From 76b25c2e26ef68442de627ca8e4890a51879a33e Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Fri, 15 Mar 2019 12:04:47 +0200
Subject: [PATCH 01/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock

---
 .../Model/Cart/AddProductsToCart.php          |  8 +++----
 .../CatalogInventory/AddProductToCartTest.php | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
index 005cf3a10ca8..02db4a4fc3bb 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
@@ -50,16 +50,16 @@ public function __construct(
      */
     public function execute(Quote $cart, array $cartItems): void
     {
-        foreach ($cartItems as $cartItemData) {
-            $this->addProductToCart->execute($cart, $cartItemData);
-        }
-
         if ($cart->getData('has_error')) {
             throw new GraphQlInputException(
                 __('Shopping cart error: %message', ['message' => $this->getCartErrors($cart)])
             );
         }
 
+        foreach ($cartItems as $cartItemData) {
+            $this->addProductToCart->execute($cart, $cartItemData);
+        }
+
         $this->cartRepository->save($cart);
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
index 17c2af8dc59d..889ef9683891 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
@@ -58,6 +58,29 @@ public function testAddProductIfQuantityIsNotAvailable()
         self::fail('Should be "The requested qty is not available" error message.');
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Some of the products are out of stock.
+     */
+    public function testUpdateProductOutOfStockInCart()
+    {
+        $sku = 'simple';
+        $qty = 1;
+        $maskedQuoteId = $this->getMaskedQuoteId();
+
+        $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
+        $this->graphQlQuery($query);
+
+        $product = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+        $productId = $product->getIdBySku($sku);
+        $product->load($productId);
+        $product->setStockData(['is_in_stock' => 0]);
+        $product->save();
+
+        $this->graphQlQuery($query);
+    }
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/products.php
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php

From 9bb2932bd9ad1f4d81a5060f3c64ebe45153392d Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Tue, 26 Mar 2019 12:25:59 +0200
Subject: [PATCH 02/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock

---
 .../Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php | 8 ++++----
 .../QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php    | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
index 02db4a4fc3bb..005cf3a10ca8 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
@@ -50,16 +50,16 @@ public function __construct(
      */
     public function execute(Quote $cart, array $cartItems): void
     {
+        foreach ($cartItems as $cartItemData) {
+            $this->addProductToCart->execute($cart, $cartItemData);
+        }
+
         if ($cart->getData('has_error')) {
             throw new GraphQlInputException(
                 __('Shopping cart error: %message', ['message' => $this->getCartErrors($cart)])
             );
         }
 
-        foreach ($cartItems as $cartItemData) {
-            $this->addProductToCart->execute($cart, $cartItemData);
-        }
-
         $this->cartRepository->save($cart);
     }
 
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
index 1b32866ed883..ce1ef465a302 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -65,6 +65,11 @@ public function __construct(
      */
     public function execute(Quote $cart, array $cartItemData): void
     {
+        if ($cart->getData('has_error')) {
+            throw new GraphQlInputException(
+                __('Shopping cart error: %message', ['message' => $this->getCartErrors($cart)])
+            );
+        }
         $sku = $this->extractSku($cartItemData);
         $qty = $this->extractQty($cartItemData);
         $customizableOptions = $this->extractCustomizableOptions($cartItemData);

From 6df7a812797fbf0db98291208451f6e80adeb4d2 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Thu, 18 Jul 2019 08:30:43 +0300
Subject: [PATCH 03/19] GraphQl-439: Improve coverage for mutation
 addSimpleProductToCart or Cart contains a product after product got status
 Out of Stock

---
 .../Model/Cart/AddProductsToCart.php          |  26 ---
 .../Model/Cart/AddSimpleProductToCart.php     |   5 -
 .../Model/Resolver/GetCartMessages.php        |  72 +++++++++
 .../Magento/QuoteGraphQl/etc/schema.graphqls  |   9 ++
 .../GraphQl/Quote/GetCartMessagesTest.php     | 153 ++++++++++++++++++
 5 files changed, 234 insertions(+), 31 deletions(-)
 create mode 100644 app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
index 005cf3a10ca8..f8d7844dd051 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
@@ -8,7 +8,6 @@
 namespace Magento\QuoteGraphQl\Model\Cart;
 
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\Message\AbstractMessage;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
 
@@ -53,31 +52,6 @@ public function execute(Quote $cart, array $cartItems): void
         foreach ($cartItems as $cartItemData) {
             $this->addProductToCart->execute($cart, $cartItemData);
         }
-
-        if ($cart->getData('has_error')) {
-            throw new GraphQlInputException(
-                __('Shopping cart error: %message', ['message' => $this->getCartErrors($cart)])
-            );
-        }
-
         $this->cartRepository->save($cart);
     }
-
-    /**
-     * Collecting cart errors
-     *
-     * @param Quote $cart
-     * @return string
-     */
-    private function getCartErrors(Quote $cart): string
-    {
-        $errorMessages = [];
-
-        /** @var AbstractMessage $error */
-        foreach ($cart->getErrors() as $error) {
-            $errorMessages[] = $error->getText();
-        }
-
-        return implode(PHP_EOL, $errorMessages);
-    }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
index ce1ef465a302..1b32866ed883 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -65,11 +65,6 @@ public function __construct(
      */
     public function execute(Quote $cart, array $cartItemData): void
     {
-        if ($cart->getData('has_error')) {
-            throw new GraphQlInputException(
-                __('Shopping cart error: %message', ['message' => $this->getCartErrors($cart)])
-            );
-        }
         $sku = $this->extractSku($cartItemData);
         $qty = $this->extractQty($cartItemData);
         $customizableOptions = $this->extractCustomizableOptions($cartItemData);
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php
new file mode 100644
index 000000000000..fd1beec0de46
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+use Magento\Framework\Message\AbstractMessage;
+use Magento\Quote\Model\Quote;
+
+/**
+ * @inheritdoc
+ */
+class GetCartMessages implements ResolverInterface
+{
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
+    /**
+     * @param GetCartForUser $getCartForUser
+     */
+    public function __construct(
+        GetCartForUser $getCartForUser
+    ) {
+        $this->getCartForUser = $getCartForUser;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $cartId = $args['input']['cart_id'];
+        if (isset($cartId) === false || empty($cartId)) {
+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
+        }
+        $currentUserId = $context->getUserId();
+        $cart = $this->getCartForUser->execute($cartId, $currentUserId);
+        if (empty($cart->getData('has_error'))) {
+            throw new GraphQlNoSuchEntityException(__('Requested cart hasn\'t errors.'));
+        }
+        return ['messages' => $this->getCartErrors($cart)];
+    }
+
+    /**
+     * Collecting cart errors
+     *
+     * @param Quote $cart
+     * @return array
+     */
+    private function getCartErrors(Quote $cart): array
+    {
+        $errorMessages = [];
+
+        /** @var AbstractMessage $error */
+        foreach ($cart->getErrors() as $error) {
+            $errorMessages[] = $error->getText();
+        }
+
+        return $errorMessages;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 79cea3855f6f..e4aa600fcc52 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -17,6 +17,7 @@ type Mutation {
     setBillingAddressOnCart(input: SetBillingAddressOnCartInput): SetBillingAddressOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetBillingAddressOnCart")
     setShippingMethodsOnCart(input: SetShippingMethodsOnCartInput): SetShippingMethodsOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingMethodsOnCart")
     setPaymentMethodOnCart(input: SetPaymentMethodOnCartInput): SetPaymentMethodOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentMethodOnCart")
+    getCartMessages(input: GetCartMessagesInput): GetCartMessagesOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\GetCartMessages") @doc(description:"Return all shopping cart messages for a guest or logged in user")
 }
 
 input AddSimpleProductsToCartInput {
@@ -124,6 +125,10 @@ input PaymentMethodInput {
     purchase_order_number: String @doc(description:"Purchase order number")
 }
 
+input GetCartMessagesInput {
+    cart_id: String!
+}
+
 type SetPaymentMethodOnCartOutput {
     cart: Cart!
 }
@@ -144,6 +149,10 @@ type ApplyCouponToCartOutput {
     cart: Cart!
 }
 
+type GetCartMessagesOutput {
+     messages: [String]!
+}
+
 type Cart {
     items: [CartItemInterface] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartItems")
     applied_coupon: AppliedCoupon @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\AppliedCoupon")
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
new file mode 100644
index 000000000000..7d12d308f84a
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+
+class GetCartMessagesTestTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testGetCartMessages()
+    {
+        $sku = 'simple';
+        $qty = 1;
+        $maskedQuoteId = $this->getMaskedQuoteId();
+
+        $queryAddProduct = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
+        $this->graphQlQuery($queryAddProduct);
+
+        $product = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+        $productId = $product->getIdBySku($sku);
+        $product->load($productId);
+        $product->setStockData(['is_in_stock' => 0]);
+        $product->save();
+
+        $queryGetMessages = $this->getCartMessagesQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($queryGetMessages);
+        self::assertEquals('Some of the products are out of stock.', $response['getCartMessages']['messages'][0]);
+    }
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Required parameter "cart_id" is missing.
+     */
+    public function testRequiredParamMissing()
+    {
+        $maskedQuoteId = '';
+
+        $query = $this->getCartMessagesQuery($maskedQuoteId);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Requested cart hasn't errors.
+     */
+    public function testCartWithoutErrors()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteId();
+
+        $query = $this->getCartMessagesQuery($maskedQuoteId);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @return string
+     */
+    public function getMaskedQuoteId() : string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    public function getCartMessagesQuery(string $maskedQuoteId): string
+    {
+        return <<<QUERY
+mutation {  
+  getCartMessages(
+    input: {
+      cart_id: "{$maskedQuoteId}"
+    }
+  ){
+      messages
+  }
+}  
+QUERY;
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $sku
+     * @param int $qty
+     * @return string
+     */
+    public function getAddSimpleProductQuery(string $maskedQuoteId, string $sku, int $qty) : string
+    {
+        return <<<QUERY
+mutation {  
+  addSimpleProductsToCart(
+    input: {
+      cart_id: "{$maskedQuoteId}", 
+      cartItems: [
+        {
+          data: {
+            qty: $qty
+            sku: "$sku"
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      items {
+        qty
+      }
+    }
+  }
+}
+QUERY;
+    }
+}

From 9fd75e97430ee750e8a73e1a103e33a803b14507 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Thu, 18 Jul 2019 10:34:30 +0300
Subject: [PATCH 04/19] GraphQl-439: Improve coverage for mutation
 addSimpleProductToCart or Cart contains a product after product got status
 Out of Stock #475

---
 .../testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
index 7d12d308f84a..03d294b53b10 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
@@ -13,6 +13,11 @@
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 
+/**
+ * Class GetCartMessagesTestTest
+ *
+ * @package Magento\GraphQl\Quote
+ */
 class GetCartMessagesTestTest extends GraphQlAbstract
 {
     /**
@@ -90,6 +95,7 @@ public function testCartWithoutErrors()
 
     /**
      * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getMaskedQuoteId() : string
     {

From f9a57840e5acf2b20adfbc784ab31821abfbfc82 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Mon, 29 Jul 2019 09:13:15 +0300
Subject: [PATCH 05/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock

---
 .../Magento/GraphQl/CatalogInventory/AddProductToCartTest.php | 4 ++--
 .../testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
index 6ac7235a0e8a..91982d298c9d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
@@ -56,9 +56,9 @@ public function testUpdateProductOutOfStockInCart()
     {
         $sku = 'simple';
         $qty = 1;
-        $maskedQuoteId = $this->getMaskedQuoteId();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
-        $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
+        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
         $this->graphQlQuery($query);
 
         $product = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
index 03d294b53b10..1c3dc2400bf3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
@@ -14,11 +14,11 @@
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 
 /**
- * Class GetCartMessagesTestTest
+ * Class GetCartMessagesTest
  *
  * @package Magento\GraphQl\Quote
  */
-class GetCartMessagesTestTest extends GraphQlAbstract
+class GetCartMessagesTest extends GraphQlAbstract
 {
     /**
      * @var QuoteResource

From 20f0d553d075e95f1a89d62b2acb43330458b888 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <44254165+XxXgeoXxX@users.noreply.github.com>
Date: Wed, 31 Jul 2019 13:07:17 +0300
Subject: [PATCH 06/19] Delete mypatch.patch

---
 mypatch.patch | 762710 -----------------------------------------------
 1 file changed, 762710 deletions(-)
 delete mode 100644 mypatch.patch

diff --git a/mypatch.patch b/mypatch.patch
deleted file mode 100644
index 79342b902e4d..000000000000
--- a/mypatch.patch
+++ /dev/null
@@ -1,762710 +0,0 @@
-diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
-index dae954a0970..89aea729985 100644
---- a/.github/CONTRIBUTING.md
-+++ b/.github/CONTRIBUTING.md
-@@ -1,36 +1,48 @@
- # Contributing to Magento 2 code
- 
- Contributions to the Magento 2 codebase are done using the fork & pull model.
--This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes. For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).
-+This contribution model has contributors maintaining their own fork of the Magento 2 repository.
-+The forked repository is then used to submit a request to the base repository to “pull” a set of changes.
-+For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).
- 
- Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes or optimizations.
- 
--The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor within two weeks, the pull request will be closed.
-+The Magento 2 development team or community maintainers will review all issues and contributions submitted by the community of developers in the first in, first out order.
-+During the review we might require clarifications from the contributor.
-+If there is no response from the contributor within two weeks, the pull request will be closed.
- 
-+For more detailed information on contribution please read our [beginners guide](https://github.com/magento/magento2/wiki/Getting-Started).
- 
- ## Contribution requirements
- 
--1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.2/coding-standards/bk-coding-standards.html).
-+1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.3/coding-standards/bk-coding-standards.html).
- 2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
--3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.2-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information.
-+3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.3-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information.
- 4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
- 3. PRs which include new logic or new features must be submitted along with:
- * Unit/integration test coverage
--* Proposed [documentation](http://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
-+* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
- 4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
- 5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
- 
- ## Contribution process
- 
--If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). This will allow you to collaborate with the Magento 2 development team, fork the Magento 2 project and send pull requests.
-+If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free).
-+This will allow you to collaborate with the Magento 2 development team, fork the Magento 2 project and send pull requests.
- 
- 1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
- 2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
- 3. Create and test your work.
--4. Fork the Magento 2 repository according to the [Fork A Repository instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
-+4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#pull_request).
- 5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
- 
- ## Code of Conduct
- 
- Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project.
- The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).
-+
-+## Connecting with Community!
-+
-+If you have any questions, join us in [#beginners](https://magentocommeng.slack.com/messages/CH8BGFX9D) Slack chat. If you are not on our slack, [click here](http://tinyurl.com/engcom-slack) to join.
-+
-+Need to find a project? Check out the [Slack Channels](https://github.com/magento/magento2/wiki/Slack-Channels) (with listed project info) and the [Magento Community Portal](https://opensource.magento.com/).
-diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
-index 12ad4e452b1..2b1720ccaab 100644
---- a/.github/ISSUE_TEMPLATE.md
-+++ b/.github/ISSUE_TEMPLATE.md
-@@ -5,11 +5,12 @@
-      - Information on your environment,
-      - Steps to reproduce,
-      - Expected and actual results,
-+    Fields marked with (*) are required. Please don't remove the template.
- 
-     Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
- -->
- 
--### Preconditions
-+### Preconditions (*)
- <!---
-     Please provide as detailed information about your environment as possible.
-     For example Magento version, tag, HEAD, PHP & MySQL version, etc..
-@@ -17,7 +18,7 @@
- 1. 
- 2. 
- 
--### Steps to reproduce
-+### Steps to reproduce (*)
- <!---
-     It is important to provide a set of clear steps to reproduce this bug.
-     If relevant please include code samples
-@@ -26,10 +27,10 @@
- 2. 
- 3. 
- 
--### Expected result
-+### Expected result (*)
- <!--- Tell us what should happen -->
- 1. [Screenshots, logs or description]
- 
--### Actual result
-+### Actual result (*)
- <!--- Tell us what happens instead -->
- 1. [Screenshots, logs or description]
-diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
-new file mode 100644
-index 00000000000..33a6ef02ace
---- /dev/null
-+++ b/.github/ISSUE_TEMPLATE/bug_report.md
-@@ -0,0 +1,34 @@
-+---
-+name: Bug report
-+about: Technical issue with the Magento 2 core components
-+
-+---
-+
-+<!---
-+Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
-+Fields marked with (*) are required. Please don't remove the template.
-+-->
-+
-+### Preconditions (*)
-+<!---
-+Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
-+-->
-+1.
-+2.
-+
-+### Steps to reproduce (*)
-+<!---
-+Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
-+-->
-+1.
-+2.
-+
-+### Expected result (*)
-+<!--- Tell us what do you expect to happen. -->
-+1. [Screenshots, logs or description]
-+2.
-+
-+### Actual result (*)
-+<!--- Tell us what happened instead. Include error messages and issues. -->
-+1. [Screenshots, logs or description]
-+2.
-diff --git a/.github/ISSUE_TEMPLATE/developer-experience-issue.md b/.github/ISSUE_TEMPLATE/developer-experience-issue.md
-new file mode 100644
-index 00000000000..423d4818fb3
---- /dev/null
-+++ b/.github/ISSUE_TEMPLATE/developer-experience-issue.md
-@@ -0,0 +1,19 @@
-+---
-+name: Developer experience issue
-+about: Issues related to customization, extensibility, modularity
-+
-+---
-+
-+<!---
-+Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
-+Fields marked with (*) are required. Please don't remove the template.
-+-->
-+
-+### Summary (*)
-+<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->
-+
-+### Examples (*)
-+<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->
-+
-+### Proposed solution
-+<!--- Suggest your potential solutions for this issue. -->
-diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
-new file mode 100644
-index 00000000000..f64185773ca
---- /dev/null
-+++ b/.github/ISSUE_TEMPLATE/feature_request.md
-@@ -0,0 +1,21 @@
-+---
-+name: Feature request
-+about: Please consider reporting directly to https://github.com/magento/community-features
-+
-+---
-+
-+<!---
-+Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum. Fields marked with (*) are required. Please don't remove the template.
-+-->
-+
-+### Description (*)
-+<!--- Describe the feature you would like to add. -->
-+
-+### Expected behavior (*)
-+<!--- What is the expected behavior of this feature? How is it going to work? -->
-+
-+### Benefits
-+<!--- How do you think this feature would improve Magento? -->
-+
-+### Additional information
-+<!--- What other information can you provide about the desired feature? -->
-diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
-index 5b0b9d74e45..11da06ee704 100644
---- a/.github/PULL_REQUEST_TEMPLATE.md
-+++ b/.github/PULL_REQUEST_TEMPLATE.md
-@@ -3,12 +3,13 @@
-     To help us process this pull request we recommend that you add the following information:
-      - Summary of the pull request,
-      - Issue(s) related to the changes made,
--     - Manual testing scenarios,
-+     - Manual testing scenarios
-+    Fields marked with (*) are required. Please don't remove the template.
- -->
- 
- <!--- Please provide a general summary of the Pull Request in the Title above -->
- 
--### Description
-+### Description (*)
- <!---
-     Please provide a description of the changes proposed in the pull request.
-     Letting us know what has changed and why it needed changing will help us validate this pull request.
-@@ -20,9 +21,8 @@
-     There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
- -->
- 1. magento/magento2#<issue_number>: Issue title
--2. ...
- 
--### Manual testing scenarios
-+### Manual testing scenarios (*)
- <!---
-     Please provide a set of unambiguous steps to test the proposed code change.
-     Giving us manual testing scenarios will help with the processing and validation process.
-@@ -30,8 +30,14 @@
- 1. ...
- 2. ...
- 
--### Contribution checklist
-+### Questions or comments
-+<!---
-+	If relevant, here you can ask questions or provide comments on your pull request for the reviewer
-+	For example if you need assistance with writing tests or would like some feedback on one of your development ideas
-+-->
-+
-+### Contribution checklist (*)
-  - [ ] Pull request has a meaningful description of its purpose
-  - [ ] All commits are accompanied by meaningful commit messages
-  - [ ] All new or changed code is covered with unit/integration tests (if applicable)
-- - [ ] All automated tests passed successfully (all builds on Travis CI are green)
-+ - [ ] All automated tests passed successfully (all builds are green)
-diff --git a/.gitignore b/.gitignore
-index 8831ad0a17c..8ec1104f255 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -33,7 +33,6 @@ atlassian*
- /.php_cs
- /.php_cs.cache
- /grunt-config.json
--/dev/tools/grunt/configs/local-themes.js
- /pub/media/*.*
- !/pub/media/.htaccess
- /pub/media/attribute/*
-@@ -49,6 +48,8 @@ atlassian*
- /pub/media/import/*
- !/pub/media/import/.htaccess
- /pub/media/logo/*
-+/pub/media/custom_options/*
-+!/pub/media/custom_options/.htaccess
- /pub/media/theme/*
- /pub/media/theme_customization/*
- !/pub/media/theme_customization/.htaccess
-diff --git a/.htaccess b/.htaccess
-index d22b5a1395c..71a5cf708db 100644
---- a/.htaccess
-+++ b/.htaccess
-@@ -27,6 +27,11 @@
-     #AddType x-mapp-php5 .php
-     #AddHandler x-mapp-php5 .php
- 
-+############################################
-+## enable usage of methods arguments in backtrace
-+
-+    SetEnv MAGE_DEBUG_SHOW_ARGS 1
-+
- ############################################
- ## default index file
- 
-@@ -364,6 +369,15 @@
-             Require all denied
-         </IfVersion>
-     </Files>
-+    <Files .user.ini>
-+        <IfVersion < 2.4>
-+            order allow,deny
-+            deny from all
-+        </IfVersion>
-+        <IfVersion >= 2.4>
-+            Require all denied
-+        </IfVersion>
-+    </Files>
- 
- # For 404s and 403s that aren't handled by the application, show plain 404 response
- ErrorDocument 404 /pub/errors/404.php
-diff --git a/.htaccess.sample b/.htaccess.sample
-index c9ddff2cca4..c9e83a53cc8 100644
---- a/.htaccess.sample
-+++ b/.htaccess.sample
-@@ -27,6 +27,11 @@
-     #AddType x-mapp-php5 .php
-     #AddHandler x-mapp-php5 .php
- 
-+############################################
-+## enable usage of methods arguments in backtrace
-+
-+    SetEnv MAGE_DEBUG_SHOW_ARGS 1
-+
- ############################################
- ## default index file
- 
-@@ -341,6 +346,15 @@
-             Require all denied
-         </IfVersion>
-     </Files>
-+    <Files .user.ini>
-+        <IfVersion < 2.4>
-+            order allow,deny
-+            deny from all
-+        </IfVersion>
-+        <IfVersion >= 2.4>
-+            Require all denied
-+        </IfVersion>
-+    </Files>
- 
- # For 404s and 403s that aren't handled by the application, show plain 404 response
- ErrorDocument 404 /pub/errors/404.php
-diff --git a/.travis.yml b/.travis.yml
-deleted file mode 100644
-index cc730ca5a2c..00000000000
---- a/.travis.yml
-+++ /dev/null
-@@ -1,65 +0,0 @@
--sudo: required
--dist: trusty
--group: edge
--addons:
--  apt:
--    packages:
--    - mysql-server-5.6
--    - mysql-client-core-5.6
--    - mysql-client-5.6
--    - postfix
--  firefox: "46.0"
--  hosts:
--      - magento2.travis
--services:
--  - rabbitmq
--  - elasticsearch
--language: php
--php:
--  - 7.1
--  - 7.2
--env:
--  global:
--    - COMPOSER_BIN_DIR=~/bin
--    - INTEGRATION_SETS=3
--    - NODE_JS_VERSION=8
--    - MAGENTO_HOST_NAME="magento2.travis"
--  matrix:
--    - TEST_SUITE=unit
--    - TEST_SUITE=static
--    - TEST_SUITE=js GRUNT_COMMAND=spec
--    - TEST_SUITE=js GRUNT_COMMAND=static
--    - TEST_SUITE=integration INTEGRATION_INDEX=1
--    - TEST_SUITE=integration INTEGRATION_INDEX=2
--    - TEST_SUITE=integration INTEGRATION_INDEX=3
--    - TEST_SUITE=functional
--matrix:
--  exclude:
--    - php: 7.1
--      env: TEST_SUITE=static
--    - php: 7.1
--      env: TEST_SUITE=js GRUNT_COMMAND=spec
--    - php: 7.1
--      env: TEST_SUITE=js GRUNT_COMMAND=static
--    - php: 7.1
--      env: TEST_SUITE=functional
--cache:
--  apt: true
--  directories:
--    - $HOME/.composer/cache
--    - $HOME/.nvm
--    - $HOME/node_modules
--    - $HOME/yarn.lock
--before_install:
--  - curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.0/elasticsearch-2.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.0.deb && sudo service elasticsearch restart
--  - ./dev/travis/before_install.sh
--install: composer install --no-interaction
--before_script: ./dev/travis/before_script.sh
--script:
--  # Set arguments for variants of phpunit based tests; '|| true' prevents failing script when leading test fails
--  - test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true
--
--  # The scripts for grunt/phpunit type tests
--  - if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
--  - if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
--  - if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi
-diff --git a/.travis.yml.sample b/.travis.yml.sample
-new file mode 100644
-index 00000000000..76885ebab28
---- /dev/null
-+++ b/.travis.yml.sample
-@@ -0,0 +1,68 @@
-+sudo: required
-+dist: trusty
-+group: edge
-+addons:
-+  apt:
-+    packages:
-+    - mysql-server-5.6
-+    - mysql-client-core-5.6
-+    - mysql-client-5.6
-+    - postfix
-+  firefox: "46.0"
-+  hosts:
-+      - magento2.travis
-+services:
-+  - rabbitmq
-+  - elasticsearch
-+language: php
-+php:
-+  - 7.1
-+  - 7.2
-+env:
-+  global:
-+    - COMPOSER_BIN_DIR=~/bin
-+    - INTEGRATION_SETS=3
-+    - NODE_JS_VERSION=8
-+    - MAGENTO_HOST_NAME="magento2.travis"
-+  matrix:
-+    - TEST_SUITE=unit
-+    - TEST_SUITE=static
-+    - TEST_SUITE=js GRUNT_COMMAND=spec
-+    - TEST_SUITE=js GRUNT_COMMAND=static
-+    - TEST_SUITE=integration INTEGRATION_INDEX=1
-+    - TEST_SUITE=integration INTEGRATION_INDEX=2
-+    - TEST_SUITE=integration INTEGRATION_INDEX=3
-+    - TEST_SUITE=functional
-+    - TEST_SUITE=graphql-api-functional
-+matrix:
-+  exclude:
-+    - php: 7.1
-+      env: TEST_SUITE=static
-+    - php: 7.1
-+      env: TEST_SUITE=js GRUNT_COMMAND=spec
-+    - php: 7.1
-+      env: TEST_SUITE=js GRUNT_COMMAND=static
-+    - php: 7.1
-+      env: TEST_SUITE=functional
-+    - php: 7.1
-+      env: TEST_SUITE=graphql-api-functional
-+cache:
-+  apt: true
-+  directories:
-+    - $HOME/.composer/cache
-+    - $HOME/.nvm
-+    - $HOME/node_modules
-+    - $HOME/yarn.lock
-+before_install:
-+  - ./dev/travis/before_install.sh
-+install: composer install --no-interaction
-+before_script: ./dev/travis/before_script.sh
-+script:
-+  # Set arguments for variants of phpunit based tests; '|| true' prevents failing script when leading test fails
-+  - test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true
-+
-+  # The scripts for grunt/phpunit type tests
-+  - if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
-+  - if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ] && [ $TEST_SUITE != "graphql-api-functional" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
-+  - if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi
-+  - if [ $TEST_SUITE == "graphql-api-functional" ]; then phpunit -c dev/tests/api-functional; fi
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index 078b93bd719..0999bee6ea4 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -1,6 +1,10 @@
-+2.3.0
-+=============
-+To get detailed information about changes in Magento 2.3.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
-+
- 2.1.0
- =============
--To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
-+To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](https://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
- 
- 2.0.0
- =============
-@@ -153,7 +157,7 @@ To get detailed information about changes in Magento 2.1.0, please visit [Magent
-     * Updated styles 
- * Sample Data:
-     * Improved sample data installation UX
--    * Updated sample data with Product Heros, color swatches, MAP and rule based product relations
-+    * Updated sample data with Product Heroes, color swatches, MAP and rule based product relations
-     * Improved sample data upgrade flow
-     * Added the ability to log errors and set the error flag during sample data installation
- * Various improvements:
-@@ -485,7 +489,7 @@ Tests:
-     * Fixed an issue where found records in global search in Backend could not be selected via keyboard
-     * Fixed an issue where Category menu items went out of screen when page side was reached
-     * Fixed an issue where subcategories in menu were shown instantly when user moved mouse quickly
--    * Fixed an issue where popup header was our of window range while creating group product
-+    * Fixed an issue where popup header was out of window range while creating group product
-     * Fixed an issue where region field was absent in customer address form on backend for "United Kingdom" country
-     * Fixed an ability to edit the Order from Admin panel
-     * Fixed an issue where email could not be retrieved from \Magento\Quote\Api\Data\AddressInterface after adding an address on OnePageCheckout
-@@ -622,7 +626,7 @@ Tests:
-     * Fixed an issue where filters were not shown on product reviews report grid
-     * Fixed an issue where second customer address was not deleted from customer account
-     * Fixed an issue where custom options pop-up was still displayed after submit
--    * Fixed an issue where Second Product was not added to Shopping Cart from Wishlist at first atempt
-+    * Fixed an issue where Second Product was not added to Shopping Cart from Wishlist at first attempt
-     * Fixed an issue where customer invalid email message was not displayed
-     * Fixed an issue where All Access Tokens for Customer without Tokens could not be revoked
-     * Fixed an issue where it was impossible to add Product to Shopping Cart from shared Wishlist
-@@ -781,7 +785,7 @@ Tests:
-     * Refactored controller actions in the Product area
-     * Moved commands cache.php, indexer.php, log.php, test.php, compiler.php, singletenant\_compiler.php, generator.php, pack.php, deploy.php and file\_assembler.php to the new bin/magento CLI framework
- * Data Migration Tool
--    * The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
-+    * The Data Migration Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
- * Fixed bugs
-     * Fixed an issue where error appeared during placing order with virtual product
-     * Fixed an issue where billing and shipping sections didn't contain address information on order print
-@@ -1021,7 +1025,7 @@ Tests:
-     * Improved backend menu keyboard accessibility
-     * Accessibility improvements: WAI-ARIA in a product item on a category page and related products
-     * Checkout flow code can work with a separate DB storage
--    * <a href="http://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
-+    * <a href="https://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
-     * Addressed naming inconsistencies in REST routes
-     * Added Advanced Developer workflow for frontend developers
- * Setup
-@@ -2280,7 +2284,7 @@ Tests:
-   * Fixed an issue where no results were found for Coupons reports
-   * Fixed an issue with incremental Qty setting
-   * Fixed an issue with allowing importing of negative weight values
--  * Fixed an issue with Inventory - Only X left Treshold being not dependent on Qty for Item's Status to Become Out of Stock
-+  * Fixed an issue with Inventory - Only X left Threshold being not dependent on Qty for Item's Status to Become Out of Stock
-   * Fixed an issue where the "Catalog Search Index index was rebuilt." message was displayed when reindexing the Catalog Search index
-  * Search module:
-   * Integrated the Search library to the advanced search functionality
-@@ -2702,7 +2706,7 @@ Tests:
-    * Ability to support extensible service data objects
-    * No Code Duplication in Root Templates
-  * Fixed bugs:
--   * Persistance session application. Loggin out the customer
-+   * Persistence session application. Logging out the customer
-    * Placing the order with two terms and conditions
-    * Saving of custom option by service catalogProductCustomOptionsWriteServiceV1
-    * Placing the order on frontend if enter in the street address line 1 and 2 255 symbols
-@@ -2961,7 +2965,7 @@ Tests:
-   * Fixed an issue with incorrect items label for the cases when there are more than one item in the category
-   * Fixed an issue when configurable product was out of stock in Google Shopping while being in stock in the Magento backend
-   * Fixed an issue when swipe gesture in menu widget was not supported on mobile
--  * Fixed an issue when it was impossible to enter alpha-numeric zip code on the stage of  estimating shipping and tax rates
-+  * Fixed an issue when it was impossible to enter alphanumeric zip code on the stage of  estimating shipping and tax rates
-   * Fixed an issue when custom price was not applied when editing an order
-   * Fixed an issue when items were not returned to stock after unsuccessful order was placed
-   * Fixed an issue when error message appeared "Cannot save the credit memo” while creating credit memo
-@@ -4132,7 +4136,7 @@ Tests:
-   * Moved Multishipping functionality to newly created module Multishipping
-   * Extracted Product duplication behavior from Product model to Product\Copier model
-   * Replaced event "catalog_model_product_duplicate" with composite Product\Copier model
--  * Replaced event "catalog_product_prepare_save" with controller product initialization helper that can be customozed via plugins
-+  * Replaced event "catalog_product_prepare_save" with controller product initialization helper that can be customized via plugins
-   * Consolidated Authorize.Net functionality in single module Authorizenet
-   * Eliminated dependency of Sales module on Shipping and Usa modules
-   * Eliminated dependency of Shipping module on Customer module
-@@ -4331,7 +4335,7 @@ Tests:
-   * Fixed order placing with virtual product using Express Checkout
-   * Fixed the error during order placement with Recurring profile payment
-   * Fixed wrong redirect after customer registration during multishipping checkout
--  * Fixed inability to crate shipping labels
-+  * Fixed inability to create shipping labels
-   * Fixed inability to switch language, if the default language is English
-   * Fixed an issue with incorrect XML appearing in cache after some actions on the frontend
-   * Fixed product export
-diff --git a/README.md b/README.md
-index 6b2ac458eb4..73154c18d89 100644
---- a/README.md
-+++ b/README.md
-@@ -1,19 +1,17 @@
--[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2)
- [![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
- [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
--[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
-+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)
- <h2>Welcome</h2>
- Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
- 
--## Magento system requirements
--[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html)
-+## Magento System Requirements
-+[Magento System Requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html).
- 
- ## Install Magento
--To install Magento, see either:
- 
--*	[Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html)
-+*	[Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
- 
--<h2>Contributing to the Magento 2 code base</h2>
-+<h2>Contributing to the Magento 2 Code Base</h2>
- Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
- 
- To learn about how to make a contribution, click [here][1].
-@@ -22,10 +20,10 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
- 
- To suggest documentation improvements, click [here][4].
- 
--[1]: <http://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
--[2]: <http://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
-+[1]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
-+[2]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
- [3]: <https://github.com/magento/magento2/issues>
--[4]: <http://devdocs.magento.com>
-+[4]: <https://devdocs.magento.com>
- 
- <h3>Community Maintainers</h3>
- The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
-@@ -40,35 +38,33 @@ Magento is thankful for any contribution that can improve our code base, documen
-     <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
- </a>
- 
--<h3>Labels applied by the Magento team</h3>
-+### Labels Applied by the Magento Team
-+We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
-+Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
- 
--| Label        | Description           | 
--| ------------- |-------------|
--| ![DOC](http://devdocs.magento.com/common/images/github_DOC.png) | Affects Documentation domain. |
--| ![PROD](http://devdocs.magento.com/common/images/github_PROD.png) | Affects the Product team (mostly feature requests or business logic change). |
--| ![TECH](http://devdocs.magento.com/common/images/github_TECH.png) | Affects Architect Group (mostly to make decisions around technology changes). |
--| ![accept](http://devdocs.magento.com/common/images/github_accept.png) | The pull request has been accepted and will be merged into mainline code. |
--| ![reject](http://devdocs.magento.com/common/images/github_reject.png) | The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. |
--| ![bug report](http://devdocs.magento.com/common/images/github_bug.png) | The Magento Team has confirmed that this issue contains the minimum required information to reproduce. |
--| ![acknowledged](http://devdocs.magento.com/common/images/gitHub_acknowledged.png) | The Magento Team has validated the issue and an internal ticket has been created. |
--| ![in progress](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. |
--| ![needs update](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. |
-+## Reporting Security Issues
- 
--To learn more about issue gate labels click [here](https://github.com/magento/magento2/wiki/Magento-Issue-Gates)
-+To report security vulnerabilities or learn more about reporting security issues in Magento software or web sites visit the [Magento Bug Bounty Program](https://hackerone.com/magento) on hackerone. Please create a hackerone account [there](https://hackerone.com/magento) to submit and follow-up your issue.
- 
--<h2>Reporting security issues</h2>
-+Stay up-to-date on the latest security news and patches for Magento by signing up for [Security Alert Notifications](https://magento.com/security/sign-up).
- 
--To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account <a href="https://bugcrowd.com/magento">there</a> to submit and follow-up your issue. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.
-+## License
- 
--Stay up-to-date on the latest security news and patches for Magento by signing up for <a href="https://magento.com/security/sign-up">Security Alert Notifications</a>.
-+Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.
- 
--<h2>License</h2>
-+[Open Software License (OSL 3.0)](https://opensource.org/licenses/osl-3.0.php).
-+Please see [LICENSE.txt](https://github.com/magento/magento2/blob/2.3-develop/LICENSE.txt) for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
- 
--Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
-+Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
-+Please see LICENSE_EE.txt for the full text of the MEE License or visit https://magento.com/legal/terms/enterprise.
- 
--http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
--Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
-+## Community Engineering Slack
- 
--Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
--Please see LICENSE_EE.txt for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.
-+To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us request at [engcom@adobe.com](mailto:engcom@adobe.com) or [self signup](https://tinyurl.com/engcom-slack).
-+
-+
-+We have channels for each project. These channels are recommended for new members:
- 
-+- [general](https://magentocommeng.slack.com/messages/C4YS78WE6): Open chat for introductions and Magento 2 questions
-+- [github](https://magentocommeng.slack.com/messages/C7KB93M32): Support for GitHub issues, pull requests, and processes
-+- [public-backlog](https://magentocommeng.slack.com/messages/CCV3J3RV5): Discussions of the Magento 2 backlog
-diff --git a/SECURITY.md b/SECURITY.md
-new file mode 100644
-index 00000000000..2b06199e5f9
---- /dev/null
-+++ b/SECURITY.md
-@@ -0,0 +1,10 @@
-+# Reporting Security Issues
-+
-+Magento values the contributions of the security research community, and we look forward to working with you to minimize risk to Magento merchants. 
-+
-+## Where should I report security issues?
-+
-+We strongly encourage you to report all security issues privately via our [bug bounty program](https://hackerone.com/magento).  Please provide us with relevant technical details and repro steps to expedite our investigation.  If you prefer not to use HackerOne, email us directly at `psirt@adobe.com` with details and repro steps.  
-+
-+## Learning More About Security
-+To learn more about securing a Magento store, please visit the [Security Center](https://magento.com/security).
-diff --git a/app/autoload.php b/app/autoload.php
-index 54087d02554..d6407083dc0 100644
---- a/app/autoload.php
-+++ b/app/autoload.php
-@@ -28,6 +28,9 @@ $vendorAutoload = BP . "/{$vendorDir}/autoload.php";
- /* 'composer install' validation */
- if (file_exists($vendorAutoload)) {
-     $composerAutoloader = include $vendorAutoload;
-+} else if (file_exists("{$vendorDir}/autoload.php")) {
-+	$vendorAutoload = "{$vendorDir}/autoload.php";
-+	$composerAutoloader = include $vendorAutoload;
- } else {
-     throw new \Exception(
-         'Vendor autoload is not found. Please run \'composer install\' under application root directory.'
-diff --git a/app/bootstrap.php b/app/bootstrap.php
-index 70b632537a7..4974acdf0fc 100644
---- a/app/bootstrap.php
-+++ b/app/bootstrap.php
-@@ -8,18 +8,21 @@
-  * Environment initialization
-  */
- error_reporting(E_ALL);
-+if (in_array('phar', \stream_get_wrappers())) {
-+    stream_wrapper_unregister('phar');
-+}
- #ini_set('display_errors', 1);
- 
- /* PHP version validation */
--if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
-+if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 70103) {
-     if (PHP_SAPI == 'cli') {
--        echo 'Magento supports 7.0.2, 7.0.4, and 7.0.6 or later. ' .
--            'Please read http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html';
-+        echo 'Magento supports PHP 7.1.3 or later. ' .
-+            'Please read https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html';
-     } else {
-         echo <<<HTML
- <div style="font:12px/1.35em arial, helvetica, sans-serif;">
--    <p>Magento supports PHP 7.0.2, 7.0.4, and 7.0.6 or later. Please read
--    <a target="_blank" href="http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html">
-+    <p>Magento supports PHP 7.1.3 or later. Please read
-+    <a target="_blank" href="https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html">
-     Magento System Requirements</a>.
- </div>
- HTML;
-@@ -31,8 +34,6 @@ require_once __DIR__ . '/autoload.php';
- // Sets default autoload mappings, may be overridden in Bootstrap::create
- \Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
- 
--require_once BP . '/app/functions.php';
--
- /* Custom umask value may be provided in optional mage_umask file in root */
- $umaskFile = BP . '/magento_umask';
- $mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;
-diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
-index 6f0e42bdcbe..82f70d92e49 100644
---- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
-+++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
-@@ -8,6 +8,11 @@
- 
- namespace Magento\AdminNotification\Block\Grid\Renderer;
- 
-+/**
-+ * Renderer class for action in the admin notifications grid
-+ *
-+ * @package Magento\AdminNotification\Block\Grid\Renderer
-+ */
- class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
- {
-     /**
-@@ -37,7 +42,9 @@ class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstrac
-      */
-     public function render(\Magento\Framework\DataObject $row)
-     {
--        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' .
-+        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' .
-+            $this->escapeUrl($row->getUrl())
-+            . '">' .
-             __('Read Details') . '</a>' : '';
- 
-         $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
-diff --git a/app/code/Magento/AdminNotification/Block/Window.php b/app/code/Magento/AdminNotification/Block/Window.php
-index 9563626ee25..e9b4bfa4489 100644
---- a/app/code/Magento/AdminNotification/Block/Window.php
-+++ b/app/code/Magento/AdminNotification/Block/Window.php
-@@ -8,6 +8,8 @@
- namespace Magento\AdminNotification\Block;
- 
- /**
-+ * Admin notification window block
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -40,7 +42,7 @@ class Window extends \Magento\Backend\Block\Template
-     protected $_criticalCollection;
- 
-     /**
--     * @var \Magento\Adminnotification\Model\Inbox
-+     * @var \Magento\AdminNotification\Model\Inbox
-      */
-     protected $_latestItem;
- 
-@@ -92,7 +94,7 @@ class Window extends \Magento\Backend\Block\Template
-     /**
-      * Retrieve latest critical item
-      *
--     * @return bool|\Magento\Adminnotification\Model\Inbox
-+     * @return bool|\Magento\AdminNotification\Model\Inbox
-      */
-     protected function _getLatestItem()
-     {
-diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
-index 125dba405b1..22eb3b30722 100644
---- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
-+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
- 
--class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification implements HttpGetActionInterface
- {
-     /**
-      * @return void
-diff --git a/app/code/Magento/AdminNotification/Model/Feed.php b/app/code/Magento/AdminNotification/Model/Feed.php
-index d3b0b8501c8..b99a8bbbc90 100644
---- a/app/code/Magento/AdminNotification/Model/Feed.php
-+++ b/app/code/Magento/AdminNotification/Model/Feed.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\AdminNotification\Model;
- 
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Config\ConfigOptionsListConstants;
- 
- /**
-@@ -25,6 +27,11 @@ class Feed extends \Magento\Framework\Model\AbstractModel
- 
-     const XML_LAST_UPDATE_PATH = 'system/adminnotification/last_update';
- 
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * Feed url
-      *
-@@ -77,6 +84,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
-      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-      * @param array $data
-+     * @param Escaper|null $escaper
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -90,21 +98,26 @@ class Feed extends \Magento\Framework\Model\AbstractModel
-         \Magento\Framework\UrlInterface $urlBuilder,
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
--        array $data = []
-+        array $data = [],
-+        Escaper $escaper = null
-     ) {
-         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
--        $this->_backendConfig    = $backendConfig;
--        $this->_inboxFactory     = $inboxFactory;
--        $this->curlFactory       = $curlFactory;
-+        $this->_backendConfig = $backendConfig;
-+        $this->_inboxFactory = $inboxFactory;
-+        $this->curlFactory = $curlFactory;
-         $this->_deploymentConfig = $deploymentConfig;
--        $this->productMetadata   = $productMetadata;
--        $this->urlBuilder        = $urlBuilder;
-+        $this->productMetadata = $productMetadata;
-+        $this->urlBuilder = $urlBuilder;
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-     }
- 
-     /**
-      * Init model
-      *
-      * @return void
-+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
-      */
-     protected function _construct()
-     {
-@@ -252,6 +265,6 @@ class Feed extends \Magento\Framework\Model\AbstractModel
-      */
-     private function escapeString(\SimpleXMLElement $data)
-     {
--        return htmlspecialchars((string)$data);
-+        return $this->escaper->escapeHtml((string)$data);
-     }
- }
-diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php
-index a92eebfaec5..40b089d9471 100644
---- a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php
-+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php
-@@ -6,6 +6,8 @@
- namespace Magento\AdminNotification\Model\ResourceModel;
- 
- /**
-+ * Inbox resource model
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -77,8 +79,7 @@ class Inbox extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-             'is_read=?',
-             0
-         );
--        $return = $connection->fetchPairs($select);
--        return $return;
-+        return $connection->fetchPairs($select);
-     }
- 
-     /**
-diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
-index 38477c015ca..c08b13373aa 100644
---- a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
-+++ b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
-@@ -7,6 +7,8 @@
- namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
- 
- /**
-+ * Media synchronization error message class.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -27,7 +29,7 @@ class Error extends \Magento\AdminNotification\Model\System\Message\Media\Abstra
-     protected function _shouldBeDisplayed()
-     {
-         $data = $this->_syncFlag->getFlagData();
--        return isset($data['has_errors']) && true == $data['has_errors'];
-+        return !empty($data['has_errors']);
-     }
- 
-     /**
-diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
-index 81bea14099e..ed882a07767 100644
---- a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
-+++ b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
-@@ -6,6 +6,8 @@
- namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
- 
- /**
-+ * Media synchronization success message class.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -27,8 +29,8 @@ class Success extends \Magento\AdminNotification\Model\System\Message\Media\Abst
-     {
-         $state = $this->_syncFlag->getState();
-         $data = $this->_syncFlag->getFlagData();
--        $hasErrors = isset($data['has_errors']) && true == $data['has_errors'] ? true : false;
--        return false == $hasErrors && \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED == $state;
-+        $hasErrors = !empty($data['has_errors']);
-+        return !$hasErrors && \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED == $state;
-     }
- 
-     /**
-diff --git a/app/code/Magento/AdminNotification/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/AdminNotification/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..3f0f251ce7e
---- /dev/null
-+++ b/app/code/Magento/AdminNotification/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuSystem">
-+        <data key="pageTitle">System</data>
-+        <data key="title">Notifications</data>
-+        <data key="dataUiId">magento-backend-system</data>
-+    </entity>
-+    <entity name="AdminMenuSystemOtherSettingsNotifications">
-+        <data key="pageTitle">Notifications</data>
-+        <data key="title">Notifications</data>
-+        <data key="dataUiId">magento-adminnotification-system-adminnotification</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml b/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..75dceb40286
---- /dev/null
-+++ b/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSystemNotificationNavigateMenuTest">
-+        <annotations>
-+            <features value="AdminNotification"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin system notification navigate menu test"/>
-+            <description value="Admin should be able to navigate to System > Notifications"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14125"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemNotificationPage">
-+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSystemOtherSettingsNotifications.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSystemOtherSettingsNotifications.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
-index e5cf487908c..fe0727474fa 100644
---- a/app/code/Magento/AdminNotification/composer.json
-+++ b/app/code/Magento/AdminNotification/composer.json
-@@ -11,7 +11,8 @@
-         "magento/module-backend": "*",
-         "magento/module-media-storage": "*",
-         "magento/module-store": "*",
--        "magento/module-ui": "*"
-+        "magento/module-ui": "*",
-+        "magento/module-config": "*"
-     },
-     "type": "magento2-module",
-     "license": [
-diff --git a/app/code/Magento/AdminNotification/etc/adminhtml/menu.xml b/app/code/Magento/AdminNotification/etc/adminhtml/menu.xml
-index fbed5c0960b..04d700b9f90 100644
---- a/app/code/Magento/AdminNotification/etc/adminhtml/menu.xml
-+++ b/app/code/Magento/AdminNotification/etc/adminhtml/menu.xml
-@@ -7,6 +7,6 @@
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
-     <menu>
--        <add id="Magento_AdminNotification::system_adminnotification"      title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
-+        <add id="Magento_AdminNotification::system_adminnotification" title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
-     </menu>
- </config>
-diff --git a/app/code/Magento/AdminNotification/etc/db_schema.xml b/app/code/Magento/AdminNotification/etc/db_schema.xml
-index 35e6045b607..29d928ced20 100644
---- a/app/code/Magento/AdminNotification/etc/db_schema.xml
-+++ b/app/code/Magento/AdminNotification/etc/db_schema.xml
-@@ -21,16 +21,16 @@
-                 default="0" comment="Flag if notification read"/>
-         <column xsi:type="smallint" name="is_remove" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Flag if notification might be removed"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="notification_id"/>
-         </constraint>
--        <index name="ADMINNOTIFICATION_INBOX_SEVERITY" indexType="btree">
-+        <index referenceId="ADMINNOTIFICATION_INBOX_SEVERITY" indexType="btree">
-             <column name="severity"/>
-         </index>
--        <index name="ADMINNOTIFICATION_INBOX_IS_READ" indexType="btree">
-+        <index referenceId="ADMINNOTIFICATION_INBOX_IS_READ" indexType="btree">
-             <column name="is_read"/>
-         </index>
--        <index name="ADMINNOTIFICATION_INBOX_IS_REMOVE" indexType="btree">
-+        <index referenceId="ADMINNOTIFICATION_INBOX_IS_REMOVE" indexType="btree">
-             <column name="is_remove"/>
-         </index>
-     </table>
-@@ -40,7 +40,7 @@
-                 default="0" comment="Problem type"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Create date"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="identity"/>
-         </constraint>
-     </table>
-diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml
-index c68313211c2..06fd380cb2a 100644
---- a/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml
-+++ b/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.notification.container.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">notificationGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\AdminNotification\Model\ResourceModel\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\AdminNotification\Model\ResourceModel\Grid\Collection</argument>
-                     <argument name="default_dir" xsi:type="string">DESC</argument>
-                     <argument name="default_sort" xsi:type="string">date_added</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
-index aa8ba23d0ee..eed6b53f343 100644
---- a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
-+++ b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
-@@ -8,7 +8,7 @@
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceContainer name="notifications">
--            <uiComponent name="notification_area"/>
-+            <uiComponent name="notification_area" aclResource="Magento_AdminNotification::show_list"/>
-             <block class="Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup"
-                    name="unread_system_messages"
-                    as="unread_system_messages"
-diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
-index 3f79e803ccc..b4f19bda36c 100644
---- a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
-+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
-@@ -4,10 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
--<?php
- /**
-  * @see \Magento\AdminNotification\Block\Window
-  */
-@@ -19,11 +15,13 @@
-             "autoOpen": true,
-             "buttons": false,
-             "modalClass": "modal-system-messages",
--            "title": "<?= /* @escapeNotVerified */ $block->getHeaderText() ?>"
-+            "title": "<?= $block->escapeHtmlAttr($block->getHeaderText()) ?>"
-         }
-     }'>
-     <li class="message message-warning warning">
--        <?= /* @escapeNotVerified */ $block->getNoticeMessageText() ?><br/>
--        <a href="<?= /* @escapeNotVerified */ $block->getNoticeMessageUrl() ?>"><?= /* @escapeNotVerified */ $block->getReadDetailsText() ?></a>
-+        <?= $block->escapeHtml($block->getNoticeMessageText()) ?><br/>
-+        <a href="<?= $block->escapeUrl($block->getNoticeMessageUrl()) ?>">
-+            <?= $block->escapeHtml($block->getReadDetailsText()) ?>
-+        </a>
-     </li>
- </ul>
-diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
-index 01d6fdcb295..22512b9055f 100644
---- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
-+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
-@@ -4,41 +4,41 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block \Magento\AdminNotification\Block\System\Messages */
- ?>
--<?php /** @var $block \Magento\AdminNotification\Block\System\Messages */ ?>
- 
- <?php $lastCritical = $block->getLastCritical();?>
--<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?>">
-+<div id="system_messages"
-+     class="message-system<?php if ($lastCritical) : ?>
-+     message-system-unread<?php endif; ?>">
-     <div class="message-system-inner">
--        <?php if ($lastCritical): ?>
-+        <?php if ($lastCritical) : ?>
-             <ul class="message-system-list">
-                 <li class="message message-warning error">
--                    <?= /* @escapeNotVerified */ $lastCritical->getText() ?>
-+                    <?= $block->escapeHtml($lastCritical->getText()) ?>
-                 </li>
-             </ul>
-         <?php endif; ?>
-         <div class="message-system-short">
-             <span class="message-system-short-label">
--                <?= /* @escapeNotVerified */ __('System Messages:') ?>
-+                <?= $block->escapeHtml(__('System Messages:')) ?>
-             </span>
- 
--            <?php if ($block->getCriticalCount()): ?>
-+            <?php if ($block->getCriticalCount()) : ?>
-                 <div class="message message-warning error">
-                     <a class="message-link" href="#" title="<?= $block->escapeHtml(__('Critical System Messages')) ?>">
--                        <?= /* @escapeNotVerified */ $block->getCriticalCount() ?>
-+                        <?= (int) $block->getCriticalCount() ?>
-                     </a>
-                 </div>
--            <?php endif;?>
-+            <?php endif; ?>
- 
--            <?php if ($block->getMajorCount()): ?>
-+            <?php if ($block->getMajorCount()) : ?>
-                <div class="message message-warning warning">
-                    <a class="message-link" href="#" title="<?= $block->escapeHtml(__('Major System Messages')) ?>">
--                       <?= /* @escapeNotVerified */ $block->getMajorCount() ?>
-+                       <?= (int) $block->getMajorCount() ?>
-                    </a>
-                </div>
--            <?php endif;?>
-+            <?php endif; ?>
-         </div>
-         <div id="message-system-all" title="<?= $block->escapeHtml(__('System messages')) ?>" data-mage-init='<?= $block->escapeHtml($block->getSystemMessageDialogJson()) ?>'></div>
-     </div>
-diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
-index 0448daaf176..494e6086562 100644
---- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
-+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
-@@ -4,16 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */
- ?>
--<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
- 
--<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?= $block->escapeHtml($block->getPopupTitle()) ?>">
-+<div style="display:none" id="system_messages_list" data-role="system_messages_list"
-+     title="<?= $block->escapeHtmlAttr($block->getPopupTitle()) ?>">
-     <ul class="message-system-list messages">
--        <?php foreach ($block->getUnreadMessages() as $message): ?>
--            <li class="message message-warning <?= /* @escapeNotVerified */ $block->getItemClass($message) ?>">
--                <?= /* @escapeNotVerified */ $message->getText() ?>
-+        <?php foreach ($block->getUnreadMessages() as $message) : ?>
-+            <li class="message message-warning <?= $block->escapeHtmlAttr($block->getItemClass($message)) ?>">
-+                <?= $block->escapeHtml($message->getText()) ?>
-             </li>
-         <?php endforeach;?>
-     </ul>
-@@ -27,4 +26,4 @@
-             }
-         }
-     }
--</script>
-\ No newline at end of file
-+</script>
-diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
-index 777448cdd82..38398727e0f 100644
---- a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
-+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
-@@ -4,81 +4,78 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/** @var $this \Magento\AdminNotification\Block\ToolbarEntry */
- 
--?>
--<?php /** @var $this \Magento\AdminNotification\Block\ToolbarEntry */ ?>
--<?php
-     $notificationCount = $block->getUnreadNotificationCount();
-     $notificationCounterMax = $block->getNotificationCounterMax();
- ?>
- <div
-     data-mage-init='{"toolbarEntry": {}}'
-     class="notifications-wrapper admin__action-dropdown-wrap"
--    data-notification-count="<?= /* @escapeNotVerified */ $notificationCount ?>">
-+    data-notification-count="<?= (int)$notificationCount ?>">
-     <?php if ($notificationCount > 0) : ?>
-         <a
--            href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
-+            href="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"
-             class="notifications-action admin__action-dropdown"
-             data-mage-init='{"dropdown":{}}'
--            title="<?= /* @escapeNotVerified */ __('Notifications') ?>"
-+            title="<?= $block->escapeHtmlAttr(__('Notifications')) ?>"
-             data-toggle="dropdown">
-             <span class="notifications-counter">
--                <?= /* @escapeNotVerified */ ($notificationCount > $notificationCounterMax) ? $notificationCounterMax . '+' : $notificationCount ?>
-+                <?= /* @noEscape */ ($notificationCount > $notificationCounterMax) ? (int)$notificationCounterMax . '+' : (int)$notificationCount ?>
-             </span>
-         </a>
-         <ul
-             class="admin__action-dropdown-menu"
--            data-mark-as-read-url="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/ajaxMarkAsRead') ?>">
-+            data-mark-as-read-url="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/ajaxMarkAsRead')) ?>">
-             <?php foreach ($block->getLatestUnreadNotifications() as $notification) : ?>
--            <?php /** @var $notification \Magento\AdminNotification\Model\Inbox*/ ?>
--            <li class="notifications-entry<?php if ($notification->getSeverity() == 1): ?> notifications-critical<?php endif; ?>"
--                data-notification-id="<?= /* @escapeNotVerified */ $notification->getId() ?>"
--                data-notification-severity="<?php if ($notification->getSeverity() == 1): ?>1<?php endif; ?>">
--                <?php
--                    $notificationDescription = $block->escapeHtml($notification->getDescription());
--                    $notificationDescriptionLength = $block->getNotificationDescriptionLength();
--                ?>
--                <strong class="notifications-entry-title">
--                    <?= $block->escapeHtml($notification->getTitle()) ?>
--                </strong>
--                <?php if (strlen($notificationDescription) > $notificationDescriptionLength) : ?>
--                    <p class="notifications-entry-description _cutted">
--                        <span class="notifications-entry-description-start">
--                            <?= /* @escapeNotVerified */ substr($notificationDescription, 0, $notificationDescriptionLength) ?>
--                        </span>
--                        <span class="notifications-entry-description-end">
--                            <?= /* @escapeNotVerified */ substr($notificationDescription, $notificationDescriptionLength) ?>
--                        </span>
--                    </p>
--                <?php else : ?>
--                    <p class="notifications-entry-description">
--                        <?= /* @escapeNotVerified */ $notificationDescription ?>
--                    </p>
--                <?php endif; ?>
--                <time class="notifications-entry-time">
--                    <?= /* @escapeNotVerified */ $block->formatNotificationDate($notification->getDateAdded()) ?>
--                </time>
--                <button
--                    type="button"
--                    class="notifications-close"
--                    title="<?= /* @escapeNotVerified */ __('Close') ?>"
--                    ></button>
--            </li>
-+                <?php /** @var $notification \Magento\AdminNotification\Model\Inbox */ ?>
-+                <li class="notifications-entry<?php if ($notification->getSeverity() == 1) : ?> notifications-critical<?php endif; ?>"
-+                    data-notification-id="<?= $block->escapeHtmlAttr($notification->getId()) ?>"
-+                    data-notification-severity="<?php if ($notification->getSeverity() == 1) : ?>1<?php endif; ?>">
-+                    <?php
-+                        $notificationDescription = $notification->getDescription();
-+                        $notificationDescriptionLength = $block->getNotificationDescriptionLength();
-+                    ?>
-+                    <strong class="notifications-entry-title">
-+                        <?= $block->escapeHtml($notification->getTitle()) ?>
-+                    </strong>
-+                    <?php if (strlen($notificationDescription) > $notificationDescriptionLength) : ?>
-+                        <p class="notifications-entry-description _cutted">
-+                            <span class="notifications-entry-description-start">
-+                                <?= $block->escapeHtml(substr($notificationDescription, 0, $notificationDescriptionLength)) ?>
-+                            </span>
-+                            <span class="notifications-entry-description-end">
-+                                <?= $block->escapeHtml(substr($notificationDescription, $notificationDescriptionLength)) ?>
-+                            </span>
-+                        </p>
-+                    <?php else : ?>
-+                        <p class="notifications-entry-description">
-+                            <?= $block->escapeHtml($notificationDescription) ?>
-+                        </p>
-+                    <?php endif; ?>
-+                    <time class="notifications-entry-time">
-+                        <?= $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())) ?>
-+                    </time>
-+                    <button
-+                        type="button"
-+                        class="notifications-close"
-+                        title="<?= $block->escapeHtmlAttr(__('Close')) ?>"
-+                        ></button>
-+                </li>
-             <?php endforeach; ?>
-             <li class="notifications-entry notifications-entry-last">
-                 <a
--                    href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
-+                    href="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"
-                     class="action-tertiary action-more">
--                    <?= /* @escapeNotVerified */ __('See All (') ?><span class="notifications-counter"><?= /* @escapeNotVerified */ $notificationCount ?></span><?= /* @escapeNotVerified */ __(' unread)') ?>
-+                    <?= $block->escapeHtml(__('See All (')) ?><span class="notifications-counter"><?= (int)$notificationCount ?></span><?= $block->escapeHtml(__(' unread)')) ?>
-                 </a>
-             </li>
-         </ul>
-     <?php else : ?>
-         <a
-             class="notifications-action admin__action-dropdown"
--            href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
--            title="<?= /* @escapeNotVerified */ __('Notifications') ?>">
-+            href="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"
-+            title="<?= $block->escapeHtmlAttr(__('Notifications')) ?>">
-         </a>
-     <?php endif; ?>
- </div>
-diff --git a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
-index 02413a1899c..d78266ab753 100644
---- a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
-+++ b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
-@@ -5,12 +5,14 @@
-  */
- namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
- use Magento\Catalog\Model\Product as CatalogProduct;
- 
--class GetFilter extends ExportController
-+class GetFilter extends ExportController implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * Get grid-filter of entity attributes action.
-@@ -37,10 +39,10 @@ class GetFilter extends ExportController
-                 );
-                 return $resultLayout;
-             } catch (\Exception $e) {
--                $this->messageManager->addError($e->getMessage());
-+                $this->messageManager->addErrorMessage($e->getMessage());
-             }
-         } else {
--            $this->messageManager->addError(__('Please correct the data sent.'));
-+            $this->messageManager->addErrorMessage(__('Please correct the data sent.'));
-         }
-         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
-index 2e17e734b1e..591e648547d 100644
---- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
-+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
-@@ -185,6 +185,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
-      * @param AdvancedPricing\Validator\Website $websiteValidator
-      * @param AdvancedPricing\Validator\TierPrice $tierPriceValidator
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     * @throws \Exception
-      */
-     public function __construct(
-         \Magento\Framework\Json\Helper\Data $jsonHelper,
-@@ -255,6 +256,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
-      * @param array $rowData
-      * @param int $rowNum
-      * @return bool
-+     * @throws \Zend_Validate_Exception
-      */
-     public function validateRow(array $rowData, $rowNum)
-     {
-@@ -308,6 +310,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
-      * Save advanced pricing
-      *
-      * @return $this
-+     * @throws \Exception
-      */
-     public function saveAdvancedPricing()
-     {
-@@ -319,6 +322,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
-      * Deletes Advanced price data from raw data.
-      *
-      * @return $this
-+     * @throws \Exception
-      */
-     public function deleteAdvancedPricing()
-     {
-@@ -347,6 +351,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
-      * Replace advanced pricing
-      *
-      * @return $this
-+     * @throws \Exception
-      */
-     public function replaceAdvancedPricing()
-     {
-@@ -360,6 +365,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
-      * @return $this
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * @throws \Exception
-      */
-     protected function saveAndReplaceAdvancedPrices()
-     {
-@@ -368,8 +374,8 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
-             $this->_cachedSkuToDelete = null;
-         }
-         $listSku = [];
-+        $tierPrices = [];
-         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
--            $tierPrices = [];
-             foreach ($bunch as $rowNum => $rowData) {
-                 if (!$this->validateRow($rowData, $rowNum)) {
-                     $this->addRowError(ValidatorInterface::ERROR_SKU_IS_EMPTY, $rowNum);
-@@ -397,23 +403,28 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
-                     ];
-                 }
-             }
--            if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
--                if ($listSku) {
--                    $this->processCountNewPrices($tierPrices);
--                    if ($this->deleteProductTierPrices(array_unique($listSku), self::TABLE_TIER_PRICE)) {
--                        $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE);
--                        $this->setUpdatedAt($listSku);
--                    }
--                }
--            } elseif (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
-+
-+            if (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
-                 $this->processCountExistingPrices($tierPrices, self::TABLE_TIER_PRICE)
-                     ->processCountNewPrices($tierPrices);
-+
-                 $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE);
-                 if ($listSku) {
-                     $this->setUpdatedAt($listSku);
-                 }
-             }
-         }
-+
-+        if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
-+            if ($listSku) {
-+                $this->processCountNewPrices($tierPrices);
-+                if ($this->deleteProductTierPrices(array_unique($listSku), self::TABLE_TIER_PRICE)) {
-+                    $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE);
-+                    $this->setUpdatedAt($listSku);
-+                }
-+            }
-+        }
-+
-         return $this;
-     }
- 
-@@ -423,6 +434,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
-      * @param array $priceData
-      * @param string $table
-      * @return $this
-+     * @throws \Exception
-      */
-     protected function saveProductPrices(array $priceData, $table)
-     {
-@@ -454,6 +466,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
-      * @param array $listSku
-      * @param string $table
-      * @return boolean
-+     * @throws \Exception
-      */
-     protected function deleteProductTierPrices(array $listSku, $table)
-     {
-@@ -531,6 +544,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
-      * Retrieve product skus
-      *
-      * @return array
-+     * @throws \Exception
-      */
-     protected function retrieveOldSkus()
-     {
-@@ -551,6 +565,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
-      * @param array $prices
-      * @param string $table
-      * @return $this
-+     * @throws \Exception
-      */
-     protected function processCountExistingPrices($prices, $table)
-     {
-@@ -562,11 +577,14 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
- 
-         $tableName = $this->_resourceFactory->create()->getTable($table);
-         $productEntityLinkField = $this->getProductEntityLinkField();
--        $existingPrices = $this->_connection->fetchAssoc(
-+        $existingPrices = $this->_connection->fetchAll(
-             $this->_connection->select()->from(
-                 $tableName,
--                ['value_id', $productEntityLinkField, 'all_groups', 'customer_group_id']
--            )->where($productEntityLinkField . ' IN (?)', $existProductIds)
-+                [$productEntityLinkField, 'all_groups', 'customer_group_id', 'qty']
-+            )->where(
-+                $productEntityLinkField . ' IN (?)',
-+                $existProductIds
-+            )
-         );
-         foreach ($existingPrices as $existingPrice) {
-             foreach ($prices as $sku => $skuPrices) {
-@@ -591,8 +609,10 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
-         foreach ($prices as $price) {
-             if ($existingPrice['all_groups'] == $price['all_groups']
-                 && $existingPrice['customer_group_id'] == $price['customer_group_id']
-+                && (int) $existingPrice['qty'] === (int) $price['qty']
-             ) {
-                 $this->countItemsUpdated++;
-+                continue;
-             }
-         }
-     }
-diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
-index b46e286e750..d78c4f5e61a 100644
---- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
-+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
-@@ -103,13 +103,13 @@ class WebsiteTest extends \PHPUnit\Framework\TestCase
-         $this->webSiteModel->expects($this->once())->method('getBaseCurrency')->willReturn($currency);
- 
-         $expectedResult = AdvancedPricing::VALUE_ALL_WEBSITES . ' [' . $currencyCode . ']';
--        $this->websiteString = $this->getMockBuilder(
-+        $websiteString = $this->getMockBuilder(
-             \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\Website::class
-         )
-             ->setMethods(['_clearMessages', '_addMessages'])
-             ->setConstructorArgs([$this->storeResolver, $this->webSiteModel])
-             ->getMock();
--        $result = $this->websiteString->getAllWebsitesValue();
-+        $result = $websiteString->getAllWebsitesValue();
- 
-         $this->assertEquals($expectedResult, $result);
-     }
-diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
-index 340e81746f0..2aa59c1cfb7 100644
---- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
-+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
-@@ -921,7 +921,7 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
-         );
-         $dbSelectMock = $this->createMock(\Magento\Framework\DB\Select::class);
-         $this->connection->expects($this->once())
--            ->method('fetchAssoc')
-+            ->method('fetchAll')
-             ->willReturn($existingPrices);
-         $this->connection->expects($this->once())
-             ->method('select')
-@@ -930,7 +930,7 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
-             ->method('from')
-             ->with(
-                 self::TABLE_NAME,
--                ['value_id', self::LINK_FIELD, 'all_groups', 'customer_group_id']
-+                [self::LINK_FIELD, 'all_groups', 'customer_group_id', 'qty']
-             )->willReturnSelf();
-         $this->advancedPricing->expects($this->once())
-             ->method('retrieveOldSkus')
-diff --git a/app/code/Magento/AdvancedSearch/Model/Recommendations/DataProvider.php b/app/code/Magento/AdvancedSearch/Model/Recommendations/DataProvider.php
-index 546983bb5e5..c0c224766eb 100644
---- a/app/code/Magento/AdvancedSearch/Model/Recommendations/DataProvider.php
-+++ b/app/code/Magento/AdvancedSearch/Model/Recommendations/DataProvider.php
-@@ -10,6 +10,9 @@ use Magento\Store\Model\ScopeInterface;
- use Magento\Search\Model\QueryInterface;
- use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
- 
-+/**
-+ * Class DataProvider
-+ */
- class DataProvider implements SuggestedQueriesInterface
- {
-     /**
-@@ -51,6 +54,8 @@ class DataProvider implements SuggestedQueriesInterface
-     private $recommendationsFactory;
- 
-     /**
-+     * DataProvider constructor.
-+     *
-      * @param ScopeConfigInterface $scopeConfig
-      * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
-      * @param \Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory $recommendationsFactory
-@@ -69,18 +74,20 @@ class DataProvider implements SuggestedQueriesInterface
-     }
- 
-     /**
-+     * Is Results Count Enabled
-+     *
-      * @return bool
-      */
-     public function isResultsCountEnabled()
-     {
--        return (bool)$this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             self::CONFIG_RESULTS_COUNT_ENABLED,
-             ScopeInterface::SCOPE_STORE
-         );
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getItems(QueryInterface $query)
-     {
-@@ -102,6 +109,8 @@ class DataProvider implements SuggestedQueriesInterface
-     }
- 
-     /**
-+     * Return Search Recommendations
-+     *
-      * @param QueryInterface $query
-      * @return array
-      */
-@@ -126,17 +135,21 @@ class DataProvider implements SuggestedQueriesInterface
-     }
- 
-     /**
-+     * Is Search Recommendations Enabled
-+     *
-      * @return bool
-      */
-     private function isSearchRecommendationsEnabled()
-     {
--        return (bool)$this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             self::CONFIG_IS_ENABLED,
-             ScopeInterface::SCOPE_STORE
-         );
-     }
- 
-     /**
-+     * Return Search Recommendations Count
-+     *
-      * @return int
-      */
-     private function getSearchRecommendationsCount()
-diff --git a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
-index 7751a3b7509..b20872da2f8 100644
---- a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
-+++ b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
-@@ -16,6 +16,7 @@ use Magento\Framework\Search\Request\Dimension;
- use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
- use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
- use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
-+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
- 
- /**
-  * @api
-@@ -47,12 +48,17 @@ class Index extends AbstractDb
-      */
-     private $dimensionCollectionFactory;
- 
-+    /**
-+     * @var int|null
-+     */
-+    private $websiteId;
-+
-     /**
-      * Index constructor.
-      * @param Context $context
-      * @param StoreManagerInterface $storeManager
-      * @param MetadataPool $metadataPool
--     * @param null $connectionName
-+     * @param string|null $connectionName
-      * @param TableResolver|null $tableResolver
-      * @param DimensionCollectionFactory|null $dimensionCollectionFactory
-      */
-@@ -94,12 +100,17 @@ class Index extends AbstractDb
-         $catalogProductIndexPriceSelect = [];
- 
-         foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
--            $catalogProductIndexPriceSelect[] = $connection->select()->from(
--                $this->tableResolver->resolve('catalog_product_index_price', $dimensions),
--                ['entity_id', 'customer_group_id', 'website_id', 'min_price']
--            );
--            if ($productIds) {
--                current($catalogProductIndexPriceSelect)->where('entity_id IN (?)', $productIds);
-+            if (!isset($dimensions[WebsiteDimensionProvider::DIMENSION_NAME]) ||
-+                $this->websiteId === null ||
-+                $dimensions[WebsiteDimensionProvider::DIMENSION_NAME]->getValue() === $this->websiteId) {
-+                $select = $connection->select()->from(
-+                    $this->tableResolver->resolve('catalog_product_index_price', $dimensions),
-+                    ['entity_id', 'customer_group_id', 'website_id', 'min_price']
-+                );
-+                if ($productIds) {
-+                    $select->where('entity_id IN (?)', $productIds);
-+                }
-+                $catalogProductIndexPriceSelect[] = $select;
-             }
-         }
- 
-@@ -123,9 +134,12 @@ class Index extends AbstractDb
-      */
-     public function getPriceIndexData($productIds, $storeId)
-     {
-+        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
-+
-+        $this->websiteId = $websiteId;
-         $priceProductsIndexData = $this->_getCatalogProductPriceData($productIds);
-+        $this->websiteId = null;
- 
--        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
-         if (!isset($priceProductsIndexData[$websiteId])) {
-             return [];
-         }
-diff --git a/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml b/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml
-index fa7774f5cec..2c4f7fca183 100644
---- a/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml
-+++ b/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml
-@@ -48,18 +48,18 @@
-                     </depends>
-                 </field>
-                 <!--<group id="suggestions">-->
--                    <field id="search_suggestion_enabled" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-+                    <field id="search_suggestion_enabled" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
-                         <label>Enable Search Suggestions</label>
-                         <comment>When you enable this option your site may slow down.</comment>
-                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                     </field>
--                    <field id="search_suggestion_count" translate="label" type="text" sortOrder="71" showInDefault="1" showInWebsite="1" showInStore="1">
-+                    <field id="search_suggestion_count" translate="label" type="text" sortOrder="91" showInDefault="1" showInWebsite="1" showInStore="1">
-                         <label>Search Suggestions Count</label>
-                         <depends>
-                             <field id="search_suggestion_enabled">1</field>
-                         </depends>
-                     </field>
--                    <field id="search_suggestion_count_results_enabled" translate="label" type="select" sortOrder="72" showInDefault="1" showInWebsite="1" showInStore="1">
-+                    <field id="search_suggestion_count_results_enabled" translate="label" type="select" sortOrder="92" showInDefault="1" showInWebsite="1" showInStore="1">
-                         <label>Show Results Count for Each Suggestion</label>
-                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                         <comment>When you enable this option your site may slow down.</comment>
-diff --git a/app/code/Magento/AdvancedSearch/etc/db_schema.xml b/app/code/Magento/AdvancedSearch/etc/db_schema.xml
-index 9fae4041109..2dd8c68e2d5 100644
---- a/app/code/Magento/AdvancedSearch/etc/db_schema.xml
-+++ b/app/code/Magento/AdvancedSearch/etc/db_schema.xml
-@@ -14,13 +14,13 @@
-                 default="0" comment="Query Id"/>
-         <column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Relation Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID"
-                     table="catalogsearch_recommendations" column="query_id" referenceTable="search_query"
-                     referenceColumn="query_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID"
-                     table="catalogsearch_recommendations" column="relation_id" referenceTable="search_query"
-                     referenceColumn="query_id" onDelete="CASCADE"/>
-     </table>
-diff --git a/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_block.xml b/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_block.xml
-index b6ef596281e..f3544863348 100644
---- a/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_block.xml
-+++ b/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\AdvancedSearch\Block\Adminhtml\Search\Grid" name="search.edit.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">catalog_search_grid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\AdvancedSearch\Model\ResourceModel\Search\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\AdvancedSearch\Model\ResourceModel\Search\Grid\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">name</argument>
-                     <argument name="default_dir" xsi:type="string">ASC</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-diff --git a/app/code/Magento/AdvancedSearch/view/adminhtml/templates/system/config/testconnection.phtml b/app/code/Magento/AdvancedSearch/view/adminhtml/templates/system/config/testconnection.phtml
-index ae202cbfaf4..a583b2d51e4 100644
---- a/app/code/Magento/AdvancedSearch/view/adminhtml/templates/system/config/testconnection.phtml
-+++ b/app/code/Magento/AdvancedSearch/view/adminhtml/templates/system/config/testconnection.phtml
-@@ -3,13 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
- ?>
- <button class="scalable" type="button" id="<?= $block->getHtmlId() ?>" data-mage-init='{"testConnection":{
--    "url": "<?= /* @escapeNotVerified */ $block->getAjaxUrl() ?>",
-+    "url": "<?= $block->escapeUrl($block->getAjaxUrl()) ?>",
-     "elementId": "<?= $block->getHtmlId() ?>",
--    "successText": "<?= /* @escapeNotVerified */ __('Successful! Test again?') ?>",
--    "failedText": "<?= /* @escapeNotVerified */ __('Connection failed! Test again?') ?>",
--    "fieldMapping": "<?= /* @escapeNotVerified */ $block->getFieldMapping() ?>"}, "validation": {}}'>
--    <span><span><span id="<?= $block->getHtmlId() ?>_result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span></span></span>
-+    "successText": "<?= $block->escapeHtmlAttr(__('Successful! Test again?')) ?>",
-+    "failedText": "<?= $block->escapeHtmlAttr(__('Connection failed! Test again?')) ?>",
-+    "fieldMapping": "<?= /* @noEscape */ $block->getFieldMapping() ?>"}, "validation": {}}'>
-+    <span id="<?= $block->getHtmlId() ?>_result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span>
- </button>
-diff --git a/app/code/Magento/AdvancedSearch/view/adminhtml/web/js/testconnection.js b/app/code/Magento/AdvancedSearch/view/adminhtml/web/js/testconnection.js
-index e28f1b4d07d..ba08b8ecd29 100644
---- a/app/code/Magento/AdvancedSearch/view/adminhtml/web/js/testconnection.js
-+++ b/app/code/Magento/AdvancedSearch/view/adminhtml/web/js/testconnection.js
-@@ -40,7 +40,8 @@ define([
-                 element =  $('#' + this.options.elementId),
-                 self = this,
-                 params = {},
--                msg = '';
-+                msg = '',
-+                fieldToCheck = this.options.fieldToCheck || 'success';
- 
-             element.removeClass('success').addClass('fail');
-             $.each($.parseJSON(this.options.fieldMapping), function (key, el) {
-@@ -49,9 +50,10 @@ define([
-             $.ajax({
-                 url: this.options.url,
-                 showLoader: true,
--                data: params
-+                data: params,
-+                headers: this.options.headers || {}
-             }).done(function (response) {
--                if (response.success) {
-+                if (response[fieldToCheck]) {
-                     element.removeClass('fail').addClass('success');
-                     result = self.options.successText;
-                 } else {
-diff --git a/app/code/Magento/AdvancedSearch/view/frontend/templates/search_data.phtml b/app/code/Magento/AdvancedSearch/view/frontend/templates/search_data.phtml
-index 6e660555053..1fa23cf3d62 100644
---- a/app/code/Magento/AdvancedSearch/view/frontend/templates/search_data.phtml
-+++ b/app/code/Magento/AdvancedSearch/view/frontend/templates/search_data.phtml
-@@ -3,7 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
-+
- /**
-  * @var \Magento\AdvancedSearch\Block\SearchData $block
-  */
-@@ -11,15 +11,15 @@
- <?php
- /** @var \Magento\Search\Model\QueryResult[] $data */
- $data = $block->getItems();
--if (count($data)):?>
-+if (count($data)) : ?>
-     <dl class="block">
--        <dt class="title"><?= /* @escapeNotVerified */ __($block->getTitle()) ?></dt>
-+        <dt class="title"><?= $block->escapeHtml(__($block->getTitle())) ?></dt>
-         <?php foreach ($data as $additionalInfo) : ?>
-             <dd class="item">
--                <a href="<?= /* @escapeNotVerified */ $block->getLink($additionalInfo->getQueryText()) ?>"
-+                <a href="<?= $block->escapeUrl($block->getLink($additionalInfo->getQueryText())) ?>"
-                     ><?= $block->escapeHtml($additionalInfo->getQueryText()) ?></a>
--                <?php if ($block->isShowResultsCount()): ?>
--                    <span class="count"><?= /* @escapeNotVerified */ $additionalInfo->getResultsCount() ?></span>
-+                <?php if ($block->isShowResultsCount()) : ?>
-+                    <span class="count"><?= /* @noEscape */ (int)$additionalInfo->getResultsCount() ?></span>
-                 <?php endif; ?>
-             </dd>
-         <?php endforeach; ?>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/LICENSE.txt b/app/code/Magento/AmqpStore/LICENSE.txt
-similarity index 100%
-rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/LICENSE.txt
-rename to app/code/Magento/AmqpStore/LICENSE.txt
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/LICENSE_AFL.txt b/app/code/Magento/AmqpStore/LICENSE_AFL.txt
-similarity index 100%
-rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/LICENSE_AFL.txt
-rename to app/code/Magento/AmqpStore/LICENSE_AFL.txt
-diff --git a/app/code/Magento/AmqpStore/Plugin/AsynchronousOperations/MassConsumerEnvelopeCallback.php b/app/code/Magento/AmqpStore/Plugin/AsynchronousOperations/MassConsumerEnvelopeCallback.php
-new file mode 100644
-index 00000000000..e05004cea78
---- /dev/null
-+++ b/app/code/Magento/AmqpStore/Plugin/AsynchronousOperations/MassConsumerEnvelopeCallback.php
-@@ -0,0 +1,101 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AmqpStore\Plugin\AsynchronousOperations;
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Framework\MessageQueue\EnvelopeFactory;
-+use PhpAmqpLib\Wire\AMQPTable;
-+use Magento\Framework\MessageQueue\EnvelopeInterface;
-+use Magento\AsynchronousOperations\Model\MassConsumerEnvelopeCallback as SubjectMassConsumerEnvelopeCallback;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * Plugin to get 'store_id' from the new custom header 'store_id' in amqp
-+ * 'application_headers' properties and setCurrentStore by value 'store_id'.
-+ */
-+class MassConsumerEnvelopeCallback
-+{
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var EnvelopeFactory
-+     */
-+    private $envelopeFactory;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @param EnvelopeFactory $envelopeFactory
-+     * @param StoreManagerInterface $storeManager
-+     * @param LoggerInterface $logger
-+     */
-+    public function __construct(
-+        EnvelopeFactory $envelopeFactory,
-+        StoreManagerInterface $storeManager,
-+        LoggerInterface $logger
-+    ) {
-+        $this->storeManager = $storeManager;
-+        $this->envelopeFactory = $envelopeFactory;
-+        $this->logger = $logger;
-+    }
-+
-+    /**
-+     * Check if amqpProperties['application_headers'] have 'store_id' and use it to setCurrentStore
-+     * Restore original store value in consumer process after execution.
-+     * Reject queue messages because of wrong store_id.
-+     *
-+     * @param SubjectMassConsumerEnvelopeCallback $subject
-+     * @param callable $proceed
-+     * @param EnvelopeInterface $message
-+     * @return void
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function aroundExecute(
-+        SubjectMassConsumerEnvelopeCallback $subject,
-+        callable $proceed,
-+        EnvelopeInterface $message
-+    ) {
-+        $amqpProperties = $message->getProperties();
-+        if (isset($amqpProperties['application_headers'])) {
-+            $headers = $amqpProperties['application_headers'];
-+            if ($headers instanceof AMQPTable) {
-+                $headers = $headers->getNativeData();
-+            }
-+            if (isset($headers['store_id'])) {
-+                $storeId = $headers['store_id'];
-+                try {
-+                    $currentStoreId = $this->storeManager->getStore()->getId();
-+                } catch (NoSuchEntityException $e) {
-+                    $this->logger->error(
-+                        sprintf(
-+                            "Can't set currentStoreId during processing queue. Message rejected. Error %s.",
-+                            $e->getMessage()
-+                        )
-+                    );
-+                    $subject->getQueue()->reject($message, false, $e->getMessage());
-+                    return;
-+                }
-+                if (isset($storeId) && $storeId !== $currentStoreId) {
-+                    $this->storeManager->setCurrentStore($storeId);
-+                }
-+            }
-+        }
-+        $proceed($message);
-+        if (isset($storeId, $currentStoreId) && $storeId !== $currentStoreId) {
-+            $this->storeManager->setCurrentStore($currentStoreId);//restore original store value
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AmqpStore/Plugin/Framework/Amqp/Bulk/Exchange.php b/app/code/Magento/AmqpStore/Plugin/Framework/Amqp/Bulk/Exchange.php
-new file mode 100644
-index 00000000000..c5db1f5300c
---- /dev/null
-+++ b/app/code/Magento/AmqpStore/Plugin/Framework/Amqp/Bulk/Exchange.php
-@@ -0,0 +1,117 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AmqpStore\Plugin\Framework\Amqp\Bulk;
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Framework\MessageQueue\EnvelopeFactory;
-+use PhpAmqpLib\Exception\AMQPInvalidArgumentException;
-+use PhpAmqpLib\Wire\AMQPTable;
-+use Magento\Framework\Amqp\Bulk\Exchange as SubjectExchange;
-+use Magento\Framework\MessageQueue\EnvelopeInterface;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * Plugin to set 'store_id' to the new custom header 'store_id' in amqp
-+ * 'application_headers'.
-+ */
-+class Exchange
-+{
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var EnvelopeFactory
-+     */
-+    private $envelopeFactory;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * Exchange constructor.
-+     * @param EnvelopeFactory $envelopeFactory
-+     * @param StoreManagerInterface $storeManager
-+     * @param LoggerInterface $logger
-+     */
-+    public function __construct(
-+        EnvelopeFactory $envelopeFactory,
-+        StoreManagerInterface $storeManager,
-+        LoggerInterface $logger
-+    ) {
-+        $this->storeManager = $storeManager;
-+        $this->envelopeFactory = $envelopeFactory;
-+        $this->logger = $logger;
-+    }
-+
-+    /**
-+     * Set current store_id in amqpProperties['application_headers']
-+     * so consumer may check store_id and execute operation in correct store scope.
-+     * Prevent publishing inconsistent messages because of store_id not defined or wrong.
-+     *
-+     * @param SubjectExchange $subject
-+     * @param string $topic
-+     * @param EnvelopeInterface[] $envelopes
-+     * @return array
-+     * @throws AMQPInvalidArgumentException
-+     * @throws \LogicException
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function beforeEnqueue(SubjectExchange $subject, $topic, array $envelopes)
-+    {
-+        try {
-+            $storeId = $this->storeManager->getStore()->getId();
-+        } catch (NoSuchEntityException $e) {
-+            $errorMessage = sprintf(
-+                "Can't get current storeId and inject to amqp message. Error %s.",
-+                $e->getMessage()
-+            );
-+            $this->logger->error($errorMessage);
-+            throw new \LogicException($errorMessage);
-+        }
-+
-+        $updatedEnvelopes = [];
-+        foreach ($envelopes as $envelope) {
-+            $properties = $envelope->getProperties();
-+            if (!isset($properties)) {
-+                $properties = [];
-+            }
-+            if (isset($properties['application_headers'])) {
-+                $headers = $properties['application_headers'];
-+                if ($headers instanceof AMQPTable) {
-+                    try {
-+                        $headers->set('store_id', $storeId);
-+                    // phpcs:ignore Magento2.Exceptions.ThrowCatch
-+                    } catch (AMQPInvalidArgumentException $ea) {
-+                        $errorMessage = sprintf("Can't set storeId to amqp message. Error %s.", $ea->getMessage());
-+                        $this->logger->error($errorMessage);
-+                        throw new AMQPInvalidArgumentException($errorMessage);
-+                    }
-+                    $properties['application_headers'] = $headers;
-+                }
-+            } else {
-+                $properties['application_headers'] = new AMQPTable(['store_id' => $storeId]);
-+            }
-+            $updatedEnvelopes[] = $this->envelopeFactory->create(
-+                [
-+                    'body' => $envelope->getBody(),
-+                    'properties' => $properties
-+                ]
-+            );
-+        }
-+        if (!empty($updatedEnvelopes)) {
-+            $envelopes = $updatedEnvelopes;
-+        }
-+        return [$topic, $envelopes];
-+    }
-+}
-diff --git a/app/code/Magento/AmqpStore/README.md b/app/code/Magento/AmqpStore/README.md
-new file mode 100644
-index 00000000000..0f84c8ff327
---- /dev/null
-+++ b/app/code/Magento/AmqpStore/README.md
-@@ -0,0 +1,3 @@
-+# Amqp Store
-+
-+**AmqpStore** provides ability to specify store before publish messages with Amqp.
-diff --git a/app/code/Magento/AmqpStore/composer.json b/app/code/Magento/AmqpStore/composer.json
-new file mode 100644
-index 00000000000..bd11527bbb3
---- /dev/null
-+++ b/app/code/Magento/AmqpStore/composer.json
-@@ -0,0 +1,30 @@
-+{
-+    "name": "magento/module-amqp-store",
-+    "description": "N/A",
-+    "config": {
-+        "sort-packages": true
-+    },
-+    "require": {
-+        "magento/framework": "*",
-+        "magento/framework-amqp": "*",
-+        "magento/module-store": "*",
-+        "php": "~7.1.3||~7.2.0"
-+    },
-+    "suggest": {
-+        "magento/module-asynchronous-operations": "*",
-+        "magento/framework-message-queue": "*"
-+    },
-+    "type": "magento2-module",
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\AmqpStore\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AmqpStore/etc/di.xml b/app/code/Magento/AmqpStore/etc/di.xml
-new file mode 100644
-index 00000000000..3bbbebd2495
---- /dev/null
-+++ b/app/code/Magento/AmqpStore/etc/di.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\Framework\Amqp\Bulk\Exchange">
-+        <plugin name="amqpStoreIdFieldForAmqpBulkExchange" type="Magento\AmqpStore\Plugin\Framework\Amqp\Bulk\Exchange"/>
-+    </type>
-+    <type name="Magento\AsynchronousOperations\Model\MassConsumerEnvelopeCallback">
-+        <plugin name="amqpStoreIdFieldForAsynchronousOperationsMassConsumerEnvelopeCallback" type="Magento\AmqpStore\Plugin\AsynchronousOperations\MassConsumerEnvelopeCallback"/>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/AmqpStore/etc/module.xml b/app/code/Magento/AmqpStore/etc/module.xml
-new file mode 100644
-index 00000000000..085b97b5e2f
---- /dev/null
-+++ b/app/code/Magento/AmqpStore/etc/module.xml
-@@ -0,0 +1,14 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_AmqpStore">
-+        <sequence>
-+            <module name="Magento_Store"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/app/code/Magento/AmqpStore/registration.php b/app/code/Magento/AmqpStore/registration.php
-new file mode 100644
-index 00000000000..4922879bfbf
---- /dev/null
-+++ b/app/code/Magento/AmqpStore/registration.php
-@@ -0,0 +1,9 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use \Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AmqpStore', __DIR__);
-diff --git a/app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php b/app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php
-index ff9126a83d5..87666cb880e 100644
---- a/app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php
-+++ b/app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Analytics\Controller\Adminhtml\BIEssentials;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\App\Config\ScopeConfigInterface;
-@@ -12,7 +13,7 @@ use Magento\Framework\App\Config\ScopeConfigInterface;
- /**
-  * Provides link to BI Essentials signup
-  */
--class SignUp extends Action
-+class SignUp extends Action implements HttpGetActionInterface
- {
-     /**
-      * Path to config value with URL to BI Essentials sign-up page.
-diff --git a/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php b/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php
-index cec09377770..9068654fa94 100644
---- a/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php
-+++ b/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Analytics\Controller\Adminhtml\Reports;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Analytics\Model\Exception\State\SubscriptionUpdateException;
- use Magento\Analytics\Model\ReportUrlProvider;
- use Magento\Backend\App\Action;
-@@ -16,7 +17,7 @@ use Magento\Framework\Exception\LocalizedException;
- /**
-  * Provide redirect to resource with reports.
-  */
--class Show extends Action
-+class Show extends Action implements HttpGetActionInterface
- {
-     /**
-      * @var ReportUrlProvider
-diff --git a/app/code/Magento/Analytics/Model/Cryptographer.php b/app/code/Magento/Analytics/Model/Cryptographer.php
-index 665d564814b..efddcb501aa 100644
---- a/app/code/Magento/Analytics/Model/Cryptographer.php
-+++ b/app/code/Magento/Analytics/Model/Cryptographer.php
-@@ -129,7 +129,12 @@ class Cryptographer
-      */
-     private function validateCipherMethod($cipherMethod)
-     {
--        $methods = openssl_get_cipher_methods();
-+        $methods = array_map(
-+            'strtolower',
-+            openssl_get_cipher_methods()
-+        );
-+        $cipherMethod = strtolower($cipherMethod);
-+
-         return (false !== array_search($cipherMethod, $methods));
-     }
- }
-diff --git a/app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php b/app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php
-index fecbf2033c1..4d623441974 100644
---- a/app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php
-+++ b/app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php
-@@ -5,7 +5,7 @@
-  */
- namespace Magento\Analytics\Model\ReportXml;
- 
--use Magento\Framework\Module\Manager as ModuleManager;
-+use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
- 
- /**
-  * Iterator for ReportXml modules
-diff --git a/app/code/Magento/Analytics/README.md b/app/code/Magento/Analytics/README.md
-index 7ec64abcd9b..f600f1d406e 100644
---- a/app/code/Magento/Analytics/README.md
-+++ b/app/code/Magento/Analytics/README.md
-@@ -1,6 +1,6 @@
- # Magento_Analytics Module
- 
--The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html) functionality.
-+The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html) functionality.
- 
- The module implements the following functionality:
- 
-@@ -16,8 +16,8 @@ The module implements the following functionality:
- 
- ## Structure
- 
--Beyond the [usual module file structure](http://devdocs.magento.com/guides/v2.2/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
--[Report XML](http://devdocs.magento.com/guides/v2.2/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
-+Beyond the [usual module file structure](https://devdocs.magento.com/guides/v2.2/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
-+[Report XML](https://devdocs.magento.com/guides/v2.2/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
- The language declares SQL queries using XML declaration.
- 
- ## Subscription Process
-diff --git a/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php b/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php
-index 14b80c6814b..3af168886a4 100644
---- a/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php
-+++ b/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php
-@@ -76,7 +76,7 @@ class ColumnsResolver
-             $columnName = $this->nameResolver->getName($attributeData);
-             if (isset($attributeData['function'])) {
-                 $prefix = '';
--                if (isset($attributeData['distinct']) && $attributeData['distinct'] == true) {
-+                if (!empty($attributeData['distinct'])) {
-                     $prefix = ' DISTINCT ';
-                 }
-                 $expression = new ColumnValueExpression(
-diff --git a/app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php b/app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php
-index 81ee9b15781..b4b7adebf74 100644
---- a/app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php
-+++ b/app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php
-@@ -11,6 +11,7 @@ use Magento\Framework\DB\Select;
- 
- /**
-  * Responsible for Select object creation, works as a builder. Returns Select as result;
-+ *
-  * Used in SQL assemblers.
-  */
- class SelectBuilder
-@@ -85,11 +86,13 @@ class SelectBuilder
-      * Set joins conditions
-      *
-      * @param array $joins
--     * @return void
-+     * @return $this
-      */
-     public function setJoins($joins)
-     {
-         $this->joins = $joins;
-+
-+        return $this;
-     }
- 
-     /**
-@@ -106,11 +109,13 @@ class SelectBuilder
-      * Set connection name
-      *
-      * @param string $connectionName
--     * @return void
-+     * @return $this
-      */
-     public function setConnectionName($connectionName)
-     {
-         $this->connectionName = $connectionName;
-+
-+        return $this;
-     }
- 
-     /**
-@@ -127,11 +132,13 @@ class SelectBuilder
-      * Set columns
-      *
-      * @param array $columns
--     * @return void
-+     * @return $this
-      */
-     public function setColumns($columns)
-     {
-         $this->columns = $columns;
-+
-+        return $this;
-     }
- 
-     /**
-@@ -148,11 +155,13 @@ class SelectBuilder
-      * Set filters
-      *
-      * @param array $filters
--     * @return void
-+     * @return $this
-      */
-     public function setFilters($filters)
-     {
-         $this->filters = $filters;
-+
-+        return $this;
-     }
- 
-     /**
-@@ -169,11 +178,13 @@ class SelectBuilder
-      * Set from condition
-      *
-      * @param array $from
--     * @return void
-+     * @return $this
-      */
-     public function setFrom($from)
-     {
-         $this->from = $from;
-+
-+        return $this;
-     }
- 
-     /**
-@@ -236,11 +247,13 @@ class SelectBuilder
-      * Set group
-      *
-      * @param array $group
--     * @return void
-+     * @return $this
-      */
-     public function setGroup($group)
-     {
-         $this->group = $group;
-+
-+        return $this;
-     }
- 
-     /**
-@@ -257,11 +270,13 @@ class SelectBuilder
-      * Set parameters
-      *
-      * @param array $params
--     * @return void
-+     * @return $this
-      */
-     public function setParams($params)
-     {
-         $this->params = $params;
-+
-+        return $this;
-     }
- 
-     /**
-@@ -278,10 +293,12 @@ class SelectBuilder
-      * Set having condition
-      *
-      * @param array $having
--     * @return void
-+     * @return $this
-      */
-     public function setHaving($having)
-     {
-         $this->having = $having;
-+
-+        return $this;
-     }
- }
-diff --git a/app/code/Magento/Analytics/ReportXml/ReportProvider.php b/app/code/Magento/Analytics/ReportXml/ReportProvider.php
-index 60e722930c2..8966d018dc6 100644
---- a/app/code/Magento/Analytics/ReportXml/ReportProvider.php
-+++ b/app/code/Magento/Analytics/ReportXml/ReportProvider.php
-@@ -55,7 +55,7 @@ class ReportProvider
-     private function getIteratorName(Query $query)
-     {
-         $config = $query->getConfig();
--        return isset($config['iterator']) ? $config['iterator'] : null;
-+        return $config['iterator'] ?? null;
-     }
- 
-     /**
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Analytics/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..01b86101def
---- /dev/null
-+++ b/app/code/Magento/Analytics/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuReports">
-+        <data key="pageTitle">Reports</data>
-+        <data key="title">Reports</data>
-+        <data key="dataUiId">magento-reports-report</data>
-+    </entity>
-+    <entity name="AdminMenuReportsBusinessIntelligenceAdvancedReporting">
-+        <data key="pageTitle">AdvancedReporting</data>
-+        <data key="title">AdvancedReporting</data>
-+        <data key="dataUiId">magento-analytics-advanced-reporting</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml b/app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml
-index 8324ad5ba99..83f27def4b4 100644
---- a/app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml
-+++ b/app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="adminNoReport" type="user">
-         <data key="username" unique="suffix">noreport</data>
-         <data key="firstname">No</data>
-@@ -18,7 +18,7 @@
-         <data key="interface_local">en_US</data>
-         <data key="is_active">true</data>
-         <data key="current_password">123123q</data>
--</entity>
-+    </entity>
-     <entity name="restrictedWebUser" type="user">
-         <data key="username" unique="suffix">restrictedWebUser</data>
-         <data key="firstname">restricted</data>
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml b/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
-index 71d8bdcd599..099cc71321b 100644
---- a/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
-+++ b/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="adminNoReportRole" type="user_role">
-         <data key="rolename" unique="suffix">noreport</data>
-         <data key="current_password">123123q</data>
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Metadata/user-meta.xml b/app/code/Magento/Analytics/Test/Mftf/Metadata/user-meta.xml
-deleted file mode 100644
-index 06186d2d104..00000000000
---- a/app/code/Magento/Analytics/Test/Mftf/Metadata/user-meta.xml
-+++ /dev/null
-@@ -1,23 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
--    <operation name="CreateUser" dataType="user" type="create"
--               auth="adminFormKey" url="/admin/user/save/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
--        <contentType>application/x-www-form-urlencoded</contentType>
--        <field key="username">string</field>
--        <field key="firstname">string</field>
--        <field key="lastname">string</field>
--        <field key="email">string</field>
--        <field key="password">string</field>
--        <field key="password_confirmation">string</field>
--        <field key="interface_locale">string</field>
--        <field key="is_active">boolean</field>
--        <field key="current_password">string</field>
--    </operation>
--</operations>
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Metadata/user_role-meta.xml b/app/code/Magento/Analytics/Test/Mftf/Metadata/user_role-meta.xml
-deleted file mode 100644
-index f5246880792..00000000000
---- a/app/code/Magento/Analytics/Test/Mftf/Metadata/user_role-meta.xml
-+++ /dev/null
-@@ -1,19 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
--    <operation name="CreateUserRole" dataType="user_role" type="create"
--               auth="adminFormKey" url="/admin/user_role/saverole/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
--        <contentType>application/x-www-form-urlencoded</contentType>
--        <field key="rolename">string</field>
--        <field key="current_password">string</field>
--        <array key="resource">
--            <value>string</value>
--        </array>
--    </operation>
--</operations>
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Page/AdminConfigPage.xml b/app/code/Magento/Analytics/Test/Mftf/Page/AdminConfigPage.xml
-new file mode 100644
-index 00000000000..c4ced12e67e
---- /dev/null
-+++ b/app/code/Magento/Analytics/Test/Mftf/Page/AdminConfigPage.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminConfigGeneralAnalyticsPage" url="admin/system_config/edit/section/analytics/" area="admin" module="Magento_Config">
-+        <section name="AdminConfigAdvancedReportingSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Section/AdminAdvancedReportingSection.xml b/app/code/Magento/Analytics/Test/Mftf/Section/AdminAdvancedReportingSection.xml
-new file mode 100644
-index 00000000000..7b6851e5bdf
---- /dev/null
-+++ b/app/code/Magento/Analytics/Test/Mftf/Section/AdminAdvancedReportingSection.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminAdvancedReportingSection">
-+        <element name="goToAdvancedReporting" type="text" selector="//div[@class='dashboard-advanced-reports-actions']/a[@title='Go to Advanced Reporting']" timeout="30"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigAdvancedReportingSection.xml b/app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigAdvancedReportingSection.xml
-new file mode 100644
-index 00000000000..36e4779a48d
---- /dev/null
-+++ b/app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigAdvancedReportingSection.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminConfigAdvancedReportingSection">
-+        <element name="advancedReportingMenuItem" type="text" selector="//*[@class='admin__page-nav-link item-nav']//span[text()='Advanced Reporting']"/>
-+        <element name="advancedReportingService" type="select" selector="#analytics_general_enabled"/>
-+        <element name="advancedReportingServiceLabel" type="text" selector="#row_analytics_general_enabled>td.label>label>span"/>
-+        <element name="advancedReportingServiceStatus" type="text" selector="#row_analytics_general_enabled>td.value>p>span"/>
-+        <element name="advancedReportingIndustry" type="select" selector="#analytics_general_vertical"/>
-+        <element name="advancedReportingIndustryLabel" type="text" selector=".config-vertical-label>label>span"/>
-+        <element name="advancedReportingHour" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(2)"/>
-+        <element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
-+        <element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(6)"/>
-+        <element name="advancedReportingBlankIndustryError" type="text" selector=".message-error>div"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml
-new file mode 100644
-index 00000000000..e660a2eb8d4
---- /dev/null
-+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml
-@@ -0,0 +1,38 @@
-+<?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="AdminAdvancedReportingButtonTest">
-+        <annotations>
-+            <stories value="AdvancedReporting"/>
-+            <title value="AdvancedReportingButtonTest"/>
-+            <description value="Test log in to AdvancedReporting and tests AdvancedReportingButtonTest"/>
-+            <testCaseId value="MC-14800"/>
-+            <skip>
-+                <issueId value="MC-14800" />
-+            </skip>
-+            <severity value="CRITICAL"/>
-+            <group value="analytics"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Navigate through Advanced Reporting button on dashboard to Sign Up page-->
-+        <amOnPage url="{{AdminDashboardPage.url}}" stepKey="amOnDashboardPage"/>
-+        <waitForPageLoad stepKey="waitForDashboardPageLoad"/>
-+        <click selector="{{AdminAdvancedReportingSection.goToAdvancedReporting}}" stepKey="clickGoToAdvancedReporting"/>
-+        <switchToNextTab stepKey="switchToNewTab"/>
-+        <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..67d67152856
---- /dev/null
-+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml
-@@ -0,0 +1,35 @@
-+<?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="AdminAdvancedReportingNavigateMenuTest">
-+        <annotations>
-+            <features value="Analytics"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin advanced reporting navigate menu test"/>
-+            <description value="Admin should be able to navigate through advanced reporting admin menu to BI reports page"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14152"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateAdvancedReportingPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsBusinessIntelligenceAdvancedReporting.dataUiId}}"/>
-+        </actionGroup>
-+        <switchToNextTab stepKey="switchToNewTab"/>
-+        <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
-index fefb7874ef7..914cb59b64e 100644
---- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
-+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminConfigurationBlankIndustryTest">
-         <annotations>
-             <features value="Analytics"/>
-@@ -18,15 +18,14 @@
-             <group value="analytics"/>
-         </annotations>
-         <after>
--            <amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-         </after>
-         <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
--        <amOnPage stepKey="amOnAdminConfig" url="{{AdminConfigPage.url}}"/>
--        <waitForPageLoad stepKey="waitForAdminConfig"/>
--        <click stepKey="clickAdvancedReportingConfigMenu" selector="{{AdminConfigSection.advancedReportingMenuItem}}"/>
--        <see stepKey="seeAdvancedReportingIndustryLabel" selector="{{AdminConfigSection.advancedReportingIndustryLabel}}" userInput="Industry"/>
--        <selectOption stepKey="selectAdvancedReportingIndustry" selector="{{AdminConfigSection.advancedReportingIndustry}}" userInput="--Please Select--"/>
--        <click stepKey="clickSaveConfigButton" selector="{{AdminConfigSection.saveButton}}"/>
--        <see stepKey="seeBlankIndustryErrorMessage" selector="{{AdminConfigSection.advancedReportingBlankIndustryError}}" userInput="Please select an industry."/>
-+        <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
-+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
-+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
-+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="--Please Select--" stepKey="selectAdvancedReportingIndustry"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton"/>
-+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingBlankIndustryError}}" userInput="Please select an industry." stepKey="seeBlankIndustryErrorMessage"/>
-     </test>
- </tests>
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
-index 15c9727cc8c..1c1a3b27b06 100644
---- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
-+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- 
--<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminConfigurationEnableDisableAnalyticsTest">
-         <annotations>
-             <features value="Analytics"/>
-@@ -16,32 +16,26 @@
-             <severity value="MAJOR"/>
-             <testCaseId value="MAGETWO-66465"/>
-             <group value="analytics"/>
--            <skip>
--                <issueId value="MAGETWO-90659"/>
--            </skip>
-         </annotations>
-         <after>
--            <amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-         </after>
-         <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
--        <!--Goto admin stores configure page -->
--        <amOnPage stepKey="amOnAdminConfig" url="{{AdminConfigPage.url}}"/>
--        <!--Enable Advanced Reporting-->
--        <click stepKey="clickAdvancedReportingConfigMenu" selector="{{AdminConfigSection.advancedReportingMenuItem}}"/>
--        <see stepKey="seeAdvancedReportingServiceLabelEnabled" selector="{{AdminConfigSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service"/>
--        <selectOption stepKey="selectAdvancedReportingServiceEnabled" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Enable"/>
--        <see stepKey="seeAdvancedReportingIndustryLabel" selector="{{AdminConfigSection.advancedReportingIndustryLabel}}" userInput="Industry"/>
--        <selectOption stepKey="selectAdvancedReportingIndustry" selector="{{AdminConfigSection.advancedReportingIndustry}}" userInput="Apps and Games"/>
--        <click stepKey="clickSaveConfigButtonEnabled" selector="{{AdminConfigSection.saveButton}}"/>
--        <see stepKey="seeSaveConfigurationMessageEnabled" selector="{{AdminConfigSection.advancedReportingSuccessMessage}}" userInput="You saved the configuration."/>
--        <see stepKey="seeAdvancedReportingServiceEnabled" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Enable"/>
--        <see stepKey="seeAdvancedReportingServiceStatusEnabled" selector="{{AdminConfigSection.advancedReportingServiceStatus}}" userInput="Subscription status: Pending"/>
-+        <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
-+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service" stepKey="seeAdvancedReportingServiceLabelEnabled"/>
-+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
-+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
-+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton1"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess"/>
-+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="seeAdvancedReportingServiceEnabled"/>
-+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceStatus}}" userInput="Subscription status: Pending" stepKey="seeAdvancedReportingServiceStatusEnabled"/>
-         <!--Disable Advanced Reporting-->
--        <see stepKey="seeAdvancedReportingServiceLabelDisabled" selector="{{AdminConfigSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service"/>
--        <selectOption stepKey="selectAdvancedReportingServiceDisabled" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Disable"/>
--        <click stepKey="clickSaveConfigButtonDisabled" selector="{{AdminConfigSection.saveButton}}"/>
--        <see stepKey="seeSaveConfigurationMessageDisabled" selector="{{AdminConfigSection.advancedReportingSuccessMessage}}" userInput="You saved the configuration."/>
--        <see stepKey="seeAdvancedReportingServiceDisabled" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Disable"/>
--        <see stepKey="seeAdvancedReportingServiceStatusDisabled" selector="{{AdminConfigSection.advancedReportingServiceStatus}}" userInput="Subscription status: Disabled"/>
-+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service" stepKey="seeAdvancedReportingServiceLabelDisabled"/>
-+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Disable" stepKey="selectAdvancedReportingServiceDisabled"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton2"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess2"/>
-+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Disable" stepKey="seeAdvancedReportingServiceDisabled"/>
-+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceStatus}}" userInput="Subscription status: Disabled" stepKey="seeAdvancedReportingServiceStatusDisabled"/>
-     </test>
- </tests>
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
-index d4f30737bae..bb682c44680 100644
---- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
-+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminConfigurationIndustryTest">
-         <annotations>
-             <features value="Analytics"/>
-@@ -17,18 +17,14 @@
-             <severity value="MAJOR"/>
-             <testCaseId value="MAGETWO-63898"/>
-             <group value="analytics"/>
--            <skip>
--                <issueId value="MAGETWO-90659"/>
--            </skip>
-         </annotations>
- 
-         <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
--
--        <amOnPage stepKey="amOnAdminConfig" url="{{AdminConfigPage.url}}"/>
--        <click stepKey="clickAdvancedReportingConfigMenu" selector="{{AdminConfigSection.advancedReportingMenuItem}}"/>
--        <see stepKey="seeAdvancedReportingIndustryLabel" selector="{{AdminConfigSection.advancedReportingIndustryLabel}}" userInput="Industry"/>
--        <selectOption stepKey="selectAdvancedReportingIndustry" selector="{{AdminConfigSection.advancedReportingIndustry}}" userInput="Apps and Games"/>
--        <click stepKey="clickSaveConfigButton" selector="{{AdminConfigSection.saveButton}}"/>
--        <see stepKey="seeIndustrySuccessMessage" selector="{{AdminConfigSection.advancedReportingSuccessMessage}}" userInput="You saved the configuration."/>
-+        <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
-+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
-+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
-+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess"/>
-     </test>
- </tests>
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
-index b3ccd3afd1b..58e809ec45c 100644
---- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
-+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminConfigurationPermissionTest">
-         <annotations>
-             <features value="Analytics"/>
-@@ -17,49 +17,49 @@
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-82648"/>
-             <group value="analytics"/>
--            <skip>
--                <issueId value="MAGETWO-90659"/>
--            </skip>
-         </annotations>
-         <before>
--            <createData stepKey="noReportUserRole" entity="adminNoReportRole"/>
--            <createData stepKey="noReportUser" entity="adminNoReport"/>
-+            <createData entity="adminNoReportRole" stepKey="noReportUserRole"/>
-+            <createData entity="adminNoReport" stepKey="noReportUser"/>
-+            <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
-         </before>
-         <after>
--            <amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-         </after>
--        <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
-+        <amOnPage url="{{AdminUsersPage.url}}" stepKey="amOnAdminUsersPage"/>
-+        <fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="$$noReportUser.username$$" stepKey="fillUsernameSearch"/>
-+        <click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad time="10" stepKey="wait1"/>
-+        <see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="$$noReportUser.username$$" stepKey="seeFoundUsername"/>
-+        <click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="clickFoundUsername"/>
-+        <waitForPageLoad time="30" stepKey="wait2"/>
-+        <seeInField selector="{{AdminEditUserSection.usernameTextField}}" userInput="$$noReportUser.username$$" stepKey="seeUsernameInField"/>
-+        <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillCurrentPassword"/>
-+        <click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRoleTab"/>
- 
--        <amOnPage stepKey="amOnAdminUsersPage" url="{{AdminUsersPage.url}}"/>
--        <fillField stepKey="fillUsernameSearch" selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="$$noReportUser.username$$"/>
--        <click stepKey="clickSearchButton" selector="{{AdminUserGridSection.searchButton}}"/>
--        <waitForPageLoad stepKey="wait1" time="10"/>
--        <see stepKey="seeFoundUsername" selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="$$noReportUser.username$$"/>
--        <click stepKey="clickFoundUsername" selector="{{AdminUserGridSection.searchResultFirstRow}}"/>
--        <waitForPageLoad stepKey="wait2" time="30"/>
--        <seeInField stepKey="seeUsernameInField" selector="{{AdminEditUserSection.usernameTextField}}" userInput="$$noReportUser.username$$"/>
--        <fillField stepKey="fillCurrentPassword" selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
--        <click stepKey="clickUserRoleTab" selector="{{AdminEditUserSection.userRoleTab}}"/>
-+        <fillField selector="{{AdminEditUserSection.roleNameFilterTextField}}" userInput="$$noReportUserRole.rolename$$" stepKey="fillRoleNameSearch"/>
-+        <click selector="{{AdminEditUserSection.searchButton}}" stepKey="clickSearchButtonUserRole"/>
-+        <waitForPageLoad time="10" stepKey="wait3"/>
-+        <see selector="{{AdminEditUserSection.roleNameInFirstRow}}" userInput="$$noReportUserRole.rolename$$" stepKey="seeFoundRoleName"/>
-+        <click selector="{{AdminEditUserSection.searchResultFirstRow}}" stepKey="clickFoundRoleName"/>
-+        <click selector="{{AdminEditUserSection.saveButton}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad time="10" stepKey="wait4"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the user." stepKey="seeSuccess"/>
- 
--        <fillField stepKey="fillRoleNameSearch" selector="{{AdminEditUserSection.roleNameFilterTextField}}" userInput="$$noReportUserRole.rolename$$"/>
--        <click stepKey="clickSearchButtonUserRole" selector="{{AdminEditUserSection.searchButton}}"/>
--        <waitForPageLoad stepKey="wait3" time="10"/>
--        <see stepKey="seeFoundRoleName" selector="{{AdminEditUserSection.roleNameInFirstRow}}" userInput="$$noReportUserRole.rolename$$"/>
--        <click stepKey="clickFoundRoleName" selector="{{AdminEditUserSection.searchResultFirstRow}}"/>
--        <click stepKey="clickSaveButton" selector="{{AdminEditUserSection.saveButton}}"/>
--        <waitForPageLoad stepKey="wait4" time="10"/>
--        <see stepKey="saveUserSuccessMessage" selector="{{AdminUserGridSection.successMessage}}" userInput="You saved the user."/>
-+        <amOnPage url="{{AdminConfigPage.url}}" stepKey="amOnAdminConfig"/>
-+        <conditionalClick selector="{{AdminConfigSection.generalTab}}" dependentSelector="{{AdminConfigSection.generalTabOpened}}" visible="false" stepKey="openGeneralTabIfClosed"/>
-+        <scrollTo selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" stepKey="scrollToMenuItem"/>
-+        <!--<see stepKey="seeAdvancedReportingConfigMenuItem" selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" userInput="Advanced Reporting"/>-->
-+        <seeElementInDOM selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" stepKey="seeAdvancedReportingConfigMenuItem"/>
-+        <actionGroup ref="logout" stepKey="logoutOfAdmin2"/>
- 
--        <amOnPage stepKey="amOnAdminConfig" url="{{AdminConfigPage.url}}"/>
--        <see stepKey="seeAdvancedReportingConfigMenuItem" selector="{{AdminConfigSection.advancedReportingMenuItem}}" userInput="Advanced Reporting"/>
--        <amOnPage stepKey="amOnLogoutPage2" url="admin/admin/auth/logout/"/>
--
--        <amOnPage stepKey="amOnAdminLoginPage" url="{{AdminLoginPage.url}}"/>
--        <fillField stepKey="fillUsernameNoReport" selector="{{AdminLoginFormSection.username}}" userInput="$$noReportUser.username$$"/>
--        <fillField stepKey="fillPasswordNoReport" selector="{{AdminLoginFormSection.password}}" userInput="$$noReportUser.password$$"/>
--        <click stepKey="clickOnSignIn2" selector="{{AdminLoginFormSection.signIn}}"/>
--        <waitForPageLoad stepKey="wait5" time="10"/>
--        <amOnPage stepKey="amOnAdminConfig2" url="{{AdminConfigPage.url}}"/>
--        <dontSee stepKey="dontSeeAdvancedReportingConfigMenuItem" selector="{{AdminConfigSection.advancedReportingMenuItem}}" userInput="Advanced Reporting"/>
-+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
-+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="$$noReportUser.username$$" stepKey="fillUsernameNoReport"/>
-+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="$$noReportUser.password$$" stepKey="fillPasswordNoReport"/>
-+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickOnSignIn2"/>
-+        <waitForPageLoad time="10" stepKey="wait5"/>
-+        <amOnPage url="{{AdminConfigPage.url}}" stepKey="amOnAdminConfig2"/>
-+        <conditionalClick selector="{{AdminConfigSection.generalTab}}" dependentSelector="{{AdminConfigSection.generalTabOpened}}" visible="false" stepKey="openGeneralTabIfClosed2"/>
-+        <dontSeeElementInDOM selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" stepKey="dontSeeAdvancedReportingConfigMenuItem"/>
-     </test>
- </tests>
-diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
-index fc1ff7d18b5..58e62500b82 100644
---- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
-+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminConfigurationTimeToSendDataTest">
-         <annotations>
-             <features value="Analytics"/>
-@@ -19,17 +19,16 @@
-             <group value="analytics"/>
-         </annotations>
-         <after>
--            <amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-         </after>
-         <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
--        <amOnPage stepKey="amOnAdminConfig" url="{{AdminConfigPage.url}}"/>
--        <waitForPageLoad stepKey="waitForAdminConfig"/>
--        <click stepKey="clickAdvancedReportingConfigMenu" selector="{{AdminConfigSection.advancedReportingMenuItem}}"/>
--        <selectOption stepKey="selectAdvancedReportingIndustry" selector="{{AdminConfigSection.advancedReportingIndustry}}" userInput="Apps and Games"/>
--        <selectOption stepKey="selectAdvancedReportingHour" selector="{{AdminConfigSection.advancedReportingHour}}" userInput="11"/>
--        <selectOption stepKey="selectAdvancedReportingMinute" selector="{{AdminConfigSection.advancedReportingMinute}}" userInput="11"/>
--        <selectOption stepKey="selectAdvancedReportingSeconds" selector="{{AdminConfigSection.advancedReportingSeconds}}" userInput="00"/>
--        <click stepKey="clickSaveConfigButton" selector="{{AdminConfigSection.saveButton}}"/>
--        <see stepKey="seeBlankIndustryErrorMessage" selector="{{AdminConfigSection.advancedReportingSuccessMessage}}" userInput="You saved the configuration."/>
-+        <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
-+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
-+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
-+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingHour}}" userInput="11" stepKey="selectAdvancedReportingHour"/>
-+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingMinute}}" userInput="11" stepKey="selectAdvancedReportingMinute"/>
-+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingSeconds}}" userInput="00" stepKey="selectAdvancedReportingSeconds"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess"/>
-     </test>
- </tests>
-diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
-index 407e323aeaa..9428f8954c6 100644
---- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
-+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
-@@ -39,6 +39,15 @@ class AdditionalCommentTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(['getComment', 'getLabel'])
-             ->disableOriginalConstructor()
-             ->getMock();
-+
-+        $objectManager = new ObjectManager($this);
-+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
-+        $reflection = new \ReflectionClass($this->abstractElementMock);
-+        $reflection_property = $reflection->getProperty('_escaper');
-+        $reflection_property->setAccessible(true);
-+        $reflection_property->setValue($this->abstractElementMock, $escaper);
-+
-+        $this->abstractElementMock->setEscaper($escaper);
-         $this->contextMock = $this->getMockBuilder(Context::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
-index d567d658823..08ee3c35693 100644
---- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
-+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
-@@ -46,6 +46,14 @@ class CollectionTimeLabelTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(['getComment'])
-             ->disableOriginalConstructor()
-             ->getMock();
-+
-+        $objectManager = new ObjectManager($this);
-+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
-+        $reflection = new \ReflectionClass($this->abstractElementMock);
-+        $reflection_property = $reflection->getProperty('_escaper');
-+        $reflection_property->setAccessible(true);
-+        $reflection_property->setValue($this->abstractElementMock, $escaper);
-+
-         $this->contextMock = $this->getMockBuilder(Context::class)
-             ->setMethods(['getLocaleDate'])
-             ->disableOriginalConstructor()
-diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
-index 78ff581f3de..b43225be957 100644
---- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
-+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
-@@ -51,6 +51,14 @@ class SubscriptionStatusLabelTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(['getComment'])
-             ->disableOriginalConstructor()
-             ->getMock();
-+
-+        $objectManager = new ObjectManager($this);
-+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
-+        $reflection = new \ReflectionClass($this->abstractElementMock);
-+        $reflection_property = $reflection->getProperty('_escaper');
-+        $reflection_property->setAccessible(true);
-+        $reflection_property->setValue($this->abstractElementMock, $escaper);
-+
-         $this->formMock = $this->getMockBuilder(Form::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
-index 6a0cecc7810..0b5e86a5233 100644
---- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
-+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
-@@ -39,6 +39,14 @@ class VerticalTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(['getComment', 'getLabel', 'getHint'])
-             ->disableOriginalConstructor()
-             ->getMock();
-+
-+        $objectManager = new ObjectManager($this);
-+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
-+        $reflection = new \ReflectionClass($this->abstractElementMock);
-+        $reflection_property = $reflection->getProperty('_escaper');
-+        $reflection_property->setAccessible(true);
-+        $reflection_property->setValue($this->abstractElementMock, $escaper);
-+
-         $this->contextMock = $this->getMockBuilder(Context::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php
-index 47747027ed7..cf00556cfe5 100644
---- a/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php
-+++ b/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php
-@@ -191,7 +191,7 @@ class ExportDataHandlerTest extends \PHPUnit\Framework\TestCase
-             ->with(
-                 $archiveSource,
-                 $archiveAbsolutePath,
--                $isArchiveSourceDirectory ? true : false
-+                $isArchiveSourceDirectory
-             );
- 
-         $fileContent = 'Some text';
-@@ -222,7 +222,7 @@ class ExportDataHandlerTest extends \PHPUnit\Framework\TestCase
-     {
-         return [
-             'Data source for archive is directory' => [true],
--            'Data source for archive doesn\'t directory' => [false],
-+            'Data source for archive isn\'t directory' => [false],
-         ];
-     }
- 
-diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php
-index f314d77f32b..b08d41ac829 100644
---- a/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php
-+++ b/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php
-@@ -7,9 +7,12 @@
- namespace Magento\Analytics\Test\Unit\Model\ReportXml;
- 
- use Magento\Analytics\Model\ReportXml\ModuleIterator;
--use Magento\Framework\Module\Manager as ModuleManager;
-+use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
- 
-+/**
-+ * Module iterator test.
-+ */
- class ModuleIteratorTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/SelectBuilderTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/SelectBuilderTest.php
-index 8be2f0ee968..a4362d583df 100644
---- a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/SelectBuilderTest.php
-+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/SelectBuilderTest.php
-@@ -64,12 +64,12 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
-             ['link-type' => 'right', 'table' => 'attribute', 'condition' => 'neq'],
-         ];
-         $groups = ['id', 'name'];
--        $this->selectBuilder->setConnectionName($connectionName);
--        $this->selectBuilder->setFrom($from);
--        $this->selectBuilder->setColumns($columns);
--        $this->selectBuilder->setFilters([$filter]);
--        $this->selectBuilder->setJoins($joins);
--        $this->selectBuilder->setGroup($groups);
-+        $this->selectBuilder->setConnectionName($connectionName)
-+            ->setFrom($from)
-+            ->setColumns($columns)
-+            ->setFilters([$filter])
-+            ->setJoins($joins)
-+            ->setGroup($groups);
-         $this->resourceConnectionMock->expects($this->once())
-             ->method('getConnection')
-             ->with($connectionName)
-diff --git a/app/code/Magento/Analytics/etc/adminhtml/system.xml b/app/code/Magento/Analytics/etc/adminhtml/system.xml
-index 4e21648d00c..c7da840b7e6 100644
---- a/app/code/Magento/Analytics/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Analytics/etc/adminhtml/system.xml
-@@ -36,6 +36,9 @@
-                     <source_model>Magento\Analytics\Model\Config\Source\Vertical</source_model>
-                     <backend_model>Magento\Analytics\Model\Config\Backend\Vertical</backend_model>
-                     <frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\Vertical</frontend_model>
-+					<depends>
-+						<field id="analytics/general/enabled">1</field>
-+					</depends>
-                 </field>
-                 <field id="additional_comment" translate="label comment" type="label" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
-                     <label><![CDATA[<strong>Get more insights from Magento Business Intelligence</strong>]]></label>
-diff --git a/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml b/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml
-index a22c603b2a8..b056ffce1fa 100644
---- a/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml
-+++ b/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml
-@@ -3,7 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
- ?>
- 
- <section class="dashboard-advanced-reports" data-index="dashboard-advanced-reports">
-diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/BulkSummaryInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/BulkSummaryInterface.php
-index f5dd5bb13ea..a433ec0953a 100644
---- a/app/code/Magento/AsynchronousOperations/Api/Data/BulkSummaryInterface.php
-+++ b/app/code/Magento/AsynchronousOperations/Api/Data/BulkSummaryInterface.php
-@@ -13,6 +13,8 @@ namespace Magento\AsynchronousOperations\Api\Data;
-  */
- interface BulkSummaryInterface extends \Magento\Framework\Bulk\BulkSummaryInterface
- {
-+    const USER_TYPE = 'user_type';
-+
-     /**
-      * Retrieve existing extension attributes object.
-      *
-@@ -31,4 +33,19 @@ interface BulkSummaryInterface extends \Magento\Framework\Bulk\BulkSummaryInterf
-     public function setExtensionAttributes(
-         \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface $extensionAttributes
-     );
-+
-+    /**
-+     * Get user type
-+     *
-+     * @return int
-+     */
-+    public function getUserType();
-+
-+    /**
-+     * Set user type
-+     *
-+     * @param int $userType
-+     * @return $this
-+     */
-+    public function setUserType($userType);
- }
-diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php
-index 9e9dbd3dd67..a450187dd09 100644
---- a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php
-+++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php
-@@ -6,9 +6,9 @@
- namespace Magento\AsynchronousOperations\Controller\Adminhtml\Bulk;
- 
- /**
-- * Class View Opertion Details Controller
-+ * Class View Operation Details Controller
-  */
--class Details extends \Magento\Backend\App\Action
-+class Details extends \Magento\Backend\App\Action implements \Magento\Framework\App\Action\HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php b/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php
-index 4f086ce8ac2..faf01921e57 100644
---- a/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php
-+++ b/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\AsynchronousOperations\Model;
- 
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\App\ResourceConnection;
- use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
- use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory;
-@@ -13,6 +14,7 @@ use Magento\Framework\MessageQueue\BulkPublisherInterface;
- use Magento\Framework\EntityManager\EntityManager;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory;
-+use Magento\Authorization\Model\UserContextInterface;
- 
- /**
-  * Class BulkManagement
-@@ -51,6 +53,11 @@ class BulkManagement implements \Magento\Framework\Bulk\BulkManagementInterface
-      */
-     private $resourceConnection;
- 
-+    /**
-+     * @var \Magento\Authorization\Model\UserContextInterface
-+     */
-+    private $userContext;
-+
-     /**
-      * @var \Psr\Log\LoggerInterface
-      */
-@@ -65,6 +72,7 @@ class BulkManagement implements \Magento\Framework\Bulk\BulkManagementInterface
-      * @param MetadataPool $metadataPool
-      * @param ResourceConnection $resourceConnection
-      * @param \Psr\Log\LoggerInterface $logger
-+     * @param UserContextInterface $userContext
-      */
-     public function __construct(
-         EntityManager $entityManager,
-@@ -73,7 +81,8 @@ class BulkManagement implements \Magento\Framework\Bulk\BulkManagementInterface
-         BulkPublisherInterface $publisher,
-         MetadataPool $metadataPool,
-         ResourceConnection $resourceConnection,
--        \Psr\Log\LoggerInterface $logger
-+        \Psr\Log\LoggerInterface $logger,
-+        UserContextInterface $userContext = null
-     ) {
-         $this->entityManager = $entityManager;
-         $this->bulkSummaryFactory= $bulkSummaryFactory;
-@@ -82,6 +91,7 @@ class BulkManagement implements \Magento\Framework\Bulk\BulkManagementInterface
-         $this->resourceConnection = $resourceConnection;
-         $this->publisher = $publisher;
-         $this->logger = $logger;
-+        $this->userContext = $userContext ?: ObjectManager::getInstance()->get(UserContextInterface::class);
-     }
- 
-     /**
-@@ -93,6 +103,10 @@ class BulkManagement implements \Magento\Framework\Bulk\BulkManagementInterface
-         $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
-         // save bulk summary and related operations
-         $connection->beginTransaction();
-+        $userType = $this->userContext->getUserType();
-+        if ($userType === null) {
-+            $userType = UserContextInterface::USER_TYPE_ADMIN;
-+        }
-         try {
-             /** @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface $bulkSummary */
-             $bulkSummary = $this->bulkSummaryFactory->create();
-@@ -100,6 +114,7 @@ class BulkManagement implements \Magento\Framework\Bulk\BulkManagementInterface
-             $bulkSummary->setBulkId($bulkUuid);
-             $bulkSummary->setDescription($description);
-             $bulkSummary->setUserId($userId);
-+            $bulkSummary->setUserType($userType);
-             $bulkSummary->setOperationCount((int)$bulkSummary->getOperationCount() + count($operations));
- 
-             $this->entityManager->save($bulkSummary);
-diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkSummary.php b/app/code/Magento/AsynchronousOperations/Model/BulkSummary.php
-index e99233d0769..1d834ad10b2 100644
---- a/app/code/Magento/AsynchronousOperations/Model/BulkSummary.php
-+++ b/app/code/Magento/AsynchronousOperations/Model/BulkSummary.php
-@@ -78,6 +78,22 @@ class BulkSummary extends DataObject implements BulkSummaryInterface, \Magento\F
-         return $this->setData(self::USER_ID, $userId);
-     }
- 
-+    /**
-+     * @inheritDoc
-+     */
-+    public function getUserType()
-+    {
-+        return $this->getData(self::USER_TYPE);
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function setUserType($userType)
-+    {
-+        return $this->setData(self::USER_TYPE, $userType);
-+    }
-+
-     /**
-      * @inheritDoc
-      */
-diff --git a/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php b/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
-index 28bc8141a8e..e3ba8b06819 100644
---- a/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
-+++ b/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
-@@ -8,17 +8,11 @@ declare(strict_types=1);
- 
- namespace Magento\AsynchronousOperations\Model;
- 
--use Magento\Framework\App\ResourceConnection;
--use Psr\Log\LoggerInterface;
--use Magento\Framework\MessageQueue\MessageLockException;
--use Magento\Framework\MessageQueue\ConnectionLostException;
--use Magento\Framework\Exception\NotFoundException;
--use Magento\Framework\MessageQueue\CallbackInvoker;
-+use Magento\Framework\Registry;
-+use Magento\Framework\MessageQueue\CallbackInvokerInterface;
- use Magento\Framework\MessageQueue\ConsumerConfigurationInterface;
- use Magento\Framework\MessageQueue\EnvelopeInterface;
- use Magento\Framework\MessageQueue\QueueInterface;
--use Magento\Framework\MessageQueue\LockInterface;
--use Magento\Framework\MessageQueue\MessageController;
- use Magento\Framework\MessageQueue\ConsumerInterface;
- 
- /**
-@@ -29,68 +23,53 @@ use Magento\Framework\MessageQueue\ConsumerInterface;
- class MassConsumer implements ConsumerInterface
- {
-     /**
--     * @var \Magento\Framework\MessageQueue\CallbackInvoker
-+     * @var CallbackInvokerInterface
-      */
-     private $invoker;
- 
--    /**
--     * @var \Magento\Framework\App\ResourceConnection
--     */
--    private $resource;
--
-     /**
-      * @var \Magento\Framework\MessageQueue\ConsumerConfigurationInterface
-      */
-     private $configuration;
- 
-     /**
--     * @var \Magento\Framework\MessageQueue\MessageController
-+     * @var Registry
-      */
--    private $messageController;
-+    private $registry;
- 
-     /**
--     * @var LoggerInterface
-+     * @var MassConsumerEnvelopeCallbackFactory
-      */
--    private $logger;
--
--    /**
--     * @var OperationProcessor
--     */
--    private $operationProcessor;
-+    private $massConsumerEnvelopeCallback;
- 
-     /**
-      * Initialize dependencies.
-      *
--     * @param CallbackInvoker $invoker
--     * @param ResourceConnection $resource
--     * @param MessageController $messageController
-+     * @param CallbackInvokerInterface $invoker
-      * @param ConsumerConfigurationInterface $configuration
--     * @param OperationProcessorFactory $operationProcessorFactory
--     * @param LoggerInterface $logger
-+     * @param MassConsumerEnvelopeCallbackFactory $massConsumerEnvelopeCallback
-+     * @param Registry $registry
-      */
-     public function __construct(
--        CallbackInvoker $invoker,
--        ResourceConnection $resource,
--        MessageController $messageController,
-+        CallbackInvokerInterface $invoker,
-         ConsumerConfigurationInterface $configuration,
--        OperationProcessorFactory $operationProcessorFactory,
--        LoggerInterface $logger
-+        MassConsumerEnvelopeCallbackFactory $massConsumerEnvelopeCallback,
-+        Registry $registry = null
-     ) {
-         $this->invoker = $invoker;
--        $this->resource = $resource;
--        $this->messageController = $messageController;
-         $this->configuration = $configuration;
--        $this->operationProcessor = $operationProcessorFactory->create([
--            'configuration' => $configuration
--        ]);
--        $this->logger = $logger;
-+        $this->massConsumerEnvelopeCallback = $massConsumerEnvelopeCallback;
-+        $this->registry = $registry ?? \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(Registry::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process($maxNumberOfMessages = null)
-     {
-+        $this->registry->register('isSecureArea', true, true);
-+
-         $queue = $this->configuration->getQueue();
- 
-         if (!isset($maxNumberOfMessages)) {
-@@ -98,6 +77,8 @@ class MassConsumer implements ConsumerInterface
-         } else {
-             $this->invoker->invoke($queue, $maxNumberOfMessages, $this->getTransactionCallback($queue));
-         }
-+
-+        $this->registry->unregister('isSecureArea');
-     }
- 
-     /**
-@@ -108,38 +89,14 @@ class MassConsumer implements ConsumerInterface
-      */
-     private function getTransactionCallback(QueueInterface $queue)
-     {
--        return function (EnvelopeInterface $message) use ($queue) {
--            /** @var LockInterface $lock */
--            $lock = null;
--            try {
--                $topicName = $message->getProperties()['topic_name'];
--                $lock = $this->messageController->lock($message, $this->configuration->getConsumerName());
--
--                $allowedTopics = $this->configuration->getTopicNames();
--                if (in_array($topicName, $allowedTopics)) {
--                    $this->operationProcessor->process($message->getBody());
--                } else {
--                    $queue->reject($message);
--                    return;
--                }
--                $queue->acknowledge($message);
--            } catch (MessageLockException $exception) {
--                $queue->acknowledge($message);
--            } catch (ConnectionLostException $e) {
--                if ($lock) {
--                    $this->resource->getConnection()
--                        ->delete($this->resource->getTableName('queue_lock'), ['id = ?' => $lock->getId()]);
--                }
--            } catch (NotFoundException $e) {
--                $queue->acknowledge($message);
--                $this->logger->warning($e->getMessage());
--            } catch (\Exception $e) {
--                $queue->reject($message, false, $e->getMessage());
--                if ($lock) {
--                    $this->resource->getConnection()
--                        ->delete($this->resource->getTableName('queue_lock'), ['id = ?' => $lock->getId()]);
--                }
--            }
-+        $callbackInstance =  $this->massConsumerEnvelopeCallback->create(
-+            [
-+                'configuration' => $this->configuration,
-+                'queue' => $queue,
-+            ]
-+        );
-+        return function (EnvelopeInterface $message) use ($callbackInstance) {
-+            $callbackInstance->execute($message);
-         };
-     }
- }
-diff --git a/app/code/Magento/AsynchronousOperations/Model/MassConsumerEnvelopeCallback.php b/app/code/Magento/AsynchronousOperations/Model/MassConsumerEnvelopeCallback.php
-new file mode 100644
-index 00000000000..42437292e6f
---- /dev/null
-+++ b/app/code/Magento/AsynchronousOperations/Model/MassConsumerEnvelopeCallback.php
-@@ -0,0 +1,137 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AsynchronousOperations\Model;
-+
-+use Magento\Framework\App\ResourceConnection;
-+use Psr\Log\LoggerInterface;
-+use Magento\Framework\MessageQueue\MessageLockException;
-+use Magento\Framework\MessageQueue\ConnectionLostException;
-+use Magento\Framework\Exception\NotFoundException;
-+use Magento\Framework\MessageQueue\ConsumerConfigurationInterface;
-+use Magento\Framework\MessageQueue\EnvelopeInterface;
-+use Magento\Framework\MessageQueue\QueueInterface;
-+use Magento\Framework\MessageQueue\LockInterface;
-+use Magento\Framework\MessageQueue\MessageController;
-+
-+/**
-+ * Class used as public callback function by async consumer.
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class MassConsumerEnvelopeCallback
-+{
-+    /**
-+     * @var QueueInterface
-+     */
-+    private $queue;
-+
-+    /**
-+     * @var ResourceConnection
-+     */
-+    private $resource;
-+
-+    /**
-+     * @var ConsumerConfigurationInterface
-+     */
-+    private $configuration;
-+
-+    /**
-+     * @var MessageController
-+     */
-+    private $messageController;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var OperationProcessor
-+     */
-+    private $operationProcessor;
-+
-+    /**
-+     * @param ResourceConnection $resource
-+     * @param MessageController $messageController
-+     * @param ConsumerConfigurationInterface $configuration
-+     * @param OperationProcessorFactory $operationProcessorFactory
-+     * @param LoggerInterface $logger
-+     * @param QueueInterface $queue
-+     */
-+    public function __construct(
-+        ResourceConnection $resource,
-+        MessageController $messageController,
-+        ConsumerConfigurationInterface $configuration,
-+        OperationProcessorFactory $operationProcessorFactory,
-+        LoggerInterface $logger,
-+        QueueInterface $queue
-+    ) {
-+        $this->resource = $resource;
-+        $this->messageController = $messageController;
-+        $this->configuration = $configuration;
-+        $this->operationProcessor = $operationProcessorFactory->create(
-+            [
-+                'configuration' => $configuration
-+            ]
-+        );
-+        $this->logger = $logger;
-+        $this->queue = $queue;
-+    }
-+
-+    /**
-+     * Get transaction callback. This handles the case of async.
-+     *
-+     * @param EnvelopeInterface $message
-+     * @return void
-+     */
-+    public function execute(EnvelopeInterface $message)
-+    {
-+        $queue = $this->queue;
-+        /** @var LockInterface $lock */
-+        $lock = null;
-+        try {
-+            $topicName = $message->getProperties()['topic_name'];
-+            $lock = $this->messageController->lock($message, $this->configuration->getConsumerName());
-+
-+            $allowedTopics = $this->configuration->getTopicNames();
-+            if (in_array($topicName, $allowedTopics)) {
-+                $this->operationProcessor->process($message->getBody());
-+            } else {
-+                $queue->reject($message);
-+                return;
-+            }
-+            $queue->acknowledge($message);
-+        } catch (MessageLockException $exception) {
-+            $queue->acknowledge($message);
-+        } catch (ConnectionLostException $e) {
-+            if ($lock) {
-+                $this->resource->getConnection()
-+                    ->delete($this->resource->getTableName('queue_lock'), ['id = ?' => $lock->getId()]);
-+            }
-+        } catch (NotFoundException $e) {
-+            $queue->acknowledge($message);
-+            $this->logger->warning($e->getMessage());
-+        } catch (\Exception $e) {
-+            $queue->reject($message, false, $e->getMessage());
-+            if ($lock) {
-+                $this->resource->getConnection()
-+                    ->delete($this->resource->getTableName('queue_lock'), ['id = ?' => $lock->getId()]);
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Get message queue.
-+     *
-+     * @return QueueInterface
-+     */
-+    public function getQueue()
-+    {
-+        return $this->queue;
-+    }
-+}
-diff --git a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
-index 2d516e82f40..89d468159c6 100644
---- a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
-+++ b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
-@@ -8,6 +8,7 @@ declare(strict_types=1);
- 
- namespace Magento\AsynchronousOperations\Model;
- 
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\DataObject\IdentityGeneratorInterface;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\AsynchronousOperations\Api\Data\ItemStatusInterfaceFactory;
-@@ -18,9 +19,13 @@ use Magento\Framework\Bulk\BulkManagementInterface;
- use Magento\Framework\Exception\BulkException;
- use Psr\Log\LoggerInterface;
- use Magento\AsynchronousOperations\Model\ResourceModel\Operation\OperationRepository;
-+use Magento\Authorization\Model\UserContextInterface;
-+use Magento\Framework\Encryption\Encryptor;
- 
- /**
-  * Class MassSchedule used for adding multiple entities as Operations to Bulk Management with the status tracking
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) Suppressed without refactoring to not introduce BiC
-  */
- class MassSchedule
- {
-@@ -54,6 +59,16 @@ class MassSchedule
-      */
-     private $operationRepository;
- 
-+    /**
-+     * @var \Magento\Authorization\Model\UserContextInterface
-+     */
-+    private $userContext;
-+
-+    /**
-+     * @var Encryptor
-+     */
-+    private $encryptor;
-+
-     /**
-      * Initialize dependencies.
-      *
-@@ -63,6 +78,8 @@ class MassSchedule
-      * @param BulkManagementInterface $bulkManagement
-      * @param LoggerInterface $logger
-      * @param OperationRepository $operationRepository
-+     * @param UserContextInterface $userContext
-+     * @param Encryptor|null $encryptor
-      */
-     public function __construct(
-         IdentityGeneratorInterface $identityService,
-@@ -70,7 +87,9 @@ class MassSchedule
-         AsyncResponseInterfaceFactory $asyncResponseFactory,
-         BulkManagementInterface $bulkManagement,
-         LoggerInterface $logger,
--        OperationRepository $operationRepository
-+        OperationRepository $operationRepository,
-+        UserContextInterface $userContext = null,
-+        Encryptor $encryptor = null
-     ) {
-         $this->identityService = $identityService;
-         $this->itemStatusInterfaceFactory = $itemStatusInterfaceFactory;
-@@ -78,15 +97,17 @@ class MassSchedule
-         $this->bulkManagement = $bulkManagement;
-         $this->logger = $logger;
-         $this->operationRepository = $operationRepository;
-+        $this->userContext = $userContext ?: ObjectManager::getInstance()->get(UserContextInterface::class);
-+        $this->encryptor = $encryptor ?: ObjectManager::getInstance()->get(Encryptor::class);
-     }
- 
-     /**
-      * Schedule new bulk operation based on the list of entities
-      *
--     * @param $topicName
--     * @param $entitiesArray
--     * @param null $groupId
--     * @param null $userId
-+     * @param string $topicName
-+     * @param array $entitiesArray
-+     * @param string $groupId
-+     * @param string $userId
-      * @return AsyncResponseInterface
-      * @throws BulkException
-      * @throws LocalizedException
-@@ -95,6 +116,10 @@ class MassSchedule
-     {
-         $bulkDescription = __('Topic %1', $topicName);
- 
-+        if ($userId == null) {
-+            $userId = $this->userContext->getUserId();
-+        }
-+
-         if ($groupId == null) {
-             $groupId = $this->identityService->generateId();
- 
-@@ -114,9 +139,13 @@ class MassSchedule
-             $requestItem = $this->itemStatusInterfaceFactory->create();
- 
-             try {
--                $operations[] = $this->operationRepository->createByTopic($topicName, $entityParams, $groupId);
-+                $operation = $this->operationRepository->createByTopic($topicName, $entityParams, $groupId);
-+                $operations[] = $operation;
-                 $requestItem->setId($key);
-                 $requestItem->setStatus(ItemStatusInterface::STATUS_ACCEPTED);
-+                $requestItem->setDataHash(
-+                    $this->encryptor->hash($operation->getSerializedData(), Encryptor::HASH_VERSION_SHA256)
-+                );
-                 $requestItems[] = $requestItem;
-             } catch (\Exception $exception) {
-                 $this->logger->error($exception);
-diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php
-index 3a45c34df17..e5951fb129e 100644
---- a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php
-+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php
-@@ -108,6 +108,7 @@ class BulkManagementTest extends \PHPUnit\Framework\TestCase
-         $bulkUuid = 'bulk-001';
-         $description = 'Bulk summary description...';
-         $userId = 1;
-+        $userType = \Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN;
-         $connectionName = 'default';
-         $topicNames = ['topic.name.0', 'topic.name.1'];
-         $operation = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class)
-@@ -131,6 +132,7 @@ class BulkManagementTest extends \PHPUnit\Framework\TestCase
-         $bulkSummary->expects($this->once())->method('setBulkId')->with($bulkUuid)->willReturnSelf();
-         $bulkSummary->expects($this->once())->method('setDescription')->with($description)->willReturnSelf();
-         $bulkSummary->expects($this->once())->method('setUserId')->with($userId)->willReturnSelf();
-+        $bulkSummary->expects($this->once())->method('setUserType')->with($userType)->willReturnSelf();
-         $bulkSummary->expects($this->once())->method('getOperationCount')->willReturn(1);
-         $bulkSummary->expects($this->once())->method('setOperationCount')->with(3)->willReturnSelf();
-         $this->entityManager->expects($this->once())->method('save')->with($bulkSummary)->willReturn($bulkSummary);
-diff --git a/app/code/Magento/AsynchronousOperations/composer.json b/app/code/Magento/AsynchronousOperations/composer.json
-index 7d5a097eeea..18927b5f4ec 100644
---- a/app/code/Magento/AsynchronousOperations/composer.json
-+++ b/app/code/Magento/AsynchronousOperations/composer.json
-@@ -10,7 +10,6 @@
-         "magento/module-authorization": "*",
-         "magento/module-backend": "*",
-         "magento/module-ui": "*",
--        "magento/module-user": "*",
-         "php": "~7.1.3||~7.2.0"
-     },
-     "suggest": {
-diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema.xml b/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
-index 1b99ce9a280..5cd55408838 100644
---- a/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
-+++ b/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
-@@ -14,20 +14,22 @@
-         <column xsi:type="varbinary" name="uuid" nullable="true" length="39"
-                 comment="Bulk UUID (can be exposed to reference bulk entity)"/>
-         <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="true" identity="false"
--                comment="ID of the user that performed an action"/>
-+                comment="ID of the WebAPI user that performed an action"/>
-+        <column xsi:type="int" name="user_type" nullable="true" comment="Which type of user"/>
-         <column xsi:type="varchar" name="description" nullable="true" length="255" comment="Bulk Description"/>
-         <column xsi:type="int" name="operation_count" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Total number of operations scheduled within this bulk"/>
-         <column xsi:type="timestamp" name="start_time" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Bulk start time"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID" table="magento_bulk"
--                    column="user_id" referenceTable="admin_user" referenceColumn="user_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="MAGENTO_BULK_UUID">
-+        <constraint xsi:type="unique" referenceId="MAGENTO_BULK_UUID">
-             <column name="uuid"/>
-         </constraint>
-+        <index referenceId="MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID" indexType="btree">
-+            <column name="user_id"/>
-+        </index>
-     </table>
-     <table name="magento_operation" resource="default" engine="innodb" comment="Operation entity">
-         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
-@@ -45,12 +47,12 @@
-                 comment="Code of the error that appeared during operation execution (used to aggregate related failed operations)"/>
-         <column xsi:type="varchar" name="result_message" nullable="true" length="255"
-                 comment="Operation result message"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID" table="magento_operation"
-+        <constraint xsi:type="foreign" referenceId="MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID" table="magento_operation"
-                     column="bulk_uuid" referenceTable="magento_bulk" referenceColumn="uuid" onDelete="CASCADE"/>
--        <index name="MAGENTO_OPERATION_BULK_UUID_ERROR_CODE" indexType="btree">
-+        <index referenceId="MAGENTO_OPERATION_BULK_UUID_ERROR_CODE" indexType="btree">
-             <column name="bulk_uuid"/>
-             <column name="error_code"/>
-         </index>
-@@ -60,13 +62,13 @@
-         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
-                 comment="Internal ID"/>
-         <column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID"
-+        <constraint xsi:type="foreign" referenceId="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID"
-                     table="magento_acknowledged_bulk" column="bulk_uuid" referenceTable="magento_bulk"
-                     referenceColumn="uuid" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID">
-+        <constraint xsi:type="unique" referenceId="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID">
-             <column name="bulk_uuid"/>
-         </constraint>
-     </table>
-diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json b/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
-index d62f16ffca8..9b6c0709e19 100644
---- a/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
-+++ b/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
-@@ -4,14 +4,19 @@
-             "id": true,
-             "uuid": true,
-             "user_id": true,
-+            "user_type": true,
-             "description": true,
-             "operation_count": true,
-             "start_time": true
-         },
-+        "index": {
-+            "MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true,
-+            "MAGENTO_BULK_USER_ID": true
-+        },
-         "constraint": {
-             "PRIMARY": true,
--            "MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true,
--            "MAGENTO_BULK_UUID": true
-+            "MAGENTO_BULK_UUID": true,
-+            "MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true
-         }
-     },
-     "magento_operation": {
-diff --git a/app/code/Magento/Authorization/Model/Role.php b/app/code/Magento/Authorization/Model/Role.php
-index 2546df86d09..dcc46ee77ee 100644
---- a/app/code/Magento/Authorization/Model/Role.php
-+++ b/app/code/Magento/Authorization/Model/Role.php
-@@ -51,19 +51,29 @@ class Role extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $properties = parent::__sleep();
-         return array_diff($properties, ['_resource', '_resourceCollection']);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
-         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         $this->_resource = $objectManager->get(\Magento\Authorization\Model\ResourceModel\Role::class);
-diff --git a/app/code/Magento/Authorization/etc/db_schema.xml b/app/code/Magento/Authorization/etc/db_schema.xml
-index 45c02128bfc..a38828eb6ef 100644
---- a/app/code/Magento/Authorization/etc/db_schema.xml
-+++ b/app/code/Magento/Authorization/etc/db_schema.xml
-@@ -21,14 +21,14 @@
-                 comment="User ID"/>
-         <column xsi:type="varchar" name="user_type" nullable="true" length="16" comment="User Type"/>
-         <column xsi:type="varchar" name="role_name" nullable="true" length="50" comment="Role Name"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="role_id"/>
-         </constraint>
--        <index name="AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER" indexType="btree">
-+        <index referenceId="AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER" indexType="btree">
-             <column name="parent_id"/>
-             <column name="sort_order"/>
-         </index>
--        <index name="AUTHORIZATION_ROLE_TREE_LEVEL" indexType="btree">
-+        <index referenceId="AUTHORIZATION_ROLE_TREE_LEVEL" indexType="btree">
-             <column name="tree_level"/>
-         </index>
-     </table>
-@@ -40,17 +40,17 @@
-         <column xsi:type="varchar" name="resource_id" nullable="true" length="255" comment="Resource ID"/>
-         <column xsi:type="varchar" name="privileges" nullable="true" length="20" comment="Privileges"/>
-         <column xsi:type="varchar" name="permission" nullable="true" length="10" comment="Permission"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID"
-+        <constraint xsi:type="foreign" referenceId="AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID"
-                     table="authorization_rule" column="role_id" referenceTable="authorization_role"
-                     referenceColumn="role_id" onDelete="CASCADE"/>
--        <index name="AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID" indexType="btree">
-+        <index referenceId="AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID" indexType="btree">
-             <column name="resource_id"/>
-             <column name="role_id"/>
-         </index>
--        <index name="AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID" indexType="btree">
-+        <index referenceId="AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID" indexType="btree">
-             <column name="role_id"/>
-             <column name="resource_id"/>
-         </index>
-diff --git a/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php b/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php
-index a7a670d64d7..c693ebe95d5 100644
---- a/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php
-+++ b/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php
-@@ -3,13 +3,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Block\Adminhtml\Order\View\Info;
- 
- use Magento\Authorizenet\Model\Directpost;
- 
- /**
-+ * Fraud information block for Authorize.net payment method
-+ *
-  * @api
-  * @since 100.0.2
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class FraudDetails extends \Magento\Backend\Block\Template
- {
-@@ -33,6 +38,8 @@ class FraudDetails extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Return payment method model
-+     *
-      * @return \Magento\Sales\Model\Order\Payment
-      */
-     public function getPayment()
-@@ -42,6 +49,8 @@ class FraudDetails extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Produce and return the block's HTML output
-+     *
-      * @return string
-      */
-     protected function _toHtml()
-diff --git a/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php b/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php
-new file mode 100644
-index 00000000000..23034270640
---- /dev/null
-+++ b/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php
-@@ -0,0 +1,29 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Authorizenet\Block\Adminhtml\Order\View\Info;
-+
-+use Magento\Framework\Phrase;
-+use Magento\Payment\Block\ConfigurableInfo;
-+
-+/**
-+ * Payment information block for Authorize.net payment method
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
-+class PaymentDetails extends ConfigurableInfo
-+{
-+    /**
-+     * Returns localized label for payment info block
-+     *
-+     * @param string $field
-+     * @return string | Phrase
-+     */
-+    protected function getLabel($field)
-+    {
-+        return __($field);
-+    }
-+}
-diff --git a/app/code/Magento/Authorizenet/Block/Transparent/Iframe.php b/app/code/Magento/Authorizenet/Block/Transparent/Iframe.php
-index 296d22d6f61..65161413cb1 100644
---- a/app/code/Magento/Authorizenet/Block/Transparent/Iframe.php
-+++ b/app/code/Magento/Authorizenet/Block/Transparent/Iframe.php
-@@ -3,13 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Block\Transparent;
- 
- use Magento\Payment\Block\Transparent\Iframe as TransparentIframe;
- 
- /**
-+ * Transparent Iframe block for Authorize.net payments
-  * @api
-  * @since 100.0.2
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Iframe extends TransparentIframe
- {
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/AddConfigured.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/AddConfigured.php
-index 46d395b978e..f71314613fc 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/AddConfigured.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/AddConfigured.php
-@@ -4,8 +4,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
--class AddConfigured extends \Magento\Sales\Controller\Adminhtml\Order\Create\AddConfigured
-+use Magento\Framework\App\Action\HttpPutActionInterface;
-+use Magento\Sales\Controller\Adminhtml\Order\Create\AddConfigured as BaseAddConfigured;
-+
-+/**
-+ * Class AddConfigured
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
-+class AddConfigured extends BaseAddConfigured implements HttpPutActionInterface
- {
- }
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Cancel.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Cancel.php
-index 3432e14d77b..3ebea4704db 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Cancel.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Cancel.php
-@@ -4,8 +4,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
--class Cancel extends \Magento\Sales\Controller\Adminhtml\Order\Create\Cancel
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Sales\Controller\Adminhtml\Order\Create\Cancel as BaseCancel;
-+
-+/**
-+ * Class Cancel
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
-+class Cancel extends BaseCancel implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureProductToAdd.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureProductToAdd.php
-index 9fa3c7dd19b..19eb4571a85 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureProductToAdd.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureProductToAdd.php
-@@ -4,8 +4,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
--class ConfigureProductToAdd extends \Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureProductToAdd
-+use Magento\Framework\App\Action\HttpPutActionInterface;
-+use Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureProductToAdd as BaseConfigureProductToAdd;
-+
-+/**
-+ * Class ConfigureProductToAdd
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
-+class ConfigureProductToAdd extends BaseConfigureProductToAdd implements HttpPutActionInterface
- {
- }
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureQuoteItems.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureQuoteItems.php
-index c1ea98aea23..d314149059c 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureQuoteItems.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureQuoteItems.php
-@@ -4,8 +4,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
--class ConfigureQuoteItems extends \Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureQuoteItems
-+use Magento\Framework\App\Action\HttpPutActionInterface;
-+use Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureQuoteItems as BaseConfigureQuoteItems;
-+
-+/**
-+ * Class ConfigureQuoteItems
-+ * @deprecated 2.3 Authorize.net is removing all support for this payment method
-+ */
-+class ConfigureQuoteItems extends BaseConfigureQuoteItems implements HttpPutActionInterface
- {
- }
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Index.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Index.php
-index b206f89ab8b..33ac620499e 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Index.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Index.php
-@@ -4,8 +4,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
-+/**
-+ * Class Index
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
- class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create\Index
- {
- }
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/LoadBlock.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/LoadBlock.php
-index 43e456e7669..577840c0a9b 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/LoadBlock.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/LoadBlock.php
-@@ -4,8 +4,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
-+/**
-+ * Class LoadBlock
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
- class LoadBlock extends \Magento\Sales\Controller\Adminhtml\Order\Create\LoadBlock
- {
- }
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php
-index b393015ce12..fc4cce07bd0 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php
-@@ -3,21 +3,26 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
--use Magento\Framework\Escaper;
--use Magento\Catalog\Helper\Product;
-+use Magento\Authorizenet\Helper\Backend\Data as DataHelper;
- use Magento\Backend\App\Action\Context;
--use Magento\Framework\View\Result\PageFactory;
- use Magento\Backend\Model\View\Result\ForwardFactory;
--use Magento\Authorizenet\Helper\Backend\Data as DataHelper;
-+use Magento\Catalog\Helper\Product;
-+use Magento\Framework\Escaper;
-+use Magento\Framework\View\Result\PageFactory;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Sales\Controller\Adminhtml\Order\Create;
- 
- /**
-  * Class Place
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
--class Place extends \Magento\Sales\Controller\Adminhtml\Order\Create
-+class Place extends Create implements HttpPostActionInterface
- {
-     /**
-      * @var DataHelper
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ProcessData.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ProcessData.php
-index 35720249be3..3d0d572bd62 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ProcessData.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ProcessData.php
-@@ -4,8 +4,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
--class ProcessData extends \Magento\Sales\Controller\Adminhtml\Order\Create\ProcessData
-+use Magento\Sales\Controller\Adminhtml\Order\Create\ProcessData as BaseProcessData;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class ProcessData
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
-+class ProcessData extends BaseProcessData implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php
-index bd9de956dc6..333751f9365 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
- use Magento\Backend\App\Action;
-@@ -10,11 +12,16 @@ use Magento\Backend\Model\View\Result\ForwardFactory;
- use Magento\Framework\View\Result\LayoutFactory;
- use Magento\Framework\View\Result\PageFactory;
- use Magento\Payment\Block\Transparent\Iframe;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Sales\Controller\Adminhtml\Order\Create;
- 
- /**
-+ * Class Redirect
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
--class Redirect extends \Magento\Sales\Controller\Adminhtml\Order\Create
-+class Redirect extends Create implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * Core registry
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Reorder.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Reorder.php
-index 80b9f54524f..06a6403915f 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Reorder.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Reorder.php
-@@ -4,8 +4,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
--class Reorder extends \Magento\Sales\Controller\Adminhtml\Order\Create\Reorder
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Sales\Controller\Adminhtml\Order\Create\Reorder as BaseReorder;
-+
-+/**
-+ * Class Reorder
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
-+class Reorder extends BaseReorder implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php
-index 82a5ee08f7c..c42e7ecbeef 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php
-@@ -4,9 +4,19 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
--class ReturnQuote extends \Magento\Sales\Controller\Adminhtml\Order\Create
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Sales\Controller\Adminhtml\Order\Create;
-+
-+/**
-+ * Class ReturnQuote
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
-+class ReturnQuote extends Create implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * Return quote
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Save.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Save.php
-index 7519f3415c4..cc93ce5daed 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Save.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Save.php
-@@ -4,8 +4,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
-+/**
-+ * Class Save
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
- class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create\Save
- {
- }
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ShowUpdateResult.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ShowUpdateResult.php
-index b55da878b2e..af80bde1083 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ShowUpdateResult.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ShowUpdateResult.php
-@@ -4,8 +4,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
-+/**
-+ * Class ShowUpdateResult
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
- class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create\ShowUpdateResult
- {
- }
-diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Start.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Start.php
-index f0ac5f80c11..689b30d63be 100644
---- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Start.php
-+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Start.php
-@@ -4,8 +4,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
- 
--abstract class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Sales\Controller\Adminhtml\Order\Create;
-+
-+/**
-+ * Class Start
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
-+abstract class Start extends Create implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
-index fc9e7807cd9..cfaa5f1cfcd 100644
---- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
-+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
-@@ -3,16 +3,22 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Directpost;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Payment\Block\Transparent\Iframe;
-+use Magento\Framework\App\Action\Action;
- 
- /**
-  * DirectPost Payment Controller
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
--abstract class Payment extends \Magento\Framework\App\Action\Action
-+abstract class Payment extends Action implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * Core registry
-@@ -44,6 +50,8 @@ abstract class Payment extends \Magento\Framework\App\Action\Action
-     }
- 
-     /**
-+     * Get checkout model
-+     *
-      * @return \Magento\Checkout\Model\Session
-      */
-     protected function _getCheckout()
-@@ -63,6 +71,7 @@ abstract class Payment extends \Magento\Framework\App\Action\Action
- 
-     /**
-      * Response action.
-+     *
-      * Action for Authorize.net SIM Relay Request.
-      *
-      * @param string $area
-diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php
-index 3ad9f470909..e0610a92feb 100644
---- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php
-+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php
-@@ -4,18 +4,32 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Directpost\Payment;
- 
- use Magento\Authorizenet\Helper\DataFactory;
- use Magento\Authorizenet\Model\Directpost;
- use Magento\Authorizenet\Model\DirectpostFactory;
- use Magento\Framework\App\Action\Context;
-+use Magento\Framework\App\CsrfAwareActionInterface;
-+use Magento\Framework\App\Request\InvalidRequestException;
-+use Magento\Framework\App\RequestInterface;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Registry;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Psr\Log\LoggerInterface;
- 
--class BackendResponse extends \Magento\Authorizenet\Controller\Directpost\Payment
-+/**
-+ * Class BackendResponse
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
-+class BackendResponse extends \Magento\Authorizenet\Controller\Directpost\Payment implements
-+    CsrfAwareActionInterface,
-+    HttpGetActionInterface,
-+    HttpPostActionInterface
- {
-     /**
-      * @var LoggerInterface
-@@ -48,8 +62,26 @@ class BackendResponse extends \Magento\Authorizenet\Controller\Directpost\Paymen
-         $this->logger = $logger ?: $this->_objectManager->get(LoggerInterface::class);
-     }
- 
-+    /**
-+     * @inheritDoc
-+     */
-+    public function createCsrfValidationException(
-+        RequestInterface $request
-+    ): ?InvalidRequestException {
-+        return null;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function validateForCsrf(RequestInterface $request): ?bool
-+    {
-+        return true;
-+    }
-+
-     /**
-      * Response action.
-+     *
-      * Action for Authorize.net SIM Relay Request.
-      *
-      * @return \Magento\Framework\Controller\ResultInterface
-diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php
-index 92957481b92..7d672a75f5b 100644
---- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php
-+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php
-@@ -3,9 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Authorizenet\Controller\Directpost\Payment;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Authorizenet\Controller\Directpost\Payment;
- use Magento\Authorizenet\Helper\DataFactory;
- use Magento\Checkout\Model\Type\Onepage;
-@@ -24,8 +26,9 @@ use Psr\Log\LoggerInterface;
-  * Class Place
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
--class Place extends Payment
-+class Place extends Payment implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Quote\Api\CartManagementInterface
-diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php
-index 028b90bf7da..8c9510243f6 100644
---- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php
-+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php
-@@ -4,15 +4,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Directpost\Payment;
- 
--use Magento\Framework\App\ObjectManager;
-+use Magento\Authorizenet\Controller\Directpost\Payment;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Payment\Block\Transparent\Iframe;
- 
- /**
-  * Class Redirect
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
--class Redirect extends \Magento\Authorizenet\Controller\Directpost\Payment
-+class Redirect extends Payment implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * Retrieve params and put javascript into iframe
-diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php
-index d88e77d6c4e..17fc3cb72e4 100644
---- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php
-+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php
-@@ -4,12 +4,43 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Directpost\Payment;
- 
--class Response extends \Magento\Authorizenet\Controller\Directpost\Payment
-+use Magento\Framework\App\CsrfAwareActionInterface;
-+use Magento\Framework\App\Request\InvalidRequestException;
-+use Magento\Framework\App\RequestInterface;
-+use Magento\Authorizenet\Controller\Directpost\Payment;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class Response
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
-+class Response extends Payment implements CsrfAwareActionInterface, HttpGetActionInterface, HttpPostActionInterface
- {
-+    /**
-+     * @inheritDoc
-+     */
-+    public function createCsrfValidationException(
-+        RequestInterface $request
-+    ): ?InvalidRequestException {
-+        return null;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function validateForCsrf(RequestInterface $request): ?bool
-+    {
-+        return true;
-+    }
-+
-     /**
-      * Response action.
-+     *
-      * Action for Authorize.net SIM Relay Request.
-      *
-      * @return \Magento\Framework\Controller\ResultInterface
-diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/ReturnQuote.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/ReturnQuote.php
-index 3030a75055b..c974632f584 100644
---- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/ReturnQuote.php
-+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/ReturnQuote.php
-@@ -4,9 +4,19 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Controller\Directpost\Payment;
- 
--class ReturnQuote extends \Magento\Authorizenet\Controller\Directpost\Payment
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Authorizenet\Controller\Directpost\Payment;
-+
-+/**
-+ * Class ReturnQuote
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
-+class ReturnQuote extends Payment implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * Return customer quote by ajax
-diff --git a/app/code/Magento/Authorizenet/Helper/Backend/Data.php b/app/code/Magento/Authorizenet/Helper/Backend/Data.php
-index 24bdb238732..d291125ccae 100644
---- a/app/code/Magento/Authorizenet/Helper/Backend/Data.php
-+++ b/app/code/Magento/Authorizenet/Helper/Backend/Data.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Helper\Backend;
- 
- use Magento\Authorizenet\Helper\Data as FrontendDataHelper;
-@@ -16,6 +18,7 @@ use Magento\Backend\Model\UrlInterface;
-  *
-  * @api
-  * @since 100.0.2
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Data extends FrontendDataHelper
- {
-diff --git a/app/code/Magento/Authorizenet/Helper/Data.php b/app/code/Magento/Authorizenet/Helper/Data.php
-index 8bcc1f3f3f0..e240cd692a1 100644
---- a/app/code/Magento/Authorizenet/Helper/Data.php
-+++ b/app/code/Magento/Authorizenet/Helper/Data.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Helper;
- 
- use Magento\Framework\App\Helper\AbstractHelper;
-@@ -17,6 +19,7 @@ use Magento\Authorizenet\Model\Authorizenet;
-  *
-  * @api
-  * @since 100.0.2
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Data extends AbstractHelper
- {
-@@ -153,6 +156,7 @@ class Data extends AbstractHelper
- 
-     /**
-      * Update all child and parent order's edit increment numbers.
-+     *
-      * Needed for Admin area.
-      *
-      * @param \Magento\Sales\Model\Order $order
-@@ -255,6 +259,7 @@ class Data extends AbstractHelper
- 
-     /**
-      * Format price with currency sign
-+     *
-      * @param  \Magento\Payment\Model\InfoInterface $payment
-      * @param float $amount
-      * @return string
-diff --git a/app/code/Magento/Authorizenet/Helper/DataFactory.php b/app/code/Magento/Authorizenet/Helper/DataFactory.php
-index f3ccf16e7d3..71f16ab4af6 100644
---- a/app/code/Magento/Authorizenet/Helper/DataFactory.php
-+++ b/app/code/Magento/Authorizenet/Helper/DataFactory.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Helper;
- 
- use Magento\Framework\Exception\LocalizedException;
-@@ -10,6 +12,7 @@ use Magento\Framework\ObjectManagerInterface;
- 
- /**
-  * Class DataFactory
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class DataFactory
- {
-diff --git a/app/code/Magento/Authorizenet/Model/Authorizenet.php b/app/code/Magento/Authorizenet/Model/Authorizenet.php
-index ae9ac833a43..9370b649a23 100644
---- a/app/code/Magento/Authorizenet/Model/Authorizenet.php
-+++ b/app/code/Magento/Authorizenet/Model/Authorizenet.php
-@@ -3,15 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model;
- 
- use Magento\Authorizenet\Model\TransactionService;
- use Magento\Framework\HTTP\ZendClientFactory;
- 
- /**
-+ * Model for Authorize.net payment method
-+ *
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- abstract class Authorizenet extends \Magento\Payment\Model\Method\Cc
- {
-diff --git a/app/code/Magento/Authorizenet/Model/Debug.php b/app/code/Magento/Authorizenet/Model/Debug.php
-index 255c2e3aba4..93d508cc744 100644
---- a/app/code/Magento/Authorizenet/Model/Debug.php
-+++ b/app/code/Magento/Authorizenet/Model/Debug.php
-@@ -3,9 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model;
- 
- /**
-+ * Authorize.net debug payment method model
-+ *
-  * @method string getRequestBody()
-  * @method \Magento\Authorizenet\Model\Debug setRequestBody(string $value)
-  * @method string getResponseBody()
-@@ -18,10 +22,13 @@ namespace Magento\Authorizenet\Model;
-  * @method \Magento\Authorizenet\Model\Debug setRequestDump(string $value)
-  * @method string getResultDump()
-  * @method \Magento\Authorizenet\Model\Debug setResultDump(string $value)
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Debug extends \Magento\Framework\Model\AbstractModel
- {
-     /**
-+     * Construct debug class
-+     *
-      * @return void
-      */
-     protected function _construct()
-diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php
-index d5c11ab54cd..946ec8ba01a 100644
---- a/app/code/Magento/Authorizenet/Model/Directpost.php
-+++ b/app/code/Magento/Authorizenet/Model/Directpost.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model;
- 
- use Magento\Framework\App\ObjectManager;
-@@ -14,6 +16,7 @@ use Magento\Payment\Model\Method\TransparentInterface;
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements TransparentInterface, ConfigInterface
- {
-@@ -27,7 +30,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
-     /**
-      * @var string
-      */
--    protected $_infoBlockType = \Magento\Payment\Block\Info::class;
-+    protected $_infoBlockType = \Magento\Authorizenet\Block\Adminhtml\Order\View\Info\PaymentDetails::class;
- 
-     /**
-      * Payment Method feature
-@@ -371,8 +374,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
-     }
- 
-     /**
--     * Refund the amount
--     * Need to decode last 4 digits for request.
-+     * Refund the amount need to decode last 4 digits for request.
-      *
-      * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface $payment
-      * @param float $amount
-@@ -544,15 +546,16 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
-     public function validateResponse()
-     {
-         $response = $this->getResponse();
--        //md5 check
--        if (!$this->getConfigData('trans_md5')
--            || !$this->getConfigData('login')
--            || !$response->isValidHash($this->getConfigData('trans_md5'), $this->getConfigData('login'))
-+        $hashConfigKey = !empty($response->getData('x_SHA2_Hash')) ? 'signature_key' : 'trans_md5';
-+
-+        //hash check
-+        if (!$response->isValidHash($this->getConfigData($hashConfigKey), $this->getConfigData('login'))
-         ) {
-             throw new \Magento\Framework\Exception\LocalizedException(
-                 __('The transaction was declined because the response hash validation failed.')
-             );
-         }
-+
-         return true;
-     }
- 
-@@ -626,6 +629,14 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
-             $payment->setIsTransactionPending(true)
-                 ->setIsFraudDetected(true);
-         }
-+
-+        $additionalInformationKeys = explode(',', $this->getValue('paymentInfoKeys'));
-+        foreach ($additionalInformationKeys as $paymentInfoKey) {
-+            $paymentInfoValue = $response->getDataByKey($paymentInfoKey);
-+            if ($paymentInfoValue !== null) {
-+                $payment->setAdditionalInformation($paymentInfoKey, $paymentInfoValue);
-+            }
-+        }
-     }
- 
-     /**
-@@ -644,7 +655,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
-             case self::RESPONSE_CODE_ERROR:
-                 $errorMessage = $this->dataHelper->wrapGatewayError($this->getResponse()->getXResponseReasonText());
-                 $order = $this->getOrderFromResponse();
--                $this->paymentFailures->handle((int)$order->getQuoteId(), $errorMessage);
-+                $this->paymentFailures->handle((int)$order->getQuoteId(), (string)$errorMessage);
-                 throw new \Magento\Framework\Exception\LocalizedException($errorMessage);
-             default:
-                 throw new \Magento\Framework\Exception\LocalizedException(
-@@ -682,6 +693,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
- 
-     /**
-      * Operate with order using information from Authorize.net.
-+     *
-      * Authorize order or authorize and capture it.
-      *
-      * @param \Magento\Sales\Model\Order $order
-@@ -699,6 +711,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
-             //decline the order (in case of wrong response code) but don't return money to customer.
-             $message = $e->getMessage();
-             $this->declineOrder($order, $message, false);
-+
-             throw $e;
-         }
- 
-@@ -769,7 +782,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
-     }
- 
-     /**
--     * Add status comment
-+     * Add status comment to history
-      *
-      * @param \Magento\Sales\Model\Order\Payment $payment
-      * @return $this
-@@ -824,6 +837,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
-                       ->void($response);
-             }
-             $order->registerCancellation($message)->save();
-+            $this->_eventManager->dispatch('order_cancel_after', ['order' => $order ]);
-         } catch (\Exception $e) {
-             //quiet decline
-             $this->getPsrLogger()->critical($e);
-@@ -858,7 +872,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
-      * Getter for specified value according to set payment method code
-      *
-      * @param mixed $key
--     * @param null $storeId
-+     * @param mixed $storeId
-      * @return mixed
-      */
-     public function getValue($key, $storeId = null)
-@@ -918,10 +932,12 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
-             $payment->setIsTransactionDenied(true);
-         }
-         $this->addStatusCommentOnUpdate($payment, $response, $transactionId);
--        return [];
-+        return $response->getData();
-     }
- 
-     /**
-+     * Add status comment on update
-+     *
-      * @param \Magento\Sales\Model\Order\Payment $payment
-      * @param \Magento\Framework\DataObject $response
-      * @param string $transactionId
-@@ -996,8 +1012,9 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
-     }
- 
-     /**
--     * @return \Psr\Log\LoggerInterface
-+     * Get psr logger.
-      *
-+     * @return \Psr\Log\LoggerInterface
-      * @deprecated 100.1.0
-      */
-     private function getPsrLogger()
-@@ -1038,7 +1055,9 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
-     }
- 
-     /**
--     * Checks if filter action is Report Only. Transactions that trigger this filter are processed as normal,
-+     * Checks if filter action is Report Only.
-+     *
-+     * Transactions that trigger this filter are processed as normal,
-      * but are also reported in the Merchant Interface as triggering this filter.
-      *
-      * @param string $fdsFilterAction
-diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Request.php b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
-index d9a403e5c99..10be4cd5feb 100644
---- a/app/code/Magento/Authorizenet/Model/Directpost/Request.php
-+++ b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
-@@ -3,13 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Authorizenet\Model\Directpost;
- 
- use Magento\Authorizenet\Model\Request as AuthorizenetRequest;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Intl\DateTimeFactory;
- 
- /**
-  * Authorize.net request model for DirectPost model
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Request extends AuthorizenetRequest
- {
-@@ -18,9 +22,35 @@ class Request extends AuthorizenetRequest
-      */
-     protected $_transKey = null;
- 
-+    /**
-+     * Hexadecimal signature key.
-+     *
-+     * @var string
-+     */
-+    private $signatureKey = '';
-+
-+    /**
-+     * @var DateTimeFactory
-+     */
-+    private $dateTimeFactory;
-+
-+    /**
-+     * @param array $data
-+     * @param DateTimeFactory $dateTimeFactory
-+     */
-+    public function __construct(
-+        array $data = [],
-+        DateTimeFactory $dateTimeFactory = null
-+    ) {
-+        $this->dateTimeFactory = $dateTimeFactory ?? ObjectManager::getInstance()
-+                ->get(DateTimeFactory::class);
-+        parent::__construct($data);
-+    }
-+
-     /**
-      * Return merchant transaction key.
--     * Needed to generate sign.
-+     *
-+     * Needed to generate MD5 sign.
-      *
-      * @return string
-      */
-@@ -31,7 +61,8 @@ class Request extends AuthorizenetRequest
- 
-     /**
-      * Set merchant transaction key.
--     * Needed to generate sign.
-+     *
-+     * Needed to generate MD5 sign.
-      *
-      * @param string $transKey
-      * @return $this
-@@ -43,7 +74,7 @@ class Request extends AuthorizenetRequest
-     }
- 
-     /**
--     * Generates the fingerprint for request.
-+     * Generates the MD5 fingerprint for request.
-      *
-      * @param string $merchantApiLoginId
-      * @param string $merchantTransactionKey
-@@ -63,7 +94,7 @@ class Request extends AuthorizenetRequest
-     ) {
-         return hash_hmac(
-             "md5",
--            $merchantApiLoginId . "^" . $fpSequence . "^" . $fpTimestamp . "^" . $amount . "^" . $currencyCode,
-+            $merchantApiLoginId . '^' . $fpSequence . '^' . $fpTimestamp . '^' . $amount . '^' . $currencyCode,
-             $merchantTransactionKey
-         );
-     }
-@@ -78,7 +109,7 @@ class Request extends AuthorizenetRequest
-     {
-         $this->setXVersion('3.1')->setXDelimData('FALSE')->setXRelayResponse('TRUE');
- 
--        $this->setXTestRequest($paymentMethod->getConfigData('test') ? 'TRUE' : 'FALSE');
-+        $this->setSignatureKey($paymentMethod->getConfigData('signature_key'));
- 
-         $this->setXLogin($paymentMethod->getConfigData('login'))
-             ->setXMethod(\Magento\Authorizenet\Model\Authorizenet::REQUEST_METHOD_CC)
-@@ -112,73 +143,138 @@ class Request extends AuthorizenetRequest
-             sprintf('%.2F', $order->getBaseShippingAmount())
-         );
- 
--        //need to use strval() because NULL values IE6-8 decodes as "null" in JSON in JavaScript,
-+        //need to use (string) because NULL values IE6-8 decodes as "null" in JSON in JavaScript,
-         //but we need "" for null values.
-         $billing = $order->getBillingAddress();
-         if (!empty($billing)) {
--            $this->setXFirstName(strval($billing->getFirstname()))
--                ->setXLastName(strval($billing->getLastname()))
--                ->setXCompany(strval($billing->getCompany()))
--                ->setXAddress(strval($billing->getStreetLine(1)))
--                ->setXCity(strval($billing->getCity()))
--                ->setXState(strval($billing->getRegion()))
--                ->setXZip(strval($billing->getPostcode()))
--                ->setXCountry(strval($billing->getCountryId()))
--                ->setXPhone(strval($billing->getTelephone()))
--                ->setXFax(strval($billing->getFax()))
--                ->setXCustId(strval($billing->getCustomerId()))
--                ->setXCustomerIp(strval($order->getRemoteIp()))
--                ->setXCustomerTaxId(strval($billing->getTaxId()))
--                ->setXEmail(strval($order->getCustomerEmail()))
--                ->setXEmailCustomer(strval($paymentMethod->getConfigData('email_customer')))
--                ->setXMerchantEmail(strval($paymentMethod->getConfigData('merchant_email')));
-+            $this->setXFirstName((string)$billing->getFirstname())
-+                ->setXLastName((string)$billing->getLastname())
-+                ->setXCompany((string)$billing->getCompany())
-+                ->setXAddress((string)$billing->getStreetLine(1))
-+                ->setXCity((string)$billing->getCity())
-+                ->setXState((string)$billing->getRegion())
-+                ->setXZip((string)$billing->getPostcode())
-+                ->setXCountry((string)$billing->getCountryId())
-+                ->setXPhone((string)$billing->getTelephone())
-+                ->setXFax((string)$billing->getFax())
-+                ->setXCustId((string)$billing->getCustomerId())
-+                ->setXCustomerIp((string)$order->getRemoteIp())
-+                ->setXCustomerTaxId((string)$billing->getTaxId())
-+                ->setXEmail((string)$order->getCustomerEmail())
-+                ->setXEmailCustomer((string)$paymentMethod->getConfigData('email_customer'))
-+                ->setXMerchantEmail((string)$paymentMethod->getConfigData('merchant_email'));
-         }
- 
-         $shipping = $order->getShippingAddress();
-         if (!empty($shipping)) {
-             $this->setXShipToFirstName(
--                strval($shipping->getFirstname())
-+                (string)$shipping->getFirstname()
-             )->setXShipToLastName(
--                strval($shipping->getLastname())
-+                (string)$shipping->getLastname()
-             )->setXShipToCompany(
--                strval($shipping->getCompany())
-+                (string)$shipping->getCompany()
-             )->setXShipToAddress(
--                strval($shipping->getStreetLine(1))
-+                (string)$shipping->getStreetLine(1)
-             )->setXShipToCity(
--                strval($shipping->getCity())
-+                (string)$shipping->getCity()
-             )->setXShipToState(
--                strval($shipping->getRegion())
-+                (string)$shipping->getRegion()
-             )->setXShipToZip(
--                strval($shipping->getPostcode())
-+                (string)$shipping->getPostcode()
-             )->setXShipToCountry(
--                strval($shipping->getCountryId())
-+                (string)$shipping->getCountryId()
-             );
-         }
- 
--        $this->setXPoNum(strval($payment->getPoNumber()));
-+        $this->setXPoNum((string)$payment->getPoNumber());
- 
-         return $this;
-     }
- 
-     /**
-      * Set sign hash into the request object.
--     * All needed fields should be placed in the object fist.
-+     *
-+     * All needed fields should be placed in the object first.
-      *
-      * @return $this
-      */
-     public function signRequestData()
-     {
--        $fpTimestamp = time();
--        $hash = $this->generateRequestSign(
--            $this->getXLogin(),
--            $this->_getTransactionKey(),
--            $this->getXAmount(),
--            $this->getXCurrencyCode(),
--            $this->getXFpSequence(),
--            $fpTimestamp
--        );
-+        $fpDate = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
-+        $fpTimestamp = $fpDate->getTimestamp();
-+
-+        if (!empty($this->getSignatureKey())) {
-+            $hash = $this->generateSha2RequestSign(
-+                (string)$this->getXLogin(),
-+                (string)$this->getSignatureKey(),
-+                (string)$this->getXAmount(),
-+                (string)$this->getXCurrencyCode(),
-+                (string)$this->getXFpSequence(),
-+                $fpTimestamp
-+            );
-+        } else {
-+            $hash = $this->generateRequestSign(
-+                $this->getXLogin(),
-+                $this->_getTransactionKey(),
-+                $this->getXAmount(),
-+                $this->getXCurrencyCode(),
-+                $this->getXFpSequence(),
-+                $fpTimestamp
-+            );
-+        }
-+
-         $this->setXFpTimestamp($fpTimestamp);
-         $this->setXFpHash($hash);
-+
-         return $this;
-     }
-+
-+    /**
-+     * Generates the SHA2 fingerprint for request.
-+     *
-+     * @param string $merchantApiLoginId
-+     * @param string $merchantSignatureKey
-+     * @param string $amount
-+     * @param string $currencyCode
-+     * @param string $fpSequence An invoice number or random number.
-+     * @param int $fpTimestamp
-+     * @return string The fingerprint.
-+     */
-+    private function generateSha2RequestSign(
-+        string $merchantApiLoginId,
-+        string $merchantSignatureKey,
-+        string $amount,
-+        string $currencyCode,
-+        string $fpSequence,
-+        int $fpTimestamp
-+    ): string {
-+        $message = $merchantApiLoginId . '^' . $fpSequence . '^' . $fpTimestamp . '^' . $amount . '^' . $currencyCode;
-+
-+        return strtoupper(hash_hmac('sha512', $message, pack('H*', $merchantSignatureKey)));
-+    }
-+
-+    /**
-+     * Return merchant hexadecimal signature key.
-+     *
-+     * Needed to generate SHA2 sign.
-+     *
-+     * @return string
-+     */
-+    private function getSignatureKey(): string
-+    {
-+        return $this->signatureKey;
-+    }
-+
-+    /**
-+     * Set merchant hexadecimal signature key.
-+     *
-+     * Needed to generate SHA2 sign.
-+     *
-+     * @param string $signatureKey
-+     * @return void
-+     */
-+    private function setSignatureKey(string $signatureKey)
-+    {
-+        $this->signatureKey = $signatureKey;
-+    }
- }
-diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Request/Factory.php b/app/code/Magento/Authorizenet/Model/Directpost/Request/Factory.php
-index 2cdd02d7f84..6036935f57b 100644
---- a/app/code/Magento/Authorizenet/Model/Directpost/Request/Factory.php
-+++ b/app/code/Magento/Authorizenet/Model/Directpost/Request/Factory.php
-@@ -3,12 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model\Directpost\Request;
- 
- use Magento\Authorizenet\Model\Request\Factory as AuthorizenetRequestFactory;
- 
- /**
-  * Factory class for @see \Magento\Authorizenet\Model\Directpost\Request
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Factory extends AuthorizenetRequestFactory
- {
-diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Response.php b/app/code/Magento/Authorizenet/Model/Directpost/Response.php
-index dc62c1e990d..b5604a78cb9 100644
---- a/app/code/Magento/Authorizenet/Model/Directpost/Response.php
-+++ b/app/code/Magento/Authorizenet/Model/Directpost/Response.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model\Directpost;
- 
- use Magento\Authorizenet\Model\Response as AuthorizenetResponse;
-@@ -10,6 +12,7 @@ use Magento\Framework\Encryption\Helper\Security;
- 
- /**
-  * Authorize.net response model for DirectPost model
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Response extends AuthorizenetResponse
- {
-@@ -24,25 +27,31 @@ class Response extends AuthorizenetResponse
-      */
-     public function generateHash($merchantMd5, $merchantApiLogin, $amount, $transactionId)
-     {
--        if (!$amount) {
--            $amount = '0.00';
--        }
--
-         return strtoupper(md5($merchantMd5 . $merchantApiLogin . $transactionId . $amount));
-     }
- 
-     /**
-      * Return if is valid order id.
-      *
--     * @param string $merchantMd5
-+     * @param string $storedHash
-      * @param string $merchantApiLogin
-      * @return bool
-      */
--    public function isValidHash($merchantMd5, $merchantApiLogin)
-+    public function isValidHash($storedHash, $merchantApiLogin)
-     {
--        $hash = $this->generateHash($merchantMd5, $merchantApiLogin, $this->getXAmount(), $this->getXTransId());
-+        if (empty($this->getData('x_amount'))) {
-+            $this->setData('x_amount', '0.00');
-+        }
- 
--        return Security::compareStrings($hash, $this->getData('x_MD5_Hash'));
-+        if (!empty($this->getData('x_SHA2_Hash'))) {
-+            $hash = $this->generateSha2Hash($storedHash);
-+            return Security::compareStrings($hash, $this->getData('x_SHA2_Hash'));
-+        } elseif (!empty($this->getData('x_MD5_Hash'))) {
-+            $hash = $this->generateHash($storedHash, $merchantApiLogin, $this->getXAmount(), $this->getXTransId());
-+            return Security::compareStrings($hash, $this->getData('x_MD5_Hash'));
-+        }
-+
-+        return false;
-     }
- 
-     /**
-@@ -54,4 +63,54 @@ class Response extends AuthorizenetResponse
-     {
-         return $this->getXResponseCode() == \Magento\Authorizenet\Model\Directpost::RESPONSE_CODE_APPROVED;
-     }
-+
-+    /**
-+     * Generates an SHA2 hash to compare against AuthNet's.
-+     *
-+     * @param string $signatureKey
-+     * @return string
-+     * @see https://support.authorize.net/s/article/MD5-Hash-End-of-Life-Signature-Key-Replacement
-+     */
-+    private function generateSha2Hash(string $signatureKey): string
-+    {
-+        $hashFields = [
-+            'x_trans_id',
-+            'x_test_request',
-+            'x_response_code',
-+            'x_auth_code',
-+            'x_cvv2_resp_code',
-+            'x_cavv_response',
-+            'x_avs_code',
-+            'x_method',
-+            'x_account_number',
-+            'x_amount',
-+            'x_company',
-+            'x_first_name',
-+            'x_last_name',
-+            'x_address',
-+            'x_city',
-+            'x_state',
-+            'x_zip',
-+            'x_country',
-+            'x_phone',
-+            'x_fax',
-+            'x_email',
-+            'x_ship_to_company',
-+            'x_ship_to_first_name',
-+            'x_ship_to_last_name',
-+            'x_ship_to_address',
-+            'x_ship_to_city',
-+            'x_ship_to_state',
-+            'x_ship_to_zip',
-+            'x_ship_to_country',
-+            'x_invoice_num',
-+        ];
-+
-+        $message = '^';
-+        foreach ($hashFields as $field) {
-+            $message .= ($this->getData($field) ?? '') . '^';
-+        }
-+
-+        return strtoupper(hash_hmac('sha512', $message, pack('H*', $signatureKey)));
-+    }
- }
-diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Response/Factory.php b/app/code/Magento/Authorizenet/Model/Directpost/Response/Factory.php
-index c2a24ef386a..4fda5ac62b4 100644
---- a/app/code/Magento/Authorizenet/Model/Directpost/Response/Factory.php
-+++ b/app/code/Magento/Authorizenet/Model/Directpost/Response/Factory.php
-@@ -3,12 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model\Directpost\Response;
- 
- use Magento\Authorizenet\Model\Response\Factory as AuthorizenetResponseFactory;
- 
- /**
-  * Factory class for @see \Magento\Authorizenet\Model\Directpost\Response
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Factory extends AuthorizenetResponseFactory
- {
-diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Session.php b/app/code/Magento/Authorizenet/Model/Directpost/Session.php
-index 7ddedac1613..26c5ff0cb7e 100644
---- a/app/code/Magento/Authorizenet/Model/Directpost/Session.php
-+++ b/app/code/Magento/Authorizenet/Model/Directpost/Session.php
-@@ -3,12 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model\Directpost;
- 
- use Magento\Framework\Session\SessionManager;
- 
- /**
-  * Authorize.net DirectPost session model
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Session extends SessionManager
- {
-diff --git a/app/code/Magento/Authorizenet/Model/Request.php b/app/code/Magento/Authorizenet/Model/Request.php
-index dc52f84baec..552439fc8bb 100644
---- a/app/code/Magento/Authorizenet/Model/Request.php
-+++ b/app/code/Magento/Authorizenet/Model/Request.php
-@@ -3,12 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model;
- 
- use Magento\Framework\DataObject;
- 
- /**
-  * Request object
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Request extends DataObject
- {
-diff --git a/app/code/Magento/Authorizenet/Model/Request/Factory.php b/app/code/Magento/Authorizenet/Model/Request/Factory.php
-index e60bbd0c88e..a7a636280e2 100644
---- a/app/code/Magento/Authorizenet/Model/Request/Factory.php
-+++ b/app/code/Magento/Authorizenet/Model/Request/Factory.php
-@@ -3,10 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model\Request;
- 
- /**
-  * Factory class for @see \Magento\Authorizenet\Model\Request
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Factory
- {
-diff --git a/app/code/Magento/Authorizenet/Model/ResourceModel/Debug.php b/app/code/Magento/Authorizenet/Model/ResourceModel/Debug.php
-index ee6ec6783bb..2c21d0e2e28 100644
---- a/app/code/Magento/Authorizenet/Model/ResourceModel/Debug.php
-+++ b/app/code/Magento/Authorizenet/Model/ResourceModel/Debug.php
-@@ -3,10 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model\ResourceModel;
- 
- /**
-  * Resource Authorize.net debug model
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Debug extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- {
-diff --git a/app/code/Magento/Authorizenet/Model/ResourceModel/Debug/Collection.php b/app/code/Magento/Authorizenet/Model/ResourceModel/Debug/Collection.php
-index 095ac5a91dd..b84ee1e72a2 100644
---- a/app/code/Magento/Authorizenet/Model/ResourceModel/Debug/Collection.php
-+++ b/app/code/Magento/Authorizenet/Model/ResourceModel/Debug/Collection.php
-@@ -3,10 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model\ResourceModel\Debug;
- 
- /**
-  * Resource Authorize.net debug collection model
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
- {
-diff --git a/app/code/Magento/Authorizenet/Model/Response.php b/app/code/Magento/Authorizenet/Model/Response.php
-index 52b43c251dc..c552663a153 100644
---- a/app/code/Magento/Authorizenet/Model/Response.php
-+++ b/app/code/Magento/Authorizenet/Model/Response.php
-@@ -3,12 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model;
- 
- use Magento\Framework\DataObject;
- 
- /**
-  * Response object
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Response extends DataObject
- {
-diff --git a/app/code/Magento/Authorizenet/Model/Response/Factory.php b/app/code/Magento/Authorizenet/Model/Response/Factory.php
-index 74bf8953471..45780955660 100644
---- a/app/code/Magento/Authorizenet/Model/Response/Factory.php
-+++ b/app/code/Magento/Authorizenet/Model/Response/Factory.php
-@@ -3,10 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model\Response;
- 
- /**
-  * Factory class for @see \Magento\Authorizenet\Model\Response
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Factory
- {
-diff --git a/app/code/Magento/Authorizenet/Model/Source/Cctype.php b/app/code/Magento/Authorizenet/Model/Source/Cctype.php
-index 0a5fe8ab9b3..ffb35847224 100644
---- a/app/code/Magento/Authorizenet/Model/Source/Cctype.php
-+++ b/app/code/Magento/Authorizenet/Model/Source/Cctype.php
-@@ -3,16 +3,21 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model\Source;
- 
- use Magento\Payment\Model\Source\Cctype as PaymentCctype;
- 
- /**
-  * Authorize.net Payment CC Types Source Model
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class Cctype extends PaymentCctype
- {
-     /**
-+     * Return all supported credit card types
-+     *
-      * @return string[]
-      */
-     public function getAllowedTypes()
-diff --git a/app/code/Magento/Authorizenet/Model/Source/PaymentAction.php b/app/code/Magento/Authorizenet/Model/Source/PaymentAction.php
-index 9943e1001da..c6e57557f65 100644
---- a/app/code/Magento/Authorizenet/Model/Source/PaymentAction.php
-+++ b/app/code/Magento/Authorizenet/Model/Source/PaymentAction.php
-@@ -3,18 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Model\Source;
- 
- use Magento\Framework\Option\ArrayInterface;
- 
- /**
-- *
-  * Authorize.net Payment Action Dropdown source
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class PaymentAction implements ArrayInterface
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function toOptionArray()
-     {
-diff --git a/app/code/Magento/Authorizenet/Model/TransactionService.php b/app/code/Magento/Authorizenet/Model/TransactionService.php
-index 693a5b890fa..af0b02e94cf 100644
---- a/app/code/Magento/Authorizenet/Model/TransactionService.php
-+++ b/app/code/Magento/Authorizenet/Model/TransactionService.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Authorizenet\Model;
- 
-@@ -15,7 +16,7 @@ use Magento\Payment\Model\Method\Logger;
- 
- /**
-  * Class TransactionService
-- * @package Magento\Authorizenet\Model
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-  */
- class TransactionService
- {
-@@ -74,6 +75,7 @@ class TransactionService
- 
-     /**
-      * Get transaction information
-+     *
-      * @param \Magento\Authorizenet\Model\Authorizenet $context
-      * @param string $transactionId
-      * @return \Magento\Framework\Simplexml\Element
-@@ -142,6 +144,7 @@ class TransactionService
- 
-     /**
-      * Create request body to get transaction details
-+     *
-      * @param string $login
-      * @param string $transactionKey
-      * @param string $transactionId
-diff --git a/app/code/Magento/Authorizenet/Observer/AddFieldsToResponseObserver.php b/app/code/Magento/Authorizenet/Observer/AddFieldsToResponseObserver.php
-index 03846dddfde..bdd10437927 100644
---- a/app/code/Magento/Authorizenet/Observer/AddFieldsToResponseObserver.php
-+++ b/app/code/Magento/Authorizenet/Observer/AddFieldsToResponseObserver.php
-@@ -3,11 +3,19 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
- use Magento\Sales\Model\Order;
- 
-+/**
-+ * Class AddFieldsToResponseObserver
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
- class AddFieldsToResponseObserver implements ObserverInterface
- {
-     /**
-diff --git a/app/code/Magento/Authorizenet/Observer/SaveOrderAfterSubmitObserver.php b/app/code/Magento/Authorizenet/Observer/SaveOrderAfterSubmitObserver.php
-index 8426d004c20..45f0adfa96f 100644
---- a/app/code/Magento/Authorizenet/Observer/SaveOrderAfterSubmitObserver.php
-+++ b/app/code/Magento/Authorizenet/Observer/SaveOrderAfterSubmitObserver.php
-@@ -3,11 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
- use Magento\Sales\Model\Order;
- 
-+/**
-+ * Class SaveOrderAfterSubmitObserver
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
- class SaveOrderAfterSubmitObserver implements ObserverInterface
- {
-     /**
-diff --git a/app/code/Magento/Authorizenet/Observer/UpdateAllEditIncrementsObserver.php b/app/code/Magento/Authorizenet/Observer/UpdateAllEditIncrementsObserver.php
-index 3e62fe2278d..d6cc51eb63c 100644
---- a/app/code/Magento/Authorizenet/Observer/UpdateAllEditIncrementsObserver.php
-+++ b/app/code/Magento/Authorizenet/Observer/UpdateAllEditIncrementsObserver.php
-@@ -3,11 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Authorizenet\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
- use Magento\Sales\Model\Order;
- 
-+/**
-+ * Class UpdateAllEditIncrementsObserver
-+ * @deprecated 2.3.1 Authorize.net is removing all support for this payment method
-+ */
- class UpdateAllEditIncrementsObserver implements ObserverInterface
- {
-     /**
-diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/RequestTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/RequestTest.php
-new file mode 100644
-index 00000000000..94d8f3a0d27
---- /dev/null
-+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/RequestTest.php
-@@ -0,0 +1,80 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Authorizenet\Test\Unit\Model\Directpost;
-+
-+use Magento\Authorizenet\Model\Directpost\Request;
-+use Magento\Framework\Intl\DateTimeFactory;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+
-+class RequestTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var DateTimeFactory|MockObject
-+     */
-+    private $dateTimeFactory;
-+
-+    /**
-+     * @var Request
-+     */
-+    private $requestModel;
-+
-+    protected function setUp()
-+    {
-+        $this->dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $dateTime = new \DateTime('2016-07-05 00:00:00', new \DateTimeZone('UTC'));
-+        $this->dateTimeFactory->method('create')
-+            ->willReturn($dateTime);
-+
-+        $this->requestModel = new Request([], $this->dateTimeFactory);
-+    }
-+
-+    /**
-+     * @param string $signatureKey
-+     * @param string $expectedHash
-+     * @dataProvider signRequestDataProvider
-+     */
-+    public function testSignRequestData(string $signatureKey, string $expectedHash)
-+    {
-+        /** @var \Magento\Authorizenet\Model\Directpost $paymentMethod */
-+        $paymentMethod = $this->createMock(\Magento\Authorizenet\Model\Directpost::class);
-+        $paymentMethod->method('getConfigData')
-+            ->willReturnMap(
-+                [
-+                    ['test', null, true],
-+                    ['login', null, 'login'],
-+                    ['trans_key', null, 'trans_key'],
-+                    ['signature_key', null, $signatureKey],
-+                ]
-+            );
-+
-+        $this->requestModel->setConstantData($paymentMethod);
-+        $this->requestModel->signRequestData();
-+        $signHash = $this->requestModel->getXFpHash();
-+
-+        $this->assertEquals($expectedHash, $signHash);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function signRequestDataProvider()
-+    {
-+        return [
-+            [
-+                'signatureKey' => '3EAFCE5697C1B4B9748385C1FCD29D86F3B9B41C7EED85A3A01DFF65' .
-+                    '70C8C29373C2A153355C3313CDF4AF723C0036DBF244A0821713A910024EE85547CEF37F',
-+                'expectedHash' => '719ED94DF5CF3510CB5531E8115462C8F12CBCC8E917BD809E8D40B4FF06' .
-+                    '1E14953554403DD9813CCCE0F31B184EB4DEF558E9C0747505A0C25420372DB00BE1'
-+            ],
-+            [
-+                'signatureKey' => '',
-+                'expectedHash' => '3656211f2c41d1e4c083606f326c0460'
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
-index 15c7eecb09a..ff4aa8b5ee3 100644
---- a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
-+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
-@@ -13,53 +13,16 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @var \Magento\Authorizenet\Model\Directpost\Response
-      */
--    protected $responseModel;
-+    private $responseModel;
- 
-     protected function setUp()
-     {
-         $objectManager = new ObjectManager($this);
--        $this->responseModel = $objectManager->getObject(\Magento\Authorizenet\Model\Directpost\Response::class);
--    }
--
--    /**
--     * @param string $merchantMd5
--     * @param string $merchantApiLogin
--     * @param float|null $amount
--     * @param float|string $amountTestFunc
--     * @param string $transactionId
--     * @dataProvider generateHashDataProvider
--     */
--    public function testGenerateHash($merchantMd5, $merchantApiLogin, $amount, $amountTestFunc, $transactionId)
--    {
--        $this->assertEquals(
--            $this->generateHash($merchantMd5, $merchantApiLogin, $amountTestFunc, $transactionId),
--            $this->responseModel->generateHash($merchantMd5, $merchantApiLogin, $amount, $transactionId)
-+        $this->responseModel = $objectManager->getObject(
-+            \Magento\Authorizenet\Model\Directpost\Response::class
-         );
-     }
- 
--    /**
--     * @return array
--     */
--    public function generateHashDataProvider()
--    {
--        return [
--            [
--                'merchantMd5' => 'FCD7F001E9274FDEFB14BFF91C799306',
--                'merchantApiLogin' => 'Magento',
--                'amount' => null,
--                'amountTestFunc' => '0.00',
--                'transactionId' => '1'
--            ],
--            [
--                'merchantMd5' => '8AEF4E508261A287C3E2F544720FCA3A',
--                'merchantApiLogin' => 'Magento2',
--                'amount' => 100.50,
--                'amountTestFunc' => 100.50,
--                'transactionId' => '2'
--            ]
--        ];
--    }
--
-     /**
-      * @param $merchantMd5
-      * @param $merchantApiLogin
-@@ -73,7 +36,8 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @param string $merchantMd5
-+     * @param string $storedHash
-+     * @param string $hashKey
-      * @param string $merchantApiLogin
-      * @param float|null $amount
-      * @param string $transactionId
-@@ -81,12 +45,21 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
-      * @param bool $expectedValue
-      * @dataProvider isValidHashDataProvider
-      */
--    public function testIsValidHash($merchantMd5, $merchantApiLogin, $amount, $transactionId, $hash, $expectedValue)
--    {
-+    public function testIsValidHash(
-+        string $storedHash,
-+        string $hashKey,
-+        string $merchantApiLogin,
-+        $amount,
-+        string $transactionId,
-+        string $hash,
-+        bool $expectedValue
-+    ) {
-         $this->responseModel->setXAmount($amount);
-         $this->responseModel->setXTransId($transactionId);
--        $this->responseModel->setData('x_MD5_Hash', $hash);
--        $this->assertEquals($expectedValue, $this->responseModel->isValidHash($merchantMd5, $merchantApiLogin));
-+        $this->responseModel->setData($hashKey, $hash);
-+        $result = $this->responseModel->isValidHash($storedHash, $merchantApiLogin);
-+
-+        $this->assertEquals($expectedValue, $result);
-     }
- 
-     /**
-@@ -94,9 +67,14 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
-      */
-     public function isValidHashDataProvider()
-     {
-+        $signatureKey = '3EAFCE5697C1B4B9748385C1FCD29D86F3B9B41C7EED85A3A01DFF6570C8C' .
-+            '29373C2A153355C3313CDF4AF723C0036DBF244A0821713A910024EE85547CEF37F';
-+        $expectedSha2Hash = '368D48E0CD1274BF41C059138DA69985594021A4AD5B4C5526AE88C8F' .
-+            '7C5769B13C5E1E4358900F3E51076FB69D14B0A797904C22E8A11A52AA49CDE5FBB703C';
-         return [
-             [
-                 'merchantMd5' => 'FCD7F001E9274FDEFB14BFF91C799306',
-+                'hashKey' => 'x_MD5_Hash',
-                 'merchantApiLogin' => 'Magento',
-                 'amount' => null,
-                 'transactionId' => '1',
-@@ -105,11 +83,21 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
-             ],
-             [
-                 'merchantMd5' => '8AEF4E508261A287C3E2F544720FCA3A',
-+                'hashKey' => 'x_MD5_Hash',
-                 'merchantApiLogin' => 'Magento2',
-                 'amount' => 100.50,
-                 'transactionId' => '2',
-                 'hash' => '1F24A4EC9A169B2B2A072A5F168E16DC',
-                 'expectedValue' => false
-+            ],
-+            [
-+                'signatureKey' => $signatureKey,
-+                'hashKey' => 'x_SHA2_Hash',
-+                'merchantApiLogin' => 'Magento2',
-+                'amount' => 100.50,
-+                'transactionId' => '2',
-+                'hash' => $expectedSha2Hash,
-+                'expectedValue' => true
-             ]
-         ];
-     }
-diff --git a/app/code/Magento/Authorizenet/etc/adminhtml/system.xml b/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
-index 1319fa102d0..fc86c0d2dc6 100644
---- a/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
-@@ -9,7 +9,7 @@
-     <system>
-         <section id="payment">
-             <group id="authorizenet_directpost" translate="label" type="text" sortOrder="34" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label>Authorize.net Direct Post</label>
-+                <label>Authorize.Net Direct Post (Deprecated)</label>
-                 <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Enabled</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-@@ -29,6 +29,10 @@
-                     <label>Transaction Key</label>
-                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                 </field>
-+                <field id="signature_key" translate="label" type="obscure" sortOrder="55" showInDefault="1" showInWebsite="1" showInStore="0">
-+                    <label>Signature Key</label>
-+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-+                </field>
-                 <field id="trans_md5" translate="label" type="obscure" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
-                     <label>Merchant MD5</label>
-                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-diff --git a/app/code/Magento/Authorizenet/etc/config.xml b/app/code/Magento/Authorizenet/etc/config.xml
-index eacf77cda1e..60356460f55 100644
---- a/app/code/Magento/Authorizenet/etc/config.xml
-+++ b/app/code/Magento/Authorizenet/etc/config.xml
-@@ -19,9 +19,10 @@
-                 <order_status>processing</order_status>
-                 <payment_action>authorize</payment_action>
-                 <test>1</test>
--                <title>Credit Card Direct Post (Authorize.net)</title>
-+                <title>Credit Card Direct Post (Authorize.Net)</title>
-                 <trans_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-                 <trans_md5 backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-+                <signature_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-                 <allowspecific>0</allowspecific>
-                 <currency>USD</currency>
-                 <create_order_before>1</create_order_before>
-@@ -32,6 +33,8 @@
-                 <cgi_url>https://secure.authorize.net/gateway/transact.dll</cgi_url>
-                 <cgi_url_td_test_mode>https://apitest.authorize.net/xml/v1/request.api</cgi_url_td_test_mode>
-                 <cgi_url_td>https://api2.authorize.net/xml/v1/request.api</cgi_url_td>
-+                <paymentInfoKeys>x_card_type,x_account_number,x_avs_code,x_auth_code,x_response_reason_text,x_cvv2_resp_code</paymentInfoKeys>
-+                <group>authorizenet</group>
-             </authorizenet_directpost>
-         </payment>
-     </default>
-diff --git a/app/code/Magento/Authorizenet/etc/di.xml b/app/code/Magento/Authorizenet/etc/di.xml
-index 4beb2456be1..69d24019f2f 100644
---- a/app/code/Magento/Authorizenet/etc/di.xml
-+++ b/app/code/Magento/Authorizenet/etc/di.xml
-@@ -35,4 +35,9 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Authorizenet\Block\Adminhtml\Order\View\Info\PaymentDetails">
-+        <arguments>
-+            <argument name="config" xsi:type="object">Magento\Authorizenet\Model\Directpost</argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Authorizenet/etc/payment.xml b/app/code/Magento/Authorizenet/etc/payment.xml
-new file mode 100644
-index 00000000000..1d2cac374d8
---- /dev/null
-+++ b/app/code/Magento/Authorizenet/etc/payment.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
-+    <groups>
-+        <group id="authorizenet">
-+            <label>Authorize.Net</label>
-+        </group>
-+    </groups>
-+</payment>
-diff --git a/app/code/Magento/Authorizenet/i18n/en_US.csv b/app/code/Magento/Authorizenet/i18n/en_US.csv
-index bb59afffff2..d724bd960d3 100644
---- a/app/code/Magento/Authorizenet/i18n/en_US.csv
-+++ b/app/code/Magento/Authorizenet/i18n/en_US.csv
-@@ -45,7 +45,7 @@ void,void
- "Fraud Filters","Fraud Filters"
- "Place Order","Place Order"
- "Sorry, but something went wrong. Please contact the seller.","Sorry, but something went wrong. Please contact the seller."
--"Authorize.net Direct Post","Authorize.net Direct Post"
-+"Authorize.Net Direct Post (Deprecated)","Authorize.Net Direct Post (Deprecated)"
- Enabled,Enabled
- "Payment Action","Payment Action"
- Title,Title
-@@ -67,3 +67,9 @@ Debug,Debug
- "Minimum Order Total","Minimum Order Total"
- "Maximum Order Total","Maximum Order Total"
- "Sort Order","Sort Order"
-+"x_card_type","Credit Card Type"
-+"x_account_number", "Credit Card Number"
-+"x_avs_code","AVS Response Code"
-+"x_auth_code","Processor Authentication Code"
-+"x_response_reason_text","Processor Response Text"
-+"x_cvv2_resp_code","CVV2 Response Code"
-diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
-index 2ef93aca480..30887139894 100644
---- a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
-+++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\Authorizenet\Block\Transparent\Iframe
-  */
-@@ -15,15 +13,15 @@ $helper = $block->getHelper('adminhtml');
- <html>
-     <head>
-         <script>
--        <?php if (isset($params['redirect'])): ?>
-+        <?php if (isset($params['redirect'])) : ?>
-             window.location="<?= $block->escapeUrl($params['redirect']) ?>";
-         <?php endif; ?>
--        <?php if (isset($params['redirect_parent'])): ?>
-+        <?php if (isset($params['redirect_parent'])) : ?>
-             window.top.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
-         <?php endif; ?>
--        <?php if (isset($params['error_msg'])): ?>
-+        <?php if (isset($params['error_msg'])) : ?>
-             window.top.directPostModel.showError(<?= /* @noEscape */ json_encode((array)$params['error_msg']) ?>);
--            <?php if (isset($params['x_invoice_num'])): ?>
-+            <?php if (isset($params['x_invoice_num'])) : ?>
-                 window.top.directPostModel.successUrl="<?= $block->escapeUrl($helper->getSuccessOrderUrl($params)) ?>";
-             <?php endif; ?>
-         <?php endif; ?>
-diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
-index 95040255f13..bec87738a83 100644
---- a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
-+++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Authorizenet\Block\Transparent\Iframe $block
-  * @see \Magento\Authorizenet\Block\Transparent\Iframe
-@@ -12,7 +11,7 @@
- $code = $block->escapeHtml($block->getMethodCode());
- $method = $block->getMethod();
- $controller = $block->escapeHtml($block->getRequest()->getControllerName());
--$orderUrl = $block->escapeUrl($this->helper('Magento\Authorizenet\Helper\Backend\Data')->getPlaceOrderAdminUrl());
-+$orderUrl = $block->escapeUrl($block->getHelper('adminhtml')->getPlaceOrderAdminUrl());
- $ccType = $block->getInfoData('cc_type');
- $ccExpMonth = $block->getInfoData('cc_exp_month');
- $ccExpYear = $block->getInfoData('cc_exp_year');
-@@ -41,9 +40,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
-                         'validate-cc-type-select':'#<?= /* @noEscape */ $code ?>_cc_number'
-                         }">
-                 <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
--                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-+                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
-                     <option value="<?= $block->escapeHtml($typeCode) ?>"
--                            <?php if ($typeCode == $ccType): ?>selected="selected"<?php endif; ?>>
-+                            <?php if ($typeCode == $ccType) : ?>selected="selected"<?php endif; ?>>
-                         <?= $block->escapeHtml($typeName) ?>
-                     </option>
-                 <?php endforeach; ?>
-@@ -81,9 +80,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
-                         'required':true,
-                         'validate-cc-exp':'#<?= /* @noEscape */ $code ?>_expiration_yr'
-                         }">
--                <?php foreach ($block->getCcMonths() as $k => $v): ?>
-+                <?php foreach ($block->getCcMonths() as $k => $v) : ?>
-                     <option value="<?= $block->escapeHtml($k) ?>"
--                            <?php if ($k == $ccExpMonth): ?>selected="selected"<?php endif; ?>>
-+                            <?php if ($k == $ccExpMonth) : ?>selected="selected"<?php endif; ?>>
-                         <?= $block->escapeHtml($v) ?>
-                     </option>
-                 <?php endforeach; ?>
-@@ -93,9 +92,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
-                     class="admin__control-select admin__control-select-year"
-                     data-container="<?= /* @noEscape */ $code ?>-cc-year"
-                     data-validate="{required:true}">
--                <?php foreach ($block->getCcYears() as $k => $v): ?>
-+                <?php foreach ($block->getCcYears() as $k => $v) : ?>
-                     <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
--                            <?php if ($k == $ccExpYear): ?>selected="selected"<?php endif; ?>>
-+                            <?php if ($k == $ccExpYear) : ?>selected="selected"<?php endif; ?>>
-                         <?= $block->escapeHtml($v) ?>
-                     </option>
-                 <?php endforeach; ?>
-@@ -103,7 +102,7 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
-         </div>
-     </div>
- 
--    <?php if ($block->hasVerification()): ?>
-+    <?php if ($block->hasVerification()) : ?>
-     <div class="admin__field _required field-cvv">
-         <label class="admin__field-label"
-                for="<?= /* @noEscape */ $code ?>_cc_cid"
-diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
-index 60fec263352..15325e15de1 100644
---- a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
-+++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Authorizenet\Block\Adminhtml\Order\View\Info\FraudDetails $block
-  */
-@@ -12,41 +11,41 @@ $payment = $block->getPayment();
- $fraudDetails = $payment->getAdditionalInformation('fraud_details');
- ?>
- 
--<?php if (!empty($fraudDetails)): ?>
-+<?php if (!empty($fraudDetails)) : ?>
-     <div class="admin__page-section-item-title">
-         <span class="title"><?= $block->escapeHtml(__('Fraud Detection ')) ?></span>
-     </div>
- 
-     <div class="admin__page-section-item-content">
-         <div class="order-payment-additional">
--            <?php if(!empty($fraudDetails['fds_filter_action'])): ?>
-+            <?php if (!empty($fraudDetails['fds_filter_action'])) : ?>
-                 <?= $block->escapeHtml(__('FDS Filter Action')) ?>:
-                 <?= $block->escapeHtml($fraudDetails['fds_filter_action']) ?>
-                 </br>
-             <?php endif; ?>
- 
--            <?php if(!empty($fraudDetails['avs_response'])): ?>
-+            <?php if (!empty($fraudDetails['avs_response'])) : ?>
-                 <?= $block->escapeHtml(__('AVS Response')) ?>:
-                 <?= $block->escapeHtml($fraudDetails['avs_response']) ?>
-                 </br>
-             <?php endif; ?>
- 
--            <?php if(!empty($fraudDetails['card_code_response'])): ?>
-+            <?php if (!empty($fraudDetails['card_code_response'])) : ?>
-                 <?= $block->escapeHtml(__('Card Code Response')) ?>:
-                 <?= $block->escapeHtml($fraudDetails['card_code_response']) ?>
-                 </br>
-             <?php endif; ?>
- 
--            <?php if(!empty($fraudDetails['cavv_response']) || ($fraudDetails['cavv_response'] === 0)): ?>
-+            <?php if (!empty($fraudDetails['cavv_response']) || ($fraudDetails['cavv_response'] === 0)) : ?>
-                 <?= $block->escapeHtml(__('CAVV Response')) ?>:
-                 <?= $block->escapeHtml($fraudDetails['cavv_response']) ?>
-                 </br>
-             <?php endif; ?>
- 
--            <?php if(!empty($fraudDetails['fraud_filters'])): ?>
--                <b><?= $block->escapeHtml(__('Fraud Filters')) ?>:
--                </b></br>
--                <?php foreach($fraudDetails['fraud_filters'] as $filter): ?>
-+            <?php if (!empty($fraudDetails['fraud_filters'])) : ?>
-+                <strong><?= $block->escapeHtml(__('Fraud Filters')) ?>:
-+                </strong></br>
-+                <?php foreach ($fraudDetails['fraud_filters'] as $filter) : ?>
-                     <?= $block->escapeHtml($filter['name']) ?>:
-                     <?= $block->escapeHtml($filter['action']) ?>
-                     </br>
-diff --git a/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js b/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
-index 8edc38dce6f..8c4c90bf111 100644
---- a/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
-+++ b/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
-@@ -6,7 +6,8 @@
- var config = {
-     map: {
-         '*': {
--            transparent: 'Magento_Payment/transparent'
-+            transparent: 'Magento_Payment/js/transparent',
-+            'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
-         }
-     }
- };
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Block/Form.php b/app/code/Magento/AuthorizenetAcceptjs/Block/Form.php
-new file mode 100644
-index 00000000000..9f10b2df40e
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Block/Form.php
-@@ -0,0 +1,62 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Block;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\Backend\Model\Session\Quote;
-+use Magento\Framework\View\Element\Template\Context;
-+use Magento\Payment\Block\Form\Cc;
-+use Magento\Payment\Model\Config as PaymentConfig;
-+
-+/**
-+ * Block for representing the payment form
-+ *
-+ * @api
-+ */
-+class Form extends Cc
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var Quote
-+     */
-+    private $sessionQuote;
-+
-+    /**
-+     * @param Context $context
-+     * @param PaymentConfig $paymentConfig
-+     * @param Config $config
-+     * @param Quote $sessionQuote
-+     * @param array $data
-+     */
-+    public function __construct(
-+        Context $context,
-+        PaymentConfig $paymentConfig,
-+        Config $config,
-+        Quote $sessionQuote,
-+        array $data = []
-+    ) {
-+        parent::__construct($context, $paymentConfig, $data);
-+        $this->config = $config;
-+        $this->sessionQuote = $sessionQuote;
-+    }
-+
-+    /**
-+     * Check if cvv validation is available
-+     *
-+     * @return boolean
-+     */
-+    public function isCvvEnabled(): bool
-+    {
-+        return $this->config->isCvvEnabled($this->sessionQuote->getStoreId());
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Block/Info.php b/app/code/Magento/AuthorizenetAcceptjs/Block/Info.php
-new file mode 100644
-index 00000000000..ea476eaa557
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Block/Info.php
-@@ -0,0 +1,31 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Block;
-+
-+use Magento\Framework\Phrase;
-+use Magento\Payment\Block\ConfigurableInfo;
-+
-+/**
-+ * Translates the labels for the info block
-+ *
-+ * @api
-+ */
-+class Info extends ConfigurableInfo
-+{
-+    /**
-+     * Returns label
-+     *
-+     * @param string $field
-+     * @return Phrase
-+     */
-+    protected function getLabel($field): Phrase
-+    {
-+        return __($field);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Block/Payment.php b/app/code/Magento/AuthorizenetAcceptjs/Block/Payment.php
-new file mode 100644
-index 00000000000..059bba0c805
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Block/Payment.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Block;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Framework\View\Element\Template;
-+use Magento\Checkout\Model\ConfigProviderInterface;
-+use Magento\Framework\View\Element\Template\Context;
-+
-+/**
-+ * Represents the payment block for the admin checkout form
-+ *
-+ * @api
-+ */
-+class Payment extends Template
-+{
-+    /**
-+     * @var ConfigProviderInterface
-+     */
-+    private $config;
-+
-+    /**
-+     * @var Json
-+     */
-+    private $json;
-+
-+    /**
-+     * @param Context $context
-+     * @param ConfigProviderInterface $config
-+     * @param Json $json
-+     * @param array $data
-+     */
-+    public function __construct(
-+        Context $context,
-+        ConfigProviderInterface $config,
-+        Json $json,
-+        array $data = []
-+    ) {
-+        parent::__construct($context, $data);
-+        $this->config = $config;
-+        $this->json = $json;
-+    }
-+
-+    /**
-+     * Retrieves the config that should be used by the block
-+     *
-+     * @return string
-+     */
-+    public function getPaymentConfig(): string
-+    {
-+        $payment = $this->config->getConfig()['payment'];
-+        $config = $payment[$this->getMethodCode()];
-+        $config['code'] = $this->getMethodCode();
-+
-+        return $this->json->serialize($config);
-+    }
-+
-+    /**
-+     * Returns the method code for this payment method
-+     *
-+     * @return string
-+     */
-+    public function getMethodCode(): string
-+    {
-+        return Config::METHOD;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptPaymentStrategyCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptPaymentStrategyCommand.php
-new file mode 100644
-index 00000000000..a72435644d2
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptPaymentStrategyCommand.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Command\CommandException;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Payment\Gateway\CommandInterface;
-+
-+/**
-+ * Chooses the best method of accepting the payment based on the status of the transaction
-+ */
-+class AcceptPaymentStrategyCommand implements CommandInterface
-+{
-+    private const ACCEPT_FDS = 'accept_fds';
-+    private const NEEDS_APPROVAL_STATUSES = [
-+        'FDSPendingReview',
-+        'FDSAuthorizedPendingReview'
-+    ];
-+
-+    /**
-+     * @var CommandPoolInterface
-+     */
-+    private $commandPool;
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param CommandPoolInterface $commandPool
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(
-+        CommandPoolInterface $commandPool,
-+        SubjectReader $subjectReader
-+    ) {
-+        $this->commandPool = $commandPool;
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute(array $commandSubject): void
-+    {
-+        if ($this->shouldAcceptInGateway($commandSubject)) {
-+            $this->commandPool->get(self::ACCEPT_FDS)
-+                ->execute($commandSubject);
-+        }
-+    }
-+
-+    /**
-+     * Determines if the transaction needs to be accepted in the gateway
-+     *
-+     * @param array $commandSubject
-+     * @return bool
-+     * @throws CommandException
-+     */
-+    private function shouldAcceptInGateway(array $commandSubject): bool
-+    {
-+        $details = $this->commandPool->get('get_transaction_details')
-+            ->execute($commandSubject)
-+            ->get();
-+
-+        return in_array($details['transaction']['transactionStatus'], self::NEEDS_APPROVAL_STATUSES);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/CaptureStrategyCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/CaptureStrategyCommand.php
-new file mode 100644
-index 00000000000..a4d895d4daa
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/CaptureStrategyCommand.php
-@@ -0,0 +1,140 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Framework\Api\FilterBuilder;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Payment\Gateway\CommandInterface;
-+use Magento\Payment\Gateway\Helper\ContextHelper;
-+use Magento\Sales\Api\Data\OrderPaymentInterface;
-+use Magento\Sales\Api\Data\TransactionInterface;
-+use Magento\Sales\Api\TransactionRepositoryInterface;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+
-+/**
-+ * Chooses the best method of capture based on the context of the payment
-+ */
-+class CaptureStrategyCommand implements CommandInterface
-+{
-+    private const SALE = 'sale';
-+    private const CAPTURE = 'settle';
-+
-+    /**
-+     * @var CommandPoolInterface
-+     */
-+    private $commandPool;
-+
-+    /**
-+     * @var TransactionRepositoryInterface
-+     */
-+    private $transactionRepository;
-+
-+    /**
-+     * @var FilterBuilder
-+     */
-+    private $filterBuilder;
-+
-+    /**
-+     * @var SearchCriteriaBuilder
-+     */
-+    private $searchCriteriaBuilder;
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param CommandPoolInterface $commandPool
-+     * @param TransactionRepositoryInterface $repository
-+     * @param FilterBuilder $filterBuilder
-+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(
-+        CommandPoolInterface $commandPool,
-+        TransactionRepositoryInterface $repository,
-+        FilterBuilder $filterBuilder,
-+        SearchCriteriaBuilder $searchCriteriaBuilder,
-+        SubjectReader $subjectReader
-+    ) {
-+        $this->commandPool = $commandPool;
-+        $this->transactionRepository = $repository;
-+        $this->filterBuilder = $filterBuilder;
-+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute(array $commandSubject): void
-+    {
-+        /** @var PaymentDataObjectInterface $paymentDO */
-+        $paymentDO = $this->subjectReader->readPayment($commandSubject);
-+
-+        $command = $this->getCommand($paymentDO);
-+        $this->commandPool->get($command)
-+            ->execute($commandSubject);
-+    }
-+
-+    /**
-+     * Get execution command name.
-+     *
-+     * @param PaymentDataObjectInterface $paymentDO
-+     * @return string
-+     */
-+    private function getCommand(PaymentDataObjectInterface $paymentDO): string
-+    {
-+        $payment = $paymentDO->getPayment();
-+        ContextHelper::assertOrderPayment($payment);
-+
-+        // If auth transaction does not exist then execute authorize&capture command
-+        $captureExists = $this->captureTransactionExists($payment);
-+        if (!$payment->getAuthorizationTransaction() && !$captureExists) {
-+            return self::SALE;
-+        }
-+
-+        return self::CAPTURE;
-+    }
-+
-+    /**
-+     * Check if capture transaction already exists
-+     *
-+     * @param OrderPaymentInterface $payment
-+     * @return bool
-+     */
-+    private function captureTransactionExists(OrderPaymentInterface $payment): bool
-+    {
-+        $this->searchCriteriaBuilder->addFilters(
-+            [
-+                $this->filterBuilder
-+                    ->setField('payment_id')
-+                    ->setValue($payment->getId())
-+                    ->create(),
-+            ]
-+        );
-+
-+        $this->searchCriteriaBuilder->addFilters(
-+            [
-+                $this->filterBuilder
-+                    ->setField('txn_type')
-+                    ->setValue(TransactionInterface::TYPE_CAPTURE)
-+                    ->create(),
-+            ]
-+        );
-+
-+        $searchCriteria = $this->searchCriteriaBuilder->create();
-+        $count = $this->transactionRepository->getList($searchCriteria)
-+            ->getTotalCount();
-+
-+        return $count > 0;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommand.php
-new file mode 100644
-index 00000000000..bb9e7c26a45
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommand.php
-@@ -0,0 +1,87 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Command\CommandPool;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Payment\Gateway\CommandInterface;
-+use Magento\Payment\Gateway\Response\HandlerInterface;
-+
-+/**
-+ * Syncs the transaction status with authorize.net
-+ */
-+class FetchTransactionInfoCommand implements CommandInterface
-+{
-+    /**
-+     * @var CommandPool
-+     */
-+    private $commandPool;
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var HandlerInterface|null
-+     */
-+    private $handler;
-+
-+    /**
-+     * @param CommandPoolInterface $commandPool
-+     * @param SubjectReader $subjectReader
-+     * @param Config $config
-+     * @param HandlerInterface|null $handler
-+     */
-+    public function __construct(
-+        CommandPoolInterface $commandPool,
-+        SubjectReader $subjectReader,
-+        Config $config,
-+        HandlerInterface $handler = null
-+    ) {
-+        $this->commandPool = $commandPool;
-+        $this->subjectReader = $subjectReader;
-+        $this->config = $config;
-+        $this->handler = $handler;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute(array $commandSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($commandSubject);
-+        $order = $paymentDO->getOrder();
-+
-+        $command = $this->commandPool->get('get_transaction_details');
-+        $result = $command->execute($commandSubject);
-+        $response = $result->get();
-+
-+        if ($this->handler) {
-+            $this->handler->handle($commandSubject, $response);
-+        }
-+
-+        $additionalInformationKeys = $this->config->getTransactionInfoSyncKeys($order->getStoreId());
-+        $rawDetails = [];
-+        foreach ($additionalInformationKeys as $key) {
-+            if (isset($response['transaction'][$key])) {
-+                $rawDetails[$key] = $response['transaction'][$key];
-+            }
-+        }
-+
-+        return $rawDetails;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/GatewayQueryCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/GatewayQueryCommand.php
-new file mode 100644
-index 00000000000..f8975ef38ee
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/GatewayQueryCommand.php
-@@ -0,0 +1,100 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Exception;
-+use Magento\Payment\Gateway\Command\CommandException;
-+use Magento\Payment\Gateway\Command\ResultInterface;
-+use Magento\Payment\Gateway\CommandInterface;
-+use Magento\Payment\Gateway\Http\ClientInterface;
-+use Magento\Payment\Gateway\Http\TransferFactoryInterface;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Payment\Gateway\Validator\ValidatorInterface;
-+use Psr\Log\LoggerInterface;
-+use Magento\Payment\Gateway\Command\Result\ArrayResult;
-+
-+/**
-+ * Makes a request to the gateway and returns results
-+ */
-+class GatewayQueryCommand implements CommandInterface
-+{
-+    /**
-+     * @var BuilderInterface
-+     */
-+    private $requestBuilder;
-+
-+    /**
-+     * @var TransferFactoryInterface
-+     */
-+    private $transferFactory;
-+
-+    /**
-+     * @var ClientInterface
-+     */
-+    private $client;
-+
-+    /**
-+     * @var ValidatorInterface
-+     */
-+    private $validator;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @param BuilderInterface $requestBuilder
-+     * @param TransferFactoryInterface $transferFactory
-+     * @param ClientInterface $client
-+     * @param LoggerInterface $logger
-+     * @param ValidatorInterface $validator
-+     */
-+    public function __construct(
-+        BuilderInterface $requestBuilder,
-+        TransferFactoryInterface $transferFactory,
-+        ClientInterface $client,
-+        LoggerInterface $logger,
-+        ValidatorInterface $validator
-+    ) {
-+        $this->requestBuilder = $requestBuilder;
-+        $this->transferFactory = $transferFactory;
-+        $this->client = $client;
-+        $this->validator = $validator;
-+        $this->logger = $logger;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * @throws Exception
-+     */
-+    public function execute(array $commandSubject): ResultInterface
-+    {
-+        $transferO = $this->transferFactory->create(
-+            $this->requestBuilder->build($commandSubject)
-+        );
-+
-+        try {
-+            $response = $this->client->placeRequest($transferO);
-+        } catch (Exception $e) {
-+            $this->logger->critical($e);
-+
-+            throw new CommandException(__('There was an error while trying to process the request.'));
-+        }
-+
-+        $result = $this->validator->validate(
-+            array_merge($commandSubject, ['response' => $response])
-+        );
-+        if (!$result->isValid()) {
-+            throw new CommandException(__('There was an error while trying to process the request.'));
-+        }
-+
-+        return new ArrayResult($response);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundTransactionStrategyCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundTransactionStrategyCommand.php
-new file mode 100644
-index 00000000000..53a1f13fa87
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundTransactionStrategyCommand.php
-@@ -0,0 +1,77 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Command\CommandException;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Payment\Gateway\CommandInterface;
-+
-+/**
-+ * Chooses the best method of returning the payment based on the status of the transaction
-+ */
-+class RefundTransactionStrategyCommand implements CommandInterface
-+{
-+    private const REFUND = 'refund_settled';
-+    private const VOID = 'void';
-+
-+    /**
-+     * @var CommandPoolInterface
-+     */
-+    private $commandPool;
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param CommandPoolInterface $commandPool
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(
-+        CommandPoolInterface $commandPool,
-+        SubjectReader $subjectReader
-+    ) {
-+        $this->commandPool = $commandPool;
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute(array $commandSubject): void
-+    {
-+        $command = $this->getCommand($commandSubject);
-+
-+        $this->commandPool->get($command)
-+            ->execute($commandSubject);
-+    }
-+
-+    /**
-+     * Determines the command that should be used based on the status of the transaction
-+     *
-+     * @param array $commandSubject
-+     * @return string
-+     * @throws CommandException
-+     */
-+    private function getCommand(array $commandSubject): string
-+    {
-+        $details = $this->commandPool->get('get_transaction_details')
-+            ->execute($commandSubject)
-+            ->get();
-+
-+        if ($details['transaction']['transactionStatus'] === 'capturedPendingSettlement') {
-+            return self::VOID;
-+        } elseif ($details['transaction']['transactionStatus'] !== 'settledSuccessfully') {
-+            throw new CommandException(__('This transaction cannot be refunded with its current status.'));
-+        }
-+
-+        return self::REFUND;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Config.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Config.php
-new file mode 100644
-index 00000000000..2a28945d983
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Config.php
-@@ -0,0 +1,199 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway;
-+
-+use Magento\AuthorizenetAcceptjs\Model\Adminhtml\Source\Environment;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+/**
-+ * Houses configuration for this gateway
-+ */
-+class Config extends \Magento\Payment\Gateway\Config\Config
-+{
-+    const METHOD = 'authorizenet_acceptjs';
-+    private const KEY_LOGIN_ID = 'login';
-+    private const KEY_TRANSACTION_KEY = 'trans_key';
-+    private const KEY_ENVIRONMENT = 'environment';
-+    private const KEY_LEGACY_TRANSACTION_HASH = 'trans_md5';
-+    private const KEY_SIGNATURE_KEY = 'trans_signature_key';
-+    private const KEY_PAYMENT_ACTION = 'payment_action';
-+    private const KEY_SHOULD_EMAIL_CUSTOMER = 'email_customer';
-+    private const KEY_ADDITIONAL_INFO_KEYS = 'paymentInfoKeys';
-+    private const KEY_CLIENT_KEY = 'public_client_key';
-+    private const KEY_CVV_ENABLED = 'cvv_enabled';
-+    private const KEY_TRANSACTION_SYNC_KEYS = 'transactionSyncKeys';
-+    private const ENDPOINT_URL_SANDBOX = 'https://apitest.authorize.net/xml/v1/request.api';
-+    private const ENDPOINT_URL_PRODUCTION = 'https://api.authorize.net/xml/v1/request.api';
-+    private const SOLUTION_ID_SANDBOX = 'AAA102993';
-+    private const SOLUTION_ID_PRODUCTION = 'AAA175350';
-+
-+    /**
-+     * @param ScopeConfigInterface $scopeConfig
-+     * @param null|string $methodCode
-+     * @param string $pathPattern
-+     */
-+    public function __construct(
-+        ScopeConfigInterface $scopeConfig,
-+        $methodCode = null,
-+        $pathPattern = self::DEFAULT_PATH_PATTERN
-+    ) {
-+        parent::__construct($scopeConfig, $methodCode, $pathPattern);
-+    }
-+
-+    /**
-+     * Gets the login id
-+     *
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    public function getLoginId($storeId = null): ?string
-+    {
-+        return $this->getValue(Config::KEY_LOGIN_ID, $storeId);
-+    }
-+
-+    /**
-+     * Gets the current environment
-+     *
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    public function getEnvironment($storeId = null): string
-+    {
-+        return $this->getValue(Config::KEY_ENVIRONMENT, $storeId);
-+    }
-+
-+    /**
-+     * Gets the transaction key
-+     *
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    public function getTransactionKey($storeId = null): ?string
-+    {
-+        return $this->getValue(Config::KEY_TRANSACTION_KEY, $storeId);
-+    }
-+
-+    /**
-+     * Gets the API endpoint URL
-+     *
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    public function getApiUrl($storeId = null): string
-+    {
-+        $environment = $this->getValue(Config::KEY_ENVIRONMENT, $storeId);
-+
-+        return $environment === Environment::ENVIRONMENT_SANDBOX
-+            ? self::ENDPOINT_URL_SANDBOX
-+            : self::ENDPOINT_URL_PRODUCTION;
-+    }
-+
-+    /**
-+     * Gets the configured signature key
-+     *
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    public function getTransactionSignatureKey($storeId = null): ?string
-+    {
-+        return $this->getValue(Config::KEY_SIGNATURE_KEY, $storeId);
-+    }
-+
-+    /**
-+     * Gets the configured legacy transaction hash
-+     *
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    public function getLegacyTransactionHash($storeId = null): ?string
-+    {
-+        return $this->getValue(Config::KEY_LEGACY_TRANSACTION_HASH, $storeId);
-+    }
-+
-+    /**
-+     * Gets the configured payment action
-+     *
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    public function getPaymentAction($storeId = null): ?string
-+    {
-+        return $this->getValue(Config::KEY_PAYMENT_ACTION, $storeId);
-+    }
-+
-+    /**
-+     * Gets the configured client key
-+     *
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    public function getClientKey($storeId = null): ?string
-+    {
-+        return $this->getValue(Config::KEY_CLIENT_KEY, $storeId);
-+    }
-+
-+    /**
-+     * Should authorize.net email the customer their receipt.
-+     *
-+     * @param int|null $storeId
-+     * @return bool
-+     */
-+    public function shouldEmailCustomer($storeId = null): bool
-+    {
-+        return (bool)$this->getValue(Config::KEY_SHOULD_EMAIL_CUSTOMER, $storeId);
-+    }
-+
-+    /**
-+     * Should the cvv field be shown
-+     *
-+     * @param int|null $storeId
-+     * @return bool
-+     */
-+    public function isCvvEnabled($storeId = null): bool
-+    {
-+        return (bool)$this->getValue(Config::KEY_CVV_ENABLED, $storeId);
-+    }
-+
-+    /**
-+     * Retrieves the solution id for the given store based on environment
-+     *
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    public function getSolutionId($storeId = null): ?string
-+    {
-+        $environment = $this->getValue(Config::KEY_ENVIRONMENT, $storeId);
-+
-+        return $environment === Environment::ENVIRONMENT_SANDBOX
-+            ? self::SOLUTION_ID_SANDBOX
-+            : self::SOLUTION_ID_PRODUCTION;
-+    }
-+
-+    /**
-+     * Returns the keys to be pulled from the transaction and displayed
-+     *
-+     * @param int|null $storeId
-+     * @return string[]
-+     */
-+    public function getAdditionalInfoKeys($storeId = null): array
-+    {
-+        return explode(',', $this->getValue(Config::KEY_ADDITIONAL_INFO_KEYS, $storeId) ?? '');
-+    }
-+
-+    /**
-+     * Returns the keys to be pulled from the transaction and displayed when syncing the transaction
-+     *
-+     * @param int|null $storeId
-+     * @return string[]
-+     */
-+    public function getTransactionInfoSyncKeys($storeId = null): array
-+    {
-+        return explode(',', $this->getValue(Config::KEY_TRANSACTION_SYNC_KEYS, $storeId) ?? '');
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Client.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Client.php
-new file mode 100644
-index 00000000000..1b2efbb8572
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Client.php
-@@ -0,0 +1,126 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Http;
-+
-+use InvalidArgumentException;
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\Framework\HTTP\ZendClient;
-+use Magento\Framework\HTTP\ZendClientFactory;
-+use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Payment\Gateway\Http\ClientException;
-+use Magento\Payment\Gateway\Http\ClientInterface;
-+use Magento\Payment\Gateway\Http\TransferInterface;
-+use Magento\Payment\Model\Method\Logger as PaymentLogger;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * A client that can communicate with the Authorize.net API
-+ */
-+class Client implements ClientInterface
-+{
-+    /**
-+     * @var PaymentLogger
-+     */
-+    private $paymentLogger;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var ZendClientFactory
-+     */
-+    private $httpClientFactory;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var Json
-+     */
-+    private $json;
-+
-+    /**
-+     * @param PaymentLogger $paymentLogger
-+     * @param LoggerInterface $logger
-+     * @param ZendClientFactory $httpClientFactory
-+     * @param Config $config
-+     * @param Json $json
-+     */
-+    public function __construct(
-+        PaymentLogger $paymentLogger,
-+        LoggerInterface $logger,
-+        ZendClientFactory $httpClientFactory,
-+        Config $config,
-+        Json $json
-+    ) {
-+        $this->httpClientFactory = $httpClientFactory;
-+        $this->config = $config;
-+        $this->paymentLogger = $paymentLogger;
-+        $this->logger = $logger;
-+        $this->json = $json;
-+    }
-+
-+    /**
-+     * Places request to gateway. Returns result as ENV array
-+     *
-+     * @param TransferInterface $transferObject
-+     * @return array
-+     * @throws \Magento\Payment\Gateway\Http\ClientException
-+     */
-+    public function placeRequest(TransferInterface $transferObject)
-+    {
-+        $request = $transferObject->getBody();
-+        $log = [
-+            'request' => $request,
-+        ];
-+        $client = $this->httpClientFactory->create();
-+        $url = $this->config->getApiUrl();
-+
-+        $type = $request['payload_type'];
-+        unset($request['payload_type']);
-+        $request = [$type => $request];
-+
-+        try {
-+            $client->setUri($url);
-+            $client->setConfig(['maxredirects' => 0, 'timeout' => 30]);
-+            $client->setRawData($this->json->serialize($request), 'application/json');
-+            $client->setMethod(ZendClient::POST);
-+
-+            $responseBody = $client->request()
-+                ->getBody();
-+
-+            // Strip BOM because Authorize.net sends it in the response
-+            if ($responseBody && substr($responseBody, 0, 3) === pack('CCC', 0xef, 0xbb, 0xbf)) {
-+                $responseBody = substr($responseBody, 3);
-+            }
-+
-+            $log['response'] = $responseBody;
-+
-+            try {
-+                $data = $this->json->unserialize($responseBody);
-+            } catch (InvalidArgumentException $e) {
-+                throw new \Exception('Invalid JSON was returned by the gateway');
-+            }
-+
-+            return $data;
-+        } catch (\Exception $e) {
-+            $this->logger->critical($e);
-+
-+            throw new ClientException(
-+                __('Something went wrong in the payment gateway.')
-+            );
-+        } finally {
-+            $this->paymentLogger->debug($log);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/Filter/RemoveFieldsFilter.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/Filter/RemoveFieldsFilter.php
-new file mode 100644
-index 00000000000..a23397c0918
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/Filter/RemoveFieldsFilter.php
-@@ -0,0 +1,42 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Http\Payload\Filter;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Http\Payload\FilterInterface;
-+
-+/**
-+ * Removes a set of fields from the payload
-+ */
-+class RemoveFieldsFilter implements FilterInterface
-+{
-+    /**
-+     * @var array
-+     */
-+    private $fields;
-+
-+    /**
-+     * @param array $fields
-+     */
-+    public function __construct(array $fields)
-+    {
-+        $this->fields = $fields;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function filter(array $data): array
-+    {
-+        foreach ($this->fields as $field) {
-+            unset($data[$field]);
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/FilterInterface.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/FilterInterface.php
-new file mode 100644
-index 00000000000..35e563eacb0
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/FilterInterface.php
-@@ -0,0 +1,23 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Http\Payload;
-+
-+/**
-+ * Describes a filter for filtering content after all the builders have finished
-+ */
-+interface FilterInterface
-+{
-+    /**
-+     * Filters some data before use
-+     *
-+     * @param array $data
-+     * @return array
-+     */
-+    public function filter(array $data): array;
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/TransferFactory.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/TransferFactory.php
-new file mode 100644
-index 00000000000..a4cdeba7749
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/TransferFactory.php
-@@ -0,0 +1,58 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Http;
-+
-+use Magento\Payment\Gateway\Http\TransferBuilder;
-+use Magento\Payment\Gateway\Http\TransferFactoryInterface;
-+use Magento\Payment\Gateway\Http\TransferInterface;
-+use Magento\AuthorizenetAcceptjs\Gateway\Http\Payload\FilterInterface;
-+
-+/**
-+ * Can create a transfer object
-+ */
-+class TransferFactory implements TransferFactoryInterface
-+{
-+    /**
-+     * @var TransferBuilder
-+     */
-+    private $transferBuilder;
-+
-+    /**
-+     * @var array
-+     */
-+    private $payloadFilters;
-+
-+    /**
-+     * @param TransferBuilder $transferBuilder
-+     * @param FilterInterface[] $payloadFilters
-+     */
-+    public function __construct(
-+        TransferBuilder $transferBuilder,
-+        array $payloadFilters = []
-+    ) {
-+        $this->transferBuilder = $transferBuilder;
-+        $this->payloadFilters = $payloadFilters;
-+    }
-+
-+    /**
-+     * Builds gateway transfer object
-+     *
-+     * @param array $request
-+     * @return TransferInterface
-+     */
-+    public function create(array $request)
-+    {
-+        foreach ($this->payloadFilters as $filter) {
-+            $request = $filter->filter($request);
-+        }
-+
-+        return $this->transferBuilder
-+            ->setBody($request)
-+            ->build();
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AcceptFdsDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AcceptFdsDataBuilder.php
-new file mode 100644
-index 00000000000..6883d63397b
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AcceptFdsDataBuilder.php
-@@ -0,0 +1,65 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Adds the meta transaction information to the request
-+ */
-+class AcceptFdsDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $payment = $paymentDO->getPayment();
-+        $data = [];
-+
-+        if ($payment instanceof Payment) {
-+            $authorizationTransaction = $payment->getAuthorizationTransaction();
-+
-+            if (empty($authorizationTransaction)) {
-+                $transactionId = $payment->getLastTransId();
-+            } else {
-+                $transactionId = $authorizationTransaction->getParentTxnId();
-+
-+                if (empty($transactionId)) {
-+                    $transactionId = $authorizationTransaction->getTxnId();
-+                }
-+            }
-+
-+            $data = [
-+                'heldTransactionRequest' => [
-+                    'action' => 'approve',
-+                    'refTransId' => $transactionId,
-+                ]
-+            ];
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AddressDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AddressDataBuilder.php
-new file mode 100644
-index 00000000000..e9c42e86444
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AddressDataBuilder.php
-@@ -0,0 +1,77 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+
-+/**
-+ * Adds the basic payment information to the request
-+ */
-+class AddressDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $order = $paymentDO->getOrder();
-+        $billingAddress = $order->getBillingAddress();
-+        $shippingAddress = $order->getShippingAddress();
-+        $result = [
-+            'transactionRequest' => []
-+        ];
-+
-+        if ($billingAddress) {
-+            $result['transactionRequest']['billTo'] = [
-+                'firstName' => $billingAddress->getFirstname(),
-+                'lastName' => $billingAddress->getLastname(),
-+                'company' => $billingAddress->getCompany() ?? '',
-+                'address' => $billingAddress->getStreetLine1(),
-+                'city' => $billingAddress->getCity(),
-+                'state' => $billingAddress->getRegionCode(),
-+                'zip' => $billingAddress->getPostcode(),
-+                'country' => $billingAddress->getCountryId()
-+            ];
-+        }
-+
-+        if ($shippingAddress) {
-+            $result['transactionRequest']['shipTo'] = [
-+                'firstName' => $shippingAddress->getFirstname(),
-+                'lastName' => $shippingAddress->getLastname(),
-+                'company' => $shippingAddress->getCompany() ?? '',
-+                'address' => $shippingAddress->getStreetLine1(),
-+                'city' => $shippingAddress->getCity(),
-+                'state' => $shippingAddress->getRegionCode(),
-+                'zip' => $shippingAddress->getPostcode(),
-+                'country' => $shippingAddress->getCountryId()
-+            ];
-+        }
-+
-+        if ($order->getRemoteIp()) {
-+            $result['transactionRequest']['customerIP'] = $order->getRemoteIp();
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AmountDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AmountDataBuilder.php
-new file mode 100644
-index 00000000000..601c329fe4f
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AmountDataBuilder.php
-@@ -0,0 +1,46 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Payment\Helper\Formatter;
-+
-+/**
-+ * Adds the amount of the transaction to the Request
-+ */
-+class AmountDataBuilder implements BuilderInterface
-+{
-+    use Formatter;
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        return [
-+            'transactionRequest' => [
-+                'amount' => $this->formatPrice($this->subjectReader->readAmount($buildSubject)),
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthenticationDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthenticationDataBuilder.php
-new file mode 100644
-index 00000000000..2387ab0ab89
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthenticationDataBuilder.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+
-+/**
-+ * Adds the stored credentials to the request
-+ */
-+class AuthenticationDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     * @param Config $config
-+     */
-+    public function __construct(
-+        SubjectReader $subjectReader,
-+        Config $config
-+    ) {
-+        $this->subjectReader = $subjectReader;
-+        $this->config = $config;
-+    }
-+
-+    /**
-+     * Adds authentication information to the request
-+     *
-+     * @param array $buildSubject
-+     * @return array
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $storeId = $this->subjectReader->readStoreId($buildSubject);
-+
-+        return [
-+            'merchantAuthentication' => [
-+                'name' => $this->config->getLoginId($storeId),
-+                'transactionKey' => $this->config->getTransactionKey($storeId)
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthorizeDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthorizeDataBuilder.php
-new file mode 100644
-index 00000000000..226175f74d5
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthorizeDataBuilder.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\AuthorizenetAcceptjs\Model\PassthroughDataObject;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Adds the meta transaction information to the request
-+ */
-+class AuthorizeDataBuilder implements BuilderInterface
-+{
-+    private const REQUEST_AUTH_ONLY = 'authOnlyTransaction';
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @var PassthroughDataObject
-+     */
-+    private $passthroughData;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     * @param PassthroughDataObject $passthroughData
-+     */
-+    public function __construct(
-+        SubjectReader $subjectReader,
-+        PassthroughDataObject $passthroughData
-+    ) {
-+        $this->subjectReader = $subjectReader;
-+        $this->passthroughData = $passthroughData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $payment = $paymentDO->getPayment();
-+        $data = [];
-+
-+        if ($payment instanceof Payment) {
-+            $data = [
-+                'transactionRequest' => [
-+                    'transactionType' => self::REQUEST_AUTH_ONLY,
-+                ]
-+            ];
-+
-+            $this->passthroughData->setData(
-+                'transactionType',
-+                $data['transactionRequest']['transactionType']
-+            );
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CaptureDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CaptureDataBuilder.php
-new file mode 100644
-index 00000000000..0b17d10fb0d
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CaptureDataBuilder.php
-@@ -0,0 +1,73 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\AuthorizenetAcceptjs\Model\PassthroughDataObject;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Adds the meta transaction information to the request
-+ */
-+class CaptureDataBuilder implements BuilderInterface
-+{
-+    private const REQUEST_TYPE_PRIOR_AUTH_CAPTURE = 'priorAuthCaptureTransaction';
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @var PassthroughDataObject
-+     */
-+    private $passthroughData;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     * @param PassthroughDataObject $passthroughData
-+     */
-+    public function __construct(
-+        SubjectReader $subjectReader,
-+        PassthroughDataObject $passthroughData
-+    ) {
-+        $this->subjectReader = $subjectReader;
-+        $this->passthroughData = $passthroughData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $payment = $paymentDO->getPayment();
-+        $data = [];
-+
-+        if ($payment instanceof Payment) {
-+            $authTransaction = $payment->getAuthorizationTransaction();
-+            $refId = $authTransaction->getAdditionalInformation('real_transaction_id');
-+
-+            $data = [
-+                'transactionRequest' => [
-+                    'transactionType' => self::REQUEST_TYPE_PRIOR_AUTH_CAPTURE,
-+                    'refTransId' => $refId
-+                ]
-+            ];
-+
-+            $this->passthroughData->setData(
-+                'transactionType',
-+                $data['transactionRequest']['transactionType']
-+            );
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomSettingsBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomSettingsBuilder.php
-new file mode 100644
-index 00000000000..e5b4472c098
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomSettingsBuilder.php
-@@ -0,0 +1,62 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+
-+/**
-+ * Adds the custom settings to the request
-+ */
-+class CustomSettingsBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     * @param Config $config
-+     */
-+    public function __construct(SubjectReader $subjectReader, Config $config)
-+    {
-+        $this->subjectReader = $subjectReader;
-+        $this->config = $config;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $result = [];
-+
-+        if ($this->config->shouldEmailCustomer($this->subjectReader->readStoreId($buildSubject))) {
-+            $result['transactionRequest'] = [
-+                'transactionSettings' => [
-+                    'setting' => [
-+                        [
-+                            'settingName' => 'emailCustomer',
-+                            'settingValue' => 'true'
-+                        ]
-+                    ]
-+                ]
-+            ];
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomerDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomerDataBuilder.php
-new file mode 100644
-index 00000000000..7cd0426e93d
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomerDataBuilder.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+
-+/**
-+ * Adds the basic payment information to the request
-+ */
-+class CustomerDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $order = $paymentDO->getOrder();
-+        $billingAddress = $order->getBillingAddress();
-+        $result = [
-+            'transactionRequest' => [
-+                'customer' => [
-+                    'id' => $order->getCustomerId(),
-+                    'email' => $billingAddress->getEmail()
-+                ]
-+            ]
-+        ];
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/OrderDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/OrderDataBuilder.php
-new file mode 100644
-index 00000000000..b0e33c9ca96
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/OrderDataBuilder.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+
-+/**
-+ * Adds the basic payment information to the request
-+ */
-+class OrderDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $order = $paymentDO->getOrder();
-+
-+        return [
-+            'transactionRequest' => [
-+                'order' => [
-+                    'invoiceNumber' => $order->getOrderIncrementId()
-+                ]
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PassthroughDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PassthroughDataBuilder.php
-new file mode 100644
-index 00000000000..0301d08ad42
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PassthroughDataBuilder.php
-@@ -0,0 +1,58 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Model\PassthroughDataObject;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+
-+/**
-+ * Adds data to the request that can be used in the response
-+ */
-+class PassthroughDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var PassthroughDataObject
-+     */
-+    private $passthroughData;
-+
-+    /**
-+     * @param PassthroughDataObject $passthroughData
-+     */
-+    public function __construct(PassthroughDataObject $passthroughData)
-+    {
-+        $this->passthroughData = $passthroughData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $fields = [];
-+
-+        foreach ($this->passthroughData->getData() as $key => $value) {
-+            $fields[] = [
-+                'name' => $key,
-+                'value' => $value
-+            ];
-+        }
-+
-+        if (!empty($fields)) {
-+            return [
-+                'transactionRequest' => [
-+                    'userFields' => [
-+                        'userField' => $fields
-+                    ]
-+                ]
-+            ];
-+        }
-+
-+        return [];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PaymentDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PaymentDataBuilder.php
-new file mode 100644
-index 00000000000..1ad73f62366
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PaymentDataBuilder.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Adds the basic payment information to the request
-+ */
-+class PaymentDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $payment = $paymentDO->getPayment();
-+        $data = [];
-+
-+        if ($payment instanceof Payment) {
-+            $dataDescriptor = $payment->getAdditionalInformation('opaqueDataDescriptor');
-+            $dataValue = $payment->getAdditionalInformation('opaqueDataValue');
-+
-+            $data['transactionRequest']['payment'] = [
-+                'opaqueData' => [
-+                    'dataDescriptor' => $dataDescriptor,
-+                    'dataValue' => $dataValue
-+                ]
-+            ];
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PoDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PoDataBuilder.php
-new file mode 100644
-index 00000000000..ad8f8c2b05d
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PoDataBuilder.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Adds the basic payment information to the request
-+ */
-+class PoDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $payment = $paymentDO->getPayment();
-+        $data = [];
-+
-+        if ($payment instanceof Payment) {
-+            $data = [
-+                'transactionRequest' => [
-+                    'poNumber' => $payment->getPoNumber()
-+                ]
-+            ];
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundPaymentDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundPaymentDataBuilder.php
-new file mode 100644
-index 00000000000..96f3e67720f
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundPaymentDataBuilder.php
-@@ -0,0 +1,58 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Adds the basic refund information to the request
-+ */
-+class RefundPaymentDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     * @throws \Exception
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $payment = $paymentDO->getPayment();
-+        $data = [];
-+
-+        if ($payment instanceof Payment) {
-+            $data = [
-+                'transactionRequest' => [
-+                    'payment' => [
-+                        'creditCard' => [
-+                            'cardNumber' => $payment->getAdditionalInformation('ccLast4'),
-+                            'expirationDate' => 'XXXX'
-+                        ]
-+                    ]
-+                ]
-+            ];
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundReferenceTransactionDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundReferenceTransactionDataBuilder.php
-new file mode 100644
-index 00000000000..b8cb5f858d0
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundReferenceTransactionDataBuilder.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Adds the reference transaction to the request
-+ */
-+class RefundReferenceTransactionDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $payment = $paymentDO->getPayment();
-+        $data = [];
-+
-+        if ($payment instanceof Payment) {
-+            $transactionId = $payment->getAuthorizationTransaction()->getParentTxnId();
-+            $data = [
-+                'transactionRequest' => [
-+                    'refTransId' => $transactionId
-+                ]
-+            ];
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundTransactionTypeDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundTransactionTypeDataBuilder.php
-new file mode 100644
-index 00000000000..752be05f6b5
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundTransactionTypeDataBuilder.php
-@@ -0,0 +1,31 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+
-+/**
-+ * Adds the meta transaction information to the request
-+ */
-+class RefundTransactionTypeDataBuilder implements BuilderInterface
-+{
-+    private const REQUEST_TYPE_REFUND = 'refundTransaction';
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        return [
-+            'transactionRequest' => [
-+                'transactionType' => self::REQUEST_TYPE_REFUND
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RequestTypeBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RequestTypeBuilder.php
-new file mode 100644
-index 00000000000..16c3f9556de
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RequestTypeBuilder.php
-@@ -0,0 +1,45 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+
-+/**
-+ * Adds the type of the request to the build subject
-+ */
-+class RequestTypeBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var string
-+     */
-+    private $type;
-+
-+    /**
-+     * @param string $type
-+     */
-+    public function __construct(string $type)
-+    {
-+        $this->type = $type;
-+    }
-+
-+    /**
-+     * Adds the type of the request to the build subject
-+     *
-+     * @param array $buildSubject
-+     * @return array
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        return [
-+            'payload_type' => $this->type
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SaleDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SaleDataBuilder.php
-new file mode 100644
-index 00000000000..6ec27b10561
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SaleDataBuilder.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\AuthorizenetAcceptjs\Model\PassthroughDataObject;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Adds the meta transaction information to the request
-+ */
-+class SaleDataBuilder implements BuilderInterface
-+{
-+    private const REQUEST_AUTH_AND_CAPTURE = 'authCaptureTransaction';
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @var PassthroughDataObject
-+     */
-+    private $passthroughData;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     * @param PassthroughDataObject $passthroughData
-+     */
-+    public function __construct(
-+        SubjectReader $subjectReader,
-+        PassthroughDataObject $passthroughData
-+    ) {
-+        $this->subjectReader = $subjectReader;
-+        $this->passthroughData = $passthroughData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $payment = $paymentDO->getPayment();
-+        $data = [];
-+
-+        if ($payment instanceof Payment) {
-+            $data = [
-+                'transactionRequest' => [
-+                    'transactionType' => self::REQUEST_AUTH_AND_CAPTURE,
-+                ]
-+            ];
-+
-+            $this->passthroughData->setData(
-+                'transactionType',
-+                $data['transactionRequest']['transactionType']
-+            );
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/ShippingDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/ShippingDataBuilder.php
-new file mode 100644
-index 00000000000..390714579f0
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/ShippingDataBuilder.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Adds the shipping information to the request
-+ */
-+class ShippingDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $payment = $paymentDO->getPayment();
-+        $order = $paymentDO->getOrder();
-+        $data = [];
-+
-+        if ($payment instanceof Payment && $order instanceof Order) {
-+            $data = [
-+                'transactionRequest' => [
-+                    'shipping' => [
-+                        'amount' => $order->getBaseShippingAmount()
-+                    ]
-+                ]
-+            ];
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SolutionDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SolutionDataBuilder.php
-new file mode 100644
-index 00000000000..0c89a0116de
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SolutionDataBuilder.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+
-+/**
-+ * Adds the appropriate solution ID to the request
-+ */
-+class SolutionDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     * @param Config $config
-+     */
-+    public function __construct(SubjectReader $subjectReader, Config $config)
-+    {
-+        $this->config = $config;
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        return [
-+            'transactionRequest' => [
-+                'solution' => [
-+                    'id' => $this->config->getSolutionId($this->subjectReader->readStoreId($buildSubject)),
-+                ]
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StoreConfigBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StoreConfigBuilder.php
-new file mode 100644
-index 00000000000..f44b1e5de9a
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StoreConfigBuilder.php
-@@ -0,0 +1,43 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+
-+/**
-+ * This builder is used for correct store resolving and used only to retrieve correct store ID.
-+ */
-+class StoreConfigBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $order = $paymentDO->getOrder();
-+
-+        return [
-+            'store_id' => $order->getStoreId()
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StubDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StubDataBuilder.php
-new file mode 100644
-index 00000000000..794c120f944
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StubDataBuilder.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+
-+/**
-+ * Stub data builder.
-+ *
-+ * Since the order of params is matters for Authorize.net request,
-+ * this builder is used to reserve a place in builders sequence.
-+ */
-+class StubDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        return [];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/TransactionDetailsDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/TransactionDetailsDataBuilder.php
-new file mode 100644
-index 00000000000..e3a17e96368
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/TransactionDetailsDataBuilder.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Adds the reference transaction to the request
-+ */
-+class TransactionDetailsDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $data = [];
-+
-+        if (!empty($buildSubject['transactionId'])) {
-+            $data = [
-+                'transId' => $buildSubject['transactionId']
-+            ];
-+        } else {
-+            $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+            $payment = $paymentDO->getPayment();
-+
-+            if ($payment instanceof Payment) {
-+                $authorizationTransaction = $payment->getAuthorizationTransaction();
-+
-+                if (empty($authorizationTransaction)) {
-+                    $transactionId = $payment->getLastTransId();
-+                } else {
-+                    $transactionId = $authorizationTransaction->getParentTxnId();
-+
-+                    if (empty($transactionId)) {
-+                        $transactionId = $authorizationTransaction->getTxnId();
-+                    }
-+                }
-+
-+                $data = [
-+                    'transId' => $transactionId
-+                ];
-+            }
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/VoidDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/VoidDataBuilder.php
-new file mode 100644
-index 00000000000..ef0cb96774e
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/VoidDataBuilder.php
-@@ -0,0 +1,60 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Adds the meta transaction information to the request
-+ */
-+class VoidDataBuilder implements BuilderInterface
-+{
-+    private const REQUEST_TYPE_VOID = 'voidTransaction';
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(
-+        SubjectReader $subjectReader
-+    ) {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $payment = $paymentDO->getPayment();
-+        $transactionData = [];
-+
-+        if ($payment instanceof Payment) {
-+            $authorizationTransaction = $payment->getAuthorizationTransaction();
-+            $refId = $authorizationTransaction->getAdditionalInformation('real_transaction_id');
-+            if (empty($refId)) {
-+                $refId = $authorizationTransaction->getParentTxnId();
-+            }
-+
-+            $transactionData['transactionRequest'] = [
-+                'transactionType' => self::REQUEST_TYPE_VOID,
-+                'refTransId' => $refId
-+            ];
-+        }
-+
-+        return $transactionData;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseParentTransactionHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseParentTransactionHandler.php
-new file mode 100644
-index 00000000000..30b1ce88b08
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseParentTransactionHandler.php
-@@ -0,0 +1,45 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Response\HandlerInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Processes payment information from a void transaction response
-+ */
-+class CloseParentTransactionHandler implements HandlerInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function handle(array $handlingSubject, array $response): void
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($handlingSubject);
-+        $payment = $paymentDO->getPayment();
-+
-+        if ($payment instanceof Payment) {
-+            $payment->setShouldCloseParentTransaction(true);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandler.php
-new file mode 100644
-index 00000000000..acbde62bacd
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandler.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Response\HandlerInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Processes payment information from a void transaction response
-+ */
-+class CloseTransactionHandler implements HandlerInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @var bool
-+     */
-+    private $closeTransaction;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     * @param bool $closeTransaction
-+     */
-+    public function __construct(SubjectReader $subjectReader, bool $closeTransaction = true)
-+    {
-+        $this->subjectReader = $subjectReader;
-+        $this->closeTransaction = $closeTransaction;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function handle(array $handlingSubject, array $response): void
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($handlingSubject);
-+        $payment = $paymentDO->getPayment();
-+
-+        if ($payment instanceof Payment) {
-+            $payment->setIsTransactionClosed($this->closeTransaction);
-+            $payment->setShouldCloseParentTransaction(true);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentResponseHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentResponseHandler.php
-new file mode 100644
-index 00000000000..16e8fbabb21
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentResponseHandler.php
-@@ -0,0 +1,55 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Response\HandlerInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Processes payment information from a response
-+ */
-+class PaymentResponseHandler implements HandlerInterface
-+{
-+    private const RESPONSE_CODE_HELD = 4;
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function handle(array $handlingSubject, array $response): void
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($handlingSubject);
-+        $payment = $paymentDO->getPayment();
-+        $transactionResponse = $response['transactionResponse'];
-+
-+        if ($payment instanceof Payment) {
-+            $payment->setCcLast4($payment->getAdditionalInformation('ccLast4'));
-+            $payment->setCcAvsStatus($transactionResponse['avsResultCode']);
-+            $payment->setIsTransactionClosed(false);
-+
-+            if ($transactionResponse['responseCode'] == self::RESPONSE_CODE_HELD) {
-+                $payment->setIsTransactionPending(true)
-+                    ->setIsFraudDetected(true);
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentReviewStatusHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentReviewStatusHandler.php
-new file mode 100644
-index 00000000000..9f7c6287366
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentReviewStatusHandler.php
-@@ -0,0 +1,63 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Response\HandlerInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Processes payment information from a void transaction response
-+ */
-+class PaymentReviewStatusHandler implements HandlerInterface
-+{
-+    private const REVIEW_PENDING_STATUSES = [
-+        'FDSPendingReview',
-+        'FDSAuthorizedPendingReview'
-+    ];
-+    private const REVIEW_DECLINED_STATUSES = [
-+        'void',
-+        'declined'
-+    ];
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function handle(array $handlingSubject, array $response): void
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($handlingSubject);
-+        $payment = $paymentDO->getPayment();
-+
-+        if ($payment instanceof Payment) {
-+            $paymentDO = $this->subjectReader->readPayment($handlingSubject);
-+            $payment = $paymentDO->getPayment();
-+
-+            $status = $response['transaction']['transactionStatus'];
-+            // This data is only used when updating the order payment via Get Payment Update
-+            if (!in_array($status, self::REVIEW_PENDING_STATUSES)) {
-+                $denied = in_array($status, self::REVIEW_DECLINED_STATUSES);
-+                $payment->setData('is_transaction_denied', $denied);
-+                $payment->setData('is_transaction_approved', !$denied);
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionDetailsResponseHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionDetailsResponseHandler.php
-new file mode 100644
-index 00000000000..0dab6414521
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionDetailsResponseHandler.php
-@@ -0,0 +1,65 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\AuthorizenetAcceptjs\Gateway\Validator\TransactionResponseValidator;
-+use Magento\Payment\Gateway\Response\HandlerInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Adds the details to the transaction that should show when the transaction is viewed in the admin
-+ */
-+class TransactionDetailsResponseHandler implements HandlerInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     * @param Config $config
-+     */
-+    public function __construct(SubjectReader $subjectReader, Config $config)
-+    {
-+        $this->subjectReader = $subjectReader;
-+        $this->config = $config;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function handle(array $handlingSubject, array $response): void
-+    {
-+        $storeId = $this->subjectReader->readStoreId($handlingSubject);
-+        $paymentDO = $this->subjectReader->readPayment($handlingSubject);
-+        $payment = $paymentDO->getPayment();
-+        $transactionResponse = $response['transactionResponse'];
-+
-+        if ($payment instanceof Payment) {
-+            // Add the keys that should show in the transaction details interface
-+            $additionalInformationKeys = $this->config->getAdditionalInfoKeys($storeId);
-+            $rawDetails = [];
-+            foreach ($additionalInformationKeys as $paymentInfoKey) {
-+                if (isset($transactionResponse[$paymentInfoKey])) {
-+                    $rawDetails[$paymentInfoKey] = $transactionResponse[$paymentInfoKey];
-+                    $payment->setAdditionalInformation($paymentInfoKey, $transactionResponse[$paymentInfoKey]);
-+                }
-+            }
-+            $payment->setTransactionAdditionalInfo(Payment\Transaction::RAW_DETAILS, $rawDetails);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionIdHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionIdHandler.php
-new file mode 100644
-index 00000000000..bf5257f95da
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionIdHandler.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Response\HandlerInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Processes transaction id for the payment
-+ */
-+class TransactionIdHandler implements HandlerInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function handle(array $handlingSubject, array $response): void
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($handlingSubject);
-+        $payment = $paymentDO->getPayment();
-+        $transactionResponse = $response['transactionResponse'];
-+
-+        if ($payment instanceof Payment) {
-+            if (!$payment->getParentTransactionId()
-+                || $transactionResponse['transId'] != $payment->getParentTransactionId()
-+            ) {
-+                $payment->setTransactionId($transactionResponse['transId']);
-+            }
-+            $payment->setTransactionAdditionalInfo(
-+                'real_transaction_id',
-+                $transactionResponse['transId']
-+            );
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/VoidResponseHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/VoidResponseHandler.php
-new file mode 100644
-index 00000000000..06b16b37278
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/VoidResponseHandler.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Response\HandlerInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Processes payment information from a void transaction response
-+ */
-+class VoidResponseHandler implements HandlerInterface
-+{
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(SubjectReader $subjectReader)
-+    {
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function handle(array $handlingSubject, array $response): void
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($handlingSubject);
-+        $payment = $paymentDO->getPayment();
-+        $transactionId = $response['transactionResponse']['transId'];
-+
-+        if ($payment instanceof Payment) {
-+            $payment->setIsTransactionClosed(true);
-+            $payment->setShouldCloseParentTransaction(true);
-+            $payment->setTransactionAdditionalInfo('real_transaction_id', $transactionId);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/SubjectReader.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/SubjectReader.php
-new file mode 100644
-index 00000000000..855d48e2796
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/SubjectReader.php
-@@ -0,0 +1,96 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway;
-+
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Payment\Gateway\Helper;
-+
-+/**
-+ * Helper for extracting information from the payment data structure
-+ */
-+class SubjectReader
-+{
-+    /**
-+     * Reads payment from subject
-+     *
-+     * @param array $subject
-+     * @return PaymentDataObjectInterface
-+     */
-+    public function readPayment(array $subject): PaymentDataObjectInterface
-+    {
-+        return Helper\SubjectReader::readPayment($subject);
-+    }
-+
-+    /**
-+     * Reads store's ID, otherwise returns null.
-+     *
-+     * @param array $subject
-+     * @return int|null
-+     */
-+    public function readStoreId(array $subject): ?int
-+    {
-+        $storeId = $subject['store_id'] ?? null;
-+
-+        if (empty($storeId)) {
-+            try {
-+                $storeId = (int)$this->readPayment($subject)
-+                    ->getOrder()
-+                    ->getStoreId();
-+            } catch (\InvalidArgumentException $e) {
-+                // No store id is current set
-+            }
-+        }
-+
-+        return $storeId ? (int)$storeId : null;
-+    }
-+
-+    /**
-+     * Reads amount from subject
-+     *
-+     * @param array $subject
-+     * @return string
-+     */
-+    public function readAmount(array $subject): string
-+    {
-+        return (string)Helper\SubjectReader::readAmount($subject);
-+    }
-+
-+    /**
-+     * Reads response from subject
-+     *
-+     * @param array $subject
-+     * @return array
-+     */
-+    public function readResponse(array $subject): ?array
-+    {
-+        return Helper\SubjectReader::readResponse($subject);
-+    }
-+
-+    /**
-+     * Reads login id from subject
-+     *
-+     * @param array $subject
-+     * @return string|null
-+     */
-+    public function readLoginId(array $subject): ?string
-+    {
-+        return $subject['merchantAuthentication']['name'] ?? null;
-+    }
-+
-+    /**
-+     * Reads transaction key from subject
-+     *
-+     * @param array $subject
-+     * @return string|null
-+     */
-+    public function readTransactionKey(array $subject): ?string
-+    {
-+        return $subject['merchantAuthentication']['transactionKey'] ?? null;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/GeneralResponseValidator.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/GeneralResponseValidator.php
-new file mode 100644
-index 00000000000..7ad4647b421
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/GeneralResponseValidator.php
-@@ -0,0 +1,79 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Validator;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Validator\AbstractValidator;
-+use Magento\Payment\Gateway\Validator\ResultInterface;
-+use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
-+
-+/**
-+ * Validates that the request was successful
-+ */
-+class GeneralResponseValidator extends AbstractValidator
-+{
-+    /**
-+     * The result code that authorize.net returns for a successful Api call
-+     */
-+    private const RESULT_CODE_SUCCESS = 'Ok';
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @var ResultInterfaceFactory
-+     */
-+    private $resultFactory;
-+
-+    /**
-+     * @param ResultInterfaceFactory $resultFactory
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(
-+        ResultInterfaceFactory $resultFactory,
-+        SubjectReader $subjectReader
-+    ) {
-+        parent::__construct($resultFactory);
-+        $this->resultFactory = $resultFactory;
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function validate(array $validationSubject): ResultInterface
-+    {
-+        $response = $this->subjectReader->readResponse($validationSubject);
-+        $isValid = (isset($response['messages']['resultCode'])
-+            && $response['messages']['resultCode'] === self::RESULT_CODE_SUCCESS);
-+        $errorCodes = [];
-+        $errorMessages = [];
-+
-+        if (!$isValid) {
-+            if (isset($response['messages']['message']['code'])) {
-+                $errorCodes[] = $response['messages']['message']['code'];
-+                $errorMessages[] = $response['messages']['message']['text'];
-+            } elseif (isset($response['messages']['message'])) {
-+                foreach ($response['messages']['message'] as $message) {
-+                    $errorCodes[] = $message['code'];
-+                    $errorMessages[] = $message['text'];
-+                }
-+            } elseif (isset($response['errors']['error'])) {
-+                foreach ($response['errors']['error'] as $message) {
-+                    $errorCodes[] = $message['errorCode'];
-+                    $errorMessages[] = $message['errorText'];
-+                }
-+            }
-+        }
-+
-+        return $this->createResult($isValid, $errorMessages, $errorCodes);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionHashValidator.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionHashValidator.php
-new file mode 100644
-index 00000000000..0d1c2ad033d
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionHashValidator.php
-@@ -0,0 +1,197 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Validator;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Framework\Encryption\Helper\Security;
-+use Magento\Payment\Gateway\Validator\AbstractValidator;
-+use Magento\Payment\Gateway\Validator\ResultInterface;
-+use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
-+
-+/**
-+ * Validates the transaction hash
-+ */
-+class TransactionHashValidator extends AbstractValidator
-+{
-+    /**
-+     * The error code for failed transaction hash verification
-+     */
-+    private const ERROR_TRANSACTION_HASH = 'ETHV';
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @param ResultInterfaceFactory $resultFactory
-+     * @param SubjectReader $subjectReader
-+     * @param Config $config
-+     */
-+    public function __construct(
-+        ResultInterfaceFactory $resultFactory,
-+        SubjectReader $subjectReader,
-+        Config $config
-+    ) {
-+        parent::__construct($resultFactory);
-+
-+        $this->subjectReader = $subjectReader;
-+        $this->config = $config;
-+    }
-+
-+    /**
-+     * Validates the transaction hash matches the configured hash
-+     *
-+     * @param array $validationSubject
-+     * @return ResultInterface
-+     */
-+    public function validate(array $validationSubject): ResultInterface
-+    {
-+        $response = $this->subjectReader->readResponse($validationSubject);
-+        $storeId = $this->subjectReader->readStoreId($validationSubject);
-+
-+        if (!empty($response['transactionResponse']['transHashSha2'])) {
-+            return $this->validateHash(
-+                $validationSubject,
-+                $this->config->getTransactionSignatureKey($storeId),
-+                'transHashSha2',
-+                'generateSha512Hash'
-+            );
-+        } elseif (!empty($response['transactionResponse']['transHash'])) {
-+            return $this->validateHash(
-+                $validationSubject,
-+                $this->config->getLegacyTransactionHash($storeId),
-+                'transHash',
-+                'generateMd5Hash'
-+            );
-+        }
-+
-+        return $this->createResult(
-+            false,
-+            [
-+                __('The authenticity of the gateway response could not be verified.')
-+            ],
-+            [self::ERROR_TRANSACTION_HASH]
-+        );
-+    }
-+
-+    /**
-+     * Validates the response again the legacy MD5 spec
-+     *
-+     * @param array $validationSubject
-+     * @param string $storedHash
-+     * @param string $hashField
-+     * @param string $generateFunction
-+     * @return ResultInterface
-+     */
-+    private function validateHash(
-+        array $validationSubject,
-+        string $storedHash,
-+        string $hashField,
-+        string $generateFunction
-+    ): ResultInterface {
-+        $storeId = $this->subjectReader->readStoreId($validationSubject);
-+        $response = $this->subjectReader->readResponse($validationSubject);
-+        $transactionResponse = $response['transactionResponse'];
-+
-+        /*
-+         * Authorize.net is inconsistent with how they hash and heuristically trying to detect whether or not they used
-+         * the amount to calculate the hash is risky because their responses are incorrect in some cases.
-+         * Refund uses the amount when referencing a transaction but will use 0 when refunding without a reference.
-+         * Non-refund reference transactions such as (void/capture) don't use the amount. Authorize/auth&capture
-+         * transactions will use amount but if there is an AVS error the response will indicate the transaction was a
-+         * reference transaction so this can't be heuristically detected by looking at combinations of refTransID
-+         * and transId (yes they also mixed the letter casing for "id"). Their documentation doesn't talk about this
-+         * and to make this even better, none of their official SDKs support the new hash field to compare
-+         * implementations. Therefore the only way to safely validate this hash without failing for even more
-+         * unexpected corner cases we simply need to validate with and without the amount.
-+         */
-+        try {
-+            $amount = $this->subjectReader->readAmount($validationSubject);
-+        } catch (\InvalidArgumentException $e) {
-+            $amount = 0;
-+        }
-+
-+        $hash = $this->{$generateFunction}(
-+            $storedHash,
-+            $this->config->getLoginId($storeId),
-+            sprintf('%.2F', $amount),
-+            $transactionResponse['transId'] ?? ''
-+        );
-+        $valid = Security::compareStrings($hash, $transactionResponse[$hashField]);
-+
-+        if (!$valid && $amount > 0) {
-+            $hash = $this->{$generateFunction}(
-+                $storedHash,
-+                $this->config->getLoginId($storeId),
-+                '0.00',
-+                $transactionResponse['transId'] ?? ''
-+            );
-+            $valid = Security::compareStrings($hash, $transactionResponse[$hashField]);
-+        }
-+
-+        if ($valid) {
-+            return $this->createResult(true);
-+        }
-+
-+        return $this->createResult(
-+            false,
-+            [
-+                __('The authenticity of the gateway response could not be verified.')
-+            ],
-+            [self::ERROR_TRANSACTION_HASH]
-+        );
-+    }
-+
-+    /**
-+     * Generates a Md5 hash to compare against AuthNet's.
-+     *
-+     * @param string $merchantMd5
-+     * @param string $merchantApiLogin
-+     * @param string $amount
-+     * @param string $transactionId
-+     * @return string
-+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-+     */
-+    private function generateMd5Hash(
-+        $merchantMd5,
-+        $merchantApiLogin,
-+        $amount,
-+        $transactionId
-+    ) {
-+        return strtoupper(md5($merchantMd5 . $merchantApiLogin . $transactionId . $amount));
-+    }
-+
-+    /**
-+     * Generates a SHA-512 hash to compare against AuthNet's.
-+     *
-+     * @param string $merchantKey
-+     * @param string $merchantApiLogin
-+     * @param string $amount
-+     * @param string $transactionId
-+     * @return string
-+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-+     */
-+    private function generateSha512Hash(
-+        $merchantKey,
-+        $merchantApiLogin,
-+        $amount,
-+        $transactionId
-+    ) {
-+        $message = '^' . $merchantApiLogin . '^' . $transactionId . '^' . $amount . '^';
-+
-+        return strtoupper(hash_hmac('sha512', $message, pack('H*', $merchantKey)));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionResponseValidator.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionResponseValidator.php
-new file mode 100644
-index 00000000000..326f4fb29ac
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionResponseValidator.php
-@@ -0,0 +1,101 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Validator;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Validator\AbstractValidator;
-+use Magento\Payment\Gateway\Validator\ResultInterface;
-+use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
-+
-+/**
-+ * Validates the status of an attempted transaction
-+ */
-+class TransactionResponseValidator extends AbstractValidator
-+{
-+    private const RESPONSE_CODE_APPROVED = 1;
-+    private const RESPONSE_CODE_HELD = 4;
-+    private const RESPONSE_REASON_CODE_APPROVED = 1;
-+    private const RESPONSE_REASON_CODE_PENDING_REVIEW_AUTHORIZED = 252;
-+    private const RESPONSE_REASON_CODE_PENDING_REVIEW = 253;
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @param ResultInterfaceFactory $resultFactory
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(ResultInterfaceFactory $resultFactory, SubjectReader $subjectReader)
-+    {
-+        parent::__construct($resultFactory);
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function validate(array $validationSubject): ResultInterface
-+    {
-+        $response = $this->subjectReader->readResponse($validationSubject);
-+        $transactionResponse = $response['transactionResponse'];
-+
-+        if ($this->isResponseCodeAnError($transactionResponse)) {
-+            $errorCodes = [];
-+            $errorMessages = [];
-+
-+            if (isset($transactionResponse['messages']['message']['code'])) {
-+                $errorCodes[] = $transactionResponse['messages']['message']['code'];
-+                $errorMessages[] = $transactionResponse['messages']['message']['text'];
-+            } elseif (isset($transactionResponse['messages']['message'])) {
-+                foreach ($transactionResponse['messages']['message'] as $message) {
-+                    $errorCodes[] = $message['code'];
-+                    $errorMessages[] = $message['description'];
-+                }
-+            } elseif (isset($transactionResponse['errors'])) {
-+                foreach ($transactionResponse['errors'] as $message) {
-+                    $errorCodes[] = $message['errorCode'];
-+                    $errorMessages[] = $message['errorText'];
-+                }
-+            }
-+
-+            return $this->createResult(false, $errorMessages, $errorCodes);
-+        }
-+
-+        return $this->createResult(true);
-+    }
-+
-+    /**
-+     * Determines if the response code is actually an error
-+     *
-+     * @param array $transactionResponse
-+     * @return bool
-+     */
-+    private function isResponseCodeAnError(array $transactionResponse): bool
-+    {
-+        $code = $transactionResponse['messages']['message']['code']
-+            ?? $transactionResponse['messages']['message'][0]['code']
-+            ?? $transactionResponse['errors'][0]['errorCode']
-+            ?? null;
-+
-+        return !in_array($transactionResponse['responseCode'], [
-+                self::RESPONSE_CODE_APPROVED, self::RESPONSE_CODE_HELD
-+            ])
-+            || $code
-+            && !in_array(
-+                $code,
-+                [
-+                    self::RESPONSE_REASON_CODE_APPROVED,
-+                    self::RESPONSE_REASON_CODE_PENDING_REVIEW,
-+                    self::RESPONSE_REASON_CODE_PENDING_REVIEW_AUTHORIZED
-+                ]
-+            );
-+    }
-+}
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/LICENSE.txt b/app/code/Magento/AuthorizenetAcceptjs/LICENSE.txt
-similarity index 100%
-rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/LICENSE.txt
-rename to app/code/Magento/AuthorizenetAcceptjs/LICENSE.txt
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/LICENSE_AFL.txt b/app/code/Magento/AuthorizenetAcceptjs/LICENSE_AFL.txt
-similarity index 100%
-rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/LICENSE_AFL.txt
-rename to app/code/Magento/AuthorizenetAcceptjs/LICENSE_AFL.txt
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Cctype.php b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Cctype.php
-new file mode 100644
-index 00000000000..046907ebb88
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Cctype.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Model\Adminhtml\Source;
-+
-+use Magento\Payment\Model\Source\Cctype as PaymentCctype;
-+
-+/**
-+ * Authorize.net Payment CC Types Source Model
-+ */
-+class Cctype extends PaymentCctype
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getAllowedTypes(): array
-+    {
-+        return ['VI', 'MC', 'AE', 'DI', 'JCB', 'DN'];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Environment.php b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Environment.php
-new file mode 100644
-index 00000000000..f2eca8e1439
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Environment.php
-@@ -0,0 +1,37 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Model\Adminhtml\Source;
-+
-+/**
-+ * Authorize.net Environment Dropdown source
-+ */
-+class Environment implements \Magento\Framework\Data\OptionSourceInterface
-+{
-+    const ENVIRONMENT_PRODUCTION = 'production';
-+    const ENVIRONMENT_SANDBOX = 'sandbox';
-+
-+    /**
-+     * Possible environment types
-+     *
-+     * @return array
-+     */
-+    public function toOptionArray(): array
-+    {
-+        return [
-+            [
-+                'value' => self::ENVIRONMENT_SANDBOX,
-+                'label' => 'Sandbox',
-+            ],
-+            [
-+                'value' => self::ENVIRONMENT_PRODUCTION,
-+                'label' => 'Production'
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/PaymentAction.php b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/PaymentAction.php
-new file mode 100644
-index 00000000000..907a1b2a51b
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/PaymentAction.php
-@@ -0,0 +1,32 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Model\Adminhtml\Source;
-+
-+/**
-+ * Authorize.net Payment Action Dropdown source
-+ */
-+class PaymentAction implements \Magento\Framework\Data\OptionSourceInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function toOptionArray(): array
-+    {
-+        return [
-+            [
-+                'value' => 'authorize',
-+                'label' => __('Authorize Only'),
-+            ],
-+            [
-+                'value' => 'authorize_capture',
-+                'label' => __('Authorize and Capture')
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Model/PassthroughDataObject.php b/app/code/Magento/AuthorizenetAcceptjs/Model/PassthroughDataObject.php
-new file mode 100644
-index 00000000000..b49ef7e6225
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Model/PassthroughDataObject.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Model;
-+
-+use Magento\Framework\DataObject;
-+
-+/**
-+ * Contains all the accumulated data from the request builders that should be passed through to the handlers
-+ */
-+class PassthroughDataObject extends DataObject
-+{
-+
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Model/Ui/ConfigProvider.php b/app/code/Magento/AuthorizenetAcceptjs/Model/Ui/ConfigProvider.php
-new file mode 100644
-index 00000000000..b24c101a3f7
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Model/Ui/ConfigProvider.php
-@@ -0,0 +1,60 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Model\Ui;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\Checkout\Model\ConfigProviderInterface;
-+use Magento\Quote\Api\Data\CartInterface;
-+
-+/**
-+ * Retrieves config needed for checkout
-+ */
-+class ConfigProvider implements ConfigProviderInterface
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var CartInterface
-+     */
-+    private $cart;
-+
-+    /**
-+     * @param Config $config
-+     * @param CartInterface $cart
-+     */
-+    public function __construct(Config $config, CartInterface $cart)
-+    {
-+        $this->config = $config;
-+        $this->cart = $cart;
-+    }
-+
-+    /**
-+     * Retrieve assoc array of checkout configuration
-+     *
-+     * @return array
-+     */
-+    public function getConfig()
-+    {
-+        $storeId = $this->cart->getStoreId();
-+
-+        return [
-+            'payment' => [
-+                Config::METHOD => [
-+                    'clientKey' => $this->config->getClientKey($storeId),
-+                    'apiLoginID' => $this->config->getLoginId($storeId),
-+                    'environment' => $this->config->getEnvironment($storeId),
-+                    'useCvv' => $this->config->isCvvEnabled($storeId),
-+                ]
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Observer/DataAssignObserver.php b/app/code/Magento/AuthorizenetAcceptjs/Observer/DataAssignObserver.php
-new file mode 100644
-index 00000000000..c7490ad0c80
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Observer/DataAssignObserver.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Observer;
-+
-+use Magento\Framework\Event\Observer;
-+use Magento\Payment\Observer\AbstractDataAssignObserver;
-+use Magento\Quote\Api\Data\PaymentInterface;
-+
-+/**
-+ * Adds the payment info to the payment object
-+ */
-+class DataAssignObserver extends AbstractDataAssignObserver
-+{
-+    /**
-+     * @var array
-+     */
-+    private $additionalInformationList = [
-+        'opaqueDataDescriptor',
-+        'opaqueDataValue',
-+        'ccLast4'
-+    ];
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute(Observer $observer)
-+    {
-+        $data = $this->readDataArgument($observer);
-+
-+        $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
-+        if (!is_array($additionalData)) {
-+            return;
-+        }
-+
-+        $paymentInfo = $this->readPaymentModelArgument($observer);
-+
-+        foreach ($this->additionalInformationList as $additionalInformationKey) {
-+            if (isset($additionalData[$additionalInformationKey])) {
-+                $paymentInfo->setAdditionalInformation(
-+                    $additionalInformationKey,
-+                    $additionalData[$additionalInformationKey]
-+                );
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/README.md b/app/code/Magento/AuthorizenetAcceptjs/README.md
-new file mode 100644
-index 00000000000..b066f8a2d75
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/README.md
-@@ -0,0 +1 @@
-+The Magento_AuthorizenetAcceptjs module implements the integration with the Authorize.Net payment gateway and makes the latter available as a payment method in Magento.
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Setup/Patch/Data/CopyCurrentConfig.php b/app/code/Magento/AuthorizenetAcceptjs/Setup/Patch/Data/CopyCurrentConfig.php
-new file mode 100644
-index 00000000000..0675bd94b62
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Setup/Patch/Data/CopyCurrentConfig.php
-@@ -0,0 +1,230 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Setup\Patch\Data;
-+
-+use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\Encryption\EncryptorInterface;
-+use Magento\Framework\Setup\ModuleDataSetupInterface;
-+use Magento\Framework\Setup\Patch\DataPatchInterface;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Store\Api\Data\WebsiteInterface;
-+
-+/**
-+ * Copies the Authorize.net DirectPost configuration values to the new Accept.js module.
-+ */
-+class CopyCurrentConfig implements DataPatchInterface
-+{
-+    private const DIRECTPOST_PATH = 'payment/authorizenet_directpost';
-+    private const ACCEPTJS_PATH = 'payment/authorizenet_acceptjs';
-+    private const PAYMENT_PATH_FORMAT = '%s/%s';
-+
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @var ConfigInterface
-+     */
-+    private $resourceConfig;
-+
-+    /**
-+     * @var EncryptorInterface
-+     */
-+    private $encryptor;
-+
-+    /**
-+     * @var ModuleDataSetupInterface
-+     */
-+    private $moduleDataSetup;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var array
-+     */
-+    private $configFieldsToMigrate = [
-+        'cctypes',
-+        'debug',
-+        'email_customer',
-+        'order_status',
-+        'payment_action',
-+        'currency',
-+        'allow_specific',
-+        'specificcountry',
-+        'min_order_total',
-+        'max_order_total'
-+    ];
-+
-+    /**
-+     * @var array
-+     */
-+    private $encryptedConfigFieldsToMigrate = [
-+        'login',
-+        'trans_key',
-+        'trans_md5'
-+    ];
-+
-+    /**
-+     * @param ModuleDataSetupInterface $moduleDataSetup
-+     * @param ScopeConfigInterface $scopeConfig
-+     * @param ConfigInterface $resourceConfig
-+     * @param EncryptorInterface $encryptor
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(
-+        ModuleDataSetupInterface $moduleDataSetup,
-+        ScopeConfigInterface $scopeConfig,
-+        ConfigInterface  $resourceConfig,
-+        EncryptorInterface $encryptor,
-+        StoreManagerInterface $storeManager
-+    ) {
-+        $this->scopeConfig = $scopeConfig;
-+        $this->resourceConfig = $resourceConfig;
-+        $this->encryptor = $encryptor;
-+        $this->moduleDataSetup = $moduleDataSetup;
-+        $this->storeManager = $storeManager;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function apply(): void
-+    {
-+        $this->moduleDataSetup->startSetup();
-+        $this->migrateDefaultValues();
-+        $this->migrateWebsiteValues();
-+        $this->moduleDataSetup->endSetup();
-+    }
-+
-+    /**
-+     * Migrate configuration values from DirectPost to Accept.js on default scope
-+     *
-+     * @return void
-+     */
-+    private function migrateDefaultValues(): void
-+    {
-+        foreach ($this->configFieldsToMigrate as $field) {
-+            $configValue = $this->getOldConfigValue($field);
-+
-+            if (!empty($configValue)) {
-+                $this->saveNewConfigValue($field, $configValue);
-+            }
-+        }
-+
-+        foreach ($this->encryptedConfigFieldsToMigrate as $field) {
-+            $configValue = $this->getOldConfigValue($field);
-+
-+            if (!empty($configValue)) {
-+                $this->saveNewConfigValue(
-+                    $field,
-+                    $configValue,
-+                    ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-+                    0,
-+                    true
-+                );
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Migrate configuration values from DirectPost to Accept.js on all website scopes
-+     *
-+     * @return void
-+     */
-+    private function migrateWebsiteValues(): void
-+    {
-+        foreach ($this->storeManager->getWebsites() as $website) {
-+            $websiteID = (int) $website->getId();
-+
-+            foreach ($this->configFieldsToMigrate as $field) {
-+                $configValue = $this->getOldConfigValue($field, ScopeInterface::SCOPE_WEBSITES, $websiteID);
-+
-+                if (!empty($configValue)) {
-+                    $this->saveNewConfigValue($field, $configValue, ScopeInterface::SCOPE_WEBSITES, $websiteID);
-+                }
-+            }
-+
-+            foreach ($this->encryptedConfigFieldsToMigrate as $field) {
-+                $configValue = $this->getOldConfigValue($field, ScopeInterface::SCOPE_WEBSITES, $websiteID);
-+
-+                if (!empty($configValue)) {
-+                    $this->saveNewConfigValue($field, $configValue, ScopeInterface::SCOPE_WEBSITES, $websiteID, true);
-+                }
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Get old configuration value from the DirectPost module's configuration on the store scope
-+     *
-+     * @param string $field
-+     * @param string $scope
-+     * @param int $scopeID
-+     * @return mixed
-+     */
-+    private function getOldConfigValue(
-+        string $field,
-+        string $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-+        int $scopeID = null
-+    ) {
-+        return $this->scopeConfig->getValue(
-+            sprintf(self::PAYMENT_PATH_FORMAT, self::DIRECTPOST_PATH, $field),
-+            $scope,
-+            $scopeID
-+        );
-+    }
-+
-+    /**
-+     * Save configuration value for AcceptJS
-+     *
-+     * @param string $field
-+     * @param mixed $value
-+     * @param string $scope
-+     * @param int $scopeID
-+     * @param bool $isEncrypted
-+     * @return void
-+     */
-+    private function saveNewConfigValue(
-+        string $field,
-+        $value,
-+        string $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-+        int $scopeID = 0,
-+        bool $isEncrypted = false
-+    ): void {
-+        $value = $isEncrypted ? $this->encryptor->encrypt($value) : $value;
-+
-+        $this->resourceConfig->saveConfig(
-+            sprintf(self::PAYMENT_PATH_FORMAT, self::ACCEPTJS_PATH, $field),
-+            $value,
-+            $scope,
-+            $scopeID
-+        );
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public static function getDependencies()
-+    {
-+        return [];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getAliases()
-+    {
-+        return [];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ConfigureAuthorizenetAcceptjsActionGroup.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ConfigureAuthorizenetAcceptjsActionGroup.xml
-new file mode 100644
-index 00000000000..e9a194435e3
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ConfigureAuthorizenetAcceptjsActionGroup.xml
-@@ -0,0 +1,46 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="ConfigureAuthorizenetAcceptjs">
-+        <arguments>
-+            <argument name="paymentAction" type="string"/>
-+        </arguments>
-+        <!-- Navigate to configuration -->
-+        <waitForPageLoad stepKey="waitForStores"/>
-+        <click stepKey="clickOnStores" selector="{{AdminMenuSection.stores}}"/>
-+        <waitForPageLoad stepKey="waitForConfiguration"/>
-+        <click stepKey="clickOnConfiguration" selector="{{StoresSubmenuSection.configuration}}"/>
-+        <waitForPageLoad stepKey="waitForSales"/>
-+        <waitForElementVisible stepKey="waitForVisibleHack" selector="{{AdminMenuSection.currencySetup}}"/>
-+        <scrollTo stepKey="scrollToSales" selector="{{StoresConfigurationListSection.sales}}"/>
-+        <click stepKey="clickOnSales" selector="{{StoresConfigurationListSection.sales}}" />
-+        <waitForPageLoad stepKey="waitForPaymentMethods"/>
-+        <click stepKey="clickOnPaymentMethods" selector="{{StoresConfigurationListSection.salesPaymentMethods}}" />
-+        <waitForPageLoad stepKey="waitForOpenConfiguration"/>
-+        <scrollTo stepKey="scrollToOpenConfig" selector="{{AuthorizenetAcceptjsConfigurationSection.openSectionToggle}}"/>
-+        <conditionalClick stepKey="openConfiguration" selector="{{AuthorizenetAcceptjsConfigurationSection.openSectionToggle}}" dependentSelector="{{AuthorizenetAcceptjsConfigurationSection.alreadyOpenSectionToggle}}" visible="false"/>
-+
-+        <!-- Fill Auth.net fields and save -->
-+        <waitForPageLoad stepKey="waitToFillApiLogin"/>
-+        <conditionalClick selector="{{AuthorizenetAcceptjsConfigurationSection.paymentActionCheckbox}}" stepKey="uncheckPaymentActionDefault" dependentSelector="{{AuthorizenetAcceptjsConfigurationSection.paymentActionSelectDisabled}}" visible="true"/>
-+        <selectOption selector="{{AuthorizenetAcceptjsConfigurationSection.paymentActionSelect}}" stepKey="selectPaymentAction" userInput="{{paymentAction}}"/>
-+        <scrollTo stepKey="scrollToApiLoginId" selector="{{AuthorizenetAcceptjsConfigurationSection.apiLoginIdField}}"/>
-+        <fillField stepKey="fillApiLoginId" selector="{{AuthorizenetAcceptjsConfigurationSection.apiLoginIdField}}" userInput="{{_CREDS.authorizenet_acceptjs_api_login_id}}"/>
-+        <fillField stepKey="fillTransactionKey" selector="{{AuthorizenetAcceptjsConfigurationSection.transactionKeyField}}" userInput="{{_CREDS.authorizenet_acceptjs_transaction_key}}"/>
-+        <fillField stepKey="fillPublicClientKey" selector="{{AuthorizenetAcceptjsConfigurationSection.publicClientKeyField}}" userInput="{{_CREDS.authorizenet_acceptjs_public_client_key}}"/>
-+        <fillField stepKey="fillSignatureKey" selector="{{AuthorizenetAcceptjsConfigurationSection.signatureKeyField}}" userInput="{{_CREDS.authorizenet_acceptjs_signature_key}}"/>
-+        <uncheckOption stepKey="uncheckCheckbox" selector="{{AuthorizenetAcceptjsConfigurationSection.enabledDefaultCheckbox}}"/>
-+        <selectOption stepKey="fillExpYear" selector="{{AuthorizenetAcceptjsConfigurationSection.enabledDefaultSelect}}" userInput="Yes"/>
-+        <click stepKey="clickOnSave" selector="{{ConfigurationMainActionsSection.save}}" />
-+    </actionGroup>
-+
-+    <actionGroup name="DisableAuthorizenetAcceptjs">
-+        <magentoCLI stepKey="disableAuthorizenetAcceptjs" command="config:set payment/authorizenet_acceptjs/active 0"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/FillPaymentInformationActionGroup.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/FillPaymentInformationActionGroup.xml
-new file mode 100644
-index 00000000000..d06bf996a1f
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/FillPaymentInformationActionGroup.xml
-@@ -0,0 +1,37 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="FillPaymentInformation">
-+        <click stepKey="clickOnAuthorizenetToggle" selector="{{AuthorizenetCheckoutSection.selectAuthorizenet}}"/>
-+        <waitForPageLoad stepKey="waitForCardDataSection"/>
-+        <fillField stepKey="fillCardNumber" selector="{{AuthorizenetCheckoutSection.cardInput}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
-+        <selectOption stepKey="fillExpMonth" selector="{{AuthorizenetCheckoutSection.expMonth}}" userInput="{{PaymentAndShippingInfo.month}}"/>
-+        <selectOption stepKey="fillExpYear" selector="{{AuthorizenetCheckoutSection.expYear}}" userInput="20{{PaymentAndShippingInfo.year}}"/>
-+        <fillField stepKey="fillCvv" selector="{{AuthorizenetCheckoutSection.cvv}}" userInput="123"/>
-+        <click stepKey="checkoutButton" selector="{{AuthorizenetCheckoutSection.checkoutButton}}"/>
-+        <waitForPageLoad stepKey="waitForCheckout"/>
-+    </actionGroup>
-+
-+    <!-- Guest checkout Authorizenet fill billing address -->
-+    <actionGroup name="GuestCheckoutAuthorizenetFillBillingAddress">
-+        <arguments>
-+            <argument name="customer"/>
-+            <argument name="customerAddress"/>
-+        </arguments>
-+        <fillField selector="{{GuestAuthorizenetCheckoutSection.firstName}}" userInput="{{customer.firstName}}" stepKey="fillFirstName"/>
-+        <fillField selector="{{GuestAuthorizenetCheckoutSection.lastName}}" userInput="{{customer.lastName}}" stepKey="fillLastName"/>
-+        <fillField selector="{{GuestAuthorizenetCheckoutSection.street}}" userInput="{{customerAddress.street[0]}}" stepKey="fillStreet"/>
-+        <fillField selector="{{GuestAuthorizenetCheckoutSection.city}}" userInput="{{customerAddress.city}}" stepKey="fillCity"/>
-+        <selectOption selector="{{GuestAuthorizenetCheckoutSection.state}}" userInput="{{customerAddress.state}}" stepKey="selectState"/>
-+        <fillField selector="{{GuestAuthorizenetCheckoutSection.postcode}}" userInput="{{customerAddress.postcode}}" stepKey="fillPostCode"/>
-+        <fillField selector="{{GuestAuthorizenetCheckoutSection.telephone}}" userInput="{{customerAddress.telephone}}" stepKey="fillTelephone"/>
-+        <click selector="{{GuestAuthorizenetCheckoutSection.update}}" stepKey="updateAddress"/>
-+        <waitForPageLoad stepKey="waitForUpdate"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ViewAndValidateOrderActionGroup.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ViewAndValidateOrderActionGroup.xml
-new file mode 100644
-index 00000000000..ba0e49d1876
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ViewAndValidateOrderActionGroup.xml
-@@ -0,0 +1,70 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="ViewAndValidateOrderActionGroup">
-+        <arguments>
-+            <argument name="amount" type="string"/>
-+            <argument name="status" type="string"/>
-+            <argument name="captureStatus" type="string"/>
-+            <argument name="closedStatus" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-+        <click selector="{{AdminMenuSection.sales}}" stepKey="clickSales"/>
-+        <waitForPageLoad stepKey="waitForSalesSubsection"/>
-+        <click selector="{{AdminMenuSection.orders}}" stepKey="clickOrders"/>
-+        <waitForPageLoad stepKey="waitForOrdersGrid" time="30"/>
-+        <click selector="{{OrdersGridSection.viewMostRecentOrder}}" stepKey="viewOrder"/>
-+        <waitForPageLoad stepKey="waitForViewOrder"/>
-+        <click selector="{{ViewOrderSection.openInvoiceForm}}" stepKey="openInvoiceForm"/>
-+        <selectOption selector="{{ViewOrderSection.selectCaptureType}}" stepKey="selectCaptureType" userInput="Capture Online"/>
-+        <click selector="{{ViewOrderSection.submitInvoice}}" stepKey="submitInvoice"/>
-+        <waitForPageLoad stepKey="waitForInvoiceLoad"/>
-+        <click selector="{{ViewOrderSection.commentsHistory}}" stepKey="viewCommentsHistory"/>
-+        <waitForPageLoad stepKey="waitForHistoryLoad"/>
-+        <see userInput="{{amount}}" selector="{{ViewOrderSection.capturedAmountText}}" stepKey="validateCapturedAmount"/>
-+        <see userInput="{{status}}" selector="{{ViewOrderSection.orderStatus}}" stepKey="validateOrderStatus"/>
-+        <click selector="{{ViewOrderSection.invoices}}" stepKey="openInvoices"/>
-+        <waitForPageLoad stepKey="waitForInvoices"/>
-+        <seeElement selector="{{ViewOrderSection.firstInvoice}}" stepKey="seeFirstInvoice"/>
-+        <click selector="{{ViewOrderSection.transactions}}" stepKey="openTransactions"/>
-+        <waitForPageLoad stepKey="waitForTransactions"/>
-+        <see userInput="{{captureStatus}}" selector="{{ViewOrderSection.confirmCapture}}" stepKey="seeCapture"/>
-+        <!-- Enable below line after fix of MC-
-+        <see userInput="{{closedStatus}}" selector="{{ViewOrderSection.confirmClosed}}" stepKey="seeClosed"/>
-+        -->
-+    </actionGroup>
-+    <actionGroup name="ViewAndValidateOrderActionGroupNoSubmit">
-+        <arguments>
-+            <argument name="amount" type="string"/>
-+            <argument name="status" type="string"/>
-+            <argument name="captureStatus" type="string"/>
-+            <argument name="closedStatus" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-+        <click selector="{{AdminMenuSection.sales}}" stepKey="clickSales"/>
-+        <waitForPageLoad stepKey="waitForSalesSubsection"/>
-+        <click selector="{{AdminMenuSection.orders}}" stepKey="clickOrders"/>
-+        <waitForPageLoad stepKey="waitForOrdersGrid" time="30"/>
-+        <click selector="{{OrdersGridSection.viewMostRecentOrder}}" stepKey="viewOrder"/>
-+        <waitForPageLoad stepKey="waitForViewOrder"/>
-+        <click selector="{{ViewOrderSection.commentsHistory}}" stepKey="viewCommentsHistory"/>
-+        <waitForPageLoad stepKey="waitForHistoryLoad"/>
-+        <see userInput="{{amount}}" selector="{{ViewOrderSection.capturedAmountTextUnsubmitted}}" stepKey="validateCapturedAmount"/>
-+        <see userInput="{{status}}" selector="{{ViewOrderSection.orderStatus}}" stepKey="validateOrderStatus"/>
-+        <click selector="{{ViewOrderSection.invoices}}" stepKey="openInvoices"/>
-+        <waitForPageLoad stepKey="waitForInvoices"/>
-+        <seeElement selector="{{ViewOrderSection.firstInvoice}}" stepKey="seeFirstInvoice"/>
-+        <click selector="{{ViewOrderSection.transactions}}" stepKey="openTransactions"/>
-+        <waitForPageLoad stepKey="waitForTransactions"/>
-+        <see userInput="{{captureStatus}}" selector="{{ViewOrderSection.confirmCapture}}" stepKey="seeCapture"/>
-+        <!-- Enable below line after fix of MC-
-+        <see userInput="{{closedStatus}}" selector="{{ViewOrderSection.confirmClosed}}" stepKey="seeClosed"/>
-+        -->
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Data/AuthorizenetAcceptjsOrderValidationData.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Data/AuthorizenetAcceptjsOrderValidationData.xml
-new file mode 100644
-index 00000000000..59d4be98d45
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Data/AuthorizenetAcceptjsOrderValidationData.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AuthorizenetAcceptjsOrderValidationData" type="AuthorizenetAcceptjsCredentials">
-+        <data key="virtualProductOrderAmount">$24.68</data>
-+        <data key="twoSimpleProductsOrderAmount">$128.00</data>
-+        <data key="processingStatusProcessing">Processing</data>
-+        <data key="captureStatusCapture">Capture</data>
-+        <data key="closedStatusNo">No</data>
-+    </entity>
-+</entities>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/LICENSE.txt b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/LICENSE.txt
-similarity index 100%
-rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/LICENSE.txt
-rename to app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/LICENSE.txt
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/LICENSE_AFL.txt b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/LICENSE_AFL.txt
-similarity index 100%
-rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/LICENSE_AFL.txt
-rename to app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/LICENSE_AFL.txt
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/README.md b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/README.md
-new file mode 100644
-index 00000000000..aba235e2cfa
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/README.md
-@@ -0,0 +1,3 @@
-+# AuthorizenetAcceptjs Functional Tests
-+
-+The Functional Test Module for **Magento AuthorizenetAcceptjs** module.
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AdminMenuSection.xml
-new file mode 100644
-index 00000000000..defb91339ea
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AdminMenuSection.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminMenuSection">
-+        <element name="dashboard" type="button" selector="#menu-magento-backend-dashboard"/>
-+        <element name="sales" type="button" selector="#menu-magento-sales-sales"/>
-+        <element name="orders" type="button" selector="//*[@id='menu-magento-sales-sales']//span[text()='Orders']"/>
-+        <element name="catalog" type="button" selector="#menu-magento-catalog-catalog"/>
-+        <element name="customers" type="button" selector="#menu-magento-customer-customer"/>
-+        <element name="marketing" type="button" selector="#menu-magento-backend-marketing"/>
-+        <element name="content" type="button" selector="#menu-magento-backend-content"/>
-+        <element name="reports" type="button" selector="#menu-magento-reports-report"/>
-+        <element name="stores" type="button" selector="#menu-magento-backend-stores"/>
-+        <element name="system" type="button" selector="#menu-magento-backend-system"/>
-+        <element name="findPartners" type="button" selector="#menu-magento-marketplace-partners"/>
-+        <element name="currencySetup" type="button" selector="//a[contains(@class, 'item-nav')]//span[text()='Currency Setup']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AuthorizenetAcceptjsConfigurationSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AuthorizenetAcceptjsConfigurationSection.xml
-new file mode 100644
-index 00000000000..31be865ea26
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AuthorizenetAcceptjsConfigurationSection.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AuthorizenetAcceptjsConfigurationSection">
-+        <element name="openSectionToggle" type="button" selector="#payment_us_authorizenet_acceptjs-head"/>
-+        <element name="alreadyOpenSectionToggle" type="button" selector="#payment_us_authorizenet_acceptjs-head.open"/>
-+        <element name="apiLoginIdField" type="input" selector="#payment_us_authorizenet_acceptjs_required_login"/>
-+        <element name="transactionKeyField" type="input" selector="#payment_us_authorizenet_acceptjs_required_trans_key"/>
-+        <element name="publicClientKeyField" type="input" selector="#payment_us_authorizenet_acceptjs_required_public_client_key"/>
-+        <element name="signatureKeyField" type="input" selector="#payment_us_authorizenet_acceptjs_required_trans_signature_key"/>
-+        <element name="enabledDefaultCheckbox" type="input" selector="#payment_us_authorizenet_acceptjs_active_inherit"/>
-+        <element name="enabledDefaultSelect" type="select" selector="#payment_us_authorizenet_acceptjs_active"/>
-+        <element name="paymentActionCheckbox" type="input" selector="#payment_us_authorizenet_acceptjs_required_payment_action_inherit"/>
-+        <element name="paymentActionSelect" type="select" selector="#payment_us_authorizenet_acceptjs_required_payment_action"/>
-+        <element name="paymentActionSelectDisabled" type="select" selector="#payment_us_authorizenet_acceptjs_required_payment_action[disabled='disabled']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AuthorizenetCheckoutSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AuthorizenetCheckoutSection.xml
-new file mode 100644
-index 00000000000..5d97842de37
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AuthorizenetCheckoutSection.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AuthorizenetCheckoutSection">
-+        <element name="selectAuthorizenet" type="button" selector="#authorizenet_acceptjs"/>
-+        <element name="cardInput" type="input" selector="#authorizenet_acceptjs_cc_number"/>
-+        <element name="expMonth" type="select" selector="#authorizenet_acceptjs_expiration"/>
-+        <element name="expYear" type="select" selector="#authorizenet_acceptjs_expiration_yr"/>
-+        <element name="cvv" type="input" selector="#authorizenet_acceptjs_cc_cid"/>
-+        <element name="checkoutButton" type="button" selector="._active button.action.checkout"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ConfigurationMainActionsSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ConfigurationMainActionsSection.xml
-new file mode 100644
-index 00000000000..344330c4bc0
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ConfigurationMainActionsSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="ConfigurationMainActionsSection">
-+        <element name="save" type="button" selector="#save"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/GuestAuthorizenetCheckoutSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/GuestAuthorizenetCheckoutSection.xml
-new file mode 100644
-index 00000000000..b5f2ecf6411
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/GuestAuthorizenetCheckoutSection.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="GuestAuthorizenetCheckoutSection">
-+        <element name="firstName" type="input" selector="div[name='billingAddressauthorizenet_acceptjs.firstname'] input"/>
-+        <element name="lastName" type="input" selector="div[name='billingAddressauthorizenet_acceptjs.lastname'] input"/>
-+        <element name="street" type="input" selector="div[name='billingAddressauthorizenet_acceptjs.street.0'] input"/>
-+        <element name="city" type="input" selector="div[name='billingAddressauthorizenet_acceptjs.city'] input"/>
-+        <element name="state" type="select" selector="div[name='billingAddressauthorizenet_acceptjs.region_id'] select"/>
-+        <element name="postcode" type="input" selector="div[name='billingAddressauthorizenet_acceptjs.postcode'] input"/>
-+        <element name="country" type="select" selector="div[name='billingAddressauthorizenet_acceptjs.country_id'] select"/>
-+        <element name="telephone" type="input" selector="div[name='billingAddressauthorizenet_acceptjs.telephone'] input"/>
-+        <element name="update" type="button" selector=".payment-method._active button.action-update" />
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/OrdersGridSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/OrdersGridSection.xml
-new file mode 100644
-index 00000000000..7ae3dd0ffee
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/OrdersGridSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="OrdersGridSection">
-+        <element name="viewMostRecentOrder" type="button" selector="#container div.admin__data-grid-wrap td:nth-of-type(10) a"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/StoresConfigurationListSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/StoresConfigurationListSection.xml
-new file mode 100644
-index 00000000000..f9f1bef38d1
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/StoresConfigurationListSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StoresConfigurationListSection">
-+        <element name="sales" type="button" selector="#system_config_tabs > div:nth-child(4) > div"/>
-+        <element name="salesPaymentMethods" type="button" selector="//a[contains(@class, 'item-nav')]//span[text()='Payment Methods']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/StoresSubmenuSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/StoresSubmenuSection.xml
-new file mode 100644
-index 00000000000..e54f9808fd4
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/StoresSubmenuSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StoresSubmenuSection">
-+        <element name="configuration" type="button" selector="#menu-magento-backend-stores li[data-ui-id='menu-magento-config-system-config']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ViewOrderSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ViewOrderSection.xml
-new file mode 100644
-index 00000000000..608067d7d31
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ViewOrderSection.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="ViewOrderSection">
-+        <element name="openInvoiceForm" type="button" selector="#order_invoice"/>
-+        <element name="selectCaptureType" type="select" selector="select[name='invoice[capture_case]']"/>
-+        <element name="submitInvoice" type="button" selector="button.submit-button"/>
-+        <element name="commentsHistory" type="button" selector="#sales_order_view_tabs_order_history"/>
-+        <element name="capturedAmountText" type="text" selector="//div[@class='comments-block-item'][2]/div[@class='comments-block-item-comment']"/>
-+        <element name="capturedAmountTextUnsubmitted" type="text" selector="//div[@class='comments-block-item'][1]/div[@class='comments-block-item-comment']"/>
-+        <element name="orderStatus" type="text" selector=".note-list-item .note-list-status"/>
-+        <element name="invoices" type="button" selector="#sales_order_view_tabs_order_invoices"/>
-+        <element name="firstInvoice" type="text" selector=".data-grid tbody tr"/>
-+        <element name="transactions" type="button" selector="#sales_order_view_tabs_order_transactions"/>
-+        <element name="confirmCapture" type="text" selector="//table[@id='order_transactions_table']/tbody/tr/td[6]"/>
-+        <element name="confirmClosed" type="text" selector="//table[@id='order_transactions_table']/tbody/tr/td[7]"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/FullCaptureAuthorizenetAcceptjsTest.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/FullCaptureAuthorizenetAcceptjsTest.xml
-new file mode 100644
-index 00000000000..6aa6792e0e0
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/FullCaptureAuthorizenetAcceptjsTest.xml
-@@ -0,0 +1,75 @@
-+<?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="FullCaptureAuthorizenetAcceptjsTest">
-+        <annotations>
-+            <stories value="Authorize.net Accept.js"/>
-+            <title value="Full Capture using Authorize.net Accept.js"/>
-+            <description value="Capture an order placed using Authorize.net Accept.js"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-12255"/>
-+            <skip>
-+                <issueId value="DEVOPS-4604"/>
-+            </skip>
-+            <group value="AuthorizenetAcceptjs"/>
-+            <group value="ThirdPartyPayments"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <createData stepKey="createCustomer" entity="Simple_US_Customer"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!--Configure Auth.net-->
-+            <actionGroup ref="ConfigureAuthorizenetAcceptjs" stepKey="configureAuthorizenetAcceptjs">
-+                <argument name="paymentAction" value="Authorize Only"/>
-+            </actionGroup>
-+
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="DisableAuthorizenetAcceptjs" stepKey="DisableAuthorizenetAcceptjs"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Storefront Login-->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginStorefront">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Add product to cart-->
-+        <amOnPage url="$$createProduct.name$$.html" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-+        <waitForPageLoad stepKey="waitForCartToFill"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+
-+        <!--Checkout steps-->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="GoToCheckoutFromMinicartActionGroup"/>
-+        <waitForPageLoad stepKey="waitForCheckoutLoad"/>
-+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShipping"/>
-+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="submitShippingSelection"/>
-+        <waitForPageLoad stepKey="waitForShippingToFinish"/>
-+        <actionGroup ref="FillPaymentInformation" stepKey="fillPaymentInfo"/>
-+
-+        <!--View and validate order-->
-+        <actionGroup ref="ViewAndValidateOrderActionGroup" stepKey="viewAndValidateOrder">
-+            <argument name="amount" value="{{AuthorizenetAcceptjsOrderValidationData.twoSimpleProductsOrderAmount}}"/>
-+            <argument name="status" value="{{AuthorizenetAcceptjsOrderValidationData.processingStatusProcessing}}"/>
-+            <argument name="captureStatus" value="{{AuthorizenetAcceptjsOrderValidationData.captureStatusCapture}}"/>
-+            <argument name="closedStatus" value="{{AuthorizenetAcceptjsOrderValidationData.closedStatusNo}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/GuestCheckoutVirtualProductAuthorizenetAcceptjsTest.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/GuestCheckoutVirtualProductAuthorizenetAcceptjsTest.xml
-new file mode 100644
-index 00000000000..6f71bd18076
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/GuestCheckoutVirtualProductAuthorizenetAcceptjsTest.xml
-@@ -0,0 +1,84 @@
-+<?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="GuestCheckoutVirtualProductAuthorizenetAcceptjsTest">
-+        <annotations>
-+            <stories value="Authorize.net Accept.js"/>
-+            <title value="Guest Checkout of Virtual Product using Authorize.net Accept.js"/>
-+            <description value="Checkout a virtual product with a guest using Authorize.net Accept.js"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-12712"/>
-+            <skip>
-+                <issueId value="DEVOPS-4604"/>
-+            </skip>
-+            <group value="AuthorizenetAcceptjs"/>
-+            <group value="ThirdPartyPayments"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create virtual product -->
-+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+            <waitForPageLoad stepKey="waitForProductIndexPage"/>
-+            <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+                <argument name="product" value="defaultVirtualProduct"/>
-+            </actionGroup>
-+            <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
-+                <argument name="product" value="defaultVirtualProduct"/>
-+            </actionGroup>
-+            <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
-+
-+            <!--Configure Auth.net-->
-+            <actionGroup ref="ConfigureAuthorizenetAcceptjs" stepKey="configureAuthorizenetAcceptjs">
-+                <argument name="paymentAction" value="Authorize and Capture"/>
-+            </actionGroup>
-+
-+        </before>
-+        <after>
-+            <actionGroup ref="DisableAuthorizenetAcceptjs" stepKey="DisableAuthorizenetAcceptjs"/>
-+            <!-- Delete virtual product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="defaultVirtualProduct"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Add product to cart twice-->
-+        <amOnPage url="{{defaultVirtualProduct.sku}}.html" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-+        <waitForPageLoad stepKey="waitForCartToFill"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCartAgain"/>
-+        <waitForPageLoad stepKey="waitForCartToFillAgain"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage2"/>
-+
-+        <!--Checkout steps-->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="GoToCheckoutFromMinicartActionGroup"/>
-+        <waitForPageLoad stepKey="waitForCheckoutLoad"/>
-+
-+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="enterEmail"/>
-+        <click stepKey="clickOnAuthorizenetToggle" selector="{{AuthorizenetCheckoutSection.selectAuthorizenet}}"/>
-+        <waitForPageLoad stepKey="waitForBillingInfoLoad"/>
-+        <actionGroup ref="GuestCheckoutAuthorizenetFillBillingAddress" stepKey="fillAddressForm">
-+            <argument name="customer" value="Simple_US_Customer"/>
-+            <argument name="customerAddress" value="CustomerAddressSimple"/>
-+        </actionGroup>
-+        <actionGroup ref="FillPaymentInformation" stepKey="fillPaymentInfo"/>
-+
-+        <!--View and validate order-->
-+        <actionGroup ref="ViewAndValidateOrderActionGroupNoSubmit" stepKey="viewAndValidateOrder">
-+            <argument name="amount" value="{{AuthorizenetAcceptjsOrderValidationData.virtualProductOrderAmount}}"/>
-+            <argument name="status" value="{{AuthorizenetAcceptjsOrderValidationData.processingStatusProcessing}}"/>
-+            <argument name="captureStatus" value="{{AuthorizenetAcceptjsOrderValidationData.captureStatusCapture}}"/>
-+            <argument name="closedStatus" value="{{AuthorizenetAcceptjsOrderValidationData.closedStatusNo}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Block/FormTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Block/FormTest.php
-new file mode 100644
-index 00000000000..020b651aaaf
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Block/FormTest.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Block;
-+
-+use Magento\AuthorizenetAcceptjs\Block\Form;
-+use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\Backend\Model\Session\Quote;
-+use Magento\Framework\View\Element\Template\Context;
-+use Magento\Payment\Model\Config as PaymentConfig;
-+
-+class FormTest extends TestCase
-+{
-+    /**
-+     * @var Form
-+     */
-+    private $block;
-+
-+    /**
-+     * @var Config|MockObject|InvocationMocker
-+     */
-+    private $configMock;
-+
-+    protected function setUp()
-+    {
-+        $contextMock = $this->createMock(Context::class);
-+        $this->configMock = $this->createMock(Config::class);
-+        $quoteMock = $this->getMockBuilder(Quote::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getStoreId'])
-+            ->getMock();
-+        $quoteMock->method('getStoreId')
-+            ->willReturn('123');
-+        $paymentConfig = $this->createMock(PaymentConfig::class);
-+
-+        $this->block = new Form(
-+            $contextMock,
-+            $paymentConfig,
-+            $this->configMock,
-+            $quoteMock
-+        );
-+    }
-+
-+    public function testIsCvvEnabled()
-+    {
-+        $this->configMock->method('isCvvEnabled')
-+            ->with('123')
-+            ->willReturn(true);
-+        $this->assertTrue($this->block->isCvvEnabled());
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Block/InfoTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Block/InfoTest.php
-new file mode 100644
-index 00000000000..70dfb140e15
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Block/InfoTest.php
-@@ -0,0 +1,80 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Block;
-+
-+use Magento\AuthorizenetAcceptjs\Block\Info;
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\Framework\Phrase;
-+use Magento\Framework\Phrase\RendererInterface;
-+use Magento\Framework\View\Element\Template\Context;
-+use Magento\Payment\Gateway\ConfigInterface;
-+use Magento\Payment\Model\InfoInterface;
-+use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class InfoTest extends TestCase
-+{
-+    public function testLabelsAreTranslated()
-+    {
-+        /** @var Context|MockObject|InvocationMocker $contextMock */
-+        $contextMock = $this->createMock(Context::class);
-+        /** @var Config|MockObject|InvocationMocker $configMock */
-+        $configMock = $this->createMock(ConfigInterface::class);
-+        $block = new Info($contextMock, $configMock);
-+        /** @var InfoInterface|MockObject|InvocationMocker $payment */
-+        $payment = $this->createMock(InfoInterface::class);
-+        /** @var RendererInterface|MockObject|InvocationMocker $translationRenderer */
-+        $translationRenderer = $this->createMock(RendererInterface::class);
-+
-+        // only foo should be used
-+        $configMock->method('getValue')
-+            ->willReturnMap([
-+                ['paymentInfoKeys', null,  'foo'],
-+                ['privateInfoKeys', null, '']
-+            ]);
-+
-+        // Give more info to ensure only foo is translated
-+        $payment->method('getAdditionalInformation')
-+            ->willReturnCallback(function ($name = null) {
-+                $info = [
-+                    'foo' => 'bar',
-+                    'baz' => 'bash'
-+                ];
-+
-+                if (empty($name)) {
-+                    return $info;
-+                }
-+
-+                return $info[$name];
-+            });
-+
-+        // Foo should be translated to Super Cool String
-+        $translationRenderer->method('render')
-+            ->with(['foo'], [])
-+            ->willReturn('Super Cool String');
-+
-+        $previousRenderer = Phrase::getRenderer();
-+        Phrase::setRenderer($translationRenderer);
-+
-+        try {
-+            $block->setData('info', $payment);
-+
-+            $info = $block->getSpecificInformation();
-+        } finally {
-+            // No matter what, restore the renderer
-+            Phrase::setRenderer($previousRenderer);
-+        }
-+
-+        // Assert the label was correctly translated
-+        $this->assertSame($info['Super Cool String'], 'bar');
-+        $this->assertArrayNotHasKey('foo', $info);
-+        $this->assertArrayNotHasKey('baz', $info);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Block/PaymentTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Block/PaymentTest.php
-new file mode 100644
-index 00000000000..11ae27f9d2e
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Block/PaymentTest.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Block;
-+
-+use Magento\AuthorizenetAcceptjs\Block\Payment;
-+use Magento\AuthorizenetAcceptjs\Model\Ui\ConfigProvider;
-+use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Framework\View\Element\Template\Context;
-+use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class PaymentTest extends TestCase
-+{
-+    /**
-+     * @var ConfigProvider|MockObject|InvocationMocker
-+     */
-+    private $configMock;
-+
-+    /**
-+     * @var Payment
-+     */
-+    private $block;
-+
-+    protected function setUp()
-+    {
-+        $contextMock = $this->createMock(Context::class);
-+        $this->configMock = $this->createMock(ConfigProvider::class);
-+        $this->block = new Payment($contextMock, $this->configMock, new Json());
-+    }
-+
-+    public function testConfigIsCreated()
-+    {
-+        $this->configMock->method('getConfig')
-+            ->willReturn([
-+                'payment' => [
-+                    'authorizenet_acceptjs' => [
-+                        'foo' => 'bar'
-+                    ]
-+                ]
-+            ]);
-+
-+        $result = $this->block->getPaymentConfig();
-+        $expected = '{"foo":"bar","code":"authorizenet_acceptjs"}';
-+        $this->assertEquals($expected, $result);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/AcceptPaymentStrategyCommandTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/AcceptPaymentStrategyCommandTest.php
-new file mode 100644
-index 00000000000..316fef54433
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/AcceptPaymentStrategyCommandTest.php
-@@ -0,0 +1,131 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Command\AcceptPaymentStrategyCommand;
-+use Magento\AuthorizenetAcceptjs\Gateway\Command\RefundTransactionStrategyCommand;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Payment\Gateway\Command\ResultInterface;
-+use Magento\Payment\Gateway\CommandInterface;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class AcceptPaymentStrategyCommandTest extends TestCase
-+{
-+    /**
-+     * @var CommandInterface|MockObject
-+     */
-+    private $commandMock;
-+
-+    /**
-+     * @var CommandInterface|MockObject
-+     */
-+    private $transactionDetailsCommandMock;
-+
-+    /**
-+     * @var CommandPoolInterface|MockObject
-+     */
-+    private $commandPoolMock;
-+
-+    /**
-+     * @var RefundTransactionStrategyCommand
-+     */
-+    private $command;
-+
-+    /**
-+     * @var ResultInterface|MockObject
-+     */
-+    private $transactionResultMock;
-+
-+    protected function setUp()
-+    {
-+        $this->transactionDetailsCommandMock = $this->createMock(CommandInterface::class);
-+        $this->commandMock = $this->createMock(CommandInterface::class);
-+        $this->transactionResultMock = $this->createMock(ResultInterface::class);
-+        $this->commandPoolMock = $this->createMock(CommandPoolInterface::class);
-+        $this->command = new AcceptPaymentStrategyCommand(
-+            $this->commandPoolMock,
-+            new SubjectReader()
-+        );
-+    }
-+
-+    /**
-+     * @param string $status
-+     * @dataProvider inReviewStatusesProvider
-+     */
-+    public function testCommandWillAcceptInTheGatewayWhenInFDSReview(string $status)
-+    {
-+        // Assert command is executed
-+        $this->commandMock->expects($this->once())
-+            ->method('execute');
-+
-+        $this->commandPoolMock->method('get')
-+            ->willReturnMap([
-+                ['get_transaction_details', $this->transactionDetailsCommandMock],
-+                ['accept_fds', $this->commandMock]
-+            ]);
-+
-+        $this->transactionResultMock->method('get')
-+            ->willReturn([
-+                'transaction' => [
-+                    'transactionStatus' => $status
-+                ]
-+            ]);
-+
-+        $buildSubject = [
-+            'foo' => '123'
-+        ];
-+
-+        $this->transactionDetailsCommandMock->expects($this->once())
-+            ->method('execute')
-+            ->with($buildSubject)
-+            ->willReturn($this->transactionResultMock);
-+
-+        $this->command->execute($buildSubject);
-+    }
-+
-+    public function testCommandWillDoNothingWhenTransactionHasAlreadyBeenAuthorized()
-+    {
-+        // Assert command is never executed
-+        $this->commandMock->expects($this->never())
-+            ->method('execute');
-+
-+        $this->commandPoolMock->method('get')
-+            ->willReturnMap([
-+                ['get_transaction_details', $this->transactionDetailsCommandMock],
-+            ]);
-+
-+        $this->transactionResultMock->method('get')
-+            ->willReturn([
-+                'transaction' => [
-+                    'transactionStatus' => 'anythingelseisfine'
-+                ]
-+            ]);
-+
-+        $buildSubject = [
-+            'foo' => '123'
-+        ];
-+
-+        $this->transactionDetailsCommandMock->expects($this->once())
-+            ->method('execute')
-+            ->with($buildSubject)
-+            ->willReturn($this->transactionResultMock);
-+
-+        $this->command->execute($buildSubject);
-+    }
-+
-+    public function inReviewStatusesProvider()
-+    {
-+        return [
-+            ['FDSPendingReview'],
-+            ['FDSAuthorizedPendingReview']
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
-new file mode 100644
-index 00000000000..4cbded97647
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
-@@ -0,0 +1,181 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Command\CaptureStrategyCommand;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Framework\Api\FilterBuilder;
-+use Magento\Framework\Api\Search\SearchCriteria;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Payment\Gateway\Command\GatewayCommand;
-+use Magento\Payment\Gateway\Data\PaymentDataObject;
-+use Magento\Sales\Api\Data\TransactionSearchResultInterface;
-+use Magento\Sales\Api\TransactionRepositoryInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class CaptureStrategyCommandTest extends TestCase
-+{
-+    /**
-+     * @var CaptureStrategyCommand
-+     */
-+    private $strategyCommand;
-+
-+    /**
-+     * @var CommandPoolInterface|MockObject
-+     */
-+    private $commandPoolMock;
-+
-+    /**
-+     * @var TransactionRepositoryInterface|MockObject
-+     */
-+    private $transactionRepositoryMock;
-+
-+    /**
-+     * @var FilterBuilder|MockObject
-+     */
-+    private $filterBuilderMock;
-+
-+    /**
-+     * @var SearchCriteriaBuilder|MockObject
-+     */
-+    private $searchCriteriaBuilderMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var PaymentDataObject|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    /**
-+     * @var GatewayCommand|MockObject
-+     */
-+    private $commandMock;
-+
-+    /**
-+     * @var TransactionSearchResultInterface|MockObject
-+     */
-+    private $transactionsResult;
-+
-+    protected function setUp()
-+    {
-+        // Simple mocks
-+        $this->paymentDOMock = $this->createMock(PaymentDataObject::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+        $this->commandMock = $this->createMock(GatewayCommand::class);
-+        $this->commandPoolMock = $this->createMock(CommandPoolInterface::class);
-+        $this->searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
-+        $this->transactionRepositoryMock = $this->createMock(TransactionRepositoryInterface::class);
-+
-+        // The search criteria builder should return the criteria with the specified filters
-+        $this->filterBuilderMock = $this->createMock(FilterBuilder::class);
-+        // We aren't coupling the implementation to the test. The test only cares how the result is processed
-+        $this->filterBuilderMock->method('setField')
-+            ->willReturnSelf();
-+        $this->filterBuilderMock->method('setValue')
-+            ->willReturnSelf();
-+        $searchCriteria = new SearchCriteria();
-+        $this->searchCriteriaBuilderMock->method('addFilters')
-+            ->willReturnSelf();
-+        $this->searchCriteriaBuilderMock->method('create')
-+            ->willReturn($searchCriteria);
-+        // The transaction result can be customized per test to simulate different scenarios
-+        $this->transactionsResult = $this->createMock(TransactionSearchResultInterface::class);
-+        $this->transactionRepositoryMock->method('getList')
-+            ->with($searchCriteria)
-+            ->willReturn($this->transactionsResult);
-+
-+        $this->strategyCommand = new CaptureStrategyCommand(
-+            $this->commandPoolMock,
-+            $this->transactionRepositoryMock,
-+            $this->filterBuilderMock,
-+            $this->searchCriteriaBuilderMock,
-+            new SubjectReader()
-+        );
-+    }
-+
-+    public function testExecuteWillAuthorizeWhenNotAuthorizedAndNotCaptured()
-+    {
-+        $subject = ['payment' => $this->paymentDOMock];
-+
-+        // Hasn't been authorized
-+        $this->paymentMock->method('getAuthorizationTransaction')
-+            ->willReturn(false);
-+        // Hasn't been captured
-+        $this->transactionsResult->method('getTotalCount')
-+            ->willReturn(0);
-+        // Assert authorize command was used
-+        $this->commandPoolMock->expects($this->once())
-+            ->method('get')
-+            ->with('sale')
-+            ->willReturn($this->commandMock);
-+        // Assert execute was called and with correct data
-+        $this->commandMock->expects($this->once())
-+            ->method('execute')
-+            ->with($subject);
-+
-+        $this->strategyCommand->execute($subject);
-+        // Assertions are performed via mock expects above
-+    }
-+
-+    public function testExecuteWillAuthorizeAndCaptureWhenAlreadyCaptured()
-+    {
-+        $subject = ['payment' => $this->paymentDOMock];
-+
-+        // Already authorized
-+        $this->paymentMock->method('getAuthorizationTransaction')
-+            ->willReturn(true);
-+        // And already captured
-+        $this->transactionsResult->method('getTotalCount')
-+            ->willReturn(1);
-+        // Assert authorize command was used
-+        $this->commandPoolMock->expects($this->once())
-+            ->method('get')
-+            ->with('settle')
-+            ->willReturn($this->commandMock);
-+        // Assert execute was called and with correct data
-+        $this->commandMock->expects($this->once())
-+            ->method('execute')
-+            ->with($subject);
-+
-+        $this->strategyCommand->execute($subject);
-+        // Assertions are performed via mock expects above
-+    }
-+
-+    public function testExecuteWillCaptureWhenAlreadyAuthorizedButNotCaptured()
-+    {
-+        $subject = ['payment' => $this->paymentDOMock];
-+
-+        // Was already authorized
-+        $this->paymentMock->method('getAuthorizationTransaction')
-+            ->willReturn(true);
-+        // But, hasn't been captured
-+        $this->transactionsResult->method('getTotalCount')
-+            ->willReturn(0);
-+        // Assert authorize command was used
-+        $this->commandPoolMock->expects($this->once())
-+            ->method('get')
-+            ->with('settle')
-+            ->willReturn($this->commandMock);
-+        // Assert execute was called and with correct data
-+        $this->commandMock->expects($this->once())
-+            ->method('execute')
-+            ->with($subject);
-+
-+        $this->strategyCommand->execute($subject);
-+        // Assertions are performed via mock expects above
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/FetchTransactionInfoCommandTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/FetchTransactionInfoCommandTest.php
-new file mode 100644
-index 00000000000..757500c7e50
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/FetchTransactionInfoCommandTest.php
-@@ -0,0 +1,132 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Command\FetchTransactionInfoCommand;
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Payment\Gateway\Command\ResultInterface;
-+use Magento\Payment\Gateway\CommandInterface;
-+use Magento\Payment\Gateway\Data\PaymentDataObject;
-+use Magento\Payment\Gateway\Response\HandlerInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class FetchTransactionInfoCommandTest extends TestCase
-+{
-+    /**
-+     * @var CommandInterface|MockObject
-+     */
-+    private $transactionDetailsCommandMock;
-+
-+    /**
-+     * @var CommandPoolInterface|MockObject
-+     */
-+    private $commandPoolMock;
-+
-+    /**
-+     * @var FetchTransactionInfoCommand
-+     */
-+    private $command;
-+
-+    /**
-+     * @var ResultInterface|MockObject
-+     */
-+    private $transactionResultMock;
-+
-+    /**
-+     * @var PaymentDataObject|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $configMock;
-+
-+    /**
-+     * @var HandlerInterface
-+     */
-+    private $handlerMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObject::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+        $this->configMock = $this->createMock(Config::class);
-+        $this->configMock->method('getTransactionInfoSyncKeys')
-+            ->willReturn(['foo', 'bar']);
-+        $orderMock = $this->createMock(Order::class);
-+        $this->paymentDOMock->method('getOrder')
-+            ->willReturn($orderMock);
-+        $this->transactionDetailsCommandMock = $this->createMock(CommandInterface::class);
-+        $this->transactionResultMock = $this->createMock(ResultInterface::class);
-+        $this->commandPoolMock = $this->createMock(CommandPoolInterface::class);
-+        $this->handlerMock = $this->createMock(HandlerInterface::class);
-+        $this->command = new FetchTransactionInfoCommand(
-+            $this->commandPoolMock,
-+            new SubjectReader(),
-+            $this->configMock,
-+            $this->handlerMock
-+        );
-+    }
-+
-+    public function testCommandWillMarkTransactionAsApprovedWhenNotVoid()
-+    {
-+        $response = [
-+            'transaction' => [
-+                'transactionStatus' => 'authorizedPendingCapture',
-+                'foo' => 'abc',
-+                'bar' => 'cba',
-+                'dontreturnme' => 'justdont'
-+            ]
-+        ];
-+
-+        $this->commandPoolMock->method('get')
-+            ->willReturnMap([
-+                ['get_transaction_details', $this->transactionDetailsCommandMock],
-+            ]);
-+
-+        $this->transactionResultMock->method('get')
-+            ->willReturn($response);
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock
-+        ];
-+
-+        $this->transactionDetailsCommandMock->expects($this->once())
-+            ->method('execute')
-+            ->with($buildSubject)
-+            ->willReturn($this->transactionResultMock);
-+
-+        $this->handlerMock->expects($this->once())
-+            ->method('handle')
-+            ->with($buildSubject, $response)
-+            ->willReturn($this->transactionResultMock);
-+
-+        $result = $this->command->execute($buildSubject);
-+
-+        $expected = [
-+            'foo' => 'abc',
-+            'bar' => 'cba'
-+        ];
-+
-+        $this->assertSame($expected, $result);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/GatewayQueryCommandTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/GatewayQueryCommandTest.php
-new file mode 100644
-index 00000000000..e37db349363
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/GatewayQueryCommandTest.php
-@@ -0,0 +1,196 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Command\GatewayQueryCommand;
-+use Magento\Payment\Gateway\Command\Result\ArrayResult;
-+use Magento\Payment\Gateway\Http\ClientInterface;
-+use Magento\Payment\Gateway\Http\TransferFactoryInterface;
-+use Magento\Payment\Gateway\Http\TransferInterface;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Payment\Gateway\Validator\Result;
-+use Magento\Payment\Gateway\Validator\ValidatorInterface;
-+use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+use Psr\Log\LoggerInterface;
-+
-+class GatewayQueryCommandTest extends TestCase
-+{
-+    /**
-+     * @var GatewayQueryCommand
-+     */
-+    private $command;
-+
-+    /**
-+     * @var BuilderInterface|MockObject|InvocationMocker
-+     */
-+    private $requestBuilderMock;
-+
-+    /**
-+     * @var TransferFactoryInterface|MockObject|InvocationMocker
-+     */
-+    private $transferFactoryMock;
-+
-+    /**
-+     * @var ClientInterface|MockObject|InvocationMocker
-+     */
-+    private $clientMock;
-+
-+    /**
-+     * @var LoggerInterface|MockObject|InvocationMocker
-+     */
-+    private $loggerMock;
-+
-+    /**
-+     * @var ValidatorInterface|MockObject|InvocationMocker
-+     */
-+    private $validatorMock;
-+
-+    /**
-+     * @var TransferInterface|MockObject|InvocationMocker
-+     */
-+    private $transferMock;
-+
-+    protected function setUp()
-+    {
-+        $this->requestBuilderMock = $this->createMock(BuilderInterface::class);
-+        $this->transferFactoryMock = $this->createMock(TransferFactoryInterface::class);
-+        $this->transferMock = $this->createMock(TransferInterface::class);
-+        $this->clientMock = $this->createMock(ClientInterface::class);
-+        $this->loggerMock = $this->createMock(LoggerInterface::class);
-+        $this->validatorMock = $this->createMock(ValidatorInterface::class);
-+
-+        $this->command = new GatewayQueryCommand(
-+            $this->requestBuilderMock,
-+            $this->transferFactoryMock,
-+            $this->clientMock,
-+            $this->loggerMock,
-+            $this->validatorMock
-+        );
-+    }
-+
-+    public function testNormalExecution()
-+    {
-+        $buildSubject = [
-+            'foo' => '123'
-+        ];
-+
-+        $request = [
-+            'bar' => '321'
-+        ];
-+
-+        $response = [
-+            'transaction' => [
-+                'transactionType' => 'foo',
-+                'transactionStatus' => 'bar',
-+                'responseCode' => 'baz'
-+            ]
-+        ];
-+
-+        $validationSubject = $buildSubject;
-+        $validationSubject['response'] = $response;
-+
-+        $this->requestBuilderMock->method('build')
-+            ->with($buildSubject)
-+            ->willReturn($request);
-+
-+        $this->transferFactoryMock->method('create')
-+            ->with($request)
-+            ->willReturn($this->transferMock);
-+
-+        $this->clientMock->method('placeRequest')
-+            ->with($this->transferMock)
-+            ->willReturn($response);
-+
-+        $this->validatorMock->method('validate')
-+            ->with($validationSubject)
-+            ->willReturn(new Result(true));
-+
-+        $result = $this->command->execute($buildSubject);
-+
-+        $this->assertInstanceOf(ArrayResult::class, $result);
-+        $this->assertEquals($response, $result->get());
-+    }
-+
-+    /**
-+     * @expectedExceptionMessage There was an error while trying to process the request.
-+     * @expectedException \Magento\Payment\Gateway\Command\CommandException
-+     */
-+    public function testExceptionIsThrownAndLoggedWhenRequestFails()
-+    {
-+        $buildSubject = [
-+            'foo' => '123'
-+        ];
-+
-+        $request = [
-+            'bar' => '321'
-+        ];
-+
-+        $this->requestBuilderMock->method('build')
-+            ->with($buildSubject)
-+            ->willReturn($request);
-+
-+        $this->transferFactoryMock->method('create')
-+            ->with($request)
-+            ->willReturn($this->transferMock);
-+
-+        $e = new \Exception('foobar');
-+
-+        $this->clientMock->method('placeRequest')
-+            ->with($this->transferMock)
-+            ->willThrowException($e);
-+
-+        // assert the exception is logged
-+        $this->loggerMock->expects($this->once())
-+            ->method('critical')
-+            ->with($e);
-+
-+        $this->command->execute($buildSubject);
-+    }
-+    /**
-+     * @expectedExceptionMessage There was an error while trying to process the request.
-+     * @expectedException \Magento\Payment\Gateway\Command\CommandException
-+     */
-+    public function testExceptionIsThrownWhenResponseIsInvalid()
-+    {
-+        $buildSubject = [
-+            'foo' => '123'
-+        ];
-+
-+        $request = [
-+            'bar' => '321'
-+        ];
-+
-+        $response = [
-+            'baz' => '456'
-+        ];
-+
-+        $validationSubject = $buildSubject;
-+        $validationSubject['response'] = $response;
-+
-+        $this->requestBuilderMock->method('build')
-+            ->with($buildSubject)
-+            ->willReturn($request);
-+
-+        $this->transferFactoryMock->method('create')
-+            ->with($request)
-+            ->willReturn($this->transferMock);
-+
-+        $this->clientMock->method('placeRequest')
-+            ->with($this->transferMock)
-+            ->willReturn($response);
-+
-+        $this->validatorMock->method('validate')
-+            ->with($validationSubject)
-+            ->willReturn(new Result(false));
-+
-+        $this->command->execute($buildSubject);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/RefundTransactionStrategyCommandTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/RefundTransactionStrategyCommandTest.php
-new file mode 100644
-index 00000000000..df6d89d7bc5
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/RefundTransactionStrategyCommandTest.php
-@@ -0,0 +1,153 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Command\RefundTransactionStrategyCommand;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Payment\Gateway\Command\ResultInterface;
-+use Magento\Payment\Gateway\CommandInterface;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class RefundTransactionStrategyCommandTest extends TestCase
-+{
-+    /**
-+     * @var CommandInterface|MockObject
-+     */
-+    private $commandMock;
-+
-+    /**
-+     * @var CommandInterface|MockObject
-+     */
-+    private $transactionDetailsCommandMock;
-+
-+    /**
-+     * @var CommandPoolInterface|MockObject
-+     */
-+    private $commandPoolMock;
-+
-+    /**
-+     * @var RefundTransactionStrategyCommand
-+     */
-+    private $command;
-+
-+    /**
-+     * @var ResultInterface|MockObject
-+     */
-+    private $transactionResultMock;
-+
-+    protected function setUp()
-+    {
-+        $this->transactionDetailsCommandMock = $this->createMock(CommandInterface::class);
-+        $this->commandMock = $this->createMock(CommandInterface::class);
-+        $this->transactionResultMock = $this->createMock(ResultInterface::class);
-+        $this->commandPoolMock = $this->createMock(CommandPoolInterface::class);
-+        $this->command = new RefundTransactionStrategyCommand(
-+            $this->commandPoolMock,
-+            new SubjectReader()
-+        );
-+    }
-+
-+    public function testCommandWillVoidWhenTransactionIsPendingSettlement()
-+    {
-+        // Assert command is executed
-+        $this->commandMock->expects($this->once())
-+            ->method('execute');
-+
-+        $this->commandPoolMock->method('get')
-+            ->willReturnMap([
-+                ['get_transaction_details', $this->transactionDetailsCommandMock],
-+                ['void', $this->commandMock]
-+            ]);
-+
-+        $this->transactionResultMock->method('get')
-+            ->willReturn([
-+                'transaction' => [
-+                    'transactionStatus' => 'capturedPendingSettlement'
-+                ]
-+            ]);
-+
-+        $buildSubject = [
-+            'foo' => '123'
-+        ];
-+
-+        $this->transactionDetailsCommandMock->expects($this->once())
-+            ->method('execute')
-+            ->with($buildSubject)
-+            ->willReturn($this->transactionResultMock);
-+
-+        $this->command->execute($buildSubject);
-+    }
-+
-+    public function testCommandWillRefundWhenTransactionIsSettled()
-+    {
-+        // Assert command is executed
-+        $this->commandMock->expects($this->once())
-+            ->method('execute');
-+
-+        $this->commandPoolMock->method('get')
-+            ->willReturnMap([
-+                ['get_transaction_details', $this->transactionDetailsCommandMock],
-+                ['refund_settled', $this->commandMock]
-+            ]);
-+
-+        $this->transactionResultMock->method('get')
-+            ->willReturn([
-+                'transaction' => [
-+                    'transactionStatus' => 'settledSuccessfully'
-+                ]
-+            ]);
-+
-+        $buildSubject = [
-+            'foo' => '123'
-+        ];
-+
-+        $this->transactionDetailsCommandMock->expects($this->once())
-+            ->method('execute')
-+            ->with($buildSubject)
-+            ->willReturn($this->transactionResultMock);
-+
-+        $this->command->execute($buildSubject);
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Payment\Gateway\Command\CommandException
-+     * @expectedExceptionMessage This transaction cannot be refunded with its current status.
-+     */
-+    public function testCommandWillThrowExceptionWhenTransactionIsInInvalidState()
-+    {
-+        // Assert command is never executed
-+        $this->commandMock->expects($this->never())
-+            ->method('execute');
-+
-+        $this->commandPoolMock->method('get')
-+            ->willReturnMap([
-+                ['get_transaction_details', $this->transactionDetailsCommandMock],
-+            ]);
-+
-+        $this->transactionResultMock->method('get')
-+            ->willReturn([
-+                'transaction' => [
-+                    'transactionStatus' => 'somethingIsWrong'
-+                ]
-+            ]);
-+
-+        $buildSubject = [
-+            'foo' => '123'
-+        ];
-+
-+        $this->transactionDetailsCommandMock->expects($this->once())
-+            ->method('execute')
-+            ->with($buildSubject)
-+            ->willReturn($this->transactionResultMock);
-+
-+        $this->command->execute($buildSubject);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/ConfigTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/ConfigTest.php
-new file mode 100644
-index 00000000000..da2b953d843
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/ConfigTest.php
-@@ -0,0 +1,126 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Store\Model\ScopeInterface;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class ConfigTest extends TestCase
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $model;
-+
-+    /**
-+     * @var ScopeConfigInterface|MockObject
-+     */
-+    private $scopeConfigMock;
-+
-+    protected function setUp()
-+    {
-+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
-+
-+        $objectManager = new ObjectManager($this);
-+        $this->model = $objectManager->getObject(
-+            Config::class,
-+            [
-+                'scopeConfig' => $this->scopeConfigMock,
-+                'methodCode' => Config::METHOD,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @param $getterName
-+     * @param $configField
-+     * @param $configValue
-+     * @param $expectedValue
-+     * @dataProvider configMapProvider
-+     */
-+    public function testConfigGetters($getterName, $configField, $configValue, $expectedValue)
-+    {
-+        $this->scopeConfigMock->method('getValue')
-+            ->with($this->getPath($configField), ScopeInterface::SCOPE_STORE, 123)
-+            ->willReturn($configValue);
-+        $this->assertEquals($expectedValue, $this->model->{$getterName}(123));
-+    }
-+
-+    /**
-+     * @dataProvider environmentUrlProvider
-+     * @param $environment
-+     * @param $expectedUrl
-+     */
-+    public function testGetApiUrl($environment, $expectedUrl)
-+    {
-+        $this->scopeConfigMock->method('getValue')
-+            ->with($this->getPath('environment'), ScopeInterface::SCOPE_STORE, 123)
-+            ->willReturn($environment);
-+        $this->assertEquals($expectedUrl, $this->model->getApiUrl(123));
-+    }
-+
-+    /**
-+     * @dataProvider environmentSolutionProvider
-+     * @param $environment
-+     * @param $expectedSolution
-+     */
-+    public function testGetSolutionIdSandbox($environment, $expectedSolution)
-+    {
-+        $this->scopeConfigMock->method('getValue')
-+            ->with($this->getPath('environment'), ScopeInterface::SCOPE_STORE, 123)
-+            ->willReturn($environment);
-+        $this->assertEquals($expectedSolution, $this->model->getSolutionId(123));
-+    }
-+
-+    public function configMapProvider()
-+    {
-+        return [
-+            ['getLoginId', 'login', 'username', 'username'],
-+            ['getEnvironment', 'environment', 'production', 'production'],
-+            ['getClientKey', 'public_client_key', 'abc', 'abc'],
-+            ['getTransactionKey', 'trans_key', 'password', 'password'],
-+            ['getLegacyTransactionHash', 'trans_md5', 'abc123', 'abc123'],
-+            ['getTransactionSignatureKey', 'trans_signature_key', 'abc123', 'abc123'],
-+            ['getPaymentAction', 'payment_action', 'authorize', 'authorize'],
-+            ['shouldEmailCustomer', 'email_customer', true, true],
-+            ['isCvvEnabled', 'cvv_enabled', true, true],
-+            ['getAdditionalInfoKeys', 'paymentInfoKeys', 'a,b,c', ['a', 'b', 'c']],
-+            ['getTransactionInfoSyncKeys', 'transactionSyncKeys', 'a,b,c', ['a', 'b', 'c']],
-+        ];
-+    }
-+    public function environmentUrlProvider()
-+    {
-+        return [
-+            ['sandbox', 'https://apitest.authorize.net/xml/v1/request.api'],
-+            ['production', 'https://api.authorize.net/xml/v1/request.api'],
-+        ];
-+    }
-+
-+    public function environmentSolutionProvider()
-+    {
-+        return [
-+            ['sandbox', 'AAA102993'],
-+            ['production', 'AAA175350'],
-+        ];
-+    }
-+
-+    /**
-+     * Return config path
-+     *
-+     * @param string $field
-+     * @return string
-+     */
-+    private function getPath($field)
-+    {
-+        return sprintf(Config::DEFAULT_PATH_PATTERN, Config::METHOD, $field);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Http/ClientTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Http/ClientTest.php
-new file mode 100644
-index 00000000000..4086195ff4c
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Http/ClientTest.php
-@@ -0,0 +1,218 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Http;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Http\Client;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\HTTP\ZendClientFactory;
-+use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Payment\Gateway\Http\TransferInterface;
-+use Magento\Payment\Model\Method\Logger;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+use Psr\Log\LoggerInterface;
-+use Zend_Http_Client;
-+use Zend_Http_Response;
-+
-+class ClientTest extends TestCase
-+{
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var Logger
-+     */
-+    private $paymentLogger;
-+
-+    /**
-+     * @var ZendClientFactory
-+     */
-+    private $httpClientFactory;
-+
-+    /**
-+     * @var Zend_Http_Client
-+     */
-+    private $httpClient;
-+
-+    /**
-+     * @var Zend_Http_Response
-+     */
-+    private $httpResponse;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = new ObjectManager($this);
-+        $this->paymentLogger = $this->createMock(Logger::class);
-+        $this->httpClientFactory = $this->createMock(ZendClientFactory::class);
-+        $this->httpClient = $this->createMock(Zend_Http_Client::class);
-+        $this->httpResponse = $this->createMock(Zend_Http_Response::class);
-+        $this->httpClientFactory->method('create')->will($this->returnValue($this->httpClient));
-+        $this->httpClient->method('request')
-+            ->willReturn($this->httpResponse);
-+        /** @var MockObject $logger */
-+        $this->logger = $this->createMock(LoggerInterface::class);
-+    }
-+
-+    public function testCanSendRequest()
-+    {
-+        // Assert the raw data was set on the client
-+        $this->httpClient->expects($this->once())
-+            ->method('setRawData')
-+            ->with(
-+                '{"doSomeThing":{"foobar":"baz"}}',
-+                'application/json'
-+            );
-+
-+        $request = [
-+            'payload_type' => 'doSomeThing',
-+            'foobar' => 'baz'
-+        ];
-+        // Authorize.net returns a BOM and refuses to fix it
-+        $response = pack('CCC', 0xef, 0xbb, 0xbf) . '{"foo":{"bar":"baz"}}';
-+
-+        $this->httpResponse->method('getBody')
-+            ->willReturn($response);
-+
-+        // Assert the logger was given the data
-+        $this->paymentLogger->expects($this->once())
-+            ->method('debug')
-+            ->with(['request' => $request, 'response' => '{"foo":{"bar":"baz"}}']);
-+
-+        /**
-+         * @var $apiClient Client
-+         */
-+        $apiClient = $this->objectManager->getObject(Client::class, [
-+            'httpClientFactory' => $this->httpClientFactory,
-+            'paymentLogger' => $this->paymentLogger,
-+            'json' => new Json()
-+        ]);
-+
-+        $result = $apiClient->placeRequest($this->getTransferObjectMock($request));
-+
-+        $this->assertSame('baz', $result['foo']['bar']);
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Something went wrong in the payment gateway.
-+     */
-+    public function testExceptionIsThrownWhenEmptyResponseIsReceived()
-+    {
-+        // Assert the client has the raw data set
-+        $this->httpClient->expects($this->once())
-+            ->method('setRawData')
-+            ->with(
-+                '{"doSomeThing":{"foobar":"baz"}}',
-+                'application/json'
-+            );
-+
-+        $this->httpResponse->method('getBody')
-+            ->willReturn('');
-+
-+        // Assert the exception is given to the logger
-+        $this->logger->expects($this->once())
-+            ->method('critical')
-+            ->with($this->callback(function ($e) {
-+                return $e instanceof \Exception
-+                    && $e->getMessage() === 'Invalid JSON was returned by the gateway';
-+            }));
-+
-+        $request = [
-+            'payload_type' => 'doSomeThing',
-+            'foobar' => 'baz'
-+        ];
-+
-+        // Assert the logger was given the data
-+        $this->paymentLogger->expects($this->once())
-+            ->method('debug')
-+            ->with(['request' => $request, 'response' => '']);
-+
-+        /**
-+         * @var $apiClient Client
-+         */
-+        $apiClient = $this->objectManager->getObject(Client::class, [
-+            'httpClientFactory' => $this->httpClientFactory,
-+            'paymentLogger' => $this->paymentLogger,
-+            'logger' => $this->logger,
-+            'json' => new Json()
-+        ]);
-+
-+        $apiClient->placeRequest($this->getTransferObjectMock($request));
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Something went wrong in the payment gateway.
-+     */
-+    public function testExceptionIsThrownWhenInvalidResponseIsReceived()
-+    {
-+        // Assert the client was given the raw data
-+        $this->httpClient->expects($this->once())
-+            ->method('setRawData')
-+            ->with(
-+                '{"doSomeThing":{"foobar":"baz"}}',
-+                'application/json'
-+            );
-+
-+        $this->httpResponse->method('getBody')
-+            ->willReturn('bad');
-+
-+        $request = [
-+            'payload_type' => 'doSomeThing',
-+            'foobar' => 'baz'
-+        ];
-+
-+        // Assert the logger was given the data
-+        $this->paymentLogger->expects($this->once())
-+            ->method('debug')
-+            ->with(['request' => $request, 'response' => 'bad']);
-+
-+        // Assert the exception was given to the logger
-+        $this->logger->expects($this->once())
-+            ->method('critical')
-+            ->with($this->callback(function ($e) {
-+                return $e instanceof \Exception
-+                    && $e->getMessage() === 'Invalid JSON was returned by the gateway';
-+            }));
-+
-+        /**
-+         * @var $apiClient Client
-+         */
-+        $apiClient = $this->objectManager->getObject(Client::class, [
-+            'httpClientFactory' => $this->httpClientFactory,
-+            'paymentLogger' => $this->paymentLogger,
-+            'logger' => $this->logger,
-+            'json' => new Json()
-+        ]);
-+
-+        $apiClient->placeRequest($this->getTransferObjectMock($request));
-+    }
-+
-+    /**
-+     * Creates mock object for TransferInterface.
-+     *
-+     * @return TransferInterface|MockObject
-+     */
-+    private function getTransferObjectMock(array $data)
-+    {
-+        $transferObjectMock = $this->createMock(TransferInterface::class);
-+        $transferObjectMock->method('getBody')
-+            ->willReturn($data);
-+
-+        return $transferObjectMock;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Http/Payload/Filter/RemoveFieldsFilterTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Http/Payload/Filter/RemoveFieldsFilterTest.php
-new file mode 100644
-index 00000000000..bcc6279f5b1
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Http/Payload/Filter/RemoveFieldsFilterTest.php
-@@ -0,0 +1,36 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Http\Payload\Filter;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Http\Payload\Filter\RemoveFieldsFilter;
-+use PHPUnit\Framework\TestCase;
-+
-+class RemoveFieldsFilterTest extends TestCase
-+{
-+    public function testFilterRemovesFields()
-+    {
-+        $filter = new RemoveFieldsFilter(['foo', 'bar']);
-+
-+        $actual = $filter->filter([
-+            'some' => 123,
-+            'data' => 321,
-+            'foo' => 'to',
-+            'filter' => ['blah'],
-+            'bar' => 'fields from'
-+        ]);
-+
-+        $expected = [
-+            'some' => 123,
-+            'data' => 321,
-+            'filter' => ['blah'],
-+        ];
-+
-+        $this->assertEquals($expected, $actual);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Http/TransferFactoryTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Http/TransferFactoryTest.php
-new file mode 100644
-index 00000000000..954fd9782bd
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Http/TransferFactoryTest.php
-@@ -0,0 +1,73 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Http;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Http\Payload\Filter\RemoveFieldsFilter;
-+use Magento\AuthorizenetAcceptjs\Gateway\Http\TransferFactory;
-+use Magento\Payment\Gateway\Http\TransferBuilder;
-+use Magento\Payment\Gateway\Http\TransferInterface;
-+use Magento\AuthorizenetAcceptjs\Gateway\Http\Payload\FilterInterface;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class TransferFactoryTest extends TestCase
-+{
-+    /**
-+     * @var TransferFactory
-+     */
-+    private $transferFactory;
-+
-+    /**
-+     * @var TransferFactory
-+     */
-+    private $transferMock;
-+
-+    /**
-+     * @var TransferBuilder|MockObject
-+     */
-+    private $transferBuilder;
-+
-+    /**
-+     * @var FilterInterface|MockObject
-+     */
-+    private $filterMock;
-+
-+    protected function setUp()
-+    {
-+        $this->transferBuilder = $this->createMock(TransferBuilder::class);
-+        $this->transferMock = $this->createMock(TransferInterface::class);
-+        $this->filterMock = $this->createMock(RemoveFieldsFilter::class);
-+
-+        $this->transferFactory = new TransferFactory(
-+            $this->transferBuilder,
-+            [$this->filterMock]
-+        );
-+    }
-+
-+    public function testCreate()
-+    {
-+        $request = ['data1', 'data2'];
-+
-+        // Assert the filter was created
-+        $this->filterMock->expects($this->once())
-+            ->method('filter')
-+            ->with($request)
-+            ->willReturn($request);
-+
-+        // Assert the body of the transfer was set
-+        $this->transferBuilder->expects($this->once())
-+            ->method('setBody')
-+            ->with($request)
-+            ->willReturnSelf();
-+
-+        $this->transferBuilder->method('build')
-+            ->willReturn($this->transferMock);
-+
-+        $this->assertEquals($this->transferMock, $this->transferFactory->create($request));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AcceptFdsDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AcceptFdsDataBuilderTest.php
-new file mode 100644
-index 00000000000..00bb7ee84f9
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AcceptFdsDataBuilderTest.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\AcceptFdsDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Sales\Model\Order\Payment\Transaction;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+
-+class AcceptFdsDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var AcceptFdsDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->orderMock = $this->createMock(Order::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->builder = new AcceptFdsDataBuilder(new SubjectReader());
-+    }
-+
-+    public function testBuild()
-+    {
-+        $transactionMock = $this->createMock(Transaction::class);
-+
-+        $this->paymentMock->method('getAuthorizationTransaction')
-+            ->willReturn($transactionMock);
-+
-+        $transactionMock->method('getTxnId')
-+            ->willReturn('foo');
-+
-+        $expected = [
-+            'heldTransactionRequest' => [
-+                'action' => 'approve',
-+                'refTransId' => 'foo'
-+            ]
-+        ];
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock,
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AddressDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
-new file mode 100644
-index 00000000000..6ddb30a64af
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
-@@ -0,0 +1,129 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\AddressDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\AddressAdapterInterface;
-+use Magento\Payment\Gateway\Data\OrderAdapterInterface;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class AddressDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var AddressDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var PaymentDataObjectInterface|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    /**
-+     * @var OrderAdapterInterface|MockObject
-+     */
-+    private $orderMock;
-+
-+    private $mockAddressData = [
-+        'firstName' => [
-+            'method' => 'getFirstname',
-+            'sampleData' => 'John'
-+        ],
-+        'lastName' => [
-+            'method' => 'getLastname',
-+            'sampleData' => 'Doe'
-+        ],
-+        'company' => [
-+            'method' => 'getCompany',
-+            'sampleData' => 'Magento'
-+        ],
-+        'address' => [
-+            'method' => 'getStreetLine1',
-+            'sampleData' => '11501 Domain Dr'
-+        ],
-+        'city' => [
-+            'method' => 'getCity',
-+            'sampleData' => 'Austin'
-+        ],
-+        'state' => [
-+            'method' => 'getRegionCode',
-+            'sampleData' => 'TX'
-+        ],
-+        'zip' => [
-+            'method' => 'getPostcode',
-+            'sampleData' => '78758'
-+        ],
-+        'country' => [
-+            'method' => 'getCountryId',
-+            'sampleData' => 'US'
-+        ],
-+    ];
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+        $this->orderMock = $this->createMock(OrderAdapterInterface::class);
-+        $this->paymentDOMock->method('getOrder')
-+            ->willReturn($this->orderMock);
-+
-+        $this->builder = new AddressDataBuilder(new SubjectReader());
-+    }
-+
-+    public function testBuildWithBothAddresses()
-+    {
-+        $billingAddress = $this->createAddressMock('billing');
-+        $shippingAddress = $this->createAddressMock('shipping');
-+        $this->orderMock->method('getBillingAddress')
-+            ->willReturn($billingAddress);
-+        $this->orderMock->method('getShippingAddress')
-+            ->willReturn($shippingAddress);
-+        $this->orderMock->method('getRemoteIp')
-+            ->willReturn('abc');
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock
-+        ];
-+
-+        $result = $this->builder->build($buildSubject);
-+
-+        $this->validateAddressData($result['transactionRequest']['billTo'], 'billing');
-+        $this->validateAddressData($result['transactionRequest']['shipTo'], 'shipping');
-+        $this->assertEquals('abc', $result['transactionRequest']['customerIP']);
-+    }
-+
-+    private function validateAddressData($responseData, $addressPrefix)
-+    {
-+        foreach ($this->mockAddressData as $fieldValue => $field) {
-+            $this->assertEquals($addressPrefix . $field['sampleData'], $responseData[$fieldValue]);
-+        }
-+    }
-+
-+    private function createAddressMock($prefix)
-+    {
-+        $addressAdapterMock = $this->createMock(AddressAdapterInterface::class);
-+
-+        foreach ($this->mockAddressData as $field) {
-+            $addressAdapterMock->method($field['method'])
-+                ->willReturn($prefix . $field['sampleData']);
-+        }
-+
-+        return $addressAdapterMock;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AmountDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AmountDataBuilderTest.php
-new file mode 100644
-index 00000000000..9da0139302a
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AmountDataBuilderTest.php
-@@ -0,0 +1,42 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\AmountDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use PHPUnit\Framework\TestCase;
-+
-+class AmountDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var AmountDataBuilder
-+     */
-+    private $builder;
-+
-+    protected function setUp()
-+    {
-+        $this->builder = new AmountDataBuilder(
-+            new SubjectReader()
-+        );
-+    }
-+
-+    public function testBuild()
-+    {
-+        $expected = [
-+            'transactionRequest' => [
-+                'amount' => '123.45',
-+            ]
-+        ];
-+
-+        $buildSubject = [
-+            'amount' => 123.45
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AuthenticationDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AuthenticationDataBuilderTest.php
-new file mode 100644
-index 00000000000..e9588e51b0f
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AuthenticationDataBuilderTest.php
-@@ -0,0 +1,78 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\AuthenticationDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class AuthenticationDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var AuthenticationDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    /**
-+     * @var SubjectReader|MockObject
-+     */
-+    private $subjectReaderMock;
-+
-+    /**
-+     * @var Config|MockObject
-+     */
-+    private $configMock;
-+
-+    protected function setUp()
-+    {
-+        $this->configMock = $this->createMock(Config::class);
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        /** @var MockObject|SubjectReader subjectReaderMock */
-+        $this->subjectReaderMock = $this->createMock(SubjectReader::class);
-+
-+        $this->builder = new AuthenticationDataBuilder($this->subjectReaderMock, $this->configMock);
-+    }
-+
-+    public function testBuild()
-+    {
-+        $this->configMock->method('getLoginId')
-+            ->willReturn('myloginid');
-+        $this->configMock->method('getTransactionKey')
-+            ->willReturn('mytransactionkey');
-+
-+        $expected = [
-+            'merchantAuthentication' => [
-+                'name' => 'myloginid',
-+                'transactionKey' => 'mytransactionkey'
-+            ]
-+        ];
-+
-+        $buildSubject = [];
-+
-+        $this->subjectReaderMock->method('readStoreId')
-+            ->with($buildSubject)
-+            ->willReturn(123);
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AuthorizationDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AuthorizationDataBuilderTest.php
-new file mode 100644
-index 00000000000..438d681a2b5
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AuthorizationDataBuilderTest.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\AuthorizeDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\AuthorizenetAcceptjs\Model\PassthroughDataObject;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class AuthorizationDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var AuthorizeDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    /**
-+     * @var PassthroughDataObject
-+     */
-+    private $passthroughData;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+        $this->passthroughData = new PassthroughDataObject();
-+
-+        $this->builder = new AuthorizeDataBuilder(
-+            new SubjectReader(),
-+            $this->passthroughData
-+        );
-+    }
-+
-+    public function testBuildWillAddTransactionType()
-+    {
-+        $expected = [
-+            'transactionRequest' => [
-+                'transactionType' => 'authOnlyTransaction'
-+            ]
-+        ];
-+
-+        $buildSubject = [
-+            'store_id' => 123,
-+            'payment' => $this->paymentDOMock,
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+        $this->assertEquals('authOnlyTransaction', $this->passthroughData->getData('transactionType'));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/CaptureDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/CaptureDataBuilderTest.php
-new file mode 100644
-index 00000000000..537a685f1ff
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/CaptureDataBuilderTest.php
-@@ -0,0 +1,77 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\CaptureDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\AuthorizenetAcceptjs\Model\PassthroughDataObject;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class CaptureDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var CaptureDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    /**
-+     * @var PassthroughDataObject
-+     */
-+    private $passthroughData;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+        $this->passthroughData = new PassthroughDataObject();
-+
-+        $this->builder = new CaptureDataBuilder(
-+            new SubjectReader(),
-+            $this->passthroughData
-+        );
-+    }
-+
-+    public function testBuildWillCaptureWhenAuthorizeTransactionExists()
-+    {
-+        $transactionMock = $this->createMock(Payment\Transaction::class);
-+        $transactionMock->method('getAdditionalInformation')
-+            ->with('real_transaction_id')
-+            ->willReturn('prevtrans');
-+        $this->paymentMock->method('getAuthorizationTransaction')
-+            ->willReturn($transactionMock);
-+
-+        $expected = [
-+            'transactionRequest' => [
-+                'transactionType' => 'priorAuthCaptureTransaction',
-+                'refTransId' => 'prevtrans'
-+            ]
-+        ];
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock,
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+        $this->assertEquals('priorAuthCaptureTransaction', $this->passthroughData->getData('transactionType'));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/CustomSettingsBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/CustomSettingsBuilderTest.php
-new file mode 100644
-index 00000000000..be7dd7eca17
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/CustomSettingsBuilderTest.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\CustomSettingsBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class CustomSettingsBuilderTest extends TestCase
-+{
-+    /**
-+     * @var CustomSettingsBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var SubjectReader|MockObject
-+     */
-+    private $subjectReaderMock;
-+
-+    /**
-+     * @var Config|MockObject
-+     */
-+    private $configMock;
-+
-+    protected function setUp()
-+    {
-+        $this->configMock = $this->createMock(Config::class);
-+        /** @var MockObject|SubjectReader subjectReaderMock */
-+        $this->subjectReaderMock = $this->createMock(SubjectReader::class);
-+        $this->subjectReaderMock->method('readStoreId')
-+            ->willReturn('123');
-+
-+        $this->builder = new CustomSettingsBuilder($this->subjectReaderMock, $this->configMock);
-+    }
-+
-+    public function testBuildWithEmailCustomerDisabled()
-+    {
-+        $this->configMock->method('shouldEmailCustomer')
-+            ->with('123')
-+            ->willReturn(false);
-+
-+        $this->assertEquals([], $this->builder->build([]));
-+    }
-+
-+    public function testBuildWithEmailCustomerEnabled()
-+    {
-+        $this->configMock->method('shouldEmailCustomer')
-+            ->with('123')
-+            ->willReturn(true);
-+
-+        $expected = [
-+            'transactionRequest' => [
-+                'transactionSettings' => [
-+                    'setting' => [
-+                        [
-+                            'settingName' => 'emailCustomer',
-+                            'settingValue' => 'true'
-+                        ]
-+                    ]
-+                ]
-+            ]
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build([]));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/CustomerDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/CustomerDataBuilderTest.php
-new file mode 100644
-index 00000000000..7c9116cad54
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/CustomerDataBuilderTest.php
-@@ -0,0 +1,79 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\CustomerDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\AddressAdapterInterface;
-+use Magento\Payment\Gateway\Data\OrderAdapterInterface;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class CustomerDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var CustomerDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    /**
-+     * @var OrderAdapterInterface|MockObject
-+     */
-+    private $orderMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+        $this->orderMock = $this->createMock(OrderAdapterInterface::class);
-+        $this->paymentDOMock->method('getOrder')
-+            ->willReturn($this->orderMock);
-+
-+        $this->builder = new CustomerDataBuilder(new SubjectReader());
-+    }
-+
-+    public function testBuild()
-+    {
-+        $addressAdapterMock = $this->createMock(AddressAdapterInterface::class);
-+        $addressAdapterMock->method('getEmail')
-+            ->willReturn('foo@bar.com');
-+        $this->orderMock->method('getBillingAddress')
-+            ->willReturn($addressAdapterMock);
-+        $this->orderMock->method('getCustomerId')
-+            ->willReturn('123');
-+
-+        $expected = [
-+            'transactionRequest' => [
-+                'customer' => [
-+                    'id' => '123',
-+                    'email' => 'foo@bar.com'
-+                ]
-+            ]
-+        ];
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock,
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/OrderDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/OrderDataBuilderTest.php
-new file mode 100644
-index 00000000000..d66421d48ca
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/OrderDataBuilderTest.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\OrderDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Payment\Model\InfoInterface;
-+use Magento\Payment\Gateway\Data\OrderAdapterInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class OrderDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var OrderDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var InfoInterface|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var PaymentDataObjectInterface|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    /**
-+     * @var OrderAdapterInterface|MockObject
-+     */
-+    private $orderMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+        $this->orderMock = $this->createMock(OrderAdapterInterface::class);
-+        $this->paymentDOMock->method('getOrder')
-+            ->willReturn($this->orderMock);
-+
-+        $this->builder = new OrderDataBuilder(new SubjectReader());
-+    }
-+
-+    public function testBuild()
-+    {
-+        $this->orderMock->method('getOrderIncrementId')
-+            ->willReturn('10000015');
-+
-+        $expected = [
-+            'transactionRequest' => [
-+                'order' => [
-+                    'invoiceNumber' => '10000015'
-+                ]
-+            ]
-+        ];
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock,
-+            'order' => $this->orderMock,
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/PassthroughDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/PassthroughDataBuilderTest.php
-new file mode 100644
-index 00000000000..f4c5f56efe8
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/PassthroughDataBuilderTest.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\PassthroughDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Model\PassthroughDataObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class PassthroughDataBuilderTest extends TestCase
-+{
-+    public function testBuild()
-+    {
-+        $passthroughData = new PassthroughDataObject([
-+            'foo' => 'bar',
-+            'baz' => 'bash'
-+        ]);
-+        $builder = new PassthroughDataBuilder($passthroughData);
-+
-+        $expected = [
-+            'transactionRequest' => [
-+                'userFields' => [
-+                    'userField' => [
-+                        [
-+                            'name' => 'foo',
-+                            'value' => 'bar'
-+                        ],
-+                        [
-+                            'name' => 'baz',
-+                            'value' => 'bash'
-+                        ],
-+                    ]
-+                ]
-+            ]
-+        ];
-+
-+        $this->assertEquals($expected, $builder->build([]));
-+    }
-+
-+    public function testBuildWithNoData()
-+    {
-+        $passthroughData = new PassthroughDataObject();
-+        $builder = new PassthroughDataBuilder($passthroughData);
-+        $expected = [];
-+
-+        $this->assertEquals($expected, $builder->build([]));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
-new file mode 100644
-index 00000000000..cf3842b8947
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
-@@ -0,0 +1,72 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\PaymentDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class PaymentDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var PaymentDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->orderMock = $this->createMock(Order::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->builder = new PaymentDataBuilder(new SubjectReader());
-+    }
-+
-+    public function testBuild()
-+    {
-+        $this->paymentMock->method('getAdditionalInformation')
-+            ->willReturnMap([
-+                ['opaqueDataDescriptor', 'foo'],
-+                ['opaqueDataValue', 'bar']
-+            ]);
-+
-+        $expected = [
-+            'transactionRequest' => [
-+                'payment' => [
-+                    'opaqueData' => [
-+                        'dataDescriptor' => 'foo',
-+                        'dataValue' => 'bar'
-+                    ]
-+                ]
-+            ]
-+        ];
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock,
-+            'amount' => 123.45
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/PoDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/PoDataBuilderTest.php
-new file mode 100644
-index 00000000000..97b51c1e180
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/PoDataBuilderTest.php
-@@ -0,0 +1,61 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\PoDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Payment\Model\InfoInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class PoDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var PoDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var InfoInterface|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var PaymentDataObjectInterface|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->builder = new PoDataBuilder(new SubjectReader());
-+    }
-+
-+    public function testBuild()
-+    {
-+        $this->paymentMock->method('getPoNumber')
-+            ->willReturn('abc');
-+
-+        $expected = [
-+            'transactionRequest' => [
-+                'poNumber' => 'abc'
-+            ]
-+        ];
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock,
-+        ];
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/RefundPaymentDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/RefundPaymentDataBuilderTest.php
-new file mode 100644
-index 00000000000..c1879b3df83
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/RefundPaymentDataBuilderTest.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\RefundPaymentDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class RefundPaymentDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var RefundPaymentDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->builder = new RefundPaymentDataBuilder(
-+            new SubjectReader()
-+        );
-+    }
-+
-+    public function testBuild()
-+    {
-+        $this->paymentMock->method('getAdditionalInformation')
-+            ->with('ccLast4')
-+            ->willReturn('1111');
-+
-+        $expected = [
-+            'transactionRequest' => [
-+                'payment' => [
-+                    'creditCard' => [
-+                        'cardNumber' => '1111',
-+                        'expirationDate' => 'XXXX'
-+                    ]
-+                ]
-+            ]
-+        ];
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock,
-+            'amount' => 123.45
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/RefundReferenceTransactionDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/RefundReferenceTransactionDataBuilderTest.php
-new file mode 100644
-index 00000000000..cf1803005ac
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/RefundReferenceTransactionDataBuilderTest.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\RefundReferenceTransactionDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Sales\Model\Order\Payment\Transaction;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+
-+class RefundReferenceTransactionDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var RefundReferenceTransactionDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->orderMock = $this->createMock(Order::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->builder = new RefundReferenceTransactionDataBuilder(new SubjectReader());
-+    }
-+
-+    public function testBuild()
-+    {
-+        $transactionMock = $this->createMock(Transaction::class);
-+
-+        $this->paymentMock->method('getAuthorizationTransaction')
-+            ->willReturn($transactionMock);
-+
-+        $transactionMock->method('getParentTxnId')
-+            ->willReturn('foo');
-+
-+        $expected = [
-+            'transactionRequest' => [
-+                'refTransId' => 'foo'
-+            ]
-+        ];
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock,
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/RefundTransactionTypeDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/RefundTransactionTypeDataBuilderTest.php
-new file mode 100644
-index 00000000000..4e0f5f75fb9
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/RefundTransactionTypeDataBuilderTest.php
-@@ -0,0 +1,30 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\RefundTransactionTypeDataBuilder;
-+use PHPUnit\Framework\TestCase;
-+
-+class RefundTransactionTypeDataBuilderTest extends TestCase
-+{
-+    private const REQUEST_TYPE_REFUND = 'refundTransaction';
-+
-+    public function testBuild()
-+    {
-+        $builder = new RefundTransactionTypeDataBuilder();
-+
-+        $expected = [
-+            'transactionRequest' => [
-+                'transactionType' => self::REQUEST_TYPE_REFUND
-+            ]
-+        ];
-+
-+        $this->assertEquals($expected, $builder->build([]));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/RequestTypeBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/RequestTypeBuilderTest.php
-new file mode 100644
-index 00000000000..cb03dfc3dac
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/RequestTypeBuilderTest.php
-@@ -0,0 +1,36 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\AuthenticationDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\RequestTypeBuilder;
-+use PHPUnit\Framework\TestCase;
-+
-+class RequestTypeBuilderTest extends TestCase
-+{
-+    /**
-+     * @var AuthenticationDataBuilder
-+     */
-+    private $builder;
-+
-+    protected function setUp()
-+    {
-+        $this->builder = new RequestTypeBuilder('foo');
-+    }
-+
-+    public function testBuild()
-+    {
-+        $expected = [
-+            'payload_type' => 'foo'
-+        ];
-+
-+        $buildSubject = [];
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/SaleDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/SaleDataBuilderTest.php
-new file mode 100644
-index 00000000000..407b9bc85a2
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/SaleDataBuilderTest.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\SaleDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\AuthorizenetAcceptjs\Model\PassthroughDataObject;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class SaleDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var SaleDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    /**
-+     * @var PassthroughDataObject
-+     */
-+    private $passthroughData;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+        $this->passthroughData = new PassthroughDataObject();
-+
-+        $this->builder = new SaleDataBuilder(
-+            new SubjectReader(),
-+            $this->passthroughData
-+        );
-+    }
-+
-+    public function testBuildWillAddTransactionType()
-+    {
-+        $expected = [
-+            'transactionRequest' => [
-+                'transactionType' => 'authCaptureTransaction'
-+            ]
-+        ];
-+
-+        $buildSubject = [
-+            'store_id' => 123,
-+            'payment' => $this->paymentDOMock,
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+        $this->assertEquals('authCaptureTransaction', $this->passthroughData->getData('transactionType'));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/ShippingDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/ShippingDataBuilderTest.php
-new file mode 100644
-index 00000000000..d6525e610a2
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/ShippingDataBuilderTest.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\ShippingDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class ShippingDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var v
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    /**
-+     * @var Order
-+     */
-+    private $orderMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->orderMock = $this->createMock(Order::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+        $this->paymentDOMock->method('getOrder')
-+            ->willReturn($this->orderMock);
-+
-+        $this->builder = new ShippingDataBuilder(
-+            new SubjectReader()
-+        );
-+    }
-+
-+    public function testBuild()
-+    {
-+        $this->orderMock->method('getBaseShippingAmount')
-+            ->willReturn('43.12');
-+
-+        $expected = [
-+            'transactionRequest' => [
-+                'shipping' => [
-+                    'amount' => '43.12'
-+                ]
-+            ]
-+        ];
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock,
-+            'order' => $this->orderMock,
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/SolutionDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/SolutionDataBuilderTest.php
-new file mode 100644
-index 00000000000..1b06546c2ea
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/SolutionDataBuilderTest.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\SolutionDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class SolutionDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var SolutionDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    /**
-+     * @var SubjectReader|MockObject
-+     */
-+    private $subjectReaderMock;
-+
-+    /**
-+     * @var Config|MockObject
-+     */
-+    private $configMock;
-+
-+    protected function setUp()
-+    {
-+        $this->configMock = $this->createMock(Config::class);
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        /** @var MockObject|SubjectReader subjectReaderMock */
-+        $this->subjectReaderMock = $this->createMock(SubjectReader::class);
-+
-+        $this->builder = new SolutionDataBuilder($this->subjectReaderMock, $this->configMock);
-+    }
-+
-+    public function testBuild()
-+    {
-+        $this->subjectReaderMock->method('readStoreId')
-+            ->willReturn('123');
-+        $this->configMock->method('getSolutionId')
-+            ->with('123')
-+            ->willReturn('solutionid');
-+
-+        $expected = [
-+            'transactionRequest' => [
-+                'solution' => [
-+                    'id' => 'solutionid',
-+                ]
-+            ]
-+        ];
-+
-+        $buildSubject = [];
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/StoreConfigBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/StoreConfigBuilderTest.php
-new file mode 100644
-index 00000000000..2ed0cb13ed6
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/StoreConfigBuilderTest.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\StoreConfigBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Payment\Model\InfoInterface;
-+use Magento\Payment\Gateway\Data\OrderAdapterInterface;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class StoreConfigBuilderTest extends TestCase
-+{
-+    /**
-+     * @var StoreConfigBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var InfoInterface|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var PaymentDataObjectInterface|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    /**
-+     * @var OrderAdapterInterface|MockObject
-+     */
-+    private $orderMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(InfoInterface::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+        $this->orderMock = $this->createMock(OrderAdapterInterface::class);
-+        $this->paymentDOMock->method('getOrder')
-+            ->willReturn($this->orderMock);
-+
-+        $this->builder = new StoreConfigBuilder(new SubjectReader());
-+    }
-+
-+    public function testBuild()
-+    {
-+        $this->orderMock->method('getStoreID')
-+            ->willReturn(123);
-+
-+        $expected = [
-+            'store_id' => 123
-+        ];
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock,
-+        ];
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/TransactionDetailsDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/TransactionDetailsDataBuilderTest.php
-new file mode 100644
-index 00000000000..03c036c0271
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/TransactionDetailsDataBuilderTest.php
-@@ -0,0 +1,89 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\TransactionDetailsDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Sales\Model\Order\Payment\Transaction;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+
-+class TransactionDetailsDataBuilderTest extends TestCase
-+{
-+    /**
-+     * @var TransactionDetailsDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->orderMock = $this->createMock(Order::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->builder = new TransactionDetailsDataBuilder(new SubjectReader());
-+    }
-+
-+    public function testBuild()
-+    {
-+        $transactionMock = $this->createMock(Transaction::class);
-+
-+        $this->paymentMock->method('getAuthorizationTransaction')
-+            ->willReturn($transactionMock);
-+
-+        $transactionMock->method('getParentTxnId')
-+            ->willReturn('foo');
-+
-+        $expected = [
-+            'transId' => 'foo'
-+        ];
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock,
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+
-+    public function testBuildWithIncludedTransactionId()
-+    {
-+        $transactionMock = $this->createMock(Transaction::class);
-+
-+        $this->paymentMock->expects($this->never())
-+            ->method('getAuthorizationTransaction');
-+
-+        $transactionMock->expects($this->never())
-+            ->method('getParentTxnId');
-+
-+        $expected = [
-+            'transId' => 'foo'
-+        ];
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock,
-+            'transactionId' => 'foo'
-+        ];
-+
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/VoidDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/VoidDataBuilderTest.php
-new file mode 100644
-index 00000000000..84460a1c744
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/VoidDataBuilderTest.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Request\VoidDataBuilder;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\Sales\Model\Order\Payment\Transaction;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class VoidDataBuilderTest extends TestCase
-+{
-+    private const REQUEST_TYPE_VOID = 'voidTransaction';
-+
-+    /**
-+     * @var VoidDataBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->builder = new VoidDataBuilder(new SubjectReader());
-+    }
-+
-+    public function testBuild()
-+    {
-+        $transactionMock = $this->createMock(Transaction::class);
-+        $this->paymentMock->method('getAuthorizationTransaction')
-+            ->willReturn($transactionMock);
-+        $transactionMock->method('getParentTxnId')
-+            ->willReturn('myref');
-+
-+        $buildSubject = [
-+            'payment' => $this->paymentDOMock
-+        ];
-+
-+        $expected = [
-+            'transactionRequest' => [
-+                'transactionType' => self::REQUEST_TYPE_VOID,
-+                'refTransId' => 'myref',
-+            ]
-+        ];
-+        $this->assertEquals($expected, $this->builder->build($buildSubject));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/CloseParentTransactionHandlerTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/CloseParentTransactionHandlerTest.php
-new file mode 100644
-index 00000000000..e9929c631eb
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/CloseParentTransactionHandlerTest.php
-@@ -0,0 +1,62 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Response\CloseParentTransactionHandler;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Payment\Model\InfoInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class CloseParentTransactionHandlerTest extends TestCase
-+{
-+    /**
-+     * @var CloseParentTransactionHandler
-+     */
-+    private $handler;
-+
-+    /**
-+     * @var InfoInterface|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var PaymentDataObjectInterface|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->handler = new CloseParentTransactionHandler(new SubjectReader());
-+    }
-+
-+    public function testHandleClosesTransactionByDefault()
-+    {
-+        $subject = [
-+            'payment' => $this->paymentDOMock
-+        ];
-+        $response = [
-+            'transactionResponse' => []
-+        ];
-+
-+        // Assert the parent transaction i closed
-+        $this->paymentMock->expects($this->once())
-+            ->method('setShouldCloseParentTransaction')
-+            ->with(true);
-+
-+        $this->handler->handle($subject, $response);
-+        // Assertions are via mock expects above
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/CloseTransactionHandlerTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/CloseTransactionHandlerTest.php
-new file mode 100644
-index 00000000000..a7093f0dac8
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/CloseTransactionHandlerTest.php
-@@ -0,0 +1,62 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Response\CloseTransactionHandler;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Payment\Model\InfoInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class CloseTransactionHandlerTest extends TestCase
-+{
-+    /**
-+     * @var CloseTransactionHandler
-+     */
-+    private $handler;
-+
-+    /**
-+     * @var InfoInterface|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var PaymentDataObjectInterface|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->handler = new CloseTransactionHandler(new SubjectReader());
-+    }
-+
-+    public function testHandleClosesTransactionByDefault()
-+    {
-+        $subject = [
-+            'payment' => $this->paymentDOMock
-+        ];
-+        $response = [
-+            'transactionResponse' => []
-+        ];
-+
-+        // Assert the transaction is closed
-+        $this->paymentMock->expects($this->once())
-+            ->method('setIsTransactionClosed')
-+            ->with(true);
-+
-+        $this->handler->handle($subject, $response);
-+        // Assertions are via mock expects above
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentResponseHandlerTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentResponseHandlerTest.php
-new file mode 100644
-index 00000000000..d051c7d2910
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentResponseHandlerTest.php
-@@ -0,0 +1,112 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Response\PaymentResponseHandler;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class PaymentResponseHandlerTest extends TestCase
-+{
-+    private const RESPONSE_CODE_APPROVED = 1;
-+    private const RESPONSE_CODE_HELD = 4;
-+
-+    /**
-+     * @var PaymentResponseHandler
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->builder = new PaymentResponseHandler(new SubjectReader());
-+    }
-+
-+    public function testHandleDefaultResponse()
-+    {
-+        $this->paymentMock->method('getAdditionalInformation')
-+            ->with('ccLast4')
-+            ->willReturn('1234');
-+        // Assert the avs code is saved
-+        $this->paymentMock->expects($this->once())
-+            ->method('setCcAvsStatus')
-+            ->with('avshurray');
-+        $this->paymentMock->expects($this->once())
-+            ->method('setCcLast4')
-+            ->with('1234');
-+        $this->paymentMock->expects($this->once())
-+            ->method('setIsTransactionClosed')
-+            ->with(false);
-+
-+        $response = [
-+            'transactionResponse' => [
-+                'avsResultCode' => 'avshurray',
-+                'responseCode' => self::RESPONSE_CODE_APPROVED,
-+            ]
-+        ];
-+        $subject = [
-+            'payment' => $this->paymentDOMock
-+        ];
-+
-+        $this->builder->handle($subject, $response);
-+        // Assertions are part of mocking above
-+    }
-+
-+    public function testHandleHeldResponse()
-+    {
-+        // Assert the avs code is saved
-+        $this->paymentMock->expects($this->once())
-+            ->method('setCcAvsStatus')
-+            ->with('avshurray');
-+        $this->paymentMock->expects($this->once())
-+            ->method('setIsTransactionClosed')
-+            ->with(false);
-+        // opaque data wasn't provided
-+        $this->paymentMock->expects($this->never())
-+            ->method('setAdditionalInformation');
-+        // Assert the payment is flagged for review
-+        $this->paymentMock->expects($this->once())
-+            ->method('setIsTransactionPending')
-+            ->with(true)
-+            ->willReturnSelf();
-+        $this->paymentMock->expects($this->once())
-+            ->method('setIsFraudDetected')
-+            ->with(true);
-+
-+        $response = [
-+            'transactionResponse' => [
-+                'avsResultCode' => 'avshurray',
-+                'responseCode' => self::RESPONSE_CODE_HELD,
-+            ]
-+        ];
-+        $subject = [
-+            'payment' => $this->paymentDOMock
-+        ];
-+
-+        $this->builder->handle($subject, $response);
-+        // Assertions are part of mocking above
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentReviewStatusHandlerTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentReviewStatusHandlerTest.php
-new file mode 100644
-index 00000000000..a52a1b317fb
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentReviewStatusHandlerTest.php
-@@ -0,0 +1,130 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Response\PaymentReviewStatusHandler;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Payment\Model\InfoInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class PaymentReviewStatusHandlerTest extends TestCase
-+{
-+    /**
-+     * @var PaymentReviewStatusHandler
-+     */
-+    private $handler;
-+
-+    /**
-+     * @var InfoInterface|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var PaymentDataObjectInterface|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->handler = new PaymentReviewStatusHandler(new SubjectReader());
-+    }
-+
-+    public function testApprovesPayment()
-+    {
-+        $subject = [
-+            'payment' => $this->paymentDOMock
-+        ];
-+        $response = [
-+            'transaction' => [
-+                'transactionStatus' => 'approvedOrSomething',
-+            ]
-+        ];
-+
-+        // Assert payment is handled correctly
-+        $this->paymentMock->expects($this->exactly(2))
-+            ->method('setData')
-+            ->withConsecutive(
-+                ['is_transaction_denied', false],
-+                ['is_transaction_approved', true]
-+            );
-+
-+        $this->handler->handle($subject, $response);
-+        // Assertions are via mock expects above
-+    }
-+
-+    /**
-+     * @param string $status
-+     * @dataProvider declinedTransactionStatusesProvider
-+     */
-+    public function testDeniesPayment(string $status)
-+    {
-+        $subject = [
-+            'payment' => $this->paymentDOMock
-+        ];
-+        $response = [
-+            'transaction' => [
-+                'transactionStatus' => $status,
-+            ]
-+        ];
-+
-+        // Assert payment is handled correctly
-+        $this->paymentMock->expects($this->exactly(2))
-+            ->method('setData')
-+            ->withConsecutive(
-+                ['is_transaction_denied', true],
-+                ['is_transaction_approved', false]
-+            );
-+        $this->handler->handle($subject, $response);
-+    }
-+
-+    /**
-+     * @param string $status
-+     * @dataProvider pendingTransactionStatusesProvider
-+     */
-+    public function testDoesNothingWhenPending(string $status)
-+    {
-+        $subject = [
-+            'payment' => $this->paymentDOMock
-+        ];
-+        $response = [
-+            'transaction' => [
-+                'transactionStatus' => $status,
-+            ]
-+        ];
-+
-+        // Assert payment is handled correctly
-+        $this->paymentMock->expects($this->never())
-+            ->method('setData');
-+
-+        $this->handler->handle($subject, $response);
-+    }
-+
-+    public function pendingTransactionStatusesProvider()
-+    {
-+        return [
-+            ['FDSPendingReview'],
-+            ['FDSAuthorizedPendingReview']
-+        ];
-+    }
-+
-+    public function declinedTransactionStatusesProvider()
-+    {
-+        return [
-+            ['void'],
-+            ['declined']
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/TransactionDetailsResponseHandlerTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/TransactionDetailsResponseHandlerTest.php
-new file mode 100644
-index 00000000000..016e3a1e953
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/TransactionDetailsResponseHandlerTest.php
-@@ -0,0 +1,82 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Gateway\Response\TransactionDetailsResponseHandler;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Payment\Model\InfoInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class TransactionDetailsResponseHandlerTest extends TestCase
-+{
-+    /**
-+     * @var TransactionDetailsResponseHandler
-+     */
-+    private $handler;
-+
-+    /**
-+     * @var InfoInterface|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var PaymentDataObjectInterface|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    /**
-+     * @var Config|MockObject
-+     */
-+    private $configMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->configMock = $this->createMock(Config::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->handler = new TransactionDetailsResponseHandler(new SubjectReader(), $this->configMock);
-+    }
-+
-+    public function testHandle()
-+    {
-+        $subject = [
-+            'payment' => $this->paymentDOMock,
-+            'store_id' => 123,
-+        ];
-+        $response = [
-+            'transactionResponse' => [
-+                'dontsaveme' => 'dontdoti',
-+                'abc' => 'foobar',
-+            ]
-+        ];
-+
-+        // Assert the information comes from the right store config
-+        $this->configMock->method('getAdditionalInfoKeys')
-+            ->with(123)
-+            ->willReturn(['abc']);
-+
-+        // Assert the payment has the most recent information always set on it
-+        $this->paymentMock->expects($this->once())
-+            ->method('setAdditionalInformation')
-+            ->with('abc', 'foobar');
-+        // Assert the transaction has the raw details from the transaction
-+        $this->paymentMock->expects($this->once())
-+            ->method('setTransactionAdditionalInfo')
-+            ->with('raw_details_info', ['abc' => 'foobar']);
-+
-+        $this->handler->handle($subject, $response);
-+        // Assertions are via mock expects above
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/TransactionIdHandlerTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/TransactionIdHandlerTest.php
-new file mode 100644
-index 00000000000..710f9959184
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/TransactionIdHandlerTest.php
-@@ -0,0 +1,92 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Response\TransactionIdHandler;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class TransactionIdHandlerTest extends TestCase
-+{
-+    /**
-+     * @var TransactionIdHandler
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var Payment|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->builder = new TransactionIdHandler(new SubjectReader());
-+    }
-+
-+    public function testHandleDefaultResponse()
-+    {
-+        $this->paymentMock->method('getParentTransactionId')
-+            ->willReturn(null);
-+        // Assert the id is set
-+        $this->paymentMock->expects($this->once())
-+            ->method('setTransactionId')
-+            ->with('thetransid');
-+        // Assert the id is set in the additional info for later
-+        $this->paymentMock->expects($this->once())
-+            ->method('setTransactionAdditionalInfo')
-+            ->with('real_transaction_id', 'thetransid');
-+
-+        $response = [
-+            'transactionResponse' => [
-+                'transId' => 'thetransid',
-+            ]
-+        ];
-+        $subject = [
-+            'payment' => $this->paymentDOMock
-+        ];
-+
-+        $this->builder->handle($subject, $response);
-+        // Assertions are part of mocking above
-+    }
-+
-+    public function testHandleDifferenceInTransactionId()
-+    {
-+        $this->paymentMock->method('getParentTransactionId')
-+            ->willReturn('somethingElse');
-+        // Assert the id is set
-+        $this->paymentMock->expects($this->once())
-+            ->method('setTransactionId')
-+            ->with('thetransid');
-+
-+        $response = [
-+            'transactionResponse' => [
-+                'transId' => 'thetransid',
-+            ]
-+        ];
-+        $subject = [
-+            'payment' => $this->paymentDOMock
-+        ];
-+
-+        $this->builder->handle($subject, $response);
-+        // Assertions are part of mocking above
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/VoidResponseHandlerTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/VoidResponseHandlerTest.php
-new file mode 100644
-index 00000000000..f99da2b2ec9
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/VoidResponseHandlerTest.php
-@@ -0,0 +1,72 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Response\VoidResponseHandler;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use Magento\Payment\Model\InfoInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class VoidResponseHandlerTest extends TestCase
-+{
-+    /**
-+     * @var VoidResponseHandler
-+     */
-+    private $handler;
-+
-+    /**
-+     * @var InfoInterface|MockObject
-+     */
-+    private $paymentMock;
-+
-+    /**
-+     * @var PaymentDataObjectInterface|MockObject
-+     */
-+    private $paymentDOMock;
-+
-+    protected function setUp()
-+    {
-+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->paymentMock = $this->createMock(Payment::class);
-+        $this->paymentDOMock->method('getPayment')
-+            ->willReturn($this->paymentMock);
-+
-+        $this->handler = new VoidResponseHandler(new SubjectReader());
-+    }
-+
-+    public function testHandle()
-+    {
-+        $subject = [
-+            'payment' => $this->paymentDOMock
-+        ];
-+        $response = [
-+            'transactionResponse' => [
-+                'transId' => 'abc123',
-+            ]
-+        ];
-+
-+        // Assert the transaction is closed
-+        $this->paymentMock->expects($this->once())
-+            ->method('setIsTransactionClosed')
-+            ->with(true);
-+        // Assert the parent transaction is closed
-+        $this->paymentMock->expects($this->once())
-+            ->method('setShouldCloseParentTransaction')
-+            ->with(true);
-+        // Assert the authorize.net transaction id is saved
-+        $this->paymentMock->expects($this->once())
-+            ->method('setTransactionAdditionalInfo')
-+            ->with('real_transaction_id', 'abc123');
-+
-+        $this->handler->handle($subject, $response);
-+        // Assertions are via mock expects above
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/SubjectReaderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/SubjectReaderTest.php
-new file mode 100644
-index 00000000000..42219024bad
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/SubjectReaderTest.php
-@@ -0,0 +1,119 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Data\OrderAdapterInterface;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-+use PHPUnit\Framework\TestCase;
-+
-+class SubjectReaderTest extends TestCase
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->subjectReader = new SubjectReader();
-+    }
-+
-+    public function testReadPayment(): void
-+    {
-+        $paymentDO = $this->createMock(PaymentDataObjectInterface::class);
-+
-+        $this->assertSame($paymentDO, $this->subjectReader->readPayment(['payment' => $paymentDO]));
-+    }
-+
-+    /**
-+     * @expectedException \InvalidArgumentException
-+     * @expectedExceptionMessage Payment data object should be provided
-+     */
-+    public function testReadPaymentThrowsExceptionWhenNotAPaymentObject(): void
-+    {
-+        $this->subjectReader->readPayment(['payment' => 'nope']);
-+    }
-+
-+    /**
-+     * @expectedException \InvalidArgumentException
-+     * @expectedExceptionMessage Payment data object should be provided
-+     */
-+    public function testReadPaymentThrowsExceptionWhenNotSet(): void
-+    {
-+        $this->subjectReader->readPayment([]);
-+    }
-+
-+    public function testReadResponse(): void
-+    {
-+        $expected = ['foo' => 'bar'];
-+
-+        $this->assertSame($expected, $this->subjectReader->readResponse(['response' => $expected]));
-+    }
-+
-+    /**
-+     * @expectedException \InvalidArgumentException
-+     * @expectedExceptionMessage Response does not exist
-+     */
-+    public function testReadResponseThrowsExceptionWhenNotAvailable(): void
-+    {
-+        $this->subjectReader->readResponse([]);
-+    }
-+
-+    public function testReadStoreId(): void
-+    {
-+        $this->assertEquals(123, $this->subjectReader->readStoreId(['store_id' => '123']));
-+    }
-+
-+    public function testReadStoreIdFromOrder(): void
-+    {
-+        $paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
-+        $orderMock = $this->createMock(OrderAdapterInterface::class);
-+        $paymentDOMock->method('getOrder')
-+            ->willReturn($orderMock);
-+        $orderMock->method('getStoreID')
-+            ->willReturn('123');
-+
-+        $result = $this->subjectReader->readStoreId([
-+            'payment' => $paymentDOMock
-+        ]);
-+
-+        $this->assertEquals(123, $result);
-+    }
-+
-+    public function testReadLoginId(): void
-+    {
-+        $this->assertEquals('abc', $this->subjectReader->readLoginId([
-+            'merchantAuthentication' => ['name' => 'abc']
-+        ]));
-+    }
-+
-+    public function testReadTransactionKey(): void
-+    {
-+        $this->assertEquals('abc', $this->subjectReader->readTransactionKey([
-+            'merchantAuthentication' => ['transactionKey' => 'abc']
-+        ]));
-+    }
-+
-+    public function testReadAmount(): void
-+    {
-+        $this->assertSame('123.12', $this->subjectReader->readAmount(['amount' => 123.12]));
-+    }
-+
-+    /**
-+     * @expectedException \InvalidArgumentException
-+     * @expectedExceptionMessage Amount should be provided
-+     */
-+    public function testReadAmountThrowsExceptionWhenNotAvailable(): void
-+    {
-+        $this->subjectReader->readAmount([]);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
-new file mode 100644
-index 00000000000..347cd071acc
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
-@@ -0,0 +1,161 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Validator;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\AuthorizenetAcceptjs\Gateway\Validator\GeneralResponseValidator;
-+use Magento\Payment\Gateway\Validator\ResultInterface;
-+use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class GeneralResponseValidatorTest extends TestCase
-+{
-+    /**
-+     * @var ResultInterfaceFactory|MockObject
-+     */
-+    private $resultFactoryMock;
-+
-+    /**
-+     * @var GeneralResponseValidator
-+     */
-+    private $validator;
-+
-+    protected function setUp()
-+    {
-+        $this->resultFactoryMock = $this->createMock(ResultInterfaceFactory::class);
-+        $this->validator = new GeneralResponseValidator($this->resultFactoryMock, new SubjectReader());
-+    }
-+
-+    public function testValidateParsesSuccess()
-+    {
-+        $args = [];
-+
-+        $this->resultFactoryMock->method('create')
-+            ->with($this->callback(function ($a) use (&$args) {
-+                // Spy on method call
-+                $args = $a;
-+
-+                return true;
-+            }))
-+            ->willReturn($this->createMock(ResultInterface::class));
-+
-+        $this->validator->validate([
-+            'response' => [
-+                'messages' => [
-+                    'resultCode' => 'Ok',
-+                    'message' => [
-+                        [
-+                            'code' => 'foo',
-+                            'text' => 'bar'
-+                        ]
-+                    ]
-+                ]
-+            ]
-+        ]);
-+
-+        $this->assertTrue($args['isValid']);
-+        $this->assertEmpty($args['errorCodes']);
-+        $this->assertEmpty($args['failsDescription']);
-+    }
-+
-+    public function testValidateParsesErrors()
-+    {
-+        $args = [];
-+
-+        $this->resultFactoryMock->method('create')
-+            ->with($this->callback(function ($a) use (&$args) {
-+                // Spy on method call
-+                $args = $a;
-+
-+                return true;
-+            }))
-+            ->willReturn($this->createMock(ResultInterface::class));
-+
-+        $this->validator->validate([
-+            'response' => [
-+                'errors' => [
-+                    'resultCode' => 'Error',
-+                    'error' => [
-+                        [
-+                            'errorCode' => 'foo',
-+                            'errorText' => 'bar'
-+                        ]
-+                    ]
-+                ]
-+            ]
-+        ]);
-+
-+        $this->assertFalse($args['isValid']);
-+        $this->assertSame(['foo'], $args['errorCodes']);
-+        $this->assertSame(['bar'], $args['failsDescription']);
-+    }
-+
-+    public function testValidateParsesMessages()
-+    {
-+        $args = [];
-+
-+        $this->resultFactoryMock->method('create')
-+            ->with($this->callback(function ($a) use (&$args) {
-+                // Spy on method call
-+                $args = $a;
-+
-+                return true;
-+            }))
-+            ->willReturn($this->createMock(ResultInterface::class));
-+
-+        $this->validator->validate([
-+            'response' => [
-+                'messages' => [
-+                    'resultCode' => 'Error',
-+                    'message' => [
-+                        [
-+                            'code' => 'foo',
-+                            'text' => 'bar'
-+                        ]
-+                    ]
-+                ]
-+            ]
-+        ]);
-+
-+        $this->assertFalse($args['isValid']);
-+        $this->assertSame(['foo'], $args['errorCodes']);
-+        $this->assertSame(['bar'], $args['failsDescription']);
-+    }
-+
-+    public function testValidateParsesErrorsWhenOnlyOneIsReturned()
-+    {
-+        $args = [];
-+
-+        $this->resultFactoryMock->method('create')
-+            ->with($this->callback(function ($a) use (&$args) {
-+                // Spy on method call
-+                $args = $a;
-+
-+                return true;
-+            }))
-+            ->willReturn($this->createMock(ResultInterface::class));
-+
-+        $this->validator->validate([
-+            'response' => [
-+                'messages' => [
-+                    'resultCode' => 'Error',
-+                    'message' => [
-+                        'code' => 'foo',
-+                        'text' => 'bar'
-+                    ]
-+                ]
-+            ]
-+        ]);
-+
-+        $this->assertFalse($args['isValid']);
-+        $this->assertSame(['foo'], $args['errorCodes']);
-+        $this->assertSame(['bar'], $args['failsDescription']);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Validator/TransactionHashValidatorTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Validator/TransactionHashValidatorTest.php
-new file mode 100644
-index 00000000000..fb3f9d0520d
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Validator/TransactionHashValidatorTest.php
-@@ -0,0 +1,280 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Validator;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\AuthorizenetAcceptjs\Gateway\Validator\TransactionHashValidator;
-+use Magento\Payment\Gateway\Validator\ResultInterface;
-+use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class TransactionHashValidatorTest extends TestCase
-+{
-+    /**
-+     * @var ResultInterfaceFactory|MockObject
-+     */
-+    private $resultFactoryMock;
-+
-+    /**
-+     * @var TransactionHashValidator
-+     */
-+    private $validator;
-+
-+    /**
-+     * @var Config|MockObject
-+     */
-+    private $configMock;
-+
-+    /**
-+     * @var ResultInterface
-+     */
-+    private $resultMock;
-+
-+    protected function setUp()
-+    {
-+        $this->resultFactoryMock = $this->createMock(ResultInterfaceFactory::class);
-+        $this->configMock = $this->createMock(Config::class);
-+        $this->resultMock = $this->createMock(ResultInterface::class);
-+
-+        $this->validator = new TransactionHashValidator(
-+            $this->resultFactoryMock,
-+            new SubjectReader(),
-+            $this->configMock
-+        );
-+    }
-+
-+    /**
-+     * @param $response
-+     * @param $isValid
-+     * @param $errorCodes
-+     * @param $errorDescriptions
-+     * @dataProvider sha512ResponseProvider
-+     */
-+    public function testValidateSha512HashScenarios(
-+        $response,
-+        $isValid,
-+        $errorCodes,
-+        $errorDescriptions
-+    ) {
-+        $args = [];
-+
-+        $this->resultFactoryMock->method('create')
-+            ->with($this->callback(function ($a) use (&$args) {
-+                // Spy on method call
-+                $args = $a;
-+
-+                return true;
-+            }))
-+            ->willReturn($this->resultMock);
-+
-+        $this->configMock->method('getTransactionSignatureKey')
-+            ->willReturn('abc');
-+        $this->configMock->method('getLoginId')
-+            ->willReturn('username');
-+
-+        $this->validator->validate($response);
-+
-+        $this->assertSame($isValid, $args['isValid']);
-+        $this->assertEquals($errorCodes, $args['errorCodes']);
-+        $this->assertEquals($errorDescriptions, $args['failsDescription']);
-+    }
-+
-+    /**
-+     * @param $response
-+     * @param $isValid
-+     * @param $errorCodes
-+     * @param $errorDescriptions
-+     * @dataProvider md5ResponseProvider
-+     */
-+    public function testValidateMd5HashScenarios(
-+        $response,
-+        $isValid,
-+        $errorCodes,
-+        $errorDescriptions
-+    ) {
-+        $args = [];
-+
-+        $this->resultFactoryMock->method('create')
-+            ->with($this->callback(function ($a) use (&$args) {
-+                // Spy on method call
-+                $args = $a;
-+
-+                return true;
-+            }))
-+            ->willReturn($this->resultMock);
-+
-+        $this->configMock->method('getLegacyTransactionHash')
-+            ->willReturn('abc');
-+        $this->configMock->method('getLoginId')
-+            ->willReturn('username');
-+
-+        $this->validator->validate($response);
-+
-+        $this->assertSame($isValid, $args['isValid']);
-+        $this->assertEquals($errorCodes, $args['errorCodes']);
-+        $this->assertEquals($errorDescriptions, $args['failsDescription']);
-+    }
-+
-+    public function md5ResponseProvider()
-+    {
-+        return [
-+            [
-+                [
-+                    'response' => [
-+                        'transactionResponse' => [
-+                            'transId' => '123',
-+                            'transHash' => 'C8675D9F7BE7BE4A04C18EA1B6F7B6FD'
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+            [
-+                [
-+                    'response' => [
-+                        'transactionResponse' => [
-+                            'transId' => '123',
-+                            'transHash' => 'C8675D9F7BE7BE4A04C18EA1B6F7B6FD'
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+            [
-+                [
-+                    'amount' => '123.00',
-+                    'response' => [
-+                        'transactionResponse' => [
-+                            'transHash' => 'bad'
-+                        ]
-+                    ]
-+                ],
-+                false,
-+                ['ETHV'],
-+                ['The authenticity of the gateway response could not be verified.']
-+            ],
-+            [
-+                [
-+                    'amount' => '123.00',
-+                    'response' => [
-+                        'transactionResponse' => [
-+                            'refTransID' => '123',
-+                            'transId' => '123',
-+                            'transHash' => 'C8675D9F7BE7BE4A04C18EA1B6F7B6FD'
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+        ];
-+    }
-+
-+    public function sha512ResponseProvider()
-+    {
-+        return [
-+            [
-+                [
-+                    'response' => [
-+                        'transactionResponse' => [
-+                            'transId' => '123',
-+                            'refTransID' => '123',
-+                            'transHashSha2' => 'CC0FF465A081D98FFC6E502C40B2DCC7655ACF591F859135B6E66558D'
-+                                . '41E3A2C654D5A2ACF4749104F3133711175C232C32676F79F70211C2984B21A33D30DEE'
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+            [
-+                [
-+                    'response' => [
-+                        'transactionResponse' => [
-+                            'transId' => '0',
-+                            'refTransID' => '123',
-+                            'transHashSha2' => '563D42F4A5189F74334088EF6A02E84F320CD8C005FB0DC436EF96084D'
-+                                . 'FAC0C76DE081DFC58A3BF825465C63B7F38E4D463025EAC44597A68C024CBBCE7A3159'
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+            [
-+                [
-+                    'amount' => '123.00',
-+                    'response' => [
-+                        'transactionResponse' => [
-+                            'transId' => '0',
-+                            'transHashSha2' => 'DEE5309078D9F7A68BA4F706FB3E58618D3991A6A5E4C39DCF9C49E693'
-+                                . '673C38BD6BB15C235263C549A6B5F0B6D7019EC729E0C275C9FEA37FB91F8B612D0A5D'
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+            [
-+                [
-+                    'amount' => '123.00',
-+                    'response' => [
-+                        'transactionResponse' => [
-+                            'transId' => '123',
-+                            'transHashSha2' => '1DBD16DED0DA02F52A22A9AD71A49F70BD2ECD42437552889912DD5CE'
-+                                . 'CBA0E09A5E8E6221DA74D98A46E5F77F7774B6D9C39CADF3E9A33D85870A6958DA7C8B2'
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+            [
-+                [
-+                    'amount' => '123.00',
-+                    'response' => [
-+                        'transactionResponse' => [
-+                            'transId' => '123',
-+                            'refTransID' => '0',
-+                            'transHashSha2' => '1DBD16DED0DA02F52A22A9AD71A49F70BD2ECD42437552889912DD5CE'
-+                                . 'CBA0E09A5E8E6221DA74D98A46E5F77F7774B6D9C39CADF3E9A33D85870A6958DA7C8B2'
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+            [
-+                [
-+                    'amount' => '123.00',
-+                    'response' => [
-+                        'transactionResponse' => [
-+                            'transHashSha2' => 'bad'
-+                        ]
-+                    ]
-+                ],
-+                false,
-+                ['ETHV'],
-+                ['The authenticity of the gateway response could not be verified.']
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Validator/TransactionResponseValidatorTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Validator/TransactionResponseValidatorTest.php
-new file mode 100644
-index 00000000000..c59cf00899a
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Validator/TransactionResponseValidatorTest.php
-@@ -0,0 +1,231 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Gateway\Validator;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\AuthorizenetAcceptjs\Gateway\Validator\TransactionResponseValidator;
-+use Magento\Payment\Gateway\Validator\ResultInterface;
-+use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Tests for the transaction response validator
-+ */
-+class TransactionResponseValidatorTest extends TestCase
-+{
-+    private const RESPONSE_CODE_APPROVED = 1;
-+    private const RESPONSE_CODE_HELD = 4;
-+    private const RESPONSE_CODE_DENIED = 2;
-+    private const RESPONSE_REASON_CODE_APPROVED = 1;
-+    private const RESPONSE_REASON_CODE_PENDING_REVIEW_AUTHORIZED = 252;
-+    private const RESPONSE_REASON_CODE_PENDING_REVIEW = 253;
-+    private const ERROR_CODE_AVS_MISMATCH = 27;
-+
-+    /**
-+     * @var ResultInterfaceFactory|MockObject
-+     */
-+    private $resultFactoryMock;
-+
-+    /**
-+     * @var TransactionResponseValidator
-+     */
-+    private $validator;
-+
-+    /**
-+     * @var ResultInterface
-+     */
-+    private $resultMock;
-+
-+    protected function setUp()
-+    {
-+        $this->resultFactoryMock = $this->createMock(ResultInterfaceFactory::class);
-+        $this->resultMock = $this->createMock(ResultInterface::class);
-+
-+        $this->validator = new TransactionResponseValidator(
-+            $this->resultFactoryMock,
-+            new SubjectReader()
-+        );
-+    }
-+
-+    /**
-+     * @param $transactionResponse
-+     * @param $isValid
-+     * @param $errorCodes
-+     * @param $errorMessages
-+     * @dataProvider scenarioProvider
-+     */
-+    public function testValidateScenarios($transactionResponse, $isValid, $errorCodes, $errorMessages)
-+    {
-+        $args = [];
-+
-+        $this->resultFactoryMock->method('create')
-+            ->with($this->callback(function ($a) use (&$args) {
-+                // Spy on method call
-+                $args = $a;
-+
-+                return true;
-+            }))
-+            ->willReturn($this->resultMock);
-+
-+        $this->validator->validate([
-+            'response' => [
-+                'transactionResponse' => $transactionResponse
-+            ]
-+        ]);
-+
-+        $this->assertEquals($isValid, $args['isValid']);
-+        $this->assertEquals($errorCodes, $args['errorCodes']);
-+        $this->assertEquals($errorMessages, $args['failsDescription']);
-+    }
-+
-+    /**
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function scenarioProvider()
-+    {
-+        return [
-+            // Test for acceptable reason codes
-+            [
-+                [
-+                    'responseCode' => self::RESPONSE_CODE_APPROVED,
-+                    'messages' => [
-+                        'message' => [
-+                            'code' => self::RESPONSE_REASON_CODE_APPROVED,
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+            [
-+                [
-+                    'responseCode' => self::RESPONSE_CODE_APPROVED,
-+                    'messages' => [
-+                        'message' => [
-+                            'code' => self::RESPONSE_REASON_CODE_PENDING_REVIEW,
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+            [
-+                [
-+                    'responseCode' => self::RESPONSE_CODE_APPROVED,
-+                    'messages' => [
-+                        'message' => [
-+                            'code' => self::RESPONSE_REASON_CODE_PENDING_REVIEW_AUTHORIZED,
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+            [
-+                [
-+                    'responseCode' => self::RESPONSE_CODE_HELD,
-+                    'messages' => [
-+                        'message' => [
-+                            'code' => self::RESPONSE_REASON_CODE_APPROVED,
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+            [
-+                [
-+                    'responseCode' => self::RESPONSE_CODE_HELD,
-+                    'messages' => [
-+                        'message' => [
-+                            'code' => self::RESPONSE_REASON_CODE_PENDING_REVIEW,
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+            [
-+                [
-+                    'responseCode' => self::RESPONSE_CODE_HELD,
-+                    'messages' => [
-+                        'message' => [
-+                            'code' => self::RESPONSE_REASON_CODE_PENDING_REVIEW_AUTHORIZED,
-+                        ]
-+                    ]
-+                ],
-+                true,
-+                [],
-+                []
-+            ],
-+
-+            // Test for reason codes that aren't acceptable
-+            [
-+                [
-+                    'responseCode' => self::RESPONSE_CODE_APPROVED,
-+                    'messages' => [
-+                        'message' => [
-+                            [
-+                                'description' => 'bar',
-+                                'code' => 'foo',
-+                            ]
-+                        ]
-+                    ]
-+                ],
-+                false,
-+                ['foo'],
-+                ['bar']
-+            ],
-+            [
-+                [
-+                    'responseCode' => self::RESPONSE_CODE_APPROVED,
-+                    'messages' => [
-+                        'message' => [
-+                            // Alternate, non-array sytax
-+                            'text' => 'bar',
-+                            'code' => 'foo',
-+                        ]
-+                    ]
-+                ],
-+                false,
-+                ['foo'],
-+                ['bar']
-+            ],
-+            [
-+                [
-+                    'responseCode' => self::RESPONSE_CODE_DENIED,
-+                    'errors' => [
-+                        [
-+                            'errorCode' => self::ERROR_CODE_AVS_MISMATCH,
-+                            'errorText' => 'bar'
-+                        ]
-+                    ]
-+                ],
-+                false,
-+                [self::ERROR_CODE_AVS_MISMATCH],
-+                ['bar']
-+            ],
-+            // This validator only cares about successful edge cases so test for default behavior
-+            [
-+                [
-+                    'responseCode' => 'foo',
-+                ],
-+                false,
-+                [],
-+                []
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Model/Ui/ConfigProviderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Model/Ui/ConfigProviderTest.php
-new file mode 100644
-index 00000000000..dea4557fd58
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Model/Ui/ConfigProviderTest.php
-@@ -0,0 +1,76 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Model\Ui;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\AuthorizenetAcceptjs\Model\Ui\ConfigProvider;
-+use Magento\Quote\Api\Data\CartInterface;
-+use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class ConfigProviderTest extends TestCase
-+{
-+    /**
-+     * @var CartInterface|MockObject|InvocationMocker
-+     */
-+    private $cart;
-+
-+    /**
-+     * @var Config|MockObject|InvocationMocker
-+     */
-+    private $config;
-+
-+    /**
-+     * @var ConfigProvider
-+     */
-+    private $provider;
-+
-+    protected function setUp()
-+    {
-+        $this->cart = $this->createMock(CartInterface::class);
-+        $this->config = $this->createMock(Config::class);
-+        $this->provider = new ConfigProvider($this->config, $this->cart);
-+    }
-+
-+    public function testProviderRetrievesValues()
-+    {
-+        $this->cart->method('getStoreId')
-+            ->willReturn('123');
-+
-+        $this->config->method('getClientKey')
-+            ->with('123')
-+            ->willReturn('foo');
-+
-+        $this->config->method('getLoginId')
-+            ->with('123')
-+            ->willReturn('bar');
-+
-+        $this->config->method('getEnvironment')
-+            ->with('123')
-+            ->willReturn('baz');
-+
-+        $this->config->method('isCvvEnabled')
-+            ->with('123')
-+            ->willReturn(false);
-+
-+        $expected = [
-+            'payment' => [
-+                Config::METHOD => [
-+                    'clientKey' => 'foo',
-+                    'apiLoginID' => 'bar',
-+                    'environment' => 'baz',
-+                    'useCvv' => false,
-+                ]
-+            ]
-+        ];
-+
-+        $this->assertEquals($expected, $this->provider->getConfig());
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Observer/DataAssignObserverTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Observer/DataAssignObserverTest.php
-new file mode 100644
-index 00000000000..bd439a33678
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Observer/DataAssignObserverTest.php
-@@ -0,0 +1,80 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Observer;
-+
-+use Magento\Framework\DataObject;
-+use Magento\Framework\Event;
-+use Magento\Framework\Event\Observer;
-+use Magento\Payment\Model\InfoInterface;
-+use Magento\Payment\Observer\AbstractDataAssignObserver;
-+use Magento\AuthorizenetAcceptjs\Observer\DataAssignObserver;
-+use Magento\Quote\Api\Data\PaymentInterface;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Tests DataAssignObserver
-+ */
-+class DataAssignObserverTest extends TestCase
-+{
-+    public function testExecuteSetsProperData()
-+    {
-+        $additionalInfo = [
-+            'opaqueDataDescriptor' => 'foo',
-+            'opaqueDataValue' => 'bar',
-+            'ccLast4' => '1234'
-+        ];
-+
-+        $observerContainer = $this->createMock(Observer::class);
-+        $event = $this->createMock(Event::class);
-+        $paymentInfoModel = $this->createMock(InfoInterface::class);
-+        $dataObject = new DataObject([PaymentInterface::KEY_ADDITIONAL_DATA => $additionalInfo]);
-+        $observerContainer->method('getEvent')
-+            ->willReturn($event);
-+        $event->method('getDataByKey')
-+            ->willReturnMap(
-+                [
-+                    [AbstractDataAssignObserver::MODEL_CODE, $paymentInfoModel],
-+                    [AbstractDataAssignObserver::DATA_CODE, $dataObject]
-+                ]
-+            );
-+        $paymentInfoModel->expects($this->at(0))
-+            ->method('setAdditionalInformation')
-+            ->with('opaqueDataDescriptor', 'foo');
-+        $paymentInfoModel->expects($this->at(1))
-+            ->method('setAdditionalInformation')
-+            ->with('opaqueDataValue', 'bar');
-+        $paymentInfoModel->expects($this->at(2))
-+            ->method('setAdditionalInformation')
-+            ->with('ccLast4', '1234');
-+
-+        $observer = new DataAssignObserver();
-+        $observer->execute($observerContainer);
-+    }
-+
-+    public function testDoestSetDataWhenEmpty()
-+    {
-+        $observerContainer = $this->createMock(Observer::class);
-+        $event = $this->createMock(Event::class);
-+        $paymentInfoModel = $this->createMock(InfoInterface::class);
-+        $observerContainer->method('getEvent')
-+            ->willReturn($event);
-+        $event->method('getDataByKey')
-+            ->willReturnMap(
-+                [
-+                    [AbstractDataAssignObserver::MODEL_CODE, $paymentInfoModel],
-+                    [AbstractDataAssignObserver::DATA_CODE, new DataObject()]
-+                ]
-+            );
-+        $paymentInfoModel->expects($this->never())
-+            ->method('setAdditionalInformation');
-+
-+        $observer = new DataAssignObserver();
-+        $observer->execute($observerContainer);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Setup/Patch/Data/CopyCurrentConfigTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Setup/Patch/Data/CopyCurrentConfigTest.php
-new file mode 100644
-index 00000000000..5ac8a6ca9b3
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Setup/Patch/Data/CopyCurrentConfigTest.php
-@@ -0,0 +1,149 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Test\Unit\Setup\Patch\Data;
-+
-+use Magento\AuthorizenetAcceptjs\Setup\Patch\Data\CopyCurrentConfig;
-+use Magento\Config\Model\ResourceModel\Config as ResourceConfig;
-+use Magento\Framework\App\Config;
-+use Magento\Framework\Encryption\Encryptor;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Setup\Module\DataSetup;
-+use Magento\Setup\Model\ModuleContext;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Store\Model\Website;
-+use PHPUnit\Framework\TestCase;
-+
-+class CopyCurrentConfigTest extends TestCase
-+{
-+    /**
-+     * @var \Magento\Framework\App\Config
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @var \Magento\Config\Model\ResourceModel\Config
-+     */
-+    private $resourceConfig;
-+
-+    /**
-+     * @var \Magento\Framework\Encryption\Encryptor
-+     */
-+    private $encryptor;
-+
-+    /**
-+     * @var \Magento\Setup\Module\DataSetup
-+     */
-+    private $setup;
-+
-+    /**
-+     * @var \Magento\Setup\Model\ModuleContext
-+     */
-+    private $context;
-+
-+    /**
-+     * @var \Magento\Store\Model\StoreManager
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var \Magento\Store\Model\Website
-+     */
-+    private $website;
-+
-+    protected function setUp(): void
-+    {
-+        $this->scopeConfig = $this->createMock(Config::class);
-+        $this->resourceConfig = $this->createMock(ResourceConfig::class);
-+        $this->encryptor = $this->createMock(Encryptor::class);
-+        $this->setup = $this->createMock(DataSetup::class);
-+
-+        $this->setup->expects($this->once())
-+            ->method('startSetup')
-+            ->willReturn(null);
-+
-+        $this->setup->expects($this->once())
-+            ->method('endSetup')
-+            ->willReturn(null);
-+
-+        $this->context = $this->createMock(ModuleContext::class);
-+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
-+        $this->website = $this->createMock(Website::class);
-+    }
-+
-+    public function testMigrateData(): void
-+    {
-+        $this->scopeConfig->expects($this->exactly(26))
-+            ->method('getValue')
-+            ->willReturn('TestValue');
-+
-+        $this->resourceConfig->expects($this->exactly(26))
-+            ->method('saveConfig')
-+            ->willReturn(null);
-+
-+        $this->encryptor->expects($this->exactly(6))
-+            ->method('encrypt')
-+            ->willReturn('TestValue');
-+
-+        $this->website->expects($this->once())
-+            ->method('getId')
-+            ->willReturn(1);
-+
-+        $this->storeManager->expects($this->once())
-+            ->method('getWebsites')
-+            ->willReturn([$this->website]);
-+
-+        $objectManager = new ObjectManager($this);
-+
-+        $installer = $objectManager->getObject(
-+            CopyCurrentConfig::class,
-+            [
-+                'moduleDataSetup' => $this->setup,
-+                'scopeConfig' => $this->scopeConfig,
-+                'resourceConfig' => $this->resourceConfig,
-+                'encryptor' => $this->encryptor,
-+                'storeManager' => $this->storeManager
-+            ]
-+        );
-+
-+        $installer->apply($this->context);
-+    }
-+
-+    public function testMigrateDataNullFields(): void
-+    {
-+        $this->scopeConfig->expects($this->exactly(13))
-+            ->method('getValue')
-+            ->will($this->onConsecutiveCalls(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
-+
-+        $this->resourceConfig->expects($this->exactly(10))
-+            ->method('saveConfig')
-+            ->willReturn(null);
-+
-+        $this->encryptor->expects($this->never())
-+            ->method('encrypt');
-+
-+        $this->storeManager->expects($this->once())
-+            ->method('getWebsites')
-+            ->willReturn([]);
-+
-+        $objectManager = new ObjectManager($this);
-+
-+        $installer = $objectManager->getObject(
-+            CopyCurrentConfig::class,
-+            [
-+                'moduleDataSetup' => $this->setup,
-+                'scopeConfig' => $this->scopeConfig,
-+                'resourceConfig' => $this->resourceConfig,
-+                'encryptor' => $this->encryptor,
-+                'storeManager' => $this->storeManager
-+            ]
-+        );
-+
-+        $installer->apply($this->context);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/composer.json b/app/code/Magento/AuthorizenetAcceptjs/composer.json
-new file mode 100644
-index 00000000000..be2cd6d4e70
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/composer.json
-@@ -0,0 +1,31 @@
-+{
-+    "name": "magento/module-authorizenet-acceptjs",
-+    "description": "N/A",
-+    "config": {
-+        "sort-packages": true
-+    },
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-payment": "*",
-+        "magento/module-sales": "*",
-+        "magento/module-config": "*",
-+        "magento/module-backend": "*",
-+        "magento/module-checkout": "*",
-+        "magento/module-store": "*",
-+        "magento/module-quote": "*"
-+    },
-+    "type": "magento2-module",
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\AuthorizenetAcceptjs\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/adminhtml/di.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/adminhtml/di.xml
-new file mode 100644
-index 00000000000..730094b8d55
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/adminhtml/di.xml
-@@ -0,0 +1,34 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\AuthorizenetAcceptjs\Block\Payment">
-+        <arguments>
-+            <argument name="config" xsi:type="object">Magento\AuthorizenetAcceptjs\Model\Ui\ConfigProvider</argument>
-+        </arguments>
-+    </type>
-+    <virtualType name="AuthorizenetAcceptjsAuthorizeRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
-+        <arguments>
-+            <argument name="builders" xsi:type="array">
-+                <item name="request_type" xsi:type="string">AuthorizenetAcceptjsTransactionRequestTypeBuilder</item>
-+                <item name="store" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AuthenticationDataBuilder</item>
-+                <item name="transaction_type" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AuthorizeDataBuilder</item>
-+                <item name="amount" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AmountDataBuilder</item>
-+                <item name="payment" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\PaymentDataBuilder</item>
-+                <item name="shipping" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\ShippingDataBuilder</item>
-+                <item name="solution" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\SolutionDataBuilder</item>
-+                <item name="order" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\OrderDataBuilder</item>
-+                <item name="po" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\PoDataBuilder</item>
-+                <item name="customer" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\CustomerDataBuilder</item>
-+                <item name="address" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AddressDataBuilder</item>
-+                <item name="custom_settings" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\CustomSettingsBuilder</item>
-+                <item name="passthrough_data" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\PassthroughDataBuilder</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/adminhtml/system.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/adminhtml/system.xml
-new file mode 100644
-index 00000000000..279a904d916
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/adminhtml/system.xml
-@@ -0,0 +1,118 @@
-+<?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_Config:etc/system_file.xsd">
-+    <system>
-+        <section id="payment">
-+            <group id="authorizenet_acceptjs" translate="label" type="text" sortOrder="34" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <label>Authorize.Net</label>
-+                <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                    <label>Enabled</label>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <requires>
-+                        <group id="authorizenet_acceptjs_required"/>
-+                    </requires>
-+                </field>
-+                <group id="required" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="5">
-+                    <label>Basic Authorize.Net Settings</label>
-+                    <attribute type="expanded">1</attribute>
-+                    <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-+                    <field id="title" translate="label" type="text" sortOrder="10" showInDefault="10" showInWebsite="1" showInStore="1" canRestore="1">
-+                        <label>Title</label>
-+                        <config_path>payment/authorizenet_acceptjs/title</config_path>
-+                    </field>
-+                    <field id="environment" translate="label" type="select" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Environment</label>
-+                        <source_model>Magento\AuthorizenetAcceptjs\Model\Adminhtml\Source\Environment</source_model>
-+                        <config_path>payment/authorizenet_acceptjs/environment</config_path>
-+                    </field>
-+                    <field id="payment_action" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                        <label>Payment Action</label>
-+                        <source_model>Magento\AuthorizenetAcceptjs\Model\Adminhtml\Source\PaymentAction</source_model>
-+                        <config_path>payment/authorizenet_acceptjs/payment_action</config_path>
-+                    </field>
-+                    <field id="login" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>API Login ID</label>
-+                        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-+                        <config_path>payment/authorizenet_acceptjs/login</config_path>
-+                    </field>
-+                    <field id="trans_key" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Transaction Key</label>
-+                        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-+                        <config_path>payment/authorizenet_acceptjs/trans_key</config_path>
-+                    </field>
-+                    <field id="public_client_key" translate="label" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Public Client Key</label>
-+                        <config_path>payment/authorizenet_acceptjs/public_client_key</config_path>
-+                    </field>
-+                    <field id="trans_signature_key" translate="label" type="obscure" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Signature Key</label>
-+                        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-+                        <config_path>payment/authorizenet_acceptjs/trans_signature_key</config_path>
-+                    </field>
-+                    <field id="trans_md5" translate="label" type="obscure" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Merchant MD5 (deprecated)</label>
-+                        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-+                        <config_path>payment/authorizenet_acceptjs/trans_md5</config_path>
-+                    </field>
-+                </group>
-+                <group id="advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="0" sortOrder="20">
-+                    <label>Advanced Authorize.Net Settings</label>
-+                    <attribute type="expanded">0</attribute>
-+                    <field id="currency" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                        <label>Accepted Currency</label>
-+                        <source_model>Magento\Config\Model\Config\Source\Locale\Currency</source_model>
-+                        <config_path>payment/authorizenet_acceptjs/currency</config_path>
-+                    </field>
-+                    <field id="debug" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                        <label>Debug</label>
-+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                        <config_path>payment/authorizenet_acceptjs/debug</config_path>
-+                    </field>
-+                    <field id="email_customer" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                        <label>Email Customer</label>
-+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                        <config_path>payment/authorizenet_acceptjs/email_customer</config_path>
-+                    </field>
-+                    <field id="cvv_enabled" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                        <label>Enable Credit Card Verification Field</label>
-+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                        <config_path>payment/authorizenet_acceptjs/cvv_enabled</config_path>
-+                    </field>
-+                    <field id="cctypes" translate="label" type="multiselect" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                        <label>Credit Card Types</label>
-+                        <source_model>Magento\AuthorizenetAcceptjs\Model\Adminhtml\Source\Cctype</source_model>
-+                        <config_path>payment/authorizenet_acceptjs/cctypes</config_path>
-+                    </field>
-+                    <field id="allowspecific" translate="label" type="allowspecific" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                        <label>Payment from Applicable Countries</label>
-+                        <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-+                        <config_path>payment/authorizenet_acceptjs/allowspecific</config_path>
-+                    </field>
-+                    <field id="specificcountry" translate="label" type="multiselect" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Payment from Specific Countries</label>
-+                        <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
-+                        <config_path>payment/authorizenet_acceptjs/specificcountry</config_path>
-+                    </field>
-+                    <field id="min_order_total" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Minimum Order Total</label>
-+                        <config_path>payment/authorizenet_acceptjs/min_order_total</config_path>
-+                    </field>
-+                    <field id="max_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Maximum Order Total</label>
-+                        <config_path>payment/authorizenet_acceptjs/max_order_total</config_path>
-+                    </field>
-+                    <field id="sort_order" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Sort Order</label>
-+                        <frontend_class>validate-number</frontend_class>
-+                        <config_path>payment/authorizenet_acceptjs/sort_order</config_path>
-+                    </field>
-+                </group>
-+            </group>
-+        </section>
-+    </system>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/authorizenet_acceptjs_error_mapping.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/authorizenet_acceptjs_error_mapping.xml
-new file mode 100644
-index 00000000000..507a9b14f91
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/authorizenet_acceptjs_error_mapping.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<mapping xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/error_mapping.xsd">
-+    <message_list>
-+        <message code="E00003" translate="true">Invalid request to gateway.</message>
-+        <message code="E00007" translate="true">Invalid gateway credentials.</message>
-+        <message code="E00027" translate="true">Transaction has been declined. Please try again later.</message>
-+        <message code="ETHV" translate="true">The authenticity of the gateway response could not be verified.</message>
-+    </message_list>
-+</mapping>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml
-new file mode 100644
-index 00000000000..7324421d3c1
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml
-@@ -0,0 +1,56 @@
-+<?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_Store:etc/config.xsd">
-+    <default>
-+        <dev>
-+            <js>
-+                <minify_exclude>
-+                    <authorizenet_acceptjs>\.authorize\.net/v1/Accept</authorizenet_acceptjs>
-+                </minify_exclude>
-+            </js>
-+        </dev>
-+        <payment>
-+            <authorizenet_acceptjs>
-+                <active>0</active>
-+                <cctypes>AE,VI,MC,DI,JCB,DN</cctypes>
-+                <debug>0</debug>
-+                <can_use_checkout>1</can_use_checkout>
-+                <can_use_internal>1</can_use_internal>
-+                <can_capture_partial>0</can_capture_partial>
-+                <can_authorize>1</can_authorize>
-+                <can_refund>1</can_refund>
-+                <can_capture>1</can_capture>
-+                <can_void>1</can_void>
-+                <can_accept_payment>1</can_accept_payment>
-+                <can_deny_payment>1</can_deny_payment>
-+                <can_cancel>1</can_cancel>
-+                <can_review_payment>1</can_review_payment>
-+                <can_edit>1</can_edit>
-+                <can_fetch_transaction_info>1</can_fetch_transaction_info>
-+                <can_fetch_transaction_information>1</can_fetch_transaction_information>
-+                <model>AuthorizenetAcceptjsFacade</model>
-+                <email_customer>0</email_customer>
-+                <login backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-+                <order_status>processing</order_status>
-+                <payment_action>authorize</payment_action>
-+                <title>Credit Card (Authorize.Net)</title>
-+                <cvv_enabled>1</cvv_enabled>
-+                <public_client_key/>
-+                <trans_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-+                <trans_md5 backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-+                <trans_signature_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-+                <allowspecific>0</allowspecific>
-+                <currency>USD</currency>
-+                <environment>production</environment>
-+                <privateInfoKeys>authCode,avsResultCode,cvvResultCode,cavvResultCode</privateInfoKeys>
-+                <paymentInfoKeys>accountType,ccLast4,authCode,avsResultCode,cvvResultCode,cavvResultCode</paymentInfoKeys>
-+                <transactionSyncKeys>transactionStatus,responseCode,responseReasonCode,authCode,AVSResponse,cardCodeResponse,CAVVResponse</transactionSyncKeys>
-+            </authorizenet_acceptjs>
-+        </payment>
-+    </default>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/di.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/di.xml
-new file mode 100644
-index 00000000000..39dff96e195
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/di.xml
-@@ -0,0 +1,434 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\AuthorizenetAcceptjs\Gateway\Config">
-+        <arguments>
-+            <argument name="methodCode" xsi:type="const">Magento\AuthorizenetAcceptjs\Gateway\Config::METHOD</argument>
-+        </arguments>
-+    </type>
-+    <virtualType name="AuthorizenetAcceptjsFacade" type="Magento\Payment\Model\Method\Adapter">
-+        <arguments>
-+            <argument name="code" xsi:type="string">authorizenet_acceptjs</argument>
-+            <argument name="formBlockType" xsi:type="string">Magento\AuthorizenetAcceptjs\Block\Form</argument>
-+            <argument name="infoBlockType" xsi:type="string">AuthorizenetAcceptjsInfoBlock</argument>
-+            <argument name="valueHandlerPool" xsi:type="object">AuthorizenetAcceptjsValueHandlerPool</argument>
-+            <argument name="validatorPool" xsi:type="object">AuthorizenetAcceptjsValidatorPool</argument>
-+            <argument name="commandPool" xsi:type="object">AuthorizenetAcceptjsCommandPool</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
-+        <arguments>
-+            <argument name="commands" xsi:type="array">
-+                <item name="authorize" xsi:type="string">AuthorizenetAcceptjsAuthorizeCommand</item>
-+                <item name="capture" xsi:type="string">AuthorizenetAcceptjsCaptureCommand</item>
-+                <item name="sale" xsi:type="string">AuthorizenetAcceptjsSaleCommand</item>
-+                <item name="settle" xsi:type="string">AuthorizenetAcceptjsSettleCommand</item>
-+                <item name="void" xsi:type="string">AuthorizenetAcceptjsVoidCommand</item>
-+                <item name="refund" xsi:type="string">AuthorizenetAcceptjsRefundCommand</item>
-+                <item name="refund_settled" xsi:type="string">AuthorizenetAcceptjsRefundSettledCommand</item>
-+                <item name="cancel" xsi:type="string">AuthorizenetAcceptjsCancelCommand</item>
-+                <item name="accept_payment" xsi:type="string">AuthorizenetAcceptjsAcceptPaymentCommand</item>
-+                <item name="accept_fds" xsi:type="string">AuthorizenetAcceptjsAcceptFdsCommand</item>
-+                <item name="deny_payment" xsi:type="string">AuthorizenetAcceptjsCancelCommand</item>
-+                <item name="get_transaction_details" xsi:type="string">AuthorizenetAcceptjsTransactionDetailsCommand</item>
-+                <item name="fetch_transaction_information" xsi:type="string">AuthorizenetAcceptjsFetchTransactionInfoCommand</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+
-+    <!-- Validators -->
-+    <virtualType name="AuthorizenetAcceptjsAcceptsFdsRequestValidator" type="Magento\Payment\Gateway\Validator\ValidatorComposite">
-+        <arguments>
-+            <argument name="validators" xsi:type="array">
-+                <item name="general" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Validator\GeneralResponseValidator</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsTransactionValidator" type="Magento\Payment\Gateway\Validator\ValidatorComposite">
-+        <arguments>
-+            <argument name="chainBreakingValidators" xsi:type="array">
-+                <item name="general" xsi:type="boolean">true</item>
-+            </argument>
-+            <argument name="validators" xsi:type="array">
-+                <item name="general" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Validator\GeneralResponseValidator</item>
-+                <item name="transaction_status" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Validator\TransactionResponseValidator</item>
-+                <item name="transaction_hash" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Validator\TransactionHashValidator</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsTransactionDetailsValidator" type="Magento\Payment\Gateway\Validator\ValidatorComposite">
-+        <arguments>
-+            <argument name="validators" xsi:type="array">
-+                <item name="general" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Validator\GeneralResponseValidator</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
-+        <arguments>
-+            <argument name="config" xsi:type="object">Magento\AuthorizenetAcceptjs\Gateway\Config</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
-+        <arguments>
-+            <argument name="validators" xsi:type="array">
-+                <item name="country" xsi:type="string">AuthorizenetAcceptjsCountryValidator</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <!-- End Validators -->
-+
-+    <!-- Gateway Commands -->
-+    <virtualType name="AuthorizenetAcceptjsFetchTransactionInfoCommand" type="Magento\AuthorizenetAcceptjs\Gateway\Command\FetchTransactionInfoCommand">
-+        <arguments>
-+            <argument name="commandPool" xsi:type="object">AuthorizenetAcceptjsCommandPool</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsTransactionDetailsCommand" type="Magento\AuthorizenetAcceptjs\Gateway\Command\GatewayQueryCommand">
-+        <arguments>
-+            <argument name="requestBuilder" xsi:type="object">AuthorizenetAcceptjsTransactionDetailsRequest</argument>
-+            <argument name="transferFactory" xsi:type="object">AuthorizenetAcceptjsDefaultTransferFactory</argument>
-+            <argument name="client" xsi:type="object">Magento\AuthorizenetAcceptjs\Gateway\Http\Client</argument>
-+            <argument name="validator" xsi:type="object">AuthorizenetAcceptjsTransactionDetailsValidator</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsAuthorizeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
-+        <arguments>
-+            <argument name="requestBuilder" xsi:type="object">AuthorizenetAcceptjsAuthorizeRequest</argument>
-+            <argument name="transferFactory" xsi:type="object">AuthorizenetAcceptjsDefaultTransferFactory</argument>
-+            <argument name="client" xsi:type="object">Magento\AuthorizenetAcceptjs\Gateway\Http\Client</argument>
-+            <argument name="handler" xsi:type="object">AuthorizenetAcceptjsAuthorizationHandler</argument>
-+            <argument name="validator" xsi:type="object">AuthorizenetAcceptjsTransactionValidator</argument>
-+            <argument name="errorMessageMapper" xsi:type="object">AuthorizenetAcceptjsVirtualErrorMessageMapper</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsAcceptFdsCommand" type="Magento\AuthorizenetAcceptjs\Gateway\Command\GatewayQueryCommand">
-+        <arguments>
-+            <argument name="requestBuilder" xsi:type="object">AuthorizenetAcceptjsAcceptsFdsRequest</argument>
-+            <argument name="transferFactory" xsi:type="object">AuthorizenetAcceptjsDefaultTransferFactory</argument>
-+            <argument name="client" xsi:type="object">Magento\AuthorizenetAcceptjs\Gateway\Http\Client</argument>
-+            <argument name="validator" xsi:type="object">AuthorizenetAcceptjsAcceptsFdsRequestValidator</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsAcceptPaymentCommand" type="Magento\AuthorizenetAcceptjs\Gateway\Command\AcceptPaymentStrategyCommand">
-+        <arguments>
-+            <argument name="commandPool" xsi:type="object">AuthorizenetAcceptjsCommandPool</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsSaleCommand" type="AuthorizenetAcceptjsAuthorizeCommand">
-+        <arguments>
-+            <argument name="requestBuilder" xsi:type="object">AuthorizenetAcceptjsSaleRequest</argument>
-+            <argument name="handler" xsi:type="object">AuthorizenetAcceptjsSaleHandler</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsRefundCommand" type="Magento\AuthorizenetAcceptjs\Gateway\Command\RefundTransactionStrategyCommand">
-+        <arguments>
-+            <argument name="commandPool" xsi:type="object">AuthorizenetAcceptjsCommandPool</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsRefundSettledCommand" type="AuthorizenetAcceptjsAuthorizeCommand">
-+        <arguments>
-+            <argument name="requestBuilder" xsi:type="object">AuthorizenetAcceptjsRefundRequest</argument>
-+            <argument name="handler" xsi:type="object">AuthorizenetAcceptjsRefundSettledHandler</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsCaptureCommand" type="Magento\AuthorizenetAcceptjs\Gateway\Command\CaptureStrategyCommand">
-+        <arguments>
-+            <argument name="commandPool" xsi:type="object">AuthorizenetAcceptjsCommandPool</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsSettleCommand" type="AuthorizenetAcceptjsAuthorizeCommand">
-+        <arguments>
-+            <argument name="requestBuilder" xsi:type="object">AuthorizenetAcceptjsCaptureRequest</argument>
-+            <argument name="handler" xsi:type="object">AuthorizenetAcceptjsCaptureTransactionHandler</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsVoidCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
-+        <arguments>
-+            <argument name="requestBuilder" xsi:type="object">AuthorizenetAcceptjsVoidRequest</argument>
-+            <argument name="transferFactory" xsi:type="object">AuthorizenetAcceptjsDefaultTransferFactory</argument>
-+            <argument name="client" xsi:type="object">Magento\AuthorizenetAcceptjs\Gateway\Http\Client</argument>
-+            <argument name="handler" xsi:type="object">AuthorizenetAcceptjsVoidHandler</argument>
-+            <argument name="validator" xsi:type="object">AuthorizenetAcceptjsTransactionValidator</argument>
-+            <argument name="errorMessageMapper" xsi:type="object">AuthorizenetAcceptjsVirtualErrorMessageMapper</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsCancelCommand" type="AuthorizenetAcceptjsVoidCommand">
-+        <arguments>
-+            <argument name="handler" xsi:type="object">AuthorizenetAcceptjsCancelHandler</argument>
-+        </arguments>
-+    </virtualType>
-+    <!-- End Gateway Commands -->
-+
-+    <!-- Handlers -->
-+    <virtualType name="AuthorizenetAcceptjsPaymentReviewStatusHandler" type="Magento\Payment\Gateway\Response\HandlerChain">
-+        <arguments>
-+            <argument name="handlers" xsi:type="array">
-+                <item name="payment_status" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\PaymentReviewStatusHandler</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsAuthorizationHandler" type="Magento\Payment\Gateway\Response\HandlerChain">
-+        <arguments>
-+            <argument name="handlers" xsi:type="array">
-+                <item name="transaction_id" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\TransactionIdHandler</item>
-+                <item name="payment_details" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\PaymentResponseHandler</item>
-+                <item name="transaction_details" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\TransactionDetailsResponseHandler</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsSaleHandler" type="AuthorizenetAcceptjsAuthorizationHandler">
-+        <arguments>
-+            <argument name="handlers" xsi:type="array">
-+                <item name="close_parent_transaction" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\CloseParentTransactionHandler</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="CloseCaptureTransactionHandler" type="Magento\AuthorizenetAcceptjs\Gateway\Response\CloseTransactionHandler">
-+        <arguments>
-+            <argument name="closeTransaction" xsi:type="boolean">false</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsCaptureTransactionHandler" type="Magento\Payment\Gateway\Response\HandlerChain">
-+        <arguments>
-+            <argument name="handlers" xsi:type="array">
-+                <item name="close_transaction" xsi:type="string">CloseCaptureTransactionHandler</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsRefundSettledHandler" type="Magento\Payment\Gateway\Response\HandlerChain">
-+        <arguments>
-+            <argument name="handlers" xsi:type="array">
-+                <item name="transaction_id" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\TransactionIdHandler</item>
-+                <item name="close_parent_transaction" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\CloseParentTransactionHandler</item>
-+                <item name="close_transaction" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\CloseTransactionHandler</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsVoidHandler" type="Magento\Payment\Gateway\Response\HandlerChain">
-+        <arguments>
-+            <argument name="handlers" xsi:type="array">
-+                <item name="void" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\VoidResponseHandler</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsCancelHandler" type="Magento\Payment\Gateway\Response\HandlerChain">
-+        <arguments>
-+            <argument name="handlers" xsi:type="array">
-+                <item name="close_transaction" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\CloseTransactionHandler</item>
-+                <item name="close_parent_transaction" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\CloseParentTransactionHandler</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <!-- End Handlers -->
-+
-+    <!-- Request Types -->
-+    <!-- Be advised that the order of the request parameters is important -->
-+    <virtualType name="AuthorizenetAcceptjsTransactionDetailsRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
-+        <arguments>
-+            <argument name="builders" xsi:type="array">
-+                <item name="request_type" xsi:type="string">AuthorizenetAcceptjsTransactionDetailsRequestTypeBuilder</item>
-+                <item name="store" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AuthenticationDataBuilder</item>
-+                <item name="reference_transaction" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\TransactionDetailsDataBuilder</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsAcceptsFdsRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
-+        <arguments>
-+            <argument name="builders" xsi:type="array">
-+                <item name="request_type" xsi:type="string">AuthorizenetAcceptjsAcceptsFdsRequestTypeBuilder</item>
-+                <item name="store" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AuthenticationDataBuilder</item>
-+                <item name="reference_transaction" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AcceptFdsDataBuilder</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsAuthorizeRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
-+        <arguments>
-+            <argument name="builders" xsi:type="array">
-+                <item name="request_type" xsi:type="string">AuthorizenetAcceptjsTransactionRequestTypeBuilder</item>
-+                <item name="store" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AuthenticationDataBuilder</item>
-+                <item name="transaction_type" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AuthorizeDataBuilder</item>
-+                <item name="amount" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AmountDataBuilder</item>
-+                <item name="payment" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\PaymentDataBuilder</item>
-+                <item name="shipping" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\ShippingDataBuilder</item>
-+                <item name="solution" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\SolutionDataBuilder</item>
-+                <item name="order" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\OrderDataBuilder</item>
-+                <item name="po" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\PoDataBuilder</item>
-+                <item name="customer" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\CustomerDataBuilder</item>
-+                <item name="address" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AddressDataBuilder</item>
-+                <item name="3d_secure" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\StubDataBuilder</item>
-+                <item name="custom_settings" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\CustomSettingsBuilder</item>
-+                <item name="passthrough_data" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\PassthroughDataBuilder</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsSaleRequest" type="AuthorizenetAcceptjsAuthorizeRequest">
-+        <arguments>
-+            <argument name="builders" xsi:type="array">
-+                <item name="transaction_type" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\SaleDataBuilder</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsRefundRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
-+        <arguments>
-+            <argument name="builders" xsi:type="array">
-+                <item name="request_type" xsi:type="string">AuthorizenetAcceptjsTransactionRequestTypeBuilder</item>
-+                <item name="store" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AuthenticationDataBuilder</item>
-+                <item name="transaction_type" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\RefundTransactionTypeDataBuilder</item>
-+                <item name="amount" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AmountDataBuilder</item>
-+                <item name="payment" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\RefundPaymentDataBuilder</item>
-+                <item name="shipping" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\ShippingDataBuilder</item>
-+                <item name="ref_transaction" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\RefundReferenceTransactionDataBuilder</item>
-+                <item name="order" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\OrderDataBuilder</item>
-+                <item name="po" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\PoDataBuilder</item>
-+                <item name="customer" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\CustomerDataBuilder</item>
-+                <item name="address" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AddressDataBuilder</item>
-+                <item name="custom_settings" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\CustomSettingsBuilder</item>
-+                <item name="passthrough_data" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\PassthroughDataBuilder</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsCaptureRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
-+        <arguments>
-+            <argument name="builders" xsi:type="array">
-+                <item name="request_type" xsi:type="string">AuthorizenetAcceptjsTransactionRequestTypeBuilder</item>
-+                <item name="store" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AuthenticationDataBuilder</item>
-+                <item name="transaction_type" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\CaptureDataBuilder</item>
-+                <item name="passthrough_data" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\PassthroughDataBuilder</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsVoidRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
-+        <arguments>
-+            <argument name="builders" xsi:type="array">
-+                <item name="request_type" xsi:type="string">AuthorizenetAcceptjsTransactionRequestTypeBuilder</item>
-+                <item name="store" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\AuthenticationDataBuilder</item>
-+                <item name="void" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\VoidDataBuilder</item>
-+                <item name="passthrough_data" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Request\PassthroughDataBuilder</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <!-- End Request Types -->
-+
-+    <!-- Request Payload Types -->
-+    <virtualType name="AuthorizenetAcceptjsTransactionRequestTypeBuilder" type="Magento\AuthorizenetAcceptjs\Gateway\Request\RequestTypeBuilder">
-+        <arguments>
-+            <argument name="type" xsi:type="string">createTransactionRequest</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsTransactionDetailsRequestTypeBuilder" type="Magento\AuthorizenetAcceptjs\Gateway\Request\RequestTypeBuilder">
-+        <arguments>
-+            <argument name="type" xsi:type="string">getTransactionDetailsRequest</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsAcceptsFdsRequestTypeBuilder" type="Magento\AuthorizenetAcceptjs\Gateway\Request\RequestTypeBuilder">
-+        <arguments>
-+            <argument name="type" xsi:type="string">updateHeldTransactionRequest</argument>
-+        </arguments>
-+    </virtualType>
-+    <!-- End Request Payload Types -->
-+
-+    <!-- Error Mapping -->
-+    <virtualType name="AuthorizenetAcceptjsErrorMappingConfigReader" type="Magento\Payment\Gateway\ErrorMapper\VirtualConfigReader">
-+        <arguments>
-+            <argument name="fileName" xsi:type="string">authorizenet_acceptjs_error_mapping.xml</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsErrorMappingData" type="Magento\Payment\Gateway\ErrorMapper\MappingData">
-+        <arguments>
-+            <argument name="reader" xsi:type="object">AuthorizenetAcceptjsErrorMappingConfigReader</argument>
-+            <argument name="cacheId" xsi:type="string">authorizenet_acceptjs_error_mapper</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsVirtualErrorMessageMapper" type="Magento\Payment\Gateway\ErrorMapper\ErrorMessageMapper">
-+        <arguments>
-+            <argument name="messageMapping" xsi:type="object">AuthorizenetAcceptjsErrorMappingData</argument>
-+        </arguments>
-+    </virtualType>
-+    <!-- End Error Mapping -->
-+
-+    <type name="Magento\AuthorizenetAcceptjs\Gateway\Command\FetchTransactionInfoCommand">
-+        <arguments>
-+            <argument name="handler" xsi:type="object">AuthorizenetAcceptjsPaymentReviewStatusHandler</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Payment\Gateway\Command\CommandManagerPool">
-+        <arguments>
-+            <argument name="executors" xsi:type="array">
-+                <item name="authorizenet_acceptjs" xsi:type="string">AuthorizenetAcceptjsCommandManager</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Config\Model\Config\TypePool">
-+        <arguments>
-+            <argument name="sensitive" xsi:type="array">
-+                <item name="payment/authorizenet_acceptjs/login" xsi:type="string">1</item>
-+                <item name="payment/authorizenet_acceptjs/trans_key" xsi:type="string">1</item>
-+                <item name="payment/authorizenet_acceptjs/signature_key" xsi:type="string">1</item>
-+                <item name="payment/authorizenet_acceptjs/trans_md5" xsi:type="string">1</item>
-+                <item name="payment/authorizenet_acceptjs/api_url" xsi:type="string">1</item>
-+                <item name="payment/authorizenet_acceptjs/email_customer" xsi:type="string">1</item>
-+            </argument>
-+            <argument name="environment" xsi:type="array">
-+                <item name="payment/authorizenet_acceptjs/api_url" xsi:type="string">1</item>
-+                <item name="payment/authorizenet_acceptjs/test" xsi:type="string">1</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <virtualType name="AuthorizenetAcceptjsDefaultValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
-+        <arguments>
-+            <argument name="configInterface" xsi:type="object">Magento\AuthorizenetAcceptjs\Gateway\Config</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
-+        <arguments>
-+            <argument name="handlers" xsi:type="array">
-+                <item name="default" xsi:type="string">AuthorizenetAcceptjsDefaultValueHandler</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsCommandManager" type="Magento\Payment\Gateway\Command\CommandManager">
-+        <arguments>
-+            <argument name="commandPool" xsi:type="object">AuthorizenetAcceptjsCommandPool</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsLogger" type="Magento\Payment\Model\Method\Logger">
-+        <arguments>
-+            <argument name="config" xsi:type="object">Magento\AuthorizenetAcceptjs\Gateway\Config</argument>
-+        </arguments>
-+    </virtualType>
-+    <type name="Magento\AuthorizenetAcceptjs\Gateway\Http\Client">
-+        <arguments>
-+            <argument name="paymentLogger" xsi:type="object">AuthorizenetAcceptjsLogger</argument>
-+        </arguments>
-+    </type>
-+    <virtualType name="AuthorizenetAcceptjsRemoveStoreConfigFilter" type="Magento\AuthorizenetAcceptjs\Gateway\Http\Payload\Filter\RemoveFieldsFilter">
-+        <arguments>
-+            <argument name="fields" xsi:type="array">
-+                <item name="0" xsi:type="string">store_id</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsDefaultTransferFactory" type="Magento\AuthorizenetAcceptjs\Gateway\Http\TransferFactory">
-+        <arguments>
-+            <argument name="payloadFilters" xsi:type="array">
-+                <item name="store_config" xsi:type="object">AuthorizenetAcceptjsRemoveStoreConfigFilter</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="AuthorizenetAcceptjsInfoBlock" type="Magento\AuthorizenetAcceptjs\Block\Info">
-+        <arguments>
-+            <argument name="config" xsi:type="object">Magento\AuthorizenetAcceptjs\Gateway\Config</argument>
-+        </arguments>
-+    </virtualType>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/events.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/events.xml
-new file mode 100644
-index 00000000000..93dc448d1d8
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/events.xml
-@@ -0,0 +1,13 @@
-+<?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="payment_method_assign_data_authorizenet_acceptjs">
-+        <observer name="authorizenet_acceptjs_gateway_data_assign" instance="Magento\AuthorizenetAcceptjs\Observer\DataAssignObserver" />
-+    </event>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/frontend/di.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/frontend/di.xml
-new file mode 100644
-index 00000000000..8b0e570abbd
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/frontend/di.xml
-@@ -0,0 +1,30 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\AuthorizenetAcceptjs\Block\Info">
-+        <arguments>
-+            <argument name="data" xsi:type="array">
-+                <item xsi:type="string" name="is_secure_mode">1</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Checkout\Model\CompositeConfigProvider">
-+        <arguments>
-+            <argument name="configProviders" xsi:type="array">
-+                <item name="authorizenet_acceptjs_config_provider" xsi:type="object">Magento\AuthorizenetAcceptjs\Model\Ui\ConfigProvider</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Payment\Model\CcGenericConfigProvider">
-+        <arguments>
-+            <argument name="methodCodes" xsi:type="array">
-+                <item name="authorizenet_acceptjs" xsi:type="const">Magento\AuthorizenetAcceptjs\Gateway\Config::METHOD</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/module.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/module.xml
-new file mode 100644
-index 00000000000..6bc8fe3c4da
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/module.xml
-@@ -0,0 +1,19 @@
-+<?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:Module/etc/module.xsd" >
-+    <module name="Magento_AuthorizenetAcceptjs" setup_version="1.0.0">
-+        <sequence>
-+            <module name="Magento_Customer"/>
-+            <module name="Magento_Payment"/>
-+            <module name="Magento_Checkout"/>
-+            <module name="Magento_Catalog"/>
-+            <module name="Magento_Quote"/>
-+            <module name="Magento_Theme"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/payment.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/payment.xml
-new file mode 100644
-index 00000000000..b9f8d40b030
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/payment.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
-+    <methods>
-+        <method name="authorizenet_acceptjs">
-+            <allow_multiple_address>0</allow_multiple_address>
-+        </method>
-+    </methods>
-+</payment>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/i18n/en_US.csv b/app/code/Magento/AuthorizenetAcceptjs/i18n/en_US.csv
-new file mode 100644
-index 00000000000..da518301652
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/i18n/en_US.csv
-@@ -0,0 +1,21 @@
-+Authorize.net,Authorize.net
-+"Gateway URL","Gateway URL"
-+"Invalid payload type.","Invalid payload type."
-+"Something went wrong in the payment gateway.","Something went wrong in the payment gateway."
-+"Merchant MD5 (deprecated","Merchant MD5 (deprecated"
-+"Signature Key","Signature Key"
-+"Basic Authorize.Net Settings","Basic Authorize.Net Settings"
-+"Advanced Authorie.Net Settings","Advanced Authorie.Net Settings"
-+"Public Client Key","Public Client Key"
-+"Environment","Environment"
-+"Production","Production"
-+"Sandbox","Sandbox"
-+"accountType","Account Type"
-+"authCode", "Processor Response Text"
-+"avsResultCode", "AVS Response Code"
-+"cvvResultCode","CVV Response Code"
-+"cavvResultCode","CAVV Response Code"
-+"Enable Credit Card Verification Field","Enable Credit Card Verification Field"
-+"ccLast4","Last 4 Digits of Card"
-+"There was an error while trying to process the refund.","There was an error while trying to process the refund."
-+"This transaction cannot be refunded with its current status.","This transaction cannot be refunded with its current status."
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/registration.php b/app/code/Magento/AuthorizenetAcceptjs/registration.php
-new file mode 100644
-index 00000000000..5338c9a4ddc
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/registration.php
-@@ -0,0 +1,11 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use \Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AuthorizenetAcceptjs', __DIR__);
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/layout/sales_order_create_index.xml
-new file mode 100644
-index 00000000000..ee1de3ed7ef
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/layout/sales_order_create_index.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <body>
-+        <referenceBlock name="order_create_billing_form">
-+            <action method="setMethodFormTemplate">
-+                <argument name="method" xsi:type="const">Magento\AuthorizenetAcceptjs\Gateway\Config::METHOD</argument>
-+                <argument name="template" xsi:type="string">Magento_AuthorizenetAcceptjs::form/cc.phtml</argument>
-+            </action>
-+        </referenceBlock>
-+        <referenceBlock name="content">
-+            <block name="authorizenet_acceptjs_payment_script"
-+                   as="authorizenet_acceptjs_payment_script"
-+                   template="Magento_AuthorizenetAcceptjs::payment/script.phtml"
-+                   class="Magento\AuthorizenetAcceptjs\Block\Payment"
-+                   after="billing_method"/>
-+        </referenceBlock>
-+    </body>
-+</page>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml
-new file mode 100644
-index 00000000000..13f6d38e2b8
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <body>
-+        <referenceBlock name="order.create.billing.method.form">
-+            <action method="setMethodFormTemplate">
-+                <argument name="method" xsi:type="const">Magento\AuthorizenetAcceptjs\Gateway\Config::METHOD</argument>
-+                <argument name="template" xsi:type="string">Magento_AuthorizenetAcceptjs::form/cc.phtml</argument>
-+            </action>
-+        </referenceBlock>
-+    </body>
-+</page>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/form/cc.phtml
-new file mode 100644
-index 00000000000..b757e55aadd
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/form/cc.phtml
-@@ -0,0 +1,92 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/**
-+ * @var Magento\AuthorizenetAcceptjs\Block\Form $block
-+ */
-+$code = $block->escapeHtml($block->getMethodCode());
-+$ccType = $block->getInfoData('cc_type');
-+$ccExpMonth = $block->getInfoData('cc_exp_month');
-+$ccExpYear = $block->getInfoData('cc_exp_year');
-+?>
-+<fieldset class="admin__fieldset payment-method" id="payment_form_<?= /* @noEscape */ $code ?>"
-+          style="display:none">
-+    <div class="field-type admin__field _required">
-+        <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_type">
-+            <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
-+        </label>
-+        <div class="admin__field-control">
-+            <select id="<?= /* @noEscape */ $code ?>_cc_type" name="payment[cc_type]"
-+                    class="required-entry validate-cc-type-select admin__control-select">
-+                <option value=""></option>
-+                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
-+                    <option value="<?= $block->escapeHtml($typeCode) ?>" <?php if ($typeCode == $ccType) : ?>selected="selected"<?php endif ?>>
-+                        <?= $block->escapeHtml($typeName) ?>
-+                    </option>
-+                <?php endforeach ?>
-+            </select>
-+        </div>
-+    </div>
-+    <div class="field-number admin__field _required">
-+        <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_number">
-+            <span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
-+        </label>
-+        <div class="admin__field-control">
-+            <input type="text" id="<?= /* @noEscape */ $code ?>_cc_number" name="payment[cc_number]"
-+                   title="<?= $block->escapeHtml(__('Credit Card Number')) ?>" class="admin__control-text validate-cc-number"
-+                   value="<?= /* @noEscape */ $block->getInfoData('cc_number') ?>"/>
-+        </div>
-+    </div>
-+    <div class="field-date admin__field _required">
-+        <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_exp_month">
-+            <span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
-+        </label>
-+        <div class="admin__field-control">
-+            <select id="<?= /* @noEscape */ $code ?>_cc_exp_month" name="payment[cc_exp_month]"
-+                    class="admin__control-select admin__control-select-month validate-cc-exp required-entry">
-+                <?php foreach ($block->getCcMonths() as $k => $v) : ?>
-+                    <option value="<?= $block->escapeHtml($k) ?>"
-+                            <?php if ($k == $ccExpMonth) : ?>selected="selected"<?php endif ?>>
-+                        <?= $block->escapeHtml($v) ?>
-+                    </option>
-+                <?php endforeach; ?>
-+            </select>
-+            <select id="<?= /* @noEscape */ $code ?>_cc_exp_year" name="payment[cc_exp_year]"
-+                    class="admin__control-select admin__control-select-year required-entry">
-+                <?php foreach ($block->getCcYears() as $k => $v) : ?>
-+                    <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
-+                            <?php if ($k == $ccExpYear) : ?>selected="selected"<?php endif ?>>
-+                        <?= $block->escapeHtml($v) ?>
-+                    </option>
-+                <?php endforeach ?>
-+            </select>
-+        </div>
-+    </div>
-+
-+    <?php if ($block->isCvvEnabled()) : ?>
-+        <div class="field-number required admin__field _required">
-+            <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_cid">
-+                <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
-+            </label>
-+            <div class="admin__field-control">
-+                <input type="text" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
-+                       class="required-entry validate-cc-cvn admin__control-cvn admin__control-text"
-+                       id="<?= /* @noEscape */ $code ?>_cc_cid"
-+                       name="payment[cc_cid]" value="<?= /* @noEscape */ $block->getInfoData('cc_cid') ?>"/>
-+            </div>
-+        </div>
-+    <?php endif; ?>
-+
-+    <input type="hidden" id="<?= /* @noEscape */ $code ?>_opaque_data_descriptor"
-+           name="payment[opaqueDataDescriptor]"
-+           value="<?=$block->escapeHtmlAttr($block->getInfoData('opaqueDataDescriptor')) ?>"/>
-+    <input type="hidden" id="<?= /* @noEscape */ $code ?>_opaque_data_value"
-+           name="payment[opaqueDataValue]"
-+           value="<?=$block->escapeHtmlAttr($block->getInfoData('opaqueDataValue')) ?>"/>
-+    <input type="hidden" id="<?= /* @noEscape */ $code ?>_cc_last_4"
-+           name="payment[ccLast4]"
-+           value="<?=$block->escapeHtmlAttr($block->getInfoData('ccLast4')) ?>"/>
-+</fieldset>
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml
-new file mode 100644
-index 00000000000..6960bddf696
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/** @var Magento\AuthorizenetAcceptjs\Block\Payment $block */
-+?>
-+<script type="text/x-magento-init">
-+    {
-+        "#payment_form_<?= $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>": {
-+            "Magento_AuthorizenetAcceptjs/js/payment-form": {
-+                "config": <?= /* @noEscape */ $block->getPaymentConfig() ?>
-+            }
-+        }
-+    }
-+</script>
-\ No newline at end of file
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/web/js/authorizenet.js b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/web/js/authorizenet.js
-new file mode 100644
-index 00000000000..0eb865d7666
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/web/js/authorizenet.js
-@@ -0,0 +1,196 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+define([
-+    'jquery',
-+    'uiComponent',
-+    'Magento_Ui/js/modal/alert',
-+    'Magento_AuthorizenetAcceptjs/js/view/payment/acceptjs-client'
-+], function ($, Class, alert, AcceptjsClient) {
-+    'use strict';
-+
-+    return Class.extend({
-+        defaults: {
-+            acceptjsClient: null,
-+            $selector: null,
-+            selector: 'edit_form',
-+            container: 'payment_form_authorizenet_acceptjs',
-+            active: false,
-+            imports: {
-+                onActiveChange: 'active'
-+            }
-+        },
-+
-+        /**
-+         * @{inheritdoc}
-+         */
-+        initConfig: function (config) {
-+            this._super();
-+
-+            this.acceptjsClient = AcceptjsClient({
-+                environment: config.environment
-+            });
-+
-+            return this;
-+        },
-+
-+        /**
-+         * @{inheritdoc}
-+         */
-+        initObservable: function () {
-+            this.$selector = $('#' + this.selector);
-+            this._super()
-+                .observe('active');
-+
-+            // re-init payment method events
-+            this.$selector.off('changePaymentMethod.' + this.code)
-+                .on('changePaymentMethod.' + this.code, this.changePaymentMethod.bind(this));
-+
-+            return this;
-+        },
-+
-+        /**
-+         * Enable/disable current payment method
-+         *
-+         * @param {Object} event
-+         * @param {String} method
-+         * @returns {Object}
-+         */
-+        changePaymentMethod: function (event, method) {
-+            this.active(method === this.code);
-+
-+            return this;
-+        },
-+
-+        /**
-+         * Triggered when payment changed
-+         *
-+         * @param {Boolean} isActive
-+         */
-+        onActiveChange: function (isActive) {
-+            if (!isActive) {
-+
-+                return;
-+            }
-+
-+            this.disableEventListeners();
-+
-+            window.order.addExcludedPaymentMethod(this.code);
-+
-+            this.enableEventListeners();
-+        },
-+
-+        /**
-+         * Sets the payment details on the form
-+         *
-+         * @param {Object} tokens
-+         */
-+        setPaymentDetails: function (tokens) {
-+            var $ccNumber = $(this.getSelector('cc_number')),
-+                ccLast4 = $ccNumber.val().replace(/[^\d]/g, '').substr(-4);
-+
-+            $(this.getSelector('opaque_data_descriptor')).val(tokens.opaqueDataDescriptor);
-+            $(this.getSelector('opaque_data_value')).val(tokens.opaqueDataValue);
-+            $(this.getSelector('cc_last_4')).val(ccLast4);
-+            $ccNumber.val('');
-+            $(this.getSelector('cc_exp_month')).val('');
-+            $(this.getSelector('cc_exp_year')).val('');
-+
-+            if (this.useCvv) {
-+                $(this.getSelector('cc_cid')).val('');
-+            }
-+        },
-+
-+        /**
-+         * Trigger order submit
-+         */
-+        submitOrder: function () {
-+            var authData = {},
-+                cardData = {},
-+                secureData = {};
-+
-+            this.$selector.validate().form();
-+            this.$selector.trigger('afterValidate.beforeSubmit');
-+
-+            authData.clientKey = this.clientKey;
-+            authData.apiLoginID = this.apiLoginID;
-+
-+            cardData.cardNumber = $(this.getSelector('cc_number')).val();
-+            cardData.month = $(this.getSelector('cc_exp_month')).val();
-+            cardData.year = $(this.getSelector('cc_exp_year')).val();
-+
-+            if (this.useCvv) {
-+                cardData.cardCode = $(this.getSelector('cc_cid')).val();
-+            }
-+
-+            secureData.authData = authData;
-+            secureData.cardData = cardData;
-+
-+            this.disableEventListeners();
-+
-+            this.acceptjsClient.createTokens(secureData)
-+                .always(function () {
-+                    $('body').trigger('processStop');
-+                    this.enableEventListeners();
-+                }.bind(this))
-+                .done(function (tokens) {
-+                    this.setPaymentDetails(tokens);
-+                    this.placeOrder();
-+                }.bind(this))
-+                .fail(function (messages) {
-+                    this.tokens = null;
-+
-+                    if (messages.length > 0) {
-+                        this._showError(messages[0]);
-+                    }
-+                }.bind(this));
-+
-+            return false;
-+        },
-+
-+        /**
-+         * Place order
-+         */
-+        placeOrder: function () {
-+            this.$selector.trigger('realOrder');
-+        },
-+
-+        /**
-+         * Get jQuery selector
-+         *
-+         * @param {String} field
-+         * @returns {String}
-+         */
-+        getSelector: function (field) {
-+            return '#' + this.code + '_' + field;
-+        },
-+
-+        /**
-+         * Show alert message
-+         *
-+         * @param {String} message
-+         */
-+        _showError: function (message) {
-+            alert({
-+                content: message
-+            });
-+        },
-+
-+        /**
-+         * Enable form event listeners
-+         */
-+        enableEventListeners: function () {
-+            this.$selector.on('submitOrder.authorizenetacceptjs', this.submitOrder.bind(this));
-+        },
-+
-+        /**
-+         * Disable form event listeners
-+         */
-+        disableEventListeners: function () {
-+            this.$selector.off('submitOrder');
-+            this.$selector.off('submit');
-+        }
-+
-+    });
-+});
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/web/js/payment-form.js b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/web/js/payment-form.js
-new file mode 100644
-index 00000000000..68c2f22f6ed
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/web/js/payment-form.js
-@@ -0,0 +1,18 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+define([
-+    'Magento_AuthorizenetAcceptjs/js/authorizenet',
-+    'jquery'
-+], function (AuthorizenetAcceptjs, $) {
-+    'use strict';
-+
-+    return function (data, element) {
-+        var $form = $(element),
-+            config = data.config;
-+
-+        config.active = $form.length > 0 && !$form.is(':hidden');
-+        new AuthorizenetAcceptjs(config);
-+    };
-+});
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/base/requirejs-config.js b/app/code/Magento/AuthorizenetAcceptjs/view/base/requirejs-config.js
-new file mode 100644
-index 00000000000..83ddd1094ea
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/base/requirejs-config.js
-@@ -0,0 +1,19 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+var config = {
-+    shim: {
-+        acceptjs: {
-+            exports: 'Accept'
-+        },
-+        acceptjssandbox: {
-+            exports: 'Accept'
-+        }
-+    },
-+    paths: {
-+        acceptjssandbox: 'https://jstest.authorize.net/v1/Accept',
-+        acceptjs: 'https://js.authorize.net/v1/Accept'
-+    }
-+};
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-client.js b/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-client.js
-new file mode 100644
-index 00000000000..935465f5298
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-client.js
-@@ -0,0 +1,73 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'jquery',
-+    'uiClass',
-+    'Magento_AuthorizenetAcceptjs/js/view/payment/acceptjs-factory',
-+    'Magento_AuthorizenetAcceptjs/js/view/payment/validator-handler'
-+], function ($, Class, acceptjsFactory, validatorHandler) {
-+    'use strict';
-+
-+    return Class.extend({
-+        defaults: {
-+            environment: 'production'
-+        },
-+
-+        /**
-+         * @{inheritdoc}
-+         */
-+        initialize: function () {
-+            validatorHandler.initialize();
-+
-+            this._super();
-+
-+            return this;
-+        },
-+
-+        /**
-+         * Creates the token pair with the provided data
-+         *
-+         * @param {Object} data
-+         * @return {jQuery.Deferred}
-+         */
-+        createTokens: function (data) {
-+            var deferred = $.Deferred();
-+
-+            if (this.acceptjsClient) {
-+                this._createTokens(deferred, data);
-+            } else {
-+                acceptjsFactory(this.environment)
-+                    .done(function (client) {
-+                        this.acceptjsClient = client;
-+                        this._createTokens(deferred, data);
-+                    }.bind(this));
-+            }
-+
-+            return deferred.promise();
-+        },
-+
-+        /**
-+         * Creates a token from the payment information in the form
-+         *
-+         * @param {jQuery.Deferred} deferred
-+         * @param {Object} data
-+         */
-+        _createTokens: function (deferred, data) {
-+            this.acceptjsClient.dispatchData(data, function (response) {
-+                validatorHandler.validate(response, function (valid, messages) {
-+                    if (valid) {
-+                        deferred.resolve({
-+                            opaqueDataDescriptor: response.opaqueData.dataDescriptor,
-+                            opaqueDataValue: response.opaqueData.dataValue
-+                        });
-+                    } else {
-+                        deferred.reject(messages);
-+                    }
-+                });
-+            });
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-factory.js b/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-factory.js
-new file mode 100644
-index 00000000000..e98a204e36c
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-factory.js
-@@ -0,0 +1,38 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'jquery'
-+], function ($) {
-+    'use strict';
-+
-+    return function (environment) {
-+        var deferred = $.Deferred(),
-+            dependency = 'acceptjs';
-+
-+        if (environment === 'sandbox') {
-+            dependency = 'acceptjssandbox';
-+        }
-+
-+        require([dependency], function (accept) {
-+                var $body = $('body');
-+
-+                /*
-+                 * Acceptjs doesn't safely load dependent files which leads to a race condition when trying to use
-+                 * the sdk right away.
-+                 * @see https://community.developer.authorize.net/t5/Integration-and-Testing/
-+                 * Dynamically-loading-Accept-js-E-WC-03-Accept-js-is-not-loaded/td-p/63283
-+                 */
-+                $body.on('handshake.acceptjs', function () {
-+                    deferred.resolve(accept);
-+                    $body.off('handshake.acceptjs');
-+                });
-+            },
-+            deferred.reject
-+        );
-+
-+        return deferred.promise();
-+    };
-+});
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/response-validator.js b/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/response-validator.js
-new file mode 100644
-index 00000000000..3c44ca2f9e4
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/response-validator.js
-@@ -0,0 +1,38 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'jquery',
-+    'mage/translate'
-+], function ($, $t) {
-+    'use strict';
-+
-+    return {
-+        /**
-+         * Validate Authorizenet-Acceptjs response
-+         *
-+         * @param {Object} context
-+         * @returns {jQuery.Deferred}
-+         */
-+        validate: function (context) {
-+            var state = $.Deferred(),
-+                messages = [];
-+
-+            if (context.messages.resultCode === 'Ok') {
-+                state.resolve();
-+            } else {
-+                if (context.messages.message.length > 0) {
-+                    $.each(context.messages.message, function (index, element) {
-+                        messages.push($t(element.text));
-+                    });
-+                }
-+                state.reject(messages);
-+            }
-+
-+            return state.promise();
-+        }
-+    };
-+});
-+
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/validator-handler.js b/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/validator-handler.js
-new file mode 100644
-index 00000000000..109f159c9a7
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/validator-handler.js
-@@ -0,0 +1,59 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'jquery',
-+    'Magento_AuthorizenetAcceptjs/js/view/payment/response-validator'
-+], function ($, responseValidator) {
-+    'use strict';
-+
-+    return {
-+        validators: [],
-+
-+        /**
-+         * Init list of validators
-+         */
-+        initialize: function () {
-+            this.add(responseValidator);
-+        },
-+
-+        /**
-+         * Add new validator
-+         * @param {Object} validator
-+         */
-+        add: function (validator) {
-+            this.validators.push(validator);
-+        },
-+
-+        /**
-+         * Run pull of validators
-+         * @param {Object} context
-+         * @param {Function} callback
-+         */
-+        validate: function (context, callback) {
-+            var self = this,
-+                deferred;
-+
-+            // no available validators
-+            if (!self.validators.length) {
-+                callback(true);
-+
-+                return;
-+            }
-+
-+            // get list of deferred validators
-+            deferred = $.map(self.validators, function (current) {
-+                return current.validate(context);
-+            });
-+
-+            $.when.apply($, deferred)
-+                .done(function () {
-+                    callback(true);
-+                }).fail(function (error) {
-+                    callback(false, error);
-+                });
-+        }
-+    };
-+});
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/AuthorizenetAcceptjs/view/frontend/layout/checkout_index_index.xml
-new file mode 100644
-index 00000000000..f31b06c9be9
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/frontend/layout/checkout_index_index.xml
-@@ -0,0 +1,49 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <body>
-+        <referenceBlock name="checkout.root">
-+            <arguments>
-+                <argument name="jsLayout" xsi:type="array">
-+                    <item name="components" xsi:type="array">
-+                        <item name="checkout" xsi:type="array">
-+                            <item name="children" xsi:type="array">
-+                                <item name="steps" xsi:type="array">
-+                                    <item name="children" xsi:type="array">
-+                                        <item name="billing-step" xsi:type="array">
-+                                            <item name="component" xsi:type="string">uiComponent</item>
-+                                            <item name="children" xsi:type="array">
-+                                                <item name="payment" xsi:type="array">
-+                                                    <item name="children" xsi:type="array">
-+                                                        <item name="renders" xsi:type="array">
-+                                                            <!-- merge payment method renders here -->
-+                                                            <item name="children" xsi:type="array">
-+                                                                <item name="authorizenet_acceptjs" xsi:type="array">
-+                                                                    <item name="component" xsi:type="string">Magento_AuthorizenetAcceptjs/js/view/payment/authorizenet</item>
-+                                                                    <item name="methods" xsi:type="array">
-+                                                                        <item name="authorizenet_acceptjs" xsi:type="array">
-+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
-+                                                                        </item>
-+                                                                    </item>
-+                                                                </item>
-+                                                            </item>
-+                                                        </item>
-+                                                    </item>
-+                                                </item>
-+                                            </item>
-+                                        </item>
-+                                    </item>
-+                                </item>
-+                            </item>
-+                        </item>
-+                    </item>
-+                </argument>
-+            </arguments>
-+        </referenceBlock>
-+    </body>
-+</page>
-\ No newline at end of file
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/frontend/web/js/view/payment/authorizenet.js b/app/code/Magento/AuthorizenetAcceptjs/view/frontend/web/js/view/payment/authorizenet.js
-new file mode 100644
-index 00000000000..a05fe739a44
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/frontend/web/js/view/payment/authorizenet.js
-@@ -0,0 +1,20 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'uiComponent',
-+    'Magento_Checkout/js/model/payment/renderer-list'
-+],
-+function (Component, rendererList) {
-+    'use strict';
-+
-+    rendererList.push({
-+        type: 'authorizenet_acceptjs',
-+        component: 'Magento_AuthorizenetAcceptjs/js/view/payment/method-renderer/authorizenet-accept'
-+    });
-+
-+    /** Add view logic here if needed */
-+    return Component.extend({});
-+});
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/frontend/web/js/view/payment/method-renderer/authorizenet-accept.js b/app/code/Magento/AuthorizenetAcceptjs/view/frontend/web/js/view/payment/method-renderer/authorizenet-accept.js
-new file mode 100644
-index 00000000000..983318c4cda
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/frontend/web/js/view/payment/method-renderer/authorizenet-accept.js
-@@ -0,0 +1,146 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'jquery',
-+    'Magento_Payment/js/view/payment/cc-form',
-+    'Magento_AuthorizenetAcceptjs/js/view/payment/acceptjs-client',
-+    'Magento_Checkout/js/model/full-screen-loader',
-+    'Magento_Ui/js/model/messageList',
-+    'Magento_Payment/js/model/credit-card-validation/validator'
-+], function ($, Component, AcceptjsClient, fullScreenLoader, globalMessageList) {
-+    'use strict';
-+
-+    return Component.extend({
-+        defaults: {
-+            active: false,
-+            template: 'Magento_AuthorizenetAcceptjs/payment/authorizenet-acceptjs',
-+            tokens: null,
-+            ccForm: 'Magento_Payment/payment/cc-form',
-+            acceptjsClient: null
-+        },
-+
-+        /**
-+         * Set list of observable attributes
-+         *
-+         * @returns {exports.initObservable}
-+         */
-+        initObservable: function () {
-+            this._super()
-+                .observe(['active']);
-+
-+            return this;
-+        },
-+
-+        /**
-+         * @returns {String}
-+         */
-+        getCode: function () {
-+            return 'authorizenet_acceptjs';
-+        },
-+
-+        /**
-+         * Initialize form elements for validation
-+         */
-+        initFormElement: function (element) {
-+            this.formElement = element;
-+            this.acceptjsClient = AcceptjsClient({
-+                environment: window.checkoutConfig.payment[this.getCode()].environment
-+            });
-+            $(this.formElement).validation();
-+        },
-+
-+        /**
-+         * @returns {Object}
-+         */
-+        getData: function () {
-+            return {
-+                method: this.getCode(),
-+                'additional_data': {
-+                    opaqueDataDescriptor: this.tokens ? this.tokens.opaqueDataDescriptor : null,
-+                    opaqueDataValue: this.tokens ? this.tokens.opaqueDataValue : null,
-+                    ccLast4: this.creditCardNumber().substr(-4)
-+                }
-+            };
-+        },
-+
-+        /**
-+         * Check if payment is active
-+         *
-+         * @returns {Boolean}
-+         */
-+        isActive: function () {
-+            var active = this.getCode() === this.isChecked();
-+
-+            this.active(active);
-+
-+            return active;
-+        },
-+
-+        /**
-+         * Prepare data to place order
-+         */
-+        beforePlaceOrder: function () {
-+            var authData = {},
-+                cardData = {},
-+                secureData = {};
-+
-+            if (!$(this.formElement).valid()) {
-+                return;
-+            }
-+
-+            authData.clientKey = window.checkoutConfig.payment[this.getCode()].clientKey;
-+            authData.apiLoginID = window.checkoutConfig.payment[this.getCode()].apiLoginID;
-+
-+            cardData.cardNumber = this.creditCardNumber();
-+            cardData.month = this.creditCardExpMonth();
-+            cardData.year = this.creditCardExpYear();
-+
-+            if (this.hasVerification()) {
-+                cardData.cardCode = this.creditCardVerificationNumber();
-+            }
-+
-+            secureData.authData = authData;
-+            secureData.cardData = cardData;
-+
-+            fullScreenLoader.startLoader();
-+
-+            this.acceptjsClient.createTokens(secureData)
-+                .always(function () {
-+                    fullScreenLoader.stopLoader();
-+                })
-+                .done(function (tokens) {
-+                    this.tokens = tokens;
-+                    this.placeOrder();
-+                }.bind(this))
-+                .fail(function (messages) {
-+                    this.tokens = null;
-+                    this._showErrors(messages);
-+                }.bind(this));
-+        },
-+
-+        /**
-+         * Should the cvv field be used
-+         *
-+         * @return {Boolean}
-+         */
-+        hasVerification: function () {
-+            return window.checkoutConfig.payment[this.getCode()].useCvv;
-+        },
-+
-+        /**
-+         * Show error messages
-+         *
-+         * @param {String[]} errorMessages
-+         */
-+        _showErrors: function (errorMessages) {
-+            $.each(errorMessages, function (index, message) {
-+                globalMessageList.addErrorMessage({
-+                    message: message
-+                });
-+            });
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/frontend/web/template/payment/authorizenet-acceptjs.html b/app/code/Magento/AuthorizenetAcceptjs/view/frontend/web/template/payment/authorizenet-acceptjs.html
-new file mode 100644
-index 00000000000..6db52a2b102
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetAcceptjs/view/frontend/web/template/payment/authorizenet-acceptjs.html
-@@ -0,0 +1,45 @@
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<div class="payment-method" css="_active: isActive()">
-+    <div class="payment-method-title field choice">
-+        <input type="radio"
-+               name="payment[method]"
-+               class="radio"
-+               attr="id: getCode()"
-+               ko-value="getCode()"
-+               ko-checked="isChecked"
-+               click="selectPaymentMethod"
-+               visible="isRadioButtonVisible()"
-+        />
-+        <label attr="for: getCode()" class="label">
-+            <span translate="getTitle()"></span>
-+        </label>
-+    </div>
-+    <div class="payment-method-content">
-+        <each args="getRegion('messages')" render="" />
-+        <div class="payment-method-billing-address">
-+            <each args="$parent.getRegion(getBillingAddressFormName())" render="" />
-+        </div>
-+        <form class="form" id="co-payment-form" method="post" afterRender="initFormElement">
-+            <render args="ccForm" />
-+        </form>
-+        <div class="checkout-agreements-block">
-+            <each args="$parent.getRegion('before-place-order')" render="" />
-+        </div>
-+        <div class="actions-toolbar">
-+            <div class="primary">
-+                <button class="action primary checkout"
-+                        type="submit"
-+                        click="beforePlaceOrder"
-+                        attr="title: $t('Place Order')"
-+                >
-+                    <span translate="'Place Order'"></span>
-+                </button>
-+            </div>
-+        </div>
-+    </div>
-+</div>
-diff --git a/app/code/Magento/AuthorizenetCardinal/Gateway/Request/Authorize3DSecureBuilder.php b/app/code/Magento/AuthorizenetCardinal/Gateway/Request/Authorize3DSecureBuilder.php
-new file mode 100644
-index 00000000000..7e3d63d6f18
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/Gateway/Request/Authorize3DSecureBuilder.php
-@@ -0,0 +1,82 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetCardinal\Gateway\Request;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\SubjectReader;
-+use Magento\AuthorizenetCardinal\Model\Config;
-+use Magento\CardinalCommerce\Model\Response\JwtParser;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+/**
-+ * Adds the cardholder authentication information to the request
-+ */
-+class Authorize3DSecureBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var JwtParser
-+     */
-+    private $jwtParser;
-+
-+    /**
-+     * @param SubjectReader $subjectReader
-+     * @param Config $config
-+     * @param JwtParser $jwtParser
-+     */
-+    public function __construct(
-+        SubjectReader $subjectReader,
-+        Config $config,
-+        JwtParser $jwtParser
-+    ) {
-+        $this->subjectReader = $subjectReader;
-+        $this->config = $config;
-+        $this->jwtParser = $jwtParser;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        if ($this->config->isActive() === false) {
-+            return [];
-+        }
-+
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $payment = $paymentDO->getPayment();
-+        $data = [];
-+
-+        if ($payment instanceof Payment) {
-+            $cardinalJwt = (string)$payment->getAdditionalInformation('cardinalJWT');
-+            $jwtPayload = $this->jwtParser->execute($cardinalJwt);
-+            $eciFlag = $jwtPayload['Payload']['Payment']['ExtendedData']['ECIFlag'] ?? '';
-+            $cavv = $jwtPayload['Payload']['Payment']['ExtendedData']['CAVV'] ?? '';
-+            $data = [
-+                'transactionRequest' => [
-+                    'cardholderAuthentication' => [
-+                        'authenticationIndicator' => $eciFlag,
-+                        'cardholderAuthenticationValue' => $cavv
-+                    ],
-+                ]
-+            ];
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetCardinal/LICENSE.txt b/app/code/Magento/AuthorizenetCardinal/LICENSE.txt
-new file mode 100644
-index 00000000000..49525fd99da
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/LICENSE.txt
-@@ -0,0 +1,48 @@
-+
-+Open Software License ("OSL") v. 3.0
-+
-+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-+
-+Licensed under the Open Software License version 3.0
-+
-+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-+
-+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-+
-+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-+
-+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
-+
-+         4. to perform the Original Work publicly; and
-+
-+         5. to display the Original Work publicly. 
-+
-+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-+
-+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-+
-+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-+
-+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-+
-+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-+
-+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-+
-+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-+
-+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-+
-+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-+
-+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-+
-+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-+
-+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-+
-+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-+
-+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
-\ No newline at end of file
-diff --git a/app/code/Magento/AuthorizenetCardinal/LICENSE_AFL.txt b/app/code/Magento/AuthorizenetCardinal/LICENSE_AFL.txt
-new file mode 100644
-index 00000000000..f39d641b18a
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/LICENSE_AFL.txt
-@@ -0,0 +1,48 @@
-+
-+Academic Free License ("AFL") v. 3.0
-+
-+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-+
-+Licensed under the Academic Free License version 3.0
-+
-+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-+
-+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-+
-+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-+
-+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
-+
-+         4. to perform the Original Work publicly; and
-+
-+         5. to display the Original Work publicly.
-+
-+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-+
-+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-+
-+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-+
-+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-+
-+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-+
-+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-+
-+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-+
-+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-+
-+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-+
-+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-+
-+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-+
-+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-+
-+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-+
-+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
-diff --git a/app/code/Magento/AuthorizenetCardinal/Model/Checkout/ConfigProvider.php b/app/code/Magento/AuthorizenetCardinal/Model/Checkout/ConfigProvider.php
-new file mode 100644
-index 00000000000..d0cde9c643e
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/Model/Checkout/ConfigProvider.php
-@@ -0,0 +1,45 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetCardinal\Model\Checkout;
-+
-+use Magento\AuthorizenetCardinal\Model\Config;
-+use Magento\Checkout\Model\ConfigProviderInterface;
-+
-+/**
-+ * Configuration provider.
-+ */
-+class ConfigProvider implements ConfigProviderInterface
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @param Config $config
-+     */
-+    public function __construct(
-+        Config $config
-+    ) {
-+        $this->config = $config;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getConfig(): array
-+    {
-+        $config['cardinal'] = [
-+            'isActiveFor' => [
-+                'authorizenet' => $this->config->isActive()
-+            ]
-+        ];
-+
-+        return $config;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetCardinal/Model/Config.php b/app/code/Magento/AuthorizenetCardinal/Model/Config.php
-new file mode 100644
-index 00000000000..e70a6a2e39c
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/Model/Config.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetCardinal\Model;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Store\Model\ScopeInterface;
-+
-+/**
-+ * AuthorizenetCardinal integration configuration.
-+ *
-+ * Class is a proxy service for retrieving configuration settings.
-+ */
-+class Config
-+{
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @param ScopeConfigInterface $scopeConfig
-+     */
-+    public function __construct(ScopeConfigInterface $scopeConfig)
-+    {
-+        $this->scopeConfig = $scopeConfig;
-+    }
-+
-+    /**
-+     * If this config option set to false no AuthorizenetCardinal integration should be available
-+     *
-+     * @param int|null $storeId
-+     * @return bool
-+     */
-+    public function isActive(?int $storeId = null): bool
-+    {
-+        $enabled = $this->scopeConfig->isSetFlag(
-+            'three_d_secure/cardinal/enabled_authorizenet',
-+            ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-+
-+        return $enabled;
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetCardinal/Observer/DataAssignObserver.php b/app/code/Magento/AuthorizenetCardinal/Observer/DataAssignObserver.php
-new file mode 100644
-index 00000000000..cb2cdf64ae3
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/Observer/DataAssignObserver.php
-@@ -0,0 +1,63 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetCardinal\Observer;
-+
-+use Magento\Framework\Event\Observer;
-+use Magento\Payment\Observer\AbstractDataAssignObserver;
-+use Magento\Quote\Api\Data\PaymentInterface;
-+use Magento\AuthorizenetCardinal\Model\Config;
-+
-+/**
-+ * Adds the payment info to the payment object
-+ */
-+class DataAssignObserver extends AbstractDataAssignObserver
-+{
-+    /**
-+     * JWT key
-+     */
-+    private const JWT_KEY = 'cardinalJWT';
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @param Config $config
-+     */
-+    public function __construct(
-+        Config $config
-+    ) {
-+        $this->config = $config;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute(Observer $observer)
-+    {
-+        if ($this->config->isActive() === false) {
-+            return;
-+        }
-+
-+        $data = $this->readDataArgument($observer);
-+        $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
-+        if (!is_array($additionalData)) {
-+            return;
-+        }
-+
-+        $paymentInfo = $this->readPaymentModelArgument($observer);
-+        if (isset($additionalData[self::JWT_KEY])) {
-+            $paymentInfo->setAdditionalInformation(
-+                self::JWT_KEY,
-+                $additionalData[self::JWT_KEY]
-+            );
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetCardinal/README.md b/app/code/Magento/AuthorizenetCardinal/README.md
-new file mode 100644
-index 00000000000..2324f680baf
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/README.md
-@@ -0,0 +1 @@
-+The AuthorizenetCardinal module provides a possibility to enable 3-D Secure 2.0 support for AuthorizenetAcceptjs payment integration.
-\ No newline at end of file
-diff --git a/app/code/Magento/AuthorizenetCardinal/Test/Unit/Observer/DataAssignObserverTest.php b/app/code/Magento/AuthorizenetCardinal/Test/Unit/Observer/DataAssignObserverTest.php
-new file mode 100644
-index 00000000000..9f560507e34
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/Test/Unit/Observer/DataAssignObserverTest.php
-@@ -0,0 +1,100 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetCardinal\Test\Unit\Observer;
-+
-+use Magento\AuthorizenetCardinal\Model\Config;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\Event;
-+use Magento\Framework\Event\Observer;
-+use Magento\Payment\Model\InfoInterface;
-+use Magento\Payment\Observer\AbstractDataAssignObserver;
-+use Magento\AuthorizenetCardinal\Observer\DataAssignObserver;
-+use Magento\Quote\Api\Data\PaymentInterface;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Class DataAssignObserverTest
-+ */
-+class DataAssignObserverTest extends TestCase
-+{
-+    /**
-+     * Tests setting JWT in payment additional information.
-+     */
-+    public function testExecuteSetsProperData()
-+    {
-+        $additionalInfo = [
-+            'cardinalJWT' => 'foo'
-+        ];
-+
-+        $config = $this->createMock(Config::class);
-+        $config->method('isActive')
-+            ->willReturn(true);
-+        $observerContainer = $this->createMock(Observer::class);
-+        $event = $this->createMock(Event::class);
-+        $paymentInfoModel = $this->createMock(InfoInterface::class);
-+        $dataObject = new DataObject([PaymentInterface::KEY_ADDITIONAL_DATA => $additionalInfo]);
-+        $observerContainer->method('getEvent')
-+            ->willReturn($event);
-+        $event->method('getDataByKey')
-+            ->willReturnMap(
-+                [
-+                    [AbstractDataAssignObserver::MODEL_CODE, $paymentInfoModel],
-+                    [AbstractDataAssignObserver::DATA_CODE, $dataObject]
-+                ]
-+            );
-+        $paymentInfoModel->expects($this->once())
-+            ->method('setAdditionalInformation')
-+            ->with('cardinalJWT', 'foo');
-+
-+        $observer = new DataAssignObserver($config);
-+        $observer->execute($observerContainer);
-+    }
-+
-+    /**
-+     * Tests case when Cardinal JWT is absent.
-+     */
-+    public function testDoesntSetDataWhenEmpty()
-+    {
-+        $config = $this->createMock(Config::class);
-+        $config->method('isActive')
-+            ->willReturn(true);
-+        $observerContainer = $this->createMock(Observer::class);
-+        $event = $this->createMock(Event::class);
-+        $paymentInfoModel = $this->createMock(InfoInterface::class);
-+        $observerContainer->method('getEvent')
-+            ->willReturn($event);
-+        $event->method('getDataByKey')
-+            ->willReturnMap(
-+                [
-+                    [AbstractDataAssignObserver::MODEL_CODE, $paymentInfoModel],
-+                    [AbstractDataAssignObserver::DATA_CODE, new DataObject()]
-+                ]
-+            );
-+        $paymentInfoModel->expects($this->never())
-+            ->method('setAdditionalInformation');
-+
-+        $observer = new DataAssignObserver($config);
-+        $observer->execute($observerContainer);
-+    }
-+
-+    /**
-+     * Tests case when CardinalCommerce is disabled.
-+     */
-+    public function testDoesntSetDataWhenDisabled()
-+    {
-+        $config = $this->createMock(Config::class);
-+        $config->method('isActive')
-+            ->willReturn(false);
-+        $observerContainer = $this->createMock(Observer::class);
-+        $observerContainer->expects($this->never())
-+            ->method('getEvent');
-+        $observer = new DataAssignObserver($config);
-+        $observer->execute($observerContainer);
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetCardinal/composer.json b/app/code/Magento/AuthorizenetCardinal/composer.json
-new file mode 100644
-index 00000000000..2d3ceee2093
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/composer.json
-@@ -0,0 +1,31 @@
-+{
-+    "name": "magento/module-authorizenet-cardinal",
-+    "description": "Provides a possibility to enable 3-D Secure 2.0 support for Authorize.Net Acceptjs.",
-+    "config": {
-+        "sort-packages": true
-+    },
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/module-authorizenet-acceptjs": "*",
-+        "magento/framework": "*",
-+        "magento/module-cardinal-commerce": "*",
-+        "magento/module-payment": "*",
-+        "magento/module-sales": "*",
-+        "magento/module-quote": "*",
-+        "magento/module-checkout": "*",
-+        "magento/module-store": "*"
-+    },
-+    "type": "magento2-module",
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\AuthorizenetCardinal\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetCardinal/etc/adminhtml/system.xml b/app/code/Magento/AuthorizenetCardinal/etc/adminhtml/system.xml
-new file mode 100644
-index 00000000000..2be287a5e87
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/etc/adminhtml/system.xml
-@@ -0,0 +1,22 @@
-+<?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_Config:etc/system_file.xsd">
-+    <system>
-+        <section id="three_d_secure">
-+            <group id="cardinal">
-+                <group id="config">
-+                    <field id="enabled_authorize" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Enable for Authorize.Net</label>
-+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                        <config_path>three_d_secure/cardinal/enabled_authorizenet</config_path>
-+                    </field>
-+                </group>
-+            </group>
-+        </section>
-+    </system>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetCardinal/etc/config.xml b/app/code/Magento/AuthorizenetCardinal/etc/config.xml
-new file mode 100644
-index 00000000000..d94bcdc4790
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/etc/config.xml
-@@ -0,0 +1,16 @@
-+<?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_Store:etc/config.xsd">
-+    <default>
-+        <three_d_secure>
-+            <cardinal>
-+                <enabled_authorizenet>0</enabled_authorizenet>
-+            </cardinal>
-+        </three_d_secure>
-+    </default>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetCardinal/etc/di.xml b/app/code/Magento/AuthorizenetCardinal/etc/di.xml
-new file mode 100644
-index 00000000000..45541a3cf49
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/etc/di.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <virtualType name="AuthorizenetAcceptjsAuthorizeRequest">
-+        <arguments>
-+            <argument name="builders" xsi:type="array">
-+                <item name="3d_secure" xsi:type="string">Magento\AuthorizenetCardinal\Gateway\Request\Authorize3DSecureBuilder</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetCardinal/etc/events.xml b/app/code/Magento/AuthorizenetCardinal/etc/events.xml
-new file mode 100644
-index 00000000000..5b0afbe6846
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/etc/events.xml
-@@ -0,0 +1,13 @@
-+<?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="payment_method_assign_data_authorizenet_acceptjs">
-+        <observer name="authorizenet_cardinal_data_assign" instance="Magento\AuthorizenetCardinal\Observer\DataAssignObserver" />
-+    </event>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetCardinal/etc/frontend/di.xml b/app/code/Magento/AuthorizenetCardinal/etc/frontend/di.xml
-new file mode 100644
-index 00000000000..13c7a223e82
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/etc/frontend/di.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\Checkout\Model\CompositeConfigProvider">
-+        <arguments>
-+            <argument name="configProviders" xsi:type="array">
-+                <item name="authorizenet_cardinal_config_provider" xsi:type="object">
-+                    Magento\AuthorizenetCardinal\Model\Checkout\ConfigProvider
-+                </item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetCardinal/etc/module.xml b/app/code/Magento/AuthorizenetCardinal/etc/module.xml
-new file mode 100644
-index 00000000000..fdf8151311f
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/etc/module.xml
-@@ -0,0 +1,15 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_AuthorizenetCardinal" >
-+        <sequence>
-+            <module name="Magento_AuthorizenetAcceptjs"/>
-+            <module name="Magento_CardinalCommerce"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetCardinal/registration.php b/app/code/Magento/AuthorizenetCardinal/registration.php
-new file mode 100644
-index 00000000000..0153e9eaa4d
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/registration.php
-@@ -0,0 +1,9 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use \Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AuthorizenetCardinal', __DIR__);
-diff --git a/app/code/Magento/AuthorizenetCardinal/view/frontend/requirejs-config.js b/app/code/Magento/AuthorizenetCardinal/view/frontend/requirejs-config.js
-new file mode 100644
-index 00000000000..81823cb2afc
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/view/frontend/requirejs-config.js
-@@ -0,0 +1,15 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+var config = {
-+    config: {
-+        mixins: {
-+            'Magento_AuthorizenetAcceptjs/js/view/payment/method-renderer/authorizenet-accept': {
-+                'Magento_AuthorizenetCardinal/js/authorizenet-accept-mixin': true
-+            }
-+        }
-+    }
-+};
-+
-diff --git a/app/code/Magento/AuthorizenetCardinal/view/frontend/web/js/authorizenet-accept-mixin.js b/app/code/Magento/AuthorizenetCardinal/view/frontend/web/js/authorizenet-accept-mixin.js
-new file mode 100644
-index 00000000000..336ceaab3ec
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetCardinal/view/frontend/web/js/authorizenet-accept-mixin.js
-@@ -0,0 +1,70 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+define([
-+    'jquery',
-+    'Magento_CardinalCommerce/js/cardinal-client',
-+    'Magento_Checkout/js/model/full-screen-loader',
-+    'Magento_Ui/js/model/messageList'
-+], function ($, cardinalClient, fullScreenLoader, globalMessageList) {
-+    'use strict';
-+
-+    return function (originalComponent) {
-+        return originalComponent.extend({
-+            defaults: {
-+                cardinalJWT: null
-+            },
-+
-+            /**
-+             * Performs 3d-secure authentication
-+             */
-+            beforePlaceOrder: function () {
-+                var original = this._super.bind(this),
-+                    client = cardinalClient,
-+                    isActive = window.checkoutConfig.cardinal.isActiveFor.authorizenet,
-+                    cardData;
-+
-+                if (!isActive || !$(this.formElement).valid()) {
-+                    return original();
-+                }
-+
-+                cardData = {
-+                    accountNumber: this.creditCardNumber(),
-+                    expMonth: this.creditCardExpMonth(),
-+                    expYear: this.creditCardExpYear()
-+                };
-+
-+                if (this.hasVerification()) {
-+                    cardData.cardCode = this.creditCardVerificationNumber();
-+                }
-+
-+                fullScreenLoader.startLoader();
-+                client.startAuthentication(cardData)
-+                    .always(function () {
-+                        fullScreenLoader.stopLoader();
-+                    })
-+                    .done(function (jwt) {
-+                        this.cardinalJWT = jwt;
-+                        original();
-+                    }.bind(this))
-+                    .fail(function (errorMessage) {
-+                        globalMessageList.addErrorMessage({
-+                            message: errorMessage
-+                        });
-+                    });
-+            },
-+
-+            /**
-+             * @returns {Object}
-+             */
-+            getData: function () {
-+                var originalData = this._super();
-+
-+                originalData['additional_data'].cardinalJWT = this.cardinalJWT;
-+
-+                return originalData;
-+            }
-+        });
-+    };
-+});
-diff --git a/app/code/Magento/AuthorizenetGraphQl/Model/AuthorizenetDataProvider.php b/app/code/Magento/AuthorizenetGraphQl/Model/AuthorizenetDataProvider.php
-new file mode 100644
-index 00000000000..eb241d376e2
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetGraphQl/Model/AuthorizenetDataProvider.php
-@@ -0,0 +1,61 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetGraphQl\Model;
-+
-+use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderInterface;
-+use Magento\Framework\Stdlib\ArrayManager;
-+
-+/**
-+ * DataProvider Model for Authorizenet
-+ */
-+class AuthorizenetDataProvider implements AdditionalDataProviderInterface
-+{
-+    private const PATH_ADDITIONAL_DATA = 'authorizenet_acceptjs';
-+
-+    /**
-+     * @var ArrayManager
-+     */
-+    private $arrayManager;
-+
-+    /**
-+     * AuthorizenetDataProvider constructor.
-+     * @param ArrayManager $arrayManager
-+     */
-+    public function __construct(
-+        ArrayManager $arrayManager
-+    ) {
-+        $this->arrayManager = $arrayManager;
-+    }
-+
-+    /**
-+     * Return additional data
-+     *
-+     * @param array $data
-+     * @return array
-+     */
-+    public function getData(array $data): array
-+    {
-+        $additionalData = $this->arrayManager->get(static::PATH_ADDITIONAL_DATA, $data) ?? [];
-+        foreach ($additionalData as $key => $value) {
-+            $additionalData[$this->snakeCaseToCamelCase($key)] = $value;
-+            unset($additionalData[$key]);
-+        }
-+        return $additionalData;
-+    }
-+
-+    /**
-+     * Converts an input string from snake_case to camelCase.
-+     *
-+     * @param string $input
-+     * @return string
-+     */
-+    private function snakeCaseToCamelCase($input)
-+    {
-+        return lcfirst(str_replace('_', '', ucwords($input, '_')));
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetGraphQl/README.md b/app/code/Magento/AuthorizenetGraphQl/README.md
-new file mode 100644
-index 00000000000..8b920e56934
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetGraphQl/README.md
-@@ -0,0 +1,3 @@
-+# AuthorizenetGraphQl
-+
-+ **AuthorizenetGraphQl** defines the data types needed to pass payment information data from the client to Magento.
-diff --git a/app/code/Magento/AuthorizenetGraphQl/composer.json b/app/code/Magento/AuthorizenetGraphQl/composer.json
-new file mode 100644
-index 00000000000..6adf11ff72b
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetGraphQl/composer.json
-@@ -0,0 +1,25 @@
-+{
-+    "name": "magento/module-authorizenet-graph-ql",
-+    "description": "N/A",
-+    "type": "magento2-module",
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-quote-graph-ql": "*"
-+    },
-+    "suggest": {
-+        "magento/module-graph-ql": "*"
-+    },
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\AuthorizenetGraphQl\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/AuthorizenetGraphQl/etc/graphql/di.xml b/app/code/Magento/AuthorizenetGraphQl/etc/graphql/di.xml
-new file mode 100644
-index 00000000000..e8ea45091c0
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetGraphQl/etc/graphql/di.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool">
-+        <arguments>
-+            <argument name="dataProviders" xsi:type="array">
-+                <item name="authorizenet_acceptjs" xsi:type="object">Magento\AuthorizenetGraphQl\Model\AuthorizenetDataProvider</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetGraphQl/etc/module.xml b/app/code/Magento/AuthorizenetGraphQl/etc/module.xml
-new file mode 100644
-index 00000000000..85a780a8819
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetGraphQl/etc/module.xml
-@@ -0,0 +1,10 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_AuthorizenetGraphQl"/>
-+</config>
-diff --git a/app/code/Magento/AuthorizenetGraphQl/etc/schema.graphqls b/app/code/Magento/AuthorizenetGraphQl/etc/schema.graphqls
-new file mode 100644
-index 00000000000..1d724bbde3c
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetGraphQl/etc/schema.graphqls
-@@ -0,0 +1,12 @@
-+# Copyright © Magento, Inc. All rights reserved.
-+# See COPYING.txt for license details.
-+
-+input PaymentMethodAdditionalDataInput {
-+    authorizenet_acceptjs: AuthorizenetInput @doc(description: "Defines the required attributes for Authorize.Net payments")
-+}
-+
-+input AuthorizenetInput {
-+    opaque_data_descriptor: String! @doc(description: "Authorize.Net's description of the transaction request")
-+    opaque_data_value: String! @doc(description: "The nonce returned by Authorize.Net")
-+    cc_last_4: Int! @doc(description: "The last four digits of the credit or debit card")
-+}
-\ No newline at end of file
-diff --git a/app/code/Magento/AuthorizenetGraphQl/registration.php b/app/code/Magento/AuthorizenetGraphQl/registration.php
-new file mode 100644
-index 00000000000..2e50f9fe92a
---- /dev/null
-+++ b/app/code/Magento/AuthorizenetGraphQl/registration.php
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AuthorizenetGraphQl', __DIR__);
-diff --git a/app/code/Magento/Backend/App/Action/Plugin/Authentication.php b/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
-index 68506a521c1..4b25e9921e4 100644
---- a/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
-+++ b/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
-@@ -160,7 +160,7 @@ class Authentication
-             } else {
-                 $this->_actionFlag->set('', \Magento\Framework\App\ActionInterface::FLAG_NO_DISPATCH, true);
-                 $this->_response->setRedirect($this->_url->getCurrentUrl());
--                $this->messageManager->addError(__('Invalid Form Key. Please refresh the page.'));
-+                $this->messageManager->addErrorMessage(__('Invalid Form Key. Please refresh the page.'));
-                 $isRedirectNeeded = true;
-             }
-         }
-@@ -205,7 +205,7 @@ class Authentication
-             $this->_auth->login($username, $password);
-         } catch (AuthenticationException $e) {
-             if (!$request->getParam('messageSent')) {
--                $this->messageManager->addError($e->getMessage());
-+                $this->messageManager->addErrorMessage($e->getMessage());
-                 $request->setParam('messageSent', true);
-                 $outputValue = false;
-             }
-diff --git a/app/code/Magento/Backend/App/DefaultPath.php b/app/code/Magento/Backend/App/DefaultPath.php
-index df8b7183897..b790a2edc3f 100644
---- a/app/code/Magento/Backend/App/DefaultPath.php
-+++ b/app/code/Magento/Backend/App/DefaultPath.php
-@@ -42,6 +42,6 @@ class DefaultPath implements \Magento\Framework\App\DefaultPathInterface
-      */
-     public function getPart($code)
-     {
--        return isset($this->_parts[$code]) ? $this->_parts[$code] : null;
-+        return $this->_parts[$code] ?? null;
-     }
- }
-diff --git a/app/code/Magento/Backend/App/Request/BackendValidator.php b/app/code/Magento/Backend/App/Request/BackendValidator.php
-index 878f9cb4dc4..7ec6c83f29b 100644
---- a/app/code/Magento/Backend/App/Request/BackendValidator.php
-+++ b/app/code/Magento/Backend/App/Request/BackendValidator.php
-@@ -77,6 +77,8 @@ class BackendValidator implements ValidatorInterface
-     }
- 
-     /**
-+     * Validate request
-+     *
-      * @param RequestInterface $request
-      * @param ActionInterface $action
-      *
-@@ -115,6 +117,8 @@ class BackendValidator implements ValidatorInterface
-     }
- 
-     /**
-+     * Create exception
-+     *
-      * @param RequestInterface $request
-      * @param ActionInterface $action
-      *
-@@ -142,8 +146,9 @@ class BackendValidator implements ValidatorInterface
-                 $exception = new InvalidRequestException($response);
-             } else {
-                 //For regular requests.
-+                $startPageUrl = $this->backendUrl->getStartupPageUrl();
-                 $response = $this->redirectFactory->create()
--                    ->setUrl($this->backendUrl->getStartupPageUrl());
-+                    ->setUrl($this->backendUrl->getUrl($startPageUrl));
-                 $exception = new InvalidRequestException(
-                     $response,
-                     [
-@@ -166,7 +171,7 @@ class BackendValidator implements ValidatorInterface
-         ActionInterface $action
-     ): void {
-         if ($action instanceof AbstractAction) {
--            //Abstract Action has build-in validation.
-+            //Abstract Action has built-in validation.
-             if (!$action->_processUrlKeys()) {
-                 throw new InvalidRequestException($action->getResponse());
-             }
-diff --git a/app/code/Magento/Backend/Block/Dashboard/Bar.php b/app/code/Magento/Backend/Block/Dashboard/Bar.php
-index 7ccb2d51ccd..57f13c740f7 100644
---- a/app/code/Magento/Backend/Block/Dashboard/Bar.php
-+++ b/app/code/Magento/Backend/Block/Dashboard/Bar.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Backend\Block\Dashboard;
- 
-+use Magento\Store\Model\Store;
-+
- /**
-  * Adminhtml dashboard bar block
-  *
-@@ -23,6 +25,8 @@ class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-     protected $_currentCurrencyCode = null;
- 
-     /**
-+     * Get totals
-+     *
-      * @return array
-      */
-     public function getTotals()
-@@ -31,6 +35,8 @@ class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-     }
- 
-     /**
-+     * Add total
-+     *
-      * @param string $label
-      * @param float $value
-      * @param bool $isQuantity
-@@ -73,6 +79,7 @@ class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-      * Retrieve currency model if not set then return currency model for current store
-      *
-      * @return \Magento\Directory\Model\Currency
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     public function getCurrency()
-     {
-@@ -90,7 +97,8 @@ class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-                     $this->getRequest()->getParam('group')
-                 )->getWebsite()->getBaseCurrency();
-             } else {
--                $this->_currentCurrencyCode = $this->_storeManager->getStore()->getBaseCurrency();
-+                $this->_currentCurrencyCode = $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)
-+                    ->getBaseCurrency();
-             }
-         }
- 
-diff --git a/app/code/Magento/Backend/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php
-index 8e238ccab44..b76421e4e6f 100644
---- a/app/code/Magento/Backend/Block/Dashboard/Graph.php
-+++ b/app/code/Magento/Backend/Block/Dashboard/Graph.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Backend\Block\Dashboard;
- 
- /**
-@@ -15,7 +17,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-     /**
-      * Api URL
-      */
--    const API_URL = 'http://chart.apis.google.com/chart';
-+    const API_URL = 'https://image-charts.com/chart';
- 
-     /**
-      * All series
-@@ -76,6 +78,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-     /**
-      * Google chart api data encoding
-      *
-+     * @deprecated since the Google Image Charts API not accessible from March 14, 2019
-      * @var string
-      */
-     protected $_encoding = 'e';
-@@ -111,8 +114,8 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-         \Magento\Backend\Helper\Dashboard\Data $dashboardData,
-         array $data = []
-     ) {
--        $this->_dashboardData = $dashboardData;
-         parent::__construct($context, $collectionFactory, $data);
-+        $this->_dashboardData = $dashboardData;
-     }
- 
-     /**
-@@ -128,7 +131,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-     /**
-      * Set data rows
-      *
--     * @param array $rows
-+     * @param string $rows
-      * @return void
-      */
-     public function setDataRows($rows)
-@@ -152,15 +155,14 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-      * Get series
-      *
-      * @param string $seriesId
--     * @return array|false
-+     * @return array|bool
-      */
-     public function getSeries($seriesId)
-     {
-         if (isset($this->_allSeries[$seriesId])) {
-             return $this->_allSeries[$seriesId];
--        } else {
--            return false;
-         }
-+        return false;
-     }
- 
-     /**
-@@ -187,11 +189,12 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-     {
-         $params = [
-             'cht' => 'lc',
--            'chf' => 'bg,s,ffffff',
--            'chco' => 'ef672f',
-             'chls' => '7',
--            'chxs' => '0,676056,15,0,l,676056|1,676056,15,0,l,676056',
--            'chm' => 'h,f2ebde,0,0:1:.1,1,-1',
-+            'chf'  => 'bg,s,f4f4f4|c,lg,90,ffffff,0.1,ededed,0',
-+            'chm'  => 'B,f4d4b2,0,0,0',
-+            'chco' => 'db4814',
-+            'chxs' => '0,0,11|1,0,11',
-+            'chma' => '15,15,15,15'
-         ];
- 
-         $this->_allSeries = $this->getRowsData($this->_dataRows);
-@@ -279,20 +282,11 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-         $this->_axisLabels['x'] = $dates;
-         $this->_allSeries = $datas;
- 
--        //Google encoding values
--        if ($this->_encoding == "s") {
--            // simple encoding
--            $params['chd'] = "s:";
--            $dataDelimiter = "";
--            $dataSetdelimiter = ",";
--            $dataMissing = "_";
--        } else {
--            // extended encoding
--            $params['chd'] = "e:";
--            $dataDelimiter = "";
--            $dataSetdelimiter = ",";
--            $dataMissing = "__";
--        }
-+        // Image-Charts Awesome data format values
-+        $params['chd'] = "a:";
-+        $dataDelimiter = ",";
-+        $dataSetdelimiter = "|";
-+        $dataMissing = "_";
- 
-         // process each string in the array, and find the max length
-         $localmaxvalue = [0];
-@@ -306,7 +300,6 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-         $minvalue = min($localminvalue);
- 
-         // default values
--        $yrange = 0;
-         $yLabels = [];
-         $miny = 0;
-         $maxy = 0;
-@@ -314,14 +307,13 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
- 
-         if ($minvalue >= 0 && $maxvalue >= 0) {
-             if ($maxvalue > 10) {
--                $p = pow(10, $this->_getPow($maxvalue));
-+                $p = pow(10, $this->_getPow((int) $maxvalue));
-                 $maxy = ceil($maxvalue / $p) * $p;
-                 $yLabels = range($miny, $maxy, $p);
-             } else {
-                 $maxy = ceil($maxvalue + 1);
-                 $yLabels = range($miny, $maxy, 1);
-             }
--            $yrange = $maxy;
-             $yorigin = 0;
-         }
- 
-@@ -329,44 +321,14 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
- 
-         foreach ($this->getAllSeries() as $index => $serie) {
-             $thisdataarray = $serie;
--            if ($this->_encoding == "s") {
--                // SIMPLE ENCODING
--                for ($j = 0; $j < sizeof($thisdataarray); $j++) {
--                    $currentvalue = $thisdataarray[$j];
--                    if (is_numeric($currentvalue)) {
--                        $ylocation = round(
--                            (strlen($this->_simpleEncoding) - 1) * ($yorigin + $currentvalue) / $yrange
--                        );
--                        $chartdata[] = substr($this->_simpleEncoding, $ylocation, 1) . $dataDelimiter;
--                    } else {
--                        $chartdata[] = $dataMissing . $dataDelimiter;
--                    }
--                }
--            } else {
--                // EXTENDED ENCODING
--                for ($j = 0; $j < sizeof($thisdataarray); $j++) {
--                    $currentvalue = $thisdataarray[$j];
--                    if (is_numeric($currentvalue)) {
--                        if ($yrange) {
--                            $ylocation = 4095 * ($yorigin + $currentvalue) / $yrange;
--                        } else {
--                            $ylocation = 0;
--                        }
--                        $firstchar = floor($ylocation / 64);
--                        $secondchar = $ylocation % 64;
--                        $mappedchar = substr(
--                            $this->_extendedEncoding,
--                            $firstchar,
--                            1
--                        ) . substr(
--                            $this->_extendedEncoding,
--                            $secondchar,
--                            1
--                        );
--                        $chartdata[] = $mappedchar . $dataDelimiter;
--                    } else {
--                        $chartdata[] = $dataMissing . $dataDelimiter;
--                    }
-+            $count = count($thisdataarray);
-+            for ($j = 0; $j < $count; $j++) {
-+                $currentvalue = $thisdataarray[$j];
-+                if (is_numeric($currentvalue)) {
-+                    $ylocation = $yorigin + $currentvalue;
-+                    $chartdata[] = $ylocation . $dataDelimiter;
-+                } else {
-+                    $chartdata[] = $dataMissing . $dataDelimiter;
-                 }
-             }
-             $chartdata[] = $dataSetdelimiter;
-@@ -381,45 +343,13 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
- 
-         $valueBuffer = [];
- 
--        if (sizeof($this->_axisLabels) > 0) {
-+        if (count($this->_axisLabels) > 0) {
-             $params['chxt'] = implode(',', array_keys($this->_axisLabels));
-             $indexid = 0;
-             foreach ($this->_axisLabels as $idx => $labels) {
-                 if ($idx == 'x') {
--                    /**
--                     * Format date
--                     */
--                    foreach ($this->_axisLabels[$idx] as $_index => $_label) {
--                        if ($_label != '') {
--                            $period = new \DateTime($_label, new \DateTimeZone($timezoneLocal));
--                            switch ($this->getDataHelper()->getParam('period')) {
--                                case '24h':
--                                    $this->_axisLabels[$idx][$_index] = $this->_localeDate->formatDateTime(
--                                        $period->setTime($period->format('H'), 0, 0),
--                                        \IntlDateFormatter::NONE,
--                                        \IntlDateFormatter::SHORT
--                                    );
--                                    break;
--                                case '7d':
--                                case '1m':
--                                    $this->_axisLabels[$idx][$_index] = $this->_localeDate->formatDateTime(
--                                        $period,
--                                        \IntlDateFormatter::SHORT,
--                                        \IntlDateFormatter::NONE
--                                    );
--                                    break;
--                                case '1y':
--                                case '2y':
--                                    $this->_axisLabels[$idx][$_index] = date('m/Y', strtotime($_label));
--                                    break;
--                            }
--                        } else {
--                            $this->_axisLabels[$idx][$_index] = '';
--                        }
--                    }
--
-+                    $this->formatAxisLabelDate((string) $idx, (string) $timezoneLocal);
-                     $tmpstring = implode('|', $this->_axisLabels[$idx]);
--
-                     $valueBuffer[] = $indexid . ":|" . $tmpstring;
-                 } elseif ($idx == 'y') {
-                     $valueBuffer[] = $indexid . ":|" . implode('|', $yLabels);
-@@ -438,12 +368,51 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-             foreach ($params as $name => $value) {
-                 $p[] = $name . '=' . urlencode($value);
-             }
--            return self::API_URL . '?' . implode('&', $p);
--        } else {
--            $gaData = urlencode(base64_encode(json_encode($params)));
--            $gaHash = $this->_dashboardData->getChartDataHash($gaData);
--            $params = ['ga' => $gaData, 'h' => $gaHash];
--            return $this->getUrl('adminhtml/*/tunnel', ['_query' => $params]);
-+            return (string) self::API_URL . '?' . implode('&', $p);
-+        }
-+        $gaData = urlencode(base64_encode(json_encode($params)));
-+        $gaHash = $this->_dashboardData->getChartDataHash($gaData);
-+        $params = ['ga' => $gaData, 'h' => $gaHash];
-+        return $this->getUrl('adminhtml/*/tunnel', ['_query' => $params]);
-+    }
-+
-+    /**
-+     * Format dates for axis labels
-+     *
-+     * @param string $idx
-+     * @param string $timezoneLocal
-+     *
-+     * @return void
-+     */
-+    private function formatAxisLabelDate($idx, $timezoneLocal)
-+    {
-+        foreach ($this->_axisLabels[$idx] as $_index => $_label) {
-+            if ($_label != '') {
-+                $period = new \DateTime($_label, new \DateTimeZone($timezoneLocal));
-+                switch ($this->getDataHelper()->getParam('period')) {
-+                    case '24h':
-+                        $this->_axisLabels[$idx][$_index] = $this->_localeDate->formatDateTime(
-+                            $period->setTime((int) $period->format('H'), 0, 0),
-+                            \IntlDateFormatter::NONE,
-+                            \IntlDateFormatter::SHORT
-+                        );
-+                        break;
-+                    case '7d':
-+                    case '1m':
-+                        $this->_axisLabels[$idx][$_index] = $this->_localeDate->formatDateTime(
-+                            $period,
-+                            \IntlDateFormatter::SHORT,
-+                            \IntlDateFormatter::NONE
-+                        );
-+                        break;
-+                    case '1y':
-+                    case '2y':
-+                        $this->_axisLabels[$idx][$_index] = date('m/Y', strtotime($_label));
-+                        break;
-+                }
-+            } else {
-+                $this->_axisLabels[$idx][$_index] = '';
-+            }
-         }
-     }
- 
-@@ -540,6 +509,8 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
-     }
- 
-     /**
-+     * Sets data helper
-+     *
-      * @param \Magento\Backend\Helper\Dashboard\AbstractDashboard $dataHelper
-      * @return void
-      */
-diff --git a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
-index 50279786c0a..bca7f13b0ce 100644
---- a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
-+++ b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
-@@ -19,21 +19,21 @@ class Grid extends \Magento\Backend\Block\Dashboard\Grid
-     protected $_collectionFactory;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $_moduleManager;
- 
-     /**
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Backend\Helper\Data $backendHelper
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
-      * @param array $data
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-         \Magento\Backend\Helper\Data $backendHelper,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
-         array $data = []
-     ) {
-@@ -43,6 +43,8 @@ class Grid extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
-+     * Construct.
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -52,6 +54,8 @@ class Grid extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
-+     * Prepare collection.
-+     *
-      * @return $this
-      */
-     protected function _prepareCollection()
-@@ -110,6 +114,8 @@ class Grid extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
-+     * Prepare columns.
-+     *
-      * @return $this
-      */
-     protected function _prepareColumns()
-@@ -129,7 +135,9 @@ class Grid extends \Magento\Backend\Block\Dashboard\Grid
-             ]
-         );
- 
--        $baseCurrencyCode = $this->_storeManager->getStore((int)$this->getParam('store'))->getBaseCurrencyCode();
-+        $baseCurrencyCode = $this->_storeManager->getStore(
-+            (int)$this->getParam('store')
-+        )->getBaseCurrencyCode();
- 
-         $this->addColumn(
-             'total',
-@@ -149,7 +157,7 @@ class Grid extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getRowUrl($row)
-     {
-diff --git a/app/code/Magento/Backend/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php
-index 6d7a4d6458a..3455ff087a7 100644
---- a/app/code/Magento/Backend/Block/Dashboard/Sales.php
-+++ b/app/code/Magento/Backend/Block/Dashboard/Sales.php
-@@ -18,20 +18,20 @@ class Sales extends \Magento\Backend\Block\Dashboard\Bar
-     protected $_template = 'Magento_Backend::dashboard/salebar.phtml';
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $_moduleManager;
- 
-     /**
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param array $data
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-         \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         array $data = []
-     ) {
-         $this->_moduleManager = $moduleManager;
-@@ -39,6 +39,8 @@ class Sales extends \Magento\Backend\Block\Dashboard\Bar
-     }
- 
-     /**
-+     * Prepare layout.
-+     *
-      * @return $this|void
-      */
-     protected function _prepareLayout()
-diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
-index cac10ae3720..7dc897a62a3 100644
---- a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
-+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
-@@ -19,21 +19,21 @@ class Ordered extends \Magento\Backend\Block\Dashboard\Grid
-     protected $_collectionFactory;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $_moduleManager;
- 
-     /**
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Backend\Helper\Data $backendHelper
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Sales\Model\ResourceModel\Report\Bestsellers\CollectionFactory $collectionFactory
-      * @param array $data
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-         \Magento\Backend\Helper\Data $backendHelper,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Sales\Model\ResourceModel\Report\Bestsellers\CollectionFactory $collectionFactory,
-         array $data = []
-     ) {
-@@ -43,6 +43,8 @@ class Ordered extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
-+     * Construct.
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -52,7 +54,7 @@ class Ordered extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _prepareCollection()
-     {
-@@ -81,7 +83,7 @@ class Ordered extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _prepareColumns()
-     {
-diff --git a/app/code/Magento/Backend/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php
-index 4dcda367758..e57a6249af4 100644
---- a/app/code/Magento/Backend/Block/Dashboard/Totals.php
-+++ b/app/code/Magento/Backend/Block/Dashboard/Totals.php
-@@ -11,6 +11,9 @@
-  */
- namespace Magento\Backend\Block\Dashboard;
- 
-+/**
-+ * Totals block.
-+ */
- class Totals extends \Magento\Backend\Block\Dashboard\Bar
- {
-     /**
-@@ -19,20 +22,20 @@ class Totals extends \Magento\Backend\Block\Dashboard\Bar
-     protected $_template = 'Magento_Backend::dashboard/totalbar.phtml';
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $_moduleManager;
- 
-     /**
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param array $data
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-         \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         array $data = []
-     ) {
-         $this->_moduleManager = $moduleManager;
-@@ -40,6 +43,7 @@ class Totals extends \Magento\Backend\Block\Dashboard\Bar
-     }
- 
-     /**
-+     * @inheritDoc
-      * @return $this|void
-      */
-     protected function _prepareLayout()
-diff --git a/app/code/Magento/Backend/Block/DataProviders/ImageUploadConfig.php b/app/code/Magento/Backend/Block/DataProviders/ImageUploadConfig.php
-new file mode 100644
-index 00000000000..9c17b0e5538
---- /dev/null
-+++ b/app/code/Magento/Backend/Block/DataProviders/ImageUploadConfig.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Backend\Block\DataProviders;
-+
-+use Magento\Framework\View\Element\Block\ArgumentInterface;
-+use Magento\Backend\Model\Image\UploadResizeConfigInterface;
-+
-+/**
-+ * Provides additional data for image uploader
-+ */
-+class ImageUploadConfig implements ArgumentInterface
-+{
-+    /**
-+     * @var UploadResizeConfigInterface
-+     */
-+    private $imageUploadConfig;
-+
-+    /**
-+     * @param UploadResizeConfigInterface $imageUploadConfig
-+     */
-+    public function __construct(UploadResizeConfigInterface $imageUploadConfig)
-+    {
-+        $this->imageUploadConfig = $imageUploadConfig;
-+    }
-+
-+    /**
-+     * Get image resize configuration
-+     *
-+     * @return int
-+     */
-+    public function getIsResizeEnabled(): int
-+    {
-+        return (int)$this->imageUploadConfig->isResizeEnabled();
-+    }
-+}
-diff --git a/app/code/Magento/Backend/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php
-index 5bad74d8a8b..84fa487281a 100644
---- a/app/code/Magento/Backend/Block/Media/Uploader.php
-+++ b/app/code/Magento/Backend/Block/Media/Uploader.php
-@@ -3,10 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Backend\Block\Media;
- 
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Framework\Image\Adapter\UploadConfigInterface;
-+use Magento\Backend\Model\Image\UploadResizeConfigInterface;
- 
- /**
-  * Adminhtml media library uploader
-@@ -35,24 +39,46 @@ class Uploader extends \Magento\Backend\Block\Widget
-      */
-     private $jsonEncoder;
- 
-+    /**
-+     * @var UploadResizeConfigInterface
-+     */
-+    private $imageUploadConfig;
-+
-+    /**
-+     * @var UploadConfigInterface
-+     * @deprecated
-+     * @see \Magento\Backend\Model\Image\UploadResizeConfigInterface
-+     */
-+    private $imageConfig;
-+
-     /**
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Framework\File\Size $fileSize
-      * @param array $data
-      * @param Json $jsonEncoder
-+     * @param UploadConfigInterface $imageConfig
-+     * @param UploadResizeConfigInterface $imageUploadConfig
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-         \Magento\Framework\File\Size $fileSize,
-         array $data = [],
--        Json $jsonEncoder = null
-+        Json $jsonEncoder = null,
-+        UploadConfigInterface $imageConfig = null,
-+        UploadResizeConfigInterface $imageUploadConfig = null
-     ) {
-         $this->_fileSizeService = $fileSize;
-         $this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class);
-+        $this->imageConfig = $imageConfig
-+            ?: ObjectManager::getInstance()->get(UploadConfigInterface::class);
-+        $this->imageUploadConfig = $imageUploadConfig
-+            ?: ObjectManager::getInstance()->get(UploadResizeConfigInterface::class);
-         parent::__construct($context, $data);
-     }
- 
-     /**
-+     * Initialize block.
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -90,6 +116,26 @@ class Uploader extends \Magento\Backend\Block\Widget
-         return $this->_fileSizeService;
-     }
- 
-+    /**
-+     * Get Image Upload Maximum Width Config.
-+     *
-+     * @return int
-+     */
-+    public function getImageUploadMaxWidth()
-+    {
-+        return $this->imageUploadConfig->getMaxWidth();
-+    }
-+
-+    /**
-+     * Get Image Upload Maximum Height Config.
-+     *
-+     * @return int
-+     */
-+    public function getImageUploadMaxHeight()
-+    {
-+        return $this->imageUploadConfig->getMaxHeight();
-+    }
-+
-     /**
-      * Prepares layout and set element renderer
-      *
-diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php
-index 7d86497288a..1e2561e2efe 100644
---- a/app/code/Magento/Backend/Block/Menu.php
-+++ b/app/code/Magento/Backend/Block/Menu.php
-@@ -9,12 +9,12 @@ namespace Magento\Backend\Block;
- /**
-  * Backend menu block
-  *
-- * @api
-- * @method \Magento\Backend\Block\Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo)
-+ * @method $this setAdditionalCacheKeyInfo(array $cacheKeyInfo)
-  * @method array getAdditionalCacheKeyInfo()
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @api
-  * @since 100.0.2
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Menu extends \Magento\Backend\Block\Template
- {
-@@ -75,7 +75,12 @@ class Menu extends \Magento\Backend\Block\Template
-     private $anchorRenderer;
- 
-     /**
--     * @param Template\Context $context
-+     * @var \Magento\Framework\App\Route\ConfigInterface
-+     */
-+    private $routeConfig;
-+
-+    /**
-+     * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Backend\Model\UrlInterface $url
-      * @param \Magento\Backend\Model\Menu\Filter\IteratorFactory $iteratorFactory
-      * @param \Magento\Backend\Model\Auth\Session $authSession
-@@ -84,6 +89,9 @@ class Menu extends \Magento\Backend\Block\Template
-      * @param array $data
-      * @param MenuItemChecker|null $menuItemChecker
-      * @param AnchorRenderer|null $anchorRenderer
-+     * @param \Magento\Framework\App\Route\ConfigInterface|null $routeConfig
-+     *
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-@@ -94,7 +102,8 @@ class Menu extends \Magento\Backend\Block\Template
-         \Magento\Framework\Locale\ResolverInterface $localeResolver,
-         array $data = [],
-         MenuItemChecker $menuItemChecker = null,
--        AnchorRenderer $anchorRenderer = null
-+        AnchorRenderer $anchorRenderer = null,
-+        \Magento\Framework\App\Route\ConfigInterface $routeConfig = null
-     ) {
-         $this->_url = $url;
-         $this->_iteratorFactory = $iteratorFactory;
-@@ -103,6 +112,9 @@ class Menu extends \Magento\Backend\Block\Template
-         $this->_localeResolver = $localeResolver;
-         $this->menuItemChecker =  $menuItemChecker;
-         $this->anchorRenderer = $anchorRenderer;
-+        $this->routeConfig = $routeConfig ?:
-+            \Magento\Framework\App\ObjectManager::getInstance()
-+                ->get(\Magento\Framework\App\Route\ConfigInterface::class);
-         parent::__construct($context, $data);
-     }
- 
-@@ -130,6 +142,7 @@ class Menu extends \Magento\Backend\Block\Template
- 
-     /**
-      * Render menu item mouse events
-+     *
-      * @param \Magento\Backend\Model\Menu\Item $menuItem
-      * @return string
-      */
-@@ -203,8 +216,9 @@ class Menu extends \Magento\Backend\Block\Template
-      */
-     protected function _callbackSecretKey($match)
-     {
-+        $routeId = $this->routeConfig->getRouteByFrontName($match[1]);
-         return \Magento\Backend\Model\UrlInterface::SECRET_KEY_PARAM_NAME . '/' . $this->_url->getSecretKey(
--            $match[1],
-+            $routeId ?: $match[1],
-             $match[2],
-             $match[3]
-         );
-@@ -342,7 +356,7 @@ class Menu extends \Magento\Backend\Block\Template
-      * @param \Magento\Backend\Model\Menu\Item $menuItem
-      * @param int $level
-      * @param int $limit
--     * @param $id int
-+     * @param int|null $id
-      * @return string HTML code
-      */
-     protected function _addSubMenu($menuItem, $level, $limit, $id = null)
-diff --git a/app/code/Magento/Backend/Block/Page/Footer.php b/app/code/Magento/Backend/Block/Page/Footer.php
-index 3d1570e5ddf..e0c173a4cbf 100644
---- a/app/code/Magento/Backend/Block/Page/Footer.php
-+++ b/app/code/Magento/Backend/Block/Page/Footer.php
-@@ -40,7 +40,7 @@ class Footer extends \Magento\Backend\Block\Template
-     }
- 
-     /**
--     * @return void
-+     * @inheritdoc
-      */
-     protected function _construct()
-     {
-@@ -57,4 +57,12 @@ class Footer extends \Magento\Backend\Block\Template
-     {
-         return $this->productMetadata->getVersion();
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function getCacheLifetime()
-+    {
-+        return 3600 * 24 * 10;
-+    }
- }
-diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
-index 1468df2b0b4..9c35cfb5df8 100644
---- a/app/code/Magento/Backend/Block/Store/Switcher.php
-+++ b/app/code/Magento/Backend/Block/Store/Switcher.php
-@@ -17,7 +17,7 @@ class Switcher extends \Magento\Backend\Block\Template
-     /**
-      * URL for store switcher hint
-      */
--    const HINT_URL = 'http://docs.magento.com/m2/ce/user_guide/configuration/scope.html';
-+    const HINT_URL = 'https://docs.magento.com/m2/ce/user_guide/configuration/scope.html';
- 
-     /**
-      * Name of website variable
-@@ -86,6 +86,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     protected $_storeFactory;
- 
-     /**
-+     * Switcher constructor.
-+     *
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Store\Model\WebsiteFactory $websiteFactory
-      * @param \Magento\Store\Model\GroupFactory $storeGroupFactory
-@@ -106,7 +108,7 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
--     * @return void
-+     * @inheritdoc
-      */
-     protected function _construct()
-     {
-@@ -130,6 +132,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get website collection.
-+     *
-      * @return \Magento\Store\Model\ResourceModel\Website\Collection
-      */
-     public function getWebsiteCollection()
-@@ -169,6 +173,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Set website variable name.
-+     *
-      * @param string $varName
-      * @return $this
-      */
-@@ -179,6 +185,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get website variable name.
-+     *
-      * @return string
-      */
-     public function getWebsiteVarName()
-@@ -191,6 +199,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Check if current website selected.
-+     *
-      * @param \Magento\Store\Model\Website $website
-      * @return bool
-      */
-@@ -200,6 +210,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Return website Id.
-+     *
-      * @return int|null
-      */
-     public function getWebsiteId()
-@@ -211,6 +223,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Return group collection provided website.
-+     *
-      * @param int|\Magento\Store\Model\Website $website
-      * @return \Magento\Store\Model\ResourceModel\Group\Collection
-      */
-@@ -247,6 +261,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Sets store group variable name.
-+     *
-      * @param string $varName
-      * @return $this
-      */
-@@ -257,6 +273,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Return store group variable name.
-+     *
-      * @return string
-      */
-     public function getStoreGroupVarName()
-@@ -269,6 +287,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Is provided group selected.
-+     *
-      * @param \Magento\Store\Model\Group $group
-      * @return bool
-      */
-@@ -278,6 +298,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Return store group Id.
-+     *
-      * @return int|null
-      */
-     public function getStoreGroupId()
-@@ -289,6 +311,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Return store collection.
-+     *
-      * @param \Magento\Store\Model\Group|int $group
-      * @return \Magento\Store\Model\ResourceModel\Store\Collection
-      */
-@@ -328,6 +352,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Return store Id.
-+     *
-      * @return int|null
-      */
-     public function getStoreId()
-@@ -339,6 +365,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Check is provided store selected.
-+     *
-      * @param \Magento\Store\Model\Store $store
-      * @return bool
-      */
-@@ -358,6 +386,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Sets store variable name.
-+     *
-      * @param string $varName
-      * @return $this
-      */
-@@ -368,6 +398,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Return store variable name.
-+     *
-      * @return mixed|string
-      */
-     public function getStoreVarName()
-@@ -380,6 +412,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Return switch url.
-+     *
-      * @return string
-      */
-     public function getSwitchUrl()
-@@ -399,6 +433,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Checks if scope selected.
-+     *
-      * @return bool
-      */
-     public function hasScopeSelected()
-@@ -472,6 +508,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Sets store ids.
-+     *
-      * @param array $storeIds
-      * @return $this
-      */
-@@ -482,6 +520,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Return store ids.
-+     *
-      * @return array
-      */
-     public function getStoreIds()
-@@ -490,6 +530,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Check if system is run in the single store mode.
-+     *
-      * @return bool
-      */
-     public function isShow()
-@@ -498,6 +540,8 @@ class Switcher extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Render block.
-+     *
-      * @return string
-      */
-     protected function _toHtml()
-diff --git a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
-index 5a09e1f17f6..6004d08b4b7 100644
---- a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
-+++ b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
-@@ -6,6 +6,9 @@
- 
- namespace Magento\Backend\Block\System\Design\Edit\Tab;
- 
-+/**
-+ * General system tab block.
-+ */
- class General extends \Magento\Backend\Block\Widget\Form\Generic
- {
-     /**
-@@ -90,7 +93,7 @@ class General extends \Magento\Backend\Block\Widget\Form\Generic
-             ]
-         );
- 
--        $dateFormat = $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT);
-+        $dateFormat = $this->_localeDate->getDateFormatWithLongYear();
-         $fieldset->addField(
-             'date_from',
-             'date',
-diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Form.php b/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
-index e479e8f560d..47a156c16ce 100644
---- a/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
-+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Backend\Block\System\Store\Delete;
- 
-+use Magento\Backup\Helper\Data as BackupHelper;
-+use Magento\Framework\App\ObjectManager;
-+
- /**
-  * Adminhtml cms block edit form
-  *
-@@ -12,6 +15,25 @@ namespace Magento\Backend\Block\System\Store\Delete;
-  */
- class Form extends \Magento\Backend\Block\Widget\Form\Generic
- {
-+    /**
-+     * @var BackupHelper
-+     */
-+    private $backup;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function __construct(
-+        \Magento\Backend\Block\Template\Context $context,
-+        \Magento\Framework\Registry $registry,
-+        \Magento\Framework\Data\FormFactory $formFactory,
-+        array $data = [],
-+        ?BackupHelper $backup = null
-+    ) {
-+        parent::__construct($context, $registry, $formFactory, $data);
-+        $this->backup = $backup ?? ObjectManager::getInstance()->get(BackupHelper::class);
-+    }
-+
-     /**
-      * Init form
-      *
-@@ -25,7 +47,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     protected function _prepareForm()
-     {
-@@ -45,6 +67,12 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
- 
-         $fieldset->addField('item_id', 'hidden', ['name' => 'item_id', 'value' => $dataObject->getId()]);
- 
-+        $backupOptions = ['0' => __('No')];
-+        $backupSelected = '0';
-+        if ($this->backup->isEnabled()) {
-+            $backupOptions['1'] = __('Yes');
-+            $backupSelected = '1';
-+        }
-         $fieldset->addField(
-             'create_backup',
-             'select',
-@@ -52,8 +80,8 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-                 'label' => __('Create DB Backup'),
-                 'title' => __('Create DB Backup'),
-                 'name' => 'create_backup',
--                'options' => ['1' => __('Yes'), '0' => __('No')],
--                'value' => '1'
-+                'options' => $backupOptions,
-+                'value' => $backupSelected
-             ]
-         );
- 
-diff --git a/app/code/Magento/Backend/Block/Template/Context.php b/app/code/Magento/Backend/Block/Template/Context.php
-index 6efc8d86802..27c777c6d40 100644
---- a/app/code/Magento/Backend/Block/Template/Context.php
-+++ b/app/code/Magento/Backend/Block/Template/Context.php
-@@ -17,7 +17,9 @@ namespace Magento\Backend\Block\Template;
-  * the classes they were introduced for.
-  *
-  * @api
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @since 100.0.2
-  */
- class Context extends \Magento\Framework\View\Element\Template\Context
-@@ -173,6 +175,8 @@ class Context extends \Magento\Framework\View\Element\Template\Context
-     }
- 
-     /**
-+     * Get backend session instance.
-+     *
-      * @return \Magento\Backend\Model\Session
-      */
-     public function getBackendSession()
-@@ -181,6 +185,8 @@ class Context extends \Magento\Framework\View\Element\Template\Context
-     }
- 
-     /**
-+     * Get math random instance.
-+     *
-      * @return \Magento\Framework\Math\Random
-      */
-     public function getMathRandom()
-@@ -189,6 +195,8 @@ class Context extends \Magento\Framework\View\Element\Template\Context
-     }
- 
-     /**
-+     * Get form key instance.
-+     *
-      * @return \Magento\Framework\Data\Form\FormKey
-      */
-     public function getFormKey()
-@@ -197,7 +205,9 @@ class Context extends \Magento\Framework\View\Element\Template\Context
-     }
- 
-     /**
--     * @return \Magento\Framework\Data\Form\FormKey
-+     * Get name builder instance.
-+     *
-+     * @return \Magento\Framework\Code\NameBuilder
-      */
-     public function getNameBuilder()
-     {
-diff --git a/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php b/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
-index 94af9a1d757..5a792ddb391 100644
---- a/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
-+++ b/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
-@@ -7,6 +7,8 @@
- namespace Magento\Backend\Block\Widget\Button;
- 
- /**
-+ * Button list widget
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -127,12 +129,6 @@ class ButtonList
-      */
-     public function sortButtons(Item $itemA, Item $itemB)
-     {
--        $sortOrderA = intval($itemA->getSortOrder());
--        $sortOrderB = intval($itemB->getSortOrder());
--
--        if ($sortOrderA == $sortOrderB) {
--            return 0;
--        }
--        return ($sortOrderA < $sortOrderB) ? -1 : 1;
-+        return (int)$itemA->getSortOrder() <=> (int)$itemB->getSortOrder();
-     }
- }
-diff --git a/app/code/Magento/Backend/Block/Widget/Form.php b/app/code/Magento/Backend/Block/Widget/Form.php
-index 30221618edb..38d5d90a22d 100644
---- a/app/code/Magento/Backend/Block/Widget/Form.php
-+++ b/app/code/Magento/Backend/Block/Widget/Form.php
-@@ -3,8 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Backend\Block\Widget;
- 
-+use Magento\Framework\App\ObjectManager;
-+
- /**
-  * Backend form widget
-  *
-@@ -27,13 +30,23 @@ class Form extends \Magento\Backend\Block\Widget
-      */
-     protected $_template = 'Magento_Backend::widget/form.phtml';
- 
-+    /** @var Form\Element\ElementCreator */
-+    private $creator;
-+
-     /**
-+     * Constructs form
-+     *
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param array $data
-+     * @param Form\Element\ElementCreator|null $creator
-      */
--    public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
--    {
-+    public function __construct(
-+        \Magento\Backend\Block\Template\Context $context,
-+        array $data = [],
-+        Form\Element\ElementCreator $creator = null
-+    ) {
-         parent::__construct($context, $data);
-+        $this->creator = $creator ?: ObjectManager::getInstance()->get(Form\Element\ElementCreator::class);
-     }
- 
-     /**
-@@ -46,7 +59,6 @@ class Form extends \Magento\Backend\Block\Widget
-         parent::_construct();
- 
-         $this->setDestElementId('edit_form');
--        $this->setShowGlobalIcon(false);
-     }
- 
-     /**
-@@ -148,6 +160,7 @@ class Form extends \Magento\Backend\Block\Widget
- 
-     /**
-      * Initialize form fields values
-+     *
-      * Method will be called after prepareForm and can be used for field values initialization
-      *
-      * @return $this
-@@ -173,32 +186,11 @@ class Form extends \Magento\Backend\Block\Widget
-             if (!$this->_isAttributeVisible($attribute)) {
-                 continue;
-             }
--            if (($inputType = $attribute->getFrontend()->getInputType()) && !in_array(
--                $attribute->getAttributeCode(),
--                $exclude
--            ) && ('media_image' != $inputType || $attribute->getAttributeCode() == 'image')
-+            if (($inputType = $attribute->getFrontend()->getInputType())
-+                && !in_array($attribute->getAttributeCode(), $exclude)
-+                && ('media_image' !== $inputType || $attribute->getAttributeCode() == 'image')
-             ) {
--                $fieldType = $inputType;
--                $rendererClass = $attribute->getFrontend()->getInputRendererClass();
--                if (!empty($rendererClass)) {
--                    $fieldType = $inputType . '_' . $attribute->getAttributeCode();
--                    $fieldset->addType($fieldType, $rendererClass);
--                }
--
--                $element = $fieldset->addField(
--                    $attribute->getAttributeCode(),
--                    $fieldType,
--                    [
--                        'name' => $attribute->getAttributeCode(),
--                        'label' => $attribute->getFrontend()->getLocalizedLabel(),
--                        'class' => $attribute->getFrontend()->getClass(),
--                        'required' => $attribute->getIsRequired(),
--                        'note' => $attribute->getNote()
--                    ]
--                )->setEntityAttribute(
--                    $attribute
--                );
--
-+                $element = $this->creator->create($fieldset, $attribute);
-                 $element->setAfterElementHtml($this->_getAdditionalElementHtml($element));
- 
-                 $this->_applyTypeSpecificConfig($inputType, $element, $attribute);
-diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php
-index 8b7babc1bb9..febaae38616 100644
---- a/app/code/Magento/Backend/Block/Widget/Form/Container.php
-+++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php
-@@ -56,6 +56,8 @@ class Container extends \Magento\Backend\Block\Widget\Container
-     protected $_template = 'Magento_Backend::widget/form/container.phtml';
- 
-     /**
-+     * Initialize form.
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -83,7 +85,7 @@ class Container extends \Magento\Backend\Block\Widget\Container
-             -1
-         );
- 
--        $objId = $this->getRequest()->getParam($this->_objectId);
-+        $objId = (int)$this->getRequest()->getParam($this->_objectId);
- 
-         if (!empty($objId)) {
-             $this->addButton(
-@@ -93,7 +95,7 @@ class Container extends \Magento\Backend\Block\Widget\Container
-                     'class' => 'delete',
-                     'onclick' => 'deleteConfirm(\'' . __(
-                         'Are you sure you want to do this?'
--                    ) . '\', \'' . $this->getDeleteUrl() . '\')'
-+                    ) . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})'
-                 ]
-             );
-         }
-@@ -151,11 +153,13 @@ class Container extends \Magento\Backend\Block\Widget\Container
-     }
- 
-     /**
-+     * Get URL for delete button.
-+     *
-      * @return string
-      */
-     public function getDeleteUrl()
-     {
--        return $this->getUrl('*/*/delete', [$this->_objectId => $this->getRequest()->getParam($this->_objectId)]);
-+        return $this->getUrl('*/*/delete', [$this->_objectId => (int)$this->getRequest()->getParam($this->_objectId)]);
-     }
- 
-     /**
-@@ -183,6 +187,8 @@ class Container extends \Magento\Backend\Block\Widget\Container
-     }
- 
-     /**
-+     * Get form HTML.
-+     *
-      * @return string
-      */
-     public function getFormHtml()
-@@ -192,6 +198,8 @@ class Container extends \Magento\Backend\Block\Widget\Container
-     }
- 
-     /**
-+     * Get form init scripts.
-+     *
-      * @return string
-      */
-     public function getFormInitScripts()
-@@ -203,6 +211,8 @@ class Container extends \Magento\Backend\Block\Widget\Container
-     }
- 
-     /**
-+     * Get form scripts.
-+     *
-      * @return string
-      */
-     public function getFormScripts()
-@@ -214,6 +224,8 @@ class Container extends \Magento\Backend\Block\Widget\Container
-     }
- 
-     /**
-+     * Get header width.
-+     *
-      * @return string
-      */
-     public function getHeaderWidth()
-@@ -222,6 +234,8 @@ class Container extends \Magento\Backend\Block\Widget\Container
-     }
- 
-     /**
-+     * Get header css class.
-+     *
-      * @return string
-      */
-     public function getHeaderCssClass()
-@@ -230,6 +244,8 @@ class Container extends \Magento\Backend\Block\Widget\Container
-     }
- 
-     /**
-+     * Get header HTML.
-+     *
-      * @return string
-      */
-     public function getHeaderHtml()
-diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
-index eff49c3b75a..d599d5fbad5 100644
---- a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
-+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
-@@ -4,14 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
-+namespace Magento\Backend\Block\Widget\Form\Element;
-+
- /**
-  * Form element dependencies mapper
-  * Assumes that one element may depend on other element values.
-  * Will toggle as "enabled" only if all elements it depends from toggle as true.
-- */
--namespace Magento\Backend\Block\Widget\Form\Element;
--
--/**
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -117,6 +116,7 @@ class Dependence extends \Magento\Backend\Block\AbstractBlock
- 
-     /**
-      * HTML output getter
-+     *
-      * @return string
-      */
-     protected function _toHtml()
-@@ -139,7 +139,8 @@ require(['mage/adminhtml/form'], function(){
-     }
- 
-     /**
--     * Field dependences JSON map generator
-+     * Field dependencies JSON map generator
-+     *
-      * @return string
-      */
-     protected function _getDependsJson()
-diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php b/app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php
-new file mode 100644
-index 00000000000..b9cdd259796
---- /dev/null
-+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php
-@@ -0,0 +1,136 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Backend\Block\Widget\Form\Element;
-+
-+use Magento\Eav\Model\Entity\Attribute;
-+use Magento\Framework\Data\Form\Element\AbstractElement;
-+use Magento\Framework\Data\Form\Element\Fieldset;
-+
-+/**
-+ * Class ElementCreator
-+ *
-+ * @deprecated 100.3.0 in favour of UI component implementation
-+ * @package Magento\Backend\Block\Widget\Form\Element
-+ */
-+class ElementCreator
-+{
-+    /**
-+     * @var array
-+     */
-+    private $modifiers;
-+
-+    /**
-+     * ElementCreator constructor.
-+     *
-+     * @param array $modifiers
-+     */
-+    public function __construct(array $modifiers = [])
-+    {
-+        $this->modifiers = $modifiers;
-+    }
-+
-+    /**
-+     * Creates element
-+     *
-+     * @param Fieldset $fieldset
-+     * @param Attribute $attribute
-+     *
-+     * @return AbstractElement
-+     */
-+    public function create(Fieldset $fieldset, Attribute $attribute): AbstractElement
-+    {
-+        $config = $this->getElementConfig($attribute);
-+
-+        if (!empty($config['rendererClass'])) {
-+            $fieldType = $config['inputType'] . '_' . $attribute->getAttributeCode();
-+            $fieldset->addType($fieldType, $config['rendererClass']);
-+        }
-+
-+        return $fieldset
-+            ->addField($config['attribute_code'], $config['inputType'], $config)
-+            ->setEntityAttribute($attribute);
-+    }
-+
-+    /**
-+     * Returns element config
-+     *
-+     * @param Attribute $attribute
-+     * @return array
-+     */
-+    private function getElementConfig(Attribute $attribute): array
-+    {
-+        $defaultConfig = $this->createDefaultConfig($attribute);
-+        $config = $this->modifyConfig($defaultConfig);
-+
-+        $config['label'] = __($config['label']);
-+
-+        return $config;
-+    }
-+
-+    /**
-+     * Returns default config
-+     *
-+     * @param Attribute $attribute
-+     * @return array
-+     */
-+    private function createDefaultConfig(Attribute $attribute): array
-+    {
-+        return [
-+            'inputType' => $attribute->getFrontend()->getInputType(),
-+            'rendererClass' => $attribute->getFrontend()->getInputRendererClass(),
-+            'attribute_code' => $attribute->getAttributeCode(),
-+            'name' => $attribute->getAttributeCode(),
-+            'label' => $attribute->getFrontend()->getLabel(),
-+            'class' => $attribute->getFrontend()->getClass(),
-+            'required' => $attribute->getIsRequired(),
-+            'note' => $attribute->getNote(),
-+        ];
-+    }
-+
-+    /**
-+     *  Modify config
-+     *
-+     * @param array $config
-+     * @return array
-+     */
-+    private function modifyConfig(array $config): array
-+    {
-+        if ($this->isModified($config['attribute_code'])) {
-+            return $this->applyModifier($config);
-+        }
-+        return $config;
-+    }
-+
-+    /**
-+     * Returns bool if attribute need to modify
-+     *
-+     * @param string $attribute_code
-+     * @return bool
-+     */
-+    private function isModified($attribute_code): bool
-+    {
-+        return isset($this->modifiers[$attribute_code]);
-+    }
-+
-+    /**
-+     * Apply modifier to config
-+     *
-+     * @param array $config
-+     * @return array
-+     */
-+    private function applyModifier(array $config): array
-+    {
-+        $modifiedConfig = $this->modifiers[$config['attribute_code']];
-+        foreach (array_keys($config) as $key) {
-+            if (isset($modifiedConfig[$key])) {
-+                $config[$key] = $modifiedConfig[$key];
-+            }
-+        }
-+        return $config;
-+    }
-+}
-diff --git a/app/code/Magento/Backend/Block/Widget/Grid.php b/app/code/Magento/Backend/Block/Widget/Grid.php
-index 72ab5a265d8..66298d23389 100644
---- a/app/code/Magento/Backend/Block/Widget/Grid.php
-+++ b/app/code/Magento/Backend/Block/Widget/Grid.php
-@@ -12,7 +12,7 @@ namespace Magento\Backend\Block\Widget;
-  * @api
-  * @deprecated 100.2.0 in favour of UI component implementation
-  * @method string getRowClickCallback() getRowClickCallback()
-- * @method \Magento\Backend\Block\Widget\Grid setRowClickCallback() setRowClickCallback(string $value)
-+ * @method \Magento\Backend\Block\Widget\Grid setRowClickCallback(string $value)
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @since 100.0.2
-  */
-@@ -150,7 +150,10 @@ class Grid extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Internal constructor, that is called from real constructor
-+     *
-      * @return void
-+     *
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-     protected function _construct()
-@@ -709,6 +712,7 @@ class Grid extends \Magento\Backend\Block\Widget
- 
-     /**
-      * Grid url getter
-+     *
-      * Version of getGridUrl() but with parameters
-      *
-      * @param array $params url parameters
-diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
-index d49ad294114..a0907726ccc 100644
---- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
-+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
-@@ -9,6 +9,9 @@
-  */
- namespace Magento\Backend\Block\Widget\Grid\Column\Filter;
- 
-+/**
-+ * Theme grid filter
-+ */
- class Theme extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
- {
-     /**
-@@ -54,7 +57,8 @@ class Theme extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFil
-     }
- 
-     /**
--     * Retrieve options setted in column.
-+     * Retrieve options set in column.
-+     *
-      * Or load if options was not set.
-      *
-      * @return array
-diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php
-index c45a222d1eb..424fee98d62 100644
---- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php
-+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Backend\Block\Widget\Grid\Column;
- 
- /**
-@@ -14,15 +16,6 @@ namespace Magento\Backend\Block\Widget\Grid\Column;
-  */
- class Multistore extends \Magento\Backend\Block\Widget\Grid\Column
- {
--    /**
--     * @param \Magento\Backend\Block\Template\Context $context
--     * @param array $data
--     */
--    public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
--    {
--        parent::__construct($context, $data);
--    }
--
-     /**
-      * Get header css class name
-      *
-diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
-index b8a2e283b29..623a75015eb 100644
---- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
-+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
-@@ -28,6 +28,8 @@ abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock imp
-     protected $_column;
- 
-     /**
-+     * Set column for renderer.
-+     *
-      * @param Column $column
-      * @return $this
-      */
-@@ -38,6 +40,8 @@ abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock imp
-     }
- 
-     /**
-+     * Returns row associated with the renderer.
-+     *
-      * @return Column
-      */
-     public function getColumn()
-@@ -48,7 +52,7 @@ abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock imp
-     /**
-      * Renders grid column
-      *
--     * @param   Object $row
-+     * @param DataObject $row
-      * @return  string
-      */
-     public function render(DataObject $row)
-@@ -66,7 +70,7 @@ abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock imp
-     /**
-      * Render column for export
-      *
--     * @param Object $row
-+     * @param DataObject $row
-      * @return string
-      */
-     public function renderExport(DataObject $row)
-@@ -75,7 +79,9 @@ abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock imp
-     }
- 
-     /**
--     * @param Object $row
-+     * Returns value of the row.
-+     *
-+     * @param DataObject $row
-      * @return mixed
-      */
-     protected function _getValue(DataObject $row)
-@@ -92,7 +98,9 @@ abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock imp
-     }
- 
-     /**
--     * @param Object $row
-+     * Get pre-rendered input element.
-+     *
-+     * @param DataObject $row
-      * @return string
-      */
-     public function _getInputValueElement(DataObject $row)
-@@ -108,7 +116,9 @@ abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock imp
-     }
- 
-     /**
--     * @param Object $row
-+     * Get input value by row.
-+     *
-+     * @param DataObject $row
-      * @return mixed
-      */
-     protected function _getInputValue(DataObject $row)
-@@ -117,6 +127,8 @@ abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock imp
-     }
- 
-     /**
-+     * Renders header of the column,
-+     *
-      * @return string
-      */
-     public function renderHeader()
-@@ -148,6 +160,8 @@ abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock imp
-     }
- 
-     /**
-+     * Render HTML properties.
-+     *
-      * @return string
-      */
-     public function renderProperty()
-@@ -172,6 +186,8 @@ abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock imp
-     }
- 
-     /**
-+     * Returns HTML for CSS.
-+     *
-      * @return string
-      */
-     public function renderCss()
-diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
-index b3f467ce37c..03566bce3fc 100644
---- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
-+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
-@@ -82,7 +82,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
-     {
-         if ($data = (string)$this->_getValue($row)) {
-             $currency_code = $this->_getCurrencyCode($row);
--            $data = floatval($data) * $this->_getRate($row);
-+            $data = (float)$data * $this->_getRate($row);
-             $sign = (bool)(int)$this->getColumn()->getShowNumberSign() && $data > 0 ? '+' : '';
-             $data = sprintf("%f", $data);
-             $data = $this->_localeCurrency->getCurrency($currency_code)->toCurrency($data);
-@@ -118,10 +118,10 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
-     protected function _getRate($row)
-     {
-         if ($rate = $this->getColumn()->getRate()) {
--            return floatval($rate);
-+            return (float)$rate;
-         }
-         if ($rate = $row->getData($this->getColumn()->getRateField())) {
--            return floatval($rate);
-+            return (float)$rate;
-         }
-         return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
-     }
-diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
-index e4300c63485..9da23af83f0 100644
---- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
-+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
-@@ -60,7 +60,7 @@ class Price extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
-                 return $data;
-             }
- 
--            $data = floatval($data) * $this->_getRate($row);
-+            $data = (float)$data * $this->_getRate($row);
-             $data = sprintf("%f", $data);
-             $data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
-             return $data;
-@@ -94,10 +94,10 @@ class Price extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
-     protected function _getRate($row)
-     {
-         if ($rate = $this->getColumn()->getRate()) {
--            return floatval($rate);
-+            return (float)$rate;
-         }
-         if ($rate = $row->getData($this->getColumn()->getRateField())) {
--            return floatval($rate);
-+            return (float)$rate;
-         }
-         return 1;
-     }
-diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
-index 185b1116b8f..891b2a3ada7 100644
---- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
-+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
-@@ -7,6 +7,7 @@
- namespace Magento\Backend\Block\Widget\Grid\Massaction;
- 
- use Magento\Backend\Block\Widget\Grid\Massaction\VisibilityCheckerInterface as VisibilityChecker;
-+use Magento\Framework\Data\Collection\AbstractDb;
- use Magento\Framework\DataObject;
- 
- /**
-@@ -52,7 +53,7 @@ abstract class AbstractMassaction extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
--     * @return void
-+     * @inheritdoc
-      */
-     protected function _construct()
-     {
-@@ -217,6 +218,7 @@ abstract class AbstractMassaction extends \Magento\Backend\Block\Widget
-      * Retrieve JSON string of selected checkboxes
-      *
-      * @return string
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     public function getSelectedJson()
-     {
-@@ -231,6 +233,7 @@ abstract class AbstractMassaction extends \Magento\Backend\Block\Widget
-      * Retrieve array of selected checkboxes
-      *
-      * @return string[]
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     public function getSelected()
-     {
-@@ -252,6 +255,8 @@ abstract class AbstractMassaction extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get mass action javascript code.
-+     *
-      * @return string
-      */
-     public function getJavaScript()
-@@ -268,6 +273,8 @@ abstract class AbstractMassaction extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get grid ids in JSON format.
-+     *
-      * @return string
-      */
-     public function getGridIdsJson()
-@@ -275,23 +282,28 @@ abstract class AbstractMassaction extends \Magento\Backend\Block\Widget
-         if (!$this->getUseSelectAll()) {
-             return '';
-         }
--        /** @var \Magento\Framework\Data\Collection $allIdsCollection */
--        $allIdsCollection = clone $this->getParentBlock()->getCollection();
- 
--        if ($this->getMassactionIdField()) {
--            $massActionIdField = $this->getMassactionIdField();
-+        /** @var \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection $collection */
-+        $collection = clone $this->getParentBlock()->getCollection();
-+
-+        if ($collection instanceof AbstractDb) {
-+            $idsSelect = clone $collection->getSelect();
-+            $idsSelect->reset(\Magento\Framework\DB\Select::ORDER);
-+            $idsSelect->reset(\Magento\Framework\DB\Select::LIMIT_COUNT);
-+            $idsSelect->reset(\Magento\Framework\DB\Select::LIMIT_OFFSET);
-+            $idsSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
-+            $idsSelect->columns($this->getMassactionIdField(), 'main_table');
-+            $idList = $collection->getConnection()->fetchCol($idsSelect);
-         } else {
--            $massActionIdField = $this->getParentBlock()->getMassactionIdField();
-+            $idList = $collection->setPageSize(0)->getColumnValues($this->getMassactionIdField());
-         }
- 
--        $gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);
--        if (!empty($gridIds)) {
--            return join(",", $gridIds);
--        }
--        return '';
-+        return implode(',', $idList);
-     }
- 
-     /**
-+     * Get Html id.
-+     *
-      * @return string
-      */
-     public function getHtmlId()
-diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
-index 333904e398c..c7c1f93e8ca 100644
---- a/app/code/Magento/Backend/Block/Widget/Tabs.php
-+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
-@@ -8,6 +8,8 @@ namespace Magento\Backend\Block\Widget;
- use Magento\Backend\Block\Widget\Tab\TabInterface;
- 
- /**
-+ * Tabs widget
-+ *
-  * @api
-  * @SuppressWarnings(PHPMD.NumberOfChildren)
-  * @since 100.0.2
-@@ -178,6 +180,8 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get active tab id
-+     *
-      * @return string
-      */
-     public function getActiveTabId()
-@@ -187,6 +191,7 @@ class Tabs extends \Magento\Backend\Block\Widget
- 
-     /**
-      * Set Active Tab
-+     *
-      * Tab has to be not hidden and can show
-      *
-      * @param string $tabId
-@@ -231,7 +236,7 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _beforeToHtml()
-     {
-@@ -282,6 +287,8 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Apply tabs order
-+     *
-      * @param array $orderByPosition
-      * @param array $orderByIdentity
-      *
-@@ -294,7 +301,7 @@ class Tabs extends \Magento\Backend\Block\Widget
-         /**
-          * Rearrange the positions by using the after tag for each tab.
-          *
--         * @var integer      $position
-+         * @var int $position
-          * @var TabInterface $tab
-          */
-         foreach ($orderByPosition as $position => $tab) {
-@@ -338,6 +345,8 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
-     
-     /**
-+     * Get js object name
-+     *
-      * @return string
-      */
-     public function getJsObjectName()
-@@ -346,6 +355,8 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get tabs ids
-+     *
-      * @return string[]
-      */
-     public function getTabsIds()
-@@ -358,6 +369,8 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get tab id
-+     *
-      * @param \Magento\Framework\DataObject|TabInterface $tab
-      * @param bool $withPrefix
-      * @return string
-@@ -371,6 +384,8 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * CVan show tab
-+     *
-      * @param \Magento\Framework\DataObject|TabInterface $tab
-      * @return bool
-      */
-@@ -383,6 +398,8 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get tab is hidden
-+     *
-      * @param \Magento\Framework\DataObject|TabInterface $tab
-      * @return bool
-      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-@@ -396,6 +413,8 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get tab url
-+     *
-      * @param \Magento\Framework\DataObject|TabInterface $tab
-      * @return string
-      */
-@@ -414,6 +433,8 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get tab title
-+     *
-      * @param \Magento\Framework\DataObject|TabInterface $tab
-      * @return string
-      */
-@@ -426,6 +447,8 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get tab class
-+     *
-      * @param \Magento\Framework\DataObject|TabInterface $tab
-      * @return string
-      */
-@@ -441,6 +464,8 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get tab label
-+     *
-      * @param \Magento\Framework\DataObject|TabInterface $tab
-      * @return string
-      */
-@@ -453,6 +478,8 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get tab content
-+     *
-      * @param \Magento\Framework\DataObject|TabInterface $tab
-      * @return string
-      */
-@@ -468,7 +495,8 @@ class Tabs extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
--     * Mark tabs as dependant of each other
-+     * Mark tabs as dependent of each other
-+     *
-      * Arbitrary number of tabs can be specified, but at least two
-      *
-      * @param string $tabOneId
-diff --git a/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php b/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
-index 70b01046f6a..11da740c466 100644
---- a/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
-+++ b/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
-@@ -11,13 +11,15 @@ use Symfony\Component\Console\Command\Command;
- use Symfony\Component\Console\Input\InputOption;
- 
- /**
-+ * Abstract cache command
-+ *
-  * @api
-  * @since 100.0.2
-  */
- abstract class AbstractCacheCommand extends Command
- {
-     /**
--     * Input option bootsrap
-+     * Input option bootstrap
-      */
-     const INPUT_KEY_BOOTSTRAP = 'bootstrap';
- 
-@@ -40,7 +42,7 @@ abstract class AbstractCacheCommand extends Command
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function configure()
-     {
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
-index ad454609776..23731e29f0d 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Auth;
- 
--class DeniedJson extends \Magento\Backend\Controller\Adminhtml\Auth
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class DeniedJson extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\JsonFactory
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
-index e1ea57f6303..1de77c810f3 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
-@@ -6,11 +6,14 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Auth;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGet;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPost;
-+
- /**
-  * @api
-  * @since 100.0.2
-  */
--class Login extends \Magento\Backend\Controller\Adminhtml\Auth
-+class Login extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGet, HttpPost
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
-index 41e32c92928..d7ad080395e 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
-@@ -6,7 +6,10 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Auth;
- 
--class Logout extends \Magento\Backend\Controller\Adminhtml\Auth
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGet;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPost;
-+
-+class Logout extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGet, HttpPost
- {
-     /**
-      * Administrator logout action
-@@ -16,7 +19,7 @@ class Logout extends \Magento\Backend\Controller\Adminhtml\Auth
-     public function execute()
-     {
-         $this->_auth->logout();
--        $this->messageManager->addSuccess(__('You have logged out.'));
-+        $this->messageManager->addSuccessMessage(__('You have logged out.'));
- 
-         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-         $resultRedirect = $this->resultRedirectFactory->create();
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
-index 7a926b1c09c..79bc19256d2 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
-@@ -6,10 +6,11 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Cache;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Controller\ResultFactory;
- 
--class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache
-+class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -28,11 +29,11 @@ class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache
-         try {
-             $this->_objectManager->create(\Magento\Catalog\Model\Product\Image::class)->clearCache();
-             $this->_eventManager->dispatch('clean_catalog_images_cache_after');
--            $this->messageManager->addSuccess(__('The image cache was cleaned.'));
-+            $this->messageManager->addSuccessMessage(__('The image cache was cleaned.'));
-         } catch (LocalizedException $e) {
--            $this->messageManager->addError($e->getMessage());
-+            $this->messageManager->addErrorMessage($e->getMessage());
-         } catch (\Exception $e) {
--            $this->messageManager->addException($e, __('An error occurred while clearing the image cache.'));
-+            $this->messageManager->addExceptionMessage($e, __('An error occurred while clearing the image cache.'));
-         }
- 
-         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
-index 72f23ab65cf..36aca1afcc4 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
-@@ -6,10 +6,11 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Cache;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Controller\ResultFactory;
- 
--class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache
-+class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -28,11 +29,12 @@ class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache
-         try {
-             $this->_objectManager->get(\Magento\Framework\View\Asset\MergeService::class)->cleanMergedJsCss();
-             $this->_eventManager->dispatch('clean_media_cache_after');
--            $this->messageManager->addSuccess(__('The JavaScript/CSS cache has been cleaned.'));
-+            $this->messageManager->addSuccessMessage(__('The JavaScript/CSS cache has been cleaned.'));
-         } catch (LocalizedException $e) {
--            $this->messageManager->addError($e->getMessage());
-+            $this->messageManager->addErrorMessage($e->getMessage());
-         } catch (\Exception $e) {
--            $this->messageManager->addException($e, __('An error occurred while clearing the JavaScript/CSS cache.'));
-+            $this->messageManager
-+                ->addExceptionMessage($e, __('An error occurred while clearing the JavaScript/CSS cache.'));
-         }
- 
-         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
-index 27ae2fc31e1..a3a26c5cf62 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Cache;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class CleanStaticFiles extends \Magento\Backend\Controller\Adminhtml\Cache
-+class CleanStaticFiles extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -26,7 +27,7 @@ class CleanStaticFiles extends \Magento\Backend\Controller\Adminhtml\Cache
-     {
-         $this->_objectManager->get(\Magento\Framework\App\State\CleanupFiles::class)->clearMaterializedViewFiles();
-         $this->_eventManager->dispatch('clean_static_files_cache_after');
--        $this->messageManager->addSuccess(__('The static files cache has been cleaned.'));
-+        $this->messageManager->addSuccessMessage(__('The static files cache has been cleaned.'));
- 
-         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
-index ca89ea58fa6..daf424d14c5 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Cache;
- 
--class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -27,7 +29,7 @@ class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache
-         foreach ($this->_cacheFrontendPool as $cacheFrontend) {
-             $cacheFrontend->getBackend()->clean();
-         }
--        $this->messageManager->addSuccess(__("You flushed the cache storage."));
-+        $this->messageManager->addSuccessMessage(__("You flushed the cache storage."));
-         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-         $resultRedirect = $this->resultRedirectFactory->create();
-         return $resultRedirect->setPath('adminhtml/*');
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
-index f0fed159e0f..f3474bf4387 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Cache;
- 
--class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -27,7 +29,7 @@ class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache
-             $cacheFrontend->clean();
-         }
-         $this->_eventManager->dispatch('adminhtml_cache_flush_system');
--        $this->messageManager->addSuccess(__("The Magento cache storage has been flushed."));
-+        $this->messageManager->addSuccessMessage(__("The Magento cache storage has been flushed."));
-         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-         $resultRedirect = $this->resultRedirectFactory->create();
-         return $resultRedirect->setPath('adminhtml/*');
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php
-index 05bd309ca62..f1e908bb842 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Cache;
- 
--class Index extends \Magento\Backend\Controller\Adminhtml\Cache
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
- {
-     /**
-      * Display cache management grid
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
-index 2bfa937b06b..03b88ca1d3f 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
-@@ -67,12 +67,12 @@ class MassDisable extends \Magento\Backend\Controller\Adminhtml\Cache
-             }
-             if ($updatedTypes > 0) {
-                 $this->_cacheState->persist();
--                $this->messageManager->addSuccess(__("%1 cache type(s) disabled.", $updatedTypes));
-+                $this->messageManager->addSuccessMessage(__("%1 cache type(s) disabled.", $updatedTypes));
-             }
-         } catch (LocalizedException $e) {
--            $this->messageManager->addError($e->getMessage());
-+            $this->messageManager->addErrorMessage($e->getMessage());
-         } catch (\Exception $e) {
--            $this->messageManager->addException($e, __('An error occurred while disabling cache.'));
-+            $this->messageManager->addExceptionMessage($e, __('An error occurred while disabling cache.'));
-         }
-     }
- 
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
-index 113e0f2d896..1b98a00d4bf 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
-@@ -66,12 +66,12 @@ class MassEnable extends \Magento\Backend\Controller\Adminhtml\Cache
-             }
-             if ($updatedTypes > 0) {
-                 $this->_cacheState->persist();
--                $this->messageManager->addSuccess(__("%1 cache type(s) enabled.", $updatedTypes));
-+                $this->messageManager->addSuccessMessage(__("%1 cache type(s) enabled.", $updatedTypes));
-             }
-         } catch (LocalizedException $e) {
--            $this->messageManager->addError($e->getMessage());
-+            $this->messageManager->addErrorMessage($e->getMessage());
-         } catch (\Exception $e) {
--            $this->messageManager->addException($e, __('An error occurred while enabling cache.'));
-+            $this->messageManager->addExceptionMessage($e, __('An error occurred while enabling cache.'));
-         }
-     }
- 
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
-index 3843b030afb..bde211debcf 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
-@@ -37,12 +37,12 @@ class MassRefresh extends \Magento\Backend\Controller\Adminhtml\Cache
-                 $updatedTypes++;
-             }
-             if ($updatedTypes > 0) {
--                $this->messageManager->addSuccess(__("%1 cache type(s) refreshed.", $updatedTypes));
-+                $this->messageManager->addSuccessMessage(__("%1 cache type(s) refreshed.", $updatedTypes));
-             }
-         } catch (LocalizedException $e) {
--            $this->messageManager->addError($e->getMessage());
-+            $this->messageManager->addErrorMessage($e->getMessage());
-         } catch (\Exception $e) {
--            $this->messageManager->addException($e, __('An error occurred while refreshing cache.'));
-+            $this->messageManager->addExceptionMessage($e, __('An error occurred while refreshing cache.'));
-         }
- 
-         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php
-index d8c52f6c50b..decca6837fa 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php
-@@ -6,7 +6,11 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Dashboard;
- 
--class Index extends \Magento\Backend\Controller\Adminhtml\Dashboard
-+use Magento\Backend\Controller\Adminhtml\Dashboard as DashboardAction;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+class Index extends DashboardAction implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
-index 3907f4a4f71..a42a44814cb 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
-@@ -6,12 +6,17 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Dashboard;
- 
--class ProductsViewed extends AjaxBlock
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Get most viewed products controller.
-+ */
-+class ProductsViewed extends AjaxBlock implements HttpPostActionInterface
- {
-     /**
-      * Gets most viewed products list
-      *
--     * @return \Magento\Backend\Model\View\Result\Page
-+     * @return \Magento\Framework\Controller\Result\Raw
-      */
-     public function execute()
-     {
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
-index f831fa67f4b..c709859adb1 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
-@@ -6,7 +6,13 @@
- 
- namespace Magento\Backend\Controller\Adminhtml\Dashboard;
- 
--class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Reports\Controller\Adminhtml\Report\Statistics;
-+
-+/**
-+ * Refresh Dashboard statistics action.
-+ */
-+class RefreshStatistics extends Statistics implements HttpPostActionInterface
- {
-     /**
-      * @param \Magento\Backend\App\Action\Context $context
-@@ -25,6 +31,8 @@ class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Sta
-     }
- 
-     /**
-+     * Refresh statistics.
-+     *
-      * @return \Magento\Backend\Model\View\Result\Redirect
-      */
-     public function execute()
-@@ -34,9 +42,9 @@ class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Sta
-             foreach ($collectionsNames as $collectionName) {
-                 $this->_objectManager->create($collectionName)->aggregate();
-             }
--            $this->messageManager->addSuccess(__('We updated lifetime statistic.'));
-+            $this->messageManager->addSuccessMessage(__('We updated lifetime statistic.'));
-         } catch (\Exception $e) {
--            $this->messageManager->addError(__('We can\'t refresh lifetime statistics.'));
-+            $this->messageManager->addErrorMessage(__('We can\'t refresh lifetime statistics.'));
-             $this->logger->critical($e);
-         }
- 
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
-index 9ca4021d083..37f3064aeaa 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
-@@ -6,11 +6,15 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Index;
- 
-+use Magento\Backend\Controller\Adminhtml\Index as IndexAction;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
- /**
-  * @api
-  * @since 100.0.2
-  */
--class GlobalSearch extends \Magento\Backend\Controller\Adminhtml\Index
-+class GlobalSearch extends IndexAction implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\JsonFactory
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php
-index a5c71fb2dbc..afb1b457327 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php
-@@ -6,7 +6,10 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Index;
- 
--class Index extends \Magento\Backend\Controller\Adminhtml\Index
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGet;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPost;
-+
-+class Index extends \Magento\Backend\Controller\Adminhtml\Index implements HttpGet, HttpPost
- {
-     /**
-      * Admin area entry point
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php
-index ce59d2fd48e..e84987d8e1d 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php
-@@ -6,6 +6,9 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\Noroute;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-+ */
- class Index extends \Magento\Backend\App\Action
- {
-     /**
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php
-index 54771bfdc1a..648f1be86f5 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\System\Account;
- 
--class Index extends \Magento\Backend\Controller\Adminhtml\System\Account
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Backend\Controller\Adminhtml\System\Account implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
-index 1b10c151a9d..d95b0541c2c 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
-@@ -76,12 +76,12 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Account
-             $errors = $user->validate();
-             if ($errors !== true && !empty($errors)) {
-                 foreach ($errors as $error) {
--                    $this->messageManager->addError($error);
-+                    $this->messageManager->addErrorMessage($error);
-                 }
-             } else {
-                 $user->save();
-                 $user->sendNotificationEmailsIfRequired();
--                $this->messageManager->addSuccess(__('You saved the account.'));
-+                $this->messageManager->addSuccessMessage(__('You saved the account.'));
-             }
-         } catch (UserLockedException $e) {
-             $this->_auth->logout();
-@@ -91,12 +91,12 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Account
-         } catch (ValidatorException $e) {
-             $this->messageManager->addMessages($e->getMessages());
-             if ($e->getMessage()) {
--                $this->messageManager->addError($e->getMessage());
-+                $this->messageManager->addErrorMessage($e->getMessage());
-             }
-         } catch (LocalizedException $e) {
--            $this->messageManager->addError($e->getMessage());
-+            $this->messageManager->addErrorMessage($e->getMessage());
-         } catch (\Exception $e) {
--            $this->messageManager->addError(__('An error occurred while saving account.'));
-+            $this->messageManager->addErrorMessage(__('An error occurred while saving account.'));
-         }
- 
-         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
-index 76402169f26..21f28188cf8 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
-@@ -19,11 +19,11 @@ class Delete extends \Magento\Backend\Controller\Adminhtml\System\Design
- 
-             try {
-                 $design->delete();
--                $this->messageManager->addSuccess(__('You deleted the design change.'));
-+                $this->messageManager->addSuccessMessage(__('You deleted the design change.'));
-             } catch (\Magento\Framework\Exception\LocalizedException $e) {
--                $this->messageManager->addError($e->getMessage());
-+                $this->messageManager->addErrorMessage($e->getMessage());
-             } catch (\Exception $e) {
--                $this->messageManager->addException($e, __("You can't delete the design change."));
-+                $this->messageManager->addExceptionMessage($e, __("You can't delete the design change."));
-             }
-         }
-         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php
-index 30b26f22941..c6a05b5a71d 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\System\Design;
- 
--class Index extends \Magento\Backend\Controller\Adminhtml\System\Design
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Backend\Controller\Adminhtml\System\Design implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Page
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
-index 1f478604ced..25cfb61d658 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
-@@ -6,7 +6,12 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\System\Design;
- 
--class Save extends \Magento\Backend\Controller\Adminhtml\System\Design
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Save design action.
-+ */
-+class Save extends \Magento\Backend\Controller\Adminhtml\System\Design implements HttpPostActionInterface
- {
-     /**
-      * Filtering posted data. Converting localized data if needed
-@@ -26,6 +31,8 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Design
-     }
- 
-     /**
-+     * Save design action.
-+     *
-      * @return \Magento\Backend\Model\View\Result\Redirect
-      */
-     public function execute()
-@@ -50,14 +57,14 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Design
-             try {
-                 $design->save();
-                 $this->_eventManager->dispatch('theme_save_after');
--                $this->messageManager->addSuccess(__('You saved the design change.'));
-+                $this->messageManager->addSuccessMessage(__('You saved the design change.'));
-             } catch (\Exception $e) {
--                $this->messageManager->addError($e->getMessage());
-+                $this->messageManager->addErrorMessage($e->getMessage());
-                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setDesignData($data);
--                return $resultRedirect->setPath('adminhtml/*/', ['id' => $design->getId()]);
-+                return $resultRedirect->setPath('*/*/edit', ['id' => $design->getId()]);
-             }
-         }
- 
--        return $resultRedirect->setPath('adminhtml/*/');
-+        return $resultRedirect->setPath('*/*/');
-     }
- }
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
-index 4fbae6abb42..a9be14b77b2 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
-@@ -14,6 +14,7 @@ use Magento\Framework\Filesystem;
-  * Store controller
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-  */
- abstract class Store extends Action
- {
-@@ -86,6 +87,8 @@ abstract class Store extends Action
-      * Backup database
-      *
-      * @return bool
-+     *
-+     * @deprecated Backup module is to be removed.
-      */
-     protected function _backupDatabase()
-     {
-@@ -103,12 +106,12 @@ abstract class Store extends Action
-                 ->setType('db')
-                 ->setPath($filesystem->getDirectoryRead(DirectoryList::VAR_DIR)->getAbsolutePath('backups'));
-             $backupDb->createBackup($backup);
--            $this->messageManager->addSuccess(__('The database was backed up.'));
-+            $this->messageManager->addSuccessMessage(__('The database was backed up.'));
-         } catch (\Magento\Framework\Exception\LocalizedException $e) {
--            $this->messageManager->addError($e->getMessage());
-+            $this->messageManager->addErrorMessage($e->getMessage());
-             return false;
-         } catch (\Exception $e) {
--            $this->messageManager->addException(
-+            $this->messageManager->addExceptionMessage(
-                 $e,
-                 __('We can\'t create a backup right now. Please try again later.')
-             );
-@@ -125,7 +128,7 @@ abstract class Store extends Action
-      */
-     protected function _addDeletionNotice($typeTitle)
-     {
--        $this->messageManager->addNotice(
-+        $this->messageManager->addNoticeMessage(
-             __(
-                 'Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.)'
-                 . ', but the %1 will not be able to be restored. It is suggested that you create a database backup '
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
-index 925ae4c69ee..4e323be709a 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
-@@ -15,13 +15,13 @@ class DeleteGroup extends \Magento\Backend\Controller\Adminhtml\System\Store
-     {
-         $itemId = $this->getRequest()->getParam('item_id', null);
-         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Group::class)->load($itemId))) {
--            $this->messageManager->addError(__('Something went wrong. Please try again.'));
-+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
-             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
-             $redirectResult = $this->resultRedirectFactory->create();
-             return $redirectResult->setPath('adminhtml/*/');
-         }
-         if (!$model->isCanDelete()) {
--            $this->messageManager->addError(__('This store cannot be deleted.'));
-+            $this->messageManager->addErrorMessage(__('This store cannot be deleted.'));
-             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
-             $redirectResult = $this->resultRedirectFactory->create();
-             return $redirectResult->setPath('adminhtml/*/editGroup', ['group_id' => $itemId]);
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php
-index b6fbd88c766..49c327060da 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php
-@@ -1,16 +1,20 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Backend\Controller\Adminhtml\System\Store;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store
-+/**
-+ * Delete store.
-+ */
-+class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
- {
-     /**
-+     * @inheritDoc
-      * @return \Magento\Backend\Model\View\Result\Redirect
-      */
-     public function execute()
-@@ -21,11 +25,11 @@ class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store
-         $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
- 
-         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Group::class)->load($itemId))) {
--            $this->messageManager->addError(__('Something went wrong. Please try again.'));
-+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
-             return $redirectResult->setPath('adminhtml/*/');
-         }
-         if (!$model->isCanDelete()) {
--            $this->messageManager->addError(__('This store cannot be deleted.'));
-+            $this->messageManager->addErrorMessage(__('This store cannot be deleted.'));
-             return $redirectResult->setPath('adminhtml/*/editGroup', ['group_id' => $model->getId()]);
-         }
- 
-@@ -35,12 +39,12 @@ class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store
- 
-         try {
-             $model->delete();
--            $this->messageManager->addSuccess(__('You deleted the store.'));
-+            $this->messageManager->addSuccessMessage(__('You deleted the store.'));
-             return $redirectResult->setPath('adminhtml/*/');
-         } catch (\Magento\Framework\Exception\LocalizedException $e) {
--            $this->messageManager->addError($e->getMessage());
-+            $this->messageManager->addErrorMessage($e->getMessage());
-         } catch (\Exception $e) {
--            $this->messageManager->addException($e, __('Unable to delete the store. Please try again later.'));
-+            $this->messageManager->addExceptionMessage($e, __('Unable to delete the store. Please try again later.'));
-         }
-         return $redirectResult->setPath('adminhtml/*/editGroup', ['group_id' => $itemId]);
-     }
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
-index b31de6cacc5..c340b1ec53a 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
-@@ -15,13 +15,13 @@ class DeleteStore extends \Magento\Backend\Controller\Adminhtml\System\Store
-     {
-         $itemId = $this->getRequest()->getParam('item_id', null);
-         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Store::class)->load($itemId))) {
--            $this->messageManager->addError(__('Something went wrong. Please try again.'));
-+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
-             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
-             $redirectResult = $this->resultRedirectFactory->create();
-             return $redirectResult->setPath('adminhtml/*/');
-         }
-         if (!$model->isCanDelete()) {
--            $this->messageManager->addError(__('This store view cannot be deleted.'));
-+            $this->messageManager->addErrorMessage(__('This store view cannot be deleted.'));
-             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
-             $redirectResult = $this->resultRedirectFactory->create();
-             return $redirectResult->setPath('adminhtml/*/editStore', ['store_id' => $itemId]);
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php
-index 13b104c5ec4..7999012b435 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php
-@@ -1,14 +1,17 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Backend\Controller\Adminhtml\System\Store;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store
-+/**
-+ * Delete store view.
-+ */
-+class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
- {
-     /**
-      * Delete store view post action
-@@ -22,11 +25,11 @@ class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store
-         /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
-         $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Store::class)->load($itemId))) {
--            $this->messageManager->addError(__('Something went wrong. Please try again.'));
-+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
-             return $redirectResult->setPath('adminhtml/*/');
-         }
-         if (!$model->isCanDelete()) {
--            $this->messageManager->addError(__('This store view cannot be deleted.'));
-+            $this->messageManager->addErrorMessage(__('This store view cannot be deleted.'));
-             return $redirectResult->setPath('adminhtml/*/editStore', ['store_id' => $model->getId()]);
-         }
- 
-@@ -37,12 +40,13 @@ class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store
-         try {
-             $model->delete();
- 
--            $this->messageManager->addSuccess(__('You deleted the store view.'));
-+            $this->messageManager->addSuccessMessage(__('You deleted the store view.'));
-             return $redirectResult->setPath('adminhtml/*/');
-         } catch (\Magento\Framework\Exception\LocalizedException $e) {
--            $this->messageManager->addError($e->getMessage());
-+            $this->messageManager->addErrorMessage($e->getMessage());
-         } catch (\Exception $e) {
--            $this->messageManager->addException($e, __('Unable to delete the store view. Please try again later.'));
-+            $this->messageManager
-+                ->addExceptionMessage($e, __('Unable to delete the store view. Please try again later.'));
-         }
-         return $redirectResult->setPath('adminhtml/*/editStore', ['store_id' => $itemId]);
-     }
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php
-index 1f2ec4b2ba4..9e8664b8ecd 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\System\Store;
- 
--class DeleteWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class DeleteWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Framework\Controller\ResultInterface
-@@ -15,13 +17,13 @@ class DeleteWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store
-     {
-         $itemId = $this->getRequest()->getParam('item_id', null);
-         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Website::class)->load($itemId))) {
--            $this->messageManager->addError(__('Something went wrong. Please try again.'));
-+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
-             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
-             $redirectResult = $this->resultRedirectFactory->create();
-             return $redirectResult->setPath('adminhtml/*/');
-         }
-         if (!$model->isCanDelete()) {
--            $this->messageManager->addError(__('This website cannot be deleted.'));
-+            $this->messageManager->addErrorMessage(__('This website cannot be deleted.'));
-             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
-             $redirectResult = $this->resultRedirectFactory->create();
-             return $redirectResult->setPath('adminhtml/*/editWebsite', ['website_id' => $itemId]);
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php
-index c2d24b8c41a..3fee1a25c9f 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php
-@@ -6,11 +6,16 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\System\Store;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Store
-+/**
-+ * Delete website.
-+ */
-+class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
- {
-     /**
-+     * @inheritDoc
-      * @return \Magento\Backend\Model\View\Result\Redirect
-      */
-     public function execute()
-@@ -23,11 +28,11 @@ class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Sto
-         $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
- 
-         if (!$model) {
--            $this->messageManager->addError(__('Something went wrong. Please try again.'));
-+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
-             return $redirectResult->setPath('adminhtml/*/');
-         }
-         if (!$model->isCanDelete()) {
--            $this->messageManager->addError(__('This website cannot be deleted.'));
-+            $this->messageManager->addErrorMessage(__('This website cannot be deleted.'));
-             return $redirectResult->setPath('adminhtml/*/editWebsite', ['website_id' => $model->getId()]);
-         }
- 
-@@ -37,12 +42,12 @@ class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Sto
- 
-         try {
-             $model->delete();
--            $this->messageManager->addSuccess(__('You deleted the website.'));
-+            $this->messageManager->addSuccessMessage(__('You deleted the website.'));
-             return $redirectResult->setPath('adminhtml/*/');
-         } catch (\Magento\Framework\Exception\LocalizedException $e) {
--            $this->messageManager->addError($e->getMessage());
-+            $this->messageManager->addErrorMessage($e->getMessage());
-         } catch (\Exception $e) {
--            $this->messageManager->addException($e, __('Unable to delete the website. Please try again later.'));
-+            $this->messageManager->addExceptionMessage($e, __('Unable to delete the website. Please try again later.'));
-         }
-         return $redirectResult->setPath('*/*/editWebsite', ['website_id' => $itemId]);
-     }
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
-index cbc068a4808..e5cd43b521f 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\System\Store;
- 
--class EditStore extends \Magento\Backend\Controller\Adminhtml\System\Store
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class EditStore extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Framework\Controller\ResultInterface
-@@ -57,7 +59,7 @@ class EditStore extends \Magento\Backend\Controller\Adminhtml\System\Store
-         if ($model->getId() || $this->_coreRegistry->registry('store_action') == 'add') {
-             $this->_coreRegistry->register('store_data', $model);
-             if ($this->_coreRegistry->registry('store_action') == 'edit' && $codeBase && !$model->isReadOnly()) {
--                $this->messageManager->addNotice($codeBase);
-+                $this->messageManager->addNoticeMessage($codeBase);
-             }
-             $resultPage = $this->createPage();
-             if ($this->_coreRegistry->registry('store_action') == 'add') {
-@@ -71,7 +73,7 @@ class EditStore extends \Magento\Backend\Controller\Adminhtml\System\Store
-             ));
-             return $resultPage;
-         } else {
--            $this->messageManager->addError($notExists);
-+            $this->messageManager->addErrorMessage($notExists);
-             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-             $resultRedirect = $this->resultRedirectFactory->create();
-             return $resultRedirect->setPath('adminhtml/*/');
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php
-index bfdf7cdbeb8..74ed7951e62 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\System\Store;
- 
--class EditWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class EditWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Forward
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php
-index b104704f41b..54da065c4af 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php
-@@ -6,12 +6,13 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\System\Store;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
- /**
-  * Class Index returns Stores page
-  */
--class Index extends \Magento\Backend\Controller\Adminhtml\System\Store
-+class Index extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpGetActionInterface
- {
-     /**
-      * Returns Stores page
-diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
-index 8ca783f887e..b67f1f23f16 100644
---- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
-+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
-@@ -6,12 +6,14 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml\System\Store;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
- /**
-  * Class Save
-  *
-  * Save controller for system entities such as: Store, StoreGroup, Website
-  */
--class Save extends \Magento\Backend\Controller\Adminhtml\System\Store
-+class Save extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
- {
-     /**
-      * Process Website model save
-@@ -32,7 +34,7 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Store
-         }
- 
-         $websiteModel->save();
--        $this->messageManager->addSuccess(__('You saved the website.'));
-+        $this->messageManager->addSuccessMessage(__('You saved the website.'));
- 
-         return $postData;
-     }
-@@ -68,7 +70,7 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Store
-             );
-         }
-         $storeModel->save();
--        $this->messageManager->addSuccess(__('You saved the store view.'));
-+        $this->messageManager->addSuccessMessage(__('You saved the store view.'));
- 
-         return $postData;
-     }
-@@ -98,7 +100,7 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Store
-             );
-         }
-         $groupModel->save();
--        $this->messageManager->addSuccess(__('You saved the store.'));
-+        $this->messageManager->addSuccessMessage(__('You saved the store.'));
- 
-         return $postData;
-     }
-@@ -134,10 +136,10 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Store
-                 $redirectResult->setPath('adminhtml/*/');
-                 return $redirectResult;
-             } catch (\Magento\Framework\Exception\LocalizedException $e) {
--                $this->messageManager->addError($e->getMessage());
-+                $this->messageManager->addErrorMessage($e->getMessage());
-                 $this->_getSession()->setPostData($postData);
-             } catch (\Exception $e) {
--                $this->messageManager->addException(
-+                $this->messageManager->addExceptionMessage(
-                     $e,
-                     __('Something went wrong while saving. Please review the error log.')
-                 );
-diff --git a/app/code/Magento/Backend/Model/AdminPathConfig.php b/app/code/Magento/Backend/Model/AdminPathConfig.php
-index e7338adca4a..0e77835a513 100644
---- a/app/code/Magento/Backend/Model/AdminPathConfig.php
-+++ b/app/code/Magento/Backend/Model/AdminPathConfig.php
-@@ -48,10 +48,7 @@ class AdminPathConfig implements PathConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
--     *
--     * @param \Magento\Framework\App\RequestInterface $request
--     * @return string
-+     * @inheritdoc
-      */
-     public function getCurrentSecureUrl(\Magento\Framework\App\RequestInterface $request)
-     {
-@@ -59,28 +56,29 @@ class AdminPathConfig implements PathConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
--     *
--     * @param string $path
--     * @return bool
-+     * @inheritdoc
-      */
-     public function shouldBeSecure($path)
-     {
--        return parse_url(
--            (string)$this->coreConfig->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default'),
--            PHP_URL_SCHEME
--        ) === 'https'
--        || $this->backendConfig->isSetFlag(Store::XML_PATH_SECURE_IN_ADMINHTML)
--        && parse_url(
--            (string)$this->coreConfig->getValue(Store::XML_PATH_SECURE_BASE_URL, 'default'),
--            PHP_URL_SCHEME
--        ) === 'https';
-+        $baseUrl = (string)$this->coreConfig->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
-+        if (parse_url($baseUrl, PHP_URL_SCHEME) === 'https') {
-+            return true;
-+        }
-+
-+        if ($this->backendConfig->isSetFlag(Store::XML_PATH_SECURE_IN_ADMINHTML)) {
-+            if ($this->backendConfig->isSetFlag('admin/url/use_custom')) {
-+                $adminBaseUrl = (string)$this->coreConfig->getValue('admin/url/custom', 'default');
-+            } else {
-+                $adminBaseUrl = (string)$this->coreConfig->getValue(Store::XML_PATH_SECURE_BASE_URL, 'default');
-+            }
-+            return parse_url($adminBaseUrl, PHP_URL_SCHEME) === 'https';
-+        }
-+
-+        return false;
-     }
- 
-     /**
--     * {@inheritdoc}
--     *
--     * @return string
-+     * @inheritdoc
-      */
-     public function getDefaultPath()
-     {
-diff --git a/app/code/Magento/Backend/Model/Auth/Session.php b/app/code/Magento/Backend/Model/Auth/Session.php
-index 593b4219d45..61db71c1803 100644
---- a/app/code/Magento/Backend/Model/Auth/Session.php
-+++ b/app/code/Magento/Backend/Model/Auth/Session.php
-@@ -5,21 +5,25 @@
-  */
- namespace Magento\Backend\Model\Auth;
- 
-+use Magento\Framework\Acl;
-+use Magento\Framework\AclFactory;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
- use Magento\Framework\Stdlib\CookieManagerInterface;
-+use Magento\Backend\Spi\SessionUserHydratorInterface;
-+use Magento\Backend\Spi\SessionAclHydratorInterface;
-+use Magento\User\Model\User;
-+use Magento\User\Model\UserFactory;
- 
- /**
-  * Backend Auth session model
-  *
-  * @api
-- * @method \Magento\User\Model\User|null getUser()
-- * @method \Magento\Backend\Model\Auth\Session setUser(\Magento\User\Model\User $value)
-- * @method \Magento\Framework\Acl|null getAcl()
-- * @method \Magento\Backend\Model\Auth\Session setAcl(\Magento\Framework\Acl $value)
-  * @method int getUpdatedAt()
-  * @method \Magento\Backend\Model\Auth\Session setUpdatedAt(int $value)
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @todo implement solution that keeps is_first_visit flag in session during redirects
-  * @api
-  * @since 100.0.2
-@@ -55,6 +59,36 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
-      */
-     protected $_config;
- 
-+    /**
-+     * @var SessionUserHydratorInterface
-+     */
-+    private $userHydrator;
-+
-+    /**
-+     * @var SessionAclHydratorInterface
-+     */
-+    private $aclHydrator;
-+
-+    /**
-+     * @var UserFactory
-+     */
-+    private $userFactory;
-+
-+    /**
-+     * @var AclFactory
-+     */
-+    private $aclFactory;
-+
-+    /**
-+     * @var User|null
-+     */
-+    private $user;
-+
-+    /**
-+     * @var Acl|null
-+     */
-+    private $acl;
-+
-     /**
-      * @param \Magento\Framework\App\Request\Http $request
-      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
-@@ -69,6 +103,10 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
-      * @param \Magento\Backend\Model\UrlInterface $backendUrl
-      * @param \Magento\Backend\App\ConfigInterface $config
-      * @throws \Magento\Framework\Exception\SessionException
-+     * @param SessionUserHydratorInterface|null $userHydrator
-+     * @param SessionAclHydratorInterface|null $aclHydrator
-+     * @param UserFactory|null $userFactory
-+     * @param AclFactory|null $aclFactory
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -83,11 +121,19 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
-         \Magento\Framework\App\State $appState,
-         \Magento\Framework\Acl\Builder $aclBuilder,
-         \Magento\Backend\Model\UrlInterface $backendUrl,
--        \Magento\Backend\App\ConfigInterface $config
-+        \Magento\Backend\App\ConfigInterface $config,
-+        ?SessionUserHydratorInterface $userHydrator = null,
-+        ?SessionAclHydratorInterface $aclHydrator = null,
-+        ?UserFactory $userFactory = null,
-+        ?AclFactory $aclFactory = null
-     ) {
-         $this->_config = $config;
-         $this->_aclBuilder = $aclBuilder;
-         $this->_backendUrl = $backendUrl;
-+        $this->userHydrator = $userHydrator ?? ObjectManager::getInstance()->get(SessionUserHydratorInterface::class);
-+        $this->aclHydrator = $aclHydrator ?? ObjectManager::getInstance()->get(SessionAclHydratorInterface::class);
-+        $this->userFactory = $userFactory ?? ObjectManager::getInstance()->get(UserFactory::class);
-+        $this->aclFactory = $aclFactory ?? ObjectManager::getInstance()->get(AclFactory::class);
-         parent::__construct(
-             $request,
-             $sidResolver,
-@@ -230,6 +276,16 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
-         return $this;
-     }
- 
-+    /**
-+     * @inheritDoc
-+     */
-+    public function destroy(array $options = null)
-+    {
-+        $this->user = null;
-+        $this->acl = null;
-+        parent::destroy($options);
-+    }
-+
-     /**
-      * Process of configuring of current auth storage when logout was performed
-      *
-@@ -253,4 +309,136 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
-     {
-         return true;
-     }
-+
-+    /**
-+     * Logged-in user.
-+     *
-+     * @return User|null
-+     */
-+    public function getUser()
-+    {
-+        if (!$this->user) {
-+            $userData = $this->getUserData();
-+            if ($userData) {
-+                /** @var User $user */
-+                $user = $this->userFactory->create();
-+                $this->userHydrator->hydrate($user, $userData);
-+                $this->user = $user;
-+            }
-+        }
-+
-+        return $this->user;
-+    }
-+
-+    /**
-+     * Set logged-in user instance.
-+     *
-+     * @param User|null $user
-+     * @return Session
-+     */
-+    public function setUser($user)
-+    {
-+        $this->setUserData(null);
-+        if ($user) {
-+            $this->setUserData($this->userHydrator->extract($user));
-+        }
-+        $this->user = $user;
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * Is user logged in?
-+     *
-+     * @return bool
-+     */
-+    public function hasUser()
-+    {
-+        return $this->user || $this->hasUserData();
-+    }
-+
-+    /**
-+     * Remove logged-in user.
-+     *
-+     * @return Session
-+     */
-+    public function unsUser()
-+    {
-+        $this->user = null;
-+        return $this->unsUserData();
-+    }
-+
-+    /**
-+     * Logged-in user's ACL data.
-+     *
-+     * @return Acl|null
-+     */
-+    public function getAcl()
-+    {
-+        if (!$this->acl) {
-+            $aclData = $this->getUserAclData();
-+            if ($aclData) {
-+                /** @var Acl $acl */
-+                $acl = $this->aclFactory->create();
-+                $this->aclHydrator->hydrate($acl, $aclData);
-+                $this->acl = $acl;
-+            }
-+        }
-+
-+        return $this->acl;
-+    }
-+
-+    /**
-+     * Set logged-in user's ACL data instance.
-+     *
-+     * @param Acl|null $acl
-+     * @return Session
-+     */
-+    public function setAcl($acl)
-+    {
-+        $this->setUserAclData(null);
-+        if ($acl) {
-+            $this->setUserAclData($this->aclHydrator->extract($acl));
-+        }
-+        $this->acl = $acl;
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * Whether ACL data is present.
-+     *
-+     * @return bool
-+     */
-+    public function hasAcl()
-+    {
-+        return $this->acl || $this->hasUserAclData();
-+    }
-+
-+    /**
-+     * Remove ACL data.
-+     *
-+     * @return Session
-+     */
-+    public function unsAcl()
-+    {
-+        $this->acl = null;
-+        return $this->unsUserAclData();
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function writeClose()
-+    {
-+        //Updating data in session in case these objects has been changed.
-+        if ($this->user) {
-+            $this->setUser($this->user);
-+        }
-+        if ($this->acl) {
-+            $this->setAcl($this->acl);
-+        }
-+
-+        parent::writeClose();
-+    }
- }
-diff --git a/app/code/Magento/Backend/Model/Auth/SessionAclHydrator.php b/app/code/Magento/Backend/Model/Auth/SessionAclHydrator.php
-new file mode 100644
-index 00000000000..34e01be6966
---- /dev/null
-+++ b/app/code/Magento/Backend/Model/Auth/SessionAclHydrator.php
-@@ -0,0 +1,36 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Backend\Model\Auth;
-+
-+use Magento\Backend\Spi\SessionAclHydratorInterface;
-+use Magento\Framework\Acl;
-+
-+/**
-+ * @inheritDoc
-+ */
-+class SessionAclHydrator extends Acl implements SessionAclHydratorInterface
-+{
-+    /**
-+     * @inheritDoc
-+     */
-+    public function extract(Acl $acl): array
-+    {
-+        return ['rules' => $acl->_rules, 'resources' => $acl->_resources, 'roles' => $acl->_roleRegistry];
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function hydrate(Acl $target, array $data): void
-+    {
-+        $target->_rules = $data['rules'];
-+        $target->_resources = $data['resources'];
-+        $target->_roleRegistry = $data['roles'];
-+    }
-+}
-diff --git a/app/code/Magento/Backend/Model/Auth/SessionUserHydrator.php b/app/code/Magento/Backend/Model/Auth/SessionUserHydrator.php
-new file mode 100644
-index 00000000000..6dee8b7b302
---- /dev/null
-+++ b/app/code/Magento/Backend/Model/Auth/SessionUserHydrator.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Backend\Model\Auth;
-+
-+use Magento\Backend\Spi\SessionUserHydratorInterface;
-+use Magento\User\Model\User;
-+use Magento\Authorization\Model\Role;
-+use Magento\Authorization\Model\RoleFactory;
-+
-+/**
-+ * @inheritDoc
-+ */
-+class SessionUserHydrator implements SessionUserHydratorInterface
-+{
-+    /**
-+     * @var RoleFactory
-+     */
-+    private $roleFactory;
-+
-+    /**
-+     * @param RoleFactory $roleFactory
-+     */
-+    public function __construct(RoleFactory $roleFactory)
-+    {
-+        $this->roleFactory = $roleFactory;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function extract(User $user): array
-+    {
-+        return ['data' => $user->getData(), 'role_data' => $user->getRole()->getData()];
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function hydrate(User $target, array $data): void
-+    {
-+        $target->setData($data['data']);
-+        /** @var Role $role */
-+        $role = $this->roleFactory->create();
-+        $role->setData($data['role_data']);
-+        $target->setData('extracted_role', $role);
-+        $target->getRole();
-+    }
-+}
-diff --git a/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php b/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php
-index c106afb90a0..f6d08883d7a 100644
---- a/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php
-+++ b/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php
-@@ -16,14 +16,17 @@ use Magento\Framework\Exception\LocalizedException;
-  */
- class BackendModel extends Value
- {
--    /** Maximum dmin session lifetime; 1 year*/
-+    /** Maximum admin session lifetime; 1 year*/
-     const MAX_LIFETIME = 31536000;
- 
-     /** Minimum admin session lifetime */
-     const MIN_LIFETIME = 60;
- 
-     /**
-+     * Processing object before save data
-+     *
-      * @since 100.1.0
-+     * @throws LocalizedException
-      */
-     public function beforeSave()
-     {
-diff --git a/app/code/Magento/Backend/Model/Image/UploadResizeConfig.php b/app/code/Magento/Backend/Model/Image/UploadResizeConfig.php
-new file mode 100644
-index 00000000000..8155aa5e2fe
---- /dev/null
-+++ b/app/code/Magento/Backend/Model/Image/UploadResizeConfig.php
-@@ -0,0 +1,72 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Backend\Model\Image;
-+
-+/**
-+ * Image uploader config provider.
-+ */
-+class UploadResizeConfig implements UploadResizeConfigInterface
-+{
-+    /**
-+     * Config path for the maximal image width value
-+     */
-+    const XML_PATH_MAX_WIDTH_IMAGE = 'system/upload_configuration/max_width';
-+
-+    /**
-+     * Config path for the maximal image height value
-+     */
-+    const XML_PATH_MAX_HEIGHT_IMAGE = 'system/upload_configuration/max_height';
-+
-+    /**
-+     * Config path for the maximal image height value
-+     */
-+    const XML_PATH_ENABLE_RESIZE = 'system/upload_configuration/enable_resize';
-+
-+    /**
-+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-+     */
-+    private $config;
-+
-+    /**
-+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-+     */
-+    public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $config)
-+    {
-+        $this->config = $config;
-+    }
-+
-+    /**
-+     * Get maximal width value for resized image
-+     *
-+     * @return int
-+     */
-+    public function getMaxWidth(): int
-+    {
-+        return (int)$this->config->getValue(self::XML_PATH_MAX_WIDTH_IMAGE);
-+    }
-+
-+    /**
-+     * Get maximal height value for resized image
-+     *
-+     * @return int
-+     */
-+    public function getMaxHeight(): int
-+    {
-+        return (int)$this->config->getValue(self::XML_PATH_MAX_HEIGHT_IMAGE);
-+    }
-+
-+    /**
-+     * Get config value for frontend resize
-+     *
-+     * @return bool
-+     */
-+    public function isResizeEnabled(): bool
-+    {
-+        return (bool)$this->config->getValue(self::XML_PATH_ENABLE_RESIZE);
-+    }
-+}
-diff --git a/app/code/Magento/Backend/Model/Image/UploadResizeConfigInterface.php b/app/code/Magento/Backend/Model/Image/UploadResizeConfigInterface.php
-new file mode 100644
-index 00000000000..50582dfafbc
---- /dev/null
-+++ b/app/code/Magento/Backend/Model/Image/UploadResizeConfigInterface.php
-@@ -0,0 +1,37 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Backend\Model\Image;
-+
-+/**
-+ * Interface UploadResizeConfigInterface
-+ *
-+ * Used to retrieve configuration for frontend image uploader
-+ */
-+interface UploadResizeConfigInterface
-+{
-+    /**
-+     * Get maximal width value for resized image
-+     *
-+     * @return int
-+     */
-+    public function getMaxWidth(): int;
-+
-+    /**
-+     * Get maximal height value for resized image
-+     *
-+     * @return int
-+     */
-+    public function getMaxHeight(): int;
-+
-+    /**
-+     * Get config value for frontend resize
-+     *
-+     * @return bool
-+     */
-+    public function isResizeEnabled(): bool;
-+}
-diff --git a/app/code/Magento/Backend/Model/Menu.php b/app/code/Magento/Backend/Model/Menu.php
-index 22110cf52de..0246346ec4d 100644
---- a/app/code/Magento/Backend/Model/Menu.php
-+++ b/app/code/Magento/Backend/Model/Menu.php
-@@ -83,7 +83,7 @@ class Menu extends \ArrayObject
-             }
-             $parentItem->getChildren()->add($item, null, $index);
-         } else {
--            $index = intval($index);
-+            $index = (int) $index;
-             if (!isset($this[$index])) {
-                 $this->offsetSet($index, $item);
-                 $this->_logger->info(
-diff --git a/app/code/Magento/Backend/Model/Menu/Builder.php b/app/code/Magento/Backend/Model/Menu/Builder.php
-index ae572deab53..1c6e900bc5c 100644
---- a/app/code/Magento/Backend/Model/Menu/Builder.php
-+++ b/app/code/Magento/Backend/Model/Menu/Builder.php
-@@ -102,6 +102,6 @@ class Builder
-      */
-     protected function _getParam($params, $paramName, $defaultValue = null)
-     {
--        return isset($params[$paramName]) ? $params[$paramName] : $defaultValue;
-+        return $params[$paramName] ?? $defaultValue;
-     }
- }
-diff --git a/app/code/Magento/Backend/Model/Menu/Item.php b/app/code/Magento/Backend/Model/Menu/Item.php
-index 67c6216cbbc..d535e9c84df 100644
---- a/app/code/Magento/Backend/Model/Menu/Item.php
-+++ b/app/code/Magento/Backend/Model/Menu/Item.php
-@@ -145,7 +145,7 @@ class Item
-     protected $_moduleList;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     private $_moduleManager;
- 
-@@ -163,7 +163,7 @@ class Item
-      * @param \Magento\Backend\Model\MenuFactory $menuFactory
-      * @param \Magento\Backend\Model\UrlInterface $urlModel
-      * @param \Magento\Framework\Module\ModuleListInterface $moduleList
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param array $data
-      */
-     public function __construct(
-@@ -173,7 +173,7 @@ class Item
-         \Magento\Backend\Model\MenuFactory $menuFactory,
-         \Magento\Backend\Model\UrlInterface $urlModel,
-         \Magento\Framework\Module\ModuleListInterface $moduleList,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         array $data = []
-     ) {
-         $this->_validator = $validator;
-diff --git a/app/code/Magento/Backend/Model/Search/Customer.php b/app/code/Magento/Backend/Model/Search/Customer.php
-index 35a7359ce99..e76a1b77ab2 100644
---- a/app/code/Magento/Backend/Model/Search/Customer.php
-+++ b/app/code/Magento/Backend/Model/Search/Customer.php
-@@ -89,7 +89,7 @@ class Customer extends \Magento\Framework\DataObject
- 
-         $this->searchCriteriaBuilder->setCurrentPage($this->getStart());
-         $this->searchCriteriaBuilder->setPageSize($this->getLimit());
--        $searchFields = ['firstname', 'lastname', 'company'];
-+        $searchFields = ['firstname', 'lastname', 'billing_company'];
-         $filters = [];
-         foreach ($searchFields as $field) {
-             $filters[] = $this->filterBuilder
-diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php
-index 11edaa26f44..ed031287456 100644
---- a/app/code/Magento/Backend/Model/Session/Quote.php
-+++ b/app/code/Magento/Backend/Model/Session/Quote.php
-@@ -24,6 +24,7 @@ use Magento\Customer\Api\GroupManagementInterface;
-  * @method Quote setOrderId($orderId)
-  * @method int getOrderId()
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @since 100.0.2
-  */
- class Quote extends \Magento\Framework\Session\SessionManager
-@@ -149,7 +150,8 @@ class Quote extends \Magento\Framework\Session\SessionManager
-             $this->_quote = $this->quoteFactory->create();
-             if ($this->getStoreId()) {
-                 if (!$this->getQuoteId()) {
--                    $this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId());
-+                    $customerGroupId = $this->groupManagement->getDefaultGroup($this->getStoreId())->getId();
-+                    $this->_quote->setCustomerGroupId($customerGroupId);
-                     $this->_quote->setIsActive(false);
-                     $this->_quote->setStoreId($this->getStoreId());
-                     
-diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php
-index f199fd0fe7b..ba0c3d1cfac 100644
---- a/app/code/Magento/Backend/Model/Url.php
-+++ b/app/code/Magento/Backend/Model/Url.php
-@@ -13,6 +13,7 @@ use Magento\Framework\App\ObjectManager;
-  * Class \Magento\Backend\Model\UrlInterface
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @api
-  * @since 100.0.2
-  */
-@@ -366,6 +367,19 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
-         return $this->_menu;
-     }
- 
-+    /**
-+     * Set scope entity
-+     *
-+     * @param mixed $scopeId
-+     * @return \Magento\Framework\UrlInterface
-+     */
-+    public function setScope($scopeId)
-+    {
-+        parent::setScope($scopeId);
-+        $this->_scope = $this->_scopeResolver->getScope($scopeId);
-+        return $this;
-+    }
-+
-     /**
-      * Set custom auth session
-      *
-@@ -402,13 +416,13 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
-     }
- 
-     /**
--     * Retrieve action path.
--     * Add backend area front name as a prefix to action path
-+     * Retrieve action path, add backend area front name as a prefix to action path
-      *
-      * @return string
-      */
-     protected function _getActionPath()
-     {
-+
-         $path = parent::_getActionPath();
-         if ($path) {
-             if ($this->getAreaFrontName()) {
-@@ -448,8 +462,7 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
-     }
- 
-     /**
--     * Get config data by path
--     * Use only global config values for backend
-+     * Get config data by path, use only global config values for backend
-      *
-      * @param string $path
-      * @return null|string
-diff --git a/app/code/Magento/Backend/Spi/SessionAclHydratorInterface.php b/app/code/Magento/Backend/Spi/SessionAclHydratorInterface.php
-new file mode 100644
-index 00000000000..7227cc92fcc
---- /dev/null
-+++ b/app/code/Magento/Backend/Spi/SessionAclHydratorInterface.php
-@@ -0,0 +1,34 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Backend\Spi;
-+
-+use Magento\Framework\Acl;
-+
-+/**
-+ * Extract/hydrate user's ACL data to/from session.
-+ */
-+interface SessionAclHydratorInterface
-+{
-+    /**
-+     * Extract ACL data to store in session.
-+     *
-+     * @param Acl $acl
-+     * @return array Array of scalars.
-+     */
-+    public function extract(Acl $acl): array;
-+
-+    /**
-+     * Fill ACL object with data from session.
-+     *
-+     * @param Acl $target
-+     * @param array $data Data from session.
-+     * @return void
-+     */
-+    public function hydrate(Acl $target, array $data): void;
-+}
-diff --git a/app/code/Magento/Backend/Spi/SessionUserHydratorInterface.php b/app/code/Magento/Backend/Spi/SessionUserHydratorInterface.php
-new file mode 100644
-index 00000000000..211c7b01df3
---- /dev/null
-+++ b/app/code/Magento/Backend/Spi/SessionUserHydratorInterface.php
-@@ -0,0 +1,34 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Backend\Spi;
-+
-+use Magento\User\Model\User;
-+
-+/**
-+ * Extract/hydrate user data to/from session.
-+ */
-+interface SessionUserHydratorInterface
-+{
-+    /**
-+     * Extract user data to store in session.
-+     *
-+     * @param User $user
-+     * @return array Array of scalars.
-+     */
-+    public function extract(User $user): array;
-+
-+    /**
-+     * Fill User object with data from session.
-+     *
-+     * @param User $target
-+     * @param array $data Data from session.
-+     * @return void
-+     */
-+    public function hydrate(User $target, array $data): void;
-+}
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAssertPageTitleActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAssertPageTitleActionGroup.xml
-new file mode 100644
-index 00000000000..42ffb4b7421
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAssertPageTitleActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAssertPageTitleActionGroup">
-+        <arguments>
-+            <argument name="title" type="string"/>
-+        </arguments>
-+        <see selector="{{AdminGridHeaders.title}}" userInput="{{title}}" stepKey="assertPageTitle"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml
-new file mode 100644
-index 00000000000..8e0f5a06761
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminNavigateMenuActionGroup">
-+        <arguments>
-+            <argument name="menuUiId" type="string"/>
-+            <argument name="submenuUiId" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminMenuSection.menuItem(menuUiId)}}" stepKey="clickOnMenuItem"/>
-+        <click selector="{{AdminMenuSection.menuItem(submenuUiId)}}" stepKey="clickOnSubmenuItem"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminDashboardPageIsVisibleActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminDashboardPageIsVisibleActionGroup.xml
-new file mode 100644
-index 00000000000..1c86a736ac2
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminDashboardPageIsVisibleActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertAdminDashboardPageIsVisibleActionGroup">
-+        <seeInCurrentUrl url="{{AdminDashboardPage.url}}" stepKey="seeDashboardUrl"/>
-+        <see userInput="Dashboard" selector="{{AdminHeaderSection.pageTitle}}" stepKey="seeDashboardTitle"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminPageIsNot404ActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminPageIsNot404ActionGroup.xml
-new file mode 100644
-index 00000000000..eaf7c7cd8a6
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminPageIsNot404ActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertAdminPageIsNot404ActionGroup">
-+        <dontSee userInput="404 Error" selector="{{AdminHeaderSection.pageHeading}}" stepKey="dontSee404PageHeading"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminSuccessLoginActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminSuccessLoginActionGroup.xml
-new file mode 100644
-index 00000000000..844f58c789a
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminSuccessLoginActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertAdminSuccessLoginActionGroup">
-+        <waitForElementVisible selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="waitForAdminAccountTextVisible" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageInAdminPanelActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageInAdminPanelActionGroup.xml
-new file mode 100644
-index 00000000000..23823ea085a
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageInAdminPanelActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertMessageInAdminPanelActionGroup">
-+        <arguments>
-+            <argument name="message" type="string" />
-+            <argument name="messageType" type="string" defaultValue="success" />
-+        </arguments>
-+
-+        <waitForElementVisible selector="{{AdminMessagesSection.messageByType(messageType)}}" stepKey="waitForMessageVisible" />
-+        <see userInput="{{message}}" selector="{{AdminMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageOnAdminLoginActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageOnAdminLoginActionGroup.xml
-new file mode 100644
-index 00000000000..607fba3736c
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageOnAdminLoginActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertMessageOnAdminLoginActionGroup">
-+        <arguments>
-+            <argument name="message" type="string" defaultValue="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." />
-+            <argument name="messageType" type="string" defaultValue="error" />
-+        </arguments>
-+
-+        <waitForElementVisible selector="{{AdminLoginMessagesSection.messageByType(messageType)}}" stepKey="waitForAdminLoginFormMessage" />
-+        <see userInput="{{message}}" selector="{{AdminLoginMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertOrderGraphImageOnDashboardActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertOrderGraphImageOnDashboardActionGroup.xml
-new file mode 100644
-index 00000000000..3e3b0bc6a8a
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertOrderGraphImageOnDashboardActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertOrderGraphImageOnDashboardActionGroup">
-+        <click selector="{{AdminDashboardSection.ordersTab}}" stepKey="clickOrdersBtn"/>
-+        <seeElement selector="{{AdminDashboardSection.ordersChart}}" stepKey="seeGraphImage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginActionGroup.xml
-index bcff329d79d..9ba4430bafe 100644
---- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginActionGroup.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="LoginActionGroup">
-         <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}" stepKey="navigateToAdmin"/>
-         <fillField userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" selector="{{AdminLoginFormSection.username}}" stepKey="fillUsername"/>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.xml
-new file mode 100644
-index 00000000000..6aaa612b249
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="LoginAdminWithCredentialsActionGroup">
-+        <arguments>
-+            <argument name="adminUser" type="string" />
-+            <argument name="adminPassword" type="string" />
-+        </arguments>
-+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}" stepKey="navigateToAdmin"/>
-+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser}}" stepKey="fillUsername"/>
-+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminPassword}}" stepKey="fillPassword"/>
-+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
-+        <closeAdminNotification stepKey="closeAdminNotification"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
-index 8a24ab2a2f1..b2fbadcbe38 100644
---- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
-@@ -7,16 +7,15 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="LoginAsAdmin">
-         <arguments>
--            <argument name="adminUser" defaultValue="_ENV"/>
-+            <argument name="adminUser" type="entity" defaultValue="DefaultAdminUser"/>
-         </arguments>
-         <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
--        <waitForPageLoad stepKey="waitForAdminLoginPageLoad"/>
--        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
--        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminUser.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
-+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser.username}}" stepKey="fillUsername"/>
-+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminUser.password}}" stepKey="fillPassword"/>
-         <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
-         <closeAdminNotification stepKey="closeAdminNotification"/>
-     </actionGroup>
--</actionGroups>
-\ No newline at end of file
-+</actionGroups>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LogoutActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LogoutActionGroup.xml
-index cdaf231e9dd..a4d922086df 100644
---- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LogoutActionGroup.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LogoutActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="logout">
-         <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-     </actionGroup>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml
-index 9fe5f54f1db..6f27b03e4df 100644
---- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Action group to delete an item given that items name -->
-     <!-- Must already be on the admin page containing the grid -->
-     <actionGroup name="deleteEntitySecondaryGrid">
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml
-new file mode 100644
-index 00000000000..a0492ac9b95
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="SetAdminAccountActionGroup">
-+        <arguments>
-+            <argument name="InterfaceLocaleByValue" defaultValue="en_US" type="string"/>
-+        </arguments>
-+        <!-- Navigate to admin System Account Page-->
-+        <amOnPage url="{{AdminSystemAccountPage.url}}" stepKey="openAdminSystemAccountPage" />
-+        <waitForElementVisible selector="{{AdminSystemAccountSection.interfaceLocale}}" stepKey="waitForInterfaceLocale"/>
-+        <!-- Change Admin locale to Français (France) / French (France) -->
-+        <selectOption userInput="{{InterfaceLocaleByValue}}" selector="{{AdminSystemAccountSection.interfaceLocale}}" stepKey="setInterfaceLocate"/>
-+        <fillField selector="{{AdminSystemAccountSection.currentPassword}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
-+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitSuccessMessage"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the account." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetWebsiteCountryOptionsToDefaultActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetWebsiteCountryOptionsToDefaultActionGroup.xml
-new file mode 100644
-index 00000000000..4519648eb1d
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetWebsiteCountryOptionsToDefaultActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="SetWebsiteCountryOptionsToDefaultActionGroup">
-+        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation3"/>
-+        <waitForElementVisible selector="{{CountryOptionsSection.topDestinations}}" stepKey="waitCheckboxToBeVisible3"/>
-+        <checkOption selector="{{CountryOptionsSection.generalCountryAllowInherit}}" stepKey="setToDefault1"/>
-+        <checkOption selector="{{CountryOptionsSection.generalCountryDefaultInherit}}" stepKey="setToDefault2"/>
-+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveDefaultConfig"/>
-+        <waitForPageLoad stepKey="waitForSavingSystemConfiguration"/>
-+        <see userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml
-index b7b63c5d9a6..fd353964bae 100644
---- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="SortByIdDescendingActionGroup">
-         <conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="clickToAttemptSortByIdDescending" visible="true"/>
-         <waitForLoadingMaskToDisappear stepKey="waitForFirstIdSortDescendingToFinish" />
-diff --git a/app/code/Magento/Backend/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Backend/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..4fe600d194e
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,46 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuContent">
-+        <data key="pageTitle">Content</data>
-+        <data key="title">Content</data>
-+        <data key="dataUiId">magento-backend-content</data>
-+    </entity>
-+    <entity name="AdminMenuContentDesignSchedule">
-+        <data key="pageTitle">Store Design Schedule</data>
-+        <data key="title">Schedule</data>
-+        <data key="dataUiId">magento-backend-system-design-schedule</data>
-+    </entity>
-+    <entity name="AdminMenuDashboard">
-+        <data key="pageTitle">Dashboard</data>
-+        <data key="title">Dashboard</data>
-+        <data key="dataUiId">magento-backend-dashboard</data>
-+    </entity>
-+    <entity name="AdminMenuStores">
-+        <data key="pageTitle">Stores</data>
-+        <data key="title">Stores</data>
-+        <data key="dataUiId">magento-backend-stores</data>
-+    </entity>
-+    <entity name="AdminMenuStoresSettingsAllStores">
-+        <data key="pageTitle">Stores</data>
-+        <data key="title">All Stores</data>
-+        <data key="dataUiId">magento-backend-system-store</data>
-+    </entity>
-+    <entity name="AdminMenuStoresSettingsConfiguration">
-+        <data key="pageTitle">Configuration</data>
-+        <data key="title">Configuration</data>
-+        <data key="dataUiId">magento-config-system-config</data>
-+    </entity>
-+    <entity name="AdminMenuSystemToolsCacheManagement">
-+        <data key="pageTitle">Cache Management</data>
-+        <data key="title">Cache Management</data>
-+        <data key="dataUiId">magento-backend-system-cache</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Data/BackenedData.xml b/app/code/Magento/Backend/Test/Mftf/Data/BackenedData.xml
-index 286685315a7..016e936977c 100644
---- a/app/code/Magento/Backend/Test/Mftf/Data/BackenedData.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/Data/BackenedData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="backendDataOne" type="backend">
-         <data key="backendConfigName">data</data>
-     </entity>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Data/CookieConfigData.xml b/app/code/Magento/Backend/Test/Mftf/Data/CookieConfigData.xml
-new file mode 100644
-index 00000000000..52a6c27a37e
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Data/CookieConfigData.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="ChangedCookieDomainForMainWebsiteConfigData">
-+        <data key="path">web/cookie/cookie_domain</data>
-+        <data key="scope">website</data>
-+        <data key="scope_code">base</data>
-+        <data key="value">testDomain.com</data>
-+    </entity>
-+    <entity name="EmptyCookieDomainForMainWebsiteConfigData">
-+        <data key="path">web/cookie/cookie_domain</data>
-+        <data key="scope">website</data>
-+        <data key="scope_code">base</data>
-+        <data key="value">''</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
-index a53938d5346..8afc2c5bbb3 100644
---- a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
-@@ -7,11 +7,14 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="ConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
-         <section name="WYSIWYGOptionsSection"/>
-     </page>
-     <page name="WebConfigurationPage" url="admin/system_config/edit/section/web/" area="admin" module="Backend">
-         <section name="WYSIWYGOptionsSection"/>
-     </page>
-+    <page name="GeneralConfigurationPage" url="admin/system_config/edit/section/general/" area="admin" module="Backend">
-+        <section name="LocaleOptionsSection"/>
-+    </page>
- </pages>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml
-new file mode 100644
-index 00000000000..0e95d5c139a
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminDashboardPage" url="admin/dashboard/" area="admin" module="Magento_Backend">
-+        <section name="AdminMenuSection"/>
-+        <section name="AdminDashboardSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminForgotPasswordPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminForgotPasswordPage.xml
-new file mode 100644
-index 00000000000..84af56d102d
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminForgotPasswordPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminForgotPasswordPage" url="admin/auth/forgotpassword/" area="admin" module="Magento_Backend">
-+        <section name="AdminForgotPasswordFormSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml
-index ca0797f7ded..78226d79273 100644
---- a/app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml
-@@ -7,8 +7,9 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminLoginPage" url="admin" area="admin" module="Magento_Backend">
-+        <section name="AdminLoginMessagesSection"/>
-         <section name="AdminLoginFormSection"/>
-     </page>
- </pages>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml
-index 75ef114ec64..713199771e8 100644
---- a/app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml
-@@ -7,6 +7,6 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminLogoutPage" url="admin/auth/logout/" area="admin" module="Magento_Backend"/>
- </pages>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.xml
-new file mode 100644
-index 00000000000..2f04c2c11d2
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminSystemAccountPage" url="admin/system_account/index/" area="admin" module="Magento_Backend">
-+        <section name="AdminSystemAccountSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
-index dc512e66528..2ec25da4619 100644
---- a/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminConfirmationModalSection">
-         <element name="title" type="text" selector="aside.confirm .modal-title"/>
-         <element name="message" type="text" selector="aside.confirm .modal-content"/>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminDashboardSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminDashboardSection.xml
-new file mode 100644
-index 00000000000..61fe7ffa48e
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminDashboardSection.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminDashboardSection">
-+        <element name="ordersTab" type="button" selector="#diagram_tab_orders"/>
-+        <element name="ordersChart" type="button" selector="#diagram_tab_orders_content .dashboard-diagram-image img"/>
-+        <element name="dashboardDiagramContent" type="button" selector="#diagram_tab_content"/>
-+        <element name="dashboardDiagramOrderContentTab" type="block" selector="#diagram_tab_orders_content"/>
-+        <element name="dashboardDiagramAmounts" type="button" selector="#diagram_tab_amounts"/>
-+        <element name="dashboardDiagramAmountsContentTab" type="block" selector="#diagram_tab_amounts_content"/>
-+        <element name="dashboardDiagramTotals" type="text" selector="#diagram_tab_amounts_content"/>
-+        <element name="dashboardTotals" type="text" selector="//*[@class='dashboard-totals-label' and contains(text(), '{{columnName}}')]/../*[@class='dashboard-totals-value']" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminForgotPasswordFormSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminForgotPasswordFormSection.xml
-new file mode 100644
-index 00000000000..efaca221233
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminForgotPasswordFormSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminForgotPasswordFormSection">
-+        <element name="email" type="input" selector="#login-form input[name='email']"/>
-+        <element name="retrievePasswordButton" type="button" selector="#login-form button[type='submit']" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminGridTableSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminGridTableSection.xml
-index 3e8f8a8f2e4..cc92e530cf3 100644
---- a/app/code/Magento/Backend/Test/Mftf/Section/AdminGridTableSection.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminGridTableSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminGridTableSection">
-         <element name="row" type="text" selector="table.data-grid tbody tr[data-role=row]:nth-of-type({{row}})" parameterized="true"/>
-     </section>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
-index 92b06878ab8..186bb183d68 100644
---- a/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
-@@ -7,8 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminHeaderSection">
-         <element name="pageTitle" type="text" selector=".page-header h1.page-title"/>
-+        <element name="adminUserAccountText" type="text" selector=".page-header .admin-user-account-text" />
-+        <!-- Legacy heading section. Mostly used for admin 404 and 403 pages -->
-+        <element name="pageHeading" type="text" selector=".page-content .page-heading"/>
-+        <!-- Used for page not found error -->
-+        <element name="pageNotFoundTitle" type="text" selector=".page-title span"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
-index b65a969e334..bd65dea89ab 100644
---- a/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
-@@ -7,10 +7,11 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminLoginFormSection">
-         <element name="username" type="input" selector="#username"/>
-         <element name="password" type="input" selector="#login"/>
-         <element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
-+        <element name="forgotPasswordLink" type="button" selector=".action-forgotpassword" timeout="10"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginMessagesSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginMessagesSection.xml
-new file mode 100644
-index 00000000000..f6ada50ada3
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginMessagesSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminLoginMessagesSection">
-+        <element name="messageByType" type="block" selector=".login-content .messages .message-{{messageType}}" parameterized="true" />
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
-index f8d259cc8e4..4867b5ba5ae 100644
---- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
-@@ -7,9 +7,11 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminMainActionsSection">
--        <element name="save" type="button" selector="#save"/>
--        <element name="delete" type="button" selector="#delete"/>
-+        <element name="save" type="button" selector="#save" timeout="30"/>
-+        <element name="saveAndContinue" type="button" selector="button[id*=save_and_continue]" timeout="30"/>
-+        <element name="delete" type="button" selector="#delete" timeout="30"/>
-+        <element name="add" type="button" selector="#add" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
-new file mode 100644
-index 00000000000..8498ad8c52e
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
-@@ -0,0 +1,28 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminMenuSection">
-+        <element name="catalog" type="button" selector="#menu-magento-catalog-catalog"/>
-+        <element name="catalogProducts" type="button" selector="#nav li[data-ui-id='menu-magento-catalog-catalog-products']"/>
-+        <element name="customers" type="button" selector="#menu-magento-customer-customer"/>
-+        <element name="content" type="button" selector="#menu-magento-backend-content"/>
-+        <element name="widgets" type="button" selector="#nav li[data-ui-id='menu-magento-widget-cms-widget-instance']"/>
-+        <element name="stores" type="button" selector="#menu-magento-backend-stores"/>
-+        <element name="configuration" type="button" selector="#nav li[data-ui-id='menu-magento-config-system-config']"/>
-+        <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
-+        <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
-+        <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
-+        <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
-+        <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
-+
-+        <!-- Navigate menu selectors -->
-+        <element name="menuItem" type="button" selector="li[data-ui-id='menu-{{dataUiId}}']" parameterized="true" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
-index ff5e02397cb..be3ef92acf0 100644
---- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
-@@ -7,10 +7,12 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminMessagesSection">
-         <element name="success" type="text" selector="#messages div.message-success"/>
-         <element name="nthSuccess" type="text" selector=".message.message-success.success:nth-of-type({{n}})>div" parameterized="true"/>
-         <element name="error" type="text" selector="#messages div.message-error"/>
-+        <element name="notice" type="text" selector=".message.message-notice.notice"/>
-+        <element name="messageByType" type="text" selector="#messages div.message-{{messageType}}" parameterized="true" />
-     </section>
- </sections>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminSecondaryGridSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminSecondaryGridSection.xml
-index ea84ce7ea0c..9051eb747a7 100644
---- a/app/code/Magento/Backend/Test/Mftf/Section/AdminSecondaryGridSection.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminSecondaryGridSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminSecondaryGridSection">
-         <element name="resetFilters" type="button" selector="[title='Reset Filter']"/>
-         <element name="taxIdentifierSearch" type="input" selector=".col-code .admin__control-text"/>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml
-new file mode 100644
-index 00000000000..2f799721a8c
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+   /**
-+    * Copyright © Magento, Inc. All rights reserved.
-+    * See COPYING.txt for license details.
-+    */
-+  -->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminSlideOutDialogSection">
-+        <element name="closeButton" type="button" selector=".modal-slide._show [data-role=&quot;closeBtn&quot;]" timeout="30"/>
-+        <element name="cancelButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Cancel']" timeout="30"/>
-+        <element name="doneButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Done']" timeout="30"/>
-+        <element name="saveButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Save']" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml
-new file mode 100644
-index 00000000000..a78b381b6e7
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminSystemAccountSection">
-+        <element name="interfaceLocale" type="select" selector="#interface_locale"/>
-+        <element name="currentPassword" type="text" selector="#current_password"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/CountryOptionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/CountryOptionsSection.xml
-new file mode 100644
-index 00000000000..2e2e5aec35e
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/CountryOptionsSection.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="CountryOptionsSection">
-+        <element name="allowedCountries" type="select" selector="#general_country_allow"/>
-+        <element name="notAllowedCountry" type="button" selector="#general_country_allow option:not([selected])"/>
-+        <element name="generalCountryAllowInherit" type="checkbox" selector="#general_country_allow_inherit"/>
-+        <element name="generalCountryDefaultInherit" type="checkbox" selector="#general_country_default_inherit"/>
-+        <element name="generalCountryDefault" type="select" selector="#general_country_default"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml
-new file mode 100644
-index 00000000000..a460aaebf10
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="LocaleOptionsSection">
-+        <element name="sectionHeader" type="text" selector="#general_locale-head"/>
-+        <element name="timezone" type="select" selector="#general_locale_timezone"/>
-+        <element name="useDefault" type="checkbox" selector="#general_locale_timezone_inherit"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
-new file mode 100644
-index 00000000000..2c061e54f55
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
-@@ -0,0 +1,116 @@
-+<?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="AdminAttributeTextSwatchesCanBeFiledTest">
-+        <annotations>
-+            <features value="Backend"/>
-+            <stories value="Unable to add more attributes in size"/>
-+            <title value="Check that attribute text swatches can be filed"/>
-+            <description value="Check that attribute text swatches can be filed"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-96710"/>
-+            <useCaseId value="MAGETWO-96409"/>
-+            <group value="backend"/>
-+            <group value="ui"/>
-+        </annotations>
-+        <before>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        </before>
-+        <after>
-+            <!-- Delete all 10 store views -->
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView1">
-+                <argument name="customStore" value="customStore"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView2">
-+                <argument name="customStore" value="NewStoreViewData"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView3">
-+                <argument name="customStore" value="storeViewData"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView4">
-+                <argument name="customStore" value="storeViewData1"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView5">
-+                <argument name="customStore" value="storeViewData2"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView6">
-+                <argument name="customStore" value="storeViewData3"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView7">
-+                <argument name="customStore" value="storeViewData4"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView8">
-+                <argument name="customStore" value="storeViewData5"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView9">
-+                <argument name="customStore" value="storeViewData6"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView10">
-+                <argument name="customStore" value="storeViewData7"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create 10 store views -->
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView1">
-+            <argument name="customStore" value="customStore"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView2">
-+            <argument name="customStore" value="NewStoreViewData"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView3">
-+            <argument name="customStore" value="storeViewData"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView4">
-+            <argument name="customStore" value="storeViewData1"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView5">
-+            <argument name="customStore" value="storeViewData2"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView6">
-+            <argument name="customStore" value="storeViewData3"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView7">
-+            <argument name="customStore" value="storeViewData4"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView8">
-+            <argument name="customStore" value="storeViewData5"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView9">
-+            <argument name="customStore" value="storeViewData6"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView10">
-+            <argument name="customStore" value="storeViewData7"/>
-+        </actionGroup>
-+
-+        <!--Navigate to Product attribute page-->
-+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <fillField userInput="test_label" selector="{{AttributePropertiesSection.DefaultLabel}}" stepKey="fillDefaultLabel"/>
-+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="Text Swatch" stepKey="selectInputType"/>
-+        <click selector="{{AttributePropertiesSection.addSwatch}}" stepKey="clickAddSwatch"/>
-+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
-+
-+        <!-- Fill Swatch and Description fields for Admin -->
-+        <fillField selector="{{AttributeManageSwatchSection.swatchField('Admin')}}" userInput="test" stepKey="fillSwatchForAdmin"/>
-+        <fillField selector="{{AttributeManageSwatchSection.descriptionField('Admin')}}" userInput="test" stepKey="fillDescriptionForAdmin"/>
-+
-+        <!-- Grab value Swatch and Description fields for Admin -->
-+        <grabValueFrom selector="{{AttributeManageSwatchSection.swatchField('Admin')}}" stepKey="grabSwatchForAdmin"/>
-+        <grabValueFrom selector="{{AttributeManageSwatchSection.descriptionField('Admin')}}" stepKey="grabDescriptionForAdmin"/>
-+
-+        <!-- Check that Swatch and Description fields for Admin are not empty-->
-+        <assertNotEmpty actual="$grabSwatchForAdmin" stepKey="checkSwatchFieldForAdmin"/>
-+        <assertNotEmpty actual="$grabDescriptionForAdmin" stepKey="checkDescriptionFieldForAdmin"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminContentScheduleNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminContentScheduleNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..bead59653ee
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminContentScheduleNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminContentScheduleNavigateMenuTest">
-+        <annotations>
-+            <features value="Backend"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin content schedule navigate menu test"/>
-+            <description value="Admin should be able to navigate to Content > Schedule"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14117"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentSchedulePage">
-+            <argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuContentDesignSchedule.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuContentDesignSchedule.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..33561d7c3b0
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml
-@@ -0,0 +1,33 @@
-+<?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="AdminDashboardNavigateMenuTest">
-+        <annotations>
-+            <features value="Backend"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin dashboard navigate menu test"/>
-+            <description value="Admin should be able to navigate to Dashboard"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14116"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <click selector="{{AdminMenuSection.menuItem(AdminMenuDashboard.dataUiId)}}" stepKey="clickOnMenuItem"/>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuDashboard.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml
-new file mode 100644
-index 00000000000..f48c7752efc
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml
-@@ -0,0 +1,125 @@
-+<?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="AdminDashboardWithChartsTest">
-+        <annotations>
-+            <features value="Backend"/>
-+            <stories value="Google Charts on Magento dashboard"/>
-+            <title value="Admin should see Google chart on Magento dashboard"/>
-+            <description value="Google chart on Magento dashboard page is displaying properly"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-98934"/>
-+            <useCaseId value="MAGETWO-98584"/>
-+            <group value="backend"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set admin/dashboard/enable_charts 1" stepKey="setEnableCharts"/>
-+            <createData entity="SimpleProduct2" stepKey="createProduct">
-+                <field key="price">150</field>
-+            </createData>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer">
-+                <field key="firstname">John1</field>
-+                <field key="lastname">Doe1</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Reset admin order filter -->
-+            <comment userInput="Reset admin order filter" stepKey="resetAdminOrderFilter"/>
-+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
-+            <waitForLoadingMaskToDisappear stepKey="waitForLoadingOrderGrid"/>
-+            <magentoCLI command="config:set admin/dashboard/enable_charts 0" stepKey="setDisableChartsAsDefault"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Login as admin -->
-+        <comment userInput="Login as admin" stepKey="adminLogin"/>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <!-- Grab quantity value -->
-+        <comment userInput="Grab quantity value from dashboard" stepKey="grabQuantityFromDashboard"/>
-+        <grabTextFrom selector="{{AdminDashboardSection.dashboardTotals('Quantity')}}" stepKey="grabStartQuantity"/>
-+        <!-- Login as customer -->
-+        <comment userInput="Login as customer" stepKey="loginAsCustomer"/>
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <!-- Add Product to Shopping Cart-->
-+        <comment userInput="Add product to the shopping cart" stepKey="addProductToCart"/>
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+        </actionGroup>
-+        <!--Go to Checkout-->
-+        <comment userInput="Go to checkout" stepKey="goToCheckout"/>
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingCheckoutPageWithShippingMethod"/>
-+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask1"/>
-+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
-+        <!-- Checkout select Check/Money Order payment -->
-+        <comment userInput="Select Check/Money payment" stepKey="checkoutSelectCheckMoneyPayment"/>
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
-+        <!-- Place Order -->
-+        <comment userInput="Place order" stepKey="placeOrder"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
-+        <see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order number is: " stepKey="seeOrderNumber"/>
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
-+        <!-- Search for Order in the order grid -->
-+        <comment userInput="Search for Order in the order grid" stepKey="searchOrderInGrid"/>
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
-+            <argument name="orderId" value="$grabOrderNumber"/>
-+        </actionGroup>
-+        <waitForLoadingMaskToDisappear stepKey="waitForSearchingOrder"/>
-+        <!-- Create invoice -->
-+        <comment userInput="Create invoice" stepKey="createInvoice"/>
-+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-+        <waitForPageLoad stepKey="waitForOrderPageToLoad"/>
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
-+        <waitForPageLoad stepKey="waitForInvoicePageToLoad"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
-+        <see selector="{{AdminInvoiceTotalSection.total('Subtotal')}}" userInput="$150.00" stepKey="seeCorrectGrandTotal"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessInvoiceMessage"/>
-+        <!--Create Shipment for the order-->
-+        <comment userInput="Create Shipment for the order" stepKey="createShipmentForOrder"/>
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage2"/>
-+        <waitForPageLoad time="30" stepKey="waitForOrderListPageLoading"/>
-+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="openOrderPageForShip"/>
-+        <waitForPageLoad stepKey="waitForOrderDetailsPage"/>
-+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
-+        <waitForPageLoad stepKey="waitForShipmentPagePage"/>
-+        <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl"/>
-+        <!--Submit Shipment-->
-+        <comment userInput="Submit Shipment" stepKey="submitShipment"/>
-+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
-+        <waitForPageLoad stepKey="waitForShipmentSubmit"/>
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The shipment has been created." stepKey="seeShipmentCreateSuccess"/>
-+        <!-- Go to dashboard page -->
-+        <comment userInput="Go to dashboard page" stepKey="goToDashboardPage"/>
-+        <amOnPage url="{{AdminDashboardPage.url}}" stepKey="amOnDashboardPage"/>
-+        <waitForPageLoad stepKey="waitForDashboardPageLoad4"/>
-+        <!-- Grab quantity value -->
-+        <comment userInput="Grab quantity value from dashboard at the end" stepKey="grabQuantityFromDashboardAtTheEnd"/>
-+        <grabTextFrom selector="{{AdminDashboardSection.dashboardTotals('Quantity')}}" stepKey="grabEndQuantity"/>
-+        <!-- Assert that page is not broken -->
-+        <comment userInput="Assert that dashboard page is not broken" stepKey="assertDashboardPageIsNotBroken"/>
-+        <seeElement selector="{{AdminDashboardSection.dashboardDiagramOrderContentTab}}" stepKey="seeOrderContentTab"/>
-+        <seeElement selector="{{AdminDashboardSection.dashboardDiagramContent}}" stepKey="seeDiagramContent"/>
-+        <click selector="{{AdminDashboardSection.dashboardDiagramAmounts}}" stepKey="clickDashboardAmount"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForDashboardAmountLoading"/>
-+        <seeElement selector="{{AdminDashboardSection.dashboardDiagramAmountsContentTab}}" stepKey="seeDiagramAmountContent"/>
-+        <seeElement selector="{{AdminDashboardSection.dashboardDiagramTotals}}" stepKey="seeAmountTotals"/>
-+        <dontSeeJsError stepKey="dontSeeJsError"/>
-+        <assertGreaterThan expected="$grabStartQuantity" actual="$grabEndQuantity" stepKey="checkQuantityWasChanged"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterChangeCookieDomainTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterChangeCookieDomainTest.xml
-new file mode 100644
-index 00000000000..93d411c8827
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterChangeCookieDomainTest.xml
-@@ -0,0 +1,34 @@
-+<?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="AdminLoginAfterChangeCookieDomainTest">
-+        <annotations>
-+            <features value="Backend"/>
-+            <stories value="Login on the Admin Backend"/>
-+            <title value="Admin user can login after changing cookie domain on main website scope without changing cookie domain on default scope"/>
-+            <description value="Admin user can login after changing cookie domain on main website scope without changing cookie domain on default scope"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-17847"/>
-+            <useCaseId value="MC-17275"/>
-+            <group value="backend"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set {{ChangedCookieDomainForMainWebsiteConfigData.path}} --scope={{ChangedCookieDomainForMainWebsiteConfigData.scope}} --scope-code={{ChangedCookieDomainForMainWebsiteConfigData.scope_code}} {{ChangedCookieDomainForMainWebsiteConfigData.value}}" stepKey="changeDomainForMainWebsiteBeforeTestRun"/>
-+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{EmptyCookieDomainForMainWebsiteConfigData.path}} --scope={{EmptyCookieDomainForMainWebsiteConfigData.scope}} --scope-code={{EmptyCookieDomainForMainWebsiteConfigData.scope_code}} {{EmptyCookieDomainForMainWebsiteConfigData.value}}" stepKey="changeDomainForMainWebsiteAfterTestComplete"/>
-+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestComplete"/>
-+        </after>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <actionGroup ref="AssertAdminDashboardPageIsVisibleActionGroup" stepKey="seeDashboardPage"/>
-+        <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml
-new file mode 100644
-index 00000000000..38749dfd792
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml
-@@ -0,0 +1,37 @@
-+<?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="AdminLoginAfterJSMinificationTest">
-+        <annotations>
-+            <features value="Backend"/>
-+            <stories value="Admin Panel JS minification"/>
-+            <title value="Admin panel should be accessible with JS minification enabled"/>
-+            <description value="Admin panel should be accessible with JS minification enabled"/>
-+            <testCaseId value="MC-14104"/>
-+            <severity value="MAJOR"/>
-+            <group value="backend"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set {{MinifyJavaScriptFilesEnableConfigData.path}} {{MinifyJavaScriptFilesEnableConfigData.value}}" stepKey="enableJsMinification"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{MinifyJavaScriptFilesDisableConfigData.path}} {{MinifyJavaScriptFilesDisableConfigData.value}}" stepKey="disableJsMinification"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <actionGroup ref="AssertAdminSuccessLoginActionGroup" stepKey="loggedInSuccessfully"/>
-+        <actionGroup ref="AssertAdminPageIsNot404ActionGroup" stepKey="dontSee404Page"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginTest.xml
-index 99d0f665473..ce33f01c601 100644
---- a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginTest.xml
-+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminLoginTest">
-         <annotations>
-             <features value="Backend"/>
-@@ -20,11 +20,8 @@
-             <group value="login"/>
-         </annotations>
- 
--        <amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
--        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
--        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
--        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickOnSignIn"/>
--        <closeAdminNotification stepKey="closeAdminNotification"/>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-         <seeInCurrentUrl url="{{AdminLoginPage.url}}" stepKey="seeAdminLoginUrl"/>
-+        <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-     </test>
--</tests>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml
-new file mode 100644
-index 00000000000..c9a3b8089cc
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml
-@@ -0,0 +1,50 @@
-+<?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="AdminMenuNavigationWithSecretKeysTest">
-+        <annotations>
-+            <features value="Backend"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin should be able to navigate between menu options with secret url keys enabled"/>
-+            <description value="Admin should be able to navigate between menu options with secret url keys enabled"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-95349"/>
-+            <group value="menu"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set admin/security/use_form_key 1" stepKey="enableUrlSecretKeys"/>
-+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set admin/security/use_form_key 0" stepKey="disableUrlSecretKeys"/>
-+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches2"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption1"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForStoresMenu1" />
-+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption1"/>
-+        <waitForPageLoad stepKey="waitForConfigurationPageLoad1"/>
-+        <seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath1"/>
-+
-+        <click selector="{{AdminMenuSection.catalog}}" stepKey="clickCatalogMenuOption"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForCatalogMenu1" />
-+        <click selector="{{AdminMenuSection.catalogProducts}}" stepKey="clickCatalogProductsMenuOption"/>
-+        <waitForPageLoad stepKey="waitForProductsPageLoad"/>
-+        <seeCurrentUrlMatches regex="~\/catalog\/product\/~" stepKey="seeCurrentUrlMatchesProductsPath"/>
-+
-+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption2"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForStoresMenu2" />
-+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption2"/>
-+        <waitForPageLoad stepKey="waitForConfigurationPageLoad2"/>
-+        <seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminPrivacyPolicyTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminPrivacyPolicyTest.xml
-new file mode 100644
-index 00000000000..4f215d20a7a
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminPrivacyPolicyTest.xml
-@@ -0,0 +1,93 @@
-+<?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="AdminPrivacyPolicyTest">
-+        <annotations>
-+            <features value="Backend"/>
-+            <stories value="Checks to see if privacy policy url is in the admin page and every sub page"/>
-+            <title value="There should be a privacy policy url in the admin page and every sub page"/>
-+            <description value="There should be a privacy policy url in the admin page and every sub page"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-17787"/>
-+            <group value="backend"/>
-+            <group value="login"/>
-+        </annotations>
-+
-+        <!-- Logging in Magento admin and checking for Privacy policy footer in dashboard -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <closeAdminNotification stepKey="closeAdminNotification"/>
-+        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkDashboard"/>
-+
-+        <!-- Checking for Privacy policy footer in salesOrderPage -->
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesOrder">
-+            <argument name="menuUiId" value="magento-sales-sales"/>
-+            <argument name="submenuUiId" value="magento-sales-sales-order"/>
-+        </actionGroup>
-+        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkSalesOrder"/>
-+
-+        <!-- Checking for Privacy policy footer in catalogProductsPage -->
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCatalogProducts">
-+            <argument name="menuUiId" value="magento-catalog-catalog"/>
-+            <argument name="submenuUiId" value="magento-catalog-catalog-products"/>
-+        </actionGroup>
-+        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkCatalogProducts"/>
-+
-+        <!-- Checking for Privacy policy footer in customersAllCustomersPage -->
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCustomersAllCustomers">
-+            <argument name="menuUiId" value="magento-customer-customer"/>
-+            <argument name="submenuUiId" value="magento-customer-customer-manage"/>
-+        </actionGroup>
-+        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkCustomersAllCustomers"/>
-+
-+        <!-- Checking for Privacy policy footer in marketingCatalogPriceRulePage -->
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingCatalogPriceRule">
-+            <argument name="menuUiId" value="magento-backend-marketing"/>
-+            <argument name="submenuUiId" value="magento-catalogrule-promo-catalog"/>
-+        </actionGroup>
-+        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkMarketingCatalogPriceRule"/>
-+
-+        <!-- Checking for Privacy policy footer in contentBlocksPage -->
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentBlocks">
-+            <argument name="menuUiId" value="magento-backend-content"/>
-+            <argument name="submenuUiId" value="magento-cms-cms-block"/>
-+        </actionGroup>
-+        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkContentBlocks"/>
-+
-+        <!-- Checking for Privacy policy footer in reportSearcbTermsPage -->
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsSearchTerms">
-+            <argument name="menuUiId" value="magento-reports-report"/>
-+            <argument name="submenuUiId" value="magento-search-report-search-term"/>
-+        </actionGroup>
-+        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkReportsSearchTerms"/>
-+
-+        <!-- Checking for Privacy policy footer in storesAllStoresPage -->
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresAllStores">
-+            <argument name="menuUiId" value="magento-backend-stores"/>
-+            <argument name="submenuUiId" value="magento-backend-system-store"/>
-+        </actionGroup>
-+        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkStoresAllStores"/>
-+
-+        <!-- Checking for Privacy policy footer in systemImportPage -->
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemImport">
-+            <argument name="menuUiId" value="magento-backend-system"/>
-+            <argument name="submenuUiId" value="magento-importexport-system-convert-import"/>
-+        </actionGroup>
-+        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkSystemImport"/>
-+
-+        <!-- Checking for Privacy policy footer in findPartnersAndExtensionsPage -->
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToFindPartnersAndExtensions">
-+            <argument name="menuUiId" value="magento-marketplace-partners"/>
-+            <argument name="submenuUiId" value="magento-marketplace-partners"/>
-+        </actionGroup>
-+        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkFindPartnersAndExtensions"/>
-+    </test>
-+</tests>
-+
-+
-diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresAllStoresNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresAllStoresNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..7758b387e39
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresAllStoresNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminStoresAllStoresNavigateMenuTest">
-+        <annotations>
-+            <features value="Backend"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin stores all stores navigate menu test"/>
-+            <description value="Admin should be able to navigate to Stores > All Stores"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14118"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresAllStoresPage">
-+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuStoresSettingsAllStores.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuStoresSettingsAllStores.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresConfigurationNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresConfigurationNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..a54269b186b
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresConfigurationNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminStoresConfigurationNavigateMenuTest">
-+        <annotations>
-+            <features value="Backend"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin stores configuration navigate menu test"/>
-+            <description value="Admin should be able to navigate to Stores > Configuration"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14119"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresConfigurationPage">
-+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuStoresSettingsConfiguration.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuStoresSettingsConfiguration.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminSystemCacheManagementNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminSystemCacheManagementNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..516631c1bd1
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminSystemCacheManagementNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSystemCacheManagementNavigateMenuTest">
-+        <annotations>
-+            <features value="Backend"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin system cache management navigate menu test"/>
-+            <description value="Admin should be able to navigate to System > Cache Management"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14120"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemCacheManagementPage">
-+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSystemToolsCacheManagement.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSystemToolsCacheManagement.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminUserLoginWithStoreCodeInUrlTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminUserLoginWithStoreCodeInUrlTest.xml
-new file mode 100644
-index 00000000000..df5ca6d0378
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminUserLoginWithStoreCodeInUrlTest.xml
-@@ -0,0 +1,32 @@
-+<?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="AdminUserLoginWithStoreCodeInUrlTest">
-+        <annotations>
-+            <features value="Backend"/>
-+            <stories value="Admin Panel URL with Store Code"/>
-+            <title value="Admin panel should be accessible with Add Store Code to URL setting enabled"/>
-+            <description value="Admin panel should be accessible with Add Store Code to URL setting enabled"/>
-+            <testCaseId value="MC-14279"/>
-+            <severity value="CRITICAL"/>
-+            <group value="backend"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlEnable"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlDisable"/>
-+        </after>
-+
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <actionGroup ref="AssertAdminDashboardPageIsVisibleActionGroup" stepKey="seeDashboardPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/TextTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/TextTest.php
-index 1bf23649e2e..5aa8cf7a0c5 100644
---- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/TextTest.php
-+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/TextTest.php
-@@ -8,6 +8,9 @@ namespace Magento\Backend\Test\Unit\Block\Widget\Grid\Column\Filter;
- 
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
- 
-+/**
-+ * Unit test for \Magento\Backend\Block\Widget\Grid\Column\Filter\Text
-+ */
- class TextTest extends \PHPUnit\Framework\TestCase
- {
-     /** @var \Magento\Backend\Block\Widget\Grid\Column\Filter\Text*/
-@@ -31,7 +34,10 @@ class TextTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(['getEscaper'])
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->escaper = $this->createPartialMock(\Magento\Framework\Escaper::class, ['escapeHtml']);
-+        $this->escaper = $this->createPartialMock(
-+            \Magento\Framework\Escaper::class,
-+            ['escapeHtml', 'escapeHtmlAttr']
-+        );
-         $this->helper = $this->createMock(\Magento\Framework\DB\Helper::class);
- 
-         $this->context->expects($this->once())->method('getEscaper')->willReturn($this->escaper);
-@@ -60,6 +66,13 @@ class TextTest extends \PHPUnit\Framework\TestCase
-         $this->block->setColumn($column);
- 
-         $this->escaper->expects($this->any())->method('escapeHtml')->willReturn('escapedHtml');
-+        $this->escaper->expects($this->once())
-+            ->method('escapeHtmlAttr')
-+            ->willReturnCallback(
-+                function ($string) {
-+                    return $string;
-+                }
-+            );
-         $column->expects($this->any())->method('getId')->willReturn('id');
-         $column->expects($this->once())->method('getHtmlId')->willReturn('htmlId');
- 
-diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
-index e8143b5f6b4..e62b73f3924 100644
---- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
-+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
-@@ -269,62 +269,6 @@ class MassactionTest extends \PHPUnit\Framework\TestCase
-         $this->assertEmpty($this->_block->getGridIdsJson());
-     }
- 
--    /**
--     * @param array $items
--     * @param string $result
--     *
--     * @dataProvider dataProviderGetGridIdsJsonWithUseSelectAll
--     */
--    public function testGetGridIdsJsonWithUseSelectAll(array $items, $result)
--    {
--        $this->_block->setUseSelectAll(true);
--
--        if ($this->_block->getMassactionIdField()) {
--            $massActionIdField = $this->_block->getMassactionIdField();
--        } else {
--            $massActionIdField = $this->_block->getParentBlock()->getMassactionIdField();
--        }
--
--        $collectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->_gridMock->expects($this->once())
--            ->method('getCollection')
--            ->willReturn($collectionMock);
--        $collectionMock->expects($this->once())
--            ->method('setPageSize')
--            ->with(0)
--            ->willReturnSelf();
--        $collectionMock->expects($this->once())
--            ->method('getColumnValues')
--            ->with($massActionIdField)
--            ->willReturn($items);
--
--        $this->assertEquals($result, $this->_block->getGridIdsJson());
--    }
--
--    /**
--     * @return array
--     */
--    public function dataProviderGetGridIdsJsonWithUseSelectAll()
--    {
--        return [
--            [
--                [],
--                '',
--            ],
--            [
--                [1],
--                '1',
--            ],
--            [
--                [1, 2, 3],
--                '1,2,3',
--            ],
--        ];
--    }
--
-     /**
-      * @param string $itemId
-      * @param array|\Magento\Framework\DataObject $item
-diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php
-index b1911da0242..ac0f4a2f467 100644
---- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php
-+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php
-@@ -38,7 +38,7 @@ class CleanMediaTest extends \PHPUnit\Framework\TestCase
-         $messageManagerParams = $helper->getConstructArguments(\Magento\Framework\Message\Manager::class);
-         $messageManagerParams['exceptionMessageFactory'] = $exceptionMessageFactory;
-         $messageManager = $this->getMockBuilder(\Magento\Framework\Message\Manager::class)
--            ->setMethods(['addSuccess'])
-+            ->setMethods(['addSuccessMessage'])
-             ->setConstructorArgs($messageManagerParams)
-             ->getMock();
- 
-@@ -86,7 +86,7 @@ class CleanMediaTest extends \PHPUnit\Framework\TestCase
-         $mergeService->expects($this->once())->method('cleanMergedJsCss');
- 
-         $messageManager->expects($this->once())
--            ->method('addSuccess')
-+            ->method('addSuccessMessage')
-             ->with('The JavaScript/CSS cache has been cleaned.');
- 
-         $valueMap = [
-diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php
-index 40d9ca1aa89..fc457cd9681 100644
---- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php
-+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php
-@@ -76,7 +76,7 @@ class CleanStaticFilesTest extends \PHPUnit\Framework\TestCase
-             ->with('clean_static_files_cache_after');
- 
-         $this->messageManagerMock->expects($this->once())
--            ->method('addSuccess')
-+            ->method('addSuccessMessage')
-             ->with('The static files cache has been cleaned.');
- 
-         $resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
-diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
-index 197b46acc61..a8b248c611e 100644
---- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
-+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
-@@ -156,7 +156,7 @@ class MassDisableTest extends \PHPUnit\Framework\TestCase
-             ->willReturn(['someCache']);
- 
-         $this->messageManagerMock->expects($this->once())
--            ->method('addError')
-+            ->method('addErrorMessage')
-             ->with('These cache type(s) don\'t exist: someCache')
-             ->willReturnSelf();
- 
-@@ -176,7 +176,7 @@ class MassDisableTest extends \PHPUnit\Framework\TestCase
-             ->willThrowException($exception);
- 
-         $this->messageManagerMock->expects($this->once())
--            ->method('addException')
-+            ->method('addExceptionMessage')
-             ->with($exception, 'An error occurred while disabling cache.')
-             ->willReturnSelf();
- 
-@@ -216,7 +216,7 @@ class MassDisableTest extends \PHPUnit\Framework\TestCase
-             ->method('persist');
- 
-         $this->messageManagerMock->expects($this->once())
--            ->method('addSuccess')
-+            ->method('addSuccessMessage')
-             ->with('1 cache type(s) disabled.')
-             ->willReturnSelf();
- 
-diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
-index 9b364019315..6eac44a564f 100644
---- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
-+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
-@@ -156,7 +156,7 @@ class MassEnableTest extends \PHPUnit\Framework\TestCase
-             ->willReturn(['someCache']);
- 
-         $this->messageManagerMock->expects($this->once())
--            ->method('addError')
-+            ->method('addErrorMessage')
-             ->with('These cache type(s) don\'t exist: someCache')
-             ->willReturnSelf();
- 
-@@ -176,7 +176,7 @@ class MassEnableTest extends \PHPUnit\Framework\TestCase
-             ->willThrowException($exception);
- 
-         $this->messageManagerMock->expects($this->once())
--            ->method('addException')
-+            ->method('addExceptionMessage')
-             ->with($exception, 'An error occurred while enabling cache.')
-             ->willReturnSelf();
- 
-@@ -216,7 +216,7 @@ class MassEnableTest extends \PHPUnit\Framework\TestCase
-             ->method('persist');
- 
-         $this->messageManagerMock->expects($this->once())
--            ->method('addSuccess')
-+            ->method('addSuccessMessage')
-             ->with('1 cache type(s) enabled.')
-             ->willReturnSelf();
- 
-diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
-index e8dcc00345f..a985681919f 100644
---- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
-+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
-@@ -107,7 +107,7 @@ class RefreshStatisticsTest extends \PHPUnit\Framework\TestCase
-         $this->resultRedirectFactory->expects($this->any())->method('create')->willReturn($this->resultRedirect);
- 
-         $this->messageManager->expects($this->once())
--            ->method('addSuccess')
-+            ->method('addSuccessMessage')
-             ->with(__('We updated lifetime statistic.'));
- 
-         $this->objectManager->expects($this->any())
-diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php
-index 844a821df1c..a8490d6ba2e 100644
---- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php
-+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php
-@@ -71,7 +71,7 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             ->getMock();
-         $this->_messagesMock = $this->getMockBuilder(\Magento\Framework\Message\Manager::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['addSuccess'])
-+            ->setMethods(['addSuccessMessage'])
-             ->getMockForAbstractClass();
- 
-         $this->_authSessionMock = $this->getMockBuilder(\Magento\Backend\Model\Auth\Session::class)
-@@ -221,7 +221,7 @@ class SaveTest extends \PHPUnit\Framework\TestCase
- 
-         $this->_requestMock->setParams($requestParams);
- 
--        $this->_messagesMock->expects($this->once())->method('addSuccess')->with($this->equalTo($testedMessage));
-+        $this->_messagesMock->expects($this->once())->method('addSuccessMessage')->with($this->equalTo($testedMessage));
- 
-         $this->_controller->execute();
-     }
-diff --git a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php
-index 4911dc1e996..b373459b786 100644
---- a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php
-+++ b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php
-@@ -76,17 +76,35 @@ class AdminPathConfigTest extends \PHPUnit\Framework\TestCase
-      * @param $unsecureBaseUrl
-      * @param $useSecureInAdmin
-      * @param $secureBaseUrl
-+     * @param $useCustomUrl
-+     * @param $customUrl
-      * @param $expected
-      * @dataProvider shouldBeSecureDataProvider
-      */
--    public function testShouldBeSecure($unsecureBaseUrl, $useSecureInAdmin, $secureBaseUrl, $expected)
--    {
--        $coreConfigValueMap = [
-+    public function testShouldBeSecure(
-+        $unsecureBaseUrl,
-+        $useSecureInAdmin,
-+        $secureBaseUrl,
-+        $useCustomUrl,
-+        $customUrl,
-+        $expected
-+    ) {
-+        $coreConfigValueMap = $this->returnValueMap([
-             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default', null, $unsecureBaseUrl],
-             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, 'default', null, $secureBaseUrl],
--        ];
--        $this->coreConfig->expects($this->any())->method('getValue')->will($this->returnValueMap($coreConfigValueMap));
--        $this->backendConfig->expects($this->any())->method('isSetFlag')->willReturn($useSecureInAdmin);
-+            ['admin/url/custom', 'default', null, $customUrl],
-+        ]);
-+        $backendConfigFlagsMap = $this->returnValueMap([
-+            [\Magento\Store\Model\Store::XML_PATH_SECURE_IN_ADMINHTML, $useSecureInAdmin],
-+            ['admin/url/use_custom', $useCustomUrl],
-+        ]);
-+        $this->coreConfig->expects($this->atLeast(1))->method('getValue')
-+            ->will($coreConfigValueMap);
-+        $this->coreConfig->expects($this->atMost(2))->method('getValue')
-+            ->will($coreConfigValueMap);
-+
-+        $this->backendConfig->expects($this->atMost(2))->method('isSetFlag')
-+            ->will($backendConfigFlagsMap);
-         $this->assertEquals($expected, $this->adminPathConfig->shouldBeSecure(''));
-     }
- 
-@@ -96,13 +114,13 @@ class AdminPathConfigTest extends \PHPUnit\Framework\TestCase
-     public function shouldBeSecureDataProvider()
-     {
-         return [
--            ['http://localhost/', false, 'default', false],
--            ['http://localhost/', true, 'default', false],
--            ['https://localhost/', false, 'default', true],
--            ['https://localhost/', true, 'default', true],
--            ['http://localhost/', false, 'https://localhost/', false],
--            ['http://localhost/', true, 'https://localhost/', true],
--            ['https://localhost/', true, 'https://localhost/', true],
-+            ['http://localhost/', false, 'default', false, '', false],
-+            ['http://localhost/', true, 'default', false, '', false],
-+            ['https://localhost/', false, 'default', false, '', true],
-+            ['https://localhost/', true, 'default', false, '', true],
-+            ['http://localhost/', false, 'https://localhost/', false, '', false],
-+            ['http://localhost/', true, 'https://localhost/', false, '', true],
-+            ['https://localhost/', true, 'https://localhost/', false, '', true],
-         ];
-     }
- 
-diff --git a/app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php b/app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php
-deleted file mode 100644
-index f1a4bc355b0..00000000000
---- a/app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php
-+++ /dev/null
-@@ -1,273 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Backend\Test\Unit\Model\Auth;
--
--use Magento\Backend\Model\Auth\Session;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
--
--/**
-- * Class SessionTest tests Magento\Backend\Model\Auth\Session
-- *
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class SessionTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Backend\App\Config | \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $config;
--
--    /**
--     * @var \Magento\Framework\Session\Config | \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $sessionConfig;
--
--    /**
--     * @var \Magento\Framework\Stdlib\CookieManagerInterface | \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $cookieManager;
--
--    /**
--     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory | \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $cookieMetadataFactory;
--
--    /**
--     * @var \Magento\Framework\Session\Storage | \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $storage;
--
--    /**
--     * @var \Magento\Framework\Acl\Builder | \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $aclBuilder;
--
--    /**
--     * @var Session
--     */
--    protected $session;
--
--    protected function setUp()
--    {
--        $this->cookieMetadataFactory = $this->createPartialMock(
--            \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory::class,
--            ['createPublicCookieMetadata']
--        );
--
--        $this->config = $this->createPartialMock(\Magento\Backend\App\Config::class, ['getValue']);
--        $this->cookieManager = $this->createPartialMock(
--            \Magento\Framework\Stdlib\Cookie\PhpCookieManager::class,
--            ['getCookie', 'setPublicCookie']
--        );
--        $this->storage = $this->createPartialMock(
--            \Magento\Framework\Session\Storage::class,
--            ['getUser', 'getAcl', 'setAcl']
--        );
--        $this->sessionConfig = $this->createPartialMock(
--            \Magento\Framework\Session\Config::class,
--            ['getCookiePath', 'getCookieDomain', 'getCookieSecure', 'getCookieHttpOnly']
--        );
--        $this->aclBuilder = $this->getMockBuilder(\Magento\Framework\Acl\Builder::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $objectManager = new ObjectManager($this);
--        $this->session = $objectManager->getObject(
--            \Magento\Backend\Model\Auth\Session::class,
--            [
--                'config' => $this->config,
--                'sessionConfig' => $this->sessionConfig,
--                'cookieManager' => $this->cookieManager,
--                'cookieMetadataFactory' => $this->cookieMetadataFactory,
--                'storage' => $this->storage,
--                'aclBuilder' => $this->aclBuilder
--            ]
--        );
--    }
--
--    protected function tearDown()
--    {
--        $this->config = null;
--        $this->sessionConfig = null;
--        $this->session = null;
--    }
--
--    /**
--     * @dataProvider refreshAclDataProvider
--     * @param $isUserPassedViaParams
--     */
--    public function testRefreshAcl($isUserPassedViaParams)
--    {
--        $aclMock = $this->getMockBuilder(\Magento\Framework\Acl::class)->disableOriginalConstructor()->getMock();
--        $this->aclBuilder->expects($this->any())->method('getAcl')->willReturn($aclMock);
--        $userMock = $this->getMockBuilder(\Magento\User\Model\User::class)
--            ->setMethods(['getReloadAclFlag', 'setReloadAclFlag', 'unsetData', 'save'])
--            ->disableOriginalConstructor()
--            ->getMock();
--        $userMock->expects($this->any())->method('getReloadAclFlag')->willReturn(true);
--        $userMock->expects($this->once())->method('setReloadAclFlag')->with('0')->willReturnSelf();
--        $userMock->expects($this->once())->method('save');
--        $this->storage->expects($this->once())->method('setAcl')->with($aclMock);
--        $this->storage->expects($this->any())->method('getAcl')->willReturn($aclMock);
--        if ($isUserPassedViaParams) {
--            $this->session->refreshAcl($userMock);
--        } else {
--            $this->storage->expects($this->once())->method('getUser')->willReturn($userMock);
--            $this->session->refreshAcl();
--        }
--        $this->assertSame($aclMock, $this->session->getAcl());
--    }
--
--    /**
--     * @return array
--     */
--    public function refreshAclDataProvider()
--    {
--        return [
--            'User set via params' => [true],
--            'User set to session object' => [false]
--        ];
--    }
--
--    public function testIsLoggedInPositive()
--    {
--        $user = $this->createPartialMock(\Magento\User\Model\User::class, ['getId', '__wakeup']);
--        $user->expects($this->once())
--            ->method('getId')
--            ->will($this->returnValue(1));
--
--        $this->storage->expects($this->any())
--            ->method('getUser')
--            ->will($this->returnValue($user));
--
--        $this->assertTrue($this->session->isLoggedIn());
--    }
--
--    public function testProlong()
--    {
--        $name = session_name();
--        $cookie = 'cookie';
--        $lifetime = 900;
--        $path = '/';
--        $domain = 'magento2';
--        $secure = true;
--        $httpOnly = true;
--
--        $this->config->expects($this->once())
--            ->method('getValue')
--            ->with(\Magento\Backend\Model\Auth\Session::XML_PATH_SESSION_LIFETIME)
--            ->willReturn($lifetime);
--        $cookieMetadata = $this->createMock(\Magento\Framework\Stdlib\Cookie\PublicCookieMetadata::class);
--        $cookieMetadata->expects($this->once())
--            ->method('setDuration')
--            ->with($lifetime)
--            ->will($this->returnSelf());
--        $cookieMetadata->expects($this->once())
--            ->method('setPath')
--            ->with($path)
--            ->will($this->returnSelf());
--        $cookieMetadata->expects($this->once())
--            ->method('setDomain')
--            ->with($domain)
--            ->will($this->returnSelf());
--        $cookieMetadata->expects($this->once())
--            ->method('setSecure')
--            ->with($secure)
--            ->will($this->returnSelf());
--        $cookieMetadata->expects($this->once())
--            ->method('setHttpOnly')
--            ->with($httpOnly)
--            ->will($this->returnSelf());
--
--        $this->cookieMetadataFactory->expects($this->once())
--            ->method('createPublicCookieMetadata')
--            ->will($this->returnValue($cookieMetadata));
--
--        $this->cookieManager->expects($this->once())
--            ->method('getCookie')
--            ->with($name)
--            ->will($this->returnValue($cookie));
--        $this->cookieManager->expects($this->once())
--            ->method('setPublicCookie')
--            ->with($name, $cookie, $cookieMetadata);
--
--        $this->sessionConfig->expects($this->once())
--            ->method('getCookiePath')
--            ->will($this->returnValue($path));
--        $this->sessionConfig->expects($this->once())
--            ->method('getCookieDomain')
--            ->will($this->returnValue($domain));
--        $this->sessionConfig->expects($this->once())
--            ->method('getCookieSecure')
--            ->will($this->returnValue($secure));
--        $this->sessionConfig->expects($this->once())
--            ->method('getCookieHttpOnly')
--            ->will($this->returnValue($httpOnly));
--
--        $this->session->prolong();
--
--        $this->assertLessThanOrEqual(time(), $this->session->getUpdatedAt());
--    }
--
--    /**
--     * @dataProvider isAllowedDataProvider
--     * @param bool $isUserDefined
--     * @param bool $isAclDefined
--     * @param bool $isAllowed
--     * @param true $expectedResult
--     */
--    public function testIsAllowed($isUserDefined, $isAclDefined, $isAllowed, $expectedResult)
--    {
--        $userAclRole = 'userAclRole';
--        if ($isAclDefined) {
--            $aclMock = $this->getMockBuilder(\Magento\Framework\Acl::class)->disableOriginalConstructor()->getMock();
--            $this->storage->expects($this->any())->method('getAcl')->willReturn($aclMock);
--        }
--        if ($isUserDefined) {
--            $userMock = $this->getMockBuilder(\Magento\User\Model\User::class)->disableOriginalConstructor()->getMock();
--            $this->storage->expects($this->once())->method('getUser')->willReturn($userMock);
--        }
--        if ($isAclDefined && $isUserDefined) {
--            $userMock->expects($this->any())->method('getAclRole')->willReturn($userAclRole);
--            $aclMock->expects($this->once())->method('isAllowed')->with($userAclRole)->willReturn($isAllowed);
--        }
--
--        $this->assertEquals($expectedResult, $this->session->isAllowed('resource'));
--    }
--
--    /**
--     * @return array
--     */
--    public function isAllowedDataProvider()
--    {
--        return [
--            "Negative: User not defined" => [false, true, true, false],
--            "Negative: Acl not defined" => [true, false, true, false],
--            "Negative: Permission denied" => [true, true, false, false],
--            "Positive: Permission granted" => [true, true, false, false],
--        ];
--    }
--
--    /**
--     * @dataProvider firstPageAfterLoginDataProvider
--     * @param bool $isFirstPageAfterLogin
--     */
--    public function testFirstPageAfterLogin($isFirstPageAfterLogin)
--    {
--        $this->session->setIsFirstPageAfterLogin($isFirstPageAfterLogin);
--        $this->assertEquals($isFirstPageAfterLogin, $this->session->isFirstPageAfterLogin());
--    }
--
--    /**
--     * @return array
--     */
--    public function firstPageAfterLoginDataProvider()
--    {
--        return [
--            'First page after login' => [true],
--            'Not first page after login' => [false],
--        ];
--    }
--}
-diff --git a/app/code/Magento/Backend/Test/Unit/Model/Authorization/RoleLocatorTest.php b/app/code/Magento/Backend/Test/Unit/Model/Authorization/RoleLocatorTest.php
-deleted file mode 100644
-index 5b3910e9445..00000000000
---- a/app/code/Magento/Backend/Test/Unit/Model/Authorization/RoleLocatorTest.php
-+++ /dev/null
-@@ -1,36 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Backend\Test\Unit\Model\Authorization;
--
--class RoleLocatorTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Backend\Model\Authorization\RoleLocator
--     */
--    protected $_model;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $_sessionMock = [];
--
--    protected function setUp()
--    {
--        $this->_sessionMock = $this->createPartialMock(
--            \Magento\Backend\Model\Auth\Session::class,
--            ['getUser', 'getAclRole', 'hasUser']
--        );
--        $this->_model = new \Magento\Backend\Model\Authorization\RoleLocator($this->_sessionMock);
--    }
--
--    public function testGetAclRoleIdReturnsCurrentUserAclRoleId()
--    {
--        $this->_sessionMock->expects($this->once())->method('hasUser')->will($this->returnValue(true));
--        $this->_sessionMock->expects($this->once())->method('getUser')->will($this->returnSelf());
--        $this->_sessionMock->expects($this->once())->method('getAclRole')->will($this->returnValue('some_role'));
--        $this->assertEquals('some_role', $this->_model->getAclRoleId());
--    }
--}
-diff --git a/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php b/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php
-deleted file mode 100644
-index 77eb7cdb34d..00000000000
---- a/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php
-+++ /dev/null
-@@ -1,127 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Backend\Test\Unit\Model\Locale;
--
--use Magento\Framework\Locale\Resolver;
--
--class ManagerTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Backend\Model\Locale\Manager
--     */
--    protected $_model;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\TranslateInterface
--     */
--    protected $_translator;
--
--    /**
--     * @var \Magento\Backend\Model\Session
--     */
--    protected $_session;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Auth\Session
--     */
--    protected $_authSession;
--    
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\App\ConfigInterface
--     */
--    protected $_backendConfig;
--
--    protected function setUp()
--    {
--        $this->_session = $this->createMock(\Magento\Backend\Model\Session::class);
--
--        $this->_authSession = $this->createPartialMock(\Magento\Backend\Model\Auth\Session::class, ['getUser']);
--        
--        $this->_backendConfig = $this->getMockForAbstractClass(
--            \Magento\Backend\App\ConfigInterface::class,
--            [],
--            '',
--            false
--        );
--        
--        $userMock = new \Magento\Framework\DataObject();
--
--        $this->_authSession->expects($this->any())->method('getUser')->will($this->returnValue($userMock));
--
--        $this->_translator = $this->getMockBuilder(\Magento\Framework\TranslateInterface::class)
--            ->setMethods(['init', 'setLocale'])
--            ->getMockForAbstractClass();
--
--        $this->_translator->expects($this->any())->method('setLocale')->will($this->returnValue($this->_translator));
--
--        $this->_translator->expects($this->any())->method('init')->will($this->returnValue(false));
--
--        $this->_model = new \Magento\Backend\Model\Locale\Manager(
--            $this->_session,
--            $this->_authSession,
--            $this->_translator,
--            $this->_backendConfig
--        );
--    }
--
--    /**
--     * @return array
--     */
--    public function switchBackendInterfaceLocaleDataProvider()
--    {
--        return ['case1' => ['locale' => 'de_DE'], 'case2' => ['locale' => 'en_US']];
--    }
--
--    /**
--     * @param string $locale
--     * @dataProvider switchBackendInterfaceLocaleDataProvider
--     * @covers \Magento\Backend\Model\Locale\Manager::switchBackendInterfaceLocale
--     */
--    public function testSwitchBackendInterfaceLocale($locale)
--    {
--        $this->_model->switchBackendInterfaceLocale($locale);
--
--        $userInterfaceLocale = $this->_authSession->getUser()->getInterfaceLocale();
--        $this->assertEquals($userInterfaceLocale, $locale);
--
--        $sessionLocale = $this->_session->getSessionLocale();
--        $this->assertEquals($sessionLocale, null);
--    }
--
--    /**
--     * @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
--     */
--    public function testGetUserInterfaceLocaleDefault()
--    {
--        $locale = $this->_model->getUserInterfaceLocale();
--
--        $this->assertEquals($locale, Resolver::DEFAULT_LOCALE);
--    }
--
--    /**
--     * @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
--     */
--    public function testGetUserInterfaceLocale()
--    {
--        $this->_model->switchBackendInterfaceLocale('de_DE');
--        $locale = $this->_model->getUserInterfaceLocale();
--
--        $this->assertEquals($locale, 'de_DE');
--    }
--
--    /**
--     * @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
--     */
--    public function testGetUserInterfaceGeneralLocale()
--    {
--        $this->_backendConfig->expects($this->any())
--            ->method('getValue')
--            ->with('general/locale/code')
--            ->willReturn('test_locale');
--        $locale = $this->_model->getUserInterfaceLocale();
--        $this->assertEquals($locale, 'test_locale');
--    }
--}
-diff --git a/app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php b/app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php
-index 260a38a481b..2b5f644e359 100644
---- a/app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php
-+++ b/app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php
-@@ -168,6 +168,6 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-         } catch (\Exception $e) {
-             return;
-         }
--        $this->fail("Generic \Exception was not throwed");
-+        $this->fail("Generic \Exception was not thrown");
-     }
- }
-diff --git a/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php b/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
-index 869d4ba3f45..d159225089a 100644
---- a/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
-+++ b/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
-@@ -267,7 +267,10 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
-         $cartInterfaceMock->expects($this->atLeastOnce())->method('getId')->willReturn($quoteId);
-         $defaultGroup = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)->getMock();
-         $defaultGroup->expects($this->any())->method('getId')->will($this->returnValue($customerGroupId));
--        $this->groupManagementMock->expects($this->any())->method('getDefaultGroup')->willReturn($defaultGroup);
-+        $this->groupManagementMock
-+            ->method('getDefaultGroup')
-+            ->with($storeId)
-+            ->willReturn($defaultGroup);
- 
-         $dataCustomerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-             ->disableOriginalConstructor()
-diff --git a/app/code/Magento/Backend/Test/Unit/Service/V1/ModuleServiceTest.php b/app/code/Magento/Backend/Test/Unit/Service/V1/ModuleServiceTest.php
-new file mode 100644
-index 00000000000..c7ff1d95617
---- /dev/null
-+++ b/app/code/Magento/Backend/Test/Unit/Service/V1/ModuleServiceTest.php
-@@ -0,0 +1,71 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Backend\Test\Unit\Service\V1;
-+
-+use Magento\Backend\Service\V1\ModuleService;
-+use Magento\Framework\Module\ModuleListInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+
-+/**
-+ * Module List Service Test
-+ *
-+ * Covers \Magento\Sales\Model\ValidatorResultMerger
-+ */
-+class ModuleServiceTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Testable Object
-+     *
-+     * @var ModuleService
-+     */
-+    private $moduleService;
-+
-+    /**
-+     * @var ModuleListInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $moduleListMock;
-+
-+    /**
-+     * Object Manager
-+     *
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * Set Up
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->moduleListMock = $this->createMock(ModuleListInterface::class);
-+        $this->objectManager = new ObjectManager($this);
-+        $this->moduleService = $this->objectManager->getObject(
-+            ModuleService::class,
-+            [
-+                'moduleList' => $this->moduleListMock,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test getModules method
-+     *
-+     * @return void
-+     */
-+    public function testGetModules()
-+    {
-+        $moduleNames = ['Magento_Backend', 'Magento_Catalog', 'Magento_Customer'];
-+        $this->moduleListMock->expects($this->once())->method('getNames')->willReturn($moduleNames);
-+
-+        $expected = $moduleNames;
-+        $actual = $this->moduleService->getModules();
-+        $this->assertEquals($expected, $actual);
-+    }
-+}
-diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
-index f9408768136..e54bd136b34 100644
---- a/app/code/Magento/Backend/composer.json
-+++ b/app/code/Magento/Backend/composer.json
-@@ -22,6 +22,7 @@
-       "magento/module-store": "*",
-       "magento/module-translation": "*",
-       "magento/module-ui": "*",
-+      "magento/module-authorization": "*",
-       "magento/module-user": "*"
-     },
-     "suggest": {
-diff --git a/app/code/Magento/Backend/etc/adminhtml/di.xml b/app/code/Magento/Backend/etc/adminhtml/di.xml
-index d8e9674d2b4..5f566396ab5 100644
---- a/app/code/Magento/Backend/etc/adminhtml/di.xml
-+++ b/app/code/Magento/Backend/etc/adminhtml/di.xml
-@@ -14,8 +14,6 @@
-     <preference for="Magento\Framework\App\DefaultPathInterface" type="Magento\Backend\App\DefaultPath" />
-     <preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
-     <preference for="Magento\Framework\App\Response\Http\FileFactory" type="Magento\Backend\App\Response\Http\FileFactory" />
--    <preference for="Magento\Framework\App\Request\ValidatorInterface"
--                type="Magento\Backend\App\Request\BackendValidator" />
-     <type name="Magento\Framework\Stdlib\DateTime\Timezone">
-         <arguments>
-             <argument name="scopeType" xsi:type="const">Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT</argument>
-@@ -88,6 +86,7 @@
-         <arguments>
-             <argument name="lifetimePath" xsi:type="const">Magento\Backend\Model\Auth\Session::XML_PATH_SESSION_LIFETIME</argument>
-             <argument name="sessionName" xsi:type="const">Magento\Backend\Model\Session\AdminConfig::SESSION_NAME_ADMIN</argument>
-+            <argument name="scopeType" xsi:type="const">Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT</argument>
-         </arguments>
-     </type>
-     <type name="Magento\Framework\View\Result\PageFactory">
-@@ -169,4 +168,6 @@
-             <argument name="defaultClass" xsi:type="string">Magento\Backend\Block\Template</argument>
-         </arguments>
-     </type>
-+    <preference for="CsrfRequestValidator" type="Magento\Backend\App\Request\BackendValidator" />
-+    <preference for="Magento\Backend\Model\Image\UploadResizeConfigInterface" type="Magento\Backend\Model\Image\UploadResizeConfig" />
- </config>
-diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
-index be1b836d648..65744e56d94 100644
---- a/app/code/Magento/Backend/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
-@@ -112,7 +112,7 @@
-             <group id="debug" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Debug</label>
-                 <field id="template_hints_storefront" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
--                    <label>Enabled Template Path Hints for Storefront</label>
-+                    <label>Enable Template Path Hints for Storefront</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
-                 <field id="template_hints_storefront_show_with_parameter" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-@@ -129,10 +129,10 @@
-                         <field id="*/*/template_hints_storefront">1</field>
-                         <field id="*/*/template_hints_storefront_show_with_parameter">1</field>
-                     </depends>
--                    <comment>Add the following paramater to the URL to show template hints ?templatehints=[parameter_value]</comment>
-+                    <comment>Add the following parameter to the URL to show template hints ?templatehints=[parameter_value]</comment>
-                 </field>
-                 <field id="template_hints_admin" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
--                    <label>Enabled Template Path Hints for Admin</label>
-+                    <label>Enable Template Path Hints for Admin</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
-                 <field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
-@@ -169,27 +169,31 @@
-             </group>
-             <group id="js" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>JavaScript Settings</label>
--                <field id="merge_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <field id="merge_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Merge JavaScript Files</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
--                <field id="enable_js_bundling" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <field id="enable_js_bundling" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Enable JavaScript Bundling</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
--                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Minify JavaScript Files</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                     <comment>Minification is not applied in developer mode.</comment>
-                 </field>
-+                <field id="move_inline_to_bottom" translate="label" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                    <label>Move JS code to the bottom of the page</label>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                </field>
-             </group>
-             <group id="css" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>CSS Settings</label>
--                <field id="merge_css_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <field id="merge_css_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Merge CSS Files</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
--                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Minify CSS Files</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                     <comment>Minification is not applied in developer mode.</comment>
-@@ -197,7 +201,7 @@
-             </group>
-             <group id="image" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="0" showInStore="0">
-                 <label>Image Processing Settings</label>
--                <field id="default_adapter" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="default_adapter" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Image Adapter</label>
-                     <source_model>Magento\Config\Model\Config\Source\Image\Adapter</source_model>
-                     <backend_model>Magento\Config\Model\Config\Backend\Image\Adapter</backend_model>
-@@ -234,6 +238,7 @@
-                 <field id="destinations" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                     <label>Top destinations</label>
-                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
-+                    <can_be_empty>1</can_be_empty>
-                 </field>
-             </group>
-             <group id="locale" translate="label" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
-@@ -314,19 +319,19 @@
-                     <label>Disable Email Communications</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
--                <field id="host" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="host" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Host</label>
-                     <comment>For Windows server only.</comment>
-                 </field>
--                <field id="port" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="port" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Port (25)</label>
-                     <comment>For Windows server only.</comment>
-                 </field>
--                <field id="set_return_path" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="0" showInStore="0">
-+                <field id="set_return_path" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                     <label>Set Return-Path</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesnocustom</source_model>
-                 </field>
--                <field id="return_path_email" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="0" showInStore="0">
-+                <field id="return_path_email" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
-                     <label>Return-Path Email</label>
-                     <validate>validate-email</validate>
-                     <backend_model>Magento\Config\Model\Config\Backend\Email\Address</backend_model>
-@@ -335,6 +340,30 @@
-                     </depends>
-                 </field>
-             </group>
-+            <group id="upload_configuration" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <label>Images Upload Configuration</label>
-+                <field id="enable_resize" translate="label" type="select" sortOrder="200" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                    <label>Enable Frontend Resize</label>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <comment>Resize performed via javascript before file upload.</comment>
-+                </field>
-+                <field id="max_width" translate="label comment" type="text" sortOrder="300" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                    <label>Maximum Width</label>
-+                    <validate>validate-greater-than-zero validate-number required-entry</validate>
-+                    <comment>Maximum allowed width for uploaded image.</comment>
-+                    <depends>
-+                        <field id="enable_resize">1</field>
-+                    </depends>
-+                </field>
-+                <field id="max_height" translate="label comment" type="text" sortOrder="400" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                    <label>Maximum Height</label>
-+                    <validate>validate-greater-than-zero validate-number required-entry</validate>
-+                    <comment>Maximum allowed height for uploaded image.</comment>
-+                    <depends>
-+                        <field id="enable_resize">1</field>
-+                    </depends>
-+                </field>
-+            </group>
-         </section>
-         <section id="admin" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
-             <label>Admin</label>
-@@ -435,7 +464,7 @@
-                         <![CDATA[<strong style="color:red">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).]]>
-                     </comment>
-                 </field>
--                <field id="redirect_to_base" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="redirect_to_base" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Auto-redirect to Base URL</label>
-                     <source_model>Magento\Config\Model\Config\Source\Web\Redirect</source_model>
-                     <comment>I.e. redirect from http://example.com/store/ to http://www.example.com/store/</comment>
-@@ -448,7 +477,7 @@
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
-             </group>
--            <group id="unsecure" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-+            <group id="unsecure" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Base URLs</label>
-                 <comment>Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/</comment>
-                 <field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-@@ -456,7 +485,7 @@
-                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
-                     <comment>Specify URL or {{base_url}} placeholder.</comment>
-                 </field>
--                <field id="base_link_url" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Base Link URL</label>
-                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
-                     <comment>May start with {{unsecure_base_url}} placeholder.</comment>
-@@ -466,13 +495,13 @@
-                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
-                     <comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
-                 </field>
--                <field id="base_media_url" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                     <label>Base URL for User Media Files</label>
-                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
-                     <comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
-                 </field>
-             </group>
--            <group id="secure" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-+            <group id="secure" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Base URLs (Secure)</label>
-                 <comment>Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/</comment>
-                 <field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-@@ -480,7 +509,7 @@
-                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
-                     <comment>Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.</comment>
-                 </field>
--                <field id="base_link_url" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Secure Base Link URL</label>
-                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
-                     <comment>May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.</comment>
-@@ -490,24 +519,24 @@
-                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
-                     <comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
-                 </field>
--                <field id="base_media_url" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                     <label>Secure Base URL for User Media Files</label>
-                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
-                     <comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
-                 </field>
--                <field id="use_in_frontend" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="use_in_frontend" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Use Secure URLs on Storefront</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                     <backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
-                     <comment>Enter https protocol to use Secure URLs on Storefront.</comment>
-                 </field>
--                <field id="use_in_adminhtml" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="use_in_adminhtml" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Use Secure URLs in Admin</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                     <backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
-                     <comment>Enter https protocol to use Secure URLs in Admin.</comment>
-                 </field>
--                <field id="enable_hsts" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <field id="enable_hsts" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                     <label>Enable HTTP Strict Transport Security (HSTS)</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                     <backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
-@@ -517,7 +546,7 @@
-                         <field id="use_in_adminhtml">1</field>
-                     </depends>
-                 </field>
--                <field id="enable_upgrade_insecure" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <field id="enable_upgrade_insecure" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
-                     <label>Upgrade Insecure Requests</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                     <backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
-diff --git a/app/code/Magento/Backend/etc/config.xml b/app/code/Magento/Backend/etc/config.xml
-index b7aaf8bf20d..8283fa18dd3 100644
---- a/app/code/Magento/Backend/etc/config.xml
-+++ b/app/code/Magento/Backend/etc/config.xml
-@@ -28,6 +28,11 @@
-             <dashboard>
-                 <enable_charts>1</enable_charts>
-             </dashboard>
-+            <upload_configuration>
-+                <enable_resize>1</enable_resize>
-+                <max_width>1920</max_width>
-+                <max_height>1200</max_height>
-+            </upload_configuration>
-         </system>
-         <general>
-             <validator_data>
-diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
-index c526703da99..41db85b9323 100644
---- a/app/code/Magento/Backend/etc/di.xml
-+++ b/app/code/Magento/Backend/etc/di.xml
-@@ -198,4 +198,8 @@
-             <argument name="anchorRenderer" xsi:type="object">Magento\Backend\Block\AnchorRenderer</argument>
-         </arguments>
-     </type>
-+    <preference for="Magento\Backend\Spi\SessionUserHydratorInterface"
-+                type="Magento\Backend\Model\Auth\SessionUserHydrator" />
-+    <preference for="Magento\Backend\Spi\SessionAclHydratorInterface"
-+                type="Magento\Backend\Model\Auth\SessionAclHydrator" />
- </config>
-diff --git a/app/code/Magento/Backend/etc/module.xml b/app/code/Magento/Backend/etc/module.xml
-index 6d1691a0e56..03976396f6f 100644
---- a/app/code/Magento/Backend/etc/module.xml
-+++ b/app/code/Magento/Backend/etc/module.xml
-@@ -6,9 +6,10 @@
-  */
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
--    <module name="Magento_Backend" >
-+    <module name="Magento_Backend">
-         <sequence>
-             <module name="Magento_Directory"/>
-+            <module name="Magento_Theme"/>
-         </sequence>
-     </module>
- </config>
-diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml
-index 50d210f7102..6d2ecd8d36a 100644
---- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml
-+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.cache.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">cache_grid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Backend\Model\Cache\ResourceModel\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Backend\Model\Cache\ResourceModel\Grid\Collection</argument>
-                     <argument name="pager_visibility" xsi:type="string">0</argument>
-                 </arguments>
-                 <block class="Magento\Backend\Block\Widget\Grid\Massaction" name="adminhtml.cache.massaction" as="grid.massaction">
-diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml
-index b96614f4bd8..41bfe6e78a2 100644
---- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml
-+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.design.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">designGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Theme\Model\ResourceModel\Design\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Theme\Model\ResourceModel\Design\Collection</argument>
-                     <argument name="use_ajax" xsi:type="string">1</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-                     <argument name="grid_url" xsi:type="url" path="*/*/grid">
-diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_grid_block.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_grid_block.xml
-index 126de5eb408..d0c0d8fcbf6 100644
---- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_grid_block.xml
-+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_grid_block.xml
-@@ -12,7 +12,7 @@
-                 <arguments>
-                     <argument name="id" xsi:type="string">storeGrid</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Store\Model\ResourceModel\Website\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Store\Model\ResourceModel\Website\Grid\Collection</argument>
-                 </arguments>
-                 <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="adminhtml.system.store.grid.columnSet" as="grid.columnSet">
-                     <arguments>
-diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
-index e80932e5039..a7faab0bc46 100644
---- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml
-+++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
-@@ -60,11 +60,17 @@
-                 </container>
-                 <container name="legal.system" htmlTag="div" htmlClass="footer-legal-system col-m-6">
-                     <block class="Magento\Backend\Block\Page\Footer" name="version" as="version" />
-+                    <block class="Magento\Framework\View\Element\Template" name="privacyPolicy" as="privacyPolicy" template="Magento_Backend::page/privacyPolicy.phtml">
-+                        <arguments>
-+                            <argument name="privacypolicy_url" xsi:type="string">https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf</argument>
-+                        </arguments>
-+                    </block>
-                     <block class="Magento\Framework\View\Element\Template" name="report" as="report" template="Magento_Backend::page/report.phtml">
-                         <arguments>
-                             <argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
-                         </arguments>
-                     </block>
-+                    
-                 </container>
-             </container>
-         </referenceContainer>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
-index 843328fbf17..be309423c48 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
-@@ -3,14 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-  * @see \Magento\Backend\Block\Denied
-  */
-+
-+// phpcs:disable Magento2.Security.Superglobal
- ?>
- <hr class="access-denied-hr"/>
- <div class="access-denied-page">
-@@ -21,10 +20,10 @@
-         <li><span><?= $block->escapeHtml(__('Contact a system administrator or store owner to gain permissions.')) ?></span></li>
-         <li>
-             <span><?= $block->escapeHtml(__('Return to ')) ?>
--                <?php if(isset($_SERVER['HTTP_REFERER'])): ?>
-+                <?php if (isset($_SERVER['HTTP_REFERER'])) : ?>
-                     <a href="<?= $block->escapeUrl(__($_SERVER['HTTP_REFERER'])) ?>">
-                         <?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
--                <?php else: ?>
-+                <?php else : ?>
-                     <a href="<?= $block->escapeHtmlAttr(__('javascript:history.back()')) ?>">
-                         <?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
-                 <?php endif ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml
-index 9629db9fa45..edc14190e4e 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml
-@@ -4,4 +4,4 @@
-  * See COPYING.txt for license details.
-  */
- ?>
--<div><input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" /></div>
-+<div><input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" /></div>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
-index 805e9783f3f..1d05450f44c 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
-@@ -4,19 +4,20 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/**
-+ * @var \Magento\Framework\View\Element\AbstractBlock $block
-+ */
- ?>
- 
- <form method="post" action="" id="login-form" data-mage-init='{"form": {}, "validation": {}}' autocomplete="off">
-     <fieldset class="admin__fieldset">
-         <legend class="admin__legend">
--            <span><?= /* @escapeNotVerified */ __('Welcome, please sign in') ?></span>
-+            <span><?= $block->escapeHtml(__('Welcome, please sign in')) ?></span>
-         </legend><br/>
--        <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
-+        <input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
-         <div class="admin__field _required field-username">
-             <label for="username" class="admin__field-label">
--                <span><?= /* @escapeNotVerified */ __('Username') ?></span>
-+                <span><?= $block->escapeHtml(__('Username')) ?></span>
-             </label>
-             <div class="admin__field-control">
-                 <input id="username"
-@@ -26,14 +27,14 @@
-                        autofocus
-                        value=""
-                        data-validate="{required:true}"
--                       placeholder="<?= /* @escapeNotVerified */ __('user name') ?>"
-+                       placeholder="<?= $block->escapeHtmlAttr(__('user name')) ?>"
-                        autocomplete="off"
-                     />
-             </div>
-         </div>
-         <div class="admin__field _required field-password">
-             <label for="login" class="admin__field-label">
--                <span><?= /* @escapeNotVerified */ __('Password') ?></span>
-+                <span><?= $block->escapeHtml(__('Password')) ?></span>
-             </label>
-             <div class="admin__field-control">
-                 <input id="login"
-@@ -42,8 +43,8 @@
-                        name="login[password]"
-                        data-validate="{required:true}"
-                        value=""
--                       placeholder="<?= /* @escapeNotVerified */ __('password') ?>"
--                       autocomplete="new-password"
-+                       placeholder="<?= $block->escapeHtmlAttr(__('password')) ?>"
-+                       autocomplete="off"
-                     />
-             </div>
-         </div>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml
-index 2459bc54e0c..18ee8a86517 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml
-@@ -8,6 +8,6 @@
-     <button
-         <?php $block->getUiId(); ?>
-         class="action-login action-primary">
--        <span><?= /* @escapeNotVerified */ __('Sign in') ?></span>
-+        <span><?= $block->escapeHtml(__('Sign in')) ?></span>
-     </button>
- </div>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml
-index 93509cc62f7..ac81861c993 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml
-@@ -3,15 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div class="wrapper-popup">
-     <div class="middle" id="anchor-content">
-         <div id="page:main-container">
--        <?php if ($block->getChildHtml('left')): ?>
--            <div class="columns <?= /* @escapeNotVerified */ $block->getContainerCssClass() ?>" id="page:container">
-+        <?php if ($block->getChildHtml('left')) : ?>
-+            <div class="columns <?= $block->escapeHtmlAttr($block->getContainerCssClass()) ?>" id="page:container">
-                 <div id="page:left" class="side-col">
-                     <?= $block->getChildHtml('left') ?>
-                 </div>
-@@ -24,13 +21,13 @@
-                     </div>
-                 </div>
-             </div>
--      <?php else: ?>
-+        <?php else : ?>
-           <div id="messages" data-container-for="messages"><?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?></div>
-           <?= $block->getChildHtml('content') ?>
--      <?php endif; ?>
-+        <?php endif; ?>
-          </div>
-     </div>
--    <?php if ($block->getChildHtml('footer')): ?>
-+    <?php if ($block->getChildHtml('footer')) : ?>
-     <div class="footer">
-         <?= $block->getChildHtml('footer') ?>
-     </div>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
-index ebb8e26c93f..d8cab67ecb7 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
-@@ -3,19 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Backend\Block\Page */ ?>
- <!doctype html>
--<html lang="<?= /* @escapeNotVerified */ $block->getLang() ?>" class="no-js">
-+<html lang="<?= $block->escapeHtmlAttr($block->getLang()) ?>" class="no-js">
- 
- <head>
-     <?= $block->getChildHtml('head') ?>
- </head>
- 
--<body id="html-body"<?= $block->getBodyClass() ? ' class="' . $block->getBodyClass() . '"' : '' ?> data-container="body" data-mage-init='{"loaderAjax":{},"loader":{}}'>
-+<body id="html-body" class="<?= $block->escapeHtmlAttr($block->getBodyClass()) ?>" data-container="body" data-mage-init='{"loaderAjax":{},"loader":{}}'>
-     <div class="page-wrapper">
-         <?= $block->getChildHtml('notification_window') ?>
-         <?= $block->getChildHtml('global_notices') ?>
-@@ -31,8 +28,8 @@
-                 <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
-             </div>
-             <?= $block->getChildHtml('page_main_actions') ?>
--            <?php if ($block->getChildHtml('left')): ?>
--                <div id="page:main-container" class="<?= /* @escapeNotVerified */ $block->getContainerCssClass() ?> col-2-left-layout">
-+            <?php if ($block->getChildHtml('left')) : ?>
-+                <div id="page:main-container" class="<?= $block->escapeHtmlAttr($block->getContainerCssClass()) ?> col-2-left-layout">
-                     <div class="main-col" id="content">
-                         <?= $block->getChildHtml('content') ?>
-                     </div>
-@@ -41,7 +38,7 @@
-                         <?= $block->getChildHtml('left') ?>
-                     </div>
-                 </div>
--            <?php else: ?>
-+            <?php else : ?>
-                 <div id="page:main-container" class="col-1-layout">
-                     <?= $block->getChildHtml('content') ?>
-                 </div>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
-index ae123511bd4..12b388c2107 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
-@@ -3,33 +3,33 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div class="dashboard-diagram">
-     <div class="dashboard-diagram-switcher">
-         <label for="order_<?= $block->getHtmlId() ?>_period"
--               class="label"><?= /* @escapeNotVerified */ __('Select Range:') ?></label>
-+               class="label"><?= $block->escapeHtml(__('Select Range:')) ?></label>
-         <select name="period" id="order_<?= $block->getHtmlId() ?>_period"
-                 onchange="changeDiagramsPeriod(this);" class="admin__control-select">
--            <?php foreach ($this->helper('Magento\Backend\Helper\Dashboard\Data')->getDatePeriods() as $value => $label): ?>
--                <?php if (in_array($value, ['custom'])) {
-+            <?php //phpcs:disable ?>
-+            <?php foreach ($this->helper(\Magento\Backend\Helper\Dashboard\Data::class)->getDatePeriods() as $value => $label) : ?>
-+                <?php
-+                //phpcs:enable
-+                if (in_array($value, ['custom'])) {
-                     continue;
-                 } ?>
--                <option value="<?= /* @escapeNotVerified */ $value ?>"
--                    <?php if ($block->getRequest()->getParam('period') == $value): ?> selected="selected"<?php endif; ?>
--                    ><?= /* @escapeNotVerified */ $label ?></option>
-+                <option value="<?= /* @noEscape */ $value ?>"
-+                    <?php if ($block->getRequest()->getParam('period') == $value) : ?> selected="selected"<?php endif; ?>
-+                    ><?= $block->escapeHtml($label) ?></option>
-             <?php endforeach; ?>
-         </select>
-     </div>
--    <?php if ($block->getCount()): ?>
-+    <?php if ($block->getCount()) : ?>
-     <div class="dashboard-diagram-image">
--        <img src="<?= /* @escapeNotVerified */ $block->getChartUrl(false) ?>" class="dashboard-diagram-chart" alt="Chart" title="Chart" />
-+        <img src="<?= $block->escapeUrl($block->getChartUrl(false)) ?>" class="dashboard-diagram-chart" alt="Chart" title="Chart" />
-     </div>
--    <?php else: ?>
-+    <?php else : ?>
-     <div class="dashboard-diagram-nodata">
--        <span><?= /* @escapeNotVerified */ __('No Data Found') ?></span>
-+        <span><?= $block->escapeHtml(__('No Data Found')) ?></span>
-     </div>
-     <?php endif; ?>
- </div>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml
-index 7dddc151218..f8e584ce5b9 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <div class="dashboard-diagram-disabled">
--    <?= /* @escapeNotVerified */ __('Chart is disabled. To enable the chart, click <a href="%1">here</a>.', $block->getConfigUrl()) ?>
-+    <?= /* @noEscape */ __('Chart is disabled. To enable the chart, click <a href="%1">here</a>.', $block->escapeUrl($block->getConfigUrl())) ?>
- </div>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
-index 1041aef59ce..7c05335642b 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
-@@ -3,90 +3,87 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- 
--$numColumns = sizeof($block->getColumns());
-+$numColumns = count($block->getColumns());
- ?>
--<?php if ($block->getCollection()): ?>
-+<?php if ($block->getCollection()) : ?>
- <div class="dashboard-item-content">
--    <?php if ($block->getCollection()->getSize()>0): ?>
--        <table class="admin__table-primary dashboard-data" id="<?= /* @escapeNotVerified */ $block->getId() ?>_table">
-+    <?php if ($block->getCollection()->getSize() > 0) : ?>
-+        <table class="admin__table-primary dashboard-data" id="<?= $block->escapeHtmlAttr($block->getId()) ?>_table">
-             <?php
-             /* This part is commented to remove all <col> tags from the code. */
-             /* foreach ($block->getColumns() as $_column): ?>
-             <col <?= $_column->getHtmlProperty() ?> />
-             <?php endforeach; */ ?>
--            <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()): ?>
-+            <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()) : ?>
-                 <thead>
--                <?php if ($block->getHeadersVisibility()): ?>
-+                <?php if ($block->getHeadersVisibility()) : ?>
-                     <tr>
--                        <?php foreach ($block->getColumns() as $_column): ?>
-+                        <?php foreach ($block->getColumns() as $_column) : ?>
-                             <?= $_column->getHeaderHtml() ?>
-                         <?php endforeach; ?>
-                     </tr>
-                 <?php endif; ?>
-                 </thead>
-             <?php endif; ?>
--            <?php if (!$block->getIsCollapsed()): ?>
-+            <?php if (!$block->getIsCollapsed()) : ?>
-                 <tbody>
--                <?php foreach ($block->getCollection() as $_index => $_item): ?>
--                    <tr title="<?= /* @escapeNotVerified */ $block->getRowUrl($_item) ?>">
--                    <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
--                        <td class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= ++$i == $numColumns ? 'last' : '' ?>"><?= (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?></td>
-+                <?php foreach ($block->getCollection() as $_index => $_item) : ?>
-+                    <tr title="<?= $block->escapeHtmlAttr($block->getRowUrl($_item)) ?>">
-+                    <?php $i = 0; foreach ($block->getColumns() as $_column) : ?>
-+                        <td class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?> <?= /* @noEscape */ ++$i == $numColumns ? 'last' : '' ?>"><?= /* @noEscape */ (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?></td>
-                     <?php endforeach; ?>
-                     </tr>
-                 <?php endforeach; ?>
-                 </tbody>
-             <?php endif; ?>
-         </table>
--    <?php else: ?>
--        <div class="<?= /* @escapeNotVerified */ $block->getEmptyTextClass() ?>"><?= /* @escapeNotVerified */ $block->getEmptyText() ?></div>
-+    <?php else : ?>
-+        <div class="<?= $block->escapeHtmlAttr($block->getEmptyTextClass()) ?>"><?= $block->escapeHtml($block->getEmptyText()) ?></div>
-     <?php endif; ?>
- </div>
--<?php if ($block->canDisplayContainer()): ?>
-+    <?php if ($block->canDisplayContainer()) : ?>
- <script>
- var deps = [];
- 
--<?php if ($block->getDependencyJsObject()): ?>
-+        <?php if ($block->getDependencyJsObject()) : ?>
- deps.push('uiRegistry');
--<?php endif; ?>
-+        <?php endif; ?>
- 
--<?php if (strpos($block->getRowClickCallback(), 'order.') !== false): ?>
-+        <?php if (strpos($block->getRowClickCallback(), 'order.') !== false) : ?>
- deps.push('Magento_Sales/order/create/form');
--<?php endif; ?>
-+        <?php endif; ?>
- 
- deps.push('mage/adminhtml/grid');
- 
- require(deps, function(<?= ($block->getDependencyJsObject() ? 'registry' : '') ?>){
--    <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
-+        <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
- 
--    <?php if ($block->getDependencyJsObject()): ?>
--        registry.get('<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>', function (<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>) {
--    <?php endif; ?>
-+        <?php if ($block->getDependencyJsObject()) : ?>
-+        registry.get('<?= $block->escapeJs($block->getDependencyJsObject()) ?>', function (<?= $block->escapeJs($block->getDependencyJsObject()) ?>) {
-+        <?php endif; ?>
- 
--    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?> = new varienGrid('<?= /* @escapeNotVerified */ $block->getId() ?>', '<?= /* @escapeNotVerified */ $block->getGridUrl() ?>', '<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameSort() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameDir() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameFilter() ?>');
--    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.useAjax = '<?= /* @escapeNotVerified */ $block->getUseAjax() ?>';
--    <?php if ($block->getRowClickCallback()): ?>
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.rowClickCallback = <?= /* @escapeNotVerified */ $block->getRowClickCallback() ?>;
--    <?php endif; ?>
--    <?php if ($block->getCheckboxCheckCallback()): ?>
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.checkboxCheckCallback = <?= /* @escapeNotVerified */ $block->getCheckboxCheckCallback() ?>;
--    <?php endif; ?>
--    <?php if ($block->getRowInitCallback()): ?>
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.initRowCallback = <?= /* @escapeNotVerified */ $block->getRowInitCallback() ?>;
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.rows.each(function(row){<?= /* @escapeNotVerified */ $block->getRowInitCallback() ?>(<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>, row)});
--    <?php endif; ?>
--    <?php if ($block->getMassactionBlock()->isAvailable()): ?>
--    <?= /* @escapeNotVerified */ $block->getMassactionBlock()->getJavaScript() ?>
--    <?php endif ?>
-+        <?= $block->escapeJs($block->getJsObjectName()) ?> = new varienGrid('<?= $block->escapeJs($block->getId()) ?>', '<?= $block->escapeJs($block->getGridUrl()) ?>', '<?= $block->escapeJs($block->getVarNamePage()) ?>', '<?= $block->escapeJs($block->getVarNameSort()) ?>', '<?= $block->escapeJs($block->getVarNameDir()) ?>', '<?= $block->escapeJs($block->getVarNameFilter()) ?>');
-+        <?= $block->escapeJs($block->getJsObjectName()) ?>.useAjax = '<?= $block->escapeJs($block->getUseAjax()) ?>';
-+        <?php if ($block->getRowClickCallback()) : ?>
-+            <?= $block->escapeJs($block->getJsObjectName()) ?>.rowClickCallback = <?= /* @noEscape */ $block->getRowClickCallback() ?>;
-+        <?php endif; ?>
-+        <?php if ($block->getCheckboxCheckCallback()) : ?>
-+            <?= $block->escapeJs($block->getJsObjectName()) ?>.checkboxCheckCallback = <?= /* @noEscape */ $block->getCheckboxCheckCallback() ?>;
-+        <?php endif; ?>
-+        <?php if ($block->getRowInitCallback()) : ?>
-+            <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
-+            <?= $block->escapeJs($block->getJsObjectName()) ?>.rows.each(function(row){<?= /* @noEscape */ $block->getRowInitCallback() ?>(<?= $block->escapeJs($block->getJsObjectName()) ?>, row)});
-+        <?php endif; ?>
-+        <?php if ($block->getMassactionBlock()->isAvailable()) : ?>
-+            <?= /* @noEscape */ $block->getMassactionBlock()->getJavaScript() ?>
-+        <?php endif ?>
- 
--    <?php if ($block->getDependencyJsObject()): ?>
-+        <?php if ($block->getDependencyJsObject()) : ?>
-     });
--    <?php endif; ?>
-+        <?php endif; ?>
- 
- });
- </script>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
-index 865e0fac383..6152c8fe1cf 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php if (is_array($block->getChildBlock('diagrams')->getTabsIds())) : ?>
-@@ -17,13 +14,13 @@ require([
- 
- window.changeDiagramsPeriod = function(periodObj) {
-     periodParam = periodObj.value ? 'period/' + periodObj.value + '/' : '';
--<?php foreach ($block->getChildBlock('diagrams')->getTabsIds() as $tabId): ?>
--    ajaxBlockParam = 'block/tab_<?= /* @escapeNotVerified */ $tabId ?>/';
--    ajaxBlockUrl = '<?= $block->getUrl('adminhtml/*/ajaxBlock', ['_current' => true, 'block' => '', 'period' => '']) ?>' + ajaxBlockParam + periodParam;
-+    <?php foreach ($block->getChildBlock('diagrams')->getTabsIds() as $tabId) : ?>
-+    ajaxBlockParam = 'block/tab_<?= $block->escapeJs($tabId) ?>/';
-+    ajaxBlockUrl = '<?= $block->escapeJs($block->getUrl('adminhtml/*/ajaxBlock', ['_current' => true, 'block' => '', 'period' => ''])) ?>' + ajaxBlockParam + periodParam;
-     new Ajax.Request(ajaxBlockUrl, {
-         parameters: {isAjax: 'true', form_key: FORM_KEY},
-         onSuccess: function(transport) {
--            tabContentElementId = '<?= /* @escapeNotVerified */ $block->getChildBlock('diagrams')->getId() ?>_<?= /* @escapeNotVerified */ $tabId ?>_content';
-+            tabContentElementId = '<?= $block->escapeJs($block->getChildBlock('diagrams')->getId()) ?>_<?= $block->escapeJs($tabId) ?>_content';
-             try {
-                 if (transport.responseText.isJSON()) {
-                     var response = transport.responseText.evalJSON()
-@@ -44,8 +41,8 @@ window.changeDiagramsPeriod = function(periodObj) {
-             }
-         }
-     });
--<?php endforeach; ?>
--    ajaxBlockUrl = '<?= $block->getUrl('adminhtml/*/ajaxBlock', ['_current' => true, 'block' => 'totals', 'period' => '']) ?>' + periodParam;
-+    <?php endforeach; ?>
-+    ajaxBlockUrl = '<?= $block->escapeJs($block->getUrl('adminhtml/*/ajaxBlock', ['_current' => true, 'block' => 'totals', 'period' => ''])) ?>' + periodParam;
-     new Ajax.Request(ajaxBlockUrl, {
-         parameters: {isAjax: 'true', form_key: FORM_KEY},
-         onSuccess: function(transport) {
-@@ -93,15 +90,15 @@ window.changeDiagramsPeriod = function(periodObj) {
-     <div class="dashboard-secondary col-m-4 col-m-pull-8">
-         <?= $block->getChildHtml('sales') ?>
-         <div class="dashboard-item">
--            <div class="dashboard-item-title"><?= /* @escapeNotVerified */ __('Last Orders') ?></div>
-+            <div class="dashboard-item-title"><?= $block->escapeHtml(__('Last Orders')) ?></div>
-             <?= $block->getChildHtml('lastOrders') ?>
-         </div>
-         <div class="dashboard-item">
--            <div class="dashboard-item-title"><?= /* @escapeNotVerified */ __('Last Search Terms') ?></div>
-+            <div class="dashboard-item-title"><?= $block->escapeHtml(__('Last Search Terms')) ?></div>
-             <?= $block->getChildHtml('lastSearches') ?>
-         </div>
-         <div class="dashboard-item">
--            <div class="dashboard-item-title"><?= /* @escapeNotVerified */ __('Top Search Terms') ?></div>
-+            <div class="dashboard-item-title"><?= $block->escapeHtml(__('Top Search Terms')) ?></div>
-             <?= $block->getChildHtml('topSearches') ?>
-         </div>
-     </div>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml
-index 450a2c89b50..139a7cad418 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml
-@@ -3,18 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if (sizeof($block->getTotals()) > 0): ?>
--    <?php foreach ($block->getTotals() as $_total): ?>
-+<?php if (count($block->getTotals()) > 0) : ?>
-+    <?php foreach ($block->getTotals() as $_total) : ?>
-     <div class="dashboard-item dashboard-item-primary">
--        <div class="dashboard-item-title"><?= /* @escapeNotVerified */ $_total['label'] ?></div>
-+        <div class="dashboard-item-title"><?= $block->escapeHtml($_total['label']) ?></div>
-         <div class="dashboard-item-content">
-             <strong class="dashboard-sales-value">
--                <?= /* @escapeNotVerified */ $_total['value'] ?>
--                <span class="dashboard-sales-decimals"><?= /* @escapeNotVerified */ $_total['decimals'] ?></span>
-+                <?= /* @noEscape */ $_total['value'] ?>
-+                <span class="dashboard-sales-decimals"><?= /* @noEscape */ $_total['decimals'] ?></span>
-             </strong>
-         </div>
-     </div>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml
-index f6e837fd54e..7a7a71f07fa 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml
-@@ -3,16 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if (count($block->getCollection()->getItems()) > 0): ?>
-+<?php if (count($block->getCollection()->getItems()) > 0) : ?>
-     <div class="searches-results">
--        <?php foreach ($block->getCollection()->getItems() as $item): ?>
--        <span><?= /* @escapeNotVerified */ $item->getQueryText() ?></span><br />
-+        <?php foreach ($block->getCollection()->getItems() as $item) : ?>
-+        <span><?= $block->escapeHtml($item->getQueryText()) ?></span><br />
-         <?php endforeach; ?>
-     </div>
--<?php else: ?>
--    <div class="empty-text"><?= /* @escapeNotVerified */ __('There are no search keywords.') ?></div>
-+<?php else : ?>
-+    <div class="empty-text"><?= $block->escapeHtml(__('There are no search keywords.')) ?></div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
-index bf9ae27f17b..87e5399ddda 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
-@@ -3,31 +3,28 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<p class="switcher"><label for="store_switcher"><?= /* @escapeNotVerified */ __('View Statistics For:') ?></label>
-+<p class="switcher"><label for="store_switcher"><?= $block->escapeHtml(__('View Statistics For:')) ?></label>
- <?= $block->getHintHtml() ?>
- <select name="store_switcher" id="store_switcher" class="left-col-block" onchange="return switchStore(this);">
--    <option value=""><?= /* @escapeNotVerified */ __('All Websites') ?></option>
--    <?php foreach ($block->getWebsiteCollection() as $_website): ?>
-+    <option value=""><?= $block->escapeHtml(__('All Websites')) ?></option>
-+    <?php foreach ($block->getWebsiteCollection() as $_website) : ?>
-         <?php $showWebsite = false; ?>
--        <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
-+        <?php foreach ($block->getGroupCollection($_website) as $_group) : ?>
-             <?php $showGroup = false; ?>
--            <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
--                <?php if ($showWebsite == false): ?>
-+            <?php foreach ($block->getStoreCollection($_group) as $_store) : ?>
-+                <?php if ($showWebsite == false) : ?>
-                     <?php $showWebsite = true; ?>
--                    <option website="true" value="<?= /* @escapeNotVerified */ $_website->getId() ?>"<?php if ($block->getRequest()->getParam('website') == $_website->getId()): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ $_website->getName() ?></option>
-+                    <option website="true" value="<?= $block->escapeHtmlAttr($_website->getId()) ?>"<?php if ($block->getRequest()->getParam('website') == $_website->getId()) : ?> selected="selected"<?php endif; ?>><?= $block->escapeHtml($_website->getName()) ?></option>
-                 <?php endif; ?>
--                <?php if ($showGroup == false): ?>
-+                <?php if ($showGroup == false) : ?>
-                     <?php $showGroup = true; ?>
--                    <!--optgroup label="&nbsp;&nbsp;&nbsp;<?= /* @escapeNotVerified */ $_group->getName() ?>"-->
--                    <option group="true" value="<?= /* @escapeNotVerified */ $_group->getId() ?>"<?php if ($block->getRequest()->getParam('group') == $_group->getId()): ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= /* @escapeNotVerified */ $_group->getName() ?></option>
-+                    <!--optgroup label="&nbsp;&nbsp;&nbsp;<?= $block->escapeHtmlAttr($_group->getName()) ?>"-->
-+                    <option group="true" value="<?= $block->escapeHtmlAttr($_group->getId()) ?>"<?php if ($block->getRequest()->getParam('group') == $_group->getId()) : ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_group->getName()) ?></option>
-                 <?php endif; ?>
--                <option value="<?= /* @escapeNotVerified */ $_store->getId() ?>"<?php if ($block->getStoreId() == $_store->getId()): ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= /* @escapeNotVerified */ $_store->getName() ?></option>
-+                <option value="<?= $block->escapeHtmlAttr($_store->getId()) ?>"<?php if ($block->getStoreId() == $_store->getId()) : ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_store->getName()) ?></option>
-             <?php endforeach; ?>
--            <?php if ($showGroup): ?>
-+            <?php if ($showGroup) : ?>
-                 <!--</optgroup>-->
-             <?php endif; ?>
-         <?php endforeach; ?>
-@@ -57,7 +54,7 @@
-                 var select = $('order_amounts_period');
-             }
-             var periodParam = select.value ? 'period/' + select.value + '/' : '';
--            setLocation('<?= /* @escapeNotVerified */ $block->getSwitchUrl() ?>' + storeParam + periodParam);
-+            setLocation('<?= $block->escapeJs($block->getSwitchUrl()) ?>' + storeParam + periodParam);
-         }
-     });
- </script>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml
-index 8605304b1f5..918eea75fab 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml
-@@ -3,19 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if (sizeof($block->getTotals()) > 0): ?>
-+<?php if (count($block->getTotals()) > 0) : ?>
- <div class="dashboard-totals" id="dashboard_diagram_totals">
-     <ul class="dashboard-totals-list">
--        <?php foreach ($block->getTotals() as $_total): ?>
-+        <?php foreach ($block->getTotals() as $_total) : ?>
-             <li class="dashboard-totals-item">
--                <span class="dashboard-totals-label"><?= /* @escapeNotVerified */ $_total['label'] ?></span>
-+                <span class="dashboard-totals-label"><?= $block->escapeHtml($_total['label']) ?></span>
-                 <strong class="dashboard-totals-value">
--                    <?= /* @escapeNotVerified */ $_total['value'] ?>
--                    <span class="dashboard-totals-decimals"><?= /* @escapeNotVerified */ $_total['decimals'] ?></span>
-+                    <?= /* @noEscape */ $_total['value'] ?>
-+                    <span class="dashboard-totals-decimals"><?= /* @noEscape */ $_total['decimals'] ?></span>
-                 </strong>
-             </li>
-         <?php endforeach; ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
-index 1e14dd83763..83482b1720c 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
-@@ -4,24 +4,23 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Backend\Block\Media\Uploader */
- ?>
- 
- <div id="<?= $block->getHtmlId() ?>" class="uploader"
-     data-mage-init='{
-         "Magento_Backend/js/media-uploader" : {
--            "maxFileSize": <?= /* @escapeNotVerified */ $block->getFileSizeService()->getMaxFileSize() ?>,
--            "maxWidth":<?= /* @escapeNotVerified */ \Magento\Framework\File\Uploader::MAX_IMAGE_WIDTH ?> ,
--            "maxHeight": <?= /* @escapeNotVerified */ \Magento\Framework\File\Uploader::MAX_IMAGE_HEIGHT ?>
-+            "maxFileSize": <?= /* @noEscape */ $block->getFileSizeService()->getMaxFileSize() ?>,
-+            "maxWidth": <?= /* @noEscape */ $block->getImageUploadMaxWidth() ?>,
-+            "maxHeight": <?= /* @noEscape */ $block->getImageUploadMaxHeight() ?>,
-+            "isResizeEnabled": <?= /* @noEscape */ $block->getImageUploadConfigData()->getIsResizeEnabled() ?>
-         }
-     }'
- >
-     <div class="fileinput-button form-buttons button">
--        <span><?= /* @escapeNotVerified */ __('Browse Files...') ?></span>
--        <input id="fileupload" type="file" name="<?= /* @escapeNotVerified */ $block->getConfig()->getFileField() ?>"
--            data-url="<?= /* @escapeNotVerified */ $block->getConfig()->getUrl() ?>" multiple="multiple" />
-+        <span><?= $block->escapeHtml(__('Browse Files...')) ?></span>
-+        <input id="fileupload" type="file" name="<?= $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>"
-+            data-url="<?= $block->escapeHtmlAttr($block->getConfig()->getUrl()) ?>" multiple="multiple" />
-     </div>
-     <div class="clear"></div>
-     <script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template" data-template="uploader">
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml b/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml
-index c448bd61b07..815cf9c8e4c 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml
-@@ -3,12 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <nav data-mage-init='{"globalNavigation": {}}' class="admin__menu">
--    <?= /* @escapeNotVerified */ $block->renderNavigation($block->getMenuModel(), 0, 12) ?>
-+    <?= /* @noEscape */ $block->renderNavigation($block->getMenuModel(), 0, 12) ?>
- </nav>
- 
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
-index 55bdbb460ba..e3a5c84ea45 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<a class="link-copyright" href="http://magento.com" target="_blank" title="<?= /* @escapeNotVerified */ __('Magento') ?>"></a>
--<?= /* @escapeNotVerified */ __('Copyright &copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>
-+<a class="link-copyright" href="http://magento.com" target="_blank" title="<?= $block->escapeHtmlAttr(__('Magento')) ?>"></a>
-+<?= $block->escapeHtml(__('Copyright &copy; %1 Magento Commerce Inc. All rights reserved.', date('Y'))) ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml
-index 78e2e6db15e..3f21dcda9a5 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml
-@@ -3,11 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <p class="magento-version">
--    <strong><?= /* @escapeNotVerified */ __('Magento') ?></strong>
--    <?= /* @escapeNotVerified */ __('ver. %1', $block->getMagentoVersion()) ?>
-+    <strong><?= $block->escapeHtml(__('Magento')) ?></strong>
-+    <?= $block->escapeHtml(__('ver. %1', $block->getMagentoVersion())) ?>
- </p>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
-index f952001f5e2..89f14466400 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
-@@ -4,26 +4,23 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Backend\Block\Page\Header */
-+$part = $block->getShowPart();
- ?>
--<?php switch ($block->getShowPart()):
--    case 'logo': ?>
-+<?php if ($part === 'logo') : ?>
-         <?php $edition = $block->hasEdition() ? 'data-edition="' . $block->escapeHtml($block->getEdition()) . '"' : ''; ?>
-         <?php $logoSrc = ($block->hasLogoImageSrc()) ? $block->escapeHtml($block->getLogoImageSrc()) : 'images/magento-logo.svg' ?>
-         <a
--            href="<?= /* @escapeNotVerified */ $block->getHomeLink() ?>"
--            <?= /* @escapeNotVerified */ $edition ?>
-+            href="<?= $block->escapeUrl($block->getHomeLink()) ?>"
-+            <?= /* @noEscape */ $edition ?>
-             class="logo">
--            <img class="logo-img" src="<?= /* @escapeNotVerified */ $block->getViewFileUrl($logoSrc) ?>"
-+            <img class="logo-img" src="<?= /* @noEscape */ $block->getViewFileUrl($logoSrc) ?>"
-             alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>" title="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
-         </a>
--    <?php break; ?>
--    <?php case 'user': ?>
-+<?php elseif ($part === 'user') : ?>
-         <div class="admin-user admin__action-dropdown-wrap">
-             <a
--                href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/system_account/index') ?>"
-+                href="<?= /* @noEscape */ $block->getUrl('adminhtml/system_account/index') ?>"
-                 class="admin__action-dropdown"
-                 title="<?= $block->escapeHtml(__('My Account')) ?>"
-                 data-mage-init='{"dropdown":{}}'
-@@ -33,36 +30,35 @@
-                 </span>
-             </a>
-             <ul class="admin__action-dropdown-menu">
--                <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::myaccount')): ?>
-+                <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::myaccount')) : ?>
-                 <li>
-                     <a
--                        href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/system_account/index') ?>"
--                        <?= /* @escapeNotVerified */ $block->getUiId('user', 'account', 'settings') ?>
-+                        href="<?= /* @noEscape */ $block->getUrl('adminhtml/system_account/index') ?>"
-+                        <?= /* @noEscape */ $block->getUiId('user', 'account', 'settings') ?>
-                         title="<?= $block->escapeHtml(__('Account Setting')) ?>">
--                        <?= /* @escapeNotVerified */ __('Account Setting') ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>)
-+                        <?= $block->escapeHtml(__('Account Setting')) ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>)
-                     </a>
-                 </li>
-                 <?php endif; ?>
-                 <li>
-                     <a
--                        href="<?= /* @escapeNotVerified */ $block->getBaseUrl() ?>"
-+                        href="<?= /* @noEscape */ $block->getBaseUrl() ?>"
-                         title="<?= $block->escapeHtml(__('Customer View')) ?>"
-                         target="_blank" class="store-front">
--                        <?= /* @escapeNotVerified */ __('Customer View') ?>
-+                        <?= $block->escapeHtml(__('Customer View')) ?>
-                     </a>
-                 </li>
-                 <li>
-                     <a
--                        href="<?= /* @escapeNotVerified */ $block->getLogoutLink() ?>"
-+                        href="<?= /* @noEscape */ $block->getLogoutLink() ?>"
-                         class="account-signout"
-                         title="<?= $block->escapeHtml(__('Sign Out')) ?>">
--                        <?= /* @escapeNotVerified */ __('Sign Out') ?>
-+                        <?= $block->escapeHtml(__('Sign Out')) ?>
-                     </a>
-                 </li>
-             </ul>
-         </div>
--    <?php break; ?>
--    <?php case 'other': ?>
--        <?= $block->getChildHtml() ?>
--    <?php break; ?>
--<?php endswitch; ?>
-+
-+<?php elseif ($part === 'other') : ?>
-+    <?= $block->getChildHtml() ?>
-+<?php endif; ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml
-index e47bf5830f9..94df9ef9eb8 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml
-@@ -3,7 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// no notice of license for now
- ?>
- 
- <?php
-@@ -22,20 +21,20 @@ require([
- 
-     $.extend(true, $, {
-         calendarConfig: {
--            dayNames: <?= /* @escapeNotVerified */ $days['wide'] ?>,
--            dayNamesMin: <?= /* @escapeNotVerified */ $days['abbreviated'] ?>,
--            monthNames: <?= /* @escapeNotVerified */ $months['wide'] ?>,
--            monthNamesShort: <?= /* @escapeNotVerified */ $months['abbreviated'] ?>,
--            infoTitle: "<?= /* @escapeNotVerified */ __('About the calendar') ?>",
--            firstDay: <?= /* @escapeNotVerified */ $firstDay ?>,
--            closeText: "<?= /* @escapeNotVerified */ __('Close') ?>",
--            currentText: "<?= /* @escapeNotVerified */ __('Go Today') ?>",
--            prevText: "<?= /* @escapeNotVerified */ __('Previous') ?>",
--            nextText: "<?= /* @escapeNotVerified */ __('Next') ?>",
--            weekHeader: "<?= /* @escapeNotVerified */ __('WK') ?>",
--            timeText: "<?= /* @escapeNotVerified */ __('Time') ?>",
--            hourText: "<?= /* @escapeNotVerified */ __('Hour') ?>",
--            minuteText: "<?= /* @escapeNotVerified */ __('Minute') ?>",
-+            dayNames: <?= /* @noEscape */ $days['wide'] ?>,
-+            dayNamesMin: <?= /* @noEscape */ $days['abbreviated'] ?>,
-+            monthNames: <?= /* @noEscape */ $months['wide'] ?>,
-+            monthNamesShort: <?= /* @noEscape */ $months['abbreviated'] ?>,
-+            infoTitle: "<?= $block->escapeJs(__('About the calendar')) ?>",
-+            firstDay: <?= /* @noEscape */ $firstDay ?>,
-+            closeText: "<?= $block->escapeJs(__('Close')) ?>",
-+            currentText: "<?= $block->escapeJs(__('Go Today')) ?>",
-+            prevText: "<?= $block->escapeJs(__('Previous')) ?>",
-+            nextText: "<?= $block->escapeJs(__('Next')) ?>",
-+            weekHeader: "<?= $block->escapeJs(__('WK')) ?>",
-+            timeText: "<?= $block->escapeJs(__('Time')) ?>",
-+            hourText: "<?= $block->escapeJs(__('Hour')) ?>",
-+            minuteText: "<?= $block->escapeJs(__('Minute')) ?>",
-             dateFormat: $.datepicker.RFC_2822,
-             showOn: "button",
-             showAnim: "",
-@@ -52,11 +51,11 @@ require([
-             showMinute: false,
-             serverTimezoneSeconds: <?= (int) $block->getStoreTimestamp() ?>,
-             serverTimezoneOffset: <?= (int) $block->getTimezoneOffsetSeconds() ?>,
--            yearRange: '<?= /* @escapeNotVerified */ $block->getYearRange() ?>'
-+            yearRange: '<?= $block->escapeJs($block->getYearRange()) ?>'
-         }
-     });
- 
--enUS = <?= /* @escapeNotVerified */ $enUS ?>; // en_US locale reference
-+enUS = <?= /* @noEscape */ $enUS ?>; // en_US locale reference
- 
- });
- </script>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml
-index c6c7bcc901e..5277a1df2f3 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml
-index 9cb2cec0919..68453d9ff8f 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml
-@@ -5,9 +5,9 @@
-  */
- ?>
- <script>
--    var BASE_URL = '<?= /* @escapeNotVerified */ $block->getUrl('*') ?>';
--    var FORM_KEY = '<?= /* @escapeNotVerified */ $block->getFormKey() ?>';
-+    var BASE_URL = '<?= /* @noEscape */ $block->getUrl('*') ?>';
-+    var FORM_KEY = '<?= /* @noEscape */ $block->getFormKey() ?>';
-     var require = {
--        "baseUrl": "<?= /* @escapeNotVerified */ $block->getViewFileUrl('/') ?>"
-+        "baseUrl": "<?= /* @noEscape */ $block->getViewFileUrl('/') ?>"
-     };
- </script>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml
-index 5418ad58b95..93df0aec94e 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml
-@@ -3,29 +3,26 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-  * @see \Magento\Backend\Block\Page\Notices
-  */
- ?>
--<?php if ($block->displayNoscriptNotice()): ?>
-+<?php if ($block->displayNoscriptNotice()) : ?>
-     <noscript>
-         <div class="messages">
-             <div class="message message-warning message-noscript">
--                <strong><?= /* @escapeNotVerified */ __('JavaScript may be disabled in your browser.') ?></strong>
--                <?= /* @escapeNotVerified */ __('To use this website you must first enable JavaScript in your browser.') ?>
-+                <strong><?= $block->escapeHtml(__('JavaScript may be disabled in your browser.')) ?></strong>
-+                <?= $block->escapeHtml(__('To use this website you must first enable JavaScript in your browser.')) ?>
-             </div>
-         </div>
-     </noscript>
- <?php endif; ?>
--<?php if ($block->displayDemoNotice()): ?>
-+<?php if ($block->displayDemoNotice()) : ?>
-     <div class="messages">
-         <div class="message message-warning message-demo-mode">
--            <?= /* @escapeNotVerified */ __('This is only a demo store. You can browse and place orders, but nothing will be processed.') ?>
-+            <?= $block->escapeHtml(__('This is only a demo store. You can browse and place orders, but nothing will be processed.')) ?>
-         </div>
-     </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/privacyPolicy.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/privacyPolicy.phtml
-new file mode 100644
-index 00000000000..8c876762783
---- /dev/null
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/privacyPolicy.phtml
-@@ -0,0 +1,11 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+?>
-+
-+<a class="link-report" href="<?= $block->escapeUrl($block->getPrivacypolicyUrl()) ?>" id="footer_privacy" target="_blank">
-+    <?= $block->escapeHtml(__('Privacy Policy')) ?>
-+</a> |
-\ No newline at end of file
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml
-index 4ef6d378cc4..2965983e121 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml
-@@ -3,12 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($block->getBugreportUrl()): ?>
--    <a class="link-report" href="<?= /* @escapeNotVerified */ $block->getBugreportUrl() ?>" id="footer_bug_tracking" target="_blank">
--        <?= /* @escapeNotVerified */ __('Report an Issue') ?>
-+<?php if ($block->getBugreportUrl()) : ?>
-+    <a class="link-report" href="<?= $block->escapeUrl($block->getBugreportUrl()) ?>" id="footer_bug_tracking" target="_blank">
-+        <?= $block->escapeHtml(__('Report an Issue')) ?>
-     </a>
- <?php endif; ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
-index 69d545f12d0..56a8161b57e 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
-@@ -3,12 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($block->getChildHtml()):?>
--    <div data-mage-init='{"floatingHeader": {}}' class="page-actions" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>>
-+<?php if ($block->getChildHtml()) :?>
-+    <div data-mage-init='{"floatingHeader": {}}' class="page-actions floating-header" <?= /* @noEscape */ $block->getUiId('content-header') ?>>
-         <?= $block->getChildHtml() ?>
-     </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
-index bb968c57610..da18bc18375 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
-@@ -4,27 +4,25 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var $block \Magento\Backend\Block\Store\Switcher */
- ?>
--<?php if ($websites = $block->getWebsites()): ?>
-+<?php if ($websites = $block->getWebsites()) : ?>
- 
- <div class="store-switcher store-view">
--    <span class="store-switcher-label"><?= /* @escapeNotVerified */ __('Store View:') ?></span>
-+    <span class="store-switcher-label"><?= $block->escapeHtml(__('Store View:')) ?></span>
-     <div class="actions dropdown closable">
-         <input type="hidden" name="store_switcher" id="store_switcher"
--               data-role="store-view-id" data-param="<?= /* @escapeNotVerified */ $block->getStoreVarName() ?>"
-+               data-role="store-view-id" data-param="<?= $block->escapeHtmlAttr($block->getStoreVarName()) ?>"
-                value="<?= $block->escapeHtml($block->getStoreId()) ?>"
--               onchange="switchScope(this);"<?= /* @escapeNotVerified */ $block->getUiId() ?> />
-+               onchange="switchScope(this);"<?= /* @noEscape */ $block->getUiId() ?> />
-         <input type="hidden" name="store_group_switcher" id="store_group_switcher"
--               data-role="store-group-id" data-param="<?= /* @escapeNotVerified */ $block->getStoreGroupVarName() ?>"
-+               data-role="store-group-id" data-param="<?= $block->escapeHtmlAttr($block->getStoreGroupVarName()) ?>"
-                value="<?= $block->escapeHtml($block->getStoreGroupId()) ?>"
--               onchange="switchScope(this);"<?= /* @escapeNotVerified */ $block->getUiId() ?> />
-+               onchange="switchScope(this);"<?= /* @noEscape */ $block->getUiId() ?> />
-         <input type="hidden" name="website_switcher" id="website_switcher"
--               data-role="website-id" data-param="<?= /* @escapeNotVerified */ $block->getWebsiteVarName() ?>"
-+               data-role="website-id" data-param="<?= $block->escapeHtmlAttr($block->getWebsiteVarName()) ?>"
-                value="<?= $block->escapeHtml($block->getWebsiteId()) ?>"
--               onchange="switchScope(this);"<?= /* @escapeNotVerified */ $block->getUiId() ?> />
-+               onchange="switchScope(this);"<?= /* @noEscape */ $block->getUiId() ?> />
-         <button
-             type="button"
-             class="admin__action-dropdown"
-@@ -32,96 +30,64 @@
-             data-toggle="dropdown"
-             aria-haspopup="true"
-             id="store-change-button">
--            <?= /* @escapeNotVerified */ $block->getCurrentSelectionName() ?>
-+            <?= $block->escapeHtml($block->getCurrentSelectionName()) ?>
-         </button>
-         <ul class="dropdown-menu" data-role="stores-list">
--            <?php if ($block->hasDefaultOption()): ?>
--                <li class="store-switcher-all <?php if ( ! ($block->getDefaultSelectionName() != $block->getCurrentSelectionName())) {
--                    echo "disabled";
--                } ?> <?php if ( ! $block->hasScopeSelected()) {
--                    ?> current<?php
--                } ?>">
--                    <?php if ($block->getDefaultSelectionName() != $block->getCurrentSelectionName()) {
--                        ?>
-+            <?php if ($block->hasDefaultOption()) : ?>
-+                <li class="store-switcher-all <?php if (!($block->getDefaultSelectionName() != $block->getCurrentSelectionName())) : ?>disabled<?php endif; ?> <?php if (!$block->hasScopeSelected()) : ?>current<?php endif; ?>">
-+                    <?php if ($block->getDefaultSelectionName() != $block->getCurrentSelectionName()) : ?>
-                         <a data-role="store-view-id" data-value="" href="#">
--                            <?= /* @escapeNotVerified */ $block->getDefaultSelectionName() ?>
-+                            <?= $block->escapeHtml($block->getDefaultSelectionName()) ?>
-                         </a>
--                    <?php
--                    } else {
--                        ?>
--                        <span><?= /* @escapeNotVerified */ $block->getDefaultSelectionName() ?></span>
--                    <?php
--                    } ?>
-+                    <?php else : ?>
-+                        <span><?= $block->escapeHtml($block->getDefaultSelectionName()) ?></span>
-+                    <?php endif; ?>
-                 </li>
-             <?php endif; ?>
--            <?php foreach ($websites as $website): ?>
-+            <?php foreach ($websites as $website) : ?>
-                 <?php $showWebsite = false; ?>
--                <?php foreach ($website->getGroups() as $group): ?>
-+                <?php foreach ($website->getGroups() as $group) : ?>
-                     <?php $showGroup = false; ?>
--                    <?php foreach ($block->getStores($group) as $store): ?>
--                        <?php if ($showWebsite == false): ?>
-+                    <?php foreach ($block->getStores($group) as $store) : ?>
-+                        <?php if ($showWebsite == false) : ?>
-                             <?php $showWebsite = true; ?>
--                            <li class="store-switcher-website <?php if ( ! ($block->isWebsiteSwitchEnabled() && ! $block->isWebsiteSelected($website))) {
--                                echo "disabled";
--                            } ?> <?php if ($block->isWebsiteSelected($website)) {
--                                ?> current<?php
--                            } ?>">
--                                <?php if ($block->isWebsiteSwitchEnabled() && ! $block->isWebsiteSelected($website)) {
--                                    ?>
-+                            <li class="store-switcher-website <?php if (!($block->isWebsiteSwitchEnabled() && ! $block->isWebsiteSelected($website))) : ?>disabled<?php endif; ?> <?php if ($block->isWebsiteSelected($website)) : ?>current<?php endif; ?>">
-+                                <?php if ($block->isWebsiteSwitchEnabled() && ! $block->isWebsiteSelected($website)) : ?>
-                                     <a data-role="website-id" data-value="<?= $block->escapeHtml($website->getId()) ?>" href="#">
-                                         <?= $block->escapeHtml($website->getName()) ?>
-                                     </a>
--                                <?php
--                                } else {
--                                    ?>
-+                                <?php else : ?>
-                                     <span><?= $block->escapeHtml($website->getName()) ?></span>
--                                <?php
--                                } ?>
-+                                <?php endif; ?>
-                             </li>
-                         <?php endif; ?>
--                        <?php if ($showGroup == false): ?>
-+                        <?php if ($showGroup == false) : ?>
-                             <?php $showGroup = true; ?>
--                            <li class="store-switcher-store <?php if ( ! ($block->isStoreGroupSwitchEnabled() && ! $block->isStoreGroupSelected($group))) {
--                                echo "disabled";
--                            } ?> <?php if ($block->isStoreGroupSelected($group)) {
--                                ?> current<?php
--                            } ?>">
--                                <?php if ($block->isStoreGroupSwitchEnabled() && ! $block->isStoreGroupSelected($group)) {
--                                    ?>
-+                            <li class="store-switcher-store <?php if (!($block->isStoreGroupSwitchEnabled() && ! $block->isStoreGroupSelected($group))) : ?>disabled<?php endif; ?> <?php if ($block->isStoreGroupSelected($group)) : ?>current<?php endif; ?>">
-+                                <?php if ($block->isStoreGroupSwitchEnabled() && ! $block->isStoreGroupSelected($group)) : ?>
-                                     <a data-role="store-group-id" data-value="<?= $block->escapeHtml($group->getId()) ?>" href="#">
-                                         <?= $block->escapeHtml($group->getName()) ?>
-                                     </a>
--                                <?php
--                                } else {
--                                    ?>
-+                                <?php else : ?>
-                                     <span><?= $block->escapeHtml($group->getName()) ?></span>
--                                <?php
--                                } ?>
-+                                <?php endif; ?>
-                             </li>
-                         <?php endif; ?>
--                        <li class="store-switcher-store-view <?php if ( ! ($block->isStoreSwitchEnabled() && ! $block->isStoreSelected($store))) {
--                            echo "disabled";
--                        } ?> <?php if ($block->isStoreSelected($store)) {
--                            ?> current<?php
--                        } ?>">
--                            <?php if ($block->isStoreSwitchEnabled() && ! $block->isStoreSelected($store)) {
--                                ?>
-+                        <li class="store-switcher-store-view <?php if (!($block->isStoreSwitchEnabled() && !$block->isStoreSelected($store))) : ?>disabled<?php endif; ?> <?php if ($block->isStoreSelected($store)) :?>current<?php endif; ?>">
-+                            <?php if ($block->isStoreSwitchEnabled() && ! $block->isStoreSelected($store)) : ?>
-                                 <a data-role="store-view-id" data-value="<?= $block->escapeHtml($store->getId()) ?>" href="#">
-                                     <?= $block->escapeHtml($store->getName()) ?>
-                                 </a>
--                            <?php
--                            } else {
--                                ?>
-+                            <?php else : ?>
-                                 <span><?= $block->escapeHtml($store->getName()) ?></span>
--                            <?php
--                            } ?>
-+                            <?php endif; ?>
-                         </li>
-                     <?php endforeach; ?>
-                 <?php endforeach; ?>
-             <?php endforeach; ?>
--            <?php if ($block->getShowManageStoresLink() && $block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
-+            <?php if ($block->getShowManageStoresLink() && $block->getAuthorization()->isAllowed('Magento_Backend::store')) : ?>
-                 <li class="dropdown-toolbar">
--                    <a href="<?= /* @escapeNotVerified */ $block->getUrl('*/system_store') ?>"><?= /* @escapeNotVerified */ __('Stores Configuration') ?></a>
-+                    <a href="<?= /* @noEscape */ $block->getUrl('*/system_store') ?>"><?= $block->escapeHtml(__('Stores Configuration')) ?></a>
-                 </li>
-             <?php endif; ?>
-         </ul>
-@@ -173,10 +139,10 @@ require([
-             scopeSwitcherHandler(switcherParams);
-         } else {
- 
--            <?php if ($block->getUseConfirm()): ?>
-+            <?php if ($block->getUseConfirm()) : ?>
- 
-             confirm({
--                content:  "<?= /* @escapeNotVerified */ __('Please confirm scope switching. All data that hasn\'t been saved will be lost.') ?>",
-+                content:  "<?= $block->escapeJs(__('Please confirm scope switching. All data that hasn\'t been saved will be lost.')) ?>",
-                 actions: {
-                     confirm: function() {
-                         reload();
-@@ -187,16 +153,16 @@ require([
-                 }
-             });
- 
--            <?php else: ?>
-+            <?php else : ?>
-                 reload();
-             <?php endif; ?>
-         }
- 
-         function reload() {
--            <?php if (!$block->isUsingIframe()): ?>
--            var url = '<?= /* @escapeNotVerified */ $block->getSwitchUrl() ?>' + scopeParams;
-+            <?php if (!$block->isUsingIframe()) : ?>
-+            var url = '<?= $block->escapeJs($block->getSwitchUrl()) ?>' + scopeParams;
-             setLocation(url);
--            <?php else: ?>
-+            <?php else : ?>
-             jQuery('#preview_selected_store').val(scopeId);
-             jQuery('#preview_form').submit();
- 
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml
-index 49a2c681285..382fb6e81c5 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml
-@@ -3,43 +3,40 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_element = $block->getElement() ?>
--<?php if ($_element->getFieldsetContainerId()): ?>
--    <div id="<?= /* @escapeNotVerified */ $_element->getFieldsetContainerId() ?>">789
-+<?php if ($_element->getFieldsetContainerId()) : ?>
-+    <div id="<?= $block->escapeHtmlAttr($_element->getFieldsetContainerId()) ?>">789
- <?php endif; ?>
- 
--<?php if (!$_element->getNoContainer()): ?>
--    <fieldset class="admin__fieldset fieldset <?= /* @escapeNotVerified */ $_element->getClass() ?>" id="<?= $_element->getHtmlId() ?>">
-+<?php if (!$_element->getNoContainer()) : ?>
-+    <fieldset class="admin__fieldset fieldset <?= $block->escapeHtmlAttr($_element->getClass()) ?>" id="<?= $_element->getHtmlId() ?>">
- <?php endif; ?>
- 
--    <?php if ($_element->getLegend()): ?>
-+    <?php if ($_element->getLegend()) : ?>
-         <legend class="admin__legend legend">
--            <span><?= /* @escapeNotVerified */ $_element->getLegend() ?></span>
-+            <span><?= $block->escapeHtml($_element->getLegend()) ?></span>
-             <?= $block->getHintHtml() ?>
-         </legend><br/>
--        <?= /* @escapeNotVerified */ $_element->getHeaderBar() ?>
--    <?php else: ?>
-+        <?= /* @noEscape */ $_element->getHeaderBar() ?>
-+    <?php else : ?>
-         <?= $block->getHintHtml() ?>
-     <?php endif; ?>
-         <div class="admin__fieldset tree-store-scope">
--            <?php if ($_element->getComment()): ?>
-+            <?php if ($_element->getComment()) : ?>
-             <p class="comment"><?= $block->escapeHtml($_element->getComment()) ?></p>
-             <?php endif; ?>
--            <?php if ($_element->hasHtmlContent()): ?>
--               <?= $_element->getHtmlContent() ?>
--            <?php else: ?>
-+            <?php if ($_element->hasHtmlContent()) : ?>
-+                <?= $_element->getHtmlContent() ?>
-+            <?php else : ?>
-                 <?= $_element->getChildrenHtml() ?>
-             <?php endif; ?>
-         </div>
- <?= $_element->getSubFieldsetHtml() ?>
- 
--<?php if (!$_element->getNoContainer()): ?>
-+<?php if (!$_element->getNoContainer()) : ?>
-     </fieldset>
- <?php endif; ?>
--<?php if ($_element->getFieldsetContainerId()): ?>
-+<?php if ($_element->getFieldsetContainerId()) : ?>
-     </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
-index e25c9d22ca4..959a27279e5 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
-@@ -24,21 +21,21 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
-     . $block->getUiId('form-field', $element->getId());
- ?>
- 
--<?php if (!$element->getNoDisplay()): ?>
--    <?php if ($element->getType() == 'hidden'): ?>
-+<?php if (!$element->getNoDisplay()) : ?>
-+    <?php if ($element->getType() == 'hidden') : ?>
-         <?= $element->getElementHtml() ?>
--    <?php else: ?>
--    <div<?= /* @escapeNotVerified */ $fieldAttributes ?>>
--        <?php if ($elementBeforeLabel): ?>
-+    <?php else : ?>
-+    <div<?= /* @noEscape */ $fieldAttributes ?>>
-+        <?php if ($elementBeforeLabel) : ?>
-             <?= $element->getElementHtml() ?>
-             <?= $element->getLabelHtml('', $element->getScopeLabel()) ?>
--            <?= /* @escapeNotVerified */ $note ?>
--        <?php else: ?>
-+            <?= /* @noEscape */ $note ?>
-+        <?php else : ?>
-             <?= $element->getLabelHtml('', $element->getScopeLabel()) ?>
-             <div class="admin__field-control control">
--                <?= /* @escapeNotVerified */ ($addOn) ? '<div class="addon">' . $element->getElementHtml() . '</div>' : $element->getElementHtml() ?>
-+                <?= /* @noEscape */ ($addOn) ? '<div class="addon">' . $element->getElementHtml() . '</div>' : $element->getElementHtml() ?>
-                 <?= $block->getHintHtml() ?>
--                <?= /* @escapeNotVerified */ $note ?>
-+                <?= /* @noEscape */ $note ?>
-             </div>
-         <?php endif; ?>
-     </div>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml
-index 22d93241f43..7ac867970e8 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml
-@@ -3,15 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <ul class="dropdown-menu">
--    <?php foreach ($items as $item): ?>
--    <li id="<?= /* @escapeNotVerified */ $item['id'] ?>" class="item">
--        <a href="<?= /* @escapeNotVerified */ $item['url'] ?>" class="title"><?= $block->escapeHtml($item['name']) ?></a>
--        <div class="type"><?= /* @escapeNotVerified */ $item['type'] ?></div>
-+    <?php foreach ($items as $item) : ?>
-+    <li id="<?= $block->escapeHtmlAttr($item['id']) ?>" class="item">
-+        <a href="<?= $block->escapeUrl($item['url']) ?>" class="title"><?= $block->escapeHtml($item['name']) ?></a>
-+        <div class="type"><?= $block->escapeHtml($item['type']) ?></div>
-         <?= $block->escapeHtml($item['description']) ?>
-     </li>
-     <?php endforeach ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
-index 8e30afdf51f..c392ebf3883 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
-@@ -4,17 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Backend\Block\Cache\Permissions|null $permissions */
- $permissions = $block->getData('permissions');
- ?>
--<?php if ($permissions && $permissions->hasAccessToAdditionalActions()): ?>
-+<?php if ($permissions && $permissions->hasAccessToAdditionalActions()) : ?>
-     <div class="additional-cache-management">
--        <?php if ($permissions->hasAccessToFlushCatalogImages()): ?>
--            <h2>
--                <span><?= $block->escapeHtml(__('Additional Cache Management')); ?></span>
--            </h2>
-+        <h2>
-+            <span><?= $block->escapeHtml(__('Additional Cache Management')); ?></span>
-+        </h2>
-+        <?php if ($permissions->hasAccessToFlushCatalogImages()) : ?>
-             <p>
-                 <button onclick="setLocation('<?= $block->escapeJs($block->getCleanImagesUrl()); ?>')" type="button">
-                     <?= $block->escapeHtml(__('Flush Catalog Images Cache')); ?>
-@@ -22,7 +20,7 @@ $permissions = $block->getData('permissions');
-                 <span><?= $block->escapeHtml(__('Pregenerated product images files')); ?></span>
-             </p>
-         <?php endif; ?>
--        <?php if ($permissions->hasAccessToFlushJsCss()): ?>
-+        <?php if ($permissions->hasAccessToFlushJsCss()) : ?>
-             <p>
-                 <button onclick="setLocation('<?= $block->escapeJs($block->getCleanMediaUrl()); ?>')" type="button">
-                     <?= $block->escapeHtml(__('Flush JavaScript/CSS Cache')); ?>
-@@ -30,7 +28,7 @@ $permissions = $block->getData('permissions');
-                 <span><?= $block->escapeHtml(__('Themes JavaScript and CSS files combined to one file')) ?></span>
-             </p>
-         <?php endif; ?>
--        <?php if (!$block->isInProductionMode() && $permissions->hasAccessToFlushStaticFiles()): ?>
-+        <?php if (!$block->isInProductionMode() && $permissions->hasAccessToFlushStaticFiles()) : ?>
-             <p>
-                 <button onclick="setLocation('<?= $block->escapeJs($block->getCleanStaticFilesUrl()); ?>')" type="button">
-                     <?= $block->escapeHtml(__('Flush Static Files Cache')); ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
-index 8e52f245f74..d1c51f0755a 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -17,7 +14,7 @@
-  */
- ?>
- <div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getSaveButtonHtml() ?></div>
--<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
-+<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
-     <?= $block->getBlockHtml('formkey') ?>
- 
-     <script>
-@@ -34,26 +31,30 @@
-     <?= $block->getChildHtml('form') ?>
-     <div class="entry-edit">
-         <div class="entry-edit-head">
--            <h4 class="icon-head head-edit-form fieldset-legend"><?= /* @escapeNotVerified */ __('Catalog') ?></h4>
-+            <h4 class="icon-head head-edit-form fieldset-legend"><?= $block->escapeHtml(__('Catalog')) ?></h4>
-         </div>
-         <fieldset id="catalog">
-             <table class="form-list">
-                 <tbody>
--                    <?php foreach ($block->getCatalogData() as $_item): ?>
--                    <?php /* disable reindex buttons. functionality moved to index management*/?>
--                    <?php if ($_item['buttons'][0]['name'] != 'clear_images_cache') {
--    continue;
--}?>
-+                    <?php foreach ($block->getCatalogData() as $_item) : ?>
-+                        <?php /* disable reindex buttons. functionality moved to index management*/?>
-+                        <?php
-+                        if ($_item['buttons'][0]['name'] != 'clear_images_cache') {
-+                            continue;
-+                        }
-+                        ?>
-                     <tr>
--                        <td class="label"><label><?= /* @escapeNotVerified */ $_item['label'] ?></label></td>
-+                        <td class="label"><label><?= $block->escapeHtml($_item['label']) ?></label></td>
-                         <td class="value">
--                            <?php foreach ($_item['buttons'] as $_button): ?>
-+                            <?php foreach ($_item['buttons'] as $_button) : ?>
-                                 <?php $clickAction = "setCacheAction('catalog_action',this)"; ?>
--                                <?php if (isset($_button['warning']) && $_button['warning']): ?>
-+                                <?php if (isset($_button['warning']) && $_button['warning']) : ?>
-+                                    <?php //phpcs:disable ?>
-                                     <?php $clickAction = "if (confirm('" . addslashes($_button['warning']) . "')) {{$clickAction}}"; ?>
-+                                    <?php //phpcs:enable ?>
-                                 <?php endif; ?>
--                                <button <?php if (!isset($_button['disabled']) || !$_button['disabled']):?>onclick="<?= /* @escapeNotVerified */ $clickAction ?>"<?php endif; ?> id="<?= /* @escapeNotVerified */ $_button['name'] ?>" type="button" class="scalable <?php if (isset($_button['disabled']) && $_button['disabled']):?>disabled<?php endif; ?>" style=""><span><span><span><?= /* @escapeNotVerified */ $_button['action'] ?></span></span></span></button>
--                                <?php if (isset($_button['comment'])): ?> <br /> <small><?= /* @escapeNotVerified */ $_button['comment'] ?></small> <?php endif; ?>
-+                                <button <?php if (!isset($_button['disabled']) || !$_button['disabled']) :?>onclick="<?=  /* @noEscape */ $clickAction ?>"<?php endif; ?> id="<?= $block->escapeHtmlAttr($_button['name']) ?>" type="button" class="scalable <?php if (isset($_button['disabled']) && $_button['disabled']) :?>disabled<?php endif; ?>" style=""><span><span><span><?= $block->escapeHtml($_button['action']) ?></span></span></span></button>
-+                                <?php if (isset($_button['comment'])) : ?> <br /> <small><?= $block->escapeHtml($_button['comment']) ?></small> <?php endif; ?>
-                             <?php endforeach; ?>
-                         </td>
-                         <td><small>&nbsp;</small></td>
-@@ -66,16 +67,16 @@
- 
-     <div class="entry-edit">
-         <div class="entry-edit-head">
--            <h4 class="icon-head head-edit-form fieldset-legend"><?= /* @escapeNotVerified */ __('JavaScript/CSS') ?></h4>
-+            <h4 class="icon-head head-edit-form fieldset-legend"><?= $block->escapeHtml(__('JavaScript/CSS')) ?></h4>
-         </div>
- 
-         <fieldset id="jscss">
-             <table class="form-list">
-                 <tbody>
-                     <tr>
--                        <td class="label"><label><?= /* @escapeNotVerified */ __('JavaScript/CSS Cache') ?></label></td>
-+                        <td class="label"><label><?= $block->escapeHtml(__('JavaScript/CSS Cache')) ?></label></td>
-                         <td class="value">
--                            <button onclick="setCacheAction('jscss_action', this)" id='jscss_action' type="button" class="scalable"><span><span><span><?= /* @escapeNotVerified */ __('Clear') ?></span></span></span></button>
-+                            <button onclick="setCacheAction('jscss_action', this)" id='jscss_action' type="button" class="scalable"><span><span><span><?= $block->escapeHtml(__('Clear')) ?></span></span></span></button>
-                         </td>
-                     </tr>
-                 </tbody>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml
-index 6b2f932cac7..c9cd765de35 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- ?>
--<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" id="design-edit-form">
-+<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="design-edit-form">
-     <?= $block->getBlockHtml('formkey') ?>
- </form>
- <script>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/design/index.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/design/index.phtml
-index 902c6932f0a..c0928f4723b 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/system/design/index.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/design/index.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml('grid') ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
-index b50183ced29..6e94770c6e4 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Backend\Block\GlobalSearch */
- ?>
- <div class="search-global" data-mage-init='{"globalSearch": {}}'>
-@@ -17,32 +15,34 @@
-                     class="search-global-input"
-                     id="search-global"
-                     name="query"
--                    data-mage-init='<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWidgetInitOptions()) ?>'>
-+                    <?php //phpcs:disable ?>
-+                    data-mage-init='<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getWidgetInitOptions()) ?>'>
-+                    <?php //phpcs:enable ?>
-             <button
-                 type="submit"
-                 class="search-global-action"
--                title="<?= /* @escapeNotVerified */ __('Search') ?>"
-+                title="<?= $block->escapeHtmlAttr(__('Search')) ?>"
-                 ></button>
-         </div>
-     </form>
-     <script data-template="search-suggest" type="text/x-magento-template">
-         <ul class="search-global-menu">
-         <li class="item">
--            <a id="searchPreviewProducts" href="<?= /* @escapeNotVerified */ $block->getUrl('catalog/product/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
-+            <a id="searchPreviewProducts" href="<?= $block->escapeUrl($block->getUrl('catalog/product/index/')) ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
-         </li>
-         <li class="item">
--            <a id="searchPreviewOrders" href="<?= /* @escapeNotVerified */ $block->getUrl('sales/order/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
-+            <a id="searchPreviewOrders" href="<?= $block->escapeUrl($block->getUrl('sales/order/index/')) ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
-         </li>
-         <li class="item">
--            <a id="searchPreviewCustomers" href="<?= /* @escapeNotVerified */ $block->getUrl('customer/index/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
-+            <a id="searchPreviewCustomers" href="<?= $block->escapeUrl($block->getUrl('customer/index/index/')) ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
-         </li>
-         <li class="item">
--            <a id="searchPreviewPages" href="<?= /* @escapeNotVerified */ $block->getUrl('cms/page/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
-+            <a id="searchPreviewPages" href="<?= $block->escapeUrl($block->getUrl('cms/page/index/')) ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
-         </li>
-             <% if (data.items.length) { %>
-             <% _.each(data.items, function(value){ %>
-             <li class="item"
--                <%- data.optionData(value) %>
-+                <%= data.optionData(value) %>
-                 >
-                 <a href="<%- value.url %>" class="title"><%- value.name %></a>
-                 <span class="type"><%- value.type %></span>
-@@ -52,7 +52,7 @@
-         <% } else { %>
-             <li>
-                 <span class="mage-suggest-no-records">
--                    <?= /* @escapeNotVerified */ __('No records found.') ?>
-+                    <?= $block->escapeHtml(__('No records found.')) ?>
-                 </span>
-             </li>
-         <% } %>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
-index 60cd51b496a..fecf5365544 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,9 +10,9 @@
-  */
- $items = $block->getItems();
- ?>
--<?php if (!empty($items)): ?>
-+<?php if (!empty($items)) : ?>
-     <dl id="tab_content_<?= $block->getHtmlId() ?>" name="tab_content_<?= $block->getHtmlId() ?>" class="accordion">
--    <?php foreach ($items as $_item): ?>
-+    <?php foreach ($items as $_item) : ?>
-         <?= $block->getChildHtml($_item->getId()) ?>
-     <?php endforeach ?>
-     </dl>
-@@ -23,7 +20,7 @@ $items = $block->getItems();
-         require([
-             'mage/adminhtml/accordion'
-         ], function(){
--        	tab_content_<?= $block->getHtmlId() ?>AccordionJs = new varienAccordion('tab_content_<?= $block->getHtmlId() ?>', '<?= /* @escapeNotVerified */ $block->getShowOnlyOne() ?>');
--    	});
-+            tab_content_<?= $block->getHtmlId() ?>AccordionJs = new varienAccordion('tab_content_<?= $block->getHtmlId() ?>', '<?= $block->escapeJs($block->getShowOnlyOne()) ?>');
-+        });
-     </script>
- <?php endif; ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml
-index 74cd4eb7f2c..fb7cc63ebc1 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml
-@@ -3,25 +3,22 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if (!empty($links)): ?>
-+<?php if (!empty($links)) : ?>
- <ul class="breadcrumbs">
-     <?php $_size = count($links); ?>
--    <?php foreach ($links as $_index => $_link): ?>
-+    <?php foreach ($links as $_index => $_link) : ?>
-     <li>
--        <?php if (empty($_link['url'])): ?>
--            <?php if ($_index != $_size-1): ?>
-+        <?php if (empty($_link['url'])) : ?>
-+            <?php if ($_index != $_size-1) : ?>
-                 <span><?= $block->escapeHtml($_link['label']) ?></span>
--            <?php else: ?>
-+            <?php else : ?>
-                 <strong><?= $block->escapeHtml($_link['label']) ?></strong>
-             <?php endif; ?>
--        <?php else: ?>
--            <a href="<?= /* @escapeNotVerified */ $_link['url'] ?>" title="<?= $block->escapeHtml($_link['title']) ?>"><?= $block->escapeHtml($_link['label']) ?></a>
-+        <?php else : ?>
-+            <a href="<?=  $block->escapeUrl($_link['url']) ?>" title="<?= $block->escapeHtml($_link['title']) ?>"><?= $block->escapeHtml($_link['label']) ?></a>
-         <?php endif; ?>
--        <?php if ($_index != $_size-1): ?>
-+        <?php if ($_index != $_size-1) : ?>
-             &raquo;
-         <?php endif; ?>
-     </li>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml
-index d3376745afe..b743b9bee10 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,7 +10,7 @@
-  */
- ?>
- <?= $block->getBeforeHtml() ?>
--<button <?= /* @escapeNotVerified */ $block->getAttributesHtml(), $block->getUiId() ?>>
--    <span><?= /* @escapeNotVerified */ $block->getLabel() ?></span>
-+<button <?= /* @noEscape */ $block->getAttributesHtml(), $block->getUiId() ?>>
-+    <span><?= $block->escapeHtml($block->getLabel()) ?></span>
- </button>
- <?= $block->getAfterHtml() ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
-index a115777624e..0123de098a9 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var $block \Magento\Backend\Block\Widget\Button\SplitButton */
-@@ -15,20 +12,20 @@
-     <button <?= $block->getButtonAttributesHtml() ?>>
-         <span><?= $block->escapeHtml($block->getLabel()) ?></span>
-     </button>
--    <?php if ($block->hasSplit()): ?>
-+    <?php if ($block->hasSplit()) : ?>
-         <button <?= $block->getToggleAttributesHtml() ?>>
-             <span>Select</span>
-         </button>
- 
--        <?php if (!$block->getDisabled()): ?>
--            <ul class="dropdown-menu" <?= /* @escapeNotVerified */ $block->getUiId("dropdown-menu") ?>>
--                <?php foreach ($block->getOptions() as $key => $option): ?>
-+        <?php if (!$block->getDisabled()) : ?>
-+            <ul class="dropdown-menu" <?= /* @noEscape */ $block->getUiId("dropdown-menu") ?>>
-+                <?php foreach ($block->getOptions() as $key => $option) : ?>
-                 <li>
-                     <span <?= $block->getOptionAttributesHtml($key, $option) ?>>
-                         <?= $block->escapeHtml($option['label']) ?>
-                     </span>
--                    <?php if (isset($option['hint'])): ?>
--                    <div class="tooltip" <?= /* @escapeNotVerified */ $block->getUiId('item', $key, 'tooltip') ?>>
-+                    <?php if (isset($option['hint'])) : ?>
-+                    <div class="tooltip" <?= /* @noEscape */ $block->getUiId('item', $key, 'tooltip') ?>>
-                         <a href="<?= $block->escapeHtml($option['hint']['href']) ?>" class="help">
-                             <?= $block->escapeHtml($option['hint']['label']) ?>
-                         </a>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
-index dc7d02795a0..62f8d25ce1b 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Backend\Block\Widget\Form */
- ?>
- <?php /* @todo replace .form-inline with better class name */?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
-index bcbda8fc761..aa289dbf1eb 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
-@@ -4,15 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Backend\Block\Widget\Form\Container */
-- ?>
--<?= /* @escapeNotVerified */ $block->getFormInitScripts() ?>
--<?php if ($block->getButtonsHtml('header')): ?>
--    <div class="page-form-actions" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>><?= $block->getButtonsHtml('header') ?></div>
-+?>
-+<?= /* @noEscape */ $block->getFormInitScripts() ?>
-+<?php if ($block->getButtonsHtml('header')) : ?>
-+    <div class="page-form-actions" <?= /* @noEscape */ $block->getUiId('content-header') ?>><?= $block->getButtonsHtml('header') ?></div>
- <?php endif; ?>
--<?php if ($block->getButtonsHtml('toolbar')): ?>
-+<?php if ($block->getButtonsHtml('toolbar')) : ?>
-     <div class="page-main-actions">
-         <div class="page-actions">
-             <div class="page-actions-buttons">
-@@ -22,7 +20,7 @@
-     </div>
- <?php endif; ?>
- <?= $block->getFormHtml() ?>
--<?php if ($block->hasFooterButtons()): ?>
-+<?php if ($block->hasFooterButtons()) : ?>
-     <div class="content-footer">
-         <p class="form-buttons"><?= $block->getButtonsHtml('footer') ?></p>
-     </div>
-@@ -36,7 +34,7 @@ require([
- 
-     $('#edit_form').form()
-         .validation({
--            validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>',
-+            validationUrl: '<?= $block->escapeJs($block->getValidationUrl()) ?>',
-             highlight: function(element) {
-                 var detailsElement = $(element).closest('details');
-                 if (detailsElement.length && detailsElement.is('.details')) {
-@@ -51,4 +49,4 @@ require([
- 
- });
- </script>
--<?= /* @escapeNotVerified */ $block->getFormScripts() ?>
-+<?= /* @noEscape */ $block->getFormScripts() ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
-index 720bc1e5825..ec53f7e5c74 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
-@@ -4,59 +4,46 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+$type = $element->getType();
- ?>
--<?php switch ($element->getType()) {
--    case 'fieldset': ?>
--
-+<?php if ($type === 'fieldset') : ?>
-     <fieldset>
--        <legend><?= /* @escapeNotVerified */ $element->getLegend() ?></legend><br />
--        <?php foreach ($element->getElements() as $_element): ?>
--            <?= /* @escapeNotVerified */ $formBlock->drawElement($_element) ?>
-+        <legend><?= $block->escapeHtml($element->getLegend()) ?></legend><br />
-+        <?php foreach ($element->getElements() as $_element) : ?>
-+            <?= /* @noEscape */ $formBlock->drawElement($_element) ?>
-         <?php endforeach; ?>
-     </fieldset>
--      <?php break;
--    case 'column': ?>
--      <?php break;
--    case 'hidden': ?>
--    <input type="<?= /* @escapeNotVerified */ $element->getType() ?>" name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $element->getValue() ?>">
--      <?php break;
--    case 'select': ?>
-+<?php elseif ($type === 'hidden') : ?>
-+    <input type="<?= $block->escapeHtmlAttr($element->getType()) ?>" name="<?= $block->escapeHtmlAttr($element->getName()) ?>" id="<?= $element->getHtmlId() ?>" value="<?= $block->escapeHtmlAttr($element->getValue()) ?>">
-+    <?php elseif ($type === 'select') : ?>
-     <span class="form_row">
--        <?php if ($element->getLabel()): ?><label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label><?php endif; ?>
--        <select name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" class="select<?= /* @escapeNotVerified */ $element->getClass() ?>" title="<?= /* @escapeNotVerified */ $element->getTitle() ?>">
--        <?php foreach ($element->getValues() as $_value): ?>
--            <option <?= /* @escapeNotVerified */ $_value->serialize() ?><?php if ($_value->getValue() == $element->getValue()): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ $_value->getLabel() ?></option>
-+        <?php if ($element->getLabel()) : ?><label for="<?= $element->getHtmlId() ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label><?php endif; ?>
-+        <select name="<?= $block->escapeHtmlAttr($element->getName()) ?>" id="<?= $element->getHtmlId() ?>" class="select<?= $block->escapeHtmlAttr($element->getClass()) ?>" title="<?=  $block->escapeHtmlAttr($element->getTitle()) ?>">
-+        <?php foreach ($element->getValues() as $_value) : ?>
-+            <option <?= /* @noEscape */ $_value->serialize() ?><?php if ($_value->getValue() == $element->getValue()) : ?> selected="selected"<?php endif; ?>><?= $block->escapeHtml($_value->getLabel()) ?></option>
-         <?php endforeach; ?>
-         </select>
-     </span>
--      <?php break;
--    case 'text':
--    case 'button':
--    case 'password': ?>
-+<?php elseif ($type === 'text' || $type === 'button' || $type === 'password') : ?>
-     <span class="form_row">
--        <?php if ($element->getLabel()): ?><label for="<?= $element->getHtmlId() ?>" <?= /* @escapeNotVerified */ $block->getUiId('label') ?>><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label><?php endif; ?>
--        <input type="<?= /* @escapeNotVerified */ $element->getType() ?>" name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $element->getValue() ?>" class="input-text <?= /* @escapeNotVerified */ $element->getClass() ?>" title="<?= /* @escapeNotVerified */ $element->getTitle() ?>" <?= ($element->getOnClick() ? 'onClick="' . $element->getOnClick() . '"' : '') ?>/>
-+        <?php if ($element->getLabel()) : ?><label for="<?= $element->getHtmlId() ?>" <?= /* @noEscape */ $block->getUiId('label') ?>><?= $block->escapeHtml($element->getLabel()) ?>:</label><?php endif; ?>
-+        <input type="<?= $block->escapeHtmlAttr($element->getType()) ?>" name="<?= $block->escapeHtmlAttr($element->getName()) ?>" id="<?= /* @noEscape */ $element->getHtmlId() ?>" value="<?= $block->escapeHtmlAttr($element->getValue()) ?>" class="input-text <?= $block->escapeHtmlAttr($element->getClass()) ?>" title="<?= $block->escapeHtmlAttr($element->getTitle()) ?>" <?= /* @noEscape */ ($element->getOnClick() ? 'onClick="' . $element->getOnClick() . '"' : '') ?>/>
-     </span>
--      <?php break;
--    case 'radio': ?>
-+<?php elseif ($type === 'radio') : ?>
-     <span class="form_row">
--        <?php if ($element->getLabel()): ?><label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label><?php endif; ?>
--        <input type="<?= /* @escapeNotVerified */ $element->getType() ?>" name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $element->getValue() ?>" class="input-text <?= /* @escapeNotVerified */ $element->getClass() ?>" title="<?= /* @escapeNotVerified */ $element->getTitle() ?>"/>
-+        <?php if ($element->getLabel()) : ?><label for="<?= $element->getHtmlId() ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label><?php endif; ?>
-+        <input type="<?=  $block->escapeHtmlAttr($element->getType()) ?>" name="<?=  $block->escapeHtmlAttr($element->getName()) ?>" id="<?= $element->getHtmlId() ?>" value="<?=  $block->escapeHtmlAttr($element->getValue()) ?>" class="input-text <?= $block->escapeHtmlAttr($element->getClass()) ?>" title="<?=  $block->escapeHtmlAttr($element->getTitle()) ?>"/>
-     </span>
--      <?php break;
--    case 'radios': ?>
-+<?php elseif ($type === 'radios') : ?>
-     <span class="form_row">
--        <label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label>
--    <?php foreach ($element->getRadios() as $_radio): ?>
--    <input type="radio" name="<?= /* @escapeNotVerified */ $_radio->getName() ?>" id="<?= $_radio->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $_radio->getValue() ?>" class="input-radio <?= /* @escapeNotVerified */ $_radio->getClass() ?>" title="<?= /* @escapeNotVerified */ $_radio->getTitle() ?>" <?= ($_radio->getValue() == $element->getChecked()) ? 'checked="true"' : '' ?> >&nbsp;<?= /* @escapeNotVerified */ $_radio->getLabel() ?>
-+        <label for="<?= $element->getHtmlId() ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label>
-+    <?php foreach ($element->getRadios() as $_radio) : ?>
-+    <input type="radio" name="<?=  $block->escapeHtmlAttr($_radio->getName()) ?>" id="<?= $_radio->getHtmlId() ?>" value="<?=  $block->escapeHtmlAttr($_radio->getValue()) ?>" class="input-radio <?= $block->escapeHtmlAttr($_radio->getClass()) ?>" title="<?=  $block->escapeHtmlAttr($_radio->getTitle()) ?>" <?= ($_radio->getValue() == $element->getChecked()) ? 'checked="true"' : '' ?> >&nbsp;<?= $block->escapeHtml($_radio->getLabel()) ?>
-     <?php endforeach; ?>
-     </span>
--      <?php break;
--    case 'wysiwyg': ?>
-+<?php elseif ($type === 'wysiwyg') : ?>
-     <span class="form_row">
--      <label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label>
-+      <label for="<?= $element->getHtmlId() ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label>
-         <script>
-         require([
-             "wysiwygAdapter"
-@@ -65,7 +52,7 @@
-             tinyMCE.init({
-                 mode : "exact",
-                 theme : "advanced",
--                elements : "<?= /* @escapeNotVerified */ $element->getName() ?>",
-+                elements : "<?= $block->escapeJs($element->getName()) ?>",
-                 plugins : "inlinepopups,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,zoom,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras",
-                 theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect",
-                 theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
-@@ -84,24 +71,16 @@
-             });
-         });
- </script>
--      <textarea name="<?= /* @escapeNotVerified */ $element->getName() ?>" title="<?= /* @escapeNotVerified */ $element->getTitle() ?>" id="<?= $element->getHtmlId() ?>" class="textarea <?= /* @escapeNotVerified */ $element->getClass() ?>" cols="80" rows="20"><?= /* @escapeNotVerified */ $element->getValue() ?></textarea>
-+      <textarea name="<?= $block->escapeHtmlAttr($element->getName()) ?>" title="<?=  $block->escapeHtmlAttr($element->getTitle()) ?>" id="<?= $element->getHtmlId() ?>" class="textarea <?= $block->escapeHtmlAttr($element->getClass()) ?>" cols="80" rows="20"><?= $block->escapeHtml($element->getValue()) ?></textarea>
-     </span>
--      <?php break;
--        case 'textarea': ?>
-+<?php elseif ($type === 'textarea') : ?>
-             <span class="form_row">
--                    <label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label>
--                    <textarea name="<?= /* @escapeNotVerified */ $element->getName() ?>" title="<?= /* @escapeNotVerified */ $element->getTitle() ?>" id="<?= $element->getHtmlId() ?>" class="textarea <?= /* @escapeNotVerified */ $element->getClass() ?>" cols="15" rows="2"><?= /* @escapeNotVerified */ $element->getValue() ?></textarea>
-+                    <label for="<?= $element->getHtmlId() ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label>
-+                    <textarea name="<?= $block->escapeHtmlAttr($element->getName()) ?>" title="<?=  $block->escapeHtmlAttr($element->getTitle()) ?>" id="<?= $element->getHtmlId() ?>" class="textarea <?= $block->escapeHtmlAttr($element->getClass()) ?>" cols="15" rows="2"><?= $block->escapeHtml($element->getValue()) ?></textarea>
-             </span>
--      <?php break;
--    case 'editor': ?>
--      <?php break;
--    case 'file': ?>
--      <?php break;
--    case 'checkbox': ?>
--      <?php break;
--} ?>
--<?php if ($element->getScript()): ?>
-+<?php endif; ?>
-+<?php if ($element->getScript()) : ?>
- <script>
--    <?= /* @escapeNotVerified */ $element->getScript() ?>
-+    <?= /* @noEscape */ $element->getScript() ?>
- </script>
- <?php endif; ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
-index e11c0efc123..5c07b35e72a 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
-@@ -3,20 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <tr>
- <td colspan="2">
--<label for="gallery"><?= /* @escapeNotVerified */ __('Images') ?></label>
-+<label for="gallery"><?= $block->escapeHtml(__('Images')) ?></label>
- <table id="gallery" class="gallery" border="0" cellspacing="3" cellpadding="0">
- <thead id="gallery_thead" class="gallery">
-     <tr class="gallery">
--        <td class="gallery" valign="middle" align="center"><?= /* @escapeNotVerified */ __('Big Image') ?></td>
--        <td class="gallery" valign="middle" align="center"><?= /* @escapeNotVerified */ __('Thumbnail') ?></td>
--        <td class="gallery" valign="middle" align="center"><?= /* @escapeNotVerified */ __('Sort Order') ?></td>
--        <td class="gallery" valign="middle" align="center"><?= /* @escapeNotVerified */ __('Delete') ?></td>
-+        <td class="gallery" valign="middle" align="center"><?= $block->escapeHtml(__('Big Image')) ?></td>
-+        <td class="gallery" valign="middle" align="center"><?= $block->escapeHtml(__('Thumbnail')) ?></td>
-+        <td class="gallery" valign="middle" align="center"><?= $block->escapeHtml(__('Sort Order')) ?></td>
-+        <td class="gallery" valign="middle" align="center"><?= $block->escapeHtml(__('Delete')) ?></td>
-     </tr>
- </thead>
- 
-@@ -28,22 +25,22 @@
- 
- <tbody class="gallery">
- 
--<?php $i = 0; if (!is_null($block->getValues())): ?>
--    <?php foreach ($block->getValues() as $image): $i++; ?>
--        <tr id="<?= $block->getElement()->getHtmlId() ?>_tr_<?= /* @escapeNotVerified */ $image->getValueId() ?>" class="gallery">
--        <?php foreach ($block->getValues()->getAttributeBackend()->getImageTypes() as $type): ?>
-+<?php $i = 0; if ($block->getValues() !== null) : ?>
-+    <?php foreach ($block->getValues() as $image) : $i++; ?>
-+        <tr id="<?= $block->getElement()->getHtmlId() ?>_tr_<?= $block->escapeHtmlAttr($image->getValueId()) ?>" class="gallery">
-+        <?php foreach ($block->getValues()->getAttributeBackend()->getImageTypes() as $type) : ?>
-             <td class="gallery" align="center" style="vertical-align:bottom;">
--            <a href="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>" target="_blank" onclick="imagePreview('<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>');return false;">
--            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>" src="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>?<?= /* @escapeNotVerified */ time() ?>" alt="<?= /* @escapeNotVerified */ $image->getValue() ?>" title="<?= /* @escapeNotVerified */ $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
--            <input type="file" name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_<?= /* @escapeNotVerified */ $type ?>[<?= /* @escapeNotVerified */ $image->getValueId() ?>]" size="1"></td>
-+            <a href="<?= $block->escapeUrl($image->setType($type)->getSourceUrl()) ?>" target="_blank" onclick="imagePreview('<?= $block->getElement()->getHtmlId() ?>_image_<?= $block->escapeHtmlAttr($block->escapeJs($type)) ?>_<?= $block->escapeHtmlAttr($block->escapeJs($image->getValueId())) ?>');return false;">
-+            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= $block->escapeHtmlAttr($type) ?>_<?= $block->escapeHtmlAttr($image->getValueId()) ?>" src="<?= $block->escapeUrl($image->setType($type)->getSourceUrl()) ?>?<?= /* @noEscape */ time() ?>" alt="<?= $block->escapeHtmlAttr($image->getValue()) ?>" title="<?= $block->escapeHtmlAttr($image->getValue()) ?>" height="25" class="small-image-preview v-middle"/></a><br/>
-+            <input type="file" name="<?= $block->escapeHtmlAttr($block->getElement()->getName()) ?>_<?= $block->escapeHtmlAttr($type) ?>[<?= $block->escapeHtmlAttr($image->getValueId()) ?>]" size="1"></td>
-         <?php endforeach; ?>
--        <td class="gallery" align="center" style="vertical-align:bottom;"><input type="input" name="<?= /* @escapeNotVerified */ $block->getElement()->getParentName() ?>[position][<?= /* @escapeNotVerified */ $image->getValueId() ?>]" value="<?= /* @escapeNotVerified */ $image->getPosition() ?>" id="<?= $block->getElement()->getHtmlId() ?>_position_<?= /* @escapeNotVerified */ $image->getValueId() ?>" size="3"/></td>
--        <td class="gallery" align="center" style="vertical-align:bottom;"><?= $block->getDeleteButtonHtml($image->getValueId()) ?><input type="hidden" name="<?= /* @escapeNotVerified */ $block->getElement()->getParentName() ?>[delete][<?= /* @escapeNotVerified */ $image->getValueId() ?>]" id="<?= $block->getElement()->getHtmlId() ?>_delete_<?= /* @escapeNotVerified */ $image->getValueId() ?>"/></td>
-+        <td class="gallery" align="center" style="vertical-align:bottom;"><input type="input" name="<?= $block->escapeHtmlAttr($block->getElement()->getParentName()) ?>[position][<?= $block->escapeHtmlAttr($image->getValueId()) ?>]" value="<?= $block->escapeHtmlAttr($image->getPosition()) ?>" id="<?= $block->getElement()->getHtmlId() ?>_position_<?= $block->escapeHtmlAttr($image->getValueId()) ?>" size="3"/></td>
-+        <td class="gallery" align="center" style="vertical-align:bottom;"><?= $block->getDeleteButtonHtml($image->getValueId()) ?><input type="hidden" name="<?= $block->escapeHtmlAttr($block->getElement()->getParentName()) ?>[delete][<?= $block->escapeHtmlAttr($image->getValueId()) ?>]" id="<?= $block->getElement()->getHtmlId() ?>_delete_<?= $block->escapeHtmlAttr($image->getValueId()) ?>"/></td>
-         </tr>
-     <?php endforeach; ?>
- <?php endif; ?>
- 
--<?php if ($i == 0): ?>
-+<?php if ($i == 0) : ?>
-     <script>
- document.getElementById("gallery_thead").style.visibility="hidden";
- </script>
-@@ -56,7 +53,7 @@ require([
-     'prototype'
- ], function () {
- id = 0;
--num_of_images = <?= /* @escapeNotVerified */ $i ?>;
-+num_of_images = <?= /* @noEscape */ $i ?>;
- 
- window.addNewImage = function()
- {
-@@ -65,17 +62,19 @@ window.addNewImage = function()
- 
-     id--;
-     num_of_images++;
--    new_file_input = '<input type="file" name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_%j%[%id%]" size="1">';
-+    new_file_input = '<input type="file" name="<?= $block->escapeHtmlAttr($block->getElement()->getName()) ?>_%j%[%id%]" size="1">';
- 
-     // Sort order input
-     var new_row_input = document.createElement( 'input' );
-     new_row_input.type = 'text';
--    new_row_input.name = '<?= /* @escapeNotVerified */ $block->getElement()->getParentName() ?>[position]['+id+']';
-+    new_row_input.name = '<?= $block->escapeJs($block->getElement()->getParentName()) ?>[position]['+id+']';
-     new_row_input.size = '3';
-     new_row_input.value = '0';
- 
-     // Delete button
--    new_row_button = <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getDeleteButtonHtml("this")) ?>;
-+    <?php //phpcs:disable ?>
-+    new_row_button = <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getDeleteButtonHtml("this")) ?>;
-+    <?php // phpcs:enable ?>
- 
-     table = document.getElementById( "gallery" );
- 
-@@ -114,8 +113,8 @@ window.deleteImage = function(image)
-         document.getElementById("gallery_thead").style.visibility="hidden";
-     }
-     if (image>0) {
--        document.getElementById('<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_delete_'+image).value=image;
--        document.getElementById('<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_tr_'+image).style.display='none';
-+        document.getElementById('<?= $block->escapeJs($block->getElement()->getName()) ?>_delete_'+image).value=image;
-+        document.getElementById('<?= $block->escapeJs($block->getElement()->getName()) ?>_tr_'+image).style.display='none';
-     } else {
-         image.parentNode.parentNode.parentNode.removeChild( image.parentNode.parentNode );
-     }
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml
-index ae0bcb826a1..e74e5b1e0fe 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml
-@@ -3,16 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_element = $block->getElement() ?>
--<?php if ($_element->getNoSpan() !== true): ?>
-+<?php if ($_element->getNoSpan() !== true) : ?>
- <span class="field-row">
- <?php endif; ?>
- <?= $_element->getLabelHtml() ?>
- <?= $_element->getElementHtml() ?>
--<?php if ($_element->getNoSpan() !== true): ?>
-+<?php if ($_element->getNoSpan() !== true) : ?>
- </span>
- <?php endif; ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
-index aaf1cb5ff55..7eb6e95fa85 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var $element \Magento\Framework\Data\Form\Element\Fieldset */
-@@ -32,40 +29,43 @@ if ($isField) {
- 
- <?php
- /**
--* @todo investigate situations, when the following is needed:
--* echo $element->getHeaderBar();
--* echo $element->getSubFieldsetHtml();
--*/ ?>
-+ * @todo investigate situations, when the following is needed:
-+ * echo $element->getHeaderBar();
-+ * echo $element->getSubFieldsetHtml();
-+ */ ?>
- 
--<?php if ($isWrapped): ?>
-+<?php if ($isWrapped) : ?>
-     <div class="fieldset-wrapper <?= ($isCollapsable) ? 'admin__collapsible-block-wrapper ' : '' ?>"
--        id="<?= /* @escapeNotVerified */ $containerId ? $containerId : $id . '-wrapper' ?>"
--        data-role="<?= /* @escapeNotVerified */ $id ?>-wrapper">
-+        id="<?=  $block->escapeHtmlAttr($containerId ? $containerId : $id . '-wrapper') ?>"
-+        data-role="<?=  $block->escapeHtmlAttr($id) ?>-wrapper">
-         <div class="fieldset-wrapper-title admin__fieldset-wrapper-title">
--            <strong <?php /* @escapeNotVerified */ echo($isCollapsable) ?
-+            <strong <?= /* @noEscape */ $isCollapsable ?
-                 'class="admin__collapsible-title" data-toggle="collapse" data-target="#' . $id . '-content"' :
-                 'class="title"'; ?>>
--                <span><?= /* @escapeNotVerified */ $element->getLegend() ?></span>
-+                <span><?= $block->escapeHtml($element->getLegend()) ?></span>
-             </strong>
--            <?= /* @escapeNotVerified */ $titleActions ?>
-+            <?= /* @noEscape */ $titleActions ?>
-         </div>
-         <div class="fieldset-wrapper-content admin__fieldset-wrapper-content<?= ($isCollapsable) ? ' collapse' : '' ?>"
--            id="<?= /* @escapeNotVerified */ $id ?>-content"
--            data-role="<?= /* @escapeNotVerified */ $id ?>-content">
-+            id="<?=  $block->escapeHtmlAttr($id) ?>-content"
-+            data-role="<?=  $block->escapeHtmlAttr($id) ?>-content">
- <?php endif; ?>
- 
--    <?php if (!$element->getNoContainer()): ?>
--        <fieldset class="<?= /* @escapeNotVerified */ $cssClass ?>" id="<?= /* @escapeNotVerified */ $id ?>">
--        <?php if ($element->getLegend() && !$isWrapped): ?>
--            <legend class="<?= /* @escapeNotVerified */ $isField ? 'label admin__field-label' : 'admin__legend legend' ?>">
--                <span><?= /* @escapeNotVerified */ $element->getLegend() ?></span>
-+    <?php if (!$element->getNoContainer()) : ?>
-+        <fieldset class="<?=  $block->escapeHtmlAttr($cssClass) ?>" id="<?=  $block->escapeHtmlAttr($id) ?>">
-+        <?php if (strlen($element->getBeforeElementHtml())) : ?>
-+            <?= $element->getBeforeElementHtml() ?>
-+        <?php endif ?>
-+        <?php if ($element->getLegend() && !$isWrapped) : ?>
-+            <legend class="<?= /* @noEscape */ $isField ? 'label admin__field-label' : 'admin__legend legend' ?>">
-+                <span><?= $block->escapeHtml($element->getLegend()) ?></span>
-             </legend><br />
-         <?php endif; ?>
-     <?php endif; ?>
- 
- 
-     <div class="messages">
--        <?php if ($element->getComment() && !$isField): ?>
-+        <?php if ($element->getComment() && !$isField) : ?>
-             <div class="message message-notice"><?= $block->escapeHtml($element->getComment()) ?></div>
-         <?php endif; ?>
-     </div>
-@@ -73,34 +73,34 @@ if ($isField) {
- 
-     <?= ($isField) ? '<div class="control admin__field-control">' : '' ?>
- 
--    <?php if ($element->hasHtmlContent() && !$isField): ?>
-+    <?php if ($element->hasHtmlContent() && !$isField) : ?>
-         <?= $element->getHtmlContent() ?>
--    <?php else: ?>
-+    <?php else : ?>
- 
--        <?php if ($isField && $count > 1):?>
--            <div class="fields-group-<?= /* @escapeNotVerified */ $count ?>">
-+        <?php if ($isField && $count > 1) : ?>
-+            <div class="fields-group-<?= /* @noEscape */ $count ?>">
-         <?php endif; ?>
- 
-         <?= $element->getBasicChildrenHtml() ?>
- 
-         <?= ($isField && $count > 1) ? '</div>' : '' ?>
- 
--        <?php if ($element->getComment() && $isField): ?>
-+        <?php if ($element->getComment() && $isField) : ?>
-             <div class="note"><?= $block->escapeHtml($element->getComment()) ?></div>
-         <?php endif; ?>
- 
--        <?php if ($element->hasAdvanced() && !$isField): ?>
-+        <?php if ($element->hasAdvanced() && !$isField) : ?>
-             <?= (!$element->getNoContainer() && $advancedAfter)  ? '</fieldset>' : '' ?>
--            <details data-mage-init='{"details": {}}' class="details admin__collapsible-block-wrapper" id="details<?= /* @escapeNotVerified */ $id ?>">
--                <summary class="details-summary admin__collapsible-title" id="details-summary<?= /* @escapeNotVerified */ $id ?>">
--                    <span><?= /* @escapeNotVerified */ $advancedLabel ?></span>
-+            <details data-mage-init='{"details": {}}' class="details admin__collapsible-block-wrapper" id="details<?= /* @noEscape */ $id ?>">
-+                <summary class="details-summary admin__collapsible-title" id="details-summary<?= /* @noEscape */ $id ?>">
-+                    <span><?= $block->escapeHtml($advancedLabel) ?></span>
-                 </summary>
--                <div class="details-content admin__fieldset" id="details-content<?= /* @escapeNotVerified */ $id ?>">
-+                <div class="details-content admin__fieldset" id="details-content<?= /* @noEscape */ $id ?>">
-                     <?= $element->getAdvancedChildrenHtml() ?>
-                 </div>
-             </details>
--        <?php elseif ($element->hasAdvanced() && $isField): ?>
--            <div class="nested" id="nested<?= /* @escapeNotVerified */ $id ?>">
-+        <?php elseif ($element->hasAdvanced() && $isField) : ?>
-+            <div class="nested" id="nested<?= /* @noEscape */ $id ?>">
-                 <?= $element->getAdvancedChildrenHtml() ?>
-             </div>
-         <?php endif; ?>
-@@ -110,11 +110,11 @@ if ($isField) {
-     <?php endif; ?>
- 
- 
--    <?php if (!$element->getNoContainer() && !$advancedAfter): ?>
-+    <?php if (!$element->getNoContainer() && !$advancedAfter) : ?>
-         </fieldset>
-     <?php endif; ?>
- 
--<?php if ($isWrapped): ?>
-+<?php if ($isWrapped) : ?>
-         </div>
-     </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
-index 3608ed7662e..bec6fe84fb2 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
-@@ -26,20 +23,20 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
-     . ($element->getFieldExtraAttributes() ? ' ' . $element->getFieldExtraAttributes() : '');
- ?>
- 
--<?php if (!$element->getNoDisplay()): ?>
--    <?php if ($element->getType() == 'hidden'): ?>
-+<?php if (!$element->getNoDisplay()) : ?>
-+    <?php if ($element->getType() == 'hidden') : ?>
-         <?= $element->getElementHtml() ?>
--    <?php else: ?>
--    <div<?= /* @escapeNotVerified */ $fieldAttributes ?>>
--        <?php if ($elementBeforeLabel): ?>
-+    <?php else : ?>
-+    <div<?= /* @noEscape */ $fieldAttributes ?>>
-+        <?php if ($elementBeforeLabel) : ?>
-             <?= $element->getElementHtml() ?>
-             <?= $element->getLabelHtml('', $element->getScopeLabel()) ?>
--            <?= /* @escapeNotVerified */ $note ?>
--        <?php else: ?>
-+            <?= /* @noEscape */ $note ?>
-+        <?php else : ?>
-             <?= $element->getLabelHtml('', $element->getScopeLabel()) ?>
-             <div class="admin__field-control control">
--                <?= /* @escapeNotVerified */ ($addOn) ? '<div class="admin__field">' . $element->getElementHtml() . '</div>' : $element->getElementHtml() ?>
--                <?= /* @escapeNotVerified */ $note ?>
-+                <?= /* @noEscape */ ($addOn) ? '<div class="admin__field">' . $element->getElementHtml() . '</div>' : $element->getElementHtml() ?>
-+                <?= /* @noEscape */ $note ?>
-             </div>
-         <?php endif; ?>
-     </div>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
-index c665c1095a5..63cdae13490 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -19,101 +16,101 @@
-  *
-  */
- /* @var $block \Magento\Backend\Block\Widget\Grid */
--$numColumns = !is_null($block->getColumns()) ? sizeof($block->getColumns()) : 0;
-+$numColumns = $block->getColumns() !== null ? count($block->getColumns()) : 0;
- ?>
--<?php if ($block->getCollection()): ?>
-+<?php if ($block->getCollection()) : ?>
- 
--<?php if ($block->canDisplayContainer()): ?>
-+    <?php if ($block->canDisplayContainer()) : ?>
- <div id="<?= $block->escapeHtml($block->getId()) ?>" data-grid-id="<?= $block->escapeHtml($block->getId()) ?>">
--<?php else: ?>
--<?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
--<?php endif; ?>
-+    <?php else : ?>
-+    <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
-+    <?php endif; ?>
- 
-         <div class="admin__data-grid-header admin__data-grid-toolbar">
-             <?php $massActionAvailable = $block->getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable() ?>
--            <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getChildBlock('grid.columnSet')->getFilterVisibility() || $massActionAvailable): ?>
-+            <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getChildBlock('grid.columnSet')->getFilterVisibility() || $massActionAvailable) : ?>
-             <div class="admin__data-grid-header-row">
--                <?php if ($massActionAvailable): ?>
-+                <?php if ($massActionAvailable) : ?>
-                     <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
-                 <?php endif; ?>
- 
--                <?php if ($block->getChildBlock('grid.export')): ?>
-+                <?php if ($block->getChildBlock('grid.export')) : ?>
-                     <?= $block->getChildHtml('grid.export') ?>
-                 <?php endif; ?>
-             </div>
-             <?php endif; ?>
--            <div class="<?php if($massActionAvailable) { echo '_massaction ';} ?>admin__data-grid-header-row">
--                <?php if ($massActionAvailable): ?>
-+            <div class="<?php if ($massActionAvailable) { echo '_massaction ';} ?>admin__data-grid-header-row">
-+                <?php if ($massActionAvailable) : ?>
-                     <?= $block->getChildHtml('grid.massaction') ?>
--                <?php else: ?>
-+                <?php else : ?>
-                     <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
-                 <?php endif; ?>
-                     <?php $countRecords = $block->getCollection()->getSize(); ?>
-                     <div class="admin__control-support-text">
--                        <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>-total-count" <?= /* @escapeNotVerified */ $block->getUiId('total-count') ?>>
--                            <?= /* @escapeNotVerified */ $countRecords ?>
-+                        <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>-total-count" <?= /* @noEscape */ $block->getUiId('total-count') ?>>
-+                            <?= /* @noEscape */ $countRecords ?>
-                         </span>
--                        <?= /* @escapeNotVerified */ __('records found') ?>
-+                        <?= $block->escapeHtml(__('records found')) ?>
-                         <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>_massaction-count"
--                              class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?= /* @escapeNotVerified */ __('selected') ?></span></span>
-+                              class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?= $block->escapeHtml(__('selected')) ?></span></span>
-                     </div>
--                <?php if ($block->getPagerVisibility()): ?>
-+                <?php if ($block->getPagerVisibility()) : ?>
-                     <div class="admin__data-grid-pager-wrap">
--                        <select name="<?= /* @escapeNotVerified */ $block->getVarNameLimit() ?>"
-+                        <select name="<?= $block->escapeHtmlAttr($block->getVarNameLimit()) ?>"
-                                 id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
--                                onchange="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.loadByElement(this)" <?= /* @escapeNotVerified */ $block->getUiId('per-page') ?>
-+                                onchange="<?= /* @noEscape */ $block->getJsObjectName() ?>.loadByElement(this)" <?= /* @noEscape */ $block->getUiId('per-page') ?>
-                                 class="admin__control-select">
--                            <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
-+                            <option value="20"<?php if ($block->getCollection()->getPageSize() == 20) : ?>
-                                 selected="selected"<?php endif; ?>>20
-                             </option>
--                            <option value="30"<?php if ($block->getCollection()->getPageSize() == 30): ?>
-+                            <option value="30"<?php if ($block->getCollection()->getPageSize() == 30) : ?>
-                                 selected="selected"<?php endif; ?>>30
-                             </option>
--                            <option value="50"<?php if ($block->getCollection()->getPageSize() == 50): ?>
-+                            <option value="50"<?php if ($block->getCollection()->getPageSize() == 50) : ?>
-                                 selected="selected"<?php endif; ?>>50
-                             </option>
--                            <option value="100"<?php if ($block->getCollection()->getPageSize() == 100): ?>
-+                            <option value="100"<?php if ($block->getCollection()->getPageSize() == 100) : ?>
-                                 selected="selected"<?php endif; ?>>100
-                             </option>
--                            <option value="200"<?php if ($block->getCollection()->getPageSize() == 200): ?>
-+                            <option value="200"<?php if ($block->getCollection()->getPageSize() == 200) : ?>
-                                 selected="selected"<?php endif; ?>>200
-                             </option>
-                         </select>
-                         <label for="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
--                            class="admin__control-support-text"><?= /* @escapeNotVerified */ __('per page') ?></label>
-+                            class="admin__control-support-text"><?= $block->escapeHtml(__('per page')) ?></label>
-                         <div class="admin__data-grid-pager">
-                             <?php $_curPage = $block->getCollection()->getCurPage() ?>
-                             <?php $_lastPage = $block->getCollection()->getLastPageNumber() ?>
- 
--                            <?php if ($_curPage > 1): ?>
-+                            <?php if ($_curPage > 1) : ?>
-                                 <button class="action-previous"
-                                         type="button"
--                                        onclick="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setPage('<?= /* @escapeNotVerified */ ($_curPage - 1) ?>');return false;">
--                                            <span><?= /* @escapeNotVerified */ __('Previous page') ?></span>
-+                                        onclick="<?= /* @noEscape */ $block->getJsObjectName() ?>.setPage('<?= /* @noEscape */ ($_curPage - 1) ?>');return false;">
-+                                            <span><?= $block->escapeHtml(__('Previous page')) ?></span>
-                                 </button>
--                            <?php else: ?>
--                                <button type="button" class="action-previous disabled"><span><?= /* @escapeNotVerified */ __('Previous page') ?></span></button>
-+                            <?php else : ?>
-+                                <button type="button" class="action-previous disabled"><span><?= $block->escapeHtml(__('Previous page')) ?></span></button>
-                             <?php endif; ?>
- 
-                             <input type="text"
-                                    id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current"
--                                   name="<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>"
--                                   value="<?= /* @escapeNotVerified */ $_curPage ?>"
-+                                   name="<?= $block->escapeHtmlAttr($block->getVarNamePage()) ?>"
-+                                   value="<?= $block->escapeHtmlAttr($_curPage) ?>"
-                                    class="admin__control-text"
--                                   onkeypress="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.inputPage(event, '<?= /* @escapeNotVerified */ $_lastPage ?>')" <?= /* @escapeNotVerified */ $block->getUiId('current-page') ?> />
-+                                   onkeypress="<?= /* @noEscape */ $block->getJsObjectName() ?>.inputPage(event, '<?= /* @noEscape */ $_lastPage ?>')" <?= /* @noEscape */ $block->getUiId('current-page') ?> />
- 
-                             <label class="admin__control-support-text" for="<?= $block->escapeHtml($block->getHtmlId())
-                             ?>_page-current">
--                                <?= /* @escapeNotVerified */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
-+                                <?= /* @noEscape */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
-                             </label>
--                            <?php if ($_curPage < $_lastPage): ?>
--                                <button title="<?= /* @escapeNotVerified */ __('Next page') ?>"
-+                            <?php if ($_curPage < $_lastPage) : ?>
-+                                <button type="button" title="<?= $block->escapeHtmlAttr(__('Next page')) ?>"
-                                         class="action-next"
--                                        onclick="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setPage('<?= /* @escapeNotVerified */ ($_curPage + 1) ?>');return false;">
--                                    <span><?= /* @escapeNotVerified */ __('Next page') ?></span>
-+                                        onclick="<?= /* @noEscape */ $block->getJsObjectName() ?>.setPage('<?= /* @noEscape */ ($_curPage + 1) ?>');return false;">
-+                                    <span><?= $block->escapeHtml(__('Next page')) ?></span>
-                                 </button>
--                            <?php else: ?>
--                                <button type="button" class="action-next disabled"><span><?= /* @escapeNotVerified */ __('Next page') ?></span></button>
-+                            <?php else : ?>
-+                                <button type="button" class="action-next disabled"><span><?= $block->escapeHtml(__('Next page')) ?></span></button>
-                             <?php endif; ?>
-                         </div>
-                     </div>
-@@ -121,77 +118,77 @@ $numColumns = !is_null($block->getColumns()) ? sizeof($block->getColumns()) : 0;
-             </div>
-         </div>
-         <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
--        <?php if ($block->getGridCssClass()): ?>
--            <table class="<?= /* @escapeNotVerified */ $block->getGridCssClass() ?> data-grid" id="<?= $block->escapeHtml($block->getId()) ?>_table">
-+        <?php if ($block->getGridCssClass()) : ?>
-+            <table class="<?= $block->escapeHtmlAttr($block->getGridCssClass()) ?> data-grid" id="<?= $block->escapeHtml($block->getId()) ?>_table">
-                 <!-- Rendering column set -->
-                 <?= $block->getChildHtml('grid.columnSet') ?>
-             </table>
--        <?php else: ?>
-+        <?php else : ?>
- 
-             <table class="data-grid" id="<?= $block->escapeHtml($block->getId()) ?>_table">
-                 <!-- Rendering column set -->
-                 <?= $block->getChildHtml('grid.columnSet') ?>
-             </table>
- 
--            <?php if ($block->getChildBlock('grid.bottom.links')): ?>
-+            <?php if ($block->getChildBlock('grid.bottom.links')) : ?>
-                 <?= $block->getChildHtml('grid.bottom.links') ?>
-             <?php endif; ?>
- 
-         <?php endif ?>
-         </div>
--<?php if ($block->canDisplayContainer()): ?>
-+    <?php if ($block->canDisplayContainer()) : ?>
- </div>
- <script>
-     var deps = [];
- 
--    <?php if ($block->getDependencyJsObject()): ?>
-+        <?php if ($block->getDependencyJsObject()) : ?>
-     deps.push('uiRegistry');
--    <?php endif; ?>
-+        <?php endif; ?>
- 
--    <?php if (strpos($block->getRowClickCallback(), 'order.') !== false): ?>
-+        <?php if (strpos($block->getRowClickCallback(), 'order.') !== false) : ?>
-     deps.push('Magento_Sales/order/create/form');
-     deps.push('jquery');
--    <?php endif; ?>
-+        <?php endif; ?>
- 
-     deps.push('mage/adminhtml/grid');
- 
-     require(deps, function(<?= ($block->getDependencyJsObject() ? 'registry' : '') ?>){
-         <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
- 
--        <?php if ($block->getDependencyJsObject()): ?>
--            registry.get('<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>', function (<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>) {
-+        <?php if ($block->getDependencyJsObject()) : ?>
-+            registry.get('<?= $block->escapeJs($block->getDependencyJsObject()) ?>', function (<?= $block->escapeJs($block->getDependencyJsObject()) ?>) {
-         <?php endif; ?>
- 
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?> = new varienGrid('<?= $block->escapeHtml($block->getId()) ?>', '<?= /* @escapeNotVerified */ $block->getGridUrl() ?>', '<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameSort() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameDir() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameFilter() ?>');
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.useAjax = <?= /* @escapeNotVerified */ $block->getUseAjax() ? 'true' : 'false' ?>;
--        <?php if ($block->getRowClickCallback()): ?>
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.rowClickCallback = <?= /* @escapeNotVerified */ $block->getRowClickCallback() ?>;
-+        <?= $block->escapeJs($block->getJsObjectName()) ?> = new varienGrid('<?= $block->escapeHtml($block->getId()) ?>', '<?= $block->escapeJs($block->getGridUrl()) ?>', '<?= $block->escapeJs($block->getVarNamePage()) ?>', '<?= $block->escapeJs($block->getVarNameSort()) ?>', '<?= $block->escapeJs($block->getVarNameDir()) ?>', '<?= $block->escapeJs($block->getVarNameFilter()) ?>');
-+        <?= $block->escapeJs($block->getJsObjectName()) ?>.useAjax = <?= /* @noEscape */ $block->getUseAjax() ? 'true' : 'false' ?>;
-+        <?php if ($block->getRowClickCallback()) : ?>
-+                <?= $block->escapeJs($block->getJsObjectName()) ?>.rowClickCallback = <?= /* @noEscape */ $block->getRowClickCallback() ?>;
-         <?php endif; ?>
--        <?php if ($block->getCheckboxCheckCallback()): ?>
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.checkboxCheckCallback = <?= /* @escapeNotVerified */ $block->getCheckboxCheckCallback() ?>;
-+        <?php if ($block->getCheckboxCheckCallback()) : ?>
-+                <?= $block->escapeJs($block->getJsObjectName()) ?>.checkboxCheckCallback = <?= /* @noEscape */ $block->getCheckboxCheckCallback() ?>;
-         <?php endif; ?>
--        <?php if ($block->getSortableUpdateCallback()): ?>
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.sortableUpdateCallback = <?= /* @escapeNotVerified */ $block->getSortableUpdateCallback() ?>;
-+        <?php if ($block->getSortableUpdateCallback()) : ?>
-+                <?= $block->escapeJs($block->getJsObjectName()) ?>.sortableUpdateCallback = <?= /* @noEscape */ $block->getSortableUpdateCallback() ?>;
-         <?php endif; ?>
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.bindSortable();
--        <?php if ($block->getRowInitCallback()): ?>
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.initRowCallback = <?= /* @escapeNotVerified */ $block->getRowInitCallback() ?>;
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.initGridRows();
-+        <?= $block->escapeJs($block->getJsObjectName()) ?>.bindSortable();
-+        <?php if ($block->getRowInitCallback()) : ?>
-+                <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
-+                <?= $block->escapeJs($block->getJsObjectName()) ?>.initGridRows();
-         <?php endif; ?>
--        <?php if ($block->getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable()): ?>
--        <?= /* @escapeNotVerified */ $block->getChildBlock('grid.massaction')->getJavaScript() ?>
-+        <?php if ($block->getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable()) : ?>
-+                <?= /* @noEscape */ $block->getChildBlock('grid.massaction')->getJavaScript() ?>
-         <?php endif ?>
--        <?= /* @escapeNotVerified */ $block->getAdditionalJavaScript() ?>
-+        <?= /* @noEscape */ $block->getAdditionalJavaScript() ?>
- 
--        <?php if ($block->getDependencyJsObject()): ?>
-+        <?php if ($block->getDependencyJsObject()) : ?>
-             });
-         <?php endif; ?>
-     });
- </script>
- <?php endif; ?>
- 
--<?php if ($block->getChildBlock('grid.js')): ?>
--    <?= $block->getChildHtml('grid.js') ?>
--<?php endif; ?>
-+    <?php if ($block->getChildBlock('grid.js')) : ?>
-+        <?= $block->getChildHtml('grid.js') ?>
-+    <?php endif; ?>
- 
- <?php endif ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
-index 5ff9cfbd96f..0906694520c 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
-@@ -3,42 +3,39 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-  * Template for \Magento\Backend\Block\Widget\Grid\ColumnSet
-  * @var $block \Magento\Backend\Block\Widget\Grid\ColumnSet
-  */
--$numColumns = sizeof($block->getColumns());
-+$numColumns = count($block->getColumns());
- ?>
--<?php if ($block->getCollection()): ?>
-+<?php if ($block->getCollection()) : ?>
-     <?php
-     /* This part is commented to remove all <col> tags from the code. */
-     /* foreach ($block->getColumns() as $_column): ?>
-         <col <?= $_column->getHtmlProperty() ?> />
-     <?php endforeach; */ ?>
--    <?php if ($block->isHeaderVisible()): ?>
-+    <?php if ($block->isHeaderVisible()) : ?>
-         <thead>
--            <?php if ($block->isHeaderVisible() || $block->getFilterVisibility()): ?>
-+            <?php if ($block->isHeaderVisible() || $block->getFilterVisibility()) : ?>
-                 <tr>
--                <?php foreach ($block->getColumns() as $_column): ?>
--                <?php /* @var $_column \Magento\Backend\Block\Widget\Grid\Column */ ?>
--                    <?php if ($_column->getHeaderHtml() == '&nbsp;'):?>
--                        <th class="data-grid-th" data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
-+                <?php foreach ($block->getColumns() as $_column) : ?>
-+                    <?php /* @var $_column \Magento\Backend\Block\Widget\Grid\Column */ ?>
-+                    <?php if ($_column->getHeaderHtml() == '&nbsp;') :?>
-+                        <th class="data-grid-th" data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>"
-                             <?= $_column->getHeaderHtmlProperty() ?>>&nbsp;</th>
--                    <?php else: ?>
-+                    <?php else : ?>
-                         <?= $_column->getHeaderHtml() ?>
-                     <?php endif; ?>
-                 <?php endforeach; ?>
-                 </tr>
-             <?php endif; ?>
--            <?php if ($block->isFilterVisible()): ?>
-+            <?php if ($block->isFilterVisible()) : ?>
-                 <tr class="data-grid-filters" data-role="filter-form">
--                    <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
--                        <td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>" <?= $_column->getHeaderHtmlProperty() ?>>
-+                    <?php $i = 0; foreach ($block->getColumns() as $_column) : ?>
-+                        <td data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>" <?= $_column->getHeaderHtmlProperty() ?>>
-                             <?= $_column->getFilterHtml() ?>
-                         </td>
-                     <?php endforeach; ?>
-@@ -49,75 +46,76 @@ $numColumns = sizeof($block->getColumns());
- 
-     <tbody>
- 
--        <?php if ($block->getCollection()->getSize() > 0 && !$block->getIsCollapsed()): ?>
--        <?php foreach ($block->getCollection() as $_index => $_item): ?>
--            <?php if ($block->hasMultipleRows($_item)) :?>
--                <?php $block->updateItemByFirstMultiRow($_item); ?>
--                <tr title="<?= /* @escapeNotVerified */ $block->getRowUrl($_item) ?>" data-role="row"
--                    <?php if ($_class = $block->getRowClass($_item)):?> class="<?= /* @escapeNotVerified */ $_class ?>"<?php endif;?>
--                ><?php $i = 0; foreach ($block->getColumns() as $_column):
--                      if ($block->shouldRenderCell($_item, $_column)):
-+        <?php if ($block->getCollection()->getSize() > 0 && !$block->getIsCollapsed()) : ?>
-+            <?php foreach ($block->getCollection() as $_index => $_item) : ?>
-+                <?php if ($block->hasMultipleRows($_item)) :?>
-+                    <?php $block->updateItemByFirstMultiRow($_item); ?>
-+                <tr title="<?= $block->escapeHtmlAttr($block->getRowUrl($_item)) ?>" data-role="row"
-+                    <?php if ($_class = $block->getRowClass($_item)) :?> class="<?= $block->escapeHtmlAttr($_class) ?>"<?php endif;?>
-+                ><?php $i = 0; foreach ($block->getColumns() as $_column) :
-+                    if ($block->shouldRenderCell($_item, $_column)) :
-                             $_rowspan = $block->getRowspan($_item, $_column);
--                          ?><td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
--                                <?= ($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
--                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
-+                        ?><td data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>"
-+                                <?= /* @noEscape */ ($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
-+                                class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?> <?= /* @noEscape */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
-                             >
--                                <?= (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
-+                                <?= /* @noEscape */ (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
-                             </td><?php
--                            if ($block->shouldRenderEmptyCell($_item, $_column)):?>
--                                <td colspan="<?= /* @escapeNotVerified */ $block->getEmptyCellColspan($_item) ?>" class="last">
--                                <?= /* @escapeNotVerified */ $block->getEmptyCellLabel() ?>
-+                            if ($block->shouldRenderEmptyCell($_item, $_column)) :?>
-+                                <td colspan="<?= $block->escapeHtmlAttr($block->getEmptyCellColspan($_item)) ?>" class="last">
-+                                <?= $block->escapeHtml($block->getEmptyCellLabel()) ?>
-                                 </td><?php
-                             endif;
-                         endif;
-                     endforeach;
--                ?></tr>
--                <?php $_isFirstRow = true; ?>
--                <?php foreach ($block->getMultipleRows($_item) as $_i):?>
--                    <?php if ($_isFirstRow) : ?>
--                        <?php $_isFirstRow = false; continue; ?>
--                    <?php endif; ?>
-+?></tr>
-+                    <?php $_isFirstRow = true; ?>
-+                    <?php foreach ($block->getMultipleRows($_item) as $_i) : ?>
-+                        <?php
-+                        if ($_isFirstRow) {
-+                            $_isFirstRow = false;
-+                            continue;
-+                        }
-+                        ?>
-                     <tr data-role="row">
--                        <?php $i = 0; foreach ($block->getMultipleRowColumns($_i) as $_column):
--                            ?><td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
--                            class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns-1 ? 'last' : '' ?>"
-+                        <?php $i = 0; foreach ($block->getMultipleRowColumns($_i) as $_column) :
-+                            ?><td data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>"
-+                            class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?> <?= /* @noEscape */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns-1 ? 'last' : '' ?>"
-                         >
--                            <?= (($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
-+                            <?= /* @noEscape */ (($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
-                         </td><?php
-                         endforeach; ?>
-                     </tr>
-                 <?php endforeach;?>
- 
--                <?php if ($block->shouldRenderSubTotal($_item)): ?>
-+                    <?php if ($block->shouldRenderSubTotal($_item)) : ?>
-                     <tr class="subtotals">
--                        <?php $i = 0; foreach ($block->getMultipleRowColumns() as $_column): ?>
--                            <td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
--                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
-+                        <?php $i = 0; foreach ($block->getMultipleRowColumns() as $_column) : ?>
-+                            <td data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>"
-+                                class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?> <?= /* @noEscape */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
-                             >
--                                <?php /* @escapeNotVerified */ echo $_column->hasSubtotalsLabel() ? $_column->getSubtotalsLabel()
--                                    : $_column->getRowField($block->getSubTotals($_item));
--                                ?>
-+                                <?= /* @noEscape */ $_column->hasSubtotalsLabel() ? $block->escapeHtml($_column->getSubtotalsLabel()) : $_column->getRowField($block->getSubTotals($_item)) ?>
-                             </td>
-                         <?php endforeach; ?>
-                     </tr>
-                 <?php endif; ?>
--            <?php else: ?>
--                <tr data-role="row" title="<?= /* @escapeNotVerified */ $block->getRowUrl($_item) ?>"<?php if ($_class = $block->getRowClass($_item)):?>
--                    class="<?= /* @escapeNotVerified */ $_class ?>"<?php endif;?>
-+            <?php else : ?>
-+                <tr data-role="row" title="<?= $block->escapeHtmlAttr($block->getRowUrl($_item)) ?>"<?php if ($_class = $block->getRowClass($_item)) : ?>
-+                    class="<?= $block->escapeHtmlAttr($_class) ?>"<?php endif;?>
-                 >
--                    <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
--                        <?php if ($block->shouldRenderCell($_item, $_column)):?>
--                            <td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
--                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
-+                    <?php $i = 0; foreach ($block->getColumns() as $_column) : ?>
-+                        <?php if ($block->shouldRenderCell($_item, $_column)) : ?>
-+                            <td data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>"
-+                                class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?> <?= /* @noEscape */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
-                             >
--                                <?= (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
-+                                <?= /* @noEscape */ (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
-                             </td>
--                            <?php if ($block->shouldRenderEmptyCell($_item, $_column)):?>
--                                <td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
--                                    colspan="<?= /* @escapeNotVerified */ $block->getEmptyCellColspan($_item) ?>"
--                                    class="col-no-records <?= /* @escapeNotVerified */ $block->getEmptyTextClass() ?> last"
-+                            <?php if ($block->shouldRenderEmptyCell($_item, $_column)) : ?>
-+                                <td data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>"
-+                                    colspan="<?= $block->escapeHtmlAttr($block->getEmptyCellColspan($_item)) ?>"
-+                                    class="col-no-records <?= $block->escapeHtmlAttr($block->getEmptyTextClass()) ?> last"
-                                 >
--                                    <?= /* @escapeNotVerified */ $block->getEmptyCellLabel() ?>
-+                                    <?= $block->escapeHtml($block->getEmptyCellLabel()) ?>
-                                 </td>
-                             <?php endif;?>
-                         <?php endif;?>
-@@ -125,23 +123,22 @@ $numColumns = sizeof($block->getColumns());
-                 </tr>
-             <?php endif; ?>
-         <?php endforeach; ?>
--        <?php elseif ($block->getEmptyText()): ?>
-+        <?php elseif ($block->getEmptyText()) : ?>
-             <tr class="data-grid-tr-no-data" data-role="row">
--                <td class="<?= /* @escapeNotVerified */ $block->getEmptyTextClass() ?>"
--                    colspan="<?= /* @escapeNotVerified */ $numColumns ?>"><?= /* @escapeNotVerified */ $block->getEmptyText() ?></td>
-+                <td class="<?= $block->escapeHtmlAttr($block->getEmptyTextClass()) ?>"
-+                    colspan="<?= $block->escapeHtmlAttr($numColumns) ?>"><?= $block->escapeHtml($block->getEmptyText()) ?></td>
-             </tr>
-         <?php endif; ?>
-     </tbody>
- 
--    <?php if ($block->shouldRenderTotal()): ?>
-+    <?php if ($block->shouldRenderTotal()) : ?>
-     <tfoot>
-         <tr class="totals" data-role="row">
--            <?php foreach ($block->getColumns() as $_column): ?>
--                <th data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
--                    class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?>"
-+            <?php foreach ($block->getColumns() as $_column) : ?>
-+                <th data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>"
-+                    class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?>"
-                 >
--                    <?php /* @escapeNotVerified */ echo($_column->hasTotalsLabel()) ? $_column->getTotalsLabel()
--                        : $_column->getRowField($block->getTotals()) ?>
-+                    <?= /* @noEscape */ ($_column->hasTotalsLabel()) ? $block->escapeHtml($_column->getTotalsLabel()) : $_column->getRowField($block->getTotals()) ?>
-                 </th>
-             <?php endforeach; ?>
-         </tr>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml
-index 8a40853a405..6a8ec2a934c 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml
-@@ -3,11 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($block->getButtonsHtml()): ?>
-+<?php if ($block->getButtonsHtml()) : ?>
- <div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getButtonsHtml() ?></div>
- <?php endif; ?>
- <?= $block->getGridHtml() ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml
-index 700e9749f73..e62c6ca3b42 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getGridHtml() ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml
-index 35be61dad7f..e70b93d0afc 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml
-@@ -3,17 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div class="admin__data-grid-export">
--    <label for="<?= /* @escapeNotVerified */ $block->getId() ?>_export" class="admin__control-support-text">
--        <?= /* @escapeNotVerified */ __('Export to:') ?>
-+    <label for="<?= $block->escapeHtmlAttr($block->getId()) ?>_export" class="admin__control-support-text">
-+        <?= $block->escapeHtml(__('Export to:')) ?>
-     </label>
--    <select name="<?= /* @escapeNotVerified */ $block->getId() ?>_export" id="<?= /* @escapeNotVerified */ $block->getId() ?>_export" class="admin__control-select">
--        <?php foreach ($block->getExportTypes() as $_type): ?>
--            <option value="<?= /* @escapeNotVerified */ $_type->getUrl() ?>"><?= /* @escapeNotVerified */ $_type->getLabel() ?></option>
-+    <select name="<?= $block->escapeHtmlAttr($block->getId()) ?>_export" id="<?= $block->escapeHtmlAttr($block->getId()) ?>_export" class="admin__control-select">
-+        <?php foreach ($block->getExportTypes() as $_type) : ?>
-+            <option value="<?= $block->escapeHtmlAttr($_type->getUrl()) ?>"><?= $block->escapeHtml($_type->getLabel()) ?></option>
-         <?php endforeach; ?>
-     </select>
-     <?= $block->getExportButtonHtml() ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
-index f97db4ad993..0bb453f25d7 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -17,35 +14,35 @@
-  *  getPagerVisibility()
-  *  getVarNamePage()
-  */
--$numColumns = sizeof($block->getColumns());
-+$numColumns = count($block->getColumns());
- 
- /**
-  * @var \Magento\Backend\Block\Widget\Grid\Extended $block
-  */
- ?>
--<?php if ($block->getCollection()): ?>
--    <?php if ($block->canDisplayContainer()): ?>
-+<?php if ($block->getCollection()) : ?>
-+    <?php if ($block->canDisplayContainer()) : ?>
- 
-     <div id="<?= $block->escapeHtml($block->getId()) ?>" data-grid-id="<?= $block->escapeHtml($block->getId()) ?>">
--    <?php else: ?>
-+    <?php else : ?>
-         <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
-     <?php endif; ?>
-     <?php $massActionAvailable = $block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable() ?>
--    <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getFilterVisibility() || $massActionAvailable): ?>
-+    <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getFilterVisibility() || $massActionAvailable) : ?>
-         <div class="admin__data-grid-header admin__data-grid-toolbar">
-             <div class="admin__data-grid-header-row">
--                <?php if ($massActionAvailable): ?>
-+                <?php if ($massActionAvailable) : ?>
-                     <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
-                 <?php endif; ?>
--            <?php if ($block->getExportTypes()): ?>
-+            <?php if ($block->getExportTypes()) : ?>
-                 <div class="admin__data-grid-export">
-                     <label
-                         class="admin__control-support-text"
--                        for="<?= $block->escapeHtml($block->getId()) ?>_export"><?= /* @escapeNotVerified */ __('Export to:') ?></label>
-+                        for="<?= $block->escapeHtml($block->getId()) ?>_export"><?= $block->escapeHtml(__('Export to:')) ?></label>
-                     <select name="<?= $block->escapeHtml($block->getId()) ?>_export" id="<?= $block->escapeHtml($block->getId()) ?>_export"
-                             class="admin__control-select">
--                        <?php foreach ($block->getExportTypes() as $_type): ?>
--                            <option value="<?= /* @escapeNotVerified */ $_type->getUrl() ?>"><?= /* @escapeNotVerified */ $_type->getLabel() ?></option>
-+                        <?php foreach ($block->getExportTypes() as $_type) : ?>
-+                            <option value="<?= $block->escapeHtmlAttr($_type->getUrl()) ?>"><?= $block->escapeHtml($_type->getLabel()) ?></option>
-                         <?php endforeach; ?>
-                     </select>
-                     <?= $block->getExportButtonHtml() ?>
-@@ -54,76 +51,76 @@ $numColumns = sizeof($block->getColumns());
-             </div>
- 
-             <div class="admin__data-grid-header-row <?= $massActionAvailable ? '_massaction' : '' ?>">
--                <?php if ($massActionAvailable): ?>
-+                <?php if ($massActionAvailable) : ?>
-                     <?= $block->getMassactionBlockHtml() ?>
--                <?php else: ?>
-+                <?php else : ?>
-                     <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
-                 <?php endif; ?>
-                 <?php $countRecords = $block->getCollection()->getSize(); ?>
-                 <div class="admin__control-support-text">
--                        <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>-total-count" <?= /* @escapeNotVerified */ $block->getUiId('total-count') ?>>
--                            <?= /* @escapeNotVerified */ $countRecords ?>
-+                        <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>-total-count" <?= /* @noEscape */ $block->getUiId('total-count') ?>>
-+                            <?= /* @noEscape */ $countRecords ?>
-                         </span>
--                    <?= /* @escapeNotVerified */ __('records found') ?>
-+                    <?= $block->escapeHtml(__('records found')) ?>
-                     <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>_massaction-count"
--                          class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?= /* @escapeNotVerified */ __('selected') ?></span></span>
-+                          class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?= $block->escapeHtml(__('selected')) ?></span></span>
-                 </div>
- 
--            <?php if ($block->getPagerVisibility()): ?>
-+            <?php if ($block->getPagerVisibility()) : ?>
-                 <div class="admin__data-grid-pager-wrap">
--                    <select name="<?= /* @escapeNotVerified */ $block->getVarNameLimit() ?>"
-+                    <select name="<?= $block->escapeHtmlAttr($block->getVarNameLimit()) ?>"
-                             id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
--                            onchange="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.loadByElement(this)"
-+                            onchange="<?= /* @noEscape */ $block->getJsObjectName() ?>.loadByElement(this)"
-                             class="admin__control-select">
--                        <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
-+                        <option value="20"<?php if ($block->getCollection()->getPageSize() == 20) : ?>
-                             selected="selected"<?php endif; ?>>20
-                         </option>
--                        <option value="30"<?php if ($block->getCollection()->getPageSize() == 30): ?>
-+                        <option value="30"<?php if ($block->getCollection()->getPageSize() == 30) : ?>
-                             selected="selected"<?php endif; ?>>30
-                         </option>
--                        <option value="50"<?php if ($block->getCollection()->getPageSize() == 50): ?>
-+                        <option value="50"<?php if ($block->getCollection()->getPageSize() == 50) : ?>
-                             selected="selected"<?php endif; ?>>50
-                         </option>
--                        <option value="100"<?php if ($block->getCollection()->getPageSize() == 100): ?>
-+                        <option value="100"<?php if ($block->getCollection()->getPageSize() == 100) : ?>
-                             selected="selected"<?php endif; ?>>100
-                         </option>
--                        <option value="200"<?php if ($block->getCollection()->getPageSize() == 200): ?>
-+                        <option value="200"<?php if ($block->getCollection()->getPageSize() == 200) : ?>
-                             selected="selected"<?php endif; ?>>200
-                         </option>
-                     </select>
-                     <label for="<?= $block->escapeHtml($block->getHtmlId()) ?><?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
--                        class="admin__control-support-text"><?= /* @escapeNotVerified */ __('per page') ?></label>
-+                        class="admin__control-support-text"><?= $block->escapeHtml(__('per page')) ?></label>
- 
-                     <div class="admin__data-grid-pager">
-                         <?php $_curPage = $block->getCollection()->getCurPage() ?>
-                         <?php $_lastPage = $block->getCollection()->getLastPageNumber() ?>
--                        <?php if ($_curPage > 1): ?>
-+                        <?php if ($_curPage > 1) : ?>
-                             <button class="action-previous"
-                                     type="button"
--                                    onclick="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setPage('<?= /* @escapeNotVerified */ ($_curPage - 1) ?>');return false;">
--                                <span><?= /* @escapeNotVerified */ __('Previous page') ?></span>
-+                                    onclick="<?= /* @noEscape */ $block->getJsObjectName() ?>.setPage('<?= /* @noEscape */ ($_curPage - 1) ?>');return false;">
-+                                <span><?= $block->escapeHtml(__('Previous page')) ?></span>
-                             </button>
--                        <?php else: ?>
--                            <button type="button" class="action-previous disabled"><span><?= /* @escapeNotVerified */ __('Previous page') ?></span></button>
-+                        <?php else : ?>
-+                            <button type="button" class="action-previous disabled"><span><?= $block->escapeHtml(__('Previous page')) ?></span></button>
-                         <?php endif; ?>
-                         <input type="text"
-                                id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current"
--                               name="<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>"
--                               value="<?= /* @escapeNotVerified */ $_curPage ?>"
-+                               name="<?= $block->escapeHtmlAttr($block->getVarNamePage()) ?>"
-+                               value="<?= $block->escapeHtmlAttr($_curPage) ?>"
-                                class="admin__control-text"
--                               onkeypress="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.inputPage(event, '<?= /* @escapeNotVerified */ $_lastPage ?>')" <?= /* @escapeNotVerified */ $block->getUiId('current-page') ?> />
-+                               onkeypress="<?= /* @noEscape */ $block->getJsObjectName() ?>.inputPage(event, '<?= /* @noEscape */ $_lastPage ?>')" <?= /* @noEscape */ $block->getUiId('current-page') ?> />
-                         <label class="admin__control-support-text" for="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current">
--                            <?= /* @escapeNotVerified */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
-+                            <?= /* @noEscape */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
-                         </label>
--                        <?php if ($_curPage < $_lastPage): ?>
-+                        <?php if ($_curPage < $_lastPage) : ?>
-                             <button type="button"
--                                    title="<?= /* @escapeNotVerified */ __('Next page') ?>"
-+                                    title="<?= $block->escapeHtmlAttr(__('Next page')) ?>"
-                                     class="action-next"
--                                    onclick="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setPage('<?= /* @escapeNotVerified */ ($_curPage + 1) ?>');return false;">
--                                <span><?= /* @escapeNotVerified */ __('Next page') ?></span>
-+                                    onclick="<?= /* @noEscape */ $block->getJsObjectName() ?>.setPage('<?= /* @noEscape */ ($_curPage + 1) ?>');return false;">
-+                                <span><?= $block->escapeHtml(__('Next page')) ?></span>
-                             </button>
--                        <?php else: ?>
--                        <button type="button" class="action-next disabled"><span><?= /* @escapeNotVerified */ __('Next page') ?></span></button>
-+                        <?php else : ?>
-+                        <button type="button" class="action-next disabled"><span><?= $block->escapeHtml(__('Next page')) ?></span></button>
-                         <?php endif; ?>
-                     </div>
-                 </div>
-@@ -140,25 +137,25 @@ $numColumns = sizeof($block->getColumns());
-             <col <?= $_column->getHtmlProperty() ?> />
-             <?php endforeach; */
-             ?>
--            <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()): ?>
-+            <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()) : ?>
-                 <thead>
--                <?php if ($block->getHeadersVisibility()): ?>
-+                <?php if ($block->getHeadersVisibility()) : ?>
-                     <tr>
--                        <?php foreach ($block->getColumns() as $_column): ?>
--                            <?php if ($_column->getHeaderHtml() == '&nbsp;'):?>
--                                <th class="data-grid-th" data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
-+                        <?php foreach ($block->getColumns() as $_column) : ?>
-+                            <?php if ($_column->getHeaderHtml() == '&nbsp;') : ?>
-+                                <th class="data-grid-th" data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>"
-                                     <?= $_column->getHeaderHtmlProperty() ?>>&nbsp;</th>
--                            <?php else: ?>
-+                            <?php else : ?>
-                                 <?= $_column->getHeaderHtml() ?>
-                             <?php endif; ?>
-                         <?php endforeach; ?>
-                     </tr>
-                 <?php endif; ?>
--                <?php if ($block->getFilterVisibility()): ?>
-+                <?php if ($block->getFilterVisibility()) : ?>
-                     <tr class="data-grid-filters" data-role="filter-form">
-                         <?php $i = 0;
--                        foreach ($block->getColumns() as $_column): ?>
--                            <td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>" <?= $_column->getHeaderHtmlProperty() ?>>
-+                        foreach ($block->getColumns() as $_column) : ?>
-+                            <td data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>" <?= $_column->getHeaderHtmlProperty() ?>>
-                                 <?= $_column->getFilterHtml() ?>
-                             </td>
-                         <?php endforeach; ?>
-@@ -166,12 +163,12 @@ $numColumns = sizeof($block->getColumns());
-                 <?php endif ?>
-                 </thead>
-             <?php endif; ?>
--            <?php if ($block->getCountTotals()): ?>
-+            <?php if ($block->getCountTotals()) : ?>
-                 <tfoot>
-                 <tr class="totals">
--                    <?php foreach ($block->getColumns() as $_column): ?>
--                        <th class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?>">
--                            <?= /* @escapeNotVerified */ ($_column->hasTotalsLabel()) ? $_column->getTotalsLabel() : $_column->getRowField($_column->getGrid()->getTotals()) ?>
-+                    <?php foreach ($block->getColumns() as $_column) : ?>
-+                        <th class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?>">
-+                            <?= /* @noEscape */ ($_column->hasTotalsLabel()) ? $block->escapeHtml($_column->getTotalsLabel()) : $_column->getRowField($_column->getGrid()->getTotals()) ?>
-                         </th>
-                     <?php endforeach; ?>
-                 </tr>
-@@ -179,116 +176,114 @@ $numColumns = sizeof($block->getColumns());
-             <?php endif; ?>
- 
-             <tbody>
--            <?php if (($block->getCollection()->getSize() > 0) && (!$block->getIsCollapsed())): ?>
--                <?php foreach ($block->getCollection() as $_index => $_item): ?>
--                    <tr title="<?= /* @escapeNotVerified */ $block->getRowUrl($_item) ?>"<?php if ($_class = $block->getRowClass($_item)): ?>
--                        class="<?= /* @escapeNotVerified */ $_class ?>"<?php endif; ?> ><?php
-+            <?php if (($block->getCollection()->getSize() > 0) && (!$block->getIsCollapsed())) : ?>
-+                <?php foreach ($block->getCollection() as $_index => $_item) : ?>
-+                    <tr title="<?= $block->escapeHtmlAttr($block->getRowUrl($_item)) ?>"<?php if ($_class = $block->getRowClass($_item)) : ?>
-+                        class="<?= $block->escapeHtmlAttr($_class) ?>"<?php endif; ?> ><?php
-                         $i = 0;
--                        foreach ($block->getColumns() as $_column):
--                            if ($block->shouldRenderCell($_item, $_column)):
-+                        foreach ($block->getColumns() as $_column) :
-+                            if ($block->shouldRenderCell($_item, $_column)) :
-                                 $_rowspan = $block->getRowspan($_item, $_column);
-                                 ?>
--                            <td <?= ($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
--                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?>
--                                        <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
--                                <?= (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
-+                            <td <?= /* @noEscape */ ($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
-+                                class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?>
-+                                        <?= /* @noEscape */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
-+                                <?= /* @noEscape */ (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
-                                 </td><?php
--                                if ($block->shouldRenderEmptyCell($_item, $_column)):
-+                                if ($block->shouldRenderEmptyCell($_item, $_column)) :
-                                     ?>
--                                    <td colspan="<?= /* @escapeNotVerified */ $block->getEmptyCellColspan($_item) ?>"
--                                        class="last"><?= /* @escapeNotVerified */ $block->getEmptyCellLabel() ?></td><?php
-+                                    <td colspan="<?= $block->escapeHtmlAttr($block->getEmptyCellColspan($_item)) ?>"
-+                                        class="last"><?= $block->escapeHtml($block->getEmptyCellLabel()) ?></td><?php
-                                 endif;
-                             endif;
-                         endforeach; ?>
-                     </tr>
--                    <?php if ($_multipleRows = $block->getMultipleRows($_item)): ?>
--                        <?php foreach ($_multipleRows as $_i): ?>
-+                    <?php if ($_multipleRows = $block->getMultipleRows($_item)) : ?>
-+                        <?php foreach ($_multipleRows as $_i) : ?>
-                             <tr>
-                                 <?php $i = 0;
--                                foreach ($block->getMultipleRowColumns($_i) as $_column): ?>
--                                    <td class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?>
--                                        <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
--                                        <?= (($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
-+                                foreach ($block->getMultipleRowColumns($_i) as $_column) : ?>
-+                                    <td class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?>
-+                                        <?= /* @noEscape */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
-+                                        <?= /* @noEscape */ (($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
-                                     </td>
-                                 <?php endforeach; ?>
-                             </tr>
-                         <?php endforeach; ?>
-                     <?php endif; ?>
- 
--                    <?php if ($block->shouldRenderSubTotal($_item)): ?>
-+                    <?php if ($block->shouldRenderSubTotal($_item)) : ?>
-                         <tr class="subtotals">
-                             <?php $i = 0;
--                            foreach ($block->getSubTotalColumns() as $_column): ?>
--                                <td class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?>
--                                           <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
--                                    <?php /* @escapeNotVerified */ echo($_column->hasSubtotalsLabel() ? $_column->getSubtotalsLabel() :
--                                        $_column->getRowField($block->getSubTotalItem($_item))
--                                    );
--                                    ?>
-+                            foreach ($block->getSubTotalColumns() as $_column) : ?>
-+                                <td class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?>
-+                                           <?= /* @noEscape */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
-+                                    <?= /* @noEscape */ $_column->hasSubtotalsLabel() ? $block->escapeHtml($_column->getSubtotalsLabel()) : $_column->getRowField($block->getSubTotalItem($_item)) ?>
-                                 </td>
-                             <?php endforeach; ?>
-                         </tr>
-                     <?php endif; ?>
-                 <?php endforeach; ?>
--            <?php elseif ($block->getEmptyText()): ?>
-+            <?php elseif ($block->getEmptyText()) : ?>
-                 <tr class="data-grid-tr-no-data">
--                    <td class="<?= /* @escapeNotVerified */ $block->getEmptyTextClass() ?>"
--                        colspan="<?= /* @escapeNotVerified */ $numColumns ?>"><?= /* @escapeNotVerified */ $block->getEmptyText() ?></td>
-+                    <td class="<?= $block->escapeHtmlAttr($block->getEmptyTextClass()) ?>"
-+                        colspan="<?= $block->escapeHtmlAttr($numColumns) ?>"><?= $block->escapeHtml($block->getEmptyText()) ?></td>
-                 </tr>
-             <?php endif; ?>
-             </tbody>
-         </table>
- 
-     </div>
--    <?php if ($block->canDisplayContainer()): ?>
-+    <?php if ($block->canDisplayContainer()) : ?>
- </div>
- <script>
-     var deps = [];
- 
--    <?php if ($block->getDependencyJsObject()): ?>
-+        <?php if ($block->getDependencyJsObject()) : ?>
-     deps.push('uiRegistry');
--    <?php endif; ?>
-+        <?php endif; ?>
- 
--    <?php if (strpos($block->getRowClickCallback(), 'order.') !== false): ?>
-+        <?php if (strpos($block->getRowClickCallback(), 'order.') !== false) : ?>
-     deps.push('Magento_Sales/order/create/form')
--    <?php endif; ?>
-+        <?php endif; ?>
- 
-     deps.push('mage/adminhtml/grid');
- 
--    <?php if (is_array($block->getRequireJsDependencies())): ?>
--        <?php foreach ($block->getRequireJsDependencies() as $dependency): ?>
--            deps.push('<?= /* @escapeNotVerified */ $dependency ?>');
--        <?php endforeach; ?>
--    <?php endif; ?>
-+        <?php if (is_array($block->getRequireJsDependencies())) : ?>
-+            <?php foreach ($block->getRequireJsDependencies() as $dependency) : ?>
-+            deps.push('<?= $block->escapeJs($dependency) ?>');
-+            <?php endforeach; ?>
-+        <?php endif; ?>
- 
-     require(deps, function(<?= ($block->getDependencyJsObject() ? 'registry' : '') ?>){
-         <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
- 
-         //<![CDATA[
--    <?php if ($block->getDependencyJsObject()): ?>
--        registry.get('<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>', function (<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>) {
--    <?php endif; ?>
--
--    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?> = new varienGrid(<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getId()) ?>, '<?= /* @escapeNotVerified */ $block->getGridUrl() ?>', '<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameSort() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameDir() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameFilter() ?>');
--    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.useAjax = '<?= /* @escapeNotVerified */ $block->getUseAjax() ?>';
--    <?php if ($block->getRowClickCallback()): ?>
--    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.rowClickCallback = <?= /* @escapeNotVerified */ $block->getRowClickCallback() ?>;
--    <?php endif; ?>
--    <?php if ($block->getCheckboxCheckCallback()): ?>
--    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.checkboxCheckCallback = <?= /* @escapeNotVerified */ $block->getCheckboxCheckCallback() ?>;
--    <?php endif; ?>
--    <?php if ($block->getRowInitCallback()): ?>
--    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.initRowCallback = <?= /* @escapeNotVerified */ $block->getRowInitCallback() ?>;
--    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.initGridRows();
--    <?php endif; ?>
--    <?php if ($block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable()): ?>
--    <?= /* @escapeNotVerified */ $block->getMassactionBlock()->getJavaScript() ?>
--    <?php endif ?>
--    <?= /* @escapeNotVerified */ $block->getAdditionalJavaScript() ?>
-+        <?php if ($block->getDependencyJsObject()) : ?>
-+        registry.get('<?= $block->escapeJs($block->getDependencyJsObject()) ?>', function (<?= $block->escapeJs($block->getDependencyJsObject()) ?>) {
-+        <?php endif; ?>
-+    <?php // phpcs:disable ?>
-+    <?= $block->escapeJs($block->getJsObjectName()) ?> = new varienGrid(<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getId()) ?>, '<?= $block->escapeJs($block->getGridUrl()) ?>', '<?= $block->escapeJs($block->getVarNamePage()) ?>', '<?= $block->escapeJs($block->getVarNameSort()) ?>', '<?= $block->escapeJs($block->getVarNameDir()) ?>', '<?= $block->escapeJs($block->getVarNameFilter()) ?>');
-+    <?php //phpcs:enable ?>
-+        <?= $block->escapeJs($block->getJsObjectName()) ?>.useAjax = '<?= $block->escapeJs($block->getUseAjax()) ?>';
-+        <?php if ($block->getRowClickCallback()) : ?>
-+            <?= $block->escapeJs($block->getJsObjectName()) ?>.rowClickCallback = <?= /* @noEscape */ $block->getRowClickCallback() ?>;
-+        <?php endif; ?>
-+        <?php if ($block->getCheckboxCheckCallback()) : ?>
-+            <?= $block->escapeJs($block->getJsObjectName()) ?>.checkboxCheckCallback = <?= /* @noEscape */ $block->getCheckboxCheckCallback() ?>;
-+        <?php endif; ?>
-+        <?php if ($block->getRowInitCallback()) : ?>
-+            <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
-+            <?= $block->escapeJs($block->getJsObjectName()) ?>.initGridRows();
-+        <?php endif; ?>
-+        <?php if ($block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable()) : ?>
-+            <?= /* @noEscape */ $block->getMassactionBlock()->getJavaScript() ?>
-+        <?php endif ?>
-+        <?= /* @noEscape */ $block->getAdditionalJavaScript() ?>
- 
--    <?php if ($block->getDependencyJsObject()): ?>
-+        <?php if ($block->getDependencyJsObject()) : ?>
-         });
--    <?php endif; ?>
-+        <?php endif; ?>
-     //]]>
- 
- });
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
-index ea995d9a80b..9a21cd4ef71 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
-@@ -3,14 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?= /* @escapeNotVerified */ $block->getSomething() ?>
-+<?= /* @noEscape */ $block->getSomething() ?>
- <div id="<?= $block->getHtmlId() ?>" class="admin__grid-massaction">
- 
--    <?php if ($block->getHideFormElement() !== true):?>
-+    <?php if ($block->getHideFormElement() !== true) : ?>
-     <form action="" id="<?= $block->getHtmlId() ?>-form" method="post">
-     <?php endif ?>
-         <div class="admin__grid-massaction-form">
-@@ -18,23 +15,23 @@
-             <select
-                 id="<?= $block->getHtmlId() ?>-select"
-                 class="required-entry local-validation admin__control-select"
--                <?= /* @escapeNotVerified */ $block->getUiId('select') ?>>
--                <option class="admin__control-select-placeholder" value="" selected><?= /* @escapeNotVerified */ __('Actions') ?></option>
--                <?php foreach ($block->getItems() as $_item):?>
--                    <option value="<?= /* @escapeNotVerified */ $_item->getId() ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= /* @escapeNotVerified */ $_item->getLabel() ?></option>
-+                <?= /* @noEscape */ $block->getUiId('select') ?>>
-+                <option class="admin__control-select-placeholder" value="" selected><?= $block->escapeHtml(__('Actions')) ?></option>
-+                <?php foreach ($block->getItems() as $_item) : ?>
-+                    <option value="<?= $block->escapeHtmlAttr($_item->getId()) ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= $block->escapeHtml($_item->getLabel()) ?></option>
-                 <?php endforeach; ?>
-             </select>
-             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-hiddens"></span>
-             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-additional"></span>
-             <?= $block->getApplyButtonHtml() ?>
-         </div>
--    <?php if ($block->getHideFormElement() !== true):?>
-+    <?php if ($block->getHideFormElement() !== true) :?>
-     </form>
-     <?php endif ?>
-     <div class="no-display">
--    <?php foreach ($block->getItems() as $_item): ?>
--        <div id="<?= $block->getHtmlId() ?>-item-<?= /* @escapeNotVerified */ $_item->getId() ?>-block">
--            <?php if ('' != $_item->getBlockName()):?>
-+    <?php foreach ($block->getItems() as $_item) : ?>
-+        <div id="<?= $block->getHtmlId() ?>-item-<?= /* @noEscape */ $_item->getId() ?>-block">
-+            <?php if ('' != $_item->getBlockName()) :?>
-                 <?= $block->getChildHtml($_item->getBlockName()) ?>
-             <?php endif;?>
-         </div>
-@@ -47,21 +44,21 @@
-             class="action-select-multiselect _disabled"
-             disabled="disabled"
-             data-menu="grid-mass-select">
--            <optgroup label="<?= /* @escapeNotVerified */ __('Mass Actions') ?>">
-+            <optgroup label="<?= $block->escapeHtmlAttr(__('Mass Actions')) ?>">
-                 <option disabled selected></option>
--                <?php if ($block->getUseSelectAll()):?>
-+                <?php if ($block->getUseSelectAll()) :?>
-                     <option value="selectAll">
--                        <?= /* @escapeNotVerified */ __('Select All') ?>
-+                        <?= $block->escapeHtml(__('Select All')) ?>
-                     </option>
-                     <option value="unselectAll">
--                        <?= /* @escapeNotVerified */ __('Unselect All') ?>
-+                        <?= $block->escapeHtml(__('Unselect All')) ?>
-                     </option>
-                 <?php endif; ?>
-                 <option value="selectVisible">
--                    <?= /* @escapeNotVerified */ __('Select Visible') ?>
-+                    <?= $block->escapeHtml(__('Select Visible')) ?>
-                 </option>
-                 <option value="unselectVisible">
--                    <?= /* @escapeNotVerified */ __('Unselect Visible') ?>
-+                    <?= $block->escapeHtml(__('Unselect Visible')) ?>
-                 </option>
-             </optgroup>
-         </select>
-@@ -78,25 +75,25 @@
-             var massAction = $('option:selected', this).val();
-             this.blur();
-             switch (massAction) {
--                <?php if ($block->getUseSelectAll()):?>
-+                <?php if ($block->getUseSelectAll()) : ?>
-                 case 'selectAll':
--                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectAll();
-+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectAll();
-                     break;
-                 case 'unselectAll':
--                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectAll();
-+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectAll();
-                     break;
-                 <?php endif; ?>
-                 case 'selectVisible':
--                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectVisible();
-+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectVisible();
-                     break;
-                 case 'unselectVisible':
--                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectVisible();
-+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectVisible();
-                     break;
-             }
-         });
-     });
--    <?php if (!$block->getParentBlock()->canDisplayContainer()): ?>
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setGridIds('<?= /* @escapeNotVerified */ $block->getGridIdsJson() ?>');
-+    <?php if (!$block->getParentBlock()->canDisplayContainer()) : ?>
-+        <?= $block->escapeJs($block->getJsObjectName()) ?>.setGridIds('<?= $block->escapeJs($block->getGridIdsJson()) ?>');
-     <?php endif; ?>
- </script>
- </div>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
-index f969fa61097..c0f30fc282f 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
-@@ -3,13 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div id="<?= $block->getHtmlId() ?>" class="admin__grid-massaction">
- 
--    <?php if ($block->getHideFormElement() !== true):?>
-+    <?php if ($block->getHideFormElement() !== true) : ?>
-     <form action="" id="<?= $block->getHtmlId() ?>-form" method="post">
-     <?php endif ?>
-         <div class="admin__grid-massaction-form">
-@@ -17,21 +14,21 @@
-             <select
-                 id="<?= $block->getHtmlId() ?>-select"
-                 class="required-entry local-validation admin__control-select">
--                <option class="admin__control-select-placeholder" value="" selected><?= /* @escapeNotVerified */ __('Actions') ?></option>
--                <?php foreach ($block->getItems() as $_item): ?>
--                    <option value="<?= /* @escapeNotVerified */ $_item->getId() ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= /* @escapeNotVerified */ $_item->getLabel() ?></option>
-+                <option class="admin__control-select-placeholder" value="" selected><?= $block->escapeHtml(__('Actions')) ?></option>
-+                <?php foreach ($block->getItems() as $_item) : ?>
-+                    <option value="<?= $block->escapeHtmlAttr($_item->getId()) ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= $block->escapeHtml($_item->getLabel()) ?></option>
-                 <?php endforeach; ?>
-             </select>
-             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-hiddens"></span>
-             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-additional"></span>
-             <?= $block->getApplyButtonHtml() ?>
-         </div>
--    <?php if ($block->getHideFormElement() !== true):?>
-+    <?php if ($block->getHideFormElement() !== true) : ?>
-     </form>
-     <?php endif ?>
-     <div class="no-display">
--        <?php foreach ($block->getItems() as $_item): ?>
--            <div id="<?= $block->getHtmlId() ?>-item-<?= /* @escapeNotVerified */ $_item->getId() ?>-block">
-+        <?php foreach ($block->getItems() as $_item) : ?>
-+            <div id="<?= $block->getHtmlId() ?>-item-<?= /* @noEscape */ $_item->getId() ?>-block">
-                 <?= $_item->getAdditionalActionBlockHtml() ?>
-             </div>
-         <?php endforeach; ?>
-@@ -41,21 +38,21 @@
-             id="<?= $block->getHtmlId() ?>-mass-select"
-             class="action-select-multiselect"
-             data-menu="grid-mass-select">
--            <optgroup label="<?= /* @escapeNotVerified */ __('Mass Actions') ?>">
-+            <optgroup label="<?= $block->escapeHtml(__('Mass Actions')) ?>">
-                 <option disabled selected></option>
--            <?php if ($block->getUseSelectAll()):?>
-+            <?php if ($block->getUseSelectAll()) : ?>
-                 <option value="selectAll">
--                    <?= /* @escapeNotVerified */ __('Select All') ?>
-+                    <?= $block->escapeHtml(__('Select All')) ?>
-                 </option>
-                 <option value="unselectAll">
--                    <?= /* @escapeNotVerified */ __('Unselect All') ?>
-+                    <?= $block->escapeHtml(__('Unselect All')) ?>
-                 </option>
-             <?php endif; ?>
-                 <option value="selectVisible">
--                    <?= /* @escapeNotVerified */ __('Select Visible') ?>
-+                    <?= $block->escapeHtml(__('Select Visible')) ?>
-                 </option>
-                 <option value="unselectVisible">
--                    <?= /* @escapeNotVerified */ __('Unselect Visible') ?>
-+                    <?= $block->escapeHtml(__('Unselect Visible')) ?>
-                 </option>
-             </optgroup>
-         </select>
-@@ -67,27 +64,27 @@
-         $('#<?= $block->getHtmlId() ?>-mass-select').change(function () {
-             var massAction = $('option:selected', this).val();
-             switch (massAction) {
--                <?php if ($block->getUseSelectAll()):?>
-+                <?php if ($block->getUseSelectAll()) : ?>
-                 case 'selectAll':
--                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectAll();
-+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectAll();
-                     break;
-                 case 'unselectAll':
--                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectAll();
-+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectAll();
-                     break;
-                 <?php endif; ?>
-                 case 'selectVisible':
--                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectVisible();
-+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectVisible();
-                     break;
-                 case 'unselectVisible':
--                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectVisible();
-+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectVisible();
-                     break;
-             }
-             this.blur();
-         });
-     });
- 
--    <?php if (!$block->getParentBlock()->canDisplayContainer()): ?>
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setGridIds('<?= /* @escapeNotVerified */ $block->getGridIdsJson() ?>');
-+    <?php if (!$block->getParentBlock()->canDisplayContainer()) : ?>
-+        <?= $block->escapeJs($block->getJsObjectName()) ?>.setGridIds('<?= /* @noEscape */ $block->getGridIdsJson() ?>');
-     <?php endif; ?>
- </script>
- </div>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
-index 70e2a879879..2208a009295 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
-@@ -3,18 +3,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-  * @var $block \Magento\Backend\Block\Widget\Grid\Serializer
-  */
- ?>
--<?php $_id = 'id_' . md5(microtime()) ?>
-+<?php
-+// phpcs:ignore
-+$_id = 'id_' . md5(microtime());
-+?>
- <?php $formId = $block->getFormId()?>
--<?php if (!empty($formId)) :?>
-+<?php if (!empty($formId)) : ?>
- <script>
-     require([
-         'prototype',
-@@ -23,11 +23,11 @@
-         Event.observe(window, "load", function(){
-             var serializeInput  = document.createElement('input');
-             serializeInput.type = 'hidden';
--            serializeInput.name = '<?= /* @escapeNotVerified */ $block->getInputElementName() ?>';
--            serializeInput.id   = '<?= /* @escapeNotVerified */ $_id ?>';
-+            serializeInput.name = '<?= $block->escapeJs($block->getInputElementName()) ?>';
-+            serializeInput.id   = '<?= /* @noEscape */ $_id ?>';
-             try {
--                document.getElementById('<?= /* @escapeNotVerified */ $formId ?>').appendChild(serializeInput);
--                new serializerController('<?= /* @escapeNotVerified */ $_id ?>', <?= /* @escapeNotVerified */ $block->getDataAsJSON() ?>, <?= /* @escapeNotVerified */ $block->getColumnInputNames(true) ?>, <?= /* @escapeNotVerified */ $block->getGridBlock()->getJsObjectName() ?>, '<?= /* @escapeNotVerified */ $block->getReloadParamName() ?>');
-+                document.getElementById('<?= $block->escapeJs($formId) ?>').appendChild(serializeInput);
-+                new serializerController('<?= /* @noEscape */ $_id ?>', <?= /* @noEscape */ $block->getDataAsJSON() ?>, <?= /* @noEscape */ $block->getColumnInputNames(true) ?>, <?= $block->escapeJs($block->getGridBlock()->getJsObjectName()) ?>, '<?= $block->escapeJs($block->getReloadParamName()) ?>');
-             } catch(e) {
-                 //Error add serializer
-             }
-@@ -35,12 +35,12 @@
-     });
- </script>
- <?php else :?>
--<input type="hidden" name="<?= /* @escapeNotVerified */ $block->getInputElementName() ?>"  value="" id="<?= /* @escapeNotVerified */ $_id ?>" />
-+<input type="hidden" name="<?= $block->escapeHtmlAttr($block->getInputElementName()) ?>"  value="" id="<?= /* @noEscape */ $_id ?>" />
- <script>
-     require([
-         'mage/adminhtml/grid'
-     ], function(){
--        new serializerController('<?= /* @escapeNotVerified */ $_id ?>', <?= /* @escapeNotVerified */ $block->getDataAsJSON() ?>, <?= /* @escapeNotVerified */ $block->getColumnInputNames(true) ?>, <?= /* @escapeNotVerified */ $block->getGridBlock()->getJsObjectName() ?>, '<?= /* @escapeNotVerified */ $block->getReloadParamName() ?>');
-+        new serializerController('<?= /* @noEscape */ $_id ?>', <?= /* @noEscape */ $block->getDataAsJSON() ?>, <?= /* @noEscape */ $block->getColumnInputNames(true) ?>, <?= $block->escapeJs($block->getGridBlock()->getJsObjectName()) ?>, '<?= $block->escapeJs($block->getReloadParamName()) ?>');
-     });
- </script>
- <?php endif;?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
-index 287028f9a11..5246aac088a 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
-@@ -4,46 +4,47 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Backend\Block\Widget\Tabs */
- ?>
--<?php if (!empty($tabs)): ?>
-+<?php if (!empty($tabs)) : ?>
- 
--<div class="admin__page-nav" data-role="container" id="<?= /* @escapeNotVerified */ $block->getId() ?>">
--    <?php if ($block->getTitle()): ?>
--        <div class="admin__page-nav-title" data-role="title" <?= /* @escapeNotVerified */ $block->getUiId('title') ?>>
--            <strong><?= /* @escapeNotVerified */ $block->getTitle() ?></strong>
-+<div class="admin__page-nav" data-role="container" id="<?=  $block->escapeHtmlAttr($block->getId()) ?>">
-+    <?php if ($block->getTitle()) : ?>
-+        <div class="admin__page-nav-title" data-role="title" <?= /* @noEscape */ $block->getUiId('title') ?>>
-+            <strong><?= $block->escapeHtml($block->getTitle()) ?></strong>
-             <span data-role="title-messages" class="admin__page-nav-title-messages"></span>
-         </div>
-     <?php endif ?>
--    <ul <?= /* @escapeNotVerified */ $block->getUiId('tab', $block->getId()) ?> class="<?= /* @escapeNotVerified */ $block->getIsHoriz() ? 'tabs-horiz' : 'tabs admin__page-nav-items' ?>">
--        <?php foreach ($tabs as $_tab): ?>
--
--            <?php if (!$block->canShowTab($_tab)): continue;  endif; ?>
-+    <ul <?= /* @noEscape */ $block->getUiId('tab', $block->getId()) ?> class="<?= /* @noEscape */ $block->getIsHoriz() ? 'tabs-horiz' : 'tabs admin__page-nav-items' ?>">
-+        <?php foreach ($tabs as $_tab) : ?>
-+            <?php
-+            if (!$block->canShowTab($_tab)) :
-+                continue;
-+            endif;
-+            ?>
-             <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
-             <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
-             <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
- 
--            <li class="admin__page-nav-item" <?php if ($block->getTabIsHidden($_tab)): ?> style="display:none"<?php endif; ?><?= /* @escapeNotVerified */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
--                <a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>" name="<?= /* @escapeNotVerified */ $block->getTabId($_tab, false) ?>" title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>"
--                   class="admin__page-nav-link <?= /* @escapeNotVerified */ $_tabClass ?>"
--                   data-tab-type="<?= /* @escapeNotVerified */ $_tabType ?>"
--                   <?= /* @escapeNotVerified */ $block->getUiId('tab', 'link', $_tab->getId()) ?>>
-+            <li class="admin__page-nav-item" <?php if ($block->getTabIsHidden($_tab)) : ?> style="display:none"<?php endif; ?><?= /* @noEscape */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
-+                <a href="<?=  $block->escapeUrl($_tabHref) ?>" id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>" name="<?=  $block->escapeHtmlAttr($block->getTabId($_tab, false)) ?>" title="<?=  $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>"
-+                   class="admin__page-nav-link <?= $block->escapeHtmlAttr($_tabClass) ?>"
-+                   data-tab-type="<?=  $block->escapeHtmlAttr($_tabType) ?>"
-+                   <?= /* @noEscape */ $block->getUiId('tab', 'link', $_tab->getId()) ?>>
- 
--                   <span><?= /* @escapeNotVerified */ $block->getTabLabel($_tab) ?></span>
-+                   <span><?= $block->escapeHtml($block->getTabLabel($_tab)) ?></span>
- 
-                    <span class="admin__page-nav-item-messages" data-role="item-messages">
-                        <span class="admin__page-nav-item-message _changed">
-                            <span class="admin__page-nav-item-message-icon"></span>
-                            <span class="admin__page-nav-item-message-tooltip">
--                               <?= /* @escapeNotVerified */ __('Changes have been made to this section that have not been saved.') ?>
-+                               <?= $block->escapeHtml(__('Changes have been made to this section that have not been saved.')) ?>
-                            </span>
-                        </span>
-                        <span class="admin__page-nav-item-message _error">
-                            <span class="admin__page-nav-item-message-icon"></span>
-                            <span class="admin__page-nav-item-message-tooltip">
--                               <?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>
-+                               <?= $block->escapeHtml(__('This tab contains invalid data. Please resolve this before saving.')) ?>
-                            </span>
-                        </span>
-                         <span class="admin__page-nav-item-message-loader">
-@@ -54,7 +55,7 @@
-                        </span>
-                    </span>
-                 </a>
--                <div id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>_content" style="display:none;"<?= /* @escapeNotVerified */ $block->getUiId('tab', 'content', $_tab->getId()) ?>><?= /* @escapeNotVerified */ $block->getTabContent($_tab) ?></div>
-+                <div id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>_content" style="display:none;"<?= /* @noEscape */ $block->getUiId('tab', 'content', $_tab->getId()) ?>><?= /* @noEscape */ $block->getTabContent($_tab) ?></div>
-             </li>
-         <?php endforeach; ?>
-     </ul>
-@@ -63,11 +64,11 @@
- <script>
- require(['jquery',"mage/backend/tabs"], function($){
-     $(function() {
--        $('#<?= /* @escapeNotVerified */ $block->getId() ?>').tabs({
--            active: '<?= /* @escapeNotVerified */ $block->getActiveTabId() ?>',
--            destination: '#<?= /* @escapeNotVerified */ $block->getDestElementId() ?>',
--            shadowTabs: <?= /* @escapeNotVerified */ $block->getAllShadowTabs() ?>,
--            tabsBlockPrefix: '<?= /* @escapeNotVerified */ $block->getId() ?>_',
-+        $('#<?= /* @noEscape */ $block->getId() ?>').tabs({
-+            active: '<?= /* @noEscape */ $block->getActiveTabId() ?>',
-+            destination: '#<?= /* @noEscape */ $block->getDestElementId() ?>',
-+            shadowTabs: <?= /* @noEscape */ $block->getAllShadowTabs() ?>,
-+            tabsBlockPrefix: '<?= /* @noEscape */ $block->getId() ?>_',
-             tabIdArgument: 'active_tab'
-         });
-     });
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
-index 062528e7422..747dc577d23 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
-@@ -3,41 +3,38 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<!-- <?php if ($block->getTitle()): ?>
--    <h3><?= /* @escapeNotVerified */ $block->getTitle() ?></h3>
-+<!-- <?php if ($block->getTitle()) : ?>
-+    <h3><?= $block->escapeHtml($block->getTitle()) ?></h3>
- <?php endif ?> -->
--<?php if (!empty($tabs)): ?>
--<div id="<?= /* @escapeNotVerified */ $block->getId() ?>">
-+<?php if (!empty($tabs)) : ?>
-+<div id="<?=  $block->escapeHtmlAttr($block->getId()) ?>">
- <ul  class="tabs-horiz">
--<?php foreach ($tabs as $_tab): ?>
--    <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
--    <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
--    <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
-+    <?php foreach ($tabs as $_tab) : ?>
-+        <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
-+        <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
-+        <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
-     <li>
--        <a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>" title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>" class="<?php $_tabClass ?>" data-tab-type="<?php $_tabType ?>">
-+        <a href="<?= $block->escapeHtmlAttr($_tabHref) ?>" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>" title="<?= $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>" class="<?= $block->escapeHtmlAttr($_tabClass) ?>" data-tab-type="<?= $block->escapeHtmlAttr($_tabType) ?>">
-             <span>
--                <span class="changed" title="<?= /* @escapeNotVerified */ __('The information in this tab has been changed.') ?>"></span>
--                <span class="error" title="<?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>"></span>
--                <span class="loader" title="<?= /* @escapeNotVerified */ __('Loading...') ?>"></span>
--                <?= /* @escapeNotVerified */ $block->getTabLabel($_tab) ?>
-+                <span class="changed" title="<?= $block->escapeHtmlAttr(__('The information in this tab has been changed.')) ?>"></span>
-+                <span class="error" title="<?= $block->escapeHtmlAttr(__('This tab contains invalid data. Please resolve this before saving.')) ?>"></span>
-+                <span class="loader" title="<?= $block->escapeHtmlAttr(__('Loading...')) ?>"></span>
-+                <?= $block->escapeHtml($block->getTabLabel($_tab)) ?>
-             </span>
-         </a>
--        <div id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>_content" style="display:none"><?= /* @escapeNotVerified */ $block->getTabContent($_tab) ?></div>
-+        <div id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>_content" style="display:none"><?= /* @noEscape */ $block->getTabContent($_tab) ?></div>
-     </li>
--<?php endforeach; ?>
-+    <?php endforeach; ?>
- </ul>
- </div>
- <script>
- require(["jquery","mage/backend/tabs"], function($){
-     $(function() {
--        $('#<?= /* @escapeNotVerified */ $block->getId() ?>').tabs({
--            active: '<?= /* @escapeNotVerified */ $block->getActiveTabId() ?>',
--            destination: '#<?= /* @escapeNotVerified */ $block->getDestElementId() ?>',
--            shadowTabs: <?= /* @escapeNotVerified */ $block->getAllShadowTabs() ?>
-+        $('#<?= /* @noEscape */ $block->getId() ?>').tabs({
-+            active: '<?= /* @noEscape */ $block->getActiveTabId() ?>',
-+            destination: '#<?= /* @noEscape */ $block->getDestElementId() ?>',
-+            shadowTabs: <?= /* @noEscape */ $block->getAllShadowTabs() ?>
-         });
-     });
- });
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabsleft.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabsleft.phtml
-index 6af34ca502f..4f69191e797 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabsleft.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabsleft.phtml
-@@ -3,21 +3,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<dl id="dl-<?= /* @escapeNotVerified */ $id ?>" class="accordion">
--<?php foreach ($sections as $sectionId => $section): ?>
--    <dt id="dt-<?= /* @escapeNotVerified */ $id ?>-<?= /* @escapeNotVerified */ $sectionId ?>">
--        <strong><?= /* @escapeNotVerified */ $section['title'] ?></strong>
-+<dl id="dl-<?= /* @noEscape */ $id ?>" class="accordion">
-+<?php foreach ($sections as $sectionId => $section) : ?>
-+    <dt id="dt-<?= /* @noEscape */ $id ?>-<?= /* @noEscape */ $sectionId ?>">
-+        <strong><?= $block->escapeHtml($section['title']) ?></strong>
-     </dt>
--    <dd id="dd-<?= /* @escapeNotVerified */ $id ?>-<?= /* @escapeNotVerified */ $section['id'] ?>" class="section-menu <?= !empty($section['active']) ? 'open' : '' ?>">
-+    <dd id="dd-<?= /* @noEscape */ $id ?>-<?= /* @noEscape */ $section['id'] ?>" class="section-menu <?= !empty($section['active']) ? 'open' : '' ?>">
-         <ul>
--        <?php foreach ($section['children'] as $menuId => $menuItem): ?>
--            <li id="li-<?= /* @escapeNotVerified */ $id ?>-<?= /* @escapeNotVerified */ $sectionId ?>-<?= /* @escapeNotVerified */ $menuId ?>">
--                <a href="#" title="<?= /* @escapeNotVerified */ $menuItem['title'] ?>">
--                    <span><?= /* @escapeNotVerified */ $menuItem['label'] ?></span>
-+        <?php foreach ($section['children'] as $menuId => $menuItem) : ?>
-+            <li id="li-<?= /* @noEscape */ $id ?>-<?= /* @noEscape */ $sectionId ?>-<?= /* @noEscape */ $menuId ?>">
-+                <a href="#" title="<?= $block->escapeHtmlAttr($menuItem['title']) ?>">
-+                    <span><?= $block->escapeHtml($menuItem['label']) ?></span>
-                 </a>
-             </li>
-         <?php endforeach ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/view/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/view/container.phtml
-index f29e8fd8624..a0d56911ae2 100644
---- a/app/code/Magento/Backend/view/adminhtml/templates/widget/view/container.phtml
-+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/view/container.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getButtonsHtml() ?></div>
- <?= $block->getViewHtml() ?>
-diff --git a/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml b/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml
-index 93309c9a22e..b0abec3aa9b 100644
---- a/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml
-+++ b/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml
-@@ -6,6 +6,7 @@
-  */
- -->
- <listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
-+    <listingToolbar name="listing_top" />
-     <columns name="design_config_columns">
-         <column name="theme_theme_id" component="Magento_Ui/js/grid/columns/select" sortOrder="40">
-             <settings>
-diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js b/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
-index f9f43cebc59..119e7a35747 100644
---- a/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
-+++ b/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
-@@ -33,9 +33,20 @@ define([
-          * @private
-          */
-         _create: function () {
--            var
--                self = this,
--                progressTmpl = mageTemplate('[data-template="uploader"]');
-+            var self = this,
-+                progressTmpl = mageTemplate('[data-template="uploader"]'),
-+                isResizeEnabled = this.options.isResizeEnabled,
-+                resizeConfiguration = {
-+                    action: 'resize',
-+                    maxWidth: this.options.maxWidth,
-+                    maxHeight: this.options.maxHeight
-+                };
-+
-+            if (!isResizeEnabled) {
-+                resizeConfiguration = {
-+                    action: 'resize'
-+                };
-+            }
- 
-             this.element.find('input[type=file]').fileupload({
-                 dataType: 'json',
-@@ -52,8 +63,7 @@ define([
-                  * @param {Object} data
-                  */
-                 add: function (e, data) {
--                    var
--                        fileSize,
-+                    var fileSize,
-                         tmpl;
- 
-                     $.each(data.files, function (index, file) {
-@@ -124,11 +134,9 @@ define([
-                 process: [{
-                     action: 'load',
-                     fileTypes: /^image\/(gif|jpeg|png)$/
--                }, {
--                    action: 'resize',
--                    maxWidth: this.options.maxWidth,
--                    maxHeight: this.options.maxHeight
--                }, {
-+                },
-+                resizeConfiguration,
-+                {
-                     action: 'save'
-                 }]
-             });
-diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js b/app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js
-index 0a692a9b868..c2a0d4dab1f 100644
---- a/app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js
-+++ b/app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js
-@@ -67,6 +67,7 @@ define([
-                              * 'Confirm' action handler.
-                              */
-                             confirm: function () {
-+                                $('body').trigger('processStart');
-                                 dataPost().postData(requestData);
-                             }
-                         }
-diff --git a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
-index fe30ca7e83f..0033f4c071e 100644
---- a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
-+++ b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
-@@ -69,7 +69,7 @@
- 
-                         <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
-                         <td if="elem.template"
--                            visible="elem.visible"
-+                            visible="elem.visible() && elem.formElement !== 'hidden'"
-                             disable="elem.disabled"
-                             css="$parent.setClasses(elem)"
-                             template="elem.template"
-diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
-index dcafbc7370d..b62963947d7 100644
---- a/app/code/Magento/Backup/Controller/Adminhtml/Index.php
-+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
-@@ -5,21 +5,26 @@
-  */
- namespace Magento\Backup\Controller\Adminhtml;
- 
-+use Magento\Backend\App\Action;
-+use Magento\Backup\Helper\Data as Helper;
-+use Magento\Framework\App\ObjectManager;
-+
- /**
-  * Backup admin controller
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  * @api
-  * @since 100.0.2
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-  */
--abstract class Index extends \Magento\Backend\App\Action
-+abstract class Index extends Action
- {
-     /**
-      * Authorization level of a basic admin session
-      *
-      * @see _isAllowed()
-      */
--    const ADMIN_RESOURCE = 'Magento_Backend::backup';
-+    const ADMIN_RESOURCE = 'Magento_Backup::backup';
- 
-     /**
-      * Core registry
-@@ -48,6 +53,11 @@ abstract class Index extends \Magento\Backend\App\Action
-      */
-     protected $maintenanceMode;
- 
-+    /**
-+     * @var Helper
-+     */
-+    private $helper;
-+
-     /**
-      * @param \Magento\Backend\App\Action\Context $context
-      * @param \Magento\Framework\Registry $coreRegistry
-@@ -55,6 +65,7 @@ abstract class Index extends \Magento\Backend\App\Action
-      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-      * @param \Magento\Backup\Model\BackupFactory $backupModelFactory
-      * @param \Magento\Framework\App\MaintenanceMode $maintenanceMode
-+     * @param Helper|null $helper
-      */
-     public function __construct(
-         \Magento\Backend\App\Action\Context $context,
-@@ -62,13 +73,27 @@ abstract class Index extends \Magento\Backend\App\Action
-         \Magento\Framework\Backup\Factory $backupFactory,
-         \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
-         \Magento\Backup\Model\BackupFactory $backupModelFactory,
--        \Magento\Framework\App\MaintenanceMode $maintenanceMode
-+        \Magento\Framework\App\MaintenanceMode $maintenanceMode,
-+        ?Helper $helper = null
-     ) {
-         $this->_coreRegistry = $coreRegistry;
-         $this->_backupFactory = $backupFactory;
-         $this->_fileFactory = $fileFactory;
-         $this->_backupModelFactory = $backupModelFactory;
-         $this->maintenanceMode = $maintenanceMode;
-+        $this->helper = $helper ?? ObjectManager::getInstance()->get(Helper::class);
-         parent::__construct($context);
-     }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function dispatch(\Magento\Framework\App\RequestInterface $request)
-+    {
-+        if (!$this->helper->isEnabled()) {
-+            return $this->_redirect('*/*/disabled');
-+        }
-+
-+        return parent::dispatch($request);
-+    }
- }
-diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
-index 27770182a6d..ee5a56e8148 100644
---- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
-+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
-@@ -1,15 +1,18 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Backup\Controller\Adminhtml\Index;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\Filesystem;
- 
--class Create extends \Magento\Backup\Controller\Adminhtml\Index
-+/**
-+ * Create backup controller
-+ */
-+class Create extends \Magento\Backup\Controller\Adminhtml\Index implements HttpPostActionInterface
- {
-     /**
-      * Create backup action.
-@@ -55,7 +58,9 @@ class Create extends \Magento\Backup\Controller\Adminhtml\Index
-             $this->_coreRegistry->register('backup_manager', $backupManager);
- 
-             if ($this->getRequest()->getParam('maintenance_mode')) {
--                if (!$this->maintenanceMode->set(true)) {
-+                $this->maintenanceMode->set(true);
-+
-+                if (!$this->maintenanceMode->isOn()) {
-                     $response->setError(
-                         __(
-                             'You need more permissions to activate maintenance mode right now.'
-@@ -82,7 +87,7 @@ class Create extends \Magento\Backup\Controller\Adminhtml\Index
- 
-             $backupManager->create();
- 
--            $this->messageManager->addSuccess($successMessage);
-+            $this->messageManager->addSuccessMessage($successMessage);
- 
-             $response->setRedirectUrl($this->getUrl('*/*/index'));
-         } catch (\Magento\Framework\Backup\Exception\NotEnoughFreeSpace $e) {
-diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Disabled.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Disabled.php
-new file mode 100644
-index 00000000000..f6fe430ae08
---- /dev/null
-+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Disabled.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Backup\Controller\Adminhtml\Index;
-+
-+use Magento\Backend\App\Action;
-+use Magento\Backend\App\Action\Context;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\View\Result\PageFactory;
-+
-+/**
-+ * Inform that backup is disabled.
-+ */
-+class Disabled extends Action implements HttpGetActionInterface
-+{
-+    /**
-+     * @see _isAllowed()
-+     */
-+    const ADMIN_RESOURCE = 'Magento_Backend::backup';
-+
-+    /**
-+     * @var PageFactory
-+     */
-+    private $pageFactory;
-+
-+    /**
-+     * @param Context $context
-+     * @param PageFactory $pageFactory
-+     */
-+    public function __construct(Context $context, PageFactory $pageFactory)
-+    {
-+        parent::__construct($context);
-+        $this->pageFactory = $pageFactory;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function execute()
-+    {
-+        return $this->pageFactory->create();
-+    }
-+}
-diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php
-index 3bbda65cb4c..271e3713034 100644
---- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php
-+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Backup\Controller\Adminhtml\Index;
- 
--class Index extends \Magento\Backup\Controller\Adminhtml\Index
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Backup\Controller\Adminhtml\Index implements HttpGetActionInterface
- {
-     /**
-      * Backup list action
-diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php
-index 04292d27590..90657fc2490 100644
---- a/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php
-+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php
-@@ -49,13 +49,13 @@ class MassDelete extends \Magento\Backup\Controller\Adminhtml\Index
- 
-             $resultData->setIsSuccess(true);
-             if ($allBackupsDeleted) {
--                $this->messageManager->addSuccess(__('You deleted the selected backup(s).'));
-+                $this->messageManager->addSuccessMessage(__('You deleted the selected backup(s).'));
-             } else {
-                 throw new \Exception($deleteFailMessage);
-             }
-         } catch (\Exception $e) {
-             $resultData->setIsSuccess(false);
--            $this->messageManager->addError($deleteFailMessage);
-+            $this->messageManager->addErrorMessage($deleteFailMessage);
-         }
- 
-         return $this->_redirect('backup/*/index');
-diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
-index 0451f6ed09b..7f450e7e313 100644
---- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
-+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
-@@ -6,13 +6,16 @@
-  */
- namespace Magento\Backup\Controller\Adminhtml\Index;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\Filesystem;
- 
- /**
-+ * Backup rollback controller.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Rollback extends \Magento\Backup\Controller\Adminhtml\Index
-+class Rollback extends \Magento\Backup\Controller\Adminhtml\Index implements HttpPostActionInterface
- {
-     /**
-      * Rollback Action
-@@ -82,7 +85,9 @@ class Rollback extends \Magento\Backup\Controller\Adminhtml\Index
-             }
- 
-             if ($this->getRequest()->getParam('maintenance_mode')) {
--                if (!$this->maintenanceMode->set(true)) {
-+                $this->maintenanceMode->set(true);
-+
-+                if (!$this->maintenanceMode->isOn()) {
-                     $response->setError(
-                         __(
-                             'You need more permissions to activate maintenance mode right now.'
-@@ -122,6 +127,7 @@ class Rollback extends \Magento\Backup\Controller\Adminhtml\Index
-             $adminSession->destroy();
- 
-             $response->setRedirectUrl($this->getUrl('*'));
-+            // phpcs:disable Magento2.Exceptions.ThrowCatch
-         } catch (\Magento\Framework\Backup\Exception\CantLoadSnapshot $e) {
-             $errorMsg = __('We can\'t find the backup file.');
-         } catch (\Magento\Framework\Backup\Exception\FtpConnectionFailed $e) {
-diff --git a/app/code/Magento/Backup/Cron/SystemBackup.php b/app/code/Magento/Backup/Cron/SystemBackup.php
-index 750262ab1c1..9502377a39d 100644
---- a/app/code/Magento/Backup/Cron/SystemBackup.php
-+++ b/app/code/Magento/Backup/Cron/SystemBackup.php
-@@ -8,6 +8,9 @@ namespace Magento\Backup\Cron;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Store\Model\ScopeInterface;
- 
-+/**
-+ * Performs scheduled backup.
-+ */
- class SystemBackup
- {
-     const XML_PATH_BACKUP_ENABLED = 'system/backup/enabled';
-@@ -101,6 +104,10 @@ class SystemBackup
-      */
-     public function execute()
-     {
-+        if (!$this->_backupData->isEnabled()) {
-+            return $this;
-+        }
-+
-         if (!$this->_scopeConfig->isSetFlag(self::XML_PATH_BACKUP_ENABLED, ScopeInterface::SCOPE_STORE)) {
-             return $this;
-         }
-diff --git a/app/code/Magento/Backup/Helper/Data.php b/app/code/Magento/Backup/Helper/Data.php
-index 3d60bf9d9c9..c6df6a73668 100644
---- a/app/code/Magento/Backup/Helper/Data.php
-+++ b/app/code/Magento/Backup/Helper/Data.php
-@@ -3,6 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Backup\Helper;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
-@@ -110,7 +113,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     public function getExtensionByType($type)
-     {
-         $extensions = $this->getExtensions();
--        return isset($extensions[$type]) ? $extensions[$type] : '';
-+        return $extensions[$type] ?? '';
-     }
- 
-     /**
-@@ -285,4 +288,14 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
- 
-         return $result;
-     }
-+
-+    /**
-+     * Is backup functionality enabled.
-+     *
-+     * @return bool
-+     */
-+    public function isEnabled(): bool
-+    {
-+        return $this->scopeConfig->isSetFlag('system/backup/functionality_enabled');
-+    }
- }
-diff --git a/app/code/Magento/Backup/Model/Backup.php b/app/code/Magento/Backup/Model/Backup.php
-index 3768f2bf8c8..c3507ecf5b4 100644
---- a/app/code/Magento/Backup/Model/Backup.php
-+++ b/app/code/Magento/Backup/Model/Backup.php
-@@ -14,6 +14,7 @@ use Magento\Framework\Filesystem\DriverPool;
-  * @method string getPath()
-  * @method string getName()
-  * @method string getTime()
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @api
-  * @since 100.0.2
-@@ -80,6 +81,7 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
-      * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
-      * @param \Magento\Framework\Filesystem $filesystem
-      * @param array $data
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      */
-     public function __construct(
-         \Magento\Backup\Helper\Data $helper,
-@@ -242,7 +244,7 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
-     /**
-      * Return content of backup file
-      *
--     * @return string
-+     * @return array
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function &getFile()
-@@ -275,8 +277,9 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
-      *
-      * @param bool $write
-      * @return $this
--     * @throws \Magento\Framework\Exception\InputException
-      * @throws \Magento\Framework\Backup\Exception\NotEnoughPermissions
-+     * @throws \Magento\Framework\Exception\FileSystemException
-+     * @throws \Magento\Framework\Exception\InputException
-      */
-     public function open($write = false)
-     {
-@@ -330,6 +333,7 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
-      *
-      * @param int $length
-      * @return string
-+     * @throws \Magento\Framework\Exception\InputException
-      */
-     public function read($length)
-     {
-@@ -340,6 +344,7 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
-      * Check end of file.
-      *
-      * @return bool
-+     * @throws \Magento\Framework\Exception\InputException
-      */
-     public function eof()
-     {
-@@ -370,6 +375,7 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
-      * Close open backup file
-      *
-      * @return $this
-+     * @throws \Magento\Framework\Exception\InputException
-      */
-     public function close()
-     {
-@@ -383,6 +389,8 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
-      * Print output
-      *
-      * @return string
-+     * @return \Magento\Framework\Filesystem\Directory\ReadInterface|string|void
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      */
-     public function output()
-     {
-@@ -398,6 +406,8 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
-     }
- 
-     /**
-+     * Get Size
-+     *
-      * @return int|mixed
-      */
-     public function getSize()
-@@ -419,6 +429,7 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
-      *
-      * @param string $password
-      * @return bool
-+     * @throws \Exception
-      */
-     public function validateUserPassword($password)
-     {
-diff --git a/app/code/Magento/Backup/Model/BackupFactory.php b/app/code/Magento/Backup/Model/BackupFactory.php
-index 28b0a7baf43..f88b410a237 100644
---- a/app/code/Magento/Backup/Model/BackupFactory.php
-+++ b/app/code/Magento/Backup/Model/BackupFactory.php
-@@ -39,8 +39,8 @@ class BackupFactory
-      */
-     public function create($timestamp, $type)
-     {
--        $fsCollection = $this->_objectManager->get(\Magento\Backup\Model\Fs\Collection::class);
--        $backupInstance = $this->_objectManager->get(\Magento\Backup\Model\Backup::class);
-+        $fsCollection = $this->_objectManager->create(\Magento\Backup\Model\Fs\Collection::class);
-+        $backupInstance = $this->_objectManager->create(\Magento\Backup\Model\Backup::class);
- 
-         foreach ($fsCollection as $backup) {
-             if ($backup->getTime() === (int) $timestamp && $backup->getType() === $type) {
-diff --git a/app/code/Magento/Backup/Model/Config/Backend/Cron.php b/app/code/Magento/Backup/Model/Config/Backend/Cron.php
-index 4855ef11295..2f0e4069f04 100644
---- a/app/code/Magento/Backup/Model/Config/Backend/Cron.php
-+++ b/app/code/Magento/Backup/Model/Config/Backend/Cron.php
-@@ -76,8 +76,8 @@ class Cron extends \Magento\Framework\App\Config\Value
- 
-         if ($enabled) {
-             $cronExprArray = [
--                intval($time[1]),                                 # Minute
--                intval($time[0]),                                 # Hour
-+                (int) $time[1],                                 # Minute
-+                (int) $time[0],                                 # Hour
-                 $frequency == $frequencyMonthly ? '1' : '*',      # Day of the Month
-                 '*',                                              # Month of the Year
-                 $frequency == $frequencyWeekly ? '1' : '*',        # Day of the Week
-diff --git a/app/code/Magento/Backup/Model/Db.php b/app/code/Magento/Backup/Model/Db.php
-index 8fbd5da1c98..084b35448a8 100644
---- a/app/code/Magento/Backup/Model/Db.php
-+++ b/app/code/Magento/Backup/Model/Db.php
-@@ -5,11 +5,18 @@
-  */
- namespace Magento\Backup\Model;
- 
-+use Magento\Backup\Helper\Data as Helper;
-+use Magento\Backup\Model\ResourceModel\Table\GetListTables;
-+use Magento\Backup\Model\ResourceModel\View\CreateViewsBackup;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Exception\RuntimeException;
-+
- /**
-  * Database backup model
-  *
-  * @api
-  * @since 100.0.2
-+ * @deprecated Backup module is to be removed.
-  */
- class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
- {
-@@ -34,15 +41,40 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
-     protected $_resource = null;
- 
-     /**
--     * @param \Magento\Backup\Model\ResourceModel\Db $resourceDb
-+     * @var Helper
-+     */
-+    private $helper;
-+
-+    /**
-+     * @var GetListTables
-+     */
-+    private $getListTables;
-+
-+    /**
-+     * @var CreateViewsBackup
-+     */
-+    private $getViewsBackup;
-+
-+    /**
-+     * Db constructor.
-+     * @param ResourceModel\Db $resourceDb
-      * @param \Magento\Framework\App\ResourceConnection $resource
-+     * @param Helper|null $helper
-+     * @param GetListTables|null $getListTables
-+     * @param CreateViewsBackup|null $getViewsBackup
-      */
-     public function __construct(
--        \Magento\Backup\Model\ResourceModel\Db $resourceDb,
--        \Magento\Framework\App\ResourceConnection $resource
-+        ResourceModel\Db $resourceDb,
-+        \Magento\Framework\App\ResourceConnection $resource,
-+        ?Helper $helper = null,
-+        ?GetListTables $getListTables = null,
-+        ?CreateViewsBackup $getViewsBackup = null
-     ) {
-         $this->_resourceDb = $resourceDb;
-         $this->_resource = $resource;
-+        $this->helper = $helper ?? ObjectManager::getInstance()->get(Helper::class);
-+        $this->getListTables = $getListTables ?? ObjectManager::getInstance()->get(GetListTables::class);
-+        $this->getViewsBackup = $getViewsBackup ?? ObjectManager::getInstance()->get(CreateViewsBackup::class);
-     }
- 
-     /**
-@@ -63,6 +95,8 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
-     }
- 
-     /**
-+     * Tables list.
-+     *
-      * @return array
-      */
-     public function getTables()
-@@ -71,6 +105,8 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
-     }
- 
-     /**
-+     * Command to recreate given table.
-+     *
-      * @param string $tableName
-      * @param bool $addDropIfExists
-      * @return string
-@@ -81,6 +117,8 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
-     }
- 
-     /**
-+     * Generate table's data dump.
-+     *
-      * @param string $tableName
-      * @return string
-      */
-@@ -90,6 +128,8 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
-     }
- 
-     /**
-+     * Header for dumps.
-+     *
-      * @return string
-      */
-     public function getHeader()
-@@ -98,6 +138,8 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
-     }
- 
-     /**
-+     * Footer for dumps.
-+     *
-      * @return string
-      */
-     public function getFooter()
-@@ -106,6 +148,8 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
-     }
- 
-     /**
-+     * Get backup SQL.
-+     *
-      * @return string
-      */
-     public function renderSql()
-@@ -124,18 +168,19 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
-     }
- 
-     /**
--     * Create backup and stream write to adapter
--     *
--     * @param \Magento\Framework\Backup\Db\BackupInterface $backup
--     * @return $this
-+     * @inheritDoc
-      */
-     public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backup)
-     {
-+        if (!$this->helper->isEnabled()) {
-+            throw new RuntimeException(__('Backup functionality is disabled'));
-+        }
-+
-         $backup->open(true);
- 
-         $this->getResource()->beginTransaction();
- 
--        $tables = $this->getResource()->getTables();
-+        $tables = $this->getListTables->execute();
- 
-         $backup->write($this->getResource()->getHeader());
- 
-@@ -172,6 +217,8 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
-                 $backup->write($this->getResource()->getTableDataAfterSql($table));
-             }
-         }
-+        $this->getViewsBackup->execute($backup);
-+
-         $backup->write($this->getResource()->getTableForeignKeysSql());
-         $backup->write($this->getResource()->getTableTriggersSql());
-         $backup->write($this->getResource()->getFooter());
-@@ -179,8 +226,6 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
-         $this->getResource()->commitTransaction();
- 
-         $backup->close();
--
--        return $this;
-     }
- 
-     /**
-diff --git a/app/code/Magento/Backup/Model/Fs/Collection.php b/app/code/Magento/Backup/Model/Fs/Collection.php
-index 2d08ac04528..b17c17f7074 100644
---- a/app/code/Magento/Backup/Model/Fs/Collection.php
-+++ b/app/code/Magento/Backup/Model/Fs/Collection.php
-@@ -115,7 +115,8 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
-         if (isset($row['display_name']) && $row['display_name'] == '') {
-             $row['display_name'] = 'WebSetupWizard';
-         }
--        $row['id'] = $row['time'] . '_' . $row['type'] . (isset($row['display_name']) ? $row['display_name'] : '');
-+        $row['id'] = $row['time'] . '_' . $row['type']
-+            . (isset($row['display_name']) ? '_' . $row['display_name'] : '');
-         return $row;
-     }
- }
-diff --git a/app/code/Magento/Backup/Model/ResourceModel/Table/GetListTables.php b/app/code/Magento/Backup/Model/ResourceModel/Table/GetListTables.php
-new file mode 100644
-index 00000000000..73c4221feba
---- /dev/null
-+++ b/app/code/Magento/Backup/Model/ResourceModel/Table/GetListTables.php
-@@ -0,0 +1,44 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Backup\Model\ResourceModel\Table;
-+
-+use Magento\Framework\App\ResourceConnection;
-+
-+/**
-+ * Provides full list of tables in the database. This list excludes views, to allow different backup process.
-+ */
-+class GetListTables
-+{
-+    private const TABLE_TYPE = 'BASE TABLE';
-+
-+    /**
-+     * @var ResourceConnection
-+     */
-+    private $resource;
-+
-+    /**
-+     * @param ResourceConnection $resource
-+     */
-+    public function __construct(ResourceConnection $resource)
-+    {
-+        $this->resource = $resource;
-+    }
-+
-+    /**
-+     * Get list of database tables excluding views.
-+     *
-+     * @return array
-+     */
-+    public function execute(): array
-+    {
-+        return $this->resource->getConnection('backup')->fetchCol(
-+            "SHOW FULL TABLES WHERE `Table_type` = ?",
-+            self::TABLE_TYPE
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/Backup/Model/ResourceModel/View/CreateViewsBackup.php b/app/code/Magento/Backup/Model/ResourceModel/View/CreateViewsBackup.php
-new file mode 100644
-index 00000000000..51b49dcb9e4
---- /dev/null
-+++ b/app/code/Magento/Backup/Model/ResourceModel/View/CreateViewsBackup.php
-@@ -0,0 +1,116 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Backup\Model\ResourceModel\View;
-+
-+use Magento\Framework\App\ResourceConnection;
-+use Magento\Framework\Backup\Db\BackupInterface;
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+
-+/**
-+ * Creates backup of Views in the database.
-+ */
-+class CreateViewsBackup
-+{
-+    /**
-+     * @var GetListViews
-+     */
-+    private $getListViews;
-+
-+    /**
-+     * @var ResourceConnection
-+     */
-+    private $resourceConnection;
-+
-+    /**
-+     * @var AdapterInterface
-+     */
-+    private $connection;
-+
-+    /**
-+     * @param GetListViews $getListViews
-+     * @param ResourceConnection $resourceConnection
-+     */
-+    public function __construct(
-+        GetListViews $getListViews,
-+        ResourceConnection $resourceConnection
-+    ) {
-+        $this->getListViews = $getListViews;
-+        $this->resourceConnection = $resourceConnection;
-+    }
-+
-+    /**
-+     * Write backup data to backup file.
-+     *
-+     * @param BackupInterface $backup
-+     */
-+    public function execute(BackupInterface $backup): void
-+    {
-+        $views = $this->getListViews->execute();
-+
-+        foreach ($views as $view) {
-+            $backup->write($this->getViewHeader($view));
-+            $backup->write($this->getDropViewSql($view));
-+            $backup->write($this->getCreateView($view));
-+        }
-+    }
-+
-+    /**
-+     * Retrieve Database connection for Backup.
-+     *
-+     * @return AdapterInterface
-+     */
-+    private function getConnection(): AdapterInterface
-+    {
-+        if (!$this->connection) {
-+            $this->connection = $this->resourceConnection->getConnection('backup');
-+        }
-+
-+        return $this->connection;
-+    }
-+
-+    /**
-+     * Get CREATE VIEW query for the specific view.
-+     *
-+     * @param string $viewName
-+     * @return string
-+     */
-+    private function getCreateView(string $viewName): string
-+    {
-+        $quotedViewName = $this->getConnection()->quoteIdentifier($viewName);
-+        $query = 'SHOW CREATE VIEW ' . $quotedViewName;
-+        $row = $this->getConnection()->fetchRow($query);
-+        $regExp = '/\sDEFINER\=\`([^`]*)\`\@\`([^`]*)\`/';
-+        $sql = preg_replace($regExp, '', $row['Create View']);
-+
-+        return $sql . ';' . "\n";
-+    }
-+
-+    /**
-+     * Prepare a header for View being dumped.
-+     *
-+     * @param string $viewName
-+     * @return string
-+     */
-+    public function getViewHeader(string $viewName): string
-+    {
-+        $quotedViewName = $this->getConnection()->quoteIdentifier($viewName);
-+        return "\n--\n" . "-- Structure for view {$quotedViewName}\n" . "--\n\n";
-+    }
-+
-+    /**
-+     * Make sure that View being created is deleted if already exists.
-+     *
-+     * @param string $viewName
-+     * @return string
-+     */
-+    public function getDropViewSql(string $viewName): string
-+    {
-+        $quotedViewName = $this->getConnection()->quoteIdentifier($viewName);
-+        return sprintf('DROP VIEW IF EXISTS %s;\n', $quotedViewName);
-+    }
-+}
-diff --git a/app/code/Magento/Backup/Model/ResourceModel/View/GetListViews.php b/app/code/Magento/Backup/Model/ResourceModel/View/GetListViews.php
-new file mode 100644
-index 00000000000..c76ea284218
---- /dev/null
-+++ b/app/code/Magento/Backup/Model/ResourceModel/View/GetListViews.php
-@@ -0,0 +1,44 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Backup\Model\ResourceModel\View;
-+
-+use Magento\Framework\App\ResourceConnection;
-+
-+/**
-+ * Get list of database views.
-+ */
-+class GetListViews
-+{
-+    private const TABLE_TYPE = 'VIEW';
-+
-+    /**
-+     * @var ResourceConnection
-+     */
-+    private $resource;
-+
-+    /**
-+     * @param ResourceConnection $resource
-+     */
-+    public function __construct(ResourceConnection $resource)
-+    {
-+        $this->resource = $resource;
-+    }
-+
-+    /**
-+     * Get list of database views.
-+     *
-+     * @return array
-+     */
-+    public function execute(): array
-+    {
-+        return $this->resource->getConnection('backup')->fetchCol(
-+            "SHOW FULL TABLES WHERE `Table_type` = ?",
-+            self::TABLE_TYPE
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateBackupActionGroup.xml
-new file mode 100644
-index 00000000000..89381112e6c
---- /dev/null
-+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateBackupActionGroup.xml
-@@ -0,0 +1,54 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+
-+    <actionGroup name="createSystemBackup">
-+        <arguments>
-+            <argument name="backup" defaultValue="SystemBackup"/>
-+        </arguments>
-+        <click selector="{{AdminMainActionsSection.systemBackup}}" stepKey="clickCreateBackupButton"/>
-+        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
-+        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
-+        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
-+        <waitForElementNotVisible selector=".loading-mask" time="300" stepKey="waitForBackupProcess"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the system backup." stepKey="seeSuccessMessage"/>
-+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
-+        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
-+    </actionGroup>
-+
-+    <actionGroup name="createMediaBackup">
-+        <arguments>
-+            <argument name="backup" defaultValue="MediaBackup"/>
-+        </arguments>
-+        <click selector="{{AdminMainActionsSection.mediaBackup}}" stepKey="clickCreateBackupButton"/>
-+        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
-+        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
-+        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
-+        <waitForPageLoad time="120" stepKey="waitForBackupProcess"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the database and media backup." stepKey="seeSuccessMessage"/>
-+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
-+        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
-+    </actionGroup>
-+
-+    <actionGroup name="createDatabaseBackup">
-+        <arguments>
-+            <argument name="backup" defaultValue="DatabaseBackup"/>
-+        </arguments>
-+        <click selector="{{AdminMainActionsSection.databaseBackup}}" stepKey="clickCreateBackupButton"/>
-+        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
-+        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
-+        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
-+        <waitForPageLoad time="120" stepKey="waitForBackupProcess"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the database backup." stepKey="seeSuccessMessage"/>
-+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
-+        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
-+    </actionGroup>
-+
-+</actionGroups>
-diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
-new file mode 100644
-index 00000000000..ebc4ac1fb05
---- /dev/null
-+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+
-+    <actionGroup name="deleteBackup">
-+        <arguments>
-+            <argument name="backup"/>
-+        </arguments>
-+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
-+        <click selector="{{AdminGridTableSection.backupRowCheckbox(backup.name)}}" stepKey="selectBackupRow"/>
-+        <selectOption selector="{{AdminGridActionSection.actionSelect}}" userInput="Delete" stepKey="selectDeleteAction"/>
-+        <click selector="{{AdminGridActionSection.submitButton}}" stepKey="clickSubmit"/>
-+        <waitForPageLoad stepKey="waitForConfirmWindowToAppear"/>
-+        <see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to delete the selected backup(s)?" stepKey="seeConfirmationModal"/>
-+        <waitForPageLoad stepKey="waitForSubmitAction"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickOkConfirmDelete"/>
-+        <dontSee selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="dontSeeBackupInGrid"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml b/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml
-new file mode 100644
-index 00000000000..ad218cdd575
---- /dev/null
-+++ b/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="SystemBackup" type="backup">
-+        <data key="name" unique="suffix">systemBackup</data>
-+        <data key="type">System</data>
-+    </entity>
-+    <entity name="MediaBackup" type="backup">
-+        <data key="name" unique="suffix">mediaBackup</data>
-+        <data key="type">Database and Media</data>
-+    </entity>
-+    <entity name="DatabaseBackup" type="backup">
-+        <data key="name" unique="suffix">databaseBackup</data>
-+        <data key="type">Database</data>
-+    </entity>
-+    <entity name="WebSetupWizardBackup" type="backup">
-+        <data key="name">WebSetupWizard</data>
-+        <data key="type">Database</data>
-+    </entity>
-+</entities>
-\ No newline at end of file
-diff --git a/app/code/Magento/Backup/Test/Mftf/Page/BackupIndexPage.xml b/app/code/Magento/Backup/Test/Mftf/Page/BackupIndexPage.xml
-new file mode 100644
-index 00000000000..aad29e6e6d5
---- /dev/null
-+++ b/app/code/Magento/Backup/Test/Mftf/Page/BackupIndexPage.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="BackupIndexPage" url="/backup/index/" area="admin" module="Magento_Backup">
-+        <section name="AdminMainActionsSection"/>
-+        <section name="AdminGridTableSection"/>
-+        <section name="AdminCreateBackupFormSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Backup/Test/Mftf/Section/AdminCreateBackupFormSection.xml b/app/code/Magento/Backup/Test/Mftf/Section/AdminCreateBackupFormSection.xml
-new file mode 100644
-index 00000000000..af88146bcfb
---- /dev/null
-+++ b/app/code/Magento/Backup/Test/Mftf/Section/AdminCreateBackupFormSection.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCreateBackupFormSection">
-+        <element name="backupNameField" type="input" selector="input[name='backup_name']"/>
-+        <element name="maintenanceModeCheckbox" type="checkbox" selector="input[name='maintenance_mode']"/>
-+        <element name="excludeMediaCheckbox" type="checkbox" selector="input[name='exclude_media']"/>
-+        <element name="ok" type="button" selector=".modal-header button.primary"/>
-+        <element name="cancel" type="button" selector=".modal-header button.cancel"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Backup/Test/Mftf/Section/AdminGridActionSection.xml b/app/code/Magento/Backup/Test/Mftf/Section/AdminGridActionSection.xml
-new file mode 100644
-index 00000000000..cca6b428a28
---- /dev/null
-+++ b/app/code/Magento/Backup/Test/Mftf/Section/AdminGridActionSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminGridActionSection">
-+        <element name="actionSelect" type="select" selector="#backupsGrid_massaction-select"/>
-+        <element name="submitButton" type="button" selector="#backupsGrid_massaction button[title='Submit']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Backup/Test/Mftf/Section/AdminGridTableSection.xml b/app/code/Magento/Backup/Test/Mftf/Section/AdminGridTableSection.xml
-new file mode 100644
-index 00000000000..72fb5168493
---- /dev/null
-+++ b/app/code/Magento/Backup/Test/Mftf/Section/AdminGridTableSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminGridTableSection">
-+        <element name="backupNameColumn" type="text" selector="table.data-grid td[data-column='display_name']"/>
-+        <element name="backupTypeByName" type="text" selector="//table//td[contains(., '{{name}}')]/parent::tr/td[@data-column='type']" parameterized="true"/>
-+        <element name="backupRowCheckbox" type="checkbox" selector="//table//td[contains(., '{{name}}')]/parent::tr/td[@data-column='massaction']//input" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Backup/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Backup/Test/Mftf/Section/AdminMainActionsSection.xml
-new file mode 100644
-index 00000000000..11ba79f32b5
---- /dev/null
-+++ b/app/code/Magento/Backup/Test/Mftf/Section/AdminMainActionsSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminMainActionsSection">
-+        <element name="systemBackup" type="button" selector="button[data-ui-id*='createsnapshotbutton']"/>
-+        <element name="mediaBackup" type="button" selector="button[data-ui-id*='createmediabackupbutton']"/>
-+        <element name="databaseBackup" type="button" selector="button.database-backup[data-ui-id*='createbutton']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml b/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
-new file mode 100644
-index 00000000000..26f8817c0a1
---- /dev/null
-+++ b/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
-@@ -0,0 +1,57 @@
-+<?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="AdminCreateAndDeleteBackupsTest">
-+        <annotations>
-+            <features value="Backup"/>
-+            <stories value="Create and delete backups"/>
-+            <title value="Create and delete backups"/>
-+            <description value="An admin user can create a backup of each type and delete each backup."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-94176"/>
-+            <group value="backup"/>
-+            <skip>
-+                <issueId value="MC-5807"/>
-+            </skip>
-+        </annotations>
-+
-+        <!--Login to admin area-->
-+        <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
-+
-+        <!--Go to backup index page-->
-+        <amOnPage url="{{BackupIndexPage.url}}" stepKey="goToBackupPage"/>
-+        <waitForPageLoad stepKey="waitForBackupPage"/>
-+
-+        <!--Create system backup-->
-+        <actionGroup ref="createSystemBackup" stepKey="createSystemBackup"/>
-+
-+        <!--Create database/media backup-->
-+        <actionGroup ref="createMediaBackup" stepKey="createMediaBackup"/>
-+
-+        <!--Create database backup-->
-+        <actionGroup ref="createDatabaseBackup" stepKey="createDatabaseBackup"/>
-+
-+        <!--Delete system backup-->
-+        <actionGroup ref="deleteBackup" stepKey="deleteSystemBackup">
-+            <argument name="backup" value="SystemBackup"/>
-+        </actionGroup>
-+
-+        <!--Delete database/media backup-->
-+        <actionGroup ref="deleteBackup" stepKey="deleteMediaBackup">
-+            <argument name="backup" value="MediaBackup"/>
-+        </actionGroup>
-+
-+        <!--Delete database backup-->
-+        <actionGroup ref="deleteBackup" stepKey="deleteDatabaseBackup">
-+            <argument name="backup" value="DatabaseBackup"/>
-+        </actionGroup>
-+
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php b/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php
-index b7dfb30c0a1..56a7ef42a0b 100644
---- a/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php
-+++ b/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php
-@@ -3,134 +3,44 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Backup\Test\Unit\Cron;
- 
-+use Magento\Backup\Cron\SystemBackup;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Backup\Helper\Data as Helper;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- 
--class SystemBackupTest extends \PHPUnit\Framework\TestCase
-+class SystemBackupTest extends TestCase
- {
-     /**
--     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
--     */
--    private $objectManager;
--
--    /**
--     * @var \Magento\Backup\Cron\SystemBackup
--     */
--    private $systemBackup;
--
--    /**
--     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $scopeConfigMock;
--
--    /**
--     * @var \Magento\Backup\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $backupDataMock;
--
--    /**
--     * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $registryMock;
--
--    /**
--     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Helper|\PHPUnit_Framework_MockObject_MockObject
-      */
--    private $loggerMock;
-+    private $helperMock;
- 
-     /**
--     * Filesystem facade
--     *
--     * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
-+     * @var SystemBackup
-      */
--    private $filesystemMock;
-+    private $cron;
- 
-     /**
--     * @var \Magento\Framework\Backup\Factory|\PHPUnit_Framework_MockObject_MockObject
-+     * @inheritDoc
-      */
--    private $backupFactoryMock;
--
--    /**
--     * @var \Magento\Framework\App\MaintenanceMode|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $maintenanceModeMock;
--
--    /**
--     * @var \Magento\Framework\Backup\Db|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $backupDbMock;
--
--    /**
--     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $objectManagerMock;
--
-     protected function setUp()
-     {
--        $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
--            ->getMock();
--        $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
--            ->getMock();
--        $this->backupDataMock = $this->getMockBuilder(\Magento\Backup\Helper\Data::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->registryMock = $this->getMockBuilder(\Magento\Framework\Registry::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
--            ->getMock();
--        $this->filesystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->backupFactoryMock = $this->getMockBuilder(\Magento\Framework\Backup\Factory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->maintenanceModeMock = $this->getMockBuilder(\Magento\Framework\App\MaintenanceMode::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->backupDbMock = $this->getMockBuilder(\Magento\Framework\Backup\Db::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->backupDbMock->expects($this->any())->method('setBackupExtension')->willReturnSelf();
--        $this->backupDbMock->expects($this->any())->method('setTime')->willReturnSelf();
--        $this->backupDbMock->expects($this->any())->method('setBackupsDir')->willReturnSelf();
--
--        $this->objectManager = new ObjectManager($this);
--        $this->systemBackup = $this->objectManager->getObject(
--            \Magento\Backup\Cron\SystemBackup::class,
--            [
--                'backupData' => $this->backupDataMock,
--                'coreRegistry' => $this->registryMock,
--                'logger' => $this->loggerMock,
--                'scopeConfig' => $this->scopeConfigMock,
--                'filesystem' => $this->filesystemMock,
--                'backupFactory' => $this->backupFactoryMock,
--                'maintenanceMode' => $this->maintenanceModeMock,
--            ]
--        );
-+        $objectManager = new ObjectManager($this);
-+        $this->helperMock = $this->getMockBuilder(Helper::class)->disableOriginalConstructor()->getMock();
-+        $this->cron = $objectManager->getObject(SystemBackup::class, ['backupData' => $this->helperMock]);
-     }
- 
-     /**
--     * @expectedException \Exception
-+     * Test that cron doesn't do anything if backups are disabled.
-      */
--    public function testExecuteThrowsException()
-+    public function testDisabled()
-     {
--        $type = 'db';
--        $this->scopeConfigMock->expects($this->any())->method('isSetFlag')->willReturn(true);
--
--        $this->scopeConfigMock->expects($this->once())->method('getValue')
--            ->with('system/backup/type', 'store')
--            ->willReturn($type);
--
--        $this->backupFactoryMock->expects($this->once())->method('create')->willReturn($this->backupDbMock);
--
--        $this->backupDbMock->expects($this->once())->method('create')->willThrowException(new \Exception);
--
--        $this->backupDataMock->expects($this->never())->method('getCreateSuccessMessageByType')->with($type);
--        $this->loggerMock->expects($this->never())->method('info');
--
--        $this->systemBackup->execute();
-+        $this->helperMock->expects($this->any())->method('isEnabled')->willReturn(false);
-+        $this->cron->execute();
-     }
- }
-diff --git a/app/code/Magento/Backup/Test/Unit/Model/BackupFactoryTest.php b/app/code/Magento/Backup/Test/Unit/Model/BackupFactoryTest.php
-index 629028bfd6f..abf5e63276a 100644
---- a/app/code/Magento/Backup/Test/Unit/Model/BackupFactoryTest.php
-+++ b/app/code/Magento/Backup/Test/Unit/Model/BackupFactoryTest.php
-@@ -56,7 +56,7 @@ class BackupFactoryTest extends \PHPUnit\Framework\TestCase
-         $this->_objectManager->expects(
-             $this->at(0)
-         )->method(
--            'get'
-+            'create'
-         )->with(
-             \Magento\Backup\Model\Fs\Collection::class
-         )->will(
-@@ -65,7 +65,7 @@ class BackupFactoryTest extends \PHPUnit\Framework\TestCase
-         $this->_objectManager->expects(
-             $this->at(1)
-         )->method(
--            'get'
-+            'create'
-         )->with(
-             \Magento\Backup\Model\Backup::class
-         )->will(
-diff --git a/app/code/Magento/Backup/Test/Unit/Model/DbTest.php b/app/code/Magento/Backup/Test/Unit/Model/DbTest.php
-deleted file mode 100644
-index 0cab5f0ad1e..00000000000
---- a/app/code/Magento/Backup/Test/Unit/Model/DbTest.php
-+++ /dev/null
-@@ -1,243 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\Backup\Test\Unit\Model;
--
--use Magento\Backup\Model\Db;
--use Magento\Backup\Model\ResourceModel\Db as DbResource;
--use Magento\Framework\App\ResourceConnection;
--use Magento\Framework\Backup\Db\BackupInterface;
--use Magento\Framework\DataObject;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
--
--class DbTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var ObjectManager
--     */
--    private $objectManager;
--
--    /**
--     * @var Db
--     */
--    private $dbModel;
--
--    /**
--     * @var DbResource|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $dbResourceMock;
--
--    /**
--     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $connectionResourceMock;
--
--    protected function setUp()
--    {
--        $this->dbResourceMock = $this->getMockBuilder(DbResource::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->connectionResourceMock = $this->getMockBuilder(ResourceConnection::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->objectManager = new ObjectManager($this);
--        $this->dbModel = $this->objectManager->getObject(
--            Db::class,
--            [
--                'resourceDb' => $this->dbResourceMock,
--                'resource' => $this->connectionResourceMock
--            ]
--        );
--    }
--
--    public function testGetResource()
--    {
--        self::assertEquals($this->dbResourceMock, $this->dbModel->getResource());
--    }
--
--    public function testGetTables()
--    {
--        $tables = [];
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTables')
--            ->willReturn($tables);
--
--        self::assertEquals($tables, $this->dbModel->getTables());
--    }
--
--    public function testGetTableCreateScript()
--    {
--        $tableName = 'some_table';
--        $script = 'script';
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTableCreateScript')
--            ->with($tableName, false)
--            ->willReturn($script);
--
--        self::assertEquals($script, $this->dbModel->getTableCreateScript($tableName, false));
--    }
--
--    public function testGetTableDataDump()
--    {
--        $tableName = 'some_table';
--        $dump = 'dump';
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTableDataDump')
--            ->with($tableName)
--            ->willReturn($dump);
--
--        self::assertEquals($dump, $this->dbModel->getTableDataDump($tableName));
--    }
--
--    public function testGetHeader()
--    {
--        $header = 'header';
--        $this->dbResourceMock->expects($this->once())
--            ->method('getHeader')
--            ->willReturn($header);
--
--        self::assertEquals($header, $this->dbModel->getHeader());
--    }
--
--    public function testGetFooter()
--    {
--        $footer = 'footer';
--        $this->dbResourceMock->expects($this->once())
--            ->method('getFooter')
--            ->willReturn($footer);
--
--        self::assertEquals($footer, $this->dbModel->getFooter());
--    }
--
--    public function testRenderSql()
--    {
--        $header = 'header';
--        $script = 'script';
--        $tableName = 'some_table';
--        $tables = [$tableName, $tableName];
--        $dump = 'dump';
--        $footer = 'footer';
--
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTables')
--            ->willReturn($tables);
--        $this->dbResourceMock->expects($this->once())
--            ->method('getHeader')
--            ->willReturn($header);
--        $this->dbResourceMock->expects($this->exactly(2))
--            ->method('getTableCreateScript')
--            ->with($tableName, true)
--            ->willReturn($script);
--        $this->dbResourceMock->expects($this->exactly(2))
--            ->method('getTableDataDump')
--            ->with($tableName)
--            ->willReturn($dump);
--        $this->dbResourceMock->expects($this->once())
--            ->method('getFooter')
--            ->willReturn($footer);
--
--        self::assertEquals(
--            $header . $script . $dump . $script . $dump . $footer,
--            $this->dbModel->renderSql()
--        );
--    }
--
--    public function testCreateBackup()
--    {
--        /** @var BackupInterface|\PHPUnit_Framework_MockObject_MockObject $backupMock */
--        $backupMock = $this->getMockBuilder(BackupInterface::class)->getMock();
--        /** @var DataObject $tableStatus */
--        $tableStatus = new DataObject();
--
--        $tableName = 'some_table';
--        $tables = [$tableName];
--        $header = 'header';
--        $footer = 'footer';
--        $dropSql = 'drop_sql';
--        $createSql = 'create_sql';
--        $beforeSql = 'before_sql';
--        $afterSql = 'after_sql';
--        $dataSql = 'data_sql';
--        $foreignKeysSql = 'foreign_keys';
--        $triggersSql = 'triggers_sql';
--        $rowsCount = 2;
--        $dataLength = 1;
--
--        $this->dbResourceMock->expects($this->once())
--            ->method('beginTransaction');
--        $this->dbResourceMock->expects($this->once())
--            ->method('commitTransaction');
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTables')
--            ->willReturn($tables);
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTableDropSql')
--            ->willReturn($dropSql);
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTableCreateSql')
--            ->with($tableName, false)
--            ->willReturn($createSql);
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTableDataBeforeSql')
--            ->with($tableName)
--            ->willReturn($beforeSql);
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTableDataAfterSql')
--            ->with($tableName)
--            ->willReturn($afterSql);
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTableDataSql')
--            ->with($tableName, $rowsCount, 0)
--            ->willReturn($dataSql);
--         $this->dbResourceMock->expects($this->once())
--             ->method('getTableStatus')
--             ->with($tableName)
--             ->willReturn($tableStatus);
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTables')
--            ->willReturn($createSql);
--        $this->dbResourceMock->expects($this->once())
--            ->method('getHeader')
--            ->willReturn($header);
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTableHeader')
--            ->willReturn($header);
--        $this->dbResourceMock->expects($this->once())
--            ->method('getFooter')
--            ->willReturn($footer);
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTableForeignKeysSql')
--            ->willReturn($foreignKeysSql);
--        $this->dbResourceMock->expects($this->once())
--            ->method('getTableTriggersSql')
--            ->willReturn($triggersSql);
--        $backupMock->expects($this->once())
--            ->method('open');
--        $backupMock->expects($this->once())
--            ->method('close');
--
--        $tableStatus->setRows($rowsCount);
--        $tableStatus->setDataLength($dataLength);
--
--        $backupMock->expects($this->any())
--            ->method('write')
--            ->withConsecutive(
--                [$this->equalTo($header)],
--                [$this->equalTo($header . $dropSql . "\n")],
--                [$this->equalTo($createSql . "\n")],
--                [$this->equalTo($beforeSql)],
--                [$this->equalTo($dataSql)],
--                [$this->equalTo($afterSql)],
--                [$this->equalTo($foreignKeysSql)],
--                [$this->equalTo($triggersSql)],
--                [$this->equalTo($footer)]
--            );
--
--        $this->dbModel->createBackup($backupMock);
--    }
--}
-diff --git a/app/code/Magento/Backup/etc/adminhtml/system.xml b/app/code/Magento/Backup/etc/adminhtml/system.xml
-index 4028452d044..aa6635b4dde 100644
---- a/app/code/Magento/Backup/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Backup/etc/adminhtml/system.xml
-@@ -9,15 +9,24 @@
-     <system>
-         <section id="system">
-             <group id="backup" translate="label" type="text" sortOrder="500" showInDefault="1" showInWebsite="0" showInStore="0">
--                <label>Scheduled Backup Settings</label>
-+                <label>Backup Settings</label>
-+                <field id="functionality_enabled" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="0" showInStore="0">
-+                    <label>Enable Backup</label>
-+                    <comment>Disabled by default for security reasons</comment>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                </field>
-                 <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
-                     <label>Enable Scheduled Backup</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <depends>
-+                        <field id="functionality_enabled">1</field>
-+                    </depends>
-                 </field>
-                 <field id="type" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
--                    <label>Backup Type</label>
-+                    <label>Scheduled Backup Type</label>
-                     <depends>
-                         <field id="enabled">1</field>
-+                        <field id="functionality_enabled">1</field>
-                     </depends>
-                     <source_model>Magento\Backup\Model\Config\Source\Type</source_model>
-                 </field>
-@@ -25,12 +34,14 @@
-                     <label>Start Time</label>
-                     <depends>
-                         <field id="enabled">1</field>
-+                        <field id="functionality_enabled">1</field>
-                     </depends>
-                 </field>
-                 <field id="frequency" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
-                     <label>Frequency</label>
-                     <depends>
-                         <field id="enabled">1</field>
-+                        <field id="functionality_enabled">1</field>
-                     </depends>
-                     <source_model>Magento\Cron\Model\Config\Source\Frequency</source_model>
-                     <backend_model>Magento\Backup\Model\Config\Backend\Cron</backend_model>
-@@ -40,6 +51,7 @@
-                     <comment>Please put your store into maintenance mode during backup.</comment>
-                     <depends>
-                         <field id="enabled">1</field>
-+                        <field id="functionality_enabled">1</field>
-                     </depends>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
-diff --git a/app/code/Magento/Backup/etc/config.xml b/app/code/Magento/Backup/etc/config.xml
-new file mode 100644
-index 00000000000..fb0808983b9
---- /dev/null
-+++ b/app/code/Magento/Backup/etc/config.xml
-@@ -0,0 +1,16 @@
-+<?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_Store:etc/config.xsd">
-+    <default>
-+        <system>
-+            <backup>
-+                <functionality_enabled>0</functionality_enabled>
-+            </backup>
-+        </system>
-+    </default>
-+</config>
-diff --git a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml
-index e17618b97e2..e3e984d933f 100644
---- a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml
-+++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.backup.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">backupsGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Backup\Model\Fs\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Backup\Model\Fs\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">time</argument>
-                     <argument name="default_dir" xsi:type="string">desc</argument>
-                 </arguments>
-diff --git a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_disabled.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_disabled.xml
-new file mode 100644
-index 00000000000..3470f528e5c
---- /dev/null
-+++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_disabled.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <head>
-+        <title>Backup functionality is disabled</title>
-+    </head>
-+    <body>
-+        <referenceContainer name="content">
-+            <block class="Magento\Backend\Block\Template" name="adminhtml.system.backup.disabled" template="Magento_Backup::backup/disabled.phtml"/>
-+        </referenceContainer>
-+    </body>
-+</page>
-diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
-index 304a60c60ca..81aa49efd11 100644
---- a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
-+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
-@@ -3,14 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <!-- TODO: refactor form styles and js -->
- <script type="text/x-magento-template" id="rollback-warning-template">
--<p><?= /* @escapeNotVerified */ __('You will lose any data created since the backup was made, including admin users, customers and orders.') ?></p>
--<p><?= /* @escapeNotVerified */ __('Are you sure you want to continue?') ?></p>
-+<p><?= $block->escapeHtml(__('You will lose any data created since the backup was made, including admin users, customers and orders.')) ?></p>
-+<p><?= $block->escapeHtml(__('Are you sure you want to continue?')) ?></p>
- </script>
- <script type="text/x-magento-template" id="backup-options-template">
-     <div class="backup-messages" style="display: none;">
-@@ -18,39 +15,39 @@
-     </div>
-     <div class="messages">
-         <div class="message message-warning">
--            <?= /* @escapeNotVerified */ __('This may take a few moments.') ?>
--            <?= /* @escapeNotVerified */ __('Be sure your store is in maintenance mode during backup.') ?></div>
-+            <?= $block->escapeHtml(__('This may take a few moments.')) ?>
-+            <?= $block->escapeHtml(__('Be sure your store is in maintenance mode during backup.')) ?></div>
-     </div>
-     <form action="" method="post" id="backup-form" class="form-inline">
-         <fieldset class="admin__fieldset form-list question">
-             <div class="admin__field field _required">
--                <label for="backup_name" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Backup Name') ?></span></label>
-+                <label for="backup_name" class="admin__field-label"><span><?= $block->escapeHtml(__('Backup Name')) ?></span></label>
-                 <div class="admin__field-control">
-                     <input type="text" name="backup_name" id="backup_name"
-                            class="admin__control-text required-entry validate-alphanum-with-spaces validate-length maximum-length-50"
-                            maxlength="50" />
-                     <div class="admin__field-note">
--                        <?= /* @escapeNotVerified */ __('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.') ?>
-+                        <?= $block->escapeHtml(__('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.')) ?>
-                     </div>
-                 </div>
-             </div>
- 
-             <div class="admin__field field maintenance-checkbox-container">
--                <label for="backup_maintenance_mode" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Maintenance mode') ?></span></label>
-+                <label for="backup_maintenance_mode" class="admin__field-label"><span><?= $block->escapeHtml(__('Maintenance mode')) ?></span></label>
-                 <div class="admin__field-control">
-                     <div class="admin__field-option">
-                         <input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="backup_maintenance_mode"/>
--                        <label class="admin__field-label" for="backup_maintenance_mode"><?= /* @escapeNotVerified */ __('Please put your store into maintenance mode during backup.') ?></label>
-+                        <label class="admin__field-label" for="backup_maintenance_mode"><?= $block->escapeHtml(__('Please put your store into maintenance mode during backup.')) ?></label>
-                     </div>
-                 </div>
-             </div>
- 
-             <div class="admin__field field maintenance-checkbox-container" id="exclude-media-checkbox-container" style="display: none;">
--                <label for="exclude_media" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Exclude') ?></span></label>
-+                <label for="exclude_media" class="admin__field-label"><span><?= $block->escapeHtml(__('Exclude')) ?></span></label>
-                 <div class="admin__field-control">
-                     <div class="admin__field-option">
-                         <input class="admin__control-checkbox" type="checkbox" name="exclude_media" value="1" id="exclude_media"/>
--                        <label class="admin__field-label" for="exclude_media"><?= /* @escapeNotVerified */ __('Exclude media folder from backup') ?></label>
-+                        <label class="admin__field-label" for="exclude_media"><?= $block->escapeHtml(__('Exclude media folder from backup')) ?></label>
-                     </div>
-                 </div>
-             </div>
-@@ -64,59 +61,59 @@
-     </div>
-     <div class="messages">
-         <div class="message message-warning">
--            <?= /* @escapeNotVerified */ __('Please enter the password to confirm rollback.') ?><br>
--            <?= /* @escapeNotVerified */ __('This action cannot be undone.') ?>
--            <p><?= /* @escapeNotVerified */ __('Are you sure you want to continue?') ?></p>
-+            <?= $block->escapeHtml(__('Please enter the password to confirm rollback.')) ?><br>
-+            <?= $block->escapeHtml(__('This action cannot be undone.')) ?>
-+            <p><?= $block->escapeHtml(__('Are you sure you want to continue?')) ?></p>
-         </div>
-     </div>
-     <form action="" method="post" id="rollback-form" class="form-inline">
-         <fieldset class="admin__fieldset password-box-container">
-             <div class="admin__field field _required">
--                <label for="password" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('User Password') ?></span></label>
-+                <label for="password" class="admin__field-label"><span><?= $block->escapeHtml(__('User Password')) ?></span></label>
-                 <div class="admin__field-control"><input type="password" name="password" id="password" class="admin__control-text required-entry" autocomplete="new-password"></div>
-             </div>
- 
-             <div class="admin__field field maintenance-checkbox-container">
--                <label for="rollback_maintenance_mode" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Maintenance mode') ?></span></label>
-+                <label for="rollback_maintenance_mode" class="admin__field-label"><span><?= $block->escapeHtml(__('Maintenance mode')) ?></span></label>
-                 <div class="admin__field-control">
-                     <div class="admin__field-option">
--                        <input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="rollback_maintenance_mode"/>  
--                        <label class="admin__field-label" for="rollback_maintenance_mode"><?= /* @escapeNotVerified */ __('Please put your store into maintenance mode during rollback processing.') ?></label>  
-+                        <input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="rollback_maintenance_mode"/>
-+                        <label class="admin__field-label" for="rollback_maintenance_mode"><?= $block->escapeHtml(__('Please put your store into maintenance mode during rollback processing.')) ?></label>
-                     </div>  
-                 </div>
-             </div>
- 
-             <div class="admin__field field maintenance-checkbox-container" id="use-ftp-checkbox-row" style="display: none;">
-                 <label for="use_ftp" class="admin__field-label">
--                    <span><?= /* @escapeNotVerified */ __('FTP') ?></span>
-+                    <span><?= $block->escapeHtml(__('FTP')) ?></span>
-                 </label>
-                 <div class="admin__field-control">
-                     <div class="admin__field-option">
-                         <input class="admin__control-checkbox" type="checkbox" name="use_ftp" value="1" id="use_ftp" onclick="backup.toggleFtpCredentialsForm(event)"/>
--                        <label class="admin__field-label" for="use_ftp"><?= /* @escapeNotVerified */ __('Use FTP Connection') ?></label>
-+                        <label class="admin__field-label" for="use_ftp"><?= $block->escapeHtml(__('Use FTP Connection')) ?></label>
-                     </div>
-                 </div>
-             </div>
-         </fieldset>
-         <div class="entry-edit" id="ftp-credentials-container" style="display: none;">
-             <fieldset class="admin__fieldset">
--                <legend class="admin__legend legend"><span><?= /* @escapeNotVerified */ __('FTP credentials') ?></span></legend><br />
-+                <legend class="admin__legend legend"><span><?= $block->escapeHtml(__('FTP credentials')) ?></span></legend><br />
-                 <div class="admin__field field _required">
--                    <label class="admin__field-label" for="ftp_host"><span><?= /* @escapeNotVerified */ __('FTP Host') ?></span></label>
-+                    <label class="admin__field-label" for="ftp_host"><span><?= $block->escapeHtml(__('FTP Host')) ?></span></label>
-                     <div class="admin__field-control">
-                         <input type="text" class="admin__control-text" name="ftp_host" id="ftp_host">
-                     </div>
-                 </div>
- 
-                 <div class="admin__field field _required">
--                    <label class="admin__field-label" for="ftp_user"><span><?= /* @escapeNotVerified */ __('FTP Login') ?></span></label>
-+                    <label class="admin__field-label" for="ftp_user"><span><?= $block->escapeHtml(__('FTP Login')) ?></span></label>
-                     <div class="admin__field-control">
-                         <input type="text" class="admin__control-text" name="ftp_user" id="ftp_user">
-                     </div>
-                 </div>
-                 <div class="admin__field field _required">
-                     <label class="admin__field-label" for="ftp_pass">
--                        <span><?= /* @escapeNotVerified */ __('FTP Password') ?></span>
-+                        <span><?= $block->escapeHtml(__('FTP Password')) ?></span>
-                     </label>
-                     <div class="admin__field-control">
-                         <input type="password" class="admin__control-text" name="ftp_pass" id="ftp_pass" autocomplete="new-password">
-@@ -124,7 +121,7 @@
-                 </div>
-                 <div class="admin__field field">
-                     <label class="admin__field-label" for="ftp_path">
--                        <span><?= /* @escapeNotVerified */ __('Magento root directory') ?></span>
-+                        <span><?= $block->escapeHtml(__('Magento root directory')) ?></span>
-                     </label>
-                     <div class="admin__field-control">
-                         <input type="text" class="admin__control-text" name="ftp_path" id="ftp_path">
-diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/disabled.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/disabled.phtml
-new file mode 100644
-index 00000000000..a5308dce5cc
---- /dev/null
-+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/disabled.phtml
-@@ -0,0 +1,7 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+?>
-+<h2>Backup functionality is currently disabled. Please use other means for backups</h2>
-diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/left.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/left.phtml
-index 1196f7e4438..cecff38611b 100644
---- a/app/code/Magento/Backup/view/adminhtml/templates/backup/left.phtml
-+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/left.phtml
-@@ -4,4 +4,4 @@
-  * See COPYING.txt for license details.
-  */
- ?>
--<h3><?= /* @escapeNotVerified */ __('Create Backup') ?></h3>
-+<h3><?= $block->escapeHtml(__('Create Backup')) ?></h3>
-diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml
-index 9ac9dd496e0..4982953e314 100644
---- a/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml
-+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml('grid') ?>
- <?= $block->getGridHtml() ?>
-diff --git a/app/code/Magento/Braintree/Block/Paypal/Button.php b/app/code/Magento/Braintree/Block/Paypal/Button.php
-index efd9e473699..fe829cf9f1f 100644
---- a/app/code/Magento/Braintree/Block/Paypal/Button.php
-+++ b/app/code/Magento/Braintree/Block/Paypal/Button.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Braintree\Block\Paypal;
- 
- use Magento\Braintree\Gateway\Config\PayPal\Config;
-@@ -49,8 +51,6 @@ class Button extends Template implements ShortcutInterface
-     private $payment;
- 
-     /**
--     * Constructor
--     *
-      * @param Context $context
-      * @param ResolverInterface $localeResolver
-      * @param Session $checkoutSession
-@@ -98,6 +98,8 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
-+     * Returns container id.
-+     *
-      * @return string
-      */
-     public function getContainerId()
-@@ -106,6 +108,8 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
-+     * Returns locale.
-+     *
-      * @return string
-      */
-     public function getLocale()
-@@ -114,6 +118,8 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
-+     * Returns currency.
-+     *
-      * @return string
-      */
-     public function getCurrency()
-@@ -122,6 +128,8 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
-+     * Returns amount.
-+     *
-      * @return float
-      */
-     public function getAmount()
-@@ -130,6 +138,8 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
-+     * Returns if is active.
-+     *
-      * @return bool
-      */
-     public function isActive()
-@@ -139,6 +149,8 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
-+     * Returns merchant name.
-+     *
-      * @return string
-      */
-     public function getMerchantName()
-@@ -147,6 +159,8 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
-+     * Returns client token.
-+     *
-      * @return string|null
-      */
-     public function getClientToken()
-@@ -155,10 +169,22 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
-+     * Returns action success.
-+     *
-      * @return string
-      */
-     public function getActionSuccess()
-     {
-         return $this->getUrl(ConfigProvider::CODE . '/paypal/review', ['_secure' => true]);
-     }
-+
-+    /**
-+     * Gets environment value.
-+     *
-+     * @return string
-+     */
-+    public function getEnvironment(): string
-+    {
-+        return $this->configProvider->getConfig()['payment'][ConfigProvider::CODE]['environment'];
-+    }
- }
-diff --git a/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php b/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
-index 1acd16708ff..ea8a44a1122 100644
---- a/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
-+++ b/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
-@@ -9,6 +9,7 @@ use Magento\Braintree\Gateway\Config\PayPal\Config;
- use Magento\Braintree\Model\Paypal\Helper;
- use Magento\Checkout\Model\Session;
- use Magento\Framework\App\Action\Context;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Framework\Exception\LocalizedException;
-@@ -17,7 +18,7 @@ use Psr\Log\LoggerInterface;
- /**
-  * Class PlaceOrder
-  */
--class PlaceOrder extends AbstractAction
-+class PlaceOrder extends AbstractAction implements HttpPostActionInterface
- {
-     /**
-      * @var Helper\OrderPlace
-@@ -54,6 +55,7 @@ class PlaceOrder extends AbstractAction
- 
-     /**
-      * @inheritdoc
-+     *
-      * @throws LocalizedException
-      */
-     public function execute()
-@@ -71,7 +73,10 @@ class PlaceOrder extends AbstractAction
-             return $resultRedirect->setPath('checkout/onepage/success', ['_secure' => true]);
-         } catch (\Exception $e) {
-             $this->logger->critical($e);
--            $this->messageManager->addExceptionMessage($e, $e->getMessage());
-+            $this->messageManager->addExceptionMessage(
-+                $e,
-+                __('The order #%1 cannot be processed.', $quote->getReservedOrderId())
-+            );
-         }
- 
-         return $resultRedirect->setPath('checkout/cart', ['_secure' => true]);
-diff --git a/app/code/Magento/Braintree/Controller/Paypal/Review.php b/app/code/Magento/Braintree/Controller/Paypal/Review.php
-index ca252aabe54..2923db6fa88 100644
---- a/app/code/Magento/Braintree/Controller/Paypal/Review.php
-+++ b/app/code/Magento/Braintree/Controller/Paypal/Review.php
-@@ -12,17 +12,25 @@ use Magento\Framework\Controller\ResultFactory;
- use Magento\Braintree\Gateway\Config\PayPal\Config;
- use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
- use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Payment\Model\Method\Logger;
- 
- /**
-  * Class Review
-  */
--class Review extends AbstractAction
-+class Review extends AbstractAction implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * @var QuoteUpdater
-      */
-     private $quoteUpdater;
- 
-+    /**
-+     * @var Logger
-+     */
-+    private $logger;
-+
-     /**
-      * @var string
-      */
-@@ -35,15 +43,18 @@ class Review extends AbstractAction
-      * @param Config $config
-      * @param Session $checkoutSession
-      * @param QuoteUpdater $quoteUpdater
-+     * @param Logger $logger
-      */
-     public function __construct(
-         Context $context,
-         Config $config,
-         Session $checkoutSession,
--        QuoteUpdater $quoteUpdater
-+        QuoteUpdater $quoteUpdater,
-+        Logger $logger
-     ) {
-         parent::__construct($context, $config, $checkoutSession);
-         $this->quoteUpdater = $quoteUpdater;
-+        $this->logger = $logger;
-     }
- 
-     /**
-@@ -55,12 +66,13 @@ class Review extends AbstractAction
-             $this->getRequest()->getPostValue('result', '{}'),
-             true
-         );
-+        $this->logger->debug($requestData);
-         $quote = $this->checkoutSession->getQuote();
- 
-         try {
-             $this->validateQuote($quote);
- 
--            if ($this->validateRequestData($requestData)) {
-+            if ($requestData && $this->validateRequestData($requestData)) {
-                 $this->quoteUpdater->execute(
-                     $requestData['nonce'],
-                     $requestData['details'],
-@@ -91,6 +103,8 @@ class Review extends AbstractAction
-     }
- 
-     /**
-+     * Validate request data
-+     *
-      * @param array $requestData
-      * @return boolean
-      */
-diff --git a/app/code/Magento/Braintree/Gateway/Config/Config.php b/app/code/Magento/Braintree/Gateway/Config/Config.php
-index 2089a9646ae..905b802061a 100644
---- a/app/code/Magento/Braintree/Gateway/Config/Config.php
-+++ b/app/code/Magento/Braintree/Gateway/Config/Config.php
-@@ -30,7 +30,6 @@ class Config extends \Magento\Payment\Gateway\Config\Config
-     const KEY_VERIFY_SPECIFIC = 'verify_specific_countries';
-     const VALUE_3DSECURE_ALL = 0;
-     const CODE_3DSECURE = 'three_d_secure';
--    const KEY_KOUNT_MERCHANT_ID = 'kount_id';
-     const FRAUD_PROTECTION = 'fraudprotection';
- 
-     /**
-@@ -173,6 +172,7 @@ class Config extends \Magento\Payment\Gateway\Config\Config
- 
-     /**
-      * Gets value of configured environment.
-+     *
-      * Possible values: production or sandbox.
-      *
-      * @param int|null $storeId
-@@ -183,17 +183,6 @@ class Config extends \Magento\Payment\Gateway\Config\Config
-         return $this->getValue(Config::KEY_ENVIRONMENT, $storeId);
-     }
- 
--    /**
--     * Gets Kount merchant ID.
--     *
--     * @param int|null $storeId
--     * @return string
--     */
--    public function getKountMerchantId($storeId = null)
--    {
--        return $this->getValue(Config::KEY_KOUNT_MERCHANT_ID, $storeId);
--    }
--
-     /**
-      * Gets merchant ID.
-      *
-@@ -217,6 +206,8 @@ class Config extends \Magento\Payment\Gateway\Config\Config
-     }
- 
-     /**
-+     * Returns SDK url.
-+     *
-      * @return string
-      */
-     public function getSdkUrl()
-@@ -224,6 +215,16 @@ class Config extends \Magento\Payment\Gateway\Config\Config
-         return $this->getValue(Config::KEY_SDK_URL);
-     }
- 
-+    /**
-+     * Gets Hosted Fields SDK Url
-+     *
-+     * @return string
-+     */
-+    public function getHostedFieldsSdkUrl(): string
-+    {
-+        return $this->getValue('hosted_fields_sdk_url');
-+    }
-+
-     /**
-      * Checks if fraud protection is enabled.
-      *
-diff --git a/app/code/Magento/Braintree/Gateway/Request/MerchantAccountDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/MerchantAccountDataBuilder.php
-new file mode 100644
-index 00000000000..6dc40e76322
---- /dev/null
-+++ b/app/code/Magento/Braintree/Gateway/Request/MerchantAccountDataBuilder.php
-@@ -0,0 +1,64 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Braintree\Gateway\Request;
-+
-+use Magento\Braintree\Gateway\Config\Config;
-+use Magento\Braintree\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+
-+/**
-+ * Adds Merchant Account ID to the request if it was specified in the configuration.
-+ */
-+class MerchantAccountDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * The merchant account ID used to create a transaction.
-+     * Currency is also determined by merchant account ID.
-+     * If no merchant account ID is specified, Braintree will use your default merchant account.
-+     */
-+    private static $merchantAccountId = 'merchantAccountId';
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * Constructor
-+     *
-+     * @param Config $config
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(Config $config, SubjectReader $subjectReader)
-+    {
-+        $this->config = $config;
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject): array
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $order = $paymentDO->getOrder();
-+
-+        $result = [];
-+        $merchantAccountId = $this->config->getMerchantAccountId($order->getStoreId());
-+        if (!empty($merchantAccountId)) {
-+            $result[self::$merchantAccountId] = $merchantAccountId;
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php
-index a035c84b4ca..4d63ee4125b 100644
---- a/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php
-+++ b/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php
-@@ -49,6 +49,8 @@ class VaultDataBuilder implements BuilderInterface
- 
-         $payment = $paymentDO->getPayment();
-         $data = $payment->getAdditionalInformation();
-+        // the payment token could be stored only if a customer checks the Vault flow on storefront
-+        // see https://developers.braintreepayments.com/guides/paypal/vault/javascript/v2#invoking-the-vault-flow
-         if (!empty($data[VaultConfigProvider::IS_ACTIVE_CODE])) {
-             $result[self::$optionsKey] = [
-                 self::$storeInVaultOnSuccess => true
-diff --git a/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
-index 85a0c644513..fe75ce86cca 100644
---- a/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
-+++ b/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
-@@ -6,8 +6,8 @@
- namespace Magento\Braintree\Gateway\Request;
- 
- use Magento\Braintree\Gateway\Config\Config;
--use Magento\Braintree\Observer\DataAssignObserver;
- use Magento\Braintree\Gateway\SubjectReader;
-+use Magento\Braintree\Observer\DataAssignObserver;
- use Magento\Payment\Gateway\Request\BuilderInterface;
- use Magento\Payment\Helper\Formatter;
- 
-@@ -36,9 +36,8 @@ class PaymentDataBuilder implements BuilderInterface
-     const PAYMENT_METHOD_NONCE = 'paymentMethodNonce';
- 
-     /**
--     * The merchant account ID used to create a transaction.
--     * Currency is also determined by merchant account ID.
--     * If no merchant account ID is specified, Braintree will use your default merchant account.
-+     * @deprecated
-+     * @see \Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder
-      */
-     const MERCHANT_ACCOUNT_ID = 'merchantAccountId';
- 
-@@ -47,25 +46,18 @@ class PaymentDataBuilder implements BuilderInterface
-      */
-     const ORDER_ID = 'orderId';
- 
--    /**
--     * @var Config
--     */
--    private $config;
--
-     /**
-      * @var SubjectReader
-      */
-     private $subjectReader;
- 
-     /**
--     * Constructor
--     *
-      * @param Config $config
-      * @param SubjectReader $subjectReader
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(Config $config, SubjectReader $subjectReader)
-     {
--        $this->config = $config;
-         $this->subjectReader = $subjectReader;
-     }
- 
-@@ -87,11 +79,6 @@ class PaymentDataBuilder implements BuilderInterface
-             self::ORDER_ID => $order->getOrderIncrementId()
-         ];
- 
--        $merchantAccountId = $this->config->getMerchantAccountId($order->getStoreId());
--        if (!empty($merchantAccountId)) {
--            $result[self::MERCHANT_ACCOUNT_ID] = $merchantAccountId;
--        }
--
-         return $result;
-     }
- }
-diff --git a/app/code/Magento/Braintree/Gateway/Request/VaultCaptureDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/VaultCaptureDataBuilder.php
-index 4280663178e..950634ba2d9 100644
---- a/app/code/Magento/Braintree/Gateway/Request/VaultCaptureDataBuilder.php
-+++ b/app/code/Magento/Braintree/Gateway/Request/VaultCaptureDataBuilder.php
-@@ -6,6 +6,8 @@
- namespace Magento\Braintree\Gateway\Request;
- 
- use Magento\Braintree\Gateway\SubjectReader;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Payment\Gateway\Command\CommandException;
- use Magento\Payment\Gateway\Request\BuilderInterface;
- use Magento\Payment\Helper\Formatter;
- 
-@@ -41,6 +43,9 @@ class VaultCaptureDataBuilder implements BuilderInterface
-         $payment = $paymentDO->getPayment();
-         $extensionAttributes = $payment->getExtensionAttributes();
-         $paymentToken = $extensionAttributes->getVaultPaymentToken();
-+        if ($paymentToken === null) {
-+            throw new CommandException(__('The Payment Token is not available to perform the request.'));
-+        }
-         return [
-             'amount' => $this->formatPrice($this->subjectReader->readAmount($buildSubject)),
-             'paymentMethodToken' => $paymentToken->getGatewayToken()
-diff --git a/app/code/Magento/Braintree/Gateway/Request/VaultThreeDSecureDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/VaultThreeDSecureDataBuilder.php
-new file mode 100644
-index 00000000000..5441067b9d8
---- /dev/null
-+++ b/app/code/Magento/Braintree/Gateway/Request/VaultThreeDSecureDataBuilder.php
-@@ -0,0 +1,55 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Braintree\Gateway\Request;
-+
-+use Magento\Braintree\Gateway\SubjectReader;
-+use Magento\Payment\Gateway\Request\BuilderInterface;
-+
-+/**
-+ * Since we can't validate 3Dsecure for sequence multishipping orders based on vault tokens,
-+ * we skip 3D secure verification for vault transactions.
-+ * For common vault transaction original 3d secure verification builder is called.
-+ */
-+class VaultThreeDSecureDataBuilder implements BuilderInterface
-+{
-+    /**
-+     * @var ThreeDSecureDataBuilder
-+     */
-+    private $threeDSecureDataBuilder;
-+
-+    /**
-+     * @var SubjectReader
-+     */
-+    private $subjectReader;
-+
-+    /**
-+     * Constructor
-+     *
-+     * @param ThreeDSecureDataBuilder $threeDSecureDataBuilder
-+     * @param SubjectReader $subjectReader
-+     */
-+    public function __construct(
-+        ThreeDSecureDataBuilder $threeDSecureDataBuilder,
-+        SubjectReader $subjectReader
-+    ) {
-+        $this->threeDSecureDataBuilder = $threeDSecureDataBuilder;
-+        $this->subjectReader = $subjectReader;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function build(array $buildSubject)
-+    {
-+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
-+        $payment = $paymentDO->getPayment();
-+        if ($payment->getAdditionalInformation('is_multishipping')) {
-+            return [];
-+        }
-+
-+        return $this->threeDSecureDataBuilder->build($buildSubject);
-+    }
-+}
-diff --git a/app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php b/app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php
-index 167fcb1569c..58ce33305da 100644
---- a/app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php
-+++ b/app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php
-@@ -38,6 +38,14 @@ class ErrorCodeProvider
-             $result[] = $error->code;
-         }
- 
-+        if (isset($response->transaction) && $response->transaction->status === 'gateway_rejected') {
-+            $result[] = $response->transaction->gatewayRejectionReason;
-+        }
-+
-+        if (isset($response->transaction) && $response->transaction->status === 'processor_declined') {
-+            $result[] = $response->transaction->processorResponseCode;
-+        }
-+
-         return $result;
-     }
- }
-diff --git a/app/code/Magento/Braintree/Model/LocaleResolver.php b/app/code/Magento/Braintree/Model/LocaleResolver.php
-index cebd90dffc7..47fc7b2acf4 100644
---- a/app/code/Magento/Braintree/Model/LocaleResolver.php
-+++ b/app/code/Magento/Braintree/Model/LocaleResolver.php
-@@ -8,6 +8,9 @@ namespace Magento\Braintree\Model;
- use Magento\Framework\Locale\ResolverInterface;
- use Magento\Braintree\Gateway\Config\PayPal\Config;
- 
-+/**
-+ * Resolves locale for PayPal Express.
-+ */
- class LocaleResolver implements ResolverInterface
- {
-     /**
-@@ -20,6 +23,17 @@ class LocaleResolver implements ResolverInterface
-      */
-     private $config;
- 
-+    /**
-+     * Mapping Magento locales on PayPal locales.
-+     *
-+     * @var array
-+     */
-+    private $localeMap = [
-+        'zh_Hans_CN' => 'zh_CN',
-+        'zh_Hant_HK' => 'zh_HK',
-+        'zh_Hant_TW' => 'zh_TW'
-+    ];
-+
-     /**
-      * @param ResolverInterface $resolver
-      * @param Config $config
-@@ -66,10 +80,11 @@ class LocaleResolver implements ResolverInterface
-      * Gets store's locale or the `en_US` locale if store's locale does not supported by PayPal.
-      *
-      * @return string
-+     * @see https://braintree.github.io/braintree-web/current/PayPalCheckout.html#createPayment
-      */
-     public function getLocale()
-     {
--        $locale = $this->resolver->getLocale();
-+        $locale = $this->localeMap[$this->resolver->getLocale()] ?? $this->resolver->getLocale();
-         $allowedLocales = $this->config->getValue('supported_locales');
- 
-         return strpos($allowedLocales, $locale) !== false ? $locale : 'en_US';
-diff --git a/app/code/Magento/Braintree/Model/Multishipping/PlaceOrder.php b/app/code/Magento/Braintree/Model/Multishipping/PlaceOrder.php
-new file mode 100644
-index 00000000000..a95d7a922f9
---- /dev/null
-+++ b/app/code/Magento/Braintree/Model/Multishipping/PlaceOrder.php
-@@ -0,0 +1,182 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Braintree\Model\Multishipping;
-+
-+use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
-+use Magento\Braintree\Gateway\Config\Config;
-+use Magento\Braintree\Model\Ui\ConfigProvider;
-+use Magento\Braintree\Observer\DataAssignObserver;
-+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider as PaypalConfigProvider;
-+use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderInterface;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
-+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
-+use Magento\Sales\Api\Data\OrderPaymentInterface;
-+use Magento\Sales\Api\OrderManagementInterface;
-+use Magento\Vault\Api\Data\PaymentTokenInterface;
-+
-+/**
-+ * Order payments processing for multishipping checkout flow.
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class PlaceOrder implements PlaceOrderInterface
-+{
-+    /**
-+     * @var OrderManagementInterface
-+     */
-+    private $orderManagement;
-+
-+    /**
-+     * @var OrderPaymentExtensionInterfaceFactory
-+     */
-+    private $paymentExtensionFactory;
-+
-+    /**
-+     * @var GetPaymentNonceCommand
-+     */
-+    private $getPaymentNonceCommand;
-+
-+    /**
-+     * @param OrderManagementInterface $orderManagement
-+     * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory
-+     * @param GetPaymentNonceCommand $getPaymentNonceCommand
-+     */
-+    public function __construct(
-+        OrderManagementInterface $orderManagement,
-+        OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory,
-+        GetPaymentNonceCommand $getPaymentNonceCommand
-+    ) {
-+        $this->orderManagement = $orderManagement;
-+        $this->paymentExtensionFactory = $paymentExtensionFactory;
-+        $this->getPaymentNonceCommand = $getPaymentNonceCommand;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function place(array $orderList): array
-+    {
-+        if (empty($orderList)) {
-+            return [];
-+        }
-+
-+        $errorList = [];
-+        $firstOrder = $this->orderManagement->place(array_shift($orderList));
-+        // get payment token from first placed order
-+        $paymentToken = $this->getPaymentToken($firstOrder);
-+
-+        foreach ($orderList as $order) {
-+            try {
-+                /** @var OrderInterface $order */
-+                $orderPayment = $order->getPayment();
-+                $this->setVaultPayment($orderPayment, $paymentToken);
-+                $this->orderManagement->place($order);
-+            } catch (\Exception $e) {
-+                $incrementId = $order->getIncrementId();
-+                $errorList[$incrementId] = $e;
-+            }
-+        }
-+
-+        return $errorList;
-+    }
-+
-+    /**
-+     * Sets vault payment method.
-+     *
-+     * @param OrderPaymentInterface $orderPayment
-+     * @param PaymentTokenInterface $paymentToken
-+     * @return void
-+     */
-+    private function setVaultPayment(OrderPaymentInterface $orderPayment, PaymentTokenInterface $paymentToken): void
-+    {
-+        $vaultMethod = $this->getVaultPaymentMethod(
-+            $orderPayment->getMethod()
-+        );
-+        $orderPayment->setMethod($vaultMethod);
-+
-+        $publicHash = $paymentToken->getPublicHash();
-+        $customerId = $paymentToken->getCustomerId();
-+        $result = $this->getPaymentNonceCommand->execute(
-+            ['public_hash' => $publicHash, 'customer_id' => $customerId]
-+        )
-+            ->get();
-+
-+        $orderPayment->setAdditionalInformation(
-+            DataAssignObserver::PAYMENT_METHOD_NONCE,
-+            $result['paymentMethodNonce']
-+        );
-+        $orderPayment->setAdditionalInformation(
-+            PaymentTokenInterface::PUBLIC_HASH,
-+            $publicHash
-+        );
-+        $orderPayment->setAdditionalInformation(
-+            PaymentTokenInterface::CUSTOMER_ID,
-+            $customerId
-+        );
-+        $orderPayment->setAdditionalInformation(
-+            'is_multishipping',
-+            1
-+        );
-+    }
-+
-+    /**
-+     * Returns vault payment method.
-+     *
-+     * For placing sequence of orders, we need to replace the original method on the vault method.
-+     *
-+     * @param string $method
-+     * @return string
-+     */
-+    private function getVaultPaymentMethod(string $method): string
-+    {
-+        $vaultPaymentMap = [
-+            ConfigProvider::CODE => ConfigProvider::CC_VAULT_CODE,
-+            PaypalConfigProvider::PAYPAL_CODE => PaypalConfigProvider::PAYPAL_VAULT_CODE
-+        ];
-+
-+        return $vaultPaymentMap[$method] ?? $method;
-+    }
-+
-+    /**
-+     * Returns payment token.
-+     *
-+     * @param OrderInterface $order
-+     * @return PaymentTokenInterface
-+     * @throws \BadMethodCallException
-+     */
-+    private function getPaymentToken(OrderInterface $order): PaymentTokenInterface
-+    {
-+        $orderPayment = $order->getPayment();
-+        $extensionAttributes = $this->getExtensionAttributes($orderPayment);
-+        $paymentToken = $extensionAttributes->getVaultPaymentToken();
-+
-+        if ($paymentToken === null) {
-+            throw new \BadMethodCallException('Vault Payment Token should be defined for placed order payment.');
-+        }
-+
-+        return $paymentToken;
-+    }
-+
-+    /**
-+     * Gets payment extension attributes.
-+     *
-+     * @param OrderPaymentInterface $payment
-+     * @return OrderPaymentExtensionInterface
-+     */
-+    private function getExtensionAttributes(OrderPaymentInterface $payment): OrderPaymentExtensionInterface
-+    {
-+        $extensionAttributes = $payment->getExtensionAttributes();
-+        if (null === $extensionAttributes) {
-+            $extensionAttributes = $this->paymentExtensionFactory->create();
-+            $payment->setExtensionAttributes($extensionAttributes);
-+        }
-+
-+        return $extensionAttributes;
-+    }
-+}
-diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php b/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
-index 6c4332ef22a..314404c7993 100644
---- a/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
-+++ b/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
-@@ -6,14 +6,15 @@
- 
- namespace Magento\Braintree\Model\Paypal\Helper;
- 
--use Magento\Quote\Model\Quote;
-+use Magento\Braintree\Model\Paypal\OrderCancellationService;
-+use Magento\Checkout\Api\AgreementsValidatorInterface;
- use Magento\Checkout\Helper\Data;
-+use Magento\Checkout\Model\Type\Onepage;
- use Magento\Customer\Model\Group;
- use Magento\Customer\Model\Session;
--use Magento\Checkout\Model\Type\Onepage;
--use Magento\Quote\Api\CartManagementInterface;
- use Magento\Framework\Exception\LocalizedException;
--use Magento\Checkout\Api\AgreementsValidatorInterface;
-+use Magento\Quote\Api\CartManagementInterface;
-+use Magento\Quote\Model\Quote;
- 
- /**
-  * Class OrderPlace
-@@ -42,23 +43,29 @@ class OrderPlace extends AbstractHelper
-     private $checkoutHelper;
- 
-     /**
--     * Constructor
--     *
-+     * @var OrderCancellationService
-+     */
-+    private $orderCancellationService;
-+
-+    /**
-      * @param CartManagementInterface $cartManagement
-      * @param AgreementsValidatorInterface $agreementsValidator
-      * @param Session $customerSession
-      * @param Data $checkoutHelper
-+     * @param OrderCancellationService $orderCancellationService
-      */
-     public function __construct(
-         CartManagementInterface $cartManagement,
-         AgreementsValidatorInterface $agreementsValidator,
-         Session $customerSession,
--        Data $checkoutHelper
-+        Data $checkoutHelper,
-+        OrderCancellationService $orderCancellationService
-     ) {
-         $this->cartManagement = $cartManagement;
-         $this->agreementsValidator = $agreementsValidator;
-         $this->customerSession = $customerSession;
-         $this->checkoutHelper = $checkoutHelper;
-+        $this->orderCancellationService = $orderCancellationService;
-     }
- 
-     /**
-@@ -67,7 +74,7 @@ class OrderPlace extends AbstractHelper
-      * @param Quote $quote
-      * @param array $agreement
-      * @return void
--     * @throws LocalizedException
-+     * @throws \Exception
-      */
-     public function execute(Quote $quote, array $agreement)
-     {
-@@ -84,7 +91,12 @@ class OrderPlace extends AbstractHelper
-         $this->disabledQuoteAddressValidation($quote);
- 
-         $quote->collectTotals();
--        $this->cartManagement->placeOrder($quote->getId());
-+        try {
-+            $this->cartManagement->placeOrder($quote->getId());
-+        } catch (\Exception $e) {
-+            $this->orderCancellationService->execute($quote->getReservedOrderId());
-+            throw $e;
-+        }
-     }
- 
-     /**
-diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php b/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
-index fe589554154..197b398380f 100644
---- a/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
-+++ b/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
-@@ -123,8 +123,8 @@ class QuoteUpdater extends AbstractHelper
-     {
-         $shippingAddress = $quote->getShippingAddress();
- 
--        $shippingAddress->setLastname($details['lastName']);
--        $shippingAddress->setFirstname($details['firstName']);
-+        $shippingAddress->setLastname($this->getShippingRecipientLastName($details));
-+        $shippingAddress->setFirstname($this->getShippingRecipientFirstName($details));
-         $shippingAddress->setEmail($details['email']);
- 
-         $shippingAddress->setCollectShippingRates(true);
-@@ -148,7 +148,7 @@ class QuoteUpdater extends AbstractHelper
-     {
-         $billingAddress = $quote->getBillingAddress();
- 
--        if ($this->config->isRequiredBillingAddress()) {
-+        if ($this->config->isRequiredBillingAddress() && !empty($details['billingAddress'])) {
-             $this->updateAddressData($billingAddress, $details['billingAddress']);
-         } else {
-             $this->updateAddressData($billingAddress, $details['shippingAddress']);
-@@ -173,14 +173,14 @@ class QuoteUpdater extends AbstractHelper
-      */
-     private function updateAddressData(Address $address, array $addressData)
-     {
--        $extendedAddress = isset($addressData['extendedAddress'])
--            ? $addressData['extendedAddress']
-+        $extendedAddress = isset($addressData['line2'])
-+            ? $addressData['line2']
-             : null;
- 
--        $address->setStreet([$addressData['streetAddress'], $extendedAddress]);
--        $address->setCity($addressData['locality']);
--        $address->setRegionCode($addressData['region']);
--        $address->setCountryId($addressData['countryCodeAlpha2']);
-+        $address->setStreet([$addressData['line1'], $extendedAddress]);
-+        $address->setCity($addressData['city']);
-+        $address->setRegionCode($addressData['state']);
-+        $address->setCountryId($addressData['countryCode']);
-         $address->setPostcode($addressData['postalCode']);
- 
-         // PayPal's address supposes not saving against customer account
-@@ -188,4 +188,30 @@ class QuoteUpdater extends AbstractHelper
-         $address->setSameAsBilling(false);
-         $address->setCustomerAddressId(null);
-     }
-+
-+    /**
-+     * Returns shipping recipient first name.
-+     *
-+     * @param array $details
-+     * @return string
-+     */
-+    private function getShippingRecipientFirstName(array $details)
-+    {
-+        return isset($details['shippingAddress']['recipientName'])
-+            ? explode(' ', $details['shippingAddress']['recipientName'], 2)[0]
-+            : $details['firstName'];
-+    }
-+
-+    /**
-+     * Returns shipping recipient last name.
-+     *
-+     * @param array $details
-+     * @return string
-+     */
-+    private function getShippingRecipientLastName(array $details)
-+    {
-+        return isset($details['shippingAddress']['recipientName'])
-+            ? explode(' ', $details['shippingAddress']['recipientName'], 2)[1]
-+            : $details['lastName'];
-+    }
- }
-diff --git a/app/code/Magento/Braintree/Model/Paypal/OrderCancellationService.php b/app/code/Magento/Braintree/Model/Paypal/OrderCancellationService.php
-new file mode 100644
-index 00000000000..29757e35ea6
---- /dev/null
-+++ b/app/code/Magento/Braintree/Model/Paypal/OrderCancellationService.php
-@@ -0,0 +1,77 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Braintree\Model\Paypal;
-+
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+
-+/**
-+ * The service to cancel an order and void authorization transaction.
-+ */
-+class OrderCancellationService
-+{
-+    /**
-+     * @var OrderRepositoryInterface
-+     */
-+    private $orderRepository;
-+
-+    /**
-+     * @var SearchCriteriaBuilder
-+     */
-+    private $searchCriteriaBuilder;
-+
-+    /**
-+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
-+     * @param OrderRepositoryInterface $orderRepository
-+     */
-+    public function __construct(
-+        SearchCriteriaBuilder $searchCriteriaBuilder,
-+        OrderRepositoryInterface $orderRepository
-+    ) {
-+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-+        $this->orderRepository = $orderRepository;
-+    }
-+
-+    /**
-+     * Cancels an order and authorization transaction.
-+     *
-+     * @param string $incrementId
-+     * @return bool
-+     */
-+    public function execute(string $incrementId): bool
-+    {
-+        $order = $this->getOrder($incrementId);
-+        if ($order === null) {
-+            return false;
-+        }
-+
-+        // `\Magento\Sales\Model\Service\OrderService::cancel` cannot be used for cancellation as the service uses
-+        // the order repository with outdated payment method instance (ex. contains Vault instead of Braintree)
-+        $order->cancel();
-+        $this->orderRepository->save($order);
-+        return true;
-+    }
-+
-+    /**
-+     * Gets order by increment ID.
-+     *
-+     * @param string $incrementId
-+     * @return OrderInterface|null
-+     */
-+    private function getOrder(string $incrementId)
-+    {
-+        $searchCriteria = $this->searchCriteriaBuilder->addFilter(OrderInterface::INCREMENT_ID, $incrementId)
-+            ->create();
-+
-+        $items = $this->orderRepository->getList($searchCriteria)
-+            ->getItems();
-+
-+        return array_pop($items);
-+    }
-+}
-diff --git a/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
-index 928769498a0..ab23037b4e9 100644
---- a/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
-+++ b/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
-@@ -13,6 +13,8 @@ use Magento\Framework\Session\SessionManagerInterface;
- 
- /**
-  * Class ConfigProvider
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class ConfigProvider implements ConfigProviderInterface
- {
-@@ -72,11 +74,11 @@ class ConfigProvider implements ConfigProviderInterface
-                     'clientToken' => $this->getClientToken(),
-                     'ccTypesMapper' => $this->config->getCcTypesMapper(),
-                     'sdkUrl' => $this->config->getSdkUrl(),
-+                    'hostedFieldsSdkUrl' => $this->config->getHostedFieldsSdkUrl(),
-                     'countrySpecificCardTypes' => $this->config->getCountrySpecificCardTypeConfig($storeId),
-                     'availableCardTypes' => $this->config->getAvailableCardTypes($storeId),
-                     'useCvv' => $this->config->isCvvEnabled($storeId),
-                     'environment' => $this->config->getEnvironment($storeId),
--                    'kountMerchantId' => $this->config->getKountMerchantId($storeId),
-                     'hasFraudProtection' => $this->config->hasFraudProtection($storeId),
-                     'merchantId' => $this->config->getMerchantId($storeId),
-                     'ccVaultCode' => self::CC_VAULT_CODE,
-@@ -92,6 +94,7 @@ class ConfigProvider implements ConfigProviderInterface
- 
-     /**
-      * Generate a new client token if necessary
-+     *
-      * @return string
-      */
-     public function getClientToken()
-diff --git a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
-index e06b913db8e..e6c5ee22c62 100644
---- a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
-+++ b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
-@@ -47,6 +47,8 @@ class ConfigProvider implements ConfigProviderInterface
-      */
-     public function getConfig()
-     {
-+        $requireBillingAddressAll = \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
-+        
-         return [
-             'payment' => [
-                 self::PAYPAL_CODE => [
-@@ -60,6 +62,8 @@ class ConfigProvider implements ConfigProviderInterface
-                     'vaultCode' => self::PAYPAL_VAULT_CODE,
-                     'skipOrderReview' => $this->config->isSkipOrderReview(),
-                     'paymentIcon' => $this->config->getPayPalIcon(),
-+                    'isRequiredBillingAddress' =>
-+                        (int)$this->config->isRequiredBillingAddress() === $requireBillingAddressAll
-                 ]
-             ]
-         ];
-diff --git a/app/code/Magento/Braintree/Plugin/OrderCancellation.php b/app/code/Magento/Braintree/Plugin/OrderCancellation.php
-new file mode 100644
-index 00000000000..90c72839d97
---- /dev/null
-+++ b/app/code/Magento/Braintree/Plugin/OrderCancellation.php
-@@ -0,0 +1,81 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Braintree\Plugin;
-+
-+use Magento\Braintree\Model\Paypal\OrderCancellationService;
-+use Magento\Braintree\Model\Ui\ConfigProvider;
-+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider as PayPalConfigProvider;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Quote\Api\CartManagementInterface;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Api\Data\PaymentInterface;
-+
-+/**
-+ * Cancels an order and an authorization transaction.
-+ */
-+class OrderCancellation
-+{
-+    /**
-+     * @var OrderCancellationService
-+     */
-+    private $orderCancellationService;
-+
-+    /**
-+     * @var CartRepositoryInterface
-+     */
-+    private $quoteRepository;
-+
-+    /**
-+     * @param OrderCancellationService $orderCancellationService
-+     * @param CartRepositoryInterface $quoteRepository
-+     */
-+    public function __construct(
-+        OrderCancellationService $orderCancellationService,
-+        CartRepositoryInterface $quoteRepository
-+    ) {
-+        $this->orderCancellationService = $orderCancellationService;
-+        $this->quoteRepository = $quoteRepository;
-+    }
-+
-+    /**
-+     * Cancels an order if an exception occurs during the order creation.
-+     *
-+     * @param CartManagementInterface $subject
-+     * @param \Closure $proceed
-+     * @param int $cartId
-+     * @param PaymentInterface $payment
-+     * @return int
-+     * @throws \Exception
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function aroundPlaceOrder(
-+        CartManagementInterface $subject,
-+        \Closure $proceed,
-+        $cartId,
-+        PaymentInterface $payment = null
-+    ) {
-+        try {
-+            return $proceed($cartId, $payment);
-+        } catch (\Exception $e) {
-+            $quote = $this->quoteRepository->get((int) $cartId);
-+            $payment = $quote->getPayment();
-+            $paymentCodes = [
-+                ConfigProvider::CODE,
-+                ConfigProvider::CC_VAULT_CODE,
-+                PayPalConfigProvider::PAYPAL_CODE,
-+                PayPalConfigProvider::PAYPAL_VAULT_CODE
-+            ];
-+            if (in_array($payment->getMethod(), $paymentCodes)) {
-+                $incrementId = $quote->getReservedOrderId();
-+                $this->orderCancellationService->execute($incrementId);
-+            }
-+
-+            throw $e;
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
-new file mode 100644
-index 00000000000..ce1d0a9aecc
---- /dev/null
-+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
-@@ -0,0 +1,42 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOrderBraintreeFillActionGroup">
-+        <!--Select Braintree Payment method on Admin Order Create Page-->
-+        <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
-+        <waitForPageLoad stepKey="waitForBraintreeConfigs"/>
-+        <click stepKey="openCardTypes" selector="{{NewOrderSection.openCardTypes}}"/>
-+        <waitForPageLoad stepKey="waitForCardTypes"/>
-+        <click stepKey="chooseCardType" selector="{{NewOrderSection.masterCard}}"/>
-+        <waitForPageLoad stepKey="waitForCardSelected"/>
-+
-+        <!--Choose Master Card from drop-down list-->
-+        <switchToIFrame stepKey="switchToCardNumber" selector="{{NewOrderSection.cardFrame}}"/>
-+        <waitForElementVisible selector="{{NewOrderSection.creditCardNumber}}" stepKey="waitForFillCardNumber"/>
-+        <fillField stepKey="fillCardNumber" selector="{{NewOrderSection.creditCardNumber}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
-+        <switchToIFrame stepKey="switchBackFromCard"/>
-+
-+        <!--Fill expire date-->
-+        <switchToIFrame stepKey="switchToExpirationMonth" selector="{{NewOrderSection.monthFrame}}"/>
-+        <waitForElementVisible selector="{{NewOrderSection.expirationMonth}}" stepKey="waitForFillMonth"/>
-+        <fillField stepKey="fillMonth" selector="{{NewOrderSection.expirationMonth}}" userInput="{{PaymentAndShippingInfo.month}}"/>
-+        <switchToIFrame stepKey="switchBackFromMonth"/>
-+        <switchToIFrame stepKey="switchToExpirationYear" selector="{{NewOrderSection.yearFrame}}"/>
-+        <waitForElementVisible selector="{{NewOrderSection.expirationYear}}" stepKey="waitForFillYear"/>
-+        <fillField stepKey="fillYear" selector="{{NewOrderSection.expirationYear}}" userInput="{{PaymentAndShippingInfo.year}}"/>
-+        <switchToIFrame stepKey="switchBackFromYear"/>
-+
-+        <!--Fill CVW code-->
-+        <switchToIFrame stepKey="switchToCVV" selector="{{NewOrderSection.cvvFrame}}"/>
-+        <waitForElementVisible selector="{{NewOrderSection.cvv}}" stepKey="waitForFillCVV"/>
-+        <fillField stepKey="fillCVV" selector="{{NewOrderSection.cvv}}" userInput="{{PaymentAndShippingInfo.cvv}}"/>
-+        <switchToIFrame stepKey="switchBackFromCVV"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
-index e86d5403e11..09ac0b77f86 100644
---- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
-@@ -5,9 +5,9 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
- 
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="GoToUserRoles">
-         <click selector="#menu-magento-backend-system" stepKey="clickOnSystemIcon"/>
-         <waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
-@@ -16,7 +16,7 @@
-     </actionGroup>
- 
-     <!--Create new role-->
--    <actionGroup name="AdminCreateRole">
-+    <actionGroup name="AdminCreateNewRole">
-         <arguments>
-             <argument name="role" type="string" defaultValue=""/>
-             <argument name="resource" type="string" defaultValue="All"/>
-@@ -34,7 +34,6 @@
-         <see userInput="You saved the role." stepKey="seeSuccessMessage" />
-     </actionGroup>
- 
--
-     <!--Delete role-->
-     <actionGroup name="AdminDeleteRoleActionGroup">
-         <arguments>
-@@ -48,4 +47,4 @@
-         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
-         <see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
-     </actionGroup>
--</actionGroups>
-\ No newline at end of file
-+</actionGroups>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
-index 23c32208377..d530f8e9f68 100644
---- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
-@@ -5,9 +5,9 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
- 
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Go to all users-->
-     <actionGroup name="GoToAllUsers">
-         <click selector="{{AdminCreateUserSection.system}}" stepKey="clickOnSystemIcon"/>
-@@ -38,19 +38,4 @@
-         <waitForPageLoad stepKey="waitForSaveUser" time="10"/>
-         <see userInput="You saved the user." stepKey="seeSuccessMessage" />
-     </actionGroup>
--
--
--    <!--Delete User-->
--    <actionGroup name="AdminDeleteUserActionGroup">
--
--        <click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser}}"/>
--        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
--        <scrollToTopOfPage stepKey="scrollToTop"/>
--        <click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
--        <waitForPageLoad stepKey="waitForDeletePopupOpen" time="5"/>
--        <click stepKey="clickToConfirm" selector="{{AdminDeleteUserSection.confirm}}"/>
--        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
--        <see userInput="You deleted the user." stepKey="seeSuccessMessage" />
--    </actionGroup>
--
- </actionGroups>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
-index 27e2039fe52..f2c050006d0 100644
---- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
-@@ -6,13 +6,13 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
--
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Skip by MQE-1576 -->
-     <actionGroup name="ConfigureBraintree">
-         <!-- GoTo ConfigureBraintree fields -->
-         <click stepKey="clickOnSTORES" selector="{{AdminMenuSection.stores}}"/>
-         <waitForPageLoad stepKey="waitForConfiguration" time="2"/>
--        <click stepKey="clickOnConfigurations" selector="{{StoresSubmenuSection.configuration}}" />
-+        <click stepKey="clickOnConfigurations" selector="{{AdminMenuSection.configuration}}" />
-         <waitForPageLoad stepKey="waitForSales" time="2"/>
-         <click stepKey="clickOnSales" selector="{{ConfigurationListSection.sales}}" />
-         <waitForPageLoad stepKey="waitForPaymentMethods" time="2"/>
-@@ -46,4 +46,8 @@
-         <waitForElementVisible selector="{{BraintreeConfiguraionSection.successfulMessage}}" stepKey="waitForSuccessfullyConfigured" time="10"/>
-     </actionGroup>
- 
--</actionGroups>
-\ No newline at end of file
-+    <actionGroup name="DisableBrainTree">
-+        <magentoCLI stepKey="disableBrainTree" command="config:set payment/braintree/active 0"/>
-+        <magentoCLI stepKey="disableBrainTreePaypal" command="config:set payment/braintree_paypal/active 0"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
-deleted file mode 100644
-index a68042127ec..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
-+++ /dev/null
-@@ -1,44 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
--    <actionGroup name="CreateCustomerActionGroup">
--        <click stepKey="openCustomers" selector="{{AdminMenuSection.customers}}"/>
--        <waitForAjaxLoad stepKey="waitForCatalogSubmenu" time="5"/>
--        <click stepKey="clickOnAllCustomers" selector="{{CustomersSubmenuSection.allCustomers}}"/>
--        <waitForPageLoad stepKey="waitForProductsPage" time="10"/>
--        <click stepKey="addNewCustomer" selector="{{CustomersPageSection.addNewCustomerButton}}"/>
--        <waitForPageLoad stepKey="waitForNewProductPage" time="10"/>
--        <click stepKey="AssociateToWebsite" selector="{{NewCustomerPageSection.associateToWebsite}}"/>
--        <click stepKey="Group" selector="{{NewCustomerPageSection.group}}"/>
--        <fillField stepKey="FillFirstName" selector="{{NewCustomerPageSection.firstName}}" userInput="{{NewCustomerData.FirstName}}"/>
--        <fillField stepKey="FillLastName" selector="{{NewCustomerPageSection.lastName}}" userInput="{{NewCustomerData.LastName}}"/>
--        <fillField stepKey="FillEmail" selector="{{NewCustomerPageSection.email}}" userInput="{{NewCustomerData.Email}}"/>
--        <scrollToTopOfPage stepKey="scrollToAddresses"/>
--        <click stepKey="goToAddresses" selector="{{NewCustomerPageSection.addresses}}"/>
--        <waitForAjaxLoad stepKey="waitForAddresses" time="5"/>
--        <click stepKey="AddNewAddress" selector="{{NewCustomerPageSection.addNewAddress}}"/>
--        <waitForPageLoad stepKey="waitForAddressFields" time="5"/>
--        <click stepKey="thickBillingAddress" selector="{{NewCustomerPageSection.defaultBillingAddress}}"/>
--        <click stepKey="thickShippingAddress" selector="{{NewCustomerPageSection.defaultShippingAddress}}"/>
--        <fillField stepKey="fillFirstNameForAddress" selector="{{NewCustomerPageSection.firstNameForAddress}}" userInput="{{NewCustomerData.AddressFirstName}}"/>
--        <fillField stepKey="fillLastNameForAddress" selector="{{NewCustomerPageSection.lastNameForAddress}}" userInput="{{NewCustomerData.AddressLastName}}"/>
--        <fillField stepKey="fillStreetAddress" selector="{{NewCustomerPageSection.streetAddress}}" userInput="{{NewCustomerData.StreetAddress}}"/>
--        <fillField stepKey="fillCity" selector="{{NewCustomerPageSection.city}}" userInput="{{NewCustomerData.City}}"/>
--        <click stepKey="openCountry" selector="{{NewCustomerPageSection.country}}"/>
--        <waitForAjaxLoad stepKey="waitForCountryList" time="5"/>
--        <click stepKey="chooseCountry" selector="{{NewCustomerPageSection.countryArmenia}}"/>
--        <fillField stepKey="fillZip" selector="{{NewCustomerPageSection.zip}}" userInput="{{NewCustomerData.Zip}}"/>
--        <fillField stepKey="fillPhoneNumber" selector="{{NewCustomerPageSection.phoneNumber}}" userInput="{{NewCustomerData.PhoneNumber}}"/>
--        <waitForPageLoad stepKey="wait" time="10"/>
--        <click stepKey="save" selector="{{NewCustomerPageSection.saveCustomer}}"/>
--        <waitForPageLoad stepKey="waitForCustomersPage" time="10"/>
--        <waitForElementVisible selector="{{NewCustomerPageSection.createdSuccessMessage}}" stepKey="waitForSuccessfullyCreatedMessage" time="20"/>
--
--    </actionGroup>
--</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
-deleted file mode 100644
-index ee7158c2b63..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
-+++ /dev/null
-@@ -1,66 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
--
--    <actionGroup name="CreateNewOrderActionGroup">
--        <click stepKey="createNewOrder" selector="{{NewOrderSection.createNewOrder}}"/>
--        <waitForPageLoad stepKey="waitForCustomersList" time="3"/>
--        <click stepKey="chooseCustomer" selector="{{NewOrderSection.customer}}"/>
--        <waitForPageLoad stepKey="waitForOrderPage" time="3"/>
--        <click stepKey="addProducts" selector="{{NewOrderSection.addProducts}}"/>
--        <waitForPageLoad stepKey="waitForProducts" time="3"/>
--        <click stepKey="chooseProducts" selector="{{NewOrderSection.chooseProduct}}"/>
--        <waitForPageLoad stepKey="waitForProductChoose" time="3"/>
--        <click stepKey="addSelectedProduct" selector="{{NewOrderSection.addSelectedProduct}}"/>
--        <waitForAjaxLoad stepKey="waitForChoose" time="3"/>
--        <click stepKey="openAddresses" selector="{{NewOrderSection.openAddresses}}"/>
--        <click stepKey="chooseAddress" selector="{{NewOrderSection.chooseAddress}}"/>
--        <fillField stepKey="fillState" selector="{{NewOrderSection.state}}" userInput="Yerevan"/>
--        <scrollTo stepKey="scrollTo" selector="#order-methods"/>
--        <waitForPageLoad stepKey="waitForMethods" time="3"/>
--        <click stepKey="startJSMethodExecution" selector="{{NewOrderSection.openShippingMethods}}"/>
--        <waitForPageLoad stepKey="waitForJSMethodExecution" time="3"/>
--        <click stepKey="openShippingMethods" selector="{{NewOrderSection.openShippingMethods}}"/>
--        <waitForPageLoad stepKey="waitForShippingMethods" time="3"/>
--        <click stepKey="chooseShippingMethods" selector="{{NewOrderSection.shippingMethod}}"/>
--        <waitForPageLoad stepKey="waitForShippingMethodChoose" time="4"/>
--        <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
--        <waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
--        <click stepKey="openCardTypes" selector="{{NewOrderSection.openCardTypes}}"/>
--        <waitForPageLoad stepKey="waitForCardTypes" time="3"/>
--        <click stepKey="chooseCardType" selector="{{NewOrderSection.masterCard}}"/>
--        <waitForPageLoad stepKey="waitForCardSelected" time="3"/>
--
--        <switchToIFrame stepKey="switchToCardNumber" selector="{{NewOrderSection.cardFrame}}"/>
--        <fillField stepKey="fillCardNumber" selector="{{NewOrderSection.creditCardNumber}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
--        <waitForPageLoad stepKey="waitForFillCardNumber" time="1"/>
--        <switchToIFrame stepKey="switchBackFromCard"/>
--
--        <switchToIFrame stepKey="switchToExpirationMonth" selector="{{NewOrderSection.monthFrame}}"/>
--        <fillField stepKey="fillMonth" selector="{{NewOrderSection.expirationMonth}}" userInput="{{PaymentAndShippingInfo.month}}"/>
--        <waitForPageLoad stepKey="waitForFillMonth" time="1"/>
--        <switchToIFrame stepKey="switchBackFromMonth"/>
--
--        <switchToIFrame stepKey="switchToExpirationYear" selector="{{NewOrderSection.yearFrame}}"/>
--        <fillField stepKey="fillYear" selector="{{NewOrderSection.expirationYear}}" userInput="{{PaymentAndShippingInfo.year}}"/>
--        <waitForPageLoad stepKey="waitForFillYear" time="1"/>
--        <switchToIFrame stepKey="switchBackFromYear"/>
--
--        <switchToIFrame stepKey="switchToCVV" selector="{{NewOrderSection.cvvFrame}}"/>
--        <fillField stepKey="fillCVV" selector="{{NewOrderSection.cvv}}" userInput="{{PaymentAndShippingInfo.cvv}}"/>
--        <wait stepKey="waitForFillCVV" time="1"/>
--        <switchToIFrame stepKey="switchBackFromCVV"/>
--
--        <click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
--        <waitForPageLoad stepKey="waitForSaveConfig" time="5"/>
--        <waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage" time="1"/>
--
--    </actionGroup>
--
--</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
-deleted file mode 100644
-index 19de3e859ae..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
-+++ /dev/null
-@@ -1,25 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
--    <actionGroup name="CreateNewProductActionGroup">
--
--        <click stepKey="openCatalog" selector="{{AdminMenuSection.catalog}}"/>
--        <waitForPageLoad stepKey="waitForCatalogSubmenu" time="5"/>
--        <click stepKey="clickOnProducts" selector="{{CatalogSubmenuSection.products}}"/>
--        <waitForPageLoad stepKey="waitForProductsPage" time="10"/>
--        <click stepKey="addProduct" selector="{{ProductsPageSection.addProductButton}}"/>
--        <waitForPageLoad stepKey="waitForNewProductPage" time="10"/>
--        <fillField stepKey="FillProductName" selector="{{NewProductPageSection.productName}}" userInput="{{NewProductData.ProductName}}"/>
--        <fillField stepKey="FillPrice" selector="{{NewProductPageSection.price}}" userInput="{{NewProductData.Price}}"/>
--        <fillField stepKey="FillQuantity" selector="{{NewProductPageSection.quantity}}" userInput="{{NewProductData.Quantity}}"/>
--        <click stepKey="Save" selector="{{NewProductPageSection.saveButton}}"/>
--        <waitForElementVisible stepKey="waitForSuccessfullyCreatedMessage" selector="{{NewProductPageSection.createdSuccessMessage}}" time="10"/>
--        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
--    </actionGroup>
--</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
-deleted file mode 100644
-index 65eddc0d9e5..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
-+++ /dev/null
-@@ -1,28 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
--    <actionGroup name="DeleteCustomerActionGroup">
--        <arguments>
--            <argument name="lastName" defaultValue=""/>
--        </arguments>
--        <click stepKey="openCustomers" selector="{{AdminMenuSection.customers}}"/>
--        <waitForPageLoad stepKey="waitForCatalogSubmenu" time="10"/>
--        <click stepKey="clickOnAllCustomers" selector="{{CustomersSubmenuSection.allCustomers}}"/>
--        <waitForPageLoad stepKey="waitForProductsPage" time="10"/>
--        <click stepKey="chooseCustomer" selector="{{CustomersPageSection.customerCheckbox(lastName)}}"/>
--        <waitForAjaxLoad stepKey="waitForThick" time="2"/>
--        <click stepKey="OpenActions" selector="{{CustomersPageSection.actions}}"/>
--        <waitForAjaxLoad stepKey="waitForDelete" time="5"/>
--        <click stepKey="ChooseDelete" selector="{{CustomersPageSection.delete}}"/>
--        <waitForPageLoad stepKey="waitForDeleteItemPopup" time="10"/>
--        <click stepKey="clickOnOk" selector="{{CustomersPageSection.ok}}"/>
--        <waitForElementVisible stepKey="waitForSuccessfullyDeletedMessage" selector="{{CustomersPageSection.deletedSuccessMessage}}" time="10"/>
--
--    </actionGroup>
--</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
-deleted file mode 100644
-index 724c6d92846..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
-+++ /dev/null
-@@ -1,26 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
--    <actionGroup name="DeleteProductActionGroup">
--        <arguments>
--            <argument name="productName" defaultValue=""/>
--        </arguments>
--        <click stepKey="openCatalog" selector="{{AdminMenuSection.catalog}}"/>
--        <waitForPageLoad stepKey="waitForCatalogSubmenu" time="5"/>
--        <click stepKey="clickOnProducts" selector="{{CatalogSubmenuSection.products}}"/>
--        <waitForPageLoad stepKey="waitForProductsPage" time="10"/>
--        <click stepKey="TickCheckbox" selector="{{ProductsPageSection.checkboxForProduct(productName)}}"/>
--        <click stepKey="OpenActions" selector="{{ProductsPageSection.actions}}"/>
--        <waitForAjaxLoad stepKey="waitForDelete" time="5"/>
--        <click stepKey="ChooseDelete" selector="{{ProductsPageSection.delete}}"/>
--        <waitForPageLoad stepKey="waitForDeleteItemPopup" time="10"/>
--        <click stepKey="clickOnOk" selector="{{ProductsPageSection.ok}}"/>
--        <waitForElementVisible stepKey="waitForSuccessfullyDeletedMessage" selector="{{ProductsPageSection.deletedSuccessMessage}}" time="10"/>
--    </actionGroup>
--</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml
-new file mode 100644
-index 00000000000..bf06bc7df52
---- /dev/null
-+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml
-@@ -0,0 +1,32 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontFillCartDataActionGroup">
-+        <arguments>
-+            <argument name="cartData" defaultValue="PaymentAndShippingInfo"/>
-+        </arguments>
-+        <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.cartFrame}}" stepKey="switchToIframe"/>
-+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.cartCode}}" stepKey="waitCartCodeElement"/>
-+        <fillField selector="{{BraintreeConfigurationPaymentSection.cartCode}}" userInput="{{cartData.cardNumber}}" stepKey="setCartCode"/>
-+        <switchToIFrame stepKey="switchBack"/>
-+        <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.monthFrame}}" stepKey="switchToIframe1"/>
-+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.month}}" stepKey="waitMonthElement"/>
-+        <fillField selector="{{BraintreeConfigurationPaymentSection.month}}" userInput="{{cartData.month}}" stepKey="setMonth"/>
-+        <switchToIFrame stepKey="switchBack1"/>
-+        <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.yearFrame}}" stepKey="switchToIframe2"/>
-+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.year}}" stepKey="waitYearElement"/>
-+        <fillField selector="{{BraintreeConfigurationPaymentSection.year}}" userInput="{{cartData.year}}" stepKey="setYear"/>
-+        <switchToIFrame stepKey="switchBack2"/>
-+        <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.codeFrame}}" stepKey="switchToIframe3"/>
-+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.verificationNumber}}" stepKey="waitVerificationNumber"/>
-+        <fillField selector="{{BraintreeConfigurationPaymentSection.verificationNumber}}" userInput="{{cartData.cvv}}" stepKey="setVerificationNumber"/>
-+        <switchToIFrame stepKey="SwitchBackToWindow"/>
-+    </actionGroup>
-+
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
-deleted file mode 100644
-index 7c774a634b3..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
-+++ /dev/null
-@@ -1,28 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
--
--    <!--Sign out-->
--    <actionGroup name="SignOut">
--        <click selector="{{SignOutSection.admin}}" stepKey="clickToAdminProfile"/>
--        <click selector="{{SignOutSection.logout}}" stepKey="clickToLogOut"/>
--        <waitForPageLoad stepKey="waitForPageLoad" />
--        <see userInput="You have logged out." stepKey="seeSuccessMessage" />
--        <waitForElementVisible selector="//*[@data-ui-id='messages-message-success']" stepKey="waitForSuccessMessageLoggedOut" time="5"/>
--    </actionGroup>
--
--    <!--Login New User-->
--    <actionGroup name="LoginNewUser">
--        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}" stepKey="navigateToAdmin"/>
--        <fillField userInput="{{NewAdmin.username}}" selector="{{LoginFormSection.username}}" stepKey="fillUsername"/>
--        <fillField userInput="{{NewAdmin.password}}" selector="{{LoginFormSection.password}}" stepKey="fillPassword"/>
--        <click selector="{{LoginFormSection.signIn}}" stepKey="clickLogin"/>
--    </actionGroup>
--
--</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
-index 208c8b25d8d..f95ba2eb590 100644
---- a/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
-@@ -6,8 +6,7 @@
-   */
- -->
- 
--<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="SampleBraintreeConfig" type="braintree_config_state">
-         <requiredEntity type="title">SampleTitle</requiredEntity>
-         <requiredEntity type="payment_action">SamplePaymentAction</requiredEntity>
-@@ -35,6 +34,34 @@
-         <data key="value">somePrivateKey</data>
-     </entity>
- 
-+    <entity name="BraintreeConfig" type="braintree_config_state">
-+        <requiredEntity type="title">BraintreeTitle</requiredEntity>
-+        <requiredEntity type="payment_action">PaymentAction</requiredEntity>
-+        <requiredEntity type="environment">Environment</requiredEntity>
-+        <requiredEntity type="merchant_id">MerchantId</requiredEntity>
-+        <requiredEntity type="public_key">PublicKey</requiredEntity>
-+        <requiredEntity type="private_key">PrivateKey</requiredEntity>
-+        <requiredEntity type="active">Status</requiredEntity>
-+    </entity>
-+    <entity name="BraintreeTitle" type="title">
-+        <data key="value">Credit Card (Braintree)</data>
-+    </entity>
-+    <entity name="PaymentAction" type="payment_action">
-+        <data key="value">authorize</data>
-+    </entity>
-+    <entity name="Environment" type="environment">
-+        <data key="value">sandbox</data>
-+    </entity>
-+    <entity name="MerchantId" type="merchant_id">
-+        <data key="value">MERCH_ID</data>
-+    </entity>
-+    <entity name="PublicKey" type="public_key">
-+        <data key="value">PUBLIC_KEY</data>
-+    </entity>
-+    <entity name="PrivateKey" type="private_key">
-+        <data key="value">PRIVATE_KEY</data>
-+    </entity>
-+
-     <!-- default configuration used to restore Magento config -->
-     <entity name="DefaultBraintreeConfig" type="braintree_config_state">
-         <requiredEntity type="title">DefaultTitle</requiredEntity>
-@@ -63,6 +90,28 @@
-         <data key="value"/>
-     </entity>
- 
-+    <entity name="CustomBraintreeConfigurationData" type="custom_braintree_config_state">
-+        <requiredEntity type="braintree_cc_vault_active">BraintreeValuteActive</requiredEntity>
-+        <requiredEntity type="active">EnableSolution</requiredEntity>
-+    </entity>
-+    <entity name="BraintreeValuteActive" type="braintree_cc_vault_active">
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="EnableSolution" type="active">
-+        <data key="value">1</data>
-+    </entity>
-+
-+    <entity name="RollBackCustomBraintreeConfigurationData" type="custom_braintree_config_state">
-+        <requiredEntity type="braintree_cc_vault_active">DefaultBraintreeValuteActive</requiredEntity>
-+        <requiredEntity type="active">DefaultEnableSolution</requiredEntity>
-+    </entity>
-+    <entity name="DefaultBraintreeValuteActive" type="braintree_cc_vault_active">
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="DefaultEnableSolution" type="active">
-+        <data key="value">0</data>
-+    </entity>
-+
-     <entity name="testData" type="data">
-         <data key="websiteName" unique="suffix">Website</data>
-         <data key="websiteCode" unique="suffix">new_website</data>
-@@ -79,7 +128,7 @@
-         <data key="firstName">John</data>
-         <data key="lastName">Smith</data>
-         <data key="password">admin123</data>
--        <data key="email">mail@mail.com</data>
-+        <data key="email" unique="prefix">mail@mail.com</data>
-     </entity>
- 
-     <entity name="PaymentAndShippingInfo" type="data">
-@@ -88,14 +137,17 @@
-         <data key="year">20</data>
-         <data key="cvv">113</data>
-     </entity>
-+    <entity name="StoredPaymentMethods">
-+        <data key="cardNumberEnding">5100</data>
-+        <data key="cardExpire">12/2020</data>
-+    </entity>
- 
-     <entity name="BraintreeConfigurationData" type="data">
-         <data key="title">Credit Card (Braintree)</data>
--        <data key="merchantID">d4pdjhxgjfrsmzbf</data>
--        <data key="publicKey">m7q4wmh43xrgyrst</data>
--        <data key="privateKey">67de364080b1b4e2492d7a3de413a572</data>
--        <data key="merchantAccountID">Magneto</data>
-+        <data key="merchantID">MERCH_ID</data>
-+        <data key="publicKey">PUBLIC_KEY</data>
-+        <data key="privateKey">PRIVATE_KEY</data>
-+        <data key="merchantAccountID">MERCH_ACCOUNT_ID</data>
-         <data key="titleForPayPalThroughBraintree">PayPal (Braintree)</data>
-     </entity>
--
- </entities>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
-deleted file mode 100644
-index 772c1c39a04..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
-+++ /dev/null
-@@ -1,23 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
--    <entity name="NewCustomerData" type="braintree_config_state">
--        <data key="FirstName">Abgar</data>
--        <data key="LastName">Abgaryan</data>
--        <data key="Email">m@m.com</data>
--        <data key="AddressFirstName">Abgar</data>
--        <data key="AddressLastName">Abgaryan</data>
--        <data key="StreetAddress">Street</data>
--        <data key="City">Yerevan</data>
--        <data key="Zip">9999</data>
--        <data key="PhoneNumber">9999</data>
--    </entity>
--
--</entities>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
-deleted file mode 100644
-index 72661ae9407..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
-+++ /dev/null
-@@ -1,17 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
--    <entity name="NewProductData" type="braintree_config_state">
--        <data key="ProductName">ProductTest</data>
--        <data key="Price">100</data>
--        <data key="Quantity">100</data>
--    </entity>
--
--</entities>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml b/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
-index e4d02a58b5b..5e3b870d65c 100644
---- a/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateBraintreeConfigState" dataType="braintree_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
-         <object key="groups" dataType="braintree_config_state">
-             <object key="braintree_section" dataType="braintree_config_state">
-@@ -42,4 +42,22 @@
-             </object>
-         </object>
-     </operation>
-+    <operation name="CustomBraintreeConfigState" dataType="custom_braintree_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
-+        <object key="groups" dataType="custom_braintree_config_state">
-+            <object key="braintree_section" dataType="custom_braintree_config_state">
-+                <object key="groups" dataType="custom_braintree_config_state">
-+                    <object key="braintree" dataType="custom_braintree_config_state">
-+                        <object key="fields" dataType="custom_braintree_config_state">
-+                            <object key="braintree_cc_vault_active" dataType="braintree_cc_vault_active">
-+                                <field key="value">integer</field>
-+                            </object>
-+                            <object key="active" dataType="active">
-+                                <field key="value">string</field>
-+                            </object>
-+                        </object>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
- </operations>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
-deleted file mode 100644
-index 1158f471d51..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
-+++ /dev/null
-@@ -1,24 +0,0 @@
--<?xml version="1.0" encoding="utf-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="AdminCreateRoleSection">
--        <element name="create" type="button" selector="#add"/>
--        <element name="name" type="button" selector="#role_name"/>
--        <element name="password" type="input" selector="#current_password"/>
--        <element name="roleResources" type="button" selector="#role_info_tabs_account"/>
--        <element name="roleResource" type="button" selector="#gws_is_all"/>
--        <element name="resourceValue" type="button" selector="//*[text()='{{arg1}}']" parameterized="true"/>
--        <element name="roleScope" type="button" selector="#all"/>
--        <element name="scopeValue" type="button" selector="//select[@id='all']/*[text()='{{arg2}}']" parameterized="true"/>
--        <element name="website" type="checkbox" selector="//*[contains(text(), '{{arg3}}')]" parameterized="true"/>
--        <element name="save" type="button" selector="//button[@title='Save Role']"/>
--        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
--        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
--        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
--    </section>
--</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
-deleted file mode 100644
-index 98d748b5a30..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
-+++ /dev/null
-@@ -1,23 +0,0 @@
--<?xml version="1.0" encoding="utf-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="AdminCreateUserSection">
--        <element name="system" type="input" selector="#menu-magento-backend-system"/>
--        <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
--        <element name="create" type="input" selector="#add"/>
--        <element name="usernameTextField" type="input" selector="#user_username"/>
--        <element name="firstNameTextField" type="input" selector="#user_firstname"/>
--        <element name="lastNameTextField" type="input" selector="#user_lastname"/>
--        <element name="emailTextField" type="input" selector="#user_email"/>
--        <element name="passwordTextField" type="input" selector="#user_password"/>
--        <element name="pwConfirmationTextField" type="input" selector="#user_confirmation"/>
--        <element name="currentPasswordField" type="input" selector="#user_current_password"/>
--        <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
--        <element name="saveButton" type="button" selector="#save"/>
--    </section>
--</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
-deleted file mode 100644
-index 220c9a444b0..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
-+++ /dev/null
-@@ -1,15 +0,0 @@
--<?xml version="1.0" encoding="utf-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="AdminDeleteRoleSection">
--        <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
--        <element name="current_pass" type="button" selector="#current_password"/>
--        <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
--        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
--    </section>
--</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
-deleted file mode 100644
-index bf2e2b44eb6..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
-+++ /dev/null
-@@ -1,15 +0,0 @@
--<?xml version="1.0" encoding="utf-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="AdminDeleteUserSection">
--        <element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
--        <element name="password" selector="#user_current_password" type="input"/>
--        <element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
--        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
--    </section>
--</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
-index e37ce8f4738..a34cdf15e7a 100644
---- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
-@@ -5,7 +5,9 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminEditRoleInfoSection">
-         <element name="roleName" type="input" selector="#role_name"/>
-         <element name="password" type="input" selector="#current_password"/>
-@@ -18,4 +20,4 @@
-         <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
-         <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
-index e999413c96d..216292b8116 100644
---- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
-@@ -5,7 +5,9 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminEditUserRoleSection">
-         <element name="usernameTextField" type="input" selector="#user_username"/>
-         <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
-@@ -14,4 +16,4 @@
-         <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
-         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
-index 2e5fcfb7b5c..cee262864d8 100644
---- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
-@@ -5,7 +5,9 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminEditUserSection">
-         <element name="system" type="input" selector="#menu-magento-backend-system"/>
-         <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
-@@ -25,4 +27,4 @@
-         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-         <element name="saveButton" type="button" selector="#save"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
-index 660c7393b40..24e5efdc610 100644
---- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
-@@ -7,13 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminMenuSection">
-         <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
-         <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
-         <element name="catalog" type="button" selector="//li[@id='menu-magento-catalog-catalog']"/>
-         <element name="customers" type="button" selector="//li[@id='menu-magento-customer-customer']"/>
--        <element name="marketing" type="button" selector="//li[@id='//li[@id='menu-magento-backend-marketing']']"/>
-+        <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
-         <element name="content" type="button" selector="//li[@id='menu-magento-backend-content']"/>
-         <element name="reports" type="button" selector="//li[@id='menu-magento-reports-report']"/>
-         <element name="stores" type="button" selector="//li[@id='menu-magento-backend-stores']"/>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
-index 63cbadc71d3..1cf54bf94e7 100644
---- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
-@@ -5,7 +5,9 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminRoleGridSection">
-         <element name="idFilterTextField" type="input" selector="#roleGrid_filter_role_id"/>
-         <element name="roleNameFilterTextField" type="input" selector="#roleGrid_filter_role_name"/>
-@@ -14,4 +16,4 @@
-         <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
-         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
-deleted file mode 100644
-index 9564bc61f79..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
-+++ /dev/null
-@@ -1,17 +0,0 @@
--<?xml version="1.0" encoding="utf-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="AdminUserGridSection">
--        <element name="usernameFilterTextField" type="input" selector="#permissionsUserGrid_filter_username"/>
--        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
--        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
--        <element name="usernameInFirstRow" type="text" selector=".col-username"/>
--        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
--        <element name="successMessage" type="text" selector=".message-success"/>
--    </section>
--</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
-index 016af2e1027..f8802e9a34a 100644
---- a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
-@@ -5,7 +5,9 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="BraintreeConfiguraionSection">
-         <element name="titleForBraintreeSettings" type="input" selector="//input[@id='payment_us_braintree_section_braintree_braintree_required_title']"/>
-         <element name="environment" type="select" selector="//select[@id='payment_us_braintree_section_braintree_braintree_required_environment']"/>
-@@ -29,6 +31,5 @@
-         <element name="actionAuthorize" type="text" selector="//select[@id='payment_us_braintree_section_braintree_braintree_paypal_payment_action']/option[text()='Authorize']"/>
-         <element name="save" type="button" selector="//span[text()='Save Config']"/>
-         <element name="successfulMessage" type="text" selector="//*[@data-ui-id='messages-message-success']"/>
--
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml
-new file mode 100644
-index 00000000000..d9f2b14a40e
---- /dev/null
-+++ b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <section name="BraintreeConfigurationPaymentSection">
-+        <element name="creditCart" type="radio" selector="#braintree"/>
-+        <element name="paymentMethodContainer" type="block" selector=".payment-method-braintree"/>
-+        <element name="paymentMethod" type="radio" selector="//div[@class='payment-group']//input[contains(@id, 'braintree_cc_vault_')]"/>
-+        <element name="cartFrame" type="iframe" selector="braintree-hosted-field-number"/>
-+        <element name="monthFrame" type="iframe" selector="braintree-hosted-field-expirationMonth"/>
-+        <element name="yearFrame" type="iframe" selector="braintree-hosted-field-expirationYear"/>
-+        <element name="codeFrame" type="iframe" selector="braintree-hosted-field-cvv"/>
-+        <element name="cartCode" type="input" selector="#credit-card-number"/>
-+        <element name="month" type="input" selector="#expiration-month"/>
-+        <element name="year" type="input" selector="#expiration-year"/>
-+        <element name="verificationNumber" type="input" selector="#cvv"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
-deleted file mode 100644
-index 32f02a69f81..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="CatalogSubmenuSection">
--        <element name="products" type="button" selector="//li[@id='menu-magento-catalog-catalog']//li[@data-ui-id='menu-magento-catalog-catalog-products']"/>
--    </section>
--</sections>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
-deleted file mode 100644
-index 100407438ea..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
-+++ /dev/null
-@@ -1,15 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="ConfigurationListSection">
--        <element name="sales" type="button" selector="//div[contains(@class, 'admin__page-nav-title title _collapsible')]/strong[text()='Sales']"/>
--        <element name="salesPaymentMethods" type="button" selector="//span[text()='Payment Methods']"/>
--    </section>
--</sections>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
-index 885a45be721..2192dd935c3 100644
---- a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="ConfigurationPaymentSection">
-         <element name="configureButton" type="button" selector="//button[@id='payment_us_braintree_section_braintree-head']"/>
-     </section>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
-deleted file mode 100644
-index e4a75b1b6a8..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
-+++ /dev/null
-@@ -1,19 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="CustomersPageSection">
--        <element name="addNewCustomerButton" type="button" selector="//*[@id='add']"/>
--        <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
--        <element name="actions" type="button" selector="//div[@class='col-xs-2']/div[@class='action-select-wrap']/button[@class='action-select']"/>
--        <element name="delete" type="button" selector="//*[contains(@class,'admin__data-grid-header-row row row-gutter')]//*[text()='Delete']"/>
--        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
--        <element name="deletedSuccessMessage" type="button" selector="//*[@class='message message-success success']"/>
--    </section>
--</sections>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
-deleted file mode 100644
-index 937afb83da9..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="CustomersSubmenuSection">
--        <element name="allCustomers" type="button" selector="//li[@id='menu-magento-customer-customer']//li[@data-ui-id='menu-magento-customer-customer-manage']"/>
--    </section>
--</sections>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
-deleted file mode 100644
-index d302f9c7d0c..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
-+++ /dev/null
-@@ -1,33 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="NewCustomerPageSection">
--        <element name="associateToWebsite" type="select" selector="//*[@class='admin__field-control _with-tooltip']//*[@class='admin__control-select']"/>
--        <element name="group" type="select" selector="//div[@class='admin__field-control admin__control-fields required']//div[@class='admin__field-control']//select[@class='admin__control-select']"/>
--        <element name="firstName" type="input" selector="//input[@name='customer[firstname]']"/>
--        <element name="lastName" type="input" selector="//input[@name='customer[lastname]']"/>
--        <element name="email" type="input" selector="//input[@name='customer[email]']"/>
--        <element name="addresses" type="button" selector="//a[@id='tab_address']"/>
--        <element name="addNewAddress" type="button" selector="//span[text()='Add New Addresses']"/>
--        <element name="defaultBillingAddress" type="button" selector="//label[text()='Default Billing Address']"/>
--        <element name="defaultShippingAddress" type="button" selector="//label[text()='Default Shipping Address']"/>
--        <element name="firstNameForAddress" type="button" selector="//input[contains(@name, 'address')][contains(@name, 'firstname')]"/>
--        <element name="lastNameForAddress" type="button" selector="//input[contains(@name, 'address')][contains(@name, 'lastname')]"/>
--        <element name="streetAddress" type="button" selector="//input[contains(@name, 'street')]"/>
--        <element name="city" type="input" selector="//input[contains(@name, 'city')]"/>
--        <element name="country" type="select" selector="//select[contains(@name, 'country_id')]"/>
--        <element name="countryArmenia" type="select" selector="//select[contains(@name, 'country_id')]//option[@data-title='Armenia']"/>
--        <element name="zip" type="input" selector="//input[contains(@name, 'postcode')]"/>
--        <element name="phoneNumber" type="input" selector="//input[contains(@name, 'telephone')]"/>
--        <element name="saveCustomer" type="button" selector="//button[@title='Save Customer']"/>
--        <element name="createdSuccessMessage" type="button" selector="//div[@data-ui-id='messages-message-success']"/>
--
--    </section>
--</sections>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
-deleted file mode 100644
-index 13f59ad2cf1..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
-+++ /dev/null
-@@ -1,35 +0,0 @@
--<?xml version="1.0" encoding="utf-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="NewOrderSection">
--        <element name="createNewOrder" type="button" selector="#add"/>
--        <element name="customer" type="button" selector="//td[contains(text(), 'Abgar')]"/>
--        <element name="addProducts" type="button" selector="#add_products"/>
--        <element name="chooseProduct" type="button" selector="//td[contains(text(),'ProductTest')]"/>
--        <element name="addSelectedProduct" type="button" selector="//button[@title='Add Selected Product(s) to Order']"/>
--        <element name="openAddresses" type="button" selector="#order-billing_address_customer_address_id"/>
--        <element name="chooseAddress" type="button" selector="//select[@id='order-billing_address_customer_address_id']//option[contains(text(), 'Abgar')]"/>
--        <element name="state" type="button" selector="#order-billing_address_region"/>
--        <element name="openShippingMethods" type="button" selector="//a[@class='action-default']"/>
--        <element name="shippingMethod" type="button" selector="//label[@class='admin__field-label' and @for='s_method_flatrate_flatrate']"/>
--        <element name="creditCardBraintree" type="button" selector="#p_method_braintree"/>
--        <element name="openCardTypes" type="button" selector="#braintree_cc_type"/>
--        <element name="masterCard" type="button" selector="//option[contains(text(), 'MasterCard')]"/>
--        <element name="cardFrame" type="iframe" selector="braintree-hosted-field-number"/>
--        <element name="monthFrame" type="iframe" selector="braintree-hosted-field-expirationMonth"/>
--        <element name="yearFrame" type="iframe" selector="braintree-hosted-field-expirationYear"/>
--        <element name="cvvFrame" type="iframe" selector="braintree-hosted-field-cvv"/>
--        <element name="creditCardNumber" type="input" selector="#credit-card-number"/>
--        <element name="expirationMonth" type="input" selector="#expiration-month"/>
--        <element name="expirationYear" type="input" selector="#expiration-year"/>
--        <element name="cvv" type="input" selector="#cvv"/>
--        <element name="submitOrder" type="input" selector="#submit_order_top_button"/>
--        <element name="successMessage" type="input" selector="#messages"/>
--
--    </section>
--</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
-deleted file mode 100644
-index 42e451940c9..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
-+++ /dev/null
-@@ -1,19 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="NewProductPageSection">
--        <element name="productName" type="input" selector="//input[@name='product[name]']"/>
--        <element name="sku" type="input" selector="//input[@name='product[sku]']"/>
--        <element name="price" type="input" selector="//input[@name='product[price]']"/>
--        <element name="quantity" type="input" selector="//input[@name='product[quantity_and_stock_status][qty]']"/>
--        <element name="saveButton" type="button" selector="//button[@id='save-button']"/>
--        <element name="createdSuccessMessage" type="button" selector="//div[@data-ui-id='messages-message-success']"/>
--    </section>
--</sections>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
-deleted file mode 100644
-index 267efdf3d0e..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
-+++ /dev/null
-@@ -1,20 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="ProductsPageSection">
--        <element name="addProductButton" type="button" selector="//button[@id='add_new_product-button']"/>
--        <element name="checkboxForProduct" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
--        <element name="actions" type="button" selector="//div[@class='col-xs-2']/div[@class='action-select-wrap']/button[@class='action-select']"/>
--        <element name="delete" type="button" selector="//*[contains(@class,'admin__data-grid-header-row row row-gutter')]//*[text()='Delete']"/>
--        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
--        <element name="deletedSuccessMessage" type="button" selector="//*[@class='message message-success success']"/>
--
--    </section>
--</sections>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
-index f094baa9f34..806762f8264 100644
---- a/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StoresSubmenuSection">
-         <element name="configuration" type="button" selector="//li[@id='menu-magento-backend-stores']//li[@data-ui-id='menu-magento-config-system-config']"/>
-     </section>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
-deleted file mode 100644
-index 3a07cbc6dd1..00000000000
---- a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
-+++ /dev/null
-@@ -1,24 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--
--    <section name="LoginFormSection">
--        <element name="username" type="input" selector="#username"/>
--        <element name="password" type="input" selector="#login"/>
--        <element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
--    </section>
--
--    <section name="SignOutSection">
--        <element name="admin" type="button" selector=".admin__action-dropdown-text"/>
--        <element name="logout" type="button" selector="//*[contains(text(), 'Sign Out')]"/>
--    </section>
--
--</sections>
--
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
-new file mode 100644
-index 00000000000..9a1110bfda2
---- /dev/null
-+++ b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
-@@ -0,0 +1,111 @@
-+<?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="BraintreeCreditCardOnCheckoutTest">
-+        <annotations>
-+            <features value="Braintree"/>
-+            <stories value="MAGETWO-91624 - Braintree saved cards use billing address the same as shipping"/>
-+            <title value="Use saved for Braintree credit card on checkout with selecting billing address"/>
-+            <description value="Use saved for Braintree credit card on checkout with selecting billing address"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-93767"/>
-+            <group value="braintree"/>
-+            <skip>
-+                <issueId value="MQE-1576"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="category"/>
-+            <createData entity="SimpleProduct" stepKey="product">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="Simple_US_Customer" stepKey="customer"/>
-+            <createData entity="BraintreeConfig" stepKey="BraintreeConfigurationData"/>
-+            <createData entity="CustomBraintreeConfigurationData" stepKey="CustomBraintreeConfigurationData"/>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="product" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <createData entity="DefaultBraintreeConfig" stepKey="DefaultBraintreeConfig"/>
-+            <createData entity="RollBackCustomBraintreeConfigurationData" stepKey="RollBackCustomBraintreeConfigurationData"/>
-+            <actionGroup ref="StorefrontSignOutActionGroup" stepKey="StorefrontSignOutActionGroup"/>
-+        </after>
-+        <!--Go to storefront-->
-+        <amOnPage url="" stepKey="DoToStorefront"/>
-+        <!--Create account-->
-+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUserFromStorefrontActionGroup">
-+            <argument name="Customer" value="Simple_US_Customer"/>
-+        </actionGroup>
-+
-+        <!--Add product to cart-->
-+        <amOnPage url="$$product.sku$$.html" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+        <!--Proceed to checkout-->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="GoToCheckoutFromMinicartActionGroup"/>
-+
-+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="LoggedInCheckoutFillNewBillingAddressActionGroup">
-+            <argument name="Address" value="US_Address_CA"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
-+        <!--Fill cart data-->
-+        <click selector="{{BraintreeConfigurationPaymentSection.creditCart}}" stepKey="SelectBraintreePaymentMethod"/>
-+        <waitForPageLoad stepKey="waitForPageLoad3"/>
-+        <scrollTo selector="{{BraintreeConfigurationPaymentSection.creditCart}}" stepKey="ScrollToCreditCardSection"/>
-+        <actionGroup ref="StorefrontFillCartDataActionGroup" stepKey="StorefrontFillCartDataActionGroup"/>
-+        <waitForPageLoad stepKey="waitForPageLoad4"/>
-+        <!--Place order-->
-+        <click selector="{{BraintreeConfigurationPaymentSection.paymentMethodContainer}}{{CheckoutPaymentSection.placeOrder}}"
-+               stepKey="PlaceOrder"/>
-+        <waitForPageLoad stepKey="waitForPageLoad5"/>
-+
-+        <!--Add product to cart again-->
-+        <amOnPage url="$$product.sku$$.html" stepKey="goToProductPage1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad6"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad7"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage2"/>
-+        <!--Proceed to checkout-->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="GoToCheckoutFromMinicartActionGroup1"/>
-+        <click selector="{{CheckoutPaymentSection.addressAction('New Address')}}" stepKey="clickOnNewAddress"/>
-+        <waitForPageLoad stepKey="waitForPageLoad8"/>
-+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="LoggedInCheckoutFillNewBillingAddressActionGroup1">
-+            <argument name="Address" value="US_Address_NY"/>
-+        </actionGroup>
-+        <click selector="{{CheckoutPaymentSection.addressAction('Ship here')}}" stepKey="SaveAddress"/>
-+        <waitForPageLoad stepKey="waitForPageLoad9"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad10"/>
-+        <click selector="{{BraintreeConfigurationPaymentSection.paymentMethod}}" stepKey="SelectBraintreePaymentMethod1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad11"/>
-+        <!--Place order-->
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="PlaceOrder1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad13"/>
-+
-+        <click selector="{{CheckoutOrderSummarySection.orderNumber}}" stepKey="ClickOnOrderNumber"/>
-+        <waitForPageLoad stepKey="waitForPageLoad14"/>
-+        <!--Check billing and shipping addresses also additional Address info-->
-+        <click selector="{{CheckoutPaymentSection.addressBook}}" stepKey="goToAddressBook"/>
-+        <grabTextFrom selector="{{CheckoutOrderSummarySection.shippingAddress}}" stepKey="shippingAddr"/>
-+        <grabTextFrom selector="{{CheckoutOrderSummarySection.billingAddress}}" stepKey="billingAddr"/>
-+        <grabTextFrom selector="{{CheckoutOrderSummarySection.additionalAddress}}" stepKey="additionalAddress"/>
-+        <see userInput="Shipping Address" stepKey="seeShippingAddress"/>
-+        <see userInput="Billing Address" stepKey="seeBillingAddress"/>
-+        <assertEquals stepKey="assertValuesAreEqual" actual="$billingAddr" expected="$shippingAddr"/>
-+        <assertNotEquals stepKey="assertValuesAreNotEqual" actual="$billingAddr" expected="$additionalAddress"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
-index df2e98816f0..2594d245f9f 100644
---- a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
-+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
-@@ -18,7 +18,7 @@
-             <testCaseId value="MAGETWO-93677"/>
-             <group value="braintree"/>
-             <skip>
--                <issueId value="MQE-1187" />
-+                <issueId value="MQE-1576"/>
-             </skip>
-         </annotations>
- 
-@@ -28,11 +28,13 @@
-             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
- 
-             <!--CreateNewProduct-->
--            <actionGroup ref="CreateNewProductActionGroup" stepKey="CreateNewProduct"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
- 
-             <!--Create New Customer-->
--            <actionGroup ref="CreateCustomerActionGroup" stepKey="CreateCustomer"/>
--
-+            <createData stepKey="createCustomer" entity="Simple_US_Customer"/>
-         </before>
- 
- 
-@@ -41,47 +43,70 @@
- 
-         <!--Create New Role-->
-         <actionGroup ref="GoToUserRoles" stepKey="GoToUserRoles"/>
--        <actionGroup ref="AdminCreateRole" stepKey="AdminCreateNewRole"/>
-+        <waitForPageLoad stepKey="waitForAllRoles" time="15"/>
-+        <actionGroup ref="AdminCreateNewRole" stepKey="AdminCreateNewRole"/>
- 
--        <!--Create New User With Specific Role-->
-+        <!--Create new admin user-->
-         <actionGroup ref="GoToAllUsers" stepKey="GoToAllUsers"/>
-+        <waitForPageLoad stepKey="waitForUsers" time="15"/>
-         <actionGroup ref="AdminCreateUserAction" stepKey="AdminCreateNewUser"/>
- 
-         <!--SignOut-->
--        <actionGroup ref="SignOut" stepKey="signOutFromAdmin"/>
-+        <actionGroup ref="logout" stepKey="signOutFromAdmin"/>
- 
--        <!--SignIn New User-->
-+        <!--Log in as new user-->
-         <actionGroup ref="LoginNewUser" stepKey="signInNewUser"/>
-         <waitForPageLoad stepKey="waitForLogin" time="3"/>
- 
-         <!--Create New Order-->
--        <actionGroup ref="CreateNewOrderActionGroup" stepKey="createNewOrder"/>
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrder">
-+            <argument name="customer" value="Simple_US_Customer"/>
-+        </actionGroup>
-+
-+        <!--Add Product to Order-->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addProduct">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+
-+        <!--Fill Order Customer Information-->
-+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress">
-+            <argument name="customer" value="Simple_US_Customer"/>
-+            <argument name="address" value="US_Address_TX"/>
-+        </actionGroup>
-+
-+        <!--Select Shipping-->
-+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"/>
-+        <waitForPageLoad stepKey="waitForShippingToFinish"/>
- 
-+        <!--Pay with Braintree -->
-+        <actionGroup ref="useBraintreeForMasterCard" stepKey="selectCardWithBraintree"/>
-+
-+        <!--Submit Order-->
-+        <click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
-+        <waitForPageLoad stepKey="waitForSaveConfig"/>
-+        <waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage"/>
- 
-         <after>
-+            <!-- Disable BrainTree -->
-+            <actionGroup ref="DisableBrainTree" stepKey="disableBrainTree"/>
-+
-             <!--SignOut-->
-             <actionGroup ref="SignOut" stepKey="signOutFromNewUser"/>
-             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
- 
-             <!--Delete Product-->
--            <actionGroup ref="DeleteProductActionGroup" stepKey="DeleteAllProducts">
--                <argument name="productName" value="NewProductData.ProductName"/>
--            </actionGroup>
-+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
- 
-             <!--Delete Customer-->
--            <actionGroup ref="DeleteCustomerActionGroup" stepKey="DeleteCustomer">
--                <argument name="lastName" value="NewCustomerData.LastName"/>
--            </actionGroup>
-+            <deleteData stepKey="deleteCustomer" createDataKey="createCustomer"/>
- 
-             <!--Delete User -->
-             <actionGroup ref="GoToAllUsers" stepKey="GoBackToAllUsers"/>
--            <actionGroup ref="AdminDeleteUserActionGroup" stepKey="AdminDeleteUserActionGroup"/>
-+            <actionGroup ref="AdminDeleteNewUserActionGroup" stepKey="AdminDeleteUserActionGroup"/>
- 
-             <!--Delete Role-->
-             <actionGroup ref="GoToUserRoles" stepKey="GoBackToUserRoles"/>
-             <actionGroup ref="AdminDeleteRoleActionGroup" stepKey="AdminDeleteRoleActionGroup"/>
--
-         </after>
--
-     </test>
- </tests>
-diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml
-new file mode 100644
-index 00000000000..8f0ce4918b9
---- /dev/null
-+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml
-@@ -0,0 +1,129 @@
-+<?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="CreateAdminOrderPayedWithOnlinePaymentIncludingTaxAndDiscount">
-+        <annotations>
-+            <features value="Braintree"/>
-+            <stories value="Get access to a New Credit Memo Page from Invoice for Order payed with online payment via Admin"/>
-+            <title value="Admin should be able to open a New Credit Memo Page from Invoice Page for Order with tax and discount and payed using online payment method"/>
-+            <description value="Admin should be able to open a New Credit Memo Page from Invoice Page for Order with tax and discount and payed using online payment method"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-94472"/>
-+            <group value="braintree"/>
-+            <skip>
-+                <issueId value="MQE-1576"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <!--Create Default Category-->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!--Create Simple product-->
-+            <createData entity="_defaultProduct" stepKey="simpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!--Create Tax Rule is based on default tax rates (Stores>Tax Rule) US-CA-*-Rate 1 = 8.2500 US-NY-*-Rate 1 = 8.3750 -->
-+            <createData entity="SimpleTaxRule" stepKey="createTaxRule"/>
-+
-+            <!--Configure Braintree Payment method-->
-+            <createData entity="BraintreeConfig" stepKey="BraintreeConfigurationData"/>
-+            <createData entity="CustomBraintreeConfigurationData" stepKey="enableBraintree"/>
-+
-+            <!--Create Retailer Customer with US_CA address-->
-+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer">
-+                <field key="group_id">3</field>
-+            </createData>
-+
-+            <!--Login as Admin User-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+
-+        <after>
-+            <!--Delete Cart Price Rule-->
-+            <actionGroup ref="AdminDeleteCartPriceRuleForRetailerActionGroup" stepKey="deleteSalesRule"/>
-+
-+            <!--Set to default configuration Tax Shipping Class-->
-+            <actionGroup ref="setDefaultShippingTaxClass" stepKey="setdefaultClass"/>
-+
-+            <!--Delete Simple Sub Category-->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!--Delete Simple Product-->
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
-+
-+            <!-- Delete Tax Rule -->
-+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
-+
-+            <!-- Rollback Braintree to Default -->
-+            <createData entity="RollBackCustomBraintreeConfigurationData" stepKey="rollbackBraintreeConfig"/>
-+
-+            <!--Delete Customer-->
-+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
-+
-+            <!--Log Out-->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create a cart price rule with 10% discount for whole cart -->
-+        <click selector="{{AdminMenuSection.marketing}}" stepKey="clickOnMarketing" />
-+        <waitForPageLoad stepKey="waitForMarketing"/>
-+        <click selector="{{CartPriceRulesSubmenuSection.cartPriceRules}}" stepKey="clickOnCartPriceRules"/>
-+        <waitForPageLoad stepKey="waitForCartPriceRules"/>
-+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
-+        <actionGroup ref="selectRetailerCustomerGroup" stepKey="selectRetailerCustomerGroup"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Percent of product price discount" stepKey="selectActionType"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="10" stepKey="fillDiscountAmount"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForCartRuleLoad"/>
-+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
-+
-+        <!--Set Taxable Goods for Shipping Tax Class-->
-+        <actionGroup ref="changeShippingTaxClass" stepKey="changeShippingTaxClass"/>
-+
-+        <!--Adding Special price to product-->
-+        <amOnPage url="{{AdminProductEditPage.url($$simpleProduct.id$$)}}" stepKey="openAdminProductEditPage"/>
-+        <actionGroup ref="AddSpecialPriceToProductActionGroup" stepKey="addSpecialPrice"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
-+
-+        <!--Create New Order-->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
-+            <argument name="customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Add a product to order-->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addProductToOrder">
-+            <argument name="product" value="$$simpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Select FlatRate shipping method-->
-+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="orderSelectFlatRateShippingMethod"/>
-+
-+        <!--Select Braintree online Payment method -->
-+        <actionGroup ref="AdminOrderBraintreeFillActionGroup" stepKey="selectCreditCardPayment"/>
-+
-+        <!--Submit Order-->
-+        <click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
-+        <waitForPageLoad stepKey="waitForSubmitOrder"/>
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeOrderSuccessMessage" after="waitForSubmitOrder"/>
-+
-+        <!-- Create New invoice-->
-+        <actionGroup ref="adminFastCreateInvoice" stepKey="createInvoice"/>
-+
-+        <!--Get access to Credit Memo page from Invoice page-->
-+        <click selector="{{AdminInvoiceMainActionsSection.openNewCreditMemoFromInvoice}}" stepKey="clickCreateNewCreditMemo"/>
-+        <waitForPageLoad stepKey="waitForLoadNewCreditMemoPage"/>
-+        <see selector="{{AdminCreditMemoOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeNewCreditMemo"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php
-index 4bea03153b9..9c25846e56d 100644
---- a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php
-+++ b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Braintree\Test\Unit\Controller\Paypal;
- 
-@@ -16,6 +17,8 @@ use Magento\Framework\Controller\ResultFactory;
- use Magento\Framework\Controller\ResultInterface;
- use Magento\Framework\Message\ManagerInterface;
- use Magento\Quote\Model\Quote;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use Psr\Log\LoggerInterface;
- 
- /**
-  * Class PlaceOrderTest
-@@ -27,34 +30,34 @@ use Magento\Quote\Model\Quote;
- class PlaceOrderTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var OrderPlace|\PHPUnit_Framework_MockObject_MockObject
-+     * @var OrderPlace|MockObject
-      */
--    private $orderPlaceMock;
-+    private $orderPlace;
- 
-     /**
--     * @var Config|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Config|MockObject
-      */
--    private $configMock;
-+    private $config;
- 
-     /**
--     * @var Session|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Session|MockObject
-      */
--    private $checkoutSessionMock;
-+    private $checkoutSession;
- 
-     /**
--     * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var RequestInterface|MockObject
-      */
--    private $requestMock;
-+    private $request;
- 
-     /**
--     * @var ResultFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ResultFactory|MockObject
-      */
--    private $resultFactoryMock;
-+    private $resultFactory;
- 
-     /**
--     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ManagerInterface|MockObject
-      */
--    protected $messageManagerMock;
-+    private $messageManager;
- 
-     /**
-      * @var PlaceOrder
-@@ -62,139 +65,143 @@ class PlaceOrderTest extends \PHPUnit\Framework\TestCase
-     private $placeOrder;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var MockObject
-      */
--    private $loggerMock;
-+    private $logger;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
--        /** @var Context|\PHPUnit_Framework_MockObject_MockObject $contextMock */
--        $contextMock = $this->getMockBuilder(Context::class)
-+        /** @var Context|MockObject $context */
-+        $context = $this->getMockBuilder(Context::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
-+        $this->request = $this->getMockBuilder(RequestInterface::class)
-             ->setMethods(['getPostValue'])
-             ->getMockForAbstractClass();
--        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
-+        $this->resultFactory = $this->getMockBuilder(ResultFactory::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->checkoutSessionMock = $this->getMockBuilder(Session::class)
-+        $this->checkoutSession = $this->getMockBuilder(Session::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->configMock = $this->getMockBuilder(Config::class)
-+        $this->config = $this->getMockBuilder(Config::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->orderPlaceMock = $this->getMockBuilder(OrderPlace::class)
-+        $this->orderPlace = $this->getMockBuilder(OrderPlace::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
-+        $this->messageManager = $this->getMockBuilder(ManagerInterface::class)
-             ->getMockForAbstractClass();
- 
--        $contextMock->expects(self::once())
--            ->method('getRequest')
--            ->willReturn($this->requestMock);
--        $contextMock->expects(self::once())
--            ->method('getResultFactory')
--            ->willReturn($this->resultFactoryMock);
--        $contextMock->expects(self::once())
--            ->method('getMessageManager')
--            ->willReturn($this->messageManagerMock);
--
--        $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
-+        $context->method('getRequest')
-+            ->willReturn($this->request);
-+        $context->method('getResultFactory')
-+            ->willReturn($this->resultFactory);
-+        $context->method('getMessageManager')
-+            ->willReturn($this->messageManager);
-+
-+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->placeOrder = new PlaceOrder(
--            $contextMock,
--            $this->configMock,
--            $this->checkoutSessionMock,
--            $this->orderPlaceMock,
--            $this->loggerMock
-+            $context,
-+            $this->config,
-+            $this->checkoutSession,
-+            $this->orderPlace,
-+            $this->logger
-         );
-     }
- 
-+    /**
-+     * Checks if an order is placed successfully.
-+     *
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NotFoundException
-+     */
-     public function testExecute()
-     {
-         $agreement = ['test-data'];
- 
-         $quoteMock = $this->getQuoteMock();
--        $quoteMock->expects(self::once())
--            ->method('getItemsCount')
-+        $quoteMock->method('getItemsCount')
-             ->willReturn(1);
- 
-         $resultMock = $this->getResultMock();
--        $resultMock->expects(self::once())
--            ->method('setPath')
-+        $resultMock->method('setPath')
-             ->with('checkout/onepage/success')
-             ->willReturnSelf();
- 
--        $this->resultFactoryMock->expects(self::once())
--            ->method('create')
-+        $this->resultFactory->method('create')
-             ->with(ResultFactory::TYPE_REDIRECT)
-             ->willReturn($resultMock);
- 
--        $this->requestMock->expects(self::once())
--            ->method('getPostValue')
-+        $this->request->method('getPostValue')
-             ->with('agreement', [])
-             ->willReturn($agreement);
- 
--        $this->checkoutSessionMock->expects(self::once())
--            ->method('getQuote')
-+        $this->checkoutSession->method('getQuote')
-             ->willReturn($quoteMock);
- 
--        $this->orderPlaceMock->expects(self::once())
--            ->method('execute')
-+        $this->orderPlace->method('execute')
-             ->with($quoteMock, [0]);
- 
--        $this->messageManagerMock->expects(self::never())
-+        $this->messageManager->expects(self::never())
-             ->method('addExceptionMessage');
- 
-         self::assertEquals($this->placeOrder->execute(), $resultMock);
-     }
- 
-+    /**
-+     * Checks a negative scenario during place order action.
-+     *
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NotFoundException
-+     */
-     public function testExecuteException()
-     {
-         $agreement = ['test-data'];
- 
-         $quote = $this->getQuoteMock();
--        $quote->expects(self::once())
--            ->method('getItemsCount')
-+        $quote->method('getItemsCount')
-             ->willReturn(0);
-+        $quote->method('getReservedOrderId')
-+            ->willReturn('000000111');
- 
-         $resultMock = $this->getResultMock();
--        $resultMock->expects(self::once())
--            ->method('setPath')
-+        $resultMock->method('setPath')
-             ->with('checkout/cart')
-             ->willReturnSelf();
- 
--        $this->resultFactoryMock->expects(self::once())
--            ->method('create')
-+        $this->resultFactory->method('create')
-             ->with(ResultFactory::TYPE_REDIRECT)
-             ->willReturn($resultMock);
- 
--        $this->requestMock->expects(self::once())
--            ->method('getPostValue')
-+        $this->request->method('getPostValue')
-             ->with('agreement', [])
-             ->willReturn($agreement);
- 
--        $this->checkoutSessionMock->expects(self::once())
--            ->method('getQuote')
-+        $this->checkoutSession->method('getQuote')
-             ->willReturn($quote);
- 
--        $this->orderPlaceMock->expects(self::never())
-+        $this->orderPlace->expects(self::never())
-             ->method('execute');
- 
--        $this->messageManagerMock->expects(self::once())
--            ->method('addExceptionMessage')
-+        $this->messageManager->method('addExceptionMessage')
-             ->with(
-                 self::isInstanceOf('\InvalidArgumentException'),
--                'Checkout failed to initialize. Verify and try again.'
-+                'The order #000000111 cannot be processed.'
-             );
- 
-         self::assertEquals($this->placeOrder->execute(), $resultMock);
-     }
- 
-     /**
--     * @return ResultInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * Gets mock object for a result.
-+     *
-+     * @return ResultInterface|MockObject
-      */
-     private function getResultMock()
-     {
-@@ -204,7 +211,9 @@ class PlaceOrderTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @return Quote|\PHPUnit_Framework_MockObject_MockObject
-+     * Gets mock object for a quote.
-+     *
-+     * @return Quote|MockObject
-      */
-     private function getQuoteMock()
-     {
-diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php
-index 609b7f21dbf..d68838bafbf 100644
---- a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php
-+++ b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\Braintree\Test\Unit\Controller\Paypal;
- 
-+use Magento\Payment\Model\Method\Logger;
- use Magento\Quote\Model\Quote;
- use Magento\Framework\View\Layout;
- use Magento\Checkout\Model\Session;
-@@ -65,6 +66,11 @@ class ReviewTest extends \PHPUnit\Framework\TestCase
-      */
-     private $review;
- 
-+    /**
-+     * @var Logger|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $loggerMock;
-+
-     protected function setUp()
-     {
-         /** @var Context|\PHPUnit_Framework_MockObject_MockObject $contextMock */
-@@ -88,6 +94,9 @@ class ReviewTest extends \PHPUnit\Framework\TestCase
-             ->getMock();
-         $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
-             ->getMockForAbstractClass();
-+        $this->loggerMock = $this->getMockBuilder(Logger::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
- 
-         $contextMock->expects(self::once())
-             ->method('getRequest')
-@@ -103,7 +112,8 @@ class ReviewTest extends \PHPUnit\Framework\TestCase
-             $contextMock,
-             $this->configMock,
-             $this->checkoutSessionMock,
--            $this->quoteUpdaterMock
-+            $this->quoteUpdaterMock,
-+            $this->loggerMock
-         );
-     }
- 
-diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
-index 76ab8b8b53b..5620e8ffa92 100644
---- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
-+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
-@@ -5,14 +5,14 @@
-  */
- namespace Magento\Braintree\Test\Unit\Gateway\Request;
- 
--use Magento\Braintree\Gateway\Config\Config;
--use Magento\Braintree\Gateway\SubjectReader;
- use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
-+use Magento\Braintree\Gateway\SubjectReader;
- use Magento\Braintree\Observer\DataAssignObserver;
- use Magento\Payment\Gateway\Data\OrderAdapterInterface;
- use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
- use Magento\Sales\Model\Order\Payment;
- use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+use Magento\Braintree\Gateway\Config\Config;
- 
- /**
-  * Tests \Magento\Braintree\Gateway\Request\PaymentDataBuilder.
-@@ -20,18 +20,12 @@ use PHPUnit_Framework_MockObject_MockObject as MockObject;
- class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
- {
-     const PAYMENT_METHOD_NONCE = 'nonce';
--    const MERCHANT_ACCOUNT_ID = '245345';
- 
-     /**
-      * @var PaymentDataBuilder
-      */
-     private $builder;
- 
--    /**
--     * @var Config|MockObject
--     */
--    private $configMock;
--
-     /**
-      * @var Payment|MockObject
-      */
-@@ -52,12 +46,12 @@ class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
-      */
-     private $orderMock;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
--        $this->configMock = $this->getMockBuilder(Config::class)
--            ->disableOriginalConstructor()
--            ->getMock();
-         $this->paymentMock = $this->getMockBuilder(Payment::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-@@ -66,13 +60,19 @@ class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
-             ->getMock();
-         $this->orderMock = $this->createMock(OrderAdapterInterface::class);
- 
--        $this->builder = new PaymentDataBuilder($this->configMock, $this->subjectReaderMock);
-+        /** @var Config $config */
-+        $config = $this->getMockBuilder(Config::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->builder = new PaymentDataBuilder($config, $this->subjectReaderMock);
-     }
- 
-     /**
-+     * @return void
-      * @expectedException \InvalidArgumentException
-      */
--    public function testBuildReadPaymentException()
-+    public function testBuildReadPaymentException(): void
-     {
-         $buildSubject = [];
- 
-@@ -85,9 +85,10 @@ class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * @return void
-      * @expectedException \InvalidArgumentException
-      */
--    public function testBuildReadAmountException()
-+    public function testBuildReadAmountException(): void
-     {
-         $buildSubject = [
-             'payment' => $this->paymentDOMock,
-@@ -106,7 +107,10 @@ class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
-         $this->builder->build($buildSubject);
-     }
- 
--    public function testBuild()
-+    /**
-+     * @return void
-+     */
-+    public function testBuild(): void
-     {
-         $additionalData = [
-             [
-@@ -118,8 +122,7 @@ class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
-         $expectedResult = [
-             PaymentDataBuilder::AMOUNT  => 10.00,
-             PaymentDataBuilder::PAYMENT_METHOD_NONCE  => self::PAYMENT_METHOD_NONCE,
--            PaymentDataBuilder::ORDER_ID => '000000101',
--            PaymentDataBuilder::MERCHANT_ACCOUNT_ID  => self::MERCHANT_ACCOUNT_ID,
-+            PaymentDataBuilder::ORDER_ID => '000000101'
-         ];
- 
-         $buildSubject = [
-@@ -131,10 +134,6 @@ class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
-             ->method('getAdditionalInformation')
-             ->willReturnMap($additionalData);
- 
--        $this->configMock->expects(self::once())
--            ->method('getMerchantAccountId')
--            ->willReturn(self::MERCHANT_ACCOUNT_ID);
--
-         $this->paymentDOMock->expects(self::once())
-             ->method('getPayment')
-             ->willReturn($this->paymentMock);
-diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
-index 25ccd8b32d1..d4e1f2745e3 100644
---- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
-+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
-@@ -3,10 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Braintree\Test\Unit\Gateway\Request;
- 
--use Magento\Braintree\Gateway\SubjectReader;
- use Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder;
-+use Magento\Braintree\Gateway\SubjectReader;
- use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
- use Magento\Sales\Api\Data\OrderPaymentExtension;
- use Magento\Sales\Model\Order\Payment;
-@@ -26,47 +28,46 @@ class VaultCaptureDataBuilderTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @var PaymentDataObjectInterface|MockObject
-      */
--    private $paymentDOMock;
-+    private $paymentDO;
- 
-     /**
-      * @var Payment|MockObject
-      */
--    private $paymentMock;
-+    private $payment;
- 
-     /**
--     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
-+     * @var SubjectReader|MockObject
-      */
--    private $subjectReaderMock;
-+    private $subjectReader;
- 
-     /**
-      * @inheritdoc
-      */
--    protected function setUp()
-+    protected function setUp(): void
-     {
--        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
--        $this->paymentMock = $this->getMockBuilder(Payment::class)
-+        $this->paymentDO = $this->createMock(PaymentDataObjectInterface::class);
-+        $this->payment = $this->getMockBuilder(Payment::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->paymentDOMock->expects(static::once())
--            ->method('getPayment')
--            ->willReturn($this->paymentMock);
-+        $this->paymentDO->method('getPayment')
-+            ->willReturn($this->payment);
- 
--        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
-+        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->builder = new VaultCaptureDataBuilder($this->subjectReaderMock);
-+        $this->builder = new VaultCaptureDataBuilder($this->subjectReader);
-     }
- 
-     /**
--     * \Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder::build
-+     * Checks the result after builder execution.
-      */
--    public function testBuild()
-+    public function testBuild(): void
-     {
-         $amount = 30.00;
-         $token = '5tfm4c';
-         $buildSubject = [
--            'payment' => $this->paymentDOMock,
-+            'payment' => $this->paymentDO,
-             'amount' => $amount,
-         ];
- 
-@@ -75,36 +76,68 @@ class VaultCaptureDataBuilderTest extends \PHPUnit\Framework\TestCase
-             'paymentMethodToken' => $token,
-         ];
- 
--        $this->subjectReaderMock->expects(self::once())
--            ->method('readPayment')
-+        $this->subjectReader->method('readPayment')
-             ->with($buildSubject)
--            ->willReturn($this->paymentDOMock);
--        $this->subjectReaderMock->expects(self::once())
--            ->method('readAmount')
-+            ->willReturn($this->paymentDO);
-+        $this->subjectReader->method('readAmount')
-             ->with($buildSubject)
-             ->willReturn($amount);
- 
--        $paymentExtensionMock = $this->getMockBuilder(OrderPaymentExtension::class)
-+        /** @var OrderPaymentExtension|MockObject $paymentExtension */
-+        $paymentExtension = $this->getMockBuilder(OrderPaymentExtension::class)
-             ->setMethods(['getVaultPaymentToken'])
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
- 
--        $paymentTokenMock = $this->getMockBuilder(PaymentToken::class)
-+        /** @var PaymentToken|MockObject $paymentToken */
-+        $paymentToken = $this->getMockBuilder(PaymentToken::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $paymentExtensionMock->expects(static::once())
--            ->method('getVaultPaymentToken')
--            ->willReturn($paymentTokenMock);
--        $this->paymentMock->expects(static::once())
--            ->method('getExtensionAttributes')
--            ->willReturn($paymentExtensionMock);
-+        $paymentExtension->method('getVaultPaymentToken')
-+            ->willReturn($paymentToken);
-+        $this->payment->method('getExtensionAttributes')
-+            ->willReturn($paymentExtension);
- 
--        $paymentTokenMock->expects(static::once())
--            ->method('getGatewayToken')
-+        $paymentToken->method('getGatewayToken')
-             ->willReturn($token);
- 
-         $result = $this->builder->build($buildSubject);
-         self::assertEquals($expected, $result);
-     }
-+
-+    /**
-+     * Checks a builder execution if Payment Token doesn't exist.
-+     *
-+     * @expectedException \Magento\Payment\Gateway\Command\CommandException
-+     * @expectedExceptionMessage The Payment Token is not available to perform the request.
-+     */
-+    public function testBuildWithoutPaymentToken(): void
-+    {
-+        $amount = 30.00;
-+        $buildSubject = [
-+            'payment' => $this->paymentDO,
-+            'amount' => $amount,
-+        ];
-+
-+        $this->subjectReader->method('readPayment')
-+            ->with($buildSubject)
-+            ->willReturn($this->paymentDO);
-+        $this->subjectReader->method('readAmount')
-+            ->with($buildSubject)
-+            ->willReturn($amount);
-+
-+        /** @var OrderPaymentExtension|MockObject $paymentExtension */
-+        $paymentExtension = $this->getMockBuilder(OrderPaymentExtension::class)
-+            ->setMethods(['getVaultPaymentToken'])
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+
-+        $this->payment->method('getExtensionAttributes')
-+            ->willReturn($paymentExtension);
-+        $paymentExtension->method('getVaultPaymentToken')
-+            ->willReturn(null);
-+
-+        $this->builder->build($buildSubject);
-+    }
- }
-diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ErrorCodeProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ErrorCodeProviderTest.php
-new file mode 100644
-index 00000000000..cddb4852da0
---- /dev/null
-+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ErrorCodeProviderTest.php
-@@ -0,0 +1,94 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Braintree\Test\Unit\Gateway\Validator;
-+
-+use Braintree\Result\Error;
-+use Magento\Braintree\Gateway\Validator\ErrorCodeProvider;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Class ErrorCodeProviderTest
-+ */
-+class ErrorCodeProviderTest extends TestCase
-+{
-+    /**
-+     * @var ErrorCodeProvider
-+     */
-+    private $model;
-+
-+    /**
-+     * Checks a extracting error codes from response.
-+     *
-+     * @param array $errors
-+     * @param array $transaction
-+     * @param array $expectedResult
-+     * @return void
-+     * @dataProvider getErrorCodeDataProvider
-+     */
-+    public function testGetErrorCodes(array $errors, array $transaction, array $expectedResult): void
-+    {
-+        $response = new Error(
-+            [
-+                'errors' => ['errors' => $errors],
-+                'transaction' => $transaction,
-+            ]
-+        );
-+        $this->model = new ErrorCodeProvider();
-+        $actual = $this->model->getErrorCodes($response);
-+
-+        $this->assertSame($expectedResult, $actual);
-+    }
-+
-+    /**
-+     * Gets list of errors variations.
-+     *
-+     * @return array
-+     */
-+    public function getErrorCodeDataProvider(): array
-+    {
-+        return [
-+            [
-+                'errors' => [
-+                    ['code' => 91734],
-+                    ['code' => 91504]
-+                ],
-+                'transaction' => [
-+                    'status' => 'success',
-+                ],
-+                'expectedResult' => ['91734', '91504']
-+            ],
-+            [
-+                'errors' => [],
-+                'transaction' => [
-+                    'status' => 'processor_declined',
-+                    'processorResponseCode' => '1000'
-+                ],
-+                'expectedResult' => ['1000']
-+            ],
-+            [
-+                'errors' => [],
-+                'transaction' => [
-+                    'status' => 'processor_declined',
-+                    'processorResponseCode' => '1000'
-+                ],
-+                'expectedResult' => ['1000']
-+            ],
-+            [
-+                'errors' => [
-+                    ['code' => 91734],
-+                    ['code' => 91504]
-+                ],
-+                'transaction' => [
-+                    'status' => 'processor_declined',
-+                    'processorResponseCode' => '1000'
-+                ],
-+                'expectedResult' => ['91734', '91504', '1000']
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
-index 4741a3ea38c..d966e4e3f10 100644
---- a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
-+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
-@@ -14,6 +14,9 @@ use Magento\Payment\Gateway\Validator\Result;
- use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
- use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
-+/**
-+ * Class GeneralResponseValidatorTest
-+ */
- class GeneralResponseValidatorTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -61,11 +64,13 @@ class GeneralResponseValidatorTest extends \PHPUnit\Framework\TestCase
-         $result = new Result($isValid, $messages);
- 
-         $this->resultInterfaceFactory->method('create')
--            ->with([
--                'isValid' => $isValid,
--                'failsDescription' => $messages,
--                'errorCodes' => $errorCodes
--            ])
-+            ->with(
-+                [
-+                    'isValid' => $isValid,
-+                    'failsDescription' => $messages,
-+                    'errorCodes' => $errorCodes
-+                ]
-+            )
-             ->willReturn($result);
- 
-         $actual = $this->responseValidator->validate($validationSubject);
-@@ -82,9 +87,11 @@ class GeneralResponseValidatorTest extends \PHPUnit\Framework\TestCase
-     {
-         $successTransaction = new \stdClass();
-         $successTransaction->success = true;
-+        $successTransaction->status = 'authorized';
- 
-         $failureTransaction = new \stdClass();
-         $failureTransaction->success = false;
-+        $failureTransaction->status = 'declined';
-         $failureTransaction->message = 'Transaction was failed.';
- 
-         $errors = [
-@@ -93,10 +100,10 @@ class GeneralResponseValidatorTest extends \PHPUnit\Framework\TestCase
-                     'code' => 81804,
-                     'attribute' => 'base',
-                     'message' => 'Cannot process transaction.'
--                ]
-+                ],
-             ]
-         ];
--        $errorTransaction = new Error(['errors' => $errors]);
-+        $errorTransaction = new Error(['errors' => $errors, 'transaction' => ['status' => 'declined']]);
- 
-         return [
-             [
-diff --git a/app/code/Magento/Braintree/Test/Unit/Model/LocaleResolverTest.php b/app/code/Magento/Braintree/Test/Unit/Model/LocaleResolverTest.php
-index b6ef534c55c..f80b6307664 100644
---- a/app/code/Magento/Braintree/Test/Unit/Model/LocaleResolverTest.php
-+++ b/app/code/Magento/Braintree/Test/Unit/Model/LocaleResolverTest.php
-@@ -98,19 +98,35 @@ class LocaleResolverTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Test getLocale method
-      *
--     * @return void
-+     * @param string $locale
-+     * @param string $expectedLocale
-+     * @dataProvider getLocaleDataProvider
-      */
--    public function testGetLocale()
-+    public function testGetLocale(string $locale, string $expectedLocale)
-     {
--        $locale = 'en_TEST';
--        $allowedLocales = 'en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,nl_NL';
--        $this->resolverMock->expects($this->once())->method('getLocale')->willReturn($locale);
--        $this->configMock->expects($this->once())->method('getValue')->with('supported_locales')
-+        $allowedLocales = 'en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,zh_CN,zh_TW,nl_NL';
-+        $this->resolverMock->method('getLocale')
-+            ->willReturn($locale);
-+        $this->configMock->method('getValue')
-+            ->with('supported_locales')
-             ->willReturn($allowedLocales);
--
--        $expected = 'en_US';
-         $actual = $this->localeResolver->getLocale();
--        self::assertEquals($expected, $actual);
-+
-+        self::assertEquals($expectedLocale, $actual);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getLocaleDataProvider(): array
-+    {
-+        return [
-+            ['locale' => 'zh_Hans_CN', 'expectedLocale' => 'zh_CN'],
-+            ['locale' => 'zh_Hant_HK', 'expectedLocale' => 'zh_HK'],
-+            ['locale' => 'zh_Hant_TW', 'expectedLocale' => 'zh_TW'],
-+            ['locale' => 'fr_FR', 'expectedLocale' => 'fr_FR'],
-+            ['locale' => 'unknown', 'expectedLocale' => 'en_US'],
-+        ];
-     }
- 
-     /**
-diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php
-index 1aecba91b9a..c8524017274 100644
---- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php
-+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php
-@@ -3,9 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Braintree\Test\Unit\Model\Paypal\Helper;
- 
- use Magento\Braintree\Model\Paypal\Helper\OrderPlace;
-+use Magento\Braintree\Model\Paypal\OrderCancellationService;
- use Magento\Checkout\Api\AgreementsValidatorInterface;
- use Magento\Checkout\Helper\Data;
- use Magento\Checkout\Model\Type\Onepage;
-@@ -14,6 +17,7 @@ use Magento\Customer\Model\Session;
- use Magento\Quote\Api\CartManagementInterface;
- use Magento\Quote\Model\Quote;
- use Magento\Quote\Model\Quote\Address;
-+use PHPUnit\Framework\MockObject\MockObject;
- 
- /**
-  * Class OrderPlaceTest
-@@ -27,62 +31,80 @@ class OrderPlaceTest extends \PHPUnit\Framework\TestCase
-     const TEST_EMAIL = 'test@test.loc';
- 
-     /**
--     * @var CartManagementInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var CartManagementInterface|MockObject
-      */
--    private $cartManagementMock;
-+    private $cartManagement;
- 
-     /**
--     * @var AgreementsValidatorInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var AgreementsValidatorInterface|MockObject
-      */
--    private $agreementsValidatorMock;
-+    private $agreementsValidator;
- 
-     /**
--     * @var Session|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Session|MockObject
-      */
--    private $customerSessionMock;
-+    private $customerSession;
- 
-     /**
--     * @var Data|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Data|MockObject
-      */
--    private $checkoutHelperMock;
-+    private $checkoutHelper;
- 
-     /**
--     * @var Address|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Address|MockObject
-      */
--    private $billingAddressMock;
-+    private $billingAddress;
- 
-     /**
-      * @var OrderPlace
-      */
-     private $orderPlace;
- 
-+    /**
-+     * @var OrderCancellationService|MockObject
-+     */
-+    private $orderCancellation;
-+
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
--        $this->cartManagementMock = $this->getMockBuilder(CartManagementInterface::class)
-+        $this->cartManagement = $this->getMockBuilder(CartManagementInterface::class)
-             ->getMockForAbstractClass();
--        $this->agreementsValidatorMock = $this->getMockBuilder(AgreementsValidatorInterface::class)
-+        $this->agreementsValidator = $this->getMockBuilder(AgreementsValidatorInterface::class)
-             ->getMockForAbstractClass();
--        $this->customerSessionMock = $this->getMockBuilder(Session::class)
-+        $this->customerSession = $this->getMockBuilder(Session::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->checkoutHelper = $this->getMockBuilder(Data::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->checkoutHelperMock = $this->getMockBuilder(Data::class)
-+
-+        $this->orderCancellation = $this->getMockBuilder(OrderCancellationService::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-         $this->orderPlace = new OrderPlace(
--            $this->cartManagementMock,
--            $this->agreementsValidatorMock,
--            $this->customerSessionMock,
--            $this->checkoutHelperMock
-+            $this->cartManagement,
-+            $this->agreementsValidator,
-+            $this->customerSession,
-+            $this->checkoutHelper,
-+            $this->orderCancellation
-         );
-     }
- 
-+    /**
-+     * Checks a scenario for a guest customer.
-+     *
-+     * @throws \Exception
-+     */
-     public function testExecuteGuest()
-     {
-         $agreement = ['test', 'test'];
-         $quoteMock = $this->getQuoteMock();
- 
--        $this->agreementsValidatorMock->expects(self::once())
-+        $this->agreementsValidator->expects(self::once())
-             ->method('isValid')
-             ->willReturn(true);
- 
-@@ -97,7 +119,7 @@ class OrderPlaceTest extends \PHPUnit\Framework\TestCase
-             ->method('getId')
-             ->willReturn(10);
- 
--        $this->cartManagementMock->expects(self::once())
-+        $this->cartManagement->expects(self::once())
-             ->method('placeOrder')
-             ->with(10);
- 
-@@ -105,9 +127,11 @@ class OrderPlaceTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
-+     * Disables address validation.
-+     *
-+     * @param MockObject $quoteMock
-      */
--    private function disabledQuoteAddressValidationStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
-+    private function disabledQuoteAddressValidationStep(MockObject $quoteMock)
-     {
-         $billingAddressMock = $this->getBillingAddressMock($quoteMock);
-         $shippingAddressMock = $this->getMockBuilder(Address::class)
-@@ -115,26 +139,21 @@ class OrderPlaceTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $quoteMock->expects(self::once())
--            ->method('getShippingAddress')
-+        $quoteMock->method('getShippingAddress')
-             ->willReturn($shippingAddressMock);
- 
--        $billingAddressMock->expects(self::once())
--            ->method('setShouldIgnoreValidation')
-+        $billingAddressMock->method('setShouldIgnoreValidation')
-             ->with(true)
-             ->willReturnSelf();
- 
--        $quoteMock->expects(self::once())
--            ->method('getIsVirtual')
-+        $quoteMock->method('getIsVirtual')
-             ->willReturn(false);
- 
--        $shippingAddressMock->expects(self::once())
--            ->method('setShouldIgnoreValidation')
-+        $shippingAddressMock->method('setShouldIgnoreValidation')
-             ->with(true)
-             ->willReturnSelf();
- 
--        $billingAddressMock->expects(self::any())
--            ->method('getEmail')
-+        $billingAddressMock->method('getEmail')
-             ->willReturn(self::TEST_EMAIL);
- 
-         $billingAddressMock->expects(self::never())
-@@ -142,25 +161,24 @@ class OrderPlaceTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
-+     * Prepares checkout step.
-+     *
-+     * @param MockObject $quoteMock
-      */
--    private function getCheckoutMethodStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
-+    private function getCheckoutMethodStep(MockObject $quoteMock)
-     {
--        $this->customerSessionMock->expects(self::once())
--            ->method('isLoggedIn')
-+        $this->customerSession->method('isLoggedIn')
-             ->willReturn(false);
- 
-         $quoteMock->expects(self::at(1))
-             ->method('getCheckoutMethod')
-             ->willReturn(null);
- 
--        $this->checkoutHelperMock->expects(self::once())
--            ->method('isAllowedGuestCheckout')
-+        $this->checkoutHelper->method('isAllowedGuestCheckout')
-             ->with($quoteMock)
-             ->willReturn(true);
- 
--        $quoteMock->expects(self::once())
--            ->method('setCheckoutMethod')
-+        $quoteMock->method('setCheckoutMethod')
-             ->with(Onepage::METHOD_GUEST);
- 
-         $quoteMock->expects(self::at(2))
-@@ -169,9 +187,11 @@ class OrderPlaceTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
-+     * Prepares quote.
-+     *
-+     * @param MockObject $quoteMock
-      */
--    private function prepareGuestQuoteStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
-+    private function prepareGuestQuoteStep(MockObject $quoteMock)
-     {
-         $billingAddressMock = $this->getBillingAddressMock($quoteMock);
- 
-@@ -184,44 +204,44 @@ class OrderPlaceTest extends \PHPUnit\Framework\TestCase
-             ->method('getEmail')
-             ->willReturn(self::TEST_EMAIL);
- 
--        $quoteMock->expects(self::once())
--            ->method('setCustomerEmail')
-+        $quoteMock->method('setCustomerEmail')
-             ->with(self::TEST_EMAIL)
-             ->willReturnSelf();
- 
--        $quoteMock->expects(self::once())
--            ->method('setCustomerIsGuest')
-+        $quoteMock->method('setCustomerIsGuest')
-             ->with(true)
-             ->willReturnSelf();
- 
--        $quoteMock->expects(self::once())
--            ->method('setCustomerGroupId')
-+        $quoteMock->method('setCustomerGroupId')
-             ->with(Group::NOT_LOGGED_IN_ID)
-             ->willReturnSelf();
-     }
- 
-     /**
--     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
--     * @return Address|\PHPUnit_Framework_MockObject_MockObject
-+     * Gets a mock object for a billing address entity.
-+     *
-+     * @param MockObject $quoteMock
-+     * @return Address|MockObject
-      */
--    private function getBillingAddressMock(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
-+    private function getBillingAddressMock(MockObject $quoteMock)
-     {
--        if (!isset($this->billingAddressMock)) {
--            $this->billingAddressMock = $this->getMockBuilder(Address::class)
-+        if (!isset($this->billingAddress)) {
-+            $this->billingAddress = $this->getMockBuilder(Address::class)
-                 ->setMethods(['setShouldIgnoreValidation', 'getEmail', 'setSameAsBilling'])
-                 ->disableOriginalConstructor()
-                 ->getMock();
-         }
- 
--        $quoteMock->expects(self::any())
--            ->method('getBillingAddress')
--            ->willReturn($this->billingAddressMock);
-+        $quoteMock->method('getBillingAddress')
-+            ->willReturn($this->billingAddress);
- 
--        return $this->billingAddressMock;
-+        return $this->billingAddress;
-     }
- 
-     /**
--     * @return Quote|\PHPUnit_Framework_MockObject_MockObject
-+     * Gets a mock object for a quote.
-+     *
-+     * @return Quote|MockObject
-      */
-     private function getQuoteMock()
-     {
-diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
-index 62452228b61..ec716732b11 100644
---- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
-+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
-@@ -3,23 +3,24 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Braintree\Test\Unit\Model\Paypal\Helper;
- 
--use Magento\Quote\Model\Quote;
--use Magento\Quote\Model\Quote\Address;
--use Magento\Quote\Model\Quote\Payment;
--use Magento\Quote\Api\CartRepositoryInterface;
--use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
--use Magento\Braintree\Observer\DataAssignObserver;
- use Magento\Braintree\Gateway\Config\PayPal\Config;
- use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
-+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
-+use Magento\Braintree\Observer\DataAssignObserver;
-+use Magento\Quote\Api\CartRepositoryInterface;
- use Magento\Quote\Api\Data\CartExtensionInterface;
-+use Magento\Quote\Model\Quote;
-+use Magento\Quote\Model\Quote\Address;
-+use Magento\Quote\Model\Quote\Payment;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
- /**
-  * Class QuoteUpdaterTest
-  *
-- * @see \Magento\Braintree\Model\Paypal\Helper\QuoteUpdater
-- *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class QuoteUpdaterTest extends \PHPUnit\Framework\TestCase
-@@ -27,24 +28,24 @@ class QuoteUpdaterTest extends \PHPUnit\Framework\TestCase
-     const TEST_NONCE = '3ede7045-2aea-463e-9754-cd658ffeeb48';
- 
-     /**
--     * @var Config|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Config|MockObject
-      */
--    private $configMock;
-+    private $config;
- 
-     /**
--     * @var CartRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var CartRepositoryInterface|MockObject
-      */
--    private $quoteRepositoryMock;
-+    private $quoteRepository;
- 
-     /**
--     * @var Address|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Address|MockObject
-      */
--    private $billingAddressMock;
-+    private $billingAddress;
- 
-     /**
--     * @var Address|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Address|MockObject
-      */
--    private $shippingAddressMock;
-+    private $shippingAddress;
- 
-     /**
-      * @var QuoteUpdater
-@@ -52,17 +53,17 @@ class QuoteUpdaterTest extends \PHPUnit\Framework\TestCase
-     private $quoteUpdater;
- 
-     /**
--     * @return void
-+     * @inheritdoc
-      */
-     protected function setUp()
-     {
--        $this->configMock = $this->getMockBuilder(Config::class)
-+        $this->config = $this->getMockBuilder(Config::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->quoteRepositoryMock = $this->getMockBuilder(CartRepositoryInterface::class)
-+        $this->quoteRepository = $this->getMockBuilder(CartRepositoryInterface::class)
-             ->getMockForAbstractClass();
- 
--        $this->billingAddressMock = $this->getMockBuilder(Address::class)
-+        $this->billingAddress = $this->getMockBuilder(Address::class)
-             ->setMethods(
-                 [
-                     'setLastname',
-@@ -77,9 +78,10 @@ class QuoteUpdaterTest extends \PHPUnit\Framework\TestCase
-                     'setShouldIgnoreValidation',
-                     'getEmail'
-                 ]
--            )->disableOriginalConstructor()
-+            )
-+            ->disableOriginalConstructor()
-             ->getMock();
--        $this->shippingAddressMock = $this->getMockBuilder(Address::class)
-+        $this->shippingAddress = $this->getMockBuilder(Address::class)
-             ->setMethods(
-                 [
-                     'setLastname',
-@@ -93,61 +95,61 @@ class QuoteUpdaterTest extends \PHPUnit\Framework\TestCase
-                     'setPostcode',
-                     'setShouldIgnoreValidation'
-                 ]
--            )->disableOriginalConstructor()
-+            )
-+            ->disableOriginalConstructor()
-             ->getMock();
- 
-         $this->quoteUpdater = new QuoteUpdater(
--            $this->configMock,
--            $this->quoteRepositoryMock
-+            $this->config,
-+            $this->quoteRepository
-         );
-     }
- 
-     /**
--     * @return void
-+     * Checks if quote details can be update by the response from Braintree.
-+     *
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
--    public function testExecute()
-+    public function testExecute(): void
-     {
-         $details = $this->getDetails();
--        $quoteMock = $this->getQuoteMock();
--        $paymentMock = $this->getPaymentMock();
-+        $quote = $this->getQuoteMock();
-+        $payment = $this->getPaymentMock();
- 
--        $quoteMock->expects(self::once())
--            ->method('getPayment')
--            ->willReturn($paymentMock);
-+        $quote->method('getPayment')
-+            ->willReturn($payment);
- 
--        $paymentMock->expects(self::once())
--            ->method('setMethod')
-+        $payment->method('setMethod')
-             ->with(ConfigProvider::PAYPAL_CODE);
--        $paymentMock->expects(self::once())
--            ->method('setAdditionalInformation')
-+        $payment->method('setAdditionalInformation')
-             ->with(DataAssignObserver::PAYMENT_METHOD_NONCE, self::TEST_NONCE);
- 
--        $this->updateQuoteStep($quoteMock, $details);
-+        $this->updateQuoteStep($quote, $details);
- 
--        $this->quoteUpdater->execute(self::TEST_NONCE, $details, $quoteMock);
-+        $this->quoteUpdater->execute(self::TEST_NONCE, $details, $quote);
-     }
- 
-     /**
-+     * Disables quote's addresses validation.
-+     *
-      * @return void
-      */
--    private function disabledQuoteAddressValidationStep()
-+    private function disabledQuoteAddressValidationStep(): void
-     {
--        $this->billingAddressMock->expects(self::once())
--            ->method('setShouldIgnoreValidation')
-+        $this->billingAddress->method('setShouldIgnoreValidation')
-             ->with(true);
--        $this->shippingAddressMock->expects(self::once())
--            ->method('setShouldIgnoreValidation')
-+        $this->shippingAddress->method('setShouldIgnoreValidation')
-             ->with(true);
--        $this->billingAddressMock->expects(self::once())
--            ->method('getEmail')
-+        $this->billingAddress->method('getEmail')
-             ->willReturn('bt_buyer_us@paypal.com');
-     }
- 
-     /**
-+     * Gets quote's details.
-+     *
-      * @return array
-      */
--    private function getDetails()
-+    private function getDetails(): array
-     {
-         return [
-             'email' => 'bt_buyer_us@paypal.com',
-@@ -157,74 +159,71 @@ class QuoteUpdaterTest extends \PHPUnit\Framework\TestCase
-             'phone' => '312-123-4567',
-             'countryCode' => 'US',
-             'shippingAddress' => [
--                'streetAddress' => '123 Division Street',
--                'extendedAddress' => 'Apt. #1',
--                'locality' => 'Chicago',
--                'region' => 'IL',
-+                'line1' => '123 Division Street',
-+                'line2' => 'Apt. #1',
-+                'city' => 'Chicago',
-+                'state' => 'IL',
-                 'postalCode' => '60618',
--                'countryCodeAlpha2' => 'US',
--                'recipientName' => 'John Doe',
-+                'countryCode' => 'US',
-+                'recipientName' => 'Jane Smith',
-             ],
-             'billingAddress' => [
--                'streetAddress' => '123 Billing Street',
--                'extendedAddress' => 'Apt. #1',
--                'locality' => 'Chicago',
--                'region' => 'IL',
-+                'line1' => '123 Billing Street',
-+                'line2' => 'Apt. #1',
-+                'city' => 'Chicago',
-+                'state' => 'IL',
-                 'postalCode' => '60618',
--                'countryCodeAlpha2' => 'US',
-+                'countryCode' => 'US',
-             ],
-         ];
-     }
- 
-     /**
-+     * Updates shipping address details.
-+     *
-      * @param array $details
-      */
--    private function updateShippingAddressStep(array $details)
-+    private function updateShippingAddressStep(array $details): void
-     {
--        $this->shippingAddressMock->expects(self::once())
--            ->method('setLastname')
--            ->with($details['lastName']);
--        $this->shippingAddressMock->expects(self::once())
--            ->method('setFirstname')
--            ->with($details['firstName']);
--        $this->shippingAddressMock->expects(self::once())
--            ->method('setEmail')
-+        $this->shippingAddress->method('setLastname')
-+            ->with('Smith');
-+        $this->shippingAddress->method('setFirstname')
-+            ->with('Jane');
-+        $this->shippingAddress->method('setEmail')
-             ->with($details['email']);
--        $this->shippingAddressMock->expects(self::once())
--            ->method('setCollectShippingRates')
-+        $this->shippingAddress->method('setCollectShippingRates')
-             ->with(true);
- 
--        $this->updateAddressDataStep($this->shippingAddressMock, $details['shippingAddress']);
-+        $this->updateAddressDataStep($this->shippingAddress, $details['shippingAddress']);
-     }
- 
-     /**
--     * @param \PHPUnit_Framework_MockObject_MockObject $addressMock
-+     * Updates address details.
-+     *
-+     * @param MockObject $address
-      * @param array $addressData
-      */
--    private function updateAddressDataStep(\PHPUnit_Framework_MockObject_MockObject $addressMock, array $addressData)
-+    private function updateAddressDataStep(MockObject $address, array $addressData): void
-     {
--        $addressMock->expects(self::once())
--            ->method('setStreet')
--            ->with([$addressData['streetAddress'], $addressData['extendedAddress']]);
--        $addressMock->expects(self::once())
--            ->method('setCity')
--            ->with($addressData['locality']);
--        $addressMock->expects(self::once())
--            ->method('setRegionCode')
--            ->with($addressData['region']);
--        $addressMock->expects(self::once())
--            ->method('setCountryId')
--            ->with($addressData['countryCodeAlpha2']);
--        $addressMock->expects(self::once())
--            ->method('setPostcode')
-+        $address->method('setStreet')
-+            ->with([$addressData['line1'], $addressData['line2']]);
-+        $address->method('setCity')
-+            ->with($addressData['city']);
-+        $address->method('setRegionCode')
-+            ->with($addressData['state']);
-+        $address->method('setCountryId')
-+            ->with($addressData['countryCode']);
-+        $address->method('setPostcode')
-             ->with($addressData['postalCode']);
-     }
- 
-     /**
--     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
-+     * Updates quote's address details.
-+     *
-+     * @param MockObject $quoteMock
-      * @param array $details
-      */
--    private function updateQuoteAddressStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock, array $details)
-+    private function updateQuoteAddressStep(MockObject $quoteMock, array $details): void
-     {
-         $quoteMock->expects(self::exactly(2))
-             ->method('getIsVirtual')
-@@ -235,64 +234,61 @@ class QuoteUpdaterTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Updates billing address details.
-+     *
-      * @param array $details
-      */
--    private function updateBillingAddressStep(array $details)
-+    private function updateBillingAddressStep(array $details): void
-     {
--        $this->configMock->expects(self::once())
--            ->method('isRequiredBillingAddress')
-+        $this->config->method('isRequiredBillingAddress')
-             ->willReturn(true);
- 
--        $this->updateAddressDataStep($this->billingAddressMock, $details['billingAddress']);
-+        $this->updateAddressDataStep($this->billingAddress, $details['billingAddress']);
- 
--        $this->billingAddressMock->expects(self::once())
--            ->method('setLastname')
-+        $this->billingAddress->method('setLastname')
-             ->with($details['lastName']);
--        $this->billingAddressMock->expects(self::once())
--            ->method('setFirstname')
-+        $this->billingAddress->method('setFirstname')
-             ->with($details['firstName']);
--        $this->billingAddressMock->expects(self::once())
--            ->method('setEmail')
-+        $this->billingAddress->method('setEmail')
-             ->with($details['email']);
-     }
- 
-     /**
--     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
-+     * Updates quote details.
-+     *
-+     * @param MockObject $quote
-      * @param array $details
-      */
--    private function updateQuoteStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock, array $details)
-+    private function updateQuoteStep(MockObject $quote, array $details): void
-     {
--        $quoteMock->expects(self::once())
--            ->method('setMayEditShippingAddress')
-+        $quote->method('setMayEditShippingAddress')
-             ->with(false);
--        $quoteMock->expects(self::once())
--            ->method('setMayEditShippingMethod')
-+        $quote->method('setMayEditShippingMethod')
-             ->with(true);
- 
--        $quoteMock->expects(self::exactly(2))
--            ->method('getShippingAddress')
--            ->willReturn($this->shippingAddressMock);
--        $quoteMock->expects(self::exactly(2))
-+        $quote->method('getShippingAddress')
-+            ->willReturn($this->shippingAddress);
-+        $quote->expects(self::exactly(2))
-             ->method('getBillingAddress')
--            ->willReturn($this->billingAddressMock);
-+            ->willReturn($this->billingAddress);
- 
--        $this->updateQuoteAddressStep($quoteMock, $details);
-+        $this->updateQuoteAddressStep($quote, $details);
-         $this->disabledQuoteAddressValidationStep();
- 
--        $quoteMock->expects(self::once())
--            ->method('collectTotals');
-+        $quote->method('collectTotals');
- 
--        $this->quoteRepositoryMock->expects(self::once())
--            ->method('save')
--            ->with($quoteMock);
-+        $this->quoteRepository->method('save')
-+            ->with($quote);
-     }
- 
-     /**
--     * @return Quote|\PHPUnit_Framework_MockObject_MockObject
-+     * Creates a mock for Quote object.
-+     *
-+     * @return Quote|MockObject
-      */
--    private function getQuoteMock()
-+    private function getQuoteMock(): MockObject
-     {
--        $quoteMock = $this->getMockBuilder(Quote::class)
-+        $quote = $this->getMockBuilder(Quote::class)
-             ->setMethods(
-                 [
-                     'getIsVirtual',
-@@ -304,25 +300,27 @@ class QuoteUpdaterTest extends \PHPUnit\Framework\TestCase
-                     'getBillingAddress',
-                     'getExtensionAttributes'
-                 ]
--            )->disableOriginalConstructor()
-+            )
-+            ->disableOriginalConstructor()
-             ->getMock();
- 
--        $cartExtensionMock = $this->getMockBuilder(CartExtensionInterface::class)
-+        $cartExtension = $this->getMockBuilder(CartExtensionInterface::class)
-             ->setMethods(['setShippingAssignments'])
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
- 
--        $quoteMock->expects(self::any())
--            ->method('getExtensionAttributes')
--            ->willReturn($cartExtensionMock);
-+        $quote->method('getExtensionAttributes')
-+            ->willReturn($cartExtension);
- 
--        return $quoteMock;
-+        return $quote;
-     }
- 
-     /**
--     * @return Payment|\PHPUnit_Framework_MockObject_MockObject
-+     * Creates a mock for Payment object.
-+     *
-+     * @return Payment|MockObject
-      */
--    private function getPaymentMock()
-+    private function getPaymentMock(): MockObject
-     {
-         return $this->getMockBuilder(Payment::class)
-             ->disableOriginalConstructor()
-diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php b/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php
-index 372415d3530..55e76cae910 100644
---- a/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php
-+++ b/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php
-@@ -40,7 +40,7 @@ class BraintreeTransactionStub
-     }
- 
-     /**
--     * Checks for the existance of a property stored in the private $_attributes property
-+     * Checks for the existence of a property stored in the private $_attributes property
-      *
-      * @ignore
-      * @param string $name
-diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
-index 24bc4eae960..55bc2cb195d 100644
---- a/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
-+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Braintree\Test\Unit\Model\Ui;
- 
- use Magento\Braintree\Gateway\Config\Config;
-@@ -124,6 +126,7 @@ class ConfigProviderTest extends \PHPUnit\Framework\TestCase
-                     'isActive' => true,
-                     'getCcTypesMapper' => ['visa' => 'VI', 'american-express'=> 'AE'],
-                     'getSdkUrl' => self::SDK_URL,
-+                    'getHostedFieldsSdkUrl' => 'https://sdk.com/test.js',
-                     'getCountrySpecificCardTypeConfig' => [
-                         'GB' => ['VI', 'AE'],
-                         'US' => ['DI', 'JCB']
-@@ -134,7 +137,6 @@ class ConfigProviderTest extends \PHPUnit\Framework\TestCase
-                     'getThresholdAmount' => 20,
-                     'get3DSecureSpecificCountries' => ['GB', 'US', 'CA'],
-                     'getEnvironment' => 'test-environment',
--                    'getKountMerchantId' => 'test-kount-merchant-id',
-                     'getMerchantId' => 'test-merchant-id',
-                     'hasFraudProtection' => true,
-                 ],
-@@ -145,6 +147,7 @@ class ConfigProviderTest extends \PHPUnit\Framework\TestCase
-                             'clientToken' => self::CLIENT_TOKEN,
-                             'ccTypesMapper' => ['visa' => 'VI', 'american-express' => 'AE'],
-                             'sdkUrl' => self::SDK_URL,
-+                            'hostedFieldsSdkUrl' => 'https://sdk.com/test.js',
-                             'countrySpecificCardTypes' =>[
-                                 'GB' => ['VI', 'AE'],
-                                 'US' => ['DI', 'JCB']
-@@ -152,7 +155,6 @@ class ConfigProviderTest extends \PHPUnit\Framework\TestCase
-                             'availableCardTypes' => ['AE', 'VI', 'MC', 'DI', 'JCB'],
-                             'useCvv' => true,
-                             'environment' => 'test-environment',
--                            'kountMerchantId' => 'test-kount-merchant-id',
-                             'merchantId' => 'test-merchant-id',
-                             'hasFraudProtection' => true,
-                             'ccVaultCode' => ConfigProvider::CC_VAULT_CODE
-diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
-index 22f7f46bd98..42469fe0faf 100644
---- a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
-+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
-@@ -77,6 +77,9 @@ class ConfigProviderTest extends \PHPUnit\Framework\TestCase
-                 'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
-             ]);
- 
-+        $this->config->method('isRequiredBillingAddress')
-+            ->willReturn(1);
-+
-         self::assertEquals($expected, $this->configProvider->getConfig());
-     }
- 
-@@ -101,7 +104,8 @@ class ConfigProviderTest extends \PHPUnit\Framework\TestCase
-                             'skipOrderReview' => false,
-                             'paymentIcon' => [
-                                 'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
--                            ]
-+                            ],
-+                            'isRequiredBillingAddress' => true
-                         ]
-                     ]
-                 ]
-diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
-index ba51a5436fe..2f956076f38 100644
---- a/app/code/Magento/Braintree/composer.json
-+++ b/app/code/Magento/Braintree/composer.json
-@@ -6,7 +6,7 @@
-     },
-     "require": {
-         "php": "~7.1.3||~7.2.0",
--        "braintree/braintree_php": "3.34.0",
-+        "braintree/braintree_php": "3.35.0",
-         "magento/framework": "*",
-         "magento/magento-composer-installer": "*",
-         "magento/module-catalog": "*",
-@@ -21,7 +21,8 @@
-         "magento/module-quote": "*",
-         "magento/module-sales": "*",
-         "magento/module-ui": "*",
--        "magento/module-vault": "*"
-+        "magento/module-vault": "*",
-+        "magento/module-multishipping": "*"
-     },
-     "suggest": {
-         "magento/module-checkout-agreements": "*",
-diff --git a/app/code/Magento/Braintree/etc/acl.xml b/app/code/Magento/Braintree/etc/acl.xml
-index f50a55911d6..066ccc818d4 100644
---- a/app/code/Magento/Braintree/etc/acl.xml
-+++ b/app/code/Magento/Braintree/etc/acl.xml
-@@ -11,7 +11,7 @@
-             <resource id="Magento_Backend::admin">
-                 <resource id="Magento_Reports::report">
-                     <resource id="Magento_Reports::salesroot">
--                        <resource id="Magento_Braintree::settlement_report" title="Braintree Settlement" sortOrder="80" />
-+                        <resource id="Magento_Braintree::settlement_report" title="Braintree Settlement" translate="title" sortOrder="80" />
-                     </resource>
-                 </resource>
-                 <resource id="Magento_Sales::sales">
-diff --git a/app/code/Magento/Braintree/etc/adminhtml/di.xml b/app/code/Magento/Braintree/etc/adminhtml/di.xml
-index 7a803f803ae..9de1ad48d22 100644
---- a/app/code/Magento/Braintree/etc/adminhtml/di.xml
-+++ b/app/code/Magento/Braintree/etc/adminhtml/di.xml
-@@ -29,6 +29,7 @@
-                 <item name="vault" xsi:type="string">Magento\Braintree\Gateway\Request\VaultDataBuilder</item>
-                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
-                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
-             </argument>
-         </arguments>
-     </virtualType>
-@@ -41,6 +42,7 @@
-                 <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
-                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
-                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
-             </argument>
-         </arguments>
-     </virtualType>
-diff --git a/app/code/Magento/Braintree/etc/adminhtml/menu.xml b/app/code/Magento/Braintree/etc/adminhtml/menu.xml
-index 590d5b3dce0..ce4dd4844f3 100644
---- a/app/code/Magento/Braintree/etc/adminhtml/menu.xml
-+++ b/app/code/Magento/Braintree/etc/adminhtml/menu.xml
-@@ -10,6 +10,7 @@
-         <add
-                 id="Magento_Braintree::settlement_report"
-                 title="Braintree Settlement"
-+                translate="title"
-                 module="Magento_Braintree"
-                 sortOrder="80"
-                 parent="Magento_Reports::report_salesroot"
-diff --git a/app/code/Magento/Braintree/etc/adminhtml/system.xml b/app/code/Magento/Braintree/etc/adminhtml/system.xml
-index c49402070f0..bd4346e095c 100644
---- a/app/code/Magento/Braintree/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Braintree/etc/adminhtml/system.xml
-@@ -41,7 +41,7 @@
-                         </requires>
-                     </field>
-                     <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/braintree.html</comment>
-+                        <comment>https://docs.magento.com/m2/ce/user_guide/payment/braintree.html</comment>
-                         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                     </group>
-                     <group id="braintree_required" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="5">
-@@ -84,31 +84,23 @@
-                             <label>Vault Title</label>
-                             <config_path>payment/braintree_cc_vault/title</config_path>
-                         </field>
--                        <field id="merchant_account_id" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <field id="merchant_account_id" translate="label comment" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
-                             <label>Merchant Account ID</label>
-                             <comment>If you don't specify the merchant account to use to process a transaction, Braintree will process it using your default merchant account.</comment>
-                             <config_path>payment/braintree/merchant_account_id</config_path>
-                         </field>
--                        <field id="fraudprotection" translate="label" type="select" sortOrder="34" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <field id="fraudprotection" translate="label comment" type="select" sortOrder="34" showInDefault="1" showInWebsite="1" showInStore="0">
-                             <label>Advanced Fraud Protection</label>
-                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                             <comment>Be sure to Enable Advanced Fraud Protection in Your Braintree Account in Settings/Processing Section</comment>
-                             <config_path>payment/braintree/fraudprotection</config_path>
-                         </field>
--                        <field id="kount_id" translate="label" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="0">
--                            <label>Kount Merchant ID</label>
--                            <comment><![CDATA[Used for direct fraud tool integration. Make sure you also contact <a href="mailto:accounts@braintreepayments.com">accounts@braintreepayments.com</a> to setup your Kount account.]]></comment>
--                            <depends>
--                                <field id="fraudprotection">1</field>
--                            </depends>
--                            <config_path>payment/braintree/kount_id</config_path>
--                        </field>
-                         <field id="debug" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
-                             <label>Debug</label>
-                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                             <config_path>payment/braintree/debug</config_path>
-                         </field>
--                        <field id="useccv" translate="label" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <field id="useccv" translate="label comment" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
-                             <label>CVV Verification</label>
-                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                             <comment>Be sure to Enable AVS and/or CVV in Your Braintree Account in Settings/Processing Section.</comment>
-@@ -149,7 +141,7 @@
-                     <group id="braintree_paypal" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
-                         <label>PayPal through Braintree</label>
-                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
--                        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-+                        <field id="title" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                             <label>Title</label>
-                             <config_path>payment/braintree_paypal/title</config_path>
-                             <comment>It is recommended to set this value to "PayPal" per store views.</comment>
-@@ -187,7 +179,7 @@
-                             <can_be_empty>1</can_be_empty>
-                             <config_path>payment/braintree_paypal/specificcountry</config_path>
-                         </field>
--                        <field id="require_billing_address" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <field id="require_billing_address" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
-                             <label>Require Customer's Billing Address</label>
-                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                             <config_path>payment/braintree_paypal/require_billing_address</config_path>
-@@ -203,7 +195,7 @@
-                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                             <config_path>payment/braintree_paypal/debug</config_path>
-                         </field>
--                        <field id="display_on_shopping_cart" translate="label" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <field id="display_on_shopping_cart" translate="label comment" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
-                             <label>Display on Shopping Cart</label>
-                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                             <config_path>payment/braintree_paypal/display_on_shopping_cart</config_path>
-@@ -239,14 +231,14 @@
-                             <config_path>payment/braintree/verify_specific_countries</config_path>
-                         </field>
-                     </group>
--                    <group id="braintree_dynamic_descriptor" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
-+                    <group id="braintree_dynamic_descriptor" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
-                         <label>Dynamic Descriptors</label>
-                         <comment><![CDATA[Dynamic descriptors are sent on a per-transaction basis and define what will appear on your customers credit card statements for a specific purchase.
-                             The clearer the description of your product, the less likely customers will issue chargebacks due to confusion or non-recognition.
-                             Dynamic descriptors are not enabled on all accounts by default. If you receive a validation error of 92203 or if your dynamic descriptors are not displaying as expected,
-                             please <a href="mailto:support@getbraintree.com">Braintree Support</a>.]]></comment>
-                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
--                        <field id="name" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-+                        <field id="name" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                             <label>Name</label>
-                             <config_path>payment/braintree/descriptor_name</config_path>
-                             <comment>
-@@ -254,14 +246,14 @@
-                                 and the product descriptor can be up to 18, 14, or 9 characters respectively (with an * in between for a total descriptor name of 22 characters).
-                             </comment>
-                         </field>
--                        <field id="phone" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-+                        <field id="phone" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                             <label>Phone</label>
-                             <config_path>payment/braintree/descriptor_phone</config_path>
-                             <comment>
-                                 The value in the phone number field of a customer's statement. Phone must be 10-14 characters and can only contain numbers, dashes, parentheses and periods.
-                             </comment>
-                         </field>
--                        <field id="url" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-+                        <field id="url" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                             <label>URL</label>
-                             <config_path>payment/braintree/descriptor_url</config_path>
-                             <comment>
-diff --git a/app/code/Magento/Braintree/etc/braintree_error_mapping.xml b/app/code/Magento/Braintree/etc/braintree_error_mapping.xml
-index 81da0a252e5..7155264b4e6 100644
---- a/app/code/Magento/Braintree/etc/braintree_error_mapping.xml
-+++ b/app/code/Magento/Braintree/etc/braintree_error_mapping.xml
-@@ -20,6 +20,7 @@
-         <message code="81716" translate="true">Credit card number must be 12-19 digits.</message>
-         <message code="81723" translate="true">Cardholder name is too long.</message>
-         <message code="81736" translate="true">CVV verification failed.</message>
-+        <message code="cvv" translate="true">CVV verification failed.</message>
-         <message code="81737" translate="true">Postal code verification failed.</message>
-         <message code="81750" translate="true">Credit card number is prohibited.</message>
-         <message code="81801" translate="true">Addresses must have at least one field filled in.</message>
-diff --git a/app/code/Magento/Braintree/etc/config.xml b/app/code/Magento/Braintree/etc/config.xml
-index a830c293687..522d3230216 100644
---- a/app/code/Magento/Braintree/etc/config.xml
-+++ b/app/code/Magento/Braintree/etc/config.xml
-@@ -34,7 +34,8 @@
-                 <order_status>processing</order_status>
-                 <environment>sandbox</environment>
-                 <allowspecific>0</allowspecific>
--                <sdk_url><![CDATA[https://js.braintreegateway.com/js/braintree-2.32.0.min.js]]></sdk_url>
-+                <sdk_url><![CDATA[https://js.braintreegateway.com/web/3.44.1/js/client.min.js]]></sdk_url>
-+                <hosted_fields_sdk_url><![CDATA[https://js.braintreegateway.com/web/3.44.1/js/hosted-fields.min.js]]></hosted_fields_sdk_url>
-                 <public_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-                 <private_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-                 <masked_fields>cvv,number</masked_fields>
-@@ -42,6 +43,7 @@
-                 <paymentInfoKeys>cc_type,cc_number,avsPostalCodeResponseCode,avsStreetAddressResponseCode,cvvResponseCode,processorAuthorizationCode,processorResponseCode,processorResponseText,liabilityShifted,liabilityShiftPossible,riskDataId,riskDataDecision</paymentInfoKeys>
-                 <avs_ems_adapter>Magento\Braintree\Model\AvsEmsCodeMapper</avs_ems_adapter>
-                 <cvv_ems_adapter>Magento\Braintree\Model\CvvEmsCodeMapper</cvv_ems_adapter>
-+                <group>braintree_group</group>
-             </braintree>
-             <braintree_paypal>
-                 <model>BraintreePayPalFacade</model>
-@@ -67,6 +69,7 @@
-                 <privateInfoKeys>processorResponseCode,processorResponseText,paymentId</privateInfoKeys>
-                 <paymentInfoKeys>processorResponseCode,processorResponseText,paymentId,payerEmail</paymentInfoKeys>
-                 <supported_locales>en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,nl_NL,no_NO,pl_PL,es_ES,sv_SE,tr_TR,pt_BR,ja_JP,id_ID,ko_KR,pt_PT,ru_RU,th_TH,zh_CN,zh_TW</supported_locales>
-+                <group>braintree_group</group>
-             </braintree_paypal>
-             <braintree_cc_vault>
-                 <model>BraintreeCreditCardVaultFacade</model>
-@@ -76,6 +79,7 @@
-                     <tokenFormat>Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter</tokenFormat>
-                     <additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
-                 </instant_purchase>
-+                <group>braintree_group</group>
-             </braintree_cc_vault>
-             <braintree_paypal_vault>
-                 <model>BraintreePayPalVaultFacade</model>
-@@ -85,6 +89,7 @@
-                     <tokenFormat>Magento\Braintree\Model\InstantPurchase\PayPal\TokenFormatter</tokenFormat>
-                     <additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
-                 </instant_purchase>
-+                <group>braintree_group</group>
-             </braintree_paypal_vault>
-         </payment>
-     </default>
-diff --git a/app/code/Magento/Braintree/etc/di.xml b/app/code/Magento/Braintree/etc/di.xml
-index 290fb5be58f..6f8b7d1d6c3 100644
---- a/app/code/Magento/Braintree/etc/di.xml
-+++ b/app/code/Magento/Braintree/etc/di.xml
-@@ -233,6 +233,7 @@
-                 <item name="device_data" xsi:type="string">Magento\Braintree\Gateway\Request\KountPaymentDataBuilder</item>
-                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
-                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
-             </argument>
-         </arguments>
-     </virtualType>
-@@ -287,10 +288,11 @@
-                 <item name="payment" xsi:type="string">Magento\Braintree\Gateway\Request\PaymentDataBuilder</item>
-                 <item name="channel" xsi:type="string">Magento\Braintree\Gateway\Request\ChannelDataBuilder</item>
-                 <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
--                <item name="3dsecure" xsi:type="string">Magento\Braintree\Gateway\Request\ThreeDSecureDataBuilder</item>
-+                <item name="3dsecure" xsi:type="string">Magento\Braintree\Gateway\Request\VaultThreeDSecureDataBuilder</item>
-                 <item name="device_data" xsi:type="string">Magento\Braintree\Gateway\Request\KountPaymentDataBuilder</item>
-                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
-                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
-             </argument>
-         </arguments>
-     </virtualType>
-@@ -325,6 +327,7 @@
-                 <item name="vault_capture" xsi:type="string">Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder</item>
-                 <item name="settlement" xsi:type="string">Magento\Braintree\Gateway\Request\SettlementDataBuilder</item>
-                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
-             </argument>
-         </arguments>
-     </virtualType>
-@@ -347,6 +350,7 @@
-                 <item name="device_data" xsi:type="string">Magento\Braintree\Gateway\Request\PayPal\DeviceDataBuilder</item>
-                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
-                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
-             </argument>
-         </arguments>
-     </virtualType>
-@@ -380,6 +384,7 @@
-                 <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
-                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
-                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
-+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
-             </argument>
-         </arguments>
-     </virtualType>
-@@ -609,7 +614,6 @@
-                 <item name="payment/braintree/merchant_id" xsi:type="string">1</item>
-                 <item name="payment/braintree/private_key" xsi:type="string">1</item>
-                 <item name="payment/braintree/merchant_account_id" xsi:type="string">1</item>
--                <item name="payment/braintree/kount_id" xsi:type="string">1</item>
-                 <item name="payment/braintree_paypal/merchant_name_override" xsi:type="string">1</item>
-                 <item name="payment/braintree/descriptor_phone" xsi:type="string">1</item>
-                 <item name="payment/braintree/descriptor_url" xsi:type="string">1</item>
-@@ -619,4 +623,8 @@
-             </argument>
-         </arguments>
-     </type>
-+
-+    <type name="Magento\Quote\Api\CartManagementInterface">
-+        <plugin name="order_cancellation" type="Magento\Braintree\Plugin\OrderCancellation"/>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Braintree/etc/frontend/di.xml b/app/code/Magento/Braintree/etc/frontend/di.xml
-index ea417c407df..d8d3a93b71d 100644
---- a/app/code/Magento/Braintree/etc/frontend/di.xml
-+++ b/app/code/Magento/Braintree/etc/frontend/di.xml
-@@ -61,4 +61,12 @@
-             <argument name="resolver" xsi:type="object">Magento\Braintree\Model\LocaleResolver</argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderPool">
-+        <arguments>
-+            <argument name="services" xsi:type="array">
-+                <item name="braintree" xsi:type="string">Magento\Braintree\Model\Multishipping\PlaceOrder</item>
-+                <item name="braintree_paypal" xsi:type="string">Magento\Braintree\Model\Multishipping\PlaceOrder</item>
-+            </argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Braintree/etc/payment.xml b/app/code/Magento/Braintree/etc/payment.xml
-new file mode 100644
-index 00000000000..4cae049aaf5
---- /dev/null
-+++ b/app/code/Magento/Braintree/etc/payment.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
-+    <groups>
-+        <group id="braintree_group">
-+            <label>Braintree</label>
-+        </group>
-+    </groups>
-+    <methods>
-+        <method name="braintree">
-+            <allow_multiple_address>1</allow_multiple_address>
-+        </method>
-+        <method name="braintree_paypal">
-+            <allow_multiple_address>1</allow_multiple_address>
-+        </method>
-+    </methods>
-+</payment>
-diff --git a/app/code/Magento/Braintree/i18n/en_US.csv b/app/code/Magento/Braintree/i18n/en_US.csv
-index 194ad14d497..e9145b35b56 100644
---- a/app/code/Magento/Braintree/i18n/en_US.csv
-+++ b/app/code/Magento/Braintree/i18n/en_US.csv
-@@ -190,4 +190,7 @@ Currency,Currency
- "Partial settlements are not supported by this processor.","Partial settlements are not supported by this processor."
- "Transaction can not be voided if status of a PayPal partial settlement child transaction is settlement_pending.","Transaction can not be voided if status of a PayPal partial settlement child transaction is settlement_pending."
- "Too many concurrent attempts to refund this transaction. Try again later.","Too many concurrent attempts to refund this transaction. Try again later."
--"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
-\ No newline at end of file
-+"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
-+"Braintree Settlement","Braintree Settlement"
-+"The Payment Token is not available to perform the request.","The Payment Token is not available to perform the request."
-+"The order #%1 cannot be processed.","The order #%1 cannot be processed."
-diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
-index 535a5a852fe..0d2599ff45f 100644
---- a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
-+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var Magento\Braintree\Block\Form $block */
- 
- $code = $block->escapeHtml($block->getMethodCode());
-@@ -22,9 +20,9 @@ $ccType = $block->getInfoData('cc_type');
-         <div class="admin__field-control control">
-             <select id="<?= /* @noEscape */ $code ?>_cc_type" name="payment[cc_type]"
-                     class="required-entry select admin__control-select validate-cc-type-select">
--                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-+                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
-                     <option value="<?= $block->escapeHtml($typeCode) ?>"
--                        <?php if($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
-+                        <?php if ($typeCode == $ccType) : ?> selected="selected"<?php endif; ?>>
-                         <?= $block->escapeHtml($typeName) ?>
-                     </option>
-                 <?php endforeach; ?>
-@@ -61,7 +59,7 @@ $ccType = $block->getInfoData('cc_type');
-             </div>
-         </div>
-     </div>
--    <?php if($block->hasVerification()): ?>
-+    <?php if ($block->hasVerification()) : ?>
-         <div class="admin__field _required">
-             <label class="label admin__field-label">
-                 <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
-@@ -77,13 +75,13 @@ $ccType = $block->getInfoData('cc_type');
-         </div>
-     <?php endif; ?>
- 
--    <?php if($block->isVaultEnabled()): ?>
-+    <?php if ($block->isVaultEnabled()) : ?>
-         <div class="field-tooltip-content">
-             <input type="checkbox"
-                    id="<?= /* @noEscape */ $code ?>_vault"
-                    name="payment[is_active_payment_token_enabler]"
-                    class="admin__control-checkbox"/>
--            <label class="label" for="<?= /* @noEscape */ $code ?>_vault">
-+            <label class="label admin__field-label" for="<?= /* @noEscape */ $code ?>_vault">
-                 <span><?= $block->escapeHtml(__('Save for later use.')) ?></span>
-             </label>
-         </div>
-diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml
-index 22a0f8d8c98..132f053d3bf 100644
---- a/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml
-+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml
-@@ -1,10 +1,10 @@
- <?php
--use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
-+
-+use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
- 
- /** @var \Magento\Framework\View\Element\Template $block */
- $details = $block->getData(TokenUiComponentProviderInterface::COMPONENT_DETAILS);
-diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml
-index 77d08dbc527..49ce2cc7c06 100644
---- a/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml
-+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml
-@@ -1,10 +1,10 @@
- <?php
--use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
-+
-+use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
- 
- /** @var \Magento\Framework\View\Element\Template $block */
- $details = $block->getData(TokenUiComponentProviderInterface::COMPONENT_DETAILS);
-diff --git a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
-index 9c95b79196e..845ed03725b 100644
---- a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
-+++ b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
-@@ -22,8 +22,16 @@ define([
-             container: 'payment_form_braintree',
-             active: false,
-             scriptLoaded: false,
--            braintree: null,
-+            braintreeClient: null,
-+            braintreeHostedFields: null,
-+            hostedFieldsInstance: null,
-             selectedCardType: null,
-+            selectorsMapper: {
-+                'expirationMonth': 'expirationMonth',
-+                'expirationYear': 'expirationYear',
-+                'number': 'cc_number',
-+                'cvv': 'cc_cid'
-+            },
-             imports: {
-                 onActiveChange: 'active'
-             }
-@@ -107,9 +115,10 @@ define([
-                 state = self.scriptLoaded;
- 
-             $('body').trigger('processStart');
--            require([this.sdkUrl], function (braintree) {
-+            require([this.sdkUrl, this.hostedFieldsSdkUrl], function (client, hostedFields) {
-                 state(true);
--                self.braintree = braintree;
-+                self.braintreeClient = client;
-+                self.braintreeHostedFields = hostedFields;
-                 self.initBraintree();
-                 $('body').trigger('processStop');
-             });
-@@ -145,39 +154,26 @@ define([
-         _initBraintree: function () {
-             var self = this;
- 
--            this.disableEventListeners();
--
--            self.braintree.setup(self.clientToken, 'custom', {
--                id: self.selector,
--                hostedFields: self.getHostedFields(),
--
--                /**
--                 * Triggered when sdk was loaded
--                 */
--                onReady: function () {
--                    $('body').trigger('processStop');
-+            self.disableEventListeners();
-+
-+            self.braintreeClient.create({
-+                authorization: self.clientToken
-+            })
-+                .then(function (clientInstance) {
-+                    return self.braintreeHostedFields.create({
-+                        client: clientInstance,
-+                        fields: self.getHostedFields()
-+                    });
-+                })
-+                .then(function (hostedFieldsInstance) {
-+                    self.hostedFieldsInstance = hostedFieldsInstance;
-                     self.enableEventListeners();
--                },
--
--                /**
--                 * Callback for success response
--                 * @param {Object} response
--                 */
--                onPaymentMethodReceived: function (response) {
--                    if (self.validateCardType()) {
--                        self.setPaymentDetails(response.nonce);
--                        self.placeOrder();
--                    }
--                },
--
--                /**
--                 * Error callback
--                 * @param {Object} response
--                 */
--                onError: function (response) {
--                    self.error(response.message);
--                }
--            });
-+                    self.fieldEventHandler(hostedFieldsInstance);
-+                    $('body').trigger('processStop');
-+                })
-+                .catch(function () {
-+                    self.error($t('Braintree can\'t be initialized.'));
-+                });
-         },
- 
-         /**
-@@ -197,14 +193,6 @@ define([
-                     expirationYear: {
-                         selector: self.getSelector('cc_exp_year'),
-                         placeholder: $t('YY')
--                    },
--
--                    /**
--                     * Triggered when hosted field is changed
--                     * @param {Object} event
--                     */
--                    onFieldEvent: function (event) {
--                        return self.fieldEventHandler(event);
-                     }
-                 };
- 
-@@ -219,36 +207,49 @@ define([
- 
-         /**
-          * Function to handle hosted fields events
--         * @param {Object} event
--         * @returns {Boolean}
-+         * @param {Object} hostedFieldsInstance
-          */
--        fieldEventHandler: function (event) {
-+        fieldEventHandler: function (hostedFieldsInstance) {
-             var self = this,
-                 $cardType = $('#' + self.container).find('.icon-type');
- 
--            if (event.isEmpty === false) {
--                self.validateCardType();
--            }
-+            hostedFieldsInstance.on('empty', function (event) {
-+                if (event.emittedBy === 'number') {
-+                    $cardType.attr('class', 'icon-type');
-+                    self.selectedCardType(null);
-+                }
- 
--            if (event.type !== 'fieldStateChange') {
-+            });
- 
--                return false;
--            }
-+            hostedFieldsInstance.on('validityChange', function (event) {
-+                var field = event.fields[event.emittedBy],
-+                    fieldKey = event.emittedBy;
- 
--            // Handle a change in validation or card type
--            if (event.target.fieldKey === 'number') {
--                self.selectedCardType(null);
--            }
-+                if (fieldKey === 'number') {
-+                    $cardType.addClass('icon-type-' + event.cards[0].type);
-+                }
- 
--            // remove previously set classes
--            $cardType.attr('class', 'icon-type');
-+                if (fieldKey in self.selectorsMapper && field.isValid === false) {
-+                    self.addInvalidClass(self.selectorsMapper[fieldKey]);
-+                }
-+            });
-+
-+            hostedFieldsInstance.on('blur', function (event) {
-+                if (event.emittedBy === 'number') {
-+                    self.validateCardType();
-+                }
-+            });
- 
--            if (event.card) {
--                $cardType.addClass('icon-type-' + event.card.type);
-+            hostedFieldsInstance.on('cardTypeChange', function (event) {
-+                if (event.cards.length !== 1) {
-+                    return;
-+                }
-+
-+                $cardType.addClass('icon-type-' + event.cards[0].type);
-                 self.selectedCardType(
--                    validator.getMageCardType(event.card.type, self.getCcAvailableTypes())
-+                    validator.getMageCardType(event.cards[0].type, self.getCcAvailableTypes())
-                 );
--            }
-+            });
-         },
- 
-         /**
-@@ -290,16 +291,32 @@ define([
-          * Trigger order submit
-          */
-         submitOrder: function () {
--            this.$selector.validate().form();
--            this.$selector.trigger('afterValidate.beforeSubmit');
--            $('body').trigger('processStop');
-+            var self = this;
-+
-+            self.$selector.validate().form();
-+            self.$selector.trigger('afterValidate.beforeSubmit');
- 
-             // validate parent form
--            if (this.$selector.validate().errorList.length) {
-+            if (self.$selector.validate().errorList.length) {
-+                $('body').trigger('processStop');
-+
-                 return false;
-             }
- 
--            $('#' + this.container).find('[type="submit"]').trigger('click');
-+            if (!self.validateCardType()) {
-+                return false;
-+            }
-+
-+            self.hostedFieldsInstance.tokenize(function (err, payload) {
-+                if (err) {
-+                    self.error($t('Some payment input fields are invalid.'));
-+
-+                    return false;
-+                }
-+
-+                self.setPaymentDetails(payload.nonce);
-+                $('#' + self.container).find('[type="submit"]').trigger('click');
-+            });
-         },
- 
-         /**
-@@ -329,12 +346,10 @@ define([
-          * @returns {Boolean}
-          */
-         validateCardType: function () {
--            var $input = $(this.getSelector('cc_number'));
--
--            $input.removeClass('braintree-hosted-fields-invalid');
-+            this.removeInvalidClass('cc_number');
- 
-             if (!this.selectedCardType()) {
--                $input.addClass('braintree-hosted-fields-invalid');
-+                this.addInvalidClass('cc_number');
- 
-                 return false;
-             }
-@@ -350,6 +365,28 @@ define([
-          */
-         getSelector: function (field) {
-             return '#' + this.code + '_' + field;
-+        },
-+
-+        /**
-+         * Add invalid class to field.
-+         *
-+         * @param {String} field
-+         * @returns void
-+         * @private
-+         */
-+        addInvalidClass: function (field) {
-+            $(this.getSelector(field)).addClass('braintree-hosted-fields-invalid');
-+        },
-+
-+        /**
-+         * Remove invalid class from field.
-+         *
-+         * @param {String} field
-+         * @returns void
-+         * @private
-+         */
-+        removeInvalidClass: function (field) {
-+            $(this.getSelector(field)).removeClass('braintree-hosted-fields-invalid');
-         }
-     });
- });
-diff --git a/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml
-index ab294f8e797..c4152e1c3eb 100644
---- a/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml
-+++ b/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml
-@@ -35,6 +35,9 @@
-                                                                         <item name="braintree_paypal" xsi:type="array">
-                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
-                                                                         </item>
-+                                                                        <item name="braintree_cc_vault" xsi:type="array">
-+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
-+                                                                        </item>
-                                                                     </item>
-                                                                 </item>
-                                                             </item>
-diff --git a/app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml b/app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml
-new file mode 100644
-index 00000000000..06390d403e6
---- /dev/null
-+++ b/app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <body>
-+        <referenceBlock name="checkout_billing">
-+            <arguments>
-+                <argument name="form_templates" xsi:type="array">
-+                    <item name="braintree" xsi:type="string">Magento_Braintree::multishipping/form.phtml</item>
-+                    <item name="braintree_paypal" xsi:type="string">Magento_Braintree::multishipping/form_paypal.phtml</item>
-+                </argument>
-+            </arguments>
-+        </referenceBlock>
-+    </body>
-+</page>
-diff --git a/app/code/Magento/Braintree/view/frontend/requirejs-config.js b/app/code/Magento/Braintree/view/frontend/requirejs-config.js
-index 9fc38064677..e2f5fb03e58 100644
---- a/app/code/Magento/Braintree/view/frontend/requirejs-config.js
-+++ b/app/code/Magento/Braintree/view/frontend/requirejs-config.js
-@@ -6,7 +6,19 @@
- var config = {
-     map: {
-         '*': {
--            braintree: 'https://js.braintreegateway.com/js/braintree-2.32.0.min.js'
-+            braintreeClient: 'https://js.braintreegateway.com/web/3.44.1/js/client.min.js',
-+            braintreeHostedFields: 'https://js.braintreegateway.com/web/3.44.1/js/hosted-fields.min.js',
-+            braintreePayPal: 'https://js.braintreegateway.com/web/3.44.1/js/paypal-checkout.min.js',
-+            braintree3DSecure: 'https://js.braintreegateway.com/web/3.44.1/js/three-d-secure.min.js',
-+            braintreeDataCollector: 'https://js.braintreegateway.com/web/3.44.1/js/data-collector.min.js'
-+        }
-+    },
-+    paths: {
-+        braintreePayPalCheckout: 'https://www.paypalobjects.com/api/checkout.min'
-+    },
-+    shim: {
-+        braintreePayPalCheckout: {
-+            exports: 'paypal'
-         }
-     }
- };
-diff --git a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
-new file mode 100644
-index 00000000000..fc3030b6a4b
---- /dev/null
-+++ b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
-@@ -0,0 +1,29 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+?>
-+<script>
-+    require([
-+        'uiLayout',
-+        'jquery'
-+    ], function (layout, $) {
-+        $(function () {
-+            var paymentMethodData = {
-+                method: 'braintree'
-+            };
-+            layout([
-+                {
-+                    component: 'Magento_Braintree/js/view/payment/method-renderer/multishipping/cc-form',
-+                    name: 'payment_method_braintree',
-+                    method: paymentMethodData.method,
-+                    item: paymentMethodData
-+                }
-+            ]);
-+
-+            $('body').trigger('contentUpdated');
-+        })
-+    })
-+</script>
-+<!-- ko template: getTemplate() --><!-- /ko -->
-diff --git a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
-new file mode 100644
-index 00000000000..ea3eb2214c2
---- /dev/null
-+++ b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
-@@ -0,0 +1,29 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+?>
-+<script>
-+    require([
-+        'uiLayout',
-+        'jquery'
-+    ], function (layout, $) {
-+        $(function () {
-+            var paymentMethodData = {
-+                method: 'braintree_paypal'
-+            };
-+            layout([
-+                {
-+                    component: 'Magento_Braintree/js/view/payment/method-renderer/multishipping/paypal',
-+                    name: 'payment_method_braintree_paypal',
-+                    method: paymentMethodData.method,
-+                    item: paymentMethodData
-+                }
-+            ]);
-+
-+            $('body').trigger('contentUpdated');
-+        })
-+    })
-+</script>
-+<!-- ko template: getTemplate() --><!-- /ko -->
-diff --git a/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml b/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
-index c1ef461ecae..e0a9e46bd7c 100644
---- a/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
-+++ b/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
-@@ -15,21 +15,18 @@ $config = [
-         'id' => $id,
-         'clientToken' => $block->getClientToken(),
-         'displayName' => $block->getMerchantName(),
--        'actionSuccess' => $block->getActionSuccess()
-+        'actionSuccess' => $block->getActionSuccess(),
-+        'environment' => $block->getEnvironment()
-     ]
- ];
- 
- ?>
--<div data-mage-init='<?= /* @noEscape */ json_encode($config) ?>'
--    class="paypal checkout paypal-logo braintree-paypal-logo<?= /* @noEscape */ $block->getContainerId() ?>-container">
--    <button data-currency="<?= /* @noEscape */ $block->getCurrency() ?>"
--       data-locale="<?= /* @noEscape */ $block->getLocale() ?>"
--       data-amount="<?= /* @noEscape */ $block->getAmount() ?>"
--       id="<?= /* @noEscape */ $id ?>"
--       class="action-braintree-paypal-logo" disabled>
--        <img class="braintree-paypal-button-hidden"
--             src="https://checkout.paypal.com/pwpp/2.17.6/images/pay-with-paypal.png"
--             alt="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"
--             title="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"/>
--    </button>
-+<div data-mage-init='<?= /* @noEscape */ json_encode($config); ?>'
-+    class="paypal checkout paypal-logo braintree-paypal-logo<?= /* @noEscape */ $block->getContainerId(); ?>-container">
-+    <div data-currency="<?= /* @noEscape */ $block->getCurrency(); ?>"
-+       data-locale="<?= /* @noEscape */ $block->getLocale(); ?>"
-+       data-amount="<?= /* @noEscape */ $block->getAmount(); ?>"
-+       id="<?= /* @noEscape */ $id; ?>"
-+       class="action-braintree-paypal-logo">
-+    </div>
- </div>
-diff --git a/app/code/Magento/Braintree/view/frontend/web/js/paypal/button.js b/app/code/Magento/Braintree/view/frontend/web/js/paypal/button.js
-index 3ac50fbcb47..aacd3016d73 100644
---- a/app/code/Magento/Braintree/view/frontend/web/js/paypal/button.js
-+++ b/app/code/Magento/Braintree/view/frontend/web/js/paypal/button.js
-@@ -9,7 +9,9 @@ define(
-         'uiComponent',
-         'underscore',
-         'jquery',
--        'braintree',
-+        'braintreeClient',
-+        'braintreePayPal',
-+        'braintreePayPalCheckout',
-         'Magento_Braintree/js/paypal/form-builder',
-         'domReady!'
-     ],
-@@ -19,7 +21,9 @@ define(
-         Component,
-         _,
-         $,
--        braintree,
-+        braintreeClient,
-+        braintreePayPal,
-+        braintreePayPalCheckout,
-         formBuilder
-     ) {
-         'use strict';
-@@ -27,58 +31,34 @@ define(
-         return Component.extend({
- 
-             defaults: {
--
--                integrationName: 'braintreePaypal.currentIntegration',
--
--                /**
--                 * {String}
--                 */
-                 displayName: null,
--
--                /**
--                 * {String}
--                 */
-                 clientToken: null,
--
--                /**
--                 * {Object}
--                 */
--                clientConfig: {
--
--                    /**
--                     * @param {Object} integration
--                     */
--                    onReady: function (integration) {
--                        resolver(function () {
--                            registry.set(this.integrationName, integration);
--                            $('#' + this.id).removeAttr('disabled');
--                        }, this);
--                    },
--
--                    /**
--                     * @param {Object} payload
--                     */
--                    onPaymentMethodReceived: function (payload) {
--                        $('body').trigger('processStart');
--
--                        formBuilder.build(
--                            {
--                                action: this.actionSuccess,
--                                fields: {
--                                    result: JSON.stringify(payload)
--                                }
--                            }
--                        ).submit();
--                    }
--                }
-+                paypalCheckoutInstance: null
-             },
- 
-             /**
-              * @returns {Object}
-              */
-             initialize: function () {
--                this._super()
--                    .initComponent();
-+                var self = this;
-+
-+                self._super();
-+
-+                braintreeClient.create({
-+                    authorization: self.clientToken
-+                })
-+                    .then(function (clientInstance) {
-+                        return braintreePayPal.create({
-+                            client: clientInstance
-+                        });
-+                    })
-+                    .then(function (paypalCheckoutInstance) {
-+                        self.paypalCheckoutInstance = paypalCheckoutInstance;
-+
-+                        return self.paypalCheckoutInstance;
-+                    });
-+
-+                self.initComponent();
- 
-                 return this;
-             },
-@@ -87,64 +67,76 @@ define(
-              * @returns {Object}
-              */
-             initComponent: function () {
--                var currentIntegration = registry.get(this.integrationName),
--                    $this = $('#' + this.id),
--                    self = this,
-+                var self = this,
-+                    selector = '#' + self.id,
-+                    $this = $(selector),
-                     data = {
-                         amount: $this.data('amount'),
-                         locale: $this.data('locale'),
-                         currency: $this.data('currency')
-+                    };
-+
-+                $this.html('');
-+                braintreePayPalCheckout.Button.render({
-+                    env: self.environment,
-+                    style: {
-+                        color: 'blue',
-+                        shape: 'rect',
-+                        size: 'medium',
-+                        label: 'pay',
-+                        tagline: false
-+                    },
-+
-+                    /**
-+                     * Payment setup
-+                     */
-+                    payment: function () {
-+                        return self.paypalCheckoutInstance.createPayment(self.getClientConfig(data));
-                     },
--                    initCallback = function () {
--                        $this.attr('disabled', 'disabled');
--                        registry.remove(this.integrationName);
--                        braintree.setup(this.clientToken, 'custom', this.getClientConfig(data));
--
--                        $this.off('click')
--                            .on('click', function (event) {
--                                event.preventDefault();
--
--                                registry.get(self.integrationName, function (integration) {
--                                    try {
--                                        integration.paypal.initAuthFlow();
--                                    } catch (e) {
--                                        $this.attr('disabled', 'disabled');
-+
-+                    /**
-+                     * Triggers on `onAuthorize` event
-+                     *
-+                     * @param {Object} response
-+                     */
-+                    onAuthorize: function (response) {
-+                        return self.paypalCheckoutInstance.tokenizePayment(response)
-+                            .then(function (payload) {
-+                                $('body').trigger('processStart');
-+
-+                                formBuilder.build(
-+                                    {
-+                                        action: self.actionSuccess,
-+                                        fields: {
-+                                            result: JSON.stringify(payload)
-+                                        }
-                                     }
--                                });
-+                                ).submit();
-                             });
--                    }.bind(this);
--
--                currentIntegration ?
--                    currentIntegration.teardown(initCallback) :
--                    initCallback();
-+                    }
-+                }, selector);
- 
-                 return this;
-             },
- 
-             /**
-              * @returns {Object}
-+             * @private
-              */
-             getClientConfig: function (data) {
--                this.clientConfig.paypal = {
--                    singleUse: true,
-+                var config = {
-+                    flow: 'checkout',
-                     amount: data.amount,
-                     currency: data.currency,
-                     locale: data.locale,
--                    enableShippingAddress: true,
--                    headless: true
-+                    enableShippingAddress: true
-                 };
- 
-                 if (this.displayName) {
--                    this.clientConfig.paypal.displayName = this.displayName;
-+                    config.displayName = this.displayName;
-                 }
- 
--                _.each(this.clientConfig, function (fn, name) {
--                    if (typeof fn === 'function') {
--                        this.clientConfig[name] = fn.bind(this);
--                    }
--                }, this);
--
--                return this.clientConfig;
-+                return config;
-             }
-         });
-     }
-diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/3d-secure.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/3d-secure.js
-index e3b806bf213..84fa8cf6272 100644
---- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/3d-secure.js
-+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/3d-secure.js
-@@ -7,17 +7,57 @@
- 
- define([
-     'jquery',
-+    'braintree3DSecure',
-     'Magento_Braintree/js/view/payment/adapter',
-     'Magento_Checkout/js/model/quote',
--    'mage/translate'
--], function ($, braintree, quote, $t) {
-+    'mage/translate',
-+    'Magento_Ui/js/modal/modal',
-+    'Magento_Checkout/js/model/full-screen-loader'
-+], function (
-+    $,
-+    braintree3DSecure,
-+    braintreeAdapter,
-+    quote,
-+    $t,
-+    Modal,
-+    fullScreenLoader
-+) {
-     'use strict';
- 
-     return {
-         config: null,
-+        modal: null,
-+        threeDSecureInstance: null,
-+        state: null,
- 
-         /**
--         * Set 3d secure config
-+         * Initializes component
-+         */
-+        initialize: function () {
-+            var self = this,
-+                promise = $.Deferred();
-+
-+            self.state = $.Deferred();
-+            braintreeAdapter.getApiClient()
-+                .then(function (clientInstance) {
-+                    return braintree3DSecure.create({
-+                        client: clientInstance
-+                    });
-+                })
-+                .then(function (threeDSecureInstance) {
-+                    self.threeDSecureInstance = threeDSecureInstance;
-+                    promise.resolve(self.threeDSecureInstance);
-+                })
-+                .catch(function (err) {
-+                    promise.reject(err);
-+                });
-+
-+            return promise.promise();
-+        },
-+
-+        /**
-+         * Sets 3D Secure config
-+         *
-          * @param {Object} config
-          */
-         setConfig: function (config) {
-@@ -26,7 +66,8 @@ define([
-         },
- 
-         /**
--         * Get code
-+         * Gets code
-+         *
-          * @returns {String}
-          */
-         getCode: function () {
-@@ -34,54 +75,114 @@ define([
-         },
- 
-         /**
--         * Validate Braintree payment nonce
-+         * Validates 3D Secure
-+         *
-          * @param {Object} context
-          * @returns {Object}
-          */
-         validate: function (context) {
--            var client = braintree.getApiClient(),
--                state = $.Deferred(),
-+            var self = this,
-                 totalAmount = quote.totals()['base_grand_total'],
--                billingAddress = quote.billingAddress();
-+                billingAddress = quote.billingAddress(),
-+                options = {
-+                    amount: totalAmount,
-+                    nonce: context.paymentPayload.nonce,
-+
-+                    /**
-+                     * Adds iframe to page
-+                     * @param {Object} err
-+                     * @param {Object} iframe
-+                     */
-+                    addFrame: function (err, iframe) {
-+                        self.createModal($(iframe));
-+                        fullScreenLoader.stopLoader();
-+                        self.modal.openModal();
-+                    },
-+
-+                    /**
-+                     * Removes iframe from page
-+                     */
-+                    removeFrame: function () {
-+                        self.modal.closeModal();
-+                    }
-+                };
- 
-             if (!this.isAmountAvailable(totalAmount) || !this.isCountryAvailable(billingAddress.countryId)) {
--                state.resolve();
-+                self.state.resolve();
- 
--                return state.promise();
-+                return self.state.promise();
-             }
- 
--            client.verify3DS({
--                amount: totalAmount,
--                creditCard: context.paymentMethodNonce
--            }, function (error, response) {
--                var liability;
-+            fullScreenLoader.startLoader();
-+            this.initialize()
-+                .then(function () {
-+                    self.threeDSecureInstance.verifyCard(options, function (err, payload) {
-+                        if (err) {
-+                            self.state.reject(err.message);
-+
-+                            return;
-+                        }
-+
-+                        // `liabilityShifted` indicates that 3DS worked and authentication succeeded
-+                        // if `liabilityShifted` and `liabilityShiftPossible` are false - card is ineligible for 3DS
-+                        if (payload.liabilityShifted || !payload.liabilityShifted && !payload.liabilityShiftPossible) {
-+                            context.paymentPayload.nonce = payload.nonce;
-+                            self.state.resolve();
-+                        } else {
-+                            self.state.reject($t('Please try again with another form of payment.'));
-+                        }
-+                    });
-+                })
-+                .fail(function () {
-+                    fullScreenLoader.stopLoader();
-+                    self.state.reject($t('Please try again with another form of payment.'));
-+                });
-+
-+            return self.state.promise();
-+        },
- 
--                if (error) {
--                    state.reject(error.message);
-+        /**
-+         * Creates modal window
-+         *
-+         * @param {Object} $context
-+         * @private
-+         */
-+        createModal: function ($context) {
-+            var self = this,
-+                options = {
-+                    clickableOverlay: false,
-+                    buttons: [],
-+                    modalCloseBtnHandler: self.cancelFlow.bind(self),
-+                    keyEventHandlers: {
-+                        escapeKey: self.cancelFlow.bind(self)
-+                    }
-+                };
- 
--                    return;
--                }
-+            // adjust iframe styles
-+            $context.attr('width', '100%');
-+            self.modal = Modal(options, $context);
-+        },
- 
--                liability = {
--                    shifted: response.verificationDetails.liabilityShifted,
--                    shiftPossible: response.verificationDetails.liabilityShiftPossible
--                };
-+        /**
-+         * Cancels 3D Secure flow
-+         *
-+         * @private
-+         */
-+        cancelFlow: function () {
-+            var self = this;
- 
--                if (liability.shifted || !liability.shifted && !liability.shiftPossible) {
--                    context.paymentMethodNonce = response.nonce;
--                    state.resolve();
--                } else {
--                    state.reject($t('Please try again with another form of payment.'));
--                }
-+            self.threeDSecureInstance.cancelVerifyCard(function () {
-+                self.modal.closeModal();
-+                self.state.reject();
-             });
--
--            return state.promise();
-         },
- 
-         /**
--         * Check minimal amount for 3d secure activation
-+         * Checks minimal amount for 3D Secure activation
-+         *
-          * @param {Number} amount
-          * @returns {Boolean}
-+         * @private
-          */
-         isAmountAvailable: function (amount) {
-             amount = parseFloat(amount);
-@@ -90,9 +191,11 @@ define([
-         },
- 
-         /**
--         * Check if current country is available for 3d secure
-+         * Checks if current country is available for 3D Secure
-+         *
-          * @param {String} countryId
-          * @returns {Boolean}
-+         * @private
-          */
-         isCountryAvailable: function (countryId) {
-             var key,
-diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/adapter.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/adapter.js
-index 185e347bc9f..9cd6aa68867 100644
---- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/adapter.js
-+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/adapter.js
-@@ -6,81 +6,42 @@
- /*global define*/
- define([
-     'jquery',
--    'braintree',
--    'Magento_Ui/js/model/messageList',
--    'mage/translate'
--], function ($, braintree, globalMessageList, $t) {
-+    'braintreeClient'
-+], function ($, braintreeClient) {
-     'use strict';
- 
-     return {
-         apiClient: null,
--        config: {},
-         checkout: null,
-+        code: 'braintree',
- 
-         /**
--         * Get Braintree api client
-+         * Returns Braintree API client
-          * @returns {Object}
-          */
-         getApiClient: function () {
--            if (!this.apiClient) {
--                this.apiClient = new braintree.api.Client({
--                    clientToken: this.getClientToken()
--                });
--            }
--
--            return this.apiClient;
--        },
--
--        /**
--         * Set configuration
--         * @param {Object} config
--         */
--        setConfig: function (config) {
--            this.config = config;
--        },
--
--        /**
--         * Setup Braintree SDK
--         */
--        setup: function () {
--            if (!this.getClientToken()) {
--                this.showError($t('Sorry, but something went wrong.'));
--            }
--
--            braintree.setup(this.getClientToken(), 'custom', this.config);
-+            return braintreeClient.create({
-+                authorization: this.getClientToken()
-+            });
-         },
- 
-         /**
--         * Get payment name
-+         * Returns payment code
-+         *
-          * @returns {String}
-          */
-         getCode: function () {
--            return 'braintree';
-+            return this.code;
-         },
- 
-         /**
--         * Get client token
--         * @returns {String|*}
--         */
--        getClientToken: function () {
--
--            return window.checkoutConfig.payment[this.getCode()].clientToken;
--        },
--
--        /**
--         * Show error message
-+         * Returns client token
-          *
--         * @param {String} errorMessage
--         */
--        showError: function (errorMessage) {
--            globalMessageList.addErrorMessage({
--                message: errorMessage
--            });
--        },
--
--        /**
--         * May be triggered on Braintree SDK setup
-+         * @returns {String}
-+         * @private
-          */
--        onReady: function () {}
-+        getClientToken: function () {
-+            return window.checkoutConfig.payment[this.code].clientToken;
-+        }
-     };
- });
-diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/braintree.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/braintree.js
-index 2e1c65632e8..132fcd6b3b0 100644
---- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/braintree.js
-+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/braintree.js
-@@ -23,7 +23,7 @@ define(
-             rendererList.push(
-                 {
-                     type: braintreeType,
--                    component: 'Magento_Braintree/js/view/payment/method-renderer/hosted-fields'
-+                    component: 'Magento_Braintree/js/view/payment/method-renderer/cc-form'
-                 }
-             );
-         }
-diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/kount.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/kount.js
-new file mode 100644
-index 00000000000..cd0d024387b
---- /dev/null
-+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/kount.js
-@@ -0,0 +1,61 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+/*browser:true*/
-+/*global define*/
-+
-+define([
-+    'jquery',
-+    'braintreeDataCollector',
-+    'Magento_Braintree/js/view/payment/adapter'
-+], function (
-+    $,
-+    braintreeDataCollector,
-+    braintreeAdapter
-+) {
-+    'use strict';
-+
-+    return {
-+        paymentCode: 'braintree',
-+
-+        /**
-+         * Returns information about a customer's device on checkout page for passing to Kount for review.
-+         *
-+         * @returns {Object}
-+         */
-+        getDeviceData: function () {
-+            var state = $.Deferred();
-+
-+            if (this.hasFraudProtection()) {
-+                braintreeAdapter.getApiClient()
-+                    .then(function (clientInstance) {
-+                        return braintreeDataCollector.create({
-+                            client: clientInstance,
-+                            kount: true
-+                        });
-+                    })
-+                    .then(function (dataCollectorInstance) {
-+                        var deviceData = dataCollectorInstance.deviceData;
-+
-+                        state.resolve(deviceData);
-+                    })
-+                    .catch(function (err) {
-+                        state.reject(err);
-+                    });
-+            }
-+
-+            return state.promise();
-+        },
-+
-+        /**
-+         * Returns setting value.
-+         *
-+         * @returns {Boolean}
-+         * @private
-+         */
-+        hasFraudProtection: function () {
-+            return window.checkoutConfig.payment[this.paymentCode].hasFraudProtection;
-+        }
-+    };
-+});
-diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js
-index 39bdf582c8c..ac97e4fa5eb 100644
---- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js
-+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js
-@@ -9,90 +9,97 @@ define(
-         'underscore',
-         'jquery',
-         'Magento_Payment/js/view/payment/cc-form',
--        'Magento_Checkout/js/model/quote',
-         'Magento_Braintree/js/view/payment/adapter',
--        'mage/translate',
-+        'braintreeHostedFields',
-+        'Magento_Checkout/js/model/quote',
-         'Magento_Braintree/js/validator',
-+        'Magento_Ui/js/model/messageList',
-         'Magento_Braintree/js/view/payment/validator-handler',
--        'Magento_Checkout/js/model/full-screen-loader'
-+        'Magento_Vault/js/view/payment/vault-enabler',
-+        'Magento_Braintree/js/view/payment/kount',
-+        'mage/translate',
-+        'prototype',
-+        'domReady!'
-     ],
-     function (
-         _,
-         $,
-         Component,
-+        braintreeAdapter,
-+        hostedFields,
-         quote,
--        braintree,
--        $t,
-         validator,
-+        globalMessageList,
-         validatorManager,
--        fullScreenLoader
-+        VaultEnabler,
-+        kount,
-+        $t
-     ) {
-         'use strict';
- 
-         return Component.extend({
-             defaults: {
-+                template: 'Magento_Braintree/payment/form',
-                 active: false,
--                braintreeClient: null,
--                braintreeDeviceData: null,
--                paymentMethodNonce: null,
--                lastBillingAddress: null,
--                ccCode: null,
--                ccMessageContainer: null,
--                validatorManager: validatorManager,
-                 code: 'braintree',
--
--                /**
--                 * Additional payment data
--                 *
--                 * {Object}
--                 */
--                additionalData: {},
--
--                /**
--                 * Braintree client configuration
--                 *
--                 * {Object}
--                 */
--                clientConfig: {
--
--                    /**
--                     * Triggers on payment nonce receive
--                     * @param {Object} response
--                     */
--                    onPaymentMethodReceived: function (response) {
--                        this.beforePlaceOrder(response);
--                    },
--
--                    /**
--                     * Device data initialization
--                     *
--                     * @param {Object} checkout
--                     */
--                    onReady: function (checkout) {
--                        braintree.checkout = checkout;
--                        braintree.onReady();
--                    },
--
--                    /**
--                     * Triggers on any Braintree error
--                     * @param {Object} response
--                     */
--                    onError: function (response) {
--                        braintree.showError($t('Payment ' + this.getTitle() + ' can\'t be initialized'));
--                        this.isPlaceOrderActionAllowed(true);
--                        throw response.message;
--                    },
--
--                    /**
--                     * Triggers when customer click "Cancel"
--                     */
--                    onCancelled: function () {
--                        this.paymentMethodNonce = null;
--                    }
-+                lastBillingAddress: null,
-+                hostedFieldsInstance: null,
-+                selectorsMapper: {
-+                    'expirationMonth': 'expirationMonth',
-+                    'expirationYear': 'expirationYear',
-+                    'number': 'cc_number',
-+                    'cvv': 'cc_cid'
-                 },
--                imports: {
--                    onActiveChange: 'active'
--                }
-+                paymentPayload: {
-+                    nonce: null
-+                },
-+                additionalData: {}
-+            },
-+
-+            /**
-+             * @returns {exports.initialize}
-+             */
-+            initialize: function () {
-+                var self = this;
-+
-+                self._super();
-+                self.vaultEnabler = new VaultEnabler();
-+                self.vaultEnabler.setPaymentCode(self.getVaultCode());
-+
-+                kount.getDeviceData()
-+                    .then(function (deviceData) {
-+                        self.additionalData['device_data'] = deviceData;
-+                    });
-+
-+                return self;
-+            },
-+
-+            /**
-+             * Init hosted fields.
-+             *
-+             * Is called after knockout finishes input fields bindings.
-+             */
-+            initHostedFields: function () {
-+                var self = this;
-+
-+                braintreeAdapter.getApiClient()
-+                    .then(function (clientInstance) {
-+
-+                        return hostedFields.create({
-+                            client: clientInstance,
-+                            fields: self.getFieldsConfiguration()
-+                        });
-+                    })
-+                    .then(function (hostedFieldsInstance) {
-+                        self.hostedFieldsInstance = hostedFieldsInstance;
-+                        self.isPlaceOrderActionAllowed(true);
-+                        self.initFormValidationEvents(hostedFieldsInstance);
-+
-+                        return self.hostedFieldsInstance;
-+                    })
-+                    .catch(function () {
-+                        self.showError($t('Payment ' + self.getTitle() + ' can\'t be initialized'));
-+                    });
-             },
- 
-             /**
-@@ -104,8 +111,6 @@ define(
-                 validator.setConfig(window.checkoutConfig.payment[this.getCode()]);
-                 this._super()
-                     .observe(['active']);
--                this.validatorManager.initialize();
--                this.initClientConfig();
- 
-                 return this;
-             },
-@@ -133,225 +138,288 @@ define(
-             },
- 
-             /**
--             * Triggers when payment method change
--             * @param {Boolean} isActive
-+             * Get data
-+             *
-+             * @returns {Object}
-              */
--            onActiveChange: function (isActive) {
--                if (!isActive) {
--                    return;
--                }
-+            getData: function () {
-+                var data = {
-+                    'method': this.getCode(),
-+                    'additional_data': {
-+                        'payment_method_nonce': this.paymentPayload.nonce
-+                    }
-+                };
- 
--                this.restoreMessageContainer();
--                this.restoreCode();
-+                data['additional_data'] = _.extend(data['additional_data'], this.additionalData);
-+                this.vaultEnabler.visitAdditionalData(data);
- 
--                /**
--                 * Define onReady callback
--                 */
--                braintree.onReady = function () {};
--                this.initBraintree();
-+                return data;
-             },
- 
-             /**
--             * Restore original message container for cc-form component
-+             * Get list of available CC types
-+             *
-+             * @returns {Object}
-              */
--            restoreMessageContainer: function () {
--                this.messageContainer = this.ccMessageContainer;
-+            getCcAvailableTypes: function () {
-+                var availableTypes = validator.getAvailableCardTypes(),
-+                    billingAddress = quote.billingAddress(),
-+                    billingCountryId;
-+
-+                this.lastBillingAddress = quote.shippingAddress();
-+
-+                if (!billingAddress) {
-+                    billingAddress = this.lastBillingAddress;
-+                }
-+
-+                billingCountryId = billingAddress.countryId;
-+
-+                if (billingCountryId && validator.getCountrySpecificCardTypes(billingCountryId)) {
-+                    return validator.collectTypes(
-+                        availableTypes,
-+                        validator.getCountrySpecificCardTypes(billingCountryId)
-+                    );
-+                }
-+
-+                return availableTypes;
-             },
- 
-             /**
--             * Restore original code for cc-form component
-+             * @returns {Boolean}
-              */
--            restoreCode: function () {
--                this.code = this.ccCode;
-+            isVaultEnabled: function () {
-+                return this.vaultEnabler.isVaultEnabled();
-             },
- 
--            /** @inheritdoc */
--            initChildren: function () {
--                this._super();
--                this.ccMessageContainer = this.messageContainer;
--                this.ccCode = this.code;
--
--                return this;
-+            /**
-+             * Returns vault code.
-+             *
-+             * @returns {String}
-+             */
-+            getVaultCode: function () {
-+                return window.checkoutConfig.payment[this.getCode()].ccVaultCode;
-             },
- 
-             /**
--             * Init config
-+             * Action to place order
-+             * @param {String} key
-              */
--            initClientConfig: function () {
--                // Advanced fraud tools settings
--                if (this.hasFraudProtection()) {
--                    this.clientConfig = _.extend(this.clientConfig, this.kountConfig());
-+            placeOrder: function (key) {
-+                var self = this;
-+
-+                if (key) {
-+                    return self._super();
-                 }
-+                // place order on success validation
-+                validatorManager.validate(self, function () {
-+                    return self.placeOrder('parent');
-+                }, function (err) {
- 
--                _.each(this.clientConfig, function (fn, name) {
--                    if (typeof fn === 'function') {
--                        this.clientConfig[name] = fn.bind(this);
-+                    if (err) {
-+                        self.showError(err);
-                     }
--                }, this);
-+                });
-+
-+                return false;
-             },
- 
-             /**
--             * Init Braintree configuration
-+             * Returns state of place order button
-+             *
-+             * @returns {Boolean}
-              */
--            initBraintree: function () {
--                var intervalId = setInterval(function () {
--                    // stop loader when frame will be loaded
--                    if ($('#braintree-hosted-field-number').length) {
--                        clearInterval(intervalId);
--                        fullScreenLoader.stopLoader();
--                    }
--                }, 500);
--
--                if (braintree.checkout) {
--                    braintree.checkout.teardown(function () {
--                        braintree.checkout = null;
--                    });
--                }
--
--                fullScreenLoader.startLoader();
--                braintree.setConfig(this.clientConfig);
--                braintree.setup();
-+            isButtonActive: function () {
-+                return this.isActive() && this.isPlaceOrderActionAllowed();
-             },
- 
-             /**
--             * @returns {Object}
-+             * Trigger order placing
-              */
--            kountConfig: function () {
--                var config = {
--                    dataCollector: {
--                        kount: {
--                            environment: this.getEnvironment()
-+            placeOrderClick: function () {
-+                var self = this;
-+
-+                if (this.isFormValid(this.hostedFieldsInstance)) {
-+                    self.hostedFieldsInstance.tokenize(function (err, payload) {
-+                        if (err) {
-+                            self.showError($t('Some payment input fields are invalid.'));
-+
-+                            return;
-                         }
--                    },
--
--                    /**
--                     * Device data initialization
--                     *
--                     * @param {Object} checkout
--                     */
--                    onReady: function (checkout) {
--                        braintree.checkout = checkout;
--                        this.additionalData['device_data'] = checkout.deviceData;
--                        braintree.onReady();
--                    }
--                };
- 
--                if (this.getKountMerchantId()) {
--                    config.dataCollector.kount.merchantId = this.getKountMerchantId();
-+                        self.setPaymentPayload(payload);
-+                        self.placeOrder();
-+                    });
-                 }
--
--                return config;
-             },
- 
-             /**
--             * Get full selector name
-+             * Validates credit card form.
-              *
--             * @param {String} field
--             * @returns {String}
-+             * @param {Object} hostedFieldsInstance
-+             * @returns {Boolean}
-+             * @private
-              */
--            getSelector: function (field) {
--                return '#' + this.getCode() + '_' + field;
-+            isFormValid: function (hostedFieldsInstance) {
-+                var self = this,
-+                    state = hostedFieldsInstance.getState();
-+
-+                return Object.keys(state.fields).every(function (fieldKey) {
-+                    if (fieldKey in self.selectorsMapper && state.fields[fieldKey].isValid === false) {
-+                        self.addInvalidClass(self.selectorsMapper[fieldKey]);
-+                    }
-+
-+                    return state.fields[fieldKey].isValid;
-+                });
-             },
- 
-             /**
--             * Get list of available CC types
-+             * Init form validation events.
-              *
--             * @returns {Object}
-+             * @param {Object} hostedFieldsInstance
-+             * @private
-              */
--            getCcAvailableTypes: function () {
--                var availableTypes = validator.getAvailableCardTypes(),
--                    billingAddress = quote.billingAddress(),
--                    billingCountryId;
-+            initFormValidationEvents: function (hostedFieldsInstance) {
-+                var self = this;
- 
--                this.lastBillingAddress = quote.shippingAddress();
-+                hostedFieldsInstance.on('empty', function (event) {
-+                    if (event.emittedBy === 'number') {
-+                        self.selectedCardType(null);
-+                    }
- 
--                if (!billingAddress) {
--                    billingAddress = this.lastBillingAddress;
--                }
-+                });
- 
--                billingCountryId = billingAddress.countryId;
-+                hostedFieldsInstance.on('blur', function (event) {
-+                    if (event.emittedBy === 'number') {
-+                        self.validateCardType();
-+                    }
-+                });
- 
--                if (billingCountryId && validator.getCountrySpecificCardTypes(billingCountryId)) {
--                    return validator.collectTypes(
--                        availableTypes, validator.getCountrySpecificCardTypes(billingCountryId)
--                    );
--                }
-+                hostedFieldsInstance.on('validityChange', function (event) {
-+                    var field = event.fields[event.emittedBy],
-+                        fieldKey = event.emittedBy;
- 
--                return availableTypes;
-+                    if (fieldKey === 'number') {
-+                        self.isValidCardNumber = field.isValid;
-+                    }
-+
-+                    if (fieldKey in self.selectorsMapper && field.isValid === false) {
-+                        self.addInvalidClass(self.selectorsMapper[fieldKey]);
-+                    }
-+                });
-+
-+                hostedFieldsInstance.on('cardTypeChange', function (event) {
-+                    if (event.cards.length === 1) {
-+                        self.selectedCardType(
-+                            validator.getMageCardType(event.cards[0].type, self.getCcAvailableTypes())
-+                        );
-+                    }
-+                });
-             },
- 
-             /**
--             * @returns {Boolean}
-+             * Get full selector name
-+             *
-+             * @param {String} field
-+             * @returns {String}
-+             * @private
-              */
--            hasFraudProtection: function () {
--                return window.checkoutConfig.payment[this.getCode()].hasFraudProtection;
-+            getSelector: function (field) {
-+                return '#' + this.getCode() + '_' + field;
-             },
- 
-             /**
--             * @returns {String}
-+             * Add invalid class to field.
-+             *
-+             * @param {String} field
-+             * @returns void
-+             * @private
-              */
--            getEnvironment: function () {
--                return window.checkoutConfig.payment[this.getCode()].environment;
-+            addInvalidClass: function (field) {
-+                $(this.getSelector(field)).addClass('braintree-hosted-fields-invalid');
-             },
- 
-             /**
--             * @returns {String}
-+             * Remove invalid class from field.
-+             *
-+             * @param {String} field
-+             * @returns void
-+             * @private
-              */
--            getKountMerchantId: function () {
--                return window.checkoutConfig.payment[this.getCode()].kountMerchantId;
-+            removeInvalidClass: function (field) {
-+                $(this.getSelector(field)).removeClass('braintree-hosted-fields-invalid');
-             },
- 
-             /**
--             * Get data
-+             * Get Braintree Hosted Fields
-              *
-              * @returns {Object}
-+             * @private
-              */
--            getData: function () {
--                var data = {
--                    'method': this.getCode(),
--                    'additional_data': {
--                        'payment_method_nonce': this.paymentMethodNonce
--                    }
--                };
-+            getFieldsConfiguration: function () {
-+                var self = this,
-+                    fields = {
-+                        number: {
-+                            selector: self.getSelector('cc_number')
-+                        },
-+                        expirationMonth: {
-+                            selector: self.getSelector('expirationMonth'),
-+                            placeholder: $t('MM')
-+                        },
-+                        expirationYear: {
-+                            selector: self.getSelector('expirationYear'),
-+                            placeholder: $t('YY')
-+                        }
-+                    };
- 
--                data['additional_data'] = _.extend(data['additional_data'], this.additionalData);
-+                if (self.hasVerification()) {
-+                    fields.cvv = {
-+                        selector: self.getSelector('cc_cid')
-+                    };
-+                }
- 
--                return data;
-+                return fields;
-             },
- 
-             /**
--             * Set payment nonce
--             * @param {String} paymentMethodNonce
-+             * Validate current credit card type.
-+             *
-+             * @returns {Boolean}
-+             * @private
-              */
--            setPaymentMethodNonce: function (paymentMethodNonce) {
--                this.paymentMethodNonce = paymentMethodNonce;
-+            validateCardType: function () {
-+                var cardFieldName = 'cc_number';
-+
-+                this.removeInvalidClass(cardFieldName);
-+
-+                if (this.selectedCardType() === null || !this.isValidCardNumber) {
-+                    this.addInvalidClass(cardFieldName);
-+
-+                    return false;
-+                }
-+
-+                return true;
-             },
- 
-             /**
--             * Prepare data to place order
--             * @param {Object} data
-+             * Sets payment payload
-+             *
-+             * @param {Object} paymentPayload
-+             * @private
-              */
--            beforePlaceOrder: function (data) {
--                this.setPaymentMethodNonce(data.nonce);
--                this.placeOrder();
-+            setPaymentPayload: function (paymentPayload) {
-+                this.paymentPayload = paymentPayload;
-             },
- 
-             /**
--             * Action to place order
--             * @param {String} key
-+             * Show error message
-+             *
-+             * @param {String} errorMessage
-+             * @private
-              */
--            placeOrder: function (key) {
--                var self = this;
--
--                if (key) {
--                    return self._super();
--                }
--                // place order on success validation
--                self.validatorManager.validate(self, function () {
--                    return self.placeOrder('parent');
-+            showError: function (errorMessage) {
-+                globalMessageList.addErrorMessage({
-+                    message: errorMessage
-                 });
--
--                return false;
-             }
-         });
-     }
-diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js
-deleted file mode 100644
-index 05c09abdb7b..00000000000
---- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js
-+++ /dev/null
-@@ -1,170 +0,0 @@
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--/*browser:true*/
--/*global define*/
--
--define([
--    'jquery',
--    'Magento_Braintree/js/view/payment/method-renderer/cc-form',
--    'Magento_Braintree/js/validator',
--    'Magento_Vault/js/view/payment/vault-enabler',
--    'mage/translate'
--], function ($, Component, validator, VaultEnabler, $t) {
--    'use strict';
--
--    return Component.extend({
--
--        defaults: {
--            template: 'Magento_Braintree/payment/form',
--            clientConfig: {
--
--                /**
--                 * {String}
--                 */
--                id: 'co-transparent-form-braintree'
--            },
--            isValidCardNumber: false
--        },
--
--        /**
--         * @returns {exports.initialize}
--         */
--        initialize: function () {
--            this._super();
--            this.vaultEnabler = new VaultEnabler();
--            this.vaultEnabler.setPaymentCode(this.getVaultCode());
--
--            return this;
--        },
--
--        /**
--         * Init config
--         */
--        initClientConfig: function () {
--            this._super();
--
--            // Hosted fields settings
--            this.clientConfig.hostedFields = this.getHostedFields();
--        },
--
--        /**
--         * @returns {Object}
--         */
--        getData: function () {
--            var data = this._super();
--
--            this.vaultEnabler.visitAdditionalData(data);
--
--            return data;
--        },
--
--        /**
--         * @returns {Boolean}
--         */
--        isVaultEnabled: function () {
--            return this.vaultEnabler.isVaultEnabled();
--        },
--
--        /**
--         * Get Braintree Hosted Fields
--         * @returns {Object}
--         */
--        getHostedFields: function () {
--            var self = this,
--                fields = {
--                    number: {
--                        selector: self.getSelector('cc_number')
--                    },
--                    expirationMonth: {
--                        selector: self.getSelector('expirationMonth'),
--                        placeholder: $t('MM')
--                    },
--                    expirationYear: {
--                        selector: self.getSelector('expirationYear'),
--                        placeholder: $t('YY')
--                    }
--                };
--
--            if (self.hasVerification()) {
--                fields.cvv = {
--                    selector: self.getSelector('cc_cid')
--                };
--            }
--
--            /**
--             * Triggers on Hosted Field changes
--             * @param {Object} event
--             * @returns {Boolean}
--             */
--            fields.onFieldEvent = function (event) {
--                if (event.isEmpty === false) {
--                    self.validateCardType();
--                }
--
--                if (event.type !== 'fieldStateChange') {
--                    return false;
--                }
--
--                // Handle a change in validation or card type
--                if (event.target.fieldKey === 'number') {
--                    self.selectedCardType(null);
--                }
--
--                if (event.target.fieldKey === 'number' && event.card) {
--                    self.isValidCardNumber = event.isValid;
--                    self.selectedCardType(
--                        validator.getMageCardType(event.card.type, self.getCcAvailableTypes())
--                    );
--                }
--            };
--
--            return fields;
--        },
--
--        /**
--         * Validate current credit card type
--         * @returns {Boolean}
--         */
--        validateCardType: function () {
--            var $selector = $(this.getSelector('cc_number')),
--                invalidClass = 'braintree-hosted-fields-invalid';
--
--            $selector.removeClass(invalidClass);
--
--            if (this.selectedCardType() === null || !this.isValidCardNumber) {
--                $(this.getSelector('cc_number')).addClass(invalidClass);
--
--                return false;
--            }
--
--            return true;
--        },
--
--        /**
--         * Returns state of place order button
--         * @returns {Boolean}
--         */
--        isButtonActive: function () {
--            return this.isActive() && this.isPlaceOrderActionAllowed();
--        },
--
--        /**
--         * Trigger order placing
--         */
--        placeOrderClick: function () {
--            if (this.validateCardType()) {
--                this.isPlaceOrderActionAllowed(false);
--                $(this.getSelector('submit')).trigger('click');
--            }
--        },
--
--        /**
--         * @returns {String}
--         */
--        getVaultCode: function () {
--            return window.checkoutConfig.payment[this.getCode()].ccVaultCode;
--        }
--    });
--});
-diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/cc-form.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/cc-form.js
-new file mode 100644
-index 00000000000..868fe174ae4
---- /dev/null
-+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/cc-form.js
-@@ -0,0 +1,83 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+/*browser:true*/
-+/*global define*/
-+
-+define([
-+    'jquery',
-+    'Magento_Braintree/js/view/payment/method-renderer/cc-form',
-+    'Magento_Braintree/js/validator',
-+    'Magento_Ui/js/model/messageList',
-+    'mage/translate',
-+    'Magento_Checkout/js/model/full-screen-loader',
-+    'Magento_Checkout/js/action/set-payment-information-extended',
-+    'Magento_Checkout/js/model/payment/additional-validators',
-+    'Magento_Braintree/js/view/payment/validator-handler'
-+], function (
-+    $,
-+    Component,
-+    validator,
-+    messageList,
-+    $t,
-+    fullScreenLoader,
-+    setPaymentInformationExtended,
-+    additionalValidators,
-+    validatorManager
-+) {
-+    'use strict';
-+
-+    return Component.extend({
-+        defaults: {
-+            template: 'Magento_Braintree/payment/multishipping/form'
-+        },
-+
-+        /**
-+         * @override
-+         */
-+        placeOrder: function () {
-+            var self = this;
-+
-+            validatorManager.validate(self, function () {
-+                return self.setPaymentInformation();
-+            });
-+        },
-+
-+        /**
-+         * @override
-+         */
-+        setPaymentInformation: function () {
-+            if (additionalValidators.validate()) {
-+                fullScreenLoader.startLoader();
-+                $.when(
-+                    setPaymentInformationExtended(
-+                        this.messageContainer,
-+                        this.getData(),
-+                        true
-+                    )
-+                ).done(this.done.bind(this))
-+                    .fail(this.fail.bind(this));
-+            }
-+        },
-+
-+        /**
-+         * {Function}
-+         */
-+        fail: function () {
-+            fullScreenLoader.stopLoader();
-+
-+            return this;
-+        },
-+
-+        /**
-+         * {Function}
-+         */
-+        done: function () {
-+            fullScreenLoader.stopLoader();
-+            $('#multishipping-billing-form').submit();
-+
-+            return this;
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js
-new file mode 100644
-index 00000000000..b3837103148
---- /dev/null
-+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js
-@@ -0,0 +1,162 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+/*browser:true*/
-+/*global define*/
-+define([
-+    'jquery',
-+    'underscore',
-+    'Magento_Braintree/js/view/payment/method-renderer/paypal',
-+    'Magento_Checkout/js/action/set-payment-information-extended',
-+    'Magento_Checkout/js/model/payment/additional-validators',
-+    'Magento_Checkout/js/model/full-screen-loader'
-+], function (
-+    $,
-+    _,
-+    Component,
-+    setPaymentInformationExtended,
-+    additionalValidators,
-+    fullScreenLoader
-+) {
-+    'use strict';
-+
-+    return Component.extend({
-+        defaults: {
-+            template: 'Magento_Braintree/payment/multishipping/paypal',
-+            submitButtonSelector: '#payment-continue span',
-+            paypalButtonSelector: '[id="parent-payment-continue"]',
-+            reviewButtonHtml: ''
-+        },
-+
-+        /**
-+         * @override
-+         */
-+        initObservable: function () {
-+            this.reviewButtonHtml = $(this.paypalButtonSelector).html();
-+
-+            return this._super();
-+        },
-+
-+        /**
-+         * Get configuration for PayPal.
-+         *
-+         * @returns {Object}
-+         */
-+        getPayPalConfig: function () {
-+            var config;
-+
-+            config = this._super();
-+            config.flow = 'vault';
-+            config.enableShippingAddress = false;
-+            config.shippingAddressEditable = false;
-+
-+            return config;
-+        },
-+
-+        /**
-+         * @override
-+         */
-+        onActiveChange: function (isActive) {
-+            this._super(isActive);
-+            this.updateSubmitButton(isActive);
-+        },
-+
-+        /**
-+         * @override
-+         */
-+        beforePlaceOrder: function (data) {
-+            this._super(data);
-+
-+            this.updateSubmitButton(true);
-+        },
-+
-+        /**
-+         * @override
-+         */
-+        getShippingAddress: function () {
-+            return {};
-+        },
-+
-+        /**
-+         * @override
-+         */
-+        getData: function () {
-+            var data = this._super();
-+
-+            data['additional_data']['is_active_payment_token_enabler'] = true;
-+
-+            return data;
-+        },
-+
-+        /**
-+         * @override
-+         */
-+        isActiveVault: function () {
-+            return true;
-+        },
-+
-+        /**
-+         * Skipping order review step on checkout with multiple addresses is not allowed.
-+         *
-+         * @returns {Boolean}
-+         */
-+        isSkipOrderReview: function () {
-+            return false;
-+        },
-+
-+        /**
-+         * Checks if payment method nonce is already received.
-+         *
-+         * @returns {Boolean}
-+         */
-+        isPaymentMethodNonceReceived: function () {
-+            return this.paymentPayload.nonce !== null;
-+        },
-+
-+        /**
-+         * Updates submit button on multi-addresses checkout billing form.
-+         *
-+         * @param {Boolean} isActive
-+         */
-+        updateSubmitButton: function (isActive) {
-+            if (this.isPaymentMethodNonceReceived() || !isActive) {
-+                $(this.paypalButtonSelector).html(this.reviewButtonHtml);
-+            }
-+        },
-+
-+        /**
-+         * @override
-+         */
-+        placeOrder: function () {
-+            fullScreenLoader.startLoader();
-+            $.when(
-+                setPaymentInformationExtended(
-+                    this.messageContainer,
-+                    this.getData(),
-+                    true
-+                )
-+            ).done(this.done.bind(this))
-+                .fail(this.fail.bind(this));
-+        },
-+
-+        /**
-+         * {Function}
-+         */
-+        fail: function () {
-+            fullScreenLoader.stopLoader();
-+
-+            return this;
-+        },
-+
-+        /**
-+         * {Function}
-+         */
-+        done: function () {
-+            fullScreenLoader.stopLoader();
-+            $('#multishipping-billing-form').submit();
-+
-+            return this;
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
-index 7c75cc3e594..c46e65ffb8a 100644
---- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
-+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
-@@ -7,26 +7,30 @@
- define([
-     'jquery',
-     'underscore',
--    'mage/utils/wrapper',
-     'Magento_Checkout/js/view/payment/default',
-     'Magento_Braintree/js/view/payment/adapter',
-+    'braintreePayPal',
-+    'braintreePayPalCheckout',
-     'Magento_Checkout/js/model/quote',
-     'Magento_Checkout/js/model/full-screen-loader',
-     'Magento_Checkout/js/model/payment/additional-validators',
-     'Magento_Vault/js/view/payment/vault-enabler',
-     'Magento_Checkout/js/action/create-billing-address',
-+    'Magento_Braintree/js/view/payment/kount',
-     'mage/translate'
- ], function (
-     $,
-     _,
--    wrapper,
-     Component,
--    Braintree,
-+    BraintreeAdapter,
-+    BraintreePayPal,
-+    BraintreePayPalCheckout,
-     quote,
-     fullScreenLoader,
-     additionalValidators,
-     VaultEnabler,
-     createBillingAddress,
-+    kount,
-     $t
- ) {
-     'use strict';
-@@ -36,10 +40,15 @@ define([
-             template: 'Magento_Braintree/payment/paypal',
-             code: 'braintree_paypal',
-             active: false,
--            paymentMethodNonce: null,
-             grandTotalAmount: null,
-             isReviewRequired: false,
-+            paypalCheckoutInstance: null,
-             customerEmail: null,
-+            vaultEnabler: null,
-+            paymentPayload: {
-+                nonce: null
-+            },
-+            paypalButtonSelector: '[data-container="paypal-button"]',
- 
-             /**
-              * Additional payment data
-@@ -48,39 +57,42 @@ define([
-              */
-             additionalData: {},
- 
--            /**
--             * PayPal client configuration
--             * {Object}
--             */
--            clientConfig: {
--                dataCollector: {
--                    paypal: true
--                },
--
--                /**
--                 * Triggers when widget is loaded
--                 * @param {Object} checkout
--                 */
--                onReady: function (checkout) {
--                    Braintree.checkout = checkout;
--                    this.additionalData['device_data'] = checkout.deviceData;
--                    this.enableButton();
--                    Braintree.onReady();
--                },
--
--                /**
--                 * Triggers on payment nonce receive
--                 * @param {Object} response
--                 */
--                onPaymentMethodReceived: function (response) {
--                    this.beforePlaceOrder(response);
--                }
--            },
-             imports: {
-                 onActiveChange: 'active'
-             }
-         },
- 
-+        /**
-+         * Initialize view.
-+         *
-+         * @return {exports}
-+         */
-+        initialize: function () {
-+            var self = this;
-+
-+            self._super();
-+
-+            BraintreeAdapter.getApiClient().then(function (clientInstance) {
-+                return BraintreePayPal.create({
-+                    client: clientInstance
-+                });
-+            }).then(function (paypalCheckoutInstance) {
-+                self.paypalCheckoutInstance = paypalCheckoutInstance;
-+
-+                return self.paypalCheckoutInstance;
-+            });
-+
-+            kount.getDeviceData()
-+                .then(function (deviceData) {
-+                    self.additionalData['device_data'] = deviceData;
-+                });
-+
-+            // for each component initialization need update property
-+            this.isReviewRequired(false);
-+
-+            return self;
-+        },
-+
-         /**
-          * Set list of observable attributes
-          * @returns {exports.initObservable}
-@@ -105,9 +117,11 @@ define([
-                 }
-             });
- 
--            // for each component initialization need update property
--            this.isReviewRequired(false);
--            this.initClientConfig();
-+            quote.shippingAddress.subscribe(function () {
-+                if (self.isActive()) {
-+                    self.reInitPayPal();
-+                }
-+            });
- 
-             return this;
-         },
-@@ -157,24 +171,13 @@ define([
-         },
- 
-         /**
--         * Init config
--         */
--        initClientConfig: function () {
--            this.clientConfig = _.extend(this.clientConfig, this.getPayPalConfig());
--
--            _.each(this.clientConfig, function (fn, name) {
--                if (typeof fn === 'function') {
--                    this.clientConfig[name] = fn.bind(this);
--                }
--            }, this);
--        },
--
--        /**
--         * Set payment nonce
--         * @param {String} paymentMethodNonce
-+         * Sets payment payload
-+         *
-+         * @param {Object} paymentPayload
-+         * @private
-          */
--        setPaymentMethodNonce: function (paymentMethodNonce) {
--            this.paymentMethodNonce = paymentMethodNonce;
-+        setPaymentPayload: function (paymentPayload) {
-+            this.paymentPayload = paymentPayload;
-         },
- 
-         /**
-@@ -201,51 +204,69 @@ define([
- 
-         /**
-          * Prepare data to place order
--         * @param {Object} data
-+         * @param {Object} payload
-          */
--        beforePlaceOrder: function (data) {
--            this.setPaymentMethodNonce(data.nonce);
-+        beforePlaceOrder: function (payload) {
-+            this.setPaymentPayload(payload);
- 
--            if (quote.billingAddress() === null && typeof data.details.billingAddress !== 'undefined') {
--                this.setBillingAddress(data.details, data.details.billingAddress);
-+            if ((this.isRequiredBillingAddress() || quote.billingAddress() === null) &&
-+                typeof payload.details.billingAddress !== 'undefined'
-+            ) {
-+                this.setBillingAddress(payload.details, payload.details.billingAddress);
-             }
- 
-             if (this.isSkipOrderReview()) {
-                 this.placeOrder();
-             } else {
--                this.customerEmail(data.details.email);
-+                this.customerEmail(payload.details.email);
-                 this.isReviewRequired(true);
-             }
-         },
- 
-         /**
-          * Re-init PayPal Auth Flow
--         * @param {Function} callback - Optional callback
-          */
--        reInitPayPal: function (callback) {
--            if (Braintree.checkout) {
--                Braintree.checkout.teardown(function () {
--                    Braintree.checkout = null;
--                });
--            }
-+        reInitPayPal: function () {
-+            var self = this;
- 
--            this.disableButton();
--            this.clientConfig.paypal.amount = this.grandTotalAmount;
--            this.clientConfig.paypal.shippingAddressOverride = this.getShippingAddress();
--
--            if (callback) {
--                this.clientConfig.onReady = wrapper.wrap(
--                    this.clientConfig.onReady,
--                    function (original, checkout) {
--                        this.clientConfig.onReady = original;
--                        original(checkout);
--                        callback();
--                    }.bind(this)
--                );
--            }
-+            $(self.paypalButtonSelector).html('');
-+
-+            return BraintreePayPalCheckout.Button.render({
-+                env: this.getEnvironment(),
-+                style: {
-+                    color: 'blue',
-+                    shape: 'rect',
-+                    size: 'medium',
-+                    label: 'pay',
-+                    tagline: false
-+                },
-+
-+                /**
-+                 * Creates a PayPal payment
-+                 */
-+                payment: function () {
-+                    return self.paypalCheckoutInstance.createPayment(
-+                        self.getPayPalConfig()
-+                    );
-+                },
- 
--            Braintree.setConfig(this.clientConfig);
--            Braintree.setup();
-+                /**
-+                 * Tokenizes the authorize data
-+                 */
-+                onAuthorize: function (data) {
-+                    return self.paypalCheckoutInstance.tokenizePayment(data)
-+                        .then(function (payload) {
-+                            self.beforePlaceOrder(payload);
-+                        });
-+                },
-+
-+                /**
-+                 * Triggers on error
-+                 */
-+                onError: function () {
-+                    self.showError($t('Payment ' + self.getTitle() + ' can\'t be initialized'));
-+                }
-+            }, self.paypalButtonSelector);
-         },
- 
-         /**
-@@ -264,43 +285,36 @@ define([
-             return window.checkoutConfig.payment[this.getCode()].isAllowShippingAddressOverride;
-         },
- 
-+        /**
-+         * Is billing address required from PayPal side
-+         * @returns {Boolean}
-+         */
-+        isRequiredBillingAddress: function () {
-+            return window.checkoutConfig.payment[this.getCode()].isRequiredBillingAddress;
-+        },
-+
-         /**
-          * Get configuration for PayPal
-          * @returns {Object}
-          */
-         getPayPalConfig: function () {
-             var totals = quote.totals(),
--                config = {},
-+                config,
-                 isActiveVaultEnabler = this.isActiveVault();
- 
--            config.paypal = {
--                container: 'paypal-container',
--                singleUse: !isActiveVaultEnabler,
--                headless: true,
-+            config = {
-+                flow: !isActiveVaultEnabler ? 'checkout' : 'vault',
-                 amount: this.grandTotalAmount,
-                 currency: totals['base_currency_code'],
-                 locale: this.getLocale(),
-                 enableShippingAddress: true,
--
--                /**
--                 * Triggers on any Braintree error
--                 */
--                onError: function () {
--                    this.paymentMethodNonce = null;
--                },
--
--                /**
--                 * Triggers if browser doesn't support PayPal Checkout
--                 */
--                onUnsupported: function () {
--                    this.paymentMethodNonce = null;
--                }
-+                shippingAddressEditable: this.isAllowOverrideShippingAddress()
-             };
- 
--            config.paypal.shippingAddressOverride = this.getShippingAddress();
-+            config.shippingAddressOverride = this.getShippingAddress();
- 
-             if (this.getMerchantName()) {
--                config.paypal.displayName = this.getMerchantName();
-+                config.displayName = this.getMerchantName();
-             }
- 
-             return config;
-@@ -318,14 +332,13 @@ define([
-             }
- 
-             return {
--                recipientName: address.firstname + ' ' + address.lastname,
--                streetAddress: address.street[0],
--                locality: address.city,
--                countryCodeAlpha2: address.countryId,
-+                line1: address.street[0],
-+                city: address.city,
-+                state: address.regionCode,
-                 postalCode: address.postcode,
--                region: address.regionCode,
-+                countryCode: address.countryId,
-                 phone: address.telephone,
--                editable: this.isAllowOverrideShippingAddress()
-+                recipientName: address.firstname + ' ' + address.lastname
-             };
-         },
- 
-@@ -345,7 +358,7 @@ define([
-             var data = {
-                 'method': this.getCode(),
-                 'additional_data': {
--                    'payment_method_nonce': this.paymentMethodNonce
-+                    'payment_method_nonce': this.paymentPayload.nonce
-                 }
-             };
- 
-@@ -372,6 +385,13 @@ define([
-             return window.checkoutConfig.payment[this.getCode()].vaultCode;
-         },
- 
-+        /**
-+         * @returns {String}
-+         */
-+        getEnvironment: function () {
-+            return window.checkoutConfig.payment[BraintreeAdapter.getCode()].environment;
-+        },
-+
-         /**
-          * Check if need to skip order review
-          * @returns {Boolean}
-@@ -392,61 +412,7 @@ define([
-          * Re-init PayPal Auth flow to use Vault
-          */
-         onVaultPaymentTokenEnablerChange: function () {
--            this.clientConfig.paypal.singleUse = !this.isActiveVault();
-             this.reInitPayPal();
--        },
--
--        /**
--         * Disable submit button
--         */
--        disableButton: function () {
--            // stop any previous shown loaders
--            fullScreenLoader.stopLoader(true);
--            fullScreenLoader.startLoader();
--            $('[data-button="place"]').attr('disabled', 'disabled');
--        },
--
--        /**
--         * Enable submit button
--         */
--        enableButton: function () {
--            $('[data-button="place"]').removeAttr('disabled');
--            fullScreenLoader.stopLoader();
--        },
--
--        /**
--         * Triggers when customer click "Continue to PayPal" button
--         */
--        payWithPayPal: function () {
--            this.reInitPayPal(function () {
--                if (!additionalValidators.validate()) {
--                    return;
--                }
--
--                try {
--                    Braintree.checkout.paypal.initAuthFlow();
--                } catch (e) {
--                    this.messageContainer.addErrorMessage({
--                        message: $t('Payment ' + this.getTitle() + ' can\'t be initialized.')
--                    });
--                }
--            }.bind(this));
--        },
--
--        /**
--         * Get button title
--         * @returns {String}
--         */
--        getButtonTitle: function () {
--            return this.isSkipOrderReview() ? 'Pay with PayPal' : 'Continue to PayPal';
--        },
--
--        /**
--         * Get button id
--         * @returns {String}
--         */
--        getButtonId: function () {
--            return this.getCode() + (this.isSkipOrderReview() ? '_pay_with' : '_continue_to');
-         }
-     });
- });
-diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js
-index 85e531706d6..ad8ac02bfb8 100644
---- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js
-+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js
-@@ -51,15 +51,7 @@ define([
-         placeOrder: function () {
-             var self = this;
- 
--            /**
--             * Define onReady callback
--             */
--            Braintree.onReady = function () {
--                self.getPaymentMethodNonce();
--            };
--            self.hostedFields(function (formComponent) {
--                formComponent.initBraintree();
--            });
-+            self.getPaymentMethodNonce();
-         },
- 
-         /**
-@@ -75,7 +67,7 @@ define([
-                 .done(function (response) {
-                     fullScreenLoader.stopLoader();
-                     self.hostedFields(function (formComponent) {
--                        formComponent.setPaymentMethodNonce(response.paymentMethodNonce);
-+                        formComponent.paymentPayload.nonce = response.paymentMethodNonce;
-                         formComponent.additionalData['public_hash'] = self.publicHash;
-                         formComponent.code = self.code;
-                         formComponent.messageContainer = self.messageContainer;
-diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/validator-handler.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/validator-handler.js
-index fbe85c3b460..992c241fad6 100644
---- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/validator-handler.js
-+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/validator-handler.js
-@@ -7,28 +7,26 @@
- 
- define([
-     'jquery',
--    'Magento_Ui/js/model/messageList',
-     'Magento_Braintree/js/view/payment/3d-secure'
--], function ($, globalMessageList, verify3DSecure) {
-+], function ($, verify3DSecure) {
-     'use strict';
- 
-     return {
-+        initialized: false,
-         validators: [],
- 
-         /**
--         * Get payment config
--         * @returns {Object}
--         */
--        getConfig: function () {
--            return window.checkoutConfig.payment;
--        },
--
--        /**
--         * Init list of validators
-+         * Inits list of validators
-          */
-         initialize: function () {
-             var config = this.getConfig();
- 
-+            if (this.initialized) {
-+                return;
-+            }
-+
-+            this.initialized = true;
-+
-             if (config[verify3DSecure.getCode()].enabled) {
-                 verify3DSecure.setConfig(config[verify3DSecure.getCode()]);
-                 this.add(verify3DSecure);
-@@ -36,7 +34,17 @@ define([
-         },
- 
-         /**
--         * Add new validator
-+         * Gets payment config
-+         *
-+         * @returns {Object}
-+         */
-+        getConfig: function () {
-+            return window.checkoutConfig.payment;
-+        },
-+
-+        /**
-+         * Adds new validator
-+         *
-          * @param {Object} validator
-          */
-         add: function (validator) {
-@@ -44,17 +52,21 @@ define([
-         },
- 
-         /**
--         * Run pull of validators
-+         * Runs pull of validators
-+         *
-          * @param {Object} context
--         * @param {Function} callback
-+         * @param {Function} successCallback
-+         * @param {Function} errorCallback
-          */
--        validate: function (context, callback) {
-+        validate: function (context, successCallback, errorCallback) {
-             var self = this,
-                 deferred;
- 
-+            self.initialize();
-+
-             // no available validators
-             if (!self.validators.length) {
--                callback();
-+                successCallback();
- 
-                 return;
-             }
-@@ -66,20 +78,10 @@ define([
- 
-             $.when.apply($, deferred)
-                 .done(function () {
--                    callback();
-+                    successCallback();
-                 }).fail(function (error) {
--                    self.showError(error);
-+                    errorCallback(error);
-                 });
--        },
--
--        /**
--         * Show error message
--         * @param {String} errorMessage
--         */
--        showError: function (errorMessage) {
--            globalMessageList.addErrorMessage({
--                message: errorMessage
--            });
-         }
-     };
- });
-diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/form.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/form.html
-index 819b06ca757..9bcb5dad8b6 100644
---- a/app/code/Magento/Braintree/view/frontend/web/template/payment/form.html
-+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/form.html
-@@ -87,7 +87,7 @@
-                         <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
-                     </label>
-                     <div class="control _with-tooltip">
--                        <div data-bind="attr: {id: getCode() + '_cc_cid'}" class="hosted-control hosted-cid"></div>
-+                        <div data-bind="afterRender: initHostedFields, attr: {id: getCode() + '_cc_cid'}" class="hosted-control hosted-cid"></div>
-                         <div class="hosted-error"><!-- ko i18n: 'Please, enter valid Card Verification Number'--><!-- /ko --></div>
- 
-                         <div class="field-tooltip toggle">
-diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/form.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/form.html
-new file mode 100644
-index 00000000000..b72ef24b81b
---- /dev/null
-+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/form.html
-@@ -0,0 +1,106 @@
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+
-+<div data-bind="attr: {class: 'payment-method payment-method-' + getCode()}, css: {'_active': isActive()}">
-+    <div>
-+        <form id="co-transparent-form-braintree" class="form" data-bind="" method="post" action="#" novalidate="novalidate">
-+            <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'payment_form_' + getCode()}">
-+                <legend class="legend">
-+                    <span><!-- ko i18n: 'Credit Card Information'--><!-- /ko --></span>
-+                </legend>
-+                <br>
-+                <div class="field type">
-+                    <div class="control">
-+                        <ul class="credit-card-types">
-+                            <!-- ko foreach: {data: getCcAvailableTypes(), as: 'item'} -->
-+                            <li class="item" data-bind="css: {
-+                                _active: $parent.selectedCardType() == item,
-+                                _inactive: $parent.selectedCardType() != null && $parent.selectedCardType() != item
-+                            } ">
-+                                <!--ko if: $parent.getIcons(item) -->
-+                                <img data-bind="attr: {
-+                                    'src': $parent.getIcons(item).url,
-+                                    'width': $parent.getIcons(item).width,
-+                                    'height': $parent.getIcons(item).height
-+                                }">
-+                                <!--/ko-->
-+                            </li>
-+                            <!--/ko-->
-+                        </ul>
-+                        <input type="hidden"
-+                               name="payment[cc_type]"
-+                               class="input-text"
-+                               value=""
-+                               data-bind="attr: {id: getCode() + '_cc_type', 'data-container': getCode() + '-cc-type'},
-+                                    value: creditCardType
-+                        ">
-+                    </div>
-+                </div>
-+                <div class="field number required">
-+                    <label data-bind="afterRender: initHostedFields, attr: {for: getCode() + '_cc_number'}" class="label">
-+                        <span><!-- ko i18n: 'Credit Card Number'--><!-- /ko --></span>
-+                    </label>
-+                    <div class="control">
-+                        <div data-bind="attr: {id: getCode() + '_cc_number'}" class="hosted-control"></div>
-+                        <div class="hosted-error"><!-- ko i18n: 'Please, enter valid Credit Card Number'--><!-- /ko --></div>
-+                    </div>
-+                </div>
-+                <div class="field number required">
-+                    <label data-bind="attr: {for: getCode() + '_expiration'}" class="label">
-+                        <span><!-- ko i18n: 'Expiration Date'--><!-- /ko --></span>
-+                    </label>
-+                    <div class="control">
-+                        <div class="hosted-date-wrap">
-+                            <div data-bind="attr: {id: getCode() + '_expirationMonth'}"
-+                                 class="hosted-control hosted-date"></div>
-+
-+                            <div data-bind="attr: {id: getCode() + '_expirationYear'}"
-+                                 class="hosted-control hosted-date"></div>
-+
-+                            <div class="hosted-error"><!-- ko i18n: 'Please, enter valid Expiration Date'--><!-- /ko --></div>
-+                        </div>
-+                    </div>
-+                </div>
-+                <!-- ko if: (hasVerification())-->
-+                <div class="field cvv required" data-bind="attr: {id: getCode() + '_cc_type_cvv_div'}">
-+                    <label data-bind="attr: {for: getCode() + '_cc_cid'}" class="label">
-+                        <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
-+                    </label>
-+                    <div class="control _with-tooltip">
-+                        <div data-bind="attr: {id: getCode() + '_cc_cid'}" class="hosted-control hosted-cid"></div>
-+                        <div class="hosted-error"><!-- ko i18n: 'Please, enter valid Card Verification Number'--><!-- /ko --></div>
-+
-+                        <div class="field-tooltip toggle">
-+                            <span class="field-tooltip-action action-cvv"
-+                                  tabindex="0"
-+                                  data-toggle="dropdown"
-+                                  data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
-+                                <span><!-- ko i18n: 'What is this?'--><!-- /ko --></span>
-+                            </span>
-+                            <div class="field-tooltip-content"
-+                                 data-target="dropdown"
-+                                 data-bind="html: getCvvImageHtml()"></div>
-+                        </div>
-+                    </div>
-+                </div>
-+                <!-- /ko -->
-+            </fieldset>
-+            <input type="submit" id="braintree_submit"  style="display:none" />
-+        </form>
-+
-+        <div class="actions-toolbar no-display">
-+            <div class="primary">
-+                <button data-role="review-save"
-+                        type="submit"
-+                        data-bind="{click: placeOrderClick}"
-+                        class="action primary checkout">
-+                    <span data-bind="i18n: 'Place Order'"></span>
-+                </button>
-+            </div>
-+        </div>
-+    </div>
-+</div>
-\ No newline at end of file
-diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/paypal.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/paypal.html
-new file mode 100644
-index 00000000000..fcd53203519
---- /dev/null
-+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/paypal.html
-@@ -0,0 +1,41 @@
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<div class="payment-method" data-bind="css: {'_active': isActive()}">
-+    <div class="payment-method-title field choice">
-+        <label class="label" data-bind="attr: {'for': getCode()}">
-+            <!-- PayPal Logo -->
-+            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark'), title: $t('Acceptance Mark')}"
-+                 class="payment-icon"/>
-+            <!-- PayPal Logo -->
-+            <span text="getTitle()"></span>
-+        </label>
-+    </div>
-+
-+    <div class="payment-method-content">
-+        <each args="getRegion('messages')" render=""></each>
-+        <fieldset class="braintree-paypal-fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
-+            <div id="paypal-container"></div>
-+        </fieldset>
-+        <div data-container="paypal-button"></div>
-+        <div class="actions-toolbar braintree-paypal-actions" data-bind="visible: isReviewRequired()">
-+            <div class="payment-method-item braintree-paypal-account">
-+                <span class="payment-method-type">PayPal</span>
-+                <span class="payment-method-description" text="customerEmail()"></span>
-+            </div>
-+            <div class="actions-toolbar no-display">
-+                <div class="primary">
-+                    <button data-button="paypal-place" data-role="review-save"
-+                            type="submit"
-+                            data-bind="{click: placeOrder}"
-+                            class="action primary checkout">
-+                        <span data-bind="i18n: 'Place Order'"></span>
-+                    </button>
-+                </div>
-+            </div>
-+        </div>
-+    </div>
-+</div>
-diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
-index e1f6a1b4c25..0abf3483ac7 100644
---- a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
-+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
-@@ -65,15 +65,7 @@
-             </div>
-         </div>
-         <div class="actions-toolbar" data-bind="visible: !isReviewRequired()">
--            <div class="primary">
--                <button data-button="place" data-role="review-save"
--                        type="submit"
--                        data-bind="attr: {id: getButtonId(), title: $t(getButtonTitle())}, enable: (isActive()), click: payWithPayPal"
--                        class="action primary checkout"
--                        disabled>
--                    <span translate="getButtonTitle()"></span>
--                </button>
--            </div>
-+            <div data-container="paypal-button" class="primary"></div>
-         </div>
-     </div>
- </div>
-diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
-index b220e2c98d7..46db8a99073 100644
---- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
-+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
-@@ -20,9 +20,7 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
-     protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/checkbox.phtml';
- 
-     /**
--     * @param  string $elementId
--     * @param  string $containerId
--     * @return string
-+     * @inheritdoc
-      */
-     public function setValidationContainer($elementId, $containerId)
-     {
-@@ -34,4 +32,15 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
-             '\';
-             </script>';
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getSelectionPrice($selection)
-+    {
-+        $price = parent::getSelectionPrice($selection);
-+        $qty = $selection->getSelectionQty();
-+
-+        return $price * $qty;
-+    }
- }
-diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
-index a4b8c6bde73..629f08dc751 100644
---- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
-+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
-@@ -20,9 +20,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
-     protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/multi.phtml';
- 
-     /**
--     * @param  string $elementId
--     * @param  string $containerId
--     * @return string
-+     * @inheritdoc
-      */
-     public function setValidationContainer($elementId, $containerId)
-     {
-@@ -34,4 +32,15 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
-             '\';
-             </script>';
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getSelectionPrice($selection)
-+    {
-+        $price = parent::getSelectionPrice($selection);
-+        $qty = $selection->getSelectionQty();
-+
-+        return $price * $qty;
-+    }
- }
-diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
-index 0e21e566d5e..91b015782fe 100644
---- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
-+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
-@@ -4,13 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
-+namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes;
-+
- /**
-- * Bundle Extended Attribures Block
-+ * Bundle Extended Attributes Block.
-  *
-- * @author      Magento Core Team <core@magentocommerce.com>
-+ * @author Magento Core Team <core@magentocommerce.com>
-  */
--namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes;
--
- class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
- {
-     /**
-@@ -75,7 +75,7 @@ class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Ele
-     }
- 
-     /**
--     * Execute method getElementHtml from parrent class
-+     * Execute method getElementHtml from parent class
-      *
-      * @return string
-      */
-@@ -85,6 +85,8 @@ class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Ele
-     }
- 
-     /**
-+     * Get options.
-+     *
-      * @return array
-      */
-     public function getOptions()
-@@ -106,6 +108,8 @@ class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Ele
-     }
- 
-     /**
-+     * Is disabled field.
-+     *
-      * @return bool
-      */
-     public function isDisabledField()
-@@ -118,6 +122,8 @@ class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Ele
-     }
- 
-     /**
-+     * Get product.
-+     *
-      * @return mixed
-      */
-     public function getProduct()
-@@ -129,6 +135,8 @@ class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Ele
-     }
- 
-     /**
-+     * Get extended element.
-+     *
-      * @param string $switchAttributeCode
-      * @return \Magento\Framework\Data\Form\Element\Select
-      * @throws \Magento\Framework\Exception\LocalizedException
-diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
-index 23fc2026ab1..82a0086ad67 100644
---- a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
-+++ b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
-@@ -100,6 +100,8 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRend
-     }
- 
-     /**
-+     * Check if item can be shipped separately
-+     *
-      * @param mixed $item
-      * @return bool
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-@@ -136,6 +138,8 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRend
-     }
- 
-     /**
-+     * Check if child items calculated
-+     *
-      * @param mixed $item
-      * @return bool
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-@@ -174,6 +178,8 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRend
-     }
- 
-     /**
-+     * Retrieve selection attributes values
-+     *
-      * @param mixed $item
-      * @return mixed|null
-      */
-@@ -191,6 +197,8 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRend
-     }
- 
-     /**
-+     * Retrieve order item options array
-+     *
-      * @return array
-      */
-     public function getOrderOptions()
-@@ -212,6 +220,8 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRend
-     }
- 
-     /**
-+     * Retrieve order item
-+     *
-      * @return mixed
-      */
-     public function getOrderItem()
-@@ -223,6 +233,8 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRend
-     }
- 
-     /**
-+     * Get html info for item
-+     *
-      * @param mixed $item
-      * @return string
-      */
-@@ -245,6 +257,8 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRend
-     }
- 
-     /**
-+     * Check if we can show price info for this item
-+     *
-      * @param object $item
-      * @return bool
-      */
-diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
-index 542f170da8c..fa488b073f5 100644
---- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
-+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
-@@ -7,6 +7,7 @@ namespace Magento\Bundle\Block\Catalog\Product\View\Type;
- 
- use Magento\Bundle\Model\Option;
- use Magento\Catalog\Model\Product;
-+use Magento\Framework\DataObject;
- 
- /**
-  * Catalog bundle product info block
-@@ -56,6 +57,11 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
-      */
-     private $catalogRuleProcessor;
- 
-+    /**
-+     * @var array
-+     */
-+    private $optionsPosition = [];
-+
-     /**
-      * @param \Magento\Catalog\Block\Product\Context $context
-      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
-@@ -86,6 +92,8 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
-     }
- 
-     /**
-+     * Return catalog rule processor or creates processor if it does not exist
-+     *
-      * @deprecated 100.2.0
-      * @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
-      */
-@@ -101,6 +109,7 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
- 
-     /**
-      * Returns the bundle product options
-+     *
-      * Will return cached options data if the product options are already initialized
-      * In a case when $stripSelection parameter is true will reload stored bundle selections collection from DB
-      *
-@@ -135,6 +144,8 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
-     }
- 
-     /**
-+     * Return true if product has options
-+     *
-      * @return bool
-      */
-     public function hasOptions()
-@@ -150,7 +161,6 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
-      * Returns JSON encoded config to be used in JS scripts
-      *
-      * @return string
--     *
-      */
-     public function getJsonConfig()
-     {
-@@ -161,7 +171,7 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
- 
-         $defaultValues = [];
-         $preConfiguredFlag = $currentProduct->hasPreconfiguredValues();
--        /** @var \Magento\Framework\DataObject|null $preConfiguredValues */
-+        /** @var DataObject|null $preConfiguredValues */
-         $preConfiguredValues = $preConfiguredFlag ? $currentProduct->getPreconfiguredValues() : null;
- 
-         $position = 0;
-@@ -172,19 +182,25 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
-             }
-             $optionId = $optionItem->getId();
-             $options[$optionId] = $this->getOptionItemData($optionItem, $currentProduct, $position);
-+            $this->optionsPosition[$position] = $optionId;
- 
-             // Add attribute default value (if set)
-             if ($preConfiguredFlag) {
-                 $configValue = $preConfiguredValues->getData('bundle_option/' . $optionId);
-                 if ($configValue) {
-                     $defaultValues[$optionId] = $configValue;
-+                    $configQty = $preConfiguredValues->getData('bundle_option_qty/' . $optionId);
-+                    if ($configQty) {
-+                        $options[$optionId]['selections'][$configValue]['qty'] = $configQty;
-+                    }
-                 }
-+                $options = $this->processOptions($optionId, $options, $preConfiguredValues);
-             }
-             $position++;
-         }
-         $config = $this->getConfigData($currentProduct, $options);
- 
--        $configObj = new \Magento\Framework\DataObject(
-+        $configObj = new DataObject(
-             [
-                 'config' => $config,
-             ]
-@@ -370,6 +386,7 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
-         $config = [
-             'options' => $options,
-             'selected' => $this->selectedOptions,
-+            'positions' => $this->optionsPosition,
-             'bundleId' => $product->getId(),
-             'priceFormat' => $this->localeFormat->getPriceFormat(),
-             'prices' => [
-@@ -388,4 +405,30 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
-         ];
-         return $config;
-     }
-+
-+    /**
-+     * Set preconfigured quantities and selections to options.
-+     *
-+     * @param string $optionId
-+     * @param array $options
-+     * @param DataObject $preConfiguredValues
-+     * @return array
-+     */
-+    private function processOptions(string $optionId, array $options, DataObject $preConfiguredValues)
-+    {
-+        $preConfiguredQtys = $preConfiguredValues->getData("bundle_option_qty/${optionId}") ?? [];
-+        $selections = $options[$optionId]['selections'];
-+        array_walk($selections, function (&$selection, $selectionId) use ($preConfiguredQtys) {
-+            if (is_array($preConfiguredQtys) && isset($preConfiguredQtys[$selectionId])) {
-+                $selection['qty'] = $preConfiguredQtys[$selectionId];
-+            } else {
-+                if ((int)$preConfiguredQtys > 0) {
-+                    $selection['qty'] = $preConfiguredQtys;
-+                }
-+            }
-+        });
-+        $options[$optionId]['selections'] = $selections;
-+
-+        return $options;
-+    }
- }
-diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
-index 5d326e7c01d..7c5a64ca023 100644
---- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
-+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
-@@ -6,6 +6,8 @@
- 
- namespace Magento\Bundle\Block\Catalog\Product\View\Type\Bundle;
- 
-+use Magento\Catalog\Model\Product;
-+
- /**
-  * Bundle option renderer
-  * @api
-@@ -167,7 +169,9 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
-      */
-     protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
-     {
--        if ($selectionId && $option->getSelectionById($selectionId)) {
-+        if (is_array($selectionId)) {
-+            $this->_selectedOptions = $selectionId;
-+        } elseif ($selectionId && $option->getSelectionById($selectionId)) {
-             $this->_selectedOptions = $selectionId;
-         } elseif (!$option->getRequired()) {
-             $this->_selectedOptions = 'None';
-@@ -177,7 +181,7 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
-     /**
-      * Define if selection is selected
-      *
--     * @param  \Magento\Catalog\Model\Product $selection
-+     * @param  Product $selection
-      * @return bool
-      */
-     public function isSelected($selection)
-@@ -217,7 +221,7 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
-     /**
-      * Get product model
-      *
--     * @return \Magento\Catalog\Model\Product
-+     * @return Product
-      */
-     public function getProduct()
-     {
-@@ -228,7 +232,9 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
-     }
- 
-     /**
--     * @param \Magento\Catalog\Model\Product $selection
-+     * Get bundle option price title.
-+     *
-+     * @param Product $selection
-      * @param bool $includeContainer
-      * @return string
-      */
-@@ -250,7 +256,7 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
-     /**
-      * Get price for selection product
-      *
--     * @param \Magento\Catalog\Model\Product $selection
-+     * @param Product $selection
-      * @return int|float
-      */
-     public function getSelectionPrice($selection)
-@@ -273,7 +279,7 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
-     /**
-      * Get title price for selection product
-      *
--     * @param \Magento\Catalog\Model\Product $selection
-+     * @param Product $selection
-      * @param bool $includeContainer
-      * @return string
-      */
-@@ -295,7 +301,7 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
-      */
-     public function setValidationContainer($elementId, $containerId)
-     {
--        return;
-+        return '';
-     }
- 
-     /**
-@@ -314,7 +320,7 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
-     /**
-      * Format price string
-      *
--     * @param \Magento\Catalog\Model\Product $selection
-+     * @param Product $selection
-      * @param bool $includeContainer
-      * @return string
-      */
-diff --git a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
-index c75ebc70060..c0a2d9d4303 100644
---- a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
-+++ b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
-@@ -32,7 +32,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
-      * @param \Magento\Framework\Url\Helper\Data $urlHelper
-      * @param \Magento\Framework\Message\ManagerInterface $messageManager
-      * @param PriceCurrencyInterface $priceCurrency
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param InterpretationStrategyInterface $messageInterpretationStrategy
-      * @param Configuration $bundleProductConfiguration
-      * @param array $data
-@@ -46,7 +46,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
-         \Magento\Framework\Url\Helper\Data $urlHelper,
-         \Magento\Framework\Message\ManagerInterface $messageManager,
-         PriceCurrencyInterface $priceCurrency,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         InterpretationStrategyInterface $messageInterpretationStrategy,
-         Configuration $bundleProductConfiguration,
-         array $data = []
-@@ -69,6 +69,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
- 
-     /**
-      * Overloaded method for getting list of bundle options
-+     *
-      * Caches result in quote item, because it can be used in cart 'recent view' and on same page in cart checkout
-      *
-      * @return array
-@@ -88,7 +89,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
-         $messages = [];
-         $quoteItem = $this->getItem();
- 
--        // Add basic messages occuring during this page load
-+        // Add basic messages occurring during this page load
-         $baseMessages = $quoteItem->getMessage(false);
-         if ($baseMessages) {
-             foreach ($baseMessages as $message) {
-diff --git a/app/code/Magento/Bundle/Block/DataProviders/OptionPriceRenderer.php b/app/code/Magento/Bundle/Block/DataProviders/OptionPriceRenderer.php
-new file mode 100644
-index 00000000000..058b3a981b5
---- /dev/null
-+++ b/app/code/Magento/Bundle/Block/DataProviders/OptionPriceRenderer.php
-@@ -0,0 +1,63 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Bundle\Block\DataProviders;
-+
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Pricing\Price\TierPrice;
-+use Magento\Framework\Pricing\Render;
-+use Magento\Framework\View\Element\Block\ArgumentInterface;
-+use Magento\Framework\View\LayoutInterface;
-+
-+/**
-+ * Provides additional data for bundle options
-+ */
-+class OptionPriceRenderer implements ArgumentInterface
-+{
-+    /**
-+     * Parent layout of the block
-+     *
-+     * @var LayoutInterface
-+     */
-+    private $layout;
-+
-+    /**
-+     * @param LayoutInterface $layout
-+     */
-+    public function __construct(LayoutInterface $layout)
-+    {
-+        $this->layout = $layout;
-+    }
-+
-+    /**
-+     * Format tier price string
-+     *
-+     * @param Product $selection
-+     * @param array $arguments
-+     * @return string
-+     */
-+    public function renderTierPrice(Product $selection, array $arguments = []): string
-+    {
-+        if (!array_key_exists('zone', $arguments)) {
-+            $arguments['zone'] = Render::ZONE_ITEM_OPTION;
-+        }
-+
-+        $priceHtml = '';
-+
-+        /** @var Render $priceRender */
-+        $priceRender = $this->layout->getBlock('product.price.render.default');
-+        if ($priceRender !== false) {
-+            $priceHtml = $priceRender->render(
-+                TierPrice::PRICE_CODE,
-+                $selection,
-+                $arguments
-+            );
-+        }
-+
-+        return $priceHtml;
-+    }
-+}
-diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php
-index ba7b9b5fcb5..08fac66c4a4 100644
---- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php
-+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php
-@@ -6,6 +6,16 @@
-  */
- namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
- 
--class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product\Crosssell
-+use Magento\Catalog\Controller\Adminhtml\Product\Crosssell as CatalogCrossel;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class Crosssell
-+ *
-+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
-+ * @deprecated Not used since cross-sell products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
-+ */
-+class Crosssell extends CatalogCrossel implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php
-index 87550d768ca..b301d6ee2fe 100644
---- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php
-+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php
-@@ -6,6 +6,16 @@
-  */
- namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
- 
--class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid
-+use Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid as CatalogCrosssellGrid;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class CrosssellGrid
-+ *
-+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
-+ * @deprecated Not used since cross-sell products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
-+ */
-+class CrosssellGrid extends CatalogCrosssellGrid implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php
-index 58f464fba3a..7534cfddcaa 100644
---- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php
-+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php
-@@ -6,6 +6,16 @@
-  */
- namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
- 
--class Related extends \Magento\Catalog\Controller\Adminhtml\Product\Related
-+use Magento\Catalog\Controller\Adminhtml\Product\Related as CatalogRelated;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class Related
-+ *
-+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
-+ * @deprecated Not used since related products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
-+ */
-+class Related extends CatalogRelated implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php
-index a27efe8bc2b..e0fc9226663 100644
---- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php
-+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php
-@@ -6,6 +6,16 @@
-  */
- namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
- 
--class RelatedGrid extends \Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid
-+use Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid as CatalogRelatedGrid;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class RelatedGrid
-+ *
-+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
-+ * @deprecated Not used since related products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
-+ */
-+class RelatedGrid extends CatalogRelatedGrid implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php
-index d0a6343569e..239b13970e6 100644
---- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php
-+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php
-@@ -6,6 +6,16 @@
-  */
- namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
- 
--class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product\Upsell
-+use Magento\Catalog\Controller\Adminhtml\Product\Upsell as CatalogUpsell;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class Upsell
-+ *
-+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
-+ * @deprecated Not used since upsell products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
-+ */
-+class Upsell extends CatalogUpsell implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php
-index 74c87be5b71..ed3312d3b07 100644
---- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php
-+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php
-@@ -6,6 +6,13 @@
-  */
- namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
- 
-+/**
-+ * Class UpsellGrid
-+ *
-+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
-+ * @deprecated Not used since upsell products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
-+ */
- class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid
- {
- }
-diff --git a/app/code/Magento/Bundle/Model/OptionRepository.php b/app/code/Magento/Bundle/Model/OptionRepository.php
-index 59e658b08df..0b96ea8d5b7 100644
---- a/app/code/Magento/Bundle/Model/OptionRepository.php
-+++ b/app/code/Magento/Bundle/Model/OptionRepository.php
-@@ -90,7 +90,7 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function get($sku, $optionId)
-     {
-@@ -106,23 +106,24 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
- 
-         $productLinks = $this->linkManagement->getChildren($product->getSku(), $optionId);
- 
--        /** @var \Magento\Bundle\Api\Data\OptionInterface $option */
-+        /** @var \Magento\Bundle\Api\Data\OptionInterface $optionDataObject */
-         $optionDataObject = $this->optionFactory->create();
-         $this->dataObjectHelper->populateWithArray(
-             $optionDataObject,
-             $option->getData(),
-             \Magento\Bundle\Api\Data\OptionInterface::class
-         );
--        $optionDataObject->setOptionId($option->getId())
--            ->setTitle($option->getTitle() === null ? $option->getDefaultTitle() : $option->getTitle())
--            ->setSku($product->getSku())
--            ->setProductLinks($productLinks);
-+
-+        $optionDataObject->setOptionId($option->getId());
-+        $optionDataObject->setTitle($option->getTitle() === null ? $option->getDefaultTitle() : $option->getTitle());
-+        $optionDataObject->setSku($product->getSku());
-+        $optionDataObject->setProductLinks($productLinks);
- 
-         return $optionDataObject;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getList($sku)
-     {
-@@ -131,6 +132,8 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
-     }
- 
-     /**
-+     * Return list of product options
-+     *
-      * @param ProductInterface $product
-      * @return \Magento\Bundle\Api\Data\OptionInterface[]
-      */
-@@ -140,7 +143,7 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function delete(\Magento\Bundle\Api\Data\OptionInterface $option)
-     {
-@@ -156,20 +159,19 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function deleteById($sku, $optionId)
-     {
--        $product = $this->getProduct($sku);
--        $optionCollection = $this->type->getOptionsCollection($product);
--        $optionCollection->setIdFilter($optionId);
--        $hasBeenDeleted = $this->delete($optionCollection->getFirstItem());
-+        /** @var \Magento\Bundle\Api\Data\OptionInterface $option */
-+        $option = $this->get($sku, $optionId);
-+        $hasBeenDeleted = $this->delete($option);
- 
-         return $hasBeenDeleted;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function save(
-         \Magento\Catalog\Api\Data\ProductInterface $product,
-@@ -189,6 +191,9 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
-      * @param \Magento\Catalog\Api\Data\ProductInterface $product
-      * @param \Magento\Bundle\Api\Data\OptionInterface $option
-      * @return $this
-+     * @throws InputException
-+     * @throws NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\CouldNotSaveException
-      */
-     protected function updateOptionSelection(
-         \Magento\Catalog\Api\Data\ProductInterface $product,
-@@ -228,9 +233,12 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
-     }
- 
-     /**
-+     * Retrieve product by SKU
-+     *
-      * @param string $sku
-      * @return \Magento\Catalog\Api\Data\ProductInterface
--     * @throws \Magento\Framework\Exception\InputException
-+     * @throws InputException
-+     * @throws NoSuchEntityException
-      */
-     private function getProduct($sku)
-     {
-diff --git a/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php b/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php
-new file mode 100644
-index 00000000000..499f0cd2ca9
---- /dev/null
-+++ b/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Bundle\Model\Plugin\Frontend;
-+
-+use Magento\Bundle\Model\Product\Type;
-+use Magento\Catalog\Model\Product as CatalogProduct;
-+
-+/**
-+ * Add child identities to product identities on storefront.
-+ */
-+class Product
-+{
-+    /**
-+     * @var Type
-+     */
-+    private $type;
-+
-+    /**
-+     * @param Type $type
-+     */
-+    public function __construct(Type $type)
-+    {
-+        $this->type = $type;
-+    }
-+
-+    /**
-+     * Add child identities to product identities
-+     *
-+     * @param CatalogProduct $product
-+     * @param array $identities
-+     * @return array
-+     */
-+    public function afterGetIdentities(CatalogProduct $product, array $identities): array
-+    {
-+        foreach ($this->type->getChildrenIds($product->getEntityId()) as $childIds) {
-+            foreach ($childIds as $childId) {
-+                $identities[] = CatalogProduct::CACHE_TAG . '_' . $childId;
-+            }
-+        }
-+
-+        return array_unique($identities);
-+    }
-+}
-diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
-index 00b6b2d7a3f..0e75ad2dc82 100644
---- a/app/code/Magento/Bundle/Model/Product/Price.php
-+++ b/app/code/Magento/Bundle/Model/Product/Price.php
-@@ -11,8 +11,11 @@ use Magento\Framework\App\ObjectManager;
- use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
- 
- /**
-+ * Bundle product type price model
-+ *
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @since 100.0.2
-  */
- class Price extends \Magento\Catalog\Model\Product\Type\Price
-@@ -180,9 +183,9 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-     /**
-      * Get product final price
-      *
--     * @param   float                     $qty
--     * @param   \Magento\Catalog\Model\Product $product
--     * @return  float
-+     * @param float $qty
-+     * @param \Magento\Catalog\Model\Product $product
-+     * @return float
-      */
-     public function getFinalPrice($qty, $product)
-     {
-@@ -207,9 +210,9 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-      * Returns final price of a child product
-      *
-      * @param \Magento\Catalog\Model\Product $product
--     * @param float                      $productQty
-+     * @param float $productQty
-      * @param \Magento\Catalog\Model\Product $childProduct
--     * @param float                      $childProductQty
-+     * @param float $childProductQty
-      * @return float
-      */
-     public function getChildFinalPrice($product, $productQty, $childProduct, $childProductQty)
-@@ -220,10 +223,10 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-     /**
-      * Retrieve Price considering tier price
-      *
--     * @param  \Magento\Catalog\Model\Product $product
--     * @param  string|null                $which
--     * @param  bool|null                  $includeTax
--     * @param  bool                       $takeTierPrice
-+     * @param \Magento\Catalog\Model\Product $product
-+     * @param string|null $which
-+     * @param bool|null $includeTax
-+     * @param bool $takeTierPrice
-      * @return float|array
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-@@ -255,67 +258,68 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-                 foreach ($options as $option) {
-                     /* @var $option \Magento\Bundle\Model\Option */
-                     $selections = $option->getSelections();
--                    if ($selections) {
--                        $selectionMinimalPrices = [];
--                        $selectionMaximalPrices = [];
--
--                        foreach ($option->getSelections() as $selection) {
--                            /* @var $selection \Magento\Bundle\Model\Selection */
--                            if (!$selection->isSalable()) {
--                                /**
--                                 * @todo CatalogInventory Show out of stock Products
--                                 */
--                                continue;
--                            }
--
--                            $qty = $selection->getSelectionQty();
--
--                            $item = $product->getPriceType() == self::PRICE_TYPE_FIXED ? $product : $selection;
--
--                            $selectionMinimalPrices[] = $this->_catalogData->getTaxPrice(
--                                $item,
--                                $this->getSelectionFinalTotalPrice(
--                                    $product,
--                                    $selection,
--                                    1,
--                                    $qty,
--                                    true,
--                                    $takeTierPrice
--                                ),
--                                $includeTax
--                            );
--                            $selectionMaximalPrices[] = $this->_catalogData->getTaxPrice(
--                                $item,
--                                $this->getSelectionFinalTotalPrice(
--                                    $product,
--                                    $selection,
--                                    1,
--                                    null,
--                                    true,
--                                    $takeTierPrice
--                                ),
--                                $includeTax
-+                    if (empty($selections)) {
-+                        continue;
-+                    }
-+                    $selectionMinimalPrices = [];
-+                    $selectionMaximalPrices = [];
-+
-+                    foreach ($option->getSelections() as $selection) {
-+                        /* @var $selection \Magento\Bundle\Model\Selection */
-+                        if (!$selection->isSalable()) {
-+                            /**
-+                             * @todo CatalogInventory Show out of stock Products
-+                             */
-+                            continue;
-+                        }
-+
-+                        $qty = $selection->getSelectionQty();
-+
-+                        $item = $product->getPriceType() == self::PRICE_TYPE_FIXED ? $product : $selection;
-+
-+                        $selectionMinimalPrices[] = $this->_catalogData->getTaxPrice(
-+                            $item,
-+                            $this->getSelectionFinalTotalPrice(
-+                                $product,
-+                                $selection,
-+                                1,
-+                                $qty,
-+                                true,
-+                                $takeTierPrice
-+                            ),
-+                            $includeTax
-+                        );
-+                        $selectionMaximalPrices[] = $this->_catalogData->getTaxPrice(
-+                            $item,
-+                            $this->getSelectionFinalTotalPrice(
-+                                $product,
-+                                $selection,
-+                                1,
-+                                null,
-+                                true,
-+                                $takeTierPrice
-+                            ),
-+                            $includeTax
-+                        );
-+                    }
-+
-+                    if (count($selectionMinimalPrices)) {
-+                        $selMinPrice = min($selectionMinimalPrices);
-+                        if ($option->getRequired()) {
-+                            $minimalPrice += $selMinPrice;
-+                            $minPriceFounded = true;
-+                        } elseif (true !== $minPriceFounded) {
-+                            $selMinPrice += $minimalPrice;
-+                            $minPriceFounded = false === $minPriceFounded ? $selMinPrice : min(
-+                                $minPriceFounded,
-+                                $selMinPrice
-                             );
-                         }
- 
--                        if (count($selectionMinimalPrices)) {
--                            $selMinPrice = min($selectionMinimalPrices);
--                            if ($option->getRequired()) {
--                                $minimalPrice += $selMinPrice;
--                                $minPriceFounded = true;
--                            } elseif (true !== $minPriceFounded) {
--                                $selMinPrice += $minimalPrice;
--                                $minPriceFounded = false === $minPriceFounded ? $selMinPrice : min(
--                                    $minPriceFounded,
--                                    $selMinPrice
--                                );
--                            }
--
--                            if ($option->isMultiSelection()) {
--                                $maximalPrice += array_sum($selectionMaximalPrices);
--                            } else {
--                                $maximalPrice += max($selectionMaximalPrices);
--                            }
-+                        if ($option->isMultiSelection()) {
-+                            $maximalPrice += array_sum($selectionMaximalPrices);
-+                        } else {
-+                            $maximalPrice += max($selectionMaximalPrices);
-                         }
-                     }
-                 }
-@@ -338,23 +342,25 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
- 
-                             $prices[] = $valuePrice;
-                         }
--                        if (count($prices)) {
--                            if ($customOption->getIsRequire()) {
--                                $minimalPrice += $this->_catalogData->getTaxPrice($product, min($prices), $includeTax);
--                            }
--
--                            $multiTypes = [
--                                \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX,
--                                \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE,
--                            ];
--
--                            if (in_array($customOption->getType(), $multiTypes)) {
--                                $maximalValue = array_sum($prices);
--                            } else {
--                                $maximalValue = max($prices);
--                            }
--                            $maximalPrice += $this->_catalogData->getTaxPrice($product, $maximalValue, $includeTax);
-+                        if (empty($prices)) {
-+                            continue;
-+                        }
-+
-+                        if ($customOption->getIsRequire()) {
-+                            $minimalPrice += $this->_catalogData->getTaxPrice($product, min($prices), $includeTax);
-+                        }
-+
-+                        $multiTypes = [
-+                            \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX,
-+                            \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE,
-+                        ];
-+
-+                        if (in_array($customOption->getType(), $multiTypes)) {
-+                            $maximalValue = array_sum($prices);
-+                        } else {
-+                            $maximalValue = max($prices);
-                         }
-+                        $maximalPrice += $this->_catalogData->getTaxPrice($product, $maximalValue, $includeTax);
-                     } else {
-                         $valuePrice = $customOption->getPrice(true);
- 
-@@ -402,8 +408,8 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-      *
-      * @param \Magento\Catalog\Model\Product $bundleProduct
-      * @param \Magento\Catalog\Model\Product $selectionProduct
--     * @param float|null                 $selectionQty
--     * @param null|bool                  $multiplyQty      Whether to multiply selection's price by its quantity
-+     * @param float|null $selectionQty
-+     * @param null|bool $multiplyQty Whether to multiply selection's price by its quantity
-      * @return float
-      *
-      * @see \Magento\Bundle\Model\Product\Price::getSelectionFinalTotalPrice()
-@@ -418,7 +424,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-      *
-      * @param \Magento\Catalog\Model\Product $bundleProduct
-      * @param \Magento\Catalog\Model\Product $selectionProduct
--     * @param float                    $qty
-+     * @param float $qty
-      * @return float
-      */
-     public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qty = null)
-@@ -427,15 +433,14 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-     }
- 
-     /**
--     * Calculate final price of selection
--     * with take into account tier price
-+     * Calculate final price of selection with take into account tier price
-      *
--     * @param  \Magento\Catalog\Model\Product $bundleProduct
--     * @param  \Magento\Catalog\Model\Product $selectionProduct
--     * @param  float                    $bundleQty
--     * @param  float                    $selectionQty
--     * @param  bool                       $multiplyQty
--     * @param  bool                       $takeTierPrice
-+     * @param \Magento\Catalog\Model\Product $bundleProduct
-+     * @param \Magento\Catalog\Model\Product $selectionProduct
-+     * @param float $bundleQty
-+     * @param float $selectionQty
-+     * @param bool $multiplyQty
-+     * @param bool $takeTierPrice
-      * @return float
-      */
-     public function getSelectionFinalTotalPrice(
-@@ -454,7 +459,11 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-         }
- 
-         if ($bundleProduct->getPriceType() == self::PRICE_TYPE_DYNAMIC) {
--            $price = $selectionProduct->getFinalPrice($takeTierPrice ? $selectionQty : 1);
-+            $totalQty = $bundleQty * $selectionQty;
-+            if (!$takeTierPrice || $totalQty === 0) {
-+                $totalQty = 1;
-+            }
-+            $price = $selectionProduct->getFinalPrice($totalQty);
-         } else {
-             if ($selectionProduct->getSelectionPriceType()) {
-                 // percent
-@@ -485,10 +494,10 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-     /**
-      * Apply tier price for bundle
-      *
--     * @param   \Magento\Catalog\Model\Product $product
--     * @param   float                    $qty
--     * @param   float                    $finalPrice
--     * @return  float
-+     * @param \Magento\Catalog\Model\Product $product
-+     * @param float $qty
-+     * @param float $finalPrice
-+     * @return float
-      */
-     protected function _applyTierPrice($product, $qty, $finalPrice)
-     {
-@@ -509,9 +518,9 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-     /**
-      * Get product tier price by qty
-      *
--     * @param   float                    $qty
--     * @param   \Magento\Catalog\Model\Product $product
--     * @return  float|array
-+     * @param float $qty
-+     * @param \Magento\Catalog\Model\Product $product
-+     * @return float|array
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-@@ -605,11 +614,11 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-     /**
-      * Calculate and apply special price
-      *
--     * @param float  $finalPrice
--     * @param float  $specialPrice
-+     * @param float $finalPrice
-+     * @param float $specialPrice
-      * @param string $specialPriceFrom
-      * @param string $specialPriceTo
--     * @param mixed  $store
-+     * @param mixed $store
-      * @return float
-      */
-     public function calculateSpecialPrice(
-@@ -634,7 +643,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-      *
-      * @param /Magento/Catalog/Model/Product $bundleProduct
-      * @param float|string $price
--     * @param int          $bundleQty
-+     * @param int $bundleQty
-      * @return float
-      */
-     public function getLowestPrice($bundleProduct, $price, $bundleQty = 1)
-diff --git a/app/code/Magento/Bundle/Model/Product/SaveHandler.php b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
-index fc215aa6b8e..99e8188146b 100644
---- a/app/code/Magento/Bundle/Model/Product/SaveHandler.php
-+++ b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
-@@ -58,6 +58,8 @@ class SaveHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Perform action on Bundle product relation/extension attribute
-+     *
-      * @param object $entity
-      * @param array $arguments
-      *
-@@ -83,7 +85,7 @@ class SaveHandler implements ExtensionInterface
-             : [];
- 
-         if (!$entity->getCopyFromView()) {
--            $this->processRemovedOptions($entity->getSku(), $existingOptionsIds, $optionIds);
-+            $this->processRemovedOptions($entity, $existingOptionsIds, $optionIds);
-             $newOptionsIds = array_diff($optionIds, $existingOptionsIds);
-             $this->saveOptions($entity, $bundleProductOptions, $newOptionsIds);
-         } else {
-@@ -96,6 +98,8 @@ class SaveHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Remove option product links
-+     *
-      * @param string $entitySku
-      * @param \Magento\Bundle\Api\Data\OptionInterface $option
-      * @return void
-@@ -154,16 +158,19 @@ class SaveHandler implements ExtensionInterface
-     /**
-      * Removes old options that no longer exists.
-      *
--     * @param string $entitySku
-+     * @param ProductInterface $entity
-      * @param array $existingOptionsIds
-      * @param array $optionIds
-      * @return void
-      */
--    private function processRemovedOptions(string $entitySku, array $existingOptionsIds, array $optionIds): void
-+    private function processRemovedOptions(ProductInterface $entity, array $existingOptionsIds, array $optionIds): void
-     {
-+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
-+        $parentId = $entity->getData($metadata->getLinkField());
-         foreach (array_diff($existingOptionsIds, $optionIds) as $optionId) {
--            $option = $this->optionRepository->get($entitySku, $optionId);
--            $this->removeOptionLinks($entitySku, $option);
-+            $option = $this->optionRepository->get($entity->getSku(), $optionId);
-+            $option->setParentId($parentId);
-+            $this->removeOptionLinks($entity->getSku(), $option);
-             $this->optionRepository->delete($option);
-         }
-     }
-diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
-index 17ecba545ef..2dc519dbf15 100644
---- a/app/code/Magento/Bundle/Model/Product/Type.php
-+++ b/app/code/Magento/Bundle/Model/Product/Type.php
-@@ -6,13 +6,14 @@
- 
- namespace Magento\Bundle\Model\Product;
- 
--use Magento\Framework\App\ObjectManager;
-+use Magento\Bundle\Model\ResourceModel\Selection\Collection as Selections;
-+use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
- use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\Pricing\PriceCurrencyInterface;
- use Magento\Framework\Serialize\Serializer\Json;
--use Magento\Framework\EntityManager\MetadataPool;
--use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
--use Magento\Bundle\Model\ResourceModel\Selection\Collection as Selections;
-+use Magento\Framework\Stdlib\ArrayUtils;
- 
- /**
-  * Bundle Type Model
-@@ -160,6 +161,11 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-      */
-     private $selectionCollectionFilterApplier;
- 
-+    /**
-+     * @var ArrayUtils
-+     */
-+    private $arrayUtility;
-+
-     /**
-      * @param \Magento\Catalog\Model\Product\Option $catalogProductOption
-      * @param \Magento\Eav\Model\Config $eavConfig
-@@ -185,6 +191,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
-      * @param MetadataPool|null $metadataPool
-      * @param SelectionCollectionFilterApplier|null $selectionCollectionFilterApplier
-+     * @param ArrayUtils|null $arrayUtility
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -212,7 +219,8 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-         \Magento\CatalogInventory\Api\StockStateInterface $stockState,
-         Json $serializer = null,
-         MetadataPool $metadataPool = null,
--        SelectionCollectionFilterApplier $selectionCollectionFilterApplier = null
-+        SelectionCollectionFilterApplier $selectionCollectionFilterApplier = null,
-+        ArrayUtils $arrayUtility = null
-     ) {
-         $this->_catalogProduct = $catalogProduct;
-         $this->_catalogData = $catalogData;
-@@ -232,6 +240,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
- 
-         $this->selectionCollectionFilterApplier = $selectionCollectionFilterApplier
-             ?: ObjectManager::getInstance()->get(SelectionCollectionFilterApplier::class);
-+        $this->arrayUtility= $arrayUtility ?: ObjectManager::getInstance()->get(ArrayUtils::class);
- 
-         parent::__construct(
-             $catalogProductOption,
-@@ -308,8 +317,11 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-                 $selectionIds = $this->serializer->unserialize($customOption->getValue());
-                 if (!empty($selectionIds)) {
-                     $selections = $this->getSelectionsByIds($selectionIds, $product);
--                    foreach ($selections->getItems() as $selection) {
--                        $skuParts[] = $selection->getSku();
-+                    foreach ($selectionIds as $selectionId) {
-+                        $entity = $selections->getItemByColumnValue('selection_id', $selectionId);
-+                        if (isset($entity) && $entity->getEntityId()) {
-+                            $skuParts[] = $entity->getSku();
-+                        }
-                     }
-                 }
-             }
-@@ -537,7 +549,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-                 foreach ($options as $quoteItemOption) {
-                     if ($quoteItemOption->getCode() == 'selection_qty_' . $selection->getSelectionId()) {
-                         if ($optionUpdateFlag) {
--                            $quoteItemOption->setValue(intval($quoteItemOption->getValue()));
-+                            $quoteItemOption->setValue((int) $quoteItemOption->getValue());
-                         } else {
-                             $quoteItemOption->setValue($value);
-                         }
-@@ -559,7 +571,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-      */
-     public function prepareQuoteItemQty($qty, $product)
-     {
--        return intval($qty);
-+        return (int) $qty;
-     }
- 
-     /**
-@@ -625,6 +637,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
- 
-     /**
-      * Prepare product and its configuration to be added to some products list.
-+     *
-      * Perform standard preparation process and then prepare of bundle selections options.
-      *
-      * @param \Magento\Framework\DataObject $buyRequest
-@@ -669,7 +682,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-                     $options
-                 );
- 
--                $selectionIds = $this->multiToFlatArray($options);
-+                $selectionIds = array_values($this->arrayUtility->flatten($options));
-                 // If product has not been configured yet then $selections array should be empty
-                 if (!empty($selectionIds)) {
-                     $selections = $this->getSelectionsByIds($selectionIds, $product);
-@@ -733,9 +746,9 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-                      * for selection (not for all bundle)
-                      */
-                     $price = $product->getPriceModel()
--                        ->getSelectionFinalTotalPrice($product, $selection, 0, $qty);
-+                        ->getSelectionFinalTotalPrice($product, $selection, 0, 1);
-                     $attributes = [
--                        'price' => $this->priceCurrency->convert($price),
-+                        'price' => $price,
-                         'qty' => $qty,
-                         'option_label' => $selection->getOption()
-                             ->getTitle(),
-@@ -790,6 +803,8 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-     }
- 
-     /**
-+     * Cast array values to int
-+     *
-      * @param array $array
-      * @return int[]|int[][]
-      */
-@@ -808,24 +823,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-         return $array;
-     }
- 
--    /**
--     * @param array $array
--     * @return int[]
--     */
--    private function multiToFlatArray(array $array)
--    {
--        $flatArray = [];
--        foreach ($array as $key => $value) {
--            if (is_array($value)) {
--                $flatArray = array_merge($flatArray, $this->multiToFlatArray($value));
--            } else {
--                $flatArray[$key] = $value;
--            }
--        }
--
--        return $flatArray;
--    }
--
-     /**
-      * Retrieve message for specify option(s)
-      *
-@@ -920,8 +917,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-     }
- 
-     /**
--     * Prepare additional options/information for order item which will be
--     * created from this product
-+     * Prepare additional options/information for order item which will be created from this product
-      *
-      * @param \Magento\Catalog\Model\Product $product
-      * @return array
-@@ -987,6 +983,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
- 
-     /**
-      * Sort selections method for usort function
-+     *
-      * Sort selections by option position, selection position and selection id
-      *
-      * @param  \Magento\Catalog\Model\Product $firstItem
-@@ -1009,10 +1006,8 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-             $secondItem->getPosition(),
-             $secondItem->getSelectionId(),
-         ];
--        if ($aPosition == $bPosition) {
--            return 0;
--        }
--        return $aPosition < $bPosition ? -1 : 1;
-+
-+        return $aPosition <=> $bPosition;
-     }
- 
-     /**
-@@ -1050,6 +1045,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
- 
-     /**
-      * Retrieve additional searchable data from type instance
-+     *
-      * Using based on product id and store_id data
-      *
-      * @param \Magento\Catalog\Model\Product $product
-@@ -1118,6 +1114,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
- 
-     /**
-      * Retrieve products divided into groups required to purchase
-+     *
-      * At least one product in each group has to be purchased
-      *
-      * @param  \Magento\Catalog\Model\Product $product
-@@ -1214,6 +1211,8 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-     }
- 
-     /**
-+     * Returns selection qty
-+     *
-      * @param \Magento\Framework\DataObject $selection
-      * @param int[] $qtys
-      * @param int $selectionOptionId
-@@ -1232,6 +1231,8 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-     }
- 
-     /**
-+     * Returns qty
-+     *
-      * @param \Magento\Catalog\Model\Product $product
-      * @param \Magento\Framework\DataObject $selection
-      * @return float|int
-@@ -1249,6 +1250,8 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-     }
- 
-     /**
-+     * Validate required options
-+     *
-      * @param \Magento\Catalog\Model\Product $product
-      * @param bool $isStrictProcessMode
-      * @param \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection
-@@ -1270,6 +1273,8 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-     }
- 
-     /**
-+     * Check if selection is salable
-+     *
-      * @param \Magento\Bundle\Model\ResourceModel\Selection\Collection $selections
-      * @param bool $skipSaleableCheck
-      * @param \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection
-@@ -1300,6 +1305,8 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-     }
- 
-     /**
-+     * Validate result
-+     *
-      * @param array $_result
-      * @return void
-      * @throws \Magento\Framework\Exception\LocalizedException
-@@ -1318,6 +1325,8 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
-     }
- 
-     /**
-+     * Merge selections with options
-+     *
-      * @param \Magento\Catalog\Model\Product\Option[] $options
-      * @param \Magento\Framework\DataObject[] $selections
-      * @return \Magento\Framework\DataObject[]
-diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
-index 0b6e97cfb92..b71853cde41 100644
---- a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
-+++ b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
-@@ -6,20 +6,173 @@
- namespace Magento\Bundle\Model\ResourceModel\Indexer;
- 
- use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier;
-+use Magento\Framework\Indexer\DimensionalIndexerInterface;
-+use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query\JoinAttributeProcessor;
-+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
-+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
- 
- /**
-  * Bundle products Price indexer resource model
-  *
-- * @author      Magento Core Team <core@magentocommerce.com>
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
-+class Price implements DimensionalIndexerInterface
- {
-+    /**
-+     * @var IndexTableStructureFactory
-+     */
-+    private $indexTableStructureFactory;
-+
-+    /**
-+     * @var TableMaintainer
-+     */
-+    private $tableMaintainer;
-+
-+    /**
-+     * @var MetadataPool
-+     */
-+    private $metadataPool;
-+
-+    /**
-+     * @var \Magento\Framework\App\ResourceConnection
-+     */
-+    private $resource;
-+
-+    /**
-+     * @var bool
-+     */
-+    private $fullReindexAction;
-+
-+    /**
-+     * @var string
-+     */
-+    private $connectionName;
-+
-+    /**
-+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
-+     */
-+    private $connection;
-+
-+    /**
-+     * Mapping between dimensions and field in database
-+     *
-+     * @var array
-+     */
-+    private $dimensionToFieldMapper = [
-+        WebsiteDimensionProvider::DIMENSION_NAME => 'pw.website_id',
-+        CustomerGroupDimensionProvider::DIMENSION_NAME => 'cg.customer_group_id',
-+    ];
-+
-+    /**
-+     * @var BasePriceModifier
-+     */
-+    private $basePriceModifier;
-+
-+    /**
-+     * @var JoinAttributeProcessor
-+     */
-+    private $joinAttributeProcessor;
-+
-+    /**
-+     * @var \Magento\Framework\Event\ManagerInterface
-+     */
-+    private $eventManager;
-+
-+    /**
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-+     */
-+    private $moduleManager;
-+
-+    /**
-+     * @param IndexTableStructureFactory $indexTableStructureFactory
-+     * @param TableMaintainer $tableMaintainer
-+     * @param MetadataPool $metadataPool
-+     * @param \Magento\Framework\App\ResourceConnection $resource
-+     * @param BasePriceModifier $basePriceModifier
-+     * @param JoinAttributeProcessor $joinAttributeProcessor
-+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-+     * @param bool $fullReindexAction
-+     * @param string $connectionName
-+     *
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     */
-+    public function __construct(
-+        IndexTableStructureFactory $indexTableStructureFactory,
-+        TableMaintainer $tableMaintainer,
-+        MetadataPool $metadataPool,
-+        \Magento\Framework\App\ResourceConnection $resource,
-+        BasePriceModifier $basePriceModifier,
-+        JoinAttributeProcessor $joinAttributeProcessor,
-+        \Magento\Framework\Event\ManagerInterface $eventManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-+        $fullReindexAction = false,
-+        $connectionName = 'indexer'
-+    ) {
-+        $this->indexTableStructureFactory = $indexTableStructureFactory;
-+        $this->tableMaintainer = $tableMaintainer;
-+        $this->connectionName = $connectionName;
-+        $this->metadataPool = $metadataPool;
-+        $this->resource = $resource;
-+        $this->fullReindexAction = $fullReindexAction;
-+        $this->basePriceModifier = $basePriceModifier;
-+        $this->joinAttributeProcessor = $joinAttributeProcessor;
-+        $this->eventManager = $eventManager;
-+        $this->moduleManager = $moduleManager;
-+    }
-+
-     /**
-      * @inheritdoc
-+     * @param array $dimensions
-+     * @param \Traversable $entityIds
-+     * @throws \Exception
-      */
--    protected function reindex($entityIds = null)
-+    public function executeByDimensions(array $dimensions, \Traversable $entityIds)
-     {
--        $this->_prepareBundlePrice($entityIds);
-+        $this->tableMaintainer->createMainTmpTable($dimensions);
-+
-+        $temporaryPriceTable = $this->indexTableStructureFactory->create(
-+            [
-+            'tableName' => $this->tableMaintainer->getMainTmpTable($dimensions),
-+            'entityField' => 'entity_id',
-+            'customerGroupField' => 'customer_group_id',
-+            'websiteField' => 'website_id',
-+            'taxClassField' => 'tax_class_id',
-+            'originalPriceField' => 'price',
-+            'finalPriceField' => 'final_price',
-+            'minPriceField' => 'min_price',
-+            'maxPriceField' => 'max_price',
-+            'tierPriceField' => 'tier_price',
-+            ]
-+        );
-+
-+        $entityIds = iterator_to_array($entityIds);
-+
-+        $this->prepareTierPriceIndex($dimensions, $entityIds);
-+
-+        $this->prepareBundlePriceTable();
-+
-+        $this->prepareBundlePriceByType(
-+            \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED,
-+            $dimensions,
-+            $entityIds
-+        );
-+
-+        $this->prepareBundlePriceByType(
-+            \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC,
-+            $dimensions,
-+            $entityIds
-+        );
-+
-+        $this->calculateBundleOptionPrice($temporaryPriceTable, $dimensions);
-+
-+        $this->basePriceModifier->modifyPrice($temporaryPriceTable, $entityIds);
-     }
- 
-     /**
-@@ -27,9 +180,9 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-      *
-      * @return string
-      */
--    protected function _getBundlePriceTable()
-+    private function getBundlePriceTable()
-     {
--        return $this->tableStrategy->getTableName('catalog_product_index_price_bundle');
-+        return $this->getTable('catalog_product_index_price_bundle_tmp');
-     }
- 
-     /**
-@@ -37,9 +190,9 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-      *
-      * @return string
-      */
--    protected function _getBundleSelectionTable()
-+    private function getBundleSelectionTable()
-     {
--        return $this->tableStrategy->getTableName('catalog_product_index_price_bundle_sel');
-+        return $this->getTable('catalog_product_index_price_bundle_sel_tmp');
-     }
- 
-     /**
-@@ -47,9 +200,9 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-      *
-      * @return string
-      */
--    protected function _getBundleOptionTable()
-+    private function getBundleOptionTable()
-     {
--        return $this->tableStrategy->getTableName('catalog_product_index_price_bundle_opt');
-+        return $this->getTable('catalog_product_index_price_bundle_opt_tmp');
-     }
- 
-     /**
-@@ -57,9 +210,9 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-      *
-      * @return $this
-      */
--    protected function _prepareBundlePriceTable()
-+    private function prepareBundlePriceTable()
-     {
--        $this->getConnection()->delete($this->_getBundlePriceTable());
-+        $this->getConnection()->delete($this->getBundlePriceTable());
-         return $this;
-     }
- 
-@@ -68,9 +221,9 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-      *
-      * @return $this
-      */
--    protected function _prepareBundleSelectionTable()
-+    private function prepareBundleSelectionTable()
-     {
--        $this->getConnection()->delete($this->_getBundleSelectionTable());
-+        $this->getConnection()->delete($this->getBundleSelectionTable());
-         return $this;
-     }
- 
-@@ -79,9 +232,9 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-      *
-      * @return $this
-      */
--    protected function _prepareBundleOptionTable()
-+    private function prepareBundleOptionTable()
-     {
--        $this->getConnection()->delete($this->_getBundleOptionTable());
-+        $this->getConnection()->delete($this->getBundleOptionTable());
-         return $this;
-     }
- 
-@@ -89,51 +242,58 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-      * Prepare temporary price index data for bundle products by price type
-      *
-      * @param int $priceType
-+     * @param array $dimensions
-      * @param int|array $entityIds the entity ids limitation
--     * @return $this
-+     * @return void
-+     * @throws \Exception
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
--    protected function _prepareBundlePriceByType($priceType, $entityIds = null)
-+    private function prepareBundlePriceByType($priceType, array $dimensions, $entityIds = null)
-     {
-         $connection = $this->getConnection();
--        $table = $this->_getBundlePriceTable();
--
-         $select = $connection->select()->from(
-             ['e' => $this->getTable('catalog_product_entity')],
-             ['entity_id']
--        )->join(
-+        )->joinInner(
-             ['cg' => $this->getTable('customer_group')],
--            '',
-+            array_key_exists(CustomerGroupDimensionProvider::DIMENSION_NAME, $dimensions)
-+                ? sprintf(
-+                    '%s = %s',
-+                    $this->dimensionToFieldMapper[CustomerGroupDimensionProvider::DIMENSION_NAME],
-+                    $dimensions[CustomerGroupDimensionProvider::DIMENSION_NAME]->getValue()
-+                ) : '',
-             ['customer_group_id']
--        );
--        $this->_addWebsiteJoinToSelect($select, true);
--        $this->_addProductWebsiteJoinToSelect($select, 'cw.website_id', "e.entity_id");
--        $select->columns(
--            'website_id',
--            'cw'
--        )->join(
--            ['cwd' => $this->_getWebsiteDateTable()],
--            'cw.website_id = cwd.website_id',
-+        )->joinInner(
-+            ['pw' => $this->getTable('catalog_product_website')],
-+            'pw.product_id = e.entity_id',
-+            ['pw.website_id']
-+        )->joinInner(
-+            ['cwd' => $this->getTable('catalog_product_index_website')],
-+            'pw.website_id = cwd.website_id',
-             []
--        )->joinLeft(
--            ['tp' => $this->_getTierPriceIndexTable()],
--            'tp.entity_id = e.entity_id AND tp.website_id = cw.website_id' .
-+        );
-+        $select->joinLeft(
-+            ['tp' => $this->getTable('catalog_product_index_tier_price')],
-+            'tp.entity_id = e.entity_id AND tp.website_id = pw.website_id' .
-             ' AND tp.customer_group_id = cg.customer_group_id',
-             []
-         )->where(
-             'e.type_id=?',
--            $this->getTypeId()
-+            \Magento\Bundle\Ui\DataProvider\Product\Listing\Collector\BundlePrice::PRODUCT_TYPE
-         );
- 
--        // add enable products limitation
--        $statusCond = $connection->quoteInto(
--            '=?',
--            \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
--        );
--        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
--        $this->_addAttributeToSelect($select, 'status', "e.$linkField", 'cs.store_id', $statusCond, true);
-+        foreach ($dimensions as $dimension) {
-+            if (!isset($this->dimensionToFieldMapper[$dimension->getName()])) {
-+                throw new \LogicException(
-+                    'Provided dimension is not valid for Price indexer: ' . $dimension->getName()
-+                );
-+            }
-+            $select->where($this->dimensionToFieldMapper[$dimension->getName()] . ' = ?', $dimension->getValue());
-+        }
-+
-+        $this->joinAttributeProcessor->process($select, 'status', Status::STATUS_ENABLED);
-         if ($this->moduleManager->isEnabled('Magento_Tax')) {
--            $taxClassId = $this->_addAttributeToSelect($select, 'tax_class_id', "e.$linkField", 'cs.store_id');
-+            $taxClassId = $this->joinAttributeProcessor->process($select, 'tax_class_id');
-         } else {
-             $taxClassId = new \Zend_Db_Expr('0');
-         }
-@@ -146,13 +306,12 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-             );
-         }
- 
--        $priceTypeCond = $connection->quoteInto('=?', $priceType);
--        $this->_addAttributeToSelect($select, 'price_type', "e.$linkField", 'cs.store_id', $priceTypeCond);
-+        $this->joinAttributeProcessor->process($select, 'price_type', $priceType);
- 
--        $price = $this->_addAttributeToSelect($select, 'price', "e.$linkField", 'cs.store_id');
--        $specialPrice = $this->_addAttributeToSelect($select, 'special_price', "e.$linkField", 'cs.store_id');
--        $specialFrom = $this->_addAttributeToSelect($select, 'special_from_date', "e.$linkField", 'cs.store_id');
--        $specialTo = $this->_addAttributeToSelect($select, 'special_to_date', "e.$linkField", 'cs.store_id');
-+        $price = $this->joinAttributeProcessor->process($select, 'price');
-+        $specialPrice = $this->joinAttributeProcessor->process($select, 'special_price');
-+        $specialFrom = $this->joinAttributeProcessor->process($select, 'special_from_date');
-+        $specialTo = $this->joinAttributeProcessor->process($select, 'special_to_date');
-         $currentDate = new \Zend_Db_Expr('cwd.website_date');
- 
-         $specialFromDate = $connection->getDatePartSql($specialFrom);
-@@ -174,11 +333,13 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-                 'ROUND((1 - ' . $tierExpr . ' / 100) * ' . $price . ', 4)',
-                 'NULL'
-             );
--            $finalPrice = $connection->getLeastSql([
-+            $finalPrice = $connection->getLeastSql(
-+                [
-                 $price,
-                 $connection->getIfNullSql($specialPriceExpr, $price),
-                 $connection->getIfNullSql($tierPrice, $price),
--            ]);
-+                ]
-+            );
-         } else {
-             $finalPrice = new \Zend_Db_Expr('0');
-             $tierPrice = $connection->getCheckSql($tierExpr . ' IS NOT NULL', '0', 'NULL');
-@@ -205,39 +366,41 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-         /**
-          * Add additional external limitation
-          */
--        $this->_eventManager->dispatch(
-+        $this->eventManager->dispatch(
-             'catalog_product_prepare_index_select',
-             [
-                 'select' => $select,
-                 'entity_field' => new \Zend_Db_Expr('e.entity_id'),
--                'website_field' => new \Zend_Db_Expr('cw.website_id'),
--                'store_field' => new \Zend_Db_Expr('cs.store_id')
-+                'website_field' => new \Zend_Db_Expr('pw.website_id'),
-+                'store_field' => new \Zend_Db_Expr('cwd.default_store_id')
-             ]
-         );
- 
--        $query = $select->insertFromSelect($table);
-+        $query = $select->insertFromSelect($this->getBundlePriceTable());
-         $connection->query($query);
--
--        return $this;
-     }
- 
-     /**
-      * Calculate fixed bundle product selections price
-      *
--     * @return $this
-+     * @param IndexTableStructure $priceTable
-+     * @param array $dimensions
-+     *
-+     * @return void
-+     * @throws \Exception
-      */
--    protected function _calculateBundleOptionPrice()
-+    private function calculateBundleOptionPrice($priceTable, $dimensions)
-     {
-         $connection = $this->getConnection();
- 
--        $this->_prepareBundleSelectionTable();
--        $this->_calculateBundleSelectionPrice(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED);
--        $this->_calculateBundleSelectionPrice(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC);
-+        $this->prepareBundleSelectionTable();
-+        $this->calculateBundleSelectionPrice($dimensions, \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED);
-+        $this->calculateBundleSelectionPrice($dimensions, \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC);
- 
--        $this->_prepareBundleOptionTable();
-+        $this->prepareBundleOptionTable();
- 
-         $select = $connection->select()->from(
--            $this->_getBundleSelectionTable(),
-+            $this->getBundleSelectionTable(),
-             ['entity_id', 'customer_group_id', 'website_id', 'option_id']
-         )->group(
-             ['entity_id', 'customer_group_id', 'website_id', 'option_id']
-@@ -254,24 +417,24 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-             ]
-         );
- 
--        $query = $select->insertFromSelect($this->_getBundleOptionTable());
-+        $query = $select->insertFromSelect($this->getBundleOptionTable());
-         $connection->query($query);
- 
--        $this->_prepareDefaultFinalPriceTable();
--        $this->applyBundlePrice();
--        $this->applyBundleOptionPrice();
--
--        return $this;
-+        $this->getConnection()->delete($priceTable->getTableName());
-+        $this->applyBundlePrice($priceTable);
-+        $this->applyBundleOptionPrice($priceTable);
-     }
- 
-     /**
-      * Calculate bundle product selections price by product type
-      *
-+     * @param array $dimensions
-      * @param int $priceType
--     * @return $this
-+     * @return void
-+     * @throws \Exception
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
--    protected function _calculateBundleSelectionPrice($priceType)
-+    private function calculateBundleSelectionPrice($dimensions, $priceType)
-     {
-         $connection = $this->getConnection();
- 
-@@ -312,10 +475,12 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-                 'NULL'
-             );
- 
--            $priceExpr = $connection->getLeastSql([
-+            $priceExpr = $connection->getLeastSql(
-+                [
-                 $priceExpr,
-                 $connection->getIfNullSql($tierExpr, $priceExpr),
--            ]);
-+                ]
-+            );
-         } else {
-             $price = 'idx.min_price * bs.selection_qty';
-             $specialExpr = $connection->getCheckSql(
-@@ -328,15 +493,18 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-                 'ROUND((1 - i.tier_percent / 100) * ' . $price . ', 4)',
-                 'NULL'
-             );
--            $priceExpr = $connection->getLeastSql([
-+            $priceExpr = $connection->getLeastSql(
-+                [
-                 $specialExpr,
-                 $connection->getIfNullSql($tierExpr, $price),
--            ]);
-+                ]
-+            );
-         }
- 
--        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
-+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
-+        $linkField = $metadata->getLinkField();
-         $select = $connection->select()->from(
--            ['i' => $this->_getBundlePriceTable()],
-+            ['i' => $this->getBundlePriceTable()],
-             ['entity_id', 'customer_group_id', 'website_id']
-         )->join(
-             ['parent_product' => $this->getTable('catalog_product_entity')],
-@@ -355,7 +523,7 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-             'bs.selection_id = bsp.selection_id AND bsp.website_id = i.website_id',
-             ['']
-         )->join(
--            ['idx' => $this->getIdxTable()],
-+            ['idx' => $this->getMainTable($dimensions)],
-             'bs.product_id = idx.entity_id AND i.customer_group_id = idx.customer_group_id' .
-             ' AND i.website_id = idx.website_id',
-             []
-@@ -375,49 +543,26 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-             ]
-         );
- 
--        $query = $select->insertFromSelect($this->_getBundleSelectionTable());
-+        $query = $select->insertFromSelect($this->getBundleSelectionTable());
-         $connection->query($query);
--
--        return $this;
--    }
--
--    /**
--     * Prepare temporary index price for bundle products
--     *
--     * @param int|array $entityIds  the entity ids limitation
--     * @return $this
--     */
--    protected function _prepareBundlePrice($entityIds = null)
--    {
--        if (!$this->hasEntity() && empty($entityIds)) {
--            return $this;
--        }
--        $this->_prepareTierPriceIndex($entityIds);
--        $this->_prepareBundlePriceTable();
--        $this->_prepareBundlePriceByType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED, $entityIds);
--        $this->_prepareBundlePriceByType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC, $entityIds);
--
--        $this->_calculateBundleOptionPrice();
--        $this->_applyCustomOption();
--
--        $this->_movePriceDataToIndexTable();
--
--        return $this;
-     }
- 
-     /**
-      * Prepare percentage tier price for bundle products
-      *
--     * @param int|array $entityIds
--     * @return $this
-+     * @param array $dimensions
-+     * @param array $entityIds
-+     * @return void
-+     * @throws \Exception
-      */
--    protected function _prepareTierPriceIndex($entityIds = null)
-+    private function prepareTierPriceIndex($dimensions, $entityIds)
-     {
-         $connection = $this->getConnection();
--        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
-+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
-+        $linkField = $metadata->getLinkField();
-         // remove index by bundle products
-         $select = $connection->select()->from(
--            ['i' => $this->_getTierPriceIndexTable()],
-+            ['i' => $this->getTable('catalog_product_index_tier_price')],
-             null
-         )->join(
-             ['e' => $this->getTable('catalog_product_entity')],
-@@ -425,7 +570,7 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-             []
-         )->where(
-             'e.type_id=?',
--            $this->getTypeId()
-+            \Magento\Bundle\Ui\DataProvider\Product\Listing\Collector\BundlePrice::PRODUCT_TYPE
-         );
-         $query = $select->deleteFromSelect('i');
-         $connection->query($query);
-@@ -442,40 +587,47 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-             'tp.all_groups = 1 OR (tp.all_groups = 0 AND tp.customer_group_id = cg.customer_group_id)',
-             ['customer_group_id']
-         )->join(
--            ['cw' => $this->getTable('store_website')],
--            'tp.website_id = 0 OR tp.website_id = cw.website_id',
-+            ['pw' => $this->getTable('store_website')],
-+            'tp.website_id = 0 OR tp.website_id = pw.website_id',
-             ['website_id']
-         )->where(
--            'cw.website_id != 0'
-+            'pw.website_id != 0'
-         )->where(
-             'e.type_id=?',
--            $this->getTypeId()
-+            \Magento\Bundle\Ui\DataProvider\Product\Listing\Collector\BundlePrice::PRODUCT_TYPE
-         )->columns(
-             new \Zend_Db_Expr('MIN(tp.value)')
-         )->group(
--            ['e.entity_id', 'cg.customer_group_id', 'cw.website_id']
-+            ['e.entity_id', 'cg.customer_group_id', 'pw.website_id']
-         );
- 
-         if (!empty($entityIds)) {
-             $select->where('e.entity_id IN(?)', $entityIds);
-         }
-+        foreach ($dimensions as $dimension) {
-+            if (!isset($this->dimensionToFieldMapper[$dimension->getName()])) {
-+                throw new \LogicException(
-+                    'Provided dimension is not valid for Price indexer: ' . $dimension->getName()
-+                );
-+            }
-+            $select->where($this->dimensionToFieldMapper[$dimension->getName()] . ' = ?', $dimension->getValue());
-+        }
- 
--        $query = $select->insertFromSelect($this->_getTierPriceIndexTable());
-+        $query = $select->insertFromSelect($this->getTable('catalog_product_index_tier_price'));
-         $connection->query($query);
--
--        return $this;
-     }
- 
-     /**
-      * Create bundle price.
-      *
--     * @return  void
-+     * @param IndexTableStructure $priceTable
-+     * @return void
-      */
--    private function applyBundlePrice(): void
-+    private function applyBundlePrice($priceTable): void
-     {
-         $select = $this->getConnection()->select();
-         $select->from(
--            $this->_getBundlePriceTable(),
-+            $this->getBundlePriceTable(),
-             [
-                 'entity_id',
-                 'customer_group_id',
-@@ -486,11 +638,10 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-                 'min_price',
-                 'max_price',
-                 'tier_price',
--                'base_tier',
-             ]
-         );
- 
--        $query = $select->insertFromSelect($this->_getDefaultFinalPriceTable());
-+        $query = $select->insertFromSelect($priceTable->getTableName());
-         $this->getConnection()->query($query);
-     }
- 
-@@ -498,13 +649,14 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-      * Make insert/update bundle option price.
-      *
-      * @return void
-+     * @param IndexTableStructure $priceTable
-      */
--    private function applyBundleOptionPrice(): void
-+    private function applyBundleOptionPrice($priceTable): void
-     {
-         $connection = $this->getConnection();
- 
-         $subSelect = $connection->select()->from(
--            $this->_getBundleOptionTable(),
-+            $this->getBundleOptionTable(),
-             [
-                 'entity_id',
-                 'customer_group_id',
-@@ -534,7 +686,47 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-             ]
-         );
- 
--        $query = $select->crossUpdateFromSelect(['i' => $this->_getDefaultFinalPriceTable()]);
-+        $query = $select->crossUpdateFromSelect(['i' => $priceTable->getTableName()]);
-         $connection->query($query);
-     }
-+
-+    /**
-+     * Get main table
-+     *
-+     * @param array $dimensions
-+     * @return string
-+     */
-+    private function getMainTable($dimensions)
-+    {
-+        if ($this->fullReindexAction) {
-+            return $this->tableMaintainer->getMainReplicaTable($dimensions);
-+        }
-+        return $this->tableMaintainer->getMainTable($dimensions);
-+    }
-+
-+    /**
-+     * Get connection
-+     *
-+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
-+     * @throws \DomainException
-+     */
-+    private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
-+    {
-+        if ($this->connection === null) {
-+            $this->connection = $this->resource->getConnection($this->connectionName);
-+        }
-+
-+        return $this->connection;
-+    }
-+
-+    /**
-+     * Get table
-+     *
-+     * @param string $tableName
-+     * @return string
-+     */
-+    private function getTable($tableName)
-+    {
-+        return $this->resource->getTableName($tableName, $this->connectionName);
-+    }
- }
-diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
-index e9295b22674..21ba1f75ba9 100644
---- a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
-+++ b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
-@@ -5,10 +5,8 @@
-  */
- namespace Magento\Bundle\Model\ResourceModel\Selection;
- 
--use Magento\Customer\Api\GroupManagementInterface;
- use Magento\Framework\DataObject;
- use Magento\Framework\DB\Select;
--use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
- use Magento\Framework\App\ObjectManager;
- 
-@@ -17,6 +15,7 @@ use Magento\Framework\App\ObjectManager;
-  *
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @since 100.0.2
-  */
- class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-@@ -45,6 +44,95 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      */
-     private $websiteScopePriceJoined = false;
- 
-+    /**
-+     * @var \Magento\CatalogInventory\Model\ResourceModel\Stock\Item
-+     */
-+    private $stockItem;
-+
-+    /**
-+     * Collection constructor.
-+     * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
-+     * @param \Psr\Log\LoggerInterface $logger
-+     * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-+     * @param \Magento\Eav\Model\Config $eavConfig
-+     * @param \Magento\Framework\App\ResourceConnection $resource
-+     * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
-+     * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-+     * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-+     * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
-+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-+     * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
-+     * @param \Magento\Catalog\Model\ResourceModel\Url $catalogUrl
-+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-+     * @param \Magento\Customer\Model\Session $customerSession
-+     * @param \Magento\Framework\Stdlib\DateTime $dateTime
-+     * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
-+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
-+     * @param ProductLimitationFactory|null $productLimitationFactory
-+     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
-+     * @param \Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer|null $tableMaintainer
-+     * @param \Magento\CatalogInventory\Model\ResourceModel\Stock\Item|null $stockItem
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     */
-+    public function __construct(
-+        \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
-+        \Psr\Log\LoggerInterface $logger,
-+        \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
-+        \Magento\Framework\Event\ManagerInterface $eventManager,
-+        \Magento\Eav\Model\Config $eavConfig,
-+        \Magento\Framework\App\ResourceConnection $resource,
-+        \Magento\Eav\Model\EntityFactory $eavEntityFactory,
-+        \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-+        \Magento\Framework\Validator\UniversalFactory $universalFactory,
-+        \Magento\Store\Model\StoreManagerInterface $storeManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-+        \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
-+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-+        \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
-+        \Magento\Catalog\Model\ResourceModel\Url $catalogUrl,
-+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
-+        \Magento\Customer\Model\Session $customerSession,
-+        \Magento\Framework\Stdlib\DateTime $dateTime,
-+        \Magento\Customer\Api\GroupManagementInterface $groupManagement,
-+        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
-+        ProductLimitationFactory $productLimitationFactory = null,
-+        \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
-+        \Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer $tableMaintainer = null,
-+        \Magento\CatalogInventory\Model\ResourceModel\Stock\Item $stockItem = null
-+    ) {
-+        parent::__construct(
-+            $entityFactory,
-+            $logger,
-+            $fetchStrategy,
-+            $eventManager,
-+            $eavConfig,
-+            $resource,
-+            $eavEntityFactory,
-+            $resourceHelper,
-+            $universalFactory,
-+            $storeManager,
-+            $moduleManager,
-+            $catalogProductFlatState,
-+            $scopeConfig,
-+            $productOptionFactory,
-+            $catalogUrl,
-+            $localeDate,
-+            $customerSession,
-+            $dateTime,
-+            $groupManagement,
-+            $connection,
-+            $productLimitationFactory,
-+            $metadataPool,
-+            $tableMaintainer
-+        );
-+
-+        $this->stockItem = $stockItem
-+            ?? ObjectManager::getInstance()->get(\Magento\CatalogInventory\Model\ResourceModel\Stock\Item::class);
-+    }
-+
-     /**
-      * Initialize collection
-      *
-@@ -58,19 +146,14 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
--     * Set store id for each collection item when collection was loaded
-+     * Set store id for each collection item when collection was loaded.
-+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
-      *
-      * @return $this
-      */
-     public function _afterLoad()
-     {
--        parent::_afterLoad();
--        if ($this->getStoreId() && $this->_items) {
--            foreach ($this->_items as $item) {
--                $item->setStoreId($this->getStoreId());
--            }
--        }
--        return $this;
-+        return parent::_afterLoad();
-     }
- 
-     /**
-@@ -170,28 +253,30 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      */
-     public function addQuantityFilter()
-     {
--        $stockItemTable = $this->getTable('cataloginventory_stock_item');
--        $stockStatusTable = $this->getTable('cataloginventory_stock_status');
-+        $manageStockExpr = $this->stockItem->getManageStockExpr('stock_item');
-+        $backordersExpr = $this->stockItem->getBackordersExpr('stock_item');
-+        $minQtyExpr = $this->getConnection()->getCheckSql(
-+            'selection.selection_can_change_qty',
-+            $this->stockItem->getMinSaleQtyExpr('stock_item'),
-+            'selection.selection_qty'
-+        );
-+
-+        $where = $manageStockExpr . ' = 0';
-+        $where .= ' OR ('
-+            . 'stock_item.is_in_stock = ' . \Magento\CatalogInventory\Model\Stock::STOCK_IN_STOCK
-+            . ' AND ('
-+                . $backordersExpr . ' != ' . \Magento\CatalogInventory\Model\Stock::BACKORDERS_NO
-+                . ' OR '
-+                . $minQtyExpr . ' <= stock_item.qty'
-+            . ')'
-+        . ')';
-+
-         $this->getSelect()
-             ->joinInner(
--                ['stock' => $stockStatusTable],
--                'selection.product_id = stock.product_id',
--                []
--            )->joinInner(
--                ['stock_item' => $stockItemTable],
-+                ['stock_item' => $this->stockItem->getMainTable()],
-                 'selection.product_id = stock_item.product_id',
-                 []
--            )
--            ->where(
--                '('
--                . 'selection.selection_can_change_qty > 0'
--                . ' or '
--                . 'selection.selection_qty <= stock.qty'
--                . ' or '
--                .'stock_item.manage_stock = 0'
--                . ')'
--            )
--            ->where('stock.stock_status = 1');
-+            )->where($where);
- 
-         return $this;
-     }
-@@ -267,7 +352,10 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
-+     * Get Catalog Rule Processor.
-+     *
-      * @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
-+     *
-      * @deprecated 100.2.0
-      */
-     private function getCatalogRuleProcessor()
-diff --git a/app/code/Magento/Bundle/Plugin/UpdatePriceInQuoteItemOptions.php b/app/code/Magento/Bundle/Plugin/UpdatePriceInQuoteItemOptions.php
-new file mode 100644
-index 00000000000..d5aafb8ad2b
---- /dev/null
-+++ b/app/code/Magento/Bundle/Plugin/UpdatePriceInQuoteItemOptions.php
-@@ -0,0 +1,55 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Bundle\Plugin;
-+
-+use Magento\Quote\Model\Quote\Item as OrigQuoteItem;
-+use Magento\Quote\Model\Quote\Item\AbstractItem;
-+use Magento\Framework\Serialize\SerializerInterface;
-+
-+/**
-+ * Update prices stored in quote item options after calculating quote item's totals
-+ */
-+class UpdatePriceInQuoteItemOptions
-+{
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @param SerializerInterface $serializer
-+     */
-+    public function __construct(SerializerInterface $serializer)
-+    {
-+        $this->serializer = $serializer;
-+    }
-+
-+    /**
-+     * Update price on quote item options level
-+     *
-+     * @param OrigQuoteItem $subject
-+     * @param AbstractItem $result
-+     * @return AbstractItem
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterCalcRowTotal(OrigQuoteItem $subject, AbstractItem $result)
-+    {
-+        $bundleAttributes = $result->getProduct()->getCustomOption('bundle_selection_attributes');
-+        if ($bundleAttributes !== null) {
-+            $actualPrice = $result->getPrice();
-+            $parsedValue = $this->serializer->unserialize($bundleAttributes->getValue());
-+            if (is_array($parsedValue) && array_key_exists('price', $parsedValue)) {
-+                $parsedValue['price'] = $actualPrice;
-+            }
-+            $bundleAttributes->setValue($this->serializer->serialize($parsedValue));
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
-index adb0777151b..04a6ee0bd45 100644
---- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
-+++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
-@@ -198,6 +198,8 @@ class Calculator implements BundleCalculatorInterface
-     }
- 
-     /**
-+     * Get selection price list provider.
-+     *
-      * @return SelectionPriceListProviderInterface
-      * @deprecated 100.2.0
-      */
-@@ -281,7 +283,7 @@ class Calculator implements BundleCalculatorInterface
-      * @param float $basePriceValue
-      * @param Product $bundleProduct
-      * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
--     * @param null|bool|string|arrayy $exclude
-+     * @param null|bool|string|array $exclude
-      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-      */
-     protected function calculateFixedBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude)
-diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
-index 927b8fbff8d..a28d721cc9a 100644
---- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
-+++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
-@@ -54,7 +54,7 @@ class BundleSelectionFactory
-     ) {
-         $arguments['bundleProduct'] = $bundleProduct;
-         $arguments['saleableItem'] = $selection;
--        $arguments['quantity'] = $quantity ? floatval($quantity) : 1.;
-+        $arguments['quantity'] = $quantity ? (float)$quantity : 1.;
- 
-         return $this->objectManager->create(self::SELECTION_CLASS_DEFAULT, $arguments);
-     }
-diff --git a/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTypes.php b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTypes.php
-new file mode 100644
-index 00000000000..701def7fc13
---- /dev/null
-+++ b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTypes.php
-@@ -0,0 +1,204 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Bundle\Setup\Patch\Data;
-+
-+use Magento\Catalog\Api\Data\ProductAttributeInterface;
-+use Magento\Eav\Setup\EavSetup;
-+use Magento\Eav\Setup\EavSetupFactory;
-+use Magento\Framework\Setup\ModuleDataSetupInterface;
-+use Magento\Framework\Setup\Patch\DataPatchInterface;
-+use Magento\Framework\Setup\Patch\PatchVersionInterface;
-+
-+/**
-+ * Class UpdateBundleRelatedEntityTypes
-+ *
-+ * @package Magento\Bundle\Setup\Patch
-+ */
-+class UpdateBundleRelatedEntityTypes implements DataPatchInterface, PatchVersionInterface
-+{
-+    /**
-+     * @var ModuleDataSetupInterface
-+     */
-+    private $moduleDataSetup;
-+
-+    /**
-+     * @var EavSetupFactory
-+     */
-+    private $eavSetupFactory;
-+
-+    /**
-+     * UpdateBundleRelatedEntityTypes constructor.
-+     * @param ModuleDataSetupInterface $moduleDataSetup
-+     * @param EavSetupFactory $eavSetupFactory
-+     */
-+    public function __construct(
-+        ModuleDataSetupInterface $moduleDataSetup,
-+        \Magento\Eav\Setup\EavSetupFactory $eavSetupFactory
-+    ) {
-+        $this->moduleDataSetup = $moduleDataSetup;
-+        $this->eavSetupFactory = $eavSetupFactory;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function apply()
-+    {
-+        /** @var \Magento\Eav\Setup\EavSetup $eavSetup */
-+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
-+
-+        $attributeSetId = $eavSetup->getDefaultAttributeSetId(ProductAttributeInterface::ENTITY_TYPE_CODE);
-+        $eavSetup->addAttributeGroup(
-+            ProductAttributeInterface::ENTITY_TYPE_CODE,
-+            $attributeSetId,
-+            'Bundle Items',
-+            16
-+        );
-+        $this->upgradePriceType($eavSetup);
-+        $this->upgradeSkuType($eavSetup);
-+        $this->upgradeWeightType($eavSetup);
-+        $this->upgradeShipmentType($eavSetup);
-+    }
-+
-+    /**
-+     * Upgrade Dynamic Price attribute
-+     *
-+     * @param EavSetup $eavSetup
-+     * @return void
-+     */
-+    private function upgradePriceType(EavSetup $eavSetup)
-+    {
-+        $eavSetup->updateAttribute(
-+            ProductAttributeInterface::ENTITY_TYPE_CODE,
-+            'price_type',
-+            'frontend_input',
-+            'boolean',
-+            31
-+        );
-+        $eavSetup->updateAttribute(
-+            ProductAttributeInterface::ENTITY_TYPE_CODE,
-+            'price_type',
-+            'frontend_label',
-+            'Dynamic Price'
-+        );
-+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'price_type', 'default_value', 0);
-+    }
-+
-+    /**
-+     * Upgrade Dynamic Sku attribute
-+     *
-+     * @param EavSetup $eavSetup
-+     * @return void
-+     */
-+    private function upgradeSkuType(EavSetup $eavSetup)
-+    {
-+        $eavSetup->updateAttribute(
-+            ProductAttributeInterface::ENTITY_TYPE_CODE,
-+            'sku_type',
-+            'frontend_input',
-+            'boolean',
-+            21
-+        );
-+        $eavSetup->updateAttribute(
-+            ProductAttributeInterface::ENTITY_TYPE_CODE,
-+            'sku_type',
-+            'frontend_label',
-+            'Dynamic SKU'
-+        );
-+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'sku_type', 'default_value', 0);
-+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'sku_type', 'is_visible', 1);
-+    }
-+
-+    /**
-+     * Upgrade Dynamic Weight attribute
-+     *
-+     * @param EavSetup $eavSetup
-+     * @return void
-+     */
-+    private function upgradeWeightType(EavSetup $eavSetup)
-+    {
-+        $eavSetup->updateAttribute(
-+            ProductAttributeInterface::ENTITY_TYPE_CODE,
-+            'weight_type',
-+            'frontend_input',
-+            'boolean',
-+            71
-+        );
-+        $eavSetup->updateAttribute(
-+            ProductAttributeInterface::ENTITY_TYPE_CODE,
-+            'weight_type',
-+            'frontend_label',
-+            'Dynamic Weight'
-+        );
-+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'weight_type', 'default_value', 0);
-+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'weight_type', 'is_visible', 1);
-+    }
-+
-+    /**
-+     * Upgrade Ship Bundle Items attribute
-+     *
-+     * @param EavSetup $eavSetup
-+     * @return void
-+     */
-+    private function upgradeShipmentType(EavSetup $eavSetup)
-+    {
-+        $attributeSetId = $eavSetup->getDefaultAttributeSetId(ProductAttributeInterface::ENTITY_TYPE_CODE);
-+        $eavSetup->addAttributeToGroup(
-+            ProductAttributeInterface::ENTITY_TYPE_CODE,
-+            $attributeSetId,
-+            'Bundle Items',
-+            'shipment_type',
-+            1
-+        );
-+        $eavSetup->updateAttribute(
-+            ProductAttributeInterface::ENTITY_TYPE_CODE,
-+            'shipment_type',
-+            'frontend_input',
-+            'select'
-+        );
-+        $eavSetup->updateAttribute(
-+            ProductAttributeInterface::ENTITY_TYPE_CODE,
-+            'shipment_type',
-+            'frontend_label',
-+            'Ship Bundle Items'
-+        );
-+        $eavSetup->updateAttribute(
-+            ProductAttributeInterface::ENTITY_TYPE_CODE,
-+            'shipment_type',
-+            'source_model',
-+            \Magento\Bundle\Model\Product\Attribute\Source\Shipment\Type::class
-+        );
-+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'shipment_type', 'default_value', 0);
-+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'shipment_type', 'is_visible', 1);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public static function getDependencies()
-+    {
-+        return [
-+            ApplyAttributesUpdate::class,
-+        ];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public static function getVersion()
-+    {
-+        return '2.0.2';
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getAliases()
-+    {
-+        return [];
-+    }
-+}
-diff --git a/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php
-deleted file mode 100644
-index 44647ea76a1..00000000000
---- a/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php
-+++ /dev/null
-@@ -1,204 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Bundle\Setup\Patch\Data;
--
--use Magento\Eav\Setup\EavSetupFactory;
--use Magento\Framework\App\ResourceConnection;
--use Magento\Framework\Setup\ModuleDataSetupInterface;
--use Magento\Framework\Setup\Patch\DataPatchInterface;
--use Magento\Framework\Setup\Patch\PatchVersionInterface;
--use Magento\Catalog\Api\Data\ProductAttributeInterface;
--use Magento\Eav\Setup\EavSetup;
--
--/**
-- * Class UpdateBundleRelatedEntityTytpes
-- * @package Magento\Bundle\Setup\Patch
-- */
--class UpdateBundleRelatedEntityTytpes implements DataPatchInterface, PatchVersionInterface
--{
--    /**
--     * @var ModuleDataSetupInterface
--     */
--    private $moduleDataSetup;
--
--    /**
--     * @var EavSetupFactory
--     */
--    private $eavSetupFactory;
--
--    /**
--     * UpdateBundleRelatedEntityTytpes constructor.
--     * @param ModuleDataSetupInterface $moduleDataSetup
--     * @param EavSetupFactory $eavSetupFactory
--     */
--    public function __construct(
--        ModuleDataSetupInterface $moduleDataSetup,
--        \Magento\Eav\Setup\EavSetupFactory $eavSetupFactory
--    ) {
--        $this->moduleDataSetup = $moduleDataSetup;
--        $this->eavSetupFactory = $eavSetupFactory;
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function apply()
--    {
--        /** @var \Magento\Eav\Setup\EavSetup $eavSetup */
--        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
--
--        $attributeSetId = $eavSetup->getDefaultAttributeSetId(ProductAttributeInterface::ENTITY_TYPE_CODE);
--        $eavSetup->addAttributeGroup(
--            ProductAttributeInterface::ENTITY_TYPE_CODE,
--            $attributeSetId,
--            'Bundle Items',
--            16
--        );
--        $this->upgradePriceType($eavSetup);
--        $this->upgradeSkuType($eavSetup);
--        $this->upgradeWeightType($eavSetup);
--        $this->upgradeShipmentType($eavSetup);
--    }
--
--    /**
--     * Upgrade Dynamic Price attribute
--     *
--     * @param EavSetup $eavSetup
--     * @return void
--     */
--    private function upgradePriceType(EavSetup $eavSetup)
--    {
--        $eavSetup->updateAttribute(
--            ProductAttributeInterface::ENTITY_TYPE_CODE,
--            'price_type',
--            'frontend_input',
--            'boolean',
--            31
--        );
--        $eavSetup->updateAttribute(
--            ProductAttributeInterface::ENTITY_TYPE_CODE,
--            'price_type',
--            'frontend_label',
--            'Dynamic Price'
--        );
--        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'price_type', 'default_value', 0);
--    }
--
--    /**
--     * Upgrade Dynamic Sku attribute
--     *
--     * @param EavSetup $eavSetup
--     * @return void
--     */
--    private function upgradeSkuType(EavSetup $eavSetup)
--    {
--        $eavSetup->updateAttribute(
--            ProductAttributeInterface::ENTITY_TYPE_CODE,
--            'sku_type',
--            'frontend_input',
--            'boolean',
--            21
--        );
--        $eavSetup->updateAttribute(
--            ProductAttributeInterface::ENTITY_TYPE_CODE,
--            'sku_type',
--            'frontend_label',
--            'Dynamic SKU'
--        );
--        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'sku_type', 'default_value', 0);
--        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'sku_type', 'is_visible', 1);
--    }
--
--    /**
--     * Upgrade Dynamic Weight attribute
--     *
--     * @param EavSetup $eavSetup
--     * @return void
--     */
--    private function upgradeWeightType(EavSetup $eavSetup)
--    {
--        $eavSetup->updateAttribute(
--            ProductAttributeInterface::ENTITY_TYPE_CODE,
--            'weight_type',
--            'frontend_input',
--            'boolean',
--            71
--        );
--        $eavSetup->updateAttribute(
--            ProductAttributeInterface::ENTITY_TYPE_CODE,
--            'weight_type',
--            'frontend_label',
--            'Dynamic Weight'
--        );
--        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'weight_type', 'default_value', 0);
--        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'weight_type', 'is_visible', 1);
--    }
--
--    /**
--     * Upgrade Ship Bundle Items attribute
--     *
--     * @param EavSetup $eavSetup
--     * @return void
--     */
--    private function upgradeShipmentType(EavSetup $eavSetup)
--    {
--        $attributeSetId = $eavSetup->getDefaultAttributeSetId(ProductAttributeInterface::ENTITY_TYPE_CODE);
--        $eavSetup->addAttributeToGroup(
--            ProductAttributeInterface::ENTITY_TYPE_CODE,
--            $attributeSetId,
--            'Bundle Items',
--            'shipment_type',
--            1
--        );
--        $eavSetup->updateAttribute(
--            ProductAttributeInterface::ENTITY_TYPE_CODE,
--            'shipment_type',
--            'frontend_input',
--            'select'
--        );
--        $eavSetup->updateAttribute(
--            ProductAttributeInterface::ENTITY_TYPE_CODE,
--            'shipment_type',
--            'frontend_label',
--            'Ship Bundle Items'
--        );
--        $eavSetup->updateAttribute(
--            ProductAttributeInterface::ENTITY_TYPE_CODE,
--            'shipment_type',
--            'source_model',
--            \Magento\Bundle\Model\Product\Attribute\Source\Shipment\Type::class
--        );
--        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'shipment_type', 'default_value', 0);
--        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'shipment_type', 'is_visible', 1);
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public static function getDependencies()
--    {
--        return [
--            ApplyAttributesUpdate::class,
--        ];
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public static function getVersion()
--    {
--        return '2.0.2';
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function getAliases()
--    {
--        return [];
--    }
--}
-diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml
-index a5e62fca948..836826734f0 100644
---- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Fill main fields in create product form-->
-     <actionGroup name="fillMainBundleProductForm">
-         <arguments>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml
-old mode 100644
-new mode 100755
-index f3e5eff3834..b3ac72d3f41
---- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AdminClearFiltersActionGroup">
-         <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
-         <waitForPageLoad stepKey="WaitForPageToLoad"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml
-new file mode 100644
-index 00000000000..4cd16320d3d
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml
-@@ -0,0 +1,167 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateApiDynamicBundleProductActionGroup">
-+        <arguments>
-+            <argument name="productName" defaultValue="Api Dynamic Bundle Product" type="string"/>
-+        </arguments>
-+        <!--Create 4 simple products-->
-+        <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+            <field key="price">4.99</field>
-+        </createData>
-+        <createData entity="SimpleProduct2" stepKey="simpleProduct2">
-+            <field key="price">2.89</field>
-+        </createData>
-+        <createData entity="SimpleProduct2" stepKey="simpleProduct3">
-+            <field key="price">7.33</field>
-+        </createData>
-+        <createData entity="SimpleProduct2" stepKey="simpleProduct4">
-+            <field key="price">18.25</field>
-+        </createData>
-+        <!-- Create the bundle product based -->
-+        <createData entity="ApiBundleProduct" stepKey="createBundleProduct">
-+            <field key="name">{{productName}}</field>
-+        </createData>
-+        <createData entity="MultipleSelectOption" stepKey="createBundleOption1_1">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <field key="required">false</field>
-+        </createData>
-+        <createData entity="CheckboxOption" stepKey="createBundleOption1_2">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createBundleOption1_1"/>
-+            <requiredEntity createDataKey="simpleProduct1"/>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createBundleOption1_1"/>
-+            <requiredEntity createDataKey="simpleProduct2"/>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct3">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createBundleOption1_2"/>
-+            <requiredEntity createDataKey="simpleProduct3"/>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct4">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createBundleOption1_2"/>
-+            <requiredEntity createDataKey="simpleProduct4"/>
-+        </createData>
-+    </actionGroup>
-+    <actionGroup name="AdminCreateApiFixedBundleProductActionGroup">
-+        <arguments>
-+            <argument name="productName" defaultValue="Api Fixed Bundle Product" type="string"/>
-+        </arguments>
-+        <!--Create 4 simple products-->
-+        <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+            <field key="price">4.99</field>
-+        </createData>
-+        <createData entity="SimpleProduct2" stepKey="simpleProduct2">
-+            <field key="price">2.89</field>
-+        </createData>
-+        <createData entity="SimpleProduct2" stepKey="simpleProduct3">
-+            <field key="price">7.33</field>
-+        </createData>
-+        <createData entity="SimpleProduct2" stepKey="simpleProduct4">
-+            <field key="price">18.25</field>
-+        </createData>
-+        <!-- Create the bundle product based -->
-+        <createData entity="ApiFixedBundleProduct" stepKey="createBundleProduct">
-+            <field key="name">{{productName}}</field>
-+        </createData>
-+        <createData entity="MultipleSelectOption" stepKey="createBundleOption1_1">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <field key="required">false</field>
-+        </createData>
-+        <createData entity="CheckboxOption" stepKey="createBundleOption1_2">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createBundleOption1_1"/>
-+            <requiredEntity createDataKey="simpleProduct1"/>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createBundleOption1_1"/>
-+            <requiredEntity createDataKey="simpleProduct2"/>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct3">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createBundleOption1_2"/>
-+            <requiredEntity createDataKey="simpleProduct3"/>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct4">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createBundleOption1_2"/>
-+            <requiredEntity createDataKey="simpleProduct4"/>
-+        </createData>
-+    </actionGroup>
-+    <actionGroup name="AdminCreateApiDynamicBundleProductAllOptionTypesActionGroup">
-+        <arguments>
-+            <argument name="productName" defaultValue="Api Dynamic Bundle Product" type="string"/>
-+        </arguments>
-+        <!-- Create simple products -->
-+        <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+            <field key="price">10</field>
-+        </createData>
-+        <createData entity="SimpleProduct2" stepKey="simpleProduct2">
-+            <field key="price">20</field>
-+        </createData>
-+        <!-- Create Bundle product -->
-+        <createData entity="ApiBundleProduct" stepKey="createBundleProduct">
-+            <field key="name">{{productName}}</field>
-+        </createData>
-+        <createData entity="DropDownBundleOption" stepKey="createDropDownBundleOption">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <field key="title">Drop-down Option</field>
-+        </createData>
-+        <createData entity="RadioButtonsOption" stepKey="createBundleRadioButtonsOption">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <field key="title">Radio Buttons Option</field>
-+        </createData>
-+        <createData entity="CheckboxOption" stepKey="createBundleCheckboxOption">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <field key="title">Checkbox Option</field>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkCheckboxOptionToProduct1">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createBundleCheckboxOption"/>
-+            <requiredEntity createDataKey="simpleProduct1"/>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkCheckboxOptionToProduct2">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createBundleCheckboxOption"/>
-+            <requiredEntity createDataKey="simpleProduct2"/>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkDropDownOptionToProduct1">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createDropDownBundleOption"/>
-+            <requiredEntity createDataKey="simpleProduct1"/>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkDropDownOptionToProduct2">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createDropDownBundleOption"/>
-+            <requiredEntity createDataKey="simpleProduct2"/>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkRadioButtonsOptionToProduct1">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createBundleRadioButtonsOption"/>
-+            <requiredEntity createDataKey="simpleProduct1"/>
-+        </createData>
-+        <createData entity="ApiBundleLink" stepKey="linkRadioButtonsOptionToProduct2">
-+            <requiredEntity createDataKey="createBundleProduct"/>
-+            <requiredEntity createDataKey="createBundleRadioButtonsOption"/>
-+            <requiredEntity createDataKey="simpleProduct2"/>
-+        </createData>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOrderBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOrderBundleProductActionGroup.xml
-new file mode 100644
-index 00000000000..d73d31c4498
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOrderBundleProductActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOrderConfigureBundleProduct">
-+        <arguments>
-+            <argument name="productName" type="string" defaultValue="{{SimpleProduct.sku}}"/>
-+            <argument name="productNumber" type="string" defaultValue="1"/>
-+            <argument name="productQty" type="string" defaultValue="1"/>
-+        </arguments>
-+        <click selector="{{AdminOrderFormItemsOrderedSection.configureButtonBySku}}" stepKey="clickConfigure"/>
-+        <waitForPageLoad stepKey="waitForConfigurePageLoad"/>
-+        <checkOption selector="{{AdminOrderBundleProductSection.bundleProductCheckbox(productNumber)}}" stepKey="checkProduct"/>
-+        <fillField selector="{{AdminOrderFormConfigureProductSection.quantity}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
-+        <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOk"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductFilterActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductFilterActionGroup.xml
-index 8ab7af1d031..177f9203ed1 100644
---- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductFilterActionGroup.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductFilterActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="BundleProductFilter">
-         <!--Setting filter-->
-         <!--Prereq: go to admin product catalog page-->
-diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
-index af8fc1459d9..d86d720ed7f 100644
---- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="CreateBasicBundleProduct">
-         <!--Prereq: Go to bundle product creation page-->
-         <!--Product name and SKU-->
-@@ -15,11 +15,12 @@
-         <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
- 
-         <!--Trigger SEO drop down-->
--        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed"/>
--        <waitForPageLoad stepKey="WaitForDropDownSEO"/>
-+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="scrollToSeoDropDown"/>
-+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.urlKey}}" visible="false" stepKey="openDropDownIfClosed"/>
-+        <waitForPageLoad stepKey="waitForDropDownSEO"/>
- 
-         <!--Fill URL input-->
--        <fillField userInput="{{BundleProduct.urlKey}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension"/>
-+        <fillField userInput="{{BundleProduct.urlKey}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="fillsInSeoLinkExtension"/>
-     </actionGroup>
- 
-     <actionGroup name="addBundleOptionWithTwoProducts">
-@@ -55,4 +56,74 @@
-         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '0')}}" userInput="50" stepKey="fillQuantity1"/>
-         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '1')}}" userInput="50" stepKey="fillQuantity2"/>
-     </actionGroup>
-+
-+    <actionGroup name="addBundleOptionWithOneProduct" extends="addBundleOptionWithTwoProducts">
-+        <remove keyForRemoval="openProductFilters2"/>
-+        <remove keyForRemoval="fillProductSkuFilter2"/>
-+        <remove keyForRemoval="clickApplyFilters2"/>
-+        <remove keyForRemoval="waitForFilteredGridLoad2"/>
-+        <remove keyForRemoval="selectProduct2"/>
-+        <remove keyForRemoval="selectProduct2"/>
-+        <remove keyForRemoval="fillQuantity1"/>
-+        <remove keyForRemoval="fillQuantity2"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '0')}}" userInput="1" stepKey="fillQuantity" after="clickAddButton1"/>
-+    </actionGroup>
-+
-+    <actionGroup name="addBundleOptionWithTreeProducts" extends="addBundleOptionWithTwoProducts">
-+        <arguments>
-+            <argument name="prodTreeSku" type="string"/>
-+        </arguments>
-+        <remove keyForRemoval="fillQuantity1"/>
-+        <remove keyForRemoval="fillQuantity2"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters3" after="selectProduct2"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters3" after="clickClearFilters3"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{prodTreeSku}}" stepKey="fillProductSkuFilter3" after="openProductFilters3"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters3" after="fillProductSkuFilter3"/>
-+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad3" time="30" after="clickApplyFilters3"/>
-+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectProduct3" after="waitForFilteredGridLoad3"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '0')}}" userInput="1" stepKey="fillQuantity1" after="clickAddButton1"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '1')}}" userInput="1" stepKey="fillQuantity2" after="fillQuantity1"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '2')}}" userInput="1" stepKey="fillQuantity3" after="fillQuantity2"/>
-+    </actionGroup>
-+
-+    <actionGroup name="addBundleOptionWithSixProducts" extends="addBundleOptionWithTwoProducts">
-+        <arguments>
-+            <argument name="prodTreeSku" type="string"/>
-+            <argument name="prodFourSku" type="string"/>
-+            <argument name="prodFiveSku" type="string"/>
-+            <argument name="prodSixSku" type="string"/>
-+        </arguments>
-+        <remove keyForRemoval="fillQuantity1"/>
-+        <remove keyForRemoval="fillQuantity2"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters3" after="selectProduct2"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters3" after="clickClearFilters3"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{prodTreeSku}}" stepKey="fillProductSkuFilter3" after="openProductFilters3"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters3" after="fillProductSkuFilter3"/>
-+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad3" time="30" after="clickApplyFilters3"/>
-+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectProduct3" after="waitForFilteredGridLoad3"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters4" after="selectProduct3"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters4" after="clickClearFilters4"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{prodFourSku}}" stepKey="fillProductSkuFilter4" after="openProductFilters4"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters4" after="fillProductSkuFilter4"/>
-+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad4" time="30" after="clickApplyFilters4"/>
-+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectProduct4" after="clickApplyFilters4"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters5" after="selectProduct4"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters5" after="clickClearFilters5"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{prodFiveSku}}" stepKey="fillProductSkuFilter5" after="openProductFilters5"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters5" after="fillProductSkuFilter5"/>
-+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad5" time="30" after="clickApplyFilters5"/>
-+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectProduct5" after="waitForFilteredGridLoad5"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters6" after="selectProduct5"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters6" after="clickClearFilters6"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{prodSixSku}}" stepKey="fillProductSkuFilter6" after="openProductFilters6"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters6" after="fillProductSkuFilter6"/>
-+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad6" time="30" after="clickApplyFilters6"/>
-+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectProduct6" after="waitForFilteredGridLoad6"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '0')}}" userInput="2" stepKey="fillQuantity1" after="clickAddButton1"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '1')}}" userInput="2" stepKey="fillQuantity2" after="fillQuantity1"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '2')}}" userInput="2" stepKey="fillQuantity3" after="fillQuantity2"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '3')}}" userInput="2" stepKey="fillQuantity4" after="fillQuantity3"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '4')}}" userInput="2" stepKey="fillQuantity5" after="fillQuantity4"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '5')}}" userInput="2" stepKey="fillQuantity6" after="fillQuantity5"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
-index 2ae9748c773..20bde5f87bd 100644
---- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
-@@ -7,14 +7,15 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AncillaryPrepBundleProduct">
-         <!--Prereq: go to bundle product creation page-->
-         <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillProductName"/>
-         <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
- 
-         <!--Trigger SEO drop down-->
--        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed"/>
-+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="moveToSEOSection"/>
-+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.urlKey}}" visible="false" stepKey="openDropDownIfClosed"/>
-         <waitForPageLoad stepKey="WaitForDropDownSEO"/>
- 
-         <!--Fill URL input-->
-diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/SetBundleProductAttributesActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/SetBundleProductAttributesActionGroup.xml
-new file mode 100644
-index 00000000000..50af5993af5
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/SetBundleProductAttributesActionGroup.xml
-@@ -0,0 +1,82 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="SetBundleProductAttributes">
-+        <arguments>
-+            <argument name="attributeSet" defaultValue="Default" type="string"/>
-+            <argument name="bundleProductName" defaultValue="defaultBundleProductNameAndSku" type="string"/>
-+            <argument name="bundleProductSku" defaultValue="defaultBundleProductNameAndSku" type="string"/>
-+            <argument name="price" defaultValue="10" type="string"/>
-+            <argument name="stock" defaultValue="In Stock" type="string"/>
-+            <argument name="weight" defaultValue="10" type="string"/>
-+            <argument name="visibility" defaultValue="Catalog, Search" type="string"/>
-+            <argument name="fromDate" defaultValue="10/10/2018" type="string"/>
-+            <argument name="toDate" defaultValue="10/10/2018" type="string"/>
-+            <argument name="country" defaultValue="Italy" type="string"/>
-+        </arguments>
-+
-+        <!--
-+        Pre-Reqs:
-+        1) Go to bundle product creation page
-+        2) Will not Enable/Disable
-+        -->
-+
-+        <!--Apply Attribute Set-->
-+        <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
-+        <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{attributeSet}}" stepKey="searchForAttrSet"/>
-+        <click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet"/>
-+
-+        <!--Product name and SKU-->
-+        <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{bundleProductName}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{bundleProductSku}}" stepKey="fillProductSku"/>
-+        <click selector="{{AdminProductFormBundleSection.productName}}" stepKey="clickUnselectField"/>
-+
-+        <!--Dynamic SKU Toggle-->
-+        <checkOption selector="{{AdminProductFormBundleSection.dynamicSkuToggle}}" stepKey="clickOnToggle"/>
-+        <click selector="{{AdminProductFormBundleSection.productName}}" stepKey="clickUnselectFieldAgain"/>
-+
-+        <!--Dynamic Price Toggle-->
-+        <checkOption selector="{{AdminProductFormBundleSection.dynamicPriceToggle}}" stepKey="clickOnDynamicPriceToggle"/>
-+
-+        <!--Tax Class-->
-+        <selectOption selector="{{AdminProductFormBundleSection.taxClassDropDown}}" userInput="Taxable Goods" stepKey="taxClassDropDown"/>
-+
-+        <!--Fill out price-->
-+        <fillField selector="{{AdminProductFormBundleSection.priceField}}" userInput="{{price}}" stepKey="fillOutPrice"/>
-+
-+        <!--Stock status-->
-+        <selectOption selector="{{AdminProductFormBundleSection.stockStatusField}}" userInput="{{stock}}" stepKey="stockStatus"/>
-+
-+        <!--Dynamic weight-->
-+        <checkOption selector="{{AdminProductFormBundleSection.dynamicWeightToggle}}" stepKey="dynamicWeight"/>
-+
-+        <!--Weight-->
-+        <fillField selector="{{AdminProductFormBundleSection.weightField}}" userInput="{{weight}}" stepKey="fillIn"/>
-+
-+        <!--Visibilty-->
-+        <selectOption selector="{{AdminProductFormBundleSection.visibilityDropDown}}" userInput="{{visibility}}" stepKey="openVisibility"/>
-+
-+        <!--Categories-->
-+        <click selector="{{AdminProductFormBundleSection.categoriesDropDown}}" stepKey="clickOnCategoriesDropDown"/>
-+        <click selector="{{AdminProductFormBundleSection.defaultCategory}}" stepKey="selectDefaultCategory"/>
-+        <click selector="{{AdminProductFormBundleSection.categoryDone}}" stepKey="clickOnCategoriesDoneToCloseOptions"/>
-+
-+        <!--New from - to-->
-+        <fillField selector="{{AdminProductFormBundleSection.fromDate}}" userInput="{{fromDate}}" stepKey="fillInFirstDate"/>
-+        <fillField selector="{{AdminProductFormBundleSection.toDate}}" userInput="{{toDate}}" stepKey="fillInSecondDate"/>
-+
-+        <!--Country of manufacture-->
-+        <selectOption selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="{{country}}" stepKey="countryOfManufactureDropDown"/>
-+
-+        <!--Save the product-->
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StoreFrontAddProductToCartFromBundleActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StoreFrontAddProductToCartFromBundleActionGroup.xml
-new file mode 100644
-index 00000000000..441303e8f1b
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StoreFrontAddProductToCartFromBundleActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StoreFrontAddProductToCartFromBundleWithCurrencyActionGroup">
-+        <arguments>
-+            <argument name="product"/>
-+            <argument name="currency" type="string" defaultValue="US Dollar"/>
-+        </arguments>
-+        <click selector="{{StorefrontBundledSection.currencyTrigger}}" stepKey="openCurrencyTrigger"/>
-+        <click selector="{{StorefrontBundledSection.currency(currency)}}" stepKey="chooseCurrency"/>
-+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
-+        <waitForPageLoad stepKey="waitForBundleOpen"/>
-+        <checkOption selector="{{StorefrontBundledSection.productInBundle(product.name)}}" stepKey="chooseProduct"/>
-+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="addToCartProduct"/>
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
-index 48697d43ec8..1767db0a009 100644
---- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Add Bundle Product to Cart from the category page with specified quantity to cart -->
-     <actionGroup name="StorefrontAddCategoryBundleProductToCartActionGroup">
-         <arguments>
-@@ -24,4 +24,38 @@
-         <waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
-         <waitForText userInput="{{quantity}}" selector="{{StorefrontMinicartSection.productCount}}" time="30" stepKey="assertProductCount"/>
-     </actionGroup>
-+
-+    <!-- Add Bundle Product to Cart from the category page -->
-+    <actionGroup name="StorefrontAddBundleProductFromCategoryToCartActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductTitleByName(productName)}}" stepKey="moveMouseOverProduct"/>
-+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName(productName)}}" stepKey="openProductPage"/>
-+        <waitForPageLoad time="30" stepKey="waitForBundleProductPageLoad"/>
-+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomizeAndAddToCart"/>
-+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="clickAddBundleProductToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMinicartSection.productCount}}" stepKey="waitProductCount"/>
-+        <see userInput="You added {{productName}} to your shopping cart." selector="{{StorefrontMessagesSection.success}}" stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+
-+    <!-- Add Bundle Product to Cart from product Page-->
-+    <actionGroup name="StorefrontAddBundleProductFromProductToCartActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomizeAndAddToCart"/>
-+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="clickAddBundleProductToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMinicartSection.productCount}}" stepKey="waitProductCount"/>
-+        <see userInput="You added {{productName}} to your shopping cart." selector="{{StorefrontMessagesSection.success}}" stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+
-+    <!-- Add Bundled Product to Cart with selected multiselect option-->
-+    <actionGroup name="StorefrontAddBundleProductFromProductToCartWithMultiOption" extends="StorefrontAddBundleProductFromProductToCartActionGroup">
-+        <arguments>
-+            <argument name="optionName" type="string"/>
-+            <argument name="value" type="string"/>
-+        </arguments>
-+        <selectOption selector="{{StorefrontBundledSection.multiselectOptionFourProducts(optionName)}}" userInput="{{value}}" stepKey="selectValue" before="clickAddBundleProductToCart"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontSelectBundleProductDropDownOptionActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontSelectBundleProductDropDownOptionActionGroup.xml
-new file mode 100644
-index 00000000000..e6afdce6ab6
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontSelectBundleProductDropDownOptionActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontSelectBundleProductDropDownOptionActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <click selector="{{StorefrontBundleProductActionSection.dropdownSelectOption}}" stepKey="clickOnSelectOption"/>
-+        <click selector="{{StorefrontBundleProductActionSection.dropdownProductSelection(productName)}}"  stepKey="selectProduct"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup.xml
-new file mode 100644
-index 00000000000..cf2ccfac470
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup">
-+        <waitForElementVisible selector="{{StorefrontBundleProductActionSection.customizeAndAddToCartButton}}" stepKey="waitForCustomizeAndAddToCartButton"/>
-+        <click selector="{{StorefrontBundleProductActionSection.customizeAndAddToCartButton}}" stepKey="clickOnCustomizeAndAddToCartButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
-new file mode 100644
-index 00000000000..a00f1e36786
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="VerifyProductTypeOrder">
-+        <seeElement stepKey="seeBundleInOrder" selector="{{AdminProductDropdownOrderSection.bundleProduct}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
-index 7123a573bc2..60d11345731 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="ApiBundleLink" type="bundle_link">
-         <var key="option_id" entityKey="return" entityType="bundle_option"/>
-         <var key="sku" entityKey="sku" entityType="product"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
-index e10fe4e33c2..a53ae9be4b7 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="DropDownBundleOption" type="bundle_option">
-         <data key="title" unique="suffix">bundle-option-dropdown</data>
-         <data key="required">true</data>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/BundleProductsSummaryData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/BundleProductsSummaryData.xml
-new file mode 100644
-index 00000000000..5cd286c0c6a
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Data/BundleProductsSummaryData.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="BundleProductsSummary" type="Quote">
-+        <data key="subtotal">1,968.00</data>
-+        <data key="shipping">5.00</data>
-+        <data key="total">1,973.00</data>
-+        <data key="shippingMethod">Flat Rate - Fixed</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
-index 380b5b89590..256bfd77469 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="CustomAttributeDynamicPrice" type="custom_attribute">
-         <data key="attribute_code">price_type</data>
-         <data key="value">0</data>
-@@ -23,4 +23,12 @@
-         <data key="attribute_code">price_view</data>
-         <data key="value">0</data>
-     </entity>
-+    <entity name="CustomAttributeFixWeight" type="custom_attribute">
-+        <data key="attribute_code">weight_type</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="CustomAttributeFixSku" type="custom_attribute">
-+        <data key="attribute_code">sku_type</data>
-+        <data key="value">1</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
-index f48810e0534..5034c72b9ee 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="BundleProduct" type="product">
-         <data key="name" unique="suffix">BundleProduct</data>
-         <data key="name2" unique="suffix">BundleProduct2</data>
-@@ -23,6 +23,7 @@
-         <data key="urlKey2" unique="suffix">bundleproduct2</data>
-         <data key="default_quantity1">10</data>
-         <data key="default_quantity2">20</data>
-+        <data key="quantity">30</data>
-         <data key="set">4</data>
-         <data key="type">bundle</data>
-         <data key="price">10</data>
-@@ -30,6 +31,22 @@
-         <data key="fixedPriceFormatted">$10.00</data>
-         <data key="defaultAttribute">Default</data>
-     </entity>
-+    <entity name="FixedBundleProduct" type="product2">
-+        <data key="name" unique="suffix">FixedBundleProduct</data>
-+        <data key="sku" unique="suffix">fixed-bundle-product</data>
-+        <data key="type_id">bundle</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="price">1.23</data>
-+        <data key="visibility">4</data>
-+        <data key="status">1</data>
-+        <data key="urlKey" unique="suffix">fixed-bundle-product</data>
-+        <requiredEntity type="custom_attribute">CustomAttributeCategoryIds</requiredEntity>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute">CustomAttributePriceView</requiredEntity>
-+        <requiredEntity type="custom_attribute">CustomAttributeFixPrice</requiredEntity>
-+        <requiredEntity type="custom_attribute">CustomAttributeFixWeight</requiredEntity>
-+        <requiredEntity type="custom_attribute">CustomAttributeFixSku</requiredEntity>
-+    </entity>
-     <entity name="ApiBundleProduct" type="product2">
-         <data key="name" unique="suffix">Api Bundle Product</data>
-         <data key="sku" unique="suffix">api-bundle-product</data>
-@@ -59,4 +76,35 @@
-         <requiredEntity type="custom_attribute">CustomAttributeDynamicPrice</requiredEntity>
-         <requiredEntity type="custom_attribute">CustomAttributePriceViewRange</requiredEntity>
-     </entity>
-+    <entity name="ApiFixedBundleProduct" type="product2">
-+        <data key="name" unique="suffix">Api Fixed Bundle Product</data>
-+        <data key="sku" unique="suffix">api-fixed-bundle-product</data>
-+        <data key="type_id">bundle</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="price">1.23</data>
-+        <data key="visibility">4</data>
-+        <data key="status">1</data>
-+        <data key="urlKey" unique="suffix">api-fixed-bundle-product</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute">ApiProductDescription</requiredEntity>
-+        <requiredEntity type="custom_attribute">ApiProductShortDescription</requiredEntity>
-+        <requiredEntity type="custom_attribute">CustomAttributeFixPrice</requiredEntity>
-+        <requiredEntity type="custom_attribute">CustomAttributePriceView</requiredEntity>
-+    </entity>
-+    <entity name="BundleProductPriceViewRange" type="product2">
-+        <data key="name" unique="suffix">BundleProduct</data>
-+        <data key="sku" unique="suffix">bundle-product</data>
-+        <data key="type_id">bundle</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="status">1</data>
-+        <data key="urlKey" unique="suffix">bundle-product</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute">CustomAttributeCategoryIds</requiredEntity>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute">ApiProductDescription</requiredEntity>
-+        <requiredEntity type="custom_attribute">ApiProductShortDescription</requiredEntity>
-+        <requiredEntity type="custom_attribute">CustomAttributeDynamicPrice</requiredEntity>
-+        <requiredEntity type="custom_attribute">CustomAttributePriceViewRange</requiredEntity>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
-index ca39253aa54..254f542316d 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateBundleLink" dataType="bundle_link" type="create" auth="adminOauth" url="/V1/bundle-products/{sku}/links/{return}" method="POST">
-         <contentType>application/json</contentType>
-         <object dataType="bundle_link" key="linkedProduct">
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml
-index c912ea5eac4..4e1dc7ac9cb 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateBundleOption" dataType="bundle_option" type="create" auth="adminOauth" url="/V1/bundle-products/options/add" method="POST">
-         <contentType>application/json</contentType>
-         <object dataType="bundle_option" key="option">
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml
-index 12cba3fc179..df931c74191 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="GetAllBundleOptions" dataType="bundle_options" type="get" auth="adminOauth" url="/V1/bundle-products/{sku}/options/all" method="GET">
-         <contentType>application/json</contentType>
-     </operation>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml b/app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml
-index cb97521499e..782c97aab1a 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminCatalogProductPage" url="catalog/product/" area="admin" module="Magento_Bundle">
-         <section name="AdminCatalogProductSection"/>
-     </page>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
-index f0048e2fc95..562ded6c8e4 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
-@@ -7,7 +7,7 @@
-  -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
-         <section name="AdminProductFormBundleSection"/>
-     </page>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminOrderBundleProductSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminOrderBundleProductSection.xml
-new file mode 100644
-index 00000000000..915b11ebdbb
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminOrderBundleProductSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+<section name="AdminOrderBundleProductSection">
-+    <element name="bundleProductCheckbox" type="checkbox" selector="(//input[contains(@class, 'admin__control-checkbox') and contains(@class, 'bundle-option')])[{{productNumber}}]" parameterized="true"/>
-+</section>
-+</sections>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductDropdownOrderSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
-new file mode 100644
-index 00000000000..787f7ade8ff
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminProductDropdownOrderSection">
-+        <element name="bundleProduct" type="text" selector="//li[not(preceding-sibling::li[span[@title='Downloadable Product']]) and not(following-sibling::li[span[@title='Simple Product']]) and not(following-sibling::li[span[@title='Configurable Product']]) and not(following-sibling::li[span[@title='Grouped Product']]) and not(following-sibling::li[span[@title='Virtual Product']])]/span[@title='Bundle Product']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
-index 25f1d95dc86..cb6f6c1b56a 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductFormBundleSection">
-         <element name="bundleItemsToggle" type="button" selector="//span[text()='Bundle Items']"/>
-         <element name="shipmentType" type="select" selector=".admin__control-select[name='product[shipment_type]']"/>
-@@ -22,6 +22,8 @@
-         <element name="bundleOptionXProductYQuantity" type="input" selector="[name='bundle_options[bundle_options][{{x}}][bundle_selections][{{y}}][selection_qty]']" parameterized="true"/>
-         <element name="addProductsToOption" type="button" selector="[data-index='modal_set']" timeout="30"/>
-         <element name="nthAddProductsToOption" type="button" selector="//tr[{{var}}]//button[@data-index='modal_set']" timeout="30" parameterized="true"/>
-+        <element name="bundlePriceType" type="select" selector="bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]"/>
-+        <element name="bundlePriceValue" type="input" selector="bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]"/>
-         <!--Select"url Key"InputForm-->
-         <element name="urlKey" type="input" selector="//input[@name='product[url_key]']" timeout="30"/>
-         <!--AddSelectedProducts-->
-@@ -49,7 +51,9 @@
-         <!--NameOfProductOnProductPage-->
-         <element name="bundleProductName" type="text" selector="//*[@id='maincontent']//span[@itemprop='name']"/>
-         <!--EnableDisableToggle-->
--        <element name="enableDisableToggle" type="button" selector="//*[@id='container']//input[@name='product[status]']/.." timeout="30"/>
-+        <element name="enableDisableToggle" type="checkbox" selector="//*[@id='container']//input[@name='product[status]']/.." timeout="30"/>
-+        <element name="enableDisableToggleOn" type="checkbox" selector="//*[@id='container']//input[@name='product[status]' and @value='1']/.."/>
-+        <element name="enableDisableToggleOff" type="checkbox" selector="//*[@id='container']//input[@name='product[status]' and @value='2']/.."/>
-         <!--SearchButton-->
-         <element name="searchButton" type="button" selector="//div[@class='data-grid-search-control-wrap']//*[@type='button']" timeout="30"/>
-         <!--ClickOnFirstProductInCatalog-->
-@@ -61,12 +65,34 @@
-         <element name="listedBundleItem2" type="text" selector="//tr[@data-repeat-index='2']//div"/>
-         <!--FirstProductOption-->
-         <element name="firstProductOption" type="checkbox" selector="//div[@class='admin__data-grid-outer-wrap']//tr[@data-repeat-index='0']//input[@type='checkbox']"/>
-+        <element name="dynamicSkuToggle" type="checkbox" selector="div[data-index='sku_type'] .admin__actions-switch-label" timeout="30"/>
-+        <element name="dynamicPriceToggle" type="checkbox" selector="//div[@data-index='price_type']//div[@data-role='switcher']"/>
-+        <element name="taxClassDropDown" type="select" selector="//select[@name='product[tax_class_id]']" timeout="30"/>
-+        <element name="taxableGoodsOption" type="text" selector="//select[@name='product[tax_class_id]']//option[@data-title='Taxable Goods']"/>
-+        <element name="stockStatusField" type="select" selector="//select[@name='product[quantity_and_stock_status][is_in_stock]']"/>
-+        <element name="inStockOption" type="text" selector="//select[@name='product[quantity_and_stock_status][is_in_stock]']//option[@data-title='{{stock}}']" parameterized="true" timeout="30"/>
-+        <element name="dynamicWeightToggle" type="checkbox" selector="//div[@data-index='weight_type']//div[@data-role='switcher']" timeout="30"/>
-+        <element name="weightField" type="input" selector="//div[@data-index='weight']//input"/>
-+        <element name="categoriesDropDown" type="block" selector="//div[@data-index='category_ids']//div[@class='admin__field-control']" timeout="30"/>
-+        <element name="defaultCategory" type="text" selector="//div[@data-index='category_ids']//span[contains(text(), 'Default Category')]"/>
-+        <element name="visibilityDropDown" type="select" selector="//select[@name='product[visibility]']"/>
-+        <element name="catalogOption1" type="text" selector="//select[@name='product[visibility]']//option[1]"/>
-+        <element name="catalogOption2" type="text" selector="//select[@name='product[visibility]']//option[2]"/>
-+        <element name="fromDate" type="input" selector="//div[@data-index='news_from_date']//input"/>
-+        <element name="toDate" type="input" selector="//div[@data-index='news_to_date']//input"/>
-+        <element name="countryOfManufactureDropDown" type="select" selector="//select[@name='product[country_of_manufacture]']"/>
-+        <element name="selectCountryOfManufacture" type="text" selector="//select[@name='product[country_of_manufacture]']//option[@data-title='{{country}}']" parameterized="true"/>
-+        <element name="dynamicSkuToggleOn" type="checkbox" selector="//div[@data-index='sku_type']//div[@data-role='switcher']//input[@value='0']"/>
-+        <element name="dynamicSkuToggleOff" type="checkbox" selector="//div[@data-index='sku_type']//div[@data-role='switcher']//input[@value='1']"/>
-+        <element name="dynamicWeightToggleOn" type="checkbox" selector="//div[@data-index='weight_type']//div[@data-role='switcher']//input[@value='0']"/>
-+        <element name="dynamicWeightToggleOff" type="checkbox" selector="//div[@data-index='weight_type']//div[@data-role='switcher']//input[@value='1']"/>
-+        <element name="categoryFieldName" type="text" selector="//fieldset[@data-index='container_category_ids']//label//span" timeout="30"/>
-+        <element name="categoryDone" type="button" selector=".admin__action-multiselect-actions-wrap [type='button'] span" timeout="30"/>
-+        <element name="dynamicPriceToggleOff" type="checkbox" selector="//div[@data-index='price_type']//div[@data-role='switcher']//input[@value='1']"/>
-         <!--Category Selection-->
--        <element name="categoriesDropDown" type="multiselect" selector="//div[@data-index='category_ids']//div" timeout="30"/>
--        <element name="defaultCategory" type="multiselect" selector="//div[@data-index='category_ids']//span[contains(text(), 'Default Category')]"/>
-         <element name="categoryByName" type="multiselect" selector="//div[@data-index='category_ids']//span[contains(text(), '{{category}}')]" parameterized="true"/>
-         <element name="searchForCategory" type="input" selector="div.action-menu._active > div.admin__action-multiselect-search-wrap input" timeout="30"/>
--        <element name="selectCategory" type="multiselect" selector="//div[@class='action-menu _active']//label[@class='admin__action-multiselect-label']"/>
-+        <element name="selectCategory" type="multiselect" selector="//div[@class='action-menu _active']//label[@class='admin__action-multiselect-label']" timeout="30"/>
-         <element name="categoriesLabel" type="text" selector="//div[@class='action-menu _active']//button[@data-action='close-advanced-select']"/>
-         <element name="userDefinedQuantity" type="checkbox" selector="[name='bundle_options[bundle_options][{{option}}][bundle_selections][{{product}}][selection_can_change_qty]'][type='checkbox']" parameterized="true"/>
-     </section>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/BundleStorefrontSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/BundleStorefrontSection.xml
-index 1a8709bd84e..7a188fd58e1 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Section/BundleStorefrontSection.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Section/BundleStorefrontSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="BundleStorefrontSection">
-         <!--TestingForLocationOfOptions-->
-         <element name="bundleOptionSelector" type="checkbox" selector="//*[@id='bundle-slide']/span" timeout="30"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
-index f724f9bbfe1..c47cf6095c7 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
-@@ -7,8 +7,10 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontBundledSection">
-+        <element name="productCheckbox" type="select" selector="//*[@id='customizeTitle']/following-sibling::div[{{arg1}}]//div[{{arg2}}][@class='field choice']/input" parameterized="true"/>
-+        <element name="bundleProductsPrice" type="text" selector="//*[@class='bundle-info']//*[contains(@id,'product-price')]/span"/>
-         <element name="nthBundledOption" type="input" selector=".option:nth-of-type({{numOption}}) .choice:nth-of-type({{numOptionSelect}}) input" parameterized="true"/>
-         <element name="addToCart" type="button" selector="#bundle-slide" timeout="30"/>
-         <element name="addToCartConfigured" type="button" selector="#product-addtocart-button" timeout="30"/>
-@@ -24,10 +26,17 @@
-         <element name="bundleProductName" type="text" selector="//*[@id='maincontent']//span[@itemprop='name']"/>
-         <element name="pageNotFound" type="text" selector="//h1[@class='page-title']//span[contains(., 'Whoops, our bad...')]"/>
-         <element name="dropDownOptionOneProducts" type="select" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//select" parameterized="true"/>
-+        <element name="dropDownOptionTierPrices" type="text" selector="//label//span[contains(text(), '{{optionName}}')]/../..//div[@class='control']//div[@class='option-tier-prices']" parameterized="true"/>
-+        <element name="productInBundle" type="select" selector="//label//span[contains(text(), '{{productName}}')]" parameterized="true"/>
-         <element name="dropDownOptionOneQuantity" type="input" selector="//span[contains(text(), '{{productName}}')]/../..//input" parameterized="true"/>
-         <element name="radioButtonOptionTwoProducts" type="checkbox" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field choice'][{{productNumber}}]/input" parameterized="true"/>
-         <element name="radioButtonOptionTwoQuantity" type="input" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field qty qty-holder']//input" parameterized="true"/>
-+        <element name="radioButtonOptionLabel" type="text" selector="//label//span[contains(text(), '{{optionName}}')]/../..//div[@class='control']//div[@class='field choice']//label[contains(.,'{{productName}}')]" parameterized="true"/>
-         <element name="checkboxOptionThreeProducts" type="checkbox" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field choice'][{{productNumber}}]/input" parameterized="true"/>
-+        <element name="checkboxOptionLabel" type="text" selector="//label//span[contains(text(), '{{optionName}}')]/../..//div[@class='control']//div[@class='field choice']//label[contains(.,'{{productName}}')]" parameterized="true"/>
-         <element name="multiselectOptionFourProducts" type="multiselect" selector="//label//span[contains(text(), '{{productName}}')]/../..//select[@multiple='multiple']" parameterized="true"/>
-+        <element name="currencyTrigger" type="select" selector="#switcher-currency-trigger" timeout="30"/>
-+        <element name="currency" type="select" selector="//a[text()='{{arg}}']" parameterized="true"/>
-+        <element name="multiSelectOption" type="select" selector="//div[@class='field option  required']//select"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml
-index c76f822a091..3d5dc61d88a 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCategoryProductSection">
-         <element name="priceToByProductId" type="text" selector="div[data-product-id='{{id}}'] .price-to" parameterized="true"/>
-         <element name="priceFromByProductId" type="text" selector="div[data-product-id='{{id}}'] .price-from" parameterized="true"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductActionSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductActionSection.xml
-index abc9bc6dab5..eb92fd37564 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductActionSection.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductActionSection.xml
-@@ -6,10 +6,12 @@
-   */
- -->
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontBundleProductActionSection">
--        <element name="customizeAndAddToCartButton" type="button" selector="#bundle-slide"/>
-+        <element name="customizeAndAddToCartButton" type="button" selector="#bundle-slide" timeout="30"/>
-         <element name="quantityField" type="input" selector="#qty"/>
--        <element name="addToCartButton" type="button" selector="#product-addtocart-button"/>
-+        <element name="addToCartButton" type="button" selector="#product-addtocart-button" timeout="30"/>
-+        <element name="dropdownSelectOption" type="select" selector="//div[@class='control']/select"/>
-+        <element name="dropdownProductSelection" type="select" selector="//div[@class='control']/select/option[contains(.,'{{productName}}')]" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-index 41c00b5eda1..fae1ec331b6 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-@@ -7,11 +7,12 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductInfoMainSection">
-         <element name="priceFrom" type="text" selector=".product-info-price .price-from"/>
-         <element name="priceTo" type="text" selector=".product-info-price .price-to"/>
-         <element name="minPrice" type="text" selector="span[data-price-type='minPrice']"/>
-         <element name="maxPrice" type="text" selector="span[data-price-type='minPrice']"/>
-+        <element name="productBundleOptionsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/../input" parameterized="true" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
-index d94e196ea5a..401d360a34c 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddBundleItemsTest">
-         <annotations>
-             <features value="Bundle"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
-index e1f90790b30..21e6be98b31 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddDefaultImageBundleProductTest">
-         <annotations>
-             <features value="Bundle"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml
-new file mode 100644
-index 00000000000..c49202f31ae
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml
-@@ -0,0 +1,66 @@
-+<?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="AdminAddDefaultVideoBundleProductTest" extends="AdminAddDefaultVideoSimpleProductTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="Add/remove images and videos for all product types and category"/>
-+            <title value="Admin should be able to add default video for a Bundle Product"/>
-+            <description value="Admin should be able to add default video for a Bundle Product"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-110"/>
-+            <group value="Bundle"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+        </after>
-+
-+        <!-- Create a bundle product -->
-+        <!-- Replacing steps in base AdminAddDefaultVideoSimpleProductTest -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillMainProductForm">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add two bundle items -->
-+        <scrollTo selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" x="0" y="-100" stepKey="scrollToSection" after="addProductVideo"/>
-+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="openBundleSection" after="scrollToSection"/>
-+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption" after="openBundleSection"/>
-+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleTitle" after="clickAddOption"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillBundleTitle" after="waitForBundleTitle"/>
-+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectOptionBundleTitle" after="fillBundleTitle"/>
-+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProducts" after="selectOptionBundleTitle"/>
-+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProducts" after="waitForAddProducts"/>
-+        <waitForPageLoad stepKey="waitForPageLoad" after="clickAddProducts"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku1" after="waitForPageLoad">
-+            <argument name="product" value="$$simpleProduct1$$"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="checkOption1" after="filterProductGridBySku1"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku2" after="checkOption1">
-+            <argument name="product" value="$$simpleProduct2$$"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="checkOption2" after="filterProductGridBySku2"/>
-+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="addProducts" after="checkOption2"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillQty1" after="addProducts"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillQty2" before="saveProductForm"/>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
-index 795982eb4b9..1d2f21b7d15 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAttributeSetSelectionTest">
-         <annotations>
-             <features value="Bundle"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml
-new file mode 100644
-index 00000000000..c6a07f7ed95
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml
-@@ -0,0 +1,189 @@
-+<?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="AdminBasicBundleProductAttributesTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="Create/Edit bundle product in Admin"/>
-+            <title value="Admin should be able to set/edit all the basic product attributes when creating/editing a bundle product"/>
-+            <description value="Admin should be able to set/edit all the basic product attributes when creating/editing a bundle product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-222"/>
-+            <group value="Bundle"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-+        </after>
-+        <!--Create attribute set-->
-+        <actionGroup ref="CreateDefaultAttributeSet" stepKey="createDefaultAttributeSet">
-+            <argument name="label" value="{{ProductAttributeFrontendLabel.label}}"/>
-+        </actionGroup>
-+
-+        <!--Go to product creation page-->
-+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
-+        <waitForPageLoad stepKey="waitForBundleProductCreationPage"/>
-+
-+        <!--Enable/Disable Toggle-->
-+        <checkOption selector="{{AdminProductFormBundleSection.enableDisableToggle}}" stepKey="clickOnEnableDisableToggle"/>
-+
-+        <!--Fill out product attributes-->
-+        <actionGroup ref="SetBundleProductAttributes" stepKey="fillOutAllAttributes">
-+            <!--primarily uses default values-->
-+            <argument name="attributeSet" value="{{ProductAttributeFrontendLabel.label}}"/>
-+            <argument name="bundleProductName" value="{{BundleProduct.name}}"/>
-+            <argument name="bundleProductSku" value="{{BundleProduct.sku}}"/>
-+            <argument name="visibilty" value="catalog"/>
-+        </actionGroup>
-+
-+        <!--Verify form was filled out correctly-->
-+
-+        <!--Enable/Disable Toggle check-->
-+        <dontSeeCheckboxIsChecked selector="{{AdminProductFormBundleSection.enableDisableToggle}}" stepKey="seeToggleIsOff"/>
-+
-+        <!--Apply Attribute Set-->
-+        <seeOptionIsSelected selector="{{AdminProductFormSection.attributeSet}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeSet"/>
-+
-+        <!--Product name and SKU-->
-+        <seeInField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="seeProductSku"/>
-+
-+        <!--Dynamic SKU Toggle-->
-+        <dontSeeCheckboxIsChecked selector="{{AdminProductFormBundleSection.dynamicSkuToggle}}" stepKey="seeDynamicSkuToggleOff"/>
-+
-+        <!--Dynamic Price Toggle-->
-+        <dontSeeCheckboxIsChecked selector="{{AdminProductFormBundleSection.dynamicPriceToggle}}" stepKey="seeDynamicPriceToggleOff"/>
-+
-+        <!--Tax Class-->
-+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.taxClassDropDown}}" userInput="Taxable Goods" stepKey="seeCorrectTaxClass"/>
-+
-+        <!--Fill out price-->
-+        <seeInField selector="{{AdminProductFormBundleSection.priceField}}" userInput="10" stepKey="seePrice"/>
-+
-+        <!--Stock status-->
-+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.stockStatusField}}" userInput="In Stock" stepKey="seeStockStatus"/>
-+
-+        <!--Dynamic weight-->
-+        <dontSeeCheckboxIsChecked selector="{{AdminProductFormBundleSection.dynamicWeightToggle}}" stepKey="seeDynamicWeightOff"/>
-+
-+        <!--Weight-->
-+        <seeInField selector="{{AdminProductFormBundleSection.weightField}}" userInput="10" stepKey="seeWeight"/>
-+
-+        <!--Visibilty-->
-+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.visibilityDropDown}}" userInput="Catalog" stepKey="seeVisibility"/>
-+
-+        <!--Categories-->
-+        <seeElement selector="{{AdminProductFormBundleSection.defaultCategory}}" stepKey="seeDefaultCategory"/>
-+
-+        <!--New from - to-->
-+        <seeInField selector="{{AdminProductFormBundleSection.fromDate}}" userInput="10/10/2018" stepKey="seeFirstDate"/>
-+        <seeInField selector="{{AdminProductFormBundleSection.toDate}}" userInput="10/10/2018" stepKey="seeSecondDate"/>
-+
-+        <!--Country of manufacture-->
-+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="Italy" stepKey="seeCountryOfManufacture"/>
-+
-+        <!--Create second attribute set for edit-->
-+        <actionGroup ref="CreateDefaultAttributeSet" stepKey="createSecondAttributeSet">
-+            <argument name="label" value="{{ProductAttributeFrontendLabelTwo.label}}"/>
-+        </actionGroup>
-+
-+        <!--Filter catalog-->
-+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToCatalogProductPage"/>
-+        <waitForPageLoad stepKey="WaitForPageToLoad"/>
-+        <actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductFiltersSection.attributeSetOfFirstRow(ProductAttributeFrontendLabel.label)}}" stepKey="clickAttributeSet2"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+
-+        <!--Edit fields-->
-+
-+        <!--Enable/Disable Toggle-->
-+        <checkOption selector="{{AdminProductFormBundleSection.enableDisableToggle}}" stepKey="clickOnEnableDisableToggleAgain"/>
-+
-+        <!--Apply Attribute Set-->
-+        <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
-+        <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{ProductAttributeFrontendLabelTwo.label}}" stepKey="searchForAttrSet"/>
-+        <click selector="{{AdminProductFormSection.attributeSetFilterResultByName(ProductAttributeFrontendLabelTwo.label)}}" stepKey="selectAttrSet"/>
-+
-+        <!--Product name and SKU-->
-+        <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name2}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku2}}" stepKey="fillProductSku"/>
-+        <click selector="{{AdminProductFormBundleSection.productName}}" stepKey="clickUnselectField"/>
-+
-+        <!--Dynamic SKU Toggle-->
-+        <checkOption selector="{{AdminProductFormBundleSection.dynamicSkuToggle}}" stepKey="clickOnToggle"/>
-+        <click selector="{{AdminProductFormBundleSection.productName}}" stepKey="clickUnselectFieldAgain"/>
-+
-+        <!--Fill out price-->
-+        <fillField selector="{{AdminProductFormBundleSection.priceField}}" userInput="20" stepKey="fillOutPrice"/>
-+
-+        <!--Stock status-->
-+        <selectOption selector="{{AdminProductFormBundleSection.stockStatusField}}" userInput="Out of Stock" stepKey="stockStatus"/>
-+
-+        <!--Dynamic weight-->
-+        <checkOption selector="{{AdminProductFormBundleSection.dynamicWeightToggle}}" stepKey="dynamicWeight"/>
-+
-+        <!--Visibilty-->
-+        <selectOption selector="{{AdminProductFormBundleSection.visibilityDropDown}}" userInput="Not Visible Individually" stepKey="openVisibility"/>
-+
-+        <!--New from - to-->
-+        <fillField selector="{{AdminProductFormBundleSection.fromDate}}" userInput="10/20/2018" stepKey="fillInFirstDate"/>
-+        <fillField selector="{{AdminProductFormBundleSection.toDate}}" userInput="10/20/2018" stepKey="fillInSecondDate"/>
-+
-+        <!--Country of manufacture-->
-+        <selectOption selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="France" stepKey="countryOfManufactureDropDown"/>
-+
-+        <!--Save the product-->
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
-+
-+        <!--Verify form was filled out correctly after edit-->
-+
-+        <!--Enable/Disable Toggle-->
-+        <seeElement selector="{{AdminProductFormBundleSection.enableDisableToggleOn}}" stepKey="seeToggleIsOn2"/>
-+
-+        <!--Attribute Set-->
-+        <seeOptionIsSelected selector="{{AdminProductFormSection.attributeSet}}" userInput="{{ProductAttributeFrontendLabelTwo.label}}" stepKey="seeAttributeSet2"/>
-+
-+        <!--Product name and SKU-->
-+        <seeInField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name2}}" stepKey="seeProductName2"/>
-+        <seeInField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku2}}" stepKey="seeProductSku2"/>
-+
-+        <!--Dynamic SKU Toggle-->
-+        <seeElement selector="{{AdminProductFormBundleSection.dynamicSkuToggleOn}}" stepKey="seeDynamicSkuToggleOn2"/>
-+
-+        <!--Tax Class-->
-+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.taxClassDropDown}}" userInput="Taxable Goods" stepKey="seeCorrectTaxClass2"/>
-+
-+        <!--Price-->
-+        <seeInField selector="{{AdminProductFormBundleSection.priceField}}" userInput="20" stepKey="seePrice2"/>
-+
-+        <!--Stock status-->
-+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.stockStatusField}}" userInput="Out of Stock" stepKey="seeStockStatus2"/>
-+
-+        <!--Dynamic weight-->
-+        <seeElement selector="{{AdminProductFormBundleSection.dynamicWeightToggleOn}}" stepKey="seeDynamicWeightOn2"/>
-+
-+        <!--Visibilty-->
-+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.visibilityDropDown}}" userInput="Not Visible Individually" stepKey="seeVisibility2"/>
-+
-+        <!--Categories-->
-+        <seeElement selector="{{AdminProductFormBundleSection.categoriesDropDown}}" stepKey="seeDefaultCategory2"/>
-+
-+        <!--New from - to-->
-+        <seeInField selector="{{AdminProductFormBundleSection.fromDate}}" userInput="10/20/2018" stepKey="seeFirstDate2"/>
-+        <seeInField selector="{{AdminProductFormBundleSection.toDate}}" userInput="10/20/2018" stepKey="seeSecondDate2"/>
-+
-+        <!--Country of manufacture-->
-+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="France" stepKey="seeCountryOfManufacture2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminBundleProductSetEditContentTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBundleProductSetEditContentTest.xml
-new file mode 100644
-index 00000000000..65733a5bcc0
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBundleProductSetEditContentTest.xml
-@@ -0,0 +1,40 @@
-+<?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="AdminBundleProductSetEditContentTest" extends="AdminSimpleProductSetEditContentTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="Create/Edit bundle product in Admin"/>
-+            <title value="Admin should be able to set/edit product Content when editing a bundle product"/>
-+            <description value="Admin should be able to set/edit product Content when editing a bundle product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3343"/>
-+            <group value="Bundle"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+        <after>
-+            <!-- Delete bundle product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="BundleProduct"/>
-+            </actionGroup>
-+        </after>
-+
-+        <!-- Create product -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+
-+        <!--Checking content storefront-->
-+        <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml
-index bf62212babd..86db6f372b5 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminDeleteABundleProduct">
-         <annotations>
-             <features value="Bundle"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
-new file mode 100644
-index 00000000000..a4e26256e97
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
-@@ -0,0 +1,55 @@
-+<?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="AdminDeleteBundleDynamicProductTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="Delete products"/>
-+            <title value="Delete Bundle Dynamic Product"/>
-+            <description value="Admin should be able to delete a bundle dynamic product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11016"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16393"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createDynamicBundleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteBundleProductFilteredBySkuAndName">
-+            <argument name="product" value="$$createDynamicBundleProduct$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
-+        <!-- Verify product on Product Page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createDynamicBundleProduct.name$$)}}" stepKey="amOnBundleProductPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
-+        <!-- Search for the product by sku -->
-+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createDynamicBundleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-+        <waitForPageLoad stepKey="waitForSearchButton"/>
-+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForSearchResults"/>
-+         <!-- Should not see any search results -->
-+        <dontSee userInput="$$createDynamicBundleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
-+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
-+        <!-- Go to the category page that we created in the before block -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-+        <!-- Should not see the product -->
-+        <dontSee userInput="$$createDynamicBundleProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
-+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml
-new file mode 100644
-index 00000000000..2527dae7ead
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml
-@@ -0,0 +1,52 @@
-+<?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="AdminDeleteBundleFixedProductTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="Delete products"/>
-+            <title value="Delete Bundle Fixed Product"/>
-+            <description value="Admin should be able to delete a bundle fixed product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11017"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="FixedBundleProduct" stepKey="createFixedBundleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteBundleProductFilteredBySkuAndName">
-+            <argument name="product" value="$$createFixedBundleProduct$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
-+        <!-- Verify product on Product Page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createFixedBundleProduct.name$$)}}" stepKey="amOnBundleProductPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
-+        <!-- Search for the product by sku -->
-+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createFixedBundleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-+        <waitForPageLoad stepKey="waitForSearchButton"/>
-+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForSearchResults"/>
-+        <!-- Should not see any search results -->
-+        <dontSee userInput="$$createFixedBundleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
-+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
-+        <!-- Go to the category page that we created in the before block -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-+        <!-- Should not see the product -->
-+        <dontSee userInput="$$createFixedBundleProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
-+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
-new file mode 100644
-index 00000000000..08faa9d2444
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
-@@ -0,0 +1,78 @@
-+<?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="AdminEditRelatedBundleProductTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="Create/Edit bundle product in Admin"/>
-+            <title value="Admin should be able to set/edit Related Products information when editing a bundle product"/>
-+            <description value="Admin should be able to set/edit Related Products information when editing a bundle product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3342"/>
-+            <group value="Bundle"/>
-+        </annotations>
-+        <before>
-+            <!--Admin login-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct0"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-+        </before>
-+        <after>
-+            <!-- Delete the bundled product -->
-+            <actionGroup stepKey="deleteBundle" ref="deleteProductUsingProductGrid">
-+                <argument name="product" value="BundleProduct"/>
-+            </actionGroup>
-+            <!--Logging out-->
-+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-+            <deleteData createDataKey="simpleProduct0" stepKey="deleteSimpleProduct0"/>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+        </after>
-+
-+        <!-- Create a bundle product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillBundleProductNameAndSku">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="addRelatedProductBySku" stepKey="addRelatedProduct0">
-+            <argument name="sku" value="$$simpleProduct0.sku$$"/>
-+        </actionGroup>
-+
-+        <!--Save the product-->
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-+
-+        <actionGroup ref="addRelatedProductBySku" stepKey="addRelatedProduct1">
-+            <argument name="sku" value="$$simpleProduct1.sku$$"/>
-+        </actionGroup>
-+
-+        <!--Remove previous related product-->
-+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.removeRelatedProduct($$simpleProduct0.sku$$)}}" stepKey="removeRelatedProduct"/>
-+
-+        <!--Save the product-->
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAfterEdit"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
-+
-+        <!--See related product in admin-->
-+        <scrollTo selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" stepKey="scrollTo"/>
-+        <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedSee"/>
-+        <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedRelatedProduct}}" userInput="$$simpleProduct1.sku$$" stepKey="seeRelatedProduct"/>
-+
-+        <!--See related product in storefront-->
-+        <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
-+        <waitForPageLoad stepKey="waitForStorefront"/>
-+        <see userInput="$$simpleProduct1.sku$$" stepKey="seeRelatedProductInStorefront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml
-index 9faf9e69bc8..40a6e1b75c6 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminFilterProductListByBundleProduct">
-         <annotations>
-             <features value="Bundle"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
-index 6cb86d80283..2f891fcc8f1 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminMassDeleteBundleProductsTest">
-         <annotations>
-             <features value="Bundle"/>
-@@ -99,8 +99,8 @@
-         <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku2}}" stepKey="fillProductSku2"/>
- 
-         <!--Trigger SEO drop down-->
--        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed2"/>
--        <waitForPageLoad stepKey="WaitForDropDownSEO"/>
-+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="moveToSEOSection"/>
-+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.urlKey}}" visible="false" stepKey="openDropDownIfClosed"/>
- 
-         <!--Fill URL input-->
-         <fillField userInput="{{BundleProduct.urlKey2}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension2"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
-index 643f13dfd61..1f46e1fc9f0 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminProductBundleCreationTest">
-         <annotations>
-             <features value="Bundle"/>
-@@ -31,6 +31,8 @@
-             <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
-             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndexPage"/>
-+            <actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteAllProducts"/>
-             <actionGroup ref="logout" stepKey="logout"/>
-         </after>
-         <!-- go to bundle product creation page-->
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
-index ccd729ac841..1438958b92b 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminRemoveDefaultImageBundleProductTest">
-         <annotations>
-             <features value="Bundle"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml
-new file mode 100644
-index 00000000000..d050c5443d1
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml
-@@ -0,0 +1,66 @@
-+<?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="AdminRemoveDefaultVideoBundleProductTest"  extends="AdminRemoveDefaultVideoSimpleProductTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="Add/remove images and videos for all product types and category"/>
-+            <title value="Admin should be able to remove default video from a Bundle Product"/>
-+            <description value="Admin should be able to remove default video from a Bundle Product"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-205"/>
-+            <group value="Bundle"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+        </after>
-+
-+        <!-- Create a bundle product -->
-+        <!-- Replacing steps in base AdminRemoveDefaultVideoSimpleProductTest -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillMainProductForm">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add two bundle items -->
-+        <scrollTo selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" x="0" y="-100" stepKey="scrollToSection" after="addProductVideo"/>
-+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="openBundleSection" after="scrollToSection"/>
-+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption" after="openBundleSection"/>
-+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleTitle" after="clickAddOption"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillBundleTitle" after="waitForBundleTitle"/>
-+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectOptionBundleTitle" after="fillBundleTitle"/>
-+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProducts" after="selectOptionBundleTitle"/>
-+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProducts" after="waitForAddProducts"/>
-+        <waitForPageLoad stepKey="waitForPageLoad" after="clickAddProducts"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku1" after="waitForPageLoad">
-+            <argument name="product" value="$$simpleProduct1$$"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="checkOption1" after="filterProductGridBySku1"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku2" after="checkOption1">
-+            <argument name="product" value="$$simpleProduct2$$"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="checkOption2" after="filterProductGridBySku2"/>
-+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="addProducts" after="checkOption2"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillQty1" after="addProducts"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillQty2" before="saveProductForm"/>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
-new file mode 100644
-index 00000000000..52bce676008
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
-@@ -0,0 +1,195 @@
-+<?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="AdvanceCatalogSearchBundleByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Bundle product with product name"/>
-+            <description value="Guest customer should be able to advance search Bundle product with product name"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-139"/>
-+            <group value="Bundle"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
-+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-+            <createData entity="ApiBundleProduct" stepKey="product"/>
-+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="simple1"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="simple2"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+    <test name="AdvanceCatalogSearchBundleBySkuTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Bundle product with product sku"/>
-+            <description value="Guest customer should be able to advance search Bundle product with product sku"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-143"/>
-+            <group value="Bundle"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
-+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-+            <createData entity="ApiBundleProduct" stepKey="product"/>
-+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="simple1"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="simple2"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+    <test name="AdvanceCatalogSearchBundleByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Bundle product with product description"/>
-+            <description value="Guest customer should be able to advance search Bundle product with product description"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-242"/>
-+            <group value="Bundle"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
-+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-+            <createData entity="ApiBundleProduct" stepKey="product"/>
-+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="simple1"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="simple2"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+    <test name="AdvanceCatalogSearchBundleByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Bundle product with product short description"/>
-+            <description value="Guest customer should be able to advance search Bundle product with product short description"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-250"/>
-+            <group value="Bundle"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
-+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-+            <createData entity="ApiBundleProduct" stepKey="product"/>
-+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="simple1"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="simple2"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+    <test name="AdvanceCatalogSearchBundleByPriceTest" extends="AdvanceCatalogSearchSimpleProductByPriceTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Bundle product with product price"/>
-+            <description value="Guest customer should be able to advance search Bundle product with product price"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-251"/>
-+            <group value="Bundle"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
-+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-+            <createData entity="ApiBundleProduct" stepKey="product"/>
-+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="simple1"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="simple2"/>
-+            </createData>
-+            <getData entity="GetProduct" stepKey="arg1">
-+                <requiredEntity createDataKey="product"/>
-+            </getData>
-+            <getData entity="GetProduct" stepKey="arg2">
-+                <requiredEntity createDataKey="simple1"/>
-+            </getData>
-+            <getData entity="GetProduct" stepKey="arg3">
-+                <requiredEntity createDataKey="simple2"/>
-+            </getData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
-index a579460906d..c922b981aec 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="BundleProductFixedPricingTest">
-         <annotations>
-             <features value="Bundle"/>
-@@ -31,6 +31,10 @@
-             <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
-             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+            <!-- Delete the bundled product we created in the test body -->
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteBundleProduct">
-+                <argument name="sku" value="{{BundleProduct.sku}}"/>
-+            </actionGroup>
-             <actionGroup ref="logout" stepKey="logout"/>
-         </after>
-         <!--Go to bundle product creation page-->
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
-new file mode 100644
-index 00000000000..ded8bb3c833
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
-@@ -0,0 +1,83 @@
-+<?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="CurrencyChangingBundleProductInCartTest">
-+            <annotations>
-+                <features value="Bundle"/>
-+                <stories value="Check that after changing currency price of cart is correct when the bundle product added to the cart"/>
-+                <title value="User should be able change the currency and get right price in cart when the bundle product added to the cart"/>
-+                <description value="User should be able change the currency and add one more product in cart and get right price in previous currency"/>
-+                <severity value="MAJOR"/>
-+                <testCaseId value="MAGETWO-94467"/>
-+                <group value="Bundle"/>
-+            </annotations>
-+            <before>
-+                <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+                <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-+                <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
-+            </before>
-+            <after>
-+                <!-- Delete the bundled product -->
-+                <actionGroup stepKey="deleteBundle" ref="deleteProductUsingProductGrid">
-+                    <argument name="product" value="BundleProduct"/>
-+                </actionGroup>
-+                <actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFiltersAfter"/>
-+                <waitForPageLoad stepKey="waitForClearFilter"/>
-+                <!--Clear Configs-->
-+                <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-+                <waitForPageLoad stepKey="waitForAdminLoginPageLoad"/>
-+                <amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage"/>
-+                <waitForPageLoad stepKey="waitForConfigCurrencySetupPageForUnselectEuroCurrency"/>
-+                <unselectOption selector="{{CurrencySetupSection.allowCurrencies}}" userInput="Euro" stepKey="unselectEuro"/>
-+                <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+                <click selector="{{CurrencySetupSection.currencyOptions}}" stepKey="closeOptions"/>
-+                <waitForPageLoad stepKey="waitForCloseOptions"/>
-+                <click stepKey="saveUnselectedConfigs" selector="{{AdminConfigSection.saveButton}}"/>
-+                <amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
-+                <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+                <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+            </after>
-+            <!--Go to bundle product creation page-->
-+            <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
-+            <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
-+            <actionGroup ref="fillMainBundleProductForm" stepKey="fillMainFieldsForBundle"/>
-+            <!-- Add Option, a "Radio Buttons" type option -->
-+            <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts2">
-+                <argument name="x" value="0"/>
-+                <argument name="n" value="1"/>
-+                <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
-+                <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
-+                <argument name="optionTitle" value="Option"/>
-+                <argument name="inputType" value="radio"/>
-+            </actionGroup>
-+            <checkOption selector="{{AdminProductFormBundleSection.userDefinedQuantity('0', '0')}}" stepKey="userDefinedQuantitiyOptionProduct0"/>
-+            <checkOption selector="{{AdminProductFormBundleSection.userDefinedQuantity('0', '1')}}" stepKey="userDefinedQuantitiyOptionProduct1"/>
-+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+            <amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage"/>
-+            <waitForPageLoad stepKey="waitForConfigCurrencySetupPage"/>
-+            <conditionalClick selector="{{CurrencySetupSection.currencyOptions}}" dependentSelector="{{CurrencySetupSection.allowCurrencies}}" visible="false" stepKey="openOptions"/>
-+            <waitForPageLoad stepKey="waitForOptions"/>
-+            <selectOption selector="{{CurrencySetupSection.allowCurrencies}}" parameterArray="['Euro', 'US Dollar']" stepKey="selectCurrencies"/>
-+            <click stepKey="saveConfigs" selector="{{AdminConfigSection.saveButton}}"/>
-+            <!-- Go to storefront BundleProduct -->
-+            <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
-+            <waitForPageLoad stepKey="waitForStorefront"/>
-+            <actionGroup ref="StoreFrontAddProductToCartFromBundleWithCurrencyActionGroup" stepKey="addProduct1ToCartAndChangeCurrencyToEuro">
-+                <argument name="product" value="$$simpleProduct1$$"/>
-+                <argument name="currency" value="EUR - Euro"/>
-+            </actionGroup>
-+            <actionGroup ref="StoreFrontAddProductToCartFromBundleWithCurrencyActionGroup" stepKey="addProduct2ToCartAndChangeCurrencyToUSD">
-+                <argument name="product" value="$$simpleProduct2$$"/>
-+                <argument name="currency" value="USD - US Dollar"/>
-+            </actionGroup>
-+            <click stepKey="openMiniCart" selector="{{StorefrontMinicartSection.showCart}}"/>
-+            <waitForPageLoad stepKey="waitForMiniCart"/>
-+            <see stepKey="seeCartSubtotal" userInput="$12,300.00"/>
-+        </test>
-+</tests>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
-index 7a7b4673eda..0cfd1f99a8c 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EnableDisableBundleProductStatusTest">
-         <annotations>
-             <features value="Bundle"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-index 9402d1d4801..9040d675be3 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-         <test name="EndToEndB2CAdminTest">
-             <!--Create Bundle Product-->
-             <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle" after="seeSimpleProductInGrid"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
-index 89867341e96..ff192538637 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="MassEnableDisableBundleProductsTest">
-         <annotations>
-             <features value="Bundle"/>
-@@ -17,9 +17,6 @@
-             <severity value="CRITICAL"/>
-             <testCaseId value="MC-217"/>
-             <group value="Bundle"/>
--            <skip>
--                <issueId value="MAGETWO-92898"/>
--            </skip>
-         </annotations>
-         <before>
-             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-@@ -63,15 +60,7 @@
-         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
-         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
- 
--        <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillProductName"/>
--        <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
--
--        <!--Trigger SEO drop down-->
--        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed"/>
--        <waitForPageLoad stepKey="WaitForDropDownSEO"/>
--
--        <!--Fill URL input-->
--        <fillField userInput="{{BundleProduct.urlKey}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension"/>
-+        <actionGroup ref="AncillaryPrepBundleProduct" stepKey="createBundledProductForTwoSimpleProducts"/>
- 
-         <!--Save the product-->
-         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
-@@ -107,7 +96,8 @@
-         <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku2}}" stepKey="fillProductSku2"/>
- 
-         <!--Trigger SEO drop down-->
--        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed2"/>
-+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="moveToSEOSection"/>
-+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.urlKey}}" visible="false" stepKey="openDropDownIfClosed"/>
-         <waitForPageLoad stepKey="WaitForDropDownSEO2"/>
- 
-         <!--Fill URL input-->
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml
-index 8a0a1ceaf52..e0a6a9afd64 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="NewBundleProductSelectionTest">
-         <annotations>
-             <features value="Bundle"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml
-new file mode 100644
-index 00000000000..8efe32a7d84
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml
-@@ -0,0 +1,76 @@
-+<?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="NewProductsListWidgetBundleProductTest" extends="NewProductsListWidgetTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="New products list widget"/>
-+            <title value="Admin should be able to set Bundle Product as new so that it shows up in the Catalog New Products List Widget"/>
-+            <description value="Admin should be able to set Bundle Product as new so that it shows up in the Catalog New Products List Widget"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-123"/>
-+            <group value="Bundle"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+        </after>
-+
-+        <!-- A Cms page containing the New Products Widget gets created here via extends -->
-+
-+        <!-- Create a product to appear in the widget, fill in basic info first -->
-+
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-+        <waitForPageLoad stepKey="waitForProductList"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
-+        <click selector="{{AdminProductGridActionSection.addBundleProduct}}" stepKey="clickAddBundleProduct"/>
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
-+        <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
-+
-+        <!-- and then configure bundled items for this product -->
-+
-+        <scrollTo selector="{{AdminProductFormBundleSection.addOption}}" stepKey="scrollToAddOptionButton"/>
-+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
-+        <waitForPageLoad stepKey="waitForOptions"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="MFTF Test Bundle 1" stepKey="fillOptionTitle"/>
-+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="checkbox" stepKey="selectInputType"/>
-+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
-+            <argument name="product" value="$$simpleProduct1$$"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
-+            <argument name="product" value="$$simpleProduct2$$"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
-+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="1" stepKey="fillProductDefaultQty1"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="1" stepKey="fillProductDefaultQty2"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
-+
-+        <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
-+
-+        <!-- Check for product on the CMS page with the New Products widget -->
-+
-+        <amOnPage url="{{_newDefaultCmsPage.identifier}}" stepKey="amOnCmsPage"/>
-+        <waitForPageLoad stepKey="waitForCmsPage"/>
-+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml
-new file mode 100644
-index 00000000000..779f1370c4d
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml
-@@ -0,0 +1,143 @@
-+<?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="StorefrontAddBundleOptionsToCartTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="MAGETWO-95813: Only two bundle options are added to the cart"/>
-+            <title value="Checking adding of bundle options to the cart"/>
-+            <description value="Verifying adding of bundle options to the cart"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-95933"/>
-+            <group value="Bundle"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct3"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct4"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct5"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct6"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct7"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct8"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct9"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct10"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+            <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
-+            <deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
-+            <deleteData createDataKey="simpleProduct5" stepKey="deleteSimpleProduct5"/>
-+            <deleteData createDataKey="simpleProduct6" stepKey="deleteSimpleProduct6"/>
-+            <deleteData createDataKey="simpleProduct7" stepKey="deleteSimpleProduct7"/>
-+            <deleteData createDataKey="simpleProduct8" stepKey="deleteSimpleProduct8"/>
-+            <deleteData createDataKey="simpleProduct9" stepKey="deleteSimpleProduct9"/>
-+            <deleteData createDataKey="simpleProduct10" stepKey="deleteSimpleProduct10"/>
-+            <!--delete created bundle product-->
-+            <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
-+                <argument name="sku" value="{{BundleProduct.sku}}"/>
-+            </actionGroup>
-+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
-+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Start creating a bundle product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-+        <waitForPageLoad stepKey="waitForProductList"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillNameAndSku">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add Option One, a "Checkbox" type option, with tree products -->
-+        <actionGroup ref="addBundleOptionWithTreeProducts" stepKey="addBundleOptionWithTreeProducts">
-+            <argument name="x" value="0"/>
-+            <argument name="n" value="1"/>
-+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
-+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
-+            <argument name="prodTreeSku" value="$$simpleProduct3.sku$$"/>
-+            <argument name="optionTitle" value="Option One"/>
-+            <argument name="inputType" value="checkbox"/>
-+        </actionGroup>
-+
-+        <!-- Add Option Two, a "Radio Buttons" type option, with one product -->
-+        <actionGroup ref="addBundleOptionWithOneProduct" stepKey="addBundleOptionWithOneProduct">
-+            <argument name="x" value="1"/>
-+            <argument name="n" value="2"/>
-+            <argument name="prodOneSku" value="$$simpleProduct4.sku$$"/>
-+            <argument name="prodTwoSku" value=""/>
-+            <argument name="optionTitle" value="Option Two"/>
-+            <argument name="inputType" value="radio"/>
-+        </actionGroup>
-+
-+        <!-- Add Option Tree, a "Checkbox" type option, with six products -->
-+        <actionGroup ref="addBundleOptionWithSixProducts" stepKey="addBundleOptionWithSixProducts">
-+            <argument name="x" value="2"/>
-+            <argument name="n" value="3"/>
-+            <argument name="prodOneSku" value="$$simpleProduct5.sku$$"/>
-+            <argument name="prodTwoSku" value="$$simpleProduct6.sku$$"/>
-+            <argument name="prodTreeSku" value="$$simpleProduct7.sku$$"/>
-+            <argument name="prodFourSku" value="$$simpleProduct8.sku$$"/>
-+            <argument name="prodFiveSku" value="$$simpleProduct9.sku$$"/>
-+            <argument name="prodSixSku" value="$$simpleProduct10.sku$$"/>
-+            <argument name="optionTitle" value="Option Tree"/>
-+            <argument name="inputType" value="checkbox"/>
-+        </actionGroup>
-+
-+        <!-- Save product-->
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!--Go to Storefront and open Bundle Product page-->
-+        <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
-+        <waitForPageLoad stepKey="waitForStorefront"/>
-+
-+        <!--Click "Customize and Add to Cart" button-->
-+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
-+
-+        <!--Assert Bundle Product Price-->
-+        <grabTextFrom selector="{{StorefrontBundledSection.bundleProductsPrice}}" stepKey="grabProductsPrice"/>
-+        <assertEquals expected='$123.00' expectedType="string" actual="$grabProductsPrice" message="ExpectedPrice" stepKey="assertBundleProductPrice"/>
-+
-+        <!--Chose all products from 1st & 3rd options -->
-+        <click stepKey="selectProduct1" selector="{{StorefrontBundledSection.productCheckbox('1','1')}}"/>
-+        <click stepKey="selectProduct2" selector="{{StorefrontBundledSection.productCheckbox('1','2')}}"/>
-+        <click stepKey="selectProduct3" selector="{{StorefrontBundledSection.productCheckbox('1','3')}}"/>
-+        <click stepKey="selectProduct5" selector="{{StorefrontBundledSection.productCheckbox('3','1')}}"/>
-+        <click stepKey="selectProduct6" selector="{{StorefrontBundledSection.productCheckbox('3','2')}}"/>
-+        <click stepKey="selectProduct7" selector="{{StorefrontBundledSection.productCheckbox('3','3')}}"/>
-+        <click stepKey="selectProduct8" selector="{{StorefrontBundledSection.productCheckbox('3','4')}}"/>
-+        <click stepKey="selectProduct9" selector="{{StorefrontBundledSection.productCheckbox('3','5')}}"/>
-+        <click stepKey="selectProduct10" selector="{{StorefrontBundledSection.productCheckbox('3','6')}}"/>
-+
-+        <!--Click "Add to Cart" button-->
-+        <click selector="{{StorefrontBundleProductActionSection.addToCartButton}}" stepKey="clickAddBundleProductToCart"/>
-+        <waitForPageLoad time="30" stepKey="waitForAddBundleProductPageLoad"/>
-+
-+        <!--Click "mini cart" icon-->
-+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
-+        <waitForPageLoad stepKey="waitForDetailsOpen"/>
-+
-+        <!--Check all products and Cart Subtotal -->
-+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssert" after="waitForDetailsOpen">
-+            <argument name="subtotal" value="1,968.00"/>
-+            <argument name="shipping" value="5.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="1,973.00"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml
-new file mode 100644
-index 00000000000..33181d6e920
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml
-@@ -0,0 +1,78 @@
-+<?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="StorefrontAddBundleProductWithZeroPriceToShoppingCartTest">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="Add Bundle product with zero price to shopping cart"/>
-+            <title value="Add Bundle product with zero price to shopping cart"/>
-+            <description value="Add Bundle product with zero price to shopping cart"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-95167"/>
-+            <group value="bundle"/>
-+        </annotations>
-+        <before>
-+            <!--Enable freeShipping-->
-+            <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
-+            <!--Create category-->
-+            <createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
-+            <!--Create simple with zero price product-->
-+            <createData entity="ApiProductWithDescription" stepKey="apiSimple">
-+                <field key="price">0</field>
-+            </createData>
-+            <!--Create Bundle product-->
-+            <createData entity="ApiBundleProductPriceViewRange" stepKey="apiBundleProduct">
-+                <requiredEntity createDataKey="createSubCategory"/>
-+            </createData>
-+            <!--Create Attribute-->
-+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
-+                <requiredEntity createDataKey="apiBundleProduct"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink">
-+                <requiredEntity createDataKey="apiBundleProduct"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="apiSimple"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        </before>
-+        <after>
-+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShipping"/>
-+            <deleteData createDataKey="apiSimple" stepKey="deleteSimple"/>
-+            <deleteData createDataKey="apiBundleProduct" stepKey="deleteBundleProduct"/>
-+            <deleteData createDataKey="createSubCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Open category page-->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createSubCategory.custom_attributes[url_key]$$)}}" stepKey="amOnCategoryPage"/>
-+        <!--Add bundle product to cart-->
-+        <actionGroup ref="StorefrontAddBundleProductFromCategoryToCartActionGroup" stepKey="addBundleProductToCart">
-+            <argument name="productName" value="$$apiBundleProduct.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+
-+        <!--Place order-->
-+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping">
-+            <argument name="shippingMethod" value="Free Shipping"/>
-+        </actionGroup>
-+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="checkoutPlaceOrder"/>
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
-+
-+        <!--Check subtotal in created order-->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderById">
-+            <argument name="orderId" value="$grabOrderNumber"/>
-+        </actionGroup>
-+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-+        <waitForPageLoad stepKey="waitForAdminOrderPageLoad"/>
-+        <scrollTo selector="{{AdminOrderTotalSection.subTotal}}" stepKey="scrollToOrderTotalSection"/>
-+        <see selector="{{AdminOrderTotalSection.subTotal}}"  userInput="$0.00" stepKey="checkSubtotal"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
-index c0d659f1665..40132ea9565 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontAdminEditDataTest">
-         <annotations>
-             <features value="Bundle"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
-index 655081df610..695c3a8bf7d 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontBundleCartTest">
-         <annotations>
-             <features value="Bundle"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
-index a475ef16ed5..d7394b2dbf3 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontBundleProductDetailsTest">
-         <annotations>
-             <features value="Bundle"/>
-@@ -32,6 +32,8 @@
-             <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
-             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndexPage"/>
-+            <actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteAllProducts"/>
-             <actionGroup ref="logout" stepKey="logout"/>
-         </after>
-         <!-- go to bundle product creation page-->
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml
-index 577079965ca..9ad4b6828d6 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontBundleProductShownInCategoryListAndGrid">
-         <annotations>
-             <features value="Bundle"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
-new file mode 100644
-index 00000000000..532af1ea76d
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
-@@ -0,0 +1,106 @@
-+<?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="StorefrontCheckBundleProductOptionTierPrices">
-+        <annotations>
-+            <features value="Bundle"/>
-+            <stories value="View bundle products"/>
-+            <title value="Check tier prices for bundle options"/>
-+            <description value="Check tier prices for bundle options"/>
-+            <testCaseId value="MAGETWO-98968"/>
-+            <useCaseId value="MAGETWO-98603"/>
-+            <severity value="AVERAGE"/>
-+            <group value="catalog"/>
-+            <group value="bundle"/>
-+        </annotations>
-+        <before>
-+            <!-- Create Dynamic Bundle product -->
-+            <actionGroup ref="AdminCreateApiDynamicBundleProductAllOptionTypesActionGroup" stepKey="createBundleProduct"/>
-+
-+            <!-- Add tier prices to simple products -->
-+            <!-- Simple product 1 -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <amOnPage url="{{AdminProductEditPage.url($$simpleProduct1CreateBundleProduct.id$$)}}" stepKey="openAdminEditPageProduct1"/>
-+            <actionGroup ref="ProductSetAdvancedPricing" stepKey="addTierPriceProduct1">
-+                <argument name="group" value="ALL GROUPS"/>
-+                <argument name="quantity" value="5"/>
-+                <argument name="price" value="Discount"/>
-+                <argument name="amount" value="50"/>
-+            </actionGroup>
-+            <!-- Simple product 2 -->
-+            <amOnPage url="{{AdminProductEditPage.url($$simpleProduct2CreateBundleProduct.id$$)}}" stepKey="openAdminEditPageProduct2"/>
-+            <actionGroup ref="ProductSetAdvancedPricing" stepKey="addTierPriceProduct2">
-+                <argument name="group" value="ALL GROUPS"/>
-+                <argument name="quantity" value="7"/>
-+                <argument name="price" value="Discount"/>
-+                <argument name="amount" value="25"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logoutAsAdmin"/>
-+
-+            <!-- Run reindex -->
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createBundleProductCreateBundleProduct" stepKey="deleteDynamicBundleProduct"/>
-+            <deleteData createDataKey="simpleProduct1CreateBundleProduct" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="simpleProduct2CreateBundleProduct" stepKey="deleteSimpleProduct2"/>
-+        </after>
-+
-+        <!-- Go to storefront product page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createBundleProductCreateBundleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToBundleProductPage"/>
-+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
-+
-+        <!--"Drop-down" type option-->
-+        <!-- Check Tier Prices for product 1 -->
-+        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct1CreateBundleProduct.sku$$ +$$$simpleProduct1CreateBundleProduct.price$$.00" stepKey="selectDropDownOptionProduct1"/>
-+        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct1CreateBundleProduct.sku$$ +$$$simpleProduct1CreateBundleProduct.price$$.00" stepKey="checkDropDownOptionProduct1"/>
-+        <grabTextFrom selector="{{StorefrontBundledSection.dropDownOptionTierPrices('Drop-down Option')}}" stepKey="DropDownTierPriceTextProduct1"/>
-+        <assertContains stepKey="assertDropDownTierPriceTextProduct1">
-+            <expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
-+            <actualResult type="variable">DropDownTierPriceTextProduct1</actualResult>
-+        </assertContains>
-+        <!-- Check Tier Prices for product 2 -->
-+        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.sku$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="selectDropDownOptionProduct2"/>
-+        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.sku$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="checkDropDownOptionProduct2"/>
-+        <grabTextFrom selector="{{StorefrontBundledSection.dropDownOptionTierPrices('Drop-down Option')}}" stepKey="dropDownTierPriceTextProduct2"/>
-+        <assertContains stepKey="assertDropDownTierPriceTextProduct2">
-+            <expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
-+            <actualResult type="variable">dropDownTierPriceTextProduct2</actualResult>
-+        </assertContains>
-+
-+        <!--"Radio Buttons" type option-->
-+        <!-- Check Tier Prices for product 1 -->
-+        <grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct1CreateBundleProduct.sku$$')}}" stepKey="radioButtonsOptionTierPriceTextProduct1"/>
-+        <assertContains stepKey="assertRadioButtonsOptionTierPriceTextProduct1">
-+            <expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
-+            <actualResult type="variable">radioButtonsOptionTierPriceTextProduct1</actualResult>
-+        </assertContains>
-+        <!-- Check Tier Prices for product 2 -->
-+        <grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct2CreateBundleProduct.sku$$')}}" stepKey="radioButtonsOptionTierPriceTextProduct2"/>
-+        <assertContains stepKey="assertRadioButtonsOptionTierPriceTextProduct2">
-+            <expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
-+            <actualResult type="variable">radioButtonsOptionTierPriceTextProduct2</actualResult>
-+        </assertContains>
-+
-+        <!--"Checkbox" type option-->
-+        <!-- Check Tier Prices for product 1 -->
-+        <grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct1CreateBundleProduct.sku$$')}}" stepKey="checkBoxOptionTierPriceTextProduct1"/>
-+        <assertContains stepKey="assertCheckBoxOptionTierPriceTextProduct1">
-+            <expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
-+            <actualResult type="variable">checkBoxOptionTierPriceTextProduct1</actualResult>
-+        </assertContains>
-+        <!-- Check Tier Prices for product 2 -->
-+        <grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct2CreateBundleProduct.sku$$')}}" stepKey="checkBoxOptionTierPriceTextProduct2"/>
-+        <assertContains stepKey="assertCheckBoxOptionTierPriceTextProduct2">
-+            <expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
-+            <actualResult type="variable">checkBoxOptionTierPriceTextProduct2</actualResult>
-+        </assertContains>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
-index 26e5e436ed5..5e6e8915414 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontCustomerSelectAndSetBundleOptionsTest">
-         <annotations>
-             <features value="Bundle"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
-index a50a73c7f6b..58806126aee 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontEditBundleProductTest">
-         <annotations>
-             <features value="Bundle"/>
-@@ -94,9 +94,8 @@
-         <click stepKey="clickEdit" selector="{{CheckoutCartProductSection.nthEditButton('1')}}"/>
-         <waitForPageLoad stepKey="waitForStorefront2"/>
- 
--        <!-- Choose both of the options on the storefront -->
--        <click stepKey="selectFirstBundleOption2" selector="{{StorefrontBundledSection.nthBundledOption('1','1')}}"/>
--        <click stepKey="selectSecondBundleOption2" selector="{{StorefrontBundledSection.nthBundledOption('1','2')}}"/>
-+        <!-- Check second one option to choose both of the options on the storefront -->
-+        <click selector="{{StorefrontBundledSection.nthBundledOption('1','2')}}" stepKey="selectSecondBundleOption2"/>
- 
-         <waitForPageLoad stepKey="waitForPriceUpdate3"/>
-         <see stepKey="seeDoublePrice" selector="{{StorefrontBundledSection.configuredPrice}}" userInput="2,460.00"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
-index 6c476183a35..ccd6a58223b 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontGoToDetailsPageWhenAddingToCart">
-         <annotations>
-             <features value="Bundle"/>
-diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
-index 1b1a46d1c8b..31a5f9bab77 100644
---- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
-+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
-@@ -7,10 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest">
-         <annotations>
-             <features value="Bundle"/>
-+            <stories value="View bundle products"/>
-             <title value="Verify dynamic bundle product prices for combination of options"/>
-             <description value="Verify prices for various configurations of Dynamic Bundle product"/>
-             <severity value="CRITICAL"/>
-diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
-index c252e5f9961..07d2e1b995c 100644
---- a/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
-+++ b/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
-@@ -280,6 +280,7 @@ class BundleTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(110, $jsonConfig['prices']['oldPrice']['amount']);
-         $this->assertEquals(100, $jsonConfig['prices']['basePrice']['amount']);
-         $this->assertEquals(100, $jsonConfig['prices']['finalPrice']['amount']);
-+        $this->assertEquals([1], $jsonConfig['positions']);
-     }
- 
-     /**
-diff --git a/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php b/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
-new file mode 100644
-index 00000000000..1af73bafc62
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
-@@ -0,0 +1,99 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Bundle\Test\Unit\Block\DataProviders;
-+
-+use Magento\Bundle\Block\DataProviders\OptionPriceRenderer;
-+use Magento\Catalog\Model\Product;
-+use Magento\Framework\Pricing\Render;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Framework\View\Element\BlockInterface;
-+use Magento\Framework\View\LayoutInterface;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Class to test additional data for bundle options
-+ */
-+class OptionPriceRendererTest extends TestCase
-+{
-+    /**
-+     * @var LayoutInterface|MockObject
-+     */
-+    private $layoutMock;
-+
-+    /**
-+     * @var OptionPriceRenderer
-+     */
-+    private $renderer;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = new ObjectManager($this);
-+
-+        $this->layoutMock = $this->createMock(
-+            LayoutInterface::class
-+        );
-+
-+        $this->renderer = $objectManager->getObject(
-+            OptionPriceRenderer::class,
-+            ['layout' => $this->layoutMock]
-+        );
-+    }
-+
-+    /**
-+     * Test to render Tier price html
-+     *
-+     * @return void
-+     */
-+    public function testRenderTierPrice(): void
-+    {
-+        $expectedHtml = 'tier price html';
-+        $expectedArguments = ['zone' => Render::ZONE_ITEM_OPTION];
-+
-+        $productMock = $this->createMock(Product::class);
-+
-+        $priceRenderer = $this->createPartialMock(BlockInterface::class, ['toHtml', 'render']);
-+        $priceRenderer->expects($this->once())
-+            ->method('render')
-+            ->with('tier_price', $productMock, $expectedArguments)
-+            ->willReturn($expectedHtml);
-+
-+        $this->layoutMock->method('getBlock')
-+            ->with('product.price.render.default')
-+            ->willReturn($priceRenderer);
-+
-+        $this->assertEquals(
-+            $expectedHtml,
-+            $this->renderer->renderTierPrice($productMock),
-+            'Render Tier price is wrong'
-+        );
-+    }
-+
-+    /**
-+     * Test to render Tier price html when render block is not exists
-+     *
-+     * @return void
-+     */
-+    public function testRenderTierPriceNotExist(): void
-+    {
-+        $productMock = $this->createMock(Product::class);
-+
-+        $this->layoutMock->method('getBlock')
-+            ->with('product.price.render.default')
-+            ->willReturn(false);
-+
-+        $this->assertEquals(
-+            '',
-+            $this->renderer->renderTierPrice($productMock),
-+            'Render Tier price is wrong'
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php b/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
-index b4a466b413a..2450f63c389 100644
---- a/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
-+++ b/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
-@@ -8,6 +8,7 @@
- namespace Magento\Bundle\Test\Unit\Model;
- 
- use Magento\Bundle\Model\OptionRepository;
-+use Magento\Framework\Exception\NoSuchEntityException;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -84,7 +85,7 @@ class OptionRepositoryTest extends \PHPUnit\Framework\TestCase
-             ->getMock();
-         $this->optionResourceMock = $this->createPartialMock(
-             \Magento\Bundle\Model\ResourceModel\Option::class,
--            ['delete', '__wakeup', 'save', 'removeOptionSelections']
-+            ['get', 'delete', '__wakeup', 'save', 'removeOptionSelections']
-         );
-         $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-         $this->linkManagementMock = $this->createMock(\Magento\Bundle\Api\ProductLinkManagementInterface::class);
-@@ -227,32 +228,92 @@ class OptionRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->model->delete($optionMock);
-     }
- 
-+    /**
-+     * Test successful delete action for given $optionId
-+     */
-     public function testDeleteById()
-     {
-         $productSku = 'sku';
-         $optionId = 100;
--        $productMock = $this->createMock(\Magento\Catalog\Api\Data\ProductInterface::class);
-+
-+        $optionMock = $this->createMock(\Magento\Bundle\Model\Option::class);
-+        $optionMock->expects($this->exactly(2))
-+            ->method('getId')
-+            ->willReturn($optionId);
-+
-+        $optionMock->expects($this->once())
-+            ->method('getData')
-+            ->willReturn([
-+                'title' => 'Option title',
-+                'option_id' => $optionId
-+            ]);
-+
-+        $this->optionFactoryMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($optionMock);
-+
-+        $productMock = $this->createPartialMock(
-+            \Magento\Catalog\Model\Product::class,
-+            ['getTypeId', 'getTypeInstance', 'getStoreId', 'getPriceType', '__wakeup', 'getSku']
-+        );
-         $productMock->expects($this->once())
-             ->method('getTypeId')
-             ->willReturn(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
--        $this->productRepositoryMock->expects($this->once())
-+        $productMock->expects($this->exactly(2))->method('getSku')->willReturn($productSku);
-+
-+        $this->productRepositoryMock
-+            ->expects($this->once())
-             ->method('get')
-             ->with($productSku)
-             ->willReturn($productMock);
- 
-+        $optCollectionMock = $this->createMock(\Magento\Bundle\Model\ResourceModel\Option\Collection::class);
-+        $optCollectionMock->expects($this->once())->method('getItemById')->with($optionId)->willReturn($optionMock);
-+        $this->typeMock->expects($this->once())
-+            ->method('getOptionsCollection')
-+            ->with($productMock)
-+            ->willReturn($optCollectionMock);
-+
-+        $this->assertTrue($this->model->deleteById($productSku, $optionId));
-+    }
-+
-+    /**
-+     * Tests if NoSuchEntityException thrown when provided $optionId not found
-+     */
-+    public function testDeleteByIdException()
-+    {
-+        $productSku = 'sku';
-+        $optionId = null;
-+
-         $optionMock = $this->createMock(\Magento\Bundle\Model\Option::class);
-+        $optionMock->expects($this->exactly(1))
-+            ->method('getId')
-+            ->willReturn($optionId);
-+
-+        $productMock = $this->createPartialMock(
-+            \Magento\Catalog\Model\Product::class,
-+            ['getTypeId', 'getTypeInstance', 'getStoreId', 'getPriceType', '__wakeup', 'getSku']
-+        );
-+        $productMock->expects($this->once())
-+            ->method('getTypeId')
-+            ->willReturn(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
-+
-+        $this->productRepositoryMock
-+            ->expects($this->once())
-+            ->method('get')
-+            ->with($productSku)
-+            ->willReturn($productMock);
- 
-         $optCollectionMock = $this->createMock(\Magento\Bundle\Model\ResourceModel\Option\Collection::class);
-+        $optCollectionMock->expects($this->once())->method('getItemById')->with($optionId)->willReturn($optionMock);
-         $this->typeMock->expects($this->once())
-             ->method('getOptionsCollection')
-             ->with($productMock)
-             ->willReturn($optCollectionMock);
- 
--        $optCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
--        $optCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
-+        $this->expectException(NoSuchEntityException::class);
- 
--        $this->optionResourceMock->expects($this->once())->method('delete')->with($optionMock)->willReturnSelf();
--        $this->assertTrue($this->model->deleteById($productSku, $optionId));
-+        $this->model->deleteById($productSku, $optionId);
-     }
- 
-     /**
-diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Plugin/Frontend/ProductTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Plugin/Frontend/ProductTest.php
-new file mode 100644
-index 00000000000..ee08618eab5
---- /dev/null
-+++ b/app/code/Magento/Bundle/Test/Unit/Model/Plugin/Frontend/ProductTest.php
-@@ -0,0 +1,73 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Bundle\Test\Unit\Model\Plugin\Frontend;
-+
-+use Magento\Bundle\Model\Plugin\Frontend\Product as ProductPlugin;
-+use Magento\Bundle\Model\Product\Type;
-+use Magento\Catalog\Model\Product;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+
-+class ProductTest extends \PHPUnit\Framework\TestCase
-+{
-+    /** @var  \Magento\Bundle\Model\Plugin\Product */
-+    private $plugin;
-+
-+    /** @var  MockObject|Type */
-+    private $type;
-+
-+    /** @var  MockObject|\Magento\Catalog\Model\Product */
-+    private $product;
-+
-+    protected function setUp()
-+    {
-+        $this->product = $this->getMockBuilder(Product::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getEntityId'])
-+            ->getMock();
-+
-+        $this->type = $this->getMockBuilder(Type::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getChildrenIds'])
-+            ->getMock();
-+
-+        $this->plugin = new ProductPlugin($this->type);
-+    }
-+
-+    public function testAfterGetIdentities()
-+    {
-+        $baseIdentities = [
-+            'SomeCacheId',
-+            'AnotherCacheId',
-+        ];
-+        $id = 12345;
-+        $childIds = [
-+            1 => [1, 2, 5, 100500],
-+            12 => [7, 22, 45, 24612]
-+        ];
-+        $expectedIdentities = [
-+            'SomeCacheId',
-+            'AnotherCacheId',
-+            Product::CACHE_TAG . '_' . 1,
-+            Product::CACHE_TAG . '_' . 2,
-+            Product::CACHE_TAG . '_' . 5,
-+            Product::CACHE_TAG . '_' . 100500,
-+            Product::CACHE_TAG . '_' . 7,
-+            Product::CACHE_TAG . '_' . 22,
-+            Product::CACHE_TAG . '_' . 45,
-+            Product::CACHE_TAG . '_' . 24612,
-+        ];
-+        $this->product->expects($this->once())
-+            ->method('getEntityId')
-+            ->will($this->returnValue($id));
-+        $this->type->expects($this->once())
-+            ->method('getChildrenIds')
-+            ->with($id)
-+            ->will($this->returnValue($childIds));
-+        $identities = $this->plugin->afterGetIdentities($this->product, $baseIdentities);
-+        $this->assertEquals($expectedIdentities, $identities);
-+    }
-+}
-diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
-index 4bbf5641c55..9d7629c6f0a 100644
---- a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
-+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
-@@ -15,6 +15,7 @@ use Magento\Framework\EntityManager\EntityMetadataInterface;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Framework\Stdlib\ArrayUtils;
- 
- /**
-  * Class TypeTest
-@@ -87,6 +88,11 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-      */
-     private $serializer;
- 
-+    /**
-+     * @var ArrayUtils|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $arrayUtility;
-+
-     /**
-      * @return void
-      */
-@@ -159,6 +165,11 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        $this->arrayUtility = $this->getMockBuilder(ArrayUtils::class)
-+            ->setMethods(['flatten'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-         $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->model = $objectHelper->getObject(
-             \Magento\Bundle\Model\Product\Type::class,
-@@ -175,6 +186,7 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-                 'priceCurrency' => $this->priceCurrency,
-                 'serializer' => $this->serializer,
-                 'metadataPool' => $this->metadataPool,
-+                'arrayUtility' => $this->arrayUtility
-             ]
-         );
-     }
-@@ -421,6 +433,8 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-                     return $resultValue;
-                 }
-             );
-+        $bundleOptions = [3 => 5];
-+
-         $product->expects($this->any())
-             ->method('getId')
-             ->willReturn(333);
-@@ -438,9 +452,7 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-             ->with($selectionCollection, true, true);
-         $productType->expects($this->once())
-             ->method('setStoreFilter');
--        $buyRequest->expects($this->once())
--            ->method('getBundleOption')
--            ->willReturn([3 => 5]);
-+        $buyRequest->expects($this->once())->method('getBundleOption')->willReturn($bundleOptions);
-         $selectionCollection->expects($this->any())
-             ->method('getItems')
-             ->willReturn([$selection]);
-@@ -491,6 +503,9 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-         $option->expects($this->once())
-             ->method('getTitle')
-             ->willReturn('Title for option');
-+
-+        $this->arrayUtility->expects($this->once())->method('flatten')->willReturn($bundleOptions);
-+
-         $buyRequest->expects($this->once())
-             ->method('getBundleOptionQty')
-             ->willReturn([3 => 5]);
-@@ -513,10 +528,6 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-             ->method('getSelectionId')
-             ->willReturn(314);
- 
--        $this->priceCurrency->expects($this->once())
--            ->method('convert')
--            ->willReturn(3.14);
--
-         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
-         $this->assertEquals([$product, $productType], $result);
-     }
-@@ -657,6 +668,8 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-                     return $resultValue;
-                 }
-             );
-+        $bundleOptions = [3 => 5];
-+
-         $product->expects($this->any())
-             ->method('getId')
-             ->willReturn(333);
-@@ -676,7 +689,10 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-             ->method('setStoreFilter');
-         $buyRequest->expects($this->once())
-             ->method('getBundleOption')
--            ->willReturn([3 => 5]);
-+            ->willReturn($bundleOptions);
-+
-+        $this->arrayUtility->expects($this->once())->method('flatten')->willReturn($bundleOptions);
-+
-         $selectionCollection->expects($this->any())
-             ->method('getItems')
-             ->willReturn([$selection]);
-@@ -737,10 +753,6 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-             ->method('prepareForCart')
-             ->willReturn([]);
- 
--        $this->priceCurrency->expects($this->once())
--            ->method('convert')
--            ->willReturn(3.14);
--
-         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
-         $this->assertEquals('We can\'t add this item to your shopping cart right now.', $result);
-     }
-@@ -898,9 +910,10 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-             ->with($selectionCollection, true, true);
-         $productType->expects($this->once())
-             ->method('setStoreFilter');
--        $buyRequest->expects($this->once())
--            ->method('getBundleOption')
--            ->willReturn([3 => 5]);
-+
-+        $bundleOptions = [3 => 5];
-+        $buyRequest->expects($this->once())->method('getBundleOption')->willReturn($bundleOptions);
-+
-         $selectionCollection->expects($this->any())
-             ->method('getItems')
-             ->willReturn([$selection]);
-@@ -951,6 +964,9 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-         $option->expects($this->once())
-             ->method('getTitle')
-             ->willReturn('Title for option');
-+
-+        $this->arrayUtility->expects($this->once())->method('flatten')->willReturn($bundleOptions);
-+
-         $buyRequest->expects($this->once())
-             ->method('getBundleOptionQty')
-             ->willReturn([3 => 5]);
-@@ -961,10 +977,6 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-             ->method('prepareForCart')
-             ->willReturn('string');
- 
--        $this->priceCurrency->expects($this->once())
--            ->method('convert')
--            ->willReturn(3.14);
--
-         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
-         $this->assertEquals('string', $result);
-     }
-@@ -1065,13 +1077,15 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-             ->willReturn(333);
-         $productType->expects($this->once())
-             ->method('setStoreFilter');
--        $buyRequest->expects($this->once())
--            ->method('getBundleOption')
--            ->willReturn([]);
-+
-+        $bundleOptions = [];
-+        $buyRequest->expects($this->once())->method('getBundleOption')->willReturn($bundleOptions);
-         $buyRequest->expects($this->once())
-             ->method('getBundleOptionQty')
-             ->willReturn([3 => 5]);
- 
-+        $this->arrayUtility->expects($this->once())->method('flatten')->willReturn($bundleOptions);
-+
-         $result = $this->model->prepareForCartAdvanced($buyRequest, $product, 'single');
-         $this->assertEquals([$product], $result);
-     }
-@@ -1177,9 +1191,12 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-             ->with($selectionCollection, true, true);
-         $productType->expects($this->once())
-             ->method('setStoreFilter');
--        $buyRequest->expects($this->once())
--            ->method('getBundleOption')
--            ->willReturn([3 => 5]);
-+
-+        $bundleOptions = [3 => 5];
-+        $buyRequest->expects($this->once())->method('getBundleOption')->willReturn($bundleOptions);
-+
-+        $this->arrayUtility->expects($this->once())->method('flatten')->willReturn($bundleOptions);
-+
-         $selectionCollection->expects($this->at(0))
-             ->method('getItems')
-             ->willReturn([$selection]);
-@@ -1301,9 +1318,12 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-             ->willReturn($option);
-         $productType->expects($this->once())
-             ->method('setStoreFilter');
--        $buyRequest->expects($this->once())
--            ->method('getBundleOption')
--            ->willReturn([3 => 5]);
-+
-+        $bundleOptions = [3 => 5];
-+        $buyRequest->expects($this->once())->method('getBundleOption')->willReturn($bundleOptions);
-+
-+        $this->arrayUtility->expects($this->once())->method('flatten')->willReturn($bundleOptions);
-+
-         $selectionCollection->expects($this->any())
-             ->method('getItems')
-             ->willReturn([$selection]);
-@@ -1595,7 +1615,7 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
-         $selectionItemMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
--            ->setMethods(['getSku', '__wakeup'])
-+            ->setMethods(['getSku', 'getEntityId', '__wakeup'])
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-@@ -1623,9 +1643,12 @@ class TypeTest extends \PHPUnit\Framework\TestCase
-             ->will($this->returnValue($serializeIds));
-         $selectionMock = $this->getSelectionsByIdsMock($selectionIds, $productMock, 5, 6);
-         $selectionMock->expects(($this->any()))
--            ->method('getItems')
--            ->will($this->returnValue([$selectionItemMock]));
--        $selectionItemMock->expects($this->any())
-+            ->method('getItemByColumnValue')
-+            ->will($this->returnValue($selectionItemMock));
-+        $selectionItemMock->expects($this->at(0))
-+            ->method('getEntityId')
-+            ->will($this->returnValue(1));
-+        $selectionItemMock->expects($this->once())
-             ->method('getSku')
-             ->will($this->returnValue($itemSku));
- 
-diff --git a/app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/Selection/CollectionTest.php b/app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/Selection/CollectionTest.php
-deleted file mode 100644
-index e595f9a47f0..00000000000
---- a/app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/Selection/CollectionTest.php
-+++ /dev/null
-@@ -1,156 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Bundle\Test\Unit\Model\ResourceModel\Selection;
--
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
--use Magento\Store\Model\StoreManagerInterface;
--use Magento\Store\Api\Data\StoreInterface;
--use Magento\Framework\Validator\UniversalFactory;
--use Magento\Eav\Model\Entity\AbstractEntity;
--use Magento\Framework\DB\Adapter\AdapterInterface;
--use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
--use Magento\Framework\DB\Select;
--
--/**
-- * Class CollectionTest.
-- */
--class CollectionTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $storeManager;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $store;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $universalFactory;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $entity;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $adapter;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $select;
--
--    /**
--     * @var \Magento\Bundle\Model\ResourceModel\Selection\Collection
--     */
--    private $model;
--
--    protected function setUp()
--    {
--        $objectManager = new ObjectManager($this);
--        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->store = $this->getMockBuilder(StoreInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->universalFactory = $this->getMockBuilder(UniversalFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->entity = $this->getMockBuilder(AbstractEntity::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->adapter = $this->getMockBuilder(AdapterInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->select = $this->getMockBuilder(Select::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $factory = $this->getMockBuilder(ProductLimitationFactory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--
--        $this->storeManager->expects($this->any())
--            ->method('getStore')
--            ->willReturn($this->store);
--        $this->store->expects($this->any())
--            ->method('getId')
--            ->willReturn(1);
--        $this->universalFactory->expects($this->any())
--            ->method('create')
--            ->willReturn($this->entity);
--        $this->entity->expects($this->any())
--            ->method('getConnection')
--            ->willReturn($this->adapter);
--        $this->entity->expects($this->any())
--            ->method('getDefaultAttributes')
--            ->willReturn([]);
--        $this->adapter->expects($this->any())
--            ->method('select')
--            ->willReturn($this->select);
--
--        $this->model = $objectManager->getObject(
--            \Magento\Bundle\Model\ResourceModel\Selection\Collection::class,
--            [
--                'storeManager' => $this->storeManager,
--                'universalFactory' => $this->universalFactory,
--                'productLimitationFactory' => $factory
--            ]
--        );
--    }
--
--    public function testAddQuantityFilter()
--    {
--        $statusTableName = 'cataloginventory_stock_status';
--        $itemTableName = 'cataloginventory_stock_item';
--        $this->entity->expects($this->exactly(2))
--            ->method('getTable')
--            ->willReturnMap([
--                ['cataloginventory_stock_item', $itemTableName],
--                ['cataloginventory_stock_status', $statusTableName],
--            ]);
--        $this->select->expects($this->exactly(2))
--            ->method('joinInner')
--            ->withConsecutive(
--                [
--                    ['stock' => $statusTableName],
--                    'selection.product_id = stock.product_id',
--                    [],
--                ],
--                [
--                    ['stock_item' => $itemTableName],
--                    'selection.product_id = stock_item.product_id',
--                    [],
--                ]
--            )->willReturnSelf();
--        $this->select
--            ->expects($this->exactly(2))
--            ->method('where')
--            ->withConsecutive(
--                [
--                    '('
--                    . 'selection.selection_can_change_qty > 0'
--                    . ' or '
--                    . 'selection.selection_qty <= stock.qty'
--                    . ' or '
--                    .'stock_item.manage_stock = 0'
--                    . ')',
--                ],
--                [
--                    'stock.stock_status = 1',
--                ]
--            )->willReturnSelf();
--
--        $this->assertEquals($this->model, $this->model->addQuantityFilter());
--    }
--}
-diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php
-index f38dfc5538c..3e60e057fe6 100644
---- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php
-+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php
-@@ -6,6 +6,7 @@
- namespace Magento\Bundle\Test\Unit\Pricing\Price;
- 
- use \Magento\Bundle\Pricing\Price\SpecialPrice;
-+use Magento\Store\Api\Data\WebsiteInterface;
- 
- class SpecialPriceTest extends \PHPUnit\Framework\TestCase
- {
-@@ -77,12 +78,6 @@ class SpecialPriceTest extends \PHPUnit\Framework\TestCase
-             ->method('getSpecialPrice')
-             ->will($this->returnValue($specialPrice));
- 
--        $store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->saleable->expects($this->once())
--            ->method('getStore')
--            ->will($this->returnValue($store));
-         $this->saleable->expects($this->once())
-             ->method('getSpecialFromDate')
-             ->will($this->returnValue($specialFromDate));
-@@ -92,7 +87,7 @@ class SpecialPriceTest extends \PHPUnit\Framework\TestCase
- 
-         $this->localeDate->expects($this->once())
-             ->method('isScopeDateInInterval')
--            ->with($store, $specialFromDate, $specialToDate)
-+            ->with(WebsiteInterface::ADMIN_CODE, $specialFromDate, $specialToDate)
-             ->will($this->returnValue($isScopeDateInInterval));
- 
-         $this->priceCurrencyMock->expects($this->never())
-diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
-index 98fd96c52cc..ad6fc12712c 100644
---- a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
-+++ b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
-@@ -14,6 +14,7 @@ use Magento\Framework\Stdlib\ArrayManager;
- use Magento\Framework\UrlInterface;
- use Magento\Ui\Component\Container;
- use Magento\Ui\Component\Form;
-+use Magento\Ui\Component\Form\Fieldset;
- use Magento\Ui\Component\Modal;
- 
- /**
-@@ -69,13 +70,26 @@ class BundlePanel extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-     public function modifyMeta(array $meta)
-     {
-         $meta = $this->removeFixedTierPrice($meta);
--        $path = $this->arrayManager->findPath(static::CODE_BUNDLE_DATA, $meta, null, 'children');
-+
-+        $groupCode = static::CODE_BUNDLE_DATA;
-+        $path = $this->arrayManager->findPath($groupCode, $meta, null, 'children');
-+        if (empty($path)) {
-+            $meta[$groupCode]['children'] = [];
-+            $meta[$groupCode]['arguments']['data']['config'] = [
-+                'componentType' => Fieldset::NAME,
-+                'label' => __('Bundle Items'),
-+                'collapsible' => true
-+            ];
-+
-+            $path = $this->arrayManager->findPath($groupCode, $meta, null, 'children');
-+        }
- 
-         $meta = $this->arrayManager->merge(
-             $path,
-@@ -220,7 +234,7 @@ class BundlePanel extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function modifyData(array $data)
-     {
-diff --git a/app/code/Magento/Bundle/etc/db_schema.xml b/app/code/Magento/Bundle/etc/db_schema.xml
-index 8092f34c533..97e86e5c173 100644
---- a/app/code/Magento/Bundle/etc/db_schema.xml
-+++ b/app/code/Magento/Bundle/etc/db_schema.xml
-@@ -18,13 +18,13 @@
-         <column xsi:type="int" name="position" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Position"/>
-         <column xsi:type="varchar" name="type" nullable="true" length="255" comment="Type"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="option_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_OPT_PARENT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_OPT_PARENT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_bundle_option" column="parent_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="CATALOG_PRODUCT_BUNDLE_OPTION_PARENT_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_BUNDLE_OPTION_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
-     </table>
-@@ -39,13 +39,13 @@
-         <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
-         <column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Parent Product Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_OPT_VAL_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_OPT_VAL_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
-                     table="catalog_product_bundle_option_value" column="option_id"
-                     referenceTable="catalog_product_bundle_option" referenceColumn="option_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CAT_PRD_BNDL_OPT_VAL_OPT_ID_PARENT_PRD_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CAT_PRD_BNDL_OPT_VAL_OPT_ID_PARENT_PRD_ID_STORE_ID">
-             <column name="option_id"/>
-             <column name="parent_product_id"/>
-             <column name="store_id"/>
-@@ -73,19 +73,19 @@
-                 comment="Selection Qty"/>
-         <column xsi:type="smallint" name="selection_can_change_qty" padding="6" unsigned="false" nullable="false"
-                 identity="false" default="0" comment="Selection Can Change Qty"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="selection_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_SELECTION_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_SELECTION_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
-                     table="catalog_product_bundle_selection" column="option_id"
-                     referenceTable="catalog_product_bundle_option" referenceColumn="option_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_SELECTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_SELECTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_bundle_selection" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="CATALOG_PRODUCT_BUNDLE_SELECTION_OPTION_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_BUNDLE_SELECTION_OPTION_ID" indexType="btree">
-             <column name="option_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_BUNDLE_SELECTION_PRODUCT_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_BUNDLE_SELECTION_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-@@ -97,72 +97,72 @@
-                 comment="Website Id"/>
-         <column xsi:type="smallint" name="selection_price_type" padding="5" unsigned="true" nullable="false"
-                 identity="false" default="0" comment="Selection Price Type"/>
--        <column xsi:type="decimal" name="selection_price_value" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="selection_price_value" scale="6" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Selection Price Value"/>
-         <column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Parent Product Id"/>
--        <constraint xsi:type="primary" name="PK_CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE">
-+        <constraint xsi:type="primary" referenceId="PK_CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE">
-             <column name="selection_id"/>
-             <column name="parent_product_id"/>
-             <column name="website_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_SELECTION_PRICE_WS_ID_STORE_WS_WS_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_SELECTION_PRICE_WS_ID_STORE_WS_WS_ID"
-                     table="catalog_product_bundle_selection_price" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="FK_DCF37523AA05D770A70AA4ED7C2616E4"
-+        <constraint xsi:type="foreign" referenceId="FK_DCF37523AA05D770A70AA4ED7C2616E4"
-                     table="catalog_product_bundle_selection_price" column="selection_id"
-                     referenceTable="catalog_product_bundle_selection" referenceColumn="selection_id"
-                     onDelete="CASCADE"/>
--        <index name="CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-     <table name="catalog_product_bundle_price_index" resource="default" engine="innodb"
-            comment="Catalog Product Bundle Price Index">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website Id"/>
-         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
--                comment="Customer Group Id"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="false"
-+                comment="Customer Group ID"/>
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="false"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="false"
-                 comment="Max Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="website_id"/>
-             <column name="customer_group_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_PRICE_IDX_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_PRICE_IDX_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
-                     table="catalog_product_bundle_price_index" column="customer_group_id"
-                     referenceTable="customer_group" referenceColumn="customer_group_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_PRICE_IDX_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_PRICE_IDX_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_bundle_price_index" column="entity_id"
-                     referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_PRICE_IDX_WS_ID_STORE_WS_WS_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_PRICE_IDX_WS_ID_STORE_WS_WS_ID"
-                     table="catalog_product_bundle_price_index" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <index name="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
-     </table>
-     <table name="catalog_product_bundle_stock_index" resource="default" engine="innodb"
-            comment="Catalog Product Bundle Stock Index">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
--                comment="Website Id"/>
-+                comment="Website ID"/>
-         <column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="false"
--                comment="Stock Id"/>
-+                comment="Stock ID"/>
-         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Option Id"/>
-         <column xsi:type="smallint" name="stock_status" padding="6" unsigned="false" nullable="true" identity="false"
-                 default="0" comment="Stock Status"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="website_id"/>
-             <column name="stock_id"/>
-@@ -172,32 +172,32 @@
-     <table name="catalog_product_index_price_bundle_idx" resource="default" engine="innodb"
-            comment="Catalog Product Index Price Bundle Idx">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
-                 identity="false"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
--                comment="Website Id"/>
-+                comment="Website ID"/>
-         <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
--                default="0" comment="Tax Class Id"/>
-+                default="0" comment="Tax Class ID"/>
-         <column xsi:type="smallint" name="price_type" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Price Type"/>
--        <column xsi:type="decimal" name="special_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="special_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Special Price"/>
--        <column xsi:type="decimal" name="tier_percent" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_percent" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Percent"/>
--        <column xsi:type="decimal" name="orig_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="orig_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Orig Price"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Price"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tier" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Base Tier"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -206,32 +206,32 @@
-     <table name="catalog_product_index_price_bundle_tmp" resource="default" engine="memory"
-            comment="Catalog Product Index Price Bundle Tmp">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
-                 identity="false"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
--                comment="Website Id"/>
-+                comment="Website ID"/>
-         <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
--                default="0" comment="Tax Class Id"/>
-+                default="0" comment="Tax Class ID"/>
-         <column xsi:type="smallint" name="price_type" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Price Type"/>
--        <column xsi:type="decimal" name="special_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="special_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Special Price"/>
--        <column xsi:type="decimal" name="tier_percent" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_percent" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Percent"/>
--        <column xsi:type="decimal" name="orig_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="orig_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Orig Price"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Price"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tier" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Base Tier"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -240,11 +240,11 @@
-     <table name="catalog_product_index_price_bundle_sel_idx" resource="default" engine="innodb"
-            comment="Catalog Product Index Price Bundle Sel Idx">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
-                 identity="false"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
--                comment="Website Id"/>
-+                comment="Website ID"/>
-         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Option Id"/>
-         <column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
-@@ -253,11 +253,11 @@
-                 default="0" comment="Group Type"/>
-         <column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="true" identity="false"
-                 default="0" comment="Is Required"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -268,11 +268,11 @@
-     <table name="catalog_product_index_price_bundle_sel_tmp" resource="default" engine="memory"
-            comment="Catalog Product Index Price Bundle Sel Tmp">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
-                 identity="false"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
--                comment="Website Id"/>
-+                comment="Website ID"/>
-         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Option Id"/>
-         <column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
-@@ -281,11 +281,11 @@
-                 default="0" comment="Group Type"/>
-         <column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="true" identity="false"
-                 default="0" comment="Is Required"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -296,24 +296,24 @@
-     <table name="catalog_product_index_price_bundle_opt_idx" resource="default" engine="innodb"
-            comment="Catalog Product Index Price Bundle Opt Idx">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
-                 identity="false"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
--                comment="Website Id"/>
-+                comment="Website ID"/>
-         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Option Id"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="alt_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="alt_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Alt Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <column xsi:type="decimal" name="alt_tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="alt_tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Alt Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -323,24 +323,24 @@
-     <table name="catalog_product_index_price_bundle_opt_tmp" resource="default" engine="memory"
-            comment="Catalog Product Index Price Bundle Opt Tmp">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
-                 identity="false"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
--                comment="Website Id"/>
-+                comment="Website ID"/>
-         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Option Id"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="alt_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="alt_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Alt Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <column xsi:type="decimal" name="alt_tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="alt_tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Alt Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-diff --git a/app/code/Magento/Bundle/etc/di.xml b/app/code/Magento/Bundle/etc/di.xml
-index 733b089dccd..72155d922a2 100644
---- a/app/code/Magento/Bundle/etc/di.xml
-+++ b/app/code/Magento/Bundle/etc/di.xml
-@@ -123,6 +123,9 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Quote\Model\Quote\Item">
-+        <plugin name="update_price_for_bundle_in_quote_item_option" type="Magento\Bundle\Plugin\UpdatePriceInQuoteItemOptions"/>
-+    </type>
-     <type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
-         <plugin name="append_bundle_data_to_order" type="Magento\Bundle\Model\Plugin\QuoteItem"/>
-     </type>
-@@ -140,6 +143,13 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Sales\Model\Order\ProductOption">
-+        <arguments>
-+            <argument name="processorPool" xsi:type="array">
-+                <item name="bundle" xsi:type="object">Magento\Bundle\Model\ProductOptionProcessor</item>
-+            </argument>
-+        </arguments>
-+    </type>
-     <type name="Magento\Bundle\Ui\DataProvider\Product\Listing\Collector\BundlePrice">
-         <arguments>
-             <argument name="excludeAdjustments" xsi:type="array">
-diff --git a/app/code/Magento/Bundle/etc/frontend/di.xml b/app/code/Magento/Bundle/etc/frontend/di.xml
-index 54f6d3b4b0f..fc820ff87a1 100644
---- a/app/code/Magento/Bundle/etc/frontend/di.xml
-+++ b/app/code/Magento/Bundle/etc/frontend/di.xml
-@@ -13,4 +13,7 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Catalog\Model\Product">
-+        <plugin name="bundle" type="Magento\Bundle\Model\Plugin\Frontend\Product" sortOrder="100" />
-+    </type>
- </config>
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
-index 224cd71538b..f028c7013df 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes\Extend */
- $elementHtml = $block->getParentElementHtml();
- 
-@@ -20,18 +18,18 @@ $isElementReadonly = $block->getElement()
-     ->getReadonly();
- ?>
- 
--<?php if (!($attributeCode === 'price' && $block->getCanReadPrice() === false)) { ?>
--    <div class="<?= /* @escapeNotVerified */  $attributeCode ?> "><?= /* @escapeNotVerified */  $elementHtml ?></div>
--<?php } ?>
-+<?php if (!($attributeCode === 'price' && $block->getCanReadPrice() === false)) : ?>
-+    <div class="<?= $block->escapeHtmlAttr($attributeCode) ?> "><?= /* @noEscape */ $elementHtml ?></div>
-+<?php endif; ?>
- 
- <?= $block->getExtendedElement($switchAttributeCode)->toHtml() ?>
- 
- <?php if (!$isElementReadonly && $block->getDisableChild()) { ?>
-     <script>
-         require(['prototype'], function () {
--            function <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change() {
--                var $attribute = $('<?= /* @escapeNotVerified */ $attributeCode ?>');
--                if ($('<?= /* @escapeNotVerified */ $switchAttributeCode ?>').value == '<?= /* @escapeNotVerified */ $block::DYNAMIC ?>') {
-+            function <?= /* @noEscape */ $switchAttributeCode ?>_change() {
-+                var $attribute = $('<?= $block->escapeJs($attributeCode) ?>');
-+                if ($('<?= /* @noEscape */ $switchAttributeCode ?>').value == '<?= $block->escapeJs($block::DYNAMIC) ?>') {
-                     if ($attribute) {
-                         $attribute.disabled = true;
-                         $attribute.value = '';
-@@ -43,13 +41,13 @@ $isElementReadonly = $block->getElement()
-                 } else {
-                     if ($attribute) {
-                         <?php if ($attributeCode === 'price' && !$block->getCanEditPrice() && $block->getCanReadPrice()
--                                && $block->getProduct()->isObjectNew()) { ?>
--                            <?php $defaultProductPrice = $block->getDefaultProductPrice() ?: "''"; ?>
--                            $attribute.value = <?= /* @escapeNotVerified */ $defaultProductPrice ?>;
--                        <?php } else { ?>
-+                                && $block->getProduct()->isObjectNew()) : ?>
-+                                        <?php $defaultProductPrice = $block->getDefaultProductPrice() ?: "''"; ?>
-+                            $attribute.value = <?= /* @noEscape */ (string)$defaultProductPrice ?>;
-+                        <?php else : ?>
-                             $attribute.disabled = false;
-                             $attribute.addClassName('required-entry');
--                        <?php } ?>
-+                        <?php endif; ?>
-                     }
-                     if ($('dynamic-price-warning')) {
-                         $('dynamic-price-warning').hide();
-@@ -58,11 +56,11 @@ $isElementReadonly = $block->getElement()
-             }
- 
-             <?php if (!($attributeCode === 'price' && !$block->getCanEditPrice()
--                    && !$block->getProduct()->isObjectNew())) { ?>
--                $('<?= /* @escapeNotVerified */ $switchAttributeCode ?>').observe('change', <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change);
--            <?php } ?>
-+                    && !$block->getProduct()->isObjectNew())) : ?>
-+                $('<?= /* @noEscape */ $switchAttributeCode ?>').observe('change', <?= /* @noEscape */ $switchAttributeCode ?>_change);
-+            <?php endif; ?>
-             Event.observe(window, 'load', function(){
--                <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change();
-+                <?= /* @noEscape */ $switchAttributeCode ?>_change();
-             });
-         });
-     </script>
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
-index 87798a6ba62..53ad0a96324 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
-@@ -3,17 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Bundle */ ?>
- <?php $options = $block->decorateArray($block->getOptions(true)); ?>
--<?php if (count($options)): ?>
-+<?php if (count($options)) : ?>
- <fieldset id="catalog_product_composite_configure_fields_bundle"
-           class="fieldset admin__fieldset composite-bundle<?= $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
--    <legend class="legend admin__legend"><span><?= /* @escapeNotVerified */ __('Bundle Items') ?></span></legend><br />
-+    <legend class="legend admin__legend">
-+        <span><?= $block->escapeHtml(__('Bundle Items')) ?></span>
-+    </legend><br />
-     <?php foreach ($options as $option) : ?>
-         <?php if ($option->getSelections()) : ?>
-             <?= $block->getOptionHtml($option) ?>
-@@ -71,7 +70,7 @@ require([
-             }
-         }
-     };
--    ProductConfigure.bundleControl = new BundleControl(<?= /* @escapeNotVerified */ $block->getJsonConfig() ?>);
-+    ProductConfigure.bundleControl = new BundleControl(<?= /* @noEscape */ $block->getJsonConfig() ?>);
- });
- </script>
- 
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
-index 44ed02f2758..08e89699b1f 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
-@@ -3,60 +3,58 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Checkbox */ ?>
- <?php $_option = $block->getOption(); ?>
- <?php $_selections = $_option->getSelections(); ?>
--<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
-+<?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
- 
--<div class="field admin__field options<?php if ($_option->getRequired()) echo ' required _required' ?>">
-+<div class="field admin__field options<?php if ($_option->getRequired()) { echo ' required _required'; } ?>">
-     <label class="label admin__field-label">
-         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
-     </label>
- 
-     <div class="control admin__field-control">
--        <div class="nested <?php if ($_option->getDecoratedIsLast()):?> last<?php endif;?>">
-+        <div class="nested <?php if ($_option->getDecoratedIsLast()) :?> last<?php endif;?>">
- 
--            <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
--                <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
-+            <?php if (count($_selections) == 1 && $_option->getRequired()) : ?>
-+                <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
-                 <input type="hidden"
--                       name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                       value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"
--                       price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selections[0]) ?>" />
--            <?php else:?>
-+                       name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                       value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"
-+                       price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selections[0])) ?>" />
-+            <?php else :?>
- 
--                <?php foreach ($_selections as $_selection): ?>
-+                <?php foreach ($_selections as $_selection) : ?>
-                     <div class="field choice admin__field admin__field-option">
-                         <input
--                            class="change-container-classname admin__control-checkbox checkbox bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> <?php if ($_option->getRequired()) echo 'validate-one-required-by-name' ?>"
--                            id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
-+                            class="change-container-classname admin__control-checkbox checkbox bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?> <?php if ($_option->getRequired()) { echo 'validate-one-required-by-name'; } ?>"
-+                            id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
-                             type="checkbox"
--                            name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][<?= /* @escapeNotVerified */ $_selection->getId() ?>]"
--                            <?php if ($block->isSelected($_selection)):?>
-+                            name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>][<?= $block->escapeHtmlAttr($_selection->getId()) ?>]"
-+                            <?php if ($block->isSelected($_selection)) :?>
-                                 <?= ' checked="checked"' ?>
-                             <?php endif;?>
--                            <?php if (!$_selection->isSaleable() && !$_skipSaleableCheck):?>
-+                            <?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) :?>
-                                 <?= ' disabled="disabled"' ?>
-                             <?php endif;?>
--                            value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
-+                            value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
-                             onclick="ProductConfigure.bundleControl.changeSelection(this)"
--                            price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>" />
-+                            price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selection)) ?>" />
- 
-                         <label class="admin__field-label"
--                               for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
--                            <span><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection) ?></span>
-+                               for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>">
-+                            <span><?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selection) ?></span>
-                         </label>
- 
--                        <?php if ($_option->getRequired()): ?>
--                            <?= /* @escapeNotVerified */ $block->setValidationContainer('bundle-option-' . $_option->getId() . '-' . $_selection->getSelectionId(), 'bundle-option-' . $_option->getId() . '-container') ?>
-+                        <?php if ($_option->getRequired()) : ?>
-+                            <?=  /* @noEscape */ $block->setValidationContainer('bundle-option-' . $_option->getId() . '-' . $_selection->getSelectionId(), 'bundle-option-' . $_option->getId() . '-container') ?>
-                         <?php endif;?>
-                     </div>
-                 <?php endforeach; ?>
- 
--                <div id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></div>
-+                <div id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></div>
-             <?php endif; ?>
-         </div>
-     </div>
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
-index 8c13dd6479d..f4c4e3e51ae 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
-@@ -3,32 +3,34 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Multi */ ?>
- <?php $_option = $block->getOption(); ?>
- <?php $_selections = $_option->getSelections(); ?>
--<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
--<div class="field admin__field <?php if ($_option->getRequired()) echo ' required' ?><?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?>">
-+<?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
-+<div class="field admin__field <?php if ($_option->getRequired()) { echo ' required'; } ?><?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?>">
-     <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
-     <div class="control admin__field-control">
--        <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
--            <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
--            <input type="hidden" name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"
--                   price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selections[0]) ?>" />
--        <?php else: ?>
--            <select multiple="multiple" size="5" id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
--                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][]"
--                    class="admin__control-multiselect bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> multiselect change-container-classname"
-+        <?php if (count($_selections) == 1 && $_option->getRequired()) : ?>
-+            <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
-+            <input type="hidden" name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                   value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"
-+                   price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selections[0])) ?>" />
-+        <?php else : ?>
-+            <select multiple="multiple" size="5" id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"
-+                    name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>][]"
-+                    class="admin__control-multiselect bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?><?php if ($_option->getRequired()) { echo ' required-entry'; } ?> multiselect change-container-classname"
-                     onchange="ProductConfigure.bundleControl.changeSelection(this)">
--            <?php if(!$_option->getRequired()): ?>
--                <option value=""><?= /* @escapeNotVerified */ __('None') ?></option>
-+            <?php if (!$_option->getRequired()) : ?>
-+                <option value=""><?= $block->escapeHtml(__('None')) ?></option>
-             <?php endif; ?>
--            <?php foreach ($_selections as $_selection): ?>
--                <option value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>"><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection, false) ?></option>
-+            <?php foreach ($_selections as $_selection) : ?>
-+                <option value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
-+                    <?php if ($block->isSelected($_selection)) { echo ' selected="selected"'; } ?>
-+                    <?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) { echo ' disabled="disabled"'; } ?>
-+                    price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selection)) ?>">
-+                    <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selection, false) ?></option>
-             <?php endforeach; ?>
-             </select>
-         <?php endif; ?>
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
-index f0912979a92..0c3835fb32a 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
-@@ -3,69 +3,73 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Radio */ ?>
- <?php $_option = $block->getOption(); ?>
- <?php $_selections  = $_option->getSelections(); ?>
- <?php $_default = $_option->getDefaultSelection(); ?>
--<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
-+<?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
- <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
- 
--<div class="field admin__field options<?php if ($_option->getRequired()) echo ' required' ?>">
-+<div class="field admin__field options<?php if ($_option->getRequired()) { echo ' required'; } ?>">
-     <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
-     <div class="control admin__field-control">
--        <div class="nested<?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?>">
--        <?php if ($block->showSingle()): ?>
--            <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
-+        <div class="nested<?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?>">
-+        <?php if ($block->showSingle()) : ?>
-+            <?= /* @noEscape */ $block->getSelectionTitlePrice($_selections[0]) ?>
-             <input type="hidden"
--                   name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"
--                   price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selections[0]) ?>" />
--        <?php else:?>
--            <?php if (!$_option->getRequired()): ?>
-+                   name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                   value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"
-+                   price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selections[0])) ?>" />
-+        <?php else :?>
-+            <?php if (!$_option->getRequired()) : ?>
-                 <div class="field choice admin__field admin__field-option">
-                     <input type="radio"
-                            class="radio admin__control-radio"
--                           id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
--                           name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"<?= ($_default && $_default->isSalable()) ? '' : ' checked="checked" ' ?>
-+                           id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"
-+                           name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"<?= ($_default && $_default->isSalable()) ? '' : ' checked="checked" ' ?>
-                            value=""
-                            onclick="ProductConfigure.bundleControl.changeSelection(this)" />
-                     <label class="admin__field-label"
--                           for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"><span><?= /* @escapeNotVerified */ __('None') ?></span></label>
-+                           for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"><span><?= $block->escapeHtml(__('None')) ?></span></label>
-                 </div>
-             <?php endif; ?>
- 
--            <?php foreach ($_selections as $_selection): ?>
-+            <?php foreach ($_selections as $_selection) : ?>
-                 <div class="field choice admin__field admin__field-option">
-                     <input type="radio"
-                            class="radio admin__control-radio <?= $_option->getRequired() ? ' validate-one-required-by-name' : '' ?> change-container-classname"
--                           id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
--                           name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                           <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>
--                           value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
-+                           id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
-+                           name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                           <?php if ($block->isSelected($_selection)) { echo ' checked="checked"'; } ?>
-+                           <?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) { echo ' disabled="disabled"'; } ?>
-+                           value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
-                            onclick="ProductConfigure.bundleControl.changeSelection(this)"
--                           price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>"
--                           qtyId="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input" />
-+                           price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selection)) ?>"
-+                           qtyId="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input" />
-                     <label class="admin__field-label"
--                           for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"><span><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection) ?></span></label>
--                <?php if ($_option->getRequired()): ?>
--                    <?= /* @escapeNotVerified */ $block->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
-+                           for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>">
-+                        <span><?= /* @noEscape */ $block->getSelectionTitlePrice($_selection) ?></span>
-+                    </label>
-+                <?php if ($_option->getRequired()) : ?>
-+                    <?= /* @noEscape */ $block->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
-                 <?php endif; ?>
-                 </div>
-             <?php endforeach; ?>
--            <div id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></div>
-+            <div id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></div>
-         <?php endif; ?>
-             <div class="field admin__field qty">
-                 <label class="label admin__field-label"
--                       for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"><span><?= /* @escapeNotVerified */ __('Quantity:') ?></span></label>
--                <div class="control admin__field-control"><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
--                        id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
--                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
-+                       for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input">
-+                    <span><?= $block->escapeHtml(__('Quantity:')) ?></span>
-+                </label>
-+                <div class="control admin__field-control"><input <?php if (!$_canChangeQty) { echo ' disabled="disabled"'; } ?>
-+                        id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input"
-+                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
-                         type="text"
--                        name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]" value="<?= /* @escapeNotVerified */ $_defaultQty ?>" />
-+                        name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                        value="<?= $block->escapeHtmlAttr($_defaultQty) ?>" />
-                 </div>
-             </div>
-         </div>
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
-index 32766f62163..fbb7f7fbb7b 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
-@@ -3,36 +3,39 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Select */ ?>
- <?php $_option      = $block->getOption(); ?>
- <?php $_selections  = $_option->getSelections(); ?>
- <?php $_default     = $_option->getDefaultSelection(); ?>
--<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
-+<?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
- <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
- 
--<div class="field admin__field option<?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?><?php if ($_option->getRequired()) echo ' required _required' ?>">
-+<div class="field admin__field option<?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?><?php if ($_option->getRequired()) { echo ' required _required'; } ?>">
-     <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
-     <div class="control admin__field-control">
--        <?php if ($block->showSingle()): ?>
--            <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
--            <input type="hidden" name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"
--                   price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selections[0]) ?>" />
--        <?php else:?>
--            <select id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
--                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> select admin__control-select change-container-classname"
-+        <?php if ($block->showSingle()) : ?>
-+            <?= /* @noEscape */ $block->getSelectionTitlePrice($_selections[0]) ?>
-+            <input type="hidden"
-+                   name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                   value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"
-+                   price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selections[0])) ?>" />
-+        <?php else :?>
-+            <select id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"
-+                    name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                    class="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?><?php if ($_option->getRequired()) { echo ' required-entry'; } ?> select admin__control-select change-container-classname"
-                     onchange="ProductConfigure.bundleControl.changeSelection(this)">
--                <option value=""><?= /* @escapeNotVerified */ __('Choose a selection...') ?></option>
--                <?php foreach ($_selections as $_selection): ?>
-+                <option value=""><?= $block->escapeHtml(__('Choose a selection...')) ?></option>
-+                <?php foreach ($_selections as $_selection) : ?>
-                     <option
--                        value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>
--                        price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>"
--                        qtyId="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection, false) ?></option>
-+                        value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
-+                        <?php if ($block->isSelected($_selection)) { echo ' selected="selected"'; } ?>
-+                        <?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) { echo ' disabled="disabled"'; } ?>
-+                        price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selection)) ?>"
-+                        qtyId="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input">
-+                        <?= /* @noEscape */ $block->getSelectionTitlePrice($_selection, false) ?>
-+                    </option>
-                 <?php endforeach; ?>
-             </select>
-         <?php endif; ?>
-@@ -40,12 +43,16 @@
-         <div class="nested">
-             <div class="field admin__field qty">
-                 <label class="label admin__field-label"
--                       for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"><span><?= /* @escapeNotVerified */ __('Quantity:') ?></span></label>
-+                       for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input">
-+                    <span><?= $block->escapeHtml(__('Quantity:')) ?></span>
-+                </label>
-                 <div class="control admin__field-control">
--                    <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
--                        id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
--                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text"
--                        name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]" value="<?= /* @escapeNotVerified */ $_defaultQty ?>" />
-+                    <input <?php if (!$_canChangeQty) { echo ' disabled="disabled"'; } ?>
-+                        id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input"
-+                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
-+                        type="text"
-+                        name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                        value="<?= $block->escapeHtmlAttr($_defaultQty) ?>" />
-                 </div>
-             </div>
-         </div>
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
-index 5b27412dd88..c8ab6cc5b98 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle */
- ?>
- <script>
-@@ -19,14 +17,20 @@ if(typeof Bundle=='undefined') {
- <div id="bundle_product_container" class="entry-edit form-inline">
-     <fieldset class="fieldset">
-         <div class="field field-ship-bundle-items">
--            <label for="shipment_type" class="label"><?= /* @escapeNotVerified */ __('Ship Bundle Items') ?></label>
-+            <label for="shipment_type" class="label"><?= $block->escapeHtml(__('Ship Bundle Items')) ?></label>
-             <div class="control">
--                <select <?php if ($block->isReadonly()): ?>disabled="disabled" <?php endif;?>
-+                <select <?php if ($block->isReadonly()) : ?>disabled="disabled" <?php endif;?>
-                         id="shipment_type"
--                        name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[shipment_type]"
-+                        name="<?= $block->escapeHtmlAttr($block->getFieldSuffix()) ?>[shipment_type]"
-                         class="select">
--                    <option value="1"><?= /* @escapeNotVerified */ __('Separately') ?></option>
--                    <option value="0"<?php if ($block->getProduct()->getShipmentType() == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Together') ?></option>
-+                    <option value="1"><?= $block->escapeHtml(__('Separately')) ?></option>
-+                    <option value="0"
-+                        <?php if ($block->getProduct()->getShipmentType() == 0) : ?>
-+                            selected="selected"
-+                        <?php endif; ?>
-+                    >
-+                        <?= $block->escapeHtml(__('Together')) ?>
-+                    </option>
-                 </select>
-             </div>
-         </div>
-@@ -48,7 +52,7 @@ require(["prototype", "mage/adminhtml/form"], function(){
-     // re-bind form elements onchange
-     varienWindowOnload(true);
- 
--    <?php if ($block->isReadonly()):?>
-+    <?php if ($block->isReadonly()) :?>
-     $('product_bundle_container').select('input', 'select', 'textarea', 'button').each(function(input){
-         input.disabled = true;
-         if (input.tagName.toLowerCase() == 'button') {
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
-index 783d71beb16..4d68d363b74 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
-@@ -3,16 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option */
- ?>
- <script id="bundle-option-template" type="text/x-magento-template">
--    <div id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>" class="option-box">
--        <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>-wrapper">
-+    <div id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>" class="option-box">
-+        <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-wrapper">
-             <div class="fieldset-wrapper-title">
--                <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>-content">
-+                <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
-                     <span><%- data.default_title %></span>
-                 </strong>
-                 <div class="actions">
-@@ -20,55 +18,56 @@
-                 </div>
-                 <div data-role="draggable-handle" class="draggable-handle"></div>
-             </div>
--            <div class="fieldset-wrapper-content in collapse" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>-content">
-+            <div class="fieldset-wrapper-content in collapse" id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
-                 <fieldset class="fieldset">
-                     <fieldset class="fieldset-alt">
-                         <div class="field field-option-title required">
--                            <label class="label" for="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_title">
--                                <?= /* @escapeNotVerified */ __('Option Title') ?>
-+                            <label class="label" for="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_title">
-+                                <?= $block->escapeHtml(__('Option Title')) ?>
-                             </label>
-                             <div class="control">
--                                <?php if ($block->isDefaultStore()): ?>
-+                                <?php if ($block->isDefaultStore()) : ?>
-                                 <input class="input-text required-entry"
-                                        type="text"
--                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][title]"
--                                       id="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_title"
-+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][title]"
-+                                       id="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_title"
-                                        value="<%- data.title %>"
-                                        data-original-value="<%- data.title %>" />
--                                <?php else: ?>
-+                                <?php else : ?>
-                                 <input class="input-text required-entry"
-                                        type="text"
--                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][default_title]"
--                                       id="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_default_title"
-+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][default_title]"
-+                                       id="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_default_title"
-                                        value="<%- data.default_title %>"
-                                        data-original-value="<%- data.default_title %>" />
-                                 <?php endif; ?>
-                                 <input type="hidden"
--                                       id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_id_<%- data.index %>"
--                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][option_id]"
-+                                       id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_id_<%- data.index %>"
-+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][option_id]"
-                                        value="<%- data.option_id %>" />
-                                 <input type="hidden"
--                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][delete]"
-+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][delete]"
-                                        value=""
-                                        data-state="deleted" />
-                             </div>
-                         </div>
--                        <?php if (!$block->isDefaultStore()): ?>
-+                        <?php if (!$block->isDefaultStore()) : ?>
-                         <div class="field field-option-store-view required">
--                            <label class="label" for="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_title_store">
--                                <?= /* @escapeNotVerified */ __('Store View Title') ?>
-+                            <label class="label" for="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_title_store">
-+                                <?= $block->escapeHtml(__('Store View Title')) ?>
-                             </label>
-                             <div class="control">
--                                <input class="input-text required-entry" type="text"
--                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][title]"
--                                       id="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_title_store"
-+                                <input class="input-text required-entry"
-+                                       type="text"
-+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][title]"
-+                                       id="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_title_store"
-                                        value="<%- data.title %>" />
-                             </div>
-                         </div>
-                         <?php endif; ?>
-                         <div class="field field-option-input-type required">
--                            <label class="label" for="<?= /* @escapeNotVerified */ $block->getFieldId() . '_<%- data.index %>_type' ?>">
--                                <?= /* @escapeNotVerified */ __('Input Type') ?>
-+                            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId() . '_<%- data.index %>_type') ?>">
-+                                <?= $block->escapeHtml(__('Input Type')) ?>
-                             </label>
-                             <div class="control">
-                                 <?= $block->getTypeSelectHtml() ?>
-@@ -81,19 +80,19 @@
-                                        checked="checked"
-                                        id="field-option-req" />
-                                 <label for="field-option-req">
--                                    <?= /* @escapeNotVerified */ __('Required') ?>
-+                                    <?= $block->escapeHtml(__('Required')) ?>
-                                 </label>
-                                 <span style="display:none"><?= $block->getRequireSelectHtml() ?></span>
-                             </div>
-                         </div>
-                         <div class="field field-option-position no-display">
-                             <label class="label" for="field-option-position">
--                                <?= /* @escapeNotVerified */ __('Position') ?>
-+                                <?= $block->escapeHtml(__('Position')) ?>
-                             </label>
-                             <div class="control">
-                                 <input class="input-text validate-zero-or-greater"
-                                        type="text"
--                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][position]"
-+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][position]"
-                                        value="<%- data.position %>"
-                                        id="field-option-position" />
-                             </div>
-@@ -101,13 +100,13 @@
-                     </fieldset>
- 
-                     <div class="no-products-message">
--                        <?= /* @escapeNotVerified */ __('There are no products in this option.') ?>
-+                        <?= $block->escapeHtml(__('There are no products in this option.')) ?>
-                     </div>
-                     <?= $block->getAddSelectionButtonHtml() ?>
-                 </fieldset>
-             </div>
-         </div>
--        <div id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_search_<%- data.index %>" class="selection-search"></div>
-+        <div id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_search_<%- data.index %>" class="selection-search"></div>
-     </div>
- </script>
- 
-@@ -141,7 +140,7 @@ function changeInputType(oldObject, oType) {
- 
- Bundle.Option = Class.create();
- Bundle.Option.prototype = {
--    idLabel : '<?= /* @escapeNotVerified */ $block->getFieldId() ?>',
-+    idLabel : '<?= $block->escapeJs($block->getFieldId()) ?>',
-     templateText : '',
-     itemsCount : 0,
-     initialize : function(template) {
-@@ -150,7 +149,7 @@ Bundle.Option.prototype = {
- 
-     add : function(data) {
-         if (!data) {
--            data = <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(['default_title' => __('New Option')]) ?>;
-+            data = <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode(['default_title' => __('New Option')]) ?>;
-         } else {
-             data.title = data.title.replace(/</g, "&lt;");
-             data.title = data.title.replace(/"/g, "&quot;");
-@@ -280,17 +279,17 @@ Bundle.Option.prototype = {
- var optionIndex = 0;
- bOption = new Bundle.Option(optionTemplate);
- <?php
--    foreach ($block->getOptions() as $_option) {
--        /** @var $_option \Magento\Bundle\Model\Option */
--        /* @escapeNotVerified */ echo 'optionIndex = bOption.add(', $_option->toJson(), ');', PHP_EOL;
--        if ($_option->getSelections()) {
--            foreach ($_option->getSelections() as $_selection) {
--                /** @var $_selection \Magento\Catalog\Model\Product */
--                $_selection->setName($block->escapeHtml($_selection->getName()));
--                /* @escapeNotVerified */ echo 'bSelection.addRow(optionIndex,', $_selection->toJson(), ');', PHP_EOL;
--            }
-+foreach ($block->getOptions() as $_option) {
-+    /** @var $_option \Magento\Bundle\Model\Option */
-+    /* @noEscape */ echo 'optionIndex = bOption.add(', $_option->toJson(), ');', PHP_EOL;
-+    if ($_option->getSelections()) {
-+        foreach ($_option->getSelections() as $_selection) {
-+            /** @var $_selection \Magento\Catalog\Model\Product */
-+            $_selection->setName($block->escapeHtml($_selection->getName()));
-+            /* @noEscape */ echo 'bSelection.addRow(optionIndex,', $_selection->toJson(), ');', PHP_EOL;
-         }
-     }
-+}
- ?>
- function togglePriceType() {
-     bOption['priceType' + ($('price_type').value == '1' ? 'Fixed' : 'Dynamic')]();
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
-index 91c245afe57..0f1167f3d3e 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection */
- ?>
- <script id="bundle-option-selection-box-template" type="text/x-magento-template">
-@@ -13,16 +11,16 @@
-         <thead>
-             <tr class="headings">
-                 <th class="col-draggable"></th>
--                <th class="col-default"><?= /* @escapeNotVerified */ __('Default') ?></th>
--                <th class="col-name"><?= /* @escapeNotVerified */ __('Name') ?></th>
--                <th class="col-sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
--            <?php if ($block->getCanReadPrice() !== false): ?>
--                <th class="col-price price-type-box"><?= /* @escapeNotVerified */ __('Price') ?></th>
--                <th class="col-price price-type-box"><?= /* @escapeNotVerified */ __('Price Type') ?></th>
-+                <th class="col-default"><?= $block->escapeHtml(__('Default')) ?></th>
-+                <th class="col-name"><?= $block->escapeHtml(__('Name')) ?></th>
-+                <th class="col-sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-+            <?php if ($block->getCanReadPrice() !== false) : ?>
-+                <th class="col-price price-type-box"><?= $block->escapeHtml(__('Price')) ?></th>
-+                <th class="col-price price-type-box"><?= $block->escapeHtml(__('Price Type')) ?></th>
-             <?php endif; ?>
--                <th class="col-qty"><?= /* @escapeNotVerified */ __('Default Quantity') ?></th>
--                <th class="col-uqty qty-box"><?= /* @escapeNotVerified */ __('User Defined') ?></th>
--                <th class="col-order type-order" style="display:none"><?= /* @escapeNotVerified */ __('Position') ?></th>
-+                <th class="col-qty"><?= $block->escapeHtml(__('Default Quantity')) ?></th>
-+                <th class="col-uqty qty-box"><?= $block->escapeHtml(__('User Defined')) ?></th>
-+                <th class="col-order type-order" style="display:none"><?= $block->escapeHtml(__('Position')) ?></th>
-                 <th class="col-actions"></th>
-             </tr>
-         </thead>
-@@ -33,31 +31,38 @@
- <script id="bundle-option-selection-row-template" type="text/x-magento-template">
-     <td class="col-draggable">
-         <span data-role="draggable-handle" class="draggable-handle"></span>
--        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_id<%- data.index %>"
--               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_id]"
-+        <input type="hidden"
-+               id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_id<%- data.index %>"
-+               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_id]"
-                value="<%- data.selection_id %>"/>
--        <input type="hidden" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][option_id]"
-+        <input type="hidden"
-+               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][option_id]"
-                value="<%- data.option_id %>"/>
--        <input type="hidden" class="product"
--               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][product_id]"
-+        <input type="hidden"
-+               class="product"
-+               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][product_id]"
-                value="<%- data.product_id %>"/>
--        <input type="hidden" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][delete]"
--               value="" class="delete"/>
-+        <input type="hidden" name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][delete]"
-+               value=""
-+               class="delete"/>
-     </td>
-     <td class="col-default">
--        <input onclick="bSelection.checkGroup(event)" type="<%- data.option_type %>" class="default"
--               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][is_default]"
-+        <input onclick="bSelection.checkGroup(event)"
-+               type="<%- data.option_type %>"
-+               class="default"
-+               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][is_default]"
-                value="1" <%- data.checked %> />
-     </td>
-     <td class="col-name"><%- data.name %></td>
-     <td class="col-sku"><%- data.sku %></td>
--<?php if ($block->getCanReadPrice() !== false): ?>
-+<?php if ($block->getCanReadPrice() !== false) : ?>
-     <td class="col-price price-type-box">
--        <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>_price_value"
--               class="input-text required-entry validate-zero-or-greater" type="text"
--               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]"
-+        <input id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>_price_value"
-+               class="input-text required-entry validate-zero-or-greater"
-+               type="text"
-+               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]"
-                value="<%- data.selection_price_value %>"
--            <?php if ($block->getCanEditPrice() === false): ?>
-+            <?php if ($block->getCanEditPrice() === false) : ?>
-                disabled="disabled"
-             <?php endif; ?>/>
-     </td>
-@@ -65,19 +70,23 @@
-         <?= $block->getPriceTypeSelectHtml() ?>
-         <div><?= $block->getCheckboxScopeHtml() ?></div>
-     </td>
--<?php else: ?>
--    <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>_price_value"
--           name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]" value="0" />
--    <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>_price_type"
--           name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_type]" value="0" />
--    <?php if ($block->isUsedWebsitePrice()): ?>
--    <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>_price_scope"
--           name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][default_price_scope]" value="1" />
-+<?php else : ?>
-+    <input type="hidden"
-+           id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>_price_value"
-+           name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]" value="0" />
-+    <input type="hidden"
-+           id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>_price_type"
-+           name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_type]" value="0" />
-+    <?php if ($block->isUsedWebsitePrice()) : ?>
-+    <input type="hidden"
-+           id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>_price_scope"
-+           name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][default_price_scope]" value="1" />
-     <?php endif; ?>
- <?php endif; ?>
-     <td class="col-qty">
--        <input class="input-text required-entry validate-greater-zero-based-on-option validate-zero-or-greater" type="text"
--               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_qty]"
-+        <input class="input-text required-entry validate-greater-zero-based-on-option validate-zero-or-greater"
-+               type="text"
-+               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_qty]"
-                value="<%- data.selection_qty %>" />
-     </td>
-     <td class="col-uqty qty-box">
-@@ -85,8 +94,9 @@
-         <span style="display:none"><?= $block->getQtyTypeSelectHtml() ?></span>
-     </td>
-     <td class="col-order type-order" style="display:none">
--        <input class="input-text required-entry validate-zero-or-greater" type="text"
--               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][position]"
-+        <input class="input-text required-entry validate-zero-or-greater"
-+               type="text"
-+               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][position]"
-                value="<%- data.position %>" />
-     </td>
-     <td class="col-actions">
-@@ -106,7 +116,7 @@ var bundleTemplateBox = jQuery('#bundle-option-selection-box-template').html(),
- 
- Bundle.Selection = Class.create();
- Bundle.Selection.prototype = {
--    idLabel : '<?= /* @escapeNotVerified */ $block->getFieldId() ?>',
-+    idLabel : '<?= $block->escapeJs($block->getFieldId()) ?>',
-     scopePrice : <?= (int)$block->isUsedWebsitePrice() ?>,
-     templateBox : '',
-     templateRow : '',
-@@ -115,7 +125,7 @@ Bundle.Selection.prototype = {
-     gridSelection: new Hash(),
-     gridRemoval: new Hash(),
-     gridSelectedProductSkus: [],
--    selectionSearchUrl: '<?= /* @escapeNotVerified */ $block->getSelectionSearchUrl() ?>',
-+    selectionSearchUrl: '<?= $block->escapeUrl($block->getSelectionSearchUrl()) ?>',
- 
-     initialize : function() {
-         this.templateBox = '<div class="tier form-list" id="' + this.idLabel + '_box_<%- data.parentIndex %>">' + bundleTemplateBox + '</div>';
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
-index 3aba02fadff..c480d9b126d 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php
- /**
-@@ -21,19 +19,19 @@
- 
- <?php $_prevOptionId = '' ?>
- 
--<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
-+<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
-     <?php $_showlastRow = true ?>
--<?php else: ?>
-+<?php else : ?>
-     <?php $_showlastRow = false ?>
- <?php endif; ?>
- 
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
-     <?php $block->setPriceDataObject($_item) ?>
-     <?php $attributes = $block->getSelectionAttributes($_item) ?>
--    <?php if ($_item->getOrderItem()->getParentItem()): ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-         <tr>
--            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
-+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
-             <td>&nbsp;</td>
-             <td>&nbsp;</td>
-             <td>&nbsp;</td>
-@@ -43,165 +41,164 @@
-             <td>&nbsp;</td>
-             <td class="last">&nbsp;</td>
-         </tr>
--        <?php $_prevOptionId = $attributes['option_id'] ?>
-+            <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
-     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
--        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-+        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-         <td class="col-product">
-             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
-             <div class="product-sku-block">
--                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
--                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
-+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
-             </div>
-         </td>
--        <?php else: ?>
-+        <?php else : ?>
-         <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
-         <?php endif; ?>
-         <td class="col-price">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'price') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-ordered-qty">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <table class="qty-table">
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Ordered')) ?></th>
-+                        <td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
-                     </tr>
--                    <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
-+                    <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Invoiced') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Invoiced')) ?></th>
-+                        <td><?= (float)$_item->getOrderItem()->getQtyInvoiced() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
--                    <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
-+                    <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyShipped()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Shipped')) ?></th>
-+                        <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
--                    <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
-+                    <?php if ((float) $_item->getOrderItem()->getQtyRefunded()) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Refunded') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Refunded')) ?></th>
-+                        <td><?= (float)$_item->getOrderItem()->getQtyRefunded() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
--                    <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
-+                    <?php if ((float) $_item->getOrderItem()->getQtyCanceled()) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Canceled') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Canceled')) ?></th>
-+                        <td><?= (float)$_item->getOrderItem()->getQtyCanceled() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
-                 </table>
--            <?php elseif ($block->isShipmentSeparately($_item)): ?>
-+            <?php elseif ($block->isShipmentSeparately($_item)) : ?>
-                 <table class="qty-table">
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Ordered')) ?></th>
-+                        <td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
-                     </tr>
--                    <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
-+                    <?php if ((float) $_item->getOrderItem()->getQtyShipped()) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyShipped()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Shipped')) ?></th>
-+                        <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
-                 </table>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <?php if ($block->canParentReturnToStock($_item)) : ?>
-         <td class="col-return-to-stock">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?php if ($block->canReturnItemToStock($_item)) : ?>
-                     <input type="checkbox"
-                            class="admin__control-checkbox"
--                           name="creditmemo[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>][back_to_stock]"
--                           value="1"<?php if ($_item->getBackToStock()):?> checked="checked"<?php endif;?> />
-+                           name="creditmemo[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>][back_to_stock]"
-+                           value="1"<?php if ($_item->getBackToStock()) :?> checked="checked"<?php endif;?> />
-                     <label class="admin__field-label"></label>
-                 <?php endif; ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <?php endif; ?>
-         <td class="col-refund col-qty">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?php if ($block->canEditQty()) : ?>
-                     <input type="text"
-                            class="input-text admin__control-text qty-input"
--                           name="creditmemo[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>][qty]"
--                           value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" />
--                <?php else: ?>
--                    <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
-+                           name="creditmemo[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>][qty]"
-+                           value="<?= (float)$_item->getQty() * 1 ?>" />
-+                <?php else : ?>
-+                    <?= (float)$_item->getQty() * 1 ?>
-                 <?php endif; ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-subtotal">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-tax-amount">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-discont">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-total last">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'total') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-     </tr>
- <?php endforeach; ?>
--<?php if ($_showlastRow): ?>
-+<?php if ($_showlastRow) : ?>
-     <tr class="border">
-         <td class="col-product">
--            <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
-+            <?php if ($block->getOrderOptions($_item->getOrderItem())) : ?>
-                 <dl class="item-options">
--                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
--                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
-+                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option) : ?>
-+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
-                     <dd>
--                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
--                        <?= /* @escapeNotVerified */ $option['value'] ?>
--                    <?php else: ?>
--                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
--                        <?php if ($_remainder):?>
--                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
-+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
-+                        <?= $block->escapeHtml($option['value']) ?>
-+                    <?php else : ?>
-+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-+                        <?php if ($_remainder) :?>
-+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                             <script>
--require(['prototype'], function(){
--
--    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
--
--});
--</script>
-+                                require(['prototype'], function(){
-+                                    <?php $escapedId = $block->escapeJs($_id) ?>
-+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
-+                                });
-+                            </script>
-                         <?php endif;?>
-                     <?php endif;?>
-                     </dd>
-                 <?php endforeach; ?>
-                 </dl>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-             <?= $block->escapeHtml($_item->getDescription()) ?>
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
-index a9e71a79f89..0d54e1528df 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php
- /**
-@@ -21,19 +19,19 @@
- 
- <?php $_prevOptionId = '' ?>
- 
--<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
-+<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
-     <?php $_showlastRow = true ?>
--<?php else: ?>
-+<?php else : ?>
-     <?php $_showlastRow = false ?>
- <?php endif; ?>
- 
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
-     <?php $block->setPriceDataObject($_item) ?>
-     <?php $attributes = $block->getSelectionAttributes($_item) ?>
--    <?php if ($_item->getOrderItem()->getParentItem()): ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-         <tr>
--            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
-+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
-             <td>&nbsp;</td>
-             <td>&nbsp;</td>
-             <td>&nbsp;</td>
-@@ -41,88 +39,87 @@
-             <td>&nbsp;</td>
-             <td class="last">&nbsp;</td>
-         </tr>
--        <?php $_prevOptionId = $attributes['option_id'] ?>
-+            <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
-     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
--        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-+        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-         <td class="col-product">
-             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
-             <div class="product-sku-block">
--                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
--                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
-+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
-             </div>
-         </td>
--        <?php else: ?>
-+        <?php else : ?>
-         <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
-         <?php endif; ?>
-         <td class="col-price">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'price') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-qty">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= (float)$_item->getQty() * 1 ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-subtotal">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-tax">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-discount">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-total last">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'total') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-     </tr>
- <?php endforeach; ?>
--<?php if ($_showlastRow): ?>
-+<?php if ($_showlastRow) : ?>
-     <tr class="border">
-         <td class="col-product">
--            <?php if ($block->getOrderOptions()): ?>
-+            <?php if ($block->getOrderOptions()) : ?>
-                 <dl class="item-options">
--                <?php foreach ($block->getOrderOptions() as $option): ?>
--                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
-+                <?php foreach ($block->getOrderOptions() as $option) : ?>
-+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
-                     <dd>
--                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
--                        <?= /* @escapeNotVerified */ $option['value'] ?>
--                    <?php else: ?>
--                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
--                        <?php if ($_remainder):?>
--                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
-+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
-+                        <?= $block->escapeHtml($option['value']) ?>
-+                    <?php else : ?>
-+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-+                        <?php if ($_remainder) :?>
-+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                             <script>
--require(['prototype'], function(){
--
--    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
--
--});
--</script>
-+                                require(['prototype'], function(){
-+                                    <?php $escapedId = $block->escapeJs($_id) ?>
-+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
-+                                });
-+                            </script>
-                         <?php endif;?>
-                     <?php endif;?>
-                     </dd>
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
-index ff26d67bd83..a7d49b4b353 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php
- /**
-@@ -21,19 +19,28 @@
- 
- <?php $_prevOptionId = '' ?>
- 
--<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
-+<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
-     <?php $_showlastRow = true ?>
--<?php else: ?>
-+<?php else : ?>
-     <?php $_showlastRow = false ?>
- <?php endif; ?>
- 
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
-+    <?php
-+    $shipTogether = ($_item->getOrderItem()->getProductType() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) ?
-+        !$_item->getOrderItem()->isShipSeparately() : !$_item->getOrderItem()->getParentItem()->isShipSeparately()
-+    ?>
-     <?php $block->setPriceDataObject($_item) ?>
--    <?php if ($_item->getOrderItem()->getParentItem()): ?>
-+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
-+        <?php
-+        if ($shipTogether) {
-+            continue;
-+        }
-+        ?>
-         <?php $attributes = $block->getSelectionAttributes($_item) ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-         <tr>
--            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
-+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
-             <td>&nbsp;</td>
-             <td>&nbsp;</td>
-             <td>&nbsp;</td>
-@@ -42,152 +49,152 @@
-             <td>&nbsp;</td>
-             <td class="last">&nbsp;</td>
-         </tr>
--        <?php $_prevOptionId = $attributes['option_id'] ?>
-+            <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
-     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
--        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-+        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-         <td class="col-product">
-             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
-             <div class="product-sku-block">
--                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
--                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
-+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
-             </div>
-         </td>
--        <?php else: ?>
-+        <?php else : ?>
-         <td class="col-product">
-             <div class="option-value"><?= $block->getValueHtml($_item) ?></div>
-         </td>
-         <?php endif; ?>
-         <td class="col-price">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item) || $shipTogether) : ?>
-                 <?= $block->getColumnHtml($_item, 'price') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-qty">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item) || $shipTogether) : ?>
-                 <table class="qty-table">
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
--                        <td><span><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyOrdered()*1 ?></span></td>
-+                        <th><?= $block->escapeHtml(__('Ordered')) ?></th>
-+                        <td><span><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></span></td>
-                     </tr>
--                    <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
-+                    <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Invoiced') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Invoiced')) ?></th>
-+                        <td><?= (float)$_item->getOrderItem()->getQtyInvoiced() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
--                    <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
-+                    <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyShipped()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Shipped')) ?></th>
-+                        <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
--                    <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
-+                    <?php if ((float) $_item->getOrderItem()->getQtyRefunded()) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Refunded') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Refunded')) ?></th>
-+                        <td><?= (float)$_item->getOrderItem()->getQtyRefunded() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
--                    <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
-+                    <?php if ((float) $_item->getOrderItem()->getQtyCanceled()) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Canceled') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Canceled')) ?></th>
-+                        <td><?= (float)$_item->getOrderItem()->getQtyCanceled() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
-                 </table>
--            <?php elseif ($block->isShipmentSeparately($_item)): ?>
-+            <?php elseif ($block->isShipmentSeparately($_item)) : ?>
-                 <table class="qty-table">
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Ordered')) ?></th>
-+                        <td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
-                     </tr>
--                    <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
-+                    <?php if ((float) $_item->getOrderItem()->getQtyShipped()) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyShipped()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Shipped')) ?></th>
-+                        <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
-                 </table>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-                         <?php endif; ?>
-         </td>
-         <td class="col-qty-invoice">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item) || $shipTogether) : ?>
-                 <?php if ($block->canEditQty()) : ?>
-                     <input type="text"
-                            class="input-text admin__control-text qty-input"
--                           name="invoice[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]"
--                           value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" />
-+                           name="invoice[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>]"
-+                           value="<?= (float)$_item->getQty() * 1 ?>" />
-                 <?php else : ?>
--                    <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
-+                    <?= (float)$_item->getQty() * 1 ?>
-                 <?php endif; ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-subtotal">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-tax">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-discount">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-total last">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'total') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-     </tr>
- <?php endforeach; ?>
--<?php if ($_showlastRow): ?>
-+<?php if ($_showlastRow) : ?>
-     <tr class="border">
-         <td class="col-product">
--            <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
-+            <?php if ($block->getOrderOptions($_item->getOrderItem())) : ?>
-                 <dl class="item-options">
--                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
--                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
-+                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option) : ?>
-+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
-                     <dd>
--                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
--                        <?= /* @escapeNotVerified */ $option['value'] ?>
--                    <?php else: ?>
--                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
--                        <?php if ($_remainder):?>
--                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
-+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
-+                        <?= $block->escapeHtml($option['value']) ?>
-+                    <?php else : ?>
-+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-+                        <?php if ($_remainder) :?>
-+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                             <script>
--require(['prototype'], function(){
--
--    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
-+                                require(['prototype'], function(){
-+                                    <?php $escapedId = $block->escapeJs($_id) ?>
-+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId?>').show();});
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
- 
--});
--</script>
-+                                });
-+                            </script>
-                         <?php endif;?>
-                     <?php endif;?>
-                     </dd>
-                 <?php endforeach; ?>
-                 </dl>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-             <?= $block->escapeHtml($_item->getDescription()) ?>
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
-index 5f344409b6a..e29bb5dbc94 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php
- /**
-@@ -21,19 +19,19 @@
- 
- <?php $_prevOptionId = '' ?>
- 
--<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
-+<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
-     <?php $_showlastRow = true ?>
--<?php else: ?>
-+<?php else : ?>
-     <?php $_showlastRow = false ?>
- <?php endif; ?>
- 
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
-     <?php $block->setPriceDataObject($_item) ?>
--    <?php if ($_item->getOrderItem()->getParentItem()): ?>
-+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
-         <?php $attributes = $block->getSelectionAttributes($_item) ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-         <tr>
--            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
-+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
-             <td>&nbsp;</td>
-             <td>&nbsp;</td>
-             <td>&nbsp;</td>
-@@ -41,89 +39,88 @@
-             <td>&nbsp;</td>
-             <td class="last">&nbsp;</td>
-         </tr>
--        <?php $_prevOptionId = $attributes['option_id'] ?>
-+            <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
-     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
--        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-+        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-         <td class="col-product">
-             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
-             <div class="product-sku-block">
--                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
--                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
-+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
-             </div>
--        <?php else: ?>
-+        <?php else : ?>
-         <td class="col-product">
-             <div class="option-value"><?= $block->getValueHtml($_item) ?></div>
-         </td>
-         <?php endif; ?>
-         <td class="col-price">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'price') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-qty">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= (float)$_item->getQty() * 1 ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-subtotal">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-tax">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-discount">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-total last">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'total') ?>
--             <?php else: ?>
-+                <?php else : ?>
-                  &nbsp;
-             <?php endif; ?>
-         </td>
-     </tr>
- <?php endforeach; ?>
--<?php if ($_showlastRow): ?>
-+<?php if ($_showlastRow) : ?>
-     <tr class="border">
-         <td class="col-product">
--            <?php if ($block->getOrderOptions()): ?>
-+            <?php if ($block->getOrderOptions()) : ?>
-                 <dl class="item-options">
--                <?php foreach ($block->getOrderOptions() as $option): ?>
--                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
-+                <?php foreach ($block->getOrderOptions() as $option) : ?>
-+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
-                     <dd>
--                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
--                        <?= /* @escapeNotVerified */ $option['value'] ?>
--                    <?php else: ?>
--                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
--                        <?php if ($_remainder):?>
--                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
-+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
-+                        <?= $block->escapeHtml($option['value']) ?>
-+                    <?php else : ?>
-+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-+                        <?php if ($_remainder) :?>
-+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                             <script>
--require(['protoype'], function(){
--
--    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
--
--});
--</script>
-+                                require(['prototype'], function(){
-+                                    <?php $escapedId = $block->escapeJs($_id) ?>
-+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
-+                                });
-+                            </script>
-                         <?php endif;?>
-                     <?php endif;?>
-                     </dd>
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
-index bb0857a80d6..233e57a0033 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php
- /**
-@@ -16,24 +14,24 @@
- 
- <?php $_item = $block->getItem() ?>
- <?php $items = array_merge([$_item], $_item->getChildrenItems()); ?>
--<?php $_count = count ($items) ?>
-+<?php $_count = count($items) ?>
- <?php $_index = 0 ?>
- 
- <?php $_prevOptionId = '' ?>
- 
--<?php if($block->getOrderOptions() || $_item->getDescription() || $block->canDisplayGiftmessage()): ?>
-+<?php if ($block->getOrderOptions() || $_item->getDescription() || $block->canDisplayGiftmessage()) : ?>
-     <?php $_showlastRow = true ?>
--<?php else: ?>
-+<?php else : ?>
-     <?php $_showlastRow = false ?>
- <?php endif; ?>
- 
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
-     <?php $block->setPriceDataObject($_item) ?>
-     <?php $attributes = $block->getSelectionAttributes($_item) ?>
--    <?php if ($_item->getParentItem()): ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+    <?php if ($_item->getParentItem()) : ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-         <tr>
--            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
-+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
-             <td>&nbsp;</td>
-             <td>&nbsp;</td>
-             <td>&nbsp;</td>
-@@ -44,161 +42,160 @@
-             <td>&nbsp;</td>
-             <td class="last">&nbsp;</td>
-         </tr>
--        <?php $_prevOptionId = $attributes['option_id'] ?>
-+            <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
-     <tr<?= (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
--        <?php if (!$_item->getParentItem()): ?>
-+        <?php if (!$_item->getParentItem()) : ?>
-         <td class="col-product">
--            <div class="product-title" id="order_item_<?= /* @escapeNotVerified */ $_item->getId() ?>_title">
-+            <div class="product-title" id="order_item_<?= $block->escapeHtmlAttr($_item->getId()) ?>_title">
-                 <?= $block->escapeHtml($_item->getName()) ?>
-             </div>
-             <div class="product-sku-block">
--                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
--                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
-+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
-             </div>
-         </td>
--        <?php else: ?>
-+        <?php else : ?>
-         <td class="col-product">
-             <div class="option-value"><?= $block->getValueHtml($_item) ?></div>
-         </td>
-         <?php endif; ?>
-         <td class="col-status">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $_item->getStatus() ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= $block->escapeHtml($_item->getStatus()) ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-price-original">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('original_price') ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= /* @noEscape */ $block->displayPriceAttribute('original_price') ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-price">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'price') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                     &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-ordered-qty">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <table class="qty-table">
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Ordered')) ?></th>
-+                        <td><?= (float)$_item->getQtyOrdered() * 1 ?></td>
-                     </tr>
--                    <?php if ((float) $_item->getQtyInvoiced()): ?>
-+                    <?php if ((float) $_item->getQtyInvoiced()) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Invoiced') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getQtyInvoiced()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Invoiced')) ?></th>
-+                        <td><?= (float)$_item->getQtyInvoiced() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
--                    <?php if ((float) $_item->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
-+                    <?php if ((float) $_item->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Shipped')) ?></th>
-+                        <td><?= (float)$_item->getQtyShipped() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
--                    <?php if ((float) $_item->getQtyRefunded()): ?>
-+                    <?php if ((float) $_item->getQtyRefunded()) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Refunded') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getQtyRefunded()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Refunded')) ?></th>
-+                        <td><?= (float)$_item->getQtyRefunded() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
--                    <?php if ((float) $_item->getQtyCanceled()): ?>
-+                    <?php if ((float) $_item->getQtyCanceled()) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Canceled') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getQtyCanceled()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Canceled')) ?></th>
-+                        <td><?= (float)$_item->getQtyCanceled() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
-                 </table>
--            <?php elseif ($block->isShipmentSeparately($_item)): ?>
-+            <?php elseif ($block->isShipmentSeparately($_item)) : ?>
-                 <table class="qty-table">
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Ordered')) ?></th>
-+                        <td><?= (float)$_item->getQtyOrdered() * 1 ?></td>
-                     </tr>
--                    <?php if ((float) $_item->getQtyShipped()): ?>
-+                    <?php if ((float) $_item->getQtyShipped()) : ?>
-                     <tr>
--                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
--                        <td><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></td>
-+                        <th><?= $block->escapeHtml(__('Shipped')) ?></th>
-+                        <td><?= (float)$_item->getQtyShipped() * 1 ?></td>
-                     </tr>
-                     <?php endif; ?>
-                 </table>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-subtotal">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-tax-amount">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-tax-percent">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $block->displayTaxPercent($_item) ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= /* @noEscape */ $block->displayTaxPercent($_item) ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-discont">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
--                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
--            <?php else: ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-total last">
--            <?php if ($block->canShowPriceInfo($_item)): ?>
-+            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'total') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-     </tr>
- <?php endforeach; ?>
--<?php if($_showlastRow): ?>
--    <tr<?php if (!$block->canDisplayGiftmessage()) echo ' class="border"' ?>>
-+<?php if ($_showlastRow) : ?>
-+    <tr<?php if (!$block->canDisplayGiftmessage()) { echo ' class="border"'; } ?>>
-         <td class="col-product">
--            <?php if ($block->getOrderOptions()): ?>
-+            <?php if ($block->getOrderOptions()) : ?>
-                 <dl class="item-options">
--                <?php foreach ($block->getOrderOptions() as $option): ?>
--                    <dt><?= /* @escapeNotVerified */ $option['label'] ?>:</dt>
-+                <?php foreach ($block->getOrderOptions() as $option) : ?>
-+                    <dt><?= $block->escapeHtml($option['label']) ?>:</dt>
-                     <dd>
--                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
--                        <?= /* @escapeNotVerified */ $option['value'] ?>
--                    <?php else: ?>
--                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
--                        <?php if ($_remainder):?>
--                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
-+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
-+                        <?= $block->escapeHtml($option['value']) ?>
-+                    <?php else : ?>
-+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-+                        <?php if ($_remainder) :?>
-+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                             <script>
--require(['prototype'], function(){
--
--    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
--                            
--});
--</script>
-+                                require(['prototype'], function(){
-+                                    <?php $escapedId = $block->escapeJs($_id) ?>
-+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
-+                                });
-+                            </script>
-                         <?php endif;?>
-                     <?php endif;?>
-                     </dd>
-                 <?php endforeach; ?>
-                 </dl>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-             <?= $block->escapeHtml($_item->getDescription()) ?>
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
-index 2ede8277bcf..2e52ed90662 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- 
- <?php /** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */ ?>
-@@ -17,85 +15,84 @@
- 
- <?php $_prevOptionId = '' ?>
- 
--<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
-+<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
-     <?php $_showlastRow = true ?>
--<?php else: ?>
-+<?php else : ?>
-     <?php $_showlastRow = false ?>
- <?php endif; ?>
- 
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
-     <?php $block->setPriceDataObject($_item) ?>
--    <?php if ($_item->getOrderItem()->getParentItem()): ?>
-+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
-         <?php $attributes = $block->getSelectionAttributes($_item) ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-         <tr>
--            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
-+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
-             <td class="col-product">&nbsp;</td>
-             <td class="col-qty last">&nbsp;</td>
-         </tr>
--        <?php $_prevOptionId = $attributes['option_id'] ?>
-+            <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
-     <tr class="<?= (++$_index == $_count && !$_showlastRow) ? 'border' : '' ?>">
--        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-+        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-         <td class="col-product">
-             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
-             <div class="product-sku-block">
--                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
--                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
-+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
-             </div>
-         </td>
--        <?php else: ?>
-+        <?php else : ?>
-         <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
-         <?php endif; ?>
-         <td class="col-ordered-qty">
--            <?php if ($block->isShipmentSeparately($_item)): ?>
-+            <?php if ($block->isShipmentSeparately($_item)) : ?>
-                 <?= $block->getColumnHtml($_item, 'qty') ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-         <td class="col-qty last">
--            <?php if ($block->isShipmentSeparately($_item)): ?>
-+            <?php if ($block->isShipmentSeparately($_item)) : ?>
-                 <input type="text"
-                        class="input-text admin__control-text"
--                       name="shipment[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]"
--                       value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" />
--            <?php else: ?>
-+                       name="shipment[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>]"
-+                       value="<?= (float)$_item->getQty() * 1 ?>" />
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-     </tr>
- <?php endforeach; ?>
--<?php if ($_showlastRow): ?>
-+<?php if ($_showlastRow) : ?>
-     <tr class="border">
-         <td class="col-product">
--            <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
-+            <?php if ($block->getOrderOptions($_item->getOrderItem())) : ?>
-                 <dl class="item-options">
--                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
--                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
-+                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option) : ?>
-+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
-                     <dd>
--                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
--                        <?= /* @escapeNotVerified */ $option['value'] ?>
--                    <?php else: ?>
--                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
--                        <?php if ($_remainder):?>
--                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
-+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
-+                        <?= $block->escapeHtml($option['value']) ?>
-+                    <?php else : ?>
-+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-+                        <?php if ($_remainder) :?>
-+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                             <script>
--require(['prototype'], function(){
--
--                            $('<?= /* @escapeNotVerified */ $_id ?>').hide();
--                            $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
--                            $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
--
--});
--</script>
-+                                require(['prototype'], function(){
-+                                    <?php $escapedId = $block->escapeJs($_id) ?>
-+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
-+                                });
-+                            </script>
-                         <?php endif;?>
-                     <?php endif;?>
-                     </dd>
-                 <?php endforeach; ?>
-                 </dl>
--                        <?php else: ?>
-+                        <?php else : ?>
-                 &nbsp;
-                         <?php endif; ?>
-             <?= $block->escapeHtml($_item->getDescription()) ?>
-diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
-index 71eabd45cbb..521669700e1 100644
---- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
-+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */ ?>
- 
-@@ -17,74 +15,73 @@
- 
- <?php $_prevOptionId = '' ?>
- 
--<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
-+<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
-     <?php $_showlastRow = true ?>
--<?php else: ?>
-+<?php else : ?>
-     <?php $_showlastRow = false ?>
- <?php endif; ?>
- 
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
-     <?php $block->setPriceDataObject($_item) ?>
--    <?php if ($_item->getParentItem()): ?>
-+    <?php if ($_item->getParentItem()) : ?>
-         <?php $attributes = $block->getSelectionAttributes($_item) ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-         <tr>
--            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
-+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
-             <td class="col-qty last">&nbsp;</td>
-         </tr>
--        <?php $_prevOptionId = $attributes['option_id'] ?>
-+            <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
-     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
--        <?php if (!$_item->getParentItem()): ?>
-+        <?php if (!$_item->getParentItem()) : ?>
-         <td class="col-product">
-             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
-             <div class="product-sku-block">
--                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
--                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
-+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
-             </div>
-         </td>
--        <?php else: ?>
-+        <?php else : ?>
-         <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
-         <?php endif; ?>
-         <td class="col-qty last">
--            <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())): ?>
--                <?php if (isset($shipItems[$_item->getId()])): ?>
--                    <?= /* @escapeNotVerified */ $shipItems[$_item->getId()]->getQty()*1 ?>
--                <?php elseif ($_item->getIsVirtual()): ?>
--                    <?= /* @escapeNotVerified */ __('N/A') ?>
--                <?php else: ?>
-+            <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())) : ?>
-+                <?php if (isset($shipItems[$_item->getId()])) : ?>
-+                    <?= (float)$shipItems[$_item->getId()]->getQty() * 1 ?>
-+                <?php elseif ($_item->getIsVirtual()) : ?>
-+                    <?= $block->escapeHtml(__('N/A')) ?>
-+                <?php else : ?>
-                     0
-                 <?php endif; ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-     </tr>
- <?php endforeach; ?>
--<?php if ($_showlastRow): ?>
-+<?php if ($_showlastRow) : ?>
-     <tr class="border">
-         <td class="col-product">
--            <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
-+            <?php if ($block->getOrderOptions($_item->getOrderItem())) : ?>
-                 <dl class="item-options">
--                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
--                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
-+                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option) : ?>
-+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
-                     <dd>
--                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
--                        <?= /* @escapeNotVerified */ $option['value'] ?>
--                    <?php else: ?>
--                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
--                        <?php if ($_remainder):?>
--                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
-+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
-+                        <?= $block->escapeHtml($option['value']) ?>
-+                    <?php else : ?>
-+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-+                        <?php if ($_remainder) :?>
-+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                             <script>
--require(['prototype'], function(){
--
--                            $('<?= /* @escapeNotVerified */ $_id ?>').hide();
--                            $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
--                            $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
--
--});
--</script>
-+                                require(['prototype'], function(){
-+                                    <?php $escapedId = $block->escapeJs($_id) ?>
-+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
-+                                });
-+                            </script>
-                         <?php endif;?>
-                     <?php endif;?>
-                     </dd>
-diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml
-index 5955d0337bb..26264cc2cc8 100644
---- a/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml
-+++ b/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php
-@@ -21,76 +18,63 @@ $maximalPrice = $finalPriceModel->getMaximalPrice();
- $regularPriceModel = $block->getPriceType('regular_price');
- $maximalRegularPrice = $regularPriceModel->getMaximalPrice();
- $minimalRegularPrice = $regularPriceModel->getMinimalPrice();
-+$regularPriceAttributes = [
-+    'display_label'     => __('Regular Price'),
-+    'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
-+    'include_container' => true,
-+    'skip_adjustments'  => true
-+];
-+$renderMinimalRegularPrice = $block->renderAmount($minimalRegularPrice, $regularPriceAttributes);
- ?>
--<?php if ($block->getSaleableItem()->getPriceView()): ?>
-+<?php if ($block->getSaleableItem()->getPriceView()) : ?>
-     <p class="minimal-price">
--        <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalPrice, [
-+        <?= /* @noEscape */ $block->renderAmount($minimalPrice, [
-             'display_label'     => __('As low as'),
-             'price_id'          => $block->getPriceId('from-'),
-             'include_container' => true
-         ]); ?>
--        <?php if ($minimalPrice < $minimalRegularPrice): ?>
-+        <?php if ($minimalPrice < $minimalRegularPrice) : ?>
-             <span class="old-price">
--                <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalRegularPrice, [
--                    'display_label'     => __('Regular Price'),
--                    'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
--                    'include_container' => true,
--                    'skip_adjustments'  => true
--                ]); ?>
-+                <?= /* @noEscape */ $renderMinimalRegularPrice ?>
-             </span>
-         <?php endif ?>
-     </p>
--<?php else: ?>
--    <?php if ($block->showRangePrice()): ?>
-+<?php else : ?>
-+    <?php if ($block->showRangePrice()) : ?>
-         <p class="price-from">
--            <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalPrice, [
-+            <?= /* @noEscape */ $block->renderAmount($minimalPrice, [
-                 'display_label'     => __('From'),
-                 'price_id'          => $block->getPriceId('from-'),
-                 'price_type'        => 'minPrice',
-                 'include_container' => true
-             ]); ?>
--            <?php if ($minimalPrice < $minimalRegularPrice): ?>
-+            <?php if ($minimalPrice < $minimalRegularPrice) : ?>
-                 <span class="old-price">
--                    <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalRegularPrice, [
--                        'display_label'     => __('Regular Price'),
--                        'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
--                        'include_container' => true,
--                        'skip_adjustments'  => true
--                    ]); ?>
-+                    <?= /* @noEscape */ $renderMinimalRegularPrice ?>
-                 </span>
-             <?php endif ?>
-         </p>
-         <p class="price-to">
--            <?php /* @escapeNotVerified */ echo $block->renderAmount($maximalPrice, [
-+            <?= /* @noEscape */ $block->renderAmount($maximalPrice, [
-                 'display_label'     => __('To'),
-                 'price_id'          => $block->getPriceId('to-'),
-                 'price_type'        => 'maxPrice',
-                 'include_container' => true
-             ]); ?>
--            <?php if ($maximalPrice < $maximalRegularPrice): ?>
-+            <?php if ($maximalPrice < $maximalRegularPrice) : ?>
-                 <span class="old-price">
--                    <?php /* @escapeNotVerified */ echo $block->renderAmount($maximalRegularPrice, [
--                        'display_label'     => __('Regular Price'),
--                        'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
--                        'include_container' => true,
--                        'skip_adjustments'  => true
--                    ]); ?>
-+                    <?= /* @noEscape */ $block->renderAmount($maximalRegularPrice, $regularPriceAttributes); ?>
-                 </span>
-             <?php endif ?>
-         </p>
--    <?php else: ?>
--        <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalPrice, [
-+    <?php else : ?>
-+        <?= /* @noEscape */ $block->renderAmount($minimalPrice, [
-             'price_id'          => $block->getPriceId('product-price-'),
-             'include_container' => true
-         ]); ?>
--        <?php if ($minimalPrice < $minimalRegularPrice): ?>
-+        <?php if ($minimalPrice < $minimalRegularPrice) : ?>
-             <span class="old-price">
--                <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalRegularPrice, [
--                    'display_label'     => __('Regular Price'),
--                    'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
--                    'include_container' => true,
--                    'skip_adjustments'  => true
--                ]); ?>
-+                <?= /* @noEscape */ $renderMinimalRegularPrice ?>
-             </span>
-         <?php endif ?>
-     <?php endif ?>
-diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml
-index 53d24dd7c2c..00bd9955632 100644
---- a/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml
-+++ b/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml
-@@ -3,11 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php /** @var \Magento\Framework\Pricing\Render\Amount $block */ ?>
- 
--<?= /* @escapeNotVerified */ $block->formatCurrency($block->getDisplayValue(), (bool) $block->getIncludeContainer()) ?>
-+<?= /* @noEscape */ $block->formatCurrency($block->getDisplayValue(), (bool) $block->getIncludeContainer()) ?>
-diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml
-index 5f152c4bbef..f5f67588a1c 100644
---- a/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml
-+++ b/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php
-@@ -16,10 +13,10 @@ $tierPriceModel = $block->getPrice();
- $tierPrices = $tierPriceModel->getTierPriceList();
- ?>
- <?php if (count($tierPrices)) : ?>
--    <ul class="<?= /* @escapeNotVerified */ ($block->hasListClass() ? $block->getListClass() : 'prices-tier items') ?>">
-+    <ul class="<?= $block->escapeHtmlAttr(($block->hasListClass() ? $block->getListClass() : 'prices-tier items')) ?>">
-         <?php foreach ($tierPrices as $index => $price) : ?>
-             <li class="item">
--                <?php /* @escapeNotVerified */ echo __(
-+                <?= /* @noEscape */ __(
-                     'Buy %1 with %2 discount each',
-                     $price['price_qty'],
-                     '<strong class="benefit">' . round($price['percentage_value']) . '%</strong>'
-diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
-index e56cc6f32d8..49ee253ad1e 100644
---- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
-+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
-@@ -27,7 +27,8 @@ define([
-         '<% } %>',
-         controlContainer: 'dd', // should be eliminated
-         priceFormat: {},
--        isFixedPrice: false
-+        isFixedPrice: false,
-+        optionTierPricesBlocksSelector: '#option-tier-prices-{1} [data-role="selection-tier-prices"]'
-     };
- 
-     $.widget('mage.priceBundle', {
-@@ -91,6 +92,8 @@ define([
-             if (changes) {
-                 priceBox.trigger('updatePrice', changes);
-             }
-+
-+            this._displayTierPriceBlock(bundleOption);
-             this.updateProductSummary();
-         },
- 
-@@ -207,6 +210,35 @@ define([
-             return this;
-         },
- 
-+        /**
-+         * Show or hide option tier prices block
-+         *
-+         * @param {Object} optionElement
-+         * @private
-+         */
-+        _displayTierPriceBlock: function (optionElement) {
-+            var optionType = optionElement.prop('type'),
-+                optionId,
-+                optionValue,
-+                optionTierPricesElements;
-+
-+            if (optionType === 'select-one') {
-+                optionId = utils.findOptionId(optionElement[0]);
-+                optionValue = optionElement.val() || null;
-+                optionTierPricesElements = $(this.options.optionTierPricesBlocksSelector.replace('{1}', optionId));
-+
-+                _.each(optionTierPricesElements, function (tierPriceElement) {
-+                    var selectionId = $(tierPriceElement).data('selection-id') + '';
-+
-+                    if (selectionId === optionValue) {
-+                        $(tierPriceElement).show();
-+                    } else {
-+                        $(tierPriceElement).hide();
-+                    }
-+                });
-+            }
-+        },
-+
-         /**
-          * Handler to update productSummary box
-          */
-@@ -374,8 +406,17 @@ define([
-     function applyTierPrice(oneItemPrice, qty, optionConfig) {
-         var tiers = optionConfig.tierPrice,
-             magicKey = _.keys(oneItemPrice)[0],
-+            tiersFirstKey = _.keys(optionConfig)[0],
-             lowest = false;
- 
-+        if (!tiers) {//tiers is undefined when options has only one option
-+            tiers = optionConfig[tiersFirstKey].tierPrice;
-+        }
-+
-+        tiers.sort(function (a, b) {//sorting based on "price_qty"
-+            return a['price_qty'] - b['price_qty'];
-+        });
-+
-         _.each(tiers, function (tier, index) {
-             if (tier['price_qty'] > qty) {
-                 return;
-diff --git a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
-index 5b8c050e5af..d12f2e8f6a9 100644
---- a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
-+++ b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
-@@ -29,10 +29,22 @@
-                 <container name="product.info.bundle.options.top" as="product_info_bundle_options_top">
-                     <block class="Magento\Catalog\Block\Product\View" name="bundle.back.button" as="backButton" before="-" template="Magento_Bundle::catalog/product/view/backbutton.phtml"/>
-                 </container>
--                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/>
-+                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select">
-+                    <arguments>
-+                        <argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
-+                    </arguments>
-+                </block>
-                 <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
--                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/>
--                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox"/>
-+                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio">
-+                    <arguments>
-+                        <argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
-+                    </arguments>
-+                </block>
-+                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox">
-+                    <arguments>
-+                        <argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
-+                    </arguments>
-+                </block>
-             </block>
-         </referenceBlock>
-         <referenceBlock name="product.info.form.options">
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/backbutton.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/backbutton.phtml
-index 31a39c1cd16..ba58544c26a 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/backbutton.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/backbutton.phtml
-@@ -6,5 +6,5 @@
- ?>
- <button type="button"
-         class="action back customization">
--    <span><?= /* @escapeNotVerified */ __('Go back to product details') ?></span>
-+    <span><?= $block->escapeHtml(__('Go back to product details')) ?></span>
- </button>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
-index d7aea4237b1..480ffea5bc8 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
-@@ -3,18 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php $_product = $block->getProduct() ?>
--<?php if ($_product->isSaleable() && $block->hasOptions()):?>
-+<?php if ($_product->isSaleable() && $block->hasOptions()) :?>
-     <div class="bundle-actions">
-         <button id="bundle-slide"
-                 class="action primary customize"
-                 type="button">
--            <span><?= /* @escapeNotVerified */ __('Customize and Add to Cart') ?></span>
-+            <span><?= $block->escapeHtml(__('Customize and Add to Cart')) ?></span>
-         </button>
-     </div>
- <?php endif;?>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/options/notice.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/options/notice.phtml
-index 2dbea0fd213..927b64352d5 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/options/notice.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/options/notice.phtml
-@@ -4,4 +4,4 @@
-  * See COPYING.txt for license details.
-  */
- ?>
--<p class="required"><?= /* @escapeNotVerified */ __('* Required Fields') ?></p>
-+<p class="required"><?= $block->escapeHtml(__('* Required Fields')) ?></p>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
-index bc4337fa7ae..9bf179e622f 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
-@@ -3,40 +3,37 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php
-     $_product = $block->getProduct();
- ?>
--<?php if ($_product->isSaleable() && $block->hasOptions()): ?>
-+<?php if ($_product->isSaleable() && $block->hasOptions()) : ?>
- <div id="bundleSummary"
-      class="block-bundle-summary"
-      data-mage-init='{"sticky":{"container": ".product-add-form"}}'>
-     <div class="title">
--        <strong><?= /* @escapeNotVerified */ __('Your Customization') ?></strong>
-+        <strong><?= $block->escapeHtml(__('Your Customization')) ?></strong>
-     </div>
-     <div class="content">
-         <div class="bundle-info">
-             <?= $block->getImage($_product, 'bundled_product_customization_page')->toHtml() ?>
-             <div class="product-details">
-                 <strong class="product name"><?= $block->escapeHtml($_product->getName()) ?></strong>
--                <?php if ($_product->getIsSalable()): ?>
--                    <p class="available stock" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
--                        <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
-+                <?php if ($_product->getIsSalable()) : ?>
-+                    <p class="available stock" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-+                        <span><?= $block->escapeHtml(__('In stock')) ?></span>
-                     </p>
--                <?php else: ?>
--                    <p class="unavailable stock" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
--                        <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
-+                <?php else : ?>
-+                    <p class="unavailable stock" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-+                        <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
-                     </p>
-                 <?php endif; ?>
-                 <?= $block->getChildHtml('', true) ?>
-             </div>
-         </div>
-         <div class="bundle-summary">
--            <strong class="subtitle"><?= /* @escapeNotVerified */ __('Summary') ?></strong>
-+            <strong class="subtitle"><?= $block->escapeHtml(__('Summary')) ?></strong>
-             <div id="bundle-summary" data-container="product-summary">
-                 <ul data-mage-init='{"productSummary": []}' class="bundle items"></ul>
-                 <script data-template="bundle-summary" type="text/x-magento-template">
-@@ -46,7 +43,7 @@
-                     </li>
-                 </script>
-                 <script data-template="bundle-option" type="text/x-magento-template">
--                    <div><?= /* @escapeNotVerified */ __('%1 x %2', '<%- data._quantity_ %>', '<%- data._label_ %>') ?></div>
-+                    <div><?= /* @noEscape */ __('%1 x %2', '<%- data._quantity_ %>', '<%- data._label_ %>') ?></div>
-                 </script>
-             </div>
-         </div>
-@@ -61,7 +58,7 @@
-                 "slideBackSelector": ".action.customization.back",
-                 "bundleProductSelector": "#bundleProduct",
-                 "bundleOptionsContainer": ".product-add-form"
--                <?php if ($block->isStartCustomization()): ?>
-+                <?php if ($block->isStartCustomization()) : ?>
-                 ,"autostart": true
-                 <?php endif;?>
-             }
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
-index ce9ef89a82b..ee29fc61d01 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
-@@ -4,19 +4,17 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle */
- ?>
- <?php $_product = $block->getProduct() ?>
--<?php if ($block->displayProductStockStatus()): ?>
--    <?php if ($_product->isAvailable()): ?>
--        <p class="stock available" title="<?= /* @escapeNotVerified */ __('Availability:') ?>">
--            <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
-+<?php if ($block->displayProductStockStatus()) : ?>
-+    <?php if ($_product->isAvailable()) : ?>
-+        <p class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability:')) ?>">
-+            <span><?= $block->escapeHtml(__('In stock')) ?></span>
-         </p>
--    <?php else: ?>
--        <p class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability:') ?>">
--            <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
-+    <?php else : ?>
-+        <p class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability:')) ?>">
-+            <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
-         </p>
-     <?php endif; ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
-index bda649eb603..5b56598dc58 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox */ ?>
-@@ -17,31 +14,34 @@
-     </label>
-     <div class="control">
-         <div class="nested options-list">
--            <?php if ($block->showSingle()): ?>
--                <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
-+            <?php if ($block->showSingle()) : ?>
-+                <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
-+                <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
-                 <input type="hidden"
--                       class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>  product bundle option"
--                       name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                       value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"/>
--            <?php else:?>
--                <?php foreach($_selections as $_selection): ?>
-+                       class="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>  product bundle option"
-+                       name="bundle_option[<?= $block->escapeHtml($_option->getId()) ?>]"
-+                       value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"/>
-+            <?php else :?>
-+                <?php foreach ($_selections as $_selection) : ?>
-                     <div class="field choice">
--                        <input class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> checkbox product bundle option change-container-classname"
--                               id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
-+                        <input class="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?> checkbox product bundle option change-container-classname"
-+                               id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
-                                type="checkbox"
--                               <?php if ($_option->getRequired()) /* @escapeNotVerified */ echo 'data-validate="{\'validate-one-required-by-name\':\'input[name^=&quot;bundle_option[' . $_option->getId() . ']&quot;]:checked\'}"'?>
--                               name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][<?= /* @escapeNotVerified */ $_selection->getId() ?>]"
--                               data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][<?= /* @escapeNotVerified */ $_selection->getId() ?>]"
--                               <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?>
--                               <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
--                               value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"/>
-+                               <?php if ($_option->getRequired()) { echo 'data-validate="{\'validate-one-required-by-name\':\'input[name^=&quot;bundle_option[' . $block->escapeHtmlAttr($_option->getId()) . ']&quot;]:checked\'}"'; } ?>
-+                               name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>][<?= $block->escapeHtmlAttr($_selection->getId()) ?>]"
-+                               data-selector="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>][<?= $block->escapeHtmlAttr($_selection->getId()) ?>]"
-+                               <?php if ($block->isSelected($_selection)) { echo ' checked="checked"'; } ?>
-+                               <?php if (!$_selection->isSaleable()) { echo ' disabled="disabled"'; } ?>
-+                               value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"/>
-                         <label class="label"
--                               for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
--                            <span><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection) ?></span>
-+                               for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>">
-+                            <span><?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selection) ?></span>
-+                            <br/>
-+                            <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
-                         </label>
-                     </div>
-                 <?php endforeach; ?>
--                <div id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></div>
-+                <div id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></div>
-             <?php endif; ?>
-         </div>
-     </div>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
-index 718d43070a5..d6f9fdb74ef 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
-@@ -3,39 +3,36 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi */ ?>
- <?php $_option = $block->getOption() ?>
- <?php $_selections = $_option->getSelections() ?>
- <div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
--    <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>">
-+    <label class="label" for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>">
-         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
-     </label>
-     <div class="control">
--        <?php if ($block->showSingle()): ?>
--            <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
-+        <?php if ($block->showSingle()) : ?>
-+            <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
-             <input type="hidden"
--                   name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"/>
--        <?php else: ?>
-+                   name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                   value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"/>
-+        <?php else : ?>
-             <select multiple="multiple"
-                     size="5"
--                    id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
--                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][]"
--                    data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][]"
--                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> multiselect product bundle option change-container-classname"
--                    <?php if ($_option->getRequired()) echo 'data-validate={required:true}' ?>>
--                <?php if(!$_option->getRequired()): ?>
--                    <option value=""><?= /* @escapeNotVerified */ __('None') ?></option>
-+                    id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"
-+                    name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>][]"
-+                    data-selector="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>][]"
-+                    class="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?> multiselect product bundle option change-container-classname"
-+                    <?php if ($_option->getRequired()) { echo 'data-validate={required:true}'; } ?>>
-+                <?php if (!$_option->getRequired()) : ?>
-+                    <option value=""><?= $block->escapeHtml(__('None')) ?></option>
-                 <?php endif; ?>
--                <?php foreach ($_selections as $_selection): ?>
--                    <option value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
--                            <?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?>
--                            <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
--                        <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection, false) ?>
-+                <?php foreach ($_selections as $_selection) : ?>
-+                    <option value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
-+                            <?php if ($block->isSelected($_selection)) { echo ' selected="selected"'; } ?>
-+                            <?php if (!$_selection->isSaleable()) { echo ' disabled="disabled"'; } ?>>
-+                        <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selection, false) ?>
-                     </option>
-                 <?php endforeach; ?>
-             </select>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
-index 7ea89e86098..11ed226c176 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio */ ?>
- <?php $_option = $block->getOption(); ?>
-@@ -19,8 +16,9 @@
-     </label>
-     <div class="control">
-         <div class="nested options-list">
--            <?php if ($block->showSingle()): ?>
--                <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
-+            <?php if ($block->showSingle()) : ?>
-+                <?= /* @noEscape */ $block->getSelectionTitlePrice($_selections[0]) ?>
-+                <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
-                 <input type="hidden"
-                     class="bundle-option-<?= (int)$_option->getId() ?>  product bundle option"
-                     name="bundle_option[<?= (int)$_option->getId() ?>]"
-@@ -28,52 +26,54 @@
-                     id="bundle-option-<?= (int)$_option->getId() ?>-<?= (int)$_selections[0]->getSelectionId() ?>"
-                     checked="checked"
-                 />
--            <?php else:?>
--                <?php if (!$_option->getRequired()): ?>
-+            <?php else :?>
-+                <?php if (!$_option->getRequired()) : ?>
-                     <div class="field choice">
-                         <input type="radio"
-                                class="radio product bundle option"
--                               id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
--                               name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                               data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-+                               id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"
-+                               name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                               data-selector="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-                                <?= ($_default && $_default->isSalable())?'':' checked="checked" ' ?>
-                                value=""/>
--                        <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>">
--                            <span><?= /* @escapeNotVerified */ __('None') ?></span>
-+                        <label class="label" for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>">
-+                            <span><?= $block->escapeHtml(__('None')) ?></span>
-                         </label>
-                     </div>
-                 <?php endif; ?>
--                <?php foreach ($_selections as $_selection): ?>
-+                <?php foreach ($_selections as $_selection) : ?>
-                     <div class="field choice">
-                         <input type="radio"
-                                class="radio product bundle option change-container-classname"
--                               id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
--                               <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?>
--                               name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                               data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                               <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?>
--                               <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
--                               value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"/>
-+                               id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
-+                               <?php if ($_option->getRequired()) { echo 'data-validate="{\'validate-one-required-by-name\':true}"'; }?>
-+                               name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                               data-selector="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                               <?php if ($block->isSelected($_selection)) { echo ' checked="checked"'; } ?>
-+                               <?php if (!$_selection->isSaleable()) { echo ' disabled="disabled"'; } ?>
-+                               value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"/>
-                         <label class="label"
--                               for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
--                            <span><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection) ?></span>
-+                               for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>">
-+                            <span><?= /* @noEscape */ $block->getSelectionTitlePrice($_selection) ?></span>
-+                            <br/>
-+                            <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
-                         </label>
-                     </div>
-                 <?php endforeach; ?>
--                <div id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></div>
-+                <div id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></div>
-             <?php endif; ?>
-             <div class="field qty qty-holder">
--                <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input">
--                    <span><?= /* @escapeNotVerified */ __('Quantity') ?></span>
-+                <label class="label" for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input">
-+                    <span><?= $block->escapeHtml(__('Quantity')) ?></span>
-                 </label>
-                 <div class="control">
--                    <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
--                           id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
--                           class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
-+                    <input <?php if (!$_canChangeQty) { echo ' disabled="disabled"'; } ?>
-+                           id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input"
-+                           class="input-text qty<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
-                            type="number"
--                           name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                           data-selector="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                           value="<?= /* @escapeNotVerified */ $_defaultQty ?>"/>
-+                           name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                           data-selector="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                           value="<?= $block->escapeHtmlAttr($_defaultQty) ?>"/>
-                 </div>
-             </div>
-         </div>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
-index 977daa2b2a4..1edf45fe8ca 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select */ ?>
-@@ -14,45 +11,55 @@
- <?php $_default     = $_option->getDefaultSelection(); ?>
- <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
- <div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
--    <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>">
-+    <label class="label" for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>">
-         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
-     </label>
-     <div class="control">
--        <?php if ($block->showSingle()): ?>
--            <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
-+        <?php if ($block->showSingle()) : ?>
-+            <?= /* @noEscape */ $block->getSelectionTitlePrice($_selections[0]) ?>
-+            <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
-             <input type="hidden"
--                   class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>  product bundle option"
--                   name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"/>
--        <?php else:?>
--            <select id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
--                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                    data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> product bundle option bundle-option-select change-container-classname"
--                <?php if ($_option->getRequired()) echo 'data-validate = {required:true}' ?>>
--                <option value=""><?= /* @escapeNotVerified */ __('Choose a selection...') ?></option>
--                <?php foreach ($_selections as $_selection): ?>
--                    <option value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
--                        <?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?>
--                        <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
--                        <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection, false) ?>
-+                   class="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>  product bundle option"
-+                   name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                   value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"/>
-+        <?php else :?>
-+            <select id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"
-+                    name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                    data-selector="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                    class="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?> product bundle option bundle-option-select change-container-classname"
-+                <?php if ($_option->getRequired()) { echo 'data-validate = {required:true}'; } ?>>
-+                <option value=""><?= $block->escapeHtml(__('Choose a selection...')) ?></option>
-+                <?php foreach ($_selections as $_selection) : ?>
-+                    <option value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
-+                        <?php if ($block->isSelected($_selection)) { echo ' selected="selected"'; } ?>
-+                        <?php if (!$_selection->isSaleable()) { echo ' disabled="disabled"'; } ?>>
-+                        <?= /* @noEscape */ $block->getSelectionTitlePrice($_selection, false) ?>
-                     </option>
-                 <?php endforeach; ?>
-             </select>
-+            <div id="option-tier-prices-<?= $block->escapeHtmlAttr($_option->getId()) ?>" class="option-tier-prices">
-+                <?php foreach ($_selections as $_selection) : ?>
-+                    <div data-role="selection-tier-prices"
-+                         data-selection-id="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
-+                         class="selection-tier-prices">
-+                        <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
-+                    </div>
-+                <?php endforeach; ?>
-+            </div>
-         <?php endif; ?>
-         <div class="nested">
-             <div class="field qty qty-holder">
--                <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input">
--                    <span><?= /* @escapeNotVerified */ __('Quantity') ?></span>
-+                <label class="label" for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input">
-+                    <span><?= $block->escapeHtml(__('Quantity')) ?></span>
-                 </label>
-                 <div class="control">
--                    <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
--                           id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
--                           class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
-+                    <input <?php if (!$_canChangeQty) { echo ' disabled="disabled"'; } ?>
-+                           id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input"
-+                           class="input-text qty<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
-                            type="number"
--                           name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                           data-selector="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                           value="<?= /* @escapeNotVerified */ $_defaultQty ?>"/>
-+                           name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                           data-selector="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                           value="<?= $block->escapeHtmlAttr($_defaultQty) ?>"/>
-                 </div>
-             </div>
-         </div>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
-index 157e2d95972..cac96a8aca7 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
-@@ -3,24 +3,22 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /** @var $block Magento\Bundle\Block\Catalog\Product\View\Type\Bundle */ ?>
- <?php
- $product = $block->getProduct();
--$helper = $this->helper('Magento\Catalog\Helper\Output');
-+$helper = $this->helper(Magento\Catalog\Helper\Output::class);
- $stripSelection = $product->getConfigureMode() ? true : false;
- $options = $block->decorateArray($block->getOptions($stripSelection));
- ?>
--<?php if ($product->isSaleable()):?>
--    <?php if (count($options)): ?>
-+<?php if ($product->isSaleable()) :?>
-+    <?php if (count($options)) : ?>
- <script type="text/x-magento-init">
-     {
-         "#product_addtocart_form": {
-             "priceBundle": {
--                "optionConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>,
-+                "optionConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
-                 "controlContainer": ".field.option"
-             }
-         }
-@@ -28,17 +26,20 @@ $options = $block->decorateArray($block->getOptions($stripSelection));
- </script>
-         <fieldset class="fieldset fieldset-bundle-options">
-             <legend id="customizeTitle" class="legend title">
--                <span><?= /* @escapeNotVerified */ __('Customize %1', $helper->productAttribute($product, $product->getName(), 'name')) ?></span>
-+                <span><?= /* @noEscape */ __('Customize %1', $helper->productAttribute($product, $product->getName(), 'name')) ?></span>
-             </legend><br />
-             <?= $block->getChildHtml('product_info_bundle_options_top') ?>
--            <?php foreach ($options as $option): ?>
--                <?php if (!$option->getSelections()): ?>
--                    <?php continue; ?>
--                <?php endif; ?>
--                <?= $block->getOptionHtml($option) ?>
-+            <?php foreach ($options as $option) : ?>
-+                <?php
-+                if (!$option->getSelections()) {
-+                    continue;
-+                } else {
-+                    echo $block->getOptionHtml($option);
-+                }
-+                ?>
-             <?php endforeach; ?>
-         </fieldset>
--    <?php else: ?>
--        <p class="empty"><?= /* @escapeNotVerified */ __('No options of this product are available.') ?></p>
-+    <?php else : ?>
-+        <p class="empty"><?= $block->escapeHtml(__('No options of this product are available.')) ?></p>
-     <?php endif; ?>
- <?php endif;?>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
-index a87c2167e66..cbf7755ae99 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
- <?php $parentItem = $block->getItem() ?>
-@@ -13,15 +11,15 @@
- 
- <?php $items = $block->getChildren($parentItem) ?>
- 
--<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-+<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()) : ?>
-     <?php $_showlastRow = true ?>
--<?php else: ?>
-+<?php else : ?>
-     <?php $_showlastRow = false ?>
- <?php endif; ?>
- 
- <?php $_prevOptionId = '' ?>
- 
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
- 
-     <?php
-         // As part of invoice item renderer logic, the order is set on each invoice item.
-@@ -30,40 +28,40 @@
-         $_item->setOrder($_order);
-     ?>
- 
--    <?php if ($_item->getOrderItem()->getParentItem()): ?>
-+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
-         <?php $attributes = $block->getSelectionAttributes($_item) ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-             <tr class="bundle-option-label">
-                 <td colspan="3">
--                    <strong><?= /* @escapeNotVerified */  $attributes['option_label'] ?></strong>
-+                    <strong><?= $block->escapeHtml($attributes['option_label']) ?></strong>
-                 </td>
-             </tr>
-             <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
--    <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-+    <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-         <tr class="bundle-item bundle-parent">
-             <td class="item-info">
-                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
--                <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-+                <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-             </td>
--    <?php else: ?>
-+    <?php else : ?>
-         <tr class="bundle-item bundle-option-value">
-             <td class="item-info">
-                 <p><?= $block->getValueHtml($_item) ?></p>
-             </td>
-     <?php endif; ?>
-             <td class="item-qty">
--                <?php if ($block->canShowPriceInfo($_item)): ?>
--                    <?= /* @escapeNotVerified */  $_item->getQty() * 1 ?>
--                <?php else: ?>
-+                <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                    <?= (float)$_item->getQty() * 1 ?>
-+                <?php else : ?>
-                     &nbsp;
-                 <?php endif; ?>
-             </td>
-             <td class="item-price">
--                <?php if ($block->canShowPriceInfo($_item)): ?>
--                    <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
--                <?php else: ?>
-+                <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                    <?= /* @noEscape */ $block->getItemPrice($_item) ?>
-+                <?php else : ?>
-                     &nbsp;
-                 <?php endif; ?>
-             </td>
-@@ -71,14 +69,14 @@
- 
- <?php endforeach; ?>
- 
--<?php if ($_showlastRow): ?>
-+<?php if ($_showlastRow) : ?>
-     <tr>
-         <td colspan="3" class="item-extra">
--            <?php if ($block->getItemOptions()): ?>
-+            <?php if ($block->getItemOptions()) : ?>
-                 <dl>
--                    <?php foreach ($block->getItemOptions() as $option): ?>
--                        <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
--                                    <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
-+                    <?php foreach ($block->getItemOptions() as $option) : ?>
-+                        <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
-+                                    <dd><?= $block->escapeHtml($option['value']) ?></dd>
-                     <?php endforeach; ?>
-                 </dl>
-             <?php endif; ?>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
-index ee79ca3b0a7..d24fa390fa0 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
- 
-@@ -14,15 +12,15 @@
- <?php $_index = 0 ?>
- <?php $_order = $block->getItem()->getOrder(); ?>
- 
--<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-+<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()) : ?>
-     <?php $_showlastRow = true ?>
--<?php else: ?>
-+<?php else : ?>
-     <?php $_showlastRow = false ?>
- <?php endif; ?>
- 
- <?php $_prevOptionId = '' ?>
- 
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
- 
-     <?php
-         // As part of invoice item renderer logic, the order is set on each invoice item.
-@@ -31,40 +29,40 @@
-         $_item->setOrder($_order);
-     ?>
- 
--    <?php if ($_item->getOrderItem()->getParentItem()): ?>
-+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
-         <?php $attributes = $block->getSelectionAttributes($_item) ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-             <tr class="bundle-option-label">
-                 <td colspan="3">
--                    <strong><em><?= /* @escapeNotVerified */  $attributes['option_label'] ?></em></strong>
-+                    <strong><em><?= $block->escapeHtml($attributes['option_label']) ?></em></strong>
-                 </td>
-             </tr>
-             <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
--    <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-+    <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-         <tr class="bundle-item bundle-parent">
-             <td class="item-info">
-                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
--                <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-+                <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-             </td>
--    <?php else: ?>
-+    <?php else : ?>
-         <tr class="bundle-item bundle-option-value">
-             <td class="item-info">
-                 <p><?= $block->getValueHtml($_item) ?></p>
-             </td>
-     <?php endif; ?>
-             <td class="item-qty">
--                <?php if ($block->canShowPriceInfo($_item)): ?>
--                    <?= /* @escapeNotVerified */  $_item->getQty() * 1 ?>
--                <?php else: ?>
-+                <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                    <?= (float)$_item->getQty() * 1 ?>
-+                <?php else : ?>
-                     &nbsp;
-                 <?php endif; ?>
-             </td>
-             <td class="item-price">
--                <?php if ($block->canShowPriceInfo($_item)): ?>
--                    <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
--                <?php else: ?>
-+                <?php if ($block->canShowPriceInfo($_item)) : ?>
-+                    <?= /* @noEscape */ $block->getItemPrice($_item) ?>
-+                <?php else : ?>
-                     &nbsp;
-                 <?php endif; ?>
-             </td>
-@@ -72,14 +70,14 @@
- 
- <?php endforeach; ?>
- 
--<?php if ($_showlastRow): ?>
-+<?php if ($_showlastRow) : ?>
-     <tr>
-         <td colspan="3" class="item-extra">
--            <?php if ($block->getItemOptions()): ?>
-+            <?php if ($block->getItemOptions()) : ?>
-                 <dl>
--                    <?php foreach ($block->getItemOptions() as $option): ?>
--                        <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
--                                    <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
-+                    <?php foreach ($block->getItemOptions() as $option) : ?>
-+                        <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
-+                                    <dd><?= $block->escapeHtml($option['value']) ?></dd>
-                     <?php endforeach; ?>
-                 </dl>
-             <?php endif; ?>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
-index c9c3103c448..94dc0917fcf 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
- <?php $_item = $block->getItem() ?>
-@@ -14,41 +12,41 @@
- <?php $parentItem = $block->getItem() ?>
- <?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?>
- 
--<?php if ($block->getItemOptions() || $_item->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $_item) && $_item->getGiftMessageId()): ?>
-+<?php if ($block->getItemOptions() || $_item->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $_item) && $_item->getGiftMessageId()) : ?>
-     <?php $_showlastRow = true ?>
--<?php else: ?>
-+<?php else : ?>
-     <?php $_showlastRow = false ?>
- <?php endif; ?>
- 
- <?php $_prevOptionId = '' ?>
- 
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
- 
--    <?php if ($_item->getParentItem()): ?>
-+    <?php if ($_item->getParentItem()) : ?>
-         <?php $attributes = $block->getSelectionAttributes($_item) ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-             <tr class="bundle-option-label">
-                 <td colspan="3">
--                    <strong><em><?= /* @escapeNotVerified */  $attributes['option_label'] ?></em></strong>
-+                    <strong><em><?= $block->escapeHtml($attributes['option_label']) ?></em></strong>
-                 </td>
-             </tr>
-             <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
--    <?php if (!$_item->getParentItem()): ?>
-+    <?php if (!$_item->getParentItem()) : ?>
-         <tr class="bundle-item bundle-parent">
-             <td class="item-info">
-                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
--                <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-+                <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-             </td>
-             <td class="item-qty">
--                <?= /* @escapeNotVerified */  $_item->getQtyOrdered() * 1 ?>
-+                <?= (float)$_item->getQtyOrdered() * 1 ?>
-             </td>
-             <td class="item-price">
--                <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
-+                <?= /* @noEscape */ $block->getItemPrice($_item) ?>
-             </td>
-         </tr>
--    <?php else: ?>
-+    <?php else : ?>
-         <tr class="bundle-item bundle-option-value">
-             <td class="item-info" colspan="3">
-                 <p><?= $block->getValueHtml($_item) ?></p>
-@@ -58,25 +56,25 @@
- 
- <?php endforeach; ?>
- 
--<?php if ($_showlastRow): ?>
-+<?php if ($_showlastRow) : ?>
-     <tr>
-         <td colspan="3" class="item-extra">
--            <?php if ($block->getItemOptions()): ?>
-+            <?php if ($block->getItemOptions()) : ?>
-             <dl>
--                <?php foreach ($block->getItemOptions() as $option): ?>
--                <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
--                            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
-+                <?php foreach ($block->getItemOptions() as $option) : ?>
-+                <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
-+                            <dd><?= $block->escapeHtml($option['value']) ?></dd>
-                 <?php endforeach; ?>
-             </dl>
-             <?php endif; ?>
--            <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
-+            <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper(Magento\GiftMessage\Helper\Message::class)->getGiftMessage($_item->getGiftMessageId())) : ?>
-                 <table class="message-gift">
-                     <tr>
-                         <td>
--                            <h3><?= /* @escapeNotVerified */  __('Gift Message') ?></h3>
--                            <strong><?= /* @escapeNotVerified */  __('From:') ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
--                            <br /><strong><?= /* @escapeNotVerified */  __('To:') ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
--                            <br /><strong><?= /* @escapeNotVerified */  __('Message:') ?></strong>
-+                            <h3><?= $block->escapeHtml(__('Gift Message')) ?></h3>
-+                            <strong><?= $block->escapeHtml(__('From:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-+                            <br /><strong><?= $block->escapeHtml(__('To:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-+                            <br /><strong><?= $block->escapeHtml(__('Message:')) ?></strong>
-                             <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
-                         </td>
-                     </tr>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
-index 61582087d1f..bf84ad33b92 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
- 
-@@ -14,49 +12,49 @@
- <?php $items = array_merge([$parentItem->getOrderItem()], $parentItem->getOrderItem()->getChildrenItems()) ?>
- <?php $shipItems = $block->getChildren($parentItem) ?>
- 
--<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-+<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()) : ?>
-     <?php $_showlastRow = true ?>
--<?php else: ?>
-+<?php else : ?>
-     <?php $_showlastRow = false ?>
- <?php endif; ?>
- 
- <?php $_prevOptionId = '' ?>
- 
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
- 
--    <?php if ($_item->getParentItem()): ?>
-+    <?php if ($_item->getParentItem()) : ?>
-         <?php $attributes = $block->getSelectionAttributes($_item) ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-             <tr class="bundle-option-label">
-                 <td colspan="2">
--                    <strong><em><?= /* @escapeNotVerified */  $attributes['option_label'] ?></em></strong>
-+                    <strong><em><?= $block->escapeHtml($attributes['option_label']) ?></em></strong>
-                 </td>
-             </tr>
-             <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
--    <?php if (!$_item->getParentItem()): ?>
-+    <?php if (!$_item->getParentItem()) : ?>
-         <tr class="bundle-item bundle-parent">
-             <td class="item-info">
-                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
--                <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-+                <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-             </td>
--    <?php else: ?>
-+    <?php else : ?>
-         <tr class="bundle-item bundle-option-value">
-             <td class="item-info">
-                 <p><?= $block->getValueHtml($_item) ?></p>
-             </td>
-     <?php endif; ?>
-             <td class="item-qty">
--                <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())): ?>
--                    <?php if (isset($shipItems[$_item->getId()])): ?>
--                        <?= /* @escapeNotVerified */  $shipItems[$_item->getId()]->getQty() * 1 ?>
--                    <?php elseif ($_item->getIsVirtual()): ?>
--                        <?= /* @escapeNotVerified */  __('N/A') ?>
--                    <?php else: ?>
-+                <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())) : ?>
-+                    <?php if (isset($shipItems[$_item->getId()])) : ?>
-+                        <?= (float)$shipItems[$_item->getId()]->getQty() * 1 ?>
-+                    <?php elseif ($_item->getIsVirtual()) : ?>
-+                        <?= $block->escapeHtml(__('N/A')) ?>
-+                    <?php else : ?>
-                         0
-                     <?php endif; ?>
--                <?php else: ?>
-+                <?php else : ?>
-                     &nbsp;
-                 <?php endif; ?>
-             </td>
-@@ -64,14 +62,14 @@
- 
- <?php endforeach; ?>
- 
--<?php if ($_showlastRow): ?>
-+<?php if ($_showlastRow) : ?>
-     <tr>
-         <td colspan="2" class="item-extra">
--            <?php if ($block->getItemOptions()): ?>
-+            <?php if ($block->getItemOptions()) : ?>
-             <dl>
--                <?php foreach ($block->getItemOptions() as $option): ?>
--                <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
--                            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
-+                <?php foreach ($block->getItemOptions() as $option) : ?>
-+                <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
-+                            <dd><?= $block->escapeHtml($option['value']) ?></dd>
-                 <?php endforeach; ?>
-             </dl>
-             <?php endif; ?>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml b/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml
-index bad5acc209b..1bd7e554a73 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml
-@@ -3,8 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml() ?>
-+
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
-index b9d075966c5..64e6594b4f7 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
- <?php $parentItem = $block->getItem() ?>
-@@ -16,91 +14,95 @@
- 
- <?php $_prevOptionId = '' ?>
- 
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
- 
--    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-+    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()) : ?>
-         <?php $_showlastRow = true ?>
--    <?php else: ?>
-+    <?php else : ?>
-         <?php $_showlastRow = false ?>
-     <?php endif; ?>
- 
--    <?php if ($_item->getOrderItem()->getParentItem()): ?>
-+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
-         <?php $attributes = $block->getSelectionAttributes($_item) ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-             <tr class="options-label">
--                <td class="col label" colspan="7"><div class="option label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
-+                <td class="col label" colspan="7"><div class="option label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
-             </tr>
-             <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
--<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="<?php if ($_item->getOrderItem()->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?= /* @escapeNotVerified */ $attributes['option_label'] ?>"<?php endif; ?>>
--    <?php if (!$_item->getOrderItem()->getParentItem()): ?>
--        <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
-+<tr id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>"
-+    class="<?php if ($_item->getOrderItem()->getParentItem()) : ?>item-options-container<?php else : ?>item-parent<?php endif; ?>"
-+    <?php if ($_item->getParentItem()) : ?>
-+        data-th="<?= $block->escapeHtmlAttr($attributes['option_label']) ?>"
-+    <?php endif; ?>>
-+    <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-+        <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
-             <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
-         </td>
--    <?php else: ?>
--        <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
-+    <?php else : ?>
-+        <td class="col value" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
-     <?php endif; ?>
--    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
--    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
--        <?php if ($block->canShowPriceInfo($_item)): ?>
-+    <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
-+    <td class="col price" data-th="<?= $block->escapeHtmlAttr(__('Price')) ?>">
-+        <?php if ($block->canShowPriceInfo($_item)) : ?>
-             <?= $block->getItemPriceHtml($_item) ?>
--        <?php else: ?>
-+        <?php else : ?>
-             &nbsp;
-         <?php endif; ?>
-     </td>
--    <td class="col qty" data-th="<?= $block->escapeHtml(__('Quantity')) ?>">
--        <?php if ($block->canShowPriceInfo($_item)): ?>
--            <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
--        <?php else: ?>
-+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Quantity')) ?>">
-+        <?php if ($block->canShowPriceInfo($_item)) : ?>
-+            <?= (float)$_item->getQty() * 1 ?>
-+        <?php else : ?>
-             &nbsp;
-         <?php endif; ?>
-     </td>
--    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
--        <?php if ($block->canShowPriceInfo($_item)): ?>
-+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
-+        <?php if ($block->canShowPriceInfo($_item)) : ?>
-             <?= $block->getItemRowTotalHtml($_item) ?>
--        <?php else: ?>
-+        <?php else : ?>
-             &nbsp;
-         <?php endif; ?>
-     </td>
--    <td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>">
--        <?php if ($block->canShowPriceInfo($_item)): ?>
--            <?= /* @escapeNotVerified */ $block->getOrder()->formatPrice(-$_item->getDiscountAmount()) ?>
--        <?php else: ?>
-+    <td class="col discount" data-th="<?= $block->escapeHtmlAttr(__('Discount Amount')) ?>">
-+        <?php if ($block->canShowPriceInfo($_item)) : ?>
-+            <?= $block->escapeHtml($block->getOrder()->formatPrice(-$_item->getDiscountAmount()), ['span']) ?>
-+        <?php else : ?>
-             &nbsp;
-         <?php endif; ?>
-     </td>
--    <td class="col rowtotal" data-th="<?= $block->escapeHtml(__('Row Total')) ?>">
--        <?php if ($block->canShowPriceInfo($_item)): ?>
-+    <td class="col rowtotal" data-th="<?= $block->escapeHtmlAttr(__('Row Total')) ?>">
-+        <?php if ($block->canShowPriceInfo($_item)) : ?>
-             <?= $block->getItemRowTotalAfterDiscountHtml($_item) ?>
--        <?php else: ?>
-+        <?php else : ?>
-             &nbsp;
-         <?php endif; ?>
-     </td>
- </tr>
- <?php endforeach; ?>
- 
--<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))): ?>
-+<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))) : ?>
-     <tr>
-         <td class="col options" colspan="7">
--            <?php if ($_options = $block->getItemOptions()): ?>
-+            <?php if ($_options = $block->getItemOptions()) : ?>
-                 <dl class="item-options">
-                     <?php foreach ($_options as $_option) : ?>
-                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                        <?php if (!$block->getPrintStatus()): ?>
-+                        <?php if (!$block->getPrintStatus()) : ?>
-                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
--                            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
--                                <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
--                                <?php if (isset($_formatedOptionValue['full_view'])): ?>
-+                            <dd<?php if (isset($_formatedOptionValue['full_view'])) : ?> class="tooltip wrapper"<?php endif; ?>>
-+                                <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
-+                                <?php if (isset($_formatedOptionValue['full_view'])) : ?>
-                                     <div class="tooltip content">
-                                         <dl class="item options">
-                                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
-+                                            <dd><?= /* @noEscape */ $_formatedOptionValue['full_view'] ?></dd>
-                                         </dl>
-                                     </div>
-                                 <?php endif; ?>
-                             </dd>
--                        <?php else: ?>
-+                        <?php else : ?>
-                             <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
-                         <?php endif; ?>
-                     <?php endforeach; ?>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
-index e18d75ce77b..b2025e53986 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
- <?php $parentItem = $block->getItem() ?>
-@@ -15,77 +13,85 @@
- <?php $_index = 0 ?>
- 
- <?php $_prevOptionId = '' ?>
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
- 
--    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-+    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()) : ?>
-         <?php $_showlastRow = true ?>
--    <?php else: ?>
-+    <?php else : ?>
-         <?php $_showlastRow = false ?>
-     <?php endif; ?>
- 
--    <?php if ($_item->getOrderItem()->getParentItem()): ?>
-+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
-         <?php $attributes = $block->getSelectionAttributes($_item) ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-             <tr class="options-label">
--                <td class="col label" colspan="5"><div class="option label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
-+                <td class="col label" colspan="5">
-+                    <div class="option label"><?= $block->escapeHtml($attributes['option_label']) ?></div>
-+                </td>
-             </tr>
-             <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
--    <tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="<?php if ($_item->getOrderItem()->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getOrderItem()->getParentItem()): ?> data-th="<?= /* @escapeNotVerified */ $attributes['option_label'] ?>"<?php endif; ?>>
--    <?php if (!$_item->getOrderItem()->getParentItem()): ?>
--        <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
-+    <tr id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>"
-+        class="<?php if ($_item->getOrderItem()->getParentItem()) : ?>item-options-container
-+        <?php else : ?>item-parent
-+        <?php endif; ?>"
-+        <?php if ($_item->getOrderItem()->getParentItem()) : ?>
-+            data-th="<?= $block->escapeHtmlAttr($attributes['option_label']) ?>"
-+        <?php endif; ?>>
-+    <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-+        <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
-             <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
-         </td>
--    <?php else: ?>
--        <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
-+    <?php else : ?>
-+        <td class="col value" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
-     <?php endif; ?>
--    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
--    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
--        <?php if ($block->canShowPriceInfo($_item)): ?>
-+    <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
-+    <td class="col price" data-th="<?= $block->escapeHtmlAttr(__('Price')) ?>">
-+        <?php if ($block->canShowPriceInfo($_item)) : ?>
-             <?= $block->getItemPriceHtml($_item) ?>
--        <?php else: ?>
-+        <?php else : ?>
-             &nbsp;
-         <?php endif; ?>
-     </td>
--    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Invoiced')) ?>">
--        <?php if ($block->canShowPriceInfo($_item)): ?>
--            <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
--        <?php else: ?>
-+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Qty Invoiced')) ?>">
-+        <?php if ($block->canShowPriceInfo($_item)) : ?>
-+            <?= (float)$_item->getQty() * 1 ?>
-+        <?php else : ?>
-             &nbsp;
-         <?php endif; ?>
-     </td>
--    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
--        <?php if ($block->canShowPriceInfo($_item)): ?>
-+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
-+        <?php if ($block->canShowPriceInfo($_item)) : ?>
-             <?= $block->getItemRowTotalHtml($_item) ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-     </tr>
- <?php endforeach; ?>
- 
--<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))): ?>
-+<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))) : ?>
-     <tr>
-         <td class="col options" colspan="5">
--            <?php if ($_options = $block->getItemOptions()): ?>
-+            <?php if ($_options = $block->getItemOptions()) : ?>
-                 <dl class="item-options">
-                     <?php foreach ($_options as $_option) : ?>
-                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                        <?php if (!$block->getPrintStatus()): ?>
-+                        <?php if (!$block->getPrintStatus()) : ?>
-                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
--                            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
--                                <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
--                                <?php if (isset($_formatedOptionValue['full_view'])): ?>
-+                            <dd<?php if (isset($_formatedOptionValue['full_view'])) : ?> class="tooltip wrapper"<?php endif; ?>>
-+                                <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
-+                                <?php if (isset($_formatedOptionValue['full_view'])) : ?>
-                                     <div class="tooltip content">
-                                         <dl class="item options">
-                                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
-+                                            <dd><?= /* @noEscape */ $_formatedOptionValue['full_view'] ?></dd>
-                                         </dl>
-                                     </div>
-                                 <?php endif; ?>
-                             </dd>
--                        <?php else: ?>
-+                        <?php else : ?>
-                             <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
-                         <?php endif; ?>
-                     <?php endforeach; ?>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
-index 063d66edb9e..3507901dff8 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
-@@ -3,133 +3,150 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */
-+$parentItem = $block->getItem();
-+$items = array_merge([$parentItem], $parentItem->getChildrenItems());
-+$index = 0;
-+$prevOptionId = '';
- ?>
--<?php $parentItem = $block->getItem() ?>
--<?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?>
--<?php $_index = 0 ?>
- 
--<?php $_prevOptionId = '' ?>
-+<?php foreach ($items as $item) : ?>
- 
--<?php foreach ($items as $_item): ?>
--
--    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
--        <?php $_showlastRow = true ?>
--    <?php else: ?>
--        <?php $_showlastRow = false ?>
-+    <?php if ($block->getItemOptions()
-+        || $parentItem->getDescription()
-+        || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem)
-+        && $parentItem->getGiftMessageId()) : ?>
-+        <?php $showLastRow = true; ?>
-+    <?php else : ?>
-+        <?php $showLastRow = false; ?>
-     <?php endif; ?>
- 
--    <?php if ($_item->getParentItem()): ?>
--        <?php $attributes = $block->getSelectionAttributes($_item) ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+    <?php if ($item->getParentItem()) : ?>
-+        <?php $attributes = $block->getSelectionAttributes($item) ?>
-+        <?php if ($prevOptionId != $attributes['option_id']) : ?>
-             <tr class="options-label">
--                <td class="col label" colspan="5"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></td>
-+                <td class="col label" colspan="5"><?= $block->escapeHtml($attributes['option_label']); ?></td>
-             </tr>
--            <?php $_prevOptionId = $attributes['option_id'] ?>
-+            <?php $prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
--<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="<?php if ($_item->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?= /* @escapeNotVerified */ $attributes['option_label'] ?>"<?php endif; ?>>
--    <?php if (!$_item->getParentItem()): ?>
--        <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
--            <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
-+<tr id="order-item-row-<?= /* @noEscape */ $item->getId() ?>"
-+    class="<?php if ($item->getParentItem()) : ?>
-+        item-options-container
-+    <?php else : ?>
-+        item-parent
-+    <?php endif; ?>"
-+    <?php if ($item->getParentItem()) : ?>
-+        data-th="<?= $block->escapeHtmlAttr($attributes['option_label']); ?>"
-+    <?php endif; ?>>
-+    <?php if (!$item->getParentItem()) : ?>
-+        <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')); ?>">
-+            <strong class="product name product-item-name"><?= $block->escapeHtml($item->getName()); ?></strong>
-+        </td>
-+    <?php else : ?>
-+        <td class="col value" data-th="<?= $block->escapeHtmlAttr(__('Product Name')); ?>">
-+            <?= $block->getValueHtml($item); ?>
-         </td>
--    <?php else: ?>
--        <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
-     <?php endif; ?>
--    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($_item->getSku()) ?></td>
--    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
--        <?php if (!$_item->getParentItem()): ?>
--            <?= $block->getItemPriceHtml() ?>
--        <?php else: ?>
-+    <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')); ?>">
-+        <?= /* @noEscape */ $block->prepareSku($item->getSku()); ?>
-+    </td>
-+    <td class="col price" data-th="<?= $block->escapeHtmlAttr(__('Price')); ?>">
-+        <?php if (!$item->getParentItem()) : ?>
-+            <?= /* @noEscape */ $block->getItemPriceHtml(); ?>
-+        <?php else : ?>
-             &nbsp;
-         <?php endif; ?>
-     </td>
--    <td class="col qty" data-th="<?= $block->escapeHtml(__('Quantity')) ?>">
--        <?php if (
--        ($_item->getParentItem() && $block->isChildCalculated()) ||
--        (!$_item->getParentItem() && !$block->isChildCalculated()) || ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $block->isShipmentSeparately())):?>
-+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Quantity')); ?>">
-+        <?php if (($item->getParentItem() && $block->isChildCalculated()) ||
-+        (!$item->getParentItem() && !$block->isChildCalculated()) ||
-+        ($item->getQtyShipped() > 0 && $item->getParentItem() && $block->isShipmentSeparately())) : ?>
-             <ul class="items-qty">
-         <?php endif; ?>
--        <?php if (($_item->getParentItem() && $block->isChildCalculated()) ||
--            (!$_item->getParentItem() && !$block->isChildCalculated())): ?>
--            <?php if ($_item->getQtyOrdered() > 0): ?>
-+        <?php if (($item->getParentItem() && $block->isChildCalculated()) ||
-+            (!$item->getParentItem() && !$block->isChildCalculated())) : ?>
-+            <?php if ($item->getQtyOrdered() > 0) : ?>
-                 <li class="item">
--                    <span class="title"><?= /* @escapeNotVerified */ __('Ordered') ?></span>
--                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></span>
-+                    <span class="title"><?= $block->escapeHtml(__('Ordered')); ?></span>
-+                    <span class="content"><?= /* @noEscape */ $item->getQtyOrdered() * 1; ?></span>
-                 </li>
-             <?php endif; ?>
--            <?php if ($_item->getQtyShipped() > 0 && !$block->isShipmentSeparately()): ?>
-+            <?php if ($item->getQtyShipped() > 0 && !$block->isShipmentSeparately()) : ?>
-                 <li class="item">
--                    <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
--                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></span>
-+                    <span class="title"><?= $block->escapeHtml(__('Shipped')); ?></span>
-+                    <span class="content"><?= /* @noEscape */ $item->getQtyShipped() * 1; ?></span>
-                 </li>
-             <?php endif; ?>
--            <?php if ($_item->getQtyCanceled() > 0): ?>
-+            <?php if ($item->getQtyCanceled() > 0) : ?>
-                 <li class="item">
--                    <span class="title"><?= /* @escapeNotVerified */ __('Canceled') ?></span>
--                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyCanceled()*1 ?></span>
-+                    <span class="title"><?= $block->escapeHtml(__('Canceled')); ?></span>
-+                    <span class="content"><?= /* @noEscape */ $item->getQtyCanceled() * 1; ?></span>
-                 </li>
-             <?php endif; ?>
--            <?php if ($_item->getQtyRefunded() > 0): ?>
-+            <?php if ($item->getQtyRefunded() > 0) : ?>
-                 <li class="item">
--                    <span class="title"><?= /* @escapeNotVerified */ __('Refunded') ?></span>
--                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyRefunded()*1 ?></span>
-+                    <span class="title"><?= $block->escapeHtml(__('Refunded')); ?></span>
-+                    <span class="content"><?= /* @noEscape */ $item->getQtyRefunded() * 1; ?></span>
-                 </li>
-             <?php endif; ?>
--        <?php elseif ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $block->isShipmentSeparately()): ?>
-+        <?php elseif ($item->getQtyShipped() > 0 && $item->getParentItem() && $block->isShipmentSeparately()) : ?>
-             <li class="item">
--                <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
--                <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Shipped')); ?></span>
-+                <span class="content"><?= /* @noEscape */ $item->getQtyShipped() * 1; ?></span>
-             </li>
--        <?php else: ?>
--            &nbsp;
-+        <?php else : ?>
-+            <span class="content"><?= /* @noEscape */ $parentItem->getQtyOrdered() * 1; ?></span>
-         <?php endif; ?>
--        <?php if (
--        ($_item->getParentItem() && $block->isChildCalculated()) ||
--        (!$_item->getParentItem() && !$block->isChildCalculated()) || ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $block->isShipmentSeparately())):?>
-+        <?php if (($item->getParentItem() && $block->isChildCalculated()) ||
-+        (!$item->getParentItem() && !$block->isChildCalculated()) ||
-+        ($item->getQtyShipped() > 0 && $item->getParentItem() && $block->isShipmentSeparately())) :?>
-             </ul>
-         <?php endif; ?>
-     </td>
--    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
--        <?php if (!$_item->getParentItem()): ?>
--            <?= $block->getItemRowTotalHtml() ?>
--        <?php else: ?>
-+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
-+        <?php if (!$item->getParentItem()) : ?>
-+            <?= /* @noEscape */ $block->getItemRowTotalHtml(); ?>
-+        <?php else : ?>
-             &nbsp;
-         <?php endif; ?>
-     </td>
- </tr>
- <?php endforeach; ?>
- 
--<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))): ?>
-+<?php if ($showLastRow && (($options = $block->getItemOptions()) || $block->escapeHtml($item->getDescription()))) : ?>
- <tr>
-     <td class="col options" colspan="5">
--        <?php if ($_options = $block->getItemOptions()): ?>
-+        <?php if ($options = $block->getItemOptions()) : ?>
-             <dl class="item-options">
--                <?php foreach ($_options as $_option) : ?>
--                    <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                    <?php if (!$block->getPrintStatus()): ?>
--                        <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
--                        <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
--                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
--                            <?php if (isset($_formatedOptionValue['full_view'])): ?>
-+                <?php foreach ($options as $option) : ?>
-+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
-+                    <?php if (!$block->getPrintStatus()) : ?>
-+                        <?php $formattedOptionValue = $block->getFormatedOptionValue($option) ?>
-+                        <dd<?php if (isset($formattedOptionValue['full_view'])) : ?>
-+                            class="tooltip wrapper"
-+                        <?php endif; ?>>
-+                            <?= /* @noEscape */ $formattedOptionValue['value'] ?>
-+                            <?php if (isset($formattedOptionValue['full_view'])) : ?>
-                                 <div class="tooltip content">
-                                     <dl class="item options">
--                                        <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
-+                                        <dt><?= $block->escapeHtml($option['label']); ?></dt>
-+                                        <dd><?= /* @noEscape */ $formattedOptionValue['full_view']; ?></dd>
-                                     </dl>
-                                 </div>
-                             <?php endif; ?>
-                         </dd>
--                    <?php else: ?>
--                        <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
-+                    <?php else : ?>
-+                        <dd><?= $block->escapeHtml((isset($option['print_value']) ?
-+                                $option['print_value'] :
-+                                $option['value'])); ?>
-+                        </dd>
-                     <?php endif; ?>
-                 <?php endforeach; ?>
-             </dl>
-         <?php endif; ?>
--        <?= $block->escapeHtml($_item->getDescription()) ?>
-+        <?= $block->escapeHtml($item->getDescription()); ?>
-     </td>
- </tr>
- <?php endif; ?>
-diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
-index 0cd39156b25..c2ed3b161f6 100644
---- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
-+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
- 
-@@ -16,69 +14,69 @@
- 
- <?php $_prevOptionId = '' ?>
- 
--<?php foreach ($items as $_item): ?>
-+<?php foreach ($items as $_item) : ?>
- 
--    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-+    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()) : ?>
-         <?php $_showlastRow = true ?>
--    <?php else: ?>
-+    <?php else : ?>
-         <?php $_showlastRow = false ?>
-     <?php endif; ?>
- 
--    <?php if ($_item->getParentItem()): ?>
-+    <?php if ($_item->getParentItem()) : ?>
-         <?php $attributes = $block->getSelectionAttributes($_item) ?>
--        <?php if ($_prevOptionId != $attributes['option_id']): ?>
-+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
-             <tr class="options-label">
--                <td colspan="3" class="col label"><div class="option label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
-+                <td colspan="3" class="col label"><div class="option label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
-             </tr>
-             <?php $_prevOptionId = $attributes['option_id'] ?>
-         <?php endif; ?>
-     <?php endif; ?>
--    <tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="<?php if ($_item->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?= /* @escapeNotVerified */ $attributes['option_label'] ?>"<?php endif; ?>>
--        <?php if (!$_item->getParentItem()): ?>
--            <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
-+    <tr id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>" class="<?php if ($_item->getParentItem()) : ?>item-options-container<?php else : ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()) : ?> data-th="<?= $block->escapeHtmlAttr($attributes['option_label']) ?>"<?php endif; ?>>
-+        <?php if (!$_item->getParentItem()) : ?>
-+            <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
-                 <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
-             </td>
--        <?php else: ?>
--            <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
-+        <?php else : ?>
-+            <td class="col value" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
-         <?php endif; ?>
--        <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
--        <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Shipped')) ?>">
--            <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())): ?>
--                <?php if (isset($shipItems[$_item->getId()])): ?>
--                    <?= /* @escapeNotVerified */ $shipItems[$_item->getId()]->getQty()*1 ?>
--                <?php elseif ($_item->getIsVirtual()): ?>
--                    <?= /* @escapeNotVerified */ __('N/A') ?>
--                <?php else: ?>
-+        <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
-+        <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Qty Shipped')) ?>">
-+            <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())) : ?>
-+                <?php if (isset($shipItems[$_item->getId()])) : ?>
-+                    <?= (float)$shipItems[$_item->getId()]->getQty() * 1 ?>
-+                <?php elseif ($_item->getIsVirtual()) : ?>
-+                    <?= $block->escapeHtml(__('N/A')) ?>
-+                <?php else : ?>
-                     0
-                 <?php endif; ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 &nbsp;
-             <?php endif; ?>
-         </td>
-     </tr>
- <?php endforeach; ?>
- 
--<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))): ?>
-+<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))) : ?>
-     <tr>
-         <td class="col options" colspan="3">
--            <?php if ($_options = $block->getItemOptions()): ?>
-+            <?php if ($_options = $block->getItemOptions()) : ?>
-                 <dl class="item-options">
-                     <?php foreach ($_options as $_option) : ?>
-                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                        <?php if (!$block->getPrintStatus()): ?>
-+                        <?php if (!$block->getPrintStatus()) : ?>
-                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
--                            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
--                                <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
--                                <?php if (isset($_formatedOptionValue['full_view'])): ?>
-+                            <dd<?php if (isset($_formatedOptionValue['full_view'])) : ?> class="tooltip wrapper"<?php endif; ?>>
-+                                <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
-+                                <?php if (isset($_formatedOptionValue['full_view'])) : ?>
-                                     <div class="tooltip content">
-                                         <dl class="item options">
-                                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
-+                                            <dd><?= /* @noEscape */ $_formatedOptionValue['full_view'] ?></dd>
-                                         </dl>
-                                     </div>
-                                 <?php endif; ?>
-                             </dd>
--                        <?php else: ?>
-+                        <?php else : ?>
-                             <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
-                         <?php endif; ?>
-                     <?php endforeach; ?>
-diff --git a/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js b/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js
-index d8d4cb1e99b..1e7fe6b6673 100644
---- a/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js
-+++ b/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js
-@@ -56,8 +56,9 @@ define([
- 
-             // Clear Summary box
-             this.element.html('');
--
--            $.each(this.cache.currentElement.selected, $.proxy(this._renderOption, this));
-+            this.cache.currentElement.positions.forEach(function (optionId) {
-+                this._renderOption(optionId, this.cache.currentElement.selected[optionId]);
-+            }, this);
-             this.element
-                 .parents(this.options.bundleSummaryContainer)
-                 .toggleClass('empty', !this.cache.currentElementCount); // Zero elements equal '.empty' container
-diff --git a/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php b/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php
-index b904d3f62a7..211d625fbc7 100644
---- a/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php
-+++ b/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php
-@@ -8,19 +8,22 @@ declare(strict_types=1);
- namespace Magento\BundleGraphQl\Model;
- 
- use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
-+use Magento\Bundle\Model\Product\Type as Type;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class BundleProductTypeResolver implements TypeResolverInterface
- {
-+    const BUNDLE_PRODUCT = 'BundleProduct';
-+    
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolveType(array $data) : string
-     {
--        if (isset($data['type_id']) && $data['type_id'] == 'bundle') {
--            return 'BundleProduct';
-+        if (isset($data['type_id']) && $data['type_id'] == Type::TYPE_CODE) {
-+            return self::BUNDLE_PRODUCT;
-         }
-         return '';
-     }
-diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItemLinks.php b/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItemLinks.php
-index f90945d19f9..184f7177a99 100644
---- a/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItemLinks.php
-+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItemLinks.php
-@@ -7,15 +7,15 @@ declare(strict_types=1);
- 
- namespace Magento\BundleGraphQl\Model\Resolver;
- 
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\BundleGraphQl\Model\Resolver\Links\Collection;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
- use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class BundleItemLinks implements ResolverInterface
- {
-@@ -42,16 +42,14 @@ class BundleItemLinks implements ResolverInterface
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
--    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-     {
-         if (!isset($value['option_id']) || !isset($value['parent_id'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"option_id" and "parent_id" values should be specified'));
-         }
-+
-         $this->linkCollection->addIdFilters((int)$value['option_id'], (int)$value['parent_id']);
-         $result = function () use ($value) {
-             return $this->linkCollection->getLinksForOptionId((int)$value['option_id']);
-diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php b/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php
-index 9474f825fe5..b67bd69ecf9 100644
---- a/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php
-+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php
-@@ -13,12 +13,11 @@ use Magento\BundleGraphQl\Model\Resolver\Options\Collection;
- use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
- use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class BundleItems implements ResolverInterface
- {
-@@ -35,21 +34,21 @@ class BundleItems implements ResolverInterface
-     /**
-      * @var MetadataPool
-      */
--    private $metdataPool;
-+    private $metadataPool;
- 
-     /**
-      * @param Collection $bundleOptionCollection
-      * @param ValueFactory $valueFactory
--     * @param MetadataPool $metdataPool
-+     * @param MetadataPool $metadataPool
-      */
-     public function __construct(
-         Collection $bundleOptionCollection,
-         ValueFactory $valueFactory,
--        MetadataPool $metdataPool
-+        MetadataPool $metadataPool
-     ) {
-         $this->bundleOptionCollection = $bundleOptionCollection;
-         $this->valueFactory = $valueFactory;
--        $this->metdataPool = $metdataPool;
-+        $this->metadataPool = $metadataPool;
-     }
- 
-     /**
-@@ -57,9 +56,9 @@ class BundleItems implements ResolverInterface
-      *
-      * {@inheritDoc}
-      */
--    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-     {
--        $linkField = $this->metdataPool->getMetadata(ProductInterface::class)->getLinkField();
-+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-         if ($value['type_id'] !== Type::TYPE_CODE
-             || !isset($value[$linkField])
-             || !isset($value[ProductInterface::SKU])
-diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php
-index 149155c8627..7608d6e9e4d 100644
---- a/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php
-+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php
-@@ -61,6 +61,7 @@ class Collection
-      * Add parent id/sku pair to use for option filter at fetch time.
-      *
-      * @param int $parentId
-+     * @param int $parentEntityId
-      * @param string $sku
-      */
-     public function addParentFilterData(int $parentId, int $parentEntityId, string $sku) : void
-diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Label.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Label.php
-index a4757108ee5..de72b18982c 100644
---- a/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Label.php
-+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Label.php
-@@ -7,10 +7,10 @@ declare(strict_types=1);
- 
- namespace Magento\BundleGraphQl\Model\Resolver\Options;
- 
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
--use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product;
-+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product as ProductDataProvider;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
- use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
-@@ -19,29 +19,28 @@ use Magento\Framework\GraphQl\Query\ResolverInterface;
-  */
- class Label implements ResolverInterface
- {
--
-     /**
-      * @var ValueFactory
-      */
-     private $valueFactory;
- 
-     /**
--     * @var Product
-+     * @var ProductDataProvider
-      */
-     private $product;
- 
-     /**
-      * @param ValueFactory $valueFactory
--     * @param Product $product
-+     * @param ProductDataProvider $product
-      */
--    public function __construct(ValueFactory $valueFactory, Product $product)
-+    public function __construct(ValueFactory $valueFactory, ProductDataProvider $product)
-     {
-         $this->valueFactory = $valueFactory;
-         $this->product = $product;
-     }
- 
-     /**
--     * @inheritDoc
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -49,12 +48,9 @@ class Label implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         if (!isset($value['sku'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"sku" value should be specified'));
-         }
- 
-         $this->product->addProductSku($value['sku']);
-diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicPrice.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicPrice.php
-index e8dc3decc2a..978e1c455fc 100644
---- a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicPrice.php
-+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicPrice.php
-@@ -5,36 +5,20 @@
-  */
- declare(strict_types=1);
- 
--
- namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
- 
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Bundle\Model\Product\Type as Bundle;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class DynamicPrice implements ResolverInterface
- {
-     /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
--    /**
--     * @param ValueFactory $valueFactory
--     */
--    public function __construct(ValueFactory $valueFactory)
--    {
--        $this->valueFactory = $valueFactory;
--    }
--
--    /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -42,16 +26,12 @@ class DynamicPrice implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         $result = null;
-         if ($value['type_id'] === Bundle::TYPE_CODE) {
-             $result = isset($value['price_type']) ? !$value['price_type'] : null;
-         }
- 
--        return $this->valueFactory->create(
--            function () use ($result) {
--                return $result;
--            }
--        );
-+        return $result;
-     }
- }
-diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicSku.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicSku.php
-index 37e1557d36d..73f84c278a6 100644
---- a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicSku.php
-+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicSku.php
-@@ -5,36 +5,20 @@
-  */
- declare(strict_types=1);
- 
--
- namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
- 
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Bundle\Model\Product\Type as Bundle;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class DynamicSku implements ResolverInterface
- {
-     /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
--    /**
--     * @param ValueFactory $valueFactory
--     */
--    public function __construct(ValueFactory $valueFactory)
--    {
--        $this->valueFactory = $valueFactory;
--    }
--
--    /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -42,18 +26,12 @@ class DynamicSku implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
--        $result = function () {
--            return null;
--        };
-+    ) {
-+        $result = null;
-         if ($value['type_id'] === Bundle::TYPE_CODE) {
-             $result = isset($value['sku_type']) ? !$value['sku_type'] : null;
-         }
- 
--        return $this->valueFactory->create(
--            function () use ($result) {
--                return $result;
--            }
--        );
-+        return $result;
-     }
- }
-diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicWeight.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicWeight.php
-index 5f79bba449e..a4bb8ef64fc 100644
---- a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicWeight.php
-+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicWeight.php
-@@ -5,36 +5,20 @@
-  */
- declare(strict_types=1);
- 
--
- namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
- 
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Bundle\Model\Product\Type as Bundle;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class DynamicWeight implements ResolverInterface
- {
-     /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
--    /**
--     * @param ValueFactory $valueFactory
--     */
--    public function __construct(ValueFactory $valueFactory)
--    {
--        $this->valueFactory = $valueFactory;
--    }
--
--    /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -42,18 +26,12 @@ class DynamicWeight implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
--        $result = function () {
--            return null;
--        };
-+    ) {
-+        $result = null;
-         if ($value['type_id'] === Bundle::TYPE_CODE) {
-             $result = isset($value['weight_type']) ? !$value['weight_type'] : null;
-         }
- 
--        return $this->valueFactory->create(
--            function () use ($result) {
--                return $result;
--            }
--        );
-+        return $result;
-     }
- }
-diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/PriceView.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/PriceView.php
-index ef8e93748c7..b7351b09d43 100644
---- a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/PriceView.php
-+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/PriceView.php
-@@ -5,19 +5,16 @@
-  */
- declare(strict_types=1);
- 
--
- namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
- 
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Bundle\Model\Product\Type as Bundle;
- use Magento\Framework\GraphQl\Config\Element\Field;
- use Magento\Framework\GraphQl\Query\EnumLookup;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class PriceView implements ResolverInterface
- {
-@@ -26,23 +23,16 @@ class PriceView implements ResolverInterface
-      */
-     private $enumLookup;
- 
--    /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
-     /**
-      * @param EnumLookup $enumLookup
--     * @param ValueFactory $valueFactory
-      */
--    public function __construct(EnumLookup $enumLookup, ValueFactory $valueFactory)
-+    public function __construct(EnumLookup $enumLookup)
-     {
-         $this->enumLookup = $enumLookup;
--        $this->valueFactory = $valueFactory;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -50,19 +40,13 @@ class PriceView implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
--        $result = function () {
--            return null;
--        };
-+    ) {
-+        $result = null;
-         if ($value['type_id'] === Bundle::TYPE_CODE) {
-             $result = isset($value['price_view'])
-                 ? $this->enumLookup->getEnumValueFromField('PriceViewEnum', $value['price_view']) : null;
-         }
- 
--        return $this->valueFactory->create(
--            function () use ($result) {
--                return $result;
--            }
--        );
-+        return $result;
-     }
- }
-diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/ShipBundleItems.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/ShipBundleItems.php
-index e2bd12a84e2..6babf6520e1 100644
---- a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/ShipBundleItems.php
-+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/ShipBundleItems.php
-@@ -5,19 +5,16 @@
-  */
- declare(strict_types=1);
- 
--
- namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
- 
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Bundle\Model\Product\Type as Bundle;
- use Magento\Framework\GraphQl\Config\Element\Field;
- use Magento\Framework\GraphQl\Query\EnumLookup;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class ShipBundleItems implements ResolverInterface
- {
-@@ -26,23 +23,16 @@ class ShipBundleItems implements ResolverInterface
-      */
-     private $enumLookup;
- 
--    /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
-     /**
-      * @param EnumLookup $enumLookup
--     * @param ValueFactory $valueFactory
-      */
--    public function __construct(EnumLookup $enumLookup, ValueFactory $valueFactory)
-+    public function __construct(EnumLookup $enumLookup)
-     {
-         $this->enumLookup = $enumLookup;
--        $this->valueFactory = $valueFactory;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -50,19 +40,10 @@ class ShipBundleItems implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
--        $result = function () {
--            return null;
--        };
--        if ($value['type_id'] === Bundle::TYPE_CODE) {
--            $result = isset($value['shipment_type'])
--                ? $this->enumLookup->getEnumValueFromField('ShipBundleItemsEnum', $value['shipment_type']) : null;
--        }
-+    ) {
-+        $result = isset($value['shipment_type']) && $value['type_id'] === Bundle::TYPE_CODE
-+            ? $this->enumLookup->getEnumValueFromField('ShipBundleItemsEnum', $value['shipment_type']) : null;
- 
--        return $this->valueFactory->create(
--            function () use ($result) {
--                return $result;
--            }
--        );
-+        return $result;
-     }
- }
-diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
-index edde6079dfb..26d2cbcd704 100644
---- a/app/code/Magento/BundleGraphQl/etc/schema.graphqls
-+++ b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
-@@ -1,35 +1,35 @@
- # Copyright © Magento, Inc. All rights reserved.
- # See COPYING.txt for license details.
- 
--type BundleItem @doc(description: "BundleItem defines an individual item in a bundle product") {
--    option_id: Int @doc(description: "An ID assigned to each type of item in a bundle product")
--    title: String @doc(description: "The display name of the item")
--    required: Boolean @doc(description: "Indicates whether the item must be included in the bundle")
--    type: String @doc(description: "The input type that the customer uses to select the item. Examples include radio button and checkbox")
--    position: Int @doc(description: "he relative position of this item compared to the other bundle items")
--    sku: String @doc(description: "The SKU of the bundle product")
--    options: [BundleItemOption] @doc(description: "An array of additional options for this bundle item") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundleItemLinks")
-+type BundleItem @doc(description: "BundleItem defines an individual item in a bundle product.") {
-+    option_id: Int @doc(description: "An ID assigned to each type of item in a bundle product.")
-+    title: String @doc(description: "The display name of the item.")
-+    required: Boolean @doc(description: "Indicates whether the item must be included in the bundle.")
-+    type: String @doc(description: "The input type that the customer uses to select the item. Examples include radio button and checkbox.")
-+    position: Int @doc(description: "he relative position of this item compared to the other bundle items.")
-+    sku: String @doc(description: "The SKU of the bundle product.")
-+    options: [BundleItemOption] @doc(description: "An array of additional options for this bundle item.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundleItemLinks")
- }
- 
--type BundleItemOption @doc(description: "BundleItemOption defines characteristics and options for a specific bundle item") {
--    id: Int @doc(description: "The ID assigned to the bundled item option")
--    label: String @doc(description: "The text that identifies the bundled item option") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\Label")
--    qty: Float @doc(description: "Indicates the quantity of this specific bundle item")
--    position: Int @doc(description: "When a bundle item contains multiple options, the relative position of this option compared to the other options")
--    is_default: Boolean @doc(description: "Indicates whether this option is the default option")
--    price: Float @doc(description: "The price of the selected option")
--    price_type: PriceTypeEnum @doc(description: "One of FIXED, PERCENT, or DYNAMIC")
--    can_change_quantity: Boolean @doc(description: "Indicates whether the customer can change the number of items for this option")
--    product: ProductInterface @doc(description: "Contains details about this product option") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
-+type BundleItemOption @doc(description: "BundleItemOption defines characteristics and options for a specific bundle item.") {
-+    id: Int @doc(description: "The ID assigned to the bundled item option.")
-+    label: String @doc(description: "The text that identifies the bundled item option.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\Label")
-+    qty: Float @doc(description: "Indicates the quantity of this specific bundle item.")
-+    position: Int @doc(description: "When a bundle item contains multiple options, the relative position of this option compared to the other options.")
-+    is_default: Boolean @doc(description: "Indicates whether this option is the default option.")
-+    price: Float @doc(description: "The price of the selected option.")
-+    price_type: PriceTypeEnum @doc(description: "One of FIXED, PERCENT, or DYNAMIC.")
-+    can_change_quantity: Boolean @doc(description: "Indicates whether the customer can change the number of items for this option.")
-+    product: ProductInterface @doc(description: "Contains details about this product option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
- }
- 
--type BundleProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "BundleProduct defines basic features of a bundle product and contains multiple BundleItems") {
--    price_view: PriceViewEnum @doc(description: "One of PRICE_RANGE or AS_LOW_AS") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\PriceView")
--    dynamic_price: Boolean @doc(description: "Indicates whether the bundle product has a dynamic price") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicPrice")
--    dynamic_sku: Boolean @doc(description: "Indicates whether the bundle product has a dynamic SK") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicSku")
--    ship_bundle_items: ShipBundleItemsEnum @doc(description: "Indicates whether to ship bundle items together or individually") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\ShipBundleItems")
--    dynamic_weight: Boolean @doc(description: "Indicates whether the bundle product has a dynamically calculated weight") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicWeight")
--    items: [BundleItem] @doc(description: "An array containing information about individual bundle items") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundleItems")
-+type BundleProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "BundleProduct defines basic features of a bundle product and contains multiple BundleItems.") {
-+    price_view: PriceViewEnum @doc(description: "One of PRICE_RANGE or AS_LOW_AS.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\PriceView")
-+    dynamic_price: Boolean @doc(description: "Indicates whether the bundle product has a dynamic price.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicPrice")
-+    dynamic_sku: Boolean @doc(description: "Indicates whether the bundle product has a dynamic SK.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicSku")
-+    ship_bundle_items: ShipBundleItemsEnum @doc(description: "Indicates whether to ship bundle items together or individually.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\ShipBundleItems")
-+    dynamic_weight: Boolean @doc(description: "Indicates whether the bundle product has a dynamically calculated weight.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicWeight")
-+    items: [BundleItem] @doc(description: "An array containing information about individual bundle items.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundleItems")
- }
- 
- enum PriceViewEnum @doc(description: "This enumeration defines whether a bundle product's price is displayed as the lowest possible value or as a range.") {
-diff --git a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
-index e0c94097e4d..2cefc60a429 100644
---- a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
-+++ b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
-@@ -322,7 +322,7 @@ class RowCustomizer implements RowCustomizerInterface
-      */
-     protected function getTypeValue($type)
-     {
--        return isset($this->typeMapping[$type]) ? $this->typeMapping[$type] : self::VALUE_DYNAMIC;
-+        return $this->typeMapping[$type] ?? self::VALUE_DYNAMIC;
-     }
- 
-     /**
-@@ -333,7 +333,7 @@ class RowCustomizer implements RowCustomizerInterface
-      */
-     protected function getPriceViewValue($type)
-     {
--        return isset($this->priceViewMapping[$type]) ? $this->priceViewMapping[$type] : self::VALUE_PRICE_RANGE;
-+        return $this->priceViewMapping[$type] ?? self::VALUE_PRICE_RANGE;
-     }
- 
-     /**
-@@ -344,7 +344,7 @@ class RowCustomizer implements RowCustomizerInterface
-      */
-     protected function getPriceTypeValue($type)
-     {
--        return isset($this->priceTypeMapping[$type]) ? $this->priceTypeMapping[$type] : null;
-+        return $this->priceTypeMapping[$type] ?? null;
-     }
- 
-     /**
-@@ -355,7 +355,7 @@ class RowCustomizer implements RowCustomizerInterface
-      */
-     private function getShipmentTypeValue($type)
-     {
--        return isset($this->shipmentTypeMapping[$type]) ? $this->shipmentTypeMapping[$type] : null;
-+        return $this->shipmentTypeMapping[$type] ?? null;
-     }
- 
-     /**
-diff --git a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
-index 3ed7e144ddd..81a47d72602 100644
---- a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
-+++ b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
-@@ -20,6 +20,7 @@ use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * Class Bundle
-+ *
-  * @package Magento\BundleImportExport\Model\Import\Product\Type
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  */
-@@ -349,6 +350,8 @@ class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
-     }
- 
-     /**
-+     * Deprecated method for retrieving mapping between skus and products.
-+     *
-      * @deprecated Misspelled method
-      * @see retrieveProductsByCachedSkus
-      */
-@@ -600,6 +603,7 @@ class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
- 
-     /**
-      * Populate array for insert option values
-+     *
-      * @param array $optionIds
-      * @return array
-      */
-@@ -779,7 +783,7 @@ class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
-      */
-     private function getStoreIdByCode(string $storeCode): int
-     {
--        if (!isset($this->storeIdToCode[$storeCode])) {
-+        if (!isset($this->storeCodeToId[$storeCode])) {
-             /** @var $store \Magento\Store\Model\Store */
-             foreach ($this->storeManager->getStores() as $store) {
-                 $this->storeCodeToId[$store->getCode()] = $store->getId();
-diff --git a/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php b/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php
-index b0794f45646..a8650a4e6e9 100644
---- a/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php
-+++ b/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php
-@@ -242,7 +242,7 @@ class BundleTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractIm
-                         'price_type' => 'fixed',
-                         'shipment_type' => '1',
-                         'default_qty' => '1',
--                        'is_defaul' => '1',
-+                        'is_default' => '1',
-                         'position' => '1',
-                         'option_id' => '1']
-                 ]
-@@ -264,7 +264,7 @@ class BundleTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractIm
-                         'price_type' => 'percent',
-                         'shipment_type' => 0,
-                         'default_qty' => '2',
--                        'is_defaul' => '1',
-+                        'is_default' => '1',
-                         'position' => '6',
-                         'option_id' => '6']
-                 ]
-@@ -324,7 +324,7 @@ class BundleTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractIm
-                          . 'price_type=fixed,'
-                          . 'shipment_type=separately,'
-                          . 'default_qty=1,'
--                         . 'is_defaul=1,'
-+                         . 'is_default=1,'
-                          . 'position=1,'
-                          . 'option_id=1 | name=Bundle2,'
-                          . 'type=dropdown,'
-@@ -333,7 +333,7 @@ class BundleTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractIm
-                          . 'price=10,'
-                          . 'price_type=fixed,'
-                          . 'default_qty=1,'
--                         . 'is_defaul=1,'
-+                         . 'is_default=1,'
-                          . 'position=2,'
-                          . 'option_id=2'
-                 ],
-diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
-index 8acf170d43c..b2aa0d000e9 100644
---- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
-+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
-@@ -7,6 +7,9 @@ namespace Magento\CacheInvalidate\Model;
- 
- use Magento\Framework\Cache\InvalidateLogger;
- 
-+/**
-+ * Class PurgeCache
-+ */
- class PurgeCache
- {
-     const HEADER_X_MAGENTO_TAGS_PATTERN = 'X-Magento-Tags-Pattern';
-@@ -26,6 +29,18 @@ class PurgeCache
-      */
-     private $logger;
- 
-+    /**
-+     * Batch size of the purge request.
-+     *
-+     * Based on default Varnish 4 http_req_hdr_len size minus a 512 bytes margin for method,
-+     * header name, line feeds etc.
-+     *
-+     * @see https://varnish-cache.org/docs/4.1/reference/varnishd.html
-+     *
-+     * @var int
-+     */
-+    private $requestSize = 7680;
-+
-     /**
-      * Constructor
-      *
-@@ -44,18 +59,66 @@ class PurgeCache
-     }
- 
-     /**
--     * Send curl purge request
--     * to invalidate cache by tags pattern
-+     * Send curl purge request to invalidate cache by tags pattern
-      *
-      * @param string $tagsPattern
-      * @return bool Return true if successful; otherwise return false
-      */
-     public function sendPurgeRequest($tagsPattern)
-     {
-+        $successful = true;
-         $socketAdapter = $this->socketAdapterFactory->create();
-         $servers = $this->cacheServer->getUris();
--        $headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $tagsPattern];
-         $socketAdapter->setOptions(['timeout' => 10]);
-+
-+        $formattedTagsChunks = $this->splitTags($tagsPattern);
-+        foreach ($formattedTagsChunks as $formattedTagsChunk) {
-+            if (!$this->sendPurgeRequestToServers($socketAdapter, $servers, $formattedTagsChunk)) {
-+                $successful = false;
-+            }
-+        }
-+
-+        return $successful;
-+    }
-+
-+    /**
-+     * Split tags by batches
-+     *
-+     * @param string $tagsPattern
-+     * @return \Generator
-+     */
-+    private function splitTags($tagsPattern)
-+    {
-+        $tagsBatchSize = 0;
-+        $formattedTagsChunk = [];
-+        $formattedTags = explode('|', $tagsPattern);
-+        foreach ($formattedTags as $formattedTag) {
-+            if ($tagsBatchSize + strlen($formattedTag) > $this->requestSize - count($formattedTagsChunk) - 1) {
-+                yield implode('|', $formattedTagsChunk);
-+                $formattedTagsChunk = [];
-+                $tagsBatchSize = 0;
-+            }
-+
-+            $tagsBatchSize += strlen($formattedTag);
-+            $formattedTagsChunk[] = $formattedTag;
-+        }
-+        if (!empty($formattedTagsChunk)) {
-+            yield implode('|', $formattedTagsChunk);
-+        }
-+    }
-+
-+    /**
-+     * Send curl purge request to servers to invalidate cache by tags pattern
-+     *
-+     * @param \Zend\Http\Client\Adapter\Socket $socketAdapter
-+     * @param \Zend\Uri\Uri[] $servers
-+     * @param string $formattedTagsChunk
-+     * @return bool Return true if successful; otherwise return false
-+     */
-+    private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedTagsChunk)
-+    {
-+        $headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $formattedTagsChunk];
-+        $unresponsiveServerError = [];
-         foreach ($servers as $server) {
-             $headers['Host'] = $server->getHost();
-             try {
-@@ -69,12 +132,31 @@ class PurgeCache
-                 $socketAdapter->read();
-                 $socketAdapter->close();
-             } catch (\Exception $e) {
--                $this->logger->critical($e->getMessage(), compact('server', 'tagsPattern'));
-+                $unresponsiveServerError[] = "Cache host: " . $server->getHost() . ":" . $server->getPort() .
-+                    "resulted in error message: " . $e->getMessage();
-+            }
-+        }
-+
-+        $errorCount = count($unresponsiveServerError);
-+
-+        if ($errorCount > 0) {
-+            $loggerMessage = implode(" ", $unresponsiveServerError);
-+
-+            if ($errorCount == count($servers)) {
-+                $this->logger->critical(
-+                    'No cache server(s) could be purged ' . $loggerMessage,
-+                    compact('server', 'formattedTagsChunk')
-+                );
-                 return false;
-             }
-+
-+            $this->logger->warning(
-+                'Unresponsive cache server(s) hit' . $loggerMessage,
-+                compact('server', 'formattedTagsChunk')
-+            );
-         }
- 
--        $this->logger->execute(compact('servers', 'tagsPattern'));
-+        $this->logger->execute(compact('servers', 'formattedTagsChunk'));
-         return true;
-     }
- }
-diff --git a/app/code/Magento/Captcha/Controller/Refresh/Index.php b/app/code/Magento/Captcha/Controller/Refresh/Index.php
-index e89a80646ed..e401e03e955 100644
---- a/app/code/Magento/Captcha/Controller/Refresh/Index.php
-+++ b/app/code/Magento/Captcha/Controller/Refresh/Index.php
-@@ -8,9 +8,10 @@
-  */
- namespace Magento\Captcha\Controller\Refresh;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\App\Action\Context;
- 
--class Index extends \Magento\Framework\App\Action\Action
-+class Index extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Captcha\Helper\Data
-diff --git a/app/code/Magento/Captcha/CustomerData/Captcha.php b/app/code/Magento/Captcha/CustomerData/Captcha.php
-new file mode 100644
-index 00000000000..a744daacdc6
---- /dev/null
-+++ b/app/code/Magento/Captcha/CustomerData/Captcha.php
-@@ -0,0 +1,61 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Captcha\CustomerData;
-+
-+use Magento\Customer\CustomerData\SectionSourceInterface;
-+
-+/**
-+ * Captcha section
-+ */
-+class Captcha extends \Magento\Framework\DataObject implements SectionSourceInterface
-+{
-+    /**
-+     * @var array
-+     */
-+    private $formIds;
-+
-+    /**
-+     * @var \Magento\Captcha\Helper\Data
-+     */
-+    private $helper;
-+
-+    /**
-+     * @param \Magento\Captcha\Helper\Data $helper
-+     * @param array $formIds
-+     * @param array $data
-+     * @codeCoverageIgnore
-+     */
-+    public function __construct(
-+        \Magento\Captcha\Helper\Data $helper,
-+        array $formIds,
-+        array $data = []
-+    ) {
-+        parent::__construct($data);
-+        $this->helper = $helper;
-+        $this->formIds = $formIds;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getSectionData() :array
-+    {
-+        $data = [];
-+
-+        foreach ($this->formIds as $formId) {
-+            $captchaModel = $this->helper->getCaptcha($formId);
-+            $data[$formId] = [
-+                'isRequired' => $captchaModel->isRequired(),
-+                'timestamp' => time()
-+            ];
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php b/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php
-index ef5f5a8edce..34ee62044ff 100644
---- a/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php
-+++ b/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Captcha\Model\Checkout;
- 
-+/**
-+ * Configuration provider for Captcha rendering.
-+ */
- class ConfigProvider implements \Magento\Checkout\Model\ConfigProviderInterface
- {
-     /**
-@@ -38,7 +41,7 @@ class ConfigProvider implements \Magento\Checkout\Model\ConfigProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConfig()
-     {
-@@ -49,7 +52,8 @@ class ConfigProvider implements \Magento\Checkout\Model\ConfigProviderInterface
-                 'imageHeight' => $this->getImageHeight($formId),
-                 'imageSrc' => $this->getImageSrc($formId),
-                 'refreshUrl' => $this->getRefreshUrl(),
--                'isRequired' => $this->isRequired($formId)
-+                'isRequired' => $this->isRequired($formId),
-+                'timestamp' => time()
-             ];
-         }
-         return $config;
-diff --git a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
-index 91f3a785df3..84ac71046c3 100644
---- a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
-+++ b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
-@@ -10,6 +10,9 @@ use Magento\Captcha\Helper\Data as CaptchaHelper;
- use Magento\Framework\Session\SessionManagerInterface;
- use Magento\Framework\Controller\Result\JsonFactory;
- 
-+/**
-+ * Around plugin for login action.
-+ */
- class AjaxLogin
- {
-     /**
-@@ -61,6 +64,8 @@ class AjaxLogin
-     }
- 
-     /**
-+     * Check captcha data on login action.
-+     *
-      * @param \Magento\Customer\Controller\Ajax\Login $subject
-      * @param \Closure $proceed
-      * @return $this
-@@ -94,18 +99,20 @@ class AjaxLogin
-             if ($formId === $loginFormId) {
-                 $captchaModel = $this->helper->getCaptcha($formId);
-                 if ($captchaModel->isRequired($username)) {
--                    $captchaModel->logAttempt($username);
-                     if (!$captchaModel->isCorrect($captchaString)) {
-                         $this->sessionManager->setUsername($username);
-+                        $captchaModel->logAttempt($username);
-                         return $this->returnJsonError(__('Incorrect CAPTCHA'));
-                     }
-                 }
-+                $captchaModel->logAttempt($username);
-             }
-         }
-         return $proceed();
-     }
- 
-     /**
-+     * Format JSON response.
-      *
-      * @param \Magento\Framework\Phrase $phrase
-      * @return \Magento\Framework\Controller\Result\Json
-diff --git a/app/code/Magento/Captcha/Model/DefaultModel.php b/app/code/Magento/Captcha/Model/DefaultModel.php
-index cf6690df5c8..483f9c3fb4d 100644
---- a/app/code/Magento/Captcha/Model/DefaultModel.php
-+++ b/app/code/Magento/Captcha/Model/DefaultModel.php
-@@ -78,6 +78,11 @@ class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model
-      */
-     protected $session;
- 
-+    /**
-+     * @var string
-+     */
-+    private $words;
-+
-     /**
-      * @param \Magento\Framework\Session\SessionManagerInterface $session
-      * @param \Magento\Captcha\Helper\Data $captchaData
-@@ -311,18 +316,18 @@ class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model
-      */
-     public function isCorrect($word)
-     {
--        $storedWord = $this->getWord();
-+        $storedWords = $this->getWords();
-         $this->clearWord();
- 
--        if (!$word || !$storedWord) {
-+        if (!$word || !$storedWords) {
-             return false;
-         }
- 
-         if (!$this->isCaseSensitive()) {
--            $storedWord = strtolower($storedWord);
-+            $storedWords = strtolower($storedWords);
-             $word = strtolower($word);
-         }
--        return $word === $storedWord;
-+        return in_array($word, explode(',', $storedWords));
-     }
- 
-     /**
-@@ -481,7 +486,7 @@ class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model
-     /**
-      * Get captcha word
-      *
--     * @return string
-+     * @return string|null
-      */
-     public function getWord()
-     {
-@@ -489,6 +494,17 @@ class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model
-         return time() < $sessionData['expires'] ? $sessionData['data'] : null;
-     }
- 
-+    /**
-+     * Get captcha words
-+     *
-+     * @return string|null
-+     */
-+    private function getWords()
-+    {
-+        $sessionData = $this->session->getData($this->getFormIdKey(self::SESSION_WORD));
-+        return time() < $sessionData['expires'] ? $sessionData['words'] : null;
-+    }
-+
-     /**
-      * Set captcha word
-      *
-@@ -498,9 +514,10 @@ class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model
-      */
-     protected function setWord($word)
-     {
-+        $this->words = $this->words ? $this->words . ',' . $word : $word;
-         $this->session->setData(
-             $this->getFormIdKey(self::SESSION_WORD),
--            ['data' => $word, 'expires' => time() + $this->getTimeout()]
-+            ['data' => $word, 'words' => $this->words, 'expires' => time() + $this->getTimeout()]
-         );
-         $this->word = $word;
-         return $this;
-diff --git a/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php b/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
-index 9b97225e60d..39579616fa9 100644
---- a/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
-+++ b/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
-@@ -18,6 +18,6 @@ class CaptchaStringResolver
-     {
-         $captchaParams = $request->getPost(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE);
- 
--        return isset($captchaParams[$formId]) ? $captchaParams[$formId] : '';
-+        return $captchaParams[$formId] ?? '';
-     }
- }
-diff --git a/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php b/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
-deleted file mode 100644
-index 7ccaa76b6c7..00000000000
---- a/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
-+++ /dev/null
-@@ -1,82 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Captcha\Observer;
--
--use Magento\Framework\Event\ObserverInterface;
--
--class CheckGuestCheckoutObserver implements ObserverInterface
--{
--    /**
--     * @var \Magento\Captcha\Helper\Data
--     */
--    protected $_helper;
--
--    /**
--     * @var \Magento\Framework\App\ActionFlag
--     */
--    protected $_actionFlag;
--
--    /**
--     * @var CaptchaStringResolver
--     */
--    protected $captchaStringResolver;
--
--    /**
--     * @var \Magento\Checkout\Model\Type\Onepage
--     */
--    protected $_typeOnepage;
--
--    /**
--     * @var \Magento\Framework\Json\Helper\Data
--     */
--    protected $jsonHelper;
--
--    /**
--     * @param \Magento\Captcha\Helper\Data $helper
--     * @param \Magento\Framework\App\ActionFlag $actionFlag
--     * @param CaptchaStringResolver $captchaStringResolver
--     * @param \Magento\Checkout\Model\Type\Onepage $typeOnepage
--     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
--     */
--    public function __construct(
--        \Magento\Captcha\Helper\Data $helper,
--        \Magento\Framework\App\ActionFlag $actionFlag,
--        CaptchaStringResolver $captchaStringResolver,
--        \Magento\Checkout\Model\Type\Onepage $typeOnepage,
--        \Magento\Framework\Json\Helper\Data $jsonHelper
--    ) {
--        $this->_helper = $helper;
--        $this->_actionFlag = $actionFlag;
--        $this->captchaStringResolver = $captchaStringResolver;
--        $this->_typeOnepage = $typeOnepage;
--        $this->jsonHelper = $jsonHelper;
--    }
--
--    /**
--     * Check Captcha On Checkout as Guest Page
--     *
--     * @param \Magento\Framework\Event\Observer $observer
--     * @return $this
--     */
--    public function execute(\Magento\Framework\Event\Observer $observer)
--    {
--        $formId = 'guest_checkout';
--        $captchaModel = $this->_helper->getCaptcha($formId);
--        $checkoutMethod = $this->_typeOnepage->getQuote()->getCheckoutMethod();
--        if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_GUEST
--            && $captchaModel->isRequired()
--        ) {
--            $controller = $observer->getControllerAction();
--            if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))) {
--                $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
--                $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
--                $controller->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
--            }
--        }
--
--        return $this;
--    }
--}
-diff --git a/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php b/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
-deleted file mode 100644
-index 8e110a9f465..00000000000
---- a/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
-+++ /dev/null
-@@ -1,82 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Captcha\Observer;
--
--use Magento\Framework\Event\ObserverInterface;
--
--class CheckRegisterCheckoutObserver implements ObserverInterface
--{
--    /**
--     * @var \Magento\Captcha\Helper\Data
--     */
--    protected $_helper;
--
--    /**
--     * @var \Magento\Framework\App\ActionFlag
--     */
--    protected $_actionFlag;
--
--    /**
--     * @var CaptchaStringResolver
--     */
--    protected $captchaStringResolver;
--
--    /**
--     * @var \Magento\Checkout\Model\Type\Onepage
--     */
--    protected $_typeOnepage;
--
--    /**
--     * @var \Magento\Framework\Json\Helper\Data
--     */
--    protected $jsonHelper;
--
--    /**
--     * @param \Magento\Captcha\Helper\Data $helper
--     * @param \Magento\Framework\App\ActionFlag $actionFlag
--     * @param CaptchaStringResolver $captchaStringResolver
--     * @param \Magento\Checkout\Model\Type\Onepage $typeOnepage
--     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
--     */
--    public function __construct(
--        \Magento\Captcha\Helper\Data $helper,
--        \Magento\Framework\App\ActionFlag $actionFlag,
--        CaptchaStringResolver $captchaStringResolver,
--        \Magento\Checkout\Model\Type\Onepage $typeOnepage,
--        \Magento\Framework\Json\Helper\Data $jsonHelper
--    ) {
--        $this->_helper = $helper;
--        $this->_actionFlag = $actionFlag;
--        $this->captchaStringResolver = $captchaStringResolver;
--        $this->_typeOnepage = $typeOnepage;
--        $this->jsonHelper = $jsonHelper;
--    }
--
--    /**
--     * Check Captcha On Checkout Register Page
--     *
--     * @param \Magento\Framework\Event\Observer $observer
--     * @return $this
--     */
--    public function execute(\Magento\Framework\Event\Observer $observer)
--    {
--        $formId = 'register_during_checkout';
--        $captchaModel = $this->_helper->getCaptcha($formId);
--        $checkoutMethod = $this->_typeOnepage->getQuote()->getCheckoutMethod();
--        if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_REGISTER
--            && $captchaModel->isRequired()
--        ) {
--            $controller = $observer->getControllerAction();
--            if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))) {
--                $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
--                $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
--                $controller->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
--            }
--        }
--
--        return $this;
--    }
--}
-diff --git a/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php b/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php
-index bdc8dfa2189..dd4974c5d84 100644
---- a/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php
-+++ b/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Captcha\Observer;
- 
- use Magento\Customer\Model\AuthenticationInterface;
-@@ -11,7 +12,10 @@ use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Customer\Api\CustomerRepositoryInterface;
- 
- /**
-+ * Check captcha on user login page observer.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class CheckUserLoginObserver implements ObserverInterface
- {
-@@ -140,7 +144,7 @@ class CheckUserLoginObserver implements ObserverInterface
-                     $customer = $this->getCustomerRepository()->get($login);
-                     $this->getAuthentication()->processAuthenticationFailure($customer->getId());
-                 } catch (NoSuchEntityException $e) {
--                    //do nothing as customer existance is validated later in authenticate method
-+                    //do nothing as customer existence is validated later in authenticate method
-                 }
-                 $this->messageManager->addError(__('Incorrect CAPTCHA'));
-                 $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
-diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml
-new file mode 100644
-index 00000000000..07329e26598
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminLoginWithCaptchaActionGroup" extends="LoginAsAdmin">
-+        <arguments>
-+            <argument name="captcha" type="string" />
-+        </arguments>
-+        <fillField stepKey="fillCaptchaField" after="fillPassword" userInput="{{captcha}}" selector="{{AdminLoginFormSection.captchaField}}" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup.xml
-new file mode 100644
-index 00000000000..a371f177e35
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup">
-+        <waitForPageLoad stepKey="waitForPageLoaded" />
-+        <dontSee selector="{{StorefrontCustomerSignInFormSection.captchaField}}" stepKey="dontSeeCaptchaField"/>
-+        <dontSee selector="{{StorefrontCustomerSignInFormSection.captchaImg}}" stepKey="dontSeeCaptchaImage"/>
-+        <dontSee selector="{{StorefrontCustomerSignInFormSection.captchaReload}}" stepKey="dontSeeCaptchaReloadButton"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitForPageReloaded" />
-+        <dontSee selector="{{StorefrontCustomerSignInFormSection.captchaField}}" stepKey="dontSeeCaptchaFieldAfterPageReload"/>
-+        <dontSee selector="{{StorefrontCustomerSignInFormSection.captchaImg}}" stepKey="dontSeeCaptchaImageAfterPageReload"/>
-+        <dontSee selector="{{StorefrontCustomerSignInFormSection.captchaReload}}" stepKey="dontSeeCaptchaReloadButtonAfterPageReload"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnAdminLoginFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnAdminLoginFormActionGroup.xml
-new file mode 100644
-index 00000000000..aa02588000d
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnAdminLoginFormActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCaptchaVisibleOnAdminLoginFormActionGroup">
-+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaField}}" stepKey="seeCaptchaField"/>
-+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaImg}}" stepKey="seeCaptchaImage"/>
-+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitForPageReloaded" />
-+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaField}}" stepKey="seeCaptchaFieldAfterPageReload"/>
-+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaImg}}" stepKey="seeCaptchaImageAfterPageReload"/>
-+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaReload}}" stepKey="seeCaptchaReloadButtonAfterPageReload"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnContactUsFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnContactUsFormActionGroup.xml
-new file mode 100644
-index 00000000000..d800c65cabb
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnContactUsFormActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCaptchaVisibleOnContactUsFormActionGroup">
-+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaField}}" stepKey="waitToSeeCaptchaField"/>
-+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaImg}}" stepKey="waitToSeeCaptchaImage"/>
-+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaReload}}" stepKey="waitToSeeCaptchaReloadButton"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitForPageReloaded" />
-+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaField}}" stepKey="waitToSeeCaptchaFieldAfterPageReload"/>
-+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaImg}}" stepKey="waitToSeeCaptchaImageAfterPageReload"/>
-+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaReload}}" stepKey="waitToSeeCaptchaReloadButtonAfterPageReload"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup.xml
-new file mode 100644
-index 00000000000..6c09d1d4938
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup">
-+        <waitForElementVisible selector="{{StorefrontCustomerCreateFormSection.captchaField}}" stepKey="waitForCaptchaField"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerCreateFormSection.captchaImg}}" stepKey="waitForCaptchaImage"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerCreateFormSection.captchaReload}}" stepKey="waitForCaptchaReloadButton"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml
-new file mode 100644
-index 00000000000..c68ffbfb5be
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCaptchaVisibleOnCustomerAccountInfoActionGroup">
-+        <checkOption selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox" />
-+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" stepKey="seeCaptchaField"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaImg}}" stepKey="seeCaptchaImage"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitForPageReloaded" />
-+        <checkOption selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckboxAfterPageReload" />
-+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" stepKey="seeCaptchaFieldAfterPageReload"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaImg}}" stepKey="seeCaptchaImageAfterPageReload"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaReload}}" stepKey="seeCaptchaReloadButtonAfterPageReload"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerLoginFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerLoginFormActionGroup.xml
-new file mode 100644
-index 00000000000..5616b099c02
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerLoginFormActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCaptchaVisibleOnCustomerLoginFormActionGroup">
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaField}}" stepKey="waitToSeeCaptchaField"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaImg}}" stepKey="waitToSeeCaptchaImage"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaReload}}" stepKey="waitToSeeCaptchaReloadButton"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitForPageReloaded" />
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaField}}" stepKey="waitToSeeCaptchaFieldAfterPageReload"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaImg}}" stepKey="waitToSeeCaptchaImageAfterPageReload"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaReload}}" stepKey="waitToSeeCaptchaReloadButtonAfterPageReload"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml
-new file mode 100644
-index 00000000000..f3b6eb1d9af
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="CaptchaFormsDisplayingActionGroup">
-+        <click selector="{{CaptchaFormsDisplayingSection.store}}" stepKey="ClickToGoStores"/>
-+        <waitForPageLoad stepKey="waitForStoresLoaded"/>
-+        <click selector="{{CaptchaFormsDisplayingSection.config}}" stepKey="ClickToGoConfiguration"/>
-+        <waitForPageLoad stepKey="waitForConfigurationsLoaded"/>
-+        <scrollTo selector="{{CaptchaFormsDisplayingSection.customer}}" x="0" y="-80" stepKey="ScrollToCustomers"/>
-+        <click selector="{{CaptchaFormsDisplayingSection.customer}}" stepKey="ClickToCustomers"/>
-+        <waitForPageLoad stepKey="waitForCustomerConfigurationsLoaded"/>
-+        <click selector="{{CaptchaFormsDisplayingSection.customerConfig}}" stepKey="ClickToGoCustomerConfiguration"/>
-+        <scrollTo selector="{{CaptchaFormsDisplayingSection.captcha}}" stepKey="scrollToCaptcha"/>
-+        <conditionalClick selector="{{CaptchaFormsDisplayingSection.captcha}}" dependentSelector="{{CaptchaFormsDisplayingSection.dependent}}" visible="false" stepKey="ClickToOpenCaptcha"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailWithCaptchaActionGroup.xml
-new file mode 100644
-index 00000000000..8aff3d5482f
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailWithCaptchaActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+        
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontCustomerChangeEmailWithCaptchaActionGroup" extends="StorefrontCustomerChangeEmailActionGroup">
-+        <arguments>
-+            <argument name="captcha" type="string" />
-+        </arguments>
-+
-+        <fillField selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" userInput="{{captcha}}" stepKey="fillCaptchaField" after="fillCurrentPassword" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillContactUsFormWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillContactUsFormWithCaptchaActionGroup.xml
-new file mode 100644
-index 00000000000..3546fa2e57a
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillContactUsFormWithCaptchaActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontFillContactUsFormWithCaptchaActionGroup" extends="StorefrontFillContactUsFormActionGroup">
-+        <arguments>
-+            <argument name="captcha" type="string" />
-+        </arguments>
-+        <fillField stepKey="fillCaptchaField" after="fillComment" userInput="{{captcha}}" selector="{{StorefrontContactUsFormSection.captchaField}}" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup.xml
-new file mode 100644
-index 00000000000..d67ebc1a007
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup" extends="StorefrontFillCustomerAccountCreationFormActionGroup">
-+        <arguments>
-+            <argument name="captcha" type="string" />
-+        </arguments>
-+        <fillField stepKey="fillCaptchaField" after="fillConfirmPassword" userInput="{{captcha}}" selector="{{StorefrontCustomerCreateFormSection.captchaField}}" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormWithCaptchaActionGroup.xml
-new file mode 100644
-index 00000000000..5ad727a8fe9
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormWithCaptchaActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontFillCustomerLoginFormWithCaptchaActionGroup" extends="StorefrontFillCustomerLoginFormActionGroup">
-+        <arguments>
-+            <argument name="captcha" type="string" />
-+        </arguments>
-+        <fillField stepKey="fillCaptchaField" after="fillPassword" userInput="{{captcha}}" selector="{{StorefrontCustomerSignInFormSection.captchaField}}" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml
-new file mode 100644
-index 00000000000..90f48c320f2
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml
-@@ -0,0 +1,142 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="StorefrontCustomerCaptchaEnableConfigData">
-+        <!-- Magento default value -->
-+        <data key="path">customer/captcha/enable</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="StorefrontCustomerCaptchaDisableConfigData">
-+        <data key="path">customer/captcha/enable</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="StorefrontCaptchaOnCustomerCreateFormConfigData">
-+        <data key="path">customer/captcha/forms</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Create user</data>
-+        <data key="value">user_create</data>
-+    </entity>
-+    <entity name="StorefrontCaptchaOnContactUsFormConfigData">
-+        <data key="path">customer/captcha/forms</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Contact Us</data>
-+        <data key="value">contact_us</data>
-+    </entity>
-+    <entity name="StorefrontCaptchaOnCustomerLoginConfigData">
-+        <!-- Magento default value -->
-+        <data key="path">customer/captcha/forms</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Login</data>
-+        <data key="value">user_login</data>
-+    </entity>
-+    <entity name="StorefrontCaptchaOnCustomerChangePasswordConfigData">
-+        <data key="path">customer/captcha/forms</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Change password</data>
-+        <data key="value">user_edit</data>
-+    </entity>
-+    <entity name="StorefrontCaptchaOnCustomerForgotPasswordConfigData">
-+        <!-- Magento default value -->
-+        <data key="path">customer/captcha/forms</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Forgot password</data>
-+        <data key="value">user_forgotpassword</data>
-+    </entity>
-+    <entity name="StorefrontCustomerCaptchaModeAlwaysConfigData">
-+        <data key="path">customer/captcha/mode</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Always</data>
-+        <data key="value">always</data>
-+    </entity>
-+    <entity name="StorefrontCustomerCaptchaModeAfterFailConfigData">
-+        <!-- Magento default value -->
-+        <data key="path">customer/captcha/mode</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">After number of attempts to login</data>
-+        <data key="value">after_fail</data>
-+    </entity>
-+    <entity name="StorefrontCustomerCaptchaLength3ConfigData">
-+        <data key="path">customer/captcha/length</data>
-+        <data key="scope">admin</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">3</data>
-+        <data key="value">3</data>
-+    </entity>
-+    <entity name="StorefrontCustomerCaptchaSymbols1ConfigData">
-+        <data key="path">customer/captcha/symbols</data>
-+        <data key="scope">admin</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">1</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="StorefrontCustomerCaptchaDefaultLengthConfigData">
-+        <!-- Magento default value -->
-+        <data key="path">customer/captcha/length</data>
-+        <data key="scope">admin</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">4-5</data>
-+        <data key="value">4-5</data>
-+    </entity>
-+    <entity name="StorefrontCustomerCaptchaDefaultSymbolsConfigData">
-+        <!-- Magento default value -->
-+        <data key="path">customer/captcha/symbols</data>
-+        <data key="scope">admin</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">ABCDEFGHJKMnpqrstuvwxyz23456789</data>
-+        <data key="value">ABCDEFGHJKMnpqrstuvwxyz23456789</data>
-+    </entity>
-+    <entity name="AdminCaptchaEnableConfigData">
-+        <!-- Magento default value -->
-+        <data key="path">admin/captcha/enable</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="AdminCaptchaDisableConfigData">
-+        <data key="path">admin/captcha/enable</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="AdminCaptchaLength3ConfigData">
-+        <data key="path">admin/captcha/length</data>
-+        <data key="scope">admin</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">3</data>
-+        <data key="value">3</data>
-+    </entity>
-+    <entity name="AdminCaptchaSymbols1ConfigData">
-+        <data key="path">admin/captcha/symbols</data>
-+        <data key="scope">admin</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">1</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="AdminCaptchaDefaultLengthConfigData">
-+        <!-- Magento default value -->
-+        <data key="path">admin/captcha/length</data>
-+        <data key="scope">admin</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">4-5</data>
-+        <data key="value">4-5</data>
-+    </entity>
-+    <entity name="AdminCaptchaDefaultSymbolsConfigData">
-+        <!-- Magento default value -->
-+        <data key="path">admin/captcha/symbols</data>
-+        <data key="scope">admin</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">ABCDEFGHJKMnpqrstuvwxyz23456789</data>
-+        <data key="value">ABCDEFGHJKMnpqrstuvwxyz23456789</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.xml
-new file mode 100644
-index 00000000000..d8fb206b811
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="WrongCaptcha">
-+        <data key="value" unique="suffix">WrongCAPTCHA</data>
-+    </entity>
-+
-+    <!-- This CAPTCHA will only work if "StorefrontCustomerCaptchaLength3ConfigData" and "StorefrontCustomerCaptchaSymbols1ConfigData" config is set. -->
-+    <entity name="PreconfiguredCaptcha">
-+        <data key="value">111</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml
-new file mode 100644
-index 00000000000..57a09219fe4
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+   <entity name="CaptchaData">
-+       <data key="createUser">Create user</data>
-+       <data key="login">Login</data>
-+       <data key="passwd">Forgot password</data>
-+       <data key="contactUs">Contact Us</data>
-+       <data key="changePasswd">Change password</data>
-+       <data key="register">Register during Checkout</data>
-+       <data key="checkoutAsGuest">Check Out as Guest</data>
-+   </entity>
-+</entities>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/AdminLoginFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/AdminLoginFormSection.xml
-new file mode 100644
-index 00000000000..2bcc6fc542d
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Section/AdminLoginFormSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminLoginFormSection">
-+        <element name="captchaField" type="input" selector="#login-form input[name='captcha[backend_login]']" />
-+        <element name="captchaImg" type="block" selector="#login-form img#backend_login"/>
-+        <element name="captchaReload" type="block" selector="#login-form img#captcha-reload"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml
-new file mode 100644
-index 00000000000..4c974e6fced
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+    <section name="CaptchaFormsDisplayingSection">
-+        <element name="store" type="button" selector="#menu-magento-backend-stores"/>
-+        <element name="config" type="button" selector="//li[@data-ui-id='menu-magento-config-system-config']//span"/>
-+        <element name="customer" type="button" selector="//div[@class='admin__page-nav-title title _collapsible']//strong[text()='Customers']"/>
-+        <element name="customerConfig" type="text" selector="//span[text()='Customer Configuration']"/>
-+        <element name="captcha" type="button" selector="#customer_captcha-head"/>
-+        <element name="dependent" type="button" selector="//a[@id='customer_captcha-head' and @class='open']"/>
-+        <element name="forms" type="multiselect" selector="#customer_captcha_forms"/>
-+        <element name="createUser" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='user_create']"/>
-+        <element name="forgotpassword" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='user_forgotpassword']"/>
-+        <element name="userLogin" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='user_login']"/>
-+        <element name="guestCheckout" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='guest_checkout']"/>
-+        <element name="register" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='register_during_checkout']"/>
-+        <element name="userEdit" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='user_edit']"/>
-+        <element name="contactUs" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='contact_us']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsCaptchaSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsCaptchaSection.xml
-new file mode 100644
-index 00000000000..f587812576f
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsCaptchaSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontContactUsCaptchaSection">
-+        <element name="captchaField" type="input" selector="#captcha_contact_us"/>
-+        <element name="captchaImg" type="block" selector=".captcha-img"/>
-+        <element name="captchaReload" type="block" selector=".captcha-reload"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml
-new file mode 100644
-index 00000000000..60cf961ba7e
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontContactUsFormSection">
-+        <element name="captchaField" type="input" selector="#contact-form input[name='captcha[contact_us]']" />
-+        <element name="captchaImg" type="block" selector="#contact-form img.captcha-img"/>
-+        <element name="captchaReload" type="block" selector="#contact-form button.captcha-reload"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
-new file mode 100644
-index 00000000000..a273c8d4abd
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerAccountInformationSection">
-+        <element name="captchaField" type="input" selector="#captcha_user_edit"/>
-+        <element name="captchaImg" type="block" selector=".captcha-img"/>
-+        <element name="captchaReload" type="block" selector=".captcha-reload"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
-new file mode 100644
-index 00000000000..f48e6124cb2
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerCreateFormSection">
-+        <element name="captchaField" type="input" selector="#captcha_user_create"/>
-+        <element name="captchaImg" type="block" selector=".captcha-img"/>
-+        <element name="captchaReload" type="block" selector=".captcha-reload"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
-new file mode 100644
-index 00000000000..54aa36d1ca2
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerSignInFormSection">
-+        <element name="captchaField" type="input" selector="#captcha_user_login"/>
-+        <element name="captchaImg" type="block" selector=".captcha-img"/>
-+        <element name="captchaReload" type="block" selector=".captcha-reload"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInPopupFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInPopupFormSection.xml
-new file mode 100644
-index 00000000000..7a0557c4a27
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInPopupFormSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerSignInPopupFormSection">
-+        <element name="captchaField" type="input" selector="#captcha_user_login"/>
-+        <element name="captchaImg" type="block" selector=".captcha-img"/>
-+        <element name="captchaReload" type="block" selector=".captcha-reload"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml
-new file mode 100644
-index 00000000000..e5ee55910df
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml
-@@ -0,0 +1,68 @@
-+<?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="AdminLoginWithCaptchaTest">
-+        <annotations>
-+            <features value="Captcha"/>
-+            <stories value="Admin login + Captcha"/>
-+            <title value="Captcha on Admin login form"/>
-+            <description value="Test creation for admin login with captcha."/>
-+            <testCaseId value="MC-14012" />
-+            <severity value="MAJOR"/>
-+            <group value="captcha"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set {{AdminCaptchaLength3ConfigData.path}} {{AdminCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
-+            <magentoCLI command="config:set {{AdminCaptchaSymbols1ConfigData.path}} {{AdminCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
-+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{AdminCaptchaDefaultLengthConfigData.path}} {{AdminCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
-+            <magentoCLI command="config:set {{AdminCaptchaDefaultSymbolsConfigData.path}} {{AdminCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
-+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
-+        </after>
-+        
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdminWithWrongCredentialsFirstAttempt">
-+            <argument name="adminUser" value="AdminUserWrongCredentials" />
-+        </actionGroup>
-+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeFirstLoginErrorMessage" />
-+
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdminWithWrongCredentialsSecondAttempt">
-+            <argument name="adminUser" value="AdminUserWrongCredentials" />
-+        </actionGroup>
-+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeSecondLoginErrorMessage" />
-+
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdminWithWrongCredentialsThirdAttempt">
-+            <argument name="adminUser" value="AdminUserWrongCredentials" />
-+        </actionGroup>
-+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeThirdLoginErrorMessage" />
-+
-+        <!-- Check captcha visibility on admin login page  -->
-+        <actionGroup ref="AssertCaptchaVisibleOnAdminLoginFormActionGroup" stepKey="assertCaptchaVisible" />
-+
-+        <!-- Submit form with incorrect captcha -->
-+        <actionGroup ref="AdminLoginWithCaptchaActionGroup" stepKey="loginAsAdminWithIncorrectCaptcha">
-+            <argument name="adminUser" value="DefaultAdminUser" />
-+            <argument name="captcha" value="{{WrongCaptcha.value}}" />
-+        </actionGroup>
-+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeIncorrectCaptchaErrorMessage">
-+            <argument name="message" value="Incorrect CAPTCHA." />
-+        </actionGroup>
-+        <actionGroup ref="AssertCaptchaVisibleOnAdminLoginFormActionGroup" stepKey="assertCaptchaVisibleAfterIncorrectCaptcha" />
-+
-+        <actionGroup ref="AdminLoginWithCaptchaActionGroup" stepKey="loginAsAdminWithCorrectCaptcha">
-+            <argument name="adminUser" value="DefaultAdminUser" />
-+            <argument name="captcha" value="{{PreconfiguredCaptcha.value}}" />
-+        </actionGroup>
-+        <actionGroup ref="AssertAdminSuccessLoginActionGroup" stepKey="verifyAdminLoggedIn" />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/AdminResetUserPasswordFailedTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/AdminResetUserPasswordFailedTest.xml
-new file mode 100644
-index 00000000000..8f9c5828e2f
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Test/AdminResetUserPasswordFailedTest.xml
-@@ -0,0 +1,19 @@
-+<?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="AdminResetUserPasswordFailedTest">
-+        <before>
-+            <magentoCLI command="config:set {{AdminCaptchaDisableConfigData.path}} {{AdminCaptchaDisableConfigData.value}} " stepKey="disableAdminCaptcha"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{AdminCaptchaEnableConfigData.path}} {{AdminCaptchaEnableConfigData.value}} " stepKey="enableAdminCaptcha"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
-new file mode 100644
-index 00000000000..977ee78c0d2
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
-@@ -0,0 +1,117 @@
-+<?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="CaptchaFormsDisplayingTest">
-+        <annotations>
-+            <features value="Captcha"/>
-+            <stories value="MAGETWO-91552 - [github] CAPTCHA doesn't show when check out as guest"/>
-+            <title value="Captcha forms displaying"/>
-+            <description value="Captcha forms displaying"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-93941"/>
-+            <group value="captcha"/>
-+        </annotations>
-+
-+        <!--Login as admin-->
-+        <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        <!--Go to Captcha-->
-+        <actionGroup ref="CaptchaFormsDisplayingActionGroup" stepKey="CaptchaFormsDisplayingActionGroup"/>
-+        <waitForPageLoad stepKey="WaitForPageLoaded"/>
-+        <!--Verify fields removed-->
-+        <grabTextFrom selector="{{CaptchaFormsDisplayingSection.forms}}" stepKey="formItems"/>
-+        <assertNotContains stepKey="checkoutAsGuest">
-+            <expectedResult type="string">{{CaptchaData.checkoutAsGuest}}</expectedResult>
-+            <actualResult type="variable">$formItems</actualResult>
-+        </assertNotContains>
-+        <assertNotContains stepKey="register">
-+            <expectedResult type="string">{{CaptchaData.register}}</expectedResult>
-+            <actualResult type="variable">$formItems</actualResult>
-+        </assertNotContains>
-+        <!--Verify fields existence-->
-+        <grabTextFrom selector="{{CaptchaFormsDisplayingSection.createUser}}" stepKey="createUser"/>
-+        <assertEquals stepKey="CreateUserFieldIsPresent">
-+            <expectedResult type="string">{{CaptchaData.createUser}}</expectedResult>
-+            <actualResult type="variable">$createUser</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{CaptchaFormsDisplayingSection.userLogin}}" stepKey="login"/>
-+        <assertEquals stepKey="LoginFieldIsPresent">
-+            <expectedResult type="string">{{CaptchaData.login}}</expectedResult>
-+            <actualResult type="variable">login</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{CaptchaFormsDisplayingSection.forgotpassword}}" stepKey="forgotpassword"/>
-+        <assertEquals stepKey="PasswordFieldIsPresent">
-+            <expectedResult type="string">{{CaptchaData.passwd}}</expectedResult>
-+            <actualResult type="variable">$forgotpassword</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{CaptchaFormsDisplayingSection.contactUs}}" stepKey="contactUs"/>
-+        <assertEquals stepKey="contactUsFieldIsPresent">
-+            <expectedResult type="string">{{CaptchaData.contactUs}}</expectedResult>
-+            <actualResult type="variable">$contactUs</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{CaptchaFormsDisplayingSection.userEdit}}" stepKey="userEdit"/>
-+        <assertEquals stepKey="userEditFieldIsPresent">
-+            <expectedResult type="string">{{CaptchaData.changePasswd}}</expectedResult>
-+            <actualResult type="variable">$userEdit</actualResult>
-+        </assertEquals>
-+
-+        <!--Roll back configuration-->
-+        <scrollToTopOfPage stepKey="ScrollToTop"/>
-+        <click selector="{{CaptchaFormsDisplayingSection.captcha}}" stepKey="ClickToCloseCaptcha"/>
-+    </test>
-+    <test name="CaptchaWithDisabledGuestCheckout">
-+        <annotations>
-+            <features value="Captcha"/>
-+            <stories value="MC-5602 - CAPTCHA doesn't appear in login popup after refreshing page."/>
-+            <title value="Captcha is displaying on login form with disabled guest checkout"/>
-+            <description value="Captcha is displaying on login form with disabled guest checkout"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-96691"/>
-+            <group value="captcha"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set checkout/options/guest_checkout 0" stepKey="disableGuestCheckout"/>
-+            <magentoCLI command="config:set customer/captcha/failed_attempts_login 1" stepKey="decreaseLoginAttempt"/>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set checkout/options/guest_checkout 1" stepKey="enableGuestCheckout"/>
-+            <magentoCLI command="config:set customer/captcha/failed_attempts_login 3" stepKey="increaseLoginAttempt"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct1"/>
-+        </after>
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.sku$$)}}" stepKey="openProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart" />
-+        <waitForPageLoad stepKey="waitForAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+        <waitForText userInput="You added $$createSimpleProduct.name$$ to your shopping cart." stepKey="waitForText"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
-+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.email}}" stepKey="waitEmailFieldVisible"/>
-+        <fillField selector="{{StorefrontCustomerSignInPopupFormSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail"/>
-+        <fillField selector="{{StorefrontCustomerSignInPopupFormSection.password}}" userInput="incorrectPassword" stepKey="fillIncorrectCustomerPassword"/>
-+        <click selector="{{StorefrontCustomerSignInPopupFormSection.signIn}}" stepKey="clickSignIn"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.errorMessage}}" stepKey="seeErrorMessage"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaField}}" stepKey="seeCaptchaField"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaImg}}" stepKey="seeCaptchaImage"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart2"/>
-+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout2"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.email}}" stepKey="waitEmailFieldVisible2"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaField}}" stepKey="seeCaptchaField2"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaImg}}" stepKey="seeCaptchaImage2"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
-new file mode 100644
-index 00000000000..54237087227
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
-@@ -0,0 +1,102 @@
-+<?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="StorefrontCaptchaEditCustomerEmailTest">
-+        <annotations>
-+            <features value="Captcha"/>
-+            <stories value="Customer Account Info Edit + Captcha"/>
-+            <title value="Test for checking captcha on the customer account edit page."/>
-+            <description value="Test for checking captcha on the customer account edit page and customer is locked."/>
-+            <testCaseId value="MC-14013" />
-+            <severity value="MAJOR"/>
-+            <group value="captcha"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Setup CAPTCHA for testing -->
-+            <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerChangePasswordConfigData.path}} {{StorefrontCaptchaOnCustomerChangePasswordConfigData.value}}" stepKey="enableUserEditCaptcha"/>
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
-+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
-+
-+            <createData entity="Simple_US_Customer" stepKey="customer"/>
-+            <!-- Sign in as customer -->
-+            <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-+                <argument name="Customer" value="$$customer$$"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <!-- Revert Captcha forms configurations -->
-+            <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerLoginConfigData.path}} {{StorefrontCaptchaOnCustomerLoginConfigData.value}},{{StorefrontCaptchaOnCustomerForgotPasswordConfigData.value}}" stepKey="enableCaptchaOnDefaultForms" />
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
-+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
-+
-+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-+        </after>
-+
-+        <!-- Open Customer edit page -->
-+        <actionGroup ref="StorefrontOpenCustomerAccountInfoEditPageActionGroup" stepKey="goToCustomerEditPage" />
-+
-+        <!-- Update email with incorrect password 3 times. -->
-+        <actionGroup ref="StorefrontCustomerChangeEmailActionGroup" stepKey="changeEmailFirstAttempt">
-+            <argument name="email" value="$$customer.email$$" />
-+            <argument name="password" value="{{Colorado_US_Customer.password}}" />
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="assertAccountMessageFirstAttempt">
-+            <argument name="message" value="The password doesn't match this account. Verify the password and try again." />
-+            <argument name="messageType" value="error" />
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontCustomerChangeEmailActionGroup" stepKey="changeEmailSecondAttempt">
-+            <argument name="email" value="$$customer.email$$" />
-+            <argument name="password" value="{{Colorado_US_Customer.password}}" />
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="assertAccountMessageSecondAttempt">
-+            <argument name="message" value="The password doesn't match this account. Verify the password and try again." />
-+            <argument name="messageType" value="error" />
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontCustomerChangeEmailActionGroup" stepKey="changeEmailThirdAttempt">
-+            <argument name="email" value="$$customer.email$$" />
-+            <argument name="password" value="{{Colorado_US_Customer.password}}" />
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="assertAccountMessageThirdAttempt">
-+            <argument name="message" value="The password doesn't match this account. Verify the password and try again." />
-+            <argument name="messageType" value="error" />
-+        </actionGroup>
-+
-+        <!-- Check captcha visibility after incorrect password submit form -->
-+        <actionGroup ref="AssertCaptchaVisibleOnCustomerAccountInfoActionGroup" stepKey="assertCaptchaVisible" />
-+
-+        <!-- Try to submit form with incorrect captcha -->
-+        <actionGroup ref="StorefrontCustomerChangeEmailWithCaptchaActionGroup" stepKey="changeEmailWithIncorrectCaptcha">
-+            <argument name="email" value="$$customer.email$$" />
-+            <argument name="password" value="{{Colorado_US_Customer.password}}" />
-+            <argument name="captcha" value="{{WrongCaptcha.value}}" />
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="assertAccountMessageAfterIncorrectCaptcha">
-+            <argument name="message" value="Incorrect CAPTCHA" />
-+            <argument name="messageType" value="error" />
-+        </actionGroup>
-+
-+        <!-- Update customer email correct password and CAPTCHA -->
-+        <actionGroup ref="StorefrontCustomerChangeEmailWithCaptchaActionGroup" stepKey="changeEmailCorrectAttempt">
-+            <argument name="email" value="$$customer.email$$" />
-+            <argument name="password" value="$$customer.password$$" />
-+            <argument name="captcha" value="{{PreconfiguredCaptcha.value}}" />
-+        </actionGroup>
-+        <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="assertAccountMessageCorrectAttempt" />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml
-new file mode 100644
-index 00000000000..0c6a3f31c1d
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml
-@@ -0,0 +1,64 @@
-+<?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="StorefrontCaptchaOnContactUsTest">
-+        <annotations>
-+            <features value="Captcha"/>
-+            <stories value="Submit Contact us form + Captcha"/>
-+            <title value="Captcha on contact us form test"/>
-+            <description value="Test creation for send comment using the contact us form with captcha."/>
-+            <testCaseId value="MC-14103" />
-+            <severity value="MAJOR"/>
-+            <group value="captcha"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
-+            <magentoCLI command="config:set {{StorefrontCaptchaOnContactUsFormConfigData.path}} {{StorefrontCaptchaOnContactUsFormConfigData.value}}" stepKey="enableUserEditCaptcha"/>
-+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
-+            <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerLoginConfigData.path}} {{StorefrontCaptchaOnCustomerLoginConfigData.value}},{{StorefrontCaptchaOnCustomerForgotPasswordConfigData.value}}" stepKey="enableCaptchaOnDefaultForms" />
-+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
-+        </after>
-+
-+        <!-- Open storefront contact us form -->
-+        <actionGroup ref="StorefrontOpenContactUsPageActionGroup" stepKey="goToContactUsPage" />
-+
-+        <!-- Check Captcha items -->
-+        <actionGroup ref="AssertCaptchaVisibleOnContactUsFormActionGroup" stepKey="seeCaptchaOnContactUsForm" />
-+
-+        <!-- Submit Contact Us form -->
-+        <actionGroup ref="StorefrontFillContactUsFormWithCaptchaActionGroup" stepKey="fillContactUsFormWithWrongCaptcha">
-+            <argument name="customer" value="Simple_US_Customer" />
-+            <argument name="contactUsData" value="DefaultContactUsData" />
-+            <argument name="captcha" value="{{WrongCaptcha.value}}" />
-+        </actionGroup>
-+        <actionGroup ref="StorefrontSubmitContactUsFormActionGroup" stepKey="submitContactUsFormWithWrongCaptcha" />
-+
-+        <!-- Check Captcha items after form reload -->
-+        <actionGroup ref="AssertMessageContactUsFormActionGroup" stepKey="verifyErrorMessage">
-+            <argument name="message" value="Incorrect CAPTCHA" />
-+            <argument name="messageType" value="error" />
-+        </actionGroup>
-+        <actionGroup ref="AssertCaptchaVisibleOnContactUsFormActionGroup" stepKey="seeCaptchaOnContactUsFormAfterWrongCaptcha" />
-+
-+        <actionGroup ref="StorefrontFillContactUsFormWithCaptchaActionGroup" stepKey="fillContactUsFormWithCorrectCaptcha">
-+            <argument name="customer" value="Simple_US_Customer" />
-+            <argument name="contactUsData" value="DefaultContactUsData" />
-+            <argument name="captcha" value="{{PreconfiguredCaptcha.value}}" />
-+        </actionGroup>
-+        <actionGroup ref="StorefrontSubmitContactUsFormActionGroup" stepKey="submitContactUsFormWithCorrectCaptcha" />
-+        <actionGroup ref="AssertMessageContactUsFormActionGroup" stepKey="verifySuccessMessage" />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
-new file mode 100644
-index 00000000000..5a1be68d3f2
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
-@@ -0,0 +1,79 @@
-+<?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="StorefrontCaptchaOnCustomerLoginTest">
-+        <annotations>
-+            <features value="Captcha"/>
-+            <stories value="Login with Customer Account + Captcha"/>
-+            <title value="Captcha customer login page test"/>
-+            <description value="Check CAPTCHA on Storefront Login Page."/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14010" />
-+            <group value="captcha"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
-+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
-+            <createData entity="Simple_US_Customer" stepKey="customer"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
-+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
-+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-+        </after>
-+
-+        <!-- Open storefront login form -->
-+        <actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage" />
-+
-+        <!-- Login with wrong credentials 3 times -->
-+        <actionGroup ref="StorefrontFillCustomerLoginFormActionGroup" stepKey="fillLoginFormFirstAttempt">
-+            <argument name="customer" value="Colorado_US_Customer" />
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonFirstAttempt" />
-+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterFirstAttempt" />
-+        <actionGroup ref="AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup" stepKey="dontSeeCaptchaAfterFirstAttempt" />
-+
-+        <actionGroup ref="StorefrontFillCustomerLoginFormActionGroup" stepKey="fillLoginFormSecondAttempt">
-+            <argument name="customer" value="Colorado_US_Customer" />
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonSecondAttempt" />
-+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterSecondAttempt" />
-+        <actionGroup ref="AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup" stepKey="dontSeeCaptchaAfterSecondAttempt" />
-+
-+        <actionGroup ref="StorefrontFillCustomerLoginFormActionGroup" stepKey="fillLoginFormThirdAttempt">
-+            <argument name="customer" value="Colorado_US_Customer" />
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonThirdAttempt" />
-+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterThirdAttempt" />
-+        <actionGroup ref="AssertCaptchaVisibleOnCustomerLoginFormActionGroup" stepKey="seeCaptchaAfterThirdAttempt" />
-+
-+        <!-- Submit form with incorrect captcha -->
-+        <actionGroup ref="StorefrontFillCustomerLoginFormWithCaptchaActionGroup" stepKey="fillLoginFormCorrectAccountIncorrectCaptcha">
-+            <argument name="customer" value="$$customer$$" />
-+            <argument name="captcha" value="{{WrongCaptcha.value}}" />
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonCorrectAccountIncorrectCaptcha" />
-+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterIncorrectCaptcha">
-+            <argument name="message" value="Incorrect CAPTCHA" />
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontFillCustomerLoginFormWithCaptchaActionGroup" stepKey="fillLoginFormCorrectAccountCorrectCaptcha">
-+            <argument name="customer" value="$$customer$$" />
-+            <argument name="captcha" value="{{PreconfiguredCaptcha.value}}" />
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonCorrectAccountCorrectCaptcha" />
-+        <actionGroup ref="AssertCustomerWelcomeMessageActionGroup" stepKey="assertCustomerLoggedIn">
-+            <argument name="customerFullName" value="$$customer.firstname$$ $$customer.lastname$$" />
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml
-new file mode 100644
-index 00000000000..2c331f958e4
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml
-@@ -0,0 +1,68 @@
-+<?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="StorefrontCaptchaRegisterNewCustomerTest">
-+        <annotations>
-+            <features value="Captcha"/>
-+            <stories value="Create New Customer Account + Captcha"/>
-+            <title value="Test creation for customer register with captcha on storefront."/>
-+            <description value="Test creation for customer register with captcha on storefront."/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14805" />
-+            <group value="captcha"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!--  Enable captcha for customer. -->
-+            <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerCreateFormConfigData.path}} {{StorefrontCaptchaOnCustomerCreateFormConfigData.value}}" stepKey="enableUserRegistrationCaptcha" />
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaModeAlwaysConfigData.path}} {{StorefrontCustomerCaptchaModeAlwaysConfigData.value}}" stepKey="alwaysEnableCaptcha" />
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
-+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
-+        </before>
-+        <after>
-+            <!-- Set default configuration. -->
-+            <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerLoginConfigData.path}} {{StorefrontCaptchaOnCustomerLoginConfigData.value}},{{StorefrontCaptchaOnCustomerForgotPasswordConfigData.value}}" stepKey="enableCaptchaOnDefaultForms" />
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaModeAfterFailConfigData.path}} {{StorefrontCustomerCaptchaModeAfterFailConfigData.value}}" stepKey="defaultCaptchaMode" />
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
-+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
-+        </after>
-+
-+        <!-- Open Customer registration page -->
-+        <actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="goToCustomerAccountCreatePage" />
-+
-+        <!-- Check captcha visibility registration page load -->
-+        <actionGroup ref="AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup" stepKey="verifyCaptchaVisible" />
-+
-+        <!-- Submit form with incorrect captcha -->
-+        <actionGroup ref="StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup" stepKey="fillNewCustomerAccountFormWithIncorrectCaptcha">
-+            <argument name="customer" value="Simple_US_Customer" />
-+            <argument name="captcha" value="{{WrongCaptcha.value}}" />
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="clickCreateAnAccountButton" />
-+
-+        <actionGroup ref="AssertMessageCustomerCreateAccountActionGroup" stepKey="assertMessage">
-+            <argument name="message" value="Incorrect CAPTCHA" />
-+            <argument name="messageType" value="error" />
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup" stepKey="verifyCaptchaVisibleAfterFail" />
-+
-+        <!-- Submit form with correct captcha -->
-+        <actionGroup ref="StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup" stepKey="fillNewCustomerAccountFormWithCorrectCaptcha">
-+            <argument name="customer" value="Simple_US_Customer" />
-+            <argument name="captcha" value="{{PreconfiguredCaptcha.value}}" />
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="clickCreateAnAccountButtonAfterCorrectCaptcha" />
-+        <actionGroup ref="AssertMessageCustomerCreateAccountActionGroup" stepKey="assertSuccessMessage" />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
-new file mode 100644
-index 00000000000..36d7989b9ac
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
-@@ -0,0 +1,19 @@
-+<?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="StorefrontResetCustomerPasswordFailedTest">
-+        <before>
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDisableConfigData.path}} {{StorefrontCustomerCaptchaDisableConfigData.value}}" stepKey="disableCaptcha"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaEnableConfigData.path}} {{StorefrontCustomerCaptchaEnableConfigData.value}}" stepKey="enableCaptcha"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php
-index 655fcd6118e..8764dbd4cec 100644
---- a/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php
-+++ b/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php
-@@ -77,6 +77,7 @@ class ConfigProviderTest extends \PHPUnit\Framework\TestCase
-             ->will($this->returnValue('https://magento.com/captcha'));
- 
-         $config = $this->model->getConfig();
-+        unset($config['captcha'][$this->formId]['timestamp']);
-         $this->assertEquals($config, $expectedConfig);
-     }
- 
-diff --git a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
-index 0500b29f787..eef75d2c01e 100644
---- a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
-+++ b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
-@@ -24,7 +24,7 @@ class DefaultTest extends \PHPUnit\Framework\TestCase
-         'enable' => '1',
-         'font' => 'linlibertine',
-         'mode' => 'after_fail',
--        'forms' => 'user_forgotpassword,user_create,guest_checkout,register_during_checkout',
-+        'forms' => 'user_forgotpassword,user_create',
-         'failed_attempts_login' => '3',
-         'failed_attempts_ip' => '1000',
-         'timeout' => '7',
-@@ -35,8 +35,6 @@ class DefaultTest extends \PHPUnit\Framework\TestCase
-         'always_for' => [
-             'user_create',
-             'user_forgotpassword',
--            'guest_checkout',
--            'register_during_checkout',
-             'contact_us',
-         ],
-     ];
-@@ -185,7 +183,13 @@ class DefaultTest extends \PHPUnit\Framework\TestCase
-     {
-         self::$_defaultConfig['case_sensitive'] = '1';
-         $this->assertFalse($this->_object->isCorrect('abcdef5'));
--        $sessionData = ['user_create_word' => ['data' => 'AbCdEf5', 'expires' => time() + self::EXPIRE_FRAME]];
-+        $sessionData = [
-+            'user_create_word' => [
-+                'data' => 'AbCdEf5',
-+                'words' => 'AbCdEf5',
-+                'expires' => time() + self::EXPIRE_FRAME
-+            ]
-+        ];
-         $this->_object->getSession()->setData($sessionData);
-         self::$_defaultConfig['case_sensitive'] = '0';
-         $this->assertTrue($this->_object->isCorrect('abcdef5'));
-@@ -226,7 +230,7 @@ class DefaultTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->assertEquals($this->_object->getWord(), 'AbCdEf5');
-         $this->_object->getSession()->setData(
--            ['user_create_word' => ['data' => 'AbCdEf5', 'expires' => time() - 360]]
-+            ['user_create_word' => ['data' => 'AbCdEf5', 'words' => 'AbCdEf5','expires' => time() - 360]]
-         );
-         $this->assertNull($this->_object->getWord());
-     }
-@@ -249,7 +253,13 @@ class DefaultTest extends \PHPUnit\Framework\TestCase
-             ->getMock();
-         $session->expects($this->any())->method('isLoggedIn')->will($this->returnValue(false));
- 
--        $session->setData(['user_create_word' => ['data' => 'AbCdEf5', 'expires' => time() + self::EXPIRE_FRAME]]);
-+        $session->setData([
-+            'user_create_word' => [
-+                'data' => 'AbCdEf5',
-+                'words' => 'AbCdEf5',
-+                'expires' => time() + self::EXPIRE_FRAME
-+            ]
-+        ]);
-         return $session;
-     }
- 
-@@ -362,8 +372,7 @@ class DefaultTest extends \PHPUnit\Framework\TestCase
-         return [
-             [true, 'contact_us'],
-             [false, 'user_create'],
--            [false, 'user_forgotpassword'],
--            [false, 'guest_checkout']
-+            [false, 'user_forgotpassword']
-         ];
-     }
- }
-diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CheckGuestCheckoutObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CheckGuestCheckoutObserverTest.php
-deleted file mode 100644
-index d3f29fae8a5..00000000000
---- a/app/code/Magento/Captcha/Test/Unit/Observer/CheckGuestCheckoutObserverTest.php
-+++ /dev/null
-@@ -1,211 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\Captcha\Test\Unit\Observer;
--
--use Magento\Captcha\Model\DefaultModel as CaptchaModel;
--use Magento\Captcha\Observer\CheckGuestCheckoutObserver;
--use Magento\Captcha\Helper\Data as CaptchaDataHelper;
--use Magento\Framework\App\Action\Action;
--use Magento\Framework\App\ActionFlag;
--use Magento\Captcha\Observer\CaptchaStringResolver;
--use Magento\Checkout\Model\Type\Onepage;
--use Magento\Framework\App\Request\Http;
--use Magento\Framework\App\Response\Http as HttpResponse;
--use Magento\Framework\Event\Observer;
--use Magento\Framework\Json\Helper\Data as JsonHelper;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
--use Magento\Quote\Model\Quote;
--
--/**
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class CheckGuestCheckoutObserverTest extends \PHPUnit\Framework\TestCase
--{
--    const FORM_ID = 'guest_checkout';
--
--    /**
--     * @var CheckGuestCheckoutObserver
--     */
--    private $checkGuestCheckoutObserver;
--
--    /**
--     * @var ObjectManager
--     */
--    private $objectManager;
--
--    /**
--     * @var Observer
--     */
--    private $observer;
--
--    /**
--     * @var HttpResponse|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $responseMock;
--
--    /**
--     * @var HttpResponse|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $requestMock;
--
--    /**
--     * @var ActionFlag|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $actionFlagMock;
--
--    /**
--     * @var CaptchaStringResolver|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $captchaStringResolverMock;
--
--    /**
--     * @var JsonHelper|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $jsonHelperMock;
--
--    /**
--     * @var CaptchaModel|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $captchaModelMock;
--
--    /**
--     * @var  Quote|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $quoteModelMock;
--
--    /**
--     * @var Action|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $controllerMock;
--
--    protected function setUp()
--    {
--        $onepageModelTypeMock = $this->createMock(Onepage::class);
--        $captchaHelperMock = $this->createMock(CaptchaDataHelper::class);
--        $this->objectManager = new ObjectManager($this);
--        $this->actionFlagMock = $this->createMock(ActionFlag::class);
--        $this->captchaStringResolverMock = $this->createMock(CaptchaStringResolver::class);
--        $this->captchaModelMock = $this->createMock(CaptchaModel::class);
--        $this->quoteModelMock = $this->createMock(Quote::class);
--        $this->controllerMock = $this->createMock(Action::class);
--        $this->requestMock = $this->createMock(Http::class);
--        $this->responseMock = $this->createMock(HttpResponse::class);
--        $this->observer = new Observer(['controller_action' => $this->controllerMock]);
--        $this->jsonHelperMock = $this->createMock(JsonHelper::class);
--
--        $this->checkGuestCheckoutObserver = $this->objectManager->getObject(
--            CheckGuestCheckoutObserver::class,
--            [
--                'helper' => $captchaHelperMock,
--                'actionFlag' => $this->actionFlagMock,
--                'captchaStringResolver' => $this->captchaStringResolverMock,
--                'typeOnepage' => $onepageModelTypeMock,
--                'jsonHelper' => $this->jsonHelperMock
--            ]
--        );
--
--        $captchaHelperMock->expects($this->once())
--            ->method('getCaptcha')
--            ->with(self::FORM_ID)
--            ->willReturn($this->captchaModelMock);
--        $onepageModelTypeMock->expects($this->once())
--            ->method('getQuote')
--            ->willReturn($this->quoteModelMock);
--    }
--
--    public function testCheckGuestCheckoutForRegister()
--    {
--        $this->quoteModelMock->expects($this->once())
--            ->method('getCheckoutMethod')
--            ->willReturn(Onepage::METHOD_REGISTER);
--        $this->captchaModelMock->expects($this->never())
--            ->method('isRequired');
--
--        $this->checkGuestCheckoutObserver->execute($this->observer);
--    }
--
--    public function testCheckGuestCheckoutWithNoCaptchaRequired()
--    {
--        $this->quoteModelMock->expects($this->once())
--            ->method('getCheckoutMethod')
--            ->willReturn(Onepage::METHOD_GUEST);
--        $this->captchaModelMock->expects($this->once())
--            ->method('isRequired')
--            ->willReturn(false);
--        $this->captchaModelMock->expects($this->never())
--            ->method('isCorrect');
--
--        $this->checkGuestCheckoutObserver->execute($this->observer);
--    }
--
--    public function testCheckGuestCheckoutWithIncorrectCaptcha()
--    {
--        $captchaValue = 'some_word';
--        $encodedJsonValue = '{}';
--
--        $this->quoteModelMock->expects($this->once())
--            ->method('getCheckoutMethod')
--            ->willReturn(Onepage::METHOD_GUEST);
--        $this->captchaModelMock->expects($this->once())
--            ->method('isRequired')
--            ->willReturn(true);
--        $this->controllerMock->expects($this->once())
--            ->method('getRequest')
--            ->willReturn($this->requestMock);
--        $this->controllerMock->expects($this->once())
--            ->method('getResponse')
--            ->willReturn($this->responseMock);
--        $this->controllerMock->expects($this->once())
--            ->method('getResponse')
--            ->willReturn($this->responseMock);
--        $this->captchaStringResolverMock->expects($this->once())
--            ->method('resolve')
--            ->with($this->requestMock, self::FORM_ID)
--            ->willReturn($captchaValue);
--        $this->captchaModelMock->expects($this->once())
--            ->method('isCorrect')
--            ->with($captchaValue)
--            ->willReturn(false);
--        $this->actionFlagMock->expects($this->once())
--            ->method('set')
--            ->with('', Action::FLAG_NO_DISPATCH, true);
--        $this->jsonHelperMock->expects($this->once())
--            ->method('jsonEncode')
--            ->willReturn($encodedJsonValue);
--        $this->responseMock->expects($this->once())
--            ->method('representJson')
--            ->with($encodedJsonValue);
--
--        $this->checkGuestCheckoutObserver->execute($this->observer);
--    }
--
--    public function testCheckGuestCheckoutWithCorrectCaptcha()
--    {
--        $this->quoteModelMock->expects($this->once())
--            ->method('getCheckoutMethod')
--            ->willReturn(Onepage::METHOD_GUEST);
--        $this->captchaModelMock->expects($this->once())
--            ->method('isRequired')
--            ->willReturn(true);
--        $this->controllerMock->expects($this->once())
--            ->method('getRequest')
--            ->willReturn($this->requestMock);
--        $this->captchaStringResolverMock->expects($this->once())
--            ->method('resolve')
--            ->with($this->requestMock, self::FORM_ID)
--            ->willReturn('some_word');
--        $this->captchaModelMock->expects($this->once())
--            ->method('isCorrect')
--            ->with('some_word')
--            ->willReturn(true);
--        $this->actionFlagMock->expects($this->never())
--            ->method('set');
--
--        $this->checkGuestCheckoutObserver->execute($this->observer);
--    }
--}
-diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CheckRegisterCheckoutObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CheckRegisterCheckoutObserverTest.php
-deleted file mode 100644
-index 89012ef6538..00000000000
---- a/app/code/Magento/Captcha/Test/Unit/Observer/CheckRegisterCheckoutObserverTest.php
-+++ /dev/null
-@@ -1,211 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\Captcha\Test\Unit\Observer;
--
--use Magento\Captcha\Model\DefaultModel as CaptchaModel;
--use Magento\Captcha\Observer\CheckRegisterCheckoutObserver;
--use Magento\Captcha\Helper\Data as CaptchaDataHelper;
--use Magento\Framework\App\Action\Action;
--use Magento\Framework\App\ActionFlag;
--use Magento\Captcha\Observer\CaptchaStringResolver;
--use Magento\Checkout\Model\Type\Onepage;
--use Magento\Framework\App\Request\Http;
--use Magento\Framework\App\Response\Http as HttpResponse;
--use Magento\Framework\Event\Observer;
--use Magento\Framework\Json\Helper\Data as JsonHelper;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
--use Magento\Quote\Model\Quote;
--
--/**
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class CheckRegisterCheckoutObserverTest extends \PHPUnit\Framework\TestCase
--{
--    const FORM_ID = 'register_during_checkout';
--
--    /**
--     * @var CheckRegisterCheckoutObserver
--     */
--    private $checkRegisterCheckoutObserver;
--
--    /**
--     * @var ObjectManager
--     */
--    private $objectManager;
--
--    /**
--     * @var Observer
--     */
--    private $observer;
--
--    /**
--     * @var HttpResponse|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $responseMock;
--
--    /**
--     * @var HttpResponse|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $requestMock;
--
--    /**
--     * @var ActionFlag|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $actionFlagMock;
--
--    /**
--     * @var CaptchaStringResolver|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $captchaStringResolverMock;
--
--    /**
--     * @var JsonHelper|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $jsonHelperMock;
--
--    /**
--     * @var CaptchaModel|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $captchaModelMock;
--
--    /**
--     * @var  Quote|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $quoteModelMock;
--
--    /**
--     * @var Action|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $controllerMock;
--
--    protected function setUp()
--    {
--        $onepageModelTypeMock = $this->createMock(Onepage::class);
--        $captchaHelperMock = $this->createMock(CaptchaDataHelper::class);
--        $this->objectManager = new ObjectManager($this);
--        $this->actionFlagMock = $this->createMock(ActionFlag::class);
--        $this->captchaStringResolverMock = $this->createMock(CaptchaStringResolver::class);
--        $this->captchaModelMock = $this->createMock(CaptchaModel::class);
--        $this->quoteModelMock = $this->createMock(Quote::class);
--        $this->controllerMock = $this->createMock(Action::class);
--        $this->requestMock = $this->createMock(Http::class);
--        $this->responseMock = $this->createMock(HttpResponse::class);
--        $this->observer = new Observer(['controller_action' => $this->controllerMock]);
--        $this->jsonHelperMock = $this->createMock(JsonHelper::class);
--
--        $this->checkRegisterCheckoutObserver = $this->objectManager->getObject(
--            CheckRegisterCheckoutObserver::class,
--            [
--                'helper' => $captchaHelperMock,
--                'actionFlag' => $this->actionFlagMock,
--                'captchaStringResolver' => $this->captchaStringResolverMock,
--                'typeOnepage' => $onepageModelTypeMock,
--                'jsonHelper' => $this->jsonHelperMock
--            ]
--        );
--
--        $captchaHelperMock->expects($this->once())
--            ->method('getCaptcha')
--            ->with(self::FORM_ID)
--            ->willReturn($this->captchaModelMock);
--        $onepageModelTypeMock->expects($this->once())
--            ->method('getQuote')
--            ->willReturn($this->quoteModelMock);
--    }
--
--    public function testCheckRegisterCheckoutForGuest()
--    {
--        $this->quoteModelMock->expects($this->once())
--            ->method('getCheckoutMethod')
--            ->willReturn(Onepage::METHOD_GUEST);
--        $this->captchaModelMock->expects($this->never())
--            ->method('isRequired');
--
--        $this->checkRegisterCheckoutObserver->execute($this->observer);
--    }
--
--    public function testCheckRegisterCheckoutWithNoCaptchaRequired()
--    {
--        $this->quoteModelMock->expects($this->once())
--            ->method('getCheckoutMethod')
--            ->willReturn(Onepage::METHOD_REGISTER);
--        $this->captchaModelMock->expects($this->once())
--            ->method('isRequired')
--            ->willReturn(false);
--        $this->captchaModelMock->expects($this->never())
--            ->method('isCorrect');
--
--        $this->checkRegisterCheckoutObserver->execute($this->observer);
--    }
--
--    public function testCheckRegisterCheckoutWithIncorrectCaptcha()
--    {
--        $captchaValue = 'some_word';
--        $encodedJsonValue = '{}';
--
--        $this->quoteModelMock->expects($this->once())
--            ->method('getCheckoutMethod')
--            ->willReturn(Onepage::METHOD_REGISTER);
--        $this->captchaModelMock->expects($this->once())
--            ->method('isRequired')
--            ->willReturn(true);
--        $this->controllerMock->expects($this->once())
--            ->method('getRequest')
--            ->willReturn($this->requestMock);
--        $this->controllerMock->expects($this->once())
--            ->method('getResponse')
--            ->willReturn($this->responseMock);
--        $this->controllerMock->expects($this->once())
--            ->method('getResponse')
--            ->willReturn($this->responseMock);
--        $this->captchaStringResolverMock->expects($this->once())
--            ->method('resolve')
--            ->with($this->requestMock, self::FORM_ID)
--            ->willReturn($captchaValue);
--        $this->captchaModelMock->expects($this->once())
--            ->method('isCorrect')
--            ->with($captchaValue)
--            ->willReturn(false);
--        $this->actionFlagMock->expects($this->once())
--            ->method('set')
--            ->with('', Action::FLAG_NO_DISPATCH, true);
--        $this->jsonHelperMock->expects($this->once())
--            ->method('jsonEncode')
--            ->willReturn($encodedJsonValue);
--        $this->responseMock->expects($this->once())
--            ->method('representJson')
--            ->with($encodedJsonValue);
--
--        $this->checkRegisterCheckoutObserver->execute($this->observer);
--    }
--
--    public function testCheckRegisterCheckoutWithCorrectCaptcha()
--    {
--        $this->quoteModelMock->expects($this->once())
--            ->method('getCheckoutMethod')
--            ->willReturn(Onepage::METHOD_REGISTER);
--        $this->captchaModelMock->expects($this->once())
--            ->method('isRequired')
--            ->willReturn(true);
--        $this->controllerMock->expects($this->once())
--            ->method('getRequest')
--            ->willReturn($this->requestMock);
--        $this->captchaStringResolverMock->expects($this->once())
--            ->method('resolve')
--            ->with($this->requestMock, self::FORM_ID)
--            ->willReturn('some_word');
--        $this->captchaModelMock->expects($this->once())
--            ->method('isCorrect')
--            ->with('some_word')
--            ->willReturn(true);
--        $this->actionFlagMock->expects($this->never())
--            ->method('set');
--
--        $this->checkRegisterCheckoutObserver->execute($this->observer);
--    }
--}
-diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserLoginBackendObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserLoginBackendObserverTest.php
-new file mode 100644
-index 00000000000..415f022a736
---- /dev/null
-+++ b/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserLoginBackendObserverTest.php
-@@ -0,0 +1,137 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Captcha\Test\Unit\Observer;
-+
-+use Magento\Captcha\Helper\Data;
-+use Magento\Captcha\Model\DefaultModel;
-+use Magento\Captcha\Observer\CaptchaStringResolver;
-+use Magento\Captcha\Observer\CheckUserLoginBackendObserver;
-+use Magento\Framework\App\RequestInterface;
-+use Magento\Framework\Event;
-+use Magento\Framework\Event\Observer;
-+use Magento\Framework\Message\ManagerInterface;
-+use PHPUnit\Framework\TestCase;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+
-+/**
-+ * Class CheckUserLoginBackendObserverTest
-+ */
-+class CheckUserLoginBackendObserverTest extends TestCase
-+{
-+    /**
-+     * @var CheckUserLoginBackendObserver
-+     */
-+    private $observer;
-+
-+    /**
-+     * @var ManagerInterface|MockObject
-+     */
-+    private $messageManagerMock;
-+
-+    /**
-+     * @var CaptchaStringResolver|MockObject
-+     */
-+    private $captchaStringResolverMock;
-+
-+    /**
-+     * @var RequestInterface|MockObject
-+     */
-+    private $requestMock;
-+
-+    /**
-+     * @var Data|MockObject
-+     */
-+    private $helperMock;
-+
-+    /**
-+     * Set Up
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->helperMock = $this->createMock(Data::class);
-+        $this->messageManagerMock = $this->createMock(ManagerInterface::class);
-+        $this->captchaStringResolverMock = $this->createMock(CaptchaStringResolver::class);
-+        $this->requestMock = $this->createMock(RequestInterface::class);
-+
-+        $this->observer = new CheckUserLoginBackendObserver(
-+            $this->helperMock,
-+            $this->captchaStringResolverMock,
-+            $this->requestMock
-+        );
-+    }
-+
-+    /**
-+     * Test check user login in backend with correct captcha
-+     *
-+     * @dataProvider requiredCaptchaDataProvider
-+     * @param bool $isRequired
-+     * @return void
-+     */
-+    public function testCheckOnBackendLoginWithCorrectCaptcha(bool $isRequired): void
-+    {
-+        $formId = 'backend_login';
-+        $login = 'admin';
-+        $captchaValue = 'captcha-value';
-+
-+        /** @var Observer|MockObject $observerMock */
-+        $observerMock = $this->createPartialMock(Observer::class, ['getEvent']);
-+        $eventMock = $this->createPartialMock(Event::class, ['getUsername']);
-+        $captcha = $this->createMock(DefaultModel::class);
-+
-+        $eventMock->method('getUsername')->willReturn('admin');
-+        $observerMock->method('getEvent')->willReturn($eventMock);
-+        $captcha->method('isRequired')->with($login)->willReturn($isRequired);
-+        $captcha->method('isCorrect')->with($captchaValue)->willReturn(true);
-+        $this->helperMock->method('getCaptcha')->with($formId)->willReturn($captcha);
-+        $this->captchaStringResolverMock->method('resolve')->with($this->requestMock, $formId)
-+            ->willReturn($captchaValue);
-+
-+        $this->observer->execute($observerMock);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function requiredCaptchaDataProvider(): array
-+    {
-+        return [
-+            [true],
-+            [false]
-+        ];
-+    }
-+
-+    /**
-+     * Test check user login in backend with wrong captcha
-+     *
-+     * @return void
-+     * @expectedException \Magento\Framework\Exception\Plugin\AuthenticationException
-+     */
-+    public function testCheckOnBackendLoginWithWrongCaptcha(): void
-+    {
-+        $formId = 'backend_login';
-+        $login = 'admin';
-+        $captchaValue = 'captcha-value';
-+
-+        /** @var Observer|MockObject $observerMock */
-+        $observerMock = $this->createPartialMock(Observer::class, ['getEvent']);
-+        $eventMock = $this->createPartialMock(Event::class, ['getUsername']);
-+        $captcha = $this->createMock(DefaultModel::class);
-+
-+        $eventMock->method('getUsername')->willReturn($login);
-+        $observerMock->method('getEvent')->willReturn($eventMock);
-+        $captcha->method('isRequired')->with($login)->willReturn(true);
-+        $captcha->method('isCorrect')->with($captchaValue)->willReturn(false);
-+        $this->helperMock->method('getCaptcha')->with($formId)->willReturn($captcha);
-+        $this->captchaStringResolverMock->method('resolve')->with($this->requestMock, $formId)
-+            ->willReturn($captchaValue);
-+
-+        $this->observer->execute($observerMock);
-+    }
-+}
-diff --git a/app/code/Magento/Captcha/etc/config.xml b/app/code/Magento/Captcha/etc/config.xml
-index 71c474de90f..dd748dd05cc 100644
---- a/app/code/Magento/Captcha/etc/config.xml
-+++ b/app/code/Magento/Captcha/etc/config.xml
-@@ -53,8 +53,6 @@
-                 <always_for>
-                     <user_create>1</user_create>
-                     <user_forgotpassword>1</user_forgotpassword>
--                    <guest_checkout>1</guest_checkout>
--                    <register_during_checkout>1</register_during_checkout>
-                     <contact_us>1</contact_us>
-                 </always_for>
-             </captcha>
-@@ -77,12 +75,6 @@
-                     <user_forgotpassword>
-                         <label>Forgot password</label>
-                     </user_forgotpassword>
--                    <guest_checkout>
--                        <label>Check Out as Guest</label>
--                    </guest_checkout>
--                    <register_during_checkout>
--                        <label>Register during Checkout</label>
--                    </register_during_checkout>
-                     <contact_us>
-                         <label>Contact Us</label>
-                     </contact_us>
-diff --git a/app/code/Magento/Captcha/etc/db_schema.xml b/app/code/Magento/Captcha/etc/db_schema.xml
-index fa9a14abb89..158e2f43b9f 100644
---- a/app/code/Magento/Captcha/etc/db_schema.xml
-+++ b/app/code/Magento/Captcha/etc/db_schema.xml
-@@ -9,11 +9,11 @@
-         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-     <table name="captcha_log" resource="default" engine="innodb" comment="Count Login Attempts">
-         <column xsi:type="varchar" name="type" nullable="false" length="32" comment="Type"/>
--        <column xsi:type="varchar" name="value" nullable="false" length="32" comment="Value"/>
-+        <column xsi:type="varchar" name="value" nullable="false" length="255" comment="Value"/>
-         <column xsi:type="int" name="count" padding="10" unsigned="true" nullable="false" identity="false" default="0"
-                 comment="Count"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Update Time"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="type"/>
-             <column name="value"/>
-         </constraint>
-diff --git a/app/code/Magento/Captcha/etc/di.xml b/app/code/Magento/Captcha/etc/di.xml
-index 955896eb127..83c4e8aa1e2 100644
---- a/app/code/Magento/Captcha/etc/di.xml
-+++ b/app/code/Magento/Captcha/etc/di.xml
-@@ -27,13 +27,12 @@
-         </arguments>
-     </type>
-     <type name="Magento\Customer\Controller\Ajax\Login">
--        <plugin name="configurable_product" type="Magento\Captcha\Model\Customer\Plugin\AjaxLogin" sortOrder="50" />
-+        <plugin name="captcha_validation" type="Magento\Captcha\Model\Customer\Plugin\AjaxLogin" sortOrder="50" />
-     </type>
-     <type name="Magento\Captcha\Model\Customer\Plugin\AjaxLogin">
-         <arguments>
-             <argument name="formIds" xsi:type="array">
-                 <item name="user_login" xsi:type="string">user_login</item>
--                <item name="guest_checkout" xsi:type="string">guest_checkout</item>
-             </argument>
-         </arguments>
-     </type>
-diff --git a/app/code/Magento/Captcha/etc/events.xml b/app/code/Magento/Captcha/etc/events.xml
-index e3ddd19de2d..970c0d07726 100644
---- a/app/code/Magento/Captcha/etc/events.xml
-+++ b/app/code/Magento/Captcha/etc/events.xml
-@@ -18,10 +18,6 @@
-     <event name="admin_user_authenticate_before">
-         <observer name="captcha" instance="Magento\Captcha\Observer\CheckUserLoginBackendObserver" />
-     </event>
--    <event name="controller_action_predispatch_checkout_onepage_saveBilling">
--        <observer name="captcha_guest" instance="Magento\Captcha\Observer\CheckGuestCheckoutObserver" />
--        <observer name="captcha_register" instance="Magento\Captcha\Observer\CheckRegisterCheckoutObserver" />
--    </event>
-     <event name="customer_customer_authenticated">
-         <observer name="captcha_reset_attempt" instance="Magento\Captcha\Observer\ResetAttemptForFrontendObserver" />
-     </event>
-diff --git a/app/code/Magento/Captcha/etc/frontend/di.xml b/app/code/Magento/Captcha/etc/frontend/di.xml
-index 225e62c8e82..490f1eab851 100644
---- a/app/code/Magento/Captcha/etc/frontend/di.xml
-+++ b/app/code/Magento/Captcha/etc/frontend/di.xml
-@@ -17,7 +17,20 @@
-         <arguments>
-             <argument name="formIds" xsi:type="array">
-                 <item name="user_login" xsi:type="string">user_login</item>
--                <item name="guest_checkout" xsi:type="string">guest_checkout</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Captcha\CustomerData\Captcha">
-+        <arguments>
-+            <argument name="formIds" xsi:type="array">
-+                <item name="user_login" xsi:type="string">user_login</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Customer\CustomerData\SectionPoolInterface">
-+        <arguments>
-+            <argument name="sectionSourceMap" xsi:type="array">
-+                <item name="captcha" xsi:type="string">Magento\Captcha\CustomerData\Captcha</item>
-             </argument>
-         </arguments>
-     </type>
-diff --git a/app/code/Magento/Captcha/etc/frontend/sections.xml b/app/code/Magento/Captcha/etc/frontend/sections.xml
-new file mode 100644
-index 00000000000..7f2070e10c8
---- /dev/null
-+++ b/app/code/Magento/Captcha/etc/frontend/sections.xml
-@@ -0,0 +1,13 @@
-+<?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_Customer:etc/sections.xsd">
-+    <action name="customer/ajax/login">
-+        <section name="captcha"/>
-+    </action>
-+</config>
-diff --git a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
-index 1be4bd19cd4..88e0d5edc2a 100644
---- a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
-+++ b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Captcha\Block\Captcha\DefaultCaptcha $block */
- 
- /** @var \Magento\Captcha\Model\DefaultModel $captcha */
-diff --git a/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml
-index 4ed56fd56cc..7180372f004 100644
---- a/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml
-+++ b/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml
-@@ -36,29 +36,7 @@
-                                                                         <item name="captcha" xsi:type="array">
-                                                                             <item name="component" xsi:type="string">Magento_Captcha/js/view/checkout/loginCaptcha</item>
-                                                                             <item name="displayArea" xsi:type="string">additional-login-form-fields</item>
--                                                                            <item name="formId" xsi:type="string">guest_checkout</item>
--                                                                            <item name="configSource" xsi:type="string">checkoutConfig</item>
--                                                                        </item>
--                                                                    </item>
--                                                                </item>
--                                                            </item>
--                                                        </item>
--                                                    </item>
--                                                </item>
--                                            </item>
--                                        </item>
--                                        <item name="billing-step" xsi:type="array">
--                                            <item name="children" xsi:type="array">
--                                                <item name="payment" xsi:type="array">
--                                                    <item name="children" xsi:type="array">
--                                                        <item name="customer-email" xsi:type="array">
--                                                            <item name="children" xsi:type="array">
--                                                                <item name="additional-login-form-fields" xsi:type="array">
--                                                                    <item name="children" xsi:type="array">
--                                                                        <item name="captcha" xsi:type="array">
--                                                                            <item name="component" xsi:type="string">Magento_Captcha/js/view/checkout/loginCaptcha</item>
--                                                                            <item name="displayArea" xsi:type="string">additional-login-form-fields</item>
--                                                                            <item name="formId" xsi:type="string">guest_checkout</item>
-+                                                                            <item name="formId" xsi:type="string">user_login</item>
-                                                                             <item name="configSource" xsi:type="string">checkoutConfig</item>
-                                                                         </item>
-                                                                     </item>
-diff --git a/app/code/Magento/Captcha/view/frontend/requirejs-config.js b/app/code/Magento/Captcha/view/frontend/requirejs-config.js
-index 3b322711f8b..42c80632d3e 100644
---- a/app/code/Magento/Captcha/view/frontend/requirejs-config.js
-+++ b/app/code/Magento/Captcha/view/frontend/requirejs-config.js
-@@ -6,7 +6,8 @@
- var config = {
-     map: {
-         '*': {
--            captcha: 'Magento_Captcha/captcha'
-+            captcha: 'Magento_Captcha/js/captcha',
-+            'Magento_Captcha/captcha': 'Magento_Captcha/js/captcha'
-         }
-     }
- };
-diff --git a/app/code/Magento/Captcha/view/frontend/templates/default.phtml b/app/code/Magento/Captcha/view/frontend/templates/default.phtml
-index 6c9a5fe85f5..ead8c590eee 100644
---- a/app/code/Magento/Captcha/view/frontend/templates/default.phtml
-+++ b/app/code/Magento/Captcha/view/frontend/templates/default.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Captcha\Block\Captcha\DefaultCaptcha $block */
- 
- /** @var \Magento\Captcha\Model\DefaultModel $captcha */
-diff --git a/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml b/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml
-index bad5acc209b..5902a9f25cc 100644
---- a/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/Captcha/view/frontend/web/captcha.js b/app/code/Magento/Captcha/view/frontend/web/js/captcha.js
-similarity index 100%
-rename from app/code/Magento/Captcha/view/frontend/web/captcha.js
-rename to app/code/Magento/Captcha/view/frontend/web/js/captcha.js
-diff --git a/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js b/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js
-index 3a235df73a9..e79cfb35ee0 100644
---- a/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js
-+++ b/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js
-@@ -17,11 +17,12 @@ define([
-             imageSource: ko.observable(captchaData.imageSrc),
-             visibility: ko.observable(false),
-             captchaValue: ko.observable(null),
--            isRequired: captchaData.isRequired,
-+            isRequired: ko.observable(captchaData.isRequired),
-             isCaseSensitive: captchaData.isCaseSensitive,
-             imageHeight: captchaData.imageHeight,
-             refreshUrl: captchaData.refreshUrl,
-             isLoading: ko.observable(false),
-+            timestamp: null,
- 
-             /**
-              * @return {String}
-@@ -41,7 +42,7 @@ define([
-              * @return {Boolean}
-              */
-             getIsVisible: function () {
--                return this.visibility;
-+                return this.visibility();
-             },
- 
-             /**
-@@ -55,14 +56,14 @@ define([
-              * @return {Boolean}
-              */
-             getIsRequired: function () {
--                return this.isRequired;
-+                return this.isRequired();
-             },
- 
-             /**
-              * @param {Boolean} flag
-              */
-             setIsRequired: function (flag) {
--                this.isRequired = flag;
-+                this.isRequired(flag);
-             },
- 
-             /**
-diff --git a/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js b/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js
-index f80b2ab163f..d79c42a7115 100644
---- a/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js
-+++ b/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js
-@@ -7,8 +7,10 @@ define([
-     'jquery',
-     'uiComponent',
-     'Magento_Captcha/js/model/captcha',
--    'Magento_Captcha/js/model/captchaList'
--], function ($, Component, Captcha, captchaList) {
-+    'Magento_Captcha/js/model/captchaList',
-+    'Magento_Customer/js/customer-data',
-+    'underscore'
-+], function ($, Component, Captcha, captchaList, customerData, _) {
-     'use strict';
- 
-     var captchaConfig;
-@@ -34,12 +36,49 @@ define([
-             if (window[this.configSource] && window[this.configSource].captcha) {
-                 captchaConfig = window[this.configSource].captcha;
-                 $.each(captchaConfig, function (formId, captchaData) {
-+                    var captcha;
-+
-                     captchaData.formId = formId;
--                    captchaList.add(Captcha(captchaData));
--                });
-+                    captcha = Captcha(captchaData);
-+                    this.checkCustomerData(formId, customerData.get('captcha')(), captcha);
-+                    this.subscribeCustomerData(formId, captcha);
-+                    captchaList.add(captcha);
-+                }.bind(this));
-             }
-         },
- 
-+        /**
-+         * Check customer data for captcha configuration.
-+         *
-+         * @param {String} formId
-+         * @param {Object} captchaData
-+         * @param {Object} captcha
-+         */
-+        checkCustomerData: function (formId, captchaData, captcha) {
-+            if (!_.isEmpty(captchaData) &&
-+                !_.isEmpty(captchaData)[formId] &&
-+                captchaData[formId].timestamp > captcha.timestamp
-+            ) {
-+                if (!captcha.isRequired() && captchaData[formId].isRequired) {
-+                    captcha.refresh();
-+                }
-+                captcha.isRequired(captchaData[formId].isRequired);
-+                captcha.timestamp = captchaData[formId].timestamp;
-+            }
-+        },
-+
-+        /**
-+         * Subscribe for customer data updates.
-+         *
-+         * @param {String} formId
-+         * @param {Object} captcha
-+         */
-+        subscribeCustomerData: function (formId, captcha) {
-+            customerData.get('captcha').subscribe(function (captchaData) {
-+                this.checkCustomerData(formId, captchaData, captcha);
-+            }.bind(this));
-+        },
-+
-         /**
-          * @return {Boolean}
-          */
-@@ -89,6 +128,15 @@ define([
-             return this.currentCaptcha !== null ? this.currentCaptcha.getIsRequired() : false;
-         },
- 
-+        /**
-+         * Set isRequired on current captcha model.
-+         *
-+         * @param {Boolean} flag
-+         */
-+        setIsRequired: function (flag) {
-+            this.currentCaptcha.setIsRequired(flag);
-+        },
-+
-         /**
-          * @return {Boolean}
-          */
-diff --git a/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js b/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js
-index 7709febea60..49528f6ce85 100644
---- a/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js
-+++ b/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js
-@@ -6,9 +6,10 @@
- define([
-     'Magento_Captcha/js/view/checkout/defaultCaptcha',
-     'Magento_Captcha/js/model/captchaList',
--    'Magento_Customer/js/action/login'
-+    'Magento_Customer/js/action/login',
-+    'underscore'
- ],
--function (defaultCaptcha, captchaList, loginAction) {
-+function (defaultCaptcha, captchaList, loginAction, _) {
-     'use strict';
- 
-     return defaultCaptcha.extend({
-@@ -26,9 +27,10 @@ function (defaultCaptcha, captchaList, loginAction) {
- 
-                 loginAction.registerLoginCallback(function (loginData) {
-                     if (loginData['captcha_form_id'] &&
--                        loginData['captcha_form_id'] == self.formId //eslint-disable-line eqeqeq
-+                        loginData['captcha_form_id'] === self.formId &&
-+                        self.isRequired()
-                     ) {
--                        self.refresh();
-+                        _.defer(self.refresh.bind(self));
-                     }
-                 });
-             }
-diff --git a/app/code/Magento/Captcha/view/frontend/web/onepage.js b/app/code/Magento/Captcha/view/frontend/web/onepage.js
-deleted file mode 100644
-index 7f5f11d2057..00000000000
---- a/app/code/Magento/Captcha/view/frontend/web/onepage.js
-+++ /dev/null
-@@ -1,22 +0,0 @@
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--/**
-- * @deprecated since version 2.2.0
-- */
--define(['jquery'], function ($) {
--    'use strict';
--
--    $(document).on('login', function () {
--        var type;
--
--        $('[data-captcha="guest_checkout"], [data-captcha="register_during_checkout"]').hide();
--        $('[role="guest_checkout"], [role="register_during_checkout"]').hide();
--        type = $('#login\\:guest').is(':checked') ? 'guest_checkout' : 'register_during_checkout';
--        $('[role="' + type + '"], [data-captcha="' + type + '"]').show();
--    }).on('billingSave', function () {
--            $('.captcha-reload:visible').trigger('click');
--        });
--});
-diff --git a/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html b/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
-index 575b3ca6f73..3f48ec330c0 100644
---- a/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
-+++ b/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
-@@ -4,12 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- -->
-+<input name="captcha_form_id" type="hidden" data-bind="value: formId,  attr: {'data-scope': dataScope}" />
- <!-- ko if: (isRequired() && getIsVisible())-->
- <div class="field captcha required" data-bind="blockLoader: getIsLoading()">
-     <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="i18n: 'Please type the letters and numbers below'"></span></label>
-     <div class="control captcha">
-         <input name="captcha_string" type="text" class="input-text required-entry" data-bind="value: captchaValue(), attr: {id: 'captcha_' + formId, 'data-scope': dataScope}" autocomplete="off"/>
--        <input name="captcha_form_id" type="hidden" data-bind="value: formId,  attr: {'data-scope': dataScope}" />
-         <div class="nested">
-             <div class="field captcha no-label">
-                 <div class="control captcha-image">
-diff --git a/app/code/Magento/CardinalCommerce/LICENSE.txt b/app/code/Magento/CardinalCommerce/LICENSE.txt
-new file mode 100644
-index 00000000000..49525fd99da
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/LICENSE.txt
-@@ -0,0 +1,48 @@
-+
-+Open Software License ("OSL") v. 3.0
-+
-+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-+
-+Licensed under the Open Software License version 3.0
-+
-+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-+
-+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-+
-+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-+
-+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
-+
-+         4. to perform the Original Work publicly; and
-+
-+         5. to display the Original Work publicly. 
-+
-+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-+
-+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-+
-+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-+
-+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-+
-+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-+
-+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-+
-+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-+
-+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-+
-+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-+
-+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-+
-+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-+
-+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-+
-+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-+
-+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
-\ No newline at end of file
-diff --git a/app/code/Magento/CardinalCommerce/LICENSE_AFL.txt b/app/code/Magento/CardinalCommerce/LICENSE_AFL.txt
-new file mode 100644
-index 00000000000..f39d641b18a
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/LICENSE_AFL.txt
-@@ -0,0 +1,48 @@
-+
-+Academic Free License ("AFL") v. 3.0
-+
-+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-+
-+Licensed under the Academic Free License version 3.0
-+
-+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-+
-+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-+
-+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-+
-+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
-+
-+         4. to perform the Original Work publicly; and
-+
-+         5. to display the Original Work publicly.
-+
-+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-+
-+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-+
-+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-+
-+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-+
-+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-+
-+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-+
-+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-+
-+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-+
-+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-+
-+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-+
-+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-+
-+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-+
-+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-+
-+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
-diff --git a/app/code/Magento/CardinalCommerce/Model/Adminhtml/Source/Environment.php b/app/code/Magento/CardinalCommerce/Model/Adminhtml/Source/Environment.php
-new file mode 100644
-index 00000000000..29e2939a0ae
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/Model/Adminhtml/Source/Environment.php
-@@ -0,0 +1,36 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CardinalCommerce\Model\Adminhtml\Source;
-+
-+/**
-+ * CardinalCommerce Environment Dropdown source
-+ */
-+class Environment implements \Magento\Framework\Data\OptionSourceInterface
-+{
-+    private const ENVIRONMENT_PRODUCTION = 'production';
-+    private const ENVIRONMENT_SANDBOX = 'sandbox';
-+
-+    /**
-+     * Possible environment types
-+     *
-+     * @return array
-+     */
-+    public function toOptionArray(): array
-+    {
-+        return [
-+            [
-+                'value' => self::ENVIRONMENT_SANDBOX,
-+                'label' => 'Sandbox',
-+            ],
-+            [
-+                'value' => self::ENVIRONMENT_PRODUCTION,
-+                'label' => 'Production'
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/CardinalCommerce/Model/Checkout/ConfigProvider.php b/app/code/Magento/CardinalCommerce/Model/Checkout/ConfigProvider.php
-new file mode 100644
-index 00000000000..a6794eae900
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/Model/Checkout/ConfigProvider.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CardinalCommerce\Model\Checkout;
-+
-+use Magento\CardinalCommerce\Model\Config;
-+use Magento\CardinalCommerce\Model\Request\TokenBuilder;
-+use Magento\Checkout\Model\ConfigProviderInterface;
-+
-+/**
-+ * Configuration provider.
-+ */
-+class ConfigProvider implements ConfigProviderInterface
-+{
-+    /**
-+     * @var TokenBuilder
-+     */
-+    private $requestJwtBuilder;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @param TokenBuilder $requestJwtBuilder
-+     * @param Config $config
-+     */
-+    public function __construct(
-+        TokenBuilder $requestJwtBuilder,
-+        Config $config
-+    ) {
-+        $this->requestJwtBuilder = $requestJwtBuilder;
-+        $this->config = $config;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getConfig(): array
-+    {
-+        $config['cardinal'] = [
-+            'environment' => $this->config->getEnvironment(),
-+            'requestJWT' => $this->requestJwtBuilder->build()
-+        ];
-+
-+        return $config;
-+    }
-+}
-diff --git a/app/code/Magento/CardinalCommerce/Model/Config.php b/app/code/Magento/CardinalCommerce/Model/Config.php
-new file mode 100644
-index 00000000000..64c72dae8d5
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/Model/Config.php
-@@ -0,0 +1,120 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CardinalCommerce\Model;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Store\Model\ScopeInterface;
-+
-+/**
-+ * CardinalCommerce integration configuration.
-+ *
-+ * Class is a proxy service for retrieving configuration settings.
-+ */
-+class Config
-+{
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @param ScopeConfigInterface $scopeConfig
-+     */
-+    public function __construct(ScopeConfigInterface $scopeConfig)
-+    {
-+        $this->scopeConfig = $scopeConfig;
-+    }
-+
-+    /**
-+     * Returns CardinalCommerce API Key used for authentication.
-+     *
-+     * A shared secret value between the merchant and Cardinal. This value should never be exposed to the public.
-+     *
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    public function getApiKey(?int $storeId = null): string
-+    {
-+        $apiKey = $this->scopeConfig->getValue(
-+            'three_d_secure/cardinal/api_key',
-+            ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-+        return $apiKey;
-+    }
-+
-+    /**
-+     * Returns CardinalCommerce API Identifier.
-+     *
-+     * GUID used to identify the specific API Key.
-+     *
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    public function getApiIdentifier(?int $storeId = null): string
-+    {
-+        $apiIdentifier = $this->scopeConfig->getValue(
-+            'three_d_secure/cardinal/api_identifier',
-+            ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-+        return $apiIdentifier;
-+    }
-+
-+    /**
-+     * Returns CardinalCommerce Org Unit Id.
-+     *
-+     * GUID to identify the merchant organization within Cardinal systems.
-+     *
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    public function getOrgUnitId(?int $storeId = null): string
-+    {
-+        $orgUnitId = $this->scopeConfig->getValue(
-+            'three_d_secure/cardinal/org_unit_id',
-+            ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-+        return $orgUnitId;
-+    }
-+
-+    /**
-+     * Returns CardinalCommerce environment.
-+     *
-+     * Sandbox or production.
-+     *
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    public function getEnvironment(?int $storeId = null): string
-+    {
-+        $environment = $this->scopeConfig->getValue(
-+            'three_d_secure/cardinal/environment',
-+            ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-+        return $environment;
-+    }
-+
-+    /**
-+     * If is "true" extra information about interaction with CardinalCommerce API are written to payment.log file
-+     *
-+     * @param int|null $storeId
-+     * @return bool
-+     */
-+    public function isDebugModeEnabled(?int $storeId = null): bool
-+    {
-+        $debugModeEnabled = $this->scopeConfig->isSetFlag(
-+            'three_d_secure/cardinal/debug',
-+            ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-+        return $debugModeEnabled;
-+    }
-+}
-diff --git a/app/code/Magento/CardinalCommerce/Model/JwtManagement.php b/app/code/Magento/CardinalCommerce/Model/JwtManagement.php
-new file mode 100644
-index 00000000000..953af1751fd
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/Model/JwtManagement.php
-@@ -0,0 +1,141 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CardinalCommerce\Model;
-+
-+use Magento\Framework\Serialize\Serializer\Json;
-+
-+/**
-+ * JSON Web Token management.
-+ */
-+class JwtManagement
-+{
-+    /**
-+     * The signing algorithm. Cardinal supported algorithm is 'HS256'
-+     */
-+    private const SIGN_ALGORITHM = 'HS256';
-+
-+    /**
-+     * @var Json
-+     */
-+    private $json;
-+
-+    /**
-+     * @param Json $json
-+     */
-+    public function __construct(
-+        Json $json
-+    ) {
-+        $this->json = $json;
-+    }
-+
-+    /**
-+     * Converts JWT string into array.
-+     *
-+     * @param string $jwt The JWT
-+     * @param string $key The secret key
-+     *
-+     * @return array
-+     * @throws \InvalidArgumentException
-+     */
-+    public function decode(string $jwt, string $key): array
-+    {
-+        if (empty($jwt)) {
-+            throw new \InvalidArgumentException('JWT is empty');
-+        }
-+
-+        $parts = explode('.', $jwt);
-+        if (count($parts) != 3) {
-+            throw new \InvalidArgumentException('Wrong number of segments in JWT');
-+        }
-+
-+        [$headB64, $payloadB64, $signatureB64] = $parts;
-+
-+        $headerJson = $this->urlSafeB64Decode($headB64);
-+        $header = $this->json->unserialize($headerJson);
-+
-+        $payloadJson  = $this->urlSafeB64Decode($payloadB64);
-+        $payload = $this->json->unserialize($payloadJson);
-+
-+        $signature = $this->urlSafeB64Decode($signatureB64);
-+        if ($signature !== $this->sign($headB64 . '.' . $payloadB64, $key, $header['alg'])) {
-+            throw new \InvalidArgumentException('JWT signature verification failed');
-+        }
-+
-+        return $payload;
-+    }
-+
-+    /**
-+     * Converts and signs array into a JWT string.
-+     *
-+     * @param array $payload
-+     * @param string $key
-+     *
-+     * @return string
-+     * @throws \InvalidArgumentException
-+     */
-+    public function encode(array $payload, string $key): string
-+    {
-+        $header = ['typ' => 'JWT', 'alg' => self::SIGN_ALGORITHM];
-+
-+        $headerJson = $this->json->serialize($header);
-+        $segments[] = $this->urlSafeB64Encode($headerJson);
-+
-+        $payloadJson = $this->json->serialize($payload);
-+        $segments[] = $this->urlSafeB64Encode($payloadJson);
-+
-+        $signature = $this->sign(implode('.', $segments), $key, $header['alg']);
-+        $segments[] = $this->urlSafeB64Encode($signature);
-+
-+        return implode('.', $segments);
-+    }
-+    /**
-+     * Sign a string with a given key and algorithm.
-+     *
-+     * @param string $msg The message to sign.
-+     * @param string $key The secret key.
-+     * @param string $algorithm The signing algorithm.
-+     *
-+     * @return string
-+     * @throws \InvalidArgumentException
-+     */
-+    private function sign(string $msg, string $key, string $algorithm): string
-+    {
-+        if ($algorithm !== self::SIGN_ALGORITHM) {
-+            throw new \InvalidArgumentException('Algorithm ' . $algorithm . ' is not supported');
-+        }
-+
-+        return hash_hmac('sha256', $msg, $key, true);
-+    }
-+
-+    /**
-+     * Decode a string with URL-safe Base64.
-+     *
-+     * @param string $input A Base64 encoded string
-+     *
-+     * @return string
-+     */
-+    private function urlSafeB64Decode(string $input): string
-+    {
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+        return base64_decode(
-+            str_pad(strtr($input, '-_', '+/'), strlen($input) % 4, '=', STR_PAD_RIGHT)
-+        );
-+    }
-+
-+    /**
-+     * Encode a string with URL-safe Base64.
-+     *
-+     * @param string $input The string you want encoded
-+     *
-+     * @return string
-+     */
-+    private function urlSafeB64Encode(string $input): string
-+    {
-+        return str_replace('=', '', strtr(base64_encode($input), '+/', '-_'));
-+    }
-+}
-diff --git a/app/code/Magento/CardinalCommerce/Model/Request/TokenBuilder.php b/app/code/Magento/CardinalCommerce/Model/Request/TokenBuilder.php
-new file mode 100644
-index 00000000000..e045d00dc55
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/Model/Request/TokenBuilder.php
-@@ -0,0 +1,99 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CardinalCommerce\Model\Request;
-+
-+use Magento\CardinalCommerce\Model\JwtManagement;
-+use Magento\CardinalCommerce\Model\Config;
-+use Magento\Checkout\Model\Session;
-+use Magento\Framework\DataObject\IdentityGeneratorInterface;
-+use Magento\Framework\Intl\DateTimeFactory;
-+
-+/**
-+ * Cardinal request token builder.
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ */
-+class TokenBuilder
-+{
-+    /**
-+     * @var JwtManagement
-+     */
-+    private $jwtManagement;
-+
-+    /**
-+     * @var Session
-+     */
-+    private $checkoutSession;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var IdentityGeneratorInterface
-+     */
-+    private $identityGenerator;
-+
-+    /**
-+     * @var DateTimeFactory
-+     */
-+    private $dateTimeFactory;
-+
-+    /**
-+     * @param JwtManagement $jwtManagement
-+     * @param Session $checkoutSession
-+     * @param Config $config
-+     * @param IdentityGeneratorInterface $identityGenerator
-+     * @param DateTimeFactory $dateTimeFactory
-+     */
-+    public function __construct(
-+        JwtManagement $jwtManagement,
-+        Session $checkoutSession,
-+        Config $config,
-+        IdentityGeneratorInterface $identityGenerator,
-+        DateTimeFactory $dateTimeFactory
-+    ) {
-+        $this->jwtManagement = $jwtManagement;
-+        $this->checkoutSession = $checkoutSession;
-+        $this->config = $config;
-+        $this->identityGenerator = $identityGenerator;
-+        $this->dateTimeFactory = $dateTimeFactory;
-+    }
-+
-+    /**
-+     * Builds request JWT.
-+     *
-+     * @return string
-+     */
-+    public function build()
-+    {
-+        $quote = $this->checkoutSession->getQuote();
-+        $currentDate = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
-+        $orderDetails = [
-+            'OrderDetails' => [
-+                'OrderNumber' => $quote->getId(),
-+                'Amount' => $quote->getBaseGrandTotal() * 100,
-+                'CurrencyCode' => $quote->getBaseCurrencyCode()
-+            ]
-+        ];
-+
-+        $token = [
-+            'jti' => $this->identityGenerator->generateId(),
-+            'iss' => $this->config->getApiIdentifier(),
-+            'iat' => $currentDate->getTimestamp(),
-+            'OrgUnitId' => $this->config->getOrgUnitId(),
-+            'Payload' => $orderDetails,
-+            'ObjectifyPayload' => true
-+        ];
-+
-+        $jwt = $this->jwtManagement->encode($token, $this->config->getApiKey());
-+
-+        return $jwt;
-+    }
-+}
-diff --git a/app/code/Magento/CardinalCommerce/Model/Response/JwtParser.php b/app/code/Magento/CardinalCommerce/Model/Response/JwtParser.php
-new file mode 100644
-index 00000000000..1865605d50a
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/Model/Response/JwtParser.php
-@@ -0,0 +1,120 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CardinalCommerce\Model\Response;
-+
-+use Magento\CardinalCommerce\Model\JwtManagement;
-+use Magento\CardinalCommerce\Model\Config;
-+use Magento\Framework\Exception\LocalizedException;
-+use Psr\Log\LoggerInterface;
-+use Magento\Payment\Model\Method\Logger as PaymentLogger;
-+
-+/**
-+ * Parse content of CardinalCommerce response JWT.
-+ */
-+class JwtParser
-+{
-+    /**
-+     * @var JwtManagement
-+     */
-+    private $jwtManagement;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var JwtPayloadValidatorInterface
-+     */
-+    private $tokenValidator;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var PaymentLogger
-+     */
-+    private $paymentLogger;
-+
-+    /**
-+     * @param JwtManagement $jwtManagement
-+     * @param Config $config
-+     * @param JwtPayloadValidatorInterface $tokenValidator
-+     * @param PaymentLogger $paymentLogger
-+     * @param LoggerInterface $logger
-+     */
-+    public function __construct(
-+        JwtManagement $jwtManagement,
-+        Config $config,
-+        JwtPayloadValidatorInterface $tokenValidator,
-+        PaymentLogger $paymentLogger,
-+        LoggerInterface $logger
-+    ) {
-+        $this->jwtManagement = $jwtManagement;
-+        $this->config = $config;
-+        $this->tokenValidator = $tokenValidator;
-+        $this->paymentLogger = $paymentLogger;
-+        $this->logger = $logger;
-+    }
-+
-+    /**
-+     * Returns response JWT payload.
-+     *
-+     * @param string $jwt
-+     * @return array
-+     * @throws LocalizedException
-+     */
-+    public function execute(string $jwt): array
-+    {
-+        $jwtPayload = '';
-+        try {
-+            $this->debug(['Cardinal Response JWT:' => $jwt]);
-+            $jwtPayload = $this->jwtManagement->decode($jwt, $this->config->getApiKey());
-+            $this->debug(['Cardinal Response JWT payload:' => $jwtPayload]);
-+            if (!$this->tokenValidator->validate($jwtPayload)) {
-+                $this->throwException();
-+            }
-+        } catch (\InvalidArgumentException $e) {
-+            $this->logger->critical($e, ['CardinalCommerce3DSecure']);
-+            $this->throwException();
-+        }
-+
-+        return $jwtPayload;
-+    }
-+
-+    /**
-+     * Log JWT data.
-+     *
-+     * @param array $data
-+     * @return void
-+     */
-+    private function debug(array $data)
-+    {
-+        if ($this->config->isDebugModeEnabled()) {
-+            $this->paymentLogger->debug($data, ['iss'], true);
-+        }
-+    }
-+
-+    /**
-+     * Throw general localized exception.
-+     *
-+     * @return void
-+     * @throws LocalizedException
-+     */
-+    private function throwException()
-+    {
-+        throw new LocalizedException(
-+            __(
-+                'Authentication Failed. Your card issuer cannot authenticate this card. ' .
-+                'Please select another card or form of payment to complete your purchase.'
-+            )
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/CardinalCommerce/Model/Response/JwtPayloadValidator.php b/app/code/Magento/CardinalCommerce/Model/Response/JwtPayloadValidator.php
-new file mode 100644
-index 00000000000..9720b90cad9
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/Model/Response/JwtPayloadValidator.php
-@@ -0,0 +1,132 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CardinalCommerce\Model\Response;
-+
-+use Magento\Framework\Intl\DateTimeFactory;
-+
-+/**
-+ * Validates payload of CardinalCommerce response JWT.
-+ */
-+class JwtPayloadValidator implements JwtPayloadValidatorInterface
-+{
-+    /**
-+     * Resulting state of the transaction.
-+     *
-+     *  SUCCESS  - The transaction resulted in success for the payment type used. For example,
-+     *             with a CCA transaction this would indicate the user has successfully completed authentication.
-+     *
-+     *  NOACTION - The transaction was successful but requires in no additional action. For example,
-+     *             with a CCA transaction this would indicate that the user is not currently enrolled in 3D Secure,
-+     *             but the API calls were successful.
-+     *
-+     *  FAILURE  - The transaction resulted in an error. For example, with a CCA transaction this would indicate
-+     *             that the user failed authentication or an error was encountered while processing the transaction.
-+     *
-+     *  ERROR    - A service level error was encountered. These are generally reserved for connectivity
-+     *             or API authentication issues. For example if your JWT was incorrectly signed, or Cardinal
-+     *             services are currently unreachable.
-+     *
-+     * @var array
-+     */
-+    private $allowedActionCode = ['SUCCESS', 'NOACTION'];
-+
-+    /**
-+     * 3DS status of transaction from ECI Flag value. Liability shift applies.
-+     *
-+     *  05 - Successful 3D Authentication (Visa, AMEX, JCB)
-+     *  02 - Successful 3D Authentication (MasterCard)
-+     *  06 - Attempted Processing or User Not Enrolled (Visa, AMEX, JCB)
-+     *  01 - Attempted Processing or User Not Enrolled (MasterCard)
-+     *  07 - 3DS authentication is either failed or could not be attempted;
-+     *       possible reasons being both card and Issuing Bank are not secured by 3DS,
-+     *       technical errors, or improper configuration. (Visa, AMEX, JCB)
-+     *  00 - 3DS authentication is either failed or could not be attempted;
-+     *       possible reasons being both card and Issuing Bank are not secured by 3DS,
-+     *       technical errors, or improper configuration. (MasterCard)
-+     *
-+     * @var array
-+     */
-+    private $allowedECIFlag = ['05', '02', '06', '01'];
-+
-+    /**
-+     * @var DateTimeFactory
-+     */
-+    private $dateTimeFactory;
-+
-+    /**
-+     * @param DateTimeFactory $dateTimeFactory
-+     */
-+    public function __construct(
-+        DateTimeFactory $dateTimeFactory
-+    ) {
-+        $this->dateTimeFactory = $dateTimeFactory;
-+    }
-+    /**
-+     * @inheritdoc
-+     */
-+    public function validate(array $jwtPayload): bool
-+    {
-+        $transactionState = $jwtPayload['Payload']['ActionCode'] ?? '';
-+        $errorNumber = $jwtPayload['Payload']['ErrorNumber'] ?? -1;
-+        $eciFlag = $jwtPayload['Payload']['Payment']['ExtendedData']['ECIFlag'] ?? '';
-+        $expTimestamp = $jwtPayload['exp'] ?? 0;
-+
-+        return $this->isValidErrorNumber((int)$errorNumber)
-+            && $this->isValidTransactionState($transactionState)
-+            && $this->isValidEciFlag($eciFlag)
-+            && $this->isNotExpired((int)$expTimestamp);
-+    }
-+
-+    /**
-+     * Checks application error number.
-+     *
-+     * A non-zero value represents the error encountered while attempting the process the message request.
-+     *
-+     * @param int $errorNumber
-+     * @return bool
-+     */
-+    private function isValidErrorNumber(int $errorNumber)
-+    {
-+        return $errorNumber === 0;
-+    }
-+
-+    /**
-+     * Checks if value of transaction state identifier is in allowed list.
-+     *
-+     * @param string $transactionState
-+     * @return bool
-+     */
-+    private function isValidTransactionState(string $transactionState)
-+    {
-+        return in_array($transactionState, $this->allowedActionCode);
-+    }
-+
-+    /**
-+     * Checks if value of ECI Flag identifier is in allowed list.
-+     *
-+     * @param string $eciFlag
-+     * @return bool
-+     */
-+    private function isValidEciFlag(string $eciFlag)
-+    {
-+        return in_array($eciFlag, $this->allowedECIFlag);
-+    }
-+
-+    /**
-+     * Checks if token is not expired.
-+     *
-+     * @param int $expTimestamp
-+     * @return bool
-+     */
-+    private function isNotExpired(int $expTimestamp)
-+    {
-+        $currentDate = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
-+
-+        return $currentDate->getTimestamp() < $expTimestamp;
-+    }
-+}
-diff --git a/app/code/Magento/CardinalCommerce/Model/Response/JwtPayloadValidatorInterface.php b/app/code/Magento/CardinalCommerce/Model/Response/JwtPayloadValidatorInterface.php
-new file mode 100644
-index 00000000000..774c0daee6c
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/Model/Response/JwtPayloadValidatorInterface.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\CardinalCommerce\Model\Response;
-+
-+/**
-+ * Validates payload of CardinalCommerce response JWT.
-+ */
-+interface JwtPayloadValidatorInterface
-+{
-+    /**
-+     * Validates token payload.
-+     *
-+     * @param array $jwtPayload
-+     * @return bool
-+     */
-+    public function validate(array $jwtPayload);
-+}
-diff --git a/app/code/Magento/CardinalCommerce/README.md b/app/code/Magento/CardinalCommerce/README.md
-new file mode 100644
-index 00000000000..54db9114a2a
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/README.md
-@@ -0,0 +1 @@
-+The CardinalCommerce module provides a possibility to enable 3-D Secure 2.0 support for payment methods.
-\ No newline at end of file
-diff --git a/app/code/Magento/CardinalCommerce/Test/Unit/Model/JwtManagementTest.php b/app/code/Magento/CardinalCommerce/Test/Unit/Model/JwtManagementTest.php
-new file mode 100644
-index 00000000000..70eae201c15
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/Test/Unit/Model/JwtManagementTest.php
-@@ -0,0 +1,173 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CardinalCommerce\Test\Unit\Model;
-+
-+use Magento\CardinalCommerce\Model\JwtManagement;
-+use Magento\Framework\Serialize\Serializer\Json;
-+
-+/**
-+ * Tests JWT encode and decode.
-+ */
-+class JwtManagementTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * API key
-+     */
-+    private const API_KEY = 'API key';
-+
-+    /**
-+     * @var JwtManagement
-+     */
-+    private $model;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->model = new JwtManagement(new Json());
-+    }
-+
-+    /**
-+     * Tests JWT encode.
-+     */
-+    public function testEncode()
-+    {
-+        $jwt = $this->model->encode($this->getTokenPayload(), self::API_KEY);
-+
-+        $this->assertEquals(
-+            $this->getValidHS256Jwt(),
-+            $jwt,
-+            'Generated JWT isn\'t equal to expected'
-+        );
-+    }
-+
-+    /**
-+     * Tests JWT decode.
-+     */
-+    public function testDecode()
-+    {
-+        $tokenPayload = $this->model->decode($this->getValidHS256Jwt(), self::API_KEY);
-+
-+        $this->assertEquals(
-+            $this->getTokenPayload(),
-+            $tokenPayload,
-+            'JWT payload isn\'t equal to expected'
-+        );
-+    }
-+
-+    /**
-+     * Tests JWT decode.
-+     *
-+     * @param string $jwt
-+     * @param string $errorMessage
-+     * @dataProvider decodeWithExceptionDataProvider
-+     */
-+    public function testDecodeWithException(string $jwt, string $errorMessage)
-+    {
-+        $this->expectException(\InvalidArgumentException::class);
-+        $this->expectExceptionMessage($errorMessage);
-+
-+        $this->model->decode($jwt, self::API_KEY);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function decodeWithExceptionDataProvider(): array
-+    {
-+        return [
-+            [
-+                'jwt' => '',
-+                'errorMessage' => 'JWT is empty',
-+            ],
-+            [
-+                'jwt' => 'dddd.dddd',
-+                'errorMessage' => 'Wrong number of segments in JWT',
-+            ],
-+            [
-+                'jwt' => 'dddd.dddd.dddd',
-+                'errorMessage' => 'Unable to unserialize value. Error: Syntax error',
-+            ],
-+            [
-+                'jwt' => $this->getHS512Jwt(),
-+                'errorMessage' => 'Algorithm HS512 is not supported',
-+            ],
-+            [
-+                'jwt' => $this->getJwtWithInvalidSignature(),
-+                'errorMessage' => 'JWT signature verification failed',
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Returns valid JWT, signed using HS256.
-+     *
-+     * @return string
-+     */
-+    private function getValidHS256Jwt(): string
-+    {
-+        return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJhNWE1OWJmYi1hYzA2LTRjNWYtYmU1Yy0zNTFiNjR' .
-+            'hZTYwOGUiLCJpc3MiOiI1NjU2MGEzNThiOTQ2ZTBjODQ1MjM2NWRzIiwiaWF0IjoiMTQ0ODk5Nzg2NSIsIk9yZ1Vua' .
-+            'XRJZCI6IjU2NTYwN2MxOGI5NDZlMDU4NDYzZHM4ciIsIlBheWxvYWQiOnsiT3JkZXJEZXRhaWxzIjp7Ik9yZGVyTnV' .
-+            'tYmVyIjoiMTI1IiwiQW1vdW50IjoiMTUwMCIsIkN1cnJlbmN5Q29kZSI6IlVTRCJ9fSwiT2JqZWN0aWZ5UGF5bG9hZ' .
-+            'CI6dHJ1ZX0.emv9N75JIvyk_gQHMNJYQ2UzmbM5ISBQs1Y222zO1jk';
-+    }
-+
-+    /**
-+     * Returns JWT, signed using not supported HS512.
-+     *
-+     * @return string
-+     */
-+    private function getHS512Jwt(): string
-+    {
-+        return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJqdGkiOiJhNWE1OWJmYi1hYzA2LTRjNWYtYmU1Yy0zNTFiNjR' .
-+               'hZTYwOGUiLCJpc3MiOiI1NjU2MGEzNThiOTQ2ZTBjODQ1MjM2NWRzIiwiaWF0IjoiMTQ0ODk5Nzg2NSIsIk9yZ1V' .
-+               'uaXRJZCI6IjU2NTYwN2MxOGI5NDZlMDU4NDYzZHM4ciIsIlBheWxvYWQiOnsiT3JkZXJEZXRhaWxzIjp7Ik9yZGV' .
-+               'yTnVtYmVyIjoiMTI1IiwiQW1vdW50IjoiMTUwMCIsIkN1cnJlbmN5Q29kZSI6IlVTRCJ9fSwiT2JqZWN0aWZ5UGF' .
-+               '5bG9hZCI6dHJ1ZX0.4fwdXfIgUe7bAiHP2bZsxSG-s-wJOyaCmCe9MOQhs-m6LLjRGarguA_0SqZA2EeUaytMO4R' .
-+               'G84ZEOfbYfS8c1A';
-+    }
-+
-+    /**
-+     * Returns JWT with invalid signature.
-+     *
-+     * @return string
-+     */
-+    private function getJwtWithInvalidSignature(): string
-+    {
-+        return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJhNWE1OWJmYi1hYzA2LTRjNWYtYmU1Yy0zNTFiNjR' .
-+            'hZTYwOGUiLCJpc3MiOiI1NjU2MGEzNThiOTQ2ZTBjODQ1MjM2NWRzIiwiaWF0IjoiMTQ0ODk5Nzg2NSIsIk9yZ1Vua' .
-+            'XRJZCI6IjU2NTYwN2MxOGI5NDZlMDU4NDYzZHM4ciIsIlBheWxvYWQiOnsiT3JkZXJEZXRhaWxzIjp7Ik9yZGVyTnV' .
-+            'tYmVyIjoiMTI1IiwiQW1vdW50IjoiMTUwMCIsIkN1cnJlbmN5Q29kZSI6IlVTRCJ9fSwiT2JqZWN0aWZ5UGF5bG9hZ' .
-+            'CI6dHJ1ZX0.InvalidSign';
-+    }
-+
-+    /**
-+     * Returns token decoded payload.
-+     *
-+     * @return array
-+     */
-+    private function getTokenPayload(): array
-+    {
-+        return [
-+            'jti' => 'a5a59bfb-ac06-4c5f-be5c-351b64ae608e',
-+            'iss' => '56560a358b946e0c8452365ds',
-+            'iat' => '1448997865',
-+            'OrgUnitId' => '565607c18b946e058463ds8r',
-+            'Payload' => [
-+                'OrderDetails' => [
-+                    'OrderNumber' => '125',
-+                    'Amount' => '1500',
-+                    'CurrencyCode' => 'USD'
-+                ]
-+            ],
-+            'ObjectifyPayload' => true
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/CardinalCommerce/Test/Unit/Model/Response/JwtPayloadValidatorTest.php b/app/code/Magento/CardinalCommerce/Test/Unit/Model/Response/JwtPayloadValidatorTest.php
-new file mode 100644
-index 00000000000..cbaae9f777a
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/Test/Unit/Model/Response/JwtPayloadValidatorTest.php
-@@ -0,0 +1,202 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CardinalCommerce\Test\Unit\Model\Response;
-+
-+use Magento\CardinalCommerce\Model\Response\JwtPayloadValidator;
-+use Magento\Framework\Intl\DateTimeFactory;
-+
-+/**
-+ * Class JwtPayloadValidatorTest
-+ */
-+class JwtPayloadValidatorTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var JwtPayloadValidator
-+     */
-+    private $model;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->model = new JwtPayloadValidator(new DateTimeFactory());
-+    }
-+
-+    /**
-+     * Tests successful cases.
-+     *
-+     * @param array $token
-+     * @dataProvider validateSuccessDataProvider
-+     */
-+    public function testValidateSuccess(array $token)
-+    {
-+        $this->assertTrue(
-+            $this->model->validate($token)
-+        );
-+    }
-+
-+    /**
-+     * @case 1. All data are correct, the transaction was successful (Visa, AMEX)
-+     * @case 2. All data are correct, the transaction was successful but requires in no additional action (Visa, AMEX)
-+     * @case 3. All data are correct, the transaction was successful (MasterCard)
-+     * @case 4. All data are correct, the transaction was successful but requires in no additional action (MasterCard)
-+     *
-+     * @return array
-+     */
-+    public function validateSuccessDataProvider()
-+    {
-+        $expTimestamp = $this->getValidExpTimestamp();
-+
-+        return [
-+            1 => $this->createToken('05', '0', 'SUCCESS', $expTimestamp),
-+            2 => $this->createToken('06', '0', 'NOACTION', $expTimestamp),
-+            3 => $this->createToken('02', '0', 'SUCCESS', $expTimestamp),
-+            4 => $this->createToken('01', '0', 'NOACTION', $expTimestamp),
-+        ];
-+    }
-+
-+    /**
-+     * Case when 3DS authentication is either failed or could not be attempted.
-+     *
-+     * @param array $token
-+     * @dataProvider validationEciFailsDataProvider
-+     */
-+    public function testValidationEciFails(array $token)
-+    {
-+        $this->assertFalse(
-+            $this->model->validate($token),
-+            'Negative ECIFlag value validation fails'
-+        );
-+    }
-+
-+    /**
-+     * ECIFlag value when 3DS authentication is either failed or could not be attempted.
-+     *
-+     * @case 1. Visa, AMEX, JCB
-+     * @case 2. MasterCard
-+     * @return array
-+     */
-+    public function validationEciFailsDataProvider(): array
-+    {
-+        $expTimestamp = $this->getValidExpTimestamp();
-+        return [
-+            1 => $this->createToken('07', '0', 'NOACTION', $expTimestamp),
-+            2 => $this->createToken('00', '0', 'NOACTION', $expTimestamp),
-+        ];
-+    }
-+
-+    /**
-+     * Case when resulting state of the transaction is negative.
-+     *
-+     * @param array $token
-+     * @dataProvider validationActionCodeFailsDataProvider
-+     */
-+    public function testValidationActionCodeFails(array $token)
-+    {
-+        $this->assertFalse(
-+            $this->model->validate($token),
-+            'Negative ActionCode value validation fails'
-+        );
-+    }
-+
-+    /**
-+     * ECIFlag value when 3DS authentication is either failed or could not be attempted.
-+     *
-+     * @return array
-+     */
-+    public function validationActionCodeFailsDataProvider(): array
-+    {
-+        $expTimestamp = $this->getValidExpTimestamp();
-+        return [
-+            $this->createToken('05', '0', 'FAILURE', $expTimestamp),
-+            $this->createToken('05', '0', 'ERROR', $expTimestamp),
-+        ];
-+    }
-+
-+    /**
-+     * Case when ErrorNumber not equal 0.
-+     */
-+    public function testValidationErrorNumberFails()
-+    {
-+        $notAllowedErrorNumber = '10';
-+        $expTimestamp = $this->getValidExpTimestamp();
-+        $token =  $this->createToken('05', $notAllowedErrorNumber, 'SUCCESS', $expTimestamp);
-+        $this->assertFalse(
-+            $this->model->validate($token),
-+            'Negative ErrorNumber value validation fails'
-+        );
-+    }
-+
-+    /**
-+     * Case when ErrorNumber not equal 0.
-+     */
-+    public function testValidationExpirationFails()
-+    {
-+        $expTimestamp = $this->getOutdatedExpTimestamp();
-+        $token =  $this->createToken('05', '0', 'SUCCESS', $expTimestamp);
-+        $this->assertFalse(
-+            $this->model->validate($token),
-+            'Expiration date validation fails'
-+        );
-+    }
-+
-+    /**
-+     * Creates a token.
-+     *
-+     * @param string $eciFlag
-+     * @param string $errorNumber
-+     * @param string $actionCode
-+     * @param int $expTimestamp
-+     *
-+     * @return array
-+     */
-+    private function createToken(string $eciFlag, string $errorNumber, string $actionCode, int $expTimestamp): array
-+    {
-+        return [
-+            [
-+                'Payload' => [
-+                    'Payment' => [
-+                        'ExtendedData' => [
-+                            'ECIFlag' => $eciFlag,
-+                        ],
-+                    ],
-+                    'ActionCode' => $actionCode,
-+                    'ErrorNumber' => $errorNumber
-+                ],
-+                'exp' => $expTimestamp
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * Returns valid expiration timestamp.
-+     *
-+     * @return int
-+     */
-+    private function getValidExpTimestamp()
-+    {
-+        $dateTimeFactory = new DateTimeFactory();
-+        $currentDate = $dateTimeFactory->create('now', new \DateTimeZone('UTC'));
-+
-+        return $currentDate->getTimestamp() + 3600;
-+    }
-+
-+    /**
-+     * Returns outdated expiration timestamp.
-+     *
-+     * @return int
-+     */
-+    private function getOutdatedExpTimestamp()
-+    {
-+        $dateTimeFactory = new DateTimeFactory();
-+        $currentDate = $dateTimeFactory->create('now', new \DateTimeZone('UTC'));
-+
-+        return $currentDate->getTimestamp() - 3600;
-+    }
-+}
-diff --git a/app/code/Magento/CardinalCommerce/composer.json b/app/code/Magento/CardinalCommerce/composer.json
-new file mode 100644
-index 00000000000..3e839228dc7
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/composer.json
-@@ -0,0 +1,27 @@
-+{
-+    "name": "magento/module-cardinal-commerce",
-+    "description": "Provides a possibility to enable 3-D Secure 2.0 support for payment methods.",
-+    "config": {
-+        "sort-packages": true
-+    },
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-checkout": "*",
-+        "magento/module-payment": "*",
-+        "magento/module-store": "*"
-+    },
-+    "type": "magento2-module",
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\CardinalCommerce\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/CardinalCommerce/etc/adminhtml/system.xml b/app/code/Magento/CardinalCommerce/etc/adminhtml/system.xml
-new file mode 100644
-index 00000000000..4fa40436d4a
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/etc/adminhtml/system.xml
-@@ -0,0 +1,48 @@
-+<?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_Config:etc/system_file.xsd">
-+    <system>
-+        <section id="three_d_secure" translate="label" type="text" sortOrder="410" showInDefault="1" showInWebsite="1" showInStore="1">
-+            <label>3D Secure</label>
-+            <tab>sales</tab>
-+            <resource>Magento_Sales::three_d_secure</resource>
-+            <group id="cardinal" type="text" sortOrder="13" showInDefault="1" showInWebsite="1" showInStore="0">
-+                <group id="config" translate="label comment" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
-+                    <label>Configuration</label>
-+                    <comment><![CDATA[For support contact <a href="mailto:support@cardinalcommerce.com">support@cardinalcommerce.com</a>.]]>
-+                    </comment>
-+                    <field id="environment" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Environment</label>
-+                        <source_model>Magento\CardinalCommerce\Model\Adminhtml\Source\Environment</source_model>
-+                        <config_path>three_d_secure/cardinal/environment</config_path>
-+                    </field>
-+                    <field id="org_unit_id" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Org Unit Id</label>
-+                        <config_path>three_d_secure/cardinal/org_unit_id</config_path>
-+                        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-+                    </field>
-+                    <field id="api_key" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>API Key</label>
-+                        <config_path>three_d_secure/cardinal/api_key</config_path>
-+                        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-+                    </field>
-+                    <field id="api_identifier" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>API Identifier</label>
-+                        <config_path>three_d_secure/cardinal/api_identifier</config_path>
-+                        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-+                    </field>
-+                    <field id="debug" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Debug</label>
-+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                        <config_path>three_d_secure/cardinal/debug</config_path>
-+                    </field>
-+                </group>
-+            </group>
-+        </section>
-+    </system>
-+</config>
-diff --git a/app/code/Magento/CardinalCommerce/etc/config.xml b/app/code/Magento/CardinalCommerce/etc/config.xml
-new file mode 100644
-index 00000000000..60b111a59cb
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/etc/config.xml
-@@ -0,0 +1,20 @@
-+<?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_Store:etc/config.xsd">
-+    <default>
-+        <three_d_secure>
-+            <cardinal>
-+                <environment>production</environment>
-+                <api_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-+                <org_unit_id backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-+                <api_identifier backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-+                <debug>0</debug>
-+            </cardinal>
-+        </three_d_secure>
-+    </default>
-+</config>
-diff --git a/app/code/Magento/CardinalCommerce/etc/di.xml b/app/code/Magento/CardinalCommerce/etc/di.xml
-new file mode 100644
-index 00000000000..ffd3c50ef50
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/etc/di.xml
-@@ -0,0 +1,10 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <preference for="Magento\CardinalCommerce\Model\Response\JwtPayloadValidatorInterface" type="Magento\CardinalCommerce\Model\Response\JwtPayloadValidator" />
-+</config>
-diff --git a/app/code/Magento/CardinalCommerce/etc/frontend/di.xml b/app/code/Magento/CardinalCommerce/etc/frontend/di.xml
-new file mode 100644
-index 00000000000..e3913291aa6
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/etc/frontend/di.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\Checkout\Model\CompositeConfigProvider">
-+        <arguments>
-+            <argument name="configProviders" xsi:type="array">
-+                <item name="cardinal_config_provider" xsi:type="object">
-+                    Magento\CardinalCommerce\Model\Checkout\ConfigProvider
-+                </item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/CardinalCommerce/etc/module.xml b/app/code/Magento/CardinalCommerce/etc/module.xml
-new file mode 100644
-index 00000000000..8605e81d3fd
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/etc/module.xml
-@@ -0,0 +1,15 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_CardinalCommerce" >
-+        <sequence>
-+            <module name="Magento_Checkout"/>
-+            <module name="Magento_Payment"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/app/code/Magento/CardinalCommerce/registration.php b/app/code/Magento/CardinalCommerce/registration.php
-new file mode 100644
-index 00000000000..26fb168fb0a
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/registration.php
-@@ -0,0 +1,9 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use \Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CardinalCommerce', __DIR__);
-diff --git a/app/code/Magento/CardinalCommerce/view/frontend/requirejs-config.js b/app/code/Magento/CardinalCommerce/view/frontend/requirejs-config.js
-new file mode 100644
-index 00000000000..0c5e3964d04
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/view/frontend/requirejs-config.js
-@@ -0,0 +1,20 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+var config = {
-+    shim: {
-+        cardinaljs: {
-+            exports: 'Cardinal'
-+        },
-+        cardinaljsSandbox: {
-+            exports: 'Cardinal'
-+        }
-+    },
-+    paths: {
-+        cardinaljsSandbox: 'https://includestest.ccdc02.com/cardinalcruise/v1/songbird',
-+        cardinaljs: 'https://songbird.cardinalcommerce.com/edge/v1/songbird'
-+    }
-+};
-+
-diff --git a/app/code/Magento/CardinalCommerce/view/frontend/web/js/cardinal-client.js b/app/code/Magento/CardinalCommerce/view/frontend/web/js/cardinal-client.js
-new file mode 100644
-index 00000000000..2ddb450d2f8
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/view/frontend/web/js/cardinal-client.js
-@@ -0,0 +1,131 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'jquery',
-+    'uiClass',
-+    'Magento_CardinalCommerce/js/cardinal-factory',
-+    'Magento_Checkout/js/model/quote',
-+    'mage/translate'
-+], function ($, Class, cardinalFactory, quote, $t) {
-+    'use strict';
-+
-+    return {
-+        /**
-+         * Starts Cardinal Consumer Authentication
-+         *
-+         * @param {Object} cardData
-+         * @return {jQuery.Deferred}
-+         */
-+        startAuthentication: function (cardData) {
-+            var deferred = $.Deferred();
-+
-+            if (this.cardinalClient) {
-+                this._startAuthentication(deferred, cardData);
-+            } else {
-+                cardinalFactory(this.getEnvironment())
-+                    .done(function (client) {
-+                        this.cardinalClient = client;
-+                        this._startAuthentication(deferred, cardData);
-+                    }.bind(this));
-+            }
-+
-+            return deferred.promise();
-+        },
-+
-+        /**
-+         * Cardinal Consumer Authentication
-+         *
-+         * @param {jQuery.Deferred} deferred
-+         * @param {Object} cardData
-+         */
-+        _startAuthentication: function (deferred, cardData) {
-+            //this.cardinalClient.configure({ logging: { level: 'verbose' } });
-+            this.cardinalClient.on('payments.validated', function (data, jwt) {
-+                if (data.ErrorNumber !== 0) {
-+                    deferred.reject(data.ErrorDescription);
-+                } else if ($.inArray(data.ActionCode, ['FAILURE', 'ERROR']) !== -1) {
-+                    deferred.reject($t('Authentication Failed. Please try again with another form of payment.'));
-+                } else {
-+                    deferred.resolve(jwt);
-+                }
-+                this.cardinalClient.off('payments.validated');
-+            }.bind(this));
-+
-+            this.cardinalClient.on('payments.setupComplete', function () {
-+                this.cardinalClient.start('cca', this.getRequestOrderObject(cardData));
-+                this.cardinalClient.off('payments.setupComplete');
-+            }.bind(this));
-+
-+            this.cardinalClient.setup('init', {
-+                jwt: this.getRequestJWT()
-+            });
-+        },
-+
-+        /**
-+         * Returns request order object.
-+         *
-+         * The request order object is structured object that is used to pass data
-+         * to Cardinal that describes an order you'd like to process.
-+         *
-+         * If you pass a request object in both the JWT and the browser,
-+         * Cardinal will merge the objects together where the browser overwrites
-+         * the JWT object as it is considered the most recently captured data.
-+         *
-+         * @param {Object} cardData
-+         * @returns {Object}
-+         */
-+        getRequestOrderObject: function (cardData) {
-+            var totalAmount = quote.totals()['base_grand_total'],
-+                currencyCode = quote.totals()['base_currency_code'],
-+                billingAddress = quote.billingAddress(),
-+                requestObject;
-+
-+            requestObject = {
-+                OrderDetails: {
-+                    Amount: totalAmount * 100,
-+                    CurrencyCode: currencyCode
-+                },
-+                Consumer: {
-+                    Account: {
-+                        AccountNumber: cardData.accountNumber,
-+                        ExpirationMonth: cardData.expMonth,
-+                        ExpirationYear: cardData.expYear,
-+                        CardCode: cardData.cardCode
-+                    },
-+                    BillingAddress: {
-+                        FirstName: billingAddress.firstname,
-+                        LastName: billingAddress.lastname,
-+                        Address1: billingAddress.street[0],
-+                        Address2: billingAddress.street[1],
-+                        City: billingAddress.city,
-+                        State: billingAddress.region,
-+                        PostalCode: billingAddress.postcode,
-+                        CountryCode: billingAddress.countryId,
-+                        Phone1: billingAddress.telephone
-+                    }
-+                }
-+            };
-+
-+            return requestObject;
-+        },
-+
-+        /**
-+         * Returns request JWT
-+         * @returns {String}
-+         */
-+        getRequestJWT: function () {
-+            return window.checkoutConfig.cardinal.requestJWT;
-+        },
-+
-+        /**
-+         * Returns type of environment
-+         * @returns {String}
-+         */
-+        getEnvironment: function () {
-+            return window.checkoutConfig.cardinal.environment;
-+        }
-+    };
-+});
-diff --git a/app/code/Magento/CardinalCommerce/view/frontend/web/js/cardinal-factory.js b/app/code/Magento/CardinalCommerce/view/frontend/web/js/cardinal-factory.js
-new file mode 100644
-index 00000000000..1da92ba2ff7
---- /dev/null
-+++ b/app/code/Magento/CardinalCommerce/view/frontend/web/js/cardinal-factory.js
-@@ -0,0 +1,29 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'jquery'
-+], function ($) {
-+    'use strict';
-+
-+    return function (environment) {
-+        var deferred = $.Deferred(),
-+            dependency = 'cardinaljs';
-+
-+        if (environment === 'sandbox') {
-+            dependency = 'cardinaljsSandbox';
-+        }
-+
-+        require(
-+            [dependency],
-+            function (Cardinal) {
-+                deferred.resolve(Cardinal);
-+            },
-+            deferred.reject
-+        );
-+
-+        return deferred.promise();
-+    };
-+});
-diff --git a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
-index 30ac06107ba..a65355c6909 100644
---- a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
-+++ b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
-@@ -32,18 +32,20 @@ interface CategoryLinkRepositoryInterface
-      *
-      * @throws \Magento\Framework\Exception\CouldNotSaveException
-      * @throws \Magento\Framework\Exception\StateException
-+     * @throws \Magento\Framework\Exception\InputException
-      */
-     public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink);
- 
-     /**
-      * Remove the product assignment from the category by category id and sku
-      *
--     * @param string $sku
-+     * @param int $categoryId
-      * @param string $sku
-      * @return bool will returned True if products successfully deleted
-      *
-      * @throws \Magento\Framework\Exception\CouldNotSaveException
-      * @throws \Magento\Framework\Exception\StateException
-+     * @throws \Magento\Framework\Exception\InputException
-      */
-     public function deleteByIds($categoryId, $sku);
- }
-diff --git a/app/code/Magento/Catalog/Api/Data/CategoryInterface.php b/app/code/Magento/Catalog/Api/Data/CategoryInterface.php
-index b9a23e9d08e..1940a0ac80c 100644
---- a/app/code/Magento/Catalog/Api/Data/CategoryInterface.php
-+++ b/app/code/Magento/Catalog/Api/Data/CategoryInterface.php
-@@ -1,7 +1,5 @@
- <?php
- /**
-- * Category data interface
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-@@ -9,6 +7,8 @@
- namespace Magento\Catalog\Api\Data;
- 
- /**
-+ * Category data interface.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -46,11 +46,15 @@ interface CategoryInterface extends \Magento\Framework\Api\CustomAttributesDataI
-     /**#@-*/
- 
-     /**
-+     * Retrieve category id.
-+     *
-      * @return int|null
-      */
-     public function getId();
- 
-     /**
-+     * Set category id.
-+     *
-      * @param int $id
-      * @return $this
-      */
-@@ -74,7 +78,7 @@ interface CategoryInterface extends \Magento\Framework\Api\CustomAttributesDataI
-     /**
-      * Get category name
-      *
--     * @return string
-+     * @return string|null
-      */
-     public function getName();
- 
-@@ -132,60 +136,82 @@ interface CategoryInterface extends \Magento\Framework\Api\CustomAttributesDataI
-     public function setLevel($level);
- 
-     /**
-+     * Retrieve children ids comma separated.
-+     *
-      * @return string|null
-      */
-     public function getChildren();
- 
-     /**
-+     * Retrieve category creation date and time.
-+     *
-      * @return string|null
-      */
-     public function getCreatedAt();
- 
-     /**
-+     * Set category creation date and time.
-+     *
-      * @param string $createdAt
-      * @return $this
-      */
-     public function setCreatedAt($createdAt);
- 
-     /**
-+     * Retrieve category last update date and time.
-+     *
-      * @return string|null
-      */
-     public function getUpdatedAt();
- 
-     /**
-+     * Set category last update date and time.
-+     *
-      * @param string $updatedAt
-      * @return $this
-      */
-     public function setUpdatedAt($updatedAt);
- 
-     /**
-+     * Retrieve category full path.
-+     *
-      * @return string|null
-      */
-     public function getPath();
- 
-     /**
-+     * Set category full path.
-+     *
-      * @param string $path
-      * @return $this
-      */
-     public function setPath($path);
- 
-     /**
-+     * Retrieve available sort by for category.
-+     *
-      * @return string[]|null
-      */
-     public function getAvailableSortBy();
- 
-     /**
-+     * Set available sort by for category.
-+     *
-      * @param string[]|string $availableSortBy
-      * @return $this
-      */
-     public function setAvailableSortBy($availableSortBy);
- 
-     /**
-+     * Get category is included in menu.
-+     *
-      * @return bool|null
-      */
-     public function getIncludeInMenu();
- 
-     /**
-+     * Set category is included in menu.
-+     *
-      * @param bool $includeInMenu
-      * @return $this
-      */
-diff --git a/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php
-index 4cdb2631ede..45b070d2706 100644
---- a/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php
-+++ b/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php
-@@ -92,6 +92,7 @@ interface ImageInterface extends ExtensibleDataInterface
- 
-     /**
-      * Retrieve image label
-+     *
-      * Image label is short description of this image
-      *
-      * @return string
-@@ -111,7 +112,7 @@ interface ImageInterface extends ExtensibleDataInterface
-     /**
-      * Retrieve resize width
-      *
--     * This width is image dimension, which represents the width, that can be used for perfomance improvements
-+     * This width is image dimension, which represents the width, that can be used for performance improvements
-      *
-      * @return float
-      * @since 101.1.0
-@@ -128,6 +129,8 @@ interface ImageInterface extends ExtensibleDataInterface
-     public function setResizedWidth($width);
- 
-     /**
-+     * Set resized height
-+     *
-      * @param string $height
-      * @return void
-      * @since 101.1.0
-diff --git a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
-index 2ef4d068317..9768b3c08c8 100644
---- a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
-+++ b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
-@@ -8,6 +8,7 @@ namespace Magento\Catalog\Api\Data\ProductRender;
- 
- /**
-  * Price interface.
-+ *
-  * @api
-  * @since 101.1.0
-  */
-@@ -23,6 +24,7 @@ interface PriceInfoInterface extends \Magento\Framework\Api\ExtensibleDataInterf
- 
-     /**
-      * Set the final price: usually it calculated as minimal price of the product
-+     *
-      * Can be different depends on type of product
-      *
-      * @param float $finalPrice
-@@ -33,6 +35,7 @@ interface PriceInfoInterface extends \Magento\Framework\Api\ExtensibleDataInterf
- 
-     /**
-      * Retrieve max price of a product
-+     *
-      * E.g. for product with custom options is price with the most expensive custom option
-      *
-      * @return float
-@@ -51,6 +54,7 @@ interface PriceInfoInterface extends \Magento\Framework\Api\ExtensibleDataInterf
- 
-     /**
-      * Set max regular price
-+     *
-      * Max regular price is the same, as maximum price, except of excluding calculating special price and catalog rules
-      * in it
-      *
-@@ -105,6 +109,8 @@ interface PriceInfoInterface extends \Magento\Framework\Api\ExtensibleDataInterf
-     public function getSpecialPrice();
- 
-     /**
-+     * Retrieve minimal price
-+     *
-      * @return float
-      * @since 101.1.0
-      */
-@@ -129,6 +135,7 @@ interface PriceInfoInterface extends \Magento\Framework\Api\ExtensibleDataInterf
- 
-     /**
-      * Regular price - is price of product without discounts and special price with taxes and fixed product tax
-+     *
-      * Usually this price is corresponding to price in admin panel of product
-      *
-      * @param float $regularPrice
-@@ -148,7 +155,7 @@ interface PriceInfoInterface extends \Magento\Framework\Api\ExtensibleDataInterf
-     /**
-      * Set dto with formatted prices
-      *
--     * @param string[] $formattedPriceInfo
-+     * @param FormattedPriceInfoInterface $formattedPriceInfo
-      * @return void
-      * @since 101.1.0
-      */
-diff --git a/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
-index 910168d8854..166a1aba76b 100644
---- a/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
-+++ b/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
-@@ -30,7 +30,7 @@ interface ProductRenderInterface extends ExtensibleDataInterface
-     /**
-      * Set information needed for render "Add To Cart" button on front
-      *
--     * @param \Magento\Catalog\Api\Data\ProductRender\ButtonInterface $addToCartData
-+     * @param ButtonInterface $cartAddToCartButton
-      * @return void
-      * @since 101.1.0
-      */
-@@ -47,7 +47,7 @@ interface ProductRenderInterface extends ExtensibleDataInterface
-     /**
-      * Set information needed for render "Add To Compare" button on front
-      *
--     * @param ButtonInterface $compareUrlData
-+     * @param ButtonInterface $compareButton
-      * @return string
-      * @since 101.1.0
-      */
-@@ -55,6 +55,7 @@ interface ProductRenderInterface extends ExtensibleDataInterface
- 
-     /**
-      * Provide information needed for render prices and adjustments for different product types on front
-+     *
-      * Prices are represented in raw format and in current currency
-      *
-      * @return \Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface
-@@ -73,6 +74,7 @@ interface ProductRenderInterface extends ExtensibleDataInterface
- 
-     /**
-      * Provide enough information, that needed to render image on front
-+     *
-      * Images can be separated by image codes
-      *
-      * @return \Magento\Catalog\Api\Data\ProductRender\ImageInterface[]
-@@ -167,6 +169,7 @@ interface ProductRenderInterface extends ExtensibleDataInterface
- 
-     /**
-      * Set information about product saleability (Stock, other conditions)
-+     *
-      * Is used to provide information to frontend JS renders
-      * You can add plugin, in order to hide product on product page or product list on front
-      *
-@@ -178,6 +181,7 @@ interface ProductRenderInterface extends ExtensibleDataInterface
- 
-     /**
-      * Provide information about current store id or requested store id
-+     *
-      * Product should be assigned to provided store id
-      * This setting affect store scope attributes
-      *
-@@ -197,6 +201,7 @@ interface ProductRenderInterface extends ExtensibleDataInterface
- 
-     /**
-      * Provide current or desired currency code to product
-+     *
-      * This setting affect formatted prices*
-      *
-      * @return string
-diff --git a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
-index f79efa4c814..954acd35a07 100644
---- a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
-+++ b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
-@@ -4,18 +4,22 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Catalog\Api;
- 
- /**
-- * Interface which provides product renders information for products
-+ * Interface which provides product renders information for products.
-+ *
-  * @api
-  * @since 101.1.0
-  */
- interface ProductRenderListInterface
- {
-     /**
--     * Collect and retrieve the list of product render info
--     * This info contains raw prices and formated prices, product name, stock status, store_id, etc
-+     * Collect and retrieve the list of product render info.
-+     *
-+     * This info contains raw prices and formatted prices, product name, stock status, store_id, etc.
-+     *
-      * @see \Magento\Catalog\Api\Data\ProductRenderInfoDtoInterface
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
-index 33167987462..ffb648cdf43 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
-@@ -67,6 +67,8 @@ class AbstractCategory extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get category id
-+     *
-      * @return int|string|null
-      */
-     public function getCategoryId()
-@@ -78,6 +80,8 @@ class AbstractCategory extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get category name
-+     *
-      * @return string
-      */
-     public function getCategoryName()
-@@ -86,6 +90,8 @@ class AbstractCategory extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get category path
-+     *
-      * @return mixed
-      */
-     public function getCategoryPath()
-@@ -97,6 +103,8 @@ class AbstractCategory extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Check store root category
-+     *
-      * @return bool
-      */
-     public function hasStoreRootCategory()
-@@ -109,6 +117,8 @@ class AbstractCategory extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get store from request
-+     *
-      * @return Store
-      */
-     public function getStore()
-@@ -118,6 +128,8 @@ class AbstractCategory extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get root category for tree
-+     *
-      * @param mixed|null $parentNodeCategory
-      * @param int $recursionLevel
-      * @return Node|array|null
-@@ -149,10 +161,11 @@ class AbstractCategory extends \Magento\Backend\Block\Template
- 
-             $root = $tree->getNodeById($rootId);
- 
--            if ($root && $rootId != \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
-+            if ($root) {
-                 $root->setIsVisible(true);
--            } elseif ($root && $root->getId() == \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
--                $root->setName(__('Root'));
-+                if ($root->getId() == \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
-+                    $root->setName(__('Root'));
-+                }
-             }
- 
-             $this->_coreRegistry->register('root', $root);
-@@ -162,6 +175,8 @@ class AbstractCategory extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get Default Store Id
-+     *
-      * @return int
-      */
-     protected function _getDefaultStoreId()
-@@ -170,6 +185,8 @@ class AbstractCategory extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get category collection
-+     *
-      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-      */
-     public function getCategoryCollection()
-@@ -227,6 +244,8 @@ class AbstractCategory extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get category node for tree
-+     *
-      * @param mixed $parentNodeCategory
-      * @param int $recursionLevel
-      * @return Node
-@@ -249,6 +268,8 @@ class AbstractCategory extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get category save url
-+     *
-      * @param array $args
-      * @return string
-      */
-@@ -260,6 +281,8 @@ class AbstractCategory extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get category edit url
-+     *
-      * @return string
-      */
-     public function getEditUrl()
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
-index 20411a4c4d7..2eef1188e39 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
-@@ -27,7 +27,8 @@ class DeleteButton extends AbstractCategory implements ButtonProviderInterface
-             return [
-                 'id' => 'delete',
-                 'label' => __('Delete'),
--                'on_click' => "categoryDelete('" . $this->getDeleteUrl() . "')",
-+                'on_click' => "deleteConfirm('" .__('Are you sure you want to delete this category?') ."', '"
-+                    . $this->getDeleteUrl() . "', {data: {}})",
-                 'class' => 'delete',
-                 'sort_order' => 10
-             ];
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
-index b77a5e2e952..3266922d116 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
-@@ -11,6 +11,9 @@
-  */
- namespace Magento\Catalog\Block\Adminhtml\Category\Helper;
- 
-+/**
-+ * Pricestep Helper
-+ */
- class Pricestep extends \Magento\Framework\Data\Form\Element\Text
- {
-     /**
-@@ -40,7 +43,7 @@ class Pricestep extends \Magento\Framework\Data\Form\Element\Text
-             $disabled = true;
-         }
- 
--        parent::addClass('validate-number validate-number-range number-range-0.01-1000000000');
-+        parent::addClass('validate-number validate-number-range number-range-0.01-9999999999999999');
-         $html = parent::getElementHtml();
-         $htmlId = 'use_config_' . $this->getHtmlId();
-         $html .= '<br/><input id="' . $htmlId . '" name="use_config[]" value="' . $this->getId() . '"';
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
-index a67f55235b6..9a4a9fa7680 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
-@@ -71,7 +71,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
--     * @return void
-+     * @inheritdoc
-      */
-     protected function _construct()
-     {
-@@ -80,7 +80,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
--     * @return $this
-+     * @inheritdoc
-      */
-     protected function _prepareLayout()
-     {
-@@ -182,6 +182,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
-+     * Get add root button html
-+     *
-      * @return string
-      */
-     public function getAddRootButtonHtml()
-@@ -190,6 +192,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
-+     * Get add sub button html
-+     *
-      * @return string
-      */
-     public function getAddSubButtonHtml()
-@@ -198,6 +202,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
-+     * Get expand button html
-+     *
-      * @return string
-      */
-     public function getExpandButtonHtml()
-@@ -206,6 +212,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
-+     * Get collapse button html
-+     *
-      * @return string
-      */
-     public function getCollapseButtonHtml()
-@@ -214,6 +222,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
-+     * Get store switcher
-+     *
-      * @return string
-      */
-     public function getStoreSwitcherHtml()
-@@ -222,6 +232,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
-+     * Get loader tree url
-+     *
-      * @param bool|null $expanded
-      * @return string
-      */
-@@ -235,14 +247,18 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
-+     * Get nodes url
-+     *
-      * @return string
-      */
-     public function getNodesUrl()
-     {
--        return $this->getUrl('catalog/category/jsonTree');
-+        return $this->getUrl('catalog/category/tree');
-     }
- 
-     /**
-+     * Get switcher tree url
-+     *
-      * @return string
-      */
-     public function getSwitchTreeUrl()
-@@ -254,6 +270,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
-+     * Get is was expanded
-+     *
-      * @return bool
-      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-      */
-@@ -263,6 +281,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
-+     * Get move url
-+     *
-      * @return string
-      */
-     public function getMoveUrl()
-@@ -271,6 +291,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
-+     * Get tree
-+     *
-      * @param mixed|null $parenNodeCategory
-      * @return array
-      */
-@@ -282,6 +304,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
-+     * Get tree json
-+     *
-      * @param mixed|null $parenNodeCategory
-      * @return string
-      */
-@@ -367,7 +391,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-             }
-         }
- 
--        if ($isParent || $node->getLevel() < 2) {
-+        if ($isParent || $node->getLevel() < 1) {
-             $item['expanded'] = true;
-         }
- 
-@@ -390,6 +414,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
-+     * Is category movable
-+     *
-      * @param Node|array $node
-      * @return bool
-      */
-@@ -403,6 +429,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
-     }
- 
-     /**
-+     * Is parent selected category
-+     *
-      * @param Node|array $node
-      * @return bool
-      */
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
-index ad6df27b893..8f1d1dcf7ee 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
-@@ -4,13 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
-+namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset;
-+
- /**
-  * Catalog fieldset element renderer
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
--namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset;
--
- class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element
- {
-     /**
-@@ -29,7 +29,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
-     }
- 
-     /**
--     * Retireve associated with element attribute object
-+     * Retrieve associated with element attribute object
-      *
-      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
-      */
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
-index 62c27a42141..a829c058d89 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
-@@ -11,6 +11,9 @@
-  */
- namespace Magento\Catalog\Block\Adminhtml\Helper\Form;
- 
-+/**
-+ * Wysiwyg helper.
-+ */
- class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
- {
-     /**
-@@ -23,7 +26,7 @@ class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
-     /**
-      * Catalog data
-      *
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $_moduleManager = null;
- 
-@@ -43,7 +46,7 @@ class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
-      * @param \Magento\Framework\Escaper $escaper
-      * @param \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig
-      * @param \Magento\Framework\View\LayoutInterface $layout
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Backend\Helper\Data $backendData
-      * @param array $data
-      */
-@@ -53,7 +56,7 @@ class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
-         \Magento\Framework\Escaper $escaper,
-         \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig,
-         \Magento\Framework\View\LayoutInterface $layout,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Backend\Helper\Data $backendData,
-         array $data = []
-     ) {
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
-index dd09e40ac5b..1b675696866 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
-@@ -4,11 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Product attribute add/edit form main tab
-- *
-- * @author     Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
- 
- use Magento\Backend\Block\Widget\Form\Generic;
-@@ -18,6 +13,8 @@ use Magento\Eav\Helper\Data;
- use Magento\Framework\App\ObjectManager;
- 
- /**
-+ * Product attribute add/edit form main tab
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -73,6 +70,7 @@ class Advanced extends Generic
-      * Adding product form elements for editing attribute
-      *
-      * @return $this
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      * @SuppressWarnings(PHPMD)
-      */
-     protected function _prepareForm()
-@@ -255,7 +253,7 @@ class Advanced extends Generic
-     }
- 
-     /**
--     * Initialize form fileds values
-+     * Initialize form fields values
-      *
-      * @return $this
-      */
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
-index 1b188de4071..3b9036c1fbb 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
-@@ -6,13 +6,13 @@
- namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set;
- 
- /**
-- * Adminhtml Catalog Attribute Set Main Block
-- *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
- use Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapperInterface;
- 
- /**
-+ * Adminhtml Catalog Attribute Set Main Block.
-+ *
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @since 100.0.2
-@@ -140,7 +140,7 @@ class Main extends \Magento\Backend\Block\Template
-                     ) . '\', \'' . $this->getUrl(
-                         'catalog/*/delete',
-                         ['id' => $setId]
--                    ) . '\')',
-+                    ) . '\',{data: {}})',
-                     'class' => 'delete'
-                 ]
-             );
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php
-index ee92fd7c19b..26ffc6e0df3 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php
-@@ -11,6 +11,9 @@ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main;
- 
- use Magento\Backend\Block\Widget\Form;
- 
-+/**
-+ * Form group for attribute set
-+ */
- class Formgroup extends \Magento\Backend\Block\Widget\Form\Generic
- {
-     /**
-@@ -37,6 +40,8 @@ class Formgroup extends \Magento\Backend\Block\Widget\Form\Generic
-     }
- 
-     /**
-+     * Prepare form elements
-+     *
-      * @return void
-      */
-     protected function _prepareForm()
-@@ -77,13 +82,15 @@ class Formgroup extends \Magento\Backend\Block\Widget\Form\Generic
-     }
- 
-     /**
-+     * Returns set id
-+     *
-      * @return int
-      */
-     protected function _getSetId()
-     {
--        return intval(
-+        return (int)(
-             $this->getRequest()->getParam('id')
--        ) > 0 ? intval(
-+        ) > 0 ? (int)(
-             $this->getRequest()->getParam('id')
-         ) : $this->_typeFactory->create()->load(
-             $this->_coreRegistry->registry('entityType')
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
-index 285caa974fd..e6afc41ebeb 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
-@@ -12,8 +12,18 @@
-  */
- namespace Magento\Catalog\Block\Adminhtml\Product;
- 
-+use Magento\Framework\Escaper;
-+
-+/**
-+ * Class Edit
-+ */
- class Edit extends \Magento\Backend\Block\Widget
- {
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * @var string
-      */
-@@ -47,6 +57,7 @@ class Edit extends \Magento\Backend\Block\Widget
-      * @param \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory
-      * @param \Magento\Framework\Registry $registry
-      * @param \Magento\Catalog\Helper\Product $productHelper
-+     * @param Escaper $escaper
-      * @param array $data
-      */
-     public function __construct(
-@@ -55,16 +66,20 @@ class Edit extends \Magento\Backend\Block\Widget
-         \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory,
-         \Magento\Framework\Registry $registry,
-         \Magento\Catalog\Helper\Product $productHelper,
-+        Escaper $escaper,
-         array $data = []
-     ) {
-         $this->_productHelper = $productHelper;
-         $this->_attributeSetFactory = $attributeSetFactory;
-         $this->_coreRegistry = $registry;
-         $this->jsonEncoder = $jsonEncoder;
-+        $this->escaper = $escaper;
-         parent::__construct($context, $data);
-     }
- 
-     /**
-+     * Edit Product constructor
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -144,6 +159,8 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Retrieve back button html
-+     *
-      * @return string
-      */
-     public function getBackButtonHtml()
-@@ -152,6 +169,8 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Retrieve cancel button html
-+     *
-      * @return string
-      */
-     public function getCancelButtonHtml()
-@@ -160,6 +179,8 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Retrieve save button html
-+     *
-      * @return string
-      */
-     public function getSaveButtonHtml()
-@@ -168,6 +189,8 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Retrieve save and edit button html
-+     *
-      * @return string
-      */
-     public function getSaveAndEditButtonHtml()
-@@ -176,6 +199,8 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Retrieve delete button html
-+     *
-      * @return string
-      */
-     public function getDeleteButtonHtml()
-@@ -194,6 +219,8 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Retrieve validation url
-+     *
-      * @return string
-      */
-     public function getValidationUrl()
-@@ -202,6 +229,8 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Retrieve save url
-+     *
-      * @return string
-      */
-     public function getSaveUrl()
-@@ -210,6 +239,8 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Retrieve save and continue url
-+     *
-      * @return string
-      */
-     public function getSaveAndContinueUrl()
-@@ -221,6 +252,8 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Retrieve product id
-+     *
-      * @return mixed
-      */
-     public function getProductId()
-@@ -229,6 +262,8 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Retrieve product set id
-+     *
-      * @return mixed
-      */
-     public function getProductSetId()
-@@ -241,6 +276,8 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Retrieve duplicate url
-+     *
-      * @return string
-      */
-     public function getDuplicateUrl()
-@@ -249,6 +286,8 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Retrieve product header
-+     *
-      * @deprecated 101.1.0
-      * @return string
-      */
-@@ -263,6 +302,8 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get product attribute set name
-+     *
-      * @return string
-      */
-     public function getAttributeSetName()
-@@ -275,11 +316,14 @@ class Edit extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Retrieve id of selected tab
-+     *
-      * @return string
-      */
-     public function getSelectedTabId()
-     {
--        return addslashes(htmlspecialchars($this->getRequest()->getParam('tab')));
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+        return addslashes($this->escaper->escapeHtml($this->getRequest()->getParam('tab')));
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
-index 4310f61c571..2df0ff0b6cd 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
-@@ -9,13 +9,18 @@
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab;
- 
- use Magento\Framework\Data\Form\Element\AbstractElement;
- 
- /**
-+ * Attributes tab block
-+ *
-  * @api
-  * @SuppressWarnings(PHPMD.DepthOfInheritance)
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @since 100.0.2
-  */
- class Attributes extends \Magento\Catalog\Block\Adminhtml\Form implements
-@@ -31,6 +36,9 @@ class Attributes extends \Magento\Catalog\Block\Adminhtml\Form implements
-      */
-     protected $_attributeAction;
- 
-+    /** @var array */
-+    private $excludeFields;
-+
-     /**
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -38,6 +46,7 @@ class Attributes extends \Magento\Catalog\Block\Adminhtml\Form implements
-      * @param \Magento\Catalog\Model\ProductFactory $productFactory
-      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeAction
-      * @param array $data
-+     * @param array|null $excludeFields
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-@@ -45,37 +54,25 @@ class Attributes extends \Magento\Catalog\Block\Adminhtml\Form implements
-         \Magento\Framework\Data\FormFactory $formFactory,
-         \Magento\Catalog\Model\ProductFactory $productFactory,
-         \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeAction,
--        array $data = []
-+        array $data = [],
-+        array $excludeFields = null
-     ) {
-         $this->_attributeAction = $attributeAction;
-         $this->_productFactory = $productFactory;
--        parent::__construct($context, $registry, $formFactory, $data);
--    }
-+        $this->excludeFields = $excludeFields ?: [];
- 
--    /**
--     * @return void
--     */
--    protected function _construct()
--    {
--        parent::_construct();
--        $this->setShowGlobalIcon(true);
-+        parent::__construct($context, $registry, $formFactory, $data);
-     }
- 
-     /**
-+     * Prepares form
-+     *
-      * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
--    protected function _prepareForm()
-+    protected function _prepareForm(): void
-     {
--        $this->setFormExcludedFieldList(
--            [
--                'category_ids',
--                'gallery',
--                'image',
--                'media_gallery',
--                'quantity_and_stock_status',
--                'tier_price',
--            ]
--        );
-+        $this->setFormExcludedFieldList($this->getExcludedFields());
-         $this->_eventManager->dispatch(
-             'adminhtml_catalog_product_form_prepare_excluded_field_list',
-             ['object' => $this]
-@@ -149,12 +146,14 @@ HTML;
-     weightHandle.hideWeightSwitcher();
- });</script>
- HTML;
--        // @codingStandardsIgnoreEnd
-+            // @codingStandardsIgnoreEnd
-         }
-         return $html;
-     }
- 
-     /**
-+     * Returns tab label
-+     *
-      * @return \Magento\Framework\Phrase
-      */
-     public function getTabLabel()
-@@ -163,6 +162,8 @@ HTML;
-     }
- 
-     /**
-+     * Return Tab title
-+     *
-      * @return \Magento\Framework\Phrase
-      */
-     public function getTabTitle()
-@@ -171,6 +172,8 @@ HTML;
-     }
- 
-     /**
-+     * Can show tab in tabs
-+     *
-      * @return bool
-      */
-     public function canShowTab()
-@@ -179,10 +182,22 @@ HTML;
-     }
- 
-     /**
-+     * Tab not hidden
-+     *
-      * @return bool
-      */
-     public function isHidden()
-     {
-         return false;
-     }
-+
-+    /**
-+     * Returns excluded fields
-+     *
-+     * @return array
-+     */
-+    private function getExcludedFields(): array
-+    {
-+        return $this->excludeFields;
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
-index 750bf6f8a02..964872b6e51 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
-@@ -70,11 +70,11 @@ class Inventory extends \Magento\Backend\Block\Widget implements \Magento\Backen
-      * Retrieve current store id
-      *
-      * @return int
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     public function getStoreId()
-     {
--        $storeId = $this->getRequest()->getParam('store');
--        return intval($storeId);
-+        return (int)$this->getRequest()->getParam('store');
-     }
- 
-     /**
-@@ -99,6 +99,8 @@ class Inventory extends \Magento\Backend\Block\Widget implements \Magento\Backen
-     }
- 
-     /**
-+     * Return Tab title.
-+     *
-      * @return \Magento\Framework\Phrase
-      */
-     public function getTabTitle()
-@@ -107,7 +109,7 @@ class Inventory extends \Magento\Backend\Block\Widget implements \Magento\Backen
-     }
- 
-     /**
--     * @return bool
-+     * @inheritdoc
-      */
-     public function canShowTab()
-     {
-@@ -115,7 +117,7 @@ class Inventory extends \Magento\Backend\Block\Widget implements \Magento\Backen
-     }
- 
-     /**
--     * @return bool
-+     * @inheritdoc
-      */
-     public function isHidden()
-     {
-@@ -123,6 +125,8 @@ class Inventory extends \Magento\Backend\Block\Widget implements \Magento\Backen
-     }
- 
-     /**
-+     * Get availability status.
-+     *
-      * @param string $fieldName
-      * @return bool
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
-index 3467c7aac28..d95ee7f8f2c 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
-@@ -11,6 +11,9 @@
-  */
- namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
- 
-+/**
-+ * Admin AttributeSet block
-+ */
- class AttributeSet extends \Magento\Backend\Block\Widget\Form
- {
-     /**
-@@ -42,12 +45,14 @@ class AttributeSet extends \Magento\Backend\Block\Widget\Form
-     public function getSelectorOptions()
-     {
-         return [
--            'source' => $this->getUrl('catalog/product/suggestAttributeSets'),
-+            'source' => $this->escapeUrl($this->getUrl('catalog/product/suggestAttributeSets')),
-             'className' => 'category-select',
-             'showRecent' => true,
-             'storageKey' => 'product-template-key',
-             'minLength' => 0,
--            'currentlySelected' => $this->_coreRegistry->registry('product')->getAttributeSetId()
-+            'currentlySelected' => $this->escapeHtml(
-+                $this->_coreRegistry->registry('product')->getAttributeSetId()
-+            )
-         ];
-     }
- }
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
-index 3b4a5f9eabf..e754ab97005 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
-@@ -19,7 +19,7 @@ class Price extends Extended
-     /**
-      * Catalog data
-      *
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-@@ -32,14 +32,14 @@ class Price extends Extended
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Backend\Helper\Data $backendHelper
-      * @param \Magento\ProductAlert\Model\PriceFactory $priceFactory
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param array $data
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-         \Magento\Backend\Helper\Data $backendHelper,
-         \Magento\ProductAlert\Model\PriceFactory $priceFactory,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         array $data = []
-     ) {
-         $this->_priceFactory = $priceFactory;
-@@ -48,6 +48,8 @@ class Price extends Extended
-     }
- 
-     /**
-+     * Construct.
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -63,6 +65,8 @@ class Price extends Extended
-     }
- 
-     /**
-+     * @inheritDoc
-+     *
-      * @return Grid
-      */
-     protected function _prepareCollection()
-@@ -80,6 +84,8 @@ class Price extends Extended
-     }
- 
-     /**
-+     * @inheritDoc
-+     *
-      * @return $this
-      */
-     protected function _prepareColumns()
-@@ -116,6 +122,8 @@ class Price extends Extended
-     }
- 
-     /**
-+     * @inheritDoc
-+     *
-      * @return string
-      */
-     public function getGridUrl()
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
-index d572690143c..2c6647fd57b 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
-@@ -19,7 +19,7 @@ class Stock extends Extended
-     /**
-      * Catalog data
-      *
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-@@ -32,14 +32,14 @@ class Stock extends Extended
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Backend\Helper\Data $backendHelper
-      * @param \Magento\ProductAlert\Model\StockFactory $stockFactory
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param array $data
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-         \Magento\Backend\Helper\Data $backendHelper,
-         \Magento\ProductAlert\Model\StockFactory $stockFactory,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         array $data = []
-     ) {
-         $this->_stockFactory = $stockFactory;
-@@ -48,6 +48,8 @@ class Stock extends Extended
-     }
- 
-     /**
-+     * Construct.
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -63,6 +65,8 @@ class Stock extends Extended
-     }
- 
-     /**
-+     * @inheritDoc
-+     *
-      * @return Grid
-      */
-     protected function _prepareCollection()
-@@ -80,6 +84,8 @@ class Stock extends Extended
-     }
- 
-     /**
-+     * @inheritDoc
-+     *
-      * @return $this
-      */
-     protected function _prepareColumns()
-@@ -103,6 +109,8 @@ class Stock extends Extended
-     }
- 
-     /**
-+     * Get grid url.
-+     *
-      * @return string
-      */
-     public function getGridUrl()
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
-index e1b97f996c7..42463354926 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
-@@ -11,6 +11,9 @@
-  */
- namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes;
- 
-+/**
-+ * Admin product attribute search block
-+ */
- class Search extends \Magento\Backend\Block\Widget
- {
-     /**
-@@ -62,13 +65,15 @@ class Search extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get selector options
-+     *
-      * @return array
-      */
-     public function getSelectorOptions()
-     {
-         $templateId = $this->_coreRegistry->registry('product')->getAttributeSetId();
-         return [
--            'source' => $this->getUrl('catalog/product/suggestAttributes'),
-+            'source' => $this->escapeUrl($this->getUrl('catalog/product/suggestAttributes')),
-             'minLength' => 0,
-             'ajaxOptions' => ['data' => ['template_id' => $templateId]],
-             'template' => '[data-template-for="product-attribute-search-' . $this->getGroupId() . '"]',
-@@ -110,6 +115,8 @@ class Search extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get add attribute url
-+     *
-      * @return string
-      */
-     public function getAddAttributeUrl()
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
-index e4f700e5790..e5ce59c550a 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
-@@ -10,9 +10,13 @@ use Magento\Backend\Block\Widget\Grid\Extended;
- use Magento\Catalog\Model\Product;
- 
- /**
-+ * Crossel product edit tab
-+ *
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @since 100.0.2
-+ * @deprecated Not used since cross-sell products grid moved to UI components.
-+ * @see \Magento\Catalog\Ui\DataProvider\Product\Related\CrossSellDataProvider
-  */
- class Crosssell extends Extended
- {
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
-index 20e12889cae..9278b84362e 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
-@@ -18,7 +18,7 @@ class Inventory extends \Magento\Backend\Block\Widget
-     protected $_template = 'Magento_Catalog::catalog/product/tab/inventory.phtml';
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-@@ -53,7 +53,7 @@ class Inventory extends \Magento\Backend\Block\Widget
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\CatalogInventory\Model\Source\Backorders $backorders
-      * @param \Magento\CatalogInventory\Model\Source\Stock $stock
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Framework\Registry $coreRegistry
-      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
-      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
-@@ -63,7 +63,7 @@ class Inventory extends \Magento\Backend\Block\Widget
-         \Magento\Backend\Block\Template\Context $context,
-         \Magento\CatalogInventory\Model\Source\Backorders $backorders,
-         \Magento\CatalogInventory\Model\Source\Stock $stock,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Framework\Registry $coreRegistry,
-         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
-         \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
-@@ -79,6 +79,8 @@ class Inventory extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get backorder option.
-+     *
-      * @return array
-      */
-     public function getBackordersOption()
-@@ -128,6 +130,8 @@ class Inventory extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get field value.
-+     *
-      * @param string $field
-      * @return string|null
-      */
-@@ -145,6 +149,8 @@ class Inventory extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get config field value.
-+     *
-      * @param string $field
-      * @return string|null
-      */
-@@ -163,6 +169,8 @@ class Inventory extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get default config value.
-+     *
-      * @param string $field
-      * @return string|null
-      */
-@@ -182,6 +190,8 @@ class Inventory extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Is new.
-+     *
-      * @return bool
-      */
-     public function isNew()
-@@ -193,6 +203,8 @@ class Inventory extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Get field suffix.
-+     *
-      * @return string
-      */
-     public function getFieldSuffix()
-@@ -221,6 +233,8 @@ class Inventory extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Is single store mode enabled.
-+     *
-      * @return bool
-      */
-     public function isSingleStoreMode()
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
-index 5ffd3d1dda3..42990116e93 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
-@@ -41,7 +41,7 @@ abstract class AbstractGroup extends Widget implements RendererInterface
-     /**
-      * Catalog data
-      *
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-@@ -81,7 +81,7 @@ abstract class AbstractGroup extends Widget implements RendererInterface
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param GroupRepositoryInterface $groupRepository
-      * @param \Magento\Directory\Helper\Data $directoryHelper
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Framework\Registry $registry
-      * @param GroupManagementInterface $groupManagement
-      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
-@@ -92,7 +92,7 @@ abstract class AbstractGroup extends Widget implements RendererInterface
-         \Magento\Backend\Block\Template\Context $context,
-         GroupRepositoryInterface $groupRepository,
-         \Magento\Directory\Helper\Data $directoryHelper,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Framework\Registry $registry,
-         GroupManagementInterface $groupManagement,
-         \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
-index 0c59a7402da..23b927598e8 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
-@@ -9,8 +9,12 @@ use Magento\Backend\Block\Widget\Grid\Column;
- use Magento\Backend\Block\Widget\Grid\Extended;
- 
- /**
-+ * Related product edit tab
-+ *
-  * @api
-  * @since 100.0.2
-+ * @deprecated Not used since related products grid moved to UI components.
-+ * @see \Magento\Catalog\Ui\DataProvider\Product\Related\RelatedDataProvider
-  */
- class Related extends Extended
- {
-@@ -318,7 +322,7 @@ class Related extends Extended
-     }
- 
-     /**
--     * Rerieve grid URL
-+     * Retrieve grid URL
-      *
-      * @return string
-      */
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
-index 323b1785bc9..41ad72ca39e 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
-@@ -6,8 +6,12 @@
- namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
- 
- /**
-+ * Upsell product edit tab
-+ *
-  * @api
-  * @since 100.0.2
-+ * @deprecated Not used since upsell products grid moved to UI components.
-+ * @see \Magento\Catalog\Ui\DataProvider\Product\Related\CrossSellDataProvider
-  */
- class Upsell extends \Magento\Backend\Block\Widget\Grid\Extended
- {
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
-index 04c3a208b97..51c326763b0 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
-@@ -8,13 +8,13 @@ namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
- 
- use Magento\Backend\Block\Template\Context;
- use Magento\Backend\Block\Widget\Accordion;
--use Magento\Backend\Block\Widget\Tabs as WigetTabs;
-+use Magento\Backend\Block\Widget\Tabs as WidgetTabs;
- use Magento\Backend\Model\Auth\Session;
- use Magento\Catalog\Helper\Catalog;
- use Magento\Catalog\Helper\Data;
- use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
- use Magento\Framework\Json\EncoderInterface;
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\Framework\Registry;
- use Magento\Framework\Translate\InlineInterface;
- 
-@@ -22,7 +22,7 @@ use Magento\Framework\Translate\InlineInterface;
-  * Admin product edit tabs
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Tabs extends WigetTabs
-+class Tabs extends WidgetTabs
- {
-     const BASIC_TAB_GROUP_CODE = 'basic';
- 
-@@ -65,7 +65,7 @@ class Tabs extends WigetTabs
-     protected $_collectionFactory;
- 
-     /**
--     * @var Manager
-+     * @var ModuleManagerInterface
-      */
-     protected $_moduleManager;
- 
-@@ -78,7 +78,7 @@ class Tabs extends WigetTabs
-      * @param Context $context
-      * @param EncoderInterface $jsonEncoder
-      * @param Session $authSession
--     * @param Manager $moduleManager
-+     * @param ModuleManagerInterface $moduleManager
-      * @param CollectionFactory $collectionFactory
-      * @param Catalog $helperCatalog
-      * @param Data $catalogData
-@@ -91,7 +91,7 @@ class Tabs extends WigetTabs
-         Context $context,
-         EncoderInterface $jsonEncoder,
-         Session $authSession,
--        Manager $moduleManager,
-+        ModuleManagerInterface $moduleManager,
-         CollectionFactory $collectionFactory,
-         Catalog $helperCatalog,
-         Data $catalogData,
-@@ -109,7 +109,7 @@ class Tabs extends WigetTabs
-     }
- 
-     /**
--     * @return void
-+     * @inheritdoc
-      */
-     protected function _construct()
-     {
-@@ -119,6 +119,8 @@ class Tabs extends WigetTabs
-     }
- 
-     /**
-+     * Get group collection.
-+     *
-      * @param int $attributeSetId
-      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection
-      */
-@@ -131,10 +133,11 @@ class Tabs extends WigetTabs
-     }
- 
-     /**
--     * @return $this
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.NPathComplexity)
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     protected function _prepareLayout()
-     {
-@@ -315,6 +318,8 @@ class Tabs extends WigetTabs
-     }
- 
-     /**
-+     * Set attribute tab block.
-+     *
-      * @param string $attributeTabBlock
-      * @return $this
-      */
-@@ -337,6 +342,8 @@ class Tabs extends WigetTabs
-     }
- 
-     /**
-+     * Get accordion.
-+     *
-      * @param string $parentTab
-      * @return string
-      */
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
-index 1f74969c3d1..7f80aece60e 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
-@@ -4,15 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
-+namespace Magento\Catalog\Block\Adminhtml\Product\Frontend\Product;
-+
-+use Magento\Framework\Data\Form\Element\AbstractElement;
-+
- /**
-  * Fieldset config form element renderer
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
--namespace Magento\Catalog\Block\Adminhtml\Product\Frontend\Product;
--
--use Magento\Framework\Data\Form\Element\AbstractElement;
--
- class Watermark extends \Magento\Backend\Block\AbstractBlock implements
-     \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
- {
-@@ -60,6 +60,8 @@ class Watermark extends \Magento\Backend\Block\AbstractBlock implements
-     }
- 
-     /**
-+     * Render form element as HTML
-+     *
-      * @param AbstractElement $element
-      * @return string
-      */
-@@ -124,13 +126,14 @@ class Watermark extends \Magento\Backend\Block\AbstractBlock implements
-     }
- 
-     /**
-+     * Get header html for render
-+     *
-      * @param AbstractElement $element
-      * @return string
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      */
-     protected function _getHeaderHtml($element)
-     {
--        $id = $element->getHtmlId();
-         $default = !$this->getRequest()->getParam('website') && !$this->getRequest()->getParam('store');
- 
-         $html = '<h4 class="icon-head head-edit-form">' . $element->getLegend() . '</h4>';
-@@ -148,6 +151,8 @@ class Watermark extends \Magento\Backend\Block\AbstractBlock implements
-     }
- 
-     /**
-+     * Get footer html for render
-+     *
-      * @param AbstractElement $element
-      * @return string
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
-index 8f3a0793cc4..7e43f2fc064 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
-@@ -8,13 +8,15 @@ namespace Magento\Catalog\Block\Adminhtml\Product;
- use Magento\Store\Model\Store;
- 
- /**
-+ * Catalog product grid
-+ *
-  * @api
-  * @since 100.0.2
-  */
- class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
- {
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-@@ -57,7 +59,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-      * @param \Magento\Catalog\Model\Product\Type $type
-      * @param \Magento\Catalog\Model\Product\Attribute\Source\Status $status
-      * @param \Magento\Catalog\Model\Product\Visibility $visibility
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param array $data
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-@@ -71,7 +73,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-         \Magento\Catalog\Model\Product\Type $type,
-         \Magento\Catalog\Model\Product\Attribute\Source\Status $status,
-         \Magento\Catalog\Model\Product\Visibility $visibility,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         array $data = []
-     ) {
-         $this->_websiteFactory = $websiteFactory;
-@@ -85,7 +87,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
--     * @return void
-+     * @inheritDoc
-      */
-     protected function _construct()
-     {
-@@ -99,7 +101,10 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
-+     * Get store.
-+     *
-      * @return Store
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     protected function _getStore()
-     {
-@@ -108,7 +113,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
--     * @return $this
-+     * @inheritDoc
-      */
-     protected function _prepareCollection()
-     {
-@@ -136,7 +141,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-             );
-         }
-         if ($store->getId()) {
--            //$collection->setStoreId($store->getId());
-             $collection->addStoreFilter($store);
-             $collection->joinAttribute(
-                 'name',
-@@ -187,8 +191,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
--     * @param \Magento\Backend\Block\Widget\Grid\Column $column
--     * @return $this
-+     * @inheritDoc
-      */
-     protected function _addColumnFilterToCollection($column)
-     {
-@@ -208,8 +211,9 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
--     * @return $this
-+     * @inheritDoc
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     * @throws \Exception
-      */
-     protected function _prepareColumns()
-     {
-@@ -364,16 +368,11 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-             ]
-         );
- 
--        $block = $this->getLayout()->getBlock('grid.bottom.links');
--        if ($block) {
--            $this->setChild('grid.bottom.links', $block);
--        }
--
-         return parent::_prepareColumns();
-     }
- 
-     /**
--     * @return $this
-+     * @inheritDoc
-      */
-     protected function _prepareMassaction()
-     {
-@@ -425,7 +424,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
--     * @return string
-+     * @inheritDoc
-      */
-     public function getGridUrl()
-     {
-@@ -433,8 +432,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
--     * @param \Magento\Catalog\Model\Product|\Magento\Framework\DataObject $row
--     * @return string
-+     * @inheritDoc
-      */
-     public function getRowUrl($row)
-     {
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
-index 0557a215383..36740f5853d 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
-@@ -11,11 +11,16 @@
-  */
- namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
- 
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\App\Request\DataPersistorInterface;
- use Magento\Framework\Registry;
- use Magento\Catalog\Model\Product;
- use Magento\Eav\Model\Entity\Attribute;
- use Magento\Catalog\Api\Data\ProductInterface;
- 
-+/**
-+ * Adminhtml gallery block
-+ */
- class Gallery extends \Magento\Framework\View\Element\AbstractBlock
- {
-     /**
-@@ -66,27 +71,37 @@ class Gallery extends \Magento\Framework\View\Element\AbstractBlock
-      */
-     protected $registry;
- 
-+    /**
-+     * @var DataPersistorInterface
-+     */
-+    private $dataPersistor;
-+
-     /**
-      * @param \Magento\Framework\View\Element\Context $context
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param Registry $registry
-      * @param \Magento\Framework\Data\Form $form
-      * @param array $data
-+     * @param DataPersistorInterface|null $dataPersistor
-      */
-     public function __construct(
-         \Magento\Framework\View\Element\Context $context,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
-         Registry $registry,
-         \Magento\Framework\Data\Form $form,
--        $data = []
-+        $data = [],
-+        DataPersistorInterface $dataPersistor = null
-     ) {
-         $this->storeManager = $storeManager;
-         $this->registry = $registry;
-         $this->form = $form;
-+        $this->dataPersistor = $dataPersistor ?: ObjectManager::getInstance()->get(DataPersistorInterface::class);
-         parent::__construct($context, $data);
-     }
- 
-     /**
-+     * Returns element html.
-+     *
-      * @return string
-      */
-     public function getElementHtml()
-@@ -102,7 +117,24 @@ class Gallery extends \Magento\Framework\View\Element\AbstractBlock
-      */
-     public function getImages()
-     {
--        return $this->getDataObject()->getData('media_gallery') ?: null;
-+        $images = $this->getDataObject()->getData('media_gallery') ?: null;
-+        if ($images === null) {
-+            $images = ((array)$this->dataPersistor->get('catalog_product'))['product']['media_gallery'] ?? null;
-+        }
-+
-+        return $images;
-+    }
-+
-+    /**
-+     * Get value for given type.
-+     *
-+     * @param string $type
-+     * @return string|null
-+     */
-+    public function getImageValue(string $type)
-+    {
-+        $product = (array)$this->dataPersistor->get('catalog_product');
-+        return $product['product'][$type] ?? null;
-     }
- 
-     /**
-@@ -117,11 +149,13 @@ class Gallery extends \Magento\Framework\View\Element\AbstractBlock
-         $content->setId($this->getHtmlId() . '_content')->setElement($this);
-         $content->setFormName($this->formName);
-         $galleryJs = $content->getJsObjectName();
--        $content->getUploader()->getConfig()->setMegiaGallery($galleryJs);
-+        $content->getUploader()->getConfig()->setMediaGallery($galleryJs);
-         return $content->toHtml();
-     }
- 
-     /**
-+     * Returns html id
-+     *
-      * @return string
-      */
-     protected function getHtmlId()
-@@ -130,6 +164,8 @@ class Gallery extends \Magento\Framework\View\Element\AbstractBlock
-     }
- 
-     /**
-+     * Returns name
-+     *
-      * @return string
-      */
-     public function getName()
-@@ -138,6 +174,8 @@ class Gallery extends \Magento\Framework\View\Element\AbstractBlock
-     }
- 
-     /**
-+     * Returns suffix for field name
-+     *
-      * @return string
-      */
-     public function getFieldNameSuffix()
-@@ -146,6 +184,8 @@ class Gallery extends \Magento\Framework\View\Element\AbstractBlock
-     }
- 
-     /**
-+     * Returns data scope html id
-+     *
-      * @return string
-      */
-     public function getDataScopeHtmlId()
-@@ -230,7 +270,6 @@ class Gallery extends \Magento\Framework\View\Element\AbstractBlock
-     /**
-      * Retrieve attribute field name
-      *
--     *
-      * @param Attribute $attribute
-      * @return string
-      */
-@@ -244,6 +283,8 @@ class Gallery extends \Magento\Framework\View\Element\AbstractBlock
-     }
- 
-     /**
-+     * Returns html content of the block
-+     *
-      * @return string
-      */
-     public function toHtml()
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
-index 8d51f78ff5b..f5d0ec7da61 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
-@@ -13,11 +13,17 @@
-  */
- namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery;
- 
-+use Magento\Framework\App\ObjectManager;
- use Magento\Backend\Block\Media\Uploader;
- use Magento\Framework\View\Element\AbstractBlock;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\Exception\FileSystemException;
-+use Magento\Backend\Block\DataProviders\ImageUploadConfig as ImageUploadConfigDataProvider;
-+use Magento\MediaStorage\Helper\File\Storage\Database;
- 
-+/**
-+ * Block for gallery content.
-+ */
- class Content extends \Magento\Backend\Block\Widget
- {
-     /**
-@@ -40,29 +46,53 @@ class Content extends \Magento\Backend\Block\Widget
-      */
-     private $imageHelper;
- 
-+    /**
-+     * @var ImageUploadConfigDataProvider
-+     */
-+    private $imageUploadConfigDataProvider;
-+
-+    /**
-+     * @var Database
-+     */
-+    private $fileStorageDatabase;
-+
-     /**
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
-      * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
-      * @param array $data
-+     * @param ImageUploadConfigDataProvider $imageUploadConfigDataProvider
-+     * @param Database $fileStorageDatabase
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
-         \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
--        array $data = []
-+        array $data = [],
-+        ImageUploadConfigDataProvider $imageUploadConfigDataProvider = null,
-+        Database $fileStorageDatabase = null
-     ) {
-         $this->_jsonEncoder = $jsonEncoder;
-         $this->_mediaConfig = $mediaConfig;
-         parent::__construct($context, $data);
-+        $this->imageUploadConfigDataProvider = $imageUploadConfigDataProvider
-+            ?: ObjectManager::getInstance()->get(ImageUploadConfigDataProvider::class);
-+        $this->fileStorageDatabase = $fileStorageDatabase
-+            ?: ObjectManager::getInstance()->get(Database::class);
-     }
- 
-     /**
-+     * Prepare layout.
-+     *
-      * @return AbstractBlock
-      */
-     protected function _prepareLayout()
-     {
--        $this->addChild('uploader', \Magento\Backend\Block\Media\Uploader::class);
-+        $this->addChild(
-+            'uploader',
-+            \Magento\Backend\Block\Media\Uploader::class,
-+            ['image_upload_config_data' => $this->imageUploadConfigDataProvider]
-+        );
- 
-         $this->getUploader()->getConfig()->setUrl(
-             $this->_urlBuilder->addSessionParam()->getUrl('catalog/product_gallery/upload')
-@@ -103,6 +133,8 @@ class Content extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Returns js object name
-+     *
-      * @return string
-      */
-     public function getJsObjectName()
-@@ -111,6 +143,8 @@ class Content extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Returns buttons for add image action.
-+     *
-      * @return string
-      */
-     public function getAddImagesButton()
-@@ -124,6 +158,8 @@ class Content extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Returns image json
-+     *
-      * @return string
-      */
-     public function getImagesJson()
-@@ -138,6 +174,13 @@ class Content extends \Magento\Backend\Block\Widget
-             $images = $this->sortImagesByPosition($value['images']);
-             foreach ($images as &$image) {
-                 $image['url'] = $this->_mediaConfig->getMediaUrl($image['file']);
-+                if ($this->fileStorageDatabase->checkDbUsage() &&
-+                    !$mediaDir->isFile($this->_mediaConfig->getMediaPath($image['file']))
-+                ) {
-+                    $this->fileStorageDatabase->saveFileToFilesystem(
-+                        $this->_mediaConfig->getMediaPath($image['file'])
-+                    );
-+                }
-                 try {
-                     $fileHandler = $mediaDir->stat($this->_mediaConfig->getMediaPath($image['file']));
-                     $image['size'] = $fileHandler['size'];
-@@ -161,14 +204,19 @@ class Content extends \Magento\Backend\Block\Widget
-     private function sortImagesByPosition($images)
-     {
-         if (is_array($images)) {
--            usort($images, function ($imageA, $imageB) {
--                return ($imageA['position'] < $imageB['position']) ? -1 : 1;
--            });
-+            usort(
-+                $images,
-+                function ($imageA, $imageB) {
-+                    return ($imageA['position'] < $imageB['position']) ? -1 : 1;
-+                }
-+            );
-         }
-         return $images;
-     }
- 
-     /**
-+     * Returns image values json
-+     *
-      * @return string
-      */
-     public function getImagesValuesJson()
-@@ -193,9 +241,11 @@ class Content extends \Magento\Backend\Block\Widget
-         $imageTypes = [];
-         foreach ($this->getMediaAttributes() as $attribute) {
-             /* @var $attribute \Magento\Eav\Model\Entity\Attribute */
-+            $value = $this->getElement()->getDataObject()->getData($attribute->getAttributeCode())
-+                ?: $this->getElement()->getImageValue($attribute->getAttributeCode());
-             $imageTypes[$attribute->getAttributeCode()] = [
-                 'code' => $attribute->getAttributeCode(),
--                'value' => $this->getElement()->getDataObject()->getData($attribute->getAttributeCode()),
-+                'value' => $value,
-                 'label' => $attribute->getFrontend()->getLabel(),
-                 'scope' => __($this->getElement()->getScopeLabel($attribute)),
-                 'name' => $this->getElement()->getAttributeFieldName($attribute),
-@@ -241,6 +291,8 @@ class Content extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Returns image helper object.
-+     *
-      * @return \Magento\Catalog\Helper\Image
-      * @deprecated 101.0.3
-      */
-diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
-index ac1fd8c692e..c296a5aa0db 100644
---- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
-+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
-@@ -9,6 +9,7 @@ use Magento\Framework\App\Rss\DataProviderInterface;
- 
- /**
-  * Class NotifyStock
-+ *
-  * @package Magento\Catalog\Block\Adminhtml\Rss
-  */
- class NotifyStock extends \Magento\Backend\Block\AbstractBlock implements DataProviderInterface
-@@ -41,7 +42,7 @@ class NotifyStock extends \Magento\Backend\Block\AbstractBlock implements DataPr
-     }
- 
-     /**
--     * @return void
-+     * @inheritdoc
-      */
-     protected function _construct()
-     {
-@@ -50,12 +51,12 @@ class NotifyStock extends \Magento\Backend\Block\AbstractBlock implements DataPr
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getRssData()
-     {
--        $newUrl = $this->rssUrlBuilder->getUrl(['_secure' => true, '_nosecret' => true, 'type' => 'notifystock']);
--        $title = __('Low Stock Products');
-+         $newUrl = $this->rssUrlBuilder->getUrl(['_secure' => true, '_nosecret' => true, 'type' => 'notifystock']);
-+        $title = __('Low Stock Products')->render();
-         $data = ['title' => $title, 'description' => $title, 'link' => $newUrl, 'charset' => 'UTF-8'];
- 
-         foreach ($this->rssModel->getProductsCollection() as $item) {
-@@ -65,7 +66,7 @@ class NotifyStock extends \Magento\Backend\Block\AbstractBlock implements DataPr
-                 ['id' => $item->getId(), '_secure' => true, '_nosecret' => true]
-             );
-             $qty = 1 * $item->getQty();
--            $description = __('%1 has reached a quantity of %2.', $item->getName(), $qty);
-+            $description = __('%1 has reached a quantity of %2.', $item->getName(), $qty)->render();
-             $data['entries'][] = ['title' => $item->getName(), 'link' => $url, 'description' => $description];
-         }
- 
-@@ -73,7 +74,7 @@ class NotifyStock extends \Magento\Backend\Block\AbstractBlock implements DataPr
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCacheLifetime()
-     {
-@@ -81,7 +82,7 @@ class NotifyStock extends \Magento\Backend\Block\AbstractBlock implements DataPr
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isAllowed()
-     {
-@@ -89,7 +90,7 @@ class NotifyStock extends \Magento\Backend\Block\AbstractBlock implements DataPr
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFeeds()
-     {
-@@ -97,7 +98,7 @@ class NotifyStock extends \Magento\Backend\Block\AbstractBlock implements DataPr
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isAuthRequired()
-     {
-diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
-index 4102c82a0a3..c8da0f70f73 100644
---- a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
-+++ b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
-@@ -125,6 +125,7 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
- 
-     /**
-      * Retrieve url for add product to cart
-+     *
-      * Will return product view page URL if product has required options
-      *
-      * @param \Magento\Catalog\Model\Product $product
-@@ -473,7 +474,9 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
--     * @param null $type
-+     * Get the renderer that will be used to render the details block
-+     *
-+     * @param string|null $type
-      * @return bool|\Magento\Framework\View\Element\AbstractBlock
-      */
-     public function getDetailsRenderer($type = null)
-@@ -489,6 +492,8 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Return the list of details
-+     *
-      * @return \Magento\Framework\View\Element\RendererList
-      */
-     protected function getDetailsRendererList()
-diff --git a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
-index 6c54aa4e171..76f5dbd1bea 100644
---- a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
-+++ b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
-@@ -122,12 +122,7 @@ class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
-      */
-     public function getAddToWishlistParams($product)
-     {
--        $continueUrl = $this->urlEncoder->encode($this->getUrl('customer/account'));
--        $urlParamName = Action::PARAM_NAME_URL_ENCODED;
--
--        $continueUrlParams = [$urlParamName => $continueUrl];
--
--        return $this->_wishlistHelper->getAddParams($product, $continueUrlParams);
-+        return $this->_wishlistHelper->getAddParams($product);
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Block/Product/Gallery.php b/app/code/Magento/Catalog/Block/Product/Gallery.php
-index e7c7b81ec29..54f848a92e9 100644
---- a/app/code/Magento/Catalog/Block/Product/Gallery.php
-+++ b/app/code/Magento/Catalog/Block/Product/Gallery.php
-@@ -16,6 +16,8 @@ use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\Data\Collection;
- 
- /**
-+ * Product gallery block
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -43,6 +45,8 @@ class Gallery extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Prepare layout
-+     *
-      * @return $this
-      */
-     protected function _prepareLayout()
-@@ -52,6 +56,8 @@ class Gallery extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get product
-+     *
-      * @return Product
-      */
-     public function getProduct()
-@@ -60,6 +66,8 @@ class Gallery extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get gallery collection
-+     *
-      * @return Collection
-      */
-     public function getGalleryCollection()
-@@ -68,6 +76,8 @@ class Gallery extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get current image
-+     *
-      * @return Image|null
-      */
-     public function getCurrentImage()
-@@ -85,6 +95,8 @@ class Gallery extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get image url
-+     *
-      * @return string
-      */
-     public function getImageUrl()
-@@ -93,6 +105,8 @@ class Gallery extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get image file
-+     *
-      * @return mixed
-      */
-     public function getImageFile()
-@@ -115,7 +129,7 @@ class Gallery extends \Magento\Framework\View\Element\Template
-                 if ($size[0] > 600) {
-                     return 600;
-                 } else {
--                    return $size[0];
-+                    return (int) $size[0];
-                 }
-             }
-         }
-@@ -124,6 +138,8 @@ class Gallery extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get previous image
-+     *
-      * @return Image|false
-      */
-     public function getPreviousImage()
-@@ -143,6 +159,8 @@ class Gallery extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get next image
-+     *
-      * @return Image|false
-      */
-     public function getNextImage()
-@@ -166,6 +184,8 @@ class Gallery extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get previous image url
-+     *
-      * @return false|string
-      */
-     public function getPreviousImageUrl()
-@@ -178,6 +198,8 @@ class Gallery extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get next image url
-+     *
-      * @return false|string
-      */
-     public function getNextImageUrl()
-diff --git a/app/code/Magento/Catalog/Block/Product/Image.php b/app/code/Magento/Catalog/Block/Product/Image.php
-index 20a556ab414..7a7f9c0affc 100644
---- a/app/code/Magento/Catalog/Block/Product/Image.php
-+++ b/app/code/Magento/Catalog/Block/Product/Image.php
-@@ -6,6 +6,8 @@
- namespace Magento\Catalog\Block\Product;
- 
- /**
-+ * Product image block
-+ *
-  * @api
-  * @method string getImageUrl()
-  * @method string getWidth()
-@@ -13,6 +15,7 @@ namespace Magento\Catalog\Block\Product;
-  * @method string getLabel()
-  * @method float getRatio()
-  * @method string getCustomAttributes()
-+ * @method string getClass()
-  * @since 100.0.2
-  */
- class Image extends \Magento\Framework\View\Element\Template
-diff --git a/app/code/Magento/Catalog/Block/Product/ImageFactory.php b/app/code/Magento/Catalog/Block/Product/ImageFactory.php
-index f9a576367dd..aa303af656a 100644
---- a/app/code/Magento/Catalog/Block/Product/ImageFactory.php
-+++ b/app/code/Magento/Catalog/Block/Product/ImageFactory.php
-@@ -77,16 +77,29 @@ class ImageFactory
-     {
-         $result = [];
-         foreach ($attributes as $name => $value) {
--            $result[] = $name . '="' . $value . '"';
-+            if ($name != 'class') {
-+                $result[] = $name . '="' . $value . '"';
-+            }
-         }
-         return !empty($result) ? implode(' ', $result) : '';
-     }
- 
-+    /**
-+     * Retrieve image class for HTML element
-+     *
-+     * @param array $attributes
-+     * @return string
-+     */
-+    private function getClass(array $attributes): string
-+    {
-+        return $attributes['class'] ?? 'product-image-photo';
-+    }
-+
-     /**
-      * Calculate image ratio
-      *
--     * @param $width
--     * @param $height
-+     * @param int $width
-+     * @param int $height
-      * @return float
-      */
-     private function getRatio(int $width, int $height): float
-@@ -98,8 +111,9 @@ class ImageFactory
-     }
- 
-     /**
--     * @param Product $product
-+     * Get image label
-      *
-+     * @param Product $product
-      * @param string $imageType
-      * @return string
-      */
-@@ -114,6 +128,7 @@ class ImageFactory
- 
-     /**
-      * Create image block from product
-+     *
-      * @param Product $product
-      * @param string $imageId
-      * @param array|null $attributes
-@@ -154,6 +169,7 @@ class ImageFactory
-                 'label' => $this->getLabel($product, $imageMiscParams['image_type']),
-                 'ratio' => $this->getRatio($imageMiscParams['image_width'], $imageMiscParams['image_height']),
-                 'custom_attributes' => $this->getStringCustomAttributes($attributes),
-+                'class' => $this->getClass($attributes),
-                 'product_id' => $product->getId()
-             ],
-         ];
-diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
-index c1b255c762d..144cb682e2d 100644
---- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
-+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
-@@ -178,8 +178,9 @@ class ListProduct extends AbstractProduct implements IdentityInterface
-     }
- 
-     /**
--     * Need use as _prepareLayout - but problem in declaring collection from
--     * another block (was problem with search result)
-+     * Need use as _prepareLayout - but problem in declaring collection from another block.
-+     * (was problem with search result)
-+     *
-      * @return $this
-      */
-     protected function _beforeToHtml()
-@@ -188,7 +189,9 @@ class ListProduct extends AbstractProduct implements IdentityInterface
- 
-         $this->addToolbarBlock($collection);
- 
--        $collection->load();
-+        if (!$collection->isLoaded()) {
-+            $collection->load();
-+        }
- 
-         return parent::_beforeToHtml();
-     }
-@@ -262,6 +265,8 @@ class ListProduct extends AbstractProduct implements IdentityInterface
-     }
- 
-     /**
-+     * Set collection.
-+     *
-      * @param AbstractCollection $collection
-      * @return $this
-      */
-@@ -272,7 +277,9 @@ class ListProduct extends AbstractProduct implements IdentityInterface
-     }
- 
-     /**
--     * @param array|string|integer| Element $code
-+     * Add attribute.
-+     *
-+     * @param array|string|integer|Element $code
-      * @return $this
-      */
-     public function addAttribute($code)
-@@ -282,6 +289,8 @@ class ListProduct extends AbstractProduct implements IdentityInterface
-     }
- 
-     /**
-+     * Get price block template.
-+     *
-      * @return mixed
-      */
-     public function getPriceBlockTemplate()
-@@ -364,13 +373,15 @@ class ListProduct extends AbstractProduct implements IdentityInterface
-         return [
-             'action' => $url,
-             'data' => [
--                'product' => $product->getEntityId(),
-+                'product' => (int) $product->getEntityId(),
-                 ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlHelper->getEncodedUrl($url),
-             ]
-         ];
-     }
- 
-     /**
-+     * Get product price.
-+     *
-      * @param Product $product
-      * @return string
-      */
-@@ -396,8 +407,8 @@ class ListProduct extends AbstractProduct implements IdentityInterface
-     }
- 
-     /**
--     * Specifies that price rendering should be done for the list of products
--     * i.e. rendering happens in the scope of product list, but not single product
-+     * Specifies that price rendering should be done for the list of products.
-+     * (rendering happens in the scope of product list, but not single product)
-      *
-      * @return Render
-      */
-diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php
-index 0c547f81c85..596cd7cc5bd 100644
---- a/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php
-+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php
-@@ -9,6 +9,9 @@
-  */
- namespace Magento\Catalog\Block\Product\ProductList;
- 
-+/**
-+ * Crosssell block for product
-+ */
- class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
- {
-     /**
-@@ -25,7 +28,7 @@ class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
-      */
-     protected function _prepareData()
-     {
--        $product = $this->_coreRegistry->registry('product');
-+        $product = $this->getProduct();
-         /* @var $product \Magento\Catalog\Model\Product */
- 
-         $this->_itemCollection = $product->getCrossSellProductCollection()->addAttributeToSelect(
-@@ -43,6 +46,7 @@ class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
- 
-     /**
-      * Before rendering html process
-+     *
-      * Prepare items collection
-      *
-      * @return \Magento\Catalog\Block\Product\ProductList\Crosssell
-diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
-index 219922f9e46..08861951154 100644
---- a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
-+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
-@@ -46,7 +46,7 @@ class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
-     protected $_checkoutCart;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-@@ -55,7 +55,7 @@ class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
-      * @param \Magento\Checkout\Model\ResourceModel\Cart $checkoutCart
-      * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility
-      * @param \Magento\Checkout\Model\Session $checkoutSession
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param array $data
-      */
-     public function __construct(
-@@ -63,7 +63,7 @@ class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
-         \Magento\Checkout\Model\ResourceModel\Cart $checkoutCart,
-         \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
-         \Magento\Checkout\Model\Session $checkoutSession,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         array $data = []
-     ) {
-         $this->_checkoutCart = $checkoutCart;
-@@ -77,11 +77,13 @@ class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
-     }
- 
-     /**
-+     * Prepare data
-+     *
-      * @return $this
-      */
-     protected function _prepareData()
-     {
--        $product = $this->_coreRegistry->registry('product');
-+        $product = $this->getProduct();
-         /* @var $product \Magento\Catalog\Model\Product */
- 
-         $this->_itemCollection = $product->getRelatedProductCollection()->addAttributeToSelect(
-@@ -103,6 +105,8 @@ class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
-     }
- 
-     /**
-+     * Before to html handler
-+     *
-      * @return $this
-      */
-     protected function _beforeToHtml()
-@@ -112,6 +116,8 @@ class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
-     }
- 
-     /**
-+     * Get collection items
-+     *
-      * @return Collection
-      */
-     public function getItems()
-diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
-index 0b8d2d6c89e..c530ba4785a 100644
---- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
-+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
-@@ -7,6 +7,8 @@ namespace Magento\Catalog\Block\Product\ProductList;
- 
- use Magento\Catalog\Helper\Product\ProductList;
- use Magento\Catalog\Model\Product\ProductList\Toolbar as ToolbarModel;
-+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
-+use Magento\Framework\App\ObjectManager;
- 
- /**
-  * Product list toolbar
-@@ -77,6 +79,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
- 
-     /**
-      * @var bool $_paramsMemorizeAllowed
-+     * @deprecated
-      */
-     protected $_paramsMemorizeAllowed = true;
- 
-@@ -96,6 +99,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-      * Catalog session
-      *
-      * @var \Magento\Catalog\Model\Session
-+     * @deprecated
-      */
-     protected $_catalogSession;
- 
-@@ -104,6 +108,11 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-      */
-     protected $_toolbarModel;
- 
-+    /**
-+     * @var ToolbarMemorizer
-+     */
-+    private $toolbarMemorizer;
-+
-     /**
-      * @var ProductList
-      */
-@@ -119,6 +128,16 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-      */
-     protected $_postDataHelper;
- 
-+    /**
-+     * @var \Magento\Framework\App\Http\Context
-+     */
-+    private $httpContext;
-+
-+    /**
-+     * @var \Magento\Framework\Data\Form\FormKey
-+     */
-+    private $formKey;
-+
-     /**
-      * @param \Magento\Framework\View\Element\Template\Context $context
-      * @param \Magento\Catalog\Model\Session $catalogSession
-@@ -128,6 +147,11 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-      * @param ProductList $productListHelper
-      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
-      * @param array $data
-+     * @param ToolbarMemorizer|null $toolbarMemorizer
-+     * @param \Magento\Framework\App\Http\Context|null $httpContext
-+     * @param \Magento\Framework\Data\Form\FormKey|null $formKey
-+     *
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-         \Magento\Framework\View\Element\Template\Context $context,
-@@ -137,7 +161,10 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-         \Magento\Framework\Url\EncoderInterface $urlEncoder,
-         ProductList $productListHelper,
-         \Magento\Framework\Data\Helper\PostHelper $postDataHelper,
--        array $data = []
-+        array $data = [],
-+        ToolbarMemorizer $toolbarMemorizer = null,
-+        \Magento\Framework\App\Http\Context $httpContext = null,
-+        \Magento\Framework\Data\Form\FormKey $formKey = null
-     ) {
-         $this->_catalogSession = $catalogSession;
-         $this->_catalogConfig = $catalogConfig;
-@@ -145,6 +172,15 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-         $this->urlEncoder = $urlEncoder;
-         $this->_productListHelper = $productListHelper;
-         $this->_postDataHelper = $postDataHelper;
-+        $this->toolbarMemorizer = $toolbarMemorizer ?: ObjectManager::getInstance()->get(
-+            ToolbarMemorizer::class
-+        );
-+        $this->httpContext = $httpContext ?: ObjectManager::getInstance()->get(
-+            \Magento\Framework\App\Http\Context::class
-+        );
-+        $this->formKey = $formKey ?: ObjectManager::getInstance()->get(
-+            \Magento\Framework\Data\Form\FormKey::class
-+        );
-         parent::__construct($context, $data);
-     }
- 
-@@ -152,6 +188,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-      * Disable list state params memorizing
-      *
-      * @return $this
-+     * @deprecated
-      */
-     public function disableParamsMemorizing()
-     {
-@@ -165,6 +202,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-      * @param string $param parameter name
-      * @param mixed $value parameter value
-      * @return $this
-+     * @deprecated
-      */
-     protected function _memorizeParam($param, $value)
-     {
-@@ -244,13 +282,13 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-             $defaultOrder = $keys[0];
-         }
- 
--        $order = $this->_toolbarModel->getOrder();
-+        $order = $this->toolbarMemorizer->getOrder();
-         if (!$order || !isset($orders[$order])) {
-             $order = $defaultOrder;
-         }
- 
--        if ($order != $defaultOrder) {
--            $this->_memorizeParam('sort_order', $order);
-+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
-+            $this->httpContext->setValue(ToolbarModel::ORDER_PARAM_NAME, $order, $defaultOrder);
-         }
- 
-         $this->setData('_current_grid_order', $order);
-@@ -270,13 +308,13 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-         }
- 
-         $directions = ['asc', 'desc'];
--        $dir = strtolower($this->_toolbarModel->getDirection());
-+        $dir = strtolower($this->toolbarMemorizer->getDirection());
-         if (!$dir || !in_array($dir, $directions)) {
-             $dir = $this->_direction;
-         }
- 
--        if ($dir != $this->_direction) {
--            $this->_memorizeParam('sort_direction', $dir);
-+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
-+            $this->httpContext->setValue(ToolbarModel::DIRECTION_PARAM_NAME, $dir, $this->_direction);
-         }
- 
-         $this->setData('_current_grid_direction', $dir);
-@@ -392,6 +430,8 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get pager encoded url.
-+     *
-      * @param array $params
-      * @return string
-      */
-@@ -412,11 +452,15 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-             return $mode;
-         }
-         $defaultMode = $this->_productListHelper->getDefaultViewMode($this->getModes());
--        $mode = $this->_toolbarModel->getMode();
-+        $mode = $this->toolbarMemorizer->getMode();
-         if (!$mode || !isset($this->_availableMode[$mode])) {
-             $mode = $defaultMode;
-         }
- 
-+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
-+            $this->httpContext->setValue(ToolbarModel::MODE_PARAM_NAME, $mode, $defaultMode);
-+        }
-+
-         $this->setData('_current_grid_mode', $mode);
-         return $mode;
-     }
-@@ -568,13 +612,13 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-             $defaultLimit = $keys[0];
-         }
- 
--        $limit = $this->_toolbarModel->getLimit();
-+        $limit = $this->toolbarMemorizer->getLimit();
-         if (!$limit || !isset($limits[$limit])) {
-             $limit = $defaultLimit;
-         }
- 
--        if ($limit != $defaultLimit) {
--            $this->_memorizeParam('limit_page', $limit);
-+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
-+            $this->httpContext->setValue(ToolbarModel::LIMIT_PARAM_NAME, $limit, $defaultLimit);
-         }
- 
-         $this->setData('_current_limit', $limit);
-@@ -582,6 +626,8 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Check if limit is current used in toolbar.
-+     *
-      * @param int $limit
-      * @return bool
-      */
-@@ -591,6 +637,8 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Pager number of items from which products started on current page.
-+     *
-      * @return int
-      */
-     public function getFirstNum()
-@@ -600,6 +648,8 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Pager number of items products finished on current page.
-+     *
-      * @return int
-      */
-     public function getLastNum()
-@@ -609,6 +659,8 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Total number of products in current category.
-+     *
-      * @return int
-      */
-     public function getTotalNum()
-@@ -617,6 +669,8 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Check if current page is the first.
-+     *
-      * @return bool
-      */
-     public function isFirstPage()
-@@ -625,6 +679,8 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Return last page number.
-+     *
-      * @return int
-      */
-     public function getLastPageNum()
-@@ -692,6 +748,8 @@ class Toolbar extends \Magento\Framework\View\Element\Template
-             'orderDefault' => $this->getOrderField(),
-             'limitDefault' => $this->_productListHelper->getDefaultLimitPerPageValue($defaultMode),
-             'url' => $this->getPagerUrl(),
-+            'formKey' => $this->formKey->getFormKey(),
-+            'post' => $this->toolbarMemorizer->isMemorizingAllowed() ? true : false
-         ];
-         $options = array_replace_recursive($options, $customOptions);
-         return json_encode(['productListToolbarForm' => $options]);
-diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
-index 10aebf27057..d888f44a6fb 100644
---- a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
-+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
-@@ -7,7 +7,6 @@
- namespace Magento\Catalog\Block\Product\ProductList;
- 
- use Magento\Catalog\Model\ResourceModel\Product\Collection;
--use Magento\Framework\View\Element\AbstractBlock;
- 
- /**
-  * Catalog product upsell items block
-@@ -61,7 +60,7 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
-     protected $_checkoutCart;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-@@ -70,7 +69,7 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
-      * @param \Magento\Checkout\Model\ResourceModel\Cart $checkoutCart
-      * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility
-      * @param \Magento\Checkout\Model\Session $checkoutSession
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param array $data
-      */
-     public function __construct(
-@@ -78,7 +77,7 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
-         \Magento\Checkout\Model\ResourceModel\Cart $checkoutCart,
-         \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
-         \Magento\Checkout\Model\Session $checkoutSession,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         array $data = []
-     ) {
-         $this->_checkoutCart = $checkoutCart;
-@@ -92,11 +91,13 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
-     }
- 
-     /**
-+     * Prepare data
-+     *
-      * @return $this
-      */
-     protected function _prepareData()
-     {
--        $product = $this->_coreRegistry->registry('product');
-+        $product = $this->getProduct();
-         /* @var $product \Magento\Catalog\Model\Product */
-         $this->_itemCollection = $product->getUpSellProductCollection()->setPositionOrder()->addStoreFilter();
-         if ($this->moduleManager->isEnabled('Magento_Checkout')) {
-@@ -122,6 +123,8 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
-     }
- 
-     /**
-+     * Before to html handler
-+     *
-      * @return $this
-      */
-     protected function _beforeToHtml()
-@@ -131,6 +134,8 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
-     }
- 
-     /**
-+     * Get items collection
-+     *
-      * @return Collection
-      */
-     public function getItemCollection()
-@@ -146,6 +151,8 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
-     }
- 
-     /**
-+     * Get collection items
-+     *
-      * @return \Magento\Framework\DataObject[]
-      */
-     public function getItems()
-@@ -157,6 +164,8 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
-     }
- 
-     /**
-+     * Get row count
-+     *
-      * @return float
-      */
-     public function getRowCount()
-@@ -165,18 +174,22 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
-     }
- 
-     /**
-+     * Set column count
-+     *
-      * @param string $columns
-      * @return $this
-      */
-     public function setColumnCount($columns)
-     {
--        if (intval($columns) > 0) {
--            $this->_columnCount = intval($columns);
-+        if ((int) $columns > 0) {
-+            $this->_columnCount = (int) $columns;
-         }
-         return $this;
-     }
- 
-     /**
-+     * Get column count
-+     *
-      * @return int
-      */
-     public function getColumnCount()
-@@ -185,6 +198,8 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
-     }
- 
-     /**
-+     * Reset items iterator
-+     *
-      * @return void
-      */
-     public function resetItemsIterator()
-@@ -194,6 +209,8 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
-     }
- 
-     /**
-+     * Get iterable item
-+     *
-      * @return mixed
-      */
-     public function getIterableItem()
-@@ -205,6 +222,7 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
- 
-     /**
-      * Set how many items we need to show in upsell block
-+     *
-      * Notice: this parameter will be also applied
-      *
-      * @param string $type
-@@ -213,13 +231,15 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
-      */
-     public function setItemLimit($type, $limit)
-     {
--        if (intval($limit) > 0) {
--            $this->_itemLimits[$type] = intval($limit);
-+        if ((int) $limit > 0) {
-+            $this->_itemLimits[$type] = (int) $limit;
-         }
-         return $this;
-     }
- 
-     /**
-+     * Get item limit
-+     *
-      * @param string $type
-      * @return array|int
-      */
-diff --git a/app/code/Magento/Catalog/Block/Product/View.php b/app/code/Magento/Catalog/Block/Product/View.php
-index 8055d17a64a..ed6278c2b58 100644
---- a/app/code/Magento/Catalog/Block/Product/View.php
-+++ b/app/code/Magento/Catalog/Block/Product/View.php
-@@ -169,8 +169,7 @@ class View extends AbstractProduct implements \Magento\Framework\DataObject\Iden
-     }
- 
-     /**
--     * Get JSON encoded configuration array which can be used for JS dynamic
--     * price calculation depending on product options
-+     * Get JSON encoded configuration which can be used for JS dynamic price calculation depending on product options
-      *
-      * @return string
-      */
-@@ -188,24 +187,25 @@ class View extends AbstractProduct implements \Magento\Framework\DataObject\Iden
-         }
- 
-         $tierPrices = [];
--        $tierPricesList = $product->getPriceInfo()->getPrice('tier_price')->getTierPriceList();
-+        $priceInfo = $product->getPriceInfo();
-+        $tierPricesList = $priceInfo->getPrice('tier_price')->getTierPriceList();
-         foreach ($tierPricesList as $tierPrice) {
--            $tierPrices[] = $tierPrice['price']->getValue();
-+            $tierPrices[] = $tierPrice['price']->getValue() * 1;
-         }
-         $config = [
--            'productId'   => $product->getId(),
-+            'productId'   => (int)$product->getId(),
-             'priceFormat' => $this->_localeFormat->getPriceFormat(),
-             'prices'      => [
-                 'oldPrice'   => [
--                    'amount'      => $product->getPriceInfo()->getPrice('regular_price')->getAmount()->getValue(),
-+                    'amount'      => $priceInfo->getPrice('regular_price')->getAmount()->getValue() * 1,
-                     'adjustments' => []
-                 ],
-                 'basePrice'  => [
--                    'amount'      => $product->getPriceInfo()->getPrice('final_price')->getAmount()->getBaseAmount(),
-+                    'amount'      => $priceInfo->getPrice('final_price')->getAmount()->getBaseAmount() * 1,
-                     'adjustments' => []
-                 ],
-                 'finalPrice' => [
--                    'amount'      => $product->getPriceInfo()->getPrice('final_price')->getAmount()->getValue(),
-+                    'amount'      => $priceInfo->getPrice('final_price')->getAmount()->getValue() * 1,
-                     'adjustments' => []
-                 ]
-             ],
-@@ -262,6 +262,7 @@ class View extends AbstractProduct implements \Magento\Framework\DataObject\Iden
- 
-     /**
-      * Get default qty - either as preconfigured, or as 1.
-+     *
-      * Also restricts it by minimal qty.
-      *
-      * @param null|\Magento\Catalog\Model\Product $product
-@@ -323,10 +324,7 @@ class View extends AbstractProduct implements \Magento\Framework\DataObject\Iden
-     public function getIdentities()
-     {
-         $identities = $this->getProduct()->getIdentities();
--        $category = $this->_coreRegistry->registry('current_category');
--        if ($category) {
--            $identities[] = Category::CACHE_TAG . '_' . $category->getId();
--        }
-+
-         return $identities;
-     }
- 
-diff --git a/app/code/Magento/Catalog/Block/Product/View/Attributes.php b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
-index cb59d86a745..5b9777cbfd1 100644
---- a/app/code/Magento/Catalog/Block/Product/View/Attributes.php
-+++ b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
-@@ -16,6 +16,8 @@ use Magento\Framework\Phrase;
- use Magento\Framework\Pricing\PriceCurrencyInterface;
- 
- /**
-+ * Attributes attributes block
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -56,6 +58,8 @@ class Attributes extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Returns a Product
-+     *
-      * @return Product
-      */
-     public function getProduct()
-@@ -88,9 +92,9 @@ class Attributes extends \Magento\Framework\View\Element\Template
-                     $value = $this->priceCurrency->convertAndFormat($value);
-                 }
- 
--                if (is_string($value) && strlen($value)) {
-+                if (is_string($value) && strlen(trim($value))) {
-                     $data[$attribute->getAttributeCode()] = [
--                        'label' => __($attribute->getStoreLabel()),
-+                        'label' => $attribute->getStoreLabel(),
-                         'value' => $value,
-                         'code' => $attribute->getAttributeCode(),
-                     ];
-diff --git a/app/code/Magento/Catalog/Block/Product/View/Details.php b/app/code/Magento/Catalog/Block/Product/View/Details.php
-new file mode 100644
-index 00000000000..e76c5bf2013
---- /dev/null
-+++ b/app/code/Magento/Catalog/Block/Product/View/Details.php
-@@ -0,0 +1,47 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Block\Product\View;
-+
-+/**
-+ * Product details block.
-+ *
-+ * Holds a group of blocks to show as tabs.
-+ *
-+ * @api
-+ */
-+class Details extends \Magento\Framework\View\Element\Template
-+{
-+    /**
-+     * Get sorted child block names.
-+     *
-+     * @param string $groupName
-+     * @param string $callback
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     *
-+     * @return array
-+     */
-+    public function getGroupSortedChildNames(string $groupName, string $callback): array
-+    {
-+        $groupChildNames = $this->getGroupChildNames($groupName, $callback);
-+        $layout = $this->getLayout();
-+
-+        $childNamesSortOrder = [];
-+
-+        foreach ($groupChildNames as $childName) {
-+            $alias = $layout->getElementAlias($childName);
-+            $sortOrder = (int)$this->getChildData($alias, 'sort_order') ?? 0;
-+
-+            $childNamesSortOrder[$sortOrder] = $childName;
-+        }
-+
-+        ksort($childNamesSortOrder, SORT_NUMERIC);
-+
-+        return $childNamesSortOrder;
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
-index ab01fc6d134..b6a58c07c42 100644
---- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
-+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
-@@ -23,6 +23,8 @@ use Magento\Framework\Json\EncoderInterface;
- use Magento\Framework\Stdlib\ArrayUtils;
- 
- /**
-+ * Product gallery block
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -135,16 +137,18 @@ class Gallery extends AbstractView
-         $imagesItems = [];
-         /** @var DataObject $image */
-         foreach ($this->getGalleryImages() as $image) {
--            $imageItem = new DataObject([
--                'thumb' => $image->getData('small_image_url'),
--                'img' => $image->getData('medium_image_url'),
--                'full' => $image->getData('large_image_url'),
--                'caption'  => $image->getData('label'),
--                'position' => $image->getData('position'),
--                'isMain'   => $this->isMainImage($image),
--                'type' => str_replace('external-', '', $image->getMediaType()),
--                'videoUrl' => $image->getVideoUrl(),
--            ]);
-+            $imageItem = new DataObject(
-+                [
-+                    'thumb' => $image->getData('small_image_url'),
-+                    'img' => $image->getData('medium_image_url'),
-+                    'full' => $image->getData('large_image_url'),
-+                    'caption' => ($image->getLabel() ?: $this->getProduct()->getName()),
-+                    'position' => $image->getData('position'),
-+                    'isMain'   => $this->isMainImage($image),
-+                    'type' => str_replace('external-', '', $image->getMediaType()),
-+                    'videoUrl' => $image->getVideoUrl(),
-+                ]
-+            );
-             foreach ($this->getGalleryImagesConfig()->getItems() as $imageConfig) {
-                 $imageItem->setData(
-                     $imageConfig->getData('json_object_key'),
-@@ -196,6 +200,8 @@ class Gallery extends AbstractView
-     }
- 
-     /**
-+     * Returns image attribute
-+     *
-      * @param string $imageId
-      * @param string $attributeName
-      * @param string $default
-@@ -203,9 +209,9 @@ class Gallery extends AbstractView
-      */
-     public function getImageAttribute($imageId, $attributeName, $default = null)
-     {
--        $attributes =
--            $this->getConfigView()->getMediaAttributes('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId);
--        return isset($attributes[$attributeName]) ? $attributes[$attributeName] : $default;
-+        $attributes = $this->getConfigView()
-+                ->getMediaAttributes('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId);
-+        return $attributes[$attributeName] ?? $default;
-     }
- 
-     /**
-@@ -222,6 +228,8 @@ class Gallery extends AbstractView
-     }
- 
-     /**
-+     * Returns image gallery config object
-+     *
-      * @return Collection
-      */
-     private function getGalleryImagesConfig()
-diff --git a/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
-new file mode 100644
-index 00000000000..0384c9cd9ac
---- /dev/null
-+++ b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
-@@ -0,0 +1,156 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Catalog\Block\Product\View;
-+
-+use Magento\Framework\View\Element\Block\ArgumentInterface;
-+use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Catalog\Block\Product\Context;
-+use Magento\Framework\Stdlib\ArrayUtils;
-+
-+/**
-+ * Gallery options block.
-+ */
-+class GalleryOptions extends AbstractView implements ArgumentInterface
-+{
-+    /**
-+     * @var Json
-+     */
-+    private $jsonSerializer;
-+
-+    /**
-+     * @var Gallery
-+     */
-+    private $gallery;
-+
-+    /**
-+     * @param Context $context
-+     * @param ArrayUtils $arrayUtils
-+     * @param Json $jsonSerializer
-+     * @param Gallery $gallery
-+     * @param array $data
-+     */
-+    public function __construct(
-+        Context $context,
-+        ArrayUtils $arrayUtils,
-+        Json $jsonSerializer,
-+        Gallery $gallery,
-+        array $data = []
-+    ) {
-+        $this->gallery = $gallery;
-+        $this->jsonSerializer = $jsonSerializer;
-+        parent::__construct($context, $arrayUtils, $data);
-+    }
-+
-+    /**
-+     * Retrieve gallery options in JSON format
-+     *
-+     * @return string
-+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-+     * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * @SuppressWarnings(PHPMD.ElseExpression)
-+     */
-+    public function getOptionsJson()
-+    {
-+        $optionItems = null;
-+
-+        //Special case for gallery/nav which can be the string "thumbs/false/dots"
-+        if (is_bool($this->getVar("gallery/nav"))) {
-+            $optionItems['nav'] = $this->getVar("gallery/nav") ? 'true' : 'false';
-+        } else {
-+            $optionItems['nav'] = $this->escapeHtml($this->getVar("gallery/nav"));
-+        }
-+
-+        $optionItems['loop'] = $this->getVar("gallery/loop");
-+        $optionItems['keyboard'] = $this->getVar("gallery/keyboard");
-+        $optionItems['arrows'] = $this->getVar("gallery/arrows");
-+        $optionItems['allowfullscreen'] = $this->getVar("gallery/allowfullscreen");
-+        $optionItems['showCaption'] = $this->getVar("gallery/caption");
-+        $optionItems['width'] = (int)$this->escapeHtml(
-+            $this->gallery->getImageAttribute('product_page_image_medium', 'width')
-+        );
-+        $optionItems['thumbwidth'] = (int)$this->escapeHtml(
-+            $this->gallery->getImageAttribute('product_page_image_small', 'width')
-+        );
-+
-+        if ($this->gallery->getImageAttribute('product_page_image_small', 'height') ||
-+            $this->gallery->getImageAttribute('product_page_image_small', 'width')) {
-+            $optionItems['thumbheight'] = (int)$this->escapeHtml(
-+                $this->gallery->getImageAttribute('product_page_image_small', 'height') ?:
-+                    $this->gallery->getImageAttribute('product_page_image_small', 'width')
-+            );
-+        }
-+
-+        if ($this->gallery->getImageAttribute('product_page_image_medium', 'height') ||
-+            $this->gallery->getImageAttribute('product_page_image_medium', 'width')) {
-+            $optionItems['height'] = (int)$this->escapeHtml(
-+                $this->gallery->getImageAttribute('product_page_image_medium', 'height') ?:
-+                    $this->gallery->getImageAttribute('product_page_image_medium', 'width')
-+            );
-+        }
-+
-+        if ($this->getVar("gallery/transition/duration")) {
-+            $optionItems['transitionduration'] =
-+                (int)$this->escapeHtml($this->getVar("gallery/transition/duration"));
-+        }
-+
-+        $optionItems['transition'] = $this->escapeHtml($this->getVar("gallery/transition/effect"));
-+        $optionItems['navarrows'] = $this->getVar("gallery/navarrows");
-+        $optionItems['navtype'] = $this->escapeHtml($this->getVar("gallery/navtype"));
-+        $optionItems['navdir'] = $this->escapeHtml($this->getVar("gallery/navdir"));
-+
-+        if ($this->getVar("gallery/thumbmargin")) {
-+            $optionItems['thumbmargin'] = (int)$this->escapeHtml($this->getVar("gallery/thumbmargin"));
-+        }
-+
-+        return $this->jsonSerializer->serialize($optionItems);
-+    }
-+
-+    /**
-+     * Retrieve gallery fullscreen options in JSON format
-+     *
-+     * @return string
-+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-+     * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * @SuppressWarnings(PHPMD.ElseExpression)
-+     */
-+    public function getFSOptionsJson()
-+    {
-+        $fsOptionItems = null;
-+
-+        //Special case for gallery/nav which can be the string "thumbs/false/dots"
-+        if (is_bool($this->getVar("gallery/fullscreen/nav"))) {
-+            $fsOptionItems['nav'] = $this->getVar("gallery/fullscreen/nav") ? 'true' : 'false';
-+        } else {
-+            $fsOptionItems['nav'] = $this->escapeHtml($this->getVar("gallery/fullscreen/nav"));
-+        }
-+
-+        $fsOptionItems['loop'] = $this->getVar("gallery/fullscreen/loop");
-+        $fsOptionItems['navdir'] = $this->escapeHtml($this->getVar("gallery/fullscreen/navdir"));
-+        $fsOptionItems['navarrows'] = $this->getVar("gallery/fullscreen/navarrows");
-+        $fsOptionItems['navtype'] = $this->escapeHtml($this->getVar("gallery/fullscreen/navtype"));
-+        $fsOptionItems['arrows'] = $this->getVar("gallery/fullscreen/arrows");
-+        $fsOptionItems['showCaption'] = $this->getVar("gallery/fullscreen/caption");
-+
-+        if ($this->getVar("gallery/fullscreen/transition/duration")) {
-+            $fsOptionItems['transitionduration'] = (int)$this->escapeHtml(
-+                $this->getVar("gallery/fullscreen/transition/duration")
-+            );
-+        }
-+
-+        $fsOptionItems['transition'] = $this->escapeHtml($this->getVar("gallery/fullscreen/transition/effect"));
-+
-+        if ($this->getVar("gallery/fullscreen/keyboard")) {
-+            $fsOptionItems['keyboard'] = $this->getVar("gallery/fullscreen/keyboard");
-+        }
-+
-+        if ($this->getVar("gallery/fullscreen/thumbmargin")) {
-+            $fsOptionItems['thumbmargin'] =
-+                (int)$this->escapeHtml($this->getVar("gallery/fullscreen/thumbmargin"));
-+        }
-+
-+        return $this->jsonSerializer->serialize($fsOptionItems);
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Block/Product/View/Options.php b/app/code/Magento/Catalog/Block/Product/View/Options.php
-index 0720c018f6a..c457b20cd09 100644
---- a/app/code/Magento/Catalog/Block/Product/View/Options.php
-+++ b/app/code/Magento/Catalog/Block/Product/View/Options.php
-@@ -4,16 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Product options block
-- *
-- * @author     Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Catalog\Block\Product\View;
- 
- use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Option\Value;
- 
- /**
-+ * Product options block
-+ *
-+ * @author Magento Core Team <core@magentocommerce.com>
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @since 100.0.2
-@@ -121,6 +120,8 @@ class Options extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get group of option.
-+     *
-      * @param string $type
-      * @return string
-      */
-@@ -142,6 +143,8 @@ class Options extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Check if block has options.
-+     *
-      * @return bool
-      */
-     public function hasOptions()
-@@ -160,7 +163,10 @@ class Options extends \Magento\Framework\View\Element\Template
-      */
-     protected function _getPriceConfiguration($option)
-     {
--        $optionPrice = $this->pricingHelper->currency($option->getPrice(true), false, false);
-+        $optionPrice = $option->getPrice(true);
-+        if ($option->getPriceType() !== Value::TYPE_PERCENT) {
-+            $optionPrice = $this->pricingHelper->currency($optionPrice, false, false);
-+        }
-         $data = [
-             'prices' => [
-                 'oldPrice' => [
-@@ -195,7 +201,7 @@ class Options extends \Magento\Framework\View\Element\Template
-                 ],
-             ],
-             'type' => $option->getPriceType(),
--            'name' => $option->getTitle()
-+            'name' => $option->getTitle(),
-         ];
-         return $data;
-     }
-@@ -231,7 +237,7 @@ class Options extends \Magento\Framework\View\Element\Template
-         //pass the return array encapsulated in an object for the other modules to be able to alter it eg: weee
-         $this->_eventManager->dispatch('catalog_product_option_price_configuration_after', ['configObj' => $configObj]);
- 
--        $config=$configObj->getConfig();
-+        $config = $configObj->getConfig();
- 
-         return $this->_jsonEncoder->encode($config);
-     }
-diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
-index 181211a0fc4..030b6e1d220 100644
---- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
-+++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
-@@ -9,11 +9,15 @@
-  *
-  * @author     Magento Core Team <core@magentocommerce.com>
-  */
-+
- namespace Magento\Catalog\Block\Product\View\Options;
- 
- use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface;
- 
- /**
-+ * Product options section abstract block.
-+ *
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  * @since 100.0.2
-  */
-@@ -46,7 +50,7 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
-     /**
-      * @param \Magento\Framework\View\Element\Template\Context $context
-      * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
--     * @param \Magento\Catalog\Helper\Data $catalogData,
-+     * @param \Magento\Catalog\Helper\Data $catalogData
-      * @param array $data
-      */
-     public function __construct(
-@@ -123,6 +127,8 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Retrieve formatted price.
-+     *
-      * @return string
-      *
-      * @deprecated
-@@ -134,7 +140,7 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
--     * Return formated price
-+     * Return formatted price
-      *
-      * @param array $value
-      * @param bool $flag
-diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
-index 7df9b972e15..d9d663b32f4 100644
---- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
-+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
-@@ -3,8 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Catalog\Block\Product\View\Options\Type;
- 
-+use Magento\Catalog\Model\Product\Option;
-+use Magento\Catalog\Block\Product\View\Options\Type\Select\CheckableFactory;
-+use Magento\Catalog\Block\Product\View\Options\Type\Select\MultipleFactory;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\View\Element\Template\Context;
-+use Magento\Framework\Pricing\Helper\Data;
-+use Magento\Catalog\Helper\Data as CatalogHelper;
-+
- /**
-  * Product options text type block
-  *
-@@ -13,169 +22,60 @@ namespace Magento\Catalog\Block\Product\View\Options\Type;
-  */
- class Select extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
- {
-+    /**
-+     * @var CheckableFactory
-+     */
-+    private $checkableFactory;
-+    /**
-+     * @var MultipleFactory
-+     */
-+    private $multipleFactory;
-+
-+    /**
-+     * Select constructor.
-+     * @param Context $context
-+     * @param Data $pricingHelper
-+     * @param CatalogHelper $catalogData
-+     * @param array $data
-+     * @param CheckableFactory|null $checkableFactory
-+     * @param MultipleFactory|null $multipleFactory
-+     */
-+    public function __construct(
-+        Context $context,
-+        Data $pricingHelper,
-+        CatalogHelper $catalogData,
-+        array $data = [],
-+        CheckableFactory $checkableFactory = null,
-+        MultipleFactory $multipleFactory = null
-+    ) {
-+        parent::__construct($context, $pricingHelper, $catalogData, $data);
-+        $this->checkableFactory = $checkableFactory ?: ObjectManager::getInstance()->get(CheckableFactory::class);
-+        $this->multipleFactory = $multipleFactory ?: ObjectManager::getInstance()->get(MultipleFactory::class);
-+    }
-+
-     /**
-      * Return html for control element
-      *
-      * @return string
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.NPathComplexity)
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-     public function getValuesHtml()
-     {
--        $_option = $this->getOption();
--        $configValue = $this->getProduct()->getPreconfiguredValues()->getData('options/' . $_option->getId());
--        $store = $this->getProduct()->getStore();
--
--        $this->setSkipJsReloadPrice(1);
--        // Remove inline prototype onclick and onchange events
--
--        if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN ||
--            $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE
-+        $option = $this->getOption();
-+        $optionType = $option->getType();
-+        if ($optionType === Option::OPTION_TYPE_DROP_DOWN ||
-+            $optionType === Option::OPTION_TYPE_MULTIPLE
-         ) {
--            $require = $_option->getIsRequire() ? ' required' : '';
--            $extraParams = '';
--            $select = $this->getLayout()->createBlock(
--                \Magento\Framework\View\Element\Html\Select::class
--            )->setData(
--                [
--                    'id' => 'select_' . $_option->getId(),
--                    'class' => $require . ' product-custom-option admin__control-select'
--                ]
--            );
--            if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN) {
--                $select->setName('options[' . $_option->getId() . ']')->addOption('', __('-- Please Select --'));
--            } else {
--                $select->setName('options[' . $_option->getId() . '][]');
--                $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
--            }
--            foreach ($_option->getValues() as $_value) {
--                $priceStr = $this->_formatPrice(
--                    [
--                        'is_percent' => $_value->getPriceType() == 'percent',
--                        'pricing_value' => $_value->getPrice($_value->getPriceType() == 'percent'),
--                    ],
--                    false
--                );
--                $select->addOption(
--                    $_value->getOptionTypeId(),
--                    $_value->getTitle() . ' ' . strip_tags($priceStr) . '',
--                    ['price' => $this->pricingHelper->currencyByStore($_value->getPrice(true), $store, false)]
--                );
--            }
--            if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE) {
--                $extraParams = ' multiple="multiple"';
--            }
--            if (!$this->getSkipJsReloadPrice()) {
--                $extraParams .= ' onchange="opConfig.reloadPrice()"';
--            }
--            $extraParams .= ' data-selector="' . $select->getName() . '"';
--            $select->setExtraParams($extraParams);
--
--            if ($configValue) {
--                $select->setValue($configValue);
--            }
--
--            return $select->getHtml();
-+            $optionBlock = $this->multipleFactory->create();
-         }
--
--        if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO ||
--            $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX
-+        if ($optionType === Option::OPTION_TYPE_RADIO ||
-+            $optionType === Option::OPTION_TYPE_CHECKBOX
-         ) {
--            $selectHtml = '<div class="options-list nested" id="options-' . $_option->getId() . '-list">';
--            $require = $_option->getIsRequire() ? ' required' : '';
--            $arraySign = '';
--            switch ($_option->getType()) {
--                case \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO:
--                    $type = 'radio';
--                    $class = 'radio admin__control-radio';
--                    if (!$_option->getIsRequire()) {
--                        $selectHtml .= '<div class="field choice admin__field admin__field-option">' .
--                            '<input type="radio" id="options_' .
--                            $_option->getId() .
--                            '" class="' .
--                            $class .
--                            ' product-custom-option" name="options[' .
--                            $_option->getId() .
--                            ']"' .
--                            ' data-selector="options[' . $_option->getId() . ']"' .
--                            ($this->getSkipJsReloadPrice() ? '' : ' onclick="opConfig.reloadPrice()"') .
--                            ' value="" checked="checked" /><label class="label admin__field-label" for="options_' .
--                            $_option->getId() .
--                            '"><span>' .
--                            __('None') . '</span></label></div>';
--                    }
--                    break;
--                case \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX:
--                    $type = 'checkbox';
--                    $class = 'checkbox admin__control-checkbox';
--                    $arraySign = '[]';
--                    break;
--            }
--            $count = 1;
--            foreach ($_option->getValues() as $_value) {
--                $count++;
--
--                $priceStr = $this->_formatPrice(
--                    [
--                        'is_percent' => $_value->getPriceType() == 'percent',
--                        'pricing_value' => $_value->getPrice($_value->getPriceType() == 'percent'),
--                    ]
--                );
--
--                $htmlValue = $_value->getOptionTypeId();
--                if ($arraySign) {
--                    $checked = is_array($configValue) && in_array($htmlValue, $configValue) ? 'checked' : '';
--                } else {
--                    $checked = $configValue == $htmlValue ? 'checked' : '';
--                }
--
--                $dataSelector = 'options[' . $_option->getId() . ']';
--                if ($arraySign) {
--                    $dataSelector .= '[' . $htmlValue . ']';
--                }
--
--                $selectHtml .= '<div class="field choice admin__field admin__field-option' .
--                    $require .
--                    '">' .
--                    '<input type="' .
--                    $type .
--                    '" class="' .
--                    $class .
--                    ' ' .
--                    $require .
--                    ' product-custom-option"' .
--                    ($this->getSkipJsReloadPrice() ? '' : ' onclick="opConfig.reloadPrice()"') .
--                    ' name="options[' .
--                    $_option->getId() .
--                    ']' .
--                    $arraySign .
--                    '" id="options_' .
--                    $_option->getId() .
--                    '_' .
--                    $count .
--                    '" value="' .
--                    $htmlValue .
--                    '" ' .
--                    $checked .
--                    ' data-selector="' . $dataSelector . '"' .
--                    ' price="' .
--                    $this->pricingHelper->currencyByStore($_value->getPrice(true), $store, false) .
--                    '" />' .
--                    '<label class="label admin__field-label" for="options_' .
--                    $_option->getId() .
--                    '_' .
--                    $count .
--                    '"><span>' .
--                    $_value->getTitle() .
--                    '</span> ' .
--                    $priceStr .
--                    '</label>';
--                $selectHtml .= '</div>';
--            }
--            $selectHtml .= '</div>';
--
--            return $selectHtml;
-+            $optionBlock = $this->checkableFactory->create();
-         }
-+        return $optionBlock
-+            ->setOption($option)
-+            ->setProduct($this->getProduct())
-+            ->setSkipJsReloadPrice(1)
-+            ->_toHtml();
-     }
- }
-diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php
-new file mode 100644
-index 00000000000..3d856f85dbd
---- /dev/null
-+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Block\Product\View\Options\Type\Select;
-+
-+use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface;
-+use Magento\Catalog\Block\Product\View\Options\AbstractOptions;
-+use Magento\Catalog\Model\Product\Option;
-+
-+/**
-+ * Represent needed logic for checkbox and radio button option types
-+ */
-+class Checkable extends AbstractOptions
-+{
-+    /**
-+     * @var string
-+     */
-+    protected $_template = 'Magento_Catalog::product/composite/fieldset/options/view/checkable.phtml';
-+
-+    /**
-+     * Returns formated price
-+     *
-+     * @param ProductCustomOptionValuesInterface $value
-+     * @return string
-+     */
-+    public function formatPrice(ProductCustomOptionValuesInterface $value): string
-+    {
-+        /** @noinspection PhpMethodParametersCountMismatchInspection */
-+        return parent::_formatPrice(
-+            [
-+                'is_percent' => $value->getPriceType() === 'percent',
-+                'pricing_value' => $value->getPrice($value->getPriceType() === 'percent')
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Returns current currency for store
-+     *
-+     * @param ProductCustomOptionValuesInterface $value
-+     * @return float|string
-+     */
-+    public function getCurrencyByStore(ProductCustomOptionValuesInterface $value)
-+    {
-+        /** @noinspection PhpMethodParametersCountMismatchInspection */
-+        return $this->pricingHelper->currencyByStore(
-+            $value->getPrice(true),
-+            $this->getProduct()->getStore(),
-+            false
-+        );
-+    }
-+
-+    /**
-+     * Returns preconfigured value for given option
-+     *
-+     * @param Option $option
-+     * @return string|array|null
-+     */
-+    public function getPreconfiguredValue(Option $option)
-+    {
-+        return $this->getProduct()->getPreconfiguredValues()->getData('options/' . $option->getId());
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php
-new file mode 100644
-index 00000000000..09a931dfa06
---- /dev/null
-+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php
-@@ -0,0 +1,112 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Block\Product\View\Options\Type\Select;
-+
-+use Magento\Catalog\Block\Product\View\Options\AbstractOptions;
-+use Magento\Catalog\Model\Product\Option;
-+use Magento\Framework\View\Element\Html\Select;
-+
-+/**
-+ * Represent needed logic for dropdown and multi-select
-+ */
-+class Multiple extends AbstractOptions
-+{
-+    /**
-+     * @inheritdoc
-+     *
-+     * @return string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    protected function _toHtml()
-+    {
-+        $option = $this->getOption();
-+        $optionType = $option->getType();
-+        $configValue = $this->getProduct()->getPreconfiguredValues()->getData('options/' . $option->getId());
-+        $require = $option->getIsRequire() ? ' required' : '';
-+        $extraParams = '';
-+        /** @var Select $select */
-+        $select = $this->getLayout()->createBlock(
-+            Select::class
-+        )->setData(
-+            [
-+                'id' => 'select_' . $option->getId(),
-+                'class' => $require . ' product-custom-option admin__control-select'
-+            ]
-+        );
-+        $select = $this->insertSelectOption($select, $option);
-+        $select = $this->processSelectOption($select, $option);
-+        if ($optionType === Option::OPTION_TYPE_MULTIPLE) {
-+            $extraParams = ' multiple="multiple"';
-+        }
-+        if (!$this->getSkipJsReloadPrice()) {
-+            $extraParams .= ' onchange="opConfig.reloadPrice()"';
-+        }
-+        $extraParams .= ' data-selector="' . $select->getName() . '"';
-+        $select->setExtraParams($extraParams);
-+        if ($configValue) {
-+            $select->setValue($configValue);
-+        }
-+        return $select->getHtml();
-+    }
-+
-+    /**
-+     * Returns select with inserted option give as a parameter
-+     *
-+     * @param Select $select
-+     * @param Option $option
-+     * @return Select
-+     */
-+    private function insertSelectOption(Select $select, Option $option): Select
-+    {
-+        $require = $option->getIsRequire() ? ' required' : '';
-+        if ($option->getType() === Option::OPTION_TYPE_DROP_DOWN) {
-+            $select->setName('options[' . $option->getId() . ']')->addOption('', __('-- Please Select --'));
-+        } else {
-+            $select->setName('options[' . $option->getId() . '][]');
-+            $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
-+        }
-+
-+        return $select;
-+    }
-+
-+    /**
-+     * Returns select with formated option prices
-+     *
-+     * @param Select $select
-+     * @param Option $option
-+     * @return Select
-+     */
-+    private function processSelectOption(Select $select, Option $option): Select
-+    {
-+        $store = $this->getProduct()->getStore();
-+        foreach ($option->getValues() as $_value) {
-+            $isPercentPriceType = $_value->getPriceType() === 'percent';
-+            $priceStr = $this->_formatPrice(
-+                [
-+                    'is_percent' => $isPercentPriceType,
-+                    'pricing_value' => $_value->getPrice($isPercentPriceType)
-+                ],
-+                false
-+            );
-+            $select->addOption(
-+                $_value->getOptionTypeId(),
-+                $_value->getTitle() . ' ' . strip_tags($priceStr) . '',
-+                [
-+                    'price' => $this->pricingHelper->currencyByStore(
-+                        $_value->getPrice(true),
-+                        $store,
-+                        false
-+                    )
-+                ]
-+            );
-+        }
-+
-+        return $select;
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
-index 704271b58f4..b4c24231a74 100644
---- a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
-+++ b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
-@@ -139,7 +139,7 @@ class NewWidget extends \Magento\Catalog\Block\Product\NewProduct implements \Ma
-             [
-                 $this->getDisplayType(),
-                 $this->getProductsPerPage(),
--                intval($this->getRequest()->getParam($this->getData('page_var_name'), 1)),
-+                (int) $this->getRequest()->getParam($this->getData('page_var_name'), 1),
-                 $this->serializer->serialize($this->getRequest()->getParams())
-             ]
-         );
-diff --git a/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php b/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php
-index da35b566d7e..dd2e23e67f3 100644
---- a/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php
-+++ b/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php
-@@ -20,8 +20,8 @@ use Magento\Store\Model\StoreManager;
- /**
-  * Reports Viewed Products Counter
-  *
-- * The main responsilibity of this class is provide necessary data to track viewed products
-- * by customer on frontend and data to synchornize this tracks with backend
-+ * The main responsibility of this class is provide necessary data to track viewed products
-+ * by customer on frontend and data to synchronize this tracks with backend
-  *
-  * @api
-  * @since 101.1.0
-@@ -109,6 +109,8 @@ class ProductViewCounter extends Template
-      *
-      * @return string {JSON encoded data}
-      * @since 101.1.0
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getCurrentProductData()
-     {
-diff --git a/app/code/Magento/Catalog/Console/Command/PriceIndexerDimensionsModeSetCommand.php b/app/code/Magento/Catalog/Console/Command/PriceIndexerDimensionsModeSetCommand.php
-deleted file mode 100644
-index e331f4d2a2f..00000000000
---- a/app/code/Magento/Catalog/Console/Command/PriceIndexerDimensionsModeSetCommand.php
-+++ /dev/null
-@@ -1,198 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\Catalog\Console\Command;
--
--use Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration;
--use Symfony\Component\Console\Input\InputInterface;
--use Symfony\Component\Console\Output\OutputInterface;
--use Symfony\Component\Console\Input\InputOption;
--use Symfony\Component\Console\Input\InputArgument;
--use Magento\Framework\Exception\LocalizedException;
--use Magento\Indexer\Console\Command\AbstractIndexerCommand;
--use Magento\Framework\App\ObjectManagerFactory;
--use Magento\Catalog\Model\Indexer\Product\Price\ModeSwitcher;
--use Magento\Framework\App\Config\ScopeConfigInterface;
--use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
--use Magento\Framework\App\Cache\TypeListInterface;
--
--/**
-- * Command to change price indexer dimensions mode
-- *
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class PriceIndexerDimensionsModeSetCommand extends AbstractIndexerCommand
--{
--    const INPUT_KEY_MODE = 'mode';
--
--    /**
--     * ScopeConfigInterface
--     *
--     * @var ScopeConfigInterface
--     */
--    private $configReader;
--
--    /**
--     * ConfigInterface
--     *
--     * @var ConfigInterface
--     */
--    private $configWriter;
--
--    /**
--     * TypeListInterface
--     *
--     * @var TypeListInterface
--     */
--    private $cacheTypeList;
--
--    /**
--     * ModeSwitcher
--     *
--     * @var ModeSwitcher
--     */
--    private $modeSwitcher;
--
--    /**
--     * @param ObjectManagerFactory $objectManagerFactory
--     * @param ScopeConfigInterface $configReader
--     * @param ConfigInterface $configWriter
--     * @param TypeListInterface $cacheTypeList
--     * @param ModeSwitcher $modeSwitcher
--     */
--    public function __construct(
--        ObjectManagerFactory $objectManagerFactory,
--        ScopeConfigInterface $configReader,
--        ConfigInterface $configWriter,
--        TypeListInterface $cacheTypeList,
--        ModeSwitcher $modeSwitcher
--    ) {
--        $this->configReader = $configReader;
--        $this->configWriter = $configWriter;
--        $this->cacheTypeList = $cacheTypeList;
--        $this->modeSwitcher = $modeSwitcher;
--        parent::__construct($objectManagerFactory);
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    protected function configure()
--    {
--        $this->setName('indexer:set-dimensions-mode:catalog_product_price')
--            ->setDescription('Set Indexer Dimensions Mode')
--            ->setDefinition($this->getInputList());
--
--        parent::configure();
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    protected function execute(InputInterface $input, OutputInterface $output)
--    {
--        $errors = $this->validate($input);
--
--        if ($errors) {
--            throw new \InvalidArgumentException(implode(PHP_EOL, $errors));
--        }
--
--        $returnValue = \Magento\Framework\Console\Cli::RETURN_SUCCESS;
--
--        $indexer = $this->getObjectManager()->get(\Magento\Indexer\Model\Indexer::class);
--        $indexer->load(\Magento\Catalog\Model\Indexer\Product\Price\Processor::INDEXER_ID);
--
--        try {
--            $currentMode = $input->getArgument(self::INPUT_KEY_MODE);
--            $previousMode = $this->configReader->getValue(ModeSwitcher::XML_PATH_PRICE_DIMENSIONS_MODE) ?:
--                DimensionModeConfiguration::DIMENSION_NONE;
--
--            if ($previousMode !== $currentMode) {
--                //Create new tables and move data
--                $this->modeSwitcher->createTables($currentMode);
--                $this->modeSwitcher->moveData($currentMode, $previousMode);
--
--                //Change config options
--                $this->configWriter->saveConfig(ModeSwitcher::XML_PATH_PRICE_DIMENSIONS_MODE, $currentMode);
--                $this->cacheTypeList->cleanType('config');
--                $indexer->invalidate();
--
--                //Delete old tables
--                $this->modeSwitcher->dropTables($previousMode);
--
--                $output->writeln(
--                    'Dimensions mode for indexer ' . $indexer->getTitle() . ' was changed from \''
--                    . $previousMode . '\' to \'' . $currentMode . '\''
--                );
--            } else {
--                $output->writeln('Dimensions mode for indexer ' . $indexer->getTitle() . ' has not been changed');
--            }
--        } catch (LocalizedException $e) {
--            $output->writeln($e->getMessage() . PHP_EOL);
--            // we must have an exit code higher than zero to indicate something was wrong
--            $returnValue =  \Magento\Framework\Console\Cli::RETURN_FAILURE;
--        } catch (\Exception $e) {
--            $output->writeln($indexer->getTitle() . " indexer process unknown error:" . PHP_EOL);
--            $output->writeln($e->getMessage() . PHP_EOL);
--            // we must have an exit code higher than zero to indicate something was wrong
--            $returnValue =  \Magento\Framework\Console\Cli::RETURN_FAILURE;
--        }
--
--        return $returnValue;
--    }
--
--    /**
--     * Get list of arguments for the command
--     *
--     * @return InputOption[]
--     */
--    public function getInputList(): array
--    {
--        $modeOptions[] = new InputArgument(
--            self::INPUT_KEY_MODE,
--            InputArgument::REQUIRED,
--            'Indexer dimensions mode ['. DimensionModeConfiguration::DIMENSION_NONE
--            . '|' . DimensionModeConfiguration::DIMENSION_WEBSITE
--            . '|' . DimensionModeConfiguration::DIMENSION_CUSTOMER_GROUP
--            . '|' . DimensionModeConfiguration::DIMENSION_WEBSITE_AND_CUSTOMER_GROUP .']'
--        );
--        return $modeOptions;
--    }
--
--    /**
--     * Check if all admin options are provided
--     *
--     * @param InputInterface $input
--     * @return string[]
--     */
--    public function validate(InputInterface $input): array
--    {
--        $errors = [];
--
--        $acceptedModeValues = ' Accepted values for ' . self::INPUT_KEY_MODE . ' are \''
--            . DimensionModeConfiguration::DIMENSION_NONE . '\', \''
--            . DimensionModeConfiguration::DIMENSION_WEBSITE . '\', \''
--            . DimensionModeConfiguration::DIMENSION_CUSTOMER_GROUP . '\', \''
--            . DimensionModeConfiguration::DIMENSION_WEBSITE_AND_CUSTOMER_GROUP . '\'';
--
--        $inputMode = $input->getArgument(self::INPUT_KEY_MODE);
--        if (!$inputMode) {
--            $errors[] = 'Missing argument \'' . self::INPUT_KEY_MODE .'\'.' . $acceptedModeValues;
--        } elseif (!in_array(
--            $inputMode,
--            [
--                DimensionModeConfiguration::DIMENSION_NONE,
--                DimensionModeConfiguration::DIMENSION_WEBSITE,
--                DimensionModeConfiguration::DIMENSION_CUSTOMER_GROUP,
--                DimensionModeConfiguration::DIMENSION_WEBSITE_AND_CUSTOMER_GROUP
--            ]
--        )) {
--            $errors[] = $acceptedModeValues;
--        }
--        return $errors;
--    }
--}
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php
-index 6456b6d578b..733e270174e 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php
-@@ -6,12 +6,14 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Category;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
- /**
-  * Class Add Category
-  *
-  * @package Magento\Catalog\Controller\Adminhtml\Category
-  */
--class Add extends \Magento\Catalog\Controller\Adminhtml\Category
-+class Add extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
- {
-     /**
-      * Forward factory for result
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
-index b8865f2de8d..752257f5b90 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Category;
- 
--class CategoriesJson extends \Magento\Catalog\Controller\Adminhtml\Category
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class CategoriesJson extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\JsonFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
-index 0a54475b15f..39122d139c9 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Category;
- 
--class Delete extends \Magento\Catalog\Controller\Adminhtml\Category
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+class Delete extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Catalog\Api\CategoryRepositoryInterface
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
-index 6ff478e49a3..0450ff1607a 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Category;
- 
--class Edit extends \Magento\Catalog\Controller\Adminhtml\Category
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Edit extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\JsonFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php
-index 4cc0f2d89d1..d1efa0014d4 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php
-@@ -5,12 +5,13 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Category\Image;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
- /**
-  * Class Upload
-  */
--class Upload extends \Magento\Backend\App\Action
-+class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Image uploader
-@@ -54,14 +55,6 @@ class Upload extends \Magento\Backend\App\Action
- 
-         try {
-             $result = $this->imageUploader->saveFileToTmpDir($imageId);
--
--            $result['cookie'] = [
--                'name' => $this->_getSession()->getName(),
--                'value' => $this->_getSession()->getSessionId(),
--                'lifetime' => $this->_getSession()->getCookieLifetime(),
--                'path' => $this->_getSession()->getCookiePath(),
--                'domain' => $this->_getSession()->getCookieDomain(),
--            ];
-         } catch (\Exception $e) {
-             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
-         }
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
-index 902d71775a3..a5be6223bee 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
-@@ -6,7 +6,12 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Category;
- 
--class Index extends \Magento\Catalog\Controller\Adminhtml\Category
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+/**
-+ * Controller for category listing
-+ */
-+class Index extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
-index df2c80eda14..082101ff078 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
-@@ -6,7 +6,12 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Category;
- 
--class Move extends \Magento\Catalog\Controller\Adminhtml\Category
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+/**
-+ * Move category admin controller
-+ */
-+class Move extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\JsonFactory
-@@ -26,7 +31,7 @@ class Move extends \Magento\Catalog\Controller\Adminhtml\Category
-     /**
-      * @param \Magento\Backend\App\Action\Context $context
-      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
--     * @param \Magento\Framework\View\LayoutFactory $layoutFactory,
-+     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-      * @param \Psr\Log\LoggerInterface $logger
-      */
-     public function __construct(
-@@ -44,7 +49,7 @@ class Move extends \Magento\Catalog\Controller\Adminhtml\Category
-     /**
-      * Move category action
-      *
--     * @return \Magento\Framework\Controller\Result\Raw
-+     * @return \Magento\Framework\Controller\Result\Json
-      */
-     public function execute()
-     {
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
-index 9384397b67f..e3d40bee214 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
-@@ -1,12 +1,16 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Category;
- 
--class RefreshPath extends \Magento\Catalog\Controller\Adminhtml\Category
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+/**
-+ * Class RefreshPath
-+ */
-+class RefreshPath extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\JsonFactory
-@@ -42,6 +46,7 @@ class RefreshPath extends \Magento\Catalog\Controller\Adminhtml\Category
-                 'id' => $categoryId,
-                 'path' => $category->getPath(),
-                 'parentId' => $category->getParentId(),
-+                'level' => $category->getLevel()
-             ]);
-         }
-     }
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
-index aa9ae88754b..77518fd9bf5 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\Catalog\Controller\Adminhtml\Category;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Catalog\Api\Data\CategoryAttributeInterface;
- use Magento\Store\Model\StoreManagerInterface;
- 
-@@ -14,7 +15,7 @@ use Magento\Store\Model\StoreManagerInterface;
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Save extends \Magento\Catalog\Controller\Adminhtml\Category
-+class Save extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\RawFactory
-@@ -146,6 +147,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Category
-                 $parentCategory = $this->getParentCategory($parentId, $storeId);
-                 $category->setPath($parentCategory->getPath());
-                 $category->setParentId($parentCategory->getId());
-+                $category->setLevel(null);
-             }
- 
-             /**
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php
-index 4eda49068ac..66a5fb1008a 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php
-@@ -5,10 +5,14 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Category;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+use Magento\Catalog\Controller\Adminhtml\Category as CategoryAction;
-+
- /**
-  * Catalog category validate
-  */
--class Validate extends \Magento\Catalog\Controller\Adminhtml\Category
-+class Validate extends CategoryAction implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\JsonFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
-index 7eb391dedf8..3cba09b1e8e 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
-@@ -6,10 +6,18 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Ui\Component\MassAction\Filter;
- use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-+use Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute as AttributeAction;
- 
--class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute
-+/**
-+ * Form for mass updatings products' attributes.
-+ * Can be accessed by GET since it's a form,
-+ * can be accessed by POST since it's used as a processor of a mass-action button.
-+ */
-+class Edit extends AttributeAction implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
-index 0fbf9054ef1..342bbc388f8 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
-@@ -6,84 +6,80 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
- 
-+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Backend\App\Action;
-+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
- 
- /**
-  * Class Save
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute
-+class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface
- {
-     /**
--     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
-+     * @var \Magento\Framework\Bulk\BulkManagementInterface
-      */
--    protected $_productFlatIndexerProcessor;
-+    private $bulkManagement;
- 
-     /**
--     * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-+     * @var \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory
-      */
--    protected $_productPriceIndexerProcessor;
-+    private $operationFactory;
- 
-     /**
--     * Catalog product
--     *
--     * @var \Magento\Catalog\Helper\Product
-+     * @var \Magento\Framework\DataObject\IdentityGeneratorInterface
-      */
--    protected $_catalogProduct;
-+    private $identityService;
- 
-     /**
--     * @var \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory
-+     * @var \Magento\Framework\Serialize\SerializerInterface
-      */
--    protected $stockItemFactory;
-+    private $serializer;
- 
-     /**
--     * Stock Indexer
--     *
--     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
-+     * @var \Magento\Authorization\Model\UserContextInterface
-      */
--    protected $_stockIndexerProcessor;
-+    private $userContext;
- 
-     /**
--     * @var \Magento\Framework\Api\DataObjectHelper
-+     * @var int
-      */
--    protected $dataObjectHelper;
-+    private $bulkSize;
- 
-     /**
-      * @param Action\Context $context
-      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
--     * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
--     * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
--     * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor
--     * @param \Magento\Catalog\Helper\Product $catalogProduct
--     * @param \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory
--     * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-+     * @param \Magento\Framework\Bulk\BulkManagementInterface $bulkManagement
-+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory $operartionFactory
-+     * @param \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService
-+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
-+     * @param \Magento\Authorization\Model\UserContextInterface $userContext
-+     * @param int $bulkSize
-      */
-     public function __construct(
-         Action\Context $context,
-         \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper,
--        \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
--        \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
--        \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
--        \Magento\Catalog\Helper\Product $catalogProduct,
--        \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory,
--        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-+        \Magento\Framework\Bulk\BulkManagementInterface $bulkManagement,
-+        \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory $operartionFactory,
-+        \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService,
-+        \Magento\Framework\Serialize\SerializerInterface $serializer,
-+        \Magento\Authorization\Model\UserContextInterface $userContext,
-+        int $bulkSize = 100
-     ) {
--        $this->_productFlatIndexerProcessor = $productFlatIndexerProcessor;
--        $this->_productPriceIndexerProcessor = $productPriceIndexerProcessor;
--        $this->_stockIndexerProcessor = $stockIndexerProcessor;
--        $this->_catalogProduct = $catalogProduct;
--        $this->stockItemFactory = $stockItemFactory;
-         parent::__construct($context, $attributeHelper);
--        $this->dataObjectHelper = $dataObjectHelper;
-+        $this->bulkManagement = $bulkManagement;
-+        $this->operationFactory = $operartionFactory;
-+        $this->identityService = $identityService;
-+        $this->serializer = $serializer;
-+        $this->userContext = $userContext;
-+        $this->bulkSize = $bulkSize;
-     }
- 
-     /**
-      * Update product attributes
-      *
--     * @return \Magento\Backend\Model\View\Result\Redirect
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.NPathComplexity)
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     * @return \Magento\Framework\Controller\Result\Redirect
-      */
-     public function execute()
-     {
-@@ -92,128 +88,184 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
-         }
- 
-         /* Collect Data */
--        $inventoryData = $this->getRequest()->getParam('inventory', []);
-         $attributesData = $this->getRequest()->getParam('attributes', []);
-         $websiteRemoveData = $this->getRequest()->getParam('remove_website_ids', []);
-         $websiteAddData = $this->getRequest()->getParam('add_website_ids', []);
- 
--        /* Prepare inventory data item options (use config settings) */
--        $options = $this->_objectManager->get(\Magento\CatalogInventory\Api\StockConfigurationInterface::class)
--            ->getConfigItemOptions();
--        foreach ($options as $option) {
--            if (isset($inventoryData[$option]) && !isset($inventoryData['use_config_' . $option])) {
--                $inventoryData['use_config_' . $option] = 0;
--            }
--        }
-+        $storeId = $this->attributeHelper->getSelectedStoreId();
-+        $websiteId = $this->attributeHelper->getStoreWebsiteId($storeId);
-+        $productIds = $this->attributeHelper->getProductIds();
-+
-+        $attributesData = $this->sanitizeProductAttributes($attributesData);
- 
-         try {
--            $storeId = $this->attributeHelper->getSelectedStoreId();
--            if ($attributesData) {
--                $dateFormat = $this->_objectManager->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
--                    ->getDateFormat(\IntlDateFormatter::SHORT);
--
--                foreach ($attributesData as $attributeCode => $value) {
--                    $attribute = $this->_objectManager->get(\Magento\Eav\Model\Config::class)
--                        ->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
--                    if (!$attribute->getAttributeId()) {
--                        unset($attributesData[$attributeCode]);
--                        continue;
--                    }
--                    if ($attribute->getBackendType() == 'datetime') {
--                        if (!empty($value)) {
--                            $filterInput = new \Zend_Filter_LocalizedToNormalized(['date_format' => $dateFormat]);
--                            $filterInternal = new \Zend_Filter_NormalizedToLocalized(
--                                ['date_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT]
--                            );
--                            $value = $filterInternal->filter($filterInput->filter($value));
--                        } else {
--                            $value = null;
--                        }
--                        $attributesData[$attributeCode] = $value;
--                    } elseif ($attribute->getFrontendInput() == 'multiselect') {
--                        // Check if 'Change' checkbox has been checked by admin for this attribute
--                        $isChanged = (bool)$this->getRequest()->getPost('toggle_' . $attributeCode);
--                        if (!$isChanged) {
--                            unset($attributesData[$attributeCode]);
--                            continue;
--                        }
--                        if (is_array($value)) {
--                            $value = implode(',', $value);
--                        }
--                        $attributesData[$attributeCode] = $value;
--                    }
--                }
-+            $this->publish($attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds);
-+            $this->messageManager->addSuccessMessage(__('Message is added to queue'));
-+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-+            $this->messageManager->addErrorMessage($e->getMessage());
-+        } catch (\Exception $e) {
-+            $this->messageManager->addExceptionMessage(
-+                $e,
-+                __('Something went wrong while updating the product(s) attributes.')
-+            );
-+        }
- 
--                $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class)
--                    ->updateAttributes($this->attributeHelper->getProductIds(), $attributesData, $storeId);
--            }
-+        return $this->resultRedirectFactory->create()->setPath('catalog/product/', ['store' => $storeId]);
-+    }
- 
--            if ($inventoryData) {
--                // TODO why use ObjectManager?
--                /** @var \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry */
--                $stockRegistry = $this->_objectManager
--                    ->create(\Magento\CatalogInventory\Api\StockRegistryInterface::class);
--                /** @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository */
--                $stockItemRepository = $this->_objectManager
--                    ->create(\Magento\CatalogInventory\Api\StockItemRepositoryInterface::class);
--                foreach ($this->attributeHelper->getProductIds() as $productId) {
--                    $stockItemDo = $stockRegistry->getStockItem(
--                        $productId,
--                        $this->attributeHelper->getStoreWebsiteId($storeId)
--                    );
--                    if (!$stockItemDo->getProductId()) {
--                        $inventoryData['product_id'] = $productId;
--                    }
--
--                    $stockItemId = $stockItemDo->getId();
--                    $this->dataObjectHelper->populateWithArray(
--                        $stockItemDo,
--                        $inventoryData,
--                        \Magento\CatalogInventory\Api\Data\StockItemInterface::class
-+    /**
-+     * Sanitize product attributes
-+     *
-+     * @param array $attributesData
-+     *
-+     * @return array
-+     */
-+    private function sanitizeProductAttributes($attributesData)
-+    {
-+        $dateFormat = $this->_objectManager->get(TimezoneInterface::class)->getDateFormat(\IntlDateFormatter::SHORT);
-+        $config = $this->_objectManager->get(\Magento\Eav\Model\Config::class);
-+
-+        foreach ($attributesData as $attributeCode => $value) {
-+            $attribute = $config->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
-+            if (!$attribute->getAttributeId()) {
-+                unset($attributesData[$attributeCode]);
-+                continue;
-+            }
-+            if ($attribute->getBackendType() === 'datetime') {
-+                if (!empty($value)) {
-+                    $filterInput = new \Zend_Filter_LocalizedToNormalized(['date_format' => $dateFormat]);
-+                    $filterInternal = new \Zend_Filter_NormalizedToLocalized(
-+                        ['date_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT]
-                     );
--                    $stockItemDo->setItemId($stockItemId);
--                    $stockItemRepository->save($stockItemDo);
-+                    $value = $filterInternal->filter($filterInput->filter($value));
-+                } else {
-+                    $value = null;
-                 }
--                $this->_stockIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
--            }
--
--            if ($websiteAddData || $websiteRemoveData) {
--                /* @var $actionModel \Magento\Catalog\Model\Product\Action */
--                $actionModel = $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class);
--                $productIds = $this->attributeHelper->getProductIds();
--
--                if ($websiteRemoveData) {
--                    $actionModel->updateWebsites($productIds, $websiteRemoveData, 'remove');
-+                $attributesData[$attributeCode] = $value;
-+            } elseif ($attribute->getFrontendInput() === 'multiselect') {
-+                // Check if 'Change' checkbox has been checked by admin for this attribute
-+                $isChanged = (bool)$this->getRequest()->getPost('toggle_' . $attributeCode);
-+                if (!$isChanged) {
-+                    unset($attributesData[$attributeCode]);
-+                    continue;
-                 }
--                if ($websiteAddData) {
--                    $actionModel->updateWebsites($productIds, $websiteAddData, 'add');
-+                if (is_array($value)) {
-+                    $value = implode(',', $value);
-                 }
--
--                $this->_eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
-+                $attributesData[$attributeCode] = $value;
-             }
-+        }
-+        return $attributesData;
-+    }
- 
--            $this->messageManager->addSuccessMessage(
--                __('A total of %1 record(s) were updated.', count($this->attributeHelper->getProductIds()))
--            );
--
--            $this->_productFlatIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
-+    /**
-+     * Schedule new bulk
-+     *
-+     * @param array $attributesData
-+     * @param array $websiteRemoveData
-+     * @param array $websiteAddData
-+     * @param int $storeId
-+     * @param int $websiteId
-+     * @param array $productIds
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     *
-+     * @return void
-+     */
-+    private function publish(
-+        $attributesData,
-+        $websiteRemoveData,
-+        $websiteAddData,
-+        $storeId,
-+        $websiteId,
-+        $productIds
-+    ):void {
-+        $productIdsChunks = array_chunk($productIds, $this->bulkSize);
-+        $bulkUuid = $this->identityService->generateId();
-+        $bulkDescription = __('Update attributes for ' . count($productIds) . ' selected products');
-+        $operations = [];
-+        foreach ($productIdsChunks as $productIdsChunk) {
-+            if ($websiteRemoveData || $websiteAddData) {
-+                $dataToUpdate = [
-+                    'website_assign' => $websiteAddData,
-+                    'website_detach' => $websiteRemoveData
-+                ];
-+                $operations[] = $this->makeOperation(
-+                    'Update website assign',
-+                    'product_action_attribute.website.update',
-+                    $dataToUpdate,
-+                    $storeId,
-+                    $websiteId,
-+                    $productIdsChunk,
-+                    $bulkUuid
-+                );
-+            }
- 
--            if ($this->_catalogProduct->isDataForPriceIndexerWasChanged($attributesData)
--                || !empty($websiteRemoveData)
--                || !empty($websiteAddData)
--            ) {
--                $this->_productPriceIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
-+            if ($attributesData) {
-+                $operations[] = $this->makeOperation(
-+                    'Update product attributes',
-+                    'product_action_attribute.update',
-+                    $attributesData,
-+                    $storeId,
-+                    $websiteId,
-+                    $productIdsChunk,
-+                    $bulkUuid
-+                );
-             }
--        } catch (\Magento\Framework\Exception\LocalizedException $e) {
--            $this->messageManager->addErrorMessage($e->getMessage());
--        } catch (\Exception $e) {
--            $this->messageManager->addExceptionMessage(
--                $e,
--                __('Something went wrong while updating the product(s) attributes.')
-+        }
-+
-+        if (!empty($operations)) {
-+            $result = $this->bulkManagement->scheduleBulk(
-+                $bulkUuid,
-+                $operations,
-+                $bulkDescription,
-+                $this->userContext->getUserId()
-             );
-+            if (!$result) {
-+                throw new \Magento\Framework\Exception\LocalizedException(
-+                    __('Something went wrong while processing the request.')
-+                );
-+            }
-         }
-+    }
-+
-+    /**
-+     * Make asynchronous operation
-+     *
-+     * @param string $meta
-+     * @param string $queue
-+     * @param array $dataToUpdate
-+     * @param int $storeId
-+     * @param int $websiteId
-+     * @param array $productIds
-+     * @param int $bulkUuid
-+     *
-+     * @return OperationInterface
-+     */
-+    private function makeOperation(
-+        $meta,
-+        $queue,
-+        $dataToUpdate,
-+        $storeId,
-+        $websiteId,
-+        $productIds,
-+        $bulkUuid
-+    ): OperationInterface {
-+        $dataToEncode = [
-+            'meta_information' => $meta,
-+            'product_ids' => $productIds,
-+            'store_id' => $storeId,
-+            'website_id' => $websiteId,
-+            'attributes' => $dataToUpdate
-+        ];
-+        $data = [
-+            'data' => [
-+                'bulk_uuid' => $bulkUuid,
-+                'topic_name' => $queue,
-+                'serialized_data' => $this->serializer->serialize($dataToEncode),
-+                'status' => \Magento\Framework\Bulk\OperationInterface::STATUS_TYPE_OPEN,
-+            ]
-+        ];
- 
--        return $this->resultRedirectFactory->create()
--            ->setPath('catalog/product/', ['store' => $this->attributeHelper->getSelectedStoreId()]);
-+        return $this->operationFactory->create($data);
-     }
- }
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php
-index a873f08d082..30a6629dd1c 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php
-@@ -6,7 +6,11 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
- 
--class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+use Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute as AttributeAction;
-+
-+class Validate extends AttributeAction implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\JsonFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
-index bbef1de28e5..09eacbbf073 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
-@@ -6,8 +6,10 @@
- 
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
-+use Magento\Backend\App\Action\Context;
- use Magento\Catalog\Api\AttributeSetRepositoryInterface;
- use Magento\Catalog\Api\Data\ProductAttributeInterface;
-+use Magento\Catalog\Controller\Adminhtml\Product;
- use Magento\Eav\Api\AttributeGroupRepositoryInterface;
- use Magento\Eav\Api\AttributeManagementInterface;
- use Magento\Eav\Api\AttributeRepositoryInterface;
-@@ -16,8 +18,14 @@ use Magento\Eav\Api\Data\AttributeGroupInterfaceFactory;
- use Magento\Eav\Api\Data\AttributeInterface;
- use Magento\Eav\Api\Data\AttributeSetInterface;
- use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\Controller\Result\Json;
-+use Magento\Framework\Controller\Result\JsonFactory;
-+use Magento\Framework\DataObject;
- use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\App\ObjectManager;
- use Psr\Log\LoggerInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Api\ExtensionAttributesFactory;
- 
- /**
-@@ -25,10 +33,10 @@ use Magento\Framework\Api\ExtensionAttributesFactory;
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Product
-+class AddAttributeToTemplate extends Product implements HttpPostActionInterface
- {
-     /**
--     * @var \Magento\Framework\Controller\Result\JsonFactory
-+     * @var JsonFactory
-      */
-     protected $resultJsonFactory;
- 
-@@ -75,33 +83,34 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
-     /**
-      * Constructor
-      *
--     * @param \Magento\Backend\App\Action\Context $context
-+     * @param Context $context
-      * @param Builder $productBuilder
--     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
--     * @param \Magento\Eav\Api\Data\AttributeGroupInterfaceFactory|null $attributeGroupFactory
-+     * @param JsonFactory $resultJsonFactory
-+     * @param AttributeGroupInterfaceFactory|null $attributeGroupFactory
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     * @SuppressWarnings(PHPMD.LongVariable)
-      */
-     public function __construct(
--        \Magento\Backend\App\Action\Context $context,
--        \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder,
--        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
--        \Magento\Eav\Api\Data\AttributeGroupInterfaceFactory $attributeGroupFactory = null
-+        Context $context,
-+        Builder $productBuilder,
-+        JsonFactory $resultJsonFactory,
-+        AttributeGroupInterfaceFactory $attributeGroupFactory = null
-     ) {
-         parent::__construct($context, $productBuilder);
-         $this->resultJsonFactory = $resultJsonFactory;
--        $this->attributeGroupFactory = $attributeGroupFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
--            ->get(\Magento\Eav\Api\Data\AttributeGroupInterfaceFactory::class);
-+        $this->attributeGroupFactory = $attributeGroupFactory ?: ObjectManager::getInstance()
-+            ->get(AttributeGroupInterfaceFactory::class);
-     }
- 
-     /**
-      * Add attribute to attribute set
-      *
--     * @return \Magento\Framework\Controller\Result\Json
-+     * @return Json
-      */
-     public function execute()
-     {
-         $request = $this->getRequest();
--        $response = new \Magento\Framework\DataObject();
-+        $response = new DataObject();
-         $response->setError(false);
- 
-         try {
-@@ -124,12 +133,12 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
-                     ->getItems();
- 
-                 if (!$attributeGroupItems) {
--                    throw new \Magento\Framework\Exception\NoSuchEntityException;
-+                    throw new NoSuchEntityException;
-                 }
- 
-                 /** @var AttributeGroupInterface $attributeGroup */
-                 $attributeGroup = reset($attributeGroupItems);
--            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+            } catch (NoSuchEntityException $e) {
-                 /** @var AttributeGroupInterface $attributeGroup */
-                 $attributeGroup = $this->attributeGroupFactory->create();
-             }
-@@ -176,101 +185,114 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
-      * Adding basic filters
-      *
-      * @return SearchCriteriaBuilder
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws LocalizedException
-      */
-     private function getBasicAttributeSearchCriteriaBuilder()
-     {
--        $attributeIds = (array)$this->getRequest()->getParam('attributeIds', []);
-+        $attributeIds = (array) $this->getRequest()->getParam('attributeIds', []);
- 
-         if (empty($attributeIds['selected'])) {
-             throw new LocalizedException(__('Attributes were missing and must be specified.'));
-         }
- 
-         return $this->getSearchCriteriaBuilder()
--            ->addFilter('attribute_set_id', new \Zend_Db_Expr('null'), 'is')
-             ->addFilter('attribute_id', [$attributeIds['selected']], 'in');
-     }
- 
-     /**
-+     * Get AttributeRepositoryInterface
-+     *
-      * @return AttributeRepositoryInterface
-      */
-     private function getAttributeRepository()
-     {
-         if (null === $this->attributeRepository) {
--            $this->attributeRepository = \Magento\Framework\App\ObjectManager::getInstance()
--                ->get(\Magento\Eav\Api\AttributeRepositoryInterface::class);
-+            $this->attributeRepository = ObjectManager::getInstance()
-+                ->get(AttributeRepositoryInterface::class);
-         }
-         return $this->attributeRepository;
-     }
- 
-     /**
-+     * Get AttributeSetRepositoryInterface
-+     *
-      * @return AttributeSetRepositoryInterface
-      */
-     private function getAttributeSetRepository()
-     {
-         if (null === $this->attributeSetRepository) {
--            $this->attributeSetRepository = \Magento\Framework\App\ObjectManager::getInstance()
--                ->get(\Magento\Catalog\Api\AttributeSetRepositoryInterface::class);
-+            $this->attributeSetRepository = ObjectManager::getInstance()
-+                ->get(AttributeSetRepositoryInterface::class);
-         }
-         return $this->attributeSetRepository;
-     }
- 
-     /**
-+     * Get AttributeGroupInterface
-+     *
-      * @return AttributeGroupRepositoryInterface
-      */
-     private function getAttributeGroupRepository()
-     {
-         if (null === $this->attributeGroupRepository) {
--            $this->attributeGroupRepository = \Magento\Framework\App\ObjectManager::getInstance()
--                ->get(\Magento\Eav\Api\AttributeGroupRepositoryInterface::class);
-+            $this->attributeGroupRepository = ObjectManager::getInstance()
-+                ->get(AttributeGroupRepositoryInterface::class);
-         }
-         return $this->attributeGroupRepository;
-     }
- 
-     /**
-+     * Get SearchCriteriaBuilder
-+     *
-      * @return SearchCriteriaBuilder
-      */
-     private function getSearchCriteriaBuilder()
-     {
-         if (null === $this->searchCriteriaBuilder) {
--            $this->searchCriteriaBuilder = \Magento\Framework\App\ObjectManager::getInstance()
--                ->get(\Magento\Framework\Api\SearchCriteriaBuilder::class);
-+            $this->searchCriteriaBuilder = ObjectManager::getInstance()
-+                ->get(SearchCriteriaBuilder::class);
-         }
-         return $this->searchCriteriaBuilder;
-     }
- 
-     /**
-+     * Get AttributeManagementInterface
-+     *
-      * @return AttributeManagementInterface
-      */
-     private function getAttributeManagement()
-     {
-         if (null === $this->attributeManagement) {
--            $this->attributeManagement = \Magento\Framework\App\ObjectManager::getInstance()
--                ->get(\Magento\Eav\Api\AttributeManagementInterface::class);
-+            $this->attributeManagement = ObjectManager::getInstance()
-+                ->get(AttributeManagementInterface::class);
-         }
-         return $this->attributeManagement;
-     }
- 
-     /**
-+     * Get LoggerInterface
-+     *
-      * @return LoggerInterface
-      */
-     private function getLogger()
-     {
-         if (null === $this->logger) {
--            $this->logger = \Magento\Framework\App\ObjectManager::getInstance()
--                ->get(\Psr\Log\LoggerInterface::class);
-+            $this->logger = ObjectManager::getInstance()
-+                ->get(LoggerInterface::class);
-         }
-         return $this->logger;
-     }
- 
-     /**
-+     * Get ExtensionAttributesFactory.
-+     *
-      * @return ExtensionAttributesFactory
-      */
-     private function getExtensionAttributesFactory()
-     {
-         if (null === $this->extensionAttributesFactory) {
--            $this->extensionAttributesFactory = \Magento\Framework\App\ObjectManager::getInstance()
--                ->get(\Magento\Framework\Api\ExtensionAttributesFactory::class);
-+            $this->extensionAttributesFactory = ObjectManager::getInstance()
-+                ->get(ExtensionAttributesFactory::class);
-         }
-         return $this->extensionAttributesFactory;
-     }
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
-index bef6aee0e2a..faa9e4ddf49 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
- 
--class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpPostActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Redirect
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
-index a99cbdbade1..a41cd71aea4 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
- 
--class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Framework\Controller\ResultInterface
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php
-index 9bdc54b289c..34267121f9b 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
- 
--class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Page
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php
-index e954d973059..fdfde7e8060 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
- 
--class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
-index 817de6828e4..853cc652703 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
-@@ -7,12 +7,14 @@
- 
- namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Backend\App\Action\Context;
- use Magento\Backend\Model\View\Result\Redirect;
- use Magento\Catalog\Api\Data\ProductAttributeInterface;
- use Magento\Catalog\Controller\Adminhtml\Product\Attribute;
- use Magento\Catalog\Helper\Product;
- use Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation;
-+use Magento\Framework\Serialize\Serializer\FormData;
- use Magento\Catalog\Model\Product\AttributeSet\BuildFactory;
- use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
- use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\Validator;
-@@ -31,9 +33,11 @@ use Magento\Framework\View\LayoutFactory;
- use Magento\Framework\View\Result\PageFactory;
- 
- /**
-+ * Product attribute save controller.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Save extends Attribute
-+class Save extends Attribute implements HttpPostActionInterface
- {
-     /**
-      * @var BuildFactory
-@@ -75,6 +79,11 @@ class Save extends Attribute
-      */
-     private $presentation;
- 
-+    /**
-+     * @var FormData|null
-+     */
-+    private $formDataSerializer;
-+
-     /**
-      * @param Context $context
-      * @param FrontendInterface $attributeLabelCache
-@@ -88,6 +97,7 @@ class Save extends Attribute
-      * @param Product $productHelper
-      * @param LayoutFactory $layoutFactory
-      * @param Presentation|null $presentation
-+     * @param FormData|null $formDataSerializer
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -102,7 +112,8 @@ class Save extends Attribute
-         FilterManager $filterManager,
-         Product $productHelper,
-         LayoutFactory $layoutFactory,
--        Presentation $presentation = null
-+        Presentation $presentation = null,
-+        FormData $formDataSerializer = null
-     ) {
-         parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
-         $this->buildFactory = $buildFactory;
-@@ -113,19 +124,38 @@ class Save extends Attribute
-         $this->groupCollectionFactory = $groupCollectionFactory;
-         $this->layoutFactory = $layoutFactory;
-         $this->presentation = $presentation ?: ObjectManager::getInstance()->get(Presentation::class);
-+        $this->formDataSerializer = $formDataSerializer
-+            ?: ObjectManager::getInstance()->get(FormData::class);
-     }
- 
-     /**
-+     * @inheritdoc
-+     *
-      * @return Redirect
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     * @throws \Zend_Validate_Exception
-      */
-     public function execute()
-     {
-+        try {
-+            $optionData = $this->formDataSerializer
-+                ->unserialize($this->getRequest()->getParam('serialized_options', '[]'));
-+        } catch (\InvalidArgumentException $e) {
-+            $message = __("The attribute couldn't be saved due to an error. Verify your information and try again. "
-+                . "If the error persists, please try again later.");
-+            $this->messageManager->addErrorMessage($message);
-+            return $this->returnResult('catalog/*/edit', ['_current' => true], ['error' => true]);
-+        }
-+
-         $data = $this->getRequest()->getPostValue();
-+        $data = array_replace_recursive(
-+            $data,
-+            $optionData
-+        );
-+
-         if ($data) {
--            $this->preprocessOptionsData($data);
-             $setId = $this->getRequest()->getParam('set');
- 
-             $attributeSet = null;
-@@ -134,7 +164,7 @@ class Save extends Attribute
-                 $name = trim($name);
- 
-                 try {
--                    /** @var $attributeSet Set */
-+                    /** @var Set $attributeSet */
-                     $attributeSet = $this->buildFactory->create()
-                         ->setEntityTypeId($this->_entityTypeId)
-                         ->setSkeletonId($setId)
-@@ -156,7 +186,7 @@ class Save extends Attribute
- 
-             $attributeId = $this->getRequest()->getParam('attribute_id');
- 
--            /** @var $model ProductAttributeInterface */
-+            /** @var ProductAttributeInterface $model */
-             $model = $this->attributeFactory->create();
-             if ($attributeId) {
-                 $model->load($attributeId);
-@@ -165,30 +195,11 @@ class Save extends Attribute
-                 ? $model->getAttributeCode()
-                 : $this->getRequest()->getParam('attribute_code');
-             $attributeCode = $attributeCode ?: $this->generateCode($this->getRequest()->getParam('frontend_label')[0]);
--            if (strlen($attributeCode) > 0) {
--                $validatorAttrCode = new \Zend_Validate_Regex(
--                    ['pattern' => '/^[a-z\x{600}-\x{6FF}][a-z\x{600}-\x{6FF}_0-9]{0,30}$/u']
--                );
--                if (!$validatorAttrCode->isValid($attributeCode)) {
--                    $this->messageManager->addErrorMessage(
--                        __(
--                            'Attribute code "%1" is invalid. Please use only letters (a-z), ' .
--                            'numbers (0-9) or underscore(_) in this field, first character should be a letter.',
--                            $attributeCode
--                        )
--                    );
--                    return $this->returnResult(
--                        'catalog/*/edit',
--                        ['attribute_id' => $attributeId, '_current' => true],
--                        ['error' => true]
--                    );
--                }
--            }
-             $data['attribute_code'] = $attributeCode;
- 
-             //validate frontend_input
-             if (isset($data['frontend_input'])) {
--                /** @var $inputType Validator */
-+                /** @var Validator $inputType */
-                 $inputType = $this->validatorFactory->create();
-                 if (!$inputType->isValid($data['frontend_input'])) {
-                     foreach ($inputType->getMessages() as $message) {
-@@ -229,14 +240,14 @@ class Save extends Attribute
-                 $data['backend_model'] = $this->productHelper->getAttributeBackendModelByInputType(
-                     $data['frontend_input']
-                 );
-+
-+                if ($model->getIsUserDefined() === null) {
-+                    $data['backend_type'] = $model->getBackendTypeByInput($data['frontend_input']);
-+                }
-             }
- 
-             $data += ['is_filterable' => 0, 'is_filterable_in_search' => 0];
- 
--            if ($model->getIsUserDefined() === null || $model->getIsUserDefined() != 0) {
--                $data['backend_type'] = $model->getBackendTypeByInput($data['frontend_input']);
--            }
--
-             $defaultValueField = $model->getDefaultValueByInput($data['frontend_input']);
-             if ($defaultValueField) {
-                 $data['default_value'] = $this->getRequest()->getParam($defaultValueField);
-@@ -316,28 +327,8 @@ class Save extends Attribute
-     }
- 
-     /**
--     * Extract options data from serialized options field and append to data array.
--     *
--     * This logic is required to overcome max_input_vars php limit
--     * that may vary and/or be inaccessible to change on different instances.
-+     * Provides an initialized Result object.
-      *
--     * @param array $data
--     * @return void
--     */
--    private function preprocessOptionsData(&$data)
--    {
--        if (isset($data['serialized_options'])) {
--            $serializedOptions = json_decode($data['serialized_options'], JSON_OBJECT_AS_ARRAY);
--            foreach ($serializedOptions as $serializedOption) {
--                $option = [];
--                parse_str($serializedOption, $option);
--                $data = array_replace_recursive($data, $option);
--            }
--        }
--        unset($data['serialized_options']);
--    }
--
--    /**
-      * @param string $path
-      * @param array $params
-      * @param array $response
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
-index db452113ada..c74a382724a 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
-@@ -7,9 +7,20 @@
- 
- namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
- 
-+use Magento\Catalog\Controller\Adminhtml\Product\Attribute as AttributeAction;
-+use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\DataObject;
-+use Magento\Framework\Serialize\Serializer\FormData;
- 
--class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-+/**
-+ * Product attribute validate controller.
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class Validate extends AttributeAction implements HttpGetActionInterface, HttpPostActionInterface
- {
-     const DEFAULT_MESSAGE_KEY = 'message';
- 
-@@ -28,6 +39,16 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-      */
-     private $multipleAttributeList;
- 
-+    /**
-+     * @var FormData|null
-+     */
-+    private $formDataSerializer;
-+
-+    /**
-+     * @var AttributeCodeValidator
-+     */
-+    private $attributeCodeValidator;
-+
-     /**
-      * Constructor
-      *
-@@ -38,6 +59,8 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-      * @param array $multipleAttributeList
-+     * @param FormData|null $formDataSerializer
-+     * @param AttributeCodeValidator|null $attributeCodeValidator
-      */
-     public function __construct(
-         \Magento\Backend\App\Action\Context $context,
-@@ -46,15 +69,24 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-         \Magento\Framework\View\LayoutFactory $layoutFactory,
--        array $multipleAttributeList = []
-+        array $multipleAttributeList = [],
-+        FormData $formDataSerializer = null,
-+        AttributeCodeValidator $attributeCodeValidator = null
-     ) {
-         parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
-         $this->resultJsonFactory = $resultJsonFactory;
-         $this->layoutFactory = $layoutFactory;
-         $this->multipleAttributeList = $multipleAttributeList;
-+        $this->formDataSerializer = $formDataSerializer ?: ObjectManager::getInstance()
-+            ->get(FormData::class);
-+        $this->attributeCodeValidator = $attributeCodeValidator ?: ObjectManager::getInstance()->get(
-+            AttributeCodeValidator::class
-+        );
-     }
- 
-     /**
-+     * @inheritdoc
-+     *
-      * @return \Magento\Framework\Controller\ResultInterface
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-@@ -63,6 +95,15 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-     {
-         $response = new DataObject();
-         $response->setError(false);
-+        try {
-+            $optionsData = $this->formDataSerializer
-+                ->unserialize($this->getRequest()->getParam('serialized_options', '[]'));
-+        } catch (\InvalidArgumentException $e) {
-+            $message = __("The attribute couldn't be validated due to an error. Verify your information and try again. "
-+                . "If the error persists, please try again later.");
-+            $this->setMessageToResponse($response, [$message]);
-+            $response->setError(true);
-+        }
- 
-         $attributeCode = $this->getRequest()->getParam('attribute_code');
-         $frontendLabel = $this->getRequest()->getParam('frontend_label');
-@@ -75,7 +116,7 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-             $attributeCode
-         );
- 
--        if ($attribute->getId() && !$attributeId) {
-+        if ($attribute->getId() && !$attributeId || $attributeCode === 'product_type' || $attributeCode === 'type_id') {
-             $message = strlen($this->getRequest()->getParam('attribute_code'))
-                 ? __('An attribute with this code already exists.')
-                 : __('An attribute with the same code (%1) already exists.', $attributeCode);
-@@ -85,6 +126,12 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-             $response->setError(true);
-             $response->setProductAttribute($attribute->toArray());
-         }
-+
-+        if (!$this->attributeCodeValidator->isValid($attributeCode)) {
-+            $this->setMessageToResponse($response, $this->attributeCodeValidator->getMessages());
-+            $response->setError(true);
-+        }
-+
-         if ($this->getRequest()->has('new_attribute_set_name')) {
-             $setName = $this->getRequest()->getParam('new_attribute_set_name');
-             /** @var $attributeSet \Magento\Eav\Model\Entity\Attribute\Set */
-@@ -102,10 +149,10 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-         }
- 
-         $multipleOption = $this->getRequest()->getParam("frontend_input");
--        $multipleOption = null == $multipleOption ? 'select' : $multipleOption;
-+        $multipleOption = (null === $multipleOption) ? 'select' : $multipleOption;
- 
--        if (isset($this->multipleAttributeList[$multipleOption]) && !(null == ($multipleOption))) {
--            $options = $this->getRequest()->getParam($this->multipleAttributeList[$multipleOption]);
-+        if (isset($this->multipleAttributeList[$multipleOption])) {
-+            $options = $optionsData[$this->multipleAttributeList[$multipleOption]] ?? null;
-             $this->checkUniqueOption(
-                 $response,
-                 $options
-@@ -123,7 +170,8 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-     }
- 
-     /**
--     * Throws Exception if not unique values into options
-+     * Throws Exception if not unique values into options.
-+     *
-      * @param array $optionsValues
-      * @param array $deletedOptions
-      * @return bool
-@@ -132,7 +180,7 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-     {
-         $adminValues = [];
-         foreach ($optionsValues as $optionKey => $values) {
--            if (!(isset($deletedOptions[$optionKey]) and $deletedOptions[$optionKey] === '1')) {
-+            if (!(isset($deletedOptions[$optionKey]) && $deletedOptions[$optionKey] === '1')) {
-                 $adminValues[] = reset($values);
-             }
-         }
-@@ -157,6 +205,8 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
-     }
- 
-     /**
-+     * Performs checking the uniqueness of the attribute options.
-+     *
-      * @param DataObject $response
-      * @param array|null $options
-      * @return $this
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
-index 4fa61b2b372..78ad9f42387 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
-@@ -3,15 +3,26 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
-+use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Model\ProductFactory;
- use Magento\Cms\Model\Wysiwyg as WysiwygModel;
- use Magento\Framework\App\RequestInterface;
- use Magento\Store\Model\StoreFactory;
- use Psr\Log\LoggerInterface as Logger;
- use Magento\Framework\Registry;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Type as ProductTypes;
- 
-+/**
-+ * Build a product based on a request
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class Builder
- {
-     /**
-@@ -39,6 +50,11 @@ class Builder
-      */
-     protected $storeFactory;
- 
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-     /**
-      * Constructor
-      *
-@@ -47,13 +63,15 @@ class Builder
-      * @param Registry $registry
-      * @param WysiwygModel\Config $wysiwygConfig
-      * @param StoreFactory|null $storeFactory
-+     * @param ProductRepositoryInterface|null $productRepository
-      */
-     public function __construct(
-         ProductFactory $productFactory,
-         Logger $logger,
-         Registry $registry,
-         WysiwygModel\Config $wysiwygConfig,
--        StoreFactory $storeFactory = null
-+        StoreFactory $storeFactory = null,
-+        ProductRepositoryInterface $productRepository = null
-     ) {
-         $this->productFactory = $productFactory;
-         $this->logger = $logger;
-@@ -61,47 +79,77 @@ class Builder
-         $this->wysiwygConfig = $wysiwygConfig;
-         $this->storeFactory = $storeFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
-             ->get(\Magento\Store\Model\StoreFactory::class);
-+        $this->productRepository = $productRepository ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(ProductRepositoryInterface::class);
-     }
- 
-     /**
-      * Build product based on user request
-      *
-      * @param RequestInterface $request
--     * @return \Magento\Catalog\Model\Product
-+     * @return ProductInterface
-+     * @throws \RuntimeException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
--    public function build(RequestInterface $request)
-+    public function build(RequestInterface $request): ProductInterface
-     {
--        $productId = (int)$request->getParam('id');
--        /** @var $product \Magento\Catalog\Model\Product */
--        $product = $this->productFactory->create();
--        $product->setStoreId($request->getParam('store', 0));
--        $store = $this->storeFactory->create();
--        $store->load($request->getParam('store', 0));
--
-+        $productId = (int) $request->getParam('id');
-+        $storeId = $request->getParam('store', 0);
-+        $attributeSetId = (int) $request->getParam('set');
-         $typeId = $request->getParam('type');
--        if (!$productId && $typeId) {
--            $product->setTypeId($typeId);
--        }
- 
--        $product->setData('_edit_mode', true);
-         if ($productId) {
-             try {
--                $product->load($productId);
-+                $product = $this->productRepository->getById($productId, true, $storeId);
-+                if ($attributeSetId) {
-+                    $product->setAttributeSetId($attributeSetId);
-+                }
-             } catch (\Exception $e) {
--                $product->setTypeId(\Magento\Catalog\Model\Product\Type::DEFAULT_TYPE);
-+                $product = $this->createEmptyProduct(ProductTypes::DEFAULT_TYPE, $attributeSetId, $storeId);
-                 $this->logger->critical($e);
-             }
-+        } else {
-+            $product = $this->createEmptyProduct($typeId, $attributeSetId, $storeId);
-         }
- 
--        $setId = (int)$request->getParam('set');
--        if ($setId) {
--            $product->setAttributeSetId($setId);
--        }
-+        $store = $this->storeFactory->create();
-+        $store->load($storeId);
- 
-         $this->registry->register('product', $product);
-         $this->registry->register('current_product', $product);
-         $this->registry->register('current_store', $store);
--        $this->wysiwygConfig->setStoreId($request->getParam('store'));
-+
-+        $this->wysiwygConfig->setStoreId($storeId);
-+
-+        return $product;
-+    }
-+
-+    /**
-+     * Create a product with the given properties
-+     *
-+     * @param int $typeId
-+     * @param int $attributeSetId
-+     * @param int $storeId
-+     * @return \Magento\Catalog\Model\Product
-+     */
-+    private function createEmptyProduct($typeId, $attributeSetId, $storeId): Product
-+    {
-+        /** @var $product \Magento\Catalog\Model\Product */
-+        $product = $this->productFactory->create();
-+        $product->setData('_edit_mode', true);
-+
-+        if ($typeId !== null) {
-+            $product->setTypeId($typeId);
-+        }
-+
-+        if ($storeId !== null) {
-+            $product->setStoreId($storeId);
-+        }
-+
-+        if ($attributeSetId) {
-+            $product->setAttributeSetId($attributeSetId);
-+        }
-+
-         return $product;
-     }
- }
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php
-index fa94a2fb7be..e51d3ffe94a 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php
-@@ -6,7 +6,17 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
--class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product
-+use Magento\Catalog\Controller\Adminhtml\Product;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class Crosssell
-+ *
-+ * @package Magento\Catalog\Controller\Adminhtml\Product
-+ * @deprecated Not used since cross-sell products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
-+ */
-+class Crosssell extends Product implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\LayoutFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php
-index daaf2c21ee2..5039d0c052b 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php
-@@ -6,7 +6,17 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
--class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product
-+use Magento\Catalog\Controller\Adminhtml\Product;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class CrosssellGrid
-+ *
-+ * @package Magento\Catalog\Controller\Adminhtml\Product
-+ * @deprecated Not used since cross-sell products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
-+ */
-+class CrosssellGrid extends Product implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\LayoutFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
-index 1b9316a95ad..c31ceabcda6 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
--class Edit extends \Magento\Catalog\Controller\Adminhtml\Product
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Edit extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface
- {
-     /**
-      * Array of actions which can be processed without secret key validation
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php
-index b5660ea8793..ff7311e9317 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Gallery;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- 
--class Upload extends \Magento\Backend\App\Action
-+class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php
-index 40e62895caf..51aaa8c178e 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php
-@@ -1,12 +1,16 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
--class GridOnly extends \Magento\Catalog\Controller\Adminhtml\Product
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+
-+/**
-+ * Get specified tab grid controller.
-+ */
-+class GridOnly extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\RawFactory
-@@ -47,7 +51,7 @@ class GridOnly extends \Magento\Catalog\Controller\Adminhtml\Product
-         $this->productBuilder->build($this->getRequest());
- 
-         $block = $this->getRequest()->getParam('gridOnlyBlock');
--        $blockClassSuffix = str_replace(' ', '_', ucwords(str_replace('_', ' ', $block)));
-+        $blockClassSuffix = ucwords($block, '_');
- 
-         /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
-         $resultRaw = $this->resultRawFactory->create();
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php
-index ea66ecf6b16..7755a512eb9 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
--class Index extends \Magento\Catalog\Controller\Adminhtml\Product
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
-index d82f4a04fb2..f11d16755ef 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
-@@ -19,6 +19,8 @@ use Magento\Framework\App\ObjectManager;
- use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter;
- 
- /**
-+ * Product helper
-+ *
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @since 100.0.2
-@@ -365,6 +367,8 @@ class Helper
-     }
- 
-     /**
-+     * Get link resolver instance
-+     *
-      * @return LinkResolver
-      * @deprecated 101.0.0
-      */
-@@ -377,6 +381,8 @@ class Helper
-     }
- 
-     /**
-+     * Get DateTimeFilter instance
-+     *
-      * @return \Magento\Framework\Stdlib\DateTime\Filter\DateTime
-      * @deprecated 101.0.0
-      */
-@@ -391,6 +397,7 @@ class Helper
- 
-     /**
-      * Remove ids of non selected websites from $websiteIds array and return filtered data
-+     *
-      * $websiteIds parameter expects array with website ids as keys and 1 (selected) or 0 (non selected) as values
-      * Only one id (default website ID) will be set to $websiteIds array when the single store mode is turned on
-      *
-@@ -463,6 +470,7 @@ class Helper
-     private function convertSpecialFromDateStringToObject($productData)
-     {
-         if (isset($productData['special_from_date']) && $productData['special_from_date'] != '') {
-+            $productData['special_from_date'] = $this->getDateTimeFilter()->filter($productData['special_from_date']);
-             $productData['special_from_date'] = new \DateTime($productData['special_from_date']);
-         }
- 
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
-index 188b0b22f33..49165c85f85 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
-@@ -46,6 +46,8 @@ class AttributeFilter
-     }
- 
-     /**
-+     * Reset "Use Config Settings" to false in product data.
-+     *
-      * @param Product $product
-      * @param string $attributeCode
-      * @param array $productData
-@@ -62,6 +64,8 @@ class AttributeFilter
-     }
- 
-     /**
-+     * Prepare default attribute data for product.
-+     *
-      * @param array $attributeList
-      * @param string $attributeCode
-      * @param array $productData
-@@ -73,7 +77,7 @@ class AttributeFilter
-             /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
-             $attribute = $attributeList[$attributeCode];
-             $attributeType = $attribute->getBackendType();
--            // For non-numberic types set the attributeValue to 'false' to trigger their removal from the db
-+            // For non-numeric types set the attributeValue to 'false' to trigger their removal from the db
-             if ($attributeType === 'varchar' || $attributeType === 'text' || $attributeType === 'datetime') {
-                 $attribute->setIsRequired(false);
-                 $productData[$attributeCode] = false;
-@@ -86,6 +90,8 @@ class AttributeFilter
-     }
- 
-     /**
-+     * Check, whether attribute should not be updated.
-+     *
-      * @param Product $product
-      * @param array $useDefaults
-      * @param string $attribute
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
-index f32c6edd573..8fceba3c45e 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
-@@ -6,13 +6,14 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Backend\App\Action\Context;
- use Magento\Ui\Component\MassAction\Filter;
- use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
- use Magento\Catalog\Api\ProductRepositoryInterface;
- 
--class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product
-+class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface
- {
-     /**
-      * Massactions filter
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
-index e3623aabfa1..9d7273fb3f2 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
-@@ -6,6 +6,7 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Catalog\Controller\Adminhtml\Product;
- use Magento\Framework\Controller\ResultFactory;
-@@ -13,9 +14,10 @@ use Magento\Ui\Component\MassAction\Filter;
- use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
- 
- /**
-+ * Updates status for a batch of products.
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product
-+class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-@@ -86,7 +88,7 @@ class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product
-         $filterRequest = $this->getRequest()->getParam('filters', null);
-         $status = (int) $this->getRequest()->getParam('status');
- 
--        if (null !== $storeId && null !== $filterRequest) {
-+        if (null === $storeId && null !== $filterRequest) {
-             $storeId = (isset($filterRequest['store_id'])) ? (int) $filterRequest['store_id'] : 0;
-         }
- 
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php
-index 0b027105cd7..0b1ef98c386 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php
-@@ -6,11 +6,12 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Catalog\Controller\Adminhtml\Product;
- use Magento\Framework\App\ObjectManager;
- 
--class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product
-+class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface
- {
-     /**
-      * @var Initialization\StockDataFilter
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php
-index 4bc15d14a29..f54f8d469c3 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php
-@@ -7,7 +7,17 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
--class Related extends \Magento\Catalog\Controller\Adminhtml\Product
-+use Magento\Catalog\Controller\Adminhtml\Product;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class Related
-+ *
-+ * @package Magento\Catalog\Controller\Adminhtml\Product
-+ * @deprecated Not used since related products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
-+ */
-+class Related extends Product implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\LayoutFactory
-@@ -29,6 +39,8 @@ class Related extends \Magento\Catalog\Controller\Adminhtml\Product
-     }
- 
-     /**
-+     * Execute
-+     *
-      * @return \Magento\Framework\View\Result\Layout
-      */
-     public function execute()
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php
-index b2fc7ebe1eb..b1092bba0d3 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php
-@@ -7,6 +7,15 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
--class RelatedGrid extends Related
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class RelatedGrid
-+ *
-+ * @package Magento\Catalog\Controller\Adminhtml\Product
-+ * @deprecated Not used since related products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
-+ */
-+class RelatedGrid extends Related implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Reload.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Reload.php
-index ff87e7f5741..a0963e60d88 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Reload.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Reload.php
-@@ -5,12 +5,13 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
- /**
-  * Backend reload of product create/edit form
-  */
--class Reload extends \Magento\Catalog\Controller\Adminhtml\Product
-+class Reload extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface
- {
-     /**
-      * {@inheritdoc}
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
-index ff3ce60d927..825d0ee032d 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
-@@ -7,7 +7,9 @@
- 
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Backend\App\Action;
-+use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Controller\Adminhtml\Product;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\Framework\App\Request\DataPersistorInterface;
-@@ -16,7 +18,7 @@ use Magento\Framework\App\Request\DataPersistorInterface;
-  * Class Save
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Save extends \Magento\Catalog\Controller\Adminhtml\Product
-+class Save extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface
- {
-     /**
-      * @var Initialization\Helper
-@@ -53,6 +55,16 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
-      */
-     private $storeManager;
- 
-+    /**
-+     * @var \Magento\Framework\Escaper|null
-+     */
-+    private $escaper;
-+
-+    /**
-+     * @var null|\Psr\Log\LoggerInterface
-+     */
-+    private $logger;
-+
-     /**
-      * Save constructor.
-      *
-@@ -62,6 +74,8 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
-      * @param \Magento\Catalog\Model\Product\Copier $productCopier
-      * @param \Magento\Catalog\Model\Product\TypeTransitionManager $productTypeManager
-      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-+     * @param \Magento\Framework\Escaper|null $escaper
-+     * @param \Psr\Log\LoggerInterface|null $logger
-      */
-     public function __construct(
-         \Magento\Backend\App\Action\Context $context,
-@@ -69,13 +83,17 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
-         Initialization\Helper $initializationHelper,
-         \Magento\Catalog\Model\Product\Copier $productCopier,
-         \Magento\Catalog\Model\Product\TypeTransitionManager $productTypeManager,
--        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-+        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
-+        \Magento\Framework\Escaper $escaper = null,
-+        \Psr\Log\LoggerInterface $logger = null
-     ) {
-         $this->initializationHelper = $initializationHelper;
-         $this->productCopier = $productCopier;
-         $this->productTypeManager = $productTypeManager;
-         $this->productRepository = $productRepository;
-         parent::__construct($context, $productBuilder);
-+        $this->escaper = $escaper ?? $this->_objectManager->get(\Magento\Framework\Escaper::class);
-+        $this->logger = $logger ?? $this->_objectManager->get(\Psr\Log\LoggerInterface::class);
-     }
- 
-     /**
-@@ -102,7 +120,6 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
-                     $this->productBuilder->build($this->getRequest())
-                 );
-                 $this->productTypeManager->processProduct($product);
--
-                 if (isset($data['product'][$product->getIdFieldName()])) {
-                     throw new \Magento\Framework\Exception\LocalizedException(
-                         __('The product was unable to be saved. Please try again.')
-@@ -110,6 +127,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
-                 }
- 
-                 $originalSku = $product->getSku();
-+                $canSaveCustomOptions = $product->getCanSaveCustomOptions();
-                 $product->save();
-                 $this->handleImageRemoveError($data, $product->getId());
-                 $this->getCategoryLinkManagement()->assignProductToCategories(
-@@ -119,21 +137,17 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
-                 $productId = $product->getEntityId();
-                 $productAttributeSetId = $product->getAttributeSetId();
-                 $productTypeId = $product->getTypeId();
--
--                $this->copyToStores($data, $productId);
--
-+                $extendedData = $data;
-+                $extendedData['can_save_custom_options'] = $canSaveCustomOptions;
-+                $this->copyToStores($extendedData, $productId);
-                 $this->messageManager->addSuccessMessage(__('You saved the product.'));
-                 $this->getDataPersistor()->clear('catalog_product');
-                 if ($product->getSku() != $originalSku) {
-                     $this->messageManager->addNoticeMessage(
-                         __(
-                             'SKU for product %1 has been changed to %2.',
--                            $this->_objectManager->get(
--                                \Magento\Framework\Escaper::class
--                            )->escapeHtml($product->getName()),
--                            $this->_objectManager->get(
--                                \Magento\Framework\Escaper::class
--                            )->escapeHtml($product->getSku())
-+                            $this->escaper->escapeHtml($product->getName()),
-+                            $this->escaper->escapeHtml($product->getSku())
-                         )
-                     );
-                 }
-@@ -143,17 +157,21 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
-                 );
- 
-                 if ($redirectBack === 'duplicate') {
-+                    $product->unsetData('quantity_and_stock_status');
-                     $newProduct = $this->productCopier->copy($product);
-+                    $this->checkUniqueAttributes($product);
-                     $this->messageManager->addSuccessMessage(__('You duplicated the product.'));
-                 }
-             } catch (\Magento\Framework\Exception\LocalizedException $e) {
--                $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-+                $this->logger->critical($e);
-                 $this->messageManager->addExceptionMessage($e);
-+                $data = isset($product) ? $this->persistMediaData($product, $data) : $data;
-                 $this->getDataPersistor()->set('catalog_product', $data);
-                 $redirectBack = $productId ? true : 'new';
-             } catch (\Exception $e) {
--                $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-+                $this->logger->critical($e);
-                 $this->messageManager->addErrorMessage($e->getMessage());
-+                $data = isset($product) ? $this->persistMediaData($product, $data) : $data;
-                 $this->getDataPersistor()->set('catalog_product', $data);
-                 $redirectBack = $productId ? true : 'new';
-             }
-@@ -186,6 +204,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
- 
-     /**
-      * Notify customer when image was not deleted in specific case.
-+     *
-      * TODO: temporary workaround must be eliminated in MAGETWO-45306
-      *
-      * @param array $postData
-@@ -239,6 +258,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
-                                     ->setStoreId($copyFrom)
-                                     ->load($productId)
-                                     ->setStoreId($copyTo)
-+                                    ->setCanSaveCustomOptions($data['can_save_custom_options'])
-                                     ->setCopyFromView(true)
-                                     ->save();
-                             }
-@@ -250,6 +270,8 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
-     }
- 
-     /**
-+     * Get categoryLinkManagement in a backward compatible way.
-+     *
-      * @return \Magento\Catalog\Api\CategoryLinkManagementInterface
-      */
-     private function getCategoryLinkManagement()
-@@ -262,6 +284,8 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
-     }
- 
-     /**
-+     * Get storeManager in a backward compatible way.
-+     *
-      * @return StoreManagerInterface
-      * @deprecated 101.0.0
-      */
-@@ -288,4 +312,57 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
- 
-         return $this->dataPersistor;
-     }
-+
-+    /**
-+     * Persist media gallery on error, in order to show already saved images on next run.
-+     *
-+     * @param ProductInterface $product
-+     * @param array $data
-+     * @return array
-+     */
-+    private function persistMediaData(ProductInterface $product, array $data)
-+    {
-+        $mediaGallery = $product->getData('media_gallery');
-+        if (!empty($mediaGallery['images'])) {
-+            foreach ($mediaGallery['images'] as $key => $image) {
-+                if (!isset($image['new_file'])) {
-+                    //Remove duplicates.
-+                    unset($mediaGallery['images'][$key]);
-+                }
-+            }
-+            $data['product']['media_gallery'] = $mediaGallery;
-+            $fields = [
-+                'image',
-+                'small_image',
-+                'thumbnail',
-+                'swatch_image',
-+            ];
-+            foreach ($fields as $field) {
-+                $data['product'][$field] = $product->getData($field);
-+            }
-+        }
-+
-+        return $data;
-+    }
-+
-+    /**
-+     * Check unique attributes and add error to message manager
-+     *
-+     * @param \Magento\Catalog\Model\Product $product
-+     */
-+    private function checkUniqueAttributes(\Magento\Catalog\Model\Product $product)
-+    {
-+        $uniqueLabels = [];
-+        foreach ($product->getAttributes() as $attribute) {
-+            if ($attribute->getIsUnique() && $attribute->getIsUserDefined()
-+                && $product->getData($attribute->getAttributeCode()) !== null
-+            ) {
-+                $uniqueLabels[] = $attribute->getDefaultFrontendLabel();
-+            }
-+        }
-+        if ($uniqueLabels) {
-+            $uniqueLabels = implode('", "', $uniqueLabels);
-+            $this->messageManager->addErrorMessage(__('The value of attribute(s) "%1" must be unique', $uniqueLabels));
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Search.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Search.php
-index c7c71b2f560..316983298a1 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Search.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Search.php
-@@ -9,11 +9,12 @@ declare(strict_types=1);
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
- use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- 
- /**
-  * Controller to search product for ui-select component
-  */
--class Search extends \Magento\Backend\App\Action
-+class Search extends \Magento\Backend\App\Action implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -48,6 +49,8 @@ class Search extends \Magento\Backend\App\Action
-     }
- 
-     /**
-+     * Execute product search.
-+     *
-      * @return \Magento\Framework\Controller\ResultInterface
-      */
-     public function execute() : \Magento\Framework\Controller\ResultInterface
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php
-index 480c30322a0..bfe474abba1 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
- 
--class Add extends \Magento\Catalog\Controller\Adminhtml\Product\Set
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Add extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
-index f2695311732..771cc83f79e 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
- 
--class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Set
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Eav\Api\AttributeSetRepositoryInterface
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php
-index ec540180b03..6f6870cb084 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
- 
--class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Set
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php
-index 29f7dff4f0d..aadf724f600 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
- 
--class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Set
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
-index c5dd9ce6d8e..83620de25b0 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
-@@ -6,12 +6,13 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\App\ObjectManager;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Set
-+class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\LayoutFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php
-index 614bddd0ebc..1cec8e86787 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php
-@@ -6,7 +6,17 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
--class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product
-+use Magento\Catalog\Controller\Adminhtml\Product;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class Upsell
-+ *
-+ * @package Magento\Catalog\Controller\Adminhtml\Product
-+ * @deprecated Not used since upsell products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
-+ */
-+class Upsell extends Product implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\LayoutFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php
-index 50beb588b15..581531e7c93 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php
-@@ -6,7 +6,17 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
--class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product
-+use Magento\Catalog\Controller\Adminhtml\Product;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class UpsellGrid
-+ *
-+ * @package Magento\Catalog\Controller\Adminhtml\Product
-+ * @deprecated Not used since upsell products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
-+ */
-+class UpsellGrid extends Product implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\LayoutFactory
-diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
-index e131bfe38c5..77c9cfcd40f 100644
---- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
-+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
-@@ -6,6 +6,8 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Catalog\Controller\Adminhtml\Product;
- use Magento\Framework\App\ObjectManager;
-@@ -16,7 +18,7 @@ use Magento\Store\Model\StoreManagerInterface;
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Validate extends \Magento\Catalog\Controller\Adminhtml\Product
-+class Validate extends Product implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
-diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
-index 226e5725050..da3d99a8d27 100644
---- a/app/code/Magento/Catalog/Controller/Category/View.php
-+++ b/app/code/Magento/Catalog/Controller/Category/View.php
-@@ -7,53 +7,73 @@
- namespace Magento\Catalog\Controller\Category;
- 
- use Magento\Catalog\Api\CategoryRepositoryInterface;
-+use Magento\Catalog\Model\Category;
-+use Magento\Catalog\Model\Design;
- use Magento\Catalog\Model\Layer\Resolver;
-+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
-+use Magento\Catalog\Model\Session;
-+use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
-+use Magento\Framework\App\Action\Action;
-+use Magento\Framework\App\Action\Context;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\App\ActionInterface;
-+use Magento\Framework\Controller\Result\ForwardFactory;
-+use Magento\Framework\Controller\ResultInterface;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Registry;
-+use Magento\Framework\View\Result\Page;
- use Magento\Framework\View\Result\PageFactory;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Psr\Log\LoggerInterface;
- 
- /**
-+ * View a category on storefront. Needs to be accessible by POST because of the store switching.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class View extends \Magento\Framework\App\Action\Action
-+class View extends Action implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * Core registry
-      *
--     * @var \Magento\Framework\Registry
-+     * @var Registry
-      */
-     protected $_coreRegistry = null;
- 
-     /**
-      * Catalog session
-      *
--     * @var \Magento\Catalog\Model\Session
-+     * @var Session
-      */
-     protected $_catalogSession;
- 
-     /**
-      * Catalog design
-      *
--     * @var \Magento\Catalog\Model\Design
-+     * @var Design
-      */
-     protected $_catalogDesign;
- 
-     /**
--     * @var \Magento\Store\Model\StoreManagerInterface
-+     * @var StoreManagerInterface
-      */
-     protected $_storeManager;
- 
-     /**
--     * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
-+     * @var CategoryUrlPathGenerator
-      */
-     protected $categoryUrlPathGenerator;
- 
-     /**
--     * @var \Magento\Framework\View\Result\PageFactory
-+     * @var PageFactory
-      */
-     protected $resultPageFactory;
- 
-     /**
--     * @var \Magento\Framework\Controller\Result\ForwardFactory
-+     * @var ForwardFactory
-      */
-     protected $resultForwardFactory;
- 
-@@ -69,32 +89,39 @@ class View extends \Magento\Framework\App\Action\Action
-      */
-     protected $categoryRepository;
- 
-+    /**
-+     * @var ToolbarMemorizer
-+     */
-+    private $toolbarMemorizer;
-+
-     /**
-      * Constructor
-      *
--     * @param \Magento\Framework\App\Action\Context $context
--     * @param \Magento\Catalog\Model\Design $catalogDesign
--     * @param \Magento\Catalog\Model\Session $catalogSession
--     * @param \Magento\Framework\Registry $coreRegistry
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
--     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
--     * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
-+     * @param Context $context
-+     * @param Design $catalogDesign
-+     * @param Session $catalogSession
-+     * @param Registry $coreRegistry
-+     * @param StoreManagerInterface $storeManager
-+     * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
-+     * @param PageFactory $resultPageFactory
-+     * @param ForwardFactory $resultForwardFactory
-      * @param Resolver $layerResolver
-      * @param CategoryRepositoryInterface $categoryRepository
-+     * @param ToolbarMemorizer|null $toolbarMemorizer
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
--        \Magento\Framework\App\Action\Context $context,
--        \Magento\Catalog\Model\Design $catalogDesign,
--        \Magento\Catalog\Model\Session $catalogSession,
--        \Magento\Framework\Registry $coreRegistry,
--        \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator,
-+        Context $context,
-+        Design $catalogDesign,
-+        Session $catalogSession,
-+        Registry $coreRegistry,
-+        StoreManagerInterface $storeManager,
-+        CategoryUrlPathGenerator $categoryUrlPathGenerator,
-         PageFactory $resultPageFactory,
--        \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory,
-+        ForwardFactory $resultForwardFactory,
-         Resolver $layerResolver,
--        CategoryRepositoryInterface $categoryRepository
-+        CategoryRepositoryInterface $categoryRepository,
-+        ToolbarMemorizer $toolbarMemorizer = null
-     ) {
-         parent::__construct($context);
-         $this->_storeManager = $storeManager;
-@@ -106,12 +133,13 @@ class View extends \Magento\Framework\App\Action\Action
-         $this->resultForwardFactory = $resultForwardFactory;
-         $this->layerResolver = $layerResolver;
-         $this->categoryRepository = $categoryRepository;
-+        $this->toolbarMemorizer = $toolbarMemorizer ?: $context->getObjectManager()->get(ToolbarMemorizer::class);
-     }
- 
-     /**
-      * Initialize requested category object
-      *
--     * @return \Magento\Catalog\Model\Category|bool
-+     * @return Category|bool
-      */
-     protected function _initCategory()
-     {
-@@ -130,13 +158,14 @@ class View extends \Magento\Framework\App\Action\Action
-         }
-         $this->_catalogSession->setLastVisitedCategoryId($category->getId());
-         $this->_coreRegistry->register('current_category', $category);
-+        $this->toolbarMemorizer->memorizeParams();
-         try {
-             $this->_eventManager->dispatch(
-                 'catalog_controller_category_init_after',
-                 ['category' => $category, 'controller_action' => $this]
-             );
--        } catch (\Magento\Framework\Exception\LocalizedException $e) {
--            $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-+        } catch (LocalizedException $e) {
-+            $this->_objectManager->get(LoggerInterface::class)->critical($e);
-             return false;
-         }
- 
-@@ -146,13 +175,12 @@ class View extends \Magento\Framework\App\Action\Action
-     /**
-      * Category view action
-      *
--     * @return \Magento\Framework\Controller\ResultInterface
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * @return ResultInterface
-+     * @throws NoSuchEntityException
-      */
-     public function execute()
-     {
--        if ($this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED)) {
-+        if ($this->_request->getParam(ActionInterface::PARAM_NAME_URL_ENCODED)) {
-             return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl());
-         }
-         $category = $this->_initCategory();
-@@ -173,29 +201,18 @@ class View extends \Magento\Framework\App\Action\Action
-                 $page->getConfig()->setPageLayout($settings->getPageLayout());
-             }
- 
--            $hasChildren = $category->hasChildren();
--            if ($category->getIsAnchor()) {
--                $type = $hasChildren ? 'layered' : 'layered_without_children';
--            } else {
--                $type = $hasChildren ? 'default' : 'default_without_children';
--            }
-+            $pageType = $this->getPageType($category);
- 
--            if (!$hasChildren) {
-+            if (!$category->hasChildren()) {
-                 // Two levels removed from parent.  Need to add default page type.
--                $parentType = strtok($type, '_');
--                $page->addPageLayoutHandles(['type' => $parentType], null, false);
-+                $parentPageType = strtok($pageType, '_');
-+                $page->addPageLayoutHandles(['type' => $parentPageType], null, false);
-             }
--            $page->addPageLayoutHandles(['type' => $type], null, false);
-+            $page->addPageLayoutHandles(['type' => $pageType], null, false);
-             $page->addPageLayoutHandles(['id' => $category->getId()]);
- 
-             // apply custom layout update once layout is loaded
--            $layoutUpdates = $settings->getLayoutUpdates();
--            if ($layoutUpdates && is_array($layoutUpdates)) {
--                foreach ($layoutUpdates as $layoutUpdate) {
--                    $page->addUpdate($layoutUpdate);
--                    $page->addPageLayoutHandles(['layout_update' => md5($layoutUpdate)], null, false);
--                }
--            }
-+            $this->applyLayoutUpdates($page, $settings);
- 
-             $page->getConfig()->addBodyClass('page-products')
-                 ->addBodyClass('categorypath-' . $this->categoryUrlPathGenerator->getUrlPath($category))
-@@ -206,4 +223,40 @@ class View extends \Magento\Framework\App\Action\Action
-             return $this->resultForwardFactory->create()->forward('noroute');
-         }
-     }
-+
-+    /**
-+     * Get page type based on category
-+     *
-+     * @param Category $category
-+     * @return string
-+     */
-+    private function getPageType(Category $category) : string
-+    {
-+        $hasChildren = $category->hasChildren();
-+        if ($category->getIsAnchor()) {
-+            return  $hasChildren ? 'layered' : 'layered_without_children';
-+        }
-+
-+        return $hasChildren ? 'default' : 'default_without_children';
-+    }
-+
-+    /**
-+     * Apply custom layout updates
-+     *
-+     * @param Page $page
-+     * @param DataObject $settings
-+     * @return void
-+     */
-+    private function applyLayoutUpdates(
-+        Page $page,
-+        DataObject $settings
-+    ) {
-+        $layoutUpdates = $settings->getLayoutUpdates();
-+        if ($layoutUpdates && is_array($layoutUpdates)) {
-+            foreach ($layoutUpdates as $layoutUpdate) {
-+                $page->addUpdate($layoutUpdate);
-+                $page->addPageLayoutHandles(['layout_update' => sha1($layoutUpdate)], null, false);
-+            }
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Controller/Index/Index.php b/app/code/Magento/Catalog/Controller/Index/Index.php
-index eae3325df9f..bd00c972049 100644
---- a/app/code/Magento/Catalog/Controller/Index/Index.php
-+++ b/app/code/Magento/Catalog/Controller/Index/Index.php
-@@ -5,12 +5,17 @@
-  */
- namespace Magento\Catalog\Controller\Index;
- 
--class Index extends \Magento\Framework\App\Action\Action
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+
-+/**
-+ * Catalog index page controller.
-+ */
-+class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
- {
-     /**
-      * Index action
-      *
--     * @return $this
-+     * @return \Magento\Framework\Controller\Result\Redirect
-      */
-     public function execute()
-     {
-diff --git a/app/code/Magento/Catalog/Controller/Product/Compare.php b/app/code/Magento/Catalog/Controller/Product/Compare.php
-index 1ee146e5aaa..084a82f87d6 100644
---- a/app/code/Magento/Catalog/Controller/Product/Compare.php
-+++ b/app/code/Magento/Catalog/Controller/Product/Compare.php
-@@ -6,6 +6,7 @@
- namespace Magento\Catalog\Controller\Product;
- 
- use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Framework\Data\Form\FormKey\Validator;
- use Magento\Framework\View\Result\PageFactory;
- 
-@@ -15,7 +16,7 @@ use Magento\Framework\View\Result\PageFactory;
-  * @SuppressWarnings(PHPMD.LongVariable)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--abstract class Compare extends \Magento\Framework\App\Action\Action
-+abstract class Compare extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
- {
-     /**
-      * Customer id
-@@ -139,4 +140,15 @@ abstract class Compare extends \Magento\Framework\App\Action\Action
-         $this->_customerId = $customerId;
-         return $this;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute()
-+    {
-+        $resultRedirect = $this->resultRedirectFactory->create();
-+        $resultRedirect->setPath('catalog/product_compare');
-+
-+        return $resultRedirect;
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
-index eb9cc831255..d99901c915a 100644
---- a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
-+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Catalog\Controller\Product\Compare;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Exception\NoSuchEntityException;
- 
--class Add extends \Magento\Catalog\Controller\Product\Compare
-+class Add extends \Magento\Catalog\Controller\Product\Compare implements HttpPostActionInterface
- {
-     /**
-      * Add item to compare list
-diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
-index 568fbf1d056..2703e9869bd 100644
---- a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
-+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Catalog\Controller\Product\Compare;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Clear extends \Magento\Catalog\Controller\Product\Compare
-+class Clear extends \Magento\Catalog\Controller\Product\Compare implements HttpPostActionInterface
- {
-     /**
-      * Remove all items from comparison list
-diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
-index 3eba058318a..c0aa32a56ed 100644
---- a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
-+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
-@@ -6,6 +6,7 @@
-  */
- namespace Magento\Catalog\Controller\Product\Compare;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Framework\Data\Form\FormKey\Validator;
- use Magento\Framework\View\Result\PageFactory;
-@@ -13,7 +14,7 @@ use Magento\Framework\View\Result\PageFactory;
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Index extends \Magento\Catalog\Controller\Product\Compare
-+class Index extends \Magento\Catalog\Controller\Product\Compare implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\Url\DecoderInterface
-diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
-index 2acbe5ce4d5..eac0ddf94af 100644
---- a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
-+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Catalog\Controller\Product\Compare;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Exception\NoSuchEntityException;
- 
--class Remove extends \Magento\Catalog\Controller\Product\Compare
-+class Remove extends \Magento\Catalog\Controller\Product\Compare implements HttpPostActionInterface
- {
-     /**
-      * Remove item from compare list
-diff --git a/app/code/Magento/Catalog/Controller/Product/View.php b/app/code/Magento/Catalog/Controller/Product/View.php
-index ed437361fdd..024123e1515 100644
---- a/app/code/Magento/Catalog/Controller/Product/View.php
-+++ b/app/code/Magento/Catalog/Controller/Product/View.php
-@@ -6,10 +6,16 @@
-  */
- namespace Magento\Catalog\Controller\Product;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\App\Action\Context;
- use Magento\Framework\View\Result\PageFactory;
-+use Magento\Catalog\Controller\Product as ProductAction;
- 
--class View extends \Magento\Catalog\Controller\Product
-+/**
-+ * View a product on storefront. Needs to be accessible by POST because of the store switching.
-+ */
-+class View extends ProductAction implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Catalog\Helper\Product\View
-diff --git a/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php b/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
-index 7cc3eb9e3d2..25f6d0c3236 100644
---- a/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
-+++ b/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
-@@ -12,6 +12,8 @@ use Magento\Catalog\Api\Data\ProductAttributeInterface;
- use Magento\Store\Model\Store;
- 
- /**
-+ * Cron job for removing outdated prices.
-+ *
-  * Cron operation is responsible for deleting all product prices on WEBSITE level
-  * in case 'Catalog Price Scope' configuration parameter is set to GLOBAL.
-  */
-@@ -76,7 +78,7 @@ class DeleteOutdatedPriceValues
-     /**
-      * Checks if price scope config option explicitly equal to global value.
-      *
--     * Such strict comparision is required to prevent price deleting when
-+     * Such strict comparison is required to prevent price deleting when
-      * price scope config option is null for some reason.
-      *
-      * @return bool
-diff --git a/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php b/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php
-index 6e7699abb47..99e9898eab3 100644
---- a/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php
-+++ b/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php
-@@ -57,8 +57,7 @@ class FrontendActionsFlush
-             ];
-         }
- 
--        return isset($configuration['lifetime']) ?
--            (int) $configuration['lifetime'] : FrontendStorageConfigurationInterface::DEFAULT_LIFETIME;
-+        return (int)$configuration['lifetime'] ?? FrontendStorageConfigurationInterface::DEFAULT_LIFETIME;
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
-index ae20cda4607..3e967636328 100644
---- a/app/code/Magento/Catalog/Helper/Data.php
-+++ b/app/code/Magento/Catalog/Helper/Data.php
-@@ -7,6 +7,7 @@ namespace Magento\Catalog\Helper;
- 
- use Magento\Catalog\Api\CategoryRepositoryInterface;
- use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Store\Model\ScopeInterface;
- use Magento\Customer\Model\Session as CustomerSession;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Pricing\PriceCurrencyInterface;
-@@ -273,7 +274,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
- 
-     /**
-      * Return current category path or get it from current category
--     * and creating array of categories|product paths for breadcrumbs
-+     *
-+     * Creating array of categories|product paths for breadcrumbs
-      *
-      * @return array
-      */
-@@ -382,6 +384,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
- 
-     /**
-      * Split SKU of an item by dashes and spaces
-+     *
-      * Words will not be broken, unless this length is greater than $length
-      *
-      * @param string $sku
-@@ -410,14 +413,15 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     /**
-      * Retrieve Catalog Price Scope
-      *
--     * @return int
-+     * @return int|null
-      */
--    public function getPriceScope()
-+    public function getPriceScope(): ?int
-     {
--        return $this->scopeConfig->getValue(
-+        $priceScope = $this->scopeConfig->getValue(
-             self::XML_PATH_PRICE_SCOPE,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         );
-+        return isset($priceScope) ? (int)$priceScope : null;
-     }
- 
-     /**
-@@ -439,7 +443,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     {
-         return $this->scopeConfig->isSetFlag(
-             self::CONFIG_USE_STATIC_URLS,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         );
-     }
- 
-@@ -454,7 +458,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     {
-         return $this->scopeConfig->isSetFlag(
-             self::CONFIG_PARSE_URL_DIRECTIVES,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $this->_storeId
-         );
-     }
-@@ -472,6 +476,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
- 
-     /**
-      * Whether to display items count for each filter option
-+     *
-      * @param int $storeId Store view ID
-      * @return bool
-      */
-@@ -479,12 +484,14 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     {
-         return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_DISPLAY_PRODUCT_COUNT,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $storeId
-         );
-     }
- 
-     /**
-+     * Convert tax address array to address data object with country id and postcode
-+     *
-      * @param array $taxAddress
-      * @return \Magento\Customer\Api\Data\AddressInterface|null
-      */
-diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
-index 4f128d639b2..9b8d0ad75a8 100644
---- a/app/code/Magento/Catalog/Helper/Image.php
-+++ b/app/code/Magento/Catalog/Helper/Image.php
-@@ -6,6 +6,7 @@
- namespace Magento\Catalog\Helper;
- 
- use Magento\Framework\App\Helper\AbstractHelper;
-+use Magento\Framework\View\Element\Block\ArgumentInterface;
- 
- /**
-  * Catalog image helper
-@@ -14,7 +15,7 @@ use Magento\Framework\App\Helper\AbstractHelper;
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @since 100.0.2
-  */
--class Image extends AbstractHelper
-+class Image extends AbstractHelper implements ArgumentInterface
- {
-     /**
-      * Media config node
-@@ -298,6 +299,7 @@ class Image extends AbstractHelper
-      *
-      * @param int $quality
-      * @return $this
-+     * @deprecated
-      */
-     public function setQuality($quality)
-     {
-@@ -406,7 +408,8 @@ class Image extends AbstractHelper
- 
-     /**
-      * Add watermark to image
--     * size param in format 100x200
-+     *
-+     * Size param in format 100x200
-      *
-      * @param string $fileName
-      * @param string $position
-@@ -533,6 +536,8 @@ class Image extends AbstractHelper
-     }
- 
-     /**
-+     * Save changes
-+     *
-      * @return $this
-      */
-     public function save()
-@@ -553,6 +558,8 @@ class Image extends AbstractHelper
-     }
- 
-     /**
-+     * Getter for placeholder url
-+     *
-      * @param null|string $placeholder
-      * @return string
-      */
-@@ -655,7 +662,8 @@ class Image extends AbstractHelper
- 
-     /**
-      * Set watermark size
--     * param size in format 100x200
-+     *
-+     * Param size in format 100x200
-      *
-      * @param string $size
-      * @return $this
-@@ -757,7 +765,7 @@ class Image extends AbstractHelper
-     protected function parseSize($string)
-     {
-         $size = explode('x', strtolower($string));
--        if (sizeof($size) == 2) {
-+        if (count($size) == 2) {
-             return ['width' => $size[0] > 0 ? $size[0] : null, 'height' => $size[1] > 0 ? $size[1] : null];
-         }
-         return false;
-@@ -859,7 +867,7 @@ class Image extends AbstractHelper
-      */
-     protected function getAttribute($name)
-     {
--        return isset($this->attributes[$name]) ? $this->attributes[$name] : null;
-+        return $this->attributes[$name] ?? null;
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Helper/Output.php b/app/code/Magento/Catalog/Helper/Output.php
-index ad0f9508cb6..33e261dc353 100644
---- a/app/code/Magento/Catalog/Helper/Output.php
-+++ b/app/code/Magento/Catalog/Helper/Output.php
-@@ -116,7 +116,7 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
-     public function getHandlers($method)
-     {
-         $method = strtolower($method);
--        return isset($this->_handlers[$method]) ? $this->_handlers[$method] : [];
-+        return $this->_handlers[$method] ?? [];
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Helper/Product.php b/app/code/Magento/Catalog/Helper/Product.php
-index c0d5d1d9e45..73b5e4af78d 100644
---- a/app/code/Magento/Catalog/Helper/Product.php
-+++ b/app/code/Magento/Catalog/Helper/Product.php
-@@ -14,6 +14,7 @@ use Magento\Store\Model\Store;
- /**
-  * Catalog category helper
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class Product extends \Magento\Framework\Url\Helper\Data
- {
-@@ -268,6 +269,8 @@ class Product extends \Magento\Framework\Url\Helper\Data
-     }
- 
-     /**
-+     * Retrieve email to friend url
-+     *
-      * @param ModelProduct $product
-      * @return string
-      */
-@@ -282,6 +285,8 @@ class Product extends \Magento\Framework\Url\Helper\Data
-     }
- 
-     /**
-+     * Get statuses
-+     *
-      * @return array
-      */
-     public function getStatuses()
-@@ -476,6 +481,7 @@ class Product extends \Magento\Framework\Url\Helper\Data
- 
-     /**
-      * Prepares product options by buyRequest: retrieves values and assigns them as default.
-+     *
-      * Also parses and adds product management related values - e.g. qty
-      *
-      * @param ModelProduct $product
-@@ -493,6 +499,7 @@ class Product extends \Magento\Framework\Url\Helper\Data
- 
-     /**
-      * Process $buyRequest and sets its options before saving configuration to some product item.
-+     *
-      * This method is used to attach additional parameters to processed buyRequest.
-      *
-      * $params holds parameters of what operation must be performed:
-@@ -541,8 +548,6 @@ class Product extends \Magento\Framework\Url\Helper\Data
-     /**
-      * Set flag that shows if Magento has to check product to be saleable (enabled and/or inStock)
-      *
--     * For instance, during order creation in the backend admin has ability to add any products to order
--     *
-      * @param bool $skipSaleableCheck
-      * @return Product
-      */
-diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
-index 90d98874e00..d6d35c5c76d 100644
---- a/app/code/Magento/Catalog/Helper/Product/Compare.php
-+++ b/app/code/Magento/Catalog/Helper/Product/Compare.php
-@@ -166,7 +166,15 @@ class Compare extends \Magento\Framework\Url\Helper\Data
-      */
-     public function getPostDataParams($product)
-     {
--        return $this->postHelper->getPostData($this->getAddUrl(), ['product' => $product->getId()]);
-+        $params = ['product' => $product->getId()];
-+        $requestingPageUrl = $this->_getRequest()->getParam('requesting_page_url');
-+
-+        if (!empty($requestingPageUrl)) {
-+            $encodedUrl = $this->urlEncoder->encode($requestingPageUrl);
-+            $params[\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED] = $encodedUrl;
-+        }
-+
-+        return $this->postHelper->getPostData($this->getAddUrl(), $params);
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Helper/Product/Configuration.php b/app/code/Magento/Catalog/Helper/Product/Configuration.php
-index 9b47e299009..5b8f6fad6e1 100644
---- a/app/code/Magento/Catalog/Helper/Product/Configuration.php
-+++ b/app/code/Magento/Catalog/Helper/Product/Configuration.php
-@@ -55,6 +55,7 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
-      * @param \Magento\Framework\Filter\FilterManager $filter
-      * @param \Magento\Framework\Stdlib\StringUtils $string
-      * @param Json $serializer
-+     * @param Escaper $escaper
-      */
-     public function __construct(
-         \Magento\Framework\App\Helper\Context $context,
-diff --git a/app/code/Magento/Catalog/Helper/Product/ProductList.php b/app/code/Magento/Catalog/Helper/Product/ProductList.php
-index fbea73a6324..3aa6aeed377 100644
---- a/app/code/Magento/Catalog/Helper/Product/ProductList.php
-+++ b/app/code/Magento/Catalog/Helper/Product/ProductList.php
-@@ -42,6 +42,7 @@ class ProductList
- 
-     /**
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-+     * @param \Magento\Framework\Registry $coreRegistry
-      */
-     public function __construct(
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
-index 5753910c125..74f40a18971 100644
---- a/app/code/Magento/Catalog/Helper/Product/View.php
-+++ b/app/code/Magento/Catalog/Helper/Product/View.php
-@@ -10,7 +10,9 @@ use Magento\Framework\View\Result\Page as ResultPage;
- 
- /**
-  * Catalog category helper
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class View extends \Magento\Framework\App\Helper\AbstractHelper
- {
-@@ -105,19 +107,16 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper
-      *
-      * @param \Magento\Framework\View\Result\Page $resultPage
-      * @param \Magento\Catalog\Model\Product $product
--     * @return \Magento\Framework\View\Result\Page
-+     * @return $this
-      */
-     private function preparePageMetadata(ResultPage $resultPage, $product)
-     {
-         $pageLayout = $resultPage->getLayout();
-         $pageConfig = $resultPage->getConfig();
- 
--        $title = $product->getMetaTitle();
--        if ($title) {
--            $pageConfig->getTitle()->set($title);
--        } else {
--            $pageConfig->getTitle()->set($product->getName());
--        }
-+        $metaTitle = $product->getMetaTitle();
-+        $pageConfig->setMetaTitle($metaTitle);
-+        $pageConfig->getTitle()->set($metaTitle ?: $product->getName());
- 
-         $keyword = $product->getMetaKeyword();
-         $currentCategory = $this->_coreRegistry->registry('current_category');
-diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php
-index 007635b1243..78a49cd1e8b 100644
---- a/app/code/Magento/Catalog/Model/AbstractModel.php
-+++ b/app/code/Magento/Catalog/Model/AbstractModel.php
-@@ -179,7 +179,7 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
-      *
-      * @param string|array $key
-      * @param mixed $value
--     * @return \Magento\Framework\DataObject
-+     * @return $this
-      */
-     public function setData($key, $value = null)
-     {
-@@ -282,9 +282,9 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
-      *
-      * Default value existing is flag for using store value in data
-      *
--     * @param   string $attributeCode
--     * @param   mixed  $value
--     * @return  $this
-+     * @param string $attributeCode
-+     * @param mixed $value
-+     * @return $this
-      *
-      * @deprecated 101.0.0
-      */
-@@ -332,11 +332,10 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
-     }
- 
-     /**
--     * Set attribute code flag if attribute has value in current store and does not use
--     * value of default store as value
-+     * Set attribute code flag if attribute has value in current store and does not use value of default store as value
-      *
--     * @param   string $attributeCode
--     * @return  $this
-+     * @param string $attributeCode
-+     * @return $this
-      *
-      * @deprecated 101.0.0
-      */
-diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php
-index d3c84e69c95..e296c8d3b89 100644
---- a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php
-+++ b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php
-@@ -58,22 +58,38 @@ class EavAttributeCondition implements CustomConditionInterface
-         $conditionValue = $this->mapConditionValue($conditionType, $filter->getValue());
- 
-         // NOTE: store scope was ignored intentionally to perform search across all stores
--        $attributeSelect = $this->resourceConnection->getConnection()
--            ->select()
--            ->from(
--                [$tableAlias => $attribute->getBackendTable()],
--                $tableAlias . '.' . $attribute->getEntityIdField()
--            )->where(
--                $this->resourceConnection->getConnection()->prepareSqlCondition(
--                    $tableAlias . '.' . $attribute->getIdFieldName(),
--                    ['eq' => $attribute->getAttributeId()]
--                )
--            )->where(
--                $this->resourceConnection->getConnection()->prepareSqlCondition(
--                    $tableAlias . '.value',
--                    [$conditionType => $conditionValue]
--                )
--            );
-+        if ($conditionType == 'is_null') {
-+            $entityResourceModel = $attribute->getEntity();
-+            $attributeSelect = $this->resourceConnection->getConnection()
-+                ->select()
-+                ->from(
-+                    [Collection::MAIN_TABLE_ALIAS => $entityResourceModel->getEntityTable()],
-+                    Collection::MAIN_TABLE_ALIAS . '.' . $entityResourceModel->getEntityIdField()
-+                )->joinLeft(
-+                    [$tableAlias => $attribute->getBackendTable()],
-+                    $tableAlias . '.' . $attribute->getEntityIdField() . '=' . Collection::MAIN_TABLE_ALIAS .
-+                    '.' . $entityResourceModel->getEntityIdField() . ' AND ' . $tableAlias . '.' .
-+                    $attribute->getIdFieldName() . '=' . $attribute->getAttributeId(),
-+                    ''
-+                )->where($tableAlias . '.value is null');
-+        } else {
-+            $attributeSelect = $this->resourceConnection->getConnection()
-+                ->select()
-+                ->from(
-+                    [$tableAlias => $attribute->getBackendTable()],
-+                    $tableAlias . '.' . $attribute->getEntityIdField()
-+                )->where(
-+                    $this->resourceConnection->getConnection()->prepareSqlCondition(
-+                        $tableAlias . '.' . $attribute->getIdFieldName(),
-+                        ['eq' => $attribute->getAttributeId()]
-+                    )
-+                )->where(
-+                    $this->resourceConnection->getConnection()->prepareSqlCondition(
-+                        $tableAlias . '.value',
-+                        [$conditionType => $conditionValue]
-+                    )
-+                );
-+        }
- 
-         return $this->resourceConnection
-             ->getConnection()
-@@ -86,6 +102,8 @@ class EavAttributeCondition implements CustomConditionInterface
-     }
- 
-     /**
-+     * Get attribute entity by its code
-+     *
-      * @param string $field
-      * @return Attribute
-      * @throws \Magento\Framework\Exception\LocalizedException
-diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php
-index d072acf4c71..71b9a9c4703 100644
---- a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php
-+++ b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php
-@@ -77,7 +77,7 @@ class NativeAttributeCondition implements CustomConditionInterface
-             ];
-         }
- 
--        return isset($conditionsMap[$conditionType]) ? $conditionsMap[$conditionType] : $conditionType;
-+        return $conditionsMap[$conditionType] ?? $conditionType;
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ProductCategoryCondition.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ProductCategoryCondition.php
-index f70bab73d08..66a9132ae44 100644
---- a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ProductCategoryCondition.php
-+++ b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ProductCategoryCondition.php
-@@ -38,6 +38,7 @@ class ProductCategoryCondition implements CustomConditionInterface
- 
-     /**
-      * @param \Magento\Framework\App\ResourceConnection $resourceConnection
-+     * @param \Magento\Catalog\Model\CategoryRepository $categoryRepository
-      */
-     public function __construct(
-         \Magento\Framework\App\ResourceConnection $resourceConnection,
-@@ -104,7 +105,7 @@ class ProductCategoryCondition implements CustomConditionInterface
-             }
-         }
- 
--        return array_unique(array_merge($categoryIds, ...$childCategoryIds));
-+        return array_map('intval', array_unique(array_merge($categoryIds, ...$childCategoryIds)));
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
-new file mode 100644
-index 00000000000..dc24a309048
---- /dev/null
-+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
-@@ -0,0 +1,163 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Attribute\Backend;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\EntityManager\EntityManager;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Exception\TemporaryStateExceptionInterface;
-+use Magento\Framework\Bulk\OperationInterface;
-+
-+/**
-+ * Consumer for export message.
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class Consumer
-+{
-+    /**
-+     * @var \Psr\Log\LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
-+     */
-+    private $productFlatIndexerProcessor;
-+
-+    /**
-+     * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-+     */
-+    private $productPriceIndexerProcessor;
-+
-+    /**
-+     * @var \Magento\Catalog\Helper\Product
-+     */
-+    private $catalogProduct;
-+
-+    /**
-+     * @var \Magento\Catalog\Model\Product\Action
-+     */
-+    private $productAction;
-+
-+    /**
-+     * @var \Magento\Framework\Serialize\SerializerInterface
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @var \Magento\Framework\Bulk\OperationManagementInterface
-+     */
-+    private $operationManagement;
-+    /**
-+     * @var EntityManager
-+     */
-+    private $entityManager;
-+
-+    /**
-+     * @param \Magento\Catalog\Helper\Product $catalogProduct
-+     * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
-+     * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
-+     * @param \Magento\Framework\Bulk\OperationManagementInterface $operationManagement
-+     * @param \Magento\Catalog\Model\Product\Action $action
-+     * @param \Psr\Log\LoggerInterface $logger
-+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
-+     * @param EntityManager $entityManager
-+     */
-+    public function __construct(
-+        \Magento\Catalog\Helper\Product $catalogProduct,
-+        \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
-+        \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
-+        \Magento\Framework\Bulk\OperationManagementInterface $operationManagement,
-+        \Magento\Catalog\Model\Product\Action $action,
-+        \Psr\Log\LoggerInterface $logger,
-+        \Magento\Framework\Serialize\SerializerInterface $serializer,
-+        EntityManager $entityManager
-+    ) {
-+        $this->catalogProduct = $catalogProduct;
-+        $this->productFlatIndexerProcessor = $productFlatIndexerProcessor;
-+        $this->productPriceIndexerProcessor = $productPriceIndexerProcessor;
-+        $this->productAction = $action;
-+        $this->logger = $logger;
-+        $this->serializer = $serializer;
-+        $this->operationManagement = $operationManagement;
-+        $this->entityManager = $entityManager;
-+    }
-+
-+    /**
-+     * Process
-+     *
-+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation
-+     * @throws \Exception
-+     *
-+     * @return void
-+     */
-+    public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterface $operation)
-+    {
-+        try {
-+            $serializedData = $operation->getSerializedData();
-+            $data = $this->serializer->unserialize($serializedData);
-+            $this->execute($data);
-+        } catch (\Zend_Db_Adapter_Exception $e) {
-+            $this->logger->critical($e->getMessage());
-+            if ($e instanceof \Magento\Framework\DB\Adapter\LockWaitException
-+                || $e instanceof \Magento\Framework\DB\Adapter\DeadlockException
-+                || $e instanceof \Magento\Framework\DB\Adapter\ConnectionException
-+            ) {
-+                $status = OperationInterface::STATUS_TYPE_RETRIABLY_FAILED;
-+                $errorCode = $e->getCode();
-+                $message = $e->getMessage();
-+            } else {
-+                $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
-+                $errorCode = $e->getCode();
-+                $message = __(
-+                    'Sorry, something went wrong during product attributes update. Please see log for details.'
-+                );
-+            }
-+        } catch (NoSuchEntityException $e) {
-+            $this->logger->critical($e->getMessage());
-+            $status = ($e instanceof TemporaryStateExceptionInterface)
-+                ? OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
-+                : OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
-+            $errorCode = $e->getCode();
-+            $message = $e->getMessage();
-+        } catch (LocalizedException $e) {
-+            $this->logger->critical($e->getMessage());
-+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
-+            $errorCode = $e->getCode();
-+            $message = $e->getMessage();
-+        } catch (\Exception $e) {
-+            $this->logger->critical($e->getMessage());
-+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
-+            $errorCode = $e->getCode();
-+            $message = __('Sorry, something went wrong during product attributes update. Please see log for details.');
-+        }
-+
-+        $operation->setStatus($status ?? OperationInterface::STATUS_TYPE_COMPLETE)
-+            ->setErrorCode($errorCode ?? null)
-+            ->setResultMessage($message ?? null);
-+
-+        $this->entityManager->save($operation);
-+    }
-+
-+    /**
-+     * Execute
-+     *
-+     * @param array $data
-+     *
-+     * @return void
-+     */
-+    private function execute($data): void
-+    {
-+        $this->productAction->updateAttributes($data['product_ids'], $data['attributes'], $data['store_id']);
-+        if ($this->catalogProduct->isDataForPriceIndexerWasChanged($data['attributes'])) {
-+            $this->productPriceIndexerProcessor->reindexList($data['product_ids']);
-+        }
-+
-+        $this->productFlatIndexerProcessor->reindexList($data['product_ids']);
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
-new file mode 100644
-index 00000000000..32ba39d9afd
---- /dev/null
-+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
-@@ -0,0 +1,168 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Attribute\Backend;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Exception\TemporaryStateExceptionInterface;
-+use Magento\Framework\Bulk\OperationInterface;
-+use Magento\Framework\EntityManager\EntityManager;
-+
-+/**
-+ * Consumer for export message.
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class ConsumerWebsiteAssign
-+{
-+    /**
-+     * @var \Psr\Log\LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
-+     */
-+    private $productFlatIndexerProcessor;
-+
-+    /**
-+     * @var \Magento\Catalog\Model\Product\Action
-+     */
-+    private $productAction;
-+
-+    /**
-+     * @var \Magento\Framework\Serialize\SerializerInterface
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-+     */
-+    private $productPriceIndexerProcessor;
-+
-+    /**
-+     * @var EntityManager
-+     */
-+    private $entityManager;
-+
-+    /**
-+     * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
-+     * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
-+     * @param \Magento\Catalog\Model\Product\Action $action
-+     * @param \Psr\Log\LoggerInterface $logger
-+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
-+     * @param EntityManager $entityManager
-+     */
-+    public function __construct(
-+        \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
-+        \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
-+        \Magento\Catalog\Model\Product\Action $action,
-+        \Psr\Log\LoggerInterface $logger,
-+        \Magento\Framework\Serialize\SerializerInterface $serializer,
-+        EntityManager $entityManager
-+    ) {
-+        $this->productFlatIndexerProcessor = $productFlatIndexerProcessor;
-+        $this->productAction = $action;
-+        $this->logger = $logger;
-+        $this->serializer = $serializer;
-+        $this->productPriceIndexerProcessor = $productPriceIndexerProcessor;
-+        $this->entityManager = $entityManager;
-+    }
-+
-+    /**
-+     * Process
-+     *
-+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation
-+     * @throws \Exception
-+     *
-+     * @return void
-+     */
-+    public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterface $operation)
-+    {
-+        try {
-+            $serializedData = $operation->getSerializedData();
-+            $data = $this->serializer->unserialize($serializedData);
-+            $this->execute($data);
-+        } catch (\Zend_Db_Adapter_Exception $e) {
-+            $this->logger->critical($e->getMessage());
-+            if ($e instanceof \Magento\Framework\DB\Adapter\LockWaitException
-+                || $e instanceof \Magento\Framework\DB\Adapter\DeadlockException
-+                || $e instanceof \Magento\Framework\DB\Adapter\ConnectionException
-+            ) {
-+                $status = OperationInterface::STATUS_TYPE_RETRIABLY_FAILED;
-+                $errorCode = $e->getCode();
-+                $message = __($e->getMessage());
-+            } else {
-+                $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
-+                $errorCode = $e->getCode();
-+                $message = __(
-+                    'Sorry, something went wrong during product attributes update. Please see log for details.'
-+                );
-+            }
-+        } catch (NoSuchEntityException $e) {
-+            $this->logger->critical($e->getMessage());
-+            $status = ($e instanceof TemporaryStateExceptionInterface)
-+                ? OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
-+                : OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
-+            $errorCode = $e->getCode();
-+            $message = $e->getMessage();
-+        } catch (LocalizedException $e) {
-+            $this->logger->critical($e->getMessage());
-+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
-+            $errorCode = $e->getCode();
-+            $message = $e->getMessage();
-+        } catch (\Exception $e) {
-+            $this->logger->critical($e->getMessage());
-+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
-+            $errorCode = $e->getCode();
-+            $message = __('Sorry, something went wrong during product attributes update. Please see log for details.');
-+        }
-+
-+        $operation->setStatus($status ?? OperationInterface::STATUS_TYPE_COMPLETE)
-+            ->setErrorCode($errorCode ?? null)
-+            ->setResultMessage($message ?? null);
-+
-+        $this->entityManager->save($operation);
-+    }
-+
-+    /**
-+     * Update website in products
-+     *
-+     * @param array $productIds
-+     * @param array $websiteRemoveData
-+     * @param array $websiteAddData
-+     *
-+     * @return void
-+     */
-+    private function updateWebsiteInProducts($productIds, $websiteRemoveData, $websiteAddData): void
-+    {
-+        if ($websiteRemoveData) {
-+            $this->productAction->updateWebsites($productIds, $websiteRemoveData, 'remove');
-+        }
-+        if ($websiteAddData) {
-+            $this->productAction->updateWebsites($productIds, $websiteAddData, 'add');
-+        }
-+    }
-+
-+    /**
-+     * Execute
-+     *
-+     * @param array $data
-+     *
-+     * @return void
-+     */
-+    private function execute($data): void
-+    {
-+        $this->updateWebsiteInProducts(
-+            $data['product_ids'],
-+            $data['attributes']['website_detach'],
-+            $data['attributes']['website_assign']
-+        );
-+        $this->productPriceIndexerProcessor->reindexList($data['product_ids']);
-+        $this->productFlatIndexerProcessor->reindexList($data['product_ids']);
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
-index 4f605d02062..d911bec0aaa 100644
---- a/app/code/Magento/Catalog/Model/Category.php
-+++ b/app/code/Magento/Catalog/Model/Category.php
-@@ -7,11 +7,8 @@ namespace Magento\Catalog\Model;
- 
- use Magento\Catalog\Api\CategoryRepositoryInterface;
- use Magento\Catalog\Api\Data\CategoryInterface;
--use Magento\Catalog\Model\Entity\GetCategoryCustomAttributeCodes;
- use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
--use Magento\Eav\Model\Entity\GetCustomAttributeCodesInterface;
- use Magento\Framework\Api\AttributeValueFactory;
--use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Convert\ConvertArray;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Profiler;
-@@ -214,11 +211,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-      */
-     protected $metadataService;
- 
--    /**
--     * @var GetCustomAttributeCodesInterface
--     */
--    private $getCustomAttributeCodes;
--
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -241,7 +233,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-      * @param array $data
--     * @param GetCustomAttributeCodesInterface|null $getCustomAttributeCodes
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -265,8 +256,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-         CategoryRepositoryInterface $categoryRepository,
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
--        array $data = [],
--        GetCustomAttributeCodesInterface $getCustomAttributeCodes = null
-+        array $data = []
-     ) {
-         $this->metadataService = $metadataService;
-         $this->_treeModel = $categoryTreeResource;
-@@ -281,9 +271,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-         $this->urlFinder = $urlFinder;
-         $this->indexerRegistry = $indexerRegistry;
-         $this->categoryRepository = $categoryRepository;
--        $this->getCustomAttributeCodes = $getCustomAttributeCodes ?? ObjectManager::getInstance()->get(
--            GetCategoryCustomAttributeCodes::class
--        );
-         parent::__construct(
-             $context,
-             $registry,
-@@ -313,14 +300,20 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function getCustomAttributesCodes()
-     {
--        return $this->getCustomAttributeCodes->execute($this->metadataService);
-+        if ($this->customAttributesCodes === null) {
-+            $this->customAttributesCodes = $this->getEavAttributesCodes($this->metadataService);
-+            $this->customAttributesCodes = array_diff($this->customAttributesCodes, CategoryInterface::ATTRIBUTES);
-+        }
-+        return $this->customAttributesCodes;
-     }
- 
-     /**
-+     * Returns model resource
-+     *
-      * @throws \Magento\Framework\Exception\LocalizedException
-      * @return \Magento\Catalog\Model\ResourceModel\Category
-      * @deprecated because resource models should be used directly
-@@ -571,7 +564,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-      *
-      * If store id is underfined for category return current active store id
-      *
--     * @return integer
-+     * @return int
-      */
-     public function getStoreId()
-     {
-@@ -657,6 +650,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Returns image url
-+     *
-      * @param string $attributeCode
-      * @return bool|string
-      * @throws \Magento\Framework\Exception\LocalizedException
-@@ -717,7 +712,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-             return $parentId;
-         }
-         $parentIds = $this->getParentIds();
--        return intval(array_pop($parentIds));
-+        return (int) array_pop($parentIds);
-     }
- 
-     /**
-@@ -805,6 +800,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
- 
-     /**
-      * Retrieve Stores where isset category Path
-+     *
-      * Return comma separated string
-      *
-      * @return string
-@@ -835,6 +831,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
- 
-     /**
-      * Get array categories ids which are part of category path
-+     *
-      * Result array contain id of current category because it is part of the path
-      *
-      * @return array
-@@ -1038,7 +1035,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
- 
-     /**
-      * Retrieve Available Product Listing  Sort By
--     * code as key, value - name
-+     *
-+     * Code as key, value - name
-      *
-      * @return array
-      */
-@@ -1121,10 +1119,15 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-             }
-         }
-         $productIndexer = $this->indexerRegistry->get(Indexer\Category\Product::INDEXER_ID);
--        if (!$productIndexer->isScheduled()
--            && (!empty($this->getAffectedProductIds()) || $this->dataHasChangedFor('is_anchor'))
--        ) {
--            $productIndexer->reindexList($this->getPathIds());
-+
-+        if (!empty($this->getAffectedProductIds())
-+                || $this->dataHasChangedFor('is_anchor')
-+                || $this->dataHasChangedFor('is_active')) {
-+            if (!$productIndexer->isScheduled()) {
-+                $productIndexer->reindexList($this->getPathIds());
-+            } else {
-+                $productIndexer->invalidate();
-+            }
-         }
-     }
- 
-@@ -1149,16 +1152,27 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-         $identities = [
-             self::CACHE_TAG . '_' . $this->getId(),
-         ];
--        if (!$this->getId() || $this->hasDataChanges()
--            || $this->isDeleted() || $this->dataHasChangedFor(self::KEY_INCLUDE_IN_MENU)
--        ) {
-+
-+        if ($this->hasDataChanges()) {
-+            $identities[] = Product::CACHE_PRODUCT_CATEGORY_TAG . '_' . $this->getId();
-+        }
-+
-+        if ($this->dataHasChangedFor('is_anchor') || $this->dataHasChangedFor('is_active')) {
-+            foreach ($this->getPathIds() as $id) {
-+                $identities[] = Product::CACHE_PRODUCT_CATEGORY_TAG . '_' . $id;
-+            }
-+        }
-+
-+        if (!$this->getId() || $this->isDeleted() || $this->dataHasChangedFor(self::KEY_INCLUDE_IN_MENU)) {
-             $identities[] = self::CACHE_TAG;
-             $identities[] = Product::CACHE_PRODUCT_CATEGORY_TAG . '_' . $this->getId();
-         }
--        return $identities;
-+        return array_unique($identities);
-     }
- 
-     /**
-+     * Returns path
-+     *
-      * @codeCoverageIgnoreStart
-      * @return string|null
-      */
-@@ -1168,6 +1182,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Returns position
-+     *
-      * @return int|null
-      */
-     public function getPosition()
-@@ -1176,6 +1192,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Returns children count
-+     *
-      * @return int
-      */
-     public function getChildrenCount()
-@@ -1184,6 +1202,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Returns created at
-+     *
-      * @return string|null
-      */
-     public function getCreatedAt()
-@@ -1192,6 +1212,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Returns updated at
-+     *
-      * @return string|null
-      */
-     public function getUpdatedAt()
-@@ -1200,6 +1222,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Returns is active
-+     *
-      * @return bool
-      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-      */
-@@ -1209,6 +1233,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Returns category id
-+     *
-      * @return int|null
-      */
-     public function getCategoryId()
-@@ -1217,6 +1243,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Returns display mode
-+     *
-      * @return string|null
-      */
-     public function getDisplayMode()
-@@ -1225,6 +1253,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Returns is include in menu
-+     *
-      * @return bool|null
-      */
-     public function getIncludeInMenu()
-@@ -1233,6 +1263,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Returns url key
-+     *
-      * @return string|null
-      */
-     public function getUrlKey()
-@@ -1241,6 +1273,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Returns children data
-+     *
-      * @return \Magento\Catalog\Api\Data\CategoryTreeInterface[]|null
-      */
-     public function getChildrenData()
-@@ -1356,6 +1390,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Set updated at
-+     *
-      * @param string $updatedAt
-      * @return $this
-      */
-@@ -1365,6 +1401,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Set created at
-+     *
-      * @param string $createdAt
-      * @return $this
-      */
-@@ -1374,6 +1412,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Set path
-+     *
-      * @param string $path
-      * @return $this
-      */
-@@ -1383,6 +1423,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Set available sort by
-+     *
-      * @param string[]|string $availableSortBy
-      * @return $this
-      */
-@@ -1392,6 +1434,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Set include in menu
-+     *
-      * @param bool $includeInMenu
-      * @return $this
-      */
-@@ -1412,6 +1456,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Set children data
-+     *
-      * @param \Magento\Catalog\Api\Data\CategoryTreeInterface[] $childrenData
-      * @return $this
-      */
-@@ -1421,7 +1467,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return \Magento\Catalog\Api\Data\CategoryExtensionInterface|null
-      */
-@@ -1431,7 +1477,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes
-      * @return $this
-diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
-index 1890ea0f7d9..20ea899a3d0 100644
---- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
-+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
-@@ -17,6 +17,12 @@ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
-      */
-     protected $pageLayoutBuilder;
- 
-+    /**
-+     * @inheritdoc
-+     * @deprecated since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
-+     */
-+    protected $_options = null;
-+
-     /**
-      * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
-      */
-@@ -26,14 +32,14 @@ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAllOptions()
-     {
--        if (!$this->_options) {
--            $this->_options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
--            array_unshift($this->_options, ['value' => '', 'label' => __('No layout updates')]);
--        }
--        return $this->_options;
-+        $options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
-+        array_unshift($options, ['value' => '', 'label' => __('No layout updates')]);
-+        $this->_options = $options;
-+
-+        return $options;
-     }
- }
-diff --git a/app/code/Magento/Catalog/Model/Category/FileInfo.php b/app/code/Magento/Catalog/Model/Category/FileInfo.php
-index 9715bb2b161..cd3592ef40a 100644
---- a/app/code/Magento/Catalog/Model/Category/FileInfo.php
-+++ b/app/code/Magento/Catalog/Model/Category/FileInfo.php
-@@ -43,6 +43,11 @@ class FileInfo
-      */
-     private $baseDirectory;
- 
-+    /**
-+     * @var ReadInterface
-+     */
-+    private $pubDirectory;
-+
-     /**
-      * @param Filesystem $filesystem
-      * @param Mime $mime
-@@ -82,6 +87,20 @@ class FileInfo
-         return $this->baseDirectory;
-     }
- 
-+    /**
-+     * Get Pub Directory read instance
-+     *
-+     * @return ReadInterface
-+     */
-+    private function getPubDirectory()
-+    {
-+        if (!isset($this->pubDirectory)) {
-+            $this->pubDirectory = $this->filesystem->getDirectoryRead(DirectoryList::PUB);
-+        }
-+
-+        return $this->pubDirectory;
-+    }
-+
-     /**
-      * Retrieve MIME type of requested file
-      *
-@@ -135,7 +154,7 @@ class FileInfo
-     {
-         $filePath = ltrim($fileName, '/');
- 
--        $mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath();
-+        $mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath($filePath);
-         $isFileNameBeginsWithMediaDirectoryPath = $this->isBeginsWithMediaDirectoryPath($fileName);
- 
-         // if the file is not using a relative path, it resides in the catalog/category media directory
-@@ -160,7 +179,7 @@ class FileInfo
-     {
-         $filePath = ltrim($fileName, '/');
- 
--        $mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath();
-+        $mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath($filePath);
-         $isFileNameBeginsWithMediaDirectoryPath = strpos($filePath, $mediaDirectoryRelativeSubpath) === 0;
- 
-         return $isFileNameBeginsWithMediaDirectoryPath;
-@@ -169,14 +188,22 @@ class FileInfo
-     /**
-      * Get media directory subpath relative to base directory path
-      *
-+     * @param string $filePath
-      * @return string
-      */
--    private function getMediaDirectoryPathRelativeToBaseDirectoryPath()
-+    private function getMediaDirectoryPathRelativeToBaseDirectoryPath(string $filePath = '')
-     {
--        $baseDirectoryPath = $this->getBaseDirectory()->getAbsolutePath();
-+        $baseDirectory = $this->getBaseDirectory();
-+        $baseDirectoryPath = $baseDirectory->getAbsolutePath();
-         $mediaDirectoryPath = $this->getMediaDirectory()->getAbsolutePath();
-+        $pubDirectoryPath = $this->getPubDirectory()->getAbsolutePath();
- 
-         $mediaDirectoryRelativeSubpath = substr($mediaDirectoryPath, strlen($baseDirectoryPath));
-+        $pubDirectory = $baseDirectory->getRelativePath($pubDirectoryPath);
-+
-+        if (strpos($mediaDirectoryRelativeSubpath, $pubDirectory) === 0 && strpos($filePath, $pubDirectory) !== 0) {
-+            $mediaDirectoryRelativeSubpath = substr($mediaDirectoryRelativeSubpath, strlen($pubDirectory));
-+        }
- 
-         return $mediaDirectoryRelativeSubpath;
-     }
-diff --git a/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php b/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
-index f22c6903a23..4ea06d4e34d 100644
---- a/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
-+++ b/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
-@@ -6,7 +6,6 @@
- namespace Magento\Catalog\Model\Category\Link;
- 
- use Magento\Catalog\Api\Data\CategoryLinkInterface;
--use Magento\Catalog\Model\Indexer\Product\Category;
- use Magento\Framework\EntityManager\Operation\ExtensionInterface;
- 
- /**
-@@ -40,6 +39,8 @@ class SaveHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Execute
-+     *
-      * @param object $entity
-      * @param array $arguments
-      * @return object
-@@ -78,6 +79,8 @@ class SaveHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Get category links positions
-+     *
-      * @param object $entity
-      * @return array
-      */
-@@ -106,27 +109,19 @@ class SaveHandler implements ExtensionInterface
-      */
-     private function mergeCategoryLinks($newCategoryPositions, $oldCategoryPositions)
-     {
--        $result = [];
-         if (empty($newCategoryPositions)) {
--            return $result;
-+            return [];
-         }
- 
-+        $categoryPositions = array_combine(array_column($oldCategoryPositions, 'category_id'), $oldCategoryPositions);
-         foreach ($newCategoryPositions as $newCategoryPosition) {
--            $key = array_search(
--                $newCategoryPosition['category_id'],
--                array_column($oldCategoryPositions, 'category_id')
--            );
--
--            if ($key === false) {
--                $result[] = $newCategoryPosition;
--            } elseif (isset($oldCategoryPositions[$key])
--                && $oldCategoryPositions[$key]['position'] != $newCategoryPosition['position']
--            ) {
--                $result[] = $newCategoryPositions[$key];
--                unset($oldCategoryPositions[$key]);
-+            $categoryId = $newCategoryPosition['category_id'];
-+            if (!isset($categoryPositions[$categoryId])) {
-+                $categoryPositions[$categoryId] = ['category_id' => $categoryId];
-             }
-+            $categoryPositions[$categoryId]['position'] = $newCategoryPosition['position'];
-         }
--        $result = array_merge($result, $oldCategoryPositions);
-+        $result = array_values($categoryPositions);
- 
-         return $result;
-     }
-diff --git a/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php b/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
-index 1e07c0cdd92..44bf153f836 100644
---- a/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
-+++ b/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
-@@ -43,6 +43,8 @@ class PositionResolver extends \Magento\Framework\Model\ResourceModel\Db\Abstrac
-             $categoryId
-         )->order(
-             'ccp.position ' . \Magento\Framework\DB\Select::SQL_ASC
-+        )->order(
-+            'ccp.product_id ' . \Magento\Framework\DB\Select::SQL_DESC
-         );
- 
-         return array_flip($connection->fetchCol($select));
-diff --git a/app/code/Magento/Catalog/Model/Category/StoreCategories.php b/app/code/Magento/Catalog/Model/Category/StoreCategories.php
-new file mode 100644
-index 00000000000..0d7afcd4a50
---- /dev/null
-+++ b/app/code/Magento/Catalog/Model/Category/StoreCategories.php
-@@ -0,0 +1,64 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Category;
-+
-+use Magento\Catalog\Api\CategoryRepositoryInterface;
-+use Magento\Catalog\Model\Category;
-+use Magento\Store\Api\GroupRepositoryInterface;
-+
-+/**
-+ * Fetcher for associated with store group categories.
-+ */
-+class StoreCategories
-+{
-+    /**
-+     * @var CategoryRepositoryInterface
-+     */
-+    private $categoryRepository;
-+
-+    /**
-+     * @var GroupRepositoryInterface
-+     */
-+    private $groupRepository;
-+
-+    /**
-+     * @param CategoryRepositoryInterface $categoryRepository
-+     * @param GroupRepositoryInterface $groupRepository
-+     */
-+    public function __construct(
-+        CategoryRepositoryInterface $categoryRepository,
-+        GroupRepositoryInterface $groupRepository
-+    ) {
-+        $this->categoryRepository = $categoryRepository;
-+        $this->groupRepository = $groupRepository;
-+    }
-+
-+    /**
-+     * Get all category ids for store.
-+     *
-+     * @param int|null $storeGroupId
-+     * @return int[]
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    public function getCategoryIds(?int $storeGroupId = null): array
-+    {
-+        $rootCategoryId = $storeGroupId
-+            ? $this->groupRepository->get($storeGroupId)->getRootCategoryId()
-+            : Category::TREE_ROOT_ID;
-+        /** @var Category $rootCategory */
-+        $rootCategory = $this->categoryRepository->get($rootCategoryId);
-+        $categoriesIds = array_map(
-+            function ($value) {
-+                return (int) $value;
-+            },
-+            (array) $rootCategory->getAllChildren(true)
-+        );
-+
-+        return $categoriesIds;
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Model/Category/Tree.php b/app/code/Magento/Catalog/Model/Category/Tree.php
-index 6080f74d5fa..0a9cb25d7b0 100644
---- a/app/code/Magento/Catalog/Model/Category/Tree.php
-+++ b/app/code/Magento/Catalog/Model/Category/Tree.php
-@@ -32,27 +32,40 @@ class Tree
-      */
-     protected $treeFactory;
- 
-+    /**
-+     * @var \Magento\Catalog\Model\ResourceModel\Category\TreeFactory
-+     */
-+    private $treeResourceFactory;
-+
-     /**
-      * @param \Magento\Catalog\Model\ResourceModel\Category\Tree $categoryTree
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection
-      * @param \Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory $treeFactory
-+     * @param \Magento\Catalog\Model\ResourceModel\Category\TreeFactory|null $treeResourceFactory
-      */
-     public function __construct(
-         \Magento\Catalog\Model\ResourceModel\Category\Tree $categoryTree,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
-         \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection,
--        \Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory $treeFactory
-+        \Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory $treeFactory,
-+        \Magento\Catalog\Model\ResourceModel\Category\TreeFactory $treeResourceFactory = null
-     ) {
-         $this->categoryTree = $categoryTree;
-         $this->storeManager = $storeManager;
-         $this->categoryCollection = $categoryCollection;
-         $this->treeFactory = $treeFactory;
-+        $this->treeResourceFactory = $treeResourceFactory ?? \Magento\Framework\App\ObjectManager::getInstance()
-+                ->get(\Magento\Catalog\Model\ResourceModel\Category\TreeFactory::class);
-     }
- 
-     /**
-+     * Get root node by category.
-+     *
-      * @param \Magento\Catalog\Model\Category|null $category
-      * @return Node|null
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getRootNode($category = null)
-     {
-@@ -71,13 +84,18 @@ class Tree
-     }
- 
-     /**
-+     * Get node by category.
-+     *
-      * @param \Magento\Catalog\Model\Category $category
-      * @return Node
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     protected function getNode(\Magento\Catalog\Model\Category $category)
-     {
-         $nodeId = $category->getId();
--        $node = $this->categoryTree->loadNode($nodeId);
-+        $categoryTree = $this->treeResourceFactory->create();
-+        $node = $categoryTree->loadNode($nodeId);
-         $node->loadChildren();
-         $this->prepareCollection();
-         $this->categoryTree->addCollectionData($this->categoryCollection);
-@@ -85,7 +103,11 @@ class Tree
-     }
- 
-     /**
-+     * Prepare category collection.
-+     *
-      * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     protected function prepareCollection()
-     {
-@@ -104,6 +126,8 @@ class Tree
-     }
- 
-     /**
-+     * Get tree by node.
-+     *
-      * @param \Magento\Framework\Data\Tree\Node $node
-      * @param int $depth
-      * @param int $currentLevel
-@@ -127,6 +151,8 @@ class Tree
-     }
- 
-     /**
-+     * Get node children.
-+     *
-      * @param \Magento\Framework\Data\Tree\Node $node
-      * @param int $depth
-      * @param int $currentLevel
-diff --git a/app/code/Magento/Catalog/Model/CategoryList.php b/app/code/Magento/Catalog/Model/CategoryList.php
-index 790ea6b921f..cab8e013d9b 100644
---- a/app/code/Magento/Catalog/Model/CategoryList.php
-+++ b/app/code/Magento/Catalog/Model/CategoryList.php
-@@ -15,6 +15,9 @@ use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
- use Magento\Framework\Api\SearchCriteriaInterface;
- use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
- 
-+/**
-+ * Class for getting category list.
-+ */
- class CategoryList implements CategoryListInterface
- {
-     /**
-@@ -64,7 +67,7 @@ class CategoryList implements CategoryListInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getList(SearchCriteriaInterface $searchCriteria)
-     {
-diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
-index d2ffd6f4400..5dce940308a 100644
---- a/app/code/Magento/Catalog/Model/Config.php
-+++ b/app/code/Magento/Catalog/Model/Config.php
-@@ -381,7 +381,7 @@ class Config extends \Magento\Eav\Model\Config
- 
-         $this->loadProductTypes();
- 
--        return isset($this->_productTypesById[$id]) ? $this->_productTypesById[$id] : false;
-+        return $this->_productTypesById[$id] ?? false;
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php b/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
-index e2b0a915740..10675a7b7c7 100644
---- a/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
-+++ b/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Catalog\Model\Config\CatalogClone\Media;
- 
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\ObjectManager;
-+
- /**
-  * Clone model for media images related config fields
-  *
-@@ -26,6 +29,11 @@ class Image extends \Magento\Framework\App\Config\Value
-      */
-     protected $_attributeCollectionFactory;
- 
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -36,6 +44,9 @@ class Image extends \Magento\Framework\App\Config\Value
-      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-      * @param array $data
-+     * @param Escaper|null $escaper
-+     *
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-         \Magento\Framework\Model\Context $context,
-@@ -46,8 +57,10 @@ class Image extends \Magento\Framework\App\Config\Value
-         \Magento\Eav\Model\Config $eavConfig,
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
--        array $data = []
-+        array $data = [],
-+        Escaper $escaper = null
-     ) {
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(Escaper::class);
-         $this->_attributeCollectionFactory = $attributeCollectionFactory;
-         $this->_eavConfig = $eavConfig;
-         parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
-@@ -71,10 +84,9 @@ class Image extends \Magento\Framework\App\Config\Value
-         $prefixes = [];
- 
-         foreach ($collection as $attribute) {
--            /* @var $attribute \Magento\Eav\Model\Entity\Attribute */
-             $prefixes[] = [
-                 'field' => $attribute->getAttributeCode() . '_',
--                'label' => $attribute->getFrontend()->getLabel(),
-+                'label' => $this->escaper->escapeHtml($attribute->getFrontend()->getLabel()),
-             ];
-         }
- 
-diff --git a/app/code/Magento/Catalog/Model/Design.php b/app/code/Magento/Catalog/Model/Design.php
-index bd7cdabb408..853bbeac8eb 100644
---- a/app/code/Magento/Catalog/Model/Design.php
-+++ b/app/code/Magento/Catalog/Model/Design.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Catalog\Model;
- 
-+use \Magento\Framework\TranslateInterface;
-+
- /**
-  * Catalog Custom Category design Model
-  *
-@@ -31,14 +33,20 @@ class Design extends \Magento\Framework\Model\AbstractModel
-      */
-     protected $_localeDate;
- 
-+    /**
-+     * @var TranslateInterface
-+     */
-+    private $translator;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-      * @param \Magento\Framework\View\DesignInterface $design
--     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
--     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
-+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
-      * @param array $data
-+     * @param TranslateInterface|null $translator
-      */
-     public function __construct(
-         \Magento\Framework\Model\Context $context,
-@@ -47,10 +55,13 @@ class Design extends \Magento\Framework\Model\AbstractModel
-         \Magento\Framework\View\DesignInterface $design,
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
--        array $data = []
-+        array $data = [],
-+        TranslateInterface $translator = null
-     ) {
-         $this->_localeDate = $localeDate;
-         $this->_design = $design;
-+        $this->translator = $translator ?:
-+            \Magento\Framework\App\ObjectManager::getInstance()->get(TranslateInterface::class);
-         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
-     }
- 
-@@ -63,6 +74,7 @@ class Design extends \Magento\Framework\Model\AbstractModel
-     public function applyCustomDesign($design)
-     {
-         $this->_design->setDesignTheme($design);
-+        $this->translator->loadData(null, true);
-         return $this;
-     }
- 
-diff --git a/app/code/Magento/Catalog/Model/Entity/GetCategoryCustomAttributeCodes.php b/app/code/Magento/Catalog/Model/Entity/GetCategoryCustomAttributeCodes.php
-deleted file mode 100644
-index b2b9199cc56..00000000000
---- a/app/code/Magento/Catalog/Model/Entity/GetCategoryCustomAttributeCodes.php
-+++ /dev/null
-@@ -1,37 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Catalog\Model\Entity;
--
--use Magento\Catalog\Api\Data\CategoryInterface;
--use Magento\Eav\Model\Entity\GetCustomAttributeCodesInterface;
--use Magento\Framework\Api\MetadataServiceInterface;
--
--class GetCategoryCustomAttributeCodes implements GetCustomAttributeCodesInterface
--{
--    /**
--     * @var GetCustomAttributeCodesInterface
--     */
--    private $baseCustomAttributeCodes;
--
--    /**
--     * @param GetCustomAttributeCodesInterface $baseCustomAttributeCodes
--     */
--    public function __construct(
--        GetCustomAttributeCodesInterface $baseCustomAttributeCodes
--    ) {
--        $this->baseCustomAttributeCodes = $baseCustomAttributeCodes;
--    }
--
--    /**
--     * @inheritdoc
--     */
--    public function execute(MetadataServiceInterface $metadataService): array
--    {
--        $customAttributesCodes = $this->baseCustomAttributeCodes->execute($metadataService);
--        return array_diff($customAttributesCodes, CategoryInterface::ATTRIBUTES);
--    }
--}
-diff --git a/app/code/Magento/Catalog/Model/Entity/GetProductCustomAttributeCodes.php b/app/code/Magento/Catalog/Model/Entity/GetProductCustomAttributeCodes.php
-deleted file mode 100644
-index 23678ffcf48..00000000000
---- a/app/code/Magento/Catalog/Model/Entity/GetProductCustomAttributeCodes.php
-+++ /dev/null
-@@ -1,37 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Catalog\Model\Entity;
--
--use Magento\Catalog\Api\Data\ProductInterface;
--use Magento\Eav\Model\Entity\GetCustomAttributeCodesInterface;
--use Magento\Framework\Api\MetadataServiceInterface;
--
--class GetProductCustomAttributeCodes implements GetCustomAttributeCodesInterface
--{
--    /**
--     * @var GetCustomAttributeCodesInterface
--     */
--    private $baseCustomAttributeCodes;
--
--    /**
--     * @param GetCustomAttributeCodesInterface $baseCustomAttributeCodes
--     */
--    public function __construct(
--        GetCustomAttributeCodesInterface $baseCustomAttributeCodes
--    ) {
--        $this->baseCustomAttributeCodes = $baseCustomAttributeCodes;
--    }
--
--    /**
--     * @inheritdoc
--     */
--    public function execute(MetadataServiceInterface $metadataService): array
--    {
--        $customAttributesCodes = $this->baseCustomAttributeCodes->execute($metadataService);
--        return array_diff($customAttributesCodes, ProductInterface::ATTRIBUTES);
--    }
--}
-diff --git a/app/code/Magento/Catalog/Model/FilterProductCustomAttribute.php b/app/code/Magento/Catalog/Model/FilterProductCustomAttribute.php
-new file mode 100644
-index 00000000000..497ed2fd499
---- /dev/null
-+++ b/app/code/Magento/Catalog/Model/FilterProductCustomAttribute.php
-@@ -0,0 +1,38 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model;
-+
-+/**
-+ * Filter custom attributes for product using the blacklist
-+ */
-+class FilterProductCustomAttribute
-+{
-+    /**
-+     * @var array
-+     */
-+    private $blackList;
-+
-+    /**
-+     * @param array $blackList
-+     */
-+    public function __construct(array $blackList = [])
-+    {
-+        $this->blackList = $blackList;
-+    }
-+
-+    /**
-+     * Delete custom attribute
-+     *
-+     * @param array $attributes set objects attributes @example ['attribute_code'=>'attribute_object']
-+     * @return array
-+     */
-+    public function execute(array $attributes): array
-+    {
-+        return array_diff_key($attributes, array_flip($this->blackList));
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Model/ImageExtractor.php b/app/code/Magento/Catalog/Model/ImageExtractor.php
-index d2c11a37629..1cb1f305a22 100644
---- a/app/code/Magento/Catalog/Model/ImageExtractor.php
-+++ b/app/code/Magento/Catalog/Model/ImageExtractor.php
-@@ -9,6 +9,9 @@ use Magento\Catalog\Helper\Image;
- use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter;
- use Magento\Framework\View\Xsd\Media\TypeDataExtractorInterface;
- 
-+/**
-+ * Image extractor from xml configuration
-+ */
- class ImageExtractor implements TypeDataExtractorInterface
- {
-     /**
-@@ -17,6 +20,7 @@ class ImageExtractor implements TypeDataExtractorInterface
-      * @param \DOMElement $mediaNode
-      * @param string $mediaParentTag
-      * @return array
-+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-     public function process(\DOMElement $mediaNode, $mediaParentTag)
-     {
-@@ -32,12 +36,22 @@ class ImageExtractor implements TypeDataExtractorInterface
-                     continue;
-                 }
-                 $attributeTagName = $attribute->tagName;
--                if ($attributeTagName === 'background') {
--                    $nodeValue = $this->processImageBackground($attribute->nodeValue);
--                } elseif ($attributeTagName === 'width' || $attributeTagName === 'height') {
--                    $nodeValue = intval($attribute->nodeValue);
-+                if ((bool)$attribute->getAttribute('xsi:nil') !== true) {
-+                    if ($attributeTagName === 'background') {
-+                        $nodeValue = $this->processImageBackground($attribute->nodeValue);
-+                    } elseif ($attributeTagName === 'width' || $attributeTagName === 'height') {
-+                        $nodeValue = (int) $attribute->nodeValue;
-+                    } elseif ($attributeTagName === 'constrain'
-+                        || $attributeTagName === 'aspect_ratio'
-+                        || $attributeTagName === 'frame'
-+                        || $attributeTagName === 'transparency'
-+                    ) {
-+                        $nodeValue = in_array($attribute->nodeValue, [true, 1, 'true', '1'], true) ?? false;
-+                    } else {
-+                        $nodeValue = $attribute->nodeValue;
-+                    }
-                 } else {
--                    $nodeValue = !in_array($attribute->nodeValue, ['false', '0']);
-+                    $nodeValue = null;
-                 }
-                 $result[$mediaParentTag][$moduleNameImage][Image::MEDIA_TYPE_CONFIG_NODE][$imageId][$attribute->tagName]
-                     = $nodeValue;
-diff --git a/app/code/Magento/Catalog/Model/ImageUploader.php b/app/code/Magento/Catalog/Model/ImageUploader.php
-index ce92a2c1d95..b5ca0895d6d 100644
---- a/app/code/Magento/Catalog/Model/ImageUploader.php
-+++ b/app/code/Magento/Catalog/Model/ImageUploader.php
-@@ -67,14 +67,9 @@ class ImageUploader
-     /**
-      * List of allowed image mime types
-      *
--     * @var array
-+     * @var string[]
-      */
--    private $allowedMimeTypes = [
--        'image/jpg',
--        'image/jpeg',
--        'image/gif',
--        'image/png',
--    ];
-+    private $allowedMimeTypes;
- 
-     /**
-      * ImageUploader constructor
-@@ -87,6 +82,7 @@ class ImageUploader
-      * @param string $baseTmpPath
-      * @param string $basePath
-      * @param string[] $allowedExtensions
-+     * @param string[] $allowedMimeTypes
-      */
-     public function __construct(
-         \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDatabase,
-@@ -96,7 +92,8 @@ class ImageUploader
-         \Psr\Log\LoggerInterface $logger,
-         $baseTmpPath,
-         $basePath,
--        $allowedExtensions
-+        $allowedExtensions,
-+        $allowedMimeTypes = []
-     ) {
-         $this->coreFileStorageDatabase = $coreFileStorageDatabase;
-         $this->mediaDirectory = $filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
-@@ -106,6 +103,7 @@ class ImageUploader
-         $this->baseTmpPath = $baseTmpPath;
-         $this->basePath = $basePath;
-         $this->allowedExtensions = $allowedExtensions;
-+        $this->allowedMimeTypes = $allowedMimeTypes;
-     }
- 
-     /**
-@@ -165,7 +163,7 @@ class ImageUploader
-     }
- 
-     /**
--     * Retrieve base path
-+     * Retrieve allowed extensions
-      *
-      * @return string[]
-      */
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
-index 4b16a4810c0..1506ccf6963 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
-@@ -7,8 +7,10 @@
- namespace Magento\Catalog\Model\Indexer\Category\Flat;
- 
- use Magento\Framework\App\ResourceConnection;
--use Magento\Framework\EntityManager\MetadataPool;
- 
-+/**
-+ * Abstract action class for category flat indexers.
-+ */
- class AbstractAction
- {
-     /**
-@@ -111,7 +113,7 @@ class AbstractAction
-     public function getMainStoreTable($storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID)
-     {
-         if (is_string($storeId)) {
--            $storeId = intval($storeId);
-+            $storeId = (int) $storeId;
-         }
- 
-         $suffix = sprintf('store_%d', $storeId);
-@@ -131,7 +133,7 @@ class AbstractAction
-         $table = $this->connection->newTable(
-             $tableName
-         )->setComment(
--            sprintf("Catalog Category Flat", $tableName)
-+            'Catalog Category Flat'
-         );
- 
-         //Adding columns
-@@ -379,7 +381,7 @@ class AbstractAction
-         $linkField = $this->getCategoryMetadata()->getLinkField();
-         foreach ($attributesType as $type) {
-             foreach ($this->getAttributeTypeValues($type, $entityIds, $storeId) as $row) {
--                if (isset($row[$linkField]) && isset($row['attribute_id'])) {
-+                if (isset($row[$linkField], $row['attribute_id'])) {
-                     $attributeId = $row['attribute_id'];
-                     if (isset($attributes[$attributeId])) {
-                         $attributeCode = $attributes[$attributeId]['attribute_code'];
-@@ -497,6 +499,8 @@ class AbstractAction
-     }
- 
-     /**
-+     * Get category metadata instance.
-+     *
-      * @return \Magento\Framework\EntityManager\EntityMetadata
-      */
-     private function getCategoryMetadata()
-@@ -510,6 +514,8 @@ class AbstractAction
-     }
- 
-     /**
-+     * Get skip static columns instance.
-+     *
-      * @return array
-      */
-     private function getSkipStaticColumns()
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
-index 64a8f930d83..a62e3d8f83b 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Catalog\Model\Indexer\Category\Flat\Action;
- 
-+/**
-+ * Class for full reindex flat categories
-+ */
- class Full extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
- {
-     /**
-@@ -92,6 +95,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
- 
-     /**
-      * Create table and add attributes as fields for specified store.
-+     *
-      * This routine assumes that DDL operations are allowed
-      *
-      * @param int $store
-@@ -109,6 +113,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
- 
-     /**
-      * Create category flat tables and add attributes as fields.
-+     *
-      * Tables are created only if DDL operations are allowed
-      *
-      * @param \Magento\Store\Model\Store[] $stores if empty, create tables for all stores of the application
-@@ -167,6 +172,44 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
-         return $this;
-     }
- 
-+    /**
-+     * Retrieve all actual Catalog Product Flat Table names
-+     *
-+     * @return string[]
-+     */
-+    private function getActualStoreTablesForCategoryFlat(): array
-+    {
-+        $actualStoreTables = [];
-+        foreach ($this->storeManager->getStores() as $store) {
-+            $actualStoreTables[] = sprintf(
-+                '%s_store_%s',
-+                $this->connection->getTableName('catalog_category_flat'),
-+                $store->getId()
-+            );
-+        }
-+
-+        return $actualStoreTables;
-+    }
-+
-+    /**
-+     * Delete all category flat tables for not existing stores
-+     *
-+     * @return void
-+     */
-+    private function deleteAbandonedStoreCategoryFlatTables(): void
-+    {
-+        $existentTables = $this->connection->getTables(
-+            $this->connection->getTableName('catalog_category_flat_store_%')
-+        );
-+        $actualStoreTables = $this->getActualStoreTablesForCategoryFlat();
-+
-+        $tablesToDelete = array_diff($existentTables, $actualStoreTables);
-+
-+        foreach ($tablesToDelete as $table) {
-+            $this->connection->dropTable($table);
-+        }
-+    }
-+
-     /**
-      * Transactional rebuild flat data from eav
-      *
-@@ -182,7 +225,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
-         $stores = $this->storeManager->getStores();
-         $this->populateFlatTables($stores);
-         $this->switchTables($stores);
--
-+        $this->deleteAbandonedStoreCategoryFlatTables();
-         $this->allowTableChanges = true;
- 
-         return $this;
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
-index 6a499883ac7..178f4172ce6 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
-@@ -123,6 +123,11 @@ abstract class AbstractAction
-      */
-     private $queryGenerator;
- 
-+    /**
-+     * @var int
-+     */
-+    private $currentStoreId = 0;
-+
-     /**
-      * @param ResourceConnection $resource
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-@@ -164,6 +169,7 @@ abstract class AbstractAction
-     {
-         foreach ($this->storeManager->getStores() as $store) {
-             if ($this->getPathFromCategoryId($store->getRootCategoryId())) {
-+                $this->currentStoreId = $store->getId();
-                 $this->reindexRootCategory($store);
-                 $this->reindexAnchorCategories($store);
-                 $this->reindexNonAnchorCategories($store);
-@@ -586,6 +592,8 @@ abstract class AbstractAction
-     }
- 
-     /**
-+     * Get temporary table name
-+     *
-      * Get temporary table name for concurrent indexing in persistent connection
-      * Temp table name is NOT shared between action instances and each action has it's own temp tree index
-      *
-@@ -597,7 +605,7 @@ abstract class AbstractAction
-         if (empty($this->tempTreeIndexTableName)) {
-             $this->tempTreeIndexTableName = $this->connection->getTableName('temp_catalog_category_tree_index')
-                 . '_'
--                . substr(md5(time() . random_int(0, 999999999)), 0, 8);
-+                . substr(sha1(time() . random_int(0, 999999999)), 0, 8);
-         }
- 
-         return $this->tempTreeIndexTableName;
-@@ -641,7 +649,6 @@ abstract class AbstractAction
-             ['child_id'],
-             ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX]
-         );
--
-         // Drop the temporary table in case it already exists on this (persistent?) connection.
-         $this->connection->dropTemporaryTable($temporaryName);
-         $this->connection->createTemporaryTable($temporaryTable);
-@@ -659,11 +666,31 @@ abstract class AbstractAction
-      */
-     protected function fillTempCategoryTreeIndex($temporaryName)
-     {
-+        $isActiveAttributeId = $this->config->getAttribute(
-+            \Magento\Catalog\Model\Category::ENTITY,
-+            'is_active'
-+        )->getId();
-+        $categoryMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\CategoryInterface::class);
-+        $categoryLinkField = $categoryMetadata->getLinkField();
-         $selects = $this->prepareSelectsByRange(
-             $this->connection->select()
-                 ->from(
-                     ['c' => $this->getTable('catalog_category_entity')],
-                     ['entity_id', 'path']
-+                )->joinInner(
-+                    ['ccacd' => $this->getTable('catalog_category_entity_int')],
-+                    'ccacd.' . $categoryLinkField . ' = c.' . $categoryLinkField . ' AND ccacd.store_id = 0' .
-+                    ' AND ccacd.attribute_id = ' . $isActiveAttributeId,
-+                    []
-+                )->joinLeft(
-+                    ['ccacs' => $this->getTable('catalog_category_entity_int')],
-+                    'ccacs.' . $categoryLinkField . ' = c.' . $categoryLinkField
-+                    . ' AND ccacs.attribute_id = ccacd.attribute_id AND ccacs.store_id = ' .
-+                    $this->currentStoreId,
-+                    []
-+                )->where(
-+                    $this->connection->getIfNullSql('ccacs.value', 'ccacd.value') . ' = ?',
-+                    1
-                 ),
-             'entity_id'
-         );
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
-index f8121b55dbf..eb59acb56c3 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
-@@ -3,33 +3,46 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Model\Indexer\Category\Product\Action;
- 
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\Config;
-+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
- use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\DB\Adapter\AdapterInterface;
- use Magento\Framework\DB\Query\Generator as QueryGenerator;
- use Magento\Framework\App\ResourceConnection;
-+use Magento\Framework\DB\Select;
-+use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Framework\Indexer\BatchProviderInterface;
-+use Magento\Framework\Indexer\BatchSizeManagementInterface;
- use Magento\Indexer\Model\ProcessManager;
-+use Magento\Store\Model\Store;
-+use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * Class Full reindex action
-  *
-- * @package Magento\Catalog\Model\Indexer\Category\Product\Action
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
-+class Full extends AbstractAction
- {
-     /**
--     * @var \Magento\Framework\Indexer\BatchSizeManagementInterface
-+     * @var BatchSizeManagementInterface
-      */
-     private $batchSizeManagement;
- 
-     /**
--     * @var \Magento\Framework\Indexer\BatchProviderInterface
-+     * @var BatchProviderInterface
-      */
-     private $batchProvider;
- 
-     /**
--     * @var \Magento\Framework\EntityManager\MetadataPool
-+     * @var MetadataPool
-      */
-     protected $metadataPool;
- 
-@@ -52,25 +65,25 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
- 
-     /**
-      * @param ResourceConnection $resource
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Catalog\Model\Config $config
-+     * @param StoreManagerInterface $storeManager
-+     * @param Config $config
-      * @param QueryGenerator|null $queryGenerator
--     * @param \Magento\Framework\Indexer\BatchSizeManagementInterface|null $batchSizeManagement
--     * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
--     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
-+     * @param BatchSizeManagementInterface|null $batchSizeManagement
-+     * @param BatchProviderInterface|null $batchProvider
-+     * @param MetadataPool|null $metadataPool
-      * @param int|null $batchRowsCount
-      * @param ActiveTableSwitcher|null $activeTableSwitcher
-      * @param ProcessManager $processManager
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
--        \Magento\Framework\App\ResourceConnection $resource,
--        \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Catalog\Model\Config $config,
-+        ResourceConnection $resource,
-+        StoreManagerInterface $storeManager,
-+        Config $config,
-         QueryGenerator $queryGenerator = null,
--        \Magento\Framework\Indexer\BatchSizeManagementInterface $batchSizeManagement = null,
--        \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
--        \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
-+        BatchSizeManagementInterface $batchSizeManagement = null,
-+        BatchProviderInterface $batchProvider = null,
-+        MetadataPool $metadataPool = null,
-         $batchRowsCount = null,
-         ActiveTableSwitcher $activeTableSwitcher = null,
-         ProcessManager $processManager = null
-@@ -81,15 +94,15 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
-             $config,
-             $queryGenerator
-         );
--        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-+        $objectManager = ObjectManager::getInstance();
-         $this->batchSizeManagement = $batchSizeManagement ?: $objectManager->get(
--            \Magento\Framework\Indexer\BatchSizeManagementInterface::class
-+            BatchSizeManagementInterface::class
-         );
-         $this->batchProvider = $batchProvider ?: $objectManager->get(
--            \Magento\Framework\Indexer\BatchProviderInterface::class
-+            BatchProviderInterface::class
-         );
-         $this->metadataPool = $metadataPool ?: $objectManager->get(
--            \Magento\Framework\EntityManager\MetadataPool::class
-+            MetadataPool::class
-         );
-         $this->batchRowsCount = $batchRowsCount;
-         $this->activeTableSwitcher = $activeTableSwitcher ?: $objectManager->get(ActiveTableSwitcher::class);
-@@ -97,33 +110,39 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
-     }
- 
-     /**
-+     * Create the store tables
-+     *
-      * @return void
-      */
--    private function createTables()
-+    private function createTables(): void
-     {
-         foreach ($this->storeManager->getStores() as $store) {
--            $this->tableMaintainer->createTablesForStore($store->getId());
-+            $this->tableMaintainer->createTablesForStore((int)$store->getId());
-         }
-     }
- 
-     /**
-+     * Truncates the replica tables
-+     *
-      * @return void
-      */
--    private function clearReplicaTables()
-+    private function clearReplicaTables(): void
-     {
-         foreach ($this->storeManager->getStores() as $store) {
--            $this->connection->truncateTable($this->tableMaintainer->getMainReplicaTable($store->getId()));
-+            $this->connection->truncateTable($this->tableMaintainer->getMainReplicaTable((int)$store->getId()));
-         }
-     }
- 
-     /**
-+     * Switches the active table
-+     *
-      * @return void
-      */
--    private function switchTables()
-+    private function switchTables(): void
-     {
-         $tablesToSwitch = [];
-         foreach ($this->storeManager->getStores() as $store) {
--            $tablesToSwitch[] = $this->tableMaintainer->getMainTable($store->getId());
-+            $tablesToSwitch[] = $this->tableMaintainer->getMainTable((int)$store->getId());
-         }
-         $this->activeTableSwitcher->switchTable($this->connection, $tablesToSwitch);
-     }
-@@ -133,12 +152,13 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
-      *
-      * @return $this
-      */
--    public function execute()
-+    public function execute(): self
-     {
-         $this->createTables();
-         $this->clearReplicaTables();
-         $this->reindex();
-         $this->switchTables();
-+
-         return $this;
-     }
- 
-@@ -147,7 +167,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
-      *
-      * @return void
-      */
--    protected function reindex()
-+    protected function reindex(): void
-     {
-         $userFunctions = [];
- 
-@@ -165,9 +185,9 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
-     /**
-      * Execute indexation by store
-      *
--     * @param \Magento\Store\Model\Store $store
-+     * @param Store $store
-      */
--    private function reindexStore($store)
-+    private function reindexStore($store): void
-     {
-         $this->reindexRootCategory($store);
-         $this->reindexAnchorCategories($store);
-@@ -177,31 +197,31 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
-     /**
-      * Publish data from tmp to replica table
-      *
--     * @param \Magento\Store\Model\Store $store
-+     * @param Store $store
-      * @return void
-      */
--    private function publishData($store)
-+    private function publishData($store): void
-     {
--        $select = $this->connection->select()->from($this->tableMaintainer->getMainTmpTable($store->getId()));
-+        $select = $this->connection->select()->from($this->tableMaintainer->getMainTmpTable((int)$store->getId()));
-         $columns = array_keys(
--            $this->connection->describeTable($this->tableMaintainer->getMainReplicaTable($store->getId()))
-+            $this->connection->describeTable($this->tableMaintainer->getMainReplicaTable((int)$store->getId()))
-         );
--        $tableName = $this->tableMaintainer->getMainReplicaTable($store->getId());
-+        $tableName = $this->tableMaintainer->getMainReplicaTable((int)$store->getId());
- 
-         $this->connection->query(
-             $this->connection->insertFromSelect(
-                 $select,
-                 $tableName,
-                 $columns,
--                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
-+                AdapterInterface::INSERT_ON_DUPLICATE
-             )
-         );
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
--    protected function reindexRootCategory(\Magento\Store\Model\Store $store)
-+    protected function reindexRootCategory(Store $store): void
-     {
-         if ($this->isIndexRootCategoryNeeded()) {
-             $this->reindexCategoriesBySelect($this->getAllProducts($store), 'cp.entity_id IN (?)', $store);
-@@ -211,10 +231,10 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
-     /**
-      * Reindex products of anchor categories
-      *
--     * @param \Magento\Store\Model\Store $store
-+     * @param Store $store
-      * @return void
-      */
--    protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
-+    protected function reindexAnchorCategories(Store $store): void
-     {
-         $this->reindexCategoriesBySelect($this->getAnchorCategoriesSelect($store), 'ccp.product_id IN (?)', $store);
-     }
-@@ -222,10 +242,10 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
-     /**
-      * Reindex products of non anchor categories
-      *
--     * @param \Magento\Store\Model\Store $store
-+     * @param Store $store
-      * @return void
-      */
--    protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store)
-+    protected function reindexNonAnchorCategories(Store $store): void
-     {
-         $this->reindexCategoriesBySelect($this->getNonAnchorCategoriesSelect($store), 'ccp.product_id IN (?)', $store);
-     }
-@@ -233,40 +253,42 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
-     /**
-      * Reindex categories using given SQL select and condition.
-      *
--     * @param \Magento\Framework\DB\Select $basicSelect
-+     * @param Select $basicSelect
-      * @param string $whereCondition
--     * @param \Magento\Store\Model\Store $store
-+     * @param Store $store
-      * @return void
-      */
--    private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSelect, $whereCondition, $store)
-+    private function reindexCategoriesBySelect(Select $basicSelect, $whereCondition, $store): void
-     {
--        $this->tableMaintainer->createMainTmpTable($store->getId());
-+        $this->tableMaintainer->createMainTmpTable((int)$store->getId());
- 
--        $entityMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-+        $entityMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
-         $columns = array_keys(
--            $this->connection->describeTable($this->tableMaintainer->getMainTmpTable($store->getId()))
-+            $this->connection->describeTable($this->tableMaintainer->getMainTmpTable((int)$store->getId()))
-         );
-         $this->batchSizeManagement->ensureBatchSize($this->connection, $this->batchRowsCount);
--        $batches = $this->batchProvider->getBatches(
--            $this->connection,
--            $entityMetadata->getEntityTable(),
-+
-+        $select = $this->connection->select();
-+        $select->distinct(true);
-+        $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
-+
-+        $batchQueries = $this->prepareSelectsByRange(
-+            $select,
-             $entityMetadata->getIdentifierField(),
--            $this->batchRowsCount
-+            (int)$this->batchRowsCount
-         );
--        foreach ($batches as $batch) {
--            $this->connection->delete($this->tableMaintainer->getMainTmpTable($store->getId()));
-+
-+        foreach ($batchQueries as $query) {
-+            $this->connection->delete($this->tableMaintainer->getMainTmpTable((int)$store->getId()));
-+            $entityIds = $this->connection->fetchCol($query);
-             $resultSelect = clone $basicSelect;
--            $select = $this->connection->select();
--            $select->distinct(true);
--            $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
--            $entityIds = $this->batchProvider->getBatchIds($this->connection, $select, $batch);
-             $resultSelect->where($whereCondition, $entityIds);
-             $this->connection->query(
-                 $this->connection->insertFromSelect(
-                     $resultSelect,
--                    $this->tableMaintainer->getMainTmpTable($store->getId()),
-+                    $this->tableMaintainer->getMainTmpTable((int)$store->getId()),
-                     $columns,
--                    \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
-+                    AdapterInterface::INSERT_ON_DUPLICATE
-                 )
-             );
-             $this->publishData($store);
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
-index 182f04de4ab..cb708695255 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
-@@ -17,6 +17,8 @@ use Magento\Framework\Indexer\CacheContext;
- use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-+ * Category rows indexer.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
-@@ -161,7 +163,7 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
-                 $this->getIndexTable($store->getId()),
-                 ['product_id IN (?)' => $this->limitationByProducts]
-             );
--        };
-+        }
-     }
- 
-     /**
-@@ -213,6 +215,7 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
-     /**
-      * Returns a list of category ids which are assigned to product ids in the index
-      *
-+     * @param array $productIds
-      * @return \Magento\Framework\Indexer\CacheContext
-      */
-     private function getCategoryIdsFromIndex(array $productIds)
-@@ -228,7 +231,7 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
-                         ->distinct()
-                 )
-             );
--        };
-+        }
-         $parentCategories = $categoryIds;
-         foreach ($categoryIds as $categoryId) {
-             $parentIds = explode('/', $this->getPathFromCategoryId($categoryId));
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
-index 802176092d1..ed8f692885d 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
-@@ -7,26 +7,41 @@ declare(strict_types=1);
- 
- namespace Magento\Catalog\Model\Indexer\Product\Eav\Action;
- 
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction;
- use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+use Magento\Framework\DB\Query\BatchIteratorInterface;
-+use Magento\Framework\DB\Query\Generator as QueryGenerator;
-+use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Indexer\BatchProviderInterface;
-+use Magento\Store\Model\ScopeInterface;
- 
- /**
-  * Class Full reindex action
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
-+class Full extends AbstractAction
- {
-     /**
--     * @var \Magento\Framework\EntityManager\MetadataPool
-+     * @var MetadataPool
-      */
-     private $metadataPool;
- 
-     /**
--     * @var \Magento\Framework\Indexer\BatchProviderInterface
-+     * @var BatchProviderInterface
-      */
-     private $batchProvider;
- 
-     /**
--     * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator
-+     * @var BatchSizeCalculator
-      */
-     private $batchSizeCalculator;
- 
-@@ -36,44 +51,54 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
-     private $activeTableSwitcher;
- 
-     /**
--     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-+     * @var ScopeConfigInterface
-      */
-     private $scopeConfig;
- 
-     /**
--     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory
--     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory
--     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
--     * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
--     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator $batchSizeCalculator
-+     * @var QueryGenerator|null
-+     */
-+    private $batchQueryGenerator;
-+
-+    /**
-+     * @param DecimalFactory $eavDecimalFactory
-+     * @param SourceFactory $eavSourceFactory
-+     * @param MetadataPool|null $metadataPool
-+     * @param BatchProviderInterface|null $batchProvider
-+     * @param BatchSizeCalculator $batchSizeCalculator
-      * @param ActiveTableSwitcher|null $activeTableSwitcher
--     * @param \Magento\Framework\App\Config\ScopeConfigInterface|null $scopeConfig
-+     * @param ScopeConfigInterface|null $scopeConfig
-+     * @param QueryGenerator|null $batchQueryGenerator
-      */
-     public function __construct(
--        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory,
--        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory,
--        \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
--        \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
--        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator $batchSizeCalculator = null,
-+        DecimalFactory $eavDecimalFactory,
-+        SourceFactory $eavSourceFactory,
-+        MetadataPool $metadataPool = null,
-+        BatchProviderInterface $batchProvider = null,
-+        BatchSizeCalculator $batchSizeCalculator = null,
-         ActiveTableSwitcher $activeTableSwitcher = null,
--        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig = null
-+        ScopeConfigInterface $scopeConfig = null,
-+        QueryGenerator $batchQueryGenerator = null
-     ) {
--        $this->scopeConfig = $scopeConfig ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
--            \Magento\Framework\App\Config\ScopeConfigInterface::class
-+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(
-+            ScopeConfigInterface::class
-         );
-         parent::__construct($eavDecimalFactory, $eavSourceFactory, $scopeConfig);
--        $this->metadataPool = $metadataPool ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
--            \Magento\Framework\EntityManager\MetadataPool::class
-+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(
-+            MetadataPool::class
-         );
--        $this->batchProvider = $batchProvider ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
--            \Magento\Framework\Indexer\BatchProviderInterface::class
-+        $this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(
-+            BatchProviderInterface::class
-         );
--        $this->batchSizeCalculator = $batchSizeCalculator ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
--            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator::class
-+        $this->batchSizeCalculator = $batchSizeCalculator ?: ObjectManager::getInstance()->get(
-+            BatchSizeCalculator::class
-         );
--        $this->activeTableSwitcher = $activeTableSwitcher ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-+        $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()->get(
-             ActiveTableSwitcher::class
-         );
-+        $this->batchQueryGenerator = $batchQueryGenerator ?: ObjectManager::getInstance()->get(
-+            QueryGenerator::class
-+        );
-     }
- 
-     /**
-@@ -81,10 +106,10 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
-      *
-      * @param array|int|null $ids
-      * @return void
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws LocalizedException
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    public function execute($ids = null)
-+    public function execute($ids = null): void
-     {
-         if (!$this->isEavIndexerEnabled()) {
-             return;
-@@ -94,20 +119,21 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
-                 $connection = $indexer->getConnection();
-                 $mainTable = $this->activeTableSwitcher->getAdditionalTableName($indexer->getMainTable());
-                 $connection->truncateTable($mainTable);
--                $entityMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
--                $batches = $this->batchProvider->getBatches(
--                    $connection,
--                    $entityMetadata->getEntityTable(),
-+                $entityMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
-+
-+                $select = $connection->select();
-+                $select->distinct(true);
-+                $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
-+
-+                $batchQueries = $this->batchQueryGenerator->generate(
-                     $entityMetadata->getIdentifierField(),
--                    $this->batchSizeCalculator->estimateBatchSize($connection, $indexerName)
-+                    $select,
-+                    $this->batchSizeCalculator->estimateBatchSize($connection, $indexerName),
-+                    BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
-                 );
- 
--                foreach ($batches as $batch) {
--                    /** @var \Magento\Framework\DB\Select $select */
--                    $select = $connection->select();
--                    $select->distinct(true);
--                    $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
--                    $entityIds = $this->batchProvider->getBatchIds($connection, $select, $batch);
-+                foreach ($batchQueries as $query) {
-+                    $entityIds = $connection->fetchCol($query);
-                     if (!empty($entityIds)) {
-                         $indexer->reindexEntities($this->processRelations($indexer, $entityIds, true));
-                         $this->syncData($indexer, $mainTable);
-@@ -116,14 +142,14 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
-                 $this->activeTableSwitcher->switchTable($indexer->getConnection(), [$indexer->getMainTable()]);
-             }
-         } catch (\Exception $e) {
--            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
-+            throw new LocalizedException(__($e->getMessage()), $e);
-         }
-     }
- 
-     /**
-      * @inheritdoc
-      */
--    protected function syncData($indexer, $destinationTable, $ids = null)
-+    protected function syncData($indexer, $destinationTable, $ids = null): void
-     {
-         $connection = $indexer->getConnection();
-         $connection->beginTransaction();
-@@ -136,7 +162,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
-                 $select,
-                 $destinationTable,
-                 $targetColumns,
--                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
-+                AdapterInterface::INSERT_ON_DUPLICATE
-             );
-             $connection->query($query);
-             $connection->commit();
-@@ -155,7 +181,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
-     {
-         $eavIndexerStatus = $this->scopeConfig->getValue(
-             self::ENABLE_EAV_INDEXER,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         );
- 
-         return (bool)$eavIndexerStatus;
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
-index 3b63a90d4c3..ebad10e1976 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
-@@ -169,8 +169,7 @@ abstract class AbstractAction
-     }
- 
-     /**
--     * Retrieve Product Type Instances
--     * as key - type code, value - instance model
-+     * Retrieve Product Type Instances as key - type code, value - instance model
-      *
-      * @return array
-      */
-@@ -213,17 +212,19 @@ abstract class AbstractAction
-             ) {
-                 $columns = $this->_productIndexerHelper->getFlatColumns();
-                 $fieldList = array_keys($columns);
--                unset($columns['entity_id']);
--                unset($columns['child_id']);
--                unset($columns['is_child']);
-+                unset(
-+                    $columns['entity_id'],
-+                    $columns['child_id'],
-+                    $columns['is_child']
-+                );
-                 /** @var $select \Magento\Framework\DB\Select */
-                 $select = $this->_connection->select()->from(
-                     ['t' => $this->_productIndexerHelper->getTable($relation->getTable())],
--                    [$relation->getChildFieldName(), new \Zend_Db_Expr('1')]
-+                    ['entity_table.entity_id', $relation->getChildFieldName(), new \Zend_Db_Expr('1')]
-                 )->join(
-                     ['entity_table' => $this->_connection->getTableName('catalog_product_entity')],
--                    'entity_table.' . $metadata->getLinkField() . 't.' . $relation->getParentFieldName(),
--                    [$relation->getParentFieldName() => 'entity_table.entity_id']
-+                    "entity_table.{$metadata->getLinkField()} = t.{$relation->getParentFieldName()}",
-+                    []
-                 )->join(
-                     ['e' => $this->_productIndexerHelper->getFlatTableName($storeId)],
-                     "e.entity_id = t.{$relation->getChildFieldName()}",
-@@ -232,10 +233,10 @@ abstract class AbstractAction
-                 if ($relation->getWhere() !== null) {
-                     $select->where($relation->getWhere());
-                 }
--                if ($productIds !== null) {
-+                if (!empty($productIds)) {
-                     $cond = [
-                         $this->_connection->quoteInto("{$relation->getChildFieldName()} IN(?)", $productIds),
--                        $this->_connection->quoteInto("entity_table.entity_id IN(?)", $productIds),
-+                        $this->_connection->quoteInto('entity_table.entity_id IN(?)', $productIds),
-                     ];
- 
-                     $select->where(implode(' OR ', $cond));
-@@ -273,15 +274,11 @@ abstract class AbstractAction
-                 $select = $this->_connection->select()->distinct(
-                     true
-                 )->from(
--                    ['t' => $this->_productIndexerHelper->getTable($relation->getTable())],
--                    []
--                )->join(
--                    ['entity_table' => $this->_connection->getTableName('catalog_product_entity')],
--                    'entity_table.' . $metadata->getLinkField() . 't.' . $relation->getParentFieldName(),
--                    [$relation->getParentFieldName() => 'entity_table.entity_id']
-+                    $this->_productIndexerHelper->getTable($relation->getTable()),
-+                    $relation->getParentFieldName()
-                 );
-                 $joinLeftCond = [
--                    "e.entity_id = entity_table.entity_id",
-+                    "e.{$metadata->getLinkField()} = t.{$relation->getParentFieldName()}",
-                     "e.child_id = t.{$relation->getChildFieldName()}",
-                 ];
-                 if ($relation->getWhere() !== null) {
-@@ -302,7 +299,7 @@ abstract class AbstractAction
-                     'e.is_child = ?',
-                     1
-                 )->where(
--                    'e.entity_id IN(?)',
-+                    "e.{$metadata->getLinkField()} IN(?)",
-                     $entitySelect
-                 )->where(
-                     "t.{$relation->getChildFieldName()} IS NULL"
-@@ -335,6 +332,8 @@ abstract class AbstractAction
-     }
- 
-     /**
-+     * Get Metadata Pool
-+     *
-      * @return \Magento\Framework\EntityManager\MetadataPool
-      */
-     private function getMetadataPool()
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
-index 8182e6f07fa..c4d807667bf 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
-@@ -8,7 +8,13 @@
- namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
- 
- use Magento\Framework\App\ResourceConnection;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Store\Model\Store;
- 
-+/**
-+ * Flat item eraser. Used to clear items from the catalog flat table.
-+ */
- class Eraser
- {
-     /**
-@@ -26,19 +32,28 @@ class Eraser
-      */
-     protected $storeManager;
- 
-+    /**
-+     * @var MetadataPool
-+     */
-+    private $metadataPool;
-+
-     /**
-      * @param \Magento\Framework\App\ResourceConnection $resource
-      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-+     * @param MetadataPool|null $metadataPool
-      */
-     public function __construct(
-         \Magento\Framework\App\ResourceConnection $resource,
-         \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
--        \Magento\Store\Model\StoreManagerInterface $storeManager
-+        \Magento\Store\Model\StoreManagerInterface $storeManager,
-+        MetadataPool $metadataPool = null
-     ) {
-         $this->productIndexerHelper = $productHelper;
-         $this->connection = $resource->getConnection();
-         $this->storeManager = $storeManager;
-+        $this->metadataPool = $metadataPool ?:
-+            \Magento\Framework\App\ObjectManager::getInstance()->get(MetadataPool::class);
-     }
- 
-     /**
-@@ -50,12 +65,7 @@ class Eraser
-      */
-     public function removeDeletedProducts(array &$ids, $storeId)
-     {
--        $select = $this->connection->select()->from(
--            $this->productIndexerHelper->getTable('catalog_product_entity')
--        )->where(
--            'entity_id IN(?)',
--            $ids
--        );
-+        $select = $this->getSelectForProducts($ids);
-         $result = $this->connection->query($select);
- 
-         $existentProducts = [];
-@@ -69,6 +79,69 @@ class Eraser
-         $this->deleteProductsFromStore($productsToDelete, $storeId);
-     }
- 
-+    /**
-+     * Remove products with "Disabled" status from the flat table(s).
-+     *
-+     * @param array $ids
-+     * @param int $storeId
-+     * @return void
-+     */
-+    public function removeDisabledProducts(array &$ids, $storeId)
-+    {
-+        /* @var $statusAttribute \Magento\Eav\Model\Entity\Attribute */
-+        $statusAttribute = $this->productIndexerHelper->getAttribute('status');
-+
-+        /** @var \Magento\Framework\EntityManager\EntityMetadataInterface $metadata */
-+        $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-+
-+        $select = $this->getSelectForProducts($ids);
-+        $select->joinLeft(
-+            ['status_global_attr' => $statusAttribute->getBackendTable()],
-+            ' status_global_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
-+            . ' AND status_global_attr.store_id = ' . Store::DEFAULT_STORE_ID
-+            . ' AND status_global_attr.' . $statusAttribute->getEntityIdField() . '='
-+            . 'product_table.' . $metadata->getLinkField(),
-+            []
-+        );
-+        $select->joinLeft(
-+            ['status_attr' => $statusAttribute->getBackendTable()],
-+            ' status_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
-+            . ' AND status_attr.store_id = ' . $storeId
-+            . ' AND status_attr.' . $statusAttribute->getEntityIdField() . '='
-+            . 'product_table.' . $metadata->getLinkField(),
-+            []
-+        );
-+        $select->where('IFNULL(status_attr.value, status_global_attr.value) = ?', Status::STATUS_DISABLED);
-+
-+        $result = $this->connection->query($select);
-+
-+        $disabledProducts = [];
-+        foreach ($result->fetchAll() as $product) {
-+            $disabledProducts[] = $product['entity_id'];
-+        }
-+
-+        if (!empty($disabledProducts)) {
-+            $ids = array_diff($ids, $disabledProducts);
-+            $this->deleteProductsFromStore($disabledProducts, $storeId);
-+        }
-+    }
-+
-+    /**
-+     * Get Select object for existed products.
-+     *
-+     * @param array $ids
-+     * @return \Magento\Framework\DB\Select
-+     */
-+    private function getSelectForProducts(array $ids)
-+    {
-+        $productTable = $this->productIndexerHelper->getTable('catalog_product_entity');
-+        $select = $this->connection->select()
-+            ->from(['product_table' => $productTable])
-+            ->columns('entity_id')
-+            ->where('product_table.entity_id IN(?)', $ids);
-+        return $select;
-+    }
-+
-     /**
-      * Delete products from flat table(s)
-      *
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
-index 3a161129928..c14bc0dd7e5 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
-@@ -9,6 +9,7 @@ namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
- use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Store\Model\Store;
- 
- /**
-  * Class Indexer
-@@ -53,42 +54,39 @@ class Indexer
-      * @param int $storeId
-      * @param int $productId
-      * @param string $valueFieldSuffix
--     * @return \Magento\Catalog\Model\Indexer\Product\Flat
-+     * @return $this
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-     public function write($storeId, $productId, $valueFieldSuffix = '')
-     {
-         $flatTable = $this->_productIndexerHelper->getFlatTableName($storeId);
-+        $entityTableName = $this->_productIndexerHelper->getTable('catalog_product_entity');
- 
-         $attributes = $this->_productIndexerHelper->getAttributes();
-         $eavAttributes = $this->_productIndexerHelper->getTablesStructure($attributes);
-         $updateData = [];
-         $describe = $this->_connection->describeTable($flatTable);
-+        $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
-+        $linkField = $metadata->getLinkField();
- 
-         foreach ($eavAttributes as $tableName => $tableColumns) {
-             $columnsChunks = array_chunk($tableColumns, self::ATTRIBUTES_CHUNK_SIZE, true);
- 
-             foreach ($columnsChunks as $columns) {
-                 $select = $this->_connection->select();
--                $selectValue = $this->_connection->select();
--                $keyColumns = [
--                    'entity_id' => 'e.entity_id',
--                    'attribute_id' => 't.attribute_id',
--                    'value' => $this->_connection->getIfNullSql('`t2`.`value`', '`t`.`value`'),
--                ];
--
--                if ($tableName != $this->_productIndexerHelper->getTable('catalog_product_entity')) {
-+
-+                if ($tableName != $entityTableName) {
-                     $valueColumns = [];
-                     $ids = [];
-                     $select->from(
--                        ['e' => $this->_productIndexerHelper->getTable('catalog_product_entity')],
--                        $keyColumns
--                    );
--
--                    $selectValue->from(
--                        ['e' => $this->_productIndexerHelper->getTable('catalog_product_entity')],
--                        $keyColumns
-+                        ['e' => $entityTableName],
-+                        [
-+                            'entity_id' => 'e.entity_id',
-+                            'attribute_id' => 't.attribute_id',
-+                            'value' => 't.value'
-+                        ]
-                     );
- 
-                     /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-@@ -97,40 +95,35 @@ class Indexer
-                             $ids[$attribute->getId()] = $columnName;
-                         }
-                     }
--                    $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
--                    $select->joinLeft(
-+                    $select->joinInner(
-                         ['t' => $tableName],
-                         sprintf('e.%s = t.%s ', $linkField, $linkField) . $this->_connection->quoteInto(
-                             ' AND t.attribute_id IN (?)',
-                             array_keys($ids)
--                        ) . ' AND t.store_id = 0',
--                        []
--                    )->joinLeft(
--                        ['t2' => $tableName],
--                        sprintf('t.%s = t2.%s ', $linkField, $linkField) .
--                        ' AND t.attribute_id = t2.attribute_id  ' .
--                        $this->_connection->quoteInto(
--                            ' AND t2.store_id = ?',
--                            $storeId
--                        ),
-+                        ) . ' AND ' . $this->_connection->quoteInto('t.store_id IN(?)', [
-+                                Store::DEFAULT_STORE_ID,
-+                                $storeId
-+                            ]),
-                         []
-                     )->where(
-                         'e.entity_id = ' . $productId
--                    )->where(
--                        't.attribute_id IS NOT NULL'
--                    );
-+                    )->order('t.store_id ASC');
-                     $cursor = $this->_connection->query($select);
-                     while ($row = $cursor->fetch(\Zend_Db::FETCH_ASSOC)) {
-                         $updateData[$ids[$row['attribute_id']]] = $row['value'];
-                         $valueColumnName = $ids[$row['attribute_id']] . $valueFieldSuffix;
-                         if (isset($describe[$valueColumnName])) {
--                            $valueColumns[$row['value']] = $valueColumnName;
-+                            $valueColumns[$row['attribute_id']] = [
-+                                'value' => $row['value'],
-+                                'column_name' => $valueColumnName
-+                            ];
-                         }
-                     }
- 
-                     //Update not simple attributes (eg. dropdown)
-                     if (!empty($valueColumns)) {
--                        $valueIds = array_keys($valueColumns);
-+                        $valueIds = array_column($valueColumns, 'value');
-+                        $optionIdToAttributeName = array_column($valueColumns, 'column_name', 'value');
- 
-                         $select = $this->_connection->select()->from(
-                             ['t' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
-@@ -139,14 +132,14 @@ class Indexer
-                             $this->_connection->quoteInto('t.option_id IN (?)', $valueIds)
-                         )->where(
-                             $this->_connection->quoteInto('t.store_id IN(?)', [
--                                \Magento\Store\Model\Store::DEFAULT_STORE_ID,
-+                                Store::DEFAULT_STORE_ID,
-                                 $storeId
-                             ])
-                         )
-                         ->order('t.store_id ASC');
-                         $cursor = $this->_connection->query($select);
-                         while ($row = $cursor->fetch(\Zend_Db::FETCH_ASSOC)) {
--                            $valueColumnName = $valueColumns[$row['option_id']];
-+                            $valueColumnName = $optionIdToAttributeName[$row['option_id']];
-                             if (isset($describe[$valueColumnName])) {
-                                 $updateData[$valueColumnName] = $row['value'];
-                             }
-@@ -156,8 +149,9 @@ class Indexer
-                     $columnNames = array_keys($columns);
-                     $columnNames[] = 'attribute_set_id';
-                     $columnNames[] = 'type_id';
-+                    $columnNames[] = $linkField;
-                     $select->from(
--                        ['e' => $this->_productIndexerHelper->getTable('catalog_product_entity')],
-+                        ['e' => $entityTableName],
-                         $columnNames
-                     )->where(
-                         'e.entity_id = ' . $productId
-@@ -165,6 +159,7 @@ class Indexer
-                     $cursor = $this->_connection->query($select);
-                     $row = $cursor->fetch(\Zend_Db::FETCH_ASSOC);
-                     if (!empty($row)) {
-+                        $linkFieldId = $linkField;
-                         foreach ($row as $columnName => $value) {
-                             $updateData[$columnName] = $value;
-                         }
-@@ -175,7 +170,9 @@ class Indexer
- 
-         if (!empty($updateData)) {
-             $updateData += ['entity_id' => $productId];
--            $updateData += ['row_id' => $productId];
-+            if ($linkField !== $metadata->getIdentifierField()) {
-+                $updateData += [$linkField => $linkFieldId];
-+            }
-             $updateFields = [];
-             foreach ($updateData as $key => $value) {
-                 $updateFields[$key] = $key;
-@@ -187,6 +184,8 @@ class Indexer
-     }
- 
-     /**
-+     * Get MetadataPool instance
-+     *
-      * @return \Magento\Framework\EntityManager\MetadataPool
-      */
-     private function getMetadataPool()
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
-index b5dbdb68606..64a7c4be4e0 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
-@@ -5,16 +5,20 @@
-  */
- namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
- 
-+use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Model\Indexer\Product\Flat\FlatTableBuilder;
- use Magento\Catalog\Model\Indexer\Product\Flat\TableBuilder;
-+use Magento\Framework\EntityManager\MetadataPool;
- 
- /**
-- * Class Row reindex action
-+ * Class Row reindex action.
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
- {
-     /**
--     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Action\Indexer
-+     * @var Indexer
-      */
-     protected $flatItemWriter;
- 
-@@ -23,6 +27,11 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
-      */
-     protected $flatItemEraser;
- 
-+    /**
-+     * @var MetadataPool
-+     */
-+    private $metadataPool;
-+
-     /**
-      * @param \Magento\Framework\App\ResourceConnection $resource
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-@@ -32,6 +41,7 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
-      * @param FlatTableBuilder $flatTableBuilder
-      * @param Indexer $flatItemWriter
-      * @param Eraser $flatItemEraser
-+     * @param MetadataPool|null $metadataPool
-      */
-     public function __construct(
-         \Magento\Framework\App\ResourceConnection $resource,
-@@ -41,7 +51,8 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
-         TableBuilder $tableBuilder,
-         FlatTableBuilder $flatTableBuilder,
-         Indexer $flatItemWriter,
--        Eraser $flatItemEraser
-+        Eraser $flatItemEraser,
-+        MetadataPool $metadataPool = null
-     ) {
-         parent::__construct(
-             $resource,
-@@ -53,6 +64,8 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
-         );
-         $this->flatItemWriter = $flatItemWriter;
-         $this->flatItemEraser = $flatItemEraser;
-+        $this->metadataPool = $metadataPool ?:
-+            \Magento\Framework\App\ObjectManager::getInstance()->get(MetadataPool::class);
-     }
- 
-     /**
-@@ -70,24 +83,50 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
-             );
-         }
-         $ids = [$id];
--        foreach ($this->_storeManager->getStores() as $store) {
-+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-+
-+        $stores = $this->_storeManager->getStores();
-+        foreach ($stores as $store) {
-             $tableExists = $this->_isFlatTableExists($store->getId());
-             if ($tableExists) {
-                 $this->flatItemEraser->removeDeletedProducts($ids, $store->getId());
-+                $this->flatItemEraser->removeDisabledProducts($ids, $store->getId());
-             }
--            if (isset($ids[0])) {
-+
-+            /* @var $status \Magento\Eav\Model\Entity\Attribute */
-+            $status = $this->_productIndexerHelper->getAttribute(ProductInterface::STATUS);
-+            $statusTable = $status->getBackend()->getTable();
-+            $catalogProductEntityTable = $this->_productIndexerHelper->getTable('catalog_product_entity');
-+            $statusConditions = [
-+                's.store_id IN(0,' . (int)$store->getId() . ')',
-+                's.attribute_id = ' . (int)$status->getId(),
-+                'e.entity_id = ' . (int)$id,
-+            ];
-+            $select = $this->_connection->select();
-+            $select->from(['e' => $catalogProductEntityTable], ['s.value'])
-+                ->where(implode(' AND ', $statusConditions))
-+                ->joinLeft(['s' => $statusTable], "e.{$linkField} = s.{$linkField}", [])
-+                ->order('s.store_id DESC')
-+                ->limit(1);
-+            $result = $this->_connection->query($select);
-+            $status = $result->fetchColumn(0);
-+
-+            if ($status == \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) {
-                 if (!$tableExists) {
-                     $this->_flatTableBuilder->build(
-                         $store->getId(),
--                        [$ids[0]],
-+                        $ids,
-                         $this->_valueFieldSuffix,
-                         $this->_tableDropSuffix,
-                         false
-                     );
-                 }
--                $this->flatItemWriter->write($store->getId(), $ids[0], $this->_valueFieldSuffix);
-+                $this->flatItemWriter->write($store->getId(), $id, $this->_valueFieldSuffix);
-+            } else {
-+                $this->flatItemEraser->deleteProductsFromStore($id, $store->getId());
-             }
-         }
-+
-         return $this;
-     }
- }
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
-index fbe0d4b550f..2252b3e3d55 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
-@@ -10,7 +10,8 @@ use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\EntityManager\MetadataPool;
- 
- /**
-- * Class FlatTableBuilder
-+ * Class for building flat index
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class FlatTableBuilder
-@@ -346,12 +347,21 @@ class FlatTableBuilder
-                 }
- 
-                 //Update not simple attributes (eg. dropdown)
--                if (isset($flatColumns[$attributeCode . $valueFieldSuffix])) {
--                    $select = $this->_connection->select()->joinInner(
--                        ['t' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
--                        't.option_id = et.' . $attributeCode . ' AND t.store_id=' . $storeId,
--                        [$attributeCode . $valueFieldSuffix => 't.value']
--                    );
-+                $columnName = $attributeCode . $valueFieldSuffix;
-+                if (isset($flatColumns[$columnName])) {
-+                    $columnValue = $this->_connection->getIfNullSql('ts.value', 't0.value');
-+                    $select = $this->_connection->select();
-+                    $select->joinLeft(
-+                        ['t0' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
-+                        't0.option_id = et.' . $attributeCode . ' AND t0.store_id = 0',
-+                        []
-+                    )->joinLeft(
-+                        ['ts' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
-+                        'ts.option_id = et.' . $attributeCode . ' AND ts.store_id = ' . $storeId,
-+                        []
-+                    )->columns(
-+                        [$columnName => $columnValue]
-+                    )->where($columnValue . ' IS NOT NULL');
-                     if (!empty($changedIds)) {
-                         $select->where($this->_connection->quoteInto('et.entity_id IN (?)', $changedIds));
-                     }
-@@ -374,6 +384,8 @@ class FlatTableBuilder
-     }
- 
-     /**
-+     * Get metadata pool
-+     *
-      * @return \Magento\Framework\EntityManager\MetadataPool
-      */
-     private function getMetadataPool()
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
-index a32379b8c0a..e6c098ab025 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
-@@ -7,6 +7,9 @@ namespace Magento\Catalog\Model\Indexer\Product\Flat;
- 
- use Magento\Catalog\Model\Indexer\Product\Flat\Table\BuilderInterfaceFactory;
- 
-+/**
-+ * Class TableBuilder
-+ */
- class TableBuilder
- {
-     /**
-@@ -112,7 +115,7 @@ class TableBuilder
-     /**
-      * Create empty temporary table with given columns list
-      *
--     * @param string $tableName  Table name
-+     * @param string $tableName Table name
-      * @param array $columns array('columnName' => \Magento\Catalog\Model\ResourceModel\Eav\Attribute, ...)
-      * @param string $valueFieldSuffix
-      *
-@@ -137,13 +140,23 @@ class TableBuilder
-             );
-             $flatColumns = $this->_productIndexerHelper->getFlatColumns();
- 
--            $temporaryTableBuilder->addColumn('entity_id', \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER);
-+            $temporaryTableBuilder->addColumn(
-+                'entity_id',
-+                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-+                null,
-+                ['unsigned'=>true]
-+            );
- 
-             $temporaryTableBuilder->addColumn('type_id', \Magento\Framework\DB\Ddl\Table::TYPE_TEXT);
- 
-             $temporaryTableBuilder->addColumn('attribute_set_id', \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER);
- 
--            $valueTemporaryTableBuilder->addColumn('entity_id', \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER);
-+            $valueTemporaryTableBuilder->addColumn(
-+                'entity_id',
-+                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-+                null,
-+                ['unsigned'=>true]
-+            );
- 
-             /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-             foreach ($columns as $columnName => $attribute) {
-@@ -198,9 +211,10 @@ class TableBuilder
-      * Fill temporary entity table
-      *
-      * @param string $tableName
--     * @param array  $columns
--     * @param array  $changedIds
-+     * @param array $columns
-+     * @param array $changedIds
-      * @return void
-+     * @throws \Exception
-      */
-     protected function _fillTemporaryEntityTable($tableName, array $columns, array $changedIds = [])
-     {
-@@ -244,11 +258,12 @@ class TableBuilder
-      * Fill temporary table by data from products EAV attributes by type
-      *
-      * @param string $tableName
--     * @param array  $tableColumns
--     * @param array  $changedIds
-+     * @param array $tableColumns
-+     * @param array $changedIds
-      * @param string $valueFieldSuffix
-      * @param int $storeId
-      * @return void
-+     * @throws \Exception
-      */
-     protected function _fillTemporaryTable(
-         $tableName,
-@@ -289,12 +304,16 @@ class TableBuilder
- 
-                 /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-                 foreach ($columnsList as $columnName => $attribute) {
--                    $countTableName = 't' . $iterationNum++;
-+                    $countTableName = 't' . ($iterationNum++);
-                     $joinCondition = sprintf(
--                        'e.%3$s = %1$s.%3$s AND %1$s.attribute_id = %2$d AND %1$s.store_id = 0',
-+                        'e.%3$s = %1$s.%3$s' .
-+                        ' AND %1$s.attribute_id = %2$d' .
-+                        ' AND (%1$s.store_id = %4$d' .
-+                        ' OR %1$s.store_id = 0)',
-                         $countTableName,
-                         $attribute->getId(),
--                        $metadata->getLinkField()
-+                        $metadata->getLinkField(),
-+                        $storeId
-                     );
- 
-                     $select->joinLeft(
-@@ -308,9 +327,10 @@ class TableBuilder
-                         $columnValueName = $attributeCode . $valueFieldSuffix;
-                         if (isset($flatColumns[$columnValueName])) {
-                             $valueJoinCondition = sprintf(
--                                'e.%1$s = %2$s.option_id AND %2$s.store_id = 0',
-+                                'e.%1$s = %2$s.option_id AND (%2$s.store_id = %3$d OR %2$s.store_id = 0)',
-                                 $attributeCode,
--                                $countTableName
-+                                $countTableName,
-+                                $storeId
-                             );
-                             $selectValue->joinLeft(
-                                 [
-@@ -345,6 +365,8 @@ class TableBuilder
-     }
- 
-     /**
-+     * Get Metadata Pool
-+     *
-      * @return \Magento\Framework\EntityManager\MetadataPool
-      * @deprecated 101.1.0
-      */
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
-index 1a757515706..858eba3ab21 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
-@@ -3,41 +3,64 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Model\Indexer\Product\Price\Action;
- 
-+use Magento\Catalog\Model\Indexer\Product\Price\AbstractAction;
-+use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
-+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
-+use Magento\Catalog\Model\Product\Type;
-+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory;
-+use Magento\Directory\Model\CurrencyFactory;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\ObjectManager;
- use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceInterface;
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+use Magento\Framework\DB\Query\BatchIterator;
-+use Magento\Framework\DB\Query\Generator as QueryGenerator;
-+use Magento\Framework\DB\Select;
- use Magento\Framework\EntityManager\EntityMetadataInterface;
- use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Indexer\BatchProviderInterface;
- use Magento\Framework\Indexer\DimensionalIndexerInterface;
- use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
-+use Magento\Framework\Stdlib\DateTime;
-+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-+use Magento\Indexer\Model\ProcessManager;
- use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
-+use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * Class Full reindex action
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-+class Full extends AbstractAction
- {
-     /**
--     * @var \Magento\Framework\EntityManager\MetadataPool
-+     * @var MetadataPool
-      */
-     private $metadataPool;
- 
-     /**
--     * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator
-+     * @var BatchSizeCalculator
-      */
-     private $batchSizeCalculator;
- 
-     /**
--     * @var \Magento\Framework\Indexer\BatchProviderInterface
-+     * @var BatchProviderInterface
-      */
-     private $batchProvider;
- 
-     /**
--     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher
-+     * @var ActiveTableSwitcher
-      */
-     private $activeTableSwitcher;
- 
-@@ -47,54 +70,61 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-     private $productMetaDataCached;
- 
-     /**
--     * @var \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory
-+     * @var DimensionCollectionFactory
-      */
-     private $dimensionCollectionFactory;
- 
-     /**
--     * @var \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer
-+     * @var TableMaintainer
-      */
-     private $dimensionTableMaintainer;
- 
-     /**
--     * @var \Magento\Indexer\Model\ProcessManager
-+     * @var ProcessManager
-      */
-     private $processManager;
- 
-     /**
--     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
--     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
--     * @param \Magento\Framework\Stdlib\DateTime $dateTime
--     * @param \Magento\Catalog\Model\Product\Type $catalogProductType
--     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory $indexerPriceFactory
--     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $defaultIndexerResource
--     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
--     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator|null $batchSizeCalculator
--     * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
--     * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher
--     * @param \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory|null $dimensionCollectionFactory
--     * @param \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer|null $dimensionTableMaintainer
--     * @param \Magento\Indexer\Model\ProcessManager $processManager
-+     * @var QueryGenerator|null
-+     */
-+    private $batchQueryGenerator;
-+
-+    /**
-+     * @param ScopeConfigInterface $config
-+     * @param StoreManagerInterface $storeManager
-+     * @param CurrencyFactory $currencyFactory
-+     * @param TimezoneInterface $localeDate
-+     * @param DateTime $dateTime
-+     * @param Type $catalogProductType
-+     * @param Factory $indexerPriceFactory
-+     * @param DefaultPrice $defaultIndexerResource
-+     * @param MetadataPool|null $metadataPool
-+     * @param BatchSizeCalculator|null $batchSizeCalculator
-+     * @param BatchProviderInterface|null $batchProvider
-+     * @param ActiveTableSwitcher|null $activeTableSwitcher
-+     * @param DimensionCollectionFactory|null $dimensionCollectionFactory
-+     * @param TableMaintainer|null $dimensionTableMaintainer
-+     * @param ProcessManager $processManager
-+     * @param QueryGenerator|null $batchQueryGenerator
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
--        \Magento\Framework\App\Config\ScopeConfigInterface $config,
--        \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Directory\Model\CurrencyFactory $currencyFactory,
--        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
--        \Magento\Framework\Stdlib\DateTime $dateTime,
--        \Magento\Catalog\Model\Product\Type $catalogProductType,
--        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory $indexerPriceFactory,
--        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $defaultIndexerResource,
--        \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
--        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator $batchSizeCalculator = null,
--        \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
--        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher = null,
--        \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory $dimensionCollectionFactory = null,
--        \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer $dimensionTableMaintainer = null,
--        \Magento\Indexer\Model\ProcessManager $processManager = null
-+        ScopeConfigInterface $config,
-+        StoreManagerInterface $storeManager,
-+        CurrencyFactory $currencyFactory,
-+        TimezoneInterface $localeDate,
-+        DateTime $dateTime,
-+        Type $catalogProductType,
-+        Factory $indexerPriceFactory,
-+        DefaultPrice $defaultIndexerResource,
-+        MetadataPool $metadataPool = null,
-+        BatchSizeCalculator $batchSizeCalculator = null,
-+        BatchProviderInterface $batchProvider = null,
-+        ActiveTableSwitcher $activeTableSwitcher = null,
-+        DimensionCollectionFactory $dimensionCollectionFactory = null,
-+        TableMaintainer $dimensionTableMaintainer = null,
-+        ProcessManager $processManager = null,
-+        QueryGenerator $batchQueryGenerator = null
-     ) {
-         parent::__construct(
-             $config,
-@@ -107,26 +137,27 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-             $defaultIndexerResource
-         );
-         $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(
--            \Magento\Framework\EntityManager\MetadataPool::class
-+            MetadataPool::class
-         );
-         $this->batchSizeCalculator = $batchSizeCalculator ?: ObjectManager::getInstance()->get(
--            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator::class
-+            BatchSizeCalculator::class
-         );
-         $this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(
--            \Magento\Framework\Indexer\BatchProviderInterface::class
-+            BatchProviderInterface::class
-         );
-         $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()->get(
--            \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class
-+            ActiveTableSwitcher::class
-         );
-         $this->dimensionCollectionFactory = $dimensionCollectionFactory ?: ObjectManager::getInstance()->get(
--            \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory::class
-+            DimensionCollectionFactory::class
-         );
-         $this->dimensionTableMaintainer = $dimensionTableMaintainer ?: ObjectManager::getInstance()->get(
--            \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer::class
-+            TableMaintainer::class
-         );
-         $this->processManager = $processManager ?: ObjectManager::getInstance()->get(
--            \Magento\Indexer\Model\ProcessManager::class
-+            ProcessManager::class
-         );
-+        $this->batchQueryGenerator = $batchQueryGenerator ?? ObjectManager::getInstance()->get(QueryGenerator::class);
-     }
- 
-     /**
-@@ -137,13 +168,13 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-      * @throws \Exception
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    public function execute($ids = null)
-+    public function execute($ids = null): void
-     {
-         try {
-             //Prepare indexer tables before full reindex
-             $this->prepareTables();
- 
--            /** @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $indexer */
-+            /** @var DefaultPrice $indexer */
-             foreach ($this->getTypeIndexers(true) as $typeId => $priceIndexer) {
-                 if ($priceIndexer instanceof DimensionalIndexerInterface) {
-                     //New price reindex mechanism
-@@ -170,7 +201,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-      * @return void
-      * @throws \Exception
-      */
--    private function prepareTables()
-+    private function prepareTables(): void
-     {
-         $this->_defaultIndexerResource->getTableStrategy()->setUseIdxTable(false);
- 
-@@ -185,7 +216,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-      * @return void
-      * @throws \Exception
-      */
--    private function truncateReplicaTables()
-+    private function truncateReplicaTables(): void
-     {
-         foreach ($this->dimensionCollectionFactory->create() as $dimension) {
-             $dimensionTable = $this->dimensionTableMaintainer->getMainReplicaTable($dimension);
-@@ -202,12 +233,12 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-      * @return void
-      * @throws \Exception
-      */
--    private function reindexProductTypeWithDimensions(DimensionalIndexerInterface $priceIndexer, string $typeId)
-+    private function reindexProductTypeWithDimensions(DimensionalIndexerInterface $priceIndexer, string $typeId): void
-     {
-         $userFunctions = [];
-         foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
-             $userFunctions[] = function () use ($priceIndexer, $dimensions, $typeId) {
--                return $this->reindexByBatches($priceIndexer, $dimensions, $typeId);
-+                $this->reindexByBatches($priceIndexer, $dimensions, $typeId);
-             };
-         }
-         $this->processManager->execute($userFunctions);
-@@ -223,10 +254,13 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-      * @return void
-      * @throws \Exception
-      */
--    private function reindexByBatches(DimensionalIndexerInterface $priceIndexer, array $dimensions, string $typeId)
--    {
-+    private function reindexByBatches(
-+        DimensionalIndexerInterface $priceIndexer,
-+        array $dimensions,
-+        string $typeId
-+    ): void {
-         foreach ($this->getBatchesForIndexer($typeId) as $batch) {
--            $this->reindexByBatchWithDimensions($priceIndexer, $batch, $dimensions, $typeId);
-+            $this->reindexByBatchWithDimensions($priceIndexer, $batch, $dimensions);
-         }
-     }
- 
-@@ -235,16 +269,20 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-      *
-      * @param string $typeId
-      *
--     * @return \Generator
-+     * @return BatchIterator
-      * @throws \Exception
-      */
--    private function getBatchesForIndexer(string $typeId)
-+    private function getBatchesForIndexer(string $typeId): BatchIterator
-     {
-         $connection = $this->_defaultIndexerResource->getConnection();
--        return $this->batchProvider->getBatches(
--            $connection,
--            $this->getProductMetaData()->getEntityTable(),
-+        $entityMetadata = $this->getProductMetaData();
-+        $select = $connection->select();
-+        $select->distinct(true);
-+        $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
-+
-+        return $this->batchQueryGenerator->generate(
-             $this->getProductMetaData()->getIdentifierField(),
-+            $select,
-             $this->batchSizeCalculator->estimateBatchSize(
-                 $connection,
-                 $typeId
-@@ -256,20 +294,18 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-      * Reindex by batch for new 'Dimensional' price indexer
-      *
-      * @param DimensionalIndexerInterface $priceIndexer
--     * @param array $batch
-+     * @param Select $batchQuery
-      * @param array $dimensions
--     * @param string $typeId
-      *
-      * @return void
-      * @throws \Exception
-      */
-     private function reindexByBatchWithDimensions(
-         DimensionalIndexerInterface $priceIndexer,
--        array $batch,
--        array $dimensions,
--        string $typeId
--    ) {
--        $entityIds = $this->getEntityIdsFromBatch($typeId, $batch);
-+        Select $batchQuery,
-+        array $dimensions
-+    ): void {
-+        $entityIds = $this->getEntityIdsFromBatch($batchQuery);
- 
-         if (!empty($entityIds)) {
-             $this->dimensionTableMaintainer->createMainTmpTable($dimensions);
-@@ -295,10 +331,10 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-      * @return void
-      * @throws \Exception
-      */
--    private function reindexProductType(PriceInterface $priceIndexer, string $typeId)
-+    private function reindexProductType(PriceInterface $priceIndexer, string $typeId): void
-     {
-         foreach ($this->getBatchesForIndexer($typeId) as $batch) {
--            $this->reindexBatch($priceIndexer, $batch, $typeId);
-+            $this->reindexBatch($priceIndexer, $batch);
-         }
-     }
- 
-@@ -306,15 +342,13 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-      * Reindex by batch for old price indexer
-      *
-      * @param PriceInterface $priceIndexer
--     * @param array $batch
--     * @param string $typeId
--     *
-+     * @param Select $batch
-      * @return void
-      * @throws \Exception
-      */
--    private function reindexBatch(PriceInterface $priceIndexer, array $batch, string $typeId)
-+    private function reindexBatch(PriceInterface $priceIndexer, Select $batch): void
-     {
--        $entityIds = $this->getEntityIdsFromBatch($typeId, $batch);
-+        $entityIds = $this->getEntityIdsFromBatch($batch);
- 
-         if (!empty($entityIds)) {
-             // Temporary table will created if not exists
-@@ -339,27 +373,15 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-     /**
-      * Get Entity Ids from batch
-      *
--     * @param string $typeId
--     * @param array $batch
--     *
-+     * @param Select $batch
-      * @return array
-      * @throws \Exception
-      */
--    private function getEntityIdsFromBatch(string $typeId, array $batch)
-+    private function getEntityIdsFromBatch(Select $batch): array
-     {
-         $connection = $this->_defaultIndexerResource->getConnection();
- 
--        // Get entity ids from batch
--        $select = $connection
--            ->select()
--            ->distinct(true)
--            ->from(
--                ['e' => $this->getProductMetaData()->getEntityTable()],
--                $this->getProductMetaData()->getIdentifierField()
--            )
--            ->where('type_id = ?', $typeId);
--
--        return $this->batchProvider->getBatchIds($connection, $select, $batch);
-+        return $connection->fetchCol($batch);
-     }
- 
-     /**
-@@ -368,7 +390,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-      * @return EntityMetadataInterface
-      * @throws \Exception
-      */
--    private function getProductMetaData()
-+    private function getProductMetaData(): EntityMetadataInterface
-     {
-         if ($this->productMetaDataCached === null) {
-             $this->productMetaDataCached = $this->metadataPool->getMetadata(ProductInterface::class);
-@@ -383,7 +405,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-      * @return string
-      * @throws \Exception
-      */
--    private function getReplicaTable()
-+    private function getReplicaTable(): string
-     {
-         return $this->activeTableSwitcher->getAdditionalTableName(
-             $this->_defaultIndexerResource->getMainTable()
-@@ -394,8 +416,9 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-      * Replacement of tables from replica to main
-      *
-      * @return void
-+     * @throws \Zend_Db_Statement_Exception
-      */
--    private function switchTables()
-+    private function switchTables(): void
-     {
-         // Switch dimension tables
-         $mainTablesByDimension = [];
-@@ -417,13 +440,14 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
- 
-     /**
-      * Move data from old price indexer mechanism to new indexer mechanism by dimensions.
-+     *
-      * Used only for backward compatibility
-      *
-      * @param array $dimensions
--     *
-      * @return void
-+     * @throws \Zend_Db_Statement_Exception
-      */
--    private function moveDataFromReplicaTableToReplicaTables(array $dimensions)
-+    private function moveDataFromReplicaTableToReplicaTables(array $dimensions): void
-     {
-         if (!$dimensions) {
-             return;
-@@ -455,17 +479,17 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-                 $select,
-                 $replicaTablesByDimension,
-                 [],
--                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
-+                AdapterInterface::INSERT_ON_DUPLICATE
-             )
-         );
-     }
- 
-     /**
--     * @deprecated
-+     * Retrieves the index table that should be used
-      *
--     * @inheritdoc
-+     * @deprecated
-      */
--    protected function getIndexTargetTable()
-+    protected function getIndexTargetTable(): string
-     {
-         return $this->activeTableSwitcher->getAdditionalTableName($this->_defaultIndexerResource->getMainTable());
-     }
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/DimensionModeConfiguration.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/DimensionModeConfiguration.php
-index 9b8eb55b7aa..7a4d8e31346 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/DimensionModeConfiguration.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/DimensionModeConfiguration.php
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- declare(strict_types=1);
--
- namespace Magento\Catalog\Model\Indexer\Product\Price;
- 
- use Magento\Framework\App\Config\ScopeConfigInterface;
-@@ -41,6 +40,7 @@ class DimensionModeConfiguration
-             CustomerGroupDimensionProvider::DIMENSION_NAME
-         ],
-     ];
-+
-     /**
-      * @var ScopeConfigInterface
-      */
-@@ -59,12 +59,23 @@ class DimensionModeConfiguration
-         $this->scopeConfig = $scopeConfig;
-     }
- 
-+    /**
-+     * Return dimension modes configuration.
-+     *
-+     * @return array
-+     */
-+    public function getDimensionModes(): array
-+    {
-+        return $this->modesMapping;
-+    }
-+
-     /**
-      * Get names of dimensions which used for provided mode.
-      * By default return dimensions for current enabled mode
-      *
-      * @param string|null $mode
-      * @return string[]
-+     * @throws \InvalidArgumentException
-      */
-     public function getDimensionConfiguration(string $mode = null): array
-     {
-@@ -82,7 +93,7 @@ class DimensionModeConfiguration
-     private function getCurrentMode(): string
-     {
-         if (null === $this->currentMode) {
--            $this->currentMode = $this->scopeConfig->getValue(ModeSwitcher::XML_PATH_PRICE_DIMENSIONS_MODE)
-+            $this->currentMode = $this->scopeConfig->getValue(ModeSwitcherConfiguration::XML_PATH_PRICE_DIMENSIONS_MODE)
-                 ?: self::DIMENSION_NONE;
-         }
- 
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcher.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcher.php
-index 81a170fc0a3..c418f2e1f25 100644
---- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcher.php
-+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcher.php
-@@ -10,14 +10,14 @@ namespace Magento\Catalog\Model\Indexer\Product\Price;
- use Magento\Framework\Search\Request\Dimension;
- use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
- use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
-+use Magento\Indexer\Model\DimensionModes;
-+use Magento\Indexer\Model\DimensionMode;
- 
- /**
-  * Class to prepare new tables for new indexer mode
-  */
--class ModeSwitcher
-+class ModeSwitcher implements \Magento\Indexer\Model\ModeSwitcherInterface
- {
--    const XML_PATH_PRICE_DIMENSIONS_MODE = 'indexer/catalog_product_price/dimensions_mode';
--
-     /**
-      * TableMaintainer
-      *
-@@ -38,15 +38,60 @@ class ModeSwitcher
-     private $dimensionsArray;
- 
-     /**
--     * @param \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer $tableMaintainer
--     * @param \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory $dimensionCollectionFactory
-+     * @var \Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration
-+     */
-+    private $dimensionModeConfiguration;
-+
-+    /**
-+     * @var ModeSwitcherConfiguration
-+     */
-+    private $modeSwitcherConfiguration;
-+
-+    /**
-+     * @param TableMaintainer $tableMaintainer
-+     * @param DimensionCollectionFactory $dimensionCollectionFactory
-+     * @param DimensionModeConfiguration $dimensionModeConfiguration
-+     * @param ModeSwitcherConfiguration $modeSwitcherConfiguration
-      */
-     public function __construct(
--        \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer $tableMaintainer,
--        \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory $dimensionCollectionFactory
-+        TableMaintainer $tableMaintainer,
-+        DimensionCollectionFactory $dimensionCollectionFactory,
-+        DimensionModeConfiguration $dimensionModeConfiguration,
-+        ModeSwitcherConfiguration $modeSwitcherConfiguration
-     ) {
-         $this->tableMaintainer = $tableMaintainer;
-         $this->dimensionCollectionFactory = $dimensionCollectionFactory;
-+        $this->dimensionModeConfiguration = $dimensionModeConfiguration;
-+        $this->modeSwitcherConfiguration = $modeSwitcherConfiguration;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getDimensionModes(): DimensionModes
-+    {
-+        $dimensionsList = [];
-+        foreach ($this->dimensionModeConfiguration->getDimensionModes() as $dimension => $modes) {
-+            $dimensionsList[] = new DimensionMode($dimension, $modes);
-+        }
-+
-+        return new DimensionModes($dimensionsList);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function switchMode(string $currentMode, string $previousMode)
-+    {
-+        //Create new tables and move data
-+        $this->createTables($currentMode);
-+        $this->moveData($currentMode, $previousMode);
-+
-+        //Change config options
-+        $this->modeSwitcherConfiguration->saveMode($currentMode);
-+
-+        //Delete old tables
-+        $this->dropTables($previousMode);
-     }
- 
-     /**
-@@ -120,7 +165,7 @@ class ModeSwitcher
-      *
-      * @param string $mode
-      *
--     * @return array
-+     * @return \Magento\Framework\Indexer\MultiDimensionProvider
-      */
-     private function getDimensionsArray(string $mode): \Magento\Framework\Indexer\MultiDimensionProvider
-     {
-diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcherConfiguration.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcherConfiguration.php
-new file mode 100644
-index 00000000000..ae00ec51f29
---- /dev/null
-+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcherConfiguration.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Indexer\Product\Price;
-+
-+use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
-+use Magento\Framework\App\Cache\TypeListInterface;
-+use Magento\Indexer\Model\Indexer;
-+
-+/**
-+ * Class to configure indexers and system config after modes has been switched
-+ */
-+class ModeSwitcherConfiguration
-+{
-+    const XML_PATH_PRICE_DIMENSIONS_MODE = 'indexer/catalog_product_price/dimensions_mode';
-+
-+    /**
-+     * ConfigInterface
-+     *
-+     * @var ConfigInterface
-+     */
-+    private $configWriter;
-+
-+    /**
-+     * TypeListInterface
-+     *
-+     * @var TypeListInterface
-+     */
-+    private $cacheTypeList;
-+
-+    /**
-+     * @var Indexer $indexer
-+     */
-+    private $indexer;
-+
-+    /**
-+     * @param ConfigInterface $configWriter
-+     * @param TypeListInterface $cacheTypeList
-+     * @param Indexer $indexer
-+     */
-+    public function __construct(
-+        ConfigInterface $configWriter,
-+        TypeListInterface $cacheTypeList,
-+        Indexer $indexer
-+    ) {
-+        $this->configWriter = $configWriter;
-+        $this->cacheTypeList = $cacheTypeList;
-+        $this->indexer = $indexer;
-+    }
-+
-+    /**
-+     * Save switcher mode and invalidate reindex.
-+     *
-+     * @param string $mode
-+     * @return void
-+     * @throws \InvalidArgumentException
-+     */
-+    public function saveMode(string $mode)
-+    {
-+        //Change config options
-+        $this->configWriter->saveConfig(self::XML_PATH_PRICE_DIMENSIONS_MODE, $mode);
-+        $this->cacheTypeList->cleanType('config');
-+        $this->indexer->load(\Magento\Catalog\Model\Indexer\Product\Price\Processor::INDEXER_ID);
-+        $this->indexer->invalidate();
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
-index d21a8666ec0..f2e2e67f944 100644
---- a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
-+++ b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
-@@ -139,7 +139,7 @@ abstract class AbstractFilter extends \Magento\Framework\DataObject implements F
-     }
- 
-     /**
--     * Get fiter items count
-+     * Get filter items count
-      *
-      * @return int
-      */
-diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
-index dac2632ff6d..d76711cb21d 100644
---- a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
-+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
-@@ -32,8 +32,8 @@ class Decimal extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param \Magento\Catalog\Model\Layer $layer
-      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
--     * @param \Magento\Catalog\Model\ResourceModel\Layer\Filter\DecimalFactory $filterDecimalFactory
-      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-+     * @param \Magento\Catalog\Model\Layer\Filter\DataProvider\DecimalFactory $dataProviderFactory
-      * @param array $data
-      */
-     public function __construct(
-diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php b/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
-index 4d2878b0b1e..07c9c2eaa24 100644
---- a/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
-+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
-@@ -4,11 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
-+namespace Magento\Catalog\Model\Layer\Filter\Item;
-+
- /**
-  * Item Data Builder
-  */
--namespace Magento\Catalog\Model\Layer\Filter\Item;
--
- class DataBuilder
- {
-     /**
-@@ -29,7 +29,7 @@ class DataBuilder
-      * Add Item Data
-      *
-      * @param string $label
--     * @param string $label
-+     * @param string $value
-      * @param int $count
-      * @return void
-      */
-diff --git a/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php b/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
-index c88215d9235..f51b2e4f90a 100644
---- a/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
-+++ b/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
-@@ -7,6 +7,9 @@
-  */
- namespace Magento\Catalog\Model\Plugin\ProductRepository;
- 
-+/**
-+ * Transaction wrapper for product repository CRUD.
-+ */
- class TransactionWrapper
- {
-     /**
-@@ -24,8 +27,10 @@ class TransactionWrapper
-     }
- 
-     /**
-+     * Transaction wrapper for save action.
-+     *
-      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
--     * @param callable $proceed
-+     * @param \Closure $proceed
-      * @param \Magento\Catalog\Api\Data\ProductInterface $product
-      * @param bool $saveOptions
-      * @return \Magento\Catalog\Api\Data\ProductInterface
-@@ -51,8 +56,10 @@ class TransactionWrapper
-     }
- 
-     /**
-+     * Transaction wrapper for delete action.
-+     *
-      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
--     * @param callable $proceed
-+     * @param \Closure $proceed
-      * @param \Magento\Catalog\Api\Data\ProductInterface $product
-      * @return bool
-      * @throws \Exception
-@@ -76,8 +83,10 @@ class TransactionWrapper
-     }
- 
-     /**
-+     * Transaction wrapper for delete by id action.
-+     *
-      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
--     * @param callable $proceed
-+     * @param \Closure $proceed
-      * @param string $productSku
-      * @return bool
-      * @throws \Exception
-diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
-index 90af9bee270..61544f8fb57 100644
---- a/app/code/Magento/Catalog/Model/Product.php
-+++ b/app/code/Magento/Catalog/Model/Product.php
-@@ -9,9 +9,8 @@ use Magento\Catalog\Api\CategoryRepositoryInterface;
- use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
- use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Api\ProductLinkRepositoryInterface;
--use Magento\Catalog\Model\Entity\GetProductCustomAttributeCodes;
- use Magento\Catalog\Model\Product\Attribute\Backend\Media\EntryConverterPool;
--use Magento\Eav\Model\Entity\GetCustomAttributeCodesInterface;
-+use Magento\Catalog\Model\FilterProductCustomAttribute;
- use Magento\Framework\Api\AttributeValueFactory;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\App\ObjectManager;
-@@ -176,7 +175,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     protected $_catalogProduct = null;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-@@ -278,6 +277,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
- 
-     /**
-      * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
-+     * @deprecated Not used anymore due to performance issue (loaded all product attributes)
-      */
-     protected $metadataService;
- 
-@@ -345,12 +345,15 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     protected $linkTypeProvider;
- 
-     /**
--     * @var GetCustomAttributeCodesInterface
-+     * @var \Magento\Eav\Model\Config
-      */
--    private $getCustomAttributeCodes;
-+    private $eavConfig;
-+    /**
-+     * @var FilterProductCustomAttribute|null
-+     */
-+    private $filterCustomAttribute;
- 
-     /**
--     * Product constructor.
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
-@@ -366,7 +369,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-      * @param Product\Attribute\Source\Status $catalogProductStatus
-      * @param Product\Media\Config $catalogProductMediaConfig
-      * @param Product\Type $catalogProductType
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Catalog\Helper\Product $catalogProduct
-      * @param ResourceModel\Product $resource
-      * @param ResourceModel\Product\Collection $resourceCollection
-@@ -386,7 +389,8 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
-      * @param array $data
--     * @param GetCustomAttributeCodesInterface|null $getCustomAttributeCodes
-+     * @param \Magento\Eav\Model\Config|null $config
-+     * @param FilterProductCustomAttribute|null $filterCustomAttribute
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-@@ -406,7 +410,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-         \Magento\Catalog\Model\Product\Attribute\Source\Status $catalogProductStatus,
-         \Magento\Catalog\Model\Product\Media\Config $catalogProductMediaConfig,
-         Product\Type $catalogProductType,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Catalog\Helper\Product $catalogProduct,
-         \Magento\Catalog\Model\ResourceModel\Product $resource,
-         \Magento\Catalog\Model\ResourceModel\Product\Collection $resourceCollection,
-@@ -426,7 +430,8 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
-         \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor,
-         array $data = [],
--        GetCustomAttributeCodesInterface $getCustomAttributeCodes = null
-+        \Magento\Eav\Model\Config $config = null,
-+        FilterProductCustomAttribute $filterCustomAttribute = null
-     ) {
-         $this->metadataService = $metadataService;
-         $this->_itemOptionFactory = $itemOptionFactory;
-@@ -455,9 +460,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-         $this->mediaGalleryEntryConverterPool = $mediaGalleryEntryConverterPool;
-         $this->dataObjectHelper = $dataObjectHelper;
-         $this->joinProcessor = $joinProcessor;
--        $this->getCustomAttributeCodes = $getCustomAttributeCodes ?? ObjectManager::getInstance()->get(
--            GetProductCustomAttributeCodes::class
--        );
-         parent::__construct(
-             $context,
-             $registry,
-@@ -468,6 +470,9 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-             $resourceCollection,
-             $data
-         );
-+        $this->eavConfig = $config ?? ObjectManager::getInstance()->get(\Magento\Eav\Model\Config::class);
-+        $this->filterCustomAttribute = $filterCustomAttribute
-+            ?? ObjectManager::getInstance()->get(FilterProductCustomAttribute::class);
-     }
- 
-     /**
-@@ -482,6 +487,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
- 
-     /**
-      * Get resource instance
-+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
-      *
-      * @throws \Magento\Framework\Exception\LocalizedException
-      * @return \Magento\Catalog\Model\ResourceModel\Product
-@@ -493,11 +499,29 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Get a list of custom attribute codes that belongs to product attribute set.
-+     *
-+     * If attribute set not specified for product will return all product attribute codes
-+     *
-+     * @return string[]
-      */
-     protected function getCustomAttributesCodes()
-     {
--        return $this->getCustomAttributeCodes->execute($this->metadataService);
-+        if ($this->customAttributesCodes === null) {
-+            $this->customAttributesCodes = array_diff(
-+                array_keys(
-+                    $this->filterCustomAttribute->execute(
-+                        $this->eavConfig->getEntityAttributes(
-+                            self::ENTITY,
-+                            $this
-+                        )
-+                    )
-+                ),
-+                ProductInterface::ATTRIBUTES
-+            );
-+        }
-+
-+        return $this->customAttributesCodes;
-     }
- 
-     /**
-@@ -508,9 +532,9 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     public function getStoreId()
-     {
-         if ($this->hasData(self::STORE_ID)) {
--            return $this->getData(self::STORE_ID);
-+            return (int)$this->getData(self::STORE_ID);
-         }
--        return $this->_storeManager->getStore()->getId();
-+        return (int)$this->_storeManager->getStore()->getId();
-     }
- 
-     /**
-@@ -566,8 +590,9 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
--     * @codeCoverageIgnoreStart
-      * Get visibility status
-+     *
-+     * @codeCoverageIgnoreStart
-      * @see \Magento\Catalog\Model\Product\Visibility
-      *
-      * @return int
-@@ -644,6 +669,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
- 
-     /**
-      * Retrieve type instance of the product.
-+     *
-      * Type instance implements product type depended logic and is a singleton shared by all products of the same type.
-      *
-      * @return \Magento\Catalog\Model\Product\Type\AbstractType
-@@ -697,7 +723,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     public function getCategoryId()
-     {
-         $category = $this->_registry->registry('current_category');
--        if ($category) {
-+        if ($category && in_array($category->getId(), $this->getCategoryIds())) {
-             return $category->getId();
-         }
-         return false;
-@@ -792,6 +818,9 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-         if (!$this->hasStoreIds()) {
-             $storeIds = [];
-             if ($websiteIds = $this->getWebsiteIds()) {
-+                if ($this->_storeManager->isSingleStoreMode()) {
-+                    $websiteIds = array_keys($websiteIds);
-+                }
-                 foreach ($websiteIds as $websiteId) {
-                     $websiteStores = $this->_storeManager->getWebsite($websiteId)->getStoreIds();
-                     $storeIds = array_merge($storeIds, $websiteStores);
-@@ -804,9 +833,10 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
- 
-     /**
-      * Retrieve product attributes
--     * if $groupId is null - retrieve all product attributes
-      *
--     * @param int  $groupId   Retrieve attributes of the specified group
-+     * If $groupId is null - retrieve all product attributes
-+     *
-+     * @param int $groupId Retrieve attributes of the specified group
-      * @param bool $skipSuper Not used
-      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute[]
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-@@ -898,10 +928,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
- 
-     /**
-      * Check/set if options can be affected when saving product
-+     *
-      * If value specified, it will be set.
-      *
--     * @param   bool $value
--     * @return  bool
-+     * @param bool $value
-+     * @return bool
-      */
-     public function canAffectOptions($value = null)
-     {
-@@ -958,7 +989,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-      */
-     public function getQty()
-     {
--        return $this->getData('qty');
-+        return (float)$this->getData('qty');
-     }
- 
-     /**
-@@ -1018,9 +1049,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
- 
-     /**
-      * Clear cache related with product and protect delete from not admin
-+     *
-      * Register indexing event before delete product
-      *
-      * @return \Magento\Catalog\Model\Product
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function beforeDelete()
-     {
-@@ -1134,8 +1167,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     /**
-      * Get formatted by currency product price
-      *
--     * @return  array|double
--     *
-+     * @return array|double*
-      * @deprecated
-      * @see getFormattedPrice()
-      */
-@@ -1527,12 +1559,13 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     /**
-      * Add image to media gallery
-      *
--     * @param string        $file              file path of image in file system
--     * @param string|array  $mediaAttribute    code of attribute with type 'media_image',
--     *                                          leave blank if image should be only in gallery
--     * @param boolean       $move              if true, it will move source file
--     * @param boolean       $exclude           mark image as disabled in product page view
-+     * @param string $file file path of image in file system
-+     * @param string|array $mediaAttribute code of attribute with type 'media_image',
-+     * leave blank if image should be only in gallery
-+     * @param bool $move if true, it will move source file
-+     * @param bool $exclude mark image as disabled in product page view
-      * @return \Magento\Catalog\Model\Product
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function addImageToMediaGallery($file, $mediaAttribute = null, $move = false, $exclude = true)
-     {
-@@ -1693,7 +1726,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
- 
-     /**
-      * Check is a virtual product
--     * Data helper wrapper
-      *
-      * @return bool
-      */
-@@ -1783,11 +1815,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
--     * Save current attribute with code $code and assign new value
-+     * Save current attribute with code $code and assign new value.
-      *
--     * @param string $code  Attribute code
--     * @param mixed  $value New attribute value
--     * @param int    $store Store ID
-+     * @param string $code Attribute code
-+     * @param mixed $value New attribute value
-+     * @param int $store Store ID
-      * @return void
-      */
-     public function addAttributeUpdate($code, $value, $store)
-@@ -1857,6 +1889,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
- 
-     /**
-      * Custom function for other modules
-+     *
-      * @return string
-      */
-     public function getGiftMessageAvailable()
-@@ -1975,6 +2008,8 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Set product options
-+     *
-      * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterface[] $options
-      * @return $this
-      */
-@@ -1998,10 +2033,10 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     /**
-      * Add custom option information to product
-      *
--     * @param   string $code    Option code
--     * @param   mixed  $value   Value of the option
--     * @param   int|Product    $product Product ID
--     * @return  $this
-+     * @param string $code Option code
-+     * @param mixed $value Value of the option
-+     * @param int|Product|null $product Product ID
-+     * @return $this
-      */
-     public function addCustomOption($code, $value, $product = null)
-     {
-@@ -2195,6 +2230,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
- 
-     /**
-      * Prepare product custom options.
-+     *
-      * To be sure that all product custom options does not has ID and has product instance
-      *
-      * @return \Magento\Catalog\Model\Product
-@@ -2529,9 +2565,9 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
--     * @return \Magento\Catalog\Api\Data\ProductExtensionInterface
-+     * @return \Magento\Framework\Api\ExtensionAttributesInterface
-      */
-     public function getExtensionAttributes()
-     {
-@@ -2539,7 +2575,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @param \Magento\Catalog\Api\Data\ProductExtensionInterface $extensionAttributes
-      * @return $this
-@@ -2552,8 +2588,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     //@codeCoverageIgnoreEnd
- 
-     /**
-+     * Convert Image to ProductAttributeMediaGalleryEntryInterface
-+     *
-      * @param array $mediaGallery
-      * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[]
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function convertToMediaGalleryInterface(array $mediaGallery)
-     {
-@@ -2569,7 +2608,10 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Get media gallery entries
-+     *
-      * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[]|null
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getMediaGalleryEntries()
-     {
-@@ -2583,8 +2625,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Set media gallery entries
-+     *
-      * @param ProductAttributeMediaGalleryEntryInterface[] $mediaGalleryEntries
-      * @return $this
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function setMediaGalleryEntries(array $mediaGalleryEntries = null)
-     {
-@@ -2625,6 +2670,8 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Get link repository
-+     *
-      * @return ProductLinkRepositoryInterface
-      */
-     private function getLinkRepository()
-@@ -2637,6 +2684,8 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
-     }
- 
-     /**
-+     * Get media gallery processor
-+     *
-      * @return Product\Gallery\Processor
-      */
-     private function getMediaGalleryProcessor()
-diff --git a/app/code/Magento/Catalog/Model/Product/Action.php b/app/code/Magento/Catalog/Model/Product/Action.php
-index f78048424b4..3863cf24572 100644
---- a/app/code/Magento/Catalog/Model/Product/Action.php
-+++ b/app/code/Magento/Catalog/Model/Product/Action.php
-@@ -168,5 +168,7 @@ class Action extends \Magento\Framework\Model\AbstractModel
-         if (!$categoryIndexer->isScheduled()) {
-             $categoryIndexer->reindexList(array_unique($productIds));
-         }
-+
-+        $this->_eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
-     }
- }
-diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
-index c2108b0273b..be1e523960f 100644
---- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
-+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Model\Product\Attribute\Backend;
- 
- use Magento\Catalog\Model\Product\Attribute\Source\Boolean as BooleanSource;
-@@ -25,7 +27,9 @@ class Boolean extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBacken
-         $attributeCode = $this->getAttribute()->getName();
-         if ($object->getData('use_config_' . $attributeCode)) {
-             $object->setData($attributeCode, BooleanSource::VALUE_USE_CONFIG);
-+            return $this;
-         }
--        return $this;
-+
-+        return parent::beforeSave($object);
-     }
- }
-diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
-index 3779cab431c..e26717e4727 100644
---- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
-+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
-@@ -247,6 +247,8 @@ abstract class AbstractGroupPrice extends Price
-     }
- 
-     /**
-+     * Validate price.
-+     *
-      * @param array $priceRow
-      * @return void
-      * @throws \Magento\Framework\Exception\LocalizedException
-@@ -312,6 +314,8 @@ abstract class AbstractGroupPrice extends Price
-     }
- 
-     /**
-+     * Get website id.
-+     *
-      * @param int $storeId
-      * @return int|null
-      */
-@@ -327,6 +331,8 @@ abstract class AbstractGroupPrice extends Price
-     }
- 
-     /**
-+     * Set price data.
-+     *
-      * @param \Magento\Catalog\Model\Product $object
-      * @param array $priceData
-      */
-@@ -373,122 +379,16 @@ abstract class AbstractGroupPrice extends Price
-      *
-      * @param \Magento\Catalog\Model\Product $object
-      * @return $this
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.NPathComplexity)
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function afterSave($object)
-     {
--        $websiteId = $this->_storeManager->getStore($object->getStoreId())->getWebsiteId();
--        $isGlobal = $this->getAttribute()->isScopeGlobal() || $websiteId == 0;
--
--        $priceRows = $object->getData($this->getAttribute()->getName());
--        if (null === $priceRows) {
--            return $this;
--        }
--
--        $priceRows = array_filter((array)$priceRows);
--
--        $old = [];
--        $new = [];
--
--        // prepare original data for compare
--        $origPrices = $object->getOrigData($this->getAttribute()->getName());
--        if (!is_array($origPrices)) {
--            $origPrices = [];
--        }
--        foreach ($origPrices as $data) {
--            if ($data['website_id'] > 0 || $data['website_id'] == '0' && $isGlobal) {
--                $key = implode(
--                    '-',
--                    array_merge(
--                        [$data['website_id'], $data['cust_group']],
--                        $this->_getAdditionalUniqueFields($data)
--                    )
--                );
--                $old[$key] = $data;
--            }
--        }
--
--        // prepare data for save
--        foreach ($priceRows as $data) {
--            $hasEmptyData = false;
--            foreach ($this->_getAdditionalUniqueFields($data) as $field) {
--                if (empty($field)) {
--                    $hasEmptyData = true;
--                    break;
--                }
--            }
--
--            if ($hasEmptyData || !isset($data['cust_group']) || !empty($data['delete'])) {
--                continue;
--            }
--            if ($this->getAttribute()->isScopeGlobal() && $data['website_id'] > 0) {
--                continue;
--            }
--            if (!$isGlobal && (int)$data['website_id'] == 0) {
--                continue;
--            }
--
--            $key = implode(
--                '-',
--                array_merge([$data['website_id'], $data['cust_group']], $this->_getAdditionalUniqueFields($data))
--            );
--
--            $useForAllGroups = $data['cust_group'] == $this->_groupManagement->getAllCustomersGroup()->getId();
--            $customerGroupId = !$useForAllGroups ? $data['cust_group'] : 0;
--            $new[$key] = array_merge(
--                $this->getAdditionalFields($data),
--                [
--                    'website_id' => $data['website_id'],
--                    'all_groups' => $useForAllGroups ? 1 : 0,
--                    'customer_group_id' => $customerGroupId,
--                    'value' => isset($data['price']) ? $data['price'] : null,
--                ],
--                $this->_getAdditionalUniqueFields($data)
--            );
--        }
--
--        $delete = array_diff_key($old, $new);
--        $insert = array_diff_key($new, $old);
--        $update = array_intersect_key($new, $old);
--
--        $isChanged = false;
--        $productId = $object->getData($this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField());
--
--        if (!empty($delete)) {
--            foreach ($delete as $data) {
--                $this->_getResource()->deletePriceData($productId, null, $data['price_id']);
--                $isChanged = true;
--            }
--        }
--
--        if (!empty($insert)) {
--            foreach ($insert as $data) {
--                $price = new \Magento\Framework\DataObject($data);
--                $price->setData(
--                    $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField(),
--                    $productId
--                );
--                $this->_getResource()->savePriceData($price);
--
--                $isChanged = true;
--            }
--        }
--
--        if (!empty($update)) {
--            $isChanged |= $this->updateValues($update, $old);
--        }
--
--        if ($isChanged) {
--            $valueChangedKey = $this->getAttribute()->getName() . '_changed';
--            $object->setData($valueChangedKey, 1);
--        }
--
-         return $this;
-     }
- 
-     /**
-+     * Update values.
-+     *
-      * @param array $valuesToUpdate
-      * @param array $oldValues
-      * @return boolean
-@@ -544,6 +444,8 @@ abstract class AbstractGroupPrice extends Price
-     }
- 
-     /**
-+     * Get metadata pool.
-+     *
-      * @return \Magento\Framework\EntityManager\MetadataPool
-      */
-     private function getMetadataPool()
-diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
-index a652d0ef902..98738e055ca 100644
---- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
-+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
-@@ -4,15 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Catalog product SKU backend attribute model
-- *
-- * @author     Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Catalog\Model\Product\Attribute\Backend;
- 
- use Magento\Catalog\Model\Product;
- 
-+/**
-+ * Catalog product SKU backend attribute model.
-+ */
- class Sku extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
- {
-     /**
-@@ -97,6 +95,7 @@ class Sku extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
-     public function beforeSave($object)
-     {
-         $this->_generateUniqueSku($object);
-+        $this->trimValue($object);
-         return parent::beforeSave($object);
-     }
- 
-@@ -127,4 +126,19 @@ class Sku extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
-         $data = $connection->fetchOne($select, $bind);
-         return abs((int)str_replace($value, '', $data));
-     }
-+
-+    /**
-+     * Remove extra spaces from attribute value before save.
-+     *
-+     * @param Product $object
-+     * @return void
-+     */
-+    private function trimValue($object)
-+    {
-+        $attrCode = $this->getAttribute()->getAttributeCode();
-+        $value = $object->getData($attrCode);
-+        if ($value) {
-+            $object->setData($attrCode, trim($value));
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/AbstractHandler.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/AbstractHandler.php
-new file mode 100644
-index 00000000000..fc0f090937d
---- /dev/null
-+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/AbstractHandler.php
-@@ -0,0 +1,101 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Product\Attribute\Backend\TierPrice;
-+
-+use Magento\Framework\EntityManager\Operation\ExtensionInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Customer\Api\GroupManagementInterface;
-+use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice;
-+
-+/**
-+ * Tier price data abstract handler.
-+ */
-+abstract class AbstractHandler implements ExtensionInterface
-+{
-+    /**
-+     * @var \Magento\Customer\Api\GroupManagementInterface
-+     */
-+    protected $groupManagement;
-+
-+    /**
-+     * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
-+     */
-+    public function __construct(
-+        GroupManagementInterface $groupManagement
-+    ) {
-+        $this->groupManagement = $groupManagement;
-+    }
-+
-+    /**
-+     * Get additional tier price fields.
-+     *
-+     * @param array $objectArray
-+     * @return array
-+     */
-+    protected function getAdditionalFields(array $objectArray): array
-+    {
-+        $percentageValue = $this->getPercentage($objectArray);
-+
-+        return [
-+            'value' => $percentageValue ? null : $objectArray['price'],
-+            'percentage_value' => $percentageValue ?: null,
-+        ];
-+    }
-+
-+    /**
-+     * Check whether price has percentage value.
-+     *
-+     * @param array $priceRow
-+     * @return float|null
-+     */
-+    protected function getPercentage(array $priceRow): ?float
-+    {
-+        return isset($priceRow['percentage_value']) && is_numeric($priceRow['percentage_value'])
-+            ? (float)$priceRow['percentage_value']
-+            : null;
-+    }
-+
-+    /**
-+     * Prepare tier price data by provided price row data.
-+     *
-+     * @param array $data
-+     * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    protected function prepareTierPrice(array $data): array
-+    {
-+        $useForAllGroups = (int)$data['cust_group'] === $this->groupManagement->getAllCustomersGroup()->getId();
-+        $customerGroupId = $useForAllGroups ? 0 : $data['cust_group'];
-+        $tierPrice = array_merge(
-+            $this->getAdditionalFields($data),
-+            [
-+                'website_id' => $data['website_id'],
-+                'all_groups' => (int)$useForAllGroups,
-+                'customer_group_id' => $customerGroupId,
-+                'value' => $data['price'] ?? null,
-+                'qty' => $this->parseQty($data['price_qty']),
-+            ]
-+        );
-+
-+        return $tierPrice;
-+    }
-+
-+    /**
-+     * Parse quantity value into float.
-+     *
-+     * @param mixed $value
-+     * @return float|int
-+     */
-+    protected function parseQty($value)
-+    {
-+        return $value * 1;
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/SaveHandler.php
-new file mode 100644
-index 00000000000..9cb2ac01458
---- /dev/null
-+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/SaveHandler.php
-@@ -0,0 +1,112 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Product\Attribute\Backend\TierPrice;
-+
-+use Magento\Framework\EntityManager\Operation\ExtensionInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Customer\Api\GroupManagementInterface;
-+use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice;
-+
-+/**
-+ * Process tier price data for handled new product
-+ */
-+class SaveHandler extends AbstractHandler
-+{
-+    /**
-+     * @var \Magento\Store\Model\StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
-+     */
-+    private $attributeRepository;
-+
-+    /**
-+     * @var \Magento\Framework\EntityManager\MetadataPool
-+     */
-+    private $metadataPoll;
-+
-+    /**
-+     * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice
-+     */
-+    private $tierPriceResource;
-+
-+    /**
-+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-+     * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
-+     * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
-+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
-+     * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice $tierPriceResource
-+     */
-+    public function __construct(
-+        StoreManagerInterface $storeManager,
-+        ProductAttributeRepositoryInterface $attributeRepository,
-+        GroupManagementInterface $groupManagement,
-+        MetadataPool $metadataPool,
-+        Tierprice $tierPriceResource
-+    ) {
-+        parent::__construct($groupManagement);
-+
-+        $this->storeManager = $storeManager;
-+        $this->attributeRepository = $attributeRepository;
-+        $this->metadataPoll = $metadataPool;
-+        $this->tierPriceResource = $tierPriceResource;
-+    }
-+
-+    /**
-+     * Set tier price data for product entity
-+     *
-+     * @param \Magento\Catalog\Api\Data\ProductInterface|object $entity
-+     * @param array $arguments
-+     * @return \Magento\Catalog\Api\Data\ProductInterface|object
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function execute($entity, $arguments = [])
-+    {
-+        $attribute = $this->attributeRepository->get('tier_price');
-+        $priceRows = $entity->getData($attribute->getName());
-+        if (null !== $priceRows) {
-+            if (!is_array($priceRows)) {
-+                throw new \Magento\Framework\Exception\InputException(
-+                    __('Tier prices data should be array, but actually other type is received')
-+                );
-+            }
-+            $websiteId = $this->storeManager->getStore($entity->getStoreId())->getWebsiteId();
-+            $isGlobal = $attribute->isScopeGlobal() || $websiteId === 0;
-+            $identifierField = $this->metadataPoll->getMetadata(ProductInterface::class)->getLinkField();
-+            $priceRows = array_filter($priceRows);
-+            $productId = (int) $entity->getData($identifierField);
-+
-+            // prepare and save data
-+            foreach ($priceRows as $data) {
-+                $isPriceWebsiteGlobal = (int)$data['website_id'] === 0;
-+                if ($isGlobal === $isPriceWebsiteGlobal
-+                    || !empty($data['price_qty'])
-+                    || isset($data['cust_group'])
-+                ) {
-+                    $tierPrice = $this->prepareTierPrice($data);
-+                    $price = new \Magento\Framework\DataObject($tierPrice);
-+                    $price->setData(
-+                        $identifierField,
-+                        $productId
-+                    );
-+                    $this->tierPriceResource->savePriceData($price);
-+                    $valueChangedKey = $attribute->getName() . '_changed';
-+                    $entity->setData($valueChangedKey, 1);
-+                }
-+            }
-+        }
-+
-+        return $entity;
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php
-new file mode 100644
-index 00000000000..f1943bc1088
---- /dev/null
-+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php
-@@ -0,0 +1,270 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Product\Attribute\Backend\TierPrice;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Locale\FormatInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-+use Magento\Customer\Api\GroupManagementInterface;
-+use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice;
-+
-+/**
-+ * Process tier price data for handled existing product.
-+ */
-+class UpdateHandler extends AbstractHandler
-+{
-+    /**
-+     * @var \Magento\Store\Model\StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
-+     */
-+    private $attributeRepository;
-+
-+    /**
-+     * @var \Magento\Framework\EntityManager\MetadataPool
-+     */
-+    private $metadataPoll;
-+
-+    /**
-+     * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice
-+     */
-+    private $tierPriceResource;
-+
-+    /**
-+     * @var FormatInterface
-+     */
-+    private $localeFormat;
-+
-+    /**
-+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-+     * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
-+     * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
-+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
-+     * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice $tierPriceResource
-+     * @param FormatInterface|null $localeFormat
-+     */
-+    public function __construct(
-+        StoreManagerInterface $storeManager,
-+        ProductAttributeRepositoryInterface $attributeRepository,
-+        GroupManagementInterface $groupManagement,
-+        MetadataPool $metadataPool,
-+        Tierprice $tierPriceResource,
-+        FormatInterface $localeFormat = null
-+    ) {
-+        parent::__construct($groupManagement);
-+
-+        $this->storeManager = $storeManager;
-+        $this->attributeRepository = $attributeRepository;
-+        $this->metadataPoll = $metadataPool;
-+        $this->tierPriceResource = $tierPriceResource;
-+        $this->localeFormat = $localeFormat ?: ObjectManager::getInstance()->get(FormatInterface::class);
-+    }
-+
-+    /**
-+     * Perform action on relation/extension attribute.
-+     *
-+     * @param \Magento\Catalog\Api\Data\ProductInterface|object $entity
-+     * @param array $arguments
-+     * @return \Magento\Catalog\Api\Data\ProductInterface|object
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function execute($entity, $arguments = [])
-+    {
-+        $attribute = $this->attributeRepository->get('tier_price');
-+        $priceRows = $entity->getData($attribute->getName());
-+        if (null !== $priceRows) {
-+            if (!is_array($priceRows)) {
-+                throw new \Magento\Framework\Exception\InputException(
-+                    __('Tier prices data should be array, but actually other type is received')
-+                );
-+            }
-+            $websiteId = (int)$this->storeManager->getStore($entity->getStoreId())->getWebsiteId();
-+            $isGlobal = $attribute->isScopeGlobal() || $websiteId === 0;
-+            $identifierField = $this->metadataPoll->getMetadata(ProductInterface::class)->getLinkField();
-+            $productId = (int)$entity->getData($identifierField);
-+
-+            // prepare original data to compare
-+            $origPrices = [];
-+            $originalId = $entity->getOrigData($identifierField);
-+            if (empty($originalId) || $entity->getData($identifierField) == $originalId) {
-+                $origPrices = $entity->getOrigData($attribute->getName());
-+            }
-+
-+            $old = $this->prepareOldTierPriceToCompare($origPrices);
-+            // prepare data for save
-+            $new = $this->prepareNewDataForSave($priceRows, $isGlobal);
-+
-+            $delete = array_diff_key($old, $new);
-+            $insert = array_diff_key($new, $old);
-+            $update = array_intersect_key($new, $old);
-+
-+            $isAttributeChanged = $this->deleteValues($productId, $delete);
-+            $isAttributeChanged |= $this->insertValues($productId, $insert);
-+            $isAttributeChanged |= $this->updateValues($update, $old);
-+
-+            if ($isAttributeChanged) {
-+                $valueChangedKey = $attribute->getName() . '_changed';
-+                $entity->setData($valueChangedKey, 1);
-+            }
-+        }
-+
-+        return $entity;
-+    }
-+
-+    /**
-+     * Update existing tier prices for processed product
-+     *
-+     * @param array $valuesToUpdate
-+     * @param array $oldValues
-+     * @return bool
-+     */
-+    private function updateValues(array $valuesToUpdate, array $oldValues): bool
-+    {
-+        $isChanged = false;
-+        foreach ($valuesToUpdate as $key => $value) {
-+            if ((!empty($value['value'])
-+                    && (float)$oldValues[$key]['price'] !== $this->localeFormat->getNumber($value['value'])
-+                ) || $this->getPercentage($oldValues[$key]) !== $this->getPercentage($value)
-+            ) {
-+                $price = new \Magento\Framework\DataObject(
-+                    [
-+                        'value_id' => $oldValues[$key]['price_id'],
-+                        'value' => $value['value'],
-+                        'percentage_value' => $this->getPercentage($value)
-+                    ]
-+                );
-+                $this->tierPriceResource->savePriceData($price);
-+                $isChanged = true;
-+            }
-+        }
-+
-+        return $isChanged;
-+    }
-+
-+    /**
-+     * Insert new tier prices for processed product
-+     *
-+     * @param int $productId
-+     * @param array $valuesToInsert
-+     * @return bool
-+     */
-+    private function insertValues(int $productId, array $valuesToInsert): bool
-+    {
-+        $isChanged = false;
-+        $identifierField = $this->metadataPoll->getMetadata(ProductInterface::class)->getLinkField();
-+        foreach ($valuesToInsert as $data) {
-+            $price = new \Magento\Framework\DataObject($data);
-+            $price->setData(
-+                $identifierField,
-+                $productId
-+            );
-+            $this->tierPriceResource->savePriceData($price);
-+            $isChanged = true;
-+        }
-+
-+        return $isChanged;
-+    }
-+
-+    /**
-+     * Delete tier price values for processed product
-+     *
-+     * @param int $productId
-+     * @param array $valuesToDelete
-+     * @return bool
-+     */
-+    private function deleteValues(int $productId, array $valuesToDelete): bool
-+    {
-+        $isChanged = false;
-+        foreach ($valuesToDelete as $data) {
-+            $this->tierPriceResource->deletePriceData($productId, null, $data['price_id']);
-+            $isChanged = true;
-+        }
-+
-+        return $isChanged;
-+    }
-+
-+    /**
-+     * Get generated price key based on price data
-+     *
-+     * @param array $priceData
-+     * @return string
-+     */
-+    private function getPriceKey(array $priceData): string
-+    {
-+        $qty = $this->parseQty($priceData['price_qty']);
-+        $key = implode(
-+            '-',
-+            array_merge([$priceData['website_id'], $priceData['cust_group']], [$qty])
-+        );
-+
-+        return $key;
-+    }
-+
-+    /**
-+     * Check by id is website global
-+     *
-+     * @param int $websiteId
-+     * @return bool
-+     */
-+    private function isWebsiteGlobal(int $websiteId): bool
-+    {
-+        return $websiteId === 0;
-+    }
-+
-+    /**
-+     * Prepare old data to compare.
-+     *
-+     * @param array|null $origPrices
-+     * @return array
-+     */
-+    private function prepareOldTierPriceToCompare(?array $origPrices): array
-+    {
-+        $old = [];
-+        if (is_array($origPrices)) {
-+            foreach ($origPrices as $data) {
-+                $key = $this->getPriceKey($data);
-+                $old[$key] = $data;
-+            }
-+        }
-+
-+        return $old;
-+    }
-+
-+    /**
-+     * Prepare new data for save.
-+     *
-+     * @param array $priceRows
-+     * @param bool $isGlobal
-+     * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function prepareNewDataForSave(array $priceRows, bool $isGlobal = true): array
-+    {
-+        $new = [];
-+        $priceRows = array_filter($priceRows);
-+        foreach ($priceRows as $data) {
-+            if (empty($data['delete'])
-+                && (!empty($data['price_qty'])
-+                    || isset($data['cust_group'])
-+                    || $isGlobal === $this->isWebsiteGlobal((int)$data['website_id']))
-+            ) {
-+                $key = $this->getPriceKey($data);
-+                $new[$key] = $this->prepareTierPrice($data);
-+            }
-+        }
-+
-+        return $new;
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
-index 92b9a2e4239..db967052cb7 100644
---- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
-+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
-@@ -13,6 +13,9 @@ namespace Magento\Catalog\Model\Product\Attribute\Backend;
- 
- use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
- 
-+/**
-+ * Backend model for Tierprice attribute
-+ */
- class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice
- {
-     /**
-@@ -159,6 +162,7 @@ class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPr
-      */
-     protected function modifyPriceData($object, $data)
-     {
-+        /** @var \Magento\Catalog\Model\Product $object */
-         $data = parent::modifyPriceData($object, $data);
-         $price = $object->getPrice();
-         foreach ($data as $key => $tierPrice) {
-@@ -172,6 +176,10 @@ class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPr
-     }
- 
-     /**
-+     * Update Price values in DB
-+     *
-+     * Updates price values in DB from array comparing to old values. Returns bool if updated
-+     *
-      * @param array $valuesToUpdate
-      * @param array $oldValues
-      * @return boolean
-diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/DataProvider.php b/app/code/Magento/Catalog/Model/Product/Attribute/DataProvider.php
-index 2bb10d3b31a..893000544a7 100644
---- a/app/code/Magento/Catalog/Model/Product/Attribute/DataProvider.php
-+++ b/app/code/Magento/Catalog/Model/Product/Attribute/DataProvider.php
-@@ -113,27 +113,28 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-      */
-     private function customizeFrontendLabels($meta)
-     {
-+        $labelConfigs = [];
-+
-         foreach ($this->storeRepository->getList() as $store) {
-             $storeId = $store->getId();
- 
-             if (!$storeId) {
-                 continue;
-             }
--
--            $meta['manage-titles']['children'] = [
--                'frontend_label[' . $storeId . ']' => $this->arrayManager->set(
--                    'arguments/data/config',
--                    [],
--                    [
--                        'formElement' => Input::NAME,
--                        'componentType' => Field::NAME,
--                        'label' => $store->getName(),
--                        'dataType' => Text::NAME,
--                        'dataScope' => 'frontend_label[' . $storeId . ']'
--                    ]
--                ),
--            ];
-+            $labelConfigs['frontend_label[' . $storeId . ']'] = $this->arrayManager->set(
-+                'arguments/data/config',
-+                [],
-+                [
-+                    'formElement' => Input::NAME,
-+                    'componentType' => Field::NAME,
-+                    'label' => $store->getName(),
-+                    'dataType' => Text::NAME,
-+                    'dataScope' => 'frontend_label[' . $storeId . ']'
-+                ]
-+            );
-         }
-+        $meta['manage-titles']['children'] = $labelConfigs;
-+
-         return $meta;
-     }
- 
-diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
-index f2039a5002d..8b638feafaa 100644
---- a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
-+++ b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
-@@ -8,6 +8,9 @@ namespace Magento\Catalog\Model\Product\Attribute;
- 
- use Magento\Framework\Exception\InputException;
- 
-+/**
-+ * Option management model for product attribute.
-+ */
- class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionManagementInterface
- {
-     /**
-@@ -25,7 +28,7 @@ class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionMan
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getItems($attributeCode)
-     {
-@@ -36,7 +39,7 @@ class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionMan
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function add($attributeCode, $option)
-     {
-@@ -47,7 +50,7 @@ class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionMan
-                 /** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */
-                     $attributeOption = $attributeOption->getLabel();
-             });
--            if (in_array($option->getLabel(), $currentOptions)) {
-+            if (in_array($option->getLabel(), $currentOptions, true)) {
-                 return false;
-             }
-         }
-@@ -59,7 +62,7 @@ class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionMan
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function delete($attributeCode, $optionId)
-     {
-diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php b/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php
-index 270a2f22967..99edfe5bc72 100644
---- a/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php
-+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php
-@@ -11,6 +11,8 @@ use Magento\Framework\Exception\InputException;
- use Magento\Framework\Exception\NoSuchEntityException;
- 
- /**
-+ * Product attribute repository
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInterface
-@@ -78,7 +80,7 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function get($attributeCode)
-     {
-@@ -89,7 +91,7 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
-     {
-@@ -100,12 +102,17 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-     public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
-     {
-+        $attribute->setEntityTypeId(
-+            $this->eavConfig
-+                ->getEntityType(\Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE)
-+                ->getId()
-+        );
-         if ($attribute->getAttributeId()) {
-             $existingModel = $this->get($attribute->getAttributeCode());
- 
-@@ -119,16 +126,7 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
-             $attribute->setIsUserDefined($existingModel->getIsUserDefined());
-             $attribute->setFrontendInput($existingModel->getFrontendInput());
- 
--            if (is_array($attribute->getFrontendLabels())) {
--                $defaultFrontendLabel = $attribute->getDefaultFrontendLabel();
--                $frontendLabel[0] = !empty($defaultFrontendLabel)
--                    ? $defaultFrontendLabel
--                    : $existingModel->getDefaultFrontendLabel();
--                foreach ($attribute->getFrontendLabels() as $item) {
--                    $frontendLabel[$item->getStoreId()] = $item->getLabel();
--                }
--                $attribute->setDefaultFrontendLabel($frontendLabel);
--            }
-+            $this->updateDefaultFrontendLabel($attribute, $existingModel);
-         } else {
-             $attribute->setAttributeId(null);
- 
-@@ -136,22 +134,10 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
-                 throw InputException::requiredField('frontend_label');
-             }
- 
--            $frontendLabels = [];
--            if ($attribute->getDefaultFrontendLabel()) {
--                $frontendLabels[0] = $attribute->getDefaultFrontendLabel();
--            }
--            if ($attribute->getFrontendLabels() && is_array($attribute->getFrontendLabels())) {
--                foreach ($attribute->getFrontendLabels() as $label) {
--                    $frontendLabels[$label->getStoreId()] = $label->getLabel();
--                }
--                if (!isset($frontendLabels[0]) || !$frontendLabels[0]) {
--                    throw InputException::invalidFieldValue('frontend_label', null);
--                }
-+            $frontendLabel = $this->updateDefaultFrontendLabel($attribute, null);
- 
--                $attribute->setDefaultFrontendLabel($frontendLabels);
--            }
-             $attribute->setAttributeCode(
--                $attribute->getAttributeCode() ?: $this->generateCode($frontendLabels[0])
-+                $attribute->getAttributeCode() ?: $this->generateCode($frontendLabel)
-             );
-             $this->validateCode($attribute->getAttributeCode());
-             $this->validateFrontendInput($attribute->getFrontendInput());
-@@ -165,11 +151,6 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
-             $attribute->setBackendModel(
-                 $this->productHelper->getAttributeBackendModelByInputType($attribute->getFrontendInput())
-             );
--            $attribute->setEntityTypeId(
--                $this->eavConfig
--                    ->getEntityType(\Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE)
--                    ->getId()
--            );
-             $attribute->setIsUserDefined(1);
-         }
-         if (!empty($attribute->getData(AttributeInterface::OPTIONS))) {
-@@ -201,7 +182,7 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function delete(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
-     {
-@@ -210,7 +191,7 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function deleteById($attributeCode)
-     {
-@@ -221,7 +202,7 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function getCustomAttributesMetadata($dataObjectClassName = null)
-@@ -275,4 +256,52 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
-             throw InputException::invalidFieldValue('frontend_input', $frontendInput);
-         }
-     }
-+
-+    /**
-+     * This method sets default frontend value using given default frontend value or frontend value from admin store
-+     * if default frontend value is not presented.
-+     * If both default frontend label and admin store frontend label are not given it throws exception
-+     * for attribute creation process or sets existing attribute value for attribute update action.
-+     *
-+     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
-+     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface|null $existingModel
-+     * @return string|null
-+     * @throws InputException
-+     */
-+    private function updateDefaultFrontendLabel($attribute, $existingModel)
-+    {
-+        $frontendLabel = $attribute->getDefaultFrontendLabel();
-+        if (empty($frontendLabel)) {
-+            $frontendLabel = $this->extractAdminStoreFrontendLabel($attribute);
-+            if (empty($frontendLabel)) {
-+                if ($existingModel) {
-+                    $frontendLabel = $existingModel->getDefaultFrontendLabel();
-+                } else {
-+                    throw InputException::invalidFieldValue('frontend_label', null);
-+                }
-+            }
-+            $attribute->setDefaultFrontendLabel($frontendLabel);
-+        }
-+        return $frontendLabel;
-+    }
-+
-+    /**
-+     * This method extracts frontend label from FrontendLabel object for admin store.
-+     *
-+     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
-+     * @return string|null
-+     */
-+    private function extractAdminStoreFrontendLabel($attribute)
-+    {
-+        $frontendLabel = [];
-+        $frontendLabels = $attribute->getFrontendLabels();
-+        if (isset($frontendLabels[0])
-+            && $frontendLabels[0] instanceof \Magento\Eav\Api\Data\AttributeFrontendLabelInterface
-+        ) {
-+            foreach ($attribute->getFrontendLabels() as $label) {
-+                $frontendLabel[$label->getStoreId()] = $label->getLabel();
-+            }
-+        }
-+        return $frontendLabel[0] ?? null;
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
-index 63b1444d1db..dbc7535dccf 100644
---- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
-+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
-@@ -17,6 +17,12 @@ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
-      */
-     protected $pageLayoutBuilder;
- 
-+    /**
-+     * @inheritdoc
-+     * @deprecated since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
-+     */
-+    protected $_options = null;
-+
-     /**
-      * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
-      */
-@@ -26,14 +32,14 @@ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
-     }
- 
-     /**
--     * @return array
-+     * @inheritdoc
-      */
-     public function getAllOptions()
-     {
--        if (!$this->_options) {
--            $this->_options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
--            array_unshift($this->_options, ['value' => '', 'label' => __('No layout updates')]);
--        }
--        return $this->_options;
-+        $options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
-+        array_unshift($options, ['value' => '', 'label' => __('No layout updates')]);
-+        $this->_options = $options;
-+
-+        return $options;
-     }
- }
-diff --git a/app/code/Magento/Catalog/Model/Product/Compare/Item.php b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
-index 3b7e47a46a0..fd07380bebd 100644
---- a/app/code/Magento/Catalog/Model/Product/Compare/Item.php
-+++ b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
-@@ -158,8 +158,8 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
-     {
-         if ($product instanceof Product) {
-             $this->setProductId($product->getId());
--        } elseif (intval($product)) {
--            $this->setProductId(intval($product));
-+        } elseif ((int) $product) {
-+            $this->setProductId((int) $product);
-         }
- 
-         return $this;
-diff --git a/app/code/Magento/Catalog/Model/Product/Copier.php b/app/code/Magento/Catalog/Model/Product/Copier.php
-index e94104ae473..44ebdf0f1f2 100644
---- a/app/code/Magento/Catalog/Model/Product/Copier.php
-+++ b/app/code/Magento/Catalog/Model/Product/Copier.php
-@@ -1,14 +1,20 @@
- <?php
- /**
-- * Catalog product copier. Creates product duplicate
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Catalog\Model\Product;
- 
- use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\Product;
- 
-+/**
-+ * Catalog product copier.
-+ *
-+ * Creates product duplicate.
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class Copier
- {
-     /**
-@@ -49,7 +55,7 @@ class Copier
-      * @param \Magento\Catalog\Model\Product $product
-      * @return \Magento\Catalog\Model\Product
-      */
--    public function copy(\Magento\Catalog\Model\Product $product)
-+    public function copy(Product $product)
-     {
-         $product->getWebsiteIds();
-         $product->getCategoryIds();
-@@ -70,21 +76,9 @@ class Copier
-         $duplicate->setUpdatedAt(null);
-         $duplicate->setId(null);
-         $duplicate->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
--
-         $this->copyConstructor->build($product, $duplicate);
--        $isDuplicateSaved = false;
--        do {
--            $urlKey = $duplicate->getUrlKey();
--            $urlKey = preg_match('/(.*)-(\d+)$/', $urlKey, $matches)
--                ? $matches[1] . '-' . ($matches[2] + 1)
--                : $urlKey . '-1';
--            $duplicate->setUrlKey($urlKey);
--            try {
--                $duplicate->save();
--                $isDuplicateSaved = true;
--            } catch (\Magento\Framework\Exception\AlreadyExistsException $e) {
--            }
--        } while (!$isDuplicateSaved);
-+        $this->setDefaultUrl($product, $duplicate);
-+        $this->setStoresUrl($product, $duplicate);
-         $this->getOptionRepository()->duplicate($product, $duplicate);
-         $product->getResource()->duplicate(
-             $product->getData($metadata->getLinkField()),
-@@ -94,6 +88,83 @@ class Copier
-     }
- 
-     /**
-+     * Set default URL.
-+     *
-+     * @param Product $product
-+     * @param Product $duplicate
-+     * @return void
-+     */
-+    private function setDefaultUrl(Product $product, Product $duplicate) : void
-+    {
-+        $duplicate->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
-+        $resource = $product->getResource();
-+        $attribute = $resource->getAttribute('url_key');
-+        $productId = $product->getId();
-+        $urlKey = $resource->getAttributeRawValue($productId, 'url_key', \Magento\Store\Model\Store::DEFAULT_STORE_ID);
-+        do {
-+            $urlKey = $this->modifyUrl($urlKey);
-+            $duplicate->setUrlKey($urlKey);
-+        } while (!$attribute->getEntity()->checkAttributeUniqueValue($attribute, $duplicate));
-+        $duplicate->setData('url_path', null);
-+        $duplicate->save();
-+    }
-+
-+    /**
-+     * Set URL for each store.
-+     *
-+     * @param Product $product
-+     * @param Product $duplicate
-+     * @return void
-+     */
-+    private function setStoresUrl(Product $product, Product $duplicate) : void
-+    {
-+        $storeIds = $duplicate->getStoreIds();
-+        $productId = $product->getId();
-+        $productResource = $product->getResource();
-+        $defaultUrlKey = $productResource->getAttributeRawValue(
-+            $productId,
-+            'url_key',
-+            \Magento\Store\Model\Store::DEFAULT_STORE_ID
-+        );
-+        $duplicate->setData('save_rewrites_history', false);
-+        foreach ($storeIds as $storeId) {
-+            $isDuplicateSaved = false;
-+            $duplicate->setStoreId($storeId);
-+            $urlKey = $productResource->getAttributeRawValue($productId, 'url_key', $storeId);
-+            if ($urlKey === $defaultUrlKey) {
-+                continue;
-+            }
-+            do {
-+                $urlKey = $this->modifyUrl($urlKey);
-+                $duplicate->setUrlKey($urlKey);
-+                $duplicate->setData('url_path', null);
-+                try {
-+                    $duplicate->save();
-+                    $isDuplicateSaved = true;
-+                    // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-+                } catch (\Magento\Framework\Exception\AlreadyExistsException $e) {
-+                }
-+            } while (!$isDuplicateSaved);
-+        }
-+        $duplicate->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
-+    }
-+
-+    /**
-+     * Modify URL key.
-+     *
-+     * @param string $urlKey
-+     * @return string
-+     */
-+    private function modifyUrl(string $urlKey) : string
-+    {
-+        return preg_match('/(.*)-(\d+)$/', $urlKey, $matches)
-+                    ? $matches[1] . '-' . ($matches[2] + 1)
-+                    : $urlKey . '-1';
-+    }
-+
-+    /**
-+     * Returns product option repository.
-+     *
-      * @return Option\Repository
-      * @deprecated 101.0.0
-      */
-@@ -107,6 +178,8 @@ class Copier
-     }
- 
-     /**
-+     * Returns metadata pool.
-+     *
-      * @return \Magento\Framework\EntityManager\MetadataPool
-      * @deprecated 101.0.0
-      */
-diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
-index bd28b65bb79..e06e85e90a2 100644
---- a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
-+++ b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
-@@ -102,6 +102,8 @@ class CreateHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Execute create handler
-+     *
-      * @param object $product
-      * @param array $arguments
-      * @return object
-@@ -167,23 +169,19 @@ class CreateHandler implements ExtensionInterface
-             if (empty($attrData) && empty($clearImages) && empty($newImages) && empty($existImages)) {
-                 continue;
-             }
--            if (in_array($attrData, $clearImages)) {
--                $product->setData($mediaAttrCode, 'no_selection');
--            }
--
--            if (in_array($attrData, array_keys($newImages))) {
--                $product->setData($mediaAttrCode, $newImages[$attrData]['new_file']);
--                $product->setData($mediaAttrCode . '_label', $newImages[$attrData]['label']);
--            }
--
--            if (in_array($attrData, array_keys($existImages)) && isset($existImages[$attrData]['label'])) {
--                $product->setData($mediaAttrCode . '_label', $existImages[$attrData]['label']);
--            }
--            if (!empty($product->getData($mediaAttrCode))) {
--                $product->addAttributeUpdate(
-+            $this->processMediaAttribute(
-+                $product,
-+                $mediaAttrCode,
-+                $clearImages,
-+                $newImages
-+            );
-+            if (in_array($mediaAttrCode, ['image', 'small_image', 'thumbnail'])) {
-+                $this->processMediaAttributeLabel(
-+                    $product,
-                     $mediaAttrCode,
--                    $product->getData($mediaAttrCode),
--                    $product->getStoreId()
-+                    $clearImages,
-+                    $newImages,
-+                    $existImages
-                 );
-             }
-         }
-@@ -208,6 +206,8 @@ class CreateHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Returns media gallery attribute instance
-+     *
-      * @return \Magento\Catalog\Api\Data\ProductAttributeInterface
-      * @since 101.0.0
-      */
-@@ -223,17 +223,22 @@ class CreateHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Process delete images
-+     *
-      * @param \Magento\Catalog\Model\Product $product
-      * @param array $images
-      * @return void
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      * @since 101.0.0
-+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
-      */
-     protected function processDeletedImages($product, array &$images)
-     {
-     }
- 
-     /**
-+     * Process images
-+     *
-      * @param \Magento\Catalog\Model\Product $product
-      * @param array $images
-      * @return void
-@@ -296,6 +301,8 @@ class CreateHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Duplicate attribute
-+     *
-      * @param \Magento\Catalog\Model\Product $product
-      * @return $this
-      * @since 101.0.0
-@@ -312,7 +319,7 @@ class CreateHandler implements ExtensionInterface
- 
-         $this->resourceModel->duplicate(
-             $this->getAttribute()->getAttributeId(),
--            isset($mediaGalleryData['duplicate']) ? $mediaGalleryData['duplicate'] : [],
-+            $mediaGalleryData['duplicate'] ?? [],
-             $product->getOriginalLinkId(),
-             $product->getData($this->metadata->getLinkField())
-         );
-@@ -364,6 +371,8 @@ class CreateHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Returns file name according to tmp name
-+     *
-      * @param string $file
-      * @return string
-      * @since 101.0.0
-@@ -392,6 +401,7 @@ class CreateHandler implements ExtensionInterface
-             $destinationFile = $forTmp
-                 ? $this->mediaDirectory->getAbsolutePath($this->mediaConfig->getTmpMediaPath($file))
-                 : $this->mediaDirectory->getAbsolutePath($this->mediaConfig->getMediaPath($file));
-+            // phpcs:disable Magento2.Functions.DiscouragedFunction
-             $destFile = dirname($file) . '/' . FileUploader::getNewFileName($destinationFile);
-         }
- 
-@@ -412,6 +422,7 @@ class CreateHandler implements ExtensionInterface
-             $destinationFile = $this->getUniqueFileName($file);
- 
-             if (!$this->mediaDirectory->isFile($this->mediaConfig->getMediaPath($file))) {
-+                // phpcs:ignore Magento2.Exceptions.DirectThrow
-                 throw new \Exception();
-             }
- 
-@@ -429,6 +440,7 @@ class CreateHandler implements ExtensionInterface
-             }
- 
-             return str_replace('\\', '/', $destinationFile);
-+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
-         } catch (\Exception $e) {
-             $file = $this->mediaConfig->getMediaPath($file);
-             throw new \Magento\Framework\Exception\LocalizedException(
-@@ -449,4 +461,81 @@ class CreateHandler implements ExtensionInterface
-         }
-         return $this->mediaAttributeCodes;
-     }
-+
-+    /**
-+     * Process media attribute
-+     *
-+     * @param \Magento\Catalog\Model\Product $product
-+     * @param string $mediaAttrCode
-+     * @param array $clearImages
-+     * @param array $newImages
-+     */
-+    private function processMediaAttribute(
-+        \Magento\Catalog\Model\Product $product,
-+        $mediaAttrCode,
-+        array $clearImages,
-+        array $newImages
-+    ) {
-+        $attrData = $product->getData($mediaAttrCode);
-+        if (in_array($attrData, $clearImages)) {
-+            $product->setData($mediaAttrCode, 'no_selection');
-+        }
-+
-+        if (in_array($attrData, array_keys($newImages))) {
-+            $product->setData($mediaAttrCode, $newImages[$attrData]['new_file']);
-+        }
-+        if (!empty($product->getData($mediaAttrCode))) {
-+            $product->addAttributeUpdate(
-+                $mediaAttrCode,
-+                $product->getData($mediaAttrCode),
-+                $product->getStoreId()
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Process media attribute label
-+     *
-+     * @param \Magento\Catalog\Model\Product $product
-+     * @param string $mediaAttrCode
-+     * @param array $clearImages
-+     * @param array $newImages
-+     * @param array $existImages
-+     */
-+    private function processMediaAttributeLabel(
-+        \Magento\Catalog\Model\Product $product,
-+        $mediaAttrCode,
-+        array $clearImages,
-+        array $newImages,
-+        array $existImages
-+    ) {
-+        $resetLabel = false;
-+        $attrData = $product->getData($mediaAttrCode);
-+        if (in_array($attrData, $clearImages)) {
-+            $product->setData($mediaAttrCode . '_label', null);
-+            $resetLabel = true;
-+        }
-+
-+        if (in_array($attrData, array_keys($newImages))) {
-+            $product->setData($mediaAttrCode . '_label', $newImages[$attrData]['label']);
-+        }
-+
-+        if (in_array($attrData, array_keys($existImages)) && isset($existImages[$attrData]['label'])) {
-+            $product->setData($mediaAttrCode . '_label', $existImages[$attrData]['label']);
-+        }
-+
-+        if ($attrData === 'no_selection' && !empty($product->getData($mediaAttrCode . '_label'))) {
-+            $product->setData($mediaAttrCode . '_label', null);
-+            $resetLabel = true;
-+        }
-+        if (!empty($product->getData($mediaAttrCode . '_label'))
-+            || $resetLabel === true
-+        ) {
-+            $product->addAttributeUpdate(
-+                $mediaAttrCode . '_label',
-+                $product->getData($mediaAttrCode . '_label'),
-+                $product->getStoreId()
-+            );
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
-index 4d274a071d0..c993e51c8bc 100644
---- a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
-+++ b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
-@@ -1,6 +1,5 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-@@ -8,13 +7,16 @@
- namespace Magento\Catalog\Model\Product\Gallery;
- 
- use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
--use Magento\Catalog\Api\Data\ProductInterface as Product;
- use Magento\Framework\Exception\InputException;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Exception\StateException;
- use Magento\Framework\Api\ImageContentValidatorInterface;
- 
- /**
-+ * Class GalleryManagement
-+ *
-+ * Provides implementation of api interface ProductAttributeMediaGalleryManagementInterface
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGalleryManagementInterface
-@@ -44,7 +46,7 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function create($sku, ProductAttributeMediaGalleryEntryInterface $entry)
-     {
-@@ -54,7 +56,7 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
-         if (!$this->contentValidator->isValid($entryContent)) {
-             throw new InputException(__('The image content is invalid. Verify the content and try again.'));
-         }
--        $product = $this->productRepository->get($sku);
-+        $product = $this->productRepository->get($sku, true);
- 
-         $existingMediaGalleryEntries = $product->getMediaGalleryEntries();
-         $existingEntryIds = [];
-@@ -69,8 +71,10 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
-         $product->setMediaGalleryEntries($existingMediaGalleryEntries);
-         try {
-             $product = $this->productRepository->save($product);
-+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
-         } catch (InputException $inputException) {
-             throw $inputException;
-+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
-         } catch (\Exception $e) {
-             throw new StateException(__("The product can't be saved."));
-         }
-@@ -84,11 +88,11 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function update($sku, ProductAttributeMediaGalleryEntryInterface $entry)
-     {
--        $product = $this->productRepository->get($sku);
-+        $product = $this->productRepository->get($sku, true);
-         $existingMediaGalleryEntries = $product->getMediaGalleryEntries();
-         if ($existingMediaGalleryEntries == null) {
-             throw new NoSuchEntityException(
-@@ -103,7 +107,10 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
- 
-             if ($existingEntry->getId() == $entry->getId()) {
-                 $found = true;
--                if ($entry->getFile()) {
-+
-+                $file = $entry->getContent();
-+
-+                if ($file && $file->getBase64EncodedData() || $entry->getFile()) {
-                     $entry->setId(null);
-                 }
-                 $existingMediaGalleryEntries[$key] = $entry;
-@@ -125,11 +132,11 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function remove($sku, $entryId)
-     {
--        $product = $this->productRepository->get($sku);
-+        $product = $this->productRepository->get($sku, true);
-         $existingMediaGalleryEntries = $product->getMediaGalleryEntries();
-         if ($existingMediaGalleryEntries == null) {
-             throw new NoSuchEntityException(
-@@ -155,7 +162,7 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function get($sku, $entryId)
-     {
-@@ -176,7 +183,7 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getList($sku)
-     {
-diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
-index c6c7fbda7e9..e1b788bc394 100644
---- a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
-+++ b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
-@@ -6,9 +6,10 @@
- 
- namespace Magento\Catalog\Model\Product\Gallery;
- 
-+use Magento\Framework\Api\Data\ImageContentInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\Exception\LocalizedException;
--use Magento\Framework\Filesystem\DriverInterface;
-+use Magento\Framework\App\ObjectManager;
- 
- /**
-  * Catalog product Media Gallery attribute processor.
-@@ -56,28 +57,39 @@ class Processor
-      */
-     protected $resourceModel;
- 
-+    /**
-+     * @var \Magento\Framework\File\Mime
-+     */
-+    private $mime;
-+
-     /**
-      * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
-      * @param \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDb
-      * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
-      * @param \Magento\Framework\Filesystem $filesystem
-      * @param \Magento\Catalog\Model\ResourceModel\Product\Gallery $resourceModel
-+     * @param \Magento\Framework\File\Mime|null $mime
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      */
-     public function __construct(
-         \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository,
-         \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDb,
-         \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
-         \Magento\Framework\Filesystem $filesystem,
--        \Magento\Catalog\Model\ResourceModel\Product\Gallery $resourceModel
-+        \Magento\Catalog\Model\ResourceModel\Product\Gallery $resourceModel,
-+        \Magento\Framework\File\Mime $mime = null
-     ) {
-         $this->attributeRepository = $attributeRepository;
-         $this->fileStorageDb = $fileStorageDb;
-         $this->mediaConfig = $mediaConfig;
-         $this->mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-         $this->resourceModel = $resourceModel;
-+        $this->mime = $mime ?: ObjectManager::getInstance()->get(\Magento\Framework\File\Mime::class);
-     }
- 
-     /**
-+     * Return media_gallery attribute
-+     *
-      * @return \Magento\Catalog\Api\Data\ProductAttributeInterface
-      * @since 101.0.0
-      */
-@@ -145,6 +157,7 @@ class Processor
-             throw new LocalizedException(__("The image doesn't exist."));
-         }
- 
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         $pathinfo = pathinfo($file);
-         $imgExtensions = ['jpg', 'jpeg', 'gif', 'png'];
-         if (!isset($pathinfo['extension']) || !in_array(strtolower($pathinfo['extension']), $imgExtensions)) {
-@@ -183,6 +196,13 @@ class Processor
-         $attrCode = $this->getAttribute()->getAttributeCode();
-         $mediaGalleryData = $product->getData($attrCode);
-         $position = 0;
-+
-+        $absoluteFilePath = $this->mediaDirectory->getAbsolutePath($destinationFile);
-+        $imageMimeType = $this->mime->getMimeType($absoluteFilePath);
-+        $imageContent = $this->mediaDirectory->readFile($absoluteFilePath);
-+        $imageBase64 = base64_encode($imageContent);
-+        $imageName = $pathinfo['filename'];
-+
-         if (!is_array($mediaGalleryData)) {
-             $mediaGalleryData = ['images' => []];
-         }
-@@ -197,9 +217,17 @@ class Processor
-         $mediaGalleryData['images'][] = [
-             'file' => $fileName,
-             'position' => $position,
--            'media_type' => 'image',
-             'label' => '',
-             'disabled' => (int)$exclude,
-+            'media_type' => 'image',
-+            'types' => $mediaAttribute,
-+            'content' => [
-+                'data' => [
-+                    ImageContentInterface::NAME => $imageName,
-+                    ImageContentInterface::BASE64_ENCODED_DATA => $imageBase64,
-+                    ImageContentInterface::TYPE => $imageMimeType,
-+                ]
-+            ]
-         ];
- 
-         $product->setData($attrCode, $mediaGalleryData);
-@@ -358,7 +386,8 @@ class Processor
-     }
- 
-     /**
--     * get media attribute codes
-+     * Get media attribute codes
-+     *
-      * @return array
-      * @since 101.0.0
-      */
-@@ -368,6 +397,8 @@ class Processor
-     }
- 
-     /**
-+     * Trim .tmp ending from filename
-+     *
-      * @param string $file
-      * @return string
-      * @since 101.0.0
-@@ -422,6 +453,7 @@ class Processor
-             $destinationFile = $forTmp
-                 ? $this->mediaDirectory->getAbsolutePath($this->mediaConfig->getTmpMediaPath($file))
-                 : $this->mediaDirectory->getAbsolutePath($this->mediaConfig->getMediaPath($file));
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             $destFile = dirname($file) . '/'
-                 . \Magento\MediaStorage\Model\File\Uploader::getNewFileName($destinationFile);
-         }
-@@ -464,7 +496,7 @@ class Processor
-     /**
-      * Retrieve data for update attribute
-      *
--     * @param  \Magento\Catalog\Model\Product $object
-+     * @param \Magento\Catalog\Model\Product $object
-      * @return array
-      * @since 101.0.0
-      */
-@@ -489,7 +521,6 @@ class Processor
-     /**
-      * Attribute value is not to be saved in a conventional way, separate table is used to store the complex value
-      *
--     * {@inheritdoc}
-      * @since 101.0.0
-      */
-     public function isScalar()
-diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
-index c785d08e64b..a3726207b30 100644
---- a/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
-+++ b/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
-@@ -47,6 +47,8 @@ class ReadHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Execute read handler for catalog product gallery
-+     *
-      * @param Product $entity
-      * @param array $arguments
-      * @return object
-@@ -55,9 +57,6 @@ class ReadHandler implements ExtensionInterface
-      */
-     public function execute($entity, $arguments = [])
-     {
--        $value = [];
--        $value['images'] = [];
--
-         $mediaEntries = $this->resourceModel->loadProductGalleryByAttributeId(
-             $entity,
-             $this->getAttribute()->getAttributeId()
-@@ -72,6 +71,8 @@ class ReadHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Add media data to product
-+     *
-      * @param Product $product
-      * @param array $mediaEntries
-      * @return void
-@@ -79,40 +80,18 @@ class ReadHandler implements ExtensionInterface
-      */
-     public function addMediaDataToProduct(Product $product, array $mediaEntries)
-     {
--        $attrCode = $this->getAttribute()->getAttributeCode();
--        $value = [];
--        $value['images'] = [];
--        $value['values'] = [];
--
--        foreach ($mediaEntries as $mediaEntry) {
--            $mediaEntry = $this->substituteNullsWithDefaultValues($mediaEntry);
--            $value['images'][$mediaEntry['value_id']] = $mediaEntry;
--        }
--        $product->setData($attrCode, $value);
--    }
--
--    /**
--     * @param array $rawData
--     * @return array
--     */
--    private function substituteNullsWithDefaultValues(array $rawData)
--    {
--        $processedData = [];
--        foreach ($rawData as $key => $rawValue) {
--            if (null !== $rawValue) {
--                $processedValue = $rawValue;
--            } elseif (isset($rawData[$key . '_default'])) {
--                $processedValue = $rawData[$key . '_default'];
--            } else {
--                $processedValue = null;
--            }
--            $processedData[$key] = $processedValue;
--        }
--
--        return $processedData;
-+        $product->setData(
-+            $this->getAttribute()->getAttributeCode(),
-+            [
-+                'images' => array_column($mediaEntries, null, 'value_id'),
-+                'values' => []
-+            ]
-+        );
-     }
- 
-     /**
-+     * Get attribute
-+     *
-      * @return \Magento\Catalog\Api\Data\ProductAttributeInterface
-      * @since 101.0.0
-      */
-@@ -126,6 +105,8 @@ class ReadHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Find default value
-+     *
-      * @param string $key
-      * @param string[] &$image
-      * @return string
-diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
-index 8ad8dcb4812..189135776b6 100644
---- a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
-+++ b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
-@@ -16,7 +16,8 @@ use Magento\Framework\EntityManager\Operation\ExtensionInterface;
- class UpdateHandler extends \Magento\Catalog\Model\Product\Gallery\CreateHandler
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @since 101.0.0
-      */
-     protected function processDeletedImages($product, array &$images)
-@@ -31,7 +32,7 @@ class UpdateHandler extends \Magento\Catalog\Model\Product\Gallery\CreateHandler
- 
-         foreach ($images as &$image) {
-             if (!empty($image['removed'])) {
--                if (!empty($image['value_id']) && !isset($picturesInOtherStores[$image['file']])) {
-+                if (!empty($image['value_id'])) {
-                     if (preg_match('/\.\.(\\\|\/)/', $image['file'])) {
-                         continue;
-                     }
-@@ -52,7 +53,8 @@ class UpdateHandler extends \Magento\Catalog\Model\Product\Gallery\CreateHandler
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @since 101.0.0
-      */
-     protected function processNewImage($product, array &$image)
-@@ -79,6 +81,8 @@ class UpdateHandler extends \Magento\Catalog\Model\Product\Gallery\CreateHandler
-     }
- 
-     /**
-+     * Retrieve store ids from product.
-+     *
-      * @param \Magento\Catalog\Model\Product $product
-      * @return array
-      * @since 101.0.0
-@@ -97,6 +101,8 @@ class UpdateHandler extends \Magento\Catalog\Model\Product\Gallery\CreateHandler
-     }
- 
-     /**
-+     * Remove deleted images.
-+     *
-      * @param array $files
-      * @return null
-      * @since 101.0.0
-diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
-index 09ba68ddbe2..a0be36c5a32 100644
---- a/app/code/Magento/Catalog/Model/Product/Image.php
-+++ b/app/code/Magento/Catalog/Model/Product/Image.php
-@@ -15,6 +15,8 @@ use Magento\Framework\Serialize\SerializerInterface;
- use Magento\Catalog\Model\Product\Image\ParamsBuilder;
- 
- /**
-+ * Image operations
-+ *
-  * @method string getFile()
-  * @method string getLabel()
-  * @method string getPosition()
-@@ -24,6 +26,11 @@ use Magento\Catalog\Model\Product\Image\ParamsBuilder;
-  */
- class Image extends \Magento\Framework\Model\AbstractModel
- {
-+    /**
-+     * Config path for the jpeg image quality value
-+     */
-+    const XML_PATH_JPEG_QUALITY = 'system/upload_configuration/jpeg_quality';
-+
-     /**
-      * @var int
-      */
-@@ -38,8 +45,9 @@ class Image extends \Magento\Framework\Model\AbstractModel
-      * Default quality value (for JPEG images only).
-      *
-      * @var int
-+     * @deprecated use config setting with path self::XML_PATH_JPEG_QUALITY
-      */
--    protected $_quality = 80;
-+    protected $_quality = null;
- 
-     /**
-      * @var bool
-@@ -203,13 +211,13 @@ class Image extends \Magento\Framework\Model\AbstractModel
-      * @param \Magento\Framework\Image\Factory $imageFactory
-      * @param \Magento\Framework\View\Asset\Repository $assetRepo
-      * @param \Magento\Framework\View\FileSystem $viewFileSystem
-+     * @param ImageFactory $viewAssetImageFactory
-+     * @param PlaceholderFactory $viewAssetPlaceholderFactory
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-      * @param array $data
--     * @param ImageFactory|null $viewAssetImageFactory
--     * @param PlaceholderFactory|null $viewAssetPlaceholderFactory
--     * @param SerializerInterface|null $serializer
-+     * @param SerializerInterface $serializer
-      * @param ParamsBuilder $paramsBuilder
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-@@ -249,6 +257,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Set image width property
-+     *
-      * @param int $width
-      * @return $this
-      */
-@@ -259,6 +269,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Get image width property
-+     *
-      * @return int
-      */
-     public function getWidth()
-@@ -267,6 +279,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Set image height property
-+     *
-      * @param int $height
-      * @return $this
-      */
-@@ -277,6 +291,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Get image height property
-+     *
-      * @return int
-      */
-     public function getHeight()
-@@ -289,6 +305,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
-      *
-      * @param int $quality
-      * @return $this
-+     * @deprecated use config setting with path self::XML_PATH_JPEG_QUALITY
-      */
-     public function setQuality($quality)
-     {
-@@ -303,10 +320,14 @@ class Image extends \Magento\Framework\Model\AbstractModel
-      */
-     public function getQuality()
-     {
--        return $this->_quality;
-+        return $this->_quality === null
-+            ? $this->_scopeConfig->getValue(self::XML_PATH_JPEG_QUALITY)
-+            : $this->_quality;
-     }
- 
-     /**
-+     * Set _keepAspectRatio property
-+     *
-      * @param bool $keep
-      * @return $this
-      */
-@@ -317,6 +338,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Set _keepFrame property
-+     *
-      * @param bool $keep
-      * @return $this
-      */
-@@ -327,6 +350,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Set _keepTransparency
-+     *
-      * @param bool $keep
-      * @return $this
-      */
-@@ -337,6 +362,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Set _constrainOnly
-+     *
-      * @param bool $flag
-      * @return $this
-      */
-@@ -347,6 +374,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Set background color
-+     *
-      * @param int[] $rgbArray
-      * @return $this
-      */
-@@ -357,6 +386,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Set size
-+     *
-      * @param string $size
-      * @return $this
-      */
-@@ -411,6 +442,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Get base filename
-+     *
-      * @return string
-      */
-     public function getBaseFile()
-@@ -419,6 +452,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Get new file
-+     *
-      * @deprecated 101.1.0
-      * @return bool|string
-      */
-@@ -438,6 +473,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Set image processor
-+     *
-      * @param MagentoImage $processor
-      * @return $this
-      */
-@@ -448,6 +485,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Get image processor
-+     *
-      * @return MagentoImage
-      */
-     public function getImageProcessor()
-@@ -461,11 +500,13 @@ class Image extends \Magento\Framework\Model\AbstractModel
-         $this->_processor->keepTransparency($this->_keepTransparency);
-         $this->_processor->constrainOnly($this->_constrainOnly);
-         $this->_processor->backgroundColor($this->_backgroundColor);
--        $this->_processor->quality($this->_quality);
-+        $this->_processor->quality($this->getQuality());
-         return $this->_processor;
-     }
- 
-     /**
-+     * Resize image
-+     *
-      * @see \Magento\Framework\Image\Adapter\AbstractAdapter
-      * @return $this
-      */
-@@ -479,12 +520,14 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Rotate image
-+     *
-      * @param int $angle
-      * @return $this
-      */
-     public function rotate($angle)
-     {
--        $angle = intval($angle);
-+        $angle = (int) $angle;
-         $this->getImageProcessor()->rotate($angle);
-         return $this;
-     }
-@@ -505,7 +548,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * Add watermark to image
--     * size param in format 100x200
-+     *
-+     * Size param in format 100x200
-      *
-      * @param string $file
-      * @param string $position
-@@ -564,6 +608,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Save file
-+     *
-      * @return $this
-      */
-     public function saveFile()
-@@ -578,6 +624,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Get url
-+     *
-      * @return string
-      */
-     public function getUrl()
-@@ -586,6 +634,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Set destination subdir
-+     *
-      * @param string $dir
-      * @return $this
-      */
-@@ -596,6 +646,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Get destination subdir
-+     *
-      * @return string
-      */
-     public function getDestinationSubdir()
-@@ -604,6 +656,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Check is image cached
-+     *
-      * @return bool
-      */
-     public function isCached()
-@@ -636,7 +690,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * Get relative watermark file path
--     * or false if file not found
-+     *
-+     * Return false if file not found
-      *
-      * @return string | bool
-      */
-@@ -771,7 +826,10 @@ class Image extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Clear cache
-+     *
-      * @return void
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      */
-     public function clearCache()
-     {
-@@ -784,6 +842,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * First check this file on FS
-+     *
-      * If it doesn't exist - try to download it from DB
-      *
-      * @param string $filename
-@@ -802,6 +861,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * Return resized product image information
-+     *
-      * @return array
-      * @throws NotLoadInfoImageException
-      */
-@@ -843,7 +903,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
-                 'transparency' => $this->_keepTransparency,
-                 'background' => $this->_backgroundColor,
-                 'angle' => $this->_angle,
--                'quality' => $this->_quality
-+                'quality' => $this->getQuality()
-             ]
-         );
-     }
-diff --git a/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php b/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php
-index dd8d352fece..4a55714a27e 100644
---- a/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php
-+++ b/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php
-@@ -10,17 +10,13 @@ namespace Magento\Catalog\Model\Product\Image;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\View\ConfigInterface;
- use Magento\Store\Model\ScopeInterface;
-+use Magento\Catalog\Model\Product\Image;
- 
- /**
-  * Builds parameters array used to build Image Asset
-  */
- class ParamsBuilder
- {
--    /**
--     * @var int
--     */
--    private $defaultQuality = 80;
--
-     /**
-      * @var array
-      */
-@@ -69,6 +65,8 @@ class ParamsBuilder
-     }
- 
-     /**
-+     * Build image params
-+     *
-      * @param array $imageArguments
-      * @return array
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-@@ -89,6 +87,8 @@ class ParamsBuilder
-     }
- 
-     /**
-+     * Overwrite default values
-+     *
-      * @param array $imageArguments
-      * @return array
-      */
-@@ -100,11 +100,12 @@ class ParamsBuilder
-         $transparency = $imageArguments['transparency'] ?? $this->defaultKeepTransparency;
-         $background = $imageArguments['background'] ?? $this->defaultBackground;
-         $angle = $imageArguments['angle'] ?? $this->defaultAngle;
-+        $quality = (int) $this->scopeConfig->getValue(Image::XML_PATH_JPEG_QUALITY);
- 
-         return [
-             'background' => (array) $background,
-             'angle' => $angle,
--            'quality' => $this->defaultQuality,
-+            'quality' => $quality,
-             'keep_aspect_ratio' => (bool) $aspectRatio,
-             'keep_frame' => (bool) $frame,
-             'keep_transparency' => (bool) $transparency,
-@@ -113,6 +114,8 @@ class ParamsBuilder
-     }
- 
-     /**
-+     * Get watermark
-+     *
-      * @param string $type
-      * @return array
-      */
-@@ -153,13 +156,12 @@ class ParamsBuilder
- 
-     /**
-      * Get frame from product_image_white_borders
-+     *
-      * @return bool
-      */
-     private function hasDefaultFrame(): bool
-     {
--        return (bool) $this->viewConfig->getViewConfig()->getVarValue(
--            'Magento_Catalog',
--            'product_image_white_borders'
--        );
-+        return (bool) $this->viewConfig->getViewConfig(['area' => \Magento\Framework\App\Area::AREA_FRONTEND])
-+            ->getVarValue('Magento_Catalog', 'product_image_white_borders');
-     }
- }
-diff --git a/app/code/Magento/Catalog/Model/Product/Media/Config.php b/app/code/Magento/Catalog/Model/Product/Media/Config.php
-index 72936d31739..33af93db13b 100644
---- a/app/code/Magento/Catalog/Model/Product/Media/Config.php
-+++ b/app/code/Magento/Catalog/Model/Product/Media/Config.php
-@@ -10,11 +10,9 @@ use Magento\Eav\Model\Entity\Attribute;
- use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-- * Catalog product media config
-+ * Catalog product media config.
-  *
-  * @api
-- *
-- * @author      Magento Core Team <core@magentocommerce.com>
-  * @since 100.0.2
-  */
- class Config implements ConfigInterface
-@@ -31,6 +29,11 @@ class Config implements ConfigInterface
-      */
-     private $attributeHelper;
- 
-+    /**
-+     * @var string[]
-+     */
-+    private $mediaAttributeCodes;
-+
-     /**
-      * @param StoreManagerInterface $storeManager
-      */
-@@ -40,8 +43,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * Filesystem directory path of product images
--     * relatively to media folder
-+     * Get filesystem directory path for product images relative to the media directory.
-      *
-      * @return string
-      */
-@@ -51,8 +53,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * Web-based directory path of product images
--     * relatively to media folder
-+     * Get web-based directory path for product images relative to the media directory.
-      *
-      * @return string
-      */
-@@ -62,7 +63,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * @return string
-+     * @inheritdoc
-      */
-     public function getBaseMediaPath()
-     {
-@@ -70,7 +71,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * @return string
-+     * @inheritdoc
-      */
-     public function getBaseMediaUrl()
-     {
-@@ -79,8 +80,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * Filesystem directory path of temporary product images
--     * relatively to media folder
-+     * Filesystem directory path of temporary product images relative to the media directory.
-      *
-      * @return string
-      */
-@@ -90,6 +90,8 @@ class Config implements ConfigInterface
-     }
- 
-     /**
-+     * Get temporary base media URL.
-+     *
-      * @return string
-      */
-     public function getBaseTmpMediaUrl()
-@@ -100,8 +102,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * @param string $file
--     * @return string
-+     * @inheritdoc
-      */
-     public function getMediaUrl($file)
-     {
-@@ -109,8 +110,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * @param string $file
--     * @return string
-+     * @inheritdoc
-      */
-     public function getMediaPath($file)
-     {
-@@ -118,6 +118,8 @@ class Config implements ConfigInterface
-     }
- 
-     /**
-+     * Get temporary media URL.
-+     *
-      * @param string $file
-      * @return string
-      */
-@@ -127,8 +129,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * Part of URL of temporary product images
--     * relatively to media folder
-+     * Part of URL of temporary product images relative to the media directory.
-      *
-      * @param string $file
-      * @return string
-@@ -139,7 +140,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * Part of URL of product images relatively to media folder
-+     * Part of URL of product images relatively to media folder.
-      *
-      * @param string $file
-      * @return string
-@@ -150,6 +151,8 @@ class Config implements ConfigInterface
-     }
- 
-     /**
-+     * Get path to the temporary media.
-+     *
-      * @param string $file
-      * @return string
-      */
-@@ -159,6 +162,8 @@ class Config implements ConfigInterface
-     }
- 
-     /**
-+     * Process file path.
-+     *
-      * @param string $file
-      * @return string
-      */
-@@ -168,15 +173,23 @@ class Config implements ConfigInterface
-     }
- 
-     /**
-+     * Get codes of media attribute.
-+     *
-      * @return array
-      * @since 100.0.4
-      */
-     public function getMediaAttributeCodes()
-     {
--        return $this->getAttributeHelper()->getAttributeCodesByFrontendType('media_image');
-+        if (!isset($this->mediaAttributeCodes)) {
-+            // the in-memory object-level caching allows to prevent unnecessary calls to the DB
-+            $this->mediaAttributeCodes = $this->getAttributeHelper()->getAttributeCodesByFrontendType('media_image');
-+        }
-+        return $this->mediaAttributeCodes;
-     }
- 
-     /**
-+     * Get attribute helper.
-+     *
-      * @return Attribute
-      */
-     private function getAttributeHelper()
-diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
-index acfc454883e..b4a4ec08d39 100644
---- a/app/code/Magento/Catalog/Model/Product/Option.php
-+++ b/app/code/Magento/Catalog/Model/Product/Option.php
-@@ -323,7 +323,7 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
-             self::OPTION_TYPE_TIME => self::OPTION_GROUP_DATE,
-         ];
- 
--        return isset($optionGroupsToTypes[$type]) ? $optionGroupsToTypes[$type] : '';
-+        return $optionGroupsToTypes[$type] ?? '';
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Model/Product/Option/Repository.php b/app/code/Magento/Catalog/Model/Product/Option/Repository.php
-index 9dc9695daff..bb4e247de32 100644
---- a/app/code/Magento/Catalog/Model/Product/Option/Repository.php
-+++ b/app/code/Magento/Catalog/Model/Product/Option/Repository.php
-@@ -14,6 +14,8 @@ use Magento\Framework\EntityManager\HydratorPool;
- use Magento\Framework\App\ObjectManager;
- 
- /**
-+ * Product custom options repository
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryInterface
-@@ -83,7 +85,7 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getList($sku)
-     {
-@@ -92,7 +94,7 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getProductOptions(ProductInterface $product, $requiredOnly = false)
-     {
-@@ -104,7 +106,7 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function get($sku, $optionId)
-     {
-@@ -117,7 +119,7 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function delete(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $entity)
-     {
-@@ -126,7 +128,7 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function duplicate(
-         \Magento\Catalog\Api\Data\ProductInterface $product,
-@@ -142,7 +144,7 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function save(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $option)
-     {
-@@ -184,7 +186,7 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function deleteByIdentifier($sku, $optionId)
-     {
-@@ -209,8 +211,8 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
-     /**
-      * Mark original values for removal if they are absent among new values
-      *
--     * @param $newValues array
--     * @param $originalValues \Magento\Catalog\Model\Product\Option\Value[]
-+     * @param array $newValues
-+     * @param \Magento\Catalog\Model\Product\Option\Value[] $originalValues
-      * @return array
-      */
-     protected function markRemovedValues($newValues, $originalValues)
-@@ -234,6 +236,8 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
-     }
- 
-     /**
-+     * Get hydrator pool
-+     *
-      * @return \Magento\Framework\EntityManager\HydratorPool
-      * @deprecated 101.0.0
-      */
-diff --git a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
-index c4a2d60414a..9cb6cda4d0a 100644
---- a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
-+++ b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Model\Product\Option;
- 
- use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface as OptionRepository;
-@@ -28,6 +30,8 @@ class SaveHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Perform action on relation/extension attribute
-+     *
-      * @param object $entity
-      * @param array $arguments
-      * @return \Magento\Catalog\Api\Data\ProductInterface|object
-@@ -35,6 +39,10 @@ class SaveHandler implements ExtensionInterface
-      */
-     public function execute($entity, $arguments = [])
-     {
-+        if ($entity->getOptionsSaved()) {
-+            return $entity;
-+        }
-+
-         $options = $entity->getOptions();
-         $optionIds = [];
- 
-@@ -52,11 +60,26 @@ class SaveHandler implements ExtensionInterface
-             }
-         }
-         if ($options) {
--            foreach ($options as $option) {
--                $this->optionRepository->save($option);
--            }
-+            $this->processOptionsSaving($options, (bool)$entity->dataHasChangedFor('sku'), (string)$entity->getSku());
-         }
- 
-         return $entity;
-     }
-+
-+    /**
-+     * Save custom options
-+     *
-+     * @param array $options
-+     * @param bool $hasChangedSku
-+     * @param string $newSku
-+     */
-+    private function processOptionsSaving(array $options, bool $hasChangedSku, string $newSku)
-+    {
-+        foreach ($options as $option) {
-+            if ($hasChangedSku && $option->hasData('product_sku')) {
-+                $option->setProductSku($newSku);
-+            }
-+            $this->optionRepository->save($option);
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
-index 7517459da65..2b4739ebeb7 100644
---- a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
-+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
-@@ -12,6 +12,7 @@ use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-  * Catalog product option date type
-  *
-  * @author     Magento Core Team <core@magentocommerce.com>
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class Date extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
- {
-@@ -102,11 +103,11 @@ class Date extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
-             $this->setUserValue(
-                 [
-                     'date' => isset($value['date']) ? $value['date'] : '',
--                    'year' => isset($value['year']) ? intval($value['year']) : 0,
--                    'month' => isset($value['month']) ? intval($value['month']) : 0,
--                    'day' => isset($value['day']) ? intval($value['day']) : 0,
--                    'hour' => isset($value['hour']) ? intval($value['hour']) : 0,
--                    'minute' => isset($value['minute']) ? intval($value['minute']) : 0,
-+                    'year' => isset($value['year']) ? (int) $value['year'] : 0,
-+                    'month' => isset($value['month']) ? (int) $value['month'] : 0,
-+                    'day' => isset($value['day']) ? (int) $value['day'] : 0,
-+                    'hour' => isset($value['hour']) ? (int) $value['hour'] : 0,
-+                    'minute' => isset($value['minute']) ? (int) $value['minute'] : 0,
-                     'day_part' => isset($value['day_part']) ? $value['day_part'] : '',
-                     'date_internal' => isset($value['date_internal']) ? $value['date_internal'] : '',
-                 ]
-@@ -147,7 +148,6 @@ class Date extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
-     public function prepareForCart()
-     {
-         if ($this->getIsValid() && $this->getUserValue() !== null) {
--            $option = $this->getOption();
-             $value = $this->getUserValue();
- 
-             if (isset($value['date_internal']) && $value['date_internal'] != '') {
-diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
-index 2390a049fbe..c388be8b6f3 100644
---- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
-+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
-@@ -279,7 +279,7 @@ class DefaultType extends \Magento\Framework\DataObject
-      */
-     public function getCustomizedView($optionInfo)
-     {
--        return isset($optionInfo['value']) ? $optionInfo['value'] : $optionInfo;
-+        return $optionInfo['value'] ?? $optionInfo;
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ExistingValidate.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ExistingValidate.php
-new file mode 100644
-index 00000000000..c9afdf023b3
---- /dev/null
-+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ExistingValidate.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Product\Option\Type\File;
-+
-+/**
-+ * Validator for existing (already saved) files.
-+ */
-+class ExistingValidate extends \Zend_Validate
-+{
-+    /**
-+     * @inheritDoc
-+     *
-+     * @param string $value File's full path.
-+     * @param string|null $originalName Original file's name (when uploaded).
-+     */
-+    public function isValid($value, string $originalName = null)
-+    {
-+        $this->_messages = [];
-+        $this->_errors = [];
-+
-+        if (!is_string($value)) {
-+            $this->_messages[] = __('Full file path is expected.')->render();
-+            return false;
-+        }
-+
-+        $result = true;
-+        $fileInfo = null;
-+        if ($originalName) {
-+            $fileInfo = ['name' => $originalName];
-+        }
-+        foreach ($this->_validators as $element) {
-+            $validator = $element['instance'];
-+            if ($validator->isValid($value, $fileInfo)) {
-+                continue;
-+            }
-+            $result = false;
-+            $messages = $validator->getMessages();
-+            $this->_messages = array_merge($this->_messages, $messages);
-+            $this->_errors = array_merge($this->_errors, array_keys($messages));
-+            if ($element['breakChainOnFailure']) {
-+                break;
-+            }
-+        }
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidateFactory.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidateFactory.php
-index 32c901afe8e..a7add0ad87b 100644
---- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidateFactory.php
-+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidateFactory.php
-@@ -6,13 +6,18 @@
- 
- namespace Magento\Catalog\Model\Product\Option\Type\File;
- 
-+/**
-+ * Class ValidateFactory. Creates Validator with type "ExistingValidate"
-+ */
- class ValidateFactory
- {
-     /**
-+     * Main factory method
-+     *
-      * @return \Zend_Validate
-      */
-     public function create()
-     {
--        return new \Zend_Validate();
-+        return new ExistingValidate();
-     }
- }
-diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
-index d6a5cb1cbc2..fef4999a117 100644
---- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
-+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
-@@ -10,8 +10,12 @@ use Magento\Catalog\Model\Product;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Catalog\Model\Product\Exception as ProductException;
- use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Math\Random;
-+use Magento\Framework\App\ObjectManager;
- 
- /**
-+ * Validator class. Represents logic for validation file given from product option
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class ValidatorFile extends Validator
-@@ -63,11 +67,19 @@ class ValidatorFile extends Validator
-     protected $isImageValidator;
- 
-     /**
-+     * @var Random
-+     */
-+    private $random;
-+
-+    /**
-+     * Constructor method
-+     *
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Framework\Filesystem $filesystem
-      * @param \Magento\Framework\File\Size $fileSize
-      * @param \Magento\Framework\HTTP\Adapter\FileTransferFactory $httpFactory
-      * @param \Magento\Framework\Validator\File\IsImage $isImageValidator
-+     * @param Random|null $random
-      * @throws \Magento\Framework\Exception\FileSystemException
-      */
-     public function __construct(
-@@ -75,16 +87,21 @@ class ValidatorFile extends Validator
-         \Magento\Framework\Filesystem $filesystem,
-         \Magento\Framework\File\Size $fileSize,
-         \Magento\Framework\HTTP\Adapter\FileTransferFactory $httpFactory,
--        \Magento\Framework\Validator\File\IsImage $isImageValidator
-+        \Magento\Framework\Validator\File\IsImage $isImageValidator,
-+        Random $random = null
-     ) {
-         $this->mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-         $this->filesystem = $filesystem;
-         $this->httpFactory = $httpFactory;
-         $this->isImageValidator = $isImageValidator;
-+        $this->random = $random
-+            ?? ObjectManager::getInstance()->get(Random::class);
-         parent::__construct($scopeConfig, $filesystem, $fileSize);
-     }
- 
-     /**
-+     * Setter method for the product
-+     *
-      * @param Product $product
-      * @return $this
-      */
-@@ -95,6 +112,8 @@ class ValidatorFile extends Validator
-     }
- 
-     /**
-+     * Validation method
-+     *
-      * @param \Magento\Framework\DataObject $processingParams
-      * @param \Magento\Catalog\Model\Product\Option $option
-      * @return array
-@@ -154,8 +173,6 @@ class ValidatorFile extends Validator
-         $userValue = [];
- 
-         if ($upload->isUploaded($file) && $upload->isValid($file)) {
--            $extension = pathinfo(strtolower($fileInfo['name']), PATHINFO_EXTENSION);
--
-             $fileName = \Magento\MediaStorage\Model\File\Uploader::getCorrectFileName($fileInfo['name']);
-             $dispersion = \Magento\MediaStorage\Model\File\Uploader::getDispersionPath($fileName);
- 
-@@ -163,7 +180,8 @@ class ValidatorFile extends Validator
- 
-             $tmpDirectory = $this->filesystem->getDirectoryRead(DirectoryList::SYS_TMP);
-             $fileHash = md5($tmpDirectory->readFile($tmpDirectory->getRelativePath($fileInfo['tmp_name'])));
--            $filePath .= '/' . $fileHash . '.' . $extension;
-+            $fileRandomName = $this->random->getRandomString(32);
-+            $filePath .= '/' .$fileRandomName;
-             $fileFullPath = $this->mediaDirectory->getAbsolutePath($this->quotePath . $filePath);
- 
-             $upload->addFilter(new \Zend_Filter_File_Rename(['target' => $fileFullPath, 'overwrite' => true]));
-@@ -243,6 +261,8 @@ class ValidatorFile extends Validator
-     }
- 
-     /**
-+     * Validate contents length method
-+     *
-      * @return bool
-      * @todo need correctly name
-      */
-diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php
-index 37e4c7b310a..100ad37273c 100644
---- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php
-+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php
-@@ -6,6 +6,9 @@
- 
- namespace Magento\Catalog\Model\Product\Option\Type\File;
- 
-+/**
-+ * Validator for existing files.
-+ */
- class ValidatorInfo extends Validator
- {
-     /**
-@@ -34,6 +37,8 @@ class ValidatorInfo extends Validator
-     protected $fileRelativePath;
- 
-     /**
-+     * Construct method
-+     *
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Framework\Filesystem $filesystem
-      * @param \Magento\Framework\File\Size $fileSize
-@@ -53,6 +58,8 @@ class ValidatorInfo extends Validator
-     }
- 
-     /**
-+     * Setter method for property "useQuotePath"
-+     *
-      * @param mixed $useQuotePath
-      * @return $this
-      */
-@@ -63,6 +70,8 @@ class ValidatorInfo extends Validator
-     }
- 
-     /**
-+     * Validate method for the option value depends on an option
-+     *
-      * @param array $optionValue
-      * @param \Magento\Catalog\Model\Product\Option $option
-      * @return bool
-@@ -90,7 +99,7 @@ class ValidatorInfo extends Validator
-         }
- 
-         $result = false;
--        if ($validatorChain->isValid($this->fileFullPath)) {
-+        if ($validatorChain->isValid($this->fileFullPath, $optionValue['title'])) {
-             $result = $this->rootDirectory->isReadable($this->fileRelativePath)
-                 && isset($optionValue['secret_key'])
-                 && $this->buildSecretKey($this->fileRelativePath) == $optionValue['secret_key'];
-@@ -109,6 +118,8 @@ class ValidatorInfo extends Validator
-     }
- 
-     /**
-+     * Method for creation secret key for the given file
-+     *
-      * @param string $fileRelativePath
-      * @return string
-      */
-@@ -118,6 +129,8 @@ class ValidatorInfo extends Validator
-     }
- 
-     /**
-+     * Calculates path for the file
-+     *
-      * @param array $optionValue
-      * @return void
-      */
-diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
-index 4a257a47810..31e178f0bd9 100644
---- a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
-+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
-@@ -10,6 +10,8 @@ use Magento\Framework\Exception\LocalizedException;
- 
- /**
-  * Catalog product option select type
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class Select extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
- {
-@@ -30,23 +32,35 @@ class Select extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
-      */
-     protected $string;
- 
-+    /**
-+     * @var array
-+     */
-+    private $singleSelectionTypes;
-+
-     /**
-      * @param \Magento\Checkout\Model\Session $checkoutSession
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Framework\Stdlib\StringUtils $string
-      * @param \Magento\Framework\Escaper $escaper
-      * @param array $data
-+     * @param array $singleSelectionTypes
-      */
-     public function __construct(
-         \Magento\Checkout\Model\Session $checkoutSession,
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-         \Magento\Framework\Stdlib\StringUtils $string,
-         \Magento\Framework\Escaper $escaper,
--        array $data = []
-+        array $data = [],
-+        array $singleSelectionTypes = []
-     ) {
-         $this->string = $string;
-         $this->_escaper = $escaper;
-         parent::__construct($checkoutSession, $scopeConfig, $data);
-+
-+        $this->singleSelectionTypes = $singleSelectionTypes ?: [
-+            'drop_down' => \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN,
-+            'radio' => \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO,
-+        ];
-     }
- 
-     /**
-@@ -71,7 +85,7 @@ class Select extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
-         }
-         if (!$this->_isSingleSelection()) {
-             $valuesCollection = $option->getOptionValuesByOptionId($value, $this->getProduct()->getStoreId())->load();
--            $valueCount = is_array($value) ? count($value) : 1;
-+            $valueCount = is_array($value) ? count($value) : 0;
-             if ($valuesCollection->count() != $valueCount) {
-                 $this->setIsValid(false);
-                 throw new LocalizedException(
-@@ -310,10 +324,6 @@ class Select extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
-      */
-     protected function _isSingleSelection()
-     {
--        $single = [
--            \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN,
--            \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO,
--        ];
--        return in_array($this->getOption()->getType(), $single);
-+        return in_array($this->getOption()->getType(), $this->singleSelectionTypes, true);
-     }
- }
-diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
-index ee508e30cc9..08455430cca 100644
---- a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
-+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
-@@ -9,6 +9,9 @@ namespace Magento\Catalog\Model\Product\Option\Validator;
- use Magento\Catalog\Model\Product\Option;
- use Zend_Validate_Exception;
- 
-+/**
-+ * Product option default validator
-+ */
- class DefaultValidator extends \Magento\Framework\Validator\AbstractValidator
- {
-     /**
-@@ -25,13 +28,20 @@ class DefaultValidator extends \Magento\Framework\Validator\AbstractValidator
-      */
-     protected $priceTypes;
- 
-+    /**
-+     * @var \Magento\Framework\Locale\FormatInterface
-+     */
-+    private $localeFormat;
-+
-     /**
-      * @param \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig
-      * @param \Magento\Catalog\Model\Config\Source\Product\Options\Price $priceConfig
-+     * @param \Magento\Framework\Locale\FormatInterface|null $localeFormat
-      */
-     public function __construct(
-         \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig,
--        \Magento\Catalog\Model\Config\Source\Product\Options\Price $priceConfig
-+        \Magento\Catalog\Model\Config\Source\Product\Options\Price $priceConfig,
-+        \Magento\Framework\Locale\FormatInterface $localeFormat = null
-     ) {
-         foreach ($productOptionConfig->getAll() as $option) {
-             foreach ($option['types'] as $type) {
-@@ -42,6 +52,9 @@ class DefaultValidator extends \Magento\Framework\Validator\AbstractValidator
-         foreach ($priceConfig->toOptionArray() as $item) {
-             $this->priceTypes[] = $item['value'];
-         }
-+
-+        $this->localeFormat = $localeFormat ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(\Magento\Framework\Locale\FormatInterface::class);
-     }
- 
-     /**
-@@ -134,11 +147,11 @@ class DefaultValidator extends \Magento\Framework\Validator\AbstractValidator
-      */
-     protected function validateOptionValue(Option $option)
-     {
--        return $this->isInRange($option->getPriceType(), $this->priceTypes);
-+        return $this->isInRange($option->getPriceType(), $this->priceTypes) && $this->isNumber($option->getPrice());
-     }
- 
-     /**
--     * Check whether value is empty
-+     * Check whether the value is empty
-      *
-      * @param mixed $value
-      * @return bool
-@@ -149,7 +162,7 @@ class DefaultValidator extends \Magento\Framework\Validator\AbstractValidator
-     }
- 
-     /**
--     * Check whether value is in range
-+     * Check whether the value is in range
-      *
-      * @param string $value
-      * @param array $range
-@@ -161,13 +174,24 @@ class DefaultValidator extends \Magento\Framework\Validator\AbstractValidator
-     }
- 
-     /**
--     * Check whether value is not negative
-+     * Check whether the value is negative
-      *
-      * @param string $value
-      * @return bool
-      */
-     protected function isNegative($value)
-     {
--        return intval($value) < 0;
-+        return $this->localeFormat->getNumber($value) < 0;
-+    }
-+
-+    /**
-+     * Check whether the value is a number
-+     *
-+     * @param string $value
-+     * @return bool
-+     */
-+    public function isNumber($value)
-+    {
-+        return is_numeric($this->localeFormat->getNumber($value));
-     }
- }
-diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php
-index 1e006542495..2256f031098 100644
---- a/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php
-+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php
-@@ -29,6 +29,6 @@ class Pool
-      */
-     public function get($type)
-     {
--        return isset($this->validators[$type]) ? $this->validators[$type] : $this->validators['default'];
-+        return $this->validators[$type] ?? $this->validators['default'];
-     }
- }
-diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
-index 44756890b6e..209531f5998 100644
---- a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
-+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
-@@ -8,6 +8,9 @@ namespace Magento\Catalog\Model\Product\Option\Validator;
- 
- use Magento\Catalog\Model\Product\Option;
- 
-+/**
-+ * Select validator class
-+ */
- class Select extends DefaultValidator
- {
-     /**
-@@ -83,7 +86,7 @@ class Select extends DefaultValidator
-         if (!$priceType && !$price) {
-             return true;
-         }
--        if (!$this->isInRange($priceType, $this->priceTypes)) {
-+        if (!$this->isInRange($priceType, $this->priceTypes) || !$this->isNumber($price)) {
-             return false;
-         }
- 
-diff --git a/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php b/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
-index 1bddd2d07cd..3ee064670a4 100644
---- a/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
-+++ b/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
-@@ -97,7 +97,7 @@ class TierPriceStorage implements \Magento\Catalog\Api\TierPriceStorageInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function get(array $skus)
-     {
-@@ -107,7 +107,7 @@ class TierPriceStorage implements \Magento\Catalog\Api\TierPriceStorageInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function update(array $prices)
-     {
-@@ -128,7 +128,7 @@ class TierPriceStorage implements \Magento\Catalog\Api\TierPriceStorageInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function replace(array $prices)
-     {
-@@ -144,7 +144,7 @@ class TierPriceStorage implements \Magento\Catalog\Api\TierPriceStorageInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function delete(array $prices)
-     {
-@@ -171,16 +171,17 @@ class TierPriceStorage implements \Magento\Catalog\Api\TierPriceStorageInterface
-         $ids = $this->retrieveAffectedIds($skus);
-         $rawPrices = $this->tierPricePersistence->get($ids);
-         $prices = [];
--
--        $linkField = $this->tierPricePersistence->getEntityLinkField();
--        $skuByIdLookup = $this->buildSkuByIdLookup($skus);
--        foreach ($rawPrices as $rawPrice) {
--            $sku = $skuByIdLookup[$rawPrice[$linkField]];
--            $price = $this->tierPriceFactory->create($rawPrice, $sku);
--            if ($groupBySku) {
--                $prices[$sku][] = $price;
--            } else {
--                $prices[] = $price;
-+        if ($rawPrices) {
-+            $linkField = $this->tierPricePersistence->getEntityLinkField();
-+            $skuByIdLookup = $this->buildSkuByIdLookup($skus);
-+            foreach ($rawPrices as $rawPrice) {
-+                $sku = $skuByIdLookup[$rawPrice[$linkField]];
-+                $price = $this->tierPriceFactory->create($rawPrice, $sku);
-+                if ($groupBySku) {
-+                    $prices[$sku][] = $price;
-+                } else {
-+                    $prices[] = $price;
-+                }
-             }
-         }
- 
-diff --git a/app/code/Magento/Catalog/Model/Product/PriceModifier.php b/app/code/Magento/Catalog/Model/Product/PriceModifier.php
-index 48d53b46145..c4d5bdfedcd 100644
---- a/app/code/Magento/Catalog/Model/Product/PriceModifier.php
-+++ b/app/code/Magento/Catalog/Model/Product/PriceModifier.php
-@@ -9,6 +9,9 @@ namespace Magento\Catalog\Model\Product;
- use Magento\Framework\Exception\CouldNotSaveException;
- use Magento\Framework\Exception\NoSuchEntityException;
- 
-+/**
-+ * Product form price modifier
-+ */
- class PriceModifier
- {
-     /**
-@@ -26,6 +29,8 @@ class PriceModifier
-     }
- 
-     /**
-+     * Remove tier price
-+     *
-      * @param \Magento\Catalog\Model\Product $product
-      * @param int|string $customerGroupId
-      * @param int $qty
-@@ -46,11 +51,11 @@ class PriceModifier
- 
-         foreach ($prices as $key => $tierPrice) {
-             if ($customerGroupId == 'all' && $tierPrice['price_qty'] == $qty
--                && $tierPrice['all_groups'] == 1 && intval($tierPrice['website_id']) === intval($websiteId)
-+                && $tierPrice['all_groups'] == 1 && (int) $tierPrice['website_id'] === (int) $websiteId
-             ) {
-                 unset($prices[$key]);
-             } elseif ($tierPrice['price_qty'] == $qty && $tierPrice['cust_group'] == $customerGroupId
--                && intval($tierPrice['website_id']) === intval($websiteId)
-+                && (int) $tierPrice['website_id'] === (int) $websiteId
-             ) {
-                 unset($prices[$key]);
-             }
-diff --git a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
-index 3ec8e968aa2..24775a791e5 100644
---- a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
-+++ b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
-@@ -16,6 +16,8 @@ use Magento\Customer\Model\Visitor;
- use Magento\Framework\EntityManager\EntityManager;
- 
- /**
-+ * A Product Widget Synchronizer.
-+ *
-  * Service which allows to sync product widget information, such as product id with db. In order to reuse this info
-  * on different devices
-  */
-@@ -85,9 +87,10 @@ class Synchronizer
-     }
- 
-     /**
--     * Find lifetime in configuration. Configuration is hold in Stores Configuration
--     * Also this configuration is generated by:
--     * @see \Magento\Catalog\Model\Widget\RecentlyViewedStorageConfiguration
-+     * Finds lifetime in configuration.
-+     *
-+     * Configuration is hold in Stores Configuration. Also this configuration is generated by
-+     * {@see Magento\Catalog\Model\Widget\RecentlyViewedStorageConfiguration}
-      *
-      * @param string $namespace
-      * @return int
-@@ -108,6 +111,8 @@ class Synchronizer
-     }
- 
-     /**
-+     * Filters actions.
-+     *
-      * In order to avoid suspicious actions, we need to filter them in DESC order, and slice only items that
-      * can be persisted in database.
-      *
-@@ -138,7 +143,9 @@ class Synchronizer
-         $productIds = [];
- 
-         foreach ($actions as $action) {
--            $productIds[] = $action['product_id'];
-+            if (isset($action['product_id'])) {
-+                $productIds[] = $action['product_id'];
-+            }
-         }
- 
-         return $productIds;
-@@ -159,33 +166,37 @@ class Synchronizer
-         $customerId = $this->session->getCustomerId();
-         $visitorId = $this->visitor->getId();
-         $collection = $this->getActionsByType($typeId);
--        $collection->addFieldToFilter('product_id', $this->getProductIdsByActions($productsData));
--
--        /**
--         * Note that collection is also filtered by visitor id and customer id
--         * This collection shouldn't be flushed when visitor has products and then login
--         * It can remove only products for visitor, or only products for customer
--         *
--         * ['product_id' => 'added_at']
--         * @var ProductFrontendActionInterface $item
--         */
--        foreach ($collection as $item) {
--            $this->entityManager->delete($item);
--        }
--
--        foreach ($productsData as $productId => $productData) {
--            /** @var ProductFrontendActionInterface $action */
--            $action = $this->productFrontendActionFactory->create([
--                'data' => [
--                    'visitor_id' => $customerId ? null : $visitorId,
--                    'customer_id' => $this->session->getCustomerId(),
--                    'added_at' => $productData['added_at'],
--                    'product_id' => $productId,
--                    'type_id' => $typeId
--                ]
--            ]);
--
--            $this->entityManager->save($action);
-+        $productIds = $this->getProductIdsByActions($productsData);
-+
-+        if ($productIds) {
-+            $collection->addFieldToFilter('product_id', $productIds);
-+
-+            /**
-+             * Note that collection is also filtered by visitor id and customer id
-+             * This collection shouldn't be flushed when visitor has products and then login
-+             * It can remove only products for visitor, or only products for customer
-+             *
-+             * ['product_id' => 'added_at']
-+             * @var ProductFrontendActionInterface $item
-+             */
-+            foreach ($collection as $item) {
-+                $this->entityManager->delete($item);
-+            }
-+
-+            foreach ($productsData as $productId => $productData) {
-+                /** @var ProductFrontendActionInterface $action */
-+                $action = $this->productFrontendActionFactory->create([
-+                    'data' => [
-+                        'visitor_id' => $customerId ? null : $visitorId,
-+                        'customer_id' => $this->session->getCustomerId(),
-+                        'added_at' => $productData['added_at'],
-+                        'product_id' => $productId,
-+                        'type_id' => $typeId
-+                    ]
-+                ]);
-+
-+                $this->entityManager->save($action);
-+            }
-         }
-     }
- 
-diff --git a/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php b/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
-new file mode 100644
-index 00000000000..9c1a781d594
---- /dev/null
-+++ b/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
-@@ -0,0 +1,179 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Product\ProductList;
-+
-+use Magento\Catalog\Model\Session as CatalogSession;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+/**
-+ * Class ToolbarMemorizer
-+ *
-+ * Responds for saving toolbar settings to catalog session
-+ */
-+class ToolbarMemorizer
-+{
-+    /**
-+     * XML PATH to enable/disable saving toolbar parameters to session
-+     */
-+    const XML_PATH_CATALOG_REMEMBER_PAGINATION = 'catalog/frontend/remember_pagination';
-+
-+    /**
-+     * @var CatalogSession
-+     */
-+    private $catalogSession;
-+
-+    /**
-+     * @var Toolbar
-+     */
-+    private $toolbarModel;
-+
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @var string|bool
-+     */
-+    private $order;
-+
-+    /**
-+     * @var string|bool
-+     */
-+    private $direction;
-+
-+    /**
-+     * @var string|bool
-+     */
-+    private $mode;
-+
-+    /**
-+     * @var string|bool
-+     */
-+    private $limit;
-+
-+    /**
-+     * @var bool
-+     */
-+    private $isMemorizingAllowed;
-+
-+    /**
-+     * @param Toolbar $toolbarModel
-+     * @param CatalogSession $catalogSession
-+     * @param ScopeConfigInterface $scopeConfig
-+     */
-+    public function __construct(
-+        Toolbar $toolbarModel,
-+        CatalogSession $catalogSession,
-+        ScopeConfigInterface $scopeConfig
-+    ) {
-+        $this->toolbarModel = $toolbarModel;
-+        $this->catalogSession = $catalogSession;
-+        $this->scopeConfig = $scopeConfig;
-+    }
-+
-+    /**
-+     * Get sort order
-+     *
-+     * @return string|bool
-+     */
-+    public function getOrder()
-+    {
-+        if ($this->order === null) {
-+            $this->order = $this->toolbarModel->getOrder() ??
-+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::ORDER_PARAM_NAME) : null);
-+        }
-+        return $this->order;
-+    }
-+
-+    /**
-+     * Get sort direction
-+     *
-+     * @return string|bool
-+     */
-+    public function getDirection()
-+    {
-+        if ($this->direction === null) {
-+            $this->direction = $this->toolbarModel->getDirection() ??
-+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::DIRECTION_PARAM_NAME) : null);
-+        }
-+        return $this->direction;
-+    }
-+
-+    /**
-+     * Get sort mode
-+     *
-+     * @return string|bool
-+     */
-+    public function getMode()
-+    {
-+        if ($this->mode === null) {
-+            $this->mode = $this->toolbarModel->getMode() ??
-+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::MODE_PARAM_NAME) : null);
-+        }
-+        return $this->mode;
-+    }
-+
-+    /**
-+     * Get products per page limit
-+     *
-+     * @return string|bool
-+     */
-+    public function getLimit()
-+    {
-+        if ($this->limit === null) {
-+            $this->limit = $this->toolbarModel->getLimit() ??
-+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::LIMIT_PARAM_NAME) : null);
-+        }
-+        return $this->limit;
-+    }
-+
-+    /**
-+     * Method to save all catalog parameters in catalog session
-+     *
-+     * @return void
-+     */
-+    public function memorizeParams()
-+    {
-+        if (!$this->catalogSession->getParamsMemorizeDisabled() && $this->isMemorizingAllowed()) {
-+            $this->memorizeParam(Toolbar::ORDER_PARAM_NAME, $this->getOrder())
-+                ->memorizeParam(Toolbar::DIRECTION_PARAM_NAME, $this->getDirection())
-+                ->memorizeParam(Toolbar::MODE_PARAM_NAME, $this->getMode())
-+                ->memorizeParam(Toolbar::LIMIT_PARAM_NAME, $this->getLimit());
-+        }
-+    }
-+
-+    /**
-+     * Check configuration for enabled/disabled toolbar memorizing
-+     *
-+     * @return bool
-+     */
-+    public function isMemorizingAllowed()
-+    {
-+        if ($this->isMemorizingAllowed === null) {
-+            $this->isMemorizingAllowed = $this->scopeConfig->isSetFlag(self::XML_PATH_CATALOG_REMEMBER_PAGINATION);
-+        }
-+        return $this->isMemorizingAllowed;
-+    }
-+
-+    /**
-+     * Memorize parameter value for session
-+     *
-+     * @param string $param parameter name
-+     * @param mixed $value parameter value
-+     * @return $this
-+     */
-+    private function memorizeParam($param, $value)
-+    {
-+        if ($value && $this->catalogSession->getData($param) != $value) {
-+            $this->catalogSession->setData($param, $value);
-+        }
-+        return $this;
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
-index 822959bfc85..f2da1e77027 100644
---- a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
-+++ b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
-@@ -15,6 +15,8 @@ use Magento\Framework\Exception\InputException;
- use Magento\Framework\Exception\TemporaryStateExceptionInterface;
- 
- /**
-+ * Product tier price management
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManagementInterface
-@@ -82,7 +84,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-@@ -148,7 +150,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function remove($sku, $customerGroupId, $qty)
-     {
-@@ -163,7 +165,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getList($sku, $customerGroupId)
-     {
-@@ -181,7 +183,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
- 
-         $prices = [];
-         foreach ($product->getData('tier_price') as $price) {
--            if ((is_numeric($customerGroupId) && intval($price['cust_group']) === intval($customerGroupId))
-+            if ((is_numeric($customerGroupId) && (int) $price['cust_group'] === (int) $customerGroupId)
-                 || ($customerGroupId === 'all' && $price['all_groups'])
-             ) {
-                 /** @var \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice */
-diff --git a/app/code/Magento/Catalog/Model/Product/Type.php b/app/code/Magento/Catalog/Model/Product/Type.php
-index dc3971397ac..4c973be20de 100644
---- a/app/code/Magento/Catalog/Model/Product/Type.php
-+++ b/app/code/Magento/Catalog/Model/Product/Type.php
-@@ -232,7 +232,7 @@ class Type implements OptionSourceInterface
-     public function getOptionText($optionId)
-     {
-         $options = $this->getOptionArray();
--        return isset($options[$optionId]) ? $options[$optionId] : null;
-+        return $options[$optionId] ?? null;
-     }
- 
-     /**
-@@ -285,7 +285,7 @@ class Type implements OptionSourceInterface
- 
-             $types = $this->getTypes();
-             foreach ($types as $typeId => $typeInfo) {
--                $priority = isset($typeInfo['index_priority']) ? abs(intval($typeInfo['index_priority'])) : 0;
-+                $priority = isset($typeInfo['index_priority']) ? abs((int) $typeInfo['index_priority']) : 0;
-                 if (!empty($typeInfo['composite'])) {
-                     $compositePriority[$typeId] = $priority;
-                 } else {
-@@ -307,7 +307,7 @@ class Type implements OptionSourceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function toOptionArray()
-     {
-diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
-index 1b5cf37f6cb..e6804d9246f 100644
---- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
-+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
-@@ -935,7 +935,7 @@ abstract class AbstractType
-      */
-     public function prepareQuoteItemQty($qty, $product)
-     {
--        return floatval($qty);
-+        return (float)$qty;
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php b/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php
-new file mode 100644
-index 00000000000..dabfdb74f01
---- /dev/null
-+++ b/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php
-@@ -0,0 +1,133 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Product\Type;
-+
-+use Magento\Store\Model\Store;
-+use Magento\Catalog\Model\ResourceModel\Product\Price\SpecialPrice;
-+use Magento\Catalog\Api\Data\SpecialPriceInterface;
-+use Magento\Store\Api\Data\WebsiteInterface;
-+
-+/**
-+ * Product special price model.
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ *
-+ * @deprecated
-+ * @see \Magento\Catalog\Model\Product\Type\Price
-+ */
-+class FrontSpecialPrice extends Price
-+{
-+    /**
-+     * @var SpecialPrice
-+     */
-+    private $specialPrice;
-+
-+    /**
-+     * @param \Magento\CatalogRule\Model\ResourceModel\RuleFactory $ruleFactory
-+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-+     * @param \Magento\Customer\Model\Session $customerSession
-+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-+     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-+     * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
-+     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory
-+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-+     * @param SpecialPrice $specialPrice
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     */
-+    public function __construct(
-+        \Magento\CatalogRule\Model\ResourceModel\RuleFactory $ruleFactory,
-+        \Magento\Store\Model\StoreManagerInterface $storeManager,
-+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
-+        \Magento\Customer\Model\Session $customerSession,
-+        \Magento\Framework\Event\ManagerInterface $eventManager,
-+        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-+        \Magento\Customer\Api\GroupManagementInterface $groupManagement,
-+        \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory,
-+        \Magento\Framework\App\Config\ScopeConfigInterface $config,
-+        SpecialPrice $specialPrice
-+    ) {
-+        $this->specialPrice = $specialPrice;
-+        parent::__construct(
-+            $ruleFactory,
-+            $storeManager,
-+            $localeDate,
-+            $customerSession,
-+            $eventManager,
-+            $priceCurrency,
-+            $groupManagement,
-+            $tierPriceFactory,
-+            $config
-+        );
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * @deprecated
-+     */
-+    protected function _applySpecialPrice($product, $finalPrice)
-+    {
-+        if (!$product->getSpecialPrice()) {
-+            return $finalPrice;
-+        }
-+
-+        $specialPrices = $this->getSpecialPrices($product);
-+        $specialPrice = !(empty($specialPrices)) ? min($specialPrices) : $product->getSpecialPrice();
-+
-+        $specialPrice =  $this->calculateSpecialPrice(
-+            $finalPrice,
-+            $specialPrice,
-+            $product->getSpecialFromDate(),
-+            $product->getSpecialToDate(),
-+            WebsiteInterface::ADMIN_CODE
-+        );
-+        $product->setData('special_price', $specialPrice);
-+
-+        return $specialPrice;
-+    }
-+
-+    /**
-+     * Get special prices.
-+     *
-+     * @param mixed $product
-+     * @return array
-+     */
-+    private function getSpecialPrices($product): array
-+    {
-+        $allSpecialPrices = $this->specialPrice->get([$product->getSku()]);
-+        $specialPrices = [];
-+        foreach ($allSpecialPrices as $price) {
-+            if ($this->isSuitableSpecialPrice($product, $price)) {
-+                $specialPrices[] = $price['value'];
-+            }
-+        }
-+
-+        return $specialPrices;
-+    }
-+
-+    /**
-+     * Price is suitable from default and current store + start and end date are equal.
-+     *
-+     * @param mixed $product
-+     * @param array $price
-+     * @return bool
-+     */
-+    private function isSuitableSpecialPrice($product, array $price): bool
-+    {
-+        $priceStoreId = $price[Store::STORE_ID];
-+        if (($priceStoreId == Store::DEFAULT_STORE_ID || $product->getStoreId() == $priceStoreId)
-+            && $price[SpecialPriceInterface::PRICE_FROM] == $product->getSpecialFromDate()
-+            && $price[SpecialPriceInterface::PRICE_TO] == $product->getSpecialToDate()) {
-+            return true;
-+        }
-+
-+        return false;
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
-index f6caa299d66..b30624b79dd 100644
---- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
-+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
-@@ -11,12 +11,14 @@ use Magento\Framework\Pricing\PriceCurrencyInterface;
- use Magento\Store\Model\Store;
- use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Store\Api\Data\WebsiteInterface;
- 
- /**
-  * Product type price model
-  *
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @since 100.0.2
-  */
- class Price
-@@ -184,6 +186,8 @@ class Price
-     }
- 
-     /**
-+     * Retrieve final price for child product
-+     *
-      * @param Product $product
-      * @param float $productQty
-      * @param Product $childProduct
-@@ -428,6 +432,8 @@ class Price
-     }
- 
-     /**
-+     * Retrieve customer group id from product
-+     *
-      * @param Product $product
-      * @return int
-      */
-@@ -453,7 +459,7 @@ class Price
-             $product->getSpecialPrice(),
-             $product->getSpecialFromDate(),
-             $product->getSpecialToDate(),
--            $product->getStore()
-+            WebsiteInterface::ADMIN_CODE
-         );
-     }
- 
-@@ -601,7 +607,7 @@ class Price
-             $specialPrice,
-             $specialPriceFrom,
-             $specialPriceTo,
--            $sId
-+            WebsiteInterface::ADMIN_CODE
-         );
- 
-         if ($rulePrice === false) {
-diff --git a/app/code/Magento/Catalog/Model/Product/Url.php b/app/code/Magento/Catalog/Model/Product/Url.php
-index c291dc33fed..2760b0f9fdd 100644
---- a/app/code/Magento/Catalog/Model/Product/Url.php
-+++ b/app/code/Magento/Catalog/Model/Product/Url.php
-@@ -7,6 +7,7 @@ namespace Magento\Catalog\Model\Product;
- 
- use Magento\UrlRewrite\Model\UrlFinderInterface;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
- 
- /**
-  * Product Url model
-@@ -45,6 +46,11 @@ class Url extends \Magento\Framework\DataObject
-      */
-     protected $urlFinder;
- 
-+    /**
-+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-     /**
-      * @param \Magento\Framework\UrlFactory $urlFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-@@ -52,6 +58,7 @@ class Url extends \Magento\Framework\DataObject
-      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
-      * @param UrlFinderInterface $urlFinder
-      * @param array $data
-+     * @param ScopeConfigInterface|null $scopeConfig
-      */
-     public function __construct(
-         \Magento\Framework\UrlFactory $urlFactory,
-@@ -59,7 +66,8 @@ class Url extends \Magento\Framework\DataObject
-         \Magento\Framework\Filter\FilterManager $filter,
-         \Magento\Framework\Session\SidResolverInterface $sidResolver,
-         UrlFinderInterface $urlFinder,
--        array $data = []
-+        array $data = [],
-+        ScopeConfigInterface $scopeConfig = null
-     ) {
-         parent::__construct($data);
-         $this->urlFactory = $urlFactory;
-@@ -67,16 +75,8 @@ class Url extends \Magento\Framework\DataObject
-         $this->filter = $filter;
-         $this->sidResolver = $sidResolver;
-         $this->urlFinder = $urlFinder;
--    }
--
--    /**
--     * Retrieve URL Instance
--     *
--     * @return \Magento\Framework\UrlInterface
--     */
--    private function getUrlInstance()
--    {
--        return $this->urlFactory->create();
-+        $this->scopeConfig = $scopeConfig ?:
-+            \Magento\Framework\App\ObjectManager::getInstance()->get(ScopeConfigInterface::class);
-     }
- 
-     /**
-@@ -157,10 +157,16 @@ class Url extends \Magento\Framework\DataObject
-                     UrlRewrite::ENTITY_TYPE => \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator::ENTITY_TYPE,
-                     UrlRewrite::STORE_ID => $storeId,
-                 ];
--                if ($categoryId) {
--                    $filterData[UrlRewrite::METADATA]['category_id'] = $categoryId;
--                }
-+                $useCategories = $this->scopeConfig->getValue(
-+                    \Magento\Catalog\Helper\Product::XML_PATH_PRODUCT_URL_USE_CATEGORY,
-+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+                );
-+
-+                $filterData[UrlRewrite::METADATA]['category_id']
-+                    = $categoryId && $useCategories ? $categoryId : '';
-+
-                 $rewrite = $this->urlFinder->findOneByData($filterData);
-+
-                 if ($rewrite) {
-                     $requestPath = $rewrite->getRequestPath();
-                     $product->setRequestPath($requestPath);
-@@ -194,6 +200,7 @@ class Url extends \Magento\Framework\DataObject
-             $routeParams['_query'] = [];
-         }
- 
--        return $this->getUrlInstance()->setScope($storeId)->getUrl($routePath, $routeParams);
-+        $url = $this->urlFactory->create()->setScope($storeId);
-+        return $url->getUrl($routePath, $routeParams);
-     }
- }
-diff --git a/app/code/Magento/Catalog/Model/Product/Visibility.php b/app/code/Magento/Catalog/Model/Product/Visibility.php
-index c863526898a..c05bda7838d 100644
---- a/app/code/Magento/Catalog/Model/Product/Visibility.php
-+++ b/app/code/Magento/Catalog/Model/Product/Visibility.php
-@@ -55,7 +55,7 @@ class Visibility extends \Magento\Framework\DataObject implements OptionSourceIn
-     /**
-      * Retrieve visible in catalog ids array
-      *
--     * @return string[]
-+     * @return int[]
-      */
-     public function getVisibleInCatalogIds()
-     {
-@@ -65,7 +65,7 @@ class Visibility extends \Magento\Framework\DataObject implements OptionSourceIn
-     /**
-      * Retrieve visible in search ids array
-      *
--     * @return string[]
-+     * @return int[]
-      */
-     public function getVisibleInSearchIds()
-     {
-@@ -75,7 +75,7 @@ class Visibility extends \Magento\Framework\DataObject implements OptionSourceIn
-     /**
-      * Retrieve visible in site ids array
-      *
--     * @return string[]
-+     * @return int[]
-      */
-     public function getVisibleInSiteIds()
-     {
-@@ -86,6 +86,7 @@ class Visibility extends \Magento\Framework\DataObject implements OptionSourceIn
-      * Retrieve option array
-      *
-      * @return array
-+     * phpcs:disable Magento2.Functions.StaticFunction
-      */
-     public static function getOptionArray()
-     {
-@@ -134,6 +135,7 @@ class Visibility extends \Magento\Framework\DataObject implements OptionSourceIn
-         $options = self::getOptionArray();
-         return isset($options[$optionId]) ? $options[$optionId] : null;
-     }
-+    //phpcs:enable Magento2.Functions.StaticFunction
- 
-     /**
-      * Retrieve flat column definition
-@@ -251,7 +253,7 @@ class Visibility extends \Magento\Framework\DataObject implements OptionSourceIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function toOptionArray()
-     {
-diff --git a/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php b/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
-index e81cdedd6d3..8acb4a6593a 100644
---- a/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
-+++ b/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
-@@ -9,6 +9,9 @@ use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Model\ResourceModel\Product\Website\Link as ProductWebsiteLink;
- use Magento\Framework\EntityManager\Operation\ExtensionInterface;
- 
-+/**
-+ * Add websites ids to product extension attributes.
-+ */
- class ReadHandler implements ExtensionInterface
- {
-     /**
-@@ -18,7 +21,7 @@ class ReadHandler implements ExtensionInterface
- 
-     /**
-      * ReadHandler constructor.
--     * @param ProductWebsiteLink $resourceModel
-+     * @param ProductWebsiteLink $productWebsiteLink
-      */
-     public function __construct(
-         ProductWebsiteLink $productWebsiteLink
-@@ -27,6 +30,8 @@ class ReadHandler implements ExtensionInterface
-     }
- 
-     /**
-+     * Add website ids to product extension attributes, if no set.
-+     *
-      * @param ProductInterface $product
-      * @param array $arguments
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-diff --git a/app/code/Magento/Catalog/Model/ProductCategoryList.php b/app/code/Magento/Catalog/Model/ProductCategoryList.php
-index 5bbae772d5c..c3a88a505c5 100644
---- a/app/code/Magento/Catalog/Model/ProductCategoryList.php
-+++ b/app/code/Magento/Catalog/Model/ProductCategoryList.php
-@@ -80,7 +80,10 @@ class ProductCategoryList
-                 Select::SQL_UNION_ALL
-             );
- 
--            $this->categoryIdList[$productId] = $this->productResource->getConnection()->fetchCol($unionSelect);
-+            $this->categoryIdList[$productId] = array_map(
-+                'intval',
-+                $this->productResource->getConnection()->fetchCol($unionSelect)
-+            );
-         }
- 
-         return $this->categoryIdList[$productId];
-diff --git a/app/code/Magento/Catalog/Model/ProductIdLocator.php b/app/code/Magento/Catalog/Model/ProductIdLocator.php
-index 2d9af6829ad..2d382164f26 100644
---- a/app/code/Magento/Catalog/Model/ProductIdLocator.php
-+++ b/app/code/Magento/Catalog/Model/ProductIdLocator.php
-@@ -37,23 +37,43 @@ class ProductIdLocator implements \Magento\Catalog\Model\ProductIdLocatorInterfa
-      */
-     private $idsBySku = [];
- 
-+    /**
-+     * Batch size to iterate collection
-+     *
-+     * @var int
-+     */
-+    private $batchSize;
-+
-     /**
-      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
-      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
--     * @param string $limitIdsBySkuValues
-+     * @param string $idsLimit
-+     * @param int $batchSize defines how many items can be processed by one iteration
-      */
-     public function __construct(
-         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
-         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory,
--        $idsLimit
-+        $idsLimit,
-+        int $batchSize = 5000
-     ) {
-         $this->metadataPool = $metadataPool;
-         $this->collectionFactory = $collectionFactory;
-         $this->idsLimit = (int)$idsLimit;
-+        $this->batchSize = $batchSize;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-+     * Load product items by provided products SKUs.
-+     * Products collection will be iterated by pages with the $this->batchSize as a page size (for a cases when to many
-+     * products SKUs were provided in parameters.
-+     * Loaded products will be chached in the $this->idsBySku variable, but in the end of the method these storage will
-+     * be truncated to $idsLimit quantity.
-+     * As a result array with the products data will be returned with the following scheme:
-+     * $data['product_sku']['link_field_value' => 'product_type']
-+     *
-+     * @throws \Exception
-      */
-     public function retrieveProductIdsBySkus(array $skus)
-     {
-@@ -72,8 +92,16 @@ class ProductIdLocator implements \Magento\Catalog\Model\ProductIdLocatorInterfa
-             $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
-                 ->getLinkField();
- 
--            foreach ($collection as $item) {
--                $this->idsBySku[strtolower(trim($item->getSku()))][$item->getData($linkField)] = $item->getTypeId();
-+            $collection->setPageSize($this->batchSize);
-+            $pages = $collection->getLastPageNumber();
-+            for ($currentPage = 1; $currentPage <= $pages; $currentPage++) {
-+                $collection->setCurPage($currentPage);
-+                foreach ($collection->getItems() as $item) {
-+                    $sku = strtolower(trim($item->getSku()));
-+                    $itemIdentifier = $item->getData($linkField);
-+                    $this->idsBySku[$sku][$itemIdentifier] = $item->getTypeId();
-+                }
-+                $collection->clear();
-             }
-         }
- 
-diff --git a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
-index bc212adae2c..b96aff148e7 100644
---- a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
-+++ b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
-@@ -9,6 +9,9 @@ namespace Magento\Catalog\Model\ProductLink;
- use Magento\Catalog\Model\ProductLink\Converter\ConverterPool;
- use Magento\Framework\Exception\NoSuchEntityException;
- 
-+/**
-+ * Provides a collection of linked product items (crosssells, related, upsells, ...)
-+ */
- class CollectionProvider
- {
-     /**
-@@ -47,22 +50,20 @@ class CollectionProvider
- 
-         $products = $this->providers[$type]->getLinkedProducts($product);
-         $converter = $this->converterPool->getConverter($type);
--        $output = [];
-         $sorterItems = [];
-         foreach ($products as $item) {
--            $output[$item->getId()] = $converter->convert($item);
-+            $itemId = $item->getId();
-+            $sorterItems[$itemId] = $converter->convert($item);
-+            $sorterItems[$itemId]['position'] = $sorterItems[$itemId]['position'] ?? 0;
-         }
- 
--        foreach ($output as $item) {
--            $itemPosition = $item['position'];
--            if (!isset($sorterItems[$itemPosition])) {
--                $sorterItems[$itemPosition] = $item;
--            } else {
--                $newPosition = $itemPosition + 1;
--                $sorterItems[$newPosition] = $item;
--            }
--        }
--        ksort($sorterItems);
-+        usort($sorterItems, function ($itemA, $itemB) {
-+            $posA = (int)$itemA['position'];
-+            $posB = (int)$itemB['position'];
-+
-+            return $posA <=> $posB;
-+        });
-+
-         return $sorterItems;
-     }
- }
-diff --git a/app/code/Magento/Catalog/Model/ProductLink/Repository.php b/app/code/Magento/Catalog/Model/ProductLink/Repository.php
-index 5bac99dbebb..98977de7eff 100644
---- a/app/code/Magento/Catalog/Model/ProductLink/Repository.php
-+++ b/app/code/Magento/Catalog/Model/ProductLink/Repository.php
-@@ -10,6 +10,7 @@ use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
- use Magento\Catalog\Api\Data\ProductLinkExtensionFactory;
- use Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks as LinksInitializer;
- use Magento\Catalog\Model\Product\LinkTypeProvider;
-+use Magento\Framework\Api\SimpleDataObjectConverter;
- use Magento\Framework\Exception\CouldNotSaveException;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\EntityManager\MetadataPool;
-@@ -170,7 +171,7 @@ class Repository implements \Magento\Catalog\Api\ProductLinkRepositoryInterface
-                     foreach ($item['custom_attributes'] as $option) {
-                         $name = $option['attribute_code'];
-                         $value = $option['value'];
--                        $setterName = 'set'.ucfirst($name);
-+                        $setterName = 'set' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($name);
-                         // Check if setter exists
-                         if (method_exists($productLinkExtension, $setterName)) {
-                             call_user_func([$productLinkExtension, $setterName], $value);
-diff --git a/app/code/Magento/Catalog/Model/ProductRender.php b/app/code/Magento/Catalog/Model/ProductRender.php
-index 702c04b910d..5efb0343cd9 100644
---- a/app/code/Magento/Catalog/Model/ProductRender.php
-+++ b/app/code/Magento/Catalog/Model/ProductRender.php
-@@ -206,7 +206,7 @@ class ProductRender extends \Magento\Framework\Model\AbstractExtensibleModel imp
-      * Set an extension attributes object.
-      *
-      * @param \Magento\Catalog\Api\Data\ProductRenderExtensionInterface $extensionAttributes
--     * @return $this
-+     * @return void
-      */
-     public function setExtensionAttributes(
-         \Magento\Catalog\Api\Data\ProductRenderExtensionInterface $extensionAttributes
-diff --git a/app/code/Magento/Catalog/Model/ProductRender/Image.php b/app/code/Magento/Catalog/Model/ProductRender/Image.php
-index 774199a0dbf..5e024938d37 100644
---- a/app/code/Magento/Catalog/Model/ProductRender/Image.php
-+++ b/app/code/Magento/Catalog/Model/ProductRender/Image.php
-@@ -9,14 +9,16 @@ namespace Magento\Catalog\Model\ProductRender;
- use Magento\Catalog\Api\Data\ProductRender\ImageInterface;
- 
- /**
-- * @inheritdoc
-+ * Product image renderer model.
-  */
- class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     ImageInterface
- {
-     /**
-+     * Set url to image.
-+     *
-      * @param string $url
--     * @return @return void
-+     * @return void
-      */
-     public function setUrl($url)
-     {
-@@ -34,6 +36,8 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Retrieve image code.
-+     *
-      * @return string
-      */
-     public function getCode()
-@@ -42,6 +46,8 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Set image code.
-+     *
-      * @param string $code
-      * @return void
-      */
-@@ -51,6 +57,8 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Set image height.
-+     *
-      * @param string $height
-      * @return void
-      */
-@@ -60,6 +68,8 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Retrieve image height.
-+     *
-      * @return float
-      */
-     public function getHeight()
-@@ -68,6 +78,8 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Retrieve image width.
-+     *
-      * @return float
-      */
-     public function getWidth()
-@@ -76,6 +88,8 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Set image width.
-+     *
-      * @param string $width
-      * @return void
-      */
-@@ -85,6 +99,8 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Retrieve image label.
-+     *
-      * @return string
-      */
-     public function getLabel()
-@@ -93,6 +109,8 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Set image label.
-+     *
-      * @param string $label
-      * @return void
-      */
-@@ -102,6 +120,8 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Retrieve image width after image resize.
-+     *
-      * @return float
-      */
-     public function getResizedWidth()
-@@ -110,6 +130,8 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Set image width after image resize.
-+     *
-      * @param string $width
-      * @return void
-      */
-@@ -119,6 +141,8 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Set image height after image resize.
-+     *
-      * @param string $height
-      * @return void
-      */
-@@ -128,6 +152,8 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Retrieve image height after image resize.
-+     *
-      * @return float
-      */
-     public function getResizedHeight()
-@@ -149,7 +175,7 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
-      * Set an extension attributes object.
-      *
-      * @param \Magento\Catalog\Api\Data\ProductRender\ImageExtensionInterface $extensionAttributes
--     * @return $this
-+     * @return void
-      */
-     public function setExtensionAttributes(
-         \Magento\Catalog\Api\Data\ProductRender\ImageExtensionInterface $extensionAttributes
-diff --git a/app/code/Magento/Catalog/Model/ProductRenderList.php b/app/code/Magento/Catalog/Model/ProductRenderList.php
-index a3d906cf10c..d1f60c09863 100644
---- a/app/code/Magento/Catalog/Model/ProductRenderList.php
-+++ b/app/code/Magento/Catalog/Model/ProductRenderList.php
-@@ -17,8 +17,8 @@ use Magento\Framework\Data\CollectionModifierInterface;
- 
- /**
-  * Provide product render information (this information should be enough for rendering product on front)
-- * for one or few products
-  *
-+ * Render information provided for one or few products
-  */
- class ProductRenderList implements ProductRenderListInterface
- {
-@@ -64,7 +64,6 @@ class ProductRenderList implements ProductRenderListInterface
-      * @param ProductRenderSearchResultsFactory $searchResultFactory
-      * @param ProductRenderFactory $productRenderDtoFactory
-      * @param Config $config
--     * @param Product\Visibility $productVisibility
-      * @param CollectionModifier $collectionModifier
-      * @param array $productAttributes
-      */
-diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php
-index ef2c99c5cb4..e961db42d99 100644
---- a/app/code/Magento/Catalog/Model/ProductRepository.php
-+++ b/app/code/Magento/Catalog/Model/ProductRepository.php
-@@ -1,16 +1,18 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- 
- namespace Magento\Catalog\Model;
- 
-+use Magento\Catalog\Api\CategoryLinkManagementInterface;
-+use Magento\Catalog\Api\Data\ProductExtension;
- use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Model\Product\Gallery\MimeTypeExtensionMap;
-+use Magento\Catalog\Model\ProductRepository\MediaGalleryProcessor;
- use Magento\Catalog\Model\ResourceModel\Product\Collection;
--use Magento\Framework\Api\Data\ImageContentInterface;
-+use Magento\Eav\Model\Entity\Attribute\Exception as AttributeException;
- use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
- use Magento\Framework\Api\ImageContentValidatorInterface;
- use Magento\Framework\Api\ImageProcessorInterface;
-@@ -18,14 +20,17 @@ use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
- use Magento\Framework\DB\Adapter\ConnectionException;
- use Magento\Framework\DB\Adapter\DeadlockException;
- use Magento\Framework\DB\Adapter\LockWaitException;
-+use Magento\Framework\EntityManager\Operation\Read\ReadExtensions;
- use Magento\Framework\Exception\CouldNotSaveException;
- use Magento\Framework\Exception\InputException;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Exception\StateException;
-+use Magento\Framework\Exception\TemporaryState\CouldNotSaveException as TemporaryCouldNotSaveException;
- use Magento\Framework\Exception\ValidatorException;
- 
- /**
-+ * Product Repository.
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  */
-@@ -117,11 +122,15 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-     protected $fileSystem;
- 
-     /**
-+     * @deprecated
-+     *
-      * @var ImageContentInterfaceFactory
-      */
-     protected $contentFactory;
- 
-     /**
-+     * @deprecated
-+     *
-      * @var ImageProcessorInterface
-      */
-     protected $imageProcessor;
-@@ -132,10 +141,17 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-     protected $extensionAttributesJoinProcessor;
- 
-     /**
-+     * @deprecated
-+     *
-      * @var \Magento\Catalog\Model\Product\Gallery\Processor
-      */
-     protected $mediaGalleryProcessor;
- 
-+    /**
-+     * @var MediaGalleryProcessor
-+     */
-+    private $mediaProcessor;
-+
-     /**
-      * @var CollectionProcessorInterface
-      */
-@@ -151,6 +167,16 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-      */
-     private $serializer;
- 
-+    /**
-+     * @var ReadExtensions
-+     */
-+    private $readExtensions;
-+
-+    /**
-+     * @var CategoryLinkManagementInterface
-+     */
-+    private $linkManagement;
-+
-     /**
-      * ProductRepository constructor.
-      * @param ProductFactory $productFactory
-@@ -176,6 +202,8 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-      * @param CollectionProcessorInterface $collectionProcessor [optional]
-      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-      * @param int $cacheLimit [optional]
-+     * @param ReadExtensions $readExtensions
-+     * @param CategoryLinkManagementInterface $linkManagement
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-@@ -202,7 +230,9 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-         \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor,
-         CollectionProcessorInterface $collectionProcessor = null,
-         \Magento\Framework\Serialize\Serializer\Json $serializer = null,
--        $cacheLimit = 1000
-+        $cacheLimit = 1000,
-+        ReadExtensions $readExtensions = null,
-+        CategoryLinkManagementInterface $linkManagement = null
-     ) {
-         $this->productFactory = $productFactory;
-         $this->collectionFactory = $collectionFactory;
-@@ -225,10 +255,14 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
-         $this->cacheLimit = (int)$cacheLimit;
-+        $this->readExtensions = $readExtensions ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(ReadExtensions::class);
-+        $this->linkManagement = $linkManagement ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(CategoryLinkManagementInterface::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function get($sku, $editMode = false, $storeId = null, $forceReload = false)
-     {
-@@ -258,7 +292,7 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getById($productId, $editMode = false, $storeId = null, $forceReload = false)
-     {
-@@ -306,10 +340,10 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-      * Add product to internal cache and truncate cache if it has more than cacheLimit elements.
-      *
-      * @param string $cacheKey
--     * @param \Magento\Catalog\Api\Data\ProductInterface $product
-+     * @param ProductInterface $product
-      * @return void
-      */
--    private function cacheProduct($cacheKey, \Magento\Catalog\Api\Data\ProductInterface $product)
-+    private function cacheProduct($cacheKey, ProductInterface $product)
-     {
-         $this->instancesById[$product->getId()][$cacheKey] = $product;
-         $this->saveProductInLocalCache($product, $cacheKey);
-@@ -326,7 +360,7 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-      *
-      * @param array $productData
-      * @param bool $createNew
--     * @return \Magento\Catalog\Api\Data\ProductInterface|Product
-+     * @return ProductInterface|Product
-      * @throws NoSuchEntityException
-      */
-     protected function initializeProductData(array $productData, $createNew)
-@@ -335,8 +369,11 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-         if ($createNew) {
-             $product = $this->productFactory->create();
-             $this->assignProductToWebsites($product);
-+        } elseif (!empty($productData['id'])) {
-+            $this->removeProductFromLocalCacheById($productData['id']);
-+            $product = $this->getById($productData['id']);
-         } else {
--            $this->removeProductFromLocalCache($productData['sku']);
-+            $this->removeProductFromLocalCacheBySku($productData['sku']);
-             $product = $this->get($productData['sku']);
-         }
- 
-@@ -348,6 +385,8 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-     }
- 
-     /**
-+     * Assign product to websites.
-+     *
-      * @param \Magento\Catalog\Model\Product $product
-      * @return void
-      */
-@@ -363,6 +402,11 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-     }
- 
-     /**
-+     * Process new gallery media entry.
-+     *
-+     * @deprecated
-+     * @see MediaGalleryProcessor::processNewMediaGalleryEntry()
-+     *
-      * @param ProductInterface $product
-      * @param array $newEntry
-      * @return $this
-@@ -374,52 +418,20 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-         ProductInterface $product,
-         array  $newEntry
-     ) {
--        /** @var ImageContentInterface $contentDataObject */
--        $contentDataObject = $newEntry['content'];
--
--        /** @var \Magento\Catalog\Model\Product\Media\Config $mediaConfig */
--        $mediaConfig = $product->getMediaConfig();
--        $mediaTmpPath = $mediaConfig->getBaseTmpMediaPath();
-+        $this->getMediaGalleryProcessor()->processNewMediaGalleryEntry($product, $newEntry);
- 
--        $relativeFilePath = $this->imageProcessor->processImageContent($mediaTmpPath, $contentDataObject);
--        $tmpFilePath = $mediaConfig->getTmpMediaShortUrl($relativeFilePath);
--
--        if (!$product->hasGalleryAttribute()) {
--            throw new StateException(
--                __("The product that was requested doesn't exist. Verify the product and try again.")
--            );
--        }
--
--        $imageFileUri = $this->getMediaGalleryProcessor()->addImage(
--            $product,
--            $tmpFilePath,
--            isset($newEntry['types']) ? $newEntry['types'] : [],
--            true,
--            isset($newEntry['disabled']) ? $newEntry['disabled'] : true
--        );
--        // Update additional fields that are still empty after addImage call
--        $this->getMediaGalleryProcessor()->updateImage(
--            $product,
--            $imageFileUri,
--            [
--                'label' => $newEntry['label'],
--                'position' => $newEntry['position'],
--                'disabled' => $newEntry['disabled'],
--                'media_type' => $newEntry['media_type'],
--            ]
--        );
-         return $this;
-     }
- 
-     /**
-      * Process product links, creating new links, updating and deleting existing links
-      *
--     * @param \Magento\Catalog\Api\Data\ProductInterface $product
-+     * @param ProductInterface $product
-      * @param \Magento\Catalog\Api\Data\ProductLinkInterface[] $newLinks
-      * @return $this
-      * @throws NoSuchEntityException
-      */
--    private function processLinks(\Magento\Catalog\Api\Data\ProductInterface $product, $newLinks)
-+    private function processLinks(ProductInterface $product, $newLinks)
-     {
-         if ($newLinks === null) {
-             // If product links were not specified, don't do anything
-@@ -482,82 +494,28 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-      * @return $this
-      * @throws InputException
-      * @throws StateException
-+     * @throws LocalizedException
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-     protected function processMediaGallery(ProductInterface $product, $mediaGalleryEntries)
-     {
--        $existingMediaGallery = $product->getMediaGallery('images');
--        $newEntries = [];
--        $entriesById = [];
--        if (!empty($existingMediaGallery)) {
--            foreach ($mediaGalleryEntries as $entry) {
--                if (isset($entry['value_id'])) {
--                    $entriesById[$entry['value_id']] = $entry;
--                } else {
--                    $newEntries[] = $entry;
--                }
--            }
--            foreach ($existingMediaGallery as $key => &$existingEntry) {
--                if (isset($entriesById[$existingEntry['value_id']])) {
--                    $updatedEntry = $entriesById[$existingEntry['value_id']];
--                    if ($updatedEntry['file'] === null) {
--                        unset($updatedEntry['file']);
--                    }
--                    $existingMediaGallery[$key] = array_merge($existingEntry, $updatedEntry);
--                } else {
--                    //set the removed flag
--                    $existingEntry['removed'] = true;
--                }
--            }
--            $product->setData('media_gallery', ["images" => $existingMediaGallery]);
--        } else {
--            $newEntries = $mediaGalleryEntries;
--        }
--
--        $images = (array)$product->getMediaGallery('images');
--        $images = $this->determineImageRoles($product, $images);
--
--        $this->getMediaGalleryProcessor()->clearMediaAttribute($product, array_keys($product->getMediaAttributes()));
--
--        foreach ($images as $image) {
--            if (!isset($image['removed']) && !empty($image['types'])) {
--                $this->getMediaGalleryProcessor()->setMediaAttribute($product, $image['types'], $image['file']);
--            }
--        }
-+        $this->getMediaGalleryProcessor()->processMediaGallery($product, $mediaGalleryEntries);
- 
--        foreach ($newEntries as $newEntry) {
--            if (!isset($newEntry['content'])) {
--                throw new InputException(__('The image content is invalid. Verify the content and try again.'));
--            }
--            /** @var ImageContentInterface $contentDataObject */
--            $contentDataObject = $this->contentFactory->create()
--                ->setName($newEntry['content']['data'][ImageContentInterface::NAME])
--                ->setBase64EncodedData($newEntry['content']['data'][ImageContentInterface::BASE64_ENCODED_DATA])
--                ->setType($newEntry['content']['data'][ImageContentInterface::TYPE]);
--            $newEntry['content'] = $contentDataObject;
--            $this->processNewMediaGalleryEntry($product, $newEntry);
--
--            $finalGallery = $product->getData('media_gallery');
--            $newEntryId = key(array_diff_key($product->getData('media_gallery')['images'], $entriesById));
--            $newEntry = array_replace_recursive($newEntry, $finalGallery['images'][$newEntryId]);
--            $entriesById[$newEntryId] = $newEntry;
--            $finalGallery['images'][$newEntryId] = $newEntry;
--            $product->setData('media_gallery', $finalGallery);
--        }
-         return $this;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
--    public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveOptions = false)
-+    public function save(ProductInterface $product, $saveOptions = false)
-     {
-+        $assignToCategories = false;
-         $tierPrices = $product->getData('tier_price');
- 
-         try {
--            $existingProduct = $this->get($product->getSku());
-+            $existingProduct = $product->getId() ? $this->getById($product->getId()) : $this->get($product->getSku());
- 
-             $product->setData(
-                 $this->resourceModel->getLinkField(),
-@@ -566,12 +524,19 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-             if (!$product->hasData(Product::STATUS)) {
-                 $product->setStatus($existingProduct->getStatus());
-             }
-+
-+            /** @var ProductExtension $extensionAttributes */
-+            $extensionAttributes = $product->getExtensionAttributes();
-+            if (empty($extensionAttributes->__toArray())) {
-+                $product->setExtensionAttributes($existingProduct->getExtensionAttributes());
-+                $assignToCategories = true;
-+            }
-         } catch (NoSuchEntityException $e) {
-             $existingProduct = null;
-         }
- 
-         $productDataArray = $this->extensibleDataObjectConverter
--            ->toNestedArray($product, [], \Magento\Catalog\Api\Data\ProductInterface::class);
-+            ->toNestedArray($product, [], ProductInterface::class);
-         $productDataArray = array_replace($productDataArray, $product->getData());
-         $ignoreLinksFlag = $product->getData('ignore_links_flag');
-         $productLinks = null;
-@@ -597,79 +562,50 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-             );
-         }
- 
--        try {
--            if ($tierPrices !== null) {
--                $product->setData('tier_price', $tierPrices);
--            }
--            $this->removeProductFromLocalCache($product->getSku());
--            unset($this->instancesById[$product->getId()]);
--            $this->resourceModel->save($product);
--        } catch (ConnectionException $exception) {
--            throw new \Magento\Framework\Exception\TemporaryState\CouldNotSaveException(
--                __('Database connection error'),
--                $exception,
--                $exception->getCode()
--            );
--        } catch (DeadlockException $exception) {
--            throw new \Magento\Framework\Exception\TemporaryState\CouldNotSaveException(
--                __('Database deadlock found when trying to get lock'),
--                $exception,
--                $exception->getCode()
--            );
--        } catch (LockWaitException $exception) {
--            throw new \Magento\Framework\Exception\TemporaryState\CouldNotSaveException(
--                __('Database lock wait timeout exceeded'),
--                $exception,
--                $exception->getCode()
--            );
--        } catch (\Magento\Eav\Model\Entity\Attribute\Exception $exception) {
--            throw \Magento\Framework\Exception\InputException::invalidFieldValue(
--                $exception->getAttributeCode(),
--                $product->getData($exception->getAttributeCode()),
--                $exception
--            );
--        } catch (ValidatorException $e) {
--            throw new CouldNotSaveException(__($e->getMessage()));
--        } catch (LocalizedException $e) {
--            throw $e;
--        } catch (\Exception $e) {
--            throw new \Magento\Framework\Exception\CouldNotSaveException(
--                __('The product was unable to be saved. Please try again.'),
--                $e
-+        if ($tierPrices !== null) {
-+            $product->setData('tier_price', $tierPrices);
-+        }
-+
-+        $this->saveProduct($product);
-+        if ($assignToCategories === true && $product->getCategoryIds()) {
-+            $this->linkManagement->assignProductToCategories(
-+                $product->getSku(),
-+                $product->getCategoryIds()
-             );
-         }
--        $this->removeProductFromLocalCache($product->getSku());
--        unset($this->instancesById[$product->getId()]);
-+        $this->removeProductFromLocalCacheBySku($product->getSku());
-+        $this->removeProductFromLocalCacheById($product->getId());
- 
-         return $this->get($product->getSku(), false, $product->getStoreId());
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
--    public function delete(\Magento\Catalog\Api\Data\ProductInterface $product)
-+    public function delete(ProductInterface $product)
-     {
-         $sku = $product->getSku();
-         $productId = $product->getId();
-         try {
--            $this->removeProductFromLocalCache($product->getSku());
--            unset($this->instancesById[$product->getId()]);
-+            $this->removeProductFromLocalCacheBySku($product->getSku());
-+            $this->removeProductFromLocalCacheById($product->getId());
-             $this->resourceModel->delete($product);
-         } catch (ValidatorException $e) {
--            throw new CouldNotSaveException(__($e->getMessage()));
-+            throw new CouldNotSaveException(__($e->getMessage()), $e);
-         } catch (\Exception $e) {
-             throw new \Magento\Framework\Exception\StateException(
--                __('The "%1" product couldn\'t be removed.', $sku)
-+                __('The "%1" product couldn\'t be removed.', $sku),
-+                $e
-             );
-         }
--        $this->removeProductFromLocalCache($sku);
--        unset($this->instancesById[$productId]);
-+        $this->removeProductFromLocalCacheBySku($sku);
-+        $this->removeProductFromLocalCacheById($productId);
- 
-         return true;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function deleteById($sku)
-     {
-@@ -678,7 +614,7 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
-     {
-@@ -695,6 +631,7 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-         $collection->load();
- 
-         $collection->addCategoryIds();
-+        $this->addExtensionAttributes($collection);
-         $searchResult = $this->searchResultsFactory->create();
-         $searchResult->setSearchCriteria($searchCriteria);
-         $searchResult->setItems($collection->getItems());
-@@ -705,7 +642,7 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-                 $this->getCacheKey(
-                     [
-                         false,
--                        $product->hasData(\Magento\Catalog\Model\Product::STORE_ID) ? $product->getStoreId() : null
-+                        $product->getStoreId()
-                     ]
-                 ),
-                 $product
-@@ -715,6 +652,20 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-         return $searchResult;
-     }
- 
-+    /**
-+     * Add extension attributes to loaded items.
-+     *
-+     * @param Collection $collection
-+     * @return Collection
-+     */
-+    private function addExtensionAttributes(Collection $collection) : Collection
-+    {
-+        foreach ($collection->getItems() as $item) {
-+            $this->readExtensions->execute($item);
-+        }
-+        return $collection;
-+    }
-+
-     /**
-      * Helper function that adds a FilterGroup to the collection.
-      *
-@@ -760,41 +711,18 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-     }
- 
-     /**
--     * Ascertain image roles, if they are not set against the gallery entries
-+     * Retrieve media gallery processor.
-      *
--     * @param ProductInterface $product
--     * @param array $images
--     * @return array
--     */
--    private function determineImageRoles(ProductInterface $product, array $images) : array
--    {
--        $imagesWithRoles = [];
--        foreach ($images as $image) {
--            if (!isset($image['types'])) {
--                $image['types'] = [];
--                if (isset($image['file'])) {
--                    foreach (array_keys($product->getMediaAttributes()) as $attribute) {
--                        if ($image['file'] == $product->getData($attribute)) {
--                            $image['types'][] = $attribute;
--                        }
--                    }
--                }
--            }
--            $imagesWithRoles[] = $image;
--        }
--        return $imagesWithRoles;
--    }
--
--    /**
--     * @return Product\Gallery\Processor
-+     * @return MediaGalleryProcessor
-      */
-     private function getMediaGalleryProcessor()
-     {
--        if (null === $this->mediaGalleryProcessor) {
--            $this->mediaGalleryProcessor = \Magento\Framework\App\ObjectManager::getInstance()
--                ->get(\Magento\Catalog\Model\Product\Gallery\Processor::class);
-+        if (null === $this->mediaProcessor) {
-+            $this->mediaProcessor = \Magento\Framework\App\ObjectManager::getInstance()
-+                ->get(MediaGalleryProcessor::class);
-         }
--        return $this->mediaGalleryProcessor;
-+
-+        return $this->mediaProcessor;
-     }
- 
-     /**
-@@ -828,25 +756,36 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-     }
- 
-     /**
--     * Removes product in the local cache.
-+     * Removes product in the local cache by sku.
-      *
-      * @param string $sku
-      * @return void
-      */
--    private function removeProductFromLocalCache(string $sku) :void
-+    private function removeProductFromLocalCacheBySku(string $sku): void
-     {
-         $preparedSku = $this->prepareSku($sku);
-         unset($this->instances[$preparedSku]);
-     }
- 
-     /**
--     * Saves product in the local cache.
-+     * Removes product in the local cache by id.
-+     *
-+     * @param string|null $id
-+     * @return void
-+     */
-+    private function removeProductFromLocalCacheById(?string $id): void
-+    {
-+        unset($this->instancesById[$id]);
-+    }
-+
-+    /**
-+     * Saves product in the local cache by sku.
-      *
-      * @param Product $product
-      * @param string $cacheKey
-      * @return void
-      */
--    private function saveProductInLocalCache(Product $product, string $cacheKey) : void
-+    private function saveProductInLocalCache(Product $product, string $cacheKey): void
-     {
-         $preparedSku = $this->prepareSku($product->getSku());
-         $this->instances[$preparedSku][$cacheKey] = $product;
-@@ -862,4 +801,56 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
-     {
-         return mb_strtolower(trim($sku));
-     }
-+
-+    /**
-+     * Save product resource model.
-+     *
-+     * @param ProductInterface|Product $product
-+     * @throws TemporaryCouldNotSaveException
-+     * @throws InputException
-+     * @throws CouldNotSaveException
-+     * @throws LocalizedException
-+     */
-+    private function saveProduct($product): void
-+    {
-+        try {
-+            $this->removeProductFromLocalCacheBySku($product->getSku());
-+            $this->removeProductFromLocalCacheById($product->getId());
-+            $this->resourceModel->save($product);
-+        } catch (ConnectionException $exception) {
-+            throw new TemporaryCouldNotSaveException(
-+                __('Database connection error'),
-+                $exception,
-+                $exception->getCode()
-+            );
-+        } catch (DeadlockException $exception) {
-+            throw new TemporaryCouldNotSaveException(
-+                __('Database deadlock found when trying to get lock'),
-+                $exception,
-+                $exception->getCode()
-+            );
-+        } catch (LockWaitException $exception) {
-+            throw new TemporaryCouldNotSaveException(
-+                __('Database lock wait timeout exceeded'),
-+                $exception,
-+                $exception->getCode()
-+            );
-+        } catch (AttributeException $exception) {
-+            throw InputException::invalidFieldValue(
-+                $exception->getAttributeCode(),
-+                $product->getData($exception->getAttributeCode()),
-+                $exception
-+            );
-+        } catch (ValidatorException $e) {
-+            throw new CouldNotSaveException(__($e->getMessage()));
-+        } catch (LocalizedException $e) {
-+            throw $e;
-+            // phpcs:disable Magento2.Exceptions.ThrowCatch
-+        } catch (\Exception $e) {
-+            throw new CouldNotSaveException(
-+                __('The product was unable to be saved. Please try again.'),
-+                $e
-+            );
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php b/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php
-new file mode 100644
-index 00000000000..fdcf2956dbd
---- /dev/null
-+++ b/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php
-@@ -0,0 +1,239 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\ProductRepository;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\Product\Gallery\Processor;
-+use Magento\Catalog\Model\Product\Media\Config;
-+use Magento\Framework\Api\Data\ImageContentInterface;
-+use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
-+use Magento\Framework\Api\ImageProcessorInterface;
-+use Magento\Framework\Exception\InputException;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\StateException;
-+
-+/**
-+ * Process Media gallery data for ProductRepository before save product.
-+ */
-+class MediaGalleryProcessor
-+{
-+    /**
-+     * Catalog gallery processor.
-+     *
-+     * @var Processor
-+     */
-+    private $processor;
-+
-+    /**
-+     * Image content data object factory.
-+     *
-+     * @var ImageContentInterfaceFactory
-+     */
-+    private $contentFactory;
-+
-+    /**
-+     * Image processor.
-+     *
-+     * @var ImageProcessorInterface
-+     */
-+    private $imageProcessor;
-+
-+    /**
-+     * @param Processor $processor
-+     * @param ImageContentInterfaceFactory $contentFactory
-+     * @param ImageProcessorInterface $imageProcessor
-+     */
-+    public function __construct(
-+        Processor $processor,
-+        ImageContentInterfaceFactory $contentFactory,
-+        ImageProcessorInterface $imageProcessor
-+    ) {
-+        $this->processor = $processor;
-+        $this->contentFactory = $contentFactory;
-+        $this->imageProcessor = $imageProcessor;
-+    }
-+
-+    /**
-+     * Process Media gallery data before save product.
-+     *
-+     * Compare Media Gallery Entries Data with existing Media Gallery
-+     * * If Media entry has not value_id set it as new
-+     * * If Existing entry 'value_id' absent in Media Gallery set 'removed' flag
-+     * * Merge Existing and new media gallery
-+     *
-+     * @param ProductInterface $product contains only existing media gallery items
-+     * @param array $mediaGalleryEntries array which contains all media gallery items
-+     * @return void
-+     * @throws InputException
-+     * @throws StateException
-+     * @throws LocalizedException
-+     */
-+    public function processMediaGallery(ProductInterface $product, array $mediaGalleryEntries) :void
-+    {
-+        $existingMediaGallery = $product->getMediaGallery('images');
-+        $newEntries = [];
-+        $entriesById = [];
-+        if (!empty($existingMediaGallery)) {
-+            foreach ($mediaGalleryEntries as $entry) {
-+                if (isset($entry['value_id'])) {
-+                    $entriesById[$entry['value_id']] = $entry;
-+                } else {
-+                    $newEntries[] = $entry;
-+                }
-+            }
-+            foreach ($existingMediaGallery as $key => &$existingEntry) {
-+                if (isset($entriesById[$existingEntry['value_id']])) {
-+                    $updatedEntry = $entriesById[$existingEntry['value_id']];
-+                    if ($updatedEntry['file'] === null) {
-+                        unset($updatedEntry['file']);
-+                    }
-+                    $existingMediaGallery[$key] = array_merge($existingEntry, $updatedEntry);
-+                } else {
-+                    //set the removed flag
-+                    $existingEntry['removed'] = true;
-+                }
-+            }
-+            $product->setData('media_gallery', ["images" => $existingMediaGallery]);
-+        } else {
-+            $newEntries = $mediaGalleryEntries;
-+        }
-+
-+        $images = (array)$product->getMediaGallery('images');
-+        $images = $this->determineImageRoles($product, $images);
-+
-+        $this->processor->clearMediaAttribute($product, array_keys($product->getMediaAttributes()));
-+
-+        $this->processMediaAttributes($product, $images);
-+        $this->processEntries($product, $newEntries, $entriesById);
-+    }
-+
-+    /**
-+     * Process new gallery media entry.
-+     *
-+     * @param ProductInterface $product
-+     * @param array $newEntry
-+     * @return void
-+     * @throws InputException
-+     * @throws StateException
-+     * @throws LocalizedException
-+     */
-+    public function processNewMediaGalleryEntry(
-+        ProductInterface $product,
-+        array  $newEntry
-+    ) :void {
-+        /** @var ImageContentInterface $contentDataObject */
-+        $contentDataObject = $newEntry['content'];
-+
-+        /** @var Config $mediaConfig */
-+        $mediaConfig = $product->getMediaConfig();
-+        $mediaTmpPath = $mediaConfig->getBaseTmpMediaPath();
-+
-+        $relativeFilePath = $this->imageProcessor->processImageContent($mediaTmpPath, $contentDataObject);
-+        $tmpFilePath = $mediaConfig->getTmpMediaShortUrl($relativeFilePath);
-+
-+        if (!$product->hasGalleryAttribute()) {
-+            throw new StateException(
-+                __("The product that was requested doesn't exist. Verify the product and try again.")
-+            );
-+        }
-+
-+        $imageFileUri = $this->processor->addImage(
-+            $product,
-+            $tmpFilePath,
-+            isset($newEntry['types']) ? $newEntry['types'] : [],
-+            true,
-+            isset($newEntry['disabled']) ? $newEntry['disabled'] : true
-+        );
-+        // Update additional fields that are still empty after addImage call
-+        $this->processor->updateImage(
-+            $product,
-+            $imageFileUri,
-+            [
-+                'label' => $newEntry['label'],
-+                'position' => $newEntry['position'],
-+                'disabled' => $newEntry['disabled'],
-+                'media_type' => $newEntry['media_type'],
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Ascertain image roles, if they are not set against the gallery entries.
-+     *
-+     * @param ProductInterface $product
-+     * @param array $images
-+     * @return array
-+     */
-+    private function determineImageRoles(ProductInterface $product, array $images) : array
-+    {
-+        $imagesWithRoles = [];
-+        foreach ($images as $image) {
-+            if (!isset($image['types'])) {
-+                $image['types'] = [];
-+                if (isset($image['file'])) {
-+                    foreach (array_keys($product->getMediaAttributes()) as $attribute) {
-+                        if ($image['file'] == $product->getData($attribute)) {
-+                            $image['types'][] = $attribute;
-+                        }
-+                    }
-+                }
-+            }
-+            $imagesWithRoles[] = $image;
-+        }
-+
-+        return $imagesWithRoles;
-+    }
-+
-+    /**
-+     * Convert entries into product media gallery data and set to product.
-+     *
-+     * @param ProductInterface $product
-+     * @param array $newEntries
-+     * @param array $entriesById
-+     * @throws InputException
-+     * @throws LocalizedException
-+     * @throws StateException
-+     */
-+    private function processEntries(ProductInterface $product, array $newEntries, array $entriesById): void
-+    {
-+        foreach ($newEntries as $newEntry) {
-+            if (!isset($newEntry['content'])) {
-+                throw new InputException(__('The image content is invalid. Verify the content and try again.'));
-+            }
-+            /** @var ImageContentInterface $contentDataObject */
-+            $contentDataObject = $this->contentFactory->create()
-+                ->setName($newEntry['content']['data'][ImageContentInterface::NAME])
-+                ->setBase64EncodedData($newEntry['content']['data'][ImageContentInterface::BASE64_ENCODED_DATA])
-+                ->setType($newEntry['content']['data'][ImageContentInterface::TYPE]);
-+            $newEntry['content'] = $contentDataObject;
-+            $this->processNewMediaGalleryEntry($product, $newEntry);
-+
-+            $finalGallery = $product->getData('media_gallery');
-+            $newEntryId = key(array_diff_key($product->getData('media_gallery')['images'], $entriesById));
-+            $newEntry = array_replace_recursive($newEntry, $finalGallery['images'][$newEntryId]);
-+            $entriesById[$newEntryId] = $newEntry;
-+            $finalGallery['images'][$newEntryId] = $newEntry;
-+            $product->setData('media_gallery', $finalGallery);
-+        }
-+    }
-+
-+    /**
-+     * Set media attribute values.
-+     *
-+     * @param ProductInterface $product
-+     * @param array $images
-+     */
-+    private function processMediaAttributes(ProductInterface $product, array $images): void
-+    {
-+        foreach ($images as $image) {
-+            if (empty($image['removed']) && !empty($image['types'])) {
-+                $this->processor->setMediaAttribute($product, $image['types'], $image['file']);
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
-index d4f5fdd5137..2896849b76c 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
-@@ -7,6 +7,7 @@ namespace Magento\Catalog\Model\ResourceModel;
- 
- /**
-  * Flat abstract collection
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Collection
-@@ -34,7 +35,7 @@ abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel
-     }
- 
-     /**
--     * get select count sql
-+     * Get select count sql
-      *
-      * @return \Magento\Framework\DB\Select
-      */
-@@ -69,6 +70,7 @@ abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel
- 
-     /**
-      * Add attribute to select result set.
-+     *
-      * Backward compatibility with EAV collection
-      *
-      * @param string $attribute
-@@ -82,6 +84,7 @@ abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel
- 
-     /**
-      * Specify collection select filter by attribute value
-+     *
-      * Backward compatibility with EAV collection
-      *
-      * @param string|\Magento\Eav\Model\Entity\Attribute $attribute
-@@ -96,6 +99,7 @@ abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel
- 
-     /**
-      * Specify collection select order by attribute value
-+     *
-      * Backward compatibility with EAV collection
-      *
-      * @param string $attribute
-@@ -110,6 +114,7 @@ abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel
- 
-     /**
-      * Set collection page start and records to show
-+     *
-      * Backward compatibility with EAV collection
-      *
-      * @param int $pageNum
-@@ -124,11 +129,12 @@ abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel
- 
-     /**
-      * Create all ids retrieving select with limitation
-+     *
-      * Backward compatibility with EAV collection
-      *
-      * @param int $limit
-      * @param int $offset
--     * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
-+     * @return \Magento\Framework\DB\Select
-      */
-     protected function _getAllIdsSelect($limit = null, $offset = null)
-     {
-@@ -144,6 +150,7 @@ abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel
- 
-     /**
-      * Retrieve all ids for collection
-+     *
-      * Backward compatibility with EAV collection
-      *
-      * @param int $limit
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
-index b9e629912a5..3d7f863b7c0 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
-@@ -7,6 +7,10 @@
- namespace Magento\Catalog\Model\ResourceModel;
- 
- use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-+use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
-+use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
-+use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
-+use Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface;
- 
- /**
-  * Catalog entity abstract model
-@@ -37,16 +41,18 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param \Magento\Catalog\Model\Factory $modelFactory
-      * @param array $data
-+     * @param UniqueValidationInterface|null $uniqueValidator
-      */
-     public function __construct(
-         \Magento\Eav\Model\Entity\Context $context,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
-         \Magento\Catalog\Model\Factory $modelFactory,
--        $data = []
-+        $data = [],
-+        UniqueValidationInterface $uniqueValidator = null
-     ) {
-         $this->_storeManager = $storeManager;
-         $this->_modelFactory = $modelFactory;
--        parent::__construct($context, $data);
-+        parent::__construct($context, $data, $uniqueValidator);
-     }
- 
-     /**
-@@ -86,16 +92,14 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
-     /**
-      * Check whether attribute instance (attribute, backend, frontend or source) has method and applicable
-      *
--     * @param AbstractAttribute|\Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
--     * |\Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
--     * |\Magento\Eav\Model\Entity\Attribute\Source\AbstractSource $instance
-+     * @param AbstractAttribute|AbstractBackend|AbstractFrontend|AbstractSource $instance
-      * @param string $method
-      * @param array $args array of arguments
-      * @return boolean
-      */
-     protected function _isCallableAttributeInstance($instance, $method, $args)
-     {
--        if ($instance instanceof \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
-+        if ($instance instanceof AbstractBackend
-             && ($method == 'beforeSave' || $method == 'afterSave')
-         ) {
-             $attributeCode = $instance->getAttribute()->getAttributeCode();
-@@ -112,6 +116,7 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
- 
-     /**
-      * Retrieve select object for loading entity attributes values
-+     *
-      * Join attribute store value
-      *
-      * @param \Magento\Framework\DataObject $object
-@@ -244,6 +249,7 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
- 
-     /**
-      * Check if attribute present for non default Store View.
-+     *
-      * Prevent "delete" query locking in a case when nothing to delete
-      *
-      * @param AbstractAttribute $attribute
-@@ -485,7 +491,7 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
-      * Retrieve attribute's raw value from DB.
-      *
-      * @param int $entityId
--     * @param int|string|array $attribute atrribute's ids or codes
-+     * @param int|string|array $attribute attribute's ids or codes
-      * @param int|\Magento\Store\Model\Store $store
-      * @return bool|string|array
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
-index fa68ae3f865..536fda7e093 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
-@@ -16,6 +16,8 @@ use Magento\Framework\DataObject;
- use Magento\Framework\EntityManager\EntityManager;
- 
- /**
-+ * Resource model for category entity
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Category extends AbstractResource
-@@ -198,7 +200,7 @@ class Category extends AbstractResource
-      * delete child categories
-      *
-      * @param \Magento\Framework\DataObject $object
--     * @return $this
-+     * @return void
-      */
-     protected function _beforeDelete(\Magento\Framework\DataObject $object)
-     {
-@@ -249,7 +251,8 @@ class Category extends AbstractResource
- 
-     /**
-      * Process category data before saving
--     * prepare path and increment children count for parent categories
-+     *
-+     * Prepare path and increment children count for parent categories
-      *
-      * @param \Magento\Framework\DataObject $object
-      * @return $this
-@@ -298,7 +301,8 @@ class Category extends AbstractResource
- 
-     /**
-      * Process category data after save category object
--     * save related products ids and update path value
-+     *
-+     * Save related products ids and update path value
-      *
-      * @param \Magento\Framework\DataObject $object
-      * @return $this
-@@ -482,15 +486,27 @@ class Category extends AbstractResource
-             $this->getCategoryProductTable(),
-             ['product_id', 'position']
-         )->where(
--            'category_id = :category_id'
-+            "{$this->getTable('catalog_category_product')}.category_id = ?",
-+            $category->getId()
-         );
-+        $websiteId = $category->getStore()->getWebsiteId();
-+        if ($websiteId) {
-+            $select->join(
-+                ['product_website' => $this->getTable('catalog_product_website')],
-+                "product_website.product_id = {$this->getTable('catalog_category_product')}.product_id",
-+                []
-+            )->where(
-+                'product_website.website_id = ?',
-+                $websiteId
-+            );
-+        }
-         $bind = ['category_id' => (int)$category->getId()];
- 
-         return $this->getConnection()->fetchPairs($select, $bind);
-     }
- 
-     /**
--     * Get chlden categories count
-+     * Get children categories count
-      *
-      * @param int $categoryId
-      * @return int
-@@ -664,7 +680,7 @@ class Category extends AbstractResource
-         $bind = ['category_id' => (int)$category->getId()];
-         $counts = $this->getConnection()->fetchOne($select, $bind);
- 
--        return intval($counts);
-+        return (int) $counts;
-     }
- 
-     /**
-@@ -862,6 +878,7 @@ class Category extends AbstractResource
- 
-     /**
-      * Check category is forbidden to delete.
-+     *
-      * If category is root and assigned to store group return false
-      *
-      * @param integer $categoryId
-@@ -918,7 +935,7 @@ class Category extends AbstractResource
-         $childrenCount = $this->getChildrenCount($category->getId()) + 1;
-         $table = $this->getEntityTable();
-         $connection = $this->getConnection();
--        $levelFiled = $connection->quoteIdentifier('level');
-+        $levelField = $connection->quoteIdentifier('level');
-         $pathField = $connection->quoteIdentifier('path');
- 
-         /**
-@@ -958,7 +975,7 @@ class Category extends AbstractResource
-                         $newPath . '/'
-                     ) . ')'
-                 ),
--                'level' => new \Zend_Db_Expr($levelFiled . ' + ' . $levelDisposition)
-+                'level' => new \Zend_Db_Expr($levelField . ' + ' . $levelDisposition)
-             ],
-             [$pathField . ' LIKE ?' => $category->getPath() . '/%']
-         );
-@@ -982,6 +999,7 @@ class Category extends AbstractResource
- 
-     /**
-      * Process positions of old parent category children and new parent category children.
-+     *
-      * Get position for moved category
-      *
-      * @param \Magento\Catalog\Model\Category $category
-@@ -1062,7 +1080,7 @@ class Category extends AbstractResource
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function delete($object)
-     {
-@@ -1088,6 +1106,8 @@ class Category extends AbstractResource
-     }
- 
-     /**
-+     * Returns EntityManager object
-+     *
-      * @return EntityManager
-      */
-     private function getEntityManager()
-@@ -1100,6 +1120,8 @@ class Category extends AbstractResource
-     }
- 
-     /**
-+     * Returns AggregateCount object
-+     *
-      * @return Category\AggregateCount
-      */
-     private function getAggregateCount()
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
-index 46bb74513b5..657daca1305 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
-@@ -82,7 +82,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
--     *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -323,9 +322,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-                         'main_table.category_id=e.entity_id',
-                         []
-                     )->where(
--                        'e.entity_id = :entity_id'
--                    )->orWhere(
--                        'e.path LIKE :c_path'
-+                        '(e.entity_id = :entity_id OR e.path LIKE :c_path)'
-                     );
-                     if ($websiteId) {
-                         $select->join(
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
-index 01e4b072b03..05950531e21 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
-@@ -173,7 +173,7 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
-     public function getMainStoreTable($storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID)
-     {
-         if (is_string($storeId)) {
--            $storeId = intval($storeId);
-+            $storeId = (int) $storeId;
-         }
- 
-         if ($storeId) {
-@@ -699,8 +699,20 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
-             $this->getTable('catalog_category_product'),
-             ['product_id', 'position']
-         )->where(
--            'category_id = :category_id'
-+            "{$this->getTable('catalog_category_product')}.category_id = ?",
-+            $category->getId()
-         );
-+        $websiteId = $category->getStore()->getWebsiteId();
-+        if ($websiteId) {
-+            $select->join(
-+                ['product_website' => $this->getTable('catalog_product_website')],
-+                "product_website.product_id = {$this->getTable('catalog_category_product')}.product_id",
-+                []
-+            )->where(
-+                'product_website.website_id = ?',
-+                $websiteId
-+            );
-+        }
-         $bind = ['category_id' => (int)$category->getId()];
- 
-         return $this->getConnection()->fetchPairs($select, $bind);
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php
-index 3b3005f1ce6..03e33365b77 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php
-@@ -12,11 +12,13 @@ use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
- use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
- use Psr\Log\LoggerInterface as Logger;
- use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Store\Model\ScopeInterface;
- 
- /**
-  * Catalog category flat collection
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
- {
-@@ -48,12 +50,20 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-      */
-     protected $_storeId;
- 
-+    /**
-+     * Core store config
-+     *
-+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-     /**
-      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
-      * @param Logger $logger
-      * @param FetchStrategyInterface $fetchStrategy
-      * @param ManagerInterface $eventManager
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-      * @param AbstractDb $resource
-      */
-@@ -63,10 +73,12 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-         FetchStrategyInterface $fetchStrategy,
-         ManagerInterface $eventManager,
-         StoreManagerInterface $storeManager,
-+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
-         AbstractDb $resource = null
-     ) {
-         $this->_storeManager = $storeManager;
-+        $this->scopeConfig = $scopeConfig;
-         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
-     }
- 
-@@ -387,4 +399,21 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-         $this->setCurPage($pageNum)->setPageSize($pageSize);
-         return $this;
-     }
-+
-+    /**
-+     * Add navigation max depth filter
-+     *
-+     * @return $this
-+     */
-+    public function addNavigationMaxDepthFilter()
-+    {
-+        $navigationMaxDepth = (int)$this->scopeConfig->getValue(
-+            'catalog/navigation/max_depth',
-+            ScopeInterface::SCOPE_STORE
-+        );
-+        if ($navigationMaxDepth > 0) {
-+            $this->addLevelFilter($navigationMaxDepth);
-+        }
-+        return $this;
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/StateDependentCollectionFactory.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/StateDependentCollectionFactory.php
-new file mode 100644
-index 00000000000..fc476ab6ff2
---- /dev/null
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/StateDependentCollectionFactory.php
-@@ -0,0 +1,55 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+namespace Magento\Catalog\Model\ResourceModel\Category;
-+
-+/**
-+ * Factory class for state dependent category collection
-+ */
-+class StateDependentCollectionFactory
-+{
-+    /**
-+     * Object Manager instance
-+     *
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * Catalog category flat state
-+     *
-+     * @var \Magento\Catalog\Model\Indexer\Category\Flat\State
-+     */
-+    private $catalogCategoryFlatState;
-+
-+    /**
-+     * Factory constructor
-+     *
-+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
-+     * @param \Magento\Catalog\Model\Indexer\Category\Flat\State $catalogCategoryFlatState
-+     */
-+    public function __construct(
-+        \Magento\Framework\ObjectManagerInterface $objectManager,
-+        \Magento\Catalog\Model\Indexer\Category\Flat\State $catalogCategoryFlatState
-+    ) {
-+        $this->objectManager = $objectManager;
-+        $this->catalogCategoryFlatState = $catalogCategoryFlatState;
-+    }
-+
-+    /**
-+     * Create class instance with specified parameters
-+     *
-+     * @param array $data
-+     * @return \Magento\Framework\Data\Collection\AbstractDb
-+     */
-+    public function create(array $data = [])
-+    {
-+        return $this->objectManager->create(
-+            ($this->catalogCategoryFlatState->isAvailable()) ? Flat\Collection::class : Collection::class,
-+            $data
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php b/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
-index 9ab863cde27..3a0d47fe573 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
-@@ -7,6 +7,7 @@ namespace Magento\Catalog\Model\ResourceModel\Collection;
- 
- /**
-  * Catalog EAV collection resource abstract model
-+ *
-  * Implement using different stores for retrieve attribute values
-  *
-  * @api
-@@ -42,7 +43,6 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
-      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
--     *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -205,10 +205,7 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
-     }
- 
-     /**
--     * @param \Magento\Framework\DB\Select $select
--     * @param string $table
--     * @param string $type
--     * @return \Magento\Framework\DB\Select
-+     * @inheritdoc
-      */
-     protected function _addLoadAttributesSelectValues($select, $table, $type)
-     {
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
-index 8f8e9f6bfed..d56cc40ad0f 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
-@@ -167,6 +167,8 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
-+     * Init model
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -234,6 +236,8 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-         ) {
-             $this->_indexerEavProcessor->markIndexerAsInvalid();
-         }
-+        
-+        $this->_source = null;
- 
-         return parent::afterSave();
-     }
-@@ -362,6 +366,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
- 
-     /**
-      * Retrieve apply to products array
-+     *
-      * Return empty array if applied to all products
-      *
-      * @return string[]
-@@ -478,7 +483,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-         $backendType = $this->getOrigData('backend_type');
-         $frontendInput = $this->getOrigData('frontend_input');
- 
--        if ($backendType == 'int' && $frontendInput == 'select') {
-+        if ($backendType == 'int' && ($frontendInput == 'select' || $frontendInput == 'boolean')) {
-             return true;
-         } elseif ($backendType == 'varchar' && $frontendInput == 'multiselect') {
-             return true;
-@@ -507,8 +512,8 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
-+     * @inheritdoc
-      * @codeCoverageIgnoreStart
--     * {@inheritdoc}
-      */
-     public function getIsWysiwygEnabled()
-     {
-@@ -516,7 +521,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsHtmlAllowedOnFront()
-     {
-@@ -524,7 +529,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getUsedForSortBy()
-     {
-@@ -532,7 +537,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsFilterable()
-     {
-@@ -540,7 +545,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsFilterableInSearch()
-     {
-@@ -548,7 +553,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsUsedInGrid()
-     {
-@@ -556,7 +561,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsVisibleInGrid()
-     {
-@@ -564,7 +569,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsFilterableInGrid()
-     {
-@@ -572,7 +577,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getPosition()
-     {
-@@ -580,7 +585,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsSearchable()
-     {
-@@ -588,7 +593,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsVisibleInAdvancedSearch()
-     {
-@@ -596,7 +601,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsComparable()
-     {
-@@ -604,7 +609,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsUsedForPromoRules()
-     {
-@@ -612,7 +617,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsVisibleOnFront()
-     {
-@@ -620,7 +625,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getUsedInProductListing()
-     {
-@@ -628,7 +633,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsVisible()
-     {
-@@ -638,7 +643,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     //@codeCoverageIgnoreEnd
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getScope()
-     {
-@@ -720,7 +725,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     /**
-      * Set apply to value for the element
-      *
--     * @param string []|string
-+     * @param string[]|string $applyTo
-      * @return $this
-      */
-     public function setApplyTo($applyTo)
-@@ -829,7 +834,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function afterDelete()
-     {
-@@ -840,9 +845,14 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     /**
-      * @inheritdoc
-      * @since 100.0.9
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $this->unsetData('entity_type');
-         return array_diff(
-             parent::__sleep(),
-@@ -853,9 +863,14 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
-     /**
-      * @inheritdoc
-      * @since 100.0.9
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
-         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         $this->_indexerEavProcessor = $objectManager->get(\Magento\Catalog\Model\Indexer\Product\Flat\Processor::class);
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
-index 3699e29f820..585da2af529 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
-@@ -112,7 +112,7 @@ class Price extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-         /**
-          * Check and set correct variable values to prevent SQL-injections
-          */
--        $range = floatval($range);
-+        $range = (float)$range;
-         if ($range == 0) {
-             $range = 1;
-         }
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
-index d71ec238819..99a7efe6c98 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
-@@ -8,6 +8,9 @@ namespace Magento\Catalog\Model\ResourceModel;
- use Magento\Catalog\Model\ResourceModel\Product\Website\Link as ProductWebsiteLink;
- use Magento\Framework\App\ObjectManager;
- use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
-+use Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface;
-+use Magento\Framework\EntityManager\EntityManager;
-+use Magento\Framework\Model\AbstractModel;
- 
- /**
-  * Product entity resource model
-@@ -43,7 +46,7 @@ class Product extends AbstractResource
-     /**
-      * Category collection factory
-      *
--     * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
-+     * @var Category\CollectionFactory
-      */
-     protected $_categoryCollectionFactory;
- 
-@@ -63,7 +66,7 @@ class Product extends AbstractResource
-     protected $typeFactory;
- 
-     /**
--     * @var \Magento\Framework\EntityManager\EntityManager
-+     * @var EntityManager
-      * @since 101.0.0
-      */
-     protected $entityManager;
-@@ -80,7 +83,7 @@ class Product extends AbstractResource
-     protected $availableCategoryIdsCache = [];
- 
-     /**
--     * @var \Magento\Catalog\Model\ResourceModel\Product\CategoryLink
-+     * @var Product\CategoryLink
-      */
-     private $productCategoryLink;
- 
-@@ -101,6 +104,7 @@ class Product extends AbstractResource
-      * @param \Magento\Catalog\Model\Product\Attribute\DefaultAttributes $defaultAttributes
-      * @param array $data
-      * @param TableMaintainer|null $tableMaintainer
-+     * @param UniqueValidationInterface|null $uniqueValidator
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -108,14 +112,15 @@ class Product extends AbstractResource
-         \Magento\Eav\Model\Entity\Context $context,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
-         \Magento\Catalog\Model\Factory $modelFactory,
--        \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
-+        Category\CollectionFactory $categoryCollectionFactory,
-         Category $catalogCategory,
-         \Magento\Framework\Event\ManagerInterface $eventManager,
-         \Magento\Eav\Model\Entity\Attribute\SetFactory $setFactory,
-         \Magento\Eav\Model\Entity\TypeFactory $typeFactory,
-         \Magento\Catalog\Model\Product\Attribute\DefaultAttributes $defaultAttributes,
-         $data = [],
--        TableMaintainer $tableMaintainer = null
-+        TableMaintainer $tableMaintainer = null,
-+        UniqueValidationInterface $uniqueValidator = null
-     ) {
-         $this->_categoryCollectionFactory = $categoryCollectionFactory;
-         $this->_catalogCategory = $catalogCategory;
-@@ -127,7 +132,8 @@ class Product extends AbstractResource
-             $context,
-             $storeManager,
-             $modelFactory,
--            $data
-+            $data,
-+            $uniqueValidator
-         );
-         $this->connectionName  = 'catalog';
-         $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
-@@ -232,7 +238,7 @@ class Product extends AbstractResource
-     /**
-      * Retrieve product category identifiers
-      *
--     * @param \Magento\Catalog\Model\Product $product
-+     * @param  \Magento\Catalog\Model\Product $product
-      * @return array
-      */
-     public function getCategoryIds($product)
-@@ -244,7 +250,7 @@ class Product extends AbstractResource
-     /**
-      * Get product identifier by sku
-      *
--     * @param string $sku
-+     * @param  string $sku
-      * @return int|false
-      */
-     public function getIdBySku($sku)
-@@ -289,7 +295,7 @@ class Product extends AbstractResource
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function delete($object)
-     {
-@@ -344,11 +350,11 @@ class Product extends AbstractResource
-      * Get collection of product categories
-      *
-      * @param \Magento\Catalog\Model\Product $product
--     * @return \Magento\Catalog\Model\ResourceModel\Category\Collection
-+     * @return Category\Collection
-      */
-     public function getCategoryCollection($product)
-     {
--        /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
-+        /** @var Category\Collection $collection */
-         $collection = $this->_categoryCollectionFactory->create();
-         $collection->joinField(
-             'product_id',
-@@ -424,18 +430,26 @@ class Product extends AbstractResource
-     /**
-      * Check availability display product in category
-      *
--     * @param \Magento\Catalog\Model\Product $product
-+     * @param \Magento\Catalog\Model\Product|int $product
-      * @param int $categoryId
-      * @return string
-      */
-     public function canBeShowInCategory($product, $categoryId)
-     {
-+        if ($product instanceof \Magento\Catalog\Model\Product) {
-+            $productId = $product->getEntityId();
-+            $storeId = $product->getStoreId();
-+        } else {
-+            $productId = $product;
-+            $storeId = $this->_storeManager->getStore()->getId();
-+        }
-+
-         $select = $this->getConnection()->select()->from(
--            $this->tableMaintainer->getMainTable($product->getStoreId()),
-+            $this->tableMaintainer->getMainTable($storeId),
-             'product_id'
-         )->where(
-             'product_id = ?',
--            (int)$product->getEntityId()
-+            (int)$productId
-         )->where(
-             'category_id = ?',
-             (int)$categoryId
-@@ -593,7 +607,7 @@ class Product extends AbstractResource
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function validate($object)
-     {
-@@ -610,7 +624,7 @@ class Product extends AbstractResource
-     /**
-      * Reset firstly loaded attributes
-      *
--     * @param \Magento\Framework\Model\AbstractModel $object
-+     * @param AbstractModel $object
-      * @param integer $entityId
-      * @param array|null $attributes
-      * @return $this
-@@ -633,7 +647,7 @@ class Product extends AbstractResource
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      * @since 101.0.0
-      */
-@@ -663,30 +677,34 @@ class Product extends AbstractResource
-     /**
-      * Save entity's attributes into the object's resource
-      *
--     * @param  \Magento\Framework\Model\AbstractModel $object
-+     * @param AbstractModel $object
-      * @return $this
-      * @throws \Exception
-      * @since 101.0.0
-      */
--    public function save(\Magento\Framework\Model\AbstractModel $object)
-+    public function save(AbstractModel $object)
-     {
-         $this->getEntityManager()->save($object);
-         return $this;
-     }
- 
-     /**
--     * @return \Magento\Framework\EntityManager\EntityManager
-+     * Retrieve entity manager object
-+     *
-+     * @return EntityManager
-      */
-     private function getEntityManager()
-     {
-         if (null === $this->entityManager) {
--            $this->entityManager = \Magento\Framework\App\ObjectManager::getInstance()
--                ->get(\Magento\Framework\EntityManager\EntityManager::class);
-+            $this->entityManager = ObjectManager::getInstance()
-+                ->get(EntityManager::class);
-         }
-         return $this->entityManager;
-     }
- 
-     /**
-+     * Retrieve ProductWebsiteLink object
-+     *
-      * @deprecated 101.1.0
-      * @return ProductWebsiteLink
-      */
-@@ -696,23 +714,26 @@ class Product extends AbstractResource
-     }
- 
-     /**
-+     * Retrieve CategoryLink object
-+     *
-      * @deprecated 101.1.0
--     * @return \Magento\Catalog\Model\ResourceModel\Product\CategoryLink
-+     * @return Product\CategoryLink
-      */
-     private function getProductCategoryLink()
-     {
-         if (null === $this->productCategoryLink) {
--            $this->productCategoryLink = \Magento\Framework\App\ObjectManager::getInstance()
--                ->get(\Magento\Catalog\Model\ResourceModel\Product\CategoryLink::class);
-+            $this->productCategoryLink = ObjectManager::getInstance()
-+                ->get(Product\CategoryLink::class);
-         }
-         return $this->productCategoryLink;
-     }
- 
-     /**
-      * Extends parent method to be appropriate for product.
-+     *
-      * Store id is required to correctly identify attribute value we are working with.
-      *
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 101.1.0
-      */
-     protected function getAttributeRow($entity, $object, $attribute)
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php
-index d97f6bebf4e..da3c4fb4417 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php
-@@ -9,6 +9,7 @@ use Magento\Framework\DB\Select;
- 
- /**
-  * Interface BaseSelectProcessorInterface
-+ *
-  * @api
-  * @since 101.0.3
-  */
-@@ -20,6 +21,8 @@ interface BaseSelectProcessorInterface
-     const PRODUCT_TABLE_ALIAS = 'child';
- 
-     /**
-+     * Process the select statement
-+     *
-      * @param Select $select
-      * @return Select
-      * @since 101.0.3
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php
-index b54c19a1115..cf5760b0c33 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php
-@@ -93,6 +93,8 @@ class CategoryLink
-     }
- 
-     /**
-+     * Get category link metadata
-+     *
-      * @return \Magento\Framework\EntityManager\EntityMetadataInterface
-      */
-     private function getCategoryLinkMetadata()
-@@ -114,16 +116,22 @@ class CategoryLink
-     private function processCategoryLinks($newCategoryPositions, &$oldCategoryPositions)
-     {
-         $result = ['changed' => [], 'updated' => []];
-+
-+        $oldCategoryPositions = array_values($oldCategoryPositions);
-         foreach ($newCategoryPositions as $newCategoryPosition) {
--            $key = array_search(
--                $newCategoryPosition['category_id'],
--                array_column($oldCategoryPositions, 'category_id')
--            );
-+            $key = false;
-+
-+            foreach ($oldCategoryPositions as $oldKey => $oldCategoryPosition) {
-+                if ((int)$oldCategoryPosition['category_id'] === (int)$newCategoryPosition['category_id']) {
-+                    $key = $oldKey;
-+                    break;
-+                }
-+            }
- 
-             if ($key === false) {
-                 $result['changed'][] = $newCategoryPosition;
-             } elseif ($oldCategoryPositions[$key]['position'] != $newCategoryPosition['position']) {
--                $result['updated'][] = $newCategoryPositions[$key];
-+                $result['updated'][] = $newCategoryPosition;
-                 unset($oldCategoryPositions[$key]);
-             }
-         }
-@@ -132,6 +140,8 @@ class CategoryLink
-     }
- 
-     /**
-+     * Update category links
-+     *
-      * @param ProductInterface $product
-      * @param array $insertLinks
-      * @param bool $insert
-@@ -175,6 +185,8 @@ class CategoryLink
-     }
- 
-     /**
-+     * Delete category links
-+     *
-      * @param ProductInterface $product
-      * @param array $deleteLinks
-      * @return array
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
-index 4384effc4e3..dbd6a7a2e10 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
-@@ -7,20 +7,21 @@
- namespace Magento\Catalog\Model\ResourceModel\Product;
- 
- use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
-+use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
- use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
- use Magento\Catalog\Model\Product\Gallery\ReadHandler as GalleryReadHandler;
- use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
- use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-+use Magento\CatalogUrlRewrite\Model\Storage\DbStorage;
- use Magento\Customer\Api\GroupManagementInterface;
- use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\DB\Select;
- use Magento\Framework\EntityManager\MetadataPool;
--use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
-+use Magento\Framework\Indexer\DimensionFactory;
- use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
- use Magento\Store\Model\Store;
--use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
--use Magento\Framework\Indexer\DimensionFactory;
- 
- /**
-  * Product collection
-@@ -31,6 +32,7 @@ use Magento\Framework\Indexer\DimensionFactory;
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  * @SuppressWarnings(PHPMD.NumberOfChildren)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @since 100.0.2
-  */
- class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\AbstractCollection
-@@ -189,7 +191,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     /**
-      * Catalog data
-      *
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager = null;
- 
-@@ -290,8 +292,19 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-      */
-     private $dimensionFactory;
- 
-+    /**
-+     * @var \Magento\Framework\DataObject
-+     */
-+    private $emptyItem;
-+
-+    /**
-+     * @var DbStorage
-+     */
-+    private $urlFinder;
-+
-     /**
-      * Collection constructor
-+     *
-      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
-      * @param \Psr\Log\LoggerInterface $logger
-      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-@@ -302,7 +315,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
-@@ -317,6 +330,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-      * @param TableMaintainer|null $tableMaintainer
-      * @param PriceTableResolver|null $priceTableResolver
-      * @param DimensionFactory|null $dimensionFactory
-+     *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -330,7 +344,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-         \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
-@@ -380,6 +394,19 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-             ?: ObjectManager::getInstance()->get(DimensionFactory::class);
-     }
- 
-+    /**
-+     * Retrieve urlFinder
-+     *
-+     * @return GalleryReadHandler
-+     */
-+    private function getUrlFinder()
-+    {
-+        if ($this->urlFinder === null) {
-+            $this->urlFinder = ObjectManager::getInstance()->get(DbStorage::class);
-+        }
-+        return $this->urlFinder;
-+    }
-+
-     /**
-      * Get cloned Select after dispatching 'catalog_prepare_price_select' event
-      *
-@@ -434,7 +461,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-      */
-     public function getPriceExpression($select)
-     {
--        //@todo: Add caching of price expresion
-+        //@todo: Add caching of price expression
-         $this->_preparePriceExpressionParameters($select);
-         return $this->_priceExpression;
-     }
-@@ -474,8 +501,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     }
- 
-     /**
--     * Retrieve is flat enabled flag
--     * Return always false if magento run admin
-+     * Retrieve is flat enabled. Return always false if magento run admin.
-      *
-      * @return bool
-      */
-@@ -506,8 +532,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     }
- 
-     /**
--     * Standard resource collection initialization
--     * Needed for child classes
-+     * Standard resource collection initialization. Needed for child classes.
-      *
-      * @param string $model
-      * @param string $entityModel
-@@ -546,14 +571,16 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     }
- 
-     /**
--     * Retrieve collection empty item
--     * Redeclared for specifying id field name without getting resource model inside model
-+     * Get collection empty item. Redeclared for specifying id field name without getting resource model inside model.
-      *
-      * @return \Magento\Framework\DataObject
-      */
-     public function getNewEmptyItem()
-     {
--        $object = parent::getNewEmptyItem();
-+        if (null === $this->emptyItem) {
-+            $this->emptyItem = parent::getNewEmptyItem();
-+        }
-+        $object = clone $this->emptyItem;
-         if ($this->isEnabledFlat()) {
-             $object->setIdFieldName($this->getEntity()->getIdFieldName());
-         }
-@@ -633,8 +660,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     }
- 
-     /**
--     * Add attribute to entities in collection
--     * If $attribute=='*' select all attributes
-+     * Add attribute to entities in collection. If $attribute=='*' select all attributes.
-      *
-      * @param array|string|integer|\Magento\Framework\App\Config\Element $attribute
-      * @param bool|string $joinType
-@@ -670,8 +696,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     }
- 
-     /**
--     * Processing collection items after loading
--     * Adding url rewrites, minimal prices, final prices, tax percents
-+     * Processing collection items after loading. Adding url rewrites, minimal prices, final prices, tax percents.
-      *
-      * @return $this
-      */
-@@ -682,6 +707,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-         }
- 
-         $this->_prepareUrlDataObject();
-+        $this->prepareStoreId();
- 
-         if (count($this)) {
-             $this->_eventManager->dispatch('catalog_product_collection_load_after', ['collection' => $this]);
-@@ -690,6 +716,23 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-         return $this;
-     }
- 
-+    /**
-+     * Add Store ID to products from collection.
-+     *
-+     * @return $this
-+     */
-+    protected function prepareStoreId()
-+    {
-+        if ($this->getStoreId() !== null) {
-+            /** @var $item \Magento\Catalog\Model\Product */
-+            foreach ($this->_items as $item) {
-+                $item->setStoreId($this->getStoreId());
-+            }
-+        }
-+
-+        return $this;
-+    }
-+
-     /**
-      * Prepare Url Data object
-      *
-@@ -756,8 +799,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     }
- 
-     /**
--     * Adding product website names to result collection
--     * Add for each product websites information
-+     * Adding product website names to result collection. Add for each product websites information.
-      *
-      * @return $this
-      */
-@@ -768,7 +810,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function load($printQuery = false, $logQuery = false)
-     {
-@@ -784,7 +826,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     }
- 
-     /**
--     * Processs adding product website names to result collection
-+     * Process adding product website names to result collection
-      *
-      * @return $this
-      */
-@@ -819,14 +861,14 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-         foreach ($this as $product) {
-             if (isset($productWebsites[$product->getId()])) {
-                 $product->setData('websites', $productWebsites[$product->getId()]);
-+                $product->setData('website_ids', $productWebsites[$product->getId()]);
-             }
-         }
-         return $this;
-     }
- 
-     /**
--     * Add store availability filter. Include availability product
--     * for store website
-+     * Add store availability filter. Include availability product for store website.
-      *
-      * @param null|string|bool|int|Store $store
-      * @return $this
-@@ -1115,11 +1157,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     /**
-      * Get SQL for get record count
-      *
--     * @param null $select
-+     * @param Select $select
-      * @param bool $resetLeftJoins
--     * @return \Magento\Framework\DB\Select
-+     * @return Select
-      */
--    protected function _getSelectCountSql($select = null, $resetLeftJoins = true)
-+    protected function _getSelectCountSql(?Select $select = null, $resetLeftJoins = true)
-     {
-         $this->_renderFilters();
-         $countSelect = $select === null ? $this->_getClearSelect() : $this->_buildClearSelect($select);
-@@ -1357,8 +1399,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     }
- 
-     /**
--     * Add URL rewrites data to product
--     * If collection loadded - run processing else set flag
-+     * Add URL rewrites data to product. If collection loadded - run processing else set flag.
-      *
-      * @param int|string $categoryId
-      * @return $this
-@@ -1395,39 +1436,21 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-         foreach ($this->getItems() as $item) {
-             $productIds[] = $item->getEntityId();
-         }
--        if (!$productIds) {
--            return;
--        }
--
--        $select = $this->getConnection()
--            ->select()
--            ->from(['u' => $this->getTable('url_rewrite')], ['u.entity_id', 'u.request_path'])
--            ->where('u.store_id = ?', $this->_storeManager->getStore($this->getStoreId())->getId())
--            ->where('u.is_autogenerated = 1')
--            ->where('u.entity_type = ?', ProductUrlRewriteGenerator::ENTITY_TYPE)
--            ->where('u.entity_id IN(?)', $productIds);
- 
-+        $filter = [
-+            'entity_type' => 'product',
-+            'entity_id' => $productIds,
-+            'store_id' => $this->getStoreId(),
-+            'is_autogenerated' => 1
-+        ];
-         if ($this->_urlRewriteCategory) {
--            $select->joinInner(
--                ['cu' => $this->getTable('catalog_url_rewrite_product_category')],
--                'u.url_rewrite_id=cu.url_rewrite_id'
--            )->where('cu.category_id IN (?)', $this->_urlRewriteCategory);
--        }
--
--        // more priority is data with category id
--        $urlRewrites = [];
--
--        foreach ($this->getConnection()->fetchAll($select) as $row) {
--            if (!isset($urlRewrites[$row['entity_id']])) {
--                $urlRewrites[$row['entity_id']] = $row['request_path'];
--            }
-+            $filter['metadata']['category_id'] = $this->_urlRewriteCategory;
-         }
- 
--        foreach ($this->getItems() as $item) {
--            if (isset($urlRewrites[$item->getEntityId()])) {
--                $item->setData('request_path', $urlRewrites[$item->getEntityId()]);
--            } else {
--                $item->setData('request_path', false);
-+        $rewrites = $this->getUrlFinder()->findAllByData($filter);
-+        foreach ($rewrites as $rewrite) {
-+            if ($item = $this->getItemById($rewrite->getEntityId())) {
-+                $item->setData('request_path', $rewrite->getRequestPath());
-             }
-         }
-     }
-@@ -1518,7 +1541,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     /**
-      * Add attribute to filter
-      *
--     * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|string $attribute
-+     * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|string|array $attribute
-      * @param array $condition
-      * @param string $joinType
-      * @return $this
-@@ -1555,33 +1578,17 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-         $this->_allIdsCache = null;
- 
-         if (is_string($attribute) && $attribute == 'is_saleable') {
--            $columns = $this->getSelect()->getPart(\Magento\Framework\DB\Select::COLUMNS);
--            foreach ($columns as $columnEntry) {
--                list($correlationName, $column, $alias) = $columnEntry;
--                if ($alias == 'is_saleable') {
--                    if ($column instanceof \Zend_Db_Expr) {
--                        $field = $column;
--                    } else {
--                        $connection = $this->getSelect()->getConnection();
--                        if (empty($correlationName)) {
--                            $field = $connection->quoteColumnAs($column, $alias, true);
--                        } else {
--                            $field = $connection->quoteColumnAs([$correlationName, $column], $alias, true);
--                        }
--                    }
--                    $this->getSelect()->where("{$field} = ?", $condition);
--                    break;
--                }
--            }
--
--            return $this;
-+            $this->addIsSaleableAttributeToFilter($condition);
-+        } elseif (is_string($attribute) && $attribute == 'tier_price') {
-+            $this->addTierPriceAttributeToFilter($attribute, $condition);
-         } else {
-             return parent::addAttributeToFilter($attribute, $condition, $joinType);
-         }
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @since 101.0.0
-      */
-     protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $entity)
-@@ -1792,7 +1799,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-             }
-             $conditions[] = $this->getConnection()->quoteInto(
-                 'product_website.website_id IN(?)',
--                $filters['website_ids']
-+                $filters['website_ids'],
-+                'int'
-             );
-         } elseif (isset(
-             $filters['store_id']
-@@ -1804,7 +1812,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-         ) {
-             $joinWebsite = true;
-             $websiteId = $this->_storeManager->getStore($filters['store_id'])->getWebsiteId();
--            $conditions[] = $this->getConnection()->quoteInto('product_website.website_id = ?', $websiteId);
-+            $conditions[] = $this->getConnection()->quoteInto('product_website.website_id = ?', $websiteId, 'int');
-         }
- 
-         $fromPart = $this->getSelect()->getPart(\Magento\Framework\DB\Select::FROM);
-@@ -1947,7 +1955,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-             }
-             // Set additional field filters
-             foreach ($this->_priceDataFieldFilters as $filterData) {
--                $select->where(call_user_func_array('sprintf', $filterData));
-+                $select->where(sprintf(...$filterData));
-             }
-         } else {
-             $fromPart['price_index']['joinCondition'] = $joinCond;
-@@ -2000,12 +2008,16 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
- 
-         $conditions = [
-             'cat_index.product_id=e.entity_id',
--            $this->getConnection()->quoteInto('cat_index.store_id=?', $filters['store_id']),
-+            $this->getConnection()->quoteInto('cat_index.store_id=?', $filters['store_id'], 'int'),
-         ];
-         if (isset($filters['visibility']) && !isset($filters['store_table'])) {
--            $conditions[] = $this->getConnection()->quoteInto('cat_index.visibility IN(?)', $filters['visibility']);
-+            $conditions[] = $this->getConnection()->quoteInto(
-+                'cat_index.visibility IN(?)',
-+                $filters['visibility'],
-+                'int'
-+            );
-         }
--        $conditions[] = $this->getConnection()->quoteInto('cat_index.category_id=?', $filters['category_id']);
-+        $conditions[] = $this->getConnection()->quoteInto('cat_index.category_id=?', $filters['category_id'], 'int');
-         if (isset($filters['category_is_anchor'])) {
-             $conditions[] = $this->getConnection()->quoteInto('cat_index.is_parent=?', $filters['category_is_anchor']);
-         }
-@@ -2188,7 +2200,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-             $this->getLinkField() . ' IN(?)',
-             $productIds
-         )->order(
--            $this->getLinkField()
-+            'qty'
-         );
-         return $select;
-     }
-@@ -2248,7 +2260,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     public function addPriceDataFieldFilter($comparisonFormat, $fields)
-     {
-         if (!preg_match('/^%s( (<|>|=|<=|>=|<>) %s)*$/', $comparisonFormat)) {
--            throw new \Exception('Invalid comparison format.');
-+            throw new \InvalidArgumentException('Invalid comparison format.');
-         }
- 
-         if (!is_array($fields)) {
-@@ -2343,7 +2355,10 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
-     }
- 
-     /**
-+     * Retrieve Media gallery resource.
-+     *
-      * @deprecated 101.0.1
-+     *
-      * @return \Magento\Catalog\Model\ResourceModel\Product\Gallery
-      */
-     private function getMediaGalleryResource()
-@@ -2449,4 +2464,71 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
- 
-         return $this->_pricesCount;
-     }
-+
-+    /**
-+     * Add is_saleable attribute to filter
-+     *
-+     * @param array|null $condition
-+     * @return $this
-+     */
-+    private function addIsSaleableAttributeToFilter(?array $condition): self
-+    {
-+        $columns = $this->getSelect()->getPart(Select::COLUMNS);
-+        foreach ($columns as $columnEntry) {
-+            list($correlationName, $column, $alias) = $columnEntry;
-+            if ($alias == 'is_saleable') {
-+                if ($column instanceof \Zend_Db_Expr) {
-+                    $field = $column;
-+                } else {
-+                    $connection = $this->getSelect()->getConnection();
-+                    if (empty($correlationName)) {
-+                        $field = $connection->quoteColumnAs($column, $alias, true);
-+                    } else {
-+                        $field = $connection->quoteColumnAs([$correlationName, $column], $alias, true);
-+                    }
-+                }
-+                $this->getSelect()->where("{$field} = ?", $condition);
-+                break;
-+            }
-+        }
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * Add tier price attribute to filter
-+     *
-+     * @param string $attribute
-+     * @param array|null $condition
-+     * @return $this
-+     */
-+    private function addTierPriceAttributeToFilter(string $attribute, ?array $condition): self
-+    {
-+        $attrCode = $attribute;
-+        $connection = $this->getConnection();
-+        $attrTable = $this->_getAttributeTableAlias($attrCode);
-+        $entity = $this->getEntity();
-+        $fKey = 'e.' . $this->getEntityPkName($entity);
-+        $pKey = $attrTable . '.' . $this->getEntityPkName($entity);
-+        $attribute = $entity->getAttribute($attrCode);
-+        $attrFieldName = $attrTable . '.value';
-+        $fKey = $connection->quoteColumnAs($fKey, null);
-+        $pKey = $connection->quoteColumnAs($pKey, null);
-+
-+        $condArr = ["{$pKey} = {$fKey}"];
-+        $this->getSelect()->join(
-+            [$attrTable => $this->getTable('catalog_product_entity_tier_price')],
-+            '(' . implode(') AND (', $condArr) . ')',
-+            [$attrCode => $attrFieldName]
-+        );
-+        $this->removeAttributeToSelect($attrCode);
-+        $this->_filterAttributes[$attrCode] = $attribute->getId();
-+        $this->_joinFields[$attrCode] = ['table' => '', 'field' => $attrFieldName];
-+        $field = $this->_getAttributeTableAlias($attrCode) . '.value';
-+        $conditionSql = $this->_getConditionSql($field, $condition);
-+        $this->getSelect()->where($conditionSql, null, Select::TYPE_CONDITION);
-+        $this->_totalRecords = null;
-+
-+        return $this;
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php
-index 7c78dbca5a0..dc3411743a0 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php
-@@ -12,6 +12,7 @@ namespace Magento\Catalog\Model\ResourceModel\Product\Compare\Item;
-  * @author      Magento Core Team <core@magentocommerce.com>
-  * @SuppressWarnings(PHPMD.LongVariable)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @since 100.0.2
-  */
- class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-@@ -63,7 +64,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
-@@ -75,7 +76,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      * @param \Magento\Catalog\Model\ResourceModel\Product\Compare\Item $catalogProductCompareItem
-      * @param \Magento\Catalog\Helper\Product\Compare $catalogProductCompare
-      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
--     *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -89,7 +89,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-         \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
-@@ -403,6 +403,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
- 
-     /**
-      * Retrieve is flat enabled flag
-+     *
-      * Overwrite disable flat for compared item if required EAV resource
-      *
-      * @return bool
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
-index 2868392f852..a9741cd8e1e 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Catalog\Model\ResourceModel\Product;
- 
- use Magento\Store\Model\Store;
-@@ -49,7 +50,8 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @since 101.0.0
-      */
-     protected function _construct()
-@@ -58,7 +60,8 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @since 101.0.0
-      */
-     public function getConnection()
-@@ -67,6 +70,8 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Load data from table by valueId
-+     *
-      * @param string $tableNameAlias
-      * @param array $ids
-      * @param int|null $storeId
-@@ -111,6 +116,8 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Load product gallery by attributeId
-+     *
-      * @param \Magento\Catalog\Model\Product $product
-      * @param int $attributeId
-      * @return array
-@@ -132,6 +139,8 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Create base load select
-+     *
-      * @param int $entityId
-      * @param int $storeId
-      * @param int $attributeId
-@@ -141,7 +150,7 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      */
-     protected function createBaseLoadSelect($entityId, $storeId, $attributeId)
-     {
--        $select =  $this->createBatchBaseSelect($storeId, $attributeId);
-+        $select = $this->createBatchBaseSelect($storeId, $attributeId);
- 
-         $select = $select->where(
-             'entity.' . $this->metadata->getLinkField() . ' = ?',
-@@ -151,6 +160,8 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Create batch base select
-+     *
-      * @param int $storeId
-      * @param int $attributeId
-      * @return \Magento\Framework\DB\Select
-@@ -190,7 +201,7 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-                     'value.' . $linkField . ' = entity.' . $linkField,
-                 ]
-             ),
--            ['label', 'position', 'disabled']
-+            []
-         )->joinLeft(
-             ['default_value' => $this->getTable(self::GALLERY_VALUE_TABLE)],
-             implode(
-@@ -201,8 +212,15 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-                     'default_value.' . $linkField . ' = entity.' . $linkField,
-                 ]
-             ),
--            ['label_default' => 'label', 'position_default' => 'position', 'disabled_default' => 'disabled']
--        )->where(
-+            []
-+        )->columns([
-+            'label' => $this->getConnection()->getIfNullSql('`value`.`label`', '`default_value`.`label`'),
-+            'position' => $this->getConnection()->getIfNullSql('`value`.`position`', '`default_value`.`position`'),
-+            'disabled' => $this->getConnection()->getIfNullSql('`value`.`disabled`', '`default_value`.`disabled`'),
-+            'label_default' => 'default_value.label',
-+            'position_default' => 'default_value.position',
-+            'disabled_default' => 'default_value.disabled'
-+        ])->where(
-             $mainTableAlias . '.attribute_id = ?',
-             $attributeId
-         )->where(
-@@ -240,6 +258,8 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Get main table alias
-+     *
-      * @return string
-      * @since 101.0.0
-      */
-@@ -249,6 +269,8 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Bind value to entity
-+     *
-      * @param int $valueId
-      * @param int $entityId
-      * @return int
-@@ -266,6 +288,8 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Save data row
-+     *
-      * @param string $table
-      * @param array $data
-      * @param array $fields
-@@ -355,9 +379,9 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-         $conditions = implode(
-             ' AND ',
-             [
--                $this->getConnection()->quoteInto('value_id = ?', (int) $valueId),
--                $this->getConnection()->quoteInto($this->metadata->getLinkField() . ' = ?', (int) $entityId),
--                $this->getConnection()->quoteInto('store_id = ?', (int) $storeId)
-+                $this->getConnection()->quoteInto('value_id = ?', (int)$valueId),
-+                $this->getConnection()->quoteInto($this->metadata->getLinkField() . ' = ?', (int)$entityId),
-+                $this->getConnection()->quoteInto('store_id = ?', (int)$storeId)
-             ]
-         );
- 
-@@ -385,7 +409,7 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- 
-         $select = $this->getConnection()->select()->from(
-             [$this->getMainTableAlias() => $this->getMainTable()],
--            ['value_id', 'value']
-+            ['value_id', 'value', 'media_type', 'disabled']
-         )->joinInner(
-             ['entity' => $this->getTable(self::GALLERY_VALUE_TO_ENTITY_TABLE)],
-             $this->getMainTableAlias() . '.value_id = entity.value_id',
-@@ -402,16 +426,16 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- 
-         // Duplicate main entries of gallery
-         foreach ($this->getConnection()->fetchAll($select) as $row) {
--            $data = [
--                'attribute_id' => $attributeId,
--                'value' => isset($newFiles[$row['value_id']]) ? $newFiles[$row['value_id']] : $row['value'],
--            ];
-+            $data = $row;
-+            $data['attribute_id'] = $attributeId;
-+            $data['value'] = $newFiles[$row['value_id']] ?? $row['value'];
-+            unset($data['value_id']);
- 
-             $valueIdMap[$row['value_id']] = $this->insertGallery($data);
-             $this->bindValueToEntity($valueIdMap[$row['value_id']], $newProductId);
-         }
- 
--        if (count($valueIdMap) == 0) {
-+        if (count($valueIdMap) === 0) {
-             return [];
-         }
- 
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
-index 123f358be40..0f324194b7f 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
-@@ -12,6 +12,9 @@ use Magento\Framework\DB\Query\Generator;
- use Magento\Framework\DB\Select;
- use Magento\Framework\App\ResourceConnection;
- 
-+/**
-+ * Class for retrieval of all product images
-+ */
- class Image
- {
-     /**
-@@ -51,7 +54,7 @@ class Image
-     }
- 
-     /**
--     * Returns product images
-+     * Get all product images.
-      *
-      * @return \Generator
-      */
-@@ -72,16 +75,63 @@ class Image
-     }
- 
-     /**
--     * Get the number of unique pictures of products
-+     * Get used product images.
-+     *
-+     * @return \Generator
-+     */
-+    public function getUsedProductImages(): \Generator
-+    {
-+        $batchSelectIterator = $this->batchQueryGenerator->generate(
-+            'value_id',
-+            $this->getUsedImagesSelect(),
-+            $this->batchSize,
-+            \Magento\Framework\DB\Query\BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
-+        );
-+
-+        foreach ($batchSelectIterator as $select) {
-+            foreach ($this->connection->fetchAll($select) as $key => $value) {
-+                yield $key => $value;
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Get the number of unique images of products.
-+     *
-      * @return int
-      */
-     public function getCountAllProductImages(): int
-     {
--        $select = $this->getVisibleImagesSelect()->reset('columns')->columns('count(*)');
-+        $select = $this->getVisibleImagesSelect()
-+            ->reset('columns')
-+            ->reset('distinct')
-+            ->columns(
-+                new \Zend_Db_Expr('count(distinct value)')
-+            );
-+
-         return (int) $this->connection->fetchOne($select);
-     }
- 
-     /**
-+     * Get the number of unique and used images of products.
-+     *
-+     * @return int
-+     */
-+    public function getCountUsedProductImages(): int
-+    {
-+        $select = $this->getUsedImagesSelect()
-+            ->reset('columns')
-+            ->reset('distinct')
-+            ->columns(
-+                new \Zend_Db_Expr('count(distinct value)')
-+            );
-+
-+        return (int) $this->connection->fetchOne($select);
-+    }
-+
-+    /**
-+     * Return select to fetch all products images.
-+     *
-      * @return Select
-      */
-     private function getVisibleImagesSelect(): Select
-@@ -94,4 +144,24 @@ class Image
-                 'disabled = 0'
-             );
-     }
-+
-+    /**
-+     * Return select to fetch all used product images.
-+     *
-+     * @return Select
-+     */
-+    private function getUsedImagesSelect(): Select
-+    {
-+        return $this->connection->select()->distinct()
-+            ->from(
-+                ['images' => $this->resourceConnection->getTableName(Gallery::GALLERY_TABLE)],
-+                'value as filepath'
-+            )->joinInner(
-+                ['image_value' => $this->resourceConnection->getTableName(Gallery::GALLERY_VALUE_TABLE)],
-+                'images.value_id = image_value.value_id',
-+                []
-+            )->where(
-+                'images.disabled = 0 AND image_value.disabled = 0'
-+            );
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
-index c33ea7c781a..e024f0d30f1 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
-@@ -24,13 +24,11 @@ abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\
-     protected $_eventManager = null;
- 
-     /**
--     * AbstractEav constructor.
-      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
-      * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy
-      * @param \Magento\Eav\Model\Config $eavConfig
-      * @param \Magento\Framework\Event\ManagerInterface $eventManager
--     * @param null $connectionName
--     * @param \Magento\Indexer\Model\Indexer\StateFactory|null $stateFactory
-+     * @param string $connectionName
-      */
-     public function __construct(
-         \Magento\Framework\Model\ResourceModel\Db\Context $context,
-@@ -70,7 +68,6 @@ abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\
-     /**
-      * Rebuild index data by entities
-      *
--     *
-      * @param int|array $processIds
-      * @return $this
-      * @throws \Exception
-@@ -88,8 +85,8 @@ abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\
- 
-     /**
-      * Rebuild index data by attribute id
--     * If attribute is not indexable remove data by attribute
-      *
-+     * If attribute is not indexable remove data by attribute
-      *
-      * @param int $attributeId
-      * @param bool $isIndexable
-@@ -245,7 +242,8 @@ abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\
- 
-     /**
-      * Retrieve condition for retrieve indexable attribute select
--     * the catalog/eav_attribute table must have alias is ca
-+     *
-+     * The catalog/eav_attribute table must have alias is ca
-      *
-      * @return string
-      */
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
-index 5b68730209b..7730d7cc9a7 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
-@@ -7,6 +7,7 @@ namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav;
- 
- use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
- use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\Data\ProductAttributeInterface;
- 
- /**
-  * Catalog Product Eav Select and Multiply Select Attributes Indexer resource model
-@@ -24,6 +25,16 @@ class Source extends AbstractEav
-      */
-     protected $_resourceHelper;
- 
-+    /**
-+     * @var \Magento\Eav\Api\AttributeRepositoryInterface
-+     */
-+    private $attributeRepository;
-+
-+    /**
-+     * @var \Magento\Framework\Api\SearchCriteriaBuilder
-+     */
-+    private $criteriaBuilder;
-+
-     /**
-      * Construct
-      *
-@@ -33,6 +44,8 @@ class Source extends AbstractEav
-      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-      * @param null|string $connectionName
-+     * @param \Magento\Eav\Api\AttributeRepositoryInterface|null $attributeRepository
-+     * @param \Magento\Framework\Api\SearchCriteriaBuilder|null $criteriaBuilder
-      */
-     public function __construct(
-         \Magento\Framework\Model\ResourceModel\Db\Context $context,
-@@ -40,7 +53,9 @@ class Source extends AbstractEav
-         \Magento\Eav\Model\Config $eavConfig,
-         \Magento\Framework\Event\ManagerInterface $eventManager,
-         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
--        $connectionName = null
-+        $connectionName = null,
-+        \Magento\Eav\Api\AttributeRepositoryInterface $attributeRepository = null,
-+        \Magento\Framework\Api\SearchCriteriaBuilder $criteriaBuilder = null
-     ) {
-         parent::__construct(
-             $context,
-@@ -50,6 +65,12 @@ class Source extends AbstractEav
-             $connectionName
-         );
-         $this->_resourceHelper = $resourceHelper;
-+        $this->attributeRepository = $attributeRepository
-+            ?: \Magento\Framework\App\ObjectManager::getInstance()
-+                ->get(\Magento\Eav\Api\AttributeRepositoryInterface::class);
-+        $this->criteriaBuilder = $criteriaBuilder
-+            ?: \Magento\Framework\App\ObjectManager::getInstance()
-+                ->get(\Magento\Framework\Api\SearchCriteriaBuilder::class);
-     }
- 
-     /**
-@@ -84,7 +105,7 @@ class Source extends AbstractEav
-         if ($multiSelect == true) {
-             $select->where('ea.backend_type = ?', 'varchar')->where('ea.frontend_input = ?', 'multiselect');
-         } else {
--            $select->where('ea.backend_type = ?', 'int')->where('ea.frontend_input = ?', 'select');
-+            $select->where('ea.backend_type = ?', 'int')->where('ea.frontend_input IN( ? )', ['select', 'boolean']);
-         }
- 
-         return $this->getConnection()->fetchCol($select);
-@@ -234,6 +255,10 @@ class Source extends AbstractEav
-             $options[$row['attribute_id']][$row['option_id']] = true;
-         }
- 
-+        // Retrieve any custom source model options
-+        $sourceModelOptions = $this->getMultiSelectAttributeWithSourceModels($attrIds);
-+        $options = array_replace_recursive($options, $sourceModelOptions);
-+
-         // prepare get multiselect values query
-         $productValueExpression = $connection->getCheckSql('pvs.value_id > 0', 'pvs.value', 'pvd.value');
-         $select = $connection->select()->from(
-@@ -297,6 +322,39 @@ class Source extends AbstractEav
-         return $this;
-     }
- 
-+    /**
-+     * Get options for multiselect attributes using custom source models
-+     * Based on @maderlock's fix from:
-+     * https://github.com/magento/magento2/issues/417#issuecomment-265146285
-+     *
-+     * @param array $attrIds
-+     *
-+     * @return array
-+     */
-+    private function getMultiSelectAttributeWithSourceModels($attrIds)
-+    {
-+        // Add options from custom source models
-+        $this->criteriaBuilder
-+                ->addFilter('attribute_id', $attrIds, 'in')
-+                ->addFilter('source_model', true, 'notnull');
-+        $criteria = $this->criteriaBuilder->create();
-+        $attributes = $this->attributeRepository->getList(
-+            ProductAttributeInterface::ENTITY_TYPE_CODE,
-+            $criteria
-+        )->getItems();
-+        
-+        $options = [];
-+        foreach ($attributes as $attribute) {
-+            $sourceModelOptions = $attribute->getOptions();
-+            // Add options to list used below
-+            foreach ($sourceModelOptions as $option) {
-+                $options[$attribute->getAttributeId()][$option->getValue()] = true;
-+            }
-+        }
-+
-+        return $options;
-+    }
-+
-     /**
-      * Save a data to temporary source index table
-      *
-@@ -330,6 +388,8 @@ class Source extends AbstractEav
-     }
- 
-     /**
-+     * Save data from select
-+     *
-      * @param \Magento\Framework\DB\Select $select
-      * @param array $options
-      * @return void
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php
-index 47fc6802d7e..463da8762b7 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php
-@@ -127,6 +127,8 @@ class CustomOptionPriceModifier implements PriceModifierInterface
-     }
- 
-     /**
-+     * Check if custom options exist.
-+     *
-      * @param IndexTableStructure $priceTable
-      * @return bool
-      * @throws \Exception
-@@ -154,6 +156,8 @@ class CustomOptionPriceModifier implements PriceModifierInterface
-     }
- 
-     /**
-+     * Get connection.
-+     *
-      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-      */
-     private function getConnection()
-@@ -211,7 +215,7 @@ class CustomOptionPriceModifier implements PriceModifierInterface
-         } else {
-             $select->joinLeft(
-                 ['otps' => $this->getTable('catalog_product_option_type_price')],
--                'otps.option_type_id = otpd.option_type_id AND otpd.store_id = cwd.default_store_id',
-+                'otps.option_type_id = otpd.option_type_id AND otps.store_id = cwd.default_store_id',
-                 []
-             );
- 
-@@ -373,6 +377,8 @@ class CustomOptionPriceModifier implements PriceModifierInterface
-     }
- 
-     /**
-+     * Get select for update.
-+     *
-      * @param string $sourceTable
-      * @return \Magento\Framework\DB\Select
-      */
-@@ -402,6 +408,8 @@ class CustomOptionPriceModifier implements PriceModifierInterface
-     }
- 
-     /**
-+     * Get table name.
-+     *
-      * @param string $tableName
-      * @return string
-      */
-@@ -411,6 +419,8 @@ class CustomOptionPriceModifier implements PriceModifierInterface
-     }
- 
-     /**
-+     * Is price scope global.
-+     *
-      * @return bool
-      */
-     private function isPriceGlobal(): bool
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
-index 168fa8f50ac..9643f4c3a71 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
-@@ -10,6 +10,7 @@ use Magento\Framework\Indexer\DimensionalIndexerInterface;
- 
- /**
-  * Default Product Type Price Indexer Resource model
-+ *
-  * For correctly work need define product type id
-  *
-  * @api
-@@ -39,7 +40,7 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
-     /**
-      * Core data
-      *
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-@@ -72,7 +73,7 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
-      * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy
-      * @param \Magento\Eav\Model\Config $eavConfig
-      * @param \Magento\Framework\Event\ManagerInterface $eventManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param string|null $connectionName
-      * @param IndexTableStructureFactory $indexTableStructureFactory
-      * @param PriceModifierInterface[] $priceModifiers
-@@ -82,7 +83,7 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
-         \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy,
-         \Magento\Eav\Model\Config $eavConfig,
-         \Magento\Framework\Event\ManagerInterface $eventManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         $connectionName = null,
-         IndexTableStructureFactory $indexTableStructureFactory = null,
-         array $priceModifiers = []
-@@ -208,6 +209,8 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
-     }
- 
-     /**
-+     * Reindex prices.
-+     *
-      * @param null|int|array $entityIds
-      * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
-      */
-@@ -256,7 +259,8 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
-         $tableName = $this->_getDefaultFinalPriceTable();
-         $this->getConnection()->delete($tableName);
- 
--        $finalPriceTable = $this->indexTableStructureFactory->create([
-+        $finalPriceTable = $this->indexTableStructureFactory->create(
-+            [
-             'tableName' => $tableName,
-             'entityField' => 'entity_id',
-             'customerGroupField' => 'customer_group_id',
-@@ -267,7 +271,8 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
-             'minPriceField' => 'min_price',
-             'maxPriceField' => 'max_price',
-             'tierPriceField' => 'tier_price',
--        ]);
-+            ]
-+        );
- 
-         return $finalPriceTable;
-     }
-@@ -462,11 +467,13 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
-         );
-         $tierPrice = $this->getTotalTierPriceExpression($price);
-         $tierPriceExpr = $connection->getIfNullSql($tierPrice, $maxUnsignedBigint);
--        $finalPrice = $connection->getLeastSql([
-+        $finalPrice = $connection->getLeastSql(
-+            [
-             $price,
-             $specialPriceExpr,
-             $tierPriceExpr,
--        ]);
-+            ]
-+        );
- 
-         $select->columns(
-             [
-@@ -604,7 +611,7 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
-             []
-         )->joinLeft(
-             ['otps' => $this->getTable('catalog_product_option_type_price')],
--            'otps.option_type_id = otpd.option_type_id AND otpd.store_id = cs.store_id',
-+            'otps.option_type_id = otpd.option_type_id AND otps.store_id = cs.store_id',
-             []
-         )->group(
-             ['i.entity_id', 'i.customer_group_id', 'i.website_id', 'o.option_id']
-@@ -802,6 +809,8 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
-     }
- 
-     /**
-+     * Check if product exists.
-+     *
-      * @return bool
-      */
-     protected function hasEntity()
-@@ -823,6 +832,8 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
-     }
- 
-     /**
-+     * Get total tier price expression.
-+     *
-      * @param \Zend_Db_Expr $priceExpression
-      * @return \Zend_Db_Expr
-      */
-@@ -841,7 +852,8 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
-                 ]
-             ),
-             'NULL',
--            $this->getConnection()->getLeastSql([
-+            $this->getConnection()->getLeastSql(
-+                [
-                 $this->getConnection()->getIfNullSql(
-                     $this->getTierPriceExpressionForTable('tier_price_1', $priceExpression),
-                     $maxUnsignedBigint
-@@ -858,11 +870,14 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
-                     $this->getTierPriceExpressionForTable('tier_price_4', $priceExpression),
-                     $maxUnsignedBigint
-                 ),
--            ])
-+                ]
-+            )
-         );
-     }
- 
-     /**
-+     * Get tier price expression for table.
-+     *
-      * @param string $tableAlias
-      * @param \Zend_Db_Expr $priceExpression
-      * @return \Zend_Db_Expr
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
-index 0005ac8dea5..a3f463d53e7 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
-@@ -16,6 +16,7 @@ use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
- 
- /**
-  * Prepare base select for Product Price index limited by specified dimensions: website and customer group
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class BaseFinalPrice
-@@ -36,7 +37,7 @@ class BaseFinalPrice
-     private $joinAttributeProcessor;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     private $moduleManager;
- 
-@@ -66,16 +67,17 @@ class BaseFinalPrice
-     private $metadataPool;
- 
-     /**
--     * BaseFinalPrice constructor.
-      * @param \Magento\Framework\App\ResourceConnection $resource
-      * @param JoinAttributeProcessor $joinAttributeProcessor
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
-      * @param string $connectionName
-      */
-     public function __construct(
-         \Magento\Framework\App\ResourceConnection $resource,
-         JoinAttributeProcessor $joinAttributeProcessor,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Framework\Event\ManagerInterface $eventManager,
-         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
-         $connectionName = 'indexer'
-@@ -89,6 +91,8 @@ class BaseFinalPrice
-     }
- 
-     /**
-+     * Build query for base final price.
-+     *
-      * @param Dimension[] $dimensions
-      * @param string $productType
-      * @param array $entityIds
-@@ -196,11 +200,13 @@ class BaseFinalPrice
-         );
-         $tierPrice = $this->getTotalTierPriceExpression($price);
-         $tierPriceExpr = $connection->getIfNullSql($tierPrice, $maxUnsignedBigint);
--        $finalPrice = $connection->getLeastSql([
-+        $finalPrice = $connection->getLeastSql(
-+            [
-             $price,
-             $specialPriceExpr,
-             $tierPriceExpr,
--        ]);
-+            ]
-+        );
- 
-         $select->columns(
-             [
-@@ -217,11 +223,8 @@ class BaseFinalPrice
-         $select->where("e.type_id = ?", $productType);
- 
-         if ($entityIds !== null) {
--            if (count($entityIds) > 1) {
--                $select->where(sprintf('e.entity_id BETWEEN %s AND %s', min($entityIds), max($entityIds)));
--            } else {
--                $select->where('e.entity_id = ?', $entityIds);
--            }
-+            $select->where(sprintf('e.entity_id BETWEEN %s AND %s', min($entityIds), max($entityIds)));
-+            $select->where('e.entity_id IN(?)', $entityIds);
-         }
- 
-         /**
-@@ -261,7 +264,8 @@ class BaseFinalPrice
-                 ]
-             ),
-             'NULL',
--            $this->getConnection()->getLeastSql([
-+            $this->getConnection()->getLeastSql(
-+                [
-                 $this->getConnection()->getIfNullSql(
-                     $this->getTierPriceExpressionForTable('tier_price_1', $priceExpression),
-                     $maxUnsignedBigint
-@@ -278,14 +282,15 @@ class BaseFinalPrice
-                     $this->getTierPriceExpressionForTable('tier_price_4', $priceExpression),
-                     $maxUnsignedBigint
-                 ),
--            ])
-+                ]
-+            )
-         );
-     }
- 
-     /**
-      * Get tier price expression for table
-      *
--     * @param $tableAlias
-+     * @param string $tableAlias
-      * @param \Zend_Db_Expr $priceExpression
-      * @return \Zend_Db_Expr
-      */
-@@ -305,7 +310,7 @@ class BaseFinalPrice
-     /**
-      * Get connection
-      *
--     * return \Magento\Framework\DB\Adapter\AdapterInterface
-+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
-      * @throws \DomainException
-      */
-     private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
-index 54673cb01bb..89daab28859 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
-@@ -30,7 +30,7 @@ class TemporaryTableStrategy implements \Magento\Framework\Indexer\Table\Strateg
- 
-     /**
-      * TemporaryTableStrategy constructor.
--     * @param \Magento\Framework\Indexer\Table\Strategy $strategy
-+     * @param \Magento\Framework\Indexer\Table\StrategyInterface $strategy
-      * @param \Magento\Framework\App\ResourceConnection $resource
-      */
-     public function __construct(
-@@ -66,9 +66,10 @@ class TemporaryTableStrategy implements \Magento\Framework\Indexer\Table\Strateg
-     }
- 
-     /**
--     * Create temporary index table based on memory table
-+     * Create temporary index table based on memory table{@inheritdoc}
-      *
--     * {@inheritdoc}
-+     * @param string $tablePrefix
-+     * @return string
-      */
-     public function prepareTableName($tablePrefix)
-     {
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
-index 024c87c9fc8..a554ff2641d 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
-@@ -60,9 +60,11 @@ class DeleteHandler
-     }
- 
-     /**
-+     * Delete linked product.
-+     *
-      * @param string $entityType
-      * @param object $entity
--     * @return object
-+     * @return void
-      * @throws CouldNotDeleteException
-      * @throws NoSuchEntityException
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
-index 8841b6059c4..841fe17bdcf 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
-@@ -11,6 +11,9 @@ use Magento\Framework\App\ObjectManager;
- use Magento\Framework\DB\Select;
- use Magento\Store\Model\Store;
- 
-+/**
-+ * Provide Select object for retrieve product id with minimal price.
-+ */
- class LinkedProductSelectBuilderByBasePrice implements LinkedProductSelectBuilderInterface
- {
-     /**
-@@ -69,7 +72,7 @@ class LinkedProductSelectBuilderByBasePrice implements LinkedProductSelectBuilde
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function build($productId)
-     {
-@@ -85,7 +88,7 @@ class LinkedProductSelectBuilderByBasePrice implements LinkedProductSelectBuilde
-                 []
-             )->joinInner(
-                 [BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS => $productTable],
--                sprintf('%s.entity_id = link.child_id', BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS, $linkField),
-+                sprintf('%s.entity_id = link.child_id', BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS),
-                 ['entity_id']
-             )->joinInner(
-                 ['t' => $priceAttribute->getBackendTable()],
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
-index 179da06b599..2238ad91550 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
-@@ -6,6 +6,10 @@
- namespace Magento\Catalog\Model\ResourceModel\Product;
- 
- use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\Model\AbstractModel;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Store\Model\Store;
- 
- /**
-  * Catalog product custom option resource model
-@@ -76,10 +80,10 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     /**
-      * Save options store data
-      *
--     * @param \Magento\Framework\Model\AbstractModel $object
-+     * @param AbstractModel $object
-      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      */
--    protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
-+    protected function _afterSave(AbstractModel $object)
-     {
-         $this->_saveValuePrices($object);
-         $this->_saveValueTitles($object);
-@@ -90,136 +94,38 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     /**
-      * Save value prices
-      *
--     * @param \Magento\Framework\Model\AbstractModel $object
-+     * @param AbstractModel $object
-      * @return $this
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
--    protected function _saveValuePrices(\Magento\Framework\Model\AbstractModel $object)
-+    protected function _saveValuePrices(AbstractModel $object)
-     {
--        $priceTable = $this->getTable('catalog_product_option_price');
--        $connection = $this->getConnection();
--
-         /*
-          * Better to check param 'price' and 'price_type' for saving.
-          * If there is not price skip saving price
-          */
--
-         if (in_array($object->getType(), $this->getPriceTypes())) {
--            //save for store_id = 0
-+            // save for store_id = 0
-             if (!$object->getData('scope', 'price')) {
--                $statement = $connection->select()->from(
--                    $priceTable,
--                    'option_id'
--                )->where(
--                    'option_id = ?',
--                    $object->getId()
--                )->where(
--                    'store_id = ?',
--                    \Magento\Store\Model\Store::DEFAULT_STORE_ID
--                );
--                $optionId = $connection->fetchOne($statement);
--
--                if ($optionId) {
--                    $data = $this->_prepareDataForTable(
--                        new \Magento\Framework\DataObject(
--                            ['price' => $object->getPrice(), 'price_type' => $object->getPriceType()]
--                        ),
--                        $priceTable
--                    );
--
--                    $connection->update(
--                        $priceTable,
--                        $data,
--                        [
--                            'option_id = ?' => $object->getId(),
--                            'store_id  = ?' => \Magento\Store\Model\Store::DEFAULT_STORE_ID
--                        ]
--                    );
--                } else {
--                    $data = $this->_prepareDataForTable(
--                        new \Magento\Framework\DataObject(
--                            [
--                                'option_id' => $object->getId(),
--                                'store_id' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
--                                'price' => $object->getPrice(),
--                                'price_type' => $object->getPriceType(),
--                            ]
--                        ),
--                        $priceTable
--                    );
--                    $connection->insert($priceTable, $data);
--                }
-+                $this->savePriceByStore($object, Store::DEFAULT_STORE_ID);
-             }
- 
-             $scope = (int)$this->_config->getValue(
--                \Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
-+                Store::XML_PATH_PRICE_SCOPE,
-                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-             );
- 
--            if ($object->getStoreId() != '0' && $scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE) {
--                $baseCurrency = $this->_config->getValue(
--                    \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
--                    'default'
--                );
--
-+            if ($object->getStoreId() != '0' && $scope == Store::PRICE_SCOPE_WEBSITE) {
-                 $storeIds = $this->_storeManager->getStore($object->getStoreId())->getWebsite()->getStoreIds();
--                if (is_array($storeIds)) {
--                    foreach ($storeIds as $storeId) {
--                        if ($object->getPriceType() == 'fixed') {
--                            $storeCurrency = $this->_storeManager->getStore($storeId)->getBaseCurrencyCode();
--                            $rate = $this->_currencyFactory->create()->load($baseCurrency)->getRate($storeCurrency);
--                            if (!$rate) {
--                                $rate = 1;
--                            }
--                            $newPrice = $object->getPrice() * $rate;
--                        } else {
--                            $newPrice = $object->getPrice();
--                        }
--
--                        $statement = $connection->select()->from(
--                            $priceTable
--                        )->where(
--                            'option_id = ?',
--                            $object->getId()
--                        )->where(
--                            'store_id  = ?',
--                            $storeId
--                        );
--
--                        if ($connection->fetchOne($statement)) {
--                            $data = $this->_prepareDataForTable(
--                                new \Magento\Framework\DataObject(
--                                    ['price' => $newPrice, 'price_type' => $object->getPriceType()]
--                                ),
--                                $priceTable
--                            );
--
--                            $connection->update(
--                                $priceTable,
--                                $data,
--                                ['option_id = ?' => $object->getId(), 'store_id  = ?' => $storeId]
--                            );
--                        } else {
--                            $data = $this->_prepareDataForTable(
--                                new \Magento\Framework\DataObject(
--                                    [
--                                        'option_id' => $object->getId(),
--                                        'store_id' => $storeId,
--                                        'price' => $newPrice,
--                                        'price_type' => $object->getPriceType(),
--                                    ]
--                                ),
--                                $priceTable
--                            );
--                            $connection->insert($priceTable, $data);
--                        }
--                    }
-+                if (empty($storeIds)) {
-+                    return $this;
-                 }
--            } elseif ($scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE && $object->getData('scope', 'price')
--            ) {
--                $connection->delete(
--                    $priceTable,
-+                foreach ($storeIds as $storeId) {
-+                    $newPrice = $this->calculateStorePrice($object, $storeId);
-+                    $this->savePriceByStore($object, (int)$storeId, $newPrice);
-+                }
-+            } elseif ($scope == Store::PRICE_SCOPE_WEBSITE && $object->getData('scope', 'price')) {
-+                $this->getConnection()->delete(
-+                    $this->getTable('catalog_product_option_price'),
-                     ['option_id = ?' => $object->getId(), 'store_id  = ?' => $object->getStoreId()]
-                 );
-             }
-@@ -228,31 +134,114 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-         return $this;
-     }
- 
-+    /**
-+     * Save option price by store
-+     *
-+     * @param AbstractModel $object
-+     * @param int $storeId
-+     * @param float|null $newPrice
-+     */
-+    private function savePriceByStore(AbstractModel $object, int $storeId, float $newPrice = null): void
-+    {
-+        $priceTable = $this->getTable('catalog_product_option_price');
-+        $connection = $this->getConnection();
-+        $price = $newPrice === null ? $object->getPrice() : $newPrice;
-+
-+        $statement = $connection->select()->from($priceTable, 'option_id')
-+            ->where('option_id = ?', $object->getId())
-+            ->where('store_id = ?', $storeId);
-+        $optionId = $connection->fetchOne($statement);
-+
-+        if (!$optionId) {
-+            $data = $this->_prepareDataForTable(
-+                new DataObject(
-+                    [
-+                        'option_id' => $object->getId(),
-+                        'store_id' => $storeId,
-+                        'price' => $price,
-+                        'price_type' => $object->getPriceType(),
-+                    ]
-+                ),
-+                $priceTable
-+            );
-+            $connection->insert($priceTable, $data);
-+        } else {
-+            // skip to update the default price when the store price is saving
-+            if ($storeId === Store::DEFAULT_STORE_ID && (int)$object->getStoreId() !== $storeId) {
-+                return;
-+            }
-+
-+            $data = $this->_prepareDataForTable(
-+                new DataObject(
-+                    [
-+                        'price' => $price,
-+                        'price_type' => $object->getPriceType()
-+                    ]
-+                ),
-+                $priceTable
-+            );
-+
-+            $connection->update(
-+                $priceTable,
-+                $data,
-+                [
-+                    'option_id = ?' => $object->getId(),
-+                    'store_id  = ?' => $storeId
-+                ]
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Calculate price by store
-+     *
-+     * @param AbstractModel $object
-+     * @param int $storeId
-+     * @return float
-+     */
-+    private function calculateStorePrice(AbstractModel $object, int $storeId): float
-+    {
-+        $price = $object->getPrice();
-+        if ($object->getPriceType() == 'fixed') {
-+            $website  = $this->_storeManager->getStore($storeId)->getWebsite();
-+            $websiteBaseCurrency = $this->_config->getValue(
-+                \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-+                ScopeInterface::SCOPE_WEBSITE,
-+                $website
-+            );
-+            $storeCurrency = $this->_storeManager->getStore($storeId)->getBaseCurrencyCode();
-+            $rate = $this->_currencyFactory->create()->load($websiteBaseCurrency)->getRate($storeCurrency);
-+            $price = $object->getPrice() * ($rate ?: 1);
-+        }
-+
-+        return (float)$price;
-+    }
-+
-     /**
-      * Save titles
-      *
--     * @param \Magento\Framework\Model\AbstractModel $object
-+     * @param AbstractModel $object
-      * @return void
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
--    protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $object)
-+    protected function _saveValueTitles(AbstractModel $object)
-     {
-         $connection = $this->getConnection();
-         $titleTableName = $this->getTable('catalog_product_option_title');
--        foreach ([\Magento\Store\Model\Store::DEFAULT_STORE_ID, $object->getStoreId()] as $storeId) {
-+        foreach ([Store::DEFAULT_STORE_ID, $object->getStoreId()] as $storeId) {
-             $existInCurrentStore = $this->getColFromOptionTable($titleTableName, (int)$object->getId(), (int)$storeId);
--            $existInDefaultStore = (int)$storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID ?
-+            $existInDefaultStore = (int)$storeId == Store::DEFAULT_STORE_ID ?
-                 $existInCurrentStore :
-                 $this->getColFromOptionTable(
-                     $titleTableName,
-                     (int)$object->getId(),
--                    \Magento\Store\Model\Store::DEFAULT_STORE_ID
-+                    Store::DEFAULT_STORE_ID
-                 );
- 
-             if ($object->getTitle()) {
-                 $isDeleteStoreTitle = (bool)$object->getData('is_delete_store_title');
-                 if ($existInCurrentStore) {
--                    if ($isDeleteStoreTitle && (int)$storeId != \Magento\Store\Model\Store::DEFAULT_STORE_ID) {
-+                    if ($isDeleteStoreTitle && (int)$storeId != Store::DEFAULT_STORE_ID) {
-                         $connection->delete($titleTableName, ['option_title_id = ?' => $existInCurrentStore]);
-                     } elseif ($object->getStoreId() == $storeId) {
-                         $data = $this->_prepareDataForTable(
-@@ -270,9 +259,9 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-                     }
-                 } else {
-                     // we should insert record into not default store only of if it does not exist in default store
--                    if (($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID && !$existInDefaultStore) ||
-+                    if (($storeId == Store::DEFAULT_STORE_ID && !$existInDefaultStore) ||
-                         (
--                            $storeId != \Magento\Store\Model\Store::DEFAULT_STORE_ID &&
-+                            $storeId != Store::DEFAULT_STORE_ID &&
-                             !$existInCurrentStore &&
-                             !$isDeleteStoreTitle
-                         )
-@@ -291,7 +280,7 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-                     }
-                 }
-             } else {
--                if ($object->getId() && $object->getStoreId() > \Magento\Store\Model\Store::DEFAULT_STORE_ID
-+                if ($object->getId() && $object->getStoreId() > Store::DEFAULT_STORE_ID
-                     && $storeId
-                 ) {
-                     $connection->delete(
-@@ -470,7 +459,7 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-                 'option_title_default.option_id=product_option.option_id',
-                 $connection->quoteInto(
-                     'option_title_default.store_id = ?',
--                    \Magento\Store\Model\Store::DEFAULT_STORE_ID
-+                    Store::DEFAULT_STORE_ID
-                 )
-             ]
-         );
-@@ -517,7 +506,7 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-                 'option_title_default.option_type_id=option_type.option_type_id',
-                 $connection->quoteInto(
-                     'option_title_default.store_id = ?',
--                    \Magento\Store\Model\Store::DEFAULT_STORE_ID
-+                    Store::DEFAULT_STORE_ID
-                 )
-             ]
-         );
-@@ -582,6 +571,8 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Get Metadata Pool
-+     *
-      * @return \Magento\Framework\EntityManager\MetadataPool
-      */
-     private function getMetadataPool()
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
-index ce0a9b6e461..494dbac02d7 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
-@@ -17,11 +17,12 @@ use Magento\Framework\Model\ResourceModel\Db\Context;
- use Magento\Store\Model\ScopeInterface;
- use Magento\Store\Model\Store;
- use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Catalog\Helper\Data;
- 
- /**
-  * Catalog product custom option resource model
-  *
-- * @author      Magento Core Team <core@magentocommerce.com>
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Value extends AbstractDb
- {
-@@ -51,6 +52,11 @@ class Value extends AbstractDb
-      */
-     private $localeFormat;
- 
-+    /**
-+     * @var Data
-+     */
-+    private $dataHelper;
-+
-     /**
-      * Class constructor
-      *
-@@ -59,17 +65,21 @@ class Value extends AbstractDb
-      * @param StoreManagerInterface $storeManager
-      * @param ScopeConfigInterface $config
-      * @param string $connectionName
-+     * @param Data $dataHelper
-      */
-     public function __construct(
-         Context $context,
-         CurrencyFactory $currencyFactory,
-         StoreManagerInterface $storeManager,
-         ScopeConfigInterface $config,
--        $connectionName = null
-+        $connectionName = null,
-+        Data $dataHelper = null
-     ) {
-         $this->_currencyFactory = $currencyFactory;
-         $this->_storeManager = $storeManager;
-         $this->_config = $config;
-+        $this->dataHelper = $dataHelper ?: ObjectManager::getInstance()
-+            ->get(Data::class);
-         parent::__construct($context, $connectionName);
-     }
- 
-@@ -85,6 +95,7 @@ class Value extends AbstractDb
- 
-     /**
-      * Proceed operations after object is saved
-+     *
-      * Save options store data
-      *
-      * @param AbstractModel $object
-@@ -130,7 +141,7 @@ class Value extends AbstractDb
-             $optionTypeId = $this->getConnection()->fetchOne($select);
- 
-             if ($optionTypeId) {
--                if ($object->getStoreId() == '0') {
-+                if ($object->getStoreId() == '0' || $this->dataHelper->isPriceGlobal()) {
-                     $bind = ['price' => $price, 'price_type' => $priceType];
-                     $where = [
-                         'option_type_id = ?' => $optionTypeId,
-@@ -160,19 +171,22 @@ class Value extends AbstractDb
-             && isset($objectPrice)
-             && $object->getStoreId() != Store::DEFAULT_STORE_ID
-         ) {
--            $baseCurrency = $this->_config->getValue(
-+            $website  = $this->_storeManager->getStore($object->getStoreId())->getWebsite();
-+
-+            $websiteBaseCurrency = $this->_config->getValue(
-                 Currency::XML_PATH_CURRENCY_BASE,
--                'default'
-+                ScopeInterface::SCOPE_WEBSITE,
-+                $website
-             );
- 
--            $storeIds = $this->_storeManager->getStore($object->getStoreId())->getWebsite()->getStoreIds();
-+            $storeIds = $website->getStoreIds();
-             if (is_array($storeIds)) {
-                 foreach ($storeIds as $storeId) {
-                     if ($priceType == 'fixed') {
-                         $storeCurrency = $this->_storeManager->getStore($storeId)->getBaseCurrencyCode();
-                         /** @var $currencyModel Currency */
-                         $currencyModel = $this->_currencyFactory->create();
--                        $currencyModel->load($baseCurrency);
-+                        $currencyModel->load($websiteBaseCurrency);
-                         $rate = $currencyModel->getRate($storeCurrency);
-                         if (!$rate) {
-                             $rate = 1;
-diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php
-index c7829ab3a31..c5c656b7265 100644
---- a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php
-+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php
-@@ -13,6 +13,7 @@ use Magento\Framework\DB\Select;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Store\Api\StoreResolverInterface;
- use Magento\Store\Model\Store;
-+use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * Class StatusBaseSelectProcessor
-@@ -30,28 +31,32 @@ class StatusBaseSelectProcessor implements BaseSelectProcessorInterface
-     private $metadataPool;
- 
-     /**
--     * @var StoreResolverInterface
-+     * @var StoreManagerInterface
-      */
--    private $storeResolver;
-+    private $storeManager;
- 
-     /**
-      * @param Config $eavConfig
-      * @param MetadataPool $metadataPool
-      * @param StoreResolverInterface $storeResolver
-+     * @param StoreManagerInterface $storeManager
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         Config $eavConfig,
-         MetadataPool $metadataPool,
--        StoreResolverInterface $storeResolver
-+        StoreResolverInterface $storeResolver,
-+        StoreManagerInterface $storeManager = null
-     ) {
-         $this->eavConfig = $eavConfig;
-         $this->metadataPool = $metadataPool;
--        $this->storeResolver = $storeResolver;
-+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(StoreManagerInterface::class);
-     }
- 
-     /**
--     * @param Select $select
--     * @return Select
-+     * @inheritdoc
-      */
-     public function process(Select $select)
-     {
-@@ -70,7 +75,7 @@ class StatusBaseSelectProcessor implements BaseSelectProcessorInterface
-             ['status_attr' => $statusAttribute->getBackendTable()],
-             "status_attr.{$linkField} = " . self::PRODUCT_TABLE_ALIAS . ".{$linkField}"
-             . ' AND status_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
--            . ' AND status_attr.store_id = ' . $this->storeResolver->getCurrentStoreId(),
-+            . ' AND status_attr.store_id = ' . $this->storeManager->getStore()->getId(),
-             []
-         );
- 
-diff --git a/app/code/Magento/Catalog/Model/Rss/Category.php b/app/code/Magento/Catalog/Model/Rss/Category.php
-index a58569d1b59..653d86b177a 100644
---- a/app/code/Magento/Catalog/Model/Rss/Category.php
-+++ b/app/code/Magento/Catalog/Model/Rss/Category.php
-@@ -6,8 +6,7 @@
- namespace Magento\Catalog\Model\Rss;
- 
- /**
-- * Class Category
-- * @package Magento\Catalog\Model\Rss
-+ * Rss Category model.
-  */
- class Category
- {
-@@ -42,9 +41,11 @@ class Category
-     }
- 
-     /**
-+     * Get products for given category.
-+     *
-      * @param \Magento\Catalog\Model\Category $category
-      * @param int $storeId
--     * @return $this
-+     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-      */
-     public function getProductCollection(\Magento\Catalog\Model\Category $category, $storeId)
-     {
-diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
-index 1eb30ff95a4..8cd61415b95 100644
---- a/app/code/Magento/Catalog/Model/Template/Filter.php
-+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
-@@ -66,7 +66,7 @@ class Filter extends \Magento\Framework\Filter\Template
-      * Set use absolute links flag
-      *
-      * @param bool $flag
--     * @return \Magento\Email\Model\Template\Filter
-+     * @return $this
-      */
-     public function setUseAbsoluteLinks($flag)
-     {
-@@ -76,10 +76,11 @@ class Filter extends \Magento\Framework\Filter\Template
- 
-     /**
-      * Setter whether SID is allowed in store directive
-+     *
-      * Doesn't set anything intentionally, since SID is not allowed in any kind of emails
-      *
-      * @param bool $flag
--     * @return \Magento\Email\Model\Template\Filter
-+     * @return $this
-      */
-     public function setUseSessionInUrl($flag)
-     {
-@@ -132,6 +133,7 @@ class Filter extends \Magento\Framework\Filter\Template
- 
-     /**
-      * Retrieve store URL directive
-+     *
-      * Support url and direct_url properties
-      *
-      * @param array $construction
-diff --git a/app/code/Magento/Catalog/Observer/CategoryProductIndexer.php b/app/code/Magento/Catalog/Observer/CategoryProductIndexer.php
-new file mode 100644
-index 00000000000..ca87efaa874
---- /dev/null
-+++ b/app/code/Magento/Catalog/Observer/CategoryProductIndexer.php
-@@ -0,0 +1,42 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Observer;
-+
-+use Magento\Catalog\Model\Indexer\Category\Product\Processor;
-+use Magento\Framework\Event\Observer;
-+use Magento\Framework\Event\ObserverInterface;
-+
-+/**
-+ * Checks if a category has changed products and depends on indexer configuration.
-+ */
-+class CategoryProductIndexer implements ObserverInterface
-+{
-+    /**
-+     * @var Processor
-+     */
-+    private $processor;
-+
-+    /**
-+     * @param Processor $processor
-+     */
-+    public function __construct(Processor $processor)
-+    {
-+        $this->processor = $processor;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute(Observer $observer): void
-+    {
-+        $productIds = $observer->getEvent()->getProductIds();
-+        if (!empty($productIds) && $this->processor->isIndexerScheduled()) {
-+            $this->processor->markIndexerAsInvalid();
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php b/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
-index a597b8fddda..a898075befd 100644
---- a/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
-+++ b/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
-@@ -3,9 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
-+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
- 
- /**
-  *  Set value for Special Price start date
-@@ -13,21 +16,20 @@ use Magento\Framework\Event\ObserverInterface;
- class SetSpecialPriceStartDate implements ObserverInterface
- {
-     /**
--     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-+     * @var TimezoneInterface
-      */
-     private $localeDate;
- 
-     /**
--     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
--     * @codeCoverageIgnore
-+     * @param TimezoneInterface $localeDate
-      */
--    public function __construct(\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate)
-+    public function __construct(TimezoneInterface $localeDate)
-     {
-         $this->localeDate = $localeDate;
-     }
- 
-     /**
--     * Set the current date to Special Price From attribute if it empty
-+     * Set the current date to Special Price From attribute if it's empty.
-      *
-      * @param \Magento\Framework\Event\Observer $observer
-      * @return $this
-@@ -36,10 +38,9 @@ class SetSpecialPriceStartDate implements ObserverInterface
-     {
-         /** @var  $product \Magento\Catalog\Model\Product */
-         $product = $observer->getEvent()->getProduct();
--        if ($product->getSpecialPrice() && !$product->getSpecialFromDate()) {
--            $product->setData('special_from_date', $this->localeDate->date());
-+        if ($product->getSpecialPrice() && $product->getSpecialFromDate() === null) {
-+            $product->setData('special_from_date', $this->localeDate->date()->setTime(0, 0));
-         }
--
-         return $this;
-     }
- }
-diff --git a/app/code/Magento/Catalog/Plugin/Block/Topmenu.php b/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
-index 8cbe235e05f..35ce327c74e 100644
---- a/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
-+++ b/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
-@@ -14,6 +14,11 @@ use Magento\Framework\Data\Tree\Node;
-  */
- class Topmenu
- {
-+    /**
-+     * Cache tag for menu block
-+     */
-+    private $cacheTag = "top_menu";
-+
-     /**
-      * Catalog category
-      *
-@@ -22,7 +27,7 @@ class Topmenu
-     protected $catalogCategory;
- 
-     /**
--     * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
-+     * @var \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory
-      */
-     private $collectionFactory;
- 
-@@ -40,13 +45,13 @@ class Topmenu
-      * Initialize dependencies.
-      *
-      * @param \Magento\Catalog\Helper\Category $catalogCategory
--     * @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
-+     * @param \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory $categoryCollectionFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
-      */
-     public function __construct(
-         \Magento\Catalog\Helper\Category $catalogCategory,
--        \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
-+        \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory $categoryCollectionFactory,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
-         \Magento\Catalog\Model\Layer\Resolver $layerResolver
-     ) {
-@@ -119,6 +124,7 @@ class Topmenu
-         $subject->addIdentity(Category::CACHE_TAG);
-         $rootId = $this->storeManager->getStore()->getRootCategoryId();
-         $storeId = $this->storeManager->getStore()->getId();
-+        $currentCategory = $this->getCurrentCategory();
-         /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
-         $collection = $this->getCategoryTree($storeId, $rootId);
-         $mapping = [$rootId => $subject->getMenu()];  // use nodes stack to avoid recursion
-@@ -128,6 +134,9 @@ class Topmenu
-             }
-             $subject->addIdentity(Category::CACHE_TAG . '_' . $category->getId());
-         }
-+        if ($currentCategory) {
-+            $subject->addIdentity($this->cacheTag . '_' . Category::CACHE_TAG . '_' . $currentCategory->getId());
-+        }
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Plugin/Framework/App/Action/ContextPlugin.php b/app/code/Magento/Catalog/Plugin/Framework/App/Action/ContextPlugin.php
-new file mode 100644
-index 00000000000..6add542b155
---- /dev/null
-+++ b/app/code/Magento/Catalog/Plugin/Framework/App/Action/ContextPlugin.php
-@@ -0,0 +1,73 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Plugin\Framework\App\Action;
-+
-+use Magento\Catalog\Model\Product\ProductList\Toolbar as ToolbarModel;
-+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
-+use Magento\Catalog\Model\Session as CatalogSession;
-+use Magento\Framework\App\Http\Context as HttpContext;
-+
-+/**
-+ * Before dispatch plugin for all frontend controllers to update http context.
-+ */
-+class ContextPlugin
-+{
-+    /**
-+     * @var ToolbarMemorizer
-+     */
-+    private $toolbarMemorizer;
-+
-+    /**
-+     * @var CatalogSession
-+     */
-+    private $catalogSession;
-+
-+    /**
-+     * @var HttpContext
-+     */
-+    private $httpContext;
-+
-+    /**
-+     * @param ToolbarMemorizer $toolbarMemorizer
-+     * @param CatalogSession $catalogSession
-+     * @param HttpContext $httpContext
-+     */
-+    public function __construct(
-+        ToolbarMemorizer $toolbarMemorizer,
-+        CatalogSession $catalogSession,
-+        HttpContext $httpContext
-+    ) {
-+        $this->toolbarMemorizer = $toolbarMemorizer;
-+        $this->catalogSession = $catalogSession;
-+        $this->httpContext = $httpContext;
-+    }
-+
-+    /**
-+     * Update http context with catalog sensitive information.
-+     *
-+     * @return void
-+     */
-+    public function beforeDispatch()
-+    {
-+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
-+            $params = [
-+                ToolbarModel::ORDER_PARAM_NAME,
-+                ToolbarModel::DIRECTION_PARAM_NAME,
-+                ToolbarModel::MODE_PARAM_NAME,
-+                ToolbarModel::LIMIT_PARAM_NAME
-+            ];
-+            foreach ($params as $param) {
-+                $paramValue = $this->catalogSession->getData($param);
-+                if ($paramValue) {
-+                    $this->httpContext->setValue($param, $paramValue, false);
-+                }
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php b/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php
-index 597a1466a12..eca4d468950 100644
---- a/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php
-+++ b/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php
-@@ -7,6 +7,9 @@ namespace Magento\Catalog\Plugin\Model\Attribute\Backend;
- 
- use Magento\Store\Model\Store;
- 
-+/**
-+ * Attribute validation
-+ */
- class AttributeValidation
- {
-     /**
-@@ -14,6 +17,11 @@ class AttributeValidation
-      */
-     private $storeManager;
- 
-+    /**
-+     * @var array
-+     */
-+    private $allowedEntityTypes;
-+
-     /**
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param array $allowedEntityTypes
-@@ -27,9 +35,12 @@ class AttributeValidation
-     }
- 
-     /**
-+     * Around validate
-+     *
-      * @param \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend $subject
-      * @param \Closure $proceed
-      * @param \Magento\Framework\DataObject $entity
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      * @return bool
-      */
-     public function aroundValidate(
-@@ -41,7 +52,7 @@ class AttributeValidation
-             return $entity instanceof $allowedEntity;
-         }, $this->allowedEntityTypes)));
- 
--        if ($isAllowedType && $this->storeManager->getStore()->getId() !== Store::DEFAULT_STORE_ID) {
-+        if ($isAllowedType && (int) $this->storeManager->getStore()->getId() !== Store::DEFAULT_STORE_ID) {
-             $attrCode = $subject->getAttribute()->getAttributeCode();
-             // Null is meaning "no value" which should be overridden by value from default scope
-             if (array_key_exists($attrCode, $entity->getData()) && $entity->getData($attrCode) === null) {
-diff --git a/app/code/Magento/Catalog/Plugin/Model/Product/Option/UpdateProductCustomOptionsAttributes.php b/app/code/Magento/Catalog/Plugin/Model/Product/Option/UpdateProductCustomOptionsAttributes.php
-new file mode 100644
-index 00000000000..dd750cfbc69
---- /dev/null
-+++ b/app/code/Magento/Catalog/Plugin/Model/Product/Option/UpdateProductCustomOptionsAttributes.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Plugin\Model\Product\Option;
-+
-+/**
-+ * Plugin for updating product 'has_options' and 'required_options' attributes
-+ */
-+class UpdateProductCustomOptionsAttributes
-+{
-+    /**
-+     * @var \Magento\Catalog\Api\ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-+     */
-+    public function __construct(\Magento\Catalog\Api\ProductRepositoryInterface $productRepository)
-+    {
-+        $this->productRepository = $productRepository;
-+    }
-+
-+    /**
-+     * Update product 'has_options' and 'required_options' attributes after option save
-+     *
-+     * @param \Magento\Catalog\Api\ProductCustomOptionRepositoryInterface $subject
-+     * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterface $option
-+     *
-+     * @return \Magento\Catalog\Api\Data\ProductCustomOptionInterface
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterSave(
-+        \Magento\Catalog\Api\ProductCustomOptionRepositoryInterface $subject,
-+        \Magento\Catalog\Api\Data\ProductCustomOptionInterface $option
-+    ) {
-+        $product = $this->productRepository->get($option->getProductSku());
-+        if (!$product->getHasOptions() ||
-+            ($option->getIsRequire() && !$product->getRequiredOptions())) {
-+            $product->setCanSaveCustomOptions(true);
-+            $product->setOptionsSaved(true);
-+            $currentOptions = array_filter($product->getOptions(), function ($iOption) use ($option) {
-+                return $option->getOptionId() != $iOption->getOptionId();
-+            });
-+            $currentOptions[] = $option;
-+            $product->setOptions($currentOptions);
-+            $product->save();
-+        }
-+
-+        return $option;
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
-index dfa06b6ebe6..b942f5570f5 100644
---- a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
-+++ b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
-@@ -8,6 +8,9 @@ namespace Magento\Catalog\Plugin\Model\ResourceModel;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Serialize\SerializerInterface;
- 
-+/**
-+ * Config cache plugin.
-+ */
- class Config
- {
-     /**#@+
-@@ -46,8 +49,10 @@ class Config
-     }
- 
-     /**
-+     * Cache attribute used in listing.
-+     *
-      * @param \Magento\Catalog\Model\ResourceModel\Config $config
--     * @param callable $proceed
-+     * @param \Closure $proceed
-      * @return array
-      */
-     public function aroundGetAttributesUsedInListing(
-@@ -73,8 +78,10 @@ class Config
-     }
- 
-     /**
-+     * Cache attributes used for sorting.
-+     *
-      * @param \Magento\Catalog\Model\ResourceModel\Config $config
--     * @param callable $proceed
-+     * @param \Closure $proceed
-      * @return array
-      */
-     public function aroundGetAttributesUsedForSortBy(
-diff --git a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/ReadSnapshotPlugin.php b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/ReadSnapshotPlugin.php
-index 4dae4ec68ef..ff4d2f93c91 100644
---- a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/ReadSnapshotPlugin.php
-+++ b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/ReadSnapshotPlugin.php
-@@ -58,7 +58,9 @@ class ReadSnapshotPlugin
-         $globalAttributes = [];
-         $attributesMap = [];
-         $eavEntityType = $metadata->getEavEntityType();
--        $attributes = (null === $eavEntityType) ? [] : $this->config->getEntityAttributes($eavEntityType);
-+        $attributes = null === $eavEntityType
-+            ? []
-+            : $this->config->getEntityAttributes($eavEntityType, new \Magento\Framework\DataObject($entityData));
- 
-         /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute */
-         foreach ($attributes as $attribute) {
-diff --git a/app/code/Magento/Catalog/Pricing/Price/BasePrice.php b/app/code/Magento/Catalog/Pricing/Price/BasePrice.php
-index 54a13be864d..77368517a31 100644
---- a/app/code/Magento/Catalog/Pricing/Price/BasePrice.php
-+++ b/app/code/Magento/Catalog/Pricing/Price/BasePrice.php
-@@ -30,7 +30,7 @@ class BasePrice extends AbstractPrice
-             $this->value = false;
-             foreach ($this->priceInfo->getPrices() as $price) {
-                 if ($price instanceof BasePriceProviderInterface && $price->getValue() !== false) {
--                    $this->value = min($price->getValue(), $this->value ?: $price->getValue());
-+                    $this->value = min($price->getValue(), $this->value !== false ? $this->value: $price->getValue());
-                 }
-             }
-         }
-diff --git a/app/code/Magento/Catalog/Pricing/Price/MinimalTierPriceCalculator.php b/app/code/Magento/Catalog/Pricing/Price/MinimalTierPriceCalculator.php
-index 387ef9416ef..a5e573caa38 100644
---- a/app/code/Magento/Catalog/Pricing/Price/MinimalTierPriceCalculator.php
-+++ b/app/code/Magento/Catalog/Pricing/Price/MinimalTierPriceCalculator.php
-@@ -29,8 +29,10 @@ class MinimalTierPriceCalculator implements MinimalPriceCalculatorInterface
-     }
- 
-     /**
--     * Get raw value of "as low as" as a minimal among tier prices
--     * {@inheritdoc}
-+     * Get raw value of "as low as" as a minimal among tier prices{@inheritdoc}
-+     *
-+     * @param SaleableInterface $saleableItem
-+     * @return float|null
-      */
-     public function getValue(SaleableInterface $saleableItem)
-     {
-@@ -49,8 +51,10 @@ class MinimalTierPriceCalculator implements MinimalPriceCalculatorInterface
-     }
- 
-     /**
--     * Return calculated amount object that keeps "as low as" value
--     * {@inheritdoc}
-+     * Return calculated amount object that keeps "as low as" value{@inheritdoc}
-+     *
-+     * @param SaleableInterface $saleableItem
-+     * @return AmountInterface|null
-      */
-     public function getAmount(SaleableInterface $saleableItem)
-     {
-@@ -58,6 +62,6 @@ class MinimalTierPriceCalculator implements MinimalPriceCalculatorInterface
- 
-         return $value === null
-             ? null
--            : $this->calculator->getAmount($value, $saleableItem);
-+            : $this->calculator->getAmount($value, $saleableItem, 'tax');
-     }
- }
-diff --git a/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php b/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
-index 1397ceb6bf7..2c4e332e712 100644
---- a/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
-+++ b/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
-@@ -29,7 +29,7 @@ class RegularPrice extends AbstractPrice implements BasePriceProviderInterface
-         if ($this->value === null) {
-             $price = $this->product->getPrice();
-             $priceInCurrentCurrency = $this->priceCurrency->convertAndRound($price);
--            $this->value = $priceInCurrentCurrency ? floatval($priceInCurrentCurrency) : 0;
-+            $this->value = $priceInCurrentCurrency ? (float)$priceInCurrentCurrency : 0;
-         }
-         return $this->value;
-     }
-diff --git a/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php b/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
-index b1bfc6ff4ad..77c48fdb166 100644
---- a/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
-+++ b/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
-@@ -11,6 +11,7 @@ use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
- use Magento\Framework\Pricing\Price\AbstractPrice;
- use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
- use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-+use Magento\Store\Api\Data\WebsiteInterface;
- 
- /**
-  * Special price model
-@@ -46,6 +47,8 @@ class SpecialPrice extends AbstractPrice implements SpecialPriceInterface, BaseP
-     }
- 
-     /**
-+     * Retrieve special price.
-+     *
-      * @return bool|float
-      */
-     public function getValue()
-@@ -96,19 +99,19 @@ class SpecialPrice extends AbstractPrice implements SpecialPriceInterface, BaseP
-     }
- 
-     /**
--     * @return bool
-+     * @inheritdoc
-      */
-     public function isScopeDateInInterval()
-     {
-         return $this->localeDate->isScopeDateInInterval(
--            $this->product->getStore(),
-+            WebsiteInterface::ADMIN_CODE,
-             $this->getSpecialFromDate(),
-             $this->getSpecialToDate()
-         );
-     }
- 
-     /**
--     * @return bool
-+     * @inheritdoc
-      */
-     public function isPercentageDiscount()
-     {
-diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
-index 74f98c2e66a..f250927889c 100644
---- a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
-+++ b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
-@@ -80,7 +80,7 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
-         GroupManagementInterface $groupManagement,
-         CustomerGroupRetrieverInterface $customerGroupRetriever = null
-     ) {
--        $quantity = floatval($quantity) ? $quantity : 1;
-+        $quantity = (float)$quantity ? $quantity : 1;
-         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
-         $this->customerSession = $customerSession;
-         $this->groupManagement = $groupManagement;
-diff --git a/app/code/Magento/Catalog/Pricing/Render/PriceBox.php b/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
-index 190168ed583..678b45ce97e 100644
---- a/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
-+++ b/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Pricing\Render;
- 
- use Magento\Catalog\Model\Product;
-@@ -71,7 +73,9 @@ class PriceBox extends PriceBoxRender
-      *
-      * @param int $length
-      * @param string|null $chars
-+     *
-      * @return string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getRandomString($length, $chars = null)
-     {
-@@ -93,4 +97,21 @@ class PriceBox extends PriceBoxRender
-         }
-         return true;
-     }
-+
-+    /**
-+     * Format percent
-+     *
-+     * @param float $percent
-+     *
-+     * @return string
-+     */
-+    public function formatPercent(float $percent): string
-+    {
-+        /*First rtrim - trim zeros. So, 10.00 -> 10.*/
-+        /*Second rtrim - trim dot. So, 10. -> 10*/
-+        return rtrim(
-+            rtrim(number_format($percent, 2), '0'),
-+            '.'
-+        );
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Setup/CategorySetup.php b/app/code/Magento/Catalog/Setup/CategorySetup.php
-index 27138793282..f8542454bef 100644
---- a/app/code/Magento/Catalog/Setup/CategorySetup.php
-+++ b/app/code/Magento/Catalog/Setup/CategorySetup.php
-@@ -10,7 +10,6 @@ namespace Magento\Catalog\Setup;
- use Magento\Catalog\Block\Adminhtml\Category\Helper\Pricestep;
- use Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\Available;
- use Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\DefaultSortby;
--use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\BaseImage;
- use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Category as CategoryFormHelper;
- use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight as WeightFormHelper;
- use Magento\Catalog\Model\Attribute\Backend\Customlayoutupdate;
-@@ -54,6 +53,8 @@ use Magento\Catalog\Model\Product\Type;
- use Magento\Theme\Model\Theme\Source\Theme;
- 
- /**
-+ * Setup category with default entities.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class CategorySetup extends EavSetup
-@@ -593,7 +594,6 @@ class CategorySetup extends EavSetup
-                         'label' => 'Base Image',
-                         'input' => 'media_image',
-                         'frontend' => ImageFrontendModel::class,
--                        'input_renderer' => BaseImage::class,
-                         'required' => false,
-                         'sort_order' => 0,
-                         'global' => ScopedAttributeInterface::SCOPE_STORE,
-@@ -626,7 +626,6 @@ class CategorySetup extends EavSetup
-                         'type' => 'varchar',
-                         'label' => 'Media Gallery',
-                         'input' => 'gallery',
--                        'backend' => Media::class,
-                         'required' => false,
-                         'sort_order' => 4,
-                         'group' => 'Images',
-diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/InstallDefaultPriceIndexerDimensionsMode.php b/app/code/Magento/Catalog/Setup/Patch/Data/InstallDefaultPriceIndexerDimensionsMode.php
-deleted file mode 100644
-index 9cb41738325..00000000000
---- a/app/code/Magento/Catalog/Setup/Patch/Data/InstallDefaultPriceIndexerDimensionsMode.php
-+++ /dev/null
-@@ -1,79 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\Catalog\Setup\Patch\Data;
--
--use Magento\Catalog\Model\Indexer\Product\Price\ModeSwitcher;
--use Magento\Framework\Setup\ModuleDataSetupInterface;
--use Magento\Framework\Setup\Patch\DataPatchInterface;
--use Magento\Framework\Setup\Patch\PatchVersionInterface;
--use Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration;
--
--/**
-- * Class InstallDefaultCategories data patch.
-- *
-- * @package Magento\Catalog\Setup\Patch
-- */
--class InstallDefaultPriceIndexerDimensionsMode implements DataPatchInterface, PatchVersionInterface
--{
--    /**
--     * @var ModuleDataSetupInterface
--     */
--    private $moduleDataSetup;
--
--    /**
--     * PatchInitial constructor.
--     * @param ModuleDataSetupInterface $moduleDataSetup
--     */
--    public function __construct(
--        ModuleDataSetupInterface $moduleDataSetup
--    ) {
--        $this->moduleDataSetup = $moduleDataSetup;
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function apply()
--    {
--        $configTable = $this->moduleDataSetup->getTable('core_config_data');
--
--        $this->moduleDataSetup->getConnection()->insert(
--            $configTable,
--            [
--                'scope' => 'default',
--                'scope_id' => 0,
--                'value' => DimensionModeConfiguration::DIMENSION_NONE,
--                'path' => ModeSwitcher::XML_PATH_PRICE_DIMENSIONS_MODE
--            ]
--        );
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public static function getDependencies()
--    {
--        return [];
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function getAliases()
--    {
--        return [];
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public static function getVersion()
--    {
--        return '2.2.6';
--    }
--}
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
-index 44c960dc376..b47e13a1182 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
-@@ -6,14 +6,25 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AddSimpleProductToCart">
-         <arguments>
-             <argument name="product" defaultValue="product"/>
-         </arguments>
--        <amOnPage url="/{{product.name}}.html" stepKey="navigateProductPage"/>
-+        <amOnPage url="{{StorefrontProductPage.url(product.custom_attributes[url_key])}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
--        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" time="30" stepKey="waitForProductAdded"/>
--        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="seeAddedToCartMessage"/>
-+        <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdding"/>
-+        <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdded"/>
-+        <waitForElementVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAddToCart}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAddToCart"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" time="30" stepKey="waitForProductAddedMessage"/>
-+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{product.name}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
-+    </actionGroup>
-+    <actionGroup name="StorefrontAddSimpleProductWithQtyActionGroup" extends="AddSimpleProductToCart">
-+        <arguments>
-+            <argument name="quantity" type="string" defaultValue="1"/>
-+        </arguments>
-+        <fillField userInput="{{quantity}}" selector="{{StorefrontProductPageSection.qtyInput}}" stepKey="fillProductQty" after="goToProductPage"/>
-     </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddWebsiteToProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddWebsiteToProductActionGroup.xml
-new file mode 100644
-index 00000000000..9a4d15a0909
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddWebsiteToProductActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AddWebsiteToProductActionGroup">
-+        <arguments>
-+            <argument name="website" type="string"/>
-+        </arguments>
-+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToProductInWebsiteSectionHeader"/>
-+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="clickProductInWebsiteSectionHeader"/>
-+        <checkOption selector="{{ProductInWebsitesSection.website(website)}}" stepKey="checkWebsite"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSaved"/>
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertProductSaveSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddAdvancedPricingToTheProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddAdvancedPricingToTheProductActionGroup.xml
-new file mode 100644
-index 00000000000..a8d2f7d9860
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddAdvancedPricingToTheProductActionGroup.xml
-@@ -0,0 +1,34 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- You must already be on the product form > Advanced Inventory;
-+         Action group can be used for customer group price and tier price -->
-+    <actionGroup name="AdminAddAdvancedPricingToTheProductActionGroup">
-+        <arguments>
-+            <argument name="index" type="string"/>
-+            <argument name="groupPrice" type="entity"/>
-+        </arguments>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.addCustomerGroupPrice}}" stepKey="clickCustomerGroupPriceAddButton"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect(index)}}" userInput="{{groupPrice.website_id}}" stepKey="selectProductTierPriceWebsiteInput"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect(index)}}" userInput="{{groupPrice.customer_group}}" stepKey="selectProductTierPriceCustomerGroupInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput(index)}}" userInput="{{groupPrice.quantity}}" stepKey="fillProductTierPriceQuantityInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput(index)}}" userInput="{{groupPrice.price}}" stepKey="selectProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+    </actionGroup>
-+
-+    <!-- Customer group is selected in different way for B2B -->
-+    <actionGroup name="AdminAddAdvancedPricingToTheProductExtendedActionGroup" extends="AdminAddAdvancedPricingToTheProductActionGroup">
-+        <remove keyForRemoval="selectProductTierPriceCustomerGroupInput"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect(index)}}" stepKey="clickProductTierPriceCustGroupSelect" after="selectProductTierPriceWebsiteInput"/>
-+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceGroupOrCatalogOption(groupPrice.customer_group)}}" time="30" stepKey="waitProductTierPriceGroupOrCatalogOption" after="clickProductTierPriceCustGroupSelect"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.productTierPriceGroupOrCatalogOption(groupPrice.customer_group)}}" stepKey="clickAllGroupsOption" after="waitProductTierPriceGroupOrCatalogOption"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddMinimumAdvertisedPriceActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddMinimumAdvertisedPriceActionGroup.xml
-new file mode 100644
-index 00000000000..f0eef98748f
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddMinimumAdvertisedPriceActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAddMinimumAdvertisedPriceActionGroup">
-+        <arguments>
-+            <argument name="msrpData" type="entity"/>
-+        </arguments>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.msrp}}" stepKey="waitSpecialPrice"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.msrp}}" userInput="{{msrpData.msrp}}" stepKey="fillMinimumAdvertisedPrice"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.msrpType}}" userInput="{{msrpData.msrp_display_actual_price_type}}" stepKey="selectPriceType"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDone"/>
-+        <waitForElementNotVisible selector="{{AdminProductFormAdvancedPricingSection.msrp}}" stepKey="waitForCloseModalWindow"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddProductCustomOptionActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddProductCustomOptionActionGroup.xml
-new file mode 100644
-index 00000000000..8e50ac6edc6
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddProductCustomOptionActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Add custom option, title and type -->
-+    <actionGroup name="AdminAddProductCustomOptionActionGroup">
-+        <arguments>
-+            <argument name="customOptionTitle" type="string"/>
-+            <argument name="customOptionType" type="string"/>
-+        </arguments>
-+        <scrollTo selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="scrollToCustomizableOptionsSection"/>
-+        <waitForPageLoad stepKey="waitForScrolling"/>
-+        <click stepKey="clickAddOptions" selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}"/>
-+        <waitForPageLoad stepKey="waitForAddProductPageLoad"/>
-+        <fillField stepKey="fillInOptionTitle" selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" userInput="{{customOptionTitle}}"/>
-+        <click stepKey="clickOptionTypeParent" selector="{{AdminProductCustomizableOptionsSection.lastOptionTypeParent}}"/>
-+        <waitForPageLoad stepKey="waitForDropdownOpen"/>
-+        <click stepKey="clickOptionType" selector="{{AdminProductCustomizableOptionsSection.optionType(customOptionType)}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddTitleAndPriceValueToCustomOptionActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddTitleAndPriceValueToCustomOptionActionGroup.xml
-new file mode 100644
-index 00000000000..3a03eb60555
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddTitleAndPriceValueToCustomOptionActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Add value, value title and value price to custom options (type: drop-down, checkbox, multiple select, radio buttons) -->
-+    <actionGroup name="AdminAddTitleAndPriceValueToCustomOptionActionGroup">
-+        <arguments>
-+            <argument name="optionValue" type="entity"/>
-+        </arguments>
-+        <click stepKey="clickAddValue" selector="{{AdminProductCustomizableOptionsSection.addValue}}"/>
-+        <fillField stepKey="fillInValueTitle" selector="{{AdminProductCustomizableOptionsSection.valueTitle}}" userInput="{{optionValue.title}}"/>
-+        <fillField stepKey="fillInValuePrice" selector="{{AdminProductCustomizableOptionsSection.valuePrice}}" userInput="{{optionValue.price}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAnchorCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAnchorCategoryActionGroup.xml
-new file mode 100644
-index 00000000000..62e9a4b6615
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAnchorCategoryActionGroup.xml
-@@ -0,0 +1,29 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAnchorCategoryActionGroup">
-+        <arguments>
-+            <argument name="categoryName" type="string"/>
-+        </arguments>
-+        <!--Open Category page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryName)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!--Enable Anchor for category -->
-+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
-+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
-+        <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignCategoryToProductAndSaveActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignCategoryToProductAndSaveActionGroup.xml
-new file mode 100644
-index 00000000000..0cb7c4885ac
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignCategoryToProductAndSaveActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAssignCategoryToProductAndSaveActionGroup">
-+        <arguments>
-+            <argument name="categoryName" type="string"/>
-+        </arguments>
-+        <!-- on edit Product page catalog/product/edit/id/{{product_id}}/ -->
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="openDropDown"/>
-+        <checkOption selector="{{AdminProductFormSection.selectCategory(categoryName)}}" stepKey="selectCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickDone"/>
-+        <waitForPageLoad stepKey="waitForApplyCategory"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSave"/>
-+        <waitForPageLoad stepKey="waitForSavingProduct"/>
-+        <see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml
-new file mode 100644
-index 00000000000..90ceb1e4a1f
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAssignImageRolesActionGroup">
-+        <arguments>
-+            <argument name="image"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggleState('closed')}}" dependentSelector="{{AdminProductImagesSection.productImagesToggleState('open')}}" visible="false" stepKey="clickSectionImage"/>
-+        <click selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="clickProductImage"/>
-+        <waitForElementVisible selector="{{AdminProductImagesSection.altText}}" stepKey="seeAltTextSection"/>
-+        <checkOption selector="{{AdminProductImagesSection.roleBase}}" stepKey="checkRoleBase"/>
-+        <checkOption selector="{{AdminProductImagesSection.roleSmall}}" stepKey="checkRoleSmall"/>
-+        <checkOption selector="{{AdminProductImagesSection.roleThumbnail}}" stepKey="checkRoleThumbnail"/>
-+        <checkOption selector="{{AdminProductImagesSection.roleSwatch}}" stepKey="checkRoleSwatch"/>
-+        <click selector="{{AdminSlideOutDialogSection.closeButton}}" stepKey="clickCloseButton"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
-index 7c04e9bd83d..90d732c9654 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Create a new category-->
-     <actionGroup name="CreateCategory">
-         <arguments>
-@@ -154,7 +154,7 @@
- 
-         <fillField stepKey="fillCategoryName" selector="{{AdminProductCategoryCreationSection.nameInput}}" userInput="{{categoryName}}"/>
- 
--        <!-- Search and select a parent catagory for the product -->
-+        <!-- Search and select a parent category for the product -->
-         <click stepKey="clickParentCategory" selector="{{AdminProductCategoryCreationSection.parentCategory}}"/>
-         <waitForPageLoad stepKey="waitForDropDownVisible"/>
-         <fillField stepKey="searchForParent" userInput="{{parentCategoryName}}" selector="{{AdminProductCategoryCreationSection.parentSearch}}"/>
-@@ -231,14 +231,89 @@
-         <waitForPageLoad stepKey="waitForStoreViewChangeLoad"/>
-     </actionGroup>
- 
-+    <actionGroup name="switchCategoryToAllStoreView">
-+        <arguments>
-+            <argument name="CatName"/>
-+        </arguments>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(CatName)}}" stepKey="navigateToCreatedCategory" />
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForSpinner1"/>
-+        <scrollToTopOfPage stepKey="scrollToToggle"/>
-+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewDropdownToggle}}" stepKey="openStoreViewDropDown"/>
-+        <click selector="{{AdminCategoryMainActionsSection.allStoreViews}}" stepKey="clickStoreViewByName"/>
-+        <see selector="{{AdminCategoryMainActionsSection.storeSwitcher}}" userInput="All Store Views" stepKey="seeAllStoreView"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForSpinner2"/>
-+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}" stepKey="selectStoreViewAccept"/>
-+        <waitForPageLoad stepKey="waitForStoreViewChangeLoad"/>
-+    </actionGroup>
-+
-     <actionGroup name="navigateToCreatedCategory">
-         <arguments>
-             <argument name="Category"/>
-         </arguments>
-         <amOnPage url="{{AdminCategoryPage.page}}" stepKey="amOnCategoryPage"/>
-         <waitForPageLoad stepKey="waitForPageLoad1"/>
--        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(Category.Name)}}" stepKey="navigateToCreatedCategory" />
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandAll"/>
-         <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(Category.Name)}}" stepKey="navigateToCreatedCategory" />
-         <waitForLoadingMaskToDisappear stepKey="waitForSpinner" />
-     </actionGroup>
-+
-+    <actionGroup name="ChangeSeoUrlKey">
-+        <arguments>
-+            <argument name="value" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection"/>
-+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{value}}" stepKey="enterURLKey"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
-+    </actionGroup>
-+
-+    <actionGroup name="ChangeSeoUrlKeyForSubCategory">
-+        <arguments>
-+            <argument name="value" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection"/>
-+        <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyDefaultValueCheckbox}}" stepKey="uncheckDefaultValue"/>
-+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{value}}" stepKey="enterURLKey"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
-+    </actionGroup>
-+    <actionGroup name="OpenCategoryFromCategoryTree">
-+        <arguments>
-+            <argument name="category" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(category)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <waitForElementVisible selector="{{AdminCategoryContentSection.categoryPageTitle}}" stepKey="waitForCategoryTitle"/>
-+    </actionGroup>
-+    <actionGroup name="AdminAssignProductToCategory">
-+        <arguments>
-+            <argument name="productId" type="string"/>
-+            <argument name="categoryName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminProductEditPage.url(productId)}}" stepKey="amOnPage"/>
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{categoryName}}]" stepKey="selectCategory"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the product." stepKey="seeSaveProductMessage"/>
-+    </actionGroup>
-+    <actionGroup name="FillCategoryNameAndUrlKeyAndSave">
-+        <arguments>
-+            <argument name="categoryName" type="string"/>
-+            <argument name="categoryUrlKey" type="string"/>
-+        </arguments>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryName}}" stepKey="enterCategoryName"/>
-+        <scrollTo selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="scrollToSearchEngineOptimization"/>
-+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{categoryUrlKey}}" stepKey="enterURLKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTheTopOfPage"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeProductSEOSettingsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeProductSEOSettingsActionGroup.xml
-new file mode 100644
-index 00000000000..ec0beac8655
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeProductSEOSettingsActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminChangeProductSEOSettingsActionGroup">
-+        <arguments>
-+            <argument name="productName" defaultValue="_defaultProduct.name"/>
-+        </arguments>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickSearchEngineOptimizationTab"/>
-+        <waitForPageLoad stepKey="waitForTabOpen"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{productName}}" stepKey="setUrlKeyInput"/>
-+        <fillField selector="{{AdminProductSEOSection.metaTitleInput}}" userInput="{{productName}}" stepKey="setMetaTitleInput"/>
-+        <fillField selector="{{AdminProductSEOSection.metaKeywordsInput}}" userInput="{{productName}}" stepKey="setMetaKeywordsInput"/>
-+        <fillField selector="{{AdminProductSEOSection.metaDescriptionInput}}" userInput="{{productName}}" stepKey="setMetaDescriptionInput"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickOnAdvancedInventoryLinkActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickOnAdvancedInventoryLinkActionGroup.xml
-new file mode 100644
-index 00000000000..58164ce5f89
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickOnAdvancedInventoryLinkActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- ActionGroup click on Advanced Inventory in product form;
-+         You must already be on the product form page -->
-+    <actionGroup name="AdminClickOnAdvancedInventoryLinkActionGroup">
-+        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
-+        <waitForPageLoad stepKey="waitForAdvancedInventoryPageToLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateCustomDropDownOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateCustomDropDownOptionsActionGroup.xml
-new file mode 100644
-index 00000000000..a674647a5c8
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateCustomDropDownOptionsActionGroup.xml
-@@ -0,0 +1,33 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateCustomDropDownOptionsActionGroup">
-+        <!-- ActionGroup will add a single custom option to a product
-+             You must already be on the product creation page -->
-+        <arguments>
-+            <argument name="customOptionName" type="string"/>
-+            <argument name="firstOption" type="entity"/>
-+            <argument name="secondOption" type="entity"/>
-+        </arguments>
-+        <click stepKey="clickAddOptions" selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}"/>
-+        <waitForPageLoad stepKey="waitForAddProductPageLoad"/>
-+        <!-- Fill in the option and select the type of drop down -->
-+        <fillField stepKey="fillInOptionTitle" selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" userInput="{{customOptionName}}"/>
-+        <click stepKey="clickOptionTypeParent" selector="{{AdminProductCustomizableOptionsSection.lastOptionTypeParent}}"/>
-+        <waitForPageLoad stepKey="waitForDropdownOpen"/>
-+        <click stepKey="clickOptionType" selector="{{AdminProductCustomizableOptionsSection.optionType('Drop-down')}}"/>
-+        <!-- Add option based on the parameter -->
-+        <click stepKey="clickAddFirstValue" selector="{{AdminProductCustomizableOptionsSection.addValue}}"/>
-+        <fillField stepKey="fillInFirstOptionValueTitle" selector="{{AdminProductCustomizableOptionsSection.valueTitle}}" userInput="{{firstOption.title}}"/>
-+        <fillField stepKey="fillInFirstOptionValuePrice" selector="{{AdminProductCustomizableOptionsSection.valuePrice}}" userInput="{{firstOption.price}}"/>
-+        <click stepKey="clickAddSecondValue" selector="{{AdminProductCustomizableOptionsSection.addValue}}"/>
-+        <fillField stepKey="fillInSecondOptionValueTitle" selector="{{AdminProductCustomizableOptionsSection.valueTitle}}" userInput="{{secondOption.title}}"/>
-+        <fillField stepKey="fillInSecondOptionValuePrice" selector="{{AdminProductCustomizableOptionsSection.valuePrice}}" userInput="{{secondOption.price}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml
-index e7d9a63484b..a99420bcf95 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Create a new root category-->
-     <actionGroup name="AdminCreateRootCategory">
-         <arguments>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
-new file mode 100644
-index 00000000000..dd66919640a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateRecentlyProductsWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
-+        <selectOption selector="{{AdminCatalogProductWidgetSection.productAttributesToShow}}" parameterArray="['Name', 'Image', 'Price']" stepKey="selectAllProductAttributes"/>
-+        <selectOption selector="{{AdminCatalogProductWidgetSection.productButtonsToShow}}" parameterArray="['Add to Cart', 'Add to Compare', 'Add to Wishlist']" stepKey="selectAllProductButtons"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
-+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessageAppears"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillAdvancedInventoryOutOfStockThresholdActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillAdvancedInventoryOutOfStockThresholdActionGroup.xml
-new file mode 100644
-index 00000000000..d0116467be5
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillAdvancedInventoryOutOfStockThresholdActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- You must already be on the product form > Advanced Inventory -->
-+    <actionGroup name="AdminFillAdvancedInventoryOutOfStockThresholdActionGroup">
-+        <arguments>
-+            <argument name="qty" type="string"/>
-+        </arguments>
-+        <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.minQtyConfigSetting}}" stepKey="uncheckMiniQtyCheckBox"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.outOfStockThreshold}}" userInput="{{qty}}" stepKey="fillMiniAllowedQty"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillAdvancedInventoryQtyActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillAdvancedInventoryQtyActionGroup.xml
-new file mode 100644
-index 00000000000..1faa3f04d36
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillAdvancedInventoryQtyActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- You must already be on the product form > Advanced Inventory -->
-+    <actionGroup name="AdminFillAdvancedInventoryQtyActionGroup">
-+        <arguments>
-+            <argument name="qty" type="string"/>
-+        </arguments>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryQty}}" userInput="{{qty}}" stepKey="fillQty"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductAttributePropertiesActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductAttributePropertiesActionGroup.xml
-new file mode 100644
-index 00000000000..cd850f8a700
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductAttributePropertiesActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminFillProductAttributePropertiesActionGroup">
-+        <arguments>
-+            <argument name="attributeName" type="string"/>
-+            <argument name="attributeType" type="string"/>
-+        </arguments>
-+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{attributeName}}" stepKey="fillDefaultLabel"/>
-+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="{{attributeType}}" stepKey="selectInputType"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetByNameActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetByNameActionGroup.xml
-new file mode 100644
-index 00000000000..1ac7ac5e54b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetByNameActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenAttributeSetByNameActionGroup">
-+        <arguments>
-+            <argument name="attributeSetName" type="string" defaultValue="Default"/>
-+        </arguments>
-+        <click selector="{{AdminProductAttributeSetGridSection.AttributeSetName(attributeSetName)}}" stepKey="chooseAttributeSet"/>
-+        <waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetGridPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetGridPageActionGroup.xml
-new file mode 100644
-index 00000000000..c6f0c3332b1
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetGridPageActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenAttributeSetGridPageActionGroup">
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSetPage"/>
-+        <waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenNewProductFormPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenNewProductFormPageActionGroup.xml
-new file mode 100644
-index 00000000000..fe859fab526
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenNewProductFormPageActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenNewProductFormPageActionGroup">
-+        <arguments>
-+            <argument name="productType" type="string" defaultValue="simple" />
-+            <argument name="attributeSetId" type="string" defaultValue="{{defaultAttributeSet.attribute_set_id}}" />
-+        </arguments>
-+
-+        <amOnPage url="{{AdminProductCreatePage.url(attributeSetId, productType)}}" stepKey="openProductNewPage" />
-+        <waitForPageLoad stepKey="waitForPageLoad" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductAttributePageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductAttributePageActionGroup.xml
-new file mode 100644
-index 00000000000..b6be3fb172d
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductAttributePageActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenProductAttributePageActionGroup">
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToAttributePage"/>
-+        <waitForPageLoad stepKey="waitForAttributePageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductIndexPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductIndexPageActionGroup.xml
-new file mode 100644
-index 00000000000..ca1303f180c
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductIndexPageActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenProductIndexPageActionGroup">
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndexPage"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
-index bca6ae2b60b..c1cb69373b0 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Navigate to create product page from product grid page-->
-     <actionGroup name="goToCreateProductPage">
-         <arguments>
-@@ -15,16 +15,25 @@
-         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
-         <waitForElementVisible selector="{{AdminProductGridActionSection.addTypeProduct(product.type_id)}}" stepKey="waitForAddProductDropdown" time="30"/>
-         <click selector="{{AdminProductGridActionSection.addTypeProduct(product.type_id)}}" stepKey="clickAddProductType"/>
--        <waitForPageLoad stepKey="waitForCreateProductPageLoad"/>
-+        <waitForPageLoad time="30" stepKey="waitForCreateProductPageLoad"/>
-         <seeInCurrentUrl url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, product.type_id)}}" stepKey="seeNewProductUrl"/>
-         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeNewProductTitle"/>
-     </actionGroup>
-+    
-+    <!--Navigate to create product page directly via ID-->
-+    <actionGroup name="goToProductPageViaID">
-+        <arguments>
-+            <argument name="productId" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminProductEditPage.url(productId)}}" stepKey="goToProduct"/>
-+    </actionGroup>
- 
--    <!--Fill main fields in create product form-->
-+    <!-- Fill main fields in create product form using a product entity -->
-     <actionGroup name="fillMainProductForm">
-         <arguments>
-             <argument name="product" defaultValue="_defaultProduct"/>
-         </arguments>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductName"/>
-         <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductSku"/>
-         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="fillProductPrice"/>
-@@ -34,6 +43,25 @@
-         <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{product.weight}}" stepKey="fillProductWeight"/>
-     </actionGroup>
- 
-+    <!-- Fill main fields in create product form using strings for flexibility -->
-+    <actionGroup name="FillMainProductFormByString">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+            <argument name="productSku" type="string"/>
-+            <argument name="productPrice" type="string"/>
-+            <argument name="productQuantity" type="string"/>
-+            <argument name="productStatus" type="string"/>
-+            <argument name="productWeight" type="string"/>
-+        </arguments>
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{productName}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{productSku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{productPrice}}" stepKey="fillProductPrice"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{productQuantity}}" stepKey="fillProductQty"/>
-+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{productStatus}}" stepKey="selectStockStatus"/>
-+        <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="This item has weight" stepKey="selectWeight"/>
-+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{productWeight}}" stepKey="fillProductWeight"/>
-+    </actionGroup>
-+
-     <!--Fill main fields in create product form with no weight, useful for virtual and downloadable products -->
-     <actionGroup name="fillMainProductFormNoWeight">
-         <arguments>
-@@ -70,10 +98,21 @@
- 
-     <!--Save product and see success message-->
-     <actionGroup name="saveProductForm">
-+        <scrollToTopOfPage stepKey="scrollTopPageProduct"/>
-+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveProductButton" />
-         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
-+        <waitForPageLoad stepKey="waitForProductToSave"/>
-         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
-     </actionGroup>
- 
-+    <actionGroup name="toggleProductEnabled">
-+        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="toggleEnabled"/>
-+    </actionGroup>
-+    <!-- Save product but do not expect a success message -->
-+    <actionGroup name="SaveProductFormNoSuccessCheck" extends="saveProductForm">
-+        <remove keyForRemoval="seeSaveConfirmation"/>
-+    </actionGroup>
-+
-     <!--Upload image for product-->
-     <actionGroup name="addProductImage">
-         <arguments>
-@@ -159,7 +198,7 @@
- 
-         <click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomOptionsSection"/>
-         <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
--        <fillField userInput="option1" selector="{{AdminProductCustomizableOptionsSection.optionTitleInput}}" stepKey="fillOptionTitle"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('0')}}" userInput="option1" stepKey="fillOptionTitle"/>
-         <click selector="{{AdminProductCustomizableOptionsSection.optionTypeOpenDropDown}}" stepKey="openTypeDropDown"/>
-         <click selector="{{AdminProductCustomizableOptionsSection.optionTypeTextField}}" stepKey="selectTypeTextField"/>
-         <fillField userInput="20" selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput}}" stepKey="fillMaxChars"/>
-@@ -173,6 +212,44 @@
-         <seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
-     </actionGroup>
- 
-+    <actionGroup name="ProductSetWebsite">
-+        <arguments>
-+            <argument name="website" type="string"/>
-+        </arguments>
-+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
-+        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{ProductInWebsitesSection.website(website)}}" visible="false" stepKey="clickToOpenProductInWebsite"/>
-+        <waitForPageLoad stepKey="waitForPageOpened"/>
-+        <click selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.save}}" stepKey="clickSaveProduct"/>
-+        <waitForPageLoad time='60' stepKey="waitForProducrSaved"/>
-+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSaveSuccessMessage"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the product." stepKey="seeSaveSuccessMessage"/>
-+    </actionGroup>
-+
-+    <actionGroup name="ProductSetAdvancedPricing">
-+        <arguments>
-+            <argument name="website" type="string" defaultValue=""/>
-+            <argument name="group" type="string" defaultValue="Retailer"/>
-+            <argument name="quantity" type="string" defaultValue="1"/>
-+            <argument name="price" type="string" defaultValue="Discount"/>
-+            <argument name="amount" type="string" defaultValue="45"/>
-+        </arguments>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>
-+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupAllGroupsQty1PriceDiscountAnd10percent"/>
-+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" stepKey="waitForSelectCustomerGroupNameAttribute2"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{website}}" stepKey="selectProductWebsiteValue"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{group}}" stepKey="selectProductCustomGroupValue"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{quantity}}" stepKey="fillProductTierPriceQtyInput"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceValueTypeSelect('0')}}" userInput="{{price}}" stepKey="selectProductTierPriceValueType"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('0')}}" userInput="{{amount}}" stepKey="selectProductTierPricePriceInput"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <waitForPageLoad stepKey="WaitForProductSave"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.save}}" stepKey="clickSaveProduct1"/>
-+        <waitForPageLoad time="60" stepKey="WaitForProductSave1"/>
-+        <see userInput="You saved the product." stepKey="seeSaveConfirmation"/>
-+    </actionGroup>
-+
-     <!--Assert text in Related, Up-Sell or Cross-Sell section in Admin Product page-->
-     <actionGroup name="AssertTextInAdminProductRelatedUpSellCrossSellSection">
-         <arguments>
-@@ -184,6 +261,44 @@
-         <see selector="{{element}}" userInput="{{expectedText}}" stepKey="assertText"/>
-     </actionGroup>
- 
-+    <!--Related products-->
-+    <actionGroup name="addRelatedProductBySku">
-+        <arguments>
-+            <argument name="sku"/>
-+        </arguments>
-+        <!--Scroll up to avoid error-->
-+        <scrollTo selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" x="0" y="-100" stepKey="scrollTo"/>
-+        <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedUpSellCrossSell"/>
-+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" stepKey="clickAddRelatedProductButton"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectProduct"/>
-+        <click selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected"/>
-+        <waitForElementNotVisible selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="waitForElementNotVisible"/>
-+    </actionGroup>
-+
-+    <!--Click AddCrossSellProducts and adds product by SKU-->
-+    <actionGroup name="addCrossSellProductBySku">
-+        <arguments>
-+            <argument name="sku"/>
-+        </arguments>
-+        <!--Scroll up to avoid error-->
-+        <scrollTo selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" x="0" y="-100" stepKey="scrollTo"/>
-+        <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedUpSellCrossSell"/>
-+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddCrossSellProductsButton}}" stepKey="clickAddCrossSellButton"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectProduct"/>
-+        <click selector="{{AdminProductCrossSellModalSection.addSelectedProducts}}" stepKey="addRelatedProductSelected"/>
-+        <waitForPageLoad stepKey="waitForModalDisappear"/>
-+    </actionGroup>
-+
-     <!--Add special price to product in Admin product page-->
-     <actionGroup name="AddSpecialPriceToProductActionGroup">
-         <arguments>
-@@ -191,9 +306,236 @@
-         </arguments>
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-         <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <waitForPageLoad stepKey="waitForAdvancedPricingModal"/>
-         <waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="waitSpecialPrice"/>
-         <fillField userInput="{{price}}" selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="fillSpecialPrice"/>
-         <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDone"/>
-+        <waitForPageLoad stepKey="waitForAdvancedPricingModalGone"/>
-         <waitForElementNotVisible selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="waitForCloseModalWindow"/>
-       </actionGroup>
-+
-+    <!--Select Product In Websites-->
-+    <actionGroup name="SelectProductInWebsitesActionGroup">
-+        <arguments>
-+            <argument name="website" type="string"/>
-+        </arguments>
-+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
-+        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{AdminProductContentSection.sectionHeaderShow}}" visible="false" stepKey="expandSection"/>
-+        <waitForPageLoad stepKey="waitForPageOpened"/>
-+        <checkOption selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
-+    </actionGroup>
-+
-+    <actionGroup name="AdminProductAddSpecialPrice">
-+        <arguments>
-+            <argument name="specialPrice" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
-+        <waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="waitSpecialPrice1"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.useDefaultPrice}}" stepKey="checkUseDefault"/>
-+        <fillField userInput="{{specialPrice}}" selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="fillSpecialPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDone"/>
-+        <waitForElementNotVisible selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="waitForCloseModalWindow"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
-+    </actionGroup>
-+
-+    <!--Switch to New Store view-->
-+    <actionGroup name="SwitchToTheNewStoreView">
-+        <arguments>
-+            <argument name="storeViewName" type="string"/>
-+        </arguments>
-+        <scrollTo selector="{{AdminProductContentSection.pageHeader}}" stepKey="scrollToUp"/>
-+        <waitForElementVisible selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="waitForElementBecomeVisible"/>
-+        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcher"/>
-+        <click selector="{{AdminProductFormActionSection.selectStoreView(storeViewName)}}" stepKey="chooseStoreView"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+    </actionGroup>
-+
-+    <!--Create a Simple Product-->
-+    <actionGroup name="createSimpleProductAndAddToWebsite">
-+        <arguments>
-+            <argument name="product"/>
-+            <argument name="website" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
-+        <waitForPageLoad stepKey="waitForProductGrid"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
-+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
-+        <fillField userInput="{{product.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillProductName"/>
-+        <fillField userInput="{{product.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillProductSKU"/>
-+        <fillField userInput="{{product.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillProductPrice"/>
-+        <fillField userInput="{{product.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillProductQuantity"/>
-+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsites"/>
-+        <click selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
-+    </actionGroup>
-+
-+    <actionGroup name="CreatedProductConnectToWebsite">
-+        <arguments>
-+            <argument name="website"/>
-+            <argument name="product"/>
-+        </arguments>
-+        <click stepKey="openProduct" selector="{{AdminProductGridActionSection.productName(product.sku)}}"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="ScrollToWebsites"/>
-+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openWebsitesList"/>
-+        <waitForPageLoad stepKey="waitForWebsitesList"/>
-+        <click selector="{{ProductInWebsitesSection.website(website.name)}}" stepKey="SelectWebsite"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.save}}" stepKey="clickSaveProduct"/>
-+        <waitForPageLoad stepKey="waitForSave"/>
-+    </actionGroup>
-+
-+    <!--Check tier price with a discount percentage on product-->
-+    <actionGroup name="AssertDiscountsPercentageOfProducts">
-+        <arguments>
-+            <argument name="amount" type="string" defaultValue="45"/>
-+        </arguments>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>
-+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton"/>
-+        <grabValueFrom selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('0')}}" stepKey="grabProductTierPriceInput"/>
-+        <assertEquals stepKey="assertProductTierPriceInput">
-+            <expectedResult type="string">{{amount}}</expectedResult>
-+            <actualResult type="string">$grabProductTierPriceInput</actualResult>
-+        </assertEquals>
-+    </actionGroup>
-+
-+    <!-- This action group goes to the product index page, opens the drop down and clicks the specified product type for adding a product -->
-+    <actionGroup name="GoToSpecifiedCreateProductPage">
-+        <arguments>
-+            <argument type="string" name="productType" defaultValue="simple"/>
-+        </arguments>
-+        <comment userInput="actionGroup:GoToSpecifiedCreateProductPage" stepKey="actionGroupComment"/>
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
-+        <click selector="{{AdminProductGridActionSection.addTypeProduct(productType)}}" stepKey="clickAddProduct"/>
-+        <waitForPageLoad stepKey="waitForFormToLoad"/>
-+    </actionGroup>
-+
-+    <!-- This action group simply navigates to the product catalog page -->
-+    <actionGroup name="GoToProductCatalogPage">
-+        <comment userInput="actionGroup:GoToProductCatalogPage" stepKey="actionGroupComment"/>
-+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
-+        <waitForPageLoad stepKey="WaitForPageToLoad"/>
-+    </actionGroup>
-+
-+    <actionGroup name="SetProductUrlKey">
-+        <arguments>
-+            <argument name="product" defaultValue="_defaultProduct"/>
-+        </arguments>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
-+        <fillField userInput="{{product.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
-+    </actionGroup>
-+
-+    <actionGroup name="SetProductUrlKeyByString">
-+        <arguments>
-+            <argument name="urlKey" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
-+        <fillField userInput="{{urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
-+    </actionGroup>
-+
-+    <actionGroup name="SetCategoryByName">
-+        <arguments>
-+            <argument name="categoryName" type="string"/>
-+        </arguments>
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{categoryName}}]" stepKey="searchAndSelectCategory"/>
-+    </actionGroup>
-+    <!--Remove category from product in ProductFrom Page-->
-+    <actionGroup name="removeCategoryFromProduct">
-+        <arguments>
-+            <argument name="categoryName" type="string" defaultValue="{{_defaultCategory.name}}"/>
-+        </arguments>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <click selector="{{AdminProductFormSection.unselectCategories(categoryName)}}" stepKey="unselectCategories"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategory"/>
-+    </actionGroup>
-+
-+    <actionGroup name="expandAdminProductSection">
-+        <arguments>
-+            <argument name="sectionSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}" type="string"/>
-+            <argument name="sectionDependentSelector" defaultValue="{{AdminProductContentSection.sectionHeaderShow}}" type="string"/>
-+        </arguments>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+        <waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>
-+        <conditionalClick selector="{{sectionSelector}}" dependentSelector="{{sectionDependentSelector}}" visible="false" stepKey="expandSection"/>
-+        <waitForPageLoad time="30" stepKey="waitForSectionToExpand"/>
-+    </actionGroup>
-+    <actionGroup name="navigateToCreatedProductEditPage">
-+        <arguments>
-+            <argument name="product" defaultValue="_defaultProduct"/>
-+        </arguments>
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToAdminProductIndexPage"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-+        <waitForPageLoad stepKey="waitForClearFilters"/>
-+        <dontSeeElement selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="dontSeeClearFilters"/>
-+        <click selector="{{AdminProductGridFilterSection.viewDropdown}}" stepKey="openViewBookmarksTab"/>
-+        <click selector="{{AdminProductGridFilterSection.viewBookmark('Default View')}}" stepKey="resetToDefaultGridView"/>
-+        <waitForPageLoad stepKey="waitForResetToDefaultView"/>
-+        <see selector="{{AdminProductGridFilterSection.viewDropdown}}" userInput="Default View" stepKey="seeDefaultViewSelected"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
-+        <waitForPageLoad stepKey="waitForFilterOnGrid"/>
-+        <click selector="{{AdminProductGridSection.selectRowBasedOnName(product.name)}}" stepKey="clickProduct"/>
-+        <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
-+        <waitForElementVisible selector="{{AdminProductFormBundleSection.productSku}}" stepKey="waitForProductSKUField"/>
-+        <seeInField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{product.sku}}" stepKey="seeProductSKU"/>
-+    </actionGroup>
-+    <actionGroup name="addUpSellProductBySku" extends="addRelatedProductBySku">
-+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddUpSellProductsButton}}" stepKey="clickAddRelatedProductButton"/>
-+        <conditionalClick selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-+        <click selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
-+        <fillField selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
-+        <click selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminAddUpSellProductsModalSection.Modal}}{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectProduct"/>
-+        <click selector="{{AdminAddUpSellProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+    </actionGroup>
-+    <actionGroup name="adminProductAdvancedPricingNewCustomerGroupPrice">
-+        <arguments>
-+            <argument name="qty" type="string" defaultValue="2"/>
-+            <argument name="priceType" type="string" defaultValue="Discount"/>
-+            <argument name="discount" type="string" defaultValue="75"/>
-+            <argument name="customerGroup" type="string" defaultValue="0"/>
-+        </arguments>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroup"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput(customerGroup)}}" userInput="{{qty}}" stepKey="fillProductTierPriceQtyInput1"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceValueTypeSelect(customerGroup)}}" userInput="{{priceType}}" stepKey="selectProductTierPriceValueType1"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput(customerGroup)}}" userInput="{{discount}}" stepKey="selectProductTierPricePriceInput"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton1"/>
-+    </actionGroup>
-+    <actionGroup name="AdminSetProductDisabled">
-+        <conditionalClick selector="{{AdminProductFormSection.enableProductLabel}}" dependentSelector="{{AdminProductFormSection.productStatusValue('1')}}" visible="true" stepKey="disableProduct"/>
-+        <seeElement selector="{{AdminProductFormSection.productStatusValue('2')}}" stepKey="assertThatProductSetToDisabled"/>
-+    </actionGroup>
-+
-+    <!-- You are on product Edit Page -->
-+    <!-- Assert checkbox available for website in Product In Websites -->
-+    <actionGroup name="AssertWebsiteIsAvailableInProductWebsites">
-+        <arguments>
-+            <argument name="website" type="string"/>
-+        </arguments>
-+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToProductInWebsitesSection"/>
-+        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{ProductInWebsitesSection.sectionHeaderOpened}}" visible="false" stepKey="expandProductWebsitesSection"/>
-+        <seeElement selector="{{ProductInWebsitesSection.website(website)}}" stepKey="seeCheckboxForWebsite"/>
-+    </actionGroup>
-+
-+    <!-- You are on product Edit Page -->
-+    <!-- Assert checkbox not available for website in Product In Websites -->
-+    <actionGroup name="AssertWebsiteIsNotAvailableInProductWebsites" extends="AssertWebsiteIsAvailableInProductWebsites">
-+        <remove keyForRemoval="seeCheckboxForWebsite"/>
-+        <dontSeeElement selector="{{ProductInWebsitesSection.website(website)}}" after="expandProductWebsitesSection" stepKey="dontSeeCheckboxForWebsite"/>
-+    </actionGroup>
-+
-+    <!-- You are on product Edit Page -->
-+    <!-- Assert checkbox Is checked for website in Product In Websites -->
-+    <actionGroup name="AssertProductIsAssignedToWebsite" extends="AssertWebsiteIsAvailableInProductWebsites">
-+        <remove keyForRemoval="seeCheckboxForWebsite"/>
-+        <seeCheckboxIsChecked selector="{{ProductInWebsitesSection.website(website)}}" after="expandProductWebsitesSection" stepKey="seeCustomWebsiteIsChecked"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
-index 3f4ee180fc6..ed0c4387cde 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
-@@ -7,14 +7,268 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="navigateToCreatedProductAttribute">
-         <arguments>
-             <argument name="ProductAttribute"/>
-         </arguments>
-         <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}"
-+                   userInput="{{ProductAttribute.attribute_code}}" stepKey="setAttributeCode"/>
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
-+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2" />
-+    </actionGroup>
-+    <actionGroup name="navigateToEditProductAttribute">
-+        <arguments>
-+            <argument name="ProductAttribute" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-+        <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="{{ProductAttribute}}" stepKey="navigateToAttributeEditPage1" />
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="navigateToAttributeEditPage2" />
-+        <waitForPageLoad stepKey="waitForPageLoad2" />
-+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="navigateToAttributeEditPage3" />
-+        <waitForPageLoad stepKey="waitForPageLoad3" />
-+    </actionGroup>
-+
-+    <actionGroup name="AdminCreateAttributeFromProductPage">
-+        <arguments>
-+            <argument name="attributeName" type="string"/>
-+            <argument name="attributeType" type="string" defaultValue="TextField"/>
-+        </arguments>
-+        <click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAttributeBtn"/>
-+        <see userInput="Select Attribute" stepKey="checkNewAttributePopUpAppeared"/>
-+        <click selector="{{AdminProductFormAttributeSection.createNewAttribute}}" stepKey="clickCreateNewAttribute"/>
-+        <fillField selector="{{AdminProductFormNewAttributeSection.attributeLabel}}" userInput="{{attributeName}}" stepKey="fillAttributeLabel"/>
-+        <selectOption selector="{{AdminProductFormNewAttributeSection.attributeType}}" userInput="{{attributeType}}" stepKey="selectAttributeType"/>
-+        <click selector="{{AdminProductFormNewAttributeSection.saveAttribute}}" stepKey="saveAttribute"/>
-+    </actionGroup>
-+    <actionGroup name="AdminCreateAttributeFromProductPageWithScope" extends="AdminCreateAttributeFromProductPage" insertAfter="selectAttributeType">
-+        <arguments>
-+            <argument name="scope" type="string" defaultValue="Store View"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminProductFormNewAttributeAdvancedSection.sectionHeader}}" dependentSelector="{{AdminProductFormNewAttributeAdvancedSection.scope}}" visible="false" stepKey="openAttributeAdvancedSection"/>
-+        <selectOption selector="{{AdminProductFormNewAttributeAdvancedSection.scope}}" userInput="{{scope}}" stepKey="selectScope"/>
-+    </actionGroup>
-+
-+    <actionGroup name="AdminCreateAttributeWithValueWithTwoStoreViesFromProductPage" extends="AdminCreateAttributeFromProductPage">
-+        <remove keyForRemoval="saveAttribute"/>
-+        <arguments>
-+            <argument name="firstStoreViewName" type="string"/>
-+            <argument name="secondStoreViewName" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminProductFormNewAttributeSection.addValue}}" stepKey="addValue" after="selectAttributeType"/>
-+        <seeElement selector="{{AdminProductFormNewAttributeSection.optionViewName(firstStoreViewName))}}" stepKey="seeFirstStoreView"/>
-+        <seeElement selector="{{AdminProductFormNewAttributeSection.optionViewName(firstStoreViewName))}}" stepKey="seeSecondStoreView"/>
-+        <fillField selector="{{AdminProductFormNewAttributeSection.optionValue('1'))}}" userInput="default" stepKey="fillDefaultStoreView"/>
-+        <fillField selector="{{AdminProductFormNewAttributeSection.optionValue('2'))}}" userInput="admin" stepKey="fillAdminStoreView"/>
-+        <fillField selector="{{AdminProductFormNewAttributeSection.optionValue('3'))}}" userInput="view1" stepKey="fillFirstStoreView"/>
-+        <fillField selector="{{AdminProductFormNewAttributeSection.optionValue('4'))}}" userInput="view2" stepKey="fillSecondStoreView"/>
-+
-+        <!--Check store view in Manage Titles section-->
-+        <click selector="{{AdminProductFormNewAttributeSection.manageTitlesHeader}}" stepKey="openManageTitlesSection"/>
-+        <seeElement selector="{{AdminProductFormNewAttributeSection.manageTitlesViewName(customStoreEN.name)}}" stepKey="seeFirstStoreViewName"/>
-+        <seeElement selector="{{AdminProductFormNewAttributeSection.manageTitlesViewName(customStoreFR.name)}}" stepKey="seeSecondStoreViewName"/>
-+        <click selector="{{AdminProductFormNewAttributeSection.saveAttribute}}" stepKey="saveAttribute1"/>
-+    </actionGroup>
-+
-+    <!-- Creates attribute and attribute set from the product page-->
-+    <actionGroup name="AdminProductPageCreateAttributeSetWithAttribute">
-+        <arguments>
-+            <argument name="attributeName" type="string"/>
-+            <argument name="attributeSetName" type="string"/>
-+            <argument name="attributeType" type="string" defaultValue="TextField"/>
-+        </arguments>
-+        <click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAttributeBtn"/>
-+        <waitForPageLoad stepKey="waitForSidePanel"/>
-+        <see userInput="Select Attribute" stepKey="checkNewAttributePopUpAppeared"/>
-+        <click selector="{{AdminProductFormAttributeSection.createNewAttribute}}" stepKey="clickCreateNewAttribute"/>
-+        <fillField selector="{{AdminProductFormNewAttributeSection.attributeLabel}}" userInput="{{attributeName}}" stepKey="fillAttributeLabel"/>
-+        <selectOption selector="{{AdminProductFormNewAttributeSection.attributeType}}" userInput="{{attributeType}}" stepKey="selectAttributeType"/>
-+        <click selector="{{AdminProductFormNewAttributeSection.saveInNewSet}}" stepKey="saveAttribute"/>
-+        <fillField selector="{{AdminProductFormNewAttributeNewSetSection.setName}}" userInput="{{attributeSetName}}" stepKey="fillSetName"/>
-+        <click selector="{{AdminProductFormNewAttributeNewSetSection.accept}}" stepKey="acceptPopup"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingToFinish"/>
-+        <!-- Product page will hang if there is no reload-->
-+        <reloadPage stepKey="reloadPage"/>
-+        <waitForPageLoad stepKey="waitForReload"/>
-+    </actionGroup>
-+
-+    <!-- Create attribute and set with given search weight and defaultValue from the Edit Product Page -->
-+    <actionGroup name="AdminCreateAttributeWithSearchWeight" extends="AdminProductPageCreateAttributeSetWithAttribute" insertAfter="selectAttributeType">
-+        <arguments>
-+            <argument name="weight" type="string" defaultValue="1"/>
-+            <argument name="defaultValue" type="string" defaultValue="default"/>
-+        </arguments>
-+        <click selector="{{AdminProductFormNewAttributeAdvancedSection.sectionHeader}}" stepKey="openAdvancedSection"/>
-+        <fillField selector="{{AdminProductFormNewAttributeAdvancedSection.defaultValue}}" userInput="{{defaultValue}}" stepKey="inputDefault"/>
-+        <click selector="{{AdminProductFormNewAttributeStorefrontSection.sectionHeader}}" stepKey="openStorefrontSection"/>
-+        <checkOption selector="{{AdminProductFormNewAttributeStorefrontSection.useInSearch}}" stepKey="checkUseInSearch"/>
-+        <waitForElementVisible selector="{{AdminProductFormNewAttributeStorefrontSection.searchWeight}}" stepKey="waitForSearchWeight"/>
-+        <selectOption selector="{{AdminProductFormNewAttributeStorefrontSection.searchWeight}}" userInput="{{weight}}" stepKey="selectWeight"/>
-+    </actionGroup>
-+    
-+    <actionGroup name="AdminProductPageSelectAttributeSet">
-+        <arguments>
-+            <argument name="attributeSetName" type="string"/>
-+        </arguments>
-+        <click stepKey="openDropdown" selector="{{AdminProductFormSection.attributeSet}}"/>
-+        <fillField stepKey="filter" selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{attributeSetName}}"/>
-+        <click stepKey="clickResult" selector="{{AdminProductFormSection.attributeSetFilterResult}}"/>
-+    </actionGroup>
-+
-+    <actionGroup name="AdminProductPageFillTextAttributeValueByName">
-+        <arguments>
-+            <argument name="attributeName" type="string"/>
-+            <argument name="value" type="string"/>
-+        </arguments>
-+        <click stepKey="openSection" selector="{{AdminProductAttributeSection.attributeSectionHeader}}"/>
-+        <fillField stepKey="fillValue" selector="{{AdminProductAttributeSection.textAttributeByName(attributeName)}}" userInput="{{value}}"/>
-+    </actionGroup>
-+
-+    <actionGroup name="changeUseForPromoRuleConditionsProductAttribute">
-+        <arguments>
-+            <argument name="option" type="string"/>
-+        </arguments>
-+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStoreFrontPropertiesTab"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <selectOption selector="{{StorefrontPropertiesSection.useForPromoRuleConditions}}" userInput="{{option}}" stepKey="changeOption"/>
-+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the product attribute." stepKey="successMessage"/>
-+    </actionGroup>
-+    <actionGroup name="deleteProductAttribute" extends="navigateToCreatedProductAttribute">
-+        <click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="deleteAttribute"/>
-+        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="ClickOnDeleteButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}"
-+                    stepKey="waitForSuccessMessage"/>
-+    </actionGroup>
-+    <actionGroup name="deleteProductAttributeByLabel">
-+        <arguments>
-+            <argument name="ProductAttribute"/>
-+        </arguments>
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{ProductAttribute.default_label}}" stepKey="setAttributeCode"/>
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
-+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="deleteAttribute"/>
-+        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="ClickOnDeleteButton"/>
-         <waitForPageLoad stepKey="waitForPageLoad1"/>
--        <click selector="{{AdminProductAttributeGridSection.AttributeCode(ProductAttribute.attribute_code)}}" stepKey="navigateToAttributeEditPage1" />
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
-+    </actionGroup>
-+    <!-- Delete product attribute by Attribute Code -->
-+    <actionGroup name="deleteProductAttributeByAttributeCode">
-+        <arguments>
-+            <argument name="ProductAttributeCode" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{ProductAttributeCode}}" stepKey="setAttributeCode"/>
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
-+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
-         <waitForPageLoad stepKey="waitForPageLoad2" />
-+        <click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="deleteAttribute"/>
-+        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="ClickOnDeleteButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
-+    </actionGroup>
-+    <!--Filter product attribute by Attribute Code -->
-+    <actionGroup name="filterProductAttributeByAttributeCode">
-+        <arguments>
-+            <argument name="ProductAttributeCode" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
-+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{ProductAttributeCode}}" stepKey="setAttributeCode"/>
-+        <waitForPageLoad stepKey="waitForUserInput"/>
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
-+    </actionGroup>
-+    <!--Filter product attribute by Default Label -->
-+    <actionGroup name="filterProductAttributeByDefaultLabel">
-+        <arguments>
-+            <argument name="productAttributeLabel" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
-+        <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="{{productAttributeLabel}}" stepKey="setDefaultLabel"/>
-+        <waitForPageLoad stepKey="waitForUserInput"/>
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
-+    </actionGroup>
-+    <actionGroup name="saveProductAttribute">
-+        <waitForElementVisible selector="{{AttributePropertiesSection.Save}}" stepKey="waitForSaveButton"/>
-+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForAttributeToSave"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+    <actionGroup name="confirmChangeInputTypeModal">
-+        <waitForElementVisible selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostConfirmButton}}" stepKey="waitForChangeInputTypeButton"/>
-+        <click selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostConfirmButton}}" stepKey="clickChangeInputTypeButton"/>
-+        <waitForElementNotVisible selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostModal}}" stepKey="waitForChangeInputTypeModalGone"/>
-+    </actionGroup>
-+    <actionGroup name="saveProductAttributeInUse">
-+        <waitForElementVisible selector="{{AttributePropertiesSection.Save}}" stepKey="waitForSaveButton"/>
-+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForAttributeToSave"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+
-+    <!--Clicks Add Attribute and adds the given attribute-->
-+    <actionGroup name="addProductAttributeInProductModal">
-+        <arguments>
-+            <argument name="attributeCode" type="string"/>
-+        </arguments>
-+        <click stepKey="addAttribute" selector="{{AdminProductFormActionSection.addAttributeButton}}"/>
-+        <conditionalClick selector="{{AdminProductAddAttributeModalSection.clearFilters}}" dependentSelector="{{AdminProductAddAttributeModalSection.clearFilters}}" visible="true" stepKey="clearFilters"/>
-+        <click stepKey="clickFilters" selector="{{AdminProductAddAttributeModalSection.filters}}"/>
-+        <fillField stepKey="fillCode" selector="{{AdminProductAddAttributeModalSection.attributeCodeFilter}}" userInput="{{attributeCode}}"/>
-+        <click stepKey="clickApply" selector="{{AdminProductAddAttributeModalSection.applyFilters}}"/>
-+        <waitForPageLoad stepKey="waitForFilters"/>
-+        <checkOption selector="{{AdminProductAddAttributeModalSection.firstRowCheckBox}}" stepKey="checkAttribute"/>
-+        <click stepKey="addSelected" selector="{{AdminProductAddAttributeModalSection.addSelected}}"/>
-+    </actionGroup>
-+
-+    <!--Clicks createNewAttribute and fills out form-->
-+    <actionGroup name="createProductAttribute">
-+        <arguments>
-+            <argument name="attribute" type="entity" defaultValue="productAttributeWysiwyg"/>
-+        </arguments>
-+        <click stepKey="createNewAttribute" selector="{{AdminProductAttributeGridSection.createNewAttributeBtn}}"/>
-+        <fillField stepKey="fillDefaultLabel" selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{attribute.attribute_code}}"/>
-+        <selectOption selector="{{AttributePropertiesSection.InputType}}" stepKey="checkInputType" userInput="{{attribute.frontend_input}}"/>
-+        <selectOption selector="{{AttributePropertiesSection.ValueRequired}}" stepKey="checkRequired" userInput="{{attribute.is_required_admin}}"/>
-+        <click stepKey="saveAttribute" selector="{{AttributePropertiesSection.Save}}"/>
-+    </actionGroup>
-+
-+    <!-- Inputs text default value and attribute code-->
-+    <actionGroup name="createProductAttributeWithTextField" extends="createProductAttribute" insertAfter="checkRequired">
-+        <click stepKey="openAdvancedProperties" selector="{{AdvancedAttributePropertiesSection.AdvancedAttributePropertiesSectionToggle}}"/>
-+        <fillField stepKey="fillCode" selector="{{AdvancedAttributePropertiesSection.AttributeCode}}" userInput="{{attribute.attribute_code}}"/>
-+        <fillField stepKey="fillDefaultValue" selector="{{AdvancedAttributePropertiesSection.DefaultValueText}}" userInput="{{attribute.default_value}}"/>
-+    </actionGroup>
-+
-+    <!-- Inputs date default value and attribute code-->
-+    <actionGroup name="createProductAttributeWithDateField" extends="createProductAttribute" insertAfter="checkRequired">
-+        <arguments>
-+            <argument name="date" type="string"/>
-+        </arguments>
-+        <click stepKey="openAdvancedProperties" selector="{{AdvancedAttributePropertiesSection.AdvancedAttributePropertiesSectionToggle}}"/>
-+        <fillField stepKey="fillCode" selector="{{AdvancedAttributePropertiesSection.AttributeCode}}" userInput="{{attribute.attribute_code}}"/>
-+        <fillField stepKey="fillDefaultValue" selector="{{AdvancedAttributePropertiesSection.DefaultValueDate}}" userInput="{{date}}"/>
-+    </actionGroup>
-+
-+    <!-- Creates dropdown option at row without saving-->
-+    <actionGroup name="createAttributeDropdownNthOption">
-+        <arguments>
-+            <argument name="row" type="string"/>
-+            <argument name="adminName" type="string"/>
-+            <argument name="frontName" type="string"/>
-+        </arguments>
-+        <click stepKey="clickAddOptions" selector="{{AttributePropertiesSection.dropdownAddOptions}}"/>
-+        <waitForPageLoad stepKey="waitForNewOption"/>
-+        <fillField stepKey="fillAdmin" selector="{{AttributePropertiesSection.dropdownNthOptionAdmin(row)}}" userInput="{{adminName}}"/>
-+        <fillField stepKey="fillStoreView" selector="{{AttributePropertiesSection.dropdownNthOptionDefaultStoreView(row)}}" userInput="{{frontName}}"/>
-+    </actionGroup>
-+
-+    <!-- Creates dropdown option at row as default-->
-+    <actionGroup name="createAttributeDropdownNthOptionAsDefault" extends="createAttributeDropdownNthOption">
-+        <checkOption selector="{{AttributePropertiesSection.dropdownNthOptionIsDefault(row)}}" stepKey="setAsDefault" after="fillStoreView"/>
-     </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
-index 33f4ccac2b9..019d103a31c 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AssignAttributeToGroup">
-         <arguments>
-             <argument name="group" type="string"/>
-@@ -34,4 +34,64 @@
-         <click selector="{{AdminProductAttributeSetActionSection.save}}" stepKey="clickSave"/>
-         <see userInput="You saved the attribute set" selector="{{AdminMessagesSection.success}}" stepKey="successMessage"/>
-     </actionGroup>
-+    <actionGroup name="CreateDefaultAttributeSet">
-+        <!--Generic atrribute set creation-->
-+        <arguments>
-+            <argument name="label" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>
-+        <waitForPageLoad stepKey="wait1"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.addAttributeSetBtn}}" stepKey="clickAddAttributeSet"/>
-+        <fillField selector="{{AdminProductAttributeSetSection.name}}" userInput="{{label}}" stepKey="fillName"/>
-+        <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSave1"/>
-+    </actionGroup>
-+    <actionGroup name="goToAttributeGridPage">
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>
-+    </actionGroup>
-+    <actionGroup name="goToAttributeSetByName">
-+        <arguments>
-+            <argument name="name" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminProductAttributeSetGridSection.resetFilter}}" stepKey="clickResetButton"/>
-+        <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="{{name}}" stepKey="filterByName"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearch"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+    </actionGroup>
-+    <!-- Filter By Attribute Label -->
-+    <actionGroup name="filterProductAttributeByAttributeLabel">
-+        <arguments>
-+            <argument name="productAttributeLabel" type="string"/>
-+        </arguments>
-+        <fillField selector="{{AdminProductAttributeGridSection.attributeLabelFilter}}" userInput="{{productAttributeLabel}}" stepKey="setAttributeLabel"/>
-+        <waitForPageLoad stepKey="waitForUserInput"/>
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
-+    </actionGroup>
-+    <actionGroup name="FilterProductAttributeSetGridByAttributeSetName">
-+        <arguments>
-+            <argument name="name" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminProductAttributeSetGridSection.resetFilter}}" stepKey="clickResetButton"/>
-+        <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="{{name}}" stepKey="filterByName"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearch"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
-+    </actionGroup>
-+
-+    <!-- Delete attribute set -->
-+    <actionGroup name="deleteAttributeSetByLabel">
-+        <arguments>
-+            <argument name="label" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>
-+        <waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
-+        <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="{{label}}" stepKey="filterByName"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearch"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-+        <waitForPageLoad stepKey="waitForClick"/>
-+        <click selector="{{AdminProductAttributeSetSection.deleteBtn}}" stepKey="clickDelete"/>
-+        <click selector="{{AdminProductAttributeSetSection.modalOk}}" stepKey="confirmDelete"/>
-+        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="The attribute set has been removed." stepKey="seeDeleteMessage"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
-index c2620bc5a36..3e967cb9c69 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Reset the product grid to the default view-->
-     <actionGroup name="resetProductGridToDefaultView">
-         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-@@ -144,6 +144,18 @@
-         <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
-     </actionGroup>
- 
-+    <!-- Filter product grid by sku, name -->
-+    <actionGroup name="filterProductGridBySkuAndName">
-+        <arguments>
-+            <argument name="product" defaultValue="_defaultProduct"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product.name}}" stepKey="fillProductNameFilter"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
-+    </actionGroup>
-+
-     <!--Delete a product by filtering grid and using delete action-->
-     <actionGroup name="deleteProductUsingProductGrid">
-         <arguments>
-@@ -155,6 +167,7 @@
-         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
-         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
-         <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product.name}}" stepKey="fillProductNameFilter"/>
-         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
-         <see selector="{{AdminProductGridSection.productGridCell('1', 'SKU')}}" userInput="{{product.sku}}"  stepKey="seeProductSkuInGrid"/>
-         <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
-@@ -164,6 +177,13 @@
-         <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
-         <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
-     </actionGroup>
-+    <!--Delete all products by filtering grid and using mass delete action-->
-+    <actionGroup name="deleteAllDuplicateProductUsingProductGrid" extends="deleteProductUsingProductGrid">
-+        <arguments>
-+            <argument name="product"/>
-+        </arguments>
-+        <remove keyForRemoval="seeProductSkuInGrid"/>
-+    </actionGroup>
- 
-     <!--Delete a product by filtering grid and using delete action-->
-     <actionGroup name="deleteProductBySku">
-@@ -172,8 +192,7 @@
-         </arguments>
-         <!--TODO use other action group for filtering grid when MQE-539 is implemented -->
-         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
--        <waitForPageLoad time="60" stepKey="waitForPageLoadInitial"/>
--        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
-         <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
-         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
-@@ -182,8 +201,20 @@
-         <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
-         <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
-         <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
--        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
--        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
-+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmModal"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmProductDelete"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="record(s) have been deleted." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+
-+    <actionGroup name="deleteProductByName" extends="deleteProductBySku">
-+        <arguments>
-+            <argument name="sku" type="string" defaultValue=""/>
-+            <argument name="name" type="string"/>
-+        </arguments>
-+        <remove keyForRemoval="fillProductSkuFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{name}}" stepKey="fillProductSkuFilter" after="openProductFilters"/>
-+        <remove keyForRemoval="seeProductSkuInGrid"/>
-+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{name}}"  stepKey="seeProductNameInGrid" after="clickApplyFilters"/>
-     </actionGroup>
- 
-     <!--Open product for edit by clicking row X and column Y in product grid-->
-@@ -206,4 +237,65 @@
-         <conditionalClick selector="{{AdminProductGridTableHeaderSection.id('descend')}}" dependentSelector="{{AdminProductGridTableHeaderSection.id('ascend')}}" visible="false" stepKey="sortById"/>
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-     </actionGroup>
-+
-+    <!--Disabled a product by filtering grid and using change status action-->
-+    <actionGroup name="ChangeStatusProductUsingProductGridActionGroup">
-+        <arguments>
-+            <argument name="product"/>
-+            <argument name="status" defaultValue="Enable" type="string" />
-+        </arguments>
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <waitForPageLoad time="60" stepKey="waitForPageLoadInitial"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
-+        <see selector="{{AdminProductGridSection.productGridCell('1', 'SKU')}}" userInput="{{product.sku}}"  stepKey="seeProductSkuInGrid"/>
-+        <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
-+        <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
-+
-+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
-+        <click selector="{{AdminProductGridSection.bulkActionOption('Change status')}}" stepKey="clickChangeStatusAction"/>
-+        <click selector="{{AdminProductGridSection.changeStatus('status')}}" stepKey="clickChangeStatusDisabled"/>
-+        <waitForPageLoad stepKey="waitForStatusToBeChanged"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="A total of 1 record(s) have been updated." stepKey="seeSuccessMessage"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForMaskToDisappear"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>
-+    </actionGroup>
-+
-+    <actionGroup name="NavigateToAndResetProductGridToDefaultView" extends="resetProductGridToDefaultView">
-+        <amOnPage url="{{AdminProductIndexPage.url}}" before="clickClearFilters" stepKey="goToAdminProductIndexPage"/>
-+        <waitForPageLoad after="goToAdminProductIndexPage" stepKey="waitForProductIndexPageToLoad"/>
-+    </actionGroup>
-+    <actionGroup name="NavigateToAndResetProductAttributeGridToDefaultView">
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-+        <waitForPageLoad stepKey="waitForGridLoad"/>
-+    </actionGroup>
-+    <!--Filter and select the the product  -->
-+    <actionGroup name="filterAndSelectProduct">
-+        <arguments>
-+            <argument name="productSku" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{productSku}}" stepKey="fillProductSkuFilter"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
-+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
-+        <click stepKey="openSelectedProduct" selector="{{AdminProductGridSection.productRowBySku(productSku)}}"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+        <waitForElementVisible selector="{{AdminHeaderSection.pageTitle}}" stepKey="waitForProductTitle"/>
-+    </actionGroup>
-+
-+    <actionGroup name="deleteProductsIfTheyExist">
-+        <conditionalClick selector="{{AdminProductGridSection.multicheckDropdown}}" dependentSelector="{{AdminProductGridSection.firstProductRow}}" visible="true" stepKey="openMulticheckDropdown"/>
-+        <conditionalClick selector="{{AdminProductGridSection.multicheckOption('Select All')}}" dependentSelector="{{AdminProductGridSection.firstProductRow}}" visible="true" stepKey="selectAllProductInFilteredGrid"/>
-+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
-+        <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
-+        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="waitForModalPopUp"/>
-+        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetProductDesignSettingsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetProductDesignSettingsActionGroup.xml
-new file mode 100644
-index 00000000000..7998cdc9373
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetProductDesignSettingsActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSetProductDesignSettingsActionGroup">
-+        <arguments>
-+            <argument name="designSettings" defaultValue="simpleBlankDesign"/>
-+        </arguments>
-+        <click selector="{{ProductDesignSection.DesignTab}}" stepKey="clickDesignTab"/>
-+        <waitForPageLoad stepKey="waitForTabOpen"/>
-+        <selectOption selector="{{ProductDesignSection.LayoutDropdown}}" userInput="{{designSettings.page_layout}}" stepKey="setLayout"/>
-+        <selectOption selector="{{ProductDesignSection.productOptionsContainer}}" userInput="{{designSettings.options_container}}" stepKey="setDisplayProductOptions"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitAdvancedInventoryFormActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitAdvancedInventoryFormActionGroup.xml
-new file mode 100644
-index 00000000000..e27454fb604
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitAdvancedInventoryFormActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Click done button;
-+         You must already be on the product form > Advanced Inventory -->
-+    <actionGroup name="AdminSubmitAdvancedInventoryFormActionGroup">
-+        <click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSwitchProductGiftMessageStatusActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSwitchProductGiftMessageStatusActionGroup.xml
-new file mode 100644
-index 00000000000..4d650a727ac
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSwitchProductGiftMessageStatusActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSwitchProductGiftMessageStatusActionGroup">
-+        <arguments>
-+            <argument name="status" defaultValue="0"/>
-+        </arguments>
-+        <click selector="{{AdminProductGiftOptionsSection.giftOptions}}" stepKey="clickToExpandGiftOptionsTab"/>
-+        <waitForPageLoad stepKey="waitForGiftOptionsOpen"/>
-+        <uncheckOption selector="{{AdminProductGiftOptionsSection.useConfigSettingsMessage}}" stepKey="uncheckConfigSettingsMessage"/>
-+        <click selector="{{AdminProductGiftOptionsSection.toggleProductGiftMessage}}" stepKey="clickToGiftMessageSwitcher"/>
-+        <seeElement selector="{{AdminProductGiftOptionsSection.giftMessageStatus('status')}}" stepKey="assertGiftMessageStatus"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUnassignCategoryOnProductAndSaveActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUnassignCategoryOnProductAndSaveActionGroup.xml
-new file mode 100644
-index 00000000000..35816f3cd67
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUnassignCategoryOnProductAndSaveActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminUnassignCategoryOnProductAndSaveActionGroup">
-+        <arguments>
-+            <argument name="categoryName" type="string"/>
-+        </arguments>
-+        <!-- on edit Product page catalog/product/edit/id/{{product_id}}/ -->
-+        <click selector="{{AdminProductFormSection.unselectCategories(categoryName)}}" stepKey="clearCategory"/>
-+        <waitForPageLoad stepKey="waitForDelete"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSave"/>
-+        <waitForPageLoad stepKey="waitForSavingProduct"/>
-+        <see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAttributeDeletionErrorMessageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAttributeDeletionErrorMessageActionGroup.xml
-new file mode 100644
-index 00000000000..9402ac05d79
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAttributeDeletionErrorMessageActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertAttributeDeletionErrorMessageActionGroup">
-+        <waitForElementVisible selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="waitForErrorMessage"/>
-+        <see selector="{{AdminProductMessagesSection.errorMessage}}" userInput="This attribute is used in configurable products." stepKey="deleteProductAttributeFailureMessage"/>
-+    </actionGroup>
-+</actionGroups>
-+
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertDontSeeProductDetailsOnStorefrontActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertDontSeeProductDetailsOnStorefrontActionGroup.xml
-new file mode 100644
-index 00000000000..3d0d16d1050
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertDontSeeProductDetailsOnStorefrontActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertDontSeeProductDetailsOnStorefrontActionGroup">
-+        <arguments>
-+            <argument name="productNumber" type="string"/>
-+            <argument name="productInfo" type="string"/>
-+        </arguments>
-+        <dontSee selector="{{StorefrontCategoryProductSection.ProductInfoByNumber(productNumber)}}" userInput="{{productInfo}}" stepKey="seeProductInfo"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertErrorMessageAfterDeletingWebsiteActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertErrorMessageAfterDeletingWebsiteActionGroup.xml
-new file mode 100644
-index 00000000000..2ae224c71a9
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertErrorMessageAfterDeletingWebsiteActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertErrorMessageAfterDeletingWebsiteActionGroup">
-+        <arguments>
-+            <argument name="errorMessage" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageLoad"/>
-+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonFromAdminCategoryModalSection"/>
-+        <see selector="{{AdminCategoryMessagesSection.errorMessage}}" userInput="{{errorMessage}}" stepKey="seeAssertErrorMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductAttributePresenceInCatalogProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductAttributePresenceInCatalogProductGridActionGroup.xml
-new file mode 100644
-index 00000000000..25390e6b4a8
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductAttributePresenceInCatalogProductGridActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertProductAttributePresenceInCatalogProductGridActionGroup">
-+        <arguments>
-+            <argument name="productAttribute" type="entity"/>
-+        </arguments>
-+         <waitForPageLoad stepKey="waitForCatalogProductGridPageLoad"/>
-+        <seeElement selector="{{AdminGridHeaders.headerByName(productAttribute.label)}}" stepKey="seeAttributeInHeaders"/>
-+    </actionGroup>
-+</actionGroups>
-+
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductDetailsOnStorefrontActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductDetailsOnStorefrontActionGroup.xml
-new file mode 100644
-index 00000000000..68c6e92b93f
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductDetailsOnStorefrontActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertProductDetailsOnStorefrontActionGroup">
-+        <arguments>
-+            <argument name="productNumber" type="string"/>
-+            <argument name="productInfo" type="string"/>
-+        </arguments>
-+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber(productNumber)}}" userInput="{{productInfo}}" stepKey="seeProductInfo"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml
-index 4eca49dc28b..8b657fa1b8a 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AssertProductInStorefrontCategoryPage">
-         <arguments>
-             <argument name="category"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
-index 59c874b8481..391a1a7d670 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AssertProductInStorefrontProductPage">
-         <arguments>
-             <argument name="product"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.xml
-new file mode 100644
-index 00000000000..7917fe68aae
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertProductInfoOnEditPageActionGroup" extends="OpenEditProductOnBackendActionGroup">
-+        <arguments>
-+            <argument name="product" type="entity"/>
-+        </arguments>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="seeProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="seeProductPrice"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{product.quantity}}" stepKey="seeProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="seeProductStockStatus"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml
-new file mode 100644
-index 00000000000..963c9d9f1c9
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertProductOnAdminGridActionGroup" extends="viewProductInAdminGrid">
-+        <arguments>
-+            <argument name="product" defaultValue="_defaultProduct"/>
-+        </arguments>
-+       <remove keyForRemoval="clickClearFiltersAfter"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontCustomProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontCustomProductAttributeActionGroup.xml
-new file mode 100644
-index 00000000000..e27efb41a7e
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontCustomProductAttributeActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontCustomProductAttributeActionGroup">
-+        <arguments>
-+            <argument name="attributeLabel" type="string"/>
-+            <argument name="attributeValue" type="string"/>
-+        </arguments>
-+        <see userInput="{{attributeLabel}}" selector="{{StorefrontProductMoreInformationSection.customAttributeLabel(attributeLabel)}}" stepKey="seeAttributeLabel" />
-+        <see userInput="{{attributeValue}}" selector="{{StorefrontProductMoreInformationSection.customAttributeValue(attributeLabel)}}" stepKey="seeAttributeValue" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductPricesActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductPricesActionGroup.xml
-new file mode 100644
-index 00000000000..6e90fe7324d
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductPricesActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontProductPricesActionGroup">
-+        <arguments>
-+            <argument name="productPrice" type="string"/>
-+            <argument name="productFinalPrice" type="string"/>
-+        </arguments>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount" userInput="{{productPrice}}"/>
-+        <see selector="{{StorefrontProductInfoMainSection.updatedPrice}}" stepKey="productFinalPriceAmount" userInput="{{productFinalPrice}}"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertSubTotalOnStorefrontMinicartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertSubTotalOnStorefrontMinicartActionGroup.xml
-new file mode 100644
-index 00000000000..26693771bd1
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertSubTotalOnStorefrontMinicartActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertSubTotalOnStorefrontMiniCartActionGroup">
-+        <arguments>
-+            <argument name="subTotal" type="string"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{StorefrontMinicartSection.showCart}}" stepKey="waitForShowCartButtonVisible"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabTextFromMiniCartSubtotalField"/>
-+        <assertEquals message="Mini shopping cart should contain subtotal {{subTotal}}" stepKey="assertSubtotalFieldFromMiniShoppingCart1">
-+            <expectedResult type="string">{{subTotal}}</expectedResult>
-+            <actualResult type="variable">grabTextFromMiniCartSubtotalField</actualResult>
-+        </assertEquals>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml
-index 304f38e2279..f2a7a0acffe 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml
-@@ -6,7 +6,7 @@
-  */
- -->
- 
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="CheckItemInLayeredNavigationActionGroup">
-         <arguments>
-             <argument name="itemType"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml
-new file mode 100644
-index 00000000000..f7cd2e70762
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+
-+    <actionGroup name="CompareTwoProductsOrder">
-+        <arguments>
-+            <argument name="product_1"/>
-+            <argument name="product_2"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad5"/>
-+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByNumber('1')}}" userInput="alt" stepKey="grabFirstProductName1_1"/>
-+        <assertEquals  expected="{{product_1.name}}" actual="($grabFirstProductName1_1)" message="notExpectedOrder" stepKey="compare1"/>
-+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByNumber('2')}}" userInput="alt" stepKey="grabFirstProductName2_2"/>
-+        <assertEquals  expected="{{product_2.name}}" actual="($grabFirstProductName2_2)" message="notExpectedOrder" stepKey="compare2"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
-new file mode 100644
-index 00000000000..53de47f8106
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="CreateNewProductActionGroup">
-+        <click stepKey="openCatalog" selector="{{AdminMenuSection.catalog}}"/>
-+        <waitForPageLoad stepKey="waitForCatalogSubmenu" time="5"/>
-+        <click stepKey="clickOnProducts" selector="{{CatalogSubmenuSection.products}}"/>
-+        <waitForPageLoad stepKey="waitForProductsPage" time="10"/>
-+        <click stepKey="addProduct" selector="{{ProductsPageSection.addProductButton}}"/>
-+        <waitForPageLoad stepKey="waitForNewProductPage" time="10"/>
-+        <fillField stepKey="FillProductName" selector="{{NewProductPageSection.productName}}" userInput="{{NewProductData.ProductName}}"/>
-+        <fillField stepKey="FillPrice" selector="{{NewProductPageSection.price}}" userInput="{{NewProductData.Price}}"/>
-+        <fillField stepKey="FillQuantity" selector="{{NewProductPageSection.quantity}}" userInput="{{NewProductData.Quantity}}"/>
-+        <click stepKey="Save" selector="{{NewProductPageSection.saveButton}}"/>
-+        <waitForElementVisible stepKey="waitForSuccessfullyCreatedMessage" selector="{{NewProductPageSection.createdSuccessMessage}}" time="10"/>
-+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
-index 6b47479d41c..7723f32d140 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- 
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="CreateCustomRadioOptions">
-         <!-- ActionGroup will add a single custom option to a product -->
-         <!-- You must already be on the product creation page -->
-@@ -15,7 +15,6 @@
-             <argument name="productOption"/>
-             <argument name="productOption2"/>
-         </arguments>
--
-         <click stepKey="clickAddOptions" selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}"/>
-         <waitForPageLoad stepKey="waitForAddProductPageLoad"/>
- 
-@@ -48,10 +47,97 @@
-         <fillField selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" userInput="{{option.title}}" stepKey="fillTitle"/>
-         <click selector="{{AdminProductCustomizableOptionsSection.lastOptionTypeParent}}" stepKey="openTypeSelect"/>
-         <click selector="{{AdminProductCustomizableOptionsSection.optionType('File')}}" stepKey="selectTypeFile"/>
--        <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.optionPrice}}" stepKey="waitForElements"/>
--        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice}}" userInput="{{option.price}}" stepKey="fillPrice"/>
--        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
--        <fillField selector="{{AdminProductCustomizableOptionsSection.optionFileExtensions}}" userInput="{{option.file_extension}}" stepKey="fillCompatibleExtensions"/>
-+        <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.optionPriceByTitle(option.title)}}" stepKey="waitForElements"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPriceByTitle(option.title)}}" userInput="{{option.price}}" stepKey="fillPrice"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceTypeByTitle(option.title)}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionFileExtensionByTitle(option.title)}}" userInput="{{option.file_extension}}" stepKey="fillCompatibleExtensions"/>
-+    </actionGroup>
-+    <actionGroup name="AddProductCustomOptionField">
-+        <arguments>
-+            <argument name="option" defaultValue="ProductOptionField"/>
-+        </arguments>
-+        <scrollTo selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="scrollToAddButtonOption"/>
-+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
-+        <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" stepKey="waitForOption"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" userInput="{{option.title}}" stepKey="fillTitle"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.lastOptionTypeParent}}" stepKey="openTypeSelect"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionType('Field')}}" stepKey="selectTypeFile"/>
-+        <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.optionPriceByTitle(option.title)}}" stepKey="waitForElements"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPriceByTitle(option.title)}}" userInput="{{option.price}}" stepKey="fillPrice"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceTypeByTitle(option.title)}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionSkuByTitle(option.title)}}" userInput="{{option.title}}" stepKey="fillSku"/>
-+    </actionGroup>
-+    <actionGroup name="importProductCustomizableOptions">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminProductCustomizableOptionsSection.importOptions}}" stepKey="clickImportOptions"/>
-+        <waitForElementVisible selector="{{AdminProductImportOptionsSection.selectProductTitle}}" stepKey="waitForTitleVisible"/>
-+        <conditionalClick selector="{{AdminProductImportOptionsSection.resetFiltersButton}}" dependentSelector="{{AdminProductImportOptionsSection.resetFiltersButton}}" visible="true" stepKey="clickResetFilters"/>
-+        <click selector="{{AdminProductImportOptionsSection.filterButton}}" stepKey="clickFilterButton"/>
-+        <waitForElementVisible selector="{{AdminProductImportOptionsSection.nameField}}" stepKey="waitForNameField"/>
-+        <fillField selector="{{AdminProductImportOptionsSection.nameField}}" userInput="{{productName}}" stepKey="fillProductName"/>
-+        <click selector="{{AdminProductImportOptionsSection.applyFiltersButton}}" stepKey="clickApplyFilters"/>
-+        <checkOption selector="{{AdminProductImportOptionsSection.firstRowItemCheckbox}}"  stepKey="checkProductCheckbox"/>
-+        <click selector="{{AdminProductImportOptionsSection.importButton}}" stepKey="clickImport"/>
-+    </actionGroup>
-+    <actionGroup name="resetImportOptionFilter">
-+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.importOptions}}" stepKey="clickImportOptions"/>
-+        <click selector="{{AdminProductImportOptionsSection.resetFiltersButton}}" stepKey="clickResetFilterButton"/>
-+    </actionGroup>
-+    <actionGroup name="checkCustomizableOptionImport">
-+        <arguments>
-+            <argument name="option" defaultValue="ProductOptionField"/>
-+            <argument name="optionIndex" type="string"/>
-+        </arguments>
-+        <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionTitleInput(optionIndex)}}" stepKey="grabOptionTitle"/>
-+        <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionPrice(optionIndex)}}" stepKey="grabOptionPrice"/>
-+        <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionSku(optionIndex)}}" stepKey="grabOptionSku"/>
-+        <assertEquals expected="{{option.title}}" expectedType="string" actual="$grabOptionTitle" stepKey="assertOptionTitle"/>
-+        <assertEquals expected="{{option.price}}" expectedType="string" actual="$grabOptionPrice" stepKey="assertOptionPrice"/>
-+        <assertEquals expected="{{option.title}}" expectedType="string" actual="$grabOptionSku" stepKey="assertOptionSku"/>
-+    </actionGroup>
-+    <!-- Assumes we are on product edit page -->
-+    <actionGroup name="AdminDeleteAllProductCustomOptions">
-+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="expandContentTab"/>
-+        <waitForPageLoad time="10" stepKey="waitCustomizableOptionsTabOpened"/>
-+        <executeInSelenium function="function($webdriver) use ($I) {
-+        $buttons = $webdriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('[data-index=\'options\'] [data-index=\'delete_button\']'));
-+        while(!empty($buttons)) {
-+            $button = reset($buttons);
-+            $I->executeJS('arguments[0].scrollIntoView(false)', [$button]);
-+            $button->click();
-+            $webdriver->wait()->until(\Facebook\WebDriver\WebDriverExpectedCondition::stalenessOf($button));
-+            $buttons = $webdriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('[data-index=\'options\'] [data-index=\'delete_button\']'));
-+        }
-+        }" stepKey="deleteCustomOptions"/>
-+        <dontSeeElement selector="{{AdminProductCustomizableOptionsSection.customOptionButtonDelete}}" stepKey="assertNoCustomOptions"/>
-+    </actionGroup>
-+    <!-- Assumes we are on product edit page -->
-+    <actionGroup name="AdminAssertProductHasNoCustomOptions">
-+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="expandContentTab"/>
-+        <waitForPageLoad time="10" stepKey="waitCustomizableOptionsTabOpened"/>
-+        <dontSeeElement selector="{{AdminProductCustomizableOptionsSection.customOption}}" stepKey="assertNoCustomOptions"/>
-+    </actionGroup>
-+    <!-- Assumes we are on product edit page -->
-+    <actionGroup name="AdminAssertProductHasNoCustomOption" extends="AdminAssertProductCustomOptionVisible">
-+        <remove keyForRemoval="assertCustomOptionVisible"/>
-+        <dontSeeElement selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle(option.title)}}" after="waitCustomizableOptionsTabOpened" stepKey="assertNoCustomOption"/>
-+    </actionGroup>
-+    <!-- Assumes we are on product edit page -->
-+    <actionGroup name="AdminAssertProductCustomOptionVisible">
-+        <arguments>
-+            <argument name="option" defaultValue="ProductOptionField"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="expandContentTab"/>
-+        <waitForPageLoad time="10" stepKey="waitCustomizableOptionsTabOpened"/>
-+        <seeElement selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle(option.title)}}" stepKey="assertCustomOptionVisible"/>
-+    </actionGroup>
-+    <!-- Assumes we are on product edit page -->
-+    <actionGroup name="AdminDeleteProductCustomOption" extends="AdminAssertProductCustomOptionVisible">
-+        <remove keyForRemoval="assertCustomOptionVisible"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.deleteCustomOptions(option.title)}}" after="waitCustomizableOptionsTabOpened" stepKey="clickDeleteCustomOption"/>
-     </actionGroup>
--
- </actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
-new file mode 100644
-index 00000000000..7491b39aa8f
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="DeleteProductActionGroup">
-+        <arguments>
-+            <argument name="productName" defaultValue=""/>
-+        </arguments>
-+        <click stepKey="openCatalog" selector="{{AdminMenuSection.catalog}}"/>
-+        <waitForPageLoad stepKey="waitForCatalogSubmenu" time="5"/>
-+        <click stepKey="clickOnProducts" selector="{{CatalogSubmenuSection.products}}"/>
-+        <waitForPageLoad stepKey="waitForProductsPage" time="10"/>
-+        <click stepKey="TickCheckbox" selector="{{ProductsPageSection.checkboxForProduct(productName)}}"/>
-+        <click stepKey="OpenActions" selector="{{ProductsPageSection.actions}}"/>
-+        <waitForAjaxLoad stepKey="waitForDelete" time="5"/>
-+        <click stepKey="ChooseDelete" selector="{{ProductsPageSection.delete}}"/>
-+        <waitForPageLoad stepKey="waitForDeleteItemPopup" time="10"/>
-+        <click stepKey="clickOnOk" selector="{{ProductsPageSection.ok}}"/>
-+        <waitForElementVisible stepKey="waitForSuccessfullyDeletedMessage" selector="{{ProductsPageSection.deletedSuccessMessage}}" time="10"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductAttributeByAttributeCodeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductAttributeByAttributeCodeActionGroup.xml
-new file mode 100644
-index 00000000000..575cbdcd9b6
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductAttributeByAttributeCodeActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+<actionGroup name="DeleteProductAttributeByAttributeCodeActionGroup">
-+    <arguments>
-+        <argument name="productAttributeCode" type="string"/>
-+    </arguments>
-+    <waitForPageLoad stepKey="waitForViewAdminProductAttributeLoad" time="30" />
-+    <click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="deleteAttribute"/>
-+    <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="clickOnConfirmOk"/>
-+    <waitForPageLoad stepKey="waitForViewProductAttributePageLoad"/>
-+</actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/FilterProductInGridByStoreViewAndNameActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/FilterProductInGridByStoreViewAndNameActionGroup.xml
-new file mode 100644
-index 00000000000..d5d378ad11b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/FilterProductInGridByStoreViewAndNameActionGroup.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="FilterProductInGridByStoreViewAndNameActionGroup">
-+        <arguments>
-+            <argument name="storeView" type="string"/>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.storeViewDropdown(storeView)}}" stepKey="clickStoreViewDropdown"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{productName}}" stepKey="fillProductNameInNameFilter"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <see selector="{{AdminProductGridFilterSection.nthRow('1')}}" userInput="{{productName}}" stepKey="seeFirstRowToVerifyProductVisibleInGrid"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/MoveCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/MoveCategoryActionGroup.xml
-index ae9dc0557a9..7bb9aa60ca6 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/MoveCategoryActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/MoveCategoryActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="MoveCategoryActionGroup">
-         <arguments>
-             <argument name="childCategory"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenEditProductOnBackendActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenEditProductOnBackendActionGroup.xml
-index 07fba7cc6be..ea2543cd5c2 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenEditProductOnBackendActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenEditProductOnBackendActionGroup.xml
-@@ -6,12 +6,12 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="OpenEditProductOnBackendActionGroup">
-         <arguments>
-             <argument name="product" defaultValue="product"/>
-         </arguments>
--        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductRow"/>
-+        <click selector="{{AdminProductGridSection.productRowBySku(product.sku)}}" stepKey="clickOnProductRow"/>
-         <waitForPageLoad time="30" stepKey="waitForProductPageLoad"/>
-         <seeInField userInput="{{product.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="seeProductSkuOnEditProductPage"/>
-     </actionGroup>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductAttributeFromSearchResultInGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductAttributeFromSearchResultInGridActionGroup.xml
-new file mode 100644
-index 00000000000..31b024c82a9
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductAttributeFromSearchResultInGridActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="OpenProductAttributeFromSearchResultInGridActionGroup" extends="SearchAttributeByCodeOnProductAttributeGridActionGroup">
-+        <arguments>
-+            <argument name="productAttributeCode" type="string"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{AdminProductAttributeGridSection.AttributeCode(productAttributeCode)}}" stepKey="waitForAdminProductAttributeGridLoad"/>
-+        <click selector="{{AdminProductAttributeGridSection.AttributeCode(productAttributeCode)}}" stepKey="clickAttributeToView"/>
-+        <waitForPageLoad stepKey="waitForViewAdminProductAttributeLoad" />
-+   </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductFromCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductFromCategoryPageActionGroup.xml
-index e8794ab895c..c460dcbfbec 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductFromCategoryPageActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductFromCategoryPageActionGroup.xml
-@@ -5,7 +5,7 @@
-  * See COPYING.txt for license details.
- -->
- 
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="OpenProductFromCategoryPageActionGroup">
-         <arguments>
-             <argument name="category"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStoreFrontProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStoreFrontProductPageActionGroup.xml
-new file mode 100644
-index 00000000000..4bfd5673e4a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStoreFrontProductPageActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="OpenStoreFrontProductPageActionGroup">
-+        <arguments>
-+            <argument name="productUrlKey" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontProductPage.url(productUrlKey)}}" stepKey="amOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStorefrontProductPageByProductNameActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStorefrontProductPageByProductNameActionGroup.xml
-new file mode 100644
-index 00000000000..c25cdc403f8
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStorefrontProductPageByProductNameActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="OpenStorefrontProductPageByProductNameActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string" defaultValue="{{_defaultProduct.name}}"/>
-+        </arguments>
-+        <amOnPage url="{{productName}}.html" stepKey="amOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
-index 53acfe2b437..2f9d38516bd 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="RestoreLayoutSetting">
-         <selectOption selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="No layout updates" stepKey="selectNoLayoutUpdates1" after="expandDefaultLayouts"/>
-         <selectOption selector="{{DefaultLayoutsSection.productLayout}}" userInput="No layout updates" stepKey="selectNoLayoutUpdates2" before="clickSaveConfig"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAndMultiselectActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAndMultiselectActionGroup.xml
-index 943fe803232..53e7ea3589d 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAndMultiselectActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAndMultiselectActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="searchAndMultiSelectActionGroup">
-         <arguments>
-             <argument name="dropDownSelector" />
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAttributeByCodeOnProductAttributeGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAttributeByCodeOnProductAttributeGridActionGroup.xml
-new file mode 100644
-index 00000000000..67cdd8192fc
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAttributeByCodeOnProductAttributeGridActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="SearchAttributeByCodeOnProductAttributeGridActionGroup">
-+        <arguments>
-+            <argument name="productAttributeCode" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-+        <waitForPageLoad stepKey="waitForAdminProductAttributeGridLoad"/>
-+        <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
-+        <waitForPageLoad stepKey="waitForAdminProductAttributeGridSectionLoad"/>
-+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{productAttributeCode}}" stepKey="setAttributeCode"/>
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskOnGridToDisappear"/>
-+        <see selector="{{AdminProductAttributeGridSection.attributeCodeColumn}}" userInput="{{productAttributeCode}}" stepKey="seeAttributeCodeInGrid"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
-index 5fbc9c5d7fc..aca9ba24c11 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
-@@ -6,16 +6,30 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="SearchForProductOnBackendActionGroup">
-         <arguments>
-             <argument name="product" defaultValue="product"/>
-         </arguments>
-         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
--        <waitForPageLoad time="30" stepKey="waitForProductsPageToLoad"/>
-+        <waitForPageLoad time="60" stepKey="waitForProductsPageToLoad"/>
-         <click selector="{{AdminProductFiltersSection.filtersButton}}" stepKey="openFiltersSectionOnProductsPage"/>
-         <conditionalClick selector="{{AdminProductFiltersSection.clearFiltersButton}}" dependentSelector="{{AdminProductFiltersSection.clearFiltersButton}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
-         <fillField userInput="{{product.sku}}" selector="{{AdminProductFiltersSection.skuInput}}" stepKey="fillSkuFieldOnFiltersSection"/>
-         <click selector="{{AdminProductFiltersSection.apply}}" stepKey="clickApplyFiltersButton"/>
-     </actionGroup>
-+
-+    <actionGroup name="SearchForProductOnBackendByNameActionGroup" extends="SearchForProductOnBackendActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <remove keyForRemoval="fillSkuFieldOnFiltersSection"/>
-+        <fillField userInput="{{productName}}" selector="{{AdminProductFiltersSection.nameInput}}" after="cleanFiltersIfTheySet" stepKey="fillNameFieldOnFiltersSection"/>
-+    </actionGroup>
-+
-+    <actionGroup name="ClearProductsFilterActionGroup">
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad time="30" stepKey="waitForProductsPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductFiltersSection.clearFiltersButton}}" dependentSelector="{{AdminProductFiltersSection.clearFiltersButton}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddProductToCartWithQtyActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddProductToCartWithQtyActionGroup.xml
-new file mode 100644
-index 00000000000..5432d547e80
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddProductToCartWithQtyActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAddProductToCartWithQtyActionGroup">
-+        <arguments>
-+            <argument name="productQty" type="string"/>
-+        </arguments>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{productQty}}" stepKey="fillProduct1Quantity"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="clickOnAddToCartButton"/>
-+        <waitForPageLoad stepKey="waitForProductToAddInCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+        <seeElement selector="{{StorefrontProductPageSection.successMsg}}" stepKey="seeSuccessSaveMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
-index 105a5c58788..080b374c60b 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Click Add to Cart button in storefront product page-->
-     <actionGroup name="StorefrontAddToCartCustomOptionsProductPageActionGroup">
-         <arguments>
-@@ -14,6 +14,7 @@
-         </arguments>
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-         <see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
-     </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCustomOptionByTitleActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCustomOptionByTitleActionGroup.xml
-new file mode 100644
-index 00000000000..bc922a40b05
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCustomOptionByTitleActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertCustomOptionByTitleActionGroup">
-+        <arguments>
-+            <argument name="title" type="string"/>
-+        </arguments>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.customOptionByTitle(title)}}" stepKey="seeCustomOption"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertGiftMessageFieldsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertGiftMessageFieldsActionGroup.xml
-new file mode 100644
-index 00000000000..a5f1b92862b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertGiftMessageFieldsActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertGiftMessageFieldsActionGroup">
-+        <waitForElementVisible selector="{{StorefrontProductCartGiftOptionSection.giftOptions}}" stepKey="waitForCartGiftOptionVisible"/>
-+        <click selector="{{StorefrontProductCartGiftOptionSection.giftOptions}}" stepKey="clickGiftOptionBtn"/>
-+        <seeElement selector="{{StorefrontProductCartGiftOptionSection.fieldTo}}" stepKey="seeFieldTo"/>
-+        <seeElement selector="{{StorefrontProductCartGiftOptionSection.fieldFrom}}" stepKey="seeFieldFrom"/>
-+        <seeElement selector="{{StorefrontProductCartGiftOptionSection.message}}" stepKey="seeMessageArea"/>
-+        <seeElement selector="{{StorefrontProductCartGiftOptionSection.update}}" stepKey="seeUpdateButton"/>
-+        <seeElement selector="{{StorefrontProductCartGiftOptionSection.cancel}}" stepKey="seeCancelButton"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
-new file mode 100644
-index 00000000000..1bb7c179dfc
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertProductImagesOnProductPageActionGroup">
-+        <arguments>
-+            <argument name="productImage" type="string" defaultValue="Magento_Catalog/images/product/placeholder/image.jpg" />
-+        </arguments>
-+        <waitForElementNotVisible selector="{{StorefrontProductMediaSection.gallerySpinner}}" stepKey="waitGallerySpinnerDisappear" />
-+        <seeElement selector="{{StorefrontProductMediaSection.gallery}}" stepKey="seeProductGallery" />
-+        <seeElement selector="{{StorefrontProductMediaSection.productImage(productImage)}}" stepKey="seeProductImage" />
-+        <click selector="{{StorefrontProductMediaSection.productImage(productImage)}}" stepKey="openFullscreenImage" />
-+        <waitForPageLoad stepKey="waitForGalleryLoaded" />
-+        <seeElement selector="{{StorefrontProductMediaSection.productImageFullscreen(productImage)}}" stepKey="seeFullscreenProductImage" />
-+        <click selector="{{StorefrontProductMediaSection.closeFullscreenImage}}" stepKey="closeFullScreenImage" />
-+        <waitForPageLoad stepKey="waitForGalleryDisappear" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductInWidgetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductInWidgetActionGroup.xml
-new file mode 100644
-index 00000000000..c25b73bab21
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductInWidgetActionGroup.xml
-@@ -0,0 +1,37 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Check the product in recently viewed widget -->
-+    <actionGroup name="StorefrontAssertProductInRecentlyViewedWidgetActionGroup">
-+        <arguments>
-+            <argument name="product"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" stepKey="waitWidgetRecentlyViewedProductsGrid"/>
-+        <see selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyViewedWidget"/>
-+    </actionGroup>
-+
-+    <!-- Check the product in recently compared widget -->
-+    <actionGroup name="StorefrontAssertProductInRecentlyComparedWidgetActionGroup">
-+        <arguments>
-+            <argument name="product"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyComparedProductsGrid}}" stepKey="waitWidgetRecentlyComparedProductsGrid"/>
-+        <see selector="{{StorefrontWidgetsSection.widgetRecentlyComparedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyComparedWidget"/>
-+    </actionGroup>
-+
-+    <!-- Check the product in recently ordered widget -->
-+    <actionGroup name="StorefrontAssertProductInRecentlyOrderedWidgetActionGroup">
-+        <arguments>
-+            <argument name="product"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" stepKey="waitWidgetRecentlyOrderedProductsGrid"/>
-+        <see selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyOrderedWidget"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductMainPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductMainPageActionGroup.xml
-new file mode 100644
-index 00000000000..43a34448c8a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductMainPageActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertProductNameOnProductMainPageActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <waitForPageLoad stepKey="waitForTheProductPageToLoad"/>
-+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{productName}}" stepKey="seeProductName"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductPageActionGroup.xml
-new file mode 100644
-index 00000000000..6cb156723b2
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductPageActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertProductNameOnProductPageActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{productName}}" stepKey="seeProductName" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductPriceOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductPriceOnProductPageActionGroup.xml
-new file mode 100644
-index 00000000000..3c62ef89e58
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductPriceOnProductPageActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertProductPriceOnProductPageActionGroup">
-+        <arguments>
-+            <argument name="productPrice" type="string"/>
-+        </arguments>
-+        <see selector="{{StorefrontProductInfoMainSection.price}}" userInput="{{productPrice}}" stepKey="seeProductPrice" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSkuOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSkuOnProductPageActionGroup.xml
-new file mode 100644
-index 00000000000..85d3927a6d6
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSkuOnProductPageActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertProductSkuOnProductPageActionGroup">
-+        <arguments>
-+            <argument name="productSku" type="string"/>
-+        </arguments>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{productSku}}" stepKey="seeProductSku" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSpecialPriceOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSpecialPriceOnProductPageActionGroup.xml
-new file mode 100644
-index 00000000000..9fefa71f102
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSpecialPriceOnProductPageActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertProductSpecialPriceOnProductPageActionGroup">
-+        <arguments>
-+            <argument name="product" type="entity"/>
-+            <argument name="specialPrice" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontProductPage.url(product.name)}}" stepKey="onFirstProductPage"/>
-+        <waitForPageLoad stepKey="waitForFirstProductPage"/>
-+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.specialPriceValue}}" stepKey="waitForProductSpecialPrice"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.specialPriceValue}}" stepKey="grabProductSpecialPrice"/>
-+        <assertEquals actual="$grabProductSpecialPrice" expectedType="string" expected="{{specialPrice}}" stepKey="assertProductPriceValuesAreEqual"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
-index 4376e78242f..7e79182616f 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Go to storefront category product page by given parameters -->
-     <actionGroup name="GoToStorefrontCategoryPageByParameters">
-         <arguments>
-@@ -15,12 +15,28 @@
-             <argument name="mode" type="string"/>
-             <argument name="numOfProductsPerPage" type="string"/>
-             <argument name="sortBy" type="string" defaultValue="position"/>
-+            <argument name="sort" type="string" defaultValue="asc"/>
-         </arguments>
-         <!-- Go to storefront category page -->
--        <amOnPage url="{{StorefrontCategoryPage.url(category)}}?product_list_limit={{numOfProductsPerPage}}&amp;product_list_mode={{mode}}&amp;product_list_order={{sortBy}}" stepKey="onCategoryPage"/>
-+        <amOnPage url="{{StorefrontCategoryPage.url(category)}}?product_list_limit={{numOfProductsPerPage}}&amp;product_list_mode={{mode}}&amp;product_list_order={{sortBy}}&amp;product_list_dir={{sort}}" stepKey="onCategoryPage"/>
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-     </actionGroup>
- 
-+    <actionGroup name="VerifyCategoryPageParameters">
-+        <arguments>
-+            <argument name="category"/>
-+            <argument name="mode" type="string"/>
-+            <argument name="numOfProductsPerPage" type="string"/>
-+            <argument name="sortBy" type="string" defaultValue="position"/>
-+        </arguments>
-+        <seeInCurrentUrl url="/{{category.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
-+        <seeInTitle userInput="{{category.name}}" stepKey="assertCategoryNameInTitle"/>
-+        <see userInput="{{category.name}}" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryName"/>
-+        <see userInput="{{mode}}" selector="{{StorefrontCategoryMainSection.modeGridIsActive}}" stepKey="assertViewMode"/>
-+        <see userInput="{{numOfProductsPerPage}}" selector="{{StorefrontCategoryMainSection.perPage}}" stepKey="assertNumberOfProductsPerPage"/>
-+        <see userInput="{{sortBy}}" selector="{{StorefrontCategoryMainSection.sortedBy}}" stepKey="assertSortedBy"/>
-+    </actionGroup>
-+
-     <!-- Check the category page -->
-     <actionGroup name="StorefrontCheckCategoryActionGroup">
-         <arguments>
-@@ -46,8 +62,30 @@
-         <seeElement selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="AssertAddToCart" />
-     </actionGroup>
- 
-+    <actionGroup name="StorefrontCheckAddToCartButtonAbsence">
-+        <arguments>
-+            <argument name="product" defaultValue="_defaultProduct"/>
-+        </arguments>
-+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
-+        <dontSeeElement selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="checkAddToCartButtonAbsence"/>
-+    </actionGroup>
-     <actionGroup name="StorefrontSwitchCategoryViewToListMode">
-         <click selector="{{StorefrontCategoryMainSection.modeListButton}}" stepKey="switchCategoryViewToListMode"/>
-         <waitForElement selector="{{StorefrontCategoryMainSection.CategoryTitle}}" time="30" stepKey="waitForCategoryReload"/>
-     </actionGroup>
-+
-+    <actionGroup name="GoToSubCategoryPage">
-+        <arguments>
-+            <argument name="parentCategory"/>
-+            <argument name="subCategory"/>
-+            <argument name="urlPath" type="string"/>
-+        </arguments>
-+        <moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName(parentCategory.name)}}" stepKey="moveMouseOnMainCategory"/>
-+        <waitForElementVisible selector="{{StorefrontHeaderSection.NavigationCategoryByName(subCategory.name)}}" stepKey="waitForSubCategoryVisible"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(subCategory.name)}}" stepKey="goToCategory"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <seeInCurrentUrl url="{{urlPath}}.html" stepKey="checkUrl"/>
-+        <seeInTitle userInput="{{subCategory.name}}" stepKey="assertCategoryNameInTitle"/>
-+        <see userInput="{{subCategory.name}}" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryName"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckProductPriceInCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckProductPriceInCategoryActionGroup.xml
-new file mode 100644
-index 00000000000..5c975998ab9
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckProductPriceInCategoryActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- You must already be on the category page -->
-+    <actionGroup name="StorefrontCheckProductPriceInCategoryActionGroup" extends="StorefrontCheckCategorySimpleProduct">
-+        <remove keyForRemoval="AssertProductPrice"/>
-+        <see userInput="{{product.price}}" selector="{{StorefrontCategoryProductSection.ProductPriceByName(product.name)}}" stepKey="AssertProductPrice"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickAddToCartOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickAddToCartOnProductPageActionGroup.xml
-new file mode 100644
-index 00000000000..1dcbc738c76
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickAddToCartOnProductPageActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontClickAddToCartOnProductPageActionGroup">
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart" />
-+        <waitForPageLoad stepKey="waitForAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
-index 7af1cacfb3d..04e15da9177 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Add Product to Compare from the category page and check message -->
-     <actionGroup name="StorefrontAddCategoryProductToCompareActionGroup">
-         <arguments>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontGoToCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontGoToCategoryPageActionGroup.xml
-new file mode 100644
-index 00000000000..e8be0db38fe
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontGoToCategoryPageActionGroup.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontGoToCategoryPageActionGroup">
-+        <arguments>
-+            <argument name="categoryName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="onFrontend"/>
-+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}" stepKey="toCategory"/>
-+        <waitForPageLoad stepKey="waitForCategoryPage"/>
-+    </actionGroup>
-+    <actionGroup name="StorefrontGoToSubCategoryPageActionGroup" extends="StorefrontGoToCategoryPageActionGroup">
-+        <arguments>
-+            <argument name="subCategoryName" type="string"/>
-+        </arguments>
-+        <moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}" stepKey="toCategory"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(subCategoryName)}}" stepKey="openSubCategory" after="toCategory"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenHomePageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenHomePageActionGroup.xml
-new file mode 100644
-index 00000000000..692d1f4266b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenHomePageActionGroup.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontOpenHomePageActionGroup">
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml
-new file mode 100644
-index 00000000000..f5fabae5fc4
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontOpenProductPageActionGroup">
-+        <arguments>
-+            <argument name="productUrl" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontProductPage.url(productUrl)}}" stepKey="openProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoaded"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
-index eb672cd162e..5f0d03597da 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Check the simple product on the product page -->
-     <actionGroup name="StorefrontCheckSimpleProduct">
-         <arguments>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml
-index d46b8950445..e6392118f79 100644
---- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml
-@@ -6,19 +6,29 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Click Add to Cart button in storefront product page-->
-     <actionGroup name="addToCartFromStorefrontProductPage">
-         <arguments>
-             <argument name="productName"/>
-         </arguments>
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
-+        <waitForPageLoad stepKey="waitForAddToCart"/>
-         <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdding"/>
-         <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdded"/>
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-         <see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
-     </actionGroup>
- 
-+    <actionGroup name="AddProductWithQtyToCartFromStorefrontProductPage" extends="addToCartFromStorefrontProductPage">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+            <argument name="productQty" type="string"/>
-+        </arguments>
-+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="{{productQty}}" stepKey="fillProductQuantity" before="addToCart"/>
-+    </actionGroup>
-+
-     <!--Verify text length validation hint with multiple inputs-->
-     <actionGroup name="testDynamicValidationHint">
-         <arguments>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontSelectCustomOptionDropDownAndAssertPricesActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontSelectCustomOptionDropDownAndAssertPricesActionGroup.xml
-new file mode 100644
-index 00000000000..39793cb8f68
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontSelectCustomOptionDropDownAndAssertPricesActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontSelectCustomOptionDropDownAndAssertPricesActionGroup" extends="AssertStorefrontProductPricesActionGroup">
-+        <arguments>
-+            <argument name="customOption" type="string"/>
-+            <argument name="productPrice" type="string"/>
-+            <argument name="productFinalPrice" type="string"/>
-+        </arguments>
-+        <selectOption selector="{{StorefrontProductPageSection.customOptionDropDown}}" userInput="{{customOption}}" stepKey="selectCustomOption" before="productPriceAmount"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontSelectCustomOptionRadioAndAssertPricesActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontSelectCustomOptionRadioAndAssertPricesActionGroup.xml
-new file mode 100644
-index 00000000000..6f7bdc46640
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontSelectCustomOptionRadioAndAssertPricesActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontSelectCustomOptionRadioAndAssertPricesActionGroup" extends="AssertStorefrontProductPricesActionGroup">
-+        <arguments>
-+            <argument name="customOption" type="entity"/>
-+            <argument name="customOptionValue" type="entity"/>
-+            <argument name="productPrice" type="string"/>
-+            <argument name="productFinalPrice" type="string"/>
-+        </arguments>
-+        <click selector="{{StorefrontProductInfoMainSection.productAttributeOptionsRadioButtons(customOption.title, customOptionValue.price)}}" stepKey="clickRadioButtonsProductOption" before="productPriceAmount"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
-new file mode 100644
-index 00000000000..aec21f3bc48
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="VerifyProductTypeOrder">
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
-+        <waitForPageLoad stepKey="waitForLoad"/>
-+        <seeElement stepKey="seeSimpleInOrder" selector="{{AdminProductDropdownOrderSection.simpleProduct}}"/>
-+        <seeElement stepKey="seeVirtualInOrder" selector="{{AdminProductDropdownOrderSection.virtualProduct}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..24e1fe9cf5e
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,36 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuCatalog">
-+        <data key="pageTitle">Catalog</data>
-+        <data key="title">Catalog</data>
-+        <data key="dataUiId">magento-catalog-catalog</data>
-+    </entity>
-+    <entity name="AdminMenuCatalogCategories">
-+        <data key="pageTitle">Default Category (ID: 2)</data>
-+        <data key="title">Categories</data>
-+        <data key="dataUiId">magento-catalog-catalog-categories</data>
-+    </entity>
-+    <entity name="AdminMenuCatalogProducts">
-+        <data key="pageTitle">Products</data>
-+        <data key="title">Products</data>
-+        <data key="dataUiId">magento-catalog-catalog-products</data>
-+    </entity>
-+    <entity name="AdminMenuStoresAttributesAttributeSet">
-+        <data key="pageTitle">Attribute Sets</data>
-+        <data key="title">Attribute Set</data>
-+        <data key="dataUiId">magento-catalog-catalog-attributes-sets</data>
-+    </entity>
-+    <entity name="AdminMenuStoresAttributesProduct">
-+        <data key="pageTitle">Product Attributes</data>
-+        <data key="title">Product</data>
-+        <data key="dataUiId">magento-catalog-catalog-attributes-attributes</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/AttributeSetData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/AttributeSetData.xml
-new file mode 100644
-index 00000000000..6e1b25fb9cd
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/AttributeSetData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="defaultAttributeSet">
-+        <data key="attribute_set_id">4</data>
-+        <data key="attribute_set_name">Default</data>
-+        <data key="sort_order">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogAttributeGroupData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogAttributeGroupData.xml
-new file mode 100644
-index 00000000000..4413cbcf86a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogAttributeGroupData.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="customGroup">
-+        <data key="name">Custom Group</data>
-+    </entity>
-+    <entity name="emptyGroup">
-+        <data key="name">Empty Group</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogAttributeSetData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogAttributeSetData.xml
-new file mode 100644
-index 00000000000..d78c03a51dd
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogAttributeSetData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="CatalogAttributeSet" type="CatalogAttributeSet">
-+        <data key="attribute_set_name" unique="suffix">test_set_</data>
-+        <data key="attributeGroupId">7</data>
-+        <data key="skeletonId">4</data>
-+    </entity>
-+</entities>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogInventoryConfigData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogInventoryConfigData.xml
-new file mode 100644
-index 00000000000..c9b67e0db43
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogInventoryConfigData.xml
-@@ -0,0 +1,33 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="CatalogInventoryOptionsShowOutOfStockEnable">
-+        <data key="path">cataloginventory/options/show_out_of_stock</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="CatalogInventoryOptionsShowOutOfStockDisable">
-+        <!-- Magento default value -->
-+        <data key="path">cataloginventory/options/show_out_of_stock</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="CatalogInventoryItemOptionsBackordersEnable">
-+        <data key="path">cataloginventory/item_options/backorders</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="CatalogInventoryItemOptionsBackordersDisable">
-+        <!-- Magento default value -->
-+        <data key="path">cataloginventory/item_options/backorders</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceData.xml
-new file mode 100644
-index 00000000000..0f7f4da1b68
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceData.xml
-@@ -0,0 +1,32 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="CatalogPriceScopeWebsite" type="catalog_price_config_state">
-+        <requiredEntity type="scope">scopeWebsite</requiredEntity>
-+        <requiredEntity type="default_product_price">defaultProductPrice</requiredEntity>
-+    </entity>
-+    <entity name="scopeWebsite" type="scope">
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="defaultProductPrice" type="default_product_price">
-+        <data key="value">0</data>
-+    </entity>
-+
-+    <entity name="DefaultConfigCatalogPrice" type="catalog_price_config_state">
-+        <requiredEntity type="scope">scopeGlobal</requiredEntity>
-+        <requiredEntity type="default_product_price">defaultProductPrice</requiredEntity>
-+    </entity>
-+    <entity name="scopeGlobal" type="scope">
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="defaultProductPrice" type="default_product_price">
-+        <data key="value"/>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogRecentlyProductsConfigData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogRecentlyProductsConfigData.xml
-new file mode 100644
-index 00000000000..d1e469deaeb
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogRecentlyProductsConfigData.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="EnableSynchronizeWidgetProductsWithBackendStorage" type="catalog_recently_products">
-+        <requiredEntity type="synchronize_with_backend">EnableCatalogRecentlyProductsSynchronize</requiredEntity>
-+    </entity>
-+
-+    <entity name="EnableCatalogRecentlyProductsSynchronize" type="synchronize_with_backend">
-+        <data key="value">1</data>
-+    </entity>
-+
-+    <entity name="DisableSynchronizeWidgetProductsWithBackendStorage" type="catalog_recently_products">
-+        <requiredEntity type="synchronize_with_backend">DefaultCatalogRecentlyProductsSynchronize</requiredEntity>
-+    </entity>
-+
-+    <entity name="DefaultCatalogRecentlyProductsSynchronize" type="synchronize_with_backend">
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml
-new file mode 100644
-index 00000000000..31783526932
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="specialProductPrice" type="catalogSpecialPrice">
-+        <data key="price">99.99</data>
-+        <data key="store_id">0</data>
-+        <var key="sku" entityType="product2" entityKey="sku" />
-+    </entity>
-+    <entity name="specialProductPrice2" type="catalogSpecialPrice">
-+        <data key="price">55.55</data>
-+        <data key="store_id">0</data>
-+        <var key="sku" entityType="product" entityKey="sku" />
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml
-new file mode 100644
-index 00000000000..abf01f00dbb
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml
-@@ -0,0 +1,63 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="RememberPaginationCatalogStorefrontConfig" type="catalog_storefront_config">
-+        <requiredEntity type="grid_per_page_values">GridPerPageValues</requiredEntity>
-+        <requiredEntity type="remember_pagination">RememberCategoryPagination</requiredEntity>
-+    </entity>
-+
-+    <entity name="GridPerPageValues" type="grid_per_page_values">
-+        <data key="value">9,12,20,24</data>
-+    </entity>
-+
-+    <entity name="RememberCategoryPagination" type="remember_pagination">
-+        <data key="value">1</data>
-+    </entity>
-+
-+    <entity name="DefaultCatalogStorefrontConfiguration" type="default_catalog_storefront_config">
-+        <requiredEntity type="catalogStorefrontFlagZero">DefaultCatalogStorefrontFlagZero</requiredEntity>
-+        <data key="list_allow_all">DefaultListAllowAll</data>
-+        <data key="flat_catalog_product">DefaultFlatCatalogProduct</data>
-+    </entity>
-+
-+    <entity name="DefaultCatalogStorefrontFlagZero" type="catalogStorefrontFlagZero">
-+        <data key="value">0</data>
-+    </entity>
-+
-+    <entity name="DefaultListAllowAll" type="list_allow_all">
-+        <data key="value">0</data>
-+    </entity>
-+
-+    <entity name="DefaultFlatCatalogProduct" type="flat_catalog_product">
-+        <data key="value">0</data>
-+    </entity>
-+
-+    <entity name="UseFlatCatalogCategoryAndProduct" type="catalog_storefront_config">
-+        <requiredEntity type="flat_catalog_product">UseFlatCatalogProduct</requiredEntity>
-+        <requiredEntity type="flat_catalog_category">UseFlatCatalogCategory</requiredEntity>
-+    </entity>
-+
-+    <entity name="UseFlatCatalogProduct" type="flat_catalog_product">
-+        <data key="value">1</data>
-+    </entity>
-+
-+    <entity name="UseFlatCatalogCategory" type="flat_catalog_category">
-+        <data key="value">1</data>
-+    </entity>
-+
-+    <entity name="DefaultFlatCatalogCategoryAndProduct" type="catalog_storefront_config">
-+        <requiredEntity type="flat_catalog_product">DefaultFlatCatalogProduct</requiredEntity>
-+        <requiredEntity type="flat_catalog_category">DefaultFlatCatalogCategory</requiredEntity>
-+    </entity>
-+
-+    <entity name="DefaultFlatCatalogCategory" type="flat_catalog_category">
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
-index 42351741d9f..13951a0d197 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="_defaultCategory" type="category">
-         <data key="name" unique="suffix">simpleCategory</data>
-         <data key="name_lwr" unique="suffix">simplecategory</data>
-@@ -42,4 +42,79 @@
-         <data key="is_active">true</data>
-         <var key="parent_id" entityType="category" entityKey="id" />
-     </entity>
-+    <entity name="FirstLevelSubCat" type="category">
-+        <data key="name" unique="suffix">FirstLevelSubCategory</data>
-+        <data key="name_lwr" unique="suffix">firstlevelsubcategory</data>
-+    </entity>
-+    <entity name="SecondLevelSubCat" type="category">
-+        <data key="name" unique="suffix">SecondLevelSubCategory</data>
-+        <data key="name_lwr" unique="suffix">secondlevelsubcategory</data>
-+    </entity>
-+    <entity name="ThirdLevelSubCat" type="category">
-+        <data key="name" unique="suffix">ThirdLevelSubCategory</data>
-+        <data key="name_lwr" unique="suffix">subcategory</data>
-+    </entity>
-+    <entity name="FourthLevelSubCat" type="category">
-+        <data key="name" unique="suffix">FourthLevelSubCategory</data>
-+        <data key="name_lwr" unique="suffix">subcategory</data>
-+    </entity>
-+    <entity name="FifthLevelCat" type="category">
-+        <data key="name" unique="suffix">FifthLevelCategory</data>
-+        <data key="name_lwr" unique="suffix">category</data>
-+    </entity>
-+    <entity name="SimpleRootSubCategory" type="category">
-+        <data key="name" unique="suffix">SimpleRootSubCategory</data>
-+        <data key="name_lwr" unique="suffix">simplerootsubcategory</data>
-+        <data key="is_active">true</data>
-+        <data key="include_in_menu">true</data>
-+        <data key="url_key" unique="suffix">simplerootsubcategory</data>
-+        <var key="parent_id" entityType="category" entityKey="id" />
-+    </entity>
-+    <entity name="SubCategory" type="category">
-+        <data key="name" unique="suffix">SubCategory</data>
-+        <data key="name_lwr" unique="suffix">subcategory</data>
-+        <data key="is_active">true</data>
-+        <data key="include_in_menu">true</data>
-+    </entity>
-+    <entity name="Two_nested_categories" type="category">
-+        <data key="name" unique="suffix">SecondLevel</data>
-+        <data key="url_key" unique="suffix">secondlevel</data>
-+        <data key="name_lwr" unique="suffix">secondlevel</data>
-+        <data key="is_active">true</data>
-+        <data key="include_in_menu">true</data>
-+        <var key="parent_id" entityType="category" entityKey="id" />
-+    </entity>
-+    <entity name="Three_nested_categories" type="category">
-+        <data key="name" unique="suffix">ThirdLevel</data>
-+        <data key="url_key" unique="suffix">thirdlevel</data>
-+        <data key="name_lwr" unique="suffix">thirdlevel</data>
-+        <data key="is_active">true</data>
-+        <data key="include_in_menu">true</data>
-+        <var key="parent_id" entityType="category" entityKey="id" />
-+    </entity>
-+    <entity name="CatNotIncludeInMenu" type="category">
-+        <data key="name" unique="suffix">NotInclMenu</data>
-+        <data key="name_lwr" unique="suffix">notinclemenu</data>
-+        <data key="is_active">true</data>
-+        <data key="include_in_menu">false</data>
-+    </entity>
-+    <entity name="CatNotActive" type="category">
-+        <data key="name" unique="suffix">NotActive</data>
-+        <data key="name_lwr" unique="suffix">notactive</data>
-+        <data key="is_active">false</data>
-+        <data key="include_in_menu">true</data>
-+    </entity>
-+    <entity name="CatInactiveNotInMenu" type="category">
-+        <data key="name" unique="suffix">InactiveNotInMenu</data>
-+        <data key="name_lwr" unique="suffix">inactivenotinmenu</data>
-+        <data key="is_active">false</data>
-+        <data key="include_in_menu">false</data>
-+    </entity>
-+    <!-- Category from file "prepared-for-sample-data.csv"-->
-+    <entity name="Gear" type="category">
-+        <data key="name">Gear</data>
-+        <data key="name_lwr">gear</data>
-+        <data key="is_active">true</data>
-+        <data key="include_in_menu">true</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
-index 8ae57f92399..d09880f14af 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
-@@ -7,10 +7,14 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
-     <entity name="CONST" type="CONST">
-         <data key="one">1</data>
-         <data key="two">2</data>
-     </entity>
-+    <entity name="prodNameWithSpecChars">
-+        <data key="trademark">"Pursuit Lumaflex™ Tone Band"</data>
-+        <data key="skumark">"x™"</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
-index e93138fecfd..389c41abf0b 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="CustomAttributeCategoryUrlKey" type="custom_attribute">
-         <data key="attribute_code">url_key</data>
-         <data key="value" unique="suffix">category</data>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
-index 2423383bc19..a2bdaa7dbc6 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
-@@ -7,9 +7,17 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="ProductAttributeFrontendLabel" type="FrontendLabel">
-         <data key="store_id">0</data>
-         <data key="label" unique="suffix">attribute</data>
-     </entity>
-+    <entity name="ProductAttributeFrontendLabelTwo" type="FrontendLabel">
-+        <data key="store_id">0</data>
-+        <data key="label" unique="suffix">attributeTwo</data>
-+    </entity>
-+    <entity name="ProductAttributeFrontendLabelThree" type="FrontendLabel">
-+        <data key="store_id">0</data>
-+        <data key="label" unique="suffix">attributeThree</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/GroupPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/GroupPriceData.xml
-new file mode 100644
-index 00000000000..ae4736a1ca2
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/GroupPriceData.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="simpleGroupPrice" type="data">
-+        <data key="price">90.00</data>
-+        <data key="price_type">fixed</data>
-+        <data key="website_id">0</data>
-+        <data key="customer_group">ALL GROUPS</data>
-+        <data key="quantity">1</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml
-index c674a8fc144..1f4b1470098 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="TestImageContent" type="ImageContent">
-         <data key="base64_encoded_data">/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDIBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAGAAYAMBIgACEQEDEQH/xACXAAEBAAMBAQEBAAAAAAAAAAAABgMEBQgCAQcQAAEDAQUFBgQDCQAAAAAAAAABAgMEBQYRFpESMTZV0QchcnOzwhMUIkEygaE1QlFSYXGCsbIBAAEFAQAAAAAAAAAAAAAAAAACAwQGBwERAAECAwMLBAMBAAAAAAAAAAEAAgMEERMhkRQxMzRBUVJTcXKxBRJhoSKBwUL/2gAMAwEAAhEDEQA/AP7+AYKysp7Po5aurlbFBEmL3u3NQ6ASaBdArcFnBN5/urzqn0d0Gf7q86p9HdCRkUzy3YFOWEXhOCpATef7q86p9HdBn+6vOqfR3QMimeW7AosIvCcFSAm8/wB1edU+jugz/dXnVPo7oGRTPLdgUWEXhOCpATef7q86p9HdBn+6vOqfR3QMimeW7AosIvCcFSA1bPtGktWiZWUM7Z6d6qjZG7lwXBf1Q2iO5paaOFCmyCDQoTd/uBLX8n3IUhN3+4EtfyfchIk9Zh9w8pyBpW9QvN4Bwbcsujis+pq2Q4Tq5HbW0u9XJj3Y4fc0ibjPgQjEY0GgJNTS4brj/FaIz3Q2FwFafNP4V3gc1aWz7FY+rjhVrsNjBrlcrsV3Iir/ABPxtqzRyM+boJKeJ7kakm2jkRV3Yom4TlbYf4xrnfFSBuqaCn7ouWwbc+4/FT90XTBz57RlbVvpqWjdUSRoiyfWjUbju71MUlqSyWdVPjpnsqIUVJI3ORFZ3fix+4OnoLSRU3V2HZnANKEjcEGOwVG74OxdUGjZM1RNQROqIlYuw3Zcr9pXpgn1f0xN4kQYgiww8bU4xwe0OG1eg+y7gCg8cvqOLEjuy7gCg8cvqOLEzT1HXIvcfKq0zpn9ShN3+4EtfyfchSE3f7gS1/J9yCJPWYfcPKTA0reoXm85l4P2HUf4/wDSHTPmSOOZiskY17F3tcmKKaXMwjGgvhj/AECMQrTFZ72ObvC5lvxq+gjeivRsUzXvVn4kb34qmpozxWc+NjVtWtqPiOREjbMj1Vf7YFHvMMdLTxP244ImP/maxEUhzMhaxC8UvABrXZuoR9pmLL+9xddfvXNrfkVtJyPqJaOpRiL8VHbKPT8+5THFVS1FnWnE+VKhsUbmsmamG3i1e78jsSwQzoiTRRyIm5HtRf8AZ9MjZGxGMY1rU/damCHTJPMQuDgAa5q31G0VpdnrnuRYO9xNaA1+/r9rUsmeGazqdscrHuZExHo1cVauH30U3THFBDBtfBijj2t+w1Ex0MhMgMcyG1r843J+GC1oDs69B9l3AFB45fUcWJHdl3AFB45fUcWJm3qOuRe4+VV5nTP6lCbv9wJa/k+5CkJu/wBwJa/k+5BEnrMPuHlJgaVvULzeADUlbUAAIQAAhAACF6D7LuAKDxy+o4sSO7LuAKDxy+o4sTMPUdci9x8qqTOmf1KE3f7gS1/J9yFITd/uBLX8n3IIk9Zh9w8pMDSt6hebwAakragABCAAEIAAQvQfZdwBQeOX1HFiR3ZdwBQeOX1HFiZh6jrkXuPlVSZ0z+pQwVlHT2hRy0lXE2WCVMHsduchnBEBINQmQaXhTeQLq8lp9XdRkC6vJafV3UpASMtmeY7Epy3i8RxU3kC6vJafV3UZAuryWn1d1KQBlszzHYlFvF4jipvIF1eS0+ruoyBdXktPq7qUgDLZnmOxKLeLxHFTeQLq8lp9XdRkC6vJafV3UpAGWzPMdiUW8XiOK1bPs6ksqiZR0MDYKdiqrY27kxXFf1U2gCO5xcauNSmySTUr/9k=</data>
-         <data key="type">image/jpeg</data>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ImageData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ImageData.xml
-new file mode 100644
-index 00000000000..a2391dda548
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ImageData.xml
-@@ -0,0 +1,28 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="placeholderBaseImage" type="imageFile">
-+        <data key="file">adobe-base.jpg</data>
-+        <data key="name">adobe-base</data>
-+        <data key="extension">jpg</data>
-+    </entity>
-+
-+    <entity name="placeholderSmallImage" type="imageFile">
-+        <data key="file">adobe-small.jpg</data>
-+        <data key="name">adobe-small</data>
-+        <data key="extension">jpg</data>
-+    </entity>
-+
-+    <entity name="placeholderThumbnailImage" type="imageFile">
-+        <data key="file">adobe-thumb.jpg</data>
-+        <data key="name">adobe-thumb</data>
-+        <data key="extension">jpg</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/NewProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/NewProductData.xml
-new file mode 100644
-index 00000000000..4479805cb12
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/NewProductData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="NewProductData" type="braintree_config_state">
-+        <data key="ProductName">ProductTest</data>
-+        <data key="Price">100</data>
-+        <data key="Quantity">100</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
-index f67370dcff2..02e5ae5ae36 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="productAttributeWysiwyg" type="ProductAttribute">
-         <data key="attribute_code" unique="suffix">attribute</data>
-         <data key="frontend_input">textarea</data>
-@@ -52,6 +52,41 @@
-         <data key="used_for_sort_by">true</data>
-         <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
-     </entity>
-+    <entity name="productAttributeWithTwoOptionsNotVisible" type="ProductAttribute">
-+        <data key="attribute_code" unique="suffix">test_attr_</data>
-+        <data key="frontend_input">select</data>
-+        <data key="scope">global</data>
-+        <data key="is_required">false</data>
-+        <data key="is_unique">false</data>
-+        <data key="is_searchable">false</data>
-+        <data key="is_visible">true</data>
-+        <data key="is_visible_in_advanced_search">false</data>
-+        <data key="is_visible_on_front">false</data>
-+        <data key="is_filterable">false</data>
-+        <data key="is_filterable_in_search">false</data>
-+        <data key="used_in_product_listing">false</data>
-+        <data key="is_used_for_promo_rules">false</data>
-+        <data key="is_comparable">false</data>
-+        <data key="is_used_in_grid">false</data>
-+        <data key="is_visible_in_grid">false</data>
-+        <data key="is_filterable_in_grid">false</data>
-+        <data key="used_for_sort_by">false</data>
-+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
-+    </entity>
-+    <entity name="hiddenDropdownAttributeWithOptions" extends="productAttributeWithTwoOptions">
-+        <data key="is_searchable">false</data>
-+        <data key="is_visible_in_advanced_search">false</data>
-+        <data key="is_visible_on_front">false</data>
-+        <data key="is_filterable">false</data>
-+        <data key="is_filterable_in_search">false</data>
-+        <data key="used_in_product_listing">false</data>
-+        <data key="is_used_for_promo_rules">false</data>
-+        <data key="is_comparable">false</data>
-+        <data key="is_used_in_grid">false</data>
-+        <data key="is_visible_in_grid">false</data>
-+        <data key="is_filterable_in_grid">false</data>
-+        <data key="used_for_sort_by">false</data>
-+    </entity>
-     <entity name="productDropDownAttribute" type="ProductAttribute">
-         <data key="attribute_code" unique="suffix">attribute</data>
-         <data key="frontend_input">select</data>
-@@ -73,6 +108,27 @@
-         <data key="used_for_sort_by">true</data>
-         <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
-     </entity>
-+    <entity name="productDropDownAttributeNotSearchable" type="ProductAttribute">
-+        <data key="attribute_code" unique="suffix">attribute</data>
-+        <data key="frontend_input">select</data>
-+        <data key="scope">global</data>
-+        <data key="is_required">false</data>
-+        <data key="is_unique">false</data>
-+        <data key="is_searchable">false</data>
-+        <data key="is_visible">true</data>
-+        <data key="is_visible_in_advanced_search">true</data>
-+        <data key="is_visible_on_front">true</data>
-+        <data key="is_filterable">true</data>
-+        <data key="is_filterable_in_search">true</data>
-+        <data key="used_in_product_listing">true</data>
-+        <data key="is_used_for_promo_rules">true</data>
-+        <data key="is_comparable">true</data>
-+        <data key="is_used_in_grid">true</data>
-+        <data key="is_visible_in_grid">true</data>
-+        <data key="is_filterable_in_grid">true</data>
-+        <data key="used_for_sort_by">true</data>
-+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
-+    </entity>
-     <entity name="productAttributeWithDropdownTwoOptions" type="ProductAttribute">
-         <data key="attribute_code">testattribute</data>
-         <data key="frontend_input">select</data>
-@@ -115,4 +171,176 @@
-         <data key="used_for_sort_by">true</data>
-         <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
-     </entity>
-+    <entity name="productAttributeMultiselectTwoOptionsNotSearchable" type="ProductAttribute">
-+        <data key="attribute_code" unique="suffix">attribute</data>
-+        <data key="frontend_input">multiselect</data>
-+        <data key="scope">global</data>
-+        <data key="is_required">false</data>
-+        <data key="is_unique">false</data>
-+        <data key="is_searchable">false</data>
-+        <data key="is_visible">true</data>
-+        <data key="is_visible_in_advanced_search">true</data>
-+        <data key="is_visible_on_front">true</data>
-+        <data key="is_filterable">true</data>
-+        <data key="is_filterable_in_search">true</data>
-+        <data key="used_in_product_listing">true</data>
-+        <data key="is_used_for_promo_rules">true</data>
-+        <data key="is_comparable">true</data>
-+        <data key="is_used_in_grid">true</data>
-+        <data key="is_visible_in_grid">true</data>
-+        <data key="is_filterable_in_grid">true</data>
-+        <data key="used_for_sort_by">true</data>
-+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
-+    </entity>
-+    <entity name="newsFromDate" type="ProductAttribute">
-+        <data key="attribute_code">news_from_date</data>
-+        <data key="default_frontend_label">Set Product as New from Date</data>
-+        <data key="frontend_input">date</data>
-+        <data key="is_required">false</data>
-+        <data key="is_user_defined">true</data>
-+        <data key="scope">website</data>
-+        <data key="is_unique">false</data>
-+        <data key="is_searchable">false</data>
-+        <data key="is_visible">false</data>
-+        <data key="is_visible_on_front">false</data>
-+        <data key="is_filterable">false</data>
-+        <data key="is_filterable_in_search">false</data>
-+        <data key="used_in_product_listing">true</data>
-+        <data key="is_used_for_promo_rules">false</data>
-+        <data key="is_comparable">false</data>
-+        <data key="is_used_in_grid">true</data>
-+        <data key="is_filterable_in_grid">true</data>
-+        <data key="used_for_sort_by">false</data>
-+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
-+    </entity>
-+    <entity name="newProductAttribute" type="ProductAttribute">
-+        <data key="attribute_code" unique="suffix">attribute</data>
-+        <data key="frontend_input">text</data>
-+        <data key="scope">global</data>
-+        <data key="is_required">false</data>
-+        <data key="is_unique">false</data>
-+        <data key="is_searchable">true</data>
-+        <data key="is_visible">true</data>
-+        <data key="is_visible_in_advanced_search">true</data>
-+        <data key="is_visible_on_front">true</data>
-+        <data key="is_filterable">true</data>
-+        <data key="is_filterable_in_search">true</data>
-+        <data key="used_in_product_listing">true</data>
-+        <data key="is_used_for_promo_rules">true</data>
-+        <data key="is_comparable">true</data>
-+        <data key="is_used_in_grid">true</data>
-+        <data key="is_visible_in_grid">true</data>
-+        <data key="is_filterable_in_grid">true</data>
-+        <data key="used_for_sort_by">true</data>
-+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
-+    </entity>
-+    <entity name="productYesNoAttribute" type="ProductAttribute">
-+        <data key="attribute_code" unique="suffix">attribute</data>
-+        <data key="frontend_input">boolean</data>
-+        <data key="scope">global</data>
-+        <data key="is_required">false</data>
-+        <data key="is_unique">false</data>
-+        <data key="is_searchable">true</data>
-+        <data key="is_visible">true</data>
-+        <data key="is_visible_in_advanced_search">true</data>
-+        <data key="is_visible_on_front">true</data>
-+        <data key="is_filterable">true</data>
-+        <data key="is_filterable_in_search">true</data>
-+        <data key="used_in_product_listing">true</data>
-+        <data key="is_used_for_promo_rules">true</data>
-+        <data key="is_comparable">true</data>
-+        <data key="is_used_in_grid">true</data>
-+        <data key="is_visible_in_grid">true</data>
-+        <data key="is_filterable_in_grid">true</data>
-+        <data key="used_for_sort_by">true</data>
-+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
-+    </entity>
-+    <entity name="productAttributeText" type="ProductAttribute">
-+        <data key="attribute_code" unique="suffix">attribute</data>
-+        <data key="frontend_input">text</data>
-+        <data key="scope">global</data>
-+        <data key="is_required">false</data>
-+        <data key="is_unique">false</data>
-+        <data key="is_searchable">false</data>
-+        <data key="is_visible">true</data>
-+        <data key="backend_type">text</data>
-+        <data key="is_wysiwyg_enabled">false</data>
-+        <data key="is_visible_in_advanced_search">false</data>
-+        <data key="is_visible_on_front">true</data>
-+        <data key="is_filterable">false</data>
-+        <data key="is_filterable_in_search">false</data>
-+        <data key="used_in_product_listing">false</data>
-+        <data key="is_used_for_promo_rules">false</data>
-+        <data key="is_comparable">true</data>
-+        <data key="is_used_in_grid">false</data>
-+        <data key="is_visible_in_grid">false</data>
-+        <data key="is_filterable_in_grid">false</data>
-+        <data key="used_for_sort_by">false</data>
-+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
-+    </entity>
-+    <entity name="textProductAttribute" extends="productAttributeWysiwyg" type="ProductAttribute">
-+        <data key="frontend_input">text</data>
-+        <data key="default_value" unique="suffix">defaultValue</data>
-+        <data key="is_required_admin">No</data>
-+    </entity>
-+    <entity name="dateProductAttribute" extends="productAttributeWysiwyg" type="ProductAttribute">
-+        <data key="frontend_input">date</data>
-+        <data key="is_required_admin">No</data>
-+    </entity>
-+    <entity name="priceProductAttribute" extends="productAttributeWysiwyg" type="ProductAttribute">
-+        <data key="frontend_input">date</data>
-+        <data key="is_required_admin">No</data>
-+    </entity>
-+    <entity name="dropdownProductAttribute" extends="productAttributeWysiwyg" type="ProductAttribute">
-+        <data key="frontend_input">select</data>
-+        <data key="frontend_input_admin">Dropdown</data>
-+        <data key="is_required_admin">No</data>
-+        <data key="option1_admin" unique="suffix">opt1Admin</data>
-+        <data key="option1_frontend" unique="suffix">opt1Front</data>
-+        <data key="option2_admin" unique="suffix">opt2Admin</data>
-+        <data key="option2_frontend" unique="suffix">opt2Front</data>
-+        <data key="option3_admin" unique="suffix">opt3Admin</data>
-+        <data key="option3_frontend" unique="suffix">opt3Front</data>
-+    </entity>
-+    <entity name="multiselectProductAttribute" extends="productAttributeWysiwyg" type="ProductAttribute">
-+        <data key="frontend_input">multiselect</data>
-+        <data key="frontend_input_admin">Multiple Select</data>
-+        <data key="is_required_admin">No</data>
-+        <data key="option1_admin" unique="suffix">opt1Admin</data>
-+        <data key="option1_frontend" unique="suffix">opt1Front</data>
-+        <data key="option2_admin" unique="suffix">opt2Admin</data>
-+        <data key="option2_frontend" unique="suffix">opt2Front</data>
-+        <data key="option3_admin" unique="suffix">opt3Admin</data>
-+        <data key="option3_frontend" unique="suffix">opt3Front</data>
-+    </entity>
-+    <entity name="dropdownProductAttributeWithQuote" extends="productAttributeWysiwyg" type="ProductAttribute">
-+        <data key="frontend_input">select</data>
-+        <data key="frontend_input_admin">Dropdown</data>
-+        <data key="is_required_admin">No</data>
-+        <data key="option1_admin" unique="suffix">opt1'Admin</data>
-+        <data key="option1_frontend" unique="suffix">opt1'Front</data>
-+    </entity>
-+    <entity name="productTextEditorAttribute" type="ProductAttribute">
-+        <data key="attribute_code" unique="suffix">attribute</data>
-+        <data key="frontend_input">texteditor</data>
-+        <data key="scope">global</data>
-+        <data key="is_required">false</data>
-+        <data key="is_unique">false</data>
-+        <data key="is_searchable">true</data>
-+        <data key="is_visible">true</data>
-+        <data key="backend_type">text</data>
-+        <data key="is_wysiwyg_enabled">true</data>
-+        <data key="is_visible_in_advanced_search">true</data>
-+        <data key="is_visible_on_front">true</data>
-+        <data key="is_filterable">true</data>
-+        <data key="is_filterable_in_search">true</data>
-+        <data key="used_in_product_listing">true</data>
-+        <data key="is_used_for_promo_rules">true</data>
-+        <data key="is_comparable">true</data>
-+        <data key="is_used_in_grid">true</data>
-+        <data key="is_visible_in_grid">true</data>
-+        <data key="is_filterable_in_grid">true</data>
-+        <data key="used_for_sort_by">true</data>
-+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
-index 60b38812e4c..98c9a70e6aa 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="ApiProductAttributeMediaGalleryEntryTestImage" type="ProductAttributeMediaGalleryEntry">
-         <data key="media_type">image</data>
-         <data key="label" unique="suffix">Test Image </data>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
-index 15c2dc8bbeb..fcb56cf298a 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="productAttributeOption1" type="ProductAttributeOption">
-         <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
-         <data key="label" unique="suffix">option1</data>
-@@ -65,4 +65,25 @@
-         <data key="is_default">false</data>
-         <data key="sort_order">0</data>
-     </entity>
-+    <entity name="ProductAttributeOption7" type="ProductAttributeOption">
-+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
-+        <data key="label" unique="suffix">Green</data>
-+        <data key="is_default">false</data>
-+        <data key="sort_order">3</data>
-+        <requiredEntity type="StoreLabel">Option7Store0</requiredEntity>
-+        <requiredEntity type="StoreLabel">Option8Store1</requiredEntity>
-+    </entity>
-+    <entity name="ProductAttributeOption8" type="ProductAttributeOption">
-+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
-+        <data key="label" unique="suffix">Red</data>
-+        <data key="is_default">false</data>
-+        <data key="sort_order">3</data>
-+        <requiredEntity type="StoreLabel">Option9Store0</requiredEntity>
-+        <requiredEntity type="StoreLabel">Option10Store1</requiredEntity>
-+    </entity>
-+    <entity name="ProductAttributeOption8" type="ProductAttributeOption">
-+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
-+        <data key="label" unique="suffix">White</data>
-+        <data key="value" unique="suffix">white</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
-index 68c0a54ff88..6d4314a6d86 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
-@@ -7,11 +7,23 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="AddToDefaultSet" type="ProductAttributeSet">
-         <var key="attributeCode" entityKey="attribute_code" entityType="ProductAttribute"/>
-         <data key="attributeSetId">4</data>
-         <data key="attributeGroupId">7</data>
-         <data key="sortOrder">0</data>
-     </entity>
-+    <entity name="AddToDefaultSetSortOrder1" type="ProductAttributeSet">
-+        <var key="attributeCode" entityKey="attribute_code" entityType="ProductAttribute"/>
-+        <data key="attributeSetId">4</data>
-+        <data key="attributeGroupId">7</data>
-+        <data key="sortOrder">1</data>
-+    </entity>
-+    <entity name="AddToSetBlank" type="ProductAttributeSet">
-+        <var key="attributeCode" entityKey="attribute_code" entityType="ProductAttribute"/>
-+        <data key="attributeSetId">0</data>
-+        <data key="attributeGroupId">0</data>
-+        <data key="sortOrder">0</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
-index 0df091eb5f8..0b6a1e7d044 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="_defaultProduct" type="product">
-         <data key="sku" unique="suffix">testSku</data>
-         <data key="type_id">simple</data>
-@@ -18,6 +18,7 @@
-         <data key="urlKey" unique="suffix">testurlkey</data>
-         <data key="status">1</data>
-         <data key="quantity">100</data>
-+        <data key="weight">1</data>
-         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-     </entity>
-@@ -34,6 +35,13 @@
-         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-     </entity>
-+    <entity name="ApiSimpleProductWithSpecCharInName" type="product" extends="ApiSimpleProduct">
-+        <data key="name">Pursuit Lumaflex&#38;trade; Tone Band</data>
-+        <data key="sku" unique="suffix">x&#38;trade;</data>
-+    </entity>
-+    <entity name="ApiSimpleProductWithCustomPrice" type="product" extends="ApiSimpleProduct">
-+        <data key="price">100</data>
-+    </entity>
-     <entity name="ApiSimpleProductUpdateDescription" type="product2">
-         <requiredEntity type="custom_attribute">ApiProductDescription</requiredEntity>
-         <requiredEntity type="custom_attribute">ApiProductShortDescription</requiredEntity>
-@@ -56,6 +64,48 @@
-         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-     </entity>
-+    <entity name="SimpleProductAfterImport1" type="product">
-+        <data key="sku">SimpleProductForTest1</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="name">SimpleProductAfterImport1</data>
-+        <data key="price">250.00</data>
-+        <data key="visibility">4</data>
-+        <data key="status">1</data>
-+        <data key="quantity">100</data>
-+        <data key="urlKey">simple-product-for-test-1</data>
-+        <data key="weight">1</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-+    </entity>
-+    <entity name="SimpleProductAfterImport2" type="product">
-+        <data key="sku">SimpleProductForTest2</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="name">SimpleProductAfterImport2</data>
-+        <data key="price">300.00</data>
-+        <data key="visibility">4</data>
-+        <data key="status">1</data>
-+        <data key="quantity">100</data>
-+        <data key="urlKey">simple-product-for-test-2</data>
-+        <data key="weight">1</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-+    </entity>
-+    <entity name="SimpleProductAfterImport3" type="product">
-+        <data key="sku">SimpleProductForTest3</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="name">SimpleProductAfterImport3</data>
-+        <data key="price">350.00</data>
-+        <data key="visibility">4</data>
-+        <data key="status">1</data>
-+        <data key="quantity">100</data>
-+        <data key="urlKey">simple-product-for-test-3</data>
-+        <data key="weight">1</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-+    </entity>
-     <entity name="SimpleProduct2" type="product">
-         <data key="sku" unique="suffix">SimpleProduct</data>
-         <data key="type_id">simple</data>
-@@ -92,6 +142,65 @@
-         <data key="quantity">0</data>
-         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-     </entity>
-+    <entity name="SimpleOutOfStockProduct" type="product">
-+        <data key="sku" unique="suffix">testSku</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">OutOfStockProduct</data>
-+        <data key="price">123.00</data>
-+        <data key="urlKey" unique="suffix">testurlkey</data>
-+        <data key="status">1</data>
-+        <data key="quantity">0</data>
-+    </entity>
-+    <entity name="SimpleProductInStockQuantityZero" type="product">
-+        <data key="sku" unique="suffix">testSku</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">SimpleProductInStockQuantityZero</data>
-+        <data key="price">123.00</data>
-+        <data key="urlKey" unique="suffix">SimpleProductInStockQuantityZero</data>
-+        <data key="status">1</data>
-+        <data key="quantity">0</data>
-+        <requiredEntity type="product_extension_attribute">EavStock0</requiredEntity>
-+    </entity>
-+    <!-- Simple Product Disabled -->
-+    <entity name="SimpleProductOffline" type="product2">
-+        <data key="sku" unique="suffix">testSku</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">SimpleOffline</data>
-+        <data key="price">123.00</data>
-+        <data key="status">2</data>
-+        <data key="quantity">100</data>
-+        <data key="urlKey" unique="suffix">testurlkey</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
-+    </entity>
-+    <entity name="SimpleProductDisabled" type="product">
-+        <data key="sku" unique="suffix">simple_product_disabled</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="name" unique="suffix">Simple Product Disabled</data>
-+        <data key="price">123.00</data>
-+        <data key="visibility">4</data>
-+        <data key="status">2</data>
-+        <data key="quantity">1001</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+    </entity>
-+    <entity name="SimpleProductNotVisibleIndividually" type="product">
-+        <data key="sku" unique="suffix">simple_product_not_visible_individually</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="name" unique="suffix">Simple Product Not Visible Individually</data>
-+        <data key="price">123.00</data>
-+        <data key="visibility">1</data>
-+        <data key="status">1</data>
-+        <data key="quantity">1000</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+    </entity>
-     <entity name="NewSimpleProduct" type="product">
-         <data key="price">321.00</data>
-     </entity>
-@@ -106,6 +215,18 @@
-         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
-     </entity>
-+    <entity name="ApiSimpleOutOfStock" type="product2">
-+        <data key="sku" unique="suffix">api-simple-product</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">Api Simple Out Of Stock Product</data>
-+        <data key="price">123.00</data>
-+        <data key="urlKey" unique="suffix">api-simple-product</data>
-+        <data key="status">1</data>
-+        <data key="quantity">100</data>
-+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
-+    </entity>
-     <entity name="ApiSimpleOne" type="product2">
-         <data key="sku" unique="suffix">api-simple-product</data>
-         <data key="type_id">simple</data>
-@@ -119,6 +240,9 @@
-         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
-     </entity>
-+    <entity name="ApiSimpleProductWithShortSKU" type="product2" extends="ApiSimpleOne">
-+        <data key="sku" unique="suffix">pr</data>
-+    </entity>
-     <entity name="ApiSimpleOneHidden" type="product2">
-         <data key="sku" unique="suffix">api-simple-product</data>
-         <data key="type_id">simple</data>
-@@ -145,6 +269,15 @@
-         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
-     </entity>
-+    <entity name="ApiSimpleProductWithPrice50" type="product2" extends="ApiSimpleOne">
-+        <data key="price">50</data>
-+    </entity>
-+    <entity name="ApiSimpleProductWithPrice60" type="product2" extends="ApiSimpleTwo">
-+        <data key="price">60</data>
-+    </entity>
-+    <entity name="ApiSimpleProductWithPrice70" type="product2" extends="SimpleOne">
-+        <data key="price">70</data>
-+    </entity>
-     <entity name="ApiSimpleTwoHidden" type="product2">
-         <data key="sku" unique="suffix">api-simple-product-two</data>
-         <data key="type_id">simple</data>
-@@ -180,6 +313,9 @@
-         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-         <requiredEntity type="custom_attribute">CustomAttributeProductUrlKey</requiredEntity>
-     </entity>
-+    <entity name="SetProductVisibilityHidden" type="product2">
-+        <data key="visibility">1</data>
-+    </entity>
-     <entity name="ProductImage" type="uploadImage">
-         <data key="title" unique="suffix">Image1</data>
-         <data key="price">1.00</data>
-@@ -206,6 +342,15 @@
-         <data key="filename">magento-again</data>
-         <data key="file_extension">jpg</data>
-     </entity>
-+    <entity name="TestImageAdobe" type="image">
-+        <data key="title" unique="suffix">magento-adobe</data>
-+        <data key="price">1.00</data>
-+        <data key="file_type">Upload File</data>
-+        <data key="shareable">Yes</data>
-+        <data key="file">adobe-base.jpg</data>
-+        <data key="filename">adobe-base</data>
-+        <data key="file_extension">jpg</data>
-+    </entity>
-     <entity name="ProductWithUnicode" type="product">
-         <data key="sku" unique="suffix">&#38657;&#20135;&#21697;</data>
-         <data key="type_id">simple</data>
-@@ -256,7 +401,7 @@
-         <data key="status">1</data>
-         <data key="quantity">100</data>
-         <data key="weight">0</data>
--        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-     </entity>
-     <entity name="productWithDescription" type="product">
-@@ -301,6 +446,20 @@
-         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-     </entity>
-+    <entity name="SimpleProductWithCustomAttributeSet" type="product">
-+        <data key="sku" unique="suffix">testSku</data>
-+        <data key="type_id">simple</data>
-+        <var key="attribute_set_id" entityKey="attribute_set_id" entityType="CatalogAttributeSet"/>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">testProductName</data>
-+        <data key="price">123.00</data>
-+        <data key="urlKey" unique="suffix">testurlkey</data>
-+        <data key="status">1</data>
-+        <data key="weight">1</data>
-+        <data key="quantity">100</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-+    </entity>
-     <entity name="productWithOptions" type="product">
-         <var key="sku" entityType="product" entityKey="sku" />
-         <data key="file">magento.jpg</data>
-@@ -315,10 +474,44 @@
-         <requiredEntity type="product_option">ProductOptionDateTime</requiredEntity>
-         <requiredEntity type="product_option">ProductOptionTime</requiredEntity>
-     </entity>
-+    <entity name="productWithOptionRadiobutton" type="product">
-+        <var key="sku" entityType="product" entityKey="sku" />
-+        <requiredEntity type="product_option">ProductOptionRadiobuttonWithTwoFixedOptions</requiredEntity>
-+    </entity>
-+    <entity name="productWithCustomOptions" type="product">
-+        <var key="sku" entityType="product" entityKey="sku" />
-+        <data key="file">magento.jpg</data>
-+        <requiredEntity type="product_option">ProductOptionDropDown2</requiredEntity>
-+    </entity>
-+    <entity name="productWithFixedOptions" type="product">
-+        <var key="sku" entityType="product" entityKey="sku" />
-+        <data key="file">magento.jpg</data>
-+        <requiredEntity type="product_option">ProductOptionRadioButton2</requiredEntity>
-+    </entity>
-     <entity name="productWithOptions2" type="product">
-         <var key="sku" entityType="product" entityKey="sku" />
-         <requiredEntity type="product_option">ProductOptionDropDownWithLongValuesTitle</requiredEntity>
-     </entity>
-+    <entity name="productWithDropdownOption" type="product">
-+        <var key="sku" entityType="product" entityKey="sku" />
-+        <requiredEntity type="product_option">ProductOptionValueDropdown</requiredEntity>
-+    </entity>
-+    <entity name="productWithDropdownAndFieldOptions" type="product">
-+        <var key="sku" entityType="product" entityKey="sku" />
-+        <requiredEntity type="product_option">ProductOptionValueDropdown</requiredEntity>
-+        <requiredEntity type="product_option">ProductOptionField</requiredEntity>
-+    </entity>
-+    <entity name="ProductWithTextFieldAndAreaOptions" type="product">
-+        <var key="sku" entityType="product" entityKey="sku" />
-+        <requiredEntity type="product_option">ProductOptionField</requiredEntity>
-+        <requiredEntity type="product_option">ProductOptionArea</requiredEntity>
-+    </entity>
-+    <entity name="ProductWithTextFieldAndAreaAndFileOptions" type="product">
-+        <var key="sku" entityType="product" entityKey="sku" />
-+        <requiredEntity type="product_option">ProductOptionField</requiredEntity>
-+        <requiredEntity type="product_option">ProductOptionArea</requiredEntity>
-+        <requiredEntity type="product_option">ProductOptionFile</requiredEntity>
-+    </entity>
-     <entity name="ApiVirtualProductWithDescription" type="product">
-         <data key="sku" unique="suffix">api-virtual-product</data>
-         <data key="type_id">virtual</data>
-@@ -419,4 +612,557 @@
-         <data key="status">1</data>
-         <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-     </entity>
-+    <entity name="simpleProductForMassUpdate" type="product">
-+        <data key="sku" unique="suffix">testSku</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">massUpdateProductName</data>
-+        <data key="keyword">massUpdateProductName</data>
-+        <data key="price">123.00</data>
-+        <data key="urlKey" unique="suffix">masstesturlkey</data>
-+        <data key="status">1</data>
-+        <data key="quantity">100</data>
-+        <data key="weight">1</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-+    </entity>
-+    <entity name="simpleProductForMassUpdate2" type="product">
-+        <data key="sku" unique="suffix">testSku</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">massUpdateProductName</data>
-+        <data key="keyword">massUpdateProductName</data>
-+        <data key="price">123.00</data>
-+        <data key="urlKey" unique="suffix">masstesturlkey</data>
-+        <data key="status">1</data>
-+        <data key="quantity">100</data>
-+        <data key="weight">1</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-+    </entity>
-+    <entity name="ApiSimpleSingleQty" type="product2">
-+        <data key="sku" unique="suffix">api-simple-product</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">Api Simple Product</data>
-+        <data key="price">123.00</data>
-+        <data key="urlKey" unique="suffix">api-simple-product</data>
-+        <data key="status">1</data>
-+        <data key="quantity">1</data>
-+        <requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
-+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
-+    </entity>
-+    <entity name="virtualProductWithRequiredFields" type="product">
-+        <data key="name" unique="suffix">virtualProduct</data>
-+        <data key="sku" unique="suffix">virtualsku</data>
-+        <data key="price">10</data>
-+        <data key="visibility">Catalog, Search</data>
-+        <data key="urlKey" unique="suffix">virtualproduct</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="virtualProductBigQty" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">100.00</data>
-+        <data key="productTaxClass">None</data>
-+        <data key="quantity">999</data>
-+        <data key="status">In Stock</data>
-+        <data key="visibility">Catalog, Search</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="virtualProductGeneralGroup" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">100.00</data>
-+        <data key="productTaxClass">None</data>
-+        <data key="quantity">999</data>
-+        <data key="status">In Stock</data>
-+        <data key="visibility">Catalog, Search</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="virtualProductCustomImportOptions" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">9,000.00</data>
-+        <data key="quantity">999</data>
-+        <data key="status">In Stock</data>
-+        <data key="visibility">Catalog, Search</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="storefrontStatus">IN STOCK</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="virtualProductWithoutManageStock" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">100.00</data>
-+        <data key="quantity">999</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="special_price">90.00</data>
-+        <data key="storefrontStatus">IN STOCK</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="virtualProductOutOfStock" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">9,000.00</data>
-+        <data key="quantity">999</data>
-+        <data key="status">Out of Stock</data>
-+        <data key="visibility">Catalog, Search</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="storefrontStatus">OUT OF STOCK</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="virtualProductAssignToCategory" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">10.00</data>
-+        <data key="quantity">999</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="updateVirtualProductRegularPriceInStock" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">120.00</data>
-+        <data key="productTaxClass">None</data>
-+        <data key="quantity">999</data>
-+        <data key="status">In Stock</data>
-+        <data key="storefrontStatus">IN STOCK</data>
-+        <data key="visibility">Search</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="updateVirtualProductWithTierPriceInStock" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">99.99</data>
-+        <data key="productTaxClass">None</data>
-+        <data key="quantity">999</data>
-+        <data key="status">In Stock</data>
-+        <data key="storefrontStatus">IN STOCK</data>
-+        <data key="visibility">Catalog</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="updateVirtualProductRegularPrice99OutOfStock" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">99.99</data>
-+        <data key="productTaxClass">Taxable Goods</data>
-+        <data key="status">Out of Stock</data>
-+        <data key="storefrontStatus">OUT OF STOCK</data>
-+        <data key="visibility">Search</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="defaultSimpleProduct" type="product">
-+        <data key="name" unique="suffix">Testp</data>
-+        <data key="sku" unique="suffix">testsku</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="price">560.00</data>
-+        <data key="urlKey" unique="suffix">testurl-</data>
-+        <data key="status">1</data>
-+        <data key="quantity">25</data>
-+        <data key="weight">1</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="ProductWithLongNameSku" extends="ApiSimpleProduct">
-+        <data key="name" unique="suffix">Product With Long Name And Sku - But not too long</data>
-+        <data key="sku" unique="suffix">Product With Long Name And Sku - But not too long</data>
-+    </entity>
-+    <entity name="PaginationProduct" type="product">
-+        <data key="name" unique="suffix">pagi</data>
-+        <data key="sku" unique="suffix">pagisku</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="price">780.00</data>
-+        <data key="urlKey" unique="suffix">pagiurl-</data>
-+        <data key="status">1</data>
-+        <data key="quantity">50</data>
-+        <data key="weight">5</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="Magento3" type="image">
-+        <data key="title" unique="suffix">Magento3</data>
-+        <data key="price">1.00</data>
-+        <data key="file_type">Upload File</data>
-+        <data key="shareable">Yes</data>
-+        <data key="file">magento3.jpg</data>
-+        <data key="filename">magento3</data>
-+        <data key="file_extension">jpg</data>
-+    </entity>
-+    <entity name="updateVirtualProductRegularPrice" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">99.99</data>
-+        <data key="productTaxClass">None</data>
-+        <data key="quantity">999</data>
-+        <data key="status">In Stock</data>
-+        <data key="storefrontStatus">IN STOCK</data>
-+        <data key="visibility">Catalog</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="updateVirtualProductRegularPrice5OutOfStock" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">5.00</data>
-+        <data key="productTaxClass">None</data>
-+        <data key="status">Out of Stock</data>
-+        <data key="storefrontStatus">OUT OF STOCK</data>
-+        <data key="visibility">Catalog</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="updateVirtualProductSpecialPrice" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">120.00</data>
-+        <data key="productTaxClass">Taxable Goods</data>
-+        <data key="quantity">999</data>
-+        <data key="status">In Stock</data>
-+        <data key="storefrontStatus">IN STOCK</data>
-+        <data key="visibility">Catalog, Search</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="special_price">45.00</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="updateVirtualProductSpecialPriceOutOfStock" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">99.99</data>
-+        <data key="productTaxClass">None</data>
-+        <data key="status">Out of Stock</data>
-+        <data key="storefrontStatus">OUT OF STOCK</data>
-+        <data key="visibility">Catalog, Search</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="special_price">45.00</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="updateVirtualProductTierPriceInStock" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">145.00</data>
-+        <data key="productTaxClass">Taxable Goods</data>
-+        <data key="quantity">999</data>
-+        <data key="status">In Stock</data>
-+        <data key="storefrontStatus">IN STOCK</data>
-+        <data key="visibility">Catalog, Search</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="updateVirtualTierPriceOutOfStock" type="product">
-+        <data key="name" unique="suffix">VirtualProduct</data>
-+        <data key="sku" unique="suffix">virtual_sku</data>
-+        <data key="price">185.00</data>
-+        <data key="productTaxClass">None</data>
-+        <data key="quantity">999</data>
-+        <data key="status">Out of Stock</data>
-+        <data key="storefrontStatus">OUT OF STOCK</data>
-+        <data key="visibility">Catalog, Search</data>
-+        <data key="urlKey" unique="suffix">virtual-product</data>
-+        <data key="type_id">virtual</data>
-+    </entity>
-+    <entity name="simpleProductRegularPrice325InStock" type="product">
-+        <data key="urlKey" unique="suffix">test-simple-product</data>
-+        <data key="name" unique="suffix">TestSimpleProduct</data>
-+        <data key="sku" unique="suffix">test_simple_product_sku</data>
-+        <data key="price">325.02</data>
-+        <data key="quantity">89</data>
-+        <data key="status">In Stock</data>
-+        <data key="storefrontStatus">IN STOCK</data>
-+        <data key="weight">89.0000</data>
-+        <data key="visibility">Search</data>
-+        <data key="type_id">simple</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="simpleProductRegularPrice32503OutOfStock" type="product">
-+        <data key="urlKey" unique="suffix">test-simple-product</data>
-+        <data key="name" unique="suffix">TestSimpleProduct</data>
-+        <data key="sku" unique="suffix">test_simple_product_sku</data>
-+        <data key="price">325.03</data>
-+        <data key="quantity">25</data>
-+        <data key="status">Out of Stock</data>
-+        <data key="storefrontStatus">OUT OF STOCK</data>
-+        <data key="weight">125.0000</data>
-+        <data key="type_id">simple</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="simpleProductRegularPrice245InStock" type="product">
-+        <data key="urlKey" unique="suffix">test-simple-product</data>
-+        <data key="name" unique="suffix">TestSimpleProduct</data>
-+        <data key="sku" unique="suffix">test_simple_product_sku</data>
-+        <data key="price">245.00</data>
-+        <data key="quantity">200</data>
-+        <data key="status">In Stock</data>
-+        <data key="storefrontStatus">IN STOCK</data>
-+        <data key="weight">120.0000</data>
-+        <data key="visibility">Catalog, Search</data>
-+        <data key="type_id">simple</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="simpleProductRegularPrice32501InStock" type="product">
-+        <data key="urlKey" unique="suffix">test-simple-product</data>
-+        <data key="name" unique="suffix">TestSimpleProduct</data>
-+        <data key="sku" unique="suffix">test_simple_product_sku</data>
-+        <data key="price">325.01</data>
-+        <data key="quantity">125</data>
-+        <data key="status">In Stock</data>
-+        <data key="storefrontStatus">IN STOCK</data>
-+        <data key="weight">25.0000</data>
-+        <data key="visibility">Catalog</data>
-+        <data key="type_id">simple</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="simpleProductTierPrice300InStock" type="product">
-+        <data key="urlKey" unique="suffix">test-simple-product</data>
-+        <data key="name" unique="suffix">TestSimpleProduct</data>
-+        <data key="sku" unique="suffix">test_simple_product_sku</data>
-+        <data key="price">300.00</data>
-+        <data key="quantity">34</data>
-+        <data key="status">In Stock</data>
-+        <data key="storefrontStatus">IN STOCK</data>
-+        <data key="weight">1</data>
-+        <data key="weightSelect">This item has weight</data>
-+        <data key="type_id">simple</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="simpleProductEnabledFlat" type="product">
-+        <data key="urlKey" unique="suffix">test-simple-product</data>
-+        <data key="name" unique="suffix">TestSimpleProduct</data>
-+        <data key="sku" unique="suffix">test_simple_product_sku</data>
-+        <data key="price">1.99</data>
-+        <data key="productTaxClass">Taxable Goods</data>
-+        <data key="quantity">1000</data>
-+        <data key="status">1</data>
-+        <data key="storefrontStatus">IN STOCK</data>
-+        <data key="weight">1</data>
-+        <data key="weightSelect">This item has weight</data>
-+        <data key="visibility">Catalog, Search</data>
-+        <data key="type_id">simple</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="simpleProductRegularPriceCustomOptions" type="product">
-+        <data key="urlKey" unique="suffix">test-simple-product</data>
-+        <data key="name" unique="suffix">TestSimpleProduct</data>
-+        <data key="sku" unique="suffix">test_simple_product_sku</data>
-+        <data key="price">245.00</data>
-+        <data key="storefront_new_cartprice">343.00</data>
-+        <data key="quantity">200</data>
-+        <data key="status">In Stock</data>
-+        <data key="storefrontStatus">IN STOCK</data>
-+        <data key="weight">120.0000</data>
-+        <data key="type_id">simple</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="simpleProductDisabled" type="product">
-+        <data key="urlKey" unique="suffix">test-simple-product</data>
-+        <data key="name" unique="suffix">TestSimpleProduct</data>
-+        <data key="sku" unique="suffix">test_simple_product_sku</data>
-+        <data key="price">74.00</data>
-+        <data key="quantity">87</data>
-+        <data key="status">In Stock</data>
-+        <data key="weight">333.0000</data>
-+        <data key="type_id">simple</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="simpleProductNotVisibleIndividually" type="product">
-+        <data key="urlKey" unique="suffix">test-simple-product</data>
-+        <data key="name" unique="suffix">TestSimpleProduct</data>
-+        <data key="sku" unique="suffix">test_simple_product_sku</data>
-+        <data key="price">325.00</data>
-+        <data key="quantity">123</data>
-+        <data key="status">In Stock</data>
-+        <data key="weight">129.0000</data>
-+        <data key="visibility">Not Visible Individually</data>
-+        <data key="type_id">simple</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="simpleProductDataOverriding" type="product">
-+        <data key="urlKey" unique="suffix">test-simple-product</data>
-+        <data key="name" unique="suffix">TestSimpleProduct</data>
-+        <data key="sku" unique="suffix">test_simple_product_sku</data>
-+        <data key="price">9.99</data>
-+        <data key="type_id">simple</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="nameAndAttributeSkuMaskSimpleProduct" type="product">
-+        <data key="urlKey" unique="suffix">simple-product</data>
-+        <data key="name" unique="suffix">SimpleProduct</data>
-+        <data key="price">10000.00</data>
-+        <data key="quantity">657</data>
-+        <data key="weight">50</data>
-+        <data key="country_of_manufacture">UA</data>
-+        <data key="country_of_manufacture_label">Ukraine</data>
-+        <data key="type_id">simple</data>
-+        <data key="status">1</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="ProductShortDescription" type="ProductAttribute">
-+        <data key="attribute_code">short_description</data>
-+    </entity>
-+    <entity name="AddToDefaultSetTopOfContentSection" type="ProductAttributeSet">
-+        <var key="attributeCode" entityKey="attribute_code" entityType="ProductAttribute"/>
-+        <data key="attributeSetId">4</data>
-+        <data key="attributeGroupId">13</data>
-+        <data key="sortOrder">0</data>
-+    </entity>
-+    <entity name="productAlphabeticalA" type="product" extends="_defaultProduct">
-+        <data key="name" unique="suffix">AAA Product</data>
-+    </entity>
-+    <entity name="productAlphabeticalB" type="product" extends="_defaultProduct">
-+        <data key="name" unique="suffix">BBB Product</data>
-+    </entity>
-+    <entity name="productWithSpecialCharacters" type="product" extends="_defaultProduct">
-+        <data key="name" unique="suffix">Product "!@#$%^&amp;*()+:;\|}{][?=~` </data>
-+        <data key="nameWithSafeChars" unique="suffix">|}{][?=~` </data>
-+    </entity>
-+    <entity name="productWith130CharName" type="product" extends="_defaultProduct">
-+        <data key="name" unique="suffix">ProductWith128Chars 1234567891123456789112345678911234567891123456789112345678911234567891123456789112345678 endnums</data>
-+    </entity>
-+    <entity name="simpleProductDefault" type="product">
-+        <data key="sku" unique="suffix">sku_simple_product_</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">Simple Product </data>
-+        <data key="price">560</data>
-+        <data key="urlKey" unique="suffix">simple-product-</data>
-+        <data key="status">1</data>
-+        <data key="quantity">25</data>
-+        <data key="weight">1</data>
-+        <data key="product_has_weight">1</data>
-+        <data key="is_in_stock">1</data>
-+        <data key="tax_class_id">2</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-+    </entity>
-+    <entity name="simpleProductWithoutCategory" type="product">
-+        <data key="sku" unique="suffix">sku_simple_product_</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">SimpleProduct</data>
-+        <data key="price">560</data>
-+        <data key="urlKey" unique="suffix">simple-product-</data>
-+        <data key="status">1</data>
-+        <data key="quantity">25</data>
-+        <data key="weight">1</data>
-+        <data key="product_has_weight">1</data>
-+        <data key="is_in_stock">1</data>
-+        <data key="tax_class_id">2</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+    </entity>
-+    <entity name="defaultSimpleProductWeight200" type="product">
-+        <data key="name" unique="suffix">Testp</data>
-+        <data key="sku" unique="suffix">testsku</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="price">560.00</data>
-+        <data key="urlKey" unique="suffix">testurl-</data>
-+        <data key="status">1</data>
-+        <data key="quantity">25</data>
-+        <data key="weight">200</data>
-+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
-+    </entity>
-+    <entity name="SimpleProductWithTwoOption" type="product">
-+        <var key="sku" entityType="product" entityKey="sku" />
-+        <requiredEntity type="product_option">ProductOptionMultiSelect</requiredEntity>
-+    </entity>
-+    <entity name="SimpleProductWithOption" type="product">
-+        <var key="sku" entityType="product" entityKey="sku" />
-+        <requiredEntity type="product_option">ProductOptionPercentPriceDropDown</requiredEntity>
-+    </entity>
-+    <entity name="SimpleProductWithDescription" type="product">
-+        <data key="sku" unique="suffix">productwithdescription</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">ProductWithDescription</data>
-+        <data key="price">123.00</data>
-+        <data key="urlKey" unique="suffix">productwithdescription</data>
-+        <data key="status">1</data>
-+        <data key="quantity">100</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
-+    </entity>
-+    <entity name="SimpleProductWithSpecialPrice" type="product">
-+        <data key="sku" unique="suffix">SimpleProductWithSpecialPrice</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="name" unique="suffix">SimpleProduct</data>
-+        <data key="price">100.00</data>
-+        <data key="special_price">90.00</data>
-+        <data key="visibility">4</data>
-+        <data key="status">1</data>
-+        <data key="quantity">86</data>
-+        <data key="urlKey" unique="suffix">simpleproduct</data>
-+        <data key="weight">1</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-+    </entity>
-+    <entity name="SimpleProductWithSpecialPriceSecond" type="product">
-+        <data key="sku" unique="suffix">SimpleProductWithSpecialPriceSecond</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="name" unique="suffix">SimpleProduct</data>
-+        <data key="price">150.00</data>
-+        <data key="special_price">110.00</data>
-+        <data key="visibility">4</data>
-+        <data key="status">1</data>
-+        <data key="quantity">86</data>
-+        <data key="urlKey" unique="suffix">simpleproduct</data>
-+        <data key="weight">1</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-+    </entity>
-+    <entity name="SimpleProduct_100" type="product">
-+        <data key="sku" unique="suffix">testSku</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">testProductName</data>
-+        <data key="price">100.00</data>
-+        <data key="urlKey" unique="suffix">testurlkey</data>
-+        <data key="status">1</data>
-+        <data key="quantity">777</data>
-+        <data key="weight">1</data>
-+        <requiredEntity type="product_extension_attribute">EavStock777</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-+    </entity>
-+    <entity name="ApiSimpleOneQty10" type="product2">
-+        <data key="sku" unique="suffix">api-simple-product</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">Api Simple Product</data>
-+        <data key="price">40.00</data>
-+        <data key="urlKey" unique="suffix">api-simple-product</data>
-+        <data key="status">1</data>
-+        <data key="quantity">10</data>
-+        <requiredEntity type="product_extension_attribute">EavStock10</requiredEntity>
-+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
-+    </entity>
-+    <entity name="ApiSimpleTwoQty10" type="product2">
-+        <data key="sku" unique="suffix">api-simple-product-two</data>
-+        <data key="type_id">simple</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">Api Simple Product Two</data>
-+        <data key="price">40.00</data>
-+        <data key="urlKey" unique="suffix">api-simple-product-two</data>
-+        <data key="status">1</data>
-+        <data key="quantity">10</data>
-+        <requiredEntity type="product_extension_attribute">EavStock10</requiredEntity>
-+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductDesignData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductDesignData.xml
-new file mode 100644
-index 00000000000..42e85ab2698
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductDesignData.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="simpleBlankDesign" type="product">
-+        <data key="custom_design">Magento Blank</data>
-+        <data key="page_layout">2 columns with left bar</data>
-+        <data key="options_container">Product Info Column</data>
-+    </entity>
-+    <entity name="simpleLumaDesign" type="product">
-+        <data key="custom_design">Magento Luma</data>
-+        <data key="page_layout">Empty</data>
-+        <data key="options_container">Block after Info Column</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
-index 88ff2bbace4..5a6a0b5dd95 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="EavStockItem" type="product_extension_attribute">
-         <requiredEntity type="stock_item">Qty_1000</requiredEntity>
-     </entity>
-@@ -17,4 +17,13 @@
-     <entity name="EavStock10" type="product_extension_attribute">
-         <requiredEntity type="stock_item">Qty_10</requiredEntity>
-     </entity>
-+    <entity name="EavStock1" type="product_extension_attribute">
-+        <requiredEntity type="stock_item">Qty_1</requiredEntity>
-+    </entity>
-+    <entity name="EavStock0" type="product_extension_attribute">
-+        <requiredEntity type="stock_item">Qty_0</requiredEntity>
-+    </entity>
-+    <entity name="EavStock777" type="product_extension_attribute">
-+        <requiredEntity type="stock_item">Qty_777</requiredEntity>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
-index b123800a6cc..71c8af318e9 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
-@@ -7,9 +7,12 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="PriceFilterRange" type="filter">
-         <data key="from">10</data>
-         <data key="to">100</data>
-     </entity>
-+    <entity name="ProductPerPage">
-+        <data key="productCount">1</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductLinkData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductLinkData.xml
-new file mode 100644
-index 00000000000..000bb209500
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductLinkData.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="RelatedProductLink" type="product_link">
-+        <var key="sku" entityKey="sku" entityType="product2"/>
-+        <var key="linked_product_sku" entityKey="sku" entityType="product"/>
-+        <data key="link_type">related</data>
-+        <data key="linked_product_type">simple</data>
-+        <data key="position">1</data>
-+        <requiredEntity type="product_link_extension_attribute">Qty1000</requiredEntity>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductLinksData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductLinksData.xml
-new file mode 100644
-index 00000000000..bd4f807880a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductLinksData.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="OneRelatedProductLink" type="product_links">
-+        <requiredEntity type="product_link">RelatedProductLink</requiredEntity>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
-index 903bf03535a..720087917aa 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="ProductOptionField" type="product_option">
-         <var key="product_sku" entityType="product" entityKey="sku" />
-         <data key="title">OptionField</data>
-@@ -38,6 +38,16 @@
-         <data key="price_type">percent</data>
-         <data key="max_characters">0</data>
-     </entity>
-+    <entity name="ProductOptionAreaFixed" type="product_option">
-+        <var key="product_sku" entityType="product" entityKey="sku" />
-+        <data key="title">OptionArea</data>
-+        <data key="type">area</data>
-+        <data key="is_require">false</data>
-+        <data key="sort_order">2</data>
-+        <data key="price">100</data>
-+        <data key="price_type">fixed</data>
-+        <data key="max_characters">0</data>
-+    </entity>
-     <entity name="ProductOptionFile" type="product_option">
-         <var key="product_sku" entityType="product" entityKey="sku" />
-         <data key="title">OptionFile</data>
-@@ -59,6 +69,16 @@
-         <requiredEntity type="product_option_value">ProductOptionValueDropdown1</requiredEntity>
-         <requiredEntity type="product_option_value">ProductOptionValueDropdown2</requiredEntity>
-     </entity>
-+    <entity name="ProductOptionDropDown2" type="product_option">
-+        <var key="product_sku" entityType="product" entityKey="sku" />
-+        <data key="title">OptionDropDown</data>
-+        <data key="type">drop_down</data>
-+        <data key="sort_order">4</data>
-+        <data key="is_require">false</data>
-+        <requiredEntity type="product_option_value">ProductOptionValueDropdown1</requiredEntity>
-+        <requiredEntity type="product_option_value">ProductOptionValueDropdown3</requiredEntity>
-+    </entity>
-+
-     <entity name="ProductOptionDropDownWithLongValuesTitle" type="product_option">
-         <var key="product_sku" entityType="product" entityKey="sku" />
-         <data key="title">OptionDropDownWithLongTitles</data>
-@@ -68,6 +88,15 @@
-         <requiredEntity type="product_option_value">ProductOptionValueDropdownLongTitle1</requiredEntity>
-         <requiredEntity type="product_option_value">ProductOptionValueDropdownLongTitle2</requiredEntity>
-     </entity>
-+    <entity name="ProductOptionValueDropdown" type="product_option">
-+        <var key="product_sku" entityType="product" entityKey="sku" />
-+        <data key="title">OptionDropDown</data>
-+        <data key="type">drop_down</data>
-+        <data key="sort_order">4</data>
-+        <data key="is_require">true</data>
-+        <requiredEntity type="product_option_value">ProductOptionValueWithSkuDropdown1</requiredEntity>
-+        <requiredEntity type="product_option_value">ProductOptionValueWithSkuDropdown2</requiredEntity>
-+    </entity>
-     <entity name="ProductOptionRadiobutton" type="product_option">
-         <var key="product_sku" entityType="product" entityKey="sku" />
-         <data key="title">OptionRadioButtons</data>
-@@ -77,6 +106,24 @@
-         <requiredEntity type="product_option_value">ProductOptionValueRadioButtons1</requiredEntity>
-         <requiredEntity type="product_option_value">ProductOptionValueRadioButtons2</requiredEntity>
-     </entity>
-+    <entity name="ProductOptionRadioButton2" type="product_option">
-+        <var key="product_sku" entityType="product" entityKey="sku" />
-+        <data key="title">OptionRadioButtons</data>
-+        <data key="type">radio</data>
-+        <data key="sort_order">4</data>
-+        <data key="is_require">false</data>
-+        <requiredEntity type="product_option_value">ProductOptionValueRadioButtons1</requiredEntity>
-+        <requiredEntity type="product_option_value">ProductOptionValueRadioButtons4</requiredEntity>
-+    </entity>
-+    <entity name="ProductOptionRadiobuttonWithTwoFixedOptions" type="product_option">
-+        <var key="product_sku" entityType="product" entityKey="sku" />
-+        <data key="title">OptionRadioButtons</data>
-+        <data key="type">radio</data>
-+        <data key="sort_order">5</data>
-+        <data key="is_require">true</data>
-+        <requiredEntity type="product_option_value">ProductOptionValueRadioButtons1</requiredEntity>
-+        <requiredEntity type="product_option_value">ProductOptionValueRadioButtons3</requiredEntity>
-+    </entity>
-     <entity name="ProductOptionCheckbox" type="product_option">
-         <var key="product_sku" entityType="product" entityKey="sku" />
-         <data key="title">OptionCheckbox</data>
-@@ -121,4 +168,18 @@
-         <data key="price">0.00</data>
-         <data key="price_type">percent</data>
-     </entity>
-+    <entity name="ProductOptionPercentPriceDropDown" type="product_option">
-+        <var key="product_sku" entityType="product" entityKey="sku" />
-+        <data key="title">OptionDropDown</data>
-+        <data key="type">drop_down</data>
-+        <data key="sort_order">4</data>
-+        <data key="is_require">true</data>
-+        <requiredEntity type="product_option_value">ProductOptionPercentPriceValueDropdown</requiredEntity>
-+    </entity>
-+    <entity name="ProductOptionFieldSecond" extends="ProductOptionField">
-+        <data key="title" unique="suffix">fifth option</data>
-+    </entity>
-+    <entity name="ProductOptionFileSecond" extends="ProductOptionFile">
-+        <data key="title" unique="suffix">fourth option</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
-index 28dd2553218..e7389943573 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="ProductOptionValueDropdown1" type="product_option_value">
-         <data key="title">OptionValueDropDown1</data>
-         <data key="sort_order">1</data>
-@@ -32,6 +32,24 @@
-         <data key="price">99.99</data>
-         <data key="price_type">percent</data>
-     </entity>
-+    <entity name="ProductOptionValueDropdown3" type="product_option_value">
-+        <data key="title">OptionValueDropDown3</data>
-+        <data key="sort_order">2</data>
-+        <data key="price">10</data>
-+        <data key="price_type">percent</data>
-+    </entity>
-+    <entity name="ProductOptionValueRadioButtons4" type="product_option_value">
-+        <data key="title">OptionValueRadioButtons4</data>
-+        <data key="sort_order">1</data>
-+        <data key="price">9.99</data>
-+        <data key="price_type">fixed</data>
-+    </entity>
-+    <entity name="ProductOptionValueRadioButtons3" type="product_option_value">
-+        <data key="title">OptionValueRadioButtons3</data>
-+        <data key="sort_order">3</data>
-+        <data key="price">10</data>
-+        <data key="price_type">fixed</data>
-+    </entity>
-     <entity name="ProductOptionValueCheckbox" type="product_option_value">
-         <data key="title">OptionValueCheckbox</data>
-         <data key="sort_order">1</data>
-@@ -62,4 +80,25 @@
-         <data key="price">20</data>
-         <data key="price_type">percent</data>
-     </entity>
-+    <entity name="ProductOptionPercentPriceValueDropdown" type="product_option_value">
-+        <data key="title">40 Percent</data>
-+        <data key="sort_order">0</data>
-+        <data key="price">40</data>
-+        <data key="price_type">percent</data>
-+        <data key="sku">sku_drop_down_row_1</data>
-+    </entity>
-+    <entity name="ProductOptionValueWithSkuDropdown1" type="product_option_value">
-+        <data key="title">ProductOptionValueWithSkuDropdown1</data>
-+        <data key="sort_order">1</data>
-+        <data key="price">10</data>
-+        <data key="price_type">fixed</data>
-+        <data key="sku">product_option_value_sku_dropdown_1_</data>
-+    </entity>
-+    <entity name="ProductOptionValueWithSkuDropdown2" type="product_option_value">
-+        <data key="title">ProductOptionValueWithSkuDropdown2</data>
-+        <data key="sort_order">1</data>
-+        <data key="price">10</data>
-+        <data key="price_type">fixed</data>
-+        <data key="sku">product_option_value_sku_dropdown_2_</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/SimpleProductOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/SimpleProductOptionData.xml
-new file mode 100644
-index 00000000000..157a4d41026
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/SimpleProductOptionData.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="simpleProductCustomizableOption">
-+        <data key="title" unique="suffix">Test3 option</data>
-+        <data key="type">Drop-down</data>
-+        <data key="is_required">1</data>
-+        <data key="option_0_title" unique="suffix">40 Percent</data>
-+        <data key="option_0_price">40.00</data>
-+        <data key="option_0_price_type">Percent</data>
-+        <data key="option_0_sku" unique="suffix">sku_drop_down_row_1</data>
-+    </entity>
-+</entities>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
-index 4fae51de86c..32f4dc1404d 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="Qty_1000" type="stock_item">
-         <data key="qty">1000</data>
-         <data key="is_in_stock">true</data>
-@@ -28,4 +28,16 @@
-         <data key="qty">101</data>
-         <data key="is_in_stock">true</data>
-     </entity>
-+    <entity name="Qty_1" type="stock_item">
-+        <data key="qty">1</data>
-+        <data key="is_in_stock">true</data>
-+    </entity>
-+    <entity name="Qty_0" type="stock_item">
-+        <data key="qty">0</data>
-+        <data key="is_in_stock">true</data>
-+    </entity>
-+    <entity name="Qty_777" type="stock_item">
-+        <data key="qty">777</data>
-+        <data key="is_in_stock">true</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
-index a703e56beda..0e51995ac72 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="Option1Store0" type="StoreLabel">
-         <data key="store_id">0</data>
-         <data key="label">option1</data>
-@@ -56,4 +56,20 @@
-         <data key="store_id">1</data>
-         <data key="label">option6</data>
-     </entity>
-+    <entity name="Option7Store0" type="StoreLabel">
-+        <data key="store_id">0</data>
-+        <data key="label">Green</data>
-+    </entity>
-+    <entity name="Option8Store1" type="StoreLabel">
-+        <data key="store_id">1</data>
-+        <data key="label">Green</data>
-+    </entity>
-+    <entity name="Option9Store0" type="StoreLabel">
-+        <data key="store_id">0</data>
-+        <data key="label">Red</data>
-+    </entity>
-+    <entity name="Option10Store1" type="StoreLabel">
-+        <data key="store_id">1</data>
-+        <data key="label">Red</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
-new file mode 100644
-index 00000000000..0c88c666a20
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
-@@ -0,0 +1,67 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="testDataTierPrice" type="data">
-+        <data key="goldenPrice1">$676.50</data>
-+        <data key="goldenPrice2">$615.00</data>
-+    </entity>
-+    <entity name="customStoreTierPrice" type="data">
-+        <data key="name">secondStore</data>
-+        <data key="code">second_store</data>
-+    </entity>
-+    <entity name="customStoreView" type="data">
-+        <data key="name">secondStoreView</data>
-+        <data key="code">second_store_view</data>
-+    </entity>
-+    <entity name="tierPriceOnVirtualProduct" type="data">
-+        <data key="website">All Websites [USD]</data>
-+        <data key="customer_group">ALL GROUPS</data>
-+        <data key="price">90.00</data>
-+        <data key="qty">2</data>
-+    </entity>
-+    <entity name="tierPriceOnGeneralGroup" type="data">
-+        <data key="website">All Websites [USD]</data>
-+        <data key="customer_group">General</data>
-+        <data key="price">80.00</data>
-+        <data key="qty">2</data>
-+    </entity>
-+    <entity name="tierPriceOnDefault" type="data">
-+        <data key="website_0">All Websites [USD]</data>
-+        <data key="customer_group_0">ALL GROUPS</data>
-+        <data key="price_0">15.00</data>
-+        <data key="qty_0">3</data>
-+        <data key="website_1">All Websites [USD]</data>
-+        <data key="customer_group_1">ALL GROUPS</data>
-+        <data key="price_1">24.00</data>
-+        <data key="qty_1">15</data>
-+    </entity>
-+    <entity name="tierPriceHighCostSimpleProduct" type="data">
-+        <data key="website">All Websites [USD]</data>
-+        <data key="customer_group">ALL GROUPS</data>
-+        <data key="price">500,000.00</data>
-+        <data key="qty">1</data>
-+    </entity>
-+    <entity name="tierProductPrice" type="catalogTierPrice">
-+        <data key="price">90.00</data>
-+        <data key="price_type">fixed</data>
-+        <data key="website_id">0</data>
-+        <data key="customer_group">ALL GROUPS</data>
-+        <data key="quantity">2</data>
-+        <var key="sku" entityType="product2" entityKey="sku" />
-+    </entity>
-+    <entity name="tierProductPriceDefault" type="catalogTierPrice">
-+        <data key="price">90.00</data>
-+        <data key="price_type">fixed</data>
-+        <data key="website_id">0</data>
-+        <data key="customer_group">ALL GROUPS</data>
-+        <data key="quantity">30</data>
-+        <var key="sku" entityType="product" entityKey="sku" />
-+    </entity>
-+</entities>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/VirtualProductOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/VirtualProductOptionData.xml
-new file mode 100644
-index 00000000000..fe1d49e4daa
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/VirtualProductOptionData.xml
-@@ -0,0 +1,60 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="virtualProductCustomizableOption1">
-+        <data key="title" unique="suffix">Test1 option </data>
-+        <data key="is_required">1</data>
-+        <data key="type">Field</data>
-+        <data key="option_0_price">120.03</data>
-+        <data key="option_0_price_type">Fixed</data>
-+        <data key="option_0_sku" unique="suffix">sku1_</data>
-+        <data key="option_0_max_characters">45</data>
-+    </entity>
-+    <entity name="virtualProductCustomizableOption2">
-+        <data key="title" unique="suffix">Test2 option </data>
-+        <data key="is_required">1</data>
-+        <data key="type">Field</data>
-+        <data key="option_0_price">120.03</data>
-+        <data key="option_0_price_type">Fixed</data>
-+        <data key="option_0_sku" unique="suffix">sku2_</data>
-+        <data key="option_0_max_characters">45</data>
-+    </entity>
-+    <entity name="virtualProductCustomizableOption3">
-+        <data key="title" unique="suffix">Test3 option </data>
-+        <data key="is_required">1</data>
-+        <data key="type">Drop-down</data>
-+        <data key="option_0_title" unique="suffix">Test3-1 </data>
-+        <data key="option_0_price">110.01</data>
-+        <data key="option_0_expected_price">9,900.90</data>
-+        <data key="option_0_price_type">Percent</data>
-+        <data key="option_0_sku" unique="suffix">sku3-1_</data>
-+        <data key="option_0_sort_order">0</data>
-+        <data key="option_1_title" unique="suffix">Test3-2 </data>
-+        <data key="option_1_price">210.02</data>
-+        <data key="option_1_price_type">Fixed</data>
-+        <data key="option_1_sku" unique="suffix">sku3-2_</data>
-+        <data key="option_1_sort_order">1</data>
-+    </entity>
-+    <entity name="virtualProductCustomizableOption4">
-+        <data key="title" unique="suffix">Test4 option </data>
-+        <data key="is_required">1</data>
-+        <data key="type">Drop-down</data>
-+        <data key="option_0_title" unique="suffix">Test4-1 </data>
-+        <data key="option_0_price">10.01</data>
-+        <data key="option_0_price_type">Percent</data>
-+        <data key="option_0_sku" unique="suffix">sku4-1_</data>
-+        <data key="option_0_sort_order">0</data>
-+        <data key="option_1_title" unique="suffix">Test4-2 </data>
-+        <data key="option_1_price">20.02</data>
-+        <data key="option_1_price_type">Fixed</data>
-+        <data key="option_1_sku" unique="suffix">sku4-2_</data>
-+        <data key="option_1_sort_order">1</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/WYSIWYGConfigData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/WYSIWYGConfigData.xml
-new file mode 100644
-index 00000000000..7bb8cf5f4db
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/WYSIWYGConfigData.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="EnableWYSIWYG">
-+        <data key="path">cms/wysiwyg/enabled</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Yes</data>
-+        <data key="value">enabled</data>
-+    </entity>
-+    <entity name="EnableTinyMCE4">
-+        <data key="path">cms/wysiwyg/editor</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Yes</data>
-+        <data key="value">mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/WidgetsData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/WidgetsData.xml
-new file mode 100644
-index 00000000000..18564ff101f
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Data/WidgetsData.xml
-@@ -0,0 +1,35 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="ProductLinkWidget" extends="ProductsListWidget">
-+        <data key="type">Catalog Product Link</data>
-+        <data key="template">Product Link Block Template</data>
-+    </entity>
-+    <entity name="RecentlyComparedProductsWidget" type="widget">
-+        <data key="type">Recently Compared Products</data>
-+        <data key="design_theme">Magento Luma</data>
-+        <data key="name" unique="suffix">Recently Compared Products</data>
-+        <array key="store_ids">
-+            <item>All Store Views</item>
-+        </array>
-+        <data key="display_on">All Pages</data>
-+        <data key="container">Sidebar Additional</data>
-+    </entity>
-+    <entity name="RecentlyViewedProductsWidget" type="widget">
-+        <data key="type">Recently Viewed Products</data>
-+        <data key="design_theme">Magento Luma</data>
-+        <data key="name" unique="suffix">Recently Viewed Products</data>
-+        <array key="store_ids">
-+            <item>All Store Views</item>
-+        </array>
-+        <data key="display_on">All Pages</data>
-+        <data key="container">Sidebar Additional</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_attribute_set-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_attribute_set-meta.xml
-new file mode 100644
-index 00000000000..9ef7b507812
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_attribute_set-meta.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="AddCatalogAttributeToAttributeSet" dataType="CatalogAttributeSet" type="create" auth="adminOauth" url="/V1/products/attribute-sets" method="POST">
-+        <contentType>application/json</contentType>
-+        <object key="attributeSet" dataType="CatalogAttributeSet">
-+            <field key="attribute_set_name">string</field>
-+            <field key="sort_order">integer</field>
-+        </object>
-+        <field key="skeletonId">integer</field>
-+    </operation>
-+    <operation name="DeleteCatalogAttributeFromAttributeSet" dataType="CatalogAttributeSet" type="delete" auth="adminOauth" url="/V1/products/attribute-sets/{attribute_set_id}" method="DELETE">
-+        <contentType>application/json</contentType>
-+    </operation>
-+    <operation name="GetCatalogAttributesFromDefaultSet" dataType="CatalogAttributeSet" type="get" auth="adminOauth" url="/V1/products/attribute-sets/{attribute_set_id}" method="GET">
-+        <contentType>application/json</contentType>
-+    </operation>
-+</operations>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml
-new file mode 100644
-index 00000000000..b1f2b43220b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml
-@@ -0,0 +1,118 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CatalogStorefrontConfiguration" dataType="catalog_storefront_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
-+        <object key="groups" dataType="catalog_storefront_config">
-+            <object key="frontend" dataType="catalog_storefront_config">
-+                <object key="fields" dataType="catalog_storefront_config">
-+                    <object key="list_mode" dataType="list_mode">
-+                        <field key="value">string</field>
-+                    </object>
-+                    <object key="grid_per_page_values" dataType="grid_per_page_values">
-+                        <field key="value">string</field>
-+                    </object>
-+                    <object key="grid_per_page" dataType="grid_per_page">
-+                        <field key="value">string</field>
-+                    </object>
-+                    <object key="list_per_page_values" dataType="list_per_page_values">
-+                        <field key="value">string</field>
-+                    </object>
-+                    <object key="list_per_page" dataType="list_per_page">
-+                        <field key="value">string</field>
-+                    </object>
-+                    <object key="default_sort_by" dataType="default_sort_by">
-+                        <field key="value">string</field>
-+                    </object>
-+                    <object key="list_allow_all" dataType="list_allow_all">
-+                        <field key="value">integer</field>
-+                    </object>
-+                    <object key="remember_pagination" dataType="remember_pagination">
-+                        <field key="value">integer</field>
-+                    </object>
-+                    <object key="flat_catalog_category" dataType="flat_catalog_category">
-+                        <field key="value">integer</field>
-+                    </object>
-+                    <object key="flat_catalog_product" dataType="flat_catalog_product">
-+                        <field key="value">integer</field>
-+                    </object>
-+                    <object key="swatches_per_product" dataType="swatches_per_product">
-+                        <field key="value">string</field>
-+                    </object>
-+                    <object key="show_swatches_in_product_list" dataType="show_swatches_in_product_list">
-+                        <field key="value">integer</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+
-+    <operation name="DefaultCatalogStorefrontConfiguration" dataType="default_catalog_storefront_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
-+        <object key="groups" dataType="default_catalog_storefront_config">
-+            <object key="frontend" dataType="default_catalog_storefront_config">
-+                <object key="fields" dataType="default_catalog_storefront_config">
-+                    <object key="list_mode" dataType="default_catalog_storefront_config">
-+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="grid_per_page_values" dataType="default_catalog_storefront_config">
-+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="grid_per_page" dataType="default_catalog_storefront_config">
-+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="list_per_page_values" dataType="default_catalog_storefront_config">
-+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="list_per_page" dataType="default_catalog_storefront_config">
-+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="default_sort_by" dataType="default_catalog_storefront_config">
-+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="remember_pagination" dataType="default_catalog_storefront_config">
-+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="flat_catalog_category" dataType="default_catalog_storefront_config">
-+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="swatches_per_product" dataType="default_catalog_storefront_config">
-+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="show_swatches_in_product_list" dataType="default_catalog_storefront_config">
-+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="list_allow_all" dataType="list_allow_all">
-+                        <field key="value">integer</field>
-+                    </object>
-+                    <object key="flat_catalog_product" dataType="flat_catalog_product">
-+                        <field key="value">integer</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml
-new file mode 100644
-index 00000000000..1ee57c89b2b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CatalogPriceConfigState" dataType="catalog_price_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
-+        <object key="groups" dataType="catalog_price_config_state">
-+            <object key="price" dataType="catalog_price_config_state">
-+                <object key="fields" dataType="catalog_price_config_state">
-+                    <object key="scope" dataType="scope">
-+                        <field key="value">string</field>
-+                    </object>
-+                    <object key="default_product_price" dataType="default_product_price">
-+                        <field key="value">string</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_recently_products-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_recently_products-meta.xml
-new file mode 100644
-index 00000000000..0fe4f154d5e
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_recently_products-meta.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CatalogRecentlyProductsConfiguration" dataType="catalog_recently_products" type="create"
-+               auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST" successRegex="/messages-message-success/">
-+        <object key="groups" dataType="catalog_recently_products">
-+            <object key="recently_products" dataType="catalog_recently_products">
-+                <object key="fields" dataType="catalog_recently_products">
-+                    <object key="synchronize_with_backend" dataType="synchronize_with_backend">
-+                        <field key="value">integer</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_special_price-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_special_price-meta.xml
-new file mode 100644
-index 00000000000..354277ad056
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_special_price-meta.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="catalogSpecialPrice" dataType="catalogSpecialPrice" type="create" auth="adminOauth" url="/V1/products/special-price" method="POST">
-+        <contentType>application/json</contentType>
-+        <object key="prices" dataType="catalogSpecialPrice">
-+            <object dataType="catalogSpecialPrice" key="0">
-+                <field key="price">number</field>
-+                <field key="store_id">integer</field>
-+                <field key="sku">string</field>
-+                <field key="price_from">string</field>
-+                <field key="price_to">string</field>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_tier_price-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_tier_price-meta.xml
-new file mode 100644
-index 00000000000..7aa7530b0fd
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_tier_price-meta.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="catalogTierPrice" dataType="catalogTierPrice" type="create" auth="adminOauth" url="/V1/products/tier-prices" method="POST">
-+        <contentType>application/json</contentType>
-+        <object key="prices" dataType="catalogTierPrice">
-+            <object dataType="catalogTierPrice" key="0">
-+                <field key="price">number</field>
-+                <field key="price_type">string</field>
-+                <field key="website_id">integer</field>
-+                <field key="sku">string</field>
-+                <field key="customer_group">string</field>
-+                <field key="quantity">integer</field>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml
-index 0880315db5d..ae491aefc10 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateCategory" dataType="category" type="create" auth="adminOauth" url="/V1/categories" method="POST">
-         <contentType>application/json</contentType>
-         <object key="category" dataType="category">
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml
-index aed9b7a9798..a37bb36eb65 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateCustomAttribute" dataType="custom_attribute" type="create">
-         <field key="attribute_code">string</field>
-         <field key="value">string</field>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml
-index d8410593cb5..7faac6c3b6d 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateEmptyExtensionAttribute" dataType="empty_extension_attribute" type="create">
-     </operation>
-     <operation name="UpdateEmptyExtensionAttribute" dataType="empty_extension_attribute" type="update">
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml
-index d0bcbd3e5db..063b8c2e5ac 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateFrontendLabel" dataType="FrontendLabel" type="create">
-         <field key="store_id">integer</field>
-         <field key="label">string</field>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/Metadata/image_content-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/image_content-meta.xml
-similarity index 100%
-rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/Metadata/image_content-meta.xml
-rename to app/code/Magento/Catalog/Test/Mftf/Metadata/image_content-meta.xml
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
-index 212de2b39d3..9ece47c01fc 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateProduct" dataType="product" type="create" auth="adminOauth" url="/V1/products" method="POST">
-         <contentType>application/json</contentType>
-         <object dataType="product" key="product">
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute-meta.xml
-index 93396352ba5..1e9aa3bc219 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateProductAttribute" dataType="ProductAttribute" type="create" auth="adminOauth" url="/V1/products/attributes" method="POST">
-         <contentType>application/json</contentType>
-         <object dataType="ProductAttribute" key="attribute">
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_media_gallery_entry-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_media_gallery_entry-meta.xml
-index 8033e8c33a3..521e864702e 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_media_gallery_entry-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_media_gallery_entry-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateProductAttributeMediaGalleryEntry" dataType="ProductAttributeMediaGalleryEntry" type="create" auth="adminOauth" url="/V1/products/{sku}/media" method="POST">
-         <contentType>application/json</contentType>
-         <object key="entry" dataType="ProductAttributeMediaGalleryEntry">
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_option-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_option-meta.xml
-index 176afa8d58d..467ff9a48eb 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_option-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_option-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateProductAttributeOption" dataType="ProductAttributeOption" type="create" auth="adminOauth" url="/V1/products/attributes/{attribute_code}/options" method="POST">
-         <contentType>application/json</contentType>
-         <object dataType="ProductAttributeOption" key="option">
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_set-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_set-meta.xml
-index eef82b07aaf..6f04c48e792 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_set-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_set-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="AddProductAttributeToAttributeSet" dataType="ProductAttributeSet" type="create" auth="adminOauth" url="/V1/products/attribute-sets/attributes" method="POST">
-         <contentType>application/json</contentType>
-         <field key="attributeSetId">integer</field>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_extension_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_extension_attribute-meta.xml
-index 8d0d1e66c81..127a754c888 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_extension_attribute-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_extension_attribute-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateProductExtensionAttribute" dataType="product_extension_attribute" type="create">
-         <field key="stock_item">stock_item</field>
-     </operation>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link-meta.xml
-index 5e631b2ea3a..a2fcbb1417d 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateProductLink" dataType="product_link" type="create">
-         <field key="sku">string</field>
-         <field key="link_type">string</field>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link_extension_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link_extension_attribute-meta.xml
-index 07ea02f5b7a..90888463ef8 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link_extension_attribute-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link_extension_attribute-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateProductLinkExtensionAttribute" dataType="product_link_extension_attribute" type="create">
-         <contentType>application/json</contentType>
-         <field key="qty">integer</field>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_links-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_links-meta.xml
-index 56b3ee25ef7..450ea99b9d0 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_links-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_links-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateProductLinks" dataType="product_links" type="create" auth="adminOauth" url="/V1/products/{sku}/links" method="POST">
-         <contentType>application/json</contentType>
-         <array key="items">
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option-meta.xml
-index adc5a33507a..6464c2988ad 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateProductOption" dataType="product_option" type="create">
-         <field key="product_sku">string</field>
-         <field key="option_id">integer</field>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option_value-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option_value-meta.xml
-index f4273f57968..bce77bc3a26 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option_value-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option_value-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateProductOptionValue" dataType="product_option_value" type="create">
-         <field key="title">string</field>
-         <field key="sort_order">integer</field>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/stock_item-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/stock_item-meta.xml
-index e7e79d69055..6ec5f2c8051 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/stock_item-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/stock_item-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateStockItem" dataType="stock_item" type="create">
-         <field key="qty">integer</field>
-         <field key="is_in_stock">boolean</field>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/store_label-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/store_label-meta.xml
-index abb9b003dc5..584ba5eebb5 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/store_label-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/store_label-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateStoreLabel" dataType="StoreLabel" type="create">
-         <field key="store_id">integer</field>
-         <field key="label">string</field>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/validation_rule-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/validation_rule-meta.xml
-index c568e52b2ab..aa120491ece 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Metadata/validation_rule-meta.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/validation_rule-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateValidationRule" dataType="validation_rule" type="create">
-         <field key="key">string</field>
-         <field key="value">string</field>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
-index cfefa8cb2c4..e1c8e5c75e9 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminCategoryEditPage" url="catalog/category/edit/id/{{categoryId}}/" area="admin" module="Catalog" parameterized="true">
-         <section name="AdminCategorySidebarActionSection"/>
-         <section name="AdminCategoryMainActionsSection"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
-index 7cabe0e18f0..f7d8abf8b2f 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
-@@ -7,8 +7,8 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
--    <page name="AdminCategoryPage" url="catalog/category/" area="admin" module="Catalog">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminCategoryPage" url="catalog/category/" area="admin" module="Magento_Catalog">
-         <section name="AdminCategorySidebarActionSection"/>
-         <section name="AdminCategoryMainActionsSection"/>
-         <section name="AdminCategorySidebarTreeSection"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminNewWidgetPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminNewWidgetPage.xml
-new file mode 100644
-index 00000000000..dd5d5aef08a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminNewWidgetPage.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminNewWidgetPage" url="admin/widget_instance/new/" area="admin" module="Magento_Widget">
-+        <section name="AdminNewWidgetSelectProductPopupSection"/>
-+        <section name="AdminCatalogProductWidgetSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
-index b04aff5f161..fab87f90f86 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="ProductAttributePage" url="catalog/product_attribute/new/" area="admin" module="Catalog">
-         <section name="AdminCreateProductAttributeSection"/>
-     </page>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeGridPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeGridPage.xml
-index a5de7453d9c..e6aafa53601 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeGridPage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeGridPage.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminProductAttributeGridPage" url="catalog/product_attribute" area="admin" module="Catalog">
-         <section name="AdminProductAttributeGridSection"/>
-     </page>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetEditPage.xml
-index 4034f2ab075..3e89cbc8262 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetEditPage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetEditPage.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminProductAttributeSetEditPage" url="catalog/product_set/edit/id" area="admin" module="Catalog">
-         <section name="AdminProductAttributeSetEditSection"/>
-     </page>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetGridPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetGridPage.xml
-index 0d879768eb4..d55e71adca2 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetGridPage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetGridPage.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminProductAttributeSetGridPage" url="catalog/product_set/" area="admin" module="ProductAttributeSet">
-         <section name="AdminProductAttributeSetGridSection"/>
-     </page>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributesEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributesEditPage.xml
-index 4918041d2cd..66475a93b75 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributesEditPage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributesEditPage.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="ProductAttributesEditPage" url="catalog/product_action_attribute/edit/" area="admin" module="Catalog">
-         <section name="AdminEditProductAttributesSection"/>
-     </page>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
-index be7c44e378f..e4c4ece5ac6 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
-         <section name="AdminProductFormSection"/>
-         <section name="AdminProductFormActionSection"/>
-@@ -15,7 +15,10 @@
-         <section name="AdminProductImagesSection"/>
-         <section name="AdminAddProductsToOptionPanel"/>
-         <section name="AdminProductMessagesSection"/>
-+        <section name="AdminProductAttributesSection"/>
-         <section name="AdminProductFormRelatedUpSellCrossSellSection"/>
-         <section name="AdminProductFormAdvancedPricingSection"/>
-+        <section name="AdminProductFormAdvancedInventorySection"/>
-+        <section name="AdminAddAttributeModalSection"/>
-     </page>
- </pages>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductDeletePage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductDeletePage.xml
-new file mode 100644
-index 00000000000..1ce53a0ebd5
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductDeletePage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminProductDeletePage" url="catalog/product/delete/id/{{productId}}/" area="admin" module="Magento_Catalog" parameterized="true">
-+        <!-- This page object only exists for the url. Use the AdminProductCreatePage for selectors. -->
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductEditPage.xml
-index 9312d4dfcfb..c9debf8bf3b 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductEditPage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductEditPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminProductEditPage" url="catalog/product/edit/id/{{productId}}/" area="admin" module="Magento_Catalog" parameterized="true">
-         <!-- This page object only exists for the url. Use the AdminProductCreatePage for selectors. -->
-     </page>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml
-index 66cd6911762..a6edf06f2c1 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminProductIndexPage" url="catalog/product/index" area="admin" module="Magento_Catalog">
-         <section name="AdminProductGridActionSection" />
-         <section name="AdminProductGridFilterSection" />
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/ProductCatalogPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/ProductCatalogPage.xml
-index 742b46fcaf7..012aeaaf14e 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/ProductCatalogPage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/ProductCatalogPage.xml
-@@ -7,7 +7,7 @@
-  -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="ProductCatalogPage" url="/catalog/product/" area="admin" module="Magento_Catalog">
-         <section name="ProductCatalogPageSection"/>
-     </page>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
-index c5b9fe86955..469c153d38b 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="StorefrontCategoryPage" url="/{{var1}}.html" area="storefront" module="Catalog" parameterized="true">
-         <section name="StorefrontCategoryMainSection"/>
-         <section name="WYSIWYGToolbarSection"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductComparePage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductComparePage.xml
-index f0599a021d4..5451d920224 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductComparePage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductComparePage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="StorefrontProductComparePage" url="catalog/product_compare/index" module="Magento_Catalog" area="storefront">
-         <section name="StorefrontProductCompareMainSection" />
-     </page>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml
-index 8fd59585938..75e3210cad7 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml
-@@ -7,8 +7,8 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
--    <page name="StorefrontProductPage" url="/{{var1}}.html" area="storefront" module="Catalog" parameterized="true">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontProductPage" url="/{{var1}}.html" area="storefront" module="Magento_Catalog" parameterized="true">
-         <section name="StorefrontProductInfoMainSection" />
-         <section name="StorefrontProductInfoDetailsSection" />
-         <section name="WYSIWYGToolbarSection"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminAddProductsToOptionPanelSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminAddProductsToOptionPanelSection.xml
-index 4541ad25af2..069a8b28698 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminAddProductsToOptionPanelSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminAddProductsToOptionPanelSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminAddProductsToOptionPanel">
-         <element name="addSelectedProducts" type="button" selector=".product_form_product_form_bundle-items_modal button.action-primary" timeout="30"/>
-         <element name="filters" type="button" selector=".product_form_product_form_bundle-items_modal button[data-action='grid-filter-expand']" timeout="30"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCatalogProductWidgetSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCatalogProductWidgetSection.xml
-new file mode 100644
-index 00000000000..3261db1f63f
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCatalogProductWidgetSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCatalogProductWidgetSection">
-+        <element name="productAttributesToShow" type="multiselect" selector="select[name='parameters[show_attributes][]']"/>
-+        <element name="productButtonsToShow" type="multiselect" selector="select[name='parameters[show_buttons][]']"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
-index 3ed3763da19..977e63b9ec9 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCategoryBasicFieldSection">
-         <element name="IncludeInMenu" type="checkbox" selector="input[name='include_in_menu']"/>
-         <element name="includeInMenuLabel" type="text" selector="input[name='include_in_menu']+label"/>
-@@ -16,9 +16,13 @@
-         <element name="enableCategoryLabel" type="text" selector="input[name='is_active']+label"/>
-         <element name="enableUseDefault" type="checkbox" selector="input[name='use_default[is_active]']"/>
-         <element name="CategoryNameInput" type="input" selector="input[name='name']"/>
-+        <element name="RequiredFieldIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=name]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
-+        <element name="RequiredFieldIndicatorColor" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=name]&gt;.admin__field-label span'), ':after').getPropertyValue('color');"/>
-         <element name="categoryNameUseDefault" type="checkbox" selector="input[name='use_default[name]']"/>
-         <element name="ContentTab" type="input" selector="input[name='name']"/>
-         <element name="FieldError" type="text" selector=".admin__field-error[data-bind='attr: {for: {{field}}}, text: error']" parameterized="true"/>
-+        <element name="panelFieldControl" type="input" selector='//aside//div[@data-index="{{arg1}}"]/descendant::*[@name="{{arg2}}"]' parameterized="true"/>
-+        <element name="productsInCategory" type="input" selector="div[data-index='assign_products']" timeout="30"/>
-     </section>
-     <section name="CategoryContentSection">
-         <element name="SelectFromGalleryBtn" type="button" selector="//label[text()='Select from Gallery']"/>
-@@ -29,6 +33,20 @@
-         <element name="DesignTab" type="button" selector="//strong[@class='admin__collapsible-title']//span[text()='Design']"/>
-         <element name="LayoutDropdown" type="select" selector="select[name='page_layout']"/>
-     </section>
-+    <section name="CategoryDisplaySettingsSection">
-+        <element name="DisplaySettingTab" type="button" selector="//strong[@class='admin__collapsible-title']//span[text()='Display Settings']"/>
-+        <element name="layeredNavigationPriceInput" type="input" selector="input[name='filter_price_range']"/>
-+        <element name="FieldError" type="text" selector=".admin__field-error[data-bind='attr: {for: {{field}}}, text: error']" parameterized="true"/>
-+        <element name="filterPriceRangeUseConfig" type="checkbox" selector="input[name='use_config[filter_price_range]']"/>
-+        <element name="RequiredFieldIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index={{arg1}}]&gt;.admin__field-label span'), ':after').getPropertyValue('content');" parameterized="true"/>
-+        <element name="displayMode" type="button" selector="select[name='display_mode']"/>
-+        <element name="anchor" type="checkbox" selector="input[name='is_anchor']"/>
-+        <element name="productListCheckBox" type="checkbox" selector="input[name='use_config[available_sort_by]']" />
-+        <element name="productList" type="text" selector="select[name='available_sort_by']"/>
-+        <element name="defaultProductLisCheckBox" type="checkbox" selector="input[name='use_config[default_sort_by]']"/>
-+        <element name="defaultProductList" type="text" selector="select[name='default_sort_by']"/>
-+        <element name="layeredNavigationPriceCheckBox" type="checkbox" selector="input[name='use_config[filter_price_range]']"/>
-+    </section>
-     <section name="CatalogWYSIWYGSection">
-         <element name="ShowHideBtn" type="button" selector="#togglecategory_form_description"/>
-         <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
-index 59537274f23..e3d22490467 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCategoryContentSection">
-         <element name="sectionHeader" type="button" selector="div[data-index='content']" timeout="30"/>
-         <element name="uploadButton" type="button" selector="//*[@class='file-uploader-area']/label[text()='Upload']"/>
-@@ -15,5 +15,14 @@
-         <element name="uploadImageFile" type="input" selector=".file-uploader-area>input"/>
-         <element name="imageFileName" type="text" selector=".file-uploader-filename"/>
-         <element name="removeImageButton" type="button" selector=".file-uploader-summary .action-remove"/>
-+        <element name="AddCMSBlock" type="select" selector="//*[@name='landing_page']"/>
-+        <element name="description" type="input" selector="//*[@name='description']"/>
-+        <element name="content" type="button" selector="div[data-index='content'"/>
-+        <element name="categoryInTree" type="button" selector="//li[contains(@class, 'x-tree-node')]//div[contains(.,'{{categoryName}}') and contains(@class, 'no-active-category')]" parameterized="true" />
-+        <element name="categoryPageTitle" type="text" selector="h1.page-title" />
-+        <element name="activeCategoryInTree" type="button" selector="//li[contains(@class, 'x-tree-node')]//div[contains(.,'{{categoryName}}') and contains(@class, 'active-category')]" parameterized="true" />
-+        <element name="productTableColumnName" type="input" selector="#catalog_category_products_filter_name"/>
-+        <element name="productTableRow" type="button" selector="#catalog_category_products_table tbody tr"/>
-+        <element name="productSearch" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryDisplaySettingsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryDisplaySettingsSection.xml
-new file mode 100644
-index 00000000000..daa00eb0a27
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryDisplaySettingsSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCategoryDisplaySettingsSection">
-+        <element name="settingsHeader" type="button" selector="//*[contains(text(),'Display Settings')]" timeout="30"/>
-+        <element name="displayMode" type="button" selector="//*[@name='display_mode']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
-index 60a6d852bf6..e8adede5b2d 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
-@@ -7,12 +7,14 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCategoryMainActionsSection">
-         <element name="SaveButton" type="button" selector=".page-actions-inner #save" timeout="30"/>
-         <element name="DeleteButton" type="button" selector=".page-actions-inner #delete" timeout="30"/>
-         <element name="CategoryStoreViewDropdownToggle" type="button" selector="#store-change-button"/>
-         <element name="CategoryStoreViewOption" type="button" selector="//div[contains(@class, 'store-switcher')]//a[normalize-space()='{{store}}']" parameterized="true"/>
-         <element name="CategoryStoreViewModalAccept" type="button" selector=".modal-popup.confirm._show .action-accept"/>
-+        <element name="allStoreViews" type="button" selector=".store-switcher .store-switcher-all" timeout="30"/>
-+        <element name="storeSwitcher" type="text" selector=".store-switcher"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
-index 1214cfd2eb2..ea4f4bf53eb 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
-@@ -7,8 +7,9 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCategoryMessagesSection">
-         <element name="SuccessMessage" type="text" selector=".message-success"/>
-+        <element name="errorMessage" type="text" selector="//div[@class='message message-error error']"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryModalSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryModalSection.xml
-index 03b9d767785..85b8dc894a1 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryModalSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryModalSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCategoryModalSection">
-         <element name="message" type="text" selector="aside.confirm div.modal-content"/>
-         <element name="title" type="text" selector="aside.confirm .modal-header .modal-title"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
-index 540a97fd04e..df79ec61ef7 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
-@@ -7,12 +7,15 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCategoryProductsGridSection">
-         <element name="rowProductId" type="text" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-id" parameterized="true"/>
-         <element name="rowProductName" type="text" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-name" parameterized="true"/>
-         <element name="rowProductSku" type="text" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-sku" parameterized="true"/>
-         <element name="rowPrice" type="text" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-price" parameterized="true"/>
-         <element name="rowPosition" type="input" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-position .position input" timeout="30" parameterized="true"/>
-+        <element name="productGridNameProduct" type="text" selector="//table[@id='catalog_category_products_table']//td[contains(., '{{productName}}')]" parameterized="true"/>
-+        <element name="productVisibility" type="select" selector="//*[@name='product[visibility]']"/>
-+        <element name="productSelectAll" type="checkbox" selector="input.admin__control-checkbox"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
-index dc254bdf159..e9ff40f98bb 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
-@@ -7,8 +7,9 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCategoryProductsSection">
-         <element name="sectionHeader" type="button" selector="div[data-index='assign_products']" timeout="30"/>
-+        <element name="addProducts" type="button" selector="#catalog_category_add_product_tabs" timeout="30"/>
-     </section>
- </sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml
-index 35852abe350..b5d5d61f646 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCategorySEOSection">
-         <element name="SectionHeader" type="button" selector="div[data-index='search_engine_optimization']" timeout="30"/>
-         <element name="UrlKeyInput" type="input" selector="input[name='url_key']"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarActionSection.xml
-index e53a9989d66..0a1901f1fda 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarActionSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarActionSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCategorySidebarActionSection">
-         <element name="AddRootCategoryButton" type="button" selector="#add_root_category_button" timeout="30"/>
-         <element name="AddSubcategoryButton" type="button" selector="#add_subcategory_button" timeout="30"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
-index 524fac78bc1..ce7d962f3ec 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
-@@ -7,14 +7,17 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCategorySidebarTreeSection">
-         <element name="collapseAll" type="button" selector=".tree-actions a:first-child"/>
-         <element name="expandAll" type="button" selector=".tree-actions a:last-child"/>
-         <element name="categoryTreeRoot" type="text" selector="div.x-tree-root-node>li.x-tree-node:first-of-type>div.x-tree-node-el:first-of-type" timeout="30"/>
-         <element name="categoryInTree" type="text" selector="//a/span[contains(text(), '{{name}}')]" parameterized="true" timeout="30"/>
--        <element name="categoryInTreeUnderRoot" type="text" selector="//div[@class='x-tree-root-node']/li/ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{name}}')]" parameterized="true"/>
-+        <element name="categoryHighlighted" type="text" selector="//ul[@id='ui-id-2']//li//a/span[contains(text(),'{{name}}')]/../.." parameterized="true" timeout="30"/>
-+        <element name="categoryNotHighlighted" type="text" selector="ul[id=\'ui-id-2\'] li[class~=\'active\']" timeout="30"/>
-+        <element name="categoryInTreeUnderRoot" type="text" selector="//li/ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{name}}')]" parameterized="true"/>
-         <element name="lastCreatedCategory" type="block" selector=".x-tree-root-ct li li:last-child" />
-         <element name="treeContainer" type="block" selector=".tree-holder" />
-+        <element name="expandRootCategory" type="text" selector="img.x-tree-elbow-end-plus"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryWarningMessagesPopupSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryWarningMessagesPopupSection.xml
-index 82b3b76df3d..4c16e9081f4 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryWarningMessagesPopupSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryWarningMessagesPopupSection.xml
-@@ -6,7 +6,7 @@
-  */
- -->
- 
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCategoryWarningMessagesPopupSection">
-         <element name="warningMessage" type="text" selector=".modal-inner-wrap .modal-content .message.message-notice"/>
-         <element name="cancelButton" type="button" selector=".modal-inner-wrap .action-secondary"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml
-new file mode 100644
-index 00000000000..2de7bf19fd3
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml
-@@ -0,0 +1,33 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCreateNewProductAttributeSection">
-+        <element name="saveAttribute" type="button" selector="#save"/>
-+        <element name="defaultLabel" type="input" selector="input[name='frontend_label[0]']"/>
-+        <element name="inputType" type="select" selector="select[name='frontend_input']" timeout="30"/>
-+        <element name="addValue" type="button" selector="//button[contains(@data-action,'add_new_row')]" timeout="30"/>
-+        <element name="defaultStoreView" type="input" selector="//input[contains(@name,'option[value][option_{{row}}][1]')]" parameterized="true"/>
-+        <element name="adminOption" type="input" selector="//input[contains(@name,'option[value][option_{{row}}][0]')]" parameterized="true"/>
-+        <element name="defaultRadioButton" type="radio" selector="//tr[{{row}}]//input[contains(@name,'default[]')]" parameterized="true"/>
-+        <element name="isRequired" type="checkbox" selector="//input[contains(@name,'is_required')]/..//label"/>
-+        <element name="advancedAttributeProperties" type="text" selector="//div[contains(@data-index,'advanced_fieldset')]"/>
-+        <element name="attributeCode" type="input" selector="//*[@class='admin__fieldset-wrapper-content admin__collapsible-content _show']//input[@name='attribute_code']"/>
-+        <element name="scope" type="select" selector="//*[@class='admin__fieldset-wrapper-content admin__collapsible-content _show']//select[@name='is_global']" timeout="30"/>
-+        <element name="defaultValue" type="input" selector="//*[@class='admin__fieldset-wrapper-content admin__collapsible-content _show']//input[@name='default_value_text']"/>
-+        <element name="isUnique" type="checkbox" selector="//input[contains(@name, 'is_unique')]/..//label"/>
-+        <element name="storefrontProperties" type="text" selector="//div[contains(@data-index,'front_fieldset')]"/>
-+        <element name="inSearch" type="checkbox" selector="//input[contains(@name, 'is_searchable')]/..//label"/>
-+        <element name="advancedSearch" type="checkbox" selector="//input[contains(@name, 'is_visible_in_advanced_search')]/..//label"/>
-+        <element name="isComparable" type="checkbox" selector="//input[contains(@name, 'is_comparable')]/..//label"/>
-+        <element name="allowHtmlTags" type="checkbox" selector="//input[contains(@name, 'is_html_allowed_on_front')]/..//label"/>
-+        <element name="visibleOnStorefront" type="checkbox" selector="//input[contains(@name, 'is_visible_on_front')]/..//label"/>
-+        <element name="sortProductListing" type="checkbox" selector="//input[contains(@name, 'is_visible_on_front')]/..//label"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
-index 377bc18d647..9b75f7e6908 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
-@@ -7,22 +7,48 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AttributePropertiesSection">
-+        <element name="propertiesTab" type="button" selector="#product_attribute_tabs_main"/>
-         <element name="DefaultLabel" type="input" selector="#attribute_label"/>
-         <element name="InputType" type="select" selector="#frontend_input"/>
-         <element name="ValueRequired" type="select" selector="#is_required"/>
-+        <element name="UpdateProductPreviewImage" type="select" selector="[name='update_product_preview_image']"/>
-         <element name="AdvancedProperties" type="button" selector="#advanced_fieldset-wrapper"/>
-         <element name="DefaultValue" type="input" selector="#default_value_text"/>
-         <element name="Scope" type="select" selector="#is_global"/>
-         <element name="Save" type="button" selector="#save" timeout="30"/>
-+        <element name="DeleteAttribute" type="button" selector="#delete" timeout="30"/>
-         <element name="SaveAndEdit" type="button" selector="#save_and_edit_button" timeout="30"/>
-         <element name="TinyMCE4" type="button" selector="//span[text()='Default Value']/parent::label/following-sibling::div//div[@class='mce-branding-powered-by']"/>
-         <element name="checkIfTabOpen" selector="//div[@id='advanced_fieldset-wrapper' and not(contains(@class,'opened'))]" type="button"/>
-+        <element name="useInLayeredNavigation" type="select" selector="#is_filterable"/>
-+        <element name="addSwatch" type="button" selector="#add_new_swatch_text_option_button"/>
-+        <element name="dropdownAddOptions" type="button" selector="#add_new_option_button"/>
-+        <!-- Manage Options nth child-->
-+        <element name="dropdownNthOptionIsDefault" type="checkbox" selector="tbody[data-role='options-container'] tr:nth-child({{var}}) .input-radio" parameterized="true"/>
-+        <element name="dropdownNthOptionAdmin" type="textarea" selector="tbody[data-role='options-container'] tr:nth-child({{var}}) td:nth-child(3) input" parameterized="true"/>
-+        <element name="dropdownNthOptionDefaultStoreView" type="textarea" selector="tbody[data-role='options-container'] tr:nth-child({{var}}) td:nth-child(4) input" parameterized="true"/>
-+        <element name="dropdownNthOptionDelete" type="button" selector="tbody[data-role='options-container'] tr:nth-child({{var}}) button[title='Delete']" parameterized="true"/>
-+    </section>
-+    <section name="AttributeDeleteModalSection">
-+        <element name="confirm" type="button" selector=".modal-popup.confirm .action-accept"/>
-+        <element name="cancel" type="button" selector=".modal-popup.confirm .action-dismiss"/>
-+    </section>
-+    <section name="AttributeManageSwatchSection">
-+        <element name="swatchField" type="input" selector="//th[contains(@class, 'col-swatch')]/span[contains(text(), '{{arg}}')]/ancestor::thead/following-sibling::tbody//input[@placeholder='Swatch']" parameterized="true"/>
-+        <element name="descriptionField" type="input" selector="//th[contains(@class, 'col-swatch')]/span[contains(text(), '{{arg}}')]/ancestor::thead/following-sibling::tbody//input[@placeholder='Description']" parameterized="true"/>
-+    </section>
-+    <section name="AttributeOptionsSection">
-+        <element name="AddOption" type="button" selector="#add_new_option_button"/>
-     </section>
-     <section name="StorefrontPropertiesSection">
-+        <element name="PageTitle" type="text" selector="//span[text()='Storefront Properties']" />
-         <element name="StoreFrontPropertiesTab" selector="#product_attribute_tabs_front" type="button"/>
-         <element name="EnableWYSIWYG" type="select" selector="#enabled"/>
-+        <element name="useForPromoRuleConditions" type="select" selector="#is_used_for_promo_rules"/>
-+        <element name="StorefrontPropertiesSectionToggle" type="button" selector="#front_fieldset-wrapper"/>
-+        <element name="visibleOnCatalogPagesOnStorefront" type="select" selector="#is_visible_on_front"/>
-     </section>
-     <section name="WYSIWYGProductAttributeSection">
-         <element name="ShowHideBtn" type="button" selector="#toggledefault_value_texteditor"/>
-@@ -60,4 +86,20 @@
-         <element name="SpecialCharacter" type="button" selector=".mce-i-charmap" />
-         <element name="TextArea" type="input" selector="#default_value_textarea" />
-     </section>
-+    <section name="AdvancedAttributePropertiesSection">
-+        <element name="AdvancedAttributePropertiesSectionToggle"
-+                 type="button" selector="#advanced_fieldset-wrapper"/>
-+        <element name="AttributeCode" type="text" selector="#attribute_code"/>
-+        <element name="DefaultValueText" type="textarea" selector="#default_value_text"/>
-+        <element name="DefaultValueTextArea" type="textarea" selector="#default_value_textarea"/>
-+        <element name="DefaultValueDate" type="textarea" selector="#default_value_date"/>
-+        <element name="DefaultValueYesNo" type="textarea" selector="#default_value_yesno"/>
-+        <element name="Scope" type="select" selector="#is_global"/>
-+        <element name="UniqueValue" type="select" selector="#is_unique"/>
-+        <element name="AddToColumnOptions" type="select" selector="#is_used_in_grid"/>
-+        <element name="UseInFilterOptions" type="select" selector="#is_filterable_in_grid"/>
-+        <element name="UseInProductListing" type="select" selector="#used_in_product_listing"/>
-+        <element name="UseInSearch" type="select" selector="#is_searchable"/>
-+        <element name="VisibleInAdvancedSearch" type="select" selector="#is_visible_in_advanced_search"/>
-+    </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
-index 703e9e7ec70..b243fbfd603 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminEditProductAttributesSection">
-         <element name="AttributeName" type="text" selector="#name"/>
-         <element name="ChangeAttributeNameToggle" type="checkbox" selector="#toggle_name"/>
-@@ -18,5 +18,9 @@
-         <element name="AttributeDescription" type="text" selector="#description"/>
-         <element name="ChangeAttributeDescriptionToggle" type="checkbox" selector="#toggle_description"/>
-         <element name="Save" type="button" selector="button[title=Save]" timeout="30"/>
-+        <element name="ProductDataMayBeLostModal" type="button" selector="//aside[contains(@class,'_show')]//header[contains(.,'Product data may be lost')]"/>
-+        <element name="ProductDataMayBeLostConfirmButton" type="button" selector="//aside[contains(@class,'_show')]//button[.='Change Input Type']"/>
-+        <element name="defaultLabel" type="text" selector="//td[contains(text(), '{{attributeName}}')]/following-sibling::td[contains(@class, 'col-frontend_label')]" parameterized="true"/>
-+        <element name="formByStoreId" type="block" selector="//form[contains(@action,'store/{{store_id}}')]" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSection.xml
-new file mode 100644
-index 00000000000..5329ad48c8f
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminNewWidgetSection">
-+        <element name="selectProduct" type="button" selector=".btn-chooser" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSelectProductPopupSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSelectProductPopupSection.xml
-new file mode 100644
-index 00000000000..0da67849f85
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSelectProductPopupSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminNewWidgetSelectProductPopupSection">
-+        <element name="filterBySku" type="input" selector=".data-grid-filters input[name='chooser_sku']"/>
-+        <element name="firstRow" type="select" selector=".even>td" timeout="20"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAddAttributeModalSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAddAttributeModalSection.xml
-new file mode 100644
-index 00000000000..a3c98e43b45
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAddAttributeModalSection.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminProductAddAttributeModalSection">
-+        <element name="addSelected" type="button" selector=".product_form_product_form_add_attribute_modal .page-main-actions .action-primary" timeout="30"/>
-+        <element name="filters" type="button" selector=".product_form_product_form_add_attribute_modal button[data-action='grid-filter-expand']" timeout="30"/>
-+        <element name="attributeCodeFilter" type="textarea" selector=".product_form_product_form_add_attribute_modal input[name='attribute_code']"/>
-+        <element name="clearFilters" type="button" selector=".product_form_product_form_add_attribute_modal .action-clear" timeout="30"/>
-+        <element name="firstRowCheckBox" type="input" selector=".product_form_product_form_add_attribute_modal .data-grid-checkbox-cell input"/>
-+        <element name="applyFilters" type="button" selector=".product_form_product_form_add_attribute_modal .admin__data-grid-filters-footer .action-secondary" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
-index caf34a9f355..5efd04eacb7 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
-@@ -7,14 +7,21 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductAttributeGridSection">
-         <element name="AttributeCode" type="text" selector="//td[contains(text(),'{{var1}}')]" parameterized="true" timeout="30"/>
--        <element name="createNewAttributeBtn" type="button" selector="button[data-index='add_new_attribute_button']"/>
-+        <element name="createNewAttributeBtn" type="button" selector="#add"/>
-         <element name="GridFilterFrontEndLabel" type="input" selector="#attributeGrid_filter_frontend_label"/>
-         <element name="Search" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
-         <element name="ResetFilter" type="button" selector="button[data-action='grid-filter-reset']" timeout="30"/>
--        <element name="FirstRow" type="button" selector="//*[@id='attributeGrid_table']/tbody/tr[1]"/>
-+        <element name="FirstRow" type="button" selector="//*[@id='attributeGrid_table']/tbody/tr[1]" timeout="30"/>
-         <element name="FilterByAttributeCode" type="input" selector="#attributeGrid_filter_attribute_code"/>
-+        <element name="attributeLabelFilter" type="input" selector="//input[@name='frontend_label']"/>
-+        <element name="attributeCodeColumn" type="text" selector="//div[@id='attributeGrid']//td[contains(@class,'col-attr-code col-attribute_code')]"/>
-+        <element name="defaultLabelColumn" type="text" selector="//div[@id='attributeGrid']//td[contains(@class,'col-label col-frontend_label')]"/>
-+        <element name="isVisibleColumn" type="text" selector="//div[@id='attributeGrid']//td[contains(@class,'a-center col-is_visible')]"/>
-+        <element name="scopeColumn" type="text" selector="//div[@id='attributeGrid']//td[contains(@class,'a-center col-is_global')]"/>
-+        <element name="isSearchableColumn" type="text" selector="//div[@id='attributeGrid']//td[contains(@class,'a-center col-is_searchable')]"/>
-+        <element name="isComparableColumn" type="text" selector="//div[@id='attributeGrid']//td[contains(@class,'a-center col-is_comparable')]"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeOptionsSection.xml
-new file mode 100644
-index 00000000000..5f1112eef36
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeOptionsSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="DropdownAttributeOptionsSection">
-+        <element name="nthOptionAdminLabel" type="input"
-+                 selector="(//*[@id='manage-options-panel']//tr[{{var}}]//input[contains(@name, 'option[value]')])[1]" parameterized="true"/>
-+        <element name="deleteButton" type="button" selector="(//td[@class='col-delete'])[1]" timeout="30"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetActionSection.xml
-index 4c309584d4d..e165b51ef18 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetActionSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetActionSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductAttributeSetActionSection">
-         <element name="save" type="button" selector="button[title='Save']" timeout="30"/>
-         <element name="reset" type="button" selector="button[title='Reset']" timeout="30"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetEditSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetEditSection.xml
-index a2193bcafbb..df8915a4998 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetEditSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetEditSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductAttributeSetEditSection">
-         <!-- Groups Column -->
-         <element name="groupTree" type="block" selector="#tree-div1"/>
-@@ -17,9 +17,16 @@
-         <element name="assignedAttribute" type="text" selector="//*[@id='tree-div1']//span[text()='{{attributeName}}']" parameterized="true"/>
-         <element name="xThLineItemYthAttributeGroup" type="text" selector="//*[@id='tree-div1']/ul/div/li[{{y}}]//li[{{x}}]" parameterized="true"/>
-         <element name="xThLineItemAttributeGroup" type="text" selector="//*[@id='tree-div1']//span[text()='{{groupName}}']/parent::*/parent::*/parent::*//li[{{x}}]//a/span" parameterized="true"/>
-+        <element name="attributesInGroup" type="text" selector="//span[text()='{{GroupName}}']/../../following-sibling::ul/li" parameterized="true"/>
-         <!-- Unassigned Attributes Column -->
-         <element name="unassignedAttributesTree" type="block" selector="#tree-div2"/>
-         <element name="unassignedAttribute" type="text" selector="//*[@id='tree-div2']//span[text()='{{attributeName}}']" parameterized="true"/>
-         <element name="xThLineItemUnassignedAttribute" type="text" selector="//*[@id='tree-div2']//li[{{x}}]//a/span" parameterized="true"/>
-+        <!-- Buttons -->
-+        <element name="AddNewGroup" type="button" selector="button[data-ui-id='adminhtml-catalog-product-set-edit-add-group-button']"/>
-+        <!-- Modal Window Add New Group -->
-+        <element name="newGroupName" type="input" selector="input[data-role='promptField']"/>
-+        <element name="buttonOk" type="button" selector=".modal-footer .action-primary.action-accept"/>
-+        <element name="errorLabel" type="text" selector="label.mage-error"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetGridSection.xml
-index 08724222a38..3fad50adb77 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetGridSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetGridSection.xml
-@@ -7,12 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductAttributeSetGridSection">
-         <element name="filter" type="input" selector="#setGrid_filter_set_name"/>
-         <element name="searchBtn" type="button" selector="#container button[title='Search']" timeout="30"/>
-         <element name="nthRow" type="block" selector="#setGrid_table tbody tr:nth-of-type({{var1}})" parameterized="true"/>
-         <element name="AttributeSetName" type="text" selector="//td[contains(text(), '{{var1}}')]" parameterized="true"/>
-         <element name="addAttributeSetBtn" type="button" selector="button.add-set" timeout="30"/>
-+        <element name="resetFilter" type="button" selector="button[data-action='grid-filter-reset']" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml
-index 9e320d9e8b0..8f635214fff 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductAttributeSetSection">
-         <element name="name" type="input" selector="#attribute_set_name"/>
-         <element name="basedOn" type="select" selector="#skeleton_set"/>
-@@ -29,6 +29,6 @@
-     </section>
-     <section name="ModifyAttributes">
-         <!-- Parameter is the attribute name -->
--        <element name="nthExistingAttribute" type="select" selector="//*[text()='{{attributeName}}']/../..//select" parameterized="true"/>
-+        <element name="nthExistingAttribute" type="select" selector="//*[text()='{{attributeName}}']/../../..//select" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributesSection.xml
-new file mode 100644
-index 00000000000..46a516b538f
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributesSection.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminProductAttributesSection">
-+        <element name="sectionHeader" type="button" selector="div[data-index='attributes']" timeout="30"/>
-+        <element name="attributeLabelByCode" type="text" selector="div[data-index='{{var}}'] .admin__field-label span" parameterized="true"/>
-+        <element name="attributeTextInputByCode" type="text" selector="div[data-index='{{var}}'] .admin__field-control input" parameterized="true"/>
-+        <element name="attributeDropdownByCode" type="text" selector="div[data-index='{{var}}'] .admin__field-control select" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml
-index 81290bf281a..755add18ec1 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml
-@@ -7,16 +7,14 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductCategoryCreationSection">
-         <element name="firstExampleProduct" type="button" selector=".data-row:nth-of-type(1)"/>
-         <element name="newCategory" type="button" selector="//button/span[text()='New Category']"/>
--
-         <element name="nameInput" type="input" selector="input[name='name']"/>
--
-         <element name="parentCategory" type="block" selector=".product_form_product_form_create_category_modal div[data-role='selected-option']"/>
-         <element name="parentSearch" type="input" selector="aside input[data-role='advanced-select-text']"/>
-         <element name="parentSearchResult" type="block" selector="aside .admin__action-multiselect-menu-inner"/>
--        <element name="createCategory" type="button" selector="#save"/>
-+        <element name="createCategory" type="button" selector="#save" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
-index b73c630d6d9..fafae5d5355 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
-@@ -7,10 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductContentSection">
-         <element name="sectionHeader" type="button" selector="div[data-index='content']" timeout="30"/>
-+        <element name="sectionHeaderShow" type="button" selector="div[data-index='content']._show" timeout="30"/>
-         <element name="descriptionTextArea" type="textarea" selector="#product_form_description"/>
-         <element name="shortDescriptionTextArea" type="textarea" selector="#product_form_short_description"/>
-+        <element name="sectionHeaderIfNotShowing" type="button" selector="//div[@data-index='content']//div[contains(@class, '_hide')]"/>
-+        <element name="pageHeader" type="textarea" selector="//*[@class='page-header row']"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCrossSellModalSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCrossSellModalSection.xml
-new file mode 100644
-index 00000000000..803d72d7a7e
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCrossSellModalSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminProductCrossSellModalSection">
-+        <element name="addSelectedProducts" type="button" selector=".product_form_product_form_related_crosssell_modal .action-primary"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
-index 80ed5cb2d7e..6d4d5d86ef7 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
-@@ -7,40 +7,64 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductCustomizableOptionsSection">
--        <element name="checkIfCustomizableOptionsTabOpen" type="text" selector="//span[text()='Customizable Options']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
-+        <element name="checkIfCustomizableOptionsTabOpen" type="text" selector="//span[text()='Customizable Options']/parent::strong/parent::*[@data-state-collapsible='closed']" timeout="30"/>
-         <element name="customizableOptions" type="text" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Customizable Options']"/>
-         <element name="useDefaultOptionTitle" type="text" selector="[data-index='options'] tr.data-row [data-index='title'] [name^='options_use_default']"/>
-         <element name="useDefaultOptionTitleByIndex" type="text" selector="[data-index='options'] [data-index='values'] tr[data-repeat-index='{{var1}}'] [name^='options_use_default']" parameterized="true"/>
--        <element name="addOptionBtn" type="button" selector="button[data-index='button_add']"/>
--        <element name="fillOptionTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//label[text()='Option Title']/parent::span/parent::div//input[@class='admin__control-text']" parameterized="true"/>
--        <element name="optionTitleInput" type="input" selector="input[name='product[options][0][title]']"/>
--        <element name="optionTypeOpenDropDown" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-select"/>
--        <element name="optionTypeTextField" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-menu._active li li"/>
-+        <element name="addOptionBtn" type="button" selector="button[data-index='button_add']" timeout="30"/>
-+        <element name="fillOptionTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//span[text()='Option Title']/parent::label/parent::div/parent::div//input[@class='admin__control-text']" parameterized="true"/>
-+        <element name="optionTitleInput" type="input" selector="input[name='product[options][{{index}}][title]']" parameterized="true"/>
-+        <element name="optionTypeOpenDropDown" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-select" timeout="30"/>
-+        <element name="optionTypeTextField" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-menu._active li li" timeout="30"/>
-         <element name="maxCharactersInput" type="input" selector="input[name='product[options][0][max_characters]']"/>
-+        <element name="deleteCustomOptions" type="button" selector="//div[contains(@class, 'fieldset-wrapper-title')]//span[contains(., '{{optionTitle}}')]/parent::div/parent::div//button[@class='action-delete']" parameterized="true" timeout="30"/>
-+        <element name="customOption" type="block" selector="[data-index='options'] tbody tr.data-row"/>
-+        <element name="customOptionButtonDelete" type="button" selector="[data-index='options'] [data-index='delete_button']"/>
- 
--        <element name="checkSelect" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//label[text()='Option Type']/parent::span/parent::div//div[@data-role='selected-option']" parameterized="true"/>
--        <element name="checkDropDown" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//parent::label/parent::span/parent::div//li[@class='admin__action-multiselect-menu-inner-item']//label[text()='Drop-down']" parameterized="true"/>
-+        <element name="optionTypeDropDown" type="select" selector="//table[@data-index='options']//tr[{{index}}]//div[@data-index='type']//div[contains(@class, 'action-select-wrap')]" parameterized="true" timeout="30"/>
-+        <element name="optionTypeItem" type="select" selector="//table[@data-index='options']//tr[{{index}}]//div[@data-index='type']//*[contains(@class, 'action-menu-item')]//*[contains(., '{{optionValue}}')]" parameterized="true" timeout="30"/>
-+        <element name="checkSelect" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//span[text()='Option Type']/parent::label/parent::div/parent::div//div[@data-role='selected-option']" parameterized="true"/>
-+        <element name="checkOptionType" type="select" selector="//span[text()='{{optionTitle}}']/parent::div/parent::div/parent::div//parent::label/parent::div/parent::div//li[@class='admin__action-multiselect-menu-inner-item']//label[text()='{{optionType}}']" parameterized="true"/>
-+        <element name="checkDropDown" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//parent::label/parent::div/parent::div//li[@class='admin__action-multiselect-menu-inner-item']//label[text()='Drop-down']" parameterized="true"/>
-         <element name="clickAddValue" type="button" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tfoot//button" parameterized="true"/>
--        <element name="fillOptionValueTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//label[text()='Title']/parent::span/parent::div//div[@class='admin__field-control']/input" parameterized="true"/>
-+        <element name="fillOptionValueTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//span[text()='Title']/parent::label/parent::div/parent::div//div[@class='admin__field-control']/input" parameterized="true"/>
-         <element name="fillOptionValuePrice" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//span[text()='Price']/parent::label/parent::div//div[@class='admin__control-addon']/input" parameterized="true"/>
--        <element name="clickSelectPriceType" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody//tr[@data-repeat-index='{{var2}}']//label[text()='Price Type']/parent::span/parent::div//select" parameterized="true"/>
--        <element name="checkboxUseDefaultTitle" type="checkbox" selector="//span[text()='Option Title']/parent::label/parent::div/div//input[@type='checkbox']"/>
-+        <element name="clickSelectPriceType" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody//tr[@data-repeat-index='{{var2}}']//span[text()='Price Type']/parent::label/parent::div/parent::div//select" parameterized="true"/>
-+        <element name="checkboxUseDefaultTitle" type="checkbox" selector="//span[text()='Option Title']/parent::label/parent::div/parent::div/div//input[@type='checkbox']"/>
-         <element name="checkboxUseDefaultOption" type="checkbox" selector="//table[@data-index='values']//tbody//tr[@data-repeat-index='{{var1}}']//div[@class='admin__field-control']//input[@type='checkbox']" parameterized="true"/>
-+        <element name="requiredCheckBox" type="checkbox" selector="input[name='product[options][{{index}}][is_require]']" parameterized="true" />
-+        <element name="fillOptionValueSku" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//span[text()='SKU']/parent::label/parent::div/parent::div//div[@class='admin__field-control']/input" parameterized="true"/>
-+        <element name="fillOptionCompatibleFileExtensions" type="input" selector="input[name='product[options][{{index}}][file_extension]']" parameterized="true"/>
- 
-         <!-- Elements that make it easier to select the most recently added element -->
-+        <element name="optionPriceByTitle" type="input" selector="//*[@data-index='options']//*[@data-role='collapsible-title' and contains(., '{{optionTitle}}')]/ancestor::tr//*[@data-index='price']//input" parameterized="true"/>
-+        <element name="optionPriceTypeByTitle" type="select" selector="//*[@data-index='options']//*[@data-role='collapsible-title' and contains(., '{{optionTitle}}')]/ancestor::tr//*[@data-index='price_type']//select" parameterized="true"/>
-+        <element name="optionSkuByTitle" type="input" selector="//*[@data-index='options']//*[@data-role='collapsible-title' and contains(., '{{optionTitle}}')]/ancestor::tr//*[@data-index='sku']//input" parameterized="true"/>
-+        <element name="optionFileExtensionByTitle" type="input" selector="//*[@data-index='options']//*[@data-role='collapsible-title' and contains(., '{{optionTitle}}')]/ancestor::tr//*[@data-index='file_extension']//input" parameterized="true"/>
-         <element name="lastOptionTitle" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, '_required')]//input" />
-         <element name="lastOptionTypeParent" type="block" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__action-multiselect-text')]" />
-+        <element name="lastOptionPrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@name, '[price]')]"/>
-+        <element name="lastOptionPriceType" type="select" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@name, '[price_type]')]"/>
-         <!-- var 1 represents the option type that you want to select, i.e "radio buttons" -->
-         <element name="optionType" type="block" selector="//*[@data-index='custom_options']//label[text()='{{var1}}'][ancestor::*[contains(@class, '_active')]]" parameterized="true" />
--        <element name="addValue" type="button" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@data-action='add_new_row']" />
-+        <element name="addValue" type="button" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@data-action='add_new_row']" timeout="30"/>
-         <element name="valueTitle" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__control-table')]//tbody/tr[last()]//*[@data-index='title']//input" />
-         <element name="valuePrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__control-table')]//tbody/tr[last()]//*[@data-index='price']//input" />
--
--        <element name="optionPrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][price]']"/>
--        <element name="optionPriceType" type="select" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][price_type]']"/>
--        <element name="optionSku" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][sku]']"/>
--        <element name="optionFileExtensions" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][file_extension]']"/>
-+        <element name="optionPrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{index}}][price]']" parameterized="true"/>
-+        <element name="optionPriceType" type="select" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{var}}][price_type]']" parameterized="true"/>
-+        <element name="optionSku" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{index}}][sku]']" parameterized="true"/>
-+        <element name="optionFileExtensions" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{index}}][file_extension]']" parameterized="true"/>
-+        <element name="importOptions" type="button" selector="//button[@data-index='button_import']" timeout="30"/>
-+    </section>
-+    <section name="AdminProductImportOptionsSection">
-+        <element name="selectProductTitle" type="text" selector="//h1[contains(text(), 'Select Product')]" timeout="30"/>
-+        <element name="filterButton" type="button" selector="//button[@data-action='grid-filter-expand']" timeout="30"/>
-+        <element name="nameField" type="input" selector="//input[@name='name']" timeout="30"/>
-+        <element name="applyFiltersButton" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
-+        <element name="resetFiltersButton" type="button" selector="//button[@data-action='grid-filter-reset']" timeout="30"/>
-+        <element name="firstRowItemCheckbox" type="input" selector="//input[@data-action='select-row']" timeout="30"/>
-+        <element name="importButton" type="button" selector="//button[contains(@class, 'action-primary')]/span[contains(text(), 'Import')]" timeout="30"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductDropdownOrderSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
-new file mode 100644
-index 00000000000..b58fb2316f9
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminProductDropdownOrderSection">
-+        <element name="simpleProduct" type="text" selector="//li[not(preceding-sibling::li)]//span[@title='Simple Product']"/>
-+        <element name="virtualProduct" type="text" selector="//li[not(preceding-sibling::li[span[@title='Bundle Product']]) and not(preceding-sibling::li[span[@title='Downloadable Product']]) and not(following-sibling::li[span[@title='Simple Product']]) and not(following-sibling::li[span[@title='Configurable Product']]) and not(following-sibling::li[span[@title='Grouped Product']])]/span[@title='Virtual Product']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml
-index 4c6c1020e19..06ff54b2a39 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductFiltersSection">
-         <element name="filtersButton" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button"/>
-         <element name="clearFiltersButton" type="button" selector="//div[@class='admin__data-grid-header']//button[@class='action-tertiary action-clear']" timeout="10"/>
-@@ -15,7 +15,7 @@
-         <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
-         <element name="filter" type="button" selector="//div[@class='data-grid-filters-action-wrap']/button" timeout="30"/>
-         <element name="typeDropDown" type="multiselect"  selector="//select[@name='type_id']" timeout="30"/>
--        <element name="bundleOption" type="multiselect" selector="//select[@name='type_id']/option[4]" timeout="30"/>
-+        <element name="bundleOption" type="multiselect" selector="//select[@name='type_id']/option[@value='bundle']" timeout="30"/>
-         <element name="applyFilters" type="button" selector="//button[@class='action-secondary']" timeout="30"/>
-         <element name="allCheckbox" type="checkbox" selector="//div[@data-role='grid-wrapper']//label[@data-bind='attr: {for: ko.uid}']" timeout="30"/>
-         <element name="actions" type="button" selector="//div[@class='action-select-wrap']/button" timeout="30"/>
-@@ -28,5 +28,7 @@
-         <element name="priceOfFirstRow" type="text" selector="//tr[@data-repeat-index='0']//div[contains(., '{{var1}}')]" parameterized="true"/>
-         <element name="AllProductsNotOfBundleType" type="text" selector="//td[5]/div[text() != 'Bundle Product']"/>
-         <element name="attributeSetOfFirstRow" type="text" selector="//tr[@data-repeat-index='0']//div[contains(., '{{var1}}')]" parameterized="true"/>
-+        <element name="storeViewDropDown" type="multiselect" selector="//select[@name='store_id']" timeout="30"/>
-+        <element name="storeViewOption" type="multiselect" selector="//select[@name='store_id']/option[contains(text(),'{{var1}}')]" parameterized="true" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml
-index a314f9cd0dd..1652546b0ac 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml
-@@ -7,13 +7,16 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductFormActionSection">
-         <element name="backButton" type="button" selector="#back" timeout="30"/>
-+        <element name="addAttributeButton" type="button" selector="#addAttribute" timeout="30"/>
-         <element name="saveButton" type="button" selector="#save-button" timeout="30"/>
-         <element name="saveArrow" type="button" selector="button[data-ui-id='save-button-dropdown']" timeout="30"/>
-         <element name="saveAndClose" type="button" selector="span[title='Save &amp; Close']" timeout="30"/>
-         <element name="changeStoreButton" type="button" selector="#store-change-button" timeout="10"/>
-         <element name="selectStoreView" type="button" selector="//ul[@data-role='stores-list']/li/a[normalize-space(.)='{{var1}}']" timeout="10" parameterized="true"/>
-+        <element name="selectTaxClass" type="select" selector="select[name='product[tax_class_id]']"/>
-+        <element name="saveAndDuplicate" type="button" selector="span[id='save_and_duplicate']" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml
-new file mode 100644
-index 00000000000..4196a86fe25
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml
-@@ -0,0 +1,34 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminProductFormAdvancedInventorySection">
-+        <element name="enableQtyIncrements" type="select" selector="//*[@name='product[stock_data][enable_qty_increments]']"/>
-+        <element name="enableQtyIncrementsOptions" type="select" selector="//*[@name='product[stock_data][enable_qty_increments]']//option[contains(@value, '{{var1}}')]" parameterized="true"/>
-+        <element name="enableQtyIncrementsUseConfigSettings" type="checkbox" selector="//input[@name='product[stock_data][use_config_enable_qty_inc]']"/>
-+        <element name="qtyUsesDecimals" type="select" selector="//*[@name='product[stock_data][is_qty_decimal]']"/>
-+        <element name="qtyUsesDecimalsOptions" type="select" selector="//*[@name='product[stock_data][is_qty_decimal]']//option[contains(@value, '{{var1}}')]" parameterized="true"/>
-+        <element name="qtyIncrements" type="input" selector="//input[@name='product[stock_data][qty_increments]']"/>
-+        <element name="qtyIncrementsUseConfigSettings" type="checkbox" selector="//input[@name='product[stock_data][use_config_qty_increments]']"/>
-+        <element name="doneButton" type="button" selector="//aside[contains(@class,'product_form_product_form_advanced_inventory_modal')]//button[contains(@data-role,'action')]" timeout="5"/>
-+        <element name="useConfigSettings" type="checkbox" selector="//input[@name='product[stock_data][use_config_manage_stock]']"/>
-+        <element name="manageStock" type="select" selector="//*[@name='product[stock_data][manage_stock]']" timeout="30"/>
-+        <element name="advancedInventoryCloseButton" type="button" selector=".product_form_product_form_advanced_inventory_modal button.action-close" timeout="30"/>
-+        <element name="miniQtyConfigSetting" type="checkbox" selector="//*[@name='product[stock_data][use_config_min_sale_qty]']"/>
-+        <element name="miniQtyAllowedInCart" type="input" selector="//*[@name='product[stock_data][min_sale_qty]']"/>
-+        <element name="maxiQtyConfigSetting" type="checkbox" selector="//*[@name='product[stock_data][use_config_max_sale_qty]']"/>
-+        <element name="maxiQtyAllowedInCart" type="input" selector="//*[@name='product[stock_data][max_sale_qty]']"/>
-+        <element name="notifyBelowQtyConfigSetting" type="checkbox" selector="//*[@name='product[stock_data][use_config_notify_stock_qty]']"/>
-+        <element name="notifyBelowQty" type="input" selector="//*[@name='product[stock_data][notify_stock_qty]']"/>
-+        <element name="advancedInventoryQty" type="input" selector="//div[@class='modal-inner-wrap']//input[@name='product[quantity_and_stock_status][qty]']"/>
-+        <element name="advancedInventoryStockStatus" type="select" selector="//div[@class='modal-inner-wrap']//select[@name='product[quantity_and_stock_status][is_in_stock]']"/>
-+        <element name="outOfStockThreshold" type="select" selector="//*[@name='product[stock_data][min_qty]']" timeout="30"/>
-+        <element name="minQtyConfigSetting" type="checkbox" selector="//input[@name='product[stock_data][use_config_min_qty]']" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
-index 1042b1e5a54..77b89a07fb7 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
-@@ -7,19 +7,23 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductFormAdvancedPricingSection">
-         <element name="customerGroupPriceAddButton" type="button" selector="[data-action='add_new_row']" timeout="30"/>
-+        <element name="addCustomerGroupPrice" type="button" selector="//span[text()='Add']/ancestor::button" timeout="30"/>
-         <element name="customerGroupPriceDeleteButton" type="button" selector="[data-action='remove_row']" timeout="30"/>
-         <element name="advancedPricingCloseButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-close" timeout="30"/>
-         <element name="productTierPriceWebsiteSelect" type="select" selector="[name='product[tier_price][{{var1}}][website_id]']" parameterized="true"/>
-         <element name="productTierPriceCustGroupSelect" type="select" selector="[name='product[tier_price][{{var1}}][cust_group]']" parameterized="true"/>
-+        <element name="productTierPriceCustGroupSelectOptions" type="select" selector="[name='product[tier_price][{{var1}}][cust_group]'] option" parameterized="true"/>
-         <element name="productTierPriceQtyInput" type="input" selector="[name='product[tier_price][{{var1}}][price_qty]']" parameterized="true"/>
-         <element name="productTierPriceValueTypeSelect" type="select" selector="[name='product[tier_price][{{var1}}][value_type]']" parameterized="true"/>
-         <element name="productTierPriceFixedPriceInput" type="input" selector="[name='product[tier_price][{{var1}}][price]']" parameterized="true"/>
-         <element name="productTierPricePercentageValuePriceInput" type="input" selector="[name='product[tier_price][{{var1}}][percentage_value]']" parameterized="true"/>
-         <element name="specialPrice" type="input" selector="input[name='product[special_price]']"/>
--        <element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary" timeout="5"/>
--        <element name="save" type="button" selector="#save-button"/>
-+        <element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary" timeout="30"/>
-+        <element name="msrp" type="input" selector="//input[@name='product[msrp]']" timeout="30"/>
-+        <element name="msrpType" type="select" selector="//select[@name='product[msrp_display_actual_price_type]']" timeout="30"/>
-+        <element name="save" type="button" selector="#save-button" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml
-new file mode 100644
-index 00000000000..b0aee1795dc
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml
-@@ -0,0 +1,40 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminProductFormAttributeSection">
-+        <element name="createNewAttribute" type="button" selector="//button[@data-index='add_new_attribute_button']" timeout="30"/>
-+    </section>
-+    <section name="AdminProductFormNewAttributeSection">
-+        <element name="attributeLabel" type="button" selector="//input[@name='frontend_label[0]']" timeout="30"/>
-+        <element name="attributeType" type="select" selector="//select[@name='frontend_input']" timeout="30"/>
-+        <element name="addValue" type="button" selector="//button[@data-action='add_new_row']" timeout="30"/>
-+        <element name="optionViewName" type="text" selector="//table[@data-index='attribute_options_select']//span[contains(text(), '{{arg}}')]" parameterized="true" timeout="30"/>
-+        <element name="optionValue" type="input" selector="(//input[contains(@name, 'option[value]')])[{{arg}}]" timeout="30" parameterized="true"/>
-+        <element name="manageTitlesHeader" type="button" selector="//div[@class='fieldset-wrapper-title']//span[contains(text(), 'Manage Titles')]" timeout="30"/>
-+        <element name="manageTitlesViewName" type="text" selector="//div[@data-index='manage-titles']//span[contains(text(), '{{arg}}')]" timeout="30" parameterized="true"/>
-+        <element name="saveAttribute" type="button" selector="button#save" timeout="30"/>
-+        <element name="saveInNewSet" type="button" selector="button#saveInNewSet" timeout="10"/>
-+    </section>
-+    <section name="AdminProductFormNewAttributeAdvancedSection">
-+        <element name="sectionHeader" type="button" selector="div[data-index='advanced_fieldset']"/>
-+        <element name="defaultValue" type="textarea" selector="input[name='default_value_text']"/>
-+        <element name="scope" type="select" selector="//div[@data-index='advanced_fieldset']//select[@name='is_global']"/>
-+    </section>
-+    <section name="AdminProductFormNewAttributeStorefrontSection">
-+        <element name="sectionHeader" type="button" selector="div[data-index='front_fieldset']"/>
-+        <element name="useInSearch" type="checkbox" selector="div[data-index='is_searchable'] .admin__field-control label"/>
-+        <element name="searchWeight" type="select" selector="select[name='search_weight']"/>
-+    </section>
-+    <section name="AdminProductFormNewAttributeNewSetSection">
-+        <element name="setName" type="button" selector="//div[contains(@class, 'modal-inner-wrap') and .//*[contains(., 'Enter Name for New Attribute Set')]]//input[contains(@class, 'admin__control-text')]"/>
-+        <element name="accept" type="button" selector="//div[contains(@class, 'modal-inner-wrap') and .//*[contains(., 'Enter Name for New Attribute Set')]]//button[contains(@class, 'action-accept')]"/>
-+        <element name="cancel" type="button" selector="//div[contains(@class, 'modal-inner-wrap') and .//*[contains(., 'Enter Name for New Attribute Set')]]//button[contains(@class, 'action-dismiss')]"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormChangeStoreSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormChangeStoreSection.xml
-index 8c9e92d912b..04e5445c8ab 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormChangeStoreSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormChangeStoreSection.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductFormChangeStoreSection">
-         <element name="storeSelector" type="button" selector="//a[contains(text(),'{{var1}}')]" parameterized="true"/>
-         <element name="acceptButton" type="button" selector="button[class='action-primary action-accept']" timeout="30"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
-index 604eba61a05..0dd9e6d948c 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
-@@ -6,25 +6,41 @@
-   */
- -->
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductFormSection">
-         <element name="attributeSet" type="select" selector="div[data-index='attribute_set_id'] .admin__field-control"/>
-         <element name="attributeSetFilter" type="input" selector="div[data-index='attribute_set_id'] .admin__field-control input" timeout="30"/>
-         <element name="attributeSetFilterResult" type="input" selector="div[data-index='attribute_set_id'] .action-menu-item._last" timeout="30"/>
-+        <element name="attributeSetFilterResultByName" type="text" selector="//label/span[text() = '{{var}}']" timeout="30" parameterized="true"/>
-         <element name="productName" type="input" selector=".admin__field[data-index=name] input"/>
-+        <element name="productNameDisabled" type="input" selector=".admin__field[data-index=name] input[disabled=true]"/>
-+        <element name="RequiredNameIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=name]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
-+        <element name="RequiredSkuIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=sku]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
-         <element name="productSku" type="input" selector=".admin__field[data-index=sku] input"/>
--        <element name="enableProductAttributeLabel" type="text" selector="//label[text()='Enable Product']"/>
--        <element name="enableProductAttributeLabelWrapper" type="text" selector="//label[text()='Enable Product']/parent::span"/>
-+        <element name="productSkuDisabled" type="input" selector=".admin__field[data-index=sku] input[disabled=true]"/>
-+        <element name="enableProductAttributeLabel" type="text" selector="//span[text()='Enable Product']/parent::label"/>
-+        <element name="enableProductAttributeLabelWrapper" type="text" selector="//span[text()='Enable Product']/parent::label/parent::div"/>
-         <element name="productStatus" type="checkbox" selector="input[name='product[status]']"/>
-+        <element name="productStatusValue" type="checkbox" selector="input[name='product[status]'][value='{{value}}']" timeout="30" parameterized="true"/>
-+        <element name="productStatusDisabled" type="checkbox" selector="input[name='product[status]'][disabled]"/>
-         <element name="enableProductLabel" type="checkbox" selector="input[name='product[status]']+label"/>
-         <element name="productStatusUseDefault" type="checkbox" selector="input[name='use_default[status]']"/>
-         <element name="productNameUseDefault" type="checkbox" selector="input[name='use_default[name]']"/>
-         <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
-+        <element name="productPriceDisabled" type="input" selector=".admin__field[data-index=price] input[disabled=true]"/>
-+        <element name="productPriceUseDefault" type="checkbox" selector=".admin__field[data-index=price] [name='use_default[price]']"/>
-+        <element name="productTaxClass" type="select" selector="//*[@name='product[tax_class_id]']"/>
-+        <element name="productTaxClassDisabled" type="select" selector="select[name='product[tax_class_id]'][disabled=true]"/>
-         <element name="productTaxClassUseDefault" type="checkbox" selector="input[name='use_default[tax_class_id]']"/>
--        <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']"/>
--        <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/>
-+        <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']" timeout="30"/>
-+        <element name="currentCategory" type="text" selector=".admin__action-multiselect-crumb > span"/>
-+        <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']" timeout="30"/>
-+        <element name="unselectCategories" type="button" selector="//span[@class='admin__action-multiselect-crumb']/span[contains(.,'{{category}}')]/../button[@data-action='remove-selected-item']" parameterized="true" timeout="30"/>
-         <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
--        <element name="productStockStatus" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]']"/>
-+        <element name="advancedInventoryLink" type="button" selector="//button[contains(@data-index, 'advanced_inventory_button')]" timeout="30"/>
-+        <element name="productStockStatus" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]']" timeout="30"/>
-+        <element name="productStockStatusDisabled" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]'][disabled=true]"/>
-+        <element name="stockStatus" type="select" selector="[data-index='product-details'] select[name='product[quantity_and_stock_status][is_in_stock]']"/>
-         <element name="productWeight" type="input" selector=".admin__field[data-index=weight] input"/>
-         <element name="productWeightSelect" type="select" selector="select[name='product[product_has_weight]']"/>
-         <element name="contentTab" type="button" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Content']"/>
-@@ -32,30 +48,52 @@
-         <element name="priceFieldError" type="text" selector="//input[@name='product[price]']/parent::div/parent::div/label[@class='admin__field-error']"/>
-         <element name="addAttributeBtn" type="button" selector="#addAttribute"/>
-         <element name="createNewAttributeBtn" type="button" selector="button[data-index='add_new_attribute_button']"/>
--        <element name="save" type="button" selector="#save"/>
-+        <element name="save" type="button" selector="#save-button" timeout="30"/>
-+        <element name="saveNewAttribute" type="button" selector="//aside[contains(@class, 'create_new_attribute_modal')]//button[@id='save']"/>
-+        <element name="successMessage" type="text" selector="#messages"/>
-         <element name="attributeTab" type="button" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Attributes']"/>
-         <element name="attributeLabel" type="input" selector="//input[@name='frontend_label[0]']"/>
-         <element name="frontendInput" type="select" selector="select[name = 'frontend_input']"/>
-         <element name="productFormTab" type="button" selector="//strong[@class='admin__collapsible-title']/span[contains(text(), '{{tabName}}')]" parameterized="true"/>
-         <element name="productFormTabState" type="text" selector="//strong[@class='admin__collapsible-title']/span[contains(text(), '{{tabName}}')]/parent::*/parent::*[@data-state-collapsible='{{state}}']" parameterized="true"/>
-         <element name="visibility" type="select" selector="//select[@name='product[visibility]']"/>
-+        <element name="visibilityDisabled" type="select" selector="select[name='product[visibility]'][disabled=true]"/>
-         <element name="visibilityUseDefault" type="checkbox" selector="//input[@name='use_default[visibility]']"/>
-         <element name="divByDataIndex" type="input" selector="div[data-index='{{var}}']" parameterized="true"/>
--        <element name="attributeLabelByText" type="text" selector="//*[@class='admin__field']//label[text()='{{attributeLabel}}']" parameterized="true"/>
-+        <element name="setProductAsNewFrom" type="input" selector="input[name='product[news_from_date]']"/>
-+        <element name="setProductAsNewTo" type="input" selector="input[name='product[news_to_date]']"/>
-+        <element name="attributeLabelByText" type="text" selector="//*[@class='admin__field']//span[text()='{{attributeLabel}}']" parameterized="true"/>
-+        <element name="attributeRequiredInput" type="input" selector="//input[contains(@name, 'product[{{attributeCode}}]')]" parameterized="true"/>
-+        <element name="attributeFieldError" type="text" selector="//*[@class='admin__field _required _error']/..//label[contains(.,'This is a required field.')]"/>
-+        <element name="customSelectField" type="select" selector="//select[@name='product[{{var}}]']" parameterized="true"/>
-+        <element name="searchCategory" type="input" selector="//*[@data-index='category_ids']//input[contains(@class, 'multiselect-search')]" timeout="30"/>
-+        <element name="selectCategory" type="input" selector="//*[@data-index='category_ids']//label[contains(., '{{categoryName}}')]" parameterized="true" timeout="30"/>
-+        <element name="done" type="button" selector="//*[@data-index='category_ids']//button[@data-action='close-advanced-select']" timeout="30"/>
-+        <element name="selectMultipleCategories" type="input" selector="//*[@data-index='container_category_ids']//*[contains(@class, '_selected')]"/>
-+        <element name="countryOfManufacture" type="select" selector="select[name='product[country_of_manufacture]']"/>
-+        <element name="newAddedAttribute" type="text" selector="//fieldset[@class='admin__fieldset']//div[contains(@data-index,'{{attributeCode}}')]" parameterized="true"/>
-+        <element name="newCategoryButton" type="button" selector="button[data-index='create_category_button']" timeout="30"/>
-+        <element name="footerBlock" type="block" selector="//footer"/>
-     </section>
-     <section name="ProductInWebsitesSection">
-         <element name="sectionHeader" type="button" selector="div[data-index='websites']" timeout="30"/>
-+        <element name="sectionHeaderOpened" type="button" selector="[data-index='websites']._show" timeout="30"/>
-         <element name="website" type="checkbox" selector="//label[contains(text(), '{{var1}}')]/parent::div//input[@type='checkbox']" parameterized="true"/>
-+        <element name="websiteChecked" type="checkbox" selector="//label[contains(text(), '{{var1}}')]/parent::div//input[@type='checkbox'][@value='1']" parameterized="true"/>
-     </section>
-     <section name="ProductDesignSection">
-         <element name="DesignTab" type="button" selector="//strong[@class='admin__collapsible-title']//span[text()='Design']"/>
-         <element name="LayoutDropdown" type="select" selector="select[name='product[page_layout]']"/>
-+        <element name="productOptionsContainer" type="select" selector="select[name='product[options_container]']"/>
-     </section>
-     <section name="AdminProductFormRelatedUpSellCrossSellSection">
-+        <element name="relatedProductsHeader" type="button" selector=".admin__collapsible-block-wrapper[data-index='related']" timeout="30"/>
-         <element name="AddRelatedProductsButton" type="button" selector="button[data-index='button_related']" timeout="30"/>
-+        <element name="addUpSellProduct" type="button" selector="button[data-index='button_upsell']" timeout="30"/>
-     </section>
-     <section name="AdminAddRelatedProductsModalSection">
--        <element name="AddSelectedProductsButton" type="button" selector="//aside[contains(@class, 'product_form_product_form_related_related_modal')]//button/span[contains(text(), 'Add Selected Products')]" timeout="30"/>
-+        <element name="AddSelectedProductsButton" type="button" selector="//aside[contains(@class, 'related_modal')]//button[contains(@class, 'action-primary')]" timeout="30"/>
-+        <element name="AddUpSellProductsButton" type="button" selector="//aside[contains(@class, 'upsell_modal')]//button[contains(@class, 'action-primary')]" timeout="30"/>
-     </section>
-     <section name="ProductWYSIWYGSection">
-         <element name="Switcher" type="button" selector="//select[@id='dropdown-switcher']"/>
-@@ -99,24 +137,24 @@
-         <element name="Numlist" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-bullist']" />
-         <element name="Bullet" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-numlist']" />
-         <element name="InsertLink" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-link']" />
--        <element name="InsertImageIcon" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-image']" />
-+        <element name="InsertImageIcon" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-image']" timeout="30"/>
-         <element name="InsertTable" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-table']" />
-         <element name="SpecialCharacter" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-charmap']" />
--        <element name="Browse" type="button" selector=".mce-i-browse"/>
--        <element name="BrowseUploadImage" type="file" selector=".fileupload" />
-+        <element name="Browse" type="button" selector=".mce-i-browse" timeout="30"/>
-+        <element name="BrowseUploadImage" type="file" selector=".fileupload" timeout="30"/>
-         <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
-         <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
-         <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
-         <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />
-         <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
-         <element name="UploadImage" type="file" selector=".fileupload" />
--        <element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
--        <element name="InsertFile" type="text" selector="#insert_files"/>
--        <element name="CreateFolder" type="button" selector="#new_folder" />
--        <element name="DeleteSelectedBtn" type="text" selector="#delete_files"/>
--        <element name="CancelBtn" type="button" selector="#cancel" />
-+        <element name="OkBtn" type="button" selector="//button//span[text()='Ok']"/>
-+        <element name="InsertFile" type="text" selector="#insert_files" timeout="30"/>
-+        <element name="CreateFolder" type="button" selector="#new_folder" timeout="30"/>
-+        <element name="DeleteSelectedBtn" type="text" selector="#delete_files" timeout="30"/>
-+        <element name="CancelBtn" type="button" selector=".page-actions #cancel" />
-         <element name="FolderName" type="button" selector="input[data-role='promptField']" />
--        <element name="AcceptFolderName" type="button" selector=".action-primary.action-accept" />
-+        <element name="AcceptFolderName" type="button" selector=".action-primary.action-accept" timeout="30"/>
-         <element name="StorageRootArrow" type="button" selector="#root > .jstree-icon" />
-         <element name="checkIfArrowExpand" type="button" selector="//li[@id='root' and contains(@class,'jstree-closed')]" />
-         <element name="WysiwygArrow" type="button" selector="#d3lzaXd5Zw-- > .jstree-icon" />
-@@ -137,21 +175,21 @@
-         <element name="Numlist" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-bullist']" />
-         <element name="Bullet" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-numlist']" />
-         <element name="InsertLink" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-link']" />
--        <element name="InsertImageIcon" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-image']" />
-+        <element name="InsertImageIcon" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-image']" timeout="30"/>
-         <element name="InsertTable" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-table']" />
-         <element name="SpecialCharacter" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-charmap']"/>
-         <element name="Browse" type="button" selector=".mce-i-browse"/>
--        <element name="BrowseUploadImage" type="file" selector=".fileupload" />
-+        <element name="BrowseUploadImage" type="file" selector=".fileupload" timeout="30" />
-         <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
-         <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
-         <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
-         <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />
-         <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
-         <element name="UploadImage" type="file" selector=".fileupload" />
--        <element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
-+        <element name="OkBtn" type="button" selector="//span[text()='Ok']" timeout="30"/>
-         <element name="InsertFile" type="text" selector="#insert_files"/>
-         <element name="CreateFolder" type="button" selector="#new_folder" />
--        <element name="DeleteSelectedBtn" type="text" selector="#delete_files"/>
-+        <element name="DeleteSelectedBtn" type="text" selector="#delete_files" timeout="30"/>
-         <element name="CancelBtn" type="button" selector="#cancel" />
-         <element name="FolderName" type="button" selector="input[data-role='promptField']" />
-         <element name="AcceptFolderName" type="button" selector=".action-primary.action-accept" />
-@@ -159,8 +197,25 @@
-         <element name="checkIfArrowExpand" type="button" selector="//li[@id='root' and contains(@class,'jstree-closed')]" />
-         <element name="confirmDelete" type="button" selector=".action-primary.action-accept" />
-     </section>
-+    <section name="ProductDescriptionWysiwygSection">
-+        <element name="EditArea" type="text" selector="#editorproduct_form_description .mce-edit-area"/>
-+        <element name="attributeEditArea" type="textarea" selector="#product_form_{{attributeCode}}" parameterized="true" timeout="30"/>
-+    </section>
-+    <section name="ProductShortDescriptionWysiwygSection">
-+        <element name="EditArea" type="text" selector="#editorproduct_form_short_description .mce-edit-area"/>
-+    </section>
-     <section name="AdminProductFormAdvancedPricingSection">
-         <element name="specialPrice" type="input" selector="input[name='product[special_price]']"/>
--        <element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary"/>
-+        <element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary" timeout="30"/>
-+        <element name="useDefaultPrice" type="checkbox" selector="//input[@name='product[special_price]']/parent::div/following-sibling::div/input[@name='use_default[special_price]']"/>
-+    </section>
-+    <section name="AdminProductAttributeSection">
-+        <element name="attributeSectionHeader" type="button" selector="//div[@data-index='attributes']" timeout="30"/>
-+        <element name="textAttributeByCode" type="text" selector="//input[@name='product[{{arg}}]']" parameterized="true"/>
-+        <element name="textAttributeByName" type="text" selector="//div[@data-index='attributes']//fieldset[contains(@class, 'admin__field') and .//*[contains(.,'{{var}}')]]//input" parameterized="true"/>
-+        <element name="dropDownAttribute" type="select" selector="//select[@name='product[{{arg}}]']" parameterized="true" timeout="30"/>
-+        <element name="attributeSection" type="block" selector="//div[@data-index='attributes']/div[contains(@class, 'admin__collapsible-content _show')]" timeout="30"/>
-+        <element name="attributeGroupByName" type="button" selector="//div[@class='fieldset-wrapper-title']//span[text()='{{group}}']" parameterized="true"/>
-+        <element name="attributeByGroupAndName" type="text" selector="//div[@class='fieldset-wrapper-title']//span[text()='{{group}}']/../../following-sibling::div//span[contains(text(),'attribute')]" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGiftOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGiftOptionsSection.xml
-new file mode 100644
-index 00000000000..63b745e5227
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGiftOptionsSection.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminProductGiftOptionsSection">
-+        <element name="giftOptions" type="text" selector="div[data-index='gift-options']"/>
-+        <element name="useConfigSettingsMessage" type="checkbox" selector="[name='product[use_config_gift_message_available]']"/>
-+        <element name="toggleProductGiftMessage" type="button" selector="input[name='product[gift_message_available]']+label"/>
-+        <element name="giftMessageStatus" type="checkbox" selector="input[name='product[gift_message_available]'][value='{{status}}']" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridActionSection.xml
-index 4ce9580405a..66e6f17be34 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridActionSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridActionSection.xml
-@@ -7,9 +7,10 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductGridActionSection">
--        <element name="addProductToggle" type="button" selector=".action-toggle.primary.add"/>
-+        <element name="addProductBtn" type="button" selector="#add_new_product-button" timeout="30"/>
-+        <element name="addProductToggle" type="button" selector=".action-toggle.primary.add" timeout="30"/>
-         <element name="addSimpleProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-simple']" timeout="30"/>
-         <element name="addGroupedProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-grouped']" timeout="30"/>
-         <element name="addVirtualProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-virtual']" timeout="30"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridConfirmActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridConfirmActionSection.xml
-index d8567df81b6..5bf73076e14 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridConfirmActionSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridConfirmActionSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductGridConfirmActionSection">
-         <element name="title" type="text" selector=".modal-popup.confirm h1.modal-title"/>
-         <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
-index 4683576bf95..3b6f24c0f25 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductGridFilterSection">
-         <element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>
-         <element name="clearAll" type="button" selector=".admin__data-grid-header .admin__data-grid-filters-current._show .action-clear" timeout="30"/>
-@@ -28,8 +28,13 @@
-         <element name="priceFilterTo" type="input" selector="input.admin__control-text[name='price[to]']"/>
-         <element name="typeFilter" type="select" selector="select.admin__control-select[name='type_id']"/>
-         <element name="statusFilter" type="select" selector="select.admin__control-select[name='status']"/>
-+        <element name="firstRowBySku" type="button" selector="//div[text()='{{var}}']/ancestor::tr" parameterized="true" timeout="30"/>
-         <element name="newFromDateFilter" type="input" selector="input.admin__control-text[name='news_from_date[from]']"/>
-         <element name="keywordSearch" type="input" selector="input#fulltext"/>
-         <element name="keywordSearchButton" type="button" selector=".data-grid-search-control-wrap button.action-submit" timeout="30"/>
-+        <element name="nthRow" type="block" selector=".data-row:nth-of-type({{var}})" parameterized="true" timeout="30"/>
-+        <element name="productCount" type="text" selector="#catalog_category_products-total-count"/>
-+        <element name="productPerPage" type="select" selector="#catalog_category_products_page-limit"/>
-+        <element name="storeViewDropdown" type="text" selector="//select[@name='store_id']/option[contains(.,'{{storeView}}')]" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridPaginationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridPaginationSection.xml
-index 9ef89e1260f..fbcfabfa02f 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridPaginationSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridPaginationSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductGridPaginationSection">
-         <element name="perPageDropdown" type="select" selector=".admin__data-grid-pager-wrap .selectmenu"/>
-         <element name="perPageOption" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//button[text()='{{label}}']" parameterized="true"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
-index 98afed124c6..07dd26381fe 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
-@@ -6,8 +6,10 @@
-   */
- -->
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductGridSection">
-+        <element name="productRowBySku" type="block" selector="//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]" parameterized="true" />
-+        <element name="productRowCheckboxBySku" type="block" selector="//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]/../td//input[@data-action='select-row']" parameterized="true" />
-         <element name="loadingMask" type="text" selector=".admin__data-grid-loading-mask[data-component*='product_listing']"/>
-         <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
-         <element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
-@@ -15,6 +17,8 @@
-         <element name="productGridElement2" type="text" selector="#addselector" />
-         <element name="productGridRows" type="text" selector="table.data-grid tr.data-row"/>
-         <element name="firstProductRow" type="text" selector="table.data-grid tr.data-row:first-of-type"/>
-+        <element name="firstProductRowName" type="text" selector="table.data-grid tr.data-row:first-of-type > td:nth-of-type(4)"/>
-+        <element name="firstProductRowEditButton" type="button" selector="table.data-grid tr.data-row td .action-menu-item:first-of-type"/>
-         <element name="productThumbnail" type="text" selector="table.data-grid tr:nth-child({{row}}) td.data-grid-thumbnail-cell > img" parameterized="true"/>
-         <element name="productThumbnailBySrc" type="text" selector="img.admin__control-thumbnail[src*='{{pattern}}']" parameterized="true"/>
-         <element name="productGridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
-@@ -28,6 +32,8 @@
-         <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
-         <element name="productGridCheckboxOnRow" type="checkbox" selector="//*[@id='container']//tr[{{row}}]/td[1]//input" parameterized="true"/>
-         <element name="productGridNameProduct" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true" timeout="30"/>
-+        <element name="productGridContentsOnRow" type="checkbox" selector="//*[@id='container']//tr[{{row}}]/td" parameterized="true"/>
-         <element name="selectRowBasedOnName" type="input" selector="//td/div[text()='{{var1}}']" parameterized="true"/>
-+        <element name="changeStatus" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-menu-item')]//ul/li/span[text() = '{{status}}']" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridTableHeaderSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridTableHeaderSection.xml
-index fc6ccea20d3..7341a6ded7a 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridTableHeaderSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridTableHeaderSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductGridTableHeaderSection">
-         <element name="id" type="button" selector=".//*[@class='sticky-header']/following-sibling::*//th[@class='data-grid-th _sortable _draggable _{{order}}']/span[text()='ID']" parameterized="true"/>
-     </section>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagePlaceholderConfigSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagePlaceholderConfigSection.xml
-new file mode 100644
-index 00000000000..7558b13d624
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagePlaceholderConfigSection.xml
-@@ -0,0 +1,37 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminProductImagePlaceholderConfigSection">
-+        <element name="sectionHeader" type="text" selector="#catalog_placeholder-head"/>
-+        <!--Base image placeholder-->
-+        <element name="baseImageInput" type="file" selector="#catalog_placeholder_image_placeholder" timeout="10"/>
-+        <element name="baseImageDelete" type="checkbox" selector="#catalog_placeholder_image_placeholder_delete"/>
-+        <element name="baseImage" type="text" selector="#catalog_placeholder_image_placeholder_image"/>
-+        <element name="baseImageBySrc" type="text" selector="#catalog_placeholder_image_placeholder_image[src*='{{var}}']" parameterized="true"/>
-+
-+        <!--Small image placeholder-->
-+        <element name="smallImageInput" type="file" selector="#catalog_placeholder_small_image_placeholder" timeout="10"/>
-+        <element name="smallImageDelete" type="checkbox" selector="#catalog_placeholder_small_image_placeholder_delete"/>
-+        <element name="smallImage" type="text" selector="#catalog_placeholder_small_image_placeholder_image"/>
-+        <element name="smallImageBySrc" type="text" selector="#catalog_placeholder_small_image_placeholder_image[src*='{{var}}']" parameterized="true"/>
-+
-+        <!--Swatch image placeholder-->
-+        <element name="swatchImageInput" type="file" selector="#catalog_placeholder_swatch_image_placeholder" timeout="10"/>
-+        <element name="swatchImageDelete" type="checkbox" selector="#catalog_placeholder_swatch_image_placeholder_delete"/>
-+        <element name="swatchImage" type="text" selector="#catalog_placeholder_swatch_image_placeholder_image"/>
-+        <element name="swatchImageBySrc" type="text" selector="#catalog_placeholder_swatch_image_placeholder_image[src*='{{var}}']" parameterized="true"/>
-+
-+        <!--Thumbnail image placeholder-->
-+        <element name="thumbnailImageInput" type="file" selector="#catalog_placeholder_thumbnail_placeholder" timeout="10"/>
-+        <element name="thumbnailImageDelete" type="checkbox" selector="#catalog_placeholder_thumbnail_placeholder_delete"/>
-+        <element name="thumbnailImage" type="text" selector="#catalog_placeholder_thumbnail_placeholder_image"/>
-+        <element name="thumbnailImageBySrc" type="text" selector="#catalog_placeholder_thumbnail_placeholder_image[src*='{{var}}']" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml
-index ce10b1e52ae..89eb1ed678c 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductImagesSection">
-         <element name="productImagesToggle" type="button" selector="div[data-index=gallery] .admin__collapsible-title"/>
-         <element name="imageFileUpload" type="input" selector="#fileupload"/>
-@@ -16,6 +16,7 @@
-         <element name="removeImageButton" type="button" selector=".action-remove"/>
-         <element name="modalOkBtn" type="button" selector="button.action-primary.action-accept"/>
-         <element name="uploadProgressBar" type="text" selector=".uploader .file-row"/>
-+        <element name="productImagesToggleState" type="button" selector="[data-index='gallery'] > [data-state-collapsible='{{status}}']" parameterized="true"/>
- 
-         <element name="nthProductImage" type="button" selector="#media_gallery_content > div:nth-child({{var}}) img.product-image" parameterized="true"/>
-         <element name="nthRemoveImageBtn" type="button" selector="#media_gallery_content > div:nth-child({{var}}) button.action-remove" parameterized="true"/>
-@@ -32,4 +33,4 @@
-         <element name="isThumbnailSelected" type="button" selector="//div[contains(@class, 'field-image-role')]//ul/li[contains(@class, 'selected')]/label[normalize-space(.) = 'Thumbnail']"/>
-         <element name="isSwatchSelected" type="button" selector="//div[contains(@class, 'field-image-role')]//ul/li[contains(@class, 'selected')]/label[normalize-space(.) = 'Swatch']"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMessagesSection.xml
-index 5f2e6bd6cf7..59fbeee142d 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMessagesSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMessagesSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductMessagesSection">
-         <element name="successMessage" type="text" selector=".message-success"/>
-         <element name="errorMessage" type="text" selector=".message.message-error.error"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml
-index bef213e6cda..dbdc8202694 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml
-@@ -7,8 +7,9 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductModalSlideGridSection">
-         <element name="productGridXRowYColumnButton" type="input" selector=".modal-slide table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true" timeout="30"/>
-+        <element name="productRowCheckboxBySku" type="input" selector="//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]/../td//input[@data-action='select-row']" parameterized="true" />
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
-index 636a7b5c85e..f3b0d3a895c 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
-@@ -7,11 +7,23 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductFormRelatedUpSellCrossSellSection">
-+        <element name="sectionHeader" type="block" selector=".fieldset-wrapper.admin__collapsible-block-wrapper[data-index='related']"/>
-         <element name="AddRelatedProductsButton" type="button" selector="button[data-index='button_related']" timeout="30"/>
-+        <element name="AddUpSellProductsButton" type="button" selector="button[data-index='button_upsell']" timeout="30"/>
-+        <element name="AddCrossSellProductsButton" type="button" selector="button[data-index='button_crosssell']" timeout="30"/>
-         <element name="relatedProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='related']"/>
-         <element name="upSellProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='upsell']"/>
-         <element name="crossSellProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='crosssell']"/>
-+        <element name="relatedDropdown" type="block" selector="//div[@data-index='related']" timeout="30"/>
-+        <element name="relatedDependent" type="block" selector="//div[@data-index='related']//div[contains(@class, '_show')]"/>
-+        <element name="selectedRelatedProduct" type="block" selector="//span[@data-index='name']"/>
-+        <element name="removeRelatedProduct" type="button" selector="//span[text()='Related Products']//..//..//..//span[text()='{{productName}}']//..//..//..//..//..//button[@class='action-delete']" parameterized="true"/>
-+        <element name="selectedProductSku" type="text" selector="//div[@data-index='{{section}}']//span[@data-index='sku']" parameterized="true" timeout="30"/>
-+    </section>
-+    <section name="AdminAddUpSellProductsModalSection">
-+        <element name="Modal" type="button" selector=".product_form_product_form_related_upsell_modal"/>
-+        <element name="AddSelectedProductsButton" type="button" selector="//aside[contains(@class, 'product_form_product_form_related_upsell_modal')]//button/span[contains(text(), 'Add Selected Products')]" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
-index 1d49d053636..8685e84a347 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
-@@ -7,9 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductSEOSection">
-         <element name="sectionHeader" type="button" selector="div[data-index='search-engine-optimization']" timeout="30"/>
-         <element name="urlKeyInput" type="input" selector="input[name='product[url_key]']"/>
-+        <element name="useDefaultUrl" type="checkbox" selector="input[name='use_default[url_key]']"/>
-+        <element name="metaTitleInput" type="input" selector="input[name='product[meta_title]']"/>
-+        <element name="metaKeywordsInput" type="textarea" selector="textarea[name='product[meta_keyword]']"/>
-+        <element name="metaDescriptionInput" type="textarea" selector="textarea[name='product[meta_description]']"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml
-index 3048f0e3f56..53af1d5bd6e 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminUpdateAttributesSection">
-         <element name="saveButton" type="button" selector="button[title='Save']" timeout="30"/>
- 
-@@ -38,4 +38,8 @@
- 
-         <element name="description" type="input" selector="#description"/>
-     </section>
-+    <section name="AdminUpdateAttributesWebsiteSection">
-+        <element name="website" type="button" selector="#attributes_update_tabs_websites"/>
-+        <element name="addProductToWebsite" type="checkbox" selector="#add-products-to-website-content .website-checkbox"/>
-+    </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/CatalogSubmenuSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/CatalogSubmenuSection.xml
-new file mode 100644
-index 00000000000..84a81c5204a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/CatalogSubmenuSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="CatalogSubmenuSection">
-+        <element name="products" type="button" selector="//li[@id='menu-magento-catalog-catalog']//li[@data-ui-id='menu-magento-catalog-catalog-products']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/NewProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/NewProductPageSection.xml
-new file mode 100644
-index 00000000000..b98bd47b541
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/NewProductPageSection.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="NewProductPageSection">
-+        <element name="productName" type="input" selector="//input[@name='product[name]']"/>
-+        <element name="sku" type="input" selector="//input[@name='product[sku]']"/>
-+        <element name="price" type="input" selector="//input[@name='product[price]']"/>
-+        <element name="quantity" type="input" selector="//input[@name='product[quantity_and_stock_status][qty]']"/>
-+        <element name="saveButton" type="button" selector="//button[@id='save-button']"/>
-+        <element name="createdSuccessMessage" type="button" selector="//div[@data-ui-id='messages-message-success']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/ProductsPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/ProductsPageSection.xml
-new file mode 100644
-index 00000000000..ea37eb59b67
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/ProductsPageSection.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="ProductsPageSection">
-+        <element name="addProductButton" type="button" selector="//button[@id='add_new_product-button']"/>
-+        <element name="checkboxForProduct" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
-+        <element name="actions" type="button" selector="//div[@class='col-xs-2']/div[@class='action-select-wrap']/button[@class='action-select']"/>
-+        <element name="delete" type="button" selector="//*[contains(@class,'admin__data-grid-header-row row row-gutter')]//*[text()='Delete']"/>
-+        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
-+        <element name="deletedSuccessMessage" type="button" selector="//*[@class='message message-success success']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml
-new file mode 100644
-index 00000000000..7ce795c78f2
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCategoryBottomToolbarSection">
-+        <element name="nextPage" type="button" selector=".//*[@class='toolbar toolbar-products'][2]//a[contains(@class, 'next')]" timeout="30"/>
-+        <element name="previousPage" type="button" selector=".//*[@class='toolbar toolbar-products'][2]//a[contains(@class, 'previous')]" timeout="30"/>
-+        <element name="pageNumber" type="text" selector="//*[@class='toolbar toolbar-products'][2]//a[contains(@class, 'page')]//span[2][contains(text() ,'{{var1}}')]" parameterized="true"/>
-+        <element name="perPage" type="select" selector="//*[@class='toolbar toolbar-products'][2]//select[@id='limiter']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryFilterSection.xml
-index 631cb36e168..ddec4428f90 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryFilterSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryFilterSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCategoryFilterSection">
-         <element name="CategoryFilter" type="button" selector="//main//div[@class='filter-options']//div[contains(text(), 'Category')]"/>
-         <element name="CategoryByName" type="button" selector="//main//div[@class='filter-options']//li[@class='item']//a[contains(text(), '{{var1}}')]" parameterized="true"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
-index 2a6003d837b..ac7a15daf56 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
-@@ -7,24 +7,32 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCategoryMainSection">
-+        <element name="perPage" type="select" selector="//*[@id='authenticationPopup']/following-sibling::div[3]//*[@id='limiter']"/>
-+        <element name="sortedBy" type="select" selector="//*[@id='authenticationPopup']/following-sibling::div[1]//*[@id='sorter']"/>
-+        <element name="modeGridIsActive" type="text" selector="//*[@id='authenticationPopup']/following-sibling::div[1]//*[@class='modes']/strong[@class='modes-mode active mode-grid']/span"/>
-         <element name="modeListButton" type="button" selector="#mode-list"/>
-         <element name="CategoryTitle" type="text" selector="#page-title-heading span"/>
-         <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
-         <element name="specifiedProductItemInfo" type="button" selector="//a[@class='product-item-link'][contains(text(), '{{var1}}')]" parameterized="true"/>
-         <element name="AddToCartBtn" type="button" selector="button.action.tocart.primary"/>
-+        <element name="addToCartProductBySku" type="button" selector="//form[@data-product-sku='{{productSku}}']//button[contains(@class, 'tocart')]" parameterized="true" />
-         <element name="SuccessMsg" type="button" selector="div.message-success"/>
-         <element name="productCount" type="text" selector="#toolbar-amount"/>
-         <element name="CatalogDescription" type="text" selector="//div[@class='category-description']//p"/>
-         <element name="mediaDescription" type="text" selector="img[alt='{{var1}}']" parameterized="true"/>
-         <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
-         <element name="productImage" type="text" selector="img.product-image-photo"/>
--        <element name="productLink" type="text" selector="a.product-item-link"/>
-+        <element name="productLink" type="text" selector="a.product-item-link" timeout="30"/>
-         <element name="productLinkByHref" type="text" selector="a.product-item-link[href$='{{var1}}.html']" parameterized="true"/>
--        <element name="productPrice" type="text" selector="div.price-box.price-final_price"/>
-+        <element name="productPrice" type="text" selector=".price-final_price"/>
-         <element name="categoryImage" type="text" selector=".category-image"/>
-         <element name="emptyProductMessage" type="block" selector=".message.info.empty>div"/>
-         <element name="lineProductName" type="text" selector=".products.list.items.product-items li:nth-of-type({{line}}) .product-item-link" timeout="30" parameterized="true"/>
-+        <element name="asLowAs" type="input" selector="//*[@class='price-box price-final_price']/a/span[@class='price-container price-final_price tax weee']"/>
-+        <element name="productsList" type="block" selector="#maincontent .column.main"/>
-+        <element name="productName" type="text" selector=".product-item-name"/>
-+        <element name="productOptionList" type="text" selector="#narrow-by-list"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
-index 19b3a5cc127..4114d64eb39 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCategoryProductSection">
-         <element name="ProductTitleByNumber" type="button" selector="//main//li[{{var1}}]//a[@class='product-item-link']" parameterized="true"/>
-         <element name="ProductPriceByNumber" type="text" selector="//main//li[{{var1}}]//span[@class='price']" parameterized="true"/>
-@@ -16,10 +16,13 @@
-         <element name="ProductInfoByNumber" type="text" selector="//main//li[{{var1}}]//div[@class='product-item-info']" parameterized="true"/>
-         <element name="ProductAddToCompareByNumber" type="text" selector="//main//li[{{var1}}]//a[contains(@class, 'tocompare')]" parameterized="true"/>
-         <element name="listedProduct" type="block" selector="ol li:nth-child({{productPositionInList}}) img" parameterized="true"/>
-+        <element name="ProductImageByNumber" type="button" selector="//main//li[{{var1}}]//img" parameterized="true"/>
-         <element name="categoryListView" type="button" selector="a[title='List']" timeout="30"/>
- 
-         <element name="ProductTitleByName" type="button" selector="//main//li//a[contains(text(), '{{var1}}')]" parameterized="true"/>
-         <element name="ProductPriceByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//span[@class='price']" parameterized="true"/>
-+        <element name="ProductCatalogRuleSpecialPriceTitleByName" type="text" selector="//div[descendant::*[contains(text(), '{{var1}}')]]//*[contains(@class, 'special-price')]" parameterized="true"/>
-+        <element name="ProductCatalogRulePriceTitleByName" type="text" selector="//div[descendant::*[contains(text(), '{{var1}}')]]//*[contains(@class, 'price-label')]" parameterized="true"/>
-         <element name="ProductImageByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[@class='product-image-photo']" parameterized="true"/>
-         <element name="ProductImageBySrc" type="text" selector=".products-grid img[src*='{{pattern}}']" parameterized="true"/>
-         <element name="ProductInfoByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//div[@class='product-item-info']" parameterized="true"/>
-@@ -28,7 +31,9 @@
-         <element name="productPriceLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]" parameterized="true"/>
-         <element name="productPriceLinkAfterLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]/following::span[contains(text(), '{{var2}}')]" parameterized="true"/>
-         <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocart')]" parameterized="true"/>
--        <element name="ProductAddToCompareByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>
-+        <!--<element name="ProductAddToCompareByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>-->
-+        <element name="ProductAddToCompareByName" type="text" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>
-         <element name="ProductImageByNameAndSrc" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[contains(@src, '{{src}}')]" parameterized="true"/>
-+        <element name="ProductStockUnavailable" type="text" selector="//*[text()='Out of stock']"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
-index 9cd35f65c29..1b7bbd58eea 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
-@@ -6,11 +6,14 @@
-  */
- -->
- 
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCategorySidebarSection">
-         <element name="filterOptionsTitle" type="text" selector="//div[@class='filter-options-title' and contains(text(), '{{var1}}')]" parameterized="true"/>
-         <element name="filterOptions" type="text" selector=".filter-options-content .items"/>
-         <element name="filterOption" type="text" selector=".filter-options-content .item"/>
-         <element name="optionQty" type="text" selector=".filter-options-content .item .count"/>
-     </section>
-+    <section name="StorefrontCategorySidebarMobileSection">
-+        <element name="shopByButton" type="button" selector="//div[contains(@class, 'filter-title')]/strong[contains(text(), 'Shop By')]"/>
-+    </section>
- </sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryTopToolbarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryTopToolbarSection.xml
-index 2b44bf1db7e..e063b5fc8c1 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryTopToolbarSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryTopToolbarSection.xml
-@@ -7,10 +7,12 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCategoryTopToolbarSection">
-         <element name="gridMode" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//*[@id='mode-grid']" timeout="30"/>
-         <element name="listMode" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//*[@id='mode-list']" timeout="30"/>
-         <element name="sortByDropdown" type="select" selector=".//*[@class='toolbar toolbar-products'][1]//*[@id='sorter']" timeout="30"/>
-+        <element name="sortDirectionAsc" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//a[contains(@class, 'sort-asc')]" timeout="30"/>
-+        <element name="sortDirectionDesc" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//a[contains(@class, 'sort-desc')]" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontComparisonSidebarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontComparisonSidebarSection.xml
-index 0fdda3eaae9..d097d6bbc46 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontComparisonSidebarSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontComparisonSidebarSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontComparisonSidebarSection">
-         <element name="Compare" type="button" selector="//main//div[contains(@class, 'block-compare')]//a[contains(@class, 'action compare')]"/>
-         <element name="ClearAll" type="button" selector="//main//div[contains(@class, 'block-compare')]//a[contains(@class, 'action clear')]"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml
-index cf956004ae4..1c937637ad8 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontFooterSection">
-         <element name="switchStoreButton" type="button" selector="#switcher-store-trigger"/>
-         <element name="storeLink" type="button" selector="//ul[@class='dropdown switcher-dropdown']//a[contains(text(),'{{var1}}')]" parameterized="true" timeout="30"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontHeaderSection.xml
-index 6b0130eefc3..52a377ad264 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontHeaderSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontHeaderSection.xml
-@@ -7,8 +7,8 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontHeaderSection">
--        <element name="NavigationCategoryByName" type="button" selector="//nav//a[span[contains(., '{{var1}}')]]" parameterized="true"/>
-+        <element name="NavigationCategoryByName" type="button" selector="//nav//a[span[contains(., '{{var1}}')]]" parameterized="true" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
-index 1a9406b9975..c58479a7b73 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
-@@ -7,8 +7,10 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontMessagesSection">
-         <element name="success" type="text" selector="div.message-success.success.message"/>
-+        <element name="error" type="text" selector="div.message-error.error.message"/>
-+        <element name="noticeMessage" type="text" selector="div.message.notice div"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml
-new file mode 100644
-index 00000000000..b2cd0f5f9af
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontMiniCartSection">
-+        <element name="quantity" type="button" selector="span.counter-number"/>
-+        <element name="show" type="button" selector="a.showcart"/>
-+        <element name="goToCheckout" type="button" selector="#top-cart-btn-checkout" timeout="30"/>
-+        <element name="emptyMiniCart" type="text" selector="//div[@class='minicart-wrapper']//span[@class='counter qty empty']/../.."/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
-index ad575b640bd..292b2d7008b 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
-@@ -6,10 +6,12 @@
-  */
- -->
- 
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontNavigationSection">
-         <element name="topCategory" type="button" selector="//a[contains(@class,'level-top')]/span[contains(text(),'{{var1}}')]" parameterized="true"/>
-         <element name="subCategory" type="button" selector="//ul[contains(@class,'submenu')]//span[contains(text(),'{{var1}}')]" parameterized="true"/>
-         <element name="breadcrumbs" type="textarea" selector=".items"/>
-+        <element name="categoryBreadcrumbs" type="textarea" selector=".breadcrumbs li"/>
-+        <element name="categoryBreadcrumbsByNumber" type="textarea" selector=".breadcrumbs li:nth-of-type({{number}})" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProducRelatedProductsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProducRelatedProductsSection.xml
-index e15723582db..f4db37b6775 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProducRelatedProductsSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProducRelatedProductsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductRelatedProductsSection">
-         <element name="relatedProductsActionsHeaderText" type="text" selector=".block.related .block-actions" />
-         <element name="relatedProductsListSectionText" type="text" selector=".block.related .products.wrapper.grid.products-grid.products-related" />
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
-index 65d6b7c5f61..5ee754904b7 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
-@@ -6,10 +6,10 @@
-   */
- -->
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductActionSection">
-         <element name="quantity" type="input" selector="#qty"/>
--        <element name="addToCart" type="button" selector="#product-addtocart-button"/>
-+        <element name="addToCart" type="button" selector="#product-addtocart-button" timeout="60"/>
-         <element name="addToCartButtonTitleIsAdding" type="text" selector="//button/span[text()='Adding...']"/>
-         <element name="addToCartButtonTitleIsAdded" type="text" selector="//button/span[text()='Added']"/>
-         <element name="addToCartButtonTitleIsAddToCart" type="text" selector="//button/span[text()='Add to Cart']"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductCompareMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
-index 728f9a5a174..ad31be6b277 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductCompareMainSection">
-         <element name="PageName" type="text" selector="//*[@id='maincontent']//h1//span"/>
-         <element name="ProductLinkByName" type="button" selector="//*[@id='product-comparison']//tr//strong[@class='product-item-name']/a[contains(text(), '{{var1}}')]" parameterized="true"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml
-index 5688811cb96..0745c0d0819 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductInfoDetailsSection">
-         <element name="productNameForReview" type="text" selector=".legend.review-legend>strong" />
-         <element name="detailsTab" type="button" selector="#tab-label-description-title" />
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-index 42ca3836e6c..fd412d3c7de 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-@@ -7,19 +7,21 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductInfoMainSection">
-         <element name="stock" type="input" selector=".stock.available"/>
-         <element name="productName" type="text" selector=".base"/>
-         <element name="productSku" type="text" selector=".product.attribute.sku>.value"/>
-         <element name="productPriceLabel" type="text" selector=".price-label"/>
--        <element name="productPrice" type="text" selector="div.price-box.price-final_price"/>
-+        <element name="price" type="text" selector=".product-info-main [data-price-type='finalPrice']"/>
-+        <element name="productPrice" type="text" selector=".price-final_price"/>
-         <element name="qty" type="input" selector="#qty"/>
-         <element name="specialPrice" type="text" selector=".special-price"/>
-+        <element name="specialPriceAmount" type="text" selector=".special-price span.price"/>
-         <element name="updatedPrice" type="text" selector="div.price-box.price-final_price [data-price-type='finalPrice'] .price"/>
-         <element name="oldPrice" type="text" selector=".old-price"/>
-         <element name="oldPriceTag" type="text" selector=".old-price .price-label"/>
--        <element name="oldPriceAmount" type="text" selector=".old-price .price"/>
-+        <element name="oldPriceAmount" type="text" selector=".old-price span.price"/>
-         <element name="productStockStatus" type="text" selector=".stock[title=Availability]>span"/>
-         <element name="productImage" type="text" selector="//*[@id='maincontent']//div[@class='gallery-placeholder']//img[@class='fotorama__img']"/>
-         <element name="productImageSrc" type="text" selector="//*[@id='maincontent']//div[@class='gallery-placeholder']//img[contains(@src, '{{src}}')]" parameterized="true"/>
-@@ -28,14 +30,18 @@
-         <element name="productOptionAreaInput" type="textarea" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//textarea" parameterized="true"/>
-         <element name="productOptionFile" type="file" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'OptionFile')]/../div[@class='control']//input[@type='file']" parameterized="true"/>
-         <element name="productOptionSelect" type="select" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//select" parameterized="true"/>
--
-+        <element name="asLowAs" type="input" selector="span[class='price-wrapper '] "/>
-+        <element name="specialPriceValue" type="text" selector="//span[@class='special-price']//span[@class='price']"/>
-+        <element name="mapPrice" type="text" selector="//div[@class='price-box price-final_price']//span[contains(@class, 'price-msrp_price')]"/>
-+        <element name="clickForPriceLink" type="text" selector="//div[@class='price-box price-final_price']//a[contains(text(), 'Click for price')]"/>
- 
-         <!-- The parameter is the nth custom option that you want to get -->
-         <element name="nthCustomOption" type="block" selector="//*[@id='product-options-wrapper']/*[@class='fieldset']/*[contains(@class, 'field')][{{customOptionNum}}]" parameterized="true" />
-+
-         <!-- The 1st parameter is the nth custom option, the 2nd parameter is the nth value in the option -->
-         <element name="nthCustomOptionInput" type="radio" selector="//*[@id='product-options-wrapper']/*[@class='fieldset']/*[contains(@class, 'field')][{{customOptionNum}}]//*[contains(@class, 'admin__field-option')][{{customOptionValueNum}}]//input" parameterized="true" />
-+        <element name="customOptionByTitle" type="text" selector="//span[text()='{{title}}']/ancestor::div[contains(@class, 'field ') and contains(@class, 'required')]" parameterized="true" timeout="30"/>
-         <element name="productOptionRadioButtonsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//input[@price='{{var2}}']" parameterized="true"/>
--
-         <element name="productOptionDataMonth" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='month']" parameterized="true"/>
-         <element name="productOptionDataDay" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='day']" parameterized="true"/>
-         <element name="productOptionDataYear" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='year']" parameterized="true"/>
-@@ -49,7 +55,6 @@
- 
-         <!-- Only one of Upload/Url Inputs are available for File and Sample depending on the value of the corresponding TypeSelector -->
-         <element name="addLinkFileUploadFile" type="file" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//input[@type='file']" parameterized="true" />
--
-         <element name="productShortDescription" type="text" selector="//div[@class='product attribute overview']//div[@class='value']"/>
-         <element name="productAttributeTitle1" type="text" selector="#product-options-wrapper div[tabindex='0'] label"/>
-         <element name="productAttributeOptions1" type="select" selector="#product-options-wrapper div[tabindex='0'] option"/>
-@@ -66,8 +71,37 @@
-         <element name="productOptionDropDownOptionTitle" type="text" selector="//label[contains(.,'{{var1}}')]/../div[@class='control']//select//option[contains(.,'{{var2}}')]" parameterized="true"/>
- 
-         <!-- Tier price selectors -->
-+        <element name="tierPriceText" type="text" selector=".prices-tier li[class='item']" />
-         <element name="productTierPriceByForTextLabel" type="text" selector="//ul[contains(@class, 'prices-tier')]//li[{{var1}}][contains(text(),'Buy {{var2}} for')]" parameterized="true"/>
-         <element name="productTierPriceAmount" type="text" selector="//ul[contains(@class, 'prices-tier')]//li[{{var1}}]//span[contains(text(), '{{var2}}')]" parameterized="true"/>
-         <element name="productTierPriceSavePercentageAmount" type="text" selector="//ul[contains(@class, 'prices-tier')]//li[{{var1}}]//span[contains(@class, 'percent')][contains(text(), '{{var2}}')]" parameterized="true"/>
-+
-+        <!-- Special price selectors -->
-+        <element name="productSpecialPrice" type="text" selector="//span[@data-price-type='finalPrice']/span"/>
-+        <element name="specialProductText" type="text" selector="//span[text()='Regular Price']"/>
-+        <element name="oldProductPrice" type="text" selector="//span[@data-price-type='oldPrice']/span"/>
-+
-+        <!-- Customizable Option selectors -->
-+        <element name="allCustomOptionLabels" type="text" selector="#product-options-wrapper label"/>
-+        <element name="customOptionLabel" type="text" selector="//label[contains(., '{{customOptionTitle}}')]" parameterized="true"/>
-+        <element name="customSelectOptions" type="select" selector="#{{selectId}} option" parameterized="true"/>
-+        <element name="requiredCustomInput" type="text" selector="//div[contains(.,'{{customOptionTitle}}') and contains(@class, 'required') and .//input[@aria-required='true']]" parameterized="true"/>
-+        <element name="requiredCustomSelect" type="select" selector="//div[contains(.,'{{customOptionTitle}}') and contains(@class, 'required') and .//select[@aria-required='true']]" parameterized="true"/>
-+        <element name="requiredCustomField" type="text" selector="//div[@class='field required']/label/span[contains(.,'{{optionTitle}}')]//../../div/div[contains(.,'This is a required field.')]" parameterized="true"/>
-+        <element name="requiredCustomFile" type="text" selector="//div[@class='field file required']/label/span[contains(.,'{{OptionFileTitle}}')]//../../div/div[contains(.,'This is a required field.')]" parameterized="true"/>
-+        <element name="requiredCustomTextArea" type="text" selector="//div[@class='field textarea required']/label/span[contains(.,'{{OptionAreaTitle}}')]//../../div/div[contains(.,'This is a required field.')]" parameterized="true"/>
-+        <element name="requiredCustomDate" type="text" selector="//div[@class='field date required']//span[text()='{{OptionDateTitle}}']//../../div/div[contains(.,'This is a required field.')]" parameterized="true"/>
-+        <element name="customOptionField" type="input" selector="//input[contains(@class,'input-text product-custom-option')]"/>
-+        <element name="customOptionTextArea" type="textarea" selector="//textarea[contains(@class,'product-custom-option')]"/>
-+        <element name="customOptionDropDown" type="select" selector="//select[contains(@class,' required product-custom-option admin__control-select')]/option[contains(.,'{{option}}')]" parameterized="true"/>
-+        <element name="customRadioOption" type="checkbox" selector="//div/input[@type='radio']/../label/span"/>
-+        <element name="customOptionCheckBox" type="checkbox" selector="//div/input[@type='checkbox']/../label/span[contains(.,'{{option}}')]" parameterized="true"/>
-+        <element name="customMultiSelectOption" type="select" selector="//select[contains(@class,'multiselect admin__control-multiselect required product-custom-option')]/option[contains(.,'{{option'}})]" parameterized="true"/>
-+        <element name="customOptionMonth" type="date" selector="//div[@class='field date required']//span[text()='{{option}}']/../..//div/select[@data-calendar-role='month']" parameterized="true"/>
-+        <element name="customOptionDay" type="date" selector="//div[@class='field date required']//span[text()='{{option}}']/../..//div/select[@data-calendar-role='day']" parameterized="true"/>
-+        <element name="customOptionYear" type="date" selector="//div[@class='field date required']//span[text()='{{option}}']/../..//div/select[@data-calendar-role='year']" parameterized="true"/>
-+        <element name="customOptionHour" type="date" selector="//div[@class='field date required']//span[text()='{{option}}']/../..//div/select[@data-calendar-role='hour']" parameterized="true"/>
-+        <element name="customOptionMinute" type="date" selector="//div[@class='field date required']//span[text()='{{option}}']/../..//div/select[@data-calendar-role='minute']" parameterized="true"/>
-+        <element name="customOptionDayPart" type="date" selector="//div[@class='field date required']//span[text()='{{option}}']/../..//div/select[@data-calendar-role='day_part']" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
-index 0273b39f48a..ea10e12fb73 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
-@@ -7,8 +7,14 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductMediaSection">
-+        <element name="gallerySpinner" type="block" selector="#maincontent .fotorama__spinner--show" />
-+        <element name="gallery" type="block" selector="[data-gallery-role='gallery']" />
-+        <element name="productImage" type="text" selector="//*[@data-gallery-role='gallery' and not(contains(@class, 'fullscreen'))]//img[contains(@src, '{{filename}}') and not(contains(@class, 'full'))]" parameterized="true" />
-+        <element name="productImageFullscreen" type="text" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//img[contains(@src, '{{filename}}') and contains(@class, 'full')]" parameterized="true" />
-+        <element name="closeFullscreenImage" type="button" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//*[@data-gallery-role='fotorama__fullscreen-icon']" />
-         <element name="imageFile" type="text" selector="//*[@class='product media']//img[contains(@src, '{{filename}}')]" parameterized="true"/>
-+        <element name="productImageActive" type="text" selector=".product.media div[data-active=true] > img[src*='{{filename}}']" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMoreInformationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMoreInformationSection.xml
-index fc2102e073d..7706c5f244b 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMoreInformationSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMoreInformationSection.xml
-@@ -7,10 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductMoreInformationSection">
-         <element name="moreInformation" type="button" selector="#tab-label-additional-title" timeout="30"/>
-         <element name="moreInformationTextArea" type="textarea" selector="#additional"/>
-+        <element name="moreInformationSpecs" type="text" selector="#product-attribute-specs-table"/>
-+        <element name="customAttributeLabel" type="text" selector="//th[./following-sibling::td[@data-th='{{attributeCode}}']]" parameterized="true" />
-+        <element name="customAttributeValue" type="text" selector="//td[@data-th='{{attributeCode}}']" parameterized="true" />
-         <element name="attributeLabel" type="text" selector=".col.label"/>
-         <element name="attributeValue" type="text" selector=".col.data"/>
-     </section>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageDesignSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageDesignSection.xml
-new file mode 100644
-index 00000000000..1f41ddefd0b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageDesignSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontProductPageDesignSection">
-+        <element name="layoutTwoColumnsLeft" type="block" selector=".page-layout-2columns-left"/>
-+        <element name="layoutEmpty" type="block" selector=".page-layout-empty"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
-index 2de616819b2..78818dd37a5 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
-@@ -7,16 +7,23 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductPageSection">
--        <element name="qtyInput" type="button" selector="input.input-text.qty"/>
-+        <element name="qtyInput" type="button" selector="input.input-text.qty" timeout="30"/>
-         <element name="addToCartBtn" type="button" selector="button.action.tocart.primary" timeout="30"/>
--        <element name="successMsg" type="button" selector="div.message-success"/>
--        <element name="errorMsg" type="button" selector="div.message-error"/>
-+        <element name="successMsg" type="button" selector="div.message-success" timeout="30"/>
-+        <element name="errorMsg" type="button" selector="div.message-error" timeout="30"/>
-         <element name="alertMessage" type="text" selector=".page.messages [role=alert]"/>
--        <element name="messagesBlock" type="text" selector=".page.messages"/>
-+        <element name="messagesBlock" type="text" selector=".page.messages" timeout="30"/>
-         <element name="addToWishlist" type="button" selector="//a[@class='action towishlist']" timeout="30"/>
-         <element name="customTextOptionInput" type="input" selector=".input-text.product-custom-option"/>
-         <element name="charCounter" type="text" selector=".character-counter"/>
-+        <element name="tax" type="input" selector=".totals-tax .amount .price"/>
-+        <element name="subTotal" type="input" selector="span[data-th='Subtotal']"/>
-+        <element name="shipping" type="input" selector="span[data-th='Shipping']"/>
-+        <element name="orderTotal" type="input" selector=".grand.totals .amount .price"/>
-+        <element name="customOptionDropDown" type="select" selector="//*[@id='product-options-wrapper']//select[contains(@class, 'product-custom-option admin__control-select')]"/>
-+        <element name="qtyInputWithProduct" type="input" selector="//tr//strong[contains(.,'{{productName}}')]/../../td[@class='col qty']//input" parameterized="true"/>
-+        <element name="customOptionRadio" type="input" selector="//span[contains(text(),'{{customOption}}')]/../../input" parameterized="true"/>
-     </section>
--</sections>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductUpSellProductsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductUpSellProductsSection.xml
-new file mode 100644
-index 00000000000..f00abbe3c58
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductUpSellProductsSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontProductUpSellProductsSection">
-+        <element name="upSellHeading" type="text" selector="#block-upsell-heading"/>
-+        <element name="upSellProducts" type="text" selector="div.upsell .product-item-name"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontWidgetsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontWidgetsSection.xml
-new file mode 100644
-index 00000000000..87aab45bd8c
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontWidgetsSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontWidgetsSection">
-+        <element name="widgetRecentlyViewedProductsGrid" type="block" selector=".block.widget.block-viewed-products-grid"/>
-+        <element name="widgetRecentlyComparedProductsGrid" type="block" selector=".block.widget.block-compared-products-grid"/>
-+        <element name="widgetRecentlyOrderedProductsGrid" type="block" selector=".block.block-reorder"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
-new file mode 100644
-index 00000000000..044b38a19c4
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
-@@ -0,0 +1,95 @@
-+<?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="AddOutOfStockProductToCompareListTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Product Comparison for products Out of Stock"/>
-+            <title value="Add Product that is Out of Stock product to Product Comparison"/>
-+            <description value="Customer should be able to add Product that is Out Of Stock to the Product Comparison"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-98644"/>
-+            <useCaseId value="MAGETWO-98522"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <magentoCLI command="config:set cataloginventory/options/show_out_of_stock 0" stepKey="displayOutOfStockNo"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+            <createData entity="SimpleSubCategory" stepKey="category"/>
-+            <createData entity="SimpleProduct4" stepKey="product">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set cataloginventory/options/show_out_of_stock 0" stepKey="displayOutOfStockNo2"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+            <deleteData createDataKey="product" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Open product page-->
-+        <comment userInput="Open product page" stepKey="openProdPage"/>
-+        <amOnPage url="{{StorefrontProductPage.url($$product.name$$)}}" stepKey="goToSimpleProductPage"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
-+        <!--'Add to compare' link is not available-->
-+        <comment userInput="'Add to compare' link is not available" stepKey="addToCompareLinkAvailability"/>
-+        <dontSeeElement selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="dontSeeAddToCompareLink"/>
-+        <!--Turn on 'out on stock' config-->
-+        <comment userInput="Turn on 'out of stock' config" stepKey="onOutOfStockConfig"/>
-+        <magentoCLI command="config:set cataloginventory/options/show_out_of_stock 1" stepKey="displayOutOfStockYes"/>
-+        <!--Clear cache and reindex-->
-+        <comment userInput="Clear cache and reindex" stepKey="cleanCache"/>
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        <!--Open product page-->
-+        <comment userInput="Open product page" stepKey="openProductPage"/>
-+        <amOnPage url="{{StorefrontProductPage.url($$product.name$$)}}" stepKey="goToSimpleProductPage2"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductPage2"/>
-+        <!--Click on 'Add to Compare' link-->
-+        <comment userInput="Click on 'Add to Compare' link" stepKey="clickOnAddToCompareLink"/>
-+        <click selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="clickOnAddToCompare"/>
-+        <waitForPageLoad stepKey="waitForProdAddToCmpList"/>
-+        <!--Assert success message-->
-+        <comment userInput="Assert success message" stepKey="assertSuccessMsg"/>
-+        <grabTextFrom selector="{{AdminProductMessagesSection.successMessage}}" stepKey="grabTextFromSuccessMessage"/>
-+        <assertEquals expected='You added product $$product.name$$ to the comparison list.' expectedType="string" actual="($grabTextFromSuccessMessage)" stepKey="assertSuccessMessage"/>
-+        <!--See product in the comparison list-->
-+        <comment userInput="See product in the comparison list" stepKey="seeProductInComparisonList"/>
-+        <amOnPage url="{{StorefrontProductComparePage.url}}" stepKey="navigateToComparePage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductComparePageLoad"/>
-+        <seeElement selector="{{StorefrontProductCompareMainSection.ProductLinkByName($product.name$)}}" stepKey="seeProductInCompareList"/>
-+        <!--Go to Category page and delete product from comparison list-->
-+        <comment userInput="Go to Category page and delete product from comparison list" stepKey="deleteProdFromCmpList"/>
-+        <amOnPage url="{{StorefrontCategoryPage.url($$category.name$$)}}" stepKey="onCategoryPage"/>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
-+        <click selector="{{StorefrontComparisonSidebarSection.ClearAll}}" stepKey="clickClearAll"/>
-+        <waitForPageLoad time="30" stepKey="waitForConfirmPageLoad"/>
-+        <click selector="{{AdminDeleteRoleSection.confirm}}" stepKey="confirmProdDelate"/>
-+        <waitForPageLoad time="30" stepKey="waitForConfirmLoad"/>
-+        <!--Add product to compare list from Category page-->
-+        <comment userInput="Add product to compare list fom Category page" stepKey="addToCmpFromCategPage"/>
-+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverOverProduct"/>
-+        <click selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="clickAddToCompare"/>
-+        <waitForPageLoad stepKey="waitProdAddingToCmpList"/>
-+        <!--Assert success message-->
-+        <comment userInput="Assert success message" stepKey="assertSuccessMsg2"/>
-+        <grabTextFrom selector="{{AdminProductMessagesSection.successMessage}}" stepKey="grabTextFromSuccessMessage2"/>
-+        <assertEquals expected='You added product $$product.name$$ to the comparison list.' expectedType="string" actual="($grabTextFromSuccessMessage)" stepKey="assertSuccessMessage2"/>
-+        <!--Check that product displays on add to compare widget-->
-+        <comment userInput="Check that product displays on add to compare widget" stepKey="checkProdNameOnWidget"/>
-+        <seeElement selector="{{StorefrontComparisonSidebarSection.ProductTitleByName($$product.name$$)}}" stepKey="seeProdNameOnCmpWidget"/>
-+        <!--See product in the compare page-->
-+        <comment userInput="See product in the compare page" stepKey="seeProductInComparePage"/>
-+        <amOnPage url="{{StorefrontProductComparePage.url}}" stepKey="navigateToComparePage2"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductComparePageLoad2"/>
-+        <seeElement selector="{{StorefrontProductCompareMainSection.ProductLinkByName($product.name$)}}" stepKey="seeProductInCompareList2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddToCartCrossSellTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddToCartCrossSellTest.xml
-new file mode 100644
-index 00000000000..53bb12fda48
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddToCartCrossSellTest.xml
-@@ -0,0 +1,93 @@
-+<?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="AddToCartCrossSellTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Promote Products as Cross-Sells"/>
-+            <title value="Admin should be able to add cross-sell to products."/>
-+            <description value="Create products, add products to cross sells, and check that they appear in the Shopping Cart page."/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-9143"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="category1"/>
-+            <createData entity="_defaultProduct" stepKey="simpleProduct1">
-+                <requiredEntity createDataKey="category1"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="simpleProduct2">
-+                <requiredEntity createDataKey="category1"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="simpleProduct3">
-+                <requiredEntity createDataKey="category1"/>
-+            </createData>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="logInAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-+
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimp1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimp2"/>
-+            <deleteData createDataKey="simpleProduct3" stepKey="deleteSimp3"/>
-+            <deleteData createDataKey="category1" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!-- Go to simpleProduct1, add simpleProduct2 and simpleProduct3 as cross-sell-->
-+        <amOnPage url="{{AdminProductEditPage.url($simpleProduct1.id$)}}" stepKey="goToProduct1"/>
-+        <click stepKey="openHeader1" selector="{{AdminProductFormRelatedUpSellCrossSellSection.sectionHeader}}"/>
-+
-+        <actionGroup ref="addCrossSellProductBySku" stepKey="addProduct2ToSimp1">
-+            <argument name="sku" value="$simpleProduct2.sku$"/>
-+        </actionGroup>
-+        <actionGroup ref="addCrossSellProductBySku" stepKey="addProduct3ToSimp1">
-+            <argument name="sku" value="$simpleProduct3.sku$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+
-+        <!-- Go to simpleProduct3, add simpleProduct1 and simpleProduct2 as cross-sell-->
-+        <amOnPage url="{{AdminProductEditPage.url($simpleProduct3.id$)}}" stepKey="goToProduct3"/>
-+        <click stepKey="openHeader2" selector="{{AdminProductFormRelatedUpSellCrossSellSection.sectionHeader}}"/>
-+
-+        <actionGroup ref="addCrossSellProductBySku" stepKey="addProduct1ToSimp3">
-+            <argument name="sku" value="$simpleProduct1.sku$"/>
-+        </actionGroup>
-+        <actionGroup ref="addCrossSellProductBySku" stepKey="addProduct2ToSimp3">
-+            <argument name="sku" value="$simpleProduct2.sku$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave2"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+
-+        <!-- Go to frontend, add simpleProduct1 to cart-->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimp1ToCart">
-+            <argument name="product" value="$simpleProduct1$"/>
-+        </actionGroup>
-+
-+        <!-- Check that cart page contains cross-sell to simpleProduct2 and simpleProduct3-->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart1"/>
-+        <waitForPageLoad stepKey="waitForCartToLoad"/>
-+        <waitForElementVisible selector="{{CheckoutCartCrossSellSection.products}}" stepKey="waitForCrossSellLoading"/>
-+        <see stepKey="seeProduct2InCrossSell" selector="{{CheckoutCartCrossSellSection.products}}" userInput="$simpleProduct2.name$"/>
-+        <see stepKey="seeProduct3InCrossSell" selector="{{CheckoutCartCrossSellSection.products}}" userInput="$simpleProduct3.name$"/>
-+
-+        <!-- Add simpleProduct3 to cart, check cross-sell contains product2 but not product3-->
-+        <click stepKey="addSimp3ToCart" selector="{{CheckoutCartCrossSellSection.productRowByName($simpleProduct3.name$)}}{{CheckoutCartCrossSellSection.addToCart}}"/>
-+        <waitForPageLoad stepKey="waitForCartToLoad2"/>
-+        <see stepKey="seeProduct2StillInCrossSell" selector="{{CheckoutCartCrossSellSection.products}}" userInput="$simpleProduct2.name$"/>
-+        <dontSee stepKey="dontSeeProduct3InCrossSell" selector="{{CheckoutCartCrossSellSection.products}}" userInput="$simpleProduct3.name$"/>
-+
-+        <!-- Add simpleProduct2 to cart, check cross-sell doesn't contain product 2 anymore.-->
-+        <click stepKey="addSimp2ToCart" selector="{{CheckoutCartCrossSellSection.productRowByName($simpleProduct2.name$)}}{{CheckoutCartCrossSellSection.addToCart}}"/>
-+        <waitForPageLoad stepKey="waitForCartToLoad3"/>
-+        <dontSee stepKey="dontSeeProduct2InCrossSell" selector="{{CheckoutCartCrossSellSection.products}}" userInput="$simpleProduct2.name$"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
-index c9b6e033a2f..117f094ee06 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddDefaultImageSimpleProductTest">
-         <annotations>
-             <features value="Catalog"/>
-@@ -43,7 +43,9 @@
-         <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
- 
-         <!-- Assert product image in admin product form -->
--        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
-+        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage">
-+            <argument name="image" value="MagentoLogo"/>
-+        </actionGroup>
- 
-         <!-- Assert product in storefront product page -->
-         <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
-index add917199e2..3f857c25892 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddRemoveProductImageVirtualProductTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
-new file mode 100644
-index 00000000000..f657fbbdae6
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
-@@ -0,0 +1,48 @@
-+<?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="AdminAddDefaultVideoSimpleProductTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Add/remove images and videos for all product types and category"/>
-+            <title value="Admin should be able to add default product video for a Simple Product"/>
-+            <description value="Admin should be able to add default product video for a Simple Product"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-111"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-+        </after>
-+
-+        <!-- Create product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
-+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
-+            <argument name="product" value="ApiSimpleProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
-+            <argument name="product" value="ApiSimpleProduct"/>
-+        </actionGroup>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="ApiSimpleProduct"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml
-new file mode 100644
-index 00000000000..eab36bc90dc
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml
-@@ -0,0 +1,34 @@
-+<?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="AdminAddDefaultVideoVirtualProductTest" extends="AdminAddDefaultVideoSimpleProductTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Add/remove images and videos for all product types and category"/>
-+            <title value="Admin should be able to add default product video for a Virtual Product"/>
-+            <description value="Admin should be able to add default product video for a Virtual Product"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-109"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+
-+        <!-- Replacing steps in base AdminAddDefaultVideoSimpleProductTest -->
-+
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
-+            <argument name="product" value="defaultVirtualProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
-+            <argument name="product" value="defaultVirtualProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="defaultVirtualProduct"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml
-index 6ee72877a0d..8ac0cfa512b 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddImageForCategoryTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
-index 479247ade8c..50d192a27e4 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddImageToWYSIWYGCatalogTest">
-         <before>
-             <actionGroup ref="LoginActionGroup" stepKey="login"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
-index e9d17b5c70d..f3d3e653b26 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddImageToWYSIWYGProductTest">
-         <annotations>
-             <features value="Catalog"/>
-@@ -16,82 +16,80 @@
-             <description value="Admin should be able to add image to WYSIWYG Editor on Product Page"/>
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-84375"/>
-+            <skip>
-+                <issueId value="MC-17232"/>
-+            </skip>
-         </annotations>
-         <before>
-             <actionGroup ref="LoginActionGroup" stepKey="login"/>
-             <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-             <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-         </before>
-+        <after>
-+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-         <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
--        <waitForPageLoad stepKey="waitForPageLoad"/>
--        <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
--        <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
--        <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
--        <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
--        <scrollTo selector="{{AdminProductFormSection.productQuantity}}" stepKey="scrollToQty" />
-+        <waitForPageLoad stepKey="waitForPageLoadProductCreatePage"/>
-+        <actionGroup ref="fillMainProductForm" stepKey="fillBasicProductInfo" />
-+
-         <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
-         <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitForDescription" />
-         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="clickInsertImageIcon1" />
--        <waitForPageLoad stepKey="waitForPageLoad1" />
-         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.Browse}}" stepKey="clickBrowse1" />
--        <waitForPageLoad stepKey="waitForPageLoad2" />
--        <waitForLoadingMaskToDisappear stepKey="waitForLoading1" />
--        <waitForLoadingMaskToDisappear stepKey="waitForLoading2" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForBrowseModal" />
-         <see selector="{{ProductDescriptionWYSIWYGToolbarSection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn1" />
-         <see selector="{{ProductDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn1" />
--        <dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn" />
--        <click selector="{{ProductDescriptionWYSIWYGToolbarSection.CreateFolder}}" stepKey="createFolder1"/>
--        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.FolderName}}" stepKey="waitForPopUp1" />
-+        <dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn1" />
-+        <click selector="{{ProductDescriptionWYSIWYGToolbarSection.CreateFolder}}" stepKey="createFolder1" />
-+        <waitForElement selector="{{ProductDescriptionWYSIWYGToolbarSection.FolderName}}" stepKey="waitForPopUp1" />
-         <fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.FolderName}}" userInput="{{ImageFolder.name}}" stepKey="fillFolderName1" />
-         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.AcceptFolderName}}" stepKey="acceptFolderName11" />
--        <waitForLoadingMaskToDisappear stepKey="waitForLoading3" />
-         <conditionalClick selector="{{ProductDescriptionWYSIWYGToolbarSection.StorageRootArrow}}" dependentSelector="{{ProductDescriptionWYSIWYGToolbarSection.checkIfArrowExpand}}" stepKey="clickStorageRootArrowIfClosed" visible="true"/>
-         <conditionalClick selector="{{ProductDescriptionWYSIWYGToolbarSection.WysiwygArrow}}" dependentSelector="{{ProductDescriptionWYSIWYGToolbarSection.checkIfWysiwygArrowExpand}}" stepKey="clickWysiwygArrowIfClosed" visible="true"/>
-         <waitForText userInput="{{ImageFolder.name}}" stepKey="waitForNewFolder1" />
-         <click userInput="{{ImageFolder.name}}" stepKey="clickOnCreatedFolder1" />
--        <waitForLoadingMaskToDisappear stepKey="waitForLoading4" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading4"/>
-         <attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage1"/>
--        <waitForLoadingMaskToDisappear stepKey="waitForLoading5" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForFileUpload1"/>
-         <waitForElementVisible  selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage1" />
-         <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.imageSelected(ImageUpload1.value)}}" stepKey="seeImageSelected1" />
-         <see selector="{{ProductDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn1"/>
-         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected1" />
--        <waitForText userInput="OK" stepKey="waitForConfirm1" />
--        <click selector="{{ProductDescriptionWYSIWYGToolbarSection.confirmDelete}}" stepKey="confirmDelete1" />
-+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmDelete1"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete1" />
-         <waitForElementNotVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForImageDeleted1" />
-         <dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="dontSeeImage1" />
--        <dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn1" />
-+        <dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn2" />
-         <attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage2"/>
--        <waitForLoadingMaskToDisappear stepKey="waitForLoading6" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForFileUpload2"/>
-         <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage2" />
-         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn1" />
--        <waitForLoadingMaskToDisappear stepKey="waitForLoading7" />
--        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="waitForOkBtn1" />
-+        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.ImageDescription}}" stepKey="waitForImageDescriptionButton1" />
-         <fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload1.content}}" stepKey="fillImageDescription1" />
-         <fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload1.height}}" stepKey="fillImageHeight1" />
-         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="clickOkBtn1" />
--        <waitForPageLoad stepKey="waitForPageLoad3"/>
-         <scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="scrollToTinyMCE4" />
-         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="clickInsertImageIcon2" />
--        <waitForPageLoad stepKey="waitForPageLoad4" />
-         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Browse}}" stepKey="clickBrowse2" />
--        <waitForPageLoad stepKey="waitForPageLoad5" />
--        <waitForLoadingMaskToDisappear stepKey="waitForLoading8" />
-+        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.CancelBtn}}" stepKey="waitForCancelButton2"/>
-         <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn2" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading13"/>
-         <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn2" />
--        <dontSeeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn2" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading14"/>
-+        <dontSeeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn3" />
-         <attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage3"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForFileUpload3"/>
-         <waitForElementVisible  selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage3" />
--        <waitForLoadingMaskToDisappear stepKey="waitForLoading9" />
--        <wait time="3" stepKey="waitMore" />
-         <waitForElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="waitForDeletebtn" />
-         <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn2"/>
-         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected2" />
--        <waitForText userInput="OK" stepKey="waitForConfirm3" />
--        <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.confirmDelete}}" stepKey="confirmDelete2" />
--        <dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn3" />
-+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirm3"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete2" />
-+        <dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn4" />
-         <attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage4"/>
--        <waitForLoadingMaskToDisappear stepKey="waitForLoading10" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForFileUpload4"/>
-         <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage4" />
-         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn" />
-         <waitForLoadingMaskToDisappear stepKey="waitForLoading11" />
-@@ -107,9 +105,5 @@
-         <seeElement selector="{{StorefrontProductInfoMainSection.mediaDescription}}" stepKey="assertMediaDescription"/>
-         <seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource3"/>
-         <seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload1.fileName)}}" stepKey="assertMediaSource1"/>
--        <after>
--            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
--            <actionGroup ref="logout" stepKey="logout"/>
--        </after>
-     </test>
- </tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
-new file mode 100644
-index 00000000000..feb4fffd12f
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
-@@ -0,0 +1,88 @@
-+<?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="AdminAddInStockProductToTheCartTest">
-+        <annotations>
-+            <stories value="Manage products"/>
-+            <title value="Add In Stock Product to Cart"/>
-+            <description value="Login as admin and add In Stock product to the cart"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11065"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <!--Create Category-->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <!--Create Simple Product-->
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+             <!--Delete created entity -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Open Product Index Page and filter the product-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProduct">
-+            <argument name="product" value="SimpleProduct"/>
-+        </actionGroup>
-+        <!-- Update product Advanced Inventory setting -->
-+        <click stepKey="openSelectedProduct" selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
-+        <waitForPageLoad stepKey="waitForAdvancedInventoryPageToLoad"/>
-+        <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" stepKey="uncheckConfigSetting"/>
-+        <selectOption selector="{{AdminProductFormAdvancedInventorySection.manageStock}}"  userInput="Yes" stepKey="clickOnManageStock"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryQty}}" userInput="5" stepKey="fillProductQty"/>
-+        <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.miniQtyConfigSetting}}" stepKey="uncheckMiniQtyCheckBox"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.miniQtyAllowedInCart}}" userInput="1" stepKey="fillMiniAllowedQty"/>
-+        <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.maxiQtyConfigSetting}}" stepKey="uncheckMaxQtyCheckBox"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.maxiQtyAllowedInCart}}" userInput="10000" stepKey="fillMaxAllowedQty"/>
-+        <selectOption  selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimals}}" userInput="Yes" stepKey="selectQuatityUsesDecimal"/>
-+        <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.notifyBelowQtyConfigSetting}}" stepKey="uncheckNotifyBelowQtyheckBox"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.notifyBelowQty}}" userInput="1" stepKey="fillNotifyBelowQty"/>
-+        <selectOption selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryStockStatus}}" userInput="In Stock" stepKey="selectOutOfStock"/>
-+        <click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
-+        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}"  stepKey="clickOnSaveButton"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-+        <!--Verify product is visible in category front page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="openCategoryStoreFrontPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeCategoryInFrontPage"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="clickOnCategory"/>
-+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="seeProductNameInCategoryPage"/>
-+        <!--Verify Product In Store Front-->
-+        <amOnPage url="$$createSimpleProduct.name$$.html" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForProductFrontPageToLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="seeProductNameInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{SimpleProduct.price}}" stepKey="seeProductPriceInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{SimpleProduct.sku}}" stepKey="seeProductSkuInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStatusInStoreFront"/>
-+        <!--Add Product to the cart-->
-+        <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="1" stepKey="fillProductQuantity"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="clickOnAddToCartButton"/>
-+        <waitForPageLoad stepKey="waitForProductToAddInCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+        <seeElement selector="{{StorefrontProductPageSection.successMsg}}" stepKey="seeSuccessSaveMessage"/>
-+        <seeElement selector="{{StorefrontMinicartSection.quantity(1)}}" stepKey="seeAddedProductQuantityInCart"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{SimpleProduct.name}}"  stepKey="seeProductNameInMiniCart"/>
-+        <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{SimpleProduct.price}}" stepKey="seeProductPriceInMiniCart"/>
-+        <seeElement selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="seeCheckOutButtonInMiniCart"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest.xml
-index 902f51c4a15..545e7c10379 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest.xml
-@@ -5,11 +5,11 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminApplyTierPriceToProductTest">
-         <annotations>
--            <features value="Apply tier price to a product"/>
-+            <features value="Catalog"/>
-+            <stories value="Apply tier price to a product"/>
-             <title value="You should be able to apply tier price to a product."/>
-             <description value="You should be able to apply tier price to a product."/>
-             <severity value="CRITICAL"/>
-@@ -235,9 +235,10 @@
-         <scrollToTopOfPage stepKey="scrollToTopOfPage5"/>
-         <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton5"/>
-         <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceDeleteButton}}" stepKey="waitForcustomerGroupPriceDeleteButton"/>
--        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceDeleteButton}}" stepKey="deleteFirstRowOfCustomerGroupPrice"/>
--        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceDeleteButton}}" stepKey="deleteSecondRowOfCustomerGroupPrice"/>
--        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton5"/>
-+        <scrollTo selector="(//*[contains(@class, 'product_form_product_form_advanced_pricing_modal')]//tr//button[@data-action='remove_row'])[1]" x="30" y="0" stepKey="scrollToDeleteFirstRowOfCustomerGroupPrice" />
-+        <click selector="(//tr//button[@data-action='remove_row'])[1]" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="deleteFirstRowOfCustomerGroupPrice"/>
-+        <click selector="//tr//button[@data-action='remove_row']" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="deleteSecondRowOfCustomerGroupPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="clickDoneButton5"/>
-         <actionGroup ref="saveProductForm" stepKey="saveProduct5"/>
-         <scrollToTopOfPage stepKey="scrollToTopOfPage6"/>
-         <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton6"/>
-@@ -268,4 +269,56 @@
-             <actualResult type="variable">grabTextFromMiniCartSubtotalField2</actualResult>
-         </assertEquals>
-     </test>
-+    <test name="AdminApplyTierPriceToProductWithPercentageDiscountTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="MC-5517 - System tries to save 0 in Advanced Pricing which is invalid for Discount field"/>
-+            <title value="You should be able to apply tier price to a product with float percent discount."/>
-+            <description value="You should be able to apply tier price to a product with float percent discount."/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MAGETWO-96881"/>
-+            <group value="product"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">100</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+            <waitForPageLoad time="30" stepKey="waitForProductIndexPageLoad"/>
-+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
-+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-+        </after>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>
-+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupAllGroupsQty1PriceDiscountAndpercent"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="1" stepKey="fillProductTierPriceQtyInput"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceValueTypeSelect('0')}}" userInput="Discount" stepKey="selectProductTierPriceValueType"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('0')}}" userInput="0.1" stepKey="selectProductTierPricePriceInput"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.sku$$)}}" stepKey="goProductPageOnStorefront"/>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
-+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('99.90')}}" stepKey="assertProductFinalPriceProductPage"/>
-+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceProductPage"/>
-+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmountProductPage"/>
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage"/>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
-+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('99.90')}}" stepKey="assertProductFinalPriceCategoryPage"/>
-+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabelCategoryPage"/>
-+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmountCategoryPage"/>
-+    </test>
- </tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml
-index aed667db1f7..4261721d360 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAssignProductAttributeToAttributeSetTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml
-new file mode 100644
-index 00000000000..88c524eff38
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml
-@@ -0,0 +1,53 @@
-+<?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="AdminBackorderAllowedAddProductToCartTest">
-+        <annotations>
-+            <stories value="Manage products"/>
-+            <title value="Add Product to Cart, Backorder Allowed"/>
-+            <description value="Customer should be able to add products to cart when that products quantity is zero"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11063"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Create a product that is "In Stock" but has quantity zero -->
-+            <createData entity="SimpleProductInStockQuantityZero" stepKey="createProduct"/>
-+
-+            <!-- Configure Magento to show out of stock products and to allow backorders -->
-+            <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockEnable.path}} {{CatalogInventoryOptionsShowOutOfStockEnable.value}}" stepKey="setConfigShowOutOfStockTrue"/>
-+            <magentoCLI command="config:set {{CatalogInventoryItemOptionsBackordersEnable.path}} {{CatalogInventoryItemOptionsBackordersEnable.value}}" stepKey="setConfigAllowBackordersTrue"/>
-+        </before>
-+
-+        <after>
-+            <!-- Set Magento back to default configuration -->
-+            <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
-+            <magentoCLI command="config:set {{CatalogInventoryItemOptionsBackordersDisable.path}} {{CatalogInventoryItemOptionsBackordersDisable.value}}" stepKey="setConfigAllowBackordersFalse"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+        </after>
-+
-+        <!-- Go to the storefront and add the product to the cart -->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="gotoAndAddProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Go to the cart page and verify we see the product -->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="gotoCart"/>
-+        <waitForPageLoad stepKey="waitForCartLoad"/>
-+        <actionGroup ref="AssertStorefrontCheckoutCartItemsActionGroup" stepKey="assertProductItemInCheckOutCart">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+            <argument name="productSku" value="$$createProduct.sku$$"/>
-+            <argument name="productPrice" value="$$createProduct.price$$"/>
-+            <argument name="subtotal" value="$$createProduct.price$$" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..a51df86d032
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminCatalogCategoriesNavigateMenuTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin catalog categories navigate menu test"/>
-+            <description value="Admin should be able to navigate to Catalog > Categories"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14131"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCategoriesPage">
-+            <argument name="menuUiId" value="{{AdminMenuCatalog.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuCatalogCategories.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuCatalogCategories.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..1d9400bf81e
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminCatalogProductsNavigateMenuTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin catalog products navigate menu test"/>
-+            <description value="Admin should be able to navigate to Catalog > Products"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14130"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCatalogProductsPage">
-+            <argument name="menuUiId" value="{{AdminMenuCatalog.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuCatalogProducts.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuCatalogProducts.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml
-new file mode 100644
-index 00000000000..bcfab6ccfdf
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml
-@@ -0,0 +1,66 @@
-+<?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="AdminChangeProductAttributeSet">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="The required product attribute is not displayed when change attribute set"/>
-+            <title value="Attributes from the selected attribute set should be shown"/>
-+            <description value="Attributes from the selected attribute set should be shown"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-98452"/>
-+            <useCaseId value="MAGETWO-98357"/>
-+            <group value="catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createProductAttributeOption1">
-+                <requiredEntity createDataKey="createProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createProductAttributeOption2">
-+                <requiredEntity createDataKey="createProductAttribute"/>
-+            </createData>
-+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$$createAttributeSet.attribute_set_id$$/" stepKey="onAttributeSetEdit"/>
-+            <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
-+                <argument name="group" value="Product Details"/>
-+                <argument name="attribute" value="$$createProductAttribute.attribute_code$$"/>
-+            </actionGroup>
-+            <actionGroup ref="SaveAttributeSet" stepKey="SaveAttributeSet"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
-+            <deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
-+            <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
-+        </after>
-+
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
-+        <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="$$createAttributeSet.attribute_set_name$$" stepKey="searchForAttrSet"/>
-+        <click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet"/>
-+
-+        <waitForText userInput="$$createProductAttribute.default_frontend_label$$" stepKey="seeAttributeInForm"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
-new file mode 100644
-index 00000000000..86978a4121a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
-@@ -0,0 +1,180 @@
-+<?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="AdminCheckConfigurableProductPriceWithDisabledChildProductTest">
-+        <annotations>
-+            <stories value="Configurable Product"/>
-+            <title value="Check Price for Configurable Product when One Child is Disabled, Others are Enabled"/>
-+            <description value="Login as admin and check the configurable product price when one child product is disabled "/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13749"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+
-+            <!-- Create Default Category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create an attribute with three options to be used in the first child product -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOption3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Add the attribute just created to default attribute set -->
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Get the first option of the attribute created -->
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Get the second option of the attribute created -->
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Get the third option of the attribute created -->
-+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOption3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create Configurable product -->
-+            <createData entity="BaseConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Create a simple product and give it the attribute with the first option -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <field key="price">10.00</field>
-+            </createData>
-+
-+            <!--Create a simple product and give it the attribute with the second option -->
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+                <field key="price">20.00</field>
-+            </createData>
-+
-+            <!--Create a simple product and give it the attribute with the Third option -->
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
-+                <field key="price">30.00</field>
-+            </createData>
-+
-+            <!-- Create the configurable product -->
-+            <createData entity="ConfigurableProductThreeOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
-+            </createData>
-+
-+            <!-- Add the first simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+
-+            <!-- Add the second simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+
-+            <!-- Add the third simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild3">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct3"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete Created Data -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteConfigChildProduct3"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteAttribute"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Open Product in Store Front Page -->
-+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="openProductInStoreFront"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+
-+        <!-- Verify category,Configurable product and initial price -->
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryInFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigChildProduct1.price$$" stepKey="seeInitialPriceInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createConfigProduct.sku$$" stepKey="seeProductSkuInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStatusInStoreFront"/>
-+
-+        <!-- Verify First Child Product attribute option is displayed -->
-+        <see selector="{{StorefrontProductInfoMainSection.productOptionSelect($$createConfigProductAttribute.default_value$$)}}" userInput="$$getConfigAttributeOption1.label$$" stepKey="seeOption1"/>
-+
-+        <!-- Select product Attribute option1, option2 and option3 and verify changes in the price -->
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect($$createConfigProductAttribute.default_value$$)}}" userInput="$$getConfigAttributeOption1.label$$" stepKey="selectOption1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigChildProduct1.price$$" stepKey="seeChildProduct1PriceInStoreFront"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect($$createConfigProductAttribute.default_value$$)}}"  userInput="$$getConfigAttributeOption2.label$$" stepKey="selectOption2"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigChildProduct2.price$$" stepKey="seeChildProduct2PriceInStoreFront"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect($$createConfigProductAttribute.default_value$$)}}"  userInput="$$getConfigAttributeOption3.label$$" stepKey="selectOption3"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigChildProduct3.price$$" stepKey="seeChildProduct3PriceInStoreFront"/>
-+
-+        <!-- Open Product Index Page and Filter First Child product  -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProduct">
-+            <argument name="product" value="ApiSimpleOne"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="selectFirstRow"/>
-+        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
-+
-+        <!-- Disable the product -->
-+        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="disableProduct"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}"  stepKey="clickOnSaveButton"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-+
-+        <!-- Open Product Store Front Page -->
-+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="openProductInStoreFront1"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad1"/>
-+
-+        <!-- Verify category,configurable product and updated price -->
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryInFrontPage1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInStoreFront1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigChildProduct2.price$$" stepKey="seeUpdatedProductPriceInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createConfigProduct.sku$$" stepKey="seeProductSkuInStoreFront1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStatusInStoreFront1"/>
-+
-+        <!-- Verify product Attribute Option1 is not displayed  -->
-+        <dontSee selector="{{StorefrontProductInfoMainSection.productOptionSelect($$createConfigProductAttribute.default_value$$)}}" userInput="$$getConfigAttributeOption1.label$$" stepKey="dontSeeOption1"/>
-+
-+        <!--Select product Attribute option2 and option3 and verify changes in the price -->
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect($$createConfigProductAttribute.default_value$$)}}"  userInput="$$getConfigAttributeOption2.label$$" stepKey="selectTheOption2"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigChildProduct2.price$$" stepKey="seeSecondChildProductPriceInStoreFront"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect($$createConfigProductAttribute.default_value$$)}}"  userInput="$$getConfigAttributeOption3.label$$" stepKey="selectTheOption3"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigChildProduct3.price$$" stepKey="seeThirdProductPriceInStoreFront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithOutOfStockChildProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithOutOfStockChildProductTest.xml
-new file mode 100644
-index 00000000000..8d41b276334
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithOutOfStockChildProductTest.xml
-@@ -0,0 +1,25 @@
-+<?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="AdminCheckConfigurableProductPriceWithOutOfStockChildProductTest" extends="AdminCheckConfigurableProductPriceWithDisabledChildProductTest">
-+        <annotations>
-+            <stories value="Configurable Product"/>
-+            <title value="Check Price for Configurable Product when Child is Out of Stock"/>
-+            <description value="Login as admin and check the configurable product price when one child product is out of stock "/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13750"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <scrollTo selector="{{AdminProductFormSection.productQuantity}}" stepKey="scrollToProductQuantity" after="waitForProductPageToLoad"/>
-+        <remove keyForRemoval="disableProduct"/>
-+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="Out of Stock" stepKey="selectOutOfStock" after="scrollToProductQuantity"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
-new file mode 100644
-index 00000000000..fd22142fcb0
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
-@@ -0,0 +1,53 @@
-+<?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="AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest">
-+        <annotations>
-+            <stories value="Create category"/>
-+            <title value="Inactive Category and subcategory are not visible on navigation menu, Include in Menu = No"/>
-+            <description value="Login as admin and verify inactive and inactive include in menu category and subcategory is not visible in navigation menu"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13638"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!--Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <!--Create Parent Inactive and Not Include In Menu Category -->
-+            <createData entity="CatInactiveNotInMenu" stepKey="createCategory"/>
-+        </before>
-+
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Open Category Page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <!--Create subcategory under parent category -->
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+        <!-- Verify Parent Category and Sub category is not visible in navigation menu -->
-+        <amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="dontSeeCategoryOnStoreNavigationBar"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigation"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml
-new file mode 100644
-index 00000000000..b6c76d65772
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml
-@@ -0,0 +1,52 @@
-+<?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="AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest">
-+        <annotations>
-+            <stories value="Create category"/>
-+            <title value="Inactive Category and subcategory are not visible on navigation menu, Include in Menu = Yes"/>
-+            <description value="Login as admin and verify inactive category and subcategory is not visible in navigation menu"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13637"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!--Login as Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <!--Create Parent Inactive Category -->
-+            <createData entity="CatNotActive" stepKey="createCategory"/>
-+        </before>
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Open Category Page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <!--Create subcategory under parent category -->
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+        <!-- Verify Parent Category and Sub category is not visible in navigation menu -->
-+        <amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="dontSeeCategoryOnStoreNavigationBar"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigation"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
-new file mode 100644
-index 00000000000..c9cd9acd970
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
-@@ -0,0 +1,53 @@
-+<?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="AdminCheckInactiveIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest">
-+        <annotations>
-+            <stories value="Create category"/>
-+            <title value="Active Category and subcategory are not visible on navigation menu, Include in Menu = No"/>
-+            <description value="Login as admin and verify inactive include in menu category and subcategory is not visible in navigation menu"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13636"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!--Login as Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <!--Create inactive Include In Menu Parent Category -->
-+            <createData entity="CatNotIncludeInMenu" stepKey="createCategory"/>
-+        </before>
-+
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Open Category Page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <!--Create subcategory under parent category -->
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+        <!-- Verify Parent Category and Sub category is not visible in navigation menu -->
-+        <amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="dontSeeCategoryOnStoreNavigationBar"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigation"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsNotVisibleInCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsNotVisibleInCategoryTest.xml
-new file mode 100644
-index 00000000000..ee8b48a94b2
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsNotVisibleInCategoryTest.xml
-@@ -0,0 +1,75 @@
-+<?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="AdminCheckOutOfStockProductIsNotVisibleInCategoryTest">
-+        <annotations>
-+            <stories value="Manage products"/>
-+            <title value="Out of Stock Product is Not Visible in Category"/>
-+            <description value="Login as admin and check out of stock product is not visible in category"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11064"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <!--Create Category-->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <!--Create Simple Product-->
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete created entity -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Open Product Index Page and filter the product-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProduct">
-+            <argument name="product" value="SimpleProduct"/>
-+        </actionGroup>
-+        <!-- Update product Advanced Inventory Setting -->
-+        <click stepKey="openSelectedProduct" selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
-+        <waitForPageLoad stepKey="waitForAdvancedInventoryPageToLoad"/>
-+        <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" stepKey="uncheckConfigSetting"/>
-+        <selectOption selector="{{AdminProductFormAdvancedInventorySection.manageStock}}"  userInput="Yes" stepKey="clickOnManageStock"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryQty}}" userInput="5" stepKey="fillProductQty"/>
-+        <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.miniQtyConfigSetting}}" stepKey="uncheckMiniQtyCheckBox"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.miniQtyAllowedInCart}}" userInput="1" stepKey="fillMiniAllowedQty"/>
-+        <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.maxiQtyConfigSetting}}" stepKey="uncheckMaxQtyCheckBox"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.maxiQtyAllowedInCart}}" userInput="10000" stepKey="fillMaxAllowedQty"/>
-+        <selectOption selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimals}}" userInput="Yes" stepKey="selectQuatityUsesDecimal"/>
-+        <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.notifyBelowQtyConfigSetting}}" stepKey="uncheckNotifyBelowQtyheckBox"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.notifyBelowQty}}" userInput="1" stepKey="fillNotifyBelowQty"/>
-+        <selectOption selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryStockStatus}}" userInput="Out of Stock" stepKey="selectOutOfStock"/>
-+        <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"  stepKey="clickOnDoneButton"/>
-+        <waitForPageLoad stepKey="waitForProductPageToSave"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}"  stepKey="clickOnSaveButton"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-+        <!--Verify product is not visible in category store front page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="openCategoryStoreFrontPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeCategoryInFrontPage"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="clickOnCategory"/>
-+        <dontSee selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="dontSeeProductInCategoryPage"/>
-+        <!--Verify Product In Store Front-->
-+        <amOnPage url="$$createSimpleProduct.name$$.html" stepKey="goToProductStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageTobeLoaded"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="seeProductNameInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="Out of stock" stepKey="seeProductStatusIsOutOfStock"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml
-new file mode 100644
-index 00000000000..e1cb45be22b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml
-@@ -0,0 +1,73 @@
-+<?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="AdminCheckOutOfStockProductIsVisibleInCategoryTest">
-+        <annotations>
-+            <stories value="Manage products"/>
-+            <title value="Out of Stock Product is Visible in Category"/>
-+            <description value="Login as admin and check out of stock product is visible in category"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11067"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!--Set Display out of stock product-->
-+            <magentoCLI stepKey="setDisplayOutOfStockProduct" command="config:set cataloginventory/options/show_out_of_stock 1" />
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <!--Create Category-->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <!--Create Simple Product-->
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete created entity -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+            <magentoCLI stepKey="setDisplayOutOfStockProduct" command="config:set cataloginventory/options/show_out_of_stock 0" />
-+        </after>
-+        <!--Open Product Index Page and filter the product-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProduct">
-+            <argument name="product" value="SimpleProduct"/>
-+        </actionGroup>
-+        <!-- Update product Advanced Inventory Setting -->
-+        <click stepKey="openSelectedProduct" selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
-+        <waitForPageLoad stepKey="waitForAdvancedInventoryPageToLoad"/>
-+        <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" stepKey="uncheckConfigSetting"/>
-+        <selectOption selector="{{AdminProductFormAdvancedInventorySection.manageStock}}"  userInput="Yes" stepKey="clickOnManageStock"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryQty}}" userInput="5" stepKey="fillProductQty"/>
-+        <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.miniQtyConfigSetting}}" stepKey="uncheckMiniQtyCheckBox"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.miniQtyAllowedInCart}}" userInput="1" stepKey="fillMiniAllowedQty"/>
-+        <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.maxiQtyConfigSetting}}" stepKey="uncheckMaxQtyCheckBox"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.maxiQtyAllowedInCart}}" userInput="10000" stepKey="fillMaxAllowedQty"/>
-+        <selectOption selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimals}}" userInput="Yes" stepKey="selectQuantityUsesDecimal"/>
-+        <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.notifyBelowQtyConfigSetting}}" stepKey="uncheckNotifyBelowQtyCheckBox"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.notifyBelowQty}}" userInput="1" stepKey="fillNotifyBelowQty"/>
-+        <selectOption selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryStockStatus}}" userInput="Out of Stock" stepKey="selectOutOfStock"/>
-+        <click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
-+        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}"  stepKey="clickOnSaveButton"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-+        <!--Verify product is visible in category front page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="openCategoryStoreFrontPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeCategoryInFrontPage"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="clickOnCategory"/>
-+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="seeProductNameInCategoryPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
-new file mode 100644
-index 00000000000..f40a62c164e
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
-@@ -0,0 +1,176 @@
-+<?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="AdminCheckPaginationInStorefrontTest">
-+        <annotations>
-+            <stories value="Create flat catalog product"/>
-+            <title value="Verify that pagination works when Flat Category is enabled"/>
-+            <description value="Login as admin, create flat catalog product and check pagination"/>
-+            <testCaseId value="MC-6051"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1 "/>
-+            <magentoCLI stepKey="setFlatCatalogProduct" command="config:set catalog/frontend/flat_catalog_product 1 "/>
-+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct1"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct2"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct3"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct4"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct5"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct6"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct7"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct8"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct9"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct10"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct11"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct12"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct13"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct14"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct15"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct16"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct17"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct18"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct19"/>
-+            <createData entity="PaginationProduct" stepKey="simpleProduct20"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0" />
-+            <magentoCLI stepKey="setFlatCatalogProduct" command="config:set catalog/frontend/flat_catalog_product 0" />
-+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+            <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
-+            <deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
-+            <deleteData createDataKey="simpleProduct5" stepKey="deleteSimpleProduct5"/>
-+            <deleteData createDataKey="simpleProduct6" stepKey="deleteSimpleProduct6"/>
-+            <deleteData createDataKey="simpleProduct7" stepKey="deleteSimpleProduct7"/>
-+            <deleteData createDataKey="simpleProduct8" stepKey="deleteSimpleProduct8"/>
-+            <deleteData createDataKey="simpleProduct9" stepKey="deleteSimpleProduct9"/>
-+            <deleteData createDataKey="simpleProduct10" stepKey="deleteSimpleProduct10"/>
-+            <deleteData createDataKey="simpleProduct11" stepKey="deleteSimpleProduct11"/>
-+            <deleteData createDataKey="simpleProduct12" stepKey="deleteSimpleProduct12"/>
-+            <deleteData createDataKey="simpleProduct13" stepKey="deleteSimpleProduct13"/>
-+            <deleteData createDataKey="simpleProduct14" stepKey="deleteSimpleProduct14"/>
-+            <deleteData createDataKey="simpleProduct15" stepKey="deleteSimpleProduct15"/>
-+            <deleteData createDataKey="simpleProduct16" stepKey="deleteSimpleProduct16"/>
-+            <deleteData createDataKey="simpleProduct17" stepKey="deleteSimpleProduct17"/>
-+            <deleteData createDataKey="simpleProduct18" stepKey="deleteSimpleProduct18"/>
-+            <deleteData createDataKey="simpleProduct19" stepKey="deleteSimpleProduct19"/>
-+            <deleteData createDataKey="simpleProduct20" stepKey="deleteSimpleProduct20"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Category Page and select created category-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad0"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded2"/>
-+
-+        <!--Select Products-->
-+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
-+        <waitForPageLoad stepKey="waitForProductsToLoad"/>
-+        <scrollTo selector="{{CatalogProductsSection.resetFilter}}" stepKey="scrollToResetFilter"/>
-+        <waitForElementVisible selector="{{CatalogProductsSection.resetFilter}}" time="30" stepKey="waitForResetButtonToVisible"/>
-+        <click selector="{{CatalogProductsSection.resetFilter}}" stepKey="clickOnResetFilter"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
-+        <selectOption selector="{{AdminProductGridFilterSection.productPerPage}}" userInput="20" stepKey="selectPagePerView"/>
-+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="pagi"  stepKey="selectProduct1"/>
-+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitFroPageToLoad1"/>
-+        <see selector="{{AdminProductGridFilterSection.productCount}}" userInput="20" stepKey="seeNumberOfProductsFound"/>
-+        <click selector="{{AdminCategoryProductsGridSection.productSelectAll}}" stepKey="selectSelectAll"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForCategorySaved"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
-+        <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
-+
-+        <!--Open Category Store Front Page-->
-+        <amOnPage url="{{_defaultCategory.name}}.html" stepKey="goToStorefront"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+
-+        <!--Select 9 items per page and verify number of products displayed in each page -->
-+        <conditionalClick selector="{{StorefrontCategoryTopToolbarSection.gridMode}}" visible="true" dependentSelector="{{StorefrontCategoryTopToolbarSection.gridMode}}" stepKey="seeProductGridIsActive"/>
-+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToBottomToolbarSection"/>
-+        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="9" stepKey="selectPerPageOption"/>
-+
-+        <!--Verify number of products displayed in First Page -->
-+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage"/>
-+
-+        <!--Verify number of products displayed in Second Page -->
-+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
-+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad4"/>
-+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage"/>
-+
-+        <!--Verify number of products displayed in third  Page -->
-+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton1"/>
-+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
-+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage"/>
-+
-+        <!--Change Pages using Previous Page selector and verify number of products displayed in each page-->
-+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage"/>
-+        <click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad5"/>
-+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage1"/>
-+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage1"/>
-+        <click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage2"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad6"/>
-+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage1"/>
-+
-+        <!--Select Pages by using page Number and verify number of products displayed-->
-+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage2"/>
-+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('2')}}" stepKey="clickOnPage2"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad7"/>
-+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage2"/>
-+
-+        <!--Select Third Page using page number-->
-+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage3"/>
-+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('3')}}" stepKey="clickOnThirdPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad8"/>
-+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage2"/>
-+
-+        <!--Select First Page using page number-->
-+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage4"/>
-+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad9"/>
-+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsFirstPage2"/>
-+
-+        <!--Select 15 items per page and verify number of products displayed in each page -->
-+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage"/>
-+        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="15" stepKey="selectPerPageOption1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad10"/>
-+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="15" stepKey="seeNumberOfProductsInFirstPage3"/>
-+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton2"/>
-+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage2"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad11"/>
-+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="5" stepKey="seeNumberOfProductsInSecondPage3"/>
-+
-+        <!--Select First Page using page number-->
-+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="scrollToPreviousPage5"/>
-+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage2"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad13"/>
-+
-+        <!--Select 30 items per page  and verify number of products displayed in each page -->
-+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage4"/>
-+        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="30" stepKey="selectPerPageOption2"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad12"/>
-+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="20" stepKey="seeNumberOfProductsInFirstPage4"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckSubCategoryIsNotVisibleInNavigationMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckSubCategoryIsNotVisibleInNavigationMenuTest.xml
-new file mode 100644
-index 00000000000..f5872ac3efc
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckSubCategoryIsNotVisibleInNavigationMenuTest.xml
-@@ -0,0 +1,52 @@
-+<?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="AdminCheckSubCategoryIsNotVisibleInNavigationMenuTest">
-+        <annotations>
-+            <stories value="Create category"/>
-+            <title value="Active category is visible on navigation menu while subcategory is not visible on navigation menu, Include in Menu = Yes"/>
-+            <description value="Login as admin and verify subcategory is not visible in navigation menu"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13635"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!--Login as Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <!--Create Parent Category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+        </before>
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Open Category Page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <!--Create subcategory under parent category -->
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+        <!-- Verify Parent Category is visible in navigation menu and Sub category is not visible in navigation menu -->
-+        <amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryOnStoreNavigationBar"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigation"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCloneProductWithDuplicateUrlTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCloneProductWithDuplicateUrlTest.xml
-new file mode 100644
-index 00000000000..295351b00bf
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCloneProductWithDuplicateUrlTest.xml
-@@ -0,0 +1,79 @@
-+<?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="AdminCloneProductWithDuplicateUrlTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <title value="Cloning a product with duplicate URL key"/>
-+            <description value="Check product cloning with duplicate URL key"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MAGETWO-98992"/>
-+            <useCaseId value="MAGETWO-98708"/>
-+            <group value="catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create category and product-->
-+            <comment userInput="Create category and product" stepKey="commentCreateCategoryAndProduct"/>
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
-+        </before>
-+        <after>
-+            <!--Delete created data-->
-+            <comment userInput="Delete created data" stepKey="commentDeleteCreatedData"/>
-+            <actionGroup ref="deleteAllDuplicateProductUsingProductGrid" stepKey="deleteAllDuplicateProducts">
-+                <argument name="product" value="$$createSimpleProduct$$"/>
-+            </actionGroup>
-+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetFiltersIfExist"/>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-+        </after>
-+        <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToProductEditPage"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductPageLoad"/>
-+        <!--Save and duplicated the product once-->
-+        <comment userInput="Save and duplicated the product once" stepKey="commentSaveAndDuplicateProduct"/>
-+        <actionGroup ref="AdminFormSaveAndDuplicate" stepKey="saveAndDuplicateProductFormFirstTime"/>
-+        <conditionalClick selector="{{AdminProductSEOSection.sectionHeader}}" dependentSelector="{{AdminProductSEOSection.urlKeyInput}}" visible="false" stepKey="openSEOSection"/>
-+        <grabValueFrom selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="grabDuplicatedProductUrlKey"/>
-+        <assertContains expected="$$createSimpleProduct.custom_attributes[url_key]$$" actual="$grabDuplicatedProductUrlKey" stepKey="assertDuplicatedProductUrlKey"/>
-+        <assertContains expectedType="string" expected="-1" actual="$grabDuplicatedProductUrlKey" stepKey="assertDuplicatedProductUrlKey1"/>
-+        <!--Add duplicated product to the simple product-->
-+        <comment userInput="Add duplicated product to the simple product" stepKey="commentAddProduct"/>
-+        <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToSimpleProductPage"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductPageLoad1"/>
-+        <actionGroup ref="addCrossSellProductBySku" stepKey="addCrossSellProduct">
-+            <argument name="sku" value="$$createSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <actionGroup ref="addRelatedProductBySku" stepKey="addRelatedProduct">
-+            <argument name="sku" value="$$createSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <actionGroup ref="addUpSellProductBySku" stepKey="addUpSellProduct">
-+            <argument name="sku" value="$$createSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <actionGroup ref="saveProductForm" stepKey="clickSaveProduct"/>
-+        <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.sectionHeader}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" visible="false" stepKey="openProductRUSSection"/>
-+        <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedProductSku('related')}}" userInput="$$createSimpleProduct.sku$$-1" stepKey="seeRelatedProduct"/>
-+        <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedProductSku('upsell')}}" userInput="$$createSimpleProduct.sku$$-1" stepKey="seeUpSellProduct"/>
-+        <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedProductSku('crosssell')}}" userInput="$$createSimpleProduct.sku$$-1" stepKey="seeCrossSellProduct"/>
-+        <!--Save and duplicated the product second time-->
-+        <comment userInput="Save and duplicated the product second time" stepKey="commentSaveAndDuplicateProduct1"/>
-+        <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToProductEditPage1"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductPageLoad2"/>
-+        <actionGroup ref="AdminFormSaveAndDuplicate" stepKey="saveAndDuplicateProductFormSecondTime"/>
-+        <conditionalClick selector="{{AdminProductSEOSection.sectionHeader}}" dependentSelector="{{AdminProductSEOSection.urlKeyInput}}" visible="false" stepKey="openProductSEOSection"/>
-+        <waitForElementVisible selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="waitForUrlKeyField"/>
-+        <grabValueFrom selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="grabSecondDuplicatedProductUrlKey"/>
-+        <assertContains expected="$$createSimpleProduct.custom_attributes[url_key]$$" actual="$grabSecondDuplicatedProductUrlKey" stepKey="assertSecondDuplicatedProductUrlKey"/>
-+        <assertContains expectedType="string" expected="-2" actual="$grabSecondDuplicatedProductUrlKey" stepKey="assertSecondDuplicatedProductUrlKey1"/>
-+        <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.sectionHeader}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" visible="false" stepKey="openProductRUSSection1"/>
-+        <waitForElementVisible selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedProductSku('related')}}" stepKey="waitForSelectedProductSku"/>
-+        <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedProductSku('related')}}" userInput="$$createSimpleProduct.sku$$-1" stepKey="seeRelatedProductForDuplicated"/>
-+        <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedProductSku('upsell')}}" userInput="$$createSimpleProduct.sku$$-1" stepKey="seeUpSellProductForDuplicated"/>
-+        <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedProductSku('crosssell')}}" userInput="$$createSimpleProduct.sku$$-1" stepKey="seeCrossSellProductForDuplicated"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminConfigureProductImagePlaceholderTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminConfigureProductImagePlaceholderTest.xml
-new file mode 100644
-index 00000000000..4d97dee56f0
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminConfigureProductImagePlaceholderTest.xml
-@@ -0,0 +1,145 @@
-+<?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="AdminConfigureProductImagePlaceholderTest">
-+
-+        <annotations>
-+            <features value="Configuration"/>
-+            <stories value="Configure product placeholder images"/>
-+            <title value="Admin is able to configure product placeholder images"/>
-+            <description value="Admin should be able to configure the images used for product image placeholders. The configured placeholders should be seen on the frontend when an image has no image."/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-5005"/>
-+            <group value="configuration"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="ApiCategory" stepKey="category"/>
-+            <!--Create product with no images-->
-+            <createData entity="ApiSimpleProduct" stepKey="productNoImages">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <!--Create product with small, base, and thumbnail image-->
-+            <createData entity="ApiSimpleProduct" stepKey="productWithImages">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="productImage">
-+                <requiredEntity createDataKey="productWithImages"/>
-+            </createData>
-+        </before>
-+
-+        <after>
-+            <!--Unset product image placeholders-->
-+            <amOnPage url="{{CatalogConfigPage.url}}" stepKey="goToCatalogConfigurationPageAfter"/>
-+            <waitForPageLoad stepKey="waitForConfigurationPageLoadAfter"/>
-+            <conditionalClick selector="{{AdminProductImagePlaceholderConfigSection.sectionHeader}}" dependentSelector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" visible="false" stepKey="openPlaceholderSectionAfter"/>
-+            <waitForElementVisible selector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" stepKey="waitForPlaceholderSectionOpenAfter"/>
-+            <!--Delete base placeholder-->
-+            <checkOption selector="{{AdminProductImagePlaceholderConfigSection.baseImageDelete}}" stepKey="checkDeleteBasePlaceholder"/>
-+            <!--Delete small placeholder-->
-+            <checkOption selector="{{AdminProductImagePlaceholderConfigSection.smallImageDelete}}" stepKey="checkDeleteSmallPlaceholder"/>
-+            <!--Delete thumbnail placeholder-->
-+            <checkOption selector="{{AdminProductImagePlaceholderConfigSection.thumbnailImageDelete}}" stepKey="checkDeleteThumbnailPlaceholder"/>
-+            <!--Save config to delete placeholders-->
-+            <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigWithPlaceholders"/>
-+            <!--See placeholders are empty-->
-+            <conditionalClick selector="{{AdminProductImagePlaceholderConfigSection.sectionHeader}}" dependentSelector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" visible="false" stepKey="openPlaceholderSection2"/>
-+            <waitForElementVisible selector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" stepKey="waitForPlaceholderSectionOpen2"/>
-+            <dontSeeElement selector="{{AdminProductImagePlaceholderConfigSection.baseImage}}" stepKey="dontSeeBaseImageSet"/>
-+            <dontSeeElement selector="{{AdminProductImagePlaceholderConfigSection.smallImage}}" stepKey="dontSeeSmallImageSet"/>
-+            <dontSeeElement selector="{{AdminProductImagePlaceholderConfigSection.thumbnailImage}}" stepKey="dontSeeThumbnailImageSet"/>
-+            <dontSeeElement selector="{{AdminProductImagePlaceholderConfigSection.swatchImage}}" stepKey="dontSeeSwatchImageSet"/>
-+
-+            <!--Delete prerequisite entities-->
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="productNoImages" stepKey="deleteProductNoImages"/>
-+            <deleteData createDataKey="productWithImages" stepKey="deleteProductWithImages"/>
-+        </after>
-+        
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
-+        
-+        <!--Admin area: configure Product Image Placeholders-->
-+        <comment userInput="Configure product image placeholders in store config" stepKey="configurePlaceholderComment"/>
-+        <amOnPage url="{{CatalogConfigPage.url}}" stepKey="goToCatalogConfigurationPage"/>
-+        <waitForPageLoad stepKey="waitForConfigurationPageLoad1"/>
-+        <conditionalClick selector="{{AdminProductImagePlaceholderConfigSection.sectionHeader}}" dependentSelector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" visible="false" stepKey="openPlaceholderSection1"/>
-+        <waitForElementVisible selector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" stepKey="waitForPlaceholderSectionOpen1"/>
-+        <!--Set base placeholder-->
-+        <attachFile selector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" userInput="{{placeholderBaseImage.file}}" stepKey="uploadBasePlaceholder"/>
-+        <!--Set small placeholder-->
-+        <attachFile selector="{{AdminProductImagePlaceholderConfigSection.smallImageInput}}" userInput="{{placeholderSmallImage.file}}" stepKey="uploadSmallPlaceholder"/>
-+        <!--Set thumbnail placeholder-->
-+        <attachFile selector="{{AdminProductImagePlaceholderConfigSection.thumbnailImageInput}}" userInput="{{placeholderThumbnailImage.file}}" stepKey="uploadThumbnailPlaceholder"/>
-+        <!--Save config with placeholders-->
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigWithPlaceholders"/>
-+        <!--See images are saved-->
-+        <conditionalClick selector="{{AdminProductImagePlaceholderConfigSection.sectionHeader}}" dependentSelector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" visible="false" stepKey="openPlaceholderSection2"/>
-+        <waitForElementVisible selector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" stepKey="waitForPlaceholderSectionOpen2"/>
-+        <seeElement selector="{{AdminProductImagePlaceholderConfigSection.baseImageBySrc(placeholderBaseImage.name)}}" stepKey="seeBasePlaceholderSet"/>
-+        <seeElement selector="{{AdminProductImagePlaceholderConfigSection.smallImageBySrc(placeholderSmallImage.name)}}" stepKey="seeSmallPlaceholderSet"/>
-+        <seeElement selector="{{AdminProductImagePlaceholderConfigSection.thumbnailImageBySrc(placeholderThumbnailImage.name)}}" stepKey="seeThumbnailPlaceholderSet"/>
-+        <dontSeeElement selector="{{AdminProductImagePlaceholderConfigSection.swatchImage}}" stepKey="dontSeeSwatchImageSet"/>
-+
-+        <!--See correct placeholder images on category page-->
-+        <comment userInput="Check placeholder images on the storefront" stepKey="checkStorefrontComment"/>
-+        <amOnPage url="$$category.name$$.html" stepKey="goToCategoryStorefront1"/>
-+        <waitForPageLoad stepKey="waitForStorefrontCategory1"/>
-+        <!--Product with no images uses placeholder-->
-+        <seeElement selector="{{StorefrontCategoryProductSection.ProductImageByName($$productNoImages.name$$)}}" stepKey="seeProductNoImagesInCategory"/>
-+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$productNoImages.name$$)}}" userInput="src" stepKey="getSmallPlaceholderImageSrc"/>
-+        <assertContains stepKey="checkSmallPlaceholderImage">
-+            <actualResult type="variable">$getSmallPlaceholderImageSrc</actualResult>
-+            <expectedResult type="string">{{placeholderSmallImage.name}}</expectedResult>
-+        </assertContains>
-+        <!--Product with images does not use placeholder-->
-+        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName($$productWithImages.name$$)}}" stepKey="seeProductWithImagesInCategory"/>
-+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$productWithImages.name$$)}}" userInput="src" stepKey="getSmallNonPlaceholderImageSrc"/>
-+        <assertNotContains stepKey="checkSmallPlaceholderImageNotUsed">
-+            <actualResult type="variable">$getSmallNonPlaceholderImageSrc</actualResult>
-+            <expectedResult type="string">{{placeholderSmallImage.name}}</expectedResult>
-+        </assertNotContains>
-+
-+        <!--Check base image on product page-->
-+        <!--Product which is using placeholder-->
-+        <click selector="{{StorefrontCategoryProductSection.ProductImageByName($$productNoImages.name$$)}}" stepKey="goToProductNoImages"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad1"/>
-+        <seeInCurrentUrl url="$$productNoImages.sku$$" stepKey="seeCorrectProductPage1"/>
-+        <seeElement selector="{{StorefrontProductMediaSection.imageFile(placeholderBaseImage.name)}}" stepKey="seeBasePlaceholderImage"/>
-+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addProductToCart1"/>
-+        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" stepKey="waitForProductAdded1"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniCart1"/>
-+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$productNoImages.name$$)}}" userInput="src" stepKey="getThumbnailPlaceholderImageSrc"/>
-+        <assertContains stepKey="checkThumbnailPlaceholderImage">
-+            <actualResult type="variable">$getThumbnailPlaceholderImageSrc</actualResult>
-+            <expectedResult type="string">{{placeholderThumbnailImage.name}}</expectedResult>
-+        </assertContains>
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProductFromCart1">
-+            <argument name="productName" value="$$productNoImages.name$$"/>
-+        </actionGroup>
-+        <!--Product which is NOT using placeholder-->
-+        <amOnPage url="$$category.name$$.html" stepKey="goToCategoryStorefront2"/>
-+        <waitForPageLoad stepKey="waitForStorefrontCategory2"/>
-+        <click selector="{{StorefrontCategoryProductSection.ProductImageByName($$productWithImages.name$$)}}" stepKey="goToProductWithImages"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
-+        <seeInCurrentUrl url="$$productWithImages.sku$$" stepKey="seeCorrectProductPage2"/>
-+        <dontSeeElement selector="{{StorefrontProductMediaSection.imageFile(placeholderBaseImage.name)}}" stepKey="dontSeeBasePlaceholderImage"/>
-+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addProductToCart2"/>
-+        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" stepKey="waitForProductAdded2"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniCart2"/>
-+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$productWithImages.name$$)}}" userInput="src" stepKey="getThumbnailImageSrc"/>
-+        <assertNotContains stepKey="checkThumbnailImage">
-+            <actualResult type="variable">$getThumbnailImageSrc</actualResult>
-+            <expectedResult type="string">{{placeholderThumbnailImage.name}}</expectedResult>
-+        </assertNotContains>
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProductFromCart2">
-+            <argument name="productName" value="$$productWithImages.name$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndEditSimpleProductSettingsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndEditSimpleProductSettingsTest.xml
-new file mode 100644
-index 00000000000..e3b0ae37463
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndEditSimpleProductSettingsTest.xml
-@@ -0,0 +1,136 @@
-+<?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="AdminCreateAndEditSimpleProductSettingsTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create/Edit simple product in Admin"/>
-+            <title value="Admin should be able to set/edit other product information when creating/editing a simple product"/>
-+            <description value="Admin should be able to set/edit product information when creating/editing a simple product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3241"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create related products -->
-+            <createData entity="SimpleProduct2" stepKey="createFirstRelatedProduct"/>
-+            <createData entity="SimpleProduct2" stepKey="createSecondRelatedProduct"/>
-+            <createData entity="SimpleProduct2" stepKey="createThirdRelatedProduct"/>
-+        </before>
-+        <after>
-+            <!-- Delete related products -->
-+            <deleteData createDataKey="createFirstRelatedProduct" stepKey="deleteFirstRelatedProduct"/>
-+            <deleteData createDataKey="createSecondRelatedProduct" stepKey="deleteSecondRelatedProduct"/>
-+            <deleteData createDataKey="createThirdRelatedProduct" stepKey="deleteThirdRelatedProduct"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create new simple product -->
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="createSimpleProduct"/>
-+
-+        <!-- Fill all main fields -->
-+        <actionGroup ref="fillMainProductForm" stepKey="fillAllNecessaryFields"/>
-+
-+        <!-- Add two related products -->
-+        <actionGroup ref="addRelatedProductBySku" stepKey="addFirstRelatedProduct">
-+            <argument name="sku" value="$$createFirstRelatedProduct.sku$$"/>
-+        </actionGroup>
-+        <actionGroup ref="addRelatedProductBySku" stepKey="addSecondRelatedProduct">
-+            <argument name="sku" value="$$createSecondRelatedProduct.sku$$"/>
-+        </actionGroup>
-+
-+        <!-- Set Design settings for the product -->
-+        <actionGroup ref="AdminSetProductDesignSettingsActionGroup" stepKey="setProductDesignSettings"/>
-+
-+        <!-- Set Gift Options settings for the product -->
-+        <actionGroup ref="AdminSwitchProductGiftMessageStatusActionGroup" stepKey="enableGiftMessageSettings">
-+            <argument name="status" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Save product form -->
-+        <actionGroup ref="saveProductForm" stepKey="clickSaveButton"/>
-+
-+        <!-- Open product page -->
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openStorefrontProductPage">
-+            <argument name="productUrl" value="{{_defaultProduct.name}}"/>
-+        </actionGroup>
-+
-+        <!-- Assert related products at the storefront -->
-+        <seeElement selector="{{StorefrontProductRelatedProductsSection.relatedProductName($$createFirstRelatedProduct.name$$)}}" stepKey="seeFirstRelatedProductInStorefront"/>
-+        <seeElement selector="{{StorefrontProductRelatedProductsSection.relatedProductName($$createSecondRelatedProduct.name$$)}}" stepKey="seeSecondRelatedProductInStorefront"/>
-+
-+        <!-- Assert product design settings "left bar is present at product page with 2 columns" -->
-+        <seeElement selector="{{StorefrontProductPageDesignSection.layoutTwoColumnsLeft}}" stepKey="seeDesignChanges"/>
-+
-+        <!-- Assert Gift Option product settings is present -->
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
-+            <argument name="product" value="_defaultProduct"/>
-+            <argument name="productCount" value="1"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openShoppingCart"/>
-+        <actionGroup ref="StorefrontAssertGiftMessageFieldsActionGroup" stepKey="assertGiftMessageFieldsArePresent"/>
-+
-+        <!-- Open created product -->
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+
-+        <!-- Edit product Search Engine Optimization settings -->
-+        <actionGroup ref="AdminChangeProductSEOSettingsActionGroup" stepKey="editProductSEOSettings">
-+            <argument name="productName" value="SimpleProduct.name"/>
-+        </actionGroup>
-+
-+        <!-- Edit related products -->
-+        <actionGroup ref="addRelatedProductBySku" stepKey="addThirdRelatedProduct">
-+            <argument name="sku" value="$$createThirdRelatedProduct.sku$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.removeRelatedProduct($$createFirstRelatedProduct.sku$$)}}" stepKey="removeFirstRelatedProduct"/>
-+
-+        <!-- Edit Design settings for the product -->
-+        <actionGroup ref="AdminSetProductDesignSettingsActionGroup" stepKey="editProductDesignSettings">
-+            <argument name="designSettings" value="simpleLumaDesign"/>
-+        </actionGroup>
-+
-+        <!-- Edit Gift Option product settings -->
-+        <actionGroup ref="AdminSwitchProductGiftMessageStatusActionGroup" stepKey="disableGiftMessageSettings"/>
-+
-+        <!-- Save product form -->
-+        <actionGroup ref="saveProductForm" stepKey="clickSaveProduct"/>
-+
-+        <!-- Verify Url Key after changing -->
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
-+            <argument name="productUrl" value="{{SimpleProduct.name}}"/>
-+        </actionGroup>
-+
-+        <!-- Assert related products at the storefront -->
-+        <seeElement selector="{{StorefrontProductRelatedProductsSection.relatedProductName($$createSecondRelatedProduct.name$$)}}" stepKey="seeSecondRelatedProduct"/>
-+        <seeElement selector="{{StorefrontProductRelatedProductsSection.relatedProductName($$createThirdRelatedProduct.name$$)}}" stepKey="seeThirdRelatedProduct"/>
-+
-+        <!-- Assert product design settings "Layout empty" -->
-+        <seeElement selector="{{StorefrontProductPageDesignSection.layoutEmpty}}" stepKey="seeNewDesignChanges"/>
-+
-+        <!-- Assert Gift Option product settings  -->
-+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
-+        <dontSeeElement selector="{{StorefrontProductCartGiftOptionSection.giftOptions}}" stepKey="dontSeeGiftOptionBtn"/>
-+
-+        <!-- Delete created simple product -->
-+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
-new file mode 100755
-index 00000000000..4deca735046
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
-@@ -0,0 +1,83 @@
-+<?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="AdminCreateSimpleProductSwitchToVirtualTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Product Type Switching"/>
-+            <title value="Admin should be able to switch a new product from simple to virtual"/>
-+            <description value="After selecting a simple product when adding Admin should be switch to virtual implicitly"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10925"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="GoToProductCatalogPage" stepKey="goToProductCatalogPage"/>
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteSimpleProduct">
-+                <argument name="product" value="_defaultProduct"/>
-+            </actionGroup>
-+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetSearch"/>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
-+        </after>
-+
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+        <!-- Open Dropdown and select simple product option -->
-+        <comment stepKey="beforeOpenProductFillForm" userInput="Selecting Product from the Add Product Dropdown"/>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm">
-+            <argument name="productType" value="simple"/>
-+        </actionGroup>
-+
-+        <!-- Fill form for Virtual Product Type -->
-+        <comment stepKey="beforeFillProductForm" userInput="Filling Product Form"/>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="SetProductUrlKey" stepKey="setProductUrl">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
-+        <!-- Check that product was added with implicit type change -->
-+        <comment stepKey="beforeVerify" userInput="Verify Product Type Assigned Correctly"/>
-+        <actionGroup ref="GoToProductCatalogPage" stepKey="goToProductCatalogPage"/>
-+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetSearch"/>
-+        <actionGroup ref="filterProductGridByName" stepKey="searchForProduct">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Virtual Product"  stepKey="seeProductTypeInGrid"/>
-+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+    </test>
-+    <test name="AdminCreateVirtualProductSwitchToSimpleTest" extends="AdminCreateSimpleProductSwitchToVirtualTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Product Type Switching"/>
-+            <title value="Admin should be able to switch a new product from virtual to simple"/>
-+            <description value="After selecting a virtual product when adding Admin should be switch to simple implicitly"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10928"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm">
-+            <argument name="productType" value="virtual"/>
-+        </actionGroup>
-+        <!-- Fill form for Virtual Product Type -->
-+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Simple Product"  stepKey="seeProductTypeInGrid"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAttributeSetEntityTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAttributeSetEntityTest.xml
-new file mode 100644
-index 00000000000..d9e410a9a30
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAttributeSetEntityTest.xml
-@@ -0,0 +1,70 @@
-+<?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="AdminCreateAttributeSetEntityTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Attribute Set"/>
-+            <title value="Create attribute set with new product attribute"/>
-+            <description value="Admin should be able to create attribute set with new product attribute"/>
-+            <testCaseId value="MC-10884"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="productAttributeWysiwyg" stepKey="createProductAttribute"/>
-+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
-+            <deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <actionGroup ref="goToAttributeSetByName" stepKey="filterProductAttributeSetGridByLabel">
-+            <argument name="name" value="$$createAttributeSet.attribute_set_name$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert created attribute in an unassigned attributes -->
-+        <see userInput="$$createProductAttribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="seeAttributeInUnassignedAttr"/>
-+
-+        <!-- Assign attribute in the group -->
-+        <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
-+            <argument name="group" value="Product Details"/>
-+            <argument name="attribute" value="$$createProductAttribute.attribute_code$$"/>
-+        </actionGroup>
-+        <see userInput="$$createProductAttribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="seeAttributeInGroup"/>
-+        <actionGroup ref="SaveAttributeSet" stepKey="SaveAttributeSet"/>
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets2"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+
-+        <!-- Assert an attribute in the group-->
-+        <actionGroup ref="goToAttributeSetByName" stepKey="filterProductAttributeSetGridByLabel2">
-+            <argument name="name" value="$$createAttributeSet.attribute_set_name$$"/>
-+        </actionGroup>
-+        <see userInput="$$createProductAttribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="seeAttributeInGroup2"/>
-+
-+        <!-- Assert attribute can be used in product creation -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
-+        <waitForPageLoad stepKey="waitForPageLoad3"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
-+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
-+
-+        <!-- Switch from default attribute set to new attribute set -->
-+        <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
-+        <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="$$createAttributeSet.attribute_set_name$$" stepKey="searchForAttrSet"/>
-+        <click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet"/>
-+
-+        <!-- See new attribute set -->
-+        <see selector="{{AdminProductFormSection.attributeSet}}" userInput="$$createAttributeSet.attribute_set_name$$" stepKey="seeAttributeSetName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
-index d5483f772f0..a5150a0fb7f 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
-@@ -7,11 +7,12 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateCategoryFromProductPageTest">
-         <annotations>
-             <features value="Catalog"/>
-             <stories value="Create/Edit Category in Admin"/>
-+            <title value="Admin should be able to create category from the product page"/>
-             <description value="Admin should be able to create category from the product page" />
-             <severity value="AVERAGE"/>
-             <testCaseId value="MC-234"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
-index 7e3e2cd918f..15171fe3713 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateCategoryTest">
-         <annotations>
-             <features value="Catalog"/>
-@@ -69,4 +69,35 @@
-         <waitForElementVisible selector="{{CategoryDesignSection.LayoutDropdown}}" stepKey="waitForLayoutDropDown" />
-         <seeOptionIsSelected selector="{{CategoryDesignSection.LayoutDropdown}}" userInput="2 columns with right bar" stepKey="see2ColumnsSelected" />
-     </test>
-+    <test name="AdminCategoryFormDisplaySettingsUIValidationTest">
-+    <annotations>
-+        <features value="Catalog"/>
-+        <stories value="Default layout configuration MAGETWO-88793"/>
-+        <title value="Category should not be saved once layered navigation price step field is left empty"/>
-+        <description value="Once the Config setting is unchecked Category should not be saved with layered navigation price field left empty"/>
-+        <severity value="AVERAGE"/>
-+        <testCaseId value="MAGETWO-95797"/>
-+        <group value="category"/>
-+    </annotations>
-+    <before>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+    </before>
-+    <after>
-+        <actionGroup ref="logout" stepKey="logout"/>
-+    </after>
-+    <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
-+    <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
-+    <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
-+    <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="enterCategoryName"/>
-+    <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="clickOnDisplaySettingsTab"/>
-+     <waitForElementVisible selector="{{CategoryDisplaySettingsSection.filterPriceRangeUseConfig}}" stepKey="wait"/>
-+    <scrollTo selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceInput}}" stepKey="scrollToLayeredNavigationField"/>
-+    <uncheckOption selector="{{CategoryDisplaySettingsSection.filterPriceRangeUseConfig}}" stepKey="uncheckConfigSetting"/>
-+    <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
-+    <see selector="{{AdminCategoryBasicFieldSection.FieldError('uid')}}" userInput="This is a required field." stepKey="seeErrorMessage"/>
-+    <!-- Verify that the Layered navigation price step field has the required indicator -->
-+    <comment userInput="Check if Layered navigation price field has required indicator icon" stepKey="comment" />
-+    <executeJS function="{{CategoryDisplaySettingsSection.RequiredFieldIndicator('filter_price_range')}}" stepKey="getRequiredFieldIndicator"/>
-+    <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="getRequiredFieldIndicator" message="pass" stepKey="assertRequiredFieldIndicator1"/>
-+    </test>
- </tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
-new file mode 100644
-index 00000000000..9115004ad95
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
-@@ -0,0 +1,75 @@
-+<?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="AdminCreateCategoryWithAnchorFieldTest">
-+        <annotations>
-+            <stories value="Create categories"/>
-+            <title value="Create anchor subcategory with all fields"/>
-+            <description value="Login as admin and create anchor subcategory with all fields"/>
-+            <testCaseId value="MC-5267"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="_defaultBlock" stepKey="createDefaultCMSBlock"/>
-+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct" />
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+            <deleteData createDataKey="createDefaultCMSBlock" stepKey="deleteDefaultCMSBlock"/>
-+            <deleteData stepKey="deleteSimpleProduct" createDataKey="simpleProduct"/>
-+        </after>
-+        <!--Create  SubCategory-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-+        <!--Select Content and fill the options-->
-+        <scrollTo  selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent"/>
-+        <click selector="{{AdminCategoryContentSection.sectionHeader}}"  stepKey="selectContent"/>
-+        <scrollTo selector="{{AdminCategoryContentSection.AddCMSBlock}}" x="0" y="-80" stepKey="scrollToAddCMSBlock"/>
-+        <selectOption selector="{{AdminCategoryContentSection.AddCMSBlock}}" userInput="$$createDefaultCMSBlock.title$$" stepKey="selectCMSBlock"/>
-+        <!--Select Display Setting and fill the options-->
-+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
-+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
-+        <selectOption selector="{{CategoryDisplaySettingsSection.displayMode}}" userInput="PRODUCTS_AND_PAGE" stepKey="selectdisplayMode"/>
-+        <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor"/>
-+        <click selector="{{CategoryDisplaySettingsSection.productListCheckBox}}" stepKey="enableTheAvailableProductList"/>
-+        <selectOption selector="{{CategoryDisplaySettingsSection.productList}}" parameterArray="['Position', 'Product Name', 'Price']" stepKey="selectPrice"/>
-+        <scrollTo selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" x="0" y="-80" stepKey="scrollToDefaultProductList"/>
-+        <click selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" stepKey="enableTheDefaultProductList"/>
-+        <selectOption selector="{{CategoryDisplaySettingsSection.defaultProductList}}" userInput="name" stepKey="selectProductName"/>
-+        <scrollTo selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceCheckBox}}" x="0" y="-80" stepKey="scrollToLayeredNavPrice"/>
-+        <click selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceCheckBox}}" stepKey="enableLayeredNavigationPrice"/>
-+        <fillField selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceInput}}" userInput="5.5" stepKey="fillThePrice"/>
-+        <!--Search the products and select the category products-->
-+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
-+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$"  stepKey="selectProduct"/>
-+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
-+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForCategorySaved"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
-+        <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
-+        <!--Verify the Category Title-->
-+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
-+        <!--Verify Product in store front page-->
-+        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name_lwr)}}"  stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+        <seeElement selector="{{StorefrontCategoryMainSection.productLinkByHref($$simpleProduct.urlKey$$)}}" stepKey="seeProductInCategory"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithCustomRootCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithCustomRootCategoryTest.xml
-new file mode 100644
-index 00000000000..e8c6da476a3
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithCustomRootCategoryTest.xml
-@@ -0,0 +1,76 @@
-+<?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="AdminCreateCategoryWithCustomRootCategoryTest">
-+        <annotations>
-+            <stories value="Create categories"/>
-+            <title value="Create category in the custom root category that is used for custom website"/>
-+            <description value="Login as admin and create a root category with nested sub category and verify category in store front "/>
-+            <testCaseId value="MC-5272"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
-+            <waitForPageLoad stepKey="waitStoreIndexPageLoad" />
-+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStore">
-+                <argument name="storeGroupName" value="customStore.name"/>
-+            </actionGroup>
-+            <actionGroup ref="DeleteCategory" stepKey="deleteCreatedNewRootCategory">
-+                <argument name="categoryEntity" value="NewRootCategory"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
-+        <!--Create Root Category-->
-+        <actionGroup ref="AdminCreateRootCategory" stepKey="createNewRootCategory">
-+            <argument name="categoryEntity" value="NewRootCategory"/>
-+        </actionGroup>
-+        <!--Create subcategory-->
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(NewRootCategory.name)}}" stepKey="clickOnCreatedNewRootCategory"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
-+        <actionGroup ref="CreateCategory" stepKey="createSubcategory">
-+            <argument name="categoryEntity" value="SimpleSubCategory"/>
-+        </actionGroup>
-+        <!--Create a Store-->
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
-+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
-+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
-+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
-+        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
-+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
-+        <!--Create a Store View-->
-+        <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="selectCreateStoreView"/>
-+        <click selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="clickDropDown"/>
-+        <selectOption userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreViewStatus"/>
-+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
-+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
-+        <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="Enabled" stepKey="enableStatus"/>
-+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreViewButton"/>
-+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
-+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
-+        <waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
-+        <!--Go to store front page-->
-+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
-+        <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
-+        <!--Verify subcategory displayed in store front page-->
-+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="selectMainWebsite"/>
-+        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}"  stepKey="selectCustomStore"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeSubCategoryInStoreFrontPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
-new file mode 100644
-index 00000000000..530bafaef24
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
-@@ -0,0 +1,86 @@
-+<?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="AdminCreateCategoryWithFiveNestingTest">
-+        <annotations>
-+            <stories value="Create categories"/>
-+            <title value="Create category with five nesting"/>
-+            <description value="Login as admin and create nested sub category and verify the subcategory displayed in store front page  "/>
-+            <testCaseId value="MC-5271"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="goToCategoryPage"/>
-+            <waitForPageLoad time="60" stepKey="waitForCategoryPageLoad"/>
-+            <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="clickCategoryLink"/>
-+            <click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="clickDelete"/>
-+            <waitForElementVisible selector="{{AdminCategoryModalSection.message}}" stepKey="waitForConfirmationModal"/>
-+            <see selector="{{AdminCategoryModalSection.message}}" userInput="Are you sure you want to delete this category?" stepKey="seeDeleteConfirmationMessage"/>
-+            <click selector="{{AdminCategoryModalSection.ok}}" stepKey="confirmDelete"/>
-+            <waitForPageLoad time="60" stepKey="waitForDeleteToFinish"/>
-+            <see selector="You deleted the category." stepKey="seeDeleteSuccess"/>
-+            <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
-+            <dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="dontSeeCategoryInTree"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Create Category with Five Nesting -->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
-+        <!--Create Nested First Category-->
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="fillFirstSubCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFirstSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSFirstSubCategorySaved"/>
-+        <!-- Verify success message -->
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
-+        <!--Create Nested Second Sub Category-->
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SecondLevelSubCat.name}}" stepKey="fillSecondSubCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSecondSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondCategory"/>
-+        <!-- Verify success message -->
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage1"/>
-+        <!--Create Nested Third Sub Category/>-->
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton2"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{ThirdLevelSubCat.name}}" stepKey="fillThirdSubCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveThirdSubCategory"/>
-+        <waitForPageLoad stepKey="waitForThirdCategorySaved"/>
-+        <!-- Verify success message -->
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage2"/>
-+        <!--Create Nested fourth Sub Category />-->
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton3"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FourthLevelSubCat.name}}" stepKey="fillFourthSubCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFourthSubCategory"/>
-+        <waitForPageLoad stepKey="waitForFourthCategorySaved"/>
-+        <!-- Verify success message -->
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage3"/>
-+        <!--Create Nested fifth Sub Category />-->
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton4"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FifthLevelCat.name}}" stepKey="fillFifthSubCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFifthLevelCategory"/>
-+        <waitForPageLoad stepKey="waitForFifthCategorySaved"/>
-+        <!-- Verify success message -->
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage4"/>
-+        <amOnPage url="/{{FirstLevelSubCat.name}}/{{SecondLevelSubCat.name}}/{{ThirdLevelSubCat.name}}/{{FourthLevelSubCat.name}}/{{FifthLevelCat.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
-+        <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
-+        <!--<Verify category displayed in store front page-->
-+        <grabMultiple selector=".breadcrumbs li"  stepKey="breadcrumbs"/>
-+        <assertEquals  stepKey="verifyTheCategoryInStoreFrontPage">
-+            <expectedResult type="array">['Home', {{FirstLevelSubCat.name}}, {{SecondLevelSubCat.name}}, {{ThirdLevelSubCat.name}}, {{FourthLevelSubCat.name}}, {{FifthLevelCat.name}} ]</expectedResult>
-+            <actualResult type="variable">breadcrumbs</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml
-new file mode 100644
-index 00000000000..96f945da138
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml
-@@ -0,0 +1,46 @@
-+<?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="AdminCreateCategoryWithInactiveCategoryTest">
-+        <annotations>
-+            <stories value="Create categories"/>
-+            <title value="Create disabled subcategory"/>
-+            <description value="Login as admin and create category with inactivated enable category option"/>
-+            <testCaseId value="MC-5268"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Create In active Category -->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableCategory"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForCategorySaved"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
-+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
-+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontCategoryIsChecked"/>
-+        <!--Verify InActive Category is created-->
-+        <seeElement  selector="{{AdminCategoryContentSection.categoryInTree(_defaultCategory.name)}}" stepKey="seeCategoryInTree" />
-+        <!--Verify Category is not listed store front page-->
-+        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}"  stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="dontSeeCategoryOnStoreFrontPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml
-new file mode 100644
-index 00000000000..c983089163f
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml
-@@ -0,0 +1,47 @@
-+<?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="AdminCreateCategoryWithInactiveIncludeInMenuTest">
-+        <annotations>
-+            <stories value="Create categories"/>
-+            <title value="Create not included in menu subcategory"/>
-+            <description value="Login as admin and create category with inactivated include in menu option"/>
-+            <testCaseId value="MC-5269"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Create Category with not included in menu Subcategory  -->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="disableIncludeInMenu"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForCategorySaved"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
-+        <waitForPageLoad stepKey="waitForPageSaved"/>
-+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
-+        <!--Verify Category is created/>-->
-+        <seeElement selector="{{AdminCategoryContentSection.activeCategoryInTree(_defaultCategory.name)}}" stepKey="seeCategoryInTree"  />
-+        <!--Verify Category in store front page menu/>-->
-+        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}"  stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="dontSeeCategoryOnNavigation"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml
-new file mode 100644
-index 00000000000..79eec02a828
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml
-@@ -0,0 +1,88 @@
-+<?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="AdminCreateCategoryWithProductsGridFilter">
-+        <annotations>
-+            <stories value="Create categories"/>
-+            <title value="Apply category products grid filter"/>
-+            <description value="Login as admin and create default product and product with grid filter"/>
-+            <testCaseId value="MC-5273"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct1">
-+                <argument name="product" value="defaultSimpleProduct"/>
-+            </actionGroup>
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct2">
-+                <argument name="product" value="SimpleProduct"/>
-+            </actionGroup>
-+            <actionGroup ref="NavigateToAndResetProductGridToDefaultView" stepKey="NavigateToAndResetProductGridToDefaultView"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-+        <waitForPageLoad stepKey="waitForProductList"/>
-+        <!--Create Default Product-->
-+        <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickAddDefaultProduct"/>
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillDefaultProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{SimpleProduct.sku}}" stepKey="fillDefaultProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{SimpleProduct.price}}" stepKey="fillDefaultProductPrice"/>
-+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="scrollToSearchEngine"/>
-+        <click selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="selectSearchEngineOptimization"/>
-+        <fillField selector="{{AdminProductFormBundleSection.urlKey}}" userInput="{{SimpleProduct.urlKey}}" stepKey="fillUrlKey"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveDefaultProduct"/>
-+        <waitForPageLoad stepKey="waitForPDefaultProductSaved"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="successMessageYouSavedTheProductIsShown"/>
-+        <!--Create product with grid filter Not Visible Individually-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="ProductList"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+        <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickAddFilterProduct"/>
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{defaultSimpleProduct.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{defaultSimpleProduct.price}}" stepKey="fillProductPrice"/>
-+        <selectOption selector="{{AdminCategoryProductsGridSection.productVisibility}}" userInput="Not Visible Individually" stepKey="selectProductVisibility"/>
-+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="scrollToSearchEngineOptimization"/>
-+        <click selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="selectSearchEngineOptimization1"/>
-+        <fillField selector="{{AdminProductFormBundleSection.urlKey}}" userInput="{{defaultSimpleProduct.urlKey}}" stepKey="fillUrlKey1"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
-+        <waitForPageLoad stepKey="waitForProductSaved"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <!--Create sub category-->
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
-+        <!--Select the default product and product with grid filter-->
-+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
-+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="{{SimpleProduct.name}}"  stepKey="selectProduct"/>
-+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
-+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromRow"/>
-+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="{{defaultSimpleProduct.name}}"  stepKey="selectDefaultProduct"/>
-+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton1"/>
-+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectDefaultProductFromTableRow"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="WaitForCategorySaved"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="successMessageYouSavedTheCategory"/>
-+        <!--Verify product with grid filter is not not visible-->
-+        <amOnPage url="{{StorefrontProductPage.url(defaultSimpleProduct.urlKey)}}" stepKey="seeOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad"/>
-+        <dontSee selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="dontSeeProductInStoreFrontPage"/>
-+        <!--Verify product in Store Front Page-->
-+        <amOnPage url="{{StorefrontProductPage.url(SimpleProduct.urlKey)}}" stepKey="seeDefaultProductPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="seeProductInStoreFrontPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml
-new file mode 100644
-index 00000000000..1b6c9707b06
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml
-@@ -0,0 +1,45 @@
-+<?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="AdminCreateCategoryWithRequiredFieldsTest">
-+        <annotations>
-+            <stories value="Create categories"/>
-+            <title value="Create Category from Category page with Required Fields Only"/>
-+            <description value="Login as an admin and create a category with required fields."/>
-+            <testCaseId value="MC-5265"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Create subcategory with required fields -->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForCategorySaved"/>
-+        <!-- Verify success message -->
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
-+        <!-- Verify subcategory created with required fields -->
-+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
-+        <seeElement selector="{{AdminCategoryContentSection.activeCategoryInTree(_defaultCategory.name)}}" stepKey="seeCategoryInTree"  />
-+        <!--Verify Category is listed in store front page menu/>-->
-+        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}"  stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
-new file mode 100644
-index 00000000000..a3f543e9cf3
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
-@@ -0,0 +1,142 @@
-+<?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="AdminCreateCustomProductAttributeWithDropdownFieldTest">
-+        <annotations>
-+            <stories value="Create product Attribute"/>
-+            <title value="Create Custom Product Attribute Dropdown Field (Not Required) from Product Page"/>
-+            <description value="login as admin and create configurable product attribute with Dropdown field"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10905"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-15474"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+
-+            <!--Create Category-->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!--Create Configurable Product-->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!--Delete created entity -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+
-+            <actionGroup ref="deleteProductAttribute" stepKey="deleteCreatedAttribute">
-+                <argument name="ProductAttribute" value="newProductAttribute"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Open Product Index Page-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-+
-+        <!-- Select Created Product-->
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
-+            <argument name="product" value="$$createConfigProduct$$"/>
-+        </actionGroup>
-+        <click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$createConfigProduct.sku$$)}}"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQty"/>
-+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="selectStockStatus"/>
-+
-+        <!-- Create New Product Attribute -->
-+        <click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickOnAddAttribute"/>
-+        <waitForPageLoad stepKey="waitForAttributePageToLoad"/>
-+        <click selector="{{AdminProductFormSection.createNewAttributeBtn}}" stepKey="clickCreateNewAttributeButton"/>
-+        <waitForPageLoad stepKey="waitForNewAttributePageToLoad"/>
-+        <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.defaultLabel}}" stepKey="waitForDefaultLabelToBeVisible"/>
-+        <fillField selector="{{AdminCreateNewProductAttributeSection.defaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillAttributeLabel"/>
-+        <selectOption selector="{{AdminCreateNewProductAttributeSection.inputType}}" userInput="Dropdown" stepKey="selectInputType"/>
-+        <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.addValue}}" stepKey="waitForAddValueButtonToVisible"/>
-+        <click selector="{{AdminCreateNewProductAttributeSection.addValue}}" stepKey="clickOnAddValueButton"/>
-+        <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.defaultStoreView('0')}}" stepKey="waitForDefaultStoreViewToVisible"/>
-+        <fillField selector="{{AdminCreateNewProductAttributeSection.defaultStoreView('0')}}" userInput="{{ProductAttributeOption8.label}}" stepKey="fillDefaultStoreView"/>
-+        <fillField selector="{{AdminCreateNewProductAttributeSection.adminOption('0')}}" userInput="{{ProductAttributeOption8.value}}" stepKey="fillAdminField"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.defaultRadioButton('1')}}" stepKey="selectRadioButton"/>
-+        <click selector="{{AdminCreateNewProductAttributeSection.advancedAttributeProperties}}" stepKey="clickOnAdvancedAttributeProperties"/>
-+        <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.attributeCode}}" stepKey="waitForAttributeCodeToVisible"/>
-+        <scrollTo selector="{{AdminCreateNewProductAttributeSection.attributeCode}}" stepKey="scrollToAttributeCode"/>
-+        <fillField selector="{{AdminCreateNewProductAttributeSection.attributeCode}}" userInput="{{newProductAttribute.attribute_code}}" stepKey="fillAttributeCode"/>
-+        <scrollTo selector="{{AdminCreateNewProductAttributeSection.isUnique}}"   stepKey="scrollToIsUniqueOption"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.isUnique}}" stepKey="enableIsUniqueOption"/>
-+        <scrollTo selector="{{AdminCreateNewProductAttributeSection.advancedAttributeProperties}}" stepKey="scrollToAdvancedAttributeProperties"/>
-+        <click selector="{{AdminCreateNewProductAttributeSection.advancedAttributeProperties}}" stepKey="clickOnAdvancedAttributeProperties1"/>
-+        <scrollTo selector="{{AdminCreateNewProductAttributeSection.storefrontProperties}}"  stepKey="scrollToStorefrontProperties"/>
-+        <click selector="{{AdminCreateNewProductAttributeSection.storefrontProperties}}" stepKey="clickOnStorefrontProperties"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontPropertiesTodiaplay"/>
-+        <scrollTo  selector="{{AdminCreateNewProductAttributeSection.sortProductListing}}" x="0" y="-80" stepKey="scroll1ToSortProductListing"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.inSearch}}" stepKey="enableInSearchOption"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.advancedSearch}}" stepKey="enableAdvancedSearch"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.isComparable}}" stepKey="enableComparableOption"/>
-+        <checkOption  selector="{{AdminCreateNewProductAttributeSection.allowHtmlTags}}" stepKey="enableAllowHtmlTags"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.visibleOnStorefront}}" stepKey="enableVisibleOnStorefront"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.sortProductListing}}" stepKey="enableSortProductListing"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+        <click selector="{{AdminCreateNewProductAttributeSection.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
-+        <waitForPageLoad stepKey="waitForAttributeToSave"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct"/>
-+        <waitForPageLoad stepKey="waitForProductToSave"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-+
-+        <!--Verify product attribute added in product form -->
-+        <scrollTo selector="{{AdminProductFormSection.contentTab}}" stepKey="scrollToContentTab"/>
-+        <waitForElementVisible selector="{{AdminProductFormSection.attributeTab}}" stepKey="waitForAttributeToVisible"/>
-+        <click selector="{{AdminProductFormSection.attributeTab}}" stepKey="clickOnAttribute"/>
-+        <seeElement selector="{{AdminProductFormSection.attributeLabelByText(ProductAttributeFrontendLabel.label)}}" stepKey="seeAttributeLabelInProductForm"/>
-+
-+        <!--Verify Product Attribute in Attribute Form -->
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{newProductAttribute.attribute_code}}" stepKey="setAttributeCode"/>
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
-+        <waitForPageLoad stepKey="waitForPageLoad" />
-+        <see selector="{{AdminProductAttributeGridSection.attributeCodeColumn}}" userInput="{{newProductAttribute.attribute_code}}" stepKey="seeAttributeCode"/>
-+        <see selector="{{AdminProductAttributeGridSection.defaultLabelColumn}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeDefaultLabel"/>
-+        <see selector="{{AdminProductAttributeGridSection.isVisibleColumn}}" userInput="Yes" stepKey="seeIsVisibleColumn"/>
-+        <see selector="{{AdminProductAttributeGridSection.isSearchableColumn}}" userInput="Yes" stepKey="seeSearchableColumn"/>
-+        <see selector="{{AdminProductAttributeGridSection.isComparableColumn}}" userInput="Yes" stepKey="seeComparableColumn"/>
-+
-+        <!--Verify Product Attribute is present in Category Store Front Page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForProductFrontPageToLoad"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="clickOnCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
-+        <waitForPageLoad  stepKey="waitForProductToLoad1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigProduct.price$$" stepKey="seeProductPriceInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createConfigProduct.sku$$" stepKey="seeProductSkuInStoreFront"/>
-+        <scrollTo selector="{{StorefrontProductMoreInformationSection.moreInformation}}" stepKey="scrollToMoreInformation"/>
-+        <see selector="{{StorefrontProductMoreInformationSection.attributeLabel}}"  userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeLabel"/>
-+        <see selector="{{StorefrontProductMoreInformationSection.attributeValue}}"  userInput="{{ProductAttributeOption8.value}}" stepKey="seeAttributeValue"/>
-+
-+        <!--Verify Product Attribute present in search page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToStorefrontPage1"/>
-+        <waitForPageLoad stepKey="waitForProductFrontPageToLoad1"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{ProductAttributeOption8.value}}" stepKey="fillAttribute"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearchResultToLoad"/>
-+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInCategoryPage"/>
-+        <see selector="{{StorefrontCategoryMainSection.productOptionList}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeProductAttributeOptionInCategoryPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeTest.xml
-new file mode 100644
-index 00000000000..525f81de6c4
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeTest.xml
-@@ -0,0 +1,72 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * 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="AdminCreateDropdownProductAttributeTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create/configure Dropdown product attribute"/>
-+            <title value="Admin should be able to create dropdown product attribute"/>
-+            <description value="Admin should be able to create dropdown product attribute"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-4982"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <!-- Remove attribute -->
-+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
-+                <argument name="ProductAttribute" value="productDropDownAttribute"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+
-+        <!-- Set attribute properties -->
-+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}"
-+                   userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
-+        <selectOption selector="{{AttributePropertiesSection.InputType}}"
-+                      userInput="{{productDropDownAttribute.frontend_input}}" stepKey="fillInputType"/>
-+
-+        <!-- Set advanced attribute properties -->
-+        <click selector="{{AdvancedAttributePropertiesSection.AdvancedAttributePropertiesSectionToggle}}"
-+               stepKey="showAdvancedAttributePropertiesSection"/>
-+        <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.AttributeCode}}"
-+                               stepKey="waitForSlideOut"/>
-+        <fillField selector="{{AdvancedAttributePropertiesSection.AttributeCode}}"
-+                   userInput="{{productDropDownAttribute.attribute_code}}"
-+                   stepKey="fillAttributeCode"/>
-+
-+        <!-- Add new attribute options -->
-+        <click selector="{{AttributeOptionsSection.AddOption}}" stepKey="clickAddOption1"/>
-+        <fillField selector="{{DropdownAttributeOptionsSection.nthOptionAdminLabel('1')}}"
-+                   userInput="Fish and Chips" stepKey="fillAdminValue1"/>
-+
-+        <click selector="{{AttributeOptionsSection.AddOption}}" stepKey="clickAddOption2"/>
-+        <fillField selector="{{DropdownAttributeOptionsSection.nthOptionAdminLabel('2')}}"
-+                   userInput="Fish &amp; Chips" stepKey="fillAdminValue2"/>
-+
-+        <!-- Save the new product attribute -->
-+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave1"/>
-+        <waitForPageLoad stepKey="waitForGridPageLoad1"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}"
-+                    stepKey="waitForSuccessMessage"/>
-+
-+        <actionGroup ref="navigateToCreatedProductAttribute" stepKey="navigateToAttribute">
-+            <argument name="ProductAttribute" value="productDropDownAttribute"/>
-+        </actionGroup>
-+        <!-- Check attribute data -->
-+        <grabValueFrom selector="{{DropdownAttributeOptionsSection.nthOptionAdminLabel('2')}}"
-+                       stepKey="secondOptionAdminLabel"/>
-+        <assertEquals actual="$secondOptionAdminLabel" expected="'Fish &amp; Chips'"
-+                      stepKey="assertSecondOption"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
-new file mode 100644
-index 00000000000..1bc69be642a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
-@@ -0,0 +1,87 @@
-+<?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="AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create product Dropdown attribute and check its visibility on frontend in Advanced Search form"/>
-+            <title value="AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest"/>
-+            <description value="Admin should able to create product Dropdown attribute and check its visibility on frontend in Advanced Search form"/>
-+            <testCaseId value="MC-10827"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Create product attribute with 2 options -->
-+            <createData entity="productDropDownAttributeNotSearchable" stepKey="attribute"/>
-+            <createData entity="productAttributeOption1" stepKey="option1">
-+                <requiredEntity createDataKey="attribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="option2">
-+                <requiredEntity createDataKey="attribute"/>
-+            </createData>
-+
-+            <!-- Create product attribute set -->
-+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Filter product attribute set by attribute set name -->
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="amOnAttributeSetPage"/>
-+        <actionGroup ref="FilterProductAttributeSetGridByAttributeSetName" stepKey="filterProductAttrSetGridByAttrSetName">
-+            <argument name="name" value="$$createAttributeSet.attribute_set_name$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert created attribute in an unassigned attributes -->
-+        <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="seeAttributeInUnassignedAttr"/>
-+
-+        <!-- Assign attribute in the group -->
-+        <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
-+            <argument name="group" value="Product Details"/>
-+            <argument name="attribute" value="$$attribute.attribute_code$$"/>
-+        </actionGroup>
-+        <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="seeAttributeInGroup"/>
-+        <actionGroup ref="SaveAttributeSet" stepKey="saveAttributeSet"/>
-+
-+        <!-- Go to Product Attribute Grid page -->
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="$$attribute.attribute_code$$" stepKey="fillAttrCodeField" />
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearchBtn" />
-+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="chooseFirstRow" />
-+
-+        <!-- Change attribute property: Frontend Label -->
-+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{productDropDownAttribute.attribute_code}}" stepKey="fillDefaultLabel"/>
-+
-+        <!-- Change attribute property: Use in Search >Yes -->
-+        <scrollToTopOfPage stepKey="scrollToTabs"/>
-+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStorefrontPropertiesTab"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <selectOption selector="{{AdvancedAttributePropertiesSection.UseInSearch}}" userInput="Yes" stepKey="seeInSearch"/>
-+
-+        <!-- Change attribute property: Visible In Advanced Search >No -->
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <selectOption selector="{{AdvancedAttributePropertiesSection.VisibleInAdvancedSearch}}" userInput="No" stepKey="dontSeeInAdvancedSearch"/>
-+
-+        <!-- Save the new product attributes -->
-+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
-+
-+        <!-- Flash cache -->
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!-- Go to store's advanced catalog search page -->
-+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
-+        <dontSeeElement selector="{{StorefrontCatalogSearchAdvancedFormSection.AttributeByCode('$$attribute.attribute_code$$')}}" stepKey="dontSeeAttribute"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
-new file mode 100644
-index 00000000000..37ec4e0d325
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
-@@ -0,0 +1,41 @@
-+<?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="AdminCreateDuplicateCategoryTest">
-+        <annotations>
-+            <stories value="Create category"/>
-+            <title value="Create Duplicate Category With Already Existed UrlKey"/>
-+            <description value="Login as admin and create duplicate category"/>
-+            <testCaseId value="MC-14702"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="SimpleSubCategory" stepKey="category"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Open Category Page and select Add category -->
-+        <actionGroup ref="goToCreateCategoryPage" stepKey="goToCategoryPage"/>
-+
-+        <!-- Fill the Category form with same name and urlKey as initially created category(SimpleSubCategory) -->
-+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillCategoryForm">
-+             <argument name="categoryName" value="$$category.name$$"/>
-+             <argument name="categoryUrlKey" value="$$category.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert error message -->
-+        <see selector="{{AdminCategoryMessagesSection.errorMessage}}" userInput="The value specified in the URL Key field would generate a URL that already exists." stepKey="seeErrorMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
-new file mode 100644
-index 00000000000..575bb56912b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
-@@ -0,0 +1,61 @@
-+<?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="AdminCreateDuplicateProductTest">
-+        <annotations>
-+            <stories value="Create Product"/>
-+            <title value="Create Duplicate Product With Existed Subcategory Name And UrlKey"/>
-+            <description value="Login as admin and create duplicate Product"/>
-+            <testCaseId value="MC-14714"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="SubCategory" stepKey="category"/>
-+            <createData entity="Two_nested_categories" stepKey="subCategory">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="subCategory" stepKey="deleteSubCategory"/>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to new simple product page -->
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="goToCreateProductPage"/>
-+
-+        <!-- Fill the main fields in the form -->
-+        <actionGroup ref="FillMainProductFormByString" stepKey="fillMainProductForm">
-+            <argument name="productName" value="$$subCategory.name$$"/>
-+            <argument name="productSku" value="{{defaultSimpleProduct.sku}}"/>
-+            <argument name="productPrice" value="{{defaultSimpleProduct.price}}"/>
-+            <argument name="productQuantity" value="{{defaultSimpleProduct.quantity}}"/>
-+            <argument name="productStatus" value="{{defaultSimpleProduct.status}}"/>
-+            <argument name="productWeight" value="{{defaultSimpleProduct.weight}}"/>
-+        </actionGroup>
-+
-+        <!-- Select the category that we created in the before block -->
-+        <actionGroup ref="SetCategoryByName" stepKey="setCategory">
-+            <argument name="categoryName" value="$$category.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Set the url key to match the subcategory created in the before block -->
-+        <actionGroup ref="SetProductUrlKeyByString" stepKey="fillUrlKey">
-+            <argument name="urlKey" value="$$subCategory.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+
-+        <!-- Save the product and expect to see an error message -->
-+        <actionGroup ref="SaveProductFormNoSuccessCheck" stepKey="tryToSaveProduct"/>
-+        <see selector="{{AdminProductFormSection.successMessage}}"  userInput="The value specified in the URL Key field would generate a URL that already exists." stepKey="seeErrorMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
-new file mode 100644
-index 00000000000..21b3dba7140
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
-@@ -0,0 +1,90 @@
-+<?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="AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest">
-+        <annotations>
-+            <stories value="Create category"/>
-+            <title value="Flat Catalog - Update Inactive Category as Inactive, Should Not be Visible on Storefront"/>
-+            <description value="Login as admin and create inactive flat category and update category as inactive and verify category is not visible in store front"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11009"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!--Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <!--Create category-->
-+            <createData entity="CatNotActive" stepKey="createCategory"/>
-+            <!-- Create First StoreView  -->
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewEn">
-+                <argument name="storeView" value="customStoreEN"/>
-+            </actionGroup>
-+            <!-- Create Second StoreView -->
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
-+                <argument name="storeView" value="customStoreFR"/>
-+            </actionGroup>
-+            <!--Run full reindex and clear caches -->
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+            <!--Enable Flat Catalog Category -->
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
-+            <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
-+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
-+            <!-- Run cron twice -->
-+            <magentoCLI command="cron:run" stepKey="runCron1"/>
-+            <magentoCLI command="cron:run" stepKey="runCron2"/>
-+        </before>
-+        <after>
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
-+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
-+            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
-+                <argument name="customStore" value="customStoreEN"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
-+                <argument name="customStore" value="customStoreFR"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Select created category and make category inactive-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(CatNotActive.name)}}" stepKey="selectCreatedCategory"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{CatNotActive.name}}" stepKey="seeUpdatedCategoryTitle"/>
-+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"  stepKey="verifyInactiveCategory"/>
-+        <!--Run full reindex and clear caches -->
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        <!--Open Index Management Page -->
-+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
-+        <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
-+        <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
-+        <!--Verify Category In Store Front-->
-+        <amOnPage url="/$$createCategory.name$$.html"  stepKey="openCategoryPage1"/>
-+        <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
-+        <seeElement selector="{{StorefrontBundledSection.pageNotFound}}" stepKey="seeWhoopsOurBadMessage"/>
-+        <!--Verify category is not visible in First Store View -->
-+        <click stepKey="selectStoreSwitcher" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
-+        <click stepKey="selectForstStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreEN.name)}}"/>
-+        <waitForPageLoad stepKey="waitForFirstStoreView"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="dontSeeCategoryOnNavigation"/>
-+        <!--Verify category is not visible in Second Store View -->
-+        <click stepKey="selectStoreSwitcher1" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
-+        <click stepKey="selectSecondStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreFR.name)}}"/>
-+        <waitForPageLoad stepKey="waitForSecondStoreView"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="dontSeeCategoryOnNavigation1"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
-new file mode 100644
-index 00000000000..aa3dba85dfa
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
-@@ -0,0 +1,92 @@
-+<?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="AdminCreateInactiveFlatCategoryTest">
-+        <annotations>
-+            <stories value="Create category"/>
-+            <title value="Flat Catalog - Create Category as Inactive, Should Not be Visible on Storefront"/>
-+            <description value="Login as admin and create flat Inactive category and verify category is not visible in store front"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11007"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!--Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <!--Create category-->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <!-- Create First StoreView  -->
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewEn">
-+                <argument name="storeView" value="customStoreEN"/>
-+            </actionGroup>
-+            <!-- Create Second StoreView -->
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
-+                <argument name="storeView" value="customStoreFR"/>
-+            </actionGroup>
-+            <!--Run full reindex and clear caches -->
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+            <!--Enable Flat Catalog Category -->
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
-+            <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
-+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
-+            <!-- Run cron twice -->
-+            <magentoCLI command="cron:run" stepKey="runCron1"/>
-+            <magentoCLI command="cron:run" stepKey="runCron2"/>
-+        </before>
-+        <after>
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
-+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
-+            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
-+                <argument name="customStore" value="customStoreEN"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
-+                <argument name="customStore" value="customStoreFR"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Select created category and make category inactive-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectCreatedCategory"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableActiveCategory"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeUpdatedCategoryTitle"/>
-+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"  stepKey="verifyInactiveIncludeInMenu"/>
-+        <!--Run full reindex and clear caches -->
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        <!--Open Index Management Page -->
-+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
-+        <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
-+        <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
-+        <!--Verify Category In Store Front-->
-+        <amOnPage url="/$$createCategory.name$$.html"  stepKey="openCategoryPage1"/>
-+        <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
-+        <!--Verify category is not visible in First Store View -->
-+        <click stepKey="selectStoreSwitcher" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
-+        <click stepKey="selectForstStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreEN.name)}}"/>
-+        <waitForPageLoad stepKey="waitForFirstStoreView"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="dontSeeCategoryOnNavigation"/>
-+        <seeElement selector="{{StorefrontBundledSection.pageNotFound}}" stepKey="seeWhoopsOurBadMessage"/>
-+        <!--Verify category is not visible in Second Store View -->
-+        <click stepKey="selectStoreSwitcher1" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
-+        <click stepKey="selectSecondStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreFR.name)}}"/>
-+        <waitForPageLoad stepKey="waitForSecondstoreView"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="dontSeeCategoryOnNavigation1"/>
-+        <seeElement selector="{{StorefrontBundledSection.pageNotFound}}" stepKey="seeWhoopsOurBadMessage1"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
-new file mode 100644
-index 00000000000..37417cd7fdb
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
-@@ -0,0 +1,91 @@
-+<?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="AdminCreateInactiveInMenuFlatCategoryTest">
-+        <annotations>
-+            <stories value="Create category"/>
-+            <title value="Flat Catalog - Exclude Category from Navigation Menu"/>
-+            <description value="Login as admin and create inactive Include In Menu flat category and verify category is not displayed in Navigation Menu"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11008"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!--Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <!--Create category-->
-+            <createData entity="SimpleSubCategory" stepKey="category"/>
-+            <!-- Create First StoreView  -->
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewEn">
-+                <argument name="storeView" value="customStoreEN"/>
-+            </actionGroup>
-+            <!-- Create Second StoreView -->
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
-+                <argument name="storeView" value="customStoreFR"/>
-+            </actionGroup>
-+            <!--Run full reindex and clear caches -->
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+            <!--Enable Flat Catalog Category -->
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
-+            <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
-+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
-+            <!-- Run cron twice -->
-+            <magentoCLI command="cron:run" stepKey="runCron1"/>
-+            <magentoCLI command="cron:run" stepKey="runCron2"/>
-+        </before>
-+        <after>
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
-+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
-+            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
-+                <argument name="customStore" value="customStoreEN"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
-+                <argument name="customStore" value="customStoreFR"/>
-+            </actionGroup>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Select created category and disable Include In Menu option-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectCreatedCategory"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="disableIcludeInMenuOption"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
-+        <!--Verify category is saved and Include In Menu Option is disabled in Category Page -->
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeUpdatedCategoryTitle"/>
-+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}"  stepKey="verifyInactiveIncludeInMenu"/>
-+        <!--Run full reindex and clear caches -->
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        <!--Open Index Management Page -->
-+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
-+        <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
-+        <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
-+        <!--Verify Category In Store Front-->
-+        <amOnPage url="/$$category.name$$.html"  stepKey="openCategoryPage1"/>
-+        <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
-+        <!--Verify category is not displayed in navigation menu in First Store View -->
-+        <click stepKey="selectStoreSwitcher" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
-+        <click stepKey="selectForstStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreEN.name)}}"/>
-+        <waitForPageLoad stepKey="waitForFirstStoreView"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$category.name$$)}}" stepKey="seeCategoryOnNavigation"/>
-+        <!--Verify category is not displayed in navigation menu in Second Store View -->
-+        <click stepKey="selectStoreSwitcher1" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
-+        <click stepKey="selectSecondStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreFR.name)}}"/>
-+        <waitForPageLoad stepKey="waitForSecondstoreView"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$category.name$$)}}" stepKey="seeCategoryOnNavigation1"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
-new file mode 100644
-index 00000000000..4e096b7ebb1
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
-@@ -0,0 +1,93 @@
-+<?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="AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Multiple Select product attribute and check its visibility in Advanced Search form"/>
-+            <title value="Create product attribute of type Multiple Select and check its visibility on frontend in Advanced Search form"/>
-+            <description value="Admin should be able to create product attribute of type Multiple Select and check its visibility on frontend in Advanced Search form"/>
-+            <testCaseId value="MC-10828"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Create a multiple select product attribute with two options -->
-+            <createData entity="productAttributeMultiselectTwoOptionsNotSearchable" stepKey="attribute"/>
-+            <createData entity="productAttributeOption1" stepKey="option1">
-+                <requiredEntity createDataKey="attribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="option2">
-+                <requiredEntity createDataKey="attribute"/>
-+            </createData>
-+
-+            <!-- Create product attribute set -->
-+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete product attribute -->
-+            <deleteData createDataKey="attribute" stepKey="deleteProductAttribute"/>
-+
-+            <!-- Delete product attribute set -->
-+            <deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Filter product attribute set by attribute set name -->
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="amOnAttributeSetPage"/>
-+        <actionGroup ref="FilterProductAttributeSetGridByAttributeSetName" stepKey="filterProductAttrSetGridByAttrSetName">
-+            <argument name="name" value="$$createAttributeSet.attribute_set_name$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert created attribute in an unassigned attributes -->
-+        <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="seeAttributeInUnassignedAttr"/>
-+
-+        <!-- Assign attribute in the group -->
-+        <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
-+            <argument name="group" value="Product Details"/>
-+            <argument name="attribute" value="$$attribute.attribute_code$$"/>
-+        </actionGroup>
-+        <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="seeAttributeInGroup"/>
-+        <actionGroup ref="SaveAttributeSet" stepKey="saveAttributeSet"/>
-+
-+        <!-- Go to Product Attribute Grid page -->
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="$$attribute.attribute_code$$" stepKey="fillAttrCodeField" />
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearchBtn" />
-+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="chooseFirstRow" />
-+
-+        <!-- Change attribute property: Frontend Label -->
-+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{productDropDownAttribute.attribute_code}}" stepKey="fillDefaultLabel"/>
-+
-+        <!-- Change attribute property: Use in Search >Yes -->
-+        <scrollToTopOfPage stepKey="scrollToTabs"/>
-+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStorefrontPropertiesTab"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <selectOption selector="{{AdvancedAttributePropertiesSection.UseInSearch}}" userInput="Yes" stepKey="seeInSearch"/>
-+
-+        <!-- Change attribute property: Visible In Advanced Search >No -->
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <selectOption selector="{{AdvancedAttributePropertiesSection.VisibleInAdvancedSearch}}" userInput="No" stepKey="dontSeeInAdvancedSearch"/>
-+
-+        <!-- Save the new product attributes -->
-+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
-+
-+        <!-- Flash cache -->
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!-- Go to store's advanced catalog search page -->
-+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
-+        <dontSeeElement selector="{{StorefrontCatalogSearchAdvancedFormSection.AttributeByCode('$$attribute.attribute_code$$')}}" stepKey="dontSeeAttribute"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductTest.xml
-new file mode 100644
-index 00000000000..02615ca5dd2
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductTest.xml
-@@ -0,0 +1,69 @@
-+<?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="AdminCreateNewAttributeFromProductTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Product attributes"/>
-+            <title value="Check that New Attribute from Product is create"/>
-+            <description value="Check that New Attribute from Product is create"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-12296"/>
-+            <useCaseId value="MAGETWO-59055"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+
-+            <!--Create product-->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+        </before>
-+        <after>
-+            <!--Delete create data-->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+
-+            <!--Delete store views-->
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteFirstStoreView">
-+                <argument name="customStore" value="customStoreEN"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteSecondStoreView">
-+                <argument name="customStore" value="customStoreFR"/>
-+            </actionGroup>
-+
-+            <!--Delete Attribute-->
-+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
-+                <argument name="ProductAttribute" value="productDropDownAttribute"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create 2 store views-->
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createFirstStoreView">
-+            <argument name="customStore" value="customStoreEN"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
-+            <argument name="customStore" value="customStoreFR"/>
-+        </actionGroup>
-+
-+        <!--Go to created product page and create new attribute-->
-+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="openAdminEditPage"/>
-+        <actionGroup ref="AdminCreateAttributeWithValueWithTwoStoreViesFromProductPage" stepKey="createAttribute">
-+            <argument name="attributeName" value="{{productDropDownAttribute.attribute_code}}"/>
-+            <argument name="attributeType" value="Dropdown"/>
-+            <argument name="firstStoreViewName" value="{{customStoreEN.name}}"/>
-+            <argument name="secondStoreViewName" value="{{customStoreFR.name}}"/>
-+        </actionGroup>
-+
-+        <!--Check attribute existence in product page attribute section-->
-+        <conditionalClick selector="{{AdminProductAttributeSection.attributeSectionHeader}}" dependentSelector="{{AdminProductAttributeSection.attributeSection}}" visible="false" stepKey="openAttributeSection"/>
-+        <seeElement selector="{{AdminProductAttributeSection.dropDownAttribute(productDropDownAttribute.attribute_code)}}" stepKey="seeNewAttributeInProductPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewGroupForAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewGroupForAttributeSetTest.xml
-new file mode 100644
-index 00000000000..3219bca233b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewGroupForAttributeSetTest.xml
-@@ -0,0 +1,111 @@
-+<?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="AdminCreateNewGroupForAttributeSetTest">
-+        <annotations>
-+            <stories value="Edit attribute set"/>
-+            <title value="Admin should be able to create new group in an Attribute Set"/>
-+            <description value="The test verifies creating a new group in an attribute set and a validation message in case of empty group name"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-170"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <!-- Create a custom attribute set and custom product attribute -->
-+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+
-+            <!-- Login to Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        
-+        <!-- Navigate to Stores > Attributes > Attribute Set -->
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSetPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+
-+        <!-- Search and open Attribute Set from preconditions -->
-+        <actionGroup ref="goToAttributeSetByName" stepKey="searchAttribute">
-+            <argument name="name" value="$$createAttributeSet.attribute_set_name$$"/>
-+        </actionGroup>
-+
-+        <!-- Click 'Add New': Show 'New Group' Modal -->
-+        <click selector="{{AdminProductAttributeSetEditSection.AddNewGroup}}" stepKey="clickAddNew"/>
-+        <waitForAjaxLoad stepKey="waitForAjax"/>
-+
-+        <!-- Fill 'name' for new group and click 'Ok': Name = <empty> -->
-+        <fillField userInput="" selector="{{AdminProductAttributeSetEditSection.newGroupName}}" stepKey="fillName"/>
-+        <click selector="{{AdminProductAttributeSetEditSection.buttonOk}}" stepKey="clickOk"/>
-+
-+        <!-- Error message 'This is a required field.' is displayed -->
-+        <see userInput="This is a required field." selector="{{AdminProductAttributeSetEditSection.errorLabel}}" stepKey="seeErrorMessage"/>
-+
-+        <!-- Fill 'name' for new group and click 'Ok': Name = Custom group -->
-+        <fillField userInput="{{customGroup.name}}" selector="{{AdminProductAttributeSetEditSection.newGroupName}}" stepKey="fillCustomGroupName"/>
-+        <click selector="{{AdminProductAttributeSetEditSection.buttonOk}}" stepKey="clickButtonOk"/>
-+
-+        <!-- Group is created and displayed in 'Groups' block -->
-+        <seeElement selector="{{AdminProductAttributeSetEditSection.attributeGroup(customGroup.name)}}" stepKey="assertCustomGroup"/>
-+
-+        <!-- Move custom Product Attribute to new 'Custom group' Group -->
-+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
-+        <click selector="{{AdminProductAttributeSetEditSection.attributeGroupExtender(customGroup.name)}}" stepKey="click"/>
-+        <waitForPageLoad stepKey="waitForPageLoadAfterClick"/>
-+        <dragAndDrop selector1="{{AdminProductAttributeSetEditSection.unassignedAttribute($$createConfigProductAttribute.attribute_code$$)}}" selector2="{{AdminProductAttributeSetEditSection.attributeGroupExtender(customGroup.name)}}" stepKey="moveAttribute"/>
-+        <waitForPageLoad stepKey="waitForDragAndDrop"/>
-+
-+        <!-- Attribute is displayed in the new group -->
-+        <see userInput="$$createConfigProductAttribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="seeAttribute"/>
-+
-+        <!-- Click 'Save' -->
-+        <actionGroup ref="SaveAttributeSet" stepKey="saveAttribute"/>
-+
-+        <actionGroup ref="goToAttributeSetByName" stepKey="backTohAttributeSet">
-+            <argument name="name" value="$$createAttributeSet.attribute_set_name$$"/>
-+        </actionGroup>
-+
-+        <!-- Create another group: Name = Empty group -->
-+        <click selector="{{AdminProductAttributeSetEditSection.AddNewGroup}}" stepKey="clickAddEmptyGroup"/>
-+        <waitForAjaxLoad stepKey="waitForLoad"/>
-+
-+        <fillField userInput="{{emptyGroup.name}}" selector="{{AdminProductAttributeSetEditSection.newGroupName}}" stepKey="fillGroupName"/>
-+        <click selector="{{AdminProductAttributeSetEditSection.buttonOk}}" stepKey="clickOnOk"/>
-+        <waitForPageLoad stepKey="waitForNewGroup"/>
-+
-+        <!-- Empty group is created. No attributes are assigned to it. -->
-+        <seeElement selector="{{AdminProductAttributeSetEditSection.attributeGroup(emptyGroup.name)}}" stepKey="assertEmptyGroup"/>
-+        <dontSeeElement selector="{{AdminProductAttributeSetEditSection.attributesInGroup(emptyGroup.name)}}" stepKey="seeNoAttributes"/>
-+      
-+        <!-- Navigate to Catalog > Products -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+
-+        <!-- Start to create a new simple product with the custom attribute set from the preconditions -->
-+        <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickAddProduct"/>
-+        <waitForPageLoad stepKey="waitForNewProductPage"/>
-+        
-+        <actionGroup ref="AdminProductPageSelectAttributeSet" stepKey="selectAttribute">
-+            <argument name="attributeSetName" value="$$createAttributeSet.attribute_set_name$$"/>
-+        </actionGroup>
-+
-+        <!-- New Section 'Custom group' is present in form. The section contains the attribute from preconditions  -->
-+        <seeElement selector="{{AdminProductAttributeSection.attributeGroupByName(customGroup.name)}}" stepKey="seeSectionCustomGroup"/>
-+        <click selector="{{AdminProductAttributeSection.attributeGroupByName(customGroup.name)}}" stepKey="openCustomGroupSection"/>
-+        <waitForAjaxLoad stepKey="waitForOpenSection"/>
-+        <scrollTo selector="{{AdminProductFormSection.footerBlock}}" stepKey="scrollToFooter"/>
-+        <seeElement selector="{{AdminProductAttributeSection.attributeByGroupAndName(customGroup.name)}}" stepKey="seeAttributePresent"/>
-+
-+        <!-- Empty section is absent in Product Form -->
-+        <dontSeeElement selector="{{AdminProductAttributeSection.attributeGroupByName(emptyGroup.name)}}" stepKey="dontSeeEmptyGroup"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
-new file mode 100644
-index 00000000000..5c798db29b9
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
-@@ -0,0 +1,133 @@
-+<?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="AdminCreateProductAttributeFromProductPageTest">
-+        <annotations>
-+            <stories value="Create product Attribute"/>
-+            <title value="Create Product Attribute from Product Page"/>
-+            <description value="Login as admin and create new product attribute from product page with Text Field"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10899"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+
-+            <!--Create Category-->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!--Create Simple Product-->
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!--Delete created entity -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!--<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>-->
-+            <actionGroup ref="deleteProductAttribute" stepKey="deleteCreatedAttribute">
-+                <argument name="ProductAttribute" value="newProductAttribute"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Open Product Index Page-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-+
-+        <!-- Select Created Product-->
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQty"/>
-+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="selectStockStatus"/>
-+
-+        <!-- Create New Product Attribute -->
-+        <click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickOnAddAttribute"/>
-+        <waitForPageLoad stepKey="waitForAttributePageToLoad"/>
-+        <click selector="{{AdminProductFormSection.createNewAttributeBtn}}" stepKey="clickCreateNewAttributeButton"/>
-+        <waitForPageLoad stepKey="waitForNewAttributePageToLoad"/>
-+        <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.defaultLabel}}" stepKey="waitForDefaultLabelToBeVisible"/>
-+        <fillField selector="{{AdminCreateNewProductAttributeSection.defaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillAttributeLabel"/>
-+        <selectOption selector="{{AdminCreateNewProductAttributeSection.inputType}}" userInput="Text Field" stepKey="selectTextField"/>
-+        <click selector="{{AdminCreateNewProductAttributeSection.advancedAttributeProperties}}" stepKey="clickOnAdvancedAttributeProperties"/>
-+        <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.attributeCode}}" stepKey="waitForAttributeCodeToVisible"/>
-+        <scrollTo selector="{{AdminCreateNewProductAttributeSection.attributeCode}}" stepKey="scrollToAttributeCode"/>
-+        <fillField selector="{{AdminCreateNewProductAttributeSection.attributeCode}}" userInput="{{newProductAttribute.attribute_code}}" stepKey="fillAttributeCode"/>
-+        <fillField selector="{{AdminCreateNewProductAttributeSection.defaultValue}}" userInput="{{ProductAttributeOption8.value}}" stepKey="fillDefaultValue"/>
-+        <scrollTo selector="{{AdminCreateNewProductAttributeSection.isUnique}}"   stepKey="scrollToIsUniqueOption"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.isUnique}}" stepKey="enableIsUniqueOption"/>
-+        <scrollTo selector="{{AdminCreateNewProductAttributeSection.advancedAttributeProperties}}" stepKey="scrollToAdvancedAttributeProperties"/>
-+        <click selector="{{AdminCreateNewProductAttributeSection.advancedAttributeProperties}}" stepKey="clickOnAdvancedAttributeProperties1"/>
-+        <scrollTo selector="{{AdminCreateNewProductAttributeSection.storefrontProperties}}"  stepKey="scrollToStorefrontProperties"/>
-+        <click selector="{{AdminCreateNewProductAttributeSection.storefrontProperties}}" stepKey="clickOnStorefrontProperties"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontToLoad"/>
-+        <scrollTo stepKey="scroll1" selector="{{AdminCreateNewProductAttributeSection.sortProductListing}}" x="0" y="-80"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.inSearch}}" stepKey="enableInSearchOption"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.advancedSearch}}" stepKey="enableAdvancedSearch"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.isComparable}}" stepKey="enableIsUComparableption"/>
-+        <checkOption  selector="{{AdminCreateNewProductAttributeSection.allowHtmlTags}}" stepKey="enableAllowHtmlTags"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.visibleOnStorefront}}" stepKey="enableVisibleOnStorefront"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.sortProductListing}}" stepKey="enableSortProductListing"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+        <click selector="{{AdminCreateNewProductAttributeSection.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
-+        <waitForPageLoad stepKey="waitForAttributeToSave"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct"/>
-+        <waitForPageLoad stepKey="waitForProductToSave"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-+
-+        <!--Verify product attribute added in product form -->
-+        <scrollTo selector="{{AdminProductFormSection.contentTab}}" stepKey="scrollToContentTab"/>
-+        <waitForElementVisible selector="{{AdminProductFormSection.attributeTab}}" stepKey="waitForAttributeToVisible"/>
-+        <click selector="{{AdminProductFormSection.attributeTab}}" stepKey="clickOnAttribute"/>
-+        <seeElement selector="{{AdminProductFormSection.attributeLabelByText(ProductAttributeFrontendLabel.label)}}" stepKey="seeAttributeLabelInProductForm"/>
-+
-+        <!--Verify Product Attribute in Attribute Form -->
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{newProductAttribute.attribute_code}}" stepKey="setAttributeCode"/>
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
-+        <waitForPageLoad stepKey="waitForPageLoad" />
-+        <see selector="{{AdminProductAttributeGridSection.attributeCodeColumn}}" userInput="{{newProductAttribute.attribute_code}}" stepKey="seeAttributeCode"/>
-+        <see selector="{{AdminProductAttributeGridSection.defaultLabelColumn}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeDefaultLabel"/>
-+        <see selector="{{AdminProductAttributeGridSection.isVisibleColumn}}" userInput="Yes" stepKey="seeIsVisibleColumn"/>
-+        <see selector="{{AdminProductAttributeGridSection.isSearchableColumn}}" userInput="Yes" stepKey="seeSearchableColumn"/>
-+        <see selector="{{AdminProductAttributeGridSection.isComparableColumn}}" userInput="Yes" stepKey="seeComparableColumn"/>
-+
-+        <!--Verify Product Attribute is present in Category Store Front Page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForProductFrontPageToLoad"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="clickOnCategory"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
-+        <waitForPageLoad  stepKey="waitForProductToLoad1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="seeProductNameInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{SimpleProduct.price}}" stepKey="seeProductPriceInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{SimpleProduct.sku}}" stepKey="seeProductSkuInStoreFront"/>
-+        <scrollTo selector="{{StorefrontProductMoreInformationSection.moreInformation}}" stepKey="scrollToMoreInformation"/>
-+        <see selector="{{StorefrontProductMoreInformationSection.attributeLabel}}"  userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeLabel"/>
-+        <see selector="{{StorefrontProductMoreInformationSection.attributeValue}}"  userInput="{{ProductAttributeOption8.value}}" stepKey="seeAttributeValue"/>
-+
-+        <!--Verify Product Attribute present in search page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToStorefrontPage1"/>
-+        <waitForPageLoad stepKey="waitForProductFrontPageToLoad1"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{ProductAttributeOption8.value}}" stepKey="fillAttribute"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="seeProductNameInCategoryPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeRequiredTextFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeRequiredTextFieldTest.xml
-new file mode 100644
-index 00000000000..d4d6496e018
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeRequiredTextFieldTest.xml
-@@ -0,0 +1,92 @@
-+<?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="AdminCreateProductAttributeRequiredTextFieldTest">
-+        <annotations>
-+            <stories value="Manage products"/>
-+            <title value="Create Custom Product Attribute Text Field (Required) from Product Page"/>
-+            <description value="Login as admin and create product attribute with Text Field and Required option"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10906"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+
-+            <!--Create Category-->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!--Create Simple Product-->
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!--Delete created entity -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="deleteProductAttribute" stepKey="deleteCreatedAttribute">
-+                <argument name="ProductAttribute" value="newProductAttribute"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Open Product Index Page-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-+
-+        <!-- Select Created Product-->
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQty"/>
-+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="selectStockStatus"/>
-+
-+        <!-- Create Product Attribute -->
-+        <click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickOnAddAttribute"/>
-+        <waitForPageLoad stepKey="waitForAttributePageToLoad"/>
-+        <click selector="{{AdminProductFormSection.createNewAttributeBtn}}" stepKey="clickCreateNewAttributeButton"/>
-+        <waitForPageLoad stepKey="waitForNewAttributePageToLoad"/>
-+        <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.defaultLabel}}" stepKey="waitForDefaultLabelToBeVisible"/>
-+        <fillField selector="{{AdminCreateNewProductAttributeSection.defaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillAttributeLabel"/>
-+        <selectOption selector="{{AdminCreateNewProductAttributeSection.inputType}}" userInput="Text Field" stepKey="selectTextField"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.isRequired}}" stepKey="enableIsRequiredOption"/>
-+        <click selector="{{AdminCreateNewProductAttributeSection.advancedAttributeProperties}}" stepKey="clickOnAdvancedAttributeProperties"/>
-+        <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.attributeCode}}" stepKey="waitForAttributeCodeToVisible"/>
-+        <scrollTo selector="{{AdminCreateNewProductAttributeSection.attributeCode}}" stepKey="scrollToAttributeCode"/>
-+        <fillField selector="{{AdminCreateNewProductAttributeSection.attributeCode}}" userInput="{{newProductAttribute.attribute_code}}" stepKey="fillAttributeCode"/>
-+        <selectOption selector="{{AdminCreateNewProductAttributeSection.scope}}" userInput="Global" stepKey="selectScope"/>
-+        <fillField selector="{{AdminCreateNewProductAttributeSection.defaultValue}}" userInput="{{ProductAttributeOption8.value}}" stepKey="fillDefaultValue"/>
-+        <scrollTo selector="{{AdminCreateNewProductAttributeSection.isUnique}}"   stepKey="scrollToIsUniqueOption"/>
-+        <checkOption selector="{{AdminCreateNewProductAttributeSection.isUnique}}" stepKey="enableIsUniqueOption"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+        <click selector="{{AdminCreateNewProductAttributeSection.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
-+        <waitForPageLoad stepKey="waitForAttributeToSave"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct"/>
-+        <waitForPageLoad stepKey="waitForProductToSave"/>
-+
-+        <!--Verify product attribute added in product form and Is Required message displayed-->
-+        <scrollTo selector="{{AdminProductFormSection.contentTab}}" stepKey="scrollToContentTab"/>
-+        <waitForElementVisible selector="{{AdminProductFormSection.attributeTab}}" stepKey="waitForAttributeToVisible"/>
-+        <seeElement selector="{{AdminProductFormSection.attributeFieldError}}" stepKey="seeAttributeInputFiledErrorMessage"/>
-+
-+        <!--Fill the Required field and save the product -->
-+        <fillField selector="{{AdminProductFormSection.attributeRequiredInput(newProductAttribute.attribute_code)}}" userInput="attribute" stepKey="fillTheAttributeRequiredInputField"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfProductFormPage"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct1"/>
-+        <waitForPageLoad stepKey="waitForProductToSave1"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSet.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSet.xml
-index 038c8fd2263..713e1b7d6df 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSet.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSet.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateProductCustomAttributeSet">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest.xml
-index 0340eea852a..6658ad36d71 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateProductDuplicateUrlkeyTest">
-         <annotations>
-             <features value="Catalog"/>
-@@ -40,4 +40,46 @@
-         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
-         <see userInput="The value specified in the URL Key field would generate a URL that already exists" selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="assertErrorMessage"/>
-     </test>
-+    <test name="AdminCreateProductDuplicateProductTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Validation Errors"/>
-+            <title value="No validation errors when trying to duplicate product twice"/>
-+            <description value="No validation errors when trying to duplicate product twice"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-5472"/>
-+            <group value="product"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!--Delete all products by filtering grid and using mass delete action-->
-+            <actionGroup ref="deleteAllDuplicateProductUsingProductGrid" stepKey="deleteAllDuplicateProducts">
-+                <argument name="product" value="$$createSimpleProduct$$"/>
-+            </actionGroup>
-+            <deleteData createDataKey="createCategory" stepKey="deletePreReqCatalog" />
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct1">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <!--Save and duplicated the product once-->
-+        <actionGroup ref="AdminFormSaveAndDuplicate" stepKey="saveAndDuplicateProductForm1"/>
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct2">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <!--Save and duplicated the product second time-->
-+        <actionGroup ref="AdminFormSaveAndDuplicate" stepKey="saveAndDuplicateProductForm2"/>
-+    </test>
- </tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
-index dbe5a90d592..11d919ddefa 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
-@@ -7,10 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateRootCategoryAndSubcategoriesTest">
-         <annotations>
-             <features value="Catalog"/>
-+            <stories value="Create categories"/>
-             <title value="Admin should be able to create a Root Category and a Subcategory"/>
-             <description value="Admin should be able to create a Root Category and a Subcategory"/>
-             <severity value="CRITICAL"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml
-new file mode 100644
-index 00000000000..f98f9acc469
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml
-@@ -0,0 +1,42 @@
-+<?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="AdminCreateRootCategoryRequiredFieldsTest">
-+        <annotations>
-+            <stories value="Create categories"/>
-+            <features value="Catalog"/>
-+            <title value="Create Root Category from Category Page"/>
-+            <description value="Create Root Category from Category Page"/>
-+            <testCaseId value="MC-5263"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="LoginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory">
-+                <argument name="categoryEntity" value="_defaultCategory" />
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout" />
-+        </after>
-+
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="OpenAdminCatergoryIndexPage"/>
-+        <click selector="{{AdminCategorySidebarActionSection.AddRootCategoryButton}}" stepKey="ClickOnAddRootButton"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="FillCategoryField"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="EnableCheckOption"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="ClickSaveButton"/>
-+        <waitForPageLoad stepKey="WaitForCategorySaved"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="AssertSuccessMessage"/>
-+        <seeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}"  stepKey="SeeCheckBoxisSelected"/>
-+        <seeInField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="SeedFieldInput"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml
-index b2e6119ef4e..6096ee1fa39 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateSimpleProductTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
-new file mode 100644
-index 00000000000..3487de65617
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
-@@ -0,0 +1,61 @@
-+<?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="AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest">
-+        <annotations>
-+            <stories value="Create simple product"/>
-+            <title value="Create simple product with (Country of Manufacture) Attribute SKU Mask"/>
-+            <description value="Test log in to Create simple product and Create simple product with (Country of Manufacture) Attribute SKU Mask"/>
-+            <testCaseId value="MC-11024"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI stepKey="setCountryOfManufacture" command="config:set catalog/fields_masks/sku" arguments="{{name}}-{{country_of_manufacture}}"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <magentoCLI stepKey="setName" command="config:set catalog/fields_masks/sku" arguments="{{name}}"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-+                <argument name="sku" value="{{nameAndAttributeSkuMaskSimpleProduct.name}}-{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" />
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="openProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
-+        <waitForPageLoad stepKey="waitForProductToggleToSelectSimpleProduct"/>
-+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickSimpleProductFromDropDownList"/>
-+
-+        <!-- Create simple product with country of manufacture attribute -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}}" stepKey="fillSimpleProductName"/>
-+        <selectOption selector="{{AdminProductFormSection.countryOfManufacture}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="selectCountryOfManufacture"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.price}}" stepKey="fillSimpleProductPrice"/>
-+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.weight}}" stepKey="fillSimpleProductWeight"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.quantity}}" stepKey="fillSimpleProductQuantity"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductToSave"/>
-+        <!-- Verify customer see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!-- Search created simple product(from above step) in the grid page to verify sku masked as name and country of manufacture -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchCreatedSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}}-{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="fillSkuFilterFieldWithNameAndCountryOfManufactureInput" />
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <waitForPageLoad stepKey="waitForProductSearchAfterApplyingFilters"/>
-+        <see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}}-{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="seeSimpleProductSkuMaskedAsNameAndCountryOfManufacture"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
-index 486fea9d91f..896a28d0298 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateSimpleProductWithUnicodeTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateTextEditorProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateTextEditorProductAttributeTest.xml
-new file mode 100644
-index 00000000000..fc7482c3531
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateTextEditorProductAttributeTest.xml
-@@ -0,0 +1,129 @@
-+<?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="AdminCreateTextEditorProductAttributeTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create product Attribute"/>
-+            <title value="Admin create text editor product attribute test"/>
-+            <description value="Create text editor product attribute with TinyMCE4 enabled"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-6338"/>
-+            <group value="catalog"/>
-+        </annotations>
-+        <before>
-+            <!-- Enable WYSIWYG editor -->
-+            <magentoCLI command="config:set {{EnableWYSIWYG.path}} {{EnableWYSIWYG.value}}" stepKey="enableWYSIWYG"/>
-+
-+            <!-- Enable TinyMCE 4 -->
-+            <magentoCLI command="config:set {{EnableTinyMCE4.path}} {{EnableTinyMCE4.value}}" stepKey="enableTinyMCE4"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete attribute -->
-+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
-+                <argument name="ProductAttribute" value="productTextEditorAttribute"/>
-+            </actionGroup>
-+
-+            <!-- Delete product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="_defaultProduct"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to Stores > Product, click "Add New Attribute" -->
-+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="openProductAttributePage"/>
-+        <click selector="{{AdminProductAttributeGridSection.createNewAttributeBtn}}" stepKey="createNewAttribute"/>
-+
-+        <!-- Input value for Default Label. Verify dropdown of "Catalog Input Type for Store Owner" -->
-+        <actionGroup ref="AdminFillProductAttributePropertiesActionGroup" stepKey="fillAttributeProperties">
-+            <argument name="attributeName" value="{{productTextEditorAttribute.attribute_code}}"/>
-+            <argument name="attributeType" value="{{productTextEditorAttribute.frontend_input}}"/>
-+        </actionGroup>
-+
-+        <!-- Input value for "Catalog Input Type for Store Owner" -->
-+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="{{productAttributeWysiwyg.frontend_input}}" stepKey="updateInputType"/>
-+
-+        <!-- Click on "Storefront Properties" tab on left menu -->
-+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStorefrontPropertiesTab"/>
-+        <dontSeeElement selector="{{StorefrontPropertiesSection.EnableWYSIWYG}}" stepKey="dontSeeWYSIWYGEnableField"/>
-+
-+        <!-- Selection for "Visible on Catalog Pages on Storefront" -->
-+        <selectOption selector="{{StorefrontPropertiesSection.visibleOnCatalogPagesOnStorefront}}" userInput="Yes" stepKey="enableVisibleOnStorefront"/>
-+        <scrollToTopOfPage stepKey="scrollToPageTop"/>
-+
-+        <!-- Go back to "Properties" tab on left menu -->
-+        <click selector="{{AttributePropertiesSection.propertiesTab}}" stepKey="clickPropertiesTab"/>
-+
-+        <!-- Updated value for "Catalog Input Type for Store Owner" -->
-+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="{{productTextEditorAttribute.frontend_input}}" stepKey="returnInputType"/>
-+
-+        <!-- Save Product Attribute -->
-+        <actionGroup ref="saveProductAttribute" stepKey="saveAttribute"/>
-+
-+        <!-- Go to Store > Attribute Set -->
-+        <actionGroup ref="AdminOpenAttributeSetGridPageActionGroup" stepKey="openAttributeSetPage"/>
-+
-+        <!-- From grid, click on attribute set Default -->
-+        <actionGroup ref="AdminOpenAttributeSetByNameActionGroup" stepKey="openDefaultAttributeSet"/>
-+
-+        <!-- Add Product Attribute to Default attribute by dragging and dropping this to the 'Project Details' folder. Then Save. -->
-+        <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
-+            <argument name="group" value="Product Details"/>
-+            <argument name="attribute" value="{{productTextEditorAttribute.attribute_code}}"/>
-+        </actionGroup>
-+        <actionGroup ref="SaveAttributeSet" stepKey="saveAttributeSet"/>
-+
-+        <!-- Go Catalog > Product to create new product page -->
-+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndexPage"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+
-+        <!-- On product page, select Attribute Set: "Default" -->
-+        <actionGroup ref="AdminProductPageSelectAttributeSet" stepKey="selectAttributeSet">
-+            <argument name="attributeSetName" value="Default"/>
-+        </actionGroup>
-+
-+        <!-- Created product attribute appear on product form -->
-+        <seeElement selector="{{AdminProductFormSection.attributeLabelByText(productTextEditorAttribute.attribute_code)}}" stepKey="seeAttributeLabelInProductForm"/>
-+
-+        <!-- TinyMCE 4 is displayed in WYSIWYG content area -->
-+        <seeElement selector="{{TinyMCESection.TinyMCE4}}" stepKey="seeTinyMCE4"/>
-+
-+        <!-- Verify toolbar menu -->
-+        <actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyToolbarMenu"/>
-+
-+        <!-- Click Show/Hide button and see Insert Image button -->
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <click selector="{{ProductAttributeWYSIWYGSection.showHideBtn(productTextEditorAttribute.attribute_code)}}" stepKey="clickShowHideBtn"/>
-+        <waitForElementVisible selector="{{TinyMCESection.InsertImageBtn}}" stepKey="waitForInsertImageBtn"/>
-+
-+        <!-- Add content into attribute -->
-+        <fillField selector="{{ProductDescriptionWysiwygSection.attributeEditArea(productTextEditorAttribute.attribute_code)}}" userInput="This content from product page" stepKey="setContent"/>
-+
-+        <!-- Fill up all required fields for product form -->
-+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
-+
-+        <!-- Assert product attribute on Storefront -->
-+        <actionGroup ref="OpenStorefrontProductPageByProductNameActionGroup" stepKey="openProductPage"/>
-+        <scrollTo stepKey="scrollToMoreInformation" selector="{{StorefrontProductMoreInformationSection.moreInformationSpecs}}" />
-+        <actionGroup ref="AssertStorefrontCustomProductAttributeActionGroup" stepKey="checkAttributeInMoreInformationTab">
-+            <argument name="attributeLabel" value="{{productTextEditorAttribute.attribute_code}}"/>
-+            <argument name="attributeValue" value="This content from product page"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
-new file mode 100644
-index 00000000000..c3fe666c84f
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
-@@ -0,0 +1,56 @@
-+<?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="AdminCreateVirtualProductFillingRequiredFieldsOnlyTest">
-+        <annotations>
-+            <stories value="Create virtual product"/>
-+            <title value="Create virtual product filling required fields only"/>
-+            <description value="Test log in to Create virtual product and Create virtual product filling required fields only"/>
-+            <testCaseId value="MC-6031"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
-+        <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
-+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
-+
-+        <!-- Create virtual product with required fields only -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductWithRequiredFields.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductWithRequiredFields.price}}" stepKey="fillProductPrice"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved" />
-+
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
-+
-+        <!-- Verify we see created virtual product(from the above step) on the product grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickSelector"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName1"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{virtualProductWithRequiredFields.sku}}" stepKey="fillVirtualProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickSearch2"/>
-+        <waitForPageLoad stepKey="waitForProductSearch"/>
-+        <seeInField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="seeVirtualProductName"/>
-+        <seeInField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{virtualProductWithRequiredFields.sku}}" stepKey="seeVirtualProductSku"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
-new file mode 100644
-index 00000000000..26ad7a46a73
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
-@@ -0,0 +1,97 @@
-+<?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="AdminCreateVirtualProductOutOfStockWithTierPriceTest">
-+        <annotations>
-+            <stories value="Create virtual product"/>
-+            <title value="Create virtual product out of stock with tier price"/>
-+            <description value="Test log in to Create virtual product and Create virtual product out of stock with tier price"/>
-+            <testCaseId value="MC-6036"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
-+        <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
-+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
-+
-+        <!-- Create virtual product out of stock with tier price -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductOutOfStock.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductOutOfStock.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductOutOfStock.price}}" stepKey="fillProductPrice"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnDefault.website_0}}" stepKey="selectProductTierPriceWebsite"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnDefault.customer_group_0}}" stepKey="selectProductTierPriceCustGroup"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnDefault.qty_0}}" stepKey="fillProductTierPriceQuantityInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnDefault.price_0}}" stepKey="selectProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButtonToAddAnotherRow"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('1')}}" userInput="{{tierPriceOnDefault.website_1}}" stepKey="clickProductTierPriceWebsite1"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('1')}}" userInput="{{tierPriceOnDefault.customer_group_1}}" stepKey="clickProductTierPriceCustGroup1"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('1')}}" userInput="{{tierPriceOnDefault.qty_1}}" stepKey="fillProductTierPriceQuantityInput1"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('1')}}" userInput="{{tierPriceOnDefault.price_1}}" stepKey="selectProductTierPriceFixedPrice1"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductOutOfStock.quantity}}" stepKey="fillVirtualProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{virtualProductOutOfStock.status}}" stepKey="selectStockStatusOutOfStock"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
-+
-+        <!-- Verify we see created virtual product out of stock with tier price on the storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(virtualProductOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{virtualProductOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
-+
-+        <!--  Verify customer see product tier price on product page -->
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('1', tierPriceOnDefault.qty_0)}}" stepKey="firstTierPriceText"/>
-+        <assertEquals stepKey="assertTierPriceTextOnProductPage1">
-+            <expectedResult type="string">Buy {{tierPriceOnDefault.qty_0}} for ${{tierPriceOnDefault.price_0}} each and save 100%</expectedResult>
-+            <actualResult type="variable">firstTierPriceText</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('2', tierPriceOnDefault.qty_1)}}" stepKey="secondTierPriceText"/>
-+        <assertEquals stepKey="assertTierPriceTextOnProductPage2">
-+            <expectedResult type="string">Buy {{tierPriceOnDefault.qty_1}} for ${{tierPriceOnDefault.price_1}} each and save 100%</expectedResult>
-+            <actualResult type="variable">secondTierPriceText</actualResult>
-+        </assertEquals>
-+
-+        <!--  Verify customer see product out of stock status on product page -->
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{virtualProductOutOfStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{virtualProductOutOfStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
-new file mode 100644
-index 00000000000..17769c79677
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
-@@ -0,0 +1,160 @@
-+<?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="AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest">
-+        <annotations>
-+            <stories value="Create virtual product"/>
-+            <title value="Create virtual product with custom options suite and import options"/>
-+            <description value="Test log in to Create virtual product and Create virtual product with custom options suite and import options"/>
-+            <testCaseId value="MC-6034"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
-+        <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
-+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
-+
-+        <!-- Create virtual product with custom options suite and import options -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductCustomImportOptions.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductCustomImportOptions.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductCustomImportOptions.price}}" stepKey="fillProductPrice"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductCustomImportOptions.quantity}}" stepKey="fillProductQuantity"/>
-+        <click selector="{{AdminProductFormSection.productStockStatus}}" stepKey="clickProductStockStatus"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductCustomImportOptions.urlKey}}" stepKey="fillUrlKey"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOption"/>
-+
-+        <!-- Create virtual product with customizable options dataSet1 -->
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButton"/>
-+        <waitForPageLoad stepKey="waitForFirstOption"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('0')}}" userInput="{{virtualProductCustomizableOption1.title}}" stepKey="fillOptionTitleForFirstDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('1')}}" stepKey="selectOptionTypeDropDownFirstDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('1', virtualProductCustomizableOption1.type)}}" stepKey="selectOptionFieldFromDropDownForFirstDataSet"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('0')}}" stepKey="checkRequiredCheckBoxForFirstDataSet"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_price}}" stepKey="fillOptionPriceForFirstDataSet"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_price_type}}" stepKey="selectOptionPriceTypeForFirstDataSet"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_sku}}" stepKey="fillOptionSkuForFirstDataSet"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_max_characters}}" stepKey="fillOptionMaxCharactersForFirstDataSet"/>
-+
-+        <!-- Create virtual product with customizable options dataSet2 -->
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForSecondDataSet"/>
-+        <waitForPageLoad stepKey="waitForSecondDataSetToLoad"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('1')}}" userInput="{{virtualProductCustomizableOption2.title}}" stepKey="fillOptionTitleForSecondDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('2')}}" stepKey="selectOptionTypeDropDownSecondDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('2', virtualProductCustomizableOption2.type)}}" stepKey="selectOptionFieldFromDropDownForSecondDataSet"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('1')}}" stepKey="checkRequiredCheckBoxForSecondDataSet"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_price}}" stepKey="fillOptionPriceForSecondDataSet"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_price_type}}" stepKey="selectOptionPriceTypeForSecondDataSet"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_sku}}" stepKey="fillOptionSkuForSecondDataSet"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_max_characters}}" stepKey="fillOptionMaxCharactersForSecondDataSet"/>
-+
-+        <!-- Create virtual product with customizable options dataSet3 -->
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForThirdSetOfData"/>
-+        <waitForPageLoad stepKey="waitForThirdSetOfDataToLoad"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('2')}}" userInput="{{virtualProductCustomizableOption3.title}}" stepKey="fillOptionTitleForThirdDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('3')}}" stepKey="selectOptionTypeDropDownForThirdDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('3', virtualProductCustomizableOption3.type)}}" stepKey="selectOptionFieldFromDropDownForThirdDataSet"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('2')}}" stepKey="checkRequiredCheckBoxForThirdDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForThirdDataSetToAddFirstRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_title}}" stepKey="fillOptionTitleForThirdDataSetFirstRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_price}}" stepKey="fillOptionPriceForThirdDataSetFirstRow"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_price_type}}" stepKey="selectOptionPriceTypeForThirdDataSetFirstRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_sku}}" stepKey="fillOptionSkuForThirdDataSetFirstRow"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForThirdDataSetToAddSecondRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_title}}" stepKey="fillOptionTitleForThirdDataSetSecondRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price}}" stepKey="fillOptionPriceForThirdDataSetSecondRow"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price_type}}" stepKey="selectOptionPriceTypeForThirdDataSetSecondRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_sku}}" stepKey="fillOptionSkuForThirdDataSetSecondRow"/>
-+
-+        <!-- Create virtual product with customizable options dataSet4 -->
-+        <scrollToTopOfPage stepKey="scrollToAddOptionButton"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForFourthDataSet"/>
-+        <waitForPageLoad stepKey="waitForFourthDataSetToLoad"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('3')}}" userInput="{{virtualProductCustomizableOption4.title}}" stepKey="fillOptionTitleForFourthDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('4')}}" stepKey="selectOptionTypeDropDownForFourthSetOfData"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('4', virtualProductCustomizableOption4.type)}}" stepKey="selectOptionFieldFromDropDownForFourthDataSet"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('3')}}" stepKey="checkRequiredCheckBoxForFourthDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForFourthDataSetToAddFirstRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_title}}" stepKey="fillOptionTitleForFourthDataSetFirstRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_price}}" stepKey="fillOptionPriceForFourthDataSetFirstRow"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_price_type}}" stepKey="selectOptionPriceTypeForFourthDataSetFirstRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_sku}}" stepKey="fillOptionSkuForFourthDataSetFirstRow"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForFourthDataSetToAddSecondRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_title}}" stepKey="fillOptionTitleForFourthDataSetSecondRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price}}" stepKey="fillOptionPriceForFourthDataSetSecondRow"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price_type}}" stepKey="selectOptionPriceTypeForFourthDataSetSecondRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_sku}}" stepKey="fillOptionSkuForFourthDataSetSecondRow"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
-+
-+        <!-- Verify customer see created virtual product with custom options suite and import options(from above step) on storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(virtualProductCustomImportOptions.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{virtualProductCustomImportOptions.sku}}" stepKey="fillVirtualProductName"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{virtualProductCustomImportOptions.name}}" stepKey="seeVirtualProductName"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.productLink}}" stepKey="openSearchedProduct"/>
-+
-+        <!-- Verify we see created virtual product with custom options suite and import options on the storefront page -->
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductCustomImportOptions.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{virtualProductCustomImportOptions.sku}}" stepKey="seeVirtualProductSku"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{virtualProductCustomImportOptions.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{virtualProductCustomImportOptions.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify we see customizable options are Required -->
-+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption1.title)}}" stepKey="verifyFirstCustomOptionIsRequired" />
-+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption2.title)}}" stepKey="verifySecondCustomOptionIsRequired" />
-+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption3.title)}}" stepKey="verifyThirdCustomOptionIsRequired" />
-+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption4.title)}}" stepKey="verifyFourthCustomOptionIsRequired" />
-+
-+        <!--Verify we see customizable option titles and prices -->
-+        <grabMultiple selector="{{StorefrontProductInfoMainSection.allCustomOptionLabels}}" stepKey="allCustomOptionLabels" />
-+        <assertEquals stepKey="verifyLabels">
-+            <actualResult type="variable">allCustomOptionLabels</actualResult>
-+            <expectedResult type="array">[{{virtualProductCustomizableOption1.title}} + ${{virtualProductCustomizableOption1.option_0_price}}, {{virtualProductCustomizableOption2.title}} + ${{virtualProductCustomizableOption2.option_0_price}}, {{virtualProductCustomizableOption3.title}}, {{virtualProductCustomizableOption4.title}}]</expectedResult>
-+        </assertEquals>
-+        <grabAttributeFrom userInput="for" selector="{{StorefrontProductInfoMainSection.customOptionLabel(virtualProductCustomizableOption4.title)}}" stepKey="fourthOptionId" />
-+        <grabMultiple selector="{{StorefrontProductInfoMainSection.customSelectOptions({$fourthOptionId})}}" stepKey="grabFourthOptions" />
-+        <assertEquals stepKey="assertFourthSelectOptions">
-+            <actualResult type="variable">grabFourthOptions</actualResult>
-+            <expectedResult type="array">['-- Please Select --', {{virtualProductCustomizableOption4.option_0_title}} +$900.90, {{virtualProductCustomizableOption4.option_1_title}} +$20.02]</expectedResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
-new file mode 100644
-index 00000000000..78247f49435
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
-@@ -0,0 +1,132 @@
-+<?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="AdminCreateVirtualProductWithTierPriceForGeneralGroupTest">
-+        <annotations>
-+            <stories value="Create virtual product"/>
-+            <title value="Create virtual product with tier price for General group"/>
-+            <description value="Test log in to Create virtual product and Create virtual product with tier price for General group"/>
-+            <testCaseId value="MC-6033"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+            <createData entity="Simple_US_CA_Customer" stepKey="customer" />
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
-+            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
-+        <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
-+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
-+
-+        <!-- Create virtual product with tier price for general group -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductGeneralGroup.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductGeneralGroup.price}}" stepKey="fillProductPrice"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnGeneralGroup.website}}" stepKey="selectProductTierPriceWebsite"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnGeneralGroup.customer_group}}" stepKey="selectProductTierPriceGroup"/>
-+        <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnGeneralGroup.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnGeneralGroup.price}}" stepKey="fillProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{virtualProductGeneralGroup.productTaxClass}}" stepKey="selectProductTaxClass"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductGeneralGroup.quantity}}" stepKey="fillProductQuantity"/>
-+        <click selector="{{AdminProductFormSection.productStockStatus}}" stepKey="clickProductStockStatus"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductGeneralGroup.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSectionHeader"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductGeneralGroup.urlKey}}" stepKey="fillUrlKeyInput"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
-+
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="checkRetailCustomerTaxClass" />
-+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="fillVirtualProductName"/>
-+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-+        <waitForPageLoad stepKey="waitForProductSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Verify we see created virtual product with tier price for general group(from the above step) in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductGeneralGroup.sku}}" stepKey="seeProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductGeneralGroup.price}}" stepKey="seeProductPrice"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
-+        <seeOptionIsSelected selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnGeneralGroup.website}}" stepKey="seeProductTierPriceWebsite"/>
-+        <seeOptionIsSelected selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnGeneralGroup.customer_group}}" stepKey="seeProductTierPriceGroup"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnGeneralGroup.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnGeneralGroup.price}}" stepKey="seeProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
-+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{virtualProductGeneralGroup.productTaxClass}}" stepKey="seeProductTaxClass"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductGeneralGroup.quantity}}" stepKey="seeProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{virtualProductGeneralGroup.status}}" stepKey="seeProductStockStatus"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
-+        <assertEquals stepKey="assertSelectedCategories">
-+            <actualResult type="variable">selectedCategories</actualResult>
-+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
-+        </assertEquals>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductGeneralGroup.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductGeneralGroup.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer see created virtual product on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="seeVirtualProductNameOnCategoryPage"/>
-+
-+        <!-- Verify customer see created virtual product with tier price for general group(from above step) in storefront page with customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$customer$$" />
-+        </actionGroup>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefront"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="fillVirtualProductNameInSearchTextBox"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="seeVirtualProductName"/>
-+        <grabTextFrom selector="{{StorefrontQuickSearchResultsSection.asLowAsLabel}}" stepKey="tierPriceTextOnStorefrontPage"/>
-+
-+        <!-- Verify customer see created virtual product with tier price -->
-+        <assertEquals stepKey="assertTierPriceTextOnCategoryPage">
-+            <expectedResult type="string">As low as ${{tierPriceOnGeneralGroup.price}}</expectedResult>
-+            <actualResult type="variable">tierPriceTextOnStorefrontPage</actualResult>
-+        </assertEquals>
-+        <click selector="{{StorefrontQuickSearchResultsSection.productLink}}" stepKey="openSearchedProduct"/>
-+        <waitForPageLoad stepKey="waitForProductPageToBeLoaded"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
-+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
-+            <expectedResult type="string">Buy {{tierPriceOnGeneralGroup.qty}} for ${{tierPriceOnGeneralGroup.price}} each and save 20%</expectedResult>
-+            <actualResult type="variable">tierPriceText</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
-new file mode 100644
-index 00000000000..6ef2569945f
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
-@@ -0,0 +1,123 @@
-+<?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="AdminCreateVirtualProductWithTierPriceTest">
-+        <annotations>
-+            <stories value="Create virtual product"/>
-+            <title value="Create virtual product with tier price"/>
-+            <description value="Test log in to Create virtual product and Create virtual product with tier price"/>
-+            <testCaseId value="MC-6032"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
-+        <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
-+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
-+
-+        <!-- Create virtual product with tier price -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductBigQty.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductBigQty.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductBigQty.price}}" stepKey="fillProductPrice"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
-+        <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="selectProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{virtualProductBigQty.productTaxClass}}" stepKey="selectProductTaxClass"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductBigQty.quantity}}" stepKey="fillProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{virtualProductBigQty.status}}" stepKey="selectStockStatusInStock"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductBigQty.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductBigQty.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
-+
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="checkRetailCustomerTaxClass" />
-+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{virtualProductBigQty.name}}" stepKey="fillProductName1"/>
-+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-+        <waitForPageLoad stepKey="waitForProductSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened" />
-+
-+        <!-- Verify we see created virtual product with tier price(from the above step) in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductBigQty.sku}}" stepKey="seeProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductBigQty.price}}" stepKey="seeProductPrice"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="seeProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
-+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{virtualProductBigQty.productTaxClass}}" stepKey="seeProductTaxClass"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductBigQty.quantity}}" stepKey="seeProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{virtualProductBigQty.status}}" stepKey="seeProductStockStatus"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
-+        <assertEquals stepKey="assertSelectedCategories">
-+            <actualResult type="variable">selectedCategories</actualResult>
-+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
-+        </assertEquals>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductBigQty.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductBigQty.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer see created virtual product on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeVirtualProductNameOnCategoryPage"/>
-+
-+        <!-- Verify customer see created virtual product with tier price(from above step) on storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefront"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{virtualProductBigQty.sku}}" stepKey="fillVirtualProductName"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeVirtualProductName"/>
-+        <grabTextFrom selector="{{StorefrontQuickSearchResultsSection.asLowAsLabel}}" stepKey="tierPriceTextOnStorefrontPage"/>
-+        <assertEquals stepKey="assertTierPriceTextOnCategoryPage">
-+            <expectedResult type="string">As low as ${{tierPriceOnVirtualProduct.price}}</expectedResult>
-+            <actualResult type="variable">tierPriceTextOnStorefrontPage</actualResult>
-+        </assertEquals>
-+        <click selector="{{StorefrontQuickSearchResultsSection.productLink}}" stepKey="openSearchedProduct"/>
-+        <waitForPageLoad stepKey="waitForProductPageToBeLoaded" />
-+
-+        <!-- Verify customer see product tier price on product page -->
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
-+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
-+            <expectedResult type="string">Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 10%</expectedResult>
-+            <actualResult type="variable">tierPriceText</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
-new file mode 100644
-index 00000000000..cb41b0292d3
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
-@@ -0,0 +1,88 @@
-+<?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="AdminCreateVirtualProductWithoutManageStockTest">
-+        <annotations>
-+            <stories value="Create virtual product"/>
-+            <title value="Create virtual product without manage stock"/>
-+            <description value="Test log in to Create virtual product and Create virtual product without manage stock"/>
-+            <testCaseId value="MC-6035"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
-+        <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
-+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
-+
-+        <!-- Create virtual product without manage stock  -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductWithoutManageStock.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductWithoutManageStock.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductWithoutManageStock.price}}" stepKey="fillProductPrice"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" userInput="{{virtualProductWithoutManageStock.special_price}}" stepKey="fillSpecialPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductWithoutManageStock.quantity}}" stepKey="fillProductQuantity"/>
-+        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickAdvancedInventoryLink"/>
-+        <click selector="{{AdminProductFormAdvancedInventorySection.manageStock}}" stepKey="clickManageStock"/>
-+        <checkOption selector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" stepKey="CheckUseConfigSettingsCheckBox"/>
-+        <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}" stepKey="clickDoneButtonOnAdvancedInventorySection"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductWithoutManageStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
-+
-+        <!-- Verify customer see created virtual product without manage stock on the storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(virtualProductWithoutManageStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontPageToLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductWithoutManageStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{virtualProductWithoutManageStock.sku}}" stepKey="seeVirtualProductSku"/>
-+
-+        <!-- Verify customer see product special price on the storefront page -->
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.specialPriceAmount}}" stepKey="specialPriceAmount"/>
-+        <assertEquals stepKey="assertSpecialPriceTextOnProductPage">
-+            <expectedResult type="string">${{virtualProductWithoutManageStock.special_price}}</expectedResult>
-+            <actualResult type="variable">specialPriceAmount</actualResult>
-+        </assertEquals>
-+
-+        <!-- Verify customer see product old price on the storefront page -->
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.oldPriceAmount}}" stepKey="oldPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{virtualProductWithoutManageStock.price}}</expectedResult>
-+            <actualResult type="variable">oldPriceAmount</actualResult>
-+        </assertEquals>
-+
-+        <!-- Verify customer see product in stock status on the storefront page -->
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{virtualProductWithoutManageStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteAttributeSetTest.xml
-new file mode 100644
-index 00000000000..cbe2f40e0dd
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteAttributeSetTest.xml
-@@ -0,0 +1,56 @@
-+<?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="AdminDeleteAttributeSetTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Attribute sets"/>
-+            <title value="Delete Attribute Set"/>
-+            <description value="Admin should be able to delete an attribute set"/>
-+            <testCaseId value="MC-10889"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
-+            <createData entity="SimpleProductWithCustomAttributeSet" stepKey="SimpleProductWithCustomAttributeSet">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <requiredEntity createDataKey="createAttributeSet"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSetsPage"/>
-+        <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="$$createAttributeSet.attribute_set_name$$" stepKey="filterByAttributeName"/>
-+        <!-- Filter the grid to find created below attribute set -->
-+        <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearch"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-+        <!-- Delete attribute set and confirm the modal -->
-+        <click selector="{{AdminProductAttributeSetSection.deleteBtn}}" stepKey="clickDelete"/>
-+        <click selector="{{AdminProductAttributeSetSection.modalOk}}" stepKey="confirmDelete"/>
-+        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="The attribute set has been removed." stepKey="deleteMessage"/>
-+        <!-- Assert the attribute set is not in the grid -->
-+        <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="$$createAttributeSet.attribute_set_name$$" stepKey="filterByAttributeName2"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearch2"/>
-+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
-+        <!-- Search for the product by sku and name on the product page -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToAdminProductIndex"/>
-+        <waitForPageLoad stepKey="waitForAdminProductIndex"/>
-+        <actionGroup ref="filterProductGridBySkuAndName" stepKey="filerProductsBySkuAndName">
-+            <argument name="product" value="SimpleProductWithCustomAttributeSet"/>
-+        </actionGroup>
-+        <!-- Should not see the product -->
-+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteConfigurableChildProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteConfigurableChildProductsTest.xml
-new file mode 100644
-index 00000000000..0df9dd0b575
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteConfigurableChildProductsTest.xml
-@@ -0,0 +1,121 @@
-+<?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="AdminDeleteConfigurableChildProductsTest">
-+        <annotations>
-+            <stories value="Configurable Product"/>
-+            <title value="Configurable Product should not be visible on storefront after child products are deleted"/>
-+            <description value="Login as admin, delete configurable child product and verify product displays out of stock in store front"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13684"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!--Set Display Out Of Stock Product -->
-+            <magentoCLI stepKey="setDisplayOutOfStockProduct" command="config:set cataloginventory/options/show_out_of_stock 0 "/>
-+            <!--Login as Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <!--Create Default Category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <!-- Create an attribute with two options to be used in the first child product -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <!-- Add the attribute just created to default attribute set -->
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <!-- Get the first option of the attribute created -->
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <!-- Get the second option of the attribute created -->
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <!-- Create Configurable product -->
-+            <createData entity="BaseConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <!-- Create a simple product and give it the attribute with the first option -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+             <!--Create a simple product and give it the attribute with the second option -->
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+            <!-- Create the configurable product -->
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+            <!-- Add the first simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <!-- Add the second simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!--Delete Created Data-->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteAttribute"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Open Product in Store Front Page -->
-+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="openProductInStoreFront"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+        <!--Verify Product is visible and In Stock -->
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryInFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigProduct.price$$" stepKey="seeProductPriceInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createConfigProduct.sku$$" stepKey="seeProductSkuInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStatusInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="$$createConfigProductAttribute.default_value$$" stepKey="seeProductAttributeLabel"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="seeProductAttributeOptions"/>
-+        <!-- Delete Child products -->
-+        <actionGroup ref="deleteProductBySku" stepKey="deleteFirstChildProduct">
-+            <argument name="sku" value="$$createConfigChildProduct1.sku$$"/>
-+        </actionGroup>
-+        <actionGroup ref="deleteProductBySku" stepKey="deleteSecondChildProduct">
-+            <argument name="sku" value="$$createConfigChildProduct2.sku$$"/>
-+        </actionGroup>
-+        <!--Verify product is not visible in category store front page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="openCategoryStoreFrontPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryInStoreFrontPage"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickOnCategory"/>
-+        <dontSee selector="{{StorefrontCategoryMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="dontSeeProductInCategoryPage"/>
-+        <!--Open Product Store Front Page and Verify Product is Out Of Stock -->
-+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="openProductInStoreFront1"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad1"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryInFrontPage1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInStoreFront1"/>
-+        <dontSee selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigProduct.price$$" stepKey="dontSeeProductPriceInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createConfigProduct.sku$$" stepKey="seeProductSkuInStoreFront1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="OUT OF STOCK" stepKey="seeProductStatusInStoreFront1"/>
-+        <dontSee selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="$$createConfigProductAttribute.default_value$$" stepKey="dontSeeProductAttributeLabel"/>
-+        <dontSeeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="dontSeeProductAttributeOptions"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteDropdownProductAttributeFromAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteDropdownProductAttributeFromAttributeSetTest.xml
-new file mode 100644
-index 00000000000..3841c061c26
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteDropdownProductAttributeFromAttributeSetTest.xml
-@@ -0,0 +1,72 @@
-+<?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="AdminDeleteDropdownProductAttributeFromAttributeSetTest">
-+        <annotations>
-+            <stories value="Delete product attributes"/>
-+            <title value="Delete Product Attribute, Dropdown Type, from Attribute Set"/>
-+            <description value="Login as admin and delete dropdown type product attribute from attribute set"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10885"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <!-- Create Dropdown Product Attribute -->
-+            <createData entity="productDropDownAttribute" stepKey="attribute"/>
-+            <!-- Create Attribute set -->
-+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
-+        </before>
-+        <after>
-+            <!--Delete Created Data -->
-+            <deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Open Product Attribute Set Page -->
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>
-+        <waitForPageLoad stepKey="waitForProductAttributeSetPageToLoad"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.resetFilter}}" stepKey="clickOnResetFilter"/>
-+        <!-- Filter created Product Attribute Set -->
-+        <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="$$createAttributeSet.attribute_set_name$$" stepKey="fillAttributeSetName"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickOnSearchButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.AttributeSetName($$createAttributeSet.attribute_set_name$$)}}" stepKey="clickOnAttributeSet"/>
-+        <waitForPageLoad stepKey="waitForAttributeSetEditPageToLoad"/>
-+        <!--Assign Attribute to the Group and save the attribute set -->
-+        <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttribute">
-+            <argument name="group" value="Product Details"/>
-+            <argument name="attribute" value="$$attribute.attribute_code$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductAttributeSetActionSection.save}}" stepKey="clickOnSaveButton"/>
-+        <waitForPageLoad stepKey="waitForPageToSave"/>
-+        <see userInput="You saved the attribute set" selector="{{AdminMessagesSection.success}}" stepKey="successMessage"/>
-+        <!--Delete product attribute from product attribute grid -->
-+        <actionGroup ref="deleteProductAttributeByAttributeCode" stepKey="deleteProductAttribute">
-+            <argument name="ProductAttributeCode" value="$$attribute.attribute_code$$"/>
-+        </actionGroup>
-+        <!--Confirm Attribute is not present in Product Attribute Grid -->
-+        <actionGroup ref="filterProductAttributeByAttributeCode" stepKey="filterAttribute">
-+            <argument name="ProductAttributeCode" value="$$attribute.attribute_code$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminProductAttributeGridSection.FirstRow}}" userInput="We couldn't find any records." stepKey="seeEmptyRow"/>
-+        <!-- Verify Attribute is not present in Product Attribute Set Page  -->
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets1"/>
-+        <waitForPageLoad stepKey="waitForProductAttributeSetPageToLoad1"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.resetFilter}}" stepKey="clickOnResetFilter1"/>
-+        <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="$$createAttributeSet.attribute_set_name$$" stepKey="fillAttributeSetName1"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickOnSearchButton1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.AttributeSetName($$createAttributeSet.attribute_set_name$$)}}" stepKey="clickOnAttributeSet1"/>
-+        <waitForPageLoad stepKey="waitForAttributeSetEditPageToLoad1"/>
-+        <dontSee userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="dontSeeAttributeInAttributeGroupTree"/>
-+        <dontSee userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="dontSeeAttributeInUnassignedAttributeTree"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductAttributeTest.xml
-new file mode 100644
-index 00000000000..d0036a2adea
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductAttributeTest.xml
-@@ -0,0 +1,65 @@
-+<?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="DeleteProductAttributeTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Product attributes"/>
-+            <title value="Delete Product Attribute"/>
-+            <description value="Admin should able to delete a product attribute"/>
-+            <testCaseId value="MC-10887"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="productAttributeWysiwyg" stepKey="createProductAttribute"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="deleteProductAttributeByAttributeCode" stepKey="deleteProductAttribute">
-+            <argument name="ProductAttributeCode" value="$$createProductAttribute.attribute_code$$"/>
-+        </actionGroup>
-+        <!-- Assert the product attribute is not in the grid by Attribute code -->
-+        <actionGroup ref="filterProductAttributeByAttributeCode" stepKey="filterByAttributeCode">
-+            <argument name="ProductAttributeCode" value="$$createProductAttribute.attribute_code$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
-+        <!--Assert the product attribute is not in the grid by Default Label -->
-+        <actionGroup ref="filterProductAttributeByDefaultLabel" stepKey="filterByDefaultLabel">
-+            <argument name="productAttributeLabel" value="$$createProductAttribute.default_frontend_label$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage2"/>
-+         <!--Go to the Catalog > Products page and create Simple Product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-+        <waitForPageLoad stepKey="waitForProductList"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="toggleAddProductBtn"/>
-+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="chooseAddSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitForProductAdded"/>
-+        <!-- Press Add Attribute button -->
-+        <click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAttributeBtn"/>
-+        <waitForPageLoad stepKey="waitForAttributeAdded"/>
-+        <!-- Filter By Attribute Label on Add Attribute Page -->
-+        <click selector="{{AdminProductFiltersSection.filter}}" stepKey="clickOnFilter"/>
-+        <actionGroup ref="filterProductAttributeByAttributeLabel" stepKey="filterByAttributeLabel">
-+            <argument name="productAttributeLabel" value="$$createProductAttribute.default_frontend_label$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage3"/>
-+         <!-- Filter By Attribute Code on Export > Products page -->
-+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="navigateToSystemExport"/>
-+        <selectOption selector="{{AdminExportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
-+        <waitForElementVisible selector="{{AdminExportMainSection.entityAttributes}}" stepKey="waitForElementVisible"/>
-+        <click selector="{{AdminExportAttributeSection.resetFilter}}" stepKey="resetFilter"/>
-+        <fillField selector="{{AdminExportAttributeSection.filterByAttributeCode}}" userInput="$$createProductAttribute.attribute_code$$" stepKey="setAttributeCode"/>
-+        <waitForPageLoad stepKey="waitForUserInput"/>
-+        <click selector="{{AdminExportAttributeSection.search}}" stepKey="searchForAttribute"/>
-+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage4"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductWithCustomOptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductWithCustomOptionTest.xml
-new file mode 100644
-index 00000000000..7f6a1333b72
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductWithCustomOptionTest.xml
-@@ -0,0 +1,54 @@
-+<?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="AdminDeleteProductWithCustomOptionTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Delete products"/>
-+            <title value="Delete Product with Custom Option"/>
-+            <description value="Admin should be able to delete a product with custom option"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11015"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <updateData createDataKey="createSimpleProduct" entity="productWithOptions2" stepKey="updateProductWithCustomOption"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteSimpleProductFilteredBySkuAndName">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
-+        <!--Verify product on product page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
-+        <!-- Search for the product by sku -->
-+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createSimpleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-+        <waitForPageLoad stepKey="waitForSearchButton"/>
-+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForSearchResults"/>
-+        <!-- Should not see any search results -->
-+        <dontSee userInput="$$createSimpleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
-+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
-+        <!-- Go to the category page that we created in the before block -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-+        <!-- Should not see the product -->
-+        <dontSee userInput="$$createSimpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
-+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
-new file mode 100644
-index 00000000000..e4b269dff96
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
-@@ -0,0 +1,51 @@
-+<?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="AdminDeleteRootCategoryAssignedToStoreTest">
-+        <annotations>
-+            <stories value="Delete categories"/>
-+            <title value="Cannot delete root category assigned to some store"/>
-+            <description value="Login as admin and root category can not be deleted when category is assigned with any store."/>
-+            <testCaseId value="MC-6050"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="NewRootCategory" stepKey="rootCategory" />
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCreatedStore">
-+                <argument name="storeGroupName" value="customStore.code"/>
-+            </actionGroup>
-+            <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
-+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
-+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
-+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
-+        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
-+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
-+        <see userInput="You saved the store." stepKey="seeSaveMessage"/>
-+
-+        <!--Verify Delete Root Category can not be deleted-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
-+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded1"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(NewRootCategory.name))}}" stepKey="clickRootCategoryInTree"/>
-+
-+        <!--Verify Delete button is not displayed-->
-+        <dontSeeElement selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="dontSeeDeleteButton"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryTest.xml
-new file mode 100644
-index 00000000000..e7ab14c7794
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryTest.xml
-@@ -0,0 +1,44 @@
-+<?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="AdminDeleteRootCategoryTest">
-+        <annotations>
-+            <stories value="Delete categories"/>
-+            <title value="Can delete a root category not assigned to any store"/>
-+            <description value="Login as admin and delete a root category not assigned to any store"/>
-+            <testCaseId value="MC-6048"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="NewRootCategory" stepKey="rootCategory" />
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Verify Created root Category-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <seeElement selector="{{AdminCategoryBasicFieldSection.CategoryNameInput(NewRootCategory.name)}}" stepKey="seeRootCategory"/>
-+
-+        <!--Delete Root Category-->
-+        <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
-+
-+        <!--Verify Root Category is not listed in backend-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
-+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded1"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories1"/>
-+        <dontSee selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{NewRootCategory.name}}" stepKey="dontSeeRootCategory"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootSubCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootSubCategoryTest.xml
-new file mode 100644
-index 00000000000..6df571f403a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootSubCategoryTest.xml
-@@ -0,0 +1,90 @@
-+<?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="AdminDeleteRootSubCategoryTest">
-+        <annotations>
-+            <stories value="Delete categories"/>
-+            <title value="Can delete a subcategory"/>
-+            <description value="Login as admin and delete a root sub category"/>
-+            <testCaseId value="MC-6049"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="NewRootCategory" stepKey="rootCategory" />
-+            <createData entity="SimpleRootSubCategory" stepKey="category">
-+                <requiredEntity createDataKey="rootCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCreatedStore">
-+                <argument name="storeGroupName" value="customStore.code"/>
-+            </actionGroup>
-+            <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create a Store-->
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
-+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
-+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
-+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
-+        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
-+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
-+        <see userInput="You saved the store." stepKey="seeSaveMessage"/>
-+
-+        <!--Create a Store View-->
-+        <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="selectCreateStoreView"/>
-+        <click selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="clickDropDown"/>
-+        <selectOption userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreViewStatus"/>
-+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
-+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
-+        <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="Enabled" stepKey="enableStatus"/>
-+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreViewButton"/>
-+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
-+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
-+        <waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
-+        <see userInput="You saved the store view." stepKey="seeSaveMessage1"/>
-+
-+        <!--Go To store front page-->
-+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
-+        <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
-+
-+        <!--Verify subcategory displayed in store front-->
-+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="selectMainWebsite"/>
-+        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}"  stepKey="selectMainWebsite1"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeSubCategoryInStoreFront"/>
-+
-+        <!--Delete SubCategory-->
-+        <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+
-+        <!--Verify Sub Category is absent in backend -->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories2"/>
-+        <dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="dontSeeCategoryInTree"/>
-+
-+        <!--Verify Sub Category is not present in Store Front-->
-+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage1"/>
-+        <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad2"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryInStoreFront"/>
-+
-+        <!--Verify in Category is not in Url Rewrite grid-->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
-+        <waitForPageLoad stepKey="waitForUrlRewritePageTopLoad"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleRootSubCategory.url_key}}" stepKey="fillRequestPath"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.emptyRecordMessage}}" userInput="We couldn't find any records." stepKey="seeEmptyRow"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSimpleProductTest.xml
-new file mode 100644
-index 00000000000..7c460a3dfc5
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSimpleProductTest.xml
-@@ -0,0 +1,53 @@
-+<?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="AdminDeleteSimpleProductTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Delete products"/>
-+            <title value="Delete Simple Product"/>
-+            <description value="Admin should be able to delete a simple product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11013"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteSimpleProductFilteredBySkuAndName">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
-+        <!--Verify product on Product Page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
-+        <!-- Search for the product by sku -->
-+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createSimpleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-+        <waitForPageLoad stepKey="waitForSearchButton"/>
-+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForSearchResults"/>
-+        <!-- Should not see any search results -->
-+        <dontSee userInput="$$createSimpleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
-+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
-+        <!-- Go to the category page that we created in the before block -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-+        <!-- Should not see the product -->
-+        <dontSee userInput="$$createSimpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
-+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSystemProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSystemProductAttributeTest.xml
-new file mode 100644
-index 00000000000..6de1a5cd359
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSystemProductAttributeTest.xml
-@@ -0,0 +1,34 @@
-+<?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="AdminDeleteSystemProductAttributeTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Delete System Product Attribute"/>
-+            <title value="Delete System Product Attribute"/>
-+            <description value="Admin should not be able to see Delete Attribute button"/>
-+            <testCaseId value="MC-10893"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttribute"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
-+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{newsFromDate.attribute_code}}" stepKey="setAttributeCode"/>
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
-+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
-+        <dontSeeElement selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="dontSeeDeleteAttributeBtn" />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteTextFieldProductAttributeFromAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteTextFieldProductAttributeFromAttributeSetTest.xml
-new file mode 100644
-index 00000000000..c3cafb17c5e
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteTextFieldProductAttributeFromAttributeSetTest.xml
-@@ -0,0 +1,88 @@
-+<?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="AdminDeleteTextFieldProductAttributeFromAttributeSetTest">
-+        <annotations>
-+            <stories value="Delete product attributes"/>
-+            <title value="Delete Product Attribute, Text Field, from Attribute Set"/>
-+            <description value="Login as admin and delete Text Field type product attribute from attribute set"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10886"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <!-- Create Product Attribute and assign to Default Product Attribute Set -->
-+            <createData entity="newProductAttribute" stepKey="attribute"/>
-+            <createData entity="AddToDefaultSet" stepKey="addToDefaultAttributeSet">
-+                <requiredEntity createDataKey="attribute"/>
-+            </createData>
-+            <!-- Create Simple Product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
-+        </before>
-+        <after>
-+            <!--Delete cteated Data -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimplaeProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Open Product Attribute Set Page -->
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>
-+        <waitForPageLoad stepKey="waitForProductAttributeSetPageToLoad"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.resetFilter}}" stepKey="clickOnResetFilter"/>
-+        <!--Select Default Product Attribute Set -->
-+        <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="Default" stepKey="fillAttributeSetName"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickOnSearchButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-+        <waitForPageLoad stepKey="waitForAttributeSetEditPageToLoad"/>
-+        <see selector="{{AdminProductAttributeSetEditSection.groupTree}}" userInput="$$attribute.attribute_code$$" stepKey="seeAttributeInAttributeGroupTree"/>
-+        <!--Open Product Index Page and filter the product-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProduct">
-+            <argument name="product" value="SimpleProduct2"/>
-+        </actionGroup>
-+        <!--Verify Created Product Attribute displayed in Product page -->
-+        <click stepKey="openSelectedProduct" selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+        <seeElement selector="{{AdminProductFormSection.newAddedAttribute($$attribute.attribute_code$$)}}" stepKey="seeProductAttributeIsAdded"/>
-+        <!--Delete product attribute from product attribute grid -->
-+        <actionGroup ref="deleteProductAttributeByAttributeCode" stepKey="deleteProductAttribute">
-+            <argument name="ProductAttributeCode" value="$$attribute.attribute_code$$"/>
-+        </actionGroup>
-+        <!-- Confirm attribute is not present in product attribute grid -->
-+        <actionGroup ref="filterProductAttributeByAttributeCode" stepKey="filterAttribute">
-+            <argument name="ProductAttributeCode" value="$$attribute.attribute_code$$"/>
-+        </actionGroup>
-+        <see stepKey="seeEmptyRow" selector="{{AdminProductAttributeGridSection.FirstRow}}" userInput="We couldn't find any records."/>
-+        <!-- Verify Attribute is not present in Product Attribute Set Page -->
-+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets1"/>
-+        <waitForPageLoad stepKey="waitForProductAttributeSetPageToLoad1"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.resetFilter}}" stepKey="clickOnResetFilter1"/>
-+        <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="Default" stepKey="fillAttributeSetName1"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickOnSearchButton1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+        <waitForPageLoad stepKey="waitForAttributeSetEditPageToLoad1"/>
-+        <dontSee userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="dontSeeAttributeInAttributeGroupTree"/>
-+        <dontSee userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="dontSeeAttributeInUnassignedAttributeTree"/>
-+        <!--Verify Product Attribute is not present in Product Index Page -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openProductIndexPage"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad1"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProduct1">
-+            <argument name="product" value="SimpleProduct2"/>
-+        </actionGroup>
-+        <!--Verify Product Attribute is not present in Product page -->
-+        <click  selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}" stepKey="openSelectedProduct1"/>
-+        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
-+        <dontSeeElement selector="{{AdminProductFormSection.newAddedAttribute($$attribute.attribute_code$$)}}" stepKey="dontSeeProductAttribute"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteVirtualProductTest.xml
-new file mode 100644
-index 00000000000..413d53d1c37
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteVirtualProductTest.xml
-@@ -0,0 +1,54 @@
-+<?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="AdminDeleteVirtualProductTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Delete products"/>
-+            <title value="Delete Virtual Product"/>
-+            <description value="Admin should be able to delete a virtual product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11014"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="defaultVirtualProduct" stepKey="createVirtualProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteVirtualProductFilteredBySkuAndName">
-+            <argument name="product" value="$$createVirtualProduct$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
-+        <!--Verify product on product page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.name$$)}}" stepKey="amOnVirtualProductPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
-+        <!-- Search for the product by sku -->
-+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createVirtualProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-+        <waitForPageLoad stepKey="waitForSearchButton"/>
-+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForSearchResults"/>
-+        <!-- Should not see any search results -->
-+        <dontSee userInput="$$createVirtualProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
-+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
-+        <!-- Go to the category page that we created in the before block -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-+        <!-- Should not see the product -->
-+        <dontSee userInput="$$createVirtualProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
-+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
-index 71f2ffecb46..53040993beb 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
-@@ -6,16 +6,16 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminEditTextEditorProductAttributeTest">
-         <annotations>
-             <features value="Catalog"/>
-             <stories value="MAGETWO-51484-Input type configuration for custom Product Attributes"/>
-             <group value="Catalog"/>
--            <title value="Admin should be able to switch between two versions of TinyMCE"/>
--            <description value="Admin should be able to switch between two versions of TinyMCE"/>
-+            <title value="Admin are able to change Input Type of Text Editor product attribute"/>
-+            <description value="Admin are able to change Input Type of Text Editor product attribute"/>
-             <severity value="CRITICAL"/>
--            <testCaseId value="MAGETWO-85745"/>
-+            <testCaseId value="MC-6215"/>
-         </annotations>
-         <before>
-             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-@@ -26,10 +26,9 @@
-                 <requiredEntity createDataKey="myProductAttributeCreation"/>
-             </createData>
-         </before>
--        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid1"/>
--        <waitForPageLoad stepKey="waitForPageLoad1"/>
--        <click selector="{{AdminProductAttributeGridSection.AttributeCode($$myProductAttributeCreation.attribute_code$$)}}" stepKey="navigateToAttributeEditPage1" />
--        <waitForPageLoad stepKey="waitForPageLoad2" />
-+        <actionGroup ref="navigateToCreatedProductAttribute" stepKey="navigateToAttribute">
-+            <argument name="ProductAttribute" value="productAttributeWysiwyg"/>
-+        </actionGroup>
-         <seeOptionIsSelected selector="{{AttributePropertiesSection.InputType}}" userInput="Text Editor" stepKey="seeTextEditorSelected" />
-         <see selector="{{AttributePropertiesSection.InputType}}" userInput="Text Area" stepKey="seeTextArea1" />
-         <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="Text Area"  stepKey="selectTextArea" />
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
-new file mode 100644
-index 00000000000..f3ec225540c
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
-@@ -0,0 +1,45 @@
-+<?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="AdminFilterByNameByStoreViewOnProductGridTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Filter products"/>
-+            <title value="Product grid filtering by store view level attribute"/>
-+            <description value="Verify that products grid can be filtered on all store view level by attribute"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-98755"/>
-+            <useCaseId value="MAGETWO-98335"/>
-+            <group value="catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToEditPage"/>
-+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToDefaultStoreView">
-+            <argument name="storeView" value="_defaultStore.name"/>
-+        </actionGroup>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.productNameUseDefault}}" stepKey="uncheckUseDefault"/>
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillNewName"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <actionGroup ref="filterProductGridByName" stepKey="filterGridByName">
-+            <argument name="product" value="SimpleProduct"/>
-+        </actionGroup>
-+        <see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{SimpleProduct2.name}}" stepKey="seeProductNameInGrid"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
-new file mode 100644
-index 00000000000..5c434ecabf8
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
-@@ -0,0 +1,160 @@
-+<?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="AdminFilteringCategoryProductsUsingScopeSelectorTest">
-+        <annotations>
-+            <stories value="Filtering Category Products"/>
-+            <title value="Filtering Category Products using scope selector"/>
-+            <description value="Filtering Category Products using scope selector"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-48850"/>
-+            <group value="catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create website, Store and Store View-->
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createSecondWebsite">
-+                <argument name="newWebsiteName" value="{{secondCustomWebsite.name}}"/>
-+                <argument name="websiteCode" value="{{secondCustomWebsite.code}}"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStoreGroup">
-+                <argument name="website" value="{{secondCustomWebsite.name}}"/>
-+                <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
-+                <argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
-+                <argument name="StoreGroup" value="SecondStoreGroupUnique"/>
-+                <argument name="customStore" value="SecondStoreUnique"/>
-+            </actionGroup>
-+
-+            <!--Create Simple Product and Category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct0">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createProduct1">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createProduct2">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createProduct12">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Set filter to product name and product0 not assigned to any website-->
-+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct0">
-+                <argument name="product" value="$$createProduct0$$"/>
-+            </actionGroup>
-+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="clickOpenProductForEdit0">
-+                <argument name="product" value="$$createProduct0$$"/>
-+            </actionGroup>
-+            <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsitesSection"/>
-+            <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="clickToOpenWebsiteSection"/>
-+            <waitForPageLoad stepKey="waitForToOpenedWebsiteSection"/>
-+            <uncheckOption selector="{{ProductInWebsitesSection.website('Main Website')}}" stepKey="uncheckWebsite"/>
-+            <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
-+
-+            <!-- Set filter to product name and product2 in website 2 only -->
-+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct2">
-+                <argument name="product" value="$$createProduct2$$"/>
-+            </actionGroup>
-+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="clickOpenProductForEdit2">
-+                <argument name="product" value="$$createProduct2$$"/>
-+            </actionGroup>
-+            <actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectProductInWebsites">
-+                <argument name="website" value="{{secondCustomWebsite.name}}"/>
-+            </actionGroup>
-+            <uncheckOption selector="{{ProductInWebsitesSection.website('Main Website')}}" stepKey="uncheckWebsite1"/>
-+            <actionGroup ref="saveProductForm" stepKey="saveProduct2"/>
-+
-+            <!-- Set filter to product name and product12 assigned to both websites 1 and 2 -->
-+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct12">
-+                <argument name="product" value="$$createProduct12$$"/>
-+            </actionGroup>
-+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="clickOpenProductForEdit12">
-+                <argument name="product" value="$$createProduct12$$"/>
-+            </actionGroup>
-+            <actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectProductInWebsites1">
-+                <argument name="website" value="{{secondCustomWebsite.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="saveProductForm" stepKey="saveProduct3"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-+                <argument name="websiteName" value="{{secondCustomWebsite.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
-+            <deleteData createDataKey="createProduct0" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="createProduct12" stepKey="deleteProduct3"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Step 1-2: Open Category page and Set scope selector to All Store Views-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="goToCategoryPage"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
-+               stepKey="clickCategoryName"/>
-+        <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection"/>
-+        <grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
-+                      stepKey="grabTextFromCategory"/>
-+        <assertRegExp expected="/\(4\)$/" expectedType="string" actual="$grabTextFromCategory" actualType="variable"
-+                      message="wrongCountProductOnAllStoreViews" stepKey="checkCountProducts"/>
-+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct0.name$$)}}"
-+             userInput="$$createProduct0.name$$" stepKey="seeProductName"/>
-+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct1.name$$)}}"
-+             userInput="$$createProduct1.name$$" stepKey="seeProductName1"/>
-+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct2.name$$)}}"
-+             userInput="$$createProduct2.name$$" stepKey="seeProductName2"/>
-+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct12.name$$)}}"
-+             userInput="$$createProduct12.name$$" stepKey="seeProductName3"/>
-+
-+        <!-- Step 3: Set scope selector to Website1( Storeview for the Website 1) -->
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="swichToDefaultStoreView">
-+            <argument name="storeView" value="_defaultStore.name"/>
-+        </actionGroup>
-+        <grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
-+                      stepKey="grabTextFromCategory1"/>
-+        <assertRegExp expected="/\(2\)$/" expectedType="string" actual="$grabTextFromCategory1" actualType="variable"
-+                      message="wrongCountProductOnWebsite1" stepKey="checkCountProducts1"/>
-+        <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection1"/>
-+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct1.name$$)}}"
-+             userInput="$$createProduct1.name$$" stepKey="seeProductName4"/>
-+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct12.name$$)}}"
-+             userInput="$$createProduct12.name$$" stepKey="seeProductName5"/>
-+        <waitForText userInput="$$createCategory.name$$ (2)" stepKey="seeCorrectProductCount"/>
-+        <dontSee selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct0.name$$)}}"
-+                 userInput="$$createProduct0.name$$" stepKey="dontSeeProductName"/>
-+        <dontSee selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct2.name$$)}}"
-+                 userInput="$$createProduct2.name$$" stepKey="dontSeeProductName1"/>
-+
-+        <!-- Step 4: Set scope selector to Website2 ( StoreView for Website 2) -->
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
-+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="swichToSecondStoreView">
-+            <argument name="storeView" value="SecondStoreUnique.name"/>
-+        </actionGroup>
-+        <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection2"/>
-+        <grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
-+                      stepKey="grabTextFromCategory2"/>
-+        <assertRegExp expected="/\(2\)$/" expectedType="string" actual="$grabTextFromCategory2" actualType="variable"
-+                      message="wrongCountProductOnWebsite2" stepKey="checkCountProducts2"/>
-+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct2.name$$)}}"
-+             userInput="$$createProduct2.name$$" stepKey="seeProductName6"/>
-+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct12.name$$)}}"
-+             userInput="$$createProduct12.name$$" stepKey="seeProductName7"/>
-+        <waitForText userInput="$$createCategory.name$$ (2)" stepKey="seeCorrectProductCount2"/>
-+        <dontSee selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct0.name$$)}}"
-+                 userInput="$$createProduct0.name$$" stepKey="dontSeeProductName2"/>
-+        <dontSee selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct2.name$$)}}"
-+                 userInput="$$createProduct1.name$$" stepKey="dontSeeProductName3"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
-new file mode 100644
-index 00000000000..672205d935d
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
-@@ -0,0 +1,73 @@
-+<?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="AdminGridPageNumberAfterSaveAndCloseActionTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Catalog grid"/>
-+            <title value="Checking Catalog grid page number after Save and Close action"/>
-+            <description value="Checking Catalog grid page number after Save and Close action"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-96164"/>
-+            <useCaseId value="MAGETWO-96127"/>
-+            <group value="Catalog"/>
-+            <skip>
-+                <issueId value="MC-17332"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Clear product grid-->
-+            <comment userInput="Clear product grid" stepKey="commentClearProductGrid"/>
-+            <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
-+            <waitForPageLoad stepKey="waitForProductIndexPage"/>
-+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
-+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-+            <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
-+            <actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteProductIfTheyExist"/>
-+            <createData stepKey="category1" entity="SimpleSubCategory"/>
-+            <createData stepKey="product1" entity="SimpleProduct">
-+                <requiredEntity createDataKey="category1"/>
-+            </createData>
-+            <createData stepKey="category2" entity="SimpleSubCategory"/>
-+            <createData stepKey="product2" entity="SimpleProduct">
-+                <requiredEntity createDataKey="category2"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
-+            <waitForPageLoad stepKey="waitForProductIndexPage"/>
-+            <click selector="{{AdminDataGridPaginationSection.previousPage}}" stepKey="clickPrevPageOrderGrid"/>
-+            <actionGroup ref="adminDataGridDeleteCustomPerPage" stepKey="deleteCustomAddedPerPage">
-+                <argument name="perPage" value="ProductPerPage.productCount"/>
-+            </actionGroup>
-+            <deleteData stepKey="deleteCategory1" createDataKey="category1"/>
-+            <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
-+            <deleteData stepKey="deleteCategory2" createDataKey="category2"/>
-+            <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
-+        <actionGroup ref="adminDataGridSelectCustomPerPage" stepKey="select1OrderPerPage">
-+            <argument name="perPage" value="ProductPerPage.productCount"/>
-+        </actionGroup>
-+        <!--Go to the next page and edit the product-->
-+        <comment userInput="Go to the next page and edit the product" stepKey="commentEdiProduct"/>
-+        <click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="clickNextPageOrderGrid"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
-+            <argument name="product" value="$$product2$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminFormSaveAndClose" stepKey="saveAndCloseProduct"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="2" stepKey="seeOnSecondPageOrderGrid"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
-new file mode 100644
-index 00000000000..b1f00a2f51a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
-@@ -0,0 +1,84 @@
-+<?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="AdminImportCustomizableOptionToProductWithSKUTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Customizable options"/>
-+            <title value="Import customizable options to a product with existing SKU"/>
-+            <description value="Import customizable options to a product with existing SKU"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-98211"/>
-+            <useCaseId value="MAGETWO-70232"/>
-+            <group value="catalog"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create category-->
-+            <comment userInput="Create category" stepKey="commentCreateCategory"/>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <!-- Create two product -->
-+            <comment userInput="Create two product" stepKey="commentCreateTwoProduct"/>
-+            <createData entity="SimpleProduct2" stepKey="createFirstProduct"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createSecondProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!--Delete second product with changed sku-->
-+            <comment userInput="Delete second product with changed sku" stepKey="commentDeleteProduct"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteSecondProduct">
-+                <argument name="sku" value="$$createFirstProduct.sku$$-1"/>
-+            </actionGroup>
-+            <!--Delete created data-->
-+            <comment userInput="Delete created data" stepKey="commentDeleteCreatedData"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-+        </after>
-+        <!--Go to product page -->
-+        <comment userInput="Go to product page" stepKey="commentGoToProductPage"/>
-+        <amOnPage url="{{AdminProductEditPage.url($$createFirstProduct.id$$)}}" stepKey="goToProductEditPage"/>
-+        <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
-+        <actionGroup ref="AddProductCustomOptionField" stepKey="addCutomOption1">
-+            <argument name="option" value="ProductOptionField"/>
-+        </actionGroup>
-+        <actionGroup ref="AddProductCustomOptionField" stepKey="addCutomOption2">
-+            <argument name="option" value="ProductOptionField2"/>
-+        </actionGroup>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+        <!--Change second product sku to first product sku-->
-+        <comment userInput="Change second product sku to first product sku" stepKey="commentChangeSecondProduct"/>
-+        <amOnPage url="{{AdminProductEditPage.url($$createSecondProduct.id$$)}}" stepKey="goToProductEditPage1"/>
-+        <waitForPageLoad stepKey="waitForProductEditPageLoad1"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="$$createFirstProduct.sku$$" stepKey="fillProductSku1"/>
-+        <!--Import customizable options and check-->
-+        <comment userInput="Import customizable options and check" stepKey="commentImportOptions"/>
-+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
-+        <actionGroup ref="importProductCustomizableOptions" stepKey="importOptions">
-+            <argument name="productName" value="$$createFirstProduct.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="checkCustomizableOptionImport" stepKey="checkFirstOptionImport">
-+            <argument name="option" value="ProductOptionField"/>
-+            <argument name="optionIndex" value="0"/>
-+        </actionGroup>
-+        <actionGroup ref="checkCustomizableOptionImport" stepKey="checkSecondOptionImport">
-+            <argument name="option" value="ProductOptionField2"/>
-+            <argument name="optionIndex" value="1"/>
-+        </actionGroup>
-+        <!--Save product and check sku changed message-->
-+        <comment userInput="Save product and check sku changed message" stepKey="commentSAveProductAndCheck"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
-+        <see userInput="SKU for product $$createSecondProduct.name$$ has been changed to $$createFirstProduct.sku$$-1." stepKey="seeSkuChangedMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
-index 2edca19deeb..8d5121cf214 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminMassChangeProductsStatusTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
-new file mode 100644
-index 00000000000..4d581bae700
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
-@@ -0,0 +1,79 @@
-+<?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="AdminMassProductPriceUpdateTest">
-+        <annotations>
-+            <stories value="Mass product update "/>
-+            <features value="Catalog"/>
-+            <title value="Mass update simple product price"/>
-+            <description value="Login as admin and update mass product price"/>
-+            <testCaseId value="MC-8510"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct1"/>
-+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct2"/>
-+        </before>
-+        <after>
-+            <deleteData  createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData  createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Product Index Page-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-+
-+        <!--Search products using keyword -->
-+        <actionGroup ref="searchProductGridByKeyword2" stepKey="searchByKeyword">
-+            <argument name="keyword" value="Testp"/>
-+        </actionGroup>
-+
-+        <!--Sort Products by ID in descending order-->
-+        <actionGroup ref="sortProductsByIdDescending" stepKey="sortProductsByIdDescending"/>
-+
-+        <!--Select products-->
-+        <checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku($$simpleProduct1.sku$$)}}" stepKey="selectFirstProduct"/>
-+        <checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku($$simpleProduct2.sku$$)}}" stepKey="selectSecondProduct"/>
-+
-+        <!-- Update product price-->
-+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
-+        <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickChangeStatus"/>
-+        <waitForPageLoad stepKey="waitForProductAttributePageToLoad"/>
-+        <scrollTo stepKey="scrollToPriceCheckBox" selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}"  x="0" y="-160"/>
-+        <click selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="selectPriceCheckBox"/>
-+        <fillField stepKey="fillPrice" selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="90.99"/>
-+        <click stepKey="clickOnSaveButton" selector="{{AdminEditProductAttributesSection.Save}}"/>
-+        <waitForPageLoad stepKey="waitForUpdatedProductToSave" />
-+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
-+
-+        <!-- Run cron twice -->
-+        <magentoCLI command="cron:run" stepKey="runCron1"/>
-+        <magentoCLI command="cron:run" stepKey="runCron2"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitFormToReload1"/>
-+
-+        <!--Verify product name, sku and updated price-->
-+        <click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$simpleProduct1.sku$$)}}"/>
-+        <waitForPageLoad stepKey="waitForFirstProductToLoad"/>
-+        <seeInField stepKey="seeFirstProductNameInField" selector="{{AdminProductFormSection.productName}}" userInput="$$simpleProduct1.name$$"/>
-+        <seeInField stepKey="seeFirstProductSkuInField" selector="{{AdminProductFormSection.productSku}}" userInput="$$simpleProduct1.sku$$"/>
-+        <seeInField stepKey="seeFirstProductPriceInField" selector="{{AdminProductFormSection.productPrice}}" userInput="90.99"/>
-+        <click stepKey="clickOnBackButton" selector="{{AdminGridMainControls.back}}"/>
-+        <waitForPageLoad stepKey="waitForProductsToLoad"/>
-+        <click stepKey="openSecondProduct" selector="{{AdminProductGridSection.productRowBySku($$simpleProduct2.sku$$)}}"/>
-+        <waitForPageLoad stepKey="waitForSecondProductToLoad"/>
-+        <seeInField stepKey="seeSecondProductNameInField" selector="{{AdminProductFormSection.productName}}" userInput="$$simpleProduct2.name$$"/>
-+        <seeInField stepKey="seeSecondProductSkuInField" selector="{{AdminProductFormSection.productSku}}" userInput="$$simpleProduct2.sku$$"/>
-+        <seeInField stepKey="seeSecondProductPriceInField" selector="{{AdminProductFormSection.productPrice}}" userInput="90.99"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
-index 7c3e31e90c0..87e0bf3d2e9 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminMassUpdateProductAttributesGlobalScopeTest">
-         <annotations>
-             <features value="Catalog"/>
-@@ -18,6 +18,9 @@
-             <testCaseId value="MC-56"/>
-             <group value="Catalog"/>
-             <group value="Product Attributes"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-         </annotations>
-         <before>
-             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-@@ -58,7 +61,13 @@
-         <click selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="toggleToChangePrice"/>
-         <fillField selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="$$createProductOne.price$$0" stepKey="fillAttributeNameField"/>
-         <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
--        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 2 record(s) were updated." stepKey="seeAttributeUpateSuccessMsg"/>
-+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
-+
-+        <!-- Run cron twice -->
-+        <magentoCLI command="cron:run" stepKey="runCron1"/>
-+        <magentoCLI command="cron:run" stepKey="runCron2"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitFormToReload1"/>
- 
-         <!-- Assert on storefront default view -->
-         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
-index be0bc2bf52a..fe0e46369c5 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminMassUpdateProductAttributesMissingRequiredFieldTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
-index f7a04709b76..bee13bec370 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminMassUpdateProductAttributesStoreViewScopeTest">
-         <annotations>
-             <features value="Catalog"/>
-@@ -52,7 +52,13 @@
-         <click selector="{{AdminEditProductAttributesSection.ChangeAttributeDescriptionToggle}}" stepKey="toggleToChangeDescription"/>
-         <fillField selector="{{AdminEditProductAttributesSection.AttributeDescription}}" userInput="Updated $$createProductOne.custom_attributes[description]$$" stepKey="fillAttributeDescriptionField"/>
-         <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
--        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 2 record(s) were updated." stepKey="seeAttributeUpateSuccessMsg"/>
-+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
-+
-+        <!-- Run cron twice -->
-+        <magentoCLI command="cron:run" stepKey="runCron1"/>
-+        <magentoCLI command="cron:run" stepKey="runCron2"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitFormToReload1"/>
- 
-         <!-- Assert on storefront default view -->
-         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest.xml
-new file mode 100644
-index 00000000000..e9b54e3f1a3
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest.xml
-@@ -0,0 +1,151 @@
-+<?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="AdminMassUpdateProductStatusStoreViewScopeTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Mass update product status"/>
-+            <title value="Admin should be able to mass update product statuses in store view scope"/>
-+            <description value="Admin should be able to mass update product statuses in store view scope"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MAGETWO-59361"/>
-+            <group value="Catalog"/>
-+            <group value="Product Attributes"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
-+
-+            <!--Create Website -->
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
-+                <argument name="newWebsiteName" value="Second Website"/>
-+                <argument name="websiteCode" value="second_website"/>
-+            </actionGroup>
-+
-+            <!--Create Store -->
-+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
-+                <argument name="website" value="Second Website"/>
-+                <argument name="storeGroupName" value="Second Store"/>
-+                <argument name="storeGroupCode" value="second_store"/>
-+            </actionGroup>
-+
-+            <!--Create Store view -->
-+            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+            <waitForPageLoad stepKey="waitForSystemStorePage"/>
-+            <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
-+            <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+            <waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>
-+            <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
-+            <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
-+            <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
-+            <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="1" stepKey="enableStoreViewStatus"/>
-+            <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreView" />
-+            <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
-+            <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
-+            <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
-+            <waitForPageLoad stepKey="waitForPageLoad2" time="180" />
-+            <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" time="150" stepKey="waitForPageReolad"/>
-+            <see userInput="You saved the store view." stepKey="seeSavedMessage" />
-+
-+            <!--Create a Simple Product 1 -->
-+            <actionGroup ref="createSimpleProductAndAddToWebsite" stepKey="createSimpleProduct1">
-+                <argument name="product" value="simpleProductForMassUpdate"/>
-+                <argument name="website" value="Second Website"/>
-+            </actionGroup>
-+
-+            <!--Create a Simple Product 2 -->
-+            <actionGroup ref="createSimpleProductAndAddToWebsite" stepKey="createSimpleProduct2">
-+                <argument name="product" value="simpleProductForMassUpdate2"/>
-+                <argument name="website" value="Second Website"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <!--Delete website -->
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
-+                <argument name="websiteName" value="Second Website"/>
-+            </actionGroup>
-+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+
-+            <!--Delete Products -->
-+            <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
-+                <argument name="productName" value="simpleProductForMassUpdate.name"/>
-+            </actionGroup>
-+            <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct2">
-+                <argument name="productName" value="simpleProductForMassUpdate2.name"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="amOnLogoutPage"/>
-+        </after>
-+
-+        <!-- Search and select products -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
-+        <actionGroup ref="searchProductGridByKeyword2" stepKey="searchByKeyword">
-+            <argument name="keyword" value="{{simpleProductForMassUpdate.keyword}}"/>
-+        </actionGroup>
-+        <actionGroup ref="sortProductsByIdDescending" stepKey="sortProductsByIdDescending"/>
-+
-+        <!-- Filter to Second Store View -->
-+        <actionGroup ref="AdminFilterStoreViewActionGroup" stepKey="filterStoreView" >
-+            <argument name="customStore" value="'Second Store View'" />
-+        </actionGroup>
-+
-+        <!-- Select Product 2 -->
-+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckbox2"/>
-+
-+        <!-- Mass update attributes -->
-+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
-+        <click selector="{{AdminProductGridSection.bulkActionOption('Change status')}}" stepKey="clickOption"/>
-+        <click selector="{{AdminProductGridSection.bulkActionOption('Disable')}}" stepKey="clickDisabled"/>
-+        <waitForPageLoad stepKey="waitForBulkUpdatePage"/>
-+
-+        <!-- Verify Product Statuses -->
-+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Enabled" stepKey="checkIfProduct1IsEnabled"/>
-+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('2')}}" userInput="Disabled" stepKey="checkIfProduct2IsDisabled"/>
-+
-+        <!-- Filter to Default Store View -->
-+        <actionGroup ref="AdminFilterStoreViewActionGroup" stepKey="filterDefaultStoreView">
-+            <argument name="customStore" value="'Default'" />
-+        </actionGroup>
-+
-+        <!-- Verify Product Statuses -->
-+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Enabled" stepKey="checkIfDefaultViewProduct1IsEnabled"/>
-+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('2')}}" userInput="Enabled" stepKey="checkIfDefaultViewProduct2IsEnabled"/>
-+
-+        <!-- Assert on storefront default view -->
-+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
-+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameDefault">
-+            <argument name="name" value="{{simpleProductForMassUpdate.keyword}}"/>
-+            <argument name="description" value=""/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault"/>
-+        <see userInput="2 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault"/>
-+
-+        <!-- Enable the product in Default store view -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex2"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageLoad2"/>
-+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="clickCheckboxDefaultStoreView"/>
-+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckboxDefaultStoreView2"/>
-+
-+        <!-- Mass update attributes -->
-+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdownDefaultStoreView"/>
-+        <click selector="{{AdminProductGridSection.bulkActionOption('Change status')}}" stepKey="clickOptionDefaultStoreView"/>
-+        <click selector="{{AdminProductGridSection.bulkActionOption('Disable')}}" stepKey="clickDisabledDefaultStoreView"/>
-+        <waitForPageLoad stepKey="waitForBulkUpdatePageDefaultStoreView"/>
-+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Disabled" stepKey="checkIfProduct2IsDisabledDefaultStoreView"/>
-+
-+        <!-- Assert on storefront default view -->
-+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault2"/>
-+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameDefault2">
-+            <argument name="name" value="{{simpleProductForMassUpdate.name}}"/>
-+            <argument name="description" value=""/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault2"/>
-+        <see userInput="We can't find any items matching these search criteria." selector="{{StorefrontCatalogSearchAdvancedResultMainSection.message}}" stepKey="seeInDefault2"/>
-+   </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml
-index d29fde8590c..551b3437cb8 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml
-@@ -6,10 +6,11 @@
-  */
- -->
- 
--<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminMoveAnchoredCategoryTest">
-         <annotations>
-             <features value="Catalog"/>
-+            <stories value="Edit categories"/>
-             <title value="Admin should be able to move a category via categories tree and changes should be applied on frontend without a forced cache cleaning"/>
-             <description value="Admin should be able to move a category via categories tree and changes should be applied on frontend without a forced cache cleaning"/>
-             <severity value="CRITICAL"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
-new file mode 100644
-index 00000000000..247711295a5
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
-@@ -0,0 +1,123 @@
-+<?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="AdminMoveAnchoredCategoryToDefaultCategoryTest">
-+        <annotations>
-+            <stories value="Move categories"/>
-+            <title value="Move default anchored subcategory with anchored parent to default subcategory"/>
-+            <description value="Login as admin,move anchored subcategory with anchored parent to default subcategory"/>
-+            <testCaseId value="MC-6493"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+            <features value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
-+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
-+            <deleteData  createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Category Page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!--Enable Anchor for _defaultCategory Category-->
-+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
-+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
-+        <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+
-+        <!--Enable Anchor for FirstLevelSubCat Category-->
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="addSubCategoryName"/>
-+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting1"/>
-+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting1"/>
-+        <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor1"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave1"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage1"/>
-+
-+        <!--Enable Anchor for SimpleSubCategory Category and add products to the Category-->
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName1"/>
-+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting2"/>
-+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting2"/>
-+        <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor2"/>
-+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory1"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
-+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$" stepKey="selectProduct"/>
-+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
-+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory2"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave2"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage2"/>
-+
-+        <!--Open Category in store front page-->
-+        <amOnPage url="/$$createDefaultCategory.name$$/{{FirstLevelSubCat.name}}/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
-+        <waitForPageLoad  stepKey="waitForStoreFrontPageLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigationBar"/>
-+
-+        <!--<Verify breadcrumbs in store front page-->
-+        <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbs"/>
-+        <assertEquals  stepKey="verifyTheCategoryInStoreFrontPage">
-+            <expectedResult type="array">['Home', $$createDefaultCategory.name$$,{{FirstLevelSubCat.name}}, {{SimpleSubCategory.name}}]</expectedResult>
-+            <actualResult type="variable">breadcrumbs</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify Product displayed in category store front page-->
-+        <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
-+        <waitForPageLoad  stepKey="waitForProductToLoad1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductName"/>
-+
-+        <!--Open Category Page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree2"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
-+
-+        <!--Move SubCategory under Default Category-->
-+        <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="moveCategory"/>
-+        <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
-+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
-+        <amOnPage url="/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage1"/>
-+        <waitForPageLoad  stepKey="waitForStoreFrontPageLoad1"/>
-+
-+        <!--Verify breadcrumbs in store front page after the move-->
-+        <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbsAfterMove"/>
-+        <assertEquals  stepKey="verifyBreadcrumbsInFrontPageAfterMove">
-+            <expectedResult type="array">['Home',{{SimpleSubCategory.name}}]</expectedResult>
-+            <actualResult type="variable">breadcrumbsAfterMove</actualResult>
-+        </assertEquals>
-+
-+        <!--Open Category in store front-->
-+        <amOnPage url="{{StorefrontCategoryPage.url(SimpleSubCategory.name)}}"  stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleSubCategory.name)}}" stepKey="seeCategoryInTitle"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeCategoryOnStoreNavigationBarAfterMove"/>
-+        <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct1"/>
-+        <waitForPageLoad  stepKey="waitForProductToLoad2"/>
-+
-+        <!--Verify product name on Store Front-->
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductNameAfterMove"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
-new file mode 100644
-index 00000000000..ba6e6a43674
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
-@@ -0,0 +1,113 @@
-+<?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="AdminMoveCategoryAndCheckUrlRewritesTest">
-+        <annotations>
-+            <stories value="Move categories"/>
-+            <title value="URL Rewrites for subcategories during creation and move"/>
-+            <description value="Login as admin, move category from one to another and check category url rewrites"/>
-+            <testCaseId value="MC-6494"/>
-+            <features value="Catalog"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open category page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!--Create second level category-->
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SubCategory.name}}" stepKey="addSubCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave1"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage1"/>
-+
-+        <!--Create third level category under second level category-->
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName1"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory2"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave2"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage2"/>
-+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#" />
-+
-+        <!--Open Url Rewrite Page-->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
-+        <waitForPageLoad stepKey="waitForUrlRewritePage"/>
-+
-+        <!--Search third level category Redirect Path, Target Path and Redirect Type-->
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="fillRedirectPathFilter"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad0"/>
-+
-+        <!--Verify Category RedirectType-->
-+        <see stepKey="verifyTheRedirectType" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="No" />
-+
-+        <!--Verify Redirect Path -->
-+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" stepKey="verifyTheRedirectPath"/>
-+
-+        <!--Verify Category Target Path-->
-+        <see stepKey="verifyTheTargetPath" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="catalog/category/view/id/{$categoryId}"/>
-+
-+        <!--Open Category Page -->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree2"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
-+
-+        <!--Move the third level category under first level category -->
-+        <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="moveCategory"/>
-+        <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
-+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
-+
-+        <!--Open Url Rewrite page  -->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage1"/>
-+        <waitForPageLoad stepKey="waitForUrlRewritePage1"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" stepKey="fillCategoryUrlKey1"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad4"/>
-+
-+        <!--Verify new Redirect Path after move -->
-+        <see stepKey="verifyTheRequestPathAfterMove" selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" />
-+
-+        <!--Verify new Target Path after move -->
-+        <see stepKey="verifyTheTargetPathAfterMove" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="catalog/category/view/id/{$categoryId}" />
-+
-+        <!--Verify new RedirectType after move -->
-+        <see stepKey="verifyTheRedirectTypeAfterMove" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="No" />
-+
-+        <!--Verify before move Redirect Path displayed with associated Target Path and Redirect Type-->
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="fillCategoryUrlKey2"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton2"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad5"/>
-+        <see stepKey="verifyTheRedirectTypeAfterMove1" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="Permanent (301)" />
-+        <see stepKey="verifyTheRequestPathAfterMove1" selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" />
-+        <see stepKey="verifyTheTargetPathAfterMove1" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" />
-+
-+        <!--Verify before move Redirect Path directs to the category page-->
-+        <amOnPage url="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnStoreNavigationBar"/>
-+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleSubCategory.name)}}" stepKey="seeCategoryInTitle"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
-new file mode 100644
-index 00000000000..d17078d794b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
-@@ -0,0 +1,117 @@
-+<?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="AdminMoveCategoryFromParentAnchoredCategoryTest">
-+        <annotations>
-+            <stories value="Move categories"/>
-+            <title value="Move default subcategory with anchored parent to default subcategory"/>
-+            <description value="Login as admin,move subcategory with anchored parent to default subcategory"/>
-+            <testCaseId value="MC-6492"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+            <features value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
-+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
-+        </before>
-+        <after>
-+            <deleteData  createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
-+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory">
-+                <argument name="categoryEntity" value="SimpleSubCategory"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Category page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!--Enable Anchor for _defaultCategory category -->
-+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
-+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
-+        <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-+
-+        <!--Create a Subcategory under _defaultCategory category-->
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
-+
-+        <!--Add a product to SimpleSubCategory category-->
-+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
-+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$" stepKey="selectProduct"/>
-+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
-+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+
-+        <!--Verify category displayed in store front page-->
-+        <amOnPage url="/$$createDefaultCategory.name$$/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
-+        <waitForPageLoad  stepKey="waitForStoreFrontPageLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigationBar"/>
-+
-+        <!--Check category breadcrumbs in store  front page-->
-+        <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbs"/>
-+        <assertEquals  stepKey="verifyTheCategoryInStoreFrontPage">
-+            <expectedResult type="array">['Home', $$createDefaultCategory.name$$,{{SimpleSubCategory.name}}]</expectedResult>
-+            <actualResult type="variable">breadcrumbs</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify Product displayed in category store front page-->
-+        <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
-+        <waitForPageLoad  stepKey="waitForProductToLoad1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductName"/>
-+
-+        <!--Open Category Page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree2"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
-+
-+        <!--Move SubCategory under Default Category-->
-+        <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="moveCategory"/>
-+        <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
-+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
-+
-+        <!--Open category in store front page-->
-+        <amOnPage url="/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage1"/>
-+        <waitForPageLoad  stepKey="waitForStoreFrontPageLoad1"/>
-+
-+        <!--Verify breadcrumbs after the move in store front page-->
-+        <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbsAfterMove"/>
-+        <assertEquals  stepKey="verifyBreadcrumbsInFrontPageAfterMove">
-+            <expectedResult type="array">['Home',{{SimpleSubCategory.name}}]</expectedResult>
-+            <actualResult type="variable">breadcrumbsAfterMove</actualResult>
-+        </assertEquals>
-+
-+       <!--Open category store front page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url(SimpleSubCategory.name)}}"  stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-+
-+        <!--Verify Category in store front-->
-+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleSubCategory.name)}}" stepKey="seeCategoryInTitle"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeSubCategoryOnStoreNavigationBarAfterMove"/>
-+        <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct1"/>
-+        <waitForPageLoad  stepKey="waitForProductToLoad2"/>
-+
-+        <!--Verify product name on Store Front-->
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductNameAfterMove"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml
-new file mode 100644
-index 00000000000..9831f73e078
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml
-@@ -0,0 +1,116 @@
-+<?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="AdminMoveCategoryToAnotherPositionInCategoryTreeTest">
-+        <annotations>
-+            <stories value="Move categories"/>
-+            <title value="Move Category to Another Position in Category Tree"/>
-+            <description value="Test log in to Move Category and Move Category to Another Position in Category Tree"/>
-+            <testCaseId value="MC-13612"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
-+            <actionGroup ref="DeleteCategory" stepKey="SecondLevelSubCat">
-+                <argument name="categoryEntity" value="SecondLevelSubCat"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Open Category Page -->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickExpandTree"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <!-- Create three level deep sub Category -->
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickAddSubCategoryButton"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="fillSubCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFirstLevelSubCategory"/>
-+        <waitForPageLoad stepKey="waitForFirstLevelCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButtonAgain"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SecondLevelSubCat.name}}" stepKey="fillSecondLevelSubCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSecondLevelSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondLevelCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSaveSuccessMessage"/>
-+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#" />
-+
-+        <!-- Move Category to another position in category tree, but click cancel button -->
-+        <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SecondLevelSubCat.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="moveCategory"/>
-+        <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
-+        <click selector="{{AdminCategoryModalSection.cancel}}" stepKey="clickCancelButtonOnWarningPopup"/>
-+        <!-- Verify Category in store front page after clicking cancel button -->
-+        <amOnPage url="/$$createDefaultCategory.name$$/{{FirstLevelSubCat.name}}/{{SecondLevelSubCat.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontPageLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigationBar"/>
-+        <!-- Verify breadcrumbs in store front page after clicking cancel button -->
-+        <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbs"/>
-+        <assertEquals  stepKey="verifyTheCategoryInStoreFrontPage">
-+            <expectedResult type="array">['Home', $$createDefaultCategory.name$$,{{FirstLevelSubCat.name}},{{SecondLevelSubCat.name}}]</expectedResult>
-+            <actualResult type="variable">breadcrumbs</actualResult>
-+        </assertEquals>
-+
-+        <!-- Move Category to another position in category tree and click ok button-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openTheAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitTillPageLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SecondLevelSubCat.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="DragCategory"/>
-+        <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessageForOneMoreTime"/>
-+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
-+        <waitForPageLoad stepKey="waitTheForPageToLoad"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
-+        <amOnPage url="/{{SimpleSubCategory.name}}.html" stepKey="seeCategoryNameInStoreFrontPage"/>
-+        <waitForPageLoad  stepKey="waitForStoreFrontPageToLoad"/>
-+        <!-- Verify Category in store front after moving category to another position in category tree -->
-+        <amOnPage url="{{StorefrontCategoryPage.url(SecondLevelSubCat.name)}}"  stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SecondLevelSubCat.name)}}" stepKey="seeCategoryInTitle"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SecondLevelSubCat.name)}}" stepKey="seeCategoryOnStoreNavigationBarAfterMove"/>
-+        <!-- Verify breadcrumbs in store front page after moving category to another position in category tree -->
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SecondLevelSubCat.name)}}" stepKey="clickCategoryOnNavigation"/>
-+        <waitForPageLoad stepKey="waitForCategoryLoad"/>
-+        <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbsAfterMove"/>
-+        <assertEquals  stepKey="verifyBreadcrumbsInFrontPageAfterMove">
-+            <expectedResult type="array">['Home',{{SecondLevelSubCat.name}}]</expectedResult>
-+            <actualResult type="variable">breadcrumbsAfterMove</actualResult>
-+        </assertEquals>
-+
-+        <!-- Open Url Rewrite page and see the url rewrite for the moved category -->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
-+        <waitForPageLoad stepKey="waitForUrlRewritePageLoad"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SecondLevelSubCat.name_lwr}}.html" stepKey="fillCategoryUrlKey"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
-+        <waitForPageLoad stepKey="waitForUrlPageToLoad"/>
-+        <!-- Verify new Redirect Path after move -->
-+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('2')}}" userInput="{{SecondLevelSubCat.name_lwr}}.html" stepKey="verifyTheRequestPathAfterMove"/>
-+        <!-- Verify new Target Path after move -->
-+        <see selector="{{AdminUrlRewriteIndexSection.targetPathColumn('2')}}" userInput="catalog/category/view/id/{$categoryId}" stepKey="verifyTheTargetPathAfterMove"/>
-+        <!-- Verify new RedirectType after move -->
-+        <see selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('2')}}" userInput="No" stepKey="verifyTheRedirectTypeAfterMove"/>
-+        <!-- Verify before move Redirect Path displayed with associated Target Path and Redirect Type-->
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SecondLevelSubCat.name_lwr}}" stepKey="fillTheCategoryUrlKey"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton2"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="Permanent (301)" stepKey="verifyTheRedirectTypeBeforeMove"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{FirstLevelSubCat.name_lwr}}/{{SecondLevelSubCat.name_lwr}}.html" stepKey="verifyTheRequestPathBeforeMove"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="{{SecondLevelSubCat.name_lwr}}.html" stepKey="verifyTheTargetPathBeforeMove"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
-new file mode 100644
-index 00000000000..da985fc2ce3
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
-@@ -0,0 +1,227 @@
-+<?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="AdminMoveProductBetweenCategoriesTest">
-+        <annotations>
-+            <stories value="Move Product"/>
-+            <title value="Move Product between Categories (Cron is ON, 'Update by Schedule' Mode)"/>
-+            <description value="Verifies correctness of showing data (products, categories) on Storefront after moving an anchored category in terms of products/categories association"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11296"/>
-+            <group value="catalog"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
-+            <createData entity="_defaultCategory" stepKey="createAnchoredCategory1"/>
-+            <createData entity="_defaultCategory" stepKey="createSecondCategory"/>
-+
-+            <!-- Switch "Category Product" and "Product Category" indexers to "Update by Schedule" mode -->
-+            <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="onIndexManagement"/>
-+            <waitForPageLoad stepKey="waitForManagementPage"/>
-+
-+            <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchCategoryProduct">
-+                <argument name="indexerValue" value="catalog_category_product"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchProductCategory">
-+                <argument name="indexerValue" value="catalog_product_category"/>
-+            </actionGroup>
-+        </before>
-+
-+        <after>
-+            <!-- Switch "Category Product" and "Product Category" indexers to "Update by Save" mode -->
-+            <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="onIndexManagement"/>
-+            <waitForPageLoad stepKey="waitForManagementPage"/>
-+
-+            <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchCategoryProduct">
-+                <argument name="indexerValue" value="catalog_category_product"/>
-+                <argument name="action" value="Update on Save"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchProductCategory">
-+                <argument name="indexerValue" value="catalog_product_category"/>
-+                <argument name="action" value="Update on Save"/>
-+            </actionGroup>
-+
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createSecondCategory" stepKey="deleteSecondCategory"/>
-+            <deleteData createDataKey="createAnchoredCategory1" stepKey="deleteAnchoredCategory1"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Create the anchored category <Cat1_anchored> -->
-+        <actionGroup ref="AdminAnchorCategoryActionGroup" stepKey="anchorCategory">
-+            <argument name="categoryName" value="$$createAnchoredCategory1.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Create subcategory <Sub1> of the anchored category -->
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSaveSuccessMessage"/>
-+
-+        <!-- Assign <product1> to the <Sub1> -->
-+        <amOnPage url="{{AdminProductEditPage.url($$simpleProduct.id$$)}}" stepKey="goToProduct"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="activateDropDownCategory"/>
-+        <fillField userInput="{{SimpleSubCategory.name}}" selector="{{AdminProductFormSection.searchCategory}}" stepKey="fillSearch"/>
-+        <waitForPageLoad stepKey="waitForSubCategory"/>
-+        <click selector="{{AdminProductFormSection.selectCategory(SimpleSubCategory.name)}}" stepKey="selectSub1Category"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickDone"/>
-+        <waitForPageLoad stepKey="waitForApplyCategory"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSave"/>
-+        <waitForPageLoad stepKey="waitForSavingChanges"/>
-+
-+        <!-- Enable `Use Categories Path for Product URLs` on Stores -> Configuration -> Catalog -> Catalog -> Search Engine Optimization -->
-+        <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="onConfigPage"/>
-+        <waitForPageLoad stepKey="waitForLoading"/>
-+        <conditionalClick selector="{{AdminCatalogSearchEngineConfigurationSection.searchEngineOptimization}}" dependentSelector="{{AdminCatalogSearchEngineConfigurationSection.openedEngineOptimization}}" visible="false" stepKey="clickEngineOptimization"/>
-+        <uncheckOption selector="{{AdminCatalogSearchEngineConfigurationSection.systemValueUseCategoriesPath}}" stepKey="uncheckDefault"/>
-+        <selectOption userInput="Yes" selector="{{AdminCatalogSearchEngineConfigurationSection.selectUseCategoriesPatForProductUrls}}" stepKey="selectYes"/>
-+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
-+        <waitForPageLoad stepKey="waitForSaving"/>
-+        <see selector="{{AdminIndexManagementSection.successMessage}}"  userInput="You saved the configuration." stepKey="seeMessage"/>
-+
-+        <!-- Navigate to the Catalog > Products -->
-+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="onCatalogProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+
-+        <!-- Click on <product1>: Product page opens-->
-+        <actionGroup ref="filterProductGridByName" stepKey="filterProduct">
-+            <argument name="product" value="$$simpleProduct$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridSection.productGridNameProduct($$simpleProduct.name$$)}}" stepKey="clickProduct1"/>
-+        <waitForPageLoad stepKey="waitForProductLoad"/>
-+
-+        <!-- Clear "Categories" field and assign the product to <Cat2> and save the product -->
-+        <grabTextFrom selector="{{AdminProductFormSection.currentCategory}}" stepKey="grabNameSubCategory"/>
-+        <click selector="{{AdminProductFormSection.unselectCategories(SimpleSubCategory.name)}}" stepKey="removeCategory"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="openDropDown"/>
-+        <checkOption selector="{{AdminProductFormSection.selectCategory($$createSecondCategory.name$$)}}" stepKey="selectCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="pressButtonDone"/>
-+        <waitForPageLoad stepKey="waitForApplyCategory2"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="pushButtonSave"/>
-+        <waitForPageLoad stepKey="waitForSavingProduct"/>
-+
-+        <!--Product is saved -->
-+        <see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSuccessMessage"/>
-+
-+        <!-- Run cron -->
-+        <magentoCLI command="cron:run" stepKey="runCron"/>
-+
-+        <!-- Clear invalidated cache on System>Tools>Cache Management page  -->
-+        <amOnPage url="{{AdminCacheManagementPage.url}}" stepKey="onCachePage"/>
-+        <waitForPageLoad stepKey="waitForCacheManagementPage"/>
-+
-+        <checkOption selector="{{AdminCacheManagementSection.configurationCheckbox}}" stepKey="checkConfigCache"/>
-+        <checkOption selector="{{AdminCacheManagementSection.pageCacheCheckbox}}" stepKey="checkPageCache"/>
-+
-+        <selectOption userInput="Refresh" selector="{{AdminCacheManagementSection.massActionSelect}}" stepKey="selectRefresh"/>
-+        <waitForElementVisible selector="{{AdminCacheManagementSection.massActionSubmit}}" stepKey="waitSubmitButton"/>
-+        <click selector="{{AdminCacheManagementSection.massActionSubmit}}" stepKey="clickSubmit"/>
-+        <waitForPageLoad stepKey="waitForRefresh"/>
-+
-+        <see userInput="2 cache type(s) refreshed." stepKey="seeCacheRefreshedMessage"/>
-+        <actionGroup ref="logout" stepKey="logout"/>
-+
-+        <!-- Open frontend -->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="onFrontend"/>
-+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
-+
-+        <!-- Open <Cat2> from navigation menu -->
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createSecondCategory.name$$)}}" stepKey="openCat2"/>
-+        <waitForPageLoad stepKey="waitForCategory2Page"/>
-+
-+        <!-- # <Cat 2> should open # <product1> should be present on the page -->
-+        <see userInput="$$createSecondCategory.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeCategoryName"/>
-+        <see userInput="$$simpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProduct"/>
-+
-+        <!-- Open <product1>  -->
-+        <click selector="{{StorefrontCategoryMainSection.productLinkByHref($$simpleProduct.urlKey$$)}}" stepKey="openProduct"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoading"/>
-+
-+        <!-- # Product page should open successfully # Breadcrumb for product should be like <Cat 2> -->
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$simpleProduct.name$$" stepKey="seeProductName"/>
-+        <see userInput="$$createSecondCategory.name$$" selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}" stepKey="seeCategoryInBreadcrumbs"/>
-+
-+        <!-- Open <Cat1_anchored> category -->
-+        <click selector="{{StorefrontNavigationSection.topCategory($$createAnchoredCategory1.name$$)}}" stepKey="clickCat1"/>
-+        <waitForPageLoad stepKey="waitForCategory1PageLoad"/>
-+
-+        <!-- # Category should open successfully # <product1> should be absent on the page -->
-+        <see userInput="$$createAnchoredCategory1.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeCategory1Name"/>
-+        <see userInput="We can't find products matching the selection." stepKey="seeEmptyNotice"/>
-+        <dontSee userInput="$$simpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontseeProduct"/>
-+      
-+        <!-- Log in to the backend: Admin user is logged in-->
-+        <actionGroup ref="LoginAsAdmin" stepKey="LoginAdmin"/>
-+        
-+        <!-- Navigate to the Catalog > Products: Navigate to the Catalog>Products -->
-+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="amOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductsPage"/>
-+
-+        <!-- Click on <product1> -->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="openSimpleProduct">
-+            <argument name="productSku" value="$$simpleProduct.sku$$"/>
-+        </actionGroup>
-+
-+        <!-- Clear "Categories" field and assign the product to <Sub1> and save the product -->
-+        <click selector="{{AdminProductFormSection.unselectCategories($$createSecondCategory.name$$)}}" stepKey="clearCategory"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="activateDropDown"/>
-+        <fillField userInput="{$grabNameSubCategory}" selector="{{AdminProductFormSection.searchCategory}}" stepKey="fillSearchField"/>
-+        <waitForPageLoad stepKey="waitForSearchSubCategory"/>
-+        <click selector="{{AdminProductFormSection.selectCategory({$grabNameSubCategory})}}" stepKey="selectSubCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickButtonDone"/>
-+        <waitForPageLoad stepKey="waitForCategoryApply"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickButtonSave"/>
-+        <waitForPageLoad stepKey="waitForSaveChanges"/>
-+
-+        <!-- Product is saved successfully -->
-+        <see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSaveMessage"/>
-+
-+        <!-- Run cron -->
-+        <magentoCLI command="cron:run" stepKey="runCron2"/>
-+
-+        <!-- Open frontend -->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="onFrontendPage"/>
-+        <waitForPageLoad stepKey="waitForFrontPageLoad"/>
-+
-+        <!-- Open <Cat2> from navigation menu -->
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createSecondCategory.name$$)}}" stepKey="openSecondCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryPage"/>
-+
-+        <!-- # <Cat 2> should open # <product1> should be absent on the page -->
-+        <see userInput="$$createSecondCategory.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeSecondCategory1Name"/>
-+        <dontSee userInput="$$simpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontseeSimpleProduct"/>
-+
-+        <!-- Click on <Cat1_anchored> category -->
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createAnchoredCategory1.name$$)}}" stepKey="clickAnchoredCategory"/>
-+        <waitForPageLoad stepKey="waitForAnchoredCategoryPage"/>
-+
-+        <!-- # Category should open successfully # <product1> should be present on the page -->
-+        <see userInput="$$createAnchoredCategory1.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="see1CategoryName"/>
-+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="$$simpleProduct.name$$" stepKey="seeProductNameOnCategory1Page"/>
-+
-+        <!-- Breadcrumb for product should be like <Cat1_anchored>/<product> (if you clicks from anchor category) -->
-+        <see userInput="$$createAnchoredCategory1.name$$" selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}" stepKey="seeCat1inBreadcrumbs"/>
-+        <dontSee userInput="{$grabNameSubCategory}" selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}" stepKey="dontSeeSubCategoryInBreadCrumbs"/>
-+
-+        <!-- <Cat1_anchored>/<Sub1>/<product> (if you clicks from Sub1 category) -->
-+        <moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createAnchoredCategory1.name$$)}}" stepKey="hoverCategory1"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName({$grabNameSubCategory})}}" stepKey="clickSubCat"/>
-+        <waitForPageLoad stepKey="waitForSubCategoryPageLoad"/>
-+
-+        <see userInput="{$grabNameSubCategory}" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeSubCategoryName"/>
-+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="$$simpleProduct.name$$" stepKey="seeProductNameOnSubCategoryPage"/>
-+
-+        <see userInput="{$grabNameSubCategory}" selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}" stepKey="seeSubCategoryInBreadcrumbs"/>
-+        <see userInput="$$createAnchoredCategory1.name$$" selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}" stepKey="seeCat1InBreadcrumbs"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
-index 012c956c2db..264615ff673 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
-@@ -7,10 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminMultipleWebsitesUseDefaultValuesTest">
-         <annotations>
-             <features value="Catalog"/>
-+            <stories value="Create websites"/>
-             <title value="Use Default Value checkboxes should be checked for new website scope"/>
-             <description value="Use Default Value checkboxes for product attribute should be checked for new website scope"/>
-             <severity value="MAJOR"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
-new file mode 100644
-index 00000000000..bcd4ca85312
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
-@@ -0,0 +1,183 @@
-+<?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="AdminNavigateMultipleUpSellProductsTest">
-+        <annotations>
-+            <stories value="Up Sell products"/>
-+            <title value="Promote Multiple Products (Simple, Configurable) as Up-Sell Products"/>
-+            <description value="Login as admin and add simple and configurable Products as Up-Sell products"/>
-+            <testCaseId value="MC-8902"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!--Create Simple Products-->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory1"/>
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory1"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory2"/>
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct1">
-+                <requiredEntity createDataKey="createCategory2"/>
-+            </createData>
-+
-+            <!-- Create the configurable product with product Attribute options-->
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="delete">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+
-+            <!--Login as admin-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <!--Logout as admin-->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createCategory1" stepKey="deleteSubCategory1"/>
-+            <deleteData createDataKey="createCategory2" stepKey="deleteCategory2"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deletecreateConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deletecreateConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+        </after>
-+
-+        <!--Open Product Index Page-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-+
-+        <!--Select SimpleProduct -->
-+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+
-+        <!--Add SimpleProduct1 and ConfigProduct as Up sell products-->
-+        <click stepKey="clickOnRelatedProducts" selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedProductsHeader}}"/>
-+        <click stepKey="clickOnAddUpSellProducts" selector="{{AdminProductFormRelatedUpSellCrossSellSection.addUpSellProduct}}"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProduct">
-+            <argument name="sku" value="$$createSimpleProduct1.sku$$"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForTheProductToLoad"/>
-+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="selectTheSimpleProduct2"/>
-+        <click stepKey="addSelectedProduct" selector="{{AdminAddRelatedProductsModalSection.AddUpSellProductsButton}}"/>
-+        <waitForPageLoad stepKey="waitForProductToBeAdded"/>
-+        <click stepKey="clickOnAddUpSellProductsButton" selector="{{AdminProductFormRelatedUpSellCrossSellSection.addUpSellProduct}}"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterConfigurableProduct">
-+            <argument name="sku" value="$$createConfigProduct.sku$$"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForTheConfigProductToLoad"/>
-+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="selectTheConfigProduct"/>
-+        <click stepKey="addSelectedProductButton" selector="{{AdminAddRelatedProductsModalSection.AddUpSellProductsButton}}"/>
-+        <waitForPageLoad stepKey="waitForConfigProductToBeAdded"/>
-+        <click stepKey="clickOnRelatedProducts1" selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedProductsHeader}}"/>
-+        <click stepKey="clickOnSaveButton" selector="{{AdminProductFormActionSection.saveButton}}"/>
-+        <waitForPageLoad stepKey="waitForLoading1"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-+
-+        <!--Go to Product Index Page -->
-+        <click stepKey="clickOnBackButton" selector="{{AdminGridMainControls.back}}"/>
-+        <waitForPageLoad stepKey="waitForProductsToBeLoaded"/>
-+
-+        <!--Select Configurable Product-->
-+        <actionGroup ref="filterProductGridBySku" stepKey="findConfigProduct">
-+            <argument name="product" value="$$createConfigProduct$$"/>
-+        </actionGroup>
-+        <click stepKey="openConfigProduct" selector="{{AdminProductGridSection.productRowBySku($$createConfigProduct.sku$$)}}"/>
-+        <waitForPageLoad stepKey="waitForConfigProductToLoad"/>
-+
-+        <!--Add  SimpleProduct1 as Up Sell Product-->
-+        <click stepKey="clickOnRelatedProductsHeader" selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedProductsHeader}}"/>
-+        <click stepKey="clickOnAddUpSellProductsButton1" selector="{{AdminProductFormRelatedUpSellCrossSellSection.addUpSellProduct}}"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterSimpleProduct2">
-+            <argument name="sku" value="$$createSimpleProduct1.sku$$"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForTheSimpleProduct2ToBeLoaded"/>
-+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="selectSimpleProduct1"/>
-+        <click stepKey="addSimpleProduct2" selector="{{AdminAddRelatedProductsModalSection.AddUpSellProductsButton}}"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductToBeAdded"/>
-+        <scrollTo selector="{{AdminProductFormActionSection.saveButton}}" stepKey="scrollToTheSaveButton"/>
-+        <click stepKey="clickOnSaveButton1" selector="{{AdminProductFormActionSection.saveButton}}"/>
-+        <waitForPageLoad stepKey="waitForLoading2"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown1"/>
-+        <waitForPageLoad stepKey="waitForUpdatesTobeSaved1"/>
-+
-+        <!--Go to SimpleProduct store front page-->
-+        <amOnPage url="$$createSimpleProduct.sku$$.html" stepKey="goToSimpleProductFrontPage"/>
-+        <waitForPageLoad stepKey="waitForProduct"/>
-+        <see stepKey="seeProductName" userInput="$$createSimpleProduct.sku$$" selector="{{StorefrontProductInfoMainSection.productName}}"/>
-+        <scrollTo stepKey="scrollToTheUpSellHeading" selector="{{StorefrontProductUpSellProductsSection.upSellHeading}}"/>
-+
-+        <!--Verify Up Sell Products displayed in SimpleProduct page-->
-+        <see stepKey="seeTheUpSellHeading" selector="{{StorefrontProductUpSellProductsSection.upSellHeading}}" userInput="We found other products you might like!"/>
-+        <see stepKey="seeSimpleProduct1" selector="{{StorefrontProductUpSellProductsSection.upSellProducts}}" userInput="$$createSimpleProduct1.name$$"/>
-+        <see stepKey="seeConfigProduct" selector="{{StorefrontProductUpSellProductsSection.upSellProducts}}" userInput="$$createConfigProduct.name$$"/>
-+
-+        <!--Go to Config Product store front page-->
-+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="goToConfigProductFrontPage"/>
-+        <waitForPageLoad stepKey="waitForConfigProductToBeLoaded"/>
-+        <scrollTo stepKey="scrollToTheUpSellHeading1" selector="{{StorefrontProductUpSellProductsSection.upSellHeading}}"/>
-+
-+        <!--Verify Up Sell Products displayed in ConfigProduct page-->
-+        <see stepKey="seeTheUpSellHeading1" selector="{{StorefrontProductUpSellProductsSection.upSellHeading}}" userInput="We found other products you might like!"/>
-+        <see stepKey="seeSimpleProduct2" selector="{{StorefrontProductUpSellProductsSection.upSellProducts}}" userInput="$$createSimpleProduct1.name$$"/>
-+
-+        <!--Go to SimpleProduct1 store front page-->
-+        <amOnPage url="$$createSimpleProduct1.sku$$.html" stepKey="goToSimpleProduct1FrontPage"/>
-+        <waitForPageLoad stepKey="waitForSimpleProduct1ToBeLoaded"/>
-+
-+        <!--Verify No Up Sell Products displayed in SimplProduct1 page-->
-+        <dontSee stepKey="dontSeeTheUpSellHeading1" selector="{{StorefrontProductUpSellProductsSection.upSellHeading}}" userInput="We found other products you might like!"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml
-new file mode 100644
-index 00000000000..ec0d86ac066
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml
-@@ -0,0 +1,314 @@
-+<?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="AdminProductCategoryIndexerInUpdateOnScheduleModeTest">
-+        <annotations>
-+            <stories value="Product Categories Indexer"/>
-+            <title value="Product Categories Indexer in Update on Schedule mode"/>
-+            <description value="The test verifies that in Update on Schedule mode if displaying of category products on Storefront changes due to product properties change,
-+            the changes are NOT applied immediately, but applied only after cron runs (twice)."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11146"/>
-+            <group value="catalog"/>
-+            <group value="indexer"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <!-- Create category A without products -->
-+            <createData entity="_defaultCategory" stepKey="createCategoryA"/>
-+
-+            <!-- Create product A1 not assigned to any category -->
-+            <createData entity="simpleProductWithoutCategory" stepKey="createProductA1"/>
-+
-+            <!-- Create anchor category B with subcategory C-->
-+            <createData entity="_defaultCategory" stepKey="createCategoryB"/>
-+            <createData entity="SubCategoryWithParent" stepKey="createCategoryC">
-+                <requiredEntity createDataKey="createCategoryB"/>
-+            </createData>
-+
-+            <!--  Assign product B1 to category B -->
-+            <createData entity="ApiSimpleProduct" stepKey="createProductB1">
-+                <requiredEntity createDataKey="createCategoryB"/>
-+            </createData>
-+
-+            <!-- Assign product C1 to category C -->
-+            <createData entity="ApiSimpleProduct" stepKey="createProductC1">
-+                <requiredEntity createDataKey="createCategoryC"/>
-+            </createData>
-+
-+            <!-- Assign product C2 to category C -->
-+            <createData entity="ApiSimpleProduct" stepKey="createProductC2">
-+                <requiredEntity createDataKey="createCategoryC"/>
-+            </createData>
-+
-+            <!-- Switch indexers to "Update by Schedule" mode -->
-+            <actionGroup ref="AdminSwitchAllIndexerToActionModeActionGroup" stepKey="onUpdateBySchedule">
-+                <argument name="action" value="Update by Schedule"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <!-- Switch indexers to "Update on Save" mode -->
-+            <actionGroup ref="AdminSwitchAllIndexerToActionModeActionGroup" stepKey="onUpdateOnSave">
-+                <argument name="action" value="Update on Save"/>
-+            </actionGroup>
-+            <!-- Delete data -->
-+            <deleteData createDataKey="createProductA1" stepKey="deleteProductA1"/>
-+            <deleteData createDataKey="createProductB1" stepKey="deleteProductB1"/>
-+            <deleteData createDataKey="createProductC1" stepKey="deleteProductC1"/>
-+            <deleteData createDataKey="createProductC2" stepKey="deleteProductC2"/>
-+            <deleteData createDataKey="createCategoryA" stepKey="deleteCategoryA"/>
-+            <deleteData createDataKey="createCategoryC" stepKey="deleteCategoryC"/>
-+            <deleteData createDataKey="createCategoryB" stepKey="deleteCategoryB"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Case: change product category from product page -->
-+        <!-- 1. Open Admin > Catalog > Products > Product A1 -->
-+        <amOnPage url="{{AdminProductEditPage.url($$createProductA1.id$$)}}" stepKey="goToProductA1"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+
-+        <!-- 2. Assign category A to product A1. Save product -->
-+        <actionGroup ref="AdminAssignCategoryToProductAndSaveActionGroup" stepKey="assignProduct">
-+            <argument name="categoryName" value="$$createCategoryA.name$$"/>
-+        </actionGroup>
-+
-+        <!-- 3. Open category A on Storefront -->
-+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="goToCategoryA">
-+            <argument name="categoryName" value="$$createCategoryA.name$$"/>
-+        </actionGroup>
-+
-+        <!-- The category is still empty -->
-+        <see userInput="$$createCategoryA.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeCategoryA1Name"/>
-+        <see userInput="We can't find products matching the selection." stepKey="seeEmptyNotice"/>
-+        <dontSee userInput="$$createProductA1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontseeProductA1"/>
-+
-+        <!-- 4. Run cron to reindex -->
-+        <wait time="60" stepKey="waitForChanges"/>
-+        <magentoCLI command="cron:run" stepKey="runCron"/>
-+
-+        <!-- 5. Open category A on Storefront again -->
-+        <reloadPage stepKey="reloadCategoryA"/>
-+
-+        <!-- Category A displays product A1 now -->
-+        <see userInput="$$createCategoryA.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeTitleCategoryA1"/>
-+        <see userInput="$$createProductA1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductA1"/>
-+
-+        <!--6.  Open Admin > Catalog > Products > Product A1. Unassign category A from product A1 -->
-+        <amOnPage url="{{AdminProductEditPage.url($$createProductA1.id$$)}}" stepKey="OnPageProductA1"/>
-+        <waitForPageLoad stepKey="waitForProductA1PageLoad"/>
-+        <actionGroup ref="AdminUnassignCategoryOnProductAndSaveActionGroup" stepKey="unassignCategoryA">
-+            <argument name="categoryName" value="$$createCategoryA.name$$"/>
-+        </actionGroup>
-+
-+        <!-- 7. Open category A on Storefront -->
-+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="toCategoryA">
-+            <argument name="categoryName" value="$$createCategoryA.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Category A still contains product A1 -->
-+        <see userInput="$$createCategoryA.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeCategoryAOnPage"/>
-+        <see userInput="$$createProductA1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeNameProductA1"/>
-+
-+        <!-- 8. Run cron reindex (Ensure that at least one minute passed since last cron run) -->
-+        <wait time="60" stepKey="waitOneMinute"/>
-+        <magentoCLI command="cron:run" stepKey="runCron1"/>
-+
-+        <!-- 9. Open category A on Storefront again -->
-+        <reloadPage stepKey="refreshCategoryAPage"/>
-+
-+        <!-- Category A is empty now -->
-+        <see userInput="$$createCategoryA.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeOnPageCategoryAName"/>
-+        <see userInput="We can't find products matching the selection." stepKey="seeOnPageEmptyNotice"/>
-+        <dontSee userInput="$$createProductA1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontseeProductA1OnPage"/>
-+
-+        <!-- Case: change product status -->
-+        <!-- 10. Open category B on Storefront  -->
-+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="toCategoryB">
-+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Category B displays product B1, C1 and C2 -->
-+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeCategoryBOnPage"/>
-+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeNameProductB1"/>
-+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeNameProductC1"/>
-+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeNameProductC2"/>
-+
-+        <!-- 11. Open product C1 in Admin. Make it disabled (Enable Product = No)-->
-+        <amOnPage url="{{AdminProductEditPage.url($$createProductC1.id$$)}}" stepKey="goToProductC1"/>
-+        <waitForPageLoad stepKey="waitForProductC1PageLoad"/>
-+        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="clickOffEnableToggleAgain"/>
-+        <!-- Saved successfully -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProductC1"/>
-+
-+        <!-- 12. Open category B on Storefront -->
-+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="toCategoryBStorefront">
-+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Category B displays product B1, C1 and C2 -->
-+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="categoryBOnPage"/>
-+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductB1"/>
-+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductC1"/>
-+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductC2"/>
-+
-+        <!-- 13. Open category C on Storefront -->
-+        <actionGroup ref="StorefrontGoToSubCategoryPageActionGroup" stepKey="goToCategoryC">
-+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
-+            <argument name="subCategoryName" value="$$createCategoryC.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Category C still displays products C1 and C2 -->
-+        <see userInput="$$createCategoryC.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="categoryCOnPage"/>
-+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductC1inCategoryC1"/>
-+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductC2InCategoryC2"/>
-+
-+        <!-- 14. Run cron to reindex  (Ensure that at least one minute passed since last cron run) -->
-+        <wait time="60" stepKey="waitMinute"/>
-+        <magentoCLI command="cron:run" stepKey="runCron2"/>
-+
-+        <!--  15. Open category B on Storefront  -->
-+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="onPageCategoryB">
-+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Category B displays product B1 and C2 only-->
-+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeTitleCategoryBOnPage"/>
-+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeOnCategoryBPageProductB1"/>
-+        <dontSee userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeOnCategoryBPageProductC1"/>
-+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeOnCategoryBPageProductC2"/>
-+
-+        <!-- 16. Open category C on Storefront -->
-+        <actionGroup ref="StorefrontGoToSubCategoryPageActionGroup" stepKey="openCategoryC">
-+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
-+            <argument name="subCategoryName" value="$$createCategoryC.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Category C displays only product C2 now -->
-+        <see userInput="$$createCategoryC.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeTitleOnCategoryCPage"/>
-+        <dontSee userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeOnCategoryCPageProductC1"/>
-+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeOnCategoryCPageProductC2"/>
-+
-+        <!-- 17. Repeat steps 10-16, but enable products instead. -->
-+        <!-- 17.11 Open product C1 in Admin. Make it enabled -->
-+        <amOnPage url="{{AdminProductEditPage.url($$createProductC1.id$$)}}" stepKey="goToEditProductC1"/>
-+        <waitForPageLoad stepKey="waitForProductC1Page"/>
-+        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="clickOnEnableToggleAgain"/>
-+
-+        <!-- Saved successfully -->
-+        <actionGroup ref="saveProductForm" stepKey="saveChangedProductC1"/>
-+
-+        <!-- 17.12. Open category B on Storefront -->
-+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryB">
-+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Category B displays product B1 and C2 -->
-+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="titleCategoryBOnPage"/>
-+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryBPageProductB1"/>
-+        <dontSee userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryBPageProductC1"/>
-+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryBPageProductC2"/>
-+
-+        <!-- 17.13. Open category C on Storefront -->
-+        <actionGroup ref="StorefrontGoToSubCategoryPageActionGroup" stepKey="openToCategoryC">
-+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
-+            <argument name="subCategoryName" value="$$createCategoryC.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Category C displays product C2 -->
-+        <see userInput="$$createCategoryC.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="titleOnCategoryCPage"/>
-+        <dontSee userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryCPageProductC1"/>
-+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryCPageProductC2"/>
-+
-+        <!-- 17.14. Run cron to reindex  (Ensure that at least one minute passed since last cron run) -->
-+        <wait time="60" stepKey="waitForOneMinute"/>
-+        <magentoCLI command="cron:run" stepKey="runCron3"/>
-+
-+        <!--  17.15. Open category B on Storefront  -->
-+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openPageCategoryB">
-+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
-+        </actionGroup>
-+
-+        <!--  Category B displays products B1, C1, C2 again, but only after reindex. -->
-+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="onPageSeeCategoryBTitle"/>
-+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="onPageSeeCategoryBProductB1"/>
-+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="onPageSeeCategoryBProductC1"/>
-+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="onPageSeeCategoryBProductC2"/>
-+
-+        <!-- 17.16. Open category C on Storefront -->
-+        <actionGroup ref="StorefrontGoToSubCategoryPageActionGroup" stepKey="openOnStorefrontCategoryC">
-+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
-+            <argument name="subCategoryName" value="$$createCategoryC.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Category C displays products C1, C2 again, but only after reindex.-->
-+        <see userInput="$$createCategoryC.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="onPageSeeCategoryCTitle"/>
-+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="onPageSeeCategoryCProductC1"/>
-+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="onPageSeeCategoryCProductC2"/>
-+
-+        <!-- Case: change product visibility -->
-+        <!-- 18. Repeat steps 10-17 but change product Visibility instead of product status -->
-+        <!-- 18.11 Open product C1 in Admin. Make it enabled -->
-+        <amOnPage url="{{AdminProductEditPage.url($$createProductC1.id$$)}}" stepKey="editProductC1"/>
-+        <waitForPageLoad stepKey="waitProductC1Page"/>
-+        <selectOption selector="{{AdminProductFormBundleSection.visibilityDropDown}}" userInput="Search"
-+                      stepKey="changeVisibility"/>
-+
-+        <!-- Saved successfully -->
-+        <actionGroup ref="saveProductForm" stepKey="productC1Saved"/>
-+
-+        <!-- 18.12. Open category B on Storefront -->
-+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="goPageCategoryB">
-+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
-+        </actionGroup>
-+
-+        <!--  Category B displays products B1, C1, C2 again, but only after reindex. -->
-+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeCategoryBTitle"/>
-+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryBProductB1"/>
-+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryBProductC1"/>
-+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryBProductC2"/>
-+
-+        <!-- 18.13. Open category C on Storefront -->
-+        <actionGroup ref="StorefrontGoToSubCategoryPageActionGroup" stepKey="goPageCategoryC">
-+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
-+            <argument name="subCategoryName" value="$$createCategoryC.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Category C displays products C1, C2 again, but only after reindex.-->
-+        <see userInput="$$createCategoryC.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeCategoryCTitle"/>
-+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeOnCategoryCProductC1"/>
-+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeOnCategoryCProductC2"/>
-+
-+        <!-- 18.14. Run cron to reindex  (Ensure that at least one minute passed since last cron run) -->
-+        <wait time="60" stepKey="waitExtraMinute"/>
-+        <magentoCLI command="cron:run" stepKey="runCron4"/>
-+
-+        <!--  18.15. Open category B on Storefront  -->
-+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="navigateToPageCategoryB">
-+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Category B displays product B1 and C2 only-->
-+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeTitleCategoryB"/>
-+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeTitleProductB1"/>
-+        <dontSee userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontseeCategoryBProductC1"/>
-+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeTitleProductC2"/>
-+
-+        <!-- 18.18. Open category C on Storefront -->
-+        <actionGroup ref="StorefrontGoToSubCategoryPageActionGroup" stepKey="navigateToPageCategoryC">
-+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
-+            <argument name="subCategoryName" value="$$createCategoryC.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Category C displays product C2 again, but only after reindex.-->
-+        <see userInput="$$createCategoryC.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeTitleCategoryC"/>
-+        <dontSee userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeOnCategoryCProductC1"/>
-+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeOnPageTitleProductC2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
-index b079d35296e..2884cb26cf8 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
-@@ -7,9 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminProductGridFilteringByDateAttributeTest">
-         <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Filter products"/>
-             <title value="Verify Set Product as new Filter input on Product Grid doesn't getreset to currentDate"/>
-             <description value="Data input in the new from date filter field should not change"/>
-             <severity value="MAJOR"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml
-new file mode 100644
-index 00000000000..8149bc34087
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml
-@@ -0,0 +1,139 @@
-+<?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="AdminProductImageAssignmentForMultipleStoresTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Product image assignment for multiple stores"/>
-+            <title value="Product image assignment for multiple stores"/>
-+            <description value="Product image assignment for multiple stores"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-58718"/>
-+            <group value="product"/>
-+            <group value="WYSIWYGDisabled"/>
-+            <skip>
-+                <issueId value="MC-13841"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Login Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!-- Create Store View English -->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewEn">
-+                <argument name="customStore" value="customStoreEN"/>
-+            </actionGroup>
-+            <!-- Create Store View France -->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewFr">
-+                <argument name="customStore" value="customStoreFR"/>
-+            </actionGroup>
-+            <!-- Create Category and Simple Product -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">100</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete Store View English -->
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
-+                <argument name="customStore" value="customStoreEN"/>
-+            </actionGroup>
-+            <!-- Delete Store View France -->
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
-+                <argument name="customStore" value="customStoreFR"/>
-+            </actionGroup>
-+            <!-- Clear Filter Store -->
-+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="resetFiltersOnStorePage"/>
-+            <!-- Delete Category and Simple Product -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <!-- Clear Filter Product -->
-+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
-+            <!-- Logout Admin -->
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-+        </after>
-+        <!-- Search Product and Open Edit -->
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchProduct">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Switch to the English store view -->
-+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchStoreViewEnglishProduct">
-+            <argument name="storeView" value="customStoreEN.name"/>
-+        </actionGroup>
-+
-+        <!-- Upload Image English -->
-+        <actionGroup ref="addProductImage" stepKey="uploadImageEnglish"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
-+
-+        <!-- Switch to the French store view -->
-+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchStoreViewFrenchProduct">
-+            <argument name="storeView" value="customStoreFR.name"/>
-+        </actionGroup>
-+
-+        <!-- Upload Image French -->
-+        <actionGroup ref="addProductImage" stepKey="uploadImageFrench">
-+            <argument name="image" value="Magento3"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssignImageRolesActionGroup" stepKey="assignImageRole1">
-+            <argument name="image" value="Magento3"/>
-+        </actionGroup>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct2"/>
-+
-+        <!-- Switch to the All store view -->
-+        <actionGroup ref="AdminSwitchToAllStoreViewActionGroup" stepKey="switchAllStoreViewProduct"/>
-+
-+        <!-- Upload Image All Store View -->
-+        <actionGroup ref="addProductImage" stepKey="uploadImageAllStoreView">
-+            <argument name="image" value="TestImageNew"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssignImageRolesActionGroup" stepKey="assignImageRole">
-+            <argument name="image" value="TestImageNew"/>
-+        </actionGroup>
-+
-+        <!-- Change any product data product description -->
-+        <click selector="{{AdminProductContentSection.sectionHeader}}" stepKey="openDescriptionDropDown"/>
-+        <fillField selector="{{AdminProductContentSection.descriptionTextArea}}" userInput="This is the long description" stepKey="fillLongDescription"/>
-+        <fillField selector="{{AdminProductContentSection.shortDescriptionTextArea}}" userInput="This is the short description" stepKey="fillShortDescription"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!-- Go to Product Page and see Default Store View-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToDefaultStorefrontProductPage"/>
-+        <waitForElementVisible selector="{{StorefrontProductMediaSection.productImageActive(TestImageNew.filename)}}" time="30" stepKey="waitImageToBeLoaded"/>
-+        <seeElement selector="{{StorefrontProductMediaSection.productImageActive(TestImageNew.filename)}}" stepKey="seeActiveImageDefault"/>
-+
-+        <!-- English Switch Store View and see English Store View -->
-+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchStoreViewEnglish">
-+            <argument name="storeView" value="customStoreEN"/>
-+        </actionGroup>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad time="30" stepKey="waitForCategoryPage"/>
-+        <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc(ProductImage.fileName)}}" stepKey="seeThumb"/>
-+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct.name$$)}}" stepKey="openProductPage"/>
-+        <waitForPageLoad time="30" stepKey="waitForProductPage"/>
-+        <waitForElementVisible selector="{{StorefrontProductMediaSection.productImageActive(ProductImage.filename)}}" time="30" stepKey="waitImageToBeLoaded2"/>
-+        <seeElement selector="{{StorefrontProductMediaSection.productImageActive(ProductImage.filename)}}" stepKey="seeActiveImageEnglish"/>
-+
-+        <!-- Switch France Store View and see France Store View -->
-+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchStoreViewFrance">
-+            <argument name="storeView" value="customStoreFR"/>
-+        </actionGroup>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="openCategoryPage1"/>
-+        <waitForPageLoad time="30" stepKey="waitForCategoryPage1"/>
-+        <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc(Magento3.fileName)}}" stepKey="seeThumb1"/>
-+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct.name$$)}}" stepKey="openProductPage1"/>
-+        <waitForPageLoad time="30" stepKey="waitForProductPage1"/>
-+        <waitForElementVisible selector="{{StorefrontProductMediaSection.productImageActive(Magento3.filename)}}" time="30" stepKey="waitImageToBeLoaded3"/>
-+        <seeElement selector="{{StorefrontProductMediaSection.productImageActive(Magento3.filename)}}" stepKey="seeActiveImageFrance"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
-index c8be44eb73c..a882c6e7817 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
-@@ -7,9 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminProductStatusAttributeDisabledByDefaultTest">
-         <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create products"/>
-             <title value="Verify the default option value for product Status attribute is set correctly during product creation"/>
-             <description value="The default option value for product Status attribute is set correctly during product creation"/>
-             <severity value="MAJOR"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveCustomOptionsFromProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveCustomOptionsFromProductTest.xml
-new file mode 100644
-index 00000000000..b5f212d1144
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveCustomOptionsFromProductTest.xml
-@@ -0,0 +1,92 @@
-+<?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="AdminRemoveCustomOptionsFromProductTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create product with custom options"/>
-+            <title value="Remove custom options from product"/>
-+            <description value="Remove custom options from product"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-11512"/>
-+            <group value="catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+            <updateData entity="ProductWithTextFieldAndAreaAndFileOptions" createDataKey="createProduct" stepKey="updateProductWithOptions">
-+                <requiredEntity createDataKey="createProduct"/>
-+            </updateData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProductWithOptions"/>
-+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductFilter"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <!-- Edit Simple Product -->
-+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="goToProduct"/>
-+        <!-- See 3 options are present -->
-+        <actionGroup ref="AdminAssertProductCustomOptionVisible" stepKey="assertCustomOptionsField">
-+            <argument name="option" value="ProductOptionField"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertProductCustomOptionVisible" stepKey="assertCustomOptionsArea">
-+            <argument name="option" value="ProductOptionArea"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertProductCustomOptionVisible" stepKey="assertCustomOptionsFile">
-+            <argument name="option" value="ProductOptionFile"/>
-+        </actionGroup>
-+        <!-- Click delete "Area" and "File" options -->
-+        <actionGroup ref="AdminDeleteProductCustomOption" stepKey="deleteCustomOptionArea">
-+            <argument name="option" value="ProductOptionArea"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminDeleteProductCustomOption" stepKey="deleteCustomOptionFile">
-+            <argument name="option" value="ProductOptionFile"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertProductCustomOptionVisible" stepKey="assertVisibleCustomOptionField">
-+            <argument name="option" value="ProductOptionField"/>
-+        </actionGroup>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+        <!-- See only "Field option" left Also we shouldn't see any other options -->
-+        <actionGroup ref="AdminAssertProductCustomOptionVisible" stepKey="assertVisibleSecondCustomOptionField">
-+            <argument name="option" value="ProductOptionField"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertProductHasNoCustomOption" stepKey="assertNoCustomOptionsFile">
-+            <argument name="option" value="ProductOptionFileSecond"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertProductHasNoCustomOption" stepKey="assertNoCustomOptionsField">
-+            <argument name="option" value="ProductOptionFieldSecond"/>
-+        </actionGroup>
-+        <!-- Click Add option "File" -->
-+        <actionGroup ref="AddProductCustomOptionFile" stepKey="createAddOptionFile">
-+            <argument name="option" value="ProductOptionFileSecond"/>
-+        </actionGroup>
-+        <!-- Click Add option "Field" -->
-+        <actionGroup ref="AddProductCustomOptionField" stepKey="createCustomOptionField">
-+            <argument name="option" value="ProductOptionFieldSecond"/>
-+        </actionGroup>
-+        <actionGroup ref="saveProductForm" stepKey="saveProductWithNewlyAddedOptions"/>
-+        <!-- See 3 options are present -->
-+        <actionGroup ref="AdminAssertProductCustomOptionVisible" stepKey="assertPresentCustomOptionField">
-+            <argument name="option" value="ProductOptionField"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertProductCustomOptionVisible" stepKey="assertPresenceOfFileOption">
-+            <argument name="option" value="ProductOptionFileSecond"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertProductCustomOptionVisible" stepKey="assertPresenceOfFieldOption">
-+            <argument name="option" value="ProductOptionFieldSecond"/>
-+        </actionGroup>
-+        <!-- Delete All options and See no more options present on the page -->
-+        <actionGroup ref="AdminDeleteAllProductCustomOptions" stepKey="deleteAllCustomOptions"/>
-+        <!-- Product successfully saved and it has no options -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProductWithoutCustomOptions"/>
-+        <actionGroup ref="AdminAssertProductHasNoCustomOptions" stepKey="assertNoCustomOptions"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
-index 4a3b370c7da..9760dc579b1 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminRemoveDefaultImageSimpleProductTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
-index e249c8e8cea..a740b700c30 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminRemoveDefaultImageVirtualProductTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
-new file mode 100644
-index 00000000000..876eedb9347
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
-@@ -0,0 +1,51 @@
-+<?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="AdminRemoveDefaultVideoSimpleProductTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Add/remove images and videos for all product types and category"/>
-+            <title value="Admin should be able to remove default product video from a Simple Product"/>
-+            <description value="Admin should be able to remove default product video from a Simple Product"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-206"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-+        </after>
-+
-+        <!-- Create product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
-+        <actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
-+            <argument name="product" value="ApiSimpleProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
-+            <argument name="product" value="ApiSimpleProduct"/>
-+        </actionGroup>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="ApiSimpleProduct"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoVirtualProductTest.xml
-new file mode 100644
-index 00000000000..8b3b38d0ece
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoVirtualProductTest.xml
-@@ -0,0 +1,34 @@
-+<?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="AdminRemoveDefaultVideoVirtualProductTest" extends="AdminRemoveDefaultVideoSimpleProductTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Add/remove images and videos for all product types and category"/>
-+            <title value="Admin should be able to remove default product video from a Virtual Product"/>
-+            <description value="Admin should be able to remove default product video from a Virtual Product"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-204"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+
-+        <!-- Replacing steps in base AdminRemoveDefaultVideoSimpleProductTest -->
-+
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
-+            <argument name="product" value="defaultVirtualProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
-+            <argument name="product" value="defaultVirtualProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="defaultVirtualProduct"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
-new file mode 100644
-index 00000000000..8316f54c15a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
-@@ -0,0 +1,131 @@
-+<?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="AdminRemoveImageAffectsAllScopesTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="MAGETWO-66442: Changes in default scope not effect product images in other scopes"/>
-+            <title value="Effect of product images changes in default scope to other scopes"/>
-+            <description value="Product image should be deleted from all scopes"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94265"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <!--Create 2 websites (with stores, store views)-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="_defaultCategory" stepKey="category"/>
-+            <createData entity="_defaultProduct" stepKey="product">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
-+                <argument name="newWebsiteName" value="FirstWebSite"/>
-+                <argument name="websiteCode" value="FirstWebSiteCode"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore" after="createWebsite">
-+                <argument name="website" value="FirstWebSite"/>
-+                <argument name="storeGroupName" value="NewStore"/>
-+                <argument name="storeGroupCode" value="Base1"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView" after="createNewStore">
-+                <argument name="StoreGroup" value="staticFirstStoreGroup"/>
-+                <argument name="customStore" value="staticStore"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createSecondWebsite" after="createCustomStoreView">
-+                <argument name="newWebsiteName" value="SecondWebSite"/>
-+                <argument name="websiteCode" value="SecondWebSiteCode"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStore" after="createSecondWebsite">
-+                <argument name="website" value="SecondWebSite"/>
-+                <argument name="storeGroupName" value="SecondStore"/>
-+                <argument name="storeGroupCode" value="Base2"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView2"  after="createSecondStore">
-+                <argument name="StoreGroup" value="staticStoreGroup"/>
-+                <argument name="customStore" value="staticSecondStore"/>
-+            </actionGroup>
-+        </before>
-+
-+        <after>
-+            <actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/>
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-+                <argument name="websiteName" value="FirstWebSite"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
-+                <argument name="websiteName" value="SecondWebSite"/>
-+            </actionGroup>
-+            <deleteData createDataKey="category" stepKey="deletePreReqCategory"/>
-+            <deleteData createDataKey="product" stepKey="deleteFirstProduct"/>
-+            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
-+            <magentoCLI stepKey="flushCache" command="cache:flush"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create product-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
-+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
-+
-+        <!--Open created product-->
-+        <click selector="{{AdminProductGridSection.productGridNameProduct($$product.name$$)}}" stepKey="createdProduct"/>
-+        <waitForPageLoad stepKey="waitForOpenedCreatedProduct"/>
-+
-+        <!-- Add image to product -->
-+        <actionGroup ref="addProductImage" stepKey="addFirstImageForProduct">
-+            <argument name="image" value="TestImageNew"/>
-+        </actionGroup>
-+
-+        <!-- Add second image to product -->
-+        <actionGroup ref="addProductImage" stepKey="addSecondImageForProduct">
-+            <argument name="image" value="MagentoLogo"/>
-+        </actionGroup>
-+        <!--"Product in Websites": select both Websites-->
-+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite1">
-+            <argument name="website" value="FirstWebSite"/>
-+        </actionGroup>
-+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite2">
-+            <argument name="website" value="SecondWebSite"/>
-+        </actionGroup>
-+
-+        <!--Go to "Catalog" -> "Products". Open created product-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoaded"/>
-+        <click selector="{{AdminProductGridSection.productGridNameProduct($$product.name$$)}}" stepKey="openCreatedProduct"/>
-+        <waitForPageLoad stepKey="waitForCreatedProductOpened"/>
-+
-+        <!--Delete Image 1-->
-+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
-+
-+        <!--Click "Save" in the upper right corner-->
-+        <actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/>
-+
-+        <!--Switch to "Store view 1"-->
-+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="selectStoreView">
-+            <argument name="storeViewName" value="Store View"/>
-+        </actionGroup>
-+
-+        <!-- Assert product first image not in admin product form -->
-+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage">
-+            <argument name="image" value="TestImageNew"/>
-+        </actionGroup>
-+
-+        <!--Switch to "Store view 2"-->
-+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="selectSecondStoreView">
-+            <argument name="storeViewName" value="Second Store View"/>
-+        </actionGroup>
-+
-+        <!-- Verify that Image 1 is deleted from the Second Store View list -->
-+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInSecondStoreViewPage">
-+            <argument name="image" value="TestImageNew"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml
-index c68a848fb0f..fb33e183799 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminRemoveImageFromCategoryTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml
-new file mode 100644
-index 00000000000..240a5492355
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml
-@@ -0,0 +1,54 @@
-+<?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="AdminRequiredFieldsHaveRequiredFieldIndicatorTest">
-+        <annotations>
-+            <stories value="Verify the presence of required field indicators across different pages in Magento Admin"/>
-+            <title value="Required fields should have the required asterisk indicator "/>
-+            <description value="Verify that Required fields should have the required indicator icon next to the field name"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94330"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <after>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-+        </after>
-+
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
-+        <waitForElementVisible selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="waitForAddSubCategoryVisible"/>
-+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
-+
-+        <!-- Verify that the Category Name field has the required field name indicator -->
-+        <executeJS function="{{AdminCategoryBasicFieldSection.RequiredFieldIndicator}}" stepKey="getRequiredFieldIndicator"/>
-+        <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="getRequiredFieldIndicator" message="pass" stepKey="assertRequiredFieldIndicator1"/>
-+
-+        <executeJS function="{{AdminCategoryBasicFieldSection.RequiredFieldIndicatorColor}}" stepKey="getRequiredFieldIndicatorColor"/>
-+        <assertEquals expected="rgb(226, 38, 38)" expectedType="string" actualType="variable" actual="getRequiredFieldIndicatorColor" message="pass" stepKey="assertRequiredFieldIndicator2"/>
-+
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndexPage"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="addProductDropdown"/>
-+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="addSimpleProduct"/>
-+
-+        <!-- Verify that the Product Name and Sku fields have the required field name indicator -->
-+        <executeJS function="{{AdminProductFormSection.RequiredNameIndicator}}" stepKey="productNameRequiredFieldIndicator"/>
-+        <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="productNameRequiredFieldIndicator" message="pass" stepKey="assertRequiredFieldIndicator3"/>
-+        <executeJS function="{{AdminProductFormSection.RequiredSkuIndicator}}" stepKey="productSkuRequiredFieldIndicator"/>
-+        <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="productSkuRequiredFieldIndicator" message="pass" stepKey="assertRequiredFieldIndicator4"/>
-+
-+        <!-- Verify that the CMS page have the required field name indicator next to Page Title -->
-+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnPagePagesGrid"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <click selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="clickAddNewPage"/>
-+        <executeJS function="{{CmsNewPagePageBasicFieldsSection.RequiredFieldIndicator}}" stepKey="pageTitleRequiredFieldIndicator"/>
-+        <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="pageTitleRequiredFieldIndicator" message="pass" stepKey="assertRequiredFieldIndicator5"/>
-+
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRestrictedUserAddCategoryFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRestrictedUserAddCategoryFromProductPageTest.xml
-new file mode 100644
-index 00000000000..cd401b7a465
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRestrictedUserAddCategoryFromProductPageTest.xml
-@@ -0,0 +1,110 @@
-+<?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="AdminRestrictedUserAddCategoryFromProductPageTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <title value="Adding new category from product page by restricted user"/>
-+            <description value="Adding new category from product page by restricted user"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-17229"/>
-+            <useCaseId value="MAGETWO-69893"/>
-+            <group value="catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create category-->
-+            <comment userInput="Create category" stepKey="commentCreateCategory"/>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+        </before>
-+        <after>
-+            <!--Delete created product-->
-+            <comment userInput="Delete created product" stepKey="commentDeleteProduct"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
-+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetFiltersIfExist"/>
-+            <actionGroup ref="logout" stepKey="logoutOfUser"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Delete created data-->
-+            <comment userInput="Delete created data" stepKey="commentDeleteCreatedData"/>
-+            <amOnPage url="{{AdminRolesPage.url}}" stepKey="navigateToUserRoleGrid" />
-+            <waitForPageLoad stepKey="waitForRolesGridLoad" />
-+            <actionGroup ref="AdminDeleteRoleActionGroup" stepKey="deleteUserRole">
-+                <argument name="role" value="adminRole"/>
-+            </actionGroup>
-+            <amOnPage url="{{AdminUsersPage.url}}" stepKey="goToAllUsersPage"/>
-+            <waitForPageLoad stepKey="waitForUsersGridLoad" />
-+            <actionGroup ref="AdminDeleteNewUserActionGroup" stepKey="deleteUser">
-+                <argument name="userName" value="{{admin2.username}}"/>
-+            </actionGroup>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-+        </after>
-+        <!--Create user role-->
-+        <comment userInput="Create user role" stepKey="commentCreateUserRole"/>
-+        <actionGroup ref="AdminFillUserRoleRequiredData" stepKey="fillUserRoleRequiredData">
-+            <argument name="User" value="adminRole"/>
-+            <argument name="restrictedRole" value="Stores"/>
-+        </actionGroup>
-+        <click selector="{{AdminEditRoleInfoSection.roleResourcesTab}}" stepKey="clickRoleResourcesTab" />
-+        <actionGroup ref="AdminAddRestrictedRole" stepKey="addRestrictedRoleStores">
-+            <argument name="User" value="adminRole"/>
-+            <argument name="restrictedRole" value="Stores"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAddRestrictedRole" stepKey="addRestrictedRoleProducts">
-+            <argument name="User" value="adminRole"/>
-+            <argument name="restrictedRole" value="Products"/>
-+        </actionGroup>
-+        <click selector="{{AdminEditRoleInfoSection.saveButton}}" stepKey="clickSaveRoleButton" />
-+        <see userInput="You saved the role." stepKey="seeUserRoleSavedMessage"/>
-+        <!--Create user and assign role to it-->
-+        <comment userInput="Create user and assign role to it" stepKey="commentCreateUser"/>
-+        <actionGroup ref="AdminCreateUserActionGroup" stepKey="createAdminUser">
-+            <argument name="role" value="adminRole"/>
-+            <argument name="User" value="admin2"/>
-+        </actionGroup>
-+        <!--Log out of admin and login with newly created user-->
-+        <comment userInput="Log out of admin and login with newly created user" stepKey="commentLoginWithNewUser"/>
-+        <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUser">
-+            <argument name="adminUser" value="admin2"/>
-+        </actionGroup>
-+        <!--Go to create product page-->
-+        <comment userInput="Go to create product page" stepKey="commentGoCreateProductPage"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage"/>
-+        <dontSeeElement selector="{{AdminProductFormSection.newCategoryButton}}" stepKey="dontSeeNewCategoryButton"/>
-+        <!--Fill product data and assign to category-->
-+        <comment userInput="Fill product data and assign to category" stepKey="commentFillProductData"/>
-+        <actionGroup ref="fillMainProductForm" stepKey="fillMainProductForm"/>
-+        <actionGroup ref="SetCategoryByName" stepKey="addCategoryToProduct">
-+            <argument name="categoryName" value="$$createCategory.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+        <!--Assert that category exist in field-->
-+        <comment userInput="Assert that category exist in field" stepKey="commentAssertion"/>
-+        <grabTextFrom selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="grabCategoryName"/>
-+        <assertContains stepKey="assertThatCategory">
-+            <expectedResult type="variable">$$createCategory.name$$</expectedResult>
-+            <actualResult type="variable">$grabCategoryName</actualResult>
-+        </assertContains>
-+        <!--Remove the category from the product and assert that it removed-->
-+        <comment userInput="Remove the category from the product and assert that it removed" stepKey="assertCategoryRemoved"/>
-+        <actionGroup ref="removeCategoryFromProduct" stepKey="removeCategoryFromProduct">
-+            <argument name="categoryName" value="$$createCategory.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="saveProductForm" stepKey="saveProductAfterRemovingCategory"/>
-+        <grabTextFrom selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="grabCategoryFieldContent"/>
-+        <assertNotContains stepKey="assertThatCategoryRemoved">
-+            <expectedResult type="variable">$$createCategory.name$$</expectedResult>
-+            <actualResult type="variable">$grabCategoryFieldContent</actualResult>
-+        </assertNotContains>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductEditUiTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductEditUiTest.xml
-index 2b9733fd2fa..bc5a0319bae 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductEditUiTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductEditUiTest.xml
-@@ -7,13 +7,16 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminSimpleProductUiValidationTest">
-         <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Edit products"/>
-             <title value="UI elements on the simple product edit screen should be organized as expected"/>
-             <description value="Admin should be able to use simple product UI in expected manner"/>
-             <testCaseId value="MAGETWO-92835"/>
-             <group value="Catalog"/>
-+            <severity value="AVERAGE"/>
-         </annotations>
- 
-         <before>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml
-index b51f6a6e432..1cd0e15780c 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminSimpleProductImagesTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml
-new file mode 100644
-index 00000000000..f5e5911352c
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml
-@@ -0,0 +1,79 @@
-+<?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="AdminSimpleProductSetEditContentTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create/edit simple product"/>
-+            <title value="Admin should be able to set/edit product Content when editing a simple product"/>
-+            <description value="Admin should be able to set/edit product Content when editing a simple product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3422"/>
-+            <group value="Catalog"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+        <before>
-+            <!--Admin Login-->
-+            <actionGroup stepKey="loginToAdminPanel" ref="LoginAsAdmin"/>
-+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-+        </before>
-+        <after>
-+            <!-- Delete simple product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="SimpleProduct"/>
-+            </actionGroup>
-+            <!--Admin Logout-->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="SimpleProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
-+            <argument name="product" value="SimpleProduct"/>
-+        </actionGroup>
-+
-+        <!--Add content-->
-+        <!--A generic scroll scrolls past this element, in doing this it fails to execute certain actions on the element and others below it. By scrolling slightly above it it resolves this issue.-->
-+        <scrollTo selector="{{AdminProductContentSection.sectionHeader}}" x="0" y="-100" stepKey="scrollTo"/>
-+        <click selector="{{AdminProductContentSection.sectionHeader}}" stepKey="openDescriptionDropDown"/>
-+        <fillField selector="{{AdminProductContentSection.descriptionTextArea}}" userInput="This is the long description" stepKey="fillLongDescription"/>
-+        <fillField selector="{{AdminProductContentSection.shortDescriptionTextArea}}" userInput="This is the short description" stepKey="fillShortDescription"/>
-+
-+        <!--save the product-->
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-+
-+        <!--Edit content-->
-+        <click selector="{{AdminProductContentSection.sectionHeader}}" stepKey="openDescriptionDropDownEdit"/>
-+        <scrollTo selector="{{AdminProductContentSection.sectionHeader}}" stepKey="scrollToEdit"/>
-+        <fillField selector="{{AdminProductContentSection.descriptionTextArea}}" userInput="EDIT ~ This is the long description ~ EDIT" stepKey="editLongDescription"/>
-+        <fillField selector="{{AdminProductContentSection.shortDescriptionTextArea}}" userInput="EDIT ~ This is the short description ~ EDIT" stepKey="editShortDescription"/>
-+
-+        <!--save the product-->
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAfterEdit"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
-+
-+        <!--Checking content admin-->
-+        <click selector="{{AdminProductContentSection.sectionHeader}}" stepKey="openDescriptionDropDownAgain"/>
-+        <scrollTo selector="{{AdminProductContentSection.sectionHeader}}" stepKey="scrollToAgain"/>
-+        <seeInField selector="{{AdminProductContentSection.descriptionTextArea}}" userInput="EDIT ~ This is the long description ~ EDIT" stepKey="seeLongDescriptionAdmin"/>
-+        <seeInField selector="{{AdminProductContentSection.shortDescriptionTextArea}}" userInput="EDIT ~ This is the short description ~ EDIT" stepKey="seeShortDescriptionAdmin"/>
-+
-+        <!--Checking content storefront-->
-+        <amOnPage url="{{SimpleProduct.sku}}.html" stepKey="goToStorefront"/>
-+        <waitForPageLoad stepKey="waitForStorefront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="EDIT ~ This is the long description ~ EDIT" stepKey="seeLongDescriptionStorefront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productShortDescription}}" userInput="EDIT ~ This is the short description ~ EDIT" stepKey="seeShortDescriptionStorefront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
-new file mode 100644
-index 00000000000..b06502ce94c
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
-@@ -0,0 +1,77 @@
-+<?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="AdminSimpleSetEditRelatedProductsTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create/edit simple product"/>
-+            <title value="Admin should be able to set/edit Related Products information when editing a simple product"/>
-+            <description value="Admin should be able to set/edit Related Products information when editing a simple product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3411"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct0"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-+        </before>
-+        <after>
-+            <!-- Delete simple product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="SimpleProduct3"/>
-+            </actionGroup>
-+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-+            <deleteData createDataKey="simpleProduct0" stepKey="deleteSimpleProduct0"/>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+        </after>
-+
-+        <!--Create product-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="SimpleProduct3"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
-+            <argument name="product" value="SimpleProduct3"/>
-+        </actionGroup>
-+
-+        <!--Add related product-->
-+        <actionGroup ref="addRelatedProductBySku" stepKey="addRelatedProduct0">
-+            <argument name="sku" value="$$simpleProduct0.sku$$"/>
-+        </actionGroup>
-+
-+        <!--Save the product-->
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-+
-+        <!--Add another related product-->
-+        <actionGroup ref="addRelatedProductBySku" stepKey="addRelatedProduct1">
-+            <argument name="sku" value="$$simpleProduct1.sku$$"/>
-+        </actionGroup>
-+
-+        <!--Remove previous related product-->
-+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.removeRelatedProduct($$simpleProduct0.sku$$)}}" stepKey="removeRelatedProduct"/>
-+
-+        <!--Save the product-->
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAfterEdit"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
-+
-+        <!--See related product in admin-->
-+        <scrollTo selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" stepKey="scrollTo"/>
-+        <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedSee"/>
-+        <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedRelatedProduct}}" userInput="$$simpleProduct1.sku$$" stepKey="seeRelatedProduct"/>
-+
-+        <!--See related product in storefront-->
-+        <amOnPage url="{{SimpleProduct3.sku}}.html" stepKey="goToStorefront"/>
-+        <waitForPageLoad stepKey="waitForStorefront"/>
-+        <seeElement selector="{{StorefrontProductRelatedProductsSection.relatedProductName($$simpleProduct1.sku$$)}}" stepKey="seeRelatedProductInStorefront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
-new file mode 100644
-index 00000000000..eb014ca7f88
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
-@@ -0,0 +1,79 @@
-+<?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="AdminSortingByWebsitesTest">
-+        <annotations>
-+            <stories value="View sorting by websites"/>
-+            <title value="Sorting by websites in Admin"/>
-+            <description value="Sorting products by websites in Admin"/>
-+            <severity value="AVERAGE"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="productAssignedToCustomWebsite">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="productAssignedToMainWebsite">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create new website -->
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
-+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
-+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
-+            </actionGroup>
-+            <actionGroup ref="EnableWebUrlOptions" stepKey="addStoreCodeToUrls"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCacheAfterEnableWebUrlOptions"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="productAssignedToCustomWebsite" stepKey="deleteProductAssignedToCustomWebsite"/>
-+            <deleteData createDataKey="productAssignedToMainWebsite" stepKey="deleteProductAssignedToMainWebsite"/>
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteTestWebsite">
-+                <argument name="websiteName" value="{{customWebsite.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Assign Custom Website to Simple Product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
-+        <waitForPageLoad stepKey="waitForCatalogProductGrid"/>
-+
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="assignCustomWebsiteToProduct">
-+            <argument name="product" value="$$productAssignedToCustomWebsite$$"/>
-+        </actionGroup>
-+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
-+        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{AdminProductContentSection.sectionHeaderShow}}" visible="false" stepKey="expandSection"/>
-+        <waitForPageLoad stepKey="waitForPageOpened"/>
-+        <uncheckOption selector="{{ProductInWebsitesSection.website(_defaultWebsite.name)}}" stepKey="deselectMainWebsite"/>
-+        <checkOption selector="{{ProductInWebsitesSection.website(customWebsite.name)}}" stepKey="selectWebsite"/>
-+
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForProductPageToSaveAgain"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
-+
-+        <!--Navigate To Product Grid To Check Website Sorting-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGridToSortByWebsite"/>
-+        <waitForPageLoad stepKey="waitForCatalogProductGridLoaded"/>
-+
-+        <!--Sorting works (By Websites) ASC-->
-+        <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortAsc"/>
-+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Main Website" stepKey="checkIfProduct1WebsitesAsc"/>
-+
-+        <!--Sorting works (By Websites) DESC-->
-+        <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortDesc"/>
-+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="{{customWebsite.name}}" stepKey="checkIfProduct1WebsitesDesc"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..ed29c281b80
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminStoresAttributeSetNavigateMenuTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin stores attribute set navigate menu test"/>
-+            <description value="Admin should be able to navigate to Stores > Attribute Set"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14133"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToAttributeSetPage">
-+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuStoresAttributesAttributeSet.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuStoresAttributesAttributeSet.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..28a33c4f20c
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminStoresProductNavigateMenuTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin stores product navigate menu test"/>
-+            <description value="Admin should be able to navigate to Stores > Product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14132"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToProductAttributePage">
-+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuStoresAttributesProduct.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuStoresAttributesProduct.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml
-new file mode 100644
-index 00000000000..4bcb82372e8
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml
-@@ -0,0 +1,95 @@
-+<?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="AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Tier price"/>
-+            <title value="Check that 'tier price' block not available for simple product from options without 'tier price'"/>
-+            <description value="Check that 'tier price' block not available for simple product from options without 'tier price'"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-97050"/>
-+            <useCaseId value="MAGETWO-96842"/>
-+            <group value="catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!--Create category-->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Create the configurable product based on the data in the /data folder -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Make the configurable product have two options, that are children of the default attribute set -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create the 2 children that will be a part of the configurable product -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <!-- Assign the two products to the configurable product -->
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-+        </after>
-+
-+        <!--Go to storefront product page an check price box css-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontLoad"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption1.value$$" stepKey="selectOption"/>
-+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="class" stepKey="grabGrabPriceClass"/>
-+        <assertNotContains actual="$grabGrabPriceClass" expected=".price-box .price-tier_price" expectedType="string"  stepKey="assertNotEquals"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
-index 5a07b11a204..a33c7bb1287 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminUnassignProductAttributeFromAttributeSetTest">
-         <annotations>
-             <features value="Catalog"/>
-@@ -17,33 +17,25 @@
-             <severity value="CRITICAL"/>
-             <testCaseId value="MC-194"/>
-             <group value="Catalog"/>
--            <skip>
--                <issueId value="MAGETWO-92780"/>
--            </skip>
-         </annotations>
-         <before>
-             <createData entity="productDropDownAttribute" stepKey="attribute"/>
--
-             <createData entity="productAttributeOption1" stepKey="option1">
-                 <requiredEntity createDataKey="attribute"/>
-             </createData>
-             <createData entity="productAttributeOption2" stepKey="option2">
-                 <requiredEntity createDataKey="attribute"/>
-             </createData>
--
-             <createData entity="AddToDefaultSet" stepKey="addToDefaultSet">
-                 <requiredEntity createDataKey="attribute"/>
-             </createData>
--
-             <createData entity="ApiProductWithDescription" stepKey="product"/>
--
-             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-         </before>
-         <after>
-             <deleteData createDataKey="attribute" stepKey="deleteAttribute"/>
-             <actionGroup ref="logout" stepKey="logout"/>
-         </after>
--
-         <!-- Assert attribute presence in storefront product additional information -->
-         <amOnPage url="/$$product.custom_attributes[url_key]$$.html" stepKey="onProductPage1"/>
-         <waitForPageLoad stepKey="wait1"/>
-@@ -64,6 +56,8 @@
-         <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="seeAttributeInUnassigned"/>
-         <!-- Save attribute set -->
-         <actionGroup ref="SaveAttributeSet" stepKey="SaveAttributeSet"/>
-+        <!-- Clear cache -->
-+        <actionGroup ref="ClearPageCacheActionGroup" stepKey="clearPageCacheActionGroup"/>
-         <!-- Go to create new product page -->
-         <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
-         <waitForPageLoad stepKey="wait2"/>
-@@ -72,8 +66,7 @@
-         <!-- Assert removed attribute not presence in storefront product additional information -->
-         <amOnPage url="/$$product.custom_attributes[url_key]$$.html" stepKey="onProductPage2"/>
-         <waitForPageLoad stepKey="wait3"/>
--        <actionGroup ref="checkAttributeNotInMoreInformationTab" stepKey="checkAttributeNotInMoreInformationTab">
--            <argument name="attributeLabel" value="$$attribute.attribute[frontend_labels][0][label]$$"/>
--        </actionGroup>
-+        <dontSeeElement selector="{{StorefrontProductMoreInformationSection.moreInformation}}" stepKey="dontSeeProductAttribute"/>
-+        <dontSee userInput="$$attribute.attribute[frontend_labels][0][label]$$" selector="{{StorefrontProductMoreInformationSection.moreInformationTextArea}}" stepKey="dontSeeAttributeLabel"/>
-     </test>
- </tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
-new file mode 100644
-index 00000000000..d8d462f850f
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
-@@ -0,0 +1,77 @@
-+<?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="AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest">
-+        <annotations>
-+            <stories value="Update categories"/>
-+            <title value="Update category, check default URL key on the custom store view"/>
-+            <description value="Login as admin and update category and check default URL Key on custom store view"/>
-+            <testCaseId value="MC-6063"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="NewRootCategory" stepKey="rootCategory"/>
-+            <createData entity="SimpleRootSubCategory" stepKey="category">
-+                <requiredEntity createDataKey="rootCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStore">
-+                <argument name="storeGroupName" value="customStore.name"/>
-+            </actionGroup>
-+            <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Store Page -->
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
-+
-+        <!--Create Custom Store -->
-+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
-+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
-+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
-+        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
-+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
-+
-+        <!--Create Store View-->
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
-+            <argument name="StoreGroup" value="customStore"/>
-+            <argument name="customStore" value="customStore"/>
-+        </actionGroup>
-+
-+        <!--Update Category-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="updateCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
-+        <waitForPageLoad stepKey="waitForCateforyToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
-+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
-+        <seeInField selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="seeCategoryUrlKey" userInput="{{SimpleRootSubCategory.name_lwr}}2" />
-+        <!--Open Category in Store Front  Page-->
-+        <amOnPage url="/{{NewRootCategory.name}}/{{_defaultCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="clickSwitchStoreButtonOnDefaultStore"/>
-+        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="selectSecondStoreToSwitchOn"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeUpdatedCatergoryInStoreFront"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategoryOnStoreFront"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(_defaultCategory.name)}}" stepKey="seeTheUpdatedCategoryTitle"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
-new file mode 100644
-index 00000000000..479249ca678
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
-@@ -0,0 +1,58 @@
-+<?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="AdminUpdateCategoryAndMakeInactiveTest">
-+        <annotations>
-+            <stories value="Update categories"/>
-+            <title value="Update category, make inactive"/>
-+            <description value="Login as admin and update category and  make it Inactive"/>
-+            <testCaseId value="MC-6060"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteCreatedCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open category page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+
-+        <!--Update category and make category inactive-->
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableCategory"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForCategorySaved"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
-+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
-+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontCategoryIsChecked"/>
-+
-+        <!--Verify Inactive Category is store front page-->
-+        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}"  stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="dontSeeCategoryOnStoreNavigationBar"/>
-+        <waitForPageLoad time="15" stepKey="wait"/>
-+
-+        <!--Verify Inactive Category in category page -->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded1"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree1"/>
-+        <seeElement  selector="{{AdminCategoryContentSection.categoryInTree(_defaultCategory.name)}}" stepKey="assertCategoryInTree" />
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory1"/>
-+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle1" />
-+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="assertCategoryIsInactive"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
-new file mode 100644
-index 00000000000..2cb4a6b6dd4
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
-@@ -0,0 +1,82 @@
-+<?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="AdminUpdateCategoryNameWithStoreViewTest">
-+        <annotations>
-+            <stories value="Update categories"/>
-+            <title value="Update category, with custom store view"/>
-+            <description value="Login as admin and update category name with custom Store View"/>
-+            <testCaseId value="MC-6061"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="NewRootCategory" stepKey="rootCategory"/>
-+            <createData entity="SimpleRootSubCategory" stepKey="category">
-+                    <requiredEntity createDataKey="rootCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStore">
-+                <argument name="storeGroupName" value="customStore.name"/>
-+            </actionGroup>
-+            <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open store page -->
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
-+
-+        <!--Create Custom Store -->
-+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
-+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
-+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
-+        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
-+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
-+
-+        <!--Create Store View-->
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
-+            <argument name="StoreGroup" value="customStore"/>
-+            <argument name="customStore" value="customStore"/>
-+        </actionGroup>
-+
-+        <!--Verify created SubCAtegory is present on Store Front -->
-+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
-+        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>
-+
-+        <!--Open Category Page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+
-+        <!--Update Category-->
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTreeUnderRoot(SimpleRootSubCategory.name)}}" stepKey="clickOnSubcategoryIsUndeRootCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="updateCategoryName"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
-+        <waitForPageLoad stepKey="waitForCateforyToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+
-+        <!--Verify the Category is not present in Store Front-->
-+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded2"/>
-+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="dontSeeCatergoryInStoreFront"/>
-+
-+        <!--Verify the Updated Category is present in Store Front-->
-+        <amOnPage url="/{{NewRootCategory.name}}/{{_defaultCategory.name}}.html" stepKey="seeTheUpdatedCategoryInStoreFront"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded3"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeUpdatedCatergoryInStoreFront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
-index 013b1b6d381..2ff83afa15e 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminUpdateCategoryStoreUrlKeyTest">
-         <annotations>
-             <features value="SEO-friendly URL Key Update"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
-new file mode 100644
-index 00000000000..e7c4a8a093e
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
-@@ -0,0 +1,84 @@
-+<?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="AdminUpdateCategoryUrlKeyWithStoreViewTest">
-+        <annotations>
-+            <stories value="Update categories"/>
-+            <title value="Update category, URL key with custom store view"/>
-+            <description value="Login as admin and update category URL Key with store view"/>
-+            <testCaseId value="MC-6062"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="NewRootCategory" stepKey="rootCategory"/>
-+            <createData entity="SimpleRootSubCategory" stepKey="category">
-+                <requiredEntity createDataKey="rootCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStore">
-+                <argument name="storeGroupName" value="customStore.name"/>
-+            </actionGroup>
-+            <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Store Page -->
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
-+
-+        <!--Create Custom Store -->
-+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
-+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
-+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
-+        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
-+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
-+
-+        <!--Create Store View-->
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
-+            <argument name="StoreGroup" value="customStore"/>
-+            <argument name="customStore" value="customStore"/>
-+        </actionGroup>
-+
-+        <!--Verify Category in Store View-->
-+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
-+        <waitForPageLoad stepKey="waitForSystemStorePage1"/>
-+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
-+        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+
-+        <!--Update URL Key-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded2"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="selectCategory1"/>
-+        <scrollTo selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="scrollToSearchEngineOptimization"/>
-+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection"/>
-+        <clearField selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="clearUrlKeyField"/>
-+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="newurlkey" stepKey="enterURLKey"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterFirstSeoUpdate"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!--Open Category Store Front Page-->
-+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront1"/>
-+        <waitForPageLoad stepKey="waitForSystemStorePage3"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCategoryOnNavigation1"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="selectCategory2"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad1"/>
-+
-+        <!--Verify Updated URLKey is present-->
-+        <seeInCurrentUrl stepKey="verifyUpdatedUrlKey" url="newurlkey.html"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
-new file mode 100644
-index 00000000000..3fea9c0eed7
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
-@@ -0,0 +1,83 @@
-+<?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="AdminUpdateCategoryWithInactiveIncludeInMenuTest">
-+        <annotations>
-+            <stories value="Update categories"/>
-+            <title value="Update category, name description urlkey metatitle exclude from menu"/>
-+            <description value="Login as admin and update category name, description, urlKey, metatitle and exclude from menu"/>
-+            <testCaseId value="MC-6058"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Category Page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+
-+        <!--Update Category name,description, urlKey, meta title and disable Include in Menu-->
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="fillCategoryName"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="disableIncludeInMenu"/>
-+        <scrollTo  selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent"/>
-+        <click selector="{{AdminCategoryContentSection.sectionHeader}}"  stepKey="selectContent"/>
-+        <fillField selector="{{AdminCategoryContentSection.description}}"  userInput="Updated category Description Fields" stepKey="fillUpdatedDescription"/>
-+        <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization"/>
-+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
-+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleRootSubCategory.url_key}}" stepKey="fillUpdatedUrlKey"/>
-+        <fillField selector="{{AdminCategorySEOSection.MetaTitleInput}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="fillUpdatedMetaTitle"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForCategorySaved"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
-+
-+        <!--Open UrlRewrite Page-->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
-+        <waitForPageLoad stepKey="waitForUrlRewritePage"/>
-+
-+        <!--Verify Updated Category UrlKey-->
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleRootSubCategory.url_key}}" stepKey="fillUpdatedCategoryUrlKey"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <see stepKey="seeCategoryUrlKey" selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{SimpleRootSubCategory.url_key}}.html" />
-+        <!--Verify Updated Category UrlKey directs to category Store Front-->
-+        <amOnPage url="{{SimpleRootSubCategory.url_key}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
-+        <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
-+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleRootSubCategory.name)}}" stepKey="seeUpdatedCategoryInStoreFrontPage"/>
-+
-+        <!--Verify Updated fields in Category Page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded1"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree1"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="selectCreatedCategory1"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="seeUpdatedCategoryTitle"/>
-+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}"  stepKey="verifyInactiveIncludeInMenu"/>
-+        <seeInField  selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="seeUpdatedCategoryName"/>
-+        <scrollTo  selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent1"/>
-+        <click selector="{{AdminCategoryContentSection.sectionHeader}}"  stepKey="selectContent1"/>
-+        <scrollTo selector="{{AdminCategoryContentSection.description}}" stepKey="scrollToDescription1"/>
-+        <seeInField stepKey="seeUpdatedDiscription" selector="{{AdminCategoryContentSection.description}}" userInput="Updated category Description Fields"/>
-+        <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
-+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
-+        <seeInField stepKey="seeUpdatedUrlKey" selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleRootSubCategory.url_key}}"/>
-+        <seeInField stepKey="seeUpdatedMetaTitleInput" selector="{{AdminCategorySEOSection.MetaTitleInput}}" userInput="{{SimpleRootSubCategory.name}}"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
-new file mode 100644
-index 00000000000..1cb01ac11cb
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
-@@ -0,0 +1,84 @@
-+<?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="AdminUpdateCategoryWithProductsTest">
-+        <annotations>
-+            <stories value="Update categories"/>
-+            <title value="Update category, sort products by default sorting"/>
-+            <description value="Login as admin, update category and sort products"/>
-+            <testCaseId value="MC-6059"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct" />
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData  createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Category Page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
-+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-+
-+        <!--Update Product Display Setting-->
-+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
-+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
-+        <scrollToTopOfPage stepKey="scfrollToTop"/>
-+        <click selector="{{CategoryDisplaySettingsSection.productListCheckBox}}" stepKey="enableTheAvailableProductList"/>
-+        <selectOption selector="{{CategoryDisplaySettingsSection.productList}}" parameterArray="['Product Name', 'Price']" stepKey="selectPrice"/>
-+        <scrollTo selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" x="0" y="-80" stepKey="scrollToDefaultProductList"/>
-+        <click selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" stepKey="enableTheDefaultProductList"/>
-+        <selectOption selector="{{CategoryDisplaySettingsSection.defaultProductList}}" userInput="name" stepKey="selectProductName"/>
-+
-+        <!--Add Products in Category-->
-+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
-+        <scrollToTopOfPage stepKey="scrollOnTopOfPage"/>
-+        <click selector="{{CatalogProductsSection.resetFilter}}" stepKey="clickOnResetFilter"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$"  stepKey="selectProduct1"/>
-+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitFroPageToLoad1"/>
-+        <scrollTo  selector="{{AdminCategoryContentSection.productTableRow}}"  stepKey="scrollToTableRow"/>
-+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProduct1FromTableRow"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForCategorySaved"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
-+        <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
-+
-+        <!--Verify Category Title-->
-+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
-+
-+        <!--Verify Category in store front page-->
-+        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}" stepKey="seeDefaultProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+
-+        <!--Verify Product in Category-->
-+        <seeElement stepKey="seeProductsInCategory" selector="{{StorefrontCategoryMainSection.productLink}}"/>
-+        <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
-+        <waitForPageLoad  stepKey="waitForProductToLoad1"/>
-+
-+        <!--Verify product name and price on Store Front-->
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductName"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{defaultSimpleProduct.price}}" stepKey="assertProductPrice"/>
-+    </test>
-+</tests>
-+
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
-new file mode 100644
-index 00000000000..8872ea98eb5
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
-@@ -0,0 +1,103 @@
-+<?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="AdminUpdateFlatCategoryAndAddProductsTest">
-+        <annotations>
-+            <stories value="Update category"/>
-+            <title value="Flat Catalog - Assign Simple Product to Category"/>
-+            <description value="Login as admin, update flat category by adding a simple product"/>
-+            <testCaseId value="MC-11012"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <!-- Create Simple Product -->
-+            <createData entity="SimpleSubCategory" stepKey="category"/>
-+            <!-- Create category -->
-+            <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct"/>
-+            <!-- Create First StoreView  -->
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewEn">
-+                <argument name="storeView" value="customStoreEN"/>
-+            </actionGroup>
-+            <!-- Create Second StoreView -->
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
-+                <argument name="storeView" value="customStoreFR"/>
-+            </actionGroup>
-+            <!--Run full reindex and clear caches -->
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <!--Enable Flat Catalog Category -->
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
-+            <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
-+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
-+            <!-- Run cron twice -->
-+            <magentoCLI command="cron:run" stepKey="runCron1"/>
-+            <magentoCLI command="cron:run" stepKey="runCron2"/>
-+        </before>
-+        <after>
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
-+            <magentoCLI stepKey="setIndexersMode" command="indexer:set-mode" arguments="realtime" />
-+            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
-+                <argument name="customStore" value="customStoreEN"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
-+                <argument name="customStore" value="customStoreFR"/>
-+            </actionGroup>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Select Created Category-->
-+        <magentoCLI command="indexer:reindex" stepKey="reindexBeforeFlow"/>
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectCreatedCategory"/>
-+        <waitForPageLoad stepKey="waitForTheCategoryPageToLoaded"/>
-+        <!--Add Products in Category-->
-+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
-+        <scrollToTopOfPage stepKey="scrollOnTopOfPage"/>
-+        <conditionalClick selector="{{CatalogProductsSection.resetFilter}}" dependentSelector="{{CatalogProductsSection.resetFilter}}" visible="true" stepKey="clickOnResetFilter"/>
-+        <waitForPageLoad stepKey="waitForProductsToLoad"/>
-+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$createSimpleProduct.name$$"  stepKey="selectProduct"/>
-+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitFroPageToLoad1"/>
-+        <scrollTo  selector="{{AdminCategoryContentSection.productTableRow}}"  stepKey="scrollToTableRow"/>
-+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+        <!--Open Index Management Page and verify flat categoryIndex status-->
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        <!--Open Index Management Page -->
-+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
-+        <waitForPageLoad stepKey="waitForIndexPageToLoad"/>
-+        <see stepKey="seeCategoryIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
-+        <!--Verify Product In Store Front-->
-+        <amOnPage url="$$createSimpleProduct.name$$.html" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-+        <!--Verify product and category is visible in First Store View -->
-+        <click stepKey="selectStoreSwitcher" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
-+        <click stepKey="selectFirstStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreEN.name)}}"/>
-+        <waitForPageLoad stepKey="waitForFirstStoreView"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$category.name$$)}}" stepKey="seeCategoryOnNavigation"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductName"/>
-+        <!--Verify product and category is visible in Second Store View -->
-+        <click stepKey="selectStoreSwitcher1" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
-+        <click stepKey="selectSecondStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreFR.name)}}"/>
-+        <waitForPageLoad stepKey="waitForSecondStoreView"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$category.name$$)}}" stepKey="seeCategoryOnNavigation1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="seeProductName"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
-new file mode 100644
-index 00000000000..55273033706
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
-@@ -0,0 +1,91 @@
-+<?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="AdminUpdateFlatCategoryAndIncludeInMenuTest">
-+        <annotations>
-+            <stories value="Update category"/>
-+            <title value="Flat Catalog - Update Category, Include in Navigation Menu"/>
-+            <description value="Login as admin and update flat category by enabling Include in Menu"/>
-+            <testCaseId value="MC-11011"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <!--Create category-->
-+            <createData entity="CatNotIncludeInMenu" stepKey="createCategory"/>
-+            <!-- Create First StoreView  -->
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewEn">
-+                <argument name="storeView" value="customStoreEN"/>
-+            </actionGroup>
-+            <!-- Create Second StoreView -->
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
-+                <argument name="storeView" value="customStoreFR"/>
-+            </actionGroup>
-+            <!--Run full reindex and clear caches -->
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+            <!--Enable Flat Catalog Category -->
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
-+            <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
-+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
-+            <!-- Run cron twice -->
-+            <magentoCLI command="cron:run" stepKey="runCron1"/>
-+            <magentoCLI command="cron:run" stepKey="runCron2"/>
-+        </before>
-+        <after>
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
-+            <magentoCLI stepKey="setIndexersMode" command="indexer:set-mode" arguments="realtime" />
-+            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
-+                <argument name="customStore" value="customStoreEN"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
-+                <argument name="customStore" value="customStoreFR"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Verify Category is not listed in navigation menu-->
-+        <amOnPage url="/{{CatNotIncludeInMenu.name_lwr}}.html"  stepKey="openCategoryPage"/>
-+        <waitForPageLoad time="60" stepKey="waitForPageToBeLoaded"/>
-+        <dontSee selector="{{StorefrontHeaderSection.NavigationCategoryByName(CatNotIncludeInMenu.name)}}" stepKey="dontSeeCategoryOnNavigation"/>
-+        <!-- Select created category and enable Include In Menu option-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(CatNotIncludeInMenu.name)}}" stepKey="selectCreatedCategory"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="enableIncludeInMenuOption"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+        <!--Run full reindex and clear caches -->
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        <!--Open Index Management Page -->
-+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
-+        <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
-+        <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
-+        <!--Verify Category In Store Front-->
-+        <amOnPage url="/$$createCategory.name$$.html"  stepKey="openCategoryPage1"/>
-+        <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
-+        <!--Verify category is visible in First Store View -->
-+        <click stepKey="selectStoreSwitcher" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
-+        <click stepKey="selectForstStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreEN.name)}}"/>
-+        <waitForPageLoad stepKey="waitForFirstStoreView"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryOnNavigation"/>
-+        <!--Verify category is visible in Second Store View -->
-+        <click stepKey="selectStoreSwitcher1" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
-+        <click stepKey="selectSecondStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreFR.name)}}"/>
-+        <waitForPageLoad stepKey="waitForSecondstoreView"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryOnNavigation1"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
-new file mode 100644
-index 00000000000..fcbc0cb2052
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
-@@ -0,0 +1,102 @@
-+<?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="AdminUpdateFlatCategoryNameAndDescriptionTest">
-+        <annotations>
-+            <stories value="Update category"/>
-+            <title value="Flat Catalog - Update Category Name and Description"/>
-+            <description value="Login as admin and update flat category name and description"/>
-+            <testCaseId value="MC-11010"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <!--Create category-->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <!-- Create First StoreView  -->
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewEn">
-+                <argument name="storeView" value="customStoreEN"/>
-+            </actionGroup>
-+            <!-- Create Second StoreView -->
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
-+                <argument name="storeView" value="customStoreFR"/>
-+            </actionGroup>
-+            <!--Run full reindex and clear caches -->
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+            <!--Enable Flat Catalog Category -->
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
-+            <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
-+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
-+            <!-- Run cron twice -->
-+            <magentoCLI command="cron:run" stepKey="runCron1"/>
-+            <magentoCLI command="cron:run" stepKey="runCron2"/>
-+        </before>
-+        <after>
-+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
-+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
-+            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory" />
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
-+                <argument name="customStore" value="customStoreEN"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
-+                <argument name="customStore" value="customStoreFR"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Select Created Category-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+        <!--Update Category Name and Description -->
-+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
-+        <scrollTo  selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent"/>
-+        <click selector="{{AdminCategoryContentSection.sectionHeader}}"  stepKey="selectContent"/>
-+        <fillField selector="{{AdminCategoryContentSection.description}}"  userInput="Updated category Description Fields" stepKey="fillUpdatedDescription"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+        <!--Run full reindex and clear caches -->
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        <!--Open Index Management Page -->
-+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
-+        <waitForPageLoad stepKey="waitForIndexPageToLoad"/>
-+        <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="READY"/>
-+        <!--Verify Category In Store Front-->
-+        <amOnPage url="{{SimpleSubCategory.name}}.html" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-+        <!--Verify category is visible in First Store View -->
-+        <click stepKey="selectStoreSwitcher" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
-+        <click stepKey="selectFirstStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreEN.name)}}"/>
-+        <waitForPageLoad stepKey="waitForFirstStoreView"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
-+        <!--Verify  category is visible in Second Store View -->
-+        <click stepKey="selectStoreSwitcher1" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
-+        <click stepKey="selectSecondStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreFR.name)}}"/>
-+        <waitForPageLoad stepKey="waitForSecondStoreView"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeCategoryOnNavigation1"/>
-+        <!-- Verify Updated  Category Name and description on Category Page-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree1"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectUpdatedCategory"/>
-+        <waitForPageLoad stepKey="waitForUpdatedCategoryPageToLoad"/>
-+        <seeInField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeUpdatedSubCategoryName"/>
-+        <scrollTo  selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent1"/>
-+        <click selector="{{AdminCategoryContentSection.sectionHeader}}"  stepKey="selectContent1"/>
-+        <seeInField selector="{{AdminCategoryContentSection.description}}" userInput="Updated category Description Fields" stepKey="seeUpdatedDescription"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml
-new file mode 100644
-index 00000000000..80f0c8ad10e
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml
-@@ -0,0 +1,92 @@
-+<?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="AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest">
-+        <annotations>
-+            <stories value="Update Simple Product"/>
-+            <title value="Update Simple Product Name to Verify Data Overriding on Store View Level"/>
-+            <description value="Test log in to Update Simple Product and Update Simple Product Name to Verify Data Overriding on Store View Level"/>
-+            <testCaseId value="MC-10821"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
-+                <argument name="storeView" value="customStoreFR"/>
-+            </actionGroup>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-+                <argument name="sku" value="{{defaultSimpleProduct.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
-+                <argument name="customStore" value="customStoreFR"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default simple product in grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGrid">
-+            <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToOpenDefaultSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Assign simple product to created store view -->
-+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewDropdownToggle}}" stepKey="clickCategoryStoreViewDropdownToggle"/>
-+        <waitForPageLoad stepKey="waitForStoreViewDropdown"/>
-+        <waitForElementVisible selector="{{AdminCategoryMainActionsSection.CategoryStoreViewOption(customStoreFR.name)}}" stepKey="waitForStoreViewOption"/>
-+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewOption(customStoreFR.name)}}" stepKey="selectCategoryStoreViewOption"/>
-+        <waitForPageLoad stepKey="waitForAcceptModal"/>
-+        <waitForElementVisible selector="{{AdminProductFormChangeStoreSection.acceptButton}}" stepKey="waitForAcceptButton"/>
-+        <click selector="{{AdminProductFormChangeStoreSection.acceptButton}}" stepKey="clickAcceptButton"/>
-+        <waitForPageLoad stepKey="waitForThePageToLoad"/>
-+        <waitForElementNotVisible selector="{{AdminProductFormChangeStoreSection.acceptButton}}" stepKey="waitForAcceptButtonGone"/>
-+        <uncheckOption selector="{{AdminProductFormSection.productNameUseDefault}}" stepKey="uncheckProductStatus"/>
-+
-+        <!-- Update default simple product with name -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductDataOverriding.name}}" stepKey="fillSimpleProductName"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
-+
-+        <!-- Verify customer see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!--Verify customer see default simple product name on magento storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$initialSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="$$initialSimpleProduct.sku$$" stepKey="fillDefaultSimpleProductSkuInSearchTextBox"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="$$initialSimpleProduct.name$$" stepKey="seeDefaultProductName"/>
-+
-+        <!--Verify customer see simple product with updated name on magento storefront page under store view section -->
-+        <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher"/>
-+        <waitForPageLoad stepKey="waitForStoreSwitcherLoad"/>
-+        <click selector="{{StorefrontHeaderSection.storeView(customStoreFR.name)}}" stepKey="clickStoreViewOption"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="$$initialSimpleProduct.sku$$" stepKey="fillDefaultSimpleProductSkuInSearch"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBoxLoad"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextButton"/>
-+        <waitForPageLoad stepKey="waitForTextSearchLoad"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{simpleProductDataOverriding.name}}" stepKey="seeUpdatedSimpleProductName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml
-new file mode 100644
-index 00000000000..f698b3d89ff
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml
-@@ -0,0 +1,90 @@
-+<?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="AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest">
-+        <annotations>
-+            <stories value="Update Simple Product"/>
-+            <title value="Update Simple Product Price to Verify Data Overriding on Store View Level"/>
-+            <description value="Test log in to Update Simple Product and Update Simple Product Price to Verify Data Overriding on Store View Level"/>
-+            <testCaseId value="MC-10823"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
-+                <argument name="storeView" value="customStoreFR"/>
-+            </actionGroup>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-+                <argument name="sku" value="{{defaultSimpleProduct.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
-+                <argument name="customStore" value="customStoreFR"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default simple product in grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGrid">
-+            <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToOpenDefaultSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Assign simple product to created store view -->
-+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewDropdownToggle}}" stepKey="clickCategoryStoreViewDropdownToggle"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <waitForElementVisible selector="{{AdminCategoryMainActionsSection.CategoryStoreViewOption(customStoreFR.name)}}" stepKey="waitForSelectCategoryStoreViewOption"/>
-+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewOption(customStoreFR.name)}}" stepKey="selectCategoryStoreViewOption"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <waitForElementVisible selector="{{AdminProductFormChangeStoreSection.acceptButton}}" stepKey="waitForAcceptButton"/>
-+        <click selector="{{AdminProductFormChangeStoreSection.acceptButton}}" stepKey="clickAcceptButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!-- Update default simple product with price -->
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductDataOverriding.price}}" stepKey="fillSimpleProductPrice"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
-+
-+        <!-- Verify customer see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!-- Verify customer see simple product with updated price on magento storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$initialSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="$$initialSimpleProduct.sku$$" stepKey="fillDefaultSimpleProductSkuInSearchTextBox"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.regularPrice}}" userInput="{{simpleProductDataOverriding.price}}" stepKey="seeUpdatedProductPriceOnStorefrontPage"/>
-+
-+        <!-- Verify customer see simple product with updated price on magento storefront page under store view section -->
-+        <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher"/>
-+        <waitForPageLoad stepKey="waitForStoreSwitcherLoad"/>
-+        <click selector="{{StorefrontHeaderSection.storeView(customStoreFR.name)}}" stepKey="clickStoreViewOption"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="$$initialSimpleProduct.sku$$" stepKey="fillDefaultSimpleProductSkuInSearch"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBoxLoad"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextButton"/>
-+        <waitForPageLoad stepKey="waitForTextSearchLoad"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.regularPrice}}" userInput="{{simpleProductDataOverriding.price}}" stepKey="seeUpdatedProductPriceOnStorefrontPageUnderStoreViewSection"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
-new file mode 100644
-index 00000000000..d151bae3ee1
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
-@@ -0,0 +1,146 @@
-+<?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="AdminUpdateSimpleProductTieredPriceTest">
-+        <annotations>
-+            <stories value="Update Simple Product"/>
-+            <title value="Update Simple Product Tiered Price"/>
-+            <description value="Test log in to Update Simple Product and Update Simple Product Tiered Price"/>
-+            <testCaseId value="MC-10824"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17181"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-+                <argument name="sku" value="{{simpleProductTierPrice300InStock.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default simple product in the grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGrid">
-+            <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToOpenDefaultSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update simple product with tier price(in stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductTierPrice300InStock.name}}" stepKey="fillSimpleProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductTierPrice300InStock.sku}}" stepKey="fillSimpleProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductTierPrice300InStock.price}}" stepKey="fillSimpleProductPrice"/>
-+
-+        <!-- Press enter to validate advanced pricing link -->
-+        <pressKey selector="{{AdminProductFormSection.productPrice}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
-+        <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceHighCostSimpleProduct.website}}" stepKey="selectProductTierPriceWebsiteInput"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceHighCostSimpleProduct.customer_group}}" stepKey="selectProductTierPriceCustomerGroupInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceHighCostSimpleProduct.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceHighCostSimpleProduct.price}}" stepKey="selectProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductTierPrice300InStock.quantity}}" stepKey="fillSimpleProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{simpleProductTierPrice300InStock.status}}" stepKey="selectStockStatusInStock"/>
-+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductTierPrice300InStock.weight}}" stepKey="fillSimpleProductWeight"/>
-+        <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="{{simpleProductTierPrice300InStock.weightSelect}}" stepKey="selectProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductTierPrice300InStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
-+
-+        <!-- Verify customer see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated simple product(from above step) in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductTierPrice300InStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{simpleProductTierPrice300InStock.sku}}" stepKey="fillProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedSimpleProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilSimpleProductPageIsOpened"/>
-+
-+        <!-- Verify customer see updated simple product in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductTierPrice300InStock.name}}" stepKey="seeSimpleProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductTierPrice300InStock.sku}}" stepKey="seeSimpleProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductTierPrice300InStock.price}}" stepKey="seeSimpleProductPrice"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceHighCostSimpleProduct.website}}" stepKey="seeProductTierPriceWebsiteInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceHighCostSimpleProduct.customer_group}}" stepKey="seeProductTierPriceCustomerGroupInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceHighCostSimpleProduct.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceHighCostSimpleProduct.price}}" stepKey="seeProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductTierPrice300InStock.quantity}}" stepKey="seeSimpleProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{simpleProductTierPrice300InStock.status}}" stepKey="seeSimpleProductStockStatus"/>
-+        <seeInField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductTierPrice300InStock.weight}}" stepKey="seeSimpleProductWeight"/>
-+        <seeInField selector="{{AdminProductFormSection.productWeightSelect}}" userInput="{{simpleProductTierPrice300InStock.weightSelect}}" stepKey="seeSimpleProductWeightSelect"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <see selector="{{AdminProductFormSection.selectMultipleCategories}}" userInput="$$categoryEntity.name$$" stepKey="seeSelectedCategories"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductTierPrice300InStock.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer see updated simple product link on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{simpleProductTierPrice300InStock.name}}" stepKey="seeSimpleProductNameOnCategoryPage"/>
-+
-+        <!-- Verify customer see updated simple product (from the above step) on the storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductTierPrice300InStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductTierPrice300InStock.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductTierPrice300InStock.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductTierPrice300InStock.sku}}" stepKey="seeProductSku"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{simpleProductTierPrice300InStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{simpleProductTierPrice300InStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify customer see updated simple product link on magento storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductTierPrice300InStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{simpleProductTierPrice300InStock.sku}}" stepKey="fillSimpleProductSkuInSearchTextBox"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{simpleProductTierPrice300InStock.name}}" stepKey="seeProductName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml
-new file mode 100644
-index 00000000000..6e8f1ba6f12
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml
-@@ -0,0 +1,93 @@
-+<?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="AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest">
-+        <annotations>
-+            <stories value="Update Simple Product"/>
-+            <title value="Update Simple Product with Regular Price (In Stock), Disabled Product"/>
-+            <description value="Test log in to Update Simple Product and Update Simple Product with Regular Price (In Stock), Disabled Product"/>
-+            <testCaseId value="MC-10816"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-+                <argument name="sku" value="{{simpleProductDisabled.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default simple product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGrid">
-+            <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToOpenDefaultSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update simple product with regular price(in stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductDisabled.name}}" stepKey="fillSimpleProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductDisabled.sku}}" stepKey="fillSimpleProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductDisabled.price}}" stepKey="fillSimpleProductPrice"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductDisabled.quantity}}" stepKey="fillSimpleProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{simpleProductDisabled.status}}" stepKey="selectStockStatusInStock"/>
-+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductDisabled.weight}}" stepKey="fillSimpleProductWeight"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductDisabled.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="clickEnableProductLabelToDisableProduct"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
-+
-+        <!-- Verify customer see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated simple product(from above step) in the grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductDisabled.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{simpleProductDisabled.sku}}" stepKey="fillProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedSimpleProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilSimpleProductPageIsOpened"/>
-+
-+        <!-- Verify customer see updated simple product in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductDisabled.name}}" stepKey="seeSimpleProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductDisabled.sku}}" stepKey="seeSimpleProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductDisabled.price}}" stepKey="seeSimpleProductPrice"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductDisabled.quantity}}" stepKey="seeSimpleProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{simpleProductDisabled.status}}" stepKey="seeSimpleProductStockStatus"/>
-+        <seeInField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductDisabled.weight}}" stepKey="seeSimpleProductWeight"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSectionHeader"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSectionHeader"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductDisabled.urlKey}}" stepKey="seeSimpleProductUrlKey"/>
-+
-+        <!--Verify customer don't see updated simple product link on magento storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductDisabled.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{simpleProductDisabled.sku}}" stepKey="fillSimpleProductSkuInSearchTextBox"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{simpleProductDisabled.name}}" stepKey="dontSeeProductNameOnStorefrontPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
-new file mode 100644
-index 00000000000..d30500de64a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
-@@ -0,0 +1,144 @@
-+<?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="AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest">
-+        <annotations>
-+            <stories value="Update Simple Product"/>
-+            <title value="Update Simple Product with Regular Price (In Stock) Enabled Flat"/>
-+            <description value="Test log in to Update Simple Product and Update Simple Product with Regular Price (In Stock) Enabled Flat"/>
-+            <testCaseId value="MC-10818"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17181"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <magentoCLI stepKey="setFlatCatalogProduct" command="config:set catalog/frontend/flat_catalog_product 1"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-+                <argument name="sku" value="{{simpleProductEnabledFlat.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+            <magentoCLI stepKey="unsetFlatCatalogProduct" command="config:set catalog/frontend/flat_catalog_product 0"/>
-+        </after>
-+
-+        <!-- Search default simple product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGrid">
-+            <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToOpenDefaultSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update simple product with regular price -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductEnabledFlat.name}}" stepKey="fillSimpleProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductEnabledFlat.sku}}" stepKey="fillSimpleProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductEnabledFlat.price}}" stepKey="fillSimpleProductPrice"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{simpleProductEnabledFlat.productTaxClass}}" stepKey="selectProductTaxClass"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductEnabledFlat.quantity}}" stepKey="fillSimpleProductQuantity"/>
-+        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickAdvancedInventoryLink"/>
-+        <waitForPageLoad stepKey="waitForAdvancedInventoryPage"/>
-+        <conditionalClick selector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" dependentSelector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" visible="true" stepKey="checkUseConfigSettingsCheckBox"/>
-+        <selectOption selector="{{AdminProductFormAdvancedInventorySection.manageStock}}" userInput="No" stepKey="selectManageStock"/>
-+        <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}" stepKey="clickDoneButtonOnAdvancedInventorySection"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{simpleProductEnabledFlat.status}}" stepKey="selectStockStatusInStock"/>
-+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductEnabledFlat.weight}}" stepKey="fillSimpleProductWeight"/>
-+        <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="{{simpleProductEnabledFlat.weightSelect}}" stepKey="selectProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductEnabledFlat.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductEnabledFlat.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
-+
-+        <!-- Verify customer see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated simple product(from above step) in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductEnabledFlat.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{simpleProductEnabledFlat.sku}}" stepKey="fillProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedSimpleProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilSimpleProductPageIsOpened"/>
-+
-+        <!-- Verify customer see updated simple product in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductEnabledFlat.name}}" stepKey="seeSimpleProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductEnabledFlat.sku}}" stepKey="seeSimpleProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductEnabledFlat.price}}" stepKey="seeSimpleProductPrice"/>
-+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{simpleProductEnabledFlat.productTaxClass}}" stepKey="seeProductTaxClass"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductEnabledFlat.quantity}}" stepKey="seeSimpleProductQuantity"/>
-+        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickTheAdvancedInventoryLink"/>
-+        <waitForPageLoad stepKey="waitForAdvancedInventoryPageLoad"/>
-+        <see selector="{{AdminProductFormAdvancedInventorySection.manageStock}}" userInput="No" stepKey="seeManageStock"/>
-+        <click selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryCloseButton}}" stepKey="clickDoneButtonOnAdvancedInventory"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{simpleProductEnabledFlat.status}}" stepKey="seeSimpleProductStockStatus"/>
-+        <seeInField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductEnabledFlat.weight}}" stepKey="seeSimpleProductWeight"/>
-+        <seeInField selector="{{AdminProductFormSection.productWeightSelect}}" userInput="{{simpleProductEnabledFlat.weightSelect}}" stepKey="seeSimpleProductWeightSelect"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <see selector="{{AdminProductFormSection.selectMultipleCategories}}" userInput="$$categoryEntity.name$$" stepKey="seeSelectedCategories" />
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductEnabledFlat.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductEnabledFlat.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer see updated simple product link on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{simpleProductEnabledFlat.name}}" stepKey="seeSimpleProductNameOnCategoryPage"/>
-+
-+        <!-- Verify customer see updated simple product (from the above step) on the storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductEnabledFlat.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductEnabledFlat.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductEnabledFlat.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductEnabledFlat.sku}}" stepKey="seeSimpleProductSkuOnStoreFrontPage"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{simpleProductEnabledFlat.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{simpleProductEnabledFlat.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify customer see updated simple product link on magento storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductEnabledFlat.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{simpleProductEnabledFlat.sku}}" stepKey="fillSimpleProductSkuInSearchTextBox"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{simpleProductEnabledFlat.name}}" stepKey="seeSimpleProductNameOnMagentoStorefrontPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
-new file mode 100644
-index 00000000000..cb7b3d6278a
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
-@@ -0,0 +1,107 @@
-+<?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="AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest">
-+        <annotations>
-+            <stories value="Update Simple Product"/>
-+            <title value="Update Simple Product with Regular Price (In Stock) Not Visible Individually"/>
-+            <description value="Test log in to Update Simple Product and Update Simple Product with Regular Price (In Stock) Not Visible Individually"/>
-+            <testCaseId value="MC-10803"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17181"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-+                <argument name="sku" value="{{simpleProductNotVisibleIndividually.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default simple product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGrid">
-+            <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToOpenDefaultSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update simple product with regular price(in stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductNotVisibleIndividually.name}}" stepKey="fillSimpleProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductNotVisibleIndividually.sku}}" stepKey="fillSimpleProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductNotVisibleIndividually.price}}" stepKey="fillSimpleProductPrice"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductNotVisibleIndividually.quantity}}" stepKey="fillSimpleProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{simpleProductNotVisibleIndividually.status}}" stepKey="selectStockStatusInStock"/>
-+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductNotVisibleIndividually.weight}}" stepKey="fillSimpleProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductNotVisibleIndividually.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductNotVisibleIndividually.urlKey}}" stepKey="fillSimpleProductUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
-+
-+        <!-- Verify customer see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated simple product(from above step) in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductNotVisibleIndividually.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{simpleProductNotVisibleIndividually.sku}}" stepKey="fillProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedSimpleProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilSimpleProductPageIsOpened"/>
-+
-+        <!-- Verify customer see updated simple product in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductNotVisibleIndividually.name}}" stepKey="seeSimpleProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductNotVisibleIndividually.sku}}" stepKey="seeSimpleProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductNotVisibleIndividually.price}}" stepKey="seeSimpleProductPrice"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductNotVisibleIndividually.quantity}}" stepKey="seeSimpleProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{simpleProductNotVisibleIndividually.status}}" stepKey="seeSimpleProductStockStatus"/>
-+        <seeInField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductNotVisibleIndividually.weight}}" stepKey="seeSimpleProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <see selector="{{AdminProductFormSection.selectMultipleCategories}}" userInput="$$categoryEntity.name$$" stepKey="seeSelectedCategories" />
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductNotVisibleIndividually.visibility}}" stepKey="seeSimpleProductVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSectionHeader"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductNotVisibleIndividually.urlKey}}" stepKey="seeSimpleProductUrlKey"/>
-+
-+        <!--Verify customer don't see updated simple product link on magento storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductNotVisibleIndividually.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{simpleProductNotVisibleIndividually.sku}}" stepKey="fillSimpleProductSkuInSearchTextBox"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{simpleProductNotVisibleIndividually.name}}" stepKey="dontSeeSimpleProductNameOnMagentoStorefrontPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
-new file mode 100644
-index 00000000000..3433a091173
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
-@@ -0,0 +1,68 @@
-+<?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="AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest">
-+        <annotations>
-+            <stories value="Update Simple Product"/>
-+            <title value="Update Simple Product with Regular Price (In Stock) Unassign from Category"/>
-+            <description value="Test log in to Update Simple Product and Update Simple Product with Regular Price (In Stock) Unassign from Category"/>
-+            <testCaseId value="MC-10817"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="_defaultProduct" stepKey="initialSimpleProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-+                <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Search default simple product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGrid">
-+            <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToOpenDefaultSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update simple product by unselecting categories -->
-+        <scrollTo selector="{{AdminProductFormSection.productStockStatus}}" stepKey="scroll"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <click selector="{{AdminProductFormSection.unselectCategories($$initialCategoryEntity.name$$)}}" stepKey="unselectCategories"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategory"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
-+
-+        <!-- Verify customer see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!--Search default simple product in the grid page -->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="OpenCategoryCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryCatalogPage"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickExpandTree"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$initialCategoryEntity.name$$)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="clickAdminCategoryProductSection"/>
-+        <waitForPageLoad stepKey="waitForSectionHeaderToLoad"/>
-+        <dontSee selector="{{AdminCategoryProductsGridSection.rowProductName($$initialSimpleProduct.name$$)}}" stepKey="dontSeeProductNameOnCategoryCatalogPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
-new file mode 100644
-index 00000000000..75b4a9728d0
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
-@@ -0,0 +1,129 @@
-+<?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="AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest">
-+        <annotations>
-+            <stories value="Update Simple Product"/>
-+            <title value="Update Simple Product with Regular Price (In Stock) Visible in Catalog and Search"/>
-+            <description value="Test log in to Update Simple Product and Update Simple Product with Regular Price (In Stock) Visible in Catalog and Search"/>
-+            <testCaseId value="MC-10802"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17181"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-+                <argument name="sku" value="{{simpleProductRegularPrice245InStock.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default simple product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGrid">
-+            <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToOpenDefaultSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update simple product with regular price(in stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductRegularPrice245InStock.name}}" stepKey="fillSimpleProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductRegularPrice245InStock.sku}}" stepKey="fillSimpleProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductRegularPrice245InStock.price}}" stepKey="fillSimpleProductPrice"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductRegularPrice245InStock.quantity}}" stepKey="fillSimpleProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{simpleProductRegularPrice245InStock.status}}" stepKey="selectStockStatusInStock"/>
-+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductRegularPrice245InStock.weight}}" stepKey="fillSimpleProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductRegularPrice245InStock.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice245InStock.urlKey}}" stepKey="fillSimpleProductUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
-+
-+        <!-- Verify customer see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated simple product(from above step) in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPrice245InStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{simpleProductRegularPrice245InStock.sku}}" stepKey="fillProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedSimpleProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilSimpleProductPageIsOpened"/>
-+
-+        <!-- Verify customer see updated simple product in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductRegularPrice245InStock.name}}" stepKey="seeSimpleProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductRegularPrice245InStock.sku}}" stepKey="seeSimpleProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductRegularPrice245InStock.price}}" stepKey="seeSimpleProductPrice"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductRegularPrice245InStock.quantity}}" stepKey="seeSimpleProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{simpleProductRegularPrice245InStock.status}}" stepKey="seeSimpleProductStockStatus"/>
-+        <seeInField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductRegularPrice245InStock.weight}}" stepKey="seeSimpleProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <see selector="{{AdminProductFormSection.selectMultipleCategories}}" userInput="$$categoryEntity.name$$" stepKey="selectedCategories" />
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductRegularPrice245InStock.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice245InStock.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer see updated simple product link on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{simpleProductRegularPrice245InStock.name}}" stepKey="seeSimpleProductNameOnCategoryPage"/>
-+
-+        <!-- Verify customer see updated simple product (from the above step) on the storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductRegularPrice245InStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductRegularPrice245InStock.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductRegularPrice245InStock.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductRegularPrice245InStock.sku}}" stepKey="seeSimpleProductSkuOnStoreFrontPage"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{simpleProductRegularPrice245InStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{simpleProductRegularPrice245InStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify customer see updated simple product link on magento storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductRegularPrice245InStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{simpleProductRegularPrice245InStock.sku}}" stepKey="fillSimpleProductSkuInSearchTextBox"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{simpleProductRegularPrice245InStock.name}}" stepKey="seeSimpleProductNameOnStorefrontPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
-new file mode 100644
-index 00000000000..f8b0b17c062
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
-@@ -0,0 +1,129 @@
-+<?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="AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest">
-+        <annotations>
-+            <stories value="Update Simple Product"/>
-+            <title value="Update Simple Product with Regular Price (In Stock) Visible in Catalog Only"/>
-+            <description value="Test log in to Update Simple Product and Update Simple Product with Regular Price (In Stock) Visible in Catalog Only"/>
-+            <testCaseId value="MC-10804"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17181"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-+                <argument name="sku" value="{{simpleProductRegularPrice32501InStock.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default simple product in the grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGrid">
-+            <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToOpenDefaultSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update simple product with regular price(in stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductRegularPrice32501InStock.name}}" stepKey="fillSimpleProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductRegularPrice32501InStock.sku}}" stepKey="fillSimpleProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductRegularPrice32501InStock.price}}" stepKey="fillSimpleProductPrice"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductRegularPrice32501InStock.quantity}}" stepKey="fillSimpleProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{simpleProductRegularPrice32501InStock.status}}" stepKey="selectStockStatusInStock"/>
-+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductRegularPrice32501InStock.weight}}" stepKey="fillSimpleProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductRegularPrice32501InStock.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice32501InStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
-+
-+        <!-- Verify customer see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated simple product(from above step) in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPrice32501InStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{simpleProductRegularPrice32501InStock.sku}}" stepKey="fillProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedSimpleProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilSimpleProductPageIsOpened"/>
-+
-+        <!-- Verify customer see updated simple product in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductRegularPrice32501InStock.name}}" stepKey="seeSimpleProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductRegularPrice32501InStock.sku}}" stepKey="seeSimpleProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductRegularPrice32501InStock.price}}" stepKey="seeSimpleProductPrice"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductRegularPrice32501InStock.quantity}}" stepKey="seeSimpleProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{simpleProductRegularPrice32501InStock.status}}" stepKey="seeSimpleProductStockStatus"/>
-+        <seeInField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductRegularPrice32501InStock.weight}}" stepKey="seeSimpleProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <see selector="{{AdminProductFormSection.selectMultipleCategories}}" userInput="$$categoryEntity.name$$" stepKey="selectedCategories" />
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductRegularPrice32501InStock.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice32501InStock.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer see updated simple product link on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{simpleProductRegularPrice32501InStock.name}}" stepKey="seeSimpleProductNameOnCategoryPage"/>
-+
-+        <!-- Verify customer see updated simple product (from the above step) on the storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductRegularPrice32501InStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductRegularPrice32501InStock.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductRegularPrice32501InStock.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductRegularPrice32501InStock.sku}}" stepKey="seeProductSku"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{simpleProductRegularPrice32501InStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{simpleProductRegularPrice32501InStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify customer don't see updated simple product link on magento storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductRegularPrice32501InStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{simpleProductRegularPrice32501InStock.sku}}" stepKey="fillSimpleProductSkuInSearchTextBox"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{simpleProductRegularPrice32501InStock.name}}" stepKey="dontSeeProductName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
-new file mode 100644
-index 00000000000..ee2a2514c9c
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
-@@ -0,0 +1,129 @@
-+<?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="AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest">
-+        <annotations>
-+            <stories value="Update Simple Product"/>
-+            <title value="Update Simple Product with Regular Price (In Stock) Visible in Search Only"/>
-+            <description value="Test log in to Update Simple Product and Update Simple Product with Regular Price (In Stock) Visible in Search Only"/>
-+            <testCaseId value="MC-10805"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17181"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-+                <argument name="sku" value="{{simpleProductRegularPrice325InStock.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default simple product in the grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGrid">
-+            <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToOpenDefaultSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update simple product with regular price(in stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductRegularPrice325InStock.name}}" stepKey="fillSimpleProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductRegularPrice325InStock.sku}}" stepKey="fillSimpleProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductRegularPrice325InStock.price}}" stepKey="fillSimpleProductPrice"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductRegularPrice325InStock.quantity}}" stepKey="fillSimpleProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{simpleProductRegularPrice325InStock.status}}" stepKey="selectStockStatusInStock"/>
-+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductRegularPrice325InStock.weight}}" stepKey="fillSimpleProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductRegularPrice325InStock.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice325InStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
-+
-+        <!-- Verify customer see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated simple product(from above step) in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPrice325InStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{simpleProductRegularPrice325InStock.sku}}" stepKey="fillProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedSimpleProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilSimpleProductPageIsOpened"/>
-+
-+        <!-- Verify customer see updated simple product in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductRegularPrice325InStock.name}}" stepKey="seeSimpleProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductRegularPrice325InStock.sku}}" stepKey="seeSimpleProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductRegularPrice325InStock.price}}" stepKey="seeSimpleProductPrice"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductRegularPrice325InStock.quantity}}" stepKey="seeSimpleProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{simpleProductRegularPrice325InStock.status}}" stepKey="seeSimpleProductStockStatus"/>
-+        <seeInField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductRegularPrice325InStock.weight}}" stepKey="seeSimpleProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <see selector="{{AdminProductFormSection.selectMultipleCategories}}" userInput="$$categoryEntity.name$$" stepKey="selectedCategories" />
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductRegularPrice325InStock.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice325InStock.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer don't see updated simple product link on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{simpleProductRegularPrice325InStock.name}}" stepKey="dontSeeSimpleProductNameOnCategoryPage"/>
-+
-+        <!-- Verify customer see updated simple product (from the above step) on the storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductRegularPrice325InStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductRegularPrice325InStock.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductRegularPrice325InStock.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductRegularPrice325InStock.sku}}" stepKey="seeProductSku"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{simpleProductRegularPrice325InStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{simpleProductRegularPrice325InStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify customer see updated simple product link on magento storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductRegularPrice325InStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{simpleProductRegularPrice325InStock.sku}}" stepKey="fillSimpleProductSkuInSearchTextBox"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{simpleProductRegularPrice325InStock.name}}" stepKey="seeProductName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
-new file mode 100644
-index 00000000000..7921ed6c3e4
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
-@@ -0,0 +1,163 @@
-+<?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="AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest">
-+        <annotations>
-+            <stories value="Update Simple Product"/>
-+            <title value="Update Simple Product with Regular Price (In Stock) with Custom Options"/>
-+            <description value="Test log in to Update Simple Product and Update Simple Product with Regular Price (In Stock) with Custom Options"/>
-+            <testCaseId value="MC-10819"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17181"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-+                <argument name="sku" value="{{simpleProductRegularPriceCustomOptions.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default simple product in the grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGrid">
-+            <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToOpenDefaultSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update simple product with regular price -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductRegularPriceCustomOptions.name}}" stepKey="fillSimpleProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductRegularPriceCustomOptions.sku}}" stepKey="fillSimpleProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductRegularPriceCustomOptions.price}}" stepKey="fillSimpleProductPrice"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductRegularPriceCustomOptions.quantity}}" stepKey="fillSimpleProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{simpleProductRegularPriceCustomOptions.status}}" stepKey="selectStockStatusInStock"/>
-+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductRegularPriceCustomOptions.weight}}" stepKey="fillSimpleProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPriceCustomOptions.urlKey}}" stepKey="fillUrlKey"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOption"/>
-+
-+        <!-- Create simple product with customizable option -->
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButton"/>
-+        <waitForPageLoad stepKey="waitForDataToLoad"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('0')}}" userInput="{{simpleProductCustomizableOption.title}}" stepKey="fillOptionTitle"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('1')}}" stepKey="selectOptionTypeDropDown"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('1', simpleProductCustomizableOption.type)}}" stepKey="selectOptionFieldFromDropDown"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('0')}}" stepKey="checkRequiredCheckBox"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddValueButton"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(simpleProductCustomizableOption.title,'0')}}" userInput="{{simpleProductCustomizableOption.option_0_title}}" stepKey="fillOptionTitleForCustomizableOption"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(simpleProductCustomizableOption.title,'0')}}" userInput="{{simpleProductCustomizableOption.option_0_price}}" stepKey="fillOptionPrice"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(simpleProductCustomizableOption.title,'0')}}" userInput="{{simpleProductCustomizableOption.option_0_price_type}}" stepKey="selectOptionPriceType"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(simpleProductCustomizableOption.title,'0')}}" userInput="{{simpleProductCustomizableOption.option_0_sku}}" stepKey="fillOptionSku"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
-+
-+        <!--Verify customer see success message-->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!--Search updated simple product(from above step) in the grid page-->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPriceCustomOptions.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{simpleProductRegularPriceCustomOptions.sku}}" stepKey="fillProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedSimpleProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilSimpleProductPageIsOpened"/>
-+
-+        <!-- Verify customer see updated simple product in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductRegularPriceCustomOptions.name}}" stepKey="seeSimpleProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductRegularPriceCustomOptions.sku}}" stepKey="seeSimpleProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductRegularPriceCustomOptions.price}}" stepKey="seeSimpleProductPrice"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductRegularPriceCustomOptions.quantity}}" stepKey="seeSimpleProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{simpleProductRegularPriceCustomOptions.status}}" stepKey="seeSimpleProductStockStatus"/>
-+        <seeInField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductRegularPriceCustomOptions.weight}}" stepKey="seeSimpleProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <see selector="{{AdminProductFormSection.selectMultipleCategories}}" userInput="$$categoryEntity.name$$" stepKey="selectedCategories" />
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPriceCustomOptions.urlKey}}" stepKey="seeUrlKey"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOptionToSeeValues"/>
-+
-+        <!-- Verify simple product with customizable options -->
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForCustomizableOption"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('0')}}" userInput="{{simpleProductCustomizableOption.title}}" stepKey="seeOptionTitleForCustomizableOption"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('1')}}" stepKey="selectOptionTypeDropDownForCustomizableOption"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('1', simpleProductCustomizableOption.type)}}" stepKey="selectOptionFieldFromDropDownForCustomizableOption"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('0')}}" stepKey="checkRequiredCheckBoxForTheThirdDataSet"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(simpleProductCustomizableOption.title,'0')}}" userInput="{{simpleProductCustomizableOption.option_0_title}}" stepKey="seeOptionTitle"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(simpleProductCustomizableOption.title,'0')}}" userInput="{{simpleProductCustomizableOption.option_0_price}}" stepKey="seeOptionPrice"/>
-+        <seeOptionIsSelected selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(simpleProductCustomizableOption.title,'0')}}" userInput="{{simpleProductCustomizableOption.option_0_price_type}}" stepKey="selectOptionValuePriceType"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(simpleProductCustomizableOption.title,'0')}}" userInput="{{simpleProductCustomizableOption.option_0_sku}}" stepKey="seeOptionSku"/>
-+
-+        <!-- Verify customer see updated simple product (from the above step) on the storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductRegularPriceCustomOptions.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductRegularPriceCustomOptions.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductRegularPriceCustomOptions.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductRegularPriceCustomOptions.sku}}" stepKey="seeSimpleProductSkuOnStoreFrontPage"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{simpleProductRegularPriceCustomOptions.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{simpleProductRegularPriceCustomOptions.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify customer see customizable options are Required -->
-+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(simpleProductCustomizableOption.title)}}" stepKey="verifyFirstCustomOptionIsRequired"/>
-+
-+        <!--Verify customer see customizable option titles and prices -->
-+        <grabAttributeFrom userInput="for" selector="{{StorefrontProductInfoMainSection.customOptionLabel(simpleProductCustomizableOption.title)}}" stepKey="simpleOptionId"/>
-+        <grabMultiple selector="{{StorefrontProductInfoMainSection.customSelectOptions({$simpleOptionId})}}" stepKey="grabFourthOptions"/>
-+        <assertEquals stepKey="assertFourthSelectOptions">
-+            <actualResult type="variable">grabFourthOptions</actualResult>
-+            <expectedResult type="array">['-- Please Select --', {{simpleProductCustomizableOption.option_0_title}} +$98.00]</expectedResult>
-+        </assertEquals>
-+
-+        <!-- Verify added Product in cart -->
-+        <selectOption selector="{{StorefrontProductPageSection.customOptionDropDown}}" userInput="{{simpleProductCustomizableOption.option_0_title}} +$98.00" stepKey="selectCustomOption"/>
-+        <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="1" stepKey="fillProductQuantity"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="clickOnAddToCartButton"/>
-+        <waitForPageLoad stepKey="waitForProductToAddInCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+        <seeElement selector="{{StorefrontProductPageSection.successMsg}}" stepKey="seeYouAddedSimpleprod4ToYourShoppingCartSuccessSaveMessage"/>
-+        <seeElement selector="{{StorefrontMinicartSection.quantity(1)}}" stepKey="seeAddedProductQuantityInCart"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{simpleProductRegularPriceCustomOptions.name}}"  stepKey="seeProductNameInMiniCart"/>
-+        <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{simpleProductRegularPriceCustomOptions.storefront_new_cartprice}}" stepKey="seeProductPriceInMiniCart"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
-new file mode 100644
-index 00000000000..0125b4c1e71
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
-@@ -0,0 +1,127 @@
-+<?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="AdminUpdateSimpleProductWithRegularPriceOutOfStockTest">
-+        <annotations>
-+            <stories value="Update Simple Product"/>
-+            <title value="Update Simple Product with Regular Price (Out of Stock)"/>
-+            <description value="Test log in to Update Simple Product and Update Simple Product with Regular Price (Out of Stock)"/>
-+            <testCaseId value="MC-10806"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17181"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-+                <argument name="sku" value="{{simpleProductRegularPrice32503OutOfStock.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default simple product in the grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGrid">
-+            <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToOpenDefaultSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update simple product with regular price(out of stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductRegularPrice32503OutOfStock.name}}" stepKey="fillSimpleProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductRegularPrice32503OutOfStock.sku}}" stepKey="fillSimpleProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductRegularPrice32503OutOfStock.price}}" stepKey="fillSimpleProductPrice"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductRegularPrice32503OutOfStock.quantity}}" stepKey="fillSimpleProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{simpleProductRegularPrice32503OutOfStock.status}}" stepKey="selectStockStatusInStock"/>
-+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductRegularPrice32503OutOfStock.weight}}" stepKey="fillSimpleProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice32503OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
-+
-+        <!-- Verify customer see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated simple product(from above step) in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPrice32503OutOfStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{simpleProductRegularPrice32503OutOfStock.sku}}" stepKey="fillProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedSimpleProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilSimpleProductPageIsOpened"/>
-+
-+        <!-- Verify customer see updated simple product in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductRegularPrice32503OutOfStock.name}}" stepKey="seeSimpleProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{simpleProductRegularPrice32503OutOfStock.sku}}" stepKey="seeSimpleProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductRegularPrice32503OutOfStock.price}}" stepKey="seeSimpleProductPrice"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductRegularPrice32503OutOfStock.quantity}}" stepKey="seeSimpleProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{simpleProductRegularPrice32503OutOfStock.status}}" stepKey="seeSimpleProductStockStatus"/>
-+        <seeInField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductRegularPrice32503OutOfStock.weight}}" stepKey="seeSimpleProductWeight"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <see selector="{{AdminProductFormSection.selectMultipleCategories}}" userInput="$$categoryEntity.name$$" stepKey="selectedCategories" />
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice32503OutOfStock.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer don't see updated simple product link on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{simpleProductRegularPrice32503OutOfStock.name}}" stepKey="dontSeeSimpleProductNameOnCategoryPage"/>
-+
-+        <!-- Verify customer see updated simple product (from the above step) on the storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductRegularPrice32503OutOfStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductRegularPrice32503OutOfStock.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductRegularPrice32503OutOfStock.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductRegularPrice32503OutOfStock.sku}}" stepKey="seeSimpleProductSkuOnStoreFrontPage"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{simpleProductRegularPrice32503OutOfStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{simpleProductRegularPrice32503OutOfStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify customer don't see updated simple product link on magento storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(simpleProductRegularPrice32503OutOfStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{simpleProductRegularPrice32503OutOfStock.sku}}" stepKey="fillSimpleProductSkuInSearchTextBox"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{simpleProductRegularPrice32503OutOfStock.name}}" stepKey="dontSeeProductName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
-new file mode 100644
-index 00000000000..4dea6663e61
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
-@@ -0,0 +1,88 @@
-+<?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="AdminUpdateTopCategoryUrlWithNoRedirectTest">
-+        <annotations>
-+            <stories value="Update category"/>
-+            <title value="Update top category url and do not create redirect"/>
-+            <description value="Login as admin and update top category url and do not create redirect"/>
-+            <testCaseId value="MC-6056"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Create three level nested category -->
-+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
-+            <createData entity="Two_nested_categories" stepKey="createTwoLevelNestedCategories">
-+                <requiredEntity createDataKey="createDefaultCategory"/>
-+            </createData>
-+            <createData entity="Three_nested_categories" stepKey="createThreeLevelNestedCategories">
-+                <requiredEntity createDataKey="createTwoLevelNestedCategories"/>
-+            </createData>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <deleteData createDataKey="createThreeLevelNestedCategories" stepKey="deleteThreeNestedCategories"/>
-+            <deleteData createDataKey="createTwoLevelNestedCategories" stepKey="deleteTwoLevelNestedCategory"/>
-+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
-+        </after>
-+
-+        <!-- Open Category page -->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+
-+        <!-- Open 3rd Level category -->
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createThreeLevelNestedCategories.name$$)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!--Update category UrlKey and uncheck permanent redirect for old URL -->
-+        <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
-+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="updatedurl" stepKey="updateUrlKey"/>
-+        <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}" stepKey="uncheckPermanentRedirectCheckBox"/>
-+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
-+        <waitForPageLoad stepKey="waitForCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+
-+        <!-- Get Category Id -->
-+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!-- Open Url Rewrite Page -->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
-+        <waitForPageLoad stepKey="waitForUrlRewritePage"/>
-+
-+        <!-- Verify third level category's  Redirect Path, Target Path and Redirect Type after the URL Update -->
-+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad0"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="updatedurl" stepKey="fillUpdatedUrlInRedirectPathFilter"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
-+        <see stepKey="seeTheRedirectType" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="No" />
-+        <see stepKey="seeTheTargetPath" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="catalog/category/view/id/{$categoryId}"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/updatedurl.html" stepKey="seeTheRedirectPath"/>
-+
-+        <!-- Verify third level category's old URL path doesn't show redirect path-->
-+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{Three_nested_categories.name_lwr}}" stepKey="fillOldUrlInRedirectPathFilter"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad4"/>
-+        <see stepKey="seeEmptyRecodsMessage" selector="{{AdminUrlRewriteIndexSection.emptyRecords}}" userInput="We couldn't find any records."/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
-new file mode 100644
-index 00000000000..ee1ed5f97ed
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
-@@ -0,0 +1,88 @@
-+<?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="AdminUpdateTopCategoryUrlWithRedirectTest">
-+        <annotations>
-+            <stories value="Update category"/>
-+            <title value="Update top category url and create redirect"/>
-+            <description value="Login as admin and update top category url and create redirect"/>
-+            <testCaseId value="MC-6057"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <!-- Create three level nested category -->
-+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
-+            <createData entity="Two_nested_categories" stepKey="createTwoLevelNestedCategories">
-+                <requiredEntity createDataKey="createDefaultCategory"/>
-+            </createData>
-+            <createData entity="Three_nested_categories" stepKey="createThreeLevelNestedCategories">
-+                <requiredEntity createDataKey="createTwoLevelNestedCategories"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createThreeLevelNestedCategories" stepKey="deleteThreeNestedCategories"/>
-+            <deleteData createDataKey="createTwoLevelNestedCategories" stepKey="deleteTwoLevelNestedCategory"/>
-+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Open Category page -->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
-+
-+        <!-- Open 3rd Level category -->
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createThreeLevelNestedCategories.name$$)}}" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!--Update category UrlKey and check permanent redirect for old URL -->
-+        <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
-+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="updateredirecturl" stepKey="updateUrlKey"/>
-+        <checkOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}" stepKey="checkPermanentRedirectCheckBox"/>
-+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
-+        <waitForPageLoad stepKey="waitForCategoryToSave"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-+
-+        <!-- Get Category ID -->
-+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!-- Open Url Rewrite Page -->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
-+        <waitForPageLoad stepKey="waitForUrlRewritePage"/>
-+
-+        <!-- Verify third level category's Redirect Path, Target Path and Redirect Type after the URL update -->
-+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="updateredirecturl" stepKey="fillUpdatedURLInRedirectPathFilter"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="No" stepKey="seeTheRedirectType"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="catalog/category/view/id/{$categoryId}" stepKey="seeTheTargetPath"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/updateredirecturl.html" stepKey="seeTheRedirectPath"/>
-+
-+        <!-- Verify third level category's Redirect path, Target Path and Redirect type for old URL -->
-+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad4"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="$$createThreeLevelNestedCategories.name$$" stepKey="fillOldUrlInRedirectPathFilter"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad5"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/$$createThreeLevelNestedCategories.name$$.html" stepKey="seeTheRedirectPathForOldUrl"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/updateredirecturl.html" stepKey="seeTheTargetPathForOldUrl"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="Permanent (301)" stepKey="seeTheRedirectTypeForOldUrl"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
-new file mode 100644
-index 00000000000..8ac56d09e5b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
-@@ -0,0 +1,157 @@
-+<?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="AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest">
-+        <annotations>
-+            <stories value="Update Virtual Product"/>
-+            <title value="Update Virtual Product with Regular Price (In Stock) Visible in Category Only"/>
-+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Regular Price (In Stock) Visible in Category Only"/>
-+            <testCaseId value="MC-6495"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default virtual product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-+        <waitForPageLoad stepKey="waitForProductSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update virtual product with regular price -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice.price}}" stepKey="fillProductPrice"/>
-+        <!-- Press enter to validate advanced pricing link -->
-+        <pressKey selector="{{AdminProductFormSection.productPrice}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
-+        <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="selectProductTierPriceWebsiteInput"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="selectProductTierPriceCustomerGroupInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="selectProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice.productTaxClass}}" stepKey="selectProductStockClass"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductRegularPrice.quantity}}" stepKey="fillProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductRegularPrice.status}}" stepKey="selectStockStatusInStock"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
-+        <waitForPageLoad stepKey="waitForCategory1"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <waitForPageLoad stepKey="waitForCategory2"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated virtual product(from above step) in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductRegularPrice.sku}}" stepKey="fillVirtualProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
-+
-+        <!-- Verify we see created virtual product with tier price(from the above step) in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice.sku}}" stepKey="seeProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice.price}}" stepKey="seeProductPrice"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="seeProductTierPriceWebsiteInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="seeProductTierPriceCustomerGroupInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="seeProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
-+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice.productTaxClass}}" stepKey="seeProductTaxClass"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductRegularPrice.quantity}}" stepKey="seeProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductRegularPrice.status}}" stepKey="seeProductStockStatus"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
-+        <assertEquals stepKey="assertSelectedCategories">
-+            <actualResult type="variable">selectedCategories</actualResult>
-+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
-+        </assertEquals>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!-- Verify customer don't see updated virtual product link on storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductRegularPrice.sku}}" stepKey="fillVirtualProductSkuOnStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="dontSeeVirtualProductName"/>
-+
-+        <!-- Verify customer see updated virtual product in category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="seeVirtualProductLinkOnCategoryPage"/>
-+        <grabTextFrom selector="{{StorefrontCategoryMainSection.asLowAs}}" stepKey="tierPriceTextOnCategoryPage"/>
-+        <assertEquals stepKey="assertTierPriceTextOnCategoryPage">
-+            <expectedResult type="string">As low as ${{tierPriceOnVirtualProduct.price}}</expectedResult>
-+            <actualResult type="variable">tierPriceTextOnCategoryPage</actualResult>
-+        </assertEquals>
-+
-+        <!-- Verify customer see updated virtual product and tier price on product page -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice.urlKey)}}" stepKey="goToStorefrontProductPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPrice.sku}}" stepKey="seeVirtualProductSku"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
-+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
-+            <expectedResult type="string">Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 10%</expectedResult>
-+            <actualResult type="variable">tierPriceText</actualResult>
-+        </assertEquals>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{updateVirtualProductRegularPrice.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{updateVirtualProductRegularPrice.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
-new file mode 100644
-index 00000000000..f621813f4f8
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
-@@ -0,0 +1,251 @@
-+<?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="AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest">
-+        <annotations>
-+            <stories value="Update Virtual Product"/>
-+            <title value="Update Virtual Product with Regular Price (In Stock) with Custom Options Visible in Search Only"/>
-+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Regular Price (In Stock) with Custom Options Visible in Search Only"/>
-+            <testCaseId value="MC-6641"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default virtual product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-+        <waitForPageLoad stepKey="waitForProductSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update virtual product with regular price(in stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPriceInStock.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPriceInStock.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPriceInStock.price}}" stepKey="fillProductPrice"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPriceInStock.productTaxClass}}" stepKey="selectProductTaxClass"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductRegularPriceInStock.quantity}}" stepKey="fillProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductRegularPriceInStock.status}}" stepKey="selectStockStatusInStock"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
-+        <waitForPageLoad stepKey="waitForCategory1"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <waitForPageLoad stepKey="waitForCategory2"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPriceInStock.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOption"/>
-+        <!-- Create virtual product with customizable options dataSet1 -->
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButton"/>
-+        <waitForPageLoad stepKey="waitForFirstOption"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('0')}}" userInput="{{virtualProductCustomizableOption1.title}}" stepKey="fillOptionTitleForFirstDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('1')}}" stepKey="selectOptionTypeDropDownFirstDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('1', virtualProductCustomizableOption1.type)}}" stepKey="selectOptionFieldFromDropDownForFirstDataSet"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('0')}}" stepKey="checkRequiredCheckBoxForFirstDataSet"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_price}}" stepKey="fillOptionPriceForFirstDataSet"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_price_type}}" stepKey="selectOptionPriceTypeForFirstDataSet"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_sku}}" stepKey="fillOptionSkuForFirstDataSet"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_max_characters}}" stepKey="fillOptionMaxCharactersForFirstDataSet"/>
-+         <!--Create virtual product with customizable options dataSet2 -->
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForSecondDataSet"/>
-+        <waitForPageLoad stepKey="waitForSecondDataSetToLoad"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('1')}}" userInput="{{virtualProductCustomizableOption2.title}}" stepKey="fillOptionTitleForSecondDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('2')}}" stepKey="selectOptionTypeDropDownSecondDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('2', virtualProductCustomizableOption2.type)}}" stepKey="selectOptionFieldFromDropDownForSecondDataSet"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('1')}}" stepKey="checkRequiredCheckBoxForSecondDataSet"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_price}}" stepKey="fillOptionPriceForSecondDataSet"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_price_type}}" stepKey="selectOptionPriceTypeForSecondDataSet"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_sku}}" stepKey="fillOptionSkuForSecondDataSet"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_max_characters}}" stepKey="fillOptionMaxCharactersForSecondDataSet"/>
-+        <!-- Create virtual product with customizable options dataSet3 -->
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForThirdSetOfData"/>
-+        <waitForPageLoad stepKey="waitForThirdSetOfDataToLoad"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('2')}}" userInput="{{virtualProductCustomizableOption3.title}}" stepKey="fillOptionTitleForThirdDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('3')}}" stepKey="selectOptionTypeDropDownForThirdDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('3', virtualProductCustomizableOption3.type)}}" stepKey="selectOptionFieldFromDropDownForThirdDataSet"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('2')}}" stepKey="checkRequiredCheckBoxForThirdDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForThirdDataSetToAddFirstRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_title}}" stepKey="fillOptionTitleForThirdDataSetFirstRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_price}}" stepKey="fillOptionPriceForThirdDataSetFirstRow"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_price_type}}" stepKey="selectOptionPriceTypeForThirdDataSetFirstRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_sku}}" stepKey="fillOptionSkuForThirdDataSetFirstRow"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForThirdDataSetToAddSecondRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_title}}" stepKey="fillOptionTitleForThirdDataSetSecondRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price}}" stepKey="fillOptionPriceForThirdDataSetSecondRow"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price_type}}" stepKey="selectOptionPriceTypeForThirdDataSetSecondRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_sku}}" stepKey="fillOptionSkuForThirdDataSetSecondRow"/>
-+        <!-- Create virtual product with customizable options dataSet4 -->
-+        <scrollToTopOfPage stepKey="scrollToAddOptionButton"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForFourthDataSet"/>
-+        <waitForPageLoad stepKey="waitForFourthDataSetToLoad"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('3')}}" userInput="{{virtualProductCustomizableOption4.title}}" stepKey="fillOptionTitleForFourthDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('4')}}" stepKey="selectOptionTypeDropDownForFourthSetOfData"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('4', virtualProductCustomizableOption4.type)}}" stepKey="selectOptionFieldFromDropDownForFourthDataSet"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('3')}}" stepKey="checkRequiredCheckBoxForFourthDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForFourthDataSetToAddFirstRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_title}}" stepKey="fillOptionTitleForFourthDataSetFirstRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_price}}" stepKey="fillOptionPriceForFourthDataSetFirstRow"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_price_type}}" stepKey="selectOptionPriceTypeForFourthDataSetFirstRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_sku}}" stepKey="fillOptionSkuForFourthDataSetFirstRow"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForFourthDataSetToAddSecondRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_title}}" stepKey="fillOptionTitleForFourthDataSetSecondRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price}}" stepKey="fillOptionPriceForFourthDataSetSecondRow"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price_type}}" stepKey="selectOptionPriceTypeForFourthDataSetSecondRow"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_sku}}" stepKey="fillOptionSkuForFourthDataSetSecondRow"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated virtual product(from above step) in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPriceInStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductRegularPriceInStock.sku}}" stepKey="fillVirtualProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
-+
-+        <!-- Verify we customer see updated virtual product in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPriceInStock.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPriceInStock.sku}}" stepKey="seeProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPriceInStock.price}}" stepKey="seeProductPrice"/>
-+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPriceInStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductRegularPriceInStock.quantity}}" stepKey="seeProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductRegularPriceInStock.status}}" stepKey="seeProductStockStatus"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
-+        <assertEquals stepKey="assertSelectedCategories">
-+            <actualResult type="variable">selectedCategories</actualResult>
-+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
-+        </assertEquals>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPriceInStock.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPriceInStock.urlKey}}" stepKey="seeUrlKey"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOptionToSeeValues"/>
-+        <!-- Create virtual product with customizable options dataSet1 -->
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButton1"/>
-+        <waitForPageLoad stepKey="waitForFirstOptionToLoad"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('0')}}" userInput="{{virtualProductCustomizableOption1.title}}" stepKey="seeOptionTitleForFirstDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('1')}}" stepKey="selectOptionTypeDropDownFirstDataSet1"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('1', virtualProductCustomizableOption1.type)}}" stepKey="selectOptionFieldFromDropDownForFirstDataSet1"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('0')}}" stepKey="checkRequiredCheckBoxForFirstDataSet1"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionPrice('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_price}}" stepKey="seeOptionPriceForFirstDataSet"/>
-+        <seeOptionIsSelected selector="{{AdminProductCustomizableOptionsSection.optionPriceType('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_price_type}}" stepKey="selectOptionPriceTypeForFirstDataSet1"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionSku('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_sku}}" stepKey="seeOptionSkuForFirstDataSet"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_max_characters}}" stepKey="seeOptionMaxCharactersForFirstDataSet"/>
-+        <!--Create virtual product with customizable options dataSet2 -->
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForSecondDataSetToSeeFields"/>
-+        <waitForPageLoad stepKey="waitForTheSecondDataSetToLoad"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('1')}}" userInput="{{virtualProductCustomizableOption2.title}}" stepKey="seeOptionTitleForSecondDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('2')}}" stepKey="selectOptionTypeDropDownSecondDataSet2"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('2', virtualProductCustomizableOption2.type)}}" stepKey="selectOptionFieldFromDropDownForSecondDataSet2"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('1')}}" stepKey="checkRequiredCheckBoxForTheSecondDataSet"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionPrice('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_price}}" stepKey="seeOptionPriceForSecondDataSet"/>
-+        <seeOptionIsSelected selector="{{AdminProductCustomizableOptionsSection.optionPriceType('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_price_type}}" stepKey="selectOptionPriceTypeForTheSecondDataSet"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionSku('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_sku}}" stepKey="seeOptionSkuForSecondDataSet"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_max_characters}}" stepKey="seeOptionMaxCharactersForSecondDataSet"/>
-+        <!-- Create virtual product with customizable options dataSet3 -->
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForTheThirdSetOfData"/>
-+        <waitForPageLoad stepKey="waitForTheThirdSetOfDataToLoad"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('2')}}" userInput="{{virtualProductCustomizableOption3.title}}" stepKey="seeOptionTitleForThirdDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('3')}}" stepKey="selectOptionTypeDropDownForTheThirdDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('3', virtualProductCustomizableOption3.type)}}" stepKey="selectOptionFieldFromDropDownForTheThirdDataSet"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('2')}}" stepKey="checkRequiredCheckBoxForTheThirdDataSet"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_title}}" stepKey="seeOptionTitleForThirdDataSetFirstRow"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_price}}" stepKey="seeOptionPriceForThirdDataSetFirstRow"/>
-+        <seeOptionIsSelected selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_price_type}}" stepKey="selectOptionPriceTypeForTheThirdDataSetFirstRow"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_sku}}" stepKey="seeOptionSkuForThirdDataSetFirstRow"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_title}}" stepKey="seeOptionTitleForThirdDataSetSecondRow"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price}}" stepKey="seeOptionPriceForThirdDataSetSecondRow"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price_type}}" stepKey="selectOptionPriceTypeForTheThirdDataSetSecondRow"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_sku}}" stepKey="seeOptionSkuForThirdDataSetSecondRow"/>
-+        <!-- Create virtual product with customizable options dataSet4 -->
-+        <scrollToTopOfPage stepKey="scrollToTheAddOptionButton"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForTheFourthDataSet"/>
-+        <waitForPageLoad stepKey="waitForTheFourthDataSetToLoad"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('3')}}" userInput="{{virtualProductCustomizableOption4.title}}" stepKey="fillOptionTitleForTheFourthDataSet"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('4')}}" stepKey="selectOptionTypeDropDownForTheFourthSetOfData"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('4', virtualProductCustomizableOption4.type)}}" stepKey="selectOptionFieldFromDropDownForTheFourthDataSet"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('3')}}" stepKey="checkRequiredCheckBoxForTheFourthDataSet"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_title}}" stepKey="seeOptionTitleForFourthDataSetFirstRow"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_price}}" stepKey="seeOptionPriceForFourthDataSetFirstRow"/>
-+        <seeOptionIsSelected selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_price_type}}" stepKey="selectOptionPriceTypeForTheFourthDataSetFirstRow"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_sku}}" stepKey="seeOptionSkuForFourthDataSetFirstRow"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_title}}" stepKey="seeOptionTitleForFourthDataSetSecondRow"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price}}" stepKey="seeOptionPriceForFourthDataSetSecondRow"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price_type}}" stepKey="selectOptionPriceTypeForTheFourthDataSetSecondRow"/>
-+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_sku}}" stepKey="seeOptionSkuForFourthDataSetSecondRow"/>
-+
-+        <!--Verify customer don't see updated virtual product link on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductRegularPriceInStock.name}}" stepKey="dontSeeVirtualProductNameOnCategoryPage"/>
-+
-+        <!-- Verify customer see updated virtual product (from the above step) on the storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPriceInStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPriceInStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPriceInStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPriceInStock.sku}}" stepKey="seeVirtualProductSku"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{updateVirtualProductRegularPriceInStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{updateVirtualProductRegularPriceInStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+        <!--Verify we customer see customizable options are Required -->
-+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption1.title)}}" stepKey="verifyFirstCustomOptionIsRequired" />
-+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption2.title)}}" stepKey="verifySecondCustomOptionIsRequired" />
-+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption3.title)}}" stepKey="verifyThirdCustomOptionIsRequired" />
-+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption4.title)}}" stepKey="verifyFourthCustomOptionIsRequired" />
-+        <!--Verify customer see customizable option titles and prices -->
-+        <grabMultiple selector="{{StorefrontProductInfoMainSection.allCustomOptionLabels}}" stepKey="allCustomOptionLabels" />
-+        <assertEquals stepKey="verifyLabels">
-+            <actualResult type="variable">allCustomOptionLabels</actualResult>
-+            <expectedResult type="array">[{{virtualProductCustomizableOption1.title}} + ${{virtualProductCustomizableOption1.option_0_price}}, {{virtualProductCustomizableOption2.title}} + ${{virtualProductCustomizableOption2.option_0_price}}, {{virtualProductCustomizableOption3.title}}, {{virtualProductCustomizableOption4.title}}]</expectedResult>
-+        </assertEquals>
-+        <grabAttributeFrom userInput="for" selector="{{StorefrontProductInfoMainSection.customOptionLabel(virtualProductCustomizableOption4.title)}}" stepKey="fourthOptionId" />
-+        <grabMultiple selector="{{StorefrontProductInfoMainSection.customSelectOptions({$fourthOptionId})}}" stepKey="grabFourthOptions" />
-+        <assertEquals stepKey="assertFourthSelectOptions">
-+            <actualResult type="variable">grabFourthOptions</actualResult>
-+            <expectedResult type="array">['-- Please Select --', {{virtualProductCustomizableOption4.option_0_title}} +$12.01, {{virtualProductCustomizableOption4.option_1_title}} +$20.02]</expectedResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
-new file mode 100644
-index 00000000000..a2a4f658602
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
-@@ -0,0 +1,100 @@
-+<?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="AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest">
-+        <annotations>
-+            <stories value="Update Virtual Product"/>
-+            <title value="Update Virtual Product with Regular Price (Out of Stock) Visible in Category and Search"/>
-+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Regular Price (Out of Stock) Visible in Category and Search"/>
-+            <testCaseId value="MC-7433"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default virtual product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-+        <waitForPageLoad stepKey="waitForProductSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update virtual product with regular price(out of stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="fillProductPrice"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.status}}" stepKey="selectStockStatusInStock"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated virtual product(from above step) in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
-+
-+        <!-- Verify customer see updated virtual product with regular price(out of stock) in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="seeProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="seeProductPrice"/>
-+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.status}}" stepKey="seeProductStockStatus"/>
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer see updated virtual product with regular price(out of stock) on product storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice5OutOfStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{updateVirtualProductRegularPrice5OutOfStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{updateVirtualProductRegularPrice5OutOfStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
-new file mode 100644
-index 00000000000..ffbad0752b7
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
-@@ -0,0 +1,129 @@
-+<?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="AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest">
-+        <annotations>
-+            <stories value="Update Virtual Product"/>
-+            <title value="Update Virtual Product with Regular Price (Out of Stock) Visible in Category Only"/>
-+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Regular Price (Out of Stock) Visible in Category Only"/>
-+            <testCaseId value="MC-6503"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default virtual product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickclearAllFilter" />
-+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-+        <waitForPageLoad stepKey="waitForProductSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update virtual product with regular price(out of stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="fillProductPrice"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.status}}" stepKey="selectStockStatusInStock"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
-+        <waitForPageLoad stepKey="waitForCategory1"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <waitForPageLoad stepKey="waitForCategory2"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated virtual product(from above step) in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
-+
-+        <!-- Verify we see updated virtual product with regular price(from the above step) in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="seeProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="seeProductPrice"/>
-+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.status}}" stepKey="seeProductStockStatus"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
-+        <assertEquals stepKey="assertSelectedCategories">
-+            <actualResult type="variable">selectedCategories</actualResult>
-+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
-+        </assertEquals>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer don't see updated virtual product link(from above step) on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="dontseeVirtualProductNameOnCategoryPage"/>
-+
-+        <!--Verify customer see updated virtual product (from above step) on product storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice5OutOfStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{updateVirtualProductRegularPrice5OutOfStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{updateVirtualProductRegularPrice5OutOfStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify customer don't see updated virtual product link(from above step) on magento storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice5OutOfStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="fillVirtualProductName"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="dontSeeVirtualProductName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
-new file mode 100644
-index 00000000000..aa3184994da
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
-@@ -0,0 +1,112 @@
-+<?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="AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest">
-+        <annotations>
-+            <stories value="Update Virtual Product"/>
-+            <title value="Update Virtual Product with Regular Price (Out of Stock) Visible in Search Only"/>
-+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Regular Price (Out of Stock) Visible in Search Only"/>
-+            <testCaseId value="MC-6498"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default virtual product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-+        <waitForPageLoad stepKey="waitForProductSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update virtual product with regular price(out of stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.price}}" stepKey="fillProductPrice"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.status}}" stepKey="selectStockStatusInStock"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated virtual product(from above step) in the grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
-+
-+        <!-- Verify customer see updated virtual product with regular price in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.sku}}" stepKey="seeProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.price}}" stepKey="seeProductPrice"/>
-+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.status}}" stepKey="seeProductStockStatus"/>
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer see updated virtual product on storefront page by url key -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice99OutOfStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{updateVirtualProductRegularPrice99OutOfStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{updateVirtualProductRegularPrice99OutOfStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify customer don't see updated virtual product link on magento storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice99OutOfStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.sku}}" stepKey="fillVirtualProductName"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="dontSeeVirtualProductLinkOnStorefrontPage"/>
-+
-+        <!--Verify customer don't see updated virtual product link on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$initialCategoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="dontSeeVirtualProductLinkOnCategoryPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
-new file mode 100644
-index 00000000000..3101c1e4603
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
-@@ -0,0 +1,145 @@
-+<?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="AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest">
-+        <annotations>
-+            <stories value="Update Virtual Product"/>
-+            <title value="Update Virtual Product with Special Price (In Stock) Visible in Category and Search"/>
-+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Special Price (In Stock) Visible in Category and Search"/>
-+            <testCaseId value="MC-6496"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default virtual product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-+        <waitForPageLoad stepKey="waitForProductSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update virtual product with special price  -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductSpecialPrice.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductSpecialPrice.price}}" stepKey="fillProductPrice"/>
-+        <!-- Press enter to validate advanced pricing link -->
-+        <pressKey selector="{{AdminProductFormSection.productPrice}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" userInput="{{updateVirtualProductSpecialPrice.special_price}}" stepKey="fillSpecialPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductSpecialPrice.productTaxClass}}" stepKey="selectProductStockClass"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductSpecialPrice.quantity}}" stepKey="fillProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductSpecialPrice.status}}" stepKey="selectStockStatusInStock"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
-+        <waitForPageLoad stepKey="waitForCategory1"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <waitForPageLoad stepKey="waitForCategory2"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPrice.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPrice.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated virtual product(from above step) in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductSpecialPrice.sku}}" stepKey="fillVirtualProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
-+        <!-- Verify customer see updated virtual product with special price(from the above step) in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductSpecialPrice.sku}}" stepKey="seeProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductSpecialPrice.price}}" stepKey="seeProductPrice"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" userInput="{{updateVirtualProductSpecialPrice.special_price}}" stepKey="seeSpecialPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
-+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductSpecialPrice.productTaxClass}}" stepKey="seeProductTaxClass"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductSpecialPrice.quantity}}" stepKey="seeProductQuantity"/>
-+        <see selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductSpecialPrice.status}}" stepKey="seeProductStockStatus"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
-+        <assertEquals stepKey="assertSelectedCategories">
-+            <actualResult type="variable">selectedCategories</actualResult>
-+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
-+        </assertEquals>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
-+        <see selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPrice.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPrice.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer see updated virtual product link on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="seeVirtualProductNameOnCategoryPage"/>
-+
-+        <!-- Verify customer see updated virtual product on the magento storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductSpecialPrice.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductSpecialPrice.sku}}" stepKey="fillVirtualProductName"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="seeVirtualProductName"/>
-+
-+        <!--Verify customer see updated virtual product with special price(from above step) on product storefront page by url key -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductSpecialPrice.urlKey)}}" stepKey="goToProductStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductSpecialPrice.sku}}" stepKey="seeVirtualProductSku"/>
-+        <!-- Verify customer see virtual product special price on the storefront page -->
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.specialPriceAmount}}" stepKey="specialPriceAmount"/>
-+        <assertEquals stepKey="assertSpecialPriceTextOnProductPage">
-+            <expectedResult type="string">${{updateVirtualProductSpecialPrice.special_price}}</expectedResult>
-+            <actualResult type="variable">specialPriceAmount</actualResult>
-+        </assertEquals>
-+        <!-- Verify customer see virtual product old price on the storefront page -->
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.oldPriceAmount}}" stepKey="oldPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{updateVirtualProductSpecialPrice.price}}</expectedResult>
-+            <actualResult type="variable">oldPriceAmount</actualResult>
-+        </assertEquals>
-+        <!-- Verify customer see virtual product in stock status on the storefront page -->
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{updateVirtualProductSpecialPrice.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
-new file mode 100644
-index 00000000000..58978c31b5b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
-@@ -0,0 +1,137 @@
-+<?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="UpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest">
-+        <annotations>
-+            <stories value="Update Virtual Product"/>
-+            <title value="Update Virtual Product with Special Price (Out of Stock) Visible in Category and Search"/>
-+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Special Price (Out of Stock) Visible in Category and Search"/>
-+            <testCaseId value="MC-6505"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default virtual product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-+        <waitForPageLoad stepKey="waitForProductSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update virtual product with special price(out of stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.price}}" stepKey="fillProductPrice"/>
-+        <!-- Press enter to validate advanced pricing link -->
-+        <pressKey selector="{{AdminProductFormSection.productPrice}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.special_price}}" stepKey="fillSpecialPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.status}}" stepKey="selectStockStatusInStock"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
-+        <waitForPageLoad stepKey="waitForCategory1"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <waitForPageLoad stepKey="waitForCategory2"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated virtual product with special price(out of stock) in the grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
-+        <!-- Verify customer see updated virtual product with special price(out of stock) in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.sku}}" stepKey="seeProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.price}}" stepKey="seeProductPrice"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.special_price}}" stepKey="seeSpecialPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
-+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
-+        <see selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.status}}" stepKey="seeProductStockStatus"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
-+        <assertEquals stepKey="assertSelectedCategories">
-+            <actualResult type="variable">selectedCategories</actualResult>
-+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
-+        </assertEquals>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
-+        <see selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer see updated virtual product with special price(out of stock) on product storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductSpecialPriceOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{updateVirtualProductSpecialPriceOutOfStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.oldPriceAmount}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{updateVirtualProductSpecialPriceOutOfStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+         <!--Verify customer see virtual product with special price on the storefront page-->
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.specialPriceAmount}}" stepKey="specialPriceAmount"/>
-+        <assertEquals stepKey="assertSpecialPriceTextOnProductPage">
-+            <expectedResult type="string">${{updateVirtualProductSpecialPriceOutOfStock.special_price}}</expectedResult>
-+            <actualResult type="variable">specialPriceAmount</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify customer don't see updated virtual product link on magento storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductSpecialPriceOutOfStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.sku}}" stepKey="fillVirtualProductName"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.name}}" stepKey="dontSeeVirtualProductNameOnStorefrontPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
-new file mode 100644
-index 00000000000..d28e9ddbb12
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
-@@ -0,0 +1,157 @@
-+<?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="UpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest">
-+        <annotations>
-+            <stories value="Update Virtual Product"/>
-+            <title value="Update Virtual Product with Tier Price (In Stock) Visible in Category and Search"/>
-+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Tier Price (In Stock) Visible in Category and Search"/>
-+            <testCaseId value="MC-6504"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default virtual product in the grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-+        <waitForPageLoad stepKey="waitForProductSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update virtual product with tier price -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductTierPriceInStock.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductTierPriceInStock.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductTierPriceInStock.price}}" stepKey="fillProductPrice"/>
-+        <!-- Press enter to validate advanced pricing link -->
-+        <pressKey selector="{{AdminProductFormSection.productPrice}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
-+        <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="selectProductTierPriceWebsiteInput"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="selectProductTierPriceCustomerGroupInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="selectProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductTierPriceInStock.productTaxClass}}" stepKey="selectProductStockClass"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductTierPriceInStock.quantity}}" stepKey="fillProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductTierPriceInStock.status}}" stepKey="selectStockStatusInStock"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
-+        <waitForPageLoad stepKey="waitForCategory1"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <waitForPageLoad stepKey="waitForCategory2"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductTierPriceInStock.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductTierPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated virtual product(from above step) in the grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductTierPriceInStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductTierPriceInStock.sku}}" stepKey="fillVirtualProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
-+
-+        <!-- Verify customer see updated virtual product with tier price(from the above step) in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductTierPriceInStock.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductTierPriceInStock.sku}}" stepKey="seeProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductTierPriceInStock.price}}" stepKey="seeProductPrice"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="seeProductTierPriceWebsiteInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="seeProductTierPriceCustomerGroupInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="seeProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
-+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductTierPriceInStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductTierPriceInStock.quantity}}" stepKey="seeProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductTierPriceInStock.status}}" stepKey="seeProductStockStatus"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
-+        <assertEquals stepKey="assertSelectedCategories">
-+            <actualResult type="variable">selectedCategories</actualResult>
-+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
-+        </assertEquals>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductTierPriceInStock.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductTierPriceInStock.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer see updated virtual product link on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductTierPriceInStock.name}}" stepKey="seeVirtualProductLinkOnCategoryPage"/>
-+
-+        <!--Verify customer see updated virtual product with tier price on product storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductTierPriceInStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductTierPriceInStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductTierPriceInStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductTierPriceInStock.sku}}" stepKey="seeVirtualProductSku"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{updateVirtualProductTierPriceInStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{updateVirtualProductTierPriceInStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
-+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
-+            <expectedResult type="string">Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 38%</expectedResult>
-+            <actualResult type="variable">tierPriceText</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify customer see updated virtual product link on magento storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductTierPriceInStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductTierPriceInStock.sku}}" stepKey="fillVirtualProductName"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductTierPriceInStock.name}}" stepKey="seeVirtualProductName"/>
-+        <grabTextFrom selector="{{StorefrontQuickSearchResultsSection.asLowAsLabel}}" stepKey="tierPriceTextOnStorefrontPage"/>
-+        <assertEquals stepKey="assertTierPriceTextOnCategoryPage">
-+            <expectedResult type="string">As low as ${{tierPriceOnVirtualProduct.price}}</expectedResult>
-+            <actualResult type="variable">tierPriceTextOnStorefrontPage</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
-new file mode 100644
-index 00000000000..22dd2b0054d
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
-@@ -0,0 +1,153 @@
-+<?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="AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest">
-+        <annotations>
-+            <stories value="Update Virtual Product"/>
-+            <title value="Update Virtual Product with Tier Price (In Stock) Visible in Category Only"/>
-+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Tier Price (In Stock) Visible in Category Only"/>
-+            <testCaseId value="MC-7508"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default virtual product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-+        <waitForPageLoad stepKey="waitForProductSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update virtual product with tier price(in stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductWithTierPriceInStock.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductWithTierPriceInStock.price}}" stepKey="fillProductPrice"/>
-+        <!-- Press enter to validate advanced pricing link -->
-+        <pressKey selector="{{AdminProductFormSection.productPrice}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
-+        <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="selectProductTierPriceWebsiteInput"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="selectProductTierPriceCustomerGroupInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="selectProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductWithTierPriceInStock.productTaxClass}}" stepKey="selectProductStockClass"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductWithTierPriceInStock.quantity}}" stepKey="fillProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductWithTierPriceInStock.status}}" stepKey="selectStockStatusInStock"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
-+        <waitForPageLoad stepKey="waitForCategory1"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <waitForPageLoad stepKey="waitForCategory2"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithTierPriceInStock.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductWithTierPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated virtual product(from above step) in the grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductWithTierPriceInStock.sku}}" stepKey="fillVirtualProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
-+
-+        <!-- Verify customer see updated virtual product with tier price(from the above step) in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductWithTierPriceInStock.sku}}" stepKey="seeProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductWithTierPriceInStock.price}}" stepKey="seeProductPrice"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="seeProductTierPriceWebsiteInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="seeProductTierPriceCustomerGroupInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="seeProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
-+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductWithTierPriceInStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductWithTierPriceInStock.quantity}}" stepKey="seeProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductWithTierPriceInStock.status}}" stepKey="seeProductStockStatus"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
-+        <assertEquals stepKey="assertSelectedCategories">
-+            <actualResult type="variable">selectedCategories</actualResult>
-+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
-+        </assertEquals>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithTierPriceInStock.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductWithTierPriceInStock.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer see updated virtual product link on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="seeVirtualProductNameOnCategoryPage"/>
-+
-+        <!--Verify customer see updated virtual product with tier price(from above step) on product storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductWithTierPriceInStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductWithTierPriceInStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductWithTierPriceInStock.sku}}" stepKey="seeVirtualProductSku"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{updateVirtualProductWithTierPriceInStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{updateVirtualProductWithTierPriceInStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+        <!-- Verify customer see product tier price on product page -->
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
-+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
-+            <expectedResult type="string">Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 10%</expectedResult>
-+            <actualResult type="variable">tierPriceText</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify customer don't see updated virtual product link on magento storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductWithTierPriceInStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductTierPriceInStock.sku}}" stepKey="fillVirtualProductName"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="dontSeeVirtualProductName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
-new file mode 100644
-index 00000000000..29c7536d216
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
-@@ -0,0 +1,153 @@
-+<?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="AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest">
-+        <annotations>
-+            <stories value="Update Virtual Product"/>
-+            <title value="Update Virtual Product with Tier Price (Out of Stock) Visible in Category and Search"/>
-+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Tier Price (Out of Stock) Visible in Category and Search"/>
-+            <testCaseId value="MC-6499"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search default virtual product in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-+        <waitForPageLoad stepKey="waitForProductSearch"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+
-+        <!-- Update virtual product with tier price(out of stock) -->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualTierPriceOutOfStock.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualTierPriceOutOfStock.price}}" stepKey="fillProductPrice"/>
-+        <!-- Press enter to validate advanced pricing link -->
-+        <pressKey selector="{{AdminProductFormSection.productPrice}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
-+        <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="selectProductTierPriceWebsiteInput"/>
-+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="selectProductTierPriceCustomerGroupInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="selectProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualTierPriceOutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualTierPriceOutOfStock.quantity}}" stepKey="fillProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualTierPriceOutOfStock.status}}" stepKey="selectStockStatusInStock"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
-+        <waitForPageLoad stepKey="waitForCategory1"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-+        <waitForPageLoad stepKey="waitForCategory2"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualTierPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualTierPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
-+
-+        <!-- Search updated virtual product(from above step) in the grid page -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualTierPriceOutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
-+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
-+
-+        <!-- Verify we customer see updated virtual product with tier price(from the above step) in the product form page -->
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualTierPriceOutOfStock.sku}}" stepKey="seeProductSku"/>
-+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualTierPriceOutOfStock.price}}" stepKey="seeProductPrice"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="seeProductTierPriceWebsiteInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="seeProductTierPriceCustomerGroupInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
-+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="seeProductTierPriceFixedPrice"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
-+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualTierPriceOutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualTierPriceOutOfStock.quantity}}" stepKey="seeProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualTierPriceOutOfStock.status}}" stepKey="seeProductStockStatus"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
-+        <assertEquals stepKey="assertSelectedCategories">
-+            <actualResult type="variable">selectedCategories</actualResult>
-+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
-+        </assertEquals>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
-+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualTierPriceOutOfStock.visibility}}" stepKey="seeVisibility"/>
-+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualTierPriceOutOfStock.urlKey}}" stepKey="seeUrlKey"/>
-+
-+        <!--Verify customer don't see updated virtual product link on category page -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="dontSeeVirtualProductNameOnCategoryPage"/>
-+
-+        <!--Verify customer see updated virtual product with tier price(from above step) on product storefront page -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualTierPriceOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualTierPriceOutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualTierPriceOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
-+        <assertEquals stepKey="assertStockAvailableOnProductPage">
-+            <expectedResult type="string">{{updateVirtualTierPriceOutOfStock.storefrontStatus}}</expectedResult>
-+            <actualResult type="variable">productStockAvailableStatus</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
-+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
-+            <expectedResult type="string">${{updateVirtualTierPriceOutOfStock.price}}</expectedResult>
-+            <actualResult type="variable">productPriceAmount</actualResult>
-+        </assertEquals>
-+        <!-- Verify customer see product tier price on product page -->
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
-+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
-+            <expectedResult type="string">Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 51%</expectedResult>
-+            <actualResult type="variable">tierPriceText</actualResult>
-+        </assertEquals>
-+
-+        <!--Verify customer don't see updated virtual product link on magento storefront page and is searchable by sku -->
-+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualTierPriceOutOfStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualTierPriceOutOfStock.sku}}" stepKey="fillVirtualProductName"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="dontSeeVirtualProductName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyProductOrderTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyProductOrderTest.xml
-new file mode 100644
-index 00000000000..a81c26b6e6e
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyProductOrderTest.xml
-@@ -0,0 +1,31 @@
-+<?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="AdminVerifyProductOrder">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Verify Product Order"/>
-+            <title value="Admin should see product types in specified order"/>
-+            <description value="Product Type Order should be Simple -> Configurable -> Grouped -> Virtual -> Bundle -> Downloadable -> EE"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14207"/>
-+            <group value="mtf_migrated"/>
-+            <group value="product"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="GoToProductCatalogPage" stepKey="goToProductCatalogPage"/>
-+        <actionGroup ref="VerifyProductTypeOrder" stepKey="verifyProductTypeOrder"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminVirtualProductSetEditContentTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVirtualProductSetEditContentTest.xml
-new file mode 100644
-index 00000000000..c9932de8080
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVirtualProductSetEditContentTest.xml
-@@ -0,0 +1,40 @@
-+<?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="AdminVirtualProductSetEditContentTest" extends="AdminSimpleProductSetEditContentTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create/edit virtual product"/>
-+            <title value="Admin should be able to set/edit product Content when editing a virtual product"/>
-+            <description value="Admin should be able to set/edit product Content when editing a virtual product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3425"/>
-+            <group value="Catalog"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+        <after>
-+            <!-- Delete virtual product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="defaultVirtualProduct"/>
-+            </actionGroup>
-+        </after>
-+
-+        <!-- Create product -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="defaultVirtualProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
-+            <argument name="product" value="defaultVirtualProduct"/>
-+        </actionGroup>
-+
-+        <!--Checking content storefront-->
-+        <amOnPage url="{{defaultVirtualProduct.sku}}.html" stepKey="goToStorefront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminVirtualSetEditRelatedProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVirtualSetEditRelatedProductsTest.xml
-new file mode 100644
-index 00000000000..e630545fff8
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVirtualSetEditRelatedProductsTest.xml
-@@ -0,0 +1,40 @@
-+<?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="AdminVirtualSetEditRelatedProductsTest" extends="AdminSimpleSetEditRelatedProductsTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create/edit virtual product"/>
-+            <title value="Admin should be able to set/edit Related Products information when editing a virtual product"/>
-+            <description value="Admin should be able to set/edit Related Products information when editing a virtual product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3415"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before></before>
-+        <after>
-+            <!-- Delete virtual product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="defaultVirtualProduct"/>
-+            </actionGroup>
-+        </after>
-+
-+        <!-- Create product -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="defaultVirtualProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
-+            <argument name="product" value="defaultVirtualProduct"/>
-+        </actionGroup>
-+
-+        <!--See related product in storefront-->
-+        <amOnPage url="{{defaultVirtualProduct.sku}}.html" stepKey="goToStorefront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
-index 03d919e3291..a4c8b492d9d 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdvanceCatalogSearchSimpleProductByNameTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml
-new file mode 100644
-index 00000000000..84c3f81ef6d
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml
-@@ -0,0 +1,81 @@
-+<?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="AdvanceCatalogSearchVirtualProductByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search virtual product with product name"/>
-+            <description value="Guest customer should be able to advance search virtual product with product name"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-137"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiVirtualProductWithDescription" stepKey="product"/>
-+        </before>
-+    </test>
-+    <test name="AdvanceCatalogSearchVirtualProductBySkuTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search virtual product with product sku"/>
-+            <description value="Guest customer should be able to advance search virtual product with product sku"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-162"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiVirtualProductWithDescription" stepKey="product"/>
-+        </before>
-+    </test>
-+    <test name="AdvanceCatalogSearchVirtualProductByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search virtual product with product description"/>
-+            <description value="Guest customer should be able to advance search virtual product with product description"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-163"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiVirtualProductWithDescription" stepKey="product"/>
-+        </before>
-+    </test>
-+    <test name="AdvanceCatalogSearchVirtualProductByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search virtual product with product short description"/>
-+            <description value="Guest customer should be able to advance search virtual product with product short description"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-164"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiVirtualProductWithDescription" stepKey="product"/>
-+        </before>
-+    </test>
-+    <test name="AdvanceCatalogSearchVirtualProductByPriceTest" extends="AdvanceCatalogSearchSimpleProductByPriceTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search virtual product with product price"/>
-+            <description value="Guest customer should be able to advance search virtual product with product price"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-165"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiVirtualProductWithDescription" stepKey="product"/>
-+        </before>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CheckCurrentCategoryIsHighlightedAndProductsDisplayed.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CheckCurrentCategoryIsHighlightedAndProductsDisplayed.xml
-new file mode 100644
-index 00000000000..d2fe983cb82
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CheckCurrentCategoryIsHighlightedAndProductsDisplayed.xml
-@@ -0,0 +1,72 @@
-+<?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="CheckCurrentCategoryIsHighlightedAndProductsDisplayed">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <title value="Сheck that current category is highlighted and all products displayed for it"/>
-+            <description value="Сheck that current category is highlighted and all products displayed for it"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-99028"/>
-+            <useCaseId value="MAGETWO-98748"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="category1"/>
-+            <createData entity="SimpleSubCategory" stepKey="category2"/>
-+            <createData entity="SimpleSubCategory" stepKey="category3"/>
-+            <createData entity="SimpleSubCategory" stepKey="category4"/>
-+            <createData entity="SimpleProduct" stepKey="product1">
-+                <requiredEntity createDataKey="category1"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="product2">
-+                <requiredEntity createDataKey="category1"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="product1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="product2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="category1" stepKey="deleteCategory1"/>
-+            <deleteData createDataKey="category2" stepKey="deleteCategory2"/>
-+            <deleteData createDataKey="category3" stepKey="deleteCategory3"/>
-+            <deleteData createDataKey="category4" stepKey="deleteCategory4"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Open Storefront home page-->
-+        <comment userInput="Open Storefront home page" stepKey="openStorefrontHomePage"/>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontHomePage"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
-+        <!--Click on first category-->
-+        <comment userInput="Click on first category" stepKey="openFirstCategoryPage"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$category1.name$$)}}" stepKey="clickCategory1Name"/>
-+        <waitForPageLoad stepKey="waitForCategory1Page"/>
-+        <!--Check if current category is highlighted and the others are not-->
-+        <comment userInput="Check if current category is highlighted and the others are not" stepKey="checkCateg1NameIsHighlighted"/>
-+        <grabAttributeFrom selector="{{AdminCategorySidebarTreeSection.categoryHighlighted($$category1.name$$)}}" userInput="class" stepKey="grabCategory1Class"/>
-+        <assertContains expectedType="string" expected="active" actual="$grabCategory1Class" stepKey="assertCategory1IsHighlighted"/>
-+        <executeJS function="return document.querySelectorAll('{{AdminCategorySidebarTreeSection.categoryNotHighlighted}}').length" stepKey="highlightedAmount"/>
-+        <assertEquals expectedType="int" expected="1" actual="$highlightedAmount" stepKey="assertRestCategories1IsNotHighlighted"/>
-+        <!--See products in the category page-->
-+        <comment userInput="See products in the category page" stepKey="seeProductsInCategoryPage"/>
-+        <seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($product1.name$)}}" stepKey="seeProduct1InCategoryPage"/>
-+        <seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($product2.name$)}}" stepKey="seeProduct2InCategoryPage"/>
-+        <!--Click on second category-->
-+        <comment userInput="Click on second category" stepKey="openSecondCategoryPage"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$category2.name$$)}}" stepKey="clickCategory2Name"/>
-+        <waitForPageLoad stepKey="waitForCategory2Page"/>
-+        <!--Check if current category is highlighted  and the others are not-->
-+        <comment userInput="Check if current category is highlighted and the others are not" stepKey="checkCateg2NameIsHighlighted"/>
-+        <grabAttributeFrom selector="{{AdminCategorySidebarTreeSection.categoryHighlighted($$category2.name$$)}}" userInput="class" stepKey="grabCategory2Class"/>
-+        <assertContains expectedType="string" expected="active" actual="$grabCategory2Class" stepKey="assertCategory2IsHighlighted"/>
-+        <executeJS function="return document.querySelectorAll('{{AdminCategorySidebarTreeSection.categoryNotHighlighted}}').length" stepKey="highlightedAmount2"/>
-+        <assertEquals expectedType="int" expected="1" actual="$highlightedAmount2" stepKey="assertRestCategories1IsNotHighlighted2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
-new file mode 100644
-index 00000000000..cee40241185
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
-@@ -0,0 +1,338 @@
-+<?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="CheckTierPricingOfProductsTest">
-+        <annotations>
-+            <features value="Shopping Cart"/>
-+            <stories value="MAGETWO-91697 - [Magento Cloud] 'Tier Pricing' of Products changes to 'Price' (without discount) after Updated Items and Quantities in the Order of B2B Store View."/>
-+            <title value="Checking 'Tier Pricing' of Products and 'Price' (without discount) in the Order of B2B Store View"/>
-+            <description value="Checking 'Tier Pricing' of Products and 'Price' (without discount) in the Order of B2B Store View"/>
-+            <testCaseId value="MAGETWO-94111"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Shopping Cart"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="category"/>
-+            <createData entity="SimpleProduct" stepKey="product1">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="product2">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="product3">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="product4">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="Simple_US_Customer" stepKey="customer"/>
-+            <!--Login as admin-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+
-+        <!--Create website, Sore adn Store View-->
-+        <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateWebsite">
-+            <argument name="newWebsiteName" value="secondWebsite"/>
-+            <argument name="websiteCode" value="second_website"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateStore">
-+            <argument name="website" value="secondWebsite"/>
-+            <argument name="storeGroupName" value="secondStore"/>
-+            <argument name="storeGroupCode" value="second_store"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateStoreView">
-+            <argument name="StoreGroup" value="customStoreTierPrice"/>
-+            <argument name="customStore" value="customStoreView"/>
-+        </actionGroup>
-+        <!--Set Configuration-->
-+        <createData entity="CatalogPriceScopeWebsite" stepKey="paymentMethodsSettingConfig"/>
-+        <!--Set advanced pricing for all 4 products-->
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct1">
-+            <argument name="product" value="$$product1$$"/>
-+        </actionGroup>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
-+            <argument name="product" value="$$product1$$"/>
-+        </actionGroup>
-+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite">
-+            <argument name="website" value="secondWebsite"/>
-+        </actionGroup>
-+        <actionGroup ref="ProductSetAdvancedPricing" stepKey="ProductSetAdvancedPricing1">
-+            <argument name="website" value="secondWebsite"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct2">
-+            <argument name="product" value="$$product2$$"/>
-+        </actionGroup>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
-+            <argument name="product" value="$$product2$$"/>
-+        </actionGroup>
-+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite2">
-+            <argument name="website" value="secondWebsite"/>
-+        </actionGroup>
-+        <actionGroup ref="ProductSetAdvancedPricing" stepKey="ProductSetAdvancedPricing2">
-+            <argument name="website" value="secondWebsite"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct3">
-+            <argument name="product" value="$$product3$$"/>
-+        </actionGroup>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct3">
-+            <argument name="product" value="$$product3$$"/>
-+        </actionGroup>
-+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite3">
-+            <argument name="website" value="secondWebsite"/>
-+        </actionGroup>
-+        <actionGroup ref="ProductSetAdvancedPricing" stepKey="ProductSetAdvancedPricing3">
-+            <argument name="website" value="secondWebsite"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct4">
-+            <argument name="product" value="$$product4$$"/>
-+        </actionGroup>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct4">
-+            <argument name="product" value="$$product4$$"/>
-+        </actionGroup>
-+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite4">
-+            <argument name="website" value="secondWebsite"/>
-+        </actionGroup>
-+        <actionGroup ref="ProductSetAdvancedPricing" stepKey="ProductSetAdvancedPricing4">
-+            <argument name="website" value="secondWebsite"/>
-+        </actionGroup>
-+        <actionGroup ref="ClearProductsFilterActionGroup" stepKey="ClearProductsFilterActionGroup"/>
-+
-+        <!--Flush cache-->
-+        <magentoCLI command="cache:flush" stepKey="cleanCache"/>
-+
-+
-+        <!--Edit customer info-->
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="OpenEditCustomerFrom">
-+            <argument name="customer" value="$$customer$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="ClickOnAccountInformationSection"/>
-+        <waitForPageLoad stepKey="waitForPageOpened1"/>
-+        <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="Retailer" stepKey="Group"/>
-+        <selectOption selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="secondStoreView" stepKey="clickToSelectStore"/>
-+        <click selector="{{AdminCustomerAccountInformationSection.saveCustomer}}" stepKey="save"/>
-+        <waitForPageLoad stepKey="waitForCustomersPage"/>
-+        <see userInput="You saved the customer." stepKey="CustomerIsSaved"/>
-+
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1" />
-+        <click selector="{{AdminCustomerFiltersSection.clearAll}}" stepKey="ClearFilters"/>
-+        <waitForPageLoad stepKey="waitForFiltersClear"/>
-+
-+        <!--Create Cart Price Rule-->
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-+        <waitForPageLoad stepKey="waitForPriceList"/>
-+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
-+        <waitForPageLoad stepKey="waitForPageDiscountPageIsLoaded"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="ship" stepKey="fillRuleName"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="secondWebsite" stepKey="selectWebsites"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="Retailer" stepKey="selectCustomerGroup"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="ship" stepKey="setCode"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.userPerCustomer}}" userInput="0" stepKey="setUserPerCustomer"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.userPerCoupon}}" userInput="0" stepKey="setUserPerCoupon"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.priority}}" userInput="0" stepKey="setPriority"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.freeShipping}}" userInput="For shipment with matching items" stepKey="selectFreeShippingType"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.saveAndContinue}}" stepKey="clickSaveAndContinueButton"/>
-+        <waitForPageLoad stepKey="waitForCartPriceRuleSaved"/>
-+        <see userInput="You saved the rule." stepKey="RuleSaved"/>
-+
-+        <!--Create new order-->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="CreateNewOrder">
-+            <argument name="customer" value="Simple_US_Customer"/>
-+            <argument name="storeView" value="customStoreView"/>
-+        </actionGroup>
-+
-+        <click  selector="{{OrdersGridSection.addProducts}}" stepKey="clickToAddProduct"/>
-+        <waitForPageLoad stepKey="waitForProductsOpened"/>
-+        <!--TEST CASE #1-->
-+        <!--Add 3 products to order with specified quantity-->
-+        <click selector="{{OrdersGridSection.selectProduct($$product1.name$$)}}" stepKey="selectProduct1"/>
-+        <fillField selector="{{OrdersGridSection.setQuantity($$product1.name$$)}}" userInput="10" stepKey="AddProductQuantity1"/>
-+
-+        <click selector="{{OrdersGridSection.selectProduct($$product2.name$$)}}" stepKey="selectProduct2"/>
-+        <fillField selector="{{OrdersGridSection.setQuantity($$product2.name$$)}}" userInput="10" stepKey="AddProductQuantity2"/>
-+
-+        <click selector="{{OrdersGridSection.selectProduct($$product3.name$$)}}" stepKey="selectProduct3"/>
-+        <fillField selector="{{OrdersGridSection.setQuantity($$product3.name$$)}}" userInput="10" stepKey="AddProductQuantity3"/>
-+        <click stepKey="addProductsToOrder" selector="{{OrdersGridSection.addProductsToOrder}}"/>
-+        <waitForLoadingMaskToDisappear stepKey="wait6"/>
-+        <!--Verify tier price values-->
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product1.name$$)}}" stepKey="checkProductPrice1"/>
-+        <assertEquals stepKey="verifyPrice1">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice1</actualResult>
-+        </assertEquals>
-+
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product2.name$$)}}" stepKey="checkProductPrice2"/>
-+        <assertEquals stepKey="verifyPrice2">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice2</actualResult>
-+        </assertEquals>
-+
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product3.name$$)}}" stepKey="checkProductPrice3"/>
-+        <assertEquals stepKey="verifyPrice3">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice3</actualResult>
-+        </assertEquals>
-+
-+        <!--Edit order and verify values-->
-+        <waitForPageLoad stepKey="waitForPageLoaded2"/>
-+        <click selector="{{OrdersGridSection.customPrice($$product1.name$$)}}" stepKey="ClickOnCustomPrice"/>
-+        <fillField selector="{{OrdersGridSection.customQuantity($$product1.name$$)}}" userInput="5" stepKey="ClickOnQuantity"/>
-+        <waitForLoadingMaskToDisappear stepKey="wait1"/>
-+        <click selector="{{OrdersGridSection.update}}" stepKey="ClickToUpdate"/>
-+        <waitForLoadingMaskToDisappear stepKey="wait2"/>
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product1.name$$)}}" stepKey="checkProductPrice4"/>
-+        <assertEquals stepKey="verifyPrice4">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice2}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice4</actualResult>
-+        </assertEquals>
-+
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product2.name$$)}}" stepKey="checkProductPrice5"/>
-+        <assertEquals stepKey="verifyPrice5">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice5</actualResult>
-+        </assertEquals>
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product3.name$$)}}" stepKey="checkProductPrice6"/>
-+        <assertEquals stepKey="verifyPrice6">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice3</actualResult>
-+        </assertEquals>
-+
-+        <!--Remove products from order-->
-+        <selectOption selector="{{OrdersGridSection.removeItems($$product1.name$$)}}" userInput="Remove" stepKey="clickToRemove1"/>
-+        <selectOption selector="{{OrdersGridSection.removeItems($$product2.name$$)}}" userInput="Remove" stepKey="clickToRemove2"/>
-+        <selectOption selector="{{OrdersGridSection.removeItems($$product3.name$$)}}" userInput="Remove" stepKey="clickToRemove3"/>
-+        <waitForLoadingMaskToDisappear stepKey="wait3"/>
-+        <click selector="{{OrdersGridSection.update}}" stepKey="ClickToUpdate1"/>
-+        <waitForPageLoad stepKey="WaitProductsDeleted"/>
-+
-+        <!--TEST CASE #2-->
-+        <!--Add 3 products to order with specified quantity-->
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+        <click stepKey="clickToAddProduct1" selector="{{OrdersGridSection.addProducts}}"/>
-+        <click selector="{{OrdersGridSection.selectProduct($$product1.name$$)}}" stepKey="selectProduct5"/>
-+        <fillField selector="{{OrdersGridSection.setQuantity($$product1.name$$)}}" userInput="10" stepKey="AddProductQuantity5"/>
-+
-+        <click selector="{{OrdersGridSection.selectProduct($$product2.name$$)}}" stepKey="selectProduct6"/>
-+        <fillField selector="{{OrdersGridSection.setQuantity($$product2.name$$)}}" userInput="10" stepKey="AddProductQuantity6"/>
-+
-+        <click selector="{{OrdersGridSection.selectProduct($$product3.name$$)}}" stepKey="selectProduct7"/>
-+        <fillField selector="{{OrdersGridSection.setQuantity($$product3.name$$)}}" userInput="10" stepKey="AddProductQuantity7"/>
-+        <click stepKey="addProductsToOrder1" selector="{{OrdersGridSection.addProductsToOrder}}"/>
-+        <waitForLoadingMaskToDisappear stepKey="wait7"/>
-+        <!--Verify tier price values-->
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product1.name$$)}}" stepKey="checkProductPrice7"/>
-+        <assertEquals stepKey="verifyPrice7">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice7</actualResult>
-+        </assertEquals>
-+
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product2.name$$)}}" stepKey="checkProductPrice8"/>
-+        <assertEquals stepKey="verifyPrice8">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice8</actualResult>
-+        </assertEquals>
-+
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product3.name$$)}}" stepKey="checkProductPrice9"/>
-+        <assertEquals stepKey="verifyPrice9">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice9</actualResult>
-+        </assertEquals>
-+
-+        <!--Add one more product and verify values-->
-+        <waitForPageLoad stepKey="waitForPgeLoaded3"/>
-+        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickToAddProduct2"/>
-+        <waitForLoadingMaskToDisappear stepKey="wait8"/>
-+        <click selector="{{OrdersGridSection.selectProduct($$product4.name$$)}}" stepKey="selectProduct8"/>
-+        <fillField selector="{{OrdersGridSection.setQuantity($$product4.name$$)}}" userInput="10" stepKey="AddProductQuantity9"/>
-+        <click selector="{{OrdersGridSection.addProductsToOrder}}" stepKey="addProductsToOrder2"/>
-+        <waitForLoadingMaskToDisappear stepKey="wait9"/>
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product4.name$$)}}" stepKey="checkProductPrice10"/>
-+        <assertEquals stepKey="verifyPrice10">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice10</actualResult>
-+        </assertEquals>
-+
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product1.name$$)}}" stepKey="checkProductPrice11"/>
-+        <assertEquals stepKey="verifyPrice11">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice11</actualResult>
-+        </assertEquals>
-+
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product2.name$$)}}" stepKey="checkProductPrice12"/>
-+        <assertEquals stepKey="verifyPrice12">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice12</actualResult>
-+        </assertEquals>
-+
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product3.name$$)}}" stepKey="checkProductPrice13"/>
-+        <assertEquals stepKey="verifyPrice13">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice13</actualResult>
-+        </assertEquals>
-+
-+        <selectOption selector="{{OrdersGridSection.removeItems($$product1.name$$)}}" userInput="Remove" stepKey="clickToRemove4"/>
-+        <selectOption selector="{{OrdersGridSection.removeItems($$product2.name$$)}}" userInput="Remove" stepKey="clickToRemove5"/>
-+        <selectOption selector="{{OrdersGridSection.removeItems($$product3.name$$)}}" userInput="Remove" stepKey="clickToRemove6"/>
-+        <waitForLoadingMaskToDisappear stepKey="wait4"/>
-+        <click selector="{{OrdersGridSection.update}}" stepKey="ClickToUpdate2"/>
-+        <waitForLoadingMaskToDisappear stepKey="wait10"/>
-+
-+        <!--TEST CASE #3-->
-+        <waitForPageLoad stepKey="WaitProductsDeleted1"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
-+        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickToAddProduct4" />
-+        <click selector="{{OrdersGridSection.selectProduct($$product1.name$$)}}" stepKey="selectProduct9"/>
-+        <fillField selector="{{OrdersGridSection.setQuantity($$product1.name$$)}}" userInput="10" stepKey="AddProductQuantity10"/>
-+        <click selector="{{OrdersGridSection.addProductsToOrder}}" stepKey="addProductsToOrder3"/>
-+        <waitForLoadingMaskToDisappear stepKey="wait11"/>
-+        <fillField selector="{{OrdersGridSection.applyCoupon}}" userInput="ship" stepKey="AddCouponCode"/>
-+        <waitForLoadingMaskToDisappear stepKey="wait5"/>
-+        <click selector="{{OrdersGridSection.update}}" stepKey="ClickToUpdate3"/>
-+        <waitForLoadingMaskToDisappear stepKey="wait12"/>
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product1.name$$)}}" stepKey="checkProductPrice14"/>
-+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product4.name$$)}}" stepKey="checkProductPrice15"/>
-+        <assertEquals stepKey="verifyPrice14">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice14</actualResult>
-+        </assertEquals>
-+        <assertEquals stepKey="verifyPrice15">
-+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
-+            <actualResult type="variable">$checkProductPrice15</actualResult>
-+        </assertEquals>
-+
-+        <after>
-+            <deleteData createDataKey="product1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="product2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="product3" stepKey="deleteProduct3"/>
-+            <deleteData createDataKey="product4" stepKey="deleteProduct4"/>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-+            <createData entity="DefaultConfigCatalogPrice" stepKey="defaultConfigCatalogPrice"/>
-+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
-+                <argument name="ruleName" value="ship"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
-+                <argument name="websiteName" value="secondWebsite"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <!--Do reindex and flush cache-->
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHint.xml b/app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHint.xml
-index c97d2c45be9..899f3e61b5b 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHint.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHint.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="ConfigurableOptionTextinputLengthValidationHintTest">
-         <annotations>
-             <features value="Product Customizable Option"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest.xml
-new file mode 100644
-index 00000000000..d895993217e
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest.xml
-@@ -0,0 +1,425 @@
-+<?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="CreateProductAttributeEntityTextFieldTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Product Attributes"/>
-+            <title value="Admin should be able to create a TextField product attribute"/>
-+            <description value="Admin should be able to create a TextField product attribute"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10894"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPage">
-+                <argument name="ProductAttribute" value="{{textProductAttribute.attribute_code}}"/>
-+            </actionGroup>
-+            <click stepKey="clickDelete" selector="{{AttributePropertiesSection.DeleteAttribute}}"/>
-+            <click stepKey="clickOk" selector="{{AttributeDeleteModalSection.confirm}}"/>
-+            <waitForPageLoad stepKey="waitForDeletion"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Navigate to Stores > Attributes > Product.-->
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
-+
-+        <!--Create new Product Attribute as TextField, with code and default value.-->
-+        <actionGroup ref="createProductAttributeWithTextField" stepKey="createAttribute">
-+            <argument name="attribute" value="textProductAttribute"/>
-+        </actionGroup>
-+
-+        <!--Navigate to Product Attribute.-->
-+        <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPage">
-+            <argument name="ProductAttribute" value="{{textProductAttribute.attribute_code}}"/>
-+        </actionGroup>
-+
-+        <!--Perform appropriate assertions against textProductAttribute entity-->
-+        <seeInField stepKey="assertLabel" selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{textProductAttribute.attribute_code}}"/>
-+        <seeOptionIsSelected stepKey="assertInputType" selector="{{AttributePropertiesSection.InputType}}" userInput="{{textProductAttribute.frontend_input}}"/>
-+        <seeOptionIsSelected stepKey="assertRequired" selector="{{AttributePropertiesSection.ValueRequired}}" userInput="{{textProductAttribute.is_required_admin}}"/>
-+        <seeInField stepKey="assertAttrCode" selector="{{AdvancedAttributePropertiesSection.AttributeCode}}" userInput="{{textProductAttribute.attribute_code}}"/>
-+        <seeInField stepKey="assertDefaultValue" selector="{{AdvancedAttributePropertiesSection.DefaultValueText}}" userInput="{{textProductAttribute.default_value}}"/>
-+
-+        <!--Go to New Product page, add Attribute and check values-->
-+        <amOnPage url="{{AdminProductCreatePage.url('4', 'simple')}}" stepKey="goToCreateSimpleProductPage"/>
-+        <actionGroup ref="addProductAttributeInProductModal" stepKey="addAttributeToProduct">
-+            <argument name="attributeCode" value="{{textProductAttribute.attribute_code}}"/>
-+        </actionGroup>
-+        <click stepKey="openAttributes" selector="{{AdminProductAttributesSection.sectionHeader}}"/>
-+        <waitForElementVisible selector="{{AdminProductAttributesSection.attributeTextInputByCode(textProductAttribute.attribute_code)}}" stepKey="waitforLabel"/>
-+        <seeInField stepKey="checkDefaultValue" selector="{{AdminProductAttributesSection.attributeTextInputByCode(textProductAttribute.attribute_code)}}" userInput="{{textProductAttribute.default_value}}"/>
-+        <see stepKey="checkLabel" selector="{{AdminProductAttributesSection.attributeLabelByCode(textProductAttribute.attribute_code)}}" userInput="{{textProductAttribute.attribute_code}}"/>
-+    </test>
-+
-+    <test name="CreateProductAttributeEntityDateTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Product Attributes"/>
-+            <title value="Admin should be able to create a Date product attribute"/>
-+            <description value="Admin should be able to create a Date product attribute"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10895"/>
-+            <group value="Catalog"/>
-+            <skip>
-+                <issueId value="MC-13817"/>
-+            </skip>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPage">
-+                <argument name="ProductAttribute" value="{{dateProductAttribute.attribute_code}}"/>
-+            </actionGroup>
-+            <click stepKey="clickDelete" selector="{{AttributePropertiesSection.DeleteAttribute}}"/>
-+            <click stepKey="clickOk" selector="{{AttributeDeleteModalSection.confirm}}"/>
-+            <waitForPageLoad stepKey="waitForDeletion"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Generate date for use as default value, needs to be MM/d/YYYY -->
-+        <generateDate date="now" format="m/j/Y" stepKey="generateDefaultDate"/>
-+
-+        <!--Navigate to Stores > Attributes > Product.-->
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
-+
-+        <!--Create new Product Attribute as TextField, with code and default value.-->
-+        <actionGroup ref="createProductAttributeWithDateField" stepKey="createAttribute">
-+            <argument name="attribute" value="dateProductAttribute"/>
-+            <argument name="date" value="{$generateDefaultDate}"/>
-+        </actionGroup>
-+
-+        <!--Navigate to Product Attribute.-->
-+        <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPage">
-+            <argument name="ProductAttribute" value="{{dateProductAttribute.attribute_code}}"/>
-+        </actionGroup>
-+
-+        <!--Perform appropriate assertions against textProductAttribute entity-->
-+        <seeInField stepKey="assertLabel" selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{dateProductAttribute.attribute_code}}"/>
-+        <seeOptionIsSelected stepKey="assertInputType" selector="{{AttributePropertiesSection.InputType}}" userInput="{{dateProductAttribute.frontend_input}}"/>
-+        <seeOptionIsSelected stepKey="assertRequired" selector="{{AttributePropertiesSection.ValueRequired}}" userInput="{{dateProductAttribute.is_required_admin}}"/>
-+        <seeInField stepKey="assertAttrCode" selector="{{AdvancedAttributePropertiesSection.AttributeCode}}" userInput="{{dateProductAttribute.attribute_code}}"/>
-+        <seeInField stepKey="assertDefaultValue" selector="{{AdvancedAttributePropertiesSection.DefaultValueDate}}" userInput="{$generateDefaultDate}"/>
-+
-+        <!--Go to New Product page, add Attribute and check values-->
-+        <amOnPage url="{{AdminProductCreatePage.url('4', 'simple')}}" stepKey="goToCreateSimpleProductPage"/>
-+        <actionGroup ref="addProductAttributeInProductModal" stepKey="addAttributeToProduct">
-+            <argument name="attributeCode" value="{{dateProductAttribute.attribute_code}}"/>
-+        </actionGroup>
-+        <click stepKey="openAttributes" selector="{{AdminProductAttributesSection.sectionHeader}}"/>
-+        <waitForElementVisible selector="{{AdminProductAttributesSection.attributeTextInputByCode(dateProductAttribute.attribute_code)}}" stepKey="waitforLabel"/>
-+        <seeInField stepKey="checkDefaultValue" selector="{{AdminProductAttributesSection.attributeTextInputByCode(dateProductAttribute.attribute_code)}}" userInput="{$generateDefaultDate}"/>
-+        <see stepKey="checkLabel" selector="{{AdminProductAttributesSection.attributeLabelByCode(dateProductAttribute.attribute_code)}}" userInput="{{dateProductAttribute.attribute_code}}"/>
-+    </test>
-+
-+    <test name="CreateProductAttributeEntityPriceTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Product Attributes"/>
-+            <title value="Admin should be able to create a Price product attribute"/>
-+            <description value="Admin should be able to create a Price product attribute"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10897"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPage">
-+                <argument name="ProductAttribute" value="{{priceProductAttribute.attribute_code}}"/>
-+            </actionGroup>
-+            <click stepKey="clickDelete" selector="{{AttributePropertiesSection.DeleteAttribute}}"/>
-+            <click stepKey="clickOk" selector="{{AttributeDeleteModalSection.confirm}}"/>
-+            <waitForPageLoad stepKey="waitForDeletion"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Navigate to Stores > Attributes > Product.-->
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
-+
-+        <!--Create new Product Attribute with Price-->
-+        <actionGroup ref="createProductAttribute" stepKey="createAttribute">
-+            <argument name="attribute" value="priceProductAttribute"/>
-+        </actionGroup>
-+
-+        <!--Navigate to Product Attribute.-->
-+        <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPage">
-+            <argument name="ProductAttribute" value="{{priceProductAttribute.attribute_code}}"/>
-+        </actionGroup>
-+
-+        <!--Perform appropriate assertions against priceProductAttribute entity-->
-+        <seeInField stepKey="assertLabel" selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{priceProductAttribute.attribute_code}}"/>
-+        <seeOptionIsSelected stepKey="assertInputType" selector="{{AttributePropertiesSection.InputType}}" userInput="{{priceProductAttribute.frontend_input}}"/>
-+        <seeOptionIsSelected stepKey="assertRequired" selector="{{AttributePropertiesSection.ValueRequired}}" userInput="{{priceProductAttribute.is_required_admin}}"/>
-+        <seeInField stepKey="assertAttrCode" selector="{{AdvancedAttributePropertiesSection.AttributeCode}}" userInput="{{priceProductAttribute.attribute_code}}"/>
-+
-+        <!--Go to New Product page, add Attribute and check values-->
-+        <amOnPage url="{{AdminProductCreatePage.url('4', 'simple')}}" stepKey="goToCreateSimpleProductPage"/>
-+        <actionGroup ref="addProductAttributeInProductModal" stepKey="addAttributeToProduct">
-+            <argument name="attributeCode" value="{{priceProductAttribute.attribute_code}}"/>
-+        </actionGroup>
-+        <click stepKey="openAttributes" selector="{{AdminProductAttributesSection.sectionHeader}}"/>
-+        <waitForElementVisible selector="{{AdminProductAttributesSection.attributeTextInputByCode(priceProductAttribute.attribute_code)}}" stepKey="waitforLabel"/>
-+        <see stepKey="checkLabel" selector="{{AdminProductAttributesSection.attributeLabelByCode(priceProductAttribute.attribute_code)}}" userInput="{{priceProductAttribute.attribute_code}}"/>
-+    </test>
-+
-+    <test name="CreateProductAttributeEntityDropdownTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Product Attributes"/>
-+            <title value="Admin should be able to create a Dropdown product attribute"/>
-+            <description value="Admin should be able to create a Dropdown product attribute"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10896"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPage">
-+                <argument name="ProductAttribute" value="{{dropdownProductAttribute.attribute_code}}"/>
-+            </actionGroup>
-+            <click stepKey="clickDelete" selector="{{AttributePropertiesSection.DeleteAttribute}}"/>
-+            <click stepKey="clickOk" selector="{{AttributeDeleteModalSection.confirm}}"/>
-+            <waitForPageLoad stepKey="waitForDeletion"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Navigate to Stores > Attributes > Product.-->
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
-+
-+        <!--Create new Product Attribute as TextField, with code and default value.-->
-+        <actionGroup ref="createProductAttribute" stepKey="createAttribute">
-+            <argument name="attribute" value="dropdownProductAttribute"/>
-+        </actionGroup>
-+
-+        <!--Navigate to Product Attribute, add Product Options and Save - 1-->
-+        <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPage1">
-+            <argument name="ProductAttribute" value="{{dropdownProductAttribute.attribute_code}}"/>
-+        </actionGroup>
-+        <actionGroup ref="createAttributeDropdownNthOption" stepKey="createOption1">
-+            <argument name="adminName" value="{{dropdownProductAttribute.option1_admin}}"/>
-+            <argument name="frontName" value="{{dropdownProductAttribute.option1_frontend}}"/>
-+            <argument name="row" value="1"/>
-+        </actionGroup>
-+        <actionGroup ref="createAttributeDropdownNthOption" stepKey="createOption2">
-+            <argument name="adminName" value="{{dropdownProductAttribute.option2_admin}}"/>
-+            <argument name="frontName" value="{{dropdownProductAttribute.option2_frontend}}"/>
-+            <argument name="row" value="2"/>
-+        </actionGroup>
-+        <actionGroup ref="createAttributeDropdownNthOptionAsDefault" stepKey="createOption3">
-+            <argument name="adminName" value="{{dropdownProductAttribute.option3_admin}}"/>
-+            <argument name="frontName" value="{{dropdownProductAttribute.option3_frontend}}"/>
-+            <argument name="row" value="3"/>
-+        </actionGroup>
-+        <click stepKey="saveAttribute" selector="{{AttributePropertiesSection.Save}}"/>
-+
-+        <!--Perform appropriate assertions against dropdownProductAttribute entity-->
-+        <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPageForAssertions">
-+            <argument name="ProductAttribute" value="{{dropdownProductAttribute.attribute_code}}"/>
-+        </actionGroup>
-+        <seeInField stepKey="assertLabel" selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{dropdownProductAttribute.attribute_code}}"/>
-+        <seeOptionIsSelected stepKey="assertInputType" selector="{{AttributePropertiesSection.InputType}}" userInput="{{dropdownProductAttribute.frontend_input_admin}}"/>
-+        <seeOptionIsSelected stepKey="assertRequired" selector="{{AttributePropertiesSection.ValueRequired}}" userInput="{{dropdownProductAttribute.is_required_admin}}"/>
-+        <seeInField stepKey="assertAttrCode" selector="{{AdvancedAttributePropertiesSection.AttributeCode}}" userInput="{{dropdownProductAttribute.attribute_code}}"/>
-+
-+        <!--Assert options are in order and with correct attributes-->
-+        <seeInField stepKey="seeOption1Admin" selector="{{AttributePropertiesSection.dropdownNthOptionAdmin('1')}}" userInput="{{dropdownProductAttribute.option1_admin}}"/>
-+        <seeInField stepKey="seeOption1StoreView" selector="{{AttributePropertiesSection.dropdownNthOptionDefaultStoreView('1')}}" userInput="{{dropdownProductAttribute.option1_frontend}}"/>
-+        <dontSeeCheckboxIsChecked stepKey="dontSeeOption1Default" selector="{{AttributePropertiesSection.dropdownNthOptionIsDefault('1')}}"/>
-+        <seeInField stepKey="seeOption2Admin" selector="{{AttributePropertiesSection.dropdownNthOptionAdmin('2')}}" userInput="{{dropdownProductAttribute.option2_admin}}"/>
-+        <seeInField stepKey="seeOption2StoreView" selector="{{AttributePropertiesSection.dropdownNthOptionDefaultStoreView('2')}}" userInput="{{dropdownProductAttribute.option2_frontend}}"/>
-+        <dontSeeCheckboxIsChecked stepKey="dontSeeOption2Default" selector="{{AttributePropertiesSection.dropdownNthOptionIsDefault('2')}}"/>
-+        <seeInField stepKey="seeOption3Admin" selector="{{AttributePropertiesSection.dropdownNthOptionAdmin('3')}}" userInput="{{dropdownProductAttribute.option3_admin}}"/>
-+        <seeInField stepKey="seeOption3StoreView" selector="{{AttributePropertiesSection.dropdownNthOptionDefaultStoreView('3')}}" userInput="{{dropdownProductAttribute.option3_frontend}}"/>
-+        <seeCheckboxIsChecked stepKey="seeOption3Default" selector="{{AttributePropertiesSection.dropdownNthOptionIsDefault('3')}}"/>
-+
-+        <!--Go to New Product page, add Attribute and check dropdown values-->
-+        <amOnPage url="{{AdminProductCreatePage.url('4', 'simple')}}" stepKey="goToCreateSimpleProductPage"/>
-+        <actionGroup ref="addProductAttributeInProductModal" stepKey="addAttributeToProduct">
-+            <argument name="attributeCode" value="{{dropdownProductAttribute.attribute_code}}"/>
-+        </actionGroup>
-+        <click stepKey="openAttributes" selector="{{AdminProductAttributesSection.sectionHeader}}"/>
-+        <waitForElementVisible selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" stepKey="waitforLabel"/>
-+        <seeOptionIsSelected selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" userInput="{{dropdownProductAttribute.option3_admin}}" stepKey="seeDefaultIsCorrect"/>
-+        <see stepKey="seeOption1Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" userInput="{{dropdownProductAttribute.option1_admin}}"/>
-+        <see stepKey="seeOption2Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" userInput="{{dropdownProductAttribute.option2_admin}}"/>
-+        <see stepKey="seeOption3Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" userInput="{{dropdownProductAttribute.option3_admin}}"/>
-+    </test>
-+
-+    <test name="CreateProductAttributeEntityDropdownWithSingleQuoteTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Product Attributes"/>
-+            <title value="Admin should be able to create a Dropdown product attribute containing a single quote"/>
-+            <description value="Admin should be able to create a Dropdown product attribute containing a single quote"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10898"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPage">
-+                <argument name="ProductAttribute" value="{{dropdownProductAttributeWithQuote.attribute_code}}"/>
-+            </actionGroup>
-+            <click stepKey="clickDelete" selector="{{AttributePropertiesSection.DeleteAttribute}}"/>
-+            <click stepKey="clickOk" selector="{{AttributeDeleteModalSection.confirm}}"/>
-+            <waitForPageLoad stepKey="waitForDeletion"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Navigate to Stores > Attributes > Product.-->
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
-+
-+        <!--Create new Product Attribute as TextField, with code and default value.-->
-+        <actionGroup ref="createProductAttribute" stepKey="createAttribute">
-+            <argument name="attribute" value="dropdownProductAttributeWithQuote"/>
-+        </actionGroup>
-+
-+        <!--Navigate to Product Attribute, add Product Option and Save - 1-->
-+        <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPage1">
-+            <argument name="ProductAttribute" value="{{dropdownProductAttributeWithQuote.attribute_code}}"/>
-+        </actionGroup>
-+        <actionGroup ref="createAttributeDropdownNthOptionAsDefault" stepKey="createOption1">
-+            <argument name="adminName" value="{{dropdownProductAttributeWithQuote.option1_admin}}"/>
-+            <argument name="frontName" value="{{dropdownProductAttributeWithQuote.option1_frontend}}"/>
-+            <argument name="row" value="1"/>
-+        </actionGroup>
-+        <click stepKey="saveAttribute" selector="{{AttributePropertiesSection.Save}}"/>
-+
-+        <!--Perform appropriate assertions against dropdownProductAttribute entity-->
-+        <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPageForAssertions">
-+            <argument name="ProductAttribute" value="{{dropdownProductAttributeWithQuote.attribute_code}}"/>
-+        </actionGroup>
-+        <seeInField stepKey="assertLabel" selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{dropdownProductAttributeWithQuote.attribute_code}}"/>
-+        <seeOptionIsSelected stepKey="assertInputType" selector="{{AttributePropertiesSection.InputType}}" userInput="{{dropdownProductAttributeWithQuote.frontend_input_admin}}"/>
-+        <seeOptionIsSelected stepKey="assertRequired" selector="{{AttributePropertiesSection.ValueRequired}}" userInput="{{dropdownProductAttributeWithQuote.is_required_admin}}"/>
-+        <seeInField stepKey="assertAttrCode" selector="{{AdvancedAttributePropertiesSection.AttributeCode}}" userInput="{{dropdownProductAttributeWithQuote.attribute_code}}"/>
-+
-+        <!--Assert options are in order and with correct attributes-->
-+        <seeInField stepKey="seeOption1Admin" selector="{{AttributePropertiesSection.dropdownNthOptionAdmin('1')}}" userInput="{{dropdownProductAttributeWithQuote.option1_admin}}"/>
-+        <seeInField stepKey="seeOption1StoreView" selector="{{AttributePropertiesSection.dropdownNthOptionDefaultStoreView('1')}}" userInput="{{dropdownProductAttributeWithQuote.option1_frontend}}"/>
-+        <seeCheckboxIsChecked stepKey="seeOption1Default" selector="{{AttributePropertiesSection.dropdownNthOptionIsDefault('1')}}"/>
-+
-+        <!--Go to New Product page, add Attribute and check dropdown values-->
-+        <amOnPage url="{{AdminProductCreatePage.url('4', 'simple')}}" stepKey="goToCreateSimpleProductPage"/>
-+        <actionGroup ref="addProductAttributeInProductModal" stepKey="addAttributeToProduct">
-+            <argument name="attributeCode" value="{{dropdownProductAttributeWithQuote.attribute_code}}"/>
-+        </actionGroup>
-+        <click stepKey="openAttributes" selector="{{AdminProductAttributesSection.sectionHeader}}"/>
-+        <waitForElementVisible selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttributeWithQuote.attribute_code)}}" stepKey="waitforLabel"/>
-+        <seeOptionIsSelected selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttributeWithQuote.attribute_code)}}" userInput="{{dropdownProductAttributeWithQuote.option1_admin}}" stepKey="seeDefaultIsCorrect"/>
-+        <see stepKey="seeOption1Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttributeWithQuote.attribute_code)}}" userInput="{{dropdownProductAttributeWithQuote.option1_admin}}"/>
-+    </test>
-+
-+    <test name="CreateProductAttributeEntityMultiSelectTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Product Attributes"/>
-+            <title value="Admin should be able to create a MultiSelect product attribute"/>
-+            <description value="Admin should be able to create a MultiSelect product attribute"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10888"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPage">
-+                <argument name="ProductAttribute" value="{{multiselectProductAttribute.attribute_code}}"/>
-+            </actionGroup>
-+            <click stepKey="clickDelete" selector="{{AttributePropertiesSection.DeleteAttribute}}"/>
-+            <click stepKey="clickOk" selector="{{AttributeDeleteModalSection.confirm}}"/>
-+            <waitForPageLoad stepKey="waitForDeletion"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Navigate to Stores > Attributes > Product.-->
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
-+
-+        <!--Create new Product Attribute as TextField, with code and default value.-->
-+        <actionGroup ref="createProductAttribute" stepKey="createAttribute">
-+            <argument name="attribute" value="multiselectProductAttribute"/>
-+        </actionGroup>
-+
-+        <!--Navigate to Product Attribute, add Product Options and Save - 1-->
-+        <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPage1">
-+            <argument name="ProductAttribute" value="{{multiselectProductAttribute.attribute_code}}"/>
-+        </actionGroup>
-+        <actionGroup ref="createAttributeDropdownNthOption" stepKey="createOption1">
-+            <argument name="adminName" value="{{multiselectProductAttribute.option1_admin}}"/>
-+            <argument name="frontName" value="{{multiselectProductAttribute.option1_frontend}}"/>
-+            <argument name="row" value="1"/>
-+        </actionGroup>
-+        <actionGroup ref="createAttributeDropdownNthOption" stepKey="createOption2">
-+            <argument name="adminName" value="{{multiselectProductAttribute.option2_admin}}"/>
-+            <argument name="frontName" value="{{multiselectProductAttribute.option2_frontend}}"/>
-+            <argument name="row" value="2"/>
-+        </actionGroup>
-+        <actionGroup ref="createAttributeDropdownNthOptionAsDefault" stepKey="createOption3">
-+            <argument name="adminName" value="{{multiselectProductAttribute.option3_admin}}"/>
-+            <argument name="frontName" value="{{multiselectProductAttribute.option3_frontend}}"/>
-+            <argument name="row" value="3"/>
-+        </actionGroup>
-+        <click stepKey="saveAttribute" selector="{{AttributePropertiesSection.Save}}"/>
-+
-+        <!--Perform appropriate assertions against multiselectProductAttribute entity-->
-+        <actionGroup ref="navigateToEditProductAttribute" stepKey="goToEditPageForAssertions">
-+            <argument name="ProductAttribute" value="{{multiselectProductAttribute.attribute_code}}"/>
-+        </actionGroup>
-+        <seeInField stepKey="assertLabel" selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{multiselectProductAttribute.attribute_code}}"/>
-+        <seeOptionIsSelected stepKey="assertInputType" selector="{{AttributePropertiesSection.InputType}}" userInput="{{multiselectProductAttribute.frontend_input_admin}}"/>
-+        <seeOptionIsSelected stepKey="assertRequired" selector="{{AttributePropertiesSection.ValueRequired}}" userInput="{{multiselectProductAttribute.is_required_admin}}"/>
-+        <seeInField stepKey="assertAttrCode" selector="{{AdvancedAttributePropertiesSection.AttributeCode}}" userInput="{{multiselectProductAttribute.attribute_code}}"/>
-+
-+        <!--Assert options are in order and with correct attributes-->
-+        <seeInField stepKey="seeOption1Admin" selector="{{AttributePropertiesSection.dropdownNthOptionAdmin('1')}}" userInput="{{multiselectProductAttribute.option1_admin}}"/>
-+        <seeInField stepKey="seeOption1StoreView" selector="{{AttributePropertiesSection.dropdownNthOptionDefaultStoreView('1')}}" userInput="{{multiselectProductAttribute.option1_frontend}}"/>
-+        <dontSeeCheckboxIsChecked stepKey="dontSeeOption1Default" selector="{{AttributePropertiesSection.dropdownNthOptionIsDefault('1')}}"/>
-+        <seeInField stepKey="seeOption2Admin" selector="{{AttributePropertiesSection.dropdownNthOptionAdmin('2')}}" userInput="{{multiselectProductAttribute.option2_admin}}"/>
-+        <seeInField stepKey="seeOption2StoreView" selector="{{AttributePropertiesSection.dropdownNthOptionDefaultStoreView('2')}}" userInput="{{multiselectProductAttribute.option2_frontend}}"/>
-+        <dontSeeCheckboxIsChecked stepKey="dontSeeOption2Default" selector="{{AttributePropertiesSection.dropdownNthOptionIsDefault('2')}}"/>
-+        <seeInField stepKey="seeOption3Admin" selector="{{AttributePropertiesSection.dropdownNthOptionAdmin('3')}}" userInput="{{multiselectProductAttribute.option3_admin}}"/>
-+        <seeInField stepKey="seeOption3StoreView" selector="{{AttributePropertiesSection.dropdownNthOptionDefaultStoreView('3')}}" userInput="{{multiselectProductAttribute.option3_frontend}}"/>
-+        <seeCheckboxIsChecked stepKey="seeOption3Default" selector="{{AttributePropertiesSection.dropdownNthOptionIsDefault('3')}}"/>
-+
-+        <!--Go to New Product page, add Attribute and check multiselect values-->
-+        <amOnPage url="{{AdminProductCreatePage.url('4', 'simple')}}" stepKey="goToCreateSimpleProductPage"/>
-+        <actionGroup ref="addProductAttributeInProductModal" stepKey="addAttributeToProduct">
-+            <argument name="attributeCode" value="{{multiselectProductAttribute.attribute_code}}"/>
-+        </actionGroup>
-+        <click stepKey="openAttributes" selector="{{AdminProductAttributesSection.sectionHeader}}"/>
-+        <waitForElementVisible selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" stepKey="waitforLabel"/>
-+        <seeOptionIsSelected selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" userInput="{{multiselectProductAttribute.option3_admin}}" stepKey="seeDefaultIsCorrect"/>
-+        <see stepKey="seeOption1Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" userInput="{{multiselectProductAttribute.option1_admin}}"/>
-+        <see stepKey="seeOption2Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" userInput="{{multiselectProductAttribute.option2_admin}}"/>
-+        <see stepKey="seeOption3Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" userInput="{{multiselectProductAttribute.option3_admin}}"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
-index 4ec775f7ea2..5cae81b36a3 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
-@@ -7,10 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="DeleteCategoriesTest">
-         <annotations>
-             <features value="Catalog"/>
-+            <stories value="Delete categories"/>
-             <title value="Admin should be able to delete the default root category and subcategories and still see products in the storefront"/>
-             <description value="Admin should be able to delete the default root category and subcategories and still see products in the storefront"/>
-             <severity value="CRITICAL"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteUsedInConfigurableProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteUsedInConfigurableProductAttributeTest.xml
-new file mode 100644
-index 00000000000..e79e4cea408
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteUsedInConfigurableProductAttributeTest.xml
-@@ -0,0 +1,105 @@
-+<?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="DeleteUsedInConfigurableProductAttributeTest">
-+        <annotations>
-+            <stories value="Delete product attribute"/>
-+            <title value="Admin should not be able to delete product attribute used in configurable product"/>
-+            <description value="Admin should not be able to delete product attribute used in configurable product"/>
-+            <testCaseId value="MC-14061"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="categoryHandle"/>
-+
-+            <!-- Create base configurable product-->
-+            <createData entity="BaseConfigurableProduct" stepKey="baseConfigProductHandle">
-+                <requiredEntity createDataKey="categoryHandle"/>
-+            </createData>
-+
-+            <!-- Create Dropdown Product Attribute -->
-+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
-+
-+            <!--Create attribute options -->
-+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+
-+            <!--Add to attribute to Default attribute set-->
-+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+
-+            <!-- Get handle of the attribute options -->
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </getData>
-+
-+            <!--Create configurable product with the options -->
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
-+                <requiredEntity createDataKey="baseConfigProductHandle"/>
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
-+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
-+            </createData>
-+
-+            <!-- Login As Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete the configurable product created in the before block -->
-+            <deleteData createDataKey="baseConfigProductHandle" stepKey="deleteConfig"/>
-+
-+            <!-- Delete the category created in the before block -->
-+            <deleteData createDataKey="categoryHandle" stepKey="deleteCategory"/>
-+
-+            <!-- Delete configurable product attribute created in the before block -->
-+            <deleteData createDataKey="productAttributeHandle" stepKey="deleteProductAttribute"/>
-+
-+            <!-- Logout -->
-+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-+        </after>
-+        <!-- Go to Stores > Attributes > Products. Search and select the product attribute that was used to create the configurable product-->
-+        <actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid">
-+            <argument name="productAttributeCode" value="$$productAttributeHandle.attribute_code$$"/>
-+        </actionGroup>
-+
-+        <!-- Click Delete Attribute button -->
-+        <actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode">
-+            <argument name="productAttributeCode" value="$$productAttributeHandle.attribute_code$$"/>
-+        </actionGroup>
-+
-+        <!-- Should see error message: This attribute is used in configurable products.  -->
-+        <actionGroup ref="AssertAttributeDeletionErrorMessageActionGroup" stepKey="assertAttributeDeletionErrorMessage"/>
-+
-+        <!-- Go back to the product attribute grid. Should see the product attribute in the grid -->
-+        <actionGroup ref="SearchAttributeByCodeOnProductAttributeGridActionGroup" stepKey="searchAttributeByCodeOnProductAttributeGrid">
-+            <argument name="productAttributeCode" value="$$productAttributeHandle.attribute_code$$"/>
-+        </actionGroup>
-+
-+        <!-- Go to the Catalog > Products page and search configurable product created in before block.-->
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProductOnBackend">
-+            <argument name="product" value="$$baseConfigProductHandle$$"/>
-+        </actionGroup>
-+
-+        <!--Should see the product attributes as expected -->
-+        <actionGroup ref="AssertProductAttributePresenceInCatalogProductGridActionGroup" stepKey="assertProductAttributePresenceInCatalogProductGrid">
-+            <argument name="productAttribute" value="$$productAttributeHandle$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-index d5d9de2648e..1419ca4cb42 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CAdminTest">
-         <annotations>
-             <features value="End to End scenarios"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-index e80de8122e8..e3924099d2f 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CGuestUserTest">
-         <annotations>
-             <features value="End to End scenarios"/>
-@@ -17,6 +17,9 @@
-             <description value="User browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-87435"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-         </annotations>
-         <before>
-             <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-index b8827616e3e..3f48c3ca811 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CLoggedInUserTest">
-         <before>
-             <createData entity="ApiCategory" stepKey="createCategory"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml
-new file mode 100644
-index 00000000000..9ee56c02c77
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml
-@@ -0,0 +1,44 @@
-+<?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="NewProductsListWidgetSimpleProductTest" extends="NewProductsListWidgetTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="New products list widget"/>
-+            <title value="Admin should be able to set Simple Product as new so that it shows up in the Catalog New Products List Widget"/>
-+            <description value="Admin should be able to set Simple Product as new so that it shows up in the Catalog New Products List Widget"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-104"/>
-+            <group value="Catalog"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+
-+        <!-- A Cms page containing the New Products Widget gets created here via extends -->
-+
-+        <!-- Create a Simple Product to appear in the widget -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-+        <waitForPageLoad stepKey="waitForProductList"/>
-+        <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickAddProduct"/>
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{_defaultProduct.price}}" stepKey="fillProductPrice"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQuantity"/>
-+        <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
-+        <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
-+
-+        <!-- If PageCache is enabled, Cache clearing happens here via merge  -->
-+
-+        <!-- Check for product on the CMS page with the New Products widget -->
-+        <amOnPage url="{{_newDefaultCmsPage.identifier}}" stepKey="amOnCmsPage"/>
-+        <waitForPageLoad stepKey="waitForCmsPage"/>
-+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml
-new file mode 100644
-index 00000000000..a4e0d8708eb
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml
-@@ -0,0 +1,48 @@
-+<?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="NewProductsListWidgetVirtualProductTest" extends="NewProductsListWidgetTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="New products list widget"/>
-+            <title value="Admin should be able to set Virtual Product as new so that it shows up in the Catalog New Products List Widget"/>
-+            <description value="Admin should be able to set Virtual Product as new so that it shows up in the Catalog New Products List Widget"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-122"/>
-+            <group value="Catalog"/>
-+            <group value="WYSIWYGDisabled"/>
-+
-+        </annotations>
-+
-+        <!-- A Cms page containing the New Products Widget gets created here via extends -->
-+
-+        <!-- Create a Virtual Product to appear in the widget -->
-+
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-+        <waitForPageLoad stepKey="waitForProductList"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="toggleAddProductButton"/>
-+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickAddVirtualProduct"/>
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="123.45" stepKey="fillProductPrice"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQuantity"/>
-+        <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
-+        <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
-+
-+        <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
-+
-+        <!-- Check for product on the CMS page with the New Products widget -->
-+
-+        <amOnPage url="{{_newDefaultCmsPage.identifier}}" stepKey="amOnCmsPage"/>
-+        <waitForPageLoad stepKey="waitForCmsPage"/>
-+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml
-new file mode 100644
-index 00000000000..461ebde29fc
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml
-@@ -0,0 +1,56 @@
-+<?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="ProductAvailableAfterEnablingSubCategoriesTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Categories"/>
-+            <title value="Check that parent categories are showing products after enabling subcategories after fully reindex"/>
-+            <description value="Check that parent categories are showing products after enabling subcategories after fully reindex"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-97370"/>
-+            <useCaseId value="MAGETWO-96846"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="SubCategoryWithParent" stepKey="simpleSubCategory">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="is_active">false</field>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="simpleSubCategory"/>
-+            </createData>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryStorefront2"/>
-+        <waitForPageLoad stepKey="waitForCategoryStorefront"/>
-+        <dontSeeElement selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct.name$$)}}" stepKey="dontSeeCreatedProduct"/>
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="onCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoadAddProducts"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandAll"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$simpleSubCategory.name$$)}}" stepKey="clickOnCreatedSimpleSubCategoryBeforeDelete"/>
-+        <waitForPageLoad stepKey="AdminCategoryEditPageLoad"/>
-+        <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="EnableCategory"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryWithProducts"/>
-+        <waitForPageLoad stepKey="waitForCategorySaved"/>
-+        <see userInput="You saved the category." stepKey="seeSuccessMessage"/>
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryStorefront"/>
-+        <waitForPageLoad stepKey="waitForCategoryStorefrontPage"/>
-+        <seeElement selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct.name$$)}}" stepKey="seeCreatedProduct"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
-index 26f6eb7910f..e9e9eb01587 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="SaveProductWithCustomOptionsAdditionalWebsiteTest">
-         <annotations>
-             <features value="Save a product with Custom Options and assign to a different website"/>
-@@ -67,7 +67,7 @@
-         <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
-         <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
- 
--       <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
-+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
-         <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
-         <waitForPageLoad stepKey="waitAfterAddOption"/>
-         <fillField selector="input[name='product[options][0][title]']" userInput="Radio Option" stepKey="fillOptionTitle"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
-index 084ae62788d..0049dcb5043 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="SimpleProductTwoCustomOptionsTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
-index 05964c5cce2..386633f0e94 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
-@@ -7,16 +7,16 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontProductNameWithDoubleQuote">
-         <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create products"/>
-             <title value="Product with double quote in name"/>
-             <description value="Product with a double quote in the name should appear correctly on the storefront"/>
-             <severity value="CRITICAL"/>
-             <group value="product"/>
-             <testCaseId value="MAGETWO-92384"/>
--            <!-- Skipped due to MAGETWO-93261 -->
--            <group value="skip"/>
-         </annotations>
-         <before>
-             <createData entity="_defaultCategory" stepKey="createCategory"/>
-@@ -66,6 +66,7 @@
-     <test name="StorefrontProductNameWithHTMLEntities">
-         <annotations>
-             <features value="Catalog"/>
-+            <stories value="Create product"/>
-             <title value=":Proudct with html special characters in name"/>
-             <description value="Product with html entities in the name should appear correctly on the PDP breadcrumbs on storefront"/>
-             <severity value="CRITICAL"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml
-index 92013f6f9d0..1c1b47a6bde 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml
-@@ -7,9 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontProductWithEmptyAttributeTest">
-         <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create products"/>
-             <title value="Product attribute is not visible on storefront if it is empty"/>
-             <description value="Product attribute should not be visible on storefront if it is empty"/>
-             <severity value="MAJOR"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml
-index c03241348e8..d7f98c4cdd3 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml
-@@ -7,9 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontProductsCompareWithEmptyAttributeTest">
-         <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Product attributes"/>
-             <title value="Product attribute is not visible on product compare page if it is empty"/>
-             <description value="Product attribute should not be visible on the product compare page if it is empty for all products that are being compared, not even displayed as N/A"/>
-             <severity value="MAJOR"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViews.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViews.xml
-deleted file mode 100644
-index 7d843012d1d..00000000000
---- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViews.xml
-+++ /dev/null
-@@ -1,291 +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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
--    <test name="StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest">
--        <annotations>
--            <features value="Catalog"/>
--            <title value="Admin should be able to sell products with different variants of their own"/>
--            <description value="Admin should be able to sell products with different variants of their own"/>
--            <severity value="CRITICAL"/>
--            <testCaseId value="MAGETWO-58184"/>
--            <group value="product"/>
--        </annotations>
--
--        <before>
--            <!-- Create Customer -->
--
--            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
--
--            <!--Create Simple Product -->
--
--            <createData entity="_defaultCategory" stepKey="createCategory"/>
--            <createData entity="_defaultProduct" stepKey="createProduct">
--                <requiredEntity createDataKey="createCategory"/>
--                <field key="price">100</field>
--            </createData>
--
--            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
--
--            <!--Create storeView 1-->
--
--            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView1">
--                <argument name="customStore" value="customStoreEN"/>
--            </actionGroup>
--
--            <!--Create storeView 2-->
--
--            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView2">
--                <argument name="customStore" value="customStoreFR"/>
--            </actionGroup>
--        </before>
--
--        <after>
--            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
--            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
--            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
--
--            <!-- Delete Store View EN -->
--
--            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView1">
--                <argument name="customStore" value="customStoreEN"/>
--            </actionGroup>
--
--            <!-- Delete Store View FR -->
--
--            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView2">
--                <argument name="customStore" value="customStoreFR"/>
--            </actionGroup>
--        </after>
--
--        <!-- Open Product Grid, Filter product and open -->
--
--        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
--        <waitForPageLoad time="30" stepKey="waitForPageLoad"/>
--
--        <actionGroup ref="filterProductGridBySku" stepKey="filterGroupedProductOptions">
--            <argument name="product" value="_defaultProduct"/>
--        </actionGroup>
--        <click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit"/>
--        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
--
--        <!-- Update Product with Option Value DropDown 1-->
--
--        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
--        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="checkAddOption1"/>
--        <waitForPageLoad time="10" stepKey="waitForPageLoad7"/>
--        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle('New Option')}}" userInput="Custom Options 1" stepKey="fillOptionTitle1"/>
--        <click selector="{{AdminProductCustomizableOptionsSection.checkSelect('Custom Options 1')}}" stepKey="clickSelect1"/>
--        <click selector="{{AdminProductCustomizableOptionsSection.checkDropDown('Custom Options 1')}}" stepKey="clickDropDown1"/>
--        <click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Custom Options 1')}}" stepKey="clickAddValue1"/>
--        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Custom Options 1', '0')}}" userInput="option1" stepKey="fillOptionValueTitle1"/>
--        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Custom Options 1', '0')}}" userInput="5" stepKey="fillOptionValuePrice1"/>
--
--        <!-- Update Product with Option Value 1 DropDown 1-->
--
--        <click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Custom Options 1')}}" stepKey="clickAddValue2"/>
--        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Custom Options 1', '1')}}" userInput="option2" stepKey="fillOptionValueTitle2"/>
--        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Custom Options 1', '1')}}" userInput="50" stepKey="fillOptionValuePrice2"/>
--        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType('Custom Options 1', '1')}}" userInput="percent" stepKey="clickSelectPriceType"/>
--        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton1"/>
--
--        <!-- Switcher to Store FR-->
--
--        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher"/>
--        <click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView"/>
--        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage"/>
--
--        <!-- Open tab Customizable Options -->
--
--        <waitForPageLoad time="10" stepKey="waitForPageLoad2"/>
--        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses3"/>
--
--        <!-- Update Option Customizable Options and Option Value 1-->
--
--        <waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
--        <uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitle}}" stepKey="uncheckUseDefaultOptionTitle"/>
--        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle('Custom Options 1')}}" userInput="FR Custom Options 1" stepKey="fillOptionTitle2"/>
--        <uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('0')}}" stepKey="uncheckUseDefaultOptionValueTitle1"/>
--        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('FR Custom Options 1', '0')}}" userInput="FR option1" stepKey="fillOptionValueTitle3"/>
--
--        <!-- Update Product with Option Value 1 DropDown 1-->
--
--        <click selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="clickHiddenRequireMessage"/>
--        <uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="uncheckUseDefaultOptionValueTitle2"/>
--        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('FR Custom Options 1', '1')}}" userInput="FR option2" stepKey="fillOptionValueTitle4"/>
--        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
--
--        <!-- Login Customer Storefront -->
--
--        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
--        <waitForPageLoad stepKey="waitForSignInPage"/>
--        <fillField  userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
--        <fillField  userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
--        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
--
--        <!-- Go to Product Page -->
--
--        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct1Page"/>
--        <waitForPageLoad stepKey="waitForProductPage"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeproductOptionDropDownOptionTitle1"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option2')}}" stepKey="seeproductOptionDropDownOptionTitle2"/>
--
--        <selectOption userInput="5" selector="{{StorefrontProductInfoMainSection.productOptionSelect('Custom Options 1')}}" stepKey="selectProductOptionDropDown"/>
--
--        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage1">
--            <argument name="productName" value="$$createProduct.name$$"/>
--        </actionGroup>
--
--        <selectOption userInput="50" selector="{{StorefrontProductInfoMainSection.productOptionSelect('Custom Options 1')}}" stepKey="selectProductOptionDropDown1"/>
--
--        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
--            <argument name="productName" value="$$createProduct.name$$"/>
--        </actionGroup>
--
--        <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
--
--        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
--
--        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
--
--        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
--        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
--
--        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCart"/>
--
--        <!-- See Custom options are displayed as option1 -->
--
--        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('105')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('105')}}" visible="false" stepKey="exposeProductOptions"/>
--        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('105')}}" userInput="option1" stepKey="seeProductOptionValueDropdown1Input1"/>
--
--        <!-- See Custom options are displayed as option2 -->
--
--        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions1"/>
--        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="option2" stepKey="seeProductOptionValueDropdown1Input2"/>
--        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
--
--        <!-- Place Order -->
--
--        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
--        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
--
--        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
--
--        <!-- Open Order -->
--
--        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
--        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
--        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
--        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
--        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
--        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
--
--        <!-- Checking the correctness of displayed custom options for user parameters on Order -->
--
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="option1" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="option2" stepKey="seeAdminOrderProductOptionValueDropdown2"/>
--
--        <!-- Switch to FR Store View Storefront -->
--
--        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnProduct4Page"/>
--        <waitForPageLoad stepKey="waitForStorefrontHomePage"/>
--        <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher1"/>
--        <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown1"/>
--        <click selector="{{StorefrontHeaderSection.storeViewOption(customStoreFR.code)}}" stepKey="selectStoreView1"/>
--        <waitForPageLoad stepKey="waitForPageLoad4"/>
--
--        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page"/>
--        <waitForPageLoad stepKey="waitForProductPage2"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDownTitle"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option1')}}" stepKey="productFrOptionDropDownOptionTitle1"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option2')}}" stepKey="productFrOptionDropDownOptionTitle2"/>
--
--        <selectOption userInput="5" selector="{{StorefrontProductInfoMainSection.productOptionSelect('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDown"/>
--
--        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage2">
--            <argument name="productName" value="$$createProduct.name$$"/>
--        </actionGroup>
--
--        <selectOption userInput="50" selector="{{StorefrontProductInfoMainSection.productOptionSelect('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDown1"/>
--
--        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage3">
--            <argument name="productName" value="$$createProduct.name$$"/>
--        </actionGroup>
--
--        <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
--
--        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart1" />
--
--        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart1"/>
--
--        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem1"/>
--        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive1"/>
--
--        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCar1t"/>
--
--        <!-- See Custom options are displayed as option1 -->
--
--        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('105')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('105')}}" visible="false" stepKey="exposeProductOptions2"/>
--        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('105')}}" userInput="FR option1" stepKey="seeProductFrOptionValueDropdown1Input2"/>
--
--        <!-- See Custom options are displayed as option2 -->
--
--        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions3"/>
--        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="FR option2" stepKey="seeProductFrOptionValueDropdown1Input3"/>
--        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext1"/>
--
--        <!-- Place Order -->
--
--        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton1"/>
--        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
--
--        <!-- Open Product Grid, Filter product and open -->
--
--        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage1"/>
--        <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
--
--        <actionGroup ref="filterProductGridBySku" stepKey="filterGroupedProductOptions1">
--            <argument name="product" value="_defaultProduct"/>
--        </actionGroup>
--        <click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit1"/>
--        <waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
--
--        <!-- Switcher to Store FR-->
--
--        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher1"/>
--        <click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView1"/>
--        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage1"/>
--
--        <!-- Open tab Customizable Options -->
--
--        <waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
--        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses4" />
--
--        <!-- Update Option Customizable Options and Option Value 1-->
--
--        <waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
--        <checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitle}}" stepKey="checkUseDefaultOptionTitle"/>
--        <checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('0')}}" stepKey="checkUseDefaultOptionValueTitle1"/>
--
--        <!-- Update Product with Option Value 1 DropDown 1-->
--
--        <waitForPageLoad time="30" stepKey="waitForPageLoad11"/>
--        <checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="checkUseDefaultOptionValueTitle2"/>
--        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton3"/>
--
--        <!--Go to Product Page-->
--
--        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page2"/>
--        <waitForPageLoad stepKey="waitForProductPage3"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle1"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeProductOptionDropDownOptionTitle3"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option2')}}" stepKey="seeProductOptionDropDownOptionTitle4"/>
--    </test>
--</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
-new file mode 100644
-index 00000000000..a0670bdee54
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
-@@ -0,0 +1,317 @@
-+<?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="StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Custom options different storeviews"/>
-+            <title value="Admin should be able to sell products with different variants of their own"/>
-+            <description value="Admin should be able to sell products with different variants of their own"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16476"/>
-+            <group value="product"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Create Customer -->
-+
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+            <!--Create Simple Product -->
-+
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">100</field>
-+            </createData>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+
-+            <!--Create storeView 1-->
-+
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView1">
-+                <argument name="customStore" value="customStoreEN"/>
-+            </actionGroup>
-+
-+            <!--Create storeView 2-->
-+
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView2">
-+                <argument name="customStore" value="customStoreFR"/>
-+            </actionGroup>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Delete Store View EN -->
-+
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView1">
-+                <argument name="customStore" value="customStoreEN"/>
-+            </actionGroup>
-+
-+            <!-- Delete Store View FR -->
-+
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView2">
-+                <argument name="customStore" value="customStoreFR"/>
-+            </actionGroup>
-+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearWebsitesGridFilters"/>
-+
-+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilter"/>
-+
-+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
-+        </after>
-+
-+        <!-- Open Product Grid, Filter product and open -->
-+
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
-+
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductPage">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Update Product with Option Value DropDown 1-->
-+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="checkAddOption1"/>
-+        <waitForPageLoad time="10" stepKey="waitForPageLoad3"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle('New Option')}}" userInput="Custom Options 1" stepKey="fillOptionTitle1"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.checkSelect('Custom Options 1')}}" stepKey="clickSelect1"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.checkDropDown('Custom Options 1')}}" stepKey="clickDropDown1"/>
-+        <click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Custom Options 1')}}" stepKey="clickAddValue1"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Custom Options 1', '0')}}" userInput="option1" stepKey="fillOptionValueTitle1"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Custom Options 1', '0')}}" userInput="5" stepKey="fillOptionValuePrice1"/>
-+
-+        <!-- Update Product with Option Value 1 DropDown 1-->
-+
-+        <click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Custom Options 1')}}" stepKey="clickAddValue2"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Custom Options 1', '1')}}" userInput="option2" stepKey="fillOptionValueTitle2"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Custom Options 1', '1')}}" userInput="50" stepKey="fillOptionValuePrice2"/>
-+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType('Custom Options 1', '1')}}" userInput="percent" stepKey="clickSelectPriceType"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton1"/>
-+
-+        <!-- Switcher to Store FR-->
-+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToStoreFR">
-+            <argument name="storeView" value="customStoreFR.name"/>
-+        </actionGroup>
-+
-+        <!-- Open tab Customizable Options -->
-+
-+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses3"/>
-+
-+        <!-- Update Option Customizable Options and Option Value 1-->
-+
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
-+        <uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitle}}" stepKey="uncheckUseDefaultOptionTitle"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle('Custom Options 1')}}" userInput="FR Custom Options 1" stepKey="fillOptionTitle2"/>
-+        <uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('0')}}" stepKey="uncheckUseDefaultOptionValueTitle1"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('FR Custom Options 1', '0')}}" userInput="FR option1" stepKey="fillOptionValueTitle3"/>
-+
-+        <!-- Update Product with Option Value 1 DropDown 1-->
-+
-+        <click selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="clickHiddenRequireMessage"/>
-+        <uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="uncheckUseDefaultOptionValueTitle2"/>
-+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('FR Custom Options 1', '1')}}" userInput="FR option2" stepKey="fillOptionValueTitle4"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
-+
-+        <!-- Login Customer Storefront -->
-+
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
-+            <argument name="Customer" value="$$createCustomer$$" />
-+        </actionGroup>
-+
-+        <!-- Go to Product Page -->
-+
-+        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct1Page"/>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
-+
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeproductOptionDropDownOptionTitle1"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option2')}}" stepKey="seeproductOptionDropDownOptionTitle2"/>
-+
-+        <selectOption userInput="5" selector="{{StorefrontProductInfoMainSection.productOptionSelect('Custom Options 1')}}" stepKey="selectProductOptionDropDown"/>
-+
-+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage1">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+        </actionGroup>
-+
-+        <selectOption userInput="50" selector="{{StorefrontProductInfoMainSection.productOptionSelect('Custom Options 1')}}" stepKey="selectProductOptionDropDown1"/>
-+
-+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
-+
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
-+
-+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
-+
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
-+        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
-+
-+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCart"/>
-+
-+        <!-- See Custom options are displayed as option1 -->
-+
-+        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('105')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('105')}}" visible="false" stepKey="exposeProductOptions"/>
-+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('105')}}" userInput="option1" stepKey="seeProductOptionValueDropdown1Input1"/>
-+
-+        <!-- See Custom options are displayed as option2 -->
-+
-+        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions1"/>
-+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="option2" stepKey="seeProductOptionValueDropdown1Input2"/>
-+
-+        <!-- Place Order -->
-+
-+        <!--Select shipping method-->
-+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-+        <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
-+        <!--Select payment method-->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
-+        <!-- Place Order -->
-+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceOrder">
-+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
-+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
-+        </actionGroup>
-+
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
-+
-+        <!-- Open Order -->
-+
-+        <actionGroup ref="filterOrderGridById" stepKey="openOrdersGrid">
-+            <argument name="orderId" value="{$grabOrderNumber}"/>
-+        </actionGroup>
-+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
-+
-+        <!-- Checking the correctness of displayed custom options for user parameters on Order -->
-+
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="option1" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="option2" stepKey="seeAdminOrderProductOptionValueDropdown2"/>
-+
-+        <!-- Switch to FR Store View Storefront -->
-+
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnProduct4Page"/>
-+
-+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchStore">
-+            <argument name="storeView" value="customStoreFR"/>
-+        </actionGroup>
-+
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProduct2Page"/>
-+
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDownTitle"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option1')}}" stepKey="productFrOptionDropDownOptionTitle1"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option2')}}" stepKey="productFrOptionDropDownOptionTitle2"/>
-+
-+        <selectOption userInput="5" selector="{{StorefrontProductInfoMainSection.productOptionSelect('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDown"/>
-+
-+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage2">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+        </actionGroup>
-+
-+        <selectOption userInput="50" selector="{{StorefrontProductInfoMainSection.productOptionSelect('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDown1"/>
-+
-+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage3">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
-+
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart1" />
-+
-+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart1"/>
-+
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem1"/>
-+        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive1"/>
-+
-+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCar1t"/>
-+
-+        <!-- See Custom options are displayed as option1 -->
-+
-+        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('105')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('105')}}" visible="false" stepKey="exposeProductOptions2"/>
-+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('105')}}" userInput="FR option1" stepKey="seeProductFrOptionValueDropdown1Input2"/>
-+
-+        <!-- See Custom options are displayed as option2 -->
-+
-+        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions3"/>
-+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="FR option2" stepKey="seeProductFrOptionValueDropdown1Input3"/>
-+
-+        <!-- Place Order -->
-+
-+        <!--Select shipping method-->
-+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod2"/>
-+        <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton2"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext2"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext2"/>
-+
-+        <!--Select payment method-->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod2"/>
-+        <!-- Place Order -->
-+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceOrder2">
-+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
-+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
-+        </actionGroup>
-+
-+        <!-- Open Product Grid, Filter product and open -->
-+
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage1"/>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad15"/>
-+
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions1">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+
-+        <click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit1"/>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad16"/>
-+
-+        <!-- Switcher to Store FR-->
-+
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
-+        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher1"/>
-+        <click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView1"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage1"/>
-+
-+        <!-- Open tab Customizable Options -->
-+
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad17"/>
-+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses4" />
-+
-+        <!-- Update Option Customizable Options and Option Value 1-->
-+
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad18"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitle}}" stepKey="checkUseDefaultOptionTitle"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('0')}}" stepKey="checkUseDefaultOptionValueTitle1"/>
-+
-+        <!-- Update Product with Option Value 1 DropDown 1-->
-+
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad19"/>
-+        <checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="checkUseDefaultOptionValueTitle2"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton3"/>
-+
-+        <!--Go to Product Page-->
-+
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProduct2Page2"/>
-+
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle1"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeProductOptionDropDownOptionTitle3"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option2')}}" stepKey="seeProductOptionDropDownOptionTitle4"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
-deleted file mode 100644
-index 6e43753220d..00000000000
---- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
-+++ /dev/null
-@@ -1,178 +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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
--    <test name="StorefrontPurchaseProductWithCustomOptions">
--        <annotations>
--            <features value="Catalog"/>
--            <stories value="Purchase a product with Custom Options of different types"/>
--            <title value="Admin should be able to sell products with different variants of their own"/>
--            <description value="Admin should be able to sell products with different variants of their own"/>
--            <severity value="CRITICAL"/>
--            <testCaseId value="MAGETWO-61717"/>
--            <group value="Catalog"/>
--        </annotations>
--        <before>
--            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
--        </before>
--        <after>
--            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
--        </after>
--
--        <!--Create Simple Product with Custom Options-->
--
--        <createData entity="_defaultCategory" stepKey="createCategory"/>
--        <createData entity="_defaultProduct" stepKey="createProduct">
--            <requiredEntity createDataKey="createCategory"/>
--            <field key="price">17</field>
--        </createData>
--        <updateData createDataKey="createProduct" entity="productWithOptions" stepKey="updateProductWithOption"/>
--
--        <!-- Login Customer Storeront -->
--
--        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
--        <fillField  userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
--        <fillField userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
--        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
--
--        <!-- Checking the correctness of displayed prices for user parameters -->
--
--        <amOnPage url="{{StorefrontHomePage.url}}$createProduct.custom_attributes[url_key]$.html" stepKey="amOnProduct3Page"/>
--
--        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsPrice(ProductOptionField.title, ProductOptionField.price)}}" stepKey="checkFieldProductOption"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsPrice(ProductOptionArea.title, '1.7')}}" stepKey="checkAreaProductOption"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsDropDown(ProductOptionDropDown.title, ProductOptionValueDropdown1.price)}}" stepKey="checkDropDownProductOption"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsRadioButtons(ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.price)}}" stepKey="checkButtonsProductOption"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsCheckbox(ProductOptionCheckbox.title, '20.91')}}" stepKey="checkCheckboxProductOptiozn"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsMultiselect(ProductOptionMultiSelect.title, ProductOptionValueMultiSelect1.price)}}" stepKey="checkMultiSelectProductOption"/>
--        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsData(ProductOptionDate.title, ProductOptionDate.price)}}" stepKey="checkDataProductOption"/>
--
--        <!-- Adding items to the checkout -->
--
--        <fillField userInput="OptionField" selector="{{StorefrontProductInfoMainSection.productOptionFieldInput(ProductOptionField.title)}}" stepKey="fillProductOptionInputField"/>
--        <fillField userInput="OptionArea" selector="{{StorefrontProductInfoMainSection.productOptionAreaInput(ProductOptionArea.title)}}" stepKey="fillProductOptionInputArea"/>
--        <attachFile userInput="{{productWithOptions.file}}" selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" stepKey="fillUploadFile"/>
--        <selectOption userInput="{{ProductOptionValueDropdown1.price}}" selector="{{StorefrontProductInfoMainSection.productOptionSelect(ProductOptionDropDown.title)}}" stepKey="seeProductOptionDropDown"/>
--        <checkOption selector="{{StorefrontProductInfoMainSection.productOptionRadioButtonsCheckbox(ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.price)}}" stepKey="seeProductOptionRadioButtons"/>
--        <checkOption selector="{{StorefrontProductInfoMainSection.productOptionRadioButtonsCheckbox(ProductOptionCheckbox.title, '20.91')}}" stepKey="seeProductOptionCheckbox"/>
--        <selectOption userInput="{{ProductOptionValueMultiSelect1.price}}" selector="{{StorefrontProductInfoMainSection.productOptionSelect(ProductOptionMultiSelect.title)}}" stepKey="selectProductOptionMultiSelect"/>
--        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDataMonth(ProductOptionDate.title)}}" stepKey="selectProductOptionDate"/>
--        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDataDay(ProductOptionDate.title)}}" stepKey="selectProductOptionDate1"/>
--        <selectOption userInput="2018" selector="{{StorefrontProductInfoMainSection.productOptionDataYear(ProductOptionDate.title)}}" stepKey="selectProductOptionDate2"/>
--        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeMonth(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeMonth"/>
--        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeDay(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeDay"/>
--        <selectOption userInput="2018" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeYear(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeYear"/>
--        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeHour(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeHour"/>
--        <selectOption userInput="00" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeMinute(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeMinute"/>
--        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionTimeHour(ProductOptionTime.title)}}" stepKey="selectProductOptionTimeHour"/>
--        <selectOption userInput="00" selector="{{StorefrontProductInfoMainSection.productOptionTimeMinute(ProductOptionTime.title)}}" stepKey="selectProductOptionTimeMinute"/>
--
--        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="finalProductPrice"/>
--
--        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
--            <argument name="productName" value="$createProduct.name$"/>
--        </actionGroup>
--
--        <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
--
--        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
--
--        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
--
--        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
--        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
--
--        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$createProduct.name$" stepKey="seeProductInCart"/>
--
--        <conditionalClick selector="{{CheckoutPaymentSection.ProductOptionsByProductItemName($createProduct.name$)}}" dependentSelector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" visible="false" stepKey="exposeProductOptions"/>
--
--        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionField.title}}" stepKey="seeProductOptionFieldInput1"/>
--        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeProductOptionAreaInput1"/>
--        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{productWithOptions.file}}" stepKey="seeProductOptionFileInput1"/>
--        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
--        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeProductOptionValueRadioButtons1Input1"/>
--        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeProductOptionValueCheckboxInput1" />
--        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeproductAttributeOptionsMultiselect1Input1" />
--        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="Jan 1, 2018" stepKey="seeProductOptionDateAndTimeInput" />
--        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="1/1/18, 1:00 AM" stepKey="seeProductOptionDataInput" />
--        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="1:00 AM" stepKey="seeProductOptionTimeInput" />
--
--        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
--
--        <!-- Place Order -->
--
--        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
--        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
--
--        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
--
--        <!-- Login to Admin and open Order -->
--
--        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
--
--        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
--        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
--        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
--        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
--        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
--        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
--
--        <!-- Checking the correctness of displayed custom options for user parameters on Order -->
--
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionField.title}}" stepKey="seeAdminOrderProductOptionField" />
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionArea.title}}" stepKey="seeAdminOrderProductOptionArea"/>
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{productWithOptions.file}}" stepKey="seeAdminOrderProductOptionFile"/>
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeAdminOrderProductOptionValueRadioButton1"/>
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeAdminOrderProductOptionValueCheckbox" />
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeAdminOrderproductAttributeOptionsMultiselect1" />
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, 2018" stepKey="seeAdminOrderProductOptionDateAndTime" />
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/18, 1:00 AM" stepKey="seeAdminOrderProductOptionData" />
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1:00 AM" stepKey="seeAdminOrderProductOptionTime" />
--
--        <!-- Reorder and Checking the correctness of displayed custom options for user parameters on Order and correctness of displayed price Subtotal-->
--
--        <click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
--        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="trySubmitOrder"/>
--
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionField.title}}" stepKey="seeAdminOrderProductOptionField1" />
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionArea.title}}" stepKey="seeAdminOrderProductOptionArea1"/>
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{productWithOptions.file}}" stepKey="seeAdminOrderProductOptionFile1"/>
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeAdminOrderProductOptionValueDropdown11"/>
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeAdminOrderProductOptionValueRadioButton11"/>
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeAdminOrderProductOptionValueCheckbox1" />
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeAdminOrderproductAttributeOptionsMultiselect11" />
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, 2018" stepKey="seeAdminOrderProductOptionDateAndTime1" />
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/18, 1:00 AM" stepKey="seeAdminOrderProductOptionData1" />
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1:00 AM" stepKey="seeAdminOrderProductOptionTime1" />
--
--        <see selector="{{AdminOrderTotalSection.subTotal}}" userInput="{$finalProductPrice}" stepKey="seeOrderSubTotal"/>
--
--        <!-- Go to Customer Order Page and Checking the correctness of displayed custom options for user parameters on Order -->
--
--        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="amOnProduct4Page"/>
--
--        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionField.title, ProductOptionField.title)}}" userInput="{{ProductOptionField.title}}" stepKey="seeStorefontOrderProductOptionField1" />
--        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionArea.title, ProductOptionArea.title)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeStorefontOrderProductOptionArea1"/>
--        <see selector="{{StorefrontCustomerOrderSection.productCustomOptionsFile($createProduct.name$, ProductOptionFile.title, productWithOptions.file)}}" userInput="{{productWithOptions.file}}" stepKey="seeStorefontOrderProductOptionFile1"/>
--        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDropDown.title, ProductOptionValueDropdown1.title)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeStorefontOrderProductOptionValueDropdown11"/>
--        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.title)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeStorefontOrderProductOptionValueRadioButtons11"/>
--        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionCheckbox.title, ProductOptionValueCheckbox.title)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeStorefontOrderProductOptionValueCheckbox1" />
--        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionMultiSelect.title, ProductOptionValueMultiSelect1.title)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeStorefontOrderproductAttributeOptionsMultiselect11" />
--        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDate.title, 'Jan 1, 2018')}}" userInput="Jan 1, 2018" stepKey="seeStorefontOrderProductOptionDateAndTime1" />
--        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDateTime.title, '1/1/18, 1:00 AM')}}" userInput="1/1/18, 1:00 AM" stepKey="seeStorefontOrderProductOptionData1" />
--        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionTime.title, '1:00 AM')}}" userInput="1:00 AM" stepKey="seeStorefontOrderProductOptionTime1" />
--
--        <!-- Delete product and category -->
--
--        <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
--        <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
--
--    </test>
--</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
-new file mode 100644
-index 00000000000..12a465188aa
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
-@@ -0,0 +1,189 @@
-+<?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="StorefrontPurchaseProductWithCustomOptionsTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Purchase a product with Custom Options of different types"/>
-+            <title value="Admin should be able to sell products with custom options of different types"/>
-+            <description value="Admin should be able to sell products with custom options of different types"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16462"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <!--Create Simple Product with Custom Options-->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">17</field>
-+            </createData>
-+            <updateData createDataKey="createProduct" entity="productWithOptions" stepKey="updateProductWithOption"/>
-+            <!-- Logout customer before in case of it logged in from previous test -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <!-- Delete product and category -->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderListingFilters"/>
-+            <actionGroup ref="logout" stepKey="logoutAdmin"/>
-+            <!-- Logout customer -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
-+        </after>
-+
-+        <!-- Login Customer Storefront -->
-+
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomerOnStorefront">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Checking the correctness of displayed prices for user parameters -->
-+
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPage"/>
-+
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsPrice(ProductOptionField.title, ProductOptionField.price)}}" stepKey="checkFieldProductOption"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsPrice(ProductOptionArea.title, '1.7')}}" stepKey="checkAreaProductOption"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsDropDown(ProductOptionDropDown.title, ProductOptionValueDropdown1.price)}}" stepKey="checkDropDownProductOption"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsRadioButtons(ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.price)}}" stepKey="checkButtonsProductOption"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsCheckbox(ProductOptionCheckbox.title, '20.91')}}" stepKey="checkCheckboxProductOptiozn"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsMultiselect(ProductOptionMultiSelect.title, ProductOptionValueMultiSelect1.price)}}" stepKey="checkMultiSelectProductOption"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsData(ProductOptionDate.title, ProductOptionDate.price)}}" stepKey="checkDataProductOption"/>
-+
-+        <!--Generate year-->
-+        <generateDate date="Now" format="Y" stepKey="year"/>
-+        <generateDate date="Now" format="y" stepKey="shortYear"/>
-+
-+        <!-- Adding items to the checkout -->
-+
-+        <fillField userInput="OptionField" selector="{{StorefrontProductInfoMainSection.productOptionFieldInput(ProductOptionField.title)}}" stepKey="fillProductOptionInputField"/>
-+        <fillField userInput="OptionArea" selector="{{StorefrontProductInfoMainSection.productOptionAreaInput(ProductOptionArea.title)}}" stepKey="fillProductOptionInputArea"/>
-+        <attachFile userInput="{{productWithOptions.file}}" selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" stepKey="fillUploadFile"/>
-+        <selectOption userInput="{{ProductOptionValueDropdown1.price}}" selector="{{StorefrontProductInfoMainSection.productOptionSelect(ProductOptionDropDown.title)}}" stepKey="seeProductOptionDropDown"/>
-+        <checkOption selector="{{StorefrontProductInfoMainSection.productOptionRadioButtonsCheckbox(ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.price)}}" stepKey="seeProductOptionRadioButtons"/>
-+        <checkOption selector="{{StorefrontProductInfoMainSection.productOptionRadioButtonsCheckbox(ProductOptionCheckbox.title, '20.91')}}" stepKey="seeProductOptionCheckbox"/>
-+        <selectOption userInput="{{ProductOptionValueMultiSelect1.price}}" selector="{{StorefrontProductInfoMainSection.productOptionSelect(ProductOptionMultiSelect.title)}}" stepKey="selectProductOptionMultiSelect"/>
-+        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDataMonth(ProductOptionDate.title)}}" stepKey="selectProductOptionDate"/>
-+        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDataDay(ProductOptionDate.title)}}" stepKey="selectProductOptionDate1"/>
-+        <selectOption userInput="$year" selector="{{StorefrontProductInfoMainSection.productOptionDataYear(ProductOptionDate.title)}}" stepKey="selectProductOptionDate2"/>
-+        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeMonth(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeMonth"/>
-+        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeDay(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeDay"/>
-+        <selectOption userInput="$year" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeYear(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeYear"/>
-+        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeHour(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeHour"/>
-+        <selectOption userInput="00" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeMinute(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeMinute"/>
-+        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionTimeHour(ProductOptionTime.title)}}" stepKey="selectProductOptionTimeHour"/>
-+        <selectOption userInput="00" selector="{{StorefrontProductInfoMainSection.productOptionTimeMinute(ProductOptionTime.title)}}" stepKey="selectProductOptionTimeMinute"/>
-+
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="finalProductPrice"/>
-+
-+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
-+
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
-+
-+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
-+
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
-+        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
-+
-+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCart"/>
-+
-+        <conditionalClick selector="{{CheckoutPaymentSection.ProductOptionsByProductItemName($$createProduct.name$$)}}" dependentSelector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" visible="false" stepKey="exposeProductOptions"/>
-+
-+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionField.title}}" stepKey="seeProductOptionFieldInput1"/>
-+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeProductOptionAreaInput1"/>
-+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{productWithOptions.file}}" stepKey="seeProductOptionFileInput1"/>
-+        <seeElement selector="{{CheckoutPaymentSection.ProductOptionLinkActiveByProductItemName($$createProduct.name$$, productWithOptions.file)}}" stepKey="seeProductOptionFileInputLink1"/>
-+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
-+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeProductOptionValueRadioButtons1Input1"/>
-+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeProductOptionValueCheckboxInput1" />
-+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeproductAttributeOptionsMultiselect1Input1" />
-+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="Jan 1, $year" stepKey="seeProductOptionDateAndTimeInput" />
-+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeProductOptionDataInput" />
-+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="1:00 AM" stepKey="seeProductOptionTimeInput" />
-+        <!--Select shipping method-->
-+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
-+        <!--Select payment method-->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
-+        <!-- Place Order -->
-+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-+
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
-+
-+        <!-- Login to Admin and open Order -->
-+
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+
-+        <actionGroup ref="filterOrderGridById" stepKey="filterByOrderId">
-+            <argument name="orderId" value="$grabOrderNumber"/>
-+        </actionGroup>
-+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
-+        <waitForPageLoad stepKey="waitForOrderPageOpened"/>
-+
-+        <!-- Checking the correctness of displayed custom options for user parameters on Order -->
-+
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionField.title}}" stepKey="seeAdminOrderProductOptionField" />
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionArea.title}}" stepKey="seeAdminOrderProductOptionArea"/>
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{productWithOptions.file}}" stepKey="seeAdminOrderProductOptionFile"/>
-+        <seeElement selector="{{AdminOrderItemsOrderedSection.productNameOptionsLink(productWithOptions.file)}}" stepKey="seeAdminOrderProductOptionFileLink"/>
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeAdminOrderProductOptionValueRadioButton1"/>
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeAdminOrderProductOptionValueCheckbox" />
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeAdminOrderproductAttributeOptionsMultiselect1" />
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, $year" stepKey="seeAdminOrderProductOptionDateAndTime" />
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeAdminOrderProductOptionData" />
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1:00 AM" stepKey="seeAdminOrderProductOptionTime" />
-+
-+        <!-- Reorder and Checking the correctness of displayed custom options for user parameters on Order and correctness of displayed price Subtotal-->
-+
-+        <click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
-+        <actionGroup ref="AdminCheckoutSelectCheckMoneyOrderBillingMethodActionGroup" stepKey="selectBillingMethod"/>
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="trySubmitOrder"/>
-+
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionField.title}}" stepKey="seeAdminOrderProductOptionField1" />
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionArea.title}}" stepKey="seeAdminOrderProductOptionArea1"/>
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{productWithOptions.file}}" stepKey="seeAdminOrderProductOptionFile1"/>
-+        <seeElement selector="{{AdminOrderItemsOrderedSection.productNameOptionsLink(productWithOptions.file)}}" stepKey="seeAdminOrderProductOptionFileLink1"/>
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeAdminOrderProductOptionValueDropdown11"/>
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeAdminOrderProductOptionValueRadioButton11"/>
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeAdminOrderProductOptionValueCheckbox1" />
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeAdminOrderproductAttributeOptionsMultiselect11" />
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, $year" stepKey="seeAdminOrderProductOptionDateAndTime1" />
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeAdminOrderProductOptionData1" />
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1:00 AM" stepKey="seeAdminOrderProductOptionTime1" />
-+
-+        <see selector="{{AdminOrderTotalSection.subTotal}}" userInput="{$finalProductPrice}" stepKey="seeOrderSubTotal"/>
-+
-+        <!-- Go to Customer Order Page and Checking the correctness of displayed custom options for user parameters on Order -->
-+
-+        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="amOnOrderPage"/>
-+
-+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionField.title, ProductOptionField.title)}}" userInput="{{ProductOptionField.title}}" stepKey="seeStorefontOrderProductOptionField1" />
-+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionArea.title, ProductOptionArea.title)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeStorefontOrderProductOptionArea1"/>
-+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptionsFile($$createProduct.name$$, ProductOptionFile.title, productWithOptions.file)}}" userInput="{{productWithOptions.file}}" stepKey="seeStorefontOrderProductOptionFile1"/>
-+        <seeElement selector="{{StorefrontCustomerOrderSection.productCustomOptionsLink($createProduct.name$, ProductOptionFile.title, productWithOptions.file)}}" stepKey="seeStorefontOrderProductOptionFileLink1"/>
-+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionDropDown.title, ProductOptionValueDropdown1.title)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeStorefontOrderProductOptionValueDropdown11"/>
-+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.title)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeStorefontOrderProductOptionValueRadioButtons11"/>
-+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionCheckbox.title, ProductOptionValueCheckbox.title)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeStorefontOrderProductOptionValueCheckbox1" />
-+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionMultiSelect.title, ProductOptionValueMultiSelect1.title)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeStorefontOrderproductAttributeOptionsMultiselect11" />
-+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionDate.title, 'Jan 1, $year')}}" userInput="Jan 1, $year" stepKey="seeStorefontOrderProductOptionDateAndTime1" />
-+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionDateTime.title, '1/1/$shortYear, 1:00 AM')}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeStorefontOrderProductOptionData1" />
-+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionTime.title, '1:00 AM')}}" userInput="1:00 AM" stepKey="seeStorefontOrderProductOptionTime1" />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
-index 9e0f80eb9ea..294dcb8c1b8 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
-@@ -7,16 +7,16 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle">
-         <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Custom options"/>
-             <group value="Catalog"/>
-             <title value="Admin should be able to see the full title of the selected custom option value in the order"/>
-             <description value="Admin should be able to see the full title of the selected custom option value in the order"/>
-             <severity value="MAJOR"/>
-             <testCaseId value="MC-3043"/>
--            <group value="skip"/>
--            <!-- Skip due to MQE-1128 -->
-         </annotations>
-         <before>
-             <!--Create Simple Product with Custom Options-->
-@@ -33,6 +33,8 @@
-             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-         </after>
- 
-         <!-- Login Customer Storefront -->
-@@ -71,11 +73,20 @@
- 
-         <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
- 
-+        <!--Select shipping method-->
-+
-+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-         <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
-+
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
- 
-         <!-- Place Order -->
- 
--        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
-+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
- 
-         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
-@@ -86,10 +97,12 @@
- 
-         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
-+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
-         <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
-         <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
-         <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-+        <waitForPageLoad stepKey="waitForOrderPageToLoad"/>
- 
-         <!-- Checking the correctness of displayed custom options for user parameters on Order -->
- 
-@@ -101,6 +114,6 @@
-         </assertEquals>
-         <moveMouseOver selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd" stepKey="hoverProduct"/>
-         <waitForElementVisible selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd:nth-child(2)" stepKey="waitForCustomOptionValueFullName"/>
--        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
-+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj111 11Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
-     </test>
- </tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml
-new file mode 100644
-index 00000000000..0ed61b8636c
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml
-@@ -0,0 +1,68 @@
-+<?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="StorefrontRememberCategoryPaginationTest">
-+        <annotations>
-+            <title value="Verify that Number of Products per page retained when visiting a different category"/>
-+            <stories value="MAGETWO-61478: Number of Products displayed per page not retained when visiting a different category"/>
-+            <description value="Verify that Number of Products per page retained when visiting a different category"/>
-+            <features value="Catalog"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94210"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="defaultCategory1"/>
-+            <createData entity="SimpleProduct" stepKey="simpleProduct1">
-+                <requiredEntity createDataKey="defaultCategory1"/>
-+            </createData>
-+
-+            <createData entity="_defaultCategory" stepKey="defaultCategory2"/>
-+            <createData entity="SimpleProduct" stepKey="simpleProduct2">
-+                <requiredEntity createDataKey="defaultCategory2"/>
-+            </createData>
-+
-+            <createData entity="RememberPaginationCatalogStorefrontConfig" stepKey="setRememberPaginationCatalogStorefrontConfig"/>
-+        </before>
-+
-+        <actionGroup ref="GoToStorefrontCategoryPageByParameters" stepKey="GoToStorefrontCategory1Page">
-+            <argument name="category" value="$$defaultCategory1.custom_attributes[url_key]$$"/>
-+            <argument name="mode" value="grid"/>
-+            <argument name="numOfProductsPerPage" value="12"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="VerifyCategoryPageParameters" stepKey="verifyCategory1PageParameters">
-+            <argument name="category" value="$$defaultCategory1$$"/>
-+            <argument name="mode" value="grid"/>
-+            <argument name="numOfProductsPerPage" value="12"/>
-+        </actionGroup>
-+
-+        <amOnPage url="{{StorefrontCategoryPage.url($$defaultCategory2.name$$)}}" stepKey="navigateToCategory2Page"/>
-+        <waitForPageLoad stepKey="waitForCategory2PageToLoad"/>
-+
-+        <actionGroup ref="VerifyCategoryPageParameters" stepKey="verifyCategory2PageParameters">
-+            <argument name="category" value="$$defaultCategory2$$"/>
-+            <argument name="mode" value="grid"/>
-+            <argument name="numOfProductsPerPage" value="12"/>
-+        </actionGroup>
-+
-+        <after>
-+            <createData entity="DefaultCatalogStorefrontConfiguration" stepKey="setDefaultCatalogStorefrontConfiguration"/>
-+
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="defaultCategory1" stepKey="deleteCategory1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="defaultCategory2" stepKey="deleteCategory2"/>
-+
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml
-new file mode 100644
-index 00000000000..514e12bb355
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml
-@@ -0,0 +1,95 @@
-+<?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="StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Special price"/>
-+            <title value="Check that special price displayed when 'default config' scope timezone does not match 'website' scope timezone"/>
-+            <description value="Check that special price displayed when 'default config' scope timezone does not match 'website' scope timezone"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-97508"/>
-+            <useCaseId value="MAGETWO-96847"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+
-+            <!--Create product-->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+
-+            <!--Create customer-->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <!--Delete create data-->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Set timezone for default config-->
-+        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfig"/>
-+        <waitForPageLoad stepKey="waitForConfigPage"/>
-+        <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSection"/>
-+        <grabValueFrom selector="{{LocaleOptionsSection.timezone}}" stepKey="originalTimezone"/>
-+        <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="Central European Standard Time (Europe/Paris)" stepKey="setTimezone"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfig"/>
-+
-+        <!--Set timezone for Main Website-->
-+        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfig1"/>
-+        <waitForPageLoad stepKey="waitForConfigPage1"/>
-+        <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreViewActionGroup">
-+            <argument name="website" value="_defaultWebsite"/>
-+        </actionGroup>
-+        <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSection1"/>
-+        <uncheckOption selector="{{LocaleOptionsSection.useDefault}}"  stepKey="uncheckUseDefault"/>
-+        <grabValueFrom selector="{{LocaleOptionsSection.timezone}}" stepKey="originalTimezone1"/>
-+        <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="Greenwich Mean Time (Africa/Abidjan)" stepKey="setTimezone1"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfig1"/>
-+
-+        <!--Set special price to created product-->
-+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="openAdminEditPage"/>
-+        <actionGroup ref="AddSpecialPriceToProductActionGroup" stepKey="setSpecialPriceToCreatedProduct">
-+            <argument name="price" value="15"/>
-+        </actionGroup>
-+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
-+
-+        <!--Login to storefront from customer and check price-->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="logInFromCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Go to the product page and check special price-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.specialPriceValue}}" stepKey="grabSpecialPrice"/>
-+        <assertEquals expected='$15.00' expectedType="string" actual="$grabSpecialPrice" stepKey="assertSpecialPrice"/>
-+
-+        <!--Reset timezone-->
-+        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfigReset"/>
-+        <waitForPageLoad stepKey="waitForConfigPageReset"/>
-+        <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSectionReset"/>
-+        <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="$originalTimezone" stepKey="resetTimezone"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigReset"/>
-+
-+        <!--Reset timezone-->
-+        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfigReset1"/>
-+        <waitForPageLoad stepKey="waitForConfigPageReset1"/>
-+        <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreViewActionGroup1">
-+            <argument name="website" value="_defaultWebsite"/>
-+        </actionGroup>
-+        <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSectionReset1"/>
-+        <uncheckOption selector="{{LocaleOptionsSection.useDefault}}"  stepKey="uncheckUseDefault1"/>
-+        <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="$originalTimezone" stepKey="resetTimezone1"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigReset1"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
-new file mode 100644
-index 00000000000..4d7c97b2645
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
-@@ -0,0 +1,87 @@
-+<?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="TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Tiered pricing and quantity increments work with decimal inventory"/>
-+            <title value="Tiered pricing and quantity increments work with decimal inventory"/>
-+            <description value="Tiered pricing and quantity increments work with decimal inventory"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-93973"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createPreReqSimpleProduct">
-+                <requiredEntity createDataKey="createPreReqCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
-+            <deleteData createDataKey="createPreReqSimpleProduct" stepKey="deletePreReqSimpleProduct"/>
-+        </after>
-+        <!--Step1. Login as admin. Go to Catalog > Products page. Filtering *prod1*. Open *prod1* to edit-->
-+        <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin" />
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions">
-+            <argument name="product" value="SimpleProduct"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridSection.productGridNameProduct('$$createPreReqSimpleProduct.name$$')}}"
-+               stepKey="clickOpenProductForEdit"/>
-+        <waitForPageLoad time="30" stepKey="waitForProductEditOpen"/>
-+        <!--Step2. Open *Advanced Inventory* pop-up (Click on *Advanced Inventory* link). Set *Qty Uses Decimals* to *Yes*. Click on button *Done*  -->
-+        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
-+        <scrollTo selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimals}}" stepKey="scrollToQtyUsesDecimalsDropBox"/>
-+        <click selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimals}}" stepKey="clickOnQtyUsesDecimalsDropBox"/>
-+        <click selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimalsOptions('1')}}" stepKey="chooseYesOnQtyUsesDecimalsDropBox"/>
-+        <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}" stepKey="clickOnDoneButton"/>
-+        <!--Step3. Open *Advanced Pricing* pop-up (Click on *Advanced Pricing* link). Click on *Add* button. Fill *0.5* in *Quantity*-->
-+        <scrollTo selector="{{AdminProductFormSection.productName}}" stepKey="scrollToProductName"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingLink1"/>
-+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForAddButton"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickOnCustomerGroupPriceAddButton"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="0.5" stepKey="fillProductTierPriceQty"/>
-+        <!--Step4. Close *Advanced Pricing* (Click on button *Done*). Save *prod1* (Click on button *Save*)-->
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickOnDoneButton2"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton"/>
-+
-+        <!--The code should be uncommented after fix MAGETWO-96016-->
-+        <!--<click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingLink2"/>-->
-+        <!--<seeInField userInput="0.5" selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" stepKey="seeInField1"/>-->
-+        <!--<click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickOnCloseButton"/>-->
-+
-+        <!--Step5. Open *Advanced Inventory* pop-up. Set *Enable Qty Increments* to *Yes*. Fill *.5* in *Qty Increments*-->
-+        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink2"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <scrollTo selector="{{AdminProductFormAdvancedInventorySection.enableQtyIncrements}}" stepKey="scrollToEnableQtyIncrements"/>
-+        <click selector="{{AdminProductFormAdvancedInventorySection.enableQtyIncrementsUseConfigSettings}}" stepKey="clickOnEnableQtyIncrementsUseConfigSettingsCheckbox"/>
-+        <click selector="{{AdminProductFormAdvancedInventorySection.enableQtyIncrements}}" stepKey="clickOnEnableQtyIncrements"/>
-+        <click selector="{{AdminProductFormAdvancedInventorySection.enableQtyIncrementsOptions(('1'))}}" stepKey="chooseYesOnEnableQtyIncrements"/>
-+        <scrollTo selector="{{AdminProductFormAdvancedInventorySection.qtyIncrementsUseConfigSettings}}" stepKey="scrollToQtyIncrementsUseConfigSettings"/>
-+        <click selector="{{AdminProductFormAdvancedInventorySection.qtyIncrementsUseConfigSettings}}" stepKey="clickOnQtyIncrementsUseConfigSettings"/>
-+        <scrollTo selector="{{AdminProductFormAdvancedInventorySection.qtyIncrements}}" stepKey="scrollToQtyIncrements"/>
-+        <fillField selector="{{AdminProductFormAdvancedInventorySection.qtyIncrements}}" userInput=".5" stepKey="fillQtyIncrements"/>
-+        <!--Step6. Close *Advanced Inventory* (Click on button *Done*). Save *prod1* (Click on button *Save*) -->
-+        <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}" stepKey="clickOnDoneButton3"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
-+        <!--Step7. Open *Customer view* (Go to *Store Front*). Open *prod1* page (Find via search and click on product name) -->
-+        <amOnPage url="{{StorefrontHomePage.url}}$$createPreReqSimpleProduct.custom_attributes[url_key]$$.html" stepKey="amOnProductPage"/>
-+        <!--Step8. Fill *1.5* in *Qty*. Click on button *Add to Cart*-->
-+        <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="1.5" stepKey="fillQty"/>
-+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="clickOnAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" time="30" stepKey="waitForProductAdded"/>
-+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createPreReqSimpleProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
-+        <!--Step9. Click on *Cart* icon. Click on *View and Edit Cart* link. Change *Qty* value to *5.5*-->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName(('$$createPreReqSimpleProduct.name$$'))}}" userInput="5.5" stepKey="fillQty2"/>
-+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickOnUpdateShoppingCartButton"/>
-+        <seeInField userInput="5.5" selector="{{CheckoutCartProductSection.ProductQuantityByName(('$$createPreReqSimpleProduct.name$$'))}}" stepKey="seeInField2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml
-index 51290ba12f2..455e9b58156 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml
-@@ -7,10 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="VerifyChildCategoriesShouldNotIncludeInMenuTest">
-         <annotations>
-             <features value="Catalog"/>
-+            <stories value="Create categories"/>
-             <title value="Customer should not see categories that are not included in the menu"/>
-             <description value="Customer should not see categories that are not included in the menu"/>
-             <severity value="CRITICAL"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
-index 234148830bd..53bcac5b1d5 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="VerifyDefaultWYSIWYGToolbarOnProductTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
-index 5fc0b6478ff..aad83cd0c2a 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest">
-         <annotations>
-             <features value="Catalog"/>
-diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
-index e2077f86767..29ed3af4f01 100644
---- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
-+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest">
-         <annotations>
-             <features value="Catalog"/>
-@@ -32,16 +32,19 @@
-         <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
-         <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitForDescription" />
-         <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="TinyMCE4Description" />
--        <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitForShortDescription" />
--        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.TinyMCE4}}"  stepKey="TinyMCE4ShortDescription" />
-+        <click selector="{{ProductDescriptionWysiwygSection.EditArea}}" stepKey="focusProductDescriptionWysiwyg"/>
-         <executeJS function="tinyMCE.get('product_form_description').setContent('Hello World!');" stepKey="executeJSFillContent1"/>
-+        <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitForShortDescription" />
-+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="TinyMCE4ShortDescription" />
-+        <click selector="{{ProductShortDescriptionWysiwygSection.EditArea}}" stepKey="focusProductShortDescriptionWysiwyg"/>
-         <executeJS function="tinyMCE.get('product_form_short_description').setContent('Hello World! Short Content');" stepKey="executeJSFillContent2"/>
-+        <scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.showHideBtn}}" y="-150" x="0" stepKey="scrollToDesShowHideBtn1" />
-         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.showHideBtn}}" stepKey="clickShowHideBtn1" />
-         <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" stepKey="waitForInsertImage1" />
-         <see selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" userInput="Insert Image..." stepKey="seeInsertImage1"/>
-         <dontSee selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="insertWidget1" />
-         <dontSee selector="{{TinyMCESection.InsertVariableBtn}}" stepKey="insertVariable1" />
--        <scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.showHideBtn}}" stepKey="scrollToDesShowHideBtn" />
-+        <scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.showHideBtn}}" stepKey="scrollToDesShowHideBtn2" />
-         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.showHideBtn}}" stepKey="clickShowHideBtn2" />
-         <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" stepKey="waitForInsertImage2" />
-         <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" userInput="Insert Image..." stepKey="seeInsertImage2"/>
-diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
-index 19c578e976c..2008d0b9414 100644
---- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
-@@ -85,7 +85,7 @@ class InventoryTest extends \PHPUnit\Framework\TestCase
-         $this->backordersMock = $this->createMock(\Magento\CatalogInventory\Model\Source\Backorders::class);
-         $this->stockMock = $this->createMock(\Magento\CatalogInventory\Model\Source\Stock::class);
-         $this->coreRegistryMock = $this->createMock(\Magento\Framework\Registry::class);
--        $this->moduleManager = $this->createMock(\Magento\Framework\Module\Manager::class);
-+        $this->moduleManager = $this->createMock(\Magento\Framework\Module\ModuleManagerInterface::class);
-         $this->storeManagerMock = $this->getMockForAbstractClass(
-             \Magento\Store\Model\StoreManagerInterface::class,
-             [],
-diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
-index 804eef25ebd..9a2199859a1 100644
---- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
-@@ -6,9 +6,14 @@
- namespace Magento\Catalog\Test\Unit\Block\Adminhtml\Product\Helper\Form\Gallery;
- 
- use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content;
--use Magento\Framework\Filesystem;
-+use Magento\Catalog\Model\Entity\Attribute;
-+use Magento\Catalog\Model\Product;
- use Magento\Framework\Phrase;
-+use Magento\MediaStorage\Helper\File\Storage\Database;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class ContentTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -46,6 +51,11 @@ class ContentTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $imageHelper;
- 
-+    /**
-+     * @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $databaseMock;
-+
-     /**
-      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-      */
-@@ -67,13 +77,18 @@ class ContentTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        $this->databaseMock = $this->getMockBuilder(Database::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->content = $this->objectManager->getObject(
-             \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content::class,
-             [
-                 'mediaConfig' => $this->mediaConfigMock,
-                 'jsonEncoder' => $this->jsonEncoderMock,
--                'filesystem' => $this->fileSystemMock
-+                'filesystem' => $this->fileSystemMock,
-+                'fileStorageDatabase' => $this->databaseMock
-             ]
-         );
-     }
-@@ -139,6 +154,13 @@ class ContentTest extends \PHPUnit\Framework\TestCase
-         $this->readMock->expects($this->any())->method('stat')->willReturnMap($sizeMap);
-         $this->jsonEncoderMock->expects($this->once())->method('encode')->willReturnCallback('json_encode');
- 
-+        $this->readMock->expects($this->any())
-+            ->method('isFile')
-+            ->will($this->returnValue(true));
-+        $this->databaseMock->expects($this->any())
-+            ->method('checkDbUsage')
-+            ->will($this->returnValue(false));
-+
-         $this->assertSame(json_encode($imagesResult), $this->content->getImagesJson());
-     }
- 
-@@ -206,6 +228,14 @@ class ContentTest extends \PHPUnit\Framework\TestCase
-         $this->fileSystemMock->expects($this->any())->method('getDirectoryRead')->willReturn($this->readMock);
-         $this->mediaConfigMock->expects($this->any())->method('getMediaUrl');
-         $this->mediaConfigMock->expects($this->any())->method('getMediaPath');
-+
-+        $this->readMock->expects($this->any())
-+            ->method('isFile')
-+            ->will($this->returnValue(true));
-+        $this->databaseMock->expects($this->any())
-+            ->method('checkDbUsage')
-+            ->will($this->returnValue(false));
-+
-         $this->readMock->expects($this->any())->method('stat')->willReturnOnConsecutiveCalls(
-             $this->throwException(
-                 new \Magento\Framework\Exception\FileSystemException(new Phrase('test'))
-@@ -219,4 +249,194 @@ class ContentTest extends \PHPUnit\Framework\TestCase
- 
-         $this->assertSame(json_encode($imagesResult), $this->content->getImagesJson());
-     }
-+
-+    /**
-+     * Test GetImageTypes() will return value for given attribute from data persistor.
-+     *
-+     * @return void
-+     */
-+    public function testGetImageTypesFromDataPersistor()
-+    {
-+        $attributeCode = 'thumbnail';
-+        $value = 'testImageValue';
-+        $scopeLabel = 'testScopeLabel';
-+        $label = 'testLabel';
-+        $name = 'testName';
-+        $expectedTypes = [
-+            $attributeCode => [
-+                'code' => $attributeCode,
-+                'value' => $value,
-+                'label' => $label,
-+                'name' => $name,
-+            ],
-+        ];
-+        $product = $this->getMockBuilder(Product::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $product->expects($this->once())
-+            ->method('getData')
-+            ->with($this->identicalTo($attributeCode))
-+            ->willReturn(null);
-+        $mediaAttribute = $this->getMediaAttribute($label, $attributeCode);
-+        $product->expects($this->once())
-+            ->method('getMediaAttributes')
-+            ->willReturn([$mediaAttribute]);
-+        $this->galleryMock->expects($this->exactly(2))
-+            ->method('getDataObject')
-+            ->willReturn($product);
-+        $this->galleryMock->expects($this->once())
-+            ->method('getImageValue')
-+            ->with($this->identicalTo($attributeCode))
-+            ->willReturn($value);
-+        $this->galleryMock->expects($this->once())
-+            ->method('getScopeLabel')
-+            ->with($this->identicalTo($mediaAttribute))
-+            ->willReturn($scopeLabel);
-+        $this->galleryMock->expects($this->once())
-+            ->method('getAttributeFieldName')
-+            ->with($this->identicalTo($mediaAttribute))
-+            ->willReturn($name);
-+        $this->getImageTypesAssertions($attributeCode, $scopeLabel, $expectedTypes);
-+    }
-+
-+    /**
-+     * Test GetImageTypes() will return value for given attribute from product.
-+     *
-+     * @return void
-+     */
-+    public function testGetImageTypesFromProduct()
-+    {
-+        $attributeCode = 'thumbnail';
-+        $value = 'testImageValue';
-+        $scopeLabel = 'testScopeLabel';
-+        $label = 'testLabel';
-+        $name = 'testName';
-+        $expectedTypes = [
-+            $attributeCode => [
-+                'code' => $attributeCode,
-+                'value' => $value,
-+                'label' => $label,
-+                'name' => $name,
-+            ],
-+        ];
-+        $product = $this->getMockBuilder(Product::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $product->expects($this->once())
-+            ->method('getData')
-+            ->with($this->identicalTo($attributeCode))
-+            ->willReturn($value);
-+        $mediaAttribute = $this->getMediaAttribute($label, $attributeCode);
-+        $product->expects($this->once())
-+            ->method('getMediaAttributes')
-+            ->willReturn([$mediaAttribute]);
-+        $this->galleryMock->expects($this->exactly(2))
-+            ->method('getDataObject')
-+            ->willReturn($product);
-+        $this->galleryMock->expects($this->never())
-+            ->method('getImageValue');
-+        $this->galleryMock->expects($this->once())
-+            ->method('getScopeLabel')
-+            ->with($this->identicalTo($mediaAttribute))
-+            ->willReturn($scopeLabel);
-+        $this->galleryMock->expects($this->once())
-+            ->method('getAttributeFieldName')
-+            ->with($this->identicalTo($mediaAttribute))
-+            ->willReturn($name);
-+        $this->getImageTypesAssertions($attributeCode, $scopeLabel, $expectedTypes);
-+    }
-+
-+    /**
-+     * Perform assertions.
-+     *
-+     * @param string $attributeCode
-+     * @param string $scopeLabel
-+     * @param array $expectedTypes
-+     * @return void
-+     */
-+    private function getImageTypesAssertions(string $attributeCode, string $scopeLabel, array $expectedTypes)
-+    {
-+        $this->content->setElement($this->galleryMock);
-+        $result = $this->content->getImageTypes();
-+        $scope = $result[$attributeCode]['scope'];
-+        $this->assertSame($scopeLabel, $scope->getText());
-+        unset($result[$attributeCode]['scope']);
-+        $this->assertSame($expectedTypes, $result);
-+    }
-+
-+    /**
-+     * Get media attribute mock.
-+     *
-+     * @param string $label
-+     * @param string $attributeCode
-+     * @return \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private function getMediaAttribute(string $label, string $attributeCode)
-+    {
-+        $frontend = $this->getMockBuilder(Product\Attribute\Frontend\Image::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $frontend->expects($this->once())
-+            ->method('getLabel')
-+            ->willReturn($label);
-+        $mediaAttribute = $this->getMockBuilder(Attribute::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $mediaAttribute->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+        $mediaAttribute->expects($this->once())
-+            ->method('getFrontend')
-+            ->willReturn($frontend);
-+
-+        return $mediaAttribute;
-+    }
-+
-+    /**
-+     * Test GetImagesJson() calls MediaStorage functions to obtain image from DB prior to stat call
-+     *
-+     * @return void
-+     */
-+    public function testGetImagesJsonMediaStorageMode()
-+    {
-+        $images = [
-+            'images' => [
-+                [
-+                    'value_id' => '0',
-+                    'file' => 'file_1.jpg',
-+                    'media_type' => 'image',
-+                    'position' => '0'
-+                ]
-+            ]
-+        ];
-+
-+        $mediaPath = [
-+            ['file_1.jpg', 'catalog/product/image_1.jpg']
-+        ];
-+
-+        $this->content->setElement($this->galleryMock);
-+
-+        $this->galleryMock->expects($this->once())
-+            ->method('getImages')
-+            ->willReturn($images);
-+        $this->fileSystemMock->expects($this->once())
-+            ->method('getDirectoryRead')
-+            ->willReturn($this->readMock);
-+        $this->mediaConfigMock->expects($this->any())
-+            ->method('getMediaPath')
-+            ->willReturnMap($mediaPath);
-+
-+        $this->readMock->expects($this->any())
-+            ->method('isFile')
-+            ->will($this->returnValue(false));
-+        $this->databaseMock->expects($this->any())
-+            ->method('checkDbUsage')
-+            ->will($this->returnValue(true));
-+
-+        $this->databaseMock->expects($this->once())
-+            ->method('saveFileToFilesystem')
-+            ->with('catalog/product/image_1.jpg');
-+
-+        $this->content->getImagesJson();
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/GalleryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/GalleryTest.php
-index 06e2368f308..1e04680676e 100644
---- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/GalleryTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/GalleryTest.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Catalog\Test\Unit\Block\Adminhtml\Product\Helper\Form;
- 
-+use Magento\Framework\App\Request\DataPersistorInterface;
-+
- class GalleryTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -32,18 +34,27 @@ class GalleryTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $objectManager;
- 
-+    /**
-+     * @var DataPersistorInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $dataPersistorMock;
-+
-     public function setUp()
-     {
-         $this->registryMock = $this->createMock(\Magento\Framework\Registry::class);
-         $this->productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getData']);
-         $this->formMock = $this->createMock(\Magento\Framework\Data\Form::class);
--
-+        $this->dataPersistorMock = $this->getMockBuilder(DataPersistorInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['get'])
-+            ->getMockForAbstractClass();
-         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->gallery = $this->objectManager->getObject(
-             \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery::class,
-             [
-                 'registry' => $this->registryMock,
--                'form' => $this->formMock
-+                'form' => $this->formMock,
-+                'dataPersistor' => $this->dataPersistorMock
-             ]
-         );
-     }
-@@ -70,6 +81,68 @@ class GalleryTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($mediaGallery, $this->gallery->getImages());
-     }
- 
-+    /**
-+     * Test getImages() will try get data from data persistor, if it's absent in registry.
-+     *
-+     * @return void
-+     */
-+    public function testGetImagesWithDataPersistor()
-+    {
-+        $product = [
-+            'product' => [
-+                'media_gallery' => [
-+                    'images' => [
-+                        [
-+                            'value_id' => '1',
-+                            'file' => 'image_1.jpg',
-+                            'media_type' => 'image',
-+                        ],
-+                        [
-+                            'value_id' => '2',
-+                            'file' => 'image_2.jpg',
-+                            'media_type' => 'image',
-+                        ],
-+                    ],
-+                ],
-+            ],
-+        ];
-+        $this->registryMock->expects($this->once())->method('registry')->willReturn($this->productMock);
-+        $this->productMock->expects($this->once())->method('getData')->willReturn(null);
-+        $this->dataPersistorMock->expects($this->once())
-+            ->method('get')
-+            ->with($this->identicalTo('catalog_product'))
-+            ->willReturn($product);
-+
-+        $this->assertSame($product['product']['media_gallery'], $this->gallery->getImages());
-+    }
-+
-+    /**
-+     * Test get image value from data persistor in case it's absent in product from registry.
-+     *
-+     * @return void
-+     */
-+    public function testGetImageValue()
-+    {
-+        $product = [
-+            'product' => [
-+                'media_gallery' => [
-+                    'images' => [
-+                        'value_id' => '1',
-+                        'file' => 'image_1.jpg',
-+                        'media_type' => 'image',
-+                    ],
-+                ],
-+                'small' => 'testSmallImage',
-+                'thumbnail' => 'testThumbnail'
-+            ]
-+        ];
-+        $this->dataPersistorMock->expects($this->once())
-+            ->method('get')
-+            ->with($this->identicalTo('catalog_product'))
-+            ->willReturn($product);
-+        $this->assertSame($product['product']['small'], $this->gallery->getImageValue('small'));
-+    }
-+
-     public function testGetDataObject()
-     {
-         $this->registryMock->expects($this->once())->method('registry')->willReturn($this->productMock);
-diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php
-index 1dd866f1fe2..da35d845468 100644
---- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php
-@@ -96,7 +96,12 @@ class NotifyStockTest extends \PHPUnit\Framework\TestCase
-         $this->urlBuilder->expects($this->once())->method('getUrl')
-             ->with('catalog/product/edit', ['id' => 1, '_secure' => true, '_nosecret' => true])
-             ->will($this->returnValue('http://magento.com/catalog/product/edit/id/1'));
--        $this->assertEquals($this->rssFeed, $this->block->getRssData());
-+
-+        $data = $this->block->getRssData();
-+        $this->assertTrue(is_string($data['title']));
-+        $this->assertTrue(is_string($data['description']));
-+        $this->assertTrue(is_string($data['entries'][0]['description']));
-+        $this->assertEquals($this->rssFeed, $data);
-     }
- 
-     public function testGetCacheLifetime()
-diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageFactoryTest.php
-index 8a42865a3fe..95b06e40602 100644
---- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageFactoryTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageFactoryTest.php
-@@ -145,7 +145,8 @@ class ImageFactoryTest extends \PHPUnit\Framework\TestCase
-                     'label' => 'test_image_label',
-                     'ratio' => 1,
-                     'custom_attributes' => '',
--                    'product_id' => null
-+                    'product_id' => null,
-+                    'class' => 'product-image-photo'
-                 ],
-             ],
-         ];
-@@ -190,6 +191,7 @@ class ImageFactoryTest extends \PHPUnit\Framework\TestCase
-                 'custom_attributes' => [
-                     'name_1' => 'value_1',
-                     'name_2' => 'value_2',
-+                    'class' => 'my-class'
-                 ],
-             ],
-             'expected' => [
-@@ -201,7 +203,8 @@ class ImageFactoryTest extends \PHPUnit\Framework\TestCase
-                     'label' => 'test_product_name',
-                     'ratio' => 0.5, // <==
-                     'custom_attributes' => 'name_1="value_1" name_2="value_2"',
--                    'product_id' => null
-+                    'product_id' => null,
-+                    'class' => 'my-class'
-                 ],
-             ],
-         ];
-diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
-index ac963326dbf..884f4c543c8 100644
---- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
-@@ -18,6 +18,11 @@ class ToolbarTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $model;
- 
-+    /**
-+     * @var \Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer | \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $memorizer;
-+
-     /**
-      * @var \Magento\Framework\Url | \PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -62,6 +67,16 @@ class ToolbarTest extends \PHPUnit\Framework\TestCase
-                 'getLimit',
-                 'getCurrentPage'
-             ]);
-+        $this->memorizer = $this->createPartialMock(
-+            \Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer::class,
-+            [
-+                'getDirection',
-+                'getOrder',
-+                'getMode',
-+                'getLimit',
-+                'isMemorizingAllowed'
-+            ]
-+        );
-         $this->layout = $this->createPartialMock(\Magento\Framework\View\Layout::class, ['getChildName', 'getBlock']);
-         $this->pagerBlock = $this->createPartialMock(\Magento\Theme\Block\Html\Pager::class, [
-                 'setUseContainer',
-@@ -116,6 +131,7 @@ class ToolbarTest extends \PHPUnit\Framework\TestCase
-                 'context' => $context,
-                 'catalogConfig' => $this->catalogConfig,
-                 'toolbarModel' => $this->model,
-+                'toolbarMemorizer' => $this->memorizer,
-                 'urlEncoder' => $this->urlEncoder,
-                 'productListHelper' => $this->productListHelper
-             ]
-@@ -155,7 +171,7 @@ class ToolbarTest extends \PHPUnit\Framework\TestCase
-     public function testGetCurrentOrder()
-     {
-         $order = 'price';
--        $this->model->expects($this->once())
-+        $this->memorizer->expects($this->once())
-             ->method('getOrder')
-             ->will($this->returnValue($order));
-         $this->catalogConfig->expects($this->once())
-@@ -169,7 +185,7 @@ class ToolbarTest extends \PHPUnit\Framework\TestCase
-     {
-         $direction = 'desc';
- 
--        $this->model->expects($this->once())
-+        $this->memorizer->expects($this->once())
-             ->method('getDirection')
-             ->will($this->returnValue($direction));
- 
-@@ -183,7 +199,7 @@ class ToolbarTest extends \PHPUnit\Framework\TestCase
-         $this->productListHelper->expects($this->once())
-             ->method('getAvailableViewMode')
-             ->will($this->returnValue(['list' => 'List']));
--        $this->model->expects($this->once())
-+        $this->memorizer->expects($this->once())
-             ->method('getMode')
-             ->will($this->returnValue($mode));
- 
-@@ -232,11 +248,11 @@ class ToolbarTest extends \PHPUnit\Framework\TestCase
-         $mode = 'list';
-         $limit = 10;
- 
--        $this->model->expects($this->once())
-+        $this->memorizer->expects($this->once())
-             ->method('getMode')
-             ->will($this->returnValue($mode));
- 
--        $this->model->expects($this->once())
-+        $this->memorizer->expects($this->once())
-             ->method('getLimit')
-             ->will($this->returnValue($limit));
-         $this->productListHelper->expects($this->once())
-@@ -266,7 +282,7 @@ class ToolbarTest extends \PHPUnit\Framework\TestCase
-         $this->productListHelper->expects($this->exactly(2))
-             ->method('getAvailableLimit')
-             ->will($this->returnValue([10 => 10, 20 => 20]));
--        $this->model->expects($this->once())
-+        $this->memorizer->expects($this->once())
-             ->method('getLimit')
-             ->will($this->returnValue($limit));
-         $this->pagerBlock->expects($this->once())
-diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php
-new file mode 100644
-index 00000000000..7ed8b13fce7
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php
-@@ -0,0 +1,223 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Catalog\Test\Unit\Block\Product\View;
-+
-+use Magento\Catalog\Block\Product\Context;
-+use Magento\Catalog\Block\Product\View\Gallery;
-+use Magento\Catalog\Block\Product\View\GalleryOptions;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Framework\Escaper;
-+use Magento\Framework\View\Config;
-+use Magento\Framework\Config\View;
-+use Magento\Framework\Serialize\Serializer\Json;
-+
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class GalleryOptionsTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var GalleryOptions
-+     */
-+    private $model;
-+
-+    /**
-+     * @var Gallery|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $gallery;
-+
-+    /**
-+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $context;
-+
-+    /**
-+     * @var Json
-+     */
-+    private $jsonSerializer;
-+
-+    /**
-+     * @var View|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $configView;
-+
-+    /**
-+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $viewConfig;
-+
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = new ObjectManager($this);
-+
-+        $this->escaper = $objectManager->getObject(Escaper::class);
-+        $this->configView = $this->createMock(View::class);
-+
-+        $this->viewConfig = $this->createConfiguredMock(
-+            Config::class,
-+            [
-+                'getViewConfig' => $this->configView
-+            ]
-+        );
-+
-+        $this->context = $this->createConfiguredMock(
-+            Context::class,
-+            [
-+                'getEscaper' => $this->escaper,
-+                'getViewConfig' => $this->viewConfig
-+            ]
-+        );
-+
-+        $this->gallery = $this->createMock(Gallery::class);
-+
-+        $this->jsonSerializer = $objectManager->getObject(
-+            Json::class
-+        );
-+
-+        $this->model =  $objectManager->getObject(GalleryOptions::class, [
-+            'context' => $this->context,
-+            'jsonSerializer' => $this->jsonSerializer,
-+            'gallery' => $this->gallery
-+        ]);
-+    }
-+
-+    public function testGetOptionsJson()
-+    {
-+        $configMap = [
-+            ['Magento_Catalog', 'gallery/nav', 'thumbs'],
-+            ['Magento_Catalog', 'gallery/loop', false],
-+            ['Magento_Catalog', 'gallery/keyboard', true],
-+            ['Magento_Catalog', 'gallery/arrows', true],
-+            ['Magento_Catalog', 'gallery/caption', false],
-+            ['Magento_Catalog', 'gallery/allowfullscreen', true],
-+            ['Magento_Catalog', 'gallery/navdir', 'horizontal'],
-+            ['Magento_Catalog', 'gallery/navarrows', true],
-+            ['Magento_Catalog', 'gallery/navtype', 'slides'],
-+            ['Magento_Catalog', 'gallery/thumbmargin', '5'],
-+            ['Magento_Catalog', 'gallery/transition/effect', 'slide'],
-+            ['Magento_Catalog', 'gallery/transition/duration', '500'],
-+        ];
-+
-+        $imageAttributesMap = [
-+            ['product_page_image_medium','height',null, 100],
-+            ['product_page_image_medium','width',null, 200],
-+            ['product_page_image_small','height',null, 300],
-+            ['product_page_image_small','width',null, 400]
-+        ];
-+
-+        $this->configView->expects($this->any())
-+            ->method('getVarValue')
-+            ->will($this->returnValueMap($configMap));
-+        $this->gallery->expects($this->any())
-+            ->method('getImageAttribute')
-+            ->will($this->returnValueMap($imageAttributesMap));
-+
-+        $json = $this->model->getOptionsJson();
-+
-+        $decodedJson = $this->jsonSerializer->unserialize($json);
-+
-+        $this->assertSame('thumbs', $decodedJson['nav']);
-+        $this->assertSame(false, $decodedJson['loop']);
-+        $this->assertSame(true, $decodedJson['keyboard']);
-+        $this->assertSame(true, $decodedJson['arrows']);
-+        $this->assertSame(false, $decodedJson['showCaption']);
-+        $this->assertSame(true, $decodedJson['allowfullscreen']);
-+        $this->assertSame('horizontal', $decodedJson['navdir']);
-+        $this->assertSame(true, $decodedJson['navarrows']);
-+        $this->assertSame('slides', $decodedJson['navtype']);
-+        $this->assertSame(5, $decodedJson['thumbmargin']);
-+        $this->assertSame('slide', $decodedJson['transition']);
-+        $this->assertSame(500, $decodedJson['transitionduration']);
-+        $this->assertSame(100, $decodedJson['height']);
-+        $this->assertSame(200, $decodedJson['width']);
-+        $this->assertSame(300, $decodedJson['thumbheight']);
-+        $this->assertSame(400, $decodedJson['thumbwidth']);
-+    }
-+
-+    public function testGetFSOptionsJson()
-+    {
-+        $configMap = [
-+            ['Magento_Catalog', 'gallery/fullscreen/nav', false],
-+            ['Magento_Catalog', 'gallery/fullscreen/loop', true],
-+            ['Magento_Catalog', 'gallery/fullscreen/keyboard', true],
-+            ['Magento_Catalog', 'gallery/fullscreen/arrows', false],
-+            ['Magento_Catalog', 'gallery/fullscreen/caption', true],
-+            ['Magento_Catalog', 'gallery/fullscreen/navdir', 'vertical'],
-+            ['Magento_Catalog', 'gallery/fullscreen/navarrows', false],
-+            ['Magento_Catalog', 'gallery/fullscreen/navtype', 'thumbs'],
-+            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', '10'],
-+            ['Magento_Catalog', 'gallery/fullscreen/transition/effect', 'dissolve'],
-+            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', '300']
-+        ];
-+
-+        $this->configView->expects($this->any())
-+            ->method('getVarValue')
-+            ->will($this->returnValueMap($configMap));
-+
-+        $json = $this->model->getFSOptionsJson();
-+
-+        $decodedJson = $this->jsonSerializer->unserialize($json);
-+
-+        //Note, this tests the special case for nav variable set to false. It
-+        //Should not be converted to boolean.
-+        $this->assertSame('false', $decodedJson['nav']);
-+        $this->assertSame(true, $decodedJson['loop']);
-+        $this->assertSame(false, $decodedJson['arrows']);
-+        $this->assertSame(true, $decodedJson['keyboard']);
-+        $this->assertSame(true, $decodedJson['showCaption']);
-+        $this->assertSame('vertical', $decodedJson['navdir']);
-+        $this->assertSame(false, $decodedJson['navarrows']);
-+        $this->assertSame(10, $decodedJson['thumbmargin']);
-+        $this->assertSame('thumbs', $decodedJson['navtype']);
-+        $this->assertSame('dissolve', $decodedJson['transition']);
-+        $this->assertSame(300, $decodedJson['transitionduration']);
-+    }
-+
-+    public function testGetOptionsJsonOptionals()
-+    {
-+        $configMap = [
-+            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', false],
-+            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', false]
-+        ];
-+
-+        $this->configView->expects($this->any())
-+            ->method('getVarValue')
-+            ->will($this->returnValueMap($configMap));
-+
-+        $json = $this->model->getOptionsJson();
-+
-+        $decodedJson = $this->jsonSerializer->unserialize($json);
-+
-+        $this->assertArrayNotHasKey('thumbmargin', $decodedJson);
-+        $this->assertArrayNotHasKey('transitionduration', $decodedJson);
-+    }
-+
-+    public function testGetFSOptionsJsonOptionals()
-+    {
-+        $configMap = [
-+            ['Magento_Catalog', 'gallery/fullscreen/keyboard', false],
-+            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', false],
-+            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', false]
-+        ];
-+
-+        $this->configView->expects($this->any())
-+            ->method('getVarValue')
-+            ->will($this->returnValueMap($configMap));
-+
-+        $json = $this->model->getFSOptionsJson();
-+
-+        $decodedJson = $this->jsonSerializer->unserialize($json);
-+
-+        $this->assertArrayNotHasKey('thumbmargin', $decodedJson);
-+        $this->assertArrayNotHasKey('keyboard', $decodedJson);
-+        $this->assertArrayNotHasKey('transitionduration', $decodedJson);
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php
-index c9b7dc50beb..a81d8b1c9fc 100644
---- a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php
-@@ -91,6 +91,94 @@ class GalleryTest extends \PHPUnit\Framework\TestCase
-         ]);
-     }
- 
-+    public function testGetGalleryImagesJsonWithLabel()
-+    {
-+        $this->prepareGetGalleryImagesJsonMocks();
-+        $json = $this->model->getGalleryImagesJson();
-+        $decodedJson = json_decode($json, true);
-+        $this->assertEquals('product_page_image_small_url', $decodedJson[0]['thumb']);
-+        $this->assertEquals('product_page_image_medium_url', $decodedJson[0]['img']);
-+        $this->assertEquals('product_page_image_large_url', $decodedJson[0]['full']);
-+        $this->assertEquals('test_label', $decodedJson[0]['caption']);
-+        $this->assertEquals('2', $decodedJson[0]['position']);
-+        $this->assertEquals(false, $decodedJson[0]['isMain']);
-+        $this->assertEquals('test_media_type', $decodedJson[0]['type']);
-+        $this->assertEquals('test_video_url', $decodedJson[0]['videoUrl']);
-+    }
-+
-+    public function testGetGalleryImagesJsonWithoutLabel()
-+    {
-+        $this->prepareGetGalleryImagesJsonMocks(false);
-+        $json = $this->model->getGalleryImagesJson();
-+        $decodedJson = json_decode($json, true);
-+        $this->assertEquals('test_product_name', $decodedJson[0]['caption']);
-+    }
-+
-+    private function prepareGetGalleryImagesJsonMocks($hasLabel = true)
-+    {
-+        $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $productTypeMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Type\AbstractType::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $productTypeMock->expects($this->any())
-+            ->method('getStoreFilter')
-+            ->with($productMock)
-+            ->willReturn($storeMock);
-+
-+        $productMock->expects($this->any())
-+            ->method('getTypeInstance')
-+            ->willReturn($productTypeMock);
-+        $productMock->expects($this->any())
-+            ->method('getMediaGalleryImages')
-+            ->willReturn($this->getImagesCollectionWithPopulatedDataObject($hasLabel));
-+        $productMock->expects($this->any())
-+            ->method('getName')
-+            ->willReturn('test_product_name');
-+
-+        $this->registry->expects($this->any())
-+            ->method('registry')
-+            ->with('product')
-+            ->willReturn($productMock);
-+
-+        $this->imageHelper = $this->getMockBuilder(\Magento\Catalog\Helper\Image::class)
-+            ->setMethods(['init', 'setImageFile', 'getUrl'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->imageHelper->expects($this->any())
-+            ->method('init')
-+            ->willReturnMap([
-+                [$productMock, 'product_page_image_small', [], $this->imageHelper],
-+                [$productMock, 'product_page_image_medium_no_frame', [], $this->imageHelper],
-+                [$productMock, 'product_page_image_large_no_frame', [], $this->imageHelper],
-+            ])
-+            ->willReturnSelf();
-+        $this->imageHelper->expects($this->any())
-+            ->method('setImageFile')
-+            ->with('test_file')
-+            ->willReturnSelf();
-+        $this->urlBuilder->expects($this->at(0))
-+            ->method('getUrl')
-+            ->willReturn('product_page_image_small_url');
-+        $this->urlBuilder->expects($this->at(1))
-+            ->method('getUrl')
-+            ->willReturn('product_page_image_medium_url');
-+        $this->urlBuilder->expects($this->at(2))
-+            ->method('getUrl')
-+            ->willReturn('product_page_image_large_url');
-+
-+        $this->galleryImagesConfigMock->expects($this->exactly(2))
-+            ->method('getItems')
-+            ->willReturn($this->getGalleryImagesConfigItems());
-+    }
-+
-     public function testGetGalleryImages()
-     {
-         $productMock = $this->createMock(Product::class);
-@@ -163,4 +251,30 @@ class GalleryTest extends \PHPUnit\Framework\TestCase
-             ])
-         ];
-     }
-+
-+    /**
-+     * @return \Magento\Framework\Data\Collection
-+     */
-+    private function getImagesCollectionWithPopulatedDataObject($hasLabel)
-+    {
-+        $collectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $items = [
-+            new \Magento\Framework\DataObject([
-+                'file' => 'test_file',
-+                'label' => ($hasLabel ? 'test_label' : ''),
-+                'position' => '2',
-+                'media_type' => 'external-test_media_type',
-+                "video_url" => 'test_video_url'
-+            ]),
-+        ];
-+
-+        $collectionMock->expects($this->any())
-+            ->method('getIterator')
-+            ->willReturn(new \ArrayIterator($items));
-+
-+        return $collectionMock;
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ViewTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ViewTest.php
-index af208c016c7..6563bdeb149 100644
---- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ViewTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ViewTest.php
-@@ -8,6 +8,9 @@
- 
- namespace Magento\Catalog\Test\Unit\Block\Product;
- 
-+/**
-+ * Class ViewTest
-+ */
- class ViewTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -25,6 +28,9 @@ class ViewTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $registryMock;
- 
-+    /**
-+     * @inheritDoc
-+     */
-     protected function setUp()
-     {
-         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-@@ -36,6 +42,9 @@ class ViewTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testShouldRenderQuantity()
-     {
-         $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
-@@ -61,28 +70,26 @@ class ViewTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(false, $this->view->shouldRenderQuantity());
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testGetIdentities()
-     {
-         $productTags = ['cat_p_1'];
-         $product = $this->createMock(\Magento\Catalog\Model\Product::class);
--        $category = $this->createMock(\Magento\Catalog\Model\Category::class);
- 
-         $product->expects($this->once())
-             ->method('getIdentities')
-             ->will($this->returnValue($productTags));
--        $category->expects($this->once())
--            ->method('getId')
--            ->will($this->returnValue(1));
-         $this->registryMock->expects($this->any())
-             ->method('registry')
-             ->will(
-                 $this->returnValueMap(
-                     [
-                         ['product', $product],
--                        ['current_category', $category],
-                     ]
-                 )
-             );
--        $this->assertEquals(['cat_p_1', 'cat_c_1'], $this->view->getIdentities());
-+        $this->assertEquals($productTags, $this->view->getIdentities());
-     }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php
-index af1ded69871..196b4df5b47 100644
---- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php
-@@ -71,7 +71,7 @@ class DeleteTest extends \PHPUnit\Framework\TestCase
-             false,
-             true,
-             true,
--            ['addSuccess']
-+            ['addSuccessMessage']
-         );
-         $this->categoryRepository = $this->createMock(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
-         $context->expects($this->any())
-diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
-index 45de62e218c..adf00333721 100644
---- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
-@@ -66,8 +66,8 @@ class RefreshPathTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testExecute() : void
-     {
--        $value = ['id' => 3, 'path' => '1/2/3', 'parentId' => 2];
--        $result = '{"id":3,"path":"1/2/3","parentId":"2"}';
-+        $value = ['id' => 3, 'path' => '1/2/3', 'parentId' => 2, 'level' => 2];
-+        $result = '{"id":3,"path":"1/2/3","parentId":"2","level":"2"}';
- 
-         $requestMock = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
- 
-diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php
-index 53f7fa0ed7e..74173dc926d 100644
---- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php
-@@ -102,7 +102,7 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             false,
-             true,
-             true,
--            ['addSuccess', 'getMessages']
-+            ['addSuccessMessage', 'getMessages']
-         );
- 
-         $this->save = $this->objectManager->getObject(
-@@ -392,7 +392,7 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-         $categoryMock->expects($this->once())
-             ->method('save');
-         $this->messageManagerMock->expects($this->once())
--            ->method('addSuccess')
-+            ->method('addSuccessMessage')
-             ->with(__('You saved the category.'));
-         $categoryMock->expects($this->at(1))
-             ->method('getId')
-diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
-index 5a977b79346..0ddd89afeac 100644
---- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
-@@ -94,7 +94,7 @@ class EditTest extends \PHPUnit\Framework\TestCase
-         $messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
-             ->setMethods([])
-             ->disableOriginalConstructor()->getMock();
--        $messageManager->expects($this->any())->method('addError')->willReturn(true);
-+        $messageManager->expects($this->any())->method('addErrorMessage')->willReturn(true);
-         $this->context = $this->getMockBuilder(\Magento\Backend\App\Action\Context::class)
-             ->setMethods(['getRequest', 'getObjectManager', 'getMessageManager', 'getResultRedirectFactory'])
-             ->disableOriginalConstructor()->getMock();
-diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
-deleted file mode 100644
-index c88a008efb1..00000000000
---- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
-+++ /dev/null
-@@ -1,258 +0,0 @@
--<?php
--/**
-- *
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Action\Attribute;
--
--/**
-- * @SuppressWarnings(PHPMD.TooManyFields)
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class SaveTest extends \PHPUnit\Framework\TestCase
--{
--    /** @var \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save */
--    protected $object;
--
--    /** @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute|\PHPUnit_Framework_MockObject_MockObject */
--    protected $attributeHelper;
--
--    /** @var \PHPUnit_Framework_MockObject_MockObject */
--    protected $dataObjectHelperMock;
--
--    /** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor|\PHPUnit_Framework_MockObject_MockObject */
--    protected $stockIndexerProcessor;
--
--    /** @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject */
--    protected $context;
--
--    /** @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject */
--    protected $request;
--
--    /** @var \Magento\Framework\App\Response\Http|\PHPUnit_Framework_MockObject_MockObject */
--    protected $response;
--
--    /** @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $objectManager;
--
--    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $eventManager;
--
--    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $url;
--
--    /** @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $redirect;
--
--    /** @var \Magento\Framework\App\ActionFlag|\PHPUnit_Framework_MockObject_MockObject */
--    protected $actionFlag;
--
--    /** @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $view;
--
--    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $messageManager;
--
--    /** @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
--    protected $session;
--
--    /** @var \Magento\Framework\AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $authorization;
--
--    /** @var \Magento\Backend\Model\Auth|\PHPUnit_Framework_MockObject_MockObject */
--    protected $auth;
--
--    /** @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
--    protected $helper;
--
--    /** @var \Magento\Backend\Model\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $backendUrl;
--
--    /** @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject */
--    protected $formKeyValidator;
--
--    /** @var \Magento\Framework\Locale\ResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $localeResolver;
--
--    /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
--    protected $product;
--
--    /** @var \Magento\CatalogInventory\Api\StockRegistryInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $stockItemService;
--
--    /** @var \PHPUnit_Framework_MockObject_MockObject */
--    protected $stockItem;
--
--    /** @var \Magento\CatalogInventory\Api\StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $stockConfig;
--
--    /** @var \PHPUnit_Framework_MockObject_MockObject */
--    protected $stockItemRepository;
--
--    /**
--     * @var  \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $resultRedirectFactory;
--
--    protected function setUp()
--    {
--        $this->attributeHelper = $this->createPartialMock(
--            \Magento\Catalog\Helper\Product\Edit\Action\Attribute::class,
--            ['getProductIds', 'getSelectedStoreId', 'getStoreWebsiteId']
--        );
--
--        $this->dataObjectHelperMock = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->stockIndexerProcessor = $this->createPartialMock(
--            \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class,
--            ['reindexList']
--        );
--
--        $resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultRedirectFactory = $this->getMockBuilder(\Magento\Backend\Model\View\Result\RedirectFactory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--        $this->resultRedirectFactory->expects($this->atLeastOnce())
--            ->method('create')
--            ->willReturn($resultRedirect);
--
--        $this->prepareContext();
--
--        $this->object = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))->getObject(
--            \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save::class,
--            [
--                'context' => $this->context,
--                'attributeHelper' => $this->attributeHelper,
--                'stockIndexerProcessor' => $this->stockIndexerProcessor,
--                'dataObjectHelper' => $this->dataObjectHelperMock,
--            ]
--        );
--    }
--
--    /**
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    protected function prepareContext()
--    {
--        $this->stockItemRepository = $this->getMockBuilder(
--            \Magento\CatalogInventory\Api\StockItemRepositoryInterface::class
--        )->disableOriginalConstructor()->getMock();
--
--        $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
--            ->disableOriginalConstructor()->getMock();
--        $this->response = $this->createMock(\Magento\Framework\App\Response\Http::class);
--        $this->objectManager = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
--        $this->eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
--        $this->url = $this->createMock(\Magento\Framework\UrlInterface::class);
--        $this->redirect = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
--        $this->actionFlag = $this->createMock(\Magento\Framework\App\ActionFlag::class);
--        $this->view = $this->createMock(\Magento\Framework\App\ViewInterface::class);
--        $this->messageManager = $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
--        $this->session = $this->createMock(\Magento\Backend\Model\Session::class);
--        $this->authorization = $this->createMock(\Magento\Framework\AuthorizationInterface::class);
--        $this->auth = $this->createMock(\Magento\Backend\Model\Auth::class);
--        $this->helper = $this->createMock(\Magento\Backend\Helper\Data::class);
--        $this->backendUrl = $this->createMock(\Magento\Backend\Model\UrlInterface::class);
--        $this->formKeyValidator = $this->createMock(\Magento\Framework\Data\Form\FormKey\Validator::class);
--        $this->localeResolver = $this->createMock(\Magento\Framework\Locale\ResolverInterface::class);
--
--        $this->context = $this->context = $this->createPartialMock(\Magento\Backend\App\Action\Context::class, [
--                'getRequest',
--                'getResponse',
--                'getObjectManager',
--                'getEventManager',
--                'getUrl',
--                'getRedirect',
--                'getActionFlag',
--                'getView',
--                'getMessageManager',
--                'getSession',
--                'getAuthorization',
--                'getAuth',
--                'getHelper',
--                'getBackendUrl',
--                'getFormKeyValidator',
--                'getLocaleResolver',
--                'getResultRedirectFactory'
--            ]);
--        $this->context->expects($this->any())->method('getRequest')->willReturn($this->request);
--        $this->context->expects($this->any())->method('getResponse')->willReturn($this->response);
--        $this->context->expects($this->any())->method('getObjectManager')->willReturn($this->objectManager);
--        $this->context->expects($this->any())->method('getEventManager')->willReturn($this->eventManager);
--        $this->context->expects($this->any())->method('getUrl')->willReturn($this->url);
--        $this->context->expects($this->any())->method('getRedirect')->willReturn($this->redirect);
--        $this->context->expects($this->any())->method('getActionFlag')->willReturn($this->actionFlag);
--        $this->context->expects($this->any())->method('getView')->willReturn($this->view);
--        $this->context->expects($this->any())->method('getMessageManager')->willReturn($this->messageManager);
--        $this->context->expects($this->any())->method('getSession')->willReturn($this->session);
--        $this->context->expects($this->any())->method('getAuthorization')->willReturn($this->authorization);
--        $this->context->expects($this->any())->method('getAuth')->willReturn($this->auth);
--        $this->context->expects($this->any())->method('getHelper')->willReturn($this->helper);
--        $this->context->expects($this->any())->method('getBackendUrl')->willReturn($this->backendUrl);
--        $this->context->expects($this->any())->method('getFormKeyValidator')->willReturn($this->formKeyValidator);
--        $this->context->expects($this->any())->method('getLocaleResolver')->willReturn($this->localeResolver);
--        $this->context->expects($this->any())
--            ->method('getResultRedirectFactory')
--            ->willReturn($this->resultRedirectFactory);
--
--        $this->product = $this->createPartialMock(
--            \Magento\Catalog\Model\Product::class,
--            ['isProductsHasSku', '__wakeup']
--        );
--
--        $this->stockItemService = $this->getMockBuilder(\Magento\CatalogInventory\Api\StockRegistryInterface::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getStockItem', 'saveStockItem'])
--            ->getMockForAbstractClass();
--        $this->stockItem = $this->getMockBuilder(\Magento\CatalogInventory\Api\Data\StockItemInterface::class)
--            ->setMethods(['getId', 'getProductId'])
--            ->disableOriginalConstructor()
--            ->getMockForAbstractClass();
--
--        $this->stockConfig = $this->getMockBuilder(\Magento\CatalogInventory\Api\StockConfigurationInterface::class)
--            ->disableOriginalConstructor()
--            ->getMockForAbstractClass();
--
--        $this->objectManager->expects($this->any())->method('create')->will($this->returnValueMap([
--            [\Magento\Catalog\Model\Product::class, [], $this->product],
--            [\Magento\CatalogInventory\Api\StockRegistryInterface::class, [], $this->stockItemService],
--            [\Magento\CatalogInventory\Api\StockItemRepositoryInterface::class, [], $this->stockItemRepository],
--        ]));
--
--        $this->objectManager->expects($this->any())->method('get')->will($this->returnValueMap([
--            [\Magento\CatalogInventory\Api\StockConfigurationInterface::class, $this->stockConfig],
--        ]));
--    }
--
--    public function testExecuteThatProductIdsAreObtainedFromAttributeHelper()
--    {
--        $this->attributeHelper->expects($this->any())->method('getProductIds')->will($this->returnValue([5]));
--        $this->attributeHelper->expects($this->any())->method('getSelectedStoreId')->will($this->returnValue([1]));
--        $this->attributeHelper->expects($this->any())->method('getStoreWebsiteId')->will($this->returnValue(1));
--        $this->stockConfig->expects($this->any())->method('getConfigItemOptions')->will($this->returnValue([]));
--        $this->dataObjectHelperMock->expects($this->any())
--            ->method('populateWithArray')
--            ->with($this->stockItem, $this->anything(), \Magento\CatalogInventory\Api\Data\StockItemInterface::class)
--            ->willReturnSelf();
--        $this->product->expects($this->any())->method('isProductsHasSku')->with([5])->will($this->returnValue(true));
--        $this->stockItemService->expects($this->any())->method('getStockItem')->with(5, 1)
--            ->will($this->returnValue($this->stockItem));
--        $this->stockIndexerProcessor->expects($this->any())->method('reindexList')->with([5]);
--
--        $this->request->expects($this->any())->method('getParam')->will($this->returnValueMap([
--            ['inventory', [], [7]],
--        ]));
--
--        $this->messageManager->expects($this->never())->method('addError');
--        $this->messageManager->expects($this->never())->method('addException');
--
--        $this->object->execute();
--    }
--}
-diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
-index f493cbc88f1..30d3503e464 100644
---- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
-@@ -5,7 +5,10 @@
-  */
- namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Attribute;
- 
-+use Magento\Catalog\Api\Data\ProductAttributeInterface;
- use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save;
-+use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
-+use Magento\Framework\Serialize\Serializer\FormData;
- use Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\AttributeTest;
- use Magento\Catalog\Model\Product\AttributeSet\BuildFactory;
- use Magento\Catalog\Model\Product\AttributeSet\Build;
-@@ -13,11 +16,14 @@ use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
- use Magento\Eav\Api\Data\AttributeSetInterface;
- use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory;
- use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
-+use Magento\Framework\Controller\ResultFactory;
- use Magento\Framework\Filter\FilterManager;
- use Magento\Catalog\Helper\Product as ProductHelper;
-+use Magento\Framework\View\Element\Messages;
- use Magento\Framework\View\LayoutFactory;
- use Magento\Backend\Model\View\Result\Redirect as ResultRedirect;
- use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\Validator as InputTypeValidator;
-+use Magento\Framework\View\LayoutInterface;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -79,6 +85,21 @@ class SaveTest extends AttributeTest
-      */
-     protected $inputTypeValidatorMock;
- 
-+    /**
-+     * @var FormData|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $formDataSerializerMock;
-+
-+    /**
-+     * @var ProductAttributeInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $productAttributeMock;
-+
-+    /**
-+     * @var AttributeCodeValidator|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $attributeCodeValidatorMock;
-+
-     protected function setUp()
-     {
-         parent::setUp();
-@@ -108,6 +129,7 @@ class SaveTest extends AttributeTest
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->redirectMock = $this->getMockBuilder(ResultRedirect::class)
-+            ->setMethods(['setData', 'setPath'])
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->attributeSetMock = $this->getMockBuilder(AttributeSetInterface::class)
-@@ -119,6 +141,15 @@ class SaveTest extends AttributeTest
-         $this->inputTypeValidatorMock = $this->getMockBuilder(InputTypeValidator::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $this->formDataSerializerMock = $this->getMockBuilder(FormData::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->attributeCodeValidatorMock = $this->getMockBuilder(AttributeCodeValidator::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->productAttributeMock = $this->getMockBuilder(ProductAttributeInterface::class)
-+            ->setMethods(['getId', 'get'])
-+            ->getMockForAbstractClass();
- 
-         $this->buildFactoryMock->expects($this->any())
-             ->method('create')
-@@ -126,6 +157,9 @@ class SaveTest extends AttributeTest
-         $this->validatorFactoryMock->expects($this->any())
-             ->method('create')
-             ->willReturn($this->inputTypeValidatorMock);
-+        $this->attributeFactoryMock
-+            ->method('create')
-+            ->willReturn($this->productAttributeMock);
-     }
- 
-     /**
-@@ -145,11 +179,24 @@ class SaveTest extends AttributeTest
-             'validatorFactory' => $this->validatorFactoryMock,
-             'groupCollectionFactory' => $this->groupCollectionFactoryMock,
-             'layoutFactory' => $this->layoutFactoryMock,
-+            'formDataSerializer' => $this->formDataSerializerMock,
-+            'attributeCodeValidator' => $this->attributeCodeValidatorMock
-         ]);
-     }
- 
-     public function testExecuteWithEmptyData()
-     {
-+        $this->requestMock->expects($this->any())
-+            ->method('getParam')
-+            ->willReturnMap([
-+                ['isAjax', null, null],
-+                ['serialized_options', '[]', ''],
-+            ]);
-+        $this->formDataSerializerMock
-+            ->expects($this->once())
-+            ->method('unserialize')
-+            ->with('')
-+            ->willReturn([]);
-         $this->requestMock->expects($this->once())
-             ->method('getPostValue')
-             ->willReturn([]);
-@@ -170,6 +217,27 @@ class SaveTest extends AttributeTest
-             'frontend_input' => 'test_frontend_input',
-         ];
- 
-+        $this->requestMock->expects($this->any())
-+            ->method('getParam')
-+            ->willReturnMap([
-+                ['isAjax', null, null],
-+                ['serialized_options', '[]', ''],
-+            ]);
-+        $this->formDataSerializerMock
-+            ->expects($this->once())
-+            ->method('unserialize')
-+            ->with('')
-+            ->willReturn([]);
-+        $this->productAttributeMock
-+            ->method('getId')
-+            ->willReturn(1);
-+        $this->productAttributeMock
-+            ->method('getAttributeCode')
-+            ->willReturn('test_code');
-+        $this->attributeCodeValidatorMock
-+            ->method('isValid')
-+            ->with('test_code')
-+            ->willReturn(true);
-         $this->requestMock->expects($this->once())
-             ->method('getPostValue')
-             ->willReturn($data);
-@@ -203,4 +271,80 @@ class SaveTest extends AttributeTest
- 
-         $this->assertInstanceOf(ResultRedirect::class, $this->getModel()->execute());
-     }
-+
-+    /**
-+     * @throws \Magento\Framework\Exception\NotFoundException
-+     */
-+    public function testExecuteWithOptionsDataError()
-+    {
-+        $serializedOptions = '{"key":"value"}';
-+        $message = "The attribute couldn't be saved due to an error. Verify your information and try again. "
-+            . "If the error persists, please try again later.";
-+
-+        $this->requestMock->expects($this->any())
-+            ->method('getParam')
-+            ->willReturnMap([
-+                ['isAjax', null, true],
-+                ['serialized_options', '[]', $serializedOptions],
-+            ]);
-+        $this->formDataSerializerMock
-+            ->expects($this->once())
-+            ->method('unserialize')
-+            ->with($serializedOptions)
-+            ->willThrowException(new \InvalidArgumentException('Some exception'));
-+        $this->messageManager
-+            ->expects($this->once())
-+            ->method('addErrorMessage')
-+            ->with($message);
-+        $this->addReturnResultConditions('catalog/*/edit', ['_current' => true], ['error' => true]);
-+
-+        $this->getModel()->execute();
-+    }
-+
-+    /**
-+     * @param string $path
-+     * @param array $params
-+     * @param array $response
-+     * @return mixed
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    private function addReturnResultConditions(string $path = '', array $params = [], array $response = [])
-+    {
-+        $layoutMock = $this->getMockBuilder(LayoutInterface::class)
-+            ->setMethods(['initMessages', 'getMessagesBlock'])
-+            ->getMockForAbstractClass();
-+        $this->layoutFactoryMock
-+            ->expects($this->once())
-+            ->method('create')
-+            ->with()
-+            ->willReturn($layoutMock);
-+        $layoutMock
-+            ->method('initMessages')
-+            ->with();
-+        $messageBlockMock = $this->getMockBuilder(Messages::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $layoutMock
-+            ->expects($this->once())
-+            ->method('getMessagesBlock')
-+            ->willReturn($messageBlockMock);
-+        $messageBlockMock
-+            ->expects($this->once())
-+            ->method('getGroupedHtml')
-+            ->willReturn('message1');
-+        $this->resultFactoryMock
-+            ->expects($this->once())
-+            ->method('create')
-+            ->with(ResultFactory::TYPE_JSON)
-+            ->willReturn($this->redirectMock);
-+        $response  = array_merge($response, [
-+            'messages' => ['message1'],
-+            'params' => $params,
-+        ]);
-+        $this->redirectMock
-+            ->expects($this->once())
-+            ->method('setData')
-+            ->with($response)
-+            ->willReturnSelf();
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
-index 9c747393cc7..742148b1bf7 100644
---- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
-@@ -6,6 +6,8 @@
- namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Attribute;
- 
- use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Validate;
-+use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
-+use Magento\Framework\Serialize\Serializer\FormData;
- use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
- use Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\AttributeTest;
- use Magento\Eav\Model\Entity\Attribute\Set as AttributeSet;
-@@ -61,6 +63,16 @@ class ValidateTest extends AttributeTest
-      */
-     protected $layoutMock;
- 
-+    /**
-+     * @var FormData|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $formDataSerializerMock;
-+
-+    /**
-+     * @var AttributeCodeValidator|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $attributeCodeValidatorMock;
-+
-     protected function setUp()
-     {
-         parent::setUp();
-@@ -86,6 +98,12 @@ class ValidateTest extends AttributeTest
-             ->getMock();
-         $this->layoutMock = $this->getMockBuilder(LayoutInterface::class)
-             ->getMockForAbstractClass();
-+        $this->formDataSerializerMock = $this->getMockBuilder(FormData::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->attributeCodeValidatorMock = $this->getMockBuilder(AttributeCodeValidator::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
- 
-         $this->contextMock->expects($this->any())
-             ->method('getObjectManager')
-@@ -100,25 +118,29 @@ class ValidateTest extends AttributeTest
-         return $this->objectManager->getObject(
-             Validate::class,
-             [
--            'context' => $this->contextMock,
--            'attributeLabelCache' => $this->attributeLabelCacheMock,
--            'coreRegistry' => $this->coreRegistryMock,
--            'resultPageFactory' => $this->resultPageFactoryMock,
--            'resultJsonFactory' => $this->resultJsonFactoryMock,
--            'layoutFactory' => $this->layoutFactoryMock,
--            'multipleAttributeList' => ['select' => 'option']
-+                'context' => $this->contextMock,
-+                'attributeLabelCache' => $this->attributeLabelCacheMock,
-+                'coreRegistry' => $this->coreRegistryMock,
-+                'resultPageFactory' => $this->resultPageFactoryMock,
-+                'resultJsonFactory' => $this->resultJsonFactoryMock,
-+                'layoutFactory' => $this->layoutFactoryMock,
-+                'multipleAttributeList' => ['select' => 'option'],
-+                'formDataSerializer' => $this->formDataSerializerMock,
-+                'attributeCodeValidator' => $this->attributeCodeValidatorMock,
-             ]
-         );
-     }
- 
-     public function testExecute()
-     {
-+        $serializedOptions = '{"key":"value"}';
-         $this->requestMock->expects($this->any())
-             ->method('getParam')
-             ->willReturnMap([
-                 ['frontend_label', null, 'test_frontend_label'],
-                 ['attribute_code', null, 'test_attribute_code'],
-                 ['new_attribute_set_name', null, 'test_attribute_set_name'],
-+                ['serialized_options', '[]', $serializedOptions],
-             ]);
-         $this->objectManagerMock->expects($this->exactly(2))
-             ->method('create')
-@@ -129,6 +151,12 @@ class ValidateTest extends AttributeTest
-         $this->attributeMock->expects($this->once())
-             ->method('loadByCode')
-             ->willReturnSelf();
-+
-+        $this->attributeCodeValidatorMock->expects($this->once())
-+            ->method('isValid')
-+            ->with('test_attribute_code')
-+            ->willReturn(true);
-+
-         $this->requestMock->expects($this->once())
-             ->method('has')
-             ->with('new_attribute_set_name')
-@@ -160,6 +188,7 @@ class ValidateTest extends AttributeTest
-      */
-     public function testUniqueValidation(array $options, $isError)
-     {
-+        $serializedOptions = '{"key":"value"}';
-         $countFunctionCalls = ($isError) ? 6 : 5;
-         $this->requestMock->expects($this->exactly($countFunctionCalls))
-             ->method('getParam')
-@@ -167,10 +196,21 @@ class ValidateTest extends AttributeTest
-                 ['frontend_label', null, null],
-                 ['attribute_code', null, "test_attribute_code"],
-                 ['new_attribute_set_name', null, 'test_attribute_set_name'],
--                ['option', null, $options],
--                ['message_key', null, Validate::DEFAULT_MESSAGE_KEY]
-+                ['message_key', null, Validate::DEFAULT_MESSAGE_KEY],
-+                ['serialized_options', '[]', $serializedOptions],
-             ]);
- 
-+        $this->formDataSerializerMock
-+            ->expects($this->once())
-+            ->method('unserialize')
-+            ->with($serializedOptions)
-+            ->willReturn($options);
-+
-+        $this->attributeCodeValidatorMock->expects($this->once())
-+            ->method('isValid')
-+            ->with('test_attribute_code')
-+            ->willReturn(true);
-+
-         $this->objectManagerMock->expects($this->once())
-             ->method('create')
-             ->willReturn($this->attributeMock);
-@@ -203,67 +243,77 @@ class ValidateTest extends AttributeTest
-         return [
-             'no values' => [
-                 [
--                    'delete' => [
--                        "option_0" => "",
--                        "option_1" => "",
--                        "option_2" => "",
--                    ]
-+                    'option' => [
-+                        'delete' => [
-+                            "option_0" => "",
-+                            "option_1" => "",
-+                            "option_2" => "",
-+                        ],
-+                    ],
-                 ], false
-             ],
-             'valid options' => [
-                 [
--                    'value' => [
--                        "option_0" => [1, 0],
--                        "option_1" => [2, 0],
--                        "option_2" => [3, 0],
-+                    'option' => [
-+                        'value' => [
-+                            "option_0" => [1, 0],
-+                            "option_1" => [2, 0],
-+                            "option_2" => [3, 0],
-+                        ],
-+                        'delete' => [
-+                            "option_0" => "",
-+                            "option_1" => "",
-+                            "option_2" => "",
-+                        ],
-                     ],
--                    'delete' => [
--                        "option_0" => "",
--                        "option_1" => "",
--                        "option_2" => "",
--                    ]
-                 ], false
-             ],
-             'duplicate options' => [
-                 [
--                    'value' => [
--                        "option_0" => [1, 0],
--                        "option_1" => [1, 0],
--                        "option_2" => [3, 0],
-+                    'option' => [
-+                        'value' => [
-+                            "option_0" => [1, 0],
-+                            "option_1" => [1, 0],
-+                            "option_2" => [3, 0],
-+                        ],
-+                        'delete' => [
-+                            "option_0" => "",
-+                            "option_1" => "",
-+                            "option_2" => "",
-+                        ],
-                     ],
--                    'delete' => [
--                        "option_0" => "",
--                        "option_1" => "",
--                        "option_2" => "",
--                    ]
-                 ], true
-             ],
-             'duplicate and deleted' => [
-                 [
--                    'value' => [
--                        "option_0" => [1, 0],
--                        "option_1" => [1, 0],
--                        "option_2" => [3, 0],
-+                    'option' => [
-+                        'value' => [
-+                            "option_0" => [1, 0],
-+                            "option_1" => [1, 0],
-+                            "option_2" => [3, 0],
-+                        ],
-+                        'delete' => [
-+                            "option_0" => "",
-+                            "option_1" => "1",
-+                            "option_2" => "",
-+                        ],
-                     ],
--                    'delete' => [
--                        "option_0" => "",
--                        "option_1" => "1",
--                        "option_2" => "",
--                    ]
-                 ], false
-             ],
-             'empty and deleted' => [
-                 [
--                    'value' => [
--                        "option_0" => [1, 0],
--                        "option_1" => [2, 0],
--                        "option_2" => ["", ""],
-+                    'option' => [
-+                        'value' => [
-+                            "option_0" => [1, 0],
-+                            "option_1" => [2, 0],
-+                            "option_2" => ["", ""],
-+                        ],
-+                        'delete' => [
-+                            "option_0" => "",
-+                            "option_1" => "",
-+                            "option_2" => "1",
-+                        ],
-                     ],
--                    'delete' => [
--                        "option_0" => "",
--                        "option_1" => "",
--                        "option_2" => "1",
--                    ]
-                 ], false
-             ],
-         ];
-@@ -278,6 +328,7 @@ class ValidateTest extends AttributeTest
-      */
-     public function testEmptyOption(array $options, $result)
-     {
-+        $serializedOptions = '{"key":"value"}';
-         $this->requestMock->expects($this->any())
-             ->method('getParam')
-             ->willReturnMap([
-@@ -285,10 +336,16 @@ class ValidateTest extends AttributeTest
-                 ['frontend_input', 'select', 'multipleselect'],
-                 ['attribute_code', null, "test_attribute_code"],
-                 ['new_attribute_set_name', null, 'test_attribute_set_name'],
--                ['option', null, $options],
-                 ['message_key', Validate::DEFAULT_MESSAGE_KEY, 'message'],
-+                ['serialized_options', '[]', $serializedOptions],
-             ]);
- 
-+        $this->formDataSerializerMock
-+            ->expects($this->once())
-+            ->method('unserialize')
-+            ->with($serializedOptions)
-+            ->willReturn($options);
-+
-         $this->objectManagerMock->expects($this->once())
-             ->method('create')
-             ->willReturn($this->attributeMock);
-@@ -297,6 +354,11 @@ class ValidateTest extends AttributeTest
-             ->method('loadByCode')
-             ->willReturnSelf();
- 
-+        $this->attributeCodeValidatorMock->expects($this->once())
-+            ->method('isValid')
-+            ->with('test_attribute_code')
-+            ->willReturn(true);
-+
-         $this->resultJsonFactoryMock->expects($this->once())
-             ->method('create')
-             ->willReturn($this->resultJson);
-@@ -320,8 +382,10 @@ class ValidateTest extends AttributeTest
-         return [
-             'empty admin scope options' => [
-                 [
--                    'value' => [
--                        "option_0" => [''],
-+                    'option' => [
-+                        'value' => [
-+                            "option_0" => [''],
-+                        ],
-                     ],
-                 ],
-                 (object) [
-@@ -331,8 +395,10 @@ class ValidateTest extends AttributeTest
-             ],
-             'not empty admin scope options' => [
-                 [
--                    'value' => [
--                        "option_0" => ['asdads'],
-+                    'option' => [
-+                        'value' => [
-+                            "option_0" => ['asdads'],
-+                        ],
-                     ],
-                 ],
-                 (object) [
-@@ -341,11 +407,13 @@ class ValidateTest extends AttributeTest
-             ],
-             'empty admin scope options and deleted' => [
-                 [
--                    'value' => [
--                        "option_0" => [''],
--                    ],
--                    'delete' => [
--                        'option_0' => '1',
-+                    'option' => [
-+                        'value' => [
-+                            "option_0" => [''],
-+                        ],
-+                        'delete' => [
-+                            'option_0' => '1',
-+                        ],
-                     ],
-                 ],
-                 (object) [
-@@ -354,11 +422,13 @@ class ValidateTest extends AttributeTest
-             ],
-             'empty admin scope options and not deleted' => [
-                 [
--                    'value' => [
--                        "option_0" => [''],
--                    ],
--                    'delete' => [
--                        'option_0' => '0',
-+                    'option' => [
-+                        'value' => [
-+                            "option_0" => [''],
-+                        ],
-+                        'delete' => [
-+                            'option_0' => '0',
-+                        ],
-                     ],
-                 ],
-                 (object) [
-@@ -368,4 +438,136 @@ class ValidateTest extends AttributeTest
-             ],
-         ];
-     }
-+
-+    /**
-+     * @throws \Magento\Framework\Exception\NotFoundException
-+     */
-+    public function testExecuteWithOptionsDataError()
-+    {
-+        $serializedOptions = '{"key":"value"}';
-+        $message = "The attribute couldn't be validated due to an error. Verify your information and try again. "
-+            . "If the error persists, please try again later.";
-+        $this->requestMock->expects($this->any())
-+            ->method('getParam')
-+            ->willReturnMap([
-+                ['frontend_label', null, 'test_frontend_label'],
-+                ['attribute_code', null, 'test_attribute_code'],
-+                ['new_attribute_set_name', null, 'test_attribute_set_name'],
-+                ['message_key', Validate::DEFAULT_MESSAGE_KEY, 'message'],
-+                ['serialized_options', '[]', $serializedOptions],
-+            ]);
-+
-+        $this->formDataSerializerMock
-+            ->expects($this->once())
-+            ->method('unserialize')
-+            ->with($serializedOptions)
-+            ->willThrowException(new \InvalidArgumentException('Some exception'));
-+
-+        $this->objectManagerMock
-+            ->method('create')
-+            ->willReturnMap([
-+                [\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class, [], $this->attributeMock],
-+                [\Magento\Eav\Model\Entity\Attribute\Set::class, [], $this->attributeSetMock]
-+            ]);
-+
-+        $this->attributeCodeValidatorMock
-+            ->method('isValid')
-+            ->willReturn(true);
-+
-+        $this->attributeMock
-+            ->method('loadByCode')
-+            ->willReturnSelf();
-+        $this->attributeSetMock
-+            ->method('setEntityTypeId')
-+            ->willReturnSelf();
-+        $this->resultJsonFactoryMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($this->resultJson);
-+        $this->resultJson->expects($this->once())
-+            ->method('setJsonData')
-+            ->with(json_encode([
-+                'error' => true,
-+                'message' => $message
-+            ]))
-+            ->willReturnSelf();
-+
-+        $this->getModel()->execute();
-+    }
-+
-+    /**
-+     * Test execute with an invalid attribute code
-+     *
-+     * @dataProvider provideInvalidAttributeCodes
-+     * @param string $attributeCode
-+     * @param $result
-+     * @throws \Magento\Framework\Exception\NotFoundException
-+     */
-+    public function testExecuteWithInvalidAttributeCode($attributeCode, $result)
-+    {
-+        $serializedOptions = '{"key":"value"}';
-+        $this->requestMock->expects($this->any())
-+            ->method('getParam')
-+            ->willReturnMap([
-+                ['frontend_label', null, null],
-+                ['frontend_input', 'select', 'multipleselect'],
-+                ['attribute_code', null, $attributeCode],
-+                ['new_attribute_set_name', null, 'test_attribute_set_name'],
-+                ['message_key', Validate::DEFAULT_MESSAGE_KEY, 'message'],
-+                ['serialized_options', '[]', $serializedOptions],
-+            ]);
-+
-+        $this->formDataSerializerMock
-+            ->expects($this->once())
-+            ->method('unserialize')
-+            ->with($serializedOptions)
-+            ->willReturn(["key" => "value"]);
-+
-+        $this->objectManagerMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($this->attributeMock);
-+
-+        $this->attributeMock->expects($this->once())
-+            ->method('loadByCode')
-+            ->willReturnSelf();
-+
-+        $this->attributeCodeValidatorMock->expects($this->once())
-+            ->method('isValid')
-+            ->with($attributeCode)
-+            ->willReturn(false);
-+
-+        $this->attributeCodeValidatorMock->expects($this->once())
-+            ->method('getMessages')
-+            ->willReturn(['Invalid Attribute Code.']);
-+
-+        $this->resultJsonFactoryMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($this->resultJson);
-+
-+        $this->resultJson->expects($this->once())
-+            ->method('setJsonData')
-+            ->willReturnArgument(0);
-+
-+        $response = $this->getModel()->execute();
-+        $responseObject = json_decode($response);
-+
-+        $this->assertEquals($responseObject, $result);
-+    }
-+
-+    /**
-+     * Providing invalid attribute codes
-+     *
-+     * @return array
-+     */
-+    public function provideInvalidAttributeCodes()
-+    {
-+        return [
-+            'invalid attribute code' => [
-+                '.attribute_code',
-+                (object) [
-+                    'error' => true,
-+                    'message' => 'Invalid Attribute Code.',
-+                ]
-+            ]
-+        ];
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php
-index b85b03852b6..2a75773754f 100644
---- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php
-@@ -9,8 +9,10 @@ use Magento\Backend\App\Action\Context;
- use Magento\Catalog\Controller\Adminhtml\Product\Attribute;
- use Magento\Framework\App\RequestInterface;
- use Magento\Framework\Cache\FrontendInterface;
-+use Magento\Framework\Message\ManagerInterface;
-+use Magento\Framework\ObjectManager\ObjectManager;
- use Magento\Framework\Registry;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
- use Magento\Framework\View\Result\PageFactory;
- use Magento\Framework\Controller\ResultFactory;
- 
-@@ -20,7 +22,7 @@ use Magento\Framework\Controller\ResultFactory;
- class AttributeTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var ObjectManager
-+     * @var ObjectManagerHelper
-      */
-     protected $objectManager;
- 
-@@ -54,9 +56,14 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $resultFactoryMock;
- 
-+    /**
-+     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $messageManager;
-+
-     protected function setUp()
-     {
--        $this->objectManager = new ObjectManager($this);
-+        $this->objectManager = new ObjectManagerHelper($this);
-         $this->contextMock = $this->getMockBuilder(Context::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-@@ -74,6 +81,9 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
-         $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $this->messageManager = $this->getMockBuilder(ManagerInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
- 
-         $this->contextMock->expects($this->any())
-             ->method('getRequest')
-@@ -81,6 +91,9 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
-         $this->contextMock->expects($this->any())
-             ->method('getResultFactory')
-             ->willReturn($this->resultFactoryMock);
-+        $this->contextMock
-+            ->method('getMessageManager')
-+            ->willReturn($this->messageManager);
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php
-index 4113ce636d6..c71fa90fb02 100644
---- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php
-@@ -14,6 +14,9 @@ use Magento\Catalog\Model\ProductFactory;
- use Magento\Framework\Registry;
- use Magento\Cms\Model\Wysiwyg\Config as WysiwygConfig;
- use Magento\Framework\App\Request\Http;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Catalog\Model\Product\Type as ProductTypes;
- 
- /**
-  * Class BuilderTest
-@@ -67,6 +70,11 @@ class BuilderTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $storeFactoryMock;
- 
-+    /**
-+     * @var ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $productRepositoryMock;
-+
-     /**
-      * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -90,9 +98,10 @@ class BuilderTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(['load'])
-             ->getMockForAbstractClass();
- 
--        $this->storeFactoryMock->expects($this->any())
--            ->method('create')
--            ->willReturn($this->storeMock);
-+        $this->productRepositoryMock = $this->getMockBuilder(ProductRepositoryInterface::class)
-+            ->setMethods(['getById'])
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
- 
-         $this->builder = $this->objectManager->getObject(
-             Builder::class,
-@@ -102,140 +111,198 @@ class BuilderTest extends \PHPUnit\Framework\TestCase
-                 'registry' => $this->registryMock,
-                 'wysiwygConfig' => $this->wysiwygConfigMock,
-                 'storeFactory' => $this->storeFactoryMock,
-+                'productRepository' => $this->productRepositoryMock
-             ]
-         );
-     }
- 
-     public function testBuildWhenProductExistAndPossibleToLoadProduct()
-     {
-+        $productId = 2;
-+        $productType = 'type_id';
-+        $productStore = 'store';
-+        $productSet = 3;
-+
-         $valueMap = [
--            ['id', null, 2],
--            ['store', 0, 'some_store'],
--            ['type', null, 'type_id'],
--            ['set', null, 3],
--            ['store', null, 'store'],
-+            ['id', null, $productId],
-+            ['type', null, $productType],
-+            ['set', null, $productSet],
-+            ['store', 0, $productStore],
-         ];
-+
-         $this->requestMock->expects($this->any())
-             ->method('getParam')
-             ->willReturnMap($valueMap);
--        $this->productFactoryMock->expects($this->once())
-+
-+        $this->productRepositoryMock->expects($this->any())
-+            ->method('getById')
-+            ->with($productId, true, $productStore)
-+            ->willReturn($this->productMock);
-+
-+        $this->storeFactoryMock->expects($this->any())
-             ->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->productMock->expects($this->once())
--            ->method('setStoreId')
--            ->with('some_store')
--            ->willReturnSelf();
--        $this->productMock->expects($this->never())
--            ->method('setTypeId');
--        $this->productMock->expects($this->once())
-+            ->willReturn($this->storeMock);
-+
-+        $this->storeMock->expects($this->any())
-             ->method('load')
--            ->with(2)
--            ->will($this->returnSelf());
--        $this->productMock->expects($this->once())
--            ->method('setAttributeSetId')
--            ->with(3)
--            ->will($this->returnSelf());
-+            ->with($productStore)
-+            ->willReturnSelf();
-+
-         $registryValueMap = [
-             ['product', $this->productMock, $this->registryMock],
-             ['current_product', $this->productMock, $this->registryMock],
-+            ['current_store', $this->registryMock, $this->storeMock],
-         ];
-+
-         $this->registryMock->expects($this->any())
-             ->method('register')
-             ->willReturn($registryValueMap);
-+
-         $this->wysiwygConfigMock->expects($this->once())
-             ->method('setStoreId')
--            ->with('store');
-+            ->with($productStore);
-+
-         $this->assertEquals($this->productMock, $this->builder->build($this->requestMock));
-     }
- 
-     public function testBuildWhenImpossibleLoadProduct()
-     {
-+        $productId = 2;
-+        $productType = 'type_id';
-+        $productStore = 'store';
-+        $productSet = 3;
-+
-         $valueMap = [
--            ['id', null, 15],
--            ['store', 0, 'some_store'],
--            ['type', null, 'type_id'],
--            ['set', null, 3],
--            ['store', null, 'store'],
-+            ['id', null, $productId],
-+            ['type', null, $productType],
-+            ['set', null, $productSet],
-+            ['store', 0, $productStore],
-         ];
-+
-         $this->requestMock->expects($this->any())
-             ->method('getParam')
--            ->will($this->returnValueMap($valueMap));
-+            ->willReturnMap($valueMap);
-+
-+        $this->productRepositoryMock->expects($this->any())
-+            ->method('getById')
-+            ->with($productId, true, $productStore)
-+            ->willThrowException(new NoSuchEntityException());
-+
-         $this->productFactoryMock->expects($this->once())
-             ->method('create')
--            ->willReturn($this->productMock);
--        $this->productMock->expects($this->once())
--            ->method('setStoreId')
--            ->with('some_store')
--            ->willReturnSelf();
--        $this->productMock->expects($this->once())
-+            ->will($this->returnValue($this->productMock));
-+
-+        $this->productMock->expects($this->any())
-+            ->method('setData')
-+            ->with('_edit_mode', true);
-+
-+        $this->productMock->expects($this->any())
-             ->method('setTypeId')
--            ->with(\Magento\Catalog\Model\Product\Type::DEFAULT_TYPE)
--            ->willReturnSelf();
--        $this->productMock->expects($this->once())
--            ->method('load')
--            ->with(15)
--            ->willThrowException(new \Exception());
-+            ->with(ProductTypes::DEFAULT_TYPE);
-+
-+        $this->productMock->expects($this->any())
-+            ->method('setStoreId')
-+            ->with($productStore);
-+
-+        $this->productMock->expects($this->any())
-+            ->method('setAttributeSetId')
-+            ->with($productSet);
-+
-         $this->loggerMock->expects($this->once())
-             ->method('critical');
--        $this->productMock->expects($this->once())
--            ->method('setAttributeSetId')
--            ->with(3)
--            ->will($this->returnSelf());
-+
-+        $this->storeFactoryMock->expects($this->any())
-+            ->method('create')
-+            ->willReturn($this->storeMock);
-+
-+        $this->storeMock->expects($this->any())
-+            ->method('load')
-+            ->with($productStore)
-+            ->willReturnSelf();
-+
-         $registryValueMap = [
-             ['product', $this->productMock, $this->registryMock],
-             ['current_product', $this->productMock, $this->registryMock],
-+            ['current_store', $this->registryMock, $this->storeMock],
-         ];
-+
-         $this->registryMock->expects($this->any())
-             ->method('register')
--            ->will($this->returnValueMap($registryValueMap));
-+            ->willReturn($registryValueMap);
-+
-         $this->wysiwygConfigMock->expects($this->once())
-             ->method('setStoreId')
--            ->with('store');
-+            ->with($productStore);
-+
-         $this->assertEquals($this->productMock, $this->builder->build($this->requestMock));
-     }
- 
-     public function testBuildWhenProductNotExist()
-     {
-+        $productId = 0;
-+        $productType = 'type_id';
-+        $productStore = 'store';
-+        $productSet = 3;
-+
-         $valueMap = [
--            ['id', null, null],
--            ['store', 0, 'some_store'],
--            ['type', null, 'type_id'],
--            ['set', null, 3],
--            ['store', null, 'store'],
-+            ['id', null, $productId],
-+            ['type', null, $productType],
-+            ['set', null, $productSet],
-+            ['store', 0, $productStore],
-         ];
-+
-         $this->requestMock->expects($this->any())
-             ->method('getParam')
--            ->will($this->returnValueMap($valueMap));
-+            ->willReturnMap($valueMap);
-+
-+        $this->productRepositoryMock->expects($this->any())
-+            ->method('getById')
-+            ->with($productId, true, $productStore)
-+            ->willThrowException(new NoSuchEntityException());
-+
-         $this->productFactoryMock->expects($this->once())
-             ->method('create')
--            ->willReturn($this->productMock);
--        $this->productMock->expects($this->once())
--            ->method('setStoreId')
--            ->with('some_store')
--            ->willReturnSelf();
--        $productValueMap = [
--            ['type_id', $this->productMock],
--            [\Magento\Catalog\Model\Product\Type::DEFAULT_TYPE, $this->productMock],
--        ];
-+            ->will($this->returnValue($this->productMock));
-+
-+        $this->productMock->expects($this->any())
-+            ->method('setData')
-+            ->with('_edit_mode', true);
-+
-         $this->productMock->expects($this->any())
-             ->method('setTypeId')
--            ->willReturnMap($productValueMap);
--        $this->productMock->expects($this->never())
--            ->method('load');
--        $this->productMock->expects($this->once())
-+            ->with($productType);
-+
-+        $this->productMock->expects($this->any())
-+            ->method('setStoreId')
-+            ->with($productStore);
-+
-+        $this->productMock->expects($this->any())
-             ->method('setAttributeSetId')
--            ->with(3)
--            ->will($this->returnSelf());
-+            ->with($productSet);
-+
-+        $this->storeFactoryMock->expects($this->any())
-+            ->method('create')
-+            ->willReturn($this->storeMock);
-+
-+        $this->storeMock->expects($this->any())
-+            ->method('load')
-+            ->with($productStore)
-+            ->willReturnSelf();
-+
-         $registryValueMap = [
-             ['product', $this->productMock, $this->registryMock],
-             ['current_product', $this->productMock, $this->registryMock],
-+            ['current_store', $this->registryMock, $this->storeMock],
-         ];
-+
-         $this->registryMock->expects($this->any())
-             ->method('register')
--            ->will($this->returnValueMap($registryValueMap));
-+            ->willReturn($registryValueMap);
-+
-         $this->wysiwygConfigMock->expects($this->once())
-             ->method('setStoreId')
--            ->with('store');
-+            ->with($productStore);
-+
-         $this->assertEquals($this->productMock, $this->builder->build($this->requestMock));
-     }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
-index ff44a91a649..c889c58e3df 100644
---- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
-@@ -95,6 +95,11 @@ class HelperTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $attributeFilterMock;
- 
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $dateTimeFilterMock;
-+
-     /**
-      * @inheritdoc
-      */
-@@ -170,6 +175,11 @@ class HelperTest extends \PHPUnit\Framework\TestCase
-         $resolverProperty = $helperReflection->getProperty('linkResolver');
-         $resolverProperty->setAccessible(true);
-         $resolverProperty->setValue($this->helper, $this->linkResolverMock);
-+
-+        $this->dateTimeFilterMock = $this->createMock(\Magento\Framework\Stdlib\DateTime\Filter\DateTime::class);
-+        $dateTimeFilterProperty = $helperReflection->getProperty('dateTimeFilter');
-+        $dateTimeFilterProperty->setAccessible(true);
-+        $dateTimeFilterProperty->setValue($this->helper, $this->dateTimeFilterMock);
-     }
- 
-     /**
-@@ -211,6 +221,12 @@ class HelperTest extends \PHPUnit\Framework\TestCase
-         if (!empty($tierPrice)) {
-             $productData = array_merge($productData, ['tier_price' => $tierPrice]);
-         }
-+
-+        $this->dateTimeFilterMock->expects($this->once())
-+            ->method('filter')
-+            ->with($specialFromDate)
-+            ->willReturn($specialFromDate);
-+
-         $attributeNonDate = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php
-index d93520297e4..60c6f2f1bd8 100644
---- a/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php
-@@ -124,7 +124,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()->getMock();
-         $this->pageConfig->expects($this->any())->method('addBodyClass')->will($this->returnSelf());
- 
--        $this->page = $this->getMockBuilder(\Magento\Framework\View\Page::class)
-+        $this->page = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
-             ->setMethods(['getConfig', 'initLayout', 'addPageLayoutHandles', 'getLayout', 'addUpdate'])
-             ->disableOriginalConstructor()->getMock();
-         $this->page->expects($this->any())->method('getConfig')->will($this->returnValue($this->pageConfig));
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/SaveHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/SaveHandlerTest.php
-new file mode 100644
-index 00000000000..fbb96933db5
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/SaveHandlerTest.php
-@@ -0,0 +1,178 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Test\Unit\Model\Attribute\Backend\TierPrice;
-+
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\SaveHandler;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-+use Magento\Customer\Api\GroupManagementInterface;
-+use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice;
-+
-+/**
-+ * Unit tests for \Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\SaveHandler
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class SaveHandlerTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var SaveHandler|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $saveHandler;
-+
-+    /**
-+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var ProductAttributeRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $attributeRepository;
-+
-+    /**
-+     * @var GroupManagementInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $groupManagement;
-+
-+    /**
-+     * @var MetadataPool|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $metadataPoll;
-+
-+    /**
-+     * @var Tierprice|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $tierPriceResource;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = new ObjectManager($this);
-+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getStore'])
-+            ->getMockForAbstractClass();
-+        $this->attributeRepository = $this->getMockBuilder(ProductAttributeRepositoryInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['get'])
-+            ->getMockForAbstractClass();
-+        $this->groupManagement = $this->getMockBuilder(GroupManagementInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAllCustomersGroup'])
-+            ->getMockForAbstractClass();
-+        $this->metadataPoll = $this->getMockBuilder(MetadataPool::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getMetadata'])
-+            ->getMock();
-+        $this->tierPriceResource = $this->getMockBuilder(Tierprice::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods([])
-+            ->getMock();
-+
-+        $this->saveHandler = $this->objectManager->getObject(
-+            \Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\SaveHandler::class,
-+            [
-+                'storeManager' => $this->storeManager,
-+                'attributeRepository' => $this->attributeRepository,
-+                'groupManagement' => $this->groupManagement,
-+                'metadataPoll' => $this->metadataPoll,
-+                'tierPriceResource' => $this->tierPriceResource
-+            ]
-+        );
-+    }
-+
-+    public function testExecute(): void
-+    {
-+        $tierPrices = [
-+            ['website_id' => 0, 'price_qty' => 2, 'cust_group' => 0, 'price' => 10],
-+            ['website_id' => 0, 'price_qty' => 3, 'cust_group' => 3200, 'price' => null, 'percentage_value' => 20]
-+        ];
-+        $linkField = 'entity_id';
-+        $productId = 10;
-+
-+        /** @var \PHPUnit_Framework_MockObject_MockObject $product */
-+        $product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getData','setData', 'getStoreId'])
-+            ->getMockForAbstractClass();
-+        $product->expects($this->atLeastOnce())->method('getData')->willReturnMap(
-+            [
-+                ['tier_price', $tierPrices],
-+                ['entity_id', $productId]
-+            ]
-+        );
-+        $product->expects($this->atLeastOnce())->method('getStoreId')->willReturn(0);
-+        $product->expects($this->atLeastOnce())->method('setData')->with('tier_price_changed', 1);
-+        $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getWebsiteId'])
-+            ->getMockForAbstractClass();
-+        $store->expects($this->atLeastOnce())->method('getWebsiteId')->willReturn(0);
-+        $this->storeManager->expects($this->atLeastOnce())->method('getStore')->willReturn($store);
-+        /** @var \PHPUnit_Framework_MockObject_MockObject $attribute */
-+        $attribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getName', 'isScopeGlobal'])
-+            ->getMockForAbstractClass();
-+        $attribute->expects($this->atLeastOnce())->method('getName')->willReturn('tier_price');
-+        $attribute->expects($this->atLeastOnce())->method('isScopeGlobal')->willReturn(true);
-+        $this->attributeRepository->expects($this->atLeastOnce())->method('get')->with('tier_price')
-+            ->willReturn($attribute);
-+        $productMetadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getLinkField'])
-+            ->getMockForAbstractClass();
-+        $productMetadata->expects($this->atLeastOnce())->method('getLinkField')->willReturn($linkField);
-+        $this->metadataPoll->expects($this->atLeastOnce())->method('getMetadata')
-+            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
-+            ->willReturn($productMetadata);
-+        $customerGroup = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getId'])
-+            ->getMockForAbstractClass();
-+        $customerGroup->expects($this->atLeastOnce())->method('getId')->willReturn(3200);
-+        $this->groupManagement->expects($this->atLeastOnce())->method('getAllCustomersGroup')
-+            ->willReturn($customerGroup);
-+        $this->tierPriceResource->expects($this->atLeastOnce())->method('savePriceData')->willReturnSelf();
-+
-+        $this->assertEquals($product, $this->saveHandler->execute($product));
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\InputException
-+     * @expectedExceptionMessage Tier prices data should be array, but actually other type is received
-+     */
-+    public function testExecuteWithException(): void
-+    {
-+        /** @var \PHPUnit_Framework_MockObject_MockObject $attribute */
-+        $attribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getName', 'isScopeGlobal'])
-+            ->getMockForAbstractClass();
-+        $attribute->expects($this->atLeastOnce())->method('getName')->willReturn('tier_price');
-+        $this->attributeRepository->expects($this->atLeastOnce())->method('get')->with('tier_price')
-+            ->willReturn($attribute);
-+        /** @var \PHPUnit_Framework_MockObject_MockObject $product */
-+        $product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getData','setData', 'getStoreId', 'getOrigData'])
-+            ->getMockForAbstractClass();
-+        $product->expects($this->atLeastOnce())->method('getData')->with('tier_price')->willReturn(1);
-+
-+        $this->saveHandler->execute($product);
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/UpdateHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/UpdateHandlerTest.php
-new file mode 100644
-index 00000000000..cce00c50d37
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/UpdateHandlerTest.php
-@@ -0,0 +1,192 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Test\Unit\Model\Attribute\Backend\TierPrice;
-+
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\UpdateHandler;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-+use Magento\Customer\Api\GroupManagementInterface;
-+use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice;
-+
-+/**
-+ * Unit tests for \Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\UpdateHandler
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var UpdateHandler|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $updateHandler;
-+
-+    /**
-+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var ProductAttributeRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $attributeRepository;
-+
-+    /**
-+     * @var GroupManagementInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $groupManagement;
-+
-+    /**
-+     * @var MetadataPool|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $metadataPoll;
-+
-+    /**
-+     * @var Tierprice|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $tierPriceResource;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = new ObjectManager($this);
-+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getStore'])
-+            ->getMockForAbstractClass();
-+        $this->attributeRepository = $this->getMockBuilder(ProductAttributeRepositoryInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['get'])
-+            ->getMockForAbstractClass();
-+        $this->groupManagement = $this->getMockBuilder(GroupManagementInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAllCustomersGroup'])
-+            ->getMockForAbstractClass();
-+        $this->metadataPoll = $this->getMockBuilder(MetadataPool::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getMetadata'])
-+            ->getMock();
-+        $this->tierPriceResource = $this->getMockBuilder(Tierprice::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods([])
-+            ->getMock();
-+
-+        $this->updateHandler = $this->objectManager->getObject(
-+            \Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\UpdateHandler::class,
-+            [
-+                'storeManager' => $this->storeManager,
-+                'attributeRepository' => $this->attributeRepository,
-+                'groupManagement' => $this->groupManagement,
-+                'metadataPoll' => $this->metadataPoll,
-+                'tierPriceResource' => $this->tierPriceResource
-+            ]
-+        );
-+    }
-+
-+    public function testExecute(): void
-+    {
-+        $newTierPrices = [
-+            ['website_id' => 0, 'price_qty' => 2, 'cust_group' => 0, 'price' => 15],
-+            ['website_id' => 0, 'price_qty' => 3, 'cust_group' => 3200, 'price' => null, 'percentage_value' => 20]
-+        ];
-+        $priceIdToDelete = 2;
-+        $originalTierPrices = [
-+            ['price_id' => 1, 'website_id' => 0, 'price_qty' => 2, 'cust_group' => 0, 'price' => 10],
-+            ['price_id' => $priceIdToDelete, 'website_id' => 0, 'price_qty' => 4, 'cust_group' => 0, 'price' => 20],
-+        ];
-+        $linkField = 'entity_id';
-+        $productId = 10;
-+
-+        /** @var \PHPUnit_Framework_MockObject_MockObject $product */
-+        $product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getData','setData', 'getStoreId', 'getOrigData'])
-+            ->getMockForAbstractClass();
-+        $product->expects($this->atLeastOnce())->method('getData')->willReturnMap(
-+            [
-+                ['tier_price', $newTierPrices],
-+                ['entity_id', $productId]
-+            ]
-+        );
-+        $product->expects($this->atLeastOnce())->method('getOrigData')
-+            ->willReturnMap(
-+                [
-+                    ['tier_price', $originalTierPrices],
-+                    ['entity_id', $productId]
-+                ]
-+            );
-+        $product->expects($this->atLeastOnce())->method('getStoreId')->willReturn(0);
-+        $product->expects($this->atLeastOnce())->method('setData')->with('tier_price_changed', 1);
-+        $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getWebsiteId'])
-+            ->getMockForAbstractClass();
-+        $store->expects($this->atLeastOnce())->method('getWebsiteId')->willReturn(0);
-+        $this->storeManager->expects($this->atLeastOnce())->method('getStore')->willReturn($store);
-+        /** @var \PHPUnit_Framework_MockObject_MockObject $attribute */
-+        $attribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getName', 'isScopeGlobal'])
-+            ->getMockForAbstractClass();
-+        $attribute->expects($this->atLeastOnce())->method('getName')->willReturn('tier_price');
-+        $attribute->expects($this->atLeastOnce())->method('isScopeGlobal')->willReturn(true);
-+        $this->attributeRepository->expects($this->atLeastOnce())->method('get')->with('tier_price')
-+            ->willReturn($attribute);
-+        $productMetadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getLinkField'])
-+            ->getMockForAbstractClass();
-+        $productMetadata->expects($this->atLeastOnce())->method('getLinkField')->willReturn($linkField);
-+        $this->metadataPoll->expects($this->atLeastOnce())->method('getMetadata')
-+            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
-+            ->willReturn($productMetadata);
-+        $customerGroup = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getId'])
-+            ->getMockForAbstractClass();
-+        $customerGroup->expects($this->atLeastOnce())->method('getId')->willReturn(3200);
-+        $this->groupManagement->expects($this->atLeastOnce())->method('getAllCustomersGroup')
-+            ->willReturn($customerGroup);
-+        $this->tierPriceResource->expects($this->exactly(2))->method('savePriceData')->willReturnSelf();
-+        $this->tierPriceResource->expects($this->once())->method('deletePriceData')
-+            ->with($productId, null, $priceIdToDelete);
-+
-+        $this->assertEquals($product, $this->updateHandler->execute($product));
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\InputException
-+     * @expectedExceptionMessage Tier prices data should be array, but actually other type is received
-+     */
-+    public function testExecuteWithException(): void
-+    {
-+        /** @var \PHPUnit_Framework_MockObject_MockObject $attribute */
-+        $attribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getName', 'isScopeGlobal'])
-+            ->getMockForAbstractClass();
-+        $attribute->expects($this->atLeastOnce())->method('getName')->willReturn('tier_price');
-+        $this->attributeRepository->expects($this->atLeastOnce())->method('get')->with('tier_price')
-+            ->willReturn($attribute);
-+        /** @var \PHPUnit_Framework_MockObject_MockObject $product */
-+        $product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getData','setData', 'getStoreId', 'getOrigData'])
-+            ->getMockForAbstractClass();
-+        $product->expects($this->atLeastOnce())->method('getData')->with('tier_price')->willReturn(1);
-+
-+        $this->updateHandler->execute($product);
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
-index 8ca823127e6..6c6a69ec39c 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
-@@ -9,31 +9,41 @@ use Magento\Catalog\Model\Category\FileInfo;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\File\Mime;
- use Magento\Framework\Filesystem;
--use Magento\Framework\Filesystem\Directory\WriteInterface;
- use Magento\Framework\Filesystem\Directory\ReadInterface;
-+use Magento\Framework\Filesystem\Directory\WriteInterface;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
- 
--class FileInfoTest extends \PHPUnit\Framework\TestCase
-+/**
-+ * Test for Magento\Catalog\Model\Category\FileInfo class.
-+ */
-+class FileInfoTest extends TestCase
- {
-     /**
--     * @var Filesystem|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Filesystem|MockObject
-      */
-     private $filesystem;
- 
-     /**
--     * @var Mime|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Mime|MockObject
-      */
-     private $mime;
- 
-     /**
--     * @var WriteInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var WriteInterface|MockObject
-      */
-     private $mediaDirectory;
- 
-     /**
--     * @var ReadInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ReadInterface|MockObject
-      */
-     private $baseDirectory;
- 
-+    /**
-+     * @var ReadInterface|MockObject
-+     */
-+    private $pubDirectory;
-+
-     /**
-      * @var FileInfo
-      */
-@@ -44,30 +54,43 @@ class FileInfoTest extends \PHPUnit\Framework\TestCase
-         $this->mediaDirectory = $this->getMockBuilder(WriteInterface::class)
-             ->getMockForAbstractClass();
- 
--        $this->baseDirectory = $this->getMockBuilder(ReadInterface::class)
-+        $this->baseDirectory = $baseDirectory = $this->getMockBuilder(ReadInterface::class)
-+            ->getMockForAbstractClass();
-+
-+        $this->pubDirectory = $pubDirectory = $this->getMockBuilder(ReadInterface::class)
-             ->getMockForAbstractClass();
- 
-         $this->filesystem = $this->getMockBuilder(Filesystem::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->filesystem->expects($this->any())
--            ->method('getDirectoryWrite')
-+
-+        $this->filesystem->method('getDirectoryWrite')
-             ->with(DirectoryList::MEDIA)
-             ->willReturn($this->mediaDirectory);
- 
--        $this->filesystem->expects($this->any())
--            ->method('getDirectoryRead')
--            ->with(DirectoryList::ROOT)
--            ->willReturn($this->baseDirectory);
-+        $this->filesystem->method('getDirectoryRead')
-+            ->willReturnCallback(
-+                function ($arg) use ($baseDirectory, $pubDirectory) {
-+                    if ($arg === DirectoryList::PUB) {
-+                        return $pubDirectory;
-+                    }
-+                    return $baseDirectory;
-+                }
-+            );
- 
-         $this->mime = $this->getMockBuilder(Mime::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->baseDirectory->expects($this->any())
--            ->method('getAbsolutePath')
--            ->with(null)
--            ->willReturn('/a/b/c');
-+        $this->baseDirectory->method('getAbsolutePath')
-+            ->willReturn('/a/b/c/');
-+
-+        $this->baseDirectory->method('getRelativePath')
-+            ->with('/a/b/c/pub/')
-+            ->willReturn('pub/');
-+
-+        $this->pubDirectory->method('getAbsolutePath')
-+            ->willReturn('/a/b/c/pub/');
- 
-         $this->model = new FileInfo(
-             $this->filesystem,
-@@ -85,12 +108,12 @@ class FileInfoTest extends \PHPUnit\Framework\TestCase
-         $this->mediaDirectory->expects($this->at(0))
-             ->method('getAbsolutePath')
-             ->with(null)
--            ->willReturn('/a/b/c/pub/media');
-+            ->willReturn('/a/b/c/pub/media/');
- 
-         $this->mediaDirectory->expects($this->at(1))
-             ->method('getAbsolutePath')
-             ->with(null)
--            ->willReturn('/a/b/c/pub/media');
-+            ->willReturn('/a/b/c/pub/media/');
- 
-         $this->mediaDirectory->expects($this->at(2))
-             ->method('getAbsolutePath')
-@@ -113,13 +136,11 @@ class FileInfoTest extends \PHPUnit\Framework\TestCase
- 
-         $expected = ['size' => 1];
- 
--        $this->mediaDirectory->expects($this->any())
--            ->method('getAbsolutePath')
-+        $this->mediaDirectory->method('getAbsolutePath')
-             ->with(null)
--            ->willReturn('/a/b/c/pub/media');
-+            ->willReturn('/a/b/c/pub/media/');
- 
--        $this->mediaDirectory->expects($this->once())
--            ->method('stat')
-+        $this->mediaDirectory->method('stat')
-             ->with($mediaPath . $fileName)
-             ->willReturn($expected);
- 
-@@ -130,22 +151,52 @@ class FileInfoTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(1, $result['size']);
-     }
- 
--    public function testIsExist()
-+    /**
-+     * @param $fileName
-+     * @param $fileMediaPath
-+     * @dataProvider isExistProvider
-+     */
-+    public function testIsExist($fileName, $fileMediaPath)
-     {
--        $mediaPath = '/catalog/category';
-+        $this->mediaDirectory->method('getAbsolutePath')
-+            ->willReturn('/a/b/c/pub/media/');
- 
--        $fileName = '/filename.ext1';
--
--        $this->mediaDirectory->expects($this->any())
--            ->method('getAbsolutePath')
--            ->with(null)
--            ->willReturn('/a/b/c/pub/media');
--
--        $this->mediaDirectory->expects($this->once())
--            ->method('isExist')
--            ->with($mediaPath . $fileName)
-+        $this->mediaDirectory->method('isExist')
-+            ->with($fileMediaPath)
-             ->willReturn(true);
- 
-         $this->assertTrue($this->model->isExist($fileName));
-     }
-+
-+    public function isExistProvider()
-+    {
-+        return [
-+            ['/filename.ext1', '/catalog/category/filename.ext1'],
-+            ['/pub/media/filename.ext1', 'filename.ext1'],
-+            ['/media/filename.ext1', 'filename.ext1']
-+        ];
-+    }
-+
-+    /**
-+     * @param $fileName
-+     * @param $expected
-+     * @dataProvider isBeginsWithMediaDirectoryPathProvider
-+     */
-+    public function testIsBeginsWithMediaDirectoryPath($fileName, $expected)
-+    {
-+        $this->mediaDirectory->method('getAbsolutePath')
-+            ->willReturn('/a/b/c/pub/media/');
-+
-+        $this->assertEquals($expected, $this->model->isBeginsWithMediaDirectoryPath($fileName));
-+    }
-+
-+    public function isBeginsWithMediaDirectoryPathProvider()
-+    {
-+        return [
-+            ['/pub/media/test/filename.ext1', true],
-+            ['/media/test/filename.ext1', true],
-+            ['/test/filename.ext1', false],
-+            ['test2/filename.ext1', false]
-+        ];
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php
-index 1ff3a1bae5c..7ad8b1a0ab3 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php
-@@ -107,7 +107,7 @@ class PositionResolverTest extends \PHPUnit\Framework\TestCase
-         $this->select->expects($this->once())
-             ->method('where')
-             ->willReturnSelf();
--        $this->select->expects($this->once())
-+        $this->select->expects($this->exactly(2))
-             ->method('order')
-             ->willReturnSelf();
-         $this->select->expects($this->once())
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/TreeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/TreeTest.php
-index 9fb2adb2b8e..97c098ba0ff 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Category/TreeTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/TreeTest.php
-@@ -43,6 +43,11 @@ class TreeTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $node;
- 
-+    /**
-+     * @var \Magento\Catalog\Model\ResourceModel\Category\TreeFactory
-+     */
-+    private $treeResourceFactoryMock;
-+
-     protected function setUp()
-     {
-         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-@@ -59,6 +64,12 @@ class TreeTest extends \PHPUnit\Framework\TestCase
-             \Magento\Store\Model\StoreManagerInterface::class
-         )->disableOriginalConstructor()->getMock();
- 
-+        $this->treeResourceFactoryMock = $this->createMock(
-+            \Magento\Catalog\Model\ResourceModel\Category\TreeFactory::class
-+        );
-+        $this->treeResourceFactoryMock->method('create')
-+            ->willReturn($this->categoryTreeMock);
-+
-         $methods = ['create'];
-         $this->treeFactoryMock =
-             $this->createPartialMock(\Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory::class, $methods);
-@@ -70,7 +81,8 @@ class TreeTest extends \PHPUnit\Framework\TestCase
-                     'categoryCollection' => $this->categoryCollection,
-                     'categoryTree' => $this->categoryTreeMock,
-                     'storeManager' => $this->storeManagerMock,
--                    'treeFactory' => $this->treeFactoryMock
-+                    'treeFactory' => $this->treeFactoryMock,
-+                    'treeResourceFactory' => $this->treeResourceFactoryMock,
-                 ]
-             );
-     }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
-index df01d1bafac..b4042d6b02c 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
-@@ -7,7 +7,6 @@
- namespace Magento\Catalog\Test\Unit\Model;
- 
- use Magento\Catalog\Model\Indexer;
--use Magento\Eav\Model\Entity\GetCustomAttributeCodesInterface;
- 
- /**
-  * @SuppressWarnings(PHPMD.TooManyFields)
-@@ -120,11 +119,6 @@ class CategoryTest extends \PHPUnit\Framework\TestCase
-      */
-     private $objectManager;
- 
--    /**
--     * @var GetCustomAttributeCodesInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $getCustomAttributeCodes;
--
-     protected function setUp()
-     {
-         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-@@ -165,10 +159,6 @@ class CategoryTest extends \PHPUnit\Framework\TestCase
-         );
-         $this->attributeValueFactory = $this->getMockBuilder(\Magento\Framework\Api\AttributeValueFactory::class)
-             ->disableOriginalConstructor()->getMock();
--        $this->getCustomAttributeCodes = $this->getMockBuilder(GetCustomAttributeCodesInterface::class)
--            ->setMethods(['execute'])
--            ->disableOriginalConstructor()
--            ->getMockForAbstractClass();
- 
-         $this->category = $this->getCategoryModel();
-     }
-@@ -321,7 +311,6 @@ class CategoryTest extends \PHPUnit\Framework\TestCase
-                 'indexerRegistry' => $this->indexerRegistry,
-                 'metadataService' => $this->metadataServiceMock,
-                 'customAttributeFactory' => $this->attributeValueFactory,
--                'getCustomAttributeCodes' => $this->getCustomAttributeCodes
-             ]
-         );
-     }
-@@ -394,13 +383,16 @@ class CategoryTest extends \PHPUnit\Framework\TestCase
-     public function reindexFlatDisabledTestDataProvider()
-     {
-         return [
--            [false, null, null, null, 0],
--            [true, null, null, null, 0],
--            [false, [], null, null, 0],
--            [false, ["1", "2"], null, null, 1],
--            [false, null, 1, null, 1],
--            [false, ["1", "2"], 0, 1, 1],
--            [false, null, 1, 1, 0],
-+            [false, null, null, null, null, null, 0],
-+            [true, null, null, null, null, null,  0],
-+            [false, [], null, null, null, null, 0],
-+            [false, ["1", "2"], null, null, null, null, 1],
-+            [false, null, 1, null, null, null, 1],
-+            [false, ["1", "2"], 0, 1, null, null,  1],
-+            [false, null, 1, 1, null, null, 0],
-+            [false, ["1", "2"], null, null, 0, 1,  1],
-+            [false, ["1", "2"], null, null, 1, 0,  1],
-+
-         ];
-     }
- 
-@@ -418,11 +410,16 @@ class CategoryTest extends \PHPUnit\Framework\TestCase
-         $affectedIds,
-         $isAnchorOrig,
-         $isAnchor,
-+        $isActiveOrig,
-+        $isActive,
-         $expectedProductReindexCall
-     ) {
-         $this->category->setAffectedProductIds($affectedIds);
-         $this->category->setData('is_anchor', $isAnchor);
-         $this->category->setOrigData('is_anchor', $isAnchorOrig);
-+        $this->category->setData('is_active', $isActive);
-+        $this->category->setOrigData('is_active', $isActiveOrig);
-+
-         $this->category->setAffectedProductIds($affectedIds);
- 
-         $pathIds = ['path/1/2', 'path/2/3'];
-@@ -433,7 +430,7 @@ class CategoryTest extends \PHPUnit\Framework\TestCase
-             ->method('isFlatEnabled')
-             ->will($this->returnValue(false));
- 
--        $this->productIndexer->expects($this->exactly(1))
-+        $this->productIndexer
-             ->method('isScheduled')
-             ->willReturn($productScheduled);
-         $this->productIndexer->expects($this->exactly($expectedProductReindexCall))
-@@ -455,10 +452,20 @@ class CategoryTest extends \PHPUnit\Framework\TestCase
-         $initialCustomAttributeValue = 'initial description';
-         $newCustomAttributeValue = 'new description';
- 
--        $this->getCustomAttributeCodes->expects($this->exactly(3))
--            ->method('execute')
--            ->willReturn([$customAttributeCode]);
--        $this->category->setData($interfaceAttributeCode, "sub");
-+        $interfaceAttribute = $this->createMock(\Magento\Framework\Api\MetadataObjectInterface::class);
-+        $interfaceAttribute->expects($this->once())
-+            ->method('getAttributeCode')
-+            ->willReturn($interfaceAttributeCode);
-+        $colorAttribute = $this->createMock(\Magento\Framework\Api\MetadataObjectInterface::class);
-+        $colorAttribute->expects($this->once())
-+            ->method('getAttributeCode')
-+            ->willReturn($customAttributeCode);
-+        $customAttributesMetadata = [$interfaceAttribute, $colorAttribute];
-+
-+        $this->metadataServiceMock->expects($this->once())
-+            ->method('getCustomAttributesMetadata')
-+            ->willReturn($customAttributesMetadata);
-+        $this->category->setData($interfaceAttributeCode, 10);
- 
-         //The description attribute is not set, expect empty custom attribute array
-         $this->assertEquals([], $this->category->getCustomAttributes());
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
-index d8931cbbfcf..f0e17c7938b 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
-@@ -57,10 +57,14 @@ class CollectionProviderTest extends \PHPUnit\Framework\TestCase
-         $linkedProductOneMock = $this->createMock(Product::class);
-         $linkedProductTwoMock = $this->createMock(Product::class);
-         $linkedProductThreeMock = $this->createMock(Product::class);
-+        $linkedProductFourMock = $this->createMock(Product::class);
-+        $linkedProductFiveMock = $this->createMock(Product::class);
- 
-         $linkedProductOneMock->expects($this->once())->method('getId')->willReturn(1);
-         $linkedProductTwoMock->expects($this->once())->method('getId')->willReturn(2);
-         $linkedProductThreeMock->expects($this->once())->method('getId')->willReturn(3);
-+        $linkedProductFourMock->expects($this->once())->method('getId')->willReturn(4);
-+        $linkedProductFiveMock->expects($this->once())->method('getId')->willReturn(5);
- 
-         $this->converterPoolMock->expects($this->once())
-             ->method('getConverter')
-@@ -71,9 +75,11 @@ class CollectionProviderTest extends \PHPUnit\Framework\TestCase
-             [$linkedProductOneMock, ['name' => 'Product One', 'position' => 10]],
-             [$linkedProductTwoMock, ['name' => 'Product Two', 'position' => 2]],
-             [$linkedProductThreeMock, ['name' => 'Product Three', 'position' => 2]],
-+            [$linkedProductFourMock, ['name' => 'Product Four', 'position' => null]],
-+            [$linkedProductFiveMock, ['name' => 'Product Five']],
-         ];
- 
--        $this->converterMock->expects($this->exactly(3))->method('convert')->willReturnMap($map);
-+        $this->converterMock->expects($this->exactly(5))->method('convert')->willReturnMap($map);
- 
-         $this->providerMock->expects($this->once())
-             ->method('getLinkedProducts')
-@@ -82,14 +88,18 @@ class CollectionProviderTest extends \PHPUnit\Framework\TestCase
-                 [
-                     $linkedProductOneMock,
-                     $linkedProductTwoMock,
--                    $linkedProductThreeMock
-+                    $linkedProductThreeMock,
-+                    $linkedProductFourMock,
-+                    $linkedProductFiveMock,
-                 ]
-             );
- 
-         $expectedResult = [
--            2 => ['name' => 'Product Two', 'position' => 2],
--            3 => ['name' => 'Product Three', 'position' => 2],
--            10 => ['name' => 'Product One', 'position' => 10],
-+            0 => ['name' => 'Product Four', 'position' => 0],
-+            1 => ['name' => 'Product Five', 'position' => 0],
-+            2 => ['name' => 'Product Three', 'position' => 2],
-+            3 => ['name' => 'Product Two', 'position' => 2],
-+            4 => ['name' => 'Product One', 'position' => 10],
-         ];
- 
-         $actualResult = $this->model->getCollection($this->productMock, 'crosssell');
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Config/CatalogClone/Media/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Config/CatalogClone/Media/ImageTest.php
-index 5b1d3bf7943..23f0aec5b69 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Config/CatalogClone/Media/ImageTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Config/CatalogClone/Media/ImageTest.php
-@@ -9,6 +9,11 @@ use Magento\Catalog\Model\Product;
- use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- 
-+/**
-+ * Tests \Magento\Catalog\Model\Config\CatalogClone\Media\Image.
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class ImageTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -36,6 +41,14 @@ class ImageTest extends \PHPUnit\Framework\TestCase
-      */
-     private $attribute;
- 
-+    /**
-+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $escaperMock;
-+
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->eavConfig = $this->getMockBuilder(\Magento\Eav\Model\Config::class)
-@@ -62,54 +75,79 @@ class ImageTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        $this->escaperMock = $this->getMockBuilder(
-+            \Magento\Framework\Escaper::class
-+        )
-+            ->disableOriginalConstructor()
-+            ->setMethods(['escapeHtml'])
-+            ->getMock();
-+
-         $helper = new ObjectManager($this);
-         $this->model = $helper->getObject(
-             \Magento\Catalog\Model\Config\CatalogClone\Media\Image::class,
-             [
-                 'eavConfig' => $this->eavConfig,
--                'attributeCollectionFactory' => $this->attributeCollectionFactory
-+                'attributeCollectionFactory' => $this->attributeCollectionFactory,
-+                'escaper' => $this->escaperMock,
-             ]
-         );
-     }
- 
--    public function testGetPrefixes()
-+    /**
-+     * @param string $actualLabel
-+     * @param string $expectedLabel
-+     * @return void
-+     *
-+     * @dataProvider getPrefixesDataProvider
-+     */
-+    public function testGetPrefixes(string $actualLabel, string $expectedLabel): void
-     {
-         $entityTypeId = 3;
-         /** @var \Magento\Eav\Model\Entity\Type|\PHPUnit_Framework_MockObject_MockObject $entityType */
-         $entityType = $this->getMockBuilder(\Magento\Eav\Model\Entity\Type::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $entityType->expects($this->once())->method('getId')->will($this->returnValue($entityTypeId));
-+        $entityType->expects($this->once())->method('getId')->willReturn($entityTypeId);
- 
-         /** @var AbstractFrontend|\PHPUnit_Framework_MockObject_MockObject $frontend */
-         $frontend = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend::class)
-             ->setMethods(['getLabel'])
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
--        $frontend->expects($this->once())->method('getLabel')->will($this->returnValue('testLabel'));
-+        $frontend->expects($this->once())->method('getLabel')->willReturn($actualLabel);
- 
--        $this->attributeCollection->expects($this->once())->method('setEntityTypeFilter')->with(
--            $this->equalTo($entityTypeId)
--        );
--        $this->attributeCollection->expects($this->once())->method('setFrontendInputTypeFilter')->with(
--            $this->equalTo('media_image')
--        );
-+        $this->attributeCollection->expects($this->once())->method('setEntityTypeFilter')->with($entityTypeId);
-+        $this->attributeCollection->expects($this->once())->method('setFrontendInputTypeFilter')->with('media_image');
- 
--        $this->attribute->expects($this->once())->method('getAttributeCode')->will(
--            $this->returnValue('attributeCode')
--        );
--        $this->attribute->expects($this->once())->method('getFrontend')->will(
--            $this->returnValue($frontend)
--        );
-+        $this->attribute->expects($this->once())->method('getAttributeCode')->willReturn('attributeCode');
-+        $this->attribute->expects($this->once())->method('getFrontend')->willReturn($frontend);
- 
--        $this->attributeCollection->expects($this->any())->method('getIterator')->will(
--            $this->returnValue(new \ArrayIterator([$this->attribute]))
--        );
-+        $this->attributeCollection->expects($this->any())->method('getIterator')
-+            ->willReturn(new \ArrayIterator([$this->attribute]));
-+
-+        $this->eavConfig->expects($this->any())->method('getEntityType')->with(Product::ENTITY)
-+            ->willReturn($entityType);
- 
--        $this->eavConfig->expects($this->any())->method('getEntityType')->with(
--            $this->equalTo(Product::ENTITY)
--        )->will($this->returnValue($entityType));
-+        $this->escaperMock->expects($this->once())->method('escapeHtml')->with($actualLabel)
-+            ->willReturn($expectedLabel);
- 
--        $this->assertEquals([['field' => 'attributeCode_', 'label' => 'testLabel']], $this->model->getPrefixes());
-+        $this->assertEquals([['field' => 'attributeCode_', 'label' => $expectedLabel]], $this->model->getPrefixes());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getPrefixesDataProvider(): array
-+    {
-+        return [
-+            [
-+                'actual_label' => 'testLabel',
-+                'expected_label' => 'testLabel',
-+            ],
-+            [
-+                'actual_label' => '<media-image-attributelabel',
-+                'expected_label' => '&lt;media-image-attributelabel',
-+            ],
-+        ];
-     }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Entity/GetCategoryCustomAttributeCodesTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Entity/GetCategoryCustomAttributeCodesTest.php
-deleted file mode 100644
-index 465063dccd3..00000000000
---- a/app/code/Magento/Catalog/Test/Unit/Model/Entity/GetCategoryCustomAttributeCodesTest.php
-+++ /dev/null
-@@ -1,66 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Catalog\Test\Unit\Model\Entity;
--
--use Magento\Catalog\Model\Entity\GetCategoryCustomAttributeCodes;
--use Magento\Eav\Model\Entity\GetCustomAttributeCodesInterface;
--use Magento\Framework\Api\MetadataServiceInterface;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
--use PHPUnit\Framework\TestCase;
--
--/**
-- * Provide tests for GetCategoryCustomAttributeCodes entity model.
-- */
--class GetCategoryCustomAttributeCodesTest extends TestCase
--{
--    /**
--     * Test subject.
--     *
--     * @var GetCategoryCustomAttributeCodes
--     */
--    private $getCategoryCustomAttributeCodes;
--
--    /**
--     * @var GetCustomAttributeCodesInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $baseCustomAttributeCodes;
--
--    /**
--     * @inheritdoc
--     */
--    protected function setUp()
--    {
--        $this->baseCustomAttributeCodes = $this->getMockBuilder(GetCustomAttributeCodesInterface::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['execute'])
--            ->getMockForAbstractClass();
--        $objectManager = new ObjectManager($this);
--        $this->getCategoryCustomAttributeCodes = $objectManager->getObject(
--            GetCategoryCustomAttributeCodes::class,
--            ['baseCustomAttributeCodes' => $this->baseCustomAttributeCodes]
--        );
--    }
--
--    /**
--     * Test GetCategoryCustomAttributeCodes::execute() will return only custom category attribute codes.
--     */
--    public function testExecute()
--    {
--        /** @var MetadataServiceInterface|\PHPUnit_Framework_MockObject_MockObject $metadataService */
--        $metadataService = $this->getMockBuilder(MetadataServiceInterface::class)
--            ->disableOriginalConstructor()
--            ->getMockForAbstractClass();
--        $this->baseCustomAttributeCodes->expects($this->once())
--            ->method('execute')
--            ->with($this->identicalTo($metadataService))
--            ->willReturn(['test_custom_attribute_code', 'name']);
--        $this->assertEquals(
--            ['test_custom_attribute_code'],
--            $this->getCategoryCustomAttributeCodes->execute($metadataService)
--        );
--    }
--}
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Entity/GetProductCustomAttributeCodesTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Entity/GetProductCustomAttributeCodesTest.php
-deleted file mode 100644
-index a37e1c6df09..00000000000
---- a/app/code/Magento/Catalog/Test/Unit/Model/Entity/GetProductCustomAttributeCodesTest.php
-+++ /dev/null
-@@ -1,66 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Catalog\Test\Unit\Model\Entity;
--
--use Magento\Catalog\Model\Entity\GetProductCustomAttributeCodes;
--use Magento\Eav\Model\Entity\GetCustomAttributeCodesInterface;
--use Magento\Framework\Api\MetadataServiceInterface;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
--use PHPUnit\Framework\TestCase;
--
--/**
-- * Provide tests for GetProductCustomAttributeCodes entity model.
-- */
--class GetProductCustomAttributeCodesTest extends TestCase
--{
--    /**
--     * Test subject.
--     *
--     * @var GetProductCustomAttributeCodes
--     */
--    private $getProductCustomAttributeCodes;
--
--    /**
--     * @var GetCustomAttributeCodesInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $baseCustomAttributeCodes;
--
--    /**
--     * @inheritdoc
--     */
--    protected function setUp()
--    {
--        $this->baseCustomAttributeCodes = $this->getMockBuilder(GetCustomAttributeCodesInterface::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['execute'])
--            ->getMockForAbstractClass();
--        $objectManager = new ObjectManager($this);
--        $this->getProductCustomAttributeCodes = $objectManager->getObject(
--            GetProductCustomAttributeCodes::class,
--            ['baseCustomAttributeCodes' => $this->baseCustomAttributeCodes]
--        );
--    }
--
--    /**
--     * Test GetProductCustomAttributeCodes::execute() will return only custom product attribute codes.
--     */
--    public function testExecute()
--    {
--        /** @var MetadataServiceInterface|\PHPUnit_Framework_MockObject_MockObject $metadataService */
--        $metadataService = $this->getMockBuilder(MetadataServiceInterface::class)
--            ->disableOriginalConstructor()
--            ->getMockForAbstractClass();
--        $this->baseCustomAttributeCodes->expects($this->once())
--            ->method('execute')
--            ->with($this->identicalTo($metadataService))
--            ->willReturn(['test_custom_attribute_code', 'name']);
--        $this->assertEquals(
--            ['test_custom_attribute_code'],
--            $this->getProductCustomAttributeCodes->execute($metadataService)
--        );
--    }
--}
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ImageUploaderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ImageUploaderTest.php
-index c989f2dd474..6552e854400 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/ImageUploaderTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/ImageUploaderTest.php
-@@ -69,10 +69,17 @@ class ImageUploaderTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Allowed extensions
-      *
--     * @var string
-+     * @var array
-      */
-     private $allowedExtensions;
- 
-+    /**
-+     * Allowed mime types
-+     *
-+     * @var array
-+     */
-+    private $allowedMimeTypes;
-+
-     protected function setUp()
-     {
-         $this->coreFileStorageDatabaseMock = $this->createMock(
-@@ -97,6 +104,7 @@ class ImageUploaderTest extends \PHPUnit\Framework\TestCase
-         $this->baseTmpPath = 'base/tmp/';
-         $this->basePath =  'base/real/';
-         $this->allowedExtensions = ['.jpg'];
-+        $this->allowedMimeTypes = ['image/jpg', 'image/jpeg', 'image/gif', 'image/png'];
- 
-         $this->imageUploader =
-             new \Magento\Catalog\Model\ImageUploader(
-@@ -107,7 +115,8 @@ class ImageUploaderTest extends \PHPUnit\Framework\TestCase
-                 $this->loggerMock,
-                 $this->baseTmpPath,
-                 $this->basePath,
--                $this->allowedExtensions
-+                $this->allowedExtensions,
-+                $this->allowedMimeTypes
-             );
-     }
- 
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
-index 90c3f999a6a..2e1cff834fd 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
-@@ -3,15 +3,29 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Eav\Action;
- 
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\Indexer\Product\Eav\Action\Full;
- use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Decimal;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Source;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+use Magento\Framework\DB\Query\Generator;
-+use Magento\Framework\DB\Select;
-+use Magento\Framework\EntityManager\EntityMetadataInterface;
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory;
- use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\Indexer\BatchProviderInterface;
- use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator;
-+use PHPUnit\Framework\MockObject\MockObject as MockObject;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -19,45 +33,50 @@ use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator;
- class FullTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\Catalog\Model\Indexer\Product\Eav\Action\Full|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Full|MockObject
-      */
-     private $model;
- 
-     /**
--     * @var DecimalFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var DecimalFactory|MockObject
-      */
-     private $eavDecimalFactory;
- 
-     /**
--     * @var SourceFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var SourceFactory|MockObject
-      */
-     private $eavSourceFactory;
- 
-     /**
--     * @var MetadataPool|\PHPUnit_Framework_MockObject_MockObject
-+     * @var MetadataPool|MockObject
-      */
-     private $metadataPool;
- 
-     /**
--     * @var BatchProviderInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var BatchProviderInterface|MockObject
-      */
-     private $batchProvider;
- 
-     /**
--     * @var BatchSizeCalculator|\PHPUnit_Framework_MockObject_MockObject
-+     * @var BatchSizeCalculator|MockObject
-      */
-     private $batchSizeCalculator;
- 
-     /**
--     * @var ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ActiveTableSwitcher|MockObject
-      */
-     private $activeTableSwitcher;
- 
-     /**
--     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ScopeConfigInterface|MockObject
-      */
-     private $scopeConfig;
- 
-+    /**
-+     * @var Generator
-+     */
-+    private $batchQueryGenerator;
-+
-     /**
-      * @return void
-      */
-@@ -67,15 +86,16 @@ class FullTest extends \PHPUnit\Framework\TestCase
-         $this->eavSourceFactory = $this->createPartialMock(SourceFactory::class, ['create']);
-         $this->metadataPool = $this->createMock(MetadataPool::class);
-         $this->batchProvider = $this->getMockForAbstractClass(BatchProviderInterface::class);
-+        $this->batchQueryGenerator = $this->createMock(Generator::class);
-         $this->batchSizeCalculator = $this->createMock(BatchSizeCalculator::class);
-         $this->activeTableSwitcher = $this->createMock(ActiveTableSwitcher::class);
--        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
-+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
- 
-         $objectManager = new ObjectManager($this);
-         $this->model = $objectManager->getObject(
--            \Magento\Catalog\Model\Indexer\Product\Eav\Action\Full::class,
-+            Full::class,
-             [
-                 'eavDecimalFactory' => $this->eavDecimalFactory,
-                 'eavSourceFactory' => $this->eavSourceFactory,
-@@ -83,7 +103,8 @@ class FullTest extends \PHPUnit\Framework\TestCase
-                 'batchProvider' => $this->batchProvider,
-                 'batchSizeCalculator' => $this->batchSizeCalculator,
-                 'activeTableSwitcher' => $this->activeTableSwitcher,
--                'scopeConfig' => $this->scopeConfig
-+                'scopeConfig' => $this->scopeConfig,
-+                'batchQueryGenerator' => $this->batchQueryGenerator,
-             ]
-         );
-     }
-@@ -96,15 +117,15 @@ class FullTest extends \PHPUnit\Framework\TestCase
-         $this->scopeConfig->expects($this->once())->method('getValue')->willReturn(1);
- 
-         $ids = [1, 2, 3];
--        $connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
-+        $connectionMock = $this->getMockBuilder(AdapterInterface::class)
-             ->getMockForAbstractClass();
- 
-         $connectionMock->expects($this->atLeastOnce())->method('describeTable')->willReturn(['id' => []]);
--        $eavSource = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Source::class)
-+        $eavSource = $this->getMockBuilder(Source::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $eavDecimal = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Decimal::class)
-+        $eavDecimal = $this->getMockBuilder(Decimal::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-@@ -125,22 +146,28 @@ class FullTest extends \PHPUnit\Framework\TestCase
- 
-         $this->eavSourceFactory->expects($this->once())->method('create')->will($this->returnValue($eavDecimal));
- 
--        $entityMetadataMock = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
-+        $entityMetadataMock = $this->getMockBuilder(EntityMetadataInterface::class)
-             ->getMockForAbstractClass();
- 
-         $this->metadataPool->expects($this->atLeastOnce())
-             ->method('getMetadata')
--            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
-+            ->with(ProductInterface::class)
-             ->willReturn($entityMetadataMock);
- 
--        $this->batchProvider->expects($this->atLeastOnce())
--            ->method('getBatches')
--            ->willReturn([['from' => 10, 'to' => 100]]);
--        $this->batchProvider->expects($this->atLeastOnce())
--            ->method('getBatchIds')
-+        // Super inefficient algorithm in some cases
-+        $this->batchProvider->expects($this->never())
-+            ->method('getBatches');
-+
-+        $batchQuery = $this->createMock(Select::class);
-+
-+        $connectionMock->method('fetchCol')
-+            ->with($batchQuery)
-             ->willReturn($ids);
- 
--        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
-+        $this->batchQueryGenerator->method('generate')
-+            ->willReturn([$batchQuery]);
-+
-+        $selectMock = $this->getMockBuilder(Select::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-@@ -153,7 +180,7 @@ class FullTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @return void
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws LocalizedException
-      */
-     public function testExecuteWithDisabledEavIndexer()
-     {
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/EraserTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/EraserTest.php
-index cc6f5d84ef0..e1e2816d442 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/EraserTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/EraserTest.php
-@@ -53,8 +53,14 @@ class EraserTest extends \PHPUnit\Framework\TestCase
-     {
-         $productsToDeleteIds = [1, 2];
-         $select = $this->createMock(\Magento\Framework\DB\Select::class);
--        $select->expects($this->once())->method('from')->with('catalog_product_entity')->will($this->returnSelf());
--        $select->expects($this->once())->method('where')->with('entity_id IN(?)', $productsToDeleteIds)
-+        $select->expects($this->once())
-+            ->method('from')
-+            ->with(['product_table' => 'catalog_product_entity'])
-+            ->will($this->returnSelf());
-+        $select->expects($this->once())->method('columns')->with('entity_id')->will($this->returnSelf());
-+        $select->expects($this->once())
-+            ->method('where')
-+            ->with('product_table.entity_id IN(?)', $productsToDeleteIds)
-             ->will($this->returnSelf());
-         $products = [['entity_id' => 2]];
-         $statement = $this->createMock(\Zend_Db_Statement_Interface::class);
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
-index 7b2a2ff304b..11d07872fef 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
-@@ -6,8 +6,13 @@
- 
- namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Flat\Action;
- 
-+use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class RowTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -16,76 +21,116 @@ class RowTest extends \PHPUnit\Framework\TestCase
-     protected $model;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var MockObject
-      */
-     protected $storeManager;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var MockObject
-      */
-     protected $store;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var MockObject
-      */
-     protected $productIndexerHelper;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var MockObject
-      */
-     protected $resource;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var MockObject
-      */
-     protected $connection;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var MockObject
-      */
-     protected $flatItemWriter;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var MockObject
-      */
-     protected $flatItemEraser;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var MockObject
-      */
-     protected $flatTableBuilder;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $objectManager = new ObjectManager($this);
- 
-+        $attributeTable = 'catalog_product_entity_int';
-+        $statusId = 22;
-         $this->connection = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
-         $this->resource = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
-         $this->resource->expects($this->any())->method('getConnection')
-             ->with('default')
--            ->will($this->returnValue($this->connection));
-+            ->willReturn($this->connection);
-         $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-         $this->store = $this->createMock(\Magento\Store\Model\Store::class);
--        $this->store->expects($this->any())->method('getId')->will($this->returnValue('store_id_1'));
--        $this->storeManager->expects($this->any())->method('getStores')->will($this->returnValue([$this->store]));
--        $this->productIndexerHelper = $this->createMock(\Magento\Catalog\Helper\Product\Flat\Indexer::class);
-+        $this->store->expects($this->any())->method('getId')->willReturn('store_id_1');
-+        $this->storeManager->expects($this->any())->method('getStores')->willReturn([$this->store]);
-         $this->flatItemEraser = $this->createMock(\Magento\Catalog\Model\Indexer\Product\Flat\Action\Eraser::class);
-         $this->flatItemWriter = $this->createMock(\Magento\Catalog\Model\Indexer\Product\Flat\Action\Indexer::class);
-         $this->flatTableBuilder = $this->createMock(
-             \Magento\Catalog\Model\Indexer\Product\Flat\FlatTableBuilder::class
-         );
-+        $this->productIndexerHelper = $this->createMock(\Magento\Catalog\Helper\Product\Flat\Indexer::class);
-+        $statusAttributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->productIndexerHelper->expects($this->any())->method('getAttribute')
-+            ->with('status')
-+            ->willReturn($statusAttributeMock);
-+        $backendMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $backendMock->expects($this->any())->method('getTable')->willReturn($attributeTable);
-+        $statusAttributeMock->expects($this->any())->method('getBackend')->willReturn($backendMock);
-+        $statusAttributeMock->expects($this->any())->method('getId')->willReturn($statusId);
-+        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->connection->expects($this->any())->method('select')->willReturn($selectMock);
-+        $selectMock->method('from')
-+            ->willReturnSelf();
-+        $selectMock->method('joinLeft')
-+            ->willReturnSelf();
-+        $selectMock->expects($this->any())->method('where')->willReturnSelf();
-+        $selectMock->expects($this->any())->method('order')->willReturnSelf();
-+        $selectMock->expects($this->any())->method('limit')->willReturnSelf();
-+        $pdoMock = $this->createMock(\Zend_Db_Statement_Pdo::class);
-+        $this->connection->expects($this->any())->method('query')->with($selectMock)->willReturn($pdoMock);
-+        $pdoMock->expects($this->any())->method('fetchColumn')->willReturn('1');
-+
-+        $metadataPool = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
-+        $productMetadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
-+            ->getMockForAbstractClass();
-+        $metadataPool->expects($this->any())->method('getMetadata')->with(ProductInterface::class)
-+            ->willReturn($productMetadata);
-+        $productMetadata->expects($this->any())->method('getLinkField')->willReturn('entity_id');
- 
-         $this->model = $objectManager->getObject(
-             \Magento\Catalog\Model\Indexer\Product\Flat\Action\Row::class,
-             [
--                'resource' => $this->resource,
--                'storeManager' => $this->storeManager,
--                'productHelper' => $this->productIndexerHelper,
--                'flatItemEraser' => $this->flatItemEraser,
--                'flatItemWriter' => $this->flatItemWriter,
--                'flatTableBuilder' => $this->flatTableBuilder
-+                'resource'         => $this->resource,
-+                'storeManager'     => $this->storeManager,
-+                'productHelper'    => $this->productIndexerHelper,
-+                'flatItemEraser'   => $this->flatItemEraser,
-+                'flatItemWriter'   => $this->flatItemWriter,
-+                'flatTableBuilder' => $this->flatTableBuilder,
-             ]
-         );
-+
-+        $objectManager->setBackwardCompatibleProperty($this->model, 'metadataPool', $metadataPool);
-     }
- 
-     /**
-@@ -100,9 +145,9 @@ class RowTest extends \PHPUnit\Framework\TestCase
-     public function testExecuteWithNonExistingFlatTablesCreatesTables()
-     {
-         $this->productIndexerHelper->expects($this->any())->method('getFlatTableName')
--            ->will($this->returnValue('store_flat_table'));
-+            ->willReturn('store_flat_table');
-         $this->connection->expects($this->any())->method('isTableExists')->with('store_flat_table')
--            ->will($this->returnValue(false));
-+            ->willReturn(false);
-         $this->flatItemEraser->expects($this->never())->method('removeDeletedProducts');
-         $this->flatTableBuilder->expects($this->once())->method('build')->with('store_id_1', ['product_id_1']);
-         $this->flatItemWriter->expects($this->once())->method('write')->with('store_id_1', 'product_id_1');
-@@ -112,9 +157,9 @@ class RowTest extends \PHPUnit\Framework\TestCase
-     public function testExecuteWithExistingFlatTablesCreatesTables()
-     {
-         $this->productIndexerHelper->expects($this->any())->method('getFlatTableName')
--            ->will($this->returnValue('store_flat_table'));
-+            ->willReturn('store_flat_table');
-         $this->connection->expects($this->any())->method('isTableExists')->with('store_flat_table')
--            ->will($this->returnValue(true));
-+            ->willReturn(true);
-         $this->flatItemEraser->expects($this->once())->method('removeDeletedProducts');
-         $this->flatTableBuilder->expects($this->never())->method('build')->with('store_id_1', ['product_id_1']);
-         $this->model->execute('product_id_1');
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php
-index f2c77627e38..8ca23df31cd 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php
-@@ -152,7 +152,7 @@ class PriceTest extends \PHPUnit\Framework\TestCase
-         $this->productCollection->expects($this->once())
-             ->method('getMaxPrice')
-             ->will($this->returnValue($maxPrice));
--        $this->assertSame(floatval($maxPrice), $this->target->getMaxPrice());
-+        $this->assertSame((float)$maxPrice, $this->target->getMaxPrice());
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
-index 3cc6f94d58c..1b42b09e5dd 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
-@@ -10,7 +10,6 @@ namespace Magento\Catalog\Test\Unit\Model\Product\Attribute;
- use Magento\Catalog\Api\Data\ProductAttributeInterface;
- use Magento\Catalog\Model\Product\Attribute\Repository;
- use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
--use Magento\Eav\Api\Data\AttributeFrontendLabelInterface;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -72,6 +71,9 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     private $optionManagementMock;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->attributeResourceMock =
-@@ -116,6 +118,9 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testGet()
-     {
-         $attributeCode = 'some attribute code';
-@@ -128,6 +133,9 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->model->get($attributeCode);
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testGetList()
-     {
-         $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
-@@ -141,6 +149,9 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->model->getList($searchCriteriaMock);
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testDelete()
-     {
-         $attributeMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
-@@ -149,6 +160,9 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(true, $this->model->delete($attributeMock));
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testDeleteById()
-     {
-         $attributeCode = 'some attribute code';
-@@ -164,6 +178,9 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(true, $this->model->deleteById($attributeCode));
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testGetCustomAttributesMetadata()
-     {
-         $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
-@@ -235,15 +252,18 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         );
-         $attributeMock->expects($this->once())->method('getAttributeId')->willReturn(null);
-         $attributeMock->expects($this->once())->method('setAttributeId')->with(null)->willReturnSelf();
--        $labelMock = $this->createMock(\Magento\Eav\Api\Data\AttributeFrontendLabelInterface::class);
--        $attributeMock->expects($this->exactly(4))->method('getFrontendLabels')->willReturn([$labelMock]);
--        $attributeMock->expects($this->exactly(2))->method('getDefaultFrontendLabel')->willReturn('test');
-+        $labelMock = $this->createMock(\Magento\Eav\Model\Entity\Attribute\FrontendLabel::class);
-+        $attributeMock->expects($this->any())->method('getFrontendLabels')->willReturn([$labelMock]);
-+        $attributeMock->expects($this->any())->method('getDefaultFrontendLabel')->willReturn(null);
-         $labelMock->expects($this->once())->method('getStoreId')->willReturn(0);
-         $labelMock->expects($this->once())->method('getLabel')->willReturn(null);
- 
-         $this->model->save($attributeMock);
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testSaveDoesNotSaveAttributeOptionsIfOptionsAreAbsentInPayload()
-     {
-         $attributeId = 1;
-@@ -260,7 +280,7 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-             ->method('get')
-             ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode)
-             ->willReturn($existingModelMock);
--
-+        $existingModelMock->expects($this->once())->method('getDefaultFrontendLabel')->willReturn('default_label');
-         // Attribute code must not be changed after attribute creation
-         $attributeMock->expects($this->once())->method('setAttributeCode')->with($attributeCode);
-         $this->attributeResourceMock->expects($this->once())->method('save')->with($attributeMock);
-@@ -269,9 +289,12 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->model->save($attributeMock);
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testSaveSavesDefaultFrontendLabelIfItIsPresentInPayload()
-     {
--        $labelMock = $this->createMock(AttributeFrontendLabelInterface::class);
-+        $labelMock = $this->createMock(\Magento\Eav\Api\Data\AttributeFrontendLabelInterface::class);
-         $labelMock->expects($this->any())->method('getStoreId')->willReturn(1);
-         $labelMock->expects($this->any())->method('getLabel')->willReturn('Store Scope Label');
- 
-@@ -280,11 +303,12 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         $attributeMock = $this->createMock(Attribute::class);
-         $attributeMock->expects($this->any())->method('getAttributeCode')->willReturn($attributeCode);
-         $attributeMock->expects($this->any())->method('getAttributeId')->willReturn($attributeId);
--        $attributeMock->expects($this->any())->method('getDefaultFrontendLabel')->willReturn('Default Label');
-+        $attributeMock->expects($this->any())->method('getDefaultFrontendLabel')->willReturn(null);
-         $attributeMock->expects($this->any())->method('getFrontendLabels')->willReturn([$labelMock]);
-         $attributeMock->expects($this->any())->method('getOptions')->willReturn([]);
- 
-         $existingModelMock = $this->createMock(Attribute::class);
-+        $existingModelMock->expects($this->any())->method('getDefaultFrontendLabel')->willReturn('Default Label');
-         $existingModelMock->expects($this->any())->method('getAttributeId')->willReturn($attributeId);
-         $existingModelMock->expects($this->any())->method('getAttributeCode')->willReturn($attributeCode);
- 
-@@ -295,12 +319,7 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
- 
-         $attributeMock->expects($this->once())
-             ->method('setDefaultFrontendLabel')
--            ->with(
--                [
--                    0 => 'Default Label',
--                    1 => 'Store Scope Label'
--                ]
--            );
-+            ->with('Default Label');
-         $this->attributeResourceMock->expects($this->once())->method('save')->with($attributeMock);
- 
-         $this->model->save($attributeMock);
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
-index 31fd0696db3..80b6db2a516 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
-@@ -6,9 +6,12 @@
- namespace Magento\Catalog\Test\Unit\Model\Product;
- 
- use Magento\Catalog\Api\Data\ProductInterface;
--use \Magento\Catalog\Model\Product\Copier;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Copier;
- 
- /**
-+ * Test for Magento\Catalog\Model\Product\Copier class.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class CopierTest extends \PHPUnit\Framework\TestCase
-@@ -54,7 +57,7 @@ class CopierTest extends \PHPUnit\Framework\TestCase
-             \Magento\Catalog\Model\Product\Option\Repository::class
-         );
-         $this->optionRepositoryMock;
--        $this->productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
-+        $this->productMock = $this->createMock(Product::class);
-         $this->productMock->expects($this->any())->method('getEntityId')->willReturn(1);
- 
-         $this->metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadata::class)
-@@ -75,6 +78,9 @@ class CopierTest extends \PHPUnit\Framework\TestCase
-         ]);
-     }
- 
-+    /**
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-     public function testCopy()
-     {
-         $stockItem = $this->getMockBuilder(\Magento\CatalogInventory\Api\Data\StockItemInterface::class)
-@@ -102,11 +108,47 @@ class CopierTest extends \PHPUnit\Framework\TestCase
-             ['linkField', null, '1'],
-         ]);
- 
--        $resourceMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product::class);
--        $this->productMock->expects($this->once())->method('getResource')->will($this->returnValue($resourceMock));
-+        $entityMock = $this->getMockForAbstractClass(
-+            \Magento\Eav\Model\Entity\AbstractEntity::class,
-+            [],
-+            '',
-+            false,
-+            true,
-+            true,
-+            ['checkAttributeUniqueValue']
-+        );
-+        $entityMock->expects($this->any())
-+            ->method('checkAttributeUniqueValue')
-+            ->willReturn(true);
-+
-+        $attributeMock = $this->getMockForAbstractClass(
-+            \Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class,
-+            [],
-+            '',
-+            false,
-+            true,
-+            true,
-+            ['getEntity']
-+        );
-+        $attributeMock->expects($this->any())
-+            ->method('getEntity')
-+            ->willReturn($entityMock);
-+
-+        $resourceMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributeRawValue', 'duplicate', 'getAttribute'])
-+            ->getMock();
-+        $resourceMock->expects($this->any())
-+            ->method('getAttributeRawValue')
-+            ->willReturn('urk-key-1');
-+        $resourceMock->expects($this->any())
-+            ->method('getAttribute')
-+            ->willReturn($attributeMock);
-+
-+        $this->productMock->expects($this->any())->method('getResource')->will($this->returnValue($resourceMock));
- 
-         $duplicateMock = $this->createPartialMock(
--            \Magento\Catalog\Model\Product::class,
-+            Product::class,
-             [
-                 '__wakeup',
-                 'setData',
-@@ -118,11 +160,11 @@ class CopierTest extends \PHPUnit\Framework\TestCase
-                 'setCreatedAt',
-                 'setUpdatedAt',
-                 'setId',
--                'setStoreId',
-                 'getEntityId',
-                 'save',
-                 'setUrlKey',
--                'getUrlKey',
-+                'setStoreId',
-+                'getStoreIds',
-             ]
-         );
-         $this->productFactoryMock->expects($this->once())->method('create')->will($this->returnValue($duplicateMock));
-@@ -137,27 +179,22 @@ class CopierTest extends \PHPUnit\Framework\TestCase
-         )->with(
-             \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED
-         );
-+        $duplicateMock->expects($this->atLeastOnce())->method('setStoreId');
-         $duplicateMock->expects($this->once())->method('setCreatedAt')->with(null);
-         $duplicateMock->expects($this->once())->method('setUpdatedAt')->with(null);
-         $duplicateMock->expects($this->once())->method('setId')->with(null);
--        $duplicateMock->expects(
--            $this->once()
--        )->method(
--            'setStoreId'
--        )->with(
--            \Magento\Store\Model\Store::DEFAULT_STORE_ID
--        );
--        $duplicateMock->expects($this->once())->method('setData')->with($productData);
-+        $duplicateMock->expects($this->atLeastOnce())->method('getStoreIds')->willReturn([]);
-+        $duplicateMock->expects($this->atLeastOnce())->method('setData')->willReturn($duplicateMock);
-         $this->copyConstructorMock->expects($this->once())->method('build')->with($this->productMock, $duplicateMock);
--        $duplicateMock->expects($this->once())->method('getUrlKey')->willReturn('urk-key-1');
--        $duplicateMock->expects($this->once())->method('setUrlKey')->with('urk-key-2');
-+        $duplicateMock->expects($this->once())->method('setUrlKey')->with('urk-key-2')->willReturn($duplicateMock);
-         $duplicateMock->expects($this->once())->method('save');
- 
-         $this->metadata->expects($this->any())->method('getLinkField')->willReturn('linkField');
- 
-         $duplicateMock->expects($this->any())->method('getData')->willReturnMap([
-             ['linkField', null, '2'],
--        ]);        $this->optionRepositoryMock->expects($this->once())
-+        ]);
-+        $this->optionRepositoryMock->expects($this->once())
-             ->method('duplicate')
-             ->with($this->productMock, $duplicateMock);
-         $resourceMock->expects($this->once())->method('duplicate')->with(1, 2);
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php
-index 9fafbc9d967..1d12645019d 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php
-@@ -266,7 +266,7 @@ class GalleryManagementTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
--     * @expectedExceptionText The image doesn't exist. Verify and try again.
-+     * @expectedExceptionMessage The image doesn't exist. Verify and try again.
-      */
-     public function testGetWithNonExistingImage()
-     {
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
-index da6b790fedf..7c2ec8abb76 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
-@@ -18,6 +18,11 @@ class DefaultValidatorTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $valueMock;
- 
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $localeFormatMock;
-+
-     /**
-      * @inheritdoc
-      */
-@@ -26,6 +31,8 @@ class DefaultValidatorTest extends \PHPUnit\Framework\TestCase
-         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
-         $storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-         $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price($storeManagerMock);
-+        $this->localeFormatMock = $this->createMock(\Magento\Framework\Locale\FormatInterface::class);
-+
-         $config = [
-             [
-                 'label' => 'group label 1',
-@@ -51,7 +58,8 @@ class DefaultValidatorTest extends \PHPUnit\Framework\TestCase
-         $configMock->expects($this->once())->method('getAll')->will($this->returnValue($config));
-         $this->validator = new \Magento\Catalog\Model\Product\Option\Validator\DefaultValidator(
-             $configMock,
--            $priceConfigMock
-+            $priceConfigMock,
-+            $this->localeFormatMock
-         );
-     }
- 
-@@ -63,10 +71,10 @@ class DefaultValidatorTest extends \PHPUnit\Framework\TestCase
-     {
-         $mess = ['option required fields' => 'Missed values for option required fields'];
-         return [
--            ['option_title', 'name 1.1', 'fixed', new \Magento\Framework\DataObject(['store_id' => 1]), [], true],
--            ['option_title', 'name 1.1', 'fixed', new \Magento\Framework\DataObject(['store_id' => 0]), [], true],
--            [null, 'name 1.1', 'fixed', new \Magento\Framework\DataObject(['store_id' => 1]), [], true],
--            [null, 'name 1.1', 'fixed', new \Magento\Framework\DataObject(['store_id' => 0]), $mess, false],
-+            ['option_title', 'name 1.1', 'fixed', 10, new \Magento\Framework\DataObject(['store_id' => 1]), [], true],
-+            ['option_title', 'name 1.1', 'fixed', 10, new \Magento\Framework\DataObject(['store_id' => 0]), [], true],
-+            [null, 'name 1.1', 'fixed', 10, new \Magento\Framework\DataObject(['store_id' => 1]), [], true],
-+            [null, 'name 1.1', 'fixed', 10, new \Magento\Framework\DataObject(['store_id' => 0]), $mess, false],
-         ];
-     }
- 
-@@ -79,15 +87,18 @@ class DefaultValidatorTest extends \PHPUnit\Framework\TestCase
-      * @param bool $result
-      * @dataProvider isValidTitleDataProvider
-      */
--    public function testIsValidTitle($title, $type, $priceType, $product, $messages, $result)
-+    public function testIsValidTitle($title, $type, $priceType, $price, $product, $messages, $result)
-     {
--        $methods = ['getTitle', 'getType', 'getPriceType', '__wakeup', 'getProduct'];
-+        $methods = ['getTitle', 'getType', 'getPriceType', 'getPrice', '__wakeup', 'getProduct'];
-         $valueMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Option::class, $methods);
-         $valueMock->expects($this->once())->method('getTitle')->will($this->returnValue($title));
-         $valueMock->expects($this->any())->method('getType')->will($this->returnValue($type));
-         $valueMock->expects($this->once())->method('getPriceType')->will($this->returnValue($priceType));
--       // $valueMock->expects($this->once())->method('getPrice')->will($this->returnValue($price));
-+        $valueMock->expects($this->once())->method('getPrice')->will($this->returnValue($price));
-         $valueMock->expects($this->once())->method('getProduct')->will($this->returnValue($product));
-+
-+        $this->localeFormatMock->expects($this->once())->method('getNumber')->will($this->returnValue($price));
-+
-         $this->assertEquals($result, $this->validator->isValid($valueMock));
-         $this->assertEquals($messages, $this->validator->getMessages());
-     }
-@@ -126,4 +137,43 @@ class DefaultValidatorTest extends \PHPUnit\Framework\TestCase
-         $this->assertFalse($this->validator->isValid($valueMock));
-         $this->assertEquals($messages, $this->validator->getMessages());
-     }
-+
-+    /**
-+     * Data provider for testValidationNegativePrice
-+     * @return array
-+     */
-+    public function validationPriceDataProvider()
-+    {
-+        return [
-+            ['option_title', 'name 1.1', 'fixed', -12, new \Magento\Framework\DataObject(['store_id' => 1])],
-+            ['option_title', 'name 1.1', 'fixed', -12, new \Magento\Framework\DataObject(['store_id' => 0])],
-+            ['option_title', 'name 1.1', 'fixed', 12, new \Magento\Framework\DataObject(['store_id' => 1])],
-+            ['option_title', 'name 1.1', 'fixed', 12, new \Magento\Framework\DataObject(['store_id' => 0])]
-+        ];
-+    }
-+
-+    /**
-+     * @param $title
-+     * @param $type
-+     * @param $priceType
-+     * @param $price
-+     * @param $product
-+     * @dataProvider validationPriceDataProvider
-+     */
-+    public function testValidationPrice($title, $type, $priceType, $price, $product)
-+    {
-+        $methods = ['getTitle', 'getType', 'getPriceType', 'getPrice', '__wakeup', 'getProduct'];
-+        $valueMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Option::class, $methods);
-+        $valueMock->expects($this->once())->method('getTitle')->will($this->returnValue($title));
-+        $valueMock->expects($this->exactly(2))->method('getType')->will($this->returnValue($type));
-+        $valueMock->expects($this->once())->method('getPriceType')->will($this->returnValue($priceType));
-+        $valueMock->expects($this->once())->method('getPrice')->will($this->returnValue($price));
-+        $valueMock->expects($this->once())->method('getProduct')->will($this->returnValue($product));
-+
-+        $this->localeFormatMock->expects($this->once())->method('getNumber')->will($this->returnValue($price));
-+
-+        $messages = [];
-+        $this->assertTrue($this->validator->isValid($valueMock));
-+        $this->assertEquals($messages, $this->validator->getMessages());
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php
-index 2de993c0755..e688da1c6aa 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php
-@@ -18,6 +18,11 @@ class FileTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $valueMock;
- 
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $localeFormatMock;
-+
-     /**
-      * @inheritdoc
-      */
-@@ -26,6 +31,8 @@ class FileTest extends \PHPUnit\Framework\TestCase
-         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
-         $storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-         $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price($storeManagerMock);
-+        $this->localeFormatMock = $this->createMock(\Magento\Framework\Locale\FormatInterface::class);
-+
-         $config = [
-             [
-                 'label' => 'group label 1',
-@@ -53,7 +60,8 @@ class FileTest extends \PHPUnit\Framework\TestCase
-         $this->valueMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Option::class, $methods);
-         $this->validator = new \Magento\Catalog\Model\Product\Option\Validator\File(
-             $configMock,
--            $priceConfigMock
-+            $priceConfigMock,
-+            $this->localeFormatMock
-         );
-     }
- 
-@@ -70,6 +78,15 @@ class FileTest extends \PHPUnit\Framework\TestCase
-             ->willReturn(10);
-         $this->valueMock->expects($this->once())->method('getImageSizeX')->will($this->returnValue(10));
-         $this->valueMock->expects($this->once())->method('getImageSizeY')->will($this->returnValue(15));
-+        $this->localeFormatMock->expects($this->at(0))
-+            ->method('getNumber')
-+            ->with($this->equalTo(10))
-+            ->will($this->returnValue(10));
-+        $this->localeFormatMock
-+            ->expects($this->at(2))
-+            ->method('getNumber')
-+            ->with($this->equalTo(15))
-+            ->will($this->returnValue(15));
-         $this->assertEmpty($this->validator->getMessages());
-         $this->assertTrue($this->validator->isValid($this->valueMock));
-     }
-@@ -87,6 +104,16 @@ class FileTest extends \PHPUnit\Framework\TestCase
-             ->willReturn(10);
-         $this->valueMock->expects($this->once())->method('getImageSizeX')->will($this->returnValue(-10));
-         $this->valueMock->expects($this->never())->method('getImageSizeY');
-+        $this->localeFormatMock->expects($this->at(0))
-+            ->method('getNumber')
-+            ->with($this->equalTo(10))
-+            ->will($this->returnValue(10));
-+        $this->localeFormatMock
-+            ->expects($this->at(1))
-+            ->method('getNumber')
-+            ->with($this->equalTo(-10))
-+            ->will($this->returnValue(-10));
-+
-         $messages = [
-             'option values' => 'Invalid option value',
-         ];
-@@ -107,6 +134,15 @@ class FileTest extends \PHPUnit\Framework\TestCase
-             ->willReturn(10);
-         $this->valueMock->expects($this->once())->method('getImageSizeX')->will($this->returnValue(10));
-         $this->valueMock->expects($this->once())->method('getImageSizeY')->will($this->returnValue(-10));
-+        $this->localeFormatMock->expects($this->at(0))
-+            ->method('getNumber')
-+            ->with($this->equalTo(10))
-+            ->will($this->returnValue(10));
-+        $this->localeFormatMock
-+            ->expects($this->at(2))
-+            ->method('getNumber')
-+            ->with($this->equalTo(-10))
-+            ->will($this->returnValue(-10));
-         $messages = [
-             'option values' => 'Invalid option value',
-         ];
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
-index b97783edf85..7fad5592a2d 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
-@@ -18,6 +18,11 @@ class SelectTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $valueMock;
- 
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $localeFormatMock;
-+
-     /**
-      * @inheritdoc
-      */
-@@ -26,6 +31,7 @@ class SelectTest extends \PHPUnit\Framework\TestCase
-         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
-         $storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-         $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price($storeManagerMock);
-+        $this->localeFormatMock = $this->createMock(\Magento\Framework\Locale\FormatInterface::class);
-         $config = [
-             [
-                 'label' => 'group label 1',
-@@ -53,7 +59,8 @@ class SelectTest extends \PHPUnit\Framework\TestCase
-         $this->valueMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Option::class, $methods, []);
-         $this->validator = new \Magento\Catalog\Model\Product\Option\Validator\Select(
-             $configMock,
--            $priceConfigMock
-+            $priceConfigMock,
-+            $this->localeFormatMock
-         );
-     }
- 
-@@ -69,6 +76,12 @@ class SelectTest extends \PHPUnit\Framework\TestCase
-         $this->valueMock->expects($this->never())->method('getPriceType');
-         $this->valueMock->expects($this->never())->method('getPrice');
-         $this->valueMock->expects($this->any())->method('getData')->with('values')->will($this->returnValue([$value]));
-+        if (isset($value['price'])) {
-+            $this->localeFormatMock
-+                ->expects($this->once())
-+                ->method('getNumber')
-+                ->will($this->returnValue($value['price']));
-+        }
-         $this->assertEquals($expectedResult, $this->validator->isValid($this->valueMock));
-     }
- 
-@@ -117,6 +130,7 @@ class SelectTest extends \PHPUnit\Framework\TestCase
-             ->method('getData')
-             ->with('values')
-             ->will($this->returnValue('invalid_data'));
-+
-         $messages = [
-             'option values' => 'Invalid option value',
-         ];
-@@ -159,6 +173,7 @@ class SelectTest extends \PHPUnit\Framework\TestCase
-         $this->valueMock->expects($this->never())->method('getPriceType');
-         $this->valueMock->expects($this->never())->method('getPrice');
-         $this->valueMock->expects($this->any())->method('getData')->with('values')->will($this->returnValue([$value]));
-+        $this->localeFormatMock->expects($this->any())->method('getNumber')->will($this->returnValue($price));
-         $messages = [
-             'option values' => 'Invalid option value',
-         ];
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php
-index 4881154728d..a3e6189f749 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php
-@@ -18,6 +18,11 @@ class TextTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $valueMock;
- 
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $localeFormatMock;
-+
-     /**
-      * @inheritdoc
-      */
-@@ -26,6 +31,7 @@ class TextTest extends \PHPUnit\Framework\TestCase
-         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
-         $storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-         $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price($storeManagerMock);
-+        $this->localeFormatMock = $this->createMock(\Magento\Framework\Locale\FormatInterface::class);
-         $config = [
-             [
-                 'label' => 'group label 1',
-@@ -53,7 +59,8 @@ class TextTest extends \PHPUnit\Framework\TestCase
-         $this->valueMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Option::class, $methods);
-         $this->validator = new \Magento\Catalog\Model\Product\Option\Validator\Text(
-             $configMock,
--            $priceConfigMock
-+            $priceConfigMock,
-+            $this->localeFormatMock
-         );
-     }
- 
-@@ -69,6 +76,10 @@ class TextTest extends \PHPUnit\Framework\TestCase
-         $this->valueMock->method('getPrice')
-             ->willReturn(10);
-         $this->valueMock->expects($this->once())->method('getMaxCharacters')->will($this->returnValue(10));
-+        $this->localeFormatMock->expects($this->exactly(2))
-+            ->method('getNumber')
-+            ->with($this->equalTo(10))
-+            ->will($this->returnValue(10));
-         $this->assertTrue($this->validator->isValid($this->valueMock));
-         $this->assertEmpty($this->validator->getMessages());
-     }
-@@ -85,6 +96,15 @@ class TextTest extends \PHPUnit\Framework\TestCase
-         $this->valueMock->method('getPrice')
-             ->willReturn(10);
-         $this->valueMock->expects($this->once())->method('getMaxCharacters')->will($this->returnValue(-10));
-+        $this->localeFormatMock->expects($this->at(0))
-+            ->method('getNumber')
-+            ->with($this->equalTo(10))
-+            ->will($this->returnValue(10));
-+        $this->localeFormatMock
-+            ->expects($this->at(1))
-+            ->method('getNumber')
-+            ->with($this->equalTo(-10))
-+            ->will($this->returnValue(-10));
-         $messages = [
-             'option values' => 'Invalid option value',
-         ];
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/TierPriceStorageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/TierPriceStorageTest.php
-index c9288790ed6..a97f2281125 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/TierPriceStorageTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/TierPriceStorageTest.php
-@@ -152,6 +152,30 @@ class TierPriceStorageTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(2, count($prices));
-     }
- 
-+    /**
-+     * Test get method without tierprices.
-+     *
-+     * @return void
-+     */
-+    public function testGetWithoutTierPrices()
-+    {
-+        $skus = ['simple', 'virtual'];
-+        $this->tierPriceValidator
-+            ->expects($this->once())
-+            ->method('validateSkus')
-+            ->with($skus)
-+            ->willReturn($skus);
-+        $this->productIdLocator->expects($this->atLeastOnce())
-+            ->method('retrieveProductIdsBySkus')
-+            ->with(['simple', 'virtual'])
-+            ->willReturn(['simple' => ['2' => 'simple'], 'virtual' => ['3' => 'virtual']]);
-+        $this->tierPricePersistence->expects($this->once())->method('get')->willReturn([]);
-+        $this->tierPricePersistence->expects($this->never())->method('getEntityLinkField');
-+        $this->tierPriceFactory->expects($this->never())->method('create');
-+        $prices = $this->tierPriceStorage->get($skus);
-+        $this->assertEmpty($prices);
-+    }
-+
-     /**
-      * Test update method.
-      *
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php
-index 754d80302d4..6029a2b8200 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php
-@@ -54,7 +54,7 @@ class PriceModifierTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
--     * @expectedMessage Tier price is unavailable for this product.
-+     * @expectedExceptionMessage Product hasn't group price with such data: customerGroupId = '1', website = 1, qty = 3
-      */
-     public function testRemoveWhenTierPricesNotExists()
-     {
-@@ -70,7 +70,7 @@ class PriceModifierTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
--     * @expectedMessage For current  customerGroupId = '10' with 'qty' = 15 any tier price exist'.
-+     * @expectedExceptionMessage Product hasn't group price with such data: customerGroupId = '10', website = 1, qty = 5
-      */
-     public function testRemoveTierPriceForNonExistingCustomerGroup()
-     {
-@@ -81,7 +81,7 @@ class PriceModifierTest extends \PHPUnit\Framework\TestCase
-             ->will($this->returnValue($this->prices));
-         $this->productMock->expects($this->never())->method('setData');
-         $this->productRepositoryMock->expects($this->never())->method('save');
--        $this->priceModifier->removeTierPrice($this->productMock, 10, 15, 1);
-+        $this->priceModifier->removeTierPrice($this->productMock, 10, 5, 1);
-     }
- 
-     public function testSuccessfullyRemoveTierPriceSpecifiedForAllGroups()
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
-index fce4a02622d..38bed83cb95 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
-@@ -80,6 +80,7 @@ class SynchronizerTest extends \PHPUnit\Framework\TestCase
- 
-     public function testFilterProductActions()
-     {
-+        $typeId = 'recently_compared_product';
-         $productsData = [
-             1 => [
-                 'added_at' => 12,
-@@ -87,7 +88,7 @@ class SynchronizerTest extends \PHPUnit\Framework\TestCase
-             ],
-             2 => [
-                 'added_at' => 13,
--                'product_id' => 2,
-+                'product_id' => '2',
-             ],
-             3 => [
-                 'added_at' => 14,
-@@ -126,10 +127,12 @@ class SynchronizerTest extends \PHPUnit\Framework\TestCase
-         $collection->expects($this->once())
-             ->method('addFilterByUserIdentities')
-             ->with(1, 34);
--        $collection->expects($this->any())
-+        $collection->expects($this->at(1))
-             ->method('addFieldToFilter')
--            ->withConsecutive(['type_id'], ['product_id']);
--
-+            ->with('type_id', $typeId);
-+        $collection->expects($this->at(2))
-+            ->method('addFieldToFilter')
-+            ->with('product_id', [1, 2]);
-         $iterator = new \IteratorIterator(new \ArrayIterator([$frontendAction]));
-         $collection->expects($this->once())
-             ->method('getIterator')
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
-index f340d0b204b..ae479a9b34d 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
-@@ -195,7 +195,7 @@ class TierPriceManagementTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
--     * @message The product doesn't exist. Verify and try again.
-+     * @expectedExceptionMessage No such entity.
-      */
-     public function testDeleteTierPriceFromNonExistingProduct()
-     {
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductIdLocatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductIdLocatorTest.php
-index b730e12ca82..b9cb82274c8 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/ProductIdLocatorTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductIdLocatorTest.php
-@@ -58,7 +58,16 @@ class ProductIdLocatorTest extends \PHPUnit\Framework\TestCase
-     {
-         $skus = ['sku_1', 'sku_2'];
-         $collection = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Collection::class)
--            ->setMethods(['getIterator', 'addFieldToFilter'])
-+            ->setMethods(
-+                [
-+                    'getItems',
-+                    'addFieldToFilter',
-+                    'setPageSize',
-+                    'getLastPageNumber',
-+                    'setCurPage',
-+                    'clear'
-+                ]
-+            )
-             ->disableOriginalConstructor()->getMock();
-         $product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-             ->setMethods(['getSku', 'getData', 'getTypeId'])
-@@ -69,7 +78,11 @@ class ProductIdLocatorTest extends \PHPUnit\Framework\TestCase
-         $this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
-         $collection->expects($this->once())->method('addFieldToFilter')
-             ->with(\Magento\Catalog\Api\Data\ProductInterface::SKU, ['in' => $skus])->willReturnSelf();
--        $collection->expects($this->once())->method('getIterator')->willReturn(new \ArrayIterator([$product]));
-+        $collection->expects($this->atLeastOnce())->method('getItems')->willReturn([$product]);
-+        $collection->expects($this->atLeastOnce())->method('setPageSize')->willReturnSelf();
-+        $collection->expects($this->atLeastOnce())->method('getLastPageNumber')->willReturn(1);
-+        $collection->expects($this->atLeastOnce())->method('setCurPage')->with(1)->willReturnSelf();
-+        $collection->expects($this->atLeastOnce())->method('clear')->willReturnSelf();
-         $this->metadataPool
-             ->expects($this->once())
-             ->method('getMetadata')
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php
-index 034b04b6a75..cfb54c3aefd 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php
-@@ -29,12 +29,12 @@ return [
-         ],
-     ],
-     'renderer_attribute_with_invalid_value' => [
--        '<?xml version="1.0"?><config><option name="name_one" renderer="true12"><inputType name="name_one"/>' .
-+        '<?xml version="1.0"?><config><option name="name_one" renderer="123true"><inputType name="name_one"/>' .
-         '</option></config>',
-         [
--            "Element 'option', attribute 'renderer': [facet 'pattern'] The value 'true12' is not accepted by the " .
--            "pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
--            "Element 'option', attribute 'renderer': 'true12' is not a valid value of the atomic" .
-+            "Element 'option', attribute 'renderer': [facet 'pattern'] The value '123true' is not accepted by the " .
-+            "pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
-+            "Element 'option', attribute 'renderer': '123true' is not a valid value of the atomic" .
-             " type 'modelName'.\nLine: 1\n"
-         ],
-     ],
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
-index 3fc3587637d..0dc294e139d 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
-@@ -1,19 +1,49 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Catalog\Test\Unit\Model;
- 
--use Magento\Catalog\Api\Data\ProductAttributeInterface;
-+use Magento\Catalog\Api\Data\ProductExtensionInterface;
-+use Magento\Catalog\Api\Data\ProductSearchResultsInterface;
-+use Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory;
-+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Gallery\MimeTypeExtensionMap;
-+use Magento\Catalog\Model\Product\Gallery\Processor;
-+use Magento\Catalog\Model\Product\LinkTypeProvider;
-+use Magento\Catalog\Model\Product\Media\Config;
-+use Magento\Catalog\Model\Product\Option;
-+use Magento\Catalog\Model\Product\Option\Value;
-+use Magento\Catalog\Model\ProductFactory;
-+use Magento\Catalog\Model\ProductLink\Link;
-+use Magento\Catalog\Model\ProductRepository;
-+use Magento\Catalog\Model\ResourceModel\Product\Collection;
-+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
- use Magento\Framework\Api\Data\ImageContentInterface;
-+use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
-+use Magento\Framework\Api\ExtensibleDataObjectConverter;
-+use Magento\Framework\Api\FilterBuilder;
-+use Magento\Framework\Api\ImageContent;
-+use Magento\Framework\Api\ImageContentValidator;
-+use Magento\Framework\Api\ImageContentValidatorInterface;
-+use Magento\Framework\Api\ImageProcessorInterface;
- use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Api\SearchCriteriaInterface;
- use Magento\Framework\DB\Adapter\ConnectionException;
-+use Magento\Framework\Filesystem;
- use Magento\Framework\Serialize\Serializer\Json;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Store\Model\Store;
-+use Magento\Store\Model\StoreManagerInterface;
-+use PHPUnit\Framework\TestCase;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
- /**
-  * Class ProductRepositoryTest
-@@ -22,133 +52,133 @@ use Magento\Store\Api\Data\StoreInterface;
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-  */
--class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-+class ProductRepositoryTest extends TestCase
- {
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var Product|MockObject
-      */
--    protected $productMock;
-+    private $product;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var Product|MockObject
-      */
--    protected $initializedProductMock;
-+    private $initializedProduct;
- 
-     /**
--     * @var \Magento\Catalog\Model\ProductRepository
-+     * @var ProductRepository
-      */
--    protected $model;
-+    private $model;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var Helper|MockObject
-      */
--    protected $initializationHelperMock;
-+    private $initializationHelper;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var Product|MockObject
-      */
--    protected $resourceModelMock;
-+    private $resourceModel;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var ProductFactory|MockObject
-      */
--    protected $productFactoryMock;
-+    private $productFactory;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var CollectionFactory|MockObject
-      */
--    protected $collectionFactoryMock;
-+    private $collectionFactory;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var SearchCriteriaBuilder|MockObject
-      */
--    protected $searchCriteriaBuilderMock;
-+    private $searchCriteriaBuilder;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var FilterBuilder|MockObject
-      */
--    protected $filterBuilderMock;
-+    private $filterBuilder;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var ProductAttributeRepositoryInterface|MockObject
-      */
--    protected $metadataServiceMock;
-+    private $metadataService;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var ProductSearchResultsInterfaceFactory|MockObject
-      */
--    protected $searchResultsFactoryMock;
-+    private $searchResultsFactory;
- 
-     /**
--     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ExtensibleDataObjectConverter|MockObject
-      */
--    protected $eavConfigMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $extensibleDataObjectConverterMock;
-+    private $extensibleDataObjectConverter;
- 
-     /**
-      * @var array data to create product
-      */
--    protected $productData = [
-+    private $productData = [
-         'sku' => 'exisiting',
-         'name' => 'existing product',
-     ];
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Filesystem
-+     * @var Filesystem|MockObject
-+     */
-+    private $fileSystem;
-+
-+    /**
-+     * @var MimeTypeExtensionMap|MockObject
-      */
--    protected $fileSystemMock;
-+    private $mimeTypeExtensionMap;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Product\Gallery\MimeTypeExtensionMap
-+     * @var ImageContentInterfaceFactory|MockObject
-      */
--    protected $mimeTypeExtensionMapMock;
-+    private $contentFactory;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var ImageContentValidator|MockObject
-      */
--    protected $contentFactoryMock;
-+    private $contentValidator;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Api\ImageContentValidator
-+     * @var LinkTypeProvider|MockObject
-      */
--    protected $contentValidatorMock;
-+    private $linkTypeProvider;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var ImageProcessorInterface|MockObject
-      */
--    protected $linkTypeProviderMock;
-+    private $imageProcessor;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Api\ImageProcessorInterface
-+     * @var ObjectManager
-      */
--    protected $imageProcessorMock;
-+    private $objectManager;
- 
-     /**
--     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-+     * @var StoreManagerInterface|MockObject
-      */
--    protected $objectManager;
-+    private $storeManager;
- 
-     /**
--     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Processor|MockObject
-      */
--    protected $storeManagerMock;
-+    private $processor;
- 
-     /**
--     * @var \Magento\Catalog\Model\Product\Gallery\Processor|\PHPUnit_Framework_MockObject_MockObject
-+     * @var CollectionProcessorInterface|MockObject
-      */
--    protected $mediaGalleryProcessor;
-+    private $collectionProcessor;
- 
-     /**
--     * @var CollectionProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ProductExtensionInterface|MockObject
-      */
--    private $collectionProcessorMock;
-+    private $productExtension;
- 
-     /**
--     * @var Json|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Json|MockObject
-      */
-     private $serializerMock;
- 
-@@ -164,13 +194,13 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     protected function setUp()
-     {
--        $this->productFactoryMock = $this->createPartialMock(
--            \Magento\Catalog\Model\ProductFactory::class,
-+        $this->productFactory = $this->createPartialMock(
-+            ProductFactory::class,
-             ['create', 'setData']
-         );
- 
--        $this->productMock = $this->createPartialMock(
--            \Magento\Catalog\Model\Product::class,
-+        $this->product = $this->createPartialMock(
-+            Product::class,
-             [
-                 'getId',
-                 'getSku',
-@@ -179,12 +209,14 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-                 'load',
-                 'setData',
-                 'getStoreId',
--                'getMediaGalleryEntries'
-+                'getMediaGalleryEntries',
-+                'getExtensionAttributes',
-+                'getCategoryIds'
-             ]
-         );
- 
--        $this->initializedProductMock = $this->createPartialMock(
--            \Magento\Catalog\Model\Product::class,
-+        $this->initializedProduct = $this->createPartialMock(
-+            Product::class,
-             [
-                 'getWebsiteIds',
-                 'setProductOptions',
-@@ -199,66 +231,73 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-                 'validate',
-                 'save',
-                 'getMediaGalleryEntries',
-+                'getExtensionAttributes',
-+                'getCategoryIds'
-             ]
-         );
--        $this->initializedProductMock->expects($this->any())
-+        $this->initializedProduct->expects($this->any())
-             ->method('hasGalleryAttribute')
-             ->willReturn(true);
--        $this->filterBuilderMock = $this->createMock(\Magento\Framework\Api\FilterBuilder::class);
--        $this->initializationHelperMock = $this->createMock(
--            \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper::class
--        );
--        $this->collectionFactoryMock = $this->createPartialMock(
--            \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class,
--            ['create']
--        );
--        $this->searchCriteriaBuilderMock = $this->createMock(\Magento\Framework\Api\SearchCriteriaBuilder::class);
--        $this->metadataServiceMock = $this->createMock(\Magento\Catalog\Api\ProductAttributeRepositoryInterface::class);
--        $this->searchResultsFactoryMock = $this->createPartialMock(
--            \Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory::class,
-+        $this->filterBuilder = $this->createMock(FilterBuilder::class);
-+        $this->initializationHelper = $this->createMock(Helper::class);
-+        $this->collectionFactory = $this->createPartialMock(CollectionFactory::class, ['create']);
-+        $this->searchCriteriaBuilder = $this->createMock(SearchCriteriaBuilder::class);
-+        $this->metadataService = $this->createMock(ProductAttributeRepositoryInterface::class);
-+        $this->searchResultsFactory = $this->createPartialMock(
-+            ProductSearchResultsInterfaceFactory::class,
-             ['create']
-         );
--        $this->resourceModelMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product::class);
-+        $this->resourceModel = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product::class);
-         $this->objectManager = new ObjectManager($this);
--        $this->extensibleDataObjectConverterMock = $this
--            ->getMockBuilder(\Magento\Framework\Api\ExtensibleDataObjectConverter::class)
-+        $this->extensibleDataObjectConverter = $this
-+            ->getMockBuilder(ExtensibleDataObjectConverter::class)
-             ->setMethods(['toNestedArray'])
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->fileSystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
-+        $this->fileSystem = $this->getMockBuilder(Filesystem::class)
-             ->disableOriginalConstructor()->getMock();
--        $this->mimeTypeExtensionMapMock =
--            $this->getMockBuilder(\Magento\Catalog\Model\Product\Gallery\MimeTypeExtensionMap::class)->getMock();
--        $this->contentFactoryMock = $this->createPartialMock(
--            \Magento\Framework\Api\Data\ImageContentInterfaceFactory::class,
--            ['create']
--        );
--        $this->contentValidatorMock = $this->getMockBuilder(
--            \Magento\Framework\Api\ImageContentValidatorInterface::class
--        )
-+        $this->mimeTypeExtensionMap = $this->getMockBuilder(MimeTypeExtensionMap::class)->getMock();
-+        $this->contentFactory = $this->createPartialMock(ImageContentInterfaceFactory::class, ['create']);
-+        $this->contentValidator = $this->getMockBuilder(ImageContentValidatorInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->linkTypeProviderMock = $this->createPartialMock(
--            \Magento\Catalog\Model\Product\LinkTypeProvider::class,
--            ['getLinkTypes']
--        );
--        $this->imageProcessorMock = $this->createMock(\Magento\Framework\Api\ImageProcessorInterface::class);
-+        $this->linkTypeProvider = $this->createPartialMock(LinkTypeProvider::class, ['getLinkTypes']);
-+        $this->imageProcessor = $this->createMock(ImageProcessorInterface::class);
- 
--        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
-             ->disableOriginalConstructor()
-             ->setMethods([])
-             ->getMockForAbstractClass();
--        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-+        $this->productExtension = $this->getMockBuilder(ProductExtensionInterface::class)
-+            ->setMethods(['__toArray'])
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+        $this->productExtension
-+            ->method('__toArray')
-+            ->willReturn([]);
-+        $this->product
-+            ->method('getExtensionAttributes')
-+            ->willReturn($this->productExtension);
-+        $this->initializedProduct
-+            ->method('getExtensionAttributes')
-+            ->willReturn($this->productExtension);
-+        $this->product
-+            ->method('getCategoryIds')
-+            ->willReturn([1, 2, 3, 4]);
-+        $this->initializedProduct
-+            ->method('getCategoryIds')
-+            ->willReturn([1, 2, 3, 4]);
-+        $storeMock = $this->getMockBuilder(StoreInterface::class)
-             ->disableOriginalConstructor()
-             ->setMethods([])
-             ->getMockForAbstractClass();
-         $storeMock->expects($this->any())->method('getWebsiteId')->willReturn('1');
--        $storeMock->expects($this->any())->method('getCode')->willReturn(\Magento\Store\Model\Store::ADMIN_CODE);
--        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
-+        $storeMock->expects($this->any())->method('getCode')->willReturn(Store::ADMIN_CODE);
-+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($storeMock);
- 
--        $this->mediaGalleryProcessor = $this->createMock(\Magento\Catalog\Model\Product\Gallery\Processor::class);
-+        $this->processor = $this->createMock(Processor::class);
- 
--        $this->collectionProcessorMock = $this->getMockBuilder(CollectionProcessorInterface::class)
-+        $this->collectionProcessor = $this->getMockBuilder(CollectionProcessorInterface::class)
-             ->getMock();
- 
-         $this->serializerMock = $this->getMockBuilder(Json::class)->getMock();
-@@ -272,31 +311,38 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-                 )
-             );
- 
-+        $mediaProcessor = $this->objectManager->getObject(
-+            ProductRepository\MediaGalleryProcessor::class,
-+            [
-+                'processor' => $this->processor,
-+                'contentFactory' => $this->contentFactory,
-+                'imageProcessor' => $this->imageProcessor,
-+            ]
-+        );
-         $this->model = $this->objectManager->getObject(
--            \Magento\Catalog\Model\ProductRepository::class,
-+            ProductRepository::class,
-             [
--                'productFactory' => $this->productFactoryMock,
--                'initializationHelper' => $this->initializationHelperMock,
--                'resourceModel' => $this->resourceModelMock,
--                'filterBuilder' => $this->filterBuilderMock,
--                'collectionFactory' => $this->collectionFactoryMock,
--                'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
--                'metadataServiceInterface' => $this->metadataServiceMock,
--                'searchResultsFactory' => $this->searchResultsFactoryMock,
--                'extensibleDataObjectConverter' => $this->extensibleDataObjectConverterMock,
--                'contentValidator' => $this->contentValidatorMock,
--                'fileSystem' => $this->fileSystemMock,
--                'contentFactory' => $this->contentFactoryMock,
--                'mimeTypeExtensionMap' => $this->mimeTypeExtensionMapMock,
--                'linkTypeProvider' => $this->linkTypeProviderMock,
--                'imageProcessor' => $this->imageProcessorMock,
--                'storeManager' => $this->storeManagerMock,
--                'mediaGalleryProcessor' => $this->mediaGalleryProcessor,
--                'collectionProcessor' => $this->collectionProcessorMock,
-+                'productFactory' => $this->productFactory,
-+                'initializationHelper' => $this->initializationHelper,
-+                'resourceModel' => $this->resourceModel,
-+                'filterBuilder' => $this->filterBuilder,
-+                'collectionFactory' => $this->collectionFactory,
-+                'searchCriteriaBuilder' => $this->searchCriteriaBuilder,
-+                'metadataServiceInterface' => $this->metadataService,
-+                'searchResultsFactory' => $this->searchResultsFactory,
-+                'extensibleDataObjectConverter' => $this->extensibleDataObjectConverter,
-+                'contentValidator' => $this->contentValidator,
-+                'fileSystem' => $this->fileSystem,
-+                'mimeTypeExtensionMap' => $this->mimeTypeExtensionMap,
-+                'linkTypeProvider' => $this->linkTypeProvider,
-+                'storeManager' => $this->storeManager,
-+                'mediaGalleryProcessor' => $this->processor,
-+                'collectionProcessor' => $this->collectionProcessor,
-                 'serializer' => $this->serializerMock,
-                 'cacheLimit' => $this->cacheLimit
-             ]
-         );
-+        $this->objectManager->setBackwardCompatibleProperty($this->model, 'mediaProcessor', $mediaProcessor);
-     }
- 
-     /**
-@@ -305,50 +351,50 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testGetAbsentProduct()
-     {
--        $this->productFactoryMock->expects($this->once())->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->resourceModelMock->expects($this->once())->method('getIdBySku')->with('test_sku')
-+        $this->productFactory->expects($this->once())->method('create')
-+            ->will($this->returnValue($this->product));
-+        $this->resourceModel->expects($this->once())->method('getIdBySku')->with('test_sku')
-             ->will($this->returnValue(null));
--        $this->productFactoryMock->expects($this->never())->method('setData');
-+        $this->productFactory->expects($this->never())->method('setData');
-         $this->model->get('test_sku');
-     }
- 
-     public function testCreateCreatesProduct()
-     {
-         $sku = 'test_sku';
--        $this->productFactoryMock->expects($this->once())->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->resourceModelMock->expects($this->once())->method('getIdBySku')->with($sku)
-+        $this->productFactory->expects($this->once())->method('create')
-+            ->will($this->returnValue($this->product));
-+        $this->resourceModel->expects($this->once())->method('getIdBySku')->with($sku)
-             ->will($this->returnValue('test_id'));
--        $this->productMock->expects($this->once())->method('load')->with('test_id');
--        $this->productMock->expects($this->once())->method('getSku')->willReturn($sku);
--        $this->assertEquals($this->productMock, $this->model->get($sku));
-+        $this->product->expects($this->once())->method('load')->with('test_id');
-+        $this->product->expects($this->once())->method('getSku')->willReturn($sku);
-+        $this->assertEquals($this->product, $this->model->get($sku));
-     }
- 
-     public function testGetProductInEditMode()
-     {
-         $sku = 'test_sku';
--        $this->productFactoryMock->expects($this->once())->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->resourceModelMock->expects($this->once())->method('getIdBySku')->with($sku)
-+        $this->productFactory->expects($this->once())->method('create')
-+            ->will($this->returnValue($this->product));
-+        $this->resourceModel->expects($this->once())->method('getIdBySku')->with($sku)
-             ->will($this->returnValue('test_id'));
--        $this->productMock->expects($this->once())->method('setData')->with('_edit_mode', true);
--        $this->productMock->expects($this->once())->method('load')->with('test_id');
--        $this->productMock->expects($this->once())->method('getSku')->willReturn($sku);
--        $this->assertEquals($this->productMock, $this->model->get($sku, true));
-+        $this->product->expects($this->once())->method('setData')->with('_edit_mode', true);
-+        $this->product->expects($this->once())->method('load')->with('test_id');
-+        $this->product->expects($this->once())->method('getSku')->willReturn($sku);
-+        $this->assertEquals($this->product, $this->model->get($sku, true));
-     }
- 
-     public function testGetBySkuWithSpace()
-     {
-         $trimmedSku = 'test_sku';
-         $sku = 'test_sku ';
--        $this->productFactoryMock->expects($this->once())->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->resourceModelMock->expects($this->once())->method('getIdBySku')->with($sku)
-+        $this->productFactory->expects($this->once())->method('create')
-+            ->will($this->returnValue($this->product));
-+        $this->resourceModel->expects($this->once())->method('getIdBySku')->with($sku)
-             ->will($this->returnValue('test_id'));
--        $this->productMock->expects($this->once())->method('load')->with('test_id');
--        $this->productMock->expects($this->once())->method('getSku')->willReturn($trimmedSku);
--        $this->assertEquals($this->productMock, $this->model->get($sku));
-+        $this->product->expects($this->once())->method('load')->with('test_id');
-+        $this->product->expects($this->once())->method('getSku')->willReturn($trimmedSku);
-+        $this->assertEquals($this->product, $this->model->get($sku));
-     }
- 
-     public function testGetWithSetStoreId()
-@@ -356,13 +402,13 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-         $productId = 123;
-         $sku = 'test-sku';
-         $storeId = 7;
--        $this->productFactoryMock->expects($this->once())->method('create')->willReturn($this->productMock);
--        $this->resourceModelMock->expects($this->once())->method('getIdBySku')->with($sku)->willReturn($productId);
--        $this->productMock->expects($this->once())->method('setData')->with('store_id', $storeId);
--        $this->productMock->expects($this->once())->method('load')->with($productId);
--        $this->productMock->expects($this->once())->method('getId')->willReturn($productId);
--        $this->productMock->expects($this->once())->method('getSku')->willReturn($sku);
--        $this->assertSame($this->productMock, $this->model->get($sku, false, $storeId));
-+        $this->productFactory->expects($this->once())->method('create')->willReturn($this->product);
-+        $this->resourceModel->expects($this->once())->method('getIdBySku')->with($sku)->willReturn($productId);
-+        $this->product->expects($this->once())->method('setData')->with('store_id', $storeId);
-+        $this->product->expects($this->once())->method('load')->with($productId);
-+        $this->product->expects($this->once())->method('getId')->willReturn($productId);
-+        $this->product->expects($this->once())->method('getSku')->willReturn($sku);
-+        $this->assertSame($this->product, $this->model->get($sku, false, $storeId));
-     }
- 
-     /**
-@@ -371,22 +417,22 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testGetByIdAbsentProduct()
-     {
--        $this->productFactoryMock->expects($this->once())->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->productMock->expects($this->once())->method('load')->with('product_id');
--        $this->productMock->expects($this->once())->method('getId')->willReturn(null);
-+        $this->productFactory->expects($this->once())->method('create')
-+            ->will($this->returnValue($this->product));
-+        $this->product->expects($this->once())->method('load')->with('product_id');
-+        $this->product->expects($this->once())->method('getId')->willReturn(null);
-         $this->model->getById('product_id');
-     }
- 
-     public function testGetByIdProductInEditMode()
-     {
-         $productId = 123;
--        $this->productFactoryMock->method('create')->willReturn($this->productMock);
--        $this->productMock->method('setData')->with('_edit_mode', true);
--        $this->productMock->method('load')->with($productId);
--        $this->productMock->expects($this->atLeastOnce())->method('getId')->willReturn($productId);
--        $this->productMock->method('getSku')->willReturn('simple');
--        $this->assertEquals($this->productMock, $this->model->getById($productId, true));
-+        $this->productFactory->method('create')->willReturn($this->product);
-+        $this->product->method('setData')->with('_edit_mode', true);
-+        $this->product->method('load')->with($productId);
-+        $this->product->expects($this->atLeastOnce())->method('getId')->willReturn($productId);
-+        $this->product->method('getSku')->willReturn('simple');
-+        $this->assertEquals($this->product, $this->model->getById($productId, true));
-     }
- 
-     /**
-@@ -400,21 +446,21 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-     public function testGetByIdForCacheKeyGenerate($identifier, $editMode, $storeId)
-     {
-         $callIndex = 0;
--        $this->productFactoryMock->expects($this->once())->method('create')
--            ->will($this->returnValue($this->productMock));
-+        $this->productFactory->expects($this->once())->method('create')
-+            ->will($this->returnValue($this->product));
-         if ($editMode) {
--            $this->productMock->expects($this->at($callIndex))->method('setData')->with('_edit_mode', $editMode);
-+            $this->product->expects($this->at($callIndex))->method('setData')->with('_edit_mode', $editMode);
-             ++$callIndex;
-         }
-         if ($storeId !== null) {
--            $this->productMock->expects($this->at($callIndex))->method('setData')->with('store_id', $storeId);
-+            $this->product->expects($this->at($callIndex))->method('setData')->with('store_id', $storeId);
-         }
--        $this->productMock->expects($this->once())->method('load')->with($identifier);
--        $this->productMock->expects($this->atLeastOnce())->method('getId')->willReturn($identifier);
--        $this->productMock->method('getSku')->willReturn('simple');
--        $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId));
-+        $this->product->expects($this->once())->method('load')->with($identifier);
-+        $this->product->expects($this->atLeastOnce())->method('getId')->willReturn($identifier);
-+        $this->product->method('getSku')->willReturn('simple');
-+        $this->assertEquals($this->product, $this->model->getById($identifier, $editMode, $storeId));
-         //Second invocation should just return from cache
--        $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId));
-+        $this->assertEquals($this->product, $this->model->getById($identifier, $editMode, $storeId));
-     }
- 
-     /**
-@@ -428,18 +474,18 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-         $editMode = false;
-         $storeId = 0;
- 
--        $this->productFactoryMock->expects($this->exactly(2))->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->productMock->expects($this->exactly(2))->method('load');
-+        $this->productFactory->expects($this->exactly(2))->method('create')
-+            ->will($this->returnValue($this->product));
-+        $this->product->expects($this->exactly(2))->method('load');
-         $this->serializerMock->expects($this->exactly(3))->method('serialize');
- 
--        $this->productMock->expects($this->exactly(4))->method('getId')->willReturn($identifier);
--        $this->productMock->method('getSku')->willReturn('simple');
--        $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId));
-+        $this->product->expects($this->exactly(4))->method('getId')->willReturn($identifier);
-+        $this->product->method('getSku')->willReturn('simple');
-+        $this->assertEquals($this->product, $this->model->getById($identifier, $editMode, $storeId));
-         //second invocation should just return from cache
--        $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId));
-+        $this->assertEquals($this->product, $this->model->getById($identifier, $editMode, $storeId));
-         //force reload
--        $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId, true));
-+        $this->assertEquals($this->product, $this->model->getById($identifier, $editMode, $storeId, true));
-     }
- 
-     /**
-@@ -454,7 +500,7 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-         $productsCount = $this->cacheLimit * 2;
- 
-         $productMocks =  $this->getProductMocksForReducedCache($productsCount);
--        $productFactoryInvMock = $this->productFactoryMock->expects($this->exactly($productsCount))
-+        $productFactoryInvMock = $this->productFactory->expects($this->exactly($productsCount))
-             ->method('create');
-         call_user_func_array([$productFactoryInvMock, 'willReturnOnConsecutiveCalls'], $productMocks);
-         $this->serializerMock->expects($this->atLeastOnce())->method('serialize');
-@@ -479,14 +525,16 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-         $productMocks = [];
- 
-         for ($i = 1; $i <= $productsCount; $i++) {
--            $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-+            $productMock = $this->getMockBuilder(Product::class)
-                 ->disableOriginalConstructor()
--                ->setMethods([
-+                ->setMethods(
-+                    [
-                     'getId',
-                     'getSku',
-                     'load',
-                     'setData',
--                ])
-+                    ]
-+                )
-                 ->getMock();
-             $productMock->expects($this->once())->method('load');
-             $productMock->expects($this->atLeastOnce())->method('getId')->willReturn($i);
-@@ -509,86 +557,86 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-         $editMode = false;
-         $storeId = 0;
- 
--        $this->productFactoryMock->expects($this->exactly(2))->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->productMock->expects($this->exactly(2))->method('load');
--        $this->productMock->expects($this->exactly(2))->method('getId')->willReturn($sku);
--        $this->resourceModelMock->expects($this->exactly(2))->method('getIdBySku')
-+        $this->productFactory->expects($this->exactly(2))->method('create')
-+            ->will($this->returnValue($this->product));
-+        $this->product->expects($this->exactly(2))->method('load');
-+        $this->product->expects($this->exactly(2))->method('getId')->willReturn($sku);
-+        $this->resourceModel->expects($this->exactly(2))->method('getIdBySku')
-             ->with($sku)->willReturn($id);
--        $this->productMock->expects($this->exactly(2))->method('getSku')->willReturn($sku);
-+        $this->product->expects($this->exactly(2))->method('getSku')->willReturn($sku);
-         $this->serializerMock->expects($this->exactly(3))->method('serialize');
- 
--        $this->assertEquals($this->productMock, $this->model->get($sku, $editMode, $storeId));
-+        $this->assertEquals($this->product, $this->model->get($sku, $editMode, $storeId));
-         //second invocation should just return from cache
--        $this->assertEquals($this->productMock, $this->model->get($sku, $editMode, $storeId));
-+        $this->assertEquals($this->product, $this->model->get($sku, $editMode, $storeId));
-         //force reload
--        $this->assertEquals($this->productMock, $this->model->get($sku, $editMode, $storeId, true));
-+        $this->assertEquals($this->product, $this->model->get($sku, $editMode, $storeId, true));
-     }
- 
-     public function testGetByIdWithSetStoreId()
-     {
-         $productId = 123;
-         $storeId = 1;
--        $this->productFactoryMock->expects($this->atLeastOnce())->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->productMock->expects($this->once())->method('setData')->with('store_id', $storeId);
--        $this->productMock->expects($this->once())->method('load')->with($productId);
--        $this->productMock->expects($this->atLeastOnce())->method('getId')->willReturn($productId);
--        $this->productMock->method('getSku')->willReturn('simple');
--        $this->assertEquals($this->productMock, $this->model->getById($productId, false, $storeId));
-+        $this->productFactory->expects($this->atLeastOnce())->method('create')
-+            ->will($this->returnValue($this->product));
-+        $this->product->expects($this->once())->method('setData')->with('store_id', $storeId);
-+        $this->product->expects($this->once())->method('load')->with($productId);
-+        $this->product->expects($this->atLeastOnce())->method('getId')->willReturn($productId);
-+        $this->product->method('getSku')->willReturn('simple');
-+        $this->assertEquals($this->product, $this->model->getById($productId, false, $storeId));
-     }
- 
-     public function testGetBySkuFromCacheInitializedInGetById()
-     {
-         $productId = 123;
-         $productSku = 'product_123';
--        $this->productFactoryMock->expects($this->once())->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->productMock->expects($this->once())->method('load')->with($productId);
--        $this->productMock->expects($this->atLeastOnce())->method('getId')->willReturn($productId);
--        $this->productMock->expects($this->once())->method('getSku')->willReturn($productSku);
--        $this->assertEquals($this->productMock, $this->model->getById($productId));
--        $this->assertEquals($this->productMock, $this->model->get($productSku));
-+        $this->productFactory->expects($this->once())->method('create')
-+            ->will($this->returnValue($this->product));
-+        $this->product->expects($this->once())->method('load')->with($productId);
-+        $this->product->expects($this->atLeastOnce())->method('getId')->willReturn($productId);
-+        $this->product->expects($this->once())->method('getSku')->willReturn($productSku);
-+        $this->assertEquals($this->product, $this->model->getById($productId));
-+        $this->assertEquals($this->product, $this->model->get($productSku));
-     }
- 
-     public function testSaveExisting()
-     {
--        $this->resourceModelMock->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
--        $this->productFactoryMock->expects($this->any())
-+        $this->resourceModel->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
-+        $this->productFactory->expects($this->any())
-             ->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->initializationHelperMock->expects($this->never())->method('initialize');
--        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->productMock)
-+            ->will($this->returnValue($this->product));
-+        $this->initializationHelper->expects($this->never())->method('initialize');
-+        $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
-             ->willReturn(true);
--        $this->resourceModelMock->expects($this->once())->method('save')->with($this->productMock)->willReturn(true);
--        $this->extensibleDataObjectConverterMock
-+        $this->resourceModel->expects($this->once())->method('save')->with($this->product)->willReturn(true);
-+        $this->extensibleDataObjectConverter
-             ->expects($this->once())
-             ->method('toNestedArray')
-             ->will($this->returnValue($this->productData));
--        $this->productMock->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
-+        $this->product->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
- 
--        $this->assertEquals($this->productMock, $this->model->save($this->productMock));
-+        $this->assertEquals($this->product, $this->model->save($this->product));
-     }
- 
-     public function testSaveNew()
-     {
--        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
--        $this->resourceModelMock->expects($this->at(0))->method('getIdBySku')->will($this->returnValue(null));
--        $this->resourceModelMock->expects($this->at(3))->method('getIdBySku')->will($this->returnValue(100));
--        $this->productFactoryMock->expects($this->any())
-+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-+        $this->resourceModel->expects($this->at(0))->method('getIdBySku')->will($this->returnValue(null));
-+        $this->resourceModel->expects($this->at(3))->method('getIdBySku')->will($this->returnValue(100));
-+        $this->productFactory->expects($this->any())
-             ->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->initializationHelperMock->expects($this->never())->method('initialize');
--        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->productMock)
-+            ->will($this->returnValue($this->product));
-+        $this->initializationHelper->expects($this->never())->method('initialize');
-+        $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
-             ->willReturn(true);
--        $this->resourceModelMock->expects($this->once())->method('save')->with($this->productMock)->willReturn(true);
--        $this->extensibleDataObjectConverterMock
-+        $this->resourceModel->expects($this->once())->method('save')->with($this->product)->willReturn(true);
-+        $this->extensibleDataObjectConverter
-             ->expects($this->once())
-             ->method('toNestedArray')
-             ->will($this->returnValue($this->productData));
--        $this->productMock->method('getSku')->willReturn('simple');
-+        $this->product->method('getSku')->willReturn('simple');
- 
--        $this->assertEquals($this->productMock, $this->model->save($this->productMock));
-+        $this->assertEquals($this->product, $this->model->save($this->product));
-     }
- 
-     /**
-@@ -597,24 +645,24 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testSaveUnableToSaveException()
-     {
--        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
--        $this->resourceModelMock->expects($this->exactly(1))
-+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-+        $this->resourceModel->expects($this->exactly(1))
-             ->method('getIdBySku')->willReturn(null);
--        $this->productFactoryMock->expects($this->exactly(2))
-+        $this->productFactory->expects($this->exactly(2))
-             ->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->initializationHelperMock->expects($this->never())->method('initialize');
--        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->productMock)
-+            ->will($this->returnValue($this->product));
-+        $this->initializationHelper->expects($this->never())->method('initialize');
-+        $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
-             ->willReturn(true);
--        $this->resourceModelMock->expects($this->once())->method('save')->with($this->productMock)
-+        $this->resourceModel->expects($this->once())->method('save')->with($this->product)
-             ->willThrowException(new \Exception());
--        $this->extensibleDataObjectConverterMock
-+        $this->extensibleDataObjectConverter
-             ->expects($this->once())
-             ->method('toNestedArray')
-             ->will($this->returnValue($this->productData));
--        $this->productMock->method('getSku')->willReturn('simple');
-+        $this->product->method('getSku')->willReturn('simple');
- 
--        $this->model->save($this->productMock);
-+        $this->model->save($this->product);
-     }
- 
-     /**
-@@ -623,24 +671,24 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testSaveException()
-     {
--        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
--        $this->resourceModelMock->expects($this->exactly(1))->method('getIdBySku')->will($this->returnValue(null));
--        $this->productFactoryMock->expects($this->exactly(2))
-+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-+        $this->resourceModel->expects($this->exactly(1))->method('getIdBySku')->will($this->returnValue(null));
-+        $this->productFactory->expects($this->exactly(2))
-             ->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->initializationHelperMock->expects($this->never())->method('initialize');
--        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->productMock)
-+            ->will($this->returnValue($this->product));
-+        $this->initializationHelper->expects($this->never())->method('initialize');
-+        $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
-             ->willReturn(true);
--        $this->resourceModelMock->expects($this->once())->method('save')->with($this->productMock)
-+        $this->resourceModel->expects($this->once())->method('save')->with($this->product)
-             ->willThrowException(new \Magento\Eav\Model\Entity\Attribute\Exception(__('123')));
--        $this->productMock->expects($this->once())->method('getId')->willReturn(null);
--        $this->extensibleDataObjectConverterMock
-+        $this->product->expects($this->exactly(2))->method('getId')->willReturn(null);
-+        $this->extensibleDataObjectConverter
-             ->expects($this->once())
-             ->method('toNestedArray')
-             ->will($this->returnValue($this->productData));
--        $this->productMock->method('getSku')->willReturn('simple');
-+        $this->product->method('getSku')->willReturn('simple');
- 
--        $this->model->save($this->productMock);
-+        $this->model->save($this->product);
-     }
- 
-     /**
-@@ -649,22 +697,22 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testSaveInvalidProductException()
-     {
--        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
--        $this->resourceModelMock->expects($this->exactly(1))->method('getIdBySku')->will($this->returnValue(null));
--        $this->productFactoryMock->expects($this->exactly(2))
-+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-+        $this->resourceModel->expects($this->exactly(1))->method('getIdBySku')->will($this->returnValue(null));
-+        $this->productFactory->expects($this->exactly(2))
-             ->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->initializationHelperMock->expects($this->never())->method('initialize');
--        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->productMock)
-+            ->will($this->returnValue($this->product));
-+        $this->initializationHelper->expects($this->never())->method('initialize');
-+        $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
-             ->willReturn(['error1', 'error2']);
--        $this->productMock->expects($this->never())->method('getId');
--        $this->extensibleDataObjectConverterMock
-+        $this->product->expects($this->once())->method('getId')->willReturn(null);
-+        $this->extensibleDataObjectConverter
-             ->expects($this->once())
-             ->method('toNestedArray')
-             ->will($this->returnValue($this->productData));
--        $this->productMock->method('getSku')->willReturn('simple');
-+        $this->product->method('getSku')->willReturn('simple');
- 
--        $this->model->save($this->productMock);
-+        $this->model->save($this->product);
-     }
- 
-     /**
-@@ -673,36 +721,36 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testSaveThrowsTemporaryStateExceptionIfDatabaseConnectionErrorOccurred()
-     {
--        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
--        $this->productFactoryMock->expects($this->any())
-+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-+        $this->productFactory->expects($this->any())
-             ->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->initializationHelperMock->expects($this->never())
-+            ->will($this->returnValue($this->product));
-+        $this->initializationHelper->expects($this->never())
-             ->method('initialize');
--        $this->resourceModelMock->expects($this->once())
-+        $this->resourceModel->expects($this->once())
-             ->method('validate')
--            ->with($this->productMock)
-+            ->with($this->product)
-             ->willReturn(true);
--        $this->resourceModelMock->expects($this->once())
-+        $this->resourceModel->expects($this->once())
-             ->method('save')
--            ->with($this->productMock)
-+            ->with($this->product)
-             ->willThrowException(new ConnectionException('Connection lost'));
--        $this->extensibleDataObjectConverterMock
-+        $this->extensibleDataObjectConverter
-             ->expects($this->once())
-             ->method('toNestedArray')
-             ->will($this->returnValue($this->productData));
--        $this->productMock->method('getSku')->willReturn('simple');
-+        $this->product->method('getSku')->willReturn('simple');
- 
--        $this->model->save($this->productMock);
-+        $this->model->save($this->product);
-     }
- 
-     public function testDelete()
-     {
--        $this->productMock->expects($this->exactly(2))->method('getSku')->willReturn('product-42');
--        $this->productMock->expects($this->exactly(2))->method('getId')->willReturn(42);
--        $this->resourceModelMock->expects($this->once())->method('delete')->with($this->productMock)
-+        $this->product->expects($this->exactly(2))->method('getSku')->willReturn('product-42');
-+        $this->product->expects($this->exactly(2))->method('getId')->willReturn(42);
-+        $this->resourceModel->expects($this->once())->method('delete')->with($this->product)
-             ->willReturn(true);
--        $this->assertTrue($this->model->delete($this->productMock));
-+        $this->assertTrue($this->model->delete($this->product));
-     }
- 
-     /**
-@@ -711,47 +759,47 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testDeleteException()
-     {
--        $this->productMock->expects($this->exactly(2))->method('getSku')->willReturn('product-42');
--        $this->productMock->expects($this->exactly(2))->method('getId')->willReturn(42);
--        $this->resourceModelMock->expects($this->once())->method('delete')->with($this->productMock)
-+        $this->product->expects($this->exactly(2))->method('getSku')->willReturn('product-42');
-+        $this->product->expects($this->exactly(2))->method('getId')->willReturn(42);
-+        $this->resourceModel->expects($this->once())->method('delete')->with($this->product)
-             ->willThrowException(new \Exception());
--        $this->model->delete($this->productMock);
-+        $this->model->delete($this->product);
-     }
- 
-     public function testDeleteById()
-     {
-         $sku = 'product-42';
--        $this->productFactoryMock->expects($this->once())->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->resourceModelMock->expects($this->once())->method('getIdBySku')->with($sku)
-+        $this->productFactory->expects($this->once())->method('create')
-+            ->will($this->returnValue($this->product));
-+        $this->resourceModel->expects($this->once())->method('getIdBySku')->with($sku)
-             ->will($this->returnValue('42'));
--        $this->productMock->expects($this->once())->method('load')->with('42');
--        $this->productMock->expects($this->atLeastOnce())->method('getSku')->willReturn($sku);
-+        $this->product->expects($this->once())->method('load')->with('42');
-+        $this->product->expects($this->atLeastOnce())->method('getSku')->willReturn($sku);
-         $this->assertTrue($this->model->deleteById($sku));
-     }
- 
-     public function testGetList()
-     {
--        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteriaInterface::class);
--        $collectionMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
--        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($collectionMock);
--        $this->productMock->method('getSku')->willReturn('simple');
-+        $searchCriteriaMock = $this->createMock(SearchCriteriaInterface::class);
-+        $collectionMock = $this->createMock(Collection::class);
-+        $this->collectionFactory->expects($this->once())->method('create')->willReturn($collectionMock);
-+        $this->product->method('getSku')->willReturn('simple');
-         $collectionMock->expects($this->once())->method('addAttributeToSelect')->with('*');
-         $collectionMock->expects($this->exactly(2))->method('joinAttribute')->withConsecutive(
-             ['status', 'catalog_product/status', 'entity_id', null, 'inner'],
-             ['visibility', 'catalog_product/visibility', 'entity_id', null, 'inner']
-         );
--        $this->collectionProcessorMock->expects($this->once())
-+        $this->collectionProcessor->expects($this->once())
-             ->method('process')
-             ->with($searchCriteriaMock, $collectionMock);
-         $collectionMock->expects($this->once())->method('load');
-         $collectionMock->expects($this->once())->method('addCategoryIds');
--        $collectionMock->expects($this->atLeastOnce())->method('getItems')->willReturn([$this->productMock]);
-+        $collectionMock->expects($this->atLeastOnce())->method('getItems')->willReturn([$this->product]);
-         $collectionMock->expects($this->once())->method('getSize')->willReturn(128);
--        $searchResultsMock = $this->createMock(\Magento\Catalog\Api\Data\ProductSearchResultsInterface::class);
-+        $searchResultsMock = $this->createMock(ProductSearchResultsInterface::class);
-         $searchResultsMock->expects($this->once())->method('setSearchCriteria')->with($searchCriteriaMock);
--        $searchResultsMock->expects($this->once())->method('setItems')->with([$this->productMock]);
--        $this->searchResultsFactoryMock->expects($this->once())->method('create')->willReturn($searchResultsMock);
-+        $searchResultsMock->expects($this->once())->method('setItems')->with([$this->product]);
-+        $this->searchResultsFactory->expects($this->once())->method('create')->willReturn($searchResultsMock);
-         $this->assertEquals($searchResultsMock, $this->model->getList($searchCriteriaMock));
-     }
- 
-@@ -821,28 +869,28 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testSaveExistingWithOptions(array $newOptions, array $existingOptions, array $expectedData)
-     {
--        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
--        $this->resourceModelMock->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
--        $this->productFactoryMock->expects($this->any())
-+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-+        $this->resourceModel->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
-+        $this->productFactory->expects($this->any())
-             ->method('create')
--            ->will($this->returnValue($this->initializedProductMock));
--        $this->initializationHelperMock->expects($this->never())->method('initialize');
--        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->initializedProductMock)
-+            ->will($this->returnValue($this->initializedProduct));
-+        $this->initializationHelper->expects($this->never())->method('initialize');
-+        $this->resourceModel->expects($this->once())->method('validate')->with($this->initializedProduct)
-             ->willReturn(true);
--        $this->resourceModelMock->expects($this->once())->method('save')
--            ->with($this->initializedProductMock)->willReturn(true);
-+        $this->resourceModel->expects($this->once())->method('save')
-+            ->with($this->initializedProduct)->willReturn(true);
-         //option data
-         $this->productData['options'] = $newOptions;
--        $this->extensibleDataObjectConverterMock
-+        $this->extensibleDataObjectConverter
-             ->expects($this->once())
-             ->method('toNestedArray')
-             ->will($this->returnValue($this->productData));
- 
--        $this->initializedProductMock->expects($this->atLeastOnce())
-+        $this->initializedProduct->expects($this->atLeastOnce())
-             ->method('getSku')->willReturn($this->productData['sku']);
--        $this->productMock->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
-+        $this->product->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
- 
--        $this->assertEquals($this->initializedProductMock, $this->model->save($this->productMock));
-+        $this->assertEquals($this->initializedProduct, $this->model->save($this->product));
-     }
- 
-     /**
-@@ -882,8 +930,8 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-             ],
-         ];
- 
--        /** @var \Magento\Catalog\Model\Product\Option|\PHPUnit_Framework_MockObject_MockObject $existingOption1 */
--        $existingOption1 = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option::class)
-+        /** @var Option|MockObject $existingOption1 */
-+        $existingOption1 = $this->getMockBuilder(Option::class)
-             ->disableOriginalConstructor()
-             ->setMethods(null)
-             ->getMock();
-@@ -893,8 +941,8 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-                 "type" => "drop_down",
-             ]
-         );
--        /** @var \Magento\Catalog\Model\Product\Option\Value $existingOptionValue1 */
--        $existingOptionValue1 = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option\Value::class)
-+        /** @var Value $existingOptionValue1 */
-+        $existingOptionValue1 = $this->getMockBuilder(Value::class)
-             ->disableOriginalConstructor()
-             ->setMethods(null)
-             ->getMock();
-@@ -905,7 +953,7 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-                 "price" => 5,
-             ]
-         );
--        $existingOptionValue2 = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option\Value::class)
-+        $existingOptionValue2 = $this->getMockBuilder(Value::class)
-             ->disableOriginalConstructor()
-             ->setMethods(null)
-             ->getMock();
-@@ -922,7 +970,7 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-                 "9" => $existingOptionValue2,
-             ]
-         );
--        $existingOption2 = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option::class)
-+        $existingOption2 = $this->getMockBuilder(Option::class)
-             ->disableOriginalConstructor()
-             ->setMethods(null)
-             ->getMock();
-@@ -987,36 +1035,36 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-      * @param array $existingLinks
-      * @param array $expectedData
-      * @dataProvider saveWithLinksDataProvider
--     * @throws \Magento\Framework\Exception\CouldNotSaveException
--     * @throws \Magento\Framework\Exception\InputException
-+     * @throws CouldNotSaveException
-+     * @throws InputException
-      */
-     public function testSaveWithLinks(array $newLinks, array $existingLinks, array $expectedData)
-     {
--        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
--        $this->resourceModelMock->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
--        $this->productFactoryMock->expects($this->any())
-+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-+        $this->resourceModel->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
-+        $this->productFactory->expects($this->any())
-             ->method('create')
--            ->will($this->returnValue($this->initializedProductMock));
--        $this->initializationHelperMock->expects($this->never())->method('initialize');
--        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->initializedProductMock)
-+            ->will($this->returnValue($this->initializedProduct));
-+        $this->initializationHelper->expects($this->never())->method('initialize');
-+        $this->resourceModel->expects($this->once())->method('validate')->with($this->initializedProduct)
-             ->willReturn(true);
--        $this->resourceModelMock->expects($this->once())->method('save')
--            ->with($this->initializedProductMock)->willReturn(true);
-+        $this->resourceModel->expects($this->once())->method('save')
-+            ->with($this->initializedProduct)->willReturn(true);
- 
--        $this->initializedProductMock->setData("product_links", $existingLinks);
-+        $this->initializedProduct->setData("product_links", $existingLinks);
- 
-         if (!empty($newLinks)) {
-             $linkTypes = ['related' => 1, 'upsell' => 4, 'crosssell' => 5, 'associated' => 3];
--            $this->linkTypeProviderMock->expects($this->once())
-+            $this->linkTypeProvider->expects($this->once())
-                 ->method('getLinkTypes')
-                 ->willReturn($linkTypes);
- 
--            $this->initializedProductMock->setData("ignore_links_flag", false);
--            $this->resourceModelMock
-+            $this->initializedProduct->setData("ignore_links_flag", false);
-+            $this->resourceModel
-                 ->expects($this->any())->method('getProductsIdsBySkus')
-                 ->willReturn([$newLinks['linked_product_sku'] => $newLinks['linked_product_sku']]);
- 
--            $inputLink = $this->objectManager->getObject(\Magento\Catalog\Model\ProductLink\Link::class);
-+            $inputLink = $this->objectManager->getObject(Link::class);
-             $inputLink->setProductSku($newLinks['product_sku']);
-             $inputLink->setLinkType($newLinks['link_type']);
-             $inputLink->setLinkedProductSku($newLinks['linked_product_sku']);
-@@ -1029,29 +1077,29 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
- 
-             $this->productData['product_links'] = [$inputLink];
- 
--            $this->initializedProductMock->expects($this->any())
-+            $this->initializedProduct->expects($this->any())
-                 ->method('getProductLinks')
-                 ->willReturn([$inputLink]);
-         } else {
--            $this->resourceModelMock
-+            $this->resourceModel
-                 ->expects($this->any())->method('getProductsIdsBySkus')
-                 ->willReturn([]);
- 
-             $this->productData['product_links'] = [];
- 
--            $this->initializedProductMock->setData('ignore_links_flag', true);
--            $this->initializedProductMock->expects($this->never())
-+            $this->initializedProduct->setData('ignore_links_flag', true);
-+            $this->initializedProduct->expects($this->never())
-                 ->method('getProductLinks')
-                 ->willReturn([]);
-         }
- 
--        $this->extensibleDataObjectConverterMock
-+        $this->extensibleDataObjectConverter
-             ->expects($this->at(0))
-             ->method('toNestedArray')
-             ->will($this->returnValue($this->productData));
- 
-         if (!empty($newLinks)) {
--            $this->extensibleDataObjectConverterMock
-+            $this->extensibleDataObjectConverter
-                 ->expects($this->at(1))
-                 ->method('toNestedArray')
-                 ->will($this->returnValue($newLinks));
-@@ -1060,7 +1108,7 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-         $outputLinks = [];
-         if (!empty($expectedData)) {
-             foreach ($expectedData as $link) {
--                $outputLink = $this->objectManager->getObject(\Magento\Catalog\Model\ProductLink\Link::class);
-+                $outputLink = $this->objectManager->getObject(Link::class);
-                 $outputLink->setProductSku($link['product_sku']);
-                 $outputLink->setLinkType($link['link_type']);
-                 $outputLink->setLinkedProductSku($link['linked_product_sku']);
-@@ -1075,18 +1123,18 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-         }
- 
-         if (!empty($outputLinks)) {
--            $this->initializedProductMock->expects($this->once())
-+            $this->initializedProduct->expects($this->once())
-                 ->method('setProductLinks')
-                 ->with($outputLinks);
-         } else {
--            $this->initializedProductMock->expects($this->never())
-+            $this->initializedProduct->expects($this->never())
-                 ->method('setProductLinks');
-         }
--        $this->initializedProductMock->expects($this->atLeastOnce())
-+        $this->initializedProduct->expects($this->atLeastOnce())
-             ->method('getSku')->willReturn($this->productData['sku']);
- 
--        $results = $this->model->save($this->initializedProductMock);
--        $this->assertEquals($this->initializedProductMock, $results);
-+        $results = $this->model->save($this->initializedProduct);
-+        $this->assertEquals($this->initializedProduct, $results);
-     }
- 
-     /**
-@@ -1163,20 +1211,20 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setupProductMocksForSave()
-     {
--        $this->resourceModelMock->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
--        $this->productFactoryMock->expects($this->any())
-+        $this->resourceModel->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
-+        $this->productFactory->expects($this->any())
-             ->method('create')
--            ->will($this->returnValue($this->initializedProductMock));
--        $this->initializationHelperMock->expects($this->never())->method('initialize');
--        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->initializedProductMock)
-+            ->will($this->returnValue($this->initializedProduct));
-+        $this->initializationHelper->expects($this->never())->method('initialize');
-+        $this->resourceModel->expects($this->once())->method('validate')->with($this->initializedProduct)
-             ->willReturn(true);
--        $this->resourceModelMock->expects($this->once())->method('save')
--            ->with($this->initializedProductMock)->willReturn(true);
-+        $this->resourceModel->expects($this->once())->method('save')
-+            ->with($this->initializedProduct)->willReturn(true);
-     }
- 
-     public function testSaveExistingWithNewMediaGalleryEntries()
-     {
--        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-         $newEntriesData = [
-             'images' => [
-                     [
-@@ -1200,13 +1248,13 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->setupProductMocksForSave();
-         //media gallery data
-         $this->productData['media_gallery'] = $newEntriesData;
--        $this->extensibleDataObjectConverterMock
-+        $this->extensibleDataObjectConverter
-             ->expects($this->once())
-             ->method('toNestedArray')
-             ->will($this->returnValue($this->productData));
- 
--        $this->initializedProductMock->setData('media_gallery', $newEntriesData);
--        $this->initializedProductMock->expects($this->any())
-+        $this->initializedProduct->setData('media_gallery', $newEntriesData);
-+        $this->initializedProduct->expects($this->any())
-             ->method('getMediaAttributes')
-             ->willReturn(["image" => "imageAttribute", "small_image" => "small_image_attribute"]);
- 
-@@ -1214,40 +1262,40 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-         $mediaTmpPath = '/tmp';
-         $absolutePath = '/a/b/filename.jpg';
- 
--        $this->mediaGalleryProcessor->expects($this->once())->method('clearMediaAttribute')
--            ->with($this->initializedProductMock, ['image', 'small_image']);
-+        $this->processor->expects($this->once())->method('clearMediaAttribute')
-+            ->with($this->initializedProduct, ['image', 'small_image']);
- 
--        $mediaConfigMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Media\Config::class)
-+        $mediaConfigMock = $this->getMockBuilder(Config::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-         $mediaConfigMock->expects($this->once())
-             ->method('getTmpMediaShortUrl')
-             ->with($absolutePath)
-             ->willReturn($mediaTmpPath . $absolutePath);
--        $this->initializedProductMock->expects($this->once())
-+        $this->initializedProduct->expects($this->once())
-             ->method('getMediaConfig')
-             ->willReturn($mediaConfigMock);
- 
-         //verify new entries
--        $contentDataObject = $this->getMockBuilder(\Magento\Framework\Api\ImageContent::class)
-+        $contentDataObject = $this->getMockBuilder(ImageContent::class)
-             ->disableOriginalConstructor()
-             ->setMethods(null)
-             ->getMock();
--        $this->contentFactoryMock->expects($this->once())
-+        $this->contentFactory->expects($this->once())
-             ->method('create')
-             ->willReturn($contentDataObject);
- 
--        $this->imageProcessorMock->expects($this->once())
-+        $this->imageProcessor->expects($this->once())
-             ->method('processImageContent')
-             ->willReturn($absolutePath);
- 
-         $imageFileUri = "imageFileUri";
--        $this->mediaGalleryProcessor->expects($this->once())->method('addImage')
--            ->with($this->initializedProductMock, $mediaTmpPath . $absolutePath, ['image', 'small_image'], true, false)
-+        $this->processor->expects($this->once())->method('addImage')
-+            ->with($this->initializedProduct, $mediaTmpPath . $absolutePath, ['image', 'small_image'], true, false)
-             ->willReturn($imageFileUri);
--        $this->mediaGalleryProcessor->expects($this->once())->method('updateImage')
-+        $this->processor->expects($this->once())->method('updateImage')
-             ->with(
--                $this->initializedProductMock,
-+                $this->initializedProduct,
-                 $imageFileUri,
-                 [
-                     'label' => 'label_text',
-@@ -1256,11 +1304,11 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-                     'media_type' => 'media_type',
-                 ]
-             );
--        $this->initializedProductMock->expects($this->atLeastOnce())
-+        $this->initializedProduct->expects($this->atLeastOnce())
-             ->method('getSku')->willReturn($this->productData['sku']);
--        $this->productMock->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
-+        $this->product->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
- 
--        $this->model->save($this->productMock);
-+        $this->model->save($this->product);
-     }
- 
-     /**
-@@ -1276,38 +1324,40 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-     public function testSaveWithDifferentWebsites()
-     {
-         $storeMock = $this->createMock(StoreInterface::class);
--        $this->resourceModelMock->expects($this->at(0))->method('getIdBySku')->will($this->returnValue(null));
--        $this->resourceModelMock->expects($this->at(3))->method('getIdBySku')->will($this->returnValue(100));
--        $this->productFactoryMock->expects($this->any())
-+        $this->resourceModel->expects($this->at(0))->method('getIdBySku')->will($this->returnValue(null));
-+        $this->resourceModel->expects($this->at(3))->method('getIdBySku')->will($this->returnValue(100));
-+        $this->productFactory->expects($this->any())
-             ->method('create')
--            ->will($this->returnValue($this->productMock));
--        $this->initializationHelperMock->expects($this->never())->method('initialize');
--        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->productMock)
-+            ->will($this->returnValue($this->product));
-+        $this->initializationHelper->expects($this->never())->method('initialize');
-+        $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
-             ->willReturn(true);
--        $this->resourceModelMock->expects($this->once())->method('save')->with($this->productMock)->willReturn(true);
--        $this->extensibleDataObjectConverterMock
-+        $this->resourceModel->expects($this->once())->method('save')->with($this->product)->willReturn(true);
-+        $this->extensibleDataObjectConverter
-             ->expects($this->once())
-             ->method('toNestedArray')
-             ->will($this->returnValue($this->productData));
--        $this->storeManagerMock->expects($this->any())
-+        $this->storeManager->expects($this->any())
-             ->method('getStore')
-             ->willReturn($storeMock);
--        $this->storeManagerMock->expects($this->once())
-+        $this->storeManager->expects($this->once())
-             ->method('getWebsites')
--            ->willReturn([
-+            ->willReturn(
-+                [
-                 1 => ['first'],
-                 2 => ['second'],
-                 3 => ['third']
--            ]);
--        $this->productMock->expects($this->once())->method('setWebsiteIds')->willReturn([2,3]);
--        $this->productMock->method('getSku')->willReturn('simple');
-+                ]
-+            );
-+        $this->product->expects($this->once())->method('setWebsiteIds')->willReturn([2,3]);
-+        $this->product->method('getSku')->willReturn('simple');
- 
--        $this->assertEquals($this->productMock, $this->model->save($this->productMock));
-+        $this->assertEquals($this->product, $this->model->save($this->product));
-     }
- 
-     public function testSaveExistingWithMediaGalleryEntries()
-     {
--        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-         //update one entry, delete one entry
-         $newEntries = [
-             [
-@@ -1355,26 +1405,26 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->setupProductMocksForSave();
-         //media gallery data
-         $this->productData['media_gallery']['images'] = $newEntries;
--        $this->extensibleDataObjectConverterMock
-+        $this->extensibleDataObjectConverter
-             ->expects($this->once())
-             ->method('toNestedArray')
-             ->will($this->returnValue($this->productData));
- 
--        $this->initializedProductMock->setData('media_gallery', $existingMediaGallery);
--        $this->initializedProductMock->expects($this->any())
-+        $this->initializedProduct->setData('media_gallery', $existingMediaGallery);
-+        $this->initializedProduct->expects($this->any())
-             ->method('getMediaAttributes')
-             ->willReturn(["image" => "filename1", "small_image" => "filename2"]);
- 
--        $this->mediaGalleryProcessor->expects($this->once())->method('clearMediaAttribute')
--            ->with($this->initializedProductMock, ['image', 'small_image']);
--        $this->mediaGalleryProcessor->expects($this->once())
-+        $this->processor->expects($this->once())->method('clearMediaAttribute')
-+            ->with($this->initializedProduct, ['image', 'small_image']);
-+        $this->processor->expects($this->once())
-             ->method('setMediaAttribute')
--            ->with($this->initializedProductMock, ['image', 'small_image'], 'filename1');
--        $this->initializedProductMock->expects($this->atLeastOnce())
-+            ->with($this->initializedProduct, ['image', 'small_image'], 'filename1');
-+        $this->initializedProduct->expects($this->atLeastOnce())
-             ->method('getSku')->willReturn($this->productData['sku']);
--        $this->productMock->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
--        $this->productMock->expects($this->any())->method('getMediaGalleryEntries')->willReturn(null);
--        $this->model->save($this->productMock);
--        $this->assertEquals($expectedResult, $this->initializedProductMock->getMediaGallery('images'));
-+        $this->product->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
-+        $this->product->expects($this->any())->method('getMediaGalleryEntries')->willReturn(null);
-+        $this->model->save($this->product);
-+        $this->assertEquals($expectedResult, $this->initializedProduct->getMediaGallery('images'));
-     }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
-index 3a357df81fe..8bf8473080c 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
-@@ -6,15 +6,13 @@
- 
- namespace Magento\Catalog\Test\Unit\Model;
- 
--use Magento\Catalog\Api\Data\ProductExtensionFactory;
- use Magento\Catalog\Api\Data\ProductExtensionInterface;
- use Magento\Catalog\Model\Product;
--use Magento\Eav\Model\Entity\GetCustomAttributeCodesInterface;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
- use Magento\Framework\Api\Data\ImageContentInterface;
- use Magento\Framework\Api\ExtensibleDataInterface;
- use Magento\Framework\Api\ExtensionAttributesFactory;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--use Magento\Catalog\Model\Product\Attribute\Source\Status as Status;
- 
- /**
-  * Product Test
-@@ -42,7 +40,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-     protected $model;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $moduleManager;
- 
-@@ -81,6 +79,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $_priceInfoMock;
- 
-+    /**
-+     * @var \Magento\Catalog\Model\FilterProductCustomAttribute|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $filterCustomAttribute;
-+
-     /**
-      * @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -177,7 +180,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @var \PHPUnit_Framework_MockObject_MockObject
-      */
--    private $extensionAttrbutes;
-+    private $extensionAttributes;
- 
-     /**
-      * @var \PHPUnit_Framework_MockObject_MockObject
-@@ -197,12 +200,12 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @var ProductExtensionInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
--    private $extensionAttributes;
-+    private $productExtAttributes;
- 
-     /**
--     * @var GetCustomAttributeCodesInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
-      */
--    private $getCustomAttributeCodes;
-+    private $eavConfig;
- 
-     /**
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-@@ -212,10 +215,10 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-         $this->categoryIndexerMock = $this->getMockForAbstractClass(\Magento\Framework\Indexer\IndexerInterface::class);
- 
-         $this->moduleManager = $this->createPartialMock(
--            \Magento\Framework\Module\Manager::class,
-+            \Magento\Framework\Module\ModuleManagerInterface::class,
-             ['isEnabled']
-         );
--        $this->extensionAttrbutes = $this->getMockBuilder(\Magento\Framework\Api\ExtensionAttributesInterface::class)
-+        $this->extensionAttributes = $this->getMockBuilder(\Magento\Framework\Api\ExtensionAttributesInterface::class)
-             ->setMethods(['getWebsiteIds', 'setWebsiteIds'])
-             ->disableOriginalConstructor()
-             ->getMock();
-@@ -367,18 +370,19 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(['create'])
-             ->getMock();
-         $this->mediaConfig = $this->createMock(\Magento\Catalog\Model\Product\Media\Config::class);
-+        $this->eavConfig = $this->createMock(\Magento\Eav\Model\Config::class);
- 
--        $this->extensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
-+        $this->productExtAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
-             ->setMethods(['getStockItem'])
-             ->getMockForAbstractClass();
-         $this->extensionAttributesFactory
-             ->expects($this->any())
-             ->method('create')
--            ->willReturn($this->extensionAttributes);
--        $this->getCustomAttributeCodes = $this->getMockBuilder(GetCustomAttributeCodesInterface::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['execute'])
--            ->getMockForAbstractClass();
-+            ->willReturn($this->productExtAttributes);
-+
-+        $this->filterCustomAttribute = $this->createTestProxy(
-+            \Magento\Catalog\Model\FilterProductCustomAttribute::class
-+        );
- 
-         $this->objectManagerHelper = new ObjectManagerHelper($this);
-         $this->model = $this->objectManagerHelper->getObject(
-@@ -409,7 +413,8 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-                 '_filesystem' => $this->filesystemMock,
-                 '_collectionFactory' => $this->collectionFactoryMock,
-                 'data' => ['id' => 1],
--                'getCustomAttributeCodes' => $this->getCustomAttributeCodes
-+                'eavConfig' => $this->eavConfig,
-+                'filterCustomAttribute' => $this->filterCustomAttribute
-             ]
-         );
-     }
-@@ -479,9 +484,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
- 
-         $abstractDbMock = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class)
-             ->disableOriginalConstructor()
--            ->setMethods([
-+            ->setMethods(
-+                [
-                 'getCategoryCollection',
--            ])
-+                ]
-+            )
-             ->getMockForAbstractClass();
-         $getCategoryCollectionMock = $this->createMock(
-             \Magento\Framework\Data\Collection::class
-@@ -544,6 +551,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
- 
-     public function testGetCategory()
-     {
-+        $this->model->setData('category_ids', [10]);
-         $this->category->expects($this->any())->method('getId')->will($this->returnValue(10));
-         $this->registry->expects($this->any())->method('registry')->will($this->returnValue($this->category));
-         $this->categoryRepository->expects($this->any())->method('get')->will($this->returnValue($this->category));
-@@ -552,7 +560,8 @@ class ProductTest extends \PHPUnit\Framework\TestCase
- 
-     public function testGetCategoryId()
-     {
--        $this->category->expects($this->once())->method('getId')->will($this->returnValue(10));
-+        $this->model->setData('category_ids', [10]);
-+        $this->category->expects($this->any())->method('getId')->will($this->returnValue(10));
- 
-         $this->registry->expects($this->at(0))->method('registry');
-         $this->registry->expects($this->at(1))->method('registry')->will($this->returnValue($this->category));
-@@ -1210,8 +1219,10 @@ class ProductTest extends \PHPUnit\Framework\TestCase
- 
-     public function testGetMediaGalleryImagesMerging()
-     {
--        $mediaEntries = [
--            'images' => [
-+        $mediaEntries =
-+            [
-+            'images' =>
-+                [
-                 [
-                     'value_id' => 1,
-                     'file' => 'imageFile.jpg',
-@@ -1226,24 +1237,28 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-                     'file' => 'smallImageFile.jpg',
-                     'media_type' => 'image',
-                 ],
--            ]
--        ];
--        $expectedImageDataObject = new \Magento\Framework\DataObject([
-+                ]
-+            ];
-+        $expectedImageDataObject = new \Magento\Framework\DataObject(
-+            [
-             'value_id' => 1,
-             'file' => 'imageFile.jpg',
-             'media_type' => 'image',
-             'url' => 'http://magento.dev/pub/imageFile.jpg',
-             'id' => 1,
-             'path' => '/var/www/html/pub/imageFile.jpg',
--        ]);
--        $expectedSmallImageDataObject = new \Magento\Framework\DataObject([
-+            ]
-+        );
-+        $expectedSmallImageDataObject = new \Magento\Framework\DataObject(
-+            [
-             'value_id' => 2,
-             'file' => 'smallImageFile.jpg',
-             'media_type' => 'image',
-             'url' => 'http://magento.dev/pub/smallImageFile.jpg',
-             'id' => 2,
-             'path' => '/var/www/html/pub/smallImageFile.jpg',
--        ]);
-+            ]
-+        );
- 
-         $directoryMock = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
-         $directoryMock->method('getAbsolutePath')->willReturnOnConsecutiveCalls(
-@@ -1276,15 +1291,16 @@ class ProductTest extends \PHPUnit\Framework\TestCase
- 
-     public function testGetCustomAttributes()
-     {
--        $interfaceAttributeCode = 'price';
-+        $priceCode = 'price';
-         $customAttributeCode = 'color';
-         $initialCustomAttributeValue = 'red';
-         $newCustomAttributeValue = 'blue';
--
--        $this->getCustomAttributeCodes->expects($this->exactly(3))
--            ->method('execute')
--            ->willReturn([$customAttributeCode]);
--        $this->model->setData($interfaceAttributeCode, 10);
-+        $customAttributesMetadata = [$priceCode => 'attribute1', $customAttributeCode => 'attribute2'];
-+        $this->metadataServiceMock->expects($this->never())->method('getCustomAttributesMetadata');
-+        $this->eavConfig->expects($this->once())
-+            ->method('getEntityAttributes')
-+            ->willReturn($customAttributesMetadata);
-+        $this->model->setData($priceCode, 10);
- 
-         //The color attribute is not set, expect empty custom attribute array
-         $this->assertEquals([], $this->model->getCustomAttributes());
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php
-index e1847bea53f..868252da819 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php
-@@ -23,7 +23,7 @@ return [
-         '<?xml version="1.0"?><config><type name="some_name" modelInstance="123" /></config>',
-         [
-             "Element 'type', attribute 'modelInstance': [facet 'pattern'] The value '123' is not accepted by the" .
--            " pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
-+            " pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
-             "Element 'type', attribute 'modelInstance': '123' is not a valid value of the atomic type" .
-             " 'modelName'.\nLine: 1\n"
-         ],
-@@ -57,7 +57,7 @@ return [
-         '<?xml version="1.0"?><config><type name="some_name"><priceModel instance="123123" /></type></config>',
-         [
-             "Element 'priceModel', attribute 'instance': [facet 'pattern'] The value '123123' is not accepted " .
--            "by the pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
-+            "by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
-             "Element 'priceModel', attribute 'instance': '123123' is not a valid value of the atomic type" .
-             " 'modelName'.\nLine: 1\n"
-         ],
-@@ -66,7 +66,7 @@ return [
-         '<?xml version="1.0"?><config><type name="some_name"><indexerModel instance="123" /></type></config>',
-         [
-             "Element 'indexerModel', attribute 'instance': [facet 'pattern'] The value '123' is not accepted by " .
--            "the pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
-+            "the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
-             "Element 'indexerModel', attribute 'instance': '123' is not a valid value of the atomic type" .
-             " 'modelName'.\nLine: 1\n"
-         ],
-@@ -83,7 +83,7 @@ return [
-         '<?xml version="1.0"?><config><type name="some_name"><stockIndexerModel instance="1234"/></type></config>',
-         [
-             "Element 'stockIndexerModel', attribute 'instance': [facet 'pattern'] The value '1234' is not " .
--            "accepted by the pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
-+            "accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
-             "Element 'stockIndexerModel', attribute 'instance': '1234' is not a valid value of the atomic " .
-             "type 'modelName'.\nLine: 1\n"
-         ],
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/valid_product_types_merged.xml b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/valid_product_types_merged.xml
-index 7edbc399a94..701338774ba 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/valid_product_types_merged.xml
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/valid_product_types_merged.xml
-@@ -15,6 +15,14 @@
-         <stockIndexerModel instance="instance_name"/>
-     </type>
-     <type label="some_label" name="some_name2" modelInstance="model_name">
-+        <allowedSelectionTypes>
-+            <type name="some_name" />
-+        </allowedSelectionTypes>
-+        <priceModel instance="instance_name_with_digits_123" />
-+        <indexerModel instance="instance_name_with_digits_123" />
-+        <stockIndexerModel instance="instance_name_with_digits_123"/>
-+    </type>
-+    <type label="some_label" name="some_name3" modelInstance="model_name">
-         <allowedSelectionTypes>
-             <type name="some_name" />
-         </allowedSelectionTypes>
-@@ -25,5 +33,6 @@
-     <composableTypes>
-         <type name="some_name"/>
-         <type name="some_name2"/>
-+        <type name="some_name3"/>
-     </composableTypes>
- </config>
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CategoryLinkTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CategoryLinkTest.php
-index 9e2b1966029..5a1a5906ec4 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CategoryLinkTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CategoryLinkTest.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Product;
- 
- use Magento\Catalog\Model\ResourceModel\Product\CategoryLink;
-@@ -129,9 +130,20 @@ class CategoryLinkTest extends \PHPUnit\Framework\TestCase
-                 );
-         }
- 
-+        $expectedResult = [];
-+
-+        foreach ($affectedIds as $type => $ids) {
-+            $expectedResult = array_merge($expectedResult, $ids);
-+            // Verify if the correct insert, update and/or delete actions are performed:
-+            $this->setupExpectationsForConnection($type, $ids);
-+        }
-+
-         $actualResult = $this->model->saveCategoryLinks($product, $newCategoryLinks);
-+
-         sort($actualResult);
--        $this->assertEquals($affectedIds, $actualResult);
-+        sort($expectedResult);
-+
-+        $this->assertEquals($expectedResult, $actualResult);
-     }
- 
-     /**
-@@ -151,7 +163,11 @@ class CategoryLinkTest extends \PHPUnit\Framework\TestCase
-                     ['category_id' => 3, 'position' => 10],
-                     ['category_id' => 4, 'position' => 20],
-                 ],
--                [], // Nothing to update - data not changed
-+                [
-+                    'update' => [],
-+                    'insert' => [],
-+                    'delete' => [],
-+                ],
-             ],
-             [
-                 [
-@@ -162,7 +178,11 @@ class CategoryLinkTest extends \PHPUnit\Framework\TestCase
-                     ['category_id' => 3, 'position' => 10],
-                     ['category_id' => 4, 'position' => 20],
-                 ],
--                [3, 4, 5], // 4 - updated position, 5 - added, 3 - deleted
-+                [
-+                    'update' => [4],
-+                    'insert' => [5],
-+                    'delete' => [3],
-+                ],
-             ],
-             [
-                 [
-@@ -173,7 +193,11 @@ class CategoryLinkTest extends \PHPUnit\Framework\TestCase
-                     ['category_id' => 3, 'position' => 10],
-                     ['category_id' => 4, 'position' => 20],
-                 ],
--                [3, 4], // 3 - updated position, 4 - deleted
-+                [
-+                    'update' => [3],
-+                    'insert' => [],
-+                    'delete' => [4],
-+                ],
-             ],
-             [
-                 [],
-@@ -181,8 +205,80 @@ class CategoryLinkTest extends \PHPUnit\Framework\TestCase
-                     ['category_id' => 3, 'position' => 10],
-                     ['category_id' => 4, 'position' => 20],
-                 ],
--                [3, 4], // 3, 4 - deleted
-+                [
-+                    'update' => [],
-+                    'insert' => [],
-+                    'delete' => [3, 4],
-+                ],
-             ],
-+            [
-+                [
-+                    ['category_id' => 3, 'position' => 10],
-+                    ['category_id' => 4, 'position' => 20],
-+                ],
-+                [
-+                    ['category_id' => 3, 'position' => 20], // swapped positions
-+                    ['category_id' => 4, 'position' => 10], // swapped positions
-+                ],
-+                [
-+                    'update' => [3, 4],
-+                    'insert' => [],
-+                    'delete' => [],
-+                ],
-+            ]
-         ];
-     }
-+
-+    /**
-+     * @param $type
-+     * @param $ids
-+     */
-+    private function setupExpectationsForConnection($type, $ids): void
-+    {
-+        switch ($type) {
-+            case 'insert':
-+                $this->connectionMock
-+                    ->expects($this->exactly(empty($ids) ? 0 : 1))
-+                    ->method('insertArray')
-+                    ->with(
-+                        $this->anything(),
-+                        $this->anything(),
-+                        $this->callback(function ($data) use ($ids) {
-+                            $foundIds = [];
-+                            foreach ($data as $row) {
-+                                $foundIds[] = $row['category_id'];
-+                            }
-+                            return $ids === $foundIds;
-+                        })
-+                    );
-+                break;
-+            case 'update':
-+                $this->connectionMock
-+                    ->expects($this->exactly(empty($ids) ? 0 : 1))
-+                    ->method('insertOnDuplicate')
-+                    ->with(
-+                        $this->anything(),
-+                        $this->callback(function ($data) use ($ids) {
-+                            $foundIds = [];
-+                            foreach ($data as $row) {
-+                                $foundIds[] = $row['category_id'];
-+                            }
-+                            return $ids === $foundIds;
-+                        })
-+                    );
-+                break;
-+            case 'delete':
-+                $this->connectionMock
-+                    ->expects($this->exactly(empty($ids) ? 0 : 1))
-+                    ->method('delete')
-+                    // Verify that the correct category ID's are touched:
-+                    ->with(
-+                        $this->anything(),
-+                        $this->callback(function ($data) use ($ids) {
-+                            return array_values($data)[1] === $ids;
-+                        })
-+                    );
-+                break;
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
-index dbbb3fb2951..6370a4a7a27 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
-@@ -58,13 +58,18 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-      */
-     private $storeManager;
- 
-+    /**
-+     * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $entityFactory;
-+
-     /**
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-     protected function setUp()
-     {
-         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--        $entityFactory = $this->createMock(\Magento\Framework\Data\Collection\EntityFactory::class);
-+        $this->entityFactory = $this->createMock(\Magento\Framework\Data\Collection\EntityFactory::class);
-         $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
-@@ -93,7 +98,7 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->setMethods(['getStore', 'getId', 'getWebsiteId'])
-             ->getMockForAbstractClass();
--        $moduleManager = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
-+        $moduleManager = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-         $catalogProductFlatState = $this->getMockBuilder(\Magento\Catalog\Model\Indexer\Product\Flat\State::class)
-@@ -120,32 +125,25 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         $groupManagement = $this->getMockBuilder(\Magento\Customer\Api\GroupManagementInterface::class)
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
--
-         $this->connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
-             ->setMethods(['getId'])
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
--
-         $this->selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--
-         $this->entityMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\AbstractEntity::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--
-         $this->galleryResourceMock = $this->getMockBuilder(
-             \Magento\Catalog\Model\ResourceModel\Product\Gallery::class
-         )->disableOriginalConstructor()->getMock();
--
-         $this->metadataPoolMock = $this->getMockBuilder(
-             \Magento\Framework\EntityManager\MetadataPool::class
-         )->disableOriginalConstructor()->getMock();
--
-         $this->galleryReadHandlerMock = $this->getMockBuilder(
-             \Magento\Catalog\Model\Product\Gallery\ReadHandler::class
-         )->disableOriginalConstructor()->getMock();
--
-         $this->storeManager->expects($this->any())->method('getId')->willReturn(1);
-         $this->storeManager->expects($this->any())->method('getStore')->willReturnSelf();
-         $universalFactory->expects($this->exactly(1))->method('create')->willReturnOnConsecutiveCalls(
-@@ -168,7 +166,7 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         $this->collection = $this->objectManager->getObject(
-             \Magento\Catalog\Model\ResourceModel\Product\Collection::class,
-             [
--                'entityFactory' => $entityFactory,
-+                'entityFactory' => $this->entityFactory,
-                 'logger' => $logger,
-                 'fetchStrategy' => $fetchStrategy,
-                 'eventManager' => $eventManager,
-@@ -318,7 +316,7 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-                 [ '(customer_group_id=? AND all_groups=0) OR all_groups=1', $customerGroupId]
-             )
-             ->willReturnSelf();
--        $select->expects($this->once())->method('order')->with('entity_id')->willReturnSelf();
-+        $select->expects($this->once())->method('order')->with('qty')->willReturnSelf();
-         $this->connectionMock->expects($this->once())
-             ->method('fetchAll')
-             ->with($select)
-@@ -370,7 +368,7 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         $select->expects($this->exactly(1))->method('where')
-             ->with('entity_id IN(?)', [1])
-             ->willReturnSelf();
--        $select->expects($this->once())->method('order')->with('entity_id')->willReturnSelf();
-+        $select->expects($this->once())->method('order')->with('qty')->willReturnSelf();
-         $this->connectionMock->expects($this->once())
-             ->method('fetchAll')
-             ->with($select)
-@@ -379,4 +377,20 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
- 
-         $this->assertSame($this->collection, $this->collection->addTierPriceData());
-     }
-+
-+    /**
-+     * Test for getNewEmptyItem() method
-+     *
-+     * @return void
-+     */
-+    public function testGetNewEmptyItem()
-+    {
-+        $item = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->entityFactory->expects($this->once())->method('create')->willReturn($item);
-+        $firstItem = $this->collection->getNewEmptyItem();
-+        $secondItem = $this->collection->getNewEmptyItem();
-+        $this->assertEquals($firstItem, $secondItem);
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/GalleryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/GalleryTest.php
-index dfed4e4f373..47ef3c99912 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/GalleryTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/GalleryTest.php
-@@ -281,6 +281,9 @@ class GalleryTest extends \PHPUnit\Framework\TestCase
-         $this->resource->bindValueToEntity($valueId, $entityId);
-     }
- 
-+    /**
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-     public function testLoadGallery()
-     {
-         $productId = 5;
-@@ -329,7 +332,8 @@ class GalleryTest extends \PHPUnit\Framework\TestCase
-             'main.value_id = entity.value_id',
-             ['entity_id']
-         )->willReturnSelf();
--        $this->product->expects($this->at(0))->method('getData')->with('entity_id')->willReturn($productId);
-+        $this->product->expects($this->at(0))->method('getData')
-+            ->with('entity_id')->willReturn($productId);
-         $this->product->expects($this->at(1))->method('getStoreId')->will($this->returnValue($storeId));
-         $this->connection->expects($this->exactly(2))->method('quoteInto')->withConsecutive(
-             ['value.store_id = ?'],
-@@ -338,26 +342,50 @@ class GalleryTest extends \PHPUnit\Framework\TestCase
-             'value.store_id = ' . $storeId,
-             'default_value.store_id = ' . 0
-         );
-+        $this->connection->expects($this->any())->method('getIfNullSql')->will(
-+            $this->returnValueMap([
-+                [
-+                    '`value`.`label`',
-+                    '`default_value`.`label`',
-+                    'IFNULL(`value`.`label`, `default_value`.`label`)'
-+                ],
-+                [
-+                    '`value`.`position`',
-+                    '`default_value`.`position`',
-+                    'IFNULL(`value`.`position`, `default_value`.`position`)'
-+                ],
-+                [
-+                    '`value`.`disabled`',
-+                    '`default_value`.`disabled`',
-+                    'IFNULL(`value`.`disabled`, `default_value`.`disabled`)'
-+                ]
-+            ])
-+        );
-         $this->select->expects($this->at(2))->method('joinLeft')->with(
-             ['value' => $getTableReturnValue],
-             $quoteInfoReturnValue,
--            [
--                'label',
--                'position',
--                'disabled'
--            ]
-+            []
-         )->willReturnSelf();
-         $this->select->expects($this->at(3))->method('joinLeft')->with(
-             ['default_value' => $getTableReturnValue],
-             $quoteDefaultInfoReturnValue,
--            ['label_default' => 'label', 'position_default' => 'position', 'disabled_default' => 'disabled']
-+            []
-         )->willReturnSelf();
--        $this->select->expects($this->at(4))->method('where')->with(
-+        $this->select->expects($this->at(4))->method('columns')->with([
-+            'label' => 'IFNULL(`value`.`label`, `default_value`.`label`)',
-+            'position' => 'IFNULL(`value`.`position`, `default_value`.`position`)',
-+            'disabled' => 'IFNULL(`value`.`disabled`, `default_value`.`disabled`)',
-+            'label_default' => 'default_value.label',
-+            'position_default' => 'default_value.position',
-+            'disabled_default' => 'default_value.disabled'
-+        ])->willReturnSelf();
-+        $this->select->expects($this->at(5))->method('where')->with(
-             'main.attribute_id = ?',
-             $attributeId
-         )->willReturnSelf();
--        $this->select->expects($this->at(5))->method('where')->with('main.disabled = 0')->willReturnSelf();
--        $this->select->expects($this->at(7))->method('where')
-+        $this->select->expects($this->at(6))->method('where')
-+            ->with('main.disabled = 0')->willReturnSelf();
-+        $this->select->expects($this->at(8))->method('where')
-                      ->with('entity.entity_id = ?', $productId)
-                      ->willReturnSelf();
-         $this->select->expects($this->once())->method('order')
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
-new file mode 100644
-index 00000000000..af2cb6f06ed
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
-@@ -0,0 +1,358 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Product;
-+
-+use Magento\Catalog\Model\ResourceModel\Product\Image;
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+use Magento\Framework\DB\Query\Generator;
-+use Magento\Framework\DB\Select;
-+use Magento\Framework\App\ResourceConnection;
-+use Magento\Catalog\Model\ResourceModel\Product\Gallery;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+use Magento\Framework\DB\Query\BatchIteratorInterface;
-+
-+/**
-+ * Class ImageTest
-+ * @package Magento\Catalog\Test\Unit\Model\ResourceModel\Product
-+ */
-+class ImageTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-+     */
-+    protected $objectManager;
-+
-+    /**
-+     * @var AdapterInterface | MockObject
-+     */
-+    protected $connectionMock;
-+
-+    /**
-+     * @var Generator | MockObject
-+     */
-+    protected $generatorMock;
-+
-+    /**
-+     * @var ResourceConnection | MockObject
-+     */
-+    protected $resourceMock;
-+
-+    protected function setUp(): void
-+    {
-+        $this->objectManager =
-+            new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $this->connectionMock = $this->createMock(AdapterInterface::class);
-+        $this->resourceMock = $this->createMock(ResourceConnection::class);
-+        $this->resourceMock->method('getConnection')
-+            ->willReturn($this->connectionMock);
-+        $this->resourceMock->method('getTableName')
-+            ->willReturnArgument(0);
-+        $this->generatorMock = $this->createMock(Generator::class);
-+    }
-+
-+    /**
-+     * @return MockObject
-+     */
-+    protected function getVisibleImagesSelectMock(): MockObject
-+    {
-+        $selectMock = $this->getMockBuilder(Select::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $selectMock->expects($this->once())
-+            ->method('distinct')
-+            ->willReturnSelf();
-+        $selectMock->expects($this->once())
-+            ->method('from')
-+            ->with(
-+                ['images' => Gallery::GALLERY_TABLE],
-+                'value as filepath'
-+            )->willReturnSelf();
-+        $selectMock->expects($this->once())
-+            ->method('where')
-+            ->with('disabled = 0')
-+            ->willReturnSelf();
-+
-+        return $selectMock;
-+    }
-+
-+    /**
-+     * @return MockObject
-+     */
-+    protected function getUsedImagesSelectMock(): MockObject
-+    {
-+        $selectMock = $this->getMockBuilder(Select::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $selectMock->expects($this->once())
-+            ->method('distinct')
-+            ->willReturnSelf();
-+        $selectMock->expects($this->once())
-+            ->method('from')
-+            ->with(
-+                ['images' => Gallery::GALLERY_TABLE],
-+                'value as filepath'
-+            )->willReturnSelf();
-+        $selectMock->expects($this->once())
-+            ->method('joinInner')
-+            ->with(
-+                ['image_value' => Gallery::GALLERY_VALUE_TABLE],
-+                'images.value_id = image_value.value_id'
-+            )->willReturnSelf();
-+        $selectMock->expects($this->once())
-+            ->method('where')
-+            ->with('images.disabled = 0 AND image_value.disabled = 0')
-+            ->willReturnSelf();
-+
-+        return $selectMock;
-+    }
-+
-+    /**
-+     * @param int $imagesCount
-+     * @dataProvider dataProvider
-+     */
-+    public function testGetCountAllProductImages(int $imagesCount): void
-+    {
-+        $selectMock = $this->getVisibleImagesSelectMock();
-+        $selectMock->expects($this->exactly(2))
-+            ->method('reset')
-+            ->withConsecutive(
-+                ['columns'],
-+                ['distinct']
-+            )->willReturnSelf();
-+        $selectMock->expects($this->once())
-+            ->method('columns')
-+            ->with(new \Zend_Db_Expr('count(distinct value)'))
-+            ->willReturnSelf();
-+
-+        $this->connectionMock->expects($this->once())
-+            ->method('select')
-+            ->willReturn($selectMock);
-+        $this->connectionMock->expects($this->once())
-+            ->method('fetchOne')
-+            ->with($selectMock)
-+            ->willReturn($imagesCount);
-+
-+        $imageModel = $this->objectManager->getObject(
-+            Image::class,
-+            [
-+                'generator' => $this->generatorMock,
-+                'resourceConnection' => $this->resourceMock
-+            ]
-+        );
-+
-+        $this->assertSame(
-+            $imagesCount,
-+            $imageModel->getCountAllProductImages()
-+        );
-+    }
-+
-+    /**
-+     * @param int $imagesCount
-+     * @dataProvider dataProvider
-+     */
-+    public function testGetCountUsedProductImages(int $imagesCount): void
-+    {
-+        $selectMock = $this->getUsedImagesSelectMock();
-+        $selectMock->expects($this->exactly(2))
-+            ->method('reset')
-+            ->withConsecutive(
-+                ['columns'],
-+                ['distinct']
-+            )->willReturnSelf();
-+        $selectMock->expects($this->once())
-+            ->method('columns')
-+            ->with(new \Zend_Db_Expr('count(distinct value)'))
-+            ->willReturnSelf();
-+
-+        $this->connectionMock->expects($this->once())
-+            ->method('select')
-+            ->willReturn($selectMock);
-+        $this->connectionMock->expects($this->once())
-+            ->method('fetchOne')
-+            ->with($selectMock)
-+            ->willReturn($imagesCount);
-+
-+        $imageModel = $this->objectManager->getObject(
-+            Image::class,
-+            [
-+                'generator' => $this->generatorMock,
-+                'resourceConnection' => $this->resourceMock
-+            ]
-+        );
-+
-+        $this->assertSame(
-+            $imagesCount,
-+            $imageModel->getCountUsedProductImages()
-+        );
-+    }
-+
-+    /**
-+     * @param int $imagesCount
-+     * @param int $batchSize
-+     * @dataProvider dataProvider
-+     */
-+    public function testGetAllProductImages(int $imagesCount, int $batchSize): void
-+    {
-+        $this->connectionMock->expects($this->once())
-+            ->method('select')
-+            ->willReturn($this->getVisibleImagesSelectMock());
-+
-+        $batchCount = (int)ceil($imagesCount / $batchSize);
-+        $fetchResultsCallback = $this->getFetchResultCallbackForBatches($imagesCount, $batchSize);
-+        $this->connectionMock->expects($this->exactly($batchCount))
-+            ->method('fetchAll')
-+            ->will($this->returnCallback($fetchResultsCallback));
-+
-+        /** @var Select | MockObject $selectMock */
-+        $selectMock = $this->getMockBuilder(Select::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->generatorMock->expects($this->once())
-+            ->method('generate')
-+            ->with(
-+                'value_id',
-+                $selectMock,
-+                $batchSize,
-+                BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
-+            )->will(
-+                $this->returnCallback(
-+                    $this->getBatchIteratorCallback($selectMock, $batchCount)
-+                )
-+            );
-+
-+        $imageModel = $this->objectManager->getObject(
-+            Image::class,
-+            [
-+                'generator' => $this->generatorMock,
-+                'resourceConnection' => $this->resourceMock,
-+                'batchSize' => $batchSize
-+            ]
-+        );
-+
-+        $this->assertCount($imagesCount, $imageModel->getAllProductImages());
-+    }
-+
-+    /**
-+     * @param int $imagesCount
-+     * @param int $batchSize
-+     * @dataProvider dataProvider
-+     */
-+    public function testGetUsedProductImages(int $imagesCount, int $batchSize): void
-+    {
-+        $this->connectionMock->expects($this->once())
-+            ->method('select')
-+            ->willReturn($this->getUsedImagesSelectMock());
-+
-+        $batchCount = (int)ceil($imagesCount / $batchSize);
-+        $fetchResultsCallback = $this->getFetchResultCallbackForBatches($imagesCount, $batchSize);
-+        $this->connectionMock->expects($this->exactly($batchCount))
-+            ->method('fetchAll')
-+            ->will($this->returnCallback($fetchResultsCallback));
-+
-+        /** @var Select | MockObject $selectMock */
-+        $selectMock = $this->getMockBuilder(Select::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->generatorMock->expects($this->once())
-+            ->method('generate')
-+            ->with(
-+                'value_id',
-+                $selectMock,
-+                $batchSize,
-+                BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
-+            )->will(
-+                $this->returnCallback(
-+                    $this->getBatchIteratorCallback($selectMock, $batchCount)
-+                )
-+            );
-+
-+        /** @var Image $imageModel */
-+        $imageModel = $this->objectManager->getObject(
-+            Image::class,
-+            [
-+                'generator' => $this->generatorMock,
-+                'resourceConnection' => $this->resourceMock,
-+                'batchSize' => $batchSize
-+            ]
-+        );
-+
-+        $this->assertCount($imagesCount, $imageModel->getUsedProductImages());
-+    }
-+
-+    /**
-+     * @param int $imagesCount
-+     * @param int $batchSize
-+     * @return \Closure
-+     */
-+    protected function getFetchResultCallbackForBatches(
-+        int $imagesCount,
-+        int $batchSize
-+    ): \Closure {
-+        $fetchResultsCallback = function () use (&$imagesCount, $batchSize) {
-+            $batchSize =
-+                ($imagesCount >= $batchSize) ? $batchSize : $imagesCount;
-+            $imagesCount -= $batchSize;
-+
-+            $getFetchResults = function ($batchSize): array {
-+                $result = [];
-+                $count = $batchSize;
-+                while ($count) {
-+                    $count--;
-+                    $result[$count] = $count;
-+                }
-+
-+                return $result;
-+            };
-+
-+            return $getFetchResults($batchSize);
-+        };
-+
-+        return $fetchResultsCallback;
-+    }
-+
-+    /**
-+     * @param Select | MockObject $selectMock
-+     * @param int $batchCount
-+     * @return \Closure
-+     */
-+    protected function getBatchIteratorCallback(
-+        MockObject $selectMock,
-+        int $batchCount
-+    ): \Closure {
-+        $iteratorCallback = function () use ($batchCount, $selectMock): array {
-+            $result = [];
-+            $count = $batchCount;
-+            while ($count) {
-+                $count--;
-+                $result[$count] = $selectMock;
-+            }
-+
-+            return $result;
-+        };
-+
-+        return $iteratorCallback;
-+    }
-+
-+    /**
-+     * Data Provider
-+     * @return array
-+     */
-+    public function dataProvider(): array
-+    {
-+        return [
-+            [300, 300],
-+            [300, 100],
-+            [139, 100],
-+            [67, 10],
-+            [154, 47],
-+            [0, 100]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimatorTest.php
-index 1c476443381..728044b89ca 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimatorTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimatorTest.php
-@@ -49,7 +49,6 @@ class CompositeProductRowSizeEstimatorTest extends \PHPUnit\Framework\TestCase
- 
-     public function testEstimateRowSize()
-     {
--        $this->markTestSkipped('Unskip after MAGETWO-89738');
-         $expectedResult = 40000000;
-         $maxRelatedProductCount = 10;
- 
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php
-index a21883eb4a1..ee487041600 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php
-@@ -16,7 +16,7 @@ use Magento\Framework\DB\Select;
- use Magento\Framework\EntityManager\EntityMetadataInterface;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
--use Magento\Store\Api\StoreResolverInterface;
-+use Magento\Store\Model\StoreManagerInterface;
- use Magento\Store\Model\Store;
- 
- /**
-@@ -35,9 +35,9 @@ class StatusBaseSelectProcessorTest extends \PHPUnit\Framework\TestCase
-     private $metadataPool;
- 
-     /**
--     * @var StoreResolverInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
--    private $storeResolver;
-+    private $storeManager;
- 
-     /**
-      * @var Select|\PHPUnit_Framework_MockObject_MockObject
-@@ -53,13 +53,13 @@ class StatusBaseSelectProcessorTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->eavConfig = $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock();
-         $this->metadataPool = $this->getMockBuilder(MetadataPool::class)->disableOriginalConstructor()->getMock();
--        $this->storeResolver = $this->getMockBuilder(StoreResolverInterface::class)->getMock();
-+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)->getMock();
-         $this->select = $this->getMockBuilder(Select::class)->disableOriginalConstructor()->getMock();
- 
-         $this->statusBaseSelectProcessor =  (new ObjectManager($this))->getObject(StatusBaseSelectProcessor::class, [
-             'eavConfig' => $this->eavConfig,
-             'metadataPool' => $this->metadataPool,
--            'storeResolver' => $this->storeResolver,
-+            'storeManager' => $this->storeManager,
-         ]);
-     }
- 
-@@ -94,8 +94,14 @@ class StatusBaseSelectProcessorTest extends \PHPUnit\Framework\TestCase
-             ->with(Product::ENTITY, ProductInterface::STATUS)
-             ->willReturn($statusAttribute);
- 
--        $this->storeResolver->expects($this->once())
--            ->method('getCurrentStoreId')
-+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMock();
-+
-+        $this->storeManager->expects($this->once())
-+            ->method('getStore')
-+            ->willReturn($storeMock);
-+
-+        $storeMock->expects($this->once())
-+            ->method('getId')
-             ->willReturn($currentStoreId);
- 
-         $this->select->expects($this->at(0))
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/_files/converted_view.php b/app/code/Magento/Catalog/Test/Unit/Model/_files/converted_view.php
-index 37b0e15cac6..e225ec0daef 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/_files/converted_view.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/_files/converted_view.php
-@@ -11,7 +11,41 @@ return [
-                     "type" => "swatch_thumb",
-                     "width" => 75,
-                     "height" => 75,
--                    "background" => [255, 25, 2]
-+                    "constrain" => false,
-+                    "aspect_ratio" => false,
-+                    "frame" => false,
-+                    "transparency" => false,
-+                    "background" => [255, 25, 2],
-+                ],
-+                "swatch_thumb_medium" => [
-+                    "type" => "swatch_medium",
-+                    "width" => 750,
-+                    "height" => 750,
-+                    "constrain" => true,
-+                    "aspect_ratio" => true,
-+                    "frame" => true,
-+                    "transparency" => true,
-+                    "background" => [255, 25, 2],
-+                ],
-+                "swatch_thumb_large" => [
-+                    "type" => "swatch_large",
-+                    "width" => 1080,
-+                    "height" => 720,
-+                    "constrain" => false,
-+                    "aspect_ratio" => false,
-+                    "frame" => false,
-+                    "transparency" => false,
-+                    "background" => [255, 25, 2],
-+                ],
-+                "swatch_thumb_small" => [
-+                    "type" => "swatch_small",
-+                    "width" => 100,
-+                    "height" => 100,
-+                    "constrain" => true,
-+                    "aspect_ratio" => true,
-+                    "frame" => true,
-+                    "transparency" => true,
-+                    "background" => [255, 25, 2],
-                 ]
-             ]
-         ]
-diff --git a/app/code/Magento/Catalog/Test/Unit/Model/_files/valid_view.xml b/app/code/Magento/Catalog/Test/Unit/Model/_files/valid_view.xml
-index 253abc5e2e4..ee4ddaad534 100644
---- a/app/code/Magento/Catalog/Test/Unit/Model/_files/valid_view.xml
-+++ b/app/code/Magento/Catalog/Test/Unit/Model/_files/valid_view.xml
-@@ -11,6 +11,37 @@
-             <image id="swatch_thumb_base" type="swatch_thumb">
-                 <width>75</width>
-                 <height>75</height>
-+                <constrain>false</constrain>
-+                <aspect_ratio>false</aspect_ratio>
-+                <frame>false</frame>
-+                <transparency>false</transparency>
-+                <background>[255, 25, 2]</background>
-+            </image>
-+            <image id="swatch_thumb_medium" type="swatch_medium">
-+                <width>750</width>
-+                <height>750</height>
-+                <constrain>true</constrain>
-+                <aspect_ratio>true</aspect_ratio>
-+                <frame>true</frame>
-+                <transparency>true</transparency>
-+                <background>[255, 25, 2]</background>
-+            </image>
-+            <image id="swatch_thumb_large" type="swatch_large">
-+                <width>1080</width>
-+                <height>720</height>
-+                <constrain>0</constrain>
-+                <aspect_ratio>0</aspect_ratio>
-+                <frame>0</frame>
-+                <transparency>0</transparency>
-+                <background>[255, 25, 2]</background>
-+            </image>
-+            <image id="swatch_thumb_small" type="swatch_small">
-+                <width>100</width>
-+                <height>100</height>
-+                <constrain>1</constrain>
-+                <aspect_ratio>1</aspect_ratio>
-+                <frame>1</frame>
-+                <transparency>1</transparency>
-                 <background>[255, 25, 2]</background>
-             </image>
-         </images>
-diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
-index 2d67db77d43..c5a3e5dab76 100644
---- a/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
-@@ -87,7 +87,7 @@ class TopmenuTest extends \PHPUnit\Framework\TestCase
-             \Magento\Catalog\Model\ResourceModel\Category\Collection::class
-         );
-         $this->categoryCollectionFactoryMock = $this->createPartialMock(
--            \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory::class,
-+            \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory::class,
-             ['create']
-         );
- 
-diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php
-new file mode 100644
-index 00000000000..463ecf88197
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php
-@@ -0,0 +1,154 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Test\Unit\Plugin\Model\Attribute\Backend;
-+
-+use Magento\Catalog\Plugin\Model\Attribute\Backend\AttributeValidation;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
-+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-+use Magento\Framework\DataObject;
-+
-+class AttributeValidationTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var AttributeValidation
-+     */
-+    private $attributeValidation;
-+
-+    /**
-+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $storeManagerMock;
-+
-+    /**
-+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $storeMock;
-+
-+    /**
-+     * @var array
-+     */
-+    private $allowedEntityTypes;
-+
-+    /**
-+     * @var \Callable
-+     */
-+    private $proceedMock;
-+
-+    /**
-+     * @var bool
-+     */
-+    private $isProceedMockCalled = false;
-+
-+    /**
-+     * @var AbstractBackend|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $subjectMock;
-+
-+    /**
-+     * @var AbstractAttribute|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $attributeMock;
-+
-+    /**
-+     * @var DataObject|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $entityMock;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = new ObjectManager($this);
-+
-+        $this->attributeMock = $this->getMockBuilder(AbstractBackend::class)
-+            ->setMethods(['getAttributeCode'])
-+            ->getMockForAbstractClass();
-+        $this->subjectMock = $this->getMockBuilder(AbstractBackend::class)
-+            ->setMethods(['getAttribute'])
-+            ->getMockForAbstractClass();
-+        $this->subjectMock->expects($this->any())
-+            ->method('getAttribute')
-+            ->willReturn($this->attributeMock);
-+
-+        $this->storeMock = $this->getMockBuilder(StoreInterface::class)
-+            ->setMethods(['getId'])
-+            ->getMockForAbstractClass();
-+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
-+            ->setMethods(['getStore'])
-+            ->getMockForAbstractClass();
-+        $this->storeManagerMock->expects($this->any())
-+            ->method('getStore')
-+            ->willReturn($this->storeMock);
-+
-+        $this->entityMock = $this->getMockBuilder(DataObject::class)
-+            ->setMethods(['getData'])
-+            ->getMock();
-+
-+        $this->allowedEntityTypes = [$this->entityMock];
-+
-+        $this->proceedMock = function () {
-+            $this->isProceedMockCalled = true;
-+        };
-+
-+        $this->attributeValidation = $objectManager->getObject(
-+            AttributeValidation::class,
-+            [
-+                'storeManager' => $this->storeManagerMock,
-+                'allowedEntityTypes' => $this->allowedEntityTypes,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @param bool $shouldProceedRun
-+     * @param bool $defaultStoreUsed
-+     * @param null|int|string $storeId
-+     * @dataProvider aroundValidateDataProvider
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     * @return void
-+     */
-+    public function testAroundValidate(bool $shouldProceedRun, bool $defaultStoreUsed, $storeId)
-+    {
-+        $this->isProceedMockCalled = false;
-+        $attributeCode = 'code';
-+
-+        $this->storeMock->expects($this->once())
-+            ->method('getId')
-+            ->willReturn($storeId);
-+        if ($defaultStoreUsed) {
-+            $this->attributeMock->expects($this->once())
-+                ->method('getAttributeCode')
-+                ->willReturn($attributeCode);
-+            $this->entityMock->expects($this->at(0))
-+                ->method('getData')
-+                ->willReturn([$attributeCode => null]);
-+            $this->entityMock->expects($this->at(1))
-+                ->method('getData')
-+                ->with($attributeCode)
-+                ->willReturn(null);
-+        }
-+
-+        $this->attributeValidation->aroundValidate($this->subjectMock, $this->proceedMock, $this->entityMock);
-+        $this->assertSame($shouldProceedRun, $this->isProceedMockCalled);
-+    }
-+
-+    /**
-+     * Data provider for testAroundValidate
-+     * @return array
-+     */
-+    public function aroundValidateDataProvider(): array
-+    {
-+        return [
-+            [true, false, '0'],
-+            [true, false, 0],
-+            [true, false, null],
-+            [false, true, 1],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
-index 78041044909..ade8829b278 100644
---- a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
-@@ -393,4 +393,40 @@ class TierPriceTest extends \PHPUnit\Framework\TestCase
-             ['basePrice' => '20.80', 'tierPrice' => '18.72', 'savedPercent' => '10']
-         ];
-     }
-+
-+    /**
-+     * @param null|string|float $quantity
-+     * @param float $expectedValue
-+     * @dataProvider getQuantityDataProvider
-+     */
-+    public function testGetQuantity($quantity, $expectedValue)
-+    {
-+        $tierPrice = new TierPrice(
-+            $this->product,
-+            $quantity,
-+            $this->calculator,
-+            $this->priceCurrencyMock,
-+            $this->session,
-+            $this->groupManagement,
-+            $this->customerGroupRetriever
-+        );
-+
-+        $this->assertEquals($expectedValue, $tierPrice->getQuantity());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getQuantityDataProvider()
-+    {
-+        return [
-+            [null, 1],
-+            ['one', 1],
-+            ['', 1],
-+            [4, 4],
-+            [4.5, 4.5],
-+            ['0.7', 0.7],
-+            ['0.0000000', 1]
-+        ];
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php
-new file mode 100644
-index 00000000000..774edcfeb6b
---- /dev/null
-+++ b/app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php
-@@ -0,0 +1,156 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Test\Unit\Ui\Component;
-+
-+use PHPUnit\Framework\TestCase;
-+use Magento\Catalog\Ui\Component\ColumnFactory;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Catalog\Api\Data\ProductAttributeInterface;
-+use Magento\Framework\View\Element\UiComponent\ContextInterface;
-+use Magento\Framework\View\Element\UiComponentFactory;
-+use Magento\Ui\Component\Listing\Columns\ColumnInterface;
-+use Magento\Ui\Component\Filters\FilterModifier;
-+
-+/**
-+ * ColumnFactory test.
-+ */
-+class ColumnFactoryTest extends TestCase
-+{
-+    /**
-+     * @var ColumnFactory
-+     */
-+    private $columnFactory;
-+
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var ProductAttributeInterface|\PHPUnit\Framework\MockObject\MockObject
-+     */
-+    private $attribute;
-+
-+    /**
-+     * @var ContextInterface|\PHPUnit\Framework\MockObject\MockObject
-+     */
-+    private $context;
-+
-+    /**
-+     * @var UiComponentFactory|\PHPUnit\Framework\MockObject\MockObject
-+     */
-+    private $uiComponentFactory;
-+
-+    /**
-+     * @var ColumnInterface|\PHPUnit\Framework\MockObject\MockObject
-+     */
-+    private $column;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-+    {
-+        $this->objectManager = new ObjectManager($this);
-+
-+        $this->attribute = $this->getMockBuilder(ProductAttributeInterface::class)
-+            ->setMethods(['usesSource'])
-+            ->getMockForAbstractClass();
-+        $this->context = $this->createMock(ContextInterface::class);
-+        $this->uiComponentFactory = $this->createMock(UiComponentFactory::class);
-+        $this->column = $this->getMockForAbstractClass(ColumnInterface::class);
-+        $this->uiComponentFactory->method('create')
-+            ->willReturn($this->column);
-+
-+        $this->columnFactory = $this->objectManager->getObject(ColumnFactory::class, [
-+            'componentFactory' => $this->uiComponentFactory
-+        ]);
-+    }
-+
-+    /**
-+     * Tests the create method will return correct object.
-+     *
-+     * @return void
-+     */
-+    public function testCreatedObject(): void
-+    {
-+        $this->context->method('getRequestParam')
-+            ->with(FilterModifier::FILTER_MODIFIER, [])
-+            ->willReturn([]);
-+
-+        $object = $this->columnFactory->create($this->attribute, $this->context);
-+        $this->assertEquals(
-+            $this->column,
-+            $object,
-+            'Object must be the same which the ui component factory creates.'
-+        );
-+    }
-+
-+    /**
-+     * Tests create method with not filterable in grid attribute.
-+     *
-+     * @param array $filterModifiers
-+     * @param null|string $filter
-+     *
-+     * @return void
-+     * @dataProvider filterModifiersProvider
-+     */
-+    public function testCreateWithNotFilterableInGridAttribute(array $filterModifiers, ?string $filter): void
-+    {
-+        $componentFactoryArgument = [
-+            'data' => [
-+                'config' => [
-+                    'label' => __(null),
-+                    'dataType' => 'text',
-+                    'add_field' => true,
-+                    'visible' => null,
-+                    'filter' => $filter,
-+                    'component' => 'Magento_Ui/js/grid/columns/column',
-+                ],
-+            ],
-+            'context' => $this->context,
-+        ];
-+
-+        $this->context->method('getRequestParam')
-+            ->with(FilterModifier::FILTER_MODIFIER, [])
-+            ->willReturn($filterModifiers);
-+        $this->attribute->method('getIsFilterableInGrid')
-+            ->willReturn(false);
-+        $this->attribute->method('getAttributeCode')
-+            ->willReturn('color');
-+
-+        $this->uiComponentFactory->expects($this->once())
-+            ->method('create')
-+            ->with($this->anything(), $this->anything(), $componentFactoryArgument);
-+
-+        $this->columnFactory->create($this->attribute, $this->context);
-+    }
-+
-+    /**
-+     * Filter modifiers data provider.
-+     *
-+     * @return array
-+     */
-+    public function filterModifiersProvider(): array
-+    {
-+        return [
-+            'without' => [
-+                'filter_modifiers' => [],
-+                'filter' => null,
-+            ],
-+            'with' => [
-+                'filter_modifiers' => [
-+                    'color' => [
-+                        'condition_type' => 'notnull',
-+                    ],
-+                ],
-+                'filter' => 'text',
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedPricingTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedPricingTest.php
-index 1a23aaace6e..e9f9349100f 100644
---- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedPricingTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedPricingTest.php
-@@ -11,7 +11,7 @@ use Magento\Customer\Api\Data\GroupInterface as CustomerGroupInterface;
- use Magento\Customer\Api\GroupManagementInterface;
- use Magento\Customer\Api\GroupRepositoryInterface;
- use Magento\Framework\Api\SearchCriteriaBuilder;
--use Magento\Framework\Module\Manager as ModuleManager;
-+use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
- use Magento\Directory\Helper\Data as DirectoryHelper;
- use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
- use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-@@ -106,7 +106,9 @@ class AdvancedPricingTest extends AbstractModifierTest
-      */
-     protected function createModel()
-     {
--        return $this->objectManager->getObject(AdvancedPricing::class, [
-+        return $this->objectManager->getObject(
-+            AdvancedPricing::class,
-+            [
-             'locator' => $this->locatorMock,
-             'storeManager' => $this->storeManagerMock,
-             'groupRepository' => $this->groupRepositoryMock,
-@@ -114,7 +116,8 @@ class AdvancedPricingTest extends AbstractModifierTest
-             'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
-             'moduleManager' => $this->moduleManagerMock,
-             'directoryHelper' => $this->directoryHelperMock
--        ]);
-+            ]
-+        );
-     }
- 
-     public function testModifyMeta()
-diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php
-index cd6565f32ed..932b09f7df9 100644
---- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
- 
- use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Categories;
-@@ -12,6 +14,7 @@ use Magento\Framework\App\CacheInterface;
- use Magento\Framework\DB\Helper as DbHelper;
- use Magento\Framework\UrlInterface;
- use Magento\Store\Model\Store;
-+use Magento\Framework\AuthorizationInterface;
- 
- /**
-  * Class CategoriesTest
-@@ -45,6 +48,11 @@ class CategoriesTest extends AbstractModifierTest
-      */
-     protected $categoryCollectionMock;
- 
-+    /**
-+     * @var AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $authorizationMock;
-+
-     protected function setUp()
-     {
-         parent::setUp();
-@@ -63,6 +71,9 @@ class CategoriesTest extends AbstractModifierTest
-         $this->categoryCollectionMock = $this->getMockBuilder(CategoryCollection::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $this->authorizationMock = $this->getMockBuilder(AuthorizationInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
- 
-         $this->categoryCollectionFactoryMock->expects($this->any())
-             ->method('create')
-@@ -86,11 +97,15 @@ class CategoriesTest extends AbstractModifierTest
-      */
-     protected function createModel()
-     {
--        return $this->objectManager->getObject(Categories::class, [
--            'locator' => $this->locatorMock,
--            'categoryCollectionFactory' => $this->categoryCollectionFactoryMock,
--            'arrayManager' => $this->arrayManagerMock,
--        ]);
-+        return $this->objectManager->getObject(
-+            Categories::class,
-+            [
-+                'locator' => $this->locatorMock,
-+                'categoryCollectionFactory' => $this->categoryCollectionFactoryMock,
-+                'arrayManager' => $this->arrayManagerMock,
-+                'authorization' => $this->authorizationMock
-+            ]
-+        );
-     }
- 
-     public function testModifyData()
-@@ -130,7 +145,9 @@ class CategoriesTest extends AbstractModifierTest
-                 ],
-             ],
-         ];
--
-+        $this->authorizationMock->expects($this->exactly(2))
-+            ->method('isAllowed')
-+            ->willReturn(true);
-         $this->arrayManagerMock->expects($this->any())
-             ->method('findPath')
-             ->willReturn('path');
-@@ -154,38 +171,4 @@ class CategoriesTest extends AbstractModifierTest
-     {
-         return [[true], [false]];
-     }
--
--    public function testModifyMetaWithCaching()
--    {
--        $this->arrayManagerMock->expects($this->exactly(2))
--            ->method('findPath')
--            ->willReturn(true);
--        $cacheManager = $this->getMockBuilder(CacheInterface::class)
--            ->getMockForAbstractClass();
--        $cacheManager->expects($this->once())
--            ->method('load')
--            ->with(Categories::CATEGORY_TREE_ID . '_');
--        $cacheManager->expects($this->once())
--            ->method('save');
--        
--        $modifier = $this->createModel();
--        $cacheContextProperty = new \ReflectionProperty(
--            Categories::class,
--            'cacheManager'
--        );
--        $cacheContextProperty->setAccessible(true);
--        $cacheContextProperty->setValue($modifier, $cacheManager);
--
--        $groupCode = 'test_group_code';
--        $meta = [
--            $groupCode => [
--                'children' => [
--                    'category_ids' => [
--                        'sortOrder' => 10,
--                    ],
--                ],
--            ],
--        ];
--        $modifier->modifyMeta($meta);
--    }
- }
-diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
-index 22bb712d42f..8cb59b1a2cc 100755
---- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
-@@ -19,6 +19,7 @@ use Magento\Eav\Model\Entity\Attribute\Group;
- use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
- use Magento\Eav\Model\Entity\Type as EntityType;
- use Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection as AttributeCollection;
-+use Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory as AttributeCollectionFactory;
- use Magento\Ui\DataProvider\Mapper\FormElement as FormElementMapper;
- use Magento\Ui\DataProvider\Mapper\MetaProperties as MetaPropertiesMapper;
- use Magento\Framework\Api\SearchCriteriaBuilder;
-@@ -87,6 +88,11 @@ class EavTest extends AbstractModifierTest
-      */
-     private $entityTypeMock;
- 
-+    /**
-+     * @var AttributeCollectionFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $attributeCollectionFactoryMock;
-+
-     /**
-      * @var AttributeCollection|\PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -225,6 +231,10 @@ class EavTest extends AbstractModifierTest
-         $this->entityTypeMock = $this->getMockBuilder(EntityType::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $this->attributeCollectionFactoryMock = $this->getMockBuilder(AttributeCollectionFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-         $this->attributeCollectionMock = $this->getMockBuilder(AttributeCollection::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-@@ -360,7 +370,8 @@ class EavTest extends AbstractModifierTest
-             'attributeRepository' => $this->attributeRepositoryMock,
-             'arrayManager' => $this->arrayManagerMock,
-             'eavAttributeFactory' => $this->eavAttributeFactoryMock,
--            '_eventManager' => $this->eventManagerMock
-+            '_eventManager' => $this->eventManagerMock,
-+            'attributeCollectionFactory' => $this->attributeCollectionFactoryMock
-         ]);
-     }
- 
-@@ -374,84 +385,68 @@ class EavTest extends AbstractModifierTest
-             ]
-         ];
- 
--        $this->locatorMock->expects($this->any())
--            ->method('getProduct')
-+        $this->attributeCollectionFactoryMock->expects($this->once())->method('create')
-+            ->willReturn($this->attributeCollectionMock);
-+
-+        $this->attributeCollectionMock->expects($this->any())->method('getItems')
-+            ->willReturn([
-+                $this->eavAttributeMock
-+            ]);
-+
-+        $this->locatorMock->expects($this->any())->method('getProduct')
-             ->willReturn($this->productMock);
- 
--        $this->productMock->expects($this->any())
--            ->method('getId')
-+        $this->productMock->expects($this->any())->method('getId')
-             ->willReturn(1);
--        $this->productMock->expects($this->once())
--            ->method('getAttributeSetId')
-+        $this->productMock->expects($this->once())->method('getAttributeSetId')
-             ->willReturn(4);
--        $this->productMock->expects($this->once())
--            ->method('getData')
-+        $this->productMock->expects($this->once())->method('getData')
-             ->with(ProductAttributeInterface::CODE_PRICE)->willReturn('19.9900');
- 
--        $this->searchCriteriaBuilderMock->expects($this->any())
--            ->method('addFilter')
-+        $this->searchCriteriaBuilderMock->expects($this->any())->method('addFilter')
-             ->willReturnSelf();
--        $this->searchCriteriaBuilderMock->expects($this->any())
--            ->method('create')
-+        $this->searchCriteriaBuilderMock->expects($this->any())->method('create')
-             ->willReturn($this->searchCriteriaMock);
--        $this->attributeGroupRepositoryMock->expects($this->any())
--            ->method('getList')
-+        $this->attributeGroupRepositoryMock->expects($this->any())->method('getList')
-             ->willReturn($this->searchCriteriaMock);
--        $this->searchCriteriaMock->expects($this->once())
--            ->method('getItems')
-+        $this->searchCriteriaMock->expects($this->once())->method('getItems')
-             ->willReturn([$this->attributeGroupMock]);
--        $this->sortOrderBuilderMock->expects($this->once())
--            ->method('setField')
-+        $this->sortOrderBuilderMock->expects($this->once())->method('setField')
-             ->willReturnSelf();
--        $this->sortOrderBuilderMock->expects($this->once())
--            ->method('setAscendingDirection')
-+        $this->sortOrderBuilderMock->expects($this->once())->method('setAscendingDirection')
-             ->willReturnSelf();
-         $dataObjectMock = $this->createMock(\Magento\Framework\Api\AbstractSimpleObject::class);
--        $this->sortOrderBuilderMock->expects($this->once())
--            ->method('create')
-+        $this->sortOrderBuilderMock->expects($this->once())->method('create')
-             ->willReturn($dataObjectMock);
- 
--        $this->searchCriteriaBuilderMock->expects($this->any())
--            ->method('addFilter')
-+        $this->searchCriteriaBuilderMock->expects($this->any())->method('addFilter')
-             ->willReturnSelf();
--        $this->searchCriteriaBuilderMock->expects($this->once())
--            ->method('addSortOrder')
-+        $this->searchCriteriaBuilderMock->expects($this->once())->method('addSortOrder')
-             ->willReturnSelf();
--        $this->searchCriteriaBuilderMock->expects($this->any())
--            ->method('create')
-+        $this->searchCriteriaBuilderMock->expects($this->any())->method('create')
-             ->willReturn($this->searchCriteriaMock);
- 
--        $this->attributeRepositoryMock->expects($this->once())
--            ->method('getList')
-+        $this->attributeRepositoryMock->expects($this->once())->method('getList')
-             ->with($this->searchCriteriaMock)
-             ->willReturn($this->searchResultsMock);
--        $this->eavAttributeMock->expects($this->any())
--            ->method('getAttributeGroupCode')
-+        $this->eavAttributeMock->expects($this->any())->method('getAttributeGroupCode')
-             ->willReturn('product-details');
--        $this->eavAttributeMock->expects($this->once())
--            ->method('getApplyTo')
-+        $this->eavAttributeMock->expects($this->once())->method('getApplyTo')
-             ->willReturn([]);
--        $this->eavAttributeMock->expects($this->once())
--            ->method('getFrontendInput')
-+        $this->eavAttributeMock->expects($this->once())->method('getFrontendInput')
-             ->willReturn('price');
--        $this->eavAttributeMock->expects($this->any())
--            ->method('getAttributeCode')
-+        $this->eavAttributeMock->expects($this->any())->method('getAttributeCode')
-             ->willReturn(ProductAttributeInterface::CODE_PRICE);
--        $this->searchResultsMock->expects($this->once())
--            ->method('getItems')
-+        $this->searchResultsMock->expects($this->once())->method('getItems')
-             ->willReturn([$this->eavAttributeMock]);
- 
--        $this->storeMock->expects(($this->once()))
--            ->method('getBaseCurrencyCode')
-+        $this->storeMock->expects(($this->once()))->method('getBaseCurrencyCode')
-             ->willReturn('en_US');
--        $this->storeManagerMock->expects($this->once())
--            ->method('getStore')
-+        $this->storeManagerMock->expects($this->once())->method('getStore')
-             ->willReturn($this->storeMock);
--        $this->currencyMock->expects($this->once())
--            ->method('toCurrency')
-+        $this->currencyMock->expects($this->once())->method('toCurrency')
-             ->willReturn('19.99');
--        $this->currencyLocaleMock->expects($this->once())
--            ->method('getCurrency')
-+        $this->currencyLocaleMock->expects($this->once())->method('getCurrency')
-             ->willReturn($this->currencyMock);
- 
-         $this->assertEquals($sourceData, $this->eav->modifyData([]));
-diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
-index c3096770729..829dc482441 100644
---- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
-@@ -74,6 +74,9 @@ class WebsitesTest extends AbstractModifierTest
-      */
-     protected $storeViewMock;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         parent::setUp();
-@@ -90,14 +93,11 @@ class WebsitesTest extends AbstractModifierTest
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->websiteRepositoryMock = $this->getMockBuilder(\Magento\Store\Api\WebsiteRepositoryInterface::class)
--            ->setMethods(['getList', 'getDefault'])
-+            ->setMethods(['getList'])
-             ->getMockForAbstractClass();
-         $this->websiteRepositoryMock->expects($this->any())
-             ->method('getDefault')
-             ->willReturn($this->websiteMock);
--        $this->websiteRepositoryMock->expects($this->any())
--            ->method('getList')
--            ->willReturn([$this->websiteMock, $this->secondWebsiteMock]);
-         $this->groupRepositoryMock = $this->getMockBuilder(\Magento\Store\Api\GroupRepositoryInterface::class)
-             ->setMethods(['getList'])
-             ->getMockForAbstractClass();
-@@ -111,8 +111,10 @@ class WebsitesTest extends AbstractModifierTest
-             ->method('getWebsiteIds')
-             ->willReturn($this->assignedWebsites);
-         $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
--            ->setMethods(['isSingleStoreMode'])
-+            ->setMethods(['isSingleStoreMode', 'getWesites'])
-             ->getMockForAbstractClass();
-+        $this->storeManagerMock->method('getWebsites')
-+            ->willReturn([$this->websiteMock, $this->secondWebsiteMock]);
-         $this->storeManagerMock->expects($this->any())
-             ->method('isSingleStoreMode')
-             ->willReturn(false);
-diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php
-index 12bc9acfa4c..009cd690d4c 100644
---- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php
-@@ -15,6 +15,7 @@ use Magento\Store\Model\StoreManagerInterface;
- use Magento\Catalog\Helper\ImageFactory;
- use Magento\Catalog\Api\Data\ProductRender\ImageInterface;
- use Magento\Catalog\Helper\Image as ImageHelper;
-+use Magento\Framework\View\DesignLoader;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -33,6 +34,9 @@ class ImageTest extends \PHPUnit\Framework\TestCase
-     /** @var  DesignInterface | \PHPUnit_Framework_MockObject_MockObject */
-     private $design;
- 
-+    /** @var DesignLoader | \PHPUnit_Framework_MockObject_MockObject*/
-+    private $designLoader;
-+
-     /** @var  Image */
-     private $model;
- 
-@@ -60,13 +64,15 @@ class ImageTest extends \PHPUnit\Framework\TestCase
-             ->getMock();
-         $this->storeManager = $this->createMock(StoreManagerInterface::class);
-         $this->design = $this->createMock(DesignInterface::class);
-+        $this->designLoader = $this->createMock(DesignLoader::class);
-         $this->model = new Image(
-             $this->imageFactory,
-             $this->state,
-             $this->storeManager,
-             $this->design,
-             $this->imageInterfaceFactory,
--            $this->imageCodes
-+            $this->imageCodes,
-+            $this->designLoader
-         );
-     }
- 
-diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
-index 6d7c8814bd4..0e0cb676cdf 100644
---- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
-@@ -54,7 +54,16 @@ class ProductCustomOptionsDataProviderTest extends \PHPUnit\Framework\TestCase
-             ->getMockForAbstractClass();
-         $this->collectionMock = $this->getMockBuilder(AbstractCollection::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['load', 'getSelect', 'getTable', 'getIterator', 'isLoaded', 'toArray', 'getSize'])
-+            ->setMethods([
-+                'load',
-+                'getSelect',
-+                'getTable',
-+                'getIterator',
-+                'isLoaded',
-+                'toArray',
-+                'getSize',
-+                'setStoreId'
-+            ])
-             ->getMockForAbstractClass();
-         $this->dbSelectMock = $this->getMockBuilder(DbSelect::class)
-             ->disableOriginalConstructor()
-diff --git a/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php b/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php
-index dbf1292e573..a4ccaffc8fb 100644
---- a/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php
-+++ b/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php
-@@ -152,21 +152,21 @@ class BreadcrumbsTest extends \PHPUnit\Framework\TestCase
-         return [
-             [
-                 $this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test ™']]),
--                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","userCategoryPathInUrl":0,"product":"Test \u2122"}}',
-+                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","useCategoryPathInUrl":0,"product":"Test \u2122"}}',
-             ],
-             [
-                 $this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test "']]),
--                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","userCategoryPathInUrl":0,"product":"Test &quot;"}}',
-+                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","useCategoryPathInUrl":0,"product":"Test &quot;"}}',
-             ],
-             [
-                 $this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test <b>x</b>']]),
--                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","userCategoryPathInUrl":0,"product":'
-+                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","useCategoryPathInUrl":0,"product":'
-                 . '"Test &lt;b&gt;x&lt;\/b&gt;"}}',
-             ],
-             [
-                 $this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test \'abc\'']]),
-                 '{"breadcrumbs":'
--                . '{"categoryUrlSuffix":".&quot;html","userCategoryPathInUrl":0,"product":"Test &#039;abc&#039;"}}'
-+                . '{"categoryUrlSuffix":".&quot;html","useCategoryPathInUrl":0,"product":"Test &#039;abc&#039;"}}'
-             ],
-         ];
-     }
-diff --git a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
-index cbc67fee8a5..ea6b1fd47a0 100644
---- a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
-+++ b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
-@@ -5,7 +5,11 @@
-  */
- namespace Magento\Catalog\Ui\Component;
- 
-+use Magento\Ui\Component\Filters\FilterModifier;
-+
- /**
-+ * Column Factory
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -47,20 +51,26 @@ class ColumnFactory
-     }
- 
-     /**
-+     * Create Factory
-+     *
-      * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
-      * @param \Magento\Framework\View\Element\UiComponent\ContextInterface $context
-      * @param array $config
-+     *
-      * @return \Magento\Ui\Component\Listing\Columns\ColumnInterface
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function create($attribute, $context, array $config = [])
-     {
-+        $filterModifiers = $context->getRequestParam(FilterModifier::FILTER_MODIFIER, []);
-+
-         $columnName = $attribute->getAttributeCode();
-         $config = array_merge([
-             'label' => __($attribute->getDefaultFrontendLabel()),
-             'dataType' => $this->getDataType($attribute),
-             'add_field' => true,
-             'visible' => $attribute->getIsVisibleInGrid(),
--            'filter' => ($attribute->getIsFilterableInGrid())
-+            'filter' => ($attribute->getIsFilterableInGrid() || array_key_exists($columnName, $filterModifiers))
-                 ? $this->getFilterType($attribute->getFrontendInput())
-                 : null,
-         ], $config);
-@@ -82,7 +92,10 @@ class ColumnFactory
-     }
- 
-     /**
-+     * Get Js Component
-+     *
-      * @param string $dataType
-+     *
-      * @return string
-      */
-     protected function getJsComponent($dataType)
-@@ -91,14 +104,15 @@ class ColumnFactory
-     }
- 
-     /**
-+     * Get Data Type
-+     *
-      * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
-+     *
-      * @return string
-      */
-     protected function getDataType($attribute)
-     {
--        return isset($this->dataTypeMap[$attribute->getFrontendInput()])
--            ? $this->dataTypeMap[$attribute->getFrontendInput()]
--            : $this->dataTypeMap['default'];
-+        return $this->dataTypeMap[$attribute->getFrontendInput()] ?? $this->dataTypeMap['default'];
-     }
- 
-     /**
-@@ -111,6 +125,6 @@ class ColumnFactory
-     {
-         $filtersMap = ['date' => 'dateRange'];
-         $result = array_replace_recursive($this->dataTypeMap, $filtersMap);
--        return isset($result[$frontendInput]) ? $result[$frontendInput] : $result['default'];
-+        return $result[$frontendInput] ?? $result['default'];
-     }
- }
-diff --git a/app/code/Magento/Catalog/Ui/Component/FilterFactory.php b/app/code/Magento/Catalog/Ui/Component/FilterFactory.php
-index fcc500c8916..dd8eaffb0a6 100644
---- a/app/code/Magento/Catalog/Ui/Component/FilterFactory.php
-+++ b/app/code/Magento/Catalog/Ui/Component/FilterFactory.php
-@@ -71,8 +71,6 @@ class FilterFactory
-      */
-     protected function getFilterType($attribute)
-     {
--        return isset($this->filterMap[$attribute->getFrontendInput()])
--            ? $this->filterMap[$attribute->getFrontendInput()]
--            : $this->filterMap['default'];
-+        return $this->filterMap[$attribute->getFrontendInput()] ?? $this->filterMap['default'];
-     }
- }
-diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
-index c96498b054d..8ea6d8b9e5a 100644
---- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
-+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
-@@ -80,6 +80,6 @@ class Columns extends \Magento\Ui\Component\Listing\Columns
-      */
-     protected function getFilterType($frontendInput)
-     {
--        return isset($this->filterMap[$frontendInput]) ? $this->filterMap[$frontendInput] : $this->filterMap['default'];
-+        return $this->filterMap[$frontendInput] ?? $this->filterMap['default'];
-     }
- }
-diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
-index d4dc9ddd7ca..09c9782fc0e 100644
---- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
-+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
-@@ -9,6 +9,8 @@ use Magento\Framework\View\Element\UiComponentFactory;
- use Magento\Framework\View\Element\UiComponent\ContextInterface;
- 
- /**
-+ * Class Thumbnail
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -67,6 +69,8 @@ class Thumbnail extends \Magento\Ui\Component\Listing\Columns\Column
-     }
- 
-     /**
-+     * Get Alt
-+     *
-      * @param array $row
-      *
-      * @return null|string
-@@ -74,6 +78,6 @@ class Thumbnail extends \Magento\Ui\Component\Listing\Columns\Column
-     protected function getAlt($row)
-     {
-         $altField = $this->getData('config/altField') ?: self::ALT_FIELD;
--        return isset($row[$altField]) ? $row[$altField] : null;
-+        return $row[$altField] ?? null;
-     }
- }
-diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
-index 5af0d71dc24..494b77724e5 100644
---- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
-+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
-@@ -3,13 +3,19 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Ui\Component\Listing\Columns;
- 
--use Magento\Framework\View\Element\UiComponentFactory;
-+use Magento\Framework\DB\Helper;
- use Magento\Framework\View\Element\UiComponent\ContextInterface;
-+use Magento\Framework\View\Element\UiComponentFactory;
- use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-+ * Websites listing column component.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -20,6 +26,11 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
-      */
-     const NAME = 'websites';
- 
-+    /**
-+     * Data for concatenated website names value.
-+     */
-+    private $websiteNames = 'website_names';
-+
-     /**
-      * Store manager
-      *
-@@ -27,26 +38,36 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
-      */
-     protected $storeManager;
- 
-+    /**
-+     * @var \Magento\Framework\DB\Helper
-+     */
-+    private $resourceHelper;
-+
-     /**
-      * @param ContextInterface $context
-      * @param UiComponentFactory $uiComponentFactory
-      * @param StoreManagerInterface $storeManager
-      * @param array $components
-      * @param array $data
-+     * @param Helper $resourceHelper
-      */
-     public function __construct(
-         ContextInterface $context,
-         UiComponentFactory $uiComponentFactory,
-         StoreManagerInterface $storeManager,
-         array $components = [],
--        array $data = []
-+        array $data = [],
-+        Helper $resourceHelper = null
-     ) {
-         parent::__construct($context, $uiComponentFactory, $components, $data);
-+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         $this->storeManager = $storeManager;
-+        $this->resourceHelper = $resourceHelper ?: $objectManager->get(Helper::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @deprecated 101.0.0
-      */
-     public function prepareDataSource(array $dataSource)
-@@ -71,9 +92,10 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
- 
-         return $dataSource;
-     }
--    
-+
-     /**
--     * Prepare component configuration
-+     * Prepare component configuration.
-+     *
-      * @return void
-      */
-     public function prepare()
-@@ -83,4 +105,46 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
-             $this->_data['config']['componentDisabled'] = true;
-         }
-     }
-+
-+    /**
-+     * Apply sorting.
-+     *
-+     * @return void
-+     */
-+    protected function applySorting()
-+    {
-+        $sorting = $this->getContext()->getRequestParam('sorting');
-+        $isSortable = $this->getData('config/sortable');
-+        if ($isSortable !== false
-+            && !empty($sorting['field'])
-+            && !empty($sorting['direction'])
-+            && $sorting['field'] === $this->getName()
-+        ) {
-+            $collection = $this->getContext()->getDataProvider()->getCollection();
-+            $collection
-+                 ->joinField(
-+                     'websites_ids',
-+                     'catalog_product_website',
-+                     'website_id',
-+                     'product_id=entity_id',
-+                     null,
-+                     'left'
-+                 )
-+                 ->joinTable(
-+                     'store_website',
-+                     'website_id = websites_ids',
-+                     ['name'],
-+                     null,
-+                     'left'
-+                 )
-+                 ->groupByAttribute('entity_id');
-+            $this->resourceHelper->addGroupConcatColumn(
-+                $collection->getSelect(),
-+                $this->websiteNames,
-+                'name'
-+            );
-+
-+            $collection->getSelect()->order($this->websiteNames . ' ' . $sorting['direction']);
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
-index 336aeffa105..9ad75b5fda9 100644
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
-@@ -14,7 +14,7 @@ use Magento\Store\Model\StoreManagerInterface;
- use Magento\Customer\Api\GroupManagementInterface;
- use Magento\Customer\Api\GroupRepositoryInterface;
- use Magento\Framework\Api\SearchCriteriaBuilder;
--use Magento\Framework\Module\Manager as ModuleManager;
-+use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
- use Magento\Ui\Component\Container;
- use Magento\Ui\Component\Form\Element\DataType\Number;
- use Magento\Ui\Component\Form\Element\DataType\Price;
-@@ -139,7 +139,8 @@ class AdvancedPricing extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @since 101.0.0
-      */
-     public function modifyMeta(array $meta)
-@@ -158,7 +159,8 @@ class AdvancedPricing extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @since 101.0.0
-      */
-     public function modifyData(array $data)
-@@ -381,11 +383,15 @@ class AdvancedPricing extends AbstractModifier
-             );
- 
-             $advancedPricingButton['arguments']['data']['config'] = [
-+                'dataScope' => 'advanced_pricing_button',
-                 'displayAsLink' => true,
-                 'formElement' => Container::NAME,
-                 'componentType' => Container::NAME,
-                 'component' => 'Magento_Ui/js/form/components/button',
-                 'template' => 'ui/form/components/button/container',
-+                'imports' => [
-+                    'childError' => $this->scopeName . '.advanced_pricing_modal.advanced-pricing:error',
-+                ],
-                 'actions' => [
-                     [
-                         'targetName' => $this->scopeName . '.advanced_pricing_modal',
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
-index 683a96133ad..a6b9856a4a0 100644
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
-@@ -67,7 +67,8 @@ class Attributes extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @since 101.0.0
-      */
-     public function modifyData(array $data)
-@@ -76,6 +77,8 @@ class Attributes extends AbstractModifier
-     }
- 
-     /**
-+     * Check if can add attributes on product form.
-+     *
-      * @return boolean
-      */
-     private function canAddAttributes()
-@@ -89,7 +92,8 @@ class Attributes extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @since 101.0.0
-      */
-     public function modifyMeta(array $meta)
-@@ -111,6 +115,8 @@ class Attributes extends AbstractModifier
-     }
- 
-     /**
-+     * Modify meta customize attribute modal.
-+     *
-      * @param array $meta
-      * @return array
-      */
-@@ -207,6 +213,8 @@ class Attributes extends AbstractModifier
-     }
- 
-     /**
-+     * Modify meta to customize create attribute modal.
-+     *
-      * @param array $meta
-      * @return array
-      */
-@@ -289,6 +297,8 @@ class Attributes extends AbstractModifier
-     }
- 
-     /**
-+     * Modify meta to customize attribute grid.
-+     *
-      * @param array $meta
-      * @return array
-      */
-@@ -309,7 +319,7 @@ class Attributes extends AbstractModifier
-                         'immediateUpdateBySelection' => true,
-                         'behaviourType' => 'edit',
-                         'externalFilterMode' => true,
--                        'dataLinks' => ['imports' => false, 'exports' => true],
-+                        'dataLinks' => ['imports' => false, 'exports' => false],
-                         'formProvider' => 'ns = ${ $.namespace }, index = product_form',
-                         'groupCode' => static::GROUP_CODE,
-                         'groupName' => static::GROUP_NAME,
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
-index ed737df708a..0b8f551988a 100644
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
- 
- use Magento\Catalog\Model\Locator\LocatorInterface;
-@@ -11,9 +13,11 @@ use Magento\Framework\App\ObjectManager;
- use Magento\Framework\App\CacheInterface;
- use Magento\Framework\DB\Helper as DbHelper;
- use Magento\Catalog\Model\Category as CategoryModel;
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Serialize\SerializerInterface;
- use Magento\Framework\UrlInterface;
- use Magento\Framework\Stdlib\ArrayManager;
-+use Magento\Framework\AuthorizationInterface;
- 
- /**
-  * Data provider for categories field of product page
-@@ -78,6 +82,11 @@ class Categories extends AbstractModifier
-      */
-     private $serializer;
- 
-+    /**
-+     * @var AuthorizationInterface
-+     */
-+    private $authorization;
-+
-     /**
-      * @param LocatorInterface $locator
-      * @param CategoryCollectionFactory $categoryCollectionFactory
-@@ -85,6 +94,7 @@ class Categories extends AbstractModifier
-      * @param UrlInterface $urlBuilder
-      * @param ArrayManager $arrayManager
-      * @param SerializerInterface $serializer
-+     * @param AuthorizationInterface $authorization
-      */
-     public function __construct(
-         LocatorInterface $locator,
-@@ -92,7 +102,8 @@ class Categories extends AbstractModifier
-         DbHelper $dbHelper,
-         UrlInterface $urlBuilder,
-         ArrayManager $arrayManager,
--        SerializerInterface $serializer = null
-+        SerializerInterface $serializer = null,
-+        AuthorizationInterface $authorization = null
-     ) {
-         $this->locator = $locator;
-         $this->categoryCollectionFactory = $categoryCollectionFactory;
-@@ -100,6 +111,7 @@ class Categories extends AbstractModifier
-         $this->urlBuilder = $urlBuilder;
-         $this->arrayManager = $arrayManager;
-         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
-+        $this->authorization = $authorization ?: ObjectManager::getInstance()->get(AuthorizationInterface::class);
-     }
- 
-     /**
-@@ -118,19 +130,31 @@ class Categories extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 101.0.0
-      */
-     public function modifyMeta(array $meta)
-     {
--        $meta = $this->createNewCategoryModal($meta);
-+        if ($this->isAllowed()) {
-+            $meta = $this->createNewCategoryModal($meta);
-+        }
-         $meta = $this->customizeCategoriesField($meta);
- 
-         return $meta;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Check current user permission on category resource
-+     *
-+     * @return bool
-+     */
-+    private function isAllowed()
-+    {
-+        return $this->authorization->isAllowed('Magento_Catalog::categories');
-+    }
-+
-+    /**
-+     * @inheritdoc
-      * @since 101.0.0
-      */
-     public function modifyData(array $data)
-@@ -202,6 +226,7 @@ class Categories extends AbstractModifier
-      *
-      * @param array $meta
-      * @return array
-+     * @throws LocalizedException
-      * @since 101.0.0
-      */
-     protected function customizeCategoriesField(array $meta)
-@@ -214,87 +239,91 @@ class Categories extends AbstractModifier
-             return $meta;
-         }
- 
--        $meta = $this->arrayManager->merge(
--            $containerPath,
--            $meta,
--            [
--                'arguments' => [
--                    'data' => [
--                        'config' => [
--                            'label' => __('Categories'),
--                            'dataScope' => '',
--                            'breakLine' => false,
--                            'formElement' => 'container',
--                            'componentType' => 'container',
--                            'component' => 'Magento_Ui/js/form/components/group',
--                            'scopeLabel' => __('[GLOBAL]'),
--                            'disabled' => $this->locator->getProduct()->isLockedAttribute($fieldCode),
--                        ],
-+        $value = [
-+            'arguments' => [
-+                'data' => [
-+                    'config' => [
-+                        'label' => __('Categories'),
-+                        'dataScope' => '',
-+                        'breakLine' => false,
-+                        'formElement' => 'container',
-+                        'componentType' => 'container',
-+                        'component' => 'Magento_Ui/js/form/components/group',
-+                        'scopeLabel' => __('[GLOBAL]'),
-+                        'disabled' => $this->locator->getProduct()->isLockedAttribute($fieldCode),
-                     ],
-                 ],
--                'children' => [
--                    $fieldCode => [
--                        'arguments' => [
--                            'data' => [
-+            ],
-+            'children' => [
-+                $fieldCode => [
-+                    'arguments' => [
-+                        'data' => [
-+                            'config' => [
-+                                'formElement' => 'select',
-+                                'componentType' => 'field',
-+                                'component' => 'Magento_Catalog/js/components/new-category',
-+                                'filterOptions' => true,
-+                                'chipsEnabled' => true,
-+                                'disableLabel' => true,
-+                                'levelsVisibility' => '1',
-+                                'elementTmpl' => 'ui/grid/filters/elements/ui-select',
-+                                'options' => $this->getCategoriesTree(),
-+                                'listens' => [
-+                                    'index=create_category:responseData' => 'setParsed',
-+                                    'newOption' => 'toggleOptionSelected'
-+                                ],
-                                 'config' => [
--                                    'formElement' => 'select',
--                                    'componentType' => 'field',
--                                    'component' => 'Magento_Catalog/js/components/new-category',
--                                    'filterOptions' => true,
--                                    'chipsEnabled' => true,
--                                    'disableLabel' => true,
--                                    'levelsVisibility' => '1',
--                                    'elementTmpl' => 'ui/grid/filters/elements/ui-select',
--                                    'options' => $this->getCategoriesTree(),
--                                    'listens' => [
--                                        'index=create_category:responseData' => 'setParsed',
--                                        'newOption' => 'toggleOptionSelected'
--                                    ],
--                                    'config' => [
--                                        'dataScope' => $fieldCode,
--                                        'sortOrder' => 10,
--                                    ],
-+                                    'dataScope' => $fieldCode,
-+                                    'sortOrder' => 10,
-                                 ],
-                             ],
-                         ],
-                     ],
--                    'create_category_button' => [
--                        'arguments' => [
--                            'data' => [
--                                'config' => [
--                                    'title' => __('New Category'),
--                                    'formElement' => 'container',
--                                    'additionalClasses' => 'admin__field-small',
--                                    'componentType' => 'container',
--                                    'component' => 'Magento_Ui/js/form/components/button',
--                                    'template' => 'ui/form/components/button/container',
--                                    'actions' => [
--                                        [
--                                            'targetName' => 'product_form.product_form.create_category_modal',
--                                            'actionName' => 'toggleModal',
--                                        ],
--                                        [
--                                            'targetName' =>
--                                                'product_form.product_form.create_category_modal.create_category',
--                                            'actionName' => 'render'
--                                        ],
--                                        [
--                                            'targetName' =>
--                                                'product_form.product_form.create_category_modal.create_category',
--                                            'actionName' => 'resetForm'
--                                        ]
--                                    ],
--                                    'additionalForGroup' => true,
--                                    'provider' => false,
--                                    'source' => 'product_details',
--                                    'displayArea' => 'insideGroup',
--                                    'sortOrder' => 20,
-+                ],
-+            ]
-+        ];
-+        if ($this->isAllowed()) {
-+            $value['children']['create_category_button'] = [
-+                'arguments' => [
-+                    'data' => [
-+                        'config' => [
-+                            'title' => __('New Category'),
-+                            'formElement' => 'container',
-+                            'additionalClasses' => 'admin__field-small',
-+                            'componentType' => 'container',
-+                            'component' => 'Magento_Ui/js/form/components/button',
-+                            'template' => 'ui/form/components/button/container',
-+                            'actions' => [
-+                                [
-+                                    'targetName' => 'product_form.product_form.create_category_modal',
-+                                    'actionName' => 'toggleModal',
-                                 ],
-+                                [
-+                                    'targetName' =>
-+                                        'product_form.product_form.create_category_modal.create_category',
-+                                    'actionName' => 'render'
-+                                ],
-+                                [
-+                                    'targetName' =>
-+                                        'product_form.product_form.create_category_modal.create_category',
-+                                    'actionName' => 'resetForm'
-+                                ]
-                             ],
--                        ]
--                    ]
-+                            'additionalForGroup' => true,
-+                            'provider' => false,
-+                            'source' => 'product_details',
-+                            'displayArea' => 'insideGroup',
-+                            'sortOrder' => 20,
-+                            'dataScope'  => $fieldCode,
-+                        ],
-+                    ],
-                 ]
--            ]
-+            ];
-+        }
-+        $meta = $this->arrayManager->merge(
-+            $containerPath,
-+            $meta,
-+            $value
-         );
- 
-         return $meta;
-@@ -305,20 +334,64 @@ class Categories extends AbstractModifier
-      *
-      * @param string|null $filter
-      * @return array
-+     * @throws LocalizedException
-      * @since 101.0.0
-      */
-     protected function getCategoriesTree($filter = null)
-     {
--        $categoryTree = $this->getCacheManager()->load(self::CATEGORY_TREE_ID . '_' . $filter);
--        if ($categoryTree) {
--            return $this->serializer->unserialize($categoryTree);
-+        $storeId = (int) $this->locator->getStore()->getId();
-+
-+        $cachedCategoriesTree = $this->getCacheManager()
-+            ->load($this->getCategoriesTreeCacheId($storeId, (string) $filter));
-+        if (!empty($cachedCategoriesTree)) {
-+            return $this->serializer->unserialize($cachedCategoriesTree);
-         }
- 
--        $storeId = $this->locator->getStore()->getId();
-+        $categoriesTree = $this->retrieveCategoriesTree(
-+            $storeId,
-+            $this->retrieveShownCategoriesIds($storeId, (string) $filter)
-+        );
-+
-+        $this->getCacheManager()->save(
-+            $this->serializer->serialize($categoriesTree),
-+            $this->getCategoriesTreeCacheId($storeId, (string) $filter),
-+            [
-+                \Magento\Catalog\Model\Category::CACHE_TAG,
-+                \Magento\Framework\App\Cache\Type\Block::CACHE_TAG
-+            ]
-+        );
-+
-+        return $categoriesTree;
-+    }
-+
-+    /**
-+     * Get cache id for categories tree.
-+     *
-+     * @param int $storeId
-+     * @param string $filter
-+     * @return string
-+     */
-+    private function getCategoriesTreeCacheId(int $storeId, string $filter = '') : string
-+    {
-+        return self::CATEGORY_TREE_ID
-+            . '_' . (string) $storeId
-+            . '_' . $filter;
-+    }
-+
-+    /**
-+     * Retrieve filtered list of categories id.
-+     *
-+     * @param int $storeId
-+     * @param string $filter
-+     * @return array
-+     * @throws LocalizedException
-+     */
-+    private function retrieveShownCategoriesIds(int $storeId, string $filter = '') : array
-+    {
-         /* @var $matchingNamesCollection \Magento\Catalog\Model\ResourceModel\Category\Collection */
-         $matchingNamesCollection = $this->categoryCollectionFactory->create();
- 
--        if ($filter !== null) {
-+        if (!empty($filter)) {
-             $matchingNamesCollection->addAttributeToFilter(
-                 'name',
-                 ['like' => $this->dbHelper->addLikeEscape($filter, ['position' => 'any'])]
-@@ -338,6 +411,19 @@ class Categories extends AbstractModifier
-             }
-         }
- 
-+        return $shownCategoriesIds;
-+    }
-+
-+    /**
-+     * Retrieve tree of categories with attributes.
-+     *
-+     * @param int $storeId
-+     * @param array $shownCategoriesIds
-+     * @return array|null
-+     * @throws LocalizedException
-+     */
-+    private function retrieveCategoriesTree(int $storeId, array $shownCategoriesIds) : ?array
-+    {
-         /* @var $collection \Magento\Catalog\Model\ResourceModel\Category\Collection */
-         $collection = $this->categoryCollectionFactory->create();
- 
-@@ -364,15 +450,6 @@ class Categories extends AbstractModifier
-             $categoryById[$category->getParentId()]['optgroup'][] = &$categoryById[$category->getId()];
-         }
- 
--        $this->getCacheManager()->save(
--            $this->serializer->serialize($categoryById[CategoryModel::TREE_ROOT_ID]['optgroup']),
--            self::CATEGORY_TREE_ID . '_' . $filter,
--            [
--                \Magento\Catalog\Model\Category::CACHE_TAG,
--                \Magento\Framework\App\Cache\Type\Block::CACHE_TAG
--            ]
--        );
--
-         return $categoryById[CategoryModel::TREE_ROOT_ID]['optgroup'];
-     }
- }
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
-index 86f1db2022c..af43c84501f 100755
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
-@@ -11,6 +11,7 @@ use Magento\Catalog\Model\ProductOptions\ConfigInterface;
- use Magento\Catalog\Model\Config\Source\Product\Options\Price as ProductOptionsPrice;
- use Magento\Framework\UrlInterface;
- use Magento\Framework\Stdlib\ArrayManager;
-+use Magento\Ui\Component\Form\Element\Hidden;
- use Magento\Ui\Component\Modal;
- use Magento\Ui\Component\Container;
- use Magento\Ui\Component\DynamicRows;
-@@ -867,7 +868,7 @@ class CustomOptions extends AbstractModifier
-                 'data' => [
-                     'config' => [
-                         'componentType' => Field::NAME,
--                        'formElement' => Input::NAME,
-+                        'formElement' => Hidden::NAME,
-                         'dataScope' => static::FIELD_SORT_ORDER_NAME,
-                         'dataType' => Number::NAME,
-                         'visible' => false,
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
-old mode 100755
-new mode 100644
-index 7cd81419c03..8326c3b5318
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
-@@ -11,6 +11,7 @@ use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
- use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
- use Magento\Catalog\Model\Locator\LocatorInterface;
- use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Type as ProductType;
- use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
- use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory as EavAttributeFactory;
- use Magento\Catalog\Ui\DataProvider\CatalogEavValidationRules;
-@@ -33,6 +34,7 @@ use Magento\Ui\DataProvider\Mapper\FormElement as FormElementMapper;
- use Magento\Ui\DataProvider\Mapper\MetaProperties as MetaPropertiesMapper;
- use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\CompositeConfigProcessor;
- use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory as AttributeCollectionFactory;
- 
- /**
-  * Class Eav
-@@ -190,6 +192,17 @@ class Eav extends AbstractModifier
-      */
-     private $localeCurrency;
- 
-+    /**
-+     * internal cache for attribute models
-+     * @var array
-+     */
-+    private $attributesCache = [];
-+
-+    /**
-+     * @var AttributeCollectionFactory
-+     */
-+    private $attributeCollectionFactory;
-+
-     /**
-      * @var CompositeConfigProcessor
-      */
-@@ -223,6 +236,7 @@ class Eav extends AbstractModifier
-      * @param array $attributesToEliminate
-      * @param CompositeConfigProcessor|null $wysiwygConfigProcessor
-      * @param ScopeConfigInterface|null $scopeConfig
-+     * @param AttributeCollectionFactory $attributeCollectionFactory
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -246,7 +260,8 @@ class Eav extends AbstractModifier
-         $attributesToDisable = [],
-         $attributesToEliminate = [],
-         CompositeConfigProcessor $wysiwygConfigProcessor = null,
--        ScopeConfigInterface $scopeConfig = null
-+        ScopeConfigInterface $scopeConfig = null,
-+        AttributeCollectionFactory $attributeCollectionFactory = null
-     ) {
-         $this->locator = $locator;
-         $this->catalogEavValidationRules = $catalogEavValidationRules;
-@@ -271,10 +286,12 @@ class Eav extends AbstractModifier
-             ->get(CompositeConfigProcessor::class);
-         $this->scopeConfig = $scopeConfig ?: \Magento\Framework\App\ObjectManager::getInstance()
-         ->get(ScopeConfigInterface::class);
-+        $this->attributeCollectionFactory = $attributeCollectionFactory
-+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(AttributeCollectionFactory::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 101.0.0
-      */
-     public function modifyMeta(array $meta)
-@@ -287,7 +304,7 @@ class Eav extends AbstractModifier
-             if ($attributes) {
-                 $meta[$groupCode]['children'] = $this->getAttributesMeta($attributes, $groupCode);
-                 $meta[$groupCode]['arguments']['data']['config']['componentType'] = Fieldset::NAME;
--                $meta[$groupCode]['arguments']['data']['config']['label'] = __('%1', $group->getAttributeGroupName());
-+                $meta[$groupCode]['arguments']['data']['config']['label'] = __($group->getAttributeGroupName());
-                 $meta[$groupCode]['arguments']['data']['config']['collapsible'] = true;
-                 $meta[$groupCode]['arguments']['data']['config']['dataScope'] = self::DATA_SCOPE_PRODUCT;
-                 $meta[$groupCode]['arguments']['data']['config']['sortOrder'] =
-@@ -385,7 +402,7 @@ class Eav extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 101.0.0
-      */
-     public function modifyData(array $data)
-@@ -403,7 +420,7 @@ class Eav extends AbstractModifier
- 
-             foreach ($attributes as $attribute) {
-                 if (null !== ($attributeValue = $this->setupAttributeData($attribute))) {
--                    if ($attribute->getFrontendInput() === 'price' && is_scalar($attributeValue)) {
-+                    if ($this->isPriceAttribute($attribute, $attributeValue)) {
-                         $attributeValue = $this->formatPrice($attributeValue);
-                     }
-                     $data[$productId][self::DATA_SOURCE_DEFAULT][$attribute->getAttributeCode()] = $attributeValue;
-@@ -414,6 +431,32 @@ class Eav extends AbstractModifier
-         return $data;
-     }
- 
-+    /**
-+     * Obtain if given attribute is a price
-+     *
-+     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
-+     * @param string|integer $attributeValue
-+     * @return bool
-+     */
-+    private function isPriceAttribute(ProductAttributeInterface $attribute, $attributeValue)
-+    {
-+        return $attribute->getFrontendInput() === 'price'
-+            && is_scalar($attributeValue)
-+            && !$this->isBundleSpecialPrice($attribute);
-+    }
-+
-+    /**
-+     * Obtain if current product is bundle and given attribute is special_price
-+     *
-+     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
-+     * @return bool
-+     */
-+    private function isBundleSpecialPrice(ProductAttributeInterface $attribute)
-+    {
-+        return $this->locator->getProduct()->getTypeId() === ProductType::TYPE_BUNDLE
-+            && $attribute->getAttributeCode() === ProductAttributeInterface::CODE_SPECIAL_PRICE;
-+    }
-+
-     /**
-      * Resolve data persistence
-      *
-@@ -507,39 +550,59 @@ class Eav extends AbstractModifier
-     private function getAttributes()
-     {
-         if (!$this->attributes) {
--            foreach ($this->getGroups() as $group) {
--                $this->attributes[$this->calculateGroupCode($group)] = $this->loadAttributes($group);
--            }
-+            $this->attributes = $this->loadAttributesForGroups($this->getGroups());
-         }
- 
-         return $this->attributes;
-     }
- 
-     /**
--     * Loading product attributes from group
-+     * Loads attributes for specified groups at once
-      *
--     * @param AttributeGroupInterface $group
-+     * @param AttributeGroupInterface[] $groups
-      * @return ProductAttributeInterface[]
-      */
--    private function loadAttributes(AttributeGroupInterface $group)
-+    private function loadAttributesForGroups(array $groups)
-     {
-         $attributes = [];
-+        $groupIds = [];
-+
-+        foreach ($groups as $group) {
-+            $groupIds[$group->getAttributeGroupId()] = $this->calculateGroupCode($group);
-+            $attributes[$this->calculateGroupCode($group)] = [];
-+        }
-+
-+        $collection = $this->attributeCollectionFactory->create();
-+        $collection->setAttributeGroupFilter(array_keys($groupIds));
-+
-+        $mapAttributeToGroup = [];
-+
-+        foreach ($collection->getItems() as $attribute) {
-+            $mapAttributeToGroup[$attribute->getAttributeId()] = $attribute->getAttributeGroupId();
-+        }
-+
-         $sortOrder = $this->sortOrderBuilder
-             ->setField('sort_order')
-             ->setAscendingDirection()
-             ->create();
-+
-         $searchCriteria = $this->searchCriteriaBuilder
--            ->addFilter(AttributeGroupInterface::GROUP_ID, $group->getAttributeGroupId())
-+            ->addFilter(AttributeGroupInterface::GROUP_ID, array_keys($groupIds), 'in')
-             ->addFilter(ProductAttributeInterface::IS_VISIBLE, 1)
-             ->addSortOrder($sortOrder)
-             ->create();
-+
-         $groupAttributes = $this->attributeRepository->getList($searchCriteria)->getItems();
-+
-         $productType = $this->getProductType();
-+
-         foreach ($groupAttributes as $attribute) {
-             $applyTo = $attribute->getApplyTo();
-             $isRelated = !$applyTo || in_array($productType, $applyTo);
-             if ($isRelated) {
--                $attributes[] = $attribute;
-+                $attributeGroupId = $mapAttributeToGroup[$attribute->getAttributeId()];
-+                $attributeGroupCode = $groupIds[$attributeGroupId];
-+                $attributes[$attributeGroupCode][] = $attribute;
-             }
-         }
- 
-@@ -613,7 +676,7 @@ class Eav extends AbstractModifier
-         // TODO: Refactor to $attribute->getOptions() when MAGETWO-48289 is done
-         $attributeModel = $this->getAttributeModel($attribute);
-         if ($attributeModel->usesSource()) {
--            $options = $attributeModel->getSource()->getAllOptions();
-+            $options = $attributeModel->getSource()->getAllOptions(true, true);
-             $meta = $this->arrayManager->merge($configPath, $meta, [
-                 'options' => $this->convertOptionsValueToString($options),
-             ]);
-@@ -671,7 +734,8 @@ class Eav extends AbstractModifier
-     }
- 
-     /**
--     * Returns attribute default value, based on db setting or setting in the system configuration
-+     * Returns attribute default value, based on db setting or setting in the system configuration.
-+     *
-      * @param ProductAttributeInterface $attribute
-      * @return null|string
-      */
-@@ -706,6 +770,8 @@ class Eav extends AbstractModifier
-     }
- 
-     /**
-+     * Adds 'use default value' checkbox.
-+     *
-      * @param ProductAttributeInterface $attribute
-      * @param array $meta
-      * @return array
-@@ -854,7 +920,7 @@ class Eav extends AbstractModifier
-     {
-         $valueMap = $this->formElementMapper->getMappings();
- 
--        return isset($valueMap[$value]) ? $valueMap[$value] : $value;
-+        return $valueMap[$value] ?? $value;
-     }
- 
-     /**
-@@ -908,6 +974,9 @@ class Eav extends AbstractModifier
-         $attributeCode = $attribute->getAttributeCode();
-         /** @var Product $product */
-         $product = $this->locator->getProduct();
-+        if ($product->isLockedAttribute($attributeCode)) {
-+            return false;
-+        }
- 
-         if (isset($this->canDisplayUseDefault[$attributeCode])) {
-             return $this->canDisplayUseDefault[$attributeCode];
-@@ -942,7 +1011,13 @@ class Eav extends AbstractModifier
-      */
-     private function getAttributeModel($attribute)
-     {
--        return $this->eavAttributeFactory->create()->load($attribute->getAttributeId());
-+        $attributeId = $attribute->getAttributeId();
-+
-+        if (!array_key_exists($attributeId, $this->attributesCache)) {
-+            $this->attributesCache[$attributeId] = $this->eavAttributeFactory->create()->load($attributeId);
-+        }
-+
-+        return $this->attributesCache[$attributeId];
-     }
- 
-     /**
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
-index 5513af9d98e..fed94193225 100644
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
-@@ -10,6 +10,9 @@ namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav;
- 
- use Psr\Log\LoggerInterface as Logger;
- 
-+/**
-+ * Process config for Wysiwyg.
-+ */
- class CompositeConfigProcessor implements WysiwygConfigDataProcessorInterface
- {
-     /**
-@@ -24,6 +27,7 @@ class CompositeConfigProcessor implements WysiwygConfigDataProcessorInterface
- 
-     /**
-      * CompositeConfigProcessor constructor.
-+     * @param Logger $logger
-      * @param array $eavWysiwygDataProcessors
-      */
-     public function __construct(Logger $logger, array $eavWysiwygDataProcessors)
-@@ -33,7 +37,7 @@ class CompositeConfigProcessor implements WysiwygConfigDataProcessorInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
-     {
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
-index 98de8ea3476..26044eb91a3 100755
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
-@@ -58,8 +58,11 @@ class General extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Customize number fields for advanced price and weight fields.
-+     *
-      * @since 101.0.0
-+     * @param array $data
-+     * @return array
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function modifyData(array $data)
-@@ -130,8 +133,11 @@ class General extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Customize product form fields.
-+     *
-      * @since 101.0.0
-+     * @param array $meta
-+     * @return array
-      */
-     public function modifyMeta(array $meta)
-     {
-@@ -349,8 +355,10 @@ class General extends AbstractModifier
-                 'allowImport' => !$this->locator->getProduct()->getId(),
-             ];
- 
--            if (!in_array($listener, $textListeners)) {
--                $importsConfig['elementTmpl'] = 'ui/form/element/input';
-+            if (in_array($listener, $textListeners)) {
-+                $importsConfig['cols'] = 15;
-+                $importsConfig['rows'] = 2;
-+                $importsConfig['elementTmpl'] = 'ui/form/element/textarea';
-             }
- 
-             $meta = $this->arrayManager->merge($listenerPath . static::META_CONFIG_PATH, $meta, $importsConfig);
-@@ -361,7 +369,8 @@ class General extends AbstractModifier
-             $skuPath . static::META_CONFIG_PATH,
-             $meta,
-             [
--                'autoImportIfEmpty' => true
-+                'autoImportIfEmpty' => true,
-+                'validation' => ['no-marginal-whitespace' => true]
-             ]
-         );
- 
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
-index 0eddca33222..a529580e292 100644
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
-@@ -45,7 +45,7 @@ class TierPrice extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 101.1.0
-      */
-     public function modifyData(array $data)
-@@ -54,8 +54,11 @@ class TierPrice extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Add tier price info to meta array.
-+     *
-      * @since 101.1.0
-+     * @param array $meta
-+     * @return array
-      */
-     public function modifyMeta(array $meta)
-     {
-@@ -150,8 +153,8 @@ class TierPrice extends AbstractModifier
-                                     'dataType' => Price::NAME,
-                                     'addbefore' => '%',
-                                     'validation' => [
--                                        'validate-number' => true,
--                                        'less-than-equals-to' => 100
-+                                        'required-entry' => true,
-+                                        'validate-positive-percent-decimal' => true
-                                     ],
-                                     'visible' => $firstOption
-                                         && $firstOption['value'] == ProductPriceOptionsInterface::VALUE_PERCENT,
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
-index bab36ce5fc4..b9d8fc56a91 100644
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
-@@ -89,7 +89,7 @@ class Websites extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 101.0.0
-      */
-     public function modifyData(array $data)
-@@ -117,7 +117,7 @@ class Websites extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 101.0.0
-      */
-     public function modifyMeta(array $meta)
-@@ -165,7 +165,7 @@ class Websites extends AbstractModifier
-         $websitesList = $this->getWebsitesList();
-         $isNewProduct = !$this->locator->getProduct()->getId();
-         $tooltip = [
--            'link' => 'http://docs.magento.com/m2/ce/user_guide/configuration/scope.html',
-+            'link' => 'https://docs.magento.com/m2/ce/user_guide/configuration/scope.html',
-             'description' => __(
-                 'If your Magento installation has multiple websites, ' .
-                 'you can edit the scope to use the product on specific sites.'
-@@ -331,6 +331,8 @@ class Websites extends AbstractModifier
-     }
- 
-     /**
-+     * Returns websites options list.
-+     *
-      * @return array
-      * @since 101.0.0
-      */
-@@ -397,8 +399,9 @@ class Websites extends AbstractModifier
-         $this->websitesList = [];
-         $groupList = $this->groupRepository->getList();
-         $storesList = $this->storeRepository->getList();
-+        $websiteList = $this->storeManager->getWebsites(true);
- 
--        foreach ($this->websiteRepository->getList() as $website) {
-+        foreach ($websiteList as $website) {
-             $websiteId = $website->getId();
-             if (!$websiteId) {
-                 continue;
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
-index 216bc16968f..4fcb87ab139 100644
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
-@@ -14,15 +14,18 @@ use Magento\Catalog\Helper\ImageFactory;
- use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
- use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorInterface;
- use Magento\Framework\App\State;
-+use Magento\Framework\View\Design\ThemeInterface;
- use Magento\Framework\View\DesignInterface;
- use Magento\Store\Model\StoreManager;
- use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Framework\View\DesignLoader;
- 
- /**
-  * Collect enough information about image rendering on front
-  * If you want to add new image, that should render on front you need
-  * to configure this class in di.xml
-  *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Image implements ProductRenderCollectorInterface
- {
-@@ -51,6 +54,7 @@ class Image implements ProductRenderCollectorInterface
- 
-     /**
-      * @var DesignInterface
-+     * @deprecated 2.3.0 DesignLoader is used for design theme loading
-      */
-     private $design;
- 
-@@ -59,6 +63,11 @@ class Image implements ProductRenderCollectorInterface
-      */
-     private $imageRenderInfoFactory;
- 
-+    /**
-+     * @var DesignLoader
-+     */
-+    private $designLoader;
-+
-     /**
-      * Image constructor.
-      * @param ImageFactory $imageFactory
-@@ -67,6 +76,7 @@ class Image implements ProductRenderCollectorInterface
-      * @param DesignInterface $design
-      * @param ImageInterfaceFactory $imageRenderInfoFactory
-      * @param array $imageCodes
-+     * @param DesignLoader $designLoader
-      */
-     public function __construct(
-         ImageFactory $imageFactory,
-@@ -74,7 +84,8 @@ class Image implements ProductRenderCollectorInterface
-         StoreManagerInterface $storeManager,
-         DesignInterface $design,
-         ImageInterfaceFactory $imageRenderInfoFactory,
--        array $imageCodes = []
-+        array $imageCodes = [],
-+        DesignLoader $designLoader = null
-     ) {
-         $this->imageFactory = $imageFactory;
-         $this->imageCodes = $imageCodes;
-@@ -82,6 +93,8 @@ class Image implements ProductRenderCollectorInterface
-         $this->storeManager = $storeManager;
-         $this->design = $design;
-         $this->imageRenderInfoFactory = $imageRenderInfoFactory;
-+        $this->designLoader = $designLoader ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(DesignLoader::class);
-     }
- 
-     /**
-@@ -92,6 +105,8 @@ class Image implements ProductRenderCollectorInterface
-     public function collect(ProductInterface $product, ProductRenderInterface $productRender)
-     {
-         $images = [];
-+        /** @var ThemeInterface $currentTheme */
-+        $currentTheme = $this->design->getDesignTheme();
- 
-         foreach ($this->imageCodes as $imageCode) {
-             /** @var ImageInterface $image */
-@@ -120,10 +135,13 @@ class Image implements ProductRenderCollectorInterface
-             $images[] = $image;
-         }
- 
-+        $this->design->setDesignTheme($currentTheme);
-         $productRender->setImages($images);
-     }
- 
-     /**
-+     * Callback for emulating image creation
-+     *
-      * Callback in which we emulate initialize default design theme, depends on current store, be settings store id
-      * from render info
-      *
-@@ -136,7 +154,7 @@ class Image implements ProductRenderCollectorInterface
-     public function emulateImageCreating(ProductInterface $product, $imageCode, $storeId, ImageInterface $image)
-     {
-         $this->storeManager->setCurrentStore($storeId);
--        $this->design->setDefaultDesignTheme();
-+        $this->designLoader->load();
- 
-         $imageHelper = $this->imageFactory->create();
-         $imageHelper->init($product, $imageCode);
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
-index 3090734df01..4de0b94d068 100644
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
-@@ -24,8 +24,6 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
- 
-     /**
-      * @param string $name
--     * @param string $primaryFieldName
--     * @param string $requestFieldName
-      * @param Reporting $reporting
-      * @param SearchCriteriaBuilder $searchCriteriaBuilder
-      * @param RequestInterface $request
-@@ -61,7 +59,7 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getData()
-     {
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
-index f4334bc25ef..ea8fc6f2d83 100644
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
-@@ -5,10 +5,16 @@
-  */
- namespace Magento\Catalog\Ui\DataProvider\Product;
- 
-+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Eav\Model\Entity\Attribute\AttributeInterface;
-+
- /**
-  * Collection which is used for rendering product list in the backend.
-  *
-  * Used for product grid and customizes behavior of the default Product collection for grid needs.
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class ProductCollection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
- {
-@@ -25,4 +31,66 @@ class ProductCollection extends \Magento\Catalog\Model\ResourceModel\Product\Col
-         $this->_productLimitationFilters->setUsePriceIndex(false);
-         return $this->_productLimitationPrice(true);
-     }
-+
-+    /**
-+     * Add attribute filter to collection
-+     *
-+     * @param AttributeInterface|integer|string|array $attribute
-+     * @param null|string|array $condition
-+     * @param string $joinType
-+     * @return $this
-+     * @throws LocalizedException
-+     */
-+    public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
-+    {
-+        $storeId = (int)$this->getStoreId();
-+        if ($attribute === 'is_saleable'
-+            || is_array($attribute)
-+            || $storeId !== $this->getDefaultStoreId()
-+        ) {
-+            return parent::addAttributeToFilter($attribute, $condition, $joinType);
-+        }
-+
-+        if ($attribute instanceof AttributeInterface) {
-+            $attributeModel = $attribute;
-+        } else {
-+            $attributeModel = $this->getEntity()->getAttribute($attribute);
-+            if ($attributeModel === false) {
-+                throw new LocalizedException(
-+                    __('Invalid attribute identifier for filter (%1)', get_class($attribute))
-+                );
-+            }
-+        }
-+
-+        if ($attributeModel->isScopeGlobal() || $attributeModel->getBackend()->isStatic()) {
-+            return parent::addAttributeToFilter($attribute, $condition, $joinType);
-+        }
-+
-+        $this->addAttributeToFilterAllStores($attributeModel, $condition);
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * Add attribute to filter by all stores
-+     *
-+     * @param Attribute $attributeModel
-+     * @param array $condition
-+     * @return void
-+     */
-+    private function addAttributeToFilterAllStores(Attribute $attributeModel, array $condition): void
-+    {
-+        $tableName = $this->getTable($attributeModel->getBackendTable());
-+        $entity = $this->getEntity();
-+        $fKey = 'e.' . $this->getEntityPkName($entity);
-+        $pKey = $tableName . '.' . $this->getEntityPkName($entity);
-+        $attributeId = $attributeModel->getAttributeId();
-+        $condition = "({$pKey} = {$fKey}) AND ("
-+            . $this->_getConditionSql("{$tableName}.value", $condition)
-+            . ') AND ('
-+            . $this->_getConditionSql("{$tableName}.attribute_id", $attributeId)
-+            . ')';
-+        $selectExistsInAllStores = $this->getConnection()->select()->from($tableName);
-+        $this->getSelect()->exists($selectExistsInAllStores, $condition);
-+    }
- }
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
-index 200ecf89641..a518afc576d 100644
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
-@@ -7,6 +7,7 @@ namespace Magento\Catalog\Ui\DataProvider\Product;
- 
- use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Store\Model\Store;
- use Magento\Ui\DataProvider\Modifier\ModifierInterface;
- use Magento\Ui\DataProvider\Modifier\PoolInterface;
- 
-@@ -67,6 +68,7 @@ class ProductDataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-         $this->addFieldStrategies = $addFieldStrategies;
-         $this->addFilterStrategies = $addFilterStrategies;
-         $this->modifiersPool = $modifiersPool ?: ObjectManager::getInstance()->get(PoolInterface::class);
-+        $this->collection->setStoreId(Store::DEFAULT_STORE_ID);
-     }
- 
-     /**
-@@ -110,7 +112,7 @@ class ProductDataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function addFilter(\Magento\Framework\Api\Filter $filter)
-     {
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php
-index 359b1a1a948..7edf25ff20c 100644
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php
-@@ -9,8 +9,7 @@ use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Api\Data\ProductRenderInterface;
- 
- /**
-- * Composite, which holds collectors, that collect enought information for
-- * product render
-+ * Composite, which holds collectors, that collect enough information for product render
-  */
- class ProductRenderCollectorComposite implements ProductRenderCollectorInterface
- {
-diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
-index 5d14cd21f7b..3f16e0a6617 100644
---- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
-+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
-@@ -21,7 +21,6 @@ interface ProductRenderCollectorInterface
-      *
-      * @param ProductInterface $product
-      * @param ProductRenderInterface $productRender
--     * @param array $data
-      * @return void
-      * @since 101.1.0
-      */
-diff --git a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
-index 95f2531e5fd..d1424d63793 100644
---- a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
-+++ b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
-@@ -105,7 +105,7 @@ class Breadcrumbs extends DataObject implements ArgumentInterface
-             [
-                 'breadcrumbs' => [
-                     'categoryUrlSuffix' => $this->escaper->escapeHtml($this->getCategoryUrlSuffix()),
--                    'userCategoryPathInUrl' => (int)$this->isCategoryUsedInProductUrl(),
-+                    'useCategoryPathInUrl' => (int)$this->isCategoryUsedInProductUrl(),
-                     'product' => $this->escaper->escapeHtml($this->getProductName())
-                 ]
-             ],
-diff --git a/app/code/Magento/Catalog/ViewModel/Product/Checker/AddToCompareAvailability.php b/app/code/Magento/Catalog/ViewModel/Product/Checker/AddToCompareAvailability.php
-new file mode 100644
-index 00000000000..27829155af2
---- /dev/null
-+++ b/app/code/Magento/Catalog/ViewModel/Product/Checker/AddToCompareAvailability.php
-@@ -0,0 +1,58 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\ViewModel\Product\Checker;
-+
-+use Magento\Framework\View\Element\Block\ArgumentInterface;
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\CatalogInventory\Api\StockConfigurationInterface;
-+
-+/**
-+ * Check is available add to compare.
-+ */
-+class AddToCompareAvailability implements ArgumentInterface
-+{
-+    /**
-+     * @var StockConfigurationInterface
-+     */
-+    private $stockConfiguration;
-+
-+    /**
-+     * @param StockConfigurationInterface $stockConfiguration
-+     */
-+    public function __construct(StockConfigurationInterface $stockConfiguration)
-+    {
-+        $this->stockConfiguration = $stockConfiguration;
-+    }
-+
-+    /**
-+     * Is product available for comparison.
-+     *
-+     * @param ProductInterface $product
-+     * @return bool
-+     */
-+    public function isAvailableForCompare(ProductInterface $product): bool
-+    {
-+        return $this->isInStock($product) || $this->stockConfiguration->isShowOutOfStock();
-+    }
-+
-+    /**
-+     * Get is in stock status.
-+     *
-+     * @param ProductInterface $product
-+     * @return bool
-+     */
-+    private function isInStock(ProductInterface $product): bool
-+    {
-+        $quantityAndStockStatus = $product->getQuantityAndStockStatus();
-+        if (!$quantityAndStockStatus) {
-+            return $product->isSalable();
-+        }
-+
-+        return isset($quantityAndStockStatus['is_in_stock']) && $quantityAndStockStatus['is_in_stock'];
-+    }
-+}
-diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
-index 44d05193390..5c3ee3da8ca 100644
---- a/app/code/Magento/Catalog/composer.json
-+++ b/app/code/Magento/Catalog/composer.json
-@@ -7,6 +7,8 @@
-     "require": {
-         "php": "~7.1.3||~7.2.0",
-         "magento/framework": "*",
-+        "magento/module-authorization": "*",
-+        "magento/module-asynchronous-operations": "*",
-         "magento/module-backend": "*",
-         "magento/module-catalog-inventory": "*",
-         "magento/module-catalog-rule": "*",
-diff --git a/app/code/Magento/Catalog/etc/acl.xml b/app/code/Magento/Catalog/etc/acl.xml
-index 358a798fc75..4d4b7bdc672 100644
---- a/app/code/Magento/Catalog/etc/acl.xml
-+++ b/app/code/Magento/Catalog/etc/acl.xml
-@@ -11,7 +11,9 @@
-             <resource id="Magento_Backend::admin">
-                 <resource id="Magento_Catalog::catalog" title="Catalog" translate="title" sortOrder="30">
-                     <resource id="Magento_Catalog::catalog_inventory" title="Inventory" translate="title" sortOrder="10">
--                        <resource id="Magento_Catalog::products" title="Products" translate="title" sortOrder="10" />
-+                        <resource id="Magento_Catalog::products" title="Products" translate="title" sortOrder="10">
-+                            <resource id="Magento_Catalog::update_attributes" title="Update Attributes" translate="title" />
-+                        </resource>
-                         <resource id="Magento_Catalog::categories" title="Categories" translate="title" sortOrder="20" />
-                     </resource>
-                 </resource>
-@@ -23,7 +25,6 @@
-                     </resource>
-                     <resource id="Magento_Backend::stores_attributes">
-                         <resource id="Magento_Catalog::attributes_attributes" title="Product" translate="title" sortOrder="30" />
--                        <resource id="Magento_Catalog::update_attributes" title="Update Attributes" translate="title" sortOrder="35" />
-                         <resource id="Magento_Catalog::sets" title="Attribute Set" translate="title" sortOrder="40"/>
-                     </resource>
-                 </resource>
-diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
-index 10251d35dff..c04cfb2dce0 100644
---- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
-+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
-@@ -78,7 +78,7 @@
-     <type name="Magento\Catalog\Model\ResourceModel\Attribute">
-         <plugin name="invalidate_pagecache_after_attribute_save" type="Magento\Catalog\Plugin\Model\ResourceModel\Attribute\Save" />
-     </type>
--    <virtualType name="\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory" type="\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory">
-+    <virtualType name="Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory" type="Magento\Catalog\Model\ResourceModel\Product\CollectionFactory">
-         <arguments>
-             <argument name="instanceName" xsi:type="string">\Magento\Catalog\Ui\DataProvider\Product\ProductCollection</argument>
-         </arguments>
-@@ -220,4 +220,16 @@
-             <argument name="filter" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\AddSearchKeyConditionToCollection</argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab\Attributes">
-+        <arguments>
-+            <argument name="excludeFields" xsi:type="array">
-+                <item name="0" xsi:type="string">category_ids</item>
-+                <item name="1" xsi:type="string">gallery</item>
-+                <item name="2" xsi:type="string">image</item>
-+                <item name="3" xsi:type="string">media_gallery</item>
-+                <item name="4" xsi:type="string">quantity_and_stock_status</item>
-+                <item name="5" xsi:type="string">tier_price</item>
-+            </argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Catalog/etc/adminhtml/events.xml b/app/code/Magento/Catalog/etc/adminhtml/events.xml
-index f4fd7fc3039..ad83f589823 100644
---- a/app/code/Magento/Catalog/etc/adminhtml/events.xml
-+++ b/app/code/Magento/Catalog/etc/adminhtml/events.xml
-@@ -9,4 +9,7 @@
-     <event name="cms_wysiwyg_images_static_urls_allowed">
-         <observer name="catalog_wysiwyg" instance="Magento\Catalog\Observer\CatalogCheckIsUsingStaticUrlsAllowedObserver" />
-     </event>
-+    <event name="catalog_category_change_products">
-+        <observer name="category_product_indexer" instance="Magento\Catalog\Observer\CategoryProductIndexer"/>
-+    </event>
- </config>
-diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
-index 71a799fd224..a6dd6cbd2e9 100644
---- a/app/code/Magento/Catalog/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml
-@@ -10,6 +10,9 @@
-         <tab id="catalog" translate="label" sortOrder="200">
-             <label>Catalog</label>
-         </tab>
-+        <tab id="advanced" translate="label" sortOrder="999999">
-+            <label>Advanced</label>
-+        </tab>
-         <section id="catalog" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-             <class>separator-top</class>
-             <label>Catalog</label>
-@@ -56,7 +59,7 @@
-                 <field id="grid_per_page_values" translate="label comment" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Products per Page on Grid Allowed Values</label>
-                     <comment>Comma-separated.</comment>
--                    <validate>validate-per-page-value-list</validate>
-+                    <validate>validate-per-page-value-list required-entry</validate>
-                 </field>
-                 <field id="grid_per_page" translate="label comment" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Products per Page on Grid Default Value</label>
-@@ -66,7 +69,7 @@
-                 <field id="list_per_page_values" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Products per Page on List Allowed Values</label>
-                     <comment>Comma-separated.</comment>
--                    <validate>validate-per-page-value-list</validate>
-+                    <validate>validate-per-page-value-list required-entry</validate>
-                 </field>
-                 <field id="list_per_page" translate="label comment" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Products per Page on List Default Value</label>
-@@ -83,8 +86,9 @@
-                     <backend_model>Magento\Catalog\Model\Indexer\Product\Flat\System\Config\Mode</backend_model>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
--                <field id="default_sort_by" translate="label" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="default_sort_by" translate="label comment" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Product Listing Sort by</label>
-+                    <comment>Applies to category pages</comment>
-                     <source_model>Magento\Catalog\Model\Config\Source\ListSort</source_model>
-                 </field>
-                 <field id="list_allow_all" translate="label comment" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
-@@ -92,6 +96,11 @@
-                     <comment>Whether to show "All" option in the "Show X Per Page" dropdown</comment>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
-+                <field id="remember_pagination" translate="label comment" type="select" sortOrder="7" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                    <label>Remember Category Pagination</label>
-+                    <comment>Changing may affect SEO and cache storage consumption.</comment>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                </field>
-             </group>
-             <group id="placeholder" translate="label" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Product Image Placeholders</label>
-@@ -105,14 +114,14 @@
-             </group>
-             <group id="seo" translate="label" type="text" sortOrder="500" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Search Engine Optimization</label>
--                <field id="title_separator" translate="label" type="text" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="title_separator" translate="label" type="text" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Page Title Separator</label>
-                 </field>
--                <field id="category_canonical_tag" translate="label" type="select" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="category_canonical_tag" translate="label" type="select" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Use Canonical Link Meta Tag For Categories</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
--                <field id="product_canonical_tag" translate="label" type="select" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="product_canonical_tag" translate="label" type="select" sortOrder="9" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Use Canonical Link Meta Tag For Products</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
-@@ -193,5 +202,19 @@
-                 </field>
-             </group>
-         </section>
-+        <section id="system" translate="label" type="text" sortOrder="900" showInDefault="1" showInWebsite="1" showInStore="1">
-+            <class>separator-top</class>
-+            <label>System</label>
-+            <tab>advanced</tab>
-+            <resource>Magento_Config::config_system</resource>
-+            <group id="upload_configuration" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <label>Images Upload Configuration</label>
-+                <field id="jpeg_quality" translate="label comment" type="text" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                    <label>Quality</label>
-+                    <validate>validate-digits validate-digits-range digits-range-1-100 required-entry</validate>
-+                    <comment>Jpeg quality for resized images 1-100%.</comment>
-+                </field>
-+            </group>
-+        </section>
-     </system>
- </config>
-diff --git a/app/code/Magento/Catalog/etc/communication.xml b/app/code/Magento/Catalog/etc/communication.xml
-new file mode 100644
-index 00000000000..1a957f6ac9f
---- /dev/null
-+++ b/app/code/Magento/Catalog/etc/communication.xml
-@@ -0,0 +1,15 @@
-+<?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:Communication/etc/communication.xsd">
-+    <topic name="product_action_attribute.update" request="Magento\AsynchronousOperations\Api\Data\OperationInterface">
-+        <handler name="product_action_attribute.update" type="Magento\Catalog\Model\Attribute\Backend\Consumer" method="process" />
-+    </topic>
-+    <topic name="product_action_attribute.website.update" request="Magento\AsynchronousOperations\Api\Data\OperationInterface">
-+        <handler name="product_action_attribute.website.update" type="Magento\Catalog\Model\Attribute\Backend\ConsumerWebsiteAssign" method="process" />
-+    </topic>
-+</config>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/etc/config.xml b/app/code/Magento/Catalog/etc/config.xml
-index 1d92197e390..3a842166a38 100644
---- a/app/code/Magento/Catalog/etc/config.xml
-+++ b/app/code/Magento/Catalog/etc/config.xml
-@@ -30,6 +30,7 @@
-                 <flat_catalog_category>0</flat_catalog_category>
-                 <default_sort_by>position</default_sort_by>
-                 <parse_url_directives>1</parse_url_directives>
-+                <remember_pagination>0</remember_pagination>
-             </frontend>
-             <product>
-                 <flat>
-@@ -52,6 +53,11 @@
-                 <forbidden_extensions>php,exe</forbidden_extensions>
-             </custom_options>
-         </catalog>
-+        <indexer>
-+            <catalog_product_price>
-+                <dimensions_mode>none</dimensions_mode>
-+            </catalog_product_price>
-+        </indexer>
-         <system>
-             <media_storage_configuration>
-                 <allowed_resources>
-@@ -61,6 +67,9 @@
-                     <product_custom_options_fodler>custom_options</product_custom_options_fodler>
-                 </allowed_resources>
-             </media_storage_configuration>
-+            <upload_configuration>
-+                <jpeg_quality>80</jpeg_quality>
-+            </upload_configuration>
-         </system>
-         <design>
-             <watermark>
-diff --git a/app/code/Magento/Catalog/etc/crontab.xml b/app/code/Magento/Catalog/etc/crontab.xml
-index c48f1307a09..74c60323530 100644
---- a/app/code/Magento/Catalog/etc/crontab.xml
-+++ b/app/code/Magento/Catalog/etc/crontab.xml
-@@ -16,7 +16,7 @@
-         <job name="catalog_product_outdated_price_values_cleanup" instance="Magento\Catalog\Cron\DeleteOutdatedPriceValues" method="execute">
-             <schedule>* * * * *</schedule>
-         </job>
--        <job name="catalog_product_frontend_actions_flush" instance="Magento\Catalog\Cron\DeleteOutdatedPriceValues" method="execute">
-+        <job name="catalog_product_frontend_actions_flush" instance="Magento\Catalog\Cron\FrontendActionsFlush" method="execute">
-             <schedule>* * * * *</schedule>
-         </job>
-         <job name="catalog_product_attribute_value_synchronize" instance="Magento\Catalog\Cron\SynchronizeWebsiteAttributes" method="execute">
-diff --git a/app/code/Magento/Catalog/etc/db_schema.xml b/app/code/Magento/Catalog/etc/db_schema.xml
-index 7b4e1a96add..6fef4ca6e91 100644
---- a/app/code/Magento/Catalog/etc/db_schema.xml
-+++ b/app/code/Magento/Catalog/etc/db_schema.xml
-@@ -9,7 +9,7 @@
-         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-     <table name="catalog_product_entity" resource="default" engine="innodb" comment="Catalog Product Table">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="smallint" name="attribute_set_id" padding="5" unsigned="true" nullable="false"
-                 identity="false" default="0" comment="Attribute Set ID"/>
-         <column xsi:type="varchar" name="type_id" nullable="false" length="32" default="simple" comment="Type ID"/>
-@@ -22,13 +22,13 @@
-                 comment="Creation Time"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Update Time"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_ENTITY_ATTRIBUTE_SET_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_ATTRIBUTE_SET_ID" indexType="btree">
-             <column name="attribute_set_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_ENTITY_SKU" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_SKU" indexType="btree">
-             <column name="sku"/>
-         </index>
-     </table>
-@@ -41,29 +41,29 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="catalog_product_entity_datetime" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_DTIME_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_DTIME_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_entity_datetime" column="entity_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_PRODUCT_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID"
-                     table="catalog_product_entity_datetime" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_ENTITY_DATETIME_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_DATETIME_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_ENTITY_DATETIME_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_DATETIME_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -76,30 +76,30 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0"/>
--        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="true"
-+                default="0" comment="Entity ID"/>
-+        <column xsi:type="decimal" name="value" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="catalog_product_entity_decimal" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_DEC_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_DEC_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_entity_decimal" column="entity_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_PRODUCT_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID"
-                     table="catalog_product_entity_decimal" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_ENTITY_DECIMAL_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_DECIMAL_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_ENTITY_DECIMAL_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_DECIMAL_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
-     </table>
-@@ -112,30 +112,30 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="true" identity="false"
-                 comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="catalog_product_entity_int" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_INT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_INT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_entity_int" column="entity_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_PRODUCT_ENTITY_INT_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_ENTITY_INT_STORE_ID_STORE_STORE_ID"
-                     table="catalog_product_entity_int" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_ENTITY_INT_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_INT_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -148,29 +148,29 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="text" name="value" nullable="true" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="catalog_product_entity_text" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_TEXT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_TEXT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_entity_text" column="entity_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_PRODUCT_ENTITY_TEXT_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_ENTITY_TEXT_STORE_ID_STORE_STORE_ID"
-                     table="catalog_product_entity_text" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_ENTITY_TEXT_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_TEXT_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -183,29 +183,29 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="catalog_product_entity_varchar" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_VCHR_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_VCHR_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_entity_varchar" column="entity_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID"
-                     table="catalog_product_entity_varchar" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_ENTITY_VARCHAR_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_VARCHAR_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -218,40 +218,40 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Position"/>
-         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_GLR_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_GLR_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="catalog_product_entity_gallery" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_GLR_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_GLR_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_entity_gallery" column="entity_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_PRODUCT_ENTITY_GALLERY_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_ENTITY_GALLERY_STORE_ID_STORE_STORE_ID"
-                     table="catalog_product_entity_gallery" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_ENTITY_GALLERY_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_ENTITY_GALLERY_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_ENTITY_GALLERY_ENTITY_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_GALLERY_ENTITY_ID" indexType="btree">
-             <column name="entity_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_ENTITY_GALLERY_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_GALLERY_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_ENTITY_GALLERY_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_GALLERY_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-     <table name="catalog_category_entity" resource="default" engine="innodb" comment="Catalog Category Table">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="smallint" name="attribute_set_id" padding="5" unsigned="true" nullable="false"
-                 identity="false" default="0" comment="Attribute Set ID"/>
-         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
-@@ -267,13 +267,13 @@
-                 comment="Tree Level"/>
-         <column xsi:type="int" name="children_count" padding="11" unsigned="false" nullable="false" identity="false"
-                 comment="Child Count"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <index name="CATALOG_CATEGORY_ENTITY_LEVEL" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_LEVEL" indexType="btree">
-             <column name="level"/>
-         </index>
--        <index name="CATALOG_CATEGORY_ENTITY_PATH" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_PATH" indexType="btree">
-             <column name="path"/>
-         </index>
-     </table>
-@@ -286,32 +286,32 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_CTGR_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="catalog_category_entity_datetime" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_CTGR_ENTT_DTIME_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_DTIME_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
-                     table="catalog_category_entity_datetime" column="entity_id" referenceTable="catalog_category_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_CATEGORY_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_CATEGORY_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID"
-                     table="catalog_category_entity_datetime" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_CATEGORY_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_CATEGORY_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_CATEGORY_ENTITY_DATETIME_ENTITY_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_DATETIME_ENTITY_ID" indexType="btree">
-             <column name="entity_id"/>
-         </index>
--        <index name="CATALOG_CATEGORY_ENTITY_DATETIME_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_DATETIME_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_CATEGORY_ENTITY_DATETIME_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_DATETIME_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -324,33 +324,33 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0"/>
--        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="true"
-+                default="0" comment="Entity ID"/>
-+        <column xsi:type="decimal" name="value" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_CTGR_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="catalog_category_entity_decimal" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_CTGR_ENTT_DEC_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_DEC_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
-                     table="catalog_category_entity_decimal" column="entity_id" referenceTable="catalog_category_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_CATEGORY_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_CATEGORY_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID"
-                     table="catalog_category_entity_decimal" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_CATEGORY_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_CATEGORY_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_CATEGORY_ENTITY_DECIMAL_ENTITY_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_DECIMAL_ENTITY_ID" indexType="btree">
-             <column name="entity_id"/>
-         </index>
--        <index name="CATALOG_CATEGORY_ENTITY_DECIMAL_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_DECIMAL_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_CATEGORY_ENTITY_DECIMAL_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_DECIMAL_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -363,33 +363,33 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="true" identity="false"
-                 comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_CTGR_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="catalog_category_entity_int" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_CTGR_ENTT_INT_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_INT_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
-                     table="catalog_category_entity_int" column="entity_id" referenceTable="catalog_category_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_CATEGORY_ENTITY_INT_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_CATEGORY_ENTITY_INT_STORE_ID_STORE_STORE_ID"
-                     table="catalog_category_entity_int" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_CATEGORY_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_CATEGORY_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_CATEGORY_ENTITY_INT_ENTITY_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_INT_ENTITY_ID" indexType="btree">
-             <column name="entity_id"/>
-         </index>
--        <index name="CATALOG_CATEGORY_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_CATEGORY_ENTITY_INT_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_INT_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -402,32 +402,32 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="text" name="value" nullable="true" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_CTGR_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="catalog_category_entity_text" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_CTGR_ENTT_TEXT_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_TEXT_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
-                     table="catalog_category_entity_text" column="entity_id" referenceTable="catalog_category_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_CATEGORY_ENTITY_TEXT_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_CATEGORY_ENTITY_TEXT_STORE_ID_STORE_STORE_ID"
-                     table="catalog_category_entity_text" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_CATEGORY_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_CATEGORY_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_CATEGORY_ENTITY_TEXT_ENTITY_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_TEXT_ENTITY_ID" indexType="btree">
-             <column name="entity_id"/>
-         </index>
--        <index name="CATALOG_CATEGORY_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_CATEGORY_ENTITY_TEXT_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_TEXT_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -440,32 +440,32 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_CTGR_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="catalog_category_entity_varchar" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_CTGR_ENTT_VCHR_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_VCHR_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
-                     table="catalog_category_entity_varchar" column="entity_id" referenceTable="catalog_category_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID"
-                     table="catalog_category_entity_varchar" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_CATEGORY_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_CATEGORY_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_CATEGORY_ENTITY_VARCHAR_ENTITY_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_VARCHAR_ENTITY_ID" indexType="btree">
-             <column name="entity_id"/>
-         </index>
--        <index name="CATALOG_CATEGORY_ENTITY_VARCHAR_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_VARCHAR_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -479,22 +479,22 @@
-                 default="0" comment="Product ID"/>
-         <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Position"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="category_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_CTGR_PRD_PRD_ID_CAT_PRD_ENTT_ENTT_ID" table="catalog_category_product"
-+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_PRD_PRD_ID_CAT_PRD_ENTT_ENTT_ID" table="catalog_category_product"
-                     column="product_id" referenceTable="catalog_product_entity" referenceColumn="entity_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_CTGR_PRD_CTGR_ID_CAT_CTGR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_PRD_CTGR_ID_CAT_CTGR_ENTT_ENTT_ID"
-                     table="catalog_category_product" column="category_id" referenceTable="catalog_category_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_CATEGORY_PRODUCT_CATEGORY_ID_PRODUCT_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_CATEGORY_PRODUCT_CATEGORY_ID_PRODUCT_ID">
-             <column name="category_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <index name="CATALOG_CATEGORY_PRODUCT_PRODUCT_ID" indexType="btree">
-+        <index referenceId="CATALOG_CATEGORY_PRODUCT_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-@@ -512,18 +512,18 @@
-                 default="0" comment="Store ID"/>
-         <column xsi:type="smallint" name="visibility" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Visibility"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="category_id"/>
-             <column name="product_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CAT_CTGR_PRD_IDX_PRD_ID_STORE_ID_CTGR_ID_VISIBILITY" indexType="btree">
-+        <index referenceId="CAT_CTGR_PRD_IDX_PRD_ID_STORE_ID_CTGR_ID_VISIBILITY" indexType="btree">
-             <column name="product_id"/>
-             <column name="store_id"/>
-             <column name="category_id"/>
-             <column name="visibility"/>
-         </index>
--        <index name="CAT_CTGR_PRD_IDX_STORE_ID_CTGR_ID_VISIBILITY_IS_PARENT_POSITION" indexType="btree">
-+        <index referenceId="CAT_CTGR_PRD_IDX_STORE_ID_CTGR_ID_VISIBILITY_IS_PARENT_POSITION" indexType="btree">
-             <column name="store_id"/>
-             <column name="category_id"/>
-             <column name="visibility"/>
-@@ -542,29 +542,29 @@
-                 default="0" comment="Product ID"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-                 comment="Store ID"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="catalog_compare_item_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CATALOG_COMPARE_ITEM_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_COMPARE_ITEM_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="catalog_compare_item" column="customer_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_COMPARE_ITEM_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_COMPARE_ITEM_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-                     table="catalog_compare_item" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_COMPARE_ITEM_STORE_ID_STORE_STORE_ID" table="catalog_compare_item"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_COMPARE_ITEM_STORE_ID_STORE_STORE_ID" table="catalog_compare_item"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
--        <index name="CATALOG_COMPARE_ITEM_PRODUCT_ID" indexType="btree">
-+        <index referenceId="CATALOG_COMPARE_ITEM_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
--        <index name="CATALOG_COMPARE_ITEM_VISITOR_ID_PRODUCT_ID" indexType="btree">
-+        <index referenceId="CATALOG_COMPARE_ITEM_VISITOR_ID_PRODUCT_ID" indexType="btree">
-             <column name="visitor_id"/>
-             <column name="product_id"/>
-         </index>
--        <index name="CATALOG_COMPARE_ITEM_CUSTOMER_ID_PRODUCT_ID" indexType="btree">
-+        <index referenceId="CATALOG_COMPARE_ITEM_CUSTOMER_ID_PRODUCT_ID" indexType="btree">
-             <column name="customer_id"/>
-             <column name="product_id"/>
-         </index>
--        <index name="CATALOG_COMPARE_ITEM_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_COMPARE_ITEM_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -574,17 +574,17 @@
-                 comment="Product ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website ID"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="product_id"/>
-             <column name="website_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CATALOG_PRODUCT_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-                     table="catalog_product_website" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_WS_PRD_ID_CAT_PRD_ENTT_ENTT_ID" table="catalog_product_website"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_WS_PRD_ID_CAT_PRD_ENTT_ENTT_ID" table="catalog_product_website"
-                     column="product_id" referenceTable="catalog_product_entity" referenceColumn="entity_id"
-                     onDelete="CASCADE"/>
--        <index name="CATALOG_PRODUCT_WEBSITE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_WEBSITE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-@@ -593,7 +593,7 @@
-         <column xsi:type="smallint" name="link_type_id" padding="5" unsigned="true" nullable="false" identity="true"
-                 comment="Link Type ID"/>
-         <column xsi:type="varchar" name="code" nullable="true" length="32" comment="Code"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="link_type_id"/>
-         </constraint>
-     </table>
-@@ -607,27 +607,27 @@
-                 default="0" comment="Linked Product ID"/>
-         <column xsi:type="smallint" name="link_type_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Link Type ID"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="link_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_LNK_LNKED_PRD_ID_CAT_PRD_ENTT_ENTT_ID" table="catalog_product_link"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_LNK_LNKED_PRD_ID_CAT_PRD_ENTT_ENTT_ID" table="catalog_product_link"
-                     column="linked_product_id" referenceTable="catalog_product_entity" referenceColumn="entity_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_PRODUCT_LINK_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_LINK_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-                     table="catalog_product_link" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_LNK_LNK_TYPE_ID_CAT_PRD_LNK_TYPE_LNK_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_LNK_LNK_TYPE_ID_CAT_PRD_LNK_TYPE_LNK_TYPE_ID"
-                     table="catalog_product_link" column="link_type_id" referenceTable="catalog_product_link_type"
-                     referenceColumn="link_type_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_LINK_LINK_TYPE_ID_PRODUCT_ID_LINKED_PRODUCT_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_LINK_LINK_TYPE_ID_PRODUCT_ID_LINKED_PRODUCT_ID">
-             <column name="link_type_id"/>
-             <column name="product_id"/>
-             <column name="linked_product_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_LINK_PRODUCT_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_LINK_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_LINK_LINKED_PRODUCT_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_LINK_LINKED_PRODUCT_ID" indexType="btree">
-             <column name="linked_product_id"/>
-         </index>
-     </table>
-@@ -640,13 +640,13 @@
-         <column xsi:type="varchar" name="product_link_attribute_code" nullable="true" length="32"
-                 comment="Product Link Attribute Code"/>
-         <column xsi:type="varchar" name="data_type" nullable="true" length="32" comment="Data Type"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="product_link_attribute_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_LNK_ATTR_LNK_TYPE_ID_CAT_PRD_LNK_TYPE_LNK_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_LNK_ATTR_LNK_TYPE_ID_CAT_PRD_LNK_TYPE_LNK_TYPE_ID"
-                     table="catalog_product_link_attribute" column="link_type_id"
-                     referenceTable="catalog_product_link_type" referenceColumn="link_type_id" onDelete="CASCADE"/>
--        <index name="CATALOG_PRODUCT_LINK_ATTRIBUTE_LINK_TYPE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_LINK_ATTRIBUTE_LINK_TYPE_ID" indexType="btree">
-             <column name="link_type_id"/>
-         </index>
-     </table>
-@@ -658,23 +658,23 @@
-                 identity="false" comment="Product Link Attribute ID"/>
-         <column xsi:type="int" name="link_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Link ID"/>
--        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-+        <column xsi:type="decimal" name="value" scale="6" precision="20" unsigned="false" nullable="false" default="0"
-                 comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_LNK_ATTR_DEC_LNK_ID_CAT_PRD_LNK_LNK_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_LNK_ATTR_DEC_LNK_ID_CAT_PRD_LNK_LNK_ID"
-                     table="catalog_product_link_attribute_decimal" column="link_id"
-                     referenceTable="catalog_product_link" referenceColumn="link_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="FK_AB2EFA9A14F7BCF1D5400056203D14B6"
-+        <constraint xsi:type="foreign" referenceId="FK_AB2EFA9A14F7BCF1D5400056203D14B6"
-                     table="catalog_product_link_attribute_decimal" column="product_link_attribute_id"
-                     referenceTable="catalog_product_link_attribute" referenceColumn="product_link_attribute_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CAT_PRD_LNK_ATTR_DEC_PRD_LNK_ATTR_ID_LNK_ID">
-+        <constraint xsi:type="unique" referenceId="CAT_PRD_LNK_ATTR_DEC_PRD_LNK_ATTR_ID_LNK_ID">
-             <column name="product_link_attribute_id"/>
-             <column name="link_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_LINK_ATTRIBUTE_DECIMAL_LINK_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_LINK_ATTRIBUTE_DECIMAL_LINK_ID" indexType="btree">
-             <column name="link_id"/>
-         </index>
-     </table>
-@@ -688,21 +688,21 @@
-                 comment="Link ID"/>
-         <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="false" identity="false" default="0"
-                 comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_LNK_ATTR_INT_LNK_ID_CAT_PRD_LNK_LNK_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_LNK_ATTR_INT_LNK_ID_CAT_PRD_LNK_LNK_ID"
-                     table="catalog_product_link_attribute_int" column="link_id" referenceTable="catalog_product_link"
-                     referenceColumn="link_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="FK_D6D878F8BA2A4282F8DDED7E6E3DE35C"
-+        <constraint xsi:type="foreign" referenceId="FK_D6D878F8BA2A4282F8DDED7E6E3DE35C"
-                     table="catalog_product_link_attribute_int" column="product_link_attribute_id"
-                     referenceTable="catalog_product_link_attribute" referenceColumn="product_link_attribute_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CAT_PRD_LNK_ATTR_INT_PRD_LNK_ATTR_ID_LNK_ID">
-+        <constraint xsi:type="unique" referenceId="CAT_PRD_LNK_ATTR_INT_PRD_LNK_ATTR_ID_LNK_ID">
-             <column name="product_link_attribute_id"/>
-             <column name="link_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_LINK_ATTRIBUTE_INT_LINK_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_LINK_ATTRIBUTE_INT_LINK_ID" indexType="btree">
-             <column name="link_id"/>
-         </index>
-     </table>
-@@ -715,21 +715,21 @@
-         <column xsi:type="int" name="link_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Link ID"/>
-         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_LNK_ATTR_VCHR_LNK_ID_CAT_PRD_LNK_LNK_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_LNK_ATTR_VCHR_LNK_ID_CAT_PRD_LNK_LNK_ID"
-                     table="catalog_product_link_attribute_varchar" column="link_id"
-                     referenceTable="catalog_product_link" referenceColumn="link_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="FK_DEE9C4DA61CFCC01DFCF50F0D79CEA51"
-+        <constraint xsi:type="foreign" referenceId="FK_DEE9C4DA61CFCC01DFCF50F0D79CEA51"
-                     table="catalog_product_link_attribute_varchar" column="product_link_attribute_id"
-                     referenceTable="catalog_product_link_attribute" referenceColumn="product_link_attribute_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CAT_PRD_LNK_ATTR_VCHR_PRD_LNK_ATTR_ID_LNK_ID">
-+        <constraint xsi:type="unique" referenceId="CAT_PRD_LNK_ATTR_VCHR_PRD_LNK_ATTR_ID_LNK_ID">
-             <column name="product_link_attribute_id"/>
-             <column name="link_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_LINK_ATTRIBUTE_VARCHAR_LINK_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_LINK_ATTRIBUTE_VARCHAR_LINK_ID" indexType="btree">
-             <column name="link_id"/>
-         </index>
-     </table>
-@@ -738,42 +738,42 @@
-         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
-                 comment="Value ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="smallint" name="all_groups" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="1" comment="Is Applicable To All Customer Groups"/>
-         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Customer Group ID"/>
-         <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="false" default="1"
-                 comment="QTY"/>
--        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-+        <column xsi:type="decimal" name="value" scale="6" precision="20" unsigned="false" nullable="false" default="0"
-                 comment="Value"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website ID"/>
-         <column xsi:type="decimal" name="percentage_value" scale="2" precision="5" unsigned="false" nullable="true"
-                 comment="Percentage value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_TIER_PRICE_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_TIER_PRICE_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
-                     table="catalog_product_entity_tier_price" column="customer_group_id" referenceTable="customer_group"
-                     referenceColumn="customer_group_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_TIER_PRICE_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_TIER_PRICE_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_entity_tier_price" column="entity_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_TIER_PRICE_WS_ID_STORE_WS_WS_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_TIER_PRICE_WS_ID_STORE_WS_WS_ID"
-                     table="catalog_product_entity_tier_price" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="UNQ_E8AB433B9ACB00343ABB312AD2FAB087">
-+        <constraint xsi:type="unique" referenceId="UNQ_E8AB433B9ACB00343ABB312AD2FAB087">
-             <column name="entity_id"/>
-             <column name="all_groups"/>
-             <column name="customer_group_id"/>
-             <column name="qty"/>
-             <column name="website_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_ENTITY_TIER_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_TIER_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_ENTITY_TIER_PRICE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_TIER_PRICE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-@@ -788,13 +788,13 @@
-                 comment="Media entry type"/>
-         <column xsi:type="smallint" name="disabled" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Visibility status"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_MDA_GLR_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_MDA_GLR_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="catalog_product_entity_media_gallery" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <index name="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
-     </table>
-@@ -805,7 +805,7 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="varchar" name="label" nullable="true" length="255" comment="Label"/>
-         <column xsi:type="int" name="position" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="Position"/>
-@@ -813,28 +813,33 @@
-                 default="0" comment="Is Disabled"/>
-         <column xsi:type="int" name="record_id" padding="10" unsigned="true" nullable="false" identity="true"
-                 comment="Record Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="record_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_MDA_GLR_VAL_VAL_ID_CAT_PRD_ENTT_MDA_GLR_VAL_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_VAL_ID_CAT_PRD_ENTT_MDA_GLR_VAL_ID"
-                     table="catalog_product_entity_media_gallery_value" column="value_id"
-                     referenceTable="catalog_product_entity_media_gallery" referenceColumn="value_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_MDA_GLR_VAL_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_STORE_ID_STORE_STORE_ID"
-                     table="catalog_product_entity_media_gallery_value" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_MDA_GLR_VAL_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_entity_media_gallery_value" column="entity_id"
-                     referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_ENTITY_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_ENTITY_ID" indexType="btree">
-             <column name="entity_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_VALUE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_VALUE_ID" indexType="btree">
-             <column name="value_id"/>
-         </index>
-+        <index referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_ENTT_ID_VAL_ID_STORE_ID" indexType="btree">
-+            <column name="entity_id"/>
-+            <column name="value_id"/>
-+            <column name="store_id"/>
-+        </index>
-     </table>
-     <table name="catalog_product_option" resource="default" engine="innodb" comment="Catalog Product Option Table">
-         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"
-@@ -854,13 +859,13 @@
-                 comment="Image Size Y"/>
-         <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Sort Order"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="option_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_OPT_PRD_ID_CAT_PRD_ENTT_ENTT_ID" table="catalog_product_option"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_OPT_PRD_ID_CAT_PRD_ENTT_ENTT_ID" table="catalog_product_option"
-                     column="product_id" referenceTable="catalog_product_entity" referenceColumn="entity_id"
-                     onDelete="CASCADE"/>
--        <index name="CATALOG_PRODUCT_OPTION_PRODUCT_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_OPTION_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-@@ -872,23 +877,23 @@
-                 default="0" comment="Option ID"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="false" default="0"
-                 comment="Price"/>
-         <column xsi:type="varchar" name="price_type" nullable="false" length="7" default="fixed" comment="Price Type"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="option_price_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_OPT_PRICE_OPT_ID_CAT_PRD_OPT_OPT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_OPT_PRICE_OPT_ID_CAT_PRD_OPT_OPT_ID"
-                     table="catalog_product_option_price" column="option_id" referenceTable="catalog_product_option"
-                     referenceColumn="option_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_PRODUCT_OPTION_PRICE_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_OPTION_PRICE_STORE_ID_STORE_STORE_ID"
-                     table="catalog_product_option_price" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_OPTION_PRICE_OPTION_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_OPTION_PRICE_OPTION_ID_STORE_ID">
-             <column name="option_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_OPTION_PRICE_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_OPTION_PRICE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -901,20 +906,20 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="option_title_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_OPT_TTL_OPT_ID_CAT_PRD_OPT_OPT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_OPT_TTL_OPT_ID_CAT_PRD_OPT_OPT_ID"
-                     table="catalog_product_option_title" column="option_id" referenceTable="catalog_product_option"
-                     referenceColumn="option_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_PRODUCT_OPTION_TITLE_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_OPTION_TITLE_STORE_ID_STORE_STORE_ID"
-                     table="catalog_product_option_title" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_OPTION_TITLE_OPTION_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_OPTION_TITLE_OPTION_ID_STORE_ID">
-             <column name="option_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_OPTION_TITLE_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_OPTION_TITLE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -927,13 +932,13 @@
-         <column xsi:type="varchar" name="sku" nullable="true" length="64" comment="SKU"/>
-         <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Sort Order"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="option_type_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_OPT_TYPE_VAL_OPT_ID_CAT_PRD_OPT_OPT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_OPT_TYPE_VAL_OPT_ID_CAT_PRD_OPT_OPT_ID"
-                     table="catalog_product_option_type_value" column="option_id" referenceTable="catalog_product_option"
-                     referenceColumn="option_id" onDelete="CASCADE"/>
--        <index name="CATALOG_PRODUCT_OPTION_TYPE_VALUE_OPTION_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_OPTION_TYPE_VALUE_OPTION_ID" indexType="btree">
-             <column name="option_id"/>
-         </index>
-     </table>
-@@ -945,24 +950,24 @@
-                 default="0" comment="Option Type ID"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="false" default="0"
-                 comment="Price"/>
-         <column xsi:type="varchar" name="price_type" nullable="false" length="7" default="fixed" comment="Price Type"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="option_type_price_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="FK_B523E3378E8602F376CC415825576B7F"
-+        <constraint xsi:type="foreign" referenceId="FK_B523E3378E8602F376CC415825576B7F"
-                     table="catalog_product_option_type_price" column="option_type_id"
-                     referenceTable="catalog_product_option_type_value" referenceColumn="option_type_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_PRODUCT_OPTION_TYPE_PRICE_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_OPTION_TYPE_PRICE_STORE_ID_STORE_STORE_ID"
-                     table="catalog_product_option_type_price" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_OPTION_TYPE_PRICE_OPTION_TYPE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_OPTION_TYPE_PRICE_OPTION_TYPE_ID_STORE_ID">
-             <column name="option_type_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_OPTION_TYPE_PRICE_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_OPTION_TYPE_PRICE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -975,21 +980,21 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="option_type_title_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="FK_C085B9CF2C2A302E8043FDEA1937D6A2"
-+        <constraint xsi:type="foreign" referenceId="FK_C085B9CF2C2A302E8043FDEA1937D6A2"
-                     table="catalog_product_option_type_title" column="option_type_id"
-                     referenceTable="catalog_product_option_type_value" referenceColumn="option_type_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_PRODUCT_OPTION_TYPE_TITLE_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_OPTION_TYPE_TITLE_STORE_ID_STORE_STORE_ID"
-                     table="catalog_product_option_type_title" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_OPTION_TYPE_TITLE_OPTION_TYPE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_OPTION_TYPE_TITLE_OPTION_TYPE_ID_STORE_ID">
-             <column name="option_type_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_OPTION_TYPE_TITLE_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_OPTION_TYPE_TITLE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -1037,16 +1042,16 @@
-                 identity="false" default="0" comment="Is Visible in Grid"/>
-         <column xsi:type="smallint" name="is_filterable_in_grid" padding="5" unsigned="true" nullable="false"
-                 identity="false" default="0" comment="Is Filterable in Grid"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="attribute_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CATALOG_EAV_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_EAV_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-                     table="catalog_eav_attribute" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <index name="CATALOG_EAV_ATTRIBUTE_USED_FOR_SORT_BY" indexType="btree">
-+        <index referenceId="CATALOG_EAV_ATTRIBUTE_USED_FOR_SORT_BY" indexType="btree">
-             <column name="used_for_sort_by"/>
-         </index>
--        <index name="CATALOG_EAV_ATTRIBUTE_USED_IN_PRODUCT_LISTING" indexType="btree">
-+        <index referenceId="CATALOG_EAV_ATTRIBUTE_USED_IN_PRODUCT_LISTING" indexType="btree">
-             <column name="used_in_product_listing"/>
-         </index>
-     </table>
-@@ -1055,17 +1060,17 @@
-                 comment="Parent ID"/>
-         <column xsi:type="int" name="child_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Child ID"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="parent_id"/>
-             <column name="child_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_RELATION_CHILD_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_RELATION_CHILD_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_relation" column="child_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_RELATION_PARENT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_RELATION_PARENT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_relation" column="parent_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="CATALOG_PRODUCT_RELATION_CHILD_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_RELATION_CHILD_ID" indexType="btree">
-             <column name="child_id"/>
-         </index>
-     </table>
-@@ -1081,20 +1086,20 @@
-                 comment="Value"/>
-         <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Original entity Id for attribute value"/>
--        <constraint xsi:type="primary" name="CAT_PRD_IDX_EAV_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
-+        <constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-             <column name="value"/>
-             <column name="source_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_VALUE" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_VALUE" indexType="btree">
-             <column name="value"/>
-         </index>
-     </table>
-@@ -1110,20 +1115,20 @@
-                 comment="Value"/>
-         <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Original entity Id for attribute value"/>
--        <constraint xsi:type="primary" name="CAT_PRD_IDX_EAV_DEC_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
-+        <constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_DEC_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-             <column name="value"/>
-             <column name="source_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_VALUE" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_VALUE" indexType="btree">
-             <column name="value"/>
-         </index>
-     </table>
-@@ -1137,28 +1142,28 @@
-                 comment="Website ID"/>
-         <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
-                 default="0" comment="Tax Class ID"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Price"/>
--        <column xsi:type="decimal" name="final_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="final_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Final Price"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_INDEX_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_PRICE_MIN_PRICE" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_MIN_PRICE" indexType="btree">
-             <column name="min_price"/>
-         </index>
--        <index name="CAT_PRD_IDX_PRICE_WS_ID_CSTR_GROUP_ID_MIN_PRICE" indexType="btree">
-+        <index referenceId="CAT_PRD_IDX_PRICE_WS_ID_CSTR_GROUP_ID_MIN_PRICE" indexType="btree">
-             <column name="website_id"/>
-             <column name="customer_group_id"/>
-             <column name="min_price"/>
-@@ -1172,26 +1177,26 @@
-                 comment="Customer Group ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website ID"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_IDX_TIER_PRICE_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_IDX_TIER_PRICE_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
-                     table="catalog_product_index_tier_price" column="customer_group_id" referenceTable="customer_group"
-                     referenceColumn="customer_group_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_IDX_TIER_PRICE_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_IDX_TIER_PRICE_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_index_tier_price" column="entity_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_IDX_TIER_PRICE_WS_ID_STORE_WS_WS_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_IDX_TIER_PRICE_WS_ID_STORE_WS_WS_ID"
-                     table="catalog_product_index_tier_price" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <index name="CATALOG_PRODUCT_INDEX_TIER_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_TIER_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_TIER_PRICE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_TIER_PRICE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-@@ -1203,12 +1208,12 @@
-                 comment="Default store id for website"/>
-         <column xsi:type="date" name="website_date" comment="Website Date"/>
-         <column xsi:type="float" name="rate" unsigned="false" nullable="true" default="1" comment="Rate"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="website_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_IDX_WS_WS_ID_STORE_WS_WS_ID" table="catalog_product_index_website"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_IDX_WS_WS_ID_STORE_WS_WS_ID" table="catalog_product_index_website"
-                     column="website_id" referenceTable="store_website" referenceColumn="website_id" onDelete="CASCADE"/>
--        <index name="CATALOG_PRODUCT_INDEX_WEBSITE_WEBSITE_DATE" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_WEBSITE_WEBSITE_DATE" indexType="btree">
-             <column name="website_date"/>
-         </index>
-     </table>
-@@ -1222,11 +1227,11 @@
-                 default="0" comment="Customer Group ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website ID"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="parent_id"/>
-             <column name="child_id"/>
-             <column name="customer_group_id"/>
-@@ -1243,11 +1248,11 @@
-                 default="0" comment="Customer Group ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website ID"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="parent_id"/>
-             <column name="child_id"/>
-             <column name="customer_group_id"/>
-@@ -1262,13 +1267,13 @@
-                 default="0" comment="Customer Group ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website ID"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -1282,13 +1287,13 @@
-                 default="0" comment="Customer Group ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website ID"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -1304,19 +1309,19 @@
-                 comment="Website ID"/>
-         <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
-                 default="0" comment="Tax Class ID"/>
--        <column xsi:type="decimal" name="orig_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="orig_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Original Price"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Price"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tier" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Base Tier"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -1332,19 +1337,19 @@
-                 comment="Website ID"/>
-         <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
-                 default="0" comment="Tax Class ID"/>
--        <column xsi:type="decimal" name="orig_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="orig_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Original Price"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Price"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tier" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Base Tier"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -1358,13 +1363,13 @@
-                 default="0" comment="Customer Group ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website ID"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -1378,13 +1383,13 @@
-                 default="0" comment="Customer Group ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website ID"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -1400,13 +1405,13 @@
-                 comment="Website ID"/>
-         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Option ID"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -1423,13 +1428,13 @@
-                 comment="Website ID"/>
-         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Option ID"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -1448,20 +1453,20 @@
-                 comment="Value"/>
-         <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Original entity Id for attribute value"/>
--        <constraint xsi:type="primary" name="CAT_PRD_IDX_EAV_IDX_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
-+        <constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_IDX_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-             <column name="value"/>
-             <column name="source_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_IDX_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_IDX_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_IDX_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_IDX_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_IDX_VALUE" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_IDX_VALUE" indexType="btree">
-             <column name="value"/>
-         </index>
-     </table>
-@@ -1477,20 +1482,20 @@
-                 comment="Value"/>
-         <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Original entity Id for attribute value"/>
--        <constraint xsi:type="primary" name="CAT_PRD_IDX_EAV_TMP_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
-+        <constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_TMP_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-             <column name="value"/>
-             <column name="source_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_TMP_ATTRIBUTE_ID" indexType="hash">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_TMP_ATTRIBUTE_ID" indexType="hash">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_TMP_STORE_ID" indexType="hash">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_TMP_STORE_ID" indexType="hash">
-             <column name="store_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_TMP_VALUE" indexType="hash">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_TMP_VALUE" indexType="hash">
-             <column name="value"/>
-         </index>
-     </table>
-@@ -1506,20 +1511,20 @@
-                 comment="Value"/>
-         <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Original entity Id for attribute value"/>
--        <constraint xsi:type="primary" name="CAT_PRD_IDX_EAV_DEC_IDX_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
-+        <constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_DEC_IDX_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-             <column name="value"/>
-             <column name="source_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_IDX_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_IDX_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_IDX_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_IDX_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_IDX_VALUE" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_IDX_VALUE" indexType="btree">
-             <column name="value"/>
-         </index>
-     </table>
-@@ -1535,20 +1540,20 @@
-                 comment="Value"/>
-         <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Original entity Id for attribute value"/>
--        <constraint xsi:type="primary" name="CAT_PRD_IDX_EAV_DEC_TMP_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
-+        <constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_DEC_TMP_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-             <column name="value"/>
-             <column name="source_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_ATTRIBUTE_ID" indexType="hash">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_ATTRIBUTE_ID" indexType="hash">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_STORE_ID" indexType="hash">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_STORE_ID" indexType="hash">
-             <column name="store_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_VALUE" indexType="hash">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_VALUE" indexType="hash">
-             <column name="value"/>
-         </index>
-     </table>
-@@ -1562,28 +1567,28 @@
-                 comment="Website ID"/>
-         <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
-                 default="0" comment="Tax Class ID"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Price"/>
--        <column xsi:type="decimal" name="final_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="final_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Final Price"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_INDEX_PRICE_IDX_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_IDX_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_PRICE_IDX_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_IDX_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_PRICE_IDX_MIN_PRICE" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_IDX_MIN_PRICE" indexType="btree">
-             <column name="min_price"/>
-         </index>
-     </table>
-@@ -1597,28 +1602,28 @@
-                 comment="Website ID"/>
-         <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
-                 default="0" comment="Tax Class ID"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Price"/>
--        <column xsi:type="decimal" name="final_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="final_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Final Price"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_INDEX_PRICE_TMP_CUSTOMER_GROUP_ID" indexType="hash">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_TMP_CUSTOMER_GROUP_ID" indexType="hash">
-             <column name="customer_group_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_PRICE_TMP_WEBSITE_ID" indexType="hash">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_TMP_WEBSITE_ID" indexType="hash">
-             <column name="website_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_PRICE_TMP_MIN_PRICE" indexType="hash">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_TMP_MIN_PRICE" indexType="hash">
-             <column name="min_price"/>
-         </index>
-     </table>
-@@ -1636,12 +1641,12 @@
-                 default="0" comment="Store ID"/>
-         <column xsi:type="smallint" name="visibility" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Visibility"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="category_id"/>
-             <column name="product_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CAT_CTGR_PRD_IDX_TMP_PRD_ID_CTGR_ID_STORE_ID" indexType="hash">
-+        <index referenceId="CAT_CTGR_PRD_IDX_TMP_PRD_ID_CTGR_ID_STORE_ID" indexType="hash">
-             <column name="product_id"/>
-             <column name="category_id"/>
-             <column name="store_id"/>
-@@ -1651,15 +1656,16 @@
-            comment="Link Media value to Product entity table">
-         <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Value media Entry ID"/>
--        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"/>
--        <constraint xsi:type="foreign" name="FK_A6C6C8FAA386736921D3A7C4B50B1185"
-+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-+                comment="Product Entity ID"/>
-+        <constraint xsi:type="foreign" referenceId="FK_A6C6C8FAA386736921D3A7C4B50B1185"
-                     table="catalog_product_entity_media_gallery_value_to_entity" column="value_id"
-                     referenceTable="catalog_product_entity_media_gallery" referenceColumn="value_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_MDA_GLR_VAL_TO_ENTT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_TO_ENTT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_entity_media_gallery_value_to_entity" column="entity_id"
-                     referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CAT_PRD_ENTT_MDA_GLR_VAL_TO_ENTT_VAL_ID_ENTT_ID">
-+        <constraint xsi:type="unique" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_TO_ENTT_VAL_ID_ENTT_ID">
-             <column name="value_id"/>
-             <column name="entity_id"/>
-         </constraint>
-@@ -1676,20 +1682,20 @@
-                 comment="Value"/>
-         <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Original entity Id for attribute value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-             <column name="value"/>
-             <column name="source_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_VALUE" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_VALUE" indexType="btree">
-             <column name="value"/>
-         </index>
-     </table>
-@@ -1705,20 +1711,20 @@
-                 comment="Value"/>
-         <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Original entity Id for attribute value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-             <column name="value"/>
-             <column name="source_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_VALUE" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_VALUE" indexType="btree">
-             <column name="value"/>
-         </index>
-     </table>
-@@ -1732,28 +1738,28 @@
-                 comment="Website ID"/>
-         <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
-                 default="0" comment="Tax Class ID"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Price"/>
--        <column xsi:type="decimal" name="final_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="final_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Final Price"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Min Price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Max Price"/>
--        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
-                 comment="Tier Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_INDEX_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
--        <index name="CATALOG_PRODUCT_INDEX_PRICE_MIN_PRICE" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_MIN_PRICE" indexType="btree">
-             <column name="min_price"/>
-         </index>
--        <index name="CAT_PRD_IDX_PRICE_WS_ID_CSTR_GROUP_ID_MIN_PRICE" indexType="btree">
-+        <index referenceId="CAT_PRD_IDX_PRICE_WS_ID_CSTR_GROUP_ID_MIN_PRICE" indexType="btree">
-             <column name="website_id"/>
-             <column name="customer_group_id"/>
-             <column name="min_price"/>
-@@ -1773,18 +1779,18 @@
-                 default="0" comment="Store ID"/>
-         <column xsi:type="smallint" name="visibility" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Visibility"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="category_id"/>
-             <column name="product_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CAT_CTGR_PRD_IDX_PRD_ID_STORE_ID_CTGR_ID_VISIBILITY" indexType="btree">
-+        <index referenceId="CAT_CTGR_PRD_IDX_PRD_ID_STORE_ID_CTGR_ID_VISIBILITY" indexType="btree">
-             <column name="product_id"/>
-             <column name="store_id"/>
-             <column name="category_id"/>
-             <column name="visibility"/>
-         </index>
--        <index name="CAT_CTGR_PRD_IDX_STORE_ID_CTGR_ID_VISIBILITY_IS_PARENT_POSITION" indexType="btree">
-+        <index referenceId="CAT_CTGR_PRD_IDX_STORE_ID_CTGR_ID_VISIBILITY_IS_PARENT_POSITION" indexType="btree">
-             <column name="store_id"/>
-             <column name="category_id"/>
-             <column name="visibility"/>
-@@ -1805,21 +1811,21 @@
-                 comment="Product Id"/>
-         <column xsi:type="bigint" name="added_at" padding="20" unsigned="false" nullable="false" identity="false"
-                 comment="Added At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="action_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_FRONTEND_ACTION_CSTR_ID_CSTR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_FRONTEND_ACTION_CSTR_ID_CSTR_ENTT_ENTT_ID"
-                     table="catalog_product_frontend_action" column="customer_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_FRONTEND_ACTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_FRONTEND_ACTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_frontend_action" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE" />
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_FRONTEND_ACTION_VISITOR_ID_PRODUCT_ID_TYPE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_FRONTEND_ACTION_VISITOR_ID_PRODUCT_ID_TYPE_ID">
-             <column name="visitor_id"/>
-             <column name="product_id"/>
-             <column name="type_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_FRONTEND_ACTION_CUSTOMER_ID_PRODUCT_ID_TYPE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_FRONTEND_ACTION_CUSTOMER_ID_PRODUCT_ID_TYPE_ID">
-             <column name="customer_id"/>
-             <column name="product_id"/>
-             <column name="type_id"/>
-diff --git a/app/code/Magento/Catalog/etc/db_schema_whitelist.json b/app/code/Magento/Catalog/etc/db_schema_whitelist.json
-index b1543a6a007..d4bd6927d43 100644
---- a/app/code/Magento/Catalog/etc/db_schema_whitelist.json
-+++ b/app/code/Magento/Catalog/etc/db_schema_whitelist.json
-@@ -484,7 +484,8 @@
-         "index": {
-             "CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_STORE_ID": true,
-             "CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_ENTITY_ID": true,
--            "CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_VALUE_ID": true
-+            "CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_VALUE_ID": true,
-+            "CAT_PRD_ENTT_MDA_GLR_VAL_ENTT_ID_VAL_ID_STORE_ID": true
-         },
-         "constraint": {
-             "PRIMARY": true,
-@@ -1121,4 +1122,4 @@
-             "CATALOG_PRODUCT_FRONTEND_ACTION_CUSTOMER_ID_PRODUCT_ID_TYPE_ID": true
-         }
-     }
--}
-\ No newline at end of file
-+}
-diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
-index 44564da388f..e30577a3976 100644
---- a/app/code/Magento/Catalog/etc/di.xml
-+++ b/app/code/Magento/Catalog/etc/di.xml
-@@ -72,6 +72,7 @@
-     <preference for="Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface" type="Magento\Catalog\Model\Indexer\Product\Price\InvalidateIndex" />
-     <preference for="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface" type="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactory" />
-     <preference for="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface" type="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite" />
-+    <preference for="Magento\Catalog\Api\Data\MassActionInterface" type="\Magento\Catalog\Model\MassAction" />
-     <type name="Magento\Customer\Model\ResourceModel\Visitor">
-         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
-     </type>
-@@ -144,12 +145,6 @@
-         <arguments>
-             <argument name="catalogProductStatus" xsi:type="object">Magento\Catalog\Model\Product\Attribute\Source\Status\Proxy</argument>
-             <argument name="productLink" xsi:type="object">Magento\Catalog\Model\Product\Link\Proxy</argument>
--            <argument name="getCustomAttributeCodes" xsi:type="object">Magento\Catalog\Model\Entity\GetProductCustomAttributeCodes</argument>
--        </arguments>
--    </type>
--    <type name="Magento\Catalog\Model\Category">
--        <arguments>
--            <argument name="getCustomAttributeCodes" xsi:type="object">Magento\Catalog\Model\Entity\GetCategoryCustomAttributeCodes</argument>
-         </arguments>
-     </type>
-     <type name="Magento\Catalog\Model\ResourceModel\Product\Collection">
-@@ -226,6 +221,12 @@
-                 <item name="gif" xsi:type="string">gif</item>
-                 <item name="png" xsi:type="string">png</item>
-             </argument>
-+            <argument name="allowedMimeTypes" xsi:type="array">
-+                <item name="jpg" xsi:type="string">image/jpg</item>
-+                <item name="jpeg" xsi:type="string">image/jpeg</item>
-+                <item name="gif" xsi:type="string">image/gif</item>
-+                <item name="png" xsi:type="string">image/png</item>
-+            </argument>
-         </arguments>
-     </virtualType>
-     <type name="Magento\Catalog\Controller\Adminhtml\Category\Image\Upload">
-@@ -563,7 +564,6 @@
-         <arguments>
-             <argument name="commands" xsi:type="array">
-                 <item name="productAttributesCleanUp" xsi:type="object">Magento\Catalog\Console\Command\ProductAttributesCleanUp</item>
--                <item name="setPriceDimensionsMode" xsi:type="object">Magento\Catalog\Console\Command\PriceIndexerDimensionsModeSetCommand</item>
-             </argument>
-         </arguments>
-     </type>
-@@ -603,6 +603,13 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Sales\Model\Order\ProductOption">
-+        <arguments>
-+            <argument name="processorPool" xsi:type="array">
-+                <item name="custom_options" xsi:type="object">Magento\Catalog\Model\ProductOptionProcessor</item>
-+            </argument>
-+        </arguments>
-+    </type>
-     <type name="Magento\Framework\Model\Entity\RepositoryFactory">
-         <arguments>
-             <argument name="entities" xsi:type="array">
-@@ -664,12 +671,14 @@
-                         <item name="mediaGalleryCreate" xsi:type="string">Magento\Catalog\Model\Product\Gallery\CreateHandler</item>
-                         <item name="categoryProductLinksSave" xsi:type="string">Magento\Catalog\Model\Category\Link\SaveHandler</item>
-                         <item name="websitePersistor" xsi:type="string">Magento\Catalog\Model\Product\Website\SaveHandler</item>
-+                        <item name="tierPriceCreator" xsi:type="string">Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\SaveHandler</item>
-                     </item>
-                     <item name="update" xsi:type="array">
-                         <item name="optionUpdater" xsi:type="string">Magento\Catalog\Model\Product\Option\SaveHandler</item>
-                         <item name="mediaGalleryUpdate" xsi:type="string">Magento\Catalog\Model\Product\Gallery\UpdateHandler</item>
-                         <item name="categoryProductLinksSave" xsi:type="string">Magento\Catalog\Model\Category\Link\SaveHandler</item>
-                         <item name="websitePersistor" xsi:type="string">Magento\Catalog\Model\Product\Website\SaveHandler</item>
-+                        <item name="tierPriceUpdater" xsi:type="string">Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\UpdateHandler</item>
-                     </item>
-                 </item>
-             </argument>
-@@ -1142,4 +1151,26 @@
-             <argument name="productType" xsi:type="string">virtual</argument>
-         </arguments>
-     </virtualType>
-+    <type name="Magento\Indexer\Console\Command\IndexerSetDimensionsModeCommand">
-+        <arguments>
-+            <argument name="dimensionSwitchers" xsi:type="array">
-+                <item name="catalog_product_price" xsi:type="object">Magento\Catalog\Model\Indexer\Product\Price\ModeSwitcher</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Indexer\Console\Command\IndexerShowDimensionsModeCommand">
-+        <arguments>
-+            <argument name="indexers" xsi:type="array">
-+                <item name="catalog_product_price" xsi:type="string">catalog_product_price</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Catalog\Model\Product\Option\Type\Select">
-+        <arguments>
-+            <argument name="singleSelectionTypes" xsi:type="array">
-+                <item name="drop_down" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN</item>
-+                <item name="radio" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO</item>
-+            </argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Catalog/etc/frontend/di.xml b/app/code/Magento/Catalog/etc/frontend/di.xml
-index 55098037191..ee9c5b29da8 100644
---- a/app/code/Magento/Catalog/etc/frontend/di.xml
-+++ b/app/code/Magento/Catalog/etc/frontend/di.xml
-@@ -116,4 +116,8 @@
-         <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
-         <plugin name="get_catalog_product_price_index_table_name" type="Magento\Catalog\Model\Indexer\Product\Price\Plugin\TableResolver"/>
-     </type>
-+    <type name="Magento\Framework\App\Action\AbstractAction">
-+        <plugin name="catalog_app_action_dispatch_controller_context_plugin"
-+                type="Magento\Catalog\Plugin\Framework\App\Action\ContextPlugin" />
-+    </type>
- </config>
-diff --git a/app/code/Magento/Catalog/etc/product_options.xsd b/app/code/Magento/Catalog/etc/product_options.xsd
-index 3bc24a90992..734c8f378d5 100644
---- a/app/code/Magento/Catalog/etc/product_options.xsd
-+++ b/app/code/Magento/Catalog/etc/product_options.xsd
-@@ -61,11 +61,11 @@
-     <xs:simpleType name="modelName">
-         <xs:annotation>
-             <xs:documentation>
--                Model name can contain only [a-zA-Z_\\].
-+                Model name can contain only ([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+.
-             </xs:documentation>
-         </xs:annotation>
-         <xs:restriction base="xs:string">
--            <xs:pattern value="[a-zA-Z_\\]+" />
-+            <xs:pattern value="([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+" />
-         </xs:restriction>
-     </xs:simpleType>
- </xs:schema>
-diff --git a/app/code/Magento/Catalog/etc/product_types_base.xsd b/app/code/Magento/Catalog/etc/product_types_base.xsd
-index 6cc35fd7bee..dec952bcf49 100644
---- a/app/code/Magento/Catalog/etc/product_types_base.xsd
-+++ b/app/code/Magento/Catalog/etc/product_types_base.xsd
-@@ -92,11 +92,11 @@
-     <xs:simpleType name="modelName">
-         <xs:annotation>
-             <xs:documentation>
--                Model name can contain only [a-zA-Z_\\].
-+                Model name can contain only ([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+.
-             </xs:documentation>
-         </xs:annotation>
-         <xs:restriction base="xs:string">
--            <xs:pattern value="[a-zA-Z_\\]+" />
-+            <xs:pattern value="([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+" />
-         </xs:restriction>
-     </xs:simpleType>
- </xs:schema>
-diff --git a/app/code/Magento/Catalog/etc/queue.xml b/app/code/Magento/Catalog/etc/queue.xml
-new file mode 100644
-index 00000000000..137f34a5c1e
---- /dev/null
-+++ b/app/code/Magento/Catalog/etc/queue.xml
-@@ -0,0 +1,15 @@
-+<?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-message-queue:etc/queue.xsd">
-+    <broker topic="product_action_attribute.update" exchange="magento-db" type="db">
-+        <queue name="product_action_attribute.update" consumer="product_action_attribute.update" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process"/>
-+    </broker>
-+    <broker topic="product_action_attribute.website.update" exchange="magento-db" type="db">
-+        <queue name="product_action_attribute.website.update" consumer="product_action_attribute.website.update" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\ConsumerWebsiteAssign::process"/>
-+    </broker>
-+</config>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/etc/queue_consumer.xml b/app/code/Magento/Catalog/etc/queue_consumer.xml
-new file mode 100644
-index 00000000000..d9e66ae69c1
---- /dev/null
-+++ b/app/code/Magento/Catalog/etc/queue_consumer.xml
-@@ -0,0 +1,11 @@
-+<?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-message-queue:etc/consumer.xsd">
-+    <consumer name="product_action_attribute.update" queue="product_action_attribute.update" connection="db" maxMessages="5000" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process" />
-+    <consumer name="product_action_attribute.website.update" queue="product_action_attribute.website.update" connection="db" maxMessages="5000" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\ConsumerWebsiteAssign::process" />
-+</config>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/etc/queue_publisher.xml b/app/code/Magento/Catalog/etc/queue_publisher.xml
-new file mode 100644
-index 00000000000..1606ea42ec0
---- /dev/null
-+++ b/app/code/Magento/Catalog/etc/queue_publisher.xml
-@@ -0,0 +1,15 @@
-+<?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-message-queue:etc/publisher.xsd">
-+    <publisher topic="product_action_attribute.update">
-+        <connection name="db" exchange="magento-db" />
-+    </publisher>
-+    <publisher topic="product_action_attribute.website.update">
-+        <connection name="db" exchange="magento-db" />
-+    </publisher>
-+</config>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/etc/queue_topology.xml b/app/code/Magento/Catalog/etc/queue_topology.xml
-new file mode 100644
-index 00000000000..bdac891afbd
---- /dev/null
-+++ b/app/code/Magento/Catalog/etc/queue_topology.xml
-@@ -0,0 +1,13 @@
-+<?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-message-queue:etc/topology.xsd">
-+    <exchange name="magento-db" type="topic" connection="db">
-+        <binding id="updateBinding" topic="product_action_attribute.update" destinationType="queue" destination="product_action_attribute.update"/>
-+        <binding id="updateBindingWebsite" topic="product_action_attribute.website.update" destinationType="queue" destination="product_action_attribute.website.update"/>
-+    </exchange>
-+</config>
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/etc/webapi_rest/di.xml b/app/code/Magento/Catalog/etc/webapi_rest/di.xml
-index 2a5d60222e9..44cdd473bf7 100644
---- a/app/code/Magento/Catalog/etc/webapi_rest/di.xml
-+++ b/app/code/Magento/Catalog/etc/webapi_rest/di.xml
-@@ -19,4 +19,7 @@
-         <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
-         <plugin name="get_catalog_product_price_index_table_name" type="Magento\Catalog\Model\Indexer\Product\Price\Plugin\TableResolver"/>
-     </type>
-+    <type name="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface">
-+        <plugin name="updateProductCustomOptionsAttributes" type="Magento\Catalog\Plugin\Model\Product\Option\UpdateProductCustomOptionsAttributes"/>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Catalog/etc/webapi_soap/di.xml b/app/code/Magento/Catalog/etc/webapi_soap/di.xml
-index 2a5d60222e9..44cdd473bf7 100644
---- a/app/code/Magento/Catalog/etc/webapi_soap/di.xml
-+++ b/app/code/Magento/Catalog/etc/webapi_soap/di.xml
-@@ -19,4 +19,7 @@
-         <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
-         <plugin name="get_catalog_product_price_index_table_name" type="Magento\Catalog\Model\Indexer\Product\Price\Plugin\TableResolver"/>
-     </type>
-+    <type name="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface">
-+        <plugin name="updateProductCustomOptionsAttributes" type="Magento\Catalog\Plugin\Model\Product\Option\UpdateProductCustomOptionsAttributes"/>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv
-index f2a3ab8f83f..ed27dfd646c 100644
---- a/app/code/Magento/Catalog/i18n/en_US.csv
-+++ b/app/code/Magento/Catalog/i18n/en_US.csv
-@@ -233,7 +233,6 @@ Products,Products
- "This attribute set no longer exists.","This attribute set no longer exists."
- "You saved the attribute set.","You saved the attribute set."
- "Something went wrong while saving the attribute set.","Something went wrong while saving the attribute set."
--"You added product %1 to the comparison list.","You added product %1 to the comparison list."
- "You cleared the comparison list.","You cleared the comparison list."
- "Something went wrong  clearing the comparison list.","Something went wrong  clearing the comparison list."
- "You removed product %1 from the comparison list.","You removed product %1 from the comparison list."
-@@ -808,4 +807,5 @@ Details,Details
- "Product Name or SKU", "Product Name or SKU"
- "Start typing to find products", "Start typing to find products"
- "Product with ID: (%1) doesn't exist", "Product with ID: (%1) doesn't exist"
--"Category with ID: (%1) doesn't exist", "Category with ID: (%1) doesn't exist"
-\ No newline at end of file
-+"Category with ID: (%1) doesn't exist", "Category with ID: (%1) doesn't exist"
-+"You added product %1 to the <a href=""%2"">comparison list</a>.","You added product %1 to the <a href=""%2"">comparison list</a>."
-\ No newline at end of file
-diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml
-index 4a27158be5f..d7aa058a1f4 100644
---- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml
-+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml
-@@ -5,6 +5,10 @@
-  * See COPYING.txt for license details.
-  */
- -->
-+<!--
-+@deprecated Not used since cross-sell products grid moved to UI components.
-+@see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
-+-->
- <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
-     <container name="root" label="Root">
-         <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Crosssell" name="catalog.product.edit.tab.crosssell"/>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml
-index b5efecf0d03..3ba4562c9d3 100644
---- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml
-+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml
-@@ -5,6 +5,10 @@
-  * See COPYING.txt for license details.
-  */
- -->
-+<!--
-+@deprecated Not used since cross-sell products grid moved to UI components.
-+@see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
-+-->
- <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
-     <container name="root" label="Root">
-         <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Crosssell" name="catalog.product.edit.tab.crosssell"/>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml
-index b42a78dfbe3..5d57c2d8f86 100644
---- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml
-+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml
-@@ -8,6 +8,8 @@
- <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
-     <update handle="formkey"/>
-     <container name="root" label="Root">
--        <block class="Magento\Catalog\Block\Adminhtml\Product\Grid" name="admin.product.grid"/>
-+        <block class="Magento\Catalog\Block\Adminhtml\Product\Grid" name="admin.product.grid">
-+            <block class="Magento\Framework\View\Element\Text\ListText" name="grid.bottom.links"/>
-+        </block>
-     </container>
- </layout>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml
-index 1340d40ef4f..c40c4a2818e 100644
---- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml
-+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml
-@@ -5,6 +5,10 @@
-  * See COPYING.txt for license details.
-  */
- -->
-+<!--
-+@deprecated Not used since related products grid moved to UI components.
-+@see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
-+-->
- <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
-     <container name="root" label="Root">
-         <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Related" name="catalog.product.edit.tab.related"/>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml
-index 1ae83419ae6..38b791d88a0 100644
---- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml
-+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml
-@@ -5,6 +5,10 @@
-  * See COPYING.txt for license details.
-  */
- -->
-+<!--
-+@deprecated Not used since related products grid moved to UI components.
-+@see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
-+-->
- <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
-     <container name="root" label="Root">
-         <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Related" name="catalog.product.edit.tab.related"/>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml
-index 44884897461..4e739660882 100644
---- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml
-+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.catalog.product.set.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">setGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Eav\Model\ResourceModel\Entity\Attribute\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Eav\Model\ResourceModel\Entity\Attribute\Grid\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">set_name</argument>
-                     <argument name="default_dir" xsi:type="string">ASC</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml
-index a9770ed3c18..eea44504119 100644
---- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml
-+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml
-@@ -5,6 +5,10 @@
-  * See COPYING.txt for license details.
-  */
- -->
-+<!--
-+@deprecated Not used since upsell products grid moved to UI components.
-+@see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
-+-->
- <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
-     <container name="root" label="Root">
-         <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Upsell" name="catalog.product.edit.tab.upsell"/>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml
-index a4acf572cae..2c400746c64 100644
---- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml
-+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml
-@@ -5,6 +5,10 @@
-  * See COPYING.txt for license details.
-  */
- -->
-+<!--
-+@deprecated Not used since upsell products grid moved to UI components.
-+@see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
-+-->
- <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
-     <container name="root" label="Root">
-         <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Upsell" name="catalog.product.edit.tab.upsell"/>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
-index 00a1580923a..cea54e883d2 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var $block \Magento\Catalog\Block\Adminhtml\Category\Tree
-  */
-@@ -20,7 +19,7 @@
-             "categoryCheckboxTree": {
-                 "dataUrl":       "<?= $block->escapeUrl($block->getLoadTreeUrl()) ?>",
-                 "divId":         "<?= /* @noEscape */ $divId ?>",
--                "rootVisible":   <?= /* @noEscape */ $block->getRoot()->getIsVisible() ? 'true' : 'false' ?>,
-+                "rootVisible":   false,
-                 "useAjax":       <?= $block->escapeHtml($block->getUseAjax()) ?>,
-                 "currentNodeId": <?= (int)$block->getCategoryId() ?>,
-                 "jsFormObject":  "<?= /* @noEscape */ $block->getJsFormObject() ?>",
-@@ -28,7 +27,7 @@
-                 "checked":       "<?= $block->escapeHtml($block->getRoot()->getChecked()) ?>",
-                 "allowdDrop":    <?= /* @noEscape */ $block->getRoot()->getIsVisible() ? 'true' : 'false' ?>,
-                 "rootId":        <?= (int)$block->getRoot()->getId() ?>,
--                "expanded":      <?= (int)$block->getIsWasExpanded() ?>,
-+                "expanded":      true,
-                 "categoryId":    <?= (int)$block->getCategoryId() ?>,
-                 "treeJson":      <?= /* @noEscape */ $block->getTreeJson() ?>
-             }
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml
-index f58b39a819a..c77b66733af 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml
-@@ -5,18 +5,18 @@
-  */
- 
- /**
-- * Template for \Magento\Catalog\Block\Adminhtml\Category\Edit
-+ * @var $block \Magento\Catalog\Block\Adminhtml\Category\Edit
-  */
- ?>
- <div data-id="information-dialog-category" class="messages" style="display: none;">
-     <div class="message message-notice">
--        <div><?= /* @escapeNotVerified */ __('This operation can take a long time') ?></div>
-+        <div><?= $block->escapeHtml(__('This operation can take a long time')) ?></div>
-     </div>
- </div>
- <script type="text/x-magento-init">
-     {
-         "*": {
--            "categoryForm": {"refreshUrl": "<?= /* @escapeNotVerified */ $block->getRefreshPathUrl() ?>"}
-+            "categoryForm": {"refreshUrl": "<?= $block->escapeJs($block->escapeUrl($block->getRefreshPathUrl())) ?>"}
-         }
-     }
- </script>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/assign_products.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/assign_products.phtml
-index 4691a709cad..af7aec12a57 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/assign_products.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/assign_products.phtml
-@@ -16,8 +16,8 @@ $gridJsObjectName = $blockGrid->getJsObjectName();
-     {
-         "*": {
-             "Magento_Catalog/catalog/category/assign-products": {
--                "selectedProducts": <?= /* @escapeNotVerified */ $block->getProductsJson() ?>,
--                "gridJsObjectName": <?= /* @escapeNotVerified */ '"' . $gridJsObjectName . '"' ?: '{}' ?>
-+                "selectedProducts": <?= /* @noEscape */ $block->getProductsJson() ?>,
-+                "gridJsObjectName": <?= /* @noEscape */ '"' . $gridJsObjectName . '"' ?: '{}' ?>
-             }
-         }
-     }
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
-index 9865589556e..6b63a20134d 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
-@@ -4,27 +4,26 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block \Magento\Catalog\Block\Adminhtml\Category\Tree */
- ?>
- <div class="categories-side-col">
-     <div class="sidebar-actions">
--        <?php if ($block->getRoot()): ?>
-+        <?php if ($block->getRoot()) :?>
-             <?= $block->getAddRootButtonHtml() ?><br/>
-             <?= $block->getAddSubButtonHtml() ?>
-         <?php endif; ?>
-     </div>
-     <div class="tree-actions">
--        <?php if ($block->getRoot()): ?>
-+        <?php if ($block->getRoot()) :?>
-             <?php //echo $block->getCollapseButtonHtml() ?>
-             <?php //echo $block->getExpandButtonHtml() ?>
-             <a href="#"
--               onclick="tree.collapseTree(); return false;"><?= /* @escapeNotVerified */ __('Collapse All') ?></a>
-+               onclick="tree.collapseTree(); return false;"><?= $block->escapeHtml(__('Collapse All')) ?></a>
-             <span class="separator">|</span> <a href="#"
--                                                onclick="tree.expandTree(); return false;"><?= /* @escapeNotVerified */ __('Expand All') ?></a>
-+                                                onclick="tree.expandTree(); return false;"><?= $block->escapeHtml(__('Expand All')) ?></a>
-         <?php endif; ?>
-     </div>
--    <?php if ($block->getRoot()): ?>
-+    <?php if ($block->getRoot()) :?>
-     <div class="tree-holder">
-         <div id="tree-div" class="tree-wrapper"></div>
-     </div>
-@@ -32,7 +31,7 @@
- 
-     <div data-id="information-dialog-tree" class="messages" style="display: none;">
-         <div class="message message-notice">
--            <div><?= /* @escapeNotVerified */ __('This operation can take a long time') ?></div>
-+            <div><?= $block->escapeHtml(__('This operation can take a long time')) ?></div>
-         </div>
-     </div>
-     <script>
-@@ -172,7 +171,7 @@
- 
-                     if (!this.collapsed) {
-                         this.collapsed = true;
--                        this.loader.dataUrl = '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl(false) ?>';
-+                        this.loader.dataUrl = '<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl(false))) ?>';
-                         this.request(this.loader.dataUrl, false);
-                     }
-                 },
-@@ -181,7 +180,7 @@
-                     this.expandAll();
-                     if (this.collapsed) {
-                         this.collapsed = false;
--                        this.loader.dataUrl = '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl(true) ?>';
-+                        this.loader.dataUrl = '<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl(true))) ?>';
-                         this.request(this.loader.dataUrl, false);
-                     }
-                 },
-@@ -216,7 +215,7 @@
-                 if (tree && switcherParams) {
-                     var url;
-                     if (switcherParams.useConfirm) {
--                        if (!confirm("<?= /* @escapeNotVerified */ __('Please confirm site switching. All data that hasn\'t been saved will be lost.') ?>")) {
-+                        if (!confirm("<?= $block->escapeJs(__('Please confirm site switching. All data that hasn\'t been saved will be lost.')) ?>")) {
-                             return false;
-                         }
-                     }
-@@ -248,7 +247,7 @@
-                                 try {
-                                     response = JSON.parse(transport.responseText);
-                                 } catch (e) {
--                                    console.warn('An error occured while parsing response');
-+                                    console.warn('An error occurred while parsing response');
-                                 }
- 
-                                 if (!response || !response['parameters']) {
-@@ -259,7 +258,7 @@
-                             }
-                         });
-                     } else {
--                        var baseUrl = '<?= /* @escapeNotVerified */ $block->getEditUrl() ?>';
-+                        var baseUrl = '<?= $block->escapeJs($block->escapeUrl($block->getEditUrl())) ?>';
-                         var urlExt = switcherParams.scopeParams + 'id/' + tree.currentNodeId + '/';
-                         url = parseSidUrl(baseUrl, urlExt);
-                         setLocation(url);
-@@ -296,17 +295,18 @@
-                 if (scopeParams) {
-                     url = url + scopeParams;
-                 }
--                <?php if ($block->isClearEdit()): ?>
-+                <?php if ($block->isClearEdit()) :?>
-                 if (selectedNode) {
-                     url = url + 'id/' + config.parameters.category_id;
-                 }
-                 <?php endif;?>
-                 //updateContent(url); //commented since ajax requests replaced with http ones to load a category
-+                jQuery('#tree-div').find('.x-tree-node-el').first().remove();
-             }
- 
-             jQuery(function () {
-                 categoryLoader = new Ext.tree.TreeLoader({
--                    dataUrl: '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl() ?>'
-+                    dataUrl: '<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl())) ?>'
-                 });
- 
-                 categoryLoader.processResponse = function (response, parent, callback) {
-@@ -388,26 +388,26 @@
-                     enableDD: true,
-                     containerScroll: true,
-                     selModel: new Ext.tree.CheckNodeMultiSelectionModel(),
--                    rootVisible: '<?= /* @escapeNotVerified */ $block->getRoot()->getIsVisible() ?>',
--                    useAjax: <?= /* @escapeNotVerified */ $block->getUseAjax() ?>,
--                    switchTreeUrl: '<?= /* @escapeNotVerified */ $block->getSwitchTreeUrl() ?>',
--                    editUrl: '<?= /* @escapeNotVerified */ $block->getEditUrl() ?>',
--                    currentNodeId: <?= /* @escapeNotVerified */ (int)$block->getCategoryId() ?>,
--                    baseUrl: '<?= /* @escapeNotVerified */ $block->getEditUrl() ?>'
-+                    rootVisible: '<?= (bool)$block->getRoot()->getIsVisible() ?>',
-+                    useAjax: <?= $block->escapeJs($block->getUseAjax()) ?>,
-+                    switchTreeUrl: '<?= $block->escapeJs($block->escapeUrl($block->getSwitchTreeUrl())) ?>',
-+                    editUrl: '<?= $block->escapeJs($block->escapeUrl($block->getEditUrl())) ?>',
-+                    currentNodeId: <?= (int)$block->getCategoryId() ?>,
-+                    baseUrl: '<?= $block->escapeJs($block->escapeUrl($block->getEditUrl())) ?>'
-                 };
- 
-                 defaultLoadTreeParams = {
-                     parameters: {
--                        text: <?= /* @escapeNotVerified */ json_encode(htmlentities($block->getRoot()->getName())) ?>,
-+                        text: <?= /* @noEscape */ json_encode(htmlentities($block->getRoot()->getName())) ?>,
-                         draggable: false,
--                        allowDrop: <?php if ($block->getRoot()->getIsVisible()): ?>true<?php else : ?>false<?php endif; ?>,
-+                        allowDrop: <?php if ($block->getRoot()->getIsVisible()) :?>true<?php else :?>false<?php endif; ?>,
-                         id: <?= (int)$block->getRoot()->getId() ?>,
-                         expanded: <?= (int)$block->getIsWasExpanded() ?>,
-                         store_id: <?= (int)$block->getStore()->getId() ?>,
-                         category_id: <?= (int)$block->getCategoryId() ?>,
-                         parent: <?= (int)$block->getRequest()->getParam('parent') ?>
-                     },
--                    data: <?= /* @escapeNotVerified */ $block->getTreeJson() ?>
-+                    data: <?= /* @noEscape */ $block->getTreeJson() ?>
-                 };
- 
-                 reRenderTree();
-@@ -485,7 +485,7 @@
-                         click: function () {
-                             (function ($) {
-                                 $.ajax({
--                                    url: '<?= /* @escapeNotVerified */ $block->getMoveUrl() ?>',
-+                                    url: '<?= $block->escapeJs($block->escapeUrl($block->getMoveUrl())) ?>',
-                                     method: 'POST',
-                                     data: registry.get('pd'),
-                                     showLoader: true
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
-index dbe66ef1aec..e24d676974b 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
-@@ -3,24 +3,21 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php $_divId = 'tree' . $block->getId() ?>
--<div id="<?= /* @escapeNotVerified */ $_divId ?>" class="tree"></div>
-+<div id="<?= $block->escapeHtmlAttr($_divId) ?>" class="tree"></div>
- <!--[if IE]>
- <script id="ie-deferred-loader" defer="defer" src="//:"></script>
- <![endif]-->
- <script>
- require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){
- 
--var tree<?= /* @escapeNotVerified */ $block->getId() ?>;
-+var tree<?= $block->escapeJs($block->getId()) ?>;
- 
--var useMassaction = <?= /* @escapeNotVerified */ $block->getUseMassaction() ? 1 : 0 ?>;
-+var useMassaction = <?= $block->getUseMassaction() ? 1 : 0 ?>;
- 
--var isAnchorOnly = <?= /* @escapeNotVerified */ $block->getIsAnchorOnly() ? 1 : 0 ?>;
-+var isAnchorOnly = <?= $block->getIsAnchorOnly() ? 1 : 0 ?>;
- 
- Ext.tree.TreePanel.Enhanced = function(el, config)
- {
-@@ -44,8 +41,8 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
-         this.setRootNode(root);
- 
-         if (firstLoad) {
--            <?php if ($block->getNodeClickListener()): ?>
--                this.addListener('click', <?= /* @escapeNotVerified */ $block->getNodeClickListener() ?>.createDelegate(this));
-+            <?php if ($block->getNodeClickListener()) :?>
-+                this.addListener('click', <?= /* @noEscape */ $block->getNodeClickListener() ?>.createDelegate(this));
-             <?php endif; ?>
-         }
- 
-@@ -58,10 +55,10 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
- 
- jQuery(function()
- {
--    var emptyNodeAdded = <?= /* @escapeNotVerified */ ($block->getWithEmptyNode() ? 'false' : 'true') ?>;
-+    var emptyNodeAdded = <?= ($block->getWithEmptyNode() ? 'false' : 'true') ?>;
- 
-     var categoryLoader = new Ext.tree.TreeLoader({
--       dataUrl: '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl() ?>'
-+       dataUrl: '<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl())) ?>'
-     });
- 
-     categoryLoader.buildCategoryTree = function(parent, config)
-@@ -80,7 +77,7 @@ jQuery(function()
-                 // Add empty node to reset category filter
-                 if(!emptyNodeAdded) {
-                     var empty = Object.clone(_node);
--                    empty.text = '<?= /* @escapeNotVerified */ __('None') ?>';
-+                    empty.text = '<?= $block->escapeJs(__('None')) ?>';
-                     empty.children = [];
-                     empty.id = 'none';
-                     empty.path = '1/none';
-@@ -151,25 +148,25 @@ jQuery(function()
-     };
- 
-     categoryLoader.on("beforeload", function(treeLoader, node) {
--        $('<?= /* @escapeNotVerified */ $_divId ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
-+        $('<?= $block->escapeJs($_divId) ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
-         treeLoader.baseParams.id = node.attributes.id;
-     });
- 
--    tree<?= /* @escapeNotVerified */ $block->getId() ?> = new Ext.tree.TreePanel.Enhanced('<?= /* @escapeNotVerified */ $_divId ?>', {
-+    tree<?= $block->escapeJs($block->getId()) ?> = new Ext.tree.TreePanel.Enhanced('<?= $block->escapeJs($_divId) ?>', {
-         animate:          false,
-         loader:           categoryLoader,
-         enableDD:         false,
-         containerScroll:  true,
--        rootVisible:      '<?= /* @escapeNotVerified */ $block->getRoot()->getIsVisible() ?>',
-+        rootVisible:      false,
-         useAjax:          true,
-         currentNodeId:    <?= (int) $block->getCategoryId() ?>,
-         addNodeTo:        false
-     });
- 
-     if (useMassaction) {
--        tree<?= /* @escapeNotVerified */ $block->getId() ?>.on('check', function(node) {
--            $('<?= /* @escapeNotVerified */ $_divId ?>').fire('node:changed', {node:node});
--        }, tree<?= /* @escapeNotVerified */ $block->getId() ?>);
-+        tree<?= $block->escapeJs($block->getId()) ?>.on('check', function(node) {
-+            $('<?= $block->escapeJs($_divId) ?>').fire('node:changed', {node:node});
-+        }, tree<?= $block->escapeJs($block->getId()) ?>);
-     }
- 
-     // set the root node
-@@ -177,11 +174,11 @@ jQuery(function()
-         text:        'Psw',
-         draggable:   false,
-         id:          <?= (int) $block->getRoot()->getId() ?>,
--        expanded:    <?= (int) $block->getIsWasExpanded() ?>,
-+        expanded:    true,
-         category_id: <?= (int) $block->getCategoryId() ?>
-     };
- 
--    tree<?= /* @escapeNotVerified */ $block->getId() ?>.loadTree({parameters:parameters, data:<?= /* @escapeNotVerified */ $block->getTreeJson() ?>},true);
-+    tree<?= $block->escapeJs($block->getId()) ?>.loadTree({parameters:parameters, data:<?= /* @noEscape */ $block->getTreeJson() ?>},true);
- 
- });
- 
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
-index 680361eae44..cbda491a647 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
-@@ -3,19 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
--/**
-- * @see \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
-- */
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+
-+/** @var $block \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element */
- ?>
- <?php
- /* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
- $element = $block->getElement();
--$note = $element->getNote() ? '<div class="note admin__field-note">' . $element->getNote() . '</div>' : '';
-+$note = $element->getNote() ? '<div class="note admin__field-note">' . $block->escapeHtml($element->getNote()) . '</div>' : '';
- $elementBeforeLabel = $element->getExtType() == 'checkbox' || $element->getExtType() == 'radio';
- $addOn = $element->getBeforeElementHtml() || $element->getAfterElementHtml();
- $fieldId = ($element->getHtmlId()) ? ' id="attribute-' . $element->getHtmlId() . '-container"' : '';
-@@ -27,8 +24,8 @@ $fieldClass .= ($element->getRequired()) ? ' required' : '';
- $fieldClass .= ($note) ? ' with-note' : '';
- $fieldClass .= ($entity && $entity->getIsUserDefined()) ? ' user-defined type-' . $entity->getFrontendInput() : '';
- 
--$fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
--    . $block->getUiId('form-field', $element->getId());
-+$fieldAttributes = $fieldId . ' class="' . $block->escapeHtmlAttr($fieldClass) . '" '
-+    . $block->getUiId('form-field', $block->escapeHtmlAttr($element->getId()));
- ?>
- 
- <?php $block->checkFieldDisable() ?>
-@@ -36,38 +33,38 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
-     $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode()
-         : 'toggleValueElements(this, this.parentNode.parentNode.parentNode)';
- ?>
--<?php if (!$element->getNoDisplay()): ?>
--    <?php if ($element->getType() == 'hidden'): ?>
-+<?php if (!$element->getNoDisplay()) :?>
-+    <?php if ($element->getType() == 'hidden') :?>
-         <?= $element->getElementHtml() ?>
--    <?php else: ?>
--    <div<?= /* @escapeNotVerified */ $fieldAttributes ?> data-attribute-code="<?= $element->getHtmlId() ?>"
--        data-apply-to="<?= $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
-+    <?php else :?>
-+    <div<?= /* @noEscape */ $fieldAttributes ?> data-attribute-code="<?= $element->getHtmlId() ?>"
-+        data-apply-to="<?= $block->escapeHtmlAttr($this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode(
-             $element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : []
-         ))?>"
-         >
--        <?php if ($elementBeforeLabel): ?>
-+        <?php if ($elementBeforeLabel) :?>
-             <?= $block->getElementHtml() ?>
-             <?= $element->getLabelHtml('', $block->getScopeLabel()) ?>
--            <?= /* @escapeNotVerified */ $note ?>
--        <?php else: ?>
-+            <?= /* @noEscape */ $note ?>
-+        <?php else :?>
-             <?= $element->getLabelHtml('', $block->getScopeLabel()) ?>
-             <div class="admin__field-control control">
--                <?= /* @escapeNotVerified */ ($addOn) ? '<div class="addon">' . $block->getElementHtml() . '</div>' : $block->getElementHtml() ?>
--                <?= /* @escapeNotVerified */ $note ?>
-+                <?= ($addOn) ? '<div class="addon">' . $block->getElementHtml() . '</div>' : $block->getElementHtml() ?>
-+                <?= /* @noEscape */ $note ?>
-             </div>
-         <?php endif; ?>
-         <div class="field-service">
--            <?php if ($block->canDisplayUseDefault()): ?>
-+            <?php if ($block->canDisplayUseDefault()) :?>
-                 <label for="<?= $element->getHtmlId() ?>_default" class="choice use-default">
--                    <input <?php if ($element->getReadonly()):?> disabled="disabled"<?php endif; ?>
-+                    <input <?php if ($element->getReadonly()) :?> disabled="disabled"<?php endif; ?>
-                             type="checkbox"
-                             name="use_default[]"
-                             class="use-default-control"
-                             id="<?= $element->getHtmlId() ?>_default"
--                            <?php if ($block->usedDefault()): ?> checked="checked"<?php endif; ?>
--                            onclick="<?= /* @escapeNotVerified */ $elementToggleCode ?>"
--                            value="<?= /* @escapeNotVerified */ $block->getAttributeCode() ?>"/>
--                    <span class="use-default-label"><?= /* @escapeNotVerified */ __('Use Default Value') ?></span>
-+                            <?php if ($block->usedDefault()) :?> checked="checked"<?php endif; ?>
-+                            onclick="<?= $block->escapeHtmlAttr($elementToggleCode) ?>"
-+                            value="<?= $block->escapeHtmlAttr($block->getAttributeCode()) ?>"/>
-+                    <span class="use-default-label"><?= $block->escapeHtml(__('Use Default Value')) ?></span>
-                 </label>
-             <?php endif; ?>
-         </div>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml
-index ce4d8450f5e..9b9fff2cfc3 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
-index 74cf8f5f3a7..e30b981ff36 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
-@@ -4,16 +4,14 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-  * @var $block \Magento\Backend\Block\Widget\Form\Container
-  */
- ?>
--<?= /* @escapeNotVerified */ $block->getFormInitScripts() ?>
--<div data-mage-init='{"floatingHeader": {}}' class="page-actions attribute-popup-actions" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>>
-+<?= /* @noEscape */ $block->getFormInitScripts() ?>
-+<div data-mage-init='{"floatingHeader": {}}' class="page-actions attribute-popup-actions" <?= /* @noEscape */ $block->getUiId('content-header') ?>>
-     <?= $block->getButtonsHtml('header') ?>
- </div>
- 
-@@ -21,13 +19,13 @@
-     <input name="form_key" type="hidden" value="<?= $block->escapeHtml($block->getFormKey()) ?>" />
-     <?= $block->getChildHtml('form') ?>
- </form>
--
--
--<script>
--require(['jquery', "mage/mage"], function(jQuery){
--
--    jQuery('#edit_form').mage('form').mage('validation', {validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'});
--
--});
-+<script type="text/x-magento-init">
-+    {
-+        "#edit_form": {
-+            "Magento_Catalog/catalog/product/edit/attribute": {
-+                "validationUrl": "<?= $block->escapeJs($block->escapeUrl($block->getValidationUrl())) ?>"
-+            }
-+        }
-+    }
- </script>
--<?= /* @escapeNotVerified */ $block->getFormScripts() ?>
-+<?= /* @noEscape */ $block->getFormScripts() ?>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
-index 8a5f1919f78..f020eddc35d 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
-@@ -4,17 +4,17 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <script>
- require([
-     "jquery",
-     'Magento_Ui/js/modal/alert',
-     'Magento_Ui/js/modal/prompt',
-+    'uiRegistry',
-     "collapsable",
-     "prototype"
--], function(jQuery, alert, prompt){
-+], function(jQuery, alert, prompt, registry){
- 
- function toggleApplyVisibility(select) {
-     if ($(select).value == 1) {
-@@ -40,13 +40,21 @@ function getFrontTab() {
- 
- function checkOptionsPanelVisibility(){
-     if($('manage-options-panel')){
--        var panel = $('manage-options-panel').up('.fieldset');
-+        var panelId = 'manage-options-panel',
-+            panel = $(panelId),
-+            panelFieldSet = panel.up('.fieldset'),
-+            activePanelClass = 'selected-type-options';
- 
-         if($('frontend_input') && ($('frontend_input').value=='select' || $('frontend_input').value=='multiselect')){
--            panel.show();
-+            panelFieldSet.show();
-+            jQuery(panel).addClass(activePanelClass);
-+            registry.get(panelId, function () {
-+                jQuery('#' + panelId).trigger('render');
-+            });
-         }
-         else {
--            panel.hide();
-+            panelFieldSet.hide();
-+            jQuery(panel).removeClass(activePanelClass);
-         }
-     }
- }
-@@ -55,7 +63,7 @@ function bindAttributeInputType()
- {
-     checkOptionsPanelVisibility();
-     switchDefaultValueField();
--    if($('frontend_input') && ($('frontend_input').value=='select' || $('frontend_input').value=='multiselect' || $('frontend_input').value=='price')){
-+    if($('frontend_input') && ($('frontend_input').value=='boolean' || $('frontend_input').value=='select' || $('frontend_input').value=='multiselect' || $('frontend_input').value=='price')){
-         if($('is_filterable') && !$('is_filterable').getAttribute('readonly')){
-             $('is_filterable').disabled = false;
-         }
-@@ -194,22 +202,22 @@ function switchDefaultValueField()
-             setRowVisibility('frontend_class', false);
-         break;
- 
--        <?php foreach ($this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields() as $type => $fields): ?>
--            case '<?= /* @escapeNotVerified */ $type ?>':
-+        <?php foreach ($this->helper(Magento\Catalog\Helper\Data::class)->getAttributeHiddenFields() as $type => $fields) :?>
-+            case '<?= $block->escapeJs($type) ?>':
-                 var isFrontTabHidden = false;
--                <?php foreach ($fields as $one): ?>
--                    <?php if ($one == '_front_fieldset'): ?>
-+                <?php foreach ($fields as $one) :?>
-+                    <?php if ($one == '_front_fieldset') :?>
-                         getFrontTab().hide();
-                         isFrontTabHidden = true;
--                    <?php elseif ($one == '_default_value'): ?>
-+                    <?php elseif ($one == '_default_value') :?>
-                         defaultValueTextVisibility =
-                         defaultValueTextareaVisibility =
-                         defaultValueDateVisibility =
-                         defaultValueYesnoVisibility = false;
--                    <?php elseif ($one == '_scope'): ?>
-+                    <?php elseif ($one == '_scope') :?>
-                         scopeVisibility = false;
--                    <?php else: ?>
--                        setRowVisibility('<?= /* @escapeNotVerified */ $one ?>', false);
-+                    <?php else :?>
-+                        setRowVisibility('<?= $block->escapeJs($one) ?>', false);
-                     <?php endif; ?>
-                 <?php endforeach; ?>
- 
-@@ -331,7 +339,7 @@ if ($('is_required')) {
- 
- jQuery(function($) {
-     bindAttributeInputType();
--    // @todo: refactor collapsable component
-+    // @todo: refactor collapsible component
-     $('.attribute-popup .collapse, [data-role="advanced_fieldset-content"]')
-         .collapsable()
-         .collapse('hide');
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
-index f3d39257c26..1d5d251f00d 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
-@@ -4,15 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Labels  */
- ?>
- 
- <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="manage-titles-wrapper">
-     <div class="fieldset-wrapper-title">
-         <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#manage-titles-content">
--            <span><?= /* @escapeNotVerified */ __('Manage Titles (Size, Color, etc.)') ?></span>
-+            <span><?= $block->escapeHtml(__('Manage Titles (Size, Color, etc.)')) ?></span>
-         </strong>
-     </div>
-     <div class="fieldset-wrapper-content in collapse" id="manage-titles-content">
-@@ -21,17 +19,23 @@
-                 <table class="admin__control-table" id="attribute-labels-table">
-                     <thead>
-                     <tr>
--                        <?php foreach ($block->getStores() as $_store): ?>
--                            <th class="col-store-view"><?= /* @escapeNotVerified */ $_store->getName() ?></th>
-+                        <?php foreach ($block->getStores() as $_store) :?>
-+                            <th class="col-store-view"><?= $block->escapeHtml($_store->getName()) ?></th>
-                         <?php endforeach; ?>
-                     </tr>
-                     </thead>
-                     <tbody>
-                     <tr>
-                         <?php $_labels = $block->getLabelValues() ?>
--                        <?php foreach ($block->getStores() as $_store): ?>
-+                        <?php foreach ($block->getStores() as $_store) :?>
-                             <td class="col-store-view">
--                                <input class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?= /* @escapeNotVerified */ $_store->getId() ?>]" value="<?= $block->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($block->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
-+                                <input class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) :?> required-option<?php endif; ?>"
-+                                       type="text"
-+                                       name="frontend_label[<?= $block->escapeHtmlAttr($_store->getId()) ?>]"
-+                                       value="<?= $block->escapeHtmlAttr($_labels[$_store->getId()]) ?>"
-+                                    <?php if ($block->getReadOnly()) :?>
-+                                        disabled="disabled"
-+                                    <?php endif;?>/>
-                             </td>
-                         <?php endforeach; ?>
-                     </tr>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
-index f812a27f87a..e5f8a360c33 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options */
- 
- $stores = $block->getStoresSortedBySortOrder();
-@@ -23,8 +21,8 @@ $stores = $block->getStoresSortedBySortOrder();
-                         <span><?= $block->escapeHtml(__('Is Default')) ?></span>
-                     </th>
-                     <?php
--                    foreach ($stores as $_store): ?>
--                        <th<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> class="_required"<?php endif; ?>>
-+                    foreach ($stores as $_store) :?>
-+                        <th<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) :?> class="_required"<?php endif; ?>>
-                             <span><?= $block->escapeHtml(__($_store->getName())) ?></span>
-                         </th>
-                     <?php endforeach;
-@@ -43,7 +41,7 @@ $stores = $block->getStoresSortedBySortOrder();
-             </tr>
-             <tr>
-                 <th colspan="<?= (int) $storetotal ?>" class="col-actions-add">
--                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-+                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) :?>
-                         <button id="add_new_option_button" data-action="add_new_row"
-                                 title="<?= $block->escapeHtml(__('Add Option')) ?>"
-                                 type="button" class="action- scalable add">
-@@ -59,22 +57,22 @@ $stores = $block->getStoresSortedBySortOrder();
-     <script id="row-template" type="text/x-magento-template">
-         <tr <% if (data.rowClasses) { %>class="<%- data.rowClasses %>"<% } %>>
-             <td class="col-draggable">
--                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
-+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) :?>
-                     <div data-role="draggable-handle" class="draggable-handle"
-                          title="<?= $block->escapeHtml(__('Sort Option')) ?>">
-                     </div>
-                 <?php endif; ?>
--                <input data-role="order" type="hidden" name="option[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>/>
-+                <input data-role="order" type="hidden" name="option[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) :?> disabled="disabled"<?php endif; ?>/>
-             </td>
-             <td class="col-default control-table-actions-cell">
--                <input class="input-radio" type="<%- data.intype %>" name="default[]" value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
-+                <input class="input-radio" type="<%- data.intype %>" name="default[]" value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()) :?>disabled="disabled"<?php endif;?>/>
-             </td>
--            <?php foreach ($stores as $_store): ?>
--            <td class="col-<%- data.id %>"><input name="option[value][<%- data.id %>][<?= (int) $_store->getId() ?>]" value="<%- data.store<?= /* @noEscape */ (int) $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/></td>
-+            <?php foreach ($stores as $_store) :?>
-+            <td class="col-<%- data.id %>"><input name="option[value][<%- data.id %>][<?= (int) $_store->getId() ?>]" value="<%- data.store<?= /* @noEscape */ (int) $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) :?> required-option required-unique<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) :?> disabled="disabled"<?php endif;?>/></td>
-             <?php endforeach; ?>
-             <td id="delete_button_container_<%- data.id %>" class="col-delete">
-                 <input type="hidden" class="delete-flag" name="option[delete][<%- data.id %>]" value="" />
--                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) :?>
-                     <button id="delete_button_<%- data.id %>" title="<?= $block->escapeHtml(__('Delete')) ?>" type="button"
-                         class="action- scalable delete delete-option"
-                         >
-@@ -86,9 +84,9 @@ $stores = $block->getStoresSortedBySortOrder();
-     </script>
-     <?php
-     $values = [];
--    foreach($block->getOptionValues() as $value) {
-+    foreach ($block->getOptionValues() as $value) {
-         $value = $value->getData();
--        $values[] = is_array($value) ? array_map(function($str) {
-+        $values[] = is_array($value) ? array_map(function ($str) {
-             return htmlspecialchars_decode($str, ENT_QUOTES);
-         }, $value) : $value;
-     }
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
-index 54b945b48c1..dd1009cc5e0 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main */
- ?>
- <div class="attribute-set">
- 
-@@ -31,11 +30,11 @@
-     </div>
-     <div class="attribute-set-col fieldset-wrapper">
-         <div class="fieldset-wrapper-title">
--            <span class="title"><?= /* @escapeNotVerified */ __('Groups') ?></span>
-+            <span class="title"><?= $block->escapeHtml(__('Groups')) ?></span>
-         </div>
--        <?php if (!$block->getIsReadOnly()): ?>
--            <?= /* @escapeNotVerified */ $block->getAddGroupButton() ?>&nbsp;<?= /* @escapeNotVerified */ $block->getDeleteGroupButton() ?>
--            <p class="note-block"><?= /* @escapeNotVerified */ __('Double click on a group to rename it.') ?></p>
-+        <?php if (!$block->getIsReadOnly()) :?>
-+            <?= /* @noEscape */ $block->getAddGroupButton() ?>&nbsp;<?= /* @noEscape */ $block->getDeleteGroupButton() ?>
-+            <p class="note-block"><?= $block->escapeHtml(__('Double click on a group to rename it.')) ?></p>
-         <?php endif; ?>
- 
-         <?= $block->getSetsFilterHtml() ?>
-@@ -43,7 +42,7 @@
-     </div>
-     <div class="attribute-set-col fieldset-wrapper">
-         <div class="fieldset-wrapper-title">
--            <span class="title"><?= /* @escapeNotVerified */ __('Unassigned Attributes') ?></span>
-+            <span class="title"><?= $block->escapeHtml(__('Unassigned Attributes')) ?></span>
-         </div>
-         <div id="tree-div2" class="attribute-set-tree"></div>
-         <script id="ie-deferred-loader" defer="defer" src="//:"></script>
-@@ -58,8 +57,8 @@
-                 ], function(jQuery, prompt, alert){
- 
-                 //<![CDATA[
--                var allowDragAndDrop = <?= /* @escapeNotVerified */ ($block->getIsReadOnly() ? 'false' : 'true') ?>;
--                var canEditGroups = <?= /* @escapeNotVerified */ ($block->getIsReadOnly() ? 'false' : 'true') ?>;
-+                var allowDragAndDrop = <?= ($block->getIsReadOnly() ? 'false' : 'true') ?>;
-+                var canEditGroups = <?=  ($block->getIsReadOnly() ? 'false' : 'true') ?>;
- 
-                 var TreePanels = function() {
-                     // shorthand
-@@ -80,13 +79,13 @@
-                             // set the root node
-                             this.root = new Ext.tree.TreeNode({
-                                 text: 'ROOT',
--                                allowDrug:false,
-+                                allowDrag:false,
-                                 allowDrop:true,
-                                 id:'1'
-                             });
- 
-                             tree.setRootNode(this.root);
--                            buildCategoryTree(this.root, <?= /* @escapeNotVerified */ $block->getGroupTreeJson() ?>);
-+                            buildCategoryTree(this.root, <?= /* @noEscape */ $block->getGroupTreeJson() ?>);
-                             // render the tree
-                             tree.render();
-                             this.root.expand(false, false);
-@@ -94,7 +93,7 @@
- 
-                             this.ge = new Ext.tree.TreeEditor(tree, {
-                                 allowBlank:false,
--                                blankText:'<?= /* @escapeNotVerified */ __('A name is required.') ?>',
-+                                blankText:'<?= $block->escapeJs(__('A name is required.')) ?>',
-                                 selectOnFocus:true,
-                                 cls:'folder'
-                             });
-@@ -125,7 +124,7 @@
-                                 id:'free'
-                             });
-                             tree2.setRootNode(this.root2);
--                            buildCategoryTree(this.root2, <?= /* @escapeNotVerified */ $block->getAttributeTreeJson() ?>);
-+                            buildCategoryTree(this.root2, <?= /* @noEscape */ $block->getAttributeTreeJson() ?>);
- 
-                             this.root2.addListener('beforeinsert', editSet.rightBeforeInsert);
-                             this.root2.addListener('beforeappend', editSet.rightBeforeAppend);
-@@ -188,20 +187,36 @@
-                                 for( j in config[i].children ) {
-                                     if(config[i].children[j].id) {
-                                         newNode = new Ext.tree.TreeNode(config[i].children[j]);
--                                        node.appendChild(newNode);
--                                        newNode.addListener('click', editSet.unregister);
-+
-+                                        if (typeof newNode.ui.onTextChange === 'function') {
-+                                            newNode.ui.onTextChange = function (_3, _4, _5) {
-+                                                if (this.rendered) {
-+                                                    this.textNode.innerText = _4;
-+                                                }
-+                                            }
-+                                        }
-                                     }
-+                                    node.appendChild(newNode);
-+                                    newNode.addListener('click', editSet.unregister);
-                                 }
-                             }
-                         }
-                     }
-                 }
- 
--                editSet = function() {
--                    return {
--                        register : function(node) {
--                            editSet.currentNode = node;
--                        },
-+
-+                    editSet = function () {
-+                        return {
-+                            register: function (node) {
-+                                editSet.currentNode = node;
-+                                if (typeof node.ui.onTextChange === 'function') {
-+                                    node.ui.onTextChange = function (_3, _4, _5) {
-+                                        if (this.rendered) {
-+                                            this.textNode.innerText = _4;
-+                                        }
-+                                    }
-+                                }
-+                            },
- 
-                         unregister : function() {
-                             editSet.currentNode = false;
-@@ -264,8 +279,8 @@
- 
-                         addGroup : function() {
-                             prompt({
--                                title: "<?= /* @escapeNotVerified */ __('Add New Group') ?>",
--                                content: "<?= /* @escapeNotVerified */ __('Please enter a new group name.') ?>",
-+                                title: "<?= $block->escapeJs($block->escapeHtml(__('Add New Group'))) ?>",
-+                                content: "<?= $block->escapeJs($block->escapeHtml(__('Please enter a new group name.'))) ?>",
-                                 value: "",
-                                 validation: true,
-                                 validationRules: ['required-entry'],
-@@ -293,6 +308,14 @@
-                                             allowDrag : true
-                                         });
- 
-+                                        if (typeof newNode.ui.onTextChange === 'function') {
-+                                            newNode.ui.onTextChange = function (_3, _4, _5) {
-+                                                if (this.rendered) {
-+                                                    this.textNode.innerText = _4;
-+                                                }
-+                                            }
-+                                        }
-+
-                                         TreePanels.root.appendChild(newNode);
-                                         newNode.addListener('beforemove', editSet.groupBeforeMove);
-                                         newNode.addListener('beforeinsert', editSet.groupBeforeInsert);
-@@ -322,7 +345,7 @@
-                             }
-                             for (var i=0; i < TreePanels.root.childNodes.length; i++) {
-                                 if (TreePanels.root.childNodes[i].text.toLowerCase() == name.toLowerCase() && TreePanels.root.childNodes[i].id != exceptNodeId) {
--                                    errorText = '<?= /* @escapeNotVerified */ __('An attribute group named "/name/" already exists.') ?>';
-+                                    errorText = '<?= $block->escapeJs(__('An attribute group named "/name/" already exists.')) ?>';
-                                     alert({
-                                         content: errorText.replace("/name/",name)
-                                     });
-@@ -350,7 +373,7 @@
-                                 editSet.req.form_key = FORM_KEY;
-                             }
-                             var req = {data : Ext.util.JSON.encode(editSet.req)};
--                            var con = new Ext.lib.Ajax.request('POST', '<?= /* @escapeNotVerified */ $block->getMoveUrl() ?>', {success:editSet.success,failure:editSet.failure}, req);
-+                            var con = new Ext.lib.Ajax.request('POST', '<?= $block->escapeJs($block->escapeUrl($block->getMoveUrl())) ?>', {success:editSet.success,failure:editSet.failure}, req);
-                         },
- 
-                         success : function(o) {
-@@ -425,7 +448,7 @@
-                         rightRemove : function(tree, nodeThis, node) {
-                             if( nodeThis.firstChild == null && node.id != 'empty' ) {
-                                 var newNode = new Ext.tree.TreeNode({
--                                    text : '<?= /* @escapeNotVerified */ __('Empty') ?>',
-+                                    text : '<?= $block->escapeJs(__('Empty')) ?>',
-                                     id : 'empty',
-                                     cls : 'folder',
-                                     is_user_defined : 1,
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/attribute.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/attribute.phtml
-index 223b3e9888e..75f04eae821 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/attribute.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/attribute.phtml
-@@ -2,4 +2,4 @@
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-- */;
-+ */
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml
-index c1af14389fe..227ed4be81f 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml
-@@ -8,7 +8,7 @@
- <script>
- require(['jquery', "mage/mage"], function(jQuery){
- 
--    jQuery('#<?= /* @escapeNotVerified */ $block->getFormId() ?>').mage('form').mage('validation');
-+    jQuery('#<?= $block->escapeJs($block->getFormId()) ?>').mage('form').mage('validation');
- 
- });
- </script>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml
-index 902c6932f0a..c0928f4723b 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml('grid') ?>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
-index 75027d5e043..32466a1dfa9 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
-@@ -3,10 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-- ?>
-+?>
- <div id="product_composite_configure" class="product-configure-popup" style="display:none;">
-     <iframe name="product_composite_configure_iframe" id="product_composite_configure_iframe" style="width:0; height:0; border:0px solid #fff; position:absolute; top:-1000px; left:-1000px" onload="window.productConfigure && productConfigure.onLoadIFrame()"></iframe>
-     <form action="" method="post" id="product_composite_configure_form" enctype="multipart/form-data" onsubmit="productConfigure.onConfirmBtn(); return false;" target="product_composite_configure_iframe">
-@@ -19,7 +16,7 @@
-             <div id="product_composite_configure_form_confirmed" style="display:none;"></div>
-         </div>
-         <input type="hidden" name="as_js_varname" value="iFrameResponse" />
--        <input type="hidden" name="form_key" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
-+        <input type="hidden" name="form_key" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
-     </form>
-     <div id="product_composite_configure_confirmed" style="display:none;"></div>
- 
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
-index acc80fa6ea6..6a83ece3304 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
-@@ -3,24 +3,22 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options */ ?>
- <?php $options = $block->decorateArray($block->getOptions()); ?>
--<?php if (count($options)): ?>
-+<?php if (count($options)) :?>
- 
--<?= $block->getChildHtml('options_js') ?>
-+    <?= $block->getChildHtml('options_js') ?>
- 
--<fieldset id="product_composite_configure_fields_options" class="fieldset admin__fieldset <?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
--    <legend class="legend admin__legend">
--        <span><?= /* @escapeNotVerified */ __('Custom Options') ?></span>
--    </legend><br>
--    <?php foreach ($options as $option): ?>
--        <?= $block->getOptionHtml($option) ?>
--    <?php endforeach;?>
--</fieldset>
-+    <fieldset id="product_composite_configure_fields_options"
-+              class="fieldset admin__fieldset <?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
-+        <legend class="legend admin__legend">
-+            <span><?= $block->escapeHtml(__('Custom Options')) ?></span>
-+        </legend><br>
-+        <?php foreach ($options as $option) :?>
-+            <?= $block->getOptionHtml($option) ?>
-+        <?php endforeach;?>
-+    </fieldset>
- 
- <?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
-index 30c05c2ec68..8adffb75218 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
-@@ -3,82 +3,82 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */ ?>
- <?php $_option = $block->getOption(); ?>
--<?php $_optionId = $_option->getId(); ?>
--<div class="admin__field field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
--  <label class="label admin__field-label">
--      <?= $block->escapeHtml($_option->getTitle()) ?>
--      <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
--  </label>
--  <div class="admin__field-control control">
-+<?php $_optionId = (int)$_option->getId(); ?>
-+<div class="admin__field field<?= $_option->getIsRequire() ? ' required _required' : '' ?>">
-+    <label class="label admin__field-label">
-+        <?= $block->escapeHtml($_option->getTitle()) ?>
-+        <?= /* @noEscape */ $block->getFormattedPrice() ?>
-+    </label>
-+    <div class="admin__field-control control">
- 
--  <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
--      || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE): ?>
-+        <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
-+            || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE) :?>
- 
--      <?= $block->getDateHtml() ?>
-+            <?= $block->getDateHtml() ?>
- 
--      <?php if (!$block->useCalendar()): ?>
--      <script>
--require([
--  "prototype",
--  "Magento_Catalog/catalog/product/composite/configure"
--], function(){
-+            <?php if (!$block->useCalendar()) :?>
-+                <script>
-+                    require([
-+                        "prototype",
-+                        "Magento_Catalog/catalog/product/composite/configure"
-+                    ], function(){
- 
--      window.dateOption = productConfigure.opConfig.dateOption;
--      Event.observe('options_<?= /* @escapeNotVerified */ $_optionId ?>_month', 'change', dateOption.reloadMonth.bind(dateOption));
--      Event.observe('options_<?= /* @escapeNotVerified */ $_optionId ?>_year', 'change', dateOption.reloadMonth.bind(dateOption));      
--});
--</script>
--      <?php endif; ?>
-+                        window.dateOption = productConfigure.opConfig.dateOption;
-+                        Event.observe('options_<?= /* @noEscape */ $_optionId ?>_month', 'change', dateOption.reloadMonth.bind(dateOption));
-+                        Event.observe('options_<?= /* @noEscape */ $_optionId ?>_year', 'change', dateOption.reloadMonth.bind(dateOption));
-+                    });
-+                </script>
-+            <?php endif; ?>
- 
--  <?php endif; ?>
-+        <?php endif; ?>
- 
--  <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
--      || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_TIME): ?>
--      <span class="time-picker"><?= $block->getTimeHtml() ?></span>
--  <?php endif; ?>
-+        <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
-+            || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_TIME) :?>
-+            <span class="time-picker"><?= $block->getTimeHtml() ?></span>
-+        <?php endif; ?>
- 
--    <input type="hidden" name="validate_datetime_<?= /* @escapeNotVerified */ $_optionId ?>" class="validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>" value="" />
--    <script>
--require([
--  "jquery",
--  "mage/backend/validation"
--], function(jQuery){
-+        <input type="hidden"
-+               name="validate_datetime_<?= /* @noEscape */ $_optionId ?>"
-+               class="validate-datetime-<?= /* @noEscape */ $_optionId ?>"
-+               value="" />
-+        <script>
-+            require([
-+                "jquery",
-+                "mage/backend/validation"
-+            ], function(jQuery){
- 
--    //<![CDATA[
--<?php if ($_option->getIsRequire()): ?>
--        jQuery.validator.addMethod('validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>', function(v) {
--            var dateTimeParts = jQuery('.datetime-picker[id^="options_<?= /* @escapeNotVerified */ $_optionId ?>"]');
--            for (var i=0; i < dateTimeParts.length; i++) {
--                if (dateTimeParts[i].value == "") return false;
--            }
--            return true;
--        }, '<?= $block->escapeJs(__('This is a required option.')) ?>');
--<?php else: ?>
--        jQuery.validator.addMethod('validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>', function(v) {
--            var dateTimeParts = jQuery('.datetime-picker[id^="options_<?= /* @escapeNotVerified */ $_optionId ?>"]');
--            var hasWithValue = false, hasWithNoValue = false;
--            var pattern = /day_part$/i;
--            for (var i=0; i < dateTimeParts.length; i++) {
--                if (! pattern.test(dateTimeParts[i].id)) {
--                    if (dateTimeParts[i].value === "") {
--                        hasWithValue = true;
--                    } else {
--                        hasWithNoValue = true;
-+                //<![CDATA[
-+                <?php if ($_option->getIsRequire()) :?>
-+                jQuery.validator.addMethod('validate-datetime-<?= /* @noEscape */ $_optionId ?>', function(v) {
-+                    var dateTimeParts = jQuery('.datetime-picker[id^="options_<?= /* @noEscape */ $_optionId ?>"]');
-+                    for (var i=0; i < dateTimeParts.length; i++) {
-+                        if (dateTimeParts[i].value == "") return false;
-                     }
--                }
--            }
--            return hasWithValue ^ hasWithNoValue;
--        }, '<?= $block->escapeJs(__('The field isn\'t complete.')) ?>');
--<?php endif; ?>
--    //]]>
--    
--});
--</script>
--  </div>
-+                    return true;
-+                }, '<?= $block->escapeJs(__('This is a required option.')) ?>');
-+                <?php else :?>
-+                jQuery.validator.addMethod('validate-datetime-<?= /* @noEscape */ $_optionId ?>', function(v) {
-+                    var dateTimeParts = jQuery('.datetime-picker[id^="options_<?= /* @noEscape */ $_optionId ?>"]');
-+                    var hasWithValue = false, hasWithNoValue = false;
-+                    var pattern = /day_part$/i;
-+                    for (var i=0; i < dateTimeParts.length; i++) {
-+                        if (! pattern.test(dateTimeParts[i].id)) {
-+                            if (dateTimeParts[i].value === "") {
-+                                hasWithValue = true;
-+                            } else {
-+                                hasWithNoValue = true;
-+                            }
-+                        }
-+                    }
-+                    return hasWithValue ^ hasWithNoValue;
-+                }, '<?= $block->escapeJs(__('The field isn\'t complete.')) ?>');
-+                <?php endif; ?>
-+                //]]>
-+
-+            });
-+        </script>
-+    </div>
- </div>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
-index 4ad7a95c919..da0b3b36d56 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
-@@ -3,15 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */ ?>
- <?php $_option = $block->getOption(); ?>
- <?php $_fileInfo = $block->getFileInfo(); ?>
- <?php $_fileExists = $_fileInfo->hasData() ? true : false; ?>
--<?php $_fileName = 'options_' . $_option->getId() . '_file'; ?>
-+<?php $_fileName = 'options_' . (int)$_option->getId() . '_file'; ?>
- <?php $_fieldNameAction = $_fileName . '_action'; ?>
- <?php $_fieldValueAction = $_fileExists ? 'save_old' : 'save_new'; ?>
- <?php $_fileNamed = $_fileName . '_name'; ?>
-@@ -21,11 +18,11 @@
- require(['prototype'], function(){
- 
- //<![CDATA[
--    opFile<?= /* @escapeNotVerified */ $_rand ?> = {
-+    opFile<?= /* @noEscape */ $_rand ?> = {
-         initializeFile: function(inputBox) {
--            this.inputFile = inputBox.select('input[name="<?= /* @escapeNotVerified */ $_fileName ?>"]')[0];
--            this.inputFileAction = inputBox.select('input[name="<?= /* @escapeNotVerified */ $_fieldNameAction ?>"]')[0];
--            this.fileNameBox = inputBox.up('dd').select('.<?= /* @escapeNotVerified */ $_fileNamed ?>')[0];
-+            this.inputFile = inputBox.select('input[name="<?= /* @noEscape */ $_fileName ?>"]')[0];
-+            this.inputFileAction = inputBox.select('input[name="<?= /* @noEscape */ $_fieldNameAction ?>"]')[0];
-+            this.fileNameBox = inputBox.up('dd').select('.<?= /* @noEscape */ $_fileNamed ?>')[0];
-         },
- 
-         toggleFileChange: function(inputBox) {
-@@ -62,42 +59,42 @@ require(['prototype'], function(){
- });
- </script>
- 
--<div class="admin__field <?php if ($_option->getIsRequire()) echo ' required _required' ?>">
-+<div class="admin__field <?= $_option->getIsRequire() ? ' required _required' : '' ?>">
-     <label class="admin__field-label label">
-         <?= $block->escapeHtml($_option->getTitle()) ?>
--        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
-+        <?= /* @noEscape */ $block->getFormattedPrice() ?>
-     </label>
-     <div class="admin__field-control control">
--        <?php if ($_fileExists): ?>
-+        <?php if ($_fileExists) :?>
-             <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $block->escapeHtml($_fileInfo->getTitle()) ?></span>
--            <a href="javascript:void(0)" class="label" onclick="opFile<?= /* @escapeNotVerified */ $_rand ?>.toggleFileChange($(this).next('.input-box'))">
--                <?= /* @escapeNotVerified */ __('Change') ?>
-+            <a href="javascript:void(0)" class="label" onclick="opFile<?= /* @noEscape */ $_rand ?>.toggleFileChange($(this).next('.input-box'))">
-+                <?= $block->escapeHtml(__('Change')) ?>
-             </a>&nbsp;
--            <?php if (!$_option->getIsRequire()): ?>
--                <input type="checkbox" onclick="opFile<?= /* @escapeNotVerified */ $_rand ?>.toggleFileDelete($(this), $(this).next('.input-box'))" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_option->getPrice(true)) ?>"/>
--                <span class="label"><?= /* @escapeNotVerified */ __('Delete') ?></span>
-+            <?php if (!$_option->getIsRequire()) :?>
-+                <input type="checkbox" onclick="opFile<?= /* @noEscape */ $_rand ?>.toggleFileDelete($(this), $(this).next('.input-box'))" price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>"/>
-+                <span class="label"><?= $block->escapeHtml(__('Delete')) ?></span>
-             <?php endif; ?>
-         <?php endif; ?>
-         <div class="input-box" <?= $_fileExists ? 'style="display:none"' : '' ?>>
-             <!-- ToDo UI: add appropriate file class when z-index issue in ui dialog will be resolved  -->
--            <input type="file" name="<?= /* @noEscape */ $_fileName ?>" class="product-custom-option<?= $_option->getIsRequire() ? ' required-entry' : '' ?>" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_option->getPrice(true)) ?>" <?= $_fileExists ? 'disabled="disabled"' : '' ?>/>
--            <input type="hidden" name="<?= /* @escapeNotVerified */ $_fieldNameAction ?>" value="<?= /* @escapeNotVerified */ $_fieldValueAction ?>" />
-+            <input type="file" name="<?= /* @noEscape */ $_fileName ?>" class="product-custom-option<?= $_option->getIsRequire() ? ' required-entry' : '' ?>" price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>" <?= $_fileExists ? 'disabled="disabled"' : '' ?>/>
-+            <input type="hidden" name="<?= /* @noEscape */ $_fieldNameAction ?>" value="<?= /* @noEscape */ $_fieldValueAction ?>" />
- 
--            <?php if ($_option->getFileExtension()): ?>
-+            <?php if ($_option->getFileExtension()) :?>
-                 <div class="admin__field-note">
--                    <span><?= /* @escapeNotVerified */ __('Compatible file extensions to upload') ?>: <strong><?= /* @escapeNotVerified */ $_option->getFileExtension() ?></strong></span>
-+                    <span><?= $block->escapeHtml(__('Compatible file extensions to upload')) ?>: <strong><?= $block->escapeHtml($_option->getFileExtension()) ?></strong></span>
-                 </div>
-             <?php endif; ?>
- 
--            <?php if ($_option->getImageSizeX() > 0): ?>
-+            <?php if ($_option->getImageSizeX() > 0) :?>
-                 <div class="admin__field-note">
--                    <span><?= /* @escapeNotVerified */ __('Maximum image width') ?>: <strong><?= /* @escapeNotVerified */ $_option->getImageSizeX() ?> <?= /* @escapeNotVerified */ __('px.') ?></strong></span>
-+                    <span><?= $block->escapeHtml(__('Maximum image width')) ?>: <strong><?= (int)$_option->getImageSizeX() ?> <?= $block->escapeHtml(__('px.')) ?></strong></span>
-                 </div>
-             <?php endif; ?>
- 
--            <?php if ($_option->getImageSizeY() > 0): ?>
-+            <?php if ($_option->getImageSizeY() > 0) :?>
-                 <div class="admin__field-note">
--                    <span><?= /* @escapeNotVerified */ __('Maximum image height') ?>: <strong><?= /* @escapeNotVerified */ $_option->getImageSizeY() ?> <?= /* @escapeNotVerified */ __('px.') ?></strong></span>
-+                    <span><?= $block->escapeHtml(__('Maximum image height')) ?>: <strong><?= (int)$_option->getImageSizeY() ?> <?= $block->escapeHtml(__('px.')) ?></strong></span>
-                 </div>
-             <?php endif; ?>
-         </div>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
-index af09bbe0acd..2218ce5d296 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
-@@ -3,21 +3,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
- <?php $_option = $block->getOption(); ?>
--<div class="admin__field field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
-+<div class="admin__field field<?= $_option->getIsRequire() ? ' required _required' : '' ?>">
-     <label class="label admin__field-label">
-         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
-     </label>
-     <div class="control admin__field-control">
-         <?= $block->getValuesHtml() ?>
--        <?php if ($_option->getIsRequire()): ?>
--            <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX): ?>
--                <span id="options-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></span>
-+        <?php if ($_option->getIsRequire()) :?>
-+            <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX) :?>
-+                <span id="options-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></span>
-             <?php endif; ?>
-         <?php endif;?>
-     </div>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
-index 11fba22ea81..d1a019911d5 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
-@@ -3,26 +3,33 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Text */ ?>
- <?php $_option = $block->getOption(); ?>
--<div class="field admin__field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
-+<div class="field admin__field<?= $_option->getIsRequire() ? ' required _required' : '' ?>">
-     <label class="admin__field-label label">
-         <?= $block->escapeHtml($_option->getTitle()) ?>
--        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
-+        <?= /* @noEscape */ $block->getFormattedPrice() ?>
-     </label>
-     <div class="control admin__field-control">
--        <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_FIELD): ?>
--            <input type="text" id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text" class="input-text admin__control-text <?= $_option->getIsRequire() ? ' required-entry' : '' ?> <?= /* @escapeNotVerified */ $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]" value="<?= $block->escapeHtml($block->getDefaultValue()) ?>" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_option->getPrice(true)) ?>" />
--        <?php elseif ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA): ?>
--            <textarea id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text" class="admin__control-textarea <?= $_option->getIsRequire() ? ' required-entry' : '' ?> <?= /* @escapeNotVerified */ $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]" rows="5" cols="25" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_option->getPrice(true)) ?>"><?= $block->escapeHtml($block->getDefaultValue()) ?></textarea>
-+        <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_FIELD) :?>
-+            <input type="text"
-+                   id="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text"
-+                   class="input-text admin__control-text <?= $_option->getIsRequire() ? ' required-entry' : '' ?> <?= $_option->getMaxCharacters() ? ' validate-length maximum-length-' . (int) $_option->getMaxCharacters() : '' ?> product-custom-option"
-+                   name="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                   value="<?= $block->escapeHtmlAttr($block->getDefaultValue()) ?>"
-+                   price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>" />
-+        <?php elseif ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA) :?>
-+            <textarea id="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text"
-+                      class="admin__control-textarea <?= $_option->getIsRequire() ? ' required-entry' : '' ?> <?= $_option->getMaxCharacters() ? ' validate-length maximum-length-' . (int) $_option->getMaxCharacters() : '' ?> product-custom-option"
-+                      name="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                      rows="5"
-+                      cols="25"
-+                      price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>"><?= $block->escapeHtml($block->getDefaultValue()) ?></textarea>
-         <?php endif;?>
- 
--        <?php if ($_option->getMaxCharacters()): ?>
--            <p class="note"><?= /* @escapeNotVerified */ __('Maximum number of characters:') ?> <strong><?= /* @escapeNotVerified */ $_option->getMaxCharacters() ?></strong></p>
-+        <?php if ($_option->getMaxCharacters()) :?>
-+            <p class="note"><?= $block->escapeHtml(__('Maximum number of characters:')) ?> <strong><?= (int) $_option->getMaxCharacters() ?></strong></p>
-         <?php endif; ?>
-     </div>
- </div>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
-index 487c9b8e8f2..4726bdc0930 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Qty */ ?>
-@@ -13,9 +10,9 @@
- <fieldset id="product_composite_configure_fields_qty"
-           class="fieldset product-composite-qty-block admin__fieldset <?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
-     <div class="field admin__field">
--        <label class="label admin__field-label"><span><?= /* @escapeNotVerified */ __('Quantity') ?></span></label>
-+        <label class="label admin__field-label"><span><?= $block->escapeHtml(__('Quantity')) ?></span></label>
-         <div class="control admin__field-control">
--            <input id="product_composite_configure_input_qty" class="input-text admin__control-text qty" type="text" name="qty" value="<?= /* @escapeNotVerified */ $block->getQtyValue() * 1 ?>">
-+            <input id="product_composite_configure_input_qty" class="input-text admin__control-text qty" type="text" name="qty" value="<?= $block->getQtyValue() * 1 ?>">
-         </div>
-     </div>
- </fieldset>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
-index 7c25c3686ea..66df098a194 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
-@@ -3,11 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+
- /**
-  * @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit
-  */
-@@ -17,11 +16,11 @@
-         <div id="product-template-suggest-container" class="suggest-expandable">
-             <div class="action-dropdown">
-                 <button type="button" class="action-toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown">
--                    <span><?= /* @escapeNotVerified */ $block->getAttributeSetName() ?></span>
-+                    <span><?= $block->escapeHtml($block->getAttributeSetName()) ?></span>
-                 </button>
-                 <ul class="dropdown-menu">
-                     <li><input type="text" id="product-template-suggest" class="search"
--                           placeholder="<?= /* @noEscape */ __('start typing to search template') ?>"/></li>
-+                           placeholder="<?= $block->escapeHtmlAttr(__('start typing to search template')) ?>"/></li>
-                 </ul>
-             </div>
-         </div>
-@@ -30,32 +29,32 @@
-             <input type="checkbox" id="product-online-switcher" name="product-online-switcher" />
-             <label class="switcher-label"
-                    for="product-online-switcher"
--                   data-text-on="<?= /* @escapeNotVerified */ __('Product online') ?>"
--                   data-text-off="<?= /* @escapeNotVerified */ __('Product offline') ?>"
--                   title="<?= /* @escapeNotVerified */ __('Product online status') ?>"></label>
-+                   data-text-on="<?= $block->escapeHtmlAttr(__('Product online')) ?>"
-+                   data-text-off="<?= $block->escapeHtmlAttr(__('Product offline')) ?>"
-+                   title="<?= $block->escapeHtmlAttr(__('Product online status')) ?>"></label>
-         </div>
- 
--        <?php if ($block->getProductId()): ?>
-+        <?php if ($block->getProductId()) :?>
-             <?= $block->getDeleteButtonHtml() ?>
-         <?php endif; ?>
--        <?php if ($block->getProductSetId()): ?>
-+        <?php if ($block->getProductSetId()) :?>
-             <?= $block->getChangeAttributeSetButtonHtml() ?>
-             <?= $block->getSaveSplitButtonHtml() ?>
-         <?php endif; ?>
-         <?= $block->getBackButtonHtml() ?>
-     </div>
- </div>
--<?php if ($block->getUseContainer()): ?>
--<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" enctype="multipart/form-data"
--      data-form="edit-product" data-product-id="<?= /* @escapeNotVerified */ $block->getProduct()->getId() ?>">
-+<?php if ($block->getUseContainer()) :?>
-+<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" enctype="multipart/form-data"
-+      data-form="edit-product" data-product-id="<?= $block->escapeHtmlAttr($block->getProduct()->getId()) ?>">
- <?php endif; ?>
-     <?= $block->getBlockHtml('formkey') ?>
-     <div data-role="tabs" id="product-edit-form-tabs"></div> <?php /* @TODO: remove id after elimination of setDestElementId('product-edit-form-tabs') */?>
-     <?= $block->getChildHtml('product-type-tabs') ?>
--    <input type="hidden" id="product_type_id" value="<?= /* @escapeNotVerified */ $block->getProduct()->getTypeId() ?>"/>
--    <input type="hidden" id="attribute_set_id" value="<?= /* @escapeNotVerified */ $block->getProduct()->getAttributeSetId() ?>"/>
-+    <input type="hidden" id="product_type_id" value="<?= $block->escapeHtmlAttr($block->getProduct()->getTypeId()) ?>"/>
-+    <input type="hidden" id="attribute_set_id" value="<?= $block->escapeHtmlAttr($block->getProduct()->getAttributeSetId()) ?>"/>
-     <button type="submit" class="hidden"></button>
--<?php if ($block->getUseContainer()): ?>
-+<?php if ($block->getUseContainer()) :?>
- </form>
- <?php endif; ?>
- <script>
-@@ -130,10 +129,10 @@ require([
-             }
-         }
-     });
--    $form.mage('validation', {validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'});
-+    $form.mage('validation', {validationUrl: '<?= $block->escapeJs($block->escapeUrl($block->getValidationUrl())) ?>'});
- 
--    var masks = <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getFieldsAutogenerationMasks()) ?>;
--    var availablePlaceholders = <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getAttributesAllowedForAutogeneration()) ?>;
-+    var masks = <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getFieldsAutogenerationMasks()) ?>;
-+    var availablePlaceholders = <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getAttributesAllowedForAutogeneration()) ?>;
-     var Autogenerator = function(masks) {
-         this._masks = masks || {};
-         this._fieldReverseIndex = this._buildReverseIndex(this._masks);
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
-index d1591d70945..056cf014f76 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
-@@ -4,18 +4,22 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute */
- ?>
- 
--<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" id="attributes-edit-form" class="attributes-edit-form" enctype="multipart/form-data">
-+<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>"
-+      method="post"
-+      id="attributes-edit-form"
-+      class="attributes-edit-form"
-+      enctype="multipart/form-data">
-     <?= $block->getBlockHtml('formkey') ?>
- </form>
--<script>
--require(['jquery', "mage/mage"], function(jQuery){
--
--    jQuery('#attributes-edit-form').mage('form')
--        .mage('validation', {validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'});
--
--});
-+<script type="text/x-magento-init">
-+    {
-+        "#attributes-edit-form": {
-+            "Magento_Catalog/catalog/product/edit/attribute": {
-+                "validationUrl": "<?= $block->escapeJs($block->escapeUrl($block->getValidationUrl())) ?>"
-+            }
-+        }
-+    }
- </script>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
-index efc06d675c3..792af12494a 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /** @var Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory $block */
- ?>
- <script>
-@@ -30,329 +29,373 @@
-     });
- </script>
- 
-+<?php
-+$defaultMinSaleQty = $block->getDefaultConfigValue('min_sale_qty');
-+if (!is_numeric($defaultMinSaleQty)) {
-+    $defaultMinSaleQty = json_decode($defaultMinSaleQty, true);
-+    $defaultMinSaleQty = (float) $defaultMinSaleQty[\Magento\Customer\Api\Data\GroupInterface::CUST_GROUP_ALL] ?? 1;
-+}
-+?>
- <div class="fieldset-wrapper form-inline advanced-inventory-edit">
-     <div class="fieldset-wrapper-title">
-         <strong class="title">
--            <span><?= /* @escapeNotVerified */ __('Advanced Inventory') ?></span>
-+            <span><?= $block->escapeHtml(__('Advanced Inventory')) ?></span>
-         </strong>
-     </div>
-     <div class="fieldset-wrapper-content">
-         <fieldset class="fieldset" id="table_cataloginventory">
-         <div class="field">
-             <label class="label" for="inventory_manage_stock">
--                <span><?= /* @escapeNotVerified */ __('Manage Stock') ?></span>
-+                <span><?= $block->escapeHtml(__('Manage Stock')) ?></span>
-             </label>
- 
-             <div class="control">
-                 <div class="fields-group-2">
-                     <div class="field">
--                        <select id="inventory_manage_stock" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[manage_stock]"
-+                        <select id="inventory_manage_stock" name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[manage_stock]"
-                                 class="select" disabled="disabled">
--                            <option value="1"><?= /* @escapeNotVerified */ __('Yes') ?></option>
--                            <option
--                                value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
-+                            <option value="1"><?= $block->escapeHtml(__('Yes')) ?></option>
-+                            <option value="0"
-+                                <?php if ($block->getFieldValue('manage_stock') == 0) :?>
-+                                    selected="selected"
-+                                <?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
-                         </select>
-                     </div>
-                     <div class="field choice">
--                        <input name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_manage_stock]" type="checkbox"
-+                        <input name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_manage_stock]" type="checkbox"
-                                id="inventory_use_config_manage_stock" data-role="toggle-editability" value="1"
-                                checked="checked" disabled="disabled"/>
-                         <label for="inventory_use_config_manage_stock"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_manage_stock_checkbox" data-role="toggle-editability-all"/>
-                         <label for="inventory_manage_stock_checkbox"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
-                     </div>
-                 </div>
-             </div>
--            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
-+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
-         </div>
- 
-         <div class="field required">
-             <label class="label" for="inventory_qty">
--                <span><?= /* @escapeNotVerified */ __('Qty') ?></span>
-+                <span><?= $block->escapeHtml(__('Qty')) ?></span>
-             </label>
- 
-             <div class="control">
-                 <div class="fields-group-2">
-                     <div class="field">
-                         <input type="text" class="input-text required-entry validate-number" id="inventory_qty"
--                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[qty]"
--                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('qty') * 1 ?>" disabled="disabled"/>
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[qty]"
-+                               value="<?= $block->getDefaultConfigValue('qty') * 1 ?>" disabled="disabled"/>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_qty_checkbox" data-role="toggle-editability-all"/>
-                         <label for="inventory_qty_checkbox"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
-                     </div>
-                 </div>
-             </div>
--            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
-+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
-         </div>
- 
-         <div class="field with-addon">
-             <label class="label" for="inventory_min_qty">
--                <span><?= /* @escapeNotVerified */ __('Out-of-Stock Threshold') ?></span>
-+                <span><?= $block->escapeHtml(__('Out-of-Stock Threshold')) ?></span>
-             </label>
- 
-             <div class="control">
-                 <div class="fields-group-2">
-                     <div class="field">
-                         <input type="text" class="input-text validate-number" id="inventory_min_qty"
--                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[min_qty]"
--                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('min_qty') * 1 ?>" disabled="disabled"/>
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[min_qty]"
-+                               value="<?= $block->getDefaultConfigValue('min_qty') * 1 ?>" disabled="disabled"/>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_use_config_min_qty"
--                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_min_qty]" value="1"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_min_qty]" value="1"
-                                data-role="toggle-editability" checked="checked" disabled="disabled"/>
-                         <label for="inventory_use_config_min_qty" class="label">
--                            <span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span>
-+                            <span><?= $block->escapeHtml(__('Use Config Settings')) ?></span>
-                         </label>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_min_qty_checkbox" data-role="toggle-editability-all"/>
-                         <label for="inventory_min_qty_checkbox"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
-                     </div>
-                 </div>
-             </div>
--            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
-+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
-         </div>
- 
-         <div class="field">
-             <label class="label" for="inventory_min_sale_qty">
--                <span><?= /* @escapeNotVerified */ __('Minimum Qty Allowed in Shopping Cart') ?></span>
-+                <span><?= $block->escapeHtml(__('Minimum Qty Allowed in Shopping Cart')) ?></span>
-             </label>
- 
-             <div class="control">
-                 <div class="fields-group-2">
-                     <div class="field">
-                         <input type="text" class="input-text validate-number" id="inventory_min_sale_qty"
--                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[min_sale_qty]"
--                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('min_sale_qty') * 1 ?>"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[min_sale_qty]"
-+                               value="<?= $defaultMinSaleQty * 1 ?>"
-                                disabled="disabled"/>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_use_config_min_sale_qty"
--                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_min_sale_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_min_sale_qty]"
-+                               value="1"
-+                               data-role="toggle-editability"
-+                               checked="checked"
-+                               disabled="disabled"/>
-                         <label for="inventory_use_config_min_sale_qty"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_min_sale_qty_checkbox" data-role="toggle-editability-all"/>
-                         <label for="inventory_min_sale_qty_checkbox"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
-                     </div>
-                 </div>
-             </div>
--            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
-+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
-         </div>
- 
-         <div class="field">
-             <label class="label" for="inventory_max_sale_qty">
--                <span><?= /* @escapeNotVerified */ __('Maximum Qty Allowed in Shopping Cart') ?></span>
-+                <span><?= $block->escapeHtml(__('Maximum Qty Allowed in Shopping Cart')) ?></span>
-             </label>
- 
-             <div class="control">
-                 <div class="fields-group-2">
-                     <div class="field">
-                         <input type="text" class="input-text validate-number" id="inventory_max_sale_qty"
--                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[max_sale_qty]"
--                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('max_sale_qty') * 1 ?>"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[max_sale_qty]"
-+                               value="<?= $block->getDefaultConfigValue('max_sale_qty') * 1 ?>"
-                                disabled="disabled"/>
-                     </div>
-                     <div class="field choice">
--                        <input type="checkbox" id="inventory_use_config_max_sale_qty"
--                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_max_sale_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
-+                        <input type="checkbox"
-+                               id="inventory_use_config_max_sale_qty"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_max_sale_qty]"
-+                               value="1"
-+                               data-role="toggle-editability"
-+                               checked="checked"
-+                               disabled="disabled"/>
-                         <label for="inventory_use_config_max_sale_qty"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_max_sale_checkbox" data-role="toggle-editability-all"/>
-                         <label for="inventory_max_sale_checkbox"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
-                     </div>
-                 </div>
-             </div>
--            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
-+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
-         </div>
- 
-         <div class="field">
-             <label class="label" for="inventory_is_qty_decimal">
--                <span><?= /* @escapeNotVerified */ __('Qty Uses Decimals') ?></span>
-+                <span><?= $block->escapeHtml(__('Qty Uses Decimals')) ?></span>
-             </label>
- 
-             <div class="control">
-                 <div class="fields-group-2">
-                     <div class="field">
-                         <select id="inventory_is_qty_decimal"
--                                name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[is_qty_decimal]" class="select"
-+                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[is_qty_decimal]"
-+                                class="select"
-                                 disabled="disabled">
--                            <option value="0"><?= /* @escapeNotVerified */ __('No') ?></option>
--                            <option
--                                value="1"<?php if ($block->getDefaultConfigValue('is_qty_decimal') == 1): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Yes') ?></option>
-+                            <option value="0"><?= $block->escapeHtml(__('No')) ?></option>
-+                            <option value="1"
-+                                <?php if ($block->getDefaultConfigValue('is_qty_decimal') == 1) :?>
-+                                    selected="selected"
-+                                <?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
-                         </select>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_is_qty_decimal_checkbox" data-role="toggle-editability-all"/>
-                         <label for="inventory_is_qty_decimal_checkbox"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
-                     </div>
-                 </div>
-             </div>
--            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
-+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
-         </div>
- 
-         <div class="field">
-             <label class="label" for="inventory_backorders">
--                <span><?= /* @escapeNotVerified */ __('Backorders') ?></span>
-+                <span><?= $block->escapeHtml(__('Backorders')) ?></span>
-             </label>
- 
-             <div class="control">
-                 <div class="fields-group-2">
-                     <div class="field">
--                        <select id="inventory_backorders" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[backorders]"
--                                class="select" disabled="disabled">
--                            <?php foreach ($block->getBackordersOption() as $option): ?>
-+                        <select id="inventory_backorders"
-+                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[backorders]"
-+                                class="select"
-+                                disabled="disabled">
-+                            <?php foreach ($block->getBackordersOption() as $option) :?>
-                                 <?php $_selected = ($option['value'] == $block->getDefaultConfigValue('backorders')) ? ' selected="selected"' : '' ?>
-                                 <option
--                                    value="<?= /* @escapeNotVerified */ $option['value'] ?>"<?= /* @escapeNotVerified */ $_selected ?>><?= /* @escapeNotVerified */ $option['label'] ?></option>
-+                                    value="<?= $block->escapeHtmlAttr($option['value']) ?>"<?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?></option>
-                             <?php endforeach; ?>
-                         </select>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_use_config_backorders"
--                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_backorders]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_backorders]"
-+                               value="1"
-+                               data-role="toggle-editability"
-+                               checked="checked"
-+                               disabled="disabled"/>
-                         <label for="inventory_use_config_backorders"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_backorders_checkbox" data-role="toggle-editability-all"/>
--                        <label for="inventory_backorders_checkbox" class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
-+                        <label for="inventory_backorders_checkbox"
-+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
-                     </div>
-                 </div>
- 
-             </div>
--            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
-+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
-         </div>
- 
-         <div class="field">
-             <label class="label" for="inventory_notify_stock_qty">
--                <span><?= /* @escapeNotVerified */ __('Notify for Quantity Below') ?></span>
-+                <span><?= $block->escapeHtml(__('Notify for Quantity Below')) ?></span>
-             </label>
- 
-             <div class="control">
-                 <div class="fields-group-2">
-                     <div class="field">
-                         <input type="text" class="input-text validate-number" id="inventory_notify_stock_qty"
--                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[notify_stock_qty]"
--                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('notify_stock_qty') * 1 ?>"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[notify_stock_qty]"
-+                               value="<?= $block->getDefaultConfigValue('notify_stock_qty') * 1 ?>"
-                                disabled="disabled"/>
-                     </div>
-                     <div class="field choice">
--                        <input type="checkbox" id="inventory_use_config_notify_stock_qty"
--                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_notify_stock_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
-+                        <input type="checkbox"
-+                               id="inventory_use_config_notify_stock_qty"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_notify_stock_qty]"
-+                               value="1"
-+                               data-role="toggle-editability"
-+                               checked="checked"
-+                               disabled="disabled"/>
-                         <label for="inventory_use_config_notify_stock_qty"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_notify_stock_qty_checkbox" data-role="toggle-editability-all"/>
-                         <label for="inventory_notify_stock_qty_checkbox"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
-                     </div>
-                 </div>
-             </div>
--            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
-+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
-         </div>
- 
-         <div class="field">
-             <label class="label" for="inventory_enable_qty_increments">
--                <span><?= /* @escapeNotVerified */ __('Enable Qty Increments') ?></span>
-+                <span><?= $block->escapeHtml(__('Enable Qty Increments')) ?></span>
-             </label>
- 
-             <div class="control">
-                 <div class="fields-group-2">
-                     <div class="field">
-                         <select id="inventory_enable_qty_increments"
--                                name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[enable_qty_increments]" class="select"
-+                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[enable_qty_increments]"
-+                                class="select"
-                                 disabled="disabled">
--                            <option value="1"><?= /* @escapeNotVerified */ __('Yes') ?></option>
--                            <option
--                                value="0"<?php if ($block->getDefaultConfigValue('enable_qty_increments') == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
-+                            <option value="1"><?= $block->escapeHtml(__('Yes')) ?></option>
-+                            <option value="0"
-+                                <?php if ($block->getDefaultConfigValue('enable_qty_increments') == 0) :?>
-+                                    selected="selected"
-+                                <?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
-                         </select>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_use_config_enable_qty_increments"
--                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_enable_qty_increments]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_enable_qty_increments]"
-+                               value="1"
-+                               data-role="toggle-editability"
-+                               checked="checked"
-+                               disabled="disabled"/>
-                         <label for="inventory_use_config_enable_qty_increments"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_enable_qty_increments_checkbox" data-role="toggle-editability-all"/>
-                         <label for="inventory_enable_qty_increments_checkbox"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
-                     </div>
-                 </div>
-             </div>
--            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
-+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
-         </div>
- 
-         <div class="field">
-             <label class="label" for="inventory_qty_increments">
--                <span><?= /* @escapeNotVerified */ __('Qty Increments') ?></span>
-+                <span><?= $block->escapeHtml(__('Qty Increments')) ?></span>
-             </label>
- 
-             <div class="control">
-                 <div class="fields-group-2">
-                     <div class="field">
-                         <input type="text" class="input-text validate-number" id="inventory_qty_increments"
--                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[qty_increments]"
--                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('qty_increments') * 1 ?>"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[qty_increments]"
-+                               value="<?= $block->getDefaultConfigValue('qty_increments') * 1 ?>"
-                                disabled="disabled"/>
-                     </div>
-                     <div class="field choice">
--                        <input type="checkbox" id="inventory_use_config_qty_increments"
--                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_qty_increments]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
-+                        <input type="checkbox"
-+                               id="inventory_use_config_qty_increments"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_qty_increments]"
-+                               value="1"
-+                               data-role="toggle-editability"
-+                               checked="checked"
-+                               disabled="disabled"/>
-                         <label for="inventory_use_config_qty_increments"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_qty_increments_checkbox" data-role="toggle-editability-all"/>
-                         <label for="inventory_qty_increments_checkbox"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
-                     </div>
-                 </div>
-             </div>
--            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
-+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
-         </div>
- 
-         <div class="field">
-             <label class="label" for="inventory_stock_availability">
--                <span><?= /* @escapeNotVerified */ __('Stock Availability') ?></span>
-+                <span><?= $block->escapeHtml(__('Stock Availability')) ?></span>
-             </label>
- 
-             <div class="control">
-                 <div class="fields-group-2">
-                     <div class="field">
-                         <select id="inventory_stock_availability"
--                                name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[is_in_stock]" class="select"
-+                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[is_in_stock]" class="select"
-                                 disabled="disabled">
--                            <option value="1"><?= /* @escapeNotVerified */ __('In Stock') ?></option>
--                            <option
--                                value="0"<?php if ($block->getDefaultConfigValue('is_in_stock') == 0): ?> selected<?php endif; ?>><?= /* @escapeNotVerified */ __('Out of Stock') ?></option>
-+                            <option value="1"><?= $block->escapeHtml(__('In Stock')) ?></option>
-+                            <option value="0"<?php if ($block->getDefaultConfigValue('is_in_stock') == 0) :?> selected<?php endif; ?>><?= $block->escapeHtml(__('Out of Stock')) ?></option>
-                         </select>
-                     </div>
-                     <div class="field choice">
-                         <input type="checkbox" id="inventory_stock_availability_checkbox" data-role="toggle-editability-all"/>
-                         <label for="inventory_stock_availability_checkbox"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
-                     </div>
-                 </div>
-             </div>
--            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
-+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
-         </div>
-         </fieldset>
-     </div>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
-index cd297a7bbf2..98b06050e0d 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
-@@ -4,29 +4,35 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab\Websites */
- ?>
- 
- <div class="fieldset-wrapper" id="add-products-to-website-wrapper">
-     <fieldset class="fieldset" id="grop_fields">
-         <legend class="legend">
--            <span><?= /* @escapeNotVerified */ __('Add Product To Websites') ?></span>
-+            <span><?= $block->escapeHtml(__('Add Product To Websites')) ?></span>
-         </legend>
-         <br>
-         <div class="store-scope">
-             <div class="store-tree" id="add-products-to-website-content">
--                <?php foreach ($block->getWebsiteCollection() as $_website): ?>
-+                <?php foreach ($block->getWebsiteCollection() as $_website) :?>
-                     <div class="website-name">
--                        <input name="add_website_ids[]" value="<?= /* @escapeNotVerified */ $_website->getId() ?>" <?php if ($block->getWebsitesReadonly()): ?>disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="add_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>" type="checkbox" />
--                        <label for="add_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
-+                        <input name="add_website_ids[]"
-+                               value="<?= $block->escapeHtmlAttr($_website->getId()) ?>"
-+                            <?php if ($block->getWebsitesReadonly()) :?>
-+                                disabled="disabled"
-+                            <?php endif;?>
-+                               class="checkbox website-checkbox"
-+                               id="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"
-+                               type="checkbox" />
-+                        <label for="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
-                     </div>
--                    <dl class="webiste-groups" id="add_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>_data">
--                        <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
-+                    <dl class="webiste-groups" id="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>_data">
-+                        <?php foreach ($block->getGroupCollection($_website) as $_group) :?>
-                             <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
-                             <dd class="group-stores">
-                                 <ul>
--                                <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
-+                                <?php foreach ($block->getStoreCollection($_group) as $_store) :?>
-                                     <li>
-                                         <?= $block->escapeHtml($_store->getName()) ?>
-                                     </li>
-@@ -44,27 +50,35 @@
- <div class="fieldset-wrapper" id="remove-products-to-website-wrapper">
-     <fieldset class="fieldset" id="grop_fields">
-         <legend class="legend">
--            <span><?= /* @escapeNotVerified */ __('Remove Product From Websites') ?></span>
-+            <span><?= $block->escapeHtml(__('Remove Product From Websites')) ?></span>
-         </legend>
-         <br>
-         <div class="messages">
-             <div class="message message-notice">
--                <div><?= /* @escapeNotVerified */ __('To hide an item in catalog or search results, set the status to "Disabled".') ?></div>
-+                <div><?= $block->escapeHtml(__('To hide an item in catalog or search results, set the status to "Disabled".')) ?></div>
-             </div>
-         </div>
-         <div class="store-scope">
-             <div class="store-tree" id="remove-products-to-website-content">
--                <?php foreach ($block->getWebsiteCollection() as $_website): ?>
-+                <?php foreach ($block->getWebsiteCollection() as $_website) :?>
-                     <div class="website-name">
--                        <input name="remove_website_ids[]" value="<?= /* @escapeNotVerified */ $_website->getId() ?>" <?php if ($block->getWebsitesReadonly()): ?>disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="remove_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>" type="checkbox" />
--                        <label for="remove_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
-+                        <input name="remove_website_ids[]"
-+                               value="<?= $block->escapeHtmlAttr($_website->getId()) ?>"
-+                            <?php if ($block->getWebsitesReadonly()) :?>
-+                                disabled="disabled"
-+                            <?php endif;?>
-+                               class="checkbox website-checkbox"
-+                               id="remove_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"
-+                               type="checkbox" />
-+                        <label for="remove_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
-                     </div>
--                    <dl class="webiste-groups" id="remove_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>_data">
--                        <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
-+                    <dl class="webiste-groups"
-+                        id="remove_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>_data">
-+                        <?php foreach ($block->getGroupCollection($_website) as $_group) :?>
-                             <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
-                             <dd class="group-stores">
-                                 <ul>
--                                <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
-+                                <?php foreach ($block->getStoreCollection($_group) as $_store) :?>
-                                     <li>
-                                         <?= $block->escapeHtml($_store->getName()) ?>
-                                     </li>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
-index 6a5f6c46484..d073053e2f8 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
-@@ -4,9 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- 
-- /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet */
-+/* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet */
- ?>
- <script id="product-template-selector-template" type="text/x-magento-template">
- <% if (!data.term && data.items.length && !data.allShown()) { %>
-@@ -14,7 +14,7 @@
- <% } %>
- <ul data-mage-init='{"menu":[]}'>
-     <% _.each(data.items, function(value) { %>
--    <li <%- data.optionData(value) %>><a href="#"><%- value.label %></a></li>
-+    <li <%= data.optionData(value) %>><a href="#"><%- value.label %></a></li>
-     <% }); %>
- </ul>
- <% if (!data.term && data.items.length && !data.allShown()) { %>
-@@ -32,7 +32,7 @@
-             }
-         });
-         $suggest
--            .mage('suggest',<?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSelectorOptions()) ?>)
-+            .mage('suggest',<?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getSelectorOptions()) ?>)
-             .on('suggestselect', function (e, ui) {
-                 if (ui.item.id) {
-                     $('[data-form=edit-product]').trigger('changeAttributeSet', ui.item);
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
-index 84c32578402..f12a99e6c78 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
-@@ -5,7 +5,7 @@
-  */
- /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\NewCategory */
- ?>
--<div id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none">
-+<div id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>" style="display:none">
-     <?= $block->getFormHtml() ?>
-     <?= $block->getAfterElementHtml() ?>
- </div>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
-index 2570a5d7126..ad38d250a33 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
-@@ -3,16 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options */ ?>
- 
- <div class="fieldset-wrapper" id="product-custom-options-wrapper" data-block="product-custom-options">
-     <div class="fieldset-wrapper-title">
-         <strong class="title">
--            <span><?= /* @escapeNotVerified */ __('Custom Options') ?></span>
-+            <span><?= $block->escapeHtml(__('Custom Options')) ?></span>
-         </strong>
-     </div>
-     <div class="fieldset-wrapper-content" id="product-custom-options-content" data-role="product-custom-options-content">
-@@ -20,7 +17,7 @@
-             <div class="messages">
-                 <div class="message message-error" id="dynamic-price-warning" style="display: none;">
-                     <div class="message-inner">
--                        <div class="message-content"><?= /* @escapeNotVerified */ __('We can\'t save custom-defined options for bundles with dynamic pricing.') ?></div>
-+                        <div class="message-content"><?= $block->escapeHtml(__('We can\'t save custom-defined options for bundles with dynamic pricing.')) ?></div>
-                     </div>
-                 </div>
-             </div>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
-index d2bca5ce173..713366e73ab 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option */ ?>
- <?= $block->getTemplatesHtml() ?>
-@@ -19,30 +18,52 @@
-                 <span id="option_<%- data.id %>_header_title"><%- data.title %></span>
-             </strong>
-             <div class="actions">
--                <button type="button" title="<?= /* @escapeNotVerified */ __('Delete Custom Option') ?>" class="action-delete" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_delete">
--                    <span><?= /* @escapeNotVerified */ __('Delete Custom Option') ?></span>
-+                <button type="button"
-+                        title="<?= $block->escapeHtmlAttr(__('Delete Custom Option')) ?>"
-+                        class="action-delete"
-+                        id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_delete">
-+                    <span><?= $block->escapeHtml(__('Delete Custom Option')) ?></span>
-                 </button>
-             </div>
--            <div id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_move" data-role="draggable-handle" class="draggable-handle"
--                 title="<?= /* @escapeNotVerified */ __('Sort Custom Options') ?>"></div>
-+            <div id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_move"
-+                 data-role="draggable-handle"
-+                 class="draggable-handle"
-+                 title="<?= $block->escapeHtmlAttr(__('Sort Custom Options')) ?>"></div>
-         </div>
-         <div class="fieldset-wrapper-content in collapse" id="<%- data.id %>-content">
-             <fieldset class="fieldset">
--                <fieldset class="fieldset-alt" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>">
--                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_is_delete" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][is_delete]" type="hidden" value=""/>
--                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_previous_type" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][previous_type]" type="hidden" value="<%- data.type %>"/>
--                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_previous_group" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][previous_group]" type="hidden" value=""/>
--                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_id" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][id]" type="hidden" value="<%- data.id %>"/>
--                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_option_id" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][option_id]" type="hidden" value="<%- data.option_id %>"/>
--                    <input name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][sort_order]" type="hidden" value="<%- data.sort_order %>"/>
-+                <fieldset class="fieldset-alt" id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>">
-+                    <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_is_delete"
-+                           name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][is_delete]"
-+                           type="hidden"
-+                           value=""/>
-+                    <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_previous_type"
-+                           name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][previous_type]"
-+                           type="hidden"
-+                           value="<%- data.type %>"/>
-+                    <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_previous_group"
-+                           name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][previous_group]"
-+                           type="hidden"
-+                           value=""/>
-+                    <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_id"
-+                           name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][id]"
-+                           type="hidden"
-+                           value="<%- data.id %>"/>
-+                    <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_option_id"
-+                           name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][option_id]"
-+                           type="hidden"
-+                           value="<%- data.option_id %>"/>
-+                    <input name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][sort_order]"
-+                           type="hidden"
-+                           value="<%- data.sort_order %>"/>
- 
-                     <div class="field field-option-title required">
--                        <label class="label" for="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_title">
--                            <?= /* @escapeNotVerified */ __('Option Title') ?>
-+                        <label class="label" for="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_title">
-+                            <?= $block->escapeHtml(__('Option Title')) ?>
-                         </label>
-                         <div class="control">
--                            <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_title"
--                                   name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][title]"
-+                            <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_title"
-+                                   name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][title]"
-                                    class="required-entry input-text"
-                                    type="text"
-                                    value="<%- data.title %>"
-@@ -54,8 +75,8 @@
-                     </div>
- 
-                     <div class="field field-option-input-type required">
--                        <label class="label" for="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_title">
--                            <?= /* @escapeNotVerified */ __('Input Type') ?>
-+                        <label class="label" for="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_title">
-+                            <?= $block->escapeHtml(__('Input Type')) ?>
-                         </label>
-                         <div class="control opt-type">
-                             <?= $block->getTypeSelectHtml() ?>
-@@ -64,9 +85,12 @@
- 
-                     <div class="field field-option-req">
-                         <div class="control">
--                            <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_required" class="is-required" type="checkbox" checked="checked"/>
-+                            <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_required"
-+                                   class="is-required"
-+                                   type="checkbox"
-+                                   checked="checked"/>
-                             <label for="field-option-req">
--                                <?= /* @escapeNotVerified */ __('Required') ?>
-+                                <?= $block->escapeHtml(__('Required')) ?>
-                             </label>
-                             <span style="display:none"><?= $block->getRequireSelectHtml() ?></span>
-                         </div>
-@@ -78,7 +102,7 @@
- </script>
- 
- <div id="import-container" style="display: none;"></div>
--<?php if (!$block->isReadonly()): ?>
-+<?php if (!$block->isReadonly()) :?>
- <div><input type="hidden" name="affect_product_custom_options" value="1"/></div>
- <?php endif; ?>
- <script>
-@@ -89,21 +113,21 @@ require([
- 
- jQuery(function ($) {
-     var fieldSet = $('[data-block=product-custom-options]');
--    fieldSet.customOptions(<?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
-+    fieldSet.customOptions(<?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode(
-         [
-             'fieldId' => $block->getFieldId(),
--            'productGridUrl' => $block->getProductGridUrl(),
-+            'productGridUrl' => $block->escapeUrl($block->getProductGridUrl()),
-             'formKey' => $block->getFormKey(),
--            'customOptionsUrl' => $block->getCustomOptionsUrl(),
--            'isReadonly' => $block->isReadonly(),
--            'itemCount' => $block->getItemCount(),
--            'currentProductId' => $block->getCurrentProductId(),
-+            'customOptionsUrl' => $block->escapeUrl($block->getCustomOptionsUrl()),
-+            'isReadonly' => (bool) $block->isReadonly(),
-+            'itemCount' => (int) $block->getItemCount(),
-+            'currentProductId' => (int) $block->getCurrentProductId(),
-         ]
-     )?>);
-     //adding data to templates
-     <?php /** @var $_value \Magento\Framework\DataObject */ ?>
--    <?php foreach ($block->getOptionValues() as $_value): ?>
--        fieldSet.customOptions('addOption', <?= /* @escapeNotVerified */ $_value->toJson() ?>);
-+    <?php foreach ($block->getOptionValues() as $_value) :?>
-+        fieldSet.customOptions('addOption', <?= /* @noEscape */ $_value->toJson() ?>);
-     <?php endforeach; ?>
- });
- 
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
-index 07ce6e5d862..2063609bf05 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Date */ ?>
- <script id="custom-option-date-type-template" type="text/x-magento-template">
-@@ -14,10 +12,10 @@
-             <thead>
-             <tr class="headings">
-                 <?php if ($block->getCanReadPrice() !== false) : ?>
--                <th><?= /* @escapeNotVerified */ __('Price') ?></th>
--                <th><?= /* @escapeNotVerified */ __('Price Type') ?></th>
-+                <th><?= $block->escapeHtml(__('Price')) ?></th>
-+                <th><?= $block->escapeHtml(__('Price Type')) ?></th>
-                 <?php endif; ?>
--                <th><?= /* @escapeNotVerified */ __('SKU') ?></th>
-+                <th><?= $block->escapeHtml(__('SKU')) ?></th>
-             </tr>
-             </thead>
-             <tr>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
-index 693c98fc02c..c0e61c5de99 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\File */ ?>
- <script id="custom-option-file-type-template" type="text/x-magento-template">
-@@ -14,27 +12,27 @@
-             <thead>
-             <tr>
-                 <?php if ($block->getCanReadPrice() !== false) : ?>
--                <th><?= /* @escapeNotVerified */ __('Price') ?></th>
--                <th><?= /* @escapeNotVerified */ __('Price Type') ?></th>
-+                    <th><?= $block->escapeHtml(__('Price')) ?></th>
-+                    <th><?= $block->escapeHtml(__('Price Type')) ?></th>
-                 <?php endif; ?>
--                <th><?= /* @escapeNotVerified */ __('SKU') ?></th>
--                <th><?= /* @escapeNotVerified */ __('Compatible File Extensions') ?></th>
--                <th><?= /* @escapeNotVerified */ __('Maximum Image Size') ?></th>
-+                <th><?= $block->escapeHtml(__('SKU')) ?></th>
-+                <th><?= $block->escapeHtml(__('Compatible File Extensions')) ?></th>
-+                <th><?= $block->escapeHtml(__('Maximum Image Size')) ?></th>
-             </tr>
-             </thead>
-             <tr>
-                 <?php if ($block->getCanReadPrice() !== false) : ?>
--                <td class="opt-price">
--                    <input name="product[options][<%- data.option_id %>][price]" data-store-label="<%- data.price %>"
--                           class="input-text validate-zero-or-greater" type="text" value="<%- data.price %>"
--                        <?php if ($block->getCanEditPrice() === false) : ?>
--                           disabled="disabled"
--                        <?php endif; ?>>
--                </td>
--                <td class="opt-price-type"><?= $block->getPriceTypeSelectHtml('data-attr="price-type"') ?><%- data.checkboxScopePrice %></td>
-+                    <td class="opt-price">
-+                        <input name="product[options][<%- data.option_id %>][price]" data-store-label="<%- data.price %>"
-+                               class="input-text validate-zero-or-greater" type="text" value="<%- data.price %>"
-+                            <?php if ($block->getCanEditPrice() === false) : ?>
-+                                disabled="disabled"
-+                            <?php endif; ?>>
-+                    </td>
-+                    <td class="opt-price-type"><?= $block->getPriceTypeSelectHtml('data-attr="price-type"') ?><%- data.checkboxScopePrice %></td>
-                 <?php else : ?>
--                <input name="product[options][<%- data.option_id %>][price]" type="hidden">
--                <input id="product_option_<%- data.option_id %>_price_type" name="product[options][<%- data.option_id %>][price_type]" type="hidden">
-+                    <input name="product[options][<%- data.option_id %>][price]" type="hidden">
-+                    <input id="product_option_<%- data.option_id %>_price_type" name="product[options][<%- data.option_id %>][price_type]" type="hidden">
-                 <?php endif; ?>
-                 <td>
-                     <input name="product[options][<%- data.option_id %>][sku]" class="input-text" type="text" value="<%- data.sku %>">
-@@ -42,10 +40,15 @@
-                 <td>
-                     <input name="product[options][<%- data.option_id %>][file_extension]" class="input-text" type="text" value="<%- data.file_extension %>">
-                 </td>
--                <td class="col-file"><?php /* @escapeNotVerified */ echo __('%1 <span>x</span> %2 <span>px.</span>',
--                    '<input class="input-text" type="text" name="product[options][<%- data.option_id %>][image_size_x]" value="<%- data.image_size_x %>">',
--                    '<input class="input-text" type="text" name="product[options][<%- data.option_id %>][image_size_y]" value="<%- data.image_size_y %>">') ?>
--                    <div class="note"><?= /* @escapeNotVerified */ __('Please leave blank if it is not an image.') ?></div>
-+                <td class="col-file"><?= $block->escapeHtml(
-+                    __(
-+                        '%1 <span>x</span> %2 <span>px.</span>',
-+                        '<input class="input-text" type="text" name="product[options][<%- data.option_id %>][image_size_x]" value="<%- data.image_size_x %>">',
-+                        '<input class="input-text" type="text" name="product[options][<%- data.option_id %>][image_size_y]" value="<%- data.image_size_y %>">'
-+                    ),
-+                    ['span', 'input']
-+                ) ?>
-+                    <div class="note"><?= $block->escapeHtml(__('Please leave blank if it is not an image.')) ?></div>
-                 </td>
-             </tr>
-         </table>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml
-index e8c398228a4..c7ff03a08d9 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Select */ ?>
- <script id="custom-option-select-type-template" type="text/x-magento-template">
-@@ -14,12 +12,12 @@
-             <thead>
-                 <tr>
-                     <th class="col-draggable">&nbsp;</th>
--                    <th class="col-name required"><?= /* @escapeNotVerified */ __('Title') ?><span class="required">*</span></th>
-+                    <th class="col-name required"><?= $block->escapeHtml(__('Title')) ?><span class="required">*</span></th>
-                     <?php if ($block->getCanReadPrice() !== false) : ?>
--                    <th class="col-price"><?= /* @escapeNotVerified */ __('Price') ?></th>
--                    <th class="col-price-type"><?= /* @escapeNotVerified */ __('Price Type') ?></th>
-+                    <th class="col-price"><?= $block->escapeHtml(__('Price')) ?></th>
-+                    <th class="col-price-type"><?= $block->escapeHtml(__('Price Type')) ?></th>
-                     <?php endif; ?>
--                    <th class="col-sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
-+                    <th class="col-sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-                     <th class="col-actions">&nbsp;</th>
-                 </tr>
-             </thead>
-@@ -38,7 +36,7 @@
-     <tr id="product_option_<%- data.id %>_select_<%- data.select_id %>">
-         <td class="col-draggable">
-             <div data-role="draggable-handle" class="draggable-handle"
--                 title="<?= /* @escapeNotVerified */ __('Sort Custom Option') ?>"></div>
-+                 title="<?= $block->escapeHtmlAttr(__('Sort Custom Option')) ?>"></div>
-             <input name="product[options][<%- data.id %>][values][<%- data.select_id %>][sort_order]" type="hidden" value="<%- data.sort_order %>">
-         </td>
-         <td class="col-name select-opt-title">
-@@ -58,7 +56,7 @@
-                 <?php endif; ?>>
-         </td>
-         <td class="col-price-type select-opt-price-type">
--            <?= /* @escapeNotVerified */ $block->getPriceTypeSelectHtml('data-attr="price-type" <% if (typeof data.scopePriceDisabled != "undefined" && data.scopePriceDisabled != null) { %> disabled="disabled" <% } %>') ?><%- data.checkboxScopePrice %>
-+            <?= /* @noEscape */ $block->getPriceTypeSelectHtml('data-attr="price-type" <% if (typeof data.scopePriceDisabled != "undefined" && data.scopePriceDisabled != null) { %> disabled="disabled" <% } %>') ?><%- data.checkboxScopePrice %>
-         </td>
-         <?php else : ?>
-         <input id="product_option_<%- data.id %>_select_<%- data.select_id %>_price" name="product[options][<%- data.id %>][values][<%- data.select_id %>][price]" type="hidden">
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
-index c9d7190589f..89da5d633ef 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Text */ ?>
- <script id="custom-option-text-type-template" type="text/x-magento-template">
-@@ -14,11 +12,11 @@
-             <thead>
-             <tr>
-                 <?php if ($block->getCanReadPrice() !== false) : ?>
--                <th class="type-price"><?= /* @escapeNotVerified */ __('Price') ?></th>
--                <th class="type-type"><?= /* @escapeNotVerified */ __('Price Type') ?></th>
-+                <th class="type-price"><?= $block->escapeHtml(__('Price')) ?></th>
-+                <th class="type-type"><?= $block->escapeHtml(__('Price Type')) ?></th>
-                 <?php endif; ?>
--                <th class="type-sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
--                <th class="type-last last"><?= /* @escapeNotVerified */ __('Max Characters') ?></th>
-+                <th class="type-sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-+                <th class="type-last last"><?= $block->escapeHtml(__('Max Characters')) ?></th>
-             </tr>
-             </thead>
-             <tr>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
-index 57715744823..e66a18c677c 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- 
- /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Tier */
- $element = $block->getElement();
-@@ -20,28 +20,28 @@ $element = $block->getElement();
- 
- <?php $_showWebsite = $block->isShowWebsiteColumn(); ?>
- <?php $_showWebsite = $block->isMultiWebsites(); ?>
--<div class="field" id="attribute-<?= /* @escapeNotVerified */ $_htmlId ?>-container" data-attribute-code="<?= /* @escapeNotVerified */ $_htmlId ?>"
-+<div class="field" id="attribute-<?= /* @noEscape */ $_htmlId ?>-container" data-attribute-code="<?= /* @noEscape */ $_htmlId ?>"
-      data-apply-to="<?= $block->escapeHtml(
--         $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
-+         $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode(
-              $element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : []
-          )
-      )?>">
--    <label class="label"><span><?= /* @escapeNotVerified */ $block->getElement()->getLabel() ?></span></label>
-+    <label class="label"><span><?= $block->escapeHtml($block->getElement()->getLabel()) ?></span></label>
-     <div class="control">
-         <table class="admin__control-table tiers_table" id="tiers_table">
-             <thead>
-                 <tr>
--                    <th class="col-websites" <?php if (!$_showWebsite): ?>style="display:none"<?php endif; ?>><?= /* @escapeNotVerified */ __('Web Site') ?></th>
--                    <th class="col-customer-group"><?= /* @escapeNotVerified */ __('Customer Group') ?></th>
--                    <th class="col-qty required"><?= /* @escapeNotVerified */ __('Quantity') ?></th>
--                    <th class="col-price required"><?= /* @escapeNotVerified */ $block->getPriceColumnHeader(__('Item Price')) ?></th>
--                    <th class="col-delete"><?= /* @escapeNotVerified */ __('Action') ?></th>
-+                    <th class="col-websites" <?php if (!$_showWebsite) :?>style="display:none"<?php endif; ?>><?= $block->escapeHtml(__('Web Site')) ?></th>
-+                    <th class="col-customer-group"><?= $block->escapeHtml(__('Customer Group')) ?></th>
-+                    <th class="col-qty required"><?= $block->escapeHtml(__('Quantity')) ?></th>
-+                    <th class="col-price required"><?= $block->escapeHtml($block->getPriceColumnHeader(__('Item Price'))) ?></th>
-+                    <th class="col-delete"><?= $block->escapeHtml(__('Action')) ?></th>
-                 </tr>
-             </thead>
--            <tbody id="<?= /* @escapeNotVerified */ $_htmlId ?>_container"></tbody>
-+            <tbody id="<?= /* @noEscape */ $_htmlId ?>_container"></tbody>
-             <tfoot>
-                 <tr>
--                    <td colspan="<?php if (!$_showWebsite): ?>4<?php else: ?>5<?php endif; ?>" class="col-actions-add"><?= $block->getAddButtonHtml() ?></td>
-+                    <td colspan="<?php if (!$_showWebsite) :?>4<?php else :?>5<?php endif; ?>" class="col-actions-add"><?= $block->getAddButtonHtml() ?></td>
-                 </tr>
-             </tfoot>
-         </table>
-@@ -55,39 +55,39 @@ require([
- 
- //<![CDATA[
- var tierPriceRowTemplate = '<tr>'
--    + '<td class="col-websites"<?php if (!$_showWebsite): ?> style="display:none"<?php endif; ?>>'
--    + '<select class="<?= /* @escapeNotVerified */ $_htmlClass ?> required-entry" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][website_id]" id="tier_price_row_<%- data.index %>_website">'
--    <?php foreach ($block->getWebsites() as $_websiteId => $_info): ?>
--    + '<option value="<?= /* @escapeNotVerified */ $_websiteId ?>"><?= $block->escapeJs($_info['name']) ?><?php if (!empty($_info['currency'])): ?> [<?= $block->escapeHtml($_info['currency']) ?>]<?php endif; ?></option>'
-+    + '<td class="col-websites"<?php if (!$_showWebsite) :?> style="display:none"<?php endif; ?>>'
-+    + '<select class="<?= $block->escapeHtmlAttr($_htmlClass) ?> required-entry" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][website_id]" id="tier_price_row_<%- data.index %>_website">'
-+    <?php foreach ($block->getWebsites() as $_websiteId => $_info) :?>
-+    + '<option value="<?= $block->escapeHtmlAttr($_websiteId) ?>"><?= $block->escapeHtml($_info['name']) ?><?php if (!empty($_info['currency'])) :?> [<?= $block->escapeHtml($_info['currency']) ?>]<?php endif; ?></option>'
-     <?php endforeach ?>
-     + '</select></td>'
--    + '<td class="col-customer-group"><select class="<?= /* @escapeNotVerified */ $_htmlClass ?> custgroup required-entry" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][cust_group]" id="tier_price_row_<%- data.index %>_cust_group">'
--    <?php foreach ($block->getCustomerGroups() as $_groupId => $_groupName): ?>
--    + '<option value="<?= /* @escapeNotVerified */ $_groupId ?>"><?= $block->escapeJs($_groupName) ?></option>'
-+    + '<td class="col-customer-group"><select class="<?= $block->escapeHtmlAttr($_htmlClass) ?> custgroup required-entry" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][cust_group]" id="tier_price_row_<%- data.index %>_cust_group">'
-+    <?php foreach ($block->getCustomerGroups() as $_groupId => $_groupName) :?>
-+    + '<option value="<?= $block->escapeHtmlAttr($_groupId) ?>"><?= $block->escapeHtml($_groupName) ?></option>'
-     <?php endforeach ?>
-     + '</select></td>'
-     + '<td class="col-qty">'
--        + '<input class="<?= /* @escapeNotVerified */ $_htmlClass ?> qty required-entry validate-greater-than-zero" type="text" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][price_qty]" value="<%- data.qty %>" id="tier_price_row_<%- data.index %>_qty" />'
--        + '<span><?= /* @escapeNotVerified */ __("and above") ?></span>'
-+        + '<input class="<?= $block->escapeHtmlAttr($_htmlClass) ?> qty required-entry validate-greater-than-zero" type="text" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][price_qty]" value="<%- data.qty %>" id="tier_price_row_<%- data.index %>_qty" />'
-+        + '<span><?= $block->escapeHtml(__("and above")) ?></span>'
-     + '</td>'
--    + '<td class="col-price"><input class="<?= /* @escapeNotVerified */ $_htmlClass ?> required-entry <?= /* @escapeNotVerified */ $_priceValueValidation ?>" type="text" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][price]" value="<%- data.price %>" id="tier_price_row_<%- data.index %>_price" /></td>'
--    + '<td class="col-delete"><input type="hidden" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][delete]" class="delete" value="" id="tier_price_row_<%- data.index %>_delete" />'
--    + '<button title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Delete Tier')) ?>" type="button" class="action- scalable delete icon-btn delete-product-option" id="tier_price_row_<%- data.index %>_delete_button" onclick="return tierPriceControl.deleteItem(event);">'
--    + '<span><?= /* @escapeNotVerified */ __("Delete") ?></span></button></td>'
-+    + '<td class="col-price"><input class="<?= $block->escapeHtmlAttr($_htmlClass) ?> required-entry <?= $block->escapeHtmlAttr($_priceValueValidation) ?>" type="text" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][price]" value="<%- data.price %>" id="tier_price_row_<%- data.index %>_price" /></td>'
-+    + '<td class="col-delete"><input type="hidden" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][delete]" class="delete" value="" id="tier_price_row_<%- data.index %>_delete" />'
-+    + '<button title="<?= $block->escapeHtml(__('Delete Tier')) ?>" type="button" class="action- scalable delete icon-btn delete-product-option" id="tier_price_row_<%- data.index %>_delete_button" onclick="return tierPriceControl.deleteItem(event);">'
-+    + '<span><?= $block->escapeHtml(__("Delete")) ?></span></button></td>'
-     + '</tr>';
- 
- var tierPriceControl = {
-     template: mageTemplate(tierPriceRowTemplate),
-     itemsCount: 0,
-     addItem : function () {
--        <?php if ($_readonly): ?>
-+        <?php if ($_readonly) :?>
-         if (arguments.length < 4) {
-             return;
-         }
-         <?php endif; ?>
-         var data = {
--            website_id: '<?= /* @escapeNotVerified */ $block->getDefaultWebsite() ?>',
--            group: '<?= /* @escapeNotVerified */ $block->getDefaultCustomerGroup() ?>',
-+            website_id: '<?= (int) $block->getDefaultWebsite() ?>',
-+            group: '<?= (int) $block->getDefaultCustomerGroup() ?>',
-             qty: '',
-             price: '',
-             readOnly: false,
-@@ -104,7 +104,7 @@ var tierPriceControl = {
-             data.readOnly = arguments[4];
-         }
- 
--        Element.insert($('<?= /* @escapeNotVerified */ $_htmlId ?>_container'), {
-+        Element.insert($('<?= $block->escapeJs($_htmlId) ?>_container'), {
-             bottom : this.template({
-                 data: data
-             })
-@@ -113,7 +113,7 @@ var tierPriceControl = {
-         $('tier_price_row_' + data.index + '_cust_group').value = data.group;
-         $('tier_price_row_' + data.index + '_website').value    = data.website_id;
- 
--        <?php if ($block->isShowWebsiteColumn() && !$block->isAllowChangeWebsite()):?>
-+        <?php if ($block->isShowWebsiteColumn() && !$block->isAllowChangeWebsite()) :?>
-         var wss = $('tier_price_row_' + data.index + '_website');
-         var txt = wss.options[wss.selectedIndex].text;
- 
-@@ -128,11 +128,11 @@ var tierPriceControl = {
-             $('tier_price_row_'+data.index+'_delete_button').hide();
-         }
- 
--        <?php if ($_readonly): ?>
--        $('<?= /* @escapeNotVerified */ $_htmlId ?>_container').select('input', 'select').each(this.disableElement);
--        $('<?= /* @escapeNotVerified */ $_htmlId ?>_container').up('table').select('button').each(this.disableElement);
--        <?php else: ?>
--        $('<?= /* @escapeNotVerified */ $_htmlId ?>_container').select('input', 'select').each(function(el){ Event.observe(el, 'change', el.setHasChanges.bind(el)); });
-+        <?php if ($_readonly) :?>
-+        $('<?= $block->escapeJs($_htmlId) ?>_container').select('input', 'select').each(this.disableElement);
-+        $('<?= $block->escapeJs($_htmlId) ?>_container').up('table').select('button').each(this.disableElement);
-+        <?php else :?>
-+        $('<?= $block->escapeJs($_htmlId) ?>_container').select('input', 'select').each(function(el){ Event.observe(el, 'change', el.setHasChanges.bind(el)); });
-         <?php endif; ?>
-     },
-     disableElement: function(el) {
-@@ -150,11 +150,11 @@ var tierPriceControl = {
-         return false;
-     }
- };
--<?php foreach ($block->getValues() as $_item): ?>
--tierPriceControl.addItem('<?= /* @escapeNotVerified */ $_item['website_id'] ?>', '<?= /* @escapeNotVerified */ $_item['cust_group'] ?>', '<?= /* @escapeNotVerified */ $_item['price_qty']*1 ?>', '<?= /* @escapeNotVerified */ $_item['price'] ?>', <?= (int)!empty($_item['readonly']) ?>);
-+<?php foreach ($block->getValues() as $_item) :?>
-+tierPriceControl.addItem('<?= $block->escapeJs($_item['website_id']) ?>', '<?= $block->escapeJs($_item['cust_group']) ?>', '<?= $_item['price_qty']*1 ?>', '<?= $block->escapeJs($_item['price']) ?>', <?= (int)!empty($_item['readonly']) ?>);
- <?php endforeach; ?>
--<?php if ($_readonly): ?>
--$('<?= /* @escapeNotVerified */ $_htmlId ?>_container').up('table').select('button')
-+<?php if ($_readonly) :?>
-+$('<?= $block->escapeJs($_htmlId) ?>_container').up('table').select('button')
-     .each(tierPriceControl.disableElement);
- <?php endif; ?>
- 
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
-index 44fdb75cdac..0c1da98c7d8 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
-@@ -4,9 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Ajax\Serializer */
- ?>
- 
-+// phpcs:disable Magento2.Security.InsecureFunction.DiscouragedWithAlternative
- <?php $_id = 'id_' . md5(microtime()) ?>
--<input type="hidden" name="<?= /* @escapeNotVerified */ $block->getInputElementName() ?>"  value="" id="<?= /* @escapeNotVerified */ $_id ?>" />
-+<input type="hidden"
-+       name="<?= $block->escapeHtmlAttr($block->getInputElementName()) ?>"
-+       value=""
-+       id="<?= /* @noEscape */ $_id ?>" />
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
-index 8f7f20f32d9..0193d7764cb 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
-@@ -4,16 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Websites */
- ?>
- <fieldset id="grop_fields" class="fieldset">
--    <legend class="legend"><span><?= /* @escapeNotVerified */ __('Product In Websites') ?></span></legend>
-+    <legend class="legend"><span><?= $block->escapeHtml(__('Product In Websites')) ?></span></legend>
-     <br>
--    <?php if ($block->getProductId()): ?>
-+    <?php if ($block->getProductId()) :?>
-     <div class="messages">
-         <div class="message message-notice">
--            <?= /* @escapeNotVerified */ __('To hide an item in catalog or search results, set the status to "Disabled".') ?>
-+            <?= $block->escapeHtml(__('To hide an item in catalog or search results, set the status to "Disabled".')) ?>
-         </div>
-     </div>
-     <?php endif; ?>
-@@ -21,22 +20,36 @@
-         <?= $block->getHintHtml() ?>
-         <div class="store-tree">
-             <?php $_websites = $block->getWebsiteCollection() ?>
--            <?php foreach ($_websites as $_website): ?>
-+            <?php foreach ($_websites as $_website) :?>
-             <div class="website-name">
--                <input name="product[website_ids][]" value="<?= /* @escapeNotVerified */ $_website->getId() ?>" <?php if ($block->isReadonly()): ?>  disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>" type="checkbox"<?php if ($block->hasWebsite($_website->getId()) || !$block->getProductId() && count($_websites) === 1): ?> checked="checked"<?php endif; ?> />
--                <label for="product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
-+                <input name="product[website_ids][]"
-+                       value="<?= (int) $_website->getId() ?>"
-+                    <?php if ($block->isReadonly()) :?>
-+                        disabled="disabled"
-+                    <?php endif;?>
-+                       class="checkbox website-checkbox"
-+                       id="product_website_<?= (int) $_website->getId() ?>"
-+                       type="checkbox"
-+                    <?php if ($block->hasWebsite($_website->getId()) || !$block->getProductId() && count($_websites) === 1) :?>
-+                        checked="checked"
-+                    <?php endif; ?>
-+                />
-+                <label for="product_website_<?= (int) $_website->getId() ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
-             </div>
--            <dl class="webiste-groups" id="product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>_data">
--                <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
-+            <dl class="webiste-groups" id="product_website_<?= (int) $_website->getId() ?>_data">
-+                <?php foreach ($block->getGroupCollection($_website) as $_group) :?>
-                 <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
-                 <dd>
-                     <ul>
--                        <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
-+                        <?php foreach ($block->getStoreCollection($_group) as $_store) :?>
-                         <li>
-                             <?= $block->escapeHtml($_store->getName()) ?>
--                            <?php if ($block->getWebsites() && !$block->hasWebsite($_website->getId())): ?>
--                            <span class="website-<?= /* @escapeNotVerified */ $_website->getId() ?>-select" style="display:none">
--                            <?= __('(Copy data from: %1)', $block->getChooseFromStoreHtml($_store)) ?>
-+                            <?php if ($block->getWebsites() && !$block->hasWebsite($_website->getId())) :?>
-+                                <span class="website-<?= (int) $_website->getId() ?>-select" style="display:none">
-+                                <?= $block->escapeHtml(
-+                                    __('(Copy data from: %1)', $block->getChooseFromStoreHtml($_store)),
-+                                    ['select', 'option', 'optgroup']
-+                                ) ?>
-                             </span>
-                             <?php endif; ?>
-                         </li>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
-index 574c9ee81af..ca77aa28ea6 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- 
- /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
- $elementName = $block->getElement()->getName() . '[images]';
-@@ -16,61 +16,60 @@ $formName = $block->getFormName();
-      data-parent-component="<?= $block->escapeHtml($block->getData('config/parentComponent')) ?>"
-      data-images="<?= $block->escapeHtml($block->getImagesJson()) ?>"
-      data-types="<?= $block->escapeHtml(
--         $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
-+         $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes())
-      ) ?>"
--    >
-+>
-     <?php if (!$block->getElement()->getReadonly()) {?>
-         <div class="image image-placeholder">
-             <?= $block->getUploaderHtml() ?>
-             <div class="product-image-wrapper">
-                 <p class="image-placeholder-text">
--                    <?= /* @escapeNotVerified */ __('Browse to find or drag image here') ?>
-+                    <?= $block->escapeHtml(__('Browse to find or drag image here')) ?>
-                 </p>
-             </div>
-         </div>
-     <?php } ?>
-     <?php foreach ($block->getImageTypes() as $typeData) {
--    ?>
--        <input name="<?= $block->escapeHtml($typeData['name']) ?>"
--               data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
--               class="image-<?= $block->escapeHtml($typeData['code']) ?>"
-+        ?>
-+        <input name="<?= $block->escapeHtmlAttr($typeData['name']) ?>"
-+               data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
-+               class="image-<?= $block->escapeHtmlAttr($typeData['code']) ?>"
-                type="hidden"
--               value="<?= $block->escapeHtml($typeData['value']) ?>"/>
--    <?php
--
-+               value="<?= $block->escapeHtmlAttr($typeData['value']) ?>"/>
-+        <?php
- } ?>
- 
-     <script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template">
-         <div class="image item<% if (data.disabled == 1) { %> hidden-for-front<% } %>"
-              data-role="image">
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][position]"
-+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][position]"
-                    value="<%- data.position %>"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-+                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
-                    class="position"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][file]"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][file]"
-+                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
-                    value="<%- data.file %>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][value_id]"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][value_id]"
-+                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
-                    value="<%- data.value_id %>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][label]"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][label]"
-+                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
-                    value="<%- data.label %>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][disabled]"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][disabled]"
-+                   data-form-part="<?= $block->escapeHtmlAttr(formName) ?>"
-                    value="<%- data.disabled %>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][media_type]"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][media_type]"
-+                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
-                    value="image"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][removed]"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][removed]"
-+                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
-                    value=""
-                    class="is-removed"/>
- 
-@@ -84,21 +83,21 @@ $formName = $block->getFormName();
-                     <button type="button"
-                             class="action-remove"
-                             data-role="delete-button"
--                            title="<?= /* @escapeNotVerified */ __('Delete image') ?>">
-+                            title="<?= $block->escapeHtmlAttr(__('Delete image')) ?>">
-                     <span>
--                        <?= /* @escapeNotVerified */ __('Delete image') ?>
-+                        <?= $block->escapeHtml(__('Delete image')) ?>
-                     </span>
-                     </button>
-                     <div class="draggable-handle"></div>
-                 </div>
--                <div class="image-fade"><span><?= /* @escapeNotVerified */ __('Hidden') ?></span></div>
-+                <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')) ?></span></div>
-             </div>
- 
- 
-             <div class="item-description">
-                 <div class="item-title" data-role="img-title"><%- data.label %></div>
-                 <div class="item-size">
--                  <span data-role="image-dimens"></span>, <span data-role="image-size"><%- data.sizeLabel %></span>
-+                    <span data-role="image-dimens"></span>, <span data-role="image-size"><%- data.sizeLabel %></span>
-                 </div>
-             </div>
- 
-@@ -106,12 +105,9 @@ $formName = $block->getFormName();
-                 <?php
-                 foreach ($block->getImageTypes() as $typeData) {
-                     ?>
--                    <li data-role-code="<?php /* @escapeNotVerified */ echo $block->escapeHtml(
--                        $typeData['code']
--                    ) ?>" class="item-role item-role-<?php /* @escapeNotVerified */ echo $block->escapeHtml(
--                        $typeData['code']
--                    ) ?>">
--                        <?= /* @escapeNotVerified */ $block->escapeHtml($typeData['label']) ?>
-+                    <li data-role-code="<?= $block->escapeHtmlAttr($typeData['code']) ?>"
-+                        class="item-role item-role-<?= $block->escapeHtmlAttr($typeData['code']) ?>">
-+                        <?= $block->escapeHtml($typeData['label']) ?>
-                     </li>
-                     <?php
-                 }
-@@ -121,98 +117,94 @@ $formName = $block->getFormName();
-     </script>
- 
-     <script data-role="img-dialog-container-tmpl" type="text/x-magento-template">
--      <div class="image-panel" data-role="dialog">
--      </div>
-+        <div class="image-panel" data-role="dialog">
-+        </div>
-     </script>
- 
-     <script data-role="img-dialog-tmpl" type="text/x-magento-template">
--            <div class="image-panel-preview">
--                <img src="<%- data.url %>" alt="<%- data.label %>" />
--            </div>
--            <div class="image-panel-controls">
--                <strong class="image-name"><%- data.label %></strong>
-+        <div class="image-panel-preview">
-+            <img src="<%- data.url %>" alt="<%- data.label %>" />
-+        </div>
-+        <div class="image-panel-controls">
-+            <strong class="image-name"><%- data.label %></strong>
- 
--                <fieldset class="admin__fieldset fieldset-image-panel">
--                    <div class="admin__field field-image-description">
--                        <label class="admin__field-label" for="image-description">
--                            <span><?= /* @escapeNotVerified */ __('Alt Text') ?></span>
--                        </label>
-+            <fieldset class="admin__fieldset fieldset-image-panel">
-+                <div class="admin__field field-image-description">
-+                    <label class="admin__field-label" for="image-description">
-+                        <span><?= $block->escapeHtml(__('Alt Text')) ?></span>
-+                    </label>
- 
--                        <div class="admin__field-control">
-+                    <div class="admin__field-control">
-                             <textarea data-role="image-description"
-                                       rows="3"
-                                       class="admin__control-textarea"
--                                      name="<?php /* @escapeNotVerified */
--                                      echo $elementName
--                                      ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
--                        </div>
--                    </div>
-+                                      name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
-+                      </div>
-+                </div>
- 
--                    <div class="admin__field field-image-role">
--                        <label class="admin__field-label">
--                            <span><?= /* @escapeNotVerified */ __('Role') ?></span>
--                        </label>
--                        <div class="admin__field-control">
--                            <ul class="multiselect-alt">
--                                <?php
--                                foreach ($block->getMediaAttributes() as $attribute) :
--                                    ?>
--                                    <li class="item">
--                                        <label>
--                                            <input class="image-type"
--                                                   data-role="type-selector"
--                                                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
--                                                   type="checkbox"
--                                                   value="<?php /* @escapeNotVerified */ echo $block->escapeHtml(
--                                                       $attribute->getAttributeCode()
--                                                   ) ?>"
--                                                />
--                                            <?php /* @escapeNotVerified */ echo $block->escapeHtml(
--                                                $attribute->getFrontendLabel()
--                                            ) ?>
--                                        </label>
--                                    </li>
-+                <div class="admin__field field-image-role">
-+                    <label class="admin__field-label">
-+                        <span><?= $block->escapeHtml(__('Role')) ?></span>
-+                    </label>
-+                    <div class="admin__field-control">
-+                        <ul class="multiselect-alt">
-+                            <?php
-+                            foreach ($block->getMediaAttributes() as $attribute) :
-+                                ?>
-+                                <li class="item">
-+                                    <label>
-+                                        <input class="image-type"
-+                                               data-role="type-selector"
-+                                               data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
-+                                               type="checkbox"
-+                                               value="<?= $block->escapeHtmlAttr($attribute->getAttributeCode()) ?>"
-+                                               />
-+                                        <?= $block->escapeHtml(
-+                                            $attribute->getFrontendLabel()
-+                                        ) ?>
-+                                    </label>
-+                                </li>
-                                 <?php
-                                 endforeach;
--                                ?>
--                            </ul>
--                        </div>
-+                            ?>
-+                        </ul>
-                     </div>
-+                </div>
- 
--                    <div class="admin__field admin__field-inline field-image-size" data-role="size">
--                        <label class="admin__field-label">
--                            <span><?= /* @escapeNotVerified */ __('Image Size') ?></span>
--                        </label>
--                        <div class="admin__field-value" data-message="<?= /* @escapeNotVerified */ __('{size}') ?>"></div>
--                    </div>
-+                <div class="admin__field admin__field-inline field-image-size" data-role="size">
-+                    <label class="admin__field-label">
-+                        <span><?= $block->escapeHtml(__('Image Size')) ?></span>
-+                    </label>
-+                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(__('{size}')) ?>"></div>
-+                </div>
- 
--                    <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
--                        <label class="admin__field-label">
--                            <span><?= /* @escapeNotVerified */ __('Image Resolution') ?></span>
--                        </label>
--                        <div class="admin__field-value" data-message="<?= /* @escapeNotVerified */ __('{width}^{height} px') ?>"></div>
--                    </div>
-+                <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
-+                    <label class="admin__field-label">
-+                        <span><?= $block->escapeHtml(__('Image Resolution')) ?></span>
-+                    </label>
-+                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(__('{width}^{height} px')) ?>"></div>
-+                </div>
- 
--                    <div class="admin__field field-image-hide">
--                        <div class="admin__field-control">
--                            <div class="admin__field admin__field-option">
--                                <input type="checkbox"
--                                       id="hide-from-product-page"
--                                       data-role="visibility-trigger"
--                                       data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
--                                       value="1"
--                                       class="admin__control-checkbox"
--                                       name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][disabled]"
--                                <% if (data.disabled == 1) { %>checked="checked"<% } %> />
--
--                                <label for="hide-from-product-page" class="admin__field-label">
--                                    <?= /* @escapeNotVerified */ __('Hide from Product Page') ?>
--                                </label>
--                            </div>
-+                <div class="admin__field field-image-hide">
-+                    <div class="admin__field-control">
-+                        <div class="admin__field admin__field-option">
-+                            <input type="checkbox"
-+                                   id="hide-from-product-page"
-+                                   data-role="visibility-trigger"
-+                                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
-+                                   value="1"
-+                                   class="admin__control-checkbox"
-+                                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][disabled]"
-+                            <% if (data.disabled == 1) { %>checked="checked"<% } %> />
-+
-+                            <label for="hide-from-product-page" class="admin__field-label">
-+                                <?= $block->escapeHtml(__('Hide from Product Page')) ?>
-+                            </label>
-                         </div>
-                     </div>
--                </fieldset>
--            </div>
-+                </div>
-+            </fieldset>
-+        </div>
-     </script>
-     <?= $block->getChildHtml('new-video') ?>
- </div>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
-index 4134392c0f5..0a13aee5930 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- 
- /** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Js $block */
- ?>
-@@ -30,8 +30,8 @@ function registerTaxRecalcs() {
-     Event.observe($('tax_class_id'), 'change', recalculateTax);
- }
- 
--var priceFormat = <?= /* @escapeNotVerified */ $this->helper('Magento\Tax\Helper\Data')->getPriceFormat($block->getStore()) ?>;
--var taxRates = <?= /* @escapeNotVerified */ $block->getAllRatesByProductClassJson() ?>;
-+var priceFormat = <?= /* @noEscape */ $this->helper(Magento\Tax\Helper\Data::class)->getPriceFormat($block->getStore()) ?>;
-+var taxRates = <?= /* @noEscape */ $block->getAllRatesByProductClassJson() ?>;
- 
- function recalculateTax() {
-     if (typeof dynamicTaxes == 'undefined') {
-@@ -75,10 +75,10 @@ function bindActiveProductTab(event, ui) {
- jQuery(document).on('tabsactivate', bindActiveProductTab);
- 
- // bind active tab
--<?php if ($tabsBlock = $block->getLayout()->getBlock('product_tabs')): ?>
-+<?php if ($tabsBlock = $block->getLayout()->getBlock('product_tabs')) :?>
- jQuery(function () {
--    if (jQuery('#<?= /* @escapeNotVerified */ $tabsBlock->getId() ?>').length && jQuery('#<?= /* @escapeNotVerified */ $tabsBlock->getId() ?>').is(':mage-tabs')) {
--        var activeAnchor = jQuery('#<?= /* @escapeNotVerified */ $tabsBlock->getId() ?>').tabs('activeAnchor');
-+    if (jQuery('#<?= $block->escapeJs($tabsBlock->getId()) ?>').length && jQuery('#<?= $block->escapeJs($tabsBlock->getId()) ?>').is(':mage-tabs')) {
-+        var activeAnchor = jQuery('#<?= $block->escapeJs($tabsBlock->getId()) ?>').tabs('activeAnchor');
-         if (activeAnchor && $('store_switcher')) {
-             $('store_switcher').switchParams = 'active_tab/' + activeAnchor.prop('name') + '/';
-         }
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/alert.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/alert.phtml
-index 5b07121de49..7c3bee3d4d2 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/alert.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/alert.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -14,7 +12,7 @@
- ?>
- <div id="alert_messages_block"><?= $block->getMessageHtml() ?></div>
- <div>
--    <h4 class="icon-head head-edit-form"><?= /* @escapeNotVerified */ __('Product Alerts') ?></h4>
-+    <h4 class="icon-head head-edit-form"><?= $block->escapeHtml(__('Product Alerts')) ?></h4>
- </div>
- <div class="clear"></div>
- <?= $block->getAccordionHtml() ?>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
-index 2c62bbf8db3..5028d3c1e83 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
-@@ -4,382 +4,448 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory */
- ?>
--<?php if ($block->isReadonly()): ?>
--<?php $_readonly = ' disabled="disabled" '; ?>
--<?php else: ?>
--<?php $_readonly = ''; ?>
-+<?php if ($block->isReadonly()) :?>
-+    <?php $_readonly = ' disabled="disabled" '; ?>
-+<?php else :?>
-+    <?php $_readonly = ''; ?>
- <?php endif; ?>
- <fieldset class="fieldset form-inline">
--<legend class="legend"><span><?= /* @escapeNotVerified */ __('Advanced Inventory') ?></span></legend>
--<br>
--<div id="table_cataloginventory">
--<div class="field">
--    <label class="label" for="inventory_manage_stock">
--        <span><?= /* @escapeNotVerified */ __('Manage Stock') ?></span>
--    </label>
--    <div class="control">
--        <select id="inventory_manage_stock" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][manage_stock]" <?= /* @escapeNotVerified */ $_readonly ?>>
--            <option value="1"><?= /* @escapeNotVerified */ __('Yes') ?></option>
--            <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
--        </select>
--        <input type="hidden" id="inventory_manage_stock_default" value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('manage_stock') ?>">
--        <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->isNew()) ? 'checked="checked"' : '' ?>
--        <input type="checkbox" id="inventory_use_config_manage_stock" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_manage_stock]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
--        <label for="inventory_use_config_manage_stock"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
--        <?php if (!$block->isReadonly()): ?>
--        <script>
--require(['prototype'], function(){
--toggleValueElements($('inventory_use_config_manage_stock'), $('inventory_use_config_manage_stock').parentNode);
--});
--</script>
--        <?php endif; ?>
--    </div>
--    <?php if (!$block->isSingleStoreMode()): ?>
--    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
--    <?php endif; ?>
--</div>
-+    <legend class="legend"><span><?= $block->escapeHtml(__('Advanced Inventory')) ?></span></legend>
-+    <br>
-+    <div id="table_cataloginventory">
-+        <div class="field">
-+            <label class="label" for="inventory_manage_stock">
-+                <span><?= $block->escapeHtml(__('Manage Stock')) ?></span>
-+            </label>
-+            <div class="control">
-+                <select id="inventory_manage_stock"
-+                        name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][manage_stock]" <?= /* @noEscape */ $_readonly ?>>
-+                    <option value="1"><?= $block->escapeHtml(__('Yes')) ?></option>
-+                    <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0) :?> selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
-+                </select>
-+                <input type="hidden"
-+                       id="inventory_manage_stock_default"
-+                       value="<?= $block->escapeHtmlAttr($block->getDefaultConfigValue('manage_stock')) ?>">
-+                <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->isNew()) ? 'checked="checked"' : '' ?>
-+                <input type="checkbox"
-+                       id="inventory_use_config_manage_stock"
-+                       name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_manage_stock]"
-+                       value="1" <?= /* @noEscape */ $_checked ?>
-+                       onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
-+                <label for="inventory_use_config_manage_stock"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
-+                <?php if (!$block->isReadonly()) :?>
-+                    <script>
-+                        require(['prototype'], function(){
-+                            toggleValueElements($('inventory_use_config_manage_stock'), $('inventory_use_config_manage_stock').parentNode);
-+                        });
-+                    </script>
-+                <?php endif; ?>
-+            </div>
-+            <?php if (!$block->isSingleStoreMode()) :?>
-+                <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
-+            <?php endif; ?>
-+        </div>
- 
--<?php if (!$block->getProduct()->isComposite()): ?>
--<div class="field">
--    <label class="label" for="inventory_qty">
--        <span><?= /* @escapeNotVerified */ __('Qty') ?></span>
--    </label>
--    <div class="control">
--        <?php if (!$_readonly): ?>
--        <input type="hidden" id="original_inventory_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][original_inventory_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('qty') * 1 ?>">
--        <?php endif;?>
--        <input type="text" class="input-text validate-number" id="inventory_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
--    </div>
--    <?php if (!$block->isSingleStoreMode()): ?>
--    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
--    <?php endif; ?>
--</div>
-+        <?php if (!$block->getProduct()->isComposite()) :?>
-+            <div class="field">
-+                <label class="label" for="inventory_qty">
-+                    <span><?= $block->escapeHtml(__('Qty')) ?></span>
-+                </label>
-+                <div class="control">
-+                    <?php if (!$_readonly) :?>
-+                        <input type="hidden"
-+                               id="original_inventory_qty"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][original_inventory_qty]"
-+                               value="<?= $block->getFieldValue('qty') * 1 ?>">
-+                    <?php endif;?>
-+                    <input type="text"
-+                           class="input-text validate-number"
-+                           id="inventory_qty"
-+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][qty]"
-+                           value="<?= $block->getFieldValue('qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
-+                </div>
-+                <?php if (!$block->isSingleStoreMode()) :?>
-+                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
-+                <?php endif; ?>
-+            </div>
- 
--<div class="field">
--    <label class="label" for="inventory_min_qty">
--        <span><?= /* @escapeNotVerified */ __('Out-of-Stock Threshold') ?></span>
--    </label>
--    <div class="control">
--        <input type="text" class="input-text validate-number" id="inventory_min_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][min_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('min_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
-+            <div class="field">
-+                <label class="label" for="inventory_min_qty">
-+                    <span><?= $block->escapeHtml(__('Out-of-Stock Threshold')) ?></span>
-+                </label>
-+                <div class="control">
-+                    <input type="text"
-+                           class="input-text validate-number"
-+                           id="inventory_min_qty"
-+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][min_qty]"
-+                           value="<?= $block->getFieldValue('min_qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
- 
--        <div class="control-inner-wrap">
--            <?php $_checked = ($block->getFieldValue('use_config_min_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
--            <input type="checkbox" id="inventory_use_config_min_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_min_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
--            <label for="inventory_use_config_min_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
--        </div>
-+                    <div class="control-inner-wrap">
-+                        <?php $_checked = ($block->getFieldValue('use_config_min_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
-+                        <input type="checkbox"
-+                               id="inventory_use_config_min_qty"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_min_qty]"
-+                               value="1" <?= /* @noEscape */ $_checked ?>
-+                               onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
-+                        <label for="inventory_use_config_min_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
-+                    </div>
- 
--        <?php if (!$block->isReadonly()): ?>
--        <script>
--require(["prototype"], function(){
--toggleValueElements($('inventory_use_config_min_qty'), $('inventory_use_config_min_qty').parentNode);
--});
--</script>
--        <?php endif; ?>
--    </div>
--    <?php if (!$block->isSingleStoreMode()): ?>
--    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
--    <?php endif; ?>
--</div>
-+                    <?php if (!$block->isReadonly()) :?>
-+                        <script>
-+                            require(["prototype"], function(){
-+                                toggleValueElements($('inventory_use_config_min_qty'), $('inventory_use_config_min_qty').parentNode);
-+                            });
-+                        </script>
-+                    <?php endif; ?>
-+                </div>
-+                <?php if (!$block->isSingleStoreMode()) :?>
-+                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
-+                <?php endif; ?>
-+            </div>
- 
--<div class="field">
--    <label class="label" for="inventory_min_sale_qty">
--        <span><?= /* @escapeNotVerified */ __('Minimum Qty Allowed in Shopping Cart') ?></span>
--    </label>
--    <div class="control">
--        <input type="text" class="input-text validate-number" id="inventory_min_sale_qty"
--               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][min_sale_qty]"
--               value="<?= /* @escapeNotVerified */ $block->getFieldValue('min_sale_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
--        <div class="control-inner-wrap">
--        <?php $_checked = ($block->getFieldValue('use_config_min_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
--            <input type="checkbox" id="inventory_use_config_min_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_min_sale_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?= /* @escapeNotVerified */ $_readonly ?>>
--            <label for="inventory_use_config_min_sale_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
--        </div>
--        <?php if (!$block->isReadonly()): ?>
--        <script>
--require(['prototype'], function(){
--toggleValueElements($('inventory_use_config_min_sale_qty'), $('inventory_use_config_min_sale_qty').parentNode);
--});
--</script>
--        <?php endif; ?>
--    </div>
--    <?php if (!$block->isSingleStoreMode()): ?>
--    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
--    <?php endif; ?>
--</div>
-+            <div class="field">
-+                <label class="label" for="inventory_min_sale_qty">
-+                    <span><?= $block->escapeHtml(__('Minimum Qty Allowed in Shopping Cart')) ?></span>
-+                </label>
-+                <div class="control">
-+                    <input type="text" class="input-text validate-number" id="inventory_min_sale_qty"
-+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][min_sale_qty]"
-+                           value="<?= $block->getFieldValue('min_sale_qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
-+                    <div class="control-inner-wrap">
-+                        <?php $_checked = ($block->getFieldValue('use_config_min_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
-+                        <input type="checkbox"
-+                               id="inventory_use_config_min_sale_qty"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_min_sale_qty]"
-+                               value="1" <?= /* @noEscape */ $_checked ?>
-+                               onclick="toggleValueElements(this, this.parentNode);"
-+                               class="checkbox" <?= /* @noEscape */ $_readonly ?>>
-+                        <label for="inventory_use_config_min_sale_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
-+                    </div>
-+                    <?php if (!$block->isReadonly()) :?>
-+                        <script>
-+                            require(['prototype'], function(){
-+                                toggleValueElements($('inventory_use_config_min_sale_qty'), $('inventory_use_config_min_sale_qty').parentNode);
-+                            });
-+                        </script>
-+                    <?php endif; ?>
-+                </div>
-+                <?php if (!$block->isSingleStoreMode()) :?>
-+                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
-+                <?php endif; ?>
-+            </div>
- 
--<div class="field">
--    <label class="label" for="inventory_max_sale_qty">
--        <span><?= /* @escapeNotVerified */ __('Maximum Qty Allowed in Shopping Cart') ?></span>
--    </label>
--    <div class="control">
--        <input type="text" class="input-text validate-number" id="inventory_max_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][max_sale_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('max_sale_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
--        <?php $_checked = ($block->getFieldValue('use_config_max_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
--        <div class="control-inner-wrap">
--            <input type="checkbox" id="inventory_use_config_max_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_max_sale_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?= /* @escapeNotVerified */ $_readonly ?>>
--            <label for="inventory_use_config_max_sale_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
--        </div>
--        <?php if (!$block->isReadonly()): ?>
--        <script>
--require(['prototype'], function(){
--toggleValueElements($('inventory_use_config_max_sale_qty'), $('inventory_use_config_max_sale_qty').parentNode);
--});
--</script>
--        <?php endif; ?>
--    </div>
--    <?php if (!$block->isSingleStoreMode()): ?>
--    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
--    <?php endif; ?>
--</div>
-+            <div class="field">
-+                <label class="label" for="inventory_max_sale_qty">
-+                    <span><?= $block->escapeHtml(__('Maximum Qty Allowed in Shopping Cart')) ?></span>
-+                </label>
-+                <div class="control">
-+                    <input type="text"
-+                           class="input-text validate-number"
-+                           id="inventory_max_sale_qty"
-+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][max_sale_qty]"
-+                           value="<?= $block->getFieldValue('max_sale_qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
-+                    <?php $_checked = ($block->getFieldValue('use_config_max_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
-+                    <div class="control-inner-wrap">
-+                        <input type="checkbox"
-+                               id="inventory_use_config_max_sale_qty"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_max_sale_qty]"
-+                               value="1" <?= /* @noEscape */ $_checked ?>
-+                               onclick="toggleValueElements(this, this.parentNode);"
-+                               class="checkbox" <?= /* @noEscape */ $_readonly ?>>
-+                        <label for="inventory_use_config_max_sale_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
-+                    </div>
-+                    <?php if (!$block->isReadonly()) :?>
-+                        <script>
-+                            require(['prototype'], function(){
-+                                toggleValueElements($('inventory_use_config_max_sale_qty'), $('inventory_use_config_max_sale_qty').parentNode);
-+                            });
-+                        </script>
-+                    <?php endif; ?>
-+                </div>
-+                <?php if (!$block->isSingleStoreMode()) :?>
-+                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
-+                <?php endif; ?>
-+            </div>
- 
--    <?php if ($block->canUseQtyDecimals()): ?>
--    <div class="field">
--        <label class="label" for="inventory_is_qty_decimal">
--            <span><?= /* @escapeNotVerified */ __('Qty Uses Decimals') ?></span>
--        </label>
--        <div class="control">
--            <select id="inventory_is_qty_decimal" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][is_qty_decimal]" <?= /* @escapeNotVerified */ $_readonly ?>>
--                <option value="0"><?= /* @escapeNotVerified */ __('No') ?></option>
--                <option value="1"<?php if ($block->getFieldValue('is_qty_decimal') == 1): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Yes') ?></option>
--            </select>
--        </div>
--        <?php if (!$block->isSingleStoreMode()): ?>
--        <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
--        <?php endif; ?>
--    </div>
-+            <?php if ($block->canUseQtyDecimals()) :?>
-+                <div class="field">
-+                    <label class="label" for="inventory_is_qty_decimal">
-+                        <span><?= $block->escapeHtml(__('Qty Uses Decimals')) ?></span>
-+                    </label>
-+                    <div class="control">
-+                        <select id="inventory_is_qty_decimal"
-+                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][is_qty_decimal]" <?= /* @noEscape */ $_readonly ?>>
-+                            <option value="0"><?= $block->escapeHtml(__('No')) ?></option>
-+                            <option value="1"<?php if ($block->getFieldValue('is_qty_decimal') == 1) :?> selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
-+                        </select>
-+                    </div>
-+                    <?php if (!$block->isSingleStoreMode()) :?>
-+                        <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
-+                    <?php endif; ?>
-+                </div>
- 
--        <?php if (!$block->isVirtual()) : ?>
--        <div class="field">
--            <label class="label" for="inventory_is_decimal_divided">
--                <span><?= /* @escapeNotVerified */ __('Allow Multiple Boxes for Shipping') ?></span>
--            </label>
--            <div class="control">
--                <select id="inventory_is_decimal_divided" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][is_decimal_divided]" <?= /* @escapeNotVerified */ $_readonly ?>>
--                    <option value="0"><?= /* @escapeNotVerified */ __('No') ?></option>
--                    <option value="1"<?php if ($block->getFieldValue('is_decimal_divided') == 1): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Yes') ?></option>
--                </select>
--            </div>
--            <?php if (!$block->isSingleStoreMode()): ?>
--            <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
-+                <?php if (!$block->isVirtual()) :?>
-+                    <div class="field">
-+                        <label class="label" for="inventory_is_decimal_divided">
-+                            <span><?= $block->escapeHtml(__('Allow Multiple Boxes for Shipping')) ?></span>
-+                        </label>
-+                        <div class="control">
-+                            <select id="inventory_is_decimal_divided"
-+                                    name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][is_decimal_divided]" <?= /* @noEscape */ $_readonly ?>>
-+                                <option value="0"><?= $block->escapeHtml(__('No')) ?></option>
-+                                <option value="1"<?php if ($block->getFieldValue('is_decimal_divided') == 1) :?>
-+                                    selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
-+                            </select>
-+                        </div>
-+                        <?php if (!$block->isSingleStoreMode()) :?>
-+                            <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
-+                        <?php endif; ?>
-+                    </div>
-+                <?php endif; ?>
-             <?php endif; ?>
--        </div>
--            <?php endif; ?>
--        <?php endif; ?>
- 
--<div class="field">
--    <label class="label" for="inventory_backorders">
--        <span><?= /* @escapeNotVerified */ __('Backorders') ?></span>
--    </label>
--    <div class="control">
--        <select id="inventory_backorders" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][backorders]" <?= /* @escapeNotVerified */ $_readonly ?>>
--            <?php foreach ($block->getBackordersOption() as $option): ?>
--            <?php $_selected = ($option['value'] == $block->getFieldValue('backorders')) ? 'selected="selected"' : '' ?>
--            <option value="<?= /* @escapeNotVerified */ $option['value'] ?>" <?= /* @escapeNotVerified */ $_selected ?>><?= /* @escapeNotVerified */ $option['label'] ?></option>
--            <?php endforeach; ?>
--        </select>
-+            <div class="field">
-+                <label class="label" for="inventory_backorders">
-+                    <span><?= $block->escapeHtml(__('Backorders')) ?></span>
-+                </label>
-+                <div class="control">
-+                    <select id="inventory_backorders"
-+                            name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][backorders]" <?= /* @noEscape */ $_readonly ?>>
-+                        <?php foreach ($block->getBackordersOption() as $option) :?>
-+                            <?php $_selected = ($option['value'] == $block->getFieldValue('backorders')) ? 'selected="selected"' : '' ?>
-+                            <option value="<?= $block->escapeHtmlAttr($option['value']) ?>" <?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?></option>
-+                        <?php endforeach; ?>
-+                    </select>
- 
--        <div class="control-inner-wrap">
--            <?php $_checked = ($block->getFieldValue('use_config_backorders') || $block->isNew()) ? 'checked="checked"' : '' ?>
--            <input type="checkbox" id="inventory_use_config_backorders" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_backorders]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
--            <label for="inventory_use_config_backorders"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
--        </div>
--        <?php if (!$block->isReadonly()): ?>
--        <script>
--require(['prototype'], function(){
--toggleValueElements($('inventory_use_config_backorders'), $('inventory_use_config_backorders').parentNode);
--});
--</script>
--        <?php endif; ?>
--    </div>
--    <?php if (!$block->isSingleStoreMode()): ?>
--    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
--    <?php endif; ?>
--</div>
-+                    <div class="control-inner-wrap">
-+                        <?php $_checked = ($block->getFieldValue('use_config_backorders') || $block->isNew()) ? 'checked="checked"' : '' ?>
-+                        <input type="checkbox"
-+                               id="inventory_use_config_backorders"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_backorders]"
-+                               value="1" <?= /* @noEscape */ $_checked ?>
-+                               onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
-+                        <label for="inventory_use_config_backorders"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
-+                    </div>
-+                    <?php if (!$block->isReadonly()) :?>
-+                        <script>
-+                            require(['prototype'], function(){
-+                                toggleValueElements($('inventory_use_config_backorders'), $('inventory_use_config_backorders').parentNode);
-+                            });
-+                        </script>
-+                    <?php endif; ?>
-+                </div>
-+                <?php if (!$block->isSingleStoreMode()) :?>
-+                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
-+                <?php endif; ?>
-+            </div>
- 
--<div class="field">
--    <label class="label" for="inventory_notify_stock_qty">
--        <span><?= /* @escapeNotVerified */ __('Notify for Quantity Below') ?></span>
--    </label>
--    <div class="control">
--        <input type="text" class="input-text validate-number" id="inventory_notify_stock_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][notify_stock_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('notify_stock_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
-+            <div class="field">
-+                <label class="label" for="inventory_notify_stock_qty">
-+                    <span><?= $block->escapeHtml(__('Notify for Quantity Below')) ?></span>
-+                </label>
-+                <div class="control">
-+                    <input type="text"
-+                           class="input-text validate-number"
-+                           id="inventory_notify_stock_qty"
-+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][notify_stock_qty]"
-+                           value="<?= $block->getFieldValue('notify_stock_qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
- 
--        <div class="control-inner-wrap">
--            <?php $_checked = ($block->getFieldValue('use_config_notify_stock_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
--            <input type="checkbox" id="inventory_use_config_notify_stock_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_notify_stock_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
--            <label for="inventory_use_config_notify_stock_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
--        </div>
--        <?php if (!$block->isReadonly()): ?>
--        <script>
--require(['prototype'], function(){
--toggleValueElements($('inventory_use_config_notify_stock_qty'), $('inventory_use_config_notify_stock_qty').parentNode);
--});
--</script>
--        <?php endif; ?>
--    </div>
--    <?php if (!$block->isSingleStoreMode()): ?>
--    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
--    <?php endif; ?>
--</div>
-+                    <div class="control-inner-wrap">
-+                        <?php $_checked = ($block->getFieldValue('use_config_notify_stock_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
-+                        <input type="checkbox"
-+                               id="inventory_use_config_notify_stock_qty"
-+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_notify_stock_qty]"
-+                               value="1" <?= /* @noEscape */ $_checked ?>
-+                               onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
-+                        <label for="inventory_use_config_notify_stock_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
-+                    </div>
-+                    <?php if (!$block->isReadonly()) :?>
-+                        <script>
-+                            require(['prototype'], function(){
-+                                toggleValueElements($('inventory_use_config_notify_stock_qty'), $('inventory_use_config_notify_stock_qty').parentNode);
-+                            });
-+                        </script>
-+                    <?php endif; ?>
-+                </div>
-+                <?php if (!$block->isSingleStoreMode()) :?>
-+                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
-+                <?php endif; ?>
-+            </div>
- 
--    <?php endif; ?>
--<div class="field">
--    <label class="label" for="inventory_enable_qty_increments">
--        <span><?= /* @escapeNotVerified */ __('Enable Qty Increments') ?></span>
--    </label>
--    <div class="control">
--        <?php $qtyIncrementsEnabled = $block->getFieldValue('enable_qty_increments'); ?>
--        <select id="inventory_enable_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][enable_qty_increments]" <?= /* @escapeNotVerified */ $_readonly ?>>
--            <option value="1"<?php if ($qtyIncrementsEnabled): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Yes') ?></option>
--            <option value="0"<?php if (!$qtyIncrementsEnabled): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
--        </select>
--        <input type="hidden" id="inventory_enable_qty_increments_default" value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('enable_qty_increments') ?>">
-+        <?php endif; ?>
-+        <div class="field">
-+            <label class="label" for="inventory_enable_qty_increments">
-+                <span><?= $block->escapeHtml(__('Enable Qty Increments')) ?></span>
-+            </label>
-+            <div class="control">
-+                <?php $qtyIncrementsEnabled = $block->getFieldValue('enable_qty_increments'); ?>
-+                <select id="inventory_enable_qty_increments"
-+                        name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][enable_qty_increments]" <?= /* @noEscape */ $_readonly ?>>
-+                    <option value="1"<?php if ($qtyIncrementsEnabled) :?> selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
-+                    <option value="0"<?php if (!$qtyIncrementsEnabled) :?> selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
-+                </select>
-+                <input type="hidden"
-+                       id="inventory_enable_qty_increments_default"
-+                       value="<?= $block->escapeHtmlAttr($block->getDefaultConfigValue('enable_qty_increments')) ?>">
- 
--        <div class="control-inner-wrap">
--            <?php $_checked = ($block->getFieldValue('use_config_enable_qty_inc') || $block->isNew()) ? 'checked="checked"' : '' ?>
--            <input type="checkbox" id="inventory_use_config_enable_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_enable_qty_increments]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
--            <label for="inventory_use_config_enable_qty_increments"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
-+                <div class="control-inner-wrap">
-+                    <?php $_checked = ($block->getFieldValue('use_config_enable_qty_inc') || $block->isNew()) ? 'checked="checked"' : '' ?>
-+                    <input type="checkbox"
-+                           id="inventory_use_config_enable_qty_increments"
-+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_enable_qty_increments]"
-+                           value="1" <?= /* @noEscape */ $_checked ?>
-+                           onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
-+                    <label for="inventory_use_config_enable_qty_increments"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
-+                </div>
-+                <?php if (!$block->isReadonly()) :?>
-+                    <script>
-+                        require(['prototype'], function(){
-+                            toggleValueElements($('inventory_use_config_enable_qty_increments'), $('inventory_use_config_enable_qty_increments').parentNode);
-+                        });
-+                    </script>
-+                <?php endif; ?>
-+            </div>
-+            <?php if (!$block->isSingleStoreMode()) :?>
-+                <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
-+            <?php endif; ?>
-         </div>
--        <?php if (!$block->isReadonly()): ?>
--        <script>
--require(['prototype'], function(){
--toggleValueElements($('inventory_use_config_enable_qty_increments'), $('inventory_use_config_enable_qty_increments').parentNode);
--});
--</script>
--        <?php endif; ?>
--    </div>
--    <?php if (!$block->isSingleStoreMode()): ?>
--    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
--    <?php endif; ?>
--</div>
- 
--<div class="field">
--    <label class="label" for="inventory_qty_increments">
--        <span><?= /* @escapeNotVerified */ __('Qty Increments') ?></span>
--    </label>
--    <div class="control">
--        <input type="text" class="input-text validate-digits" id="inventory_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][qty_increments]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('qty_increments') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
--        <div class="control-inner-wrap">
--            <?php $_checked = ($block->getFieldValue('use_config_qty_increments') || $block->isNew()) ? 'checked="checked"' : '' ?>
--            <input type="checkbox" id="inventory_use_config_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_qty_increments]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
--            <label for="inventory_use_config_qty_increments"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
-+        <div class="field">
-+            <label class="label" for="inventory_qty_increments">
-+                <span><?= $block->escapeHtml(__('Qty Increments')) ?></span>
-+            </label>
-+            <div class="control">
-+                <input type="text"
-+                       class="input-text validate-digits"
-+                       id="inventory_qty_increments"
-+                       name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][qty_increments]"
-+                       value="<?= $block->getFieldValue('qty_increments') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
-+                <div class="control-inner-wrap">
-+                    <?php $_checked = ($block->getFieldValue('use_config_qty_increments') || $block->isNew()) ? 'checked="checked"' : '' ?>
-+                    <input type="checkbox"
-+                           id="inventory_use_config_qty_increments"
-+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_qty_increments]"
-+                           value="1" <?= /* @noEscape */ $_checked ?>
-+                           onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
-+                    <label for="inventory_use_config_qty_increments"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
-+                </div>
-+                <?php if (!$block->isReadonly()) :?>
-+                    <script>
-+                        require(['prototype'], function(){
-+                            toggleValueElements($('inventory_use_config_qty_increments'), $('inventory_use_config_qty_increments').parentNode);
-+                        });
-+                    </script>
-+                <?php endif; ?>
-+            </div>
-+            <?php if (!$block->isSingleStoreMode()) :?>
-+                <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
-+            <?php endif; ?>
-         </div>
--        <?php if (!$block->isReadonly()): ?>
--        <script>
--require(['prototype'], function(){
--toggleValueElements($('inventory_use_config_qty_increments'), $('inventory_use_config_qty_increments').parentNode);
--});
--</script>
--        <?php endif; ?>
--    </div>
--    <?php if (!$block->isSingleStoreMode()): ?>
--    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
--    <?php endif; ?>
--</div>
- 
--<div class="field">
--    <label class="label" for="inventory_stock_availability">
--        <span><?= /* @escapeNotVerified */ __('Stock Availability') ?></span>
--    </label>
--    <div class="control">
--        <select id="inventory_stock_availability" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][is_in_stock]" <?= /* @escapeNotVerified */ $_readonly ?>>
--            <?php foreach ($block->getStockOption() as $option): ?>
--            <?php $_selected = ($block->getFieldValue('is_in_stock') !== null && $option['value'] == $block->getFieldValue('is_in_stock')) ? 'selected="selected"' : '' ?>
--            <option value="<?= /* @escapeNotVerified */ $option['value'] ?>" <?= /* @escapeNotVerified */ $_selected ?>><?= /* @escapeNotVerified */ $option['label'] ?></option>
--            <?php endforeach; ?>
--        </select>
-+        <div class="field">
-+            <label class="label" for="inventory_stock_availability">
-+                <span><?= $block->escapeHtml(__('Stock Availability')) ?></span>
-+            </label>
-+            <div class="control">
-+                <select id="inventory_stock_availability"
-+                        name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][is_in_stock]" <?= /* @noEscape */ $_readonly ?>>
-+                    <?php foreach ($block->getStockOption() as $option) :?>
-+                        <?php $_selected = ($block->getFieldValue('is_in_stock') !== null && $option['value'] == $block->getFieldValue('is_in_stock')) ? 'selected="selected"' : '' ?>
-+                        <option value="<?= $block->escapeHtmlAttr($option['value']) ?>" <?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?></option>
-+                    <?php endforeach; ?>
-+                </select>
-+            </div>
-+            <?php if (!$block->isSingleStoreMode()) :?>
-+                <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
-+            <?php endif; ?>
-+        </div>
-     </div>
--    <?php if (!$block->isSingleStoreMode()): ?>
--    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
--    <?php endif; ?>
--</div>
--</div>
- </fieldset>
- 
- <script>
--require(["jquery","prototype"], function(jQuery){
-+    require(["jquery","prototype"], function(jQuery){
- 
--    //<![CDATA[
--    function changeManageStockOption()
--    {
--        var manageStock = $('inventory_use_config_manage_stock').checked
-+        //<![CDATA[
-+        function changeManageStockOption()
-+        {
-+            var manageStock = $('inventory_use_config_manage_stock').checked
-                 ? $('inventory_manage_stock_default').value
-                 : $('inventory_manage_stock').value;
--        var catalogInventoryNotManageStockFields = {
--            inventory_min_sale_qty: true,
--            inventory_max_sale_qty: true,
--            inventory_enable_qty_increments : true,
--            inventory_qty_increments: true
--        };
--
--        $$('#table_cataloginventory > div').each(function(el) {
--            if (el == $('inventory_manage_stock').up(1)) {
--                return;
--            }
-+            var catalogInventoryNotManageStockFields = {
-+                inventory_min_sale_qty: true,
-+                inventory_max_sale_qty: true,
-+                inventory_enable_qty_increments : true,
-+                inventory_qty_increments: true
-+            };
- 
--            for (field in catalogInventoryNotManageStockFields) {
--                if ($(field) && ($(field).up(1) == el)) {
-+            $$('#table_cataloginventory > div').each(function(el) {
-+                if (el == $('inventory_manage_stock').up(1)) {
-                     return;
-                 }
--            }
- 
--            el[manageStock == 1 ? 'show' : 'hide']();
--        });
-+                for (field in catalogInventoryNotManageStockFields) {
-+                    if ($(field) && ($(field).up(1) == el)) {
-+                        return;
-+                    }
-+                }
- 
--        return true;
--    }
-+                el[manageStock == 1 ? 'show' : 'hide']();
-+            });
- 
--    function applyEnableQtyIncrements() {
--        var enableQtyIncrements = $('inventory_use_config_enable_qty_increments').checked
--            ? $('inventory_enable_qty_increments_default').value
--            : $('inventory_enable_qty_increments').value;
-+            return true;
-+        }
- 
--        $('inventory_qty_increments').up('.field')[enableQtyIncrements == 1 ? 'show' : 'hide']();
--    }
-+        function applyEnableQtyIncrements() {
-+            var enableQtyIncrements = $('inventory_use_config_enable_qty_increments').checked
-+                ? $('inventory_enable_qty_increments_default').value
-+                : $('inventory_enable_qty_increments').value;
- 
--    function applyEnableDecimalDivided() {
--    <?php if (!$block->isVirtual()) : ?>
--        $('inventory_is_decimal_divided').up('.field').hide();
--        <?php endif; ?>
--        $('inventory_qty_increments').removeClassName('validate-digits').removeClassName('validate-number');
--        $('inventory_min_sale_qty').removeClassName('validate-digits').removeClassName('validate-number');
--        if ($('inventory_is_qty_decimal').value == 1) {
--        <?php if (!$block->isVirtual()) : ?>
--            $('inventory_is_decimal_divided').up('.field').show();
--            <?php endif; ?>
--            $('inventory_qty_increments').addClassName('validate-number');
--            $('inventory_min_sale_qty').addClassName('validate-number');
--        } else {
--            $('inventory_qty_increments').addClassName('validate-digits');
--            $('inventory_min_sale_qty').addClassName('validate-digits');
-+            $('inventory_qty_increments').up('.field')[enableQtyIncrements == 1 ? 'show' : 'hide']();
-         }
--    }
- 
--    Event.observe(window, 'load', function() {
--        if ($('inventory_manage_stock') && $('inventory_use_config_manage_stock')) {
--            Event.observe($('inventory_manage_stock'), 'change', changeManageStockOption);
--            Event.observe($('inventory_use_config_manage_stock'), 'change', changeManageStockOption);
--            changeManageStockOption();
-+        function applyEnableDecimalDivided() {
-+            <?php if (!$block->isVirtual()) :?>
-+            $('inventory_is_decimal_divided').up('.field').hide();
-+            <?php endif; ?>
-+            $('inventory_qty_increments').removeClassName('validate-digits').removeClassName('validate-number');
-+            $('inventory_min_sale_qty').removeClassName('validate-digits').removeClassName('validate-number');
-+            if ($('inventory_is_qty_decimal').value == 1) {
-+                <?php if (!$block->isVirtual()) :?>
-+                $('inventory_is_decimal_divided').up('.field').show();
-+                <?php endif; ?>
-+                $('inventory_qty_increments').addClassName('validate-number');
-+                $('inventory_min_sale_qty').addClassName('validate-number');
-+            } else {
-+                $('inventory_qty_increments').addClassName('validate-digits');
-+                $('inventory_min_sale_qty').addClassName('validate-digits');
-+            }
-         }
--        if ($('inventory_enable_qty_increments') && $('inventory_use_config_enable_qty_increments')) {
--            //Delegation is used because of events, which are not firing while the input is disabled
--            jQuery('#inventory_enable_qty_increments').parent()
-+
-+        Event.observe(window, 'load', function() {
-+            if ($('inventory_manage_stock') && $('inventory_use_config_manage_stock')) {
-+                Event.observe($('inventory_manage_stock'), 'change', changeManageStockOption);
-+                Event.observe($('inventory_use_config_manage_stock'), 'change', changeManageStockOption);
-+                changeManageStockOption();
-+            }
-+            if ($('inventory_enable_qty_increments') && $('inventory_use_config_enable_qty_increments')) {
-+                //Delegation is used because of events, which are not firing while the input is disabled
-+                jQuery('#inventory_enable_qty_increments').parent()
-                 .on('change', '#inventory_enable_qty_increments', applyEnableQtyIncrements);
--            Event.observe($('inventory_use_config_enable_qty_increments'), 'change', applyEnableQtyIncrements);
--            applyEnableQtyIncrements();
--        }
--        if ($('inventory_is_qty_decimal') && $('inventory_qty_increments') && $('inventory_min_sale_qty')) {
--            Event.observe($('inventory_is_qty_decimal'), 'change', applyEnableDecimalDivided);
--            applyEnableDecimalDivided();
--        }
--    });
-+                Event.observe($('inventory_use_config_enable_qty_increments'), 'change', applyEnableQtyIncrements);
-+                applyEnableQtyIncrements();
-+            }
-+            if ($('inventory_is_qty_decimal') && $('inventory_qty_increments') && $('inventory_min_sale_qty')) {
-+                Event.observe($('inventory_is_qty_decimal'), 'change', applyEnableDecimalDivided);
-+                applyEnableDecimalDivided();
-+            }
-+        });
- 
--    window.applyEnableDecimalDivided = applyEnableDecimalDivided;
--    window.applyEnableQtyIncrements = applyEnableQtyIncrements;
--    window.changeManageStockOption = changeManageStockOption;
--    //]]>
-+        window.applyEnableDecimalDivided = applyEnableDecimalDivided;
-+        window.applyEnableQtyIncrements = applyEnableQtyIncrements;
-+        window.changeManageStockOption = changeManageStockOption;
-+        //]]>
- 
--});
-+    });
- </script>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
-index 04ccfb5aee8..17fb517b325 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
-@@ -4,24 +4,24 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- 
- /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Search */
- ?>
- <div id="product-attribute-search-container" class="suggest-expandable attribute-selector">
-     <div class="action-dropdown">
-         <button type="button" class="action-toggle action-choose" data-mage-init='{"dropdown":{}}' data-toggle="dropdown">
--            <span><?= /* @escapeNotVerified */ __('Add Attribute') ?></span>
-+            <span><?= $block->escapeHtml(__('Add Attribute')) ?></span>
-         </button>
-         <div class="dropdown-menu">
-             <input data-role="product-attribute-search"
--                   data-group="<?= $block->escapeHtml($block->getGroupCode()) ?>"
-+                   data-group="<?= $block->escapeHtmlAttr($block->getGroupCode()) ?>"
-                    class="search" type="text"
--                   placeholder="<?= /* @noEscape */ __('start typing to search attribute') ?>" />
-+                   placeholder="<?= $block->escapeHtmlAttr(__('start typing to search attribute')) ?>" />
-         </div>
-     </div>
- 
--<script data-template-for="product-attribute-search-<?= /* @escapeNotVerified */ $block->getGroupId() ?>" type="text/x-magento-template">
-+<script data-template-for="product-attribute-search-<?= $block->escapeHtmlAttr($block->getGroupId()) ?>" type="text/x-magento-template">
-     <ul data-mage-init='{"menu":[]}'>
-         <% if (data.items.length) { %>
-         <% _.each(data.items, function(value){ %>
-@@ -29,7 +29,7 @@
-         <% }); %>
-         <% } else { %><span class="mage-suggest-no-records"><%- data.noRecordsText %></span><% } %>
-     </ul>
--    <div class="actions"><?= /* @escapeNotVerified */ $block->getAttributeCreate() ?></div>
-+    <div class="actions"><?= $block->escapeHtml($block->getAttributeCreate()) ?></div>
- </script>
- 
- <script>
-@@ -51,13 +51,13 @@
-             });
-         });
- 
--        $suggest.mage('suggest', <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSelectorOptions()) ?>)
-+        $suggest.mage('suggest', <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getSelectorOptions()) ?>)
-             .on('suggestselect', function (e, ui) {
-                 $(this).val('');
-                 var templateId = $('#attribute_set_id').val();
-                 if (ui.item.id) {
-                     $.ajax({
--                        url: '<?= /* @escapeNotVerified */ $block->getAddAttributeUrl() ?>',
-+                        url: '<?= $block->escapeJs($block->escapeUrl($block->getAddAttributeUrl())) ?>',
-                         type: 'POST',
-                         dataType: 'json',
-                         data: {attribute_id: ui.item.id, template_id: templateId, group: $(this).data('group')},
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml
-index 6a62f01f97b..360694fceb2 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml
-@@ -4,40 +4,38 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs */
- ?>
--<?php if (!empty($tabs)): ?>
-+<?php if (!empty($tabs)) :?>
-     <?php $tabGroups = [
-         \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs::BASIC_TAB_GROUP_CODE,
-         \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs::ADVANCED_TAB_GROUP_CODE,
-     ];?>
- 
--    <div id="<?= /* @escapeNotVerified */ $block->getId() ?>"
-+    <div id="<?= $block->escapeHtmlAttr($block->getId()) ?>"
-          data-mage-init='{"tabs":{
--        "active": "<?= /* @escapeNotVerified */ $block->getActiveTabId() ?>",
--        "destination": "#<?= /* @escapeNotVerified */ $block->getDestElementId() ?>",
--        "shadowTabs": "<?= /* @escapeNotVerified */ $block->getAllShadowTabs() ?>",
--        "tabsBlockPrefix": "<?= /* @escapeNotVerified */ $block->getId() ?>_",
-+        "active": "<?= $block->escapeHtmlAttr($block->getActiveTabId()) ?>",
-+        "destination": "#<?= $block->escapeHtmlAttr($block->getDestElementId()) ?>",
-+        "shadowTabs": "<?= /* @noEscape */ $block->getAllShadowTabs() ?>",
-+        "tabsBlockPrefix": "<?= $block->escapeHtmlAttr($block->getId()) ?>_",
-         "tabIdArgument": "active_tab",
--        "tabPanelClass": "<?= /* @escapeNotVerified */ $block->getPanelsClass() ?>",
--        "excludedPanel": "<?= /* @escapeNotVerified */ $block->getExcludedPanel() ?>",
-+        "tabPanelClass": "<?= $block->escapeHtmlAttr($block->getPanelsClass()) ?>",
-+        "excludedPanel": "<?= $block->escapeHtmlAttr($block->getExcludedPanel()) ?>",
-         "groups": "ul.tabs"
-     }}'>
--        <?php foreach ($tabGroups as $tabGroupCode): ?>
-+        <?php foreach ($tabGroups as $tabGroupCode) :?>
-             <?php
-                 $tabGroupId = $block->getId() . '-' . $tabGroupCode;
-                 $isBasic = $tabGroupCode == \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs::BASIC_TAB_GROUP_CODE;
-                 $activeCollapsible = $block->isAdvancedTabGroupActive() ? true : false;
-             ?>
- 
--            <div class="admin__page-nav <?php if (!$isBasic): ?> <?= '_collapsed' ?> <?php endif;?>"
-+            <div class="admin__page-nav <?php if (!$isBasic) :?> <?= '_collapsed' ?> <?php endif;?>"
-                 data-role="container"
--                id="<?= /* @escapeNotVerified */ $tabGroupId ?>"
--                <?php if (!$isBasic): ?>
-+                id="<?= $block->escapeHtmlAttr($tabGroupId) ?>"
-+                <?php if (!$isBasic) :?>
-                     data-mage-init='{"collapsible":{
--                    "active": "<?= /* @escapeNotVerified */ $activeCollapsible ?>",
-+                    "active": "<?= /* @noEscape */ $activeCollapsible ?>",
-                     "openedState": "_show",
-                     "closedState": "_hide",
-                     "animate": 200,
-@@ -45,44 +43,45 @@
-                     }}'
-                 <?php endif;?>>
- 
--                <div class="admin__page-nav-title-wrap" <?= /* @escapeNotVerified */ $block->getUiId('title') ?> data-role="title">
--                    <div class="admin__page-nav-title <?php if (!$isBasic): ?> <?= '_collapsible' ?><?php endif;?>"
-+                <div class="admin__page-nav-title-wrap" <?= /* @noEscape */ $block->getUiId('title') ?> data-role="title">
-+                    <div class="admin__page-nav-title <?php if (!$isBasic) :?> <?= '_collapsible' ?><?php endif;?>"
-                         data-role="trigger">
-                         <strong>
--                            <?= /* @escapeNotVerified */ $isBasic ? __('Basic Settings') : __('Advanced Settings') ?>
-+                            <?= $block->escapeHtml($isBasic ? __('Basic Settings') : __('Advanced Settings')) ?>
-                         </strong>
-                         <span data-role="title-messages" class="admin__page-nav-title-messages"></span>
-                     </div>
-                 </div>
- 
--                <ul <?= /* @escapeNotVerified */ $block->getUiId('tab', $tabGroupId) ?> class="tabs admin__page-nav-items" data-role="content">
--                    <?php foreach ($tabs as $_tab): ?>
-+                <ul <?= /* @noEscape */ $block->getUiId('tab', $tabGroupId) ?> class="tabs admin__page-nav-items" data-role="content">
-+                    <?php foreach ($tabs as $_tab) :?>
-                         <?php /** @var $_tab \Magento\Backend\Block\Widget\Tab\TabInterface */ ?>
-                         <?php if (!$block->canShowTab($_tab) || $_tab->getParentTab()
-                             || ($_tab->getGroupCode() && $_tab->getGroupCode() != $tabGroupCode)
--                            || (!$_tab->getGroupCode() && $isBasic)): continue; endif;?>
-+                            || (!$_tab->getGroupCode() && $isBasic)) : continue;
-+                        endif;?>
-                         <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
-                         <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
-                         <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
--                        <li class="admin__page-nav-item <?php if ($block->getTabIsHidden($_tab)): ?> <?= "no-display" ?> <?php endif; ?> " <?= /* @escapeNotVerified */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
--                            <a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>"
--                               name="<?= /* @escapeNotVerified */ $block->getTabId($_tab, false) ?>"
--                               title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>"
--                               class="admin__page-nav-link <?= /* @escapeNotVerified */ $_tabClass ?>"
--                               data-tab-type="<?= /* @escapeNotVerified */ $_tabType ?>" <?= /* @escapeNotVerified */ $block->getUiId('tab', 'link', $_tab->getId()) ?>
-+                        <li class="admin__page-nav-item <?php if ($block->getTabIsHidden($_tab)) :?> <?= "no-display" ?> <?php endif; ?> " <?= /* @noEscape */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
-+                            <a href="<?= $block->escapeUrl($_tabHref) ?>" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
-+                               name="<?= $block->escapeHtmlAttr($block->getTabId($_tab, false)) ?>"
-+                               title="<?= $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>"
-+                               class="admin__page-nav-link <?= $block->escapeHtmlAttr($_tabClass) ?>"
-+                               data-tab-type="<?= /* @noEscape */ $_tabType ?>" <?= /* @noEscape */ $block->getUiId('tab', 'link', $_tab->getId()) ?>
-                             >
-                                 <span><?= $block->escapeHtml($block->getTabLabel($_tab)) ?></span>
-                                 <span class="admin__page-nav-item-messages" data-role="item-messages">
-                                    <span class="admin__page-nav-item-message _changed">
-                                        <span class="admin__page-nav-item-message-icon"></span>
-                                        <span class="admin__page-nav-item-message-tooltip">
--                                           <?= /* @escapeNotVerified */ __('Changes have been made to this section that have not been saved.') ?>
-+                                           <?= $block->escapeHtml(__('Changes have been made to this section that have not been saved.')) ?>
-                                        </span>
-                                    </span>
-                                    <span class="admin__page-nav-item-message _error">
-                                        <span class="admin__page-nav-item-message-icon"></span>
-                                        <span class="admin__page-nav-item-message-tooltip">
--                                           <?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>
-+                                           <?= $block->escapeHtml(__('This tab contains invalid data. Please resolve this before saving.')) ?>
-                                        </span>
-                                    </span>
-                                     <span class="admin__page-nav-item-message-loader">
-@@ -93,11 +92,11 @@
-                                    </span>
-                                 </span>
-                             </a>
--                            <div id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>_content" class="no-display"
--                                 data-tab-panel="<?= /* @escapeNotVerified */ $_tab->getTabId() ?>"
--                                <?= /* @escapeNotVerified */ $block->getUiId('tab', 'content', $_tab->getId()) ?>
-+                            <div id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>_content" class="no-display"
-+                                 data-tab-panel="<?= $block->escapeHtmlAttr($_tab->getTabId()) ?>"
-+                                <?= /* @noEscape */ $block->getUiId('tab', 'content', $_tab->getId()) ?>
-                             >
--                                <?= /* @escapeNotVerified */ $block->getTabContent($_tab) ?>
-+                                <?= /* @noEscape */ $block->getTabContent($_tab) ?>
-                                 <?= /* @noEscape */ $block->getAccordion($_tab) ?>
-                             </div>
-                         </li>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs/child_tab.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs/child_tab.phtml
-index 842ed17375f..c4dc1ddc0b0 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs/child_tab.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs/child_tab.phtml
-@@ -4,13 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\ChildTab */
- ?>
- <div class="fieldset-wrapper admin__collapsible-block-wrapper" data-tab="<?= /* @noEscape */ $block->getTabId() ?>"
-      id="<?= /* @noEscape */ $block->getTabId() ?>-wrapper" data-mage-init='{"collapsible":{
--                    "active": <?= /* @noEscape */ $block->isTabOpened() ? 'true' : 'false' ?>,
-+                    "active": <?= $block->isTabOpened() ? 'true' : 'false' ?>,
-                     "openedState": "_show",
-                     "closedState": "_hide",
-                     "animate": 200,
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
-index 8df3e32b0a2..c814298d1db 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
-@@ -4,11 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Grid */
- ?>
- <div id="<?= $block->getHtmlId() ?>" class="admin__grid-massaction">
--    <?php if ($block->getHideFormElement() !== true):?>
-+    <?php if ($block->getHideFormElement() !== true) :?>
-     <form action="" id="<?= $block->getHtmlId() ?>-form" method="post">
-     <?php endif ?>
-         <div class="admin__grid-massaction-form">
-@@ -16,43 +15,43 @@
-             <select
-                 id="<?= $block->getHtmlId() ?>-select"
-                 class="local-validation admin__control-select">
--                <option class="admin__control-select-placeholder" value="" selected><?= /* @escapeNotVerified */ __('Actions') ?></option>
--                <?php foreach ($block->getItems() as $_item): ?>
--                    <option value="<?= /* @escapeNotVerified */ $_item->getId() ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= /* @escapeNotVerified */ $_item->getLabel() ?></option>
-+                <option class="admin__control-select-placeholder" value="" selected><?= $block->escapeHtml(__('Actions')) ?></option>
-+                <?php foreach ($block->getItems() as $_item) :?>
-+                    <option value="<?= $block->escapeHtmlAttr($_item->getId()) ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= $block->escapeHtml($_item->getLabel()) ?></option>
-                 <?php endforeach; ?>
-             </select>
-             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-hiddens"></span>
-             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-additional"></span>
-             <?= $block->getApplyButtonHtml() ?>
-         </div>
--    <?php if ($block->getHideFormElement() !== true):?>
-+    <?php if ($block->getHideFormElement() !== true) :?>
-     </form>
-     <?php endif ?>
-     <div class="no-display">
--    <?php foreach ($block->getItems() as $_item): ?>
--        <div id="<?= $block->getHtmlId() ?>-item-<?= /* @escapeNotVerified */ $_item->getId() ?>-block">
-+    <?php foreach ($block->getItems() as $_item) :?>
-+        <div id="<?= $block->getHtmlId() ?>-item-<?= $block->escapeHtmlAttr($_item->getId()) ?>-block">
-             <?= $_item->getAdditionalActionBlockHtml() ?>
-         </div>
-     <?php endforeach; ?>
-     </div>
- 
-     <div class="mass-select-wrap">
--        <select id="<?= $block->getHtmlId() ?>-mass-select" data-menu="grid-mass-select">
--            <optgroup label="<?= /* @escapeNotVerified */ __('Mass Actions') ?>">
-+        <select id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>-mass-select" data-menu="grid-mass-select">
-+            <optgroup label="<?= $block->escapeHtmlAttr(__('Mass Actions')) ?>">
-                 <option disabled selected></option>
--                <?php if ($block->getUseSelectAll()):?>
-+                <?php if ($block->getUseSelectAll()) :?>
-                     <option value="selectAll">
--                        <?= /* @escapeNotVerified */ __('Select All') ?>
-+                        <?= $block->escapeHtml(__('Select All')) ?>
-                     </option>
-                     <option value="unselectAll">
--                        <?= /* @escapeNotVerified */ __('Unselect All') ?>
-+                        <?= $block->escapeHtml(__('Unselect All')) ?>
-                     </option>
-                 <?php endif; ?>
-                 <option value="selectVisible">
--                    <?= /* @escapeNotVerified */ __('Select Visible') ?>
-+                    <?= $block->escapeHtml(__('Select Visible')) ?>
-                 </option>
-                 <option value="unselectVisible">
--                    <?= /* @escapeNotVerified */ __('Unselect Visible') ?>
-+                    <?= $block->escapeHtml(__('Unselect Visible')) ?>
-                 </option>
-             </optgroup>
-         </select>
-@@ -65,19 +64,19 @@
-         $('#<?= $block->getHtmlId() ?>-mass-select').change(function () {
-             var massAction = $('option:selected', this).val();
-             switch (massAction) {
--                <?php if ($block->getUseSelectAll()):?>
-+                <?php if ($block->getUseSelectAll()) :?>
-                 case 'selectAll':
--                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectAll();
-+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectAll();
-                     break
-                 case 'unselectAll':
--                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectAll();
-+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectAll();
-                     break
-                 <?php endif; ?>
-                 case 'selectVisible':
--                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectVisible();
-+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectVisible();
-                     break
-                 case 'unselectVisible':
--                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectVisible();
-+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectVisible();
-                     break
-             }
-             this.blur();
-@@ -85,8 +84,8 @@
- 
-     });
- 
--    <?php if (!$block->getParentBlock()->canDisplayContainer()): ?>
--        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setGridIds('<?= /* @escapeNotVerified */ $block->getGridIdsJson() ?>');
-+    <?php if (!$block->getParentBlock()->canDisplayContainer()) :?>
-+        <?= $block->escapeJs($block->getJsObjectName())  ?>.setGridIds('<?= /* @noEscape */ $block->getGridIdsJson() ?>');
-     <?php endif; ?>
- </script>
- </div>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml
-index fb450d19312..668dc4a28a6 100644
---- a/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml
-+++ b/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml
-@@ -4,10 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Catalog\Block\Adminhtml\Rss\Grid\Link */
- ?>
--<?php if ($block->isRssAllowed() && $block->getLink()): ?>
--<a href="<?= /* @escapeNotVerified */ $block->getLink() ?>" class="link-feed"><?= /* @escapeNotVerified */ $block->getLabel() ?></a>
-+<?php if ($block->isRssAllowed() && $block->getLink()) :?>
-+<a href="<?= $block->escapeUrl($block->getLink()) ?>" class="link-feed"><?= $block->escapeHtml($block->getLabel()) ?></a>
- <?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
-index dafea71f872..90d6e0b4840 100644
---- a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
-+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
-@@ -77,6 +77,13 @@
-                 <dataType>text</dataType>
-             </settings>
-         </field>
-+        <field name="level" formElement="hidden">
-+            <argument name="data" xsi:type="array">
-+                <item name="config" xsi:type="array">
-+                    <item name="source" xsi:type="string">category</item>
-+                </item>
-+            </argument>
-+        </field>
-         <field name="store_id" formElement="hidden">
-             <argument name="data" xsi:type="array">
-                 <item name="config" xsi:type="array">
-@@ -331,7 +338,6 @@
-                 <item name="type" xsi:type="string">group</item>
-                 <item name="config" xsi:type="array">
-                     <item name="breakLine" xsi:type="boolean">true</item>
--                    <item name="required" xsi:type="boolean">true</item>
-                 </item>
-             </argument>
-             <field name="filter_price_range" formElement="input">
-@@ -341,6 +347,9 @@
-                     </item>
-                 </argument>
-                 <settings>
-+                    <validation>
-+                        <rule name="required-entry" xsi:type="boolean">true</rule>
-+                    </validation>
-                     <additionalClasses>
-                         <class name="admin__field-small">true</class>
-                     </additionalClasses>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml
-index 1e608239297..cb0beb67c27 100644
---- a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml
-+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml
-@@ -18,7 +18,7 @@
-                     <level>2</level>
-                     <label translate="true">Base</label>
-                 </settings>
--                <field name="watermark_image_image" formElement="fileUploader">
-+                <field name="watermark_image_image" formElement="imageUploader">
-                     <settings>
-                         <notice translate="true">Allowed file types: jpeg, gif, png.</notice>
-                         <label translate="true">Image</label>
-@@ -78,7 +78,7 @@
-                     <level>2</level>
-                     <label translate="true">Thumbnail</label>
-                 </settings>
--                <field name="watermark_thumbnail_image" formElement="fileUploader">
-+                <field name="watermark_thumbnail_image" formElement="imageUploader">
-                     <settings>
-                         <label translate="true">Image</label>
-                         <componentType>imageUploader</componentType>
-@@ -137,7 +137,7 @@
-                     <level>2</level>
-                     <label translate="true">Small</label>
-                 </settings>
--                <field name="watermark_small_image_image" formElement="fileUploader">
-+                <field name="watermark_small_image_image" formElement="imageUploader">
-                     <settings>
-                         <label translate="true">Image</label>
-                         <componentType>imageUploader</componentType>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
-index 65090fa3ac4..d2d6f098125 100644
---- a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
-+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
-@@ -132,6 +132,7 @@
-             <settings>
-                 <addField>true</addField>
-                 <filter>text</filter>
-+                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
-                 <label translate="true">Name</label>
-             </settings>
-         </column>
-@@ -154,6 +155,7 @@
-         <column name="sku" sortOrder="60">
-             <settings>
-                 <filter>text</filter>
-+                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
-                 <label translate="true">SKU</label>
-             </settings>
-         </column>
-diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js
-index 75ee3019cf4..41f7a874c26 100644
---- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js
-+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js
-@@ -82,7 +82,7 @@ define([
-     return function (config, element) {
-         config = config || {};
-         jQuery(element).on('click', function () {
--            categorySubmit(config.url, config.ajax);
-+            categorySubmit();
-         });
-     };
- });
-diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js
-index 0a04358e411..76aaddf55ac 100644
---- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js
-+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js
-@@ -15,6 +15,7 @@ define([
-                 categoryIdSelector: 'input[name="id"]',
-                 categoryPathSelector: 'input[name="path"]',
-                 categoryParentSelector: 'input[name="parent"]',
-+                categoryLevelSelector: 'input[name="level"]',
-                 refreshUrl: config.refreshUrl
-             },
- 
-@@ -47,6 +48,7 @@ define([
-                     $(this.options.categoryIdSelector).val(data.id).change();
-                     $(this.options.categoryPathSelector).val(data.path).change();
-                     $(this.options.categoryParentSelector).val(data.parentId).change();
-+                    $(this.options.categoryLevelSelector).val(data.level).change();
-                 }
-             }
-         };
-diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
-index 6903a17bcdc..1ac2a4ffada 100644
---- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
-+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
-@@ -91,8 +91,8 @@ define([
- 
-         /**
-          * Add product list types as scope and their urls
--         * expamle: addListType('product_to_add', {urlFetch: 'http://magento...'})
--         * expamle: addListType('wishlist', {urlSubmit: 'http://magento...'})
-+         * example: addListType('product_to_add', {urlFetch: 'http://magento...'})
-+         * example: addListType('wishlist', {urlSubmit: 'http://magento...'})
-          *
-          * @param type types as scope
-          * @param urls obj can be
-@@ -112,7 +112,7 @@ define([
-         /**
-          * Adds complex list type - that is used to submit several list types at once
-          * Only urlSubmit is possible for this list type
--         * expamle: addComplexListType(['wishlist', 'product_list'], 'http://magento...')
-+         * example: addComplexListType(['wishlist', 'product_list'], 'http://magento...')
-          *
-          * @param type types as scope
-          * @param urls obj can be
-@@ -469,26 +469,6 @@ define([
-             }
-         },
- 
--        /**
--         * toggles Selects states (for IE) except those to be shown in popup
--         */
--        /*_toggleSelectsExceptBlock: function(flag) {
--         if(Prototype.Browser.IE){
--         if (this.blockForm) {
--         var states = new Array;
--         var selects = this.blockForm.getElementsByTagName("select");
--         for(var i=0; i<selects.length; i++){
--         states[i] = selects[i].style.visibility
--         }
--         }
--         if (this.blockForm) {
--         for(i=0; i<selects.length; i++){
--         selects[i].style.visibility = states[i]
--         }
--         }
--         }
--         },*/
--
-         /**
-          * Close configuration window
-          */
-diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/edit/attribute.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/edit/attribute.js
-new file mode 100644
-index 00000000000..e1923dc46d6
---- /dev/null
-+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/edit/attribute.js
-@@ -0,0 +1,18 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'jquery',
-+    'mage/mage',
-+    'validation'
-+], function ($) {
-+    'use strict';
-+
-+    return function (config, element) {
-+        $(element).mage('form').validation({
-+            validationUrl: config.validationUrl
-+        });
-+    };
-+});
-diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js
-index bc44128663c..0ec404a769f 100644
---- a/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js
-+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js
-@@ -33,7 +33,6 @@ define([
-             data = {},
-             parameters = {},
-             root = {},
--            len = 0,
-             key = '';
- 
-         /**
-@@ -160,15 +159,15 @@ define([
-              * @returns {void}
-              */
-             categoryLoader.buildCategoryTree = function (parent, nodeConfig) {
--                var j = 0;
-+                var i = 0;
- 
-                 if (!nodeConfig) {
-                     return null;
-                 }
- 
-                 if (parent && nodeConfig && nodeConfig.length) {
--                    for (j = 0; j < nodeConfig.length; j++) {
--                        categoryLoader.processCategoryTree(parent, nodeConfig, j);
-+                    for (i; i < nodeConfig.length; i++) {
-+                        categoryLoader.processCategoryTree(parent, nodeConfig, i);
-                     }
-                 }
-             };
-@@ -180,14 +179,15 @@ define([
-              * @returns {Object}
-              */
-             categoryLoader.buildHashChildren = function (hash, node) {
--                var j = 0;
-+                var i = 0,
-+                    len;
- 
-                 if (node.childNodes.length > 0 || node.loaded === false && node.loading === false) {
-                     hash.children = [];
- 
--                    for (j = 0, len = node.childNodes.length; j < len; j++) {
-+                    for (i, len = node.childNodes.length; i < len; i++) {
-                         hash.children = hash.children ? hash.children : [];
--                        hash.children.push(this.buildHash(node.childNodes[j]));
-+                        hash.children.push(this.buildHash(node.childNodes[i]));
-                     }
-                 }
- 
-@@ -225,6 +225,7 @@ define([
- 
-             categoryLoader.on('beforeload', function (treeLoader, node) {
-                 treeLoader.baseParams.id = node.attributes.id;
-+                treeLoader.baseParams.selected = options.jsFormObject.updateElement.value;
-             });
- 
-             categoryLoader.on('load', function () {
-diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js
-index 9c66ce577a2..b71549c314d 100644
---- a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js
-+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js
-@@ -37,8 +37,8 @@ define([
-                             ajax: {
-                                 url: options.url,
-                                 type: 'POST',
--                                success: $.proxy(function (node) {
--                                    return this._convertData(node[0]);
-+                                success: $.proxy(function (nodes) {
-+                                    return this._convertDataNodes(nodes);
-                                 }, this),
- 
-                                 /**
-@@ -77,6 +77,21 @@ define([
-             }
-         },
- 
-+        /**
-+         * @param {Array} nodes
-+         * @returns {Array}
-+         * @private
-+         */
-+        _convertDataNodes: function (nodes) {
-+            var nodesData = [];
-+
-+            nodes.forEach(function (node) {
-+                nodesData.push(this._convertData(node));
-+            }, this);
-+
-+            return nodesData;
-+        },
-+
-         /**
-          * @param {Object} node
-          * @return {*}
-diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/edit-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/edit-tree.js
-index 3544767b8d7..7c947195f33 100644
---- a/app/code/Magento/Catalog/view/adminhtml/web/js/edit-tree.js
-+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/edit-tree.js
-@@ -18,7 +18,10 @@ require([
-     /**
-      * Delete some category
-      * This routine get categoryId explicitly, so even if currently selected tree node is out of sync
--     * with this form, we surely delete same category in the tree and at backend
-+     * with this form, we surely delete same category in the tree and at backend.
-+     *
-+     * @deprecated
-+     * @see deleteConfirm
-      */
-     function categoryDelete(url) {
-         confirm({
-diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/action-delete.js b/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/action-delete.js
-index 97f978de47b..f829c66c401 100644
---- a/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/action-delete.js
-+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/action-delete.js
-@@ -5,10 +5,10 @@
- define([
-     'underscore',
-     'Magento_Ui/js/form/element/abstract'
--], function (_, Acstract) {
-+], function (_, Abstract) {
-     'use strict';
- 
--    return Acstract.extend({
-+    return Abstract.extend({
-         defaults: {
-             prefixName: '',
-             prefixElementName: '',
-diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js b/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js
-index 2f6703cc92e..4bbdea066b7 100644
---- a/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js
-+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js
-@@ -5,10 +5,10 @@
- define([
-     'underscore',
-     'Magento_Ui/js/form/element/abstract'
--], function (_, Acstract) {
-+], function (_, Abstract) {
-     'use strict';
- 
--    return Acstract.extend({
-+    return Abstract.extend({
-         defaults: {
-             prefixName: '',
-             prefixElementName: '',
-diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/options.js b/app/code/Magento/Catalog/view/adminhtml/web/js/options.js
-index 6ea00591576..7adc0dcfdf4 100644
---- a/app/code/Magento/Catalog/view/adminhtml/web/js/options.js
-+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/options.js
-@@ -20,7 +20,6 @@ define([
- 
-     return function (config) {
-         var optionPanel = jQuery('#manage-options-panel'),
--            optionsValues = [],
-             editForm = jQuery('#edit_form'),
-             attributeOption = {
-                 table: $('attribute-options-table'),
-@@ -145,7 +144,9 @@ define([
- 
-                     return optionDefaultInputType;
-                 }
--            };
-+            },
-+            tableBody = jQuery(),
-+            activePanelClass = 'selected-type-options';
- 
-         if ($('add_new_option_button')) {
-             Event.observe('add_new_option_button', 'click', attributeOption.add.bind(attributeOption, {}, true));
-@@ -180,30 +181,32 @@ define([
-                 });
-             });
-         }
--        editForm.on('submit', function () {
--            optionPanel.find('input')
--                .each(function () {
--                    if (this.disabled) {
--                        return;
-+        editForm.on('beforeSubmit', function () {
-+            var optionContainer = optionPanel.find('table tbody'),
-+                optionsValues;
-+
-+            if (optionPanel.hasClass(activePanelClass)) {
-+                optionsValues = jQuery.map(
-+                    optionContainer.find('tr'),
-+                    function (row) {
-+                        return jQuery(row).find('input, select, textarea').serialize();
-                     }
--
--                    if (this.type === 'checkbox' || this.type === 'radio') {
--                        if (this.checked) {
--                            optionsValues.push(this.name + '=' + jQuery(this).val());
--                        }
--                    } else {
--                        optionsValues.push(this.name + '=' + jQuery(this).val());
--                    }
--                });
--            jQuery('<input>')
--                .attr({
--                    type: 'hidden',
--                    name: 'serialized_options'
--                })
--                .val(JSON.stringify(optionsValues))
--                .prependTo(editForm);
--            optionPanel.find('table')
--                .replaceWith(jQuery('<div>').text(jQuery.mage.__('Sending attribute values as package.')));
-+                );
-+                jQuery('<input>')
-+                    .attr({
-+                        type: 'hidden',
-+                        name: 'serialized_options'
-+                    })
-+                    .val(JSON.stringify(optionsValues))
-+                    .prependTo(editForm);
-+            }
-+            tableBody = optionContainer.detach();
-+        });
-+        editForm.on('afterValidate.error highlight.validate', function () {
-+            if (optionPanel.hasClass(activePanelClass)) {
-+                optionPanel.find('table').append(tableBody);
-+                jQuery('input[name="serialized_options"]').remove();
-+            }
-         });
-         window.attributeOption = attributeOption;
-         window.optionDefaultInputType = attributeOption.getOptionInputType();
-diff --git a/app/code/Magento/Catalog/view/base/templates/js/components.phtml b/app/code/Magento/Catalog/view/base/templates/js/components.phtml
-index bad5acc209b..5902a9f25cc 100644
---- a/app/code/Magento/Catalog/view/base/templates/js/components.phtml
-+++ b/app/code/Magento/Catalog/view/base/templates/js/components.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
-new file mode 100644
-index 00000000000..dbc064665d3
---- /dev/null
-+++ b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
-@@ -0,0 +1,81 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Catalog\Model\Product\Option;
-+
-+/**
-+ * @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select\Checkable
-+ */
-+$option = $block->getOption();
-+if ($option) : ?>
-+    <?php
-+    $configValue = $block->getPreconfiguredValue($option);
-+    $optionType = $option->getType();
-+    $arraySign = $optionType === Option::OPTION_TYPE_CHECKBOX ? '[]' : '';
-+    $count = 1;
-+    ?>
-+
-+<div class="options-list nested" id="options-<?= $block->escapeHtmlAttr($option->getId()) ?>-list">
-+    <?php if ($optionType === Option::OPTION_TYPE_RADIO && !$option->getIsRequire()) :?>
-+    <div class="field choice admin__field admin__field-option">
-+        <input type="radio"
-+               id="options_<?= $block->escapeHtmlAttr($option->getId()) ?>"
-+               class="radio admin__control-radio product-custom-option"
-+               name="options[<?= $block->escapeHtmlAttr($option->getId()) ?>]"
-+               data-selector="options[<?= $block->escapeHtmlAttr($option->getId()) ?>]"
-+               onclick="<?= $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()' ?>"
-+               value=""
-+               checked="checked"
-+        />
-+        <label class="label admin__field-label" for="options_<?= $block->escapeHtmlAttr($option->getId()) ?>">
-+                        <span>
-+                            <?= $block->escapeHtml(__('None'))  ?>
-+                        </span>
-+        </label>
-+    </div>
-+<?php endif; ?>
-+
-+    <?php foreach ($option->getValues() as $value) : ?>
-+        <?php
-+        $checked = '';
-+        $count++;
-+        if ($arraySign) {
-+            $checked = is_array($configValue) && in_array($value->getOptionTypeId(), $configValue) ? 'checked' : '';
-+        } else {
-+            $checked = $configValue == $value->getOptionTypeId() ? 'checked' : '';
-+        }
-+        $dataSelector = 'options[' . $option->getId() . ']';
-+        if ($arraySign) {
-+            $dataSelector .= '[' . $value->getOptionTypeId() . ']';
-+        }
-+        ?>
-+
-+        <div class="field choice admin__field admin__field-option <?= /* @noEscape */ $option->getIsRequire() ? 'required': '' ?>">
-+            <input type="<?= $block->escapeHtmlAttr($optionType) ?>"
-+                   class="<?= $optionType === Option::OPTION_TYPE_RADIO
-+                       ? 'radio admin__control-radio'
-+                       : 'checkbox admin__control-checkbox' ?> <?= $option->getIsRequire()
-+                       ? 'required': '' ?>
-+                       product-custom-option
-+                        <?= $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()' ?>"
-+                   name="options[<?= $block->escapeHtmlAttr($option->getId()) ?>]<?= /* @noEscape */ $arraySign ?>"
-+                   id="options_<?= $block->escapeHtmlAttr($option->getId() . '_' . $count) ?>"
-+                   value="<?= $block->escapeHtmlAttr($value->getOptionTypeId()) ?>"
-+                <?= $block->escapeHtml($checked) ?>
-+                   data-selector="<?= $block->escapeHtmlAttr($dataSelector) ?>"
-+                   price="<?= $block->escapeHtmlAttr($block->getCurrencyByStore($value)) ?>"
-+            />
-+            <label class="label admin__field-label"
-+                   for="options_<?= $block->escapeHtmlAttr($option->getId() . '_' . $count) ?>">
-+                <span>
-+                    <?= $block->escapeHtml($value->getTitle()) ?>
-+                </span>
-+                <?= /* @noEscape */ $block->formatPrice($value) ?>
-+            </label>
-+        </div>
-+    <?php endforeach; ?>
-+    </div>
-+<?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
-index ce1561e382e..b2c2acb7419 100644
---- a/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
-+++ b/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
-@@ -3,29 +3,26 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
--<?php /** @var \Magento\Framework\Pricing\Render\Amount $block */ ?>
-+<?php /** @var $block \Magento\Framework\Pricing\Render\Amount */ ?>
- 
--<span class="price-container <?= /* @escapeNotVerified */ $block->getAdjustmentCssClasses() ?>"
-+<span class="price-container <?= $block->escapeHtmlAttr($block->getAdjustmentCssClasses()) ?>"
-         <?= $block->getSchema() ? ' itemprop="offers" itemscope itemtype="http://schema.org/Offer"' : '' ?>>
--    <?php if ($block->getDisplayLabel()): ?>
--        <span class="price-label"><?= /* @escapeNotVerified */ $block->getDisplayLabel() ?></span>
-+    <?php if ($block->getDisplayLabel()) :?>
-+        <span class="price-label"><?= $block->escapeHtml($block->getDisplayLabel()) ?></span>
-     <?php endif; ?>
--    <span <?php if ($block->getPriceId()): ?> id="<?= /* @escapeNotVerified */ $block->getPriceId() ?>"<?php endif;?>
--        <?= ($block->getPriceDisplayLabel()) ? 'data-label="' . $block->getPriceDisplayLabel() . $block->getPriceDisplayInclExclTaxes() . '"' : '' ?>
--        data-price-amount="<?= /* @escapeNotVerified */ $block->getDisplayValue() ?>"
--        data-price-type="<?= /* @escapeNotVerified */ $block->getPriceType() ?>"
--        class="price-wrapper <?= /* @escapeNotVerified */ $block->getPriceWrapperCss() ?>"
--    ><?= /* @escapeNotVerified */ $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?></span>
--    <?php if ($block->hasAdjustmentsHtml()): ?>
-+    <span <?php if ($block->getPriceId()) :?> id="<?= $block->escapeHtmlAttr($block->getPriceId()) ?>"<?php endif;?>
-+        <?= ($block->getPriceDisplayLabel()) ? 'data-label="' . $block->escapeHtmlAttr($block->getPriceDisplayLabel() . $block->getPriceDisplayInclExclTaxes()) . '"' : '' ?>
-+        data-price-amount="<?= $block->escapeHtmlAttr($block->getDisplayValue()) ?>"
-+        data-price-type="<?= $block->escapeHtmlAttr($block->getPriceType()) ?>"
-+        class="price-wrapper <?= $block->escapeHtmlAttr($block->getPriceWrapperCss()) ?>"
-+    ><?= $block->escapeHtml($block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()), ['span']) ?></span>
-+    <?php if ($block->hasAdjustmentsHtml()) :?>
-         <?= $block->getAdjustmentsHtml() ?>
-     <?php endif; ?>
--    <?php if ($block->getSchema()): ?>
--        <meta itemprop="price" content="<?= /* @escapeNotVerified */ $block->getDisplayValue() ?>" />
--        <meta itemprop="priceCurrency" content="<?= /* @escapeNotVerified */ $block->getDisplayCurrencyCode() ?>" />
-+    <?php if ($block->getSchema()) :?>
-+        <meta itemprop="price" content="<?= $block->escapeHtmlAttr($block->getDisplayValue()) ?>" />
-+        <meta itemprop="priceCurrency" content="<?= $block->escapeHtmlAttr($block->getDisplayCurrencyCode()) ?>" />
-     <?php endif; ?>
- </span>
-diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
-index b414f02a3d6..7005e65bcca 100644
---- a/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
-+++ b/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php
-@@ -15,7 +12,7 @@
- /** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
- $priceModel = $block->getPriceType('regular_price');
- 
--/* @escapeNotVerified */ echo $block->renderAmount($priceModel->getAmount(), [
-+/* @noEscape */ echo $block->renderAmount($priceModel->getAmount(), [
-     'price_id'          => $block->getPriceId('product-price-'),
-     'include_container' => true
- ]);
-diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
-index 6e281bdef7a..e56804a06de 100644
---- a/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
-+++ b/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php
-@@ -21,9 +18,9 @@ $finalPriceModel = $block->getPriceType('final_price');
- $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
- $schema = ($block->getZone() == 'item_view') ? true : false;
- ?>
--<?php if ($block->hasSpecialPrice()): ?>
-+<?php if ($block->hasSpecialPrice()) :?>
-     <span class="special-price">
--        <?php /* @escapeNotVerified */ echo $block->renderAmount($finalPriceModel->getAmount(), [
-+        <?= /* @noEscape */ $block->renderAmount($finalPriceModel->getAmount(), [
-             'display_label'     => __('Special Price'),
-             'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
-             'price_type'        => 'finalPrice',
-@@ -32,7 +29,7 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
-         ]); ?>
-     </span>
-     <span class="old-price">
--        <?php /* @escapeNotVerified */ echo $block->renderAmount($priceModel->getAmount(), [
-+        <?= /* @noEscape */ $block->renderAmount($priceModel->getAmount(), [
-             'display_label'     => __('Regular Price'),
-             'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
-             'price_type'        => 'oldPrice',
-@@ -40,8 +37,8 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
-             'skip_adjustments'  => true
-         ]); ?>
-     </span>
--<?php else: ?>
--    <?php /* @escapeNotVerified */ echo $block->renderAmount($finalPriceModel->getAmount(), [
-+<?php else :?>
-+    <?= /* @noEscape */ $block->renderAmount($finalPriceModel->getAmount(), [
-         'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
-         'price_type'        => 'finalPrice',
-         'include_container' => true,
-@@ -49,14 +46,14 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
-     ]); ?>
- <?php endif; ?>
- 
--<?php if ($block->showMinimalPrice()): ?>
--    <?php if ($block->getUseLinkForAsLowAs()):?>
--        <a href="<?= /* @escapeNotVerified */ $block->getSaleableItem()->getProductUrl() ?>" class="minimal-price-link">
--            <?= /* @escapeNotVerified */ $block->renderAmountMinimal() ?>
-+<?php if ($block->showMinimalPrice()) :?>
-+    <?php if ($block->getUseLinkForAsLowAs()) :?>
-+        <a href="<?= $block->escapeUrl($block->getSaleableItem()->getProductUrl()) ?>" class="minimal-price-link">
-+            <?= /* @noEscape */ $block->renderAmountMinimal() ?>
-         </a>
--    <?php else:?>
-+    <?php else :?>
-         <span class="minimal-price-link">
--            <?= /* @escapeNotVerified */ $block->renderAmountMinimal() ?>
-+            <?= /* @noEscape */ $block->renderAmountMinimal() ?>
-         </span>
-     <?php endif?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
-index f5cffb99d75..5949b54268a 100644
---- a/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
-+++ b/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
-@@ -3,12 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php
-+// phpcs:disable Magento2.Templates.ThisInTemplate
-+// phpcs:disable Generic.WhiteSpace.ScopeIndent
-+
- /** @var \Magento\Catalog\Pricing\Render\PriceBox $block */
- 
- /** @var \Magento\Catalog\Pricing\Price\TierPrice $tierPriceModel */
-@@ -18,17 +18,17 @@ $msrpShowOnGesture = $block->getPriceType('msrp_price')->isShowPriceOnGesture();
- $product = $block->getSaleableItem();
- ?>
- <?php if (count($tierPrices)) : ?>
--    <ul class="<?= /* @escapeNotVerified */ ($block->hasListClass() ? $block->getListClass() : 'prices-tier items') ?>">
--    <?php foreach ($tierPrices as $index => $price) : ?>
--        <li class="item">
--            <?php
-+    <ul class="<?= $block->escapeHtmlAttr(($block->hasListClass() ? $block->getListClass() : 'prices-tier items')) ?>">
-+        <?php foreach ($tierPrices as $index => $price) : ?>
-+            <li class="item">
-+                <?php
-                 $productId = $product->getId();
-                 $isSaleable = $product->isSaleable();
-                 $popupId = 'msrp-popup-' . $productId . $block->getRandomString(20);
--                if ($msrpShowOnGesture && $price['price']->getValue() < $product->getMsrp()):
-+                if ($msrpShowOnGesture && $price['price']->getValue() < $product->getMsrp()) :
-                     $addToCartUrl = '';
-                     if ($isSaleable) {
--                        $addToCartUrl = $this->helper('\Magento\Checkout\Helper\Cart')
-+                        $addToCartUrl = $this->helper(\Magento\Checkout\Helper\Cart::class)
-                             ->getAddUrl($product, ['qty' => $price['price_qty']]);
-                     }
-                     $tierPriceData = [
-@@ -54,13 +54,13 @@ $product = $block->getSaleableItem();
-                     if ($block->getCanDisplayQty($product)) {
-                         $tierPriceData['qty'] = $price['price_qty'];
-                     }
--                ?>
--                <?= /* @escapeNotVerified */ __('Buy %1 for: ', $price['price_qty']) ?>
--                <a href="javascript:void(0);"
--                   id="<?= /* @escapeNotVerified */ ($popupId) ?>"
--                   data-tier-price="<?= $block->escapeHtml($block->jsonEncode($tierPriceData)) ?>">
--                    <?= /* @escapeNotVerified */ __('Click for price') ?></a>
--                <?php else:
-+                    ?>
-+                    <?= $block->escapeHtml(__('Buy %1 for: ', $price['price_qty'])) ?>
-+                    <a href="javascript:void(0);"
-+                       id="<?= $block->escapeHtmlAttr($popupId) ?>"
-+                       data-tier-price="<?= $block->escapeHtml($block->jsonEncode($tierPriceData)) ?>">
-+                        <?= $block->escapeHtml(__('Click for price')) ?></a>
-+                <?php else :
-                     $priceAmountBlock = $block->renderAmount(
-                         $price['price'],
-                         [
-@@ -70,22 +70,22 @@ $product = $block->getSaleableItem();
-                             'zone' => \Magento\Framework\Pricing\Render::ZONE_ITEM_OPTION
-                         ]
-                     );
--                ?>
--                <?php /* @escapeNotVerified */ echo ($block->getShowDetailedPrice() !== false)
--                        ? __(
--                            'Buy %1 for %2 each and <strong class="benefit">save<span class="percent tier-%3">&nbsp;%4</span>%</strong>',
--                            $price['price_qty'],
--                            $priceAmountBlock,
--                            $index,
--                            $tierPriceModel->getSavePercent($price['price'])
--                        )
--                        : __('Buy %1 for %2 each', $price['price_qty'], $priceAmountBlock);
--                ?>
--            <?php endif; ?>
--        </li>
--    <?php endforeach; ?>
-+                    ?>
-+                    <?= /* @noEscape */ ($block->getShowDetailedPrice() !== false)
-+                    ? __(
-+                        'Buy %1 for %2 each and <strong class="benefit">save<span class="percent tier-%3">&nbsp;%4</span>%</strong>',
-+                        $price['price_qty'],
-+                        $priceAmountBlock,
-+                        $index,
-+                        $block->formatPercent($price['percentage_value'] ?? $tierPriceModel->getSavePercent($price['price']))
-+                    )
-+                    : __('Buy %1 for %2 each', $price['price_qty'], $priceAmountBlock);
-+                    ?>
-+                <?php endif; ?>
-+            </li>
-+        <?php endforeach; ?>
-     </ul>
--    <?php if ($msrpShowOnGesture):?>
-+    <?php if ($msrpShowOnGesture) :?>
-         <script type="text/x-magento-init">
-             {
-                 ".product-info-main": {
-@@ -95,9 +95,9 @@ $product = $block->getSaleableItem();
-                         "inputQty": "#qty",
-                         "attr": "[data-tier-price]",
-                         "productForm": "#product_addtocart_form",
--                        "productId": "<?= /* @escapeNotVerified */ $productId ?>",
-+                        "productId": "<?= (int) $productId ?>",
-                         "productIdInput": "input[type=hidden][name=product]",
--                        "isSaleable": "<?= /* @escapeNotVerified */ $isSaleable ?>"
-+                        "isSaleable": "<?= (bool) $isSaleable ?>"
-                     }
-                 }
-             }
-diff --git a/app/code/Magento/Catalog/view/base/web/js/price-utils.js b/app/code/Magento/Catalog/view/base/web/js/price-utils.js
-index e2ea42f7d5f..7b83d12cc98 100644
---- a/app/code/Magento/Catalog/view/base/web/js/price-utils.js
-+++ b/app/code/Magento/Catalog/view/base/web/js/price-utils.js
-@@ -60,7 +60,7 @@ define([
-         pattern = pattern.indexOf('{sign}') < 0 ? s + pattern : pattern.replace('{sign}', s);
- 
-         // we're avoiding the usage of to fixed, and using round instead with the e representation to address
--        // numbers like 1.005 = 1.01. Using ToFixed to only provide trailig zeroes in case we have a whole number
-+        // numbers like 1.005 = 1.01. Using ToFixed to only provide trailing zeroes in case we have a whole number
-         i = parseInt(
-                 amount = Number(Math.round(Math.abs(+amount || 0) + 'e+' + precision) + ('e-' + precision)),
-                 10
-diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
-index 3630fddb326..13e2d998f6c 100644
---- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
-+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
-@@ -91,7 +91,11 @@
-                     <container name="product.info.social" label="Product social links container" htmlTag="div" htmlClass="product-social-links">
-                         <block class="Magento\Catalog\Block\Product\View" name="product.info.addto" as="addto" template="Magento_Catalog::product/view/addto.phtml">
-                             <block class="Magento\Catalog\Block\Product\View\AddTo\Compare" name="view.addto.compare" after="view.addto.wishlist"
--                                   template="Magento_Catalog::product/view/addto/compare.phtml" />
-+                                   template="Magento_Catalog::product/view/addto/compare.phtml" >
-+                                <arguments>
-+                                    <argument name="addToCompareViewModel" xsi:type="object">Magento\Catalog\ViewModel\Product\Checker\AddToCompareAvailability</argument>
-+                                </arguments>
-+                            </block>
-                         </block>
-                         <block class="Magento\Catalog\Block\Product\View" name="product.info.mailto" template="Magento_Catalog::product/view/mailto.phtml"/>
-                     </container>
-@@ -121,7 +125,12 @@
-                         </arguments>
-                     </block>
-                 </container>
--                <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="Magento_Catalog::product/view/gallery.phtml"/>
-+                <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="Magento_Catalog::product/view/gallery.phtml">
-+                    <arguments>
-+                        <argument name="gallery_options" xsi:type="object">Magento\Catalog\Block\Product\View\GalleryOptions</argument>
-+                        <argument name="imageHelper" xsi:type="object">Magento\Catalog\Helper\Image</argument>
-+                    </arguments>
-+                </block>
-                 <container name="skip_gallery_after.wrapper" htmlTag="div" htmlClass="action-skip-wrapper">
-                     <block class="Magento\Framework\View\Element\Template" after="product.info.media.image" name="skip_gallery_after" template="Magento_Theme::html/skip.phtml">
-                         <arguments>
-@@ -136,7 +145,7 @@
-                     </arguments>
-                 </block>
-             </container>
--            <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.details" template="Magento_Catalog::product/view/details.phtml" after="product.info.media">
-+            <block class="Magento\Catalog\Block\Product\View\Details" name="product.info.details" template="Magento_Catalog::product/view/details.phtml" after="product.info.media">
-                 <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" as="description" template="Magento_Catalog::product/view/attribute.phtml" group="detailed_info">
-                     <arguments>
-                         <argument name="at_call" xsi:type="string">getDescription</argument>
-@@ -144,11 +153,13 @@
-                         <argument name="css_class" xsi:type="string">description</argument>
-                         <argument name="at_label" xsi:type="string">none</argument>
-                         <argument name="title" translate="true" xsi:type="string">Details</argument>
-+                        <argument name="sort_order" xsi:type="string">10</argument>
-                     </arguments>
-                 </block>
-                 <block class="Magento\Catalog\Block\Product\View\Attributes" name="product.attributes" as="additional" template="Magento_Catalog::product/view/attributes.phtml" group="detailed_info">
-                     <arguments>
-                         <argument translate="true" name="title" xsi:type="string">More Information</argument>
-+                        <argument name="sort_order" xsi:type="string">20</argument>
-                     </arguments>
-                 </block>
-             </block>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
-index 3619ce94031..b50095e91d9 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -14,7 +11,7 @@
-  * @var $block \Magento\Catalog\Block\Category\View
-  */
- ?>
--<?php if ($block->isContentMode() || $block->isMixedMode()): ?>
-+<?php if ($block->isContentMode() || $block->isMixedMode()) :?>
-     <div class="category-cms">
-         <?= $block->getCmsBlockHtml() ?>
-     </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
-index 0efce1014f9..2f5b852575c 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
-@@ -3,19 +3,22 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+
- /**
-  * Category view template
-  *
-  * @var $block \Magento\Catalog\Block\Category\View
-  */
- ?>
--<?php if ($_description = $block->getCurrentCategory()->getDescription()): ?>
-+<?php if ($_description = $block->getCurrentCategory()->getDescription()) :?>
-     <div class="category-description">
--        <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->categoryAttribute($block->getCurrentCategory(), $_description, 'description') ?>
-+        <?= /* @noEscape */ $this->helper(Magento\Catalog\Helper\Output::class)->categoryAttribute(
-+            $block->getCurrentCategory(),
-+            $_description,
-+            'description'
-+        ) ?>
-     </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
-index edff2147ad1..02593d3b541 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,14 +10,24 @@
-  *
-  * @var $block \Magento\Catalog\Block\Category\View
-  */
-+
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+// phpcs:disable Generic.WhiteSpace.ScopeIndent.IncorrectExact
-+// phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
- ?>
- <?php
--    $_helper    = $this->helper('Magento\Catalog\Helper\Output');
-+    $_helper    = $this->helper(Magento\Catalog\Helper\Output::class);
-     $_category  = $block->getCurrentCategory();
-     $_imgHtml   = '';
-     if ($_imgUrl = $_category->getImageUrl()) {
--        $_imgHtml = '<div class="category-image"><img src="' . $_imgUrl . '" alt="' . $block->escapeHtml($_category->getName()) . '" title="' . $block->escapeHtml($_category->getName()) . '" class="image" /></div>';
-+        $_imgHtml = '<div class="category-image"><img src="'
-+            . $block->escapeUrl($_imgUrl)
-+            . '" alt="'
-+            . $block->escapeHtmlAttr($_category->getName())
-+            . '" title="'
-+            . $block->escapeHtmlAttr($_category->getName())
-+            . '" class="image" /></div>';
-         $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
--        /* @escapeNotVerified */ echo $_imgHtml;
-+        /* @noEscape */ echo $_imgHtml;
-     }
- ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
-index c521cf03ad1..80a9ae0a03e 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -14,6 +11,6 @@
-  * @var $block \Magento\Catalog\Block\Category\View
-  */
- ?>
--<?php if (!$block->isContentMode() || $block->isMixedMode()): ?>
-+<?php if (!$block->isContentMode() || $block->isMixedMode()) :?>
-     <?= $block->getProductListHtml() ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
-index 774aa8d839e..65ee7ea789e 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
-@@ -4,9 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block \Magento\Catalog\Block\Category\Rss\Link */
- ?>
--<?php if ($block->isRssAllowed() && $block->getLink() && $block->isTopCategory()): ?>
--    <a href="<?= /* @escapeNotVerified */ $block->getLink() ?>" class="action link rss"><span><?= /* @escapeNotVerified */ $block->getLabel() ?></span></a>
-+<?php if ($block->isRssAllowed() && $block->getLink() && $block->isTopCategory()) :?>
-+    <a href="<?= $block->escapeUrl($block->getLink()) ?>"
-+       class="action link rss"><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
- <?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_block.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_block.phtml
-index 2b0098be654..15fdd30c2d9 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_block.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_block.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <div class="widget block block-category-link">
--    <a <?= /* @escapeNotVerified */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
-+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
- </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_href.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_href.phtml
-index 91ab70b0376..18ffee4b5f7 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_href.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_href.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /** @var Magento\Catalog\Block\Widget\Link $block */
- ?>
- <?= $block->escapeHtml($block->getHref()) ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_inline.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_inline.phtml
-index f53c1c1ed90..8f3b2ae6137 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_inline.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_inline.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <span class="widget block block-category-link-inline">
--    <a <?= /* @escapeNotVerified */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
-+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
- </span>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml b/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml
-index 4c103b40ba2..52bec7858a9 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml
-@@ -3,7 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
-+
-+/** @var $block Magento\Catalog\Block\FrontendStorageManager */
- ?>
- <script type="text/x-magento-init">
-         {
-@@ -12,9 +13,8 @@
-                     "components": {
-                         "storage-manager": {
-                             "component": "Magento_Catalog/js/storage-manager",
--                            "appendTo": "<?= /* @escapeNotVerified */ $block->getParentComponentName() ?>",
--                            "storagesConfiguration" :
--                                         <?= /* @escapeNotVerified */ $block->getConfigurationJson() ?>
-+                            "appendTo": "<?= $block->escapeJs($block->getParentComponentName()) ?>",
-+                            "storagesConfiguration" : <?= /* @noEscape */ $block->getConfigurationJson() ?>
-                         }
-                     }
-                 }
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml b/app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml
-index 5f44c42e17c..f5dca566abf 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml
-@@ -3,12 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
-+
- /** @var \Magento\Framework\View\Element\Template $block */
- ?>
--<?= $block->escapeHtml(__(
--    'You added product %1 to the <a href="%2">comparison list</a>.',
--    $block->getData('product_name'),
--    $block->getData('compare_list_url')),
-+<?= $block->escapeHtml(
-+    __(
-+        'You added product %1 to the <a href="%2">comparison list</a>.',
-+        $block->getData('product_name'),
-+        $block->getData('compare_list_url')
-+    ),
-     ['a']
- );
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml b/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
-index 01820361744..6d5ddb95ab1 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * Category left navigation
-  *
-@@ -15,25 +13,29 @@
- <?php if (!$block->getCategory()) {
-     return;
- } ?>
--<?php $_categories = $block->getCurrentChildCategories(); ?>
-+<?php $_categories = $block->getCurrentChildCategories() ;?>
- <?php $_count = is_array($_categories) ? count($_categories) : $_categories->count(); ?>
--<?php if ($_count): ?>
-+<?php if ($_count) :?>
-     <div class="block filter">
-         <div class="title">
--            <strong><?= /* @escapeNotVerified */ __('Shop By') ?></strong>
-+            <strong><?= $block->escapeHtml(__('Shop By')) ?></strong>
-         </div>
-         <div class="content">
--            <strong class="subtitle"><?= /* @escapeNotVerified */ __('Shopping Options') ?></strong>
-+            <strong class="subtitle"><?= $block->escapeHtml(__('Shopping Options')) ?></strong>
-             <dl class="options" id="narrow-by-list2">
--                <dt><?= /* @escapeNotVerified */ __('Category') ?></dt>
-+                <dt><?= $block->escapeHtml(__('Category')) ?></dt>
-                 <dd>
-                     <ol class="items">
-                         <?php /** @var \Magento\Catalog\Model\Category $_category */ ?>
--                        <?php foreach ($_categories as $_category): ?>
--                            <?php if ($_category->getIsActive()): ?>
-+                        <?php foreach ($_categories as $_category) :?>
-+                            <?php if ($_category->getIsActive()) :?>
-                                 <li class="item">
--                                    <a href="<?= /* @escapeNotVerified */ $block->getCategoryUrl($_category) ?>"<?php if ($block->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?= $block->escapeHtml($_category->getName()) ?></a>
--                                    <span class="count"><?= /* @escapeNotVerified */ $_category->getProductCount() ?></span>
-+                                    <a href="<?= $block->escapeUrl($block->getCategoryUrl($_category)) ?>"
-+                                        <?php if ($block->isCategoryActive($_category)) :?>
-+                                            class="current"
-+                                        <?php endif; ?>
-+                                    ><?= $block->escapeHtml($_category->getName()) ?></a>
-+                                    <span class="count"><?= $block->escapeHtml($_category->getProductCount()) ?></span>
-                                 </li>
-                             <?php endif; ?>
-                         <?php endforeach ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
-index b8595aae9d9..05a5649135e 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
-@@ -4,16 +4,16 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/** @var $block Magento\Framework\View\Element\Template */
- ?>
- <li class="item link compare" data-bind="scope: 'compareProducts'" data-role="compare-products-link">
--    <a class="action compare no-display" title="<?= /* @escapeNotVerified */ __('Compare Products') ?>"
-+    <a class="action compare no-display" title="<?= $block->escapeHtmlAttr(__('Compare Products')) ?>"
-        data-bind="attr: {'href': compareProducts().listUrl}, css: {'no-display': !compareProducts().count}"
-     >
--        <?= /* @escapeNotVerified */ __('Compare Products') ?>
-+        <?= $block->escapeHtml(__('Compare Products')) ?>
-         <span class="counter qty" data-bind="text: compareProducts().countCaption"></span>
-     </a>
- </li>
- <script type="text/x-magento-init">
--{"[data-role=compare-products-link]": {"Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>}}
-+{"[data-role=compare-products-link]": {"Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>}}
- </script>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
-index 949d365e789..55772388d44 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
-@@ -4,14 +4,16 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+// phpcs:disable PSR2.ControlStructures.SwitchDeclaration
-+// phpcs:disable Generic.WhiteSpace.ScopeIndent
- 
- /* @var $block \Magento\Catalog\Block\Product\Compare\ListCompare */
- ?>
- <?php $total = $block->getItems()->getSize() ?>
--<?php if ($total): ?>
--    <a href="#" class="action print hidden-print" title="<?= /* @escapeNotVerified */ __('Print This Page') ?>">
--        <span><?= /* @escapeNotVerified */ __('Print This Page') ?></span>
-+<?php if ($total) :?>
-+    <a href="#" class="action print hidden-print" title="<?= $block->escapeHtmlAttr(__('Print This Page')) ?>">
-+        <span><?= $block->escapeHtml(__('Print This Page')) ?></span>
-     </a>
-         <div class="table-wrapper comparison">
-             <table class="data table table-comparison" id="product-comparison"
-@@ -21,19 +23,19 @@
-                     "selectors":{
-                         "productAddToCartSelector":"button.action.tocart"}
-                 }}'>
--                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Compare Products') ?></caption>
-+                <caption class="table-caption"><?= $block->escapeHtml(__('Compare Products')) ?></caption>
-                 <thead>
-                 <tr>
-                     <?php $index = 0 ?>
--                    <?php foreach ($block->getItems() as $item): ?>
--                        <?php if ($index++ == 0): ?>
--                            <th scope="row" class="cell label remove"><span><?= /* @escapeNotVerified */ __('Remove Product') ?></span></th>
-+                    <?php foreach ($block->getItems() as $item) :?>
-+                        <?php if ($index++ == 0) :?>
-+                            <th scope="row" class="cell label remove"><span><?= $block->escapeHtml(__('Remove Product')) ?></span></th>
-                         <?php endif; ?>
-                         <td class="cell remove product hidden-print">
--                            <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
--                            <a href="#" data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataRemove($item) ?>'
--                               class="action delete" title="<?= /* @escapeNotVerified */ __('Remove Product') ?>">
--                                <span><?= /* @escapeNotVerified */ __('Remove Product') ?></span>
-+                            <?php $compareHelper = $this->helper(Magento\Catalog\Helper\Product\Compare::class);?>
-+                            <a href="#" data-post='<?= /* @noEscape */ $compareHelper->getPostDataRemove($item) ?>'
-+                               class="action delete" title="<?= $block->escapeHtmlAttr(__('Remove Product')) ?>">
-+                                <span><?= $block->escapeHtml(__('Remove Product')) ?></span>
-                             </a>
-                         </td>
-                     <?php endforeach; ?>
-@@ -42,44 +44,54 @@
-                 <tbody>
-                 <tr>
-                     <?php $index = 0; ?>
--                    <?php $helper = $this->helper('Magento\Catalog\Helper\Output'); ?>
-+                    <?php $helper = $this->helper(Magento\Catalog\Helper\Output::class); ?>
-                     <?php /** @var $item \Magento\Catalog\Model\Product */ ?>
--                    <?php foreach ($block->getItems() as $item): ?>
--                        <?php if ($index++ == 0): ?>
--                            <th scope="row" class="cell label product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
-+                    <?php foreach ($block->getItems() as $item) :?>
-+                        <?php if ($index++ == 0) :?>
-+                            <th scope="row" class="cell label product">
-+                                <span><?= $block->escapeHtml(__('Product')) ?></span>
-+                            </th>
-                         <?php endif; ?>
--                        <td data-th="<?= $block->escapeHtml(__('Product')) ?>" class="cell product info">
--                            <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $block->getProductUrl($item) ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($item->getName(), null, true) ?>">
-+                        <td data-th="<?= $block->escapeHtmlAttr(__('Product')) ?>" class="cell product info">
-+                            <a class="product-item-photo"
-+                               href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>"
-+                               title="<?= /* @noEscape */ $block->stripTags($item->getName(), null, true) ?>">
-                                 <?= $block->getImage($item, 'product_comparison_list')->toHtml() ?>
-                             </a>
-                             <strong class="product-item-name">
--                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($item) ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($item->getName(), null, true) ?>">
--                                    <?= /* @escapeNotVerified */ $helper->productAttribute($item, $item->getName(), 'name') ?>
-+                                <a href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>"
-+                                   title="<?= /* @noEscape */ $block->stripTags($item->getName(), null, true) ?>">
-+                                    <?= /* @noEscape */ $helper->productAttribute($item, $item->getName(), 'name') ?>
-                                 </a>
-                             </strong>
-                             <?= $block->getReviewsSummaryHtml($item, 'short') ?>
--                            <?= /* @escapeNotVerified */ $block->getProductPrice($item, '-compare-list-top') ?>
-+                            <?= /* @noEscape */ $block->getProductPrice($item, '-compare-list-top') ?>
-                             <div class="product-item-actions hidden-print">
-                                 <div class="actions-primary">
--                                    <?php if ($item->isSaleable()): ?>
--                                        <form data-role="tocart-form" action="<?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($item) ?>" method="post">
-+                                    <?php if ($item->isSaleable()) :?>
-+                                        <form data-role="tocart-form"
-+                                              action="<?= $block->escapeUrl($this->helper(Magento\Catalog\Helper\Product\Compare::class)->getAddToCartUrl($item)) ?>"
-+                                              method="post">
-                                             <?= $block->getBlockHtml('formkey') ?>
-                                             <button type="submit" class="action tocart primary">
--                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                             </button>
-                                         </form>
--                                    <?php else: ?>
--                                        <?php if ($item->getIsSalable()): ?>
--                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
--                                        <?php else: ?>
--                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-+                                    <?php else :?>
-+                                        <?php if ($item->getIsSalable()) :?>
-+                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-+                                        <?php else :?>
-+                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-                                         <?php endif; ?>
-                                     <?php endif; ?>
-                                 </div>
--                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-+                                <?php if ($this->helper(Magento\Wishlist\Helper\Data::class)->isAllow()) :?>
-                                     <div class="secondary-addto-links actions-secondary" data-role="add-to-links">
--                                        <a href="#" data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($item) ?>' class="action towishlist" data-action="add-to-wishlist">
--                                            <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
-+                                        <a href="#"
-+                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($item) ?>'
-+                                           class="action towishlist"
-+                                           data-action="add-to-wishlist">
-+                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
-                                         </a>
-                                     </div>
-                                 <?php endif; ?>
-@@ -89,12 +101,12 @@
-                 </tr>
-                 </tbody>
-                 <tbody>
--                <?php foreach ($block->getAttributes() as $attribute): ?>
-+                <?php foreach ($block->getAttributes() as $attribute) :?>
-                     <?php $index = 0; ?>
--                    <?php if ($block->hasAttributeValueForProducts($attribute)): ?>
-+                    <?php if ($block->hasAttributeValueForProducts($attribute)) :?>
-                          <tr>
--                            <?php foreach ($block->getItems() as $item): ?>
--                                <?php if ($index++ == 0): ?>
-+                            <?php foreach ($block->getItems() as $item) :?>
-+                                <?php if ($index++ == 0) :?>
-                                     <th scope="row" class="cell label">
-                                         <span class="attribute label">
-                                             <?= $block->escapeHtml($attribute->getStoreLabel() ? $attribute->getStoreLabel() : __($attribute->getFrontendLabel())) ?>
-@@ -105,19 +117,21 @@
-                                     <div class="attribute value">
-                                         <?php switch ($attribute->getAttributeCode()) {
-                                             case "price": ?>
--                                                <?php
--                                                    /* @escapeNotVerified */ echo $block->getProductPrice(
--                                                        $item,
--                                                        '-compare-list-' . $attribute->getCode()
--                                                    )
-+                                                <?=
-+                                                /* @noEscape */ $block->getProductPrice(
-+                                                    $item,
-+                                                    '-compare-list-' . $attribute->getCode()
-+                                                )
-                                                 ?>
-                                                 <?php break;
-                                             case "small_image": ?>
-                                                 <?php $block->getImage($item, 'product_small_image')->toHtml(); ?>
-                                                 <?php break;
--                                            default: ?>
--                                            <?= /* @escapeNotVerified */ $helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode()) ?>
--                                            <?php break;
-+                                            default :?>
-+                                                <?php if (is_string($block->getProductAttributeValue($item, $attribute))) :?>
-+                                                    <?= /* @noEscape */ $helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode()) ?>
-+                                                <?php endif; ?>
-+                                                <?php break;
-                                         } ?>
-                                     </div>
-                                 </td>
-@@ -128,7 +142,7 @@
-                 </tbody>
-             </table>
-         </div>
--        <?php if (!$block->isRedirectToCartEnabled()) : ?>
-+        <?php if (!$block->isRedirectToCartEnabled()) :?>
-             <script type="text/x-magento-init">
-             {
-                 "[data-role=tocart-form]": {
-@@ -137,6 +151,6 @@
-             }
-             </script>
-         <?php endif; ?>
--<?php else: ?>
--    <div class="message info empty"><div><?= /* @escapeNotVerified */ __('You have no items to compare.') ?></div></div>
-+<?php else :?>
-+    <div class="message info empty"><div><?= $block->escapeHtml(__('You have no items to compare.')) ?></div></div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
-index 8daa3424544..809ddc5c617 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
-@@ -4,12 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+
- /* @var $block \Magento\Framework\View\Element\Template */
- ?>
- <div class="block block-compare" data-bind="scope: 'compareProducts'" data-role="compare-products-sidebar">
-     <div class="block-title">
--        <strong id="block-compare-heading" role="heading" aria-level="2"><?= /* @escapeNotVerified */ __('Compare Products') ?></strong>
-+        <strong id="block-compare-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Compare Products')) ?></strong>
-         <span class="counter qty no-display" data-bind="text: compareProducts().countCaption, css: {'no-display': !compareProducts().count}"></span>
-     </div>
-     <!-- ko if: compareProducts().count -->
-@@ -20,29 +21,32 @@
-                     <strong class="product-item-name">
-                         <a data-bind="attr: {href: product_url}, html: name" class="product-item-link"></a>
-                     </strong>
--                    <a href="#" data-bind="attr: {'data-post': remove_url}" title="<?= /* @escapeNotVerified */ __('Remove This Item') ?>" class="action delete">
--                        <span><?= /* @escapeNotVerified */ __('Remove This Item') ?></span>
-+                    <a href="#"
-+                       data-bind="attr: {'data-post': remove_url}"
-+                       title="<?= $block->escapeHtmlAttr(__('Remove This Item')) ?>"
-+                       class="action delete">
-+                        <span><?= $block->escapeHtml(__('Remove This Item')) ?></span>
-                     </a>
-                 </li>
-         </ol>
-         <div class="actions-toolbar">
-             <div class="primary">
--                <a data-bind="attr: {'href': compareProducts().listUrl}" class="action compare primary"><span><?= /* @escapeNotVerified */ __('Compare') ?></span></a>
-+                <a data-bind="attr: {'href': compareProducts().listUrl}" class="action compare primary"><span><?= $block->escapeHtml(__('Compare')) ?></span></a>
-             </div>
-             <div class="secondary">
-                 <a id="compare-clear-all" href="#" class="action clear" data-post="<?=$block->escapeHtml(
--                    $this->helper('Magento\Catalog\Helper\Product\Compare')->getPostDataClearList()
-+                    $this->helper(Magento\Catalog\Helper\Product\Compare::class)->getPostDataClearList()
-                 ) ?>">
--                    <span><?= /* @escapeNotVerified */ __('Clear All') ?></span>
-+                    <span><?= $block->escapeHtml(__('Clear All')) ?></span>
-                 </a>
-             </div>
-         </div>
-     </div>
-     <!-- /ko -->
-     <!-- ko ifnot: compareProducts().count -->
--    <div class="empty"><?= /* @escapeNotVerified */ __('You have no items to compare.') ?></div>
-+    <div class="empty"><?= $block->escapeHtml(__('You have no items to compare.')) ?></div>
-     <!-- /ko -->
- </div>
- <script type="text/x-magento-init">
--{"[data-role=compare-products-sidebar]": {"Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>}}
-+{"[data-role=compare-products-sidebar]": {"Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>}}
- </script>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
-index c7abb0525b3..e9551793c86 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
-@@ -4,39 +4,45 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Catalog\Block\Product\Gallery $block */
- ?>
- <?php $_width = $block->getImageWidth(); ?>
--<div class="product-image-popup" style="width:<?= /* @escapeNotVerified */ $_width ?>px;">
--    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?= /* @escapeNotVerified */ __('Close Window') ?></span></a></div>
--    <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()): ?>
-+<div class="product-image-popup" style="width:<?= /* @noEscape */ $_width ?>px;">
-+    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?= $block->escapeHtml(__('Close Window')) ?></span></a></div>
-+    <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()) :?>
-         <div class="nav">
--          <?php if ($_prevUrl = $block->getPreviousImageUrl()): ?>
--              <a href="<?= /* @escapeNotVerified */ $_prevUrl ?>" class="prev">&laquo; <?= /* @escapeNotVerified */ __('Prev') ?></a>
--          <?php endif; ?>
--          <?php if ($_nextUrl = $block->getNextImageUrl()): ?>
--              <a href="<?= /* @escapeNotVerified */ $_nextUrl ?>" class="next"><?= /* @escapeNotVerified */ __('Next') ?> &raquo;</a>
--          <?php endif; ?>
-+            <?php if ($_prevUrl = $block->getPreviousImageUrl()) :?>
-+                <a href="<?= $block->escapeUrl($_prevUrl) ?>" class="prev">&laquo; <?= $block->escapeHtml(__('Prev')) ?></a>
-+            <?php endif; ?>
-+            <?php if ($_nextUrl = $block->getNextImageUrl()) :?>
-+                <a href="<?= $block->escapeUrl($_nextUrl) ?>" class="next"><?= $block->escapeHtml(__('Next')) ?> &raquo;</a>
-+            <?php endif; ?>
-         </div>
-     <?php endif; ?>
--    <?php if ($_imageTitle = $block->escapeHtml($block->getCurrentImage()->getLabel())): ?>
--        <h1 class="image-label"><?= /* @escapeNotVerified */ $_imageTitle ?></h1>
-+    <?php if ($_imageTitle = $block->escapeHtml($block->getCurrentImage()->getLabel())) :?>
-+        <h1 class="image-label"><?= /* @noEscape */ $_imageTitle ?></h1>
-     <?php endif; ?>
-     <?php
--        $imageUrl = $block->getImageUrl();
-+    $imageUrl = $block->getImageUrl();
-     ?>
--    <img src="<?= /* @escapeNotVerified */ $imageUrl ?>"<?php if ($_width): ?> width="<?= /* @escapeNotVerified */ $_width ?>"<?php endif; ?> alt="<?= $block->escapeHtml($block->getCurrentImage()->getLabel()) ?>" title="<?= $block->escapeHtml($block->getCurrentImage()->getLabel()) ?>" id="product-gallery-image" class="image" data-mage-init='{"catalogGallery":{}}'/>
--    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?= /* @escapeNotVerified */ __('Close Window') ?></span></a></div>
--    <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()): ?>
-+    <img src="<?= $block->escapeUrl($imageUrl) ?>"
-+        <?php if ($_width) :?>
-+            width="<?= /* @noEscape */ $_width ?>"
-+        <?php endif; ?>
-+         alt="<?= $block->escapeHtmlAttr($block->getCurrentImage()->getLabel()) ?>"
-+         title="<?= $block->escapeHtmlAttr($block->getCurrentImage()->getLabel()) ?>"
-+         id="product-gallery-image"
-+         class="image"
-+         data-mage-init='{"catalogGallery":{}}'/>
-+    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?= /* @noEscape */ __('Close Window') ?></span></a></div>
-+    <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()) :?>
-         <div class="nav">
--          <?php if ($_prevUrl = $block->getPreviousImageUrl()): ?>
--              <a href="<?= /* @escapeNotVerified */ $_prevUrl ?>" class="prev">&laquo; <?= /* @escapeNotVerified */ __('Prev') ?></a>
--          <?php endif; ?>
--          <?php if ($_nextUrl = $block->getNextImageUrl()): ?>
--              <a href="<?= /* @escapeNotVerified */ $_nextUrl ?>" class="next"><?= /* @escapeNotVerified */ __('Next') ?> &raquo;</a>
--          <?php endif; ?>
-+            <?php if ($_prevUrl = $block->getPreviousImageUrl()) :?>
-+                <a href="<?= $block->escapeUrl($_prevUrl) ?>" class="prev">&laquo; <?= $block->escapeHtml(__('Prev')) ?></a>
-+            <?php endif; ?>
-+            <?php if ($_nextUrl = $block->getNextImageUrl()) :?>
-+                <a href="<?= $block->escapeUrl($_nextUrl) ?>" class="next"><?= $block->escapeHtml(__('Next')) ?> &raquo;</a>
-+            <?php endif; ?>
-         </div>
-     <?php endif; ?>
- </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
-index 94b829eb921..5a1b102ff63 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
-@@ -7,8 +7,8 @@
- <?php /** @var $block \Magento\Catalog\Block\Product\Image */ ?>
- 
- <img class="photo image"
--    <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
--    src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
--    width="<?= /* @escapeNotVerified */ $block->getWidth() ?>"
--    height="<?= /* @escapeNotVerified */ $block->getHeight() ?>"
--    alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>" />
-+    <?= $block->escapeHtml($block->getCustomAttributes()) ?>
-+    src="<?= $block->escapeUrl($block->getImageUrl()) ?>"
-+    width="<?= $block->escapeHtmlAttr($block->getWidth()) ?>"
-+    height="<?= $block->escapeHtmlAttr($block->getHeight()) ?>"
-+    alt="<?= /* @noEscape */ $block->stripTags($block->getLabel(), null, true) ?>" />
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
-index 74a0b2d7cf1..33f7620f1a1 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
-@@ -7,13 +7,13 @@
- <?php /** @var $block \Magento\Catalog\Block\Product\Image */ ?>
- 
- <span class="product-image-container"
--      style="width:<?= /* @escapeNotVerified */ $block->getWidth() ?>px;">
-+      style="width:<?= $block->escapeHtmlAttr($block->getWidth()) ?>px;">
-     <span class="product-image-wrapper"
--          style="padding-bottom: <?= /* @escapeNotVerified */ ($block->getRatio() * 100) ?>%;">
--        <img class="product-image-photo"
--            <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
--            src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
--            max-width="<?= /* @escapeNotVerified */ $block->getWidth() ?>"
--            max-height="<?= /* @escapeNotVerified */ $block->getHeight() ?>"
--            alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>"/></span>
-+          style="padding-bottom: <?= ($block->getRatio() * 100) ?>%;">
-+        <img class="<?= $block->escapeHtmlAttr($block->getClass()) ?>"
-+            <?= $block->escapeHtmlAttr($block->getCustomAttributes()) ?>
-+            src="<?= $block->escapeUrl($block->getImageUrl()) ?>"
-+            max-width="<?= $block->escapeHtmlAttr($block->getWidth()) ?>"
-+            max-height="<?= $block->escapeHtmlAttr($block->getHeight()) ?>"
-+            alt="<?= /* @noEscape */ $block->stripTags($block->getLabel(), null, true) ?>"/></span>
- </span>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
-index f7799b30436..ce44884a575 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
-@@ -5,10 +5,10 @@
-  */
- use Magento\Framework\App\Action\Action;
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+
- /**
-  * Product list template
-  *
-@@ -17,11 +17,11 @@ use Magento\Framework\App\Action\Action;
- ?>
- <?php
- $_productCollection = $block->getLoadedProductCollection();
--$_helper = $this->helper('Magento\Catalog\Helper\Output');
-+$_helper = $this->helper(Magento\Catalog\Helper\Output::class);
- ?>
--<?php if (!$_productCollection->count()): ?>
--    <div class="message info empty"><div><?= /* @escapeNotVerified */ __('We can\'t find products matching the selection.') ?></div></div>
--<?php else: ?>
-+<?php if (!$_productCollection->count()) :?>
-+    <div class="message info empty"><div><?= $block->escapeHtml(__('We can\'t find products matching the selection.')) ?></div></div>
-+<?php else :?>
-     <?= $block->getToolbarHtml() ?>
-     <?= $block->getAdditionalHtml() ?>
-     <?php
-@@ -41,12 +41,12 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
-      */
-     $pos = $block->getPositioned();
-     ?>
--    <div class="products wrapper <?= /* @escapeNotVerified */ $viewMode ?> products-<?= /* @escapeNotVerified */ $viewMode ?>">
-+    <div class="products wrapper <?= /* @noEscape */ $viewMode ?> products-<?= /* @noEscape */ $viewMode ?>">
-         <ol class="products list items product-items">
-             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
--            <?php foreach ($_productCollection as $_product): ?>
-+            <?php foreach ($_productCollection as $_product) :?>
-             <li class="item product product-item">
--                <div class="product-item-info" data-container="product-grid">
-+                <div class="product-item-info" data-container="product-<?= /* @noEscape */ $viewMode ?>">
-                     <?php
-                     $productImage = $block->getImage($_product, $imageDisplayArea);
-                     if ($pos != null) {
-@@ -55,7 +55,9 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
-                     }
-                     ?>
-                     <?php // Product Image ?>
--                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product photo product-item-photo" tabindex="-1">
-+                    <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
-+                       class="product photo product-item-photo"
-+                       tabindex="-1">
-                         <?= $productImage->toHtml() ?>
-                     </a>
-                     <div class="product details product-item-details">
-@@ -64,48 +66,55 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
-                         ?>
-                         <strong class="product name product-item-name">
-                             <a class="product-item-link"
--                               href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>">
--                                <?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_product->getName(), 'name') ?>
-+                               href="<?= $block->escapeUrl($_product->getProductUrl()) ?>">
-+                                <?= /* @noEscape */ $_helper->productAttribute($_product, $_product->getName(), 'name') ?>
-                             </a>
-                         </strong>
-                         <?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
--                        <?= /* @escapeNotVerified */ $block->getProductPrice($_product) ?>
-+                        <?= /* @noEscape */ $block->getProductPrice($_product) ?>
-                         <?= $block->getProductDetailsHtml($_product) ?>
- 
-                         <div class="product-item-inner">
--                            <div class="product actions product-item-actions"<?= strpos($pos, $viewMode . '-actions') ? $position : '' ?>>
--                                <div class="actions-primary"<?= strpos($pos, $viewMode . '-primary') ? $position : '' ?>>
--                                    <?php if ($_product->isSaleable()): ?>
-+                            <div class="product actions product-item-actions"<?= strpos($pos, $viewMode . '-actions') ? $block->escapeHtmlAttr($position) : '' ?>>
-+                                <div class="actions-primary"<?= strpos($pos, $viewMode . '-primary') ? $block->escapeHtmlAttr($position) : '' ?>>
-+                                    <?php if ($_product->isSaleable()) :?>
-                                         <?php $postParams = $block->getAddToCartPostParams($_product); ?>
--                                        <form data-role="tocart-form" data-product-sku="<?= $block->escapeHtml($_product->getSku()) ?>" action="<?= /* @NoEscape */ $postParams['action'] ?>" method="post">
--                                            <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $postParams['data']['product'] ?>">
--                                            <input type="hidden" name="<?= /* @escapeNotVerified */ Action::PARAM_NAME_URL_ENCODED ?>" value="<?= /* @escapeNotVerified */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
-+                                        <form data-role="tocart-form"
-+                                              data-product-sku="<?= $block->escapeHtml($_product->getSku()) ?>"
-+                                              action="<?= $block->escapeUrl($postParams['action']) ?>"
-+                                              method="post">
-+                                            <input type="hidden"
-+                                                   name="product"
-+                                                   value="<?= /* @noEscape */ $postParams['data']['product'] ?>">
-+                                            <input type="hidden" name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>"
-+                                                   value="<?= /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
-                                             <?= $block->getBlockHtml('formkey') ?>
-                                             <button type="submit"
--                                                    title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
-+                                                    title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
-                                                     class="action tocart primary">
--                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                             </button>
-                                         </form>
--                                    <?php else: ?>
--                                        <?php if ($_product->isAvailable()): ?>
--                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
--                                        <?php else: ?>
--                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-+                                    <?php else :?>
-+                                        <?php if ($_product->isAvailable()) :?>
-+                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-+                                        <?php else :?>
-+                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-                                         <?php endif; ?>
-                                     <?php endif; ?>
-                                 </div>
--                                <div data-role="add-to-links" class="actions-secondary"<?= strpos($pos, $viewMode . '-secondary') ? $position : '' ?>>
--                                    <?php if ($addToBlock = $block->getChildBlock('addto')): ?>
-+                                <div data-role="add-to-links" class="actions-secondary"<?= strpos($pos, $viewMode . '-secondary') ? $block->escapeHtmlAttr($position) : '' ?>>
-+                                    <?php if ($addToBlock = $block->getChildBlock('addto')) :?>
-                                         <?= $addToBlock->setProduct($_product)->getChildHtml() ?>
-                                     <?php endif; ?>
-                                 </div>
-                             </div>
--                            <?php if ($showDescription):?>
-+                            <?php if ($showDescription) :?>
-                                 <div class="product description product-item-description">
--                                    <?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
--                                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" title="<?= /* @escapeNotVerified */ $_productNameStripped ?>"
--                                       class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
-+                                    <?= /* @noEscape */ $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
-+                                    <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
-+                                       title="<?= /* @noEscape */ $_productNameStripped ?>"
-+                                       class="action more"><?= $block->escapeHtml(__('Learn More')) ?></a>
-                                 </div>
-                             <?php endif; ?>
-                         </div>
-@@ -116,12 +125,12 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
-         </ol>
-     </div>
-     <?= $block->getToolbarHtml() ?>
--    <?php if (!$block->isRedirectToCartEnabled()) : ?>
-+    <?php if (!$block->isRedirectToCartEnabled()) :?>
-         <script type="text/x-magento-init">
-         {
-             "[data-role=tocart-form], .form.map.checkout": {
-                 "catalogAddToCart": {
--                    "product_sku": "<?= /* @NoEscape */ $_product->getSku() ?>"
-+                    "product_sku": "<?= $block->escapeJs($_product->getSku()) ?>"
-                 }
-             }
-         }
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/addto/compare.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/addto/compare.phtml
-index 8798170e8c0..c23ee021ca3 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/list/addto/compare.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/addto/compare.phtml
-@@ -4,14 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /** @var $block Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare */
- ?>
- <a href="#"
-    class="action tocompare"
-    title="<?= $block->escapeHtml(__('Add to Compare')) ?>"
-    aria-label="<?= $block->escapeHtml(__('Add to Compare')) ?>"
--   data-post='<?= /* @escapeNotVerified */ $block->getCompareHelper()->getPostDataParams($block->getProduct()) ?>'
-+   data-post='<?= /* @noEscape */ $block->getCompareHelper()->getPostDataParams($block->getProduct()) ?>'
-    role="button">
--    <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
-+    <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
- </a>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
-index f4344023460..91e261900ae 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
-@@ -4,7 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+// phpcs:disable Generic.WhiteSpace.ScopeIndent.Incorrect
- 
- /* @var $block \Magento\Catalog\Block\Product\AbstractProduct */
- ?>
-@@ -29,7 +30,7 @@ switch ($type = $block->getType()) {
-             $templateType = null;
-             $description = false;
-         }
--    break;
-+        break;
- 
-     case 'related':
-         /** @var \Magento\Catalog\Block\Product\ProductList\Related $block */
-@@ -49,7 +50,7 @@ switch ($type = $block->getType()) {
-             $templateType = null;
-             $description = false;
-         }
--    break;
-+        break;
- 
-     case 'upsell-rule':
-         if ($exist = $block->hasItems()) {
-@@ -68,7 +69,7 @@ switch ($type = $block->getType()) {
-             $description = false;
-             $canItemsAddToCart = false;
-         }
--    break;
-+        break;
- 
-     case 'upsell':
-         /** @var \Magento\Catalog\Block\Product\ProductList\Upsell $block */
-@@ -88,7 +89,7 @@ switch ($type = $block->getType()) {
-             $description = false;
-             $canItemsAddToCart = false;
-         }
--    break;
-+        break;
- 
-     case 'crosssell-rule':
-         /** @var \Magento\Catalog\Block\Product\ProductList\Crosssell $block */
-@@ -106,7 +107,7 @@ switch ($type = $block->getType()) {
-             $description = false;
-             $canItemsAddToCart = false;
-         }
--    break;
-+        break;
- 
-     case 'crosssell':
-         /** @var \Magento\Catalog\Block\Product\ProductList\Crosssell $block */
-@@ -124,7 +125,7 @@ switch ($type = $block->getType()) {
-             $description = false;
-             $canItemsAddToCart = false;
-         }
--    break;
-+        break;
- 
-     case 'new':
-         if ($exist = $block->getProductCollection()) {
-@@ -144,117 +145,117 @@ switch ($type = $block->getType()) {
-             $description = ($mode == 'list') ? true : false;
-             $canItemsAddToCart = false;
-         }
--    break;
-+        break;
- 
-     default:
-         $exist = null;
- }
- ?>
- 
--<?php if ($exist):?>
-+<?php if ($exist) :?>
- 
--    <?php if ($type == 'related' || $type == 'upsell'): ?>
--        <?php if ($type == 'related'): ?>
--            <div class="block <?= /* @escapeNotVerified */ $class ?>" data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}' data-limit="<?= /* @escapeNotVerified */ $limit ?>" data-shuffle="<?= /* @escapeNotVerified */ $shuffle ?>">
--        <?php else: ?>
--            <div class="block <?= /* @escapeNotVerified */ $class ?>" data-mage-init='{"upsellProducts":{}}' data-limit="<?= /* @escapeNotVerified */ $limit ?>" data-shuffle="<?= /* @escapeNotVerified */ $shuffle ?>">
-+<?php if ($type == 'related' || $type == 'upsell') :?>
-+<?php if ($type == 'related') :?>
-+<div class="block <?= $block->escapeHtmlAttr($class) ?>" data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}' data-limit="<?= $block->escapeHtmlAttr($limit) ?>" data-shuffle="<?= /* @noEscape */ $shuffle ?>">
-+    <?php else :?>
-+    <div class="block <?= $block->escapeHtmlAttr($class) ?>" data-mage-init='{"upsellProducts":{}}' data-limit="<?= $block->escapeHtmlAttr($limit) ?>" data-shuffle="<?= /* @noEscape */ $shuffle ?>">
-         <?php endif; ?>
--    <?php else: ?>
--        <div class="block <?= /* @escapeNotVerified */ $class ?>">
--    <?php endif; ?>
--    <div class="block-title title">
--        <strong id="block-<?= /* @escapeNotVerified */ $class ?>-heading" role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
--    </div>
--    <div class="block-content content" aria-labelledby="block-<?= /* @escapeNotVerified */ $class ?>-heading">
--        <?php if ($type == 'related' && $canItemsAddToCart): ?>
--        <div class="block-actions">
--            <?= /* @escapeNotVerified */ __('Check items to add to the cart or') ?>
--            <button type="button" class="action select" role="select-all"><span><?= /* @escapeNotVerified */ __('select all') ?></span></button>
--        </div>
--        <?php endif; ?>
--        <div class="products wrapper grid products-grid products-<?= /* @escapeNotVerified */ $type ?>">
--            <ol class="products list items product-items">
--                <?php foreach ($items as $_item): ?>
--                <?php $available = ''; ?>
--                <?php if (!$_item->isComposite() && $_item->isSaleable() && $type == 'related'): ?>
--                    <?php if (!$_item->getRequiredOptions()): ?>
--                        <?php $available = 'related-available'; ?>
--                    <?php endif; ?>
--                <?php endif; ?>
--                <?php if ($type == 'related' || $type == 'upsell'): ?>
--                    <li class="item product product-item" style="display: none;">
--                <?php else: ?>
--                    <li class="item product product-item">
-+        <?php else :?>
-+        <div class="block <?= $block->escapeHtmlAttr($class) ?>">
-+            <?php endif; ?>
-+            <div class="block-title title">
-+                <strong id="block-<?= $block->escapeHtmlAttr($class) ?>-heading" role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
-+            </div>
-+            <div class="block-content content" aria-labelledby="block-<?= $block->escapeHtmlAttr($class) ?>-heading">
-+                <?php if ($type == 'related' && $canItemsAddToCart) :?>
-+                    <div class="block-actions">
-+                        <?= $block->escapeHtml(__('Check items to add to the cart or')) ?>
-+                        <button type="button" class="action select" role="button"><span><?= $block->escapeHtml(__('select all')) ?></span></button>
-+                    </div>
-                 <?php endif; ?>
--                <div class="product-item-info <?= /* @escapeNotVerified */ $available ?>">
--                    <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
--                    <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product photo product-item-photo">
--                        <?= $block->getImage($_item, $image)->toHtml() ?>
--                    </a>
--                    <div class="product details product-item-details">
--                        <strong class="product name product-item-name"><a class="product-item-link" title="<?= $block->escapeHtml($_item->getName()) ?>" href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>">
--                            <?= $block->escapeHtml($_item->getName()) ?></a>
--                        </strong>
--
--                        <?= /* @escapeNotVerified */ $block->getProductPrice($_item) ?>
--
--                            <?php if ($templateType): ?>
--                                <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
--                            <?php endif; ?>
--
--                            <?php if ($canItemsAddToCart && !$_item->isComposite() && $_item->isSaleable() && $type == 'related'): ?>
--                                <?php if (!$_item->getRequiredOptions()): ?>
--                                    <div class="field choice related">
--                                        <input type="checkbox" class="checkbox related" id="related-checkbox<?= /* @escapeNotVerified */ $_item->getId() ?>" name="related_products[]" value="<?= /* @escapeNotVerified */ $_item->getId() ?>" />
--                                        <label class="label" for="related-checkbox<?= /* @escapeNotVerified */ $_item->getId() ?>"><span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span></label>
--                                    </div>
-+                <div class="products wrapper grid products-grid products-<?= $block->escapeHtmlAttr($type) ?>">
-+                    <ol class="products list items product-items">
-+                        <?php foreach ($items as $_item) :?>
-+                            <?php $available = ''; ?>
-+                            <?php if (!$_item->isComposite() && $_item->isSaleable() && $type == 'related') :?>
-+                                <?php if (!$_item->getRequiredOptions()) :?>
-+                                    <?php $available = 'related-available'; ?>
-                                 <?php endif; ?>
-                             <?php endif; ?>
-+                            <?php if ($type == 'related' || $type == 'upsell') :?>
-+                                <li class="item product product-item" style="display: none;">
-+                            <?php else :?>
-+                                <li class="item product product-item">
-+                            <?php endif; ?>
-+                            <div class="product-item-info <?= /* @noEscape */ $available ?>">
-+                                <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
-+                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product photo product-item-photo">
-+                                    <?= $block->getImage($_item, $image)->toHtml() ?>
-+                                </a>
-+                                <div class="product details product-item-details">
-+                                    <strong class="product name product-item-name"><a class="product-item-link" title="<?= $block->escapeHtml($_item->getName()) ?>" href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>">
-+                                            <?= $block->escapeHtml($_item->getName()) ?></a>
-+                                    </strong>
-+
-+                                    <?= /* @noEscape */ $block->getProductPrice($_item) ?>
-+
-+                                    <?php if ($templateType) :?>
-+                                        <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
-+                                    <?php endif; ?>
- 
--                            <?php if ($showAddTo || $showCart): ?>
--                                <div class="product actions product-item-actions">
--                                    <?php if ($showCart): ?>
--                                        <div class="actions-primary">
--                                            <?php if ($_item->isSaleable()): ?>
--                                                <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
--                                                    <button class="action tocart primary" data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}' type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
--                                                    </button>
--                                                <?php else: ?>
--                                                    <?php $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
--                                                    $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
--                                                    ?>
--                                                    <button class="action tocart primary"
--                                                            data-post='<?= /* @escapeNotVerified */ $postData ?>'
--                                                            type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
--                                                    </button>
--                                                <?php endif; ?>
--                                            <?php else: ?>
--                                                <?php if ($_item->getIsSalable()): ?>
--                                                    <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
--                                                <?php else: ?>
--                                                    <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
--                                                <?php endif; ?>
--                                            <?php endif; ?>
--                                        </div>
-+                                    <?php if ($canItemsAddToCart && !$_item->isComposite() && $_item->isSaleable() && $type == 'related') :?>
-+                                        <?php if (!$_item->getRequiredOptions()) :?>
-+                                            <div class="field choice related">
-+                                                <input type="checkbox" class="checkbox related" id="related-checkbox<?= $block->escapeHtmlAttr($_item->getId()) ?>" name="related_products[]" value="<?= $block->escapeHtmlAttr($_item->getId()) ?>" />
-+                                                <label class="label" for="related-checkbox<?= $block->escapeHtmlAttr($_item->getId()) ?>"><span><?= $block->escapeHtml(__('Add to Cart')) ?></span></label>
-+                                            </div>
-+                                        <?php endif; ?>
-                                     <?php endif; ?>
- 
--                                    <?php if ($showAddTo): ?>
--                                        <div class="secondary-addto-links actions-secondary" data-role="add-to-links">
--                                            <?php if ($addToBlock = $block->getChildBlock('addto')): ?>
--                                                <?= $addToBlock->setProduct($_item)->getChildHtml() ?>
-+                                    <?php if ($showAddTo || $showCart) :?>
-+                                        <div class="product actions product-item-actions">
-+                                            <?php if ($showCart) :?>
-+                                                <div class="actions-primary">
-+                                                    <?php if ($_item->isSaleable()) :?>
-+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)) :?>
-+                                                            <button class="action tocart primary" data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-+                                                            </button>
-+                                                        <?php else :?>
-+                                                            <?php $postDataHelper = $this->helper(Magento\Framework\Data\Helper\PostHelper::class);
-+                                                            $postData = $postDataHelper->getPostData($block->escapeUrl($block->getAddToCartUrl($_item)), ['product' => $_item->getEntityId()])
-+                                                            ?>
-+                                                            <button class="action tocart primary"
-+                                                                    data-post='<?= /* @noEscape */ $postData ?>'
-+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-+                                                            </button>
-+                                                        <?php endif; ?>
-+                                                    <?php else :?>
-+                                                        <?php if ($_item->getIsSalable()) :?>
-+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-+                                                        <?php else :?>
-+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-+                                                        <?php endif; ?>
-+                                                    <?php endif; ?>
-+                                                </div>
-+                                            <?php endif; ?>
-+
-+                                            <?php if ($showAddTo) :?>
-+                                                <div class="secondary-addto-links actions-secondary" data-role="add-to-links">
-+                                                    <?php if ($addToBlock = $block->getChildBlock('addto')) :?>
-+                                                        <?= $addToBlock->setProduct($_item)->getChildHtml() ?>
-+                                                    <?php endif; ?>
-+                                                </div>
-                                             <?php endif; ?>
-                                         </div>
-                                     <?php endif; ?>
-                                 </div>
--                            <?php endif; ?>
--                        </div>
--                    </div>
--                </li>
--                <?php endforeach ?>
--            </ol>
-+                            </div>
-+                            </li>
-+                        <?php endforeach ?>
-+                    </ol>
-+                </div>
-+            </div>
-         </div>
--    </div>
--</div>
--<?php endif;?>
-+        <?php endif;?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
-index 02a6e999ad5..b2ae8b9f7ab 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,11 +10,13 @@
-  *
-  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
-  */
--use Magento\Catalog\Model\Product\ProductList\Toolbar;
-+
-+// phpcs:disable Magento2.Security.IncludeFile.FoundIncludeFile
-+// phpcs:disable PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
- ?>
--<?php if ($block->getCollection()->getSize()): ?>
--    <div class="toolbar toolbar-products" data-mage-init='<?= /* @escapeNotVerified */ $block->getWidgetOptionsJson() ?>'>
--        <?php if ($block->isExpanded()): ?>
-+<?php if ($block->getCollection()->getSize()) :?>
-+    <div class="toolbar toolbar-products" data-mage-init='<?= /* @noEscape */ $block->getWidgetOptionsJson() ?>'>
-+        <?php if ($block->isExpanded()) :?>
-             <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/viewmode.phtml')) ?>
-         <?php endif; ?>
- 
-@@ -27,7 +26,7 @@ use Magento\Catalog\Model\Product\ProductList\Toolbar;
- 
-         <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/limiter.phtml')) ?>
- 
--        <?php if ($block->isExpanded()): ?>
-+        <?php if ($block->isExpanded()) :?>
-             <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/sorter.phtml')) ?>
-         <?php endif; ?>
-     </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
-index b4ff1afa1c6..a8f504d6a4f 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,19 +10,27 @@
-  *
-  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
-  */
--use Magento\Catalog\Model\Product\ProductList\Toolbar;
- ?>
- <p class="toolbar-amount" id="toolbar-amount">
--    <?php if ($block->getLastPageNum() > 1): ?>
--        <?php /* @escapeNotVerified */ echo __('Items %1-%2 of %3',
--            '<span class="toolbar-number">' . $block->getFirstNum() . '</span>',
--            '<span class="toolbar-number">' . $block->getLastNum() . '</span>',
--            '<span class="toolbar-number">' . $block->getTotalNum() . '</span>') ?>
--    <?php elseif ($block->getTotalNum() == 1): ?>
--        <?php /* @escapeNotVerified */ echo __('%1 Item',
--           '<span class="toolbar-number">' . $block->getTotalNum() . '</span>') ?>
--    <?php else: ?>
--        <?php /* @escapeNotVerified */ echo __('%1 Items',
--            '<span class="toolbar-number">' . $block->getTotalNum() . '</span>') ?>
-+    <?php if ($block->getLastPageNum() > 1) :?>
-+        <?= $block->escapeHtml(
-+            __(
-+                'Items %1-%2 of %3',
-+                '<span class="toolbar-number">' . $block->getFirstNum() . '</span>',
-+                '<span class="toolbar-number">' . $block->getLastNum() . '</span>',
-+                '<span class="toolbar-number">' . $block->getTotalNum() . '</span>'
-+            ),
-+            ['span']
-+        ) ?>
-+    <?php elseif ($block->getTotalNum() == 1) :?>
-+        <?= $block->escapeHtml(
-+            __('%1 Item', '<span class="toolbar-number">' . $block->getTotalNum() . '</span>'),
-+            ['span']
-+        ) ?>
-+    <?php else :?>
-+        <?= $block->escapeHtml(
-+            __('%1 Items', '<span class="toolbar-number">' . $block->getTotalNum() . '</span>'),
-+            ['span']
-+        ) ?>
-     <?php endif; ?>
- </p>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
-index ec4541bde5c..4ded219748c 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,21 +10,22 @@
-  *
-  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
-  */
--use Magento\Catalog\Model\Product\ProductList\Toolbar;
- ?>
- <div class="field limiter">
-     <label class="label" for="limiter">
--        <span><?= /* @escapeNotVerified */ __('Show') ?></span>
-+        <span><?= $block->escapeHtml(__('Show')) ?></span>
-     </label>
-     <div class="control">
-         <select id="limiter" data-role="limiter" class="limiter-options">
--            <?php foreach ($block->getAvailableLimit() as $_key => $_limit): ?>
--                <option value="<?= /* @escapeNotVerified */ $_key ?>"<?php if ($block->isLimitCurrent($_key)): ?>
--                    selected="selected"<?php endif ?>>
--                    <?= /* @escapeNotVerified */ $_limit ?>
-+            <?php foreach ($block->getAvailableLimit() as $_key => $_limit) :?>
-+                <option value="<?= $block->escapeHtmlAttr($_key) ?>"
-+                    <?php if ($block->isLimitCurrent($_key)) :?>
-+                        selected="selected"
-+                    <?php endif ?>>
-+                    <?= $block->escapeHtml($_limit) ?>
-                 </option>
-             <?php endforeach; ?>
-         </select>
-     </div>
--    <span class="limiter-text"><?= /* @escapeNotVerified */ __('per page') ?></span>
-+    <span class="limiter-text"><?= $block->escapeHtml(__('per page')) ?></span>
- </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
-index 92514c5b8ea..58dde199998 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,14 +10,13 @@
-  *
-  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
-  */
--use Magento\Catalog\Model\Product\ProductList\Toolbar;
- ?>
- <div class="toolbar-sorter sorter">
--    <label class="sorter-label" for="sorter"><?= /* @escapeNotVerified */ __('Sort By') ?></label>
-+    <label class="sorter-label" for="sorter"><?= $block->escapeHtml(__('Sort By')) ?></label>
-     <select id="sorter" data-role="sorter" class="sorter-options">
--        <?php foreach ($block->getAvailableOrders() as $_key => $_order): ?>
--            <option value="<?= /* @escapeNotVerified */ $_key ?>"
--                <?php if ($block->isOrderCurrent($_key)): ?>
-+        <?php foreach ($block->getAvailableOrders() as $_key => $_order) :?>
-+            <option value="<?= $block->escapeHtmlAttr($_key) ?>"
-+                <?php if ($block->isOrderCurrent($_key)) :?>
-                     selected="selected"
-                 <?php endif; ?>
-                 >
-@@ -28,13 +24,21 @@ use Magento\Catalog\Model\Product\ProductList\Toolbar;
-             </option>
-         <?php endforeach; ?>
-     </select>
--    <?php if ($block->getCurrentDirection() == 'desc'): ?>
--        <a title="<?= /* @escapeNotVerified */ __('Set Ascending Direction') ?>" href="#" class="action sorter-action sort-desc" data-role="direction-switcher" data-value="asc">
--            <span><?= /* @escapeNotVerified */ __('Set Ascending Direction') ?></span>
-+    <?php if ($block->getCurrentDirection() == 'desc') :?>
-+        <a title="<?= $block->escapeHtmlAttr(__('Set Ascending Direction')) ?>"
-+           href="#"
-+           class="action sorter-action sort-desc"
-+           data-role="direction-switcher"
-+           data-value="asc">
-+            <span><?= $block->escapeHtml(__('Set Ascending Direction')) ?></span>
-         </a>
--    <?php else: ?>
--        <a title="<?= /* @escapeNotVerified */ __('Set Descending Direction') ?>" href="#" class="action sorter-action sort-asc" data-role="direction-switcher" data-value="desc">
--            <span><?= /* @escapeNotVerified */ __('Set Descending Direction') ?></span>
-+    <?php else :?>
-+        <a title="<?= $block->escapeHtmlAttr(__('Set Descending Direction')) ?>"
-+           href="#"
-+           class="action sorter-action sort-asc"
-+           data-role="direction-switcher"
-+           data-value="desc">
-+            <span><?= $block->escapeHtml(__('Set Descending Direction')) ?></span>
-         </a>
-     <?php endif; ?>
- </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
-index 366dfba71b0..955897f315d 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,32 +10,31 @@
-  *
-  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
-  */
--use Magento\Catalog\Model\Product\ProductList\Toolbar;
- ?>
--<?php if ($block->isEnabledViewSwitcher()): ?>
--<div class="modes">
--    <?php $_modes = $block->getModes(); ?>
--    <?php if ($_modes && count($_modes) > 1): ?>
--    <strong class="modes-label" id="modes-label"><?= /* @escapeNotVerified */ __('View as') ?></strong>
--    <?php foreach ($block->getModes() as $_code => $_label): ?>
--        <?php if ($block->isModeActive($_code)): ?>
--            <strong title="<?= /* @escapeNotVerified */ $_label ?>"
--                class="modes-mode active mode-<?= /* @escapeNotVerified */ strtolower($_code) ?>"
--                data-value="<?= /* @escapeNotVerified */ strtolower($_code) ?>">
--                <span><?= /* @escapeNotVerified */ $_label ?></span>
--            </strong>
--        <?php else: ?>
--            <a class="modes-mode mode-<?= /* @escapeNotVerified */ strtolower($_code) ?>"
--               title="<?= /* @escapeNotVerified */ $_label ?>"
--               href="#"
--               data-role="mode-switcher"
--               data-value="<?= /* @escapeNotVerified */ strtolower($_code) ?>"
--               id="mode-<?= /* @escapeNotVerified */ strtolower($_code) ?>"
--               aria-labelledby="modes-label mode-<?= /* @escapeNotVerified */ strtolower($_code) ?>">
--                <span><?= /* @escapeNotVerified */ $_label ?></span>
--            </a>
--            <?php endif; ?>
--        <?php endforeach; ?>
--    <?php endif; ?>
--</div>
-+<?php if ($block->isEnabledViewSwitcher()) :?>
-+    <div class="modes">
-+        <?php $_modes = $block->getModes(); ?>
-+        <?php if ($_modes && count($_modes) > 1) :?>
-+            <strong class="modes-label" id="modes-label"><?= $block->escapeHtml(__('View as')) ?></strong>
-+            <?php foreach ($block->getModes() as $_code => $_label) :?>
-+                <?php if ($block->isModeActive($_code)) :?>
-+                    <strong title="<?= $block->escapeHtmlAttr($_label) ?>"
-+                            class="modes-mode active mode-<?= $block->escapeHtmlAttr(strtolower($_code)) ?>"
-+                            data-value="<?= $block->escapeHtmlAttr(strtolower($_code)) ?>">
-+                        <span><?= $block->escapeHtml($_label) ?></span>
-+                    </strong>
-+                <?php else :?>
-+                    <a class="modes-mode mode-<?= $block->escapeHtmlAttr(strtolower($_code)) ?>"
-+                       title="<?= $block->escapeHtmlAttr($_label) ?>"
-+                       href="#"
-+                       data-role="mode-switcher"
-+                       data-value="<?= $block->escapeHtmlAttr(strtolower($_code)) ?>"
-+                       id="mode-<?= $block->escapeHtmlAttr(strtolower($_code)) ?>"
-+                       aria-labelledby="modes-label mode-<?= $block->escapeHtmlAttr(strtolower($_code)) ?>">
-+                        <span><?= $block->escapeHtml($_label) ?></span>
-+                    </a>
-+                <?php endif; ?>
-+            <?php endforeach; ?>
-+        <?php endif; ?>
-+    </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
-index f2d5e40cca4..b776fd4f7e1 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
-@@ -3,28 +3,29 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+// phpcs:disable Magento2.Files.LineLength.MaxExceeded
-+// phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
-+
- /**
-  * Product list template
-  *
-- * @see \Magento\Catalog\Block\Product\ListProduct
-+ * @var $block \Magento\Catalog\Block\Product\ListProduct
-  */
- ?>
- <?php
- $start = microtime(true);
- $_productCollection = $block->getLoadedProductCollection();
--$_helper = $this->helper('Magento\Catalog\Helper\Output');
-+$_helper = $this->helper(Magento\Catalog\Helper\Output::class);
- ?>
--<?php if (!$_productCollection->count()): ?>
--<p class="message note"><?= /* @escapeNotVerified */ __('We can\'t find products matching the selection.') ?></p>
--<?php else: ?>
--<?= $block->getToolbarHtml() ?>
--<?= $block->getAdditionalHtml() ?>
--<?php
-+<?php if (!$_productCollection->count()) :?>
-+    <p class="message note"><?= $block->escapeHtml(__('We can\'t find products matching the selection.')) ?></p>
-+<?php else :?>
-+    <?= $block->getToolbarHtml() ?>
-+    <?= $block->getAdditionalHtml() ?>
-+    <?php
-     if ($block->getMode() == 'grid') {
-         $viewMode = 'grid';
-         $image = 'category_page_grid';
-@@ -36,65 +37,65 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
-         $showDescription = true;
-         $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::FULL_VIEW;
-     }
--?>
--<div class="products wrapper <?= /* @escapeNotVerified */ $viewMode ?>">
--    <ol class="products list items">
--        <?php foreach ($_productCollection as $_product): ?>
--            <li class="item product">
--                <div class="product">
--                    <?php // Product Image ?>
--                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product photo">
--                        <?= $block->getImage($_product, $image)->toHtml() ?>
--                    </a>
--                    <div class="product details">
--                    <?php
-+    ?>
-+    <div class="products wrapper <?= /* @noEscape */ $viewMode ?>">
-+        <ol class="products list items">
-+            <?php foreach ($_productCollection as $_product) :?>
-+                <li class="item product">
-+                    <div class="product">
-+                        <?php // Product Image ?>
-+                        <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" class="product photo">
-+                            <?= $block->getImage($_product, $image)->toHtml() ?>
-+                        </a>
-+                        <div class="product details">
-+                            <?php
- 
--                        $info = [];
--                        $info['name'] = '<strong class="product name">'
--                                        . ' <a href="' . $_product->getProductUrl() . '" title="'
--                                        . $block->stripTags($_product->getName(), null, true) . '">'
--                                        . $_helper->productAttribute($_product, $_product->getName(), 'name')
--                                        . '</a></strong>';
--                        $info['price'] = $block->getProductPrice($_product);
--                        $info['review'] = $block->getReviewsSummaryHtml($_product, $templateType);
-+                            $info = [];
-+                            $info['name'] = '<strong class="product name">'
-+                                . ' <a href="' . $block->escapeUrl($_product->getProductUrl()) . '" title="'
-+                                . $block->stripTags($_product->getName(), null, true) . '">'
-+                                . $_helper->productAttribute($_product, $_product->getName(), 'name')
-+                                . '</a></strong>';
-+                            $info['price'] = $block->getProductPrice($_product);
-+                            $info['review'] = $block->getReviewsSummaryHtml($_product, $templateType);
- 
--                        if ($_product->isSaleable()) {
--                            $info['button'] = '<button type="button" title="' . __('Add to Cart') . '" class="action tocart"'
--                                            . ' data-mage-init=\'{ "redirectUrl": { "event": "click", url: "' . $block->getAddToCartUrl($_product) . '"} }\'>'
--                                            . '<span>' . __('Add to Cart') . '</span></button>';
--                        } else {
--                            $info['button'] = $_product->getIsSalable() ?   '<div class="stock available"><span>' . __('In stock') . '</span></div>' :
--                                                                            '<div class="stock unavailable"><span>' . __('Out of stock') . '</span></div>';
--                        }
-+                            if ($_product->isSaleable()) {
-+                                $info['button'] = '<button type="button" title="' . $block->escapeHtmlAttr(__('Add to Cart')) . '" class="action tocart"'
-+                                    . ' data-mage-init=\'{ "redirectUrl": { "event": "click", url: "' . $block->escapeUrl($block->getAddToCartUrl($_product)) . '"} }\'>'
-+                                    . '<span>' . $block->escapeHtml(__('Add to Cart')) . '</span></button>';
-+                            } else {
-+                                $info['button'] = $_product->getIsSalable() ?   '<div class="stock available"><span>' . $block->escapeHtml(__('In stock')) . '</span></div>' :
-+                                    '<div class="stock unavailable"><span>' . $block->escapeHtml(__('Out of stock')) . '</span></div>';
-+                            }
- 
--                        $info['links'] = '<div class="product links" data-role="add-to-links">'
--                                        . '<a href="#" data-post=\'' . $this->helper('Magento\Wishlist\Helper\Data')->getAddParams($_product) . '\' class="action towishlist" data-action="add-to-wishlist">'
--                                        . '<span>' . __('Add to Wish List') . '</span></a>'
--                                        . '<a href="' . $block->getAddToCompareUrl($_product) . '" class="action tocompare">'
--                                        . '<span>' . __('Add to Compare') . '</span></a></div>';
--                        $info['actions'] = '<div class="product action">' . $info['button'] . $info['links'] . '</div>';
-+                            $info['links'] = '<div class="product links" data-role="add-to-links">'
-+                                . '<a href="#" data-post=\'' . $this->helper(Magento\Wishlist\Helper\Data::class)->getAddParams($_product) . '\' class="action towishlist" data-action="add-to-wishlist">'
-+                                . '<span>' . $block->escapeHtml(__('Add to Wish List')) . '</span></a>'
-+                                . '<a href="' . $block->escapeUrl($block->getAddToCompareUrl($_product)) . '" class="action tocompare">'
-+                                . '<span>' . $block->escapeHtml(__('Add to Compare')) . '</span></a></div>';
-+                            $info['actions'] = '<div class="product action">' . $info['button'] . $info['links'] . '</div>';
- 
--                        if ($showDescription) {
--                            $info['description'] =  '<div class="product description">'
--                                                    . $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description')
--                                                    . ' <a href="' . $_product->getProductUrl() . '" class="action more">'
--                                                    . __('Learn More') . '</a></div>';
--                        } else {
--                            $info['description'] = '';
--                        }
-+                            if ($showDescription) {
-+                                $info['description'] =  '<div class="product description">'
-+                                    . $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description')
-+                                    . ' <a href="' . $block->escapeUrl($_product->getProductUrl()) . '" class="action more">'
-+                                    . $block->escapeHtml(__('Learn More')) . '</a></div>';
-+                            } else {
-+                                $info['description'] = '';
-+                            }
- 
--                        $details = $block->getInfoOrder() ?: ['name','price','review','description','actions'];
--                        foreach ($details as $detail) {
--                            /* @escapeNotVerified */ echo $info[$detail];
--                        }
--                        ?>
-+                            $details = $block->getInfoOrder() ?: ['name','price','review','description','actions'];
-+                            foreach ($details as $detail) {
-+                                /* @noEscape */ echo $info[$detail];
-+                            }
-+                            ?>
- 
-+                        </div>
-                     </div>
--                </div>
--            </li>
--        <?php endforeach; ?>
--    </ol>
--</div>
--<?= $block->getToolbarHtml() ?>
-+                </li>
-+            <?php endforeach; ?>
-+        </ol>
-+    </div>
-+    <?= $block->getToolbarHtml() ?>
- <?php endif; ?>
--<?= /* @escapeNotVerified */ $time_taken = microtime(true) - $start ?>
-+<?= $time_taken = microtime(true) - $start ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml
-index 2d89e24cc7a..316fdb06592 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml
-@@ -4,9 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block \Magento\Catalog\Block\Product\View\Additional */
- ?>
--<?php foreach ($block->getChildHtmlList() as $_html): ?>
--    <?= /* @escapeNotVerified */ $_html ?>
-+<?php foreach ($block->getChildHtmlList() as $_html) :?>
-+    <?= /* @noEscape */ $_html ?>
- <?php endforeach; ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
-index 0893cfab0bb..19241757645 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Catalog\Block\Product\View*/
- ?>
- <div class="product-addto-links" data-role="add-to-links">
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
-index adf0f44d0c8..9183e65181c 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
-@@ -4,11 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Catalog\Block\Product\View\Addto\Compare */
- ?>
- 
--<a href="#" data-post='<?= /* @escapeNotVerified */ $block->getPostDataParams() ?>'
-+<?php $viewModel = $block->getData('addToCompareViewModel'); ?>
-+<?php if ($viewModel->isAvailableForCompare($block->getProduct())) :?>
-+<a href="#" data-post='<?= /* @noEscape */ $block->getPostDataParams() ?>'
-         data-role="add-to-links"
--        class="action tocompare"><span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span></a>
-+        class="action tocompare"><span><?= $block->escapeHtml(__('Add to Compare')) ?></span></a>
-+<?php endif; ?>
-+
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
-index 9c18a18ff58..f15824595f0 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
-@@ -4,24 +4,23 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Catalog\Block\Product\View */
- ?>
- <?php $_product = $block->getProduct(); ?>
- <?php $buttonTitle = __('Add to Cart'); ?>
--<?php if ($_product->isSaleable()): ?>
-+<?php if ($_product->isSaleable()) :?>
- <div class="box-tocart">
-     <div class="fieldset">
--        <?php if ($block->shouldRenderQuantity()): ?>
-+        <?php if ($block->shouldRenderQuantity()) :?>
-         <div class="field qty">
--            <label class="label" for="qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></label>
-+            <label class="label" for="qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></label>
-             <div class="control">
-                 <input type="number"
-                        name="qty"
-                        id="qty"
--                       value="<?= /* @escapeNotVerified */ $block->getProductDefaultQty() * 1 ?>"
--                       title="<?= /* @escapeNotVerified */ __('Qty') ?>"
-+                       min="0"
-+                       value="<?= $block->getProductDefaultQty() * 1 ?>"
-+                       title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
-                        class="input-text qty"
-                        data-validate="<?= $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"
-                        />
-@@ -30,10 +29,10 @@
-         <?php endif; ?>
-         <div class="actions">
-             <button type="submit"
--                    title="<?= /* @escapeNotVerified */ $buttonTitle ?>"
-+                    title="<?= $block->escapeHtmlAttr($buttonTitle) ?>"
-                     class="action primary tocart"
--                    id="product-addtocart-button">
--                <span><?= /* @escapeNotVerified */ $buttonTitle ?></span>
-+                    id="product-addtocart-button" disabled>
-+                <span><?= $block->escapeHtml($buttonTitle) ?></span>
-             </button>
-             <?= $block->getChildHtml('', true) ?>
-         </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
-index 86f97cf6f6a..2e022a5df14 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
-@@ -4,16 +4,16 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- 
- /**
-  * Product view template
-  *
-- * @see \Magento\Catalog\Block\Product\View\Description
-+ * @var $block \Magento\Catalog\Block\Product\View\Description
-  */
- ?>
- <?php
--$_helper = $this->helper('Magento\Catalog\Helper\Output');
-+$_helper = $this->helper(Magento\Catalog\Helper\Output::class);
- $_product = $block->getProduct();
- $_call = $block->getAtCall();
- $_code = $block->getAtCode();
-@@ -32,15 +32,19 @@ if ($_attributeLabel && $_attributeLabel == 'default') {
-     $_attributeLabel = $_product->getResource()->getAttribute($_code)->getStoreLabel();
- }
- if ($_attributeType && $_attributeType == 'text') {
--    $_attributeValue = ($_helper->productAttribute($_product, $_product->$_call(), $_code)) ? $_product->getAttributeText($_code) : '';
-+    $_attributeValue = ($_helper->productAttribute($_product, $_product->$_call(), $_code))
-+        ? $_product->getAttributeText($_code)
-+        : '';
- } else {
-     $_attributeValue = $_helper->productAttribute($_product, $_product->$_call(), $_code);
- }
- ?>
- 
--<?php if ($_attributeValue): ?>
--<div class="product attribute <?= /* @escapeNotVerified */ $_className ?>">
--    <?php if ($renderLabel): ?><strong class="type"><?= /* @escapeNotVerified */ $_attributeLabel ?></strong><?php endif; ?>
--    <div class="value" <?= /* @escapeNotVerified */ $_attributeAddAttribute ?>><?= /* @escapeNotVerified */ $_attributeValue ?></div>
-+<?php if ($_attributeValue) :?>
-+<div class="product attribute <?= $block->escapeHtmlAttr($_className) ?>">
-+    <?php if ($renderLabel) :?>
-+        <strong class="type"><?= $block->escapeHtml($_attributeLabel) ?></strong>
-+    <?php endif; ?>
-+    <div class="value" <?= /* @noEscape */ $_attributeAddAttribute ?>><?= /* @noEscape */ $_attributeValue ?></div>
- </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
-index c930d2195a0..a4f0fb3efab 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- 
- /**
-  * Product additional attributes template
-@@ -13,18 +13,18 @@
-  */
- ?>
- <?php
--    $_helper = $this->helper('Magento\Catalog\Helper\Output');
-+    $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
-     $_product = $block->getProduct();
- ?>
--<?php if ($_additional = $block->getAdditionalData()): ?>
-+<?php if ($_additional = $block->getAdditionalData()) :?>
-     <div class="additional-attributes-wrapper table-wrapper">
-         <table class="data table additional-attributes" id="product-attribute-specs-table">
--            <caption class="table-caption"><?= /* @escapeNotVerified */ __('More Information') ?></caption>
-+            <caption class="table-caption"><?= $block->escapeHtml(__('More Information')) ?></caption>
-             <tbody>
--            <?php foreach ($_additional as $_data): ?>
-+            <?php foreach ($_additional as $_data) :?>
-                 <tr>
--                    <th class="col label" scope="row"><?= $block->escapeHtml(__($_data['label'])) ?></th>
--                    <td class="col data" data-th="<?= $block->escapeHtml(__($_data['label'])) ?>"><?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
-+                    <th class="col label" scope="row"><?= $block->escapeHtml($_data['label']) ?></th>
-+                    <td class="col data" data-th="<?= $block->escapeHtmlAttr($_data['label']) ?>"><?= /* @noEscape */ $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
-                 </tr>
-             <?php endforeach; ?>
-             </tbody>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/counter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/counter.phtml
-index 4414214f99a..a4aa675b2c3 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/counter.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/counter.phtml
-@@ -13,7 +13,7 @@
-     {
-         "*": {
-                 "Magento_Catalog/js/product/view/provider": {
--                    "data": <?= /* @escapeNotVerified */ $block->getCurrentProductData() ?>
-+                    "data": <?= /* @noEscape */ $block->getCurrentProductData() ?>
-             }
-         }
-     }
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/description.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/description.phtml
-index b5cdd1a2a31..c08c4d771b3 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/description.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/description.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- 
- /**
-  * Product description template
-@@ -12,4 +12,8 @@
-  * @var $block \Magento\Catalog\Block\Product\View\Description
-  */
- ?>
--<?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($block->getProduct(), $block->getProduct()->getDescription(), 'description') ?>
-+<?= /* @noEscape */ $this->helper(Magento\Catalog\Helper\Output::class)->productAttribute(
-+    $block->getProduct(),
-+    $block->getProduct()->getDescription(),
-+    'description'
-+) ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
-index b1af46b8055..f4de22f98b0 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
-@@ -4,35 +4,34 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var \Magento\Catalog\Block\Product\View\Details $block */
- ?>
--<?php if ($detailedInfoGroup = $block->getGroupChildNames('detailed_info', 'getChildHtml')):?>
-+<?php if ($detailedInfoGroup = $block->getGroupSortedChildNames('detailed_info', 'getChildHtml')) :?>
-     <div class="product info detailed">
-         <?php $layout = $block->getLayout(); ?>
-         <div class="product data items" data-mage-init='{"tabs":{"openedState":"active"}}'>
--            <?php foreach ($detailedInfoGroup as $name):?>
-+            <?php foreach ($detailedInfoGroup as $name) :?>
-                 <?php
--                    $html = $layout->renderElement($name);
--                    if (!trim($html)) {
--                        continue;
--                    }
--                    $alias = $layout->getElementAlias($name);
--                    $label = $block->getChildData($alias, 'title');
-+                $html = $layout->renderElement($name);
-+                if (!trim($html)) {
-+                    continue;
-+                }
-+                $alias = $layout->getElementAlias($name);
-+                $label = $block->getChildData($alias, 'title');
-                 ?>
-                 <div class="data item title"
--                     aria-labeledby="tab-label-<?= /* @escapeNotVerified */ $alias ?>-title"
--                     data-role="collapsible" id="tab-label-<?= /* @escapeNotVerified */ $alias ?>">
-+                     data-role="collapsible" id="tab-label-<?= $block->escapeHtmlAttr($alias) ?>">
-                     <a class="data switch"
-                        tabindex="-1"
--                       data-toggle="switch"
--                       href="#<?= /* @escapeNotVerified */ $alias ?>"
--                       id="tab-label-<?= /* @escapeNotVerified */ $alias ?>-title">
--                        <?= /* @escapeNotVerified */ $label ?>
-+                       data-toggle="trigger"
-+                       href="#<?= $block->escapeUrl($alias) ?>"
-+                       id="tab-label-<?= $block->escapeHtmlAttr($alias) ?>-title">
-+                        <?= /* @noEscape */ $label ?>
-                     </a>
-                 </div>
--                <div class="data item content" id="<?= /* @escapeNotVerified */ $alias ?>" data-role="content">
--                    <?= /* @escapeNotVerified */ $html ?>
-+                <div class="data item content"
-+                     aria-labelledby="tab-label-<?= $block->escapeHtmlAttr($alias) ?>-title" id="<?= $block->escapeHtmlAttr($alias) ?>" data-role="content">
-+                    <?= /* @noEscape */ $html ?>
-                 </div>
-             <?php endforeach;?>
-         </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
-index 9c5cce78655..8d298aec9f1 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- 
- /**
-  * Product view template
-@@ -12,28 +12,28 @@
-  * @var $block \Magento\Catalog\Block\Product\View
-  */
- ?>
--<?php $_helper = $this->helper('Magento\Catalog\Helper\Output'); ?>
-+<?php $_helper = $this->helper(Magento\Catalog\Helper\Output::class); ?>
- <?php $_product = $block->getProduct(); ?>
- 
- <div class="product-add-form">
-     <form data-product-sku="<?= $block->escapeHtml($_product->getSku()) ?>"
--          action="<?= /* @NoEscape */ $block->getSubmitUrl($_product) ?>" method="post"
--          id="product_addtocart_form"<?php if ($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
--        <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $_product->getId() ?>" />
-+          action="<?= $block->escapeUrl($block->getSubmitUrl($_product)) ?>" method="post"
-+          id="product_addtocart_form"<?php if ($_product->getOptions()) :?> enctype="multipart/form-data"<?php endif; ?>>
-+        <input type="hidden" name="product" value="<?= (int)$_product->getId() ?>" />
-         <input type="hidden" name="selected_configurable_option" value="" />
-         <input type="hidden" name="related_product" id="related-products-field" value="" />
--        <input type="hidden" name="item"  value="<?= /* @noEscape */ $block->getRequest()->getParam('id') ?>" />
-+        <input type="hidden" name="item"  value="<?= $block->escapeHtmlAttr($block->getRequest()->getParam('id')) ?>" />
-         <?= $block->getBlockHtml('formkey') ?>
-         <?= $block->getChildHtml('form_top') ?>
--        <?php if (!$block->hasOptions()):?>
-+        <?php if (!$block->hasOptions()) :?>
-             <?= $block->getChildHtml('product_info_form_content') ?>
--        <?php else:?>
--            <?php if ($_product->isSaleable() && $block->getOptionsContainer() == 'container1'):?>
-+        <?php else :?>
-+            <?php if ($_product->isSaleable() && $block->getOptionsContainer() == 'container1') :?>
-                 <?= $block->getChildChildHtml('options_container') ?>
-             <?php endif;?>
-         <?php endif; ?>
- 
--        <?php if ($_product->isSaleable() && $block->hasOptions() && $block->getOptionsContainer() == 'container2'):?>
-+        <?php if ($_product->isSaleable() && $block->hasOptions() && $block->getOptionsContainer() == 'container2') :?>
-             <?= $block->getChildChildHtml('options_container') ?>
-         <?php endif;?>
-         <?= $block->getChildHtml('form_bottom') ?>
-@@ -52,6 +52,6 @@
-             return !$(elem).find('.price-from').length;
-         });
- 
--        priceBoxes.priceBox({'priceConfig': <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>});
-+        priceBoxes.priceBox({'priceConfig': <?= /* @noEscape */ $block->getJsonConfig() ?>});
-     });
- </script>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
-index 1bfa30478df..4b33864aef4 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
-@@ -4,86 +4,48 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * Product media data template
-  *
-  * @var $block \Magento\Catalog\Block\Product\View\Gallery
-  */
- ?>
-+
-+<?php
-+$images = $block->getGalleryImages()->getItems();
-+$mainImage = current(array_filter($images, function ($img) use ($block) {
-+    return $block->isMainImage($img);
-+}));
-+
-+if (!empty($images) && empty($mainImage)) {
-+    $mainImage = $block->getGalleryImages()->getFirstItem();
-+}
-+
-+$helper = $block->getData('imageHelper');
-+$mainImageData = $mainImage ?
-+    $mainImage->getData('medium_image_url') :
-+    $helper->getDefaultPlaceholderUrl('image');
-+
-+?>
-+
- <div class="gallery-placeholder _block-content-loading" data-gallery-role="gallery-placeholder">
--    <div data-role="loader" class="loading-mask">
--        <div class="loader">
--            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>"
--                 alt="<?= /* @escapeNotVerified */ __('Loading...') ?>">
--        </div>
--    </div>
-+    <img
-+        alt="main product photo"
-+        class="gallery-placeholder__image"
-+        src="<?= /* @noEscape */ $mainImageData ?>"
-+    />
- </div>
--<!--Fix for jumping content. Loader must be the same size as gallery.-->
--<script>
--    var config = {
--            "width": <?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'width') ?>,
--            "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')
--                        ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>,
--            "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>",
--            "height": <?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'height') ?>
--        },
--        thumbBarHeight = 0,
--        loader = document.querySelectorAll('[data-gallery-role="gallery-placeholder"] [data-role="loader"]')[0];
- 
--    if (config.navtype === 'horizontal') {
--        thumbBarHeight = config.thumbheight;
--    }
--
--    loader.style.paddingBottom = ( config.height / config.width * 100) + "%";
--</script>
- <script type="text/x-magento-init">
-     {
-         "[data-gallery-role=gallery-placeholder]": {
-             "mage/gallery/gallery": {
-                 "mixins":["magnifier/magnify"],
--                "magnifierOpts": <?= /* @escapeNotVerified */ $block->getMagnifier() ?>,
--                "data": <?= /* @escapeNotVerified */ $block->getGalleryImagesJson() ?>,
--                "options": {
--                    "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/nav") ?>",
--                    "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/loop") ? 'true' : 'false' ?>,
--                    "keyboard": <?= /* @escapeNotVerified */ $block->getVar("gallery/keyboard") ? 'true' : 'false' ?>,
--                    "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/arrows") ? 'true' : 'false' ?>,
--                    "allowfullscreen": <?= /* @escapeNotVerified */ $block->getVar("gallery/allowfullscreen") ? 'true' : 'false' ?>,
--                    "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/caption") ? 'true' : 'false' ?>,
--                    "width": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'width') ?>",
--                    "thumbwidth": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_small', 'width') ?>",
--                    <?php if ($block->getImageAttribute('product_page_image_small', 'height') || $block->getImageAttribute('product_page_image_small', 'width')): ?>
--                        "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')
--                        ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>,
--                    <?php endif; ?>
--                    <?php if ($block->getImageAttribute('product_page_image_medium', 'height') || $block->getImageAttribute('product_page_image_medium', 'width')): ?>
--                        "height": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_medium', 'height')
--                        ?: $block->getImageAttribute('product_page_image_medium', 'width'); ?>,
--                    <?php endif; ?>
--                    <?php if ($block->getVar("gallery/transition/duration")): ?>
--                        "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/transition/duration") ?>,
--                    <?php endif; ?>
--                    "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/transition/effect") ?>",
--                    "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/navarrows") ? 'true' : 'false' ?>,
--                    "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>",
--                    "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navdir") ?>"
--                },
--                "fullscreen": {
--                    "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/nav") ?>",
--                    "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/loop") ? 'true' : 'false' ?>,
--                    "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navdir") ?>",
--                    "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navarrows") ? 'true' : 'false' ?>,
--                    "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navtype") ?>",
--                    "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/arrows") ? 'true' : 'false' ?>,
--                    "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/caption") ? 'true' : 'false' ?>,
--                    <?php if ($block->getVar("gallery/fullscreen/transition/duration")): ?>
--                        "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/duration") ?>,
--                    <?php endif; ?>
--                    "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/effect") ?>"
--                },
--                "breakpoints": <?= /* @escapeNotVerified */ $block->getBreakpoints() ?>
-+                "magnifierOpts": <?= /* @noEscape */ $block->getMagnifier() ?>,
-+                "data": <?= /* @noEscape */ $block->getGalleryImagesJson() ?>,
-+                "options": <?= /* @noEscape */ $block->getGalleryOptions()->getOptionsJson() ?>,
-+                "fullscreen": <?= /* @noEscape */ $block->getGalleryOptions()->getFSOptionsJson() ?>,
-+                 "breakpoints": <?= /* @noEscape */ $block->getBreakpoints() ?>
-             }
-         }
-     }
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
-index d52b594eded..f57c9b68ddb 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
-@@ -4,11 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php $_product = $block->getProduct() ?>
--<?php if ($block->canEmailToFriend()): ?>
--    <a href="<?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>"
--       class="action mailto friend"><span><?= /* @escapeNotVerified */ __('Email') ?></span></a>
-+<?php if ($block->canEmailToFriend()) :?>
-+    <a href="<?= $block->escapeUrl($this->helper(Magento\Catalog\Helper\Product::class)->getEmailToFriendUrl($_product)) ?>"
-+       class="action mailto friend"><span><?= $block->escapeHtml(__('Email')) ?></span></a>
- <?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml
-index 87655797f40..7f14b71a60c 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Directory\Block\Currency */
- ?>
--<meta property="product:price:currency" content="<?= /* @escapeNotVerified */ $block->stripTags($block->getCurrentCurrencyCode()) ?>"/>
-+<meta property="product:price:currency"
-+      content="<?= /* @noEscape */ $block->stripTags($block->getCurrentCurrencyCode()) ?>"/>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml
-index a2b91a5eeb9..eb2bde647f9 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml
-@@ -4,17 +4,18 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Catalog\Block\Product\View */
- ?>
- 
- <meta property="og:type" content="product" />
--<meta property="og:title" content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getName())) ?>" />
--<meta property="og:image" content="<?= $block->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()) ?>" />
--<meta property="og:description" content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())) ?>" />
-+<meta property="og:title"
-+      content="<?= /* @noEscape */ $block->stripTags($block->getProduct()->getName()) ?>" />
-+<meta property="og:image"
-+      content="<?= $block->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()) ?>" />
-+<meta property="og:description"
-+      content="<?= /* @noEscape */ $block->stripTags($block->getProduct()->getShortDescription()) ?>" />
- <meta property="og:url" content="<?= $block->escapeUrl($block->getProduct()->getProductUrl()) ?>" />
--<?php if ($priceAmount = $block->getProduct()->getFinalPrice()):?>
--    <meta property="product:price:amount" content="<?= /* @escapeNotVerified */ $priceAmount ?>"/>
-+<?php if ($priceAmount = $block->getProduct()->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)->getAmount()) :?>
-+    <meta property="product:price:amount" content="<?= $block->escapeHtmlAttr($priceAmount) ?>"/>
-     <?= $block->getChildHtml('meta.currency') ?>
- <?php endif;?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
-index 3ebfa768609..d9a0c845b9f 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
-@@ -4,26 +4,24 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var $block \Magento\Catalog\Block\Product\View\Options */
- ?>
- 
- <?php $_options = $block->decorateArray($block->getOptions()) ?>
- <?php $_productId = $block->getProduct()->getId() ?>
--<?php if (count($_options)):?>
-+<?php if (count($_options)) :?>
- <script type="text/x-magento-init">
-     {
-         "#product_addtocart_form": {
-             "priceOptions": {
--                "optionConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>,
-+                "optionConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
-                 "controlContainer": ".field",
-                 "priceHolderSelector": "[data-product-id='<?= $block->escapeHtml($_productId) ?>'][data-role=priceBox]"
-             }
-         }
-     }
- </script>
--    <?php foreach ($_options as $_option): ?>
-+    <?php foreach ($_options as $_option) :?>
-         <?= $block->getOptionHtml($_option) ?>
-     <?php endforeach; ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
-index 66895fa1eab..b7cd64277fe 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
-@@ -3,46 +3,43 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */ ?>
- <?php $_option = $block->getOption() ?>
--<?php $_optionId = $_option->getId() ?>
-+<?php $_optionId = $block->escapeHtmlAttr($_option->getId()) ?>
- <?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
--<div class="field date<?= /* @escapeNotVerified */ $class ?>"
-+<div class="field date<?= /* @noEscape */ $class ?>"
-     data-mage-init='{"priceOptionDate":{"fromSelector":"#product_addtocart_form"}}'>
--    <fieldset class="fieldset fieldset-product-options-inner<?= /* @escapeNotVerified */ $class ?>">
-+    <fieldset class="fieldset fieldset-product-options-inner<?= /* @noEscape */ $class ?>">
-         <legend class="legend">
-             <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
--            <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
-+            <?= /* @noEscape */ $block->getFormattedPrice() ?>
-         </legend>
-         <div class="control">
-             <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
--                || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE): ?>
-+                || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE) :?>
- 
-                 <?= $block->getDateHtml() ?>
- 
-             <?php endif; ?>
- 
-             <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
--                || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_TIME): ?>
-+                || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_TIME) :?>
-                 <?= $block->getTimeHtml() ?>
-             <?php endif; ?>
- 
--            <?php if ($_option->getIsRequire()): ?>
-+            <?php if ($_option->getIsRequire()) :?>
-                 <input type="hidden"
--                       name="validate_datetime_<?= /* @escapeNotVerified */ $_optionId ?>"
--                       class="validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>"
-+                       name="validate_datetime_<?= /* @noEscape */ $_optionId ?>"
-+                       class="validate-datetime-<?= /* @noEscape */ $_optionId ?>"
-                        value=""
--                       data-validate="{'validate-required-datetime':<?= /* @escapeNotVerified */ $_optionId ?>}"/>
--            <?php else: ?>
-+                       data-validate="{'validate-required-datetime':<?= /* @noEscape */ $_optionId ?>}"/>
-+            <?php else :?>
-                 <input type="hidden"
--                       name="validate_datetime_<?= /* @escapeNotVerified */ $_optionId ?>"
--                       class="validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>"
-+                       name="validate_datetime_<?= /* @noEscape */ $_optionId ?>"
-+                       class="validate-datetime-<?= /* @noEscape */ $_optionId ?>"
-                        value=""
--                       data-validate="{'validate-optional-datetime':<?= /* @escapeNotVerified */ $_optionId ?>}"/>
-+                       data-validate="{'validate-optional-datetime':<?= /* @noEscape */ $_optionId ?>}"/>
-             <?php endif; ?>
-             <script type="text/x-magento-init">
-             {
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml
-index 2006bf6e9f4..c25dab8b70a 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_option = $block->getOption() ?>
- <div class="field">
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
-index adb729c6d86..e83e55ad2a0 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
-@@ -3,65 +3,62 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */ ?>
- <?php $_option = $block->getOption(); ?>
- <?php $_fileInfo = $block->getFileInfo(); ?>
- <?php $_fileExists = $_fileInfo->hasData(); ?>
--<?php $_fileName = 'options_' . $_option->getId() . '_file'; ?>
-+<?php $_fileName = 'options_' . $block->escapeHtmlAttr($_option->getId()) . '_file'; ?>
- <?php $_fieldNameAction = $_fileName . '_action'; ?>
- <?php $_fieldValueAction = $_fileExists ? 'save_old' : 'save_new'; ?>
- <?php $_fileNamed = $_fileName . '_name'; ?>
- <?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
- 
--<div class="field file<?= /* @escapeNotVerified */ $class ?>">
-+<div class="field file<?= /* @noEscape */ $class ?>">
-     <label class="label" for="<?= /* @noEscape */ $_fileName ?>" id="<?= /* @noEscape */ $_fileName ?>-label">
-         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
--        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
-+        <?= /* @noEscape */ $block->getFormattedPrice() ?>
-     </label>
--    <?php if ($_fileExists): ?>
-+    <?php if ($_fileExists) :?>
-     <div class="control">
-         <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $block->escapeHtml($_fileInfo->getTitle()) ?></span>
-         <a href="javascript:void(0)" class="label" id="change-<?= /* @noEscape */ $_fileName ?>" >
--            <?= /* @escapeNotVerified */ __('Change') ?>
-+            <?= $block->escapeHtml(__('Change')) ?>
-         </a>
--        <?php if (!$_option->getIsRequire()): ?>
--            <input type="checkbox" id="delete-<?= /* @escapeNotVerified */ $_fileName ?>" />
--            <span class="label"><?= /* @escapeNotVerified */ __('Delete') ?></span>
-+        <?php if (!$_option->getIsRequire()) :?>
-+            <input type="checkbox" id="delete-<?= /* @noEscape */ $_fileName ?>" />
-+            <span class="label"><?= $block->escapeHtml(__('Delete')) ?></span>
-         <?php endif; ?>
-     </div>
-     <?php endif; ?>
--    <div class="control" id="input-box-<?= /* @escapeNotVerified */ $_fileName ?>"
-+    <div class="control" id="input-box-<?= /* @noEscape */ $_fileName ?>"
-              data-mage-init='{"priceOptionFile":{
-                 "fileName":"<?= /* @noEscape */ $_fileName ?>",
-                 "fileNamed":"<?= /* @noEscape */ $_fileNamed ?>",
--                "fieldNameAction":"<?= /* @escapeNotVerified */ $_fieldNameAction ?>",
--                "changeFileSelector":"#change-<?= /* @escapeNotVerified */ $_fileName ?>",
--                "deleteFileSelector":"#delete-<?= /* @escapeNotVerified */ $_fileName ?>"}
-+                "fieldNameAction":"<?= /* @noEscape */ $_fieldNameAction ?>",
-+                "changeFileSelector":"#change-<?= /* @noEscape */ $_fileName ?>",
-+                "deleteFileSelector":"#delete-<?= /* @noEscape */ $_fileName ?>"}
-              }'
-             <?= $_fileExists ? 'style="display:none"' : '' ?>>
-         <input type="file"
--               name="<?= /* @escapeNotVerified */ $_fileName ?>"
--               id="<?= /* @escapeNotVerified */ $_fileName ?>"
-+               name="<?= /* @noEscape */ $_fileName ?>"
-+               id="<?= /* @noEscape */ $_fileName ?>"
-                class="product-custom-option<?= $_option->getIsRequire() ? ' required' : '' ?>"
--               <?= $_fileExists ? 'disabled="disabled"' : '' ?> />
--        <input type="hidden" name="<?= /* @escapeNotVerified */ $_fieldNameAction ?>" value="<?= /* @escapeNotVerified */ $_fieldValueAction ?>" />
--        <?php if ($_option->getFileExtension()): ?>
-+            <?= $_fileExists ? 'disabled="disabled"' : '' ?> />
-+        <input type="hidden" name="<?= /* @noEscape */ $_fieldNameAction ?>" value="<?= /* @noEscape */ $_fieldValueAction ?>" />
-+        <?php if ($_option->getFileExtension()) :?>
-             <p class="note">
--                <?= /* @escapeNotVerified */ __('Compatible file extensions to upload') ?>: <strong><?= /* @escapeNotVerified */ $_option->getFileExtension() ?></strong>
-+                <?= $block->escapeHtml(__('Compatible file extensions to upload')) ?>: <strong><?= $block->escapeHtml($_option->getFileExtension()) ?></strong>
-             </p>
-         <?php endif; ?>
--        <?php if ($_option->getImageSizeX() > 0): ?>
-+        <?php if ($_option->getImageSizeX() > 0) :?>
-             <p class="note">
--                <?= /* @escapeNotVerified */ __('Maximum image width') ?>: <strong><?= /* @escapeNotVerified */ $_option->getImageSizeX() ?> <?= /* @escapeNotVerified */ __('px.') ?></strong>
-+                <?= $block->escapeHtml(__('Maximum image width')) ?>: <strong><?= (int)$_option->getImageSizeX() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
-             </p>
-         <?php endif; ?>
--        <?php if ($_option->getImageSizeY() > 0): ?>
-+        <?php if ($_option->getImageSizeY() > 0) :?>
-             <p class="note">
--                <?= /* @escapeNotVerified */ __('Maximum image height') ?>: <strong><?= /* @escapeNotVerified */ $_option->getImageSizeY() ?> <?= /* @escapeNotVerified */ __('px.') ?></strong>
-+                <?= $block->escapeHtml(__('Maximum image height')) ?>: <strong><?= (int)$_option->getImageSizeY() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
-             </p>
-         <?php endif; ?>
-     </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml
-index 980b78f917c..c4c1d24423b 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
-@@ -13,15 +10,15 @@
- $_option = $block->getOption();
- $class = ($_option->getIsRequire()) ? ' required' : '';
- ?>
--<div class="field<?= /* @escapeNotVerified */ $class ?>">
--    <label class="label" for="select_<?= /* @escapeNotVerified */ $_option->getId() ?>">
-+<div class="field<?= /* @noEscape */ $class ?>">
-+    <label class="label" for="select_<?= $block->escapeHtmlAttr($_option->getId()) ?>">
-         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
-     </label>
-     <div class="control">
-         <?= $block->getValuesHtml() ?>
--        <?php if ($_option->getIsRequire()): ?>
--            <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX): ?>
--                <span id="options-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></span>
-+        <?php if ($_option->getIsRequire()) :?>
-+            <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX) :?>
-+                <span id="options-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></span>
-             <?php endif; ?>
-         <?php endif;?>
-     </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
-index a04e366a43a..dd4c000d1f3 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Text */ ?>
- <?php
-@@ -15,14 +12,14 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
- 
- <div class="field<?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA) {
-     echo ' textarea';
--} ?><?= /* @escapeNotVerified */ $class ?>">
--    <label class="label" for="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text">
-+} ?><?= /* @noEscape */ $class ?>">
-+    <label class="label" for="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text">
-         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
--        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
-+        <?= /* @noEscape */ $block->getFormattedPrice() ?>
-     </label>
- 
-     <div class="control">
--        <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_FIELD): ?>
-+        <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_FIELD) :?>
-             <?php $_textValidate = null;
-             if ($_option->getIsRequire()) {
-                 $_textValidate['required'] = true;
-@@ -33,15 +30,15 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
-             $_textValidate['validate-no-utf8mb4-characters'] = true;
-             ?>
-             <input type="text"
--                   id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text"
-+                   id="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text"
-                    class="input-text product-custom-option"
--                   <?php if (!empty($_textValidate)) {?>
--                   data-validate="<?= $block->escapeHtml(json_encode($_textValidate)) ?>"
--                   <?php } ?>
--                   name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                   data-selector="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-+                <?php if (!empty($_textValidate)) {?>
-+                    data-validate="<?= $block->escapeHtml(json_encode($_textValidate)) ?>"
-+                <?php } ?>
-+                   name="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                   data-selector="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-                    value="<?= $block->escapeHtml($block->getDefaultValue()) ?>"/>
--        <?php elseif ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA): ?>
-+        <?php elseif ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA) :?>
-             <?php $_textAreaValidate = null;
-             if ($_option->getIsRequire()) {
-                 $_textAreaValidate['required'] = true;
-@@ -51,31 +48,31 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
-             }
-             $_textAreaValidate['validate-no-utf8mb4-characters'] = true;
-             ?>
--            <textarea id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text"
-+            <textarea id="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text"
-                       class="product-custom-option"
-                     <?php if (!empty($_textAreaValidate)) {?>
-                         data-validate="<?= $block->escapeHtml(json_encode($_textAreaValidate)) ?>"
-                     <?php } ?>
--                      name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
--                      data-selector="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-+                      name="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-+                      data-selector="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-                       rows="5"
-                       cols="25"><?= $block->escapeHtml($block->getDefaultValue()) ?></textarea>
-         <?php endif; ?>
--        <?php if ($_option->getMaxCharacters()): ?>
--            <p class="note note_<?= /* @escapeNotVerified */ $_option->getId() ?>">
--                <?= /* @escapeNotVerified */ __('Maximum %1 characters', $_option->getMaxCharacters()) ?>
-+        <?php if ($_option->getMaxCharacters()) :?>
-+            <p class="note note_<?= $block->escapeHtmlAttr($_option->getId()) ?>">
-+                <?= $block->escapeHtml(__('Maximum %1 characters', $_option->getMaxCharacters())) ?>
-                 <span class="character-counter no-display"></span>
-             </p>
-         <?php endif; ?>
-     </div>
--    <?php if ($_option->getMaxCharacters()): ?>
-+    <?php if ($_option->getMaxCharacters()) :?>
-         <script type="text/x-magento-init">
-         {
--            "[data-selector='options[<?= /* @escapeNotVerified */ $_option->getId() ?>]']": {
-+            "[data-selector='options[<?= $block->escapeJs($_option->getId()) ?>]']": {
-                 "Magento_Catalog/js/product/remaining-characters": {
--                    "maxLength":  "<?= /* @escapeNotVerified */ $_option->getMaxCharacters() ?>",
--                    "noteSelector": ".note_<?= /* @escapeNotVerified */ $_option->getId() ?>",
--                    "counterSelector": ".note_<?= /* @escapeNotVerified */ $_option->getId() ?> .character-counter"
-+                    "maxLength":  "<?= (int)$_option->getMaxCharacters() ?>",
-+                    "noteSelector": ".note_<?= $block->escapeJs($_option->getId()) ?>",
-+                    "counterSelector": ".note_<?= $block->escapeJs($_option->getId()) ?> .character-counter"
-                 }
-             }
-         }
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
-index ca6960a215a..88ee45bafe7 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
-@@ -3,14 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+/** @var $block Magento\Catalog\Block\Product\View */
- ?>
- <?php
- $required = '';
- if ($block->hasRequiredOptions()) {
--    $required = ' data-hasrequired="' . __('* Required Fields') . '"';
-+    $required = ' data-hasrequired="' . $block->escapeHtmlAttr(__('* Required Fields')) . '"';
- }
- ?>
--<div class="product-options-wrapper" id="product-options-wrapper"<?= /* @escapeNotVerified */ $required ?>>
-+<div class="product-options-wrapper" id="product-options-wrapper"<?= /* @noEscape */ $required ?>>
-     <div class="fieldset" tabindex="0">
-         <?= $block->getChildHtml('', true) ?>
-     </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml
-index e8c0b32fd76..979bab167c3 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var \Magento\Catalog\Block\Product\AbstractProduct $block */ ?>
- <?php $_product = $block->getProduct() ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml
-index 5575d00df74..52506734366 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Catalog\Block\Product\AbstractProduct */ ?>
- <?= $block->getReviewsSummaryHtml($block->getProduct(), false, true) ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml
-index 7e522b4f883..30edb2df037 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml
-@@ -3,21 +3,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Catalog\Block\Product\View\AbstractView */?>
- <?php $_product = $block->getProduct() ?>
- 
--<?php if ($block->displayProductStockStatus()): ?>
--    <?php if ($_product->isAvailable()): ?>
--        <div class="stock available" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
--            <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
-+<?php if ($block->displayProductStockStatus()) :?>
-+    <?php if ($_product->isAvailable()) :?>
-+        <div class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-+            <span><?= $block->escapeHtml(__('In stock')) ?></span>
-         </div>
--    <?php else: ?>
--        <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
--            <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
-+    <?php else :?>
-+        <div class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-+            <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
-         </div>
-     <?php endif; ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml
-index e0550cc7d44..a2187b685ca 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml
-@@ -1,18 +1,16 @@
- <?php
- /**
-- * Copyright © Magento, Inc. All rights reserved. 
-+ * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
-- //@codingStandardsIgnoreFile
- ?>
- <?php
--/**
-- * @var $block \Magento\Ui\Block\Wrapper
-- */
-+// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
-+
-+/** @var $block \Magento\Ui\Block\Wrapper */
- ?>
- 
--<?php /* @escapeNotVerified */ echo $block->renderApp(
-+<?php /* @noEscape */ echo $block->renderApp(
-     [
-         'widget_columns' => [
-             'displayMode' => 'grid'
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml
-index 3a4f81d946b..5c5f6493c31 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml
-@@ -3,16 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
-- //@codingStandardsIgnoreFile
- ?>
- <?php
--/**
-- * @var $block \Magento\Ui\Block\Wrapper
-- */
-+// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
-+
-+/** @var $block \Magento\Ui\Block\Wrapper */
- ?>
- 
--<?php /* @escapeNotVerified */ echo $block->renderApp(
-+<?php /* @noEscape */ echo $block->renderApp(
-     [
-         'widget_columns' => [
-             'displayMode' => 'list'
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
-index 2d2c91aadd4..8db3cc80368 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
-@@ -3,16 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
-- //@codingStandardsIgnoreFile
- ?>
- <?php
--/**
-- * @var $block \Magento\Ui\Block\Wrapper
-- */
-+// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
-+
-+/** @var $block \Magento\Ui\Block\Wrapper */
- ?>
- 
--<?php /* @escapeNotVerified */ echo $block->renderApp(
-+<?php /* @noEscape */ echo $block->renderApp(
-     [
-         'listing' => [
-             'displayMode' => 'grid'
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_block.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_block.phtml
-index 2ec671b8de3..69f0319134e 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_block.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_block.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <div class="widget block block-product-link">
--    <a <?= /* @escapeNotVerified */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
-+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
- </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml
-index 373eda11174..8d9f6500894 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <span class="widget block block-product-link-inline">
--    <a <?= /* @escapeNotVerified */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
-+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
- </span>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
-index a4ae3ba9079..53a0682311b 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
-@@ -4,60 +4,61 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+// phpcs:disable Magento2.Files.LineLength.MaxExceeded
- ?>
--<?php if (($_products = $block->getProductCollection()) && $_products->getSize()): ?>
-+<?php if (($_products = $block->getProductCollection()) && $_products->getSize()) :?>
-     <div class="block widget block-new-products-list">
-         <div class="block-title">
--            <strong><?= /* @escapeNotVerified */ __('New Products') ?></strong>
-+            <strong><?= $block->escapeHtml(__('New Products')) ?></strong>
-         </div>
-         <div class="block-content">
-             <?php $suffix = $block->getNameInLayout(); ?>
--            <ol class="product-items" id="widget-new-products-<?= /* @escapeNotVerified */ $suffix ?>">
--                <?php foreach ($_products->getItems() as $_product): ?>
-+            <ol class="product-items" id="widget-new-products-<?= $block->escapeHtmlAttr($suffix) ?>">
-+                <?php foreach ($_products->getItems() as $_product) :?>
-                     <li class="product-item">
-                         <div class="product-item-info">
--                            <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
--                               title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
-+                            <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
-+                               title="<?= /* @noEscape */ $block->stripTags($_product->getName(), null, true) ?>">
-                                 <?= $block->getImage($_product, 'side_column_widget_product_thumbnail')->toHtml() ?>
-                             </a>
-                             <div class="product-item-details">
-                                 <strong class="product-item-name">
--                                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
--                                       title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>)" class="product-item-link">
--                                        <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
-+                                    <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
-+                                       title="<?= /* @noEscape */ $block->stripTags($_product->getName(), null, true) ?>)"
-+                                       class="product-item-link">
-+                                        <?= /* @noEscape */ $this->helper(Magento\Catalog\Helper\Output::class)->productAttribute($_product, $_product->getName(), 'name') ?>
-                                     </a>
-                                 </strong>
--                                <?= /* @escapeNotVerified */ $block->getProductPriceHtml($_product, '-widget-new-' . $suffix) ?>
-+                                <?= $block->getProductPriceHtml($_product, '-widget-new-' . $suffix) ?>
-                                 <div class="product-item-actions">
-                                     <div class="actions-primary">
--                                        <?php if ($_product->isSaleable()): ?>
--                                            <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
--                                                <button type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>"
-+                                        <?php if ($_product->isSaleable()) :?>
-+                                            <?php if (!$_product->getTypeInstance()->isPossibleBuyFromList($_product)) :?>
-+                                                <button type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
-                                                         class="action tocart primary"
--                                                        data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'>
--                                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                        data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_product)) ?>"}}'>
-+                                                    <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                 </button>
--                                            <?php else: ?>
-+                                            <?php else :?>
-                                                 <?php
--                                                    $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
--                                                    $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()]);
--                                            ?>
--                                                <button type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>"
-+                                                $postDataHelper = $this->helper(Magento\Framework\Data\Helper\PostHelper::class);
-+                                                $postData = $postDataHelper->getPostData($block->escapeUrl($block->getAddToCartUrl($_product)), ['product' => $_product->getEntityId()]);
-+                                                ?>
-+                                                <button type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
-                                                         class="action tocart primary"
--                                                        data-post='<?= /* @escapeNotVerified */ $postData ?>'>
--                                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                        data-post='<?= /* @noEscape */ $postData ?>'>
-+                                                    <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                 </button>
-                                             <?php endif; ?>
--                                        <?php else: ?>
--                                            <?php if ($_product->getIsSalable()): ?>
--                                                <div class="stock available" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
--                                                    <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
-+                                        <?php else :?>
-+                                            <?php if ($_product->getIsSalable()) :?>
-+                                                <div class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-+                                                    <span><?= $block->escapeHtml(__('In stock')) ?></span>
-                                                 </div>
--                                            <?php else: ?>
--                                                <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
--                                                    <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
-+                                            <?php else :?>
-+                                                <div class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-+                                                    <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
-                                                 </div>
-                                             <?php endif; ?>
-                                         <?php endif; ?>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml
-index 2c40f9f7d63..8a776adc950 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml
-@@ -3,22 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if (($_products = $block->getProductCollection()) && $_products->getSize()): ?>
-+<?php if (($_products = $block->getProductCollection()) && $_products->getSize()) :?>
-     <div class="block widget block-new-products-images">
-         <div class="block-title">
--            <strong><?= /* @escapeNotVerified */ __('New Products') ?></strong>
-+            <strong><?= $block->escapeHtml(__('New Products')) ?></strong>
-         </div>
-         <div class="block-content">
-             <?php $suffix = $block->getNameInLayout(); ?>
--            <ol id="widget-new-products-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-images">
--                <?php foreach ($_products->getItems() as $_product): ?>
-+            <ol id="widget-new-products-<?= $block->escapeHtmlAttr($suffix) ?>"
-+                class="product-items product-items-images">
-+                <?php foreach ($_products->getItems() as $_product) :?>
-                     <li class="product-item">
--                        <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
--                           title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
-+                        <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
-+                           title="<?= /* @noEscape */ $block->stripTags($_product->getName(), null, true) ?>">
-                             <?php /* new_products_images_only_widget */ ?>
-                             <?= $block->getImage($_product, 'new_products_images_only_widget')->toHtml() ?>
-                         </a>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml
-index c0fb12df911..371d4df7c02 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml
-@@ -4,24 +4,26 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
--<?php if (($_products = $block->getProductCollection()) && $_products->getSize()): ?>
-+<?php if (($_products = $block->getProductCollection()) && $_products->getSize()) :?>
-     <div class="block widget block-new-products-names">
-         <div class="block-title">
--            <strong><?= /* @escapeNotVerified */ __('New Products') ?></strong>
-+            <strong><?= $block->escapeHtml(__('New Products')) ?></strong>
-         </div>
-         <div class="block-content">
-             <?php $suffix = $block->getNameInLayout(); ?>
--            <ol id="widget-new-products-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-names">
--                <?php foreach ($_products->getItems() as $_product): ?>
-+            <ol id="widget-new-products-<?= $block->escapeHtmlAttr($suffix) ?>"
-+                class="product-items product-items-names">
-+                <?php foreach ($_products->getItems() as $_product) :?>
-                     <li class="product-item">
-                         <strong class="product-item-name">
--                            <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
--                               title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>)"
-+                            <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
-+                               title="<?= /* @noEscape */ $block->stripTags($_product->getName(), null, true) ?>)"
-                                class="product-item-link">
--                                <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
-+                                <?= /* @noEscape */ $this->helper(
-+                                    Magento\Catalog\Helper\Output::class
-+                                )->productAttribute($_product, $_product->getName(), 'name') ?>
-                             </a>
-                         </strong>
-                     </li>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
-index 11bbfea1ac8..5108c488aec 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,6 +10,10 @@
-  *
-  * @var $block \Magento\Catalog\Block\Product\Widget\NewWidget
-  */
-+
-+// phpcs:disable Magento2.Files.LineLength.MaxExceeded
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+
- if ($exist = ($block->getProductCollection() && $block->getProductCollection()->getSize())) {
-     $type = 'widget-new-grid';
- 
-@@ -30,84 +31,93 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
- }
- ?>
- 
--<?php if ($exist):?>
--    <div class="block widget block-new-products <?= /* @escapeNotVerified */ $mode ?>">
-+<?php if ($exist) :?>
-+    <div class="block widget block-new-products <?= /* @noEscape */ $mode ?>">
-         <div class="block-title">
--            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
-+            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
-         </div>
-         <div class="block-content">
--            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
--            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
--                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
--                    <?php foreach ($items as $_item): ?>
-+            <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
-+            <div class="products-<?= /* @noEscape */ $mode ?> <?= /* @noEscape */ $mode ?>">
-+                <ol class="product-items <?= /* @noEscape */ $type ?>">
-+                    <?php foreach ($items as $_item) :?>
-                     <li class="product-item">
-                         <div class="product-item-info">
--                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
-+                            <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
-+                               class="product-item-photo">
-                                 <?= $block->getImage($_item, $image)->toHtml() ?>
-                             </a>
-                             <div class="product-item-details">
-                                 <strong class="product-item-name">
-                                     <a title="<?= $block->escapeHtml($_item->getName()) ?>"
--                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
-+                                       href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
-                                        class="product-item-link">
-                                         <?= $block->escapeHtml($_item->getName()) ?>
-                                     </a>
-                                 </strong>
--                                <?php
--                                echo $block->getProductPriceHtml($_item, $type);
--                                ?>
-+                                <?= $block->getProductPriceHtml($_item, $type); ?>
- 
--                                <?php if ($templateType): ?>
-+                                <?php if ($templateType) :?>
-                                     <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
-                                 <?php endif; ?>
- 
--                                <?php if ($showWishlist || $showCompare || $showCart): ?>
-+                                <?php if ($showWishlist || $showCompare || $showCart) :?>
-                                     <div class="product-item-actions">
--                                        <?php if ($showCart): ?>
-+                                        <?php if ($showCart) :?>
-                                             <div class="actions-primary">
--                                                <?php if ($_item->isSaleable()): ?>
--                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-+                                                <?php if ($_item->isSaleable()) :?>
-+                                                    <?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)) :?>
-                                                         <button class="action tocart primary"
--                                                                data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
--                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                                data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
-+                                                                type="button"
-+                                                                title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                         </button>
--                                                    <?php else: ?>
-+                                                    <?php else :?>
-                                                         <?php
--                                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
--                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-+                                                            $postDataHelper = $this->helper(Magento\Framework\Data\Helper\PostHelper::class);
-+                                                            $postData = $postDataHelper->getPostData(
-+                                                                $block->escapeUrl($block->getAddToCartUrl($_item)),
-+                                                                ['product' => (int) $_item->getEntityId()]
-+                                                            )
-                                                         ?>
-                                                         <button class="action tocart primary"
--                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
--                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                                data-post='<?= /* @noEscape */ $postData ?>'
-+                                                                type="button"
-+                                                                title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                         </button>
-                                                     <?php endif; ?>
--                                                <?php else: ?>
--                                                    <?php if ($_item->getIsSalable()): ?>
--                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
--                                                    <?php else: ?>
--                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-+                                                <?php else :?>
-+                                                    <?php if ($_item->getIsSalable()) :?>
-+                                                        <div class="stock available">
-+                                                            <span><?= $block->escapeHtml(__('In stock')) ?></span>
-+                                                        </div>
-+                                                    <?php else :?>
-+                                                        <div class="stock unavailable">
-+                                                            <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
-+                                                        </div>
-                                                     <?php endif; ?>
-                                                 <?php endif; ?>
-                                             </div>
-                                         <?php endif; ?>
--                                        <?php if ($showWishlist || $showCompare): ?>
-+                                        <?php if ($showWishlist || $showCompare) :?>
-                                             <div class="actions-secondary" data-role="add-to-links">
--                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-+                                                <?php if ($this->helper(Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) :?>
-                                                     <a href="#"
--                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
--                                                       class="action towishlist" data-action="add-to-wishlist"
--                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
--                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
-+                                                       data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
-+                                                       class="action towishlist"
-+                                                       data-action="add-to-wishlist"
-+                                                       title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-+                                                        <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
-                                                     </a>
-                                                 <?php endif; ?>
--                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
--                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-+                                                <?php if ($block->getAddToCompareUrl() && $showCompare) :?>
-+                                                    <?php $compareHelper = $this->helper(Magento\Catalog\Helper\Product\Compare::class);?>
-                                                     <a href="#" class="action tocompare"
--                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
--                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
--                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
-+                                                       data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
-+                                                       title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-+                                                        <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
-                                                     </a>
-                                                 <?php endif; ?>
-                                             </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
-index 615cd13fb6d..378cd49493a 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
-@@ -3,11 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
-+
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+// phpcs:disable Magento2.Files.LineLength.MaxExceeded
-+
- /**
-  * Template for displaying new products widget
-  *
-@@ -21,7 +22,8 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
-     $image = 'new_products_content_widget_list';
-     $title = __('New Products');
-     $items = $block->getProductCollection()->getItems();
--    $_helper = $this->helper('Magento\Catalog\Helper\Output');
-+    /** @var Magento\Catalog\Helper\Output $_helper */
-+    $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
- 
-     $showWishlist = true;
-     $showCompare = true;
-@@ -31,94 +33,102 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
- }
- ?>
- 
--<?php if ($exist):?>
--    <div class="block widget block-new-products <?= /* @escapeNotVerified */ $mode ?>">
-+<?php if ($exist) :?>
-+    <div class="block widget block-new-products <?= /* @noEscape */ $mode ?>">
-         <div class="block-title">
--            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
-+            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
-         </div>
-         <div class="block-content">
--            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
--            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
--                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
--                    <?php foreach ($items as $_item): ?>
-+            <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
-+            <div class="products-<?= /* @noEscape */ $mode ?> <?= /* @noEscape */ $mode ?>">
-+                <ol class="product-items <?= /* @noEscape */ $type ?>">
-+                    <?php foreach ($items as $_item) :?>
-                         <li class="product-item">
-                             <div class="product-item-info">
--                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
-+                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
-+                                   class="product-item-photo">
-                                     <?= $block->getImage($_item, $image)->toHtml() ?>
-                                 </a>
-                                 <div class="product-item-details">
-                                     <strong class="product-item-name">
--                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
--                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
-+                                        <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
-+                                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
-                                            class="product-item-link">
-                                             <?= $block->escapeHtml($_item->getName()) ?>
-                                         </a>
-                                     </strong>
-                                     <?= $block->getProductPriceHtml($_item, $type) ?>
- 
--                                    <?php if ($templateType): ?>
-+                                    <?php if ($templateType) :?>
-                                         <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
-                                     <?php endif; ?>
- 
--                                    <?php if ($showWishlist || $showCompare || $showCart): ?>
-+                                    <?php if ($showWishlist || $showCompare || $showCart) :?>
-                                         <div class="product-item-actions">
--                                            <?php if ($showCart): ?>
-+                                            <?php if ($showCart) :?>
-                                                 <div class="actions-primary">
--                                                    <?php if ($_item->isSaleable()): ?>
--                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-+                                                    <?php if ($_item->isSaleable()) :?>
-+                                                        <?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)
-+                                                        ) :?>
-                                                             <button class="action tocart primary"
--                                                                    data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
--                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                                    data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
-+                                                                    type="button"
-+                                                                    title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                             </button>
--                                                        <?php else: ?>
-+                                                        <?php else :?>
-                                                             <?php
--                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-+                                                                $postDataHelper = $this->helper(Magento\Framework\Data\Helper\PostHelper::class);
-                                                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                             ?>
-                                                             <button class="action tocart primary"
--                                                                    data-post='<?= /* @escapeNotVerified */ $postData ?>'
--                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                                    data-post='<?= /* @noEscape */ $postData ?>'
-+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                             </button>
-                                                         <?php endif; ?>
--                                                    <?php else: ?>
--                                                        <?php if ($_item->getIsSalable()): ?>
--                                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
--                                                        <?php else: ?>
--                                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-+                                                    <?php else :?>
-+                                                        <?php if ($_item->getIsSalable()) :?>
-+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-+                                                        <?php else :?>
-+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-                                                         <?php endif; ?>
-                                                     <?php endif; ?>
-                                                 </div>
-                                             <?php endif; ?>
--                                            <?php if ($showWishlist || $showCompare): ?>
-+                                            <?php if ($showWishlist || $showCompare) :?>
-                                                 <div class="actions-secondary" data-role="add-to-links">
--                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-+                                                    <?php if ($this->helper(Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) :?>
-                                                         <a href="#"
--                                                           data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
-+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
-                                                            class="action towishlist" data-action="add-to-wishlist"
--                                                           title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
--                                                            <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
-+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
-                                                         </a>
-                                                     <?php endif; ?>
--                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
--                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
-+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare) :?>
-+                                                        <?php $compareHelper = $this->helper(Magento\Catalog\Helper\Product\Compare::class); ?>
-                                                         <a href="#" class="action tocompare"
--                                                           title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>"
--                                                           data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'>
--                                                            <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
-+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>"
-+                                                           data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
-+                                                        >
-+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
-                                                         </a>
-                                                     <?php endif; ?>
-                                                 </div>
-                                             <?php endif; ?>
-                                         </div>
-                                     <?php endif; ?>
--                                    <?php if ($description):?>
-+                                    <?php if ($description) :?>
-                                         <div class="product-item-description">
--                                            <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
--                                            <a title="<?= $block->escapeHtml($_item->getName()) ?>"
--                                               href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
--                                               class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
-+                                            <?= /* @noEscape */ $_helper->productAttribute(
-+                                                $_item,
-+                                                $_item->getShortDescription(),
-+                                                'short_description'
-+                                            ) ?>
-+                                            <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
-+                                               href="<?= $block->escapeUrl($block->getProductUrl($_item))?>"
-+                                               class="action more"><?= $block->escapeHtml(__('Learn More')) ?></a>
-                                         </div>
-                                     <?php endif; ?>
-                                 </div>
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
-index 578630a11e9..d4db174dbe5 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
-@@ -5,12 +5,13 @@
-  */
- ?>
- <?php
--/**
-- * @var $block \Magento\Ui\Block\Wrapper
-- */
-+// phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
-+// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
-+
-+/** @var $block \Magento\Ui\Block\Wrapper */
- ?>
- 
--<?= /* @escapeNotVerified */ $block->renderApp([
-+<?php /* @noEscape */ echo $block->renderApp([
-     'widget_columns' => [
-         'displayMode' => 'grid'
-     ],
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
-index 3770c330ad7..e03ac9ca692 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
-@@ -5,12 +5,13 @@
-  */
- ?>
- <?php
--/**
-- * @var $block \Magento\Ui\Block\Wrapper
-- */
-+// phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
-+// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
-+
-+/** @var $block \Magento\Ui\Block\Wrapper */
- ?>
- 
--<?= /* @escapeNotVerified */ $block->renderApp([
-+<?php /* @noEscape */ echo $block->renderApp([
-     'widget_columns' => [
-         'displayMode' => 'list'
-     ],
-diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml
-index 1c4ad3105a2..a42b46a5238 100644
---- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml
-+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml
-@@ -3,16 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
-- //@codingStandardsIgnoreFile
- ?>
- <?php
--/**
-- * @var $block \Magento\Ui\Block\Wrapper
-- */
-+// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
-+
-+/** @var $block \Magento\Ui\Block\Wrapper */
- ?>
- 
--<?php /* @escapeNotVerified */ echo $block->renderApp(
-+<?php /* @noEscape */ echo $block->renderApp(
-     [
-         'listing' => [
-             'displayMode' => 'grid'
-diff --git a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
-index 83e91d3c3d4..bcb7c668657 100644
---- a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
-+++ b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
-@@ -6,8 +6,10 @@
- define([
-     'jquery',
-     'mage/translate',
-+    'underscore',
-+    'Magento_Catalog/js/product/view/product-ids-resolver',
-     'jquery/ui'
--], function ($, $t) {
-+], function ($, $t, _, idsResolver) {
-     'use strict';
- 
-     $.widget('mage.catalogAddToCart', {
-@@ -76,17 +78,18 @@ define([
-         /**
-          * Handler for the form 'submit' event
-          *
--         * @param {Object} form
-+         * @param {jQuery} form
-          */
-         submitForm: function (form) {
-             this.ajaxSubmit(form);
-         },
- 
-         /**
--         * @param {String} form
-+         * @param {jQuery} form
-          */
-         ajaxSubmit: function (form) {
-             var self = this,
-+                productIds = idsResolver(form),
-                 formData;
- 
-             $(self.options.minicartSelector).trigger('contentLoading');
-@@ -115,6 +118,7 @@ define([
- 
-                     $(document).trigger('ajax:addToCart', {
-                         'sku': form.data().productSku,
-+                        'productIds': productIds,
-                         'form': form,
-                         'response': res
-                     });
-@@ -159,6 +163,23 @@ define([
-                             .html(res.product.statusText);
-                     }
-                     self.enableAddToCartButton(form);
-+                },
-+
-+                /** @inheritdoc */
-+                error: function (res) {
-+                    $(document).trigger('ajax:addToCart:error', {
-+                        'sku': form.data().productSku,
-+                        'productIds': productIds,
-+                        'form': form,
-+                        'response': res
-+                    });
-+                },
-+
-+                /** @inheritdoc */
-+                complete: function (res) {
-+                    if (res.state() === 'rejected') {
-+                        location.reload();
-+                    }
-                 }
-             });
-         },
-diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
-index 88be03a04e7..b8b6ff65be2 100644
---- a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
-+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
-@@ -27,7 +27,9 @@ define([
-             directionDefault: 'asc',
-             orderDefault: 'position',
-             limitDefault: '9',
--            url: ''
-+            url: '',
-+            formKey: '',
-+            post: false
-         },
- 
-         /** @inheritdoc */
-@@ -89,7 +91,7 @@ define([
-                 baseUrl = urlPaths[0],
-                 urlParams = urlPaths[1] ? urlPaths[1].split('&') : [],
-                 paramData = {},
--                parameters, i;
-+                parameters, i, form, params, key, input, formKey;
- 
-             for (i = 0; i < urlParams.length; i++) {
-                 parameters = urlParams[i].split('=');
-@@ -99,12 +101,38 @@ define([
-             }
-             paramData[paramName] = paramValue;
- 
--            if (paramValue == defaultValue) { //eslint-disable-line eqeqeq
--                delete paramData[paramName];
--            }
--            paramData = $.param(paramData);
-+            if (this.options.post) {
-+                form = document.createElement('form');
-+                params = [this.options.mode, this.options.direction, this.options.order, this.options.limit];
-+
-+                for (key in paramData) {
-+                    if (params.indexOf(key) !== -1) { //eslint-disable-line max-depth
-+                        input = document.createElement('input');
-+                        input.name = key;
-+                        input.value = paramData[key];
-+                        form.appendChild(input);
-+                        delete paramData[key];
-+                    }
-+                }
-+                formKey = document.createElement('input');
-+                formKey.name = 'form_key';
-+                formKey.value = this.options.formKey;
-+                form.appendChild(formKey);
-+
-+                paramData = $.param(paramData);
-+                baseUrl += paramData.length ? '?' + paramData : '';
- 
--            location.href = baseUrl + (paramData.length ? '?' + paramData : '');
-+                form.action = baseUrl;
-+                form.method = 'POST';
-+                document.body.appendChild(form);
-+                form.submit();
-+            } else {
-+                if (paramValue == defaultValue) { //eslint-disable-line eqeqeq
-+                    delete paramData[paramName];
-+                }
-+                paramData = $.param(paramData);
-+                location.href = baseUrl + (paramData.length ? '?' + paramData : '');
-+            }
-         }
-     });
- 
-diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/provider.js b/app/code/Magento/Catalog/view/frontend/web/js/product/provider.js
-index c53b2fa6e2a..b29ebe7d57d 100644
---- a/app/code/Magento/Catalog/view/frontend/web/js/product/provider.js
-+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/provider.js
-@@ -5,11 +5,13 @@
- 
- define([
-     'underscore',
-+    'jquery',
-     'mageUtils',
-     'uiElement',
-     'Magento_Catalog/js/product/storage/storage-service',
--    'Magento_Customer/js/customer-data'
--], function (_, utils, Element, storage, customerData) {
-+    'Magento_Customer/js/customer-data',
-+    'Magento_Catalog/js/product/view/product-ids-resolver'
-+], function (_, $, utils, Element, storage, customerData, productResolver) {
-     'use strict';
- 
-     return Element.extend({
-@@ -135,11 +137,16 @@ define([
-          */
-         filterIds: function (ids) {
-             var _ids = {},
--                currentTime = new Date().getTime() / 1000;
-+                currentTime = new Date().getTime() / 1000,
-+                currentProductIds = productResolver($('#product_addtocart_form'));
- 
-             _.each(ids, function (id) {
--                if (currentTime - id['added_at'] < ~~this.idsStorage.lifetime) {
-+                if (
-+                    currentTime - id['added_at'] < ~~this.idsStorage.lifetime &&
-+                    !_.contains(currentProductIds, id['product_id'])
-+                ) {
-                     _ids[id['product_id']] = id;
-+
-                 }
-             }, this);
- 
-diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/data-storage.js b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/data-storage.js
-index ab566a70a75..3dc9f3e8445 100644
---- a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/data-storage.js
-+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/data-storage.js
-@@ -34,6 +34,21 @@ define([
-         };
-     }
- 
-+    /**
-+     * Set data to localStorage with support check.
-+     *
-+     * @param {String} namespace
-+     * @param {Object} data
-+     */
-+    function setLocalStorageItem(namespace, data) {
-+        try {
-+            window.localStorage.setItem(namespace, JSON.stringify(data));
-+        } catch (e) {
-+            console.warn('localStorage is unavailable - skipping local caching of product data');
-+            console.error(e);
-+        }
-+    }
-+
-     return {
- 
-         /**
-@@ -118,7 +133,7 @@ define([
-             if (_.isEmpty(data)) {
-                 this.localStorage.removeAll();
-             } else {
--                this.localStorage.set(data);
-+                setLocalStorageItem(this.namespace, data);
-             }
-         },
- 
-diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/ids-storage.js b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/ids-storage.js
-index 7eafbad8299..ec07c19a2c1 100644
---- a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/ids-storage.js
-+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/ids-storage.js
-@@ -11,6 +11,21 @@ define([
- ], function ($, _, ko, utils) {
-     'use strict';
- 
-+    /**
-+     * Set data to localStorage with support check.
-+     *
-+     * @param {String} namespace
-+     * @param {Object} data
-+     */
-+    function setLocalStorageItem(namespace, data) {
-+        try {
-+            window.localStorage.setItem(namespace, JSON.stringify(data));
-+        } catch (e) {
-+            console.warn('localStorage is unavailable - skipping local caching of product data');
-+            console.error(e);
-+        }
-+    }
-+
-     return {
- 
-         /**
-@@ -94,11 +109,7 @@ define([
-          * Initializes handler to "data" property update
-          */
-         internalDataHandler: function (data) {
--            var localStorage = this.localStorage.get();
--
--            if (!utils.compare(data, localStorage).equal) {
--                this.localStorage.set(data);
--            }
-+            setLocalStorageItem(this.namespace, data);
-         },
- 
-         /**
-diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/storage-service.js b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/storage-service.js
-index e571baa23e4..b35ab867bb0 100644
---- a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/storage-service.js
-+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/storage-service.js
-@@ -47,7 +47,7 @@ define([
-                  * @param {*} data
-                  */
-                 add: function (data) {
--                    if (!_.isEmpty(data) && !utils.compare(data, this.data()).equal) {
-+                    if (!_.isEmpty(data)) {
-                         this.data(_.extend(utils.copy(this.data()), data));
-                     }
-                 },
-diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids-resolver.js b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids-resolver.js
-new file mode 100644
-index 00000000000..f13e8f84a1b
---- /dev/null
-+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids-resolver.js
-@@ -0,0 +1,29 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+define([
-+    'underscore',
-+    'Magento_Catalog/js/product/view/product-ids'
-+], function (_, productIds) {
-+    'use strict';
-+
-+    /**
-+     * Returns id's of products in form.
-+     *
-+     * @param {jQuery} $form
-+     * @return {Array}
-+     */
-+    return function ($form) {
-+        var idSet = productIds(),
-+            product = _.findWhere($form.serializeArray(), {
-+            name: 'product'
-+        });
-+
-+        if (!_.isUndefined(product)) {
-+            idSet.push(product.value);
-+        }
-+
-+        return _.uniq(idSet);
-+    };
-+});
-diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids.js b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids.js
-new file mode 100644
-index 00000000000..2198b7b8e48
---- /dev/null
-+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids.js
-@@ -0,0 +1,12 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'ko'
-+], function (ko) {
-+    'use strict';
-+
-+    return ko.observableArray([]);
-+});
-diff --git a/app/code/Magento/Catalog/view/frontend/web/js/related-products.js b/app/code/Magento/Catalog/view/frontend/web/js/related-products.js
-index 0c37f9ff4f0..66df48c28bf 100644
---- a/app/code/Magento/Catalog/view/frontend/web/js/related-products.js
-+++ b/app/code/Magento/Catalog/view/frontend/web/js/related-products.js
-@@ -17,7 +17,7 @@ define([
-             relatedProductsField: '#related-products-field', // Hidden input field that stores related products.
-             selectAllMessage: $.mage.__('select all'),
-             unselectAllMessage: $.mage.__('unselect all'),
--            selectAllLink: '[role="select-all"]',
-+            selectAllLink: '[role="button"]',
-             elementsSelector: '.item.product'
-         },
- 
-diff --git a/app/code/Magento/Catalog/view/frontend/web/js/validate-product.js b/app/code/Magento/Catalog/view/frontend/web/js/validate-product.js
-index c0637cb672d..755e777a01f 100644
---- a/app/code/Magento/Catalog/view/frontend/web/js/validate-product.js
-+++ b/app/code/Magento/Catalog/view/frontend/web/js/validate-product.js
-@@ -13,7 +13,8 @@ define([
-     $.widget('mage.productValidate', {
-         options: {
-             bindSubmit: false,
--            radioCheckboxClosest: '.nested'
-+            radioCheckboxClosest: '.nested',
-+            addToCartButtonSelector: '.action.tocart'
-         },
- 
-         /**
-@@ -41,6 +42,7 @@ define([
-                     return false;
-                 }
-             });
-+            $(this.options.addToCartButtonSelector).attr('disabled', false);
-         }
-     });
- 
-diff --git a/app/code/Magento/CatalogAnalytics/README.md b/app/code/Magento/CatalogAnalytics/README.md
-index df125446117..f93b223c342 100644
---- a/app/code/Magento/CatalogAnalytics/README.md
-+++ b/app/code/Magento/CatalogAnalytics/README.md
-@@ -1,3 +1,3 @@
- # Magento_CatalogAnalytics module
- 
--The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
-+The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
-diff --git a/app/code/Magento/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json
-index 5c97261d483..805be8a1776 100644
---- a/app/code/Magento/CatalogAnalytics/composer.json
-+++ b/app/code/Magento/CatalogAnalytics/composer.json
-@@ -4,7 +4,8 @@
-     "require": {
-         "php": "~7.1.3||~7.2.0",
-         "magento/framework": "*",
--        "magento/module-catalog": "*"
-+        "magento/module-catalog": "*",
-+        "magento/module-analytics": "*"
-     },
-     "type": "magento2-module",
-     "license": [
-diff --git a/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
-index ebd8671de02..d57154c4299 100644
---- a/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
-@@ -15,6 +15,11 @@ use Magento\Eav\Model\Entity\Collection\AbstractCollection;
-  */
- class AttributesJoiner
- {
-+    /**
-+     * @var array
-+     */
-+    private $queryFields = [];
-+
-     /**
-      * Join fields attached to field node to collection's select.
-      *
-@@ -24,17 +29,33 @@ class AttributesJoiner
-      */
-     public function join(FieldNode $fieldNode, AbstractCollection $collection) : void
-     {
--        $query = $fieldNode->selectionSet->selections;
--
--        /** @var FieldNode $field */
--        foreach ($query as $field) {
--            if ($field->kind === 'InlineFragment') {
--                continue;
-+        foreach ($this->getQueryFields($fieldNode) as $field) {
-+            if (!$collection->isAttributeAdded($field)) {
-+                $collection->addAttributeToSelect($field);
-             }
-+        }
-+    }
- 
--            if (!$collection->isAttributeAdded($field->name->value)) {
--                $collection->addAttributeToSelect($field->name->value);
-+    /**
-+     * Get an array of queried fields.
-+     *
-+     * @param FieldNode $fieldNode
-+     * @return string[]
-+     */
-+    public function getQueryFields(FieldNode $fieldNode)
-+    {
-+        if (!isset($this->queryFields[$fieldNode->name->value])) {
-+            $this->queryFields[$fieldNode->name->value] = [];
-+            $query = $fieldNode->selectionSet->selections;
-+            /** @var FieldNode $field */
-+            foreach ($query as $field) {
-+                if ($field->kind === 'InlineFragment') {
-+                    continue;
-+                }
-+                $this->queryFields[$fieldNode->name->value][] = $field->name->value;
-             }
-         }
-+
-+        return $this->queryFields[$fieldNode->name->value];
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
-index dbe58a9c77c..b5d02511da4 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
-@@ -26,7 +26,7 @@ class DepthCalculator
-         $depth = count($selections) ? 1 : 0;
-         $childrenDepth = [0];
-         foreach ($selections as $node) {
--            if ($node->kind === 'InlineFragment') {
-+            if ($node->kind === 'InlineFragment' || null !== $node->alias) {
-                 continue;
-             }
- 
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php b/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php
-index da4ec37c51d..d2c1fc8f7be 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php
-@@ -8,6 +8,7 @@ declare(strict_types=1);
- namespace Magento\CatalogGraphQl\Model\Category;
- 
- use Magento\Catalog\Api\Data\CategoryInterface;
-+use Magento\Catalog\Model\Category;
- use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CustomAttributesFlattener;
- use Magento\Framework\Reflection\DataObjectProcessor;
- 
-@@ -41,16 +42,21 @@ class Hydrator
-     /**
-      * Hydrate and flatten category object to flat array
-      *
--     * @param CategoryInterface $category
-+     * @param Category $category
-+     * @param bool $basicFieldsOnly Set to false to avoid expensive hydration, used for performance optimization
-      * @return array
-      */
--    public function hydrateCategory(CategoryInterface $category) : array
-+    public function hydrateCategory(Category $category, $basicFieldsOnly = false) : array
-     {
--        $categoryData = $this->dataObjectProcessor->buildOutputDataArray($category, CategoryInterface::class);
-+        if ($basicFieldsOnly) {
-+            $categoryData = $category->getData();
-+        } else {
-+            $categoryData = $this->dataObjectProcessor->buildOutputDataArray($category, CategoryInterface::class);
-+        }
-         $categoryData['id'] = $category->getId();
--        $categoryData['product_count'] = $category->getProductCount();
-         $categoryData['children'] = [];
-         $categoryData['available_sort_by'] = $category->getAvailableSortBy();
-+        $categoryData['model'] = $category;
-         return $this->flattener->flatten($categoryData);
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php
-index 0401e1c4233..f587be245c9 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php
-@@ -15,6 +15,16 @@ use Magento\Catalog\Model\ResourceModel\Category;
-  */
- class LevelCalculator
- {
-+    /**
-+     * @var ResourceConnection
-+     */
-+    private $resourceConnection;
-+
-+    /**
-+     * @var Category
-+     */
-+    private $resourceCategory;
-+
-     /**
-      * @param ResourceConnection $resourceConnection
-      * @param Category $resourceCategory
-@@ -39,6 +49,7 @@ class LevelCalculator
-         $select = $connection->select()
-             ->from($this->resourceConnection->getTableName('catalog_category_entity'), 'level')
-             ->where($this->resourceCategory->getLinkField() . " = ?", $rootCategoryId);
-+
-         return (int) $connection->fetchOne($select);
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/LayerFilterItemTypeResolverComposite.php b/app/code/Magento/CatalogGraphQl/Model/LayerFilterItemTypeResolverComposite.php
-index 20e55901175..02594ecfaf8 100644
---- a/app/code/Magento/CatalogGraphQl/Model/LayerFilterItemTypeResolverComposite.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/LayerFilterItemTypeResolverComposite.php
-@@ -31,7 +31,7 @@ class LayerFilterItemTypeResolverComposite implements TypeResolverInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolveType(array $data) : string
-     {
-@@ -42,10 +42,6 @@ class LayerFilterItemTypeResolverComposite implements TypeResolverInterface
-                 return $resolvedType;
-             }
-         }
--        if (empty($resolvedType)) {
--            throw new GraphQlInputException(
--                __('Concrete type for %1 not implemented', ['ProductLinksInterface'])
--            );
--        }
-+        throw new GraphQlInputException(__('Cannot resolve layered filter type'));
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Product/Option/DateType.php b/app/code/Magento/CatalogGraphQl/Model/Product/Option/DateType.php
-new file mode 100644
-index 00000000000..e1106a3f696
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Product/Option/DateType.php
-@@ -0,0 +1,67 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Product\Option;
-+
-+use Magento\Catalog\Model\Product\Option\Type\Date as ProductDateOptionType;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Stdlib\DateTime;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class DateType extends ProductDateOptionType
-+{
-+    /**
-+     * Make valid string as a value of date option type for GraphQl queries
-+     *
-+     * @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
-+     * @return ProductDateOptionType
-+     */
-+    public function validateUserValue($values)
-+    {
-+        if ($this->_dateExists() || $this->_timeExists()) {
-+            return parent::validateUserValue($this->formatValues($values));
-+        }
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * Format date value from string to date array
-+     *
-+     * @param [] $values
-+     * @return []
-+     * @throws LocalizedException
-+     */
-+    private function formatValues($values)
-+    {
-+        if (isset($values[$this->getOption()->getId()])) {
-+            $value = $values[$this->getOption()->getId()];
-+            $dateTime = \DateTime::createFromFormat(DateTime::DATETIME_PHP_FORMAT, $value);
-+            $values[$this->getOption()->getId()] = [
-+                'date' => $value,
-+                'year' => $dateTime->format('Y'),
-+                'month' => $dateTime->format('m'),
-+                'day' => $dateTime->format('d'),
-+                'hour' => $dateTime->format('H'),
-+                'minute' => $dateTime->format('i'),
-+                'day_part' => $dateTime->format('a'),
-+            ];
-+        }
-+
-+        return $values;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function useCalendar()
-+    {
-+        return false;
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/ProductDataProvider.php b/app/code/Magento/CatalogGraphQl/Model/ProductDataProvider.php
-new file mode 100644
-index 00000000000..0d38490407e
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/ProductDataProvider.php
-@@ -0,0 +1,45 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+
-+/**
-+ * Product data provider
-+ *
-+ * TODO: will be replaces on deferred mechanism
-+ */
-+class ProductDataProvider
-+{
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @param ProductRepositoryInterface $productRepository
-+     */
-+    public function __construct(ProductRepositoryInterface $productRepository)
-+    {
-+        $this->productRepository = $productRepository;
-+    }
-+
-+    /**
-+     * Get product data by id
-+     *
-+     * @param int $productId
-+     * @return array
-+     */
-+    public function getProductDataById(int $productId): array
-+    {
-+        $product = $this->productRepository->getById($productId);
-+        $productData = $product->toArray();
-+        $productData['model'] = $product;
-+        return $productData;
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/ProductLinkTypeResolverComposite.php b/app/code/Magento/CatalogGraphQl/Model/ProductLinkTypeResolverComposite.php
-index 937e3921758..c1bf5c0b7bb 100644
---- a/app/code/Magento/CatalogGraphQl/Model/ProductLinkTypeResolverComposite.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/ProductLinkTypeResolverComposite.php
-@@ -11,7 +11,7 @@ use Magento\Framework\GraphQl\Exception\GraphQlInputException;
- use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class ProductLinkTypeResolverComposite implements TypeResolverInterface
- {
-@@ -29,8 +29,7 @@ class ProductLinkTypeResolverComposite implements TypeResolverInterface
-     }
- 
-     /**
--     * {@inheritdoc}
--     * @throws GraphQlInputException
-+     * @inheritdoc
-      */
-     public function resolveType(array $data) : string
-     {
-@@ -48,11 +47,6 @@ class ProductLinkTypeResolverComposite implements TypeResolverInterface
-                 return $resolvedType;
-             }
-         }
--
--        if (!$resolvedType) {
--            throw new GraphQlInputException(
--                __('Concrete type for %1 not implemented', ['ProductLinksInterface'])
--            );
--        }
-+        throw new GraphQlInputException(__('Cannot resolve type'));
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php
-index 378e7cb4c36..cb392a7b229 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php
-@@ -7,6 +7,7 @@ declare(strict_types=1);
- 
- namespace Magento\CatalogGraphQl\Model\Resolver;
- 
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Catalog\Api\Data\CategoryInterface;
- use Magento\Catalog\Model\ResourceModel\Category\Collection;
-@@ -15,9 +16,8 @@ use Magento\CatalogGraphQl\Model\AttributesJoiner;
- use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CustomAttributesFlattener;
- use Magento\Framework\GraphQl\Config\Element\Field;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
- use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
--use Magento\Framework\Reflection\DataObjectProcessor;
-+use Magento\CatalogGraphQl\Model\Category\Hydrator as CategoryHydrator;
- 
- /**
-  * Resolver for category objects the product is assigned to.
-@@ -36,11 +36,6 @@ class Categories implements ResolverInterface
-      */
-     private $categoryIds = [];
- 
--    /**
--     * @var DataObjectProcessor
--     */
--    private $dataObjectProcessor;
--
-     /**
-      * @var AttributesJoiner
-      */
-@@ -57,33 +52,42 @@ class Categories implements ResolverInterface
-     private $valueFactory;
- 
-     /**
--     * Category constructor.
-+     * @var CategoryHydrator
-+     */
-+    private $categoryHydrator;
-+
-+    /**
-      * @param CollectionFactory $collectionFactory
--     * @param DataObjectProcessor $dataObjectProcessor
-      * @param AttributesJoiner $attributesJoiner
-      * @param CustomAttributesFlattener $customAttributesFlattener
-      * @param ValueFactory $valueFactory
-+     * @param CategoryHydrator $categoryHydrator
-      */
-     public function __construct(
-         CollectionFactory $collectionFactory,
--        DataObjectProcessor $dataObjectProcessor,
-         AttributesJoiner $attributesJoiner,
-         CustomAttributesFlattener $customAttributesFlattener,
--        ValueFactory $valueFactory
-+        ValueFactory $valueFactory,
-+        CategoryHydrator $categoryHydrator
-     ) {
-         $this->collection = $collectionFactory->create();
--        $this->dataObjectProcessor = $dataObjectProcessor;
-         $this->attributesJoiner = $attributesJoiner;
-         $this->customAttributesFlattener = $customAttributesFlattener;
-         $this->valueFactory = $valueFactory;
-+        $this->categoryHydrator = $categoryHydrator;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-     {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+
-         /** @var \Magento\Catalog\Model\Product $product */
-         $product = $value['model'];
-         $categoryIds = $product->getCategoryIds();
-@@ -97,19 +101,24 @@ class Categories implements ResolverInterface
-             }
- 
-             if (!$this->collection->isLoaded()) {
--                $that->attributesJoiner->join($info->fieldASTs[0], $this->collection);
-+                $that->attributesJoiner->join($info->fieldNodes[0], $this->collection);
-                 $this->collection->addIdFilter($this->categoryIds);
-             }
-             /** @var CategoryInterface | \Magento\Catalog\Model\Category $item */
-             foreach ($this->collection as $item) {
-                 if (in_array($item->getId(), $categoryIds)) {
--                    $categories[$item->getId()] = $this->dataObjectProcessor->buildOutputDataArray(
--                        $item,
--                        CategoryInterface::class
--                    );
--                    $categories[$item->getId()] = $this->customAttributesFlattener
--                        ->flatten($categories[$item->getId()]);
--                    $categories[$item->getId()]['product_count'] = $item->getProductCount();
-+                    // Try to extract all requested fields from the loaded collection data
-+                    $categories[$item->getId()] = $this->categoryHydrator->hydrateCategory($item, true);
-+                    $categories[$item->getId()]['model'] = $item;
-+                    $requestedFields = $that->attributesJoiner->getQueryFields($info->fieldNodes[0]);
-+                    $extractedFields = array_keys($categories[$item->getId()]);
-+                    $foundFields = array_intersect($requestedFields, $extractedFields);
-+                    if (count($requestedFields) === count($foundFields)) {
-+                        continue;
-+                    }
-+
-+                    // If not all requested fields were extracted from the collection, start more complex extraction
-+                    $categories[$item->getId()] = $this->categoryHydrator->hydrateCategory($item);
-                 }
-             }
- 
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Breadcrumbs.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Breadcrumbs.php
-index d49c7f5e567..b93c7e27915 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Breadcrumbs.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Breadcrumbs.php
-@@ -7,12 +7,11 @@ declare(strict_types=1);
- 
- namespace Magento\CatalogGraphQl\Model\Resolver\Category;
- 
--use \Magento\CatalogGraphQl\Model\Resolver\Category\DataProvider\Breadcrumbs as BreadcrumbsDataProvider;
-+use Magento\CatalogGraphQl\Model\Resolver\Category\DataProvider\Breadcrumbs as BreadcrumbsDataProvider;
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Framework\GraphQl\Config\Element\Field;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- 
- /**
-  * Retrieves breadcrumbs
-@@ -24,39 +23,25 @@ class Breadcrumbs implements ResolverInterface
-      */
-     private $breadcrumbsDataProvider;
- 
--    /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
-     /**
-      * @param BreadcrumbsDataProvider $breadcrumbsDataProvider
--     * @param ValueFactory $valueFactory
-      */
-     public function __construct(
--        BreadcrumbsDataProvider $breadcrumbsDataProvider,
--        ValueFactory $valueFactory
-+        BreadcrumbsDataProvider $breadcrumbsDataProvider
-     ) {
-         $this->breadcrumbsDataProvider = $breadcrumbsDataProvider;
--        $this->valueFactory = $valueFactory;
-     }
- 
-     /**
-      * @inheritdoc
-      */
--    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null): Value
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-     {
-         if (!isset($value['path'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"path" value should be specified'));
-         }
- 
--        $result = function () use ($value) {
--            $breadcrumbsData = $this->breadcrumbsDataProvider->getData($value['path']);
--            return count($breadcrumbsData) ? $breadcrumbsData : null;
--        };
--        return $this->valueFactory->create($result);
-+        $breadcrumbsData = $this->breadcrumbsDataProvider->getData($value['path']);
-+        return count($breadcrumbsData) ? $breadcrumbsData : null;
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoriesIdentity.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoriesIdentity.php
-new file mode 100644
-index 00000000000..aba2d7b198d
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoriesIdentity.php
-@@ -0,0 +1,33 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
-+
-+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
-+
-+/**
-+ * Identity for multiple resolved categories
-+ */
-+class CategoriesIdentity implements IdentityInterface
-+{
-+    /**
-+     * Get category IDs from resolved data
-+     *
-+     * @param array $resolvedData
-+     * @return string[]
-+     */
-+    public function getIdentities(array $resolvedData): array
-+    {
-+        $ids = [];
-+        if (!empty($resolvedData)) {
-+            foreach ($resolvedData as $category) {
-+                $ids[] = $category['id'];
-+            }
-+        }
-+        return $ids;
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryHtmlAttribute.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryHtmlAttribute.php
-new file mode 100644
-index 00000000000..7ccb46c3a29
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryHtmlAttribute.php
-@@ -0,0 +1,57 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
-+
-+use Magento\Catalog\Model\Category;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Catalog\Helper\Output as OutputHelper;
-+
-+/**
-+ * Resolve rendered content for category attributes where HTML content is allowed
-+ */
-+class CategoryHtmlAttribute implements ResolverInterface
-+{
-+    /**
-+     * @var OutputHelper
-+     */
-+    private $outputHelper;
-+
-+    /**
-+     * @param OutputHelper $outputHelper
-+     */
-+    public function __construct(
-+        OutputHelper $outputHelper
-+    ) {
-+        $this->outputHelper = $outputHelper;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+
-+        /* @var $category Category */
-+        $category = $value['model'];
-+        $fieldName = $field->getName();
-+        $renderedValue = $this->outputHelper->categoryAttribute($category, $category->getData($fieldName), $fieldName);
-+
-+        return $renderedValue;
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryTreeIdentity.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryTreeIdentity.php
-new file mode 100644
-index 00000000000..e4970f08b3e
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryTreeIdentity.php
-@@ -0,0 +1,27 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
-+
-+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
-+
-+/**
-+ * Identity for resolved category
-+ */
-+class CategoryTreeIdentity implements IdentityInterface
-+{
-+    /**
-+     * Get category ID from resolved data
-+     *
-+     * @param array $resolvedData
-+     * @return string[]
-+     */
-+    public function getIdentities(array $resolvedData): array
-+    {
-+        return empty($resolvedData['id']) ? [] : [$resolvedData['id']];
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CheckCategoryIsActive.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CheckCategoryIsActive.php
-new file mode 100644
-index 00000000000..16f816a9671
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CheckCategoryIsActive.php
-@@ -0,0 +1,67 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
-+
-+use Magento\Catalog\Api\Data\CategoryInterface;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
-+
-+/**
-+ * Check if category is active.
-+ */
-+class CheckCategoryIsActive
-+{
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $collectionFactory;
-+
-+    /**
-+     * @var MetadataPool
-+     */
-+    private $metadata;
-+
-+    /**
-+     * @param CollectionFactory $collectionFactory
-+     * @param MetadataPool $metadata
-+     */
-+    public function __construct(
-+        CollectionFactory $collectionFactory,
-+        MetadataPool $metadata
-+    ) {
-+        $this->collectionFactory = $collectionFactory;
-+        $this->metadata = $metadata;
-+    }
-+
-+    /**
-+     * Check if category is active.
-+     *
-+     * @param int $categoryId
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    public function execute(int $categoryId): void
-+    {
-+        $collection = $this->collectionFactory->create();
-+        $collection->addAttributeToFilter(CategoryInterface::KEY_IS_ACTIVE, ['eq' => 1])
-+            ->getSelect()
-+            ->where(
-+                $collection->getSelect()
-+                    ->getConnection()
-+                    ->quoteIdentifier(
-+                        'e.' .
-+                        $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField()
-+                    ) . ' = ?',
-+                $categoryId
-+            );
-+
-+        if ($collection->count() === 0) {
-+            throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
-index 406b4173e68..e0580213dde 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
-@@ -9,8 +9,6 @@ namespace Magento\CatalogGraphQl\Model\Resolver\Category;
- 
- use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\Builder;
-@@ -22,38 +20,38 @@ use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-  */
- class Products implements ResolverInterface
- {
--    /** @var \Magento\Catalog\Api\ProductRepositoryInterface */
-+    /**
-+     * @var \Magento\Catalog\Api\ProductRepositoryInterface
-+     */
-     private $productRepository;
- 
--    /** @var Builder */
-+    /**
-+     * @var Builder
-+     */
-     private $searchCriteriaBuilder;
- 
--    /** @var Filter */
-+    /**
-+     * @var Filter
-+     */
-     private $filterQuery;
- 
--    /** @var ValueFactory */
--    private $valueFactory;
--
-     /**
-      * @param ProductRepositoryInterface $productRepository
-      * @param Builder $searchCriteriaBuilder
-      * @param Filter $filterQuery
--     * @param ValueFactory $valueFactory
-      */
-     public function __construct(
-         ProductRepositoryInterface $productRepository,
-         Builder $searchCriteriaBuilder,
--        Filter $filterQuery,
--        ValueFactory $valueFactory
-+        Filter $filterQuery
-     ) {
-         $this->productRepository = $productRepository;
-         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-         $this->filterQuery = $filterQuery;
--        $this->valueFactory = $valueFactory;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -61,13 +59,19 @@ class Products implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         $args['filter'] = [
-             'category_id' => [
-                 'eq' => $value['id']
-             ]
-         ];
-         $searchCriteria = $this->searchCriteriaBuilder->build($field->getName(), $args);
-+        if ($args['currentPage'] < 1) {
-+            throw new GraphQlInputException(__('currentPage value must be greater than 0.'));
-+        }
-+        if ($args['pageSize'] < 1) {
-+            throw new GraphQlInputException(__('pageSize value must be greater than 0.'));
-+        }
-         $searchCriteria->setCurrentPage($args['currentPage']);
-         $searchCriteria->setPageSize($args['pageSize']);
-         $searchResult = $this->filterQuery->getResult($searchCriteria, $info);
-@@ -94,14 +98,10 @@ class Products implements ResolverInterface
-             'items'       => $searchResult->getProductsSearchResult(),
-             'page_info'   => [
-                 'page_size'    => $searchCriteria->getPageSize(),
--                'current_page' => $currentPage
-+                'current_page' => $currentPage,
-+                'total_pages' => $maxPages
-             ]
-         ];
--
--        $result = function () use ($data) {
--            return $data;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $data;
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php
-new file mode 100644
-index 00000000000..397fd12b7e7
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
-+
-+use Magento\Catalog\Model\Category;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\StockProcessor;
-+use Magento\Framework\Api\SearchCriteriaInterface;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+
-+/**
-+ * Retrieves products count for a category
-+ */
-+class ProductsCount implements ResolverInterface
-+{
-+    /**
-+     * @var Visibility
-+     */
-+    private $catalogProductVisibility;
-+
-+    /**
-+     * @var StockProcessor
-+     */
-+    private $stockProcessor;
-+
-+    /**
-+     * @var SearchCriteriaInterface
-+     */
-+    private $searchCriteria;
-+
-+    /**
-+     * @param Visibility $catalogProductVisibility
-+     * @param SearchCriteriaInterface $searchCriteria
-+     * @param StockProcessor $stockProcessor
-+     */
-+    public function __construct(
-+        Visibility $catalogProductVisibility,
-+        SearchCriteriaInterface $searchCriteria,
-+        StockProcessor $stockProcessor
-+    ) {
-+        $this->catalogProductVisibility = $catalogProductVisibility;
-+        $this->searchCriteria = $searchCriteria;
-+        $this->stockProcessor = $stockProcessor;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new GraphQlInputException(__('"model" value should be specified'));
-+        }
-+        /** @var Category $category */
-+        $category = $value['model'];
-+        $productsCollection = $category->getProductCollection();
-+        $productsCollection->setVisibility($this->catalogProductVisibility->getVisibleInSiteIds());
-+        $productsCollection = $this->stockProcessor->process($productsCollection, $this->searchCriteria, []);
-+
-+        return $productsCollection->getSize();
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/SortFields.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/SortFields.php
-index ca68b299101..cb5553bb037 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/SortFields.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/SortFields.php
-@@ -9,8 +9,6 @@ namespace Magento\CatalogGraphQl\Model\Resolver\Category;
- 
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-@@ -18,11 +16,6 @@ use Magento\Framework\GraphQl\Query\ResolverInterface;
-  */
- class SortFields implements ResolverInterface
- {
--    /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
-     /**
-      * @var \Magento\Catalog\Model\Config
-      */
-@@ -39,27 +32,24 @@ class SortFields implements ResolverInterface
-     private $sortbyAttributeSource;
- 
-     /**
--     * @param ValueFactory $valueFactory
-      * @param \Magento\Catalog\Model\Config $catalogConfig
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @oaram \Magento\Catalog\Model\Category\Attribute\Source\Sortby $sortbyAttributeSource
-      */
-     public function __construct(
--        ValueFactory $valueFactory,
-         \Magento\Catalog\Model\Config $catalogConfig,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
-         \Magento\Catalog\Model\Category\Attribute\Source\Sortby $sortbyAttributeSource
-     ) {
--        $this->valueFactory = $valueFactory;
-         $this->catalogConfig = $catalogConfig;
-         $this->storeManager = $storeManager;
-         $this->sortbyAttributeSource = $sortbyAttributeSource;
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
--    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-     {
-         $sortFieldsOptions = $this->sortbyAttributeSource->getAllOptions();
-         array_walk(
-@@ -73,10 +63,6 @@ class SortFields implements ResolverInterface
-             'options' => $sortFieldsOptions,
-         ];
-         
--        $result = function () use ($data) {
--            return $data;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $data;
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
-index f631e5ff61d..89d3805383e 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
-@@ -7,12 +7,14 @@ declare(strict_types=1);
- 
- namespace Magento\CatalogGraphQl\Model\Resolver;
- 
-+use Magento\Catalog\Model\Category;
-+use Magento\CatalogGraphQl\Model\Resolver\Category\CheckCategoryIsActive;
-+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\ExtractDataFromCategoryTree;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Framework\GraphQl\Config\Element\Field;
- use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- 
- /**
-  * Category tree field resolver, used for GraphQL request processing.
-@@ -25,60 +27,71 @@ class CategoryTree implements ResolverInterface
-     const CATEGORY_INTERFACE = 'CategoryInterface';
- 
-     /**
--     * @var Products\DataProvider\CategoryTree
-+     * @var \Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree
-      */
-     private $categoryTree;
- 
-     /**
--     * @var ValueFactory
-+     * @var ExtractDataFromCategoryTree
-      */
--    private $valueFactory;
-+    private $extractDataFromCategoryTree;
- 
-     /**
--     * @param Products\DataProvider\CategoryTree $categoryTree
--     * @param ValueFactory $valueFactory
-+     * @var CheckCategoryIsActive
-+     */
-+    private $checkCategoryIsActive;
-+
-+    /**
-+     * @param \Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree $categoryTree
-+     * @param ExtractDataFromCategoryTree $extractDataFromCategoryTree
-+     * @param CheckCategoryIsActive $checkCategoryIsActive
-      */
-     public function __construct(
-         \Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree $categoryTree,
--        ValueFactory $valueFactory
-+        ExtractDataFromCategoryTree $extractDataFromCategoryTree,
-+        CheckCategoryIsActive $checkCategoryIsActive
-     ) {
-         $this->categoryTree = $categoryTree;
--        $this->valueFactory = $valueFactory;
-+        $this->extractDataFromCategoryTree = $extractDataFromCategoryTree;
-+        $this->checkCategoryIsActive = $checkCategoryIsActive;
-     }
- 
-     /**
--     * Assert that filters from search criteria are valid and retrieve root category id
-+     * Get category id
-      *
-      * @param array $args
-      * @return int
-      * @throws GraphQlInputException
-      */
--    private function assertFiltersAreValidAndGetCategoryRootIds(array $args) : int
-+    private function getCategoryId(array $args) : int
-     {
-         if (!isset($args['id'])) {
-             throw new GraphQlInputException(__('"id for category should be specified'));
-         }
- 
--        return (int) $args['id'];
-+        return (int)$args['id'];
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
--    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-     {
--        return $this->valueFactory->create(function () use ($value, $args, $field, $info) {
--            if (isset($value[$field->getName()])) {
--                return $value[$field->getName()];
--            }
-+        if (isset($value[$field->getName()])) {
-+            return $value[$field->getName()];
-+        }
-+
-+        $rootCategoryId = $this->getCategoryId($args);
-+        if ($rootCategoryId !== Category::TREE_ROOT_ID) {
-+            $this->checkCategoryIsActive->execute($rootCategoryId);
-+        }
-+        $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId);
-+
-+        if (empty($categoriesTree) || ($categoriesTree->count() == 0)) {
-+            throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
-+        }
- 
--            $rootCategoryId = $this->assertFiltersAreValidAndGetCategoryRootIds($args);
--            $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId);
--            if (!empty($categoriesTree)) {
--                return current($categoriesTree);
--            } else {
--                return null;
--            }
--        });
-+        $result = $this->extractDataFromCategoryTree->execute($categoriesTree);
-+        return current($result);
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/LayerFilters.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/LayerFilters.php
-new file mode 100644
-index 00000000000..0ec7e12e42d
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/LayerFilters.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+
-+/**
-+ * Layered navigation filters resolver, used for GraphQL request processing.
-+ */
-+class LayerFilters implements ResolverInterface
-+{
-+    /**
-+     * @var Layer\DataProvider\Filters
-+     */
-+    private $filtersDataProvider;
-+
-+    /**
-+     * @param \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider
-+     */
-+    public function __construct(
-+        \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider
-+    ) {
-+        $this->filtersDataProvider = $filtersDataProvider;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (!isset($value['layer_type'])) {
-+            return null;
-+        }
-+
-+        return $this->filtersDataProvider->getData($value['layer_type']);
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
-index 8bf3335bbb9..86137990cc5 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
-@@ -7,17 +7,16 @@ declare(strict_types=1);
- 
- namespace Magento\CatalogGraphQl\Model\Resolver;
- 
--use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\CatalogGraphQl\Model\Resolver\Product\ProductFieldsSelector;
- use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product as ProductDataProvider;
- use Magento\Framework\GraphQl\Config\Element\Field;
- use Magento\Framework\GraphQl\Exception\GraphQlInputException;
--use Magento\Framework\GraphQl\Query\FieldTranslator;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
- use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class Product implements ResolverInterface
- {
-@@ -32,35 +31,35 @@ class Product implements ResolverInterface
-     private $valueFactory;
- 
-     /**
--     * @var FieldTranslator
-+     * @var ProductFieldsSelector
-      */
--    private $fieldTranslator;
-+    private $productFieldsSelector;
- 
-     /**
-      * @param ProductDataProvider $productDataProvider
-      * @param ValueFactory $valueFactory
--     * @param FieldTranslator $fieldTranslator
-+     * @param ProductFieldsSelector $productFieldsSelector
-      */
-     public function __construct(
-         ProductDataProvider $productDataProvider,
-         ValueFactory $valueFactory,
--        FieldTranslator $fieldTranslator
-+        ProductFieldsSelector $productFieldsSelector
-     ) {
-         $this->productDataProvider = $productDataProvider;
-         $this->valueFactory = $valueFactory;
--        $this->fieldTranslator = $fieldTranslator;
-+        $this->productFieldsSelector = $productFieldsSelector;
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
--    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-     {
-         if (!isset($value['sku'])) {
-             throw new GraphQlInputException(__('No child sku found for product link.'));
-         }
-         $this->productDataProvider->addProductSku($value['sku']);
--        $fields = $this->getProductFields($info);
-+        $fields = $this->productFieldsSelector->getProductFieldsFromInfo($info);
-         $this->productDataProvider->addEavAttributes($fields);
- 
-         $result = function () use ($value) {
-@@ -86,34 +85,4 @@ class Product implements ResolverInterface
- 
-         return $this->valueFactory->create($result);
-     }
--
--    /**
--     * Return field names for all requested product fields.
--     *
--     * @param ResolveInfo $info
--     * @return string[]
--     */
--    private function getProductFields(ResolveInfo $info) : array
--    {
--        $fieldNames = [];
--        foreach ($info->fieldNodes as $node) {
--            if ($node->name->value !== 'product') {
--                continue;
--            }
--            foreach ($node->selectionSet->selections as $selectionNode) {
--                if ($selectionNode->kind === 'InlineFragment') {
--                    foreach ($selectionNode->selectionSet->selections as $inlineSelection) {
--                        if ($inlineSelection->kind === 'InlineFragment') {
--                            continue;
--                        }
--                        $fieldNames[] = $this->fieldTranslator->translate($inlineSelection->name->value);
--                    }
--                    continue;
--                }
--                $fieldNames[] = $this->fieldTranslator->translate($selectionNode->name->value);
--            }
--        }
--
--        return $fieldNames;
--    }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CanonicalUrl.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CanonicalUrl.php
-index d2675848c2d..9047eaee4b5 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CanonicalUrl.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CanonicalUrl.php
-@@ -8,9 +8,8 @@ declare(strict_types=1);
- namespace Magento\CatalogGraphQl\Model\Resolver\Product;
- 
- use Magento\Catalog\Model\Product;
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- 
-@@ -20,21 +19,7 @@ use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- class CanonicalUrl implements ResolverInterface
- {
-     /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
--    /**
--     * @param ValueFactory $valueFactory
--     */
--    public function __construct(
--        ValueFactory $valueFactory
--    ) {
--        $this->valueFactory = $valueFactory;
--    }
--
--    /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -42,21 +27,15 @@ class CanonicalUrl implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         if (!isset($value['model'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"model" value should be specified'));
-         }
- 
-         /* @var $product Product */
-         $product = $value['model'];
-         $url = $product->getUrlModel()->getUrl($product, ['_ignore_category' => true]);
--        $result = function () use ($url) {
--            return $url;
--        };
--
--        return $this->valueFactory->create($result);
-+        
-+        return $url;
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/EntityIdToId.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/EntityIdToId.php
-index 4c101f68eb4..ada3caad5f9 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/EntityIdToId.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/EntityIdToId.php
-@@ -7,19 +7,18 @@ declare(strict_types=1);
- 
- namespace Magento\CatalogGraphQl\Model\Resolver\Product;
- 
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Model\Product;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-- * Fixed the id related data in the product data
-+ * @inheritdoc
-  *
-- * {@inheritdoc}
-+ * Fixed the id related data in the product data
-  */
- class EntityIdToId implements ResolverInterface
- {
-@@ -28,23 +27,16 @@ class EntityIdToId implements ResolverInterface
-      */
-     private $metadataPool;
- 
--    /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
-     /**
-      * @param MetadataPool $metadataPool
--     * @param ValueFactory $valueFactory
-      */
--    public function __construct(MetadataPool $metadataPool, ValueFactory $valueFactory)
-+    public function __construct(MetadataPool $metadataPool)
-     {
-         $this->metadataPool = $metadataPool;
--        $this->valueFactory = $valueFactory;
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -52,12 +44,9 @@ class EntityIdToId implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         if (!isset($value['model'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"model" value should be specified'));
-         }
- 
-         /** @var Product $product */
-@@ -67,10 +56,6 @@ class EntityIdToId implements ResolverInterface
-             $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField()
-         );
- 
--        $result = function () use ($productId) {
--            return $productId;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $productId;
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Identity.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Identity.php
-new file mode 100644
-index 00000000000..198b1c112dc
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Identity.php
-@@ -0,0 +1,33 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
-+
-+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
-+
-+/**
-+ * Identity for resolved products
-+ */
-+class Identity implements IdentityInterface
-+{
-+    /**
-+     * Get product ids for cache tag
-+     *
-+     * @param array $resolvedData
-+     * @return string[]
-+     */
-+    public function getIdentities(array $resolvedData): array
-+    {
-+        $ids = [];
-+        $items = $resolvedData['items'] ?? [];
-+        foreach ($items as $item) {
-+            $ids[] = $item['entity_id'];
-+        }
-+
-+        return $ids;
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGalleryEntries.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGalleryEntries.php
-index ac028eef1fb..c8f167da583 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGalleryEntries.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGalleryEntries.php
-@@ -7,35 +7,32 @@ declare(strict_types=1);
- 
- namespace Magento\CatalogGraphQl\Model\Resolver\Product;
- 
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Catalog\Model\Product;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-+ * @inheritdoc
-+ *
-  * Format a product's media gallery information to conform to GraphQL schema representation
-  */
- class MediaGalleryEntries implements ResolverInterface
- {
-     /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
--    /**
--     * @param ValueFactory $valueFactory
--     */
--    public function __construct(ValueFactory $valueFactory)
--    {
--        $this->valueFactory = $valueFactory;
--    }
--
--    /**
-+     * @inheritdoc
-+     *
-      * Format product's media gallery entry data to conform to GraphQL schema
-      *
--     * {@inheritdoc}
-+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
-+     * @param ContextInterface $context
-+     * @param ResolveInfo $info
-+     * @param array|null $value
-+     * @param array|null $args
-+     * @throws \Exception
-+     * @return array
-      */
-     public function resolve(
-         Field $field,
-@@ -43,12 +40,9 @@ class MediaGalleryEntries implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         if (!isset($value['model'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"model" value should be specified'));
-         }
- 
-         /** @var Product $product */
-@@ -64,11 +58,6 @@ class MediaGalleryEntries implements ResolverInterface
-                 }
-             }
-         }
--
--        $result = function () use ($mediaGalleryEntries) {
--            return $mediaGalleryEntries;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $mediaGalleryEntries;
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/NewFromTo.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/NewFromTo.php
-index 34fb58b97b1..12016282a30 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/NewFromTo.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/NewFromTo.php
-@@ -7,35 +7,31 @@ declare(strict_types=1);
- 
- namespace Magento\CatalogGraphQl\Model\Resolver\Product;
- 
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Catalog\Model\Product;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-+ * @inheritdoc
-+ *
-  * Format the new from and to typo of legacy fields news_from_date and news_to_date
-  */
- class NewFromTo implements ResolverInterface
- {
-     /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
--    /**
--     * @param ValueFactory $valueFactory
--     */
--    public function __construct(ValueFactory $valueFactory)
--    {
--        $this->valueFactory = $valueFactory;
--    }
--
--    /**
-+     * @inheritdoc
-+     *
-      * Transfer data from legacy news_from_date and news_to_date to new names corespondent fields
-      *
--     * {@inheritdoc}
-+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
-+     * @param \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context
-+     * @param ResolveInfo $info
-+     * @param array|null $value
-+     * @param array|null $args
-+     * @throws \Exception
-+     * @return null|array
-      */
-     public function resolve(
-         Field $field,
-@@ -43,12 +39,9 @@ class NewFromTo implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         if (!isset($value['model'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"model" value should be specified'));
-         }
- 
-         /** @var Product $product */
-@@ -60,10 +53,6 @@ class NewFromTo implements ResolverInterface
-             $data = $product->getData($attributeName);
-         }
- 
--        $result = function () use ($data) {
--            return $data;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $data;
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Options.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Options.php
-index 8e06877452f..76602288039 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Options.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Options.php
-@@ -7,12 +7,12 @@ declare(strict_types=1);
- 
- namespace Magento\CatalogGraphQl\Model\Resolver\Product;
- 
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Catalog\Model\Product;
- use Magento\Catalog\Model\Product\Option;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-@@ -21,22 +21,17 @@ use Magento\Framework\GraphQl\Query\ResolverInterface;
- class Options implements ResolverInterface
- {
-     /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
--    /**
--     * @param ValueFactory $valueFactory
--     */
--    public function __construct(ValueFactory $valueFactory)
--    {
--        $this->valueFactory = $valueFactory;
--    }
--
--    /**
-+     * @inheritdoc
-+     *
-      * Format product's option data to conform to GraphQL schema
-      *
--     * {@inheritdoc}
-+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
-+     * @param ContextInterface $context
-+     * @param ResolveInfo $info
-+     * @param array|null $value
-+     * @param array|null $args
-+     * @throws \Exception
-+     * @return null|array
-      */
-     public function resolve(
-         Field $field,
-@@ -44,12 +39,9 @@ class Options implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         if (!isset($value['model'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"model" value should be specified'));
-         }
- 
-         /** @var Product $product */
-@@ -80,10 +72,6 @@ class Options implements ResolverInterface
-             }
-         }
- 
--        $result = function () use ($options) {
--            return $options;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $options;
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price.php
-index 29b693abc26..55d930101fb 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price.php
-@@ -7,13 +7,13 @@ declare(strict_types=1);
- 
- namespace Magento\CatalogGraphQl\Model\Resolver\Product;
- 
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Catalog\Model\Product;
- use Magento\Catalog\Pricing\Price\FinalPrice;
- use Magento\Catalog\Pricing\Price\RegularPrice;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- use Magento\Framework\Pricing\Adjustment\AdjustmentInterface;
- use Magento\Framework\Pricing\Amount\AmountInterface;
-@@ -35,30 +35,30 @@ class Price implements ResolverInterface
-      */
-     private $priceInfoFactory;
- 
--    /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
-     /**
-      * @param StoreManagerInterface $storeManager
-      * @param PriceInfoFactory $priceInfoFactory
--     * @param ValueFactory $valueFactory
-      */
-     public function __construct(
-         StoreManagerInterface $storeManager,
--        PriceInfoFactory $priceInfoFactory,
--        ValueFactory $valueFactory
-+        PriceInfoFactory $priceInfoFactory
-     ) {
-         $this->storeManager = $storeManager;
-         $this->priceInfoFactory = $priceInfoFactory;
--        $this->valueFactory = $valueFactory;
-     }
- 
-     /**
-+     * @inheritdoc
-+     *
-      * Format product's tier price data to conform to GraphQL schema
-      *
--     * {@inheritdoc}
-+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
-+     * @param ContextInterface $context
-+     * @param ResolveInfo $info
-+     * @param array|null $value
-+     * @param array|null $args
-+     * @throws \Exception
-+     * @return array
-      */
-     public function resolve(
-         Field $field,
-@@ -66,12 +66,9 @@ class Price implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         if (!isset($value['model'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"model" value should be specified'));
-         }
- 
-         /** @var Product $product */
-@@ -90,11 +87,7 @@ class Price implements ResolverInterface
-             'maximalPrice' => $this->createAdjustmentsArray($priceInfo->getAdjustments(), $maximalPriceAmount)
-         ];
- 
--        $result = function () use ($prices) {
--            return $prices;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $prices;
-     }
- 
-     /**
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductComplexTextAttribute.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductComplexTextAttribute.php
-new file mode 100644
-index 00000000000..2573e92e564
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductComplexTextAttribute.php
-@@ -0,0 +1,57 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Helper\Output as OutputHelper;
-+
-+/**
-+ * Resolve rendered content for attributes where HTML content is allowed
-+ */
-+class ProductComplexTextAttribute implements ResolverInterface
-+{
-+    /**
-+     * @var OutputHelper
-+     */
-+    private $outputHelper;
-+
-+    /**
-+     * @param OutputHelper $outputHelper
-+     */
-+    public function __construct(
-+        OutputHelper $outputHelper
-+    ) {
-+        $this->outputHelper = $outputHelper;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ): array {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+
-+        /* @var $product Product */
-+        $product = $value['model'];
-+        $fieldName = $field->getName();
-+        $renderedValue = $this->outputHelper->productAttribute($product, $product->getData($fieldName), $fieldName);
-+
-+        return ['html' => $renderedValue ?? ''];
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductFieldsSelector.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductFieldsSelector.php
-new file mode 100644
-index 00000000000..9ddad4e6451
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductFieldsSelector.php
-@@ -0,0 +1,61 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
-+
-+use Magento\Framework\GraphQl\Query\FieldTranslator;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+
-+/**
-+ * Select Product Fields From Resolve Info
-+ */
-+class ProductFieldsSelector
-+{
-+    /**
-+     * @var FieldTranslator
-+     */
-+    private $fieldTranslator;
-+
-+    /**
-+     * @param FieldTranslator $fieldTranslator
-+     */
-+    public function __construct(FieldTranslator $fieldTranslator)
-+    {
-+        $this->fieldTranslator = $fieldTranslator;
-+    }
-+
-+    /**
-+     * Return field names for all requested product fields.
-+     *
-+     * @param ResolveInfo $info
-+     * @param string $productNodeName
-+     * @return string[]
-+     */
-+    public function getProductFieldsFromInfo(ResolveInfo $info, string $productNodeName = 'product') : array
-+    {
-+        $fieldNames = [];
-+        foreach ($info->fieldNodes as $node) {
-+            if ($node->name->value !== $productNodeName) {
-+                continue;
-+            }
-+            foreach ($node->selectionSet->selections as $selectionNode) {
-+                if ($selectionNode->kind === 'InlineFragment') {
-+                    foreach ($selectionNode->selectionSet->selections as $inlineSelection) {
-+                        if ($inlineSelection->kind === 'InlineFragment') {
-+                            continue;
-+                        }
-+                        $fieldNames[] = $this->fieldTranslator->translate($inlineSelection->name->value);
-+                    }
-+                    continue;
-+                }
-+                $fieldNames[] = $this->fieldTranslator->translate($selectionNode->name->value);
-+            }
-+        }
-+
-+        return $fieldNames;
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage.php
-new file mode 100644
-index 00000000000..d1566162472
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage.php
-@@ -0,0 +1,44 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
-+
-+use Magento\Catalog\Model\Product;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+
-+/**
-+ * Returns product's image data
-+ */
-+class ProductImage implements ResolverInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ): array {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+
-+        /** @var Product $product */
-+        $product = $value['model'];
-+        $imageType = $field->getName();
-+
-+        return [
-+            'model' => $product,
-+            'image_type' => $imageType,
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Label.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Label.php
-new file mode 100644
-index 00000000000..f971e357426
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Label.php
-@@ -0,0 +1,96 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Product\ProductImage;
-+
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\ResourceModel\Product as ProductResourceModel;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Returns product's image label
-+ */
-+class Label implements ResolverInterface
-+{
-+    /**
-+     * @var ProductResourceModel
-+     */
-+    private $productResource;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @param ProductResourceModel $productResource
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(
-+        ProductResourceModel $productResource,
-+        StoreManagerInterface $storeManager
-+    ) {
-+        $this->productResource = $productResource;
-+        $this->storeManager = $storeManager;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (!isset($value['image_type'])) {
-+            throw new LocalizedException(__('"image_type" value should be specified'));
-+        }
-+
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+
-+        /** @var Product $product */
-+        $product = $value['model'];
-+        $imageType = $value['image_type'];
-+        $imagePath = $product->getData($imageType);
-+        $productId = (int)$product->getEntityId();
-+
-+        // null if image is not set
-+        if (null === $imagePath) {
-+            return $this->getAttributeValue($productId, 'name');
-+        }
-+
-+        $imageLabel = $this->getAttributeValue($productId, $imageType . '_label');
-+        if (null === $imageLabel) {
-+            $imageLabel = $this->getAttributeValue($productId, 'name');
-+        }
-+
-+        return $imageLabel;
-+    }
-+
-+    /**
-+     * Get attribute value
-+     *
-+     * @param int $productId
-+     * @param string $attributeCode
-+     * @return null|string Null if attribute value is not exists
-+     */
-+    private function getAttributeValue(int $productId, string $attributeCode): ?string
-+    {
-+        $storeId = $this->storeManager->getStore()->getId();
-+
-+        $value = $this->productResource->getAttributeRawValue($productId, $attributeCode, $storeId);
-+        return is_array($value) && empty($value) ? null : $value;
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Url.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Url.php
-new file mode 100644
-index 00000000000..23a8c2d15c0
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Url.php
-@@ -0,0 +1,89 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Product\ProductImage;
-+
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\ImageFactory;
-+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Image\Placeholder as PlaceholderProvider;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+
-+/**
-+ * Returns product's image url
-+ */
-+class Url implements ResolverInterface
-+{
-+    /**
-+     * @var ImageFactory
-+     */
-+    private $productImageFactory;
-+    /**
-+     * @var PlaceholderProvider
-+     */
-+    private $placeholderProvider;
-+
-+    /**
-+     * @param ImageFactory $productImageFactory
-+     * @param PlaceholderProvider $placeholderProvider
-+     */
-+    public function __construct(
-+        ImageFactory $productImageFactory,
-+        PlaceholderProvider $placeholderProvider
-+    ) {
-+        $this->productImageFactory = $productImageFactory;
-+        $this->placeholderProvider = $placeholderProvider;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (!isset($value['image_type'])) {
-+            throw new LocalizedException(__('"image_type" value should be specified'));
-+        }
-+
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+
-+        /** @var Product $product */
-+        $product = $value['model'];
-+        $imagePath = $product->getData($value['image_type']);
-+
-+        return $this->getImageUrl($value['image_type'], $imagePath);
-+    }
-+
-+    /**
-+     * Get image URL
-+     *
-+     * @param string $imageType
-+     * @param string|null $imagePath
-+     * @return string
-+     * @throws \Exception
-+     */
-+    private function getImageUrl(string $imageType, ?string $imagePath): string
-+    {
-+        $image = $this->productImageFactory->create();
-+        $image->setDestinationSubdir($imageType)
-+            ->setBaseFile($imagePath);
-+
-+        if ($image->isBaseFilePlaceholder()) {
-+            return $this->placeholderProvider->getPlaceholder($imageType);
-+        }
-+
-+        return $image->getUrl();
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductLinks.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductLinks.php
-index 181371f16d3..4d1b11a74b9 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductLinks.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductLinks.php
-@@ -7,18 +7,18 @@ declare(strict_types=1);
- 
- namespace Magento\CatalogGraphQl\Model\Resolver\Product;
- 
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Catalog\Model\Product;
- use Magento\Catalog\Model\ProductLink\Link;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-- * Format the product links information to conform to GraphQL schema representation
-+ * @inheritdoc
-  *
-- * {@inheritdoc}
-+ * Format the product links information to conform to GraphQL schema representation
-  */
- class ProductLinks implements ResolverInterface
- {
-@@ -28,22 +28,17 @@ class ProductLinks implements ResolverInterface
-     private $linkTypes = ['related', 'upsell', 'crosssell'];
- 
-     /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
--    /**
--     * @param ValueFactory $valueFactory
--     */
--    public function __construct(ValueFactory $valueFactory)
--    {
--        $this->valueFactory = $valueFactory;
--    }
--
--    /**
-+     * @inheritdoc
-+     *
-      * Format product links data to conform to GraphQL schema
-      *
--     * {@inheritdoc}
-+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
-+     * @param ContextInterface $context
-+     * @param ResolveInfo $info
-+     * @param array|null $value
-+     * @param array|null $args
-+     * @throws \Exception
-+     * @return null|array
-      */
-     public function resolve(
-         Field $field,
-@@ -51,12 +46,9 @@ class ProductLinks implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         if (!isset($value['model'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"model" value should be specified'));
-         }
- 
-         /** @var Product $product */
-@@ -73,10 +65,6 @@ class ProductLinks implements ResolverInterface
-             }
-         }
- 
--        $result = function () use ($links) {
--            return $links;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $links;
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/TierPrices.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/TierPrices.php
-index 0b7811d4f74..726ef91c568 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/TierPrices.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/TierPrices.php
-@@ -7,38 +7,33 @@ declare(strict_types=1);
- 
- namespace Magento\CatalogGraphQl\Model\Resolver\Product;
- 
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Catalog\Model\Product;
- use Magento\Catalog\Model\Product\TierPrice;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-- * Format a product's tier price information to conform to GraphQL schema representation
-+ * @inheritdoc
-  *
-- * {@inheritdoc}
-+ * Format a product's tier price information to conform to GraphQL schema representation
-  */
- class TierPrices implements ResolverInterface
- {
-     /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
--    /**
--     * @param ValueFactory $valueFactory
--     */
--    public function __construct(ValueFactory $valueFactory)
--    {
--        $this->valueFactory = $valueFactory;
--    }
--
--    /**
-+     * @inheritdoc
-+     *
-      * Format product's tier price data to conform to GraphQL schema
-      *
--     * {@inheritdoc}
-+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
-+     * @param ContextInterface $context
-+     * @param ResolveInfo $info
-+     * @param array|null $value
-+     * @param array|null $args
-+     * @throws \Exception
-+     * @return null|array
-      */
-     public function resolve(
-         Field $field,
-@@ -46,12 +41,9 @@ class TierPrices implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         if (!isset($value['model'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"model" value should be specified'));
-         }
- 
-         /** @var Product $product */
-@@ -66,10 +58,6 @@ class TierPrices implements ResolverInterface
-             }
-         }
- 
--        $result = function () use ($tierPrices) {
--            return $tierPrices;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $tierPrices;
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Websites.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Websites.php
-index 867f1fa0d0b..070c564713a 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Websites.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Websites.php
-@@ -7,10 +7,9 @@ declare(strict_types=1);
- 
- namespace Magento\CatalogGraphQl\Model\Resolver\Product;
- 
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
--use Magento\Catalog\Model\Product;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
- use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- use Magento\CatalogGraphQl\Model\Resolver\Product\Websites\Collection;
-@@ -43,15 +42,12 @@ class Websites implements ResolverInterface
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
--    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-     {
-         if (!isset($value['entity_id'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"model" value should be specified'));
-         }
-         $this->productWebsitesCollection->addIdFilters((int)$value['entity_id']);
-         $result = function () use ($value) {
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
-index cc791ce780c..a75a9d2cf50 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
-@@ -14,8 +14,6 @@ use Magento\Framework\GraphQl\Config\Element\Field;
- use Magento\Framework\GraphQl\Exception\GraphQlInputException;
- use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\Builder;
- use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\SearchFilter;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- use Magento\Catalog\Model\Layer\Resolver;
- 
-@@ -44,40 +42,26 @@ class Products implements ResolverInterface
-      */
-     private $searchFilter;
- 
--    /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
--    /**
--     * @var Layer\DataProvider\Filters
--     */
--    private $filtersDataProvider;
--
-     /**
-      * @param Builder $searchCriteriaBuilder
-      * @param Search $searchQuery
-      * @param Filter $filterQuery
--     * @param ValueFactory $valueFactory
-+     * @param SearchFilter $searchFilter
-      */
-     public function __construct(
-         Builder $searchCriteriaBuilder,
-         Search $searchQuery,
-         Filter $filterQuery,
--        SearchFilter $searchFilter,
--        ValueFactory $valueFactory,
--        \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider
-+        SearchFilter $searchFilter
-     ) {
-         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-         $this->searchQuery = $searchQuery;
-         $this->filterQuery = $filterQuery;
-         $this->searchFilter = $searchFilter;
--        $this->valueFactory = $valueFactory;
--        $this->filtersDataProvider = $filtersDataProvider;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -85,8 +69,14 @@ class Products implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ) : Value {
-+    ) {
-         $searchCriteria = $this->searchCriteriaBuilder->build($field->getName(), $args);
-+        if ($args['currentPage'] < 1) {
-+            throw new GraphQlInputException(__('currentPage value must be greater than 0.'));
-+        }
-+        if ($args['pageSize'] < 1) {
-+            throw new GraphQlInputException(__('pageSize value must be greater than 0.'));
-+        }
-         $searchCriteria->setCurrentPage($args['currentPage']);
-         $searchCriteria->setPageSize($args['pageSize']);
-         if (!isset($args['search']) && !isset($args['filter'])) {
-@@ -110,10 +100,10 @@ class Products implements ResolverInterface
- 
-         $currentPage = $searchCriteria->getCurrentPage();
-         if ($searchCriteria->getCurrentPage() > $maxPages && $searchResult->getTotalCount() > 0) {
--            $currentPage = new GraphQlInputException(
-+            throw new GraphQlInputException(
-                 __(
--                    'currentPage value %1 specified is greater than the number of pages available.',
--                    [$maxPages]
-+                    'currentPage value %1 specified is greater than the %2 page(s) available.',
-+                    [$currentPage, $maxPages]
-                 )
-             );
-         }
-@@ -123,15 +113,12 @@ class Products implements ResolverInterface
-             'items' => $searchResult->getProductsSearchResult(),
-             'page_info' => [
-                 'page_size' => $searchCriteria->getPageSize(),
--                'current_page' => $currentPage
-+                'current_page' => $currentPage,
-+                'total_pages' => $maxPages
-             ],
--            'filters' => $this->filtersDataProvider->getData($layerType)
-+            'layer_type' => $layerType
-         ];
- 
--        $result = function () use ($data) {
--            return $data;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $data;
-     }
- }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
-index d2fc174fb1e..fc5a563c82b 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
-@@ -9,7 +9,6 @@ namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
- 
- use GraphQL\Language\AST\FieldNode;
- use Magento\CatalogGraphQl\Model\Category\DepthCalculator;
--use Magento\CatalogGraphQl\Model\Category\Hydrator;
- use Magento\CatalogGraphQl\Model\Category\LevelCalculator;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-@@ -17,6 +16,7 @@ use Magento\Catalog\Api\Data\CategoryInterface;
- use Magento\Catalog\Model\ResourceModel\Category\Collection;
- use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
- use Magento\CatalogGraphQl\Model\AttributesJoiner;
-+use Magento\Catalog\Model\Category;
- 
- /**
-  * Category tree data provider
-@@ -53,81 +53,75 @@ class CategoryTree
-      */
-     private $metadata;
- 
--    /**
--     * @var Hydrator
--     */
--    private $hydrator;
--
-     /**
-      * @param CollectionFactory $collectionFactory
-      * @param AttributesJoiner $attributesJoiner
-      * @param DepthCalculator $depthCalculator
-      * @param LevelCalculator $levelCalculator
-      * @param MetadataPool $metadata
--     * @param Hydrator $hydrator
-      */
-     public function __construct(
-         CollectionFactory $collectionFactory,
-         AttributesJoiner $attributesJoiner,
-         DepthCalculator $depthCalculator,
-         LevelCalculator $levelCalculator,
--        MetadataPool $metadata,
--        Hydrator $hydrator
-+        MetadataPool $metadata
-     ) {
-         $this->collectionFactory = $collectionFactory;
-         $this->attributesJoiner = $attributesJoiner;
-         $this->depthCalculator = $depthCalculator;
-         $this->levelCalculator = $levelCalculator;
-         $this->metadata = $metadata;
--        $this->hydrator = $hydrator;
-     }
- 
-     /**
-+     * Returns categories tree starting from parent $rootCategoryId
-+     *
-      * @param ResolveInfo $resolveInfo
-      * @param int $rootCategoryId
--     * @return array
-+     * @return \Iterator
-      */
--    public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId) : array
-+    public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterator
-     {
--        $categoryQuery = $resolveInfo->fieldASTs[0];
-+        $categoryQuery = $resolveInfo->fieldNodes[0];
-         $collection = $this->collectionFactory->create();
-         $this->joinAttributesRecursively($collection, $categoryQuery);
-         $depth = $this->depthCalculator->calculate($categoryQuery);
-         $level = $this->levelCalculator->calculate($rootCategoryId);
-+
-+        // If root category is being filter, we've to remove first slash
-+        if ($rootCategoryId == Category::TREE_ROOT_ID) {
-+            $regExpPathFilter = sprintf('.*%s/[/0-9]*$', $rootCategoryId);
-+        } else {
-+            $regExpPathFilter = sprintf('.*/%s/[/0-9]*$', $rootCategoryId);
-+        }
-+
-         //Search for desired part of category tree
--        $collection->addPathFilter(sprintf('.*/%s/[/0-9]*$', $rootCategoryId));
-+        $collection->addPathFilter($regExpPathFilter);
-+
-         $collection->addFieldToFilter('level', ['gt' => $level]);
-         $collection->addFieldToFilter('level', ['lteq' => $level + $depth - self::DEPTH_OFFSET]);
-+        $collection->addAttributeToFilter('is_active', 1, "left");
-         $collection->setOrder('level');
-+        $collection->setOrder(
-+            'position',
-+            $collection::SORT_ORDER_DESC
-+        );
-         $collection->getSelect()->orWhere(
--            $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField() . ' = ?',
-+            $collection->getSelect()
-+                ->getConnection()
-+                ->quoteIdentifier(
-+                    'e.' . $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField()
-+                ) . ' = ?',
-             $rootCategoryId
-         );
--        return $this->processTree($collection->getIterator());
--    }
--
--    /**
--     * @param \Iterator $iterator
--     * @return array
--     */
--    private function processTree(\Iterator $iterator) : array
--    {
--        $tree = [];
--        while ($iterator->valid()) {
--            /** @var CategoryInterface $category */
--            $category = $iterator->current();
--            $iterator->next();
--            $nextCategory = $iterator->current();
--            $tree[$category->getId()] = $this->hydrator->hydrateCategory($category);
--            if ($nextCategory && (int) $nextCategory->getLevel() !== (int) $category->getLevel()) {
--                $tree[$category->getId()]['children'] = $this->processTree($iterator);
--            }
--        }
- 
--        return $tree;
-+        return $collection->getIterator();
-     }
- 
-     /**
-+     * Join attributes recursively
-+     *
-      * @param Collection $collection
-      * @param FieldNode $fieldNode
-      * @return void
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
-new file mode 100644
-index 00000000000..3525ccbb6a2
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
-@@ -0,0 +1,111 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
-+
-+use Magento\CatalogGraphQl\Model\Category\Hydrator;
-+use Magento\Catalog\Api\Data\CategoryInterface;
-+
-+/**
-+ * Extract data from category tree
-+ */
-+class ExtractDataFromCategoryTree
-+{
-+    /**
-+     * @var Hydrator
-+     */
-+    private $categoryHydrator;
-+
-+    /**
-+     * @var CategoryInterface
-+     */
-+    private $iteratingCategory;
-+
-+    /**
-+     * @var int
-+     */
-+    private $startCategoryFetchLevel = 1;
-+
-+    /**
-+     * @param Hydrator $categoryHydrator
-+     */
-+    public function __construct(
-+        Hydrator $categoryHydrator
-+    ) {
-+        $this->categoryHydrator = $categoryHydrator;
-+    }
-+
-+    /**
-+     * Extract data from category tree
-+     *
-+     * @param \Iterator $iterator
-+     * @return array
-+     */
-+    public function execute(\Iterator $iterator): array
-+    {
-+        $tree = [];
-+        while ($iterator->valid()) {
-+            /** @var CategoryInterface $category */
-+            $category = $iterator->current();
-+            $iterator->next();
-+            $pathElements = explode("/", $category->getPath());
-+            if (empty($tree)) {
-+                $this->startCategoryFetchLevel = count($pathElements) - 1;
-+            }
-+            $this->iteratingCategory = $category;
-+            $currentLevelTree = $this->explodePathToArray($pathElements, $this->startCategoryFetchLevel);
-+            if (empty($tree)) {
-+                $tree = $currentLevelTree;
-+            }
-+            $tree = $this->mergeCategoriesTrees($currentLevelTree, $tree);
-+        }
-+        return $tree;
-+    }
-+
-+    /**
-+     * Merge together complex categories trees
-+     *
-+     * @param array $tree1
-+     * @param array $tree2
-+     * @return array
-+     */
-+    private function mergeCategoriesTrees(array &$tree1, array &$tree2): array
-+    {
-+        $mergedTree = $tree1;
-+        foreach ($tree2 as $currentKey => &$value) {
-+            if (is_array($value) && isset($mergedTree[$currentKey]) && is_array($mergedTree[$currentKey])) {
-+                $mergedTree[$currentKey] = $this->mergeCategoriesTrees($mergedTree[$currentKey], $value);
-+            } else {
-+                $mergedTree[$currentKey] = $value;
-+            }
-+        }
-+        return $mergedTree;
-+    }
-+
-+    /**
-+     * Recursive method to generate tree for one category path
-+     *
-+     * @param array $pathElements
-+     * @param int $index
-+     * @return array
-+     */
-+    private function explodePathToArray(array $pathElements, int $index): array
-+    {
-+        $tree = [];
-+        $tree[$pathElements[$index]]['id'] = $pathElements[$index];
-+        if ($index === count($pathElements) - 1) {
-+            $tree[$pathElements[$index]] = $this->categoryHydrator->hydrateCategory($this->iteratingCategory);
-+            $tree[$pathElements[$index]]['model'] = $this->iteratingCategory;
-+        }
-+        $currentIndex = $index;
-+        $index++;
-+        if (isset($pathElements[$index])) {
-+            $tree[$pathElements[$currentIndex]]['children'] = $this->explodePathToArray($pathElements, $index);
-+        }
-+        return $tree;
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Image/Placeholder.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Image/Placeholder.php
-new file mode 100644
-index 00000000000..f5cf2a9ef82
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Image/Placeholder.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Image;
-+
-+use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
-+use Magento\Framework\View\Asset\Repository as AssetRepository;
-+
-+/**
-+ * Image Placeholder provider
-+ */
-+class Placeholder
-+{
-+    /**
-+     * @var PlaceholderFactory
-+     */
-+    private $placeholderFactory;
-+
-+    /**
-+     * @var AssetRepository
-+     */
-+    private $assetRepository;
-+
-+    /**
-+     * @param PlaceholderFactory $placeholderFactory
-+     * @param AssetRepository $assetRepository
-+     */
-+    public function __construct(
-+        PlaceholderFactory $placeholderFactory,
-+        AssetRepository $assetRepository
-+    ) {
-+        $this->placeholderFactory = $placeholderFactory;
-+        $this->assetRepository = $assetRepository;
-+    }
-+
-+    /**
-+     * Get placeholder
-+     *
-+     * @param string $imageType
-+     * @return string
-+     */
-+    public function getPlaceholder(string $imageType): string
-+    {
-+        $imageAsset = $this->placeholderFactory->create(['type' => $imageType]);
-+
-+        // check if placeholder defined in config
-+        if ($imageAsset->getFilePath()) {
-+            return $imageAsset->getUrl();
-+        }
-+
-+        return $this->assetRepository->getUrl(
-+            "Magento_Catalog::images/product/placeholder/{$imageType}.jpg"
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Image/Placeholder/Theme.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Image/Placeholder/Theme.php
-new file mode 100644
-index 00000000000..dc48c5ef693
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Image/Placeholder/Theme.php
-@@ -0,0 +1,71 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Image\Placeholder;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Theme provider
-+ */
-+class Theme
-+{
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var ThemeProviderInterface
-+     */
-+    private $themeProvider;
-+
-+    /**
-+     * @param ScopeConfigInterface $scopeConfig
-+     * @param StoreManagerInterface $storeManager
-+     * @param ThemeProviderInterface $themeProvider
-+     */
-+    public function __construct(
-+        ScopeConfigInterface $scopeConfig,
-+        StoreManagerInterface $storeManager,
-+        ThemeProviderInterface $themeProvider
-+    ) {
-+        $this->scopeConfig = $scopeConfig;
-+        $this->storeManager = $storeManager;
-+        $this->themeProvider = $themeProvider;
-+    }
-+
-+    /**
-+     * Get theme model
-+     *
-+     * @return array
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    public function getThemeData(): array
-+    {
-+        $themeId = $this->scopeConfig->getValue(
-+            \Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID,
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            $this->storeManager->getStore()->getId()
-+        );
-+
-+        /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
-+        $theme = $this->themeProvider->getThemeById($themeId);
-+
-+        $data = $theme->getData();
-+        $data['themeModel'] = $theme;
-+
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php
-index 2c73d7a0791..7f1fd719422 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php
-@@ -86,8 +86,12 @@ class Product
-         $collection->load();
- 
-         // Methods that perform extra fetches post-load
--        $collection->addMediaGalleryData();
--        $collection->addOptionsToResult();
-+        if (in_array('media_gallery_entries', $attributes)) {
-+            $collection->addMediaGalleryData();
-+        }
-+        if (in_array('options', $attributes)) {
-+            $collection->addOptionsToResult();
-+        }
- 
-         $searchResult = $this->searchResultsFactory->create();
-         $searchResult->setSearchCriteria($searchCriteria);
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
-index c4da59fd2ce..bc40c664425 100644
---- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
-+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
-@@ -12,7 +12,6 @@ use Magento\Framework\Api\Search\SearchCriteriaInterface;
- use Magento\CatalogGraphQl\Model\Resolver\Products\SearchCriteria\Helper\Filter as FilterHelper;
- use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResult;
- use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResultFactory;
--use Magento\Framework\EntityManager\EntityManager;
- use Magento\Search\Api\SearchInterface;
- 
- /**
-@@ -45,31 +44,42 @@ class Search
-      */
-     private $metadataPool;
- 
-+    /**
-+     * @var \Magento\Search\Model\Search\PageSizeProvider
-+     */
-+    private $pageSizeProvider;
-+
-     /**
-      * @param SearchInterface $search
-      * @param FilterHelper $filterHelper
-      * @param Filter $filterQuery
-      * @param SearchResultFactory $searchResultFactory
-+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
-+     * @param \Magento\Search\Model\Search\PageSizeProvider $pageSize
-      */
-     public function __construct(
-         SearchInterface $search,
-         FilterHelper $filterHelper,
-         Filter $filterQuery,
-         SearchResultFactory $searchResultFactory,
--        \Magento\Framework\EntityManager\MetadataPool $metadataPool
-+        \Magento\Framework\EntityManager\MetadataPool $metadataPool,
-+        \Magento\Search\Model\Search\PageSizeProvider $pageSize
-     ) {
-         $this->search = $search;
-         $this->filterHelper = $filterHelper;
-         $this->filterQuery = $filterQuery;
-         $this->searchResultFactory = $searchResultFactory;
-         $this->metadataPool = $metadataPool;
-+        $this->pageSizeProvider = $pageSize;
-     }
- 
-     /**
-      * Return results of full text catalog search of given term, and will return filtered results if filter is specified
-      *
-      * @param SearchCriteriaInterface $searchCriteria
-+     * @param ResolveInfo $info
-      * @return SearchResult
-+     * @throws \Exception
-      */
-     public function getResult(SearchCriteriaInterface $searchCriteria, ResolveInfo $info) : SearchResult
-     {
-@@ -79,7 +89,8 @@ class Search
-         $realPageSize = $searchCriteria->getPageSize();
-         $realCurrentPage = $searchCriteria->getCurrentPage();
-         // Current page must be set to 0 and page size to max for search to grab all ID's as temporary workaround
--        $searchCriteria->setPageSize(PHP_INT_MAX);
-+        $pageSize = $this->pageSizeProvider->getMaxPageSize();
-+        $searchCriteria->setPageSize($pageSize);
-         $searchCriteria->setCurrentPage(0);
-         $itemsResults = $this->search->search($searchCriteria);
- 
-@@ -133,7 +144,7 @@ class Search
-         $offset = $length * ($searchCriteria->getCurrentPage() - 1);
- 
-         if ($searchCriteria->getPageSize()) {
--            $maxPages = ceil($searchResult->getTotalCount() / $searchCriteria->getPageSize()) - 1;
-+            $maxPages = ceil($searchResult->getTotalCount() / $searchCriteria->getPageSize());
-         } else {
-             $maxPages = 0;
-         }
-diff --git a/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
-new file mode 100644
-index 00000000000..4490cf031e5
---- /dev/null
-+++ b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
-@@ -0,0 +1,78 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogGraphQl\Model\Search\Adapter\Mysql\Query\Builder;
-+
-+use Magento\Framework\DB\Helper\Mysql\Fulltext;
-+use Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface;
-+use Magento\Framework\Search\Adapter\Mysql\Query\Builder\Match as BuilderMatch;
-+use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
-+use Magento\Framework\Search\Request\Query\BoolExpression;
-+use Magento\Search\Helper\Data;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class Match extends BuilderMatch
-+{
-+    /**
-+     * @var Data
-+     */
-+    private $searchHelper;
-+
-+    /**
-+     * @param ResolverInterface $resolver
-+     * @param Fulltext $fulltextHelper
-+     * @param Data $searchHelper
-+     * @param string $fulltextSearchMode
-+     * @param PreprocessorInterface[] $preprocessors
-+     */
-+    public function __construct(
-+        ResolverInterface $resolver,
-+        Fulltext $fulltextHelper,
-+        Data $searchHelper,
-+        $fulltextSearchMode = Fulltext::FULLTEXT_MODE_BOOLEAN,
-+        array $preprocessors = []
-+    ) {
-+        parent::__construct($resolver, $fulltextHelper, $fulltextSearchMode, $preprocessors);
-+        $this->searchHelper = $searchHelper;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function prepareQuery($queryValue, $conditionType)
-+    {
-+        $replaceSymbols = str_split(self::SPECIAL_CHARACTERS, 1);
-+        $queryValue = str_replace($replaceSymbols, ' ', $queryValue);
-+        foreach ($this->preprocessors as $preprocessor) {
-+            $queryValue = $preprocessor->process($queryValue);
-+        }
-+
-+        $stringPrefix = '';
-+        if ($conditionType === BoolExpression::QUERY_CONDITION_MUST) {
-+            $stringPrefix = '+';
-+        } elseif ($conditionType === BoolExpression::QUERY_CONDITION_NOT) {
-+            $stringPrefix = '-';
-+        }
-+
-+        $queryValues = explode(' ', $queryValue);
-+
-+        foreach ($queryValues as $queryKey => $queryValue) {
-+            if (empty($queryValue)) {
-+                unset($queryValues[$queryKey]);
-+            } else {
-+                $stringSuffix = $this->searchHelper->getMinQueryLength() > strlen($queryValue) ? '' : '*';
-+                $queryValues[$queryKey] = $stringPrefix . $queryValue . $stringSuffix;
-+            }
-+        }
-+
-+        $queryValue = implode(' ', $queryValues);
-+
-+        return $queryValue;
-+    }
-+}
-diff --git a/app/code/Magento/CatalogGraphQl/Test/Unit/Model/Resolver/Product/CanonicalUrlTest.php b/app/code/Magento/CatalogGraphQl/Test/Unit/Model/Resolver/Product/CanonicalUrlTest.php
-deleted file mode 100644
-index ae01c67eb52..00000000000
---- a/app/code/Magento/CatalogGraphQl/Test/Unit/Model/Resolver/Product/CanonicalUrlTest.php
-+++ /dev/null
-@@ -1,92 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\CatalogGraphQl\Test\Unit\Model\Resolver\Product;
--
--use Magento\CatalogGraphQl\Model\Resolver\Product\CanonicalUrl;
--use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
--use Magento\Store\Model\StoreManagerInterface;
--use PHPUnit\Framework\TestCase;
--
--class CanonicalUrlTest extends TestCase
--{
--    /**
--     * @var ObjectManager
--     */
--    private $objectManager;
--
--    /**
--     * @var CanonicalUrl
--     */
--    private $subject;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $mockValueFactory;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $mockStoreManager;
--
--    public function testReturnsNullWhenNoProductAvailable()
--    {
--        $mockField = $this->getMockBuilder(\Magento\Framework\GraphQl\Config\Element\Field::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $mockInfo = $this->getMockBuilder(\Magento\Framework\GraphQl\Schema\Type\ResolveInfo::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->mockValueFactory->method('create')->with(
--            $this->callback(
--                function ($param) {
--                    return $param() === null;
--                }
--            )
--        );
--
--        $this->subject->resolve($mockField, '', $mockInfo, [], []);
--    }
--
--    protected function setUp()
--    {
--        parent::setUp();
--        $this->objectManager = new ObjectManager($this);
--        $this->mockStoreManager = $this->getMockBuilder(StoreManagerInterface::class)->getMock();
--        $this->mockValueFactory = $this->getMockBuilder(ValueFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->mockValueFactory->method('create')->willReturn(
--            $this->objectManager->getObject(
--                Value::class,
--                ['callback' => function () {
--                    return '';
--                }]
--            )
--        );
--
--        $mockProductUrlPathGenerator = $this->getMockBuilder(ProductUrlPathGenerator::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $mockProductUrlPathGenerator->method('getUrlPathWithSuffix')->willReturn('product_url.html');
--
--        $this->subject = $this->objectManager->getObject(
--            CanonicalUrl::class,
--            [
--                'valueFactory' => $this->mockValueFactory,
--                'storeManager' => $this->mockStoreManager,
--                'productUrlPathGenerator' => $mockProductUrlPathGenerator
--            ]
--        );
--    }
--}
-diff --git a/app/code/Magento/CatalogGraphQl/composer.json b/app/code/Magento/CatalogGraphQl/composer.json
-index eb86ac63441..950b496263f 100644
---- a/app/code/Magento/CatalogGraphQl/composer.json
-+++ b/app/code/Magento/CatalogGraphQl/composer.json
-@@ -14,6 +14,7 @@
-     },
-     "suggest": {
-         "magento/module-graph-ql": "*",
-+        "magento/module-graph-ql-cache": "*",
-         "magento/module-store-graph-ql": "*"
-     },
-     "license": [
-diff --git a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
-index 68a292ede6b..2292004f3cf 100644
---- a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
-+++ b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
-@@ -6,6 +6,7 @@
-  */
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <preference for="Magento\Catalog\Model\Product\Option\Type\Date" type="Magento\CatalogGraphQl\Model\Product\Option\DateType" />
-     <type name="Magento\CatalogGraphQl\Model\ProductInterfaceTypeResolverComposite">
-         <arguments>
-             <argument name="productTypeNameResolvers" xsi:type="array">
-@@ -37,11 +38,15 @@
-                 </item>
-                 <item name="customizable_options" xsi:type="array">
-                     <item name="field" xsi:type="string">CustomizableFieldOption</item>
-+                    <item name="date" xsi:type="string">CustomizableDateOption</item>
-                     <item name="date_time" xsi:type="string">CustomizableDateOption</item>
-+                    <item name="time" xsi:type="string">CustomizableDateOption</item>
-                     <item name="file" xsi:type="string">CustomizableFileOption</item>
-                     <item name="area" xsi:type="string">CustomizableAreaOption</item>
-                     <item name="drop_down" xsi:type="string">CustomizableDropDownOption</item>
-+                    <item name="multiple" xsi:type="string">CustomizableMultipleOption</item>
-                     <item name="radio" xsi:type="string">CustomizableRadioOption</item>
-+                    <item name="checkbox" xsi:type="string">CustomizableCheckboxOption</item>
-                 </item>
-             </argument>
-         </arguments>
-@@ -73,4 +78,21 @@
-             </argument>
-         </arguments>
-     </virtualType>
-+    <preference for="Magento\Framework\Search\Adapter\Mysql\Query\Builder\Match"
-+                type="Magento\CatalogGraphQl\Model\Search\Adapter\Mysql\Query\Builder\Match" />
-+    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
-+        <arguments>
-+            <argument name="extendedConfigData" xsi:type="array">
-+                <item name="product_url_suffix" xsi:type="string">catalog/seo/product_url_suffix</item>
-+                <item name="category_url_suffix" xsi:type="string">catalog/seo/category_url_suffix</item>
-+                <item name="title_separator" xsi:type="string">catalog/seo/title_separator</item>
-+                <item name="list_mode" xsi:type="string">catalog/frontend/list_mode</item>
-+                <item name="grid_per_page_values" xsi:type="string">catalog/frontend/grid_per_page_values</item>
-+                <item name="list_per_page_values" xsi:type="string">catalog/frontend/list_per_page_values</item>
-+                <item name="grid_per_page" xsi:type="string">catalog/frontend/grid_per_page</item>
-+                <item name="list_per_page" xsi:type="string">catalog/frontend/list_per_page</item>
-+                <item name="catalog_default_sort_by" xsi:type="string">catalog/frontend/default_sort_by</item>
-+            </argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
-index 9235ec271a3..f4d0990b170 100644
---- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
-+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
-@@ -9,195 +9,22 @@ type Query {
-         currentPage: Int = 1 @doc(description: "Specifies which page of results to return. The default value is 1."),
-         sort: ProductSortInput @doc(description: "Specifies which attribute to sort on, and whether to return the results in ascending or descending order.")
-      ): Products
--     @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Products") @doc(description: "The products query searches for products that match the criteria specified in the search and filter attributes")
-+     @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Products") @doc(description: "The products query searches for products that match the criteria specified in the search and filter attributes.") @cache(cacheTag: "cat_p", cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Identity")
-     category (
--        id: Int @doc(description: "Id of the category")
-+        id: Int @doc(description: "Id of the category.")
-     ): CategoryTree
--    @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree")
--}
--
--enum CurrencyEnum @doc(description: "The list of available currency codes") {
--    AFN
--    ALL
--    AZN
--    DZD
--    AOA
--    ARS
--    AMD
--    AWG
--    AUD
--    BSD
--    BHD
--    BDT
--    BBD
--    BYR
--    BZD
--    BMD
--    BTN
--    BOB
--    BAM
--    BWP
--    BRL
--    GBP
--    BND
--    BGN
--    BUK
--    BIF
--    KHR
--    CAD
--    CVE
--    CZK
--    KYD
--    GQE
--    CLP
--    CNY
--    COP
--    KMF
--    CDF
--    CRC
--    HRK
--    CUP
--    DKK
--    DJF
--    DOP
--    XCD
--    EGP
--    SVC
--    ERN
--    EEK
--    ETB
--    EUR
--    FKP
--    FJD
--    GMD
--    GEK
--    GEL
--    GHS
--    GIP
--    GTQ
--    GNF
--    GYD
--    HTG
--    HNL
--    HKD
--    HUF
--    ISK
--    INR
--    IDR
--    IRR
--    IQD
--    ILS
--    JMD
--    JPY
--    JOD
--    KZT
--    KES
--    KWD
--    KGS
--    LAK
--    LVL
--    LBP
--    LSL
--    LRD
--    LYD
--    LTL
--    MOP
--    MKD
--    MGA
--    MWK
--    MYR
--    MVR
--    LSM
--    MRO
--    MUR
--    MXN
--    MDL
--    MNT
--    MAD
--    MZN
--    MMK
--    NAD
--    NPR
--    ANG
--    YTL
--    NZD
--    NIC
--    NGN
--    KPW
--    NOK
--    OMR
--    PKR
--    PAB
--    PGK
--    PYG
--    PEN
--    PHP
--    PLN
--    QAR
--    RHD
--    RON
--    RUB
--    RWF
--    SHP
--    STD
--    SAR
--    RSD
--    SCR
--    SLL
--    SGD
--    SKK
--    SBD
--    SOS
--    ZAR
--    KRW
--    LKR
--    SDG
--    SRD
--    SZL
--    SEK
--    CHF
--    SYP
--    TWD
--    TJS
--    TZS
--    THB
--    TOP
--    TTD
--    TND
--    TMM
--    USD
--    UGX
--    UAH
--    AED
--    UYU
--    UZS
--    VUV
--    VEB
--    VEF
--    VND
--    CHE
--    CHW
--    XOF
--    WST
--    YER
--    ZMK
--    ZWD
--    TRY
--    AZM
--    ROL
--    TRL
--    XPF
-+    @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree") @doc(description: "The category query searches for categories that match the criteria specified in the search and filter attributes.") @cache(cacheTag: "cat_c", cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoryTreeIdentity")
- }
- 
- type Price @doc(description: "The Price object defines the price of a product as well as any tax-related adjustments.") {
--    amount: Money @doc(description: "The price of a product plus a three-letter currency code")
--    adjustments: [PriceAdjustment] @doc(description: "An array that provides information about tax, weee, or weee_tax adjustments")
-+    amount: Money @doc(description: "The price of a product plus a three-letter currency code.")
-+    adjustments: [PriceAdjustment] @doc(description: "An array that provides information about tax, weee, or weee_tax adjustments.")
- }
- 
- type PriceAdjustment @doc(description: "The PricedAdjustment object defines the amount of money to apply as an adjustment, the type of adjustment to apply, and whether the item is included or excluded from the adjustment.") {
--    amount: Money @doc(description: "The amount of the price adjustment and its currency code")
--    code: PriceAdjustmentCodesEnum @doc(description: "Indicates whether the adjustment involves tax, weee, or weee_tax")
--    description: PriceAdjustmentDescriptionEnum @doc(description: "Indicates whether the entity described by the code attribute is included or excluded from the adjustment")
-+    amount: Money @doc(description: "The amount of the price adjustment and its currency code.")
-+    code: PriceAdjustmentCodesEnum @doc(description: "Indicates whether the adjustment involves tax, weee, or weee_tax.")
-+    description: PriceAdjustmentDescriptionEnum @doc(description: "Indicates whether the entity described by the code attribute is included or excluded from the adjustment.")
- }
- 
- enum PriceAdjustmentCodesEnum @doc(description: "Note: This enumeration contains values defined in modules other than the Catalog module.") {
-@@ -214,11 +41,6 @@ enum PriceTypeEnum @doc(description: "This enumeration the price type.") {
-     DYNAMIC
- }
- 
--type Money @doc(description: "A Money object defines a monetary value, including a numeric value and a currency code.") {
--    value: Float @doc(description: "A number expressing a monetary value")
--    currency: CurrencyEnum @doc(description: "A three-letter currency code, such as USD or EUR")
--}
--
- type ProductPrices @doc(description: "The ProductPrices object contains the regular price of an item, as well as its minimum and maximum prices. Only composite products, which include bundle, configurable, and grouped products, can contain a minimum and maximum price.") {
-     minimalPrice: Price @doc(description: "The lowest possible final price for all the options defined within a composite product. If you are specifying a price range, this would be the from value.")
-     maximalPrice: Price @doc(description: "The highest possible final price for all the options defined within a composite product. If you are specifying a price range, this would be the to value.")
-@@ -229,313 +51,341 @@ type ProductLinks implements ProductLinksInterface @doc(description: "ProductLin
- }
- 
- interface ProductLinksInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductLinkTypeResolverComposite") @doc(description:"ProductLinks contains information about linked products, including the link type and product type of each item.") {
--    sku: String @doc(description: "The identifier of the linked product")
--    link_type: String @doc(description: "One of related, associated, upsell, or crosssell")
--    linked_product_sku: String @doc(description: "The SKU of the linked product")
--    linked_product_type: String @doc(description: "The type of linked product (simple, virtual, bundle, downloadable, grouped, configurable)")
--    position: Int @doc(description: "The position within the list of product links")
-+    sku: String @doc(description: "The identifier of the linked product.")
-+    link_type: String @doc(description: "One of related, associated, upsell, or crosssell.")
-+    linked_product_sku: String @doc(description: "The SKU of the linked product.")
-+    linked_product_type: String @doc(description: "The type of linked product (simple, virtual, bundle, downloadable, grouped, configurable).")
-+    position: Int @doc(description: "The position within the list of product links.")
- }
- 
- type ProductTierPrices @doc(description: "The ProductTierPrices object defines a tier price, which is a quantity discount offered to a specific customer group.") {
--    customer_group_id: String @doc(description: "The ID of the customer group")
--    qty: Float @doc(description: "The number of items that must be purchased to qualify for tier pricing")
--    value: Float @doc(description: "The price of the fixed price item")
--    percentage_value: Float @doc(description: "The percentage discount of the item")
--    website_id: Float @doc(description: "The ID assigned to the website")
-+    customer_group_id: String @doc(description: "The ID of the customer group.")
-+    qty: Float @doc(description: "The number of items that must be purchased to qualify for tier pricing.")
-+    value: Float @doc(description: "The price of the fixed price item.")
-+    percentage_value: Float @doc(description: "The percentage discount of the item.")
-+    website_id: Float @doc(description: "The ID assigned to the website.")
- }
- 
- interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") @doc(description: "The ProductInterface contains attributes that are common to all types of products. Note that descriptions may not be available for custom and EAV attributes.") {
--    id: Int @doc(description: "The ID number assigned to the product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\EntityIdToId")
-+    id: Int @doc(description: "The ID number assigned to the product.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\EntityIdToId")
-     name: String @doc(description: "The product name. Customers use this name to identify the product.")
--    sku: String @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer")
--    description: String @doc(description: "Detailed information about the product. The value can include simple HTML tags.")
--    short_description: String @doc(description: "A short description of the product. Its use depends on the theme.")
--    special_price: Float @doc(description: "The discounted price of the product")
--    special_from_date: String @doc(description: "The beginning date that a product has a special price")
--    special_to_date: String @doc(description: "The end date that a product has a special price")
--    attribute_set_id: Int @doc(description: "The attribute set assigned to the product")
--    meta_title: String @doc(description: "A string that is displayed in the title bar and tab of the browser and in search results lists")
--    meta_keyword: String @doc(description: "A comma-separated list of keywords that are visible only to search engines")
--    meta_description: String @doc(description: "A brief overview of the product for search results listings, maximum 255 characters")
--    image: String @doc(description: "The relative path to the main image on the product page")
--    small_image: String @doc(description: "The relative path to the small image, which is used on catalog pages")
--    thumbnail: String @doc(description: "The relative path to the product's thumbnail image")
--    new_from_date: String @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")
--    new_to_date: String @doc(description: "The end date for new product listings") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")
--    tier_price: Float @doc(description: "The price when tier pricing is in effect and the items purchased threshold has been reached")
--    options_container: String @doc(description: "If the product has multiple options, determines where they appear on the product page")
--    image_label: String @doc(description: "The label assigned to a product image")
--    small_image_label: String @doc(description: "The label assigned to a product's small image")
--    thumbnail_label: String @doc(description: "The label assigned to a product's thumbnail image")
--    created_at: String @doc(description: "Timestamp indicating when the product was created")
--    updated_at: String @doc(description: "Timestamp indicating when the product was updated")
--    country_of_manufacture: String @doc(description: "The product's country of origin")
--    type_id: String @doc(description: "One of simple, virtual, bundle, downloadable, grouped, or configurable")
--    websites: [Website] @doc(description: "An array of websites in which the product is available") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Websites")
--    product_links: [ProductLinksInterface] @doc(description: "An array of ProductLinks objects") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductLinks")
--    media_gallery_entries: [MediaGalleryEntry] @doc(description: "An array of MediaGalleryEntry objects") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\MediaGalleryEntries")
--    tier_prices: [ProductTierPrices] @doc(description: "An array of ProductTierPrices objects") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\TierPrices")
--    price: ProductPrices @doc(description: "A ProductPrices object, indicating the price of an item") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Price")
--    gift_message_available: String @doc(description: "Indicates whether a gift message is available")
--    manufacturer: Int @doc(description: "A number representing the product's manufacturer")
--    categories: [CategoryInterface] @doc(description: "The categories assigned to a product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Categories")
--    canonical_url: String @doc(description: "Canonical URL") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CanonicalUrl")
--}
--
--interface PhysicalProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") @doc(description: "PhysicalProductInterface contains attributes specific to tangible products") {
--    weight: Float @doc(description: "The weight of the item, in units defined by the store")
--}
--
--type CustomizableAreaOption implements CustomizableOptionInterface @doc(description: "CustomizableAreaOption contains information about a text area that is defined as part of a customizable option") {
--    value: CustomizableAreaValue @doc(description: "An object that defines a text area")
--    product_sku: String @doc(description: "The Stock Keeping Unit of the base product")
--}
--
--type CustomizableAreaValue @doc(description: "CustomizableAreaValue defines the price and sku of a product whose page contains a customized text area") {
--    price: Float @doc(description: "The price assigned to this option")
--    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
--    sku: String @doc(description: "The Stock Keeping Unit for this option")
--    max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option")
--}
--
--type CategoryTree implements CategoryInterface @doc(description: "Category Tree implementation") {
--    children: [CategoryTree] @doc(description: "Child categories tree") @resolve(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree")
--}
--
--type CustomizableDateOption implements CustomizableOptionInterface @doc(description: "CustomizableDateOption contains information about a date picker that is defined as part of a customizable option") {
-+    sku: String @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer.")
-+    description: ComplexTextValue @doc(description: "Detailed information about the product. The value can include simple HTML tags.") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductComplexTextAttribute")
-+    short_description: ComplexTextValue @doc(description: "A short description of the product. Its use depends on the theme.") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductComplexTextAttribute")
-+    special_price: Float @doc(description: "The discounted price of the product.")
-+    special_from_date: String @doc(description: "The beginning date that a product has a special price.")
-+    special_to_date: String @doc(description: "The end date that a product has a special price.")
-+    attribute_set_id: Int @doc(description: "The attribute set assigned to the product.")
-+    meta_title: String @doc(description: "A string that is displayed in the title bar and tab of the browser and in search results lists.")
-+    meta_keyword: String @doc(description: "A comma-separated list of keywords that are visible only to search engines.")
-+    meta_description: String @doc(description: "A brief overview of the product for search results listings, maximum 255 characters.")
-+    image: ProductImage @doc(description: "The relative path to the main image on the product page.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage")
-+    small_image: ProductImage @doc(description: "The relative path to the small image, which is used on catalog pages.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage")
-+    thumbnail: ProductImage @doc(description: "The relative path to the product's thumbnail image.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage")
-+    new_from_date: String @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")
-+    new_to_date: String @doc(description: "The end date for new product listings.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")
-+    tier_price: Float @doc(description: "The price when tier pricing is in effect and the items purchased threshold has been reached.")
-+    options_container: String @doc(description: "If the product has multiple options, determines where they appear on the product page.")
-+    created_at: String @doc(description: "Timestamp indicating when the product was created.")
-+    updated_at: String @doc(description: "Timestamp indicating when the product was updated.")
-+    country_of_manufacture: String @doc(description: "The product's country of origin.")
-+    type_id: String @doc(description: "One of simple, virtual, bundle, downloadable, grouped, or configurable.")
-+    websites: [Website] @doc(description: "An array of websites in which the product is available.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Websites")
-+    product_links: [ProductLinksInterface] @doc(description: "An array of ProductLinks objects.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductLinks")
-+    media_gallery_entries: [MediaGalleryEntry] @doc(description: "An array of MediaGalleryEntry objects.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\MediaGalleryEntries")
-+    tier_prices: [ProductTierPrices] @doc(description: "An array of ProductTierPrices objects.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\TierPrices")
-+    price: ProductPrices @doc(description: "A ProductPrices object, indicating the price of an item.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Price")
-+    gift_message_available: String @doc(description: "Indicates whether a gift message is available.")
-+    manufacturer: Int @doc(description: "A number representing the product's manufacturer.")
-+    categories: [CategoryInterface] @doc(description: "The categories assigned to a product.") @cache(cacheTag: "cat_c", cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoriesIdentity") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Categories")
-+    canonical_url: String @doc(description: "Canonical URL.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CanonicalUrl")
-+}
-+
-+interface PhysicalProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") @doc(description: "PhysicalProductInterface contains attributes specific to tangible products.") {
-+    weight: Float @doc(description: "The weight of the item, in units defined by the store.")
-+}
-+
-+type CustomizableAreaOption implements CustomizableOptionInterface @doc(description: "CustomizableAreaOption contains information about a text area that is defined as part of a customizable option.") {
-+    value: CustomizableAreaValue @doc(description: "An object that defines a text area.")
-+    product_sku: String @doc(description: "The Stock Keeping Unit of the base product.")
-+}
-+
-+type CustomizableAreaValue @doc(description: "CustomizableAreaValue defines the price and sku of a product whose page contains a customized text area.") {
-+    price: Float @doc(description: "The price assigned to this option.")
-+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
-+    sku: String @doc(description: "The Stock Keeping Unit for this option.")
-+    max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
-+}
-+
-+type CategoryTree implements CategoryInterface @doc(description: "Category Tree implementation.") {
-+    children: [CategoryTree] @doc(description: "Child categories tree.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree")
-+}
-+
-+type CustomizableDateOption implements CustomizableOptionInterface @doc(description: "CustomizableDateOption contains information about a date picker that is defined as part of a customizable option.") {
-     value: CustomizableDateValue @doc(description: "An object that defines a date field in a customizable option.")
--    product_sku: String @doc(description: "The Stock Keeping Unit of the base product")
-+    product_sku: String @doc(description: "The Stock Keeping Unit of the base product.")
-+}
-+
-+type CustomizableDateValue @doc(description: "CustomizableDateValue defines the price and sku of a product whose page contains a customized date picker.") {
-+    price: Float @doc(description: "The price assigned to this option.")
-+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
-+    sku: String @doc(description: "The Stock Keeping Unit for this option.")
-+}
-+
-+type CustomizableDropDownOption implements CustomizableOptionInterface @doc(description: "CustomizableDropDownOption contains information about a drop down menu that is defined as part of a customizable option.") {
-+    value: [CustomizableDropDownValue] @doc(description: "An array that defines the set of options for a drop down menu.")
-+}
-+
-+type CustomizableDropDownValue @doc(description: "CustomizableDropDownValue defines the price and sku of a product whose page contains a customized drop down menu.") {
-+    option_type_id: Int @doc(description: "The ID assigned to the value.")
-+    price: Float @doc(description: "The price assigned to this option.")
-+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
-+    sku: String @doc(description: "The Stock Keeping Unit for this option.")
-+    title: String @doc(description: "The display name for this option.")
-+    sort_order: Int @doc(description: "The order in which the option is displayed.")
- }
- 
--type CustomizableDateValue @doc(description: "CustomizableDateValue defines the price and sku of a product whose page contains a customized date picker") {
--    price: Float @doc(description: "The price assigned to this option")
--    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
--    sku: String @doc(description: "The Stock Keeping Unit for this option")
-+type CustomizableMultipleOption implements CustomizableOptionInterface @doc(description: "CustomizableMultipleOption contains information about a multiselect that is defined as part of a customizable option.") {
-+    value: [CustomizableMultipleValue] @doc(description: "An array that defines the set of options for a multiselect.")
- }
- 
--type CustomizableDropDownOption implements CustomizableOptionInterface @doc(description: "CustomizableDropDownOption contains information about a drop down menu that is defined as part of a customizable option") {
--    value: [CustomizableDropDownValue] @doc(description: "An array that defines the set of options for a drop down menu")
-+type CustomizableMultipleValue @doc(description: "CustomizableMultipleValue defines the price and sku of a product whose page contains a customized multiselect.") {
-+    option_type_id: Int @doc(description: "The ID assigned to the value.")
-+    price: Float @doc(description: "The price assigned to this option.")
-+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
-+    sku: String @doc(description: "The Stock Keeping Unit for this option.")
-+    title: String @doc(description: "The display name for this option.")
-+    sort_order: Int @doc(description: "The order in which the option is displayed.")
- }
- 
--type CustomizableDropDownValue @doc(description: "CustomizableDropDownValue defines the price and sku of a product whose page contains a customized drop down menu") {
--    option_type_id: Int @doc(description: "The ID assigned to the value")
--    price: Float @doc(description: "The price assigned to this option")
--    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
--    sku: String @doc(description: "The Stock Keeping Unit for this option")
--    title: String @doc(description: "The display name for this option")
--    sort_order: Int @doc(description: "The order in which the option is displayed")
-+type CustomizableFieldOption implements CustomizableOptionInterface @doc(description: "CustomizableFieldOption contains information about a text field that is defined as part of a customizable option.") {
-+    value: CustomizableFieldValue @doc(description: "An object that defines a text field.")
-+    product_sku: String @doc(description: "The Stock Keeping Unit of the base product.")
- }
- 
--type CustomizableFieldOption implements CustomizableOptionInterface @doc(description: "CustomizableFieldOption contains information about a text field that is defined as part of a customizable option") {
--    value: CustomizableFieldValue @doc(description: "An object that defines a text field")
--    product_sku: String @doc(description: "The Stock Keeping Unit of the base product")
-+type CustomizableFieldValue @doc(description: "CustomizableFieldValue defines the price and sku of a product whose page contains a customized text field.") {
-+    price: Float @doc(description: "The price of the custom value.")
-+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
-+    sku: String @doc(description: "The Stock Keeping Unit for this option.")
-+    max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
- }
- 
--type CustomizableFieldValue @doc(description: "CustomizableFieldValue defines the price and sku of a product whose page contains a customized text field") {
--    price: Float @doc(description: "The price of the custom value")
--    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
--    sku: String @doc(description: "The Stock Keeping Unit for this option")
--    max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option")
-+type CustomizableFileOption implements CustomizableOptionInterface @doc(description: "CustomizableFileOption contains information about a file picker that is defined as part of a customizable option.") {
-+    value: CustomizableFileValue @doc(description: "An object that defines a file value.")
-+    product_sku: String @doc(description: "The Stock Keeping Unit of the base product.")
- }
- 
--type CustomizableFileOption implements CustomizableOptionInterface @doc(description: "CustomizableFileOption contains information about a file picker that is defined as part of a customizable option") {
--    value: CustomizableFileValue @doc(description: "An object that defines a file value")
--    product_sku: String @doc(description: "The Stock Keeping Unit of the base product")
-+type CustomizableFileValue @doc(description: "CustomizableFileValue defines the price and sku of a product whose page contains a customized file picker.") {
-+    price: Float @doc(description: "The price assigned to this option.")
-+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
-+    sku: String @doc(description: "The Stock Keeping Unit for this option.")
-+    file_extension: String @doc(description: "The file extension to accept.")
-+    image_size_x: Int @doc(description: "The maximum width of an image.")
-+    image_size_y: Int @doc(description: "The maximum height of an image.")
- }
- 
--type CustomizableFileValue @doc(description: "CustomizableFileValue defines the price and sku of a product whose page contains a customized file picker") {
--    price: Float @doc(description: "The price assigned to this option")
--    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
--    sku: String @doc(description: "The Stock Keeping Unit for this option")
--    file_extension: String @doc(description: "The file extension to accept")
--    image_size_x: Int @doc(description: "The maximum width of an image")
--    image_size_y: Int @doc(description: "The maximum height of an image")
-+type ProductImage @doc(description: "Product image information. Contains image relative path, URL and label.") {
-+    url: String @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage\\Url")
-+    label: String @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage\\Label")
- }
- 
- interface CustomizableOptionInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\CustomizableOptionTypeResolver") @doc(description: "The CustomizableOptionInterface contains basic information about a customizable option. It can be implemented by several types of configurable options.") {
--    title: String @doc(description: "The display name for this option")
--    required: Boolean @doc(description: "Indicates whether the option is required")
--    sort_order: Int @doc(description: "The order in which the option is displayed")
-+    title: String @doc(description: "The display name for this option.")
-+    required: Boolean @doc(description: "Indicates whether the option is required.")
-+    sort_order: Int @doc(description: "The order in which the option is displayed.")
-+    option_id: Int @doc(description: "Option ID.")
- }
- 
- interface CustomizableProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") @doc(description: "CustomizableProductInterface contains information about customizable product options.") {
--    options: [CustomizableOptionInterface] @doc(description: "An array of options for a customizable product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Options")
--}
--
--interface CategoryInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\CategoryInterfaceTypeResolver") @doc(description: "CategoryInterface contains the full set of attributes that can be returned in a category search") {
--    id: Int @doc(description: "An ID that uniquely identifies the category")
--    description: String @doc(description: "An optional description of the category")
--    name: String @doc(description: "The display name of the category")
--    path: String @doc(description: "Category Path")
--    path_in_store: String @doc(description: "Category path in store")
--    url_key: String @doc(description: "The url key assigned to the category")
--    url_path: String @doc(description: "The url path assigned to the category")
--    position: Int @doc(description: "The position of the category relative to other categories at the same level in tree")
--    level: Int @doc(description: "Indicates the depth of the category within the tree")
--    created_at: String @doc(description: "Timestamp indicating when the category was created")
--    updated_at: String @doc(description: "Timestamp indicating when the category was updated")
--    product_count: Int @doc(description: "The number of products in the category")
--    default_sort_by: String @doc(description: "The attribute to use for sorting")
-+    options: [CustomizableOptionInterface] @doc(description: "An array of options for a customizable product.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Options")
-+}
-+
-+interface CategoryInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\CategoryInterfaceTypeResolver") @doc(description: "CategoryInterface contains the full set of attributes that can be returned in a category search.") {
-+    id: Int @doc(description: "An ID that uniquely identifies the category.")
-+    description: String @doc(description: "An optional description of the category.") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoryHtmlAttribute")
-+    name: String @doc(description: "The display name of the category.")
-+    path: String @doc(description: "Category Path.")
-+    path_in_store: String @doc(description: "Category path in store.")
-+    url_key: String @doc(description: "The url key assigned to the category.")
-+    url_path: String @doc(description: "The url path assigned to the category.")
-+    position: Int @doc(description: "The position of the category relative to other categories at the same level in tree.")
-+    level: Int @doc(description: "Indicates the depth of the category within the tree.")
-+    created_at: String @doc(description: "Timestamp indicating when the category was created.")
-+    updated_at: String @doc(description: "Timestamp indicating when the category was updated.")
-+    product_count: Int @doc(description: "The number of products in the category.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\ProductsCount")
-+    default_sort_by: String @doc(description: "The attribute to use for sorting.")
-     products(
-         pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once. This attribute is optional."),
-         currentPage: Int = 1 @doc(description: "Specifies which page of results to return. The default value is 1."),
-         sort: ProductSortInput @doc(description: "Specifies which attribute to sort on, and whether to return the results in ascending or descending order.")
--    ): CategoryProducts @doc(description: "The list of products assigned to the category") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Products")
--    breadcrumbs: [Breadcrumb] @doc(description: "Breadcrumbs, parent categories info") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Breadcrumbs")
-+    ): CategoryProducts @doc(description: "The list of products assigned to the category.") @cache(cacheTag: "cat_p", cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Identity") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Products")
-+    breadcrumbs: [Breadcrumb] @doc(description: "Breadcrumbs, parent categories info.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Breadcrumbs")
-+}
-+
-+type Breadcrumb @doc(description: "Breadcrumb item."){
-+    category_id: Int @doc(description: "Category ID.")
-+    category_name: String @doc(description: "Category name.")
-+    category_level: Int @doc(description: "Category level.")
-+    category_url_key: String @doc(description: "Category URL key.")
- }
- 
--type Breadcrumb @doc(description: "Breadcrumb item"){
--    category_id: Int @doc(description: "Category ID")
--    category_name: String @doc(description: "Category name")
--    category_level: Int @doc(description: "Category level")
--    category_url_key: String @doc(description: "Category URL key")
-+type CustomizableRadioOption implements CustomizableOptionInterface @doc(description: "CustomizableRadioOption contains information about a set of radio buttons that are defined as part of a customizable option.") {
-+    value: [CustomizableRadioValue] @doc(description: "An array that defines a set of radio buttons.")
- }
- 
--type CustomizableRadioOption implements CustomizableOptionInterface @doc(description: "CustomizableRadioOption contains information about a set of radio buttons that are defined as part of a customizable option") {
--    value: [CustomizableRadioValue] @doc(description: "An array that defines a set of radio buttons")
-+type CustomizableRadioValue  @doc(description: "CustomizableRadioValue defines the price and sku of a product whose page contains a customized set of radio buttons.") {
-+    option_type_id: Int @doc(description: "The ID assigned to the value.")
-+    price: Float @doc(description: "The price assigned to this option.")
-+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
-+    sku: String @doc(description: "The Stock Keeping Unit for this option.")
-+    title: String @doc(description: "The display name for this option.")
-+    sort_order: Int @doc(description: "The order in which the radio button is displayed.")
- }
- 
--type CustomizableRadioValue  @doc(description: "CustomizableRadioValue defines the price and sku of a product whose page contains a customized set of radio buttons") {
--    option_type_id: Int @doc(description: "The ID assigned to the value")
--    price: Float @doc(description: "The price assigned to this option")
--    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
--    sku: String @doc(description: "The Stock Keeping Unit for this option")
--    title: String @doc(description: "The display name for this option")
--    sort_order: Int @doc(description: "The order in which the radio button is displayed")
-+type CustomizableCheckboxOption implements CustomizableOptionInterface @doc(description: "CustomizableCheckbbixOption contains information about a set of checkbox values that are defined as part of a customizable option.") {
-+    value: [CustomizableCheckboxValue] @doc(description: "An array that defines a set of checkbox values.")
- }
- 
--type VirtualProduct implements ProductInterface, CustomizableProductInterface @doc(description: "A virtual product is non-tangible product that does not require shipping and is not kept in inventory") {
-+type CustomizableCheckboxValue  @doc(description: "CustomizableCheckboxValue defines the price and sku of a product whose page contains a customized set of checkbox values.") {
-+    option_type_id: Int @doc(description: "The ID assigned to the value.")
-+    price: Float @doc(description: "The price assigned to this option.")
-+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
-+    sku: String @doc(description: "The Stock Keeping Unit for this option.")
-+    title: String @doc(description: "The display name for this option.")
-+    sort_order: Int @doc(description: "The order in which the checkbox value is displayed.")
- }
- 
--type SimpleProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "A simple product is tangible and are usually sold as single units or in fixed quantities")
-+type VirtualProduct implements ProductInterface, CustomizableProductInterface @doc(description: "A virtual product is non-tangible product that does not require shipping and is not kept in inventory.") {
-+}
-+
-+type SimpleProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "A simple product is tangible and are usually sold as single units or in fixed quantities.")
- {
- }
- 
--type Products @doc(description: "The Products object is the top-level object returned in a product search") {
--    items: [ProductInterface] @doc(description: "An array of products that match the specified search criteria")
--    page_info: SearchResultPageInfo @doc(description: "An object that includes the page_info and currentPage values specified in the query")
--    total_count: Int @doc(description: "The number of products returned")
--    filters: [LayerFilter] @doc(description: "Layered navigation filters array")
--    sort_fields: SortFields @doc(description: "An object that includes the default sort field and all available sort fields") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\SortFields")
-+type Products @doc(description: "The Products object is the top-level object returned in a product search.") {
-+    items: [ProductInterface] @doc(description: "An array of products that match the specified search criteria.")
-+    page_info: SearchResultPageInfo @doc(description: "An object that includes the page_info and currentPage values specified in the query.")
-+    total_count: Int @doc(description: "The number of products returned.")
-+    filters: [LayerFilter] @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\LayerFilters") @doc(description: "Layered navigation filters array.")
-+    sort_fields: SortFields @doc(description: "An object that includes the default sort field and all available sort fields.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\SortFields")
- }
- 
--type CategoryProducts @doc(description: "The category products object returned in the Category query") {
--    items: [ProductInterface] @doc(description: "An array of products that are assigned to the category")
--    page_info: SearchResultPageInfo @doc(description: "An object that includes the page_info and currentPage values specified in the query")
--    total_count: Int @doc(description: "The number of products returned")
-+type CategoryProducts @doc(description: "The category products object returned in the Category query.") {
-+    items: [ProductInterface] @doc(description: "An array of products that are assigned to the category.")
-+    page_info: SearchResultPageInfo @doc(description: "An object that includes the page_info and currentPage values specified in the query.")
-+    total_count: Int @doc(description: "The number of products returned.")
- }
- 
- input ProductFilterInput @doc(description: "ProductFilterInput defines the filters to be used in the search. A filter contains at least one attribute, a comparison operator, and the value that is being searched for.") {
-     name: FilterTypeInput @doc(description: "The product name. Customers use this name to identify the product.")
--    sku: FilterTypeInput @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer")
-+    sku: FilterTypeInput @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer.")
-     description: FilterTypeInput @doc(description: "Detailed information about the product. The value can include simple HTML tags.")
-     short_description: FilterTypeInput @doc(description: "A short description of the product. Its use depends on the theme.")
--    price: FilterTypeInput @doc(description: "The price of an item")
--    special_price: FilterTypeInput @doc(description: "The discounted price of the product")
--    special_from_date: FilterTypeInput @doc(description: "The beginning date that a product has a special price")
--    special_to_date: FilterTypeInput @doc(description: "The end date that a product has a special price")
--    weight: FilterTypeInput @doc(description: "The weight of the item, in units defined by the store")
--    manufacturer: FilterTypeInput @doc(description: "A number representing the product's manufacturer")
--    meta_title: FilterTypeInput @doc(description: "A string that is displayed in the title bar and tab of the browser and in search results lists")
--    meta_keyword: FilterTypeInput @doc(description: "A comma-separated list of keywords that are visible only to search engines")
--    meta_description: FilterTypeInput @doc(description: "A brief overview of the product for search results listings, maximum 255 characters")
--    image: FilterTypeInput @doc(description: "The relative path to the main image on the product page")
--    small_image: FilterTypeInput @doc(description: "The relative path to the small image, which is used on catalog pages")
--    thumbnail: FilterTypeInput @doc(description: "The relative path to the product's thumbnail image")
--    tier_price: FilterTypeInput @doc(description: "The price when tier pricing is in effect and the items purchased threshold has been reached")
--    news_from_date: FilterTypeInput @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product")
--    news_to_date: FilterTypeInput @doc(description: "The end date for new product listings")
--    custom_layout_update: FilterTypeInput @doc(description: "XML code that is applied as a layout update to the product page")
-+    price: FilterTypeInput @doc(description: "The price of an item.")
-+    special_price: FilterTypeInput @doc(description: "The discounted price of the product. Do not include the currency code.")
-+    special_from_date: FilterTypeInput @doc(description: "The beginning date that a product has a special price.")
-+    special_to_date: FilterTypeInput @doc(description: "The end date that a product has a special price.")
-+    weight: FilterTypeInput @doc(description: "The weight of the item, in units defined by the store.")
-+    manufacturer: FilterTypeInput @doc(description: "A number representing the product's manufacturer.")
-+    meta_title: FilterTypeInput @doc(description: "A string that is displayed in the title bar and tab of the browser and in search results lists.")
-+    meta_keyword: FilterTypeInput @doc(description: "A comma-separated list of keywords that are visible only to search engines.")
-+    meta_description: FilterTypeInput @doc(description: "A brief overview of the product for search results listings, maximum 255 characters.")
-+    image: FilterTypeInput @doc(description: "The relative path to the main image on the product page.")
-+    small_image: FilterTypeInput @doc(description: "The relative path to the small image, which is used on catalog pages.")
-+    thumbnail: FilterTypeInput @doc(description: "The relative path to the product's thumbnail image.")
-+    tier_price: FilterTypeInput @doc(description: "The price when tier pricing is in effect and the items purchased threshold has been reached.")
-+    news_from_date: FilterTypeInput @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product.")
-+    news_to_date: FilterTypeInput @doc(description: "The end date for new product listings.")
-+    custom_layout_update: FilterTypeInput @doc(description: "XML code that is applied as a layout update to the product page.")
-     min_price: FilterTypeInput @doc(description:"The numeric minimal price of the product. Do not include the currency code.")
-     max_price: FilterTypeInput @doc(description:"The numeric maximal price of the product. Do not include the currency code.")
--    special_price: FilterTypeInput @doc(description:"The numeric special price of the product. Do not include the currency code.")
--    category_id: FilterTypeInput @doc(description: "Category ID the product belongs to")
--    options_container: FilterTypeInput @doc(description: "If the product has multiple options, determines where they appear on the product page")
--    required_options: FilterTypeInput @doc(description: "Indicates whether the product has required options")
--    has_options: FilterTypeInput @doc(description: "Indicates whether additional attributes have been created for the product")
--    image_label: FilterTypeInput @doc(description: "The label assigned to a product image")
--    small_image_label: FilterTypeInput @doc(description: "The label assigned to a product's small image")
--    thumbnail_label: FilterTypeInput @doc(description: "The label assigned to a product's thumbnail image")
--    created_at: FilterTypeInput @doc(description: "Timestamp indicating when the product was created")
--    updated_at: FilterTypeInput @doc(description: "Timestamp indicating when the product was updated")
--    country_of_manufacture: FilterTypeInput @doc(description: "The product's country of origin")
--    custom_layout: FilterTypeInput @doc(description: "The name of a custom layout")
--    gift_message_available: FilterTypeInput @doc(description: "Indicates whether a gift message is available")
--    or: ProductFilterInput @doc(description: "The keyword required to perform a logical OR comparison")
--}
--
--type ProductMediaGalleryEntriesContent @doc(description: "ProductMediaGalleryEntriesContent contains an image in base64 format and basic information about the image") {
--    base64_encoded_data: String @doc(description: "The image in base64 format")
--    type: String @doc(description: "The MIME type of the file, such as image/png")
--    name: String @doc(description: "The file name of the image")
--}
--
--type ProductMediaGalleryEntriesVideoContent @doc(description: "ProductMediaGalleryEntriesVideoContent contains a link to a video file and basic information about the video") {
--    media_type: String @doc(description: "Must be external-video")
--    video_provider: String @doc(description: "Describes the video source")
--    video_url: String @doc(description: "The URL to the video")
--    video_title: String @doc(description: "The title of the video")
--    video_description: String @doc(description: "A description of the video")
--    video_metadata: String @doc(description: "Optional data about the video")
--}
--
--input ProductSortInput  @doc(description: "ProductSortInput specifies the attribute to use for sorting search results and indicates whether the results are sorted in ascending or descending order") {
-+    category_id: FilterTypeInput @doc(description: "Category ID the product belongs to.")
-+    options_container: FilterTypeInput @doc(description: "If the product has multiple options, determines where they appear on the product page.")
-+    required_options: FilterTypeInput @doc(description: "Indicates whether the product has required options.")
-+    has_options: FilterTypeInput @doc(description: "Indicates whether additional attributes have been created for the product.")
-+    image_label: FilterTypeInput @doc(description: "The label assigned to a product image.")
-+    small_image_label: FilterTypeInput @doc(description: "The label assigned to a product's small image.")
-+    thumbnail_label: FilterTypeInput @doc(description: "The label assigned to a product's thumbnail image.")
-+    created_at: FilterTypeInput @doc(description: "Timestamp indicating when the product was created.")
-+    updated_at: FilterTypeInput @doc(description: "Timestamp indicating when the product was updated.")
-+    country_of_manufacture: FilterTypeInput @doc(description: "The product's country of origin.")
-+    custom_layout: FilterTypeInput @doc(description: "The name of a custom layout.")
-+    gift_message_available: FilterTypeInput @doc(description: "Indicates whether a gift message is available.")
-+    or: ProductFilterInput @doc(description: "The keyword required to perform a logical OR comparison.")
-+}
-+
-+type ProductMediaGalleryEntriesContent @doc(description: "ProductMediaGalleryEntriesContent contains an image in base64 format and basic information about the image.") {
-+    base64_encoded_data: String @doc(description: "The image in base64 format.")
-+    type: String @doc(description: "The MIME type of the file, such as image/png.")
-+    name: String @doc(description: "The file name of the image.")
-+}
-+
-+type ProductMediaGalleryEntriesVideoContent @doc(description: "ProductMediaGalleryEntriesVideoContent contains a link to a video file and basic information about the video.") {
-+    media_type: String @doc(description: "Must be external-video.")
-+    video_provider: String @doc(description: "Describes the video source.")
-+    video_url: String @doc(description: "The URL to the video.")
-+    video_title: String @doc(description: "The title of the video.")
-+    video_description: String @doc(description: "A description of the video.")
-+    video_metadata: String @doc(description: "Optional data about the video.")
-+}
-+
-+input ProductSortInput  @doc(description: "ProductSortInput specifies the attribute to use for sorting search results and indicates whether the results are sorted in ascending or descending order.") {
-     name: SortEnum @doc(description: "The product name. Customers use this name to identify the product.")
--    sku: SortEnum @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer")
-+    sku: SortEnum @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer.")
-     description: SortEnum @doc(description: "Detailed information about the product. The value can include simple HTML tags.")
-     short_description: SortEnum @doc(description: "A short description of the product. Its use depends on the theme.")
--    price: SortEnum @doc(description: "The price of the item")
--    special_price: SortEnum @doc(description: "The discounted price of the product")
--    special_from_date: SortEnum @doc(description: "The beginning date that a product has a special price")
--    special_to_date: SortEnum @doc(description: "The end date that a product has a special price")
--    weight: SortEnum @doc(description: "The weight of the item, in units defined by the store")
--    manufacturer: SortEnum @doc(description: "A number representing the product's manufacturer")
--    meta_title: SortEnum @doc(description: "A string that is displayed in the title bar and tab of the browser and in search results lists")
--    meta_keyword: SortEnum @doc(description: "A comma-separated list of keywords that are visible only to search engines")
--    meta_description: SortEnum @doc(description: "A brief overview of the product for search results listings, maximum 255 characters")
--    image: SortEnum @doc(description: "The relative path to the main image on the product page")
--    small_image: SortEnum @doc(description: "The relative path to the small image, which is used on catalog pages")
--    thumbnail: SortEnum @doc(description: "The relative path to the product's thumbnail image")
--    tier_price: SortEnum @doc(description: "The price when tier pricing is in effect and the items purchased threshold has been reached")
--    news_from_date: SortEnum @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product")
--    news_to_date: SortEnum @doc(description: "The end date for new product listings")
--    custom_layout_update: SortEnum @doc(description: "XML code that is applied as a layout update to the product page")
--    options_container: SortEnum @doc(description: "If the product has multiple options, determines where they appear on the product page")
--    required_options: SortEnum @doc(description: "Indicates whether the product has required options")
--    has_options: SortEnum @doc(description: "Indicates whether additional attributes have been created for the product")
--    image_label: SortEnum @doc(description: "The label assigned to a product image")
--    small_image_label: SortEnum @doc(description: "The label assigned to a product's small image")
--    thumbnail_label: SortEnum @doc(description: "The label assigned to a product's thumbnail image")
--    created_at: SortEnum @doc(description: "Timestamp indicating when the product was created")
--    updated_at: SortEnum @doc(description: "Timestamp indicating when the product was updated")
--    country_of_manufacture: SortEnum @doc(description: "The product's country of origin")
--    custom_layout: SortEnum @doc(description: "The name of a custom layout")
--    gift_message_available: SortEnum @doc(description: "Indicates whether a gift message is available")
--}
--
--type MediaGalleryEntry  @doc(description: "MediaGalleryEntry defines characteristics about images and videos associated with a specific product") {
--    id: Int @doc(description: "The identifier assigned to the object")
--    media_type: String @doc(description: "image or video")
--    label: String @doc(description: "The alt text displayed on the UI when the user points to the image")
--    position: Int @doc(description: "The media item's position after it has been sorted")
--    disabled: Boolean @doc(description: "Whether the image is hidden from vie")
--    types: [String] @doc(description: "Array of image types. It can have the following values: image, small_image, thumbnail")
--    file: String @doc(description: "The path of the image on the server")
--    content: ProductMediaGalleryEntriesContent @doc(description: "Contains a ProductMediaGalleryEntriesContent object")
--    video_content: ProductMediaGalleryEntriesVideoContent @doc(description: "Contains a ProductMediaGalleryEntriesVideoContent object")
-+    price: SortEnum @doc(description: "The price of the item.")
-+    special_price: SortEnum @doc(description: "The discounted price of the product.")
-+    special_from_date: SortEnum @doc(description: "The beginning date that a product has a special price.")
-+    special_to_date: SortEnum @doc(description: "The end date that a product has a special price.")
-+    weight: SortEnum @doc(description: "The weight of the item, in units defined by the store.")
-+    manufacturer: SortEnum @doc(description: "A number representing the product's manufacturer.")
-+    meta_title: SortEnum @doc(description: "A string that is displayed in the title bar and tab of the browser and in search results lists.")
-+    meta_keyword: SortEnum @doc(description: "A comma-separated list of keywords that are visible only to search engines.")
-+    meta_description: SortEnum @doc(description: "A brief overview of the product for search results listings, maximum 255 characters.")
-+    image: SortEnum @doc(description: "The relative path to the main image on the product page.")
-+    small_image: SortEnum @doc(description: "The relative path to the small image, which is used on catalog pages.")
-+    thumbnail: SortEnum @doc(description: "The relative path to the product's thumbnail image.")
-+    tier_price: SortEnum @doc(description: "The price when tier pricing is in effect and the items purchased threshold has been reached.")
-+    news_from_date: SortEnum @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product.")
-+    news_to_date: SortEnum @doc(description: "The end date for new product listings.")
-+    custom_layout_update: SortEnum @doc(description: "XML code that is applied as a layout update to the product page.")
-+    options_container: SortEnum @doc(description: "If the product has multiple options, determines where they appear on the product page.")
-+    required_options: SortEnum @doc(description: "Indicates whether the product has required options.")
-+    has_options: SortEnum @doc(description: "Indicates whether additional attributes have been created for the product.")
-+    image_label: SortEnum @doc(description: "The label assigned to a product image.")
-+    small_image_label: SortEnum @doc(description: "The label assigned to a product's small image.")
-+    thumbnail_label: SortEnum @doc(description: "The label assigned to a product's thumbnail image.")
-+    created_at: SortEnum @doc(description: "Timestamp indicating when the product was created.")
-+    updated_at: SortEnum @doc(description: "Timestamp indicating when the product was updated.")
-+    country_of_manufacture: SortEnum @doc(description: "The product's country of origin.")
-+    custom_layout: SortEnum @doc(description: "The name of a custom layout.")
-+    gift_message_available: SortEnum @doc(description: "Indicates whether a gift message is available.")
-+}
-+
-+type MediaGalleryEntry  @doc(description: "MediaGalleryEntry defines characteristics about images and videos associated with a specific product.") {
-+    id: Int @doc(description: "The identifier assigned to the object.")
-+    media_type: String @doc(description: "image or video.")
-+    label: String @doc(description: "The alt text displayed on the UI when the user points to the image.")
-+    position: Int @doc(description: "The media item's position after it has been sorted.")
-+    disabled: Boolean @doc(description: "Whether the image is hidden from vie.")
-+    types: [String] @doc(description: "Array of image types. It can have the following values: image, small_image, thumbnail.")
-+    file: String @doc(description: "The path of the image on the server.")
-+    content: ProductMediaGalleryEntriesContent @doc(description: "Contains a ProductMediaGalleryEntriesContent object.")
-+    video_content: ProductMediaGalleryEntriesVideoContent @doc(description: "Contains a ProductMediaGalleryEntriesVideoContent object.")
- }
- 
- type LayerFilter {
--    name: String @doc(description: "Layered navigation filter name")
--    request_var: String @doc(description: "Request variable name for filter query")
--    filter_items_count: Int @doc(description: "Count of filter items in filter group")
--    filter_items: [LayerFilterItemInterface] @doc(description: "Array of filter items")
-+    name: String @doc(description: "Layered navigation filter name.")
-+    request_var: String @doc(description: "Request variable name for filter query.")
-+    filter_items_count: Int @doc(description: "Count of filter items in filter group.")
-+    filter_items: [LayerFilterItemInterface] @doc(description: "Array of filter items.")
- }
- 
- interface LayerFilterItemInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\LayerFilterItemTypeResolverComposite") {
--    label: String @doc(description: "Filter label")
--    value_string: String @doc(description: "Value for filter request variable to be used in query")
--    items_count: Int @doc(description: "Count of items by filter")
-+    label: String @doc(description: "Filter label.")
-+    value_string: String @doc(description: "Value for filter request variable to be used in query.")
-+    items_count: Int @doc(description: "Count of items by filter.")
- }
- 
- type LayerFilterItem implements LayerFilterItemInterface {
-@@ -543,11 +393,23 @@ type LayerFilterItem implements LayerFilterItemInterface {
- }
- 
- type SortField {
--    value: String @doc(description: "Attribute code of sort field")
--    label: String @doc(description: "Label of sort field")
-+    value: String @doc(description: "Attribute code of sort field.")
-+    label: String @doc(description: "Label of sort field.")
-+}
-+
-+type SortFields @doc(description: "SortFields contains a default value for sort fields and all available sort fields.") {
-+    default: String @doc(description: "Default value of sort fields.")
-+    options: [SortField] @doc(description: "Available sort fields.")
- }
- 
--type SortFields @doc(description: "SortFields contains a default value for sort fields and all available sort fields") {
--    default: String @doc(description: "Default value of sort fields") 
--    options: [SortField] @doc(description: "Available sort fields")
-+type StoreConfig @doc(description: "The type contains information about a store config.") {
-+    product_url_suffix : String @doc(description: "Product URL Suffix.")
-+    category_url_suffix : String @doc(description: "Category URL Suffix.")
-+    title_separator : String @doc(description: "Page Title Separator.")
-+    list_mode : String @doc(description: "List Mode.")
-+    grid_per_page_values : String @doc(description: "Products per Page on Grid Allowed Values.")
-+    list_per_page_values : String @doc(description: "Products per Page on List Allowed Values.")
-+    grid_per_page : Int @doc(description: "Products per Page on Grid Default Value.")
-+    list_per_page : Int @doc(description: "Products per Page on List Default Value.")
-+    catalog_default_sort_by : String @doc(description: "Default Sort By.")
- }
-diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
-index 23aa8d65ddb..428c61c7fec 100644
---- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
-+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
-@@ -20,6 +20,7 @@ use Magento\Catalog\Model\Product as ProductEntity;
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-  * @since 100.0.2
-  */
- class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-@@ -349,12 +350,14 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     private $productEntityLinkField;
- 
-     /**
-+     * Product constructor.
-+     *
-      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-      * @param \Magento\Eav\Model\Config $config
-      * @param \Magento\Framework\App\ResourceConnection $resource
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param \Psr\Log\LoggerInterface $logger
--     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
-+     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
-      * @param \Magento\ImportExport\Model\Export\ConfigInterface $exportConfig
-      * @param \Magento\Catalog\Model\ResourceModel\ProductFactory $productFactory
-      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $attrSetColFactory
-@@ -363,10 +366,10 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-      * @param \Magento\Catalog\Model\ResourceModel\Product\Option\CollectionFactory $optionColFactory
-      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeColFactory
-      * @param Product\Type\Factory $_typeFactory
--     * @param \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
--     * @param \Magento\CatalogImportExport\Model\Export\RowCustomizerInterface $rowCustomizer
-+     * @param ProductEntity\LinkTypeProvider $linkTypeProvider
-+     * @param RowCustomizerInterface $rowCustomizer
-      * @param array $dateAttrCodes
--     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function __construct(
-         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
-@@ -441,8 +444,11 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-             if ($pathSize > 1) {
-                 $path = [];
-                 for ($i = 1; $i < $pathSize; $i++) {
--                    $name = $collection->getItemById($structure[$i])->getName();
--                    $path[] = $this->quoteCategoryDelimiter($name);
-+                    $childCategory = $collection->getItemById($structure[$i]);
-+                    if ($childCategory) {
-+                        $name = $childCategory->getName();
-+                        $path[] = $this->quoteCategoryDelimiter($name);
-+                    }
-                 }
-                 $this->_rootCategories[$category->getId()] = array_shift($path);
-                 if ($pathSize > 2) {
-@@ -520,10 +526,13 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-         if (empty($productIds)) {
-             return [];
-         }
-+        
-+        $productEntityJoinField = $this->getProductEntityLinkField();
-+
-         $select = $this->_connection->select()->from(
-             ['mgvte' => $this->_resourceModel->getTableName('catalog_product_entity_media_gallery_value_to_entity')],
-             [
--                "mgvte.{$this->getProductEntityLinkField()}",
-+                "mgvte.$productEntityJoinField",
-                 'mgvte.value_id'
-             ]
-         )->joinLeft(
-@@ -535,7 +544,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-             ]
-         )->joinLeft(
-             ['mgv' => $this->_resourceModel->getTableName('catalog_product_entity_media_gallery_value')],
--            '(mg.value_id = mgv.value_id)',
-+            "(mg.value_id = mgv.value_id) and (mgvte.$productEntityJoinField = mgv.$productEntityJoinField)",
-             [
-                 'mgv.label',
-                 'mgv.position',
-@@ -543,14 +552,14 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-                 'mgv.store_id',
-             ]
-         )->where(
--            "mgvte.{$this->getProductEntityLinkField()} IN (?)",
-+            "mgvte.$productEntityJoinField IN (?)",
-             $productIds
-         );
- 
-         $rowMediaGallery = [];
-         $stmt = $this->_connection->query($select);
-         while ($mediaRow = $stmt->fetch()) {
--            $rowMediaGallery[$mediaRow[$this->getProductEntityLinkField()]][] = [
-+            $rowMediaGallery[$mediaRow[$productEntityJoinField]][] = [
-                 '_media_attribute_id' => $mediaRow['attribute_id'],
-                 '_media_image' => $mediaRow['filename'],
-                 '_media_label' => $mediaRow['label'],
-@@ -667,8 +676,8 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     /**
-      * Update data row with information about categories. Return true, if data row was updated
-      *
--     * @param array &$dataRow
--     * @param array &$rowCategories
-+     * @param array $dataRow
-+     * @param array $rowCategories
-      * @param int $productId
-      * @return bool
-      */
-@@ -692,7 +701,9 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Get header columns
-+     *
-+     * @return string[]
-      */
-     public function _getHeaderColumns()
-     {
-@@ -751,7 +762,10 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Get entity collection
-+     *
-+     * @param bool $resetCollection
-+     * @return \Magento\Framework\Data\Collection\AbstractDb
-      */
-     protected function _getEntityCollection($resetCollection = false)
-     {
-@@ -796,7 +810,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-             // Maximal Products limit
-             $maxProductsLimit = 5000;
- 
--            $this->_itemsPerPage = intval(
-+            $this->_itemsPerPage = (int)(
-                 ($memoryLimit * $memoryUsagePercent - memory_get_usage(true)) / $memoryPerProduct
-             );
-             if ($this->_itemsPerPage < $minProductsLimit) {
-@@ -829,6 +843,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     public function export()
-     {
-         //Execution time may be very long
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         set_time_limit(0);
- 
-         $writer = $this->getWriter();
-@@ -858,7 +873,10 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Apply filter to collection and add not skipped attributes to select.
-+     *
-+     * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
-+     * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
-      * @since 100.2.0
-      */
-     protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection\AbstractCollection $collection)
-@@ -920,8 +938,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     }
- 
-     /**
--     * Load products' data from the collection
--     * and filter it (if needed).
-+     * Load products' data from the collection and filter it (if needed).
-      *
-      * @return array Keys are product IDs, values arrays with keys as store IDs
-      *               and values as store-specific versions of Product entity.
-@@ -929,15 +946,17 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     protected function loadCollection(): array
-     {
-         $data = [];
--
-         $collection = $this->_getEntityCollection();
-         foreach (array_keys($this->_storeIdToCode) as $storeId) {
-+            $collection->setOrder('entity_id', 'asc');
-+            $this->_prepareEntityCollection($collection);
-             $collection->setStoreId($storeId);
-+            $collection->load();
-             foreach ($collection as $itemId => $item) {
-                 $data[$itemId][$storeId] = $item;
-             }
-+            $collection->clear();
-         }
--        $collection->clear();
- 
-         return $data;
-     }
-@@ -948,6 +967,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-      * @return array
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * phpcs:disable Generic.Metrics.NestingLevel
-      */
-     protected function collectRawData()
-     {
-@@ -1042,6 +1062,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
- 
-         return $data;
-     }
-+    //phpcs:enable Generic.Metrics.NestingLevel
- 
-     /**
-      * Wrap values with double quotes if "Fields Enclosure" option is enabled
-@@ -1063,6 +1084,8 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Collect multi raw data from
-+     *
-      * @return array
-      */
-     protected function collectMultirawData()
-@@ -1104,6 +1127,8 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Check the current data has multiselect value
-+     *
-      * @param \Magento\Catalog\Model\Product $item
-      * @param int $storeId
-      * @return bool
-@@ -1116,6 +1141,8 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Collect multiselect values based on value
-+     *
-      * @param \Magento\Catalog\Model\Product $item
-      * @param string $attrCode
-      * @param int $storeId
-@@ -1140,6 +1167,8 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Check attribute is valid.
-+     *
-      * @param string $code
-      * @param mixed $value
-      * @return bool
-@@ -1155,10 +1184,16 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-             $isValid = false;
-         }
- 
-+        if (is_array($value)) {
-+            $isValid = false;
-+        }
-+
-         return $isValid;
-     }
- 
-     /**
-+     * Append multi row data
-+     *
-      * @param array $dataRow
-      * @param array $multiRawData
-      * @return array
-@@ -1268,11 +1303,23 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-         }
- 
-         if (!empty($multiRawData['customOptionsData'][$productLinkId][$storeId])) {
-+            $shouldBeMerged = true;
-             $customOptionsRows = $multiRawData['customOptionsData'][$productLinkId][$storeId];
--            $multiRawData['customOptionsData'][$productLinkId][$storeId] = [];
--            $customOptions = implode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $customOptionsRows);
- 
--            $dataRow = array_merge($dataRow, ['custom_options' => $customOptions]);
-+            if ($storeId != Store::DEFAULT_STORE_ID
-+                && !empty($multiRawData['customOptionsData'][$productLinkId][Store::DEFAULT_STORE_ID])
-+            ) {
-+                $defaultCustomOptions = $multiRawData['customOptionsData'][$productLinkId][Store::DEFAULT_STORE_ID];
-+                if (!array_diff($defaultCustomOptions, $customOptionsRows)) {
-+                    $shouldBeMerged = false;
-+                }
-+            }
-+
-+            if ($shouldBeMerged) {
-+                $multiRawData['customOptionsData'][$productLinkId][$storeId] = [];
-+                $customOptions = implode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $customOptionsRows);
-+                $dataRow = array_merge($dataRow, ['custom_options' => $customOptions]);
-+            }
-         }
- 
-         if (empty($dataRow)) {
-@@ -1288,6 +1335,8 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Add multi row data to export
-+     *
-      * @deprecated 100.1.0
-      * @param array $dataRow
-      * @param array $multiRawData
-@@ -1335,6 +1384,8 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Convert option row to cell string
-+     *
-      * @param array $option
-      * @return string
-      */
-@@ -1364,6 +1415,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     protected function getCustomOptionsData($productIds)
-     {
-         $customOptionsData = [];
-+        $defaultOptionsData = [];
- 
-         foreach (array_keys($this->_storeIdToCode) as $storeId) {
-             $options = $this->_optionColFactory->create();
-@@ -1376,38 +1428,42 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-                 ->addValuesToResult($storeId);
- 
-             foreach ($options as $option) {
-+                $optionData = $option->toArray();
-                 $row = [];
-                 $productId = $option['product_id'];
-                 $row['name'] = $option['title'];
-                 $row['type'] = $option['type'];
--                if (Store::DEFAULT_STORE_ID === $storeId) {
--                    $row['required'] = $option['is_require'];
--                    $row['price'] = $option['price'];
--                    $row['price_type'] = ($option['price_type'] === 'percent') ? 'percent' : 'fixed';
--                    $row['sku'] = $option['sku'];
--                    if ($option['max_characters']) {
--                        $row['max_characters'] = $option['max_characters'];
--                    }
- 
--                    foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
--                        if (!isset($option[$fileOptionKey])) {
--                            continue;
--                        }
--
--                        $row[$fileOptionKey] = $option[$fileOptionKey];
-+                $row['required'] = $this->getOptionValue('is_require', $defaultOptionsData, $optionData);
-+                $row['price'] = $this->getOptionValue('price', $defaultOptionsData, $optionData);
-+                $row['sku'] = $this->getOptionValue('sku', $defaultOptionsData, $optionData);
-+                if (array_key_exists('max_characters', $optionData)
-+                    || array_key_exists('max_characters', $defaultOptionsData)
-+                ) {
-+                    $row['max_characters'] = $this->getOptionValue('max_characters', $defaultOptionsData, $optionData);
-+                }
-+                foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
-+                    if (isset($option[$fileOptionKey]) || isset($defaultOptionsData[$fileOptionKey])) {
-+                        $row[$fileOptionKey] = $this->getOptionValue($fileOptionKey, $defaultOptionsData, $optionData);
-                     }
-                 }
-+                $percentType = $this->getOptionValue('price_type', $defaultOptionsData, $optionData);
-+                $row['price_type'] = ($percentType === 'percent') ? 'percent' : 'fixed';
-+
-+                if (Store::DEFAULT_STORE_ID === $storeId) {
-+                    $optionId = $option['option_id'];
-+                    $defaultOptionsData[$optionId] = $option->toArray();
-+                }
-+
-                 $values = $option->getValues();
- 
-                 if ($values) {
-                     foreach ($values as $value) {
-                         $row['option_title'] = $value['title'];
--                        if (Store::DEFAULT_STORE_ID === $storeId) {
--                            $row['option_title'] = $value['title'];
--                            $row['price'] = $value['price'];
--                            $row['price_type'] = ($value['price_type'] === 'percent') ? 'percent' : 'fixed';
--                            $row['sku'] = $value['sku'];
--                        }
-+                        $row['option_title'] = $value['title'];
-+                        $row['price'] = $value['price'];
-+                        $row['price_type'] = ($value['price_type'] === 'percent') ? 'percent' : 'fixed';
-+                        $row['sku'] = $value['sku'];
-                         $customOptionsData[$productId][$storeId][] = $this->optionRowToCellString($row);
-                     }
-                 } else {
-@@ -1421,6 +1477,31 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-         return $customOptionsData;
-     }
- 
-+    /**
-+     * Get value for custom option according to store or default value
-+     *
-+     * @param string $optionName
-+     * @param array $defaultOptionsData
-+     * @param array $optionData
-+     * @return mixed
-+     */
-+    private function getOptionValue($optionName, $defaultOptionsData, $optionData)
-+    {
-+        $optionId = $optionData['option_id'];
-+
-+        if (array_key_exists($optionName, $optionData) && $optionData[$optionName] !== null) {
-+            return $optionData[$optionName];
-+        }
-+
-+        if (array_key_exists($optionId, $defaultOptionsData)
-+            && array_key_exists($optionName, $defaultOptionsData[$optionId])
-+        ) {
-+            return $defaultOptionsData[$optionId][$optionName];
-+        }
-+
-+        return null;
-+    }
-+
-     /**
-      * Clean up already loaded attribute collection.
-      *
-diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
-index 6c3bef2a52b..5c083d421f0 100644
---- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
-+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
-@@ -3,18 +3,22 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\CatalogImportExport\Model\Import;
- 
-+use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Catalog\Model\Config as CatalogConfig;
- use Magento\Catalog\Model\Product\Visibility;
--use Magento\CatalogImportExport\Model\Import\Product\MediaGalleryProcessor;
-+use Magento\Catalog\Model\ResourceModel\Product\Link;
- use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
-+use Magento\CatalogImportExport\Model\Import\Product\MediaGalleryProcessor;
- use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
--use Magento\CatalogInventory\Api\Data\StockItemInterface;
- use Magento\CatalogImportExport\Model\StockItemImporterInterface;
-+use Magento\CatalogInventory\Api\Data\StockItemInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Filesystem;
- use Magento\Framework\Intl\DateTimeFactory;
- use Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor;
-@@ -34,6 +38,7 @@ use Magento\Store\Model\Store;
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
-  * @since 100.0.2
-  */
- class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-@@ -295,7 +300,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-         ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE => 'Imported resource (image) could not be downloaded from external resource due to timeout or access permissions',
-         ValidatorInterface::ERROR_INVALID_WEIGHT => 'Product weight is invalid',
-         ValidatorInterface::ERROR_DUPLICATE_URL_KEY => 'Url key: \'%s\' was already generated for an item with the SKU: \'%s\'. You need to specify the unique URL key manually',
--        ValidatorInterface::ERROR_DUPLICATE_MULTISELECT_VALUES => "Value for multiselect attribute %s contains duplicated values",
-+        ValidatorInterface::ERROR_DUPLICATE_MULTISELECT_VALUES => 'Value for multiselect attribute %s contains duplicated values',
-+        'invalidNewToDateValue' => 'Make sure new_to_date is later than or the same as new_from_date',
-     ];
-     //@codingStandardsIgnoreEnd
- 
-@@ -732,6 +738,11 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-      */
-     private $dateTimeFactory;
- 
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-     /**
-      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
-      * @param \Magento\ImportExport\Helper\Data $importExportData
-@@ -776,7 +787,11 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-      * @param MediaGalleryProcessor $mediaProcessor
-      * @param StockItemImporterInterface|null $stockItemImporter
-      * @param DateTimeFactory $dateTimeFactory
-+     * @param ProductRepositoryInterface|null $productRepository
-+     * @throws LocalizedException
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-     public function __construct(
-         \Magento\Framework\Json\Helper\Data $jsonHelper,
-@@ -821,7 +836,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-         ImageTypeProcessor $imageTypeProcessor = null,
-         MediaGalleryProcessor $mediaProcessor = null,
-         StockItemImporterInterface $stockItemImporter = null,
--        DateTimeFactory $dateTimeFactory = null
-+        DateTimeFactory $dateTimeFactory = null,
-+        ProductRepositoryInterface $productRepository = null
-     ) {
-         $this->_eventManager = $eventManager;
-         $this->stockRegistry = $stockRegistry;
-@@ -875,6 +891,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-             ->initImagesArrayKeys();
-         $this->validator->init($this);
-         $this->dateTimeFactory = $dateTimeFactory ?? ObjectManager::getInstance()->get(DateTimeFactory::class);
-+        $this->productRepository = $productRepository ?? ObjectManager::getInstance()
-+                ->get(ProductRepositoryInterface::class);
-     }
- 
-     /**
-@@ -890,7 +908,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     {
-         if (!$this->validator->isAttributeValid($attrCode, $attrParams, $rowData)) {
-             foreach ($this->validator->getMessages() as $message) {
--                $this->addRowError($message, $rowNum, $attrCode);
-+                $this->skipRow($rowNum, $message, ProcessingError::ERROR_LEVEL_NOT_CRITICAL, $attrCode);
-             }
-             return false;
-         }
-@@ -898,8 +916,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     }
- 
-     /**
--     *
-      * Multiple value separator getter.
-+     *
-      * @return string
-      */
-     public function getMultipleValueSeparator()
-@@ -949,6 +967,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Retrieve product type by name.
-+     *
-      * @param string $name
-      * @return Product\Type\AbstractType
-      */
-@@ -981,10 +1001,12 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-      */
-     public function deleteProductsForReplacement()
-     {
--        $this->setParameters(array_merge(
--            $this->getParameters(),
--            ['behavior' => Import::BEHAVIOR_DELETE]
--        ));
-+        $this->setParameters(
-+            array_merge(
-+                $this->getParameters(),
-+                ['behavior' => Import::BEHAVIOR_DELETE]
-+            )
-+        );
-         $this->_deleteProducts();
- 
-         return $this;
-@@ -1073,10 +1095,12 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-         $this->deleteProductsForReplacement();
-         $this->_oldSku = $this->skuProcessor->reloadOldSkus()->getOldSkus();
-         $this->_validatedRows = null;
--        $this->setParameters(array_merge(
--            $this->getParameters(),
--            ['behavior' => Import::BEHAVIOR_APPEND]
--        ));
-+        $this->setParameters(
-+            array_merge(
-+                $this->getParameters(),
-+                ['behavior' => Import::BEHAVIOR_APPEND]
-+            )
-+        );
-         $this->_saveProductsData();
- 
-         return $this;
-@@ -1189,8 +1213,10 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     }
- 
-     /**
--     * Set valid attribute set and product type to rows with all scopes
--     * to ensure that existing products doesn't changed.
-+     * Set valid attribute set and product type to rows.
-+     *
-+     * Set valid attribute set and product type to rows with all
-+     * scopes to ensure that existing products doesn't changed.
-      *
-      * @param array $rowData
-      * @return array
-@@ -1220,22 +1246,21 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
- 
-     /**
-      * Gather and save information about product links.
-+     *
-      * Must be called after ALL products saving done.
-      *
-      * @return $this
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.NPathComplexity)
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-     protected function _saveLinks()
-     {
-+        /** @var Link $resource */
-         $resource = $this->_linkFactory->create();
-         $mainTable = $resource->getMainTable();
-         $positionAttrId = [];
-         $nextLinkId = $this->_resourceHelper->getNextAutoincrement($mainTable);
- 
-         // pre-load 'position' attributes ID for each link type once
--        foreach ($this->_linkNameToId as $linkName => $linkId) {
-+        foreach ($this->_linkNameToId as $linkId) {
-             $select = $this->_connection->select()->from(
-                 $resource->getTable('catalog_product_link_attribute'),
-                 ['id' => 'product_link_attribute_id']
-@@ -1246,110 +1271,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-             $positionAttrId[$linkId] = $this->_connection->fetchOne($select, $bind);
-         }
-         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
--            $productIds = [];
--            $linkRows = [];
--            $positionRows = [];
--
--            foreach ($bunch as $rowNum => $rowData) {
--                if (!$this->isRowAllowedToImport($rowData, $rowNum)) {
--                    continue;
--                }
--
--                $sku = $rowData[self::COL_SKU];
--
--                $productId = $this->skuProcessor->getNewSku($sku)[$this->getProductEntityLinkField()];
--                $productLinkKeys = [];
--                $select = $this->_connection->select()->from(
--                    $resource->getTable('catalog_product_link'),
--                    ['id' => 'link_id', 'linked_id' => 'linked_product_id', 'link_type_id' => 'link_type_id']
--                )->where(
--                    'product_id = :product_id'
--                );
--                $bind = [':product_id' => $productId];
--                foreach ($this->_connection->fetchAll($select, $bind) as $linkData) {
--                    $linkKey = "{$productId}-{$linkData['linked_id']}-{$linkData['link_type_id']}";
--                    $productLinkKeys[$linkKey] = $linkData['id'];
--                }
--                foreach ($this->_linkNameToId as $linkName => $linkId) {
--                    $productIds[] = $productId;
--                    if (isset($rowData[$linkName . 'sku'])) {
--                        $linkSkus = explode($this->getMultipleValueSeparator(), $rowData[$linkName . 'sku']);
--                        $linkPositions = !empty($rowData[$linkName . 'position'])
--                            ? explode($this->getMultipleValueSeparator(), $rowData[$linkName . 'position'])
--                            : [];
--                        foreach ($linkSkus as $linkedKey => $linkedSku) {
--                            $linkedSku = trim($linkedSku);
--                            if (($this->skuProcessor->getNewSku($linkedSku) !== null || $this->isSkuExist($linkedSku))
--                                && strcasecmp($linkedSku, $sku) !== 0
--                            ) {
--                                $newSku = $this->skuProcessor->getNewSku($linkedSku);
--                                if (!empty($newSku)) {
--                                    $linkedId = $newSku['entity_id'];
--                                } else {
--                                    $linkedId = $this->getExistingSku($linkedSku)['entity_id'];
--                                }
--
--                                if ($linkedId == null) {
--                                    // Import file links to a SKU which is skipped for some reason,
--                                    // which leads to a "NULL"
--                                    // link causing fatal errors.
--                                    $this->_logger->critical(
--                                        new \Exception(
--                                            sprintf(
--                                                'WARNING: Orphaned link skipped: From SKU %s (ID %d) to SKU %s, ' .
--                                                'Link type id: %d',
--                                                $sku,
--                                                $productId,
--                                                $linkedSku,
--                                                $linkId
--                                            )
--                                        )
--                                    );
--                                    continue;
--                                }
--
--                                $linkKey = "{$productId}-{$linkedId}-{$linkId}";
--                                if (empty($productLinkKeys[$linkKey])) {
--                                    $productLinkKeys[$linkKey] = $nextLinkId;
--                                }
--                                if (!isset($linkRows[$linkKey])) {
--                                    $linkRows[$linkKey] = [
--                                        'link_id' => $productLinkKeys[$linkKey],
--                                        'product_id' => $productId,
--                                        'linked_product_id' => $linkedId,
--                                        'link_type_id' => $linkId,
--                                    ];
--                                }
--                                if (!empty($linkPositions[$linkedKey])) {
--                                    $positionRows[] = [
--                                        'link_id' => $productLinkKeys[$linkKey],
--                                        'product_link_attribute_id' => $positionAttrId[$linkId],
--                                        'value' => $linkPositions[$linkedKey],
--                                    ];
--                                }
--                                $nextLinkId++;
--                            }
--                        }
--                    }
--                }
--            }
--            if (Import::BEHAVIOR_APPEND != $this->getBehavior() && $productIds) {
--                $this->_connection->delete(
--                    $mainTable,
--                    $this->_connection->quoteInto('product_id IN (?)', array_unique($productIds))
--                );
--            }
--            if ($linkRows) {
--                $this->_connection->insertOnDuplicate($mainTable, $linkRows, ['link_id']);
--            }
--            if ($positionRows) {
--                // process linked product positions
--                $this->_connection->insertOnDuplicate(
--                    $resource->getAttributeTypeTable('int'),
--                    $positionRows,
--                    ['value']
--                );
--            }
-+            $this->processLinkBunches($bunch, $resource, $nextLinkId, $positionAttrId);
-         }
-         return $this;
-     }
-@@ -1406,7 +1328,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-                 $delProductId[] = $productId;
- 
-                 foreach (array_keys($categories) as $categoryId) {
--                    $categoriesIn[] = ['product_id' => $productId, 'category_id' => $categoryId, 'position' => 1];
-+                    $categoriesIn[] = ['product_id' => $productId, 'category_id' => $categoryId, 'position' => 0];
-                 }
-             }
-             if (Import::BEHAVIOR_APPEND != $this->getBehavior()) {
-@@ -1468,6 +1390,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
- 
-     /**
-      * Return additional data, needed to select.
-+     *
-      * @return array
-      */
-     private function getOldSkuFieldsForSelect()
-@@ -1477,6 +1400,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
- 
-     /**
-      * Adds newly created products to _oldSku
-+     *
-      * @param array $newProducts
-      * @return void
-      */
-@@ -1514,6 +1438,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
- 
-     /**
-      * Init media gallery resources
-+     *
-      * @return void
-      * @since 100.0.4
-      * @deprecated
-@@ -1544,6 +1469,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Retrieve image from row.
-+     *
-      * @param array $rowData
-      * @return array
-      */
-@@ -1582,6 +1509,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      * @throws LocalizedException
-+     * phpcs:disable Generic.Metrics.NestingLevel
-      */
-     protected function _saveProducts()
-     {
-@@ -1599,6 +1527,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-             $tierPrices = [];
-             $mediaGallery = [];
-             $labelsForUpdate = [];
-+            $imagesForChangeVisibility = [];
-             $uploadedImages = [];
-             $previousType = null;
-             $prevAttributeSet = null;
-@@ -1617,14 +1546,25 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-                 }
-                 $rowScope = $this->getRowScope($rowData);
- 
--                $rowData[self::URL_KEY] = $this->getUrlKey($rowData);
-+                $urlKey = $this->getUrlKey($rowData);
-+                if (!empty($rowData[self::URL_KEY])) {
-+                    // If url_key column and its value were in the CSV file
-+                    $rowData[self::URL_KEY] = $urlKey;
-+                } elseif ($this->isNeedToChangeUrlKey($rowData)) {
-+                    // If url_key column was empty or even not declared in the CSV file but by the rules it is need to
-+                    // be setteed. In case when url_key is generating from name column we have to ensure that the bunch
-+                    // of products will pass for the event with url_key column.
-+                    $bunch[$rowNum][self::URL_KEY] = $rowData[self::URL_KEY] = $urlKey;
-+                }
- 
-                 $rowSku = $rowData[self::COL_SKU];
- 
-                 if (null === $rowSku) {
-                     $this->getErrorAggregator()->addRowToSkip($rowNum);
-                     continue;
--                } elseif (self::SCOPE_STORE == $rowScope) {
-+                }
-+
-+                if (self::SCOPE_STORE == $rowScope) {
-                     // set necessary data from SCOPE_DEFAULT row
-                     $rowData[self::COL_TYPE] = $this->skuProcessor->getNewSku($rowSku)['type_id'];
-                     $rowData['attribute_set_id'] = $this->skuProcessor->getNewSku($rowSku)['attr_set_id'];
-@@ -1687,6 +1627,14 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-                         $websiteId = $this->storeResolver->getWebsiteCodeToId($websiteCode);
-                         $this->websitesCache[$rowSku][$websiteId] = true;
-                     }
-+                } else {
-+                    $product = $this->retrieveProductBySku($rowSku);
-+                    if ($product) {
-+                        $websiteIds = $product->getWebsiteIds();
-+                        foreach ($websiteIds as $websiteId) {
-+                            $this->websitesCache[$rowSku][$websiteId] = true;
-+                        }
-+                    }
-                 }
- 
-                 // 3. Categories phase
-@@ -1718,21 +1666,24 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-                 }
- 
-                 // 5. Media gallery phase
--                $disabledImages = [];
-                 list($rowImages, $rowLabels) = $this->getImagesFromRow($rowData);
-                 $storeId = !empty($rowData[self::COL_STORE])
-                     ? $this->getStoreIdByCode($rowData[self::COL_STORE])
-                     : Store::DEFAULT_STORE_ID;
--                if (isset($rowData['_media_is_disabled']) && strlen(trim($rowData['_media_is_disabled']))) {
--                    $disabledImages = array_flip(
--                        explode($this->getMultipleValueSeparator(), $rowData['_media_is_disabled'])
--                    );
-+                $imageHiddenStates = $this->getImagesHiddenStates($rowData);
-+                foreach (array_keys($imageHiddenStates) as $image) {
-+                    if (array_key_exists($rowSku, $existingImages)
-+                        && array_key_exists($image, $existingImages[$rowSku])
-+                    ) {
-+                        $rowImages[self::COL_MEDIA_IMAGE][] = $image;
-+                        $uploadedImages[$image] = $image;
-+                    }
-+
-                     if (empty($rowImages)) {
--                        foreach (array_keys($disabledImages) as $disabledImage) {
--                            $rowImages[self::COL_MEDIA_IMAGE][] = $disabledImage;
--                        }
-+                        $rowImages[self::COL_MEDIA_IMAGE][] = $image;
-                     }
-                 }
-+
-                 $rowData[self::COL_MEDIA_IMAGE] = [];
- 
-                 /*
-@@ -1748,6 +1699,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-                             if ($uploadedFile) {
-                                 $uploadedImages[$columnImage] = $uploadedFile;
-                             } else {
-+                                unset($rowData[$column]);
-                                 $this->addRowError(
-                                     ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE,
-                                     $rowNum,
-@@ -1764,31 +1716,44 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-                             $rowData[$column] = $uploadedFile;
-                         }
- 
--                        if ($uploadedFile && !isset($mediaGallery[$storeId][$rowSku][$uploadedFile])) {
--                            if (isset($existingImages[$rowSku][$uploadedFile])) {
--                                if (isset($rowLabels[$column][$columnImageKey])
--                                    && $rowLabels[$column][$columnImageKey] !=
--                                    $existingImages[$rowSku][$uploadedFile]['label']
--                                ) {
--                                    $labelsForUpdate[] = [
--                                        'label' => $rowLabels[$column][$columnImageKey],
--                                        'imageData' => $existingImages[$rowSku][$uploadedFile]
--                                    ];
--                                }
--                            } else {
--                                if ($column == self::COL_MEDIA_IMAGE) {
--                                    $rowData[$column][] = $uploadedFile;
--                                }
--                                $mediaGallery[$storeId][$rowSku][$uploadedFile] = [
--                                    'attribute_id' => $this->getMediaGalleryAttributeId(),
--                                    'label' => isset($rowLabels[$column][$columnImageKey])
--                                        ? $rowLabels[$column][$columnImageKey]
--                                        : '',
--                                    'position' => ++$position,
--                                    'disabled' => isset($disabledImages[$columnImage]) ? '1' : '0',
--                                    'value' => $uploadedFile,
-+                        if (!$uploadedFile || isset($mediaGallery[$storeId][$rowSku][$uploadedFile])) {
-+                            continue;
-+                        }
-+
-+                        if (isset($existingImages[$rowSku][$uploadedFile])) {
-+                            $currentFileData = $existingImages[$rowSku][$uploadedFile];
-+                            if (isset($rowLabels[$column][$columnImageKey])
-+                                && $rowLabels[$column][$columnImageKey] !=
-+                                $currentFileData['label']
-+                            ) {
-+                                $labelsForUpdate[] = [
-+                                    'label' => $rowLabels[$column][$columnImageKey],
-+                                    'imageData' => $currentFileData
-                                 ];
-                             }
-+
-+                            if (array_key_exists($uploadedFile, $imageHiddenStates)
-+                                && $currentFileData['disabled'] != $imageHiddenStates[$uploadedFile]
-+                            ) {
-+                                $imagesForChangeVisibility[] = [
-+                                    'disabled' => $imageHiddenStates[$uploadedFile],
-+                                    'imageData' => $currentFileData
-+                                ];
-+                            }
-+                        } else {
-+                            if ($column == self::COL_MEDIA_IMAGE) {
-+                                $rowData[$column][] = $uploadedFile;
-+                            }
-+                            $mediaGallery[$storeId][$rowSku][$uploadedFile] = [
-+                                'attribute_id' => $this->getMediaGalleryAttributeId(),
-+                                'label' => isset($rowLabels[$column][$columnImageKey])
-+                                    ? $rowLabels[$column][$columnImageKey]
-+                                    : '',
-+                                'position' => ++$position,
-+                                'disabled' => isset($imageHiddenStates[$columnImage])
-+                                    ? $imageHiddenStates[$columnImage] : '0',
-+                                'value' => $uploadedFile,
-+                            ];
-                         }
-                     }
-                 }
-@@ -1905,6 +1870,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-                 $mediaGallery
-             )->_saveProductAttributes(
-                 $attributes
-+            )->updateMediaGalleryVisibility(
-+                $imagesForChangeVisibility
-             )->updateMediaGalleryLabels(
-                 $labelsForUpdate
-             );
-@@ -1919,6 +1886,34 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Prepare array with image states (visible or hidden from product page)
-+     *
-+     * @param array $rowData
-+     * @return array
-+     */
-+    private function getImagesHiddenStates($rowData)
-+    {
-+        $statesArray = [];
-+        $mappingArray = [
-+            '_media_is_disabled' => '1'
-+        ];
-+
-+        foreach ($mappingArray as $key => $value) {
-+            if (isset($rowData[$key]) && strlen(trim($rowData[$key]))) {
-+                $items = explode($this->getMultipleValueSeparator(), $rowData[$key]);
-+
-+                foreach ($items as $item) {
-+                    $statesArray[$item] = $value;
-+                }
-+            }
-+        }
-+
-+        return $statesArray;
-+    }
-+
-+    /**
-+     * Resolve valid category ids from provided row data.
-+     *
-      * @param array $rowData
-      * @return array
-      */
-@@ -1941,11 +1936,18 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-                     . ' ' . $error['exception']->getMessage()
-                 );
-             }
-+        } else {
-+            $product = $this->retrieveProductBySku($rowData['sku']);
-+            if ($product) {
-+                $categoryIds = $product->getCategoryIds();
-+            }
-         }
-         return $categoryIds;
-     }
- 
-     /**
-+     * Get product websites.
-+     *
-      * @param string $productSku
-      * @return array
-      */
-@@ -1955,6 +1957,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Retrieve product categories.
-+     *
-      * @param string $productSku
-      * @return array
-      */
-@@ -1964,6 +1968,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Get store id by code.
-+     *
-      * @param string $storeCode
-      * @return array|int|null|string
-      */
-@@ -2055,6 +2061,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Retrieve uploader.
-+     *
-      * @return Uploader
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
-@@ -2065,6 +2073,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
- 
-     /**
-      * Uploading files into the "catalog/product" media folder.
-+     *
-      * Return a new file name if the same file is already exists.
-      *
-      * @param string $fileName
-@@ -2259,7 +2268,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-      * Returns array of new products data with SKU as key. All SKU keys are in lowercase for avoiding creation of
-      * new products with the same SKU in different letter cases.
-      *
--     * @var string $sku
-+     * @param string $sku
-      * @return array
-      */
-     public function getNewSku($sku = null)
-@@ -2323,6 +2332,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     * @throws \Zend_Validate_Exception
-      */
-     public function validateRow(array $rowData, $rowNum)
-     {
-@@ -2338,32 +2348,35 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-         // BEHAVIOR_DELETE and BEHAVIOR_REPLACE use specific validation logic
-         if (Import::BEHAVIOR_REPLACE == $this->getBehavior()) {
-             if (self::SCOPE_DEFAULT == $rowScope && !$this->isSkuExist($sku)) {
--                $this->addRowError(ValidatorInterface::ERROR_SKU_NOT_FOUND_FOR_DELETE, $rowNum);
-+                $this->skipRow($rowNum, ValidatorInterface::ERROR_SKU_NOT_FOUND_FOR_DELETE);
-                 return false;
-             }
-         }
-         if (Import::BEHAVIOR_DELETE == $this->getBehavior()) {
-             if (self::SCOPE_DEFAULT == $rowScope && !$this->isSkuExist($sku)) {
--                $this->addRowError(ValidatorInterface::ERROR_SKU_NOT_FOUND_FOR_DELETE, $rowNum);
-+                $this->skipRow($rowNum, ValidatorInterface::ERROR_SKU_NOT_FOUND_FOR_DELETE);
-                 return false;
-             }
-             return true;
-         }
- 
-+        // if product doesn't exist, need to throw critical error else all errors should be not critical.
-+        $errorLevel = $this->getValidationErrorLevel($sku);
-+
-         if (!$this->validator->isValid($rowData)) {
-             foreach ($this->validator->getMessages() as $message) {
--                $this->addRowError($message, $rowNum, $this->validator->getInvalidAttribute());
-+                $this->skipRow($rowNum, $message, $errorLevel, $this->validator->getInvalidAttribute());
-             }
-         }
- 
-         if (null === $sku) {
--            $this->addRowError(ValidatorInterface::ERROR_SKU_IS_EMPTY, $rowNum);
-+            $this->skipRow($rowNum, ValidatorInterface::ERROR_SKU_IS_EMPTY, $errorLevel);
-         } elseif (false === $sku) {
--            $this->addRowError(ValidatorInterface::ERROR_ROW_IS_ORPHAN, $rowNum);
-+            $this->skipRow($rowNum, ValidatorInterface::ERROR_ROW_IS_ORPHAN, $errorLevel);
-         } elseif (self::SCOPE_STORE == $rowScope
-             && !$this->storeResolver->getStoreCodeToId($rowData[self::COL_STORE])
-         ) {
--            $this->addRowError(ValidatorInterface::ERROR_INVALID_STORE, $rowNum);
-+            $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_STORE, $errorLevel);
-         }
- 
-         // SKU is specified, row is SCOPE_DEFAULT, new product block begins
-@@ -2378,16 +2391,15 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-                     $this->prepareNewSkuData($sku)
-                 );
-             } else {
--                $this->addRowError(ValidatorInterface::ERROR_TYPE_UNSUPPORTED, $rowNum);
-+                $this->skipRow($rowNum, ValidatorInterface::ERROR_TYPE_UNSUPPORTED, $errorLevel);
-             }
-         } else {
-             // validate new product type and attribute set
--            if (!isset($rowData[self::COL_TYPE]) || !isset($this->_productTypeModels[$rowData[self::COL_TYPE]])) {
--                $this->addRowError(ValidatorInterface::ERROR_INVALID_TYPE, $rowNum);
--            } elseif (!isset($rowData[self::COL_ATTR_SET])
--                || !isset($this->_attrSetNameToId[$rowData[self::COL_ATTR_SET]])
-+            if (!isset($rowData[self::COL_TYPE], $this->_productTypeModels[$rowData[self::COL_TYPE]])) {
-+                $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_TYPE, $errorLevel);
-+            } elseif (!isset($rowData[self::COL_ATTR_SET], $this->_attrSetNameToId[$rowData[self::COL_ATTR_SET]])
-             ) {
--                $this->addRowError(ValidatorInterface::ERROR_INVALID_ATTR_SET, $rowNum);
-+                $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_ATTR_SET, $errorLevel);
-             } elseif ($this->skuProcessor->getNewSku($sku) === null) {
-                 $this->skuProcessor->addNewSku(
-                     $sku,
-@@ -2443,24 +2455,50 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-                         ValidatorInterface::ERROR_DUPLICATE_URL_KEY,
-                         $rowNum,
-                         $rowData[self::COL_NAME],
--                        $message
--                    );
-+                        $message,
-+                        $errorLevel
-+                    )
-+                        ->getErrorAggregator()
-+                        ->addRowToSkip($rowNum);
-                 }
-             }
-         }
-+
-+        if (!empty($rowData['new_from_date']) && !empty($rowData['new_to_date'])
-+        ) {
-+            $newFromTimestamp = strtotime($this->dateTime->formatDate($rowData['new_from_date'], false));
-+            $newToTimestamp = strtotime($this->dateTime->formatDate($rowData['new_to_date'], false));
-+            if ($newFromTimestamp > $newToTimestamp) {
-+                $this->skipRow(
-+                    $rowNum,
-+                    'invalidNewToDateValue',
-+                    $errorLevel,
-+                    $rowData['new_to_date']
-+                );
-+            }
-+        }
-+
-         return !$this->getErrorAggregator()->isRowInvalid($rowNum);
-     }
- 
-     /**
-+     * Check if need to validate url key.
-+     *
-      * @param array $rowData
-      * @return bool
-      */
-     private function isNeedToValidateUrlKey($rowData)
-     {
-+        if (!empty($rowData[self::COL_SKU]) && empty($rowData[self::URL_KEY])
-+            && $this->getBehavior() === Import::BEHAVIOR_APPEND
-+            && $this->isSkuExist($rowData[self::COL_SKU])) {
-+            return false;
-+        }
-+
-         return (!empty($rowData[self::URL_KEY]) || !empty($rowData[self::COL_NAME]))
-             && (empty($rowData[self::COL_VISIBILITY])
--            || $rowData[self::COL_VISIBILITY]
--            !== (string)Visibility::getOptionArray()[Visibility::VISIBILITY_NOT_VISIBLE]);
-+                || $rowData[self::COL_VISIBILITY]
-+                !== (string)Visibility::getOptionArray()[Visibility::VISIBILITY_NOT_VISIBLE]);
-     }
- 
-     /**
-@@ -2600,9 +2638,12 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-             return explode($delimiter, $values);
-         }
-         if (preg_match_all('~"((?:[^"]|"")*)"~', $values, $matches)) {
--            return $values = array_map(function ($value) {
--                return str_replace('""', '"', $value);
--            }, $matches[1]);
-+            return $values = array_map(
-+                function ($value) {
-+                    return str_replace('""', '"', $value);
-+                },
-+                $matches[1]
-+            );
-         }
-         return [$values];
-     }
-@@ -2763,17 +2804,22 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Retrieve url key from provided row data.
-+     *
-      * @param array $rowData
-      * @return string
-+     *
-      * @since 100.0.3
-      */
-     protected function getUrlKey($rowData)
-     {
-         if (!empty($rowData[self::URL_KEY])) {
--            return strtolower($rowData[self::URL_KEY]);
-+            $urlKey = (string) $rowData[self::URL_KEY];
-+            return trim(strtolower($urlKey));
-         }
- 
--        if (!empty($rowData[self::COL_NAME])) {
-+        if (!empty($rowData[self::COL_NAME])
-+            && (array_key_exists(self::URL_KEY, $rowData) || !$this->isSkuExist($rowData[self::COL_SKU]))) {
-             return $this->productUrl->formatUrlKey($rowData[self::COL_NAME]);
-         }
- 
-@@ -2781,7 +2827,10 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Retrieve resource.
-+     *
-      * @return Proxy\Product\ResourceModel
-+     *
-      * @since 100.0.3
-      */
-     protected function getResource()
-@@ -2792,6 +2841,26 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-         return $this->_resource;
-     }
- 
-+    /**
-+     * Whether a url key is needed to be change.
-+     *
-+     * @param array $rowData
-+     * @return bool
-+     */
-+    private function isNeedToChangeUrlKey(array $rowData): bool
-+    {
-+        $urlKey = $this->getUrlKey($rowData);
-+        $productExists = $this->isSkuExist($rowData[self::COL_SKU]);
-+        $markedToEraseUrlKey = isset($rowData[self::URL_KEY]);
-+        // The product isn't new and the url key index wasn't marked for change.
-+        if (!$urlKey && $productExists && !$markedToEraseUrlKey) {
-+            // Seems there is no need to change the url key
-+            return false;
-+        }
-+
-+        return true;
-+    }
-+
-     /**
-      * Get product entity link field
-      *
-@@ -2835,6 +2904,21 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-         }
-     }
- 
-+    /**
-+     * Update 'disabled' field for media gallery entity
-+     *
-+     * @param array $images
-+     * @return $this
-+     */
-+    private function updateMediaGalleryVisibility(array $images)
-+    {
-+        if (!empty($images)) {
-+            $this->mediaProcessor->updateMediaGalleryVisibility($images);
-+        }
-+
-+        return $this;
-+    }
-+
-     /**
-      * Parse values from multiple attributes fields
-      *
-@@ -2897,9 +2981,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
- 
-         if ($this->stockConfiguration->isQty($this->skuProcessor->getNewSku($sku)['type_id'])) {
-             $stockItemDo->setData($row);
--            $row['is_in_stock'] = isset($row['is_in_stock']) && $stockItemDo->getBackorders()
--                ? $row['is_in_stock']
--                : $this->stockStateProvider->verifyStock($stockItemDo);
-+            $row['is_in_stock'] = $row['is_in_stock'] ?? $this->stockStateProvider->verifyStock($stockItemDo);
-             if ($this->stockStateProvider->verifyNotification($stockItemDo)) {
-                 $date = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
-                 $row['low_stock_date'] = $date->format(DateTime::DATETIME_PHP_FORMAT);
-@@ -2911,4 +2993,217 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
- 
-         return $row;
-     }
-+
-+    /**
-+     * Retrieve product by sku.
-+     *
-+     * @param string $sku
-+     * @return \Magento\Catalog\Api\Data\ProductInterface|null
-+     */
-+    private function retrieveProductBySku($sku)
-+    {
-+        try {
-+            $product = $this->productRepository->get($sku);
-+        } catch (NoSuchEntityException $e) {
-+            return null;
-+        }
-+        return $product;
-+    }
-+
-+    /**
-+     * Add row as skipped
-+     *
-+     * @param int $rowNum
-+     * @param string $errorCode Error code or simply column name
-+     * @param string $errorLevel error level
-+     * @param string|null $colName optional column name
-+     * @return $this
-+     */
-+    private function skipRow(
-+        $rowNum,
-+        string $errorCode,
-+        string $errorLevel = ProcessingError::ERROR_LEVEL_NOT_CRITICAL,
-+        $colName = null
-+    ): self {
-+        $this->addRowError($errorCode, $rowNum, $colName, null, $errorLevel);
-+        $this->getErrorAggregator()
-+            ->addRowToSkip($rowNum);
-+        return $this;
-+    }
-+
-+    /**
-+     * Returns errorLevel for validation
-+     *
-+     * @param string $sku
-+     * @return string
-+     */
-+    private function getValidationErrorLevel($sku): string
-+    {
-+        return (!$this->isSkuExist($sku) && Import::BEHAVIOR_REPLACE !== $this->getBehavior())
-+            ? ProcessingError::ERROR_LEVEL_CRITICAL
-+            : ProcessingError::ERROR_LEVEL_NOT_CRITICAL;
-+    }
-+
-+    /**
-+     * Processes link bunches
-+     *
-+     * @param array $bunch
-+     * @param Link $resource
-+     * @param int $nextLinkId
-+     * @param array $positionAttrId
-+     * @return void
-+     */
-+    private function processLinkBunches(
-+        array $bunch,
-+        Link $resource,
-+        int $nextLinkId,
-+        array $positionAttrId
-+    ): void {
-+        $productIds = [];
-+        $linkRows = [];
-+        $positionRows = [];
-+
-+        $bunch = array_filter($bunch, [$this, 'isRowAllowedToImport'], ARRAY_FILTER_USE_BOTH);
-+        foreach ($bunch as $rowData) {
-+            $sku = $rowData[self::COL_SKU];
-+            $productId = $this->skuProcessor->getNewSku($sku)[$this->getProductEntityLinkField()];
-+            $productIds[] = $productId;
-+            $productLinkKeys = $this->fetchProductLinks($resource, $productId);
-+            $linkNameToId = array_filter(
-+                $this->_linkNameToId,
-+                function ($linkName) use ($rowData) {
-+                    return isset($rowData[$linkName . 'sku']);
-+                },
-+                ARRAY_FILTER_USE_KEY
-+            );
-+            foreach ($linkNameToId as $linkName => $linkId) {
-+                $linkSkus = explode($this->getMultipleValueSeparator(), $rowData[$linkName . 'sku']);
-+                $linkPositions = !empty($rowData[$linkName . 'position'])
-+                    ? explode($this->getMultipleValueSeparator(), $rowData[$linkName . 'position'])
-+                    : [];
-+
-+                $linkSkus = array_filter(
-+                    $linkSkus,
-+                    function ($linkedSku) use ($sku) {
-+                        $linkedSku = trim($linkedSku);
-+                        return ($this->skuProcessor->getNewSku($linkedSku) !== null || $this->isSkuExist($linkedSku))
-+                            && strcasecmp($linkedSku, $sku) !== 0;
-+                    }
-+                );
-+                foreach ($linkSkus as $linkedKey => $linkedSku) {
-+                    $linkedId = $this->getProductLinkedId($linkedSku);
-+                    if ($linkedId == null) {
-+                        // Import file links to a SKU which is skipped for some reason, which leads to a "NULL"
-+                        // link causing fatal errors.
-+                        $formatStr = 'WARNING: Orphaned link skipped: From SKU %s (ID %d) to SKU %s, Link type id: %d';
-+                        $exception = new \Exception(sprintf($formatStr, $sku, $productId, $linkedSku, $linkId));
-+                        $this->_logger->critical($exception);
-+                        continue;
-+                    }
-+                    $linkKey = $this->composeLinkKey($productId, $linkedId, $linkId);
-+                    $productLinkKeys[$linkKey] = $productLinkKeys[$linkKey] ?? $nextLinkId;
-+
-+                    $linkRows[$linkKey] = $linkRows[$linkKey] ?? [
-+                            'link_id' => $productLinkKeys[$linkKey],
-+                            'product_id' => $productId,
-+                            'linked_product_id' => $linkedId,
-+                            'link_type_id' => $linkId,
-+                        ];
-+
-+                    if (!empty($linkPositions[$linkedKey])) {
-+                        $positionRows[] = [
-+                            'link_id' => $productLinkKeys[$linkKey],
-+                            'product_link_attribute_id' => $positionAttrId[$linkId],
-+                            'value' => $linkPositions[$linkedKey],
-+                        ];
-+                    }
-+                    $nextLinkId++;
-+                }
-+            }
-+        }
-+        $this->saveLinksData($resource, $productIds, $linkRows, $positionRows);
-+    }
-+
-+    /**
-+     * Fetches Product Links
-+     *
-+     * @param Link $resource
-+     * @param int $productId
-+     * @return array
-+     */
-+    private function fetchProductLinks(Link $resource, int $productId) : array
-+    {
-+        $productLinkKeys = [];
-+        $select = $this->_connection->select()->from(
-+            $resource->getTable('catalog_product_link'),
-+            ['id' => 'link_id', 'linked_id' => 'linked_product_id', 'link_type_id' => 'link_type_id']
-+        )->where(
-+            'product_id = :product_id'
-+        );
-+        $bind = [':product_id' => $productId];
-+        foreach ($this->_connection->fetchAll($select, $bind) as $linkData) {
-+            $linkKey = $this->composeLinkKey($productId, $linkData['linked_id'], $linkData['link_type_id']);
-+            $productLinkKeys[$linkKey] = $linkData['id'];
-+        }
-+
-+        return $productLinkKeys;
-+    }
-+
-+    /**
-+     * Gets the Id of the Sku
-+     *
-+     * @param string $linkedSku
-+     * @return int|null
-+     */
-+    private function getProductLinkedId(string $linkedSku) : ?int
-+    {
-+        $linkedSku = trim($linkedSku);
-+        $newSku = $this->skuProcessor->getNewSku($linkedSku);
-+        $linkedId = !empty($newSku) ? $newSku['entity_id'] : $this->getExistingSku($linkedSku)['entity_id'];
-+        return $linkedId;
-+    }
-+
-+    /**
-+     * Saves information about product links
-+     *
-+     * @param Link $resource
-+     * @param array $productIds
-+     * @param array $linkRows
-+     * @param array $positionRows
-+     * @throws LocalizedException
-+     */
-+    private function saveLinksData(Link $resource, array $productIds, array $linkRows, array $positionRows)
-+    {
-+        $mainTable = $resource->getMainTable();
-+        if (Import::BEHAVIOR_APPEND != $this->getBehavior() && $productIds) {
-+            $this->_connection->delete(
-+                $mainTable,
-+                $this->_connection->quoteInto('product_id IN (?)', array_unique($productIds))
-+            );
-+        }
-+        if ($linkRows) {
-+            $this->_connection->insertOnDuplicate($mainTable, $linkRows, ['link_id']);
-+        }
-+        if ($positionRows) {
-+            // process linked product positions
-+            $this->_connection->insertOnDuplicate(
-+                $resource->getAttributeTypeTable('int'),
-+                $positionRows,
-+                ['value']
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Composes the link key
-+     *
-+     * @param int $productId
-+     * @param int $linkedId
-+     * @param int $linkTypeId
-+     * @return string
-+     */
-+    private function composeLinkKey(int $productId, int $linkedId, int $linkTypeId) : string
-+    {
-+        return "{$productId}-{$linkedId}-{$linkTypeId}";
-+    }
- }
-diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
-index db5b07279ed..951989146e6 100644
---- a/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
-+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
-@@ -66,6 +66,8 @@ class CategoryProcessor
-     }
- 
-     /**
-+     * Initialize categories
-+     *
-      * @return $this
-      */
-     protected function initCategories()
-@@ -104,7 +106,6 @@ class CategoryProcessor
-      *
-      * @param string $name
-      * @param int $parentId
--     *
-      * @return int
-      */
-     protected function createCategory($name, $parentId)
-@@ -120,13 +121,8 @@ class CategoryProcessor
-         $category->setIsActive(true);
-         $category->setIncludeInMenu(true);
-         $category->setAttributeSetId($category->getDefaultAttributeSetId());
--        try {
--            $category->save();
--            $this->categoriesCache[$category->getId()] = $category;
--        } catch (\Exception $e) {
--            $this->addFailedCategory($category, $e);
--        }
--
-+        $category->save();
-+        $this->categoriesCache[$category->getId()] = $category;
-         return $category->getId();
-     }
- 
-@@ -134,7 +130,6 @@ class CategoryProcessor
-      * Returns ID of category by string path creating nonexistent ones.
-      *
-      * @param string $categoryPath
--     *
-      * @return int
-      */
-     protected function upsertCategory($categoryPath)
-@@ -165,7 +160,6 @@ class CategoryProcessor
-      *
-      * @param string $categoriesString
-      * @param string $categoriesSeparator
--     *
-      * @return array
-      */
-     public function upsertCategories($categoriesString, $categoriesSeparator)
-@@ -234,7 +228,7 @@ class CategoryProcessor
-      */
-     public function getCategoryById($categoryId)
-     {
--        return isset($this->categoriesCache[$categoryId]) ? $this->categoriesCache[$categoryId] : null;
-+        return $this->categoriesCache[$categoryId] ?? null;
-     }
- 
-     /**
-diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
-index ec7c6a11729..d43dc11a68f 100644
---- a/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
-+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
-@@ -103,7 +103,7 @@ class MediaGalleryProcessor
-     /**
-      * Save product media gallery.
-      *
--     * @param $mediaGalleryData
-+     * @param array $mediaGalleryData
-      * @return void
-      */
-     public function saveMediaGallery(array $mediaGalleryData)
-@@ -152,14 +152,37 @@ class MediaGalleryProcessor
-      * @return void
-      */
-     public function updateMediaGalleryLabels(array $labels)
-+    {
-+        $this->updateMediaGalleryField($labels, 'label');
-+    }
-+
-+    /**
-+     * Update 'disabled' field for media gallery entity
-+     *
-+     * @param array $images
-+     * @return void
-+     */
-+    public function updateMediaGalleryVisibility(array $images)
-+    {
-+        $this->updateMediaGalleryField($images, 'disabled');
-+    }
-+
-+    /**
-+     * Update value for requested field in media gallery entities
-+     *
-+     * @param array $data
-+     * @param string $field
-+     * @return void
-+     */
-+    private function updateMediaGalleryField(array $data, $field)
-     {
-         $insertData = [];
--        foreach ($labels as $label) {
--            $imageData = $label['imageData'];
-+        foreach ($data as $datum) {
-+            $imageData = $datum['imageData'];
- 
--            if ($imageData['label'] === null) {
-+            if ($imageData[$field] === null) {
-                 $insertData[] = [
--                    'label' => $label['label'],
-+                    $field => $datum[$field],
-                     $this->getProductEntityLinkField() => $imageData[$this->getProductEntityLinkField()],
-                     'value_id' => $imageData['value_id'],
-                     'store_id' => Store::DEFAULT_STORE_ID,
-@@ -168,7 +191,7 @@ class MediaGalleryProcessor
-                 $this->connection->update(
-                     $this->mediaGalleryValueTableName,
-                     [
--                        'label' => $label['label'],
-+                        $field => $datum[$field],
-                     ],
-                     [
-                         $this->getProductEntityLinkField() . ' = ?' => $imageData[$this->getProductEntityLinkField()],
-@@ -224,6 +247,7 @@ class MediaGalleryProcessor
-             ),
-             [
-                 'label' => 'mgv.label',
-+                'disabled' => 'mgv.disabled',
-             ]
-         )->joinInner(
-             ['pe' => $this->productEntityTableName],
-@@ -263,7 +287,7 @@ class MediaGalleryProcessor
-     /**
-      * Save media gallery data per store.
-      *
--     * @param $storeId
-+     * @param int $storeId
-      * @param array $mediaGalleryData
-      * @param array $newMediaValues
-      * @param array $valueToProductId
-@@ -339,6 +363,8 @@ class MediaGalleryProcessor
-     }
- 
-     /**
-+     * Get resource.
-+     *
-      * @return \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModel
-      */
-     private function getResource()
-diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
-index ae29fd2ef4b..7435c0bebfc 100644
---- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
-+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
-@@ -333,6 +333,11 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-      */
-     private $optionTypeTitles;
- 
-+    /**
-+     * @var array
-+     */
-+    private $lastOptionTitle;
-+
-     /**
-      * @param \Magento\ImportExport\Model\ResourceModel\Import\Data $importData
-      * @param ResourceConnection $resource
-@@ -426,7 +431,10 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-         );
-         $this->_productEntity->addMessageTemplate(
-             self::ERROR_INVALID_TYPE,
--            __('Value for \'type\' sub attribute in \'custom_options\' attribute contains incorrect value, acceptable values are: \'dropdown\', \'checkbox\'')
-+            __(
-+                'Value for \'type\' sub attribute in \'custom_options\' attribute contains incorrect value, acceptable values are: %1',
-+                '\''.implode('\', \'', array_keys($this->_specificTypes)).'\''
-+            )
-         );
-         $this->_productEntity->addMessageTemplate(self::ERROR_EMPTY_TITLE, __('Please enter a value for title.'));
-         $this->_productEntity->addMessageTemplate(
-@@ -624,7 +632,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-             $this->_addRowsErrors(self::ERROR_AMBIGUOUS_NEW_NAMES, $errorRows);
-             return false;
-         }
--        if ($this->getBehavior() == \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
-+        if ($this->getBehavior() == Import::BEHAVIOR_APPEND) {
-             $errorRows = $this->_findOldOptionsWithTheSameTitles();
-             if ($errorRows) {
-                 $this->_addRowsErrors(self::ERROR_AMBIGUOUS_OLD_NAMES, $errorRows);
-@@ -962,11 +970,10 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-                         return false;
-                     }
-                 }
--                return true;
-             }
-         }
- 
--        return false;
-+        return true;
-     }
- 
-     /**
-@@ -1117,6 +1124,8 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Process option row.
-+     *
-      * @param string $name
-      * @param array $optionRow
-      * @return array
-@@ -1198,6 +1207,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
- 
-     /**
-      * Import data rows.
-+     *
-      * Additional store view data (option titles) will be sought in store view specified import file rows
-      *
-      * @return boolean
-@@ -1206,7 +1216,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     protected function _importData()
-     {
-         $this->_initProductsSku();
--
-         $nextOptionId = $this->_resourceHelper->getNextAutoincrement($this->_tables['catalog_product_option']);
-         $nextValueId = $this->_resourceHelper->getNextAutoincrement(
-             $this->_tables['catalog_product_option_type_value']
-@@ -1225,7 +1234,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-             $parentCount = [];
-             $childCount = [];
-             $optionsToRemove = [];
--
-             foreach ($bunch as $rowNumber => $rowData) {
-                 if (isset($optionId, $valueId) && empty($rowData[PRODUCT::COL_STORE_VIEW_CODE])) {
-                     $nextOptionId = $optionId;
-@@ -1273,17 +1281,26 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-                         $parentCount,
-                         $childCount
-                     );
-+
-                     $this->_collectOptionTitle($combinedData, $prevOptionId, $titles);
-+                    $this->checkOptionTitles(
-+                        $options,
-+                        $titles,
-+                        $combinedData,
-+                        $prevOptionId,
-+                        $optionId,
-+                        $products,
-+                        $prices
-+                    );
-                 }
-             }
--
-             $this->removeExistingOptions($products, $optionsToRemove);
--
-             $types = [
-                 'values' => $typeValues,
-                 'prices' => $typePrices,
-                 'titles' => $typeTitles,
-             ];
-+            $this->setLastOptionTitle($titles);
-             //Save prepared custom options data.
-             $this->savePreparedCustomOptions(
-                 $products,
-@@ -1293,11 +1310,69 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-                 $types
-             );
-         }
--
-         return true;
-     }
- 
-     /**
-+     * Check options titles.
-+     *
-+     * If products were split up between bunches,
-+     * this function will add needed option for option titles
-+     *
-+     * @param array $options
-+     * @param array $titles
-+     * @param array $combinedData
-+     * @param int $prevOptionId
-+     * @param int $optionId
-+     * @param array $products
-+     * @param array $prices
-+     * @return void
-+     */
-+    private function checkOptionTitles(
-+        array &$options,
-+        array &$titles,
-+        array $combinedData,
-+        int &$prevOptionId,
-+        int &$optionId,
-+        array $products,
-+        array $prices
-+    ) : void {
-+        $titlesCount = count($titles);
-+        if ($titlesCount > 0 && count($options) !== $titlesCount) {
-+            $combinedData[Product::COL_STORE_VIEW_CODE] = '';
-+            $optionId--;
-+            $option = $this->_collectOptionMainData(
-+                $combinedData,
-+                $prevOptionId,
-+                $optionId,
-+                $products,
-+                $prices
-+            );
-+            if ($option) {
-+                $options[] = $option;
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Setting last Custom Option Title
-+     * to use it later in _collectOptionTitle
-+     * to set correct title for default store view
-+     *
-+     * @param array $titles
-+     */
-+    private function setLastOptionTitle(array &$titles) : void
-+    {
-+        if (count($titles) > 0) {
-+            end($titles);
-+            $key = key($titles);
-+            $this->lastOptionTitle[$key] = $titles[$key];
-+        }
-+    }
-+
-+    /**
-+     * Remove existing options.
-+     *
-      * Remove all existing options if import behaviour is APPEND
-      * in other case remove options for products with empty "custom_options" row only.
-      *
-@@ -1308,7 +1383,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-      */
-     private function removeExistingOptions(array $products, array $optionsToRemove): void
-     {
--        if ($this->getBehavior() != \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
-+        if ($this->getBehavior() != Import::BEHAVIOR_APPEND) {
-             $this->_deleteEntities(array_keys($products));
-         } elseif (!empty($optionsToRemove)) {
-             // Remove options for products with empty "custom_options" row
-@@ -1447,8 +1522,12 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-         $defaultStoreId = Store::DEFAULT_STORE_ID;
-         if (!empty($rowData[self::COLUMN_TITLE])) {
-             if (!isset($titles[$prevOptionId][$defaultStoreId])) {
--                // ensure default title is set
--                $titles[$prevOptionId][$defaultStoreId] = $rowData[self::COLUMN_TITLE];
-+                if (isset($this->lastOptionTitle[$prevOptionId])) {
-+                     $titles[$prevOptionId] = $this->lastOptionTitle[$prevOptionId];
-+                     unset($this->lastOptionTitle);
-+                } else {
-+                    $titles[$prevOptionId][$defaultStoreId] = $rowData[self::COLUMN_TITLE];
-+                }
-             }
-             $titles[$prevOptionId][$this->_rowStoreId] = $rowData[self::COLUMN_TITLE];
-         }
-@@ -1547,6 +1626,8 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     }
- 
-     /**
-+     * Rarse required data.
-+     *
-      * Parse required data from current row and store to class internal variables some data
-      * for underlying dependent rows
-      *
-@@ -1715,7 +1796,8 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-             ];
- 
-             $priceData = false;
--            if (!empty($rowData[self::COLUMN_ROW_PRICE])) {
-+            $customOptionRowPrice = $rowData[self::COLUMN_ROW_PRICE];
-+            if (!empty($customOptionRowPrice) || $customOptionRowPrice === '0') {
-                 $priceData = [
-                     'price' => (double)rtrim($rowData[self::COLUMN_ROW_PRICE], '%'),
-                     'price_type' => 'fixed',
-@@ -2028,7 +2110,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-         array $types
-     ): void {
-         if ($this->_isReadyForSaving($options, $titles, $types['values'])) {
--            if ($this->getBehavior() == \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
-+            if ($this->getBehavior() == Import::BEHAVIOR_APPEND) {
-                 $this->_compareOptionsWithExisting($options, $titles, $prices, $types['values']);
-                 $this->restoreOriginalOptionTypeIds($types['values'], $types['prices'], $types['titles']);
-             }
-diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php
-index addd1523f87..ea6049ba651 100644
---- a/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php
-+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php
-@@ -142,7 +142,7 @@ class SkuProcessor
-     {
-         if ($sku !== null) {
-             $sku = strtolower($sku);
--            return isset($this->newSkus[$sku]) ? $this->newSkus[$sku] : null;
-+            return $this->newSkus[$sku] ?? null;
-         }
-         return $this->newSkus;
-     }
-diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
-index be5644e22b0..3dff0188a7d 100644
---- a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
-+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
-@@ -75,7 +75,7 @@ class StoreResolver
-             $this->_initWebsites();
-         }
-         if ($code) {
--            return isset($this->websiteCodeToId[$code]) ? $this->websiteCodeToId[$code] : null;
-+            return $this->websiteCodeToId[$code] ?? null;
-         }
-         return $this->websiteCodeToId;
-     }
-@@ -90,7 +90,7 @@ class StoreResolver
-             $this->_initWebsites();
-         }
-         if ($code) {
--            return isset($this->websiteCodeToStoreIds[$code]) ? $this->websiteCodeToStoreIds[$code] : null;
-+            return $this->websiteCodeToStoreIds[$code] ?? null;
-         }
-         return $this->websiteCodeToStoreIds;
-     }
-@@ -119,7 +119,7 @@ class StoreResolver
-             $this->_initStores();
-         }
-         if ($code) {
--            return isset($this->storeCodeToId[$code]) ? $this->storeCodeToId[$code] : null;
-+            return $this->storeCodeToId[$code] ??  null;
-         }
-         return $this->storeCodeToId;
-     }
-@@ -134,7 +134,7 @@ class StoreResolver
-             $this->_initStores();
-         }
-         if ($code) {
--            return isset($this->storeIdToWebsiteStoreIds[$code]) ? $this->storeIdToWebsiteStoreIds[$code] : null;
-+            return $this->storeIdToWebsiteStoreIds[$code] ?? null;
-         }
-         return $this->storeIdToWebsiteStoreIds;
-     }
-diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
-index afd018f077d..3b6caef66ce 100644
---- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
-+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
-@@ -195,6 +195,8 @@ abstract class AbstractType
-     }
- 
-     /**
-+     * Initialize template for error message.
-+     *
-      * @param array $templateCollection
-      * @return $this
-      */
-@@ -377,6 +379,8 @@ abstract class AbstractType
-     }
- 
-     /**
-+     * Adding attribute option.
-+     *
-      * In case we've dynamically added new attribute option during import we need to add it to our cache
-      * in order to keep it up to date.
-      *
-@@ -508,8 +512,10 @@ abstract class AbstractType
-     }
- 
-     /**
--     * Prepare attributes values for save: exclude non-existent, static or with empty values attributes;
--     * set default values if needed
-+     * Adding default attribute to product before save.
-+     *
-+     * Prepare attributes values for save: exclude non-existent, static or with empty values attributes,
-+     * set default values if needed.
-      *
-      * @param array $rowData
-      * @param bool $withDefaultValue
-@@ -537,9 +543,9 @@ abstract class AbstractType
-                 } else {
-                     $resultAttrs[$attrCode] = $rowData[$attrCode];
-                 }
--            } elseif (array_key_exists($attrCode, $rowData)) {
-+            } elseif (array_key_exists($attrCode, $rowData) && empty($rowData['_store'])) {
-                 $resultAttrs[$attrCode] = $rowData[$attrCode];
--            } elseif ($withDefaultValue && null !== $attrParams['default_value']) {
-+            } elseif ($withDefaultValue && null !== $attrParams['default_value'] && empty($rowData['_store'])) {
-                 $resultAttrs[$attrCode] = $attrParams['default_value'];
-             }
-         }
-@@ -611,7 +617,8 @@ abstract class AbstractType
-     }
- 
-     /**
--     * Clean cached values
-+     * Clean cached values.
-+     *
-      * @since 100.2.0
-      */
-     public function __destruct()
-diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
-index 2aa21059918..4b7416f6ad9 100644
---- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
-+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
-@@ -7,6 +7,7 @@ namespace Magento\CatalogImportExport\Model\Import\Product;
- 
- use Magento\CatalogImportExport\Model\Import\Product;
- use Magento\Framework\Validator\AbstractValidator;
-+use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
- 
- /**
-  * Class Validator
-@@ -60,6 +61,8 @@ class Validator extends AbstractValidator implements RowValidatorInterface
-     }
- 
-     /**
-+     * Text validation
-+     *
-      * @param mixed $attrCode
-      * @param string $type
-      * @return bool
-@@ -69,6 +72,8 @@ class Validator extends AbstractValidator implements RowValidatorInterface
-         $val = $this->string->cleanString($this->_rowData[$attrCode]);
-         if ($type == 'text') {
-             $valid = $this->string->strlen($val) < Product::DB_MAX_TEXT_LENGTH;
-+        } else if ($attrCode == Product::COL_SKU) {
-+            $valid = $this->string->strlen($val) <= SKU::SKU_MAX_LENGTH;
-         } else {
-             $valid = $this->string->strlen($val) < Product::DB_MAX_VARCHAR_LENGTH;
-         }
-@@ -105,6 +110,8 @@ class Validator extends AbstractValidator implements RowValidatorInterface
-     }
- 
-     /**
-+     * Numeric validation
-+     *
-      * @param mixed $attrCode
-      * @param string $type
-      * @return bool
-@@ -132,6 +139,8 @@ class Validator extends AbstractValidator implements RowValidatorInterface
-     }
- 
-     /**
-+     * Is required attribute valid
-+     *
-      * @param string $attrCode
-      * @param array $attributeParams
-      * @param array $rowData
-@@ -159,6 +168,8 @@ class Validator extends AbstractValidator implements RowValidatorInterface
-     }
- 
-     /**
-+     * Is attribute valid
-+     *
-      * @param string $attrCode
-      * @param array $attrParams
-      * @param array $rowData
-@@ -255,6 +266,8 @@ class Validator extends AbstractValidator implements RowValidatorInterface
-     }
- 
-     /**
-+     * Set invalid attribute
-+     *
-      * @param string|null $attribute
-      * @return void
-      * @since 100.1.0
-@@ -265,6 +278,8 @@ class Validator extends AbstractValidator implements RowValidatorInterface
-     }
- 
-     /**
-+     * Get invalid attribute
-+     *
-      * @return string
-      * @since 100.1.0
-      */
-@@ -274,6 +289,8 @@ class Validator extends AbstractValidator implements RowValidatorInterface
-     }
- 
-     /**
-+     * Is valid attributes
-+     *
-      * @return bool
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      */
-@@ -300,7 +317,7 @@ class Validator extends AbstractValidator implements RowValidatorInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isValid($value)
-     {
-@@ -331,6 +348,8 @@ class Validator extends AbstractValidator implements RowValidatorInterface
-     }
- 
-     /**
-+     * Init
-+     *
-      * @param \Magento\CatalogImportExport\Model\Import\Product $context
-      * @return $this
-      */
-diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
-index e7ffe408cc7..3ac7f98818d 100644
---- a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
-+++ b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
-@@ -101,7 +101,7 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
-      * @param \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator
-      * @param \Magento\Framework\Filesystem $filesystem
-      * @param \Magento\Framework\Filesystem\File\ReadFactory $readFactory
--     * @param null $filePath
-+     * @param string|null $filePath
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function __construct(
-@@ -113,15 +113,15 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
-         \Magento\Framework\Filesystem\File\ReadFactory $readFactory,
-         $filePath = null
-     ) {
--        if ($filePath !== null) {
--            $this->_setUploadFile($filePath);
--        }
-         $this->_imageFactory = $imageFactory;
-         $this->_coreFileStorageDb = $coreFileStorageDb;
-         $this->_coreFileStorage = $coreFileStorage;
-         $this->_validator = $validator;
-         $this->_directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
-         $this->_readFactory = $readFactory;
-+        if ($filePath !== null) {
-+            $this->_setUploadFile($filePath);
-+        }
-     }
- 
-     /**
-@@ -146,20 +146,24 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
-      * @param string $fileName
-      * @param bool $renameFileOff
-      * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function move($fileName, $renameFileOff = false)
-     {
-         if ($renameFileOff) {
-             $this->setAllowRenameFiles(false);
-         }
-+
-+        if ($this->getTmpDir()) {
-+            $filePath = $this->getTmpDir() . '/';
-+        } else {
-+            $filePath = '';
-+        }
-+
-         if (preg_match('/\bhttps?:\/\//i', $fileName, $matches)) {
-             $url = str_replace($matches[0], '', $fileName);
--
--            if ($matches[0] === $this->httpScheme) {
--                $read = $this->_readFactory->create($url, DriverPool::HTTP);
--            } else {
--                $read = $this->_readFactory->create($url, DriverPool::HTTPS);
--            }
-+            $driver = $matches[0] === $this->httpScheme ? DriverPool::HTTP : DriverPool::HTTPS;
-+            $read = $this->_readFactory->create($url, $driver);
- 
-             //only use filename (for URI with query parameters)
-             $parsedUrlPath = parse_url($url, PHP_URL_PATH);
-@@ -170,24 +174,19 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
-                 }
-             }
- 
--            if ($this->getTmpDir()) {
--                $filePath = $this->getTmpDir() . '/';
--            } else {
--                $filePath = '';
-+            $fileExtension = pathinfo($fileName, PATHINFO_EXTENSION);
-+            if ($fileExtension && !$this->checkAllowedExtension($fileExtension)) {
-+                throw new \Magento\Framework\Exception\LocalizedException(__('Disallowed file type.'));
-             }
-+
-             $fileName = preg_replace('/[^a-z0-9\._-]+/i', '', $fileName);
--            $filePath = $this->_directory->getRelativePath($filePath . $fileName);
-+            $relativePath = $this->_directory->getRelativePath($filePath . $fileName);
-             $this->_directory->writeFile(
--                $filePath,
-+                $relativePath,
-                 $read->readAll()
-             );
-         }
- 
--        if ($this->getTmpDir()) {
--            $filePath = $this->getTmpDir() . '/';
--        } else {
--            $filePath = '';
--        }
-         $filePath = $this->_directory->getRelativePath($filePath . $fileName);
-         $this->_setUploadFile($filePath);
-         $destDir = $this->_directory->getAbsolutePath($this->getDestDir());
-@@ -353,7 +352,7 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function chmod($file)
-     {
-diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
-new file mode 100644
-index 00000000000..65588daa96c
---- /dev/null
-+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
-@@ -0,0 +1,86 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+
-+    <!-- Export products using filtering by attribute -->
-+    <actionGroup name="exportProductsFilterByAttribute">
-+        <arguments>
-+            <argument name="attribute" type="string"/>
-+            <argument name="attributeData" type="string"/>
-+        </arguments>
-+        <selectOption selector="{{AdminExportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
-+        <waitForElementVisible selector="{{AdminExportMainSection.entityAttributes}}" stepKey="waitForElementVisible"/>
-+        <scrollTo selector="{{AdminExportAttributeSection.chooseAttribute('attribute')}}" stepKey="scrollToAttribute" />
-+        <checkOption selector="{{AdminExportAttributeSection.chooseAttribute('attribute')}}" stepKey="selectAttribute"/>
-+        <fillField selector="{{AdminExportAttributeSection.fillFilter('attribute')}}" userInput="{{attributeData}}" stepKey="setDataInField"/>
-+        <waitForPageLoad stepKey="waitForUserInput"/>
-+        <scrollTo selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="scrollToContinue" />
-+        <click selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="clickContinueButton"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Message is added to queue, wait to get your file soon" stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+
-+    <!-- Export products without filtering -->
-+    <actionGroup name="exportAllProducts">
-+        <selectOption selector="{{AdminExportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
-+        <waitForElementVisible selector="{{AdminExportMainSection.entityAttributes}}" stepKey="waitForElementVisible" time="5"/>
-+        <scrollTo selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="scrollToContinue"/>
-+        <wait stepKey="waitForScroll" time="5"/>
-+        <click selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="clickContinueButton"/>
-+        <wait stepKey="waitForClick" time="5"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Message is added to queue, wait to get your file soon" stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+
-+    <!-- Download first file in the grid -->
-+    <actionGroup name="downloadFileByRowIndex">
-+        <arguments>
-+            <argument name="rowIndex" type="string"/>
-+        </arguments>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitFormReload"/>
-+        <click stepKey="clickSelectBtn" selector="{{AdminExportAttributeSection.selectByIndex(rowIndex)}}"/>
-+        <click stepKey="clickOnDownload" selector="{{AdminExportAttributeSection.download(rowIndex)}}" after="clickSelectBtn"/>
-+    </actionGroup>
-+
-+    <!-- Delete exported file -->
-+    <actionGroup name="deleteExportedFile">
-+        <arguments>
-+            <argument name="rowIndex" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
-+        <click stepKey="clickSelectBtn" selector="{{AdminExportAttributeSection.selectByIndex(rowIndex)}}"/>
-+        <click stepKey="clickOnDelete" selector="{{AdminExportAttributeSection.delete(rowIndex)}}" after="clickSelectBtn"/>
-+        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
-+        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmDelete"/>
-+        <waitForElementVisible selector="{{AdminDataGridTableSection.dataGridEmpty}}" stepKey="waitDataGridEmptyMessageAppears"/>
-+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
-+    </actionGroup>
-+
-+    <actionGroup name="deleteAllExportedFiles">
-+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
-+        <executeInSelenium
-+            function="
-+                function ($webdriver) use ($I) {
-+                    $buttons = $webdriver->findElements(\Facebook\WebDriver\WebDriverBy::xpath('//tr[@data-repeat-index=\'0\']//button'));
-+                    while(!empty($buttons)) {
-+                        $buttons[0]->click();
-+                        $I->waitForElementVisible('//tr[@data-repeat-index=\'0\']//a[text()=\'Delete\']', 10);
-+                        $deleteButton = $webdriver->findElement(\Facebook\WebDriver\WebDriverBy::xpath('//tr[@data-repeat-index=\'0\']//a[text()=\'Delete\']'));
-+                        $deleteButton->click();
-+                        $I->waitForElementVisible('.modal-popup.confirm button.action-accept', 10);
-+                        $I->click('.modal-popup.confirm button.action-accept');
-+                        $I->waitForPageLoad(60);
-+                        $buttons = $webdriver->findElements(\Facebook\WebDriver\WebDriverBy::xpath('//tr[@data-repeat-index=\'0\']//button'));
-+                    }
-+                }"
-+            stepKey="deleteAllExportedFilesOneByOne"/>
-+        <waitForElementVisible selector="{{AdminDataGridTableSection.dataGridEmpty}}" stepKey="waitDataGridEmptyMessageAppears"/>
-+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
-new file mode 100644
-index 00000000000..281c8c0db30
---- /dev/null
-+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
-@@ -0,0 +1,130 @@
-+<?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="AdminExportBundleProductTest">
-+        <annotations>
-+            <features value="CatalogImportExport"/>
-+            <stories value="Export products"/>
-+            <title value="Export Bundle Product"/>
-+            <description value="Admin should be able to export Bundle Product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14008"/>
-+            <group value="catalog_import_export"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-15934"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!--Create bundle product with dynamic price with two simple products -->
-+            <createData entity="SimpleProduct2" stepKey="firstSimpleProductForDynamic"/>
-+            <createData entity="SimpleProduct2" stepKey="secondSimpleProductForDynamic"/>
-+            <createData entity="ApiBundleProduct" stepKey="createDynamicBundleProduct"/>
-+            <createData entity="DropDownBundleOption" stepKey="createFirstBundleOption">
-+                <requiredEntity createDataKey="createDynamicBundleProduct"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="firstLinkOptionToDynamicProduct">
-+                <requiredEntity createDataKey="createDynamicBundleProduct"/>
-+                <requiredEntity createDataKey="createFirstBundleOption"/>
-+                <requiredEntity createDataKey="firstSimpleProductForDynamic"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="secondLinkOptionToDynamicProduct">
-+                <requiredEntity createDataKey="createDynamicBundleProduct"/>
-+                <requiredEntity createDataKey="createFirstBundleOption"/>
-+                <requiredEntity createDataKey="secondSimpleProductForDynamic"/>
-+            </createData>
-+
-+            <!-- Create bundle product with fixed price with two simple products -->
-+            <createData entity="SimpleProduct2" stepKey="firstSimpleProductForFixed"/>
-+            <createData entity="SimpleProduct2" stepKey="secondSimpleProductForFixed"/>
-+            <createData entity="ApiFixedBundleProduct" stepKey="createFixedBundleProduct"/>
-+            <createData entity="DropDownBundleOption" stepKey="createSecondBundleOption">
-+                <requiredEntity createDataKey="createFixedBundleProduct"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="firstLinkOptionToFixedProduct">
-+                <requiredEntity createDataKey="createFixedBundleProduct"/>
-+                <requiredEntity createDataKey="createSecondBundleOption"/>
-+                <requiredEntity createDataKey="firstSimpleProductForFixed"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="secondLinkOptionToFixedProduct">
-+                <requiredEntity createDataKey="createFixedBundleProduct"/>
-+                <requiredEntity createDataKey="createSecondBundleOption"/>
-+                <requiredEntity createDataKey="secondSimpleProductForFixed"/>
-+            </createData>
-+
-+            <!-- Create bundle product with custom textarea attribute with two simple products -->
-+            <createData entity="productAttributeWysiwyg" stepKey="createProductAttribute"/>
-+            <createData entity="AddToDefaultSet" stepKey="addToDefaultAttributeSet">
-+                <requiredEntity createDataKey="createProductAttribute"/>
-+            </createData>
-+            <createData entity="ApiFixedBundleProduct" stepKey="createFixedBundleProductWithAttribute">
-+                <requiredEntity createDataKey="addToDefaultAttributeSet"/>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="firstSimpleProductForFixedWithAttribute"/>
-+            <createData entity="SimpleProduct2" stepKey="secondSimpleProductForFixedWithAttribute"/>
-+            <createData entity="DropDownBundleOption" stepKey="createBundleOptionWithAttribute">
-+                <requiredEntity createDataKey="createFixedBundleProductWithAttribute"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="firstLinkOptionToFixedProductWithAttribute">
-+                <requiredEntity createDataKey="createFixedBundleProductWithAttribute"/>
-+                <requiredEntity createDataKey="createBundleOptionWithAttribute"/>
-+                <requiredEntity createDataKey="firstSimpleProductForFixedWithAttribute"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="secondLinkOptionToFixedProductWithAttribute">
-+                <requiredEntity createDataKey="createFixedBundleProductWithAttribute"/>
-+                <requiredEntity createDataKey="createBundleOptionWithAttribute"/>
-+                <requiredEntity createDataKey="secondSimpleProductForFixedWithAttribute"/>
-+            </createData>
-+
-+            <!-- Run cron twice -->
-+            <magentoCLI command="cron:run" stepKey="runCron1"/>
-+            <magentoCLI command="cron:run" stepKey="runCron2"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="deleteAllExportedFiles" stepKey="clearExportedFilesList"/>
-+        </before>
-+        <after>
-+            <!-- Delete products creations -->
-+            <deleteData createDataKey="createDynamicBundleProduct" stepKey="deleteDynamicBundleProduct"/>
-+            <deleteData createDataKey="firstSimpleProductForDynamic" stepKey="deleteFirstSimpleProductForDynamic"/>
-+            <deleteData createDataKey="secondSimpleProductForDynamic" stepKey="deleteSecondSimpleProductForDynamic"/>
-+            <deleteData createDataKey="createFixedBundleProduct" stepKey="deleteFixedBundleProduct"/>
-+            <deleteData createDataKey="firstSimpleProductForFixed" stepKey="deleteFirstSimpleProductForFixed"/>
-+            <deleteData createDataKey="secondSimpleProductForFixed" stepKey="deleteSecondSimpleProductForFixed"/>
-+            <deleteData createDataKey="createFixedBundleProductWithAttribute" stepKey="deleteFixedBundleProductWithAttribute"/>
-+            <deleteData createDataKey="firstSimpleProductForFixedWithAttribute" stepKey="deleteFirstSimpleProductForFixedWithAttribute"/>
-+            <deleteData createDataKey="secondSimpleProductForFixedWithAttribute" stepKey="deleteSecondSimpleProductForFixedWithAttribute"/>
-+            <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
-+
-+            <!-- Delete exported file -->
-+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
-+                <argument name="rowIndex" value="0"/>
-+            </actionGroup>
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to export page -->
-+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
-+
-+        <!-- Export created below products -->
-+        <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
-+
-+        <!-- Run cron -->
-+        <magentoCLI command="cron:run" stepKey="runCron3"/>
-+        <magentoCLI command="cron:run" stepKey="runCron4"/>
-+
-+        <!-- Download product -->
-+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
-+            <argument name="rowIndex" value="0"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
-new file mode 100644
-index 00000000000..c47b7dc83af
---- /dev/null
-+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
-@@ -0,0 +1,95 @@
-+<?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="AdminExportGroupedProductWithSpecialPriceTest">
-+        <annotations>
-+            <features value="CatalogImportExport"/>
-+            <stories value="Export products"/>
-+            <title value="Export grouped product with special price"/>
-+            <description value="Admin should be able to export grouped product with special price"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14009"/>
-+            <group value="catalog_import_export"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-15934"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Create first simple product and add special price  -->
-+            <createData entity="SimpleProduct2" stepKey="createFirstSimpleProduct"/>
-+            <createData entity="specialProductPrice2" stepKey="specialPriceToFirstProduct">
-+                <requiredEntity createDataKey="createFirstSimpleProduct"/>
-+            </createData>
-+
-+             <!-- Create second simple product and add special price-->
-+            <createData entity="SimpleProduct2" stepKey="createSecondSimpleProduct"/>
-+            <createData entity="specialProductPrice2" stepKey="specialPriceToSecondProduct">
-+                <requiredEntity createDataKey="createSecondSimpleProduct"/>
-+            </createData>
-+
-+            <!-- Create category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create group product with created below simple products -->
-+            <createData entity="ApiGroupedProduct2" stepKey="createGroupedProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="OneSimpleProductLink" stepKey="addFirstProduct">
-+                <requiredEntity createDataKey="createGroupedProduct"/>
-+                <requiredEntity createDataKey="createFirstSimpleProduct"/>
-+            </createData>
-+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addFirstProduct" stepKey="addSecondProduct">
-+                <requiredEntity createDataKey="createGroupedProduct"/>
-+                <requiredEntity createDataKey="createSecondSimpleProduct"/>
-+            </updateData>
-+
-+            <!-- Run cron twice -->
-+            <magentoCLI command="cron:run" stepKey="runCron1"/>
-+            <magentoCLI command="cron:run" stepKey="runCron2"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="deleteAllExportedFiles" stepKey="clearExportedFilesList"/>
-+        </before>
-+        <after>
-+            <!-- Deleted created products -->
-+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
-+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
-+            <deleteData createDataKey="createGroupedProduct" stepKey="deleteGroupedProduct"/>
-+
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete exported file -->
-+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
-+                <argument name="rowIndex" value="0"/>
-+            </actionGroup>
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to export page -->
-+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
-+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
-+
-+        <!-- Export created below products -->
-+        <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
-+
-+        <!-- Run cron -->
-+        <magentoCLI command="cron:run" stepKey="runCron3"/>
-+        <magentoCLI command="cron:run" stepKey="runCron4"/>
-+
-+        <!-- Download product -->
-+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
-+            <argument name="rowIndex" value="0"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
-new file mode 100644
-index 00000000000..160abe61799
---- /dev/null
-+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
-@@ -0,0 +1,122 @@
-+<?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="AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest">
-+        <annotations>
-+            <features value="CatalogImportExport"/>
-+            <stories value="Export products"/>
-+            <title value="Export Simple and Configurable products with custom options"/>
-+            <description value="Admin should be able to export Simple and Configurable products with custom options"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14005"/>
-+            <group value="catalog_import_export"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-15934"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Create configurable product with two attributes -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeFirstOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeSecondOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeFirstOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeSecondOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Add custom options to configurable product -->
-+            <updateData createDataKey="createConfigProduct" entity="productWithOptions" stepKey="updateProductWithOptions"/>
-+
-+            <!-- Create two simple product which will be the part of configurable product -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigFirstChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigSecondChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
-+            </createData>
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
-+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
-+            </createData>
-+
-+            <!-- Add created below children products to configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddFirstChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigFirstChildProduct"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddSecondChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigSecondChildProduct"/>
-+            </createData>
-+
-+            <!-- Run cron twice -->
-+            <magentoCLI command="cron:run" stepKey="runCron1"/>
-+            <magentoCLI command="cron:run" stepKey="runCron2"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="deleteAllExportedFiles" stepKey="clearExportedFilesList"/>
-+        </before>
-+        <after>
-+            <!-- Delete configurable product creation -->
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigFirstChildProduct" stepKey="deleteConfigFirstChildProduct"/>
-+            <deleteData createDataKey="createConfigSecondChildProduct" stepKey="deleteConfigSecondChildProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete exported file -->
-+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
-+                <argument name="rowIndex" value="0"/>
-+            </actionGroup>
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to export page -->
-+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
-+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
-+
-+        <!-- Fill entity attributes data -->
-+        <actionGroup ref="exportProductsFilterByAttribute" stepKey="exportProductBySku">
-+            <argument name="attribute" value="sku"/>
-+            <argument name="attributeData" value="$$createConfigProduct.sku$$"/>
-+        </actionGroup>
-+
-+        <!-- Run cron -->
-+        <magentoCLI command="cron:run" stepKey="runCron3"/>
-+        <magentoCLI command="cron:run" stepKey="runCron4"/>
-+
-+        <!-- Download product -->
-+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
-+            <argument name="rowIndex" value="0"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
-new file mode 100644
-index 00000000000..3b8da4055ab
---- /dev/null
-+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
-@@ -0,0 +1,138 @@
-+<?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="AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest">
-+        <annotations>
-+            <features value="CatalogImportExport"/>
-+            <stories value="Export products"/>
-+            <title value="Export Simple product and Configurable products with assigned images"/>
-+            <description value="Admin should be able to export Simple and Configurable products with assigned images"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14004"/>
-+            <group value="catalog_import_export"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Create configurable product with two attributes -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeFirstOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeSecondOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeFirstOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeSecondOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create first simple product which will be the part of configurable product -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigFirstChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
-+            </createData>
-+
-+            <!-- Add image to first simple product -->
-+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigChildFirstProductImage">
-+                <requiredEntity createDataKey="createConfigFirstChildProduct"/>
-+            </createData>
-+
-+            <!-- Create second simple product which will be the part of configurable product -->
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigSecondChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
-+            </createData>
-+
-+            <!-- Add image to second simple product -->
-+            <createData entity="ApiProductAttributeMediaGalleryEntryMagentoLogo" stepKey="createConfigSecondChildProductImage">
-+                <requiredEntity createDataKey="createConfigSecondChildProduct"/>
-+            </createData>
-+
-+            <!-- Add two options to configurable product -->
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
-+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
-+            </createData>
-+
-+            <!-- Add created below children products to configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddFirstChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigFirstChildProduct"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddSecondChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigSecondChildProduct"/>
-+            </createData>
-+
-+            <!-- Add image to configurable product -->
-+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigProductImage">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+            </createData>
-+
-+            <!-- Run cron twice -->
-+            <magentoCLI command="cron:run" stepKey="runCron1"/>
-+            <magentoCLI command="cron:run" stepKey="runCron2"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="deleteAllExportedFiles" stepKey="clearExportedFilesList"/>
-+        </before>
-+        <after>
-+            <!-- Delete configurable product creation -->
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigFirstChildProduct" stepKey="deleteConfigFirstChildProduct"/>
-+            <deleteData createDataKey="createConfigSecondChildProduct" stepKey="deleteConfigSecondChildProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete exported file -->
-+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
-+                <argument name="rowIndex" value="0"/>
-+            </actionGroup>
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to export page -->
-+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
-+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
-+
-+        <!-- Fill entity attributes data -->
-+        <actionGroup ref="exportProductsFilterByAttribute" stepKey="exportProductBySku">
-+            <argument name="attribute" value="sku"/>
-+            <argument name="attributeData" value="$$createConfigProduct.sku$$"/>
-+        </actionGroup>
-+
-+        <!-- Run cron -->
-+        <magentoCLI command="cron:run" stepKey="runCron3"/>
-+        <magentoCLI command="cron:run" stepKey="runCron4"/>
-+
-+        <!-- Download product -->
-+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
-+            <argument name="rowIndex" value="0"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
-new file mode 100644
-index 00000000000..271b4621d1a
---- /dev/null
-+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
-@@ -0,0 +1,117 @@
-+<?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="AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest">
-+        <annotations>
-+            <features value="CatalogImportExport"/>
-+            <stories value="Export products"/>
-+            <title value="Export Simple Product assigned to Main Website and Configurable Product assigned to Custom Website"/>
-+            <description value="Admin should be able to export Simple Product assigned to Main Website and Configurable Product assigned to Custom Website"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14006"/>
-+            <group value="catalog_import_export"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create simple product -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Create configurable product -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeFirstOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeSecondOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeFirstOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeSecondOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create two simple product which will be the part of configurable product -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigFirstChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigSecondChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
-+            </createData>
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
-+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddFirstChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigFirstChildProduct"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddSecondChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigSecondChildProduct"/>
-+            </createData>
-+
-+            <!-- Run cron twice -->
-+            <magentoCLI command="cron:run" stepKey="runCron1"/>
-+            <magentoCLI command="cron:run" stepKey="runCron2"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="deleteAllExportedFiles" stepKey="clearExportedFilesList"/>
-+        </before>
-+        <after>
-+            <!-- Delete simple product -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+
-+            <!-- Delete configurable product creation -->
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigFirstChildProduct" stepKey="deleteConfigFirstChildProduct"/>
-+            <deleteData createDataKey="createConfigSecondChildProduct" stepKey="deleteConfigSecondChildProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete exported file -->
-+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
-+                <argument name="rowIndex" value="0"/>
-+            </actionGroup>
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to export page -->
-+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
-+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
-+
-+        <!-- Export created below products -->
-+        <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
-+
-+        <!-- Run cron -->
-+        <magentoCLI command="cron:run" stepKey="runCron3"/>
-+        <magentoCLI command="cron:run" stepKey="runCron4"/>
-+
-+        <!-- Download product -->
-+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
-+            <argument name="rowIndex" value="0"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
-new file mode 100644
-index 00000000000..f958978a9ef
---- /dev/null
-+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
-@@ -0,0 +1,72 @@
-+<?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="AdminExportSimpleProductWithCustomAttributeTest">
-+        <annotations>
-+            <features value="CatalogImportExport"/>
-+            <stories value="Export products"/>
-+            <title value="Export Simple Product with custom attribute"/>
-+            <description value="Admin should be able to export Simple Product with custom attribute"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14007"/>
-+            <group value="catalog_import_export"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-15934"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Create simple product with custom attribute set -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
-+            <createData entity="SimpleProductWithCustomAttributeSet" stepKey="createSimpleProductWithCustomAttributeSet">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <requiredEntity createDataKey="createAttributeSet"/>
-+            </createData>
-+
-+            <!-- Run cron twice -->
-+            <magentoCLI command="cron:run" stepKey="runCron1"/>
-+            <magentoCLI command="cron:run" stepKey="runCron2"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="deleteAllExportedFiles" stepKey="clearExportedFilesList"/>
-+        </before>
-+        <after>
-+            <!-- Delete product creations -->
-+            <deleteData createDataKey="createSimpleProductWithCustomAttributeSet" stepKey="deleteSimpleProductWithCustomAttributeSet"/>
-+            <deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete exported file -->
-+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
-+                <argument name="rowIndex" value="0"/>
-+            </actionGroup>
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to export page -->
-+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
-+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
-+
-+        <!-- Export created below products -->
-+        <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
-+
-+        <!-- Run cron -->
-+        <magentoCLI command="cron:run" stepKey="runCron3"/>
-+        <magentoCLI command="cron:run" stepKey="runCron4"/>
-+
-+        <!-- Download product -->
-+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
-+            <argument name="rowIndex" value="0"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/CategoryProcessorTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/CategoryProcessorTest.php
-index 69f4a465e33..919f0cfda7c 100644
---- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/CategoryProcessorTest.php
-+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/CategoryProcessorTest.php
-@@ -34,41 +34,49 @@ class CategoryProcessorTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $product;
- 
-+    /**
-+     * @var \Magento\Catalog\Model\Category
-+     */
-+    private $childCategory;
-+
-+    /**
-+     * \Magento\Catalog\Model\Category
-+     */
-+    private $parentCategory;
-+
-     protected function setUp()
-     {
-         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->objectManagerHelper = new ObjectManagerHelper($this);
- 
--        $childCategory = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
-+        $this->childCategory = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $childCategory->method('getId')->will($this->returnValue(self::CHILD_CATEGORY_ID));
--        $childCategory->method('getName')->will($this->returnValue(self::CHILD_CATEGORY_NAME));
--        $childCategory->method('getPath')->will($this->returnValue(
-+        $this->childCategory->method('getId')->will($this->returnValue(self::CHILD_CATEGORY_ID));
-+        $this->childCategory->method('getName')->will($this->returnValue(self::CHILD_CATEGORY_NAME));
-+        $this->childCategory->method('getPath')->will($this->returnValue(
-             self::PARENT_CATEGORY_ID . CategoryProcessor::DELIMITER_CATEGORY
-             . self::CHILD_CATEGORY_ID
-         ));
- 
--        $childCategory->method('save')->willThrowException(new \Exception());
--
--        $parentCategory = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
-+        $this->parentCategory = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $parentCategory->method('getId')->will($this->returnValue(self::PARENT_CATEGORY_ID));
--        $parentCategory->method('getName')->will($this->returnValue('Parent'));
--        $parentCategory->method('getPath')->will($this->returnValue(self::PARENT_CATEGORY_ID));
-+        $this->parentCategory->method('getId')->will($this->returnValue(self::PARENT_CATEGORY_ID));
-+        $this->parentCategory->method('getName')->will($this->returnValue('Parent'));
-+        $this->parentCategory->method('getPath')->will($this->returnValue(self::PARENT_CATEGORY_ID));
- 
-         $categoryCollection =
-             $this->objectManagerHelper->getCollectionMock(
-                 \Magento\Catalog\Model\ResourceModel\Category\Collection::class,
-                 [
--                    self::PARENT_CATEGORY_ID => $parentCategory,
--                    self::CHILD_CATEGORY_ID => $childCategory,
-+                    self::PARENT_CATEGORY_ID => $this->parentCategory,
-+                    self::CHILD_CATEGORY_ID => $this->childCategory,
-                 ]
-             );
-         $map = [
--            [self::PARENT_CATEGORY_ID, $parentCategory],
--            [self::CHILD_CATEGORY_ID, $childCategory],
-+            [self::PARENT_CATEGORY_ID, $this->parentCategory],
-+            [self::CHILD_CATEGORY_ID, $this->childCategory],
-         ];
-         $categoryCollection->expects($this->any())
-             ->method('getItemById')
-@@ -91,7 +99,7 @@ class CategoryProcessorTest extends \PHPUnit\Framework\TestCase
- 
-         $categoryFactory = $this->createPartialMock(\Magento\Catalog\Model\CategoryFactory::class, ['create']);
- 
--        $categoryFactory->method('create')->will($this->returnValue($childCategory));
-+        $categoryFactory->method('create')->will($this->returnValue($this->childCategory));
- 
-         $this->categoryProcessor =
-             new \Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor(
-@@ -110,11 +118,13 @@ class CategoryProcessorTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Tests case when newly created category save throws exception.
-      */
--    public function testCreateCategoryException()
-+    public function testUpsertCategoriesWithAlreadyExistsException()
-     {
--        $method = new \ReflectionMethod(CategoryProcessor::class, 'createCategory');
--        $method->setAccessible(true);
--        $method->invoke($this->categoryProcessor, self::CHILD_CATEGORY_NAME, self::PARENT_CATEGORY_ID);
-+        $exception = new \Magento\Framework\Exception\AlreadyExistsException();
-+        $categoriesSeparator = '/';
-+        $categoryName = 'Exception Category';
-+        $this->childCategory->method('save')->willThrowException($exception);
-+        $this->categoryProcessor->upsertCategories($categoryName, $categoriesSeparator);
-         $this->assertNotEmpty($this->categoryProcessor->getFailedCategories());
-     }
- 
-diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php
-index 98e434f2174..f0a52a67e00 100644
---- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php
-+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php
-@@ -702,7 +702,7 @@ class OptionTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractIm
-     {
-         $rowData = include __DIR__ . '/_files/row_data_no_custom_option.php';
-         $this->_bypassModelMethodGetMultiRowFormat($rowData);
--        $this->assertFalse($this->modelMock->validateRow($rowData, 0));
-+        $this->assertTrue($this->modelMock->validateRow($rowData, 0));
-     }
- 
-     /**
-diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
-index a562916b3b4..f85d33edb5d 100644
---- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
-+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
-@@ -3,11 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\CatalogImportExport\Test\Unit\Model\Import;
- 
-+use Magento\CatalogImportExport\Model\Import\Product;
- use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\ImportExport\Model\Import;
-+use PHPUnit\Framework\MockObject\MockObject;
- 
- /**
-  * Class ProductTest
-@@ -26,126 +29,126 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
- 
-     const ENTITY_ID = 13;
- 
--    /** @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\Framework\DB\Adapter\AdapterInterface| MockObject */
-     protected $_connection;
- 
--    /** @var \Magento\Framework\Json\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\Framework\Json\Helper\Data| MockObject */
-     protected $jsonHelper;
- 
--    /** @var \Magento\ImportExport\Model\ResourceModel\Import\Data|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\ImportExport\Model\ResourceModel\Import\Data| MockObject */
-     protected $_dataSourceModel;
- 
--    /** @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\Framework\App\ResourceConnection| MockObject */
-     protected $resource;
- 
--    /** @var \Magento\ImportExport\Model\ResourceModel\Helper|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\ImportExport\Model\ResourceModel\Helper| MockObject */
-     protected $_resourceHelper;
- 
--    /** @var \Magento\Framework\Stdlib\StringUtils|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\Framework\Stdlib\StringUtils|MockObject */
-     protected $string;
- 
--    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\Framework\Event\ManagerInterface|MockObject */
-     protected $_eventManager;
- 
--    /** @var \Magento\CatalogInventory\Api\StockRegistryInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\CatalogInventory\Api\StockRegistryInterface|MockObject */
-     protected $stockRegistry;
- 
--    /** @var \Magento\CatalogImportExport\Model\Import\Product\OptionFactory|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\CatalogImportExport\Model\Import\Product\OptionFactory|MockObject */
-     protected $optionFactory;
- 
--    /** @var \Magento\CatalogInventory\Api\StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\CatalogInventory\Api\StockConfigurationInterface|MockObject */
-     protected $stockConfiguration;
- 
--    /** @var \Magento\CatalogInventory\Model\Spi\StockStateProviderInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\CatalogInventory\Model\Spi\StockStateProviderInterface|MockObject */
-     protected $stockStateProvider;
- 
--    /** @var \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\CatalogImportExport\Model\Import\Product\Option|MockObject */
-     protected $optionEntity;
- 
--    /** @var \Magento\Framework\Stdlib\DateTime|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\Framework\Stdlib\DateTime|MockObject */
-     protected $dateTime;
- 
-     /** @var array */
-     protected $data;
- 
--    /** @var \Magento\ImportExport\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\ImportExport\Helper\Data|MockObject */
-     protected $importExportData;
- 
--    /** @var \Magento\ImportExport\Model\ResourceModel\Import\Data|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\ImportExport\Model\ResourceModel\Import\Data|MockObject */
-     protected $importData;
- 
--    /** @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\Eav\Model\Config|MockObject */
-     protected $config;
- 
--    /** @var \Magento\ImportExport\Model\ResourceModel\Helper|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\ImportExport\Model\ResourceModel\Helper|MockObject */
-     protected $resourceHelper;
- 
--    /** @var \Magento\Catalog\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\Catalog\Helper\Data|MockObject */
-     protected $_catalogData;
- 
--    /** @var \Magento\ImportExport\Model\Import\Config|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\ImportExport\Model\Import\Config|MockObject */
-     protected $_importConfig;
- 
--    /** @var \PHPUnit_Framework_MockObject_MockObject */
-+    /** @var MockObject */
-     protected $_resourceFactory;
- 
-     // @codingStandardsIgnoreStart
--    /** @var  \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory|MockObject */
-     protected $_setColFactory;
- 
--    /** @var  \Magento\CatalogImportExport\Model\Import\Product\Type\Factory|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\Type\Factory|MockObject */
-     protected $_productTypeFactory;
- 
--    /** @var  \Magento\Catalog\Model\ResourceModel\Product\LinkFactory|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\Catalog\Model\ResourceModel\Product\LinkFactory|MockObject */
-     protected $_linkFactory;
- 
--    /** @var  \Magento\CatalogImportExport\Model\Import\Proxy\ProductFactory|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\CatalogImportExport\Model\Import\Proxy\ProductFactory|MockObject */
-     protected $_proxyProdFactory;
- 
--    /** @var  \Magento\CatalogImportExport\Model\Import\UploaderFactory|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\CatalogImportExport\Model\Import\UploaderFactory|MockObject */
-     protected $_uploaderFactory;
- 
--    /** @var  \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\Framework\Filesystem|MockObject */
-     protected $_filesystem;
- 
--    /** @var  \Magento\Framework\Filesystem\Directory\WriteInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\Framework\Filesystem\Directory\WriteInterface|MockObject */
-     protected $_mediaDirectory;
- 
--    /** @var  \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory|MockObject */
-     protected $_stockResItemFac;
- 
--    /** @var  \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\Framework\Stdlib\DateTime\TimezoneInterface|MockObject */
-     protected $_localeDate;
- 
--    /** @var \Magento\Framework\Indexer\IndexerRegistry|\PHPUnit_Framework_MockObject_MockObject  */
-+    /** @var \Magento\Framework\Indexer\IndexerRegistry|MockObject */
-     protected $indexerRegistry;
- 
--    /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject  */
-+    /** @var \Psr\Log\LoggerInterface|MockObject */
-     protected $_logger;
- 
--    /** @var  \Magento\CatalogImportExport\Model\Import\Product\StoreResolver|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\StoreResolver|MockObject */
-     protected $storeResolver;
- 
--    /** @var  \Magento\CatalogImportExport\Model\Import\Product\SkuProcessor|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\SkuProcessor|MockObject */
-     protected $skuProcessor;
- 
--    /** @var  \Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor|MockObject */
-     protected $categoryProcessor;
- 
--    /** @var  \Magento\CatalogImportExport\Model\Import\Product\Validator|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\Validator|MockObject */
-     protected $validator;
- 
--    /** @var  \Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor|MockObject */
-     protected $objectRelationProcessor;
- 
--    /** @var  \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface|MockObject */
-     protected $transactionManager;
- 
--    /** @var  \Magento\CatalogImportExport\Model\Import\Product\TaxClassProcessor|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\TaxClassProcessor|MockObject */
-     // @codingStandardsIgnoreEnd
-     protected $taxClassProcessor;
- 
--    /** @var  \Magento\CatalogImportExport\Model\Import\Product */
-+    /** @var  Product */
-     protected $importProduct;
- 
-     /**
-@@ -153,13 +156,13 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-      */
-     protected $errorAggregator;
- 
--    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject*/
-+    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|MockObject */
-     protected $scopeConfig;
- 
--    /** @var \Magento\Catalog\Model\Product\Url|\PHPUnit_Framework_MockObject_MockObject*/
-+    /** @var \Magento\Catalog\Model\Product\Url|MockObject */
-     protected $productUrl;
- 
--    /** @var  ImageTypeProcessor|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var  ImageTypeProcessor|MockObject */
-     protected $imageTypeProcessor;
- 
-     /**
-@@ -343,7 +346,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- 
-         $this->importProduct = $objectManager->getObject(
--            \Magento\CatalogImportExport\Model\Import\Product::class,
-+            Product::class,
-             [
-                 'jsonHelper' => $this->jsonHelper,
-                 'importExportData' => $this->importExportData,
-@@ -385,7 +388,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-                 'imageTypeProcessor' => $this->imageTypeProcessor
-             ]
-         );
--        $reflection = new \ReflectionClass(\Magento\CatalogImportExport\Model\Import\Product::class);
-+        $reflection = new \ReflectionClass(Product::class);
-         $reflectionProperty = $reflection->getProperty('metadataPool');
-         $reflectionProperty->setAccessible(true);
-         $reflectionProperty->setValue($this->importProduct, $metadataPoolMock);
-@@ -627,7 +630,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
- 
-     public function testDeleteProductsForReplacement()
-     {
--        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
-+        $importProduct = $this->getMockBuilder(Product::class)
-             ->disableOriginalConstructor()
-             ->setMethods([
-                 'setParameters', '_deleteProducts'
-@@ -693,7 +696,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-      */
-     public function testValidateRow($rowScope, $oldSku, $expectedResult, $behaviour = Import::BEHAVIOR_DELETE)
-     {
--        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
-+        $importProduct = $this->getMockBuilder(Product::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['getBehavior', 'getRowScope', 'getErrorAggregator'])
-             ->getMock();
-@@ -705,7 +708,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-             ->method('getErrorAggregator')
-             ->willReturn($this->getErrorAggregatorObject());
-         $importProduct->expects($this->once())->method('getRowScope')->willReturn($rowScope);
--        $skuKey = \Magento\CatalogImportExport\Model\Import\Product::COL_SKU;
-+        $skuKey = Product::COL_SKU;
-         $rowData = [
-             $skuKey => 'sku',
-         ];
-@@ -717,18 +720,22 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
- 
-     public function testValidateRowDeleteBehaviourAddRowErrorCall()
-     {
--        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
-+        $importProduct = $this->getMockBuilder(Product::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['getBehavior', 'getRowScope', 'addRowError'])
-+            ->setMethods(['getBehavior', 'getRowScope', 'addRowError', 'getErrorAggregator'])
-             ->getMock();
- 
-         $importProduct->expects($this->exactly(2))->method('getBehavior')
-             ->willReturn(\Magento\ImportExport\Model\Import::BEHAVIOR_DELETE);
-         $importProduct->expects($this->once())->method('getRowScope')
--            ->willReturn(\Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT);
-+            ->willReturn(Product::SCOPE_DEFAULT);
-         $importProduct->expects($this->once())->method('addRowError');
-+        $importProduct->method('getErrorAggregator')
-+            ->willReturn(
-+                $this->getErrorAggregatorObject(['addRowToSkip'])
-+            );
-         $rowData = [
--            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => 'sku',
-+            Product::COL_SKU => 'sku',
-         ];
- 
-         $importProduct->validateRow($rowData, 0);
-@@ -739,7 +746,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-         $messages = ['validator message'];
-         $this->validator->expects($this->once())->method('getMessages')->willReturn($messages);
-         $rowData = [
--            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => 'sku',
-+            Product::COL_SKU => 'sku',
-         ];
-         $rowNum = 0;
-         $this->importProduct->validateRow($rowData, $rowNum);
-@@ -841,7 +848,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-         return [
-             [
-                 '$storeCode' => null,
--                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
-+                '$expectedResult' => Product::SCOPE_DEFAULT,
-             ],
-             [
-                 '$storeCode' => 'value',
-@@ -856,17 +863,17 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-     public function testValidateRowCheckSpecifiedSku($sku, $expectedError)
-     {
-         $importProduct = $this->createModelMockWithErrorAggregator(
--            [ 'addRowError', 'getOptionEntity', 'getRowScope'],
-+            ['addRowError', 'getOptionEntity', 'getRowScope'],
-             ['isRowInvalid' => true]
-         );
- 
-         $rowNum = 0;
-         $rowData = [
--            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
--            \Magento\CatalogImportExport\Model\Import\Product::COL_STORE => '',
-+            Product::COL_SKU => $sku,
-+            Product::COL_STORE => '',
-         ];
- 
--        $this->storeResolver->expects($this->any())->method('getStoreCodeToId')->willReturn(null);
-+        $this->storeResolver->method('getStoreCodeToId')->willReturn(null);
-         $this->setPropertyValue($importProduct, 'storeResolver', $this->storeResolver);
-         $this->setPropertyValue($importProduct, 'skuProcessor', $this->skuProcessor);
- 
-@@ -875,7 +882,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-         $importProduct
-             ->expects($this->once())
-             ->method('getRowScope')
--            ->willReturn(\Magento\CatalogImportExport\Model\Import\Product::SCOPE_STORE);
-+            ->willReturn(Product::SCOPE_STORE);
-         $importProduct->expects($this->at(1))->method('addRowError')->with($expectedError, $rowNum)->willReturn(null);
- 
-         $importProduct->validateRow($rowData, $rowNum);
-@@ -889,7 +896,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-         $errorAggregator->method('isRowInvalid')->willReturn(true);
-         $this->setPropertyValue($this->importProduct, '_processedEntitiesCount', $count);
-         $this->setPropertyValue($this->importProduct, 'errorAggregator', $errorAggregator);
--        $rowData = [\Magento\CatalogImportExport\Model\Import\Product::COL_SKU => false];
-+        $rowData = [Product::COL_SKU => false];
-         //suppress validator
-         $this->_setValidatorMockInImportProduct($this->importProduct);
-         $this->importProduct->validateRow($rowData, $rowNum);
-@@ -899,14 +906,14 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-     public function testValidateRowValidateExistingProductTypeAddNewSku()
-     {
-         $importProduct = $this->createModelMockWithErrorAggregator(
--            [ 'addRowError', 'getOptionEntity'],
-+            ['addRowError', 'getOptionEntity'],
-             ['isRowInvalid' => true]
-         );
- 
-         $sku = 'sku';
-         $rowNum = 0;
-         $rowData = [
--            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-+            Product::COL_SKU => $sku,
-         ];
-         $oldSku = [
-             $sku => [
-@@ -929,7 +936,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-         $this->setPropertyValue($importProduct, '_oldSku', $oldSku);
- 
-         $expectedData = [
--            'entity_id' =>  $oldSku[$sku]['entity_id'], //entity_id_val
-+            'entity_id' => $oldSku[$sku]['entity_id'], //entity_id_val
-             'type_id' => $oldSku[$sku]['type_id'],// type_id_val
-             'attr_set_id' => $oldSku[$sku]['attr_set_id'], //attr_set_id_val
-             'attr_set_code' => $_attrSetIdToName[$oldSku[$sku]['attr_set_id']],//attr_set_id_val
-@@ -947,7 +954,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-         $sku = 'sku';
-         $rowNum = 0;
-         $rowData = [
--            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-+            Product::COL_SKU => $sku,
-         ];
-         $oldSku = [
-             $sku => [
-@@ -972,6 +979,11 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
- 
-     /**
-      * @dataProvider validateRowValidateNewProductTypeAddRowErrorCallDataProvider
-+     * @param string $colType
-+     * @param string $productTypeModelsColType
-+     * @param string $colAttrSet
-+     * @param string $attrSetNameToIdColAttrSet
-+     * @param string $error
-      */
-     public function testValidateRowValidateNewProductTypeAddRowErrorCall(
-         $colType,
-@@ -983,15 +995,15 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-         $sku = 'sku';
-         $rowNum = 0;
-         $rowData = [
--            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
--            \Magento\CatalogImportExport\Model\Import\Product::COL_TYPE => $colType,
--            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => $colAttrSet,
-+            Product::COL_SKU => $sku,
-+            Product::COL_TYPE => $colType,
-+            Product::COL_ATTR_SET => $colAttrSet,
-         ];
-         $_attrSetNameToId = [
--            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => $attrSetNameToIdColAttrSet,
-+            $rowData[Product::COL_ATTR_SET] => $attrSetNameToIdColAttrSet,
-         ];
-         $_productTypeModels = [
--            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE] => $productTypeModelsColType,
-+            $rowData[Product::COL_TYPE] => $productTypeModelsColType,
-         ];
-         $oldSku = [
-             $sku => null,
-@@ -1019,29 +1031,25 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-         $sku = 'sku';
-         $rowNum = 0;
-         $rowData = [
--            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
--            \Magento\CatalogImportExport\Model\Import\Product::COL_TYPE => 'value',
--            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'value',
-+            Product::COL_SKU => $sku,
-+            Product::COL_TYPE => 'value',
-+            Product::COL_ATTR_SET => 'value',
-         ];
-         $_productTypeModels = [
--            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE] => 'value',
-+            $rowData[Product::COL_TYPE] => 'value',
-         ];
-         $oldSku = [
-             $sku => null,
-         ];
-         $_attrSetNameToId = [
--            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => 'attr_set_code_val'
-+            $rowData[Product::COL_ATTR_SET] => 'attr_set_code_val'
-         ];
-         $expectedData = [
-             'entity_id' => null,
--            'type_id' => $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE],//value
-+            'type_id' => $rowData[Product::COL_TYPE],//value
-             //attr_set_id_val
--            'attr_set_id' => $_attrSetNameToId[
--                $rowData[
--                    \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET
--                ]
--            ],
--            'attr_set_code' => $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET],//value
-+            'attr_set_id' => $_attrSetNameToId[$rowData[Product::COL_ATTR_SET]],
-+            'attr_set_code' => $rowData[Product::COL_ATTR_SET],//value
-             'row_id' => null
-         ];
-         $importProduct = $this->createModelMockWithErrorAggregator(
-@@ -1077,8 +1085,8 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-         $sku = 'sku';
-         $rowNum = 0;
-         $rowData = [
--            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
--            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'col_attr_set_val',
-+            Product::COL_SKU => $sku,
-+            Product::COL_ATTR_SET => 'col_attr_set_val',
-         ];
-         $expectedAttrSetCode = 'new_attr_set_code';
-         $newSku = [
-@@ -1086,8 +1094,8 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-             'type_id' => 'new_type_id_val',
-         ];
-         $expectedRowData = [
--            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
--            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => $newSku['attr_set_code'],
-+            Product::COL_SKU => $sku,
-+            Product::COL_ATTR_SET => $newSku['attr_set_code'],
-         ];
-         $oldSku = [
-             $sku => [
-@@ -1121,8 +1129,8 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-         $sku = 'sku';
-         $rowNum = 0;
-         $rowData = [
--            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
--            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'col_attr_set_val',
-+            Product::COL_SKU => $sku,
-+            Product::COL_ATTR_SET => 'col_attr_set_val',
-         ];
-         $oldSku = [
-             $sku => [
-@@ -1374,7 +1382,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-     {
-         return [
-             [
--                '$rowScope' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
-+                '$rowScope' => Product::SCOPE_DEFAULT,
-                 '$oldSku' => null,
-                 '$expectedResult' => false,
-             ],
-@@ -1389,12 +1397,12 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-                 '$expectedResult' => true,
-             ],
-             [
--                '$rowScope' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
-+                '$rowScope' => Product::SCOPE_DEFAULT,
-                 '$oldSku' => true,
-                 '$expectedResult' => true,
-             ],
-             [
--                '$rowScope' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
-+                '$rowScope' => Product::SCOPE_DEFAULT,
-                 '$oldSku' => null,
-                 '$expectedResult' => false,
-                 '$behaviour' => Import::BEHAVIOR_REPLACE
-@@ -1415,7 +1423,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-                 '$rowData' => [
-                     'code' => str_repeat(
-                         'a',
--                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH - 1
-+                        Product::DB_MAX_VARCHAR_LENGTH - 1
-                     ),
-                 ],
-             ],
-@@ -1468,7 +1476,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-                 '$rowData' => [
-                     'code' => str_repeat(
-                         'a',
--                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_TEXT_LENGTH - 1
-+                        Product::DB_MAX_TEXT_LENGTH - 1
-                     ),
-                 ],
-             ],
-@@ -1488,7 +1496,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-                 '$rowData' => [
-                     'code' => str_repeat(
-                         'a',
--                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH + 1
-+                        Product::DB_MAX_VARCHAR_LENGTH + 1
-                     ),
-                 ],
-             ],
-@@ -1541,7 +1549,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-                 '$rowData' => [
-                     'code' => str_repeat(
-                         'a',
--                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_TEXT_LENGTH + 1
-+                        Product::DB_MAX_TEXT_LENGTH + 1
-                     ),
-                 ],
-             ],
-@@ -1553,8 +1561,8 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-      */
-     public function getRowScopeDataProvider()
-     {
--        $colSku = \Magento\CatalogImportExport\Model\Import\Product::COL_SKU;
--        $colStore = \Magento\CatalogImportExport\Model\Import\Product::COL_STORE;
-+        $colSku = Product::COL_SKU;
-+        $colStore = Product::COL_STORE;
- 
-         return [
-             [
-@@ -1562,21 +1570,21 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-                     $colSku => null,
-                     $colStore => 'store',
-                 ],
--                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_STORE
-+                '$expectedResult' => Product::SCOPE_STORE
-             ],
-             [
-                 '$rowData' => [
-                     $colSku => 'sku',
-                     $colStore => null,
-                 ],
--                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT
-+                '$expectedResult' => Product::SCOPE_DEFAULT
-             ],
-             [
-                 '$rowData' => [
-                     $colSku => 'sku',
-                     $colStore => 'store',
-                 ],
--                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_STORE
-+                '$expectedResult' => Product::SCOPE_STORE
-             ],
-         ];
-     }
-@@ -1653,9 +1661,9 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-      *
-      * @see _rewriteGetOptionEntityInImportProduct()
-      * @see _setValidatorMockInImportProduct()
--     * @param \Magento\CatalogImportExport\Model\Import\Product
-+     * @param Product
-      *  Param should go with rewritten getOptionEntity method.
--     * @return \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject
-+     * @return \Magento\CatalogImportExport\Model\Import\Product\Option|MockObject
-      */
-     private function _suppressValidateRowOptionValidatorInvalidRows($importProduct)
-     {
-@@ -1671,8 +1679,8 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-      * Used in group of validateRow method's tests.
-      * Set validator mock in importProduct, return true for isValid method.
-      *
--     * @param \Magento\CatalogImportExport\Model\Import\Product
--     * @return \Magento\CatalogImportExport\Model\Import\Product\Validator|\PHPUnit_Framework_MockObject_MockObject
-+     * @param Product
-+     * @return \Magento\CatalogImportExport\Model\Import\Product\Validator|MockObject
-      */
-     private function _setValidatorMockInImportProduct($importProduct)
-     {
-@@ -1686,9 +1694,9 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-      * Used in group of validateRow method's tests.
-      * Make getOptionEntity return option mock.
-      *
--     * @param \Magento\CatalogImportExport\Model\Import\Product
-+     * @param Product
-      *  Param should go with rewritten getOptionEntity method.
--     * @return \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject
-+     * @return \Magento\CatalogImportExport\Model\Import\Product\Option|MockObject
-      */
-     private function _rewriteGetOptionEntityInImportProduct($importProduct)
-     {
-@@ -1703,12 +1711,12 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
-     /**
-      * @param array $methods
-      * @param array $errorAggregatorMethods
--     * @return \PHPUnit_Framework_MockObject_MockObject
-+     * @return MockObject
-      */
-     protected function createModelMockWithErrorAggregator(array $methods = [], array $errorAggregatorMethods = [])
-     {
-         $methods[] = 'getErrorAggregator';
--        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
-+        $importProduct = $this->getMockBuilder(Product::class)
-             ->disableOriginalConstructor()
-             ->setMethods($methods)
-             ->getMock();
-diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php
-index 262593377aa..f734596de01 100644
---- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php
-+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php
-@@ -93,14 +93,14 @@ class UploaderTest extends \PHPUnit\Framework\TestCase
-                 $this->filesystem,
-                 $this->readFactory,
-             ])
--            ->setMethods(['_setUploadFile', 'save', 'getTmpDir'])
-+            ->setMethods(['_setUploadFile', 'save', 'getTmpDir', 'checkAllowedExtension'])
-             ->getMock();
-     }
- 
-     /**
-      * @dataProvider moveFileUrlDataProvider
-      */
--    public function testMoveFileUrl($fileUrl, $expectedHost, $expectedFileName)
-+    public function testMoveFileUrl($fileUrl, $expectedHost, $expectedFileName, $checkAllowedExtension)
-     {
-         $destDir = 'var/dest/dir';
-         $expectedRelativeFilePath = $expectedFileName;
-@@ -128,6 +128,9 @@ class UploaderTest extends \PHPUnit\Framework\TestCase
-         $this->uploader->expects($this->once())->method('_setUploadFile')->will($this->returnSelf());
-         $this->uploader->expects($this->once())->method('save')->with($destDir . '/' . $expectedFileName)
-             ->willReturn(['name' => $expectedFileName, 'path' => 'absPath']);
-+        $this->uploader->expects($this->exactly($checkAllowedExtension))
-+            ->method('checkAllowedExtension')
-+            ->willReturn(true);
- 
-         $this->uploader->setDestDir($destDir);
-         $result = $this->uploader->move($fileUrl);
-@@ -224,31 +227,37 @@ class UploaderTest extends \PHPUnit\Framework\TestCase
-                 '$fileUrl' => 'http://test_uploader_file',
-                 '$expectedHost' => 'test_uploader_file',
-                 '$expectedFileName' => 'test_uploader_file',
-+                '$checkAllowedExtension' => 0
-             ],
-             [
-                 '$fileUrl' => 'https://!:^&`;file',
-                 '$expectedHost' => '!:^&`;file',
-                 '$expectedFileName' => 'file',
-+                '$checkAllowedExtension' => 0
-             ],
-             [
-                 '$fileUrl' => 'https://www.google.com/image.jpg',
-                 '$expectedHost' => 'www.google.com/image.jpg',
-                 '$expectedFileName' => 'image.jpg',
-+                '$checkAllowedExtension' => 1
-             ],
-             [
-                 '$fileUrl' => 'https://www.google.com/image.jpg?param=1',
-                 '$expectedHost' => 'www.google.com/image.jpg?param=1',
-                 '$expectedFileName' => 'image.jpg',
-+                '$checkAllowedExtension' => 1
-             ],
-             [
-                 '$fileUrl' => 'https://www.google.com/image.jpg?param=1&param=2',
-                 '$expectedHost' => 'www.google.com/image.jpg?param=1&param=2',
-                 '$expectedFileName' => 'image.jpg',
-+                '$checkAllowedExtension' => 1
-             ],
-             [
-                 '$fileUrl' => 'http://www.google.com/image.jpg?param=1&param=2',
-                 '$expectedHost' => 'www.google.com/image.jpg?param=1&param=2',
-                 '$expectedFileName' => 'image.jpg',
-+                '$checkAllowedExtension' => 1
-             ],
-         ];
-     }
-diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php
-index c2521f77ca2..9ae22e5e1a3 100644
---- a/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php
-@@ -15,6 +15,10 @@ use Magento\Framework\Api\SearchResultsInterface;
-  * Interface StockCollectionInterface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockCollectionInterface extends SearchResultsInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php
-index 53e95921ea9..087fae6e656 100644
---- a/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php
-@@ -11,6 +11,10 @@ use Magento\Framework\Api\ExtensibleDataInterface;
-  * Interface Stock
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockInterface extends ExtensibleDataInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php
-index 038174c8e52..59a1f58b74c 100644
---- a/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php
-@@ -15,6 +15,10 @@ use Magento\Framework\Api\SearchResultsInterface;
-  * Interface StockItemCollectionInterface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockItemCollectionInterface extends SearchResultsInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
-index b876615468b..e2e8a744c4b 100644
---- a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
-@@ -11,6 +11,10 @@ use Magento\Framework\Api\ExtensibleDataInterface;
-  * Interface StockItem
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockItemInterface extends ExtensibleDataInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
-index 70a2c29ff9a..1cc045745a0 100644
---- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
-@@ -11,6 +11,10 @@ use Magento\Framework\Api\SearchResultsInterface;
-  * Stock Status collection interface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockStatusCollectionInterface extends SearchResultsInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php
-index c9ae6a96a36..66b639fb088 100644
---- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php
-@@ -11,6 +11,10 @@ use Magento\Framework\Api\ExtensibleDataInterface;
-  * Interface StockStatusInterface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockStatusInterface extends ExtensibleDataInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php b/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php
-index 9122fb00386..6fd1e746697 100644
---- a/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php
-@@ -12,6 +12,10 @@ use Magento\Framework\Exception\LocalizedException;
- 
- /**
-  * @api
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface RegisterProductSaleInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/RevertProductSaleInterface.php b/app/code/Magento/CatalogInventory/Api/RevertProductSaleInterface.php
-index ed496f3882f..552e30da892 100644
---- a/app/code/Magento/CatalogInventory/Api/RevertProductSaleInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/RevertProductSaleInterface.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Api;
- 
- /**
-  * @api
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface RevertProductSaleInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
-index a23d5030b82..5019e86b7af 100644
---- a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Api;
-  * Interface StockConfigurationInterface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockConfigurationInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php
-index 969af6481cb..eb6fb2e812f 100644
---- a/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Api;
-  * Interface StockCriteriaInterface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php b/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php
-index 1521b34c715..18bab6571c2 100644
---- a/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Api;
-  * Interface StockIndexInterface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockIndexInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php
-index a2fc7801b1d..1d2cabbb48a 100644
---- a/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Api;
-  * Interface StockItemCriteriaInterface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockItemCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php
-index 2732048d144..eecf6cbe076 100644
---- a/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Api;
-  * Interface StockItemRepository
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockItemRepositoryInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php b/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php
-index ddb84abf3d1..8796953e32f 100644
---- a/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Api;
-  * Interface StockManagementInterface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockManagementInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php b/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php
-index 2d011e24f41..5478f90fb7d 100644
---- a/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Api;
-  * Interface StockRegistryInterface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockRegistryInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php
-index 80a7e79289c..3cfdf455063 100644
---- a/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Api;
-  * Interface StockRepositoryInterface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockRepositoryInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/StockStateInterface.php b/app/code/Magento/CatalogInventory/Api/StockStateInterface.php
-index 8a1f7da5158..8be7f5be79f 100644
---- a/app/code/Magento/CatalogInventory/Api/StockStateInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/StockStateInterface.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Api;
-  * Interface StockStateInterface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockStateInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php
-index e504e6355a1..99ad7005d9d 100644
---- a/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Api;
-  * Interface StockStatusCriteriaInterface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockStatusCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php
-index 94d4998c1e3..d29171f557f 100644
---- a/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php
-+++ b/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Api;
-  * Interface StockStatusRepositoryInterface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockStatusRepositoryInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php
-index dc992378d12..f349e94235a 100644
---- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php
-+++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php
-@@ -84,7 +84,7 @@ class Customergroup extends \Magento\Framework\View\Element\Html\Select
-             $this->_customerGroups[$notLoggedInGroup->getId()] = $notLoggedInGroup->getCode();
-         }
-         if ($groupId !== null) {
--            return isset($this->_customerGroups[$groupId]) ? $this->_customerGroups[$groupId] : null;
-+            return $this->_customerGroups[$groupId] ?? null;
-         }
-         return $this->_customerGroups;
-     }
-diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
-index 15dfbd122e9..d3c165bbde1 100644
---- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
-+++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
-@@ -10,6 +10,10 @@ namespace Magento\CatalogInventory\Block\Adminhtml\Form\Field;
-  *
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- class Minsaleqty extends \Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray
- {
-diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php
-index 2c41e179892..5378801b6c2 100644
---- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php
-+++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php
-@@ -14,6 +14,10 @@ use Magento\Framework\Data\Form;
- /**
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- class Stock extends \Magento\Framework\Data\Form\Element\Select
- {
-diff --git a/app/code/Magento/CatalogInventory/Block/Qtyincrements.php b/app/code/Magento/CatalogInventory/Block/Qtyincrements.php
-index adaa762f327..a12b72cd0a9 100644
---- a/app/code/Magento/CatalogInventory/Block/Qtyincrements.php
-+++ b/app/code/Magento/CatalogInventory/Block/Qtyincrements.php
-@@ -14,6 +14,10 @@ use Magento\Framework\View\Element\Template;
-  *
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- class Qtyincrements extends Template implements IdentityInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
-index 568fa600ec5..4c8f356519e 100644
---- a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
-+++ b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
-@@ -131,7 +131,9 @@ abstract class AbstractStockqty extends \Magento\Framework\View\Element\Template
-      */
-     public function isMsgVisible()
-     {
--        return $this->getStockQty() > 0 && $this->getStockQtyLeft() <= $this->getThresholdQty();
-+        return $this->getStockQty() > 0
-+            && $this->getStockQtyLeft() > 0
-+            && $this->getStockQtyLeft() <= $this->getThresholdQty();
-     }
- 
-     /**
-diff --git a/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php b/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php
-index c315338be0d..5a3a3ca6ee9 100644
---- a/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php
-+++ b/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php
-@@ -11,6 +11,10 @@ namespace Magento\CatalogInventory\Block\Stockqty;
-  *
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- class DefaultStockqty extends AbstractStockqty implements \Magento\Framework\DataObject\IdentityInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php b/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
-index b4f5d8b670f..96bf5bd9653 100644
---- a/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
-+++ b/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
-@@ -95,7 +95,7 @@ class Minsaleqty
-             }
-             return $this->serializer->serialize($data);
-         } else {
--            return '';
-+            return $value;
-         }
-     }
- 
-diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php
-index 494d440eeed..798ac4074c1 100644
---- a/app/code/Magento/CatalogInventory/Helper/Stock.php
-+++ b/app/code/Magento/CatalogInventory/Helper/Stock.php
-@@ -18,6 +18,10 @@ use Magento\Store\Model\StoreManagerInterface;
-  * Class Stock
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @api
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- class Stock
- {
-diff --git a/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php b/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php
-index 2c52b49c1a0..0a02d4eb6a9 100644
---- a/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php
-+++ b/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php
-@@ -7,6 +7,8 @@
- namespace Magento\CatalogInventory\Model;
- 
- use Magento\Catalog\Model\ResourceModel\Product\Collection;
-+use Magento\Framework\Search\EngineResolverInterface;
-+use Magento\Search\Model\EngineResolver;
- 
- /**
-  * Catalog inventory module plugin
-@@ -17,18 +19,27 @@ class AddStockStatusToCollection
-      * @var \Magento\CatalogInventory\Helper\Stock
-      */
-     protected $stockHelper;
--    
-+
-+    /**
-+     * @var EngineResolverInterface
-+     */
-+    private $engineResolver;
-+
-     /**
--     * @param \Magento\CatalogInventory\Model\Configuration $configuration
-      * @param \Magento\CatalogInventory\Helper\Stock $stockHelper
-+     * @param EngineResolverInterface $engineResolver
-      */
-     public function __construct(
--        \Magento\CatalogInventory\Helper\Stock $stockHelper
-+        \Magento\CatalogInventory\Helper\Stock $stockHelper,
-+        EngineResolverInterface $engineResolver
-     ) {
-         $this->stockHelper = $stockHelper;
-+        $this->engineResolver = $engineResolver;
-     }
- 
-     /**
-+     * Add stock filter to collection.
-+     *
-      * @param Collection $productCollection
-      * @param bool $printQuery
-      * @param bool $logQuery
-@@ -36,7 +47,9 @@ class AddStockStatusToCollection
-      */
-     public function beforeLoad(Collection $productCollection, $printQuery = false, $logQuery = false)
-     {
--        $this->stockHelper->addIsInStockFilterToCollection($productCollection);
-+        if ($this->engineResolver->getCurrentSearchEngine() === EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE) {
-+            $this->stockHelper->addIsInStockFilterToCollection($productCollection);
-+        }
-         return [$printQuery, $logQuery];
-     }
- }
-diff --git a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
-index 36721db8748..145b0d1454a 100644
---- a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
-+++ b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
-@@ -20,6 +20,10 @@ use Magento\Catalog\Model\Product;
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- class Item extends \Magento\CatalogInventory\Model\Stock\Item implements IdentityInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Model/Configuration.php b/app/code/Magento/CatalogInventory/Model/Configuration.php
-index 2f0415b40dc..8b0849c8874 100644
---- a/app/code/Magento/CatalogInventory/Model/Configuration.php
-+++ b/app/code/Magento/CatalogInventory/Model/Configuration.php
-@@ -9,6 +9,7 @@ use Magento\CatalogInventory\Api\StockConfigurationInterface;
- use Magento\CatalogInventory\Helper\Minsaleqty as MinsaleqtyHelper;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Catalog\Model\ProductTypes\ConfigInterface;
-+use Magento\Store\Model\ScopeInterface;
- use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-@@ -131,6 +132,8 @@ class Configuration implements StockConfigurationInterface
-     protected $storeManager;
- 
-     /**
-+     * Configuration constructor.
-+     *
-      * @param ConfigInterface $config
-      * @param ScopeConfigInterface $scopeConfig
-      * @param MinsaleqtyHelper $minsaleqtyHelper
-@@ -149,7 +152,7 @@ class Configuration implements StockConfigurationInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDefaultScopeId()
-     {
-@@ -159,6 +162,8 @@ class Configuration implements StockConfigurationInterface
-     }
- 
-     /**
-+     * Is Qty Type Ids
-+     *
-      * @param int|null $filter
-      * @return array
-      */
-@@ -182,6 +187,8 @@ class Configuration implements StockConfigurationInterface
-     }
- 
-     /**
-+     * Is Qty
-+     *
-      * @param int $productTypeId
-      * @return bool
-      */
-@@ -201,12 +208,14 @@ class Configuration implements StockConfigurationInterface
-     {
-         return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_CAN_SUBTRACT,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
- 
-     /**
-+     * Get Min Qty
-+     *
-      * @param null|string|bool|int|\Magento\Store\Model\Store $store
-      * @return float
-      */
-@@ -214,12 +223,14 @@ class Configuration implements StockConfigurationInterface
-     {
-         return (float)$this->scopeConfig->getValue(
-             self::XML_PATH_MIN_QTY,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
- 
-     /**
-+     * Get Min Sale Qty
-+     *
-      * @param null|string|bool|int|\Magento\Store\Model\Store $store
-      * @param int $customerGroupId
-      * @return float
-@@ -230,6 +241,8 @@ class Configuration implements StockConfigurationInterface
-     }
- 
-     /**
-+     * Get Max Sale Qty
-+     *
-      * @param null|string|bool|int|\Magento\Store\Model\Store $store
-      * @return float|null
-      */
-@@ -237,12 +250,14 @@ class Configuration implements StockConfigurationInterface
-     {
-         return (float)$this->scopeConfig->getValue(
-             self::XML_PATH_MAX_SALE_QTY,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
- 
-     /**
-+     * Get Notify Stock Qty
-+     *
-      * @param null|string|bool|int|\Magento\Store\Model\Store $store
-      * @return float
-      */
-@@ -250,7 +265,7 @@ class Configuration implements StockConfigurationInterface
-     {
-         return (float) $this->scopeConfig->getValue(
-             self::XML_PATH_NOTIFY_STOCK_QTY,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
-@@ -264,14 +279,16 @@ class Configuration implements StockConfigurationInterface
-      */
-     public function getEnableQtyIncrements($store = null)
-     {
--        return (bool) $this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_ENABLE_QTY_INCREMENTS,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
- 
-     /**
-+     * Get Qty Increments
-+     *
-      * @param null|string|bool|int|\Magento\Store\Model\Store $store
-      * @return float
-      */
-@@ -279,7 +296,7 @@ class Configuration implements StockConfigurationInterface
-     {
-         return (float)$this->scopeConfig->getValue(
-             self::XML_PATH_QTY_INCREMENTS,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
-@@ -294,7 +311,7 @@ class Configuration implements StockConfigurationInterface
-     {
-         return (int) $this->scopeConfig->getValue(
-             self::XML_PATH_BACKORDERS,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
-@@ -309,7 +326,7 @@ class Configuration implements StockConfigurationInterface
-     {
-         return (int) $this->scopeConfig->isSetFlag(
-             self::XML_PATH_MANAGE_STOCK,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
-@@ -325,7 +342,7 @@ class Configuration implements StockConfigurationInterface
-     {
-         return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_CAN_BACK_IN_STOCK,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
-@@ -340,7 +357,7 @@ class Configuration implements StockConfigurationInterface
-     {
-         return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_SHOW_OUT_OF_STOCK,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
-@@ -355,14 +372,13 @@ class Configuration implements StockConfigurationInterface
-     {
-         return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_ITEM_AUTO_RETURN,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
- 
-     /**
--     * Get 'Display product stock status' option value
--     * Shows if it is necessary to show product stock status ('in stock'/'out of stock')
-+     * Display product stock status. Shows if it is necessary to show product stock status in stock/out of stock.
-      *
-      * @param null|string|bool|int|\Magento\Store\Model\Store $store
-      * @return bool
-@@ -371,12 +387,14 @@ class Configuration implements StockConfigurationInterface
-     {
-         return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
- 
-     /**
-+     * Get Default Config Value
-+     *
-      * @param string $field
-      * @param null|string|bool|int|\Magento\Store\Model\Store $store
-      * @return string|null
-@@ -385,12 +403,14 @@ class Configuration implements StockConfigurationInterface
-     {
-         return $this->scopeConfig->getValue(
-             self::XML_PATH_ITEM . $field,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
- 
-     /**
-+     * Get Stock Threshold Qty
-+     *
-      * @param null|string|bool|int|\Magento\Store\Model\Store $store
-      * @return string|null
-      */
-@@ -398,7 +418,7 @@ class Configuration implements StockConfigurationInterface
-     {
-         return $this->scopeConfig->getValue(
-             self::XML_PATH_STOCK_THRESHOLD_QTY,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
-diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php b/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
-index 5e7210c1b74..f9a49d4f8d1 100644
---- a/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
-+++ b/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
-@@ -9,11 +9,11 @@ namespace Magento\CatalogInventory\Model\Indexer;
- 
- use Magento\CatalogInventory\Api\StockConfigurationInterface;
- use Magento\CatalogInventory\Model\ResourceModel\Stock\Item;
--use Magento\CatalogInventory\Model\Stock;
- use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceModifierInterface;
- use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
- use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\DB\Query\Generator;
- 
- /**
-  * Class for filter product price index.
-@@ -40,22 +40,38 @@ class ProductPriceIndexFilter implements PriceModifierInterface
-      */
-     private $connectionName;
- 
-+    /**
-+     * @var Generator
-+     */
-+    private $batchQueryGenerator;
-+
-+    /**
-+     * @var int
-+     */
-+    private $batchSize;
-+
-     /**
-      * @param StockConfigurationInterface $stockConfiguration
-      * @param Item $stockItem
-      * @param ResourceConnection $resourceConnection
-      * @param string $connectionName
-+     * @param Generator $batchQueryGenerator
-+     * @param int $batchSize
-      */
-     public function __construct(
-         StockConfigurationInterface $stockConfiguration,
-         Item $stockItem,
-         ResourceConnection $resourceConnection = null,
--        $connectionName = 'indexer'
-+        $connectionName = 'indexer',
-+        Generator $batchQueryGenerator = null,
-+        $batchSize = 100
-     ) {
-         $this->stockConfiguration = $stockConfiguration;
-         $this->stockItem = $stockItem;
-         $this->resourceConnection = $resourceConnection ?: ObjectManager::getInstance()->get(ResourceConnection::class);
-         $this->connectionName = $connectionName;
-+        $this->batchQueryGenerator = $batchQueryGenerator ?: ObjectManager::getInstance()->get(Generator::class);
-+        $this->batchSize = $batchSize;
-     }
- 
-     /**
-@@ -76,32 +92,37 @@ class ProductPriceIndexFilter implements PriceModifierInterface
- 
-         $connection = $this->resourceConnection->getConnection($this->connectionName);
-         $select = $connection->select();
-+
-         $select->from(
--            ['price_index' => $priceTable->getTableName()],
--            []
--        );
--        $select->joinInner(
-             ['stock_item' => $this->stockItem->getMainTable()],
--            'stock_item.product_id = price_index.' . $priceTable->getEntityField()
--            . ' AND stock_item.stock_id = ' . Stock::DEFAULT_STOCK_ID,
--            []
-+            ['stock_item.product_id', 'MAX(stock_item.is_in_stock) as max_is_in_stock']
-         );
-+
-         if ($this->stockConfiguration->getManageStock()) {
--            $stockStatus = $connection->getCheckSql(
--                'use_config_manage_stock = 0 AND manage_stock = 0',
--                Stock::STOCK_IN_STOCK,
--                'is_in_stock'
--            );
-+            $select->where('stock_item.use_config_manage_stock = 1 OR stock_item.manage_stock = 1');
-         } else {
--            $stockStatus = $connection->getCheckSql(
--                'use_config_manage_stock = 0 AND manage_stock = 1',
--                'is_in_stock',
--                Stock::STOCK_IN_STOCK
--            );
-+            $select->where('stock_item.use_config_manage_stock = 0 AND stock_item.manage_stock = 1');
-         }
--        $select->where($stockStatus . ' = ?', Stock::STOCK_OUT_OF_STOCK);
- 
--        $query = $select->deleteFromSelect('price_index');
--        $connection->query($query);
-+        $select->group('stock_item.product_id');
-+        $select->having('max_is_in_stock = 0');
-+
-+        $batchSelectIterator = $this->batchQueryGenerator->generate(
-+            'product_id',
-+            $select,
-+            $this->batchSize,
-+            \Magento\Framework\DB\Query\BatchIteratorInterface::UNIQUE_FIELD_ITERATOR
-+        );
-+
-+        foreach ($batchSelectIterator as $select) {
-+            $productIds = null;
-+            foreach ($connection->query($select)->fetchAll() as $row) {
-+                $productIds[] = $row['product_id'];
-+            }
-+            if ($productIds !== null) {
-+                $where = [$priceTable->getEntityField() .' IN (?)' => $productIds];
-+                $connection->delete($priceTable->getTableName(), $where);
-+            }
-+        }
-     }
- }
-diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
-index bc10d38173b..43a5aabee97 100644
---- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
-+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
-@@ -6,12 +6,19 @@
-  * See COPYING.txt for license details.
-  */
- 
-+declare(strict_types=1);
-+
- namespace Magento\CatalogInventory\Model\Indexer\Stock\Action;
- 
-+use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-+use Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement;
-+use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock;
- use Magento\Framework\App\ResourceConnection;
- use Magento\CatalogInventory\Model\ResourceModel\Indexer\StockFactory;
- use Magento\Catalog\Model\Product\Type as ProductType;
-+use Magento\Framework\DB\Query\BatchIteratorInterface;
-+use Magento\Framework\DB\Query\Generator as QueryGenerator;
- use Magento\Framework\Indexer\CacheContext;
- use Magento\Framework\Event\ManagerInterface as EventManager;
- use Magento\Framework\EntityManager\MetadataPool;
-@@ -25,7 +32,6 @@ use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\StockInterface;
- /**
-  * Class Full reindex action
-  *
-- * @package Magento\CatalogInventory\Model\Indexer\Stock\Action
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Full extends AbstractAction
-@@ -60,6 +66,11 @@ class Full extends AbstractAction
-      */
-     private $activeTableSwitcher;
- 
-+    /**
-+     * @var QueryGenerator|null
-+     */
-+    private $batchQueryGenerator;
-+
-     /**
-      * @param ResourceConnection $resource
-      * @param StockFactory $indexerFactory
-@@ -71,7 +82,7 @@ class Full extends AbstractAction
-      * @param BatchProviderInterface|null $batchProvider
-      * @param array $batchRowsCount
-      * @param ActiveTableSwitcher|null $activeTableSwitcher
--     *
-+     * @param QueryGenerator|null $batchQueryGenerator
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -84,7 +95,8 @@ class Full extends AbstractAction
-         BatchSizeManagementInterface $batchSizeManagement = null,
-         BatchProviderInterface $batchProvider = null,
-         array $batchRowsCount = [],
--        ActiveTableSwitcher $activeTableSwitcher = null
-+        ActiveTableSwitcher $activeTableSwitcher = null,
-+        QueryGenerator $batchQueryGenerator = null
-     ) {
-         parent::__construct(
-             $resource,
-@@ -97,11 +109,12 @@ class Full extends AbstractAction
-         $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
-         $this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(BatchProviderInterface::class);
-         $this->batchSizeManagement = $batchSizeManagement ?: ObjectManager::getInstance()->get(
--            \Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement::class
-+            BatchSizeManagement::class
-         );
-         $this->batchRowsCount = $batchRowsCount;
-         $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()
-             ->get(ActiveTableSwitcher::class);
-+        $this->batchQueryGenerator = $batchQueryGenerator ?: ObjectManager::getInstance()->get(QueryGenerator::class);
-     }
- 
-     /**
-@@ -109,22 +122,20 @@ class Full extends AbstractAction
-      *
-      * @param null|array $ids
-      * @throws LocalizedException
--     *
-      * @return void
--     *
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    public function execute($ids = null)
-+    public function execute($ids = null): void
-     {
-         try {
-             $this->useIdxTable(false);
-             $this->cleanIndexersTables($this->_getTypeIndexers());
- 
--            $entityMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-+            $entityMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
- 
-             $columns = array_keys($this->_getConnection()->describeTable($this->_getIdxTable()));
- 
--            /** @var \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock $indexer */
-+            /** @var DefaultStock $indexer */
-             foreach ($this->_getTypeIndexers() as $indexer) {
-                 $indexer->setActionType(self::ACTION_TYPE);
-                 $connection = $indexer->getConnection();
-@@ -135,22 +146,21 @@ class Full extends AbstractAction
-                     : $this->batchRowsCount['default'];
- 
-                 $this->batchSizeManagement->ensureBatchSize($connection, $batchRowCount);
--                $batches = $this->batchProvider->getBatches(
--                    $connection,
--                    $entityMetadata->getEntityTable(),
-+
-+                $select = $connection->select();
-+                $select->distinct(true);
-+                $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
-+
-+                $batchQueries = $this->batchQueryGenerator->generate(
-                     $entityMetadata->getIdentifierField(),
--                    $batchRowCount
-+                    $select,
-+                    $batchRowCount,
-+                    BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
-                 );
- 
--                foreach ($batches as $batch) {
-+                foreach ($batchQueries as $query) {
-                     $this->clearTemporaryIndexTable();
--                    // Get entity ids from batch
--                    $select = $connection->select();
--                    $select->distinct(true);
--                    $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
--                    $select->where('type_id = ?', $indexer->getTypeId());
--
--                    $entityIds = $this->batchProvider->getBatchIds($connection, $select, $batch);
-+                    $entityIds = $connection->fetchCol($query);
-                     if (!empty($entityIds)) {
-                         $indexer->reindexEntity($entityIds);
-                         $select = $connection->select()->from($this->_getIdxTable(), $columns);
-@@ -167,12 +177,13 @@ class Full extends AbstractAction
- 
-     /**
-      * Delete all records from index table
-+     *
-      * Used to clean table before re-indexation
-      *
-      * @param array $indexers
-      * @return void
-      */
--    private function cleanIndexersTables(array $indexers)
-+    private function cleanIndexersTables(array $indexers): void
-     {
-         $tables = array_map(
-             function (StockInterface $indexer) {
-diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
-index a32faa4640a..b3fa07479a7 100644
---- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
-+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
-@@ -10,8 +10,10 @@ namespace Magento\CatalogInventory\Model\Indexer\Stock;
- 
- use Magento\CatalogInventory\Api\StockConfigurationInterface;
- use Magento\Framework\App\ResourceConnection;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\DB\Adapter\AdapterInterface;
- use Magento\Framework\Event\ManagerInterface;
-+use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\Indexer\CacheContext;
- use Magento\CatalogInventory\Model\Stock;
- use Magento\Catalog\Model\Product;
-@@ -46,25 +48,35 @@ class CacheCleaner
-      */
-     private $connection;
- 
-+    /**
-+     * @var MetadataPool
-+     */
-+    private $metadataPool;
-+
-     /**
-      * @param ResourceConnection $resource
-      * @param StockConfigurationInterface $stockConfiguration
-      * @param CacheContext $cacheContext
-      * @param ManagerInterface $eventManager
-+     * @param MetadataPool|null $metadataPool
-      */
-     public function __construct(
-         ResourceConnection $resource,
-         StockConfigurationInterface $stockConfiguration,
-         CacheContext $cacheContext,
--        ManagerInterface $eventManager
-+        ManagerInterface $eventManager,
-+        MetadataPool $metadataPool = null
-     ) {
-         $this->resource = $resource;
-         $this->stockConfiguration = $stockConfiguration;
-         $this->cacheContext = $cacheContext;
-         $this->eventManager = $eventManager;
-+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
-     }
- 
-     /**
-+     * Clean cache by product ids.
-+     *
-      * @param array $productIds
-      * @param callable $reindex
-      * @return void
-@@ -76,22 +88,37 @@ class CacheCleaner
-         $productStatusesAfter = $this->getProductStockStatuses($productIds);
-         $productIds = $this->getProductIdsForCacheClean($productStatusesBefore, $productStatusesAfter);
-         if ($productIds) {
--            $this->cacheContext->registerEntities(Product::CACHE_TAG, $productIds);
-+            $this->cacheContext->registerEntities(Product::CACHE_TAG, array_unique($productIds));
-             $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->cacheContext]);
-         }
-     }
- 
-     /**
-+     * Get current stock statuses for product ids.
-+     *
-      * @param array $productIds
-      * @return array
-      */
-     private function getProductStockStatuses(array $productIds)
-     {
-+        $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
-+            ->getLinkField();
-         $select = $this->getConnection()->select()
-             ->from(
--                $this->resource->getTableName('cataloginventory_stock_status'),
-+                ['css' => $this->resource->getTableName('cataloginventory_stock_status')],
-                 ['product_id', 'stock_status', 'qty']
--            )->where('product_id IN (?)', $productIds)
-+            )
-+            ->joinLeft(
-+                ['cpr' => $this->resource->getTableName('catalog_product_relation')],
-+                'css.product_id = cpr.child_id',
-+                []
-+            )
-+            ->joinLeft(
-+                ['cpe' => $this->resource->getTableName('catalog_product_entity')],
-+                'cpr.parent_id = cpe.' . $linkField,
-+                ['parent_id' => 'cpe.entity_id']
-+            )
-+            ->where('product_id IN (?)', $productIds)
-             ->where('stock_id = ?', Stock::DEFAULT_STOCK_ID)
-             ->where('website_id = ?', $this->stockConfiguration->getDefaultScopeId());
- 
-@@ -125,6 +152,9 @@ class CacheCleaner
-             if ($statusBefore['stock_status'] !== $statusAfter['stock_status']
-                 || ($stockThresholdQty && $statusAfter['qty'] <= $stockThresholdQty)) {
-                 $productIds[] = $productId;
-+                if (isset($statusAfter['parent_id'])) {
-+                    $productIds[] = $statusAfter['parent_id'];
-+                }
-             }
-         }
- 
-@@ -132,6 +162,8 @@ class CacheCleaner
-     }
- 
-     /**
-+     * Get database connection.
-+     *
-      * @return AdapterInterface
-      */
-     private function getConnection()
-diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php b/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php
-index ff0b5a42bfd..edbb7f50771 100644
---- a/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php
-+++ b/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php
-@@ -8,39 +8,40 @@
- namespace Magento\CatalogInventory\Model\Plugin;
- 
- use Magento\Catalog\Model\Product\Attribute\Repository;
-+use Magento\Catalog\Model\FilterProductCustomAttribute as Filter;
- 
- class FilterCustomAttribute
- {
-     /**
--     * @var array
-+     * @var Filter
-      */
--    private $blackList;
-+    private $filter;
- 
-     /**
--     * @param array $blackList
-+     * @param Filter $filter
-+     * @internal param Filter $customAttribute
-      */
--    public function __construct(array $blackList = [])
-+    public function __construct(Filter $filter)
-     {
--        $this->blackList = $blackList;
-+        $this->filter = $filter;
-     }
- 
-     /**
--     * Delete custom attribute
-+     * Remove attributes from black list
-      *
-      * @param Repository $repository
-      * @param array $attributes
--     * @return \Magento\Eav\Model\AttributeRepository
-+     * @return \Magento\Framework\Api\MetadataObjectInterface[]
-      *
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    public function afterGetCustomAttributesMetadata(Repository $repository, array $attributes)
-+    public function afterGetCustomAttributesMetadata(Repository $repository, array $attributes): array
-     {
--        foreach ($attributes as $key => $attribute) {
--            if (in_array($attribute->getAttributeCode(), $this->blackList)) {
--                unset($attributes[$key]);
--            }
-+        $return = [];
-+        foreach ($attributes as $attribute) {
-+            $return[$attribute->getAttributeCode()] = $attribute;
-         }
- 
--        return $attributes;
-+        return $this->filter->execute($return);
-     }
- }
-diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php b/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
-index b8e8e47bb1f..168e947b8fa 100644
---- a/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
-+++ b/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
-@@ -3,8 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\CatalogInventory\Model\Plugin;
- 
-+use Magento\Framework\Search\EngineResolverInterface;
-+use Magento\Search\Model\EngineResolver;
-+
-+/**
-+ * Catalog inventory plugin for layer.
-+ */
- class Layer
- {
-     /**
-@@ -21,16 +28,24 @@ class Layer
-      */
-     protected $scopeConfig;
- 
-+    /**
-+     * @var EngineResolverInterface
-+     */
-+    private $engineResolver;
-+
-     /**
-      * @param \Magento\CatalogInventory\Helper\Stock $stockHelper
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-+     * @param EngineResolverInterface $engineResolver
-      */
-     public function __construct(
-         \Magento\CatalogInventory\Helper\Stock $stockHelper,
--        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-+        EngineResolverInterface $engineResolver
-     ) {
-         $this->stockHelper = $stockHelper;
-         $this->scopeConfig = $scopeConfig;
-+        $this->engineResolver = $engineResolver;
-     }
- 
-     /**
-@@ -46,12 +61,22 @@ class Layer
-         \Magento\Catalog\Model\Layer $subject,
-         \Magento\Catalog\Model\ResourceModel\Collection\AbstractCollection $collection
-     ) {
--        if ($this->_isEnabledShowOutOfStock()) {
-+        if (!$this->isCurrentEngineMysql() || $this->_isEnabledShowOutOfStock()) {
-             return;
-         }
-         $this->stockHelper->addIsInStockFilterToCollection($collection);
-     }
- 
-+    /**
-+     * Check if current engine is MYSQL.
-+     *
-+     * @return bool
-+     */
-+    private function isCurrentEngineMysql()
-+    {
-+        return $this->engineResolver->getCurrentSearchEngine() === EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE;
-+    }
-+
-     /**
-      * Get config value for 'display out of stock' option
-      *
-diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
-index 0cc77bb7caf..502d9532e8a 100644
---- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
-+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
-@@ -17,10 +17,18 @@ use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer\Stoc
- use Magento\CatalogInventory\Model\Stock;
- use Magento\Framework\Event\Observer;
- use Magento\Framework\Exception\LocalizedException;
-+use Magento\Quote\Model\Quote\Item;
- 
- /**
-+ * Quote item quantity validator.
-+ *
-  * @api
-  * @since 100.0.2
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- class QuantityValidator
- {
-@@ -67,8 +75,7 @@ class QuantityValidator
-      * Add error information to Quote Item
-      *
-      * @param \Magento\Framework\DataObject $result
--     * @param \Magento\Quote\Model\Quote\Item $quoteItem
--     * @param bool $removeError
-+     * @param Item $quoteItem
-      * @return void
-      */
-     private function addErrorInfoToQuote($result, $quoteItem)
-@@ -100,7 +107,7 @@ class QuantityValidator
-      */
-     public function validate(Observer $observer)
-     {
--        /* @var $quoteItem \Magento\Quote\Model\Quote\Item */
-+        /* @var $quoteItem Item */
-         $quoteItem = $observer->getEvent()->getItem();
-         if (!$quoteItem ||
-             !$quoteItem->getProductId() ||
-@@ -175,35 +182,11 @@ class QuantityValidator
-             $qty = $product->getTypeInstance()->prepareQuoteItemQty($qty, $product);
-             $quoteItem->setData('qty', $qty);
-             if ($stockStatus) {
--                $result = $this->stockState->checkQtyIncrements(
--                    $product->getId(),
--                    $qty,
--                    $product->getStore()->getWebsiteId()
--                );
--                if ($result->getHasError()) {
--                    $quoteItem->addErrorInfo(
--                        'cataloginventory',
--                        Data::ERROR_QTY_INCREMENTS,
--                        $result->getMessage()
--                    );
--
--                    $quoteItem->getQuote()->addErrorInfo(
--                        $result->getQuoteMessageIndex(),
--                        'cataloginventory',
--                        Data::ERROR_QTY_INCREMENTS,
--                        $result->getQuoteMessage()
--                    );
--                } else {
--                    // Delete error from item and its quote, if it was set due to qty problems
--                    $this->_removeErrorsFromQuoteAndItem(
--                        $quoteItem,
--                        Data::ERROR_QTY_INCREMENTS
--                    );
--                }
-+                $this->checkOptionsQtyIncrements($quoteItem, $options);
-             }
-+
-             // variable to keep track if we have previously encountered an error in one of the options
-             $removeError = true;
--
-             foreach ($options as $option) {
-                 $result = $option->getStockStateResult();
-                 if ($result->getHasError()) {
-@@ -228,10 +211,47 @@ class QuantityValidator
-         }
-     }
- 
-+    /**
-+     * Verifies product options quantity increments.
-+     *
-+     * @param Item $quoteItem
-+     * @param array $options
-+     * @return void
-+     */
-+    private function checkOptionsQtyIncrements(Item $quoteItem, array $options): void
-+    {
-+        $removeErrors = true;
-+        foreach ($options as $option) {
-+            $result = $this->stockState->checkQtyIncrements(
-+                $option->getProduct()->getId(),
-+                $quoteItem->getData('qty'),
-+                $option->getProduct()->getStore()->getWebsiteId()
-+            );
-+            if ($result->getHasError()) {
-+                $quoteItem->getQuote()->addErrorInfo(
-+                    $result->getQuoteMessageIndex(),
-+                    'cataloginventory',
-+                    Data::ERROR_QTY_INCREMENTS,
-+                    $result->getQuoteMessage()
-+                );
-+
-+                $removeErrors = false;
-+            }
-+        }
-+
-+        if ($removeErrors) {
-+            // Delete error from item and its quote, if it was set due to qty problems
-+            $this->_removeErrorsFromQuoteAndItem(
-+                $quoteItem,
-+                Data::ERROR_QTY_INCREMENTS
-+            );
-+        }
-+    }
-+
-     /**
-      * Removes error statuses from quote and item, set by this observer
-      *
--     * @param \Magento\Quote\Model\Quote\Item $item
-+     * @param Item $item
-      * @param int $code
-      * @return void
-      */
-diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php
-index b99e43d52f4..a48b9ae5f08 100644
---- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php
-+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php
-@@ -9,6 +9,9 @@ use Magento\CatalogInventory\Api\StockRegistryInterface;
- use Magento\CatalogInventory\Api\StockStateInterface;
- use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\QuoteItemQtyList;
- 
-+/**
-+ * Quote item option initializer.
-+ */
- class Option
- {
-     /**
-@@ -67,10 +70,6 @@ class Option
-          * define that stock item is child for composite product
-          */
-         $stockItem->setIsChildItem(true);
--        /**
--         * don't check qty increments value for option product
--         */
--        $stockItem->setSuppressCheckQtyIncrements(true);
- 
-         return $stockItem;
-     }
-@@ -121,7 +120,7 @@ class Option
-             /**
-              * if option's qty was updates we also need to update quote item qty
-              */
--            $quoteItem->setData('qty', intval($qty));
-+            $quoteItem->setData('qty', (int) $qty);
-         }
-         if ($result->getMessage() !== null) {
-             $option->setMessage($result->getMessage());
-diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php
-index 6fb0a949941..7a46780f2d7 100644
---- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php
-+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php
-@@ -7,8 +7,15 @@ namespace Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initialize
- 
- use Magento\Catalog\Model\ProductTypes\ConfigInterface;
- use Magento\CatalogInventory\Api\StockStateInterface;
-+use Magento\CatalogInventory\Api\Data\StockItemInterface;
- use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\QuoteItemQtyList;
-+use Magento\CatalogInventory\Model\Spi\StockStateProviderInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Quote\Model\Quote\Item;
- 
-+/**
-+ * Class StockItem initializes stock item and populates it with data
-+ */
- class StockItem
- {
-     /**
-@@ -26,26 +33,35 @@ class StockItem
-      */
-     protected $stockState;
- 
-+    /**
-+     * @var StockStateProviderInterface
-+     */
-+    private $stockStateProvider;
-+
-     /**
-      * @param ConfigInterface $typeConfig
-      * @param QuoteItemQtyList $quoteItemQtyList
-      * @param StockStateInterface $stockState
-+     * @param StockStateProviderInterface|null $stockStateProvider
-      */
-     public function __construct(
-         ConfigInterface $typeConfig,
-         QuoteItemQtyList $quoteItemQtyList,
--        StockStateInterface $stockState
-+        StockStateInterface $stockState,
-+        StockStateProviderInterface $stockStateProvider = null
-     ) {
-         $this->quoteItemQtyList = $quoteItemQtyList;
-         $this->typeConfig = $typeConfig;
-         $this->stockState = $stockState;
-+        $this->stockStateProvider = $stockStateProvider ?: ObjectManager::getInstance()
-+            ->get(StockStateProviderInterface::class);
-     }
- 
-     /**
-      * Initialize stock item
-      *
--     * @param \Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem
--     * @param \Magento\Quote\Model\Quote\Item $quoteItem
-+     * @param StockItemInterface $stockItem
-+     * @param Item $quoteItem
-      * @param int $qty
-      *
-      * @return \Magento\Framework\DataObject
-@@ -54,11 +70,14 @@ class StockItem
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-     public function initialize(
--        \Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem,
--        \Magento\Quote\Model\Quote\Item $quoteItem,
-+        StockItemInterface $stockItem,
-+        Item $quoteItem,
-         $qty
-     ) {
-         $product = $quoteItem->getProduct();
-+        $quoteItemId = $quoteItem->getId();
-+        $quoteId = $quoteItem->getQuoteId();
-+        $productId = $product->getId();
-         /**
-          * When we work with subitem
-          */
-@@ -68,14 +87,14 @@ class StockItem
-              * we are using 0 because original qty was processed
-              */
-             $qtyForCheck = $this->quoteItemQtyList
--                ->getQty($product->getId(), $quoteItem->getId(), $quoteItem->getQuoteId(), 0);
-+                ->getQty($productId, $quoteItemId, $quoteId, 0);
-         } else {
-             $increaseQty = $quoteItem->getQtyToAdd() ? $quoteItem->getQtyToAdd() : $qty;
-             $rowQty = $qty;
-             $qtyForCheck = $this->quoteItemQtyList->getQty(
--                $product->getId(),
--                $quoteItem->getId(),
--                $quoteItem->getQuoteId(),
-+                $productId,
-+                $quoteItemId,
-+                $quoteId,
-                 $increaseQty
-             );
-         }
-@@ -90,14 +109,20 @@ class StockItem
- 
-         $stockItem->setProductName($product->getName());
- 
-+        /** @var \Magento\Framework\DataObject $result */
-         $result = $this->stockState->checkQuoteItemQty(
--            $product->getId(),
-+            $productId,
-             $rowQty,
-             $qtyForCheck,
-             $qty,
-             $product->getStore()->getWebsiteId()
-         );
- 
-+        /* We need to ensure that any possible plugin will not erase the data */
-+        $backOrdersQty = $this->stockStateProvider->checkQuoteItemQty($stockItem, $rowQty, $qtyForCheck, $qty)
-+            ->getItemBackorders();
-+        $result->setItemBackorders($backOrdersQty);
-+
-         if ($stockItem->hasIsChildItem()) {
-             $stockItem->unsIsChildItem();
-         }
-diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
-index 366cb1c3902..c5644060c68 100644
---- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
-+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
-@@ -18,6 +18,10 @@ use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- class DefaultStock extends AbstractIndexer implements StockInterface
- {
-@@ -288,6 +292,7 @@ class DefaultStock extends AbstractIndexer implements StockInterface
-      */
-     protected function _updateIndex($entityIds)
-     {
-+        $this->deleteOldRecords($entityIds);
-         $connection = $this->getConnection();
-         $select = $this->_getStockStatusSelect($entityIds, true);
-         $select = $this->getQueryProcessorComposite()->processQuery($select, $entityIds, true);
-@@ -310,7 +315,6 @@ class DefaultStock extends AbstractIndexer implements StockInterface
-             }
-         }
- 
--        $this->deleteOldRecords($entityIds);
-         $this->_updateIndexTable($data);
- 
-         return $this;
-@@ -318,6 +322,7 @@ class DefaultStock extends AbstractIndexer implements StockInterface
- 
-     /**
-      * Delete records by their ids from index table
-+     *
-      * Used to clean table before re-indexation
-      *
-      * @param array $ids
-@@ -362,6 +367,8 @@ class DefaultStock extends AbstractIndexer implements StockInterface
-     }
- 
-     /**
-+     * Get status expression
-+     *
-      * @param AdapterInterface $connection
-      * @param bool $isAggregate
-      * @return mixed
-@@ -387,6 +394,8 @@ class DefaultStock extends AbstractIndexer implements StockInterface
-     }
- 
-     /**
-+     * Get stock configuration
-+     *
-      * @return StockConfigurationInterface
-      *
-      * @deprecated 100.1.0
-@@ -402,6 +411,8 @@ class DefaultStock extends AbstractIndexer implements StockInterface
-     }
- 
-     /**
-+     * Get query processor composite
-+     *
-      * @return QueryProcessorComposite
-      */
-     private function getQueryProcessorComposite()
-diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/QueryProcessorInterface.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/QueryProcessorInterface.php
-index abe473bd968..115002b2376 100644
---- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/QueryProcessorInterface.php
-+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/QueryProcessorInterface.php
-@@ -11,6 +11,10 @@ use Magento\Framework\DB\Select;
- /**
-  * @api
-  * @since 100.1.0
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface QueryProcessorInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php
-index 5ced55edf20..24ed4963728 100644
---- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php
-+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock;
-  * CatalogInventory Stock Indexer Interface
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php
-index f9738484766..0ee162e429f 100644
---- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php
-+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php
-@@ -12,6 +12,10 @@ namespace Magento\CatalogInventory\Model\ResourceModel\Indexer;
- /**
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- class StockFactory
- {
-diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
-index ce8930ad4f7..edccad60231 100644
---- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
-+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
-@@ -263,6 +263,12 @@ class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-         $connection->update($this->getMainTable(), $value, $where);
-     }
- 
-+    /**
-+     * Get Manage Stock Expression
-+     *
-+     * @param string $tableAlias
-+     * @return \Zend_Db_Expr
-+     */
-     public function getManageStockExpr(string $tableAlias = ''): \Zend_Db_Expr
-     {
-         if ($tableAlias) {
-@@ -277,6 +283,12 @@ class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-         return $manageStock;
-     }
- 
-+    /**
-+     * Get Backorders Expression
-+     *
-+     * @param string $tableAlias
-+     * @return \Zend_Db_Expr
-+     */
-     public function getBackordersExpr(string $tableAlias = ''): \Zend_Db_Expr
-     {
-         if ($tableAlias) {
-@@ -291,6 +303,12 @@ class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-         return $itemBackorders;
-     }
- 
-+    /**
-+     * Get Minimum Sale Quantity Expression
-+     *
-+     * @param string $tableAlias
-+     * @return \Zend_Db_Expr
-+     */
-     public function getMinSaleQtyExpr(string $tableAlias = ''): \Zend_Db_Expr
-     {
-         if ($tableAlias) {
-diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
-index bc5fda4939a..402ce5f2f61 100644
---- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
-+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
-@@ -13,6 +13,10 @@ use Magento\Framework\App\ObjectManager;
-  * CatalogInventory Stock Status per website Resource Model
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @api
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- {
-diff --git a/app/code/Magento/CatalogInventory/Model/Source/Backorders.php b/app/code/Magento/CatalogInventory/Model/Source/Backorders.php
-index 1d200d27a44..0bffb9a9888 100644
---- a/app/code/Magento/CatalogInventory/Model/Source/Backorders.php
-+++ b/app/code/Magento/CatalogInventory/Model/Source/Backorders.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogInventory\Model\Source;
-  * Back orders source class
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- class Backorders implements \Magento\Framework\Option\ArrayInterface
- {
-diff --git a/app/code/Magento/CatalogInventory/Model/Source/Stock.php b/app/code/Magento/CatalogInventory/Model/Source/Stock.php
-index 9ed891d1dcc..7d44ab782de 100644
---- a/app/code/Magento/CatalogInventory/Model/Source/Stock.php
-+++ b/app/code/Magento/CatalogInventory/Model/Source/Stock.php
-@@ -11,6 +11,10 @@ use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
-  * CatalogInventory Stock source model
-  * @api
-  * @since 100.0.2
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- class Stock extends AbstractSource
- {
-diff --git a/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php b/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
-index f711268bc79..0fa4b919c40 100644
---- a/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
-+++ b/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
-@@ -7,16 +7,24 @@ namespace Magento\CatalogInventory\Model\Spi;
- 
- /**
-  * Interface StockRegistryProviderInterface
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockRegistryProviderInterface
- {
-     /**
-+     * Get stock.
-+     *
-      * @param int $scopeId
-      * @return \Magento\CatalogInventory\Api\Data\StockInterface
-      */
-     public function getStock($scopeId);
- 
-     /**
-+     * Get stock item.
-+     *
-      * @param int $productId
-      * @param int $scopeId
-      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
-@@ -24,6 +32,8 @@ interface StockRegistryProviderInterface
-     public function getStockItem($productId, $scopeId);
- 
-     /**
-+     * Get stock status.
-+     *
-      * @param int $productId
-      * @param int $scopeId
-      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
-diff --git a/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php b/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
-index 89fb54e7e49..30f703b5b92 100644
---- a/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
-+++ b/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
-@@ -9,22 +9,32 @@ use Magento\CatalogInventory\Api\Data\StockItemInterface;
- 
- /**
-  * Interface StockStateProviderInterface
-+ *
-+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
-+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
-  */
- interface StockStateProviderInterface
- {
-     /**
-+     * Verify stock.
-+     *
-      * @param StockItemInterface $stockItem
-      * @return bool
-      */
-     public function verifyStock(StockItemInterface $stockItem);
- 
-     /**
-+     * Verify notification.
-+     *
-      * @param StockItemInterface $stockItem
-      * @return bool
-      */
-     public function verifyNotification(StockItemInterface $stockItem);
- 
-     /**
-+     * Validate quote qty.
-+     *
-      * @param StockItemInterface $stockItem
-      * @param int|float $itemQty
-      * @param int|float $qtyToCheck
-@@ -44,8 +54,9 @@ interface StockStateProviderInterface
-     public function checkQty(StockItemInterface $stockItem, $qty);
- 
-     /**
--     * Returns suggested qty that satisfies qty increments and minQty/maxQty/minSaleQty/maxSaleQty conditions
--     * or original qty if such value does not exist
-+     * Returns suggested qty or original qty if such value does not exist.
-+     *
-+     * Suggested qty satisfies qty increments and minQty/maxQty/minSaleQty/maxSaleQty conditions.
-      *
-      * @param StockItemInterface $stockItem
-      * @param int|float $qty
-@@ -54,6 +65,8 @@ interface StockStateProviderInterface
-     public function suggestQty(StockItemInterface $stockItem, $qty);
- 
-     /**
-+     * Check qty increments.
-+     *
-      * @param StockItemInterface $stockItem
-      * @param int|float $qty
-      * @return \Magento\Framework\DataObject
-diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
-index bcab2c622a5..553ea7393c9 100644
---- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php
-+++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
-@@ -206,7 +206,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
-      */
-     public function getQty()
-     {
--        return null === $this->_getData(static::QTY) ? null : floatval($this->_getData(static::QTY));
-+        return null === $this->_getData(static::QTY) ? null : (float)$this->_getData(static::QTY);
-     }
- 
-     /**
-diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Stock/Status.php
-index 899056d8f08..4941d5d333b 100644
---- a/app/code/Magento/CatalogInventory/Model/Stock/Status.php
-+++ b/app/code/Magento/CatalogInventory/Model/Stock/Status.php
-@@ -72,6 +72,8 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
-     //@codeCoverageIgnoreStart
- 
-     /**
-+     * Retrieve  product ID
-+     *
-      * @return int
-      */
-     public function getProductId()
-@@ -80,6 +82,8 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
-     }
- 
-     /**
-+     * Retrieve website ID
-+     *
-      * @return int
-      */
-     public function getWebsiteId()
-@@ -88,6 +92,8 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
-     }
- 
-     /**
-+     * Retrieve stock ID
-+     *
-      * @return int
-      */
-     public function getStockId()
-@@ -96,6 +102,8 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
-     }
- 
-     /**
-+     * Retrieve qty
-+     *
-      * @return int
-      */
-     public function getQty()
-@@ -104,16 +112,20 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
-     }
- 
-     /**
-+     * Retrieve stock status
-+     *
-      * @return int
-      */
--    public function getStockStatus()
-+    public function getStockStatus(): int
-     {
--        return $this->getData(self::KEY_STOCK_STATUS);
-+        return (int)$this->getData(self::KEY_STOCK_STATUS);
-     }
- 
-     //@codeCoverageIgnoreEnd
- 
-     /**
-+     * Retrieve stock item
-+     *
-      * @return StockItemInterface
-      */
-     public function getStockItem()
-@@ -124,6 +136,8 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
-     //@codeCoverageIgnoreStart
- 
-     /**
-+     * Set product ID
-+     *
-      * @param int $productId
-      * @return $this
-      */
-@@ -133,6 +147,8 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
-     }
- 
-     /**
-+     * Set web website ID
-+     *
-      * @param int $websiteId
-      * @return $this
-      */
-@@ -142,6 +158,8 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
-     }
- 
-     /**
-+     * Set stock ID
-+     *
-      * @param int $stockId
-      * @return $this
-      */
-@@ -151,6 +169,8 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
-     }
- 
-     /**
-+     * Set qty
-+     *
-      * @param int $qty
-      * @return $this
-      */
-@@ -160,6 +180,8 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
-     }
- 
-     /**
-+     * Set stock status
-+     *
-      * @param int $stockStatus
-      * @return $this
-      */
-@@ -169,7 +191,7 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Retrieve existing extension attributes object or create a new one.
-      *
-      * @return \Magento\CatalogInventory\Api\Data\StockStatusExtensionInterface|null
-      */
-@@ -179,7 +201,7 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Set an extension attributes object.
-      *
-      * @param \Magento\CatalogInventory\Api\Data\StockStatusExtensionInterface $extensionAttributes
-      * @return $this
-diff --git a/app/code/Magento/CatalogInventory/Model/StockManagement.php b/app/code/Magento/CatalogInventory/Model/StockManagement.php
-index b3939f2e514..5d7d099dc01 100644
---- a/app/code/Magento/CatalogInventory/Model/StockManagement.php
-+++ b/app/code/Magento/CatalogInventory/Model/StockManagement.php
-@@ -85,6 +85,7 @@ class StockManagement implements StockManagementInterface, RegisterProductSaleIn
- 
-     /**
-      * Subtract product qtys from stock.
-+     *
-      * Return array of items that require full save.
-      *
-      * @param string[] $items
-@@ -141,17 +142,25 @@ class StockManagement implements StockManagementInterface, RegisterProductSaleIn
-     }
- 
-     /**
--     * @param string[] $items
--     * @param int $websiteId
--     * @return bool
-+     * @inheritdoc
-      */
-     public function revertProductsSale($items, $websiteId = null)
-     {
-         //if (!$websiteId) {
-         $websiteId = $this->stockConfiguration->getDefaultScopeId();
-         //}
--        $this->qtyCounter->correctItemsQty($items, $websiteId, '+');
--        return true;
-+        $revertItems = [];
-+        foreach ($items as $productId => $qty) {
-+            $stockItem = $this->stockRegistryProvider->getStockItem($productId, $websiteId);
-+            $canSubtractQty = $stockItem->getItemId() && $this->canSubtractQty($stockItem);
-+            if (!$canSubtractQty || !$this->stockConfiguration->isQty($stockItem->getTypeId())) {
-+                continue;
-+            }
-+            $revertItems[$productId] = $qty;
-+        }
-+        $this->qtyCounter->correctItemsQty($revertItems, $websiteId, '+');
-+
-+        return $revertItems;
-     }
- 
-     /**
-@@ -195,6 +204,8 @@ class StockManagement implements StockManagementInterface, RegisterProductSaleIn
-     }
- 
-     /**
-+     * Get stock resource.
-+     *
-      * @return ResourceStock
-      */
-     protected function getResource()
-diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php b/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php
-index 0a54adfe91c..8238c1e8f6b 100644
---- a/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php
-+++ b/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php
-@@ -68,7 +68,7 @@ class StockRegistryStorage
-      */
-     public function getStockItem($productId, $scopeId)
-     {
--        return isset($this->stockItems[$productId][$scopeId]) ? $this->stockItems[$productId][$scopeId] : null;
-+        return $this->stockItems[$productId][$scopeId] ?? null;
-     }
- 
-     /**
-@@ -103,7 +103,7 @@ class StockRegistryStorage
-      */
-     public function getStockStatus($productId, $scopeId)
-     {
--        return isset($this->stockStatuses[$productId][$scopeId]) ? $this->stockStatuses[$productId][$scopeId] : null;
-+        return $this->stockStatuses[$productId][$scopeId] ?? null;
-     }
- 
-     /**
-diff --git a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
-index fb6fc3be613..6851b05aa56 100644
---- a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
-+++ b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
-@@ -9,9 +9,9 @@ namespace Magento\CatalogInventory\Model;
- use Magento\Catalog\Model\ProductFactory;
- use Magento\CatalogInventory\Api\Data\StockItemInterface;
- use Magento\CatalogInventory\Model\Spi\StockStateProviderInterface;
-+use Magento\Framework\DataObject\Factory as ObjectFactory;
- use Magento\Framework\Locale\FormatInterface;
- use Magento\Framework\Math\Division as MathDivision;
--use Magento\Framework\DataObject\Factory as ObjectFactory;
- 
- /**
-  * Interface StockStateProvider
-@@ -65,6 +65,8 @@ class StockStateProvider implements StockStateProviderInterface
-     }
- 
-     /**
-+     * Validate stock
-+     *
-      * @param StockItemInterface $stockItem
-      * @return bool
-      */
-@@ -82,6 +84,8 @@ class StockStateProvider implements StockStateProviderInterface
-     }
- 
-     /**
-+     * Verify notification
-+     *
-      * @param StockItemInterface $stockItem
-      * @return bool
-      */
-@@ -91,6 +95,8 @@ class StockStateProvider implements StockStateProviderInterface
-     }
- 
-     /**
-+     * Validate quote qty
-+     *
-      * @param StockItemInterface $stockItem
-      * @param int|float $qty
-      * @param int|float $summaryQty
-@@ -113,14 +119,12 @@ class StockStateProvider implements StockStateProviderInterface
-         $result->setItemIsQtyDecimal($stockItem->getIsQtyDecimal());
-         if (!$stockItem->getIsQtyDecimal()) {
-             $result->setHasQtyOptionUpdate(true);
--            $qty = intval($qty);
-+            $qty = (int) $qty ?: 1;
-             /**
-              * Adding stock data to quote item
-              */
-             $result->setItemQty($qty);
--            $qty = $this->getNumber($qty);
--            $origQty = intval($origQty);
--            $result->setOrigQty($origQty);
-+            $result->setOrigQty((int)$this->getNumber($origQty) ?: 1);
-         }
- 
-         if ($stockItem->getMinSaleQty() && $qty < $stockItem->getMinSaleQty()) {
-@@ -254,6 +258,8 @@ class StockStateProvider implements StockStateProviderInterface
-     }
- 
-     /**
-+     * Returns suggested qty
-+     *
-      * Returns suggested qty that satisfies qty increments and minQty/maxQty/minSaleQty/maxSaleQty conditions
-      * or original qty if such value does not exist
-      *
-@@ -294,6 +300,8 @@ class StockStateProvider implements StockStateProviderInterface
-     }
- 
-     /**
-+     * Check Qty Increments
-+     *
-      * @param StockItemInterface $stockItem
-      * @param float|int $qty
-      * @return \Magento\Framework\DataObject
-@@ -369,6 +377,8 @@ class StockStateProvider implements StockStateProviderInterface
-     }
- 
-     /**
-+     * Get numeric qty
-+     *
-      * @param string|float|int|null $qty
-      * @return float|null
-      */
-diff --git a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
-index 1e99794d68a..098e254d785 100644
---- a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
-+++ b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
-@@ -6,15 +6,21 @@
- 
- namespace Magento\CatalogInventory\Observer;
- 
--use Magento\Framework\Event\ObserverInterface;
- use Magento\CatalogInventory\Api\StockManagementInterface;
-+use Magento\CatalogInventory\Model\Configuration;
- use Magento\Framework\Event\Observer as EventObserver;
-+use Magento\Framework\Event\ObserverInterface;
- 
- /**
-  * Catalog inventory module observer
-  */
- class CancelOrderItemObserver implements ObserverInterface
- {
-+    /**
-+     * @var \Magento\CatalogInventory\Model\Configuration
-+     */
-+    protected $configuration;
-+
-     /**
-      * @var StockManagementInterface
-      */
-@@ -26,13 +32,16 @@ class CancelOrderItemObserver implements ObserverInterface
-     protected $priceIndexer;
- 
-     /**
-+     * @param Configuration $configuration
-      * @param StockManagementInterface $stockManagement
-      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
-      */
-     public function __construct(
-+        Configuration $configuration,
-         StockManagementInterface $stockManagement,
-         \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
-     ) {
-+        $this->configuration = $configuration;
-         $this->stockManagement = $stockManagement;
-         $this->priceIndexer = $priceIndexer;
-     }
-@@ -49,7 +58,8 @@ class CancelOrderItemObserver implements ObserverInterface
-         $item = $observer->getEvent()->getItem();
-         $children = $item->getChildrenItems();
-         $qty = $item->getQtyOrdered() - max($item->getQtyShipped(), $item->getQtyInvoiced()) - $item->getQtyCanceled();
--        if ($item->getId() && $item->getProductId() && empty($children) && $qty) {
-+        if ($item->getId() && $item->getProductId() && empty($children) && $qty && $this->configuration
-+            ->getCanBackInStock()) {
-             $this->stockManagement->backItemQty($item->getProductId(), $qty, $item->getStore()->getWebsiteId());
-         }
-         $this->priceIndexer->reindexRow($item->getProductId());
-diff --git a/app/code/Magento/CatalogInventory/Observer/ParentItemProcessorInterface.php b/app/code/Magento/CatalogInventory/Observer/ParentItemProcessorInterface.php
-new file mode 100644
-index 00000000000..dd5689a396e
---- /dev/null
-+++ b/app/code/Magento/CatalogInventory/Observer/ParentItemProcessorInterface.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogInventory\Observer;
-+
-+use Magento\Catalog\Api\Data\ProductInterface as Product;
-+
-+/**
-+ * Interface for processing parent items of complex product types
-+ */
-+interface ParentItemProcessorInterface
-+{
-+    /**
-+     * Process stock for parent items
-+     *
-+     * @param Product $product
-+     * @return void
-+     */
-+    public function process(Product $product);
-+}
-diff --git a/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php b/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
-index b831af53d4a..6aad119694a 100644
---- a/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
-+++ b/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
-@@ -12,8 +12,7 @@ use Magento\Framework\Event\ObserverInterface;
- use Magento\Framework\Event\Observer as EventObserver;
- 
- /**
-- * This observer prepares stock data for saving by combining stock data from the stock data property
-- * and quantity_and_stock_status attribute and setting it to the single point represented by stock data property.
-+ * Prepares stock data for saving
-  *
-  * @deprecated 100.2.0 Stock data should be processed using the module API
-  * @see StockItemInterface when you want to change the stock data
-@@ -74,7 +73,6 @@ class ProcessInventoryDataObserver implements ObserverInterface
-                 $this->setStockDataToProduct($product, $stockItem, $quantityAndStockStatus);
-             }
-         }
--        $product->unsetData('quantity_and_stock_status');
-     }
- 
-     /**
-diff --git a/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php b/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
-index 93a50cc9a7a..ab21f32b3f6 100644
---- a/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
-+++ b/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
-@@ -64,8 +64,8 @@ class RevertQuoteInventoryObserver implements ObserverInterface
-     {
-         $quote = $observer->getEvent()->getQuote();
-         $items = $this->productQty->getProductQty($quote->getAllItems());
--        $this->stockManagement->revertProductsSale($items, $quote->getStore()->getWebsiteId());
--        $productIds = array_keys($items);
-+        $revertedItems = $this->stockManagement->revertProductsSale($items, $quote->getStore()->getWebsiteId());
-+        $productIds = array_keys($revertedItems);
-         if (!empty($productIds)) {
-             $this->stockIndexerProcessor->reindexList($productIds);
-             $this->priceIndexer->reindexList($productIds);
-diff --git a/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php b/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php
-index 03ba58d3f49..dd67140fa0c 100644
---- a/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php
-+++ b/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php
-@@ -13,6 +13,8 @@ use Magento\CatalogInventory\Api\StockConfigurationInterface;
- use Magento\CatalogInventory\Api\StockRegistryInterface;
- use Magento\CatalogInventory\Model\StockItemValidator;
- use Magento\Framework\Event\Observer as EventObserver;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
- 
- /**
-  * Saves stock data from a product to the Stock Item
-@@ -39,6 +41,11 @@ class SaveInventoryDataObserver implements ObserverInterface
-      */
-     private $stockItemValidator;
- 
-+    /**
-+     * @var ParentItemProcessorInterface[]
-+     */
-+    private $parentItemProcessorPool;
-+
-     /**
-      * @var array
-      */
-@@ -77,15 +84,18 @@ class SaveInventoryDataObserver implements ObserverInterface
-      * @param StockConfigurationInterface $stockConfiguration
-      * @param StockRegistryInterface $stockRegistry
-      * @param StockItemValidator $stockItemValidator
-+     * @param ParentItemProcessorInterface[] $parentItemProcessorPool
-      */
-     public function __construct(
-         StockConfigurationInterface $stockConfiguration,
-         StockRegistryInterface $stockRegistry,
--        StockItemValidator $stockItemValidator = null
-+        StockItemValidator $stockItemValidator = null,
-+        array $parentItemProcessorPool = []
-     ) {
-         $this->stockConfiguration = $stockConfiguration;
-         $this->stockRegistry = $stockRegistry;
-         $this->stockItemValidator = $stockItemValidator ?: ObjectManager::getInstance()->get(StockItemValidator::class);
-+        $this->parentItemProcessorPool = $parentItemProcessorPool;
-     }
- 
-     /**
-@@ -96,10 +106,15 @@ class SaveInventoryDataObserver implements ObserverInterface
-      *
-      * @param EventObserver $observer
-      * @return void
-+     * @throws LocalizedException
-+     * @throws NoSuchEntityException
-      */
-     public function execute(EventObserver $observer)
-     {
-+        /** @var Product $product */
-         $product = $observer->getEvent()->getProduct();
-+
-+        /** @var Item $stockItem */
-         $stockItem = $this->getStockItemToBeUpdated($product);
- 
-         if ($product->getStockData() !== null) {
-@@ -108,6 +123,7 @@ class SaveInventoryDataObserver implements ObserverInterface
-         }
-         $this->stockItemValidator->validate($product, $stockItem);
-         $this->stockRegistry->updateStockItemBySku($product->getSku(), $stockItem);
-+        $this->processParents($product);
-     }
- 
-     /**
-@@ -156,4 +172,17 @@ class SaveInventoryDataObserver implements ObserverInterface
-         }
-         return $stockData;
-     }
-+
-+    /**
-+     * Process stock data for parent products
-+     *
-+     * @param Product $product
-+     * @return void
-+     */
-+    private function processParents(Product $product)
-+    {
-+        foreach ($this->parentItemProcessorPool as $processor) {
-+            $processor->process($product);
-+        }
-+    }
- }
-diff --git a/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
-new file mode 100644
-index 00000000000..334d2b22edb
---- /dev/null
-+++ b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
-@@ -0,0 +1,159 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\CatalogInventory\Plugin;
-+
-+use Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save;
-+use Magento\CatalogInventory\Api\Data\StockItemInterface;
-+
-+/**
-+ * MassUpdate product attribute.
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class MassUpdateProductAttribute
-+{
-+    /**
-+     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
-+     */
-+    private $stockIndexerProcessor;
-+
-+    /**
-+     * @var \Magento\Framework\Api\DataObjectHelper
-+     */
-+    private $dataObjectHelper;
-+
-+    /**
-+     * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-+     */
-+    private $stockRegistry;
-+
-+    /**
-+     * @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface
-+     */
-+    private $stockItemRepository;
-+
-+    /**
-+     * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
-+     */
-+    private $stockConfiguration;
-+
-+    /**
-+     * @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute
-+     */
-+    private $attributeHelper;
-+
-+    /**
-+     * @var \Magento\Framework\Message\ManagerInterface
-+     */
-+    private $messageManager;
-+
-+    /**
-+     * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor
-+     * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-+     * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
-+     * @param \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository
-+     * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
-+     * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
-+     * @param \Magento\Framework\Message\ManagerInterface $messageManager
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     */
-+    public function __construct(
-+        \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
-+        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
-+        \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
-+        \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository,
-+        \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
-+        \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper,
-+        \Magento\Framework\Message\ManagerInterface $messageManager
-+    ) {
-+        $this->stockIndexerProcessor = $stockIndexerProcessor;
-+        $this->dataObjectHelper = $dataObjectHelper;
-+        $this->stockRegistry = $stockRegistry;
-+        $this->stockItemRepository = $stockItemRepository;
-+        $this->stockConfiguration = $stockConfiguration;
-+        $this->attributeHelper = $attributeHelper;
-+        $this->messageManager = $messageManager;
-+    }
-+
-+    /**
-+     * Around execute plugin
-+     *
-+     * @param Save $subject
-+     * @param callable $proceed
-+     *
-+     * @return \Magento\Framework\Controller\ResultInterface
-+     */
-+    public function aroundExecute(Save $subject, callable $proceed)
-+    {
-+        try {
-+            /** @var \Magento\Framework\App\RequestInterface $request */
-+            $request = $subject->getRequest();
-+            $inventoryData = $request->getParam('inventory', []);
-+            $inventoryData = $this->addConfigSettings($inventoryData);
-+
-+            $storeId = $this->attributeHelper->getSelectedStoreId();
-+            $websiteId = $this->attributeHelper->getStoreWebsiteId($storeId);
-+            $productIds = $this->attributeHelper->getProductIds();
-+
-+            if (!empty($inventoryData)) {
-+                $this->updateInventoryInProducts($productIds, $websiteId, $inventoryData);
-+            }
-+
-+            return $proceed();
-+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-+            $this->messageManager->addErrorMessage($e->getMessage());
-+            return $proceed();
-+        } catch (\Exception $e) {
-+            $this->messageManager->addExceptionMessage(
-+                $e,
-+                __('Something went wrong while updating the product(s) attributes.')
-+            );
-+            return $proceed();
-+        }
-+    }
-+
-+    /**
-+     * Add config settings
-+     *
-+     * @param array $inventoryData
-+     *
-+     * @return array
-+     */
-+    private function addConfigSettings($inventoryData)
-+    {
-+        $options = $this->stockConfiguration->getConfigItemOptions();
-+        foreach ($options as $option) {
-+            $useConfig = 'use_config_' . $option;
-+            if (isset($inventoryData[$option]) && !isset($inventoryData[$useConfig])) {
-+                $inventoryData[$useConfig] = 0;
-+            }
-+        }
-+        return $inventoryData;
-+    }
-+
-+    /**
-+     * Update inventory in products
-+     *
-+     * @param array $productIds
-+     * @param int $websiteId
-+     * @param array $inventoryData
-+     *
-+     * @return void
-+     */
-+    private function updateInventoryInProducts($productIds, $websiteId, $inventoryData): void
-+    {
-+        foreach ($productIds as $productId) {
-+            $stockItemDo = $this->stockRegistry->getStockItem($productId, $websiteId);
-+            if (!$stockItemDo->getProductId()) {
-+                $inventoryData['product_id'] = $productId;
-+            }
-+            $stockItemId = $stockItemDo->getId();
-+            $this->dataObjectHelper->populateWithArray($stockItemDo, $inventoryData, StockItemInterface::class);
-+            $stockItemDo->setItemId($stockItemId);
-+            $this->stockItemRepository->save($stockItemDo);
-+        }
-+        $this->stockIndexerProcessor->reindexList($productIds);
-+    }
-+}
-diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/DisplayOutOfStockProductActionGroup.xml b/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/DisplayOutOfStockProductActionGroup.xml
-index 1bec4cc99c0..2850b8d0692 100644
---- a/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/DisplayOutOfStockProductActionGroup.xml
-+++ b/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/DisplayOutOfStockProductActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="displayOutOfStockProduct">
-         <amOnPage url="{{InventoryConfigurationPage.url}}" stepKey="navigateToInventoryConfigurationPage"/>
-         <waitForPageLoad stepKey="waitForConfigPageToLoad"/>
-@@ -21,6 +21,7 @@
-     <actionGroup name="noDisplayOutOfStockProduct">
-         <amOnPage url="{{InventoryConfigurationPage.url}}" stepKey="navigateToInventoryConfigurationPage"/>
-         <waitForPageLoad stepKey="waitForConfigPageToLoad"/>
-+        <conditionalClick stepKey="expandProductStockOptions" selector="{{InventoryConfigSection.ProductStockOptionsTab}}" dependentSelector="{{InventoryConfigSection.CheckIfProductStockOptionsTabExpanded}}" visible="true" />
-         <uncheckOption selector="{{InventoryConfigSection.DisplayOutOfStockSystemValue}}" stepKey="uncheckUseSystemValue"/>
-         <waitForElementVisible selector="{{InventoryConfigSection.DisplayOutOfStockDropdown}}" stepKey="waitForSwitcherDropdown" />
-         <selectOption selector="{{InventoryConfigSection.DisplayOutOfStockDropdown}}" userInput="No" stepKey="switchToNo" />
-diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Data/CatalogInventoryConfigData.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Data/CatalogInventoryConfigData.xml
-new file mode 100644
-index 00000000000..e14c36446fc
---- /dev/null
-+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Data/CatalogInventoryConfigData.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="StockOptionsDisplayOutOfStockProductsEnable">
-+        <data key="path">cataloginventory/options/show_out_of_stock</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="StockOptionsDisplayOutOfStockProductsDisable">
-+        <data key="path">cataloginventory/options/show_out_of_stock</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Data/CatalogInventryConfigData.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Data/CatalogInventryConfigData.xml
-new file mode 100644
-index 00000000000..3a49b821ead
---- /dev/null
-+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Data/CatalogInventryConfigData.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="EnableCatalogInventoryConfigData">
-+        <!--Default Value -->
-+        <data key="path">cataloginventory/options/can_subtract</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="DisableCatalogInventoryConfigData">
-+        <data key="path">cataloginventory/options/can_subtract</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Page/InventoryConfigurationPage.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Page/InventoryConfigurationPage.xml
-index 95e873a3b16..ba8a3c300b2 100644
---- a/app/code/Magento/CatalogInventory/Test/Mftf/Page/InventoryConfigurationPage.xml
-+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Page/InventoryConfigurationPage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="InventoryConfigurationPage" url="admin/system_config/edit/section/cataloginventory/" area="admin" module="Magento_Config">
-         <section name="InventorySection"/>
-     </page>
-diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Section/InventorySection.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Section/InventorySection.xml
-index 55fbc84ead9..929f43467b9 100644
---- a/app/code/Magento/CatalogInventory/Test/Mftf/Section/InventorySection.xml
-+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Section/InventorySection.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="InventoryConfigSection">
-         <element name="ProductStockOptionsTab" type="button" selector="#cataloginventory_options-head"/>
-         <element name="CheckIfProductStockOptionsTabExpanded" type="button" selector="#cataloginventory_options-head:not(.open)"/>
-diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
-new file mode 100644
-index 00000000000..8458fcf3b94
---- /dev/null
-+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
-@@ -0,0 +1,146 @@
-+<?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="AssociatedProductToConfigurableOutOfStockTest">
-+        <annotations>
-+            <features value="CatalogInventory"/>
-+            <stories value="Add/remove images and videos for all product types and category"/>
-+            <title value="Out of stock associated products to configurable are not full page cache cleaned "/>
-+            <description value="After last configurable product was ordered it becomes out of stock"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94135"/>
-+            <group value="CatalogInventory"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="simplecategory"/>
-+
-+            <!-- Create configurable product with two options -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="simplecategory"/>
-+            </createData>
-+
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create child product with single quantity -->
-+            <createData entity="ApiSimpleSingleQty" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer" stepKey="createSimpleUsCustomer">
-+                <field key="group_id">1</field>
-+            </createData>
-+        </before>
-+
-+        <after>
-+              <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+              <deleteData createDataKey="simplecategory" stepKey="deleteSimpleCategory"/>
-+              <deleteData createDataKey="createSimpleUsCustomer" stepKey="deleteCustomer"/>
-+              <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+              <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+              <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+          </after>
-+
-+        <!-- Login as a customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUpNewUser">
-+            <argument name="Customer" value="$$createSimpleUsCustomer$$"/>
-+        </actionGroup>
-+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage"/>
-+        <!-- Go to configurable product page -->
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+
-+        <!-- Order product with single quantity -->
-+        <selectOption userInput="$$createConfigProductAttributeOption1.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.optionByAttributeId($$createConfigProductAttribute.attribute_id$$)}}" stepKey="configProductFillOption" />
-+        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
-+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage"/>
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-+        <waitForPageLoad stepKey="waitForOrderSuccessPage1"/>
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
-+        <actionGroup ref="StorefrontSignOutActionGroup" stepKey="StorefrontSignOutActionGroup"/>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
-+        <!-- Reset admin order filter -->
-+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5"/>
-+        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
-+        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
-+
-+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-+        <waitForPageLoad stepKey="waitForOrderPageToLoad"/>
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
-+        <waitForPageLoad stepKey="waitForNewInvoicePageToLoad"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+        <waitForPageLoad stepKey="waitForNewInvoiceToBeCreated"/>
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
-+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShip"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForShipLoadingMask"/>
-+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="submitShipment"/>
-+        <waitForPageLoad stepKey="waitShipmentCreated"/>
-+        <actionGroup ref="logout" stepKey="logout"/>
-+        <magentoCLI stepKey="runCron" command="cron:run --group='index'"/>
-+
-+        <!-- Wait till cron job runs for schedule updates -->
-+        <wait time="60" stepKey="waitForUpdateStarts"/>
-+
-+        <!-- Assert that product with single quantity is not available for order -->
-+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage2"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
-+        <dontSee userInput="$$createConfigProductAttributeOption1.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.optionByAttributeId($$createConfigProductAttribute.attribute_id$$)}}" stepKey="assertOptionNotAvailable" />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Helper/MinsaleqtyTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Helper/MinsaleqtyTest.php
-index f008ed7d9d6..051e002b80c 100644
---- a/app/code/Magento/CatalogInventory/Test/Unit/Helper/MinsaleqtyTest.php
-+++ b/app/code/Magento/CatalogInventory/Test/Unit/Helper/MinsaleqtyTest.php
-@@ -216,7 +216,7 @@ class MinsaleqtyTest extends \PHPUnit\Framework\TestCase
-     public function makeStorableArrayFieldValueDataProvider()
-     {
-         return [
--            'invalid bool' => [false, ''],
-+            'invalid bool' => [false, false],
-             'invalid empty string' => ['', ''],
-             'valid numeric' => ['22', '22'],
-             'valid empty array' => [[], '[]', 1],
-@@ -240,7 +240,8 @@ class MinsaleqtyTest extends \PHPUnit\Framework\TestCase
-                 '[1]',
-                 1,
-                 [0 => 1.0]
--            ]
-+            ],
-+            'json value' => ['{"32000":2,"0":1}', '{"32000":2,"0":1}'],
-         ];
-     }
- }
-diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/AddStockStatusToCollectionTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/AddStockStatusToCollectionTest.php
-index af35666ced3..906df547327 100644
---- a/app/code/Magento/CatalogInventory/Test/Unit/Model/AddStockStatusToCollectionTest.php
-+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/AddStockStatusToCollectionTest.php
-@@ -6,6 +6,7 @@
- namespace Magento\CatalogInventory\Test\Unit\Model;
- 
- use Magento\CatalogInventory\Model\AddStockStatusToCollection;
-+use Magento\Framework\Search\EngineResolverInterface;
- 
- class AddStockStatusToCollectionTest extends \PHPUnit\Framework\TestCase
- {
-@@ -19,13 +20,24 @@ class AddStockStatusToCollectionTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $stockHelper;
- 
-+    /**
-+     * @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $engineResolver;
-+
-     protected function setUp()
-     {
-         $this->stockHelper = $this->createMock(\Magento\CatalogInventory\Helper\Stock::class);
-+        $this->engineResolver = $this->getMockBuilder(EngineResolverInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getCurrentSearchEngine'])
-+            ->getMockForAbstractClass();
-+
-         $this->plugin = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))->getObject(
-             \Magento\CatalogInventory\Model\AddStockStatusToCollection::class,
-             [
-                 'stockHelper' => $this->stockHelper,
-+                'engineResolver' => $this->engineResolver
-             ]
-         );
-     }
-@@ -36,6 +48,10 @@ class AddStockStatusToCollectionTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        $this->engineResolver->expects($this->any())
-+            ->method('getCurrentSearchEngine')
-+            ->willReturn('mysql');
-+
-         $this->stockHelper->expects($this->once())
-             ->method('addIsInStockFilterToCollection')
-             ->with($productCollection)
-diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php
-index d2779b79b30..cefc4ada7d2 100644
---- a/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php
-+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php
-@@ -144,7 +144,7 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase
-         $store = 1;
- 
-         $this->scopeConfigMock->expects($this->once())
--            ->method('getValue')
-+            ->method('isSetFlag')
-             ->with(
-                 Configuration::XML_PATH_ENABLE_QTY_INCREMENTS,
-                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/CacheCleanerTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/CacheCleanerTest.php
-index 5e4249685f8..755e54a919b 100644
---- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/CacheCleanerTest.php
-+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/CacheCleanerTest.php
-@@ -12,6 +12,7 @@ use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\DB\Adapter\AdapterInterface;
- use Magento\Framework\DB\Select;
- use Magento\Framework\Event\ManagerInterface;
-+use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\Indexer\CacheContext;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Catalog\Model\Product;
-@@ -43,6 +44,11 @@ class CacheCleanerTest extends \PHPUnit\Framework\TestCase
-      */
-     private $cacheContextMock;
- 
-+    /**
-+     * @var MetadataPool |\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $metadataPoolMock;
-+
-     /**
-      * @var StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -61,6 +67,8 @@ class CacheCleanerTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(['getStockThresholdQty'])->getMockForAbstractClass();
-         $this->cacheContextMock = $this->getMockBuilder(CacheContext::class)->disableOriginalConstructor()->getMock();
-         $this->eventManagerMock = $this->getMockBuilder(ManagerInterface::class)->getMock();
-+        $this->metadataPoolMock = $this->getMockBuilder(MetadataPool::class)
-+            ->setMethods(['getMetadata', 'getLinkField'])->disableOriginalConstructor()->getMock();
-         $this->selectMock = $this->getMockBuilder(Select::class)->disableOriginalConstructor()->getMock();
- 
-         $this->resourceMock->expects($this->any())
-@@ -73,7 +81,8 @@ class CacheCleanerTest extends \PHPUnit\Framework\TestCase
-                 'resource' => $this->resourceMock,
-                 'stockConfiguration' => $this->stockConfigurationMock,
-                 'cacheContext' => $this->cacheContextMock,
--                'eventManager' => $this->eventManagerMock
-+                'eventManager' => $this->eventManagerMock,
-+                'metadataPool' => $this->metadataPoolMock
-             ]
-         );
-     }
-@@ -90,6 +99,7 @@ class CacheCleanerTest extends \PHPUnit\Framework\TestCase
-         $productId = 123;
-         $this->selectMock->expects($this->any())->method('from')->willReturnSelf();
-         $this->selectMock->expects($this->any())->method('where')->willReturnSelf();
-+        $this->selectMock->expects($this->any())->method('joinLeft')->willReturnSelf();
-         $this->connectionMock->expects($this->exactly(2))->method('select')->willReturn($this->selectMock);
-         $this->connectionMock->expects($this->exactly(2))->method('fetchAll')->willReturnOnConsecutiveCalls(
-             [
-@@ -105,7 +115,10 @@ class CacheCleanerTest extends \PHPUnit\Framework\TestCase
-             ->with(Product::CACHE_TAG, [$productId]);
-         $this->eventManagerMock->expects($this->once())->method('dispatch')
-             ->with('clean_cache_by_tags', ['object' => $this->cacheContextMock]);
--
-+        $this->metadataPoolMock->expects($this->exactly(2))->method('getMetadata')
-+            ->willReturnSelf();
-+        $this->metadataPoolMock->expects($this->exactly(2))->method('getLinkField')
-+            ->willReturn('row_id');
-         $callback = function () {
-         };
-         $this->unit->clean([], $callback);
-@@ -136,6 +149,7 @@ class CacheCleanerTest extends \PHPUnit\Framework\TestCase
-         $productId = 123;
-         $this->selectMock->expects($this->any())->method('from')->willReturnSelf();
-         $this->selectMock->expects($this->any())->method('where')->willReturnSelf();
-+        $this->selectMock->expects($this->any())->method('joinLeft')->willReturnSelf();
-         $this->connectionMock->expects($this->exactly(2))->method('select')->willReturn($this->selectMock);
-         $this->connectionMock->expects($this->exactly(2))->method('fetchAll')->willReturnOnConsecutiveCalls(
-             [
-@@ -149,6 +163,10 @@ class CacheCleanerTest extends \PHPUnit\Framework\TestCase
-             ->willReturn($stockThresholdQty);
-         $this->cacheContextMock->expects($this->never())->method('registerEntities');
-         $this->eventManagerMock->expects($this->never())->method('dispatch');
-+        $this->metadataPoolMock->expects($this->exactly(2))->method('getMetadata')
-+            ->willReturnSelf();
-+        $this->metadataPoolMock->expects($this->exactly(2))->method('getLinkField')
-+            ->willReturn('row_id');
- 
-         $callback = function () {
-         };
-diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/LayerTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/LayerTest.php
-index 287459bd8cb..b64563a3517 100644
---- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/LayerTest.php
-+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/LayerTest.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\CatalogInventory\Test\Unit\Model\Plugin;
- 
-+use Magento\Framework\Search\EngineResolverInterface;
-+
- class LayerTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -22,14 +24,24 @@ class LayerTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $_stockHelperMock;
- 
-+    /**
-+     * @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $engineResolver;
-+
-     protected function setUp()
-     {
-         $this->_scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-         $this->_stockHelperMock = $this->createMock(\Magento\CatalogInventory\Helper\Stock::class);
-+        $this->engineResolver = $this->getMockBuilder(EngineResolverInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getCurrentSearchEngine'])
-+            ->getMockForAbstractClass();
- 
-         $this->_model = new \Magento\CatalogInventory\Model\Plugin\Layer(
-             $this->_stockHelperMock,
--            $this->_scopeConfigMock
-+            $this->_scopeConfigMock,
-+            $this->engineResolver
-         );
-     }
- 
-@@ -38,6 +50,10 @@ class LayerTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testAddStockStatusDisabledShow()
-     {
-+        $this->engineResolver->expects($this->any())
-+            ->method('getCurrentSearchEngine')
-+            ->willReturn('mysql');
-+
-         $this->_scopeConfigMock->expects(
-             $this->once()
-         )->method(
-@@ -60,6 +76,10 @@ class LayerTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testAddStockStatusEnabledShow()
-     {
-+        $this->engineResolver->expects($this->any())
-+            ->method('getCurrentSearchEngine')
-+            ->willReturn('mysql');
-+
-         $this->_scopeConfigMock->expects(
-             $this->once()
-         )->method(
-diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/OptionTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/OptionTest.php
-index eb32c30ab4f..87233b4048b 100644
---- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/OptionTest.php
-+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/OptionTest.php
-@@ -151,7 +151,6 @@ class OptionTest extends \PHPUnit\Framework\TestCase
-         $this->optionMock->expects($this->any())->method('getProduct')->will($this->returnValue($this->productMock));
- 
-         $this->stockItemMock->expects($this->once())->method('setIsChildItem')->with(true);
--        $this->stockItemMock->expects($this->once())->method('setSuppressCheckQtyIncrements')->with(true);
-         $this->stockItemMock->expects($this->once())->method('getItemId')->will($this->returnValue(true));
- 
-         $this->stockRegistry
-@@ -222,7 +221,6 @@ class OptionTest extends \PHPUnit\Framework\TestCase
-         $this->optionMock->expects($this->any())->method('getProduct')->will($this->returnValue($this->productMock));
- 
-         $this->stockItemMock->expects($this->once())->method('setIsChildItem')->with(true);
--        $this->stockItemMock->expects($this->once())->method('setSuppressCheckQtyIncrements')->with(true);
-         $this->stockItemMock->expects($this->once())->method('getItemId')->will($this->returnValue(true));
- 
-         $this->stockRegistry
-diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QuantityValidatorTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QuantityValidatorTest.php
-index 7e2bad0b963..633505a5609 100644
---- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QuantityValidatorTest.php
-+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QuantityValidatorTest.php
-@@ -278,11 +278,13 @@ class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
-     {
-         $optionMock = $this->getMockBuilder(OptionItem::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['setHasError', 'getStockStateResult'])
-+            ->setMethods(['setHasError', 'getStockStateResult', 'getProduct'])
-             ->getMock();
-         $optionMock->expects($this->once())
-             ->method('getStockStateResult')
-             ->willReturn($this->resultMock);
-+        $optionMock->method('getProduct')
-+            ->willReturn($this->productMock);
-         $this->stockRegistryMock->expects($this->at(0))
-             ->method('getStockItem')
-             ->willReturn($this->stockItemMock);
-@@ -319,7 +321,7 @@ class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
-     {
-         $optionMock = $this->getMockBuilder(OptionItem::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['setHasError', 'getStockStateResult'])
-+            ->setMethods(['setHasError', 'getStockStateResult', 'getProduct'])
-             ->getMock();
-         $this->stockRegistryMock->expects($this->at(0))
-             ->method('getStockItem')
-@@ -330,6 +332,8 @@ class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
-         $optionMock->expects($this->once())
-             ->method('getStockStateResult')
-             ->willReturn($this->resultMock);
-+        $optionMock->method('getProduct')
-+            ->willReturn($this->productMock);
-         $options = [$optionMock];
-         $this->createInitialStub(1);
-         $this->setUpStubForQuantity(1, true);
-@@ -360,7 +364,7 @@ class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
-     {
-         $optionMock = $this->getMockBuilder(OptionItem::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['setHasError', 'getStockStateResult'])
-+            ->setMethods(['setHasError', 'getStockStateResult', 'getProduct'])
-             ->getMock();
-         $quoteItem = $this->getMockBuilder(Item::class)
-             ->disableOriginalConstructor()
-@@ -369,6 +373,8 @@ class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
-         $optionMock->expects($this->once())
-             ->method('getStockStateResult')
-             ->willReturn($this->resultMock);
-+        $optionMock->method('getProduct')
-+            ->willReturn($this->productMock);
-         $this->stockRegistryMock->expects($this->at(0))
-             ->method('getStockItem')
-             ->willReturn($this->stockItemMock);
-diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/StockItemTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/StockItemTest.php
-index 8c9a1aa7715..01dab7fce33 100644
---- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/StockItemTest.php
-+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/StockItemTest.php
-@@ -8,6 +8,7 @@ namespace Magento\CatalogInventory\Test\Unit\Model\Quote\Item\QuantityValidator\
- use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\QuoteItemQtyList;
- 
- /**
-+ * Class StockItemTest
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class StockItemTest extends \PHPUnit\Framework\TestCase
-@@ -28,10 +29,18 @@ class StockItemTest extends \PHPUnit\Framework\TestCase
-     protected $typeConfig;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\CatalogInventory\Api\StockStateInterface\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $stockStateMock;
- 
-+    /**
-+     * @var \Magento\CatalogInventory\Model\StockStateProviderInterface| \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $stockStateProviderMock;
-+
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->quoteItemQtyList = $this
-@@ -48,17 +57,25 @@ class StockItemTest extends \PHPUnit\Framework\TestCase
-         $this->stockStateMock = $this->getMockBuilder(\Magento\CatalogInventory\Api\StockStateInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+
-+        $this->stockStateProviderMock = $this
-+            ->getMockBuilder(\Magento\CatalogInventory\Model\StockStateProvider::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-         $this->model = $objectManagerHelper->getObject(
-             \Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer\StockItem::class,
-             [
-                 'quoteItemQtyList' => $this->quoteItemQtyList,
-                 'typeConfig' => $this->typeConfig,
--                'stockState' => $this->stockStateMock
-+                'stockState' => $this->stockStateMock,
-+                'stockStateProvider' => $this->stockStateProviderMock
-             ]
-         );
-     }
- 
-     /**
-+     * Test initialize with Subitem
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-     public function testInitializeWithSubitem()
-@@ -141,6 +158,10 @@ class StockItemTest extends \PHPUnit\Framework\TestCase
-             ->method('checkQuoteItemQty')
-             ->withAnyParameters()
-             ->will($this->returnValue($result));
-+        $this->stockStateProviderMock->expects($this->once())
-+            ->method('checkQuoteItemQty')
-+            ->withAnyParameters()
-+            ->will($this->returnValue($result));
-         $product->expects($this->once())
-             ->method('getCustomOption')
-             ->with('product_type')
-@@ -177,13 +198,16 @@ class StockItemTest extends \PHPUnit\Framework\TestCase
-         $quoteItem->expects($this->once())->method('setUseOldQty')->with('item')->will($this->returnSelf());
-         $result->expects($this->exactly(2))->method('getMessage')->will($this->returnValue('message'));
-         $quoteItem->expects($this->once())->method('setMessage')->with('message')->will($this->returnSelf());
--        $result->expects($this->exactly(2))->method('getItemBackorders')->will($this->returnValue('backorders'));
-+        $result->expects($this->exactly(3))->method('getItemBackorders')->will($this->returnValue('backorders'));
-         $quoteItem->expects($this->once())->method('setBackorders')->with('backorders')->will($this->returnSelf());
-         $quoteItem->expects($this->once())->method('setStockStateResult')->with($result)->will($this->returnSelf());
- 
-         $this->model->initialize($stockItem, $quoteItem, $qty);
-     }
- 
-+    /**
-+     * Test initialize without Subitem
-+     */
-     public function testInitializeWithoutSubitem()
-     {
-         $qty = 3;
-@@ -234,6 +258,10 @@ class StockItemTest extends \PHPUnit\Framework\TestCase
-             ->with($productId, 'quote_item_id', 'quote_id', $qty)
-             ->will($this->returnValue('summary_qty'));
-         $this->stockStateMock->expects($this->once())
-+                ->method('checkQuoteItemQty')
-+                ->withAnyParameters()
-+                ->will($this->returnValue($result));
-+        $this->stockStateProviderMock->expects($this->once())
-             ->method('checkQuoteItemQty')
-             ->withAnyParameters()
-             ->will($this->returnValue($result));
-@@ -256,7 +284,7 @@ class StockItemTest extends \PHPUnit\Framework\TestCase
-         $result->expects($this->once())->method('getHasQtyOptionUpdate')->will($this->returnValue(false));
-         $result->expects($this->once())->method('getItemUseOldQty')->will($this->returnValue(null));
-         $result->expects($this->once())->method('getMessage')->will($this->returnValue(null));
--        $result->expects($this->once())->method('getItemBackorders')->will($this->returnValue(null));
-+        $result->expects($this->exactly(2))->method('getItemBackorders')->will($this->returnValue(null));
- 
-         $this->model->initialize($stockItem, $quoteItem, $qty);
-     }
-diff --git a/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityAndStockStatusFieldToCollection.php b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityAndStockStatusFieldToCollection.php
-new file mode 100644
-index 00000000000..d66a783c672
---- /dev/null
-+++ b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityAndStockStatusFieldToCollection.php
-@@ -0,0 +1,32 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogInventory\Ui\DataProvider\Product;
-+
-+use Magento\Framework\Data\Collection;
-+use Magento\Ui\DataProvider\AddFieldToCollectionInterface;
-+
-+/**
-+ * Add quantity_and_stock_status field to collection
-+ */
-+class AddQuantityAndStockStatusFieldToCollection implements AddFieldToCollectionInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function addField(Collection $collection, $field, $alias = null)
-+    {
-+        $collection->joinField(
-+            'quantity_and_stock_status',
-+            'cataloginventory_stock_item',
-+            'is_in_stock',
-+            'product_id=entity_id',
-+            '{{table}}.stock_id=1',
-+            'left'
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
-index 8b55b6f3279..eb6239ea87e 100644
---- a/app/code/Magento/CatalogInventory/composer.json
-+++ b/app/code/Magento/CatalogInventory/composer.json
-@@ -8,6 +8,7 @@
-         "php": "~7.1.3||~7.2.0",
-         "magento/framework": "*",
-         "magento/module-catalog": "*",
-+        "magento/module-search": "*",
-         "magento/module-config": "*",
-         "magento/module-customer": "*",
-         "magento/module-eav": "*",
-@@ -27,5 +28,6 @@
-         "psr-4": {
-             "Magento\\CatalogInventory\\": ""
-         }
--    }
-+    },
-+    "abandoned": "magento/inventory-composer-metapackage"
- }
-diff --git a/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml b/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
-index 3397ef25918..28035de29bc 100644
---- a/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
-+++ b/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
-@@ -23,6 +23,7 @@
-         <arguments>
-             <argument name="addFieldStrategies" xsi:type="array">
-                 <item name="qty" xsi:type="object">Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityFieldToCollection</item>
-+                <item name="quantity_and_stock_status" xsi:type="object">Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityAndStockStatusFieldToCollection</item>
-             </argument>
-             <argument name="addFilterStrategies" xsi:type="array">
-                 <item name="qty" xsi:type="object">Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityFilterToCollection</item>
-diff --git a/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml b/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml
-index b9332575c96..08ed0a8f494 100644
---- a/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml
-+++ b/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml
-@@ -41,13 +41,13 @@
-                     <![CDATA[Please note that these settings apply to individual items in the cart, not to the entire cart.]]>
-                 </comment>
-                 <label>Product Stock Options</label>
--                <field id="manage_stock" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="manage_stock" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Manage Stock</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                     <backend_model>Magento\CatalogInventory\Model\Config\Backend\Managestock</backend_model>
-                     <comment>Changing can take some time due to processing whole catalog.</comment>
-                 </field>
--                <field id="backorders" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="backorders" translate="label comment" type="select" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Backorders</label>
-                     <source_model>Magento\CatalogInventory\Model\Source\Backorders</source_model>
-                     <backend_model>Magento\CatalogInventory\Model\Config\Backend\Backorders</backend_model>
-diff --git a/app/code/Magento/CatalogInventory/etc/db_schema.xml b/app/code/Magento/CatalogInventory/etc/db_schema.xml
-index 8a6ae8d2d93..5ac7fedc5aa 100644
---- a/app/code/Magento/CatalogInventory/etc/db_schema.xml
-+++ b/app/code/Magento/CatalogInventory/etc/db_schema.xml
-@@ -13,10 +13,10 @@
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website Id"/>
-         <column xsi:type="varchar" name="stock_name" nullable="true" length="255" comment="Stock Name"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="stock_id"/>
-         </constraint>
--        <index name="CATALOGINVENTORY_STOCK_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOGINVENTORY_STOCK_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-@@ -71,23 +71,23 @@
-                 identity="false" default="0" comment="Is Divided into Multiple Boxes for Shipping"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Website ID"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="item_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CATINV_STOCK_ITEM_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CATINV_STOCK_ITEM_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="cataloginventory_stock_item" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATINV_STOCK_ITEM_STOCK_ID_CATINV_STOCK_STOCK_ID"
-+        <constraint xsi:type="foreign" referenceId="CATINV_STOCK_ITEM_STOCK_ID_CATINV_STOCK_STOCK_ID"
-                     table="cataloginventory_stock_item" column="stock_id" referenceTable="cataloginventory_stock"
-                     referenceColumn="stock_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_STOCK_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_STOCK_ID">
-             <column name="product_id"/>
-             <column name="stock_id"/>
-         </constraint>
--        <index name="CATALOGINVENTORY_STOCK_ITEM_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOGINVENTORY_STOCK_ITEM_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="CATALOGINVENTORY_STOCK_ITEM_STOCK_ID" indexType="btree">
-+        <index referenceId="CATALOGINVENTORY_STOCK_ITEM_STOCK_ID" indexType="btree">
-             <column name="stock_id"/>
-         </index>
-     </table>
-@@ -103,18 +103,18 @@
-                 comment="Qty"/>
-         <column xsi:type="smallint" name="stock_status" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Stock Status"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="product_id"/>
-             <column name="website_id"/>
-             <column name="stock_id"/>
-         </constraint>
--        <index name="CATALOGINVENTORY_STOCK_STATUS_STOCK_ID" indexType="btree">
-+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_STOCK_ID" indexType="btree">
-             <column name="stock_id"/>
-         </index>
--        <index name="CATALOGINVENTORY_STOCK_STATUS_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="CATALOGINVENTORY_STOCK_STATUS_STOCK_STATUS" indexType="btree">
-+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_STOCK_STATUS" indexType="btree">
-             <column name="stock_status"/>
-         </index>
-     </table>
-@@ -130,15 +130,15 @@
-                 comment="Qty"/>
-         <column xsi:type="smallint" name="stock_status" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Stock Status"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="product_id"/>
-             <column name="website_id"/>
-             <column name="stock_id"/>
-         </constraint>
--        <index name="CATALOGINVENTORY_STOCK_STATUS_IDX_STOCK_ID" indexType="btree">
-+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_IDX_STOCK_ID" indexType="btree">
-             <column name="stock_id"/>
-         </index>
--        <index name="CATALOGINVENTORY_STOCK_STATUS_IDX_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_IDX_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-@@ -154,15 +154,15 @@
-                 comment="Qty"/>
-         <column xsi:type="smallint" name="stock_status" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Stock Status"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="product_id"/>
-             <column name="website_id"/>
-             <column name="stock_id"/>
-         </constraint>
--        <index name="CATALOGINVENTORY_STOCK_STATUS_TMP_STOCK_ID" indexType="hash">
-+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_TMP_STOCK_ID" indexType="hash">
-             <column name="stock_id"/>
-         </index>
--        <index name="CATALOGINVENTORY_STOCK_STATUS_TMP_WEBSITE_ID" indexType="hash">
-+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_TMP_WEBSITE_ID" indexType="hash">
-             <column name="website_id"/>
-         </index>
-     </table>
-@@ -178,18 +178,18 @@
-                 comment="Qty"/>
-         <column xsi:type="smallint" name="stock_status" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Stock Status"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="product_id"/>
-             <column name="website_id"/>
-             <column name="stock_id"/>
-         </constraint>
--        <index name="CATALOGINVENTORY_STOCK_STATUS_STOCK_ID" indexType="btree">
-+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_STOCK_ID" indexType="btree">
-             <column name="stock_id"/>
-         </index>
--        <index name="CATALOGINVENTORY_STOCK_STATUS_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="CATALOGINVENTORY_STOCK_STATUS_STOCK_STATUS" indexType="btree">
-+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_STOCK_STATUS" indexType="btree">
-             <column name="stock_status"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/CatalogInventory/etc/di.xml b/app/code/Magento/CatalogInventory/etc/di.xml
-index 912ab48d288..e7d79c593b8 100644
---- a/app/code/Magento/CatalogInventory/etc/di.xml
-+++ b/app/code/Magento/CatalogInventory/etc/di.xml
-@@ -35,7 +35,7 @@
-     <type name="Magento\Catalog\Model\Product\Attribute\Repository">
-         <plugin name="filterCustomAttribute" type="Magento\CatalogInventory\Model\Plugin\FilterCustomAttribute" />
-     </type>
--    <type name="Magento\CatalogInventory\Model\Plugin\FilterCustomAttribute">
-+    <type name="Magento\Catalog\Model\FilterProductCustomAttribute">
-         <arguments>
-             <argument name="blackList" xsi:type="array">
-                 <item name="quantity_and_stock_status" xsi:type="string">quantity_and_stock_status</item>
-@@ -44,7 +44,7 @@
-     </type>
-     <type name="Magento\CatalogInventory\Observer\UpdateItemsStockUponConfigChangeObserver">
-         <arguments>
--            <argument name="resourceStock" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Stock\Proxy</argument>
-+            <argument name="resourceStockItem" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Stock\Item\Proxy</argument>
-         </arguments>
-     </type>
-     <type name="Magento\Catalog\Model\Layer">
-@@ -111,7 +111,7 @@
-             <argument name="batchSizeManagement" xsi:type="object">Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement</argument>
-         </arguments>
-     </type>
--    <type name="\Magento\Framework\Data\CollectionModifier">
-+    <type name="Magento\Framework\Data\CollectionModifier">
-         <arguments>
-             <argument name="conditions" xsi:type="array">
-                 <item name="stockStatusCondition" xsi:type="object">Magento\CatalogInventory\Model\ProductCollectionStockCondition</item>
-@@ -135,4 +135,7 @@
-     <type name="Magento\CatalogInventory\Model\ResourceModel\Stock\Item">
-         <plugin name="priceIndexUpdater" type="Magento\CatalogInventory\Model\Plugin\PriceIndexUpdater" />
-     </type>
-+    <type name="Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save">
-+        <plugin name="massAction" type="Magento\CatalogInventory\Plugin\MassUpdateProductAttribute" />
-+    </type>
- </config>
-diff --git a/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml b/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml
-index f8571b6e332..0a7f0fdc32d 100644
---- a/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml
-+++ b/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml
-@@ -288,7 +288,7 @@
-                     <settings>
-                         <scopeLabel>[GLOBAL]</scopeLabel>
-                         <validation>
--                            <rule name="validate-number" xsi:type="boolean">true</rule>
-+                            <rule name="validate-greater-than-zero" xsi:type="boolean">true</rule>
-                         </validation>
-                         <label translate="true">Maximum Qty Allowed in Shopping Cart</label>
-                         <dataScope>max_sale_qty</dataScope>
-diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
-index 8e0dbf1278e..8b63d29be81 100644
---- a/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
-+++ b/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
-@@ -4,14 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\CatalogInventory\Block\Qtyincrements
-  */
- ?>
- <?php if ($block->getProductQtyIncrements()) : ?>
-     <div class="product pricing">
--        <?= /* @escapeNotVerified */ __('%1 is available to buy in increments of %2', $block->getProductName(), $block->getProductQtyIncrements()) ?>
-+        <?= $block->escapeHtml(__('%1 is available to buy in increments of %2', $block->getProductName(), $block->getProductQtyIncrements())) ?>
-     </div>
- <?php endif ?>
-diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml
-index 481ed1297a8..de667d19fad 100644
---- a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml
-+++ b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml
-@@ -4,30 +4,28 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\CatalogInventory\Block\Stockqty\Composite
-  */
- ?>
--<?php if ($block->isMsgVisible()): ?>
-+<?php if ($block->isMsgVisible()) : ?>
-     <div class="availability only">
-         <a href="#"
--           data-mage-init='{"toggleAdvanced": {"selectorsToggleClass": "active", "baseToggleClass": "expanded", "toggleContainers": "#<?= /* @escapeNotVerified */ $block->getDetailsPlaceholderId() ?>"}}'
--           id="<?= /* @escapeNotVerified */ $block->getPlaceholderId() ?>"
--           title="<?= /* @escapeNotVerified */ __('Only %1 left', ($block->getStockQtyLeft())) ?>"
-+           data-mage-init='{"toggleAdvanced": {"selectorsToggleClass": "active", "baseToggleClass": "expanded", "toggleContainers": "#<?= $block->escapeHtmlAttr($block->getDetailsPlaceholderId()) ?>"}}'
-+           id="<?= $block->escapeHtmlAttr($block->getPlaceholderId()) ?>"
-+           title="<?= $block->escapeHtmlAttr(__('Only %1 left', ($block->getStockQtyLeft()))) ?>"
-            class="action show">
--            <?= /* @escapeNotVerified */ __('Only %1 left', "<strong>{$block->getStockQtyLeft()}</strong>") ?>
-+            <?= /* @noEscape */ __('Only %1 left', "<strong>{$block->escapeHtml($block->getStockQtyLeft())}</strong>") ?>
-         </a>
-     </div>
--    <div class="availability only detailed" id="<?= /* @escapeNotVerified */ $block->getDetailsPlaceholderId() ?>">
-+    <div class="availability only detailed" id="<?= $block->escapeHtmlAttr($block->getDetailsPlaceholderId()) ?>">
-         <div class="table-wrapper">
-             <table class="data table">
--                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Product availability') ?></caption>
-+                <caption class="table-caption"><?= $block->escapeHtml(__('Product availability')) ?></caption>
-                 <thead>
-                 <tr>
--                    <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
--                    <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
-+                    <th class="col item" scope="col"><?= $block->escapeHtml(__('Product Name')) ?></th>
-+                    <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
-                 </tr>
-                 </thead>
-                 <tbody>
-@@ -35,8 +33,8 @@
-                     <?php $childProductStockQty = $block->getProductStockQty($childProduct); ?>
-                     <?php if ($childProductStockQty > 0) : ?>
-                         <tr>
--                            <td data-th="<?= $block->escapeHtml(__('Product Name')) ?>" class="col item"><?= /* @escapeNotVerified */ $childProduct->getName() ?></td>
--                            <td data-th="<?= $block->escapeHtml(__('Qty')) ?>" class="col qty"><?= /* @escapeNotVerified */ $childProductStockQty ?></td>
-+                            <td data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>" class="col item"><?= $block->escapeHtml($childProduct->getName()) ?></td>
-+                            <td data-th="<?= $block->escapeHtmlAttr(__('Qty')) ?>" class="col qty"><?= $block->escapeHtml($childProductStockQty) ?></td>
-                         </tr>
-                     <?php endif ?>
-                 <?php endforeach ?>
-diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml
-index 43fb697de26..c32cb9dd6ec 100644
---- a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml
-+++ b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml
-@@ -4,14 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\CatalogInventory\Block\Stockqty\DefaultStockqty
-  */
- ?>
--<?php if ($block->isMsgVisible()): ?>
--    <div class="availability only" title="<?= /* @escapeNotVerified */ __('Only %1 left', ($block->getStockQtyLeft())) ?>">
--        <?= /* @escapeNotVerified */ __('Only %1 left', "<strong>{$block->getStockQtyLeft()}</strong>") ?>
-+<?php if ($block->isMsgVisible()) : ?>
-+    <div class="availability only" title="<?= $block->escapeHtmlAttr(__('Only %1 left', ($block->getStockQtyLeft()))) ?>">
-+        <?= /* @noEscape */ __('Only %1 left', "<strong>{$block->escapeHtml($block->getStockQtyLeft())}</strong>") ?>
-     </div>
- <?php endif ?>
-diff --git a/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/OnlyXLeftInStockResolver.php b/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/OnlyXLeftInStockResolver.php
-new file mode 100644
-index 00000000000..9e10f0b4485
---- /dev/null
-+++ b/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/OnlyXLeftInStockResolver.php
-@@ -0,0 +1,100 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogInventoryGraphQl\Model\Resolver;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\CatalogInventory\Api\StockRegistryInterface;
-+use Magento\CatalogInventory\Model\Configuration;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Store\Model\ScopeInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class OnlyXLeftInStockResolver implements ResolverInterface
-+{
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @var StockRegistryInterface
-+     */
-+    private $stockRegistry;
-+
-+    /**
-+     * @param ScopeConfigInterface $scopeConfig
-+     * @param StockRegistryInterface $stockRegistry
-+     */
-+    public function __construct(
-+        ScopeConfigInterface $scopeConfig,
-+        StockRegistryInterface $stockRegistry
-+    ) {
-+        $this->scopeConfig = $scopeConfig;
-+        $this->stockRegistry = $stockRegistry;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!array_key_exists('model', $value) || !$value['model'] instanceof ProductInterface) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+
-+        /* @var $product ProductInterface */
-+        $product = $value['model'];
-+        $onlyXLeftQty = $this->getOnlyXLeftQty($product);
-+
-+        return $onlyXLeftQty;
-+    }
-+
-+    /**
-+     * Get product qty left when "Catalog > Inventory > Stock Options > Only X left Threshold" is greater than 0
-+     *
-+     * @param ProductInterface $product
-+     *
-+     * @return null|float
-+     */
-+    private function getOnlyXLeftQty(ProductInterface $product): ?float
-+    {
-+        $thresholdQty = (float)$this->scopeConfig->getValue(
-+            Configuration::XML_PATH_STOCK_THRESHOLD_QTY,
-+            ScopeInterface::SCOPE_STORE
-+        );
-+        if ($thresholdQty === 0) {
-+            return null;
-+        }
-+
-+        $stockItem = $this->stockRegistry->getStockItem($product->getId());
-+
-+        $stockCurrentQty = $this->stockRegistry->getStockStatus(
-+            $product->getId(),
-+            $product->getStore()->getWebsiteId()
-+        )->getQty();
-+
-+        $stockLeft = $stockCurrentQty - $stockItem->getMinQty();
-+
-+        $thresholdQty = (float)$this->scopeConfig->getValue(
-+            Configuration::XML_PATH_STOCK_THRESHOLD_QTY,
-+            ScopeInterface::SCOPE_STORE
-+        );
-+
-+        if ($stockCurrentQty > 0 && $stockLeft <= $thresholdQty) {
-+            return (float)$stockLeft;
-+        }
-+
-+        return null;
-+    }
-+}
-diff --git a/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/StockStatusProvider.php b/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/StockStatusProvider.php
-new file mode 100644
-index 00000000000..354e053efa9
---- /dev/null
-+++ b/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/StockStatusProvider.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogInventoryGraphQl\Model\Resolver;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
-+use Magento\CatalogInventory\Api\StockStatusRepositoryInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class StockStatusProvider implements ResolverInterface
-+{
-+    /**
-+     * @var StockStatusRepositoryInterface
-+     */
-+    private $stockStatusRepository;
-+
-+    /**
-+     * @param StockStatusRepositoryInterface $stockStatusRepository
-+     */
-+    public function __construct(StockStatusRepositoryInterface $stockStatusRepository)
-+    {
-+        $this->stockStatusRepository = $stockStatusRepository;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!array_key_exists('model', $value) || !$value['model'] instanceof ProductInterface) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+
-+        /* @var $product ProductInterface */
-+        $product = $value['model'];
-+
-+        $stockStatus = $this->stockStatusRepository->get($product->getId());
-+        $productStockStatus = (int)$stockStatus->getStockStatus();
-+
-+        return $productStockStatus === StockStatusInterface::STATUS_IN_STOCK ? 'IN_STOCK' : 'OUT_OF_STOCK';
-+    }
-+}
-diff --git a/app/code/Magento/CatalogInventoryGraphQl/README.md b/app/code/Magento/CatalogInventoryGraphQl/README.md
-new file mode 100644
-index 00000000000..ef4302e8da3
---- /dev/null
-+++ b/app/code/Magento/CatalogInventoryGraphQl/README.md
-@@ -0,0 +1,4 @@
-+# CatalogInventoryGraphQl
-+
-+**CatalogInventoryGraphQl** provides type information for the GraphQl module
-+to generate inventory stock fields for product information endpoints.
-diff --git a/app/code/Magento/CatalogInventoryGraphQl/composer.json b/app/code/Magento/CatalogInventoryGraphQl/composer.json
-new file mode 100644
-index 00000000000..5e85c3ae12f
---- /dev/null
-+++ b/app/code/Magento/CatalogInventoryGraphQl/composer.json
-@@ -0,0 +1,24 @@
-+{
-+  "name": "magento/module-catalog-inventory-graph-ql",
-+  "description": "N/A",
-+  "type": "magento2-module",
-+  "require": {
-+    "php": "~7.1.3||~7.2.0",
-+    "magento/framework": "*",
-+    "magento/module-store": "*",
-+    "magento/module-catalog": "*",
-+    "magento/module-catalog-inventory": "*"
-+  },
-+  "license": [
-+    "OSL-3.0",
-+    "AFL-3.0"
-+  ],
-+  "autoload": {
-+    "files": [
-+      "registration.php"
-+    ],
-+    "psr-4": {
-+      "Magento\\CatalogInventoryGraphQl\\": ""
-+    }
-+  }
-+}
-diff --git a/app/code/Magento/CatalogInventoryGraphQl/etc/module.xml b/app/code/Magento/CatalogInventoryGraphQl/etc/module.xml
-new file mode 100644
-index 00000000000..776e4e16533
---- /dev/null
-+++ b/app/code/Magento/CatalogInventoryGraphQl/etc/module.xml
-@@ -0,0 +1,16 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_CatalogInventoryGraphQl">
-+        <sequence>
-+            <module name="Magento_Store"/>
-+            <module name="Magento_Catalog"/>
-+            <module name="Magento_CatalogInventory"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/app/code/Magento/CatalogInventoryGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogInventoryGraphQl/etc/schema.graphqls
-new file mode 100644
-index 00000000000..6a6c7e75dbd
---- /dev/null
-+++ b/app/code/Magento/CatalogInventoryGraphQl/etc/schema.graphqls
-@@ -0,0 +1,12 @@
-+# Copyright © Magento, Inc. All rights reserved.
-+# See COPYING.txt for license details.
-+
-+interface ProductInterface {
-+    only_x_left_in_stock: Float @doc(description: "Product stock only x left count") @resolver(class: "Magento\\CatalogInventoryGraphQl\\Model\\Resolver\\OnlyXLeftInStockResolver")
-+    stock_status: ProductStockStatus @doc(description: "Stock status of the product") @resolver(class: "Magento\\CatalogInventoryGraphQl\\Model\\Resolver\\StockStatusProvider")
-+}
-+
-+enum ProductStockStatus @doc(description: "This enumeration states whether a product stock status is in stock or out of stock") {
-+    IN_STOCK
-+    OUT_OF_STOCK
-+}
-diff --git a/app/code/Magento/CatalogInventoryGraphQl/registration.php b/app/code/Magento/CatalogInventoryGraphQl/registration.php
-new file mode 100644
-index 00000000000..6ef9d3b1f90
---- /dev/null
-+++ b/app/code/Magento/CatalogInventoryGraphQl/registration.php
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogInventoryGraphQl', __DIR__);
-diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php
-index 6390822b58f..184cb641929 100644
---- a/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php
-+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php
-@@ -25,7 +25,7 @@ class DeleteButton extends GenericButton implements ButtonProviderInterface
-                 'class' => 'delete',
-                 'on_click' => 'deleteConfirm(\'' . __(
-                     'Are you sure you want to do this?'
--                ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\')',
-+                ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\', {data: {}})',
-                 'sort_order' => 20,
-             ];
-         }
-diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
-index 3500506d8d6..998d45b839c 100644
---- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
-+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Exception\LocalizedException;
- 
--class Delete extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
-+class Delete extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpPostActionInterface
- {
-     /**
-      * @return void
-diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php
-index 945c28b2088..2c2abcef8b2 100644
---- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php
-+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;
- 
--class Edit extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Edit extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpGetActionInterface
- {
-     /**
-      * @return void
-diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php
-index 8c6a3881951..a9dcd1f6383 100644
---- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php
-+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;
- 
--class Index extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpGetActionInterface
- {
-     /**
-      * @return void
-diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php
-index c677c75c595..d86c56402d2 100644
---- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php
-+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;
- 
--class NewAction extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class NewAction extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpGetActionInterface
- {
-     /**
-      * @return void
-diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php
-index b790d90d380..a845c104f94 100644
---- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php
-+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php
-@@ -6,9 +6,12 @@
-  */
- namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Rule\Model\Condition\AbstractCondition;
-+use Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog as CatalogAction;
- 
--class NewConditionHtml extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
-+class NewConditionHtml extends CatalogAction implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * @return void
-diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
-index f3046c58a38..0ff12faf54c 100644
---- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
-+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
-@@ -6,6 +6,7 @@
-  */
- namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Registry;
-@@ -13,9 +14,11 @@ use Magento\Framework\Stdlib\DateTime\Filter\Date;
- use Magento\Framework\App\Request\DataPersistorInterface;
- 
- /**
-+ * Save action for catalog rule
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
-+class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpPostActionInterface
- {
-     /**
-      * @var DataPersistorInterface
-@@ -39,7 +42,9 @@ class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
-     }
- 
-     /**
--     * @return void
-+     * Execute save action from catalog rule
-+     *
-+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|void
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-     public function execute()
-@@ -60,6 +65,17 @@ class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
-                     ['request' => $this->getRequest()]
-                 );
-                 $data = $this->getRequest()->getPostValue();
-+
-+                $filterValues = ['from_date' => $this->_dateFilter];
-+                if ($this->getRequest()->getParam('to_date')) {
-+                    $filterValues['to_date'] = $this->_dateFilter;
-+                }
-+                $inputFilter = new \Zend_Filter_Input(
-+                    $filterValues,
-+                    [],
-+                    $data
-+                );
-+                $data = $inputFilter->getUnescaped();
-                 $id = $this->getRequest()->getParam('rule_id');
-                 if ($id) {
-                     $model = $ruleRepository->get($id);
-diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
-index d049d74bd26..18a58c0f854 100644
---- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
-+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
-@@ -1,6 +1,5 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-@@ -9,8 +8,12 @@ namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Widget;
- use Magento\Backend\App\Action\Context;
- use Magento\Catalog\Model\Category;
- use Magento\Framework\Registry;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- 
--class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget
-+/**
-+ * Categories json widget for catalog rule
-+ */
-+class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget implements HttpPostActionInterface
- {
-     /**
-      * Core registry
-@@ -77,10 +80,11 @@ class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Wid
-             if (!($category = $this->_initCategory())) {
-                 return;
-             }
-+            $selected = $this->getRequest()->getPost('selected', '');
-             $block = $this->_view->getLayout()->createBlock(
-                 \Magento\Catalog\Block\Adminhtml\Category\Checkboxes\Tree::class
-             )->setCategoryIds(
--                [$categoryId]
-+                explode(',', $selected)
-             );
-             $this->getResponse()->representJson(
-                 $block->getTreeJson($category)
-diff --git a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
-index 5d93e6f2168..6b7c12dfdf4 100644
---- a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
-+++ b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
-@@ -10,6 +10,9 @@ use Magento\Framework\Indexer\ActionInterface as IndexerActionInterface;
- use Magento\Framework\DataObject\IdentityInterface;
- use Magento\Framework\Indexer\CacheContext;
- 
-+/**
-+ * Abstract class for CatalogRule indexers.
-+ */
- abstract class AbstractIndexer implements IndexerActionInterface, MviewActionInterface, IdentityInterface
- {
-     /**
-@@ -66,7 +69,6 @@ abstract class AbstractIndexer implements IndexerActionInterface, MviewActionInt
-     {
-         $this->indexBuilder->reindexFull();
-         $this->_eventManager->dispatch('clean_cache_by_tags', ['object' => $this]);
--        //TODO: remove after fix fpc. MAGETWO-50668
-         $this->getCacheManager()->clean($this->getIdentities());
-     }
- 
-@@ -137,8 +139,9 @@ abstract class AbstractIndexer implements IndexerActionInterface, MviewActionInt
-     abstract protected function doExecuteRow($id);
- 
-     /**
--     * @return \Magento\Framework\App\CacheInterface|mixed
-+     * Get cache manager
-      *
-+     * @return \Magento\Framework\App\CacheInterface|mixed
-      * @deprecated 100.0.7
-      */
-     private function getCacheManager()
-diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
-index 1f62200fc6b..e12eabba764 100644
---- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
-+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
-@@ -7,6 +7,7 @@
- namespace Magento\CatalogRule\Model\Indexer;
- 
- use Magento\Catalog\Model\Product;
-+use Magento\CatalogRule\Model\ResourceModel\Rule\Collection as RuleCollection;
- use Magento\CatalogRule\Model\ResourceModel\Rule\CollectionFactory as RuleCollectionFactory;
- use Magento\CatalogRule\Model\Rule;
- use Magento\Framework\App\ObjectManager;
-@@ -15,6 +16,8 @@ use Magento\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
- use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
- 
- /**
-+ * Catalog rule index builder
-+ *
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-@@ -270,14 +273,14 @@ class IndexBuilder
-      */
-     protected function doReindexByIds($ids)
-     {
--        $this->cleanByIds($ids);
-+        $this->cleanProductIndex($ids);
- 
-         $products = $this->productLoader->getProducts($ids);
--        foreach ($this->getActiveRules() as $rule) {
--            foreach ($products as $product) {
--                $this->applyRule($rule, $product);
--            }
-+        $activeRules = $this->getActiveRules();
-+        foreach ($products as $product) {
-+            $this->applyRules($activeRules, $product);
-         }
-+        $this->reindexRuleGroupWebsite->execute();
-     }
- 
-     /**
-@@ -322,6 +325,30 @@ class IndexBuilder
-         );
-     }
- 
-+    /**
-+     * Clean product index
-+     *
-+     * @param array $productIds
-+     * @return void
-+     */
-+    private function cleanProductIndex(array $productIds): void
-+    {
-+        $where = ['product_id IN (?)' => $productIds];
-+        $this->connection->delete($this->getTable('catalogrule_product'), $where);
-+    }
-+
-+    /**
-+     * Clean product price index
-+     *
-+     * @param array $productIds
-+     * @return void
-+     */
-+    private function cleanProductPriceIndex(array $productIds): void
-+    {
-+        $where = ['product_id IN (?)' => $productIds];
-+        $this->connection->delete($this->getTable('catalogrule_product_price'), $where);
-+    }
-+
-     /**
-      * Clean by product ids
-      *
-@@ -330,51 +357,35 @@ class IndexBuilder
-      */
-     protected function cleanByIds($productIds)
-     {
--        $query = $this->connection->deleteFromSelect(
--            $this->connection
--                ->select()
--                ->from($this->resource->getTableName('catalogrule_product'), 'product_id')
--                ->distinct()
--                ->where('product_id IN (?)', $productIds),
--            $this->resource->getTableName('catalogrule_product')
--        );
--        $this->connection->query($query);
--
--        $query = $this->connection->deleteFromSelect(
--            $this->connection->select()
--                ->from($this->resource->getTableName('catalogrule_product_price'), 'product_id')
--                ->distinct()
--                ->where('product_id IN (?)', $productIds),
--            $this->resource->getTableName('catalogrule_product_price')
--        );
--        $this->connection->query($query);
-+        $this->cleanProductIndex($productIds);
-+        $this->cleanProductPriceIndex($productIds);
-     }
- 
-     /**
-+     * Assign product to rule
-+     *
-      * @param Rule $rule
-      * @param Product $product
--     * @return $this
--     * @throws \Exception
--     * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * @return void
-      */
--    protected function applyRule(Rule $rule, $product)
-+    private function assignProductToRule(Rule $rule, Product $product): void
-     {
--        $ruleId = $rule->getId();
--        $productEntityId = $product->getId();
--        $websiteIds = array_intersect($product->getWebsiteIds(), $rule->getWebsiteIds());
--
-         if (!$rule->validate($product)) {
--            return $this;
-+            return;
-         }
- 
-+        $ruleId = (int) $rule->getId();
-+        $productEntityId = (int) $product->getId();
-+        $ruleProductTable = $this->getTable('catalogrule_product');
-         $this->connection->delete(
--            $this->resource->getTableName('catalogrule_product'),
-+            $ruleProductTable,
-             [
--                $this->connection->quoteInto('rule_id = ?', $ruleId),
--                $this->connection->quoteInto('product_id = ?', $productEntityId)
-+                'rule_id = ?' => $ruleId,
-+                'product_id = ?' => $productEntityId,
-             ]
-         );
- 
-+        $websiteIds = array_intersect($product->getWebsiteIds(), $rule->getWebsiteIds());
-         $customerGroupIds = $rule->getCustomerGroupIds();
-         $fromTime = strtotime($rule->getFromDate());
-         $toTime = strtotime($rule->getToDate());
-@@ -385,36 +396,44 @@ class IndexBuilder
-         $actionStop = $rule->getStopRulesProcessing();
- 
-         $rows = [];
--        try {
--            foreach ($websiteIds as $websiteId) {
--                foreach ($customerGroupIds as $customerGroupId) {
--                    $rows[] = [
--                        'rule_id' => $ruleId,
--                        'from_time' => $fromTime,
--                        'to_time' => $toTime,
--                        'website_id' => $websiteId,
--                        'customer_group_id' => $customerGroupId,
--                        'product_id' => $productEntityId,
--                        'action_operator' => $actionOperator,
--                        'action_amount' => $actionAmount,
--                        'action_stop' => $actionStop,
--                        'sort_order' => $sortOrder,
--                    ];
--
--                    if (count($rows) == $this->batchCount) {
--                        $this->connection->insertMultiple($this->getTable('catalogrule_product'), $rows);
--                        $rows = [];
--                    }
-+        foreach ($websiteIds as $websiteId) {
-+            foreach ($customerGroupIds as $customerGroupId) {
-+                $rows[] = [
-+                    'rule_id' => $ruleId,
-+                    'from_time' => $fromTime,
-+                    'to_time' => $toTime,
-+                    'website_id' => $websiteId,
-+                    'customer_group_id' => $customerGroupId,
-+                    'product_id' => $productEntityId,
-+                    'action_operator' => $actionOperator,
-+                    'action_amount' => $actionAmount,
-+                    'action_stop' => $actionStop,
-+                    'sort_order' => $sortOrder,
-+                ];
-+
-+                if (count($rows) == $this->batchCount) {
-+                    $this->connection->insertMultiple($ruleProductTable, $rows);
-+                    $rows = [];
-                 }
-             }
--
--            if (!empty($rows)) {
--                $this->connection->insertMultiple($this->resource->getTableName('catalogrule_product'), $rows);
--            }
--        } catch (\Exception $e) {
--            throw $e;
-         }
-+        if ($rows) {
-+            $this->connection->insertMultiple($ruleProductTable, $rows);
-+        }
-+    }
- 
-+    /**
-+     * Apply rule
-+     *
-+     * @param Rule $rule
-+     * @param Product $product
-+     * @return $this
-+     * @throws \Exception
-+     * @SuppressWarnings(PHPMD.NPathComplexity)
-+     */
-+    protected function applyRule(Rule $rule, $product)
-+    {
-+        $this->assignProductToRule($rule, $product);
-         $this->reindexRuleProductPrice->execute($this->batchCount, $product);
-         $this->reindexRuleGroupWebsite->execute();
- 
-@@ -422,6 +441,25 @@ class IndexBuilder
-     }
- 
-     /**
-+     * Apply rules
-+     *
-+     * @param RuleCollection $ruleCollection
-+     * @param Product $product
-+     * @return void
-+     */
-+    private function applyRules(RuleCollection $ruleCollection, Product $product): void
-+    {
-+        foreach ($ruleCollection as $rule) {
-+            $this->assignProductToRule($rule, $product);
-+        }
-+
-+        $this->cleanProductPriceIndex([$product->getId()]);
-+        $this->reindexRuleProductPrice->execute($this->batchCount, $product);
-+    }
-+
-+    /**
-+     * Retrieve table name
-+     *
-      * @param string $tableName
-      * @return string
-      */
-@@ -431,6 +469,8 @@ class IndexBuilder
-     }
- 
-     /**
-+     * Update rule product data
-+     *
-      * @param Rule $rule
-      * @return $this
-      * @deprecated 100.2.0
-@@ -456,6 +496,8 @@ class IndexBuilder
-     }
- 
-     /**
-+     * Apply all rules
-+     *
-      * @param Product|null $product
-      * @throws \Exception
-      * @return $this
-@@ -495,8 +537,10 @@ class IndexBuilder
-     }
- 
-     /**
-+     * Calculate rule product price
-+     *
-      * @param array $ruleData
--     * @param null $productData
-+     * @param array $productData
-      * @return float
-      * @deprecated 100.2.0
-      * @see ProductPriceCalculator::calculate
-@@ -507,6 +551,8 @@ class IndexBuilder
-     }
- 
-     /**
-+     * Get rule products statement
-+     *
-      * @param int $websiteId
-      * @param Product|null $product
-      * @return \Zend_Db_Statement_Interface
-@@ -520,6 +566,8 @@ class IndexBuilder
-     }
- 
-     /**
-+     * Save rule product prices
-+     *
-      * @param array $arrData
-      * @return $this
-      * @throws \Exception
-@@ -535,7 +583,7 @@ class IndexBuilder
-     /**
-      * Get active rules
-      *
--     * @return array
-+     * @return RuleCollection
-      */
-     protected function getActiveRules()
-     {
-@@ -545,7 +593,7 @@ class IndexBuilder
-     /**
-      * Get active rules
-      *
--     * @return array
-+     * @return RuleCollection
-      */
-     protected function getAllRules()
-     {
-@@ -553,6 +601,8 @@ class IndexBuilder
-     }
- 
-     /**
-+     * Get product
-+     *
-      * @param int $productId
-      * @return Product
-      */
-@@ -565,6 +615,8 @@ class IndexBuilder
-     }
- 
-     /**
-+     * Log critical exception
-+     *
-      * @param \Exception $e
-      * @return void
-      */
-diff --git a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php
-index 0b1264a2162..25bcfb8f20e 100644
---- a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php
-+++ b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php
-@@ -76,25 +76,19 @@ class RuleProductPricesPersistor
-             );
-         }
- 
--        $productIds = [];
--
--        try {
--            foreach ($priceData as $key => $data) {
--                $productIds['product_id'] = $data['product_id'];
--                $priceData[$key]['rule_date'] = $this->dateFormat->formatDate($data['rule_date'], false);
--                $priceData[$key]['latest_start_date'] = $this->dateFormat->formatDate(
--                    $data['latest_start_date'],
--                    false
--                );
--                $priceData[$key]['earliest_end_date'] = $this->dateFormat->formatDate(
--                    $data['earliest_end_date'],
--                    false
--                );
--            }
--            $connection->insertOnDuplicate($indexTable, $priceData);
--        } catch (\Exception $e) {
--            throw $e;
-+        foreach ($priceData as $key => $data) {
-+            $priceData[$key]['rule_date'] = $this->dateFormat->formatDate($data['rule_date'], false);
-+            $priceData[$key]['latest_start_date'] = $this->dateFormat->formatDate(
-+                $data['latest_start_date'],
-+                false
-+            );
-+            $priceData[$key]['earliest_end_date'] = $this->dateFormat->formatDate(
-+                $data['earliest_end_date'],
-+                false
-+            );
-         }
-+        $connection->insertOnDuplicate($indexTable, $priceData);
-+
-         return true;
-     }
- }
-diff --git a/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php b/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php
-index 6d343fe149d..fabe504fbe3 100644
---- a/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php
-+++ b/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php
-@@ -71,6 +71,8 @@ class ConditionsToSearchCriteriaMapper
-     }
- 
-     /**
-+     * Convert condition to filter group
-+     *
-      * @param ConditionInterface $condition
-      * @return null|\Magento\Framework\Api\CombinedFilterGroup|\Magento\Framework\Api\Filter
-      * @throws InputException
-@@ -89,6 +91,8 @@ class ConditionsToSearchCriteriaMapper
-     }
- 
-     /**
-+     * Convert combined condition to filter group
-+     *
-      * @param Combine $combinedCondition
-      * @return null|\Magento\Framework\Api\CombinedFilterGroup
-      * @throws InputException
-@@ -121,6 +125,8 @@ class ConditionsToSearchCriteriaMapper
-     }
- 
-     /**
-+     * Convert simple condition to filter group
-+     *
-      * @param ConditionInterface $productCondition
-      * @return FilterGroup|Filter
-      * @throws InputException
-@@ -139,6 +145,8 @@ class ConditionsToSearchCriteriaMapper
-     }
- 
-     /**
-+     * Convert simple condition with array value to filter group
-+     *
-      * @param ConditionInterface $productCondition
-      * @return FilterGroup
-      * @throws InputException
-@@ -161,6 +169,8 @@ class ConditionsToSearchCriteriaMapper
-     }
- 
-     /**
-+     * Get glue for multiple values by operator
-+     *
-      * @param string $operator
-      * @return string
-      */
-@@ -211,6 +221,8 @@ class ConditionsToSearchCriteriaMapper
-     }
- 
-     /**
-+     * Convert filters array into combined filter group
-+     *
-      * @param array $filters
-      * @param string $combinationMode
-      * @return FilterGroup
-@@ -227,6 +239,8 @@ class ConditionsToSearchCriteriaMapper
-     }
- 
-     /**
-+     * Creating of filter object by filtering params
-+     *
-      * @param string $field
-      * @param string $value
-      * @param string $conditionType
-@@ -264,6 +278,7 @@ class ConditionsToSearchCriteriaMapper
-             '!{}' => 'nlike', // does not contains
-             '()' => 'in',    // is one of
-             '!()' => 'nin',   // is not one of
-+            '<=>' => 'is_null'
-         ];
- 
-         if (!array_key_exists($ruleOperator, $operatorsMap)) {
-diff --git a/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
-index ab650c94a0f..0db178b2a0a 100644
---- a/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
-+++ b/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
-@@ -4,12 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Catalog Rule Product Condition data model
-- */
- namespace Magento\CatalogRule\Model\Rule\Condition;
- 
- /**
-+ * Catalog Rule Product Condition data model
-+ *
-  * @method string getAttribute() Returns attribute code
-  */
- class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
-@@ -29,6 +28,9 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
- 
-         $oldAttrValue = $model->getData($attrCode);
-         if ($oldAttrValue === null) {
-+            if ($this->getOperator() === '<=>') {
-+                return true;
-+            }
-             return false;
-         }
- 
-diff --git a/app/code/Magento/CatalogRule/Observer/AddDirtyRulesNotice.php b/app/code/Magento/CatalogRule/Observer/AddDirtyRulesNotice.php
-index 08c3d97b216..749ac3cf512 100644
---- a/app/code/Magento/CatalogRule/Observer/AddDirtyRulesNotice.php
-+++ b/app/code/Magento/CatalogRule/Observer/AddDirtyRulesNotice.php
-@@ -37,7 +37,7 @@ class AddDirtyRulesNotice implements ObserverInterface
-         $dirtyRules = $observer->getData('dirty_rules');
-         if (!empty($dirtyRules)) {
-             if ($dirtyRules->getState()) {
--                $this->messageManager->addNotice($observer->getData('message'));
-+                $this->messageManager->addNoticeMessage($observer->getData('message'));
-             }
-         }
-     }
-diff --git a/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php b/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php
-index 8a3a8217076..321780eca56 100644
---- a/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php
-+++ b/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php
-@@ -22,7 +22,7 @@ class RulePricesStorage
-      */
-     public function getRulePrice($id)
-     {
--        return isset($this->rulePrices[$id]) ? $this->rulePrices[$id] : false;
-+        return $this->rulePrices[$id] ?? false;
-     }
- 
-     /**
-diff --git a/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php b/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
-index a45a548264a..c71b51317fd 100644
---- a/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
-+++ b/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
-@@ -89,7 +89,7 @@ class CatalogRulePrice extends AbstractPrice implements BasePriceProviderInterfa
-     {
-         if (null === $this->value) {
-             if ($this->product->hasData(self::PRICE_CODE)) {
--                $this->value = floatval($this->product->getData(self::PRICE_CODE)) ?: false;
-+                $this->value = (float)$this->product->getData(self::PRICE_CODE) ?: false;
-             } else {
-                 $this->value = $this->getRuleResource()
-                     ->getRulePrice(
-@@ -98,7 +98,7 @@ class CatalogRulePrice extends AbstractPrice implements BasePriceProviderInterfa
-                         $this->customerSession->getCustomerGroupId(),
-                         $this->product->getId()
-                     );
--                $this->value = $this->value ? floatval($this->value) : false;
-+                $this->value = $this->value ? (float)$this->value : false;
-             }
-             if ($this->value) {
-                 $this->value = $this->priceCurrency->convertAndRound($this->value);
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminAssertCustomerGroupOnCatalogPriceRuleFormActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminAssertCustomerGroupOnCatalogPriceRuleFormActionGroup.xml
-new file mode 100644
-index 00000000000..ef498b95a5d
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminAssertCustomerGroupOnCatalogPriceRuleFormActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAssertCustomerGroupOnCatalogPriceRuleForm">
-+        <arguments>
-+            <argument name="customerGroupName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminNewCatalogRulePage.url}}" stepKey="amOnCatalogPriceRuleCreatePage"/>
-+        <waitForElementVisible selector="{{AdminNewCatalogPriceRule.customerGroups}}" stepKey="waitForElementVisible"/>
-+        <see selector="{{AdminNewCatalogPriceRule.customerGroups}}" userInput="{{customerGroupName}}" stepKey="assertCustomerGroupPresentOnCatalogPriceRuleForm"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateNewCatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateNewCatalogPriceRuleActionGroup.xml
-new file mode 100644
-index 00000000000..4599e325e39
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateNewCatalogPriceRuleActionGroup.xml
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateNewCatalogPriceRuleActionGroup">
-+        <arguments>
-+            <argument name="catalogRule" defaultValue="_defaultCatalogRule"/>
-+            <argument name="customerGroup" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminNewCatalogPriceRulePage.url}}" stepKey="openNewCatalogPriceRulePage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <fillField stepKey="fillName" selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}"/>
-+        <fillField stepKey="fillDescription" selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRule.status}}" userInput="{{catalogRule.is_active}}" stepKey="selectStatus"/>
-+        <selectOption stepKey="selectWebSite" selector="{{AdminNewCatalogPriceRule.websites}}" userInput="{{catalogRule.website_ids[0]}}"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRule.customerGroups}}" userInput="{{customerGroup}}" stepKey="selectCustomerGroup"/>
-+        <scrollTo selector="{{AdminNewCatalogPriceRule.actionsTab}}" stepKey="scrollToActionTab"/>
-+        <click stepKey="openActionDropdown" selector="{{AdminNewCatalogPriceRule.actionsTab}}"/>
-+        <selectOption stepKey="discountType" selector="{{AdminNewCatalogPriceRuleActions.apply}}" userInput="{{catalogRule.simple_action}}"/>
-+        <fillField stepKey="fillDiscountValue" selector="{{AdminNewCatalogPriceRuleActions.discountAmount}}" userInput="{{catalogRule.discount_amount}}"/>
-+        <selectOption stepKey="discardSubsequentRules" selector="{{AdminNewCatalogPriceRuleActions.disregardRules}}" userInput="Yes"/>
-+        <waitForPageLoad stepKey="waitForApplied"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminDeleteCatalogRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminDeleteCatalogRuleActionGroup.xml
-new file mode 100644
-index 00000000000..ea2d6821917
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminDeleteCatalogRuleActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminDeleteCatalogRuleActionGroup">
-+        <click selector="{{AdminNewCatalogPriceRule.delete}}" stepKey="clickOnDeleteButton"/>
-+        <waitForElementVisible selector="{{AdminNewCatalogPriceRule.okButton}}" stepKey="waitForOkButtonToBeVisible"/>
-+        <click selector="{{AdminNewCatalogPriceRule.okButton}}" stepKey="clickOnOkButton"/>
-+        <waitForPageLoad stepKey="waitForPagetoLoad"/>
-+        <see selector="{{AdminNewCatalogPriceRule.successMessage}}" userInput="You deleted the rule." stepKey="seeSuccessDeleteMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminOpenNewCatalogPriceRuleFormPageActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminOpenNewCatalogPriceRuleFormPageActionGroup.xml
-new file mode 100644
-index 00000000000..8651a17cb96
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminOpenNewCatalogPriceRuleFormPageActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenNewCatalogPriceRuleFormPageActionGroup">
-+        <amOnPage url="{{AdminNewCatalogRulePage.url}}" stepKey="openNewCatalogPriceRulePage" />
-+        <waitForPageLoad stepKey="waitForPageLoad" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminSaveAndApplyRulesActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminSaveAndApplyRulesActionGroup.xml
-new file mode 100644
-index 00000000000..2584b8b36b7
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminSaveAndApplyRulesActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSaveAndApplyRulesActionGroup">
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <click selector="{{AdminNewCatalogPriceRule.save}}" stepKey="saveTheCatalogRule"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <seeElement selector="{{AdminCatalogPriceRuleGrid.updateMessage}}" stepKey="seeMessageToUpdateTheCatalogRules"/>
-+        <see selector="{{AdminNewCatalogPriceRule.successMessage}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
-+        <click stepKey="applyRules" selector="{{AdminCatalogPriceRuleGrid.applyRules}}"/>
-+        <see stepKey="assertSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="Updated rules applied."/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminSearchCatalogRuleInGridActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminSearchCatalogRuleInGridActionGroup.xml
-new file mode 100644
-index 00000000000..c7d5d853642
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminSearchCatalogRuleInGridActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSearchCatalogRuleInGridActionGroup">
-+        <arguments>
-+            <argument name="catalogRuleName" type="string"/>
-+        </arguments>
-+        <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
-+        <waitForPageLoad stepKey="waitForPriceRulePage"/>
-+        <click selector="{{AdminCatalogPriceRuleGrid.resetFilter}}" stepKey="clickOnResetFilter"/>
-+        <waitForPageLoad stepKey="waitForTheGridPageToLoad"/>
-+        <fillField selector="{{AdminCatalogPriceRuleGrid.ruleFilter}}" userInput="{{catalogRuleName}}" stepKey="fillTheRuleFilter"/>
-+        <click selector="{{AdminCatalogPriceRuleGrid.search}}" stepKey="clickOnSearchButton"/>
-+        <waitForPageLoad stepKey="waitForTheSearchResult"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminSelectCatalogRuleFromGridActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminSelectCatalogRuleFromGridActionGroup.xml
-new file mode 100644
-index 00000000000..f0e927ea840
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminSelectCatalogRuleFromGridActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSelectCatalogRuleFromGridActionGroup">
-+        <arguments>
-+            <argument name="catalogRuleName" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminCatalogPriceRuleGrid.selectRowByRuleName(catalogRuleName)}}" stepKey="selectRow"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogPriceRuleFormActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogPriceRuleFormActionGroup.xml
-new file mode 100644
-index 00000000000..330c2ad7e15
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogPriceRuleFormActionGroup.xml
-@@ -0,0 +1,29 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCatalogPriceRuleFormActionGroup">
-+        <arguments>
-+            <argument name="catalogRule" defaultValue="inactiveCatalogRule"  />
-+            <argument name="status"  type="string" defaultValue=""/>
-+            <argument name="websites" type="string"/>
-+            <argument name="customerGroup" type="string"/>
-+        </arguments>
-+        <seeInField stepKey="fillName" selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}"/>
-+        <seeInField stepKey="fillDescription" selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}"/>
-+        <seeOptionIsSelected selector="{{AdminNewCatalogPriceRule.status}}" userInput="{{status}}" stepKey="selectStatus"/>
-+        <see stepKey="seeWebSite" selector="{{AdminNewCatalogPriceRule.websites}}" userInput="{{websites}}"/>
-+        <seeOptionIsSelected selector="{{AdminNewCatalogPriceRule.customerGroups}}" userInput="{{customerGroup}}" stepKey="selectCustomerGroup"/>
-+        <scrollTo selector="{{AdminNewCatalogPriceRule.actionsTab}}" stepKey="scrollToActionTab"/>
-+        <click stepKey="openActionDropdown" selector="{{AdminNewCatalogPriceRule.actionsTab}}"/>
-+        <seeInField stepKey="discountType" selector="{{AdminNewCatalogPriceRuleActions.apply}}" userInput="{{catalogRule.simple_action}}"/>
-+        <seeInField stepKey="fillDiscountValue" selector="{{AdminNewCatalogPriceRuleActions.discountAmount}}" userInput="{{catalogRule.discount_amount}}"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogRuleInGridActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogRuleInGridActionGroup.xml
-new file mode 100644
-index 00000000000..8be41c3b07a
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogRuleInGridActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCatalogRuleInGridActionGroup">
-+        <arguments>
-+            <argument name="catalogRuleName" type="string"/>
-+            <argument name="status" type="string" defaultValue=""/>
-+            <argument name="websites" type="string"/>
-+            <argument name="catalogRuleId" type="string"/>
-+        </arguments>
-+        <see selector="{{AdminCatalogPriceRuleGrid.firstRow}}" userInput="{{catalogRuleId}}" stepKey="seeCatalogRuleId"/>
-+        <see selector="{{AdminCatalogPriceRuleGrid.firstRow}}" userInput="{{catalogRuleName}}" stepKey="seeCatalogRuleName"/>
-+        <see selector="{{AdminCatalogPriceRuleGrid.firstRow}}" userInput="{{status}}" stepKey="seeCatalogRuleStatus"/>
-+        <see selector="{{AdminCatalogPriceRuleGrid.firstRow}}" userInput="{{websites}}" stepKey="seeCatalogRuleWebsite"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCustomerGroupNotOnCatalogPriceRuleFormActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCustomerGroupNotOnCatalogPriceRuleFormActionGroup.xml
-new file mode 100644
-index 00000000000..93a2a8a6109
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCustomerGroupNotOnCatalogPriceRuleFormActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCustomerGroupNotOnCatalogPriceRuleFormActionGroup">
-+        <arguments>
-+            <argument name="customerGroup" type="entity" />
-+        </arguments>
-+        <grabMultiple selector="{{AdminNewCatalogPriceRule.customerGroupsOptions}}" stepKey="customerGroups" />
-+        <assertNotContains stepKey="assertCustomerGroupNotInOptions">
-+            <actualResult type="variable">customerGroups</actualResult>
-+            <expectedResult type="string">{{customerGroup.code}}</expectedResult>
-+        </assertNotContains>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
-index f82974b7bc8..de0d2baee2d 100644
---- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
-@@ -7,17 +7,17 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- action group to create a new catalog price rule giving a catalogRule entity -->
-     <actionGroup name="newCatalogPriceRuleByUI">
-         <arguments>
-             <argument name="catalogRule" defaultValue="_defaultCatalogRule"/>
-         </arguments>
-+
-         <!-- Go to the admin Catalog rule grid and add a new one -->
-         <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
-         <waitForPageLoad stepKey="waitForPriceRulePage"/>
-         <click stepKey="addNewRule" selector="{{AdminGridMainControls.add}}"/>
--        <waitForPageLoad stepKey="waitForIndividualRulePage"/>
- 
-         <!-- Fill the form according the attributes of the entity -->
-         <fillField stepKey="fillName" selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}"/>
-@@ -28,8 +28,8 @@
-         <click stepKey="clickToCalender" selector="{{AdminNewCatalogPriceRule.toDateButton}}"/>
-         <click stepKey="clickToToday" selector="{{AdminNewCatalogPriceRule.todayDate}}"/>
-         <click stepKey="openActionDropdown" selector="{{AdminNewCatalogPriceRule.actionsTab}}"/>
--        <selectOption stepKey="discountType" selector="{{AdminNewCatalogPriceRuleActions.apply}}" userInput="{{catalogRule.simple_action}}"/>
-         <fillField stepKey="fillDiscountValue" selector="{{AdminNewCatalogPriceRuleActions.discountAmount}}" userInput="{{catalogRule.discount_amount}}"/>
-+        <selectOption stepKey="discountType" selector="{{AdminNewCatalogPriceRuleActions.apply}}" userInput="{{catalogRule.simple_action}}"/>
-         <selectOption stepKey="discardSubsequentRules" selector="{{AdminNewCatalogPriceRuleActions.disregardRules}}" userInput="Yes"/>
- 
-         <!-- Scroll to top and either save or save and apply after the action group -->
-@@ -37,6 +37,60 @@
-         <waitForPageLoad stepKey="waitForApplied"/>
-     </actionGroup>
- 
-+    <actionGroup name="createCatalogPriceRule">
-+        <arguments>
-+            <argument name="catalogRule" defaultValue="_defaultCatalogRule"/>
-+        </arguments>
-+
-+        <click stepKey="addNewRule" selector="{{AdminGridMainControls.add}}"/>
-+        <fillField selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}"  stepKey="fillName" />
-+        <fillField selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}" stepKey="fillDescription" />
-+        <selectOption selector="{{AdminNewCatalogPriceRule.websites}}" parameterArray="{{catalogRule.website_ids}}" stepKey="selectSite" />
-+        <click stepKey="openActionDropdown" selector="{{AdminNewCatalogPriceRule.actionsTab}}"/>
-+        <fillField stepKey="fillDiscountValue" selector="{{AdminNewCatalogPriceRuleActions.discountAmount}}" userInput="{{catalogRule.discount_amount}}"/>
-+
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <waitForPageLoad stepKey="waitForApplied"/>
-+    </actionGroup>
-+
-+    <actionGroup name="CreateCatalogPriceRuleViaTheUi">
-+        <arguments>
-+            <argument name="catalogRule" defaultValue="_defaultCatalogRule"/>
-+            <argument name="customerGroup" defaultValue="General" type="string"/>
-+            <argument name="disregardRules" defaultValue="Yes" type="string"/>
-+        </arguments>
-+
-+        <fillField selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}" stepKey="fillName1"/>
-+        <fillField selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}" stepKey="fillDescription1"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRule.websites}}" userInput="{{catalogRule.website_ids[0]}}"  stepKey="selectWebSite1"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRule.customerGroups}}" userInput="{{customerGroup}}" stepKey="selectCustomerGroup1"/>
-+        <scrollTo selector="{{AdminNewCatalogPriceRule.actionsTab}}" stepKey="scrollToActionTab1"/>
-+        <click selector="{{AdminNewCatalogPriceRule.actionsTab}}" stepKey="openActionDropdown1"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRuleActions.apply}}" userInput="{{catalogRule.simple_action}}" stepKey="discountType1"/>
-+        <fillField selector="{{AdminNewCatalogPriceRuleActions.discountAmount}}" userInput="{{catalogRule.discount_amount}}" stepKey="fillDiscountValue1"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRuleActions.disregardRules}}" userInput="{{disregardRules}}" stepKey="discardSubsequentRules1"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <scrollToTopOfPage stepKey="scrollToTop1"/>
-+    </actionGroup>
-+
-+    <actionGroup name="CreateCatalogPriceRuleConditionWithAttribute">
-+        <arguments>
-+            <argument name="attributeName" type="string"/>
-+            <argument name="targetValue" type="string"/>
-+            <argument name="targetSelectValue" type="string"/>
-+        </arguments>
-+
-+        <click selector="{{AdminNewCatalogPriceRule.conditionsTab}}" stepKey="openConditionsTab"/>
-+        <waitForPageLoad stepKey="waitForConditionTabOpened"/>
-+        <click selector="{{AdminNewCatalogPriceRuleConditions.newCondition}}" stepKey="addNewCondition"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.conditionSelect('1')}}" userInput="{{attributeName}}" stepKey="selectTypeCondition"/>
-+        <waitForElement selector="{{AdminNewCatalogPriceRuleConditions.targetEllipsisValue('1', targetValue)}}" stepKey="waitForIsTarget"/>
-+        <click selector="{{AdminNewCatalogPriceRuleConditions.targetEllipsisValue('1', 'is')}}" stepKey="clickOnIs"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.targetSelect('1')}}" userInput="{{targetSelectValue}}" stepKey="selectTargetCondition"/>
-+        <click selector="{{AdminNewCatalogPriceRule.fromDateButton}}" stepKey="clickFromCalender"/>
-+        <click selector="{{AdminNewCatalogPriceRule.todayDate}}" stepKey="clickFromToday"/>
-+    </actionGroup>
-+
-     <!-- Apply all of the saved catalog price rules -->
-     <actionGroup name="applyCatalogPriceRules">
-         <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
-@@ -44,4 +98,63 @@
-         <click stepKey="applyRules" selector="{{AdminCatalogPriceRuleGrid.applyRules}}"/>
-         <see stepKey="assertSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="Updated rules applied."/>
-     </actionGroup>
-+
-+    <!--Add Catalog Rule Condition With product SKU-->
-+    <actionGroup name="newCatalogPriceRuleByUIWithConditionIsSKU" extends="newCatalogPriceRuleByUI">
-+        <arguments>
-+            <argument name="productSku"/>
-+        </arguments>
-+        <click selector="{{AdminNewCatalogPriceRule.conditionsTab}}" after="discardSubsequentRules" stepKey="openConditionsTab"/>
-+        <waitForPageLoad after="openConditionsTab" stepKey="waitForConditionTabOpened"/>
-+        <click selector="{{AdminNewCatalogPriceRuleConditions.newCondition}}" after="waitForConditionTabOpened" stepKey="addNewCondition"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.conditionSelect('1')}}" userInput="Magento\CatalogRule\Model\Rule\Condition\Product|sku" after="addNewCondition" stepKey="selectTypeCondition"/>
-+        <waitForPageLoad after="selectTypeCondition" stepKey="waitForConditionChosed"/>
-+        <click selector="{{AdminNewCatalogPriceRuleConditions.targetEllipsis('1')}}" after="waitForConditionChosed" stepKey="clickEllipsis"/>
-+        <fillField selector="{{AdminNewCatalogPriceRuleConditions.targetInput('1', '1')}}" userInput="{{productSku}}" after="clickEllipsis" stepKey="fillProductSku"/>
-+        <click selector="{{AdminNewCatalogPriceRuleConditions.applyButton('1', '1')}}" after="fillProductSku" stepKey="clickApply"/>
-+    </actionGroup>
-+
-+    <!--Add Catalog Rule Condition With Category-->
-+    <actionGroup name="newCatalogPriceRuleByUIWithConditionIsCategory" extends="newCatalogPriceRuleByUI">
-+        <arguments>
-+            <argument name="categoryId"/>
-+        </arguments>
-+        <click selector="{{AdminNewCatalogPriceRule.conditionsTab}}" after="discardSubsequentRules" stepKey="openConditionsTab"/>
-+        <waitForPageLoad after="openConditionsTab" stepKey="waitForConditionTabOpened"/>
-+        <click selector="{{AdminNewCatalogPriceRuleConditions.newCondition}}" after="waitForConditionTabOpened" stepKey="addNewCondition"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.conditionSelect('1')}}" userInput="Magento\CatalogRule\Model\Rule\Condition\Product|category_ids" after="addNewCondition" stepKey="selectTypeCondition"/>
-+        <waitForPageLoad after="selectTypeCondition" stepKey="waitForConditionChosed"/>
-+        <click selector="{{AdminNewCatalogPriceRuleConditions.targetEllipsis('1')}}" after="waitForConditionChosed" stepKey="clickEllipsis"/>
-+        <fillField selector="{{AdminNewCatalogPriceRuleConditions.targetInput('1', '1')}}" userInput="{{categoryId}}" after="clickEllipsis" stepKey="fillCategoryId"/>
-+        <click selector="{{AdminNewCatalogPriceRuleConditions.applyButton('1', '1')}}" after="fillCategoryId" stepKey="clickApply"/>
-+    </actionGroup>
-+
-+    <actionGroup name="selectGeneralCustomerGroupActionGroup">
-+        <selectOption selector="{{AdminNewCatalogPriceRule.customerGroups}}" userInput="General" stepKey="selectCustomerGroup"/>
-+    </actionGroup>
-+
-+    <actionGroup name="selectNotLoggedInCustomerGroupActionGroup">
-+        <selectOption selector="{{AdminNewCatalogPriceRule.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
-+    </actionGroup>
-+
-+    <!-- Open rule for Edit -->
-+    <actionGroup name="OpenCatalogPriceRule">
-+        <arguments>
-+            <argument name="ruleName" type="string" defaultValue="CustomCatalogRule.name"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCatalogPriceRuleGridPage.url}}" stepKey="goToAdminCatalogPriceRuleGridPage"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
-+        <fillField selector="{{AdminCatalogPriceRuleGridSection.filterByRuleName}}" userInput="{{ruleName}}" stepKey="filterByRuleName"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearch"/>
-+        <click selector="{{AdminGridTableSection.row('1')}}" stepKey="clickEdit"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+    </actionGroup>
-+
-+    <actionGroup name="RemoveCatalogPriceRule" extends="OpenCatalogPriceRule">
-+        <click selector="{{AdminMainActionsSection.delete}}" after="waitForPageLoad" stepKey="clickToDelete"/>
-+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" after="clickToDelete" stepKey="waitForElementVisible"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" after="waitForElementVisible" stepKey="clickToConfirm"/>
-+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" after="clickToConfirm" stepKey="waitForSuccessMessage"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the rule." after="waitForSuccessMessage" stepKey="verifyRuleIsDeleted"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogSelectCustomerGroupActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogSelectCustomerGroupActionGroup.xml
-new file mode 100644
-index 00000000000..da961abac30
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogSelectCustomerGroupActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="CatalogSelectCustomerGroupActionGroup">
-+        <arguments>
-+            <argument name="customerGroupName" defaultValue="NOT LOGGED IN" type="string"/>
-+        </arguments>
-+        <selectOption selector="{{AdminNewCatalogPriceRule.customerGroups}}" userInput="{{customerGroupName}}" stepKey="selectCustomerGroup"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CreateCatalogPriceRuleConditionWithAttributeAndOptionActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CreateCatalogPriceRuleConditionWithAttributeAndOptionActionGroup.xml
-new file mode 100644
-index 00000000000..41323b8f3b4
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CreateCatalogPriceRuleConditionWithAttributeAndOptionActionGroup.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="CreateCatalogPriceRuleConditionWithAttributeAndOptionActionGroup">
-+        <arguments>
-+            <argument name="attributeName" type="string"/>
-+            <argument name="targetSelectValue" type="string"/>
-+            <argument name="indexA" type="string"/>
-+            <argument name="indexB" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminNewCatalogPriceRule.conditionsTab}}" stepKey="openConditionsTab"/>
-+        <waitForPageLoad stepKey="waitForConditionTabOpened"/>
-+        <click selector="{{AdminNewCatalogPriceRuleConditions.newCondition}}" stepKey="addNewCondition"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.conditionSelect(indexA)}}" userInput="{{attributeName}}" stepKey="selectTypeCondition"/>
-+        <waitForElement selector="{{AdminNewCatalogPriceRuleConditions.ellipsisValue(indexA)}}" stepKey="waitForTarget"/>
-+        <click selector="{{AdminNewCatalogPriceRuleConditions.ellipsisValue(indexA)}}" stepKey="clickOnEllipsis"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.targetEllipsisSelect(indexA, indexB)}}" userInput="{{targetSelectValue}}" stepKey="selectOption"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/SaveAndApplyCatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/SaveAndApplyCatalogPriceRuleActionGroup.xml
-new file mode 100644
-index 00000000000..bc75414e0de
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/SaveAndApplyCatalogPriceRuleActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="SaveAndApplyCatalogPriceRuleActionGroup">
-+        <waitForElementVisible selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="waitForSaveAndApplyButton"/>
-+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccess"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/CatalogRule/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..eb9cac1401c
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuMarketing">
-+        <data key="pageTitle">Marketing</data>
-+        <data key="title">Marketing</data>
-+        <data key="dataUiId">magento-backend-marketing</data>
-+    </entity>
-+    <entity name="AdminMenuMarketingPromotionsCatalogPriceRule">
-+        <data key="pageTitle">Catalog Price Rule</data>
-+        <data key="title">Catalog Price Rule</data>
-+        <data key="dataUiId">magento-catalogrule-promo-catalog</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml b/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
-index 3199a53026a..5c6ea970d3b 100644
---- a/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="_defaultCatalogRule" type="catalogRule">
-         <data key="name" unique="suffix">CatalogPriceRule</data>
-         <data key="description">Catalog Price Rule Description</data>
-@@ -33,7 +33,7 @@
-             <item>1</item>
-         </array>
-         <data key="simple_action">by_fixed</data>
--        <data key="discount_amount">10</data>
-+        <data key="discount_amount">12.3</data>
-     </entity>
- 
-     <entity name="CatalogRuleToPercent" type="catalogRule">
-@@ -61,6 +61,100 @@
-             <item>1</item>
-         </array>
-         <data key="simple_action">to_fixed</data>
--        <data key="discount_amount">100</data>
-+        <data key="discount_amount">110.7</data>
-+    </entity>
-+
-+    <entity name="CatalogRuleByPercentWith96Amount" type="catalogRule">
-+        <data key="name" unique="suffix">CatalogPriceRule</data>
-+        <data key="description">Catalog Price Rule Description</data>
-+        <data key="is_active">1</data>
-+        <array key="customer_group_ids">
-+            <item>0</item>
-+        </array>
-+        <array key="website_ids">
-+            <item>1</item>
-+        </array>
-+        <data key="simple_action">by_percent</data>
-+        <data key="discount_amount">96</data>
-+    </entity>
-+
-+    <entity name="CatalogRuleWithAllCustomerGroups" type="catalogRule">
-+        <data key="name" unique="suffix">CatalogPriceRule</data>
-+        <data key="description">Catalog Price Rule Description</data>
-+        <data key="is_active">1</data>
-+        <array key="customer_group_ids">
-+            <item>0</item>
-+            <item>1</item>
-+            <item>2</item>
-+            <item>3</item>
-+        </array>
-+        <array key="website_ids">
-+            <item>1</item>
-+        </array>
-+        <data key="simple_action">by_percent</data>
-+        <data key="discount_amount">10</data>
-+    </entity>
-+
-+    <entity name="InactiveCatalogRule" type="catalogRule">
-+        <data key="name" unique="suffix">InactiveCatalogRule</data>
-+        <data key="description">Inactive Catalog Price Rule Description</data>
-+        <data key="is_active">0</data>
-+        <array key="customer_group_ids">
-+            <item>1</item>
-+        </array>
-+        <array key="website_ids">
-+            <item>1</item>
-+        </array>
-+        <data key="simple_action">by_fixed</data>
-+        <data key="discount_amount">10</data>
-+    </entity>
-+
-+    <entity name="CatalogRuleWithoutDiscount" type="catalogRule">
-+        <data key="name" unique="suffix">CatalogPriceRuleWithoutDiscount</data>
-+        <data key="description">Catalog Price Rule Description</data>
-+        <data key="is_active">1</data>
-+        <array key="customer_group_ids">
-+            <item>0</item>
-+        </array>
-+        <array key="website_ids">
-+            <item>1</item>
-+        </array>
-+        <data key="simple_action">by_percent</data>
-+        <data key="discount_amount">0</data>
-+    </entity>
-+
-+    <entity name="ActiveCatalogPriceRuleWithConditions" type="catalogRule">
-+        <data key="name" unique="suffix">Active Catalog Rule with conditions </data>
-+        <data key="description">Rule Description</data>
-+        <data key="is_active">1</data>
-+        <array key="customer_group_ids">
-+            <item>0</item>
-+            <item>1</item>
-+            <item>2</item>
-+            <item>3</item>
-+        </array>
-+        <array key="website_ids">
-+            <item>1</item>
-+        </array>
-+        <data key="simple_action">by_percent</data>
-+        <data key="discount_amount">10</data>
-+    </entity>
-+
-+    <!-- DO NOT USE IN OTHER TESTS AS IT WILL BREAK THE EXISTING TESTS -->
-+    <entity name="DeleteActiveCatalogPriceRuleWithConditions" type="catalogRule">
-+        <data key="name" unique="suffix">Delete Active Catalog Rule with conditions </data>
-+        <data key="description">Rule Description</data>
-+        <data key="is_active">1</data>
-+        <array key="customer_group_ids">
-+            <item>0</item>
-+            <item>1</item>
-+            <item>2</item>
-+            <item>3</item>
-+        </array>
-+        <array key="website_ids">
-+            <item>1</item>
-+        </array>
-+        <data key="simple_action">by_percent</data>
-+        <data key="discount_amount">10</data>
-     </entity>
- </entities>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Metadata/catalog-rule-meta.xml b/app/code/Magento/CatalogRule/Test/Mftf/Metadata/catalog-rule-meta.xml
-index 6f5bd2decc6..0d89c7970b8 100644
---- a/app/code/Magento/CatalogRule/Test/Mftf/Metadata/catalog-rule-meta.xml
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Metadata/catalog-rule-meta.xml
-@@ -8,7 +8,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="createCatalogRule" dataType="catalogRule"
-                type="create" auth="adminFormKey" url="/catalog_rule/promo_catalog/save/" method="POST">
-         <contentType>application/x-www-form-urlencoded</contentType>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Page/AdminCatalogPriceRuleGridPage.xml b/app/code/Magento/CatalogRule/Test/Mftf/Page/AdminCatalogPriceRuleGridPage.xml
-new file mode 100644
-index 00000000000..24e4b27604f
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Page/AdminCatalogPriceRuleGridPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminCatalogPriceRuleGridPage" url="catalog_rule/promo_catalog/" module="Magento_CatalogRule" area="admin">
-+        <section name="AdminCatalogPriceRuleGridSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Page/AdminNewCatalogPriceRulePage.xml b/app/code/Magento/CatalogRule/Test/Mftf/Page/AdminNewCatalogPriceRulePage.xml
-new file mode 100644
-index 00000000000..fded4f5e5f3
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Page/AdminNewCatalogPriceRulePage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminNewCatalogPriceRulePage" url="catalog_rule/promo_catalog/new/" module="Magento_CatalogRule" area="admin">
-+        <section name="AdminNewCatalogPriceRule"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Page/AdminNewCatalogRulePage.xml b/app/code/Magento/CatalogRule/Test/Mftf/Page/AdminNewCatalogRulePage.xml
-new file mode 100644
-index 00000000000..c5307bf4e22
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Page/AdminNewCatalogRulePage.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminNewCatalogRulePage" url="catalog_rule/promo_catalog/new/" module="Magento_CatalogRule" area="admin">
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Page/CatalogRulePage.xml b/app/code/Magento/CatalogRule/Test/Mftf/Page/CatalogRulePage.xml
-index e080a252e78..511a9ac0615 100644
---- a/app/code/Magento/CatalogRule/Test/Mftf/Page/CatalogRulePage.xml
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Page/CatalogRulePage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="CatalogRulePage" url="catalog_rule/promo_catalog/" module="Magento_CatalogRule" area="admin">
-         <section name="AdminSecondaryGridSection"/>
-     </page>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleGridSection.xml b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleGridSection.xml
-new file mode 100644
-index 00000000000..21f1401b624
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleGridSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCatalogPriceRuleGridSection">
-+        <element name="filterByRuleName" type="input" selector="#promo_catalog_grid_filter_name"/>
-+        <element name="attribute" type="text" selector="//*[@id='promo_catalog_grid_table']//td[contains(text(), '{{attributeValue}}')]" parameterized="true"/>
-+        <element name="applyRulesButton" type="button" selector="#apply_rules" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleStagingSection.xml b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleStagingSection.xml
-index d212aac1c0d..bab9842caaa 100644
---- a/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleStagingSection.xml
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleStagingSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCatalogPriceRuleStagingSection">
-         <element name="status" type="select" selector=".modal-component [data-index='is_active'] select"/>
-     </section>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml
-index 4773fd8224f..5cb69cb6d7f 100644
---- a/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml
-@@ -7,12 +7,14 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminNewCatalogPriceRule">
-         <element name="saveAndApply" type="button" selector="#save_and_apply" timeout="30"/>
-         <element name="save" type="button" selector="#save" timeout="30"/>
-         <element name="saveAndContinue" type="button" selector="#save_and_continue" timeout="30"/>
-         <element name="delete" type="button" selector="#delete" timeout="30"/>
-+        <element name="okButton" type="button" selector="//button[@class='action-primary action-accept']"/>
-+        <element name="successMessage" type="text" selector="#messages"/>
- 
-         <element name="ruleName" type="input" selector="[name='name']"/>
-         <element name="description" type="textarea" selector="[name='description']"/>
-@@ -37,7 +39,25 @@
-         <element name="disregardRules" type="select" selector="[name='stop_rules_processing']"/>
-     </section>
- 
-+    <section name="AdminNewCatalogPriceRuleConditions">
-+        <element name="newCondition" type="button" selector=".rule-param.rule-param-new-child"/>
-+        <element name="conditionSelect" type="select" selector="select#conditions__{{var}}__new_child" parameterized="true"/>
-+        <element name="targetEllipsis" type="button" selector="//li[{{var}}]//a[@class='label'][text() = '...']" parameterized="true"/>
-+        <element name="targetEllipsisValue" type="button" selector="//ul[@id='conditions__{{var}}__children']//a[contains(text(), '{{var1}}')]" parameterized="true" timeout="30"/>
-+        <element name="ellipsisValue" type="button" selector="//ul[@id='conditions__{{var}}__children']//a[contains(text(), '...')]" parameterized="true" timeout="30"/>
-+        <element name="targetEllipsisSelect" type="select" selector="select#conditions__{{var1}}--{{var2}}__value" parameterized="true" timeout="30"/>
-+        <element name="targetSelect" type="select" selector="//ul[@id='conditions__{{var}}__children']//select" parameterized="true" timeout="30"/>
-+        <element name="targetInput" type="input" selector="input#conditions__{{var1}}--{{var2}}__value" parameterized="true"/>
-+        <element name="applyButton" type="button" selector="#conditions__{{var1}}__children li:nth-of-type({{var2}}) a.rule-param-apply" parameterized="true"/>
-+    </section>
-+
-     <section name="AdminCatalogPriceRuleGrid">
-         <element name="applyRules" type="button" selector="#apply_rules" timeout="30"/>
-+        <element name="updateMessage" type="text" selector="//div[@class='message message-notice notice']//div[contains(.,'We found updated rules that are not applied. Please click')]"/>
-+        <element name="ruleFilter" type="input" selector="//td[@data-column='name']/input[@name='name']"/>
-+        <element name="resetFilter" type="button" selector="//button[@title='Reset Filter']" timeout="30"/>
-+        <element name="search" type="button" selector="//div[@id='promo_catalog_grid']//button[@title='Search']" timeout="30"/>
-+        <element name="selectRowByRuleName" type="text" selector="//tr[@data-role='row']//td[contains(.,'{{ruleName}}')]" parameterized="true"/>
-+        <element name="firstRow" type="text" selector="//tr[@data-role='row']"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
-new file mode 100644
-index 00000000000..875a7842f21
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
-@@ -0,0 +1,96 @@
-+<?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="AdminApplyCatalogRuleByCategoryTest">
-+        <annotations>
-+            <features value="CatalogRule"/>
-+            <stories value="Apply catalog price rule"/>
-+            <title value="Admin should be able to apply the catalog rule by category"/>
-+            <description value="Admin should be able to apply the catalog rule by category"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-74"/>
-+            <group value="CatalogRule"/>
-+            <skip>
-+                <issueId value="MC-5777"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategoryOne"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProductOne">
-+                <requiredEntity createDataKey="createCategoryOne"/>
-+            </createData>
-+            <createData entity="ApiCategory" stepKey="createCategoryTwo"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProductTwo">
-+                <requiredEntity createDataKey="createCategoryTwo"/>
-+            </createData>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategoryOne" stepKey="deleteCategoryOne"/>
-+            <deleteData createDataKey="createSimpleProductOne" stepKey="deleteSimpleProductOne"/>
-+            <deleteData createDataKey="createCategoryTwo" stepKey="deleteCategoryTwo"/>
-+            <deleteData createDataKey="createSimpleProductTwo" stepKey="deleteSimpleProductTwo"/>
-+
-+            <!-- Delete the catalog price rule -->
-+            <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
-+            <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
-+                <argument name="name" value="{{_defaultCatalogRule.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-+        </after>
-+
-+        <!-- 1. Begin creating a new catalog price rule -->
-+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
-+        <waitForPageLoad stepKey="waitForPriceRulePage"/>
-+        <click selector="{{AdminGridMainControls.add}}" stepKey="addNewRule"/>
-+        <waitForPageLoad stepKey="waitForIndividualRulePage"/>
-+        <fillField selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{_defaultCatalogRule.name}}" stepKey="fillName"/>
-+        <fillField selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{_defaultCatalogRule.description}}" stepKey="fillDescription"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRule.websites}}" userInput="{{_defaultCatalogRule.website_ids[0]}}" stepKey="selectSite"/>
-+        <click selector="{{AdminNewCatalogPriceRule.fromDateButton}}" stepKey="clickFromCalender"/>
-+        <click selector="{{AdminNewCatalogPriceRule.todayDate}}" stepKey="clickFromToday"/>
-+        <click selector="{{AdminNewCatalogPriceRule.toDateButton}}" stepKey="clickToCalender"/>
-+        <click selector="{{AdminNewCatalogPriceRule.todayDate}}" stepKey="clickToToday"/>
-+        <click selector="{{AdminNewCatalogPriceRule.conditionsTab}}" stepKey="openConditions"/>
-+        <click selector="{{AdminNewCatalogPriceRuleConditions.newCondition}}" stepKey="clickNewRule"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.conditionSelect('1')}}" userInput="Category" stepKey="selectCategory"/>
-+        <waitForPageLoad stepKey="waitForEllipsis"/>
-+        <click selector="{{AdminNewCatalogPriceRuleConditions.targetEllipsis('1')}}" stepKey="clickEllipsis"/>
-+        <waitForPageLoad stepKey="waitForInput"/>
-+
-+        <!-- 2. Fill condition of category = createCategoryOne -->
-+        <fillField selector="{{AdminNewCatalogPriceRuleConditions.targetInput('1', '1')}}" userInput="$$createCategoryOne.id$$" stepKey="fillCategory"/>
-+        <click selector="{{AdminNewCatalogPriceRuleConditions.applyButton('1', '1')}}" stepKey="clickApply"/>
-+        <click selector="{{AdminNewCatalogPriceRule.actionsTab}}" stepKey="openActionDropdown"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRuleActions.apply}}" userInput="{{_defaultCatalogRule.simple_action}}" stepKey="discountType"/>
-+        <fillField selector="{{AdminNewCatalogPriceRuleActions.discountAmount}}" userInput="50" stepKey="fillDiscountValue"/>
-+        <selectOption selector="{{AdminNewCatalogPriceRuleActions.disregardRules}}" userInput="Yes" stepKey="discardSubsequentRules"/>
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <waitForPageLoad stepKey="waitForApplied"/>
-+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
-+
-+        <!-- 3. Save and apply the new catalog price rule -->
-+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!-- 4. Verify the storefront -->
-+        <amOnPage url="$$createCategoryOne.name$$.html" stepKey="goToCategoryOne"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$$createSimpleProductOne.name$$" stepKey="seeProductOne"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$61.50" stepKey="seeProductOnePrice"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="Regular Price $123.00" stepKey="seeProductOneRegularPrice"/>
-+        <amOnPage url="$$createCategoryTwo.name$$.html" stepKey="goToCategoryTwo"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$$createSimpleProductTwo.name$$" stepKey="seeProductTwo"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$123.00" stepKey="seeProductTwoPrice"/>
-+        <dontSee selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$61.50" stepKey="dontSeeDiscount"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml
-index 70fd7459865..10db68e9053 100644
---- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateCatalogPriceRuleByPercentTest">
-         <annotations>
-             <features value="CatalogRule"/>
-@@ -17,6 +17,9 @@
-             <severity value="MAJOR"/>
-             <testCaseId value="MC-65"/>
-             <group value="CatalogRule"/>
-+            <skip>
-+                <issueId value="MC-5777"/>
-+            </skip>
-         </annotations>
-         <before>
-             <!-- Create the simple product and category that it will be in -->
-@@ -28,7 +31,7 @@
-             <!-- log in and create the price rule -->
-             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-             <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI"/>
--            <actionGroup stepKey="selectLoggedInCustomers" ref="selectNotLoggedInCustomerGroup"/>
-+            <actionGroup stepKey="selectNotLoggedInCustomerGroup" ref="selectNotLoggedInCustomerGroup"/>
-             <click stepKey="saveAndApply" selector="{{AdminNewCatalogPriceRule.saveAndApply}}"/>
-             <see stepKey="assertSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule."/>
-         </before>
-@@ -65,7 +68,7 @@
-         <see stepKey="seeNewPriceInCart" selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$110.70"/>
-     </test>
- 
--    <test name="AdminCreateCatalogPriceRuleByFixedTest">
-+    <test name="AdminCreateCatalogPriceRuleByFixedTest" extends="AdminCreateCatalogPriceRuleByPercentTest">
-         <annotations>
-             <features value="CatalogRule"/>
-             <stories value="Create catalog price rule"/>
-@@ -74,57 +77,24 @@
-             <severity value="MAJOR"/>
-             <testCaseId value="MC-93"/>
-             <group value="CatalogRule"/>
-+            <skip>
-+                <issueId value="MC-5777"/>
-+            </skip>
-         </annotations>
-         <before>
--            <!-- Create the simple product and category that it will be in -->
--            <createData entity="ApiCategory" stepKey="createCategory"/>
--            <createData entity="ApiSimpleProduct" stepKey="createProduct">
--                <requiredEntity createDataKey="createCategory"/>
--            </createData>
--
--            <!-- log in and create the price rule -->
--            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-             <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
-                 <argument name="catalogRule" value="CatalogRuleByFixed"/>
-             </actionGroup>
--            <actionGroup stepKey="selectLoggedInCustomers" ref="selectNotLoggedInCustomerGroup"/>
--            <click stepKey="saveAndApply" selector="{{AdminNewCatalogPriceRule.saveAndApply}}"/>
--            <see stepKey="assertSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule."/>
-         </before>
-         <after>
--            <!-- delete the simple product and catalog price rule and logout -->
--            <amOnPage stepKey="goToPriceRulePage" url="admin/catalog_rule/promo_catalog/"/>
-             <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
-                 <argument name="name" value="{{CatalogRuleByFixed.name}}"/>
-                 <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-             </actionGroup>
--            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
--            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
--            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-         </after>
--
--        <!-- Go to category page and make sure that all of the prices are correct -->
--        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryPage"/>
--        <waitForPageLoad stepKey="waitForCategory"/>
--        <see stepKey="seeOldPrice" selector="{{StorefrontCategoryProductSection.ProductOldPriceByNumber('1')}}" userInput="$$createProduct.price$$"/>
--        <see stepKey="seeNewPrice" selector="{{StorefrontCategoryProductSection.ProductSpecialPriceByNumber('1')}}" userInput="$113.00"/>
--
--        <!-- Go to the simple product page and check that the prices are correct -->
--        <amOnPage stepKey="goToProductPage" url="$$createProduct.sku$$.html"/>
--        <waitForPageLoad stepKey="waitForProductPage"/>
--        <see stepKey="seeOldPriceTag" selector="{{StorefrontProductInfoMainSection.oldPriceTag}}" userInput="Regular Price"/>
--        <see stepKey="seeOldPrice2" selector="{{StorefrontProductInfoMainSection.oldPriceAmount}}" userInput="$$createProduct.price$$"/>
--        <see stepKey="seeNewPrice2" selector="{{StorefrontProductInfoMainSection.updatedPrice}}" userInput="$113.00"/>
--
--        <!-- Add the product to cart and check that the price is correct there -->
--        <click stepKey="addToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
--        <waitForPageLoad stepKey="waitForAddedToCart"/>
--        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
--        <waitForPageLoad stepKey="waitForCart"/>
--        <see stepKey="seeNewPriceInCart" selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$113.00"/>
-     </test>
- 
--    <test name="AdminCreateCatalogPriceRuleToPercentTest">
-+    <test name="AdminCreateCatalogPriceRuleToPercentTest" extends="AdminCreateCatalogPriceRuleByPercentTest">
-         <annotations>
-             <features value="CatalogRule"/>
-             <stories value="Create catalog price rule"/>
-@@ -133,57 +103,24 @@
-             <severity value="MAJOR"/>
-             <testCaseId value="MC-69"/>
-             <group value="CatalogRule"/>
-+            <skip>
-+                <issueId value="MC-5777"/>
-+            </skip>
-         </annotations>
-         <before>
--            <!-- Create the simple product and category that it will be in -->
--            <createData entity="ApiCategory" stepKey="createCategory"/>
--            <createData entity="ApiSimpleProduct" stepKey="createProduct">
--                <requiredEntity createDataKey="createCategory"/>
--            </createData>
--
--            <!-- log in and create the price rule -->
--            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-             <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
-                 <argument name="catalogRule" value="CatalogRuleToPercent"/>
-             </actionGroup>
--            <actionGroup stepKey="selectLoggedInCustomers" ref="selectNotLoggedInCustomerGroup"/>
--            <click stepKey="saveAndApply" selector="{{AdminNewCatalogPriceRule.saveAndApply}}"/>
--            <see stepKey="assertSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule."/>
-         </before>
-         <after>
--            <!-- delete the simple product and catalog price rule and logout -->
--            <amOnPage stepKey="goToPriceRulePage" url="admin/catalog_rule/promo_catalog/"/>
-             <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
-                 <argument name="name" value="{{CatalogRuleToPercent.name}}"/>
-                 <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-             </actionGroup>
--            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
--            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
--            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-         </after>
--
--        <!-- Go to category page and make sure that all of the prices are correct -->
--        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryPage"/>
--        <waitForPageLoad stepKey="waitForCategory"/>
--        <see stepKey="seeOldPrice" selector="{{StorefrontCategoryProductSection.ProductOldPriceByNumber('1')}}" userInput="$$createProduct.price$$"/>
--        <see stepKey="seeNewPrice" selector="{{StorefrontCategoryProductSection.ProductSpecialPriceByNumber('1')}}" userInput="$110.70"/>
--
--        <!-- Go to the simple product page and check that the prices are correct -->
--        <amOnPage stepKey="goToProductPage" url="$$createProduct.sku$$.html"/>
--        <waitForPageLoad stepKey="waitForProductPage"/>
--        <see stepKey="seeOldPriceTag" selector="{{StorefrontProductInfoMainSection.oldPriceTag}}" userInput="Regular Price"/>
--        <see stepKey="seeOldPrice2" selector="{{StorefrontProductInfoMainSection.oldPriceAmount}}" userInput="$$createProduct.price$$"/>
--        <see stepKey="seeNewPrice2" selector="{{StorefrontProductInfoMainSection.updatedPrice}}" userInput="$110.70"/>
--
--        <!-- Add the product to cart and check that the price is correct there -->
--        <click stepKey="addToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
--        <waitForPageLoad stepKey="waitForAddedToCart"/>
--        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
--        <waitForPageLoad stepKey="waitForCart"/>
--        <see stepKey="seeNewPriceInCart" selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$110.70"/>
-     </test>
- 
--    <test name="AdminCreateCatalogPriceRuleToFixedTest">
-+    <test name="AdminCreateCatalogPriceRuleToFixedTest" extends="AdminCreateCatalogPriceRuleByPercentTest">
-         <annotations>
-             <features value="CatalogRule"/>
-             <stories value="Create catalog price rule"/>
-@@ -192,53 +129,77 @@
-             <severity value="MAJOR"/>
-             <testCaseId value="MC-60"/>
-             <group value="CatalogRule"/>
-+            <skip>
-+                <issueId value="MC-5777"/>
-+            </skip>
-         </annotations>
-         <before>
--            <!-- Create the simple product and category that it will be in -->
--            <createData entity="ApiCategory" stepKey="createCategory"/>
--            <createData entity="ApiSimpleProduct" stepKey="createProduct">
--                <requiredEntity createDataKey="createCategory"/>
--            </createData>
--
--            <!-- log in and create the price rule -->
--            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-             <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
-                 <argument name="catalogRule" value="CatalogRuleToFixed"/>
-             </actionGroup>
--            <actionGroup stepKey="selectLoggedInCustomers" ref="selectNotLoggedInCustomerGroup"/>
--            <click stepKey="saveAndApply" selector="{{AdminNewCatalogPriceRule.saveAndApply}}"/>
--            <see stepKey="assertSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule."/>
-         </before>
-         <after>
--            <!-- delete the simple product and catalog price rule and logout -->
--            <amOnPage stepKey="goToPriceRulePage" url="admin/catalog_rule/promo_catalog/"/>
-             <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
-                 <argument name="name" value="{{CatalogRuleToFixed.name}}"/>
-                 <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-             </actionGroup>
--            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
--            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
--            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-         </after>
-+    </test>
- 
--        <!-- Go to category page and make sure that all of the prices are correct -->
--        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryPage"/>
--        <waitForPageLoad stepKey="waitForCategory"/>
--        <see stepKey="seeOldPrice" selector="{{StorefrontCategoryProductSection.ProductOldPriceByNumber('1')}}" userInput="$$createProduct.price$$"/>
--        <see stepKey="seeNewPrice" selector="{{StorefrontCategoryProductSection.ProductSpecialPriceByNumber('1')}}" userInput="$100.00"/>
--
--        <!-- Go to the simple product page and check that the prices are correct -->
--        <amOnPage stepKey="goToProductPage" url="$$createProduct.sku$$.html"/>
--        <waitForPageLoad stepKey="waitForProductPage"/>
--        <see stepKey="seeOldPriceTag" selector="{{StorefrontProductInfoMainSection.oldPriceTag}}" userInput="Regular Price"/>
--        <see stepKey="seeOldPrice2" selector="{{StorefrontProductInfoMainSection.oldPriceAmount}}" userInput="$$createProduct.price$$"/>
--        <see stepKey="seeNewPrice2" selector="{{StorefrontProductInfoMainSection.updatedPrice}}" userInput="$100.00"/>
-+    <test name="AdminCreateCatalogPriceRuleForCustomerGroupTest">
-+        <annotations>
-+            <features value="CatalogRule"/>
-+            <stories value="Apply catalog price rule"/>
-+            <title value="Admin should be able to apply the catalog rule by customer group"/>
-+            <description value="Admin should be able to apply the catalog rule by customer group"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-71"/>
-+            <group value="CatalogRule"/>
-+            <skip>
-+                <issueId value="MC-5777"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Create a simple product and a category-->
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete the simple product and category -->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <!-- Delete the catalog rule -->
-+            <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToRulePage"/>
-+            <waitForPageLoad stepKey="waitForRulePage"/>
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
-+                <argument name="name" value="{{_defaultCatalogRule.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+            </actionGroup>
-+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-+        </after>
- 
--        <!-- Add the product to cart and check that the price is correct there -->
--        <click stepKey="addToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
--        <waitForPageLoad stepKey="waitForAddedToCart"/>
--        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
--        <waitForPageLoad stepKey="waitForCart"/>
--        <see stepKey="seeNewPriceInCart" selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$100.00"/>
-+        <!-- Create a catalog rule for the NOT LOGGED IN customer group -->
-+        <actionGroup ref="newCatalogPriceRuleByUI" stepKey="createNewPriceRule"/>
-+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
-+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccess"/>
-+
-+        <!-- As a NOT LOGGED IN user, go to the storefront category page and should see the discount -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategory1"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$$createProduct.name$$" stepKey="seeProduct1"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$110.70" stepKey="seeDiscountedPrice1"/>
-+
-+        <!-- Create a user account -->
-+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="createAnAccount">
-+            <argument name="Customer" value="CustomerEntityOne"/>
-+        </actionGroup>
-+
-+        <!-- As a logged in user, go to the storefront category page and should NOT see discount -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategory2"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$$createProduct.name$$" stepKey="seeProduct2"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$123.00" stepKey="seeDiscountedPrice2"/>
-     </test>
- </tests>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateInactiveCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateInactiveCatalogPriceRuleTest.xml
-new file mode 100644
-index 00000000000..5223b18df4e
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateInactiveCatalogPriceRuleTest.xml
-@@ -0,0 +1,75 @@
-+<?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="AdminCreateInactiveCatalogPriceRuleTest">
-+        <annotations>
-+            <stories value="Create Catalog Price Rule"/>
-+            <title value="Create Inactive Catalog Price Rule"/>
-+            <description value="Login as admin and create inactive catalog price Rule"/>
-+            <testCaseId value="MC-13977"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminSearchCatalogRuleInGridActionGroup" stepKey="searchCreatedCatalogRule">
-+                <argument name="catalogRuleName" value="{{InactiveCatalogRule.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminSelectCatalogRuleFromGridActionGroup" stepKey="selectCreatedCatalogRule">
-+                <argument name="catalogRuleName" value="{{InactiveCatalogRule.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteCatalogRuleActionGroup" stepKey="deleteTheCatalogRule"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--  Create Inactive Catalog Price Rule -->
-+        <actionGroup ref="AdminCreateNewCatalogPriceRuleActionGroup" stepKey="createCatalogPriceRule">
-+            <argument name="catalogRule" value="InactiveCatalogRule"/>
-+            <argument name="customerGroup" value="General"/>
-+        </actionGroup>
-+
-+        <!-- Save and Apply Rules -->
-+        <actionGroup ref="AdminSaveAndApplyRulesActionGroup" stepKey="saveAndApplyRules"/>
-+
-+        <!-- Search Catalog Rule in Grid -->
-+        <actionGroup ref="AdminSearchCatalogRuleInGridActionGroup" stepKey="searchAndSelectCreatedCatalogRule">
-+            <argument name="catalogRuleName" value="{{InactiveCatalogRule.name}}"/>
-+        </actionGroup>
-+
-+        <!--Select Catalog Rule in Grid -->
-+        <actionGroup ref="AdminSelectCatalogRuleFromGridActionGroup" stepKey="selectCreatedCatalogRule">
-+            <argument name="catalogRuleName" value="{{InactiveCatalogRule.name}}"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="catalogRuleId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!-- Assert catalog Price Rule Form -->
-+        <actionGroup ref="AssertCatalogPriceRuleFormActionGroup" stepKey="assertCatalogRuleForm">
-+            <argument name="catalogRule" value="InactiveCatalogRule"/>
-+            <argument name="status" value="Inactive"/>
-+            <argument name="websites" value="Main Website"/>
-+            <argument name="customerGroup" value="General"/>
-+        </actionGroup>
-+
-+        <!-- Search Catalog Rule in Grid -->
-+        <actionGroup ref="AdminSearchCatalogRuleInGridActionGroup" stepKey="searchCreatedCatalogRule">
-+            <argument name="catalogRuleName" value="{{InactiveCatalogRule.name}}"/>
-+        </actionGroup>
-+
-+        <!-- Assert Catalog Rule In Grid -->
-+        <actionGroup ref="AssertCatalogRuleInGridActionGroup" stepKey="assertCatalogRuleInGrid">
-+            <argument name="catalogRuleName" value="{{InactiveCatalogRule.name}}"/>
-+            <argument name="status" value="Inactive"/>
-+            <argument name="websites" value="Main Website"/>
-+            <argument name="catalogRuleId" value="$catalogRuleId"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest.xml
-new file mode 100644
-index 00000000000..06392764290
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest.xml
-@@ -0,0 +1,218 @@
-+<?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="AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest">
-+        <annotations>
-+            <stories value="Delete Catalog Price Rule"/>
-+            <title value="Delete Catalog Price Rule for Simple Product"/>
-+            <description value="Assert that Catalog Price Rule is not applied for simple product."/>
-+            <testCaseId value="MC-14073"/>
-+            <severity value="CRITICAL"/>
-+            <group value="CatalogRule"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        
-+        <before>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer1"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory1"/>
-+            <createData entity="SimpleProduct" stepKey="createProduct1">
-+                <requiredEntity createDataKey="createCategory1"/>
-+            </createData>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+
-+            <amOnPage url="{{AdminNewCatalogPriceRulePage.url}}" stepKey="openNewCatalogPriceRulePage"/>
-+            <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+
-+            <actionGroup ref="CreateCatalogPriceRuleViaTheUi" stepKey="createCatalogPriceRuleViaTheUi1">
-+                <argument name="catalogRule" value="DeleteActiveCatalogPriceRuleWithConditions"/>
-+                <argument name="customerGroup" value="General"/>
-+                <argument name="disregardRules" value="Yes"/>
-+            </actionGroup>
-+
-+            <click selector="{{AdminNewCatalogPriceRule.save}}" stepKey="saveTheCatalogRule"/>
-+            <waitForPageLoad stepKey="waitForPageToLoad3"/>
-+            <see selector="{{AdminNewCatalogPriceRule.successMessage}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin1"/>
-+
-+            <deleteData createDataKey="createCustomer1" stepKey="deleteCustomer1"/>
-+            <deleteData createDataKey="createProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="createCategory1" stepKey="deleteCategoryFirst1"/>
-+        </after>
-+
-+        <!-- Delete the simple product and catalog price rule -->
-+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage1"/>
-+        <waitForPageLoad stepKey="waitForPriceRulePage"/>
-+        <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule1">
-+            <argument name="name" value="{{DeleteActiveCatalogPriceRuleWithConditions.name}}"/>
-+            <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+        </actionGroup>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
-+
-+        <!-- Assert that the Success message is present after the delete -->
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the rule." stepKey="seeDeletedRuleMessage1"/>
-+
-+        <!-- Reindex -->
-+        <magentoCLI command="cache:flush" stepKey="flushCache1"/>
-+        <magentoCLI command="indexer:reindex" stepKey="reindex1"/>
-+
-+        <!-- Assert that the rule isn't present on the Category page -->
-+        <amOnPage url="$$createCategory1.name$$.html" stepKey="goToStorefrontCategoryPage1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad3"/>
-+        <dontSee selector="{{StorefrontCategoryProductSection.ProductCatalogRulePriceTitleByName($$createProduct1.name$$)}}" userInput="Regular Price" stepKey="dontSeeRegularPriceText1"/>
-+        <dontSeeElement selector="{{StorefrontCategoryProductSection.ProductCatalogRuleSpecialPriceTitleByName($$createProduct1.name$$)}}" stepKey="dontSeeSpecialPrice1"/>
-+
-+        <!-- Assert that the rule isn't present on the Product page -->
-+        <amOnPage url="$$createProduct1.name$$.html" stepKey="goToStorefrontProductPage1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad4"/>
-+        <dontSee selector="{{StorefrontProductInfoMainSection.oldPriceTag}}" userInput="Regular Price" stepKey="dontSeeRegularPRiceText2"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createProduct1.price$$" stepKey="seeTrueProductPrice1"/>
-+
-+        <!-- Assert that the rule isn't present in the Shopping Cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToShoppingCart1">
-+            <argument name="productName" value="$$createProduct1.name$$"/>
-+        </actionGroup>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniShoppingCart1"/>
-+        <see selector="{{StorefrontMinicartSection.productPriceByName($$createProduct1.name$$)}}" userInput="$$createProduct1.price$$" stepKey="seeCorrectProductPrice1"/>
-+
-+        <!-- Assert that the rule isn't present on the Checkout page -->
-+        <click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout1"/>
-+        <conditionalClick selector="{{CheckoutCartSummarySection.expandShoppingCartSummary}}" dependentSelector="{{CheckoutCartSummarySection.expandShoppingCartSummary}}" visible="true" stepKey="expandShoppingCartSummary1"/>
-+        <see selector="{{CheckoutCartProductSection.ProductRegularPriceByName($$createProduct1.name$$)}}" userInput="$$createProduct1.price$$" stepKey="seeCorrectProductPriceOnCheckout1"/>
-+    </test>
-+
-+    <test name="AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest">
-+        <annotations>
-+            <stories value="Delete Catalog Price Rule"/>
-+            <title value="Delete Catalog Price Rule for Configurable Product"/>
-+            <description value="Assert that Catalog Price Rule is not applied for configurable product"/>
-+            <testCaseId value="MC-14074"/>
-+            <severity value="CRITICAL"/>
-+            <group value="CatalogRule"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer1"/>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory1"/>
-+
-+            <!-- Create the configurable product based on the data in the /data folder -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct1">
-+                <requiredEntity createDataKey="createCategory1"/>
-+            </createData>
-+
-+            <!-- Make the configurable product have two options, that are children of the default attribute set -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute1"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute1"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute1"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute1"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute1"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute1"/>
-+            </getData>
-+
-+            <!-- Create the 2 children that will be a part of the configurable product -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <!-- Assign the two products to the configurable product -->
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption1">
-+                <requiredEntity createDataKey="createConfigProduct1"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct1"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct1"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+
-+            <amOnPage url="{{AdminNewCatalogPriceRulePage.url}}" stepKey="openNewCatalogPriceRulePage"/>
-+            <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+
-+            <actionGroup ref="CreateCatalogPriceRuleViaTheUi" stepKey="createCatalogPriceRuleViaTheUi1">
-+                <argument name="catalogRule" value="DeleteActiveCatalogPriceRuleWithConditions"/>
-+                <argument name="customerGroup" value="General"/>
-+                <argument name="disregardRules" value="Yes"/>
-+            </actionGroup>
-+
-+            <click selector="{{AdminNewCatalogPriceRule.save}}" stepKey="saveTheCatalogRule"/>
-+            <waitForPageLoad stepKey="waitForPageToLoad3"/>
-+            <see selector="{{AdminNewCatalogPriceRule.successMessage}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin1"/>
-+
-+            <deleteData createDataKey="createCustomer1" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory1" stepKey="deleteCategory1"/>
-+            <deleteData createDataKey="createConfigProduct1" stepKey="deleteConfigProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigProductAttribute1" stepKey="deleteConfigProductAttribute1"/>
-+        </after>
-+
-+        <!-- Delete the simple product and catalog price rule -->
-+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage1"/>
-+        <waitForPageLoad stepKey="waitForPriceRulePage"/>
-+        <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule1">
-+            <argument name="name" value="{{DeleteActiveCatalogPriceRuleWithConditions.name}}"/>
-+            <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+        </actionGroup>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the rule." stepKey="seeDeletedRuleMessage1"/>
-+
-+        <!-- Reindex -->
-+        <magentoCLI command="cache:flush" stepKey="flushCache1"/>
-+        <magentoCLI command="indexer:reindex" stepKey="reindex1"/>
-+
-+        <!-- Assert that the rule isn't present on the Category page -->
-+        <amOnPage url="$$createCategory1.name$$.html" stepKey="goToStorefrontCategoryPage1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName($$createConfigProduct1.name$$)}}" userInput="$$createConfigChildProduct1.price$$" stepKey="seeRegularPriceText1"/>
-+
-+        <!-- Assert that the rule isn't present on the Product page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProduct1.custom_attributes[url_key]$$)}}" stepKey="goToStorefrontProductPage1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad3"/>
-+        <dontSee selector="{{StorefrontProductInfoMainSection.oldPriceTag}}" userInput="Regular Price" stepKey="dontSeeRegularPriceText2"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigChildProduct1.price$$" stepKey="seeTrueProductPrice1"/>
-+
-+        <!-- Assert that the rule isn't present in the Shopping Cart -->
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="option1" stepKey="selectOption1"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart1"/>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad4"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You added $$createConfigProduct1.name$ to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniShoppingCart1"/>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
-+        <see selector="{{StorefrontMinicartSection.productPriceByName($$createConfigProduct1.name$$)}}" userInput="$$createConfigProduct1.price$$" stepKey="seeCorrectProductPrice1"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
-new file mode 100644
-index 00000000000..06f3682aedd
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
-@@ -0,0 +1,101 @@
-+<?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="AdminDeleteCatalogPriceRuleTest">
-+        <annotations>
-+            <features value="CatalogRule"/>
-+            <stories value="Delete Catalog Price Rule"/>
-+            <title value="Admin should be able to delete catalog price rule"/>
-+            <description value="Admin should be able to delete catalog price rule"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-160"/>
-+            <group value="CatalogRule"/>
-+            <skip>
-+                <issueId value="MC-5777"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+
-+            <!-- Create a simple product -->
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Create a configurable product -->
-+            <actionGroup ref="createConfigurableProduct" stepKey="createConfigurableProduct">
-+                <argument name="product" value="_defaultProduct"/>
-+                <argument name="category" value="$$createCategory$$"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+        </after>
-+
-+        <!-- Create a catalog price rule -->
-+        <actionGroup ref="newCatalogPriceRuleByUI" stepKey="createNewPriceRule"/>
-+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
-+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccess"/>
-+
-+        <!-- Verify that category page shows the discount -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryPage1"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductTitleByName(ApiSimpleProduct.name)}}" userInput="$$createSimpleProduct.name$$" stepKey="seeSimpleProduct1"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName(ApiSimpleProduct.name)}}" userInput="$110.70" stepKey="seeSimpleProductDiscount1"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductTitleByName(_defaultProduct.name)}}" userInput="{{_defaultProduct.name}}" stepKey="seeConfigurableProduct1"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName(_defaultProduct.name)}}" userInput="$0.90" stepKey="seeConfigurableProductDiscount1"/>
-+
-+        <!-- Verify that the simple product page shows the discount -->
-+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="goToSimpleProductPage1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeCorrectName1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createSimpleProduct.sku$$" stepKey="seeCorrectSku1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$110.70" stepKey="seeCorrectPrice1"/>
-+
-+        <!-- Verify that the configurable product page the catalog price rule discount -->
-+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToConfigurableProductPage1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="seeCorrectName2"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="seeCorrectSku2"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$0.90" stepKey="seeCorrectPrice2"/>
-+
-+        <!-- Delete the rule -->
-+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
-+        <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
-+            <argument name="name" value="{{_defaultCatalogRule.name}}"/>
-+            <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+        </actionGroup>
-+
-+        <!-- Apply and flush the cache -->
-+        <click selector="{{AdminCatalogPriceRuleGrid.applyRules}}" stepKey="clickApplyRules"/>
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!-- Verify that category page shows the original prices -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryPage2"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductTitleByName(ApiSimpleProduct.name)}}" userInput="$$createSimpleProduct.name$$" stepKey="seeSimpleProduct2"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName(ApiSimpleProduct.name)}}" userInput="$123.00" stepKey="seeSimpleProductDiscount2"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductTitleByName(_defaultProduct.name)}}" userInput="{{_defaultProduct.name}}" stepKey="seeConfigurableProduct2"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName(_defaultProduct.name)}}" userInput="$1.00" stepKey="seeConfigurableProductDiscount2"/>
-+
-+        <!-- Verify that the simple product page shows the original price -->
-+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="goToSimpleProductPage2"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeCorrectName3"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createSimpleProduct.sku$$" stepKey="seeCorrectSku3"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$123.00" stepKey="seeCorrectPrice3"/>
-+
-+        <!-- Verify that the configurable product page shows the original price -->
-+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToConfigurableProductPage2"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="seeCorrectName4"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="seeCorrectSku4"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$1.00" stepKey="seeCorrectPrice4"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
-new file mode 100644
-index 00000000000..0ff7e0cd852
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
-@@ -0,0 +1,137 @@
-+<?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="AdminEnableAttributeIsUndefinedCatalogPriceRuleTest">
-+        <annotations>
-+            <features value="CatalogRule"/>
-+            <stories value="Catalog price rule"/>
-+            <title value="Enable 'is undefined' condition to Scope Catalog Price rules by custom product attribute"/>
-+            <description value="Enable 'is undefined' condition to Scope Catalog Price rules by custom product attribute"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13654"/>
-+            <useCaseId value="MC-10971"/>
-+            <group value="CatalogRule"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+
-+            <createData entity="ApiCategory" stepKey="createFirstCategory"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createFirstProduct">
-+                <requiredEntity createDataKey="createFirstCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createSecondProduct">
-+                <requiredEntity createDataKey="createFirstCategory"/>
-+            </createData>
-+            <createData entity="productYesNoAttribute" stepKey="createProductAttribute"/>
-+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
-+                <requiredEntity createDataKey="createProductAttribute"/>
-+            </createData>
-+
-+            <createData entity="SimpleSubCategory" stepKey="createSecondCategory"/>
-+            <createData entity="SimpleProduct3" stepKey="createThirdProduct">
-+                <requiredEntity createDataKey="createSecondCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct4" stepKey="createForthProduct">
-+                <requiredEntity createDataKey="createSecondCategory"/>
-+            </createData>
-+            <createData entity="productDropDownAttribute" stepKey="createSecondProductAttribute">
-+                <field key="scope">website</field>
-+            </createData>
-+        </before>
-+        <after>
-+
-+            <!--Delete created data-->
-+            <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToCatalogPriceRulePage"/>
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
-+                <argument name="name" value="{{CatalogRuleWithAllCustomerGroups.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+            </actionGroup>
-+            <click stepKey="resetFilters" selector="{{AdminSecondaryGridSection.resetFilters}}"/>
-+            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
-+            <deleteData createDataKey="createSecondProduct" stepKey="deleteSecondProduct"/>
-+            <deleteData createDataKey="createFirstCategory" stepKey="deleteFirstCategory"/>
-+            <deleteData createDataKey="createThirdProduct" stepKey="deleteThirdProduct"/>
-+            <deleteData createDataKey="createForthProduct" stepKey="deleteForthProduct"/>
-+            <deleteData createDataKey="createSecondCategory" stepKey="deleteSecondCategory"/>
-+            <deleteData createDataKey="createSecondProductAttribute" stepKey="deleteSecondProductAttribute"/>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create catalog price rule-->
-+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
-+        <waitForPageLoad stepKey="waitForPriceRulePage"/>
-+        <actionGroup ref="createCatalogPriceRule" stepKey="createCatalogPriceRule">
-+            <argument name="catalogRule" value="CatalogRuleWithAllCustomerGroups"/>
-+        </actionGroup>
-+        <actionGroup ref="selectNotLoggedInCustomerGroupActionGroup" stepKey="selectCustomerGroup"/>
-+        <actionGroup ref="CreateCatalogPriceRuleConditionWithAttribute" stepKey="createCatalogPriceRuleCondition">
-+            <argument name="attributeName" value="$$createProductAttribute.attribute[frontend_labels][0][label]$$"/>
-+            <argument name="targetValue" value="is"/>
-+            <argument name="targetSelectValue" value="is undefined"/>
-+        </actionGroup>
-+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="clickSaveAndApplyRules"/>
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!--Check Catalog Price Rule for first product-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createFirstProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToFirstProductPage"/>
-+        <waitForPageLoad stepKey="waitForFirstProductPageLoad"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.updatedPrice}}" stepKey="grabFirstProductUpdatedPrice"/>
-+        <assertEquals expected='$110.70' expectedType="string" actual="($grabFirstProductUpdatedPrice)" stepKey="assertFirstProductUpdatedPrice"/>
-+
-+        <!--Check Catalog Price Rule for second product-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSecondProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSecondProductPage"/>
-+        <waitForPageLoad stepKey="waitForSecondProductPageLoad"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.updatedPrice}}" stepKey="grabSecondProductUpdatedPrice"/>
-+        <assertEquals expected='$110.70' expectedType="string" actual="($grabFirstProductUpdatedPrice)" stepKey="assertSecondProductUpdatedPrice"/>
-+
-+        <!--Delete previous attribute and Catalog Price Rule-->
-+        <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
-+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToCatalogPriceRulePage"/>
-+        <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
-+            <argument name="name" value="{{CatalogRuleWithAllCustomerGroups.name}}"/>
-+            <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+        </actionGroup>
-+
-+        <!--Add new attribute to Default set-->
-+        <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle1">
-+            <requiredEntity createDataKey="createSecondProductAttribute"/>
-+        </createData>
-+
-+        <!--Create new Catalog Price Rule-->
-+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage1"/>
-+        <waitForPageLoad stepKey="waitForPriceRulePage1"/>
-+        <actionGroup ref="createCatalogPriceRule" stepKey="createCatalogPriceRule1">
-+            <argument name="catalogRule" value="CatalogRuleWithAllCustomerGroups"/>
-+        </actionGroup>
-+        <actionGroup ref="selectNotLoggedInCustomerGroupActionGroup" stepKey="selectCustomerGroup1"/>
-+        <actionGroup ref="CreateCatalogPriceRuleConditionWithAttribute" stepKey="createCatalogPriceRuleCondition1">
-+            <argument name="attributeName" value="$$createSecondProductAttribute.attribute[frontend_labels][0][label]$$"/>
-+            <argument name="targetValue" value="is"/>
-+            <argument name="targetSelectValue" value="is undefined"/>
-+        </actionGroup>
-+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="clickSaveAndApplyRules1"/>
-+        <magentoCLI command="indexer:reindex" stepKey="reindex1"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache1"/>
-+
-+        <!--Check Catalog Price Rule for third product-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createThirdProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToThirdProductPage"/>
-+        <waitForPageLoad stepKey="waitForThirdProductPageLoad"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.updatedPrice}}" stepKey="grabThirdProductUpdatedPrice"/>
-+        <assertEquals expected='$110.70' expectedType="string" actual="($grabThirdProductUpdatedPrice)" stepKey="assertThirdProductUpdatedPrice"/>
-+
-+        <!--Check Catalog Price Rule for forth product-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createForthProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToForthProductPage"/>
-+        <waitForPageLoad stepKey="waitForForthProductPageLoad"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.updatedPrice}}" stepKey="grabForthProductUpdatedPrice"/>
-+        <assertEquals expected='$110.70' expectedType="string" actual="($grabForthProductUpdatedPrice)" stepKey="assertForthProductUpdatedPrice"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminMarketingCatalogPriceRuleNavigateMenuTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminMarketingCatalogPriceRuleNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..0fe35419aaf
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminMarketingCatalogPriceRuleNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminMarketingCatalogPriceRuleNavigateMenuTest">
-+        <annotations>
-+            <features value="CatalogRule"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin marketing catalog price rule navigate menu test"/>
-+            <description value="Admin should be able to navigate to Marketing > Catalog Price Rule"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14134"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCatalogPriceRulePage">
-+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuMarketingPromotionsCatalogPriceRule.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuMarketingPromotionsCatalogPriceRule.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml
-new file mode 100644
-index 00000000000..b9e7bfb4d41
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml
-@@ -0,0 +1,182 @@
-+<?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="ApplyCatalogPriceRuleForSimpleProductAndConfigurableProductTest">
-+        <annotations>
-+            <features value="CatalogRule"/>
-+            <stories value="Apply catalog price rule"/>
-+            <title value="Admin should be able to apply the catalog price rule for simple product and configurable product"/>
-+            <description value="Admin should be able to apply the catalog price rule for simple product and configurable product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14770"/>
-+            <group value="CatalogRule"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+         </annotations>
-+        <before>
-+            <!-- Login as Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create Simple Product  -->
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">56.78</field>
-+            </createData>
-+
-+            <!-- Create the configurable product based on the data in the /data folder -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Make the configurable product have two options, that are children of the default attribute set -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create the 2 children that will be a part of the configurable product -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <!-- Assign the two products to the configurable product -->
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete the catalog price rule -->
-+            <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
-+            <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
-+                <argument name="name" value="{{_defaultCatalogRule.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <!-- Logout -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <!-- Delete products and category -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteApiCategory"/>
-+        </after>
-+        <!-- Begin creating a new catalog price rule -->
-+        <actionGroup ref="newCatalogPriceRuleByUIWithConditionIsCategory" stepKey="newCatalogPriceRuleByUIWithConditionIsCategory">
-+                <argument name ="categoryId" value="$createCategory.id$"/>
-+        </actionGroup>
-+
-+        <!-- Select not logged in customer group -->
-+        <actionGroup ref="selectNotLoggedInCustomerGroupActionGroup" stepKey="selectNotLoggedInCustomerGroup"/>
-+
-+        <!-- Save and apply the new catalog price rule -->
-+        <actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
-+
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!-- Navigate to category on store front -->
-+        <amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToCategoryPage"/>
-+
-+        <!-- Check simple product name on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1Name">
-+            <argument name="productInfo" value="$createSimpleProduct.name$"/>
-+            <argument name="productNumber" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Check simple product price on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1Price">
-+            <argument name="productInfo" value="$51.10"/>
-+            <argument name="productNumber" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Check simple product regular price on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1RegularPrice">
-+            <argument name="productInfo" value="$56.78"/>
-+            <argument name="productNumber" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Check configurable product name on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct2Name">
-+            <argument name="productInfo" value="$createConfigProduct.name$"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Check configurable product price on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct2Price">
-+            <argument name="productInfo" value="$110.70"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Navigate to simple product on store front -->
-+        <amOnPage url="{{StorefrontProductPage.url($createSimpleProduct.name$)}}" stepKey="goToProductPage1"/>
-+
-+        <!-- Assert regular and special price after selecting ProductOptionValueDropdown1 -->
-+        <actionGroup ref="AssertStorefrontProductPricesActionGroup" stepKey="assertStorefrontProductPrices">
-+            <argument name="productPrice" value="$56.78"/>
-+            <argument name="productFinalPrice" value="$51.10"/>
-+        </actionGroup>
-+
-+        <!-- Add simple product to cart -->
-+        <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="cartAddSimpleProduct1ToCart">
-+                    <argument name="productQty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Open configurable product 1 select option 1 attribute -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.custom_attributes[url_key]$$)}}" stepKey="amOnConfigurableProductPage"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect('$$createConfigProductAttribute.attribute[frontend_labels][0][label]$$')}}"  userInput="$$createConfigProductAttributeOption1.option[store_labels][0][label]$$" stepKey="selectOption"/>
-+        <actionGroup ref="AssertStorefrontProductPricesActionGroup" stepKey="assertStorefrontProductPrices2">
-+            <argument name="productPrice" value="$123.00"/>
-+            <argument name="productFinalPrice" value="$110.70"/>
-+        </actionGroup>
-+
-+        <!-- Assert regular and special price after selecting ProductOptionValueDropdown1 -->
-+        <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="cartAddConfigProduct1ToCart">
-+            <argument name="productQty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert sub total on mini shopping cart -->
-+        <actionGroup ref="AssertSubTotalOnStorefrontMiniCartActionGroup" stepKey="assertSubTotalOnStorefrontMiniCart">
-+            <argument name="subTotal" value="$161.80"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml
-new file mode 100644
-index 00000000000..3405d0c4e77
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml
-@@ -0,0 +1,111 @@
-+<?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="ApplyCatalogRuleForSimpleProductAndFixedMethodTest">
-+        <annotations>
-+            <features value="CatalogRule"/>
-+            <stories value="Apply catalog price rule"/>
-+            <title value="Admin should be able to apply the catalog price rule for simple product with custom options"/>
-+            <description value="Admin should be able to apply the catalog price rule for simple product with custom options"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14771"/>
-+            <group value="CatalogRule"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Login as Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create Simple Product -->
-+            <createData entity="_defaultProduct" stepKey="createProduct1">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">56.78</field>
-+            </createData>
-+
-+            <!-- Update all products to have custom options -->
-+            <updateData createDataKey="createProduct1" entity="productWithFixedOptions" stepKey="updateProductWithOptions1"/>
-+        </before>
-+        <after>
-+            <!-- Delete products and category -->
-+            <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete the catalog price rule -->
-+            <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
-+            <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
-+                <argument name="name" value="{{CatalogRuleByFixed.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <!-- Logout -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- 1. Begin creating a new catalog price rule -->
-+        <actionGroup ref="newCatalogPriceRuleByUIWithConditionIsCategory" stepKey="newCatalogPriceRuleByUIWithConditionIsCategory">
-+            <argument name ="categoryId" value="$createCategory.id$"/>
-+            <argument name ="catalogRule" value="CatalogRuleByFixed"/>
-+        </actionGroup>
-+
-+        <!-- Select not logged in customer group -->
-+        <actionGroup ref="selectNotLoggedInCustomerGroupActionGroup" stepKey="selectNotLoggedInCustomerGroup"/>
-+
-+        <!-- Save and apply the new catalog price rule -->
-+        <actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        
-+        <!-- Navigate to category on store front -->
-+        <amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToCategoryPage"/>
-+        
-+        <!-- Check product 1 name on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1Name">
-+            <argument name="productInfo" value="$createProduct1.name$"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Check product 1 price on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1Price">
-+            <argument name="productInfo" value="$44.48"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Check product 1 regular price on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1RegularPrice">
-+            <argument name="productInfo" value="$56.78"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Navigate to product 1 on store front -->
-+        <amOnPage url="{{StorefrontProductPage.url($createProduct1.name$)}}" stepKey="goToProductPage1"/>
-+
-+        <!-- Assert regular and special price after selecting ProductOptionValueDropdown1 -->
-+        <actionGroup ref="StorefrontSelectCustomOptionRadioAndAssertPricesActionGroup" stepKey="storefrontSelectCustomOptionAndAssertPrices1">
-+            <argument name="customOption" value="ProductOptionRadioButton2"/>
-+            <argument name="customOptionValue" value="ProductOptionValueRadioButtons1"/>
-+            <argument name="productPrice" value="$156.77"/>
-+            <argument name="productFinalPrice" value="$144.47"/>
-+        </actionGroup>
-+
-+        <!-- Add product 1 to cart -->
-+        <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="cartAddSimpleProduct1ToCart">
-+            <argument name="productQty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert sub total on mini shopping cart -->
-+        <actionGroup ref="AssertSubTotalOnStorefrontMiniCartActionGroup" stepKey="assertSubTotalOnStorefrontMiniCart">
-+            <argument name="subTotal" value="$144.47"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml
-new file mode 100644
-index 00000000000..c3bcde92bd1
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml
-@@ -0,0 +1,162 @@
-+<?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="ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest">
-+        <annotations>
-+            <features value="CatalogRule"/>
-+            <stories value="Apply catalog price rule"/>
-+            <title value="Admin should be able to apply the catalog price rule for simple product for new customer group"/>
-+            <description value="Admin should be able to apply the catalog price rule for simple product for new customer group"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14772"/>
-+            <group value="CatalogRule"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Login as Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create new customer group -->
-+            <createData entity="CustomCustomerGroup" stepKey="customerGroup" />
-+
-+            <!--Creating customer-->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer" >
-+                <field key="group_id">$customerGroup.id$</field>
-+            </createData>
-+
-+            <!-- Create category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create Simple Product -->
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">56.78</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete products and category -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Delete customer group -->
-+            <deleteData createDataKey="customerGroup" stepKey="deleteCustomerGroup"/>
-+
-+            <!-- Delete the catalog price rule -->
-+            <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
-+            <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
-+                <argument name="name" value="{{CatalogRuleByFixed.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <!-- Logout -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- 1. Begin creating a new catalog price rule -->
-+        <actionGroup ref="newCatalogPriceRuleByUIWithConditionIsCategory" stepKey="newCatalogPriceRuleByUIWithConditionIsCategory">
-+            <argument name ="categoryId" value="$createCategory.id$"/>
-+            <argument name="catalogRule" value="CatalogRuleByFixed"/>
-+        </actionGroup>
-+
-+        <!-- Select custom customer group -->
-+        <actionGroup ref="CatalogSelectCustomerGroupActionGroup" stepKey="selectCustomCustomerGroup">
-+            <argument name="customerGroupName" value="$customerGroup.code$"/>
-+        </actionGroup>
-+
-+        <!-- Save and apply the new catalog price rule -->
-+        <actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
-+
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+
-+        <!-- Navigate to category on store front -->
-+        <amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToCategoryPage"/>
-+
-+        <!-- Check product 1 name on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProductName">
-+            <argument name="productInfo" value="$createSimpleProduct.name$"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Check product 1 has no discounts applied on store front category page -->
-+        <actionGroup ref="AssertDontSeeProductDetailsOnStorefrontActionGroup" stepKey="storefrontProductRegularPrice">
-+            <argument name="productInfo" value="$44.48"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Check product 1 price on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProductPrice">
-+            <argument name="productInfo" value="$56.78"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Navigate to product 1 on store front -->
-+        <amOnPage url="{{StorefrontProductPage.url($createSimpleProduct.name$)}}" stepKey="goToProductPage"/>
-+
-+        <!-- Add product 1 to cart -->
-+        <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="cartAddSimpleProductToCart">
-+            <argument name="productQty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert sub total on mini shopping cart -->
-+        <actionGroup ref="AssertSubTotalOnStorefrontMiniCartActionGroup" stepKey="assertSubTotalOnStorefrontMiniCart">
-+            <argument name="subTotal" value="$56.78"/>
-+        </actionGroup>
-+
-+        <!--Login to storefront as previously created customer-->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Navigate to category on store front as customer-->
-+        <amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToCategoryPageAsCustomer"/>
-+
-+        <!-- Check simple product name on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProductNameAsCustomer">
-+            <argument name="productInfo" value="$createSimpleProduct.name$"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Check simple product price on store front category page as customer -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProductPriceAsCustomer">
-+            <argument name="productInfo" value="$44.48"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Check simple product regular price on store front category page as customer -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProductRegularPriceAsCustomer">
-+            <argument name="productInfo" value="$56.78"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Navigate to simple product on store front as customer -->
-+        <amOnPage url="{{StorefrontProductPage.url($createSimpleProduct.name$)}}" stepKey="goToProductPage1AsCustomer"/>
-+
-+        <!-- Assert regular and special price as customer-->
-+        <actionGroup ref="AssertStorefrontProductPricesActionGroup" stepKey="assertStorefrontProductPrices">
-+            <argument name="productPrice" value="$56.78"/>
-+            <argument name="productFinalPrice" value="$44.48"/>
-+        </actionGroup>
-+
-+        <!-- Add simple product to cart as customer -->
-+        <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="cartAddSimpleProductToCartAsCustomer">
-+            <argument name="productQty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert sub total on mini shopping cart as customer -->
-+        <actionGroup ref="AssertSubTotalOnStorefrontMiniCartActionGroup" stepKey="assertSubTotalOnStorefrontMiniCartAsCustomer">
-+            <argument name="subTotal" value="$88.96"/>
-+        </actionGroup>
-+
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
-new file mode 100644
-index 00000000000..055eacaeb2b
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
-@@ -0,0 +1,201 @@
-+<?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="ApplyCatalogRuleForSimpleProductWithCustomOptionsTest">
-+        <annotations>
-+            <features value="CatalogRule"/>
-+            <stories value="Apply catalog price rule"/>
-+            <title value="Admin should be able to apply the catalog price rule for simple product with custom options"/>
-+            <description value="Admin should be able to apply the catalog price rule for simple product with custom options"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14769"/>
-+            <group value="CatalogRule"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Login as Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create Simple Product 1 -->
-+            <createData entity="_defaultProduct" stepKey="createProduct1">
-+            <requiredEntity createDataKey="createCategory"/>
-+            <field key="price">56.78</field>
-+            </createData>
-+
-+            <!-- Create Simple Product 2 -->
-+            <createData entity="_defaultProduct" stepKey="createProduct2">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">56.78</field>
-+            </createData>
-+
-+            <!-- Create Simple Product 3 -->
-+            <createData entity="_defaultProduct" stepKey="createProduct3">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">56.78</field>
-+            </createData>
-+
-+            <!-- Update all products to have custom options -->
-+            <updateData createDataKey="createProduct1" entity="productWithCustomOptions" stepKey="updateProductWithOptions1"/>
-+            <updateData createDataKey="createProduct2" entity="productWithCustomOptions" stepKey="updateProductWithOptions2"/>
-+            <updateData createDataKey="createProduct3" entity="productWithCustomOptions" stepKey="updateProductWithOptions3"/>
-+        </before>
-+        <after>
-+            <!-- Delete products and category -->
-+            <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="createProduct3" stepKey="deleteProduct3"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete the catalog price rule -->
-+            <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
-+            <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
-+                <argument name="name" value="{{_defaultCatalogRule.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <!-- Logout -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- 1. Begin creating a new catalog price rule -->
-+        <actionGroup ref="newCatalogPriceRuleByUIWithConditionIsCategory" stepKey="newCatalogPriceRuleByUIWithConditionIsCategory">
-+            <argument name ="categoryId" value="$createCategory.id$"/>
-+        </actionGroup>
-+
-+        <!-- Select not logged in customer group -->
-+        <actionGroup ref="selectNotLoggedInCustomerGroupActionGroup" stepKey="selectNotLoggedInCustomerGroup"/>
-+
-+        <!-- Save and apply the new catalog price rule -->
-+        <actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        
-+        <!-- Navigate to category on store front -->
-+        <amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToCategoryPage"/>
-+        
-+        <!-- Check product 1 name on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1Name">
-+            <argument name="productInfo" value="$createProduct1.name$"/>
-+            <argument name="productNumber" value="3"/>
-+        </actionGroup>
-+
-+        <!-- Check product 1 price on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1Price">
-+            <argument name="productInfo" value="$51.10"/>
-+            <argument name="productNumber" value="3"/>
-+        </actionGroup>
-+
-+        <!-- Check product 1 regular price on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1RegularPrice">
-+            <argument name="productInfo" value="$56.78"/>
-+            <argument name="productNumber" value="3"/>
-+        </actionGroup>
-+
-+        <!-- Check product 2 name on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct2Name">
-+            <argument name="productInfo" value="$createProduct2.name$"/>
-+            <argument name="productNumber" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Check product 2 price on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct2Price">
-+            <argument name="productInfo" value="$51.10"/>
-+            <argument name="productNumber" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Check product 2 price on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct2RegularPrice">
-+            <argument name="productInfo" value="$56.78"/>
-+            <argument name="productNumber" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Check product 3 name on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct3Name">
-+            <argument name="productInfo" value="$createProduct3.name$"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Check product 3 price on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct3Price">
-+            <argument name="productInfo" value="$51.10"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Check product 3 regular price on store front category page -->
-+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct3RegularPrice">
-+            <argument name="productInfo" value="$56.78"/>
-+            <argument name="productNumber" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Navigate to product 1 on store front -->
-+        <amOnPage url="{{StorefrontProductPage.url($createProduct1.name$)}}" stepKey="goToProductPage1"/>
-+
-+        <!-- Assert regular and special price after selecting ProductOptionValueDropdown1 -->
-+        <actionGroup ref="StorefrontSelectCustomOptionDropDownAndAssertPricesActionGroup" stepKey="storefrontSelectCustomOptionAndAssertPrices1">
-+            <argument name="customOption" value="{{ProductOptionValueDropdown1.title}} +$0.01"/>
-+            <argument name="productPrice" value="$56.79"/>
-+            <argument name="productFinalPrice" value="$51.11"/>
-+        </actionGroup>
-+
-+        <!-- Add product 1 to cart -->
-+        <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="cartAddSimpleProduct1ToCart">
-+            <argument name="productQty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Navigate to product 2 on store front -->
-+        <amOnPage url="{{StorefrontProductPage.url($createProduct1.name$)}}" stepKey="goToProductPage2"/>
-+
-+        <!-- Assert regular and special price after selecting ProductOptionValueDropdown3 -->
-+        <actionGroup ref="StorefrontSelectCustomOptionDropDownAndAssertPricesActionGroup" stepKey="storefrontSelectCustomOptionAndAssertPrices2">
-+            <argument name="customOption" value="{{ProductOptionValueDropdown3.title}} +$5.11"/>
-+            <argument name="productPrice" value="$62.46"/>
-+            <argument name="productFinalPrice" value="$56.21"/>
-+        </actionGroup>
-+
-+        <!-- Add product 2 to cart -->
-+        <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="cartAddSimpleProduct2ToCart">
-+            <argument name="productQty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Navigate to product 3 on store front -->
-+        <amOnPage url="{{StorefrontProductPage.url($createProduct3.name$)}}" stepKey="goToProductPage3"/>
-+
-+        <!-- Add product 3 to cart with no custom option -->
-+        <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="cartAddSimpleProduct3ToCart">
-+            <argument name="productQty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert sub total on mini shopping cart -->
-+        <actionGroup ref="AssertSubTotalOnStorefrontMiniCartActionGroup" stepKey="assertSubTotalOnStorefrontMiniCart">
-+            <argument name="subTotal" value="$158.42"/>
-+        </actionGroup>
-+
-+        <!-- Navigate to checkout shipping page -->
-+        <amOnPage stepKey="navigateToShippingPage" url="{{CheckoutShippingPage.url}}"/>
-+        <waitForPageLoad stepKey="waitFoCheckoutShippingPageLoad"/>
-+
-+        <!-- Fill Shipping information -->
-+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="fillOrderShippingInfo">
-+            <argument name="customerVar" value="Simple_US_Customer"/>
-+            <argument name="customerAddressVar" value="US_Address_TX"/>
-+        </actionGroup>
-+
-+        <!-- Verify order summary on payment page -->
-+        <actionGroup ref="VerifyCheckoutPaymentOrderSummaryActionGroup" stepKey="verifyCheckoutPaymentOrderSummaryActionGroup">
-+            <argument name="orderSummarySubTotal" value="$158.42"/>
-+            <argument name="orderSummaryShippingTotal" value="$15.00"/>
-+            <argument name="orderSummaryTotal" value="$173.42"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml
-new file mode 100644
-index 00000000000..e3eac52a8d4
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml
-@@ -0,0 +1,88 @@
-+<?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="CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest">
-+        <annotations>
-+            <features value="Persistent"/>
-+            <stories value="Check the price"/>
-+            <title value="Verify that Catalog Price Rule and Customer Group Membership are persisted under long-term cookie"/>
-+            <description value="Verify that Catalog Price Rule and Customer Group Membership are persisted under long-term cookie"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-69455"/>
-+            <group value="persistent"/>
-+            <skip>
-+                <issueId value="MC-5777"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
-+            <createData entity="PersistentLogoutClearDisable" stepKey="persistentLogoutClearDisable"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">50</field>
-+            </createData>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer">
-+                <field key="group_id">1</field>
-+            </createData>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <!--Create Catalog Rule-->
-+            <actionGroup ref="newCatalogPriceRuleByUIWithConditionIsCategory" stepKey="createCatalogPriceRule">
-+                <argument name="catalogRule" value="_defaultCatalogRule"/>
-+                <argument name="categoryId" value="$$createCategory.id$$"/>
-+            </actionGroup>
-+            <actionGroup ref="selectGeneralCustomerGroupActionGroup" stepKey="selectCustomerGroup"/>
-+            <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="clickSaveAndApplyRules"/>
-+            <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccess"/>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <!-- Delete the rule -->
-+            <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToCatalogPriceRulePage"/>
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
-+                <argument name="name" value="{{_defaultCatalogRule.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
-+            <createData entity="PersistentLogoutClearEnabled" stepKey="persistentLogoutClearEnabled"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+        </after>
-+
-+        <!--Go to category and check price-->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByNumber('1')}}" userInput="$$createProduct.price$$" stepKey="checkPriceSimpleProduct"/>
-+
-+        <!--Login to storefront from customer and check price-->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="logInFromCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage2"/>
-+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductSpecialPriceByNumber('1')}}" userInput="45.00" stepKey="checkPriceSimpleProduct2"/>
-+
-+        <!--Click *Sign Out* and check the price of the Simple Product-->
-+        <actionGroup ref="StorefrontSignOutActionGroup" stepKey="storefrontSignOut"/>
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage3"/>
-+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome2"/>
-+        <seeElement selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="checkLinkNotYoy"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductSpecialPriceByNumber('1')}}" userInput="45.00" stepKey="checkPriceSimpleProduct3"/>
-+
-+        <!--Click the *Not you?* link and check the price for Simple Product-->
-+        <click selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="clickNext"/>
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage4"/>
-+        <see userInput="Default welcome msg!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome3"/>
-+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByNumber('1')}}" userInput="$$createProduct.price$$" stepKey="checkPriceSimpleProduct4"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/DeleteCustomerGroupTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/DeleteCustomerGroupTest.xml
-new file mode 100644
-index 00000000000..75223fcfc4c
---- /dev/null
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/DeleteCustomerGroupTest.xml
-@@ -0,0 +1,17 @@
-+<?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="DeleteCustomerGroupTest">
-+        <actionGroup ref="AdminOpenNewCatalogPriceRuleFormPageActionGroup" stepKey="openNewCatalogPriceRuleForm" />
-+        <actionGroup ref="AssertCustomerGroupNotOnCatalogPriceRuleFormActionGroup" stepKey="assertCustomerGroupNotOnCatalogPriceRuleForm">
-+            <argument name="customerGroup" value="$$customerGroup$$" />
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
-index 64f19cb3ca8..22fcf6870c1 100644
---- a/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
-+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontInactiveCatalogRuleTest">
-         <annotations>
-             <features value="CatalogRule"/>
-@@ -17,6 +17,9 @@
-             <severity value="CRITICAL"/>
-             <testCaseId value="MC-79"/>
-             <group value="CatalogRule"/>
-+            <skip>
-+                <issueId value="MC-5777"/>
-+            </skip>
-         </annotations>
-         <before>
-             <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-@@ -54,6 +57,7 @@
-         <!-- Verify price is not discounted in the cart -->
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
-         <waitForPageLoad stepKey="waitForCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
-         <waitForPageLoad stepKey="waitForCheckout"/>
-         <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$$createProduct.price$$" stepKey="seePrice3"/>
-diff --git a/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php b/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php
-index 6178d51644f..f969b342f82 100644
---- a/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php
-+++ b/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php
-@@ -24,13 +24,16 @@ class DeleteButtonTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $registryMock;
- 
-+    /**
-+     * @inheritDoc
-+     */
-     protected function setUp()
-     {
-         $this->urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class);
-         $this->registryMock = $this->createMock(\Magento\Framework\Registry::class);
-         $contextMock = $this->createMock(\Magento\Backend\Block\Widget\Context::class);
- 
--        $contextMock->expects($this->once())->method('getUrlBuilder')->willReturn($this->urlBuilderMock);
-+        $contextMock->expects($this->any())->method('getUrlBuilder')->willReturn($this->urlBuilderMock);
- 
-         $this->model = new \Magento\CatalogRule\Block\Adminhtml\Edit\DeleteButton(
-             $contextMock,
-@@ -38,33 +41,9 @@ class DeleteButtonTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testGetButtonData()
--    {
--        $ruleId = 42;
--        $deleteUrl = 'http://magento.com/rule/delete/' . $ruleId;
--        $ruleMock = new \Magento\Framework\DataObject(['id' => $ruleId]);
--
--        $this->registryMock->expects($this->once())
--            ->method('registry')
--            ->with(RegistryConstants::CURRENT_CATALOG_RULE_ID)
--            ->willReturn($ruleMock);
--        $this->urlBuilderMock->expects($this->once())
--            ->method('getUrl')
--            ->with('*/*/delete', ['id' => $ruleId])
--            ->willReturn($deleteUrl);
--
--        $data = [
--            'label' => __('Delete Rule'),
--            'class' => 'delete',
--            'on_click' => 'deleteConfirm(\'' . __(
--                'Are you sure you want to do this?'
--            ) . '\', \'' . $deleteUrl . '\')',
--            'sort_order' => 20,
--        ];
--
--        $this->assertEquals($data, $this->model->getButtonData());
--    }
--
-+    /**
-+     * Test empty response without a present rule.
-+     */
-     public function testGetButtonDataWithoutRule()
-     {
-         $this->assertEquals([], $this->model->getButtonData());
-diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
-index 521e4e1d598..920dcb8e1ed 100644
---- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
-+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
-@@ -144,14 +144,12 @@ class IndexBuilderTest extends \PHPUnit\Framework\TestCase
-         );
-         $this->ruleCollectionFactory = $this->createPartialMock(
-             \Magento\CatalogRule\Model\ResourceModel\Rule\CollectionFactory::class,
--            ['create', 'addFieldToFilter']
-+            ['create']
-         );
-         $this->backend = $this->createMock(\Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend::class);
-         $this->select = $this->createMock(\Magento\Framework\DB\Select::class);
-         $this->metadataPool = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
--        $metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadata::class)
--            ->disableOriginalConstructor()
--            ->getMock();
-+        $metadata = $this->createMock(\Magento\Framework\EntityManager\EntityMetadata::class);
-         $this->metadataPool->expects($this->any())->method('getMetadata')->willReturn($metadata);
-         $this->connection = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
-         $this->db = $this->createMock(\Zend_Db_Statement_Interface::class);
-@@ -181,10 +179,16 @@ class IndexBuilderTest extends \PHPUnit\Framework\TestCase
-         $this->rules->expects($this->any())->method('getWebsiteIds')->will($this->returnValue([1]));
-         $this->rules->expects($this->any())->method('getCustomerGroupIds')->will($this->returnValue([1]));
- 
--        $this->ruleCollectionFactory->expects($this->any())->method('create')->will($this->returnSelf());
--        $this->ruleCollectionFactory->expects($this->any())->method('addFieldToFilter')->will(
--            $this->returnValue([$this->rules])
--        );
-+        $ruleCollection = $this->createMock(\Magento\CatalogRule\Model\ResourceModel\Rule\Collection::class);
-+        $this->ruleCollectionFactory->expects($this->once())
-+            ->method('create')
-+            ->willReturn($ruleCollection);
-+        $ruleCollection->expects($this->once())
-+            ->method('addFieldToFilter')
-+            ->willReturnSelf();
-+        $ruleIterator = new \ArrayIterator([$this->rules]);
-+        $ruleCollection->method('getIterator')
-+            ->willReturn($ruleIterator);
- 
-         $this->product->expects($this->any())->method('load')->will($this->returnSelf());
-         $this->product->expects($this->any())->method('getId')->will($this->returnValue(1));
-@@ -213,19 +217,20 @@ class IndexBuilderTest extends \PHPUnit\Framework\TestCase
-             ]
-         );
- 
--        $this->reindexRuleProductPrice =
--            $this->getMockBuilder(\Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice::class)
--                ->disableOriginalConstructor()
--                ->getMock();
--        $this->reindexRuleGroupWebsite =
--            $this->getMockBuilder(\Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite::class)
--                ->disableOriginalConstructor()
--                ->getMock();
--        $this->setProperties($this->indexBuilder, [
--            'metadataPool' => $this->metadataPool,
--            'reindexRuleProductPrice' => $this->reindexRuleProductPrice,
--            'reindexRuleGroupWebsite' => $this->reindexRuleGroupWebsite
--        ]);
-+        $this->reindexRuleProductPrice = $this->createMock(
-+            \Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice::class
-+        );
-+        $this->reindexRuleGroupWebsite = $this->createMock(
-+            \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite::class
-+        );
-+        $this->setProperties(
-+            $this->indexBuilder,
-+            [
-+                'metadataPool' => $this->metadataPool,
-+                'reindexRuleProductPrice' => $this->reindexRuleProductPrice,
-+                'reindexRuleGroupWebsite' => $this->reindexRuleGroupWebsite,
-+            ]
-+        );
-     }
- 
-     /**
-diff --git a/app/code/Magento/CatalogRule/Test/Unit/Observer/AddDirtyRulesNoticeTest.php b/app/code/Magento/CatalogRule/Test/Unit/Observer/AddDirtyRulesNoticeTest.php
-index b052ccddbf6..25bae43a930 100644
---- a/app/code/Magento/CatalogRule/Test/Unit/Observer/AddDirtyRulesNoticeTest.php
-+++ b/app/code/Magento/CatalogRule/Test/Unit/Observer/AddDirtyRulesNoticeTest.php
-@@ -49,7 +49,7 @@ class AddDirtyRulesNoticeTest extends \PHPUnit\Framework\TestCase
-         $eventObserverMock->expects($this->at(0))->method('getData')->with('dirty_rules')->willReturn($flagMock);
-         $flagMock->expects($this->once())->method('getState')->willReturn(1);
-         $eventObserverMock->expects($this->at(1))->method('getData')->with('message')->willReturn($message);
--        $this->messageManagerMock->expects($this->once())->method('addNotice')->with($message);
-+        $this->messageManagerMock->expects($this->once())->method('addNoticeMessage')->with($message);
-         $this->observer->execute($eventObserverMock);
-     }
- }
-diff --git a/app/code/Magento/CatalogRule/etc/db_schema.xml b/app/code/Magento/CatalogRule/etc/db_schema.xml
-index f4c40a6930c..59082e93b04 100644
---- a/app/code/Magento/CatalogRule/etc/db_schema.xml
-+++ b/app/code/Magento/CatalogRule/etc/db_schema.xml
-@@ -9,7 +9,7 @@
-         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-     <table name="catalogrule" resource="default" engine="innodb" comment="CatalogRule">
-         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
-         <column xsi:type="text" name="description" nullable="true" comment="Description"/>
-         <column xsi:type="date" name="from_date" comment="From"/>
-@@ -23,12 +23,12 @@
-         <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Sort Order"/>
-         <column xsi:type="varchar" name="simple_action" nullable="true" length="32" comment="Simple Action"/>
--        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="discount_amount" scale="6" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Discount Amount"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_id"/>
-         </constraint>
--        <index name="CATALOGRULE_IS_ACTIVE_SORT_ORDER_TO_DATE_FROM_DATE" indexType="btree">
-+        <index referenceId="CATALOGRULE_IS_ACTIVE_SORT_ORDER_TO_DATE_FROM_DATE" indexType="btree">
-             <column name="is_active"/>
-             <column name="sort_order"/>
-             <column name="to_date"/>
-@@ -39,7 +39,7 @@
-         <column xsi:type="int" name="rule_product_id" padding="10" unsigned="true" nullable="false" identity="true"
-                 comment="Rule Product Id"/>
-         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
--                comment="Rule Id"/>
-+                comment="Rule ID"/>
-         <column xsi:type="int" name="from_time" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="From Time"/>
-         <column xsi:type="int" name="to_time" padding="10" unsigned="true" nullable="false" identity="false" default="0"
-@@ -49,7 +49,7 @@
-                 default="0" comment="Product Id"/>
-         <column xsi:type="varchar" name="action_operator" nullable="true" length="10" default="to_fixed"
-                 comment="Action Operator"/>
--        <column xsi:type="decimal" name="action_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="action_amount" scale="6" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Action Amount"/>
-         <column xsi:type="smallint" name="action_stop" padding="6" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Action Stop"/>
-@@ -57,10 +57,10 @@
-                 default="0" comment="Sort Order"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_product_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="UNQ_EAA51B56FF092A0DCB795D1CEF812B7B">
-+        <constraint xsi:type="unique" referenceId="UNQ_EAA51B56FF092A0DCB795D1CEF812B7B">
-             <column name="rule_id"/>
-             <column name="from_time"/>
-             <column name="to_time"/>
-@@ -69,19 +69,19 @@
-             <column name="product_id"/>
-             <column name="sort_order"/>
-         </constraint>
--        <index name="CATALOGRULE_PRODUCT_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
--        <index name="CATALOGRULE_PRODUCT_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="CATALOGRULE_PRODUCT_FROM_TIME" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_FROM_TIME" indexType="btree">
-             <column name="from_time"/>
-         </index>
--        <index name="CATALOGRULE_PRODUCT_TO_TIME" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_TO_TIME" indexType="btree">
-             <column name="to_time"/>
-         </index>
--        <index name="CATALOGRULE_PRODUCT_PRODUCT_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-@@ -92,84 +92,86 @@
-         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="true" identity="false"/>
-         <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Product Id"/>
--        <column xsi:type="decimal" name="rule_price" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="rule_price" scale="6" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Rule Price"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website Id"/>
-         <column xsi:type="date" name="latest_start_date" comment="Latest StartDate"/>
-         <column xsi:type="date" name="earliest_end_date" comment="Earliest EndDate"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_product_price_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="CATRULE_PRD_PRICE_RULE_DATE_WS_ID_CSTR_GROUP_ID_PRD_ID">
-+        <constraint xsi:type="unique" referenceId="CATRULE_PRD_PRICE_RULE_DATE_WS_ID_CSTR_GROUP_ID_PRD_ID">
-             <column name="rule_date"/>
-             <column name="website_id"/>
-             <column name="customer_group_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <index name="CATALOGRULE_PRODUCT_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
--        <index name="CATALOGRULE_PRODUCT_PRICE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_PRICE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="CATALOGRULE_PRODUCT_PRICE_PRODUCT_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_PRICE_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-     <table name="catalogrule_group_website" resource="default" engine="innodb" comment="CatalogRule Group Website">
-         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
--                comment="Rule Id"/>
-+                comment="Rule ID"/>
-         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Customer Group Id"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Website Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-         </constraint>
--        <index name="CATALOGRULE_GROUP_WEBSITE_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_GROUP_WEBSITE_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
--        <index name="CATALOGRULE_GROUP_WEBSITE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_GROUP_WEBSITE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-     <table name="catalogrule_website" resource="default" engine="innodb" comment="Catalog Rules To Websites Relations">
--        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"/>
-+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
-+                comment="Rule ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_id"/>
-             <column name="website_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CATALOGRULE_WEBSITE_RULE_ID_CATALOGRULE_RULE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOGRULE_WEBSITE_RULE_ID_CATALOGRULE_RULE_ID"
-                     table="catalogrule_website" column="rule_id" referenceTable="catalogrule" referenceColumn="rule_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOGRULE_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOGRULE_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-                     table="catalogrule_website" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <index name="CATALOGRULE_WEBSITE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_WEBSITE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-     <table name="catalogrule_customer_group" resource="default" engine="innodb"
-            comment="Catalog Rules To Customer Groups Relations">
--        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"/>
-+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
-+                comment="Rule ID"/>
-         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Customer Group Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_id"/>
-             <column name="customer_group_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CATALOGRULE_CUSTOMER_GROUP_RULE_ID_CATALOGRULE_RULE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOGRULE_CUSTOMER_GROUP_RULE_ID_CATALOGRULE_RULE_ID"
-                     table="catalogrule_customer_group" column="rule_id" referenceTable="catalogrule"
-                     referenceColumn="rule_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATRULE_CSTR_GROUP_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
-+        <constraint xsi:type="foreign" referenceId="CATRULE_CSTR_GROUP_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
-                     table="catalogrule_customer_group" column="customer_group_id" referenceTable="customer_group"
-                     referenceColumn="customer_group_id" onDelete="CASCADE"/>
--        <index name="CATALOGRULE_CUSTOMER_GROUP_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_CUSTOMER_GROUP_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
-     </table>
-@@ -177,7 +179,7 @@
-         <column xsi:type="int" name="rule_product_id" padding="10" unsigned="true" nullable="false" identity="true"
-                 comment="Rule Product Id"/>
-         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
--                comment="Rule Id"/>
-+                comment="Rule ID"/>
-         <column xsi:type="int" name="from_time" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="From Time"/>
-         <column xsi:type="int" name="to_time" padding="10" unsigned="true" nullable="false" identity="false" default="0"
-@@ -187,7 +189,7 @@
-                 default="0" comment="Product Id"/>
-         <column xsi:type="varchar" name="action_operator" nullable="true" default="to_fixed" length="10"
-                 comment="Action Operator"/>
--        <column xsi:type="decimal" name="action_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="action_amount" scale="6" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Action Amount"/>
-         <column xsi:type="smallint" name="action_stop" padding="6" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Action Stop"/>
-@@ -195,10 +197,10 @@
-                 default="0" comment="Sort Order"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_product_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="UNQ_EAA51B56FF092A0DCB795D1CEF812B7B">
-+        <constraint xsi:type="unique" referenceId="UNQ_EAA51B56FF092A0DCB795D1CEF812B7B">
-             <column name="rule_id"/>
-             <column name="from_time"/>
-             <column name="to_time"/>
-@@ -207,19 +209,19 @@
-             <column name="product_id"/>
-             <column name="sort_order"/>
-         </constraint>
--        <index name="CATALOGRULE_PRODUCT_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
--        <index name="CATALOGRULE_PRODUCT_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="CATALOGRULE_PRODUCT_FROM_TIME" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_FROM_TIME" indexType="btree">
-             <column name="from_time"/>
-         </index>
--        <index name="CATALOGRULE_PRODUCT_TO_TIME" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_TO_TIME" indexType="btree">
-             <column name="to_time"/>
-         </index>
--        <index name="CATALOGRULE_PRODUCT_PRODUCT_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-@@ -231,48 +233,48 @@
-         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="true" identity="false"/>
-         <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Product Id"/>
--        <column xsi:type="decimal" name="rule_price" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="rule_price" scale="6" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Rule Price"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website Id"/>
-         <column xsi:type="date" name="latest_start_date" comment="Latest StartDate"/>
-         <column xsi:type="date" name="earliest_end_date" comment="Earliest EndDate"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_product_price_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="CATRULE_PRD_PRICE_RULE_DATE_WS_ID_CSTR_GROUP_ID_PRD_ID">
-+        <constraint xsi:type="unique" referenceId="CATRULE_PRD_PRICE_RULE_DATE_WS_ID_CSTR_GROUP_ID_PRD_ID">
-             <column name="rule_date"/>
-             <column name="website_id"/>
-             <column name="customer_group_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <index name="CATALOGRULE_PRODUCT_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
--        <index name="CATALOGRULE_PRODUCT_PRICE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_PRICE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="CATALOGRULE_PRODUCT_PRICE_PRODUCT_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_PRODUCT_PRICE_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-     <table name="catalogrule_group_website_replica" resource="default" engine="innodb"
-            comment="CatalogRule Group Website">
-         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
--                comment="Rule Id"/>
-+                comment="Rule ID"/>
-         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Customer Group Id"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Website Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-         </constraint>
--        <index name="CATALOGRULE_GROUP_WEBSITE_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_GROUP_WEBSITE_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
--        <index name="CATALOGRULE_GROUP_WEBSITE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CATALOGRULE_GROUP_WEBSITE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/CatalogRule/etc/mview.xml b/app/code/Magento/CatalogRule/etc/mview.xml
-index 35efe33461a..9e5a1c866a8 100644
---- a/app/code/Magento/CatalogRule/etc/mview.xml
-+++ b/app/code/Magento/CatalogRule/etc/mview.xml
-@@ -16,7 +16,6 @@
-             <table name="catalog_product_entity" entity_column="entity_id" />
-             <table name="catalog_product_entity_datetime" entity_column="entity_id" />
-             <table name="catalog_product_entity_decimal" entity_column="entity_id" />
--            <table name="catalog_product_entity_gallery" entity_column="entity_id" />
-             <table name="catalog_product_entity_int" entity_column="entity_id" />
-             <table name="catalog_product_entity_text" entity_column="entity_id" />
-             <table name="catalog_product_entity_tier_price" entity_column="entity_id" />
-diff --git a/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_block.xml b/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_block.xml
-index 99d64ed7a63..f38f6e0fcd8 100644
---- a/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_block.xml
-+++ b/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="promo.catalog.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">promo_catalog_grid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\CatalogRule\Model\ResourceModel\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\CatalogRule\Model\ResourceModel\Grid\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">name</argument>
-                     <argument name="default_dir" xsi:type="string">ASC</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-diff --git a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
-index 1798b111242..1c3eedf43b2 100644
---- a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
-+++ b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
-@@ -4,17 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**@var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset $block */
- ?>
- <?php $_element = $block->getElement() ?>
- <?php $_jsObjectName = $block->getFieldSetId() != null ? $block->getFieldSetId() : $_element->getHtmlId() ?>
- <div class="rule-tree">
--    <fieldset id="<?= /* @escapeNotVerified */ $_jsObjectName ?>" <?= /* @escapeNotVerified */ $_element->serialize(['class']) ?> class="fieldset">
--        <legend class="legend"><span><?= /* @escapeNotVerified */ $_element->getLegend() ?></span></legend>
-+    <fieldset id="<?= $block->escapeHtmlAttr($_jsObjectName) ?>" <?= /* @noEscape */ $_element->serialize(['class']) ?> class="fieldset">
-+        <legend class="legend"><span><?= $block->escapeHtml($_element->getLegend()) ?></span></legend>
-         <br>
--    <?php if ($_element->getComment()): ?>
-+    <?php if ($_element->getComment()) : ?>
-         <div class="messages">
-             <div class="message message-notice"><?= $block->escapeHtml($_element->getComment()) ?></div>
-         </div>
-@@ -30,9 +28,9 @@ require([
-     "prototype"
- ], function(VarienRulesForm){
- 
--window.<?= /* @escapeNotVerified */ $_jsObjectName ?> = new VarienRulesForm('<?= /* @escapeNotVerified */ $_jsObjectName ?>', '<?= /* @escapeNotVerified */ $block->getNewChildUrl() ?>');
--<?php if ($_element->getReadonly()): ?>
--    <?= $_element->getHtmlId() ?>.setReadonly(true);
-+window.<?= /* @noEscape */ $_jsObjectName ?> = new VarienRulesForm('<?= /* @noEscape */ $_jsObjectName ?>', '<?= /* @noEscape */ $block->getNewChildUrl() ?>');
-+<?php if ($_element->getReadonly()) : ?>
-+    <?= /* @noEscape */ $_element->getHtmlId() ?>.setReadonly(true);
- <?php endif; ?>
- 
- });
-diff --git a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml
-index 1572c8f0d4e..5aaa22305a1 100644
---- a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml
-+++ b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div class="entry-edit rule-tree">
- <?= $block->getFormHtml() ?>
-diff --git a/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml b/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml
-index fb34a3ac4bb..8174434a06c 100644
---- a/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml
-+++ b/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml
-@@ -136,7 +136,7 @@
-                 </validation>
-                 <dataType>number</dataType>
-                 <tooltip>
--                    <link>http://docs.magento.com/m2/ce/user_guide/configuration/scope.html</link>
-+                    <link>https://docs.magento.com/m2/ce/user_guide/configuration/scope.html</link>
-                     <description>What is this?</description>
-                 </tooltip>
-                 <label translate="true">Websites</label>
-diff --git a/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/ActionGroup/StorefrontAssertCatalogPriceRuleAppliedToProductOptionActionGroup.xml b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/ActionGroup/StorefrontAssertCatalogPriceRuleAppliedToProductOptionActionGroup.xml
-new file mode 100644
-index 00000000000..4345d575a33
---- /dev/null
-+++ b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/ActionGroup/StorefrontAssertCatalogPriceRuleAppliedToProductOptionActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertCatalogPriceRuleAppliedToProductOptionActionGroup">
-+        <arguments>
-+            <argument name="option" type="string"/>
-+            <argument name="expectedPrice" type="string"/>
-+        </arguments>
-+        <selectOption userInput="{{option}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption"/>
-+        <see userInput="{{expectedPrice}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seeProductPrice"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/ActionGroup/StorefrontAssertUpdatedProductPriceInStorefrontProductPageActionGroup.xml b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/ActionGroup/StorefrontAssertUpdatedProductPriceInStorefrontProductPageActionGroup.xml
-new file mode 100644
-index 00000000000..56480583af7
---- /dev/null
-+++ b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/ActionGroup/StorefrontAssertUpdatedProductPriceInStorefrontProductPageActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertUpdatedProductPriceInStorefrontProductPageActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+            <argument name="expectedPrice" type="string"/>
-+        </arguments>
-+        <seeInTitle userInput="{{productName}}" stepKey="assertProductNameTitle"/>
-+        <see userInput="{{productName}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
-+        <see userInput="{{expectedPrice}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithAssignedSimpleProductsTest.xml b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithAssignedSimpleProductsTest.xml
-new file mode 100644
-index 00000000000..3e700b5bcfb
---- /dev/null
-+++ b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithAssignedSimpleProductsTest.xml
-@@ -0,0 +1,268 @@
-+<?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="AdminApplyCatalogRuleForConfigurableProductWithAssignedSimpleProductsTest">
-+        <annotations>
-+            <features value="CatalogRuleConfigurable"/>
-+            <stories value="Apply catalog price rule"/>
-+            <title value="Apply catalog rule for configurable product with assigned simple products"/>
-+            <description value="Admin should be able to apply catalog rule for configurable product with assigned simple products"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14063"/>
-+            <group value="catalogRuleConfigurable"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Create category for first configurable product -->
-+            <createData entity="SimpleSubCategory" stepKey="firstSimpleCategory"/>
-+
-+            <!-- Create first configurable product with two options -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createFirstConfigProduct">
-+                <requiredEntity createDataKey="firstSimpleCategory"/>
-+            </createData>
-+
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createFirstConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createFirstConfigProductAttributeFirstOption">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createFirstConfigProductAttributeSecondOption">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+            </createData>
-+
-+            <createData entity="AddToDefaultSet" stepKey="addFirstProductToAttributeSet">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+            </createData>
-+
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getFirstConfigAttributeFirstOption">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getFirstConfigAttributeSecondOption">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create two child products for first configurable product -->
-+            <createData entity="ApiSimpleOne" stepKey="createFirstConfigFirstChildProduct">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getFirstConfigAttributeFirstOption"/>
-+            </createData>
-+
-+            <createData entity="ApiSimpleOne" stepKey="createFirstConfigSecondChildProduct">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getFirstConfigAttributeSecondOption"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createFirstConfigProductOption">
-+                <requiredEntity createDataKey="createFirstConfigProduct"/>
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getFirstConfigAttributeFirstOption"/>
-+                <requiredEntity createDataKey="getFirstConfigAttributeSecondOption"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductAddChild" stepKey="createFirstConfigProductAddFirstChild">
-+                <requiredEntity createDataKey="createFirstConfigProduct"/>
-+                <requiredEntity createDataKey="createFirstConfigFirstChildProduct"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createFirstConfigProductAddSecondChild">
-+                <requiredEntity createDataKey="createFirstConfigProduct"/>
-+                <requiredEntity createDataKey="createFirstConfigSecondChildProduct"/>
-+            </createData>
-+
-+            <!-- Add customizable options to first product -->
-+            <updateData createDataKey="createFirstConfigProduct" entity="productWithOptionRadiobutton" stepKey="updateFirstProductWithOption"/>
-+
-+            <!-- Create category for second configurable product -->
-+            <createData entity="SimpleSubCategory" stepKey="secondSimpleCategory"/>
-+
-+            <!-- Create second configurable product with two options -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createSecondConfigProduct">
-+                <requiredEntity createDataKey="secondSimpleCategory"/>
-+            </createData>
-+
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createSecondConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createSecondConfigProductAttributeFirstOption">
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createSecondConfigProductAttributeSecondOption">
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+            </createData>
-+
-+            <createData entity="AddToDefaultSet" stepKey="addSecondProductToAttributeSet">
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+            </createData>
-+
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getSecondConfigAttributeFirstOption">
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getSecondConfigAttributeSecondOption">
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create two child products for second configurable product -->
-+            <createData entity="ApiSimpleOne" stepKey="createSecondConfigFirstChildProduct">
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getSecondConfigAttributeFirstOption"/>
-+            </createData>
-+
-+            <createData entity="ApiSimpleOne" stepKey="createSecondConfigSecondChildProduct">
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getSecondConfigAttributeSecondOption"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createSecondConfigProductOption">
-+                <requiredEntity createDataKey="createSecondConfigProduct"/>
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getSecondConfigAttributeFirstOption"/>
-+                <requiredEntity createDataKey="getSecondConfigAttributeSecondOption"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductAddChild" stepKey="createSecondConfigProductAddFirstChild">
-+                <requiredEntity createDataKey="createSecondConfigProduct"/>
-+                <requiredEntity createDataKey="createSecondConfigFirstChildProduct"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createSecondConfigProductAddSecondChild">
-+                <requiredEntity createDataKey="createSecondConfigProduct"/>
-+                <requiredEntity createDataKey="createSecondConfigSecondChildProduct"/>
-+            </createData>
-+
-+            <!-- Add customizable options to second product -->
-+            <updateData createDataKey="createSecondConfigProduct" entity="productWithOptionRadiobutton" stepKey="updateSecondProductWithOption"/>
-+
-+             <!--Create customer group -->
-+            <createData entity="CustomCustomerGroup" stepKey="customerGroup"/>
-+
-+            <!-- Create Customer -->
-+            <createData entity="SimpleUsCustomerWithNewCustomerGroup" stepKey="createCustomer">
-+                <requiredEntity createDataKey="customerGroup" />
-+            </createData>
-+
-+            <!-- Login as Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <!-- Customer log out -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+
-+            <!-- Delete created data -->
-+            <deleteData createDataKey="createFirstConfigProduct" stepKey="deleteFirstConfigProduct"/>
-+            <deleteData createDataKey="createFirstConfigFirstChildProduct" stepKey="deleteFirstConfigFirstChildProduct"/>
-+            <deleteData createDataKey="createFirstConfigSecondChildProduct" stepKey="deleteFirstConfigSecondChildProduct"/>
-+            <deleteData createDataKey="createFirstConfigProductAttribute" stepKey="deleteFirstConfigProductAttribute"/>
-+            <deleteData createDataKey="firstSimpleCategory" stepKey="deleteFirstSimpleCategory"/>
-+
-+            <deleteData createDataKey="createSecondConfigProduct" stepKey="deleteSecondConfigProduct"/>
-+            <deleteData createDataKey="createSecondConfigFirstChildProduct" stepKey="deleteSecondConfigFirstChildProduct"/>
-+            <deleteData createDataKey="createSecondConfigSecondChildProduct" stepKey="deleteSecondConfigSecondChildProduct"/>
-+            <deleteData createDataKey="createSecondConfigProductAttribute" stepKey="deleteSecondConfigProductAttribute"/>
-+            <deleteData createDataKey="secondSimpleCategory" stepKey="deleteSimpleCategory"/>
-+
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="customerGroup" stepKey="deleteCustomerGroup"/>
-+
-+            <!-- Delete created price rules -->
-+            <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRuleForFirstOption">
-+                <argument name="name" value="{{CatalogRuleToFixed.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <!-- Admin log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Create price rule -->
-+        <actionGroup ref="newCatalogPriceRuleByUI" stepKey="createPriceRule">
-+            <argument name="catalogRule" value="CatalogRuleToFixed"/>
-+        </actionGroup>
-+        <actionGroup ref="CatalogSelectCustomerGroupActionGroup" stepKey="addCustomerGroup">
-+            <argument name="customerGroupName" value="$$customerGroup.code$$"/>
-+        </actionGroup>
-+
-+        <!-- Save price rule -->
-+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="clickSaveAndApplyRule"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccessMessage"/>
-+
-+        <!-- Run full reindex and clear caches -->
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!-- Login to storefront from customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="logInFromCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert first product in category -->
-+        <amOnPage url="$$firstSimpleCategory.name$$.html" stepKey="goToFirstCategoryPageStorefront"/>
-+        <waitForPageLoad stepKey="waitForFirstCategoryPageLoad"/>
-+        <actionGroup ref="StorefrontCheckCategoryConfigurableProductWithUpdatedPriceActionGroup" stepKey="checkFirstProductPriceInCategory">
-+            <argument name="productName" value="$$createFirstConfigProduct.name$$"/>
-+            <argument name="expectedPrice" value="{{CatalogRuleToFixed.discount_amount}}"/>
-+        </actionGroup>
-+
-+        <!-- Assert second product in category -->
-+        <amOnPage url="$$secondSimpleCategory.name$$.html" stepKey="goToSecondCategoryPageStorefront"/>
-+        <waitForPageLoad stepKey="waitForSecondCategoryPageLoad"/>
-+        <actionGroup ref="StorefrontCheckCategoryConfigurableProductWithUpdatedPriceActionGroup" stepKey="checkSecondProductPriceInCategory">
-+            <argument name="productName" value="$$createSecondConfigProduct.name$$"/>
-+            <argument name="expectedPrice" value="{{CatalogRuleToFixed.discount_amount}}"/>
-+        </actionGroup>
-+
-+        <!-- Assert first product in storefront product page -->
-+        <amOnPage url="$$createFirstConfigProduct.custom_attributes[url_key]$$.html" stepKey="amOnFirstProductPage"/>
-+        <waitForPageLoad stepKey="waitForFirstProductPageLoad"/>
-+        <actionGroup ref="StorefrontAssertUpdatedProductPriceInStorefrontProductPageActionGroup" stepKey="checkFirstProductPriceInStorefrontProductPage">
-+            <argument name="productName" value="$$createFirstConfigProduct.name$$"/>
-+            <argument name="expectedPrice" value="{{CatalogRuleToFixed.discount_amount}}"/>
-+        </actionGroup>
-+
-+        <!-- Add first product with selected options to the cart -->
-+        <actionGroup ref="StorefrontAddProductWithSelectedConfigurableAndCustomOptionsToCartActionGroup" stepKey="addFirstProductWithSelectedOptionToCart1">
-+            <argument name="product" value="$$createFirstConfigProduct$$"/>
-+            <argument name="option" value="$$createFirstConfigProductAttributeFirstOption.option[store_labels][1][label]$$"/>
-+            <argument name="customizableOption" value="{{ProductOptionValueRadioButtons1.title}}"/>
-+        </actionGroup>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.updatedPrice}}" stepKey="grabForthProductUpdatedPrice1"/>
-+
-+        <actionGroup ref="StorefrontAddProductWithSelectedConfigurableAndCustomOptionsToCartActionGroup" stepKey="addFirstProductWithSelectedOptionToCart2">
-+            <argument name="product" value="$$createFirstConfigProduct$$"/>
-+            <argument name="option" value="$$createFirstConfigProductAttributeSecondOption.option[store_labels][1][label]$$"/>
-+            <argument name="customizableOption" value="{{ProductOptionValueRadioButtons3.title}}"/>
-+        </actionGroup>
-+
-+        <!-- Assert second product in storefront product page -->
-+        <amOnPage url="$$createSecondConfigProduct.custom_attributes[url_key]$$.html" stepKey="amOnSecondProductPage"/>
-+        <waitForPageLoad stepKey="waitForSecondProductPageLoad"/>
-+        <actionGroup ref="StorefrontAssertUpdatedProductPriceInStorefrontProductPageActionGroup" stepKey="checkSecondProductPriceInStorefrontProductPage">
-+            <argument name="productName" value="$$createSecondConfigProduct.name$$"/>
-+            <argument name="expectedPrice" value="{{CatalogRuleToFixed.discount_amount}}"/>
-+        </actionGroup>
-+
-+        <!-- Add second product with selected options to the cart -->
-+        <actionGroup ref="StorefrontAddProductWithSelectedConfigurableAndCustomOptionsToCartActionGroup" stepKey="addSecondProductWithSelectedOptionToCart1">
-+            <argument name="product" value="$$createSecondConfigProduct$$"/>
-+            <argument name="option" value="$$createSecondConfigProductAttributeFirstOption.option[store_labels][1][label]$$"/>
-+            <argument name="customizableOption" value="{{ProductOptionValueRadioButtons1.title}}"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontAddProductWithSelectedConfigurableAndCustomOptionsToCartActionGroup" stepKey="addSecondProductWithSelectedOptionToCart2">
-+            <argument name="product" value="$$createSecondConfigProduct$$"/>
-+            <argument name="option" value="$$createSecondConfigProductAttributeSecondOption.option[store_labels][1][label]$$"/>
-+            <argument name="customizableOption" value="{{ProductOptionValueRadioButtons3.title}}"/>
-+        </actionGroup>
-+
-+        <!--Assert products prices in the cart -->
-+        <amOnPage url="/checkout/cart/" stepKey="amOnShoppingCartPage"/>
-+        <waitForPageLoad stepKey="waitForShoppingCartPageLoad"/>
-+        <see userInput="$210.69" selector="{{CheckoutCartProductSection.ProductPriceByOption($$createFirstConfigProductAttributeFirstOption.option[store_labels][1][label]$$)}}" stepKey="assertFirstProductPriceForFirstProductOption"/>
-+        <see userInput="$120.70" selector="{{CheckoutCartProductSection.ProductPriceByOption($$createFirstConfigProductAttributeSecondOption.option[store_labels][1][label]$$)}}" stepKey="assertFirstProductPriceForSecondProductOption"/>
-+        <see userInput="$210.69" selector="{{CheckoutCartProductSection.ProductPriceByOption($$createSecondConfigProductAttributeFirstOption.option[store_labels][1][label]$$)}}" stepKey="assertSecondProductPriceForFirstProductOption"/>
-+        <see userInput="$120.70" selector="{{CheckoutCartProductSection.ProductPriceByOption($$createSecondConfigProductAttributeSecondOption.option[store_labels][1][label]$$)}}" stepKey="assertSecondProductPriceForSecondProductOption"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithOptionsTest.xml b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithOptionsTest.xml
-new file mode 100644
-index 00000000000..e53e51c626a
---- /dev/null
-+++ b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithOptionsTest.xml
-@@ -0,0 +1,221 @@
-+<?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="AdminApplyCatalogRuleForConfigurableProductWithOptionsTest">
-+        <annotations>
-+            <features value="CatalogRuleConfigurable"/>
-+            <stories value="Apply catalog price rule"/>
-+            <title value="Apply catalog price rule for configurable product with options"/>
-+            <description value="Admin should be able to apply the catalog rule for configurable product with options"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14062"/>
-+            <group value="catalogRuleConfigurable"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="simpleCategory"/>
-+
-+            <!-- Create configurable product with three options -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="simpleCategory"/>
-+            </createData>
-+
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeFirstOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeSecondOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeThirdOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeFirstOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeSecondOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeThirdOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create three child products -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigFirstChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
-+            </createData>
-+
-+            <createData entity="ApiSimpleOne" stepKey="createConfigSecondChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
-+            </createData>
-+
-+            <createData entity="ApiSimpleOne" stepKey="createConfigThirdChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeThirdOption"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
-+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
-+                <requiredEntity createDataKey="getConfigAttributeThirdOption"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddFirstChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigFirstChildProduct"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddSecondChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigSecondChildProduct"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddThirdChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigThirdChildProduct"/>
-+            </createData>
-+
-+            <!-- Login as Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <!-- Delete created data -->
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigFirstChildProduct" stepKey="deleteFirstSimpleProduct"/>
-+            <deleteData createDataKey="createConfigSecondChildProduct" stepKey="deleteSecondSimpleProduct"/>
-+            <deleteData createDataKey="createConfigThirdChildProduct" stepKey="deleteThirdSimpleProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete created price rules -->
-+            <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRuleForFirstOption">
-+                <argument name="name" value="{{CatalogRuleToFixed.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRuleForSecondOption">
-+                <argument name="name" value="{{_defaultCatalogRule.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRuleForThirdOption">
-+                <argument name="name" value="{{CatalogRuleWithoutDiscount.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create price rule for first configurable product option -->
-+        <actionGroup ref="newCatalogPriceRuleByUI" stepKey="createFirstPriceRule">
-+            <argument name="catalogRule" value="CatalogRuleToFixed"/>
-+        </actionGroup>
-+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroupForFirstPriceRule"/>
-+        <actionGroup ref="CreateCatalogPriceRuleConditionWithAttributeAndOptionActionGroup" stepKey="createFirstCatalogPriceRuleCondition">
-+            <argument name="attributeName" value="$$createConfigProductAttribute.attribute[frontend_labels][0][label]$$"/>
-+            <argument name="targetSelectValue" value="$$createConfigProductAttributeFirstOption.option[store_labels][1][label]$$"/>
-+            <argument name="indexA" value="1"/>
-+            <argument name="indexB" value="1"/>
-+        </actionGroup>
-+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApplyFirstPriceRule"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccessMessageForFirstPriceRule"/>
-+
-+        <!-- Create price rule for second configurable product option -->
-+        <actionGroup ref="newCatalogPriceRuleByUI" stepKey="createSecondPriceRule">
-+            <argument name="catalogRule" value="_defaultCatalogRule"/>
-+        </actionGroup>
-+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroupForSecondPriceRule"/>
-+        <actionGroup ref="CreateCatalogPriceRuleConditionWithAttributeAndOptionActionGroup" stepKey="createSecondCatalogPriceRuleCondition">
-+            <argument name="attributeName" value="$$createConfigProductAttribute.attribute[frontend_labels][0][label]$$"/>
-+            <argument name="targetSelectValue" value="$$createConfigProductAttributeSecondOption.option[store_labels][1][label]$$"/>
-+            <argument name="indexA" value="1"/>
-+            <argument name="indexB" value="1"/>
-+        </actionGroup>
-+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApplySecondPriceRule"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccessMessageForSecondPriceRule"/>
-+
-+        <!-- Create price rule for third configurable product option -->
-+        <actionGroup ref="newCatalogPriceRuleByUI" stepKey="createThirdPriceRule">
-+            <argument name="catalogRule" value="CatalogRuleWithoutDiscount"/>
-+        </actionGroup>
-+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroupForThirdPriceRule"/>
-+        <actionGroup ref="CreateCatalogPriceRuleConditionWithAttributeAndOptionActionGroup" stepKey="createThirdCatalogPriceRuleCondition">
-+            <argument name="attributeName" value="$$createConfigProductAttribute.attribute[frontend_labels][0][label]$$"/>
-+            <argument name="targetSelectValue" value="$$createConfigProductAttributeThirdOption.option[store_labels][1][label]$$"/>
-+            <argument name="indexA" value="1"/>
-+            <argument name="indexB" value="1"/>
-+        </actionGroup>
-+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApplyThirdPriceRule"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccessMessageForThirdPriceRule"/>
-+
-+        <!-- Run full reindex and clear caches -->
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!-- Assert product in storefront product page -->
-+        <amOnPage url="$$createConfigProduct.custom_attributes[url_key]$$.html" stepKey="amOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <actionGroup ref="StorefrontAssertUpdatedProductPriceInStorefrontProductPageActionGroup" stepKey="assertUpdatedProductPriceInStorefrontProductPage">
-+            <argument name="productName" value="$$createConfigProduct.name$$"/>
-+            <argument name="expectedPrice" value="{{CatalogRuleToFixed.discount_amount}}"/>
-+        </actionGroup>
-+
-+        <!-- Assert product options price in storefront product page -->
-+        <actionGroup ref="StorefrontAssertCatalogPriceRuleAppliedToProductOptionActionGroup" stepKey="assertCatalogPriceRuleAppliedToFirstProductOption">
-+            <argument name="option" value="$$createConfigProductAttributeFirstOption.option[store_labels][1][label]$$"/>
-+            <argument name="expectedPrice" value="{{CatalogRuleToFixed.discount_amount}}"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontAssertCatalogPriceRuleAppliedToProductOptionActionGroup" stepKey="assertCatalogPriceRuleAppliedToSecondProductOption">
-+            <argument name="option" value="$$createConfigProductAttributeSecondOption.option[store_labels][1][label]$$"/>
-+            <argument name="expectedPrice" value="$110.70"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontAssertCatalogPriceRuleAppliedToProductOptionActionGroup" stepKey="assertCatalogPriceRuleAppliedToThirdProductOption">
-+            <argument name="option" value="$$createConfigProductAttributeThirdOption.option[store_labels][1][label]$$"/>
-+            <argument name="expectedPrice" value="{{ApiConfigurableProduct.price}}"/>
-+        </actionGroup>
-+
-+        <!-- Add product with selected option to the cart -->
-+        <actionGroup ref="StorefrontAddProductWithSelectedConfigurableOptionToCartActionGroup" stepKey="addProductWithSelectedFirstOptionToCart">
-+            <argument name="product" value="$$createConfigProduct$$"/>
-+            <argument name="option" value="$$createConfigProductAttributeFirstOption.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontAddProductWithSelectedConfigurableOptionToCartActionGroup" stepKey="addProductWithSelectedSecondOptionToCart">
-+            <argument name="product" value="$$createConfigProduct$$"/>
-+            <argument name="option" value="$$createConfigProductAttributeSecondOption.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontAddProductWithSelectedConfigurableOptionToCartActionGroup" stepKey="addProductWithSelectedThirdOptionToCart">
-+            <argument name="product" value="$$createConfigProduct$$"/>
-+            <argument name="option" value="$$createConfigProductAttributeThirdOption.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+
-+        <!--Assert product price in the cart -->
-+        <amOnPage url="/checkout/cart/" stepKey="amOnShoppingCartPage"/>
-+        <waitForPageLoad stepKey="waitForShoppingCartPageLoad"/>
-+        <see userInput="{{CatalogRuleToFixed.discount_amount}}" selector="{{CheckoutCartProductSection.ProductPriceByOption($$createConfigProductAttributeFirstOption.option[store_labels][1][label]$$)}}" stepKey="assertProductPriceForFirstProductOption"/>
-+        <see userInput="$110.70" selector="{{CheckoutCartProductSection.ProductPriceByOption($$createConfigProductAttributeSecondOption.option[store_labels][1][label]$$)}}" stepKey="assertProductPriceForSecondProductOption"/>
-+        <see userInput="{{ApiConfigurableProduct.price}}" selector="{{CheckoutCartProductSection.ProductPriceByOption($$createConfigProductAttributeThirdOption.option[store_labels][1][label]$$)}}" stepKey="assertProductPriceForThirdProductOption"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
-index 4d1957991d1..681b7ecfb02 100644
---- a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
-+++ b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
-@@ -4,11 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Advanced search form
-- *
-- * @author      Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\CatalogSearch\Block\Advanced;
- 
- use Magento\CatalogSearch\Model\Advanced;
-@@ -21,6 +16,8 @@ use Magento\Framework\View\Element\Template;
- use Magento\Framework\View\Element\Template\Context;
- 
- /**
-+ * Advanced search form
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -58,7 +55,7 @@ class Form extends Template
-     }
- 
-     /**
--     * @return AbstractBlock
-+     * @inheritdoc
-      */
-     public function _prepareLayout()
-     {
-@@ -286,6 +283,8 @@ class Form extends Template
-     }
- 
-     /**
-+     * Get select block.
-+     *
-      * @return BlockInterface
-      */
-     protected function _getSelectBlock()
-@@ -299,6 +298,8 @@ class Form extends Template
-     }
- 
-     /**
-+     * Get date block.
-+     *
-      * @return BlockInterface|mixed
-      */
-     protected function _getDateBlock()
-diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Result.php b/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
-index 7c8e65b2491..9f25990594a 100644
---- a/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
-+++ b/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
-@@ -63,7 +63,7 @@ class Result extends Template
-     }
- 
-     /**
--     * @return AbstractBlock
-+     * @inheritdoc
-      */
-     protected function _prepareLayout()
-     {
-@@ -125,6 +125,8 @@ class Result extends Template
-     }
- 
-     /**
-+     * Initialize list collection.
-+     *
-      * @return void
-      */
-     public function setListCollection()
-@@ -133,6 +135,8 @@ class Result extends Template
-     }
- 
-     /**
-+     * Get product collection.
-+     *
-      * @return Collection
-      */
-     protected function _getProductCollection()
-@@ -141,6 +145,8 @@ class Result extends Template
-     }
- 
-     /**
-+     * Set search model.
-+     *
-      * @return Advanced
-      */
-     public function getSearchModel()
-@@ -149,6 +155,8 @@ class Result extends Template
-     }
- 
-     /**
-+     * Get result count.
-+     *
-      * @return mixed
-      */
-     public function getResultCount()
-@@ -161,6 +169,8 @@ class Result extends Template
-     }
- 
-     /**
-+     * Get product list HTML.
-+     *
-      * @return string
-      */
-     public function getProductListHtml()
-@@ -169,6 +179,8 @@ class Result extends Template
-     }
- 
-     /**
-+     * Get form URL.
-+     *
-      * @return string
-      */
-     public function getFormUrl()
-@@ -182,6 +194,8 @@ class Result extends Template
-     }
- 
-     /**
-+     * Get search criteria.
-+     *
-      * @return array
-      */
-     public function getSearchCriterias()
-diff --git a/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php b/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php
-index 94cb9c3c8fc..85ad66013cf 100644
---- a/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php
-+++ b/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php
-@@ -11,7 +11,7 @@ use Magento\Framework\Data\Form;
- use Magento\Framework\Data\Form\Element\Fieldset;
- 
- /**
-- * Plugin for Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front
-+ * Add Search Weight field to the product attribute add/edit tab
-  */
- class FrontTabPlugin
- {
-diff --git a/app/code/Magento/CatalogSearch/Block/SearchTermsLog.php b/app/code/Magento/CatalogSearch/Block/SearchTermsLog.php
-index 0be43ce6ff1..005c7860cfe 100644
---- a/app/code/Magento/CatalogSearch/Block/SearchTermsLog.php
-+++ b/app/code/Magento/CatalogSearch/Block/SearchTermsLog.php
-@@ -9,7 +9,7 @@ use Magento\Framework\App\ResponseInterface;
- use Magento\Framework\View\Element\Block\ArgumentInterface;
- 
- /**
-- * Class for logging search terms on cached pages
-+ * Provider of the information on whether the page is cacheable, so that AJAX-based logging of terms can be triggered
-  */
- class SearchTermsLog implements ArgumentInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php
-index b20e36016d2..4942b36743c 100644
---- a/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php
-+++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php
-@@ -6,12 +6,17 @@
-  */
- namespace Magento\CatalogSearch\Controller\Advanced;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Index extends \Magento\Framework\App\Action\Action
-+/**
-+ * Advanced search controller.
-+ */
-+class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
--     * @return \Magento\Framework\Controller\ResultInterface
-+     * @inheritdoc
-      */
-     public function execute()
-     {
-diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
-index d6a30f4f314..384132415a1 100644
---- a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
-+++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
-@@ -6,12 +6,22 @@
-  */
- namespace Magento\CatalogSearch\Controller\Advanced;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\CatalogSearch\Model\Advanced as ModelAdvanced;
- use Magento\Framework\App\Action\Context;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\UrlFactory;
- 
--class Result extends \Magento\Framework\App\Action\Action
-+/**
-+ * Advanced search result.
-+ */
-+class Result extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
- {
-+    /**
-+     * No results default handle.
-+     */
-+    const DEFAULT_NO_RESULT_HANDLE = 'catalogsearch_advanced_result_noresults';
-+
-     /**
-      * Url factory
-      *
-@@ -44,13 +54,16 @@ class Result extends \Magento\Framework\App\Action\Action
-     }
- 
-     /**
--     * @return \Magento\Framework\Controller\Result\Redirect
-+     * @inheritdoc
-      */
-     public function execute()
-     {
-         try {
-             $this->_catalogSearchAdvanced->addFilters($this->getRequest()->getQueryValue());
--            $this->_view->loadLayout();
-+            $this->_view->getPage()->initLayout();
-+            $handles = $this->_view->getLayout()->getUpdate()->getHandles();
-+            $handles[] = static::DEFAULT_NO_RESULT_HANDLE;
-+            $this->_view->loadLayout($handles);
-             $this->_view->renderLayout();
-         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-             $this->messageManager->addError($e->getMessage());
-diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
-index 22958b64d44..975c6ba1e7e 100644
---- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php
-+++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
-@@ -6,15 +6,25 @@
-  */
- namespace Magento\CatalogSearch\Controller\Result;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Catalog\Model\Layer\Resolver;
- use Magento\Catalog\Model\Session;
- use Magento\Framework\App\Action\Context;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\Search\Model\QueryFactory;
- use Magento\Search\Model\PopularSearchTerms;
- 
--class Index extends \Magento\Framework\App\Action\Action
-+/**
-+ * Search result.
-+ */
-+class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
- {
-+    /**
-+     * No results default handle.
-+     */
-+    const DEFAULT_NO_RESULT_HANDLE = 'catalogsearch_result_index_noresults';
-+
-     /**
-      * Catalog session
-      *
-@@ -85,12 +95,19 @@ class Index extends \Magento\Framework\App\Action\Action
-             $getAdditionalRequestParameters = $this->getRequest()->getParams();
-             unset($getAdditionalRequestParameters[QueryFactory::QUERY_VAR_NAME]);
- 
-+            $handles = null;
-+            if ($query->getNumResults() == 0) {
-+                $this->_view->getPage()->initLayout();
-+                $handles = $this->_view->getLayout()->getUpdate()->getHandles();
-+                $handles[] = static::DEFAULT_NO_RESULT_HANDLE;
-+            }
-+
-             if (empty($getAdditionalRequestParameters) &&
-                 $this->_objectManager->get(PopularSearchTerms::class)->isCacheable($queryText, $storeId)
-             ) {
--                $this->getCacheableResult($catalogSearchHelper, $query);
-+                $this->getCacheableResult($catalogSearchHelper, $query, $handles);
-             } else {
--                $this->getNotCacheableResult($catalogSearchHelper, $query);
-+                $this->getNotCacheableResult($catalogSearchHelper, $query, $handles);
-             }
-         } else {
-             $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
-@@ -102,9 +119,10 @@ class Index extends \Magento\Framework\App\Action\Action
-      *
-      * @param \Magento\CatalogSearch\Helper\Data $catalogSearchHelper
-      * @param \Magento\Search\Model\Query $query
-+     * @param array $handles
-      * @return void
-      */
--    private function getCacheableResult($catalogSearchHelper, $query)
-+    private function getCacheableResult($catalogSearchHelper, $query, $handles)
-     {
-         if (!$catalogSearchHelper->isMinQueryLength()) {
-             $redirect = $query->getRedirect();
-@@ -116,7 +134,7 @@ class Index extends \Magento\Framework\App\Action\Action
- 
-         $catalogSearchHelper->checkNotes();
- 
--        $this->_view->loadLayout();
-+        $this->_view->loadLayout($handles);
-         $this->_view->renderLayout();
-     }
- 
-@@ -125,11 +143,12 @@ class Index extends \Magento\Framework\App\Action\Action
-      *
-      * @param \Magento\CatalogSearch\Helper\Data $catalogSearchHelper
-      * @param \Magento\Search\Model\Query $query
-+     * @param array $handles
-      * @return void
-      *
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
--    private function getNotCacheableResult($catalogSearchHelper, $query)
-+    private function getNotCacheableResult($catalogSearchHelper, $query, $handles)
-     {
-         if ($catalogSearchHelper->isMinQueryLength()) {
-             $query->setId(0)->setIsActive(1)->setIsProcessed(1);
-@@ -144,7 +163,7 @@ class Index extends \Magento\Framework\App\Action\Action
- 
-         $catalogSearchHelper->checkNotes();
- 
--        $this->_view->loadLayout();
-+        $this->_view->loadLayout($handles);
-         $this->getResponse()->setNoCacheHeaders();
-         $this->_view->renderLayout();
-     }
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php
-index 8ca0c0eeddf..8a484d4cc79 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php
-@@ -14,6 +14,9 @@ use Magento\Framework\Search\Request\Config;
- use Magento\Framework\Search\RequestInterface;
- use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as AttributeCollection;
- 
-+/**
-+ * Aggregation resolver.
-+ */
- class AggregationResolver implements AggregationResolverInterface
- {
-     /**
-@@ -75,7 +78,7 @@ class AggregationResolver implements AggregationResolverInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(RequestInterface $request, array $documentIds)
-     {
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/AdvancedSearch.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/AdvancedSearch.php
-index 8f1f3fde142..cea42347dc3 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/AdvancedSearch.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/AdvancedSearch.php
-@@ -29,7 +29,7 @@ class AdvancedSearch implements RequestCheckerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isApplicable(RequestInterface $request)
-     {
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php
-index 01e95c4676a..42da02f8ca4 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php
-@@ -51,7 +51,7 @@ class CatalogView implements RequestCheckerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isApplicable(RequestInterface $request)
-     {
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php
-index 9e4f93b4598..75910e17207 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php
-@@ -9,6 +9,9 @@ use Magento\Framework\Search\RequestInterface;
- use Magento\Catalog\Api\CategoryRepositoryInterface;
- use Magento\Store\Model\StoreManagerInterface;
- 
-+/**
-+ * Composite request checker.
-+ */
- class RequestCheckerComposite implements RequestCheckerInterface
- {
-     /**
-@@ -53,7 +56,7 @@ class RequestCheckerComposite implements RequestCheckerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isApplicable(RequestInterface $request)
-     {
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
-index 64a776e7354..66f5ad7a719 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
-@@ -16,7 +16,14 @@ use Magento\Framework\DB\Ddl\Table;
- use Magento\Framework\DB\Select;
- use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface;
- use Magento\Framework\Search\Request\BucketInterface;
-+use Magento\Framework\Event\Manager;
- 
-+/**
-+ * Data Provider for catalog search.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class DataProvider implements DataProviderInterface
- {
-     /**
-@@ -39,12 +46,18 @@ class DataProvider implements DataProviderInterface
-      */
-     private $selectBuilderForAttribute;
- 
-+    /**
-+     * @var Manager
-+     */
-+    private $eventManager;
-+
-     /**
-      * @param Config $eavConfig
-      * @param ResourceConnection $resource
-      * @param ScopeResolverInterface $scopeResolver
-      * @param null $customerSession @deprecated
-      * @param SelectBuilderForAttribute|null $selectBuilderForAttribute
-+     * @param Manager|null $eventManager
-      *
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-@@ -53,17 +66,19 @@ class DataProvider implements DataProviderInterface
-         ResourceConnection $resource,
-         ScopeResolverInterface $scopeResolver,
-         $customerSession,
--        SelectBuilderForAttribute $selectBuilderForAttribute = null
-+        SelectBuilderForAttribute $selectBuilderForAttribute = null,
-+        Manager $eventManager = null
-     ) {
-         $this->eavConfig = $eavConfig;
-         $this->connection = $resource->getConnection();
-         $this->scopeResolver = $scopeResolver;
-         $this->selectBuilderForAttribute = $selectBuilderForAttribute
-             ?: ObjectManager::getInstance()->get(SelectBuilderForAttribute::class);
-+        $this->eventManager = $eventManager ?: ObjectManager::getInstance()->get(Manager::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDataSet(
-         BucketInterface $bucket,
-@@ -79,13 +94,17 @@ class DataProvider implements DataProviderInterface
-             'main_table.entity_id  = entities.entity_id',
-             []
-         );
-+        $this->eventManager->dispatch(
-+            'catalogsearch_query_add_filter_after',
-+            ['bucket' => $bucket, 'select' => $select]
-+        );
-         $select = $this->selectBuilderForAttribute->build($select, $attribute, $currentScope);
- 
-         return $select;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function execute(Select $select)
-     {
-@@ -93,6 +112,8 @@ class DataProvider implements DataProviderInterface
-     }
- 
-     /**
-+     * Get select.
-+     *
-      * @return Select
-      */
-     private function getSelect()
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php
-index 7ebf71f4244..26837448f2d 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php
-@@ -22,6 +22,9 @@ use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
- /**
-  * Attribute query builder
-  *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class QueryBuilder
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute.php
-index be0a9833913..00012a78d10 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute.php
-@@ -21,6 +21,9 @@ use Magento\Store\Model\Store;
- 
- /**
-  * Build select for attribute.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class SelectBuilderForAttribute
- {
-@@ -71,6 +74,8 @@ class SelectBuilderForAttribute
-     }
- 
-     /**
-+     * Build select for attribute search
-+     *
-      * @param Select $select
-      * @param AbstractAttribute $attribute
-      * @param int $currentScope
-@@ -98,7 +103,7 @@ class SelectBuilderForAttribute
-             $subSelect = $select;
-             $subSelect->from(['main_table' => $table], ['main_table.entity_id', 'main_table.value'])
-                 ->distinct()
--                ->where('main_table.attribute_id = ?', $attribute->getAttributeId())
-+                ->where('main_table.attribute_id = ?', (int) $attribute->getAttributeId())
-                 ->where('main_table.store_id = ? ', $currentScopeId);
-             if ($this->isAddStockFilter()) {
-                 $subSelect = $this->applyStockConditionToSelect->execute($subSelect);
-@@ -113,6 +118,8 @@ class SelectBuilderForAttribute
-     }
- 
-     /**
-+     * Is add stock filter
-+     *
-      * @return bool
-      */
-     private function isAddStockFilter()
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute/ApplyStockConditionToSelect.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute/ApplyStockConditionToSelect.php
-index 83f9c6f9c30..be572793f1e 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute/ApplyStockConditionToSelect.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute/ApplyStockConditionToSelect.php
-@@ -13,6 +13,9 @@ use Magento\Framework\DB\Select;
- 
- /**
-  * Join stock table with stock condition to select.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class ApplyStockConditionToSelect
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php
-index 87fc896f509..27a784f8609 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php
-@@ -18,6 +18,9 @@ use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
-  *
-  * The main idea of this strategy is using eav index table as main table for query
-  * in case when search request requires search by attributes
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class BaseSelectAttributesSearchStrategy implements BaseSelectStrategyInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php
-index 0732df7bd9f..bff878122c8 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php
-@@ -17,6 +17,9 @@ use Magento\Framework\App\ResourceConnection;
-  *
-  * The main idea of this strategy is using fulltext search index table as main table for query
-  * in case when search request does not requires any search by attributes
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class BaseSelectFullTextSearchStrategy implements BaseSelectStrategyInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
-index d2e653ac9b9..eb4761adf83 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
-@@ -24,6 +24,8 @@ use \Magento\Framework\Search\Request\IndexScopeResolverInterface;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class DataProvider implements DataProviderInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php
-index a187ccc8f96..c24acf4610e 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php
-@@ -10,6 +10,10 @@ use Magento\Framework\Search\Adapter\Mysql\Field\FieldFactory;
- use Magento\Framework\Search\Adapter\Mysql\Field\FieldInterface;
- use Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface;
- 
-+/**
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class Resolver implements ResolverInterface
- {
-     /**
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php
-index 547122125b1..bf431396cc0 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php
-@@ -12,6 +12,8 @@ use Magento\CatalogSearch\Model\Search\RequestGenerator;
-  * Purpose of class is to resolve table alias for Search Request filter
-  * @api
-  * @since 100.1.6
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class AliasResolver
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
-index 35addc3fafd..c758e773f43 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
-@@ -8,7 +8,9 @@ namespace Magento\CatalogSearch\Model\Adapter\Mysql\Filter;
- use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Model\Product;
- use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-+use Magento\CatalogSearch\Model\Search\FilterMapper\VisibilityFilter;
- use Magento\CatalogSearch\Model\Search\TableMapper;
-+use Magento\Customer\Model\Session;
- use Magento\Eav\Model\Config;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\ObjectManager;
-@@ -20,11 +22,14 @@ use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
- use Magento\Framework\Search\Adapter\Mysql\Filter\PreprocessorInterface;
- use Magento\Framework\Search\Request\FilterInterface;
- use Magento\Store\Model\Store;
--use Magento\Customer\Model\Session;
--use Magento\CatalogSearch\Model\Search\FilterMapper\VisibilityFilter;
- 
- /**
-+ * ElasticSearch search filter pre-processor.
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class Preprocessor implements PreprocessorInterface
- {
-@@ -126,7 +131,7 @@ class Preprocessor implements PreprocessorInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(FilterInterface $filter, $isNegation, $query)
-     {
-@@ -134,10 +139,13 @@ class Preprocessor implements PreprocessorInterface
-     }
- 
-     /**
-+     * Process query with field.
-+     *
-      * @param FilterInterface $filter
-      * @param bool $isNegation
-      * @param string $query
-      * @return string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     private function processQueryWithField(FilterInterface $filter, $isNegation, $query)
-     {
-@@ -168,7 +176,7 @@ class Preprocessor implements PreprocessorInterface
-         } elseif ($filter->getField() === VisibilityFilter::VISIBILITY_FILTER_FIELD) {
-             return '';
-         } elseif ($filter->getType() === FilterInterface::TYPE_TERM &&
--            in_array($attribute->getFrontendInput(), ['select', 'multiselect'], true)
-+            in_array($attribute->getFrontendInput(), ['select', 'multiselect', 'boolean'], true)
-         ) {
-             $resultQuery = $this->processTermSelect($filter, $isNegation);
-         } elseif ($filter->getType() === FilterInterface::TYPE_RANGE &&
-@@ -202,19 +210,23 @@ class Preprocessor implements PreprocessorInterface
-                 ->where('main_table.store_id = ?', Store::DEFAULT_STORE_ID)
-                 ->having($query);
- 
--            $resultQuery = 'search_index.entity_id IN (
--                select entity_id from  ' . $this->conditionManager->wrapBrackets($select) . ' as filter
--            )';
-+            $resultQuery = 'search_index.entity_id IN ('
-+                . 'select entity_id from  '
-+                . $this->conditionManager->wrapBrackets($select)
-+                . ' as filter)';
-         }
- 
-         return $resultQuery;
-     }
- 
-     /**
-+     * Process range numeric.
-+     *
-      * @param FilterInterface $filter
-      * @param string $query
-      * @param Attribute $attribute
-      * @return string
-+     * @throws \Exception
-      */
-     private function processRangeNumeric(FilterInterface $filter, $query, $attribute)
-     {
-@@ -236,14 +248,17 @@ class Preprocessor implements PreprocessorInterface
-             ->where('main_table.store_id = ?', $currentStoreId)
-             ->having($query);
- 
--        $resultQuery = 'search_index.entity_id IN (
--                select entity_id from  ' . $this->conditionManager->wrapBrackets($select) . ' as filter
--            )';
-+        $resultQuery = 'search_index.entity_id IN ('
-+            . 'select entity_id from  '
-+            . $this->conditionManager->wrapBrackets($select)
-+            . ' as filter)';
- 
-         return $resultQuery;
-     }
- 
-     /**
-+     * Process term select.
-+     *
-      * @param FilterInterface $filter
-      * @param bool $isNegation
-      * @return string
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php
-index 94432bbfe4a..a5650cac733 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php
-@@ -18,6 +18,8 @@ use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class DataProvider
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Options.php b/app/code/Magento/CatalogSearch/Model/Adapter/Options.php
-index 425e6c00416..f2e1c3c4c42 100644
---- a/app/code/Magento/CatalogSearch/Model/Adapter/Options.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Options.php
-@@ -10,6 +10,8 @@ use Magento\Framework\Search\Adapter\OptionsInterface;
- use Magento\Store\Model\ScopeInterface;
- 
- /**
-+ * Catalog search config.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -33,7 +35,7 @@ class Options implements OptionsInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function get()
-     {
-diff --git a/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php b/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php
-index 2964f836ab9..1f11d265033 100644
---- a/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php
-+++ b/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php
-@@ -6,7 +6,8 @@
- namespace Magento\CatalogSearch\Model\Adminhtml\System\Config\Backend;
- 
- /**
-- * @author      Magento Core Team <core@magentocommerce.com>
-+ * Backend model for catalog search engine system config
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -43,6 +44,7 @@ class Engine extends \Magento\Framework\App\Config\Value
- 
-     /**
-      * After save call
-+     *
-      * Invalidate catalog search index if engine was changed
-      *
-      * @return $this
-diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
-index 28f67a7829e..5b96a8c21cb 100644
---- a/app/code/Magento/CatalogSearch/Model/Advanced.php
-+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
-@@ -6,6 +6,8 @@
- namespace Magento\CatalogSearch\Model;
- 
- use Magento\Catalog\Model\Config;
-+use Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategyProvider;
-+use Magento\CatalogSearch\Model\Search\ItemCollectionProviderInterface;
- use Magento\Catalog\Model\Product\Visibility;
- use Magento\Catalog\Model\ProductFactory;
- use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-@@ -19,9 +21,11 @@ use Magento\Framework\Model\Context;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Registry;
- use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Framework\App\ObjectManager;
- 
- /**
-  * Catalog advanced search model
-+ *
-  * @method int getEntityTypeId()
-  * @method \Magento\CatalogSearch\Model\Advanced setEntityTypeId(int $value)
-  * @method int getAttributeSetId()
-@@ -63,6 +67,7 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
-     /**
-      * Initialize dependencies
-      *
-+     * @deprecated
-      * @var Config
-      */
-     protected $_catalogConfig;
-@@ -105,10 +110,22 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
-     /**
-      * Advanced Collection Factory
-      *
-+     * @deprecated
-+     * @see $collectionProvider
-      * @var ProductCollectionFactory
-      */
-     protected $productCollectionFactory;
- 
-+    /**
-+     * @var ItemCollectionProviderInterface
-+     */
-+    private $collectionProvider;
-+
-+    /**
-+     * @var ProductCollectionPrepareStrategyProvider|null
-+     */
-+    private $productCollectionPrepareStrategyProvider;
-+
-     /**
-      * Construct
-      *
-@@ -123,7 +140,8 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
-      * @param ProductCollectionFactory $productCollectionFactory
-      * @param AdvancedFactory $advancedFactory
-      * @param array $data
--     *
-+     * @param ItemCollectionProviderInterface|null $collectionProvider
-+     * @param ProductCollectionPrepareStrategyProvider|null $productCollectionPrepareStrategyProvider
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -137,7 +155,9 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
-         StoreManagerInterface $storeManager,
-         ProductCollectionFactory $productCollectionFactory,
-         AdvancedFactory $advancedFactory,
--        array $data = []
-+        array $data = [],
-+        ItemCollectionProviderInterface $collectionProvider = null,
-+        ProductCollectionPrepareStrategyProvider $productCollectionPrepareStrategyProvider = null
-     ) {
-         $this->_attributeCollectionFactory = $attributeCollectionFactory;
-         $this->_catalogProductVisibility = $catalogProductVisibility;
-@@ -146,11 +166,14 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
-         $this->_productFactory = $productFactory;
-         $this->_storeManager = $storeManager;
-         $this->productCollectionFactory = $productCollectionFactory;
-+        $this->collectionProvider = $collectionProvider;
-+        $this->productCollectionPrepareStrategyProvider = $productCollectionPrepareStrategyProvider
-+            ?: ObjectManager::getInstance()->get(ProductCollectionPrepareStrategyProvider::class);
-         parent::__construct(
-             $context,
-             $registry,
-             $advancedFactory->create(),
--            $this->productCollectionFactory->create(),
-+            $this->resolveProductCollection(),
-             $data
-         );
-     }
-@@ -265,7 +288,7 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
-     public function getProductCollection()
-     {
-         if ($this->_productCollection === null) {
--            $collection = $this->productCollectionFactory->create();
-+            $collection = $this->resolveProductCollection();
-             $this->prepareProductCollection($collection);
-             if (!$collection) {
-                 return $collection;
-@@ -276,6 +299,18 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
-         return $this->_productCollection;
-     }
- 
-+    /**
-+     * Resolve product collection.
-+     *
-+     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection|\Magento\Framework\Data\Collection
-+     */
-+    private function resolveProductCollection()
-+    {
-+        return (null === $this->collectionProvider)
-+            ? $this->productCollectionFactory->create()
-+            : $this->collectionProvider->getCollection();
-+    }
-+
-     /**
-      * Prepare product collection
-      *
-@@ -284,18 +319,14 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
-      */
-     public function prepareProductCollection($collection)
-     {
--        $collection
--            ->addAttributeToSelect($this->_catalogConfig->getProductAttributes())
--            ->setStore($this->_storeManager->getStore())
--            ->addMinimalPrice()
--            ->addTaxPercents()
--            ->addStoreFilter()
--            ->setVisibility($this->_catalogProductVisibility->getVisibleInSearchIds());
-+        $this->productCollectionPrepareStrategyProvider->getStrategy()->prepare($collection);
- 
-         return $this;
-     }
- 
-     /**
-+     * Add search criteria.
-+     *
-      * @param EntityAttribute $attribute
-      * @param mixed $value
-      * @return void
-diff --git a/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategy.php b/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategy.php
-new file mode 100644
-index 00000000000..e62de9c689f
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategy.php
-@@ -0,0 +1,61 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\CatalogSearch\Model\Advanced;
-+
-+use Magento\Catalog\Model\ResourceModel\Product\Collection;
-+use Magento\Catalog\Model\Config;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Strategy interface for preparing product collection.
-+ */
-+class ProductCollectionPrepareStrategy implements ProductCollectionPrepareStrategyInterface
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $catalogConfig;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var Visibility
-+     */
-+    private $catalogProductVisibility;
-+
-+    /**
-+     * @param Config $catalogConfig
-+     * @param StoreManagerInterface $storeManager
-+     * @param Visibility $catalogProductVisibility
-+     */
-+    public function __construct(
-+        Config $catalogConfig,
-+        StoreManagerInterface $storeManager,
-+        Visibility $catalogProductVisibility
-+    ) {
-+        $this->catalogConfig = $catalogConfig;
-+        $this->storeManager = $storeManager;
-+        $this->catalogProductVisibility = $catalogProductVisibility;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function prepare(Collection $collection)
-+    {
-+        $collection
-+            ->addAttributeToSelect($this->catalogConfig->getProductAttributes())
-+            ->setStore($this->storeManager->getStore())
-+            ->addMinimalPrice()
-+            ->addTaxPercents()
-+            ->addStoreFilter()
-+            ->setVisibility($this->catalogProductVisibility->getVisibleInSearchIds());
-+    }
-+}
-diff --git a/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategyInterface.php b/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategyInterface.php
-new file mode 100644
-index 00000000000..23719a6713a
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategyInterface.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\CatalogSearch\Model\Advanced;
-+
-+use Magento\Catalog\Model\ResourceModel\Product\Collection;
-+
-+/**
-+ * Strategy interface for preparing product collection.
-+ */
-+interface ProductCollectionPrepareStrategyInterface
-+{
-+    /**
-+     * Prepare product collection.
-+     *
-+     * @param Collection $collection
-+     * @return void
-+     */
-+    public function prepare(Collection $collection);
-+}
-diff --git a/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategyProvider.php b/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategyProvider.php
-new file mode 100644
-index 00000000000..6e963ea1aa8
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategyProvider.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\CatalogSearch\Model\Advanced;
-+
-+use Magento\Framework\Search\EngineResolverInterface;
-+
-+/**
-+ * Strategy provider for preparing product collection.
-+ */
-+class ProductCollectionPrepareStrategyProvider
-+{
-+    /**
-+     * @var EngineResolverInterface
-+     */
-+    private $engineResolver;
-+
-+    /**
-+     * @var array
-+     */
-+    private $strategies;
-+
-+    /**
-+     * @param EngineResolverInterface $engineResolver
-+     * @param array $strategies
-+     */
-+    public function __construct(
-+        EngineResolverInterface $engineResolver,
-+        array $strategies
-+    ) {
-+        $this->engineResolver = $engineResolver;
-+        $this->strategies = $strategies;
-+    }
-+
-+    /**
-+     * Get strategy provider for product collection prepare process.
-+     *
-+     * @return ProductCollectionPrepareStrategyInterface
-+     */
-+    public function getStrategy(): ProductCollectionPrepareStrategyInterface
-+    {
-+        if (!isset($this->strategies[$this->engineResolver->getCurrentSearchEngine()])) {
-+            throw new \DomainException('Undefined strategy ' . $this->engineResolver->getCurrentSearchEngine());
-+        }
-+        return $this->strategies[$this->engineResolver->getCurrentSearchEngine()];
-+    }
-+}
-diff --git a/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php b/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php
-index 429c29fd3d2..9e7737123b2 100644
---- a/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php
-+++ b/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php
-@@ -8,12 +8,16 @@ namespace Magento\CatalogSearch\Model\Advanced\Request;
- use Magento\Framework\Search\Request\Builder as RequestBuilder;
- 
- /**
-+ * Catalog search advanced request builder.
-+ *
-  * @api
-  * @since 100.0.2
-  */
- class Builder extends RequestBuilder
- {
-     /**
-+     * Bind value to query.
-+     *
-      * @param string $attributeCode
-      * @param array|string $attributeValue
-      * @return void
-diff --git a/app/code/Magento/CatalogSearch/Model/Attribute/SearchWeight.php b/app/code/Magento/CatalogSearch/Model/Attribute/SearchWeight.php
-index d6110f4b3b2..fa42cadb8a2 100644
---- a/app/code/Magento/CatalogSearch/Model/Attribute/SearchWeight.php
-+++ b/app/code/Magento/CatalogSearch/Model/Attribute/SearchWeight.php
-@@ -7,8 +7,9 @@
- namespace Magento\CatalogSearch\Model\Attribute;
- 
- /**
-- * This plugin is responsible for processing of search_weight property of a product attribute,
-- * which is used to boost matches by specific attributes.
-+ * This plugin is responsible for processing of search_weight property of a product attribute.
-+ *
-+ * 'search_weight' is used to boost matches by specific attributes.
-  *
-  * This is part of search accuracy customization functionality.
-  */
-diff --git a/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
-index c1c9997bc83..f014c6d1331 100644
---- a/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
-+++ b/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
-@@ -13,6 +13,9 @@ use Magento\Search\Model\Autocomplete\ItemFactory;
- use Magento\Framework\App\Config\ScopeConfigInterface as ScopeConfig;
- use Magento\Store\Model\ScopeInterface;
- 
-+/**
-+ * Catalog search auto-complete data provider.
-+ */
- class DataProvider implements DataProviderInterface
- {
-     /**
-@@ -44,6 +47,7 @@ class DataProvider implements DataProviderInterface
-     /**
-      * @param QueryFactory $queryFactory
-      * @param ItemFactory $itemFactory
-+     * @param ScopeConfig $scopeConfig
-      */
-     public function __construct(
-         QueryFactory $queryFactory,
-@@ -60,7 +64,7 @@ class DataProvider implements DataProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getItems()
-     {
-diff --git a/app/code/Magento/CatalogSearch/Model/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Fulltext.php
-index 1792fd21fb8..398d6e9dd18 100644
---- a/app/code/Magento/CatalogSearch/Model/Fulltext.php
-+++ b/app/code/Magento/CatalogSearch/Model/Fulltext.php
-@@ -21,6 +21,9 @@ use Magento\Search\Model\QueryFactory;
-  * @method \Magento\CatalogSearch\Model\Fulltext setStoreId(int $value)
-  * @method string getDataIndex()
-  * @method \Magento\CatalogSearch\Model\Fulltext setDataIndex(string $value)
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class Fulltext extends \Magento\Framework\Model\AbstractModel
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
-index 37208ed896e..21d8b7297da 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
-@@ -117,7 +117,8 @@ class Fulltext implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @throws \InvalidArgumentException
-      */
-     public function executeByDimensions(array $dimensions, \Traversable $entityIds = null)
-@@ -145,8 +146,10 @@ class Fulltext implements
-             $productIds = array_unique(
-                 array_merge($entityIds, $this->fulltextResource->getRelationsByChild($entityIds))
-             );
--            $saveHandler->deleteIndex($dimensions, new \ArrayIterator($productIds));
--            $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $productIds));
-+            if ($saveHandler->isAvailable($dimensions)) {
-+                $saveHandler->deleteIndex($dimensions, new \ArrayIterator($productIds));
-+                $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $productIds));
-+            }
-         }
-     }
- 
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
-index a8d46911193..cd2529a8fd7 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
-@@ -12,6 +12,8 @@ use Magento\Framework\DB\Select;
- use Magento\Store\Model\Store;
- 
- /**
-+ * Catalog search full test search data provider.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @api
-@@ -568,14 +570,13 @@ class DataProvider
-             }
-         }
-         foreach ($indexData as $entityId => $attributeData) {
--            foreach ($attributeData as $attributeId => $attributeValue) {
--                $value = $this->getAttributeValue($attributeId, $attributeValue, $storeId);
-+            foreach ($attributeData as $attributeId => $attributeValues) {
-+                $value = $this->getAttributeValue($attributeId, $attributeValues, $storeId);
-                 if (!empty($value)) {
--                    if (isset($index[$attributeId])) {
--                        $index[$attributeId][$entityId] = $value;
--                    } else {
--                        $index[$attributeId] = [$entityId => $value];
-+                    if (!isset($index[$attributeId])) {
-+                        $index[$attributeId] = [];
-                     }
-+                        $index[$attributeId][$entityId] = $value;
-                 }
-             }
-         }
-@@ -600,16 +601,16 @@ class DataProvider
-      * Retrieve attribute source value for search
-      *
-      * @param int $attributeId
--     * @param mixed $valueId
-+     * @param mixed $valueIds
-      * @param int $storeId
-      * @return string
-      */
--    private function getAttributeValue($attributeId, $valueId, $storeId)
-+    private function getAttributeValue($attributeId, $valueIds, $storeId)
-     {
-         $attribute = $this->getSearchableAttribute($attributeId);
--        $value = $this->engine->processAttributeValue($attribute, $valueId);
-+        $value = $this->engine->processAttributeValue($attribute, $valueIds);
-         if (false !== $value) {
--            $optionValue = $this->getAttributeOptionValue($attributeId, $valueId, $storeId);
-+            $optionValue = $this->getAttributeOptionValue($attributeId, $valueIds, $storeId);
-             if (null === $optionValue) {
-                 $value = $this->filterAttributeValue($value);
-             } else {
-@@ -624,13 +625,15 @@ class DataProvider
-      * Get attribute option value
-      *
-      * @param int $attributeId
--     * @param int $valueId
-+     * @param int|string $valueIds
-      * @param int $storeId
-      * @return null|string
-      */
--    private function getAttributeOptionValue($attributeId, $valueId, $storeId)
-+    private function getAttributeOptionValue($attributeId, $valueIds, $storeId)
-     {
-         $optionKey = $attributeId . '-' . $storeId;
-+        $attributeValueIds = explode(',', $valueIds);
-+        $attributeOptionValue = '';
-         if (!array_key_exists($optionKey, $this->attributeOptions)
-         ) {
-             $attribute = $this->getSearchableAttribute($attributeId);
-@@ -641,15 +644,22 @@ class DataProvider
-                 $attribute->setStoreId($storeId);
-                 $options = $attribute->getSource()->toOptionArray();
-                 $this->attributeOptions[$optionKey] = array_column($options, 'label', 'value');
--                $this->attributeOptions[$optionKey] = array_map(function ($value) {
--                    return $this->filterAttributeValue($value);
--                }, $this->attributeOptions[$optionKey]);
-+                $this->attributeOptions[$optionKey] = array_map(
-+                    function ($value) {
-+                        return $this->filterAttributeValue($value);
-+                    },
-+                    $this->attributeOptions[$optionKey]
-+                );
-             } else {
-                 $this->attributeOptions[$optionKey] = null;
-             }
-         }
--
--        return $this->attributeOptions[$optionKey][$valueId] ?? null;
-+        foreach ($attributeValueIds as $attrValueId) {
-+            if (isset($this->attributeOptions[$optionKey][$attrValueId])) {
-+                $attributeOptionValue .= $this->attributeOptions[$optionKey][$attrValueId] . ' ';
-+            }
-+        }
-+        return empty($attributeOptionValue) ? null : trim($attributeOptionValue);
-     }
- 
-     /**
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
-index 8a18c1bfcc5..f56a4fe4d1b 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
-@@ -397,7 +397,7 @@ class Full
-             }
-             $products = $this->dataProvider
-                 ->getSearchableProducts($storeId, $staticFields, $productIds, $lastProductId, $this->batchSize);
--        };
-+        }
-     }
- 
-     /**
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php
-index abd65c71cad..a2c39deff18 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php
-@@ -14,6 +14,9 @@ namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Action;
-  * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full
-  * @api
-  * @since 100.0.3
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class IndexIterator implements \Iterator
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
-index 83ad7acca84..86dccf8cfe5 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
-@@ -7,6 +7,9 @@ namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin;
- 
- use Magento\CatalogSearch\Model\Indexer\Fulltext;
- 
-+/**
-+ * Catalog search indexer plugin for catalog attribute.
-+ */
- class Attribute extends AbstractPlugin
- {
-     /**
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Category.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Category.php
-index e9c0e06ac38..1218e3da9a7 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Category.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Category.php
-@@ -10,8 +10,7 @@ use Magento\Catalog\Model\ResourceModel\Category as ResourceCategory;
- use Magento\Framework\Model\AbstractModel;
- 
- /**
-- * Class Category
-- * @package Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin
-+ * Catalog search indexer plugin for catalog category.
-  */
- class Category extends AbstractPlugin
- {
-@@ -30,6 +29,8 @@ class Category extends AbstractPlugin
-     }
- 
-     /**
-+     * Reindex catalog search.
-+     *
-      * @param ResourceCategory $resourceCategory
-      * @param \Closure $proceed
-      * @param AbstractModel $category
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php
-index 949033bb338..e250d112393 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php
-@@ -9,15 +9,19 @@ namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin;
- use Magento\Catalog\Model\ResourceModel\Product as ResourceProduct;
- use Magento\Framework\Model\AbstractModel;
- 
-+/**
-+ * Catalog search indexer plugin for catalog product.
-+ */
- class Product extends AbstractPlugin
- {
-     /**
--     * Reindex on product save
-+     * Reindex on product save.
-      *
-      * @param ResourceProduct $productResource
-      * @param \Closure $proceed
-      * @param AbstractModel $product
-      * @return ResourceProduct
-+     * @throws \Exception
-      */
-     public function aroundSave(ResourceProduct $productResource, \Closure $proceed, AbstractModel $product)
-     {
-@@ -31,6 +35,7 @@ class Product extends AbstractPlugin
-      * @param \Closure $proceed
-      * @param AbstractModel $product
-      * @return ResourceProduct
-+     * @throws \Exception
-      */
-     public function aroundDelete(ResourceProduct $productResource, \Closure $proceed, AbstractModel $product)
-     {
-@@ -38,6 +43,8 @@ class Product extends AbstractPlugin
-     }
- 
-     /**
-+     * Reindex catalog search.
-+     *
-      * @param ResourceProduct $productResource
-      * @param \Closure $proceed
-      * @param AbstractModel $product
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php
-index e971f59cf10..23ab52012f2 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php
-@@ -11,6 +11,9 @@ use Magento\Framework\Search\Request\DimensionFactory;
- use Magento\Framework\Indexer\ConfigInterface;
- use Magento\Framework\Event\ObserverInterface;
- 
-+/**
-+ * Catalog search indexer plugin for store.
-+ */
- class Store implements ObserverInterface
- {
-     /**
-@@ -44,6 +47,8 @@ class Store implements ObserverInterface
-     }
- 
-     /**
-+     * Reindex catalog search.
-+     *
-      * @param \Magento\Store\Model\Store $store
-      * @return void
-      */
-@@ -59,6 +64,8 @@ class Store implements ObserverInterface
-     }
- 
-     /**
-+     * Reindex catalog search on store modification.
-+     *
-      * @param \Magento\Framework\Event\Observer $observer
-      * @return void
-      */
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
-index c46f062c1e6..0d226acdc3d 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
-@@ -15,6 +15,8 @@ use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
- use Magento\Framework\Search\Request\IndexScopeResolverInterface;
- 
- /**
-+ * Catalog search index structure.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -43,9 +45,7 @@ class IndexStructure implements IndexStructureInterface
-     }
- 
-     /**
--     * @param string $index
--     * @param Dimension[] $dimensions
--     * @return void
-+     * @inheritdoc
-      */
-     public function delete($index, array $dimensions = [])
-     {
-@@ -56,11 +56,7 @@ class IndexStructure implements IndexStructureInterface
-     }
- 
-     /**
--     * @param string $index
--     * @param array $fields
--     * @param array $dimensions
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
--     * @return void
-+     * @inheritdoc
-      */
-     public function create($index, array $fields, array $dimensions = [])
-     {
-@@ -68,6 +64,8 @@ class IndexStructure implements IndexStructureInterface
-     }
- 
-     /**
-+     * Create fulltext index table.
-+     *
-      * @param string $tableName
-      * @throws \Zend_Db_Exception
-      * @return void
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureFactory.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureFactory.php
-index d8b3c19ddb9..d54d6c939cc 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureFactory.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureFactory.php
-@@ -10,6 +10,8 @@ use Magento\Framework\ObjectManagerInterface;
- use Magento\Framework\Search\EngineResolverInterface;
- 
- /**
-+ * Index structure factory
-+ *
-  * @api
-  * @since 100.1.0
-  */
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php
-index 0fb8af51445..c62d2a03356 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php
-@@ -7,6 +7,9 @@ namespace Magento\CatalogSearch\Model\Indexer;
- 
- use Magento\Framework\Indexer\IndexStructureInterface;
- 
-+/**
-+ * Catalog search index structure proxy.
-+ */
- class IndexStructureProxy implements IndexStructureInterface
- {
-     /**
-@@ -29,7 +32,7 @@ class IndexStructureProxy implements IndexStructureInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function delete(
-         $index,
-@@ -39,7 +42,7 @@ class IndexStructureProxy implements IndexStructureInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function create(
-         $index,
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherInterface.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherInterface.php
-index bdb663a0b61..f45ef11a863 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherInterface.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherInterface.php
-@@ -6,7 +6,8 @@
- namespace Magento\CatalogSearch\Model\Indexer;
- 
- /**
-- * Provides a functionality to replace main index with its temporary representation
-+ * Provides a functionality to replace main index with its temporary representation.
-+ *
-  * @api
-  * @since 100.2.0
-  */
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherProxy.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherProxy.php
-index e5c801cf0b7..e4a20cc188f 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherProxy.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherProxy.php
-@@ -51,7 +51,7 @@ class IndexSwitcherProxy implements IndexSwitcherInterface
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritDoc
-      *
-      * As index switcher is an optional part of the search SPI, it may be not defined by a search engine.
-      * It is especially reasonable for search engines with pre-defined indexes declaration (like Sphinx)
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
-index 931d7571a90..9f105bd3ea4 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
-@@ -14,8 +14,12 @@ use Magento\Framework\Search\Request\IndexScopeResolverInterface;
- use Magento\Framework\Indexer\SaveHandler\Batch;
- 
- /**
-+ * Catalog search indexer handler.
-+ *
-  * @api
-  * @since 100.0.2
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class IndexerHandler implements IndexerInterface
- {
-@@ -90,7 +94,7 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function saveIndex($dimensions, \Traversable $documents)
-     {
-@@ -100,7 +104,7 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function deleteIndex($dimensions, \Traversable $documents)
-     {
-@@ -111,7 +115,7 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function cleanIndex($dimensions)
-     {
-@@ -120,14 +124,20 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
--    public function isAvailable()
-+    public function isAvailable($dimensions = [])
-     {
--        return true;
-+        if (empty($dimensions)) {
-+            return true;
-+        }
-+
-+        return $this->resource->getConnection()->isTableExists($this->getTableName($dimensions));
-     }
- 
-     /**
-+     * Returns table name.
-+     *
-      * @param Dimension[] $dimensions
-      * @return string
-      */
-@@ -137,6 +147,8 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
-+     * Returns index name.
-+     *
-      * @return string
-      */
-     private function getIndexName()
-@@ -145,6 +157,8 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
-+     * Add documents to storage.
-+     *
-      * @param array $documents
-      * @param Dimension[] $dimensions
-      * @return void
-@@ -163,6 +177,8 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
-+     * Searchable filter preparation.
-+     *
-      * @param array $documents
-      * @return array
-      */
-@@ -183,6 +199,8 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
-+     * Prepare fields.
-+     *
-      * @return void
-      */
-     private function prepareFields()
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php
-index b9b44df6f40..841ee8708f2 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php
-@@ -10,6 +10,8 @@ use Magento\Framework\ObjectManagerInterface;
- use Magento\Framework\Search\EngineResolverInterface;
- 
- /**
-+ * Indexer handler factory.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php b/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
-index 47a8681a73c..b6639f76045 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
-@@ -9,6 +9,9 @@ use Magento\CatalogSearch\Model\Indexer\Fulltext;
- use Magento\Framework\Mview\ActionInterface;
- use Magento\Framework\Indexer\IndexerInterfaceFactory;
- 
-+/**
-+ * Catalog search materialized view index action.
-+ */
- class Action implements ActionInterface
- {
-     /**
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php b/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php
-index 343dc50d604..6db063bde7d 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php
-@@ -13,6 +13,8 @@ use Magento\Eav\Model\Entity\Attribute;
- /**
-  * @api
-  * @since 100.0.2
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class ProductFieldset implements \Magento\Framework\Indexer\FieldsetInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexSwitcher.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexSwitcher.php
-index 86649cd1093..ed2b1be5c70 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexSwitcher.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexSwitcher.php
-@@ -11,6 +11,9 @@ use Magento\Framework\Search\Request\IndexScopeResolverInterface;
- 
- /**
-  * Provides a functionality to replace main index with its temporary representation
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class IndexSwitcher implements IndexSwitcherInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexTableNotExistException.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexTableNotExistException.php
-index a386b74084a..b01f3c50d50 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexTableNotExistException.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexTableNotExistException.php
-@@ -14,6 +14,8 @@ use Magento\Framework\Exception\LocalizedException;
-  *
-  * @api
-  * @since 100.2.0
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class IndexTableNotExistException extends LocalizedException
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php
-index 9166ddbef60..fcecb36e7d5 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php
-@@ -9,8 +9,7 @@ namespace Magento\CatalogSearch\Model\Indexer\Scope;
- use Magento\Framework\Search\Request\Dimension;
- 
- /**
-- * Implementation of IndexScopeResolverInterface which resolves index scope dynamically
-- * depending on current scope state
-+ * Implementation of IndexScopeResolverInterface which resolves index scope dynamically depending on current scope state
-  */
- class ScopeProxy implements \Magento\Framework\Search\Request\IndexScopeResolverInterface
- {
-@@ -64,9 +63,7 @@ class ScopeProxy implements \Magento\Framework\Search\Request\IndexScopeResolver
-     }
- 
-     /**
--     * @param string $index
--     * @param Dimension[] $dimensions
--     * @return string
-+     * @inheritdoc
-      */
-     public function resolve($index, array $dimensions)
-     {
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php
-index 5f9a3e30599..a12ae8e69c3 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php
-@@ -31,6 +31,7 @@ class State
- 
-     /**
-      * Set the state to use temporary Index
-+     *
-      * @return void
-      */
-     public function useTemporaryIndex()
-@@ -40,6 +41,7 @@ class State
- 
-     /**
-      * Set the state to use regular Index
-+     *
-      * @return void
-      */
-     public function useRegularIndex()
-@@ -48,6 +50,8 @@ class State
-     }
- 
-     /**
-+     * Get state.
-+     *
-      * @return string
-      */
-     public function getState()
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/TemporaryResolver.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/TemporaryResolver.php
-index c52a0a05866..796559d1f70 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/TemporaryResolver.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/TemporaryResolver.php
-@@ -11,6 +11,9 @@ use Magento\Framework\Search\Request\Dimension;
- 
- /**
-  * Resolves name of a temporary table for indexation
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class TemporaryResolver implements \Magento\Framework\Search\Request\IndexScopeResolverInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php
-index b44a2d22054..8722cd52b61 100644
---- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php
-+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php
-@@ -13,6 +13,8 @@ use Magento\Framework\Exception\LocalizedException;
-  *
-  * @api
-  * @since 100.2.0
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class UnknownStateException extends LocalizedException
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php b/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php
-index 4ce286bf159..c24665f4808 100644
---- a/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php
-+++ b/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php
-@@ -9,6 +9,9 @@ namespace Magento\CatalogSearch\Model\Layer\Category;
- use Magento\Catalog\Model\Layer\ItemCollectionProviderInterface;
- use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
- 
-+/**
-+ * Catalog search category layer collection provider.
-+ */
- class ItemCollectionProvider implements ItemCollectionProviderInterface
- {
-     /**
-@@ -25,8 +28,7 @@ class ItemCollectionProvider implements ItemCollectionProviderInterface
-     }
- 
-     /**
--     * @param \Magento\Catalog\Model\Category $category
--     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-+     * @inheritdoc
-      */
-     public function getCollection(\Magento\Catalog\Model\Category $category)
-     {
-diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
-index 7aac6e98fc0..794d0ac9715 100644
---- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
-+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
-@@ -91,12 +91,10 @@ class Attribute extends AbstractFilter
-             return $this->itemDataBuilder->build();
-         }
- 
--        $productSize = $productCollection->getSize();
--
-         $options = $attribute->getFrontend()
-             ->getSelectOptions();
-         foreach ($options as $option) {
--            $this->buildOptionData($option, $isAttributeFilterable, $optionsFacetedData, $productSize);
-+            $this->buildOptionData($option, $isAttributeFilterable, $optionsFacetedData);
-         }
- 
-         return $this->itemDataBuilder->build();
-@@ -108,17 +106,16 @@ class Attribute extends AbstractFilter
-      * @param array $option
-      * @param boolean $isAttributeFilterable
-      * @param array $optionsFacetedData
--     * @param int $productSize
-      * @return void
-      */
--    private function buildOptionData($option, $isAttributeFilterable, $optionsFacetedData, $productSize)
-+    private function buildOptionData($option, $isAttributeFilterable, $optionsFacetedData)
-     {
-         $value = $this->getOptionValue($option);
-         if ($value === false) {
-             return;
-         }
-         $count = $this->getOptionCount($value, $optionsFacetedData);
--        if ($isAttributeFilterable && (!$this->isOptionReducesResults($count, $productSize) || $count === 0)) {
-+        if ($isAttributeFilterable && $count === 0) {
-             return;
-         }
- 
-@@ -156,4 +153,12 @@ class Attribute extends AbstractFilter
-             ? (int)$optionsFacetedData[$value]['count']
-             : 0;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function isOptionReducesResults($optionCount, $totalSize)
-+    {
-+        return $optionCount <= $totalSize;
-+    }
- }
-diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
-index 7c15514f211..0998cf7a9b3 100644
---- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
-+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
-@@ -24,14 +24,16 @@ class Category extends AbstractFilter
-     private $dataProvider;
- 
-     /**
-+     * Category constructor.
-+     *
-      * @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param \Magento\Catalog\Model\Layer $layer
-      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
--     * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
-      * @param \Magento\Framework\Escaper $escaper
--     * @param CategoryManagerFactory $categoryManager
-+     * @param \Magento\Catalog\Model\Layer\Filter\DataProvider\CategoryFactory $categoryDataProviderFactory
-      * @param array $data
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function __construct(
-         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
-diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
-index e61a886a41d..e9fb1070fed 100644
---- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
-+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
-@@ -111,12 +111,9 @@ class Decimal extends AbstractFilter
-                 $from = '';
-             }
-             if ($to == '*') {
--                $to = '';
-+                $to = null;
-             }
--            $label = $this->renderRangeLabel(
--                empty($from) ? 0 : $from,
--                empty($to) ? 0 : $to
--            );
-+            $label = $this->renderRangeLabel(empty($from) ? 0 : $from, $to);
-             $value = $from . '-' . $to;
- 
-             $data[] = [
-@@ -141,7 +138,7 @@ class Decimal extends AbstractFilter
-     protected function renderRangeLabel($fromPrice, $toPrice)
-     {
-         $formattedFromPrice = $this->priceCurrency->format($fromPrice);
--        if ($toPrice === '') {
-+        if ($toPrice === null) {
-             return __('%1 and above', $formattedFromPrice);
-         } else {
-             if ($fromPrice != $toPrice) {
-diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
-index 108f1b9f4fd..a19f53469ae 100644
---- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
-+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
-@@ -86,6 +86,8 @@ class Price extends AbstractFilter
-     }
- 
-     /**
-+     * Get resource model.
-+     *
-      * @return \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price
-      */
-     public function getResource()
-@@ -223,6 +225,8 @@ class Price extends AbstractFilter
-     }
- 
-     /**
-+     * Get 'to' part of the filter.
-+     *
-      * @param float $from
-      * @return float
-      */
-@@ -237,6 +241,8 @@ class Price extends AbstractFilter
-     }
- 
-     /**
-+     * Get 'from' part of the filter.
-+     *
-      * @param float $from
-      * @return float
-      */
-@@ -251,6 +257,8 @@ class Price extends AbstractFilter
-     }
- 
-     /**
-+     * Prepare filter data.
-+     *
-      * @param string $key
-      * @param int $count
-      * @return array
-diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php b/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php
-index 4ffd8ff4ba5..eb901498c4e 100644
---- a/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php
-+++ b/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php
-@@ -9,6 +9,9 @@ namespace Magento\CatalogSearch\Model\Layer\Search\Plugin;
- use Magento\Catalog\Model\Category;
- use Magento\Search\Model\QueryFactory;
- 
-+/**
-+ * Catalog search plugin for search collection filter in layered navigation.
-+ */
- class CollectionFilter
- {
-     /**
-diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
-index 4f14b7daba1..98caccea2ae 100644
---- a/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
-+++ b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
-@@ -9,6 +9,9 @@ namespace Magento\CatalogSearch\Model\Layer\Search;
- 
- use Magento\Catalog\Model\Layer\StateKeyInterface;
- 
-+/**
-+ * Catalog search state key for layered navigation.
-+ */
- class StateKey extends \Magento\Catalog\Model\Layer\Category\StateKey implements StateKeyInterface
- {
-     /**
-@@ -31,8 +34,7 @@ class StateKey extends \Magento\Catalog\Model\Layer\Category\StateKey implements
-     }
- 
-     /**
--     * @param \Magento\Catalog\Model\Category $category
--     * @return string|void
-+     * @inheritdoc
-      */
-     public function toString($category)
-     {
-diff --git a/app/code/Magento/CatalogSearch/Model/Price/Interval.php b/app/code/Magento/CatalogSearch/Model/Price/Interval.php
-index db1d550c372..ea2d24aeadf 100644
---- a/app/code/Magento/CatalogSearch/Model/Price/Interval.php
-+++ b/app/code/Magento/CatalogSearch/Model/Price/Interval.php
-@@ -7,6 +7,9 @@ namespace Magento\CatalogSearch\Model\Price;
- 
- use Magento\Framework\Search\Dynamic\IntervalInterface;
- 
-+/**
-+ * Catalog search price interval.
-+ */
- class Interval implements IntervalInterface
- {
-     /**
-@@ -23,7 +26,7 @@ class Interval implements IntervalInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function load($limit, $offset = null, $lower = null, $upper = null)
-     {
-@@ -32,7 +35,7 @@ class Interval implements IntervalInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function loadPrevious($data, $index, $lower = null)
-     {
-@@ -41,7 +44,7 @@ class Interval implements IntervalInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function loadNext($data, $rightIndex, $upper = null)
-     {
-@@ -50,6 +53,8 @@ class Interval implements IntervalInterface
-     }
- 
-     /**
-+     * Convert to float values.
-+     *
-      * @param array $prices
-      * @return array
-      */
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php
-index 8a5a6372bb2..05254a50aad 100644
---- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php
-@@ -8,7 +8,6 @@ namespace Magento\CatalogSearch\Model\ResourceModel;
- /**
-  * Advanced Catalog Search resource model
-  *
-- * @author      Magento Core Team <core@magentocommerce.com>
-  * @api
-  * @since 100.0.2
-  */
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
-index 57896ba5a79..9bd9a895a2a 100644
---- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
-@@ -3,23 +3,36 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\CatalogSearch\Model\ResourceModel\Advanced;
- 
- use Magento\Catalog\Model\Product;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
-+use Magento\Framework\Search\EngineResolverInterface;
-+use Magento\Search\Model\EngineResolver;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory;
- use Magento\Framework\Api\FilterBuilder;
-+use Magento\Framework\DB\Select;
- use Magento\Framework\Api\Search\SearchCriteriaBuilder;
- use Magento\Framework\Api\Search\SearchResultFactory;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\Exception\LocalizedException;
--use Magento\Framework\Search\Adapter\Mysql\TemporaryStorage;
- use Magento\Framework\Search\Request\EmptyRequestDataException;
- use Magento\Framework\Search\Request\NonExistingRequestNameException;
- use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Api\Search\SearchResultInterface;
- 
- /**
-- * Collection Advanced
-+ * Advanced search collection
-+ *
-+ * This collection should be refactored to not have dependencies on MySQL-specific implementation.
-  *
-- * @author      Magento Core Team <core@magentocommerce.com>
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @api
-  * @since 100.0.2
-@@ -39,6 +52,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
- 
-     /**
-      * @var \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory
-+     * @deprecated There must be no dependencies on specific adapter in generic search implementation
-      */
-     private $temporaryStorageFactory;
- 
-@@ -57,6 +71,41 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      */
-     private $filterBuilder;
- 
-+    /**
-+     * @var \Magento\Framework\Api\Search\SearchResultInterface
-+     */
-+    private $searchResult;
-+
-+    /**
-+     * @var string
-+     */
-+    private $searchRequestName;
-+
-+    /**
-+     * @var SearchCriteriaResolverFactory
-+     */
-+    private $searchCriteriaResolverFactory;
-+
-+    /**
-+     * @var SearchResultApplierFactory
-+     */
-+    private $searchResultApplierFactory;
-+
-+    /**
-+     * @var TotalRecordsResolverFactory
-+     */
-+    private $totalRecordsResolverFactory;
-+
-+    /**
-+     * @var EngineResolverInterface
-+     */
-+    private $engineResolver;
-+
-+    /**
-+     * @var array
-+     */
-+    private $searchOrders;
-+
-     /**
-      * Collection constructor
-      *
-@@ -70,7 +119,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param Product\OptionFactory $productOptionFactory
-@@ -86,7 +135,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      * @param SearchResultFactory|null $searchResultFactory
-      * @param ProductLimitationFactory|null $productLimitationFactory
-      * @param MetadataPool|null $metadataPool
--     *
-+     * @param string $searchRequestName
-+     * @param SearchCriteriaResolverFactory|null $searchCriteriaResolverFactory
-+     * @param SearchResultApplierFactory|null $searchResultApplierFactory
-+     * @param TotalRecordsResolverFactory|null $totalRecordsResolverFactory
-+     * @param EngineResolverInterface|null $engineResolver
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -100,7 +153,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-         \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
-@@ -115,15 +168,29 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
-         SearchResultFactory $searchResultFactory = null,
-         ProductLimitationFactory $productLimitationFactory = null,
--        MetadataPool $metadataPool = null
-+        MetadataPool $metadataPool = null,
-+        $searchRequestName = 'advanced_search_container',
-+        SearchCriteriaResolverFactory $searchCriteriaResolverFactory = null,
-+        SearchResultApplierFactory $searchResultApplierFactory = null,
-+        TotalRecordsResolverFactory $totalRecordsResolverFactory = null,
-+        EngineResolverInterface $engineResolver = null
-     ) {
-         $this->requestBuilder = $requestBuilder;
-         $this->searchEngine = $searchEngine;
-         $this->temporaryStorageFactory = $temporaryStorageFactory;
-+        $this->searchRequestName = $searchRequestName;
-         if ($searchResultFactory === null) {
-             $this->searchResultFactory = \Magento\Framework\App\ObjectManager::getInstance()
-                 ->get(\Magento\Framework\Api\Search\SearchResultFactory::class);
-         }
-+        $this->searchCriteriaResolverFactory = $searchCriteriaResolverFactory ?: ObjectManager::getInstance()
-+            ->get(SearchCriteriaResolverFactory::class);
-+        $this->searchResultApplierFactory = $searchResultApplierFactory ?: ObjectManager::getInstance()
-+            ->get(SearchResultApplierFactory::class);
-+        $this->totalRecordsResolverFactory = $totalRecordsResolverFactory ?: ObjectManager::getInstance()
-+            ->get(TotalRecordsResolverFactory::class);
-+        $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()
-+            ->get(EngineResolverInterface::class);
-         parent::__construct(
-             $entityFactory,
-             $logger,
-@@ -165,11 +232,89 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-         return $this;
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setOrder($attribute, $dir = Select::SQL_DESC)
-+    {
-+        $this->setSearchOrder($attribute, $dir);
-+        if ($this->isCurrentEngineMysql()) {
-+            parent::setOrder($attribute, $dir);
-+        }
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
-+    {
-+        /**
-+         * This changes need in backward compatible reasons for support dynamic improved algorithm
-+         * for price aggregation process.
-+         */
-+        if ($this->isCurrentEngineMysql()) {
-+            parent::addCategoryFilter($category);
-+        } else {
-+            $this->addFieldToFilter('category_ids', $category->getId());
-+            $this->_productLimitationPrice();
-+        }
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setVisibility($visibility)
-+    {
-+        /**
-+         * This changes need in backward compatible reasons for support dynamic improved algorithm
-+         * for price aggregation process.
-+         */
-+        if ($this->isCurrentEngineMysql()) {
-+            parent::setVisibility($visibility);
-+        } else {
-+            $this->addFieldToFilter('visibility', $visibility);
-+        }
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * Set sort order for search query.
-+     *
-+     * @param string $field
-+     * @param string $direction
-+     * @return void
-+     */
-+    private function setSearchOrder($field, $direction)
-+    {
-+        $field = (string)$this->_getMappedField($field);
-+        $direction = strtoupper($direction) == self::SORT_ORDER_ASC ? self::SORT_ORDER_ASC : self::SORT_ORDER_DESC;
-+
-+        $this->searchOrders[$field] = $direction;
-+    }
-+
-+    /**
-+     * Check if current engine is MYSQL.
-+     *
-+     * @return bool
-+     */
-+    private function isCurrentEngineMysql()
-+    {
-+        return $this->engineResolver->getCurrentSearchEngine() === EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE;
-+    }
-+
-     /**
-      * @inheritdoc
-      */
-     protected function _renderFiltersBefore()
-     {
-+        if ($this->isLoaded()) {
-+            return;
-+        }
-         if ($this->filters) {
-             foreach ($this->filters as $attributes) {
-                 foreach ($attributes as $attributeCode => $attributeValue) {
-@@ -177,34 +322,79 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-                     $this->addAttributeToSearch($attributeCode, $attributeValue);
-                 }
-             }
--            $searchCriteria = $this->getSearchCriteriaBuilder()->create();
--            $searchCriteria->setRequestName('advanced_search_container');
-+            $searchCriteria = $this->getSearchCriteriaResolver()->resolve();
-             try {
--                $searchResult = $this->getSearch()->search($searchCriteria);
-+                $this->searchResult = $this->getSearch()->search($searchCriteria);
-+                $this->_totalRecords = $this->getTotalRecordsResolver($this->searchResult)->resolve();
-             } catch (EmptyRequestDataException $e) {
-                 /** @var \Magento\Framework\Api\Search\SearchResultInterface $searchResult */
--                $searchResult = $this->searchResultFactory->create()->setItems([]);
-+                $this->searchResult = $this->searchResultFactory->create()->setItems([]);
-             } catch (NonExistingRequestNameException $e) {
-                 $this->_logger->error($e->getMessage());
-                 throw new LocalizedException(
-                     __('An error occurred. For details, see the error log.')
-                 );
-             }
--            $temporaryStorage = $this->temporaryStorageFactory->create();
--            $table = $temporaryStorage->storeApiDocuments($searchResult->getItems());
--
--            $this->getSelect()->joinInner(
--                [
--                    'search_result' => $table->getName(),
--                ],
--                'e.entity_id = search_result.' . TemporaryStorage::FIELD_ENTITY_ID,
--                []
--            );
-+            $this->getSearchResultApplier($this->searchResult)->apply();
-         }
-         parent::_renderFiltersBefore();
-     }
- 
-     /**
-+     * Get total records resolver.
-+     *
-+     * @param SearchResultInterface $searchResult
-+     * @return TotalRecordsResolverInterface
-+     */
-+    private function getTotalRecordsResolver(SearchResultInterface $searchResult): TotalRecordsResolverInterface
-+    {
-+        return $this->totalRecordsResolverFactory->create(
-+            [
-+            'searchResult' => $searchResult,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Get search criteria resolver.
-+     *
-+     * @return SearchCriteriaResolverInterface
-+     */
-+    private function getSearchCriteriaResolver(): SearchCriteriaResolverInterface
-+    {
-+        return $this->searchCriteriaResolverFactory->create(
-+            [
-+            'builder' => $this->getSearchCriteriaBuilder(),
-+            'collection' => $this,
-+            'searchRequestName' => $this->searchRequestName,
-+            'currentPage' => $this->_curPage,
-+            'size' => $this->getPageSize(),
-+            'orders' => $this->searchOrders,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Get search result applier.
-+     *
-+     * @param SearchResultInterface $searchResult
-+     * @return SearchResultApplierInterface
-+     */
-+    private function getSearchResultApplier(SearchResultInterface $searchResult): SearchResultApplierInterface
-+    {
-+        return $this->searchResultApplierFactory->create(
-+            [
-+            'collection' => $this,
-+            'searchResult' => $searchResult,
-+            /** This variable sets by serOrder method, but doesn't have a getter method. */
-+            'orders' => $this->_orders
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Get attribute code.
-+     *
-      * @param string $attributeCode
-      * @return string
-      */
-@@ -264,6 +454,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
-+     * Get search.
-+     *
-      * @return \Magento\Search\Api\SearchInterface
-      */
-     private function getSearch()
-@@ -276,6 +468,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
-+     * Get search criteria builder.
-+     *
-      * @return SearchCriteriaBuilder
-      */
-     private function getSearchCriteriaBuilder()
-@@ -288,6 +482,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
-+     * Get filter builder.
-+     *
-      * @return FilterBuilder
-      */
-     private function getFilterBuilder()
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
-index fac8c4d2a47..93ae2c94e21 100644
---- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
-@@ -7,6 +7,9 @@ namespace Magento\CatalogSearch\Model\ResourceModel;
- 
- /**
-  * CatalogSearch Fulltext Index Engine resource model
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class Engine implements EngineInterface
- {
-@@ -107,7 +110,9 @@ class Engine implements EngineInterface
-             && in_array($attribute->getFrontendInput(), ['text', 'textarea'])
-         ) {
-             $result = $value;
--        } elseif ($this->isTermFilterableAttribute($attribute)) {
-+        } elseif ($this->isTermFilterableAttribute($attribute)
-+            || ($attribute->getIsSearchable() && in_array($attribute->getFrontendInput(), ['select', 'multiselect']))
-+        ) {
-             $result = '';
-         }
- 
-@@ -116,6 +121,7 @@ class Engine implements EngineInterface
- 
-     /**
-      * Prepare index array as a string glued by separator
-+     *
-      * Support 2 level array gluing
-      *
-      * @param array $index
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
-index 0182b09bcac..4b9db55105e 100644
---- a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
-@@ -3,13 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--/**
-- * CatalogSearch Index Engine Interface
-- */
- namespace Magento\CatalogSearch\Model\ResourceModel;
- 
- /**
-+ * CatalogSearch Index Engine Interface
-+ *
-  * @api
-  * @since 100.0.2
-  */
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
-index aa883aeb842..d1259159606 100644
---- a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
-@@ -4,15 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Catalog Search engine provider
-- */
- namespace Magento\CatalogSearch\Model\ResourceModel;
- 
--use Magento\CatalogSearch\Model\ResourceModel\EngineInterface;
- use Magento\Framework\Search\EngineResolverInterface;
- 
- /**
-+ * Catalog Search engine provider
-+ *
-  * @api
-  * @since 100.0.2
-  */
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
-index 0408957e511..7e4b4f764f6 100644
---- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
-@@ -3,13 +3,22 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext;
- 
--use Magento\CatalogSearch\Model\Search\RequestGenerator;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
-+use Magento\Framework\Search\EngineResolverInterface;
-+use Magento\Framework\Data\Collection\Db\SizeResolverInterfaceFactory;
- use Magento\Framework\DB\Select;
-+use Magento\Framework\Api\Search\SearchResultInterface;
-+use Magento\CatalogSearch\Model\Search\RequestGenerator;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\Exception\StateException;
--use Magento\Framework\Search\Adapter\Mysql\TemporaryStorage;
- use Magento\Framework\Search\Response\QueryResponse;
- use Magento\Framework\Search\Request\EmptyRequestDataException;
- use Magento\Framework\Search\Request\NonExistingRequestNameException;
-@@ -17,13 +26,18 @@ use Magento\Framework\Api\Search\SearchResultFactory;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\App\ObjectManager;
- use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
-+use Magento\Search\Model\EngineResolver;
- 
- /**
-  * Fulltext Collection
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ *
-+ * This collection should be refactored to not have dependencies on MySQL-specific implementation.
-  *
-  * @api
-  * @since 100.0.2
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.TooManyFields)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
- {
-@@ -58,11 +72,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      */
-     private $queryText;
- 
--    /**
--     * @var string|null
--     */
--    private $relevanceOrderDirection = null;
--
-     /**
-      * @var string
-      */
-@@ -70,6 +79,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
- 
-     /**
-      * @var \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory
-+     * @deprecated There must be no dependencies on specific adapter in generic search implementation
-      */
-     private $temporaryStorageFactory;
- 
-@@ -98,6 +108,31 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      */
-     private $filterBuilder;
- 
-+    /**
-+     * @var SearchCriteriaResolverFactory
-+     */
-+    private $searchCriteriaResolverFactory;
-+
-+    /**
-+     * @var SearchResultApplierFactory
-+     */
-+    private $searchResultApplierFactory;
-+
-+    /**
-+     * @var TotalRecordsResolverFactory
-+     */
-+    private $totalRecordsResolverFactory;
-+
-+    /**
-+     * @var EngineResolverInterface
-+     */
-+    private $engineResolver;
-+
-+    /**
-+     * @var array
-+     */
-+    private $searchOrders;
-+
-     /**
-      * Collection constructor
-      *
-@@ -111,7 +146,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
-@@ -129,8 +164,15 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      * @param SearchResultFactory|null $searchResultFactory
-      * @param ProductLimitationFactory|null $productLimitationFactory
-      * @param MetadataPool|null $metadataPool
--     *
-+     * @param \Magento\Search\Api\SearchInterface|null $search
-+     * @param \Magento\Framework\Api\Search\SearchCriteriaBuilder|null $searchCriteriaBuilder
-+     * @param \Magento\Framework\Api\FilterBuilder|null $filterBuilder
-+     * @param SearchCriteriaResolverFactory|null $searchCriteriaResolverFactory
-+     * @param SearchResultApplierFactory|null $searchResultApplierFactory
-+     * @param TotalRecordsResolverFactory|null $totalRecordsResolverFactory
-+     * @param EngineResolverInterface|null $engineResolver
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-     public function __construct(
-         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
-@@ -143,7 +185,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-         \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
-@@ -160,7 +202,14 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-         $searchRequestName = 'catalog_view_container',
-         SearchResultFactory $searchResultFactory = null,
-         ProductLimitationFactory $productLimitationFactory = null,
--        MetadataPool $metadataPool = null
-+        MetadataPool $metadataPool = null,
-+        \Magento\Search\Api\SearchInterface $search = null,
-+        \Magento\Framework\Api\Search\SearchCriteriaBuilder $searchCriteriaBuilder = null,
-+        \Magento\Framework\Api\FilterBuilder $filterBuilder = null,
-+        SearchCriteriaResolverFactory $searchCriteriaResolverFactory = null,
-+        SearchResultApplierFactory $searchResultApplierFactory = null,
-+        TotalRecordsResolverFactory $totalRecordsResolverFactory = null,
-+        EngineResolverInterface $engineResolver = null
-     ) {
-         $this->queryFactory = $catalogSearchData;
-         if ($searchResultFactory === null) {
-@@ -195,9 +244,24 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-         $this->searchEngine = $searchEngine;
-         $this->temporaryStorageFactory = $temporaryStorageFactory;
-         $this->searchRequestName = $searchRequestName;
-+        $this->search = $search ?: ObjectManager::getInstance()->get(\Magento\Search\Api\SearchInterface::class);
-+        $this->searchCriteriaBuilder = $searchCriteriaBuilder ?: ObjectManager::getInstance()
-+            ->get(\Magento\Framework\Api\Search\SearchCriteriaBuilder::class);
-+        $this->filterBuilder = $filterBuilder ?: ObjectManager::getInstance()
-+            ->get(\Magento\Framework\Api\FilterBuilder::class);
-+        $this->searchCriteriaResolverFactory = $searchCriteriaResolverFactory ?: ObjectManager::getInstance()
-+            ->get(SearchCriteriaResolverFactory::class);
-+        $this->searchResultApplierFactory = $searchResultApplierFactory ?: ObjectManager::getInstance()
-+            ->get(SearchResultApplierFactory::class);
-+        $this->totalRecordsResolverFactory = $totalRecordsResolverFactory ?: ObjectManager::getInstance()
-+            ->get(TotalRecordsResolverFactory::class);
-+        $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()
-+            ->get(EngineResolverInterface::class);
-     }
- 
-     /**
-+     * Get search.
-+     *
-      * @deprecated 100.1.0
-      * @return \Magento\Search\Api\SearchInterface
-      */
-@@ -210,6 +274,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
-+     * Test search.
-+     *
-      * @deprecated 100.1.0
-      * @param \Magento\Search\Api\SearchInterface $object
-      * @return void
-@@ -221,6 +287,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
-+     * Set search criteria builder.
-+     *
-      * @deprecated 100.1.0
-      * @return \Magento\Framework\Api\Search\SearchCriteriaBuilder
-      */
-@@ -234,6 +302,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
-+     * Set search criteria builder.
-+     *
-      * @deprecated 100.1.0
-      * @param \Magento\Framework\Api\Search\SearchCriteriaBuilder $object
-      * @return void
-@@ -245,6 +315,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
-+     * Get filter builder.
-+     *
-      * @deprecated 100.1.0
-      * @return \Magento\Framework\Api\FilterBuilder
-      */
-@@ -257,6 +329,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
-+     * Set filter builder.
-+     *
-      * @deprecated 100.1.0
-      * @param \Magento\Framework\Api\FilterBuilder $object
-      * @return void
-@@ -271,7 +345,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      * Apply attribute filter to facet collection
-      *
-      * @param string $field
--     * @param null $condition
-+     * @param mixed|null $condition
-      * @return $this
-      */
-     public function addFieldToFilter($field, $condition = null)
-@@ -316,32 +390,32 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     /**
-      * @inheritdoc
-      */
--    protected function _renderFiltersBefore()
-+    public function setOrder($attribute, $dir = Select::SQL_DESC)
-     {
--        $this->getSearchCriteriaBuilder();
--        $this->getFilterBuilder();
--        $this->getSearch();
--
--        if ($this->queryText) {
--            $this->filterBuilder->setField('search_term');
--            $this->filterBuilder->setValue($this->queryText);
--            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
-+        $this->setSearchOrder($attribute, $dir);
-+        if ($this->isCurrentEngineMysql()) {
-+            parent::setOrder($attribute, $dir);
-         }
- 
--        $priceRangeCalculation = $this->_scopeConfig->getValue(
--            \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory::XML_PATH_RANGE_CALCULATION,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--        );
--        if ($priceRangeCalculation) {
--            $this->filterBuilder->setField('price_dynamic_algorithm');
--            $this->filterBuilder->setValue($priceRangeCalculation);
--            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
-+        return $this;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _renderFiltersBefore()
-+    {
-+        if ($this->isLoaded()) {
-+            return;
-         }
- 
--        $searchCriteria = $this->searchCriteriaBuilder->create();
--        $searchCriteria->setRequestName($this->searchRequestName);
-+        $this->prepareSearchTermFilter();
-+        $this->preparePriceAggregation();
-+
-+        $searchCriteria = $this->getSearchCriteriaResolver()->resolve();
-         try {
-             $this->searchResult = $this->getSearch()->search($searchCriteria);
-+            $this->_totalRecords = $this->getTotalRecordsResolver($this->searchResult)->resolve();
-         } catch (EmptyRequestDataException $e) {
-             /** @var \Magento\Framework\Api\Search\SearchResultInterface $searchResult */
-             $this->searchResult = $this->searchResultFactory->create()->setItems([]);
-@@ -350,23 +424,85 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-             throw new LocalizedException(__('An error occurred. For details, see the error log.'));
-         }
- 
--        $temporaryStorage = $this->temporaryStorageFactory->create();
--        $table = $temporaryStorage->storeApiDocuments($this->searchResult->getItems());
-+        $this->getSearchResultApplier($this->searchResult)->apply();
-+        parent::_renderFiltersBefore();
-+    }
-+
-+    /**
-+     * Set sort order for search query.
-+     *
-+     * @param string $field
-+     * @param string $direction
-+     * @return void
-+     */
-+    private function setSearchOrder($field, $direction)
-+    {
-+        $field = (string)$this->_getMappedField($field);
-+        $direction = strtoupper($direction) == self::SORT_ORDER_ASC ? self::SORT_ORDER_ASC : self::SORT_ORDER_DESC;
-+
-+        $this->searchOrders[$field] = $direction;
-+    }
- 
--        $this->getSelect()->joinInner(
-+    /**
-+     * Check if current engine is MYSQL.
-+     *
-+     * @return bool
-+     */
-+    private function isCurrentEngineMysql()
-+    {
-+        return $this->engineResolver->getCurrentSearchEngine() === EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE;
-+    }
-+
-+    /**
-+     * Get total records resolver.
-+     *
-+     * @param SearchResultInterface $searchResult
-+     * @return TotalRecordsResolverInterface
-+     */
-+    private function getTotalRecordsResolver(SearchResultInterface $searchResult): TotalRecordsResolverInterface
-+    {
-+        return $this->totalRecordsResolverFactory->create(
-             [
--                'search_result' => $table->getName(),
--            ],
--            'e.entity_id = search_result.' . TemporaryStorage::FIELD_ENTITY_ID,
--            []
-+            'searchResult' => $searchResult,
-+            ]
-         );
-+    }
- 
--        if ($this->relevanceOrderDirection) {
--            $this->getSelect()->order(
--                'search_result.'. TemporaryStorage::FIELD_SCORE . ' ' . $this->relevanceOrderDirection
--            );
--        }
--        return parent::_renderFiltersBefore();
-+    /**
-+     * Get search criteria resolver.
-+     *
-+     * @return SearchCriteriaResolverInterface
-+     */
-+    private function getSearchCriteriaResolver(): SearchCriteriaResolverInterface
-+    {
-+        return $this->searchCriteriaResolverFactory->create(
-+            [
-+            'builder' => $this->getSearchCriteriaBuilder(),
-+            'collection' => $this,
-+            'searchRequestName' => $this->searchRequestName,
-+            'currentPage' => $this->_curPage,
-+            'size' => $this->getPageSize(),
-+            'orders' => $this->searchOrders,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Get search result applier.
-+     *
-+     * @param SearchResultInterface $searchResult
-+     * @return SearchResultApplierInterface
-+     */
-+    private function getSearchResultApplier(SearchResultInterface $searchResult): SearchResultApplierInterface
-+    {
-+        return $this->searchResultApplierFactory->create(
-+            [
-+            'collection' => $this,
-+            'searchResult' => $searchResult,
-+            /** This variable sets by serOrder method, but doesn't have a getter method. */
-+            'orders' => $this->_orders,
-+            ]
-+        );
-     }
- 
-     /**
-@@ -384,6 +520,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
-+     * Render filters.
-+     *
-      * @return $this
-      */
-     protected function _renderFilters()
-@@ -392,24 +530,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-         return parent::_renderFilters();
-     }
- 
--    /**
--     * Set Order field
--     *
--     * @param string $attribute
--     * @param string $dir
--     * @return $this
--     */
--    public function setOrder($attribute, $dir = Select::SQL_DESC)
--    {
--        if ($attribute === 'relevance') {
--            $this->relevanceOrderDirection = $dir;
--        } else {
--            parent::setOrder($attribute, $dir);
--        }
--
--        return $this;
--    }
--
-     /**
-      * Stub method for compatibility with other search engines
-      *
-@@ -456,7 +576,17 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
-     {
-         $this->addFieldToFilter('category_ids', $category->getId());
--        return parent::addCategoryFilter($category);
-+        /**
-+         * This changes need in backward compatible reasons for support dynamic improved algorithm
-+         * for price aggregation process.
-+         */
-+        if ($this->isCurrentEngineMysql()) {
-+            parent::addCategoryFilter($category);
-+        } else {
-+            $this->_productLimitationPrice();
-+        }
-+
-+        return $this;
-     }
- 
-     /**
-@@ -468,6 +598,46 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     public function setVisibility($visibility)
-     {
-         $this->addFieldToFilter('visibility', $visibility);
--        return parent::setVisibility($visibility);
-+        /**
-+         * This changes need in backward compatible reasons for support dynamic improved algorithm
-+         * for price aggregation process.
-+         */
-+        if ($this->isCurrentEngineMysql()) {
-+            parent::setVisibility($visibility);
-+        }
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * Prepare search term filter for text query.
-+     *
-+     * @return void
-+     */
-+    private function prepareSearchTermFilter(): void
-+    {
-+        if ($this->queryText) {
-+            $this->filterBuilder->setField('search_term');
-+            $this->filterBuilder->setValue($this->queryText);
-+            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
-+        }
-+    }
-+
-+    /**
-+     * Prepare price aggregation algorithm.
-+     *
-+     * @return void
-+     */
-+    private function preparePriceAggregation(): void
-+    {
-+        $priceRangeCalculation = $this->_scopeConfig->getValue(
-+            \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory::XML_PATH_RANGE_CALCULATION,
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+        );
-+        if ($priceRangeCalculation) {
-+            $this->filterBuilder->setField('price_dynamic_algorithm');
-+            $this->filterBuilder->setValue($priceRangeCalculation);
-+            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
-+        }
-     }
- }
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php
-new file mode 100644
-index 00000000000..632e1ab9270
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php
-@@ -0,0 +1,51 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
-+
-+use Magento\Framework\Data\Collection;
-+use Magento\Framework\Api\Search\SearchCriteriaBuilder;
-+use Magento\Framework\Api\Search\SearchCriteria;
-+
-+/**
-+ * Resolve specific attributes for search criteria.
-+ */
-+class SearchCriteriaResolver implements SearchCriteriaResolverInterface
-+{
-+    /**
-+     * @var SearchCriteriaBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var string
-+     */
-+    private $searchRequestName;
-+
-+    /**
-+     * SearchCriteriaResolver constructor.
-+     * @param SearchCriteriaBuilder $builder
-+     * @param string $searchRequestName
-+     */
-+    public function __construct(
-+        SearchCriteriaBuilder $builder,
-+        string $searchRequestName
-+    ) {
-+        $this->builder = $builder;
-+        $this->searchRequestName = $searchRequestName;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve() : SearchCriteria
-+    {
-+        $searchCriteria = $this->builder->create();
-+        $searchCriteria->setRequestName($this->searchRequestName);
-+
-+        return $searchCriteria;
-+    }
-+}
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolverInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolverInterface.php
-new file mode 100644
-index 00000000000..047fa7f71e4
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolverInterface.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
-+
-+use Magento\Framework\Api\Search\SearchCriteria;
-+
-+/**
-+ * Resolve specific attributes for search criteria.
-+ */
-+interface SearchCriteriaResolverInterface
-+{
-+    /**
-+     * Resolve specific attribute.
-+     *
-+     * @return SearchCriteria
-+     */
-+    public function resolve(): SearchCriteria;
-+}
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
-new file mode 100644
-index 00000000000..20c237646e5
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
-@@ -0,0 +1,79 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
-+
-+use Magento\Framework\Data\Collection;
-+use Magento\Framework\Search\Adapter\Mysql\TemporaryStorage;
-+use Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory;
-+use Magento\Framework\Api\Search\SearchResultInterface;
-+
-+/**
-+ * Resolve specific attributes for search criteria.
-+ */
-+class SearchResultApplier implements SearchResultApplierInterface
-+{
-+    /**
-+     * @var Collection
-+     */
-+    private $collection;
-+
-+    /**
-+     * @var SearchResultInterface
-+     */
-+    private $searchResult;
-+
-+    /**
-+     * @var TemporaryStorageFactory
-+     */
-+    private $temporaryStorageFactory;
-+
-+    /**
-+     * @var array
-+     */
-+    private $orders;
-+
-+    /**
-+     * @param Collection $collection
-+     * @param SearchResultInterface $searchResult
-+     * @param TemporaryStorageFactory $temporaryStorageFactory
-+     * @param array $orders
-+     */
-+    public function __construct(
-+        Collection $collection,
-+        SearchResultInterface $searchResult,
-+        TemporaryStorageFactory $temporaryStorageFactory,
-+        array $orders
-+    ) {
-+        $this->collection = $collection;
-+        $this->searchResult = $searchResult;
-+        $this->temporaryStorageFactory = $temporaryStorageFactory;
-+        $this->orders = $orders;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function apply()
-+    {
-+        $temporaryStorage = $this->temporaryStorageFactory->create();
-+        $table = $temporaryStorage->storeApiDocuments($this->searchResult->getItems());
-+
-+        $this->collection->getSelect()->joinInner(
-+            [
-+                'search_result' => $table->getName(),
-+            ],
-+            'e.entity_id = search_result.' . TemporaryStorage::FIELD_ENTITY_ID,
-+            []
-+        );
-+
-+        if (isset($this->orders['relevance'])) {
-+            $this->collection->getSelect()->order(
-+                'search_result.' . TemporaryStorage::FIELD_SCORE . ' ' . $this->orders['relevance']
-+            );
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplierInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplierInterface.php
-new file mode 100644
-index 00000000000..1b3e2a6bbac
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplierInterface.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
-+
-+/**
-+ * Resolve specific attributes for search criteria.
-+ */
-+interface SearchResultApplierInterface
-+{
-+    /**
-+     * Apply search results to collection.
-+     *
-+     * @return void
-+     */
-+    public function apply();
-+}
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolver.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolver.php
-new file mode 100644
-index 00000000000..12b6f813139
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolver.php
-@@ -0,0 +1,23 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
-+
-+/**
-+ * Resolve total records count.
-+ *
-+ * For Mysql search engine we can't resolve total record count before full load of collection.
-+ */
-+class TotalRecordsResolver implements TotalRecordsResolverInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(): ?int
-+    {
-+        return null;
-+    }
-+}
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolverInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolverInterface.php
-new file mode 100644
-index 00000000000..190450f9606
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolverInterface.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
-+
-+/**
-+ * Resolve total records count.
-+ */
-+interface TotalRecordsResolverInterface
-+{
-+    /**
-+     * Resolve total records.
-+     *
-+     * @return int
-+     */
-+    public function resolve(): ?int;
-+}
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
-index b958de91314..6cdcc7c55a2 100644
---- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
-@@ -10,6 +10,7 @@ namespace Magento\CatalogSearch\Model\ResourceModel\Search;
-  * Search collection
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @api
-  * @since 100.0.2
-  */
-@@ -49,7 +50,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
-@@ -60,7 +61,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
-      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory
-      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
--     *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -74,7 +74,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-         \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
-@@ -269,6 +269,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
- 
-         $sql = $this->_getSearchInOptionSql($query);
-         if ($sql) {
-+            // phpcs:ignore Magento2.SQL.RawQuery
-             $selects[] = "SELECT * FROM ({$sql}) AS inoptionsql"; // inherent unions may be inside
-         }
- 
-diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Setup/PropertyMapper.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Setup/PropertyMapper.php
-new file mode 100644
-index 00000000000..f72e1536f47
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Setup/PropertyMapper.php
-@@ -0,0 +1,34 @@
-+<?php
-+declare(strict_types=1);
-+
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\CatalogSearch\Model\ResourceModel\Setup;
-+
-+use Magento\Eav\Model\Entity\Setup\PropertyMapperAbstract;
-+
-+/**
-+ * Class PropertyMapper
-+ *
-+ * @package Magento\CatalogSearch\Model\ResourceModel\Setup
-+ */
-+class PropertyMapper extends PropertyMapperAbstract
-+{
-+    /**
-+     * Map input attribute properties to storage representation
-+     *
-+     * @param array $input
-+     * @param int $entityTypeId
-+     * @return array
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function map(array $input, $entityTypeId): array
-+    {
-+        return [
-+            'search_weight' => $this->_getValue($input, 'search_weight', 1),
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/BaseSelectStrategyInterface.php b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/BaseSelectStrategyInterface.php
-index c6495015fee..2d8dfb92224 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/BaseSelectStrategyInterface.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/BaseSelectStrategyInterface.php
-@@ -8,8 +8,10 @@ namespace Magento\CatalogSearch\Model\Search\BaseSelectStrategy;
- use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
- 
- /**
-- * Interface BaseSelectStrategyInterface
-  * This interface represents strategy that will be used to create base select for search request
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- interface BaseSelectStrategyInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
-index 65759685c2b..e554d3c774a 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
-@@ -10,8 +10,10 @@ use Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy\BaseSelectFullT
- use Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy\BaseSelectAttributesSearchStrategy;
- 
- /**
-- * Class StrategyMapper
-  * This class is responsible for deciding which BaseSelectStrategyInterface should be used for passed SelectContainer
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class StrategyMapper
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/Catalog.php b/app/code/Magento/CatalogSearch/Model/Search/Catalog.php
-index 4572336d761..31ac889b19e 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/Catalog.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/Catalog.php
-@@ -9,8 +9,6 @@ use Magento\Search\Model\QueryFactory;
- 
- /**
-  * Search model for backend search
-- *
-- * @deprecated 100.2.0
-  */
- class Catalog extends \Magento\Framework\DataObject
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php b/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php
-index 98bf1e5984a..657c8540d7c 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php
-@@ -10,8 +10,10 @@ use Magento\Eav\Model\Config as EavConfig;
- use Magento\Catalog\Model\Product;
- 
- /**
-- * Class CustomAttributeFilterSelector
-  * Checks if FilterInterface is by custom attribute
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class CustomAttributeFilterCheck
- {
-@@ -42,7 +44,7 @@ class CustomAttributeFilterCheck
- 
-         return $attribute
-             && $filter->getType() === FilterInterface::TYPE_TERM
--            && in_array($attribute->getFrontendInput(), ['select', 'multiselect'], true);
-+            && in_array($attribute->getFrontendInput(), ['select', 'multiselect', 'boolean'], true);
-     }
- 
-     /**
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php
-index fc93b86f5da..8c796f87706 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php
-@@ -16,8 +16,10 @@ use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
- use Magento\Catalog\Model\Product;
- 
- /**
-- * Class CustomAttributeFilter
-- * Applies filters by custom attributes to base select
-+ * Applies filters by custom attributes to base select.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class CustomAttributeFilter
- {
-@@ -71,13 +73,13 @@ class CustomAttributeFilter
-      * Applies filters by custom attributes to base select
-      *
-      * @param Select $select
--     * @param FilterInterface[] ...$filters
-+     * @param FilterInterface[] $filters
-      * @return Select
-      * @throws \Magento\Framework\Exception\LocalizedException
-      * @throws \InvalidArgumentException
-      * @throws \DomainException
-      */
--    public function apply(Select $select, FilterInterface ... $filters)
-+    public function apply(Select $select, FilterInterface ...$filters)
-     {
-         $select = clone $select;
-         $mainTableAlias = $this->extractTableAliasFromSelect($select);
-@@ -141,7 +143,6 @@ class CustomAttributeFilter
-     {
-         return [
-             sprintf('`%s`.`entity_id` = `%s`.`entity_id`', $mainTable, $joinTable),
--            sprintf('`%s`.`source_id` = `%s`.`source_id`', $mainTable, $joinTable),
-             $this->conditionManager->generateCondition(
-                 sprintf('%s.attribute_id', $joinTable),
-                 '=',
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/DimensionsProcessor.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/DimensionsProcessor.php
-index 67f427d4be4..3d2b9eed037 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/DimensionsProcessor.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/DimensionsProcessor.php
-@@ -16,6 +16,9 @@ use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
- /**
-  * Class DimensionsProcessor
-  * Adds dimension conditions to select query
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class DimensionsProcessor
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php
-index 512dd69aad9..c382569338e 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php
-@@ -21,6 +21,9 @@ use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
- /**
-  * Strategy which processes exclusions from general rules
-  *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class ExclusionStrategy implements FilterStrategyInterface
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php
-index 0c823331633..67ed66da2a0 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php
-@@ -13,7 +13,10 @@ use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
- /**
-  * FilterContext represents a Context of the Strategy pattern
-  * Its responsibility is to choose appropriate strategy to apply passed filter to the Select
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class FilterContext implements FilterStrategyInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterMapper.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterMapper.php
-index 27128327554..7136fad5b19 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterMapper.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterMapper.php
-@@ -13,6 +13,9 @@ use Magento\CatalogInventory\Model\Stock;
- /**
-  * Class FilterMapper
-  * This class applies filters to Select based on SelectContainer configuration
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class FilterMapper
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterStrategyInterface.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterStrategyInterface.php
-index b59f7eeec97..a61c691c0d5 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterStrategyInterface.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterStrategyInterface.php
-@@ -10,6 +10,8 @@ namespace Magento\CatalogSearch\Model\Search\FilterMapper;
-  * FilterStrategyInterface provides the interface to work with strategies
-  * @api
-  * @since 100.1.6
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- interface FilterStrategyInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StaticAttributeStrategy.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StaticAttributeStrategy.php
-index 8544b463dbb..3986cc617f0 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StaticAttributeStrategy.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StaticAttributeStrategy.php
-@@ -12,6 +12,9 @@ use Magento\Framework\DB\Select;
- 
- /**
-  * This strategy handles static attributes
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class StaticAttributeStrategy implements FilterStrategyInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilter.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilter.php
-index 1cd9d1a3dd7..0e3ba0d4e66 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilter.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilter.php
-@@ -15,6 +15,9 @@ use Magento\CatalogInventory\Api\StockRegistryInterface;
- /**
-  * Class StockStatusFilter
-  * Adds filter by stock status to base select
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class StockStatusFilter
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy.php
-index 6b5dce5fde4..9d7e31ee3b6 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy.php
-@@ -15,6 +15,9 @@ use Magento\Framework\App\ObjectManager;
-  * This strategy handles attributes which comply with two criteria:
-  *   - The filter for dropdown or multi-select attribute
-  *   - The filter is Term filter
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class TermDropdownStrategy implements FilterStrategyInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/ApplyStockConditionToSelect.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/ApplyStockConditionToSelect.php
-index dee8b09a051..c28bc3485cf 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/ApplyStockConditionToSelect.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/ApplyStockConditionToSelect.php
-@@ -13,6 +13,9 @@ use Magento\CatalogInventory\Model\Stock\Status;
- 
- /**
-  * Apply stock condition to select.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class ApplyStockConditionToSelect
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/SelectBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/SelectBuilder.php
-index fccbfa364d8..007647db39b 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/SelectBuilder.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/SelectBuilder.php
-@@ -16,6 +16,9 @@ use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * Add joins to select.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class SelectBuilder
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php
-index a615d76bef4..690ef9115ed 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php
-@@ -16,6 +16,9 @@ use Magento\Eav\Model\Config as EavConfig;
- /**
-  * Class VisibilityFilter
-  * Applies filter by visibility to base select
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class VisibilityFilter
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/FiltersExtractor.php b/app/code/Magento/CatalogSearch/Model/Search/FiltersExtractor.php
-index 53c27eb66f6..55c85829799 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/FiltersExtractor.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/FiltersExtractor.php
-@@ -12,6 +12,9 @@ use Magento\Framework\Search\Request\Filter\BoolExpression;
- /**
-  * Class FiltersExtractor
-  * Extracts filters from QueryInterface
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class FiltersExtractor
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
-index 890a0d40001..906220db28d 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
-@@ -26,6 +26,8 @@ use Magento\CatalogSearch\Model\Search\FilterMapper\FilterMapper;
- /**
-  * Build base Query for Index
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class IndexBuilder implements IndexBuilderInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/ItemCollectionProvider.php b/app/code/Magento/CatalogSearch/Model/Search/ItemCollectionProvider.php
-new file mode 100644
-index 00000000000..f621bcbf918
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Model/Search/ItemCollectionProvider.php
-@@ -0,0 +1,50 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\CatalogSearch\Model\Search;
-+
-+use Magento\Framework\Search\EngineResolverInterface;
-+use Magento\Framework\Data\Collection;
-+
-+/**
-+ * Search collection provider.
-+ */
-+class ItemCollectionProvider implements ItemCollectionProviderInterface
-+{
-+    /**
-+     * @var EngineResolverInterface
-+     */
-+    private $engineResolver;
-+
-+    /**
-+     * @var array
-+     */
-+    private $factories;
-+
-+    /**
-+     * ItemCollectionProvider constructor.
-+     * @param EngineResolverInterface $engineResolver
-+     * @param array $factories
-+     */
-+    public function __construct(
-+        EngineResolverInterface $engineResolver,
-+        array $factories
-+    ) {
-+        $this->engineResolver = $engineResolver;
-+        $this->factories = $factories;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getCollection(): Collection
-+    {
-+        if (!isset($this->factories[$this->engineResolver->getCurrentSearchEngine()])) {
-+            throw new \DomainException('Undefined factory ' . $this->engineResolver->getCurrentSearchEngine());
-+        }
-+        return $this->factories[$this->engineResolver->getCurrentSearchEngine()]->create();
-+    }
-+}
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/ItemCollectionProviderInterface.php b/app/code/Magento/CatalogSearch/Model/Search/ItemCollectionProviderInterface.php
-new file mode 100644
-index 00000000000..db02d5ac5f5
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Model/Search/ItemCollectionProviderInterface.php
-@@ -0,0 +1,23 @@
-+<?php
-+/**
-+ *
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\CatalogSearch\Model\Search;
-+
-+use Magento\Framework\Data\Collection;
-+
-+/**
-+ * Search collection provider.
-+ */
-+interface ItemCollectionProviderInterface
-+{
-+    /**
-+     * Get collection.
-+     *
-+     * @return Collection
-+     */
-+    public function getCollection() : Collection;
-+}
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php b/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php
-index f6c2ac0a4f5..a47ea543752 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php
-@@ -12,6 +12,9 @@ use Magento\Framework\Search\Request\Query\Filter;
- 
- /**
-  * Class is responsible for checking if fulltext search is required for search query
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class FullTextSearchCheck
- {
-@@ -22,7 +25,7 @@ class FullTextSearchCheck
-      * to join catalog_eav_attribute table to search query or not
-      *
-      * In case when the $query does not requires full text search
--     * - we can skipp joining catalog_eav_attribute table because it becomes excessive
-+     * - we can skip joining catalog_eav_attribute table because it becomes excessive
-      *
-      * @param QueryInterface $query
-      * @return bool
-@@ -34,6 +37,8 @@ class FullTextSearchCheck
-     }
- 
-     /**
-+     * Process query
-+     *
-      * @param QueryInterface $query
-      * @return bool
-      * @throws \InvalidArgumentException
-@@ -59,6 +64,8 @@ class FullTextSearchCheck
-     }
- 
-     /**
-+     * Process boolean query
-+     *
-      * @param BoolExpression $query
-      * @return bool
-      * @throws \InvalidArgumentException
-@@ -87,6 +94,8 @@ class FullTextSearchCheck
-     }
- 
-     /**
-+     * Process filter query
-+     *
-      * @param Filter $query
-      * @return bool
-      * @throws \InvalidArgumentException
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php b/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php
-index 8ddc8408959..916e03f4714 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php
-@@ -5,6 +5,10 @@
-  */
- namespace Magento\CatalogSearch\Model\Search;
- 
-+/**
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class ReaderPlugin
- {
-     /**
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
-index 6f6a5eed642..8f8ba39ebd3 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
-@@ -14,6 +14,8 @@ use Magento\Framework\Search\Request\FilterInterface;
- use Magento\Framework\Search\Request\QueryInterface;
- 
- /**
-+ * Catalog search request generator.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -101,7 +103,7 @@ class RequestGenerator
-                 }
-             }
-             /** @var $attribute Attribute */
--            if (!$attribute->getIsSearchable() || in_array($attribute->getAttributeCode(), ['price', 'sku'], true)) {
-+            if (!$attribute->getIsSearchable() || in_array($attribute->getAttributeCode(), ['price'], true)) {
-                 // Some fields have their own specific handlers
-                 continue;
-             }
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php
-index 3fb3021ff9d..b3d39a48fe9 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php
-@@ -10,10 +10,13 @@ use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
- use Magento\Framework\Search\Request\BucketInterface;
- use Magento\Framework\Search\Request\FilterInterface;
- 
-+/**
-+ * Catalog search range request generator.
-+ */
- class Decimal implements GeneratorInterface
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFilterData(Attribute $attribute, $filterName)
-     {
-@@ -27,7 +30,7 @@ class Decimal implements GeneratorInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAggregationData(Attribute $attribute, $bucketName)
-     {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php
-index f2965bb9f98..63b09de7f08 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php
-@@ -10,10 +10,13 @@ use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
- use Magento\Framework\Search\Request\BucketInterface;
- use Magento\Framework\Search\Request\FilterInterface;
- 
-+/**
-+ * Catalog search request generator.
-+ */
- class General implements GeneratorInterface
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFilterData(Attribute $attribute, $filterName)
-     {
-@@ -26,7 +29,7 @@ class General implements GeneratorInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAggregationData(Attribute $attribute, $bucketName)
-     {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php
-index a7379eaa0bd..22f829063fb 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php
-@@ -9,13 +9,16 @@ namespace Magento\CatalogSearch\Model\Search\RequestGenerator;
- use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
- 
- /**
-+ * Catalog search reguest generator interface.
-+ *
-  * @api
-  * @since 100.1.6
-  */
- interface GeneratorInterface
- {
-     /**
--     * Get filter data for specific attribute
-+     * Get filter data for specific attribute.
-+     *
-      * @param Attribute $attribute
-      * @param string $filterName
-      * @return array
-@@ -24,7 +27,8 @@ interface GeneratorInterface
-     public function getFilterData(Attribute $attribute, $filterName);
- 
-     /**
--     * Get aggregation data for specific attribute
-+     * Get aggregation data for specific attribute.
-+     *
-      * @param Attribute $attribute
-      * @param string $bucketName
-      * @return array
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php
-index d2841e5cdf3..68ca546b819 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php
-@@ -9,6 +9,8 @@ namespace Magento\CatalogSearch\Model\Search\RequestGenerator;
- /**
-  * @api
-  * @since 100.1.6
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class GeneratorResolver
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainer.php b/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainer.php
-index 5305ed276bf..f0eade4bfbc 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainer.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainer.php
-@@ -10,8 +10,10 @@ use Magento\Framework\DB\Select;
- use Magento\Framework\Search\Request\FilterInterface;
- 
- /**
-- * Class SelectContainer
-  * This class is a container for all data that is required for creating select query by search request
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class SelectContainer
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php
-index a18ef8e91d7..d5b7be8bf01 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php
-@@ -18,6 +18,8 @@ use Magento\CatalogSearch\Model\Search\FilterMapper\VisibilityFilter;
-  * Class SelectContainerBuilder
-  * Class is responsible for SelectContainer creation and filling it with all required data
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class SelectContainerBuilder
- {
-diff --git a/app/code/Magento/CatalogSearch/Model/Search/TableMapper.php b/app/code/Magento/CatalogSearch/Model/Search/TableMapper.php
-index eab79c22309..6b18c4307f5 100644
---- a/app/code/Magento/CatalogSearch/Model/Search/TableMapper.php
-+++ b/app/code/Magento/CatalogSearch/Model/Search/TableMapper.php
-@@ -25,6 +25,8 @@ use Magento\Store\Model\StoreManagerInterface;
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @api
-  * @since 100.0.2
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class TableMapper
- {
-diff --git a/app/code/Magento/CatalogSearch/Plugin/EnableEavIndexer.php b/app/code/Magento/CatalogSearch/Plugin/EnableEavIndexer.php
-index c624f9d1c2e..956a1b2360f 100644
---- a/app/code/Magento/CatalogSearch/Plugin/EnableEavIndexer.php
-+++ b/app/code/Magento/CatalogSearch/Plugin/EnableEavIndexer.php
-@@ -9,6 +9,9 @@ namespace Magento\CatalogSearch\Plugin;
- 
- /**
-  * Enable Product EAV indexer in configuration for MySQL search engine
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class EnableEavIndexer
- {
-diff --git a/app/code/Magento/CatalogSearch/Setup/Patch/Data/MySQLSearchDeprecationNotification.php b/app/code/Magento/CatalogSearch/Setup/Patch/Data/MySQLSearchDeprecationNotification.php
-new file mode 100644
-index 00000000000..8fa9f56d784
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Setup/Patch/Data/MySQLSearchDeprecationNotification.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogSearch\Setup\Patch\Data;
-+
-+/**
-+ * Implementation of the notification about MySQL search being deprecated.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
-+class MySQLSearchDeprecationNotification implements \Magento\Framework\Setup\Patch\DataPatchInterface
-+{
-+    /**
-+     * @var \Magento\Framework\Search\EngineResolverInterface
-+     */
-+    private $searchEngineResolver;
-+
-+    /**
-+     * @var \Magento\Framework\Notification\NotifierInterface
-+     */
-+    private $notifier;
-+
-+    /**
-+     * @param \Magento\Framework\Search\EngineResolverInterface $searchEngineResolver
-+     * @param \Magento\Framework\Notification\NotifierInterface $notifier
-+     */
-+    public function __construct(
-+        \Magento\Framework\Search\EngineResolverInterface $searchEngineResolver,
-+        \Magento\Framework\Notification\NotifierInterface $notifier
-+    ) {
-+        $this->searchEngineResolver = $searchEngineResolver;
-+        $this->notifier = $notifier;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function apply()
-+    {
-+        if ($this->searchEngineResolver->getCurrentSearchEngine() === 'mysql') {
-+            $message = <<<MESSAGE
-+Catalog Search is currently configured to use the MySQL engine, which has been deprecated. Consider migrating to one of
-+the Elasticsearch engines now to ensure there are no service interruptions during your next upgrade.
-+MESSAGE;
-+
-+            $this->notifier->addNotice(__('Deprecation Notice'), __($message));
-+        }
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getAliases()
-+    {
-+        return [];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public static function getDependencies()
-+    {
-+        return [];
-+    }
-+}
-diff --git a/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php b/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php
-index beff1c66d4f..7f6dbe033e3 100644
---- a/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php
-+++ b/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php
-@@ -13,8 +13,8 @@ use Magento\Framework\Indexer\IndexerInterfaceFactory;
- use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
- 
- /**
-- * Class SetInitialSearchWeightForAttributes
-- * @package Magento\CatalogSearch\Setup\Patch
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class SetInitialSearchWeightForAttributes implements DataPatchInterface, PatchVersionInterface
- {
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml
-new file mode 100644
-index 00000000000..33ffa4fe1b2
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml
-@@ -0,0 +1,59 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertSearchTermSaveSuccessMessage">
-+        <arguments>
-+            <argument name="searchQuery" type="string"/>
-+            <argument name="storeValue" type="string"/>
-+            <argument name="redirectUrl" type="string"/>
-+            <argument name="displayInSuggestedTerm" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
-+        <click selector="{{AdminCatalogSearchTermIndexSection.addNewSearchTermButton}}" stepKey="clickAddNewSearchTermButton"/>
-+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermNewPageLoad"/>
-+        <fillField selector="{{AdminCatalogSearchTermNewSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQueryTextBox"/>
-+        <selectOption selector="{{AdminCatalogSearchTermNewSection.store}}" userInput="{{storeValue}}" stepKey="selectStoreValue"/>
-+        <fillField selector="{{AdminCatalogSearchTermNewSection.redirectUrl}}" userInput="{{redirectUrl}}" stepKey="fillRedirectUrl"/>
-+        <selectOption selector="{{AdminCatalogSearchTermNewSection.displayInSuggestedTerm}}" userInput="{{displayInSuggestedTerm}}" stepKey="selectDisplayInSuggestedTerm"/>
-+        <click selector="{{AdminCatalogSearchTermNewSection.saveSearchButton}}" stepKey="clickSaveSearchButton"/>
-+        <see selector="{{AdminCatalogSearchTermMessagesSection.successMessage}}" userInput="You saved the search term." stepKey="seeSaveSuccessMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AssertSearchTermSuccessDeleteMessage">
-+        <arguments>
-+            <argument name="searchQuery" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openCatalogSearchIndexPage"/>
-+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
-+        <click selector="{{AdminCatalogSearchTermIndexSection.resetFilterButton}}" stepKey="clickOnResetButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <fillField selector="{{AdminCatalogSearchTermIndexSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
-+        <click selector="{{AdminCatalogSearchTermIndexSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForSearchResultLoad"/>
-+        <click selector="{{AdminCatalogSearchTermIndexSection.nthRow('1')}}" stepKey="checkFirstRow"/>
-+        <selectOption selector="{{AdminCatalogSearchTermIndexSection.massActions}}" userInput="delete" stepKey="selectDeleteOption"/>
-+        <click selector="{{AdminCatalogSearchTermIndexSection.submit}}" stepKey="clickSubmitButton"/>
-+        <click selector="{{AdminCatalogSearchTermIndexSection.okButton}}" stepKey="clickOkButton"/>
-+        <see selector="{{AdminCatalogSearchTermMessagesSection.successMessage}}" userInput="Total of 1 record(s) were deleted." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AssertSearchTermNotInGrid">
-+        <arguments>
-+            <argument name="searchQuery" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openCatalogSearchIndexPage"/>
-+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
-+        <click selector="{{AdminCatalogSearchTermIndexSection.resetFilterButton}}" stepKey="clickOnResetButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <fillField selector="{{AdminCatalogSearchTermIndexSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
-+        <click selector="{{AdminCatalogSearchTermIndexSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForSearchResultToLoad"/>
-+        <see selector="{{AdminCatalogSearchTermIndexSection.emptyRecords}}" userInput="We couldn't find any records." stepKey="seeEmptyRecordMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
-new file mode 100644
-index 00000000000..b9ef37cb4ef
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
-@@ -0,0 +1,29 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="SetMinimalQueryLengthActionGroup">
-+        <arguments>
-+            <argument name="minLength" type="string" defaultValue="1"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="navigateToConfigurationPage"/>
-+        <waitForPageLoad stepKey="wait1"/>
-+        <scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCatalogSearchTab"/>
-+        <conditionalClick selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" dependentSelector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" visible="false" stepKey="expandCatalogSearchTab"/>
-+        <waitForElementVisible selector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" stepKey="waitTabToCollapse"/>
-+        <see userInput="{{MinMaxQueryLength.Hint}}" selector="{{AdminCatalogSearchConfigurationSection.minQueryLengthHint}}" stepKey="seeHint1"/>
-+        <see userInput="{{MinMaxQueryLength.Hint}}" selector="{{AdminCatalogSearchConfigurationSection.maxQueryLengthHint}}" stepKey="seeHint2"/>
-+        <uncheckOption selector="{{AdminCatalogSearchConfigurationSection.minQueryLengthInherit}}" stepKey="uncheckSystemValue"/>
-+        <fillField selector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" userInput="{{minLength}}" stepKey="setMinQueryLength"/>
-+        <click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseTab"/>
-+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
-+        <waitForPageLoad stepKey="waitForConfigSaved"/>
-+        <see userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
-index c4bb5ff4b6d..067d76821d6 100644
---- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
-@@ -7,19 +7,70 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Quick search the phrase and check if the result page contains correct information -->
-     <actionGroup name="StorefrontCheckQuickSearchActionGroup">
-         <arguments>
--            <argument name="phrase"/>
-+            <argument name="phrase" />
-         </arguments>
--        <fillField userInput="{{phrase}}" selector="{{StorefrontQuickSearchSection.searchPhrase}}" stepKey="fillQuickSearch"/>
--        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickQuickSearchButton" />
-+        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{phrase}}]" stepKey="fillQuickSearch" />
-         <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="checkUrl"/>
-+        <dontSeeInCurrentUrl url="form_key=" stepKey="checkUrlFormKey"/>
-         <seeInTitle userInput="Search results for: '{{phrase}}'" stepKey="assertQuickSearchTitle"/>
-         <see userInput="Search results for: '{{phrase}}'" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertQuickSearchName"/>
-     </actionGroup>
- 
-+    <!-- Quick search the phrase and check if the result page contains correct information, usable with type="string" -->
-+    <actionGroup name="StorefrontCheckQuickSearchStringActionGroup">
-+        <arguments>
-+            <argument name="phrase" type="string"/>
-+        </arguments>
-+        <fillField stepKey="fillInput" selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{phrase}}"/>
-+        <submitForm selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" parameterArray="[]" stepKey="submitQuickSearch" />
-+        <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="checkUrl"/>
-+        <dontSeeInCurrentUrl url="form_key=" stepKey="checkUrlFormKey"/>
-+        <seeInTitle userInput="Search results for: '{{phrase}}'" stepKey="assertQuickSearchTitle"/>
-+        <see userInput="Search results for: '{{phrase}}'" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertQuickSearchName"/>
-+    </actionGroup>
-+
-+    <!-- Opens product from QuickSearch and performs assertions-->
-+    <actionGroup name="StorefrontOpenProductFromQuickSearch">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+            <argument name="productUrlKey" type="string"/>
-+        </arguments>
-+        <click stepKey="openProduct" selector="{{StorefrontQuickSearchResultsSection.productByName(productName)}}"/>
-+        <waitForPageLoad stepKey="waitForProductLoad"/>
-+        <seeInCurrentUrl url="{{productUrlKey}}" stepKey="checkUrl"/>
-+        <see stepKey="checkName" selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{productName}}"/>
-+    </actionGroup>
-+
-+    <!-- Adds product from Quicksearch page and perform assertions-->
-+    <actionGroup name="StorefrontAddToCartFromQuickSearch">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <moveMouseOver stepKey="hoverOverProduct" selector="{{StorefrontQuickSearchResultsSection.productByIndex('1')}}"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.productByName(productName)}} {{StorefrontQuickSearchResultsSection.addToCartBtn}}" stepKey="addToCart"/>
-+        <waitForElementVisible selector="{{StorefrontQuickSearchResultsSection.messageSection}}" time="30" stepKey="waitForProductAdded"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.messageSection}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddedToCartMessage"/>
-+    </actionGroup>
-+
-+    <actionGroup name="StorefrontQuickSearchCheckProductNameInGrid">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+            <argument name="index" type="string"/>
-+        </arguments>
-+        <see selector="{{StorefrontQuickSearchResultsSection.productByIndex(index)}}" userInput="{{productName}}" stepKey="seeProductName"/>
-+    </actionGroup>
-+
-+    <actionGroup name="StorefrontQuickSearchCheckProductNameNotInGrid">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <dontSee selector="{{StorefrontQuickSearchResultsSection.allResults}}" userInput="{{productName}}" stepKey="dontSeeProductName"/>
-+    </actionGroup>
-+    
-     <!-- Open advanced search page -->
-     <actionGroup name="StorefrontOpenAdvancedSearchActionGroup">
-         <click selector="{{StorefrontFooterSection.AdvancedSearch}}" stepKey="clickAdvancedSearchLink" />
-@@ -48,7 +99,7 @@
-     <!-- Go to store's advanced catalog search page -->
-     <actionGroup name="GoToStoreViewAdvancedCatalogSearchActionGroup">
-         <amOnPage url="{{StorefrontCatalogSearchAdvancedFormPage.url}}" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
--        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <waitForPageLoad time="90" stepKey="waitForPageLoad"/>
-     </actionGroup>
- 
-     <!-- Storefront advanced catalog search by product name -->
-@@ -116,4 +167,9 @@
-         <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-     </actionGroup>
-+
-+    <!-- Asserts that search results do not contain any results-->
-+    <actionGroup name="StorefrontCheckSearchIsEmpty">
-+        <see stepKey="checkEmpty" selector="{{StorefrontQuickSearchResultsSection.messageSection}}" userInput="Your search returned no results"/>
-+    </actionGroup>
- </actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml
-new file mode 100644
-index 00000000000..83e4ac50a74
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml
-@@ -0,0 +1,37 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Verify AssertSearchTermNotOnFrontend-->
-+    <actionGroup name="AssertSearchTermNotOnFrontend">
-+        <arguments>
-+            <argument name="searchQuery" type="string"/>
-+            <argument name="url_key" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontProductPage.url('url_key')}}" stepKey="goToMagentoStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontMessagesSection.noticeMessage}}" userInput="Your search returned no results." stepKey="seeAssertSearchTermNotOnFrontendNoticeMessage"/>
-+    </actionGroup>
-+
-+    <actionGroup name="AssertSearchTermOnFrontend">
-+        <arguments>
-+            <argument name="searchQuery" type="string"/>
-+            <argument name="redirectUrl" type="string"/>
-+        </arguments>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
-+        <waitForPageLoad stepKey="waitForFillField"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <seeInCurrentUrl url="{{redirectUrl}}" stepKey="checkUrl"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..df1c3db6e56
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuMarketingSEOAndSearchSearchTerms">
-+        <data key="pageTitle">Search Terms</data>
-+        <data key="title">Search Terms</data>
-+        <data key="dataUiId">magento-search-search-terms</data>
-+    </entity>
-+    <entity name="AdminMenuReportsMarketingSearchTerms">
-+        <data key="pageTitle">Search Terms Report</data>
-+        <data key="title">Search Terms</data>
-+        <data key="dataUiId">magento-search-report-search-term</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml
-new file mode 100644
-index 00000000000..68684560791
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="SetMinQueryLengthToDefault" type="catalog_search_config_def">
-+        <requiredEntity type="enable">DefaultMinQueryLength</requiredEntity>
-+    </entity>
-+    <entity name="UncheckMinQueryLengthAndSet" type="catalog_search_config_query_length">
-+        <requiredEntity type="number">SetMinQueryLengthToOne</requiredEntity>
-+    </entity>
-+    <entity name="DefaultMinQueryLength" type="enable">
-+        <data key="inherit">true</data>
-+    </entity>
-+    <entity name="DefaultMinQueryLengthDisable" type="enable">
-+        <data key="inherit">0</data>
-+    </entity>
-+    <entity name="SetMinQueryLengthToOne" type="number">
-+        <data key="value">1</data>
-+    </entity>
-+
-+</entities>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/ConstData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/ConstData.xml
-index 08fc1ce00e5..52fd61301c3 100644
---- a/app/code/Magento/CatalogSearch/Test/Mftf/Data/ConstData.xml
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/ConstData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
-     <entity name="CONST" type="CONST">
-         <data key="apiSimpleProduct">Api Simple Product</data>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml
-new file mode 100644
-index 00000000000..6fb254afea3
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="MinMaxQueryLength" type="constant">
-+        <data key="Hint">This value must be compatible with the corresponding setting in the configured search engine</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/SearchTermData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/SearchTermData.xml
-new file mode 100644
-index 00000000000..995b860d107
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/SearchTermData.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="SimpleTerm" type="searchTerm">
-+        <data key="search_query" unique="suffix">Query text</data>
-+        <data key="store_id">Default Store View</data>
-+        <data key="redirect" unique="suffix">http://example.com/</data>
-+        <data key="display_in_terms">No</data>
-+    </entity>
-+</entities>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml
-new file mode 100644
-index 00000000000..7405377249a
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml
-@@ -0,0 +1,32 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CatalogSearchConfigDefault" dataType="catalog_search_config_def" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
-+        <object key="groups" dataType="catalog_search_config_def">
-+            <object key="search" dataType="catalog_search_config_def">
-+                <object key="fields" dataType="catalog_search_config_def">
-+                    <object key="min_query_length" dataType="enable">
-+                        <field key="inherit">boolean</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+    <operation name="CatalogSearchConfigQueryLength" dataType="catalog_search_config_query_length" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
-+        <object key="groups" dataType="catalog_search_config_query_length">
-+            <object key="search" dataType="catalog_search_config_query_length">
-+                <object key="fields" dataType="catalog_search_config_query_length">
-+                    <object key="min_query_length" dataType="number">
-+                        <field key="value">integer</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermIndexPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermIndexPage.xml
-new file mode 100644
-index 00000000000..bbafff8ad77
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermIndexPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminCatalogSearchTermIndexPage" url="/search/term/index/" area="admin" module="Magento_CatalogSearch">
-+        <section name="AdminCatalogSearchTermIndexSection"/>
-+    </page>
-+</pages>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermNewPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermNewPage.xml
-new file mode 100644
-index 00000000000..de749147174
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermNewPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminCatalogSearchTermNewPage" url="/search/term/new/" area="admin" module="Magento_CatalogSearch">
-+        <section name="AdminCatalogSearchTermNewSection"/>
-+    </page>
-+</pages>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedFormPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedFormPage.xml
-index c52d816f0f3..28515c8186a 100644
---- a/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedFormPage.xml
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedFormPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="StorefrontCatalogSearchAdvancedFormPage" url="/catalogsearch/advanced/" area="storefront" module="Magento_CatalogSearch">
-         <section name="StorefrontCatalogSearchAdvancedFormSection" />
-         <section name="StorefrontQuickSearchSection" />
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedResultPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedResultPage.xml
-index 422ccc652b7..0584f5e3380 100644
---- a/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedResultPage.xml
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedResultPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="StorefrontCatalogSearchAdvancedResultPage" url="/catalogsearch/advanced/result" area="storefront" module="Magento_CatalogSearch">
-         <section name="StorefrontCatalogSearchAdvancedResultMainSection" />
-         <section name="StorefrontQuickSearchSection" />
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchPage.xml
-index 6141aa96226..0700adb6d30 100644
---- a/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchPage.xml
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="StorefrontCatalogSearchPage" url="/catalogsearch/result/" area="storefront" module="Magento_CatalogSearch">
-         <section name="StorefrontCatalogSearchMainSection" />
-         <section name="StorefrontQuickSearchSection" />
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml
-new file mode 100644
-index 00000000000..aa0145b9f96
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCatalogSearchTermIndexSection">
-+        <element name="addNewSearchTermButton" type="button" selector="//div[@class='page-actions-buttons']/button[@id='add']" timeout="30"/>
-+        <element name="resetFilterButton" type="button" selector="//button[@class='action-default scalable action-reset action-tertiary']" timeout="30"/>
-+        <element name="searchButton" type="button" selector="//button[@class='action-default scalable action-secondary']" timeout="30"/>
-+        <element name="massActions" type="text" selector="//div[@class='admin__grid-massaction-form']//select[@id='search_term_grid_massaction-select']"/>
-+        <element name="submit" type="button" selector="//button[@class='action-default scalable']/span" timeout="30"/>
-+        <element name="searchQuery" type="text" selector="//tr[@class='data-grid-filters']//td/input[@name='search_query']"/>
-+        <element name="nthRow" type="checkbox" selector="//tbody/tr['{{rowNum}}']//input[@name='search']" parameterized="true"/>
-+        <element name="searchTermRowCheckboxBySearchQuery" type="checkbox" selector="//*[normalize-space()='{{var1}}']/preceding-sibling::td//input[@name='search']" parameterized="true" timeout="30"/>
-+        <element name="okButton" type="button" selector="//button[@class='action-primary action-accept']/span" timeout="30"/>
-+        <element name="emptyRecords" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
-+        <element name="gridRow" type="text" selector="//tr[@data-role='row']"/>
-+        <element name="numberOfSearchTermResults" type="text" selector="//tr[@data-role='row']/td[@data-column='num_results']"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermMessagesSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermMessagesSection.xml
-new file mode 100644
-index 00000000000..5d19198a1b9
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermMessagesSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCatalogSearchTermMessagesSection">
-+        <element name="successMessage" type="text" selector="//div[@class='message message-success success']/div[@data-ui-id='messages-message-success']"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml
-new file mode 100644
-index 00000000000..a07e2a9b8a5
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCatalogSearchTermNewSection">
-+        <element name="searchQuery" type="text" selector="#query_text"/>
-+        <element name="store" type="text" selector="#store_id"/>
-+        <element name="numberOfResults" type="button" selector="#num_results"/>
-+        <element name="numberOfUses" type="button" selector="#popularity"/>
-+        <element name="redirectUrl" type="text" selector="//div[@class='admin__field-control control']/input[@id='redirect']"/>
-+        <element name="displayInSuggestedTerm" type="select" selector="//select[@name='display_in_terms']"/>
-+        <element name="saveSearchButton" type="button" selector="//button[@id='save']/span[@class='ui-button-text']" timeout="30"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
-new file mode 100644
-index 00000000000..605bcabb8a8
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCatalogSearchConfigurationSection">
-+        <element name="minQueryLength" type="input" selector="#catalog_search_min_query_length"/>
-+        <element name="minQueryLengthInherit" type="checkbox" selector="#catalog_search_min_query_length_inherit"/>
-+        <element name="minQueryLengthHint" type="text" selector="#row_catalog_search_min_query_length .value span"/>
-+        <element name="maxQueryLengthHint" type="text" selector="#row_catalog_search_max_query_length .value span"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
-index d7c63ca1af2..68890255300 100644
---- a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCatalogSearchAdvancedFormSection">
-         <element name="SearchTitle" type="text" selector=".page-title span"/>
-         <element name="ProductName" type="input" selector="#name"/>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
-index d0634754eee..6b28b4f36c6 100644
---- a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCatalogSearchAdvancedResultMainSection">
-         <element name="SearchTitle" type="text" selector=".page-title span"/>
-         <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
-index 165629f1cea..667f08fea65 100644
---- a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCatalogSearchMainSection">
-         <element name="SearchTitle" type="text" selector=".page-title span"/>
-         <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
-@@ -15,5 +15,6 @@
-         <element name="SuccessMsg" type="button" selector="div.message-success"/>
-         <element name="productCount" type="text" selector="#toolbar-amount"/>
-         <element name="message" type="text" selector="div.message div"/>
-+        <element name="searchResults" type="block" selector="#maincontent .column.main"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontFooterSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontFooterSection.xml
-index dae21aeefc1..dbecf55a010 100644
---- a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontFooterSection.xml
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontFooterSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontFooterSection">
-         <element name="AdvancedSearch" type="button" selector="//footer//ul//li//a[text()='Advanced Search']"/>
-     </section>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminCreateSearchTermEntityTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminCreateSearchTermEntityTest.xml
-new file mode 100644
-index 00000000000..2b425f34f8a
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminCreateSearchTermEntityTest.xml
-@@ -0,0 +1,59 @@
-+<?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="AdminCreateSearchTermEntityTest">
-+        <annotations>
-+            <stories value="Search terms"/>
-+            <title value="Create search term test"/>
-+            <description value="Admin should be able to create search term"/>
-+            <testCaseId value="MC-13989"/>
-+            <severity value="CRITICAL"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create simple product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
-+        </before>
-+        <after>
-+            <!-- Delete created search term -->
-+            <actionGroup ref="AssertSearchTermSuccessDeleteMessage" stepKey="deleteSearchTerm">
-+                <argument name="searchQuery" value="$$createSimpleProduct.sku$$"/>
-+            </actionGroup>
-+
-+            <!-- Delete created product -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to the search terms page and create new search term -->
-+        <actionGroup ref="AssertSearchTermSaveSuccessMessage" stepKey="createNewSearchTerm">
-+            <argument name="searchQuery" value="$$createSimpleProduct.sku$$"/>
-+            <argument name="storeValue" value="{{SimpleTerm.store_id}}"/>
-+            <argument name="redirectUrl" value="{{SimpleTerm.redirect}}"/>
-+            <argument name="displayInSuggestedTerm" value="{{SimpleTerm.display_in_terms}}"/>
-+        </actionGroup>
-+
-+        <!-- Go to storefront -->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+
-+        <!-- Assert created search term on storefront -->
-+        <actionGroup ref="AssertSearchTermOnFrontend" stepKey="assertCreatedSearchTermOnFrontend">
-+            <argument name="searchQuery" value="$$createSimpleProduct.sku$$"/>
-+            <argument name="redirectUrl" value="{{SimpleTerm.redirect}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.xml
-new file mode 100644
-index 00000000000..c72ed424ef3
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.xml
-@@ -0,0 +1,59 @@
-+<?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="AdminDeleteSearchTermTest">
-+        <annotations>
-+            <stories value="Search terms"/>
-+            <title value="Delete Search Term and Verify Storefront"/>
-+            <description value="Test log in to SearchTerm and DeleteSearchTerm"/>
-+            <testCaseId value="MC-13988"/>
-+            <severity value="CRITICAL"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
-+            <createData entity="SimpleProduct" stepKey="simpleProduct">
-+                <requiredEntity createDataKey="initialCategoryEntity"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
-+            <deleteData stepKey="deleteSimpleProduct" createDataKey="simpleProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Add new search term-->
-+        <actionGroup ref="AssertSearchTermSaveSuccessMessage" stepKey="addNewSearchTerm">
-+            <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
-+            <argument name="storeValue" value="{{SimpleTerm.store_id}}"/>
-+            <argument name="redirectUrl" value="{{SimpleTerm.redirect}}"/>
-+            <argument name="displayInSuggestedTerm" value="{{SimpleTerm.display_in_terms}}"/>
-+        </actionGroup>
-+
-+        <!--Search and delete search term and AssertSearchTermSuccessDeleteMessage-->
-+        <actionGroup ref="AssertSearchTermSuccessDeleteMessage" stepKey="deleteSearchTerm">
-+            <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
-+        </actionGroup>
-+
-+        <!--Verify deleted search term in grid and AssertSearchTermNotInGrid-->
-+        <actionGroup ref="AssertSearchTermNotInGrid" stepKey="verifyDeletedSearchTermNotInGrid">
-+            <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
-+        </actionGroup>
-+
-+        <!--Go to storefront and Verify AssertSearchTermNotOnFrontend-->
-+        <actionGroup ref="AssertSearchTermNotOnFrontend" stepKey="verifySearchTermNotOnFrontend">
-+            <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
-+            <argument name="url_key" value="$$simpleProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminMarketingSearchTermsNavigateMenuTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminMarketingSearchTermsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..bc255020d98
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminMarketingSearchTermsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminMarketingSearchTermsNavigateMenuTest">
-+        <annotations>
-+            <features value="CatalogSearch"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin marketing search terms navigate menu test"/>
-+            <description value="Admin should be able to navigate to Marketing > Search Terms"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14135"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingSearchTermsPage">
-+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuMarketingSEOAndSearchSearchTerms.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuMarketingSEOAndSearchSearchTerms.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminReportsSearchTermsNavigateMenuTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminReportsSearchTermsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..85cf0e3ba90
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminReportsSearchTermsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsSearchTermsNavigateMenuTest">
-+        <annotations>
-+            <features value="CatalogSearch"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports search terms navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Search Terms"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14136"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportSearchTermsPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsMarketingSearchTerms.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsMarketingSearchTerms.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
-index f33f3db14b6..13665100f79 100644
---- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdvanceCatalogSearchSimpleProductByNameTest">
-         <annotations>
-             <features value="CatalogSearch"/>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-index b19c00eaf32..99f3fc00a74 100644
---- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CGuestUserTest">
-         <!-- Step 2: User searches for product -->
-         <comment userInput="Start of searching products" stepKey="startOfSearchingProducts" after="endOfBrowsingCatalog"/>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-index 5669a788105..367cb6a6e21 100644
---- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CLoggedInUserTest">
-         <!-- Step 2: User searches for product -->
-         <comment userInput="Start of searching products" stepKey="startOfSearchingProducts" after="endOfBrowsingCatalog"/>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
-new file mode 100644
-index 00000000000..b6417e12a6d
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
-@@ -0,0 +1,44 @@
-+<?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="MinimalQueryLengthForCatalogSearchTest">
-+        <annotations>
-+            <features value="CatalogSearch"/>
-+            <stories value="Catalog search"/>
-+            <title value="Minimal query length for catalog search"/>
-+            <description value="Minimal query length for catalog search"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MC-6325"/>
-+            <useCaseId value="MAGETWO-58764"/>
-+            <group value="CatalogSearch"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <createData entity="SetMinQueryLengthToDefault" stepKey="setMinimumQueryLengthToDefault"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="SetMinimalQueryLengthActionGroup" stepKey="setMinQueryLength"/>
-+        <comment userInput="Go to Storefront and search for product" stepKey="searchProdUsingMinQueryLength"/>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
-+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="s" stepKey="fillAttribute"/>
-+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
-+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="$$createProduct.name$$" stepKey="seeProductNameInCategoryPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
-new file mode 100644
-index 00000000000..19db201e91f
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
-@@ -0,0 +1,629 @@
-+<?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="QuickSearchProductBySku">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should be able to use Quick Search to find products"/>
-+            <description value="Use Quick Search to find a product"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14783"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteProduct" createDataKey="createSimpleProduct"/>
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-+        </after>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="$createSimpleProduct.sku$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">
-+            <argument name="productName" value="$createSimpleProduct.name$"/>
-+            <argument name="productUrlKey" value="$createSimpleProduct.custom_attributes[url_key]$"/>
-+        </actionGroup>
-+    </test>
-+    <test name="QuickSearchProductByName" extends="QuickSearchProductBySku">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should be able to use Quick Search to find products via Name"/>
-+            <description value="Use Quick Search to find a product"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14791"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <!-- Overwrite search to use name -->
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="$createSimpleProduct.name$"/>
-+        </actionGroup>
-+    </test>
-+    <test name="QuickSearchProductByNameWithSpecialChars" extends="QuickSearchProductBySku">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="Quick Search can find products with names that contain special characters"/>
-+            <description value="Use Quick Search to find a product by name"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14792"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="productWithSpecialCharacters" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <!-- Overwrite search to use name -->
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="$createSimpleProduct.name$"/>
-+        </actionGroup>
-+    </test>
-+    <test name="QuickSearchEmptyResults">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should not get search results on query that doesn't return anything"/>
-+            <description value="Use invalid query to return no products"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14793"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteProduct" createDataKey="createSimpleProduct"/>
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-+        </after>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="ThisShouldn'tReturnAnything"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmpty"/>
-+    </test>
-+    <test name="QuickSearchWithTwoCharsEmptyResults" extends="QuickSearchEmptyResults">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should not get search results on query that only contains two characters"/>
-+            <description value="Use of 2 character query to return no products"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14794"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-15827"/>
-+            </skip>
-+        </annotations>
-+        <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,2); return ret;" stepKey="getFirstTwoLetters" before="searchStorefront"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="{$getFirstTwoLetters}"/>
-+        </actionGroup>
-+    </test>
-+    <test name="QuickSearchProductByNameWithThreeLetters" extends="QuickSearchProductBySku">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should be able to use Quick Search to find products by their first three letters"/>
-+            <description value="Use Quick Search to find a product using only first three letters"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-15034"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,3); return ret;" stepKey="getFirstThreeLetters" before="searchStorefront"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="{$getFirstThreeLetters}"/>
-+        </actionGroup>
-+    </test>
-+    <test name="QuickSearchProductBy128CharQuery" extends="QuickSearchProductBySku">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should be able to use Quick Search product with long names, using first 128 letters"/>
-+            <description value="Use Quick Search to find a product with name of 130 length with query of only 128"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14795"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="productWith130CharName" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,128); return ret;" stepKey="get128Letters" before="searchStorefront"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="{$get128Letters}"/>
-+        </actionGroup>
-+    </test>
-+
-+    <test name="QuickSearchTwoProductsWithSameWeight">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="Quick Search should sort products with the same weight appropriately"/>
-+            <description value="Use Quick Search to find a two products with the same weight"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14796"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="productAlphabeticalA" stepKey="product1">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAlphabeticalB" stepKey="product2">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+
-+
-+            <!-- Create and Assign Attribute to product1-->
-+            <actionGroup ref="goToProductPageViaID" stepKey="goToProduct1">
-+                <argument name="productId" value="$product1.id$"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateAttributeWithSearchWeight" stepKey="createProduct1Attribute">
-+                <argument name="attributeType" value="Text Field"/>
-+                <argument name="attributeName" value="$product1.name$"/>
-+                <argument name="attributeSetName" value="$product1.name$"/>
-+                <argument name="weight" value="1"/>
-+                <argument name="defaultValue" value="{{_defaultProduct.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminProductPageSelectAttributeSet" stepKey="selectAttributeSet1">
-+                <argument name="attributeSetName" value="$product1.name$"/>
-+            </actionGroup>
-+            <!--fill in default-->
-+            <actionGroup ref="saveProductForm" stepKey="saveProduct1a"/>
-+            <actionGroup ref="AdminProductPageFillTextAttributeValueByName" stepKey="fillDefault1">
-+                <argument name="attributeName" value="$product1.name$"/>
-+                <argument name="value" value="{{_defaultProduct.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="saveProductForm" stepKey="saveProduct1b"/>
-+            <!-- Create and Assign Attribute to product2-->
-+            <actionGroup ref="goToProductPageViaID" stepKey="goToProduct2">
-+                <argument name="productId" value="$product2.id$"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateAttributeWithSearchWeight" stepKey="createProduct2Attribute">
-+                <argument name="attributeType" value="Text Field"/>
-+                <argument name="attributeName" value="$product2.name$"/>
-+                <argument name="attributeSetName" value="$product2.name$"/>
-+                <argument name="weight" value="1"/>
-+                <argument name="defaultValue" value="{{_defaultProduct.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminProductPageSelectAttributeSet" stepKey="selectAttributeSet2">
-+                <argument name="attributeSetName" value="$product2.name$"/>
-+            </actionGroup>
-+            <actionGroup ref="saveProductForm" stepKey="saveProduct2a"/>
-+            <!--fill in default-->
-+            <actionGroup ref="AdminProductPageFillTextAttributeValueByName" stepKey="fillDefault2">
-+                <argument name="attributeName" value="$product2.name$"/>
-+                <argument name="value" value="{{_defaultProduct.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="saveProductForm" stepKey="saveProduct2b"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
-+            <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-+        </after>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="{{_defaultProduct.name}}"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontQuickSearchCheckProductNameInGrid" stepKey="assertProduct1Position">
-+            <argument name="productName" value="$product1.name$"/>
-+            <argument name="index" value="2"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontQuickSearchCheckProductNameInGrid" stepKey="assertProduct2Position">
-+            <argument name="productName" value="$product2.name$"/>
-+            <argument name="index" value="1"/>
-+        </actionGroup>
-+    </test>
-+    <test name="QuickSearchTwoProductsWithDifferentWeight" extends="QuickSearchTwoProductsWithSameWeight">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="Quick Search should sort products with the different weight appropriately"/>
-+            <description value="Use Quick Search to find a two products with the different weight"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14797"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="AdminCreateAttributeWithSearchWeight" stepKey="createProduct1Attribute">
-+                <argument name="attributeType" value="Text Field"/>
-+                <argument name="attributeName" value="$product1.name$"/>
-+                <argument name="attributeSetName" value="$product1.name$"/>
-+                <argument name="weight" value="5"/>
-+                <argument name="defaultValue" value="{{_defaultProduct.name}}"/>
-+            </actionGroup>
-+        </before>
-+        <actionGroup ref="StorefrontQuickSearchCheckProductNameInGrid" stepKey="assertProduct1Position">
-+            <argument name="productName" value="$product1.name$"/>
-+            <argument name="index" value="1"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontQuickSearchCheckProductNameInGrid" stepKey="assertProduct2Position">
-+            <argument name="productName" value="$product2.name$"/>
-+            <argument name="index" value="2"/>
-+        </actionGroup>
-+    </test>
-+
-+    <test name="QuickSearchAndAddToCart">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should be able to use Quick Search to find a simple product and add it to cart"/>
-+            <description value="Use Quick Search to find simple Product and Add to Cart"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14784"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteProduct" createDataKey="createSimpleProduct"/>
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-+        </after>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="$createSimpleProduct.name$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddToCartFromQuickSearch" stepKey="addProductToCart">
-+            <argument name="productName" value="$createSimpleProduct.name$"/>
-+        </actionGroup>
-+    </test>
-+    <test name="QuickSearchAndAddToCartVirtual">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should be able to use Quick Search to find a virtual product and add it to cart"/>
-+            <description value="Use Quick Search to find virtual Product and Add to Cart"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14785"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="VirtualProduct" stepKey="createVirtualProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteProduct" createDataKey="createVirtualProduct"/>
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-+        </after>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="$createVirtualProduct.name$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddToCartFromQuickSearch" stepKey="addProductToCart">
-+            <argument name="productName" value="$createVirtualProduct.name$"/>
-+        </actionGroup>
-+    </test>
-+    <test name="QuickSearchAndAddToCartConfigurable">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should be able to use Quick Search to find a configurable product and add it to cart"/>
-+            <description value="Use Quick Search to find configurable Product and Add to Cart"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14786"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
-+                <argument name="product" value="_defaultProduct"/>
-+                <argument name="category" value="$$createCategory$$"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
-+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
-+            </actionGroup>
-+        </after>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="{{_defaultProduct.name}}"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">
-+            <argument name="productName" value="{{_defaultProduct.name}}"/>
-+            <argument name="productUrlKey" value="{{_defaultProduct.urlKey}}"/>
-+        </actionGroup>
-+        <actionGroup ref="SelectSingleAttributeAndAddToCart" stepKey="addProductToCart">
-+            <argument name="productName" value="{{_defaultProduct.name}}"/>
-+            <argument name="attributeCode" value="{{colorProductAttribute.default_label}}"/>
-+            <argument name="optionName" value="{{colorProductAttribute1.name}}"/>
-+        </actionGroup>
-+    </test>
-+    <test name="QuickSearchAndAddToCartDownloadable">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should be able to use Quick Search to find a downloadable product and add it to cart"/>
-+            <description value="Use Quick Search to find downloadable Product and Add to Cart"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14787"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="DownloadableProductWithOneLink" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="downloadableLink1" stepKey="addDownloadableLink1">
-+                <requiredEntity createDataKey="createProduct"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-+        </after>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="$createProduct.name$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddToCartFromQuickSearch" stepKey="addProductToCart">
-+            <argument name="productName" value="$createProduct.name$"/>
-+        </actionGroup>
-+    </test>
-+    <test name="QuickSearchAndAddToCartGrouped">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should be able to use Quick Search to find a grouped product and add it to cart"/>
-+            <description value="Use Quick Search to find grouped Product and Add to Cart"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14788"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiProductWithDescription" stepKey="simple1"/>
-+            <createData entity="ApiGroupedProduct" stepKey="createProduct"/>
-+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
-+                <requiredEntity createDataKey="createProduct"/>
-+                <requiredEntity createDataKey="simple1"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
-+        </after>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="$createProduct.name$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddToCartFromQuickSearch" stepKey="addProductToCart">
-+            <argument name="productName" value="$createProduct.name$"/>
-+        </actionGroup>
-+    </test>
-+    <test name="QuickSearchAndAddToCartBundleDynamic">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should be able to use Quick Search to find a Bundle Dynamic product and add it to cart"/>
-+            <description value="Use Quick Search to find Bundle Dynamic Product and Add to Cart"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14789"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!--Create dynamic product-->
-+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createBundleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="createProduct"/>
-+                <field key="qty">10</field>
-+            </createData>
-+            <!--Finish bundle creation-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <amOnPage url="{{AdminProductEditPage.url($$createBundleProduct.id$$)}}" stepKey="goToProductEditPage"/>
-+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteBundleProduct" createDataKey="createBundleProduct"/>
-+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-+        </after>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="$createBundleProduct.name$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">
-+            <argument name="productName" value="$createBundleProduct.name$"/>
-+            <argument name="productUrlKey" value="$createBundleProduct.custom_attributes[url_key]$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddBundleProductFromProductToCartActionGroup" stepKey="addProductToCart">
-+            <argument name="productName" value="$createBundleProduct.name$"/>
-+        </actionGroup>
-+    </test>
-+    <test name="QuickSearchAndAddToCartBundleFixed">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should be able to use Quick Search to find a Bundle Fixed product and add it to cart"/>
-+            <description value="Use Quick Search to find Bundle Fixed Product and Add to Cart"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14790"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!--Create fixed product-->
-+            <!--Create 2 simple products-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
-+            <!-- Create the bundle product based -->
-+            <createData entity="ApiFixedBundleProduct" stepKey="createBundleProduct"/>
-+            <createData entity="MultipleSelectOption" stepKey="createBundleOption1_1">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <field key="required">false</field>
-+            </createData>
-+            <createData entity="CheckboxOption" stepKey="createBundleOption1_2">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption1_1"/>
-+                <requiredEntity createDataKey="simpleProduct1"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption1_1"/>
-+                <requiredEntity createDataKey="simpleProduct2"/>
-+            </createData>
-+
-+            <!--Finish bundle creation-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <amOnPage url="{{AdminProductEditPage.url($$createBundleProduct.id$$)}}" stepKey="goToProductEditPage"/>
-+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteBundleProduct" createDataKey="createBundleProduct"/>
-+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-+        </after>
-+        <comment userInput="$simpleProduct1.name$" stepKey="asdf"/>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="$createBundleProduct.name$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">
-+            <argument name="productName" value="$createBundleProduct.name$"/>
-+            <argument name="productUrlKey" value="$createBundleProduct.custom_attributes[url_key]$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddBundleProductFromProductToCartWithMultiOption" stepKey="addProductToCart">
-+            <argument name="productName" value="$createBundleProduct.name$"/>
-+            <argument name="optionName" value="$createBundleOption1_1.name$"/>
-+            <argument name="value" value="$simpleProduct1.name$"/>
-+        </actionGroup>
-+    </test>
-+
-+    <test name="QuickSearchConfigurableChildren">
-+        <annotations>
-+            <stories value="Search Product on Storefront"/>
-+            <title value="User should be able to use Quick Search to a configurable product's child products"/>
-+            <description value="Use Quick Search to find a configurable product with enabled/disable children"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14798"/>
-+            <group value="CatalogSearch"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-15101"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Create the category -->
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+
-+            <!-- Create blank AttributeSet-->
-+            <createData entity="CatalogAttributeSet" stepKey="attributeSet"/>
-+
-+            <!-- Create an attribute with two options to be used in the first child product -->
-+            <createData entity="hiddenDropdownAttributeWithOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Assign attribute to set -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="goToAttributeGridPage" stepKey="goToPage"/>
-+            <actionGroup ref="goToAttributeSetByName" stepKey="goToSet">
-+                <argument name="name" value="$attributeSet.attribute_set_name$"/>
-+            </actionGroup>
-+            <actionGroup ref="AssignAttributeToGroup" stepKey="assignToAttributeSetAndGroup">
-+                <argument name="group" value="Product Details"/>
-+                <argument name="attribute" value="$createConfigProductAttribute.attribute_code$"/>
-+            </actionGroup>
-+            <actionGroup ref="SaveAttributeSet" stepKey="savePage"/>
-+
-+            <!-- Get the first option of the attribute we created -->
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create a simple product,give it the attributeSet and attribute with the first option -->
-+            <createData entity="ApiSimpleOneHidden" stepKey="createConfigChildProduct1">
-+                <field key="attribute_set_id">$attributeSet.attribute_set_id$</field>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct1" createDataKey="createConfigChildProduct1"/>
-+
-+            <!-- Create the configurable product, give it the attributeSet and add it to the category -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <field key="attribute_set_id">$attributeSet.attribute_set_id$</field>
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <!-- Create the configurable product -->
-+            <createData entity="ConfigurableProductOneOption" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+            <!-- Add the first simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+        </before>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-+            <argument name="phrase" value="$createConfigProduct.name$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontQuickSearchCheckProductNameInGrid" stepKey="seeProductInGrid">
-+            <argument name="productName" value="$createConfigProduct.name$"/>
-+            <argument name="index" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Disable Child Product -->
-+        <actionGroup ref="goToProductPageViaID" stepKey="goToChildProduct">
-+            <argument name="productId" value="$createConfigChildProduct1.id$"/>
-+        </actionGroup>
-+        <actionGroup ref="toggleProductEnabled" stepKey="disableProduct"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPageAgain"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefrontAgain">
-+            <argument name="phrase" value="$createConfigProduct.name$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGrid" stepKey="dontSeeProductAnymore">
-+            <argument name="productName" value="$createConfigProduct.name$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml
-new file mode 100644
-index 00000000000..3ebb09f3c9c
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml
-@@ -0,0 +1,72 @@
-+<?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="StorefrontUpdateSearchTermEntityTest">
-+        <annotations>
-+            <stories value="Storefront Search"/>
-+            <title value="Update Storefront Search Results"/>
-+            <description value="You should see the updated Search Term on the Storefront via the Admin."/>
-+            <testCaseId value="MC-13987"/>
-+            <severity value="CRITICAL"/>
-+            <group value="search"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory1"/>
-+            <createData entity="SimpleProduct" stepKey="createProduct1">
-+                <requiredEntity createDataKey="createCategory1"/>
-+            </createData>
-+
-+            <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage1"/>
-+            <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin1"/>
-+
-+            <deleteData createDataKey="createProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="createCategory1" stepKey="deleteCategory1"/>
-+        </after>
-+
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName1">
-+            <argument name="phrase" value="$$createProduct1.name$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+
-+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+
-+        <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByFirstSearchQuery1">
-+            <argument name="searchQuery" value="$$createProduct1.name$$"/>
-+        </actionGroup>
-+
-+        <click selector="{{AdminGridRow.editByValue($$createProduct1.name$$)}}" stepKey="clickOnSearchResult1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+
-+        <actionGroup ref="AdminFillAllSearchTermFieldsActionGroup" stepKey="searchForSearchTerm1">
-+            <argument name="searchTerm" value="UpdatedSearchTermData1"/>
-+        </actionGroup>
-+
-+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage2"/>
-+        <waitForPageLoad stepKey="waitForPageLoad3"/>
-+
-+        <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByFirstSearchQuery2">
-+            <argument name="searchQuery" value="{{UpdatedSearchTermData1.query_text}}"/>
-+        </actionGroup>
-+
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage2"/>
-+        <waitForPageLoad stepKey="waitForPageLoad4"/>
-+
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName2">
-+            <argument name="phrase" value="{{UpdatedSearchTermData1.query_text}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
-index 891f008979e..8d1dbbd6dd6 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
-@@ -10,12 +10,27 @@ namespace Magento\CatalogSearch\Test\Unit\Controller\Advanced;
-  */
- class ResultTest extends \PHPUnit\Framework\TestCase
- {
-+    /**
-+     * Test result action filters set before load layout scenario
-+     *
-+     * @return void
-+     */
-     public function testResultActionFiltersSetBeforeLoadLayout()
-     {
-         $filters = null;
-         $expectedQuery = 'filtersData';
- 
--        $view = $this->createPartialMock(\Magento\Framework\App\View::class, ['loadLayout', 'renderLayout']);
-+        $view = $this->createPartialMock(
-+            \Magento\Framework\App\View::class,
-+            ['loadLayout', 'renderLayout', 'getPage', 'getLayout']
-+        );
-+        $update = $this->createPartialMock(\Magento\Framework\View\Model\Layout\Merge::class, ['getHandles']);
-+        $update->expects($this->once())->method('getHandles')->will($this->returnValue([]));
-+        $layout = $this->createPartialMock(\Magento\Framework\View\Result\Layout::class, ['getUpdate']);
-+        $layout->expects($this->once())->method('getUpdate')->will($this->returnValue($update));
-+        $view->expects($this->once())->method('getLayout')->will($this->returnValue($layout));
-+        $page = $this->createPartialMock(\Magento\Framework\View\Result\Page::class, ['initLayout']);
-+        $view->expects($this->once())->method('getPage')->will($this->returnValue($page));
-         $view->expects($this->once())->method('loadLayout')->will(
-             $this->returnCallback(
-                 function () use (&$filters, $expectedQuery) {
-@@ -53,6 +68,11 @@ class ResultTest extends \PHPUnit\Framework\TestCase
-         $instance->execute();
-     }
- 
-+    /**
-+     * Test url set on exception scenario
-+     *
-+     * @return void
-+     */
-     public function testUrlSetOnException()
-     {
-         $redirectResultMock = $this->createMock(\Magento\Framework\Controller\Result\Redirect::class);
-@@ -131,11 +151,62 @@ class ResultTest extends \PHPUnit\Framework\TestCase
-         /** @var \Magento\CatalogSearch\Controller\Advanced\Result $instance */
-         $instance = $objectManager->getObject(
-             \Magento\CatalogSearch\Controller\Advanced\Result::class,
--            ['context' => $contextMock,
--            'catalogSearchAdvanced' => $catalogSearchAdvanced,
--            'urlFactory' => $urlFactoryMock
-+            [
-+                'context'               => $contextMock,
-+                'catalogSearchAdvanced' => $catalogSearchAdvanced,
-+                'urlFactory'            => $urlFactoryMock
-             ]
-         );
-         $this->assertEquals($redirectResultMock, $instance->execute());
-     }
-+
-+    /**
-+     * Test no result handle scenario
-+     *
-+     * @return void
-+     */
-+    public function testNoResultsHandle()
-+    {
-+        $expectedQuery = 'notExistTerm';
-+
-+        $update = $this->createPartialMock(\Magento\Framework\View\Model\Layout\Merge::class, ['getHandles']);
-+        $update->expects($this->once())->method('getHandles')->will($this->returnValue([]));
-+
-+        $layout = $this->createPartialMock(\Magento\Framework\View\Result\Layout::class, ['getUpdate']);
-+        $layout->expects($this->once())->method('getUpdate')->will($this->returnValue($update));
-+
-+        $page = $this->createPartialMock(\Magento\Framework\View\Result\Page::class, ['initLayout']);
-+
-+        $view = $this->createPartialMock(
-+            \Magento\Framework\App\View::class,
-+            ['loadLayout', 'renderLayout', 'getPage', 'getLayout']
-+        );
-+
-+        $view->expects($this->once())->method('loadLayout')
-+            ->with([\Magento\CatalogSearch\Controller\Advanced\Result::DEFAULT_NO_RESULT_HANDLE]);
-+
-+        $view->expects($this->once())->method('getPage')->will($this->returnValue($page));
-+        $view->expects($this->once())->method('getLayout')->will($this->returnValue($layout));
-+
-+        $request = $this->createPartialMock(\Magento\Framework\App\Console\Request::class, ['getQueryValue']);
-+        $request->expects($this->once())->method('getQueryValue')->will($this->returnValue($expectedQuery));
-+
-+        $catalogSearchAdvanced = $this->createPartialMock(
-+            \Magento\CatalogSearch\Model\Advanced::class,
-+            ['addFilters', '__wakeup', 'getProductCollection']
-+        );
-+
-+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $context = $objectManager->getObject(
-+            \Magento\Framework\App\Action\Context::class,
-+            ['view' => $view, 'request' => $request]
-+        );
-+
-+        /** @var \Magento\CatalogSearch\Controller\Advanced\Result $instance */
-+        $instance = $objectManager->getObject(
-+            \Magento\CatalogSearch\Controller\Advanced\Result::class,
-+            ['context' => $context, 'catalogSearchAdvanced' => $catalogSearchAdvanced]
-+        );
-+        $instance->execute();
-+    }
- }
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilderTest.php
-index 72379c3819d..949554506d5 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilderTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilderTest.php
-@@ -20,6 +20,8 @@ use Magento\Store\Model\Store;
-  * Test for Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\QueryBuilder.
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class QueryBuilderTest extends \PHPUnit\Framework\TestCase
- {
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php
-index 8eeceba8209..e3cc3e1d183 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php
-@@ -20,9 +20,13 @@ use Magento\Framework\Search\Request\Dimension;
- use Magento\Eav\Model\Entity\Attribute;
- use Magento\Catalog\Model\Product;
- use Magento\Framework\DB\Ddl\Table;
-+use Magento\Framework\Event\Manager;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class DataProviderTest extends \PHPUnit\Framework\TestCase
- {
-@@ -61,6 +65,11 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-      */
-     private $selectBuilderForAttribute;
- 
-+    /**
-+     * @var Manager|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $eventManager;
-+
-     protected function setUp()
-     {
-         $this->eavConfigMock = $this->createMock(Config::class);
-@@ -70,12 +79,14 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-         $this->adapterMock = $this->createMock(AdapterInterface::class);
-         $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($this->adapterMock);
-         $this->selectBuilderForAttribute = $this->createMock(SelectBuilderForAttribute::class);
-+        $this->eventManager = $this->createMock(Manager::class);
-         $this->model = new DataProvider(
-             $this->eavConfigMock,
-             $this->resourceConnectionMock,
-             $this->scopeResolverMock,
-             $this->sessionMock,
--            $this->selectBuilderForAttribute
-+            $this->selectBuilderForAttribute,
-+            $this->eventManager
-         );
-     }
- 
-@@ -99,6 +110,7 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
- 
-         $selectMock = $this->createMock(Select::class);
-         $this->adapterMock->expects($this->atLeastOnce())->method('select')->willReturn($selectMock);
-+        $this->eventManager->expects($this->once())->method('dispatch')->willReturn($selectMock);
-         $tableMock = $this->createMock(Table::class);
- 
-         $this->model->getDataSet($bucketMock, ['scope' => $dimensionMock], $tableMock);
-@@ -126,6 +138,7 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-         $selectMock = $this->createMock(Select::class);
-         $this->selectBuilderForAttribute->expects($this->once())->method('build')->willReturn($selectMock);
-         $this->adapterMock->expects($this->atLeastOnce())->method('select')->willReturn($selectMock);
-+        $this->eventManager->expects($this->once())->method('dispatch')->willReturn($selectMock);
-         $tableMock = $this->createMock(Table::class);
-         $this->model->getDataSet($bucketMock, ['scope' => $dimensionMock], $tableMock);
-     }
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Dynamic/DataProviderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Dynamic/DataProviderTest.php
-index 1186dd6936c..b064eec3338 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Dynamic/DataProviderTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Dynamic/DataProviderTest.php
-@@ -19,8 +19,9 @@ use Magento\Framework\Search\Dynamic\EntityStorage;
- use Magento\Store\Model\StoreManager;
- 
- /**
-- * Class DataProviderTest
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class DataProviderTest extends \PHPUnit\Framework\TestCase
- {
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Field/ResolverTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Field/ResolverTest.php
-index ca19e5e995c..1e609cdeac2 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Field/ResolverTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Field/ResolverTest.php
-@@ -9,6 +9,9 @@ use Magento\Framework\Search\Adapter\Mysql\Field\FieldInterface;
- 
- /**
-  * Unit tests for Magento\CatalogSearch\Model\Adapter\Mysql\Field\Resolver class.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class ResolverTest extends \PHPUnit\Framework\TestCase
- {
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/AliasResolverTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/AliasResolverTest.php
-index 697fab65079..1690d9f3936 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/AliasResolverTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/AliasResolverTest.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogSearch\Test\Unit\Model\Adapter\Mysql\Filter;
- use Magento\CatalogSearch\Model\Search\RequestGenerator;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
- 
-+/**
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class AliasResolverTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php
-index 01108358da2..7e3de7534e8 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php
-@@ -15,6 +15,8 @@ use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class PreprocessorTest extends \PHPUnit\Framework\TestCase
- {
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php
-index fc5915bb3cd..a4f62ce83a1 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php
-@@ -250,6 +250,7 @@ class AdvancedTest extends \PHPUnit\Framework\TestCase
-                 'productCollectionFactory' => $productCollectionFactory,
-                 'storeManager' => $this->storeManager,
-                 'currencyFactory' => $currencyFactory,
-+                'collectionProvider' => null
-             ]
-         );
-         $instance->addFilters($values);
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
-index d7129b9c224..f70c61cdbaf 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
-@@ -116,6 +116,7 @@ class FulltextTest extends \PHPUnit\Framework\TestCase
-             ->willReturn($ids);
-         $this->saveHandler->expects($this->exactly(count($stores)))->method('deleteIndex');
-         $this->saveHandler->expects($this->exactly(2))->method('saveIndex');
-+        $this->saveHandler->expects($this->exactly(2))->method('isAvailable')->willReturn(true);
-         $consecutiveStoreRebuildArguments = array_map(
-             function ($store) use ($ids) {
-                 return [$store, $ids];
-@@ -186,6 +187,7 @@ class FulltextTest extends \PHPUnit\Framework\TestCase
-             ->willReturn($ids);
-         $this->saveHandler->expects($this->exactly(count($stores)))->method('deleteIndex');
-         $this->saveHandler->expects($this->exactly(2))->method('saveIndex');
-+        $this->saveHandler->expects($this->exactly(2))->method('isAvailable')->willReturn(true);
-         $this->fullAction->expects($this->exactly(2))
-             ->method('rebuildStoreIndex')
-             ->willReturn(new \ArrayObject([$indexData, $indexData]));
-@@ -204,6 +206,7 @@ class FulltextTest extends \PHPUnit\Framework\TestCase
-             ->willReturn([$id]);
-         $this->saveHandler->expects($this->exactly(count($stores)))->method('deleteIndex');
-         $this->saveHandler->expects($this->exactly(2))->method('saveIndex');
-+        $this->saveHandler->expects($this->exactly(2))->method('isAvailable')->willReturn(true);
-         $this->fullAction->expects($this->exactly(2))
-             ->method('rebuildStoreIndex')
-             ->willReturn(new \ArrayObject([$indexData, $indexData]));
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php
-index abc0fdd1069..69e2c33d02d 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php
-@@ -321,10 +321,6 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
-             ->method('build')
-             ->will($this->returnValue($builtData));
- 
--        $this->fulltextCollection->expects($this->once())
--            ->method('getSize')
--            ->will($this->returnValue(50));
--
-         $expectedFilterItems = [
-             $this->createFilterItem(0, $builtData[0]['label'], $builtData[0]['value'], $builtData[0]['count']),
-             $this->createFilterItem(1, $builtData[1]['label'], $builtData[1]['value'], $builtData[1]['count']),
-@@ -383,9 +379,6 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
-         $this->fulltextCollection->expects($this->once())
-             ->method('getFacetedData')
-             ->willReturn($facetedData);
--        $this->fulltextCollection->expects($this->once())
--            ->method('getSize')
--            ->will($this->returnValue(50));
- 
-         $this->itemDataBuilder->expects($this->once())
-             ->method('addItemData')
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php
-index 21d67bdf53c..683070c2862 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php
-@@ -7,12 +7,20 @@ namespace Magento\CatalogSearch\Test\Unit\Model\ResourceModel\Advanced;
- 
- use Magento\Catalog\Model\Product;
- use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
- use Magento\CatalogSearch\Test\Unit\Model\ResourceModel\BaseCollection;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory;
- 
- /**
-  * Tests Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class CollectionTest extends BaseCollection
- {
-@@ -77,6 +85,42 @@ class CollectionTest extends BaseCollection
-         $productLimitationFactoryMock->method('create')
-             ->willReturn($productLimitationMock);
- 
-+        $searchCriteriaResolver = $this->getMockBuilder(SearchCriteriaResolverInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['resolve'])
-+            ->getMockForAbstractClass();
-+        $searchCriteriaResolverFactory = $this->getMockBuilder(SearchCriteriaResolverFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $searchCriteriaResolverFactory->expects($this->any())
-+            ->method('create')
-+            ->willReturn($searchCriteriaResolver);
-+
-+        $searchResultApplier = $this->getMockBuilder(SearchResultApplierInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['apply'])
-+            ->getMockForAbstractClass();
-+        $searchResultApplierFactory = $this->getMockBuilder(SearchResultApplierFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $searchResultApplierFactory->expects($this->any())
-+            ->method('create')
-+            ->willReturn($searchResultApplier);
-+
-+        $totalRecordsResolver = $this->getMockBuilder(TotalRecordsResolverInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['resolve'])
-+            ->getMockForAbstractClass();
-+        $totalRecordsResolverFactory = $this->getMockBuilder(TotalRecordsResolverFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $totalRecordsResolverFactory->expects($this->any())
-+            ->method('create')
-+            ->willReturn($totalRecordsResolver);
-+
-         $this->advancedCollection = $this->objectManager->getObject(
-             \Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection::class,
-             [
-@@ -88,6 +132,10 @@ class CollectionTest extends BaseCollection
-                 'temporaryStorageFactory' => $this->temporaryStorageFactory,
-                 'search' => $this->search,
-                 'productLimitationFactory' => $productLimitationFactoryMock,
-+                'collectionProvider' => null,
-+                'searchCriteriaResolverFactory' => $searchCriteriaResolverFactory,
-+                'searchResultApplierFactory' => $searchResultApplierFactory,
-+                'totalRecordsResolverFactory' => $totalRecordsResolverFactory
-             ]
-         );
-     }
-@@ -115,18 +163,8 @@ class CollectionTest extends BaseCollection
-             ->willReturn($this->filterBuilder);
- 
-         $filter = $this->createMock(\Magento\Framework\Api\Filter::class);
--        $this->filterBuilder->expects($this->once())->method('create')->willReturn($filter);
--
--        $criteria = $this->createMock(\Magento\Framework\Api\Search\SearchCriteria::class);
--        $this->criteriaBuilder->expects($this->once())->method('create')->willReturn($criteria);
--        $criteria->expects($this->once())
--            ->method('setRequestName')
--            ->with('advanced_search_container');
--
--        $tempTable = $this->createMock(\Magento\Framework\DB\Ddl\Table::class);
--        $temporaryStorage = $this->createMock(\Magento\Framework\Search\Adapter\Mysql\TemporaryStorage::class);
--        $temporaryStorage->expects($this->once())->method('storeApiDocuments')->willReturn($tempTable);
--        $this->temporaryStorageFactory->expects($this->once())->method('create')->willReturn($temporaryStorage);
-+        $this->filterBuilder->expects($this->any())->method('create')->willReturn($filter);
-+
-         $searchResult = $this->createMock(\Magento\Framework\Api\Search\SearchResultInterface::class);
-         $this->search->expects($this->once())->method('search')->willReturn($searchResult);
- 
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/BaseCollection.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/BaseCollection.php
-index e99d75c25f5..9ea103e23d2 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/BaseCollection.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/BaseCollection.php
-@@ -9,6 +9,9 @@ namespace Magento\CatalogSearch\Test\Unit\Model\ResourceModel;
-  * Base class for Collection tests.
-  *
-  * Contains helper methods to get commonly used mocks used for collection tests.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  **/
- class BaseCollection extends \PHPUnit\Framework\TestCase
- {
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
-index a3b1d2fd0f2..9170b81dc31 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
-@@ -5,6 +5,12 @@
-  */
- namespace Magento\CatalogSearch\Test\Unit\Model\ResourceModel\Fulltext;
- 
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
- use Magento\CatalogSearch\Test\Unit\Model\ResourceModel\BaseCollection;
- use Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory;
- use PHPUnit_Framework_MockObject_MockObject as MockObject;
-@@ -97,6 +103,41 @@ class CollectionTest extends BaseCollection
-         $temporaryStorageFactory->expects($this->any())
-             ->method('create')
-             ->willReturn($this->temporaryStorage);
-+        $searchCriteriaResolver = $this->getMockBuilder(SearchCriteriaResolverInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['resolve'])
-+            ->getMockForAbstractClass();
-+        $searchCriteriaResolverFactory = $this->getMockBuilder(SearchCriteriaResolverFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $searchCriteriaResolverFactory->expects($this->any())
-+            ->method('create')
-+            ->willReturn($searchCriteriaResolver);
-+
-+        $searchResultApplier = $this->getMockBuilder(SearchResultApplierInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['apply'])
-+            ->getMockForAbstractClass();
-+        $searchResultApplierFactory = $this->getMockBuilder(SearchResultApplierFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $searchResultApplierFactory->expects($this->any())
-+            ->method('create')
-+            ->willReturn($searchResultApplier);
-+
-+        $totalRecordsResolver = $this->getMockBuilder(TotalRecordsResolverInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['resolve'])
-+            ->getMockForAbstractClass();
-+        $totalRecordsResolverFactory = $this->getMockBuilder(TotalRecordsResolverFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $totalRecordsResolverFactory->expects($this->any())
-+            ->method('create')
-+            ->willReturn($totalRecordsResolver);
- 
-         $this->model = $this->objectManager->getObject(
-             \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection::class,
-@@ -106,6 +147,9 @@ class CollectionTest extends BaseCollection
-                 'scopeConfig' => $this->scopeConfig,
-                 'temporaryStorageFactory' => $temporaryStorageFactory,
-                 'productLimitationFactory' => $productLimitationFactoryMock,
-+                'searchCriteriaResolverFactory' => $searchCriteriaResolverFactory,
-+                'searchResultApplierFactory' => $searchResultApplierFactory,
-+                'totalRecordsResolverFactory' => $totalRecordsResolverFactory,
-             ]
-         );
- 
-@@ -124,37 +168,10 @@ class CollectionTest extends BaseCollection
-         $reflectionProperty->setValue(null);
-     }
- 
--    /**
--     * @expectedException \Exception
--     * @expectedExceptionCode 333
--     * @expectedExceptionMessage setRequestName
--     */
--    public function testGetFacetedDataWithException()
--    {
--        $criteria = $this->createMock(\Magento\Framework\Api\Search\SearchCriteria::class);
--        $this->criteriaBuilder->expects($this->once())->method('create')->willReturn($criteria);
--        $criteria->expects($this->once())
--            ->method('setRequestName')
--            ->withConsecutive(['catalog_view_container'])
--            ->willThrowException(new \Exception('setRequestName', 333));
--        $this->model->getFacetedData('field');
--    }
--
-     public function testGetFacetedDataWithEmptyAggregations()
-     {
--        $criteria = $this->createMock(\Magento\Framework\Api\Search\SearchCriteria::class);
--        $this->criteriaBuilder->expects($this->once())->method('create')->willReturn($criteria);
--        $criteria->expects($this->once())
--            ->method('setRequestName')
--            ->withConsecutive(['catalog_view_container']);
-         $searchResult = $this->getMockBuilder(\Magento\Framework\Api\Search\SearchResultInterface::class)
-             ->getMockForAbstractClass();
--        $table = $this->getMockBuilder(\Magento\Framework\DB\Ddl\Table::class)
--            ->setMethods(['getName'])
--            ->getMock();
--        $this->temporaryStorage->expects($this->once())
--            ->method('storeApiDocuments')
--            ->willReturn($table);
-         $this->search->expects($this->once())
-             ->method('search')
-             ->willReturn($searchResult);
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Setup/PropertyMapperTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Setup/PropertyMapperTest.php
-new file mode 100644
-index 00000000000..5c917b360f1
---- /dev/null
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Setup/PropertyMapperTest.php
-@@ -0,0 +1,65 @@
-+<?php
-+declare(strict_types=1);
-+
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\CatalogSearch\Test\Unit\Model\ResourceModel\Setup;
-+
-+use Magento\CatalogSearch\Model\ResourceModel\Setup\PropertyMapper;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Class PropertyMapperTest
-+ *
-+ * @package Magento\CatalogSearch\Test\Unit\Model\ResourceModel\Setup
-+ */
-+class PropertyMapperTest extends TestCase
-+{
-+    /**
-+     * @var PropertyMapper
-+     */
-+    private $propertyMapper;
-+
-+    /**
-+     * @return void
-+     */
-+    protected function setUp(): void
-+    {
-+        $this->propertyMapper = new PropertyMapper();
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function caseProvider(): array
-+    {
-+        return [
-+            [
-+                ['search_weight' => 9, 'something_other' => '3'],
-+                ['search_weight' => 9]
-+            ],
-+            [
-+                ['something' => 3],
-+                ['search_weight' => 1]
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * @dataProvider caseProvider
-+     *
-+     * @test
-+     *
-+     * @param array $input
-+     * @param array $result
-+     * @return void
-+     */
-+    public function testMapCorrectlyMapsValue(array $input, array $result): void
-+    {
-+        //Second parameter doesn't matter as it is not used
-+        $this->assertSame($result, $this->propertyMapper->map($input, 4));
-+    }
-+}
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/BaseSelectStrategy/StrategyMapperTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/BaseSelectStrategy/StrategyMapperTest.php
-index 5fa5b0333c6..b168e728117 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/BaseSelectStrategy/StrategyMapperTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/BaseSelectStrategy/StrategyMapperTest.php
-@@ -11,6 +11,10 @@ use Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy\BaseSelectFullT
- use \Magento\CatalogSearch\Model\Search\BaseSelectStrategy\StrategyMapper;
- use \Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
- 
-+/**
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class StrategyMapperTest extends \PHPUnit\Framework\TestCase
- {
-     /** @var  BaseSelectAttributesSearchStrategy|\PHPUnit_Framework_MockObject_MockObject */
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/ExclusionStrategyTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/ExclusionStrategyTest.php
-index 09591532f9f..e693807760e 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/ExclusionStrategyTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/ExclusionStrategyTest.php
-@@ -17,6 +17,8 @@ use Magento\Store\Api\Data\WebsiteInterface;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class ExclusionStrategyTest extends \PHPUnit\Framework\TestCase
- {
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/FilterContextTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/FilterContextTest.php
-index e16f23ca09d..12ce0d63ac6 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/FilterContextTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/FilterContextTest.php
-@@ -16,6 +16,10 @@ use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
- use Magento\Framework\Search\Request\FilterInterface;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- 
-+/**
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class FilterContextTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/TermDropdownStrategyTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/TermDropdownStrategyTest.php
-index 8771c92039f..e064f46655d 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/TermDropdownStrategyTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/TermDropdownStrategyTest.php
-@@ -18,6 +18,9 @@ use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- /**
-  * Class TermDropdownStrategyTest.
-  * Unit test for \Magento\CatalogSearch\Model\Search\FilterMapper\TermDropdownStrategy.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class TermDropdownStrategyTest extends \PHPUnit\Framework\TestCase
- {
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php
-index da7cfa1ea98..b066c118ef7 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php
-@@ -27,6 +27,8 @@ use Magento\Framework\DB\Select;
-  * Test for \Magento\CatalogSearch\Model\Search\IndexBuilder
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class IndexBuilderTest extends \PHPUnit\Framework\TestCase
- {
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php
-index b52c9cfd674..a8c654652a3 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php
-@@ -9,6 +9,9 @@ use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
- use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorResolver;
- use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorInterface;
- 
-+/**
-+ * Test for \Magento\CatalogSearch\Model\Search\RequestGenerator
-+ */
- class RequestGeneratorTest extends \PHPUnit\Framework\TestCase
- {
-     /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager  */
-@@ -61,7 +64,7 @@ class RequestGeneratorTest extends \PHPUnit\Framework\TestCase
-         return [
-             [
-                 [
--                    'quick_search_container' => ['queries' => 0, 'filters' => 0, 'aggregations' => 0],
-+                    'quick_search_container' => ['queries' => 1, 'filters' => 0, 'aggregations' => 0],
-                     'advanced_search_container' => ['queries' => 0, 'filters' => 0, 'aggregations' => 0],
-                     'catalog_view_container' => ['queries' => 0, 'filters' => 0, 'aggregations' => 0]
-                 ],
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/TableMapperTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/TableMapperTest.php
-index cfddc07bcee..db467552615 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/TableMapperTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/TableMapperTest.php
-@@ -18,7 +18,10 @@ use Magento\Framework\Search\Request\Filter\Term;
- 
- /**
-  * Test for \Magento\CatalogSearch\Model\Search\TableMapper
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class TableMapperTest extends \PHPUnit\Framework\TestCase
- {
-diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Plugin/EnableEavIndexerTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Plugin/EnableEavIndexerTest.php
-index 0eac2e3309a..b20fdde7c52 100644
---- a/app/code/Magento/CatalogSearch/Test/Unit/Plugin/EnableEavIndexerTest.php
-+++ b/app/code/Magento/CatalogSearch/Test/Unit/Plugin/EnableEavIndexerTest.php
-@@ -9,6 +9,10 @@ namespace Magento\CatalogSearch\Test\Unit\Plugin;
- 
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
- 
-+/**
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class EnableEavIndexerTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-diff --git a/app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php b/app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php
-index 1b05152903a..f312178e0bf 100644
---- a/app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php
-+++ b/app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php
-@@ -5,8 +5,8 @@
-  */
- namespace Magento\CatalogSearch\Ui\DataProvider\Product;
- 
--use Magento\Framework\Data\Collection;
- use Magento\CatalogSearch\Model\ResourceModel\Search\Collection as SearchCollection;
-+use Magento\Framework\Data\Collection;
- use Magento\Ui\DataProvider\AddFilterToCollectionInterface;
- 
- /**
-@@ -30,14 +30,14 @@ class AddFulltextFilterToCollection implements AddFilterToCollectionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function addFilter(Collection $collection, $field, $condition = null)
-     {
-         /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
--        if (isset($condition['fulltext']) && !empty($condition['fulltext'])) {
-+        if (isset($condition['fulltext']) && (string)$condition['fulltext'] !== '') {
-             $this->searchCollection->addBackendSearchFilter($condition['fulltext']);
-             $productIds = $this->searchCollection->load()->getAllIds();
-             $collection->addIdFilter($productIds);
-diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
-index 1000e349b6f..7bcb91e9454 100644
---- a/app/code/Magento/CatalogSearch/composer.json
-+++ b/app/code/Magento/CatalogSearch/composer.json
-@@ -1,6 +1,6 @@
- {
-     "name": "magento/module-catalog-search",
--    "description": "N/A",
-+    "description": "Catalog search",
-     "config": {
-         "sort-packages": true
-     },
-diff --git a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
-index 39235511eae..c358062b88a 100644
---- a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
-+++ b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
-@@ -19,15 +19,17 @@
-                 <field id="engine" canRestore="1">
-                     <backend_model>Magento\CatalogSearch\Model\Adminhtml\System\Config\Backend\Engine</backend_model>
-                 </field>
--                <field id="min_query_length" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="min_query_length" translate="label comment" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Minimal Query Length</label>
-                     <validate>validate-digits</validate>
-+                    <comment>This value must be compatible with the corresponding setting in the configured search engine. Be aware: a low query length limit may cause the performance impact.</comment>
-                 </field>
--                <field id="max_query_length" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="max_query_length" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Maximum Query Length</label>
-                     <validate>validate-digits</validate>
-+                    <comment>This value must be compatible with the corresponding setting in the configured search engine.</comment>
-                 </field>
--                <field id="max_count_cacheable_search_terms" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="max_count_cacheable_search_terms" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Number of top search results to cache</label>
-                     <comment>Number of popular search terms to be cached for faster response. Use “0” to cache all results after a term is searched for the second time.</comment>
-                     <validate>validate-digits</validate>
-diff --git a/app/code/Magento/CatalogSearch/etc/config.xml b/app/code/Magento/CatalogSearch/etc/config.xml
-index 66b79226c9f..7ea15c6caa5 100644
---- a/app/code/Magento/CatalogSearch/etc/config.xml
-+++ b/app/code/Magento/CatalogSearch/etc/config.xml
-@@ -13,7 +13,7 @@
-             </seo>
-             <search>
-                 <engine>mysql</engine>
--                <min_query_length>1</min_query_length>
-+                <min_query_length>3</min_query_length>
-                 <max_query_length>128</max_query_length>
-                 <max_count_cacheable_search_terms>100</max_count_cacheable_search_terms>
-                 <autocomplete_limit>8</autocomplete_limit>
-diff --git a/app/code/Magento/CatalogSearch/etc/di.xml b/app/code/Magento/CatalogSearch/etc/di.xml
-index cc07384d4c5..7359bd6b454 100644
---- a/app/code/Magento/CatalogSearch/etc/di.xml
-+++ b/app/code/Magento/CatalogSearch/etc/di.xml
-@@ -14,6 +14,10 @@
-     <preference for="Magento\CatalogSearch\Model\Search\FilterMapper\FilterStrategyInterface" type="Magento\CatalogSearch\Model\Search\FilterMapper\FilterContext"/>
-     <preference for="Magento\CatalogSearch\Model\Indexer\IndexSwitcherInterface" type="Magento\CatalogSearch\Model\Indexer\IndexSwitcherProxy"/>
-     <preference for="Magento\CatalogSearch\Model\Adapter\Aggregation\RequestCheckerInterface" type="Magento\CatalogSearch\Model\Adapter\Aggregation\RequestCheckerComposite"/>
-+    <preference for="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolver"/>
-+    <preference for="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplier"/>
-+    <preference for="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolver"/>
-+    <preference for="Magento\CatalogSearch\Model\Search\ItemCollectionProviderInterface" type="Magento\CatalogSearch\Model\Search\ItemCollectionProvider"/>
-     <type name="Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory">
-         <arguments>
-             <argument name="handlers" xsi:type="array">
-@@ -176,8 +180,13 @@
-             <argument name="collectionFactory" xsi:type="object">Magento\CatalogSearch\Model\ResourceModel\Fulltext\SearchCollectionFactory</argument>
-         </arguments>
-     </virtualType>
--    <virtualType name="Magento\CatalogSearch\Model\ResourceModel\Advanced\CollectionFactory"
--                 type="Magento\Catalog\Model\ResourceModel\Product\CollectionFactory">
-+
-+    <virtualType name="Magento\CatalogSearch\Model\Advanced\ItemCollectionProvider" type="Magento\Catalog\Model\Layer\Search\ItemCollectionProvider">
-+        <arguments>
-+            <argument name="collectionFactory" xsi:type="object">Magento\CatalogSearch\Model\ResourceModel\Advanced\CollectionFactory</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="Magento\CatalogSearch\Model\ResourceModel\Advanced\CollectionFactory" type="Magento\Catalog\Model\ResourceModel\Product\CollectionFactory">
-         <arguments>
-             <argument name="instanceName" xsi:type="string">Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection</argument>
-         </arguments>
-@@ -185,6 +194,21 @@
-     <type name="Magento\CatalogSearch\Model\Advanced">
-         <arguments>
-             <argument name="productCollectionFactory" xsi:type="object">Magento\CatalogSearch\Model\ResourceModel\Advanced\CollectionFactory</argument>
-+            <argument name="collectionProvider" xsi:type="object">Magento\CatalogSearch\Model\Search\ItemCollectionProviderInterface</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\CatalogSearch\Model\Search\ItemCollectionProvider">
-+        <arguments>
-+            <argument name="factories" xsi:type="array">
-+                <item name="mysql" xsi:type="object">Magento\CatalogSearch\Model\ResourceModel\Advanced\CollectionFactory</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategyProvider">
-+        <arguments>
-+            <argument name="strategies" xsi:type="array">
-+                <item name="mysql" xsi:type="object">Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategy</item>
-+            </argument>
-         </arguments>
-     </type>
-     <virtualType name="Magento\CatalogSearch\Model\Layer\Category\Context" type="Magento\Catalog\Model\Layer\Category\Context">
-@@ -340,4 +364,11 @@
-     <type name="Magento\Config\Model\Config">
-         <plugin name="config_enable_eav_indexer" type="Magento\CatalogSearch\Plugin\EnableEavIndexer" />
-     </type>
-+    <type name="Magento\Eav\Model\Entity\Setup\PropertyMapper\Composite">
-+        <arguments>
-+            <argument name="propertyMappers" xsi:type="array">
-+                <item name="catalog_search" xsi:type="string">Magento\CatalogSearch\Model\ResourceModel\Setup\PropertyMapper</item>
-+            </argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/CatalogSearch/etc/search_request.xml b/app/code/Magento/CatalogSearch/etc/search_request.xml
-index d7bfb2e6b4a..6f9eb6e2066 100644
---- a/app/code/Magento/CatalogSearch/etc/search_request.xml
-+++ b/app/code/Magento/CatalogSearch/etc/search_request.xml
-@@ -19,7 +19,6 @@
-                 <queryReference clause="must" ref="visibility"/>
-             </query>
-             <query xsi:type="matchQuery" value="$search_term$" name="search">
--                <match field="sku"/>
-                 <match field="*"/>
-             </query>
-             <query xsi:type="filteredQuery" name="category">
-diff --git a/app/code/Magento/CatalogSearch/i18n/en_US.csv b/app/code/Magento/CatalogSearch/i18n/en_US.csv
-index 9121520774c..f25d1a589d4 100644
---- a/app/code/Magento/CatalogSearch/i18n/en_US.csv
-+++ b/app/code/Magento/CatalogSearch/i18n/en_US.csv
-@@ -37,3 +37,6 @@ name,name
- "Minimal Query Length","Minimal Query Length"
- "Maximum Query Length","Maximum Query Length"
- "Rebuild Catalog product fulltext search index","Rebuild Catalog product fulltext search index"
-+"Please enter a valid price range.","Please enter a valid price range."
-+"This value must be compatible with the corresponding setting in the configured search engine. Be aware: a low query length limit may cause the performance impact.","This value must be compatible with the corresponding setting in the configured search engine. Be aware: a low query length limit may cause the performance impact."
-+"This value must be compatible with the corresponding setting in the configured search engine.","This value must be compatible with the corresponding setting in the configured search engine."
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
-index 53a30102287..3712f221233 100644
---- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
-+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php
- /**
-@@ -14,108 +13,120 @@
-  * @var $block \Magento\CatalogSearch\Block\Advanced\Form
-  */
- ?>
--<?php $maxQueryLength = $this->helper('Magento\CatalogSearch\Helper\Data')->getMaxQueryLength();?>
--<form class="form search advanced" action="<?= /* @escapeNotVerified */ $block->getSearchPostUrl() ?>" method="get" id="form-validate">
-+<?php $maxQueryLength = $this->helper(\Magento\CatalogSearch\Helper\Data::class)->getMaxQueryLength();?>
-+<form class="form search advanced" action="<?= $block->escapeUrl($block->getSearchPostUrl()) ?>" method="get" id="form-validate">
- <fieldset class="fieldset">
--    <legend class="legend"><span><?= /* @escapeNotVerified */ __('Search Settings') ?></span></legend><br />
--    <?php foreach ($block->getSearchableAttributes() as $_attribute): ?>
--    <?php $_code = $_attribute->getAttributeCode() ?>
--        <div class="field <?= /* @escapeNotVerified */ $_code ?>">
--            <label class="label" for="<?= /* @escapeNotVerified */ $_code ?>">
-+    <legend class="legend"><span><?= $block->escapeHtml(__('Search Settings')) ?></span></legend><br />
-+    <?php foreach ($block->getSearchableAttributes() as $_attribute) : ?>
-+        <?php $_code = $_attribute->getAttributeCode() ?>
-+        <div class="field <?= $block->escapeHtmlAttr($_code) ?>">
-+            <label class="label" for="<?= $block->escapeHtmlAttr($_code) ?>">
-                 <span><?= $block->escapeHtml(__($block->getAttributeLabel($_attribute))) ?></span>
-             </label>
-             <div class="control">
--            <?php switch ($block->getAttributeInputType($_attribute)):
--                case 'number': ?>
-+                <?php
-+                switch ($block->getAttributeInputType($_attribute)) :
-+                    case 'number':
-+                        ?>
-                 <div class="range fields group group-2">
-                     <div class="field no-label">
-                         <div class="control">
-                             <input type="text"
--                                   name="<?= /* @escapeNotVerified */ $_code ?>[from]"
-+                                   name="<?= $block->escapeHtmlAttr($_code) ?>[from]"
-                                    value="<?= $block->escapeHtml($block->getAttributeValue($_attribute, 'from')) ?>"
--                                   id="<?= /* @escapeNotVerified */ $_code ?>"
-+                                   id="<?= $block->escapeHtmlAttr($_code) ?>"
-                                    title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
-                                    class="input-text"
--                                   maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>"
--                                   data-validate="{number:true, 'less-than-equals-to':'#<?= /* @escapeNotVerified */ $_code ?>_to'}" />
-+                                   maxlength="<?= $block->escapeHtmlAttr($maxQueryLength) ?>"
-+                                   data-validate="{number:true, 'less-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>_to'}" />
-                         </div>
-                     </div>
-                     <div class="field no-label">
-                         <div class="control">
-                             <input type="text"
--                                   name="<?= /* @escapeNotVerified */ $_code ?>[to]"
-+                                   name="<?= $block->escapeHtmlAttr($_code) ?>[to]"
-                                    value="<?= $block->escapeHtml($block->getAttributeValue($_attribute, 'to')) ?>"
--                                   id="<?= /* @escapeNotVerified */ $_code ?>_to"
-+                                   id="<?= $block->escapeHtmlAttr($_code) ?>_to"
-                                    title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
-                                    class="input-text"
--                                   maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>"
--                                   data-validate="{number:true, 'greater-than-equals-to':'#<?= /* @escapeNotVerified */ $_code ?>'}" />
-+                                   maxlength="<?= $block->escapeHtmlAttr($maxQueryLength) ?>"
-+                                   data-validate="{number:true, 'greater-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>'}" />
-                         </div>
-                     </div>
-                 </div>
--                <?php break;
--                case 'price': ?>
-+                        <?php
-+                        break;
-+                    case 'price':
-+                        ?>
-                 <div class="range price fields group group-2">
-                     <div class="field no-label">
-                         <div class="control">
--                            <input name="<?= /* @escapeNotVerified */ $_code ?>[from]"
-+                            <input name="<?= $block->escapeHtmlAttr($_code) ?>[from]"
-                                    value="<?= $block->escapeHtml($block->getAttributeValue($_attribute, 'from')) ?>"
--                                   id="<?= /* @escapeNotVerified */ $_code ?>"
-+                                   id="<?= $block->escapeHtmlAttr($_code) ?>"
-                                    title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
-                                    class="input-text"
-                                    type="text"
--                                   maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>"
--                                   data-validate="{number:true, 'less-than-equals-to':'#<?= /* @escapeNotVerified */ $_code ?>_to'}" />
-+                                   maxlength="<?= $block->escapeHtmlAttr($maxQueryLength) ?>"
-+                                   data-validate="{number:true, 'less-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>_to'}" />
-                         </div>
-                     </div>
-                     <div class="field with-addon no-label">
-                         <div class="control">
-                             <div class="addon">
--                                <input name="<?= /* @escapeNotVerified */ $_code ?>[to]"
-+                                <input name="<?= $block->escapeHtmlAttr($_code) ?>[to]"
-                                        value="<?= $block->escapeHtml($block->getAttributeValue($_attribute, 'to')) ?>"
--                                       id="<?= /* @escapeNotVerified */ $_code ?>_to"
-+                                       id="<?= $block->escapeHtmlAttr($_code) ?>_to"
-                                        title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
-                                        class="input-text"
-                                        type="text"
--                                       maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>"
--                                       data-validate="{number:true, 'greater-than-equals-to':'#<?= /* @escapeNotVerified */ $_code ?>'}" />
-+                                       maxlength="<?= $block->escapeHtmlAttr($maxQueryLength) ?>"
-+                                       data-validate="{number:true, 'greater-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>'}" />
-                                 <label class="addafter"
--                                       for="<?= /* @escapeNotVerified */ $_code ?>_to">
--                                    <?= /* @escapeNotVerified */ $block->getCurrency($_attribute) ?>
-+                                       for="<?= $block->escapeHtmlAttr($_code) ?>_to">
-+                                    <?= $block->escapeHtml($block->getCurrency($_attribute)) ?>
-                                 </label>
-                             </div>
-                         </div>
-                     </div>
-                 </div>
--                <?php break;
--                case 'select': ?>
--                    <?= /* @escapeNotVerified */ $block->getAttributeSelectElement($_attribute) ?>
--                <?php break;
--                case 'yesno': ?>
--                    <?= /* @escapeNotVerified */ $block->getAttributeYesNoElement($_attribute) ?>
--                <?php break;
--                case 'date': ?>
-+                        <?php
-+                        break;
-+                    case 'select':
-+                        ?>
-+                        <?= /* @noEscape */ $block->getAttributeSelectElement($_attribute) ?>
-+                        <?php
-+                        break;
-+                    case 'yesno':
-+                        ?>
-+                        <?= /* @noEscape */ $block->getAttributeYesNoElement($_attribute) ?>
-+                        <?php
-+                        break;
-+                    case 'date':
-+                        ?>
-                 <div class="range dates fields group group-2">
-                     <div class="field date no-label">
-                         <div class="control">
--                            <?= /* @escapeNotVerified */ $block->getDateInput($_attribute, 'from') ?>
-+                            <?= /* @noEscape */ $block->getDateInput($_attribute, 'from') ?>
-                         </div>
-                     </div>
-                     <div class="field date no-label">
-                         <div class="control">
--                            <?= /* @escapeNotVerified */ $block->getDateInput($_attribute, 'to') ?>
-+                            <?= /* @noEscape */ $block->getDateInput($_attribute, 'to') ?>
-                         </div>
-                     </div>
-                 </div>
--                <?php break;
--                default: ?>
-+                        <?php
-+                        break;
-+                    default:
-+                        ?>
-                 <input type="text"
--                       name="<?= /* @escapeNotVerified */ $_code ?>"
--                       id="<?= /* @escapeNotVerified */ $_code ?>"
-+                       name="<?= $block->escapeHtmlAttr($_code) ?>"
-+                       id="<?= $block->escapeHtmlAttr($_code) ?>"
-                        value="<?= $block->escapeHtml($block->getAttributeValue($_attribute)) ?>"
-                        title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
--                       class="input-text <?= /* @escapeNotVerified */ $block->getAttributeValidationClass($_attribute) ?>"
--                       maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>" />
-+                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass($_attribute)) ?>"
-+                       maxlength="<?= $block->escapeHtmlAttr($maxQueryLength) ?>" />
-             <?php endswitch; ?>
-             </div>
-         </div>
-@@ -126,7 +137,7 @@
-     <button type="submit"
-             class="action search primary"
-             title="<?= $block->escapeHtml(__('Search')) ?>">
--        <span><?= /* @escapeNotVerified */ __('Search') ?></span>
-+        <span><?= $block->escapeHtml(__('Search')) ?></span>
-     </button>
-   </div>
- </div>
-@@ -147,8 +158,8 @@ require([
-                 }
-             },
-             messages: {
--                'price[to]': {'greater-than-equals-to': 'Please enter a valid price range.'},
--                'price[from]': {'less-than-equals-to': 'Please enter a valid price range.'}
-+                'price[to]': {'greater-than-equals-to': '<?= $block->escapeJs(__('Please enter a valid price range.')) ?>'},
-+                'price[from]': {'less-than-equals-to': '<?= $block->escapeJs(__('Please enter a valid price range.')) ?>'}
-             }
-         });
- });
-diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml
-index 09098b1ccd0..2e183291da7 100644
---- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml
-+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml
-@@ -4,13 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- 
-  /** @var \Magento\CatalogSearch\Helper\Data $helper */
--$helper = $this->helper('Magento\CatalogSearch\Helper\Data');
-+$helper = $this->helper(\Magento\CatalogSearch\Helper\Data::class);
- ?>
- <div class="nested">
--    <a class="action advanced" href="<?= /* @escapeNotVerified */ $helper->getAdvancedSearchUrl() ?>" data-action="advanced-search">
--        <?= /* @escapeNotVerified */ __('Advanced Search') ?>
-+    <a class="action advanced" href="<?= $block->escapeUrl($helper->getAdvancedSearchUrl()) ?>" data-action="advanced-search">
-+        <?= $block->escapeHtml(__('Advanced Search')) ?>
-     </a>
- </div>
-diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
-index 83808df5b95..e21b031d695 100644
---- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
-+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
-@@ -3,52 +3,51 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-  * @var $block \Magento\CatalogSearch\Block\Advanced\Result
-  */
-+/** this changes need for valid apply filters and configuration before search process is started */
-+$productList = $block->getProductListHtml();
- ?>
--<?php if ($results = $block->getResultCount()): ?>
-+<?php if ($results = $block->getResultCount()) : ?>
-     <div class="search found">
-         <?php if ($results == 1) : ?>
--            <?= /* @escapeNotVerified */ __('<strong>%1 item</strong> were found using the following search criteria', $results) ?>
--        <?php else: ?>
--            <?= /* @escapeNotVerified */ __('<strong>%1 items</strong> were found using the following search criteria', $results) ?>
-+            <?= /* @noEscape */ __('<strong>%1 item</strong> were found using the following search criteria', $results) ?>
-+        <?php else : ?>
-+            <?= /* @noEscape */ __('<strong>%1 items</strong> were found using the following search criteria', $results) ?>
-         <?php endif; ?>
-     </div>
--<?php else: ?>
-+<?php else : ?>
-     <div role="alert" class="message error">
-         <div>
--            <?= /* @escapeNotVerified */ __('We can\'t find any items matching these search criteria.') ?> <a href="<?= /* @escapeNotVerified */ $block->getFormUrl() ?>"><?= /* @escapeNotVerified */ __('Modify your search.') ?></a>
-+            <?= $block->escapeHtml(__('We can\'t find any items matching these search criteria.')) ?> <a href="<?= $block->escapeUrl($block->getFormUrl()) ?>"><?= $block->escapeHtml(__('Modify your search.')) ?></a>
-         </div>
-     </div>
- <?php endif; ?>
- 
- <?php $searchCriterias = $block->getSearchCriterias(); ?>
- <div class="search summary">
--    <?php foreach (['left', 'right'] as $side): ?>
--        <?php if (@$searchCriterias[$side]): ?>
-+    <?php foreach (['left', 'right'] as $side) : ?>
-+        <?php if (!empty($searchCriterias[$side])) : ?>
-             <ul class="items">
--                <?php foreach ($searchCriterias[$side] as $criteria): ?>
-+                <?php foreach ($searchCriterias[$side] as $criteria) : ?>
-                     <li class="item"><strong><?= $block->escapeHtml(__($criteria['name'])) ?>:</strong> <?= $block->escapeHtml($criteria['value']) ?></li>
-                 <?php endforeach; ?>
-             </ul>
-         <?php endif; ?>
-     <?php endforeach; ?>
- </div>
--<?php if ($block->getResultCount()): ?>
-+<?php if ($block->getResultCount()) : ?>
-     <div class="message notice">
-         <div>
--            <?= /* @escapeNotVerified */ __("Don't see what you're looking for?") ?>
--            <a href="<?= /* @escapeNotVerified */ $block->getFormUrl() ?>"><?= /* @escapeNotVerified */ __('Modify your search.') ?></a>
-+            <?= $block->escapeHtml(__("Don't see what you're looking for?")) ?>
-+            <a href="<?= $block->escapeUrl($block->getFormUrl()) ?>"><?= $block->escapeHtml(__('Modify your search.')) ?></a>
-         </div>
-     </div>
- <?php endif; ?>
--<?php if ($block->getResultCount()): ?>
--    <div class="search results"><?= $block->getProductListHtml() ?></div>
-+<?php if ($block->getResultCount()) : ?>
-+    <div class="search results"><?= /* @noEscape */ $productList ?></div>
- <?php endif; ?>
- <?php $block->getSearchCriterias(); ?>
-diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
-index 2757ae3b5f7..c63e6ff4abe 100644
---- a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
-+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
-@@ -3,34 +3,31 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($block->getResultCount()): ?>
--<?= $block->getChildHtml('tagged_product_list_rss_link') ?>
-+<?php if ($block->getResultCount()) : ?>
-+    <?= /* @noEscape */ $block->getChildHtml('tagged_product_list_rss_link') ?>
- <div class="search results">
--    <?php if ($messages = $block->getNoteMessages()):?>
-+    <?php if ($messages = $block->getNoteMessages()) : ?>
-     <div class="message notice">
-         <div>
--            <?php foreach ($messages as $message):?>
--                <?= /* @escapeNotVerified */ $message ?><br />
--            <?php endforeach;?>
-+            <?php foreach ($messages as $message) : ?>
-+                <?= /* @noEscape */ $message ?><br />
-+            <?php endforeach; ?>
-         </div>
-     </div>
-     <?php endif; ?>
-     <?= $block->getProductListHtml() ?>
- </div>
--<?php else: ?>
-+<?php else : ?>
- 
- <div class="message notice">
-     <div>
--        <?= /* @escapeNotVerified */ ($block->getNoResultText()) ? $block->getNoResultText() : __('Your search returned no results.') ?>
--        <?= $block->getAdditionalHtml() ?>
--        <?php if ($messages = $block->getNoteMessages()):?>
--            <?php foreach ($messages as $message):?>
--                <br /><?= /* @escapeNotVerified */ $message ?>
--            <?php endforeach;?>
-+        <?= $block->escapeHtml($block->getNoResultText() ? $block->getNoResultText() : __('Your search returned no results.')) ?>
-+        <?= /* @noEscape */ $block->getAdditionalHtml() ?>
-+        <?php if ($messages = $block->getNoteMessages()) : ?>
-+            <?php foreach ($messages as $message) : ?>
-+                <br /><?= /* @noEscape */ $message ?>
-+            <?php endforeach; ?>
-         <?php endif; ?>
-     </div>
- </div>
-diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/search_terms_log.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/search_terms_log.phtml
-index 61609bdf66b..38ef11933a4 100644
---- a/app/code/Magento/CatalogSearch/view/frontend/templates/search_terms_log.phtml
-+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/search_terms_log.phtml
-@@ -3,14 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
- ?>
--<?php if ($block->getSearchTermsLog()->isPageCacheable()): ?>
-+<?php if ($block->getSearchTermsLog()->isPageCacheable()) : ?>
-     <script type="text/x-magento-init">
-     {
-         "*": {
-             "Magento_CatalogSearch/js/search-terms-log": {
--                "url": "<?= /* @escapeNotVerified */ $block->getUrl('catalogsearch/searchTermsLog/save') ?>"
-+                "url": "<?= $block->escapeUrl($block->getUrl('catalogsearch/searchTermsLog/save')) ?>"
-             }
-         }
-     }
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
-index 6aa33f37cd3..d18034220cf 100644
---- a/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
-@@ -10,7 +10,11 @@ use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGeneratorFactory;
- use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
- use Magento\UrlRewrite\Model\MergeDataProviderFactory;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Catalog\Api\CategoryRepositoryInterface;
- 
-+/**
-+ * Model for generate url rewrites for children categories
-+ */
- class ChildrenUrlRewriteGenerator
- {
-     /**
-@@ -28,15 +32,22 @@ class ChildrenUrlRewriteGenerator
-      */
-     private $mergeDataProviderPrototype;
- 
-+    /**
-+     * @var CategoryRepositoryInterface
-+     */
-+    private $categoryRepository;
-+
-     /**
-      * @param \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider $childrenCategoriesProvider
-      * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGeneratorFactory $categoryUrlRewriteGeneratorFactory
-      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
-+     * @param CategoryRepositoryInterface|null $categoryRepository
-      */
-     public function __construct(
-         ChildrenCategoriesProvider $childrenCategoriesProvider,
-         CategoryUrlRewriteGeneratorFactory $categoryUrlRewriteGeneratorFactory,
--        MergeDataProviderFactory $mergeDataProviderFactory = null
-+        MergeDataProviderFactory $mergeDataProviderFactory = null,
-+        CategoryRepositoryInterface $categoryRepository = null
-     ) {
-         $this->childrenCategoriesProvider = $childrenCategoriesProvider;
-         $this->categoryUrlRewriteGeneratorFactory = $categoryUrlRewriteGeneratorFactory;
-@@ -44,6 +55,8 @@ class ChildrenUrlRewriteGenerator
-             $mergeDataProviderFactory = ObjectManager::getInstance()->get(MergeDataProviderFactory::class);
-         }
-         $this->mergeDataProviderPrototype = $mergeDataProviderFactory->create();
-+        $this->categoryRepository = $categoryRepository
-+            ?: ObjectManager::getInstance()->get(CategoryRepositoryInterface::class);
-     }
- 
-     /**
-@@ -53,18 +66,23 @@ class ChildrenUrlRewriteGenerator
-      * @param \Magento\Catalog\Model\Category $category
-      * @param int|null $rootCategoryId
-      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function generate($storeId, Category $category, $rootCategoryId = null)
-     {
-         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
--        foreach ($this->childrenCategoriesProvider->getChildren($category, true) as $childCategory) {
--            $childCategory->setStoreId($storeId);
--            $childCategory->setData('save_rewrites_history', $category->getData('save_rewrites_history'));
--            /** @var CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator */
--            $categoryUrlRewriteGenerator = $this->categoryUrlRewriteGeneratorFactory->create();
--            $mergeDataProvider->merge(
--                $categoryUrlRewriteGenerator->generate($childCategory, false, $rootCategoryId)
--            );
-+        $childrenIds = $this->childrenCategoriesProvider->getChildrenIds($category, true);
-+        if ($childrenIds) {
-+            foreach ($childrenIds as $childId) {
-+                /** @var Category $childCategory */
-+                $childCategory = $this->categoryRepository->get($childId, $storeId);
-+                $childCategory->setData('save_rewrites_history', $category->getData('save_rewrites_history'));
-+                /** @var CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator */
-+                $categoryUrlRewriteGenerator = $this->categoryUrlRewriteGeneratorFactory->create();
-+                $mergeDataProvider->merge(
-+                    $categoryUrlRewriteGenerator->generate($childCategory, false, $rootCategoryId)
-+                );
-+            }
-         }
- 
-         return $mergeDataProvider->getData();
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php
-index 17d12ba563e..f3984bf7d62 100644
---- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php
-@@ -6,9 +6,14 @@
- namespace Magento\CatalogUrlRewrite\Model\Category\Plugin\Category;
- 
- use Magento\Catalog\Model\Category;
-+use Magento\Catalog\Model\CategoryFactory;
- use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
- use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
-+use Magento\Store\Model\Store;
- 
-+/**
-+ * Perform url updating for children categories.
-+ */
- class Move
- {
-     /**
-@@ -21,16 +26,24 @@ class Move
-      */
-     private $childrenCategoriesProvider;
- 
-+    /**
-+     * @var CategoryFactory
-+     */
-+    private $categoryFactory;
-+
-     /**
-      * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
-      * @param ChildrenCategoriesProvider $childrenCategoriesProvider
-+     * @param CategoryFactory $categoryFactory
-      */
-     public function __construct(
-         CategoryUrlPathGenerator $categoryUrlPathGenerator,
--        ChildrenCategoriesProvider $childrenCategoriesProvider
-+        ChildrenCategoriesProvider $childrenCategoriesProvider,
-+        CategoryFactory $categoryFactory
-     ) {
-         $this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
-         $this->childrenCategoriesProvider = $childrenCategoriesProvider;
-+        $this->categoryFactory = $categoryFactory;
-     }
- 
-     /**
-@@ -51,20 +64,57 @@ class Move
-         Category $newParent,
-         $afterCategoryId
-     ) {
--        $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
--        $category->getResource()->saveAttribute($category, 'url_path');
--        $this->updateUrlPathForChildren($category);
-+        $categoryStoreId = $category->getStoreId();
-+        foreach ($category->getStoreIds() as $storeId) {
-+            $category->setStoreId($storeId);
-+            if (!$this->isGlobalScope($storeId)) {
-+                $this->updateCategoryUrlKeyForStore($category);
-+                $category->unsUrlPath();
-+                $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
-+                $category->getResource()->saveAttribute($category, 'url_path');
-+                $this->updateUrlPathForChildren($category);
-+            }
-+        }
-+        $category->setStoreId($categoryStoreId);
- 
-         return $result;
-     }
- 
-     /**
-+     * Set category url_key according to current category store id.
-+     *
-+     * @param Category $category
-+     * @return void
-+     */
-+    private function updateCategoryUrlKeyForStore(Category $category)
-+    {
-+        $item = $this->categoryFactory->create();
-+        $item->setStoreId($category->getStoreId());
-+        $item->load($category->getId());
-+        $category->setUrlKey($item->getUrlKey());
-+    }
-+
-+    /**
-+     * Check is global scope.
-+     *
-+     * @param int|null $storeId
-+     * @return bool
-+     */
-+    private function isGlobalScope($storeId)
-+    {
-+        return null === $storeId || $storeId == Store::DEFAULT_STORE_ID;
-+    }
-+
-+    /**
-+     * Updates url_path for child categories.
-+     *
-      * @param Category $category
-      * @return void
-      */
--    protected function updateUrlPathForChildren($category)
-+    private function updateUrlPathForChildren($category)
-     {
-         foreach ($this->childrenCategoriesProvider->getChildren($category, true) as $childCategory) {
-+            $childCategory->setStoreId($category->getStoreId());
-             $childCategory->unsUrlPath();
-             $childCategory->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($childCategory));
-             $childCategory->getResource()->saveAttribute($childCategory, 'url_path');
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php
-index 572152e84b2..00bf88675e7 100644
---- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php
-@@ -11,6 +11,9 @@ use Magento\UrlRewrite\Model\UrlFinderInterface;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
- use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
- 
-+/**
-+ * Storage Plugin
-+ */
- class Storage
- {
-     /**
-@@ -36,6 +39,8 @@ class Storage
-     }
- 
-     /**
-+     * Save product/category urlRewrite association
-+     *
-      * @param \Magento\UrlRewrite\Model\StorageInterface $object
-      * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[] $result
-      * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[] $urls
-@@ -53,13 +58,15 @@ class Storage
-                 'product_id' => $record->getEntityId(),
-             ];
-         }
--        if ($toSave) {
-+        if (count($toSave) > 0) {
-             $this->productResource->saveMultiple($toSave);
-         }
-         return $result;
-     }
- 
-     /**
-+     * Remove product/category urlRewrite association
-+     *
-      * @param \Magento\UrlRewrite\Model\StorageInterface $object
-      * @param array $data
-      * @return void
-@@ -71,6 +78,8 @@ class Storage
-     }
- 
-     /**
-+     * Filter urls
-+     *
-      * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[] $urls
-      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-      */
-@@ -96,6 +105,8 @@ class Storage
-     }
- 
-     /**
-+     * Check if url is correct
-+     *
-      * @param UrlRewrite $url
-      * @return bool
-      */
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
-index ee20b0e934b..cba9218ce7c 100644
---- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
-@@ -8,6 +8,9 @@ namespace Magento\CatalogUrlRewrite\Model;
- use Magento\Catalog\Api\CategoryRepositoryInterface;
- use Magento\Catalog\Model\Category;
- 
-+/**
-+ * Class for generation category url_path
-+ */
- class CategoryUrlPathGenerator
- {
-     /**
-@@ -61,9 +64,11 @@ class CategoryUrlPathGenerator
-      * Build category URL path
-      *
-      * @param \Magento\Catalog\Api\Data\CategoryInterface|\Magento\Framework\Model\AbstractModel $category
-+     * @param null|\Magento\Catalog\Api\Data\CategoryInterface|\Magento\Framework\Model\AbstractModel $parentCategory
-      * @return string
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
--    public function getUrlPath($category)
-+    public function getUrlPath($category, $parentCategory = null)
-     {
-         if (in_array($category->getParentId(), [Category::ROOT_CATEGORY_ID, Category::TREE_ROOT_ID])) {
-             return '';
-@@ -77,15 +82,17 @@ class CategoryUrlPathGenerator
-             return $category->getUrlPath();
-         }
-         if ($this->isNeedToGenerateUrlPathForParent($category)) {
--            $parentPath = $this->getUrlPath(
--                $this->categoryRepository->get($category->getParentId(), $category->getStoreId())
--            );
-+            $parentCategory = $parentCategory === null ?
-+                $this->categoryRepository->get($category->getParentId(), $category->getStoreId()) : $parentCategory;
-+            $parentPath = $this->getUrlPath($parentCategory);
-             $path = $parentPath === '' ? $path : $parentPath . '/' . $path;
-         }
-         return $path;
-     }
- 
-     /**
-+     * Define whether we should generate URL path for parent
-+     *
-      * @param \Magento\Catalog\Model\Category $category
-      * @return bool
-      */
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
-index b2da0ab39f3..a86604672e2 100644
---- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
-@@ -15,6 +15,9 @@ use Magento\Catalog\Api\CategoryRepositoryInterface;
- use Magento\Framework\App\ObjectManager;
- use Magento\UrlRewrite\Model\MergeDataProviderFactory;
- 
-+/**
-+ * Generate list of urls.
-+ */
- class CategoryUrlRewriteGenerator
- {
-     /** Entity type code */
-@@ -84,6 +87,8 @@ class CategoryUrlRewriteGenerator
-     }
- 
-     /**
-+     * Generate list of urls.
-+     *
-      * @param \Magento\Catalog\Model\Category $category
-      * @param bool $overrideStoreUrls
-      * @param int|null $rootCategoryId
-@@ -119,6 +124,7 @@ class CategoryUrlRewriteGenerator
-         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
-         $categoryId = $category->getId();
-         foreach ($category->getStoreIds() as $storeId) {
-+            $category->setStoreId($storeId);
-             if (!$this->isGlobalScope($storeId)
-                 && $this->isOverrideUrlsForStore($storeId, $categoryId, $overrideStoreUrls)
-             ) {
-@@ -131,6 +137,8 @@ class CategoryUrlRewriteGenerator
-     }
- 
-     /**
-+     * Checks if urls should be overridden for store.
-+     *
-      * @param int $storeId
-      * @param int $categoryId
-      * @param bool $overrideStoreUrls
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php b/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php
-index 019959f9c1f..a048c216139 100644
---- a/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\CatalogUrlRewrite\Model;
- 
-+/**
-+ * Class ObjectRegistry
-+ */
- class ObjectRegistry
- {
-     /**
-@@ -26,15 +29,19 @@ class ObjectRegistry
-     }
- 
-     /**
-+     * Get Entity
-+     *
-      * @param int $entityId
-      * @return \Magento\Framework\DataObject|null
-      */
-     public function get($entityId)
-     {
--        return isset($this->entitiesMap[$entityId]) ? $this->entitiesMap[$entityId] : null;
-+        return $this->entitiesMap[$entityId] ?? null;
-     }
- 
-     /**
-+     * List Entities
-+     *
-      * @return \Magento\Framework\DataObject[]
-      */
-     public function getList()
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php
-index a7cc894c9a0..4a191b54dea 100644
---- a/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php
-@@ -13,7 +13,12 @@ use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\ObjectManager;
- 
-+/**
-+ * Generate url rewrites for anchor categories
-+ */
- class AnchorUrlRewriteGenerator
- {
-     /**
-@@ -52,7 +57,7 @@ class AnchorUrlRewriteGenerator
-      * @param int $storeId
-      * @param Product $product
-      * @param ObjectRegistry $productCategories
--     * @return UrlRewrite[]
-+     * @return UrlRewrite[]|array
-      */
-     public function generate($storeId, Product $product, ObjectRegistry $productCategories)
-     {
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/CategoriesUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/CategoriesUrlRewriteGenerator.php
-index 9e787e74ae0..a7e4b511ecd 100644
---- a/app/code/Magento/CatalogUrlRewrite/Model/Product/CategoriesUrlRewriteGenerator.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/Product/CategoriesUrlRewriteGenerator.php
-@@ -11,7 +11,12 @@ use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
- use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\ObjectManager;
- 
-+/**
-+ * Generate url rewrites for categories
-+ */
- class CategoriesUrlRewriteGenerator
- {
-     /**
-@@ -28,8 +33,10 @@ class CategoriesUrlRewriteGenerator
-      * @param ProductUrlPathGenerator $productUrlPathGenerator
-      * @param UrlRewriteFactory $urlRewriteFactory
-      */
--    public function __construct(ProductUrlPathGenerator $productUrlPathGenerator, UrlRewriteFactory $urlRewriteFactory)
--    {
-+    public function __construct(
-+        ProductUrlPathGenerator $productUrlPathGenerator,
-+        UrlRewriteFactory $urlRewriteFactory
-+    ) {
-         $this->productUrlPathGenerator = $productUrlPathGenerator;
-         $this->urlRewriteFactory = $urlRewriteFactory;
-     }
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php
-index 6b838f83d31..9d26184e2c2 100644
---- a/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php
-@@ -13,6 +13,7 @@ use Magento\CatalogUrlRewrite\Model\Product\CanonicalUrlRewriteGenerator;
- use Magento\CatalogUrlRewrite\Model\Product\CategoriesUrlRewriteGenerator;
- use Magento\CatalogUrlRewrite\Model\Product\CurrentUrlRewritesRegenerator;
- use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\ObjectManager;
- use Magento\Store\Model\Store;
- use Magento\Store\Model\StoreManagerInterface;
-@@ -34,6 +35,11 @@ class ProductScopeRewriteGenerator
-      */
-     private $storeManager;
- 
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $config;
-+
-     /**
-      * @var ObjectRegistryFactory
-      */
-@@ -79,6 +85,8 @@ class ProductScopeRewriteGenerator
-      * @param AnchorUrlRewriteGenerator $anchorUrlRewriteGenerator
-      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
-      * @param CategoryRepositoryInterface|null $categoryRepository
-+     * @param ScopeConfigInterface|null $config
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-         StoreViewService $storeViewService,
-@@ -89,7 +97,8 @@ class ProductScopeRewriteGenerator
-         CurrentUrlRewritesRegenerator $currentUrlRewritesRegenerator,
-         AnchorUrlRewriteGenerator $anchorUrlRewriteGenerator,
-         MergeDataProviderFactory $mergeDataProviderFactory = null,
--        CategoryRepositoryInterface $categoryRepository = null
-+        CategoryRepositoryInterface $categoryRepository = null,
-+        ScopeConfigInterface $config = null
-     ) {
-         $this->storeViewService = $storeViewService;
-         $this->storeManager = $storeManager;
-@@ -104,6 +113,7 @@ class ProductScopeRewriteGenerator
-         $this->mergeDataProviderPrototype = $mergeDataProviderFactory->create();
-         $this->categoryRepository = $categoryRepository ?:
-             ObjectManager::getInstance()->get(CategoryRepositoryInterface::class);
-+        $this->config = $config ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
-     }
- 
-     /**
-@@ -173,9 +183,13 @@ class ProductScopeRewriteGenerator
-         $mergeDataProvider->merge(
-             $this->canonicalUrlRewriteGenerator->generate($storeId, $product)
-         );
--        $mergeDataProvider->merge(
--            $this->categoriesUrlRewriteGenerator->generate($storeId, $product, $productCategories)
--        );
-+
-+        if ($this->isCategoryRewritesEnabled()) {
-+            $mergeDataProvider->merge(
-+                $this->categoriesUrlRewriteGenerator->generate($storeId, $product, $productCategories)
-+            );
-+        }
-+
-         $mergeDataProvider->merge(
-             $this->currentUrlRewritesRegenerator->generate(
-                 $storeId,
-@@ -184,9 +198,13 @@ class ProductScopeRewriteGenerator
-                 $rootCategoryId
-             )
-         );
--        $mergeDataProvider->merge(
--            $this->anchorUrlRewriteGenerator->generate($storeId, $product, $productCategories)
--        );
-+
-+        if ($this->isCategoryRewritesEnabled()) {
-+            $mergeDataProvider->merge(
-+                $this->anchorUrlRewriteGenerator->generate($storeId, $product, $productCategories)
-+            );
-+        }
-+
-         $mergeDataProvider->merge(
-             $this->currentUrlRewritesRegenerator->generateAnchor(
-                 $storeId,
-@@ -195,6 +213,7 @@ class ProductScopeRewriteGenerator
-                 $rootCategoryId
-             )
-         );
-+
-         return $mergeDataProvider->getData();
-     }
- 
-@@ -216,10 +235,12 @@ class ProductScopeRewriteGenerator
-     }
- 
-     /**
-+     * Check if URL key has been changed
-+     *
-      * Checks if URL key has been changed for provided category and returns reloaded category,
-      * in other case - returns provided category.
-      *
--     * @param $storeId
-+     * @param int $storeId
-      * @param Category $category
-      * @return Category
-      */
-@@ -236,4 +257,14 @@ class ProductScopeRewriteGenerator
-         }
-         return $this->categoryRepository->get($category->getEntityId(), $storeId);
-     }
-+
-+    /**
-+     * Check config value of generate_category_product_rewrites
-+     *
-+     * @return bool
-+     */
-+    private function isCategoryRewritesEnabled()
-+    {
-+        return (bool)$this->config->getValue('catalog/seo/generate_category_product_rewrites');
-+    }
- }
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
-index 2e192d895c6..ac3a5092bb3 100644
---- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
-@@ -3,10 +3,21 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\CatalogUrlRewrite\Model;
- 
- use Magento\Store\Model\Store;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Category;
-+use Magento\Catalog\Model\Product;
-+use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Store\Model\StoreManagerInterface;
- 
-+/**
-+ * Class ProductUrlPathGenerator
-+ */
- class ProductUrlPathGenerator
- {
-     const XML_PATH_PRODUCT_URL_SUFFIX = 'catalog/seo/product_url_suffix';
-@@ -19,36 +30,36 @@ class ProductUrlPathGenerator
-     protected $productUrlSuffix = [];
- 
-     /**
--     * @var \Magento\Store\Model\StoreManagerInterface
-+     * @var StoreManagerInterface
-      */
-     protected $storeManager;
- 
-     /**
--     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-+     * @var ScopeConfigInterface
-      */
-     protected $scopeConfig;
- 
-     /**
--     * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
-+     * @var CategoryUrlPathGenerator
-      */
-     protected $categoryUrlPathGenerator;
- 
-     /**
--     * @var \Magento\Catalog\Api\ProductRepositoryInterface
-+     * @var ProductRepositoryInterface
-      */
-     protected $productRepository;
- 
-     /**
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-+     * @param StoreManagerInterface $storeManager
-+     * @param ScopeConfigInterface $scopeConfig
-      * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
--     * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-+     * @param ProductRepositoryInterface $productRepository
-      */
-     public function __construct(
--        \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
--        \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator,
--        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-+        StoreManagerInterface $storeManager,
-+        ScopeConfigInterface $scopeConfig,
-+        CategoryUrlPathGenerator $categoryUrlPathGenerator,
-+        ProductRepositoryInterface $productRepository
-     ) {
-         $this->storeManager = $storeManager;
-         $this->scopeConfig = $scopeConfig;
-@@ -59,8 +70,8 @@ class ProductUrlPathGenerator
-     /**
-      * Retrieve Product Url path (with category if exists)
-      *
--     * @param \Magento\Catalog\Model\Product $product
--     * @param \Magento\Catalog\Model\Category $category
-+     * @param Product $product
-+     * @param Category $category
-      *
-      * @return string
-      */
-@@ -80,10 +91,10 @@ class ProductUrlPathGenerator
-     /**
-      * Prepare URL Key with stored product data (fallback for "Use Default Value" logic)
-      *
--     * @param \Magento\Catalog\Model\Product $product
-+     * @param Product $product
-      * @return string
-      */
--    protected function prepareProductDefaultUrlKey(\Magento\Catalog\Model\Product $product)
-+    protected function prepareProductDefaultUrlKey(Product $product)
-     {
-         $storedProduct = $this->productRepository->getById($product->getId());
-         $storedUrlKey = $storedProduct->getUrlKey();
-@@ -93,9 +104,9 @@ class ProductUrlPathGenerator
-     /**
-      * Retrieve Product Url path with suffix
-      *
--     * @param \Magento\Catalog\Model\Product $product
-+     * @param Product $product
-      * @param int $storeId
--     * @param \Magento\Catalog\Model\Category $category
-+     * @param Category $category
-      * @return string
-      */
-     public function getUrlPathWithSuffix($product, $storeId, $category = null)
-@@ -106,8 +117,8 @@ class ProductUrlPathGenerator
-     /**
-      * Get canonical product url path
-      *
--     * @param \Magento\Catalog\Model\Product $product
--     * @param \Magento\Catalog\Model\Category|null $category
-+     * @param Product $product
-+     * @param Category|null $category
-      * @return string
-      */
-     public function getCanonicalUrlPath($product, $category = null)
-@@ -119,24 +130,27 @@ class ProductUrlPathGenerator
-     /**
-      * Generate product url key based on url_key entered by merchant or product name
-      *
--     * @param \Magento\Catalog\Model\Product $product
--     * @return string
-+     * @param Product $product
-+     * @return string|null
-      */
-     public function getUrlKey($product)
-     {
--        return $product->getUrlKey() === false ? false : $this->prepareProductUrlKey($product);
-+        $generatedProductUrlKey = $this->prepareProductUrlKey($product);
-+        return ($product->getUrlKey() === false || empty($generatedProductUrlKey)) ? null : $generatedProductUrlKey;
-     }
- 
-     /**
-      * Prepare url key for product
-      *
--     * @param \Magento\Catalog\Model\Product $product
-+     * @param Product $product
-      * @return string
-      */
--    protected function prepareProductUrlKey(\Magento\Catalog\Model\Product $product)
-+    protected function prepareProductUrlKey(Product $product)
-     {
--        $urlKey = $product->getUrlKey();
--        return $product->formatUrlKey($urlKey === '' || $urlKey === null ? $product->getName() : $urlKey);
-+        $urlKey = (string)$product->getUrlKey();
-+        $urlKey = trim(strtolower($urlKey));
-+
-+        return $urlKey ?: $product->formatUrlKey($product->getName());
-     }
- 
-     /**
-@@ -154,7 +168,7 @@ class ProductUrlPathGenerator
-         if (!isset($this->productUrlSuffix[$storeId])) {
-             $this->productUrlSuffix[$storeId] = $this->scopeConfig->getValue(
-                 self::XML_PATH_PRODUCT_URL_SUFFIX,
--                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+                ScopeInterface::SCOPE_STORE,
-                 $storeId
-             );
-         }
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php b/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php
-new file mode 100644
-index 00000000000..f5851cf1e11
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php
-@@ -0,0 +1,127 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogUrlRewrite\Model\Products;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-+use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
-+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
-+use Magento\UrlRewrite\Model\UrlPersistInterface;
-+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-+
-+/**
-+ *  Save/Delete UrlRewrites by Product ID's and visibility
-+ */
-+class AdaptUrlRewritesToVisibilityAttribute
-+{
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $productCollectionFactory;
-+
-+    /**
-+     * @var ProductUrlRewriteGenerator
-+     */
-+    private $urlRewriteGenerator;
-+
-+    /**
-+     * @var UrlPersistInterface
-+     */
-+    private $urlPersist;
-+
-+    /**
-+     * @var ProductUrlPathGenerator
-+     */
-+    private $urlPathGenerator;
-+
-+    /**
-+     * @param CollectionFactory $collectionFactory
-+     * @param ProductUrlRewriteGenerator $urlRewriteGenerator
-+     * @param UrlPersistInterface $urlPersist
-+     * @param ProductUrlPathGenerator|null $urlPathGenerator
-+     */
-+    public function __construct(
-+        CollectionFactory $collectionFactory,
-+        ProductUrlRewriteGenerator $urlRewriteGenerator,
-+        UrlPersistInterface $urlPersist,
-+        ProductUrlPathGenerator $urlPathGenerator
-+    ) {
-+        $this->productCollectionFactory = $collectionFactory;
-+        $this->urlRewriteGenerator = $urlRewriteGenerator;
-+        $this->urlPersist = $urlPersist;
-+        $this->urlPathGenerator = $urlPathGenerator;
-+    }
-+
-+    /**
-+     * Process Url Rewrites according to the products visibility attribute
-+     *
-+     * @param array $productIds
-+     * @param int $visibility
-+     * @throws UrlAlreadyExistsException
-+     */
-+    public function execute(array $productIds, int $visibility): void
-+    {
-+        $products = $this->getProductsByIds($productIds);
-+
-+        /** @var Product $product */
-+        foreach ($products as $product) {
-+            if ($visibility == Visibility::VISIBILITY_NOT_VISIBLE) {
-+                $this->urlPersist->deleteByData(
-+                    [
-+                        UrlRewrite::ENTITY_ID => $product->getId(),
-+                        UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
-+                    ]
-+                );
-+            } elseif ($visibility !== Visibility::VISIBILITY_NOT_VISIBLE) {
-+                $product->setVisibility($visibility);
-+                $productUrlPath = $this->urlPathGenerator->getUrlPath($product);
-+                $productUrlRewrite = $this->urlRewriteGenerator->generate($product);
-+                $product->unsUrlPath();
-+                $product->setUrlPath($productUrlPath);
-+
-+                try {
-+                    $this->urlPersist->replace($productUrlRewrite);
-+                } catch (UrlAlreadyExistsException $e) {
-+                    throw new UrlAlreadyExistsException(
-+                        __(
-+                            'Can not change the visibility of the product with SKU equals "%1". '
-+                            . 'URL key "%2" for specified store already exists.',
-+                            $product->getSku(),
-+                            $product->getUrlKey()
-+                        ),
-+                        $e,
-+                        $e->getCode(),
-+                        $e->getUrls()
-+                    );
-+                }
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Get Product Models by Id's
-+     *
-+     * @param array $productIds
-+     * @return array
-+     */
-+    private function getProductsByIds(array $productIds): array
-+    {
-+        $productCollection = $this->productCollectionFactory->create();
-+        $productCollection->addAttributeToSelect(ProductInterface::VISIBILITY);
-+        $productCollection->addAttributeToSelect('url_key');
-+        $productCollection->addFieldToFilter(
-+            'entity_id',
-+            ['in' => array_unique($productIds)]
-+        );
-+
-+        return $productCollection->getItems();
-+    }
-+}
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php b/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php
-index 685a9d28287..a475e3d5f4b 100644
---- a/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php
-@@ -3,11 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\CatalogUrlRewrite\Model\ResourceModel\Category;
- 
- use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
- use Magento\UrlRewrite\Model\Storage\DbStorage;
- 
-+/**
-+ * Product Resource Class
-+ */
- class Product extends AbstractDb
- {
-     /**
-@@ -38,13 +44,15 @@ class Product extends AbstractDb
-     }
- 
-     /**
-+     * Save multiple data
-+     *
-      * @param array $insertData
-      * @return int
-      */
-     public function saveMultiple(array $insertData)
-     {
-         $connection = $this->getConnection();
--        if (sizeof($insertData) <= self::CHUNK_SIZE) {
-+        if (count($insertData) <= self::CHUNK_SIZE) {
-             return $connection->insertMultiple($this->getTable(self::TABLE_NAME), $insertData);
-         }
-         $data = array_chunk($insertData, self::CHUNK_SIZE);
-@@ -70,7 +78,10 @@ class Product extends AbstractDb
-     }
- 
-     /**
--     * Removes multiple entities from url_rewrite table using entities from catalog_url_rewrite_product_category
-+     * Removes multiple data by filter
-+     *
-+     * Removes multiple entities from url_rewrite table
-+     * using entities from catalog_url_rewrite_product_category
-      * Example: $filter = ['category_id' => [1, 2, 3], 'product_id' => [1, 2, 3]]
-      *
-      * @param array $filter
-@@ -78,10 +89,7 @@ class Product extends AbstractDb
-      */
-     public function removeMultipleByProductCategory(array $filter)
-     {
--        return $this->getConnection()->delete(
--            $this->getTable(self::TABLE_NAME),
--            ['url_rewrite_id in (?)' => $this->prepareSelect($filter)]
--        );
-+        return $this->getConnection()->deleteFromSelect($this->prepareSelect($filter), self::TABLE_NAME);
-     }
- 
-     /**
-@@ -93,10 +101,13 @@ class Product extends AbstractDb
-     private function prepareSelect($data)
-     {
-         $select = $this->getConnection()->select();
--        $select->from($this->getTable(DbStorage::TABLE_NAME), 'url_rewrite_id');
--
-+        $select->from(DbStorage::TABLE_NAME);
-+        $select->join(
-+            self::TABLE_NAME,
-+            DbStorage::TABLE_NAME . '.url_rewrite_id = ' . self::TABLE_NAME . '.url_rewrite_id'
-+        );
-         foreach ($data as $column => $value) {
--            $select->where($this->getConnection()->quoteIdentifier($column) . ' IN (?)', $value);
-+            $select->where(DbStorage::TABLE_NAME . '.' . $column . ' IN (?)', $value);
-         }
-         return $select;
-     }
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
-index f0351467e5f..4bbecbfae6b 100644
---- a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
-@@ -3,32 +3,40 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\CatalogUrlRewrite\Model\Storage;
- 
- use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
- use Magento\UrlRewrite\Model\Storage\DbStorage as BaseDbStorage;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
- 
-+/**
-+ * Class DbStorage
-+ */
- class DbStorage extends BaseDbStorage
- {
-     /**
--     * {@inheritDoc}
-+     * @inheritDoc
-      */
-     protected function prepareSelect(array $data)
-     {
-         $metadata = [];
--        if (array_key_exists(UrlRewrite::METADATA, $data)) {
-+        if (isset($data[UrlRewrite::METADATA])) {
-             $metadata = $data[UrlRewrite::METADATA];
-             unset($data[UrlRewrite::METADATA]);
-         }
- 
-         $select = $this->connection->select();
--        $select->from([
--            'url_rewrite' => $this->resource->getTableName(self::TABLE_NAME)
--        ]);
-+        $select->from(
-+            [
-+                'url_rewrite' => $this->resource->getTableName(self::TABLE_NAME)
-+            ]
-+        );
-         $select->joinLeft(
-             ['relation' => $this->resource->getTableName(Product::TABLE_NAME)],
--            'url_rewrite.url_rewrite_id = relation.url_rewrite_id'
-+            'url_rewrite.url_rewrite_id = relation.url_rewrite_id',
-+            ['relation.category_id', 'relation.product_id']
-         );
- 
-         foreach ($data as $column => $value) {
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
-new file mode 100644
-index 00000000000..edca633fb14
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
-@@ -0,0 +1,259 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogUrlRewrite\Model\Storage;
-+
-+use Magento\Catalog\Model\ResourceModel\ProductFactory;
-+use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\ResourceConnection;
-+use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\UrlRewrite\Model\OptionProvider;
-+use Magento\UrlRewrite\Model\Storage\DbStorage as BaseDbStorage;
-+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-+use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * Class DbStorage
-+ */
-+class DynamicStorage extends BaseDbStorage
-+{
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $config;
-+
-+    /**
-+     * @var ProductFactory
-+     */
-+    private $productFactory;
-+
-+    /**
-+     * @param UrlRewriteFactory $urlRewriteFactory
-+     * @param DataObjectHelper $dataObjectHelper
-+     * @param ResourceConnection $resource
-+     * @param ScopeConfigInterface $config
-+     * @param ProductFactory $productFactory
-+     * @param LoggerInterface|null $logger
-+     */
-+    public function __construct(
-+        UrlRewriteFactory $urlRewriteFactory,
-+        DataObjectHelper $dataObjectHelper,
-+        ResourceConnection $resource,
-+        ScopeConfigInterface $config,
-+        ProductFactory $productFactory,
-+        LoggerInterface $logger = null
-+    ) {
-+        parent::__construct($urlRewriteFactory, $dataObjectHelper, $resource, $logger);
-+        $this->config = $config;
-+        $this->productFactory = $productFactory;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function prepareSelect(array $data)
-+    {
-+        $metadata = [];
-+        if (isset($data[UrlRewrite::METADATA])) {
-+            $metadata = $data[UrlRewrite::METADATA];
-+            unset($data[UrlRewrite::METADATA]);
-+        }
-+        $select = $this->connection->select();
-+        $select->from(
-+            [
-+                'url_rewrite' => $this->resource->getTableName(self::TABLE_NAME)
-+            ]
-+        );
-+        $select->joinLeft(
-+            ['relation' => $this->resource->getTableName(Product::TABLE_NAME)],
-+            'url_rewrite.url_rewrite_id = relation.url_rewrite_id'
-+        );
-+        foreach ($data as $column => $value) {
-+            $select->where('url_rewrite.' . $column . ' IN (?)', $value);
-+        }
-+        if (empty($metadata['category_id'])) {
-+            $select->where('relation.category_id IS NULL');
-+        } else {
-+            $select->where(
-+                'relation.category_id = ?',
-+                $metadata['category_id']
-+            );
-+        }
-+        return $select;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function doFindOneByData(array $data)
-+    {
-+        if (isset($data[UrlRewrite::REQUEST_PATH])
-+            && isset($data[UrlRewrite::STORE_ID])
-+            && is_string($data[UrlRewrite::REQUEST_PATH])
-+        ) {
-+            return $this->findProductRewriteByRequestPath($data);
-+        }
-+
-+        $filterResults = $this->findProductRewritesByFilter($data);
-+        if (!empty($filterResults)) {
-+            return reset($filterResults);
-+        } else {
-+            return null;
-+        }
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function doFindAllByData(array $data)
-+    {
-+        $rewrites = parent::doFindAllByData($data);
-+
-+        $remainingProducts = [];
-+        if (isset($data[UrlRewrite::ENTITY_ID]) && is_array($data[UrlRewrite::ENTITY_ID])) {
-+            $remainingProducts = array_fill_keys($data[UrlRewrite::ENTITY_ID], 1);
-+            foreach ($rewrites as $rewrite) {
-+                $id = $rewrite[UrlRewrite::ENTITY_ID];
-+                if (isset($remainingProducts[$id])) {
-+                    unset($remainingProducts[$id]);
-+                }
-+            }
-+        }
-+
-+        if (!empty($remainingProducts)) {
-+            $data[UrlRewrite::ENTITY_ID] = array_keys($remainingProducts);
-+            $rewrites = array_merge($rewrites, $this->findProductRewritesByFilter($data));
-+        }
-+
-+        return $rewrites;
-+    }
-+
-+    /**
-+     * Get category urlSuffix from config
-+     *
-+     * @param int $storeId
-+     * @return string
-+     */
-+    private function getCategoryUrlSuffix($storeId = null): string
-+    {
-+        return $this->config->getValue(
-+            CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
-+            ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-+    }
-+
-+    /**
-+     * Find product rewrite by request data
-+     *
-+     * @param array $data
-+     * @return array|null
-+     */
-+    private function findProductRewriteByRequestPath(array $data): ?array
-+    {
-+        $requestPath = $data[UrlRewrite::REQUEST_PATH] ?? null;
-+
-+        $productUrl = $this->getBaseName($requestPath);
-+        $data[UrlRewrite::REQUEST_PATH] = [$productUrl];
-+
-+        $productFromDb = $this->connection->fetchRow($this->prepareSelect($data));
-+        if ($productFromDb === false) {
-+            return null;
-+        }
-+        $categorySuffix = $this->getCategoryUrlSuffix($data[UrlRewrite::STORE_ID]);
-+        $productResource = $this->productFactory->create();
-+        $categoryPath = str_replace('/' . $productUrl, '', $requestPath);
-+        if ($productFromDb[UrlRewrite::REDIRECT_TYPE]) {
-+            $productUrl = $productFromDb[UrlRewrite::TARGET_PATH];
-+        }
-+        if ($categoryPath) {
-+            $data[UrlRewrite::REQUEST_PATH] = [$categoryPath . $categorySuffix];
-+            unset($data[UrlRewrite::IS_AUTOGENERATED]);
-+            $categoryFromDb = $this->connection->fetchRow($this->prepareSelect($data));
-+
-+            if ($categoryFromDb[UrlRewrite::REDIRECT_TYPE]) {
-+                $productFromDb[UrlRewrite::REDIRECT_TYPE] = OptionProvider::PERMANENT;
-+                $categoryPath = str_replace($categorySuffix, '', $categoryFromDb[UrlRewrite::TARGET_PATH]);
-+            }
-+
-+            if ($categoryFromDb === false
-+                || !$productResource->canBeShowInCategory(
-+                    $productFromDb[UrlRewrite::ENTITY_ID],
-+                    $categoryFromDb[UrlRewrite::ENTITY_ID]
-+                )
-+            ) {
-+                return null;
-+            }
-+
-+            $productFromDb[UrlRewrite::TARGET_PATH] = $productFromDb[UrlRewrite::TARGET_PATH]
-+                . '/category/' . $categoryFromDb[UrlRewrite::ENTITY_ID];
-+        }
-+
-+        if ($productFromDb[UrlRewrite::REDIRECT_TYPE]) {
-+            $productFromDb[UrlRewrite::TARGET_PATH] = $categoryPath . '/' . $productUrl;
-+        }
-+
-+        $productFromDb[UrlRewrite::REQUEST_PATH] = $requestPath;
-+
-+        return $productFromDb;
-+    }
-+
-+    /**
-+     * Find product rewrites by filter array
-+     *
-+     * @param array $data
-+     * @return array
-+     */
-+    private function findProductRewritesByFilter(array $data): array
-+    {
-+        if (empty($data[UrlRewrite::ENTITY_TYPE])) {
-+            return [];
-+        }
-+        $rewrites = [];
-+        $metadata = $data[UrlRewrite::METADATA] ?? [];
-+        if (isset($data[UrlRewrite::METADATA])) {
-+            unset($data[UrlRewrite::METADATA]);
-+        }
-+        $productsFromDb = $this->connection->fetchAll($this->prepareSelect($data));
-+
-+        if (!empty($metadata['category_id'])) {
-+            $categoryId = $metadata['category_id'];
-+            $data[UrlRewrite::ENTITY_ID] = $categoryId;
-+            $data[UrlRewrite::ENTITY_TYPE] = 'category';
-+            $categoryFromDb = $this->connection->fetchRow($this->prepareSelect($data));
-+            foreach ($productsFromDb as $productFromDb) {
-+                $productUrl = $this->getBaseName($productFromDb[UrlRewrite::REQUEST_PATH]);
-+                $productFromDb[UrlRewrite::REQUEST_PATH] = str_replace(
-+                    $this->getCategoryUrlSuffix($data[UrlRewrite::STORE_ID]),
-+                    '',
-+                    $categoryFromDb[UrlRewrite::REQUEST_PATH]
-+                )
-+                    . '/' . $productUrl;
-+                $rewrites[] = $productFromDb;
-+            }
-+        } else {
-+            $rewrites = $productsFromDb;
-+        }
-+
-+        return $rewrites;
-+    }
-+
-+    /**
-+     * Return base name for path
-+     *
-+     * @param string|null $string
-+     * @return string
-+     */
-+    private function getBaseName($string): string
-+    {
-+        return preg_replace('|.*?([^/]+)$|', '\1', $string, 1);
-+    }
-+}
-diff --git a/app/code/Magento/CatalogUrlRewrite/Model/TableCleaner.php b/app/code/Magento/CatalogUrlRewrite/Model/TableCleaner.php
-new file mode 100644
-index 00000000000..070836380ac
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/Model/TableCleaner.php
-@@ -0,0 +1,82 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogUrlRewrite\Model;
-+
-+use Magento\Framework\App\Cache\TypeListInterface;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\Config\Value as ConfigValue;
-+use Magento\Framework\Data\Collection\AbstractDb;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Model\Context;
-+use Magento\Framework\Model\ResourceModel\AbstractResource;
-+use Magento\Framework\Registry;
-+use Magento\UrlRewrite\Model\ResourceModel\UrlRewrite;
-+
-+/**
-+ * Table Cleaner in case of switching generate_category_product_rewrites off
-+ */
-+class TableCleaner extends ConfigValue
-+{
-+    const AUTO_GENERATED_ROW_FLAG = 1;
-+    const URL_REWRITE_GENERATION_OFF_FLAG = 0;
-+
-+    /**
-+     * @var UrlRewrite
-+     */
-+    private $urlRewrite;
-+
-+    /**
-+     * @param UrlRewrite $urlRewrite
-+     * @param Context $context
-+     * @param Registry $registry
-+     * @param ScopeConfigInterface $config
-+     * @param TypeListInterface $cacheTypeList
-+     * @param AbstractResource|null $resource
-+     * @param AbstractDb|null $resourceCollection
-+     * @param array $data
-+     */
-+    public function __construct(
-+        UrlRewrite $urlRewrite,
-+        Context $context,
-+        Registry $registry,
-+        ScopeConfigInterface $config,
-+        TypeListInterface $cacheTypeList,
-+        AbstractResource $resource = null,
-+        AbstractDb $resourceCollection = null,
-+        array $data = []
-+    ) {
-+        parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
-+        $this->urlRewrite = $urlRewrite;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     * @return ConfigValue
-+     * @throws LocalizedException
-+     */
-+    public function afterSave()
-+    {
-+        if ($this->getValue() == self::URL_REWRITE_GENERATION_OFF_FLAG) {
-+            $this->clearOldData();
-+        }
-+        return parent::afterSave();
-+    }
-+
-+    /**
-+     * Clear urlrewrites for products in categories
-+     */
-+    private function clearOldData(): void
-+    {
-+        $tableName = $this->urlRewrite->getMainTable();
-+        $conditions = [
-+            'metadata LIKE ?' => '{"category_id"%',
-+            'is_autogenerated = ?' => self::AUTO_GENERATED_ROW_FLAG
-+        ];
-+        $this->urlRewrite->getConnection()->delete($tableName, $conditions);
-+    }
-+}
-diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
-index 022a78be001..33c0cafc8f0 100644
---- a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
-@@ -6,22 +6,36 @@
- namespace Magento\CatalogUrlRewrite\Observer;
- 
- use Magento\Catalog\Model\Category;
-+use Magento\Catalog\Model\Product;
- use Magento\Catalog\Model\Product\Visibility;
-+use Magento\Catalog\Model\ProductFactory;
- use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
- use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
- use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
-+use Magento\CatalogUrlRewrite\Model\ObjectRegistry;
-+use Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory;
-+use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
- use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-+use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\DataObject;
- use Magento\Framework\Event\Observer;
- use Magento\Framework\Event\ObserverInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\ImportExport\Model\Import as ImportExport;
- use Magento\Store\Model\Store;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
-+use Magento\UrlRewrite\Model\MergeDataProvider;
- use Magento\UrlRewrite\Model\MergeDataProviderFactory;
- use Magento\UrlRewrite\Model\OptionProvider;
- use Magento\UrlRewrite\Model\UrlFinderInterface;
- use Magento\UrlRewrite\Model\UrlPersistInterface;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
-+use RuntimeException;
- 
- /**
-  * Class AfterImportDataObserver
-@@ -37,12 +51,12 @@ class AfterImportDataObserver implements ObserverInterface
-     const URL_KEY_ATTRIBUTE_CODE = 'url_key';
- 
-     /**
--     * @var \Magento\CatalogUrlRewrite\Service\V1\StoreViewService
-+     * @var StoreViewService
-      */
-     protected $storeViewService;
- 
-     /**
--     * @var \Magento\Catalog\Model\Product
-+     * @var Product
-      */
-     protected $product;
- 
-@@ -57,42 +71,42 @@ class AfterImportDataObserver implements ObserverInterface
-     protected $products = [];
- 
-     /**
--     * @var \Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory
-+     * @var ObjectRegistryFactory
-      */
-     protected $objectRegistryFactory;
- 
-     /**
--     * @var \Magento\CatalogUrlRewrite\Model\ObjectRegistry
-+     * @var ObjectRegistry
-      */
-     protected $productCategories;
- 
-     /**
--     * @var \Magento\UrlRewrite\Model\UrlFinderInterface
-+     * @var UrlFinderInterface
-      */
-     protected $urlFinder;
- 
-     /**
--     * @var \Magento\Store\Model\StoreManagerInterface
-+     * @var StoreManagerInterface
-      */
-     protected $storeManager;
- 
-     /**
--     * @var \Magento\UrlRewrite\Model\UrlPersistInterface
-+     * @var UrlPersistInterface
-      */
-     protected $urlPersist;
- 
-     /**
--     * @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory
-+     * @var UrlRewriteFactory
-      */
-     protected $urlRewriteFactory;
- 
-     /**
--     * @var \Magento\CatalogImportExport\Model\Import\Product
-+     * @var ImportProduct
-      */
-     protected $import;
- 
-     /**
--     * @var \Magento\Catalog\Model\ProductFactory
-+     * @var ProductFactory
-      */
-     protected $catalogProductFactory;
- 
-@@ -102,7 +116,7 @@ class AfterImportDataObserver implements ObserverInterface
-     protected $acceptableCategories;
- 
-     /**
--     * @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator
-+     * @var ProductUrlPathGenerator
-      */
-     protected $productUrlPathGenerator;
- 
-@@ -135,10 +149,11 @@ class AfterImportDataObserver implements ObserverInterface
-         'url_path',
-         'name',
-         'visibility',
-+        'save_rewrites_history'
-     ];
- 
-     /**
--     * @var \Magento\UrlRewrite\Model\MergeDataProvider
-+     * @var MergeDataProvider
-      */
-     private $mergeDataProviderPrototype;
- 
-@@ -157,29 +172,37 @@ class AfterImportDataObserver implements ObserverInterface
-     private $categoriesCache = [];
- 
-     /**
--     * @param \Magento\Catalog\Model\ProductFactory $catalogProductFactory
--     * @param \Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory $objectRegistryFactory
--     * @param \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator $productUrlPathGenerator
--     * @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-+     * @var ScopeConfigInterface|null
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @param ProductFactory $catalogProductFactory
-+     * @param ObjectRegistryFactory $objectRegistryFactory
-+     * @param ProductUrlPathGenerator $productUrlPathGenerator
-+     * @param StoreViewService $storeViewService
-+     * @param StoreManagerInterface $storeManager
-      * @param UrlPersistInterface $urlPersist
-      * @param UrlRewriteFactory $urlRewriteFactory
-      * @param UrlFinderInterface $urlFinder
--     * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
-+     * @param MergeDataProviderFactory|null $mergeDataProviderFactory
-      * @param CategoryCollectionFactory|null $categoryCollectionFactory
-+     * @param ScopeConfigInterface|null $scopeConfig
-+     * @throws RuntimeException
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
--        \Magento\Catalog\Model\ProductFactory $catalogProductFactory,
--        \Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory $objectRegistryFactory,
--        \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator $productUrlPathGenerator,
--        \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService,
--        \Magento\Store\Model\StoreManagerInterface $storeManager,
-+        ProductFactory $catalogProductFactory,
-+        ObjectRegistryFactory $objectRegistryFactory,
-+        ProductUrlPathGenerator $productUrlPathGenerator,
-+        StoreViewService $storeViewService,
-+        StoreManagerInterface $storeManager,
-         UrlPersistInterface $urlPersist,
-         UrlRewriteFactory $urlRewriteFactory,
-         UrlFinderInterface $urlFinder,
-         MergeDataProviderFactory $mergeDataProviderFactory = null,
--        CategoryCollectionFactory $categoryCollectionFactory = null
-+        CategoryCollectionFactory $categoryCollectionFactory = null,
-+        ScopeConfigInterface $scopeConfig = null
-     ) {
-         $this->urlPersist = $urlPersist;
-         $this->catalogProductFactory = $catalogProductFactory;
-@@ -195,15 +218,17 @@ class AfterImportDataObserver implements ObserverInterface
-         $this->mergeDataProviderPrototype = $mergeDataProviderFactory->create();
-         $this->categoryCollectionFactory = $categoryCollectionFactory ?:
-             ObjectManager::getInstance()->get(CategoryCollectionFactory::class);
-+        $this->scopeConfig = $scopeConfig ?:
-+            ObjectManager::getInstance()->get(ScopeConfigInterface::class);
-     }
- 
-     /**
--     * Action after data import.
--     * Save new url rewrites and remove old if exist.
-+     * Action after data import. Save new url rewrites and remove old if exist.
-      *
-      * @param Observer $observer
--     *
-      * @return void
-+     * @throws LocalizedException
-+     * @throws UrlAlreadyExistsException
-      */
-     public function execute(Observer $observer)
-     {
-@@ -223,18 +248,15 @@ class AfterImportDataObserver implements ObserverInterface
-      * Create product model from imported data for URL rewrite purposes.
-      *
-      * @param array $rowData
--     *
--     * @return ImportExport
-+     * @return AfterImportDataObserver|null
-+     * @throws LocalizedException
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-     protected function _populateForUrlGeneration($rowData)
-     {
-         $newSku = $this->import->getNewSku($rowData[ImportProduct::COL_SKU]);
--        if (empty($newSku) || !isset($newSku['entity_id'])) {
--            return null;
--        }
--        if ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
--            && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE])) {
-+        $oldSku = $this->import->getOldSku();
-+        if (!$this->isNeedToPopulateForUrlGeneration($rowData, $newSku, $oldSku)) {
-             return null;
-         }
-         $rowData['entity_id'] = $newSku['entity_id'];
-@@ -261,23 +283,47 @@ class AfterImportDataObserver implements ObserverInterface
-         if ($this->isGlobalScope($product->getStoreId())) {
-             $this->populateGlobalProduct($product);
-         } else {
-+            $this->storesCache[$product->getStoreId()] = true;
-             $this->addProductToImport($product, $product->getStoreId());
-         }
-         return $this;
-     }
- 
-     /**
--     * @param \Magento\Catalog\Model\Product $product
-+     * Check is need to populate data for url generation
-+     *
-+     * @param array $rowData
-+     * @param array $newSku
-+     * @param array $oldSku
-+     * @return bool
-+     */
-+    private function isNeedToPopulateForUrlGeneration($rowData, $newSku, $oldSku): bool
-+    {
-+        if ((empty($newSku) || !isset($newSku['entity_id']))
-+            || ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
-+                && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE]))
-+            || (array_key_exists($rowData[ImportProduct::COL_SKU], $oldSku)
-+                && !isset($rowData[self::URL_KEY_ATTRIBUTE_CODE])
-+                && $this->import->getBehavior() === ImportExport::BEHAVIOR_APPEND)) {
-+            return false;
-+        }
-+        return true;
-+    }
-+
-+    /**
-+     * Add store id to product data.
-+     *
-+     * @param Product $product
-      * @param array $rowData
-      * @return void
-      */
--    protected function setStoreToProduct(\Magento\Catalog\Model\Product $product, array $rowData)
-+    protected function setStoreToProduct(Product $product, array $rowData)
-     {
-         if (!empty($rowData[ImportProduct::COL_STORE])
-             && ($storeId = $this->import->getStoreIdByCode($rowData[ImportProduct::COL_STORE]))
-         ) {
-             $product->setStoreId($storeId);
--        } elseif (!$product->hasData(\Magento\Catalog\Model\Product::STORE_ID)) {
-+        } elseif (!$product->hasData(Product::STORE_ID)) {
-             $product->setStoreId(Store::DEFAULT_STORE_ID);
-         }
-     }
-@@ -285,7 +331,7 @@ class AfterImportDataObserver implements ObserverInterface
-     /**
-      * Add product to import
-      *
--     * @param \Magento\Catalog\Model\Product $product
-+     * @param Product $product
-      * @param string $storeId
-      * @return $this
-      */
-@@ -304,7 +350,7 @@ class AfterImportDataObserver implements ObserverInterface
-     /**
-      * Populate global product
-      *
--     * @param \Magento\Catalog\Model\Product $product
-+     * @param Product $product
-      * @return $this
-      */
-     protected function populateGlobalProduct($product)
-@@ -323,13 +369,16 @@ class AfterImportDataObserver implements ObserverInterface
-     /**
-      * Generate product url rewrites
-      *
--     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-+     * @return UrlRewrite[]
-+     * @throws LocalizedException
-      */
-     protected function generateUrls()
-     {
-         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
-         $mergeDataProvider->merge($this->canonicalUrlRewriteGenerate());
--        $mergeDataProvider->merge($this->categoriesUrlRewriteGenerate());
-+        if ($this->isCategoryRewritesEnabled()) {
-+            $mergeDataProvider->merge($this->categoriesUrlRewriteGenerate());
-+        }
-         $mergeDataProvider->merge($this->currentUrlRewritesRegenerate());
-         $this->productCategories = null;
- 
-@@ -378,6 +427,7 @@ class AfterImportDataObserver implements ObserverInterface
-      * Generate list based on categories.
-      *
-      * @return UrlRewrite[]
-+     * @throws LocalizedException
-      */
-     protected function categoriesUrlRewriteGenerate()
-     {
-@@ -436,6 +486,8 @@ class AfterImportDataObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Generate url-rewrite for outogenerated url-rewirte.
-+     *
-      * @param UrlRewrite $url
-      * @param Category $category
-      * @return array
-@@ -470,6 +522,8 @@ class AfterImportDataObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Generate url-rewrite for custom url-rewirte.
-+     *
-      * @param UrlRewrite $url
-      * @param Category $category
-      * @return array
-@@ -503,6 +557,8 @@ class AfterImportDataObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Retrieve category from url metadata.
-+     *
-      * @param UrlRewrite $url
-      * @return Category|null|bool
-      */
-@@ -517,9 +573,12 @@ class AfterImportDataObserver implements ObserverInterface
-     }
- 
-     /**
--     * @param \Magento\Catalog\Model\Category $category
-+     * Check, category suited for url-rewrite generation.
-+     *
-+     * @param Category $category
-      * @param int $storeId
-      * @return bool
-+     * @throws NoSuchEntityException
-      */
-     protected function isCategoryProperForGenerating($category, $storeId)
-     {
-@@ -528,7 +587,7 @@ class AfterImportDataObserver implements ObserverInterface
-             return $this->acceptableCategories[$storeId][$category->getId()];
-         }
-         $acceptable = false;
--        if ($category->getParentId() != \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
-+        if ($category->getParentId() != Category::TREE_ROOT_ID) {
-             list(, $rootCategoryId) = $category->getParentIds();
-             $acceptable = ($rootCategoryId == $this->storeManager->getStore($storeId)->getRootCategoryId());
-         }
-@@ -544,7 +603,8 @@ class AfterImportDataObserver implements ObserverInterface
-      *
-      * @param int $categoryId
-      * @param int $storeId
--     * @return Category|\Magento\Framework\DataObject
-+     * @return Category|DataObject
-+     * @throws LocalizedException
-      */
-     private function getCategoryById($categoryId, $storeId)
-     {
-@@ -561,4 +621,14 @@ class AfterImportDataObserver implements ObserverInterface
- 
-         return $this->categoriesCache[$categoryId][$storeId];
-     }
-+
-+    /**
-+     * Check config value of generate_category_product_rewrites
-+     *
-+     * @return bool
-+     */
-+    private function isCategoryRewritesEnabled()
-+    {
-+        return (bool)$this->scopeConfig->getValue('catalog/seo/generate_category_product_rewrites');
-+    }
- }
-diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteMovingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteMovingObserver.php
-index 0afdf774c7e..244aaf4d5cd 100644
---- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteMovingObserver.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteMovingObserver.php
-@@ -74,8 +74,8 @@ class CategoryProcessUrlRewriteMovingObserver implements ObserverInterface
-         UrlRewriteBunchReplacer $urlRewriteBunchReplacer,
-         DatabaseMapPool $databaseMapPool,
-         $dataUrlRewriteClassNames = [
--        DataCategoryUrlRewriteDatabaseMap::class,
--        DataProductUrlRewriteDatabaseMap::class
-+            DataCategoryUrlRewriteDatabaseMap::class,
-+            DataProductUrlRewriteDatabaseMap::class
-         ]
-     ) {
-         $this->categoryUrlRewriteGenerator = $categoryUrlRewriteGenerator;
-@@ -88,6 +88,8 @@ class CategoryProcessUrlRewriteMovingObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Execute observer functional
-+     *
-      * @param \Magento\Framework\Event\Observer $observer
-      * @return void
-      */
-@@ -105,8 +107,12 @@ class CategoryProcessUrlRewriteMovingObserver implements ObserverInterface
-             $categoryUrlRewriteResult = $this->categoryUrlRewriteGenerator->generate($category, true);
-             $this->urlRewriteHandler->deleteCategoryRewritesForChildren($category);
-             $this->urlRewriteBunchReplacer->doBunchReplace($categoryUrlRewriteResult);
--            $productUrlRewriteResult = $this->urlRewriteHandler->generateProductUrlRewrites($category);
--            $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
-+
-+            if ($this->isCategoryRewritesEnabled()) {
-+                $productUrlRewriteResult = $this->urlRewriteHandler->generateProductUrlRewrites($category);
-+                $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
-+            }
-+
-             //frees memory for maps that are self-initialized in multiple classes that were called by the generators
-             $this->resetUrlRewritesDataMaps($category);
-         }
-@@ -124,4 +130,14 @@ class CategoryProcessUrlRewriteMovingObserver implements ObserverInterface
-             $this->databaseMapPool->resetMap($className, $category->getEntityId());
-         }
-     }
-+
-+    /**
-+     * Check config value of generate_category_product_rewrites
-+     *
-+     * @return bool
-+     */
-+    private function isCategoryRewritesEnabled()
-+    {
-+        return (bool)$this->scopeConfig->getValue('catalog/seo/generate_category_product_rewrites');
-+    }
- }
-diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
-index 5d7e323e8b2..62ce54cd671 100644
---- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
-@@ -12,10 +12,12 @@ use Magento\CatalogUrlRewrite\Model\Map\DatabaseMapPool;
- use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUrlRewriteDatabaseMap;
- use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
- use Magento\CatalogUrlRewrite\Model\UrlRewriteBunchReplacer;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\Event\ObserverInterface;
- use Magento\Store\Model\ResourceModel\Group\CollectionFactory;
- use Magento\Store\Model\ResourceModel\Group\Collection as StoreGroupCollection;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Store\Model\ScopeInterface;
- 
- /**
-  * Generates Category Url Rewrites after save and Products Url Rewrites assigned to the category that's being saved
-@@ -52,11 +54,17 @@ class CategoryProcessUrlRewriteSavingObserver implements ObserverInterface
-      */
-     private $storeGroupFactory;
- 
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-     /**
-      * @param CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator
-      * @param UrlRewriteHandler $urlRewriteHandler
-      * @param UrlRewriteBunchReplacer $urlRewriteBunchReplacer
-      * @param DatabaseMapPool $databaseMapPool
-+     * @param ScopeConfigInterface $scopeConfig
-      * @param string[] $dataUrlRewriteClassNames
-      * @param CollectionFactory|null $storeGroupFactory
-      */
-@@ -65,6 +73,7 @@ class CategoryProcessUrlRewriteSavingObserver implements ObserverInterface
-         UrlRewriteHandler $urlRewriteHandler,
-         UrlRewriteBunchReplacer $urlRewriteBunchReplacer,
-         DatabaseMapPool $databaseMapPool,
-+        ScopeConfigInterface $scopeConfig,
-         $dataUrlRewriteClassNames = [
-             DataCategoryUrlRewriteDatabaseMap::class,
-             DataProductUrlRewriteDatabaseMap::class
-@@ -78,6 +87,7 @@ class CategoryProcessUrlRewriteSavingObserver implements ObserverInterface
-         $this->dataUrlRewriteClassNames = $dataUrlRewriteClassNames;
-         $this->storeGroupFactory = $storeGroupFactory
-             ?: ObjectManager::getInstance()->get(CollectionFactory::class);
-+        $this->scopeConfig = $scopeConfig;
-     }
- 
-     /**
-@@ -100,16 +110,21 @@ class CategoryProcessUrlRewriteSavingObserver implements ObserverInterface
-         }
- 
-         $mapsGenerated = false;
--        if ($category->dataHasChangedFor('url_key')
--            || $category->dataHasChangedFor('is_anchor')
--            || !empty($category->getChangedProductIds())
--        ) {
-+        if ($this->isCategoryHasChanged($category)) {
-             if ($category->dataHasChangedFor('url_key')) {
-                 $categoryUrlRewriteResult = $this->categoryUrlRewriteGenerator->generate($category);
-                 $this->urlRewriteBunchReplacer->doBunchReplace($categoryUrlRewriteResult);
-             }
--            $productUrlRewriteResult = $this->urlRewriteHandler->generateProductUrlRewrites($category);
--            $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
-+            if ($this->isCategoryRewritesEnabled()) {
-+                if ($this->isChangedOnlyProduct($category)) {
-+                    $productUrlRewriteResult =
-+                        $this->urlRewriteHandler->updateProductUrlRewritesForChangedProduct($category);
-+                    $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
-+                } else {
-+                    $productUrlRewriteResult = $this->urlRewriteHandler->generateProductUrlRewrites($category);
-+                    $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
-+                }
-+            }
-             $mapsGenerated = true;
-         }
- 
-@@ -119,6 +134,38 @@ class CategoryProcessUrlRewriteSavingObserver implements ObserverInterface
-         }
-     }
- 
-+    /**
-+     * Check is category changed changed.
-+     *
-+     * @param Category $category
-+     * @return bool
-+     */
-+    private function isCategoryHasChanged(Category $category): bool
-+    {
-+        if ($category->dataHasChangedFor('url_key')
-+            || $category->dataHasChangedFor('is_anchor')
-+            || !empty($category->getChangedProductIds())) {
-+            return true;
-+        }
-+        return false;
-+    }
-+
-+    /**
-+     * Check is only product changed.
-+     *
-+     * @param Category $category
-+     * @return bool
-+     */
-+    private function isChangedOnlyProduct(Category $category): bool
-+    {
-+        if (!empty($category->getChangedProductIds())
-+            && !$category->dataHasChangedFor('is_anchor')
-+            && !$category->dataHasChangedFor('url_key')) {
-+            return true;
-+        }
-+        return false;
-+    }
-+
-     /**
-      * In case store_id is not set for category then we can assume that it was passed through product import.
-      * Store group must have only one root category, so receiving category's path and checking if one of it parts
-@@ -154,4 +201,14 @@ class CategoryProcessUrlRewriteSavingObserver implements ObserverInterface
-             $this->databaseMapPool->resetMap($className, $category->getEntityId());
-         }
-     }
-+
-+    /**
-+     * Check config value of generate_category_product_rewrites
-+     *
-+     * @return bool
-+     */
-+    private function isCategoryRewritesEnabled()
-+    {
-+        return (bool)$this->scopeConfig->getValue('catalog/seo/generate_category_product_rewrites');
-+    }
- }
-diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
-index eb54f0427c1..713dd6ac0c7 100644
---- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
-@@ -8,11 +8,15 @@ namespace Magento\CatalogUrlRewrite\Observer;
- use Magento\Catalog\Model\Category;
- use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
- use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
-+use Magento\Catalog\Api\CategoryRepositoryInterface;
- use Magento\Framework\Event\Observer;
- use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
- use Magento\Framework\Event\ObserverInterface;
- use Magento\Store\Model\Store;
- 
-+/**
-+ * Class for set or update url path.
-+ */
- class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
- {
-     /**
-@@ -30,22 +34,32 @@ class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
-      */
-     protected $storeViewService;
- 
-+    /**
-+     * @var CategoryRepositoryInterface
-+     */
-+    private $categoryRepository;
-+
-     /**
-      * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
-      * @param ChildrenCategoriesProvider $childrenCategoriesProvider
-      * @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService
-+     * @param CategoryRepositoryInterface $categoryRepository
-      */
-     public function __construct(
-         CategoryUrlPathGenerator $categoryUrlPathGenerator,
-         ChildrenCategoriesProvider $childrenCategoriesProvider,
--        StoreViewService $storeViewService
-+        StoreViewService $storeViewService,
-+        CategoryRepositoryInterface $categoryRepository
-     ) {
-         $this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
-         $this->childrenCategoriesProvider = $childrenCategoriesProvider;
-         $this->storeViewService = $storeViewService;
-+        $this->categoryRepository = $categoryRepository;
-     }
- 
-     /**
-+     * Method for update/set url path.
-+     *
-      * @param \Magento\Framework\Event\Observer $observer
-      * @return void
-      * @throws \Magento\Framework\Exception\LocalizedException
-@@ -57,45 +71,69 @@ class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
-         $useDefaultAttribute = !$category->isObjectNew() && !empty($category->getData('use_default')['url_key']);
-         if ($category->getUrlKey() !== false && !$useDefaultAttribute) {
-             $resultUrlKey = $this->categoryUrlPathGenerator->getUrlKey($category);
--            if (empty($resultUrlKey)) {
--                throw new \Magento\Framework\Exception\LocalizedException(__('Invalid URL key'));
--            }
--            $category->setUrlKey($resultUrlKey)
--                ->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
--            if (!$category->isObjectNew()) {
--                $category->getResource()->saveAttribute($category, 'url_path');
--                if ($category->dataHasChangedFor('url_path')) {
--                    $this->updateUrlPathForChildren($category);
--                }
-+            $this->updateUrlKey($category, $resultUrlKey);
-+        } else if ($useDefaultAttribute) {
-+            $resultUrlKey = $category->formatUrlKey($category->getOrigData('name'));
-+            $this->updateUrlKey($category, $resultUrlKey);
-+            $category->setUrlKey(null)->setUrlPath(null);
-+        }
-+    }
-+
-+    /**
-+     * Update Url Key
-+     *
-+     * @param Category $category
-+     * @param string $urlKey
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    private function updateUrlKey($category, $urlKey)
-+    {
-+        if (empty($urlKey)) {
-+            throw new \Magento\Framework\Exception\LocalizedException(__('Invalid URL key'));
-+        }
-+        $category->setUrlKey($urlKey)
-+            ->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
-+        if (!$category->isObjectNew()) {
-+            $category->getResource()->saveAttribute($category, 'url_path');
-+            if ($category->dataHasChangedFor('url_path')) {
-+                $this->updateUrlPathForChildren($category);
-             }
-         }
-     }
- 
-     /**
-+     * Update url path for children category.
-+     *
-      * @param Category $category
-      * @return void
-      */
-     protected function updateUrlPathForChildren(Category $category)
-     {
--        $children = $this->childrenCategoriesProvider->getChildren($category, true);
--
-         if ($this->isGlobalScope($category->getStoreId())) {
--            foreach ($children as $child) {
-+            $childrenIds = $this->childrenCategoriesProvider->getChildrenIds($category, true);
-+            foreach ($childrenIds as $childId) {
-                 foreach ($category->getStoreIds() as $storeId) {
-                     if ($this->storeViewService->doesEntityHaveOverriddenUrlPathForStore(
-                         $storeId,
--                        $child->getId(),
-+                        $childId,
-                         Category::ENTITY
-                     )) {
--                        $child->setStoreId($storeId);
-+                        $child = $this->categoryRepository->get($childId, $storeId);
-                         $this->updateUrlPathForCategory($child);
-                     }
-                 }
-             }
-         } else {
-+            $children = $this->childrenCategoriesProvider->getChildren($category, true);
-             foreach ($children as $child) {
-+                /** @var Category $child */
-                 $child->setStoreId($category->getStoreId());
--                $this->updateUrlPathForCategory($child);
-+                if ($child->getParentId() === $category->getId()) {
-+                    $this->updateUrlPathForCategory($child, $category);
-+                } else {
-+                    $this->updateUrlPathForCategory($child);
-+                }
-             }
-         }
-     }
-@@ -112,13 +150,17 @@ class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Update url path for category.
-+     *
-      * @param Category $category
-+     * @param Category|null $parentCategory
-      * @return void
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
--    protected function updateUrlPathForCategory(Category $category)
-+    protected function updateUrlPathForCategory(Category $category, Category $parentCategory = null)
-     {
-         $category->unsUrlPath();
--        $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
-+        $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category, $parentCategory));
-         $category->getResource()->saveAttribute($category, 'url_path');
-     }
- }
-diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
-new file mode 100644
-index 00000000000..2337bb3646b
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogUrlRewrite\Observer;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\CatalogUrlRewrite\Model\Products\AdaptUrlRewritesToVisibilityAttribute;
-+use Magento\Framework\Event\Observer;
-+use Magento\Framework\Event\ObserverInterface;
-+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
-+
-+/**
-+ * Consider URL rewrites on change product visibility via mass action
-+ */
-+class ProcessUrlRewriteOnChangeProductVisibilityObserver implements ObserverInterface
-+{
-+    /**
-+     * @var AdaptUrlRewritesToVisibilityAttribute
-+     */
-+    private $adaptUrlRewritesToVisibility;
-+
-+    /**
-+     * @param AdaptUrlRewritesToVisibilityAttribute $adaptUrlRewritesToVisibility
-+     */
-+    public function __construct(AdaptUrlRewritesToVisibilityAttribute $adaptUrlRewritesToVisibility)
-+    {
-+        $this->adaptUrlRewritesToVisibility = $adaptUrlRewritesToVisibility;
-+    }
-+
-+    /**
-+     * Generate urls for UrlRewrites and save it in storage
-+     *
-+     * @param Observer $observer
-+     * @return void
-+     * @throws UrlAlreadyExistsException
-+     */
-+    public function execute(Observer $observer)
-+    {
-+        $event = $observer->getEvent();
-+        $attrData = $event->getAttributesData();
-+        $productIds = $event->getProductIds();
-+        $visibility = $attrData[ProductInterface::VISIBILITY] ?? 0;
-+
-+        if (!$visibility || !$productIds) {
-+            return;
-+        }
-+
-+        $this->adaptUrlRewritesToVisibility->execute($productIds, (int)$visibility);
-+    }
-+}
-diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
-index c4d67f447e2..6eda8dd0b61 100644
---- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
-@@ -6,11 +6,15 @@
- namespace Magento\CatalogUrlRewrite\Observer;
- 
- use Magento\Catalog\Model\Product;
-+use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
- use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-+use Magento\Framework\App\ObjectManager;
- use Magento\UrlRewrite\Model\UrlPersistInterface;
--use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
- use Magento\Framework\Event\ObserverInterface;
- 
-+/**
-+ * Class ProductProcessUrlRewriteSavingObserver
-+ */
- class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
- {
-     /**
-@@ -23,22 +27,33 @@ class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
-      */
-     private $urlPersist;
- 
-+    /**
-+     * @var ProductUrlPathGenerator
-+     */
-+    private $productUrlPathGenerator;
-+
-     /**
-      * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
-      * @param UrlPersistInterface $urlPersist
-+     * @param ProductUrlPathGenerator|null $productUrlPathGenerator
-      */
-     public function __construct(
-         ProductUrlRewriteGenerator $productUrlRewriteGenerator,
--        UrlPersistInterface $urlPersist
-+        UrlPersistInterface $urlPersist,
-+        ProductUrlPathGenerator $productUrlPathGenerator = null
-     ) {
-         $this->productUrlRewriteGenerator = $productUrlRewriteGenerator;
-         $this->urlPersist = $urlPersist;
-+        $this->productUrlPathGenerator = $productUrlPathGenerator ?: ObjectManager::getInstance()
-+            ->get(ProductUrlPathGenerator::class);
-     }
- 
-     /**
-      * Generate urls for UrlRewrite and save it in storage
-+     *
-      * @param \Magento\Framework\Event\Observer $observer
-      * @return void
-+     * @throws \Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException
-      */
-     public function execute(\Magento\Framework\Event\Observer $observer)
-     {
-@@ -51,6 +66,8 @@ class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
-             || $product->dataHasChangedFor('visibility')
-         ) {
-             if ($product->isVisibleInSiteVisibility()) {
-+                $product->unsUrlPath();
-+                $product->setUrlPath($this->productUrlPathGenerator->getUrlPath($product));
-                 $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
-             }
-         }
-diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
-index fc2056e83ec..44b47faf3d4 100644
---- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
-@@ -13,7 +13,12 @@ use Magento\Framework\Event\ObserverInterface;
- use Magento\Store\Model\Store;
- use Magento\UrlRewrite\Model\UrlPersistInterface;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-+use Magento\Store\Api\StoreWebsiteRelationInterface;
-+use Magento\Framework\App\ObjectManager;
- 
-+/**
-+ * Observer to assign the products to website
-+ */
- class ProductToWebsiteChangeObserver implements ObserverInterface
- {
-     /**
-@@ -36,22 +41,31 @@ class ProductToWebsiteChangeObserver implements ObserverInterface
-      */
-     protected $request;
- 
-+    /**
-+     * @var StoreWebsiteRelationInterface
-+     */
-+    private $storeWebsiteRelation;
-+
-     /**
-      * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
-      * @param UrlPersistInterface $urlPersist
-      * @param ProductRepositoryInterface $productRepository
-      * @param RequestInterface $request
-+     * @param StoreWebsiteRelationInterface $storeWebsiteRelation
-      */
-     public function __construct(
-         ProductUrlRewriteGenerator $productUrlRewriteGenerator,
-         UrlPersistInterface $urlPersist,
-         ProductRepositoryInterface $productRepository,
--        RequestInterface $request
-+        RequestInterface $request,
-+        StoreWebsiteRelationInterface $storeWebsiteRelation = null
-     ) {
-         $this->productUrlRewriteGenerator = $productUrlRewriteGenerator;
-         $this->urlPersist = $urlPersist;
-         $this->productRepository = $productRepository;
-         $this->request = $request;
-+        $this->storeWebsiteRelation = $storeWebsiteRelation ?:
-+            ObjectManager::getInstance()->get(StoreWebsiteRelationInterface::class);
-     }
- 
-     /**
-@@ -69,12 +83,21 @@ class ProductToWebsiteChangeObserver implements ObserverInterface
-                 $this->request->getParam('store_id', Store::DEFAULT_STORE_ID)
-             );
- 
--            $this->urlPersist->deleteByData([
--                UrlRewrite::ENTITY_ID => $product->getId(),
--                UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
--            ]);
--            if ($product->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE) {
--                $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
-+            if (!empty($this->productUrlRewriteGenerator->generate($product))) {
-+                if ($this->request->getParam('remove_website_ids')) {
-+                    foreach ($this->request->getParam('remove_website_ids') as $webId) {
-+                        foreach ($this->storeWebsiteRelation->getStoreByWebsiteId($webId) as $storeId) {
-+                            $this->urlPersist->deleteByData([
-+                                UrlRewrite::ENTITY_ID => $product->getId(),
-+                                UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
-+                                UrlRewrite::STORE_ID => $storeId
-+                            ]);
-+                        }
-+                    }
-+                }
-+                if ($product->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE) {
-+                    $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
-+                }
-             }
-         }
-     }
-diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
-index b201ae31b68..28afff56c01 100644
---- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
-@@ -33,6 +33,9 @@ class ProductUrlKeyAutogeneratorObserver implements ObserverInterface
-     {
-         /** @var Product $product */
-         $product = $observer->getEvent()->getProduct();
--        $product->setUrlKey($this->productUrlPathGenerator->getUrlKey($product));
-+        $urlKey = $this->productUrlPathGenerator->getUrlKey($product);
-+        if (null !== $urlKey) {
-+            $product->setUrlKey($urlKey);
-+        }
-     }
- }
-diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
-index c4ec0bb3a74..083b39d621f 100644
---- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
-@@ -16,6 +16,7 @@ use Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator;
- use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
- use Magento\CatalogUrlRewrite\Model\ProductScopeRewriteGenerator;
- use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Serialize\Serializer\Json;
- use Magento\UrlRewrite\Model\MergeDataProvider;
-@@ -24,6 +25,8 @@ use Magento\UrlRewrite\Model\UrlPersistInterface;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
- 
- /**
-+ * Class for management url rewrites.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class UrlRewriteHandler
-@@ -78,6 +81,11 @@ class UrlRewriteHandler
-      */
-     private $productScopeRewriteGenerator;
- 
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-     /**
-      * @param ChildrenCategoriesProvider $childrenCategoriesProvider
-      * @param CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator
-@@ -88,6 +96,8 @@ class UrlRewriteHandler
-      * @param MergeDataProviderFactory|null $mergeDataProviderFactory
-      * @param Json|null $serializer
-      * @param ProductScopeRewriteGenerator|null $productScopeRewriteGenerator
-+     * @param ScopeConfigInterface|null $scopeConfig
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-         ChildrenCategoriesProvider $childrenCategoriesProvider,
-@@ -98,7 +108,8 @@ class UrlRewriteHandler
-         CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator,
-         MergeDataProviderFactory $mergeDataProviderFactory = null,
-         Json $serializer = null,
--        ProductScopeRewriteGenerator $productScopeRewriteGenerator = null
-+        ProductScopeRewriteGenerator $productScopeRewriteGenerator = null,
-+        ScopeConfigInterface $scopeConfig = null
-     ) {
-         $this->childrenCategoriesProvider = $childrenCategoriesProvider;
-         $this->categoryUrlRewriteGenerator = $categoryUrlRewriteGenerator;
-@@ -113,6 +124,7 @@ class UrlRewriteHandler
-         $this->serializer = $serializer ?: $objectManager->get(Json::class);
-         $this->productScopeRewriteGenerator = $productScopeRewriteGenerator
-             ?: $objectManager->get(ProductScopeRewriteGenerator::class);
-+        $this->scopeConfig = $scopeConfig ?? $objectManager->get(ScopeConfigInterface::class);
-     }
- 
-     /**
-@@ -131,14 +143,19 @@ class UrlRewriteHandler
-         if ($category->getChangedProductIds()) {
-             $this->generateChangedProductUrls($mergeDataProvider, $category, $storeId, $saveRewriteHistory);
-         } else {
--            $mergeDataProvider->merge(
--                $this->getCategoryProductsUrlRewrites(
--                    $category,
--                    $storeId,
--                    $saveRewriteHistory,
--                    $category->getEntityId()
--                )
--            );
-+            $categoryStoreIds = $this->getCategoryStoreIds($category);
-+
-+            foreach ($categoryStoreIds as $categoryStoreId) {
-+                $this->isSkippedProduct[$category->getEntityId()] = [];
-+                $mergeDataProvider->merge(
-+                    $this->getCategoryProductsUrlRewrites(
-+                        $category,
-+                        $categoryStoreId,
-+                        $saveRewriteHistory,
-+                        $category->getEntityId()
-+                    )
-+                );
-+            }
-         }
- 
-         foreach ($this->childrenCategoriesProvider->getChildren($category, true) as $childCategory) {
-@@ -156,6 +173,30 @@ class UrlRewriteHandler
-     }
- 
-     /**
-+     * Update product url rewrites for changed product.
-+     *
-+     * @param Category $category
-+     * @return array
-+     */
-+    public function updateProductUrlRewritesForChangedProduct(Category $category): array
-+    {
-+        $mergeDataProvider = clone $this->mergeDataProviderPrototype;
-+        $this->isSkippedProduct[$category->getEntityId()] = [];
-+        $saveRewriteHistory = (bool)$category->getData('save_rewrites_history');
-+        $storeIds = $this->getCategoryStoreIds($category);
-+
-+        if ($category->getChangedProductIds()) {
-+            foreach ($storeIds as $storeId) {
-+                $this->generateChangedProductUrls($mergeDataProvider, $category, (int)$storeId, $saveRewriteHistory);
-+            }
-+        }
-+
-+        return $mergeDataProvider->getData();
-+    }
-+
-+    /**
-+     * Delete category rewrites for children.
-+     *
-      * @param Category $category
-      * @return void
-      */
-@@ -184,6 +225,8 @@ class UrlRewriteHandler
-     }
- 
-     /**
-+     * Get category products url rewrites.
-+     *
-      * @param Category $category
-      * @param int $storeId
-      * @param bool $saveRewriteHistory
-@@ -197,12 +240,13 @@ class UrlRewriteHandler
-         $rootCategoryId = null
-     ) {
-         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
-+        $generateProductRewrite = (bool)$this->scopeConfig->getValue('catalog/seo/generate_category_product_rewrites');
- 
-         /** @var Collection $productCollection */
-         $productCollection = $this->productCollectionFactory->create();
- 
-         $productCollection->addCategoriesFilter(['eq' => [$category->getEntityId()]])
--            ->setStoreId($storeId)
-+            ->addStoreFilter($storeId)
-             ->addAttributeToSelect('name')
-             ->addAttributeToSelect('visibility')
-             ->addAttributeToSelect('url_key')
-@@ -217,6 +261,7 @@ class UrlRewriteHandler
-             $this->isSkippedProduct[$category->getEntityId()][] = $product->getId();
-             $product->setStoreId($storeId);
-             $product->setData('save_rewrites_history', $saveRewriteHistory);
-+            $product->setData('generate_rewrites', $generateProductRewrite);
-             $mergeDataProvider->merge(
-                 $this->categoryBasedProductRewriteGenerator->generate($product, $rootCategoryId)
-             );
-@@ -252,7 +297,7 @@ class UrlRewriteHandler
-             /* @var Collection $collection */
-             $collection = $this->productCollectionFactory->create()
-                 ->setStoreId($categoryStoreId)
--                ->addIdFilter($category->getAffectedProductIds())
-+                ->addIdFilter($category->getChangedProductIds())
-                 ->addAttributeToSelect('visibility')
-                 ->addAttributeToSelect('name')
-                 ->addAttributeToSelect('url_key')
-diff --git a/app/code/Magento/CatalogUrlRewrite/Plugin/DynamicCategoryRewrites.php b/app/code/Magento/CatalogUrlRewrite/Plugin/DynamicCategoryRewrites.php
-new file mode 100644
-index 00000000000..139452116f5
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/Plugin/DynamicCategoryRewrites.php
-@@ -0,0 +1,96 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogUrlRewrite\Plugin;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-+use Magento\CatalogUrlRewrite\Model\Storage\DynamicStorage;
-+use Magento\CatalogUrlRewrite\Model\Storage\DbStorage;
-+
-+/**
-+ * Class DbStorage
-+ */
-+class DynamicCategoryRewrites
-+{
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $config;
-+
-+    /**
-+     * @var DynamicStorage
-+     */
-+    private $dynamicStorage;
-+
-+    /**
-+     * @param ScopeConfigInterface|null $config
-+     * @param DynamicStorage $dynamicStorage
-+     */
-+    public function __construct(
-+        ScopeConfigInterface $config,
-+        DynamicStorage $dynamicStorage
-+    ) {
-+        $this->config = $config;
-+        $this->dynamicStorage = $dynamicStorage;
-+    }
-+
-+    /**
-+     * Check config value of generate_category_product_rewrites
-+     *
-+     * @return bool
-+     */
-+    private function isCategoryRewritesEnabled(): bool
-+    {
-+        return (bool)$this->config->getValue('catalog/seo/generate_category_product_rewrites');
-+    }
-+
-+    /**
-+     * Execute proxy
-+     *
-+     * @param callable $proceed
-+     * @param array $data
-+     * @param string $functionName
-+     * @return mixed
-+     */
-+    private function proxy(callable $proceed, array $data, string $functionName)
-+    {
-+        if ($this->isCategoryRewritesEnabled()) {
-+            return $proceed($data);
-+        }
-+
-+        return $this->dynamicStorage->$functionName($data);
-+    }
-+
-+    /**
-+     * Find rewrite by specific data
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     * @param DbStorage $subject
-+     * @param callable $proceed
-+     * @param array $data
-+     * @return UrlRewrite|null
-+     */
-+    public function aroundFindOneByData(DbStorage $subject, callable $proceed, array $data)
-+    {
-+        return $this->proxy($proceed, $data, 'findOneByData');
-+    }
-+
-+    /**
-+     * Find rewrites by specific data
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     * @param DbStorage $subject
-+     * @param callable $proceed
-+     * @param array $data
-+     * @return UrlRewrite[]
-+     */
-+    public function aroundFindAllByData(DbStorage $subject, callable $proceed, array $data)
-+    {
-+        return $this->proxy($proceed, $data, 'findAllByData');
-+    }
-+}
-diff --git a/app/code/Magento/CatalogUrlRewrite/Plugin/Webapi/Controller/Rest/InputParamsResolver.php b/app/code/Magento/CatalogUrlRewrite/Plugin/Webapi/Controller/Rest/InputParamsResolver.php
-new file mode 100644
-index 00000000000..4e8e3840693
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/Plugin/Webapi/Controller/Rest/InputParamsResolver.php
-@@ -0,0 +1,88 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogUrlRewrite\Plugin\Webapi\Controller\Rest;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Webapi\Rest\Request as RestRequest;
-+
-+/**
-+ * Plugin for InputParamsResolver
-+ *
-+ * Used to modify product data with save_rewrites_history flag
-+ */
-+class InputParamsResolver
-+{
-+    /**
-+     * @var RestRequest
-+     */
-+    private $request;
-+
-+    /**
-+     * @param RestRequest $request
-+     */
-+    public function __construct(RestRequest $request)
-+    {
-+        $this->request = $request;
-+    }
-+
-+    /**
-+     * Add 'save_rewrites_history' param to the product data
-+     *
-+     * @see \Magento\CatalogUrlRewrite\Plugin\Catalog\Controller\Adminhtml\Product\Initialization\Helper
-+     * @param \Magento\Webapi\Controller\Rest\InputParamsResolver $subject
-+     * @param array $result
-+     * @return array
-+     */
-+    public function afterResolve(\Magento\Webapi\Controller\Rest\InputParamsResolver $subject, array $result): array
-+    {
-+        $route = $subject->getRoute();
-+        $serviceMethodName = $route->getServiceMethod();
-+        $serviceClassName = $route->getServiceClass();
-+        $requestBodyParams = $this->request->getBodyParams();
-+
-+        if ($this->isProductSaveCalled($serviceClassName, $serviceMethodName)
-+            && $this->isCustomAttributesExists($requestBodyParams)) {
-+            foreach ($requestBodyParams['product']['custom_attributes'] as $attribute) {
-+                if ($attribute['attribute_code'] === 'save_rewrites_history') {
-+                    foreach ($result as $resultItem) {
-+                        if ($resultItem instanceof \Magento\Catalog\Model\Product) {
-+                            $resultItem->setData('save_rewrites_history', (bool)$attribute['value']);
-+                            break 2;
-+                        }
-+                    }
-+                    break;
-+                }
-+            }
-+        }
-+        return $result;
-+    }
-+
-+    /**
-+     * Check that product save method called
-+     *
-+     * @param string $serviceClassName
-+     * @param string $serviceMethodName
-+     * @return bool
-+     */
-+    private function isProductSaveCalled(string $serviceClassName, string $serviceMethodName): bool
-+    {
-+        return $serviceClassName === ProductRepositoryInterface::class && $serviceMethodName === 'save';
-+    }
-+
-+    /**
-+     * Check is any custom options exists in product data
-+     *
-+     * @param array $requestBodyParams
-+     * @return bool
-+     */
-+    private function isCustomAttributesExists(array $requestBodyParams): bool
-+    {
-+        return !empty($requestBodyParams['product']['custom_attributes']);
-+    }
-+}
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
-new file mode 100644
-index 00000000000..54232676765
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
-@@ -0,0 +1,83 @@
-+<?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="AdminUrlForProductRewrittenCorrectlyTest">
-+        <annotations>
-+            <features value="CatalogUrlRewrite"/>
-+            <stories value="Url rewrites"/>
-+            <title value="Check that URL for product rewritten correctly"/>
-+            <description value="Check that URL for product rewritten correctly"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-97224"/>
-+            <useCaseId value="MAGETWO-64191"/>
-+            <group value="CatalogUrlRewrite"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!--Create product-->
-+            <createData entity="_defaultCategory" stepKey="category"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Created product-->
-+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="amOnEditPage"/>
-+        <waitForPageLoad stepKey="waitForEditPage"/>
-+
-+        <!--Switch to Default Store view-->
-+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="selectSecondStoreView">
-+            <argument name="storeViewName" value="Default Store View"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForStoreViewLoad"/>
-+
-+        <!--Set use default url-->
-+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickOnSearchEngineOptimization"/>
-+        <waitForElementVisible selector="{{AdminProductSEOSection.useDefaultUrl}}" stepKey="waitForUseDefaultUrlCheckbox"/>
-+        <click selector="{{AdminProductSEOSection.useDefaultUrl}}" stepKey="clickUseDefaultUrlCheckbox"/>
-+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="$$createProduct.sku$$-new" stepKey="changeUrlKey"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!--Select product and go toUpdate Attribute page-->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToCatalogPageChangingView"/>
-+        <waitForPageLoad stepKey="WaitForPageToLoadFullyChangingView"/>
-+        <actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
-+            <argument name="product" value="ApiSimpleProduct"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="ClickOnSelectAllCheckBoxChangingView"/>
-+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
-+        <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickBulkUpdate"/>
-+        <waitForPageLoad stepKey="waitForUpdateAttributesPageLoad"/>
-+        <seeInCurrentUrl url="{{ProductAttributesEditPage.url}}" stepKey="seeInUrlAttributeUpdatePage"/>
-+        <click selector="{{AdminUpdateAttributesWebsiteSection.website}}" stepKey="clickWebsiteTab"/>
-+        <waitForAjaxLoad stepKey="waitForLoadWebSiteTab"/>
-+        <click selector="{{AdminUpdateAttributesWebsiteSection.addProductToWebsite}}" stepKey="checkAddProductToWebsiteCheckbox"/>
-+        <click selector="{{AdminUpdateAttributesSection.saveButton}}" stepKey="clickSave"/>
-+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeSaveSuccess"/>
-+
-+        <!-- Run cron twice -->
-+        <magentoCLI command="cron:run" stepKey="runCron1"/>
-+        <magentoCLI command="cron:run" stepKey="runCron2"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitFormToReload1"/>
-+
-+        <!--Got to Store front product page and check url-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.sku$$-new)}}" stepKey="navigateToSimpleProductPage"/>
-+        <seeInCurrentUrl url="{{StorefrontProductPage.url($$createProduct.sku$$-new)}}" stepKey="seeProductNewUrl"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/RewriteStoreLevelUrlKeyOfChildCategoryTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/RewriteStoreLevelUrlKeyOfChildCategoryTest.xml
-new file mode 100644
-index 00000000000..67870c51140
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/RewriteStoreLevelUrlKeyOfChildCategoryTest.xml
-@@ -0,0 +1,67 @@
-+<?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="RewriteStoreLevelUrlKeyOfChildCategoryTest">
-+        <annotations>
-+            <title value="Rewriting Store-level URL key of child category"/>
-+            <stories value="MAGETWO-91649: #13513: Magento ignore store-level url_key of child category in URL rewrite process for global scope"/>
-+            <description value="Rewriting Store-level URL key of child category"/>
-+            <features value="CatalogUrlRewrite"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94934"/>
-+            <group value="CatalogUrlRewrite"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
-+
-+            <createData entity="_defaultCategory" stepKey="defaultCategory"/>
-+            <createData entity="SubCategoryWithParent" stepKey="subCategory">
-+                <requiredEntity createDataKey="defaultCategory"/>
-+            </createData>
-+        </before>
-+
-+        <actionGroup ref="navigateToCreatedCategory" stepKey="navigateToCreatedSubCategory">
-+            <argument name="Category" value="$$subCategory$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="AdminSwitchStoreViewForSubCategory"/>
-+
-+        <actionGroup ref="ChangeSeoUrlKeyForSubCategory" stepKey="changeSeoUrlKeyForSubCategory">
-+            <argument name="value" value="bags-second"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="navigateToCreatedCategory" stepKey="navigateToCreatedDefaultCategory">
-+            <argument name="Category" value="$$defaultCategory$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="ChangeSeoUrlKey" stepKey="changeSeoUrlKeyForDefaultCategory">
-+            <argument name="value" value="gear-global"/>
-+        </actionGroup>
-+
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+
-+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="storefrontSwitchStoreView"/>
-+
-+        <actionGroup ref="GoToSubCategoryPage" stepKey="goToSubCategoryPage">
-+            <argument name="parentCategory" value="$$defaultCategory$$"/>
-+            <argument name="subCategory" value="$$subCategory$$"/>
-+            <argument name="urlPath" value="gear-global/bags-second"/>
-+        </actionGroup>
-+
-+        <after>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <deleteData createDataKey="subCategory" stepKey="deleteSubCategory"/>
-+            <deleteData createDataKey="defaultCategory" stepKey="deleteNewRootCategory"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenUrlRewriteGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenUrlRewriteGeneratorTest.php
-index 3f641256b12..f8422c7c05f 100644
---- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenUrlRewriteGeneratorTest.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenUrlRewriteGeneratorTest.php
-@@ -31,6 +31,9 @@ class ChildrenUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
-     /** @var \PHPUnit_Framework_MockObject_MockObject */
-     private $serializerMock;
- 
-+    /** @var \PHPUnit_Framework_MockObject_MockObject */
-+    private $categoryRepository;
-+
-     protected function setUp()
-     {
-         $this->serializerMock = $this->getMockBuilder(Json::class)
-@@ -47,6 +50,9 @@ class ChildrenUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
-         $this->categoryUrlRewriteGenerator = $this->getMockBuilder(
-             \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator::class
-         )->disableOriginalConstructor()->getMock();
-+        $this->categoryRepository = $this->getMockBuilder(
-+            \Magento\Catalog\Model\CategoryRepository::class
-+        )->disableOriginalConstructor()->getMock();
-         $mergeDataProviderFactory = $this->createPartialMock(
-             \Magento\UrlRewrite\Model\MergeDataProviderFactory::class,
-             ['create']
-@@ -59,14 +65,15 @@ class ChildrenUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
-             [
-                 'childrenCategoriesProvider' => $this->childrenCategoriesProvider,
-                 'categoryUrlRewriteGeneratorFactory' => $this->categoryUrlRewriteGeneratorFactory,
--                'mergeDataProviderFactory' => $mergeDataProviderFactory
-+                'mergeDataProviderFactory' => $mergeDataProviderFactory,
-+                'categoryRepository' => $this->categoryRepository
-             ]
-         );
-     }
- 
-     public function testNoChildrenCategories()
-     {
--        $this->childrenCategoriesProvider->expects($this->once())->method('getChildren')->with($this->category, true)
-+        $this->childrenCategoriesProvider->expects($this->once())->method('getChildrenIds')->with($this->category, true)
-             ->will($this->returnValue([]));
- 
-         $this->assertEquals([], $this->childrenUrlRewriteGenerator->generate('store_id', $this->category));
-@@ -76,14 +83,16 @@ class ChildrenUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
-     {
-         $storeId = 'store_id';
-         $saveRewritesHistory = 'flag';
-+        $childId = 2;
- 
-         $childCategory = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
-             ->disableOriginalConstructor()->getMock();
--        $childCategory->expects($this->once())->method('setStoreId')->with($storeId);
-         $childCategory->expects($this->once())->method('setData')
-             ->with('save_rewrites_history', $saveRewritesHistory);
--        $this->childrenCategoriesProvider->expects($this->once())->method('getChildren')->with($this->category, true)
--            ->will($this->returnValue([$childCategory]));
-+        $this->childrenCategoriesProvider->expects($this->once())->method('getChildrenIds')->with($this->category, true)
-+            ->will($this->returnValue([$childId]));
-+        $this->categoryRepository->expects($this->once())->method('get')
-+            ->with($childId, $storeId)->willReturn($childCategory);
-         $this->category->expects($this->any())->method('getData')->with('save_rewrites_history')
-             ->will($this->returnValue($saveRewritesHistory));
-         $this->categoryUrlRewriteGeneratorFactory->expects($this->once())->method('create')
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CurrentUrlRewritesRegeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CurrentUrlRewritesRegeneratorTest.php
-index fbc620a6d74..294cf856290 100644
---- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CurrentUrlRewritesRegeneratorTest.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CurrentUrlRewritesRegeneratorTest.php
-@@ -252,7 +252,7 @@ class CurrentUrlRewritesRegeneratorTest extends \PHPUnit\Framework\TestCase
-                 ->disableOriginalConstructor()->getMock();
-             foreach ($urlRewrite as $key => $value) {
-                 $url->expects($this->any())
--                    ->method('get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key))))
-+                    ->method('get' . str_replace('_', '', ucwords($key, '_')))
-                     ->will($this->returnValue($value));
-             }
-             $rewrites[] = $url;
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php
-index f91a55c11b9..85e88370271 100644
---- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category\Plugin\Category;
- 
-+use Magento\Catalog\Model\CategoryFactory;
- use Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Move as CategoryMovePlugin;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
-@@ -39,6 +40,11 @@ class MoveTest extends \PHPUnit\Framework\TestCase
-      */
-     private $categoryMock;
- 
-+    /**
-+     * @var CategoryFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $categoryFactory;
-+
-     /**
-      * @var CategoryMovePlugin
-      */
-@@ -55,28 +61,44 @@ class MoveTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->setMethods(['getChildren'])
-             ->getMock();
-+        $this->categoryFactory = $this->getMockBuilder(CategoryFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-         $this->subjectMock = $this->getMockBuilder(CategoryResourceModel::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->categoryMock = $this->getMockBuilder(Category::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['getResource', 'setUrlPath'])
-+            ->setMethods(['getResource', 'setUrlPath', 'getStoreIds', 'getStoreId', 'setStoreId'])
-             ->getMock();
-         $this->plugin = $this->objectManager->getObject(
-             CategoryMovePlugin::class,
-             [
-                 'categoryUrlPathGenerator' => $this->categoryUrlPathGeneratorMock,
--                'childrenCategoriesProvider' => $this->childrenCategoriesProviderMock
-+                'childrenCategoriesProvider' => $this->childrenCategoriesProviderMock,
-+                'categoryFactory' => $this->categoryFactory
-             ]
-         );
-     }
- 
-+    /**
-+     * Tests url updating for children categories.
-+     */
-     public function testAfterChangeParent()
-     {
-         $urlPath = 'test/path';
--        $this->categoryMock->expects($this->once())
--            ->method('getResource')
-+        $storeIds = [1];
-+        $originalCategory = $this->getMockBuilder(Category::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->categoryFactory->method('create')
-+            ->willReturn($originalCategory);
-+
-+        $this->categoryMock->method('getResource')
-             ->willReturn($this->subjectMock);
-+        $this->categoryMock->expects($this->once())
-+            ->method('getStoreIds')
-+            ->willReturn($storeIds);
-         $this->childrenCategoriesProviderMock->expects($this->once())
-             ->method('getChildren')
-             ->with($this->categoryMock, true)
-@@ -85,9 +107,6 @@ class MoveTest extends \PHPUnit\Framework\TestCase
-             ->method('getUrlPath')
-             ->with($this->categoryMock)
-             ->willReturn($urlPath);
--        $this->categoryMock->expects($this->once())
--            ->method('getResource')
--            ->willReturn($this->subjectMock);
-         $this->categoryMock->expects($this->once())
-             ->method('setUrlPath')
-             ->with($urlPath);
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/CurrentUrlRewritesRegeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/CurrentUrlRewritesRegeneratorTest.php
-index 4855478b848..c431743fc0b 100644
---- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/CurrentUrlRewritesRegeneratorTest.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/CurrentUrlRewritesRegeneratorTest.php
-@@ -294,7 +294,7 @@ class CurrentUrlRewritesRegeneratorTest extends \PHPUnit\Framework\TestCase
-                 ->disableOriginalConstructor()->getMock();
-             foreach ($urlRewrite as $key => $value) {
-                 $url->expects($this->any())
--                    ->method('get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key))))
-+                    ->method('get' . str_replace('_', '', ucwords($key, '_')))
-                     ->will($this->returnValue($value));
-             }
-             $rewrites[] = $url;
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductScopeRewriteGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductScopeRewriteGeneratorTest.php
-index 06be01445df..d4e0978dda6 100644
---- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductScopeRewriteGeneratorTest.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductScopeRewriteGeneratorTest.php
-@@ -50,6 +50,9 @@ class ProductScopeRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
-     /** @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject */
-     private $categoryMock;
- 
-+    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    private $configMock;
-+
-     public function setUp()
-     {
-         $this->serializer = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
-@@ -96,6 +99,7 @@ class ProductScopeRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
-         );
-         $this->mergeDataProvider = new \Magento\UrlRewrite\Model\MergeDataProvider();
-         $mergeDataProviderFactory->expects($this->once())->method('create')->willReturn($this->mergeDataProvider);
-+        $this->configMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)->getMock();
- 
-         $this->productScopeGenerator = (new ObjectManager($this))->getObject(
-             \Magento\CatalogUrlRewrite\Model\ProductScopeRewriteGenerator::class,
-@@ -107,7 +111,8 @@ class ProductScopeRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
-                 'objectRegistryFactory' => $this->objectRegistryFactory,
-                 'storeViewService' => $this->storeViewService,
-                 'storeManager' => $this->storeManager,
--                'mergeDataProviderFactory' => $mergeDataProviderFactory
-+                'mergeDataProviderFactory' => $mergeDataProviderFactory,
-+                'config' => $this->configMock
-             ]
-         );
-         $this->categoryMock = $this->getMockBuilder(Category::class)->disableOriginalConstructor()->getMock();
-@@ -115,6 +120,9 @@ class ProductScopeRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
- 
-     public function testGenerationForGlobalScope()
-     {
-+        $this->configMock->expects($this->any())->method('getValue')
-+            ->with('catalog/seo/generate_category_product_rewrites')
-+            ->willReturn('1');
-         $product = $this->createMock(\Magento\Catalog\Model\Product::class);
-         $product->expects($this->any())->method('getStoreId')->will($this->returnValue(null));
-         $product->expects($this->any())->method('getStoreIds')->will($this->returnValue([1]));
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php
-index b32b0216b9b..5076577447a 100644
---- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php
-@@ -3,12 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\CatalogUrlRewrite\Test\Unit\Model;
- 
- use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Store\Model\ScopeInterface;
- 
-+/**
-+ * Class ProductUrlPathGeneratorTest
-+ */
- class ProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
- {
-     /** @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator */
-@@ -32,7 +37,10 @@ class ProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
-     /** @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject */
-     protected $category;
- 
--    protected function setUp()
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-     {
-         $this->category = $this->createMock(\Magento\Catalog\Model\Category::class);
-         $productMethods = [
-@@ -69,13 +77,14 @@ class ProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @return array
-      */
--    public function getUrlPathDataProvider()
-+    public function getUrlPathDataProvider(): array
-     {
-         return [
--            'path based on url key' => ['url-key', null, 'url-key'],
--            'path based on product name 1' => ['', 'product-name', 'product-name'],
--            'path based on product name 2' => [null, 'product-name', 'product-name'],
--            'path based on product name 3' => [false, 'product-name', 'product-name']
-+            'path based on url key uppercase' => ['Url-Key', null, 0, 'url-key'],
-+            'path based on url key' => ['url-key', null, 0, 'url-key'],
-+            'path based on product name 1' => ['', 'product-name', 1, 'product-name'],
-+            'path based on product name 2' => [null, 'product-name', 1, 'product-name'],
-+            'path based on product name 3' => [false, 'product-name', 1, 'product-name']
-         ];
-     }
- 
-@@ -83,15 +92,18 @@ class ProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
-      * @dataProvider getUrlPathDataProvider
-      * @param string|null|bool $urlKey
-      * @param string|null|bool $productName
-+     * @param int $formatterCalled
-      * @param string $result
-+     * @return void
-      */
--    public function testGetUrlPath($urlKey, $productName, $result)
-+    public function testGetUrlPath($urlKey, $productName, $formatterCalled, $result): void
-     {
-         $this->product->expects($this->once())->method('getData')->with('url_path')
-             ->will($this->returnValue(null));
-         $this->product->expects($this->any())->method('getUrlKey')->will($this->returnValue($urlKey));
-         $this->product->expects($this->any())->method('getName')->will($this->returnValue($productName));
--        $this->product->expects($this->once())->method('formatUrlKey')->will($this->returnArgument(0));
-+        $this->product->expects($this->exactly($formatterCalled))
-+            ->method('formatUrlKey')->will($this->returnArgument(0));
- 
-         $this->assertEquals($result, $this->productUrlPathGenerator->getUrlPath($this->product, null));
-     }
-@@ -99,22 +111,23 @@ class ProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @param string|bool $productUrlKey
-      * @param string|bool $expectedUrlKey
-+     * @return void
-      * @dataProvider getUrlKeyDataProvider
-      */
--    public function testGetUrlKey($productUrlKey, $expectedUrlKey)
-+    public function testGetUrlKey($productUrlKey, $expectedUrlKey): void
-     {
-         $this->product->expects($this->any())->method('getUrlKey')->will($this->returnValue($productUrlKey));
-         $this->product->expects($this->any())->method('formatUrlKey')->will($this->returnValue($productUrlKey));
--        $this->assertEquals($expectedUrlKey, $this->productUrlPathGenerator->getUrlKey($this->product));
-+        $this->assertSame($expectedUrlKey, $this->productUrlPathGenerator->getUrlKey($this->product));
-     }
- 
-     /**
-      * @return array
-      */
--    public function getUrlKeyDataProvider()
-+    public function getUrlKeyDataProvider(): array
-     {
-         return [
--            'URL Key use default' => [false, false],
-+            'URL Key use default' => [false, null],
-             'URL Key empty' => ['product-url', 'product-url'],
-         ];
-     }
-@@ -123,9 +136,10 @@ class ProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
-      * @param string|null|bool $storedUrlKey
-      * @param string|null|bool $productName
-      * @param string $expectedUrlKey
-+     * @return void
-      * @dataProvider getUrlPathDefaultUrlKeyDataProvider
-      */
--    public function testGetUrlPathDefaultUrlKey($storedUrlKey, $productName, $expectedUrlKey)
-+    public function testGetUrlPathDefaultUrlKey($storedUrlKey, $productName, $expectedUrlKey): void
-     {
-         $this->product->expects($this->once())->method('getData')->with('url_path')
-             ->will($this->returnValue(null));
-@@ -138,7 +152,7 @@ class ProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @return array
-      */
--    public function getUrlPathDefaultUrlKeyDataProvider()
-+    public function getUrlPathDefaultUrlKeyDataProvider(): array
-     {
-         return [
-             ['default-store-view-url-key', null, 'default-store-view-url-key'],
-@@ -146,7 +160,10 @@ class ProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
--    public function testGetUrlPathWithCategory()
-+    /**
-+     * @return void
-+     */
-+    public function testGetUrlPathWithCategory(): void
-     {
-         $this->product->expects($this->once())->method('getData')->with('url_path')
-             ->will($this->returnValue('product-path'));
-@@ -159,7 +176,10 @@ class ProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testGetUrlPathWithSuffix()
-+    /**
-+     * @return void
-+     */
-+    public function testGetUrlPathWithSuffix(): void
-     {
-         $storeId = 1;
-         $this->product->expects($this->once())->method('getData')->with('url_path')
-@@ -177,7 +197,10 @@ class ProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testGetUrlPathWithSuffixAndCategoryAndStore()
-+    /**
-+     * @return void
-+     */
-+    public function testGetUrlPathWithSuffixAndCategoryAndStore(): void
-     {
-         $storeId = 1;
-         $this->product->expects($this->once())->method('getData')->with('url_path')
-@@ -195,7 +218,10 @@ class ProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testGetCanonicalUrlPath()
-+    /**
-+     * @return void
-+     */
-+    public function testGetCanonicalUrlPath(): void
-     {
-         $this->product->expects($this->once())->method('getId')->will($this->returnValue(1));
- 
-@@ -205,7 +231,10 @@ class ProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testGetCanonicalUrlPathWithCategory()
-+    /**
-+     * @return void
-+     */
-+    public function testGetCanonicalUrlPathWithCategory(): void
-     {
-         $this->product->expects($this->once())->method('getId')->will($this->returnValue(1));
-         $this->category->expects($this->once())->method('getId')->will($this->returnValue(1));
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/AfterImportDataObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/AfterImportDataObserverTest.php
-index fd9ab10537f..3984d949332 100644
---- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/AfterImportDataObserverTest.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/AfterImportDataObserverTest.php
-@@ -694,7 +694,7 @@ class AfterImportDataObserverTest extends \PHPUnit\Framework\TestCase
-                 ->disableOriginalConstructor()->getMock();
-             foreach ($urlRewrite as $key => $value) {
-                 $url->expects($this->any())
--                    ->method('get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key))))
-+                    ->method('get' . str_replace('_', '', ucwords($key, '_')))
-                     ->will($this->returnValue($value));
-             }
-             $rewrites[] = $url;
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteMovingObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteMovingObserverTest.php
-new file mode 100644
-index 00000000000..57162b44f98
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteMovingObserverTest.php
-@@ -0,0 +1,148 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogUrlRewrite\Test\Unit\Observer;
-+
-+use Magento\Catalog\Model\Category;
-+use Magento\CatalogUrlRewrite\Block\UrlKeyRenderer;
-+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
-+use Magento\CatalogUrlRewrite\Model\Map\DatabaseMapPool;
-+use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUrlRewriteDatabaseMap;
-+use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
-+use Magento\CatalogUrlRewrite\Model\UrlRewriteBunchReplacer;
-+use Magento\CatalogUrlRewrite\Observer\CategoryProcessUrlRewriteMovingObserver;
-+use Magento\CatalogUrlRewrite\Observer\UrlRewriteHandler;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\Event;
-+use Magento\Framework\Event\Observer;
-+use Magento\UrlRewrite\Model\UrlPersistInterface;
-+
-+/**
-+ * Class CategoryProcessUrlRewriteMovingObserverTest
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class CategoryProcessUrlRewriteMovingObserverTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var CategoryProcessUrlRewriteMovingObserver
-+     */
-+    private $observer;
-+
-+    /**
-+     * @var CategoryUrlRewriteGenerator|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $categoryUrlRewriteGeneratorMock;
-+
-+    /**
-+     * @var UrlPersistInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $urlPersistMock;
-+
-+    /**
-+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $scopeConfigMock;
-+
-+    /**
-+     * @var UrlRewriteHandler|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $urlRewriteHandlerMock;
-+
-+    /**
-+     * @var DatabaseMapPool|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $databaseMapPoolMock;
-+
-+    /**
-+     * Set Up
-+     */
-+    protected function setUp()
-+    {
-+        $this->categoryUrlRewriteGeneratorMock = $this->createMock(CategoryUrlRewriteGenerator::class);
-+        $this->urlPersistMock = $this->createMock(UrlPersistInterface::class);
-+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
-+        $this->urlRewriteHandlerMock = $this->createMock(UrlRewriteHandler::class);
-+        /** @var UrlRewriteBunchReplacer|\PHPUnit_Framework_MockObject_MockObject $urlRewriteMock */
-+        $urlRewriteMock = $this->createMock(UrlRewriteBunchReplacer::class);
-+        $this->databaseMapPoolMock = $this->createMock(DatabaseMapPool::class);
-+
-+        $this->observer = new CategoryProcessUrlRewriteMovingObserver(
-+            $this->categoryUrlRewriteGeneratorMock,
-+            $this->urlPersistMock,
-+            $this->scopeConfigMock,
-+            $this->urlRewriteHandlerMock,
-+            $urlRewriteMock,
-+            $this->databaseMapPoolMock,
-+            [
-+                DataCategoryUrlRewriteDatabaseMap::class,
-+                DataProductUrlRewriteDatabaseMap::class
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test category process rewrite url by changing the parent
-+     *
-+     * @return void
-+     */
-+    public function testCategoryProcessUrlRewriteAfterMovingWithChangedParentId()
-+    {
-+        /** @var Observer|\PHPUnit_Framework_MockObject_MockObject $observerMock */
-+        $observerMock = $this->createMock(Observer::class);
-+        $eventMock = $this->getMockBuilder(Event::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getCategory'])
-+            ->getMock();
-+        $categoryMock = $this->createPartialMock(
-+            Category::class,
-+            [
-+                'dataHasChangedFor',
-+                'getEntityId',
-+                'getStoreId',
-+                'setData'
-+            ]
-+        );
-+
-+        $categoryMock->expects($this->once())->method('dataHasChangedFor')->with('parent_id')
-+            ->willReturn(true);
-+        $eventMock->expects($this->once())->method('getCategory')->willReturn($categoryMock);
-+        $observerMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
-+        $this->scopeConfigMock->expects($this->once())->method('isSetFlag')
-+            ->with(UrlKeyRenderer::XML_PATH_SEO_SAVE_HISTORY)->willReturn(true);
-+        $this->scopeConfigMock->method('getValue')->willReturn(true);
-+        $this->categoryUrlRewriteGeneratorMock->expects($this->once())->method('generate')
-+            ->with($categoryMock, true)->willReturn(['category-url-rewrite']);
-+        $this->urlRewriteHandlerMock->expects($this->once())->method('generateProductUrlRewrites')
-+            ->with($categoryMock)->willReturn(['product-url-rewrite']);
-+        $this->databaseMapPoolMock->expects($this->exactly(2))->method('resetMap')->willReturnSelf();
-+
-+        $this->observer->execute($observerMock);
-+    }
-+
-+    /**
-+     * Test category process rewrite url without changing the parent
-+     *
-+     * @return void
-+     */
-+    public function testCategoryProcessUrlRewriteAfterMovingWithinNotChangedParent()
-+    {
-+        /** @var Observer|\PHPUnit_Framework_MockObject_MockObject $observerMock */
-+        $observerMock = $this->createMock(Observer::class);
-+        $eventMock = $this->getMockBuilder(Event::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getCategory'])
-+            ->getMock();
-+        $categoryMock = $this->createPartialMock(Category::class, ['dataHasChangedFor']);
-+        $observerMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
-+        $eventMock->expects($this->once())->method('getCategory')->willReturn($categoryMock);
-+        $categoryMock->expects($this->once())->method('dataHasChangedFor')->with('parent_id')
-+            ->willReturn(false);
-+
-+        $this->observer->execute($observerMock);
-+    }
-+}
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php
-index afdb5488875..cdea1347581 100644
---- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php
-@@ -12,6 +12,7 @@ use Magento\CatalogUrlRewrite\Observer\CategoryProcessUrlRewriteSavingObserver;
- use Magento\CatalogUrlRewrite\Model\UrlRewriteBunchReplacer;
- use Magento\CatalogUrlRewrite\Observer\UrlRewriteHandler;
- use Magento\CatalogUrlRewrite\Model\Map\DatabaseMapPool;
-+use Magento\Framework\App\Config\ScopeConfigInterface as ScopeConfigInterfaceAlias;
- use Magento\Store\Model\ResourceModel\Group\CollectionFactory;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
- use Magento\Catalog\Model\Category;
-@@ -61,6 +62,11 @@ class CategoryProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\Tes
-      */
-     private $storeGroupFactory;
- 
-+    /**
-+     * @var \PHPUnit\Framework\MockObject\MockObject
-+     */
-+    private $scopeConfigMock;
-+
-     /**
-      * {@inheritDoc}
-      */
-@@ -70,12 +76,16 @@ class CategoryProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\Tes
-             \Magento\Framework\Event\Observer::class,
-             ['getEvent', 'getData']
-         );
--        $this->category = $this->createPartialMock(Category::class, [
--            'hasData',
--            'getParentId',
--            'dataHasChangedFor',
--            'getChangedProductIds',
--        ]);
-+        $this->category = $this->createPartialMock(
-+            Category::class,
-+            [
-+                'hasData',
-+                'getParentId',
-+                'getStoreId',
-+                'dataHasChangedFor',
-+                'getChangedProductIds',
-+            ]
-+        );
-         $this->observer->expects($this->any())
-             ->method('getEvent')
-             ->willReturnSelf();
-@@ -100,6 +110,11 @@ class CategoryProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\Tes
-             ->setMethods(['create'])
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterfaceAlias::class)
-+            ->setMethods(['getValue'])
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+        $this->scopeConfigMock->method('getValue')->willReturn(true);
- 
-         $this->categoryProcessUrlRewriteSavingObserver = (new ObjectManagerHelper($this))->getObject(
-             CategoryProcessUrlRewriteSavingObserver::class,
-@@ -109,6 +124,7 @@ class CategoryProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\Tes
-                 'urlRewriteBunchReplacer' => $this->urlRewriteBunchReplacerMock,
-                 'databaseMapPool' => $this->databaseMapPoolMock,
-                 'storeGroupFactory' => $this->storeGroupFactory,
-+                'scopeConfig' => $this->scopeConfigMock
-             ]
-         );
-     }
-@@ -200,6 +216,7 @@ class CategoryProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\Tes
-         $this->category->expects($this->any())
-             ->method('getChangedProductIds')
-             ->willReturn([]);
-+        $this->category->method('getStoreId')->willReturn(1);
- 
-         $result1 = ['test'];
-         $this->categoryUrlRewriteGeneratorMock->expects($this->once())
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductUrlKeyAutogeneratorObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductUrlKeyAutogeneratorObserverTest.php
-new file mode 100644
-index 00000000000..b9628caff84
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductUrlKeyAutogeneratorObserverTest.php
-@@ -0,0 +1,99 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogUrlRewrite\Test\Unit\Observer;
-+
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
-+
-+/**
-+ * Unit tests for \Magento\CatalogUrlRewrite\Observer\ProductUrlKeyAutogeneratorObserver class
-+ */
-+class ProductUrlKeyAutogeneratorObserverTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $productUrlPathGenerator;
-+
-+    /** @var \Magento\CatalogUrlRewrite\Observer\ProductUrlKeyAutogeneratorObserver */
-+    private $productUrlKeyAutogeneratorObserver;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-+    {
-+        $this->productUrlPathGenerator = $this->getMockBuilder(ProductUrlPathGenerator::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getUrlKey'])
-+            ->getMock();
-+
-+        $this->productUrlKeyAutogeneratorObserver = (new ObjectManagerHelper($this))->getObject(
-+            \Magento\CatalogUrlRewrite\Observer\ProductUrlKeyAutogeneratorObserver::class,
-+            [
-+                'productUrlPathGenerator' => $this->productUrlPathGenerator
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testExecuteWithUrlKey(): void
-+    {
-+        $urlKey = 'product_url_key';
-+
-+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setUrlKey'])
-+            ->getMock();
-+        $product->expects($this->atLeastOnce())->method('setUrlKey')->with($urlKey);
-+        $event = $this->getMockBuilder(\Magento\Framework\Event::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getProduct'])
-+            ->getMock();
-+        $event->expects($this->atLeastOnce())->method('getProduct')->willReturn($product);
-+        /** @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject $observer */
-+        $observer = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getEvent'])
-+            ->getMock();
-+        $observer->expects($this->atLeastOnce())->method('getEvent')->willReturn($event);
-+        $this->productUrlPathGenerator->expects($this->atLeastOnce())->method('getUrlKey')->with($product)
-+            ->willReturn($urlKey);
-+
-+        $this->productUrlKeyAutogeneratorObserver->execute($observer);
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testExecuteWithEmptyUrlKey(): void
-+    {
-+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setUrlKey'])
-+            ->getMock();
-+        $product->expects($this->never())->method('setUrlKey');
-+        $event = $this->getMockBuilder(\Magento\Framework\Event::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getProduct'])
-+            ->getMock();
-+        $event->expects($this->atLeastOnce())->method('getProduct')->willReturn($product);
-+        /** @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject $observer */
-+        $observer = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getEvent'])
-+            ->getMock();
-+        $observer->expects($this->atLeastOnce())->method('getEvent')->willReturn($event);
-+        $this->productUrlPathGenerator->expects($this->atLeastOnce())->method('getUrlKey')->with($product)
-+            ->willReturn(null);
-+
-+        $this->productUrlKeyAutogeneratorObserver->execute($observer);
-+    }
-+}
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php
-index b18597a42bf..06a89a9dd5e 100644
---- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php
-@@ -138,8 +138,14 @@ class UrlRewriteHandlerTest extends \PHPUnit\Framework\TestCase
-             ->willReturn(1);
-         $category->expects($this->any())
-             ->method('getData')
--            ->with('save_rewrites_history')
--            ->willReturn(true);
-+            ->withConsecutive(
-+                [$this->equalTo('save_rewrites_history')],
-+                [$this->equalTo('initial_setup_flag')]
-+            )
-+            ->willReturnOnConsecutiveCalls(
-+                true,
-+                null
-+            );
- 
-         /* @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject $childCategory1 */
-         $childCategory1 = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
-@@ -175,6 +181,7 @@ class UrlRewriteHandlerTest extends \PHPUnit\Framework\TestCase
-             ->method('addIdFilter')
-             ->willReturnSelf();
-         $productCollection->expects($this->any())->method('setStoreId')->willReturnSelf();
-+        $productCollection->expects($this->any())->method('addStoreFilter')->willReturnSelf();
-         $productCollection->expects($this->any())->method('addAttributeToSelect')->willReturnSelf();
-         $iterator = new \ArrayIterator([]);
-         $productCollection->expects($this->any())->method('getIterator')->will($this->returnValue($iterator));
-diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Webapi/Controller/Rest/InputParamsResolverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Webapi/Controller/Rest/InputParamsResolverTest.php
-new file mode 100644
-index 00000000000..8e705b2c09f
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Webapi/Controller/Rest/InputParamsResolverTest.php
-@@ -0,0 +1,116 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogUrlRewrite\Test\Unit\Plugin\Webapi\Controller\Rest;
-+
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Webapi\Controller\Rest\InputParamsResolver;
-+use Magento\CatalogUrlRewrite\Plugin\Webapi\Controller\Rest\InputParamsResolver as InputParamsResolverPlugin;
-+use Magento\Framework\Webapi\Rest\Request as RestRequest;
-+use Magento\Catalog\Model\Product;
-+use Magento\Webapi\Controller\Rest\Router\Route;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+
-+/**
-+ * Unit test for InputParamsResolver plugin
-+ */
-+class InputParamsResolverTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var string
-+     */
-+    private $saveRewritesHistory;
-+
-+    /**
-+     * @var array
-+     */
-+    private $requestBodyParams;
-+
-+    /**
-+     * @var array
-+     */
-+    private $result;
-+
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var InputParamsResolver|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $subject;
-+
-+    /**
-+     * @var RestRequest|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $request;
-+
-+    /**
-+     * @var Product|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $product;
-+
-+    /**
-+     * @var Route|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $route;
-+
-+    /**
-+     * @var InputParamsResolverPlugin
-+     */
-+    private $plugin;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->saveRewritesHistory = 'save_rewrites_history';
-+        $this->requestBodyParams = [
-+            'product' => [
-+                'sku' => 'test',
-+                'custom_attributes' => [
-+                    ['attribute_code' => $this->saveRewritesHistory, 'value' => 1]
-+                ]
-+            ]
-+        ];
-+
-+        $this->route = $this->createPartialMock(Route::class, ['getServiceMethod', 'getServiceClass']);
-+        $this->request = $this->createPartialMock(RestRequest::class, ['getBodyParams']);
-+        $this->request->expects($this->any())->method('getBodyParams')->willReturn($this->requestBodyParams);
-+        $this->subject = $this->createPartialMock(InputParamsResolver::class, ['getRoute']);
-+        $this->subject->expects($this->any())->method('getRoute')->willReturn($this->route);
-+        $this->product = $this->createPartialMock(Product::class, ['setData']);
-+
-+        $this->result = [false, $this->product, 'test'];
-+
-+        $this->objectManager = new ObjectManager($this);
-+        $this->plugin = $this->objectManager->getObject(
-+            InputParamsResolverPlugin::class,
-+            [
-+                'request' => $this->request
-+            ]
-+        );
-+    }
-+
-+    public function testAfterResolve()
-+    {
-+        $this->route->expects($this->once())
-+            ->method('getServiceClass')
-+            ->willReturn(ProductRepositoryInterface::class);
-+        $this->route->expects($this->once())
-+            ->method('getServiceMethod')
-+            ->willReturn('save');
-+        $this->product->expects($this->once())
-+            ->method('setData')
-+            ->with($this->saveRewritesHistory, true);
-+
-+        $this->plugin->afterResolve($this->subject, $this->result);
-+    }
-+}
-diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
-index e373d8c8c17..b4ceff96b50 100644
---- a/app/code/Magento/CatalogUrlRewrite/composer.json
-+++ b/app/code/Magento/CatalogUrlRewrite/composer.json
-@@ -16,6 +16,9 @@
-         "magento/module-ui": "*",
-         "magento/module-url-rewrite": "*"
-     },
-+    "suggest": {
-+        "magento/module-webapi": "*"
-+    },
-     "type": "magento2-module",
-     "license": [
-         "OSL-3.0",
-diff --git a/app/code/Magento/CatalogUrlRewrite/etc/adminhtml/system.xml b/app/code/Magento/CatalogUrlRewrite/etc/adminhtml/system.xml
-index 4aa2e7f40c7..1e1f4e86fa3 100644
---- a/app/code/Magento/CatalogUrlRewrite/etc/adminhtml/system.xml
-+++ b/app/code/Magento/CatalogUrlRewrite/etc/adminhtml/system.xml
-@@ -28,6 +28,15 @@
-                     <label>Create Permanent Redirect for URLs if URL Key Changed</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
-+                <field id="generate_category_product_rewrites" translate="label" type="select" sortOrder="6" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                    <label>Generate "category/product" URL Rewrites</label>
-+                    <backend_model>Magento\CatalogUrlRewrite\Model\TableCleaner</backend_model>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <comment>
-+                        <![CDATA[<strong style="color:red">Warning!</strong> Turning this option off will result in permanent removal of category/product URL rewrites without an ability to restore them.]]>
-+                    </comment>
-+                    <frontend_class>generate_category_product_rewrites</frontend_class>
-+                </field>
-             </group>
-         </section>
-     </system>
-diff --git a/app/code/Magento/CatalogUrlRewrite/etc/config.xml b/app/code/Magento/CatalogUrlRewrite/etc/config.xml
-new file mode 100644
-index 00000000000..d05c0b4b7aa
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/etc/config.xml
-@@ -0,0 +1,16 @@
-+<?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_Store:etc/config.xsd">
-+    <default>
-+        <catalog>
-+            <seo>
-+                <generate_category_product_rewrites>1</generate_category_product_rewrites>
-+            </seo>
-+        </catalog>
-+    </default>
-+</config>
-diff --git a/app/code/Magento/CatalogUrlRewrite/etc/db_schema.xml b/app/code/Magento/CatalogUrlRewrite/etc/db_schema.xml
-index 174173fa201..c8da5b59cf5 100644
---- a/app/code/Magento/CatalogUrlRewrite/etc/db_schema.xml
-+++ b/app/code/Magento/CatalogUrlRewrite/etc/db_schema.xml
-@@ -15,16 +15,16 @@
-                 comment="category_id"/>
-         <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="product_id"/>
--        <constraint xsi:type="foreign" name="CAT_URL_REWRITE_PRD_CTGR_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_URL_REWRITE_PRD_CTGR_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_url_rewrite_product_category" column="product_id"
-                     referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="FK_BB79E64705D7F17FE181F23144528FC8"
-+        <constraint xsi:type="foreign" referenceId="FK_BB79E64705D7F17FE181F23144528FC8"
-                     table="catalog_url_rewrite_product_category" column="url_rewrite_id" referenceTable="url_rewrite"
-                     referenceColumn="url_rewrite_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_URL_REWRITE_PRD_CTGR_CTGR_ID_CAT_CTGR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_URL_REWRITE_PRD_CTGR_CTGR_ID_CAT_CTGR_ENTT_ENTT_ID"
-                     table="catalog_url_rewrite_product_category" column="category_id"
-                     referenceTable="catalog_category_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="CATALOG_URL_REWRITE_PRODUCT_CATEGORY_CATEGORY_ID_PRODUCT_ID" indexType="btree">
-+        <index referenceId="CATALOG_URL_REWRITE_PRODUCT_CATEGORY_CATEGORY_ID_PRODUCT_ID" indexType="btree">
-             <column name="category_id"/>
-             <column name="product_id"/>
-         </index>
-diff --git a/app/code/Magento/CatalogUrlRewrite/etc/di.xml b/app/code/Magento/CatalogUrlRewrite/etc/di.xml
-index f6426677e8c..e6fbcaefd07 100644
---- a/app/code/Magento/CatalogUrlRewrite/etc/di.xml
-+++ b/app/code/Magento/CatalogUrlRewrite/etc/di.xml
-@@ -24,6 +24,9 @@
-     <type name="Magento\UrlRewrite\Model\StorageInterface">
-         <plugin name="storage_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Storage"/>
-     </type>
-+    <type name="Magento\CatalogUrlRewrite\Model\Storage\DbStorage">
-+        <plugin name="dynamic_storage_plugin" type="Magento\CatalogUrlRewrite\Plugin\DynamicCategoryRewrites"/>
-+    </type>
-     <type name="Magento\CatalogUrlRewrite\Model\Map\UrlRewriteFinder">
-         <arguments>
-             <argument name="urlRewriteClassNames" xsi:type="array">
-@@ -32,4 +35,14 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\UrlRewrite\Model\CompositeUrlFinder">
-+        <arguments>
-+            <argument name="children" xsi:type="array">
-+                <item name="catalog" xsi:type="array">
-+                    <item name="class" xsi:type="string">Magento\CatalogUrlRewrite\Model\Storage\DbStorage</item>
-+                    <item name="sortOrder" xsi:type="number">20</item>
-+                </item>
-+            </argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/CatalogUrlRewrite/etc/events.xml b/app/code/Magento/CatalogUrlRewrite/etc/events.xml
-index cc558fe81f1..728442acf7a 100644
---- a/app/code/Magento/CatalogUrlRewrite/etc/events.xml
-+++ b/app/code/Magento/CatalogUrlRewrite/etc/events.xml
-@@ -27,6 +27,9 @@
-     <event name="catalog_product_save_after">
-         <observer name="process_url_rewrite_saving" instance="Magento\CatalogUrlRewrite\Observer\ProductProcessUrlRewriteSavingObserver"/>
-     </event>
-+    <event name="catalog_product_attribute_update_before">
-+        <observer name="process_url_rewrite_on_change_product_visibility" instance="Magento\CatalogUrlRewrite\Observer\ProcessUrlRewriteOnChangeProductVisibilityObserver"/>
-+    </event>
-     <event name="catalog_category_save_before">
-         <observer name="category_url_path_autogeneration" instance="Magento\CatalogUrlRewrite\Observer\CategoryUrlPathAutogeneratorObserver"/>
-     </event>
-diff --git a/app/code/Magento/CatalogUrlRewrite/etc/frontend/di.xml b/app/code/Magento/CatalogUrlRewrite/etc/frontend/di.xml
-new file mode 100644
-index 00000000000..0c7ab27e51d
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/etc/frontend/di.xml
-@@ -0,0 +1,10 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+
-+</config>
-diff --git a/app/code/Magento/CatalogUrlRewrite/etc/webapi_rest/di.xml b/app/code/Magento/CatalogUrlRewrite/etc/webapi_rest/di.xml
-new file mode 100644
-index 00000000000..9c5186a5ec0
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/etc/webapi_rest/di.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\Webapi\Controller\Rest\InputParamsResolver">
-+        <plugin name="product_save_rewrites_history_rest_plugin" type="Magento\CatalogUrlRewrite\Plugin\Webapi\Controller\Rest\InputParamsResolver" sortOrder="1" disabled="false" />
-+    </type>
-+</config>
-diff --git a/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv b/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv
-index 2dce6b233cb..b3335dc3523 100644
---- a/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv
-+++ b/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv
-@@ -5,3 +5,4 @@
- "Product URL Suffix","Product URL Suffix"
- "Use Categories Path for Product URLs","Use Categories Path for Product URLs"
- "Create Permanent Redirect for URLs if URL Key Changed","Create Permanent Redirect for URLs if URL Key Changed"
-+"Generate "category/product" URL Rewrites","Generate "category/product" URL Rewrites"
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogUrlRewrite/view/adminhtml/layout/adminhtml_system_config_edit.xml b/app/code/Magento/CatalogUrlRewrite/view/adminhtml/layout/adminhtml_system_config_edit.xml
-new file mode 100644
-index 00000000000..c4766138843
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/view/adminhtml/layout/adminhtml_system_config_edit.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <body>
-+        <referenceContainer name="js">
-+            <block name="js.confirm_remove_old_urls" template="Magento_CatalogUrlRewrite::confirm.phtml"/>
-+        </referenceContainer>
-+    </body>
-+</page>
-diff --git a/app/code/Magento/CatalogUrlRewrite/view/adminhtml/templates/confirm.phtml b/app/code/Magento/CatalogUrlRewrite/view/adminhtml/templates/confirm.phtml
-new file mode 100644
-index 00000000000..800ecfd8a6e
---- /dev/null
-+++ b/app/code/Magento/CatalogUrlRewrite/view/adminhtml/templates/confirm.phtml
-@@ -0,0 +1,30 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+?>
-+<script>
-+    require([
-+        "jquery",
-+        "Magento_Ui/js/modal/confirm",
-+        "mage/translate",
-+    ], function(jQuery, confirmation, $t) {
-+    //confirmation for removing category/product URL rewrites
-+        jQuery('select.generate_category_product_rewrites').on('change', function () {
-+            if (this.value == 0) {
-+                confirmation({
-+                    title: $t('Turn off "category/products" URL rewrites?'),
-+                    content: $t('Turning off automatic generation of "category/products" URL rewrites will result in permanent removal of all the currently existing “category/product” type URL rewrites without an ability to restore them back. ' +
-+                        'This may potentially cause unresolved “category/product” type URL conflicts which you have to resolve by updating URL key manually.'),
-+                    actions: {
-+                        cancel: function () {
-+                            jQuery('select.generate_category_product_rewrites').val(1);
-+                            return false;
-+                        },
-+                    }
-+                })
-+            }
-+        });
-+    });
-+</script>
-diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/etc/module.xml b/app/code/Magento/CatalogUrlRewriteGraphQl/etc/module.xml
-index be4bb9fcd70..e6e0f6cf721 100644
---- a/app/code/Magento/CatalogUrlRewriteGraphQl/etc/module.xml
-+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/etc/module.xml
-@@ -6,5 +6,10 @@
-  */
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
--    <module name="Magento_CatalogUrlRewriteGraphQl" />
-+    <module name="Magento_CatalogUrlRewriteGraphQl" >
-+        <sequence>
-+            <module name="Magento_UrlRewriteGraphQl"/>
-+            <module name="Magento_CatalogGraphQl"/>
-+        </sequence>
-+    </module>
- </config>
-diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogUrlRewriteGraphQl/etc/schema.graphqls
-index b96cfcb03d4..89108e578d6 100644
---- a/app/code/Magento/CatalogUrlRewriteGraphQl/etc/schema.graphqls
-+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/etc/schema.graphqls
-@@ -3,17 +3,18 @@
- 
- interface ProductInterface {
-     url_key: String @doc(description: "The part of the URL that identifies the product")
--    url_path: String @doc(description: "The part of the URL that precedes the url_key")
-+    url_path: String @deprecated(reason: "Use product's `canonical_url` or url rewrites instead")
-+    url_rewrites: [UrlRewrite] @doc(description: "URL rewrites list") @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\UrlRewrite")
- }
- 
- input ProductFilterInput {
-     url_key: FilterTypeInput @doc(description: "The part of the URL that identifies the product")
--    url_path: FilterTypeInput @doc(description: "The part of the URL that precedes the url_key")
-+    url_path: FilterTypeInput @deprecated(reason: "Use product's `canonical_url` or url rewrites instead")
- }
- 
- input ProductSortInput {
-     url_key: SortEnum @doc(description: "The part of the URL that identifies the product")
--    url_path: SortEnum @doc(description: "The part of the URL that precedes the url_key")
-+    url_path: SortEnum @deprecated(reason: "Use product's `canonical_url` or url rewrites instead")
- }
- 
- enum UrlRewriteEntityTypeEnum @doc(description: "This enumeration defines the entity type.") {
-diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
-index 9a55f981b76..9e47830debf 100644
---- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
-+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
-@@ -6,16 +6,21 @@
- 
- namespace Magento\CatalogWidget\Block\Product;
- 
-+use Magento\Catalog\Model\Product;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\App\ActionInterface;
- use Magento\Framework\DataObject\IdentityInterface;
- use Magento\Framework\Pricing\PriceCurrencyInterface;
- use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Framework\View\LayoutFactory;
- use Magento\Widget\Block\BlockInterface;
-+use Magento\Framework\Url\EncoderInterface;
- 
- /**
-  * Catalog Products List widget block
-- * Class ProductsList
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-  */
- class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implements BlockInterface, IdentityInterface
- {
-@@ -94,6 +99,21 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-      */
-     private $json;
- 
-+    /**
-+     * @var LayoutFactory
-+     */
-+    private $layoutFactory;
-+
-+    /**
-+     * @var \Magento\Framework\Url\EncoderInterface|null
-+     */
-+    private $urlEncoder;
-+
-+    /**
-+     * @var \Magento\Framework\View\Element\RendererList
-+     */
-+    private $rendererListBlock;
-+
-     /**
-      * @param \Magento\Catalog\Block\Product\Context $context
-      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
-@@ -104,6 +124,10 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-      * @param \Magento\Widget\Helper\Conditions $conditionsHelper
-      * @param array $data
-      * @param Json|null $json
-+     * @param LayoutFactory|null $layoutFactory
-+     * @param \Magento\Framework\Url\EncoderInterface|null $urlEncoder
-+     *
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-         \Magento\Catalog\Block\Product\Context $context,
-@@ -114,7 +138,9 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-         \Magento\CatalogWidget\Model\Rule $rule,
-         \Magento\Widget\Helper\Conditions $conditionsHelper,
-         array $data = [],
--        Json $json = null
-+        Json $json = null,
-+        LayoutFactory $layoutFactory = null,
-+        EncoderInterface $urlEncoder = null
-     ) {
-         $this->productCollectionFactory = $productCollectionFactory;
-         $this->catalogProductVisibility = $catalogProductVisibility;
-@@ -123,6 +149,8 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-         $this->rule = $rule;
-         $this->conditionsHelper = $conditionsHelper;
-         $this->json = $json ?: ObjectManager::getInstance()->get(Json::class);
-+        $this->layoutFactory = $layoutFactory ?: ObjectManager::getInstance()->get(LayoutFactory::class);
-+        $this->urlEncoder = $urlEncoder ?: ObjectManager::getInstance()->get(EncoderInterface::class);
-         parent::__construct(
-             $context,
-             $data
-@@ -130,7 +158,9 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Internal constructor, that is called from real constructor
-+     *
-+     * @return void
-      */
-     protected function _construct()
-     {
-@@ -151,6 +181,7 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-      * Get key pieces for caching block content
-      *
-      * @return array
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     public function getCacheKeyInfo()
-     {
-@@ -164,8 +195,9 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-             $this->_storeManager->getStore()->getId(),
-             $this->_design->getDesignTheme()->getId(),
-             $this->httpContext->getValue(\Magento\Customer\Model\Context::CONTEXT_GROUP),
--            intval($this->getRequest()->getParam($this->getData('page_var_name'), 1)),
-+            (int) $this->getRequest()->getParam($this->getData('page_var_name'), 1),
-             $this->getProductsPerPage(),
-+            $this->getProductsCount(),
-             $conditions,
-             $this->json->serialize($this->getRequest()->getParams()),
-             $this->getTemplate(),
-@@ -174,7 +206,7 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-     public function getProductPriceHtml(
-@@ -196,22 +228,62 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-             ? $arguments['display_minimal_price']
-             : true;
- 
--            /** @var \Magento\Framework\Pricing\Render $priceRender */
-+        /** @var \Magento\Framework\Pricing\Render $priceRender */
-         $priceRender = $this->getLayout()->getBlock('product.price.render.default');
--
--        $price = '';
--        if ($priceRender) {
--            $price = $priceRender->render(
--                \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
--                $product,
--                $arguments
-+        if (!$priceRender) {
-+            $priceRender = $this->getLayout()->createBlock(
-+                \Magento\Framework\Pricing\Render::class,
-+                'product.price.render.default',
-+                ['data' => ['price_render_handle' => 'catalog_product_prices']]
-             );
-         }
-+
-+        $price = $priceRender->render(
-+            \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-+            $product,
-+            $arguments
-+        );
-+
-         return $price;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     */
-+    protected function getDetailsRendererList()
-+    {
-+        if (empty($this->rendererListBlock)) {
-+            /** @var $layout \Magento\Framework\View\LayoutInterface */
-+            $layout = $this->layoutFactory->create(['cacheable' => false]);
-+            $layout->getUpdate()->addHandle('catalog_widget_product_list')->load();
-+            $layout->generateXml();
-+            $layout->generateElements();
-+
-+            $this->rendererListBlock = $layout->getBlock('category.product.type.widget.details.renderers');
-+        }
-+        return $this->rendererListBlock;
-+    }
-+
-+    /**
-+     * Get post parameters.
-+     *
-+     * @param Product $product
-+     * @return array
-+     */
-+    public function getAddToCartPostParams(Product $product)
-+    {
-+        $url = $this->getAddToCartUrl($product);
-+        return [
-+            'action' => $url,
-+            'data' => [
-+                'product' => $product->getEntityId(),
-+                ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlEncoder->encode($url),
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * @inheritdoc
-      */
-     protected function _beforeToHtml()
-     {
-@@ -223,15 +295,22 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-      * Prepare and return product collection
-      *
-      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     public function createCollection()
-     {
-         /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
-         $collection = $this->productCollectionFactory->create();
-+
-+        if ($this->getData('store_id') !== null) {
-+            $collection->setStoreId($this->getData('store_id'));
-+        }
-+
-         $collection->setVisibility($this->catalogProductVisibility->getVisibleInCatalogIds());
- 
-         $collection = $this->_addProductAttributesAndPrices($collection)
-             ->addStoreFilter()
-+            ->addAttributeToSort('created_at', 'desc')
-             ->setPageSize($this->getPageSize())
-             ->setCurPage($this->getRequest()->getParam($this->getData('page_var_name'), 1));
- 
-@@ -249,6 +328,8 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-     }
- 
-     /**
-+     * Get conditions
-+     *
-      * @return \Magento\Rule\Model\Condition\Combine
-      */
-     protected function getConditions()
-@@ -338,7 +419,7 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-             if (!$this->pager) {
-                 $this->pager = $this->getLayout()->createBlock(
-                     \Magento\Catalog\Block\Product\Widget\Html\Pager::class,
--                    'widget.products.list.pager'
-+                    $this->getWidgetPagerBlockName()
-                 );
- 
-                 $this->pager->setUseContainer(true)
-@@ -386,8 +467,9 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-     }
- 
-     /**
--     * @return PriceCurrencyInterface
-+     * Get currency of product
-      *
-+     * @return PriceCurrencyInterface
-      * @deprecated 100.2.0
-      */
-     private function getPriceCurrency()
-@@ -398,4 +480,37 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
-         }
-         return $this->priceCurrency;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getAddToCartUrl($product, $additional = [])
-+    {
-+        $requestingPageUrl = $this->getRequest()->getParam('requesting_page_url');
-+
-+        if (!empty($requestingPageUrl)) {
-+            $additional['useUencPlaceholder'] = true;
-+            $url = parent::getAddToCartUrl($product, $additional);
-+            return str_replace('%25uenc%25', $this->urlEncoder->encode($requestingPageUrl), $url);
-+        }
-+
-+        return parent::getAddToCartUrl($product, $additional);
-+    }
-+
-+    /**
-+     * Get widget block name
-+     *
-+     * @return string
-+     */
-+    private function getWidgetPagerBlockName()
-+    {
-+        $pageName = $this->getData('page_var_name');
-+        $pagerBlockName = 'widget.products.list.pager';
-+
-+        if (!$pageName) {
-+            return $pagerBlockName;
-+        }
-+
-+        return $pagerBlockName . '.' . $pageName;
-+    }
- }
-diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
-index 29adc1816d3..e5fb20a58ae 100644
---- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
-+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
-@@ -9,6 +9,7 @@
-  */
- namespace Magento\CatalogWidget\Model\Rule\Condition;
- 
-+use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Model\ProductCategoryList;
- 
- /**
-@@ -77,17 +78,22 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function loadAttributeOptions()
-     {
-         $productAttributes = $this->_productResource->loadAllAttributes()->getAttributesByCode();
-+        $productAttributes = array_filter(
-+            $productAttributes,
-+            function ($attribute) {
-+                return $attribute->getFrontendLabel() &&
-+                    $attribute->getFrontendInput() !== 'text' &&
-+                    $attribute->getAttributeCode() !== ProductInterface::STATUS;
-+            }
-+        );
- 
-         $attributes = [];
-         foreach ($productAttributes as $attribute) {
--            if (!$attribute->getFrontendLabel() || $attribute->getFrontendInput() == 'text') {
--                continue;
--            }
-             $attributes[$attribute->getAttributeCode()] = $attribute->getFrontendLabel();
-         }
- 
-diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/ActionGroup/AdminCreateBlockWithWidgetActionGroup.xml b/app/code/Magento/CatalogWidget/Test/Mftf/ActionGroup/AdminCreateBlockWithWidgetActionGroup.xml
-new file mode 100644
-index 00000000000..1f54ff40283
---- /dev/null
-+++ b/app/code/Magento/CatalogWidget/Test/Mftf/ActionGroup/AdminCreateBlockWithWidgetActionGroup.xml
-@@ -0,0 +1,49 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateBlockWithWidget">
-+        <arguments>
-+            <argument name="addCondition" type="string"/>
-+            <argument name="isCondition" type="string"/>
-+            <argument name="fieldCondition" type="string"/>
-+        </arguments>
-+
-+        <click stepKey="clickShowHideButton" selector="{{BlockWYSIWYGSection.ShowHideBtn}}"/>
-+        <waitForElementVisible stepKey="waitForInsertWidgetButton" selector="{{CatalogWidgetSection.insertWidgetButton}}"/>
-+
-+        <selectOption stepKey="selectAllStoreView" userInput="All Store Views" selector="{{CatalogWidgetSection.storeViewOption}}"/>
-+        <fillField selector="{{BlockContentSection.TextArea}}" userInput="" stepKey="makeContentFieldEmpty"/>
-+
-+        <click selector="{{CatalogWidgetSection.insertWidgetButton}}" stepKey="clickInsertWidgetButton"/>
-+        <waitForElementVisible stepKey="waitForInsertWidgetFrame" selector="{{InsertWidgetSection.widgetTypeDropDown}}" time="10"/>
-+
-+        <selectOption selector="{{InsertWidgetSection.widgetTypeDropDown}}" userInput="Catalog Products List" stepKey="selectCatalogProductListOption"/>
-+        <waitForElementVisible stepKey="waitForConditionsElementBecomeAvailable" selector="{{InsertWidgetSection.conditionsAddButton}}"/>
-+
-+        <click selector="{{InsertWidgetSection.conditionsAddButton}}" stepKey="clickToAddCondition"/>
-+        <waitForElementVisible stepKey="waitForSelectBoxOpened" selector="{{InsertWidgetSection.conditionsSelectBox}}"/>
-+
-+        <selectOption selector="{{InsertWidgetSection.conditionsSelectBox}}" userInput="{{addCondition}}" stepKey="selectConditionsSelectBox"/>
-+        <waitForElementVisible stepKey="seeConditionsAdded" selector="{{InsertWidgetSection.addCondition('1')}}"/>
-+
-+        <click selector="{{InsertWidgetSection.conditionIs}}" stepKey="clickToConditionIs"/>
-+        <selectOption selector="{{InsertWidgetSection.conditionOperator('1')}}" stepKey="selectOperatorGreaterThan" userInput="{{isCondition}}"/>
-+
-+        <click selector="{{InsertWidgetSection.addCondition('1')}}" stepKey="clickAddConditionItem"/>
-+        <waitForElementVisible stepKey="waitForConditionFieldOpened" selector="{{InsertWidgetSection.conditionField('1')}}"/>
-+
-+        <fillField selector="{{InsertWidgetSection.conditionField('1')}}" stepKey="setOperator" userInput="{{fieldCondition}}"/>
-+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget"/>
-+
-+        <waitForElementVisible stepKey="waitForInsertWidgetSaved" selector="{{InsertWidgetSection.save}}"/>
-+        <click stepKey="clickSaveButton" selector="{{InsertWidgetSection.save}}"/>
-+        <see userInput="You saved the block." stepKey="seeSavedBlockMsgOnForm"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/Section/CatalogWidgetSection.xml b/app/code/Magento/CatalogWidget/Test/Mftf/Section/CatalogWidgetSection.xml
-new file mode 100644
-index 00000000000..855d325c985
---- /dev/null
-+++ b/app/code/Magento/CatalogWidget/Test/Mftf/Section/CatalogWidgetSection.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="CatalogWidgetSection">
-+        <element name="insertWidgetButton" type="button" selector=".scalable.action-add-widget.plugin"/>
-+        <element name="storeViewOption" type="button" selector="//*[@name='store_id']"/>
-+    </section>
-+
-+    <section name="InsertWidgetSection">
-+        <element name="widgetTypeDropDown" type="select" selector="#select_widget_type"/>
-+        <element name="conditionsAddButton" type="button" selector=".rule-param.rule-param-new-child"/>
-+        <element name="conditionsSelectBox" type="button" selector="#conditions__1__new_child"/>
-+        <element name="addCondition" type="button" selector="//*[@id='conditions__1--{{arg1}}__value']/../preceding-sibling::a" parameterized="true"/>
-+        <element name="conditionField" type="button" selector="#conditions__1--{{arg2}}__value" parameterized="true"/>
-+        <element name="save" type="button" selector="#save-button"/>
-+        <element name="conditionIs" type="button" selector="//*[@id='conditions__1--1__attribute']/following-sibling::span[1]"/>
-+        <element name="conditionOperator" type="button" selector="#conditions__1--{{arg3}}__operator" parameterized="true"/>
-+        <element name="checkElementStorefrontByPrice" type="button" selector="//*[@class='product-items widget-product-grid']//*[contains(text(),'${{arg4}}.00')]" parameterized="true"/>
-+        <element name="checkElementStorefrontByName" type="button" selector="//*[@class='product-items widget-product-grid']//*[@class='product-item'][{{productPosition}}]//a[contains(text(), '{{productName}}')]" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/Section/ProductListWidgetSection.xml b/app/code/Magento/CatalogWidget/Test/Mftf/Section/ProductListWidgetSection.xml
-new file mode 100644
-index 00000000000..03bef8ffa3b
---- /dev/null
-+++ b/app/code/Magento/CatalogWidget/Test/Mftf/Section/ProductListWidgetSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="ProductListWidgetSection">
-+        <element name="AddToCartByName" type="button" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{arg1}}')]]//button[contains(@class,'tocart')]" parameterized="true"/>
-+        <element name="AddToCompareByName" type="button" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{arg1}}')]]//button[contains(@class,'tocompare')]" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml b/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml
-new file mode 100644
-index 00000000000..32bea8b604c
---- /dev/null
-+++ b/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml
-@@ -0,0 +1,157 @@
-+<?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="CatalogProductListWidgetOperatorsTest">
-+        <annotations>
-+            <features value="CatalogWidget"/>
-+            <stories value="MAGETWO-91609: Problems with operator more/less in the 'catalog Products List' widget"/>
-+            <title value="Checking operator more/less in the 'catalog Products List' widget"/>
-+            <description value="Check 'less than', 'equals or greater than', 'equals or less than' operators"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94479"/>
-+            <group value="CatalogWidget"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="simplecategory"/>
-+            <createData entity="SimpleProduct" stepKey="createFirstProduct">
-+                <requiredEntity createDataKey="simplecategory"/>
-+                <field key="price">10</field>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createSecondProduct">
-+                <requiredEntity createDataKey="simplecategory"/>
-+                <field key="price">50</field>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createThirdProduct">
-+                <requiredEntity createDataKey="simplecategory"/>
-+                <field key="price">100</field>
-+            </createData>
-+
-+            <createData entity="_defaultBlock" stepKey="createPreReqBlock"/>
-+            <!--User log in on back-end as admin-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-+        </before>
-+
-+        <!--Open block with widget.-->
-+        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage1">
-+            <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminCreateBlockWithWidget" stepKey="adminCreateBlockWithWidget">
-+            <argument name="addCondition" value="Price"/>
-+            <argument name="isCondition" value="greater than"/>
-+            <argument name="fieldCondition" value="20"/>
-+        </actionGroup>
-+
-+        <!--Go to Catalog > Categories (choose category where created products)-->
-+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="onCategoryIndexPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoadAddProducts" after="onCategoryIndexPage"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickExpandAll" after="waitForCategoryPageLoadAddProducts"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="clickCategoryLink"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+
-+        <!--Content > Add CMS Block: name saved block-->
-+        <waitForElementVisible selector="{{AdminCategoryContentSection.sectionHeader}}" stepKey="waitForContentSection"/>
-+        <conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="openContentSection"/>
-+        <waitForPageLoad stepKey="waitForContentLoad"/>
-+
-+        <selectOption selector="{{AdminCategoryContentSection.AddCMSBlock}}" stepKey="selectSavedBlock" userInput="{{_defaultBlock.title}}"/>
-+
-+        <!--Display Settings > Display Mode: Static block only-->
-+        <waitForElementVisible selector="{{AdminCategoryDisplaySettingsSection.settingsHeader}}" stepKey="waitForDisplaySettingsSection"/>
-+        <conditionalClick selector="{{AdminCategoryDisplaySettingsSection.settingsHeader}}" dependentSelector="{{AdminCategoryDisplaySettingsSection.displayMode}}" visible="false" stepKey="openDisplaySettingsSection"/>
-+        <waitForPageLoad stepKey="waitForDisplaySettingsLoad"/>
-+        <selectOption stepKey="selectStaticBlockOnlyOption" userInput="Static block only" selector="{{AdminCategoryDisplaySettingsSection.displayMode}}"/>
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryWithProducts"/>
-+        <waitForPageLoad stepKey="waitForCategorySaved"/>
-+        <see userInput="You saved the category." stepKey="seeSuccessMessage"/>
-+
-+        <!--Go to Storefront > category-->
-+        <amOnPage url="$$simplecategory.name$$.html" stepKey="goToStorefrontCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontPageLoaded"/>
-+
-+        <!--Check operators Greater than-->
-+        <dontSeeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('10')}}" stepKey="dontSeeElementByPrice20"/>
-+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('50')}}" stepKey="seeElementByPrice50"/>
-+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('100')}}" stepKey="seeElementByPrice100"/>
-+
-+        <!--Open block with widget.-->
-+        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage2">
-+            <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminCreateBlockWithWidget" stepKey="adminCreateBlockWithWidgetLessThan">
-+            <argument name="addCondition" value="Price"/>
-+            <argument name="isCondition" value="less than"/>
-+            <argument name="fieldCondition" value="20"/>
-+        </actionGroup>
-+
-+        <!--Go to Storefront > category-->
-+        <amOnPage url="$$simplecategory.name$$.html" stepKey="goToStorefrontCategoryPage2"/>
-+        <waitForPageLoad stepKey="waitForStorefrontPageLoaded2"/>
-+
-+        <!--Check operators Greater than-->
-+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('10')}}" stepKey="seeElementByPrice20"/>
-+        <dontSeeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('50')}}" stepKey="dontSeeElementByPrice50"/>
-+        <dontSeeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('100')}}" stepKey="dontSeeElementByPrice100"/>
-+
-+        <!--Open block with widget.-->
-+        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage3">
-+            <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminCreateBlockWithWidget" stepKey="adminCreateBlockWithWidgetEqualsOrGreaterThan">
-+            <argument name="addCondition" value="Price"/>
-+            <argument name="isCondition" value="equals or greater than"/>
-+            <argument name="fieldCondition" value="50"/>
-+        </actionGroup>
-+
-+        <!--Go to Storefront > category-->
-+        <amOnPage url="$$simplecategory.name$$.html" stepKey="goToStorefrontCategoryPage3"/>
-+        <waitForPageLoad stepKey="waitForStorefrontPageLoaded3"/>
-+
-+        <!--Check operators Greater than-->
-+        <dontSeeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('10')}}" stepKey="dontSeeElementByPrice20s"/>
-+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('50')}}" stepKey="seeElementByPrice50s"/>
-+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('100')}}" stepKey="seeElementByPrice100s"/>
-+
-+        <!--Open block with widget.-->
-+        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage4">
-+            <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminCreateBlockWithWidget" stepKey="adminCreateBlockWithWidgetEqualsOrLessThan">
-+            <argument name="addCondition" value="Price"/>
-+            <argument name="isCondition" value="equals or less than"/>
-+            <argument name="fieldCondition" value="50"/>
-+        </actionGroup>
-+
-+        <!--Go to Storefront > category-->
-+        <amOnPage url="$$simplecategory.name$$.html" stepKey="goToStorefrontCategoryPage4"/>
-+        <waitForPageLoad stepKey="waitForStorefrontPageLoaded4"/>
-+
-+        <!--Check operators Greater than-->
-+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('10')}}" stepKey="seeElementByPrice20s"/>
-+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('50')}}" stepKey="seeElementByPrice50t"/>
-+        <dontSeeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('100')}}" stepKey="dontSeeElementByPrice100s"/>
-+
-+        <after>
-+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-+            <deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
-+            <deleteData createDataKey="simplecategory" stepKey="deleteSimpleCategory"/>
-+            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
-+            <deleteData createDataKey="createSecondProduct" stepKey="deleteSecondProduct"/>
-+            <deleteData createDataKey="createThirdProduct" stepKey="deleteThirdProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOrderTest.xml b/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOrderTest.xml
-new file mode 100644
-index 00000000000..11586207c4d
---- /dev/null
-+++ b/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOrderTest.xml
-@@ -0,0 +1,88 @@
-+<?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="CatalogProductListWidgetOrderTest">
-+        <annotations>
-+            <features value="CatalogWidget"/>
-+            <stories value="MC-5905: Wrong sorting on Products component"/>
-+            <title value="Checking order of products in the 'catalog Products List' widget"/>
-+            <description value="Check that products are ordered with recently added products first"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-13794"/>
-+            <group value="CatalogWidget"/>
-+            <group value="WYSIWYGDisabled"/>
-+            <skip>
-+                <issueId value="MC-13923"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="simplecategory"/>
-+            <createData entity="SimpleProduct" stepKey="createFirstProduct">
-+                <requiredEntity createDataKey="simplecategory"/>
-+                <field key="price">10</field>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createSecondProduct">
-+                <requiredEntity createDataKey="simplecategory"/>
-+                <field key="price">20</field>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createThirdProduct">
-+                <requiredEntity createDataKey="simplecategory"/>
-+                <field key="price">30</field>
-+            </createData>
-+            <createData entity="_defaultCmsPage" stepKey="createPreReqPage"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-+        </before>
-+        <!--Open created cms page-->
-+        <comment userInput="Open created cms page" stepKey="commentOpenCreatedCmsPage"/>
-+        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage1">
-+            <argument name="CMSPage" value="$$createPreReqPage$$"/>
-+        </actionGroup>
-+        <!--Add widget to cms page-->
-+        <comment userInput="Add widget to cms page" stepKey="commentAddWidgetToCmsPage"/>
-+        <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
-+        <waitForPageLoad stepKey="waitForPageLoad1" />
-+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Products List" stepKey="selectCatalogProductsList" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear1" />
-+        <click selector="{{WidgetSection.AddParam}}" stepKey="clickAddParamBtn" />
-+        <waitForElementVisible selector="{{WidgetSection.ConditionsDropdown}}" stepKey="waitForDropdownVisible"/>
-+        <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="Category" stepKey="selectCategoryCondition" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear2" />
-+        <click selector="{{WidgetSection.RuleParam}}" stepKey="clickRuleParam" />
-+        <waitForElementVisible selector="{{WidgetSection.Chooser}}" stepKey="waitForElement" />
-+        <click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear3" />
-+        <click selector="{{WidgetSection.PreCreateCategory('$$simplecategory.name$$')}}" stepKey="selectCategory" />
-+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
-+        <waitForPageLoad stepKey="waitForPageLoad2" />
-+        <!--Save cms page and go to Storefront-->
-+        <comment userInput="Save cms page and go to Storefront" stepKey="commentSaveCmsPageAndGoToStorefront"/>
-+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
-+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
-+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-+        <amOnPage url="$$createPreReqPage.identifier$$" stepKey="amOnPageTestPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad3" />
-+        <!--Check order of products: recently added first-->
-+        <comment userInput="Check order of products: recently added first" stepKey="commentCheckOrderOfProductsRecentlyAddedFirst"/>
-+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByName('1','$$createThirdProduct.name$$')}}" stepKey="seeElementByName1"/>
-+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByName('2','$$createSecondProduct.name$$')}}" stepKey="seeElementByName2"/>
-+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByName('3','$$createFirstProduct.name$$')}}" stepKey="seeElementByName3"/>
-+        <after>
-+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-+            <deleteData createDataKey="createPreReqPage" stepKey="deletePreReqPage" />
-+            <deleteData createDataKey="simplecategory" stepKey="deleteSimpleCategory"/>
-+            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
-+            <deleteData createDataKey="createSecondProduct" stepKey="deleteSecondProduct"/>
-+            <deleteData createDataKey="createThirdProduct" stepKey="deleteThirdProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php b/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php
-index 5de8b9d9632..a7897537957 100644
---- a/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php
-+++ b/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php
-@@ -167,6 +167,7 @@ class ProductsListTest extends \PHPUnit\Framework\TestCase
-             'context_group',
-             1,
-             5,
-+            10,
-             'some_serialized_conditions',
-             json_encode('request_params'),
-             'test_template',
-@@ -274,6 +275,7 @@ class ProductsListTest extends \PHPUnit\Framework\TestCase
-                 'addAttributeToSelect',
-                 'addUrlRewrite',
-                 'addStoreFilter',
-+                'addAttributeToSort',
-                 'setPageSize',
-                 'setCurPage',
-                 'distinct'
-@@ -288,6 +290,7 @@ class ProductsListTest extends \PHPUnit\Framework\TestCase
-         $collection->expects($this->once())->method('addAttributeToSelect')->willReturnSelf();
-         $collection->expects($this->once())->method('addUrlRewrite')->willReturnSelf();
-         $collection->expects($this->once())->method('addStoreFilter')->willReturnSelf();
-+        $collection->expects($this->once())->method('addAttributeToSort')->with('created_at', 'desc')->willReturnSelf();
-         $collection->expects($this->once())->method('setPageSize')->with($expectedPageSize)->willReturnSelf();
-         $collection->expects($this->once())->method('setCurPage')->willReturnSelf();
-         $collection->expects($this->once())->method('distinct')->willReturnSelf();
-diff --git a/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml b/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml
-index d40cc3dc6d9..0e21f9e42c9 100644
---- a/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml
-+++ b/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\CatalogWidget\Block\Product\Widget\Conditions $block */
- 
- $element = $block->getElement();
-diff --git a/app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml b/app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml
-new file mode 100644
-index 00000000000..db44d8b62dc
---- /dev/null
-+++ b/app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml
-@@ -0,0 +1,17 @@
-+<!--
-+  ~ Copyright © Magento, Inc. All rights reserved.
-+  ~ See COPYING.txt for license details.
-+  -->
-+
-+<!--
-+  ~ Copyright © Magento, Inc. All rights reserved.
-+  ~ See COPYING.txt for license details.
-+  -->
-+
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <body>
-+        <block class="Magento\Framework\View\Element\RendererList" name="category.product.type.widget.details.renderers">
-+            <block class="Magento\Framework\View\Element\Template" name="category.product.type.details.renderers.default" as="default"/>
-+        </block>
-+    </body>
-+</page>
-\ No newline at end of file
-diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
-index f2273f7d44f..881d8b28dfa 100644
---- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
-+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
-@@ -3,13 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
-+use Magento\Framework\App\Action\Action;
- 
- /** @var \Magento\CatalogWidget\Block\Product\ProductsList $block */
- ?>
--<?php if ($exist = ($block->getProductCollection() && $block->getProductCollection()->getSize())): ?>
--<?php
-+<?php if ($exist = ($block->getProductCollection() && $block->getProductCollection()->getSize())) : ?>
-+    <?php
-     $type = 'widget-product-grid';
- 
-     $mode = 'grid';
-@@ -20,21 +19,21 @@
-     $showWishlist = true;
-     $showCompare = true;
-     $showCart = true;
--    $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::DEFAULT_VIEW;
-+    $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
-     $description = false;
--?>
-+    ?>
-     <div class="block widget block-products-list <?= /* @noEscape */ $mode ?>">
--        <?php if ($block->getTitle()): ?>
--        <div class="block-title">
--            <strong><?= $block->escapeHtml(__($block->getTitle())) ?></strong>
--        </div>
-+        <?php if ($block->getTitle()) : ?>
-+            <div class="block-title">
-+                <strong><?= $block->escapeHtml(__($block->getTitle())) ?></strong>
-+            </div>
-         <?php endif ?>
-         <div class="block-content">
-             <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
-             <div class="products-<?= /* @noEscape */ $mode ?> <?= /* @noEscape */ $mode ?>">
-                 <ol class="product-items <?= /* @noEscape */ $type ?>">
-                     <?php $iterator = 1; ?>
--                    <?php foreach ($items as $_item): ?>
-+                    <?php foreach ($items as $_item) : ?>
-                         <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                         <div class="product-item-info">
-                             <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
-@@ -48,57 +47,57 @@
-                                         <?= $block->escapeHtml($_item->getName()) ?>
-                                     </a>
-                                 </strong>
--                                <?php
--                                echo $block->getProductPriceHtml($_item, $type);
--                                ?>
--
--                                <?php if ($templateType): ?>
-+                                <?php if ($templateType) : ?>
-                                     <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
-                                 <?php endif; ?>
- 
--                                <?php if ($showWishlist || $showCompare || $showCart): ?>
--                                    <div class="product-item-actions">
--                                        <?php if ($showCart): ?>
--                                            <div class="actions-primary">
--                                                <?php if ($_item->isSaleable()): ?>
--                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
--                                                        <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
--                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
--                                                        </button>
--                                                    <?php else: ?>
--                                                        <?php
--                                                        $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
--                                                        $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
--                                                        ?>
--                                                        <button class="action tocart primary" data-post='<?= /* @noEscape */ $postData ?>' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
--                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
--                                                        </button>
-+                                <?= $block->getProductPriceHtml($_item, $type) ?>
-+
-+                                <?= $block->getProductDetailsHtml($_item) ?>
-+
-+                                <?php if ($showWishlist || $showCompare || $showCart) : ?>
-+                                    <div class="product-item-inner">
-+                                        <div class="product-item-actions">
-+                                            <?php if ($showCart) : ?>
-+                                                <div class="actions-primary">
-+                                                    <?php if ($_item->isSaleable()) : ?>
-+                                                        <?php $postParams = $block->getAddToCartPostParams($_item); ?>
-+                                                        <form data-role="tocart-form" data-product-sku="<?= $block->escapeHtml($_item->getSku()) ?>" action="<?= $block->escapeUrl($postParams['action']) ?>" method="post">
-+                                                            <input type="hidden" name="product" value="<?= $block->escapeHtmlAttr($postParams['data']['product']) ?>">
-+                                                            <input type="hidden" name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>" value="<?= /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
-+                                                            <?= $block->getBlockHtml('formkey') ?>
-+                                                            <button type="submit"
-+                                                                    title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
-+                                                                    class="action tocart primary">
-+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-+                                                            </button>
-+                                                        </form>
-+                                                    <?php else : ?>
-+                                                        <?php if ($_item->getIsSalable()) : ?>
-+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-+                                                        <?php else : ?>
-+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-+                                                        <?php endif; ?>
-+                                                    <?php endif; ?>
-+                                                </div>
-+                                            <?php endif; ?>
-+                                            <?php if ($showWishlist || $showCompare) : ?>
-+                                                <div class="actions-secondary" data-role="add-to-links">
-+                                                    <?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) : ?>
-+                                                        <a href="#"
-+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
-+                                                        </a>
-                                                     <?php endif; ?>
--                                                <?php else: ?>
--                                                    <?php if ($_item->getIsSalable()): ?>
--                                                        <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
--                                                    <?php else: ?>
--                                                        <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare) : ?>
-+                                                        <?php $compareHelper = $this->helper(\Magento\Catalog\Helper\Product\Compare::class);?>
-+                                                        <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
-+                                                        </a>
-                                                     <?php endif; ?>
--                                                <?php endif; ?>
--                                            </div>
--                                        <?php endif; ?>
--                                        <?php if ($showWishlist || $showCompare): ?>
--                                            <div class="actions-secondary" data-role="add-to-links">
--                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
--                                                    <a href="#"
--                                                       data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
--                                                        <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
--                                                    </a>
--                                                <?php endif; ?>
--                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
--                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
--                                                    <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
--                                                        <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
--                                                    </a>
--                                                <?php endif; ?>
--                                            </div>
--                                        <?php endif; ?>
-+                                                </div>
-+                                            <?php endif; ?>
-+                                        </div>
-                                     </div>
-                                 <?php endif; ?>
-                             </div>
-diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
-index a43f074d8df..4941bf8451b 100644
---- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
-+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
-@@ -85,7 +85,7 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
-     protected $priceCurrency;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     public $moduleManager;
- 
-@@ -105,7 +105,7 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
-      * @param \Magento\Framework\Url\Helper\Data $urlHelper
-      * @param \Magento\Framework\Message\ManagerInterface $messageManager
-      * @param PriceCurrencyInterface $priceCurrency
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param InterpretationStrategyInterface $messageInterpretationStrategy
-      * @param array $data
-      * @param ItemResolverInterface|null $itemResolver
-@@ -120,7 +120,7 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
-         \Magento\Framework\Url\Helper\Data $urlHelper,
-         \Magento\Framework\Message\ManagerInterface $messageManager,
-         PriceCurrencyInterface $priceCurrency,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         InterpretationStrategyInterface $messageInterpretationStrategy,
-         array $data = [],
-         ItemResolverInterface $itemResolver = null
-@@ -185,6 +185,8 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
-     }
- 
-     /**
-+     * Override product url.
-+     *
-      * @param string $productUrl
-      * @return $this
-      * @codeCoverageIgnore
-@@ -313,11 +315,7 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
-     }
- 
-     /**
--     * Retrieve item messages
--     * Return array with keys
--     *
--     * text => the message text
--     * type => type of a message
-+     * Retrieve item messages, return array with keys, text => the message text, type => type of a message
-      *
-      * @return array
-      */
-@@ -472,6 +470,8 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
-     }
- 
-     /**
-+     * Get price renderer.
-+     *
-      * @return \Magento\Framework\Pricing\Render
-      * @codeCoverageIgnore
-      */
-diff --git a/app/code/Magento/Checkout/Block/Cart/Link.php b/app/code/Magento/Checkout/Block/Cart/Link.php
-index abc1ce4e310..6ea51375211 100644
---- a/app/code/Magento/Checkout/Block/Cart/Link.php
-+++ b/app/code/Magento/Checkout/Block/Cart/Link.php
-@@ -13,7 +13,7 @@ namespace Magento\Checkout\Block\Cart;
- class Link extends \Magento\Framework\View\Element\Html\Link
- {
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $_moduleManager;
- 
-@@ -24,14 +24,14 @@ class Link extends \Magento\Framework\View\Element\Html\Link
- 
-     /**
-      * @param \Magento\Framework\View\Element\Template\Context $context
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Checkout\Helper\Cart $cartHelper
-      * @param array $data
-      * @codeCoverageIgnore
-      */
-     public function __construct(
-         \Magento\Framework\View\Element\Template\Context $context,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Checkout\Helper\Cart $cartHelper,
-         array $data = []
-     ) {
-@@ -41,6 +41,8 @@ class Link extends \Magento\Framework\View\Element\Html\Link
-     }
- 
-     /**
-+     * Get label.
-+     *
-      * @return string
-      * @codeCoverageIgnore
-      */
-@@ -50,6 +52,8 @@ class Link extends \Magento\Framework\View\Element\Html\Link
-     }
- 
-     /**
-+     * Get href.
-+     *
-      * @return string
-      * @codeCoverageIgnore
-      */
-diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
-index 92ba6bf2bbb..c5e309df3ca 100644
---- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
-+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
-@@ -82,11 +82,14 @@ class Sidebar extends AbstractCart
-             'baseUrl' => $this->getBaseUrl(),
-             'minicartMaxItemsVisible' => $this->getMiniCartMaxItemsCount(),
-             'websiteId' => $this->_storeManager->getStore()->getWebsiteId(),
--            'maxItemsToDisplay' => $this->getMaxItemsToDisplay()
-+            'maxItemsToDisplay' => $this->getMaxItemsToDisplay(),
-+            'storeId' => $this->_storeManager->getStore()->getId()
-         ];
-     }
- 
-     /**
-+     * Get serialized config
-+     *
-      * @return string
-      * @since 100.2.0
-      */
-@@ -96,6 +99,8 @@ class Sidebar extends AbstractCart
-     }
- 
-     /**
-+     * Get image html template
-+     *
-      * @return string
-      */
-     public function getImageHtmlTemplate()
-@@ -130,6 +135,7 @@ class Sidebar extends AbstractCart
-      *
-      * @return string
-      * @codeCoverageIgnore
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     public function getUpdateItemQtyUrl()
-     {
-@@ -141,6 +147,7 @@ class Sidebar extends AbstractCart
-      *
-      * @return string
-      * @codeCoverageIgnore
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     public function getRemoveItemUrl()
-     {
-@@ -210,6 +217,7 @@ class Sidebar extends AbstractCart
- 
-     /**
-      * Returns maximum cart items to display
-+     *
-      * This setting regulates how many items will be displayed in minicart
-      *
-      * @return int
-diff --git a/app/code/Magento/Checkout/Block/Cart/Totals.php b/app/code/Magento/Checkout/Block/Cart/Totals.php
-index 375c564f290..131e5b157c7 100644
---- a/app/code/Magento/Checkout/Block/Cart/Totals.php
-+++ b/app/code/Magento/Checkout/Block/Cart/Totals.php
-@@ -3,12 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Checkout\Block\Cart;
- 
- use Magento\Framework\View\Element\BlockInterface;
- use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
-+use Magento\Sales\Model\ConfigInterface;
- 
- /**
-+ * Totals cart block.
-+ *
-  * @api
-  */
- class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
-@@ -42,7 +46,7 @@ class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
-      * @param \Magento\Framework\View\Element\Template\Context $context
-      * @param \Magento\Customer\Model\Session $customerSession
-      * @param \Magento\Checkout\Model\Session $checkoutSession
--     * @param \Magento\Sales\Model\Config $salesConfig
-+     * @param ConfigInterface $salesConfig
-      * @param array $layoutProcessors
-      * @param array $data
-      * @codeCoverageIgnore
-@@ -51,7 +55,7 @@ class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
-         \Magento\Framework\View\Element\Template\Context $context,
-         \Magento\Customer\Model\Session $customerSession,
-         \Magento\Checkout\Model\Session $checkoutSession,
--        \Magento\Sales\Model\Config $salesConfig,
-+        ConfigInterface $salesConfig,
-         array $layoutProcessors = [],
-         array $data = []
-     ) {
-@@ -62,6 +66,8 @@ class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
-     }
- 
-     /**
-+     * Retrieve encoded js layout.
-+     *
-      * @return string
-      */
-     public function getJsLayout()
-@@ -74,6 +80,8 @@ class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
-     }
- 
-     /**
-+     * Retrieve totals from cache.
-+     *
-      * @return array
-      */
-     public function getTotals()
-@@ -85,6 +93,8 @@ class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
-     }
- 
-     /**
-+     * Set totals to cache.
-+     *
-      * @param array $value
-      * @return $this
-      * @codeCoverageIgnore
-@@ -96,6 +106,8 @@ class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
-     }
- 
-     /**
-+     * Create totals block and set totals.
-+     *
-      * @param string $code
-      * @return BlockInterface
-      */
-@@ -121,6 +133,8 @@ class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
-     }
- 
-     /**
-+     * Get totals html.
-+     *
-      * @param mixed $total
-      * @param int|null $area
-      * @param int $colspan
-@@ -177,7 +191,7 @@ class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
-     }
- 
-     /**
--     * Get formated in base currency base grand total value
-+     * Get formatted in base currency base grand total value
-      *
-      * @return string
-      */
-diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
-index de996bed024..5dedf2c7e7e 100644
---- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
-+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
-@@ -6,10 +6,18 @@
- namespace Magento\Checkout\Block\Checkout;
- 
- use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
-+use Magento\Customer\Api\Data\CustomerInterface;
- use Magento\Customer\Helper\Address as AddressHelper;
- use Magento\Customer\Model\Session;
- use Magento\Directory\Helper\Data as DirectoryHelper;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
- 
-+/**
-+ * Fields attribute merger.
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ */
- class AttributeMerger
- {
-     /**
-@@ -46,6 +54,7 @@ class AttributeMerger
-         'alpha' => 'validate-alpha',
-         'numeric' => 'validate-number',
-         'alphanumeric' => 'validate-alphanum',
-+        'alphanum-with-spaces' => 'validate-alphanum-with-spaces',
-         'url' => 'validate-url',
-         'email' => 'email2',
-         'length' => 'validate-length',
-@@ -67,7 +76,7 @@ class AttributeMerger
-     private $customerRepository;
- 
-     /**
--     * @var \Magento\Customer\Api\Data\CustomerInterface
-+     * @var CustomerInterface
-      */
-     private $customer;
- 
-@@ -269,6 +278,7 @@ class AttributeMerger
-         for ($lineIndex = 0; $lineIndex < (int)$attributeConfig['size']; $lineIndex++) {
-             $isFirstLine = $lineIndex === 0;
-             $line = [
-+                'label' => __("%1: Line %2", $attributeConfig['label'], $lineIndex + 1),
-                 'component' => 'Magento_Ui/js/form/element/abstract',
-                 'config' => [
-                     // customScope is used to group elements within a single form e.g. they can be validated separately
-@@ -309,10 +319,14 @@ class AttributeMerger
-     }
- 
-     /**
-+     * Returns default attribute value.
-+     *
-      * @param string $attributeCode
-+     * @throws NoSuchEntityException
-+     * @throws LocalizedException
-      * @return null|string
-      */
--    protected function getDefaultValue($attributeCode)
-+    protected function getDefaultValue($attributeCode): ?string
-     {
-         if ($attributeCode === 'country_id') {
-             return $this->directoryHelper->getDefaultCountry();
-@@ -346,9 +360,13 @@ class AttributeMerger
-     }
- 
-     /**
--     * @return \Magento\Customer\Api\Data\CustomerInterface|null
-+     * Returns logged customer.
-+     *
-+     * @throws NoSuchEntityException
-+     * @throws LocalizedException
-+     * @return CustomerInterface|null
-      */
--    protected function getCustomer()
-+    protected function getCustomer(): ?CustomerInterface
-     {
-         if (!$this->customer) {
-             if ($this->customerSession->isLoggedIn()) {
-diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
-index f47e514948d..557f1433524 100644
---- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
-+++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
-@@ -7,7 +7,7 @@ namespace Magento\Checkout\Block\Checkout;
- 
- use Magento\Checkout\Helper\Data;
- use Magento\Framework\App\ObjectManager;
--use Magento\Store\Api\StoreResolverInterface;
-+use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * Class LayoutProcessor
-@@ -40,9 +40,9 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
-     private $checkoutDataHelper;
- 
-     /**
--     * @var StoreResolverInterface
-+     * @var StoreManagerInterface
-      */
--    private $storeResolver;
-+    private $storeManager;
- 
-     /**
-      * @var \Magento\Shipping\Model\Config
-@@ -53,30 +53,36 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
-      * @param \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider
-      * @param \Magento\Ui\Component\Form\AttributeMapper $attributeMapper
-      * @param AttributeMerger $merger
-+     * @param \Magento\Customer\Model\Options|null $options
-+     * @param Data|null $checkoutDataHelper
-+     * @param \Magento\Shipping\Model\Config|null $shippingConfig
-+     * @param StoreManagerInterface|null $storeManager
-      */
-     public function __construct(
-         \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider,
-         \Magento\Ui\Component\Form\AttributeMapper $attributeMapper,
--        AttributeMerger $merger
-+        AttributeMerger $merger,
-+        \Magento\Customer\Model\Options $options = null,
-+        Data $checkoutDataHelper = null,
-+        \Magento\Shipping\Model\Config $shippingConfig = null,
-+        StoreManagerInterface $storeManager = null
-     ) {
-         $this->attributeMetadataDataProvider = $attributeMetadataDataProvider;
-         $this->attributeMapper = $attributeMapper;
-         $this->merger = $merger;
-+        $this->options = $options ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(\Magento\Customer\Model\Options::class);
-+        $this->checkoutDataHelper = $checkoutDataHelper ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(Data::class);
-+        $this->shippingConfig = $shippingConfig ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(\Magento\Shipping\Model\Config::class);
-+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(StoreManagerInterface::class);
-     }
- 
-     /**
--     * @deprecated 100.0.11
--     * @return \Magento\Customer\Model\Options
--     */
--    private function getOptions()
--    {
--        if (!is_object($this->options)) {
--            $this->options = ObjectManager::getInstance()->get(\Magento\Customer\Model\Options::class);
--        }
--        return $this->options;
--    }
--
--    /**
-+     * Get address attributes.
-+     *
-      * @return array
-      */
-     private function getAddressAttributes()
-@@ -116,6 +122,7 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
-             if (!in_array($code, $codes)) {
-                 continue;
-             }
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             $options = call_user_func($attributesToConvert[$code]);
-             if (!is_array($options)) {
-                 continue;
-@@ -143,8 +150,8 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
-     public function process($jsLayout)
-     {
-         $attributesToConvert = [
--            'prefix' => [$this->getOptions(), 'getNamePrefixOptions'],
--            'suffix' => [$this->getOptions(), 'getNameSuffixOptions'],
-+            'prefix' => [$this->options, 'getNamePrefixOptions'],
-+            'suffix' => [$this->options, 'getNameSuffixOptions'],
-         ];
- 
-         $elements = $this->getAddressAttributes();
-@@ -192,8 +199,8 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
-      */
-     private function processShippingChildrenComponents($shippingRatesLayout)
-     {
--        $activeCarriers = $this->getShippingConfig()->getActiveCarriers(
--            $this->getStoreResolver()->getCurrentStoreId()
-+        $activeCarriers = $this->shippingConfig->getActiveCarriers(
-+            $this->storeManager->getStore()->getId()
-         );
-         foreach (array_keys($shippingRatesLayout) as $carrierName) {
-             $carrierKey = str_replace('-rates-validation', '', $carrierName);
-@@ -206,6 +213,7 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
- 
-     /**
-      * Appends billing address form component to payment layout
-+     *
-      * @param array $paymentLayout
-      * @param array $elements
-      * @return array
-@@ -221,7 +229,7 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
-         }
- 
-         // The if billing address should be displayed on Payment method or page
--        if ($this->getCheckoutDataHelper()->isDisplayBillingOnPaymentMethodAvailable()) {
-+        if ($this->checkoutDataHelper->isDisplayBillingOnPaymentMethodAvailable()) {
-             $paymentLayout['payments-list']['children'] =
-                 array_merge_recursive(
-                     $paymentLayout['payments-list']['children'],
-@@ -280,8 +288,14 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
-             'provider' => 'checkoutProvider',
-             'deps' => 'checkoutProvider',
-             'dataScopePrefix' => 'billingAddress' . $paymentCode,
-+            'billingAddressListProvider' => '${$.name}.billingAddressList',
-             'sortOrder' => 1,
-             'children' => [
-+                'billingAddressList' => [
-+                    'component' => 'Magento_Checkout/js/view/billing-address/list',
-+                    'displayArea' => 'billing-address-list',
-+                    'template' => 'Magento_Checkout/billing-address/list'
-+                ],
-                 'form-fields' => [
-                     'component' => 'uiComponent',
-                     'displayArea' => 'additional-fieldsets',
-@@ -340,49 +354,4 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
-             ],
-         ];
-     }
--
--    /**
--     * Get checkout data helper instance
--     *
--     * @return Data
--     * @deprecated 100.1.4
--     */
--    private function getCheckoutDataHelper()
--    {
--        if (!$this->checkoutDataHelper) {
--            $this->checkoutDataHelper = ObjectManager::getInstance()->get(Data::class);
--        }
--
--        return $this->checkoutDataHelper;
--    }
--
--    /**
--     * Retrieve Shipping Configuration.
--     *
--     * @return \Magento\Shipping\Model\Config
--     * @deprecated 100.2.0
--     */
--    private function getShippingConfig()
--    {
--        if (!$this->shippingConfig) {
--            $this->shippingConfig = ObjectManager::getInstance()->get(\Magento\Shipping\Model\Config::class);
--        }
--
--        return $this->shippingConfig;
--    }
--
--    /**
--     * Get store resolver.
--     *
--     * @return StoreResolverInterface
--     * @deprecated 100.2.0
--     */
--    private function getStoreResolver()
--    {
--        if (!$this->storeResolver) {
--            $this->storeResolver = ObjectManager::getInstance()->get(StoreResolverInterface::class);
--        }
--
--        return $this->storeResolver;
--    }
- }
-diff --git a/app/code/Magento/Checkout/Block/Link.php b/app/code/Magento/Checkout/Block/Link.php
-index cb2fb3309b8..3d0740181f4 100644
---- a/app/code/Magento/Checkout/Block/Link.php
-+++ b/app/code/Magento/Checkout/Block/Link.php
-@@ -13,7 +13,7 @@ namespace Magento\Checkout\Block;
- class Link extends \Magento\Framework\View\Element\Html\Link
- {
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $_moduleManager;
- 
-@@ -24,14 +24,14 @@ class Link extends \Magento\Framework\View\Element\Html\Link
- 
-     /**
-      * @param \Magento\Framework\View\Element\Template\Context $context
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Checkout\Helper\Data $checkoutHelper
-      * @param array $data
-      * @codeCoverageIgnore
-      */
-     public function __construct(
-         \Magento\Framework\View\Element\Template\Context $context,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Checkout\Helper\Data $checkoutHelper,
-         array $data = []
-     ) {
-@@ -41,6 +41,8 @@ class Link extends \Magento\Framework\View\Element\Html\Link
-     }
- 
-     /**
-+     * Get href.
-+     *
-      * @return string
-      * @codeCoverageIgnore
-      */
-diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
-index ca6b045ddbb..e01d5835b4c 100644
---- a/app/code/Magento/Checkout/Block/Onepage.php
-+++ b/app/code/Magento/Checkout/Block/Onepage.php
-@@ -38,7 +38,7 @@ class Onepage extends \Magento\Framework\View\Element\Template
-     protected $layoutProcessors;
- 
-     /**
--     * @var \Magento\Framework\Serialize\Serializer\Json
-+     * @var \Magento\Framework\Serialize\SerializerInterface
-      */
-     private $serializer;
- 
-@@ -48,8 +48,9 @@ class Onepage extends \Magento\Framework\View\Element\Template
-      * @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
-      * @param array $layoutProcessors
-      * @param array $data
--     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
--     * @throws \RuntimeException
-+     * @param \Magento\Framework\Serialize\Serializer\Json $serializer
-+     * @param \Magento\Framework\Serialize\SerializerInterface $serializerInterface
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         \Magento\Framework\View\Element\Template\Context $context,
-@@ -57,7 +58,8 @@ class Onepage extends \Magento\Framework\View\Element\Template
-         \Magento\Checkout\Model\CompositeConfigProvider $configProvider,
-         array $layoutProcessors = [],
-         array $data = [],
--        \Magento\Framework\Serialize\Serializer\Json $serializer = null
-+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
-+        \Magento\Framework\Serialize\SerializerInterface $serializerInterface = null
-     ) {
-         parent::__construct($context, $data);
-         $this->formKey = $formKey;
-@@ -65,12 +67,12 @@ class Onepage extends \Magento\Framework\View\Element\Template
-         $this->jsLayout = isset($data['jsLayout']) && is_array($data['jsLayout']) ? $data['jsLayout'] : [];
-         $this->configProvider = $configProvider;
-         $this->layoutProcessors = $layoutProcessors;
--        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
--            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
-+        $this->serializer = $serializerInterface ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(\Magento\Framework\Serialize\Serializer\JsonHexTag::class);
-     }
- 
-     /**
--     * @return string
-+     * @inheritdoc
-      */
-     public function getJsLayout()
-     {
-@@ -78,7 +80,7 @@ class Onepage extends \Magento\Framework\View\Element\Template
-             $this->jsLayout = $processor->process($this->jsLayout);
-         }
- 
--        return json_encode($this->jsLayout, JSON_HEX_TAG);
-+        return $this->serializer->serialize($this->jsLayout);
-     }
- 
-     /**
-@@ -115,11 +117,13 @@ class Onepage extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Retrieve serialized checkout config.
-+     *
-      * @return bool|string
-      * @since 100.2.0
-      */
-     public function getSerializedCheckoutConfig()
-     {
--        return json_encode($this->getCheckoutConfig(), JSON_HEX_TAG);
-+        return  $this->serializer->serialize($this->getCheckoutConfig());
-     }
- }
-diff --git a/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php b/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
-index 6b3774f7e38..3b2f1604fae 100644
---- a/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
-+++ b/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
-@@ -8,6 +8,8 @@ namespace Magento\Checkout\Block;
- use Magento\Framework\View\Element\Template;
- 
- /**
-+ * Displays buttons on shopping cart page
-+ *
-  * @api
-  */
- class QuoteShortcutButtons extends \Magento\Catalog\Block\ShortcutButtons
-@@ -45,7 +47,8 @@ class QuoteShortcutButtons extends \Magento\Catalog\Block\ShortcutButtons
-                 'container' => $this,
-                 'is_catalog_product' => $this->_isCatalogProduct,
-                 'or_position' => $this->_orPosition,
--                'checkout_session' => $this->_checkoutSession
-+                'checkout_session' => $this->_checkoutSession,
-+                'is_shopping_cart' => true
-             ]
-         );
-         return $this;
-diff --git a/app/code/Magento/Checkout/Controller/Account/DelegateCreate.php b/app/code/Magento/Checkout/Controller/Account/DelegateCreate.php
-index 6c4c8b053e2..e4f909f9a81 100644
---- a/app/code/Magento/Checkout/Controller/Account/DelegateCreate.php
-+++ b/app/code/Magento/Checkout/Controller/Account/DelegateCreate.php
-@@ -7,6 +7,7 @@ declare(strict_types=1);
- 
- namespace Magento\Checkout\Controller\Account;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\App\Action\Action;
- use Magento\Framework\App\Action\Context;
- use Magento\Checkout\Model\Session;
-@@ -15,7 +16,7 @@ use Magento\Sales\Api\OrderCustomerDelegateInterface;
- /**
-  * Redirect guest customer for registration.
-  */
--class DelegateCreate extends Action
-+class DelegateCreate extends Action implements HttpGetActionInterface
- {
-     /**
-      * @var OrderCustomerDelegateInterface
-diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php
-index f244fe310af..d7b09c17ee0 100644
---- a/app/code/Magento/Checkout/Controller/Cart.php
-+++ b/app/code/Magento/Checkout/Controller/Cart.php
-@@ -106,8 +106,7 @@ abstract class Cart extends \Magento\Framework\App\Action\Action implements View
-     /**
-      * Get resolved back url
-      *
--     * @param null $defaultUrl
--     *
-+     * @param string|null $defaultUrl
-      * @return mixed|null|string
-      */
-     protected function getBackUrl($defaultUrl = null)
-@@ -118,12 +117,7 @@ abstract class Cart extends \Magento\Framework\App\Action\Action implements View
-             return $returnUrl;
-         }
- 
--        $shouldRedirectToCart = $this->_scopeConfig->getValue(
--            'checkout/cart/redirect_to_cart',
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--        );
--
--        if ($shouldRedirectToCart || $this->getRequest()->getParam('in_cart')) {
-+        if ($this->shouldRedirectToCart() || $this->getRequest()->getParam('in_cart')) {
-             if ($this->getRequest()->getActionName() == 'add' && !$this->getRequest()->getParam('in_cart')) {
-                 $this->_checkoutSession->setContinueShoppingUrl($this->_redirect->getRefererUrl());
-             }
-@@ -132,4 +126,17 @@ abstract class Cart extends \Magento\Framework\App\Action\Action implements View
- 
-         return $defaultUrl;
-     }
-+
-+    /**
-+     * Is redirect should be performed after the product was added to cart.
-+     *
-+     * @return bool
-+     */
-+    private function shouldRedirectToCart()
-+    {
-+        return $this->_scopeConfig->isSetFlag(
-+            'checkout/cart/redirect_to_cart',
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+        );
-+    }
- }
-diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
-index 92dd8dd8f25..739f71caeb8 100644
---- a/app/code/Magento/Checkout/Controller/Cart/Add.php
-+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
-@@ -6,14 +6,17 @@
-  */
- namespace Magento\Checkout\Controller\Cart;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Checkout\Model\Cart as CustomerCart;
- use Magento\Framework\Exception\NoSuchEntityException;
- 
- /**
-+ * Controller for processing add to cart action.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Add extends \Magento\Checkout\Controller\Cart
-+class Add extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface
- {
-     /**
-      * @var ProductRepositoryInterface
-@@ -80,6 +83,9 @@ class Add extends \Magento\Checkout\Controller\Cart
-     public function execute()
-     {
-         if (!$this->_formKeyValidator->validate($this->getRequest())) {
-+            $this->messageManager->addErrorMessage(
-+                __('Your session has expired')
-+            );
-             return $this->resultRedirectFactory->create()->setPath('*/*/');
-         }
- 
-@@ -122,11 +128,21 @@ class Add extends \Magento\Checkout\Controller\Cart
- 
-             if (!$this->_checkoutSession->getNoCartRedirect(true)) {
-                 if (!$this->cart->getQuote()->getHasError()) {
--                    $message = __(
--                        'You added %1 to your shopping cart.',
--                        $product->getName()
--                    );
--                    $this->messageManager->addSuccessMessage($message);
-+                    if ($this->shouldRedirectToCart()) {
-+                        $message = __(
-+                            'You added %1 to your shopping cart.',
-+                            $product->getName()
-+                        );
-+                        $this->messageManager->addSuccessMessage($message);
-+                    } else {
-+                        $this->messageManager->addComplexSuccessMessage(
-+                            'addCartSuccessMessage',
-+                            [
-+                                'product_name' => $product->getName(),
-+                                'cart_url' => $this->getCartUrl(),
-+                            ]
-+                        );
-+                    }
-                 }
-                 return $this->goBack(null, $product);
-             }
-@@ -147,8 +163,7 @@ class Add extends \Magento\Checkout\Controller\Cart
-             $url = $this->_checkoutSession->getRedirectUrl(true);
- 
-             if (!$url) {
--                $cartUrl = $this->_objectManager->get(\Magento\Checkout\Helper\Cart::class)->getCartUrl();
--                $url = $this->_redirect->getRedirectUrl($cartUrl);
-+                $url = $this->_redirect->getRedirectUrl($this->getCartUrl());
-             }
- 
-             return $this->goBack($url);
-@@ -191,4 +206,27 @@ class Add extends \Magento\Checkout\Controller\Cart
-             $this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($result)
-         );
-     }
-+
-+    /**
-+     * Returns cart url
-+     *
-+     * @return string
-+     */
-+    private function getCartUrl()
-+    {
-+        return $this->_url->getUrl('checkout/cart', ['_secure' => true]);
-+    }
-+
-+    /**
-+     * Is redirect should be performed after the product was added to cart.
-+     *
-+     * @return bool
-+     */
-+    private function shouldRedirectToCart()
-+    {
-+        return $this->_scopeConfig->isSetFlag(
-+            'checkout/cart/redirect_to_cart',
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+        );
-+    }
- }
-diff --git a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
-index c205f3c1607..7eb93620312 100644
---- a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
-+++ b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
-@@ -4,17 +4,21 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Checkout\Controller\Cart;
- 
- use Magento\Checkout\Model\Cart as CustomerCart;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Escaper;
- use Magento\Framework\App\ObjectManager;
- use Magento\Sales\Model\Order\Item;
- 
- /**
-+ * Add grouped items controller.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Addgroup extends \Magento\Checkout\Controller\Cart
-+class Addgroup extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface
- {
-     /**
-      * @var Escaper
-@@ -44,6 +48,8 @@ class Addgroup extends \Magento\Checkout\Controller\Cart
-     }
- 
-     /**
-+     * Add items in group.
-+     *
-      * @return \Magento\Framework\Controller\Result\Redirect
-      */
-     public function execute()
-@@ -74,6 +80,8 @@ class Addgroup extends \Magento\Checkout\Controller\Cart
-                 }
-             }
-             $this->cart->save();
-+        } else {
-+            $this->messageManager->addErrorMessage(__('Please select at least one product to add to cart'));
-         }
-         return $this->_goBack();
-     }
-diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
-index 19b2d2db345..aa4ae755d79 100644
---- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
-+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
-@@ -7,13 +7,14 @@
- 
- namespace Magento\Checkout\Controller\Cart;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework;
- use Magento\Framework\Controller\ResultFactory;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Configure extends \Magento\Checkout\Controller\Cart
-+class Configure extends \Magento\Checkout\Controller\Cart implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
-index 5f683351811..fdfe817f354 100644
---- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
-+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
-@@ -5,10 +5,12 @@
-  */
- namespace Magento\Checkout\Controller\Cart;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class CouponPost extends \Magento\Checkout\Controller\Cart
-+class CouponPost extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface
- {
-     /**
-      * Sales quote repository
-diff --git a/app/code/Magento/Checkout/Controller/Cart/Delete.php b/app/code/Magento/Checkout/Controller/Cart/Delete.php
-index 4a6174e83fd..e9c15bd7f8c 100644
---- a/app/code/Magento/Checkout/Controller/Cart/Delete.php
-+++ b/app/code/Magento/Checkout/Controller/Cart/Delete.php
-@@ -1,12 +1,18 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Checkout\Controller\Cart;
- 
--class Delete extends \Magento\Checkout\Controller\Cart
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+/**
-+ * Action Delete.
-+ *
-+ * Deletes item from cart.
-+ */
-+class Delete extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface
- {
-     /**
-      * Delete shopping cart item action
-@@ -22,7 +28,12 @@ class Delete extends \Magento\Checkout\Controller\Cart
-         $id = (int)$this->getRequest()->getParam('id');
-         if ($id) {
-             try {
--                $this->cart->removeItem($id)->save();
-+                $this->cart->removeItem($id);
-+                // We should set Totals to be recollected once more because of Cart model as usually is loading
-+                // before action executing and in case when triggerRecollect setted as true recollecting will
-+                // executed and the flag will be true already.
-+                $this->cart->getQuote()->setTotalsCollectedFlag(false);
-+                $this->cart->save();
-             } catch (\Exception $e) {
-                 $this->messageManager->addErrorMessage(__('We can\'t remove the item.'));
-                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
-index 3fb582d35e2..182ab677777 100644
---- a/app/code/Magento/Checkout/Controller/Cart/Index.php
-+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
-@@ -7,7 +7,9 @@
- 
- namespace Magento\Checkout\Controller\Cart;
- 
--class Index extends \Magento\Checkout\Controller\Cart
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Checkout\Controller\Cart implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
-index 59bd6489bf9..40ce2252581 100644
---- a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
-+++ b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
-@@ -7,7 +7,9 @@
- 
- namespace Magento\Checkout\Controller\Cart;
- 
--class UpdateItemOptions extends \Magento\Checkout\Controller\Cart
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class UpdateItemOptions extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface
- {
-     /**
-      * Update product configuration for a cart item
-diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
-index 05ce48c9b46..bfc408d920a 100644
---- a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
-+++ b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
-@@ -1,14 +1,18 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Checkout\Controller\Cart;
- 
- use Magento\Checkout\Model\Cart\RequestQuantityProcessor;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- 
--class UpdatePost extends \Magento\Checkout\Controller\Cart
-+/**
-+ * Post update shopping cart.
-+ */
-+class UpdatePost extends \Magento\Checkout\Controller\Cart implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var RequestQuantityProcessor
-diff --git a/app/code/Magento/Checkout/Controller/Index/Index.php b/app/code/Magento/Checkout/Controller/Index/Index.php
-index 785c1f1473b..5acfab435b5 100644
---- a/app/code/Magento/Checkout/Controller/Index/Index.php
-+++ b/app/code/Magento/Checkout/Controller/Index/Index.php
-@@ -9,7 +9,9 @@ declare(strict_types=1);
- 
- namespace Magento\Checkout\Controller\Index;
- 
--class Index extends \Magento\Checkout\Controller\Onepage
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Checkout\Controller\Onepage implements HttpGetActionInterface
- {
-     /**
-      * Checkout page
-diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
-index 12b725a8f6d..66b05413620 100644
---- a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
-+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
-@@ -6,10 +6,14 @@
- 
- namespace Magento\Checkout\Controller\Onepage;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\DataObject;
- use Magento\Framework\Exception\PaymentException;
- 
--class SaveOrder extends \Magento\Checkout\Controller\Onepage
-+/**
-+ * One Page Checkout saveOrder action
-+ */
-+class SaveOrder extends \Magento\Checkout\Controller\Onepage implements HttpPostActionInterface
- {
-     /**
-      * Create order action
-@@ -31,7 +35,7 @@ class SaveOrder extends \Magento\Checkout\Controller\Onepage
-         $result = new DataObject();
-         try {
-             $agreementsValidator = $this->_objectManager->get(
--                \Magento\CheckoutAgreements\Model\AgreementsValidator::class
-+                \Magento\Checkout\Api\AgreementsValidatorInterface::class
-             );
-             if (!$agreementsValidator->isValid(array_keys($this->getRequest()->getPost('agreement', [])))) {
-                 $result->setData('success', false);
-diff --git a/app/code/Magento/Checkout/Controller/Onepage/Success.php b/app/code/Magento/Checkout/Controller/Onepage/Success.php
-index ae9be42a89c..a657b23cca4 100644
---- a/app/code/Magento/Checkout/Controller/Onepage/Success.php
-+++ b/app/code/Magento/Checkout/Controller/Onepage/Success.php
-@@ -1,12 +1,16 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Checkout\Controller\Onepage;
- 
--class Success extends \Magento\Checkout\Controller\Onepage
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+/**
-+ * Onepage checkout success controller class
-+ */
-+class Success extends \Magento\Checkout\Controller\Onepage implements HttpGetActionInterface
- {
-     /**
-      * Order success action
-@@ -24,7 +28,10 @@ class Success extends \Magento\Checkout\Controller\Onepage
-         $resultPage = $this->resultPageFactory->create();
-         $this->_eventManager->dispatch(
-             'checkout_onepage_controller_success_action',
--            ['order_ids' => [$session->getLastOrderId()]]
-+            [
-+                'order_ids' => [$session->getLastOrderId()],
-+                'order' => $session->getLastRealOrder()
-+            ]
-         );
-         return $resultPage;
-     }
-diff --git a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
-index c84aec336a5..f589e702de9 100644
---- a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
-+++ b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
-@@ -5,7 +5,9 @@
-  */
- namespace Magento\Checkout\Controller\Sidebar;
- 
--class RemoveItem extends \Magento\Framework\App\Action\Action
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class RemoveItem extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Checkout\Model\Sidebar
-diff --git a/app/code/Magento/Checkout/CustomerData/Cart.php b/app/code/Magento/Checkout/CustomerData/Cart.php
-index ddb077462ef..169be4cc62f 100644
---- a/app/code/Magento/Checkout/CustomerData/Cart.php
-+++ b/app/code/Magento/Checkout/CustomerData/Cart.php
-@@ -10,6 +10,8 @@ use Magento\Customer\CustomerData\SectionSourceInterface;
- 
- /**
-  * Cart source
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class Cart extends \Magento\Framework\DataObject implements SectionSourceInterface
- {
-@@ -82,7 +84,7 @@ class Cart extends \Magento\Framework\DataObject implements SectionSourceInterfa
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSectionData()
-     {
-@@ -98,7 +100,8 @@ class Cart extends \Magento\Framework\DataObject implements SectionSourceInterfa
-             'items' => $this->getRecentItems(),
-             'extra_actions' => $this->layout->createBlock(\Magento\Catalog\Block\ShortcutButtons::class)->toHtml(),
-             'isGuestCheckoutAllowed' => $this->isGuestCheckoutAllowed(),
--            'website_id' => $this->getQuote()->getStore()->getWebsiteId()
-+            'website_id' => $this->getQuote()->getStore()->getWebsiteId(),
-+            'storeId' => $this->getQuote()->getStore()->getStoreId()
-         ];
-     }
- 
-@@ -158,11 +161,10 @@ class Cart extends \Magento\Framework\DataObject implements SectionSourceInterfa
-                     : $item->getProduct();
- 
-                 $products = $this->catalogUrl->getRewriteByProductStore([$product->getId() => $item->getStoreId()]);
--                if (!isset($products[$product->getId()])) {
--                    continue;
-+                if (isset($products[$product->getId()])) {
-+                    $urlDataObject = new \Magento\Framework\DataObject($products[$product->getId()]);
-+                    $item->getProduct()->setUrlDataObject($urlDataObject);
-                 }
--                $urlDataObject = new \Magento\Framework\DataObject($products[$product->getId()]);
--                $item->getProduct()->setUrlDataObject($urlDataObject);
-             }
-             $items[] = $this->itemPoolInterface->getItemData($item);
-         }
-diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php
-index 636d4aaca21..40bdf93d161 100644
---- a/app/code/Magento/Checkout/Helper/Data.php
-+++ b/app/code/Magento/Checkout/Helper/Data.php
-@@ -59,6 +59,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     private $paymentFailures;
- 
-     /**
-+     * Data constructor.
-+     *
-      * @param \Magento\Framework\App\Helper\Context $context
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param \Magento\Checkout\Model\Session $checkoutSession
-@@ -113,6 +115,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     }
- 
-     /**
-+     * Format Price
-+     *
-      * @param float $price
-      * @return string
-      */
-@@ -127,6 +131,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     }
- 
-     /**
-+     * Convert Price
-+     *
-      * @param float $price
-      * @param bool $format
-      * @return float
-@@ -145,9 +151,9 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     public function canOnepageCheckout()
-     {
--        return (bool)$this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             'checkout/options/onepage_checkout_enabled',
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         );
-     }
- 
-@@ -164,7 +170,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-         }
-         $qty = $item->getQty() ? $item->getQty() : ($item->getQtyOrdered() ? $item->getQtyOrdered() : 1);
-         $taxAmount = $item->getTaxAmount() + $item->getDiscountTaxCompensation();
--        $price = floatval($qty) ? ($item->getRowTotal() + $taxAmount) / $qty : 0;
-+        $price = (float)$qty ? ($item->getRowTotal() + $taxAmount) / $qty : 0;
-         return $this->priceCurrency->round($price);
-     }
- 
-@@ -184,6 +190,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     }
- 
-     /**
-+     * Get Base Price Incl Tax
-+     *
-      * @param AbstractItem $item
-      * @return float
-      */
-@@ -191,11 +199,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     {
-         $qty = $item->getQty() ? $item->getQty() : ($item->getQtyOrdered() ? $item->getQtyOrdered() : 1);
-         $taxAmount = $item->getBaseTaxAmount() + $item->getBaseDiscountTaxCompensation();
--        $price = floatval($qty) ? ($item->getBaseRowTotal() + $taxAmount) / $qty : 0;
-+        $price = (float)$qty ? ($item->getBaseRowTotal() + $taxAmount) / $qty : 0;
-         return $this->priceCurrency->round($price);
-     }
- 
-     /**
-+     * Get Base Subtotal Incl Tax
-+     *
-      * @param AbstractItem $item
-      * @return float
-      */
-@@ -217,13 +227,15 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-         \Magento\Quote\Model\Quote $checkout,
-         string $message,
-         string $checkoutType = 'onepage'
--    ): \Magento\Checkout\Helper\Data {
-+    ): Data {
-         $this->paymentFailures->handle((int)$checkout->getId(), $message, $checkoutType);
- 
-         return $this;
-     }
- 
-     /**
-+     * Get Emails
-+     *
-      * @param string $configPath
-      * @param null|string|bool|int|Store $storeId
-      * @return array|false
-@@ -232,7 +244,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     {
-         $data = $this->scopeConfig->getValue(
-             $configPath,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $storeId
-         );
-         if (!empty($data)) {
-@@ -242,8 +254,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     }
- 
-     /**
--     * Check is allowed Guest Checkout
--     * Use config settings and observer
-+     * Check is allowed Guest Checkout. Use config settings and observer
-      *
-      * @param \Magento\Quote\Model\Quote $quote
-      * @param int|Store $store
-@@ -256,7 +267,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-         }
-         $guestCheckout = $this->scopeConfig->isSetFlag(
-             self::XML_PATH_GUEST_CHECKOUT,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
- 
-@@ -295,13 +306,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     {
-         return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_CUSTOMER_MUST_BE_LOGGED,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         );
-     }
- 
-     /**
--     * Checks if display billing address on payment method is available, otherwise
--     * billing address should be display on payment page
-+     * If display billing address on payment method is available, otherwise should be display on payment page
-+     *
-      * @return bool
-      */
-     public function isDisplayBillingOnPaymentMethodAvailable()
-diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
-index a18cba3f67c..cec99909dc9 100644
---- a/app/code/Magento/Checkout/Model/Cart.php
-+++ b/app/code/Magento/Checkout/Model/Cart.php
-@@ -16,6 +16,7 @@ use Magento\Framework\Exception\NoSuchEntityException;
-  * Shopping cart model
-  *
-  * @api
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @deprecated 100.1.0 Use \Magento\Quote\Model\Quote instead
-  * @see \Magento\Quote\Api\Data\CartInterface
-@@ -365,21 +366,15 @@ class Cart extends DataObject implements CartInterface
-     public function addProduct($productInfo, $requestInfo = null)
-     {
-         $product = $this->_getProduct($productInfo);
--        $request = $this->_getProductRequest($requestInfo);
-         $productId = $product->getId();
- 
-         if ($productId) {
--            $stockItem = $this->stockRegistry->getStockItem($productId, $product->getStore()->getWebsiteId());
--            $minimumQty = $stockItem->getMinSaleQty();
--            //If product quantity is not specified in request and there is set minimal qty for it
--            if ($minimumQty
--                && $minimumQty > 0
--                && !$request->getQty()
--            ) {
--                $request->setQty($minimumQty);
--            }
--
-+            $request = $this->getQtyRequest($product, $requestInfo);
-             try {
-+                $this->_eventManager->dispatch(
-+                    'checkout_cart_product_add_before',
-+                    ['info' => $requestInfo, 'product' => $product]
-+                );
-                 $result = $this->getQuote()->addProduct($product, $request);
-             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                 $this->_checkoutSession->setUseNotice(false);
-@@ -434,8 +429,9 @@ class Cart extends DataObject implements CartInterface
-                 }
-                 $product = $this->_getProduct($productId);
-                 if ($product->getId() && $product->isVisibleInCatalog()) {
-+                    $request = $this->getQtyRequest($product);
-                     try {
--                        $this->getQuote()->addProduct($product);
-+                        $this->getQuote()->addProduct($product, $request);
-                     } catch (\Exception $e) {
-                         $allAdded = false;
-                     }
-@@ -615,6 +611,8 @@ class Cart extends DataObject implements CartInterface
-     }
- 
-     /**
-+     * Get product ids.
-+     *
-      * @return int[]
-      */
-     public function getProductIds()
-@@ -756,4 +754,27 @@ class Cart extends DataObject implements CartInterface
-         }
-         return $this->requestInfoFilter;
-     }
-+
-+    /**
-+     * Get request quantity
-+     *
-+     * @param Product $product
-+     * @param \Magento\Framework\DataObject|int|array $request
-+     * @return int|DataObject
-+     */
-+    private function getQtyRequest($product, $request = 0)
-+    {
-+        $request = $this->_getProductRequest($request);
-+        $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
-+        $minimumQty = $stockItem->getMinSaleQty();
-+        //If product quantity is not specified in request and there is set minimal qty for it
-+        if ($minimumQty
-+            && $minimumQty > 0
-+            && !$request->getQty()
-+        ) {
-+            $request->setQty($minimumQty);
-+        }
-+
-+        return $request;
-+    }
- }
-diff --git a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
-index 16f13511001..470d4a3aca5 100644
---- a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
-+++ b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
-@@ -10,9 +10,12 @@ use Magento\Checkout\Helper\Data as CheckoutHelper;
- use Magento\Checkout\Model\Session as CheckoutSession;
- use Magento\Customer\Api\AddressMetadataInterface;
- use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
-+use Magento\Customer\Model\Address\CustomerAddressDataProvider;
- use Magento\Customer\Model\Context as CustomerContext;
- use Magento\Customer\Model\Session as CustomerSession;
- use Magento\Customer\Model\Url as CustomerUrlManager;
-+use Magento\Eav\Api\AttributeOptionManagementInterface;
-+use Magento\Framework\Api\CustomAttributesDataInterface;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\Http\Context as HttpContext;
- use Magento\Framework\App\ObjectManager;
-@@ -21,16 +24,26 @@ use Magento\Framework\Locale\FormatInterface as LocaleFormat;
- use Magento\Framework\UrlInterface;
- use Magento\Quote\Api\CartItemRepositoryInterface as QuoteItemRepository;
- use Magento\Quote\Api\CartTotalRepositoryInterface;
-+use Magento\Quote\Api\Data\AddressInterface;
- use Magento\Quote\Api\ShippingMethodManagementInterface as ShippingMethodManager;
- use Magento\Quote\Model\QuoteIdMaskFactory;
- use Magento\Store\Model\ScopeInterface;
-+use Magento\Ui\Component\Form\Element\Multiline;
- 
- /**
-+ * Default Config Provider
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.TooManyFields)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class DefaultConfigProvider implements ConfigProviderInterface
- {
-+    /**
-+     * @var AttributeOptionManagementInterface
-+     */
-+    private $attributeOptionManager;
-+
-     /**
-      * @var CheckoutHelper
-      */
-@@ -166,6 +179,11 @@ class DefaultConfigProvider implements ConfigProviderInterface
-      */
-     private $addressMetadata;
- 
-+    /**
-+     * @var CustomerAddressDataProvider
-+     */
-+    private $customerAddressData;
-+
-     /**
-      * @param CheckoutHelper $checkoutHelper
-      * @param Session $checkoutSession
-@@ -194,6 +212,8 @@ class DefaultConfigProvider implements ConfigProviderInterface
-      * @param \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement
-      * @param UrlInterface $urlBuilder
-      * @param AddressMetadataInterface $addressMetadata
-+     * @param AttributeOptionManagementInterface $attributeOptionManager
-+     * @param CustomerAddressDataProvider|null $customerAddressData
-      * @codeCoverageIgnore
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -224,7 +244,9 @@ class DefaultConfigProvider implements ConfigProviderInterface
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
-         \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement,
-         UrlInterface $urlBuilder,
--        AddressMetadataInterface $addressMetadata = null
-+        AddressMetadataInterface $addressMetadata = null,
-+        AttributeOptionManagementInterface $attributeOptionManager = null,
-+        CustomerAddressDataProvider $customerAddressData = null
-     ) {
-         $this->checkoutHelper = $checkoutHelper;
-         $this->checkoutSession = $checkoutSession;
-@@ -253,20 +275,41 @@ class DefaultConfigProvider implements ConfigProviderInterface
-         $this->paymentMethodManagement = $paymentMethodManagement;
-         $this->urlBuilder = $urlBuilder;
-         $this->addressMetadata = $addressMetadata ?: ObjectManager::getInstance()->get(AddressMetadataInterface::class);
-+        $this->attributeOptionManager = $attributeOptionManager ??
-+            ObjectManager::getInstance()->get(AttributeOptionManagementInterface::class);
-+        $this->customerAddressData = $customerAddressData ?:
-+            ObjectManager::getInstance()->get(CustomerAddressDataProvider::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Return configuration array
-+     *
-+     * @return array|mixed
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getConfig()
-     {
--        $quoteId = $this->checkoutSession->getQuote()->getId();
-+        $quote = $this->checkoutSession->getQuote();
-+        $quoteId = $quote->getId();
-+        $email = $quote->getShippingAddress()->getEmail();
-+        $quoteItemData = $this->getQuoteItemData();
-         $output['formKey'] = $this->formKey->getFormKey();
-         $output['customerData'] = $this->getCustomerData();
-         $output['quoteData'] = $this->getQuoteData();
--        $output['quoteItemData'] = $this->getQuoteItemData();
-+        $output['quoteItemData'] = $quoteItemData;
-+        $output['quoteMessages'] = $this->getQuoteItemsMessages($quoteItemData);
-         $output['isCustomerLoggedIn'] = $this->isCustomerLoggedIn();
-         $output['selectedShippingMethod'] = $this->getSelectedShippingMethod();
-+        if ($email && !$this->isCustomerLoggedIn()) {
-+            $shippingAddressFromData = $this->getAddressFromData($quote->getShippingAddress());
-+            $billingAddressFromData = $this->getAddressFromData($quote->getBillingAddress());
-+            $output['shippingAddressFromData'] = $shippingAddressFromData;
-+            if ($shippingAddressFromData != $billingAddressFromData) {
-+                $output['billingAddressFromData'] = $billingAddressFromData;
-+            }
-+            $output['validatedEmailValue'] = $email;
-+        }
-         $output['storeCode'] = $this->getStoreCode();
-         $output['isGuestCheckoutAllowed'] = $this->isGuestCheckoutAllowed();
-         $output['isCustomerLoginRequired'] = $this->isCustomerLoginRequired();
-@@ -278,14 +321,15 @@ class DefaultConfigProvider implements ConfigProviderInterface
-         $output['staticBaseUrl'] = $this->getStaticBaseUrl();
-         $output['priceFormat'] = $this->localeFormat->getPriceFormat(
-             null,
--            $this->checkoutSession->getQuote()->getQuoteCurrencyCode()
-+            $quote->getQuoteCurrencyCode()
-         );
-         $output['basePriceFormat'] = $this->localeFormat->getPriceFormat(
-             null,
--            $this->checkoutSession->getQuote()->getBaseCurrencyCode()
-+            $quote->getBaseCurrencyCode()
-         );
-         $output['postCodes'] = $this->postCodesConfig->getPostCodes();
-         $output['imageData'] = $this->imageProvider->getImages($quoteId);
-+
-         $output['totalsData'] = $this->getTotalsData();
-         $output['shippingPolicy'] = [
-             'isEnabled' => $this->scopeConfig->isSetFlag(
-@@ -326,57 +370,18 @@ class DefaultConfigProvider implements ConfigProviderInterface
-      *
-      * @return array
-      */
--    private function getCustomerData()
-+    private function getCustomerData(): array
-     {
-         $customerData = [];
-         if ($this->isCustomerLoggedIn()) {
-+            /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
-             $customer = $this->customerRepository->getById($this->customerSession->getCustomerId());
-             $customerData = $customer->__toArray();
--            foreach ($customer->getAddresses() as $key => $address) {
--                $customerData['addresses'][$key]['inline'] = $this->getCustomerAddressInline($address);
--                if ($address->getCustomAttributes()) {
--                    $customerData['addresses'][$key]['custom_attributes'] = $this->filterNotVisibleAttributes(
--                        $customerData['addresses'][$key]['custom_attributes']
--                    );
--                }
--            }
-+            $customerData['addresses'] = $this->customerAddressData->getAddressDataByCustomer($customer);
-         }
-         return $customerData;
-     }
- 
--    /**
--     * Filter not visible on storefront custom attributes.
--     *
--     * @param array $attributes
--     * @return array
--     */
--    private function filterNotVisibleAttributes(array $attributes)
--    {
--        $attributesMetadata = $this->addressMetadata->getAllAttributesMetadata();
--        foreach ($attributesMetadata as $attributeMetadata) {
--            if (!$attributeMetadata->isVisible()) {
--                unset($attributes[$attributeMetadata->getAttributeCode()]);
--            }
--        }
--
--        return $attributes;
--    }
--
--    /**
--     * Set additional customer address data
--     *
--     * @param \Magento\Customer\Api\Data\AddressInterface $address
--     * @return string
--     */
--    private function getCustomerAddressInline($address)
--    {
--        $builtOutputAddressData = $this->addressMapper->toFlatArray($address);
--        return $this->addressConfig
--            ->getFormatByCode(\Magento\Customer\Model\Address\Config::DEFAULT_ADDRESS_FORMAT)
--            ->getRenderer()
--            ->renderArray($builtOutputAddressData);
--    }
--
-     /**
-      * Retrieve quote data
-      *
-@@ -420,6 +425,7 @@ class DefaultConfigProvider implements ConfigProviderInterface
-                     $quoteItem->getProduct(),
-                     'product_thumbnail_image'
-                 )->getUrl();
-+                $quoteItemData[$index]['message'] = $quoteItem->getMessage();
-             }
-         }
-         return $quoteItemData;
-@@ -513,6 +519,38 @@ class DefaultConfigProvider implements ConfigProviderInterface
-         return $shippingMethodData;
-     }
- 
-+    /**
-+     * Create address data appropriate to fill checkout address form
-+     *
-+     * @param AddressInterface $address
-+     * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function getAddressFromData(AddressInterface $address)
-+    {
-+        $addressData = [];
-+        $attributesMetadata = $this->addressMetadata->getAllAttributesMetadata();
-+        foreach ($attributesMetadata as $attributeMetadata) {
-+            if (!$attributeMetadata->isVisible()) {
-+                continue;
-+            }
-+            $attributeCode = $attributeMetadata->getAttributeCode();
-+            $attributeData = $address->getData($attributeCode);
-+            if ($attributeData) {
-+                if ($attributeMetadata->getFrontendInput() === Multiline::NAME) {
-+                    $attributeData = \is_array($attributeData) ? $attributeData : explode("\n", $attributeData);
-+                    $attributeData = (object)$attributeData;
-+                }
-+                if ($attributeMetadata->isUserDefined()) {
-+                    $addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES][$attributeCode] = $attributeData;
-+                    continue;
-+                }
-+                $addressData[$attributeCode] = $attributeData;
-+            }
-+        }
-+        return $addressData;
-+    }
-+
-     /**
-      * Retrieve store code
-      *
-@@ -581,6 +619,7 @@ class DefaultConfigProvider implements ConfigProviderInterface
- 
-     /**
-      * Return quote totals data
-+     *
-      * @return array
-      */
-     private function getTotalsData()
-@@ -612,6 +651,7 @@ class DefaultConfigProvider implements ConfigProviderInterface
- 
-     /**
-      * Returns active carriers codes
-+     *
-      * @return array
-      */
-     private function getActiveCarriers()
-@@ -625,6 +665,7 @@ class DefaultConfigProvider implements ConfigProviderInterface
- 
-     /**
-      * Returns origin country code
-+     *
-      * @return string
-      */
-     private function getOriginCountryCode()
-@@ -638,7 +679,9 @@ class DefaultConfigProvider implements ConfigProviderInterface
- 
-     /**
-      * Returns array of payment methods
--     * @return array
-+     *
-+     * @return array $paymentMethods
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     private function getPaymentMethods()
-     {
-@@ -654,4 +697,22 @@ class DefaultConfigProvider implements ConfigProviderInterface
-         }
-         return $paymentMethods;
-     }
-+
-+    /**
-+     * Get notification messages for the quote items
-+     *
-+     * @param array $quoteItemData
-+     * @return array
-+     */
-+    private function getQuoteItemsMessages(array $quoteItemData): array
-+    {
-+        $quoteItemsMessages = [];
-+        if ($quoteItemData) {
-+            foreach ($quoteItemData as $item) {
-+                $quoteItemsMessages[$item['item_id']] = $item['message'];
-+            }
-+        }
-+
-+        return $quoteItemsMessages;
-+    }
- }
-diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
-index 333226b7d21..da29482f012 100644
---- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
-+++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
-@@ -14,6 +14,8 @@ use Magento\Framework\Exception\CouldNotSaveException;
- use Magento\Quote\Model\Quote;
- 
- /**
-+ * Guest payment information management model.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPaymentInformationManagementInterface
-@@ -66,7 +68,7 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
-      * @param \Magento\Checkout\Api\PaymentInformationManagementInterface $paymentInformationManagement
-      * @param \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory
-      * @param CartRepositoryInterface $cartRepository
--     * @param ResourceConnection|null
-+     * @param ResourceConnection $connectionPool
-      * @codeCoverageIgnore
-      */
-     public function __construct(
-@@ -88,7 +90,7 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function savePaymentInformationAndPlaceOrder(
-         $cartId,
-@@ -129,7 +131,7 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function savePaymentInformation(
-         $cartId,
-@@ -156,7 +158,7 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function getPaymentInformation($cartId)
-     {
-@@ -190,9 +192,8 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
-     {
-         $shippingAddress = $quote->getShippingAddress();
-         if ($shippingAddress && $shippingAddress->getShippingMethod()) {
--            $shippingDataArray = explode('_', $shippingAddress->getShippingMethod());
--            $shippingCarrier = array_shift($shippingDataArray);
--            $shippingAddress->setLimitCarrier($shippingCarrier);
-+            $shippingRate = $shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod());
-+            $shippingAddress->setLimitCarrier($shippingRate->getCarrier());
-         }
-     }
- }
-diff --git a/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php b/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php
-index 12a8838a7e9..ca577ed714a 100644
---- a/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php
-+++ b/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php
-@@ -3,9 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Checkout\Model\Layout;
- 
- use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Store\Model\ScopeInterface;
- 
- /**
-  * Abstract totals processor.
-@@ -13,6 +15,7 @@ use Magento\Framework\App\Config\ScopeConfigInterface;
-  * Can be used to process totals information that will be rendered during checkout.
-  * Abstract class provides sorting routing to sort total information based on configuration settings.
-  *
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  */
- abstract class AbstractTotalsProcessor
-@@ -35,12 +38,14 @@ abstract class AbstractTotalsProcessor
-     }
- 
-     /**
-+     * Sort total information based on configuration settings.
-+     *
-      * @param array $totals
-      * @return array
-      */
-     public function sortTotals($totals)
-     {
--        $configData = $this->scopeConfig->getValue('sales/totals_sort');
-+        $configData = $this->scopeConfig->getValue('sales/totals_sort', ScopeInterface::SCOPE_STORES);
-         foreach ($totals as $code => &$total) {
-             //convert JS naming style to config naming style
-             $code = str_replace('-', '_', $code);
-diff --git a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
-index 164109177d4..2eced5c6422 100644
---- a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
-+++ b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
-@@ -9,6 +9,8 @@ namespace Magento\Checkout\Model;
- use Magento\Framework\Exception\CouldNotSaveException;
- 
- /**
-+ * Payment information management
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInformationManagementInterface
-@@ -72,7 +74,7 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function savePaymentInformationAndPlaceOrder(
-         $cartId,
-@@ -98,7 +100,7 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function savePaymentInformation(
-         $cartId,
-@@ -110,14 +112,21 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
-             $quoteRepository = $this->getCartRepository();
-             /** @var \Magento\Quote\Model\Quote $quote */
-             $quote = $quoteRepository->getActive($cartId);
-+            $customerId = $quote->getBillingAddress()
-+                ->getCustomerId();
-+            if (!$billingAddress->getCustomerId() && $customerId) {
-+                //It's necessary to verify the price rules with the customer data
-+                $billingAddress->setCustomerId($customerId);
-+            }
-             $quote->removeAddress($quote->getBillingAddress()->getId());
-             $quote->setBillingAddress($billingAddress);
-             $quote->setDataChanges(true);
-             $shippingAddress = $quote->getShippingAddress();
-             if ($shippingAddress && $shippingAddress->getShippingMethod()) {
--                $shippingDataArray = explode('_', $shippingAddress->getShippingMethod());
--                $shippingCarrier = array_shift($shippingDataArray);
--                $shippingAddress->setLimitCarrier($shippingCarrier);
-+                $shippingRate = $shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod());
-+                $shippingAddress->setLimitCarrier(
-+                    $shippingRate ? $shippingRate->getCarrier() : $shippingAddress->getShippingMethod()
-+                );
-             }
-         }
-         $this->paymentMethodManagement->set($cartId, $paymentMethod);
-@@ -125,7 +134,7 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function getPaymentInformation($cartId)
-     {
-diff --git a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
-index 381ee2b9015..499e02d681f 100644
---- a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
-+++ b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
-@@ -19,6 +19,9 @@ use Magento\Quote\Model\ShippingFactory;
- use Magento\Framework\App\ObjectManager;
- 
- /**
-+ * Class ShippingInformationManagement
-+ *
-+ * @package Magento\Checkout\Model
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInformationManagementInterface
-@@ -99,8 +102,8 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
-      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector
--     * @param CartExtensionFactory|null $cartExtensionFactory,
--     * @param ShippingAssignmentFactory|null $shippingAssignmentFactory,
-+     * @param CartExtensionFactory|null $cartExtensionFactory
-+     * @param ShippingAssignmentFactory|null $shippingAssignmentFactory
-      * @param ShippingFactory|null $shippingFactory
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -136,7 +139,14 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * Save address information.
-+     *
-+     * @param int $cartId
-+     * @param \Magento\Checkout\Api\Data\ShippingInformationInterface $addressInformation
-+     * @return \Magento\Checkout\Api\Data\PaymentDetailsInterface
-+     * @throws InputException
-+     * @throws NoSuchEntityException
-+     * @throws StateException
-      */
-     public function saveAddressInformation(
-         $cartId,
-@@ -151,6 +161,10 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
-             $address->setCustomerAddressId(null);
-         }
- 
-+        if ($billingAddress && !$billingAddress->getCustomerAddressId()) {
-+            $billingAddress->setCustomerAddressId(null);
-+        }
-+
-         if (!$address->getCountryId()) {
-             throw new StateException(__('The shipping address is missing. Set the address and try again.'));
-         }
-@@ -177,7 +191,9 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
- 
-         $shippingAddress = $quote->getShippingAddress();
- 
--        if (!$shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod())) {
-+        if (!$quote->getIsVirtual()
-+            && !$shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod())
-+        ) {
-             throw new NoSuchEntityException(
-                 __('Carrier with such method not found: %1, %2', $carrierCode, $methodCode)
-             );
-@@ -208,6 +224,8 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
-     }
- 
-     /**
-+     * Prepare shipping assignment.
-+     *
-      * @param CartInterface $quote
-      * @param AddressInterface $address
-      * @param string $method
-diff --git a/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php b/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
-index d926e33d541..6bc7965ff5e 100644
---- a/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
-+++ b/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
-@@ -7,6 +7,9 @@ namespace Magento\Checkout\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
- 
-+/**
-+ * Class SalesQuoteSaveAfterObserver
-+ */
- class SalesQuoteSaveAfterObserver implements ObserverInterface
- {
-     /**
-@@ -24,15 +27,18 @@ class SalesQuoteSaveAfterObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Assign quote to session
-+     *
-      * @param \Magento\Framework\Event\Observer $observer
-      * @return void
-      */
-     public function execute(\Magento\Framework\Event\Observer $observer)
-     {
-+        /* @var \Magento\Quote\Model\Quote $quote */
-         $quote = $observer->getEvent()->getQuote();
--        /* @var $quote \Magento\Quote\Model\Quote */
-+
-         if ($quote->getIsCheckoutCart()) {
--            $this->checkoutSession->getQuoteId($quote->getId());
-+            $this->checkoutSession->setQuoteId($quote->getId());
-         }
-     }
- }
-diff --git a/app/code/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddresses.php b/app/code/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddresses.php
-index 3791b28917e..e7776b3dcbe 100644
---- a/app/code/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddresses.php
-+++ b/app/code/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddresses.php
-@@ -15,10 +15,11 @@ use Magento\Quote\Model\Quote;
- class ResetQuoteAddresses
- {
-     /**
-+     * Clears the quote addresses when all the items are removed from the cart
-+     *
-      * @param Quote $quote
-      * @param Quote $result
-      * @param mixed $itemId
--     *
-      * @return Quote
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-@@ -28,6 +29,10 @@ class ResetQuoteAddresses
-             foreach ($result->getAllAddresses() as $address) {
-                 $result->removeAddress($address->getId());
-             }
-+            $extensionAttributes = $result->getExtensionAttributes();
-+            if (!$result->isVirtual() && $extensionAttributes && $extensionAttributes->getShippingAssignments()) {
-+                $extensionAttributes->setShippingAssignments([]);
-+            }
-         }
- 
-         return $result;
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutActionGroup.xml
-new file mode 100644
-index 00000000000..a29564b2457
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Checkout select Check/Money billing method -->
-+    <actionGroup name="AdminCheckoutSelectCheckMoneyOrderBillingMethodActionGroup">
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <conditionalClick selector="{{AdminCheckoutPaymentSection.checkBillingMethodByName('Check / Money order')}}" dependentSelector="{{AdminCheckoutPaymentSection.checkBillingMethodByName('Check / Money order')}}" visible="true" stepKey="selectCheckmoBillingMethod"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterBillingMethodSelection"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertAdminEmailValidationMessageOnCheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertAdminEmailValidationMessageOnCheckoutActionGroup.xml
-new file mode 100644
-index 00000000000..858dbfc5e76
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertAdminEmailValidationMessageOnCheckoutActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertAdminEmailValidationMessageOnCheckoutActionGroup">
-+        <arguments>
-+            <argument name="message" type="string" defaultValue="Please enter a valid email address (Ex: johndoe@domain.com)."/>
-+        </arguments>
-+        <waitForElementVisible selector="{{AdminOrderFormAccountSection.emailErrorMessage}}" stepKey="waitForFormValidation"/>
-+        <see selector="{{AdminOrderFormAccountSection.emailErrorMessage}}" userInput="{{message}}" stepKey="seeTheErrorMessageIsDisplayed"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertMiniShoppingCartSubTotalActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertMiniShoppingCartSubTotalActionGroup.xml
-new file mode 100644
-index 00000000000..8c5c6f41fff
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertMiniShoppingCartSubTotalActionGroup.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertMiniShoppingCartSubTotalActionGroup">
-+        <arguments>
-+            <argument name="dataQuote" type="entity" />
-+        </arguments>
-+        <waitForPageLoad stepKey="waitForPageLoad" time="120"/>
-+        <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabMiniCartTotal" />
-+        <assertContains stepKey="assertMiniCartTotal">
-+            <actualResult type="variable">$grabMiniCartTotal</actualResult>
-+            <expectedResult type="string">{{dataQuote.subtotal}}</expectedResult>
-+        </assertContains>
-+        <assertContains stepKey="assertMiniCartCurrency">
-+            <actualResult type="variable">$grabMiniCartTotal</actualResult>
-+            <expectedResult type="string">{{dataQuote.currency}}</expectedResult>
-+        </assertContains>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertShoppingCartIsEmptyActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertShoppingCartIsEmptyActionGroup.xml
-new file mode 100644
-index 00000000000..d71832c63cb
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertShoppingCartIsEmptyActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertShoppingCartIsEmptyActionGroup">
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
-+        <waitForPageLoad stepKey="waitForCheckoutPageLoad"/>
-+        <see userInput="You have no items in your shopping cart." stepKey="seeNoItemsInShoppingCart"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefronElementVisibleActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefronElementVisibleActionGroup.xml
-new file mode 100644
-index 00000000000..b99c4b7f5bf
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefronElementVisibleActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontElementVisibleActionGroup">
-+        <arguments>
-+            <argument name="selector" type="string"/>
-+            <argument name="userInput" type="string"/>
-+        </arguments>
-+        <see selector="{{selector}}" userInput="{{userInput}}" stepKey="assertElement"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutCartItemsActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutCartItemsActionGroup.xml
-new file mode 100644
-index 00000000000..77a8bef9baf
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutCartItemsActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontCheckoutCartItemsActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+            <argument name="productSku" type="string"/>
-+            <argument name="productPrice" type="string"/>
-+            <argument name="subtotal" type="string"/>
-+            <argument name="qty" type="string"/>
-+        </arguments>
-+        <see selector="{{CheckoutCartProductSection.productName}}" userInput="{{productName}}"  stepKey="seeProductNameInCheckoutSummary"/>
-+        <see selector="{{CheckoutCartProductSection.checkoutCartProductPrice}}" userInput="{{productPrice}}" stepKey="seeProductPriceInCart"/>
-+        <see selector="{{CheckoutCartProductSection.checkoutCartSubtotal}}" userInput="{{subtotal}}" stepKey="seeSubtotalPrice"/>
-+        <seeInField selector="{{CheckoutCartProductSection.qtyByContains(productSku)}}" userInput="{{qty}}" stepKey="seeProductQuantity"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontElementInvisibleActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontElementInvisibleActionGroup.xml
-new file mode 100644
-index 00000000000..69fe27ff074
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontElementInvisibleActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontElementInvisibleActionGroup">
-+        <arguments>
-+            <argument name="selector" type="string"/>
-+            <argument name="userInput" type="string"/>
-+        </arguments>
-+        <dontSee selector="{{selector}}" userInput="{{userInput}}" stepKey="dontSeeElement"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontEmailNoteMessageOnCheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontEmailNoteMessageOnCheckoutActionGroup.xml
-new file mode 100644
-index 00000000000..c4fc753e737
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontEmailNoteMessageOnCheckoutActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontEmailNoteMessageOnCheckoutActionGroup">
-+        <arguments>
-+            <argument name="message" type="string" defaultValue="You can create an account after checkout." />
-+        </arguments>
-+        <waitForElementVisible selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.emailNoteMessage}}" stepKey="waitForFormValidation"/>
-+        <see selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.emailNoteMessage}}" userInput="{{message}}" stepKey="seeTheNoteMessageIsDisplayed"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontEmailTooltipContentOnCheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontEmailTooltipContentOnCheckoutActionGroup.xml
-new file mode 100644
-index 00000000000..f9c6771262c
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontEmailTooltipContentOnCheckoutActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontEmailTooltipContentOnCheckoutActionGroup">
-+        <arguments>
-+            <argument name="content" type="string" defaultValue="We'll send your order confirmation here." />
-+        </arguments>
-+        <waitForElementVisible selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.emailTooltipButton}}" stepKey="waitForTooltipButtonVisible" />
-+        <click selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.emailTooltipButton}}" stepKey="clickEmailTooltipButton" />
-+        <see selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.emailTooltipContent}}" userInput="{{content}}" stepKey="seeEmailTooltipContent" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontEmailValidationMessageOnCheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontEmailValidationMessageOnCheckoutActionGroup.xml
-new file mode 100644
-index 00000000000..14b96ed46ce
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontEmailValidationMessageOnCheckoutActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontEmailValidationMessageOnCheckoutActionGroup">
-+        <arguments>
-+            <argument name="message" type="string" defaultValue="Please enter a valid email address (Ex: johndoe@domain.com)." />
-+        </arguments>
-+        <waitForElementVisible selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.emailErrorMessage}}" stepKey="waitForFormValidation"/>
-+        <see selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.emailErrorMessage}}" userInput="{{message}}" stepKey="seeTheErrorMessageIsDisplayed"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml
-new file mode 100644
-index 00000000000..258d8ed9021
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontMiniCartItemsActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+            <argument name="productPrice" type="string"/>
-+            <argument name="cartSubtotal" type="string"/>
-+            <argument name="qty" type="string"/>
-+        </arguments>
-+        <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productName}}"  stepKey="seeProductNameInMiniCart"/>
-+        <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productPrice}}" stepKey="seeProductPriceInMiniCart"/>
-+        <seeElement selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="seeCheckOutButtonInMiniCart"/>
-+        <seeElement selector="{{StorefrontMinicartSection.productQuantity(productName, qty)}}" stepKey="seeProductQuantity1"/>
-+        <seeElement selector="{{StorefrontMinicartSection.productImage}}" stepKey="seeProductImage"/>
-+        <see selector="{{StorefrontMinicartSection.productSubTotal}}" userInput="{{cartSubtotal}}" stepKey="seeSubTotal"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontSeeElementActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontSeeElementActionGroup.xml
-new file mode 100644
-index 00000000000..02f00a8cd31
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontSeeElementActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontSeeElementActionGroup">
-+        <arguments>
-+            <argument name="selector" type="string"/>
-+        </arguments>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <scrollTo selector="{{selector}}" stepKey="scrollToElement"/>
-+        <seeElement selector="{{selector}}" stepKey="assertElement"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontShoppingCartSummaryItemsActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontShoppingCartSummaryItemsActionGroup.xml
-new file mode 100644
-index 00000000000..9b963273b04
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontShoppingCartSummaryItemsActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontShoppingCartSummaryItemsActionGroup">
-+        <arguments>
-+            <argument name="subtotal" type="string"/>
-+            <argument name="total" type="string"/>
-+        </arguments>
-+        <seeInCurrentUrl url="{{CheckoutCartPage.url}}" stepKey="assertUrl"/>
-+        <waitForElementVisible selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="waitForSubtotalVisible"/>
-+        <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="{{subtotal}}" stepKey="assertSubtotal"/>
-+        <waitForElementVisible selector="{{CheckoutCartSummarySection.total}}" stepKey="waitForTotalVisible"/>
-+        <waitForElementVisible selector="{{CheckoutCartSummarySection.totalAmount(total)}}" stepKey="waitForTotalAmountVisible"/>
-+        <see selector="{{CheckoutCartSummarySection.total}}" userInput="{{total}}" stepKey="assertTotal"/>
-+        <seeElement  selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="seeProceedToCheckoutButton"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontShoppingCartSummaryWithShippingActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontShoppingCartSummaryWithShippingActionGroup.xml
-new file mode 100644
-index 00000000000..7d8406adc90
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontShoppingCartSummaryWithShippingActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontShoppingCartSummaryWithShippingActionGroup" extends="AssertStorefrontShoppingCartSummaryItemsActionGroup">
-+        <arguments>
-+            <argument name="shipping" type="string"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{CheckoutCartSummarySection.shipping}}" stepKey="waitForElementToBeVisible" after="assertSubtotal"/>
-+        <waitForText userInput="{{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" time="30" stepKey="assertShipping" after="waitForElementToBeVisible"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
-index 4c9ef93c2c4..2e4b742ece8 100644
---- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
-@@ -7,17 +7,61 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Checkout select Flat Rate shipping method -->
-+    <actionGroup name="CheckoutSelectFlatRateShippingMethodActionGroup">
-+        <conditionalClick selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" dependentSelector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" visible="true" stepKey="selectFlatRateShippingMethod"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForNextButton"/>
-+    </actionGroup>
-+
-     <!-- Go to checkout from minicart -->
-     <actionGroup name="GoToCheckoutFromMinicartActionGroup">
--        <wait stepKey="wait" time="10" />
-+        <waitForElementNotVisible selector="{{StorefrontMinicartSection.emptyCart}}" stepKey="waitUpdateQuantity" />
-+        <wait time="5" stepKey="waitMinicartRendering"/>
-         <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
-         <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
--        <waitForPageLoad stepKey="waitForPageLoad"/>
-+    </actionGroup>
-+
-+    <!-- Go to checkout from cart -->
-+    <actionGroup name="GoToCheckoutFromCartActionGroup">
-+        <waitForElementNotVisible selector="{{StorefrontMinicartSection.emptyCart}}" stepKey="waitUpdateQuantity" />
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+        <seeInCurrentUrl url="{{CheckoutCartPage.url}}" stepKey="assertCheckoutCartUrl"/>
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="goToCheckout"/>
-     </actionGroup>
- 
-     <!-- Guest checkout filling shipping section -->
-     <actionGroup name="GuestCheckoutFillingShippingSectionActionGroup">
-+        <arguments>
-+            <argument name="customerVar" defaultValue="CustomerEntityOne"/>
-+            <argument name="customerAddressVar" defaultValue="CustomerAddressSimple"/>
-+            <!--First available shipping method will be selected if value is not passed for shippingMethod-->
-+            <argument name="shippingMethod" defaultValue="" type="string"/>
-+        </arguments>
-+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
-+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
-+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
-+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
-+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{customerAddressVar.city}}" stepKey="enterCity"/>
-+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
-+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
-+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+        <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('shippingMethod')}}" stepKey="selectShippingMethod"/>
-+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
-+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
-+    </actionGroup>
-+
-+    <actionGroup name="GuestCheckoutFillShippingNoWaitForPaymentActionGroup" extends="GuestCheckoutFillingShippingSectionActionGroup">
-+        <remove keyForRemoval="waitForPaymentSectionLoaded"/>
-+        <remove keyForRemoval="assertCheckoutPaymentUrl"/>
-+    </actionGroup>
-+
-+    <!-- Guest checkout filling shipping section without region -->
-+    <actionGroup name="GuestCheckoutFillingShippingSectionWithoutRegionActionGroup">
-         <arguments>
-             <argument name="customerVar"/>
-             <argument name="customerAddressVar"/>
-@@ -27,8 +71,8 @@
-         <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
-         <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
-         <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{customerAddressVar.city}}" stepKey="enterCity"/>
--        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
-         <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
-+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{customerAddressVar.country_id}}" stepKey="enterCountry"/>
-         <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-         <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-@@ -38,8 +82,59 @@
-         <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
-     </actionGroup>
- 
-+    <!-- Guest checkout filling shipping section with unavailable payments-->
-+    <actionGroup name="GuestCheckoutFillingShippingSectionUnavailablePaymentActionGroup">
-+        <arguments>
-+            <argument name="customerVar"/>
-+            <argument name="customerAddressVar"/>
-+        </arguments>
-+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
-+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
-+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
-+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
-+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{customerAddressVar.city}}" stepKey="enterCity"/>
-+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
-+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
-+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+        <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
-+        <waitForElementVisible selector="{{CheckoutPaymentSection.noQuotes}}" stepKey="waitMessage"/>
-+        <see userInput="No Payment method available." stepKey="checkMessage"/>
-+    </actionGroup>
-+
-+    <actionGroup name="GuestCheckoutWithSpecificCountryOptionForPaymentMethodActionGroup" extends="GuestCheckoutFillingShippingSectionUnavailablePaymentActionGroup">
-+        <arguments>
-+            <argument name="paymentMethod" type="string"/>
-+        </arguments>
-+        <remove keyForRemoval="checkMessage"/>
-+        <dontSee selector="{{CheckoutPaymentSection.paymentMethodByName(paymentMethod)}}" stepKey="paymentMethodDoesNotAvailable"/>
-+    </actionGroup>
-     <!-- Logged in user checkout filling shipping section -->
-     <actionGroup name="LoggedInUserCheckoutFillingShippingSectionActionGroup">
-+        <arguments>
-+            <argument name="customerVar" defaultValue="CustomerEntityOne"/>
-+            <argument name="customerAddressVar" defaultValue="CustomerAddressSimple"/>
-+        </arguments>
-+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
-+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
-+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
-+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{customerAddressVar.city}}" stepKey="enterCity"/>
-+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
-+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
-+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+        <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
-+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
-+    </actionGroup>
-+
-+    <!-- Logged in user checkout filling shipping section -->
-+    <actionGroup name="LoggedInUserCheckoutAddNewShippingSectionWithoutRegionActionGroup">
-         <arguments>
-             <argument name="customerVar"/>
-             <argument name="customerAddressVar"/>
-@@ -48,9 +143,10 @@
-         <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
-         <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
-         <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{customerAddressVar.city}}" stepKey="enterCity"/>
--        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
-         <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
-+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{customerAddressVar.country_id}}" stepKey="enterCountry"/>
-         <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
-+        <click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="clickSaveAddress"/>
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-         <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-         <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-@@ -59,6 +155,24 @@
-         <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
-     </actionGroup>
- 
-+    <!-- Place order with logged the user -->
-+    <actionGroup name="PlaceOrderWithLoggedUserActionGroup">
-+        <arguments>
-+            <!--First available shipping method will be selected if value is not passed for shippingMethod-->
-+            <argument name="shippingMethod" defaultValue="" type="string"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="waitProceedToCheckout"/>
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
-+        <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('shippingMethod')}}" stepKey="selectShippingMethod"/>
-+        <waitForElement selector="{{CheckoutShippingSection.next}}" stepKey="waitForNextButton"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
-+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
-+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="waitForPlaceOrderButton"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
-+    </actionGroup>
-+
-     <!-- Check product in checkout cart items -->
-     <actionGroup name="CheckProductInCheckoutCartItemsActionGroup">
-         <arguments>
-@@ -74,18 +188,26 @@
-     <!-- Check order summary in checkout -->
-     <actionGroup name="CheckOrderSummaryInCheckoutActionGroup">
-         <arguments>
--            <argument name="subtotal"/>
--            <argument name="shippingTotal"/>
--            <argument name="shippingMethod"/>
--            <argument name="total"/>
-+            <argument name="subtotal" type="string"/>
-+            <argument name="shippingTotal" type="string"/>
-+            <argument name="shippingMethod" type="string"/>
-+            <argument name="total" type="string"/>
-         </arguments>
-         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
--        <see userInput="${{subtotal}}" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="assertSubtotal"/>
--        <see userInput="${{shippingTotal}}" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" stepKey="assertShipping"/>
-+        <see userInput="{{subtotal}}" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="assertSubtotal"/>
-+        <see userInput="{{shippingTotal}}" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" stepKey="assertShipping"/>
-         <see userInput="{{shippingMethod}}" selector="{{CheckoutPaymentSection.orderSummaryShippingMethod}}" stepKey="assertShippingMethod"/>
--        <see userInput="${{total}}" selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="assertTotal"/>
-+        <see userInput="{{total}}" selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="assertTotal"/>
-    </actionGroup>
- 
-+    <actionGroup name="CheckTotalsSortOrderInSummarySection">
-+        <arguments>
-+            <argument name="elementName" type="string"/>
-+            <argument name="positionNumber" type="string"/>
-+        </arguments>
-+        <see userInput="{{elementName}}" selector="{{CheckoutCartSummarySection.elementPosition(positionNumber)}}" stepKey="assertElementPosition"/>
-+    </actionGroup>
-+
-     <!-- Check ship to information in checkout -->
-     <actionGroup name="CheckShipToInformationInCheckoutActionGroup">
-         <arguments>
-@@ -113,8 +235,25 @@
- 
-     <!-- Checkout select Check/Money Order payment -->
-     <actionGroup name="CheckoutSelectCheckMoneyOrderPaymentActionGroup">
--        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
--        <conditionalClick selector="{{CheckoutPaymentSection.checkMoneyOrderPayment}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" stepKey="clickCheckMoneyOrderPayment" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <conditionalClick selector="{{StorefrontCheckoutPaymentMethodSection.checkPaymentMethodByName('Check / Money order')}}" dependentSelector="{{StorefrontCheckoutPaymentMethodSection.checkPaymentMethodByName('Check / Money order')}}" visible="true" stepKey="selectCheckmoPaymentMethod"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterPaymentMethodSelection"/>
-+    </actionGroup>
-+
-+    <!-- Check selected shipping address information on shipping information step -->
-+    <actionGroup name="CheckSelectedShippingAddressInCheckoutActionGroup">
-+        <arguments>
-+            <argument name="customerVar"/>
-+            <argument name="customerAddressVar"/>
-+        </arguments>
-+        <waitForElement selector="{{CheckoutShippingSection.shippingTab}}" time="30" stepKey="waitForShippingSectionLoaded"/>
-+        <see stepKey="VerifyFirstNameInSelectedAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerVar.firstname}}" />
-+        <see stepKey="VerifyLastNameInSelectedAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerVar.lastname}}" />
-+        <see stepKey="VerifyStreetInSelectedAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.street[0]}}" />
-+        <see stepKey="VerifyCityInSelectedAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.city}}" />
-+        <see stepKey="VerifyZipInSelectedAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.postcode}}" />
-+        <see stepKey="VerifyPhoneInSelectedAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.telephone}}" />
-     </actionGroup>
- 
-     <!-- Check billing address in checkout -->
-@@ -133,16 +272,55 @@
-         <see userInput="{{customerAddressVar.telephone}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressTelephone"/>
-     </actionGroup>
- 
-+    <!-- Check billing address in checkout with billing address on payment page -->
-+    <actionGroup name="CheckBillingAddressInCheckoutWithBillingAddressOnPaymentPageActionGroup">
-+        <arguments>
-+            <argument name="customerVar"/>
-+            <argument name="customerAddressVar"/>
-+        </arguments>
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
-+        <see userInput="{{customerVar.firstName}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsFirstName"/>
-+        <see userInput="{{customerVar.lastName}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsLastName"/>
-+        <see userInput="{{customerAddressVar.street[0]}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsStreet"/>
-+        <see userInput="{{customerAddressVar.city}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsCity"/>
-+        <see userInput="{{customerAddressVar.state}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsState"/>
-+        <see userInput="{{customerAddressVar.postcode}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsPostcode"/>
-+        <see userInput="{{customerAddressVar.telephone}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsTelephone"/>
-+    </actionGroup>
-+
-     <!-- Checkout place order -->
-     <actionGroup name="CheckoutPlaceOrderActionGroup">
-         <arguments>
-             <argument name="orderNumberMessage"/>
-             <argument name="emailYouMessage"/>
-         </arguments>
--        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-         <see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{orderNumberMessage}}" stepKey="seeOrderNumber"/>
-         <see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{emailYouMessage}}" stepKey="seeEmailYou"/>
-     </actionGroup>
- 
--</actionGroups>
-\ No newline at end of file
-+    <!--Verify country options in checkout top destination section-->
-+    <actionGroup name="VerifyTopDestinationsCountry">
-+        <arguments>
-+            <argument name="country" type="string"/>
-+            <argument name="placeNumber"/>
-+        </arguments>
-+        <conditionalClick selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="openShippingDetails"/>
-+        <see selector="{{CheckoutCartSummarySection.countryParameterized('placeNumber')}}" userInput="{{country}}" stepKey="seeCountry"/>
-+    </actionGroup>
-+
-+    <actionGroup name="StorefrontSignOutActionGroup">
-+        <click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
-+        <click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see userInput="You are signed out" stepKey="signOut"/>
-+    </actionGroup>
-+
-+    <!--Click Place Order button-->
-+    <actionGroup name="ClickPlaceOrderActionGroup">
-+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClearShippingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClearShippingAddressActionGroup.xml
-new file mode 100644
-index 00000000000..0e6994e8fea
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClearShippingAddressActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.z
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="ClearShippingAddressActionGroup">
-+        <clearField selector="{{CheckoutShippingSection.firstName}}" stepKey="clearFieldFirstName"/>
-+        <clearField selector="{{CheckoutShippingSection.company}}" stepKey="clearFieldCompany"/>
-+        <clearField selector="{{CheckoutShippingSection.street}}" stepKey="clearFieldStreetAddress"/>
-+        <clearField selector="{{CheckoutShippingSection.city}}" stepKey="clearFieldCityName"/>
-+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="" stepKey="clearFieldRegion"/>
-+        <clearField selector="{{CheckoutShippingSection.postcode}}"  stepKey="clearFieldZip"/>
-+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="" stepKey="clearFieldCounty"/>
-+        <clearField selector="{{CheckoutShippingSection.telephone}}" stepKey="clearFieldPhoneNumber"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CustomerCheckoutFillNewShippingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CustomerCheckoutFillNewShippingAddressActionGroup.xml
-new file mode 100644
-index 00000000000..6a3d8810f42
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CustomerCheckoutFillNewShippingAddressActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="CustomerCheckoutFillNewShippingAddressActionGroup">
-+        <arguments>
-+            <argument name="address" type="entity"/>
-+        </arguments>
-+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{address.country}}" stepKey="selectCounty"/>
-+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{address.street}}" stepKey="fillStreet"/>
-+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{address.city}}" stepKey="fillCity"/>
-+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{address.state}}" stepKey="selectRegion"/>
-+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{address.postcode}}" stepKey="fillZipCode"/>
-+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{address.telephone}}" stepKey="fillPhone"/>
-+        <fillField selector="{{CheckoutShippingSection.company}}" userInput="{{address.company}}" stepKey="fillCompany"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/DeleteProductFromShoppingCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/DeleteProductFromShoppingCartActionGroup.xml
-new file mode 100644
-index 00000000000..86261e85d8d
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/DeleteProductFromShoppingCartActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.z
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="DeleteProductFromShoppingCartActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <click selector="{{CheckoutCartProductSection.removeProductByName(productName)}}" stepKey="deleteProductFromCheckoutCart"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see userInput="You have no items in your shopping cart." stepKey="seeNoItemsInShoppingCart"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillNewShippingAddressModalActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillNewShippingAddressModalActionGroup.xml
-new file mode 100644
-index 00000000000..7035855cc0e
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillNewShippingAddressModalActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="FillNewShippingAddressModalActionGroup" extends="FillShippingAddressOneStreetActionGroup">
-+        <arguments>
-+            <argument name="address"/>
-+        </arguments>
-+        <selectOption stepKey="selectRegion" selector="{{CheckoutShippingSection.region}}"
-+                      userInput="{{address.state}}" after="fillCityName"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingAddressOneStreetActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingAddressOneStreetActionGroup.xml
-new file mode 100644
-index 00000000000..cbc6c5320b0
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingAddressOneStreetActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="FillShippingAddressOneStreetActionGroup">
-+        <arguments>
-+            <argument name="address" type="entity"/>
-+        </arguments>
-+        <fillField stepKey="fillFirstName" selector="{{CheckoutShippingSection.firstName}}" userInput="{{address.firstname}}"/>
-+        <fillField stepKey="fillLastName" selector="{{CheckoutShippingSection.lastName}}" userInput="{{address.lastname}}"/>
-+        <fillField stepKey="fillCompany" selector="{{CheckoutShippingSection.company}}" userInput="{{address.company}}"/>
-+        <fillField stepKey="fillPhoneNumber" selector="{{CheckoutShippingSection.telephone}}" userInput="{{address.telephone}}"/>
-+        <fillField stepKey="fillStreetAddress" selector="{{CheckoutShippingSection.street}}" userInput="{{address.street[0]}}"/>
-+        <fillField stepKey="fillCityName" selector="{{CheckoutShippingSection.city}}" userInput="{{address.city}}"/>
-+        <selectOption stepKey="selectCounty" selector="{{CheckoutShippingSection.country}}" userInput="{{address.country_id}}"/>
-+        <fillField stepKey="fillZip" selector="{{CheckoutShippingSection.postcode}}" userInput="{{address.postcode}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml
-new file mode 100644
-index 00000000000..f12bf4344ab
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="FillShippingZipForm">
-+        <arguments>
-+            <argument name="address"/>
-+        </arguments>
-+        <conditionalClick stepKey="openShippingDetails" selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+        <waitForElementVisible selector="{{CheckoutCartSummarySection.country}}" time="30" stepKey="waitForCountryFieldAppears"/>
-+        <selectOption stepKey="selectCountry" selector="{{CheckoutCartSummarySection.country}}" userInput="{{address.country}}"/>
-+        <selectOption stepKey="selectStateProvince" selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{address.state}}"/>
-+        <fillField stepKey="fillPostCode" selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{address.postcode}}"/>
-+        <waitForPageLoad stepKey="waitForFormUpdate"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
-index e7a6e219d28..59e997eccec 100644
---- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Guest checkout filling billing section -->
-     <actionGroup name="GuestCheckoutFillNewBillingAddressActionGroup">
-         <arguments>
-@@ -44,5 +44,32 @@
-         <selectOption stepKey="selectCounty" selector="{{classPrefix}} {{CheckoutShippingSection.country}}" userInput="{{Address.country_id}}"/>
-         <waitForPageLoad stepKey="waitForFormUpdate2"/>
-     </actionGroup>
-+    <!--Filling address without second address field and without state field-->
-+    <actionGroup name="LoggedInCheckoutWithOneAddressFieldWithoutStateField" extends="LoggedInCheckoutFillNewBillingAddressActionGroup">
-+        <remove keyForRemoval="fillStreetAddress2"/>
-+        <remove keyForRemoval="selectState"/>
-+    </actionGroup>
- 
--</actionGroups>
-\ No newline at end of file
-+    <actionGroup name="clearCheckoutAddressPopupFieldsActionGroup">
-+        <arguments>
-+            <argument name="classPrefix" type="string" defaultValue=""/>
-+        </arguments>
-+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.firstName}}" stepKey="clearFieldFirstName"/>
-+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.lastName}}" stepKey="clearFieldLastName"/>
-+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.company}}" stepKey="clearFieldCompany"/>
-+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.street}}" stepKey="clearFieldStreetAddress1"/>
-+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.street2}}" stepKey="clearFieldStreetAddress2"/>
-+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.city}}" stepKey="clearFieldCityName"/>
-+        <selectOption selector="{{classPrefix}} {{CheckoutShippingSection.region}}" userInput="" stepKey="clearFieldRegion"/>
-+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.postcode}}"  stepKey="clearFieldZip"/>
-+        <selectOption selector="{{classPrefix}} {{CheckoutShippingSection.country}}" userInput="" stepKey="clearFieldCounty"/>
-+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.telephone}}" stepKey="clearFieldPhoneNumber"/>
-+    </actionGroup>
-+    <actionGroup name="GuestCheckoutSelectPaymentAndFillNewBillingAddressActionGroup" extends="GuestCheckoutFillNewBillingAddressActionGroup">
-+        <arguments>
-+            <argument name="paymentMethod" type="string"/>
-+        </arguments>
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" after="waitForLoading3" stepKey="waitForPaymentSectionLoaded"/>
-+        <conditionalClick selector="{{CheckoutPaymentSection.paymentMethodByName(paymentMethod)}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" before="enterFirstName" stepKey="clickCheckMoneyOrderPayment"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewShippingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewShippingAddressActionGroup.xml
-new file mode 100644
-index 00000000000..6ea2ccb08d8
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewShippingAddressActionGroup.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="GuestCheckoutFillNewShippingAddressActionGroup">
-+        <arguments>
-+            <argument name="customer" type="entity"/>
-+            <argument name="address" type="entity"/>
-+        </arguments>
-+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customer.email}}" stepKey="fillEmailField"/>
-+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customer.firstName}}" stepKey="fillFirstName"/>
-+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customer.lastName}}" stepKey="fillLastName"/>
-+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{address.street}}" stepKey="fillStreet"/>
-+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{address.city}}" stepKey="fillCity"/>
-+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{address.state}}" stepKey="selectRegion"/>
-+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{address.postcode}}" stepKey="fillZipCode"/>
-+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{address.telephone}}" stepKey="fillPhone"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml
-new file mode 100644
-index 00000000000..15c157a9826
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Assert That Shipping And Billing Address are the same-->
-+    <actionGroup name="AssertThatShippingAndBillingAddressTheSame">
-+        <!--Get shipping and billing addresses-->
-+        <grabTextFrom selector="{{ShipmentFormSection.shippingAddress}}" stepKey="shippingAddr"/>
-+        <grabTextFrom selector="{{ShipmentFormSection.billingAddress}}" stepKey="billingAddr"/>
-+        <!--Make sure that shipping and billing addresses are different-->
-+        <see userInput="Shipping Address" stepKey="seeShippingAddress"/>
-+        <see userInput="Billing Address" stepKey="seeBillingAddress"/>
-+        <assertEquals stepKey="assert" actual="$billingAddr" expected="$shippingAddr"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerOnCheckoutPageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerOnCheckoutPageActionGroup.xml
-new file mode 100644
-index 00000000000..06a49b856b5
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerOnCheckoutPageActionGroup.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="LoginAsCustomerOnCheckoutPageActionGroup">
-+        <arguments>
-+            <argument name="customer" type="entity"/>
-+        </arguments>
-+        <waitForPageLoad stepKey="waitForCheckoutShippingSectionToLoad"/>
-+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customer.email}}" stepKey="fillEmailField"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-+        <waitForElementVisible selector="{{CheckoutShippingSection.password}}" stepKey="waitForElementVisible"/>
-+        <fillField selector="{{CheckoutShippingSection.password}}" userInput="{{customer.password}}" stepKey="fillPasswordField"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear2"/>
-+        <waitForElementVisible selector="{{CheckoutShippingSection.loginButton}}" stepKey="waitForLoginButtonVisible"/>
-+        <doubleClick selector="{{CheckoutShippingSection.loginButton}}" stepKey="clickLoginBtn"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear3"/>
-+        <waitForPageLoad stepKey="waitToBeLoggedIn"/>
-+        <waitForElementNotVisible selector="{{CheckoutShippingSection.email}}" stepKey="waitForEmailInvisible" time ="60"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerUsingSignInLinkActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerUsingSignInLinkActionGroup.xml
-new file mode 100644
-index 00000000000..35e8e368ae3
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerUsingSignInLinkActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="LoginAsCustomerUsingSignInLinkActionGroup">
-+        <arguments>
-+            <argument name="customer" type="entity"/>
-+        </arguments>
-+        <click selector="{{StorefrontCustomerSignInLinkSection.signInLink}}" stepKey="clickOnCustomizeAndAddToCartButton"/>
-+        <fillField selector="{{StorefrontCustomerSignInLinkSection.email}}" userInput="{{customer.email}}" stepKey="fillEmail"/>
-+        <fillField selector="{{StorefrontCustomerSignInLinkSection.password}}" userInput="{{customer.password}}" stepKey="fillPassword"/>
-+        <click selector="{{StorefrontCustomerSignInLinkSection.signInBtn}}" stepKey="clickSignInBtn"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/OpenStoreFrontCheckoutShippingPageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/OpenStoreFrontCheckoutShippingPageActionGroup.xml
-new file mode 100644
-index 00000000000..cea9d968b58
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/OpenStoreFrontCheckoutShippingPageActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="OpenStoreFrontCheckoutShippingPageActionGroup">
-+        <amOnPage url="{{CheckoutShippingPage.url}}" stepKey="amOnCheckoutShippingPage"/>
-+        <waitForPageLoad stepKey="waitForCheckoutShippingPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddBundleProductToTheCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddBundleProductToTheCartActionGroup.xml
-new file mode 100644
-index 00000000000..2c64eda38a4
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddBundleProductToTheCartActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAddBundleProductToTheCartActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+            <argument name="quantity" type="string"/>
-+        </arguments>
-+        <click selector="{{StorefrontBundleProductActionSection.customizeAndAddToCartButton}}" stepKey="clickOnCustomizeAndAddToCartButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <click selector="{{StorefrontBundleProductActionSection.dropdownSelectOption}}" stepKey="clickOnSelectOption"/>
-+        <click selector="{{StorefrontBundleProductActionSection.dropdownProductSelection(productName)}}"  stepKey="selectProduct"/>
-+        <clearField selector="{{StorefrontBundleProductActionSection.quantityField}}" stepKey="clearTheQuantityField"/>
-+        <fillField selector="{{StorefrontBundleProductActionSection.quantityField}}" userInput="{{quantity}}" stepKey="fillTheProductQuantity"/>
-+        <click selector="{{StorefrontBundleProductActionSection.addToCartButton}}" stepKey="clickOnAddToButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddProductToCartFromCategoryActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddProductToCartFromCategoryActionGroup.xml
-new file mode 100644
-index 00000000000..de08fe7427c
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddProductToCartFromCategoryActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAddProductToCartFromCategoryActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <scrollTo selector="{{StorefrontCategoryProductSection.ProductInfoByName(productName)}}" stepKey="scroll"/>
-+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(productName)}}" stepKey="moveMouseOverProduct" />
-+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(productName)}}" stepKey="clickAddToCart" />
-+        <waitForAjaxLoad stepKey="waitForAjax"/>
-+    </actionGroup>
-+</actionGroups>
-+
-+
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddProductWithSelectedConfigurableAndCustomOptionsToCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddProductWithSelectedConfigurableAndCustomOptionsToCartActionGroup.xml
-new file mode 100644
-index 00000000000..8e13748d64e
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddProductWithSelectedConfigurableAndCustomOptionsToCartActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Add product with selected configurable option and customizable option to cart from the product page -->
-+    <actionGroup name="StorefrontAddProductWithSelectedConfigurableAndCustomOptionsToCartActionGroup">
-+        <arguments>
-+            <argument name="product" type="entity"/>
-+            <argument name="option" type="string"/>
-+            <argument name="customizableOption" type="string"/>
-+        </arguments>
-+        <selectOption userInput="{{option}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption"/>
-+        <click selector="{{StorefrontProductInfoMainSection.selectCustomOptionByName(customizableOption)}}" stepKey="selectCustomOption"/>
-+        <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage"/>
-+        <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="You added {{product.name}} to your shopping cart." stepKey="assertSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddProductWithSelectedOptionToCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddProductWithSelectedOptionToCartActionGroup.xml
-new file mode 100644
-index 00000000000..5d844523d44
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddProductWithSelectedOptionToCartActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Add product with selected option to Cart from the product page  -->
-+    <actionGroup name="StorefrontAddProductWithSelectedConfigurableOptionToCartActionGroup">
-+        <arguments>
-+            <argument name="product" type="entity"/>
-+            <argument name="option" type="string"/>
-+        </arguments>
-+        <selectOption userInput="{{option}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption"/>
-+        <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage"/>
-+        <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="You added {{product.name}} to your shopping cart." stepKey="assertSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddSimpleProductToCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddSimpleProductToCartActionGroup.xml
-new file mode 100644
-index 00000000000..7bfc87cd8d6
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddSimpleProductToCartActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+  <!-- Add Product to Cart from the category page and check message -->
-+    <actionGroup name="StorefrontAddSimpleProductToCartActionGroup">
-+        <arguments>
-+            <argument name="product" type="entity"/>
-+        </arguments>
-+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
-+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="clickAddToCart" />
-+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage" />
-+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="assertSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-+
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddToTheCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddToTheCartActionGroup.xml
-new file mode 100644
-index 00000000000..1603758016e
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddToTheCartActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAddToTheCartActionGroup">
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <scrollTo selector="{{StorefrontProductActionSection.addToCart}}"  stepKey="scrollToAddToCartButton"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCartEstimateShippingAndTaxActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCartEstimateShippingAndTaxActionGroup.xml
-new file mode 100644
-index 00000000000..0d6f34098c0
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCartEstimateShippingAndTaxActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert Estimate Shipping and Tax Data in Cart -->
-+    <actionGroup name="StorefrontAssertCartEstimateShippingAndTaxActionGroup">
-+        <arguments>
-+            <argument name="customerData" defaultValue="Simple_US_CA_Customer_For_Shipment"/>
-+        </arguments>
-+        <seeInField selector="{{CheckoutCartSummarySection.country}}" userInput="{{customerData.country}}" stepKey="assertCountryFieldInCartEstimateShippingAndTaxSection"/>
-+        <seeInField selector="{{CheckoutCartSummarySection.stateProvinceInput}}" userInput="{{customerData.region}}" stepKey="assertStateProvinceInCartEstimateShippingAndTaxSection"/>
-+        <seeInField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{customerData.postcode}}" stepKey="assertZipPostalCodeInCartEstimateShippingAndTaxSection"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCartShippingMethodSelectedActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCartShippingMethodSelectedActionGroup.xml
-new file mode 100644
-index 00000000000..4061f97821c
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCartShippingMethodSelectedActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert Shipping Method Is Checked on Cart -->
-+    <actionGroup name="StorefrontAssertCartShippingMethodSelectedActionGroup">
-+        <arguments>
-+            <argument name="carrierCode" type="string"/>
-+            <argument name="methodCode" type="string"/>
-+        </arguments>
-+        <seeCheckboxIsChecked selector="{{CheckoutCartSummarySection.shippingMethodElementId(carrierCode, methodCode)}}" stepKey="assertShippingMethodIsChecked"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutEstimateShippingInformationActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutEstimateShippingInformationActionGroup.xml
-new file mode 100644
-index 00000000000..82d7e12105b
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutEstimateShippingInformationActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert Estimate Shipping and Tax Data on Checkout -->
-+    <actionGroup name="StorefrontAssertCheckoutEstimateShippingInformationActionGroup">
-+        <arguments>
-+            <argument name="customerData" defaultValue="Simple_US_CA_Customer_For_Shipment"/>
-+        </arguments>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.country}}" userInput="{{customerData.country}}" stepKey="assertCountryField"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{customerData.region}}" stepKey="assertStateProvinceField"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{customerData.postcode}}" stepKey="assertZipPostalCodeField"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutShippingMethodSelectedActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutShippingMethodSelectedActionGroup.xml
-new file mode 100644
-index 00000000000..33f2852f1f0
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutShippingMethodSelectedActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert Shipping Method by Name Is Checked on Checkout -->
-+    <actionGroup name="StorefrontAssertCheckoutShippingMethodSelectedActionGroup">
-+        <arguments>
-+            <argument name="shippingMethod"/>
-+        </arguments>
-+        <seeCheckboxIsChecked selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('shippingMethod')}}" stepKey="assertShippingMethodByNameIsChecked"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertGuestShippingInfoActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertGuestShippingInfoActionGroup.xml
-new file mode 100644
-index 00000000000..02c362bf340
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertGuestShippingInfoActionGroup.xml
-@@ -0,0 +1,28 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert guest shipping info on checkout -->
-+    <actionGroup name="StorefrontAssertGuestShippingInfoActionGroup">
-+        <arguments>
-+            <argument name="customerData" defaultValue="Simple_UK_Customer_For_Shipment"/>
-+        </arguments>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{customerData.email}}" stepKey="assertEmailAddress"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{customerData.firstName}}" stepKey="assertFirstName"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{customerData.lastName}}" stepKey="assertLastName"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.company}}" userInput="{{customerData.company}}" stepKey="assertCompany"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{customerData.streetFirstLine}}" stepKey="assertAddressFirstLine"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.street2}}" userInput="{{customerData.streetSecondLine}}" stepKey="assertAddressSecondLine"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{customerData.city}}" stepKey="assertCity"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.country}}" userInput="{{customerData.country}}" stepKey="assertCountry"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.regionInput}}" userInput="{{customerData.region}}" stepKey="assertStateProvince"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{customerData.postcode}}" stepKey="assertZipPostalCode"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{customerData.telephone}}" stepKey="assertPhoneNumber"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertMiniCartItemCountActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertMiniCartItemCountActionGroup.xml
-new file mode 100644
-index 00000000000..03caa558e42
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertMiniCartItemCountActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertMiniCartItemCountActionGroup">
-+        <arguments>
-+            <argument name="productCount" type="string"/>
-+            <argument name="productCountText" type="string"/>
-+        </arguments>
-+        <see selector="{{StorefrontMinicartSection.productCount}}" userInput="{{productCount}}" stepKey="seeProductCountInCart"/>
-+        <see selector="{{StorefrontMinicartSection.visibleItemsCountText}}" userInput="{{productCountText}}" stepKey="seeNumberOfItemDisplayInMiniCart"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductDetailsInOrderSummaryActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductDetailsInOrderSummaryActionGroup.xml
-new file mode 100644
-index 00000000000..59159ea2d0e
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductDetailsInOrderSummaryActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertProductDetailsInOrderSummaryActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+            <argument name="qty" type="string"/>
-+            <argument name="price" type="string"/>
-+        </arguments>
-+        <see selector="{{CheckoutOrderSummarySection.productItemName}}" userInput="{{productName}}" stepKey="seeProductName"/>
-+        <see selector="{{CheckoutOrderSummarySection.productItemQty}}" userInput="{{qty}}" stepKey="seeProductQty"/>
-+        <see selector="{{CheckoutOrderSummarySection.productItemPrice}}" userInput="{{price}}" stepKey="seeProductPrice"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertShippingAddressPageDisplayActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertShippingAddressPageDisplayActionGroup.xml
-new file mode 100644
-index 00000000000..cd3d18e2aa0
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertShippingAddressPageDisplayActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertShippingAddressPageDisplayActionGroup">
-+        <seeInCurrentUrl url="checkout/#shipping" stepKey="seeCurrentUrl"/>
-+        <seeElement selector="{{CheckoutShippingSection.shippingTab}}" stepKey="seeShippingTab"/>
-+        <seeElement selector="{{CheckoutShippingGuestInfoSection.shippingBlock}}" stepKey="seeShippingBlock"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertShippingMethodOptionPresentInCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertShippingMethodOptionPresentInCartActionGroup.xml
-new file mode 100644
-index 00000000000..6e033268934
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertShippingMethodOptionPresentInCartActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert shipping method name and price are present in cart -->
-+    <actionGroup name="StorefrontAssertShippingMethodOptionPresentInCartActionGroup">
-+        <arguments>
-+            <argument name="methodName" type="string"/>
-+            <argument name="price" type="string"/>
-+        </arguments>
-+        <see selector="{{CheckoutCartSummarySection.methodName}}" userInput="{{methodName}}" stepKey="seeShippingName"/>
-+        <see selector="{{CheckoutCartSummarySection.shippingPrice}}" userInput="{{price}}" stepKey="seeShippingPrice"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertShippingMethodPresentInCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertShippingMethodPresentInCartActionGroup.xml
-new file mode 100644
-index 00000000000..3d8530ae837
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertShippingMethodPresentInCartActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert shipping method is present in cart -->
-+    <actionGroup name="StorefrontAssertShippingMethodPresentInCartActionGroup">
-+        <arguments>
-+            <argument name="shippingMethod" type="string"/>
-+        </arguments>
-+        <see selector="{{CheckoutCartSummarySection.shippingMethodLabel}}" userInput="{{shippingMethod}}" stepKey="assertShippingMethodIsPresentInCart"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAttachOptionFileActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAttachOptionFileActionGroup.xml
-new file mode 100644
-index 00000000000..364f05abd38
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAttachOptionFileActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAttachOptionFileActionGroup">
-+        <arguments>
-+            <argument name="optionTitle" defaultValue="ProductOptionFile"/>
-+            <argument name="file" defaultValue="MagentoLogo.file" />
-+        </arguments>
-+        <attachFile selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(optionTitle.title)}}" userInput="{{file}}" stepKey="attachFile"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCartEstimateShippingAndTaxActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCartEstimateShippingAndTaxActionGroup.xml
-new file mode 100644
-index 00000000000..4176859f99f
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCartEstimateShippingAndTaxActionGroup.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Fill Estimate Shipping and Tax fields -->
-+    <actionGroup name="StorefrontCartEstimateShippingAndTaxActionGroup">
-+        <arguments>
-+            <argument name="estimateAddress" defaultValue="EstimateAddressCalifornia"/>
-+        </arguments>
-+        <conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="clickOnEstimateShippingAndTax"/>
-+        <waitForElementVisible selector="{{CheckoutCartSummarySection.country}}" stepKey="waitForCountrySelectorIsVisible"/>
-+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="{{estimateAddress.country}}" stepKey="selectCountry"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForCountryLoadingMaskDisappear"/>
-+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{estimateAddress.state}}" stepKey="selectStateProvince"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForStateLoadingMaskDisappear"/>
-+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{estimateAddress.zipCode}}" stepKey="fillZipPostalCodeField"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForZipLoadingMaskDisappear"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckCartDiscountAndSummaryActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckCartDiscountAndSummaryActionGroup.xml
-new file mode 100644
-index 00000000000..6c541db6def
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckCartDiscountAndSummaryActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Open the Minicart and check Summary -->
-+    <actionGroup name="StorefrontCheckCartDiscountAndSummaryActionGroup">
-+        <arguments>
-+            <argument name="total" type="string"/>
-+            <argument name="discount" type="string"/>
-+        </arguments>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForPrices"/>
-+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-${{discount}}" stepKey="assertDiscount"/>
-+        <wait time="10" stepKey="waitForTotalPrice"/>
-+        <see selector="{{CheckoutCartSummarySection.total}}" userInput="${{total}}" stepKey="assertTotal"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckThatCartIsEmptyActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckThatCartIsEmptyActionGroup.xml
-new file mode 100644
-index 00000000000..e5fbb9065f9
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckThatCartIsEmptyActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontCheckThatCartIsEmptyActionGroup">
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <see selector="{{StorefrontMinicartSection.messageEmptyCart}}" userInput="You have no items in your shopping cart." stepKey="seeNoItemsInShoppingCart"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutAndAssertOrderSummaryDisplayActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutAndAssertOrderSummaryDisplayActionGroup.xml
-new file mode 100644
-index 00000000000..0a29cba11d4
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutAndAssertOrderSummaryDisplayActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontCheckoutAndAssertOrderSummaryDisplayActionGroup">
-+        <arguments>
-+            <argument name="itemsText" type="string"/>
-+        </arguments>
-+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="clickOnCheckOutButtonInMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <see selector="{{CheckoutShippingGuestInfoSection.itemInCart}}" userInput="{{itemsText}}" stepKey="seeOrderSummaryText"/>
-+        <seeElement selector="{{CheckoutOrderSummarySection.miniCartTab}}" stepKey="clickOnOrderSummaryTab"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutCheckOutOfStockProductActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutCheckOutOfStockProductActionGroup.xml
-new file mode 100644
-index 00000000000..92ce4f1f360
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutCheckOutOfStockProductActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontCheckoutCheckOutOfStockProductActionGroup">
-+        <arguments>
-+            <argument name="product" type="entity"/>
-+        </arguments>
-+        <see selector="{{CheckoutCartMessageSection.errorMessage}}" userInput="1 product requires your attention." stepKey="seeErrorMessage"/>
-+        <see selector="{{CheckoutCartProductSection.productName}}" userInput="{{product.name}}" stepKey="seeProductName"/>
-+        <see selector="{{CheckoutCartProductSection.messageErrorItem}}" userInput="Availability: Out of stock" stepKey="seeProductOutOfStock"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutCheckProductActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutCheckProductActionGroup.xml
-new file mode 100644
-index 00000000000..a9946118692
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutCheckProductActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontCheckoutCheckProductActionGroup">
-+        <arguments>
-+            <argument name="product" type="entity"/>
-+            <argument name="cartItem" type="entity"/>
-+        </arguments>
-+
-+        <see selector="{{CheckoutCartProductSection.productName}}" userInput="{{product.name}}" stepKey="seeProductName"/>
-+        <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName(product.name)}}" stepKey="grabProductQty"/>
-+        <assertEquals expected="{{cartItem.qty}}" actual="$grabProductQty" stepKey="assertQtyShoppingCart"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml
-new file mode 100644
-index 00000000000..09e991c2164
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontClickOnMiniCartActionGroup">
-+        <scrollToTopOfPage stepKey="scrollToTheTopOfThePage"/>
-+        <waitForElementVisible selector="{{StorefrontMinicartSection.showCart}}" stepKey="waitForElementToBeVisible"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontEnterProductQuantityAndAddToTheCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontEnterProductQuantityAndAddToTheCartActionGroup.xml
-new file mode 100644
-index 00000000000..c76cb8c0f1f
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontEnterProductQuantityAndAddToTheCartActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontEnterProductQuantityAndAddToTheCartActionGroup">
-+        <arguments>
-+            <argument name="quantity" type="string"/>
-+        </arguments>
-+        <clearField selector="{{StorefrontBundleProductActionSection.quantityField}}" stepKey="clearTheQuantityField"/>
-+        <fillField selector="{{StorefrontBundleProductActionSection.quantityField}}" userInput="{{quantity}}" stepKey="fillTheProductQuantity"/>
-+        <click selector="{{StorefrontBundleProductActionSection.addToCartButton}}" stepKey="clickOnAddToButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillEmailFieldOnCheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillEmailFieldOnCheckoutActionGroup.xml
-new file mode 100644
-index 00000000000..fcac780a367
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillEmailFieldOnCheckoutActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontFillEmailFieldOnCheckoutActionGroup">
-+        <arguments>
-+            <argument name="email" type="string" />
-+        </arguments>
-+        <fillField selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.email}}" userInput="{{email}}" stepKey="fillCustomerEmailField"/>
-+        <doubleClick selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.emailTooltipButton}}" stepKey="clickToMoveFocusFromEmailInput" />
-+        <waitForPageLoad stepKey="waitForPageLoad" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillGuestShippingInfoActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillGuestShippingInfoActionGroup.xml
-new file mode 100644
-index 00000000000..e7669d62c79
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillGuestShippingInfoActionGroup.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Fill data in checkout shipping section -->
-+    <actionGroup name="StorefrontFillGuestShippingInfoActionGroup">
-+        <arguments>
-+            <argument name="customerData" defaultValue="Simple_UK_Customer_For_Shipment"/>
-+        </arguments>
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{customerData.email}}" stepKey="fillEmailAddressField"/>
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{customerData.firstName}}" stepKey="fillFirstNameField"/>
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{customerData.lastName}}" stepKey="fillLastNameField"/>
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.company}}" userInput="{{customerData.company}}" stepKey="fillCompanyField"/>
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{customerData.streetFirstLine}}" stepKey="fillStreetAddressFirstLineField"/>
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.street2}}" userInput="{{customerData.streetSecondLine}}" stepKey="fillStreetAddressSecondLineField"/>
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{customerData.city}}" stepKey="fillCityField"/>
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{customerData.telephone}}" stepKey="fillPhoneNumberField"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillOptionFieldInputActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillOptionFieldInputActionGroup.xml
-new file mode 100644
-index 00000000000..001cdae5a47
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillOptionFieldInputActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontFillOptionFieldInputActionGroup">
-+        <arguments>
-+            <argument name="optionTitle" defaultValue="ProductOptionField"/>
-+            <argument name="fieldInput" type="string" />
-+        </arguments>
-+        <fillField selector="{{StorefrontProductInfoMainSection.productOptionFieldInput(optionTitle.title)}}" userInput="{{fieldInput}}" stepKey="fillOptionField"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillOptionTextAreaActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillOptionTextAreaActionGroup.xml
-new file mode 100644
-index 00000000000..1e3162bac3b
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillOptionTextAreaActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontFillOptionTextAreaActionGroup">
-+        <arguments>
-+            <argument name="optionTitle" defaultValue="ProductOptionArea"/>
-+            <argument name="fieldInput" type="string"/>
-+        </arguments>
-+        <fillField selector="{{StorefrontProductInfoMainSection.productOptionAreaInput(optionTitle.title)}}" userInput="{{fieldInput}}" stepKey="fillOptionTextArea"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
-index b2402d94723..28e109e2387 100644
---- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
-@@ -6,11 +6,13 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="clickViewAndEditCartFromMiniCart">
-+        <scrollTo selector="{{StorefrontMinicartSection.showCart}}" stepKey="scrollToMiniCart"/>
-         <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
-         <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
-         <click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="viewAndEditCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-         <seeInCurrentUrl url="checkout/cart" stepKey="seeInCurrentUrl"/>
-     </actionGroup>
-     <actionGroup name="assertOneProductNameInMiniCart">
-@@ -21,4 +23,25 @@
-         <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
-         <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productName}}" stepKey="seeInMiniCart"/>
-     </actionGroup>
-+
-+    <!--Remove an item from the cart using minicart-->
-+    <actionGroup name="removeProductFromMiniCart">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
-+        <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForMiniCartOpen"/>
-+        <click selector="{{StorefrontMinicartSection.deleteMiniCartItemByName(productName)}}" stepKey="clickDelete"/>
-+        <waitForElementVisible selector="{{StoreFrontRemoveItemModalSection.message}}" stepKey="waitForConfirmationModal"/>
-+        <see selector="{{StoreFrontRemoveItemModalSection.message}}" userInput="Are you sure you would like to remove this item from the shopping cart?" stepKey="seeDeleteConfirmationMessage"/>
-+        <click selector="{{StoreFrontRemoveItemModalSection.ok}}" stepKey="confirmDelete"/>
-+        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
-+    </actionGroup>
-+
-+    <!--Check that the minicart is empty-->
-+    <actionGroup name="assertMiniCartEmpty">
-+        <dontSeeElement selector="{{StorefrontMinicartSection.productCount}}" stepKey="dontSeeMinicartProductCount"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="expandMinicart"/>
-+        <see selector="{{StorefrontMinicartSection.minicartContent}}" userInput="You have no items in your shopping cart." stepKey="seeEmptyCartMessage"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutPageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutPageActionGroup.xml
-new file mode 100644
-index 00000000000..b18d476c02c
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutPageActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontOpenCheckoutPageActionGroup">
-+        <amOnPage url="{{CheckoutPage.url}}" stepKey="openCheckoutPage" />
-+        <waitForPageLoad stepKey="waitForCheckoutPageLoaded" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenMiniCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenMiniCartActionGroup.xml
-new file mode 100644
-index 00000000000..7afcb070f3f
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenMiniCartActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontOpenMiniCartActionGroup">
-+        <waitForElementVisible selector="{{StorefrontMinicartSection.showCart}}" stepKey="waitForElementToBeVisible"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
-index 3842b3962c1..fb3f2958361 100644
---- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Add Product to Cart from the category page and check message and product count in Minicart -->
-     <actionGroup name="StorefrontAddCategoryProductToCartActionGroup">
-         <arguments>
-@@ -16,8 +16,9 @@
-         </arguments>
-         <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
-         <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="clickAddToCart" />
--        <!-- @TODO: Use general message selector after MQE-694 is fixed -->
--        <waitForElement selector="{{StorefrontMessagesSection.messageProductAddedToCart(product.name)}}" time="30" stepKey="assertMessage"/>
-+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage" />
-+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="assertSuccessMessage"/>
-+        <seeLink stepKey="assertLinkToShoppingCart" url="{{_ENV.MAGENTO_BASE_URL}}checkout/cart/" userInput="shopping cart" />
-         <waitForText userInput="{{productCount}}" selector="{{StorefrontMinicartSection.productCount}}" time="30" stepKey="assertProductCount"/>
-     </actionGroup>
- 
-@@ -30,8 +31,9 @@
-         </arguments>
-         <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
-         <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="clickAddToCart" />
--        <!-- @TODO: Use general message selector after MQE-694 is fixed -->
--        <waitForElement selector="{{StorefrontMessagesSection.messageProductAddedToCart(product.name)}}" time="30" stepKey="assertMessage"/>
-+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage" />
-+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="assertSuccessMessage"/>
-+        <seeLink stepKey="assertLinkToShoppingCart" url="{{_ENV.MAGENTO_BASE_URL}}checkout/cart/" userInput="shopping cart" />
-         <waitForText userInput="{{checkQuantity}}" selector="{{StorefrontMinicartSection.productCount}}" time="30" stepKey="assertProductCount"/>
-         <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
-         <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
-@@ -46,11 +48,11 @@
-             <argument name="productCount" type="string"/>
-         </arguments>
-         <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart" />
--        <!-- @TODO: Use general message selector after MQE-694 is fixed -->
--        <waitForElement selector="{{StorefrontMessagesSection.messageProductAddedToCart(product.name)}}" time="30" stepKey="assertMessage"/>
-+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage" />
-+        <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="You added {{product.name}} to your shopping cart." stepKey="assertSuccessMessage"/>
-+        <seeLink stepKey="assertLinkToShoppingCart" url="{{_ENV.MAGENTO_BASE_URL}}checkout/cart/" userInput="shopping cart" />
-         <waitForText userInput="{{productCount}}" selector="{{StorefrontMinicartSection.productCount}}" time="30" stepKey="assertProductCount"/>
-     </actionGroup>
--
-     <!-- Open the Minicart and check Simple Product -->
-     <actionGroup name="StorefrontOpenMinicartAndCheckSimpleProductActionGroup">
-         <arguments>
-@@ -75,17 +77,20 @@
-     <!-- Check the Cart -->
-     <actionGroup name="StorefrontCheckCartActionGroup">
-         <arguments>
--            <argument name="subtotal"/>
--            <argument name="shipping"/>
--            <argument name="shippingMethod"/>
--            <argument name="total"/>
-+            <argument name="subtotal" type="string"/>
-+            <argument name="shipping" type="string"/>
-+            <argument name="shippingMethod" type="string"/>
-+            <argument name="total" type="string"/>
-         </arguments>
-         <seeInCurrentUrl url="{{CheckoutCartPage.url}}" stepKey="assertUrl"/>
--        <waitForText userInput="${{total}}" selector="{{CheckoutCartSummarySection.total}}" time="30" stepKey="waitForTotal"/>
--        <see userInput="${{subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
--        <see userInput="${{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" stepKey="assertShipping"/>
-+        <waitForPageLoad stepKey="waitForCartPage"/>
-+        <conditionalClick selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.shippingMethodForm}}" visible="false" stepKey="openEstimateShippingSection"/>
-+        <waitForElementVisible selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="waitForShippingSection"/>
-+        <checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectShippingMethod"/>
-+        <see userInput="{{subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
-         <see userInput="({{shippingMethod}})" selector="{{CheckoutCartSummarySection.shippingMethod}}" stepKey="assertShippingMethod"/>
--        <see userInput="${{total}}" selector="{{CheckoutCartSummarySection.total}}" stepKey="assertTotal"/>
-+        <waitForText userInput="{{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" time="45" stepKey="assertShipping"/>
-+        <see userInput="{{total}}" selector="{{CheckoutCartSummarySection.total}}" stepKey="assertTotal"/>
-     </actionGroup>
- 
-     <!-- Open the Cart from Minicart-->
-@@ -106,4 +111,4 @@
-         <fillField stepKey="fillZip" selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{taxCode.zip}}"/>
-         <waitForPageLoad stepKey="waitForFormUpdate"/>
-     </actionGroup>
--</actionGroups>
-\ No newline at end of file
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionCheckBoxActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionCheckBoxActionGroup.xml
-new file mode 100644
-index 00000000000..731ac03ca41
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionCheckBoxActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontSelectOptionCheckBoxActionGroup">
-+        <arguments>
-+            <argument name="optionTitle" defaultValue="ProductOptionValueCheckbox"/>
-+        </arguments>
-+        <checkOption selector="{{StorefrontProductInfoMainSection.customOptionCheckBox(optionTitle.title)}}"   stepKey="SelectOptionRadioButton"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionDateActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionDateActionGroup.xml
-new file mode 100644
-index 00000000000..37f2afd2a00
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionDateActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontSelectOptionDateActionGroup">
-+        <arguments>
-+            <argument name="optionTitle" defaultValue="ProductOptionDate"/>
-+            <argument name="month" type="string"/>
-+            <argument name="day" type="string"/>
-+            <argument name="year" type="string"/>
-+        </arguments>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.customOptionMonth(optionTitle.title)}}" userInput="{{month}}" stepKey="selectMonthForOptionDate"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.customOptionDay(optionTitle.title)}}" userInput="{{day}}" stepKey="selectDayForOptionDate"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.customOptionYear(optionTitle.title)}}" userInput="{{year}}" stepKey="selectYearForOptionDate"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionDateTimeActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionDateTimeActionGroup.xml
-new file mode 100644
-index 00000000000..f2bac08a381
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionDateTimeActionGroup.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontSelectOptionDateTimeActionGroup">
-+        <arguments>
-+            <argument name="optionTitle" defaultValue="ProductOptionDateTime"/>
-+            <argument name="month" type="string"/>
-+            <argument name="day" type="string"/>
-+            <argument name="year" type="string"/>
-+            <argument name="hour" type="string"/>
-+            <argument name="minute" type="string"/>
-+            <argument name="dayPart" type="string"/>
-+        </arguments>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.customOptionMonth(optionTitle.title)}}" userInput="{{month}}" stepKey="selectMonthForOptionDate"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.customOptionDay(optionTitle.title)}}" userInput="{{day}}" stepKey="selectDayForOptionDate"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.customOptionYear(optionTitle.title)}}" userInput="{{year}}" stepKey="selectYearForOptionDate"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.customOptionHour(optionTitle.title)}}" userInput="{{hour}}" stepKey="selectHourrForOptionDateTime"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.customOptionMinute(optionTitle.title)}}" userInput="{{minute}}" stepKey="selectMinuteForOptionDateTime"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.customOptionDayPart(optionTitle.title)}}" userInput="{{dayPart}}" stepKey="selectDayPartForOptionDateTime"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionDropDownActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionDropDownActionGroup.xml
-new file mode 100644
-index 00000000000..1f8cedae4ef
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionDropDownActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontSelectOptionDropDownActionGroup">
-+        <arguments>
-+            <argument name="optionTitle" defaultValue="ProductOptionDropDown"/>
-+            <argument name="option" defaultValue="ProductOptionValueDropdown2.title" />
-+        </arguments>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect(optionTitle.title)}}" userInput="{{option}}" stepKey="fillOptionDropDown"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionMultiSelectActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionMultiSelectActionGroup.xml
-new file mode 100644
-index 00000000000..ebf14b3f27d
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionMultiSelectActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontSelectOptionMultiSelectActionGroup">
-+        <arguments>
-+            <argument name="optionTitle" defaultValue="ProductOptionMultiSelect"/>
-+            <argument name="option" defaultValue="ProductOptionValueMultiSelect2.title"/>
-+        </arguments>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect(optionTitle.title)}}" userInput="{{option}}" stepKey="selectOption"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionRadioButtonActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionRadioButtonActionGroup.xml
-new file mode 100644
-index 00000000000..844c9ede802
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionRadioButtonActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontSelectOptionRadioButtonActionGroup">
-+        <arguments>
-+            <argument name="optionTitle" defaultValue="ProductOptionRadiobutton"/>
-+            <argument name="optionPrice" defaultValue="ProductOptionValueRadioButtons2"/>
-+        </arguments>
-+        <checkOption selector="{{StorefrontProductInfoMainSection.productOptionRadioButtonsCheckbox(optionTitle.title, optionPrice.price)}}"  stepKey="SelectOptionCheckBox"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionTimeActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionTimeActionGroup.xml
-new file mode 100644
-index 00000000000..bfa75eae702
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectOptionTimeActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontSelectOptionTimeActionGroup">
-+        <arguments>
-+            <argument name="optionTitle" defaultValue="ProductOptionTime"/>
-+            <argument name="hour" type="string"/>
-+            <argument name="minute" type="string"/>
-+            <argument name="dayPart" type="string"/>
-+        </arguments>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.customOptionHour(optionTitle.title)}}" userInput="{{hour}}" stepKey="selectHourrForOptionDateTime"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.customOptionMinute(optionTitle.title)}}" userInput="{{minute}}" stepKey="selectMinuteForOptionDateTime"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.customOptionDayPart(optionTitle.title)}}" userInput="{{dayPart}}" stepKey="selectDayPartForOptionDateTime"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml
-new file mode 100644
-index 00000000000..d3d96cb9c74
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml
-@@ -0,0 +1,29 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Fill shipment form for free shipping-->
-+    <actionGroup name="ShipmentFormFreeShippingActionGroup">
-+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="setCustomerEmail"/>
-+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="SetCustomerFirstName"/>
-+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="SetCustomerLastName"/>
-+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street}}" stepKey="SetCustomerStreetAddress"/>
-+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="SetCustomerCity"/>
-+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="SetCustomerZipCode"/>
-+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="SetCustomerPhoneNumber"/>
-+        <click selector="{{CheckoutShippingSection.region}}" stepKey="clickToSetState"/>
-+        <click selector="{{CheckoutShippingSection.state}}" stepKey="clickToChooseState"/>
-+        <see userInput="$0.00	Free	Free Shipping" selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Free Shipping')}}" stepKey="seeShippingMethod" after="clickToChooseState"/>
-+        <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Free Shipping')}}" stepKey="selectFlatShippingMethod" after="seeShippingMethod"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask" after="selectFlatShippingMethod"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickToSaveShippingInfo"/>
-+        <waitForPageLoad time="5" stepKey="waitForReviewAndPaymentsPageIsLoaded"/>
-+        <seeInCurrentUrl url="payment" stepKey="reviewAndPaymentIsShown"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontUpdateProductQtyMiniShoppingCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontUpdateProductQtyMiniShoppingCartActionGroup.xml
-new file mode 100644
-index 00000000000..ee8b761a452
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontUpdateProductQtyMiniShoppingCartActionGroup.xml
-@@ -0,0 +1,28 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontUpdateProductQtyMiniShoppingCartActionGroup">
-+        <arguments>
-+            <argument name="product" type="entity" />
-+            <argument name="quote" type="entity" />
-+        </arguments>
-+
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="goToMiniShoppingCart"/>
-+
-+        <!-- Clearing QTY field -->
-+        <doubleClick selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" stepKey="doubleClickOnQtyInput" />
-+        <pressKey selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" parameterArray="[\WebDriverKeys::DELETE]" stepKey="clearQty"/>
-+        <!-- Clearing QTY field -->
-+
-+        <fillField selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}"  userInput="{{quote.qty}}" stepKey="changeQty"/>
-+        <click selector="{{StorefrontMinicartSection.itemQuantityUpdateBySku(product.sku)}}" stepKey="clickUpdateButton"/>
-+        <waitForPageLoad stepKey="waitForProductQtyUpdate" />
-+
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/VerifyCheckoutPaymentOrderSummaryActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/VerifyCheckoutPaymentOrderSummaryActionGroup.xml
-new file mode 100644
-index 00000000000..7937092965f
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/VerifyCheckoutPaymentOrderSummaryActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Fill shipment form for free shipping-->
-+    <actionGroup name="VerifyCheckoutPaymentOrderSummaryActionGroup">
-+        <arguments>
-+            <argument name="orderSummarySubTotal" type="string"/>
-+            <argument name="orderSummaryShippingTotal" type="string"/>
-+            <argument name="orderSummaryTotal" type="string"/>
-+        </arguments>
-+        <see selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" userInput="{{orderSummarySubTotal}}" stepKey="seeCorrectSubtotal"/>
-+        <see selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" userInput="{{orderSummaryShippingTotal}}" stepKey="seeCorrectShipping"/>
-+        <see selector="{{CheckoutPaymentSection.orderSummaryTotal}}" userInput="{{orderSummaryTotal}}" stepKey="seeCorrectOrderTotal"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
-new file mode 100644
-index 00000000000..cd9cd59d20b
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
-@@ -0,0 +1,91 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <!-- Free shipping -->
-+    <entity name="EnableFreeShippingConfigData">
-+        <data key="path">carriers/freeshipping/active</data>
-+        <data key="scope">carriers</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="EnableFreeShippingToSpecificCountriesConfigData">
-+        <data key="path">carriers/freeshipping/sallowspecific</data>
-+        <data key="scope">carriers</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">Specific Countries</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="EnableFreeShippingToAfghanistanConfigData">
-+        <data key="path">carriers/freeshipping/specificcountry</data>
-+        <data key="scope">carriers</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">Afghanistan</data>
-+        <data key="value">AF</data>
-+    </entity>
-+    <entity name="EnableFreeShippingToAllAllowedCountriesConfigData">
-+        <data key="path">carriers/freeshipping/sallowspecific</data>
-+        <data key="scope">carriers</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">All Allowed Countries</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="DisableFreeShippingConfigData">
-+        <data key="path">carriers/freeshipping/active</data>
-+        <data key="scope">carriers</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+
-+    <!-- Flat Rate shipping -->
-+    <entity name="EnableFlatRateConfigData">
-+        <data key="path">carriers/flatrate/active</data>
-+        <data key="scope">carriers</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="EnableFlatRateDefaultPriceConfigData">
-+        <data key="path">carriers/flatrate/price</data>
-+        <data key="scope">carriers</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">Yes</data>
-+        <data key="value">5.00</data>
-+    </entity>
-+    <entity name="EnableFlatRateToSpecificCountriesConfigData">
-+        <data key="path">carriers/flatrate/sallowspecific</data>
-+        <data key="scope">carriers</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">Specific Countries</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="EnableFlatRateToAfghanistanConfigData">
-+        <data key="path">carriers/flatrate/specificcountry</data>
-+        <data key="scope">carriers</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">Afghanistan</data>
-+        <data key="value">AF</data>
-+    </entity>
-+    <entity name="EnableFlatRateToAllAllowedCountriesConfigData">
-+        <data key="path">carriers/flatrate/sallowspecific</data>
-+        <data key="scope">carriers</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">All Allowed Countries</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="DisableFlatRateConfigData">
-+        <data key="path">carriers/flatrate/active</data>
-+        <data key="scope">carriers</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/ConstData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/ConstData.xml
-index 1703d7255e1..f946d04fc9f 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Data/ConstData.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Data/ConstData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
-     <entity name="CONST" type="CONST">
-         <data key="successGuestCheckoutOrderNumberMessage">Your order # is:</data>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml
-new file mode 100644
-index 00000000000..7fc349bf9f0
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml
-@@ -0,0 +1,38 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="Countries" type="countryArray">
-+        <array key="country">
-+            <item>Bahamas</item>
-+        </array>
-+    </entity>
-+    <entity name="DefaultCountriesWithRequiredRegions" type="countryArray">
-+        <array key="country">
-+            <item>Australia</item>
-+            <item>Brazil</item>
-+            <item>Canada</item>
-+            <item>Croatia</item>
-+            <item>Estonia</item>
-+            <item>India</item>
-+            <item>Latvia</item>
-+            <item>Lithuania</item>
-+            <item>Romania</item>
-+            <item>Spain</item>
-+            <item>Switzerland</item>
-+            <item>United States</item>
-+            <item>Australia</item>
-+        </array>
-+    </entity>
-+    <entity name="CustomCountryWithRequiredRegion" type="countryArray">
-+        <array key="country">
-+            <item>United Kingdom</item>
-+        </array>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/EstimateAndTaxData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/EstimateAndTaxData.xml
-new file mode 100644
-index 00000000000..36dea5a521a
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Data/EstimateAndTaxData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="EstimateAddressCalifornia">
-+        <data key="country">United States</data>
-+        <data key="state">California</data>
-+        <data key="zipCode">90240</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
-index 51fb264a16a..7c4f814e2b9 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
-     <entity name="E2EB2CQuote" type="Quote">
-         <data key="subtotal">480.00</data>
-@@ -15,4 +15,43 @@
-         <data key="total">495.00</data>
-         <data key="shippingMethod">Flat Rate - Fixed</data>
-     </entity>
-+    <entity name="simpleOrderQty2" type="Quote">
-+        <data key="price">560.00</data>
-+        <data key="qty">2</data>
-+        <data key="subtotal">1,120.00</data>
-+        <data key="shipping">10.00</data>
-+        <data key="total">1,130.00</data>
-+        <data key="shippingMethod">Flat Rate - Fixed</data>
-+        <data key="currency">$</data>
-+    </entity>
-+    <entity name="quoteQty3Price123" type="Quote">
-+        <data key="price">123.00</data>
-+        <data key="qty">3</data>
-+        <data key="subtotal">369.00</data>
-+        <data key="currency">$</data>
-+    </entity>
-+    <entity name="quoteQty11Subtotal1320" type="Quote">
-+        <data key="price">100.00</data>
-+        <data key="customOptionsPrice">20</data>
-+        <data key="qty">11</data>
-+        <data key="subtotal">1,320.00</data>
-+        <data key="currency">$</data>
-+    </entity>
-+    <entity name="quoteQty2Price123" type="Quote">
-+        <data key="price">123.00</data>
-+        <data key="qty">2</data>
-+        <data key="shipping">10.00</data>
-+        <data key="subtotal">246.00</data>
-+        <data key="total">256.00</data>
-+        <data key="currency">$</data>
-+    </entity>
-+    <entity name="quoteQty2Subtotal266" type="Quote">
-+        <data key="qty">2</data>
-+        <data key="customOptionsPrice">20</data>
-+        <data key="price">143</data>
-+        <data key="subtotal">266.00</data>
-+        <data key="shipping">10.00</data>
-+        <data key="total">276.00</data>
-+        <data key="currency">$</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
-index 433d397ee81..a77b07a129d 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
-@@ -7,9 +7,11 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="CheckoutCartPage" url="/checkout/cart" module="Magento_Checkout" area="storefront">
-         <section name="CheckoutCartProductSection"/>
-         <section name="CheckoutCartSummarySection"/>
-+        <section name="CheckoutCartCrossSellSection"/>
-+        <section name="CheckoutCartMessageSection"/>
-     </page>
- </pages>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
-index aa11d42275a..d3fa045e465 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="CheckoutPage" url="/checkout" area="storefront" module="Magento_Checkout">
-         <section name="CheckoutShippingSection"/>
-         <section name="CheckoutShippingMethodsSection"/>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml
-index 59c3b20aca6..c8641f7d8fb 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml
-@@ -7,9 +7,10 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="CheckoutShippingPage" url="/checkout/#shipping" module="Checkout" area="storefront">
-         <section name="CheckoutShippingGuestInfoSection"/>
-         <section name="CheckoutShippingSection"/>
-+        <section name="StorefrontCheckoutAddressPopupSection"/>
-     </page>
- </pages>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutSuccessPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutSuccessPage.xml
-index 1c3293267e2..ebca0651b45 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutSuccessPage.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutSuccessPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="CheckoutSuccessPage" url="/checkout/onepage/success/" area="storefront" module="Magento_Checkout">
-         <section name="CheckoutSuccessMainSection"/>
-         <section name="CheckoutSuccessRegisterSection"/>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/GuestCheckoutReviewAndPaymentsPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/GuestCheckoutReviewAndPaymentsPage.xml
-index cac9c934cd6..90f8a914b4f 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Page/GuestCheckoutReviewAndPaymentsPage.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Page/GuestCheckoutReviewAndPaymentsPage.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- 
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="GuestCheckoutReviewAndPaymentsPage" url="/checkout/#payment" area="storefront" module="Magento_Checkout">
-         <section name="CheckoutPaymentSection"/>
-     </page>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutPaymentSection.xml
-new file mode 100644
-index 00000000000..2b5dd512bc4
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutPaymentSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCheckoutPaymentSection">
-+        <element name="checkBillingMethodByName" type="radio" selector="//div[@id='order-billing_method']//dl[@class='admin__payment-methods']//dt//label[contains(., '{{methodName}}')]/..//input" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/AdminDataGridHeaderSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/AdminDataGridHeaderSection.xml
-index 56062f96152..3e1f902f6c3 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/AdminDataGridHeaderSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/AdminDataGridHeaderSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminDataGridHeaderSection">
-         <element name="attributeCodeFilterInput" type="input" selector=".admin__data-grid-filters input[name='attribute_code']"/>
-     </section>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartCrossSellSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartCrossSellSection.xml
-new file mode 100644
-index 00000000000..aa23f336477
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartCrossSellSection.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="CheckoutCartCrossSellSection">
-+        <element name="title" type="text" selector=".block.crosssell .block-title"/>
-+        <element name="products" type="block" selector=".block.crosssell .block-content"/>
-+        <element name="productRowByName" type="block" selector="//li[@class='item product product-item'and .//a[@title='{{name}}']]" parameterized="true"/>
-+        <element name="addToCart" type="block" selector="//button[@title='Add to Cart']"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartMessageSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartMessageSection.xml
-new file mode 100644
-index 00000000000..cf15cdf15cf
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartMessageSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="CheckoutCartMessageSection">
-+        <element name="successMessage" type="text" selector=".message.message-success.success>div" />
-+        <element name="errorMessage" type="text" selector=".message-error.error.message>div" />
-+        <element name="emptyCartMessage" type="text" selector=".cart-empty>p"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
-index b3e3f082319..2024d249418 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CheckoutCartProductSection">
-         <element name="ProductLinkByName" type="button"
-                  selector="//main//table[@id='shopping-cart-table']//tbody//tr//strong[contains(@class, 'product-item-name')]//a[contains(text(), '{{var1}}')]"
-@@ -15,6 +15,9 @@
-         <element name="ProductPriceByName" type="text"
-                  selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'price')]//span[@class='price']"
-                  parameterized="true"/>
-+        <element name="ProductRegularPriceByName" type="text"
-+                 selector="//div[descendant::*[contains(text(), '{{var1}}')]]//*[contains(@class, 'subtotal')]"
-+                 parameterized="true"/>
-         <element name="ProductImageByName" type="text"
-                  selector="//main//table[@id='shopping-cart-table']//tbody//tr//img[contains(@class, 'product-image-photo') and @alt='{{var1}}']"
-                  parameterized="true"/>
-@@ -24,12 +27,24 @@
-         <element name="ProductOptionByNameAndAttribute" type="input"
-                  selector="//main//table[@id='shopping-cart-table']//tbody//tr[.//strong[contains(@class, 'product-item-name')]//a[contains(text(), '{{var1}}')]]//dl[@class='item-options']//dt[.='{{var2}}']/following-sibling::dd[1]"
-                  parameterized="true"/>
-+        <element name="ProductPriceByOption" type="text" selector="//*[contains(@class, 'item-options')]/dd[normalize-space(.)='{{var1}}']/ancestor::tr//td[contains(@class, 'price')]//span[@class='price']" parameterized="true"/>
-         <element name="RemoveItem" type="button"
-                  selector="//table[@id='shopping-cart-table']//tbody//tr[contains(@class,'item-actions')]//a[contains(@class,'action-delete')]"/>
-+        <element name="removeProductByName" type="text" selector="//*[contains(text(), '{{productName}}')]/ancestor::tbody//a[@class='action action-delete']" parameterized="true" timeout="30"/>
-+        <element name="productName" type="text" selector="//tbody[@class='cart item']//strong[@class='product-item-name']"/>
-         <element name="nthItemOption" type="block" selector=".item:nth-of-type({{numElement}}) .item-options" parameterized="true"/>
-         <element name="nthEditButton" type="block" selector=".item:nth-of-type({{numElement}}) .action-edit" parameterized="true"/>
-         <element name="nthBundleOptionName" type="text" selector=".product-item-details .item-options:nth-of-type({{numOption}}) dt" parameterized="true"/>
-         <element name="productSubtotalByName" type="input" selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'subtotal')]//span[@class='price']" parameterized="true"/>
-         <element name="updateShoppingCartButton" type="button" selector="#form-validate button[type='submit'].update" timeout="30"/>
-+        <element name="qty" type="input" selector="//input[@data-cart-item-id='{{var}}'][@title='Qty']" parameterized="true"/>
-+        <element name="qtyByContains" type="text" selector="//input[contains(@data-cart-item-id, '{{sku}}')][@title='Qty']" parameterized="true"/>
-+        <element name="messageErrorItem" type="text" selector="#sku-stock-failed-"/>
-+        <element name="messageErrorNeedChooseOptions" type="text" selector="//*[contains(@class, 'error')]/div"/>
-+        <element name="productOptionsLink" type="text" selector="a.action.configure"/>
-+        <element name="productOptionLabel" type="text" selector="//dl[@class='item-options']"/>
-+        <element name="checkoutCartProductPrice" type="text" selector="//td[@class='col price']//span[@class='price']"/>
-+        <element name="checkoutCartSubtotal" type="text" selector="//td[@class='col subtotal']//span[@class='price']"/>
-+        <element name="emptyCart" selector=".cart-empty" type="text"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
-index 01b483c8ecf..e6637bec765 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
-@@ -7,19 +7,30 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CheckoutCartSummarySection">
-+        <element name="expandShoppingCartSummary" type="button" selector="//*[contains(@class, 'items-in-cart')][not(contains(@class, 'active'))]"/>
-+        <element name="elementPosition" type="text" selector=".data.table.totals > tbody tr:nth-of-type({{value}}) > th" parameterized="true"/>
-         <element name="subtotal" type="text" selector="//*[@id='cart-totals']//tr[@class='totals sub']//td//span[@class='price']"/>
-+        <element name="shippingMethodForm" type="text" selector="#co-shipping-method-form"/>
-         <element name="shippingMethod" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//th//span[@class='value']"/>
-         <element name="shipping" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//td//span[@class='price']"/>
-+        <element name="shippingAmount" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//td//span[@class='price' and contains(text(), '{{amount}}')]" parameterized="true"/>
-         <element name="total" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price']"/>
-+        <element name="totalAmount" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price' and contains(text(), '{{amount}}')]" parameterized="true"/>
-         <element name="proceedToCheckout" type="button" selector=".action.primary.checkout span" timeout="30"/>
-         <element name="discountAmount" type="text" selector="td[data-th='Discount']"/>
--        <element name="shippingHeading" type="button" selector="#block-shipping-heading"/>
-+        <element name="shippingHeading" type="button" selector="#block-shipping-heading" timeout="60"/>
-         <element name="postcode" type="input" selector="input[name='postcode']" timeout="10"/>
-         <element name="stateProvince" type="select" selector="select[name='region_id']" timeout="10"/>
-+        <element name="stateProvinceInput" type="input" selector="input[name='region']"/>
-         <element name="country" type="select" selector="select[name='country_id']" timeout="10"/>
-+        <element name="countryParameterized" type="select" selector="select[name='country_id'] > option:nth-child({{var}})" timeout="10" parameterized="true"/>
-         <element name="estimateShippingAndTax" type="text" selector="#block-shipping-heading" timeout="5"/>
--        <element name="flatRateShippingMethod" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
-+        <element name="flatRateShippingMethod" type="input" selector="#s_method_flatrate_flatrate" timeout="30"/>
-+        <element name="shippingMethodLabel" type="text" selector="#co-shipping-method-form dl dt span"/>
-+        <element name="methodName" type="text" selector="#co-shipping-method-form label"/>
-+        <element name="shippingPrice" type="text" selector="#co-shipping-method-form span .price"/>
-+        <element name="shippingMethodElementId" type="radio" selector="#s_method_{{carrierCode}}_{{methodCode}}" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutHeaderSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutHeaderSection.xml
-index ca42eff89cf..babbe51746d 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutHeaderSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutHeaderSection.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CheckoutHeaderSection">
-         <element name="shippingMethodStep" type="text" selector=".opc-progress-bar-item:nth-of-type(1)"/>
-         <element name="reviewAndPaymentsStep" type="text" selector=".opc-progress-bar-item:nth-of-type(2)"/>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml
-index cb079d2f036..d3ad2aed969 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml
-@@ -7,11 +7,17 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CheckoutOrderSummarySection">
-         <element name="miniCartTab" type="button" selector=".title[role='tab']"/>
-         <element name="productItemName" type="text" selector=".product-item-name"/>
-         <element name="productItemQty" type="text" selector=".value"/>
-         <element name="productItemPrice" type="text" selector=".price"/>
-+        <element name="orderNumber" type="text" selector="//div[@class='checkout-success']//a"/>
-+        <element name="shippingAddress" type="textarea" selector="//*[@class='box box-address-shipping']//address"/>
-+        <element name="billingAddress" type="textarea" selector="//*[@class='box box-address-billing']//address"/>
-+        <element name="additionalAddress" type="text" selector=".block.block-addresses-list"/>
-+        <element name="miniCartTabClosed" type="button" selector=".title[aria-expanded='false']" timeout="30"/>
-+        <element name="itemsQtyInCart" type="text" selector=".items-in-cart > .title > strong > span"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
-index a12852ea1ef..e1c2a3b1550 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
-@@ -7,27 +7,30 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CheckoutPaymentSection">
-         <element name="isPaymentSection" type="text" selector="//*[@class='opc-progress-bar']/li[contains(@class, '_active') and span[contains(.,'Review &amp; Payments')]]"/>
-         <element name="availablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div:nth-child(2)>div.payment-method-title.field.choice"/>
-         <element name="notAvailablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div.payment-method._active>div.payment-method-title.field.choice"/>
-         <element name="billingNewAddressForm" type="text" selector="[data-form='billing-new-address']"/>
-+        <element name="billingAddressNotSameCheckbox" type="checkbox" selector="#billing-address-same-as-shipping-checkmo"/>
-+        <element name="editAddress" type="button" selector="button.action.action-edit-address"/>
-         <element name="placeOrderDisabled" type="button" selector="#checkout-payment-method-load button.disabled"/>
-         <element name="update" type="button" selector=".payment-method-billing-address .action.action-update"/>
-         <element name="guestFirstName" type="input" selector=".billing-address-form input[name*='firstname']"/>
-         <element name="guestLastName" type="input" selector=".billing-address-form input[name*='lastname']"/>
-         <element name="guestStreet" type="input" selector=".billing-address-form input[name*='street[0]']"/>
-         <element name="guestCity" type="input" selector=".billing-address-form input[name*='city']"/>
-+        <element name="guestCountry" type="select" selector=".billing-address-form select[name*='country_id']"/>
-         <element name="guestRegion" type="select" selector=".billing-address-form select[name*='region_id']"/>
-         <element name="guestPostcode" type="input" selector=".billing-address-form input[name*='postcode']"/>
-         <element name="guestTelephone" type="input" selector=".billing-address-form input[name*='telephone']"/>
--        <element name="billingAddress" type="text" selector="div.billing-address-details"/>
-+        <element name="billingAddress" type="text" selector=".payment-method._active div.billing-address-details"/>
-         <element name="cartItems" type="text" selector="ol.minicart-items"/>
-         <element name="cartItemsArea" type="button" selector="div.block.items-in-cart"/>
--        <element name="cartItemsAreaActive" type="textarea" selector="div.block.items-in-cart.active"/>
-+        <element name="cartItemsAreaActive" type="textarea" selector="div.block.items-in-cart.active" timeout="30"/>
-         <element name="checkMoneyOrderPayment" type="radio" selector="input#checkmo.radio" timeout="30"/>
--        <element name="placeOrder" type="button" selector="button.action.primary.checkout" timeout="30"/>
-+        <element name="placeOrder" type="button" selector=".payment-method._active button.action.primary.checkout" timeout="30"/>
-         <element name="paymentSectionTitle" type="text" selector="//*[@id='checkout-payment-method-load']//div[text()='Payment Method']" />
-         <element name="orderSummarySubtotal" type="text" selector="//tr[@class='totals sub']//span[@class='price']" />
-         <element name="orderSummaryShippingTotal" type="text" selector="//tr[@class='totals shipping excl']//span[@class='price']" />
-@@ -36,15 +39,25 @@
-         <element name="ProductItemByName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']" parameterized="true" />
-         <element name="ProductOptionsByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options']" parameterized="true" />
-         <element name="ProductOptionsActiveByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options active']" parameterized="true" />
-+        <element name="ProductOptionLinkActiveByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options active']//a[text() = '{{var2}}']" parameterized="true" />
-         <element name="shipToInformation" type="text" selector="//div[@class='ship-to']//div[@class='shipping-information-content']" />
-         <element name="shippingMethodInformation" type="text" selector="//div[@class='ship-via']//div[@class='shipping-information-content']" />
-         <element name="paymentMethodTitle" type="text" selector=".payment-method-title span" />
--        <element name="productOptionsByProductItemPrice" type="text" selector="//div[@class='product-item-inner']//div[@class='subtotal']//span[@class='price'][contains(.,'{{var1}}')]//ancestor::div[@class='product-item-details']//div[@class='product options']" parameterized="true"/>
--        <element name="productOptionsActiveByProductItemPrice" type="text" selector="//div[@class='subtotal']//span[@class='price'][contains(.,'{{var1}}')]//ancestor::div[@class='product-item-details']//div[@class='product options active']" parameterized="true"/>
-+        <element name="productOptionsByProductItemPrice" type="text" selector="//div[@class='product-item-inner']//div[@class='subtotal']//span[@class='price'][contains(.,'{{price}}')]//ancestor::div[@class='product-item-details']//div[@class='product options']" parameterized="true"/>
-+        <element name="productOptionsActiveByProductItemPrice" type="text" selector="//div[@class='subtotal']//span[@class='price'][contains(.,'{{price}}')]//ancestor::div[@class='product-item-details']//div[@class='product options active']" parameterized="true"/>
-+        <element name="productItemPriceByName" type="text" selector="//div[@class='product-item-details'][contains(., '{{ProductName}}')]//span[@class='price']" parameterized="true"/>
- 
-         <element name="tax" type="text" selector="[data-th='Tax'] span" timeout="30"/>
-         <element name="taxPercentage" type="text" selector=".totals-tax-details .mark"/>
-         <element name="orderSummaryTotalIncluding" type="text" selector="//tr[@class='grand totals incl']//span[@class='price']" />
-         <element name="orderSummaryTotalExcluding" type="text" selector="//tr[@class='grand totals excl']//span[@class='price']" />
-+        <element name="shippingAndBillingAddressSame" type="input" selector="#billing-address-same-as-shipping-braintree_cc_vault"/>
-+        <element name="addressAction" type="button" selector="//span[text()='{{action}}']" parameterized="true"/>
-+        <element name="addressBook" type="button" selector="//a[text()='Address Book']"/>
-+        <element name="noQuotes" type="text" selector=".no-quotes-block"/>
-+        <element name="paymentMethodByName" type="text" selector="//*[@id='checkout-payment-method-load']//*[contains(@class, 'payment-group')]//label[normalize-space(.)='{{var1}}']" parameterized="true"/>
-+        <element name="billingAddressSelectShared" type="select" selector=".checkout-billing-address select[name='billing_address_id']"/>
-+        <element name="discount" type="block" selector="tr.totals.discount"/>
-+        <element name="discountPrice" type="text" selector=".discount .price"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.xml
-new file mode 100644
-index 00000000000..42decd8d432
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection">
-+        <element name="billingAddressDetails" type="text" selector="div.billing-address-details"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
-index ca13af52c1e..e9beacc3f85 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
-@@ -7,17 +7,26 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CheckoutShippingGuestInfoSection">
--        <element name="email" type="input" selector="#customer-email"/>
-+        <element name="email" type="input" selector="#checkout-customer-email"/>
-         <element name="firstName" type="input" selector="input[name=firstname]"/>
-         <element name="lastName" type="input" selector="input[name=lastname]"/>
-+        <element name="company" type="input" selector="input[name=company]"/>
-         <element name="street" type="input" selector="input[name='street[0]']"/>
-+        <element name="street2" type="input" selector="input[name='street[1]']"/>
-         <element name="city" type="input" selector="input[name=city]"/>
-         <element name="region" type="select" selector="select[name=region_id]"/>
-+        <element name="regionInput" type="input" selector="input[name=region]"/>
-         <element name="postcode" type="input" selector="input[name=postcode]"/>
-+        <element name="country" type="select" selector="select[name=country_id]"/>
-         <element name="telephone" type="input" selector="input[name=telephone]"/>
-         <element name="next" type="button" selector="button.button.action.continue.primary" timeout="30"/>
-         <element name="firstShippingMethod" type="radio" selector=".row:nth-of-type(1) .col-method .radio"/>
-+        <element name="shippingBlock" type="text" selector="#checkout-step-shipping"/>
-+
-+        <!--Order Summary-->
-+        <element name="itemInCart" type="button" selector="//div[@class='title']"/>
-+        <element name="productName" type="text" selector="//strong[@class='product-item-name']"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml
-index 2d07cdd9bd0..2f49e4f422a 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml
-@@ -7,14 +7,18 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CheckoutShippingMethodsSection">
-         <element name="next" type="button" selector="button.button.action.continue.primary" timeout="30"/>
-         <element name="firstShippingMethod" type="radio" selector="//*[@id='checkout-shipping-method-load']//input[@class='radio']"/>
-         <element name="shippingMethodRow" type="text" selector=".form.methods-shipping table tbody tr"/>
-         <element name="checkShippingMethodByName" type="radio" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/..//input" parameterized="true"/>
-+        <element name="shippingMethodFlatRate" type="radio" selector="#checkout-shipping-method-load input[value='flatrate_flatrate']"/>
-+        <element name="shippingMethodFreeShipping" type="radio" selector="#checkout-shipping-method-load input[value='freeshipping_freeshipping']" timeout="60"/>
-         <element name="shippingMethodRowByName" type="text" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/.." parameterized="true"/>
--        <element name="shipHereButton" type="button" selector="//button[contains(@class, 'action-select-shipping-item')]/parent::div/following-sibling::div/button[contains(@class, 'action-select-shipping-item')]"/>
-+        <element name="shipHereButton" type="button" selector="//div/following-sibling::div/button[contains(@class, 'action-select-shipping-item')]"/>
-         <element name="shippingMethodLoader" type="button" selector="//div[contains(@class, 'checkout-shipping-method')]/following-sibling::div[contains(@class, 'loading-mask')]"/>
-+        <element name="freeShippingShippingMethod" type="input" selector="#s_method_freeshipping_freeshipping" timeout="30"/>
-+        <element name="noQuotesMsg" type="text" selector="#checkout-step-shipping_method div"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
-index 136658cc591..f90ec0aad46 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CheckoutShippingSection">
-         <element name="isShippingStep" type="text" selector="//*[@class='opc-progress-bar']/li[contains(@class, '_active') and span[contains(.,'Shipping')]]"/>
-         <element name="shippingTab" type="text" selector="//li[contains(@class,'opc-progress-bar-item')]//*[text()='Shipping']" timeout="30"/>
-@@ -15,7 +15,8 @@
-         <element name="editAddressButton" type="button" selector=".action-edit-address" timeout="30"/>
-         <element name="addressDropdown" type="select" selector="[name=billing_address_id]"/>
-         <element name="newAddressButton" type="button" selector=".action-show-popup" timeout="30"/>
--        <element name="email" type="input" selector="#customer-email"/>
-+        <element name="email" type="input" selector="input[id*=customer-email]"/>
-+        <element name="password" type="input" selector="#customer-password"/>
-         <element name="firstName" type="input" selector="input[name=firstname]"/>
-         <element name="lastName" type="input" selector="input[name=lastname]"/>
-         <element name="company" type="input" selector="input[name=company]"/>
-@@ -27,10 +28,18 @@
-         <element name="country" type="select" selector="select[name=country_id]"/>
-         <element name="telephone" type="input" selector="input[name=telephone]"/>
-         <element name="saveAddress" type="button" selector=".action-save-address"/>
-+        <element name="cancelChangeAddress" type="button" selector=".action-hide-popup"/>
-         <element name="updateAddress" type="button" selector=".action-update"/>
-         <element name="next" type="button" selector="button.button.action.continue.primary" timeout="30"/>
-         <element name="firstShippingMethod" type="radio" selector="//*[@id='checkout-shipping-method-load']//input[@class='radio']"/>
-         <element name="defaultShipping" type="button" selector=".billing-address-details"/>
-+        <element name="state" type="button" selector="//*[text()='Alabama']"/>
-         <element name="stateInput" type="input" selector="input[name=region]"/>
-+        <element name="regionOptions" type="select" selector="select[name=region_id] option"/>
-+        <element name="editActiveAddress" type="button" selector="//div[@class='shipping-address-item selected-item']//span[text()='Edit']" timeout="30"/>
-+        <element name="loginButton" type="button" selector=".action.login" timeout="30"/>
-+        <element name="shipHereButton" type="button" selector="//div[text()='{{street}}']/button[@class='action action-select-shipping-item']" parameterized="true" timeout="30"/>
-+        <element name="textFieldAttrRequireMessage" type="text" selector="//input[@name='custom_attributes[{{attribute}}]']/ancestor::div[contains(@class, 'control')]/div/span" parameterized="true" timeout="30"/>
-+        <element name="textFieldAttribute" type="input" selector="[name*='custom_attributes[{{attribute}}]']" parameterized="true" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
-index 8a55015f9d2..81e63baddf5 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CheckoutSuccessMainSection">
-         <element name="successTitle" type="text" selector=".page-title"/>
-         <element name="success" type="text" selector="div.checkout-success"/>
-@@ -16,6 +16,7 @@
-         <element name="orderLink" type="text" selector="a[href*=order_id].order-number" timeout="30"/>
-         <element name="orderNumberText" type="text" selector=".checkout-success > p:nth-child(1)"/>
-         <element name="continueShoppingButton" type="button" selector=".action.primary.continue" timeout="30"/>
-+        <element name="createAnAccount" type="button" selector="[data-bind*=&quot;i18n: 'Create an Account'&quot;]" timeout="30"/>
-         <element name="printLink" type="button" selector=".print" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
-index 271ccec4505..baee6cc7177 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
-@@ -7,10 +7,11 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CheckoutSuccessRegisterSection">
-         <element name="registerMessage" type="text" selector="#registration p:nth-child(1)"/>
-         <element name="customerEmail" type="text" selector="#registration p:nth-child(2)"/>
--        <element name="createAccountButton" type="button" selector="#registration form input[type='submit']" timeout="30"/>
-+        <element name="createAccountButton" type="button" selector="[data-bind*=&quot;i18n: 'Create an Account'&quot;]" timeout="30"/>
-+        <element name="orderNumber" type="text" selector="//p[text()='Your order # is: ']//span"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml
-new file mode 100644
-index 00000000000..2039128ac2d
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="ShipmentFormSection">
-+        <element name="shippingAddress" type="textarea" selector="//*[@class='box box-billing-address']//address"/>
-+        <element name="billingAddress" type="textarea" selector="//*[@class='box box-shipping-address']//address"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontRemoveItemModalSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontRemoveItemModalSection.xml
-index 4e2a08e94bd..e8001af6f03 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontRemoveItemModalSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontRemoveItemModalSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StoreFrontRemoveItemModalSection">
-         <element name="message" type="text" selector="aside.confirm div.modal-content"/>
-         <element name="ok" type="button" selector="aside.confirm .modal-footer .action-primary"/>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml
-index 0edbb21bc6f..0427938a02d 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCategoryProductSection">
-         <element name="ProductAddToCartByNumber" type="button" selector="//main//li[{{var1}}]//button[contains(@class, 'tocart')]" parameterized="true"/>
-         <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//button[contains(@class, 'tocart')]" parameterized="true"/>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutAddressPopupSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutAddressPopupSection.xml
-new file mode 100644
-index 00000000000..6a27915768d
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutAddressPopupSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCheckoutAddressPopupSection">
-+        <element name="newAddressModalPopup" type="block" selector=".modal-popup.modal-slide._inner-scroll"/>
-+        <element name="closeAddressModalPopup" type="button" selector=".action-hide-popup"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutCheckoutCustomerLoginSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutCheckoutCustomerLoginSection.xml
-new file mode 100644
-index 00000000000..9772fa1993a
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutCheckoutCustomerLoginSection.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCheckoutCheckoutCustomerLoginSection">
-+        <element name="email" type="input" selector="form[data-role='email-with-possible-login'] input[name='username']" />
-+        <element name="emailNoteMessage" type="text" selector="//form[@data-role='email-with-possible-login']//div[input[@name='username']]//*[contains(@class, 'note')]" />
-+        <element name="emailErrorMessage" type="text" selector="//form[@data-role='email-with-possible-login']//div[input[@name='username']]//*[@id='checkout-customer-email-error']" />
-+        <element name="emailTooltipButton" type="button" selector="//form[@data-role='email-with-possible-login']//div[input[@name='username']]//*[contains(@class, 'action-help')]" />
-+        <element name="emailTooltipContent" type="text" selector="//form[@data-role='email-with-possible-login']//div[input[@name='username']]//*[contains(@class, 'field-tooltip-content')]" />
-+        <element name="password" type="input" selector="form[data-role='email-with-possible-login'] input[name='password']" />
-+        <element name="passwordNoteMessage" type="text" selector="//form[@data-role='email-with-possible-login']//div[input[@name='password']]//*[contains(@class, 'note')]" />
-+        <element name="submit" type="button" selector="form[data-role='email-with-possible-login'] button[type='submit']" />
-+        <element name="forgotPassword" type="button" selector="form[data-role='email-with-possible-login'] a.remind" />
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml
-new file mode 100644
-index 00000000000..40214b9c11f
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCheckoutPaymentMethodSection">
-+        <element name="billingAddress" type="text" selector=".checkout-billing-address"/>
-+        <element name="checkPaymentMethodByName" type="radio" selector="//div[@id='checkout-payment-method-load']//div[@class='payment-method']//label//span[contains(., '{{methodName}}')]/../..//input" parameterized="true"/>
-+        <element name="billingAddressSameAsShipping" type="checkbox" selector=".payment-method._active [name='billing-address-same-as-shipping']"/>
-+        <element name="billingAddressSameAsShippingShared" type="checkbox" selector="#billing-address-same-as-shipping-shared"/>
-+        <element name="paymentOnAccount" type="radio" selector="#companycredit"/>
-+        <element name="paymentOnAccountLabel" type="text" selector="//span[text()='Payment on Account']"/>
-+        <element name="purchaseOrderNumber" type="input" selector="#po_number"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml
-index 4341d99c3fb..8bd6a59f563 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml
-@@ -7,11 +7,11 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontMessagesSection">
-         <!-- @TODO: Use general message selector after MQE-694 is fixed -->
-         <element name="messageProductAddedToCart" type="text"
--                 selector="//main//div[contains(@class, 'messages')]//div[contains(@class, 'message')]/div[contains(text(), 'You added {{var1}} to your shopping cart.')]"
-+                 selector="//main//div[contains(@class, 'messages')]//div[contains(@class, 'message')]/div[contains(text(), 'You added {{var1}} to your') and a[contains(., 'shopping cart')]]"
-                  parameterized="true"
-         />
-     </section>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
-index 2c556f25f20..621cd1d3a7b 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
-@@ -7,23 +7,36 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontMinicartSection">
-         <element name="productCount" type="text" selector="//header//div[contains(@class, 'minicart-wrapper')]//a[contains(@class, 'showcart')]//span[@class='counter-number']"/>
-         <element name="productLinkByName" type="button" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details']//a[contains(text(), '{{var1}}')]"  parameterized="true"/>
-         <element name="productPriceByName" type="text" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details'][.//a[contains(text(), '{{var1}}')]]//span[@class='price']"  parameterized="true"/>
-         <element name="productImageByName" type="text" selector="//header//ol[@id='mini-cart']//span[@class='product-image-container']//img[@alt='{{var1}}']"  parameterized="true"/>
-+        <element name="productName" type="text" selector=".product-item-name"/>
-         <element name="productOptionsDetailsByName" type="button" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details'][.//a[contains(text(), '{{var1}}')]]//span[.='See Details']"  parameterized="true"/>
-         <element name="productOptionByNameAndAttribute" type="text" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details'][.//a[contains(text(), '{{var1}}')]]//dt[@class='label' and .='{{var2}}']/following-sibling::dd[@class='values']//span"  parameterized="true"/>
--        <element name="showCart" type="button" selector="a.showcart"/>
-+        <element name="showCart" type="button" selector="a.showcart" timeout="60"/>
-         <element name="quantity" type="button" selector="span.counter-number"/>
-         <element name="miniCartOpened" type="button" selector="a.showcart.active"/>
-         <element name="goToCheckout" type="button" selector="#top-cart-btn-checkout" timeout="30"/>
-         <element name="viewAndEditCart" type="button" selector=".action.viewcart" timeout="30"/>
-         <element name="miniCartItemsText" type="text" selector=".minicart-items"/>
-         <element name="deleteMiniCartItem" type="button" selector=".action.delete" timeout="30"/>
-+        <element name="deleteMiniCartItemByName" type="button" selector="//ol[@id='mini-cart']//div[contains(., '{{var}}')]//a[contains(@class, 'delete')]" parameterized="true"/>
-         <element name="miniCartSubtotalField" type="text" selector=".block-minicart .amount span.price"/>
-+        <element name="itemQuantityBySku" type="input" selector="#minicart-content-wrapper input[data-cart-item-id='{{productSku}}']" parameterized="true"/>
-+        <element name="itemQuantityUpdateBySku" type="button" selector="//div[@id='minicart-content-wrapper']//input[@data-cart-item-id='{{productSku}}']/../button[contains(@class, 'update-cart-item')]" parameterized="true"/>
-         <element name="itemQuantity" type="input" selector="//a[text()='{{productName}}']/../..//input[contains(@class,'cart-item-qty')]" parameterized="true"/>
-         <element name="itemQuantityUpdate" type="button" selector="//a[text()='{{productName}}']/../..//span[text()='Update']" parameterized="true"/>
-+        <element name="itemDiscount" type="text" selector="//tr[@class='totals']//td[@class='amount']/span"/>
-+        <element name="subtotal" type="text" selector="//tr[@class='totals sub']//td[@class='amount']/span"/>
-+        <element name="emptyCart" type="text" selector=".counter.qty.empty"/>
-+        <element name="minicartContent" type="block" selector="#minicart-content-wrapper"/>
-+        <element name="messageEmptyCart" type="text" selector="//*[@id='minicart-content-wrapper']//*[contains(@class,'subtitle empty')]"/>
-+        <element name="visibleItemsCountText" type="text" selector="//div[@class='items-total']"/>
-+        <element name="productQuantity" type="input" selector="//*[@id='mini-cart']//a[contains(text(),'{{productName}}')]/../..//div[@class='details-qty qty']//input[@data-item-qty='{{qty}}']" parameterized="true"/>
-+        <element name="productImage" type="text" selector="//ol[@id='mini-cart']//img[@class='product-image-photo']"/>
-+        <element name="productSubTotal" type="text" selector="//div[@class='subtotal']//span/span[@class='price']"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCartGiftOptionSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCartGiftOptionSection.xml
-new file mode 100644
-index 00000000000..c1bee4af4c2
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCartGiftOptionSection.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontProductCartGiftOptionSection">
-+        <element name="giftOptions" type="button" selector=".action.action-gift"/>
-+        <element name="fieldTo" type="input" selector=".gift-options-content .field-to input"/>
-+        <element name="fieldFrom" type="input" selector=".gift-options-content .field-from input"/>
-+        <element name="message" type="textarea" selector="#gift-message-whole-message"/>
-+        <element name="update" type="button" selector=".action-update"/>
-+        <element name="cancel" type="button" selector=".action-cancel"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCompareMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
-index 823260be42f..200a742e58f 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductCompareMainSection">
-         <element name="ProductAddToCartByName" type="button" selector="//*[@id='product-comparison']//td[.//strong[@class='product-item-name']/a[contains(text(), '{{var1}}')]]//button[contains(@class, 'tocart')]" parameterized="true"/>
-     </section>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-index 1ff5d2c8744..95929401620 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductInfoMainSection">
-         <element name="AddToCart" type="button" selector="#product-addtocart-button"/>
-     </section>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml
-index 66146137d01..52a69307550 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml
-@@ -7,17 +7,19 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest">
-         <annotations>
-             <features value="Checkout"/>
--            <title value="Guest Checkout"/>
-+            <stories value="Guest checkout"/>
-+            <title value="Address State Field For UK Customers Remain Option even After Browser Refresh"/>
-             <description value="Address State Field For UK Customers Remain Option even After Browser Refresh"/>
-             <severity value="MAJOR"/>
-             <testCaseId value="MAGETWO-93329"/>
-             <group value="checkout"/>
--            <!-- Skipped because of MAGETWO-93726 -->
--            <group value="skip"/>
-+            <skip>
-+                <issueId value="MAGETWO-93726"/>
-+            </skip>
-         </annotations>
-         <before>
-             <createData entity="_defaultCategory" stepKey="createCategory"/>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml
-index add1a1b1cf9..f3e31d23f71 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml
-@@ -7,15 +7,15 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AddressStateFieldShouldNotAcceptJustIntegerValuesTest">
-         <annotations>
-             <features value="Checkout"/>
-             <stories value="MAGETWO-91465"/>
--            <title value="Guest Checkout"/>
-+            <title value="Guest Checkout - address State field should not allow just integer values"/>
-             <description value="Address State field should not allow just integer values"/>
-             <severity value="MAJOR"/>
--            <testCaseId value="MAGETWO-93203"/>
-+            <testCaseId value="MC-6223"/>
-             <group value="checkout"/>
-         </annotations>
-         <before>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml
-new file mode 100644
-index 00000000000..31a9d011a91
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml
-@@ -0,0 +1,102 @@
-+<?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="AdminCheckConfigsChangesAreNotAffectedStartedCheckoutProcessTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Changes in configs are not affecting checkout process"/>
-+            <title value="Admin check configs changes are not affected started checkout process test"/>
-+            <description value="Changes in admin for shipping rates are not affecting checkout process that has been started"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-12599"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <!-- Create simple product -->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+
-+            <!-- Enable free shipping method -->
-+            <magentoCLI command="config:set {{EnableFreeShippingConfigData.path}} {{EnableFreeShippingConfigData.value}}" stepKey="enableFreeShipping"/>
-+
-+            <!-- Disable flat rate method -->
-+            <magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
-+        </before>
-+        <after>
-+            <!-- Roll back configuration -->
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{DisableFreeShippingConfigData.path}} {{DisableFreeShippingConfigData.value}}" stepKey="disableFreeShipping"/>
-+
-+            <!-- Delete simple product -->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Add product to cart -->
-+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
-+            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="productCount" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Proceed to Checkout from mini shopping cart -->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckout"/>
-+
-+        <!-- Fill all required fields -->
-+        <actionGroup ref="GuestCheckoutFillNewShippingAddressActionGroup" stepKey="fillNewShippingAddress">
-+            <argument name="customer" value="Simple_Customer_Without_Address" />
-+            <argument name="address" value="US_Address_TX"/>
-+        </actionGroup>
-+
-+        <!-- Assert Free Shipping checkbox -->
-+        <seeCheckboxIsChecked selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="freeShippingMethodCheckboxIsChecked"/>
-+
-+        <!-- Click Next button -->
-+        <click selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="clickNext"/>
-+        <waitForPageLoad stepKey="waitForShipmentPageLoad"/>
-+
-+        <!-- Payment step is opened -->
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
-+
-+        <!-- Order Summary block contains information about shipping -->
-+        <actionGroup ref="CheckShippingMethodInCheckoutActionGroup" stepKey="guestCheckoutCheckShippingMethod">
-+            <argument  name="shippingMethod" value="freeTitleDefault.value"/>
-+        </actionGroup>
-+
-+        <!-- Open new browser's window and login as Admin -->
-+        <openNewTab stepKey="openNewTab"/>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        <!-- Go to Store > Configuration > Sales > Shipping Methods -->
-+        <actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
-+
-+        <!-- Enable "Flat Rate" -->
-+        <actionGroup ref="AdminChangeFlatRateShippingMethodStatusActionGroup" stepKey="enableFlatRateShippingStatus"/>
-+
-+        <!-- Flush cache -->
-+        <magentoCLI command="cache:flush" stepKey="cacheFlush"/>
-+
-+        <!-- Back to the Checkout and refresh the page -->
-+        <switchToPreviousTab stepKey="switchToPreviousTab"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitPageReload"/>
-+
-+        <!-- Payment step is opened after refreshing -->
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSection"/>
-+
-+        <!-- Order Summary block contains information about free shipping -->
-+        <actionGroup ref="CheckShippingMethodInCheckoutActionGroup" stepKey="guestCheckoutCheckFreeShippingMethod">
-+            <argument  name="shippingMethod" value="freeTitleDefault.value"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml
-index d7182222835..9714b76a056 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="CheckCheckoutSuccessPageAsRegisterCustomer">
-         <annotations>
-             <features value="Checkout"/>
-@@ -15,7 +15,7 @@
-             <title value="Customer Checkout"/>
-             <description value="To be sure that other elements of Success page are shown for placed order as registered Customer."/>
-             <severity value="CRITICAL"/>
--            <testCaseId value="MAGETWO-60345"/>
-+            <testCaseId value="MC-16488"/>
-             <group value="checkout"/>
-         </annotations>
- 
-@@ -55,8 +55,8 @@
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-         <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-         <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
--        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoadedTest3"/>
--
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
-         <!--Click Place Order button-->
-         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-         <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
-@@ -81,7 +81,8 @@
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
-         <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton2"/>
-         <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext2"/>
--        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoadedTest4"/>
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
- 
-         <!--Click Place Order button-->
-         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder2"/>
-@@ -105,7 +106,9 @@
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
-         <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton3"/>
-         <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext3"/>
--        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoadedTest5"/>
-+
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment3"/>
- 
-         <!--Click Place Order button-->
-         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder3"/>
-@@ -132,10 +135,10 @@
-         <annotations>
-             <features value="Checkout"/>
-             <stories value="Success page elements are presented for placed order as Guest"/>
--            <title value="Customer Checkout"/>
--            <description value="To be sure that other elements of Success page are presented for placed order as Guest."/>
-+            <title value="Guest Checkout - elements of success page are presented for placed order as guest"/>
-+            <description value="To be sure that other elements of Success page are presented for placed order as Guest"/>
-             <severity value="CRITICAL"/>
--            <testCaseId value="MAGETWO-60346"/>
-+            <testCaseId value="MC-16490"/>
-             <group value="checkout"/>
-         </annotations>
- 
-@@ -165,6 +168,9 @@
-             <argument name="customerAddressVar" value="CustomerAddressSimple" />
-         </actionGroup>
- 
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
-+
-         <!--Click Place Order button-->
-         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-         <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
-@@ -198,6 +204,9 @@
-             <argument name="customerAddressVar" value="CustomerAddressSimple" />
-         </actionGroup>
- 
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
-+
-         <!--Click Place Order button-->
-         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder2"/>
-         <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage2"/>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckNotVisibleProductInMinicartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckNotVisibleProductInMinicartTest.xml
-new file mode 100644
-index 00000000000..4b4ca1935fd
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckNotVisibleProductInMinicartTest.xml
-@@ -0,0 +1,70 @@
-+<?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="CheckNotVisibleProductInMinicartTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="MAGETWO-96422: Hidden Products are absent in Storefront Mini-Cart" />
-+            <title value="Not visible individually product in mini-shopping cart."/>
-+            <description value="To be sure that product in mini-shopping cart remains visible after admin makes it not visible individually"/>
-+            <severity value="MAJOR"/>
-+            <group value="checkout"/>
-+        </annotations>
-+
-+        <!--Create simple product1 and simple product2-->
-+        <createData entity="SimpleTwo" stepKey="createSimpleProduct1"/>
-+        <createData entity="SimpleTwo" stepKey="createSimpleProduct2"/>
-+
-+        <!--Go to simple product1 page-->
-+        <amOnPage url="$$createSimpleProduct1.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage1"/>
-+        <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
-+
-+        <!--Add simple product1 to Shopping Cart-->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage1">
-+            <argument name="productName" value="$$createSimpleProduct1.name$$"/>
-+        </actionGroup>
-+
-+        <!--Check simple product1 in minicart-->
-+        <comment userInput="Check simple product 1 in minicart" stepKey="commentCheckSimpleProduct1InMinicart" after="addToCartFromStorefrontProductPage1"/>
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertProduct1NameInMiniCart">
-+            <argument name="productName" value="$$createSimpleProduct1.name$$"/>
-+        </actionGroup>
-+
-+        <!--Make simple product1 not visible individually-->
-+        <updateData entity="SetProductVisibilityHidden" createDataKey="createSimpleProduct1" stepKey="updateSimpleProduct1">
-+            <requiredEntity createDataKey="createSimpleProduct1"/>
-+        </updateData>
-+
-+        <!--Go to simple product2 page-->
-+        <amOnPage url="$$createSimpleProduct2.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage2"/>
-+        <waitForPageLoad stepKey="waitForCatalogPageLoad2"/>
-+
-+        <!--Add simple product2 to Shopping Cart for updating cart items-->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage2">
-+            <argument name="productName" value="$$createSimpleProduct2.name$$"/>
-+        </actionGroup>
-+
-+        <!--Check simple product1 in minicart-->
-+        <comment userInput="Check hidden simple product 1 in minicart" stepKey="commentCheckHiddenSimpleProduct1InMinicart" after="addToCartFromStorefrontProductPage2"/>
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertHiddenProduct1NameInMiniCart">
-+            <argument name="productName" value="$$createSimpleProduct1.name$$"/>
-+        </actionGroup>
-+
-+        <!--Check simple product2 in minicart-->
-+        <comment userInput="Check hidden simple product 2 in minicart" stepKey="commentCheckSimpleProduct2InMinicart" after="addToCartFromStorefrontProductPage2"/>
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertProduct2NameInMiniCart">
-+            <argument name="productName" value="$$createSimpleProduct2.name$$"/>
-+        </actionGroup>
-+
-+        <!--Delete simple product1 and simple product2-->
-+        <deleteData createDataKey="createSimpleProduct1" stepKey="deleteProduct1"/>
-+        <deleteData createDataKey="createSimpleProduct2" stepKey="deleteProduct2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml
-new file mode 100644
-index 00000000000..f3807388399
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml
-@@ -0,0 +1,86 @@
-+<?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="CheckoutSpecificDestinationsTest">
-+        <annotations>
-+            <title value="Check that top destinations can be removed after a selection was previously saved"/>
-+            <stories value="MAGETWO-91511: Top destinations cannot be removed after a selection was previously saved"/>
-+            <description value="Check that top destinations can be removed after a selection was previously saved"/>
-+            <features value="Checkout"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MAGETWO-94195"/>
-+            <group value="Checkout"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="defaultCategory"/>
-+            <createData entity="_defaultProduct" stepKey="simpleProduct">
-+                <requiredEntity createDataKey="defaultCategory"/>
-+            </createData>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+
-+        <!--Go to configuration general page-->
-+        <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage"/>
-+
-+        <!--Open country options section-->
-+        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation"/>
-+
-+        <!--Select top destinations country-->
-+        <actionGroup ref="SelectTopDestinationsCountry" stepKey="selectTopDestinationsCountry">
-+            <argument name="countries" value="Countries"/>
-+        </actionGroup>
-+
-+        <!--Go to product page-->
-+        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.name$$)}}" stepKey="amOnStorefrontProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+
-+        <!--Add product to cart-->
-+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCart">
-+            <argument name="productName" value="$$simpleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!--Go to shopping cart-->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
-+
-+        <!--Verify country options in checkout top destination section-->
-+        <actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry">
-+            <argument name="country" value="Bahamas"/>
-+            <argument name="placeNumber" value="2"/>
-+        </actionGroup>
-+
-+        <!--Go to configuration general page-->
-+        <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage2"/>
-+
-+        <!--Open country options section-->
-+        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation2"/>
-+
-+        <!--Deselect top destinations country-->
-+        <actionGroup ref="UnSelectTopDestinationsCountry" stepKey="unSelectTopDestinationsCountry">
-+            <argument name="countries" value="Countries"/>
-+        </actionGroup>
-+
-+        <!--Go to shopping cart-->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart2"/>
-+
-+        <!--Verify country options is shown by default-->
-+        <actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry2">
-+            <argument name="country" value="Afghanistan"/>
-+            <argument name="placeNumber" value="2"/>
-+        </actionGroup>
-+
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/ConfiguringInstantPurchaseFunctionalityTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/ConfiguringInstantPurchaseFunctionalityTest.xml
-new file mode 100644
-index 00000000000..0897e20f1b1
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/ConfiguringInstantPurchaseFunctionalityTest.xml
-@@ -0,0 +1,255 @@
-+<?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="ConfiguringInstantPurchaseFunctionalityTest">
-+        <annotations>
-+            <features value="One Page Checkout"/>
-+            <stories value="Configuring instant purchase"/>
-+            <title value="Configuring instant purchase functionality test"/>
-+            <description value="Configuring instant purchase"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-6436"/>
-+            <group value="checkout"/>
-+            <skip>
-+                <issueId value="MQE-1576"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Configure Braintree Vault-enabled payment method -->
-+            <createData entity="BraintreeConfig" stepKey="braintreeConfigurationData"/>
-+            <createData entity="CustomBraintreeConfigurationData" stepKey="enableBraintree"/>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+            <!-- Create product -->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Set configs to default -->
-+            <createData entity="DefaultBraintreeConfig" stepKey="defaultBraintreeConfig"/>
-+            <createData entity="RollBackCustomBraintreeConfigurationData" stepKey="rollBackCustomBraintreeConfigurationData"/>
-+
-+            <!-- Delete product -->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Admin logout -->
-+            <actionGroup ref="logout" stepKey="adminLogout"/>
-+        </after>
-+
-+        <!-- Create store views -->
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createFirstStoreView">
-+            <argument name="customStore" value="storeViewData1"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
-+            <argument name="customStore" value="storeViewData2"/>
-+        </actionGroup>
-+
-+        <!-- Login to Frontend -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Add product to cart -->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+
-+        <!-- Customer placed order with payment method save -->
-+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
-+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
-+
-+        <!-- Fill Braintree cart data -->
-+        <click selector="{{BraintreeConfigurationPaymentSection.creditCart}}" stepKey="selectBraintreePaymentMethod"/>
-+        <waitForPageLoad stepKey="waitForBraintreeFormLoad"/>
-+        <scrollTo selector="{{BraintreeConfigurationPaymentSection.creditCart}}" stepKey="scrollToCreditCardSection"/>
-+        <actionGroup ref="StorefrontFillCartDataActionGroup" stepKey="fillCartData"/>
-+        <waitForPageLoad stepKey="waitForFillCartData"/>
-+
-+        <!-- Place order -->
-+        <click selector="{{BraintreeConfigurationPaymentSection.paymentMethodContainer}}{{CheckoutPaymentSection.placeOrder}}" stepKey="checkoutPlaceOrder"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
-+
-+        <!-- Go to Configuration > Sales -->
-+        <actionGroup ref="AdminOpenInstantPurchaseConfigPageActionGroup" stepKey="openInstantPurchaseConfigPage"/>
-+
-+        <!-- Enable Instant Purchase -->
-+        <actionGroup ref="AdminChangeInstantPurchaseStatusActionGroup" stepKey="enableInstantPurchase"/>
-+
-+        <!-- Switch to specific store view -->
-+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToSpecificStoreView">
-+            <argument name="storeView" value="storeViewData1.name"/>
-+        </actionGroup>
-+
-+        <!-- Change button text on a single store view -->
-+        <actionGroup ref="AdminChangeInstantPurchaseButtonTextActionGroup" stepKey="changeInstantPurchaseButtonText">
-+            <argument name="buttonText" value="Quick Buy"/>
-+        </actionGroup>
-+
-+        <!-- Verify changes on the front-end by opening a simple product as a logged in customer with saved card and address on given store view:
-+             1. Go to Storefront page -->
-+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStorefrontPage"/>
-+
-+        <!-- 2. Switch store view -->
-+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="SwitchStoreView">
-+            <argument name="storeView" value="storeViewData1"/>
-+        </actionGroup>
-+
-+        <!-- 3. Assert customer is logged with saved card with address -->
-+        <actionGroup ref="OpenStorefrontCustomerStoredPaymentMethodsPageActionGroup" stepKey="openStorefrontCustomerStoredPaymentMethodsPage"/>
-+        <actionGroup ref="AssertStorefrontCustomerSavedCardActionGroup" stepKey="assertCustomerPaymentMethod"/>
-+        <actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToAddressBook">
-+            <argument name="menu" value="Address Book"/>
-+        </actionGroup>
-+        <see selector="{{CheckoutOrderSummarySection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}} {{US_Address_TX.city}}, {{US_Address_TX.state}}, {{US_Address_TX.postcode}}" stepKey="checkShippingAddress"/>
-+
-+        <!-- Open product page -->
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
-+            <argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+
-+        <!-- Quick Buy button shows up. Clicking it opens review popup -->
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeQuickBuyButton">
-+            <argument name="selector" value="{{StorefrontInstantPurchaseSection.instantPurchaseButton}}"/>
-+            <argument name="userInput" value="Quick Buy"/>
-+        </actionGroup>
-+        <click selector="{{StorefrontInstantPurchaseSection.instantPurchaseButton}}" stepKey="clickQuickBuyButton"/>
-+        <waitForElementVisible selector="{{StorefrontInstantPurchasePopupSection.modalTitle}}" stepKey="waitForPopUpTitleVisible"/>
-+        <see selector="{{StorefrontInstantPurchasePopupSection.modalTitle}}" userInput="Instant Purchase Confirmation" stepKey="seeReviewPopUp"/>
-+        <click selector="{{StorefrontInstantPurchasePopupSection.cancel}}" stepKey="closeModalPopup"/>
-+        <waitForPageLoad stepKey="waitForClosing"/>
-+
-+        <!-- Verify changes on the front-end by opening a simple product as a logged in customer with saved card and address on a store view for which description was not changed
-+             1. New customer session should be started to verify changes -->
-+        <actionGroup ref="StorefrontSignOutActionGroup" stepKey="customerLogout"/>
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- 2. Switch store view which description was not changed -->
-+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="SwitchToSecondStoreView">
-+            <argument name="storeView" value="storeViewData2"/>
-+        </actionGroup>
-+
-+        <!-- 3. Assert customer is logged with saved card and address -->
-+        <actionGroup ref="OpenStorefrontCustomerStoredPaymentMethodsPageActionGroup" stepKey="openStorefrontCustomerPaymentMethodsPage"/>
-+        <actionGroup ref="AssertStorefrontCustomerSavedCardActionGroup" stepKey="assertPaymentMethod"/>
-+        <actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="openAddressBook">
-+            <argument name="menu" value="Address Book"/>
-+        </actionGroup>
-+        <see selector="{{CheckoutOrderSummarySection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}} {{US_Address_TX.city}}, {{US_Address_TX.state}}, {{US_Address_TX.postcode}}" stepKey="seeShippingAddress"/>
-+
-+        <!-- Open product page -->
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openCreatedProductPage">
-+            <argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+
-+        <!-- Instant Purchase button shows up. Clicking it opens review popup. -->
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeInstantPurchaseButton">
-+            <argument name="selector" value="{{StorefrontInstantPurchaseSection.instantPurchaseButton}}"/>
-+            <argument name="userInput" value="Instant Purchase"/>
-+        </actionGroup>
-+        <click selector="{{StorefrontInstantPurchaseSection.instantPurchaseButton}}" stepKey="clickInstantPurchaseButton"/>
-+        <waitForElementVisible selector="{{StorefrontInstantPurchasePopupSection.modalTitle}}" stepKey="waitForPopUpVisible"/>
-+        <see selector="{{StorefrontInstantPurchasePopupSection.modalTitle}}" userInput="Instant Purchase Confirmation" stepKey="seeReviewPopUpTitle"/>
-+        <click selector="{{StorefrontInstantPurchasePopupSection.cancel}}" stepKey="closeModalPopUp"/>
-+        <waitForPageLoad stepKey="waitForModalClosing"/>
-+
-+        <actionGroup ref="StorefrontSignOutActionGroup" stepKey="createdCustomerLogout"/>
-+
-+        <!-- Return to configuration and disable Instant Purchase in a specific store view -->
-+        <actionGroup ref="AdminOpenInstantPurchaseConfigPageActionGroup" stepKey="openInstantPurchasePage"/>
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToFirstSpecificStoreView">
-+            <argument name="storeView" value="storeViewData1.name"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminChangeInstantPurchaseStatusActionGroup" stepKey="disableInstantPurchase">
-+            <argument name="status" value="0"/>
-+        </actionGroup>
-+
-+        <!-- Verify changes on the front-end by opening a simple product as a logged in customer with saved card and address in the specific store view
-+             1. New customer session should be started to verify changes -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCreatedCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- 2. Switch store view -->
-+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchStoreView">
-+            <argument name="storeView" value="storeViewData1"/>
-+        </actionGroup>
-+
-+        <!-- 3. Assert customer is logged with saved card and address -->
-+        <actionGroup ref="OpenStorefrontCustomerStoredPaymentMethodsPageActionGroup" stepKey="openCustomerPaymentMethodsPage"/>
-+        <actionGroup ref="AssertStorefrontCustomerSavedCardActionGroup" stepKey="assertCartPaymentMethod"/>
-+        <actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToAddressBookPage">
-+            <argument name="menu" value="Address Book"/>
-+        </actionGroup>
-+        <see selector="{{CheckoutOrderSummarySection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}} {{US_Address_TX.city}}, {{US_Address_TX.state}}, {{US_Address_TX.postcode}}" stepKey="assertCustomerShippingAddress"/>
-+
-+        <!-- Open product page -->
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductIndexPage">
-+            <argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+
-+        <!-- Quick Buy button is not visible -->
-+        <actionGroup ref="AssertStorefrontElementInvisibleActionGroup" stepKey="dontSeeQuickBuyButton">
-+            <argument name="selector" value="{{StorefrontInstantPurchaseSection.instantPurchaseButton}}"/>
-+            <argument name="userInput" value="Quick Buy"/>
-+        </actionGroup>
-+
-+        <!-- Verify changes on the front-end by opening a simple product as a logged in customer with saved card and address in the other store view
-+             1. New customer session should be started to verify changes -->
-+        <actionGroup ref="StorefrontSignOutActionGroup" stepKey="logoutCustomer"/>
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLoginToStorefront">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- 2. Switch store view -->
-+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchToSecondStoreView">
-+            <argument name="storeView" value="storeViewData2"/>
-+        </actionGroup>
-+
-+        <!-- 3. Assert customer is logged with saved card and address -->
-+        <actionGroup ref="OpenStorefrontCustomerStoredPaymentMethodsPageActionGroup" stepKey="goToStorefrontCustomerPaymentMethodsPage"/>
-+        <actionGroup ref="AssertStorefrontCustomerSavedCardActionGroup" stepKey="assertCardPaymentMethod"/>
-+        <actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="openAddressBookPage">
-+            <argument name="menu" value="Address Book"/>
-+        </actionGroup>
-+        <see selector="{{CheckoutOrderSummarySection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}} {{US_Address_TX.city}}, {{US_Address_TX.state}}, {{US_Address_TX.postcode}}" stepKey="seeCustomerShippingAddress"/>
-+
-+        <!-- Open product page -->
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="goToProductPage">
-+            <argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+
-+        <!-- Instant Purchase button is still visible -->
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeInstantPurchaseBtn">
-+            <argument name="selector" value="{{StorefrontInstantPurchaseSection.instantPurchaseButton}}"/>
-+            <argument name="userInput" value="Instant Purchase"/>
-+        </actionGroup>
-+
-+        <!-- Delete store views -->
-+        <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteFirstStoreView">
-+            <argument name="customStore" value="storeViewData1"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteSecondStoreView">
-+            <argument name="customStore" value="storeViewData2"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml
-new file mode 100644
-index 00000000000..166f5022d5a
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml
-@@ -0,0 +1,63 @@
-+<?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="DefaultBillingAddressShouldBeCheckedOnPaymentPageTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Checkout via the Storefront"/>
-+            <title value="The default billing address should be used on checkout"/>
-+            <description value="Default billing address should be preselected on payments page on checkout if it exist"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-98892"/>
-+            <useCaseId value="MAGETWO-70996"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <!--Go to Storefront as Customer-->
-+            <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
-+                <argument name="Customer" value="$$createCustomer$$" />
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <!--Logout from customer account-->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
-+        </after>
-+        <!-- Add simple product to cart and go to checkout-->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+        <!-- Click "+ New Address" and Fill new address-->
-+        <click selector="{{CheckoutShippingSection.newAddressButton}}" stepKey="addAddress"/>
-+        <actionGroup ref="LoggedInCheckoutWithOneAddressFieldWithoutStateField" stepKey="changeAddress">
-+            <argument name="Address" value="UK_Not_Default_Address"/>
-+            <argument name="classPrefix" value="._show"/>
-+        </actionGroup>
-+        <!--Click "Save Addresses" -->
-+        <click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="saveAddress"/>
-+        <waitForPageLoad stepKey="waitForAddressSaved"/>
-+        <dontSeeElement selector="{{StorefrontCheckoutAddressPopupSection.newAddressModalPopup}}" stepKey="dontSeeModalPopup"/>
-+        <!--Select Shipping Rate "Flat Rate" and click "Next" button-->
-+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShipping"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
-+        <!--Verify that "My billing and shipping address are the same" is unchecked and billing address is preselected-->
-+        <dontSeeCheckboxIsChecked selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="shippingAndBillingAddressIsSameUnchecked"/>
-+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" stepKey="assertBillingAddress"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleDynamicProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleDynamicProductFromShoppingCartTest.xml
-new file mode 100644
-index 00000000000..5ad4c764026
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleDynamicProductFromShoppingCartTest.xml
-@@ -0,0 +1,69 @@
-+<?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="DeleteBundleDynamicProductFromShoppingCartTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Delete Products from Shopping Cart"/>
-+            <title value="Delete bundle dynamic product from shopping cart test"/>
-+            <description value="Delete bundle dynamic product from shopping cart"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14689"/>
-+            <group value="checkout"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category and simple product -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Create bundle product -->
-+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createBundleDynamicProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
-+                <requiredEntity createDataKey="createBundleDynamicProduct"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createNewBundleLink">
-+                <requiredEntity createDataKey="createBundleDynamicProduct"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="createSimpleProduct"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        </before>
-+        <after>
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete bundle product data -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createBundleDynamicProduct" stepKey="deleteBundleProduct"/>
-+        </after>
-+
-+        <!-- Go to bundle product page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createBundleDynamicProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+
-+        <!-- Add product to the cart -->
-+        <click selector="{{StorefrontBundleProductActionSection.customizeAndAddToCartButton}}" stepKey="clickCustomizeAndAddToCart"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCart">
-+            <argument name="productName" value="$$createBundleDynamicProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Remove product from cart -->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
-+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
-+        <actionGroup ref="DeleteProductFromShoppingCartActionGroup" stepKey="deleteProduct">
-+            <argument name="productName" value="$$createBundleDynamicProduct.name$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleFixedProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleFixedProductFromShoppingCartTest.xml
-new file mode 100644
-index 00000000000..d1008c58319
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleFixedProductFromShoppingCartTest.xml
-@@ -0,0 +1,61 @@
-+<?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="DeleteBundleFixedProductFromShoppingCartTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Delete Products from Shopping Cart"/>
-+            <title value="Delete bundle fixed product from shopping cart test"/>
-+            <description value="Delete bundle fixed product from shopping cart"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14690"/>
-+            <group value="checkout"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create simple product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
-+
-+            <!-- Create bundle product -->
-+            <createData entity="ApiFixedBundleProduct" stepKey="createFixedBundleProduct"/>
-+            <createData entity="DropDownBundleOption" stepKey="createBundleOption">
-+                <requiredEntity createDataKey="createFixedBundleProduct"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="addLinkOptionToBundleProduct">
-+                <requiredEntity createDataKey="createFixedBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption"/>
-+                <requiredEntity createDataKey="createSimpleProduct"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        </before>
-+        <after>
-+            <!-- Delete bundle product data -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createFixedBundleProduct" stepKey="deleteFixedBundleProduct"/>
-+        </after>
-+
-+        <!-- Go to bundle product page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createFixedBundleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+
-+        <!-- Add product to the cart -->
-+        <click selector="{{StorefrontBundleProductActionSection.customizeAndAddToCartButton}}" stepKey="clickCustomizeAndAddToCart"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCart">
-+            <argument name="productName" value="$$createFixedBundleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Remove product from cart -->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
-+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
-+        <actionGroup ref="DeleteProductFromShoppingCartActionGroup" stepKey="deleteProduct">
-+            <argument name="productName" value="$$createFixedBundleProduct.name$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteConfigurableProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteConfigurableProductFromShoppingCartTest.xml
-new file mode 100644
-index 00000000000..891f647e3d5
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteConfigurableProductFromShoppingCartTest.xml
-@@ -0,0 +1,80 @@
-+<?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="DeleteConfigurableProductFromShoppingCartTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Delete Products from Shopping Cart"/>
-+            <title value="Delete configurable product from shopping cart test"/>
-+            <description value="Delete configurable product from shopping cart"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14692"/>
-+            <group value="checkout"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create configurable product -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption"/>
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete configurable product data -->
-+            <deleteData createDataKey="createConfigChildProduct" stepKey="deleteConfigChildProduct"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!-- Add configurable product to the cart  -->
-+        <actionGroup ref="StorefrontAddConfigurableProductToTheCartActionGroup" stepKey="addConfigurableProductToCart">
-+            <argument name="urlKey" value="$$createConfigProduct.custom_attributes[url_key]$$" />
-+            <argument name="productAttribute" value="$$createConfigProductAttribute.default_value$$"/>
-+            <argument name="productOption" value="$$getConfigAttributeOption.value$$"/>
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Remove product from cart -->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
-+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
-+        <actionGroup ref="DeleteProductFromShoppingCartActionGroup" stepKey="deleteProduct">
-+            <argument name="productName" value="$$createConfigProduct.name$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteDownloadableProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteDownloadableProductFromShoppingCartTest.xml
-new file mode 100644
-index 00000000000..1a51e1e02fe
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteDownloadableProductFromShoppingCartTest.xml
-@@ -0,0 +1,51 @@
-+<?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="DeleteDownloadableProductFromShoppingCartTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Delete Products from Shopping Cart"/>
-+            <title value="Delete downloadable product from shopping cart test"/>
-+            <description value="Delete downloadable product from shopping cart"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14693"/>
-+            <group value="checkout"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create downloadable product -->
-+            <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct"/>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink">
-+                <requiredEntity createDataKey="createDownloadableProduct"/>
-+            </createData>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
-+                <requiredEntity createDataKey="createDownloadableProduct"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete downloadable product -->
-+            <deleteData createDataKey="createDownloadableProduct" stepKey="deleteDownloadableProduct"/>
-+        </after>
-+
-+        <!-- Add downloadable product to the cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createDownloadableProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToDownloadableProductPage"/>
-+        <waitForPageLoad stepKey="waitForDownloadableProductPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartDownloadableProductFromStorefrontProductPage">
-+            <argument name="productName" value="$$createDownloadableProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Remove product from cart -->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
-+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
-+        <actionGroup ref="DeleteProductFromShoppingCartActionGroup" stepKey="deleteProduct">
-+            <argument name="productName" value="$$createDownloadableProduct.name$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteGroupedProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteGroupedProductFromShoppingCartTest.xml
-new file mode 100644
-index 00000000000..eb8e753ea0b
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteGroupedProductFromShoppingCartTest.xml
-@@ -0,0 +1,69 @@
-+<?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="DeleteGroupedProductFromShoppingCartTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Delete Products from Shopping Cart"/>
-+            <title value="Delete grouped product from shopping cart test"/>
-+            <description value="Delete grouped product from shopping cart"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14694"/>
-+            <group value="checkout"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create grouped product with three simple products -->
-+            <createData entity="SimpleProduct2" stepKey="createFirstSimpleProduct"/>
-+            <createData entity="SimpleProduct2" stepKey="createSecondSimpleProduct"/>
-+            <createData entity="SimpleProduct2" stepKey="createThirdSimpleProduct"/>
-+            <createData entity="ApiGroupedProduct" stepKey="createGroupedProduct"/>
-+            <createData entity="OneSimpleProductLink" stepKey="addFirstProductToLink">
-+                <requiredEntity createDataKey="createGroupedProduct"/>
-+                <requiredEntity createDataKey="createFirstSimpleProduct"/>
-+            </createData>
-+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addFirstProductToLink" stepKey="addSecondProductTwo">
-+                <requiredEntity createDataKey="createGroupedProduct"/>
-+                <requiredEntity createDataKey="createSecondSimpleProduct"/>
-+            </updateData>
-+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addFirstProductToLink" stepKey="addThirdProductThree">
-+                <requiredEntity createDataKey="createGroupedProduct"/>
-+                <requiredEntity createDataKey="createThirdSimpleProduct"/>
-+            </updateData>
-+        </before>
-+        <after>
-+            <!-- Delete grouped product data -->
-+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstProduct"/>
-+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondProduct"/>
-+            <deleteData createDataKey="createThirdSimpleProduct" stepKey="deleteThirdProduct"/>
-+            <deleteData createDataKey="createGroupedProduct" stepKey="deleteGroupedProduct"/>
-+        </after>
-+
-+        <!-- Add grouped product to the cart -->
-+        <actionGroup ref="StorefrontAddThreeGroupedProductToTheCartActionGroup" stepKey="addGropedProductsToTheCart">
-+            <argument name="urlKey" value="$$createGroupedProduct.custom_attributes[url_key]$$"/>
-+            <argument name="product1" value="$$createFirstSimpleProduct.name$$"/>
-+            <argument name="product2" value="$$createSecondSimpleProduct.name$$"/>
-+            <argument name="product3" value="$$createThirdSimpleProduct.name$$"/>
-+            <argument name="qty1" value="1"/>
-+            <argument name="qty2" value="1"/>
-+            <argument name="qty3" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Remove products from cart -->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
-+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
-+        <click selector="{{CheckoutCartProductSection.removeProductByName($$createFirstSimpleProduct.name$$)}}" stepKey="deleteFirstProductFromCheckoutCart"/>
-+        <click selector="{{CheckoutCartProductSection.removeProductByName($$createSecondSimpleProduct.name$$)}}" stepKey="deleteSecondProductFromCheckoutCart"/>
-+        <click selector="{{CheckoutCartProductSection.removeProductByName($$createThirdSimpleProduct.name$$)}}" stepKey="deleteThirdProductFromCheckoutCart"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see userInput="You have no items in your shopping cart." stepKey="seeNoItemsInShoppingCart"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteVirtualProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteVirtualProductFromShoppingCartTest.xml
-new file mode 100644
-index 00000000000..97dcdd52127
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteVirtualProductFromShoppingCartTest.xml
-@@ -0,0 +1,47 @@
-+<?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="DeleteVirtualProductFromShoppingCartTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Delete Products from Shopping Cart"/>
-+            <title value="Delete virtual product from shopping cart test"/>
-+            <description value="Delete virtual product from shopping cart"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14691"/>
-+            <group value="checkout"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create virtual product -->
-+            <createData entity="VirtualProduct" stepKey="createVirtualProduct">
-+                <field key="price">50</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete virtual product -->
-+            <deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
-+        </after>
-+
-+        <!-- Add virtual product to the cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartVirtualProductFromStorefrontProductPage">
-+            <argument name="productName" value="$$createVirtualProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Remove product from cart -->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
-+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
-+        <actionGroup ref="DeleteProductFromShoppingCartActionGroup" stepKey="deleteProduct">
-+            <argument name="productName" value="$$createVirtualProduct.name$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
-new file mode 100644
-index 00000000000..20015f76e08
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
-@@ -0,0 +1,80 @@
-+<?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="EditShippingAddressOnePageCheckoutTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Edit Shipping Address"/>
-+            <title value="Edit Shipping Address on Checkout Page."/>
-+            <description value="Edit Shipping Address on Checkout Page."/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-14680"/>
-+            <group value="shoppingCart"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="simpleProductDefault" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+         </after>
-+
-+        <!-- Go to Frontend as Customer -->
-+         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
-+             <argument name="Customer" value="$$createCustomer$$" />
-+         </actionGroup>
-+
-+        <!-- Add product to cart -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-+        <actionGroup ref="StorefrontAddSimpleProductToCartActionGroup" stepKey="addProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Go to checkout page -->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="customerGoToCheckoutFromMinicart" />
-+
-+        <!--  *New Address* button on 1st checkout step -->
-+        <click selector="{{CheckoutShippingSection.newAddressButton}}" stepKey="addNewAddress"/>
-+
-+        <!--Fill in required fields and click *Save address* button-->
-+        <actionGroup ref="FillShippingAddressOneStreetActionGroup" stepKey="changeAddress">
-+            <argument name="address" value="UK_Not_Default_Address"/>
-+        </actionGroup>
-+        <click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="saveNewAddress"/>
-+
-+        <!--Select Shipping Rate-->
-+        <scrollTo selector="{{CheckoutShippingMethodsSection.next}}" stepKey="scrollToShippingRate"/>
-+        <click selector="{{CheckoutShippingMethodsSection.shippingMethodFlatRate}}" stepKey="selectShippingMethod"/>
-+
-+        <!-- Click *Edit* button for the new address -->
-+        <click selector="{{CheckoutShippingSection.editActiveAddress}}" stepKey="editNewAddress"/>
-+
-+        <!--Remove values from required fields and click *Cancel* button -->
-+        <actionGroup ref="ClearShippingAddressActionGroup" stepKey="clearRequiredFields"/>
-+        <click selector="{{CheckoutShippingSection.cancelChangeAddress}}" stepKey="cancelEditAddress"/>
-+
-+        <!-- Go to *Next* -->
-+        <scrollTo selector="{{CheckoutShippingMethodsSection.next}}" stepKey="scrollToButtonNext"/>
-+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="goNext"/>
-+
-+        <!-- Select payment solution -->
-+        <checkOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution" />
-+
-+        <!--Refresh Page and Place Order-->
-+        <reloadPage stepKey="reloadPage"/>
-+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
-+    </test>
-+ </tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-index e386698092a..a4864d612a4 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-@@ -7,8 +7,13 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CGuestUserTest">
-+        <annotations>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-         <!-- Step 3: User adds products to cart -->
-         <comment userInput="Start of adding products to cart" stepKey="startOfAddingProductsToCart" after="endOfBrowsingCatalog"/>
-         <!-- Add Simple Product 1 to cart -->
-@@ -96,14 +101,10 @@
-         <comment userInput="Check cart information" stepKey="commentCheckCartInformation" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
-         <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart" after="commentCheckCartInformation"/>
-         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCart" after="cartOpenCart">
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shipping" value="E2EB2CQuote.shipping"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="total" value="E2EB2CQuote.total"/>
-+            <argument name="subtotal" value="480.00"/>
-+            <argument name="shipping" value="15.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="495.00"/>
-         </actionGroup>
- 
-         <!-- Check simple product 1 in cart -->
-@@ -157,14 +158,10 @@
-         <!-- Check order summary in checkout -->
-         <comment userInput="Check order summary in checkout" stepKey="commentCheckOrderSummaryInCheckout" after="guestCheckoutFillingShippingSection" />
-         <actionGroup ref="CheckOrderSummaryInCheckoutActionGroup" stepKey="guestCheckoutCheckOrderSummary" after="commentCheckOrderSummaryInCheckout">
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shippingTotal" value="E2EB2CQuote.shipping"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="total" value="E2EB2CQuote.total"/>
-+            <argument name="subtotal" value="480.00"/>
-+            <argument name="shippingTotal" value="15.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="495.00"/>
-         </actionGroup>
- 
-         <!-- Check ship to information in checkout -->
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-index 6effeec6851..a4784a5cdc2 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-@@ -7,8 +7,13 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CLoggedInUserTest">
-+        <annotations>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-         <!-- Step 3: User adds products to cart -->
-         <comment userInput="Start of adding products to cart" stepKey="startOfAddingProductsToCart" after="endOfBrowsingCatalog"/>
-         <!-- Add Simple Product 1 to cart -->
-@@ -96,14 +101,10 @@
-         <comment userInput="Check cart information" stepKey="commentCheckCartInformation" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
-         <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart" after="commentCheckCartInformation"/>
-         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCart" after="cartOpenCart">
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shipping" value="E2EB2CQuote.shipping"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="total" value="E2EB2CQuote.total"/>
-+            <argument name="subtotal" value="480.00"/>
-+            <argument name="shipping" value="15.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="495.00"/>
-         </actionGroup>
- 
-         <!-- Check simple product 1 in cart -->
-@@ -157,14 +158,10 @@
-         <!-- Check order summary in checkout -->
-         <comment userInput="Check order summary in checkout" stepKey="commentCheckOrderSummaryInCheckout" after="checkoutFillingShippingSection" />
-         <actionGroup ref="CheckOrderSummaryInCheckoutActionGroup" stepKey="checkoutCheckOrderSummary" after="commentCheckOrderSummaryInCheckout">
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shippingTotal" value="E2EB2CQuote.shipping"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="total" value="E2EB2CQuote.total"/>
-+            <argument name="subtotal" value="480.00"/>
-+            <argument name="shippingTotal" value="15.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="495.00"/>
-         </actionGroup>
- 
-         <!-- Check ship to information in checkout -->
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
-new file mode 100644
-index 00000000000..89028e146c3
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
-@@ -0,0 +1,72 @@
-+<?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="IdentityOfDefaultBillingAndShippingAddressTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <title value="Checking assignment of default billing address after placing an orde"/>
-+            <description value="In 'Address book' field 'Default Billing Address' should be the same as 'Default Shipping Address'"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94108"/>
-+            <stories value="MAGETWO-62891: New address is not marked as 'Default Billing'"/>
-+            <group value="customer"/>
-+        </annotations>
-+
-+        <before>
-+            <!--Create product-->
-+            <createData stepKey="category" entity="SimpleSubCategory"/>
-+            <createData stepKey="product" entity="SimpleProduct">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+        </before>
-+
-+        <!--Go to Storefront-->
-+        <amOnPage url="" stepKey="DoToStorefront"/>
-+
-+        <!-- Fill out form for a new user with address -->
-+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="signUpNewUser">
-+            <argument name="Customer" value="Simple_US_Customer_NY"/>
-+        </actionGroup>
-+
-+        <!-- Add simple product to cart -->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart1">
-+            <argument name="product" value="$$product$$"/>
-+        </actionGroup>
-+
-+        <!--Proceed to shipment-->
-+        <amOnPage url="{{CheckoutPage.url}}/" stepKey="goToCheckout"/>
-+        <waitForPageLoad stepKey="waitForShippingSection"/>
-+
-+        <!--Fill shipment form-->
-+        <actionGroup ref="LoggedInUserCheckoutFillingShippingSectionActionGroup" stepKey="checkoutFillingShippingSection" >
-+            <argument name="customerVar" value="Simple_US_Customer_NY" />
-+            <argument name="customerAddressVar" value="US_Address_NY" />
-+        </actionGroup>
-+
-+        <!--Fill cart data-->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment" />
-+
-+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeorder">
-+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage" />
-+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
-+        </actionGroup>
-+        <!--Go To My Account-->
-+        <amOnPage stepKey="goToMyAccountPage" url="/customer/account/"/>
-+
-+        <!--Assert That Shipping And Billing Address are the same-->
-+        <actionGroup ref="AssertThatShippingAndBillingAddressTheSame" stepKey="assertThatShippingAndBillingAddressTheSame"/>
-+
-+        <after>
-+            <!--Delete created Product-->
-+            <deleteData stepKey="deleteProduct" createDataKey="product"/>
-+            <deleteData stepKey="deleteCategory" createDataKey="category"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
-index efa8b4ca751..1f3d9db5ca5 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="NoErrorCartCheckoutForProductsDeletedFromMiniCartTest">
-         <annotations>
-             <features value="Checkout"/>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingDefaultAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingDefaultAddressTest.xml
-new file mode 100644
-index 00000000000..aa3665a81bb
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingDefaultAddressTest.xml
-@@ -0,0 +1,106 @@
-+<?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="OnePageCheckoutAsCustomerUsingDefaultAddressTest">
-+        <annotations>
-+            <features value="OnePageCheckout"/>
-+            <stories value="OnePageCheckout within Offline Payment Methods"/>
-+            <title value="OnePageCheckout as customer using default address test"/>
-+            <description value="Checkout as customer using default address"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14741"/>
-+            <group value="checkout"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create Simple Product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
-+                <field key="price">560</field>
-+            </createData>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <!-- Admin log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <!-- Customer log out -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+
-+            <!-- Delete created product -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+        </after>
-+
-+        <!-- Add Simple Product to cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Go to shopping cart -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <actionGroup ref="FillShippingZipForm" stepKey="fillShippingZipForm">
-+            <argument name="address" value="US_Address_CA"/>
-+        </actionGroup>
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
-+        <waitForPageLoad stepKey="waitForProceedToCheckout"/>
-+
-+
-+        <!-- Login as customer on checkout page -->
-+        <actionGroup ref="LoginAsCustomerOnCheckoutPageActionGroup" stepKey="customerLogin">
-+            <argument name="customer" value="$createCustomer$"/>
-+        </actionGroup>
-+
-+        <!-- Fill customer address data -->
-+        <waitForElementVisible selector="{{CheckoutShippingSection.shipHereButton(UK_Not_Default_Address.street[0])}}" stepKey="waitForShipHereVisible"/>
-+        <!-- Change address -->
-+        <click selector="{{CheckoutShippingSection.shipHereButton(UK_Not_Default_Address.street[0])}}" stepKey="clickShipHere"/>
-+
-+        <!-- Click next button to open payment section -->
-+        <click selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="clickNext"/>
-+        <waitForPageLoad stepKey="waitForShipmentPageLoad"/>
-+
-+        <!-- Select payment solution -->
-+        <checkOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution" />
-+
-+        <!-- Check order summary in checkout -->
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrderButton"/>
-+        <seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="orderIsSuccessfullyPlaced"/>
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
-+
-+        <!-- Login as admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        <!-- Open created order in backend -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-+        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
-+        <actionGroup ref="OpenOrderById" stepKey="filterOrderGridById">
-+            <argument name="orderId" value="$grabOrderNumber"/>
-+        </actionGroup>
-+
-+        <!-- Assert order total -->
-+        <scrollTo selector="{{AdminOrderTotalSection.grandTotal}}" stepKey="scrollToOrderTotalSection"/>
-+        <see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$565.00" stepKey="checkOrderTotalInBackend"/>
-+
-+        <!-- Assert order addresses -->
-+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{UK_Not_Default_Address.street[0]}}" stepKey="seeBillingAddressStreet"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{UK_Not_Default_Address.city}}" stepKey="seeBillingAddressCity"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{UK_Not_Default_Address.postcode}}" stepKey="seeBillingAddressPostcode"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{UK_Not_Default_Address.street[0]}}" stepKey="seeShippingAddressStreet"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{UK_Not_Default_Address.city}}" stepKey="seeShippingAddressCity"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{UK_Not_Default_Address.postcode}}" stepKey="seeShippingAddressPostcode"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml
-new file mode 100644
-index 00000000000..bafad6f28a6
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml
-@@ -0,0 +1,119 @@
-+<?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="OnePageCheckoutAsCustomerUsingNewAddressTest">
-+        <annotations>
-+            <features value="OnePageCheckout"/>
-+            <stories value="OnePageCheckout within Offline Payment Methods"/>
-+            <title value="OnePageCheckout as customer using new address test"/>
-+            <description value="Checkout as customer using new address"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14740"/>
-+            <group value="checkout"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create Simple Product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
-+                <field key="price">560</field>
-+            </createData>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <!-- Admin log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <!-- Customer log out -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+
-+            <!-- Delete created product -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+        </after>
-+
-+        <!-- Add Simple Product to cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Go to shopping cart -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <actionGroup ref="FillShippingZipForm" stepKey="fillShippingZipForm">
-+            <argument name="address" value="US_Address_CA"/>
-+        </actionGroup>
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
-+        <waitForPageLoad stepKey="waitForProceedToCheckout"/>
-+
-+        <!-- Login using Sign In link from checkout page -->
-+        <actionGroup ref="LoginAsCustomerUsingSignInLinkActionGroup" stepKey="customerLogin">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Add new address -->
-+        <click selector="{{CheckoutShippingSection.newAddressButton}}" stepKey="addNewAddress"/>
-+
-+        <!-- Fill in required fields and save -->
-+        <actionGroup ref="FillShippingAddressOneStreetActionGroup" stepKey="changeAddress">
-+            <argument name="address" value="UK_Not_Default_Address"/>
-+        </actionGroup>
-+        <click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="saveNewAddress"/>
-+        <waitForPageLoad stepKey="waitForAddressSaving"/>
-+
-+        <!-- Click next button to open payment section -->
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-+        <waitForPageLoad stepKey="waitForShipmentPageLoad"/>
-+
-+        <!-- Change the address -->
-+        <uncheckOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution"/>
-+        <click selector="{{CheckoutPaymentSection.editAddress}}" stepKey="editAddress"/>
-+        <waitForElementVisible selector="{{CheckoutShippingSection.addressDropdown}}" stepKey="waitForAddressDropDownToBeVisible"/>
-+        <selectOption selector="{{CheckoutShippingSection.addressDropdown}}" userInput="New Address" stepKey="addAddress"/>
-+        <waitForPageLoad stepKey="waitForNewAddressForm"/>
-+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeBillingAddress">
-+            <argument name="Address" value="US_Address_NY"/>
-+        </actionGroup>
-+        <click selector="{{CheckoutShippingSection.updateAddress}}" stepKey="saveAddress"/>
-+        <waitForPageLoad stepKey="waitForAddressSaved"/>
-+
-+        <!-- Place order -->
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-+        <waitForPageLoad stepKey="waitForCheckoutPaymentSectionPageLoad"/>
-+        <seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="orderIsSuccessfullyPlaced"/>
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
-+
-+        <!-- Login as admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        <!-- Open created order in backend -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-+        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
-+        <actionGroup ref="OpenOrderById" stepKey="filterOrderGridById">
-+            <argument name="orderId" value="$grabOrderNumber"/>
-+        </actionGroup>
-+
-+        <!-- Assert order total -->
-+        <scrollTo selector="{{AdminOrderTotalSection.grandTotal}}" stepKey="scrollToOrderTotalSection"/>
-+        <see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$565.00" stepKey="checkOrderTotalInBackend"/>
-+
-+        <!-- Assert order addresses -->
-+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{US_Address_NY.street[0]}}" stepKey="seeBillingAddressStreet"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{US_Address_NY.city}}" stepKey="seeBillingAddressCity"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{US_Address_NY.postcode}}" stepKey="seeBillingAddressPostcode"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{UK_Not_Default_Address.street[0]}}" stepKey="seeShippingAddressStreet"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{UK_Not_Default_Address.city}}" stepKey="seeShippingAddressCity"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{UK_Not_Default_Address.postcode}}" stepKey="seeShippingAddressPostcode"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml
-new file mode 100644
-index 00000000000..2c341a5c4c1
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml
-@@ -0,0 +1,107 @@
-+<?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="OnePageCheckoutAsCustomerUsingNonDefaultAddressTest">
-+        <annotations>
-+            <features value="OnePageCheckout"/>
-+            <stories value="OnePageCheckout within Offline Payment Methods"/>
-+            <title value="OnePageCheckout as customer using non default address test"/>
-+            <description value="Checkout as customer using non default address"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14739"/>
-+            <group value="checkout"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create Simple Product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
-+                <field key="price">560</field>
-+            </createData>
-+
-+            <!-- Create customer -->
-+            <createData entity="Customer_US_UK_DE" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <!-- Admin log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <!-- Customer Log out -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+
-+            <!-- Delete created product -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+        </after>
-+
-+        <!-- Add Simple Product to cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Go to shopping cart -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <actionGroup ref="FillShippingZipForm" stepKey="fillShippingZipForm">
-+            <argument name="address" value="US_Address_CA"/>
-+        </actionGroup>
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
-+        <waitForPageLoad stepKey="waitForProceedToCheckout"/>
-+
-+        <!-- Login as customer on checkout page -->
-+        <actionGroup ref="LoginAsCustomerOnCheckoutPageActionGroup" stepKey="customerLogin">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <click selector="{{CheckoutShippingSection.shipHereButton(DE_Address_Berlin_Not_Default_Address.street[0])}}" stepKey="clickShipHere"/>
-+
-+        <!-- Click next button to open payment section -->
-+        <click selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="clickNext"/>
-+        <waitForPageLoad stepKey="waitForShipmentPageLoad"/>
-+        <uncheckOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution"/>
-+
-+        <!-- Change the address -->
-+        <click selector="{{CheckoutPaymentSection.editAddress}}" stepKey="editAddress"/>
-+        <waitForElementVisible selector="{{CheckoutShippingSection.addressDropdown}}" stepKey="waitForDropDownToBeVisible"/>
-+        <selectOption selector="{{CheckoutShippingSection.addressDropdown}}" userInput="{{UK_Not_Default_Address.street[0]}}" stepKey="addAddress"/>
-+
-+        <!-- Check order summary in checkout -->
-+        <click selector="{{CheckoutShippingSection.updateAddress}}" stepKey="clickToUpdate"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+
-+        <!-- Place order -->
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-+        <waitForPageLoad stepKey="waitForCheckoutPaymentSectionPageLoad"/>
-+        <seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="orderIsSuccessfullyPlaced"/>
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
-+
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        <!-- Open created order in backend -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-+        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
-+        <actionGroup ref="OpenOrderById" stepKey="filterOrderGridById">
-+            <argument name="orderId" value="$grabOrderNumber"/>
-+        </actionGroup>
-+
-+        <!-- Assert order total -->
-+        <scrollTo selector="{{AdminOrderTotalSection.grandTotal}}" stepKey="scrollToOrderTotalSection"/>
-+        <see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$565.00" stepKey="checkOrderTotalInBackend"/>
-+
-+        <!-- Assert order addresses -->
-+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{UK_Not_Default_Address.street[0]}}" stepKey="seeBillingAddressStreet"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{UK_Not_Default_Address.city}}" stepKey="seeBillingAddressCity"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{UK_Not_Default_Address.postcode}}" stepKey="seeBillingAddressPostcode"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{DE_Address_Berlin_Not_Default_Address.street[0]}}" stepKey="seeShippingAddressStreet"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{DE_Address_Berlin_Not_Default_Address.city}}" stepKey="seeShippingAddressCity"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{DE_Address_Berlin_Not_Default_Address.postcode}}" stepKey="seeShippingAddressPostcode"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml
-new file mode 100644
-index 00000000000..990459d7c81
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml
-@@ -0,0 +1,93 @@
-+<?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="OnePageCheckoutUsingSignInLinkTest">
-+        <annotations>
-+            <features value="OnePageCheckout"/>
-+            <stories value="OnePageCheckout within Offline Payment Methods"/>
-+            <title value="OnePageCheckout using sign in link test"/>
-+            <description value="Checkout using 'Sign In' link"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14738"/>
-+            <group value="checkout"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create Simple Product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
-+                <field key="price">560</field>
-+            </createData>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer_With_Different_Billing_Shipping_Addresses" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <!-- Admin log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <!-- Customer Log out -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+
-+            <!-- Delete created product -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+        </after>
-+
-+        <!-- Add Simple Product to cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Go to shopping cart -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <actionGroup ref="FillShippingZipForm" stepKey="fillShippingZipForm">
-+            <argument name="address" value="US_Address_CA"/>
-+        </actionGroup>
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
-+        <waitForPageLoad stepKey="waitForProceedToCheckout"/>
-+
-+        <!-- Login using Sign In link from checkout page -->
-+        <actionGroup ref="LoginAsCustomerUsingSignInLinkActionGroup" stepKey="customerLogin">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Click next button to open payment section -->
-+        <click selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="clickNext"/>
-+        <waitForPageLoad stepKey="waitForShipmentPageLoad"/>
-+
-+        <!-- Select payment solution -->
-+        <checkOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution" />
-+
-+        <!-- Check order summary in checkout -->
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrderButton"/>
-+        <seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="orderIsSuccessfullyPlaced"/>
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
-+
-+        <!-- Login as admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        <!-- Open created order in backend -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-+        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
-+        <actionGroup ref="OpenOrderById" stepKey="filterOrderGridById">
-+            <argument name="orderId" value="$grabOrderNumber"/>
-+        </actionGroup>
-+
-+        <!-- Assert that shipping and billing address are the same -->
-+        <grabTextFrom selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" stepKey="shippingAddress"/>
-+        <grabTextFrom selector="{{AdminShipmentAddressInformationSection.billingAddress}}" stepKey="billingAddress"/>
-+        <assertEquals stepKey="assertAddress" actual="$billingAddress" expected="$shippingAddress"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
-new file mode 100644
-index 00000000000..3ec73aec580
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
-@@ -0,0 +1,223 @@
-+<?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="OnePageCheckoutWithAllProductTypesTest">
-+        <annotations>
-+            <features value="OnePageCheckout"/>
-+            <stories value="OnePageCheckout within Offline Payment Methods"/>
-+            <title value="OnePageCheckout with all product types test"/>
-+            <description value="Checkout with all product types"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14742"/>
-+            <group value="checkout"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create Configurable Product -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption"/>
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct"/>
-+            </createData>
-+
-+            <!--Create Bundle Product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProductForBundleProduct"/>
-+            <createData entity="ApiFixedBundleProduct" stepKey="createFixedBundleProduct"/>
-+            <createData entity="DropDownBundleOption" stepKey="createBundleOption">
-+                <requiredEntity createDataKey="createFixedBundleProduct"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="firstLinkOptionToFixedProduct">
-+                <requiredEntity createDataKey="createFixedBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption"/>
-+                <requiredEntity createDataKey="createSimpleProductForBundleProduct"/>
-+            </createData>
-+
-+            <!-- Create Virtual Product -->
-+            <createData entity="VirtualProduct" stepKey="createVirtualProduct"/>
-+
-+            <!--Create Downloadable Product -->
-+            <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct"/>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink">
-+                <requiredEntity createDataKey="createDownloadableProduct"/>
-+            </createData>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
-+                <requiredEntity createDataKey="createDownloadableProduct"/>
-+            </createData>
-+
-+            <!-- Create Grouped Product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
-+            <createData entity="ApiGroupedProduct" stepKey="createGroupedProduct"/>
-+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
-+                <requiredEntity createDataKey="createGroupedProduct"/>
-+                <requiredEntity createDataKey="createSimpleProduct"/>
-+            </createData>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_Customer_Without_Address" stepKey="createCustomer"/>
-+
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        </before>
-+        <after>
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete all created products -->
-+            <deleteData createDataKey="createConfigChildProduct" stepKey="deleteConfigChildProduct"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createSimpleProductForBundleProduct" stepKey="deleteSimpleProductForBundleProduct"/>
-+            <deleteData createDataKey="createFixedBundleProduct" stepKey="deleteFixedBundleProduct"/>
-+            <deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
-+            <deleteData createDataKey="createDownloadableProduct" stepKey="deleteDownloadableProduct"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createGroupedProduct" stepKey="deleteGroupedProduct"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Logout customer -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
-+        </after>
-+
-+        <!-- Add Simple Product to cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Configurable Product to cart  -->
-+        <actionGroup ref="StorefrontAddConfigurableProductToTheCartActionGroup" stepKey="addConfigurableProductToCart">
-+            <argument name="urlKey" value="$$createConfigProduct.custom_attributes[url_key]$$" />
-+            <argument name="productAttribute" value="$$createConfigProductAttribute.default_value$$"/>
-+            <argument name="productOption" value="$$getConfigAttributeOption.value$$"/>
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Add Virtual Product to cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToVirtualProductPage"/>
-+        <waitForPageLoad stepKey="waitForVirtualProductPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartVirtualProductFromStorefrontProductPage">
-+            <argument name="productName" value="$$createVirtualProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Downloadable Product to cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createDownloadableProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToDownloadableProductPage"/>
-+        <waitForPageLoad stepKey="waitForDownloadableProductPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartDownloadableProductFromStorefrontProductPage">
-+            <argument name="productName" value="$$createDownloadableProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Grouped Product to cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createGroupedProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToGroupedProductPage"/>
-+        <waitForPageLoad stepKey="waitForGroupedProductPageLoad"/>
-+        <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="1" stepKey="fillFieldQtyInput"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartGroupedProductFromStorefrontProductPage">
-+            <argument name="productName" value="$$createGroupedProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Bundle Product to cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createFixedBundleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToBundleProductPage"/>
-+        <waitForPageLoad stepKey="waitForFixedBundleProductPageLoad"/>
-+        <click selector="{{StorefrontBundleProductActionSection.customizeAndAddToCartButton}}" stepKey="clickCustomizeAndAddToCart"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFixedBundleProductFromStorefrontProductPage">
-+            <argument name="productName" value="$$createFixedBundleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!--Go to shopping cart-->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <actionGroup ref="FillShippingZipForm" stepKey="fillShippingZipForm">
-+            <argument name="address" value="US_Address_CA"/>
-+        </actionGroup>
-+
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
-+        <waitForPageLoad stepKey="waitForProceedToCheckout"/>
-+        <actionGroup ref="FillCustomerSignInPopupFormActionGroup" stepKey="fillCustomerSignInPopupForm">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <amOnPage url="{{CheckoutShippingPage.url}}" stepKey="navigateToShippingPage"/>
-+        <waitForPageLoad stepKey="waitForShippingPageLoad"/>
-+
-+        <!-- Fill customer address data -->
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.company}}" userInput="{{CustomerAddressSimple.company}}" stepKey="fillCompany"/>
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{CustomerAddressSimple.street}}" stepKey="fillStreet"/>
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="fillCity" />
-+        <selectOption selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="fillZipCode" />
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="fillPhone" />
-+
-+        <!-- Click next button to open payment section -->
-+        <click selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="clickNextBtn"/>
-+        <waitForPageLoad stepKey="waitForShipmentPageLoad"/>
-+
-+        <!-- Check order summary in checkout -->
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrderButton"/>
-+        <seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="orderIsSuccessfullyPlaced" />
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
-+
-+        <!-- Login as admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        <!-- Open created order -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
-+        <actionGroup ref="OpenOrderById" stepKey="filterOrderGridById">
-+            <argument name="orderId" value="$grabOrderNumber"/>
-+        </actionGroup>
-+
-+        <!-- Assert that addresses on order page the same -->
-+        <grabTextFrom selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" stepKey="shippingAddressOrderPage"/>
-+        <grabTextFrom selector="{{AdminShipmentAddressInformationSection.billingAddress}}" stepKey="billingAddressOrderPage"/>
-+        <assertEquals actual="$billingAddressOrderPage" expected="$shippingAddressOrderPage" stepKey="assertAddressOrderPage"/>
-+
-+        <!-- Assert order total -->
-+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="navigateToCustomerDashboardPage"/>
-+        <waitForPageLoad stepKey="waitForCustomerDashboardPageLoad"/>
-+        <see selector="{{StorefrontCustomerRecentOrdersSection.orderTotal}}" userInput="$613.23" stepKey="checkOrderTotalInStorefront"/>
-+
-+        <!-- Go to Address Book -->
-+        <actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToAddressBook">
-+            <argument name="menu" value="Address Book"/>
-+        </actionGroup>
-+
-+        <!-- Asserts that addresses in address book equal to addresses in order -->
-+        <grabTextFrom selector="{{CheckoutOrderSummarySection.shippingAddress}}" stepKey="shippingAddress"/>
-+        <grabTextFrom selector="{{CheckoutOrderSummarySection.billingAddress}}" stepKey="billingAddress"/>
-+        <assertEquals actual="$shippingAddress" expected="$shippingAddressOrderPage" stepKey="assertShippingAddress"/>
-+        <assertEquals actual="$billingAddress" expected="$billingAddressOrderPage" stepKey="assertBillingAddress"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/ShoppingCartAndMiniShoppingCartPerCustomerTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/ShoppingCartAndMiniShoppingCartPerCustomerTest.xml
-new file mode 100644
-index 00000000000..84cdb8abd93
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/ShoppingCartAndMiniShoppingCartPerCustomerTest.xml
-@@ -0,0 +1,185 @@
-+<?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="ShoppingCartAndMiniShoppingCartPerCustomerTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Shopping Cart and Mini Shopping Cart per Customer"/>
-+            <title value="Shopping cart and mini shopping cart per customer test"/>
-+            <description value="Shopping cart and mini shopping cart per customer with enabled cached"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14730"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <!-- Flush cache -->
-+            <magentoCLI command="cache:flush" stepKey="clearCache"/>
-+
-+            <!-- Create two customers -->
-+            <createData entity="Simple_US_Customer" stepKey="createFirstCustomer"/>
-+            <createData entity="Simple_US_CA_Customer" stepKey="createSecondCustomer"/>
-+
-+            <!-- Create products -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create simple product -->
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Create simple product with custom options -->
-+            <createData entity="_defaultProduct" stepKey="createSimpleProductWithCustomOptions">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <updateData createDataKey="createSimpleProductWithCustomOptions" entity="productWithDropdownAndFieldOptions" stepKey="updateProductWithCustomOption"/>
-+        </before>
-+        <after>
-+            <!-- Delete products -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createSimpleProductWithCustomOptions" stepKey="deleteSimpleProductWithCustomOptions"/>
-+
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete customers -->
-+            <deleteData createDataKey="createFirstCustomer" stepKey="deleteFirstCustomer"/>
-+            <deleteData createDataKey="createSecondCustomer" stepKey="deleteSecondCustomer"/>
-+        </after>
-+
-+        <!-- Login as first customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccountAsFirstCustomer">
-+            <argument name="Customer" value="$$createFirstCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert cart is empty -->
-+        <actionGroup ref="AssertShoppingCartIsEmptyActionGroup" stepKey="seeEmptyShoppingCartForFirstCustomer"/>
-+
-+        <!-- Go to first product page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToFirstProductPage"/>
-+        <waitForPageLoad stepKey="waitForFirstProductPageLoad"/>
-+
-+        <!-- Add the product to the shopping cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addFirstProductToCart">
-+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Go to the second product page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProductWithCustomOptions.custom_attributes[url_key]$$)}}" stepKey="goToSecondProductPage"/>
-+        <waitForPageLoad stepKey="waitForSecondProductPageLoad"/>
-+
-+        <!-- Fill the custom options values -->
-+        <actionGroup ref="StorefrontSelectOptionDropDownActionGroup" stepKey="selectFirstOption">
-+            <argument name="optionTitle" value="ProductOptionValueDropdown"/>
-+                <argument name="option" value="ProductOptionValueWithSkuDropdown1.title"/>
-+        </actionGroup>
-+        <fillField selector="{{StorefrontProductInfoMainSection.productOptionFieldInput(ProductOptionField.title)}}" userInput="OptionField" stepKey="fillProductOptionInputField"/>
-+
-+        <!-- Add the product to the shopping cart -->
-+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addSecondProductToCart">
-+            <argument name="productName" value="$$createSimpleProductWithCustomOptions.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Logout first customer -->
-+        <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="firstCustomerLogout"/>
-+
-+        <!-- Login as second customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccountAsSecondCustomer">
-+            <argument name="Customer" value="$$createSecondCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert cart is empty -->
-+        <actionGroup ref="AssertShoppingCartIsEmptyActionGroup" stepKey="seeEmptyShoppingCartForSecondCustomer"/>
-+
-+        <!-- Go to first product page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+
-+         <!-- Add the product to the shopping cart -->
-+        <actionGroup ref="AddProductWithQtyToCartFromStorefrontProductPage" stepKey="addProductToCart">
-+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
-+            <argument name="productQty" value="{{quoteQty2Price123.qty}}"/>
-+        </actionGroup>
-+
-+        <!-- Logout second customer -->
-+        <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="secondCustomerLogout"/>
-+
-+        <!-- Login as first customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsFirstCustomer">
-+            <argument name="Customer" value="$$createFirstCustomer$$"/>
-+        </actionGroup>
-+
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
-+        <waitForPageLoad stepKey="waitForCheckoutPageLoad"/>
-+
-+        <!-- Assert first products present in shopping cart -->
-+        <actionGroup ref="StorefrontCheckCartSimpleProductActionGroup" stepKey="checkFirstProductInCart">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="productQuantity" value="ApiSimpleSingleQty.quantity"/>
-+        </actionGroup>
-+
-+        <!-- Assert second products present in shopping cart -->
-+        <seeElement selector="{{CheckoutCartProductSection.ProductLinkByName($$createSimpleProductWithCustomOptions.name$$)}}" stepKey="assertProductName"/>
-+        <see selector="{{CheckoutCartProductSection.ProductPriceByName($$createSimpleProductWithCustomOptions.name$$)}}" userInput="{{quoteQty2Subtotal266.currency}}{{quoteQty2Subtotal266.price}}" stepKey="assertProductPrice"/>
-+        <see selector="{{CheckoutCartProductSection.ProductOptionByNameAndAttribute($$createSimpleProductWithCustomOptions.name$$, ProductOptionField.title)}}" userInput="OptionField" stepKey="seeFieldOption"/>
-+        <see selector="{{CheckoutCartProductSection.ProductOptionByNameAndAttribute($$createSimpleProductWithCustomOptions.name$$, ProductOptionValueDropdown.title)}}" userInput="{{ProductOptionValueWithSkuDropdown1.title}}" stepKey="seeDropDownOption"/>
-+
-+        <!-- Assert subtotal and grand total -->
-+        <see selector="{{StorefrontProductPageSection.subTotal}}" userInput="{{quoteQty2Subtotal266.currency}}{{quoteQty2Subtotal266.subtotal}}" stepKey="seeFirstCustomerSubTotal"/>
-+        <see selector="{{StorefrontProductPageSection.orderTotal}}" userInput="{{quoteQty2Subtotal266.currency}}{{quoteQty2Subtotal266.total}}" stepKey="seeFirstCustomerOrderTotal"/>
-+
-+        <!-- Assert products in mini cart for first customer -->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStoreFrontHomePage"/>
-+        <waitForPageLoad stepKey="waitForHomePageLoad"/>
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertFirstProductInMiniCart">
-+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertSecondProductInMiniCart">
-+            <argument name="productName" value="$$createSimpleProductWithCustomOptions.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertMiniShoppingCartSubTotalActionGroup" stepKey="assertMiniCartSubTotal">
-+            <argument name="dataQuote" value="quoteQty2Subtotal266"/>
-+        </actionGroup>
-+
-+        <!-- Logout first customer -->
-+        <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutFirstCustomer"/>
-+
-+        <!-- Login as second customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsSecondCustomer">
-+            <argument name="Customer" value="$$createSecondCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert first products present in shopping cart -->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnShoppingCartPage"/>
-+        <waitForPageLoad stepKey="waitForShoppingCartPageLoad"/>
-+        <actionGroup ref="StorefrontCheckCartSimpleProductActionGroup" stepKey="checkProductInCart">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="productQuantity" value="quoteQty2Price123.qty"/>
-+        </actionGroup>
-+
-+        <!-- Assert subtotal and grand total -->
-+        <see selector="{{StorefrontProductPageSection.subTotal}}" userInput="{{quoteQty2Price123.currency}}{{quoteQty2Price123.subtotal}}" stepKey="seeSecondCustomerSubTotal"/>
-+        <see selector="{{StorefrontProductPageSection.orderTotal}}" userInput="{{quoteQty2Price123.currency}}{{quoteQty2Price123.total}}" stepKey="seeSecondCustomerOrderTotal"/>
-+
-+        <!-- Assert product in mini cart -->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
-+        <waitForPageLoad stepKey="waitForHomePageToLoad"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertProductInMiniCart">
-+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
-+            <argument name="productPrice" value="$$createSimpleProduct.price$$"/>
-+            <argument name="cartSubtotal" value="{{quoteQty2Price123.currency}}{{quoteQty2Price123.subtotal}}"/>
-+            <argument name="qty" value="{{quoteQty2Price123.qty}}"/>
-+        </actionGroup>
-+
-+        <!-- Logout second customer -->
-+        <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutSecondCustomer"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml
-new file mode 100644
-index 00000000000..d108dc3657a
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml
-@@ -0,0 +1,84 @@
-+<?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="StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Add simple product with all types of custom options to cart without selecting any options"/>
-+            <description value="Add simple product with all types of custom options to cart without selecting any options"/>
-+            <testCaseId value="MC-14725"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <updateData createDataKey="createProduct" entity="productWithOptions" stepKey="updateProductWithCustomOptions"/>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        </before>
-+        <after>
-+            <deleteData  createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData  createDataKey="createProduct" stepKey="deleteProduct"/>
-+        </after>
-+
-+        <!-- Open Product page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct1PageAndVerifyProduct">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Click on Add To Cart button-->
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!--Assert all types of product options field displayed Required message -->
-+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertRequiredProductOptionField">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.requiredCustomField(ProductOptionField.title)}}"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertRequiredProductOptionDropDown">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.requiredCustomField(ProductOptionDropDown.title)}}"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertRequiredProductOptionRadioButton">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.requiredCustomField(ProductOptionRadiobutton.title)}}"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertRequiredProductOptionCheckBox">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.requiredCustomField(ProductOptionCheckbox.title)}}"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertRequiredProductOptionMultiSelect">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.requiredCustomField(ProductOptionMultiSelect.title)}}"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertRequiredProductFileOption">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.requiredCustomFile(ProductOptionFile.title)}}"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertRequiredProductDateOption">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.requiredCustomDate(ProductOptionDate.title)}}"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertRequiredProductDateAndTimeOption">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.requiredCustomDate(ProductOptionDateTime.title)}}"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertRequiredProducTimeOption">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.requiredCustomDate(ProductOptionTime.title)}}"/>
-+        </actionGroup>
-+
-+        <!-- Verify mini cart is empty -->
-+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertEmptryCart">
-+            <argument name="selector" value="{{StorefrontMiniCartSection.emptyMiniCart}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
-new file mode 100644
-index 00000000000..693c05684f2
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
-@@ -0,0 +1,62 @@
-+<?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="StoreFrontCheckCustomerInfoCreatedByGuestTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Check customer information created by guest"/>
-+            <title value="Check Customer Information Created By Guest"/>
-+            <description value="Check customer information after placing the order as the guest who created an account"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-95932"/>
-+            <useCaseId value="MAGETWO-95820"/>
-+            <group value="checkout"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="category"/>
-+            <createData entity="_defaultProduct" stepKey="product">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="product" stepKey="deleteProduct" />
-+            <deleteData createDataKey="category" stepKey="deleteCategory" />
-+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-+        </after>
-+
-+        <amOnPage url="$$product.name$$.html" stepKey="navigateToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$$product.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
-+            <argument name="customerVar" value="CustomerEntityOne"/>
-+            <argument name="customerAddressVar" value="CustomerAddressSimple"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeOrder">
-+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
-+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
-+        </actionGroup>
-+        <grabTextFrom selector="{{CheckoutSuccessRegisterSection.orderNumber}}" stepKey="grabOrderNumber"/>
-+        <click selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="clickCreateAccountButton"/>
-+        <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{CustomerEntityOne.password}}" stepKey="TypePassword"/>
-+        <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{CustomerEntityOne.password}}" stepKey="TypeConfirmationPassword"/>
-+        <click selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}" stepKey="clickOnCreateAccount"/>
-+        <see userInput="Thank you for registering" stepKey="verifyAccountCreated"/>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdmin"/>
-+        <amOnPage url="{{AdminOrderPage.url({$grabOrderNumber})}}" stepKey="navigateToOrderPage"/>
-+        <waitForPageLoad stepKey="waitForCreatedOrderPage"/>
-+        <see stepKey="seeCustomerName" userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminShipmentOrderInformationSection.customerName}}"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
-new file mode 100644
-index 00000000000..330a026bb94
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
-@@ -0,0 +1,97 @@
-+<?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="StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest">
-+        <annotations>
-+            <title value="Checkout Free Shipping Recalculation after Coupon Code Added"/>
-+            <stories value="Checkout Free Shipping Recalculation after Coupon Code Added"/>
-+            <description value="User should be able to do checkout free shipping recalculation after adding coupon code"/>
-+            <features value="Checkout"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-96537"/>
-+            <useCaseId value="MAGETWO-96431"/>
-+            <group value="Checkout"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="Simple_US_Customer" stepKey="createSimpleUsCustomer">
-+                <field key="group_id">1</field>
-+            </createData>
-+            <createData entity="_defaultCategory" stepKey="defaultCategory"/>
-+            <createData entity="_defaultProduct" stepKey="simpleProduct">
-+                <field key="price">90</field>
-+                <requiredEntity createDataKey="defaultCategory"/>
-+            </createData>
-+            <!--It is default for FlatRate-->
-+            <createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
-+            <createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
-+            <createData entity="MinimumOrderAmount90" stepKey="minimumOrderAmount90"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache1"/>
-+            <actionGroup ref="AdminCreateCartPriceRuleWithCouponCode" stepKey="createCartPriceRule">
-+                <argument name="ruleName" value="CatPriceRule"/>
-+                <argument name="couponCode" value="CatPriceRule.coupon_code"/>
-+            </actionGroup>
-+            <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStoreFront">
-+                <argument name="Customer" value="$$createSimpleUsCustomer$$"/>
-+            </actionGroup>
-+            <amOnPage url="$$simpleProduct.name$$.html" stepKey="navigateToProductPage"/>
-+            <waitForPageLoad stepKey="waitForProductPage"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
-+            <createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
-+            <createData entity="DefaultMinimumOrderAmount" stepKey="defaultMinimumOrderAmount"/>
-+            <deleteData createDataKey="createSimpleUsCustomer" stepKey="deleteCustomer"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache2"/>
-+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
-+                <argument name="ruleName" value="{{CatPriceRule.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartRule">
-+            <argument name="product" value="$$simpleProduct$$"/>
-+            <argument name="couponCode" value="{{CatPriceRule.coupon_code}}"/>
-+        </actionGroup>
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart1"/>
-+        <waitForPageLoad stepKey="waitForpageLoad1"/>
-+        <dontSee selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Free')}}" stepKey="dontSeeFreeShipping"/>
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage"/>
-+        <waitForPageLoad stepKey="waitForShoppingCartPage"/>
-+        <conditionalClick selector="{{DiscountSection.DiscountTab}}" dependentSelector="{{DiscountSection.CouponInput}}" visible="false" stepKey="clickIfDiscountTabClosed1"/>
-+        <waitForPageLoad stepKey="waitForCouponTabOpen1"/>
-+        <click selector="{{DiscountSection.CancelCoupon}}" stepKey="cancelCoupon"/>
-+        <waitForPageLoad stepKey="waitForCancel"/>
-+        <see userInput='You canceled the coupon code.' stepKey="seeCancellationMessage"/>
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2"/>
-+        <waitForPageLoad stepKey="waitForShippingMethods"/>
-+        <click stepKey="chooseFreeShipping" selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Free')}}"/>
-+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext1"/>
-+        <waitForPageLoad stepKey="waitForReviewAndPayments1"/>
-+        <conditionalClick selector="{{DiscountSection.DiscountTab}}" dependentSelector="{{DiscountSection.CouponInput}}" visible="false" stepKey="clickIfDiscountTabClosed2"/>
-+        <waitForPageLoad stepKey="waitForCouponTabOpen2"/>
-+        <fillField selector="{{DiscountSection.DiscountInput}}" userInput="{{CatPriceRule.coupon_code}}" stepKey="fillCouponCode"/>
-+        <click selector="{{DiscountSection.ApplyCodeBtn}}" stepKey="applyCode"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see userInput="Your coupon was successfully applied." stepKey="seeSuccessMessage"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
-+        <waitForPageLoad stepKey="waitForError"/>
-+        <see stepKey="seeShippingMethodError" userInput="The shipping method is missing. Select the shipping method and try again."/>
-+        <amOnPage stepKey="navigateToShippingPage" url="{{CheckoutShippingPage.url}}"/>
-+        <waitForPageLoad stepKey="waitForShippingPageLoad"/>
-+        <click stepKey="chooseFlatRateShipping" selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Flat Rate')}}"/>
-+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext2"/>
-+        <waitForPageLoad stepKey="waitForReviewAndPayments2"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder2"/>
-+        <waitForPageLoad stepKey="waitForSuccessfullyPlacedOrder"/>
-+        <see stepKey="seeSuccessMessageForPlacedOrder" userInput="Thank you for your purchase!"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
-new file mode 100644
-index 00000000000..fb80b4880a6
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
-@@ -0,0 +1,56 @@
-+<?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="StoreFrontUpdateShoppingCartWhileUpdateMinicartTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Check updating shopping cart while updating items from minicart"/>
-+            <description value="Check updating shopping cart while updating items from minicart"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MAGETWO-97280"/>
-+            <useCaseId value="MAGETWO-71344"/>
-+            <group value="checkout"/>
-+        </annotations>
-+
-+        <before>
-+            <!--Create product-->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+        </before>
-+
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct" />
-+        </after>
-+
-+        <!--Add product to cart-->
-+        <amOnPage url="$$createProduct.name$$.html" stepKey="navigateToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!--Go to Shopping cart and check Qty-->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCart"/>
-+        <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabQtyShoppingCart"/>
-+        <assertEquals expected="1" actual="$grabQtyShoppingCart" stepKey="assertQtyShoppingCart"/>
-+
-+        <!--Open minicart and change Qty-->
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniCart"/>
-+        <waitForElementVisible selector="{{StorefrontMinicartSection.quantity}}" stepKey="waitForElementQty"/>
-+        <pressKey selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::BACKSPACE]" stepKey="deleteFiled"/>
-+        <fillField selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}"  userInput="5" stepKey="changeQty"/>
-+        <click selector="{{StorefrontMinicartSection.itemQuantityUpdate($$createProduct.name$$)}}" stepKey="updateQty"/>
-+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
-+
-+       <!--Check Qty in shopping cart after updating-->
-+        <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabQtyShoppingCart1"/>
-+        <assertEquals expected="5" actual="$grabQtyShoppingCart1" stepKey="assertQtyShoppingCart1"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml
-new file mode 100644
-index 00000000000..f63cf38d15f
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml
-@@ -0,0 +1,126 @@
-+<?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="StorefrontAddBundleDynamicProductToShoppingCartTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Add bundle dynamic product to the cart"/>
-+            <description value="Add bundle dynamic product to the cart"/>
-+            <testCaseId value="MC-14715"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
-+            <createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
-+            <!--Create  simple product-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
-+                <field key="price">50.00</field>
-+            </createData>
-+            <!--Create Bundle product-->
-+            <createData entity="BundleProductPriceViewRange" stepKey="createBundleProduct">
-+                <requiredEntity createDataKey="createSubCategory"/>
-+            </createData>
-+            <createData entity="DropDownBundleOption" stepKey="createBundleOption1_1">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <field key="required">True</field>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption1_1"/>
-+                <requiredEntity createDataKey="simpleProduct1"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption1_1"/>
-+                <requiredEntity createDataKey="simpleProduct2"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
-+            <deleteData createDataKey="createSubCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!--Open Product page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPageAndVerifyProduct">
-+            <argument name="product" value="$$createBundleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Assert Product Price Range -->
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeIsVisible">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.priceFrom}}"/>
-+            <argument name="userInput" value="From $10.00"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeIsVisible1">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.priceTo}}"/>
-+            <argument name="userInput" value="To $50.00"/>
-+        </actionGroup>
-+
-+        <!-- Click on customize And Add To Cart Button -->
-+        <actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickOnCustomizeAndAddtoCartButton"/>
-+
-+        <!-- Select Product, Quantity and add to the cart -->
-+        <click selector="{{StorefrontBundleProductActionSection.dropdownSelectOption}}" stepKey="clickOnSelectOption"/>
-+        <click selector="{{StorefrontBundleProductActionSection.dropdownProductSelection($$simpleProduct2.name$$)}}"  stepKey="selectProduct"/>
-+        <actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="enterProductQuantityAndAddToTheCart">
-+            <argument name="quantity" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
-+
-+        <!--Assert Shopping Cart Summary-->
-+        <actionGroup ref="AssertStorefrontShoppingCartSummaryWithShippingActionGroup" stepKey="AssertCartSummary" >
-+            <argument name="subtotal" value="$100.00"/>
-+            <argument name="shipping" value="10.00"/>
-+            <argument name="total" value="110.00"/>
-+        </actionGroup>
-+
-+        <!--Assert Product items in cart -->
-+        <actionGroup ref="AssertStorefrontCheckoutCartItemsActionGroup" stepKey="assertSimpleProduct1ItemsInCheckOutCart">
-+            <argument name="productName" value="$$createBundleProduct.name$$"/>
-+            <argument name="productSku" value="$$createBundleProduct.sku$$"/>
-+            <argument name="productPrice" value="$50.00"/>
-+            <argument name="subtotal" value="$100.00" />
-+            <argument name="qty" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product Option In CheckOut Cart -->
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductOptionTitleInCart">
-+            <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-+            <argument name="userInput" value="$$createBundleOption1_1.title$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductOptionInCart">
-+            <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-+            <argument name="userInput" value="1 x $$simpleProduct2.name$$ $50.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product in Mini Cart -->
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct3MiniCart">
-+            <argument name="productName" value="$$createBundleProduct.name$$"/>
-+            <argument name="productPrice" value="$50.00"/>
-+            <argument name="cartSubtotal" value="$100.00" />
-+            <argument name="qty" value="2"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartWithDisableMiniCartSidebarTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartWithDisableMiniCartSidebarTest.xml
-new file mode 100644
-index 00000000000..dcffd5cee24
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartWithDisableMiniCartSidebarTest.xml
-@@ -0,0 +1,131 @@
-+<?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="StorefrontAddBundleDynamicProductToShoppingCartWithDisableMiniCartSidebarTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Create Grouped product and verify mini cart action with disabled and enable Mini Cart Sidebar"/>
-+            <description value="Create Grouped product and verify mini cart action with disabled and enable Mini Cart Sidebar"/>
-+            <testCaseId value="MC-14719"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI stepKey="disableShoppingCartSidebar" command="config:set checkout/sidebar/display 0"/>
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRatePrice"/>
-+            <createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
-+
-+            <!--Create  simple products-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
-+                <field key="price">50.00</field>
-+            </createData>
-+
-+            <!--Create Bundle product-->
-+            <createData entity="BundleProductPriceViewRange" stepKey="createBundleProduct">
-+                <requiredEntity createDataKey="createSubCategory"/>
-+            </createData>
-+            <createData entity="DropDownBundleOption" stepKey="createBundleOption1_1">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <field key="required">True</field>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption1_1"/>
-+                <requiredEntity createDataKey="simpleProduct1"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption1_1"/>
-+                <requiredEntity createDataKey="simpleProduct2"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
-+            <deleteData createDataKey="createSubCategory" stepKey="deleteCategory"/>
-+            <magentoCLI stepKey="disableShoppingCartSidebar" command="config:set checkout/sidebar/display 1"/>
-+        </after>
-+
-+        <!--Open Product page in StoreFront and assert product and price range -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPageAndVerifyProduct">
-+            <argument name="product" value="$$createBundleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeIsVisible">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.priceFrom}}"/>
-+            <argument name="userInput" value="From $10.00"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeIsVisible1">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.priceTo}}"/>
-+            <argument name="userInput" value="To $50.00"/>
-+        </actionGroup>
-+
-+        <!-- Add Bundle dynamic product to the cart -->
-+        <actionGroup ref="StorefrontAddBundleProductToTheCartActionGroup" stepKey="addBundleDynamicProductToTheCart">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+            <argument name="quantity" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Select Mini Cart, verify it doen't open  -->
-+        <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
-+        <dontSeeElement selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="dontSeeViewAndEditCart"/>
-+
-+        <!--Assert Product items in cart -->
-+        <actionGroup ref="AssertStorefrontCheckoutCartItemsActionGroup" stepKey="assertSimpleProduct1ItemsInCheckOutCart">
-+            <argument name="productName" value="$$createBundleProduct.name$$"/>
-+            <argument name="productSku" value="$$createBundleProduct.sku$$"/>
-+            <argument name="productPrice" value="$50.00"/>
-+            <argument name="subtotal" value="$100.00" />
-+            <argument name="qty" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Assert Grouped product with option is displayed in cart -->
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductOptionTitle">
-+            <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-+            <argument name="userInput" value="$$createBundleOption1_1.title$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductOptionInCart">
-+            <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-+            <argument name="userInput" value="1 x $$simpleProduct2.name$$ $50.00"/>
-+        </actionGroup>
-+
-+        <!--Assert Shopping Cart Summary-->
-+        <actionGroup ref="AssertStorefrontShoppingCartSummaryWithShippingActionGroup" stepKey="AssertCartSummary" >
-+            <argument name="subtotal" value="$100.00"/>
-+            <argument name="shipping" value="10.00"/>
-+            <argument name="total" value="110.00"/>
-+        </actionGroup>
-+
-+        <!--Enabled Shopping Cart Sidebar -->
-+        <magentoCLI stepKey="enableShoppingCartSidebar" command="config:set checkout/sidebar/display 1"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        <reloadPage stepKey="reloadThePage"/>
-+
-+        <!--Click on mini cart-->
-+        <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart1"/>
-+
-+        <!--Assert mini cart can open and check mini cart items -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProductInMiniCart1">
-+            <argument name="productName" value="$$createBundleProduct.name$$"/>
-+            <argument name="productPrice" value="$50.00"/>
-+            <argument name="cartSubtotal" value="$100.00" />
-+            <argument name="qty" value="2"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddConfigurableProductToShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddConfigurableProductToShoppingCartTest.xml
-new file mode 100644
-index 00000000000..90d7643a126
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddConfigurableProductToShoppingCartTest.xml
-@@ -0,0 +1,166 @@
-+<?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="StorefrontAddConfigurableProductToShoppingCartTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Create configurable product with three options and add configurable product to the cart"/>
-+            <description value="Create configurable product with three options and add configurable product to the cart"/>
-+            <testCaseId value="MC-14716"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRatePrice"/>
-+            <!-- Create Default Category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create an attribute with three options to be used in the first child product -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOption3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Add the attribute just created to default attribute set -->
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Get the first option of the attribute created -->
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Get the second option of the attribute created -->
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Get the third option of the attribute created -->
-+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOption3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create Configurable product -->
-+            <createData entity="BaseConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Create a simple product and give it the attribute with the first option -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <field key="price">10.00</field>
-+            </createData>
-+
-+            <!--Create a simple product and give it the attribute with the second option -->
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+                <field key="price">20.00</field>
-+            </createData>
-+
-+            <!--Create a simple product and give it the attribute with the Third option -->
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
-+                <field key="price">30.00</field>
-+            </createData>
-+
-+            <!-- Create the configurable product -->
-+            <createData entity="ConfigurableProductThreeOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
-+            </createData>
-+
-+            <!-- Add the first simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+
-+            <!-- Add the second simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+
-+            <!-- Add the third simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild3">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct3"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteSimpleProduct2"/>
-+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteSimpleProduct3"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteProductAttribute"/>
-+        </after>
-+
-+        <!-- Add Configurable Product to the cart -->
-+        <actionGroup ref="StorefrontAddConfigurableProductToTheCartActionGroup" stepKey="addConfigurableProductToCart">
-+            <argument name="urlKey" value="$$createConfigProduct.custom_attributes[url_key]$$" />
-+            <argument name="productAttribute" value="$$createConfigProductAttribute.default_value$$"/>
-+            <argument name="productOption" value="$$getConfigAttributeOption2.label$$"/>
-+            <argument name="qty" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
-+
-+        <!--Assert Shopping Cart Summary -->
-+        <actionGroup ref="AssertStorefrontShoppingCartSummaryWithShippingActionGroup" stepKey="AssertCartSummary" >
-+            <argument name="subtotal" value="$40.00"/>
-+            <argument name="shipping" value="10.00"/>
-+            <argument name="total" value="50.00"/>
-+        </actionGroup>
-+
-+        <!--Assert Product Details In Checkout cart -->
-+        <actionGroup ref="AssertStorefrontCheckoutCartItemsActionGroup" stepKey="assertProductItemInCheckOutCart">
-+            <argument name="productName" value="$$createConfigProduct.name$$"/>
-+            <argument name="productSku" value="$$createConfigChildProduct2.sku$$"/>
-+            <argument name="productPrice" value="$$createConfigChildProduct2.price$$"/>
-+            <argument name="subtotal" value="$40.00" />
-+            <argument name="qty" value="2"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductOptionInCart">
-+            <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-+            <argument name="userInput" value="$$getConfigAttributeOption2.label$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert product details in Mini Cart -->
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertMiniCart">
-+            <argument name="productName" value="$$createConfigProduct.name$$"/>
-+            <argument name="productPrice" value="$$createConfigChildProduct2.price$$"/>
-+            <argument name="cartSubtotal" value="$40.00" />
-+            <argument name="qty" value="2"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddDownloadableProductToShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddDownloadableProductToShoppingCartTest.xml
-new file mode 100644
-index 00000000000..5a46dbc90e2
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddDownloadableProductToShoppingCartTest.xml
-@@ -0,0 +1,87 @@
-+<?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="StorefrontAddDownloadableProductToShoppingCartTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Create Downloadable product with two links and add to the shopping cart"/>
-+            <description value="Create Downloadable product with two links and add to the shopping cart"/>
-+            <testCaseId value="MC-14717"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
-+            <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct"/>
-+            <createData entity="downloadableLink1" stepKey="addDownloadableLink1">
-+                <requiredEntity createDataKey="createDownloadableProduct"/>
-+            </createData>
-+            <createData entity="downloadableLink2" stepKey="addDownloadableLink2">
-+                <requiredEntity createDataKey="createDownloadableProduct"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createDownloadableProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Open Downloadable Product page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createDownloadableProduct.custom_attributes[url_key]$$)}}" stepKey="OpenStoreFrontProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!-- Add Downloadable product to the cart -->
-+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToTheCart">
-+            <argument name="productName" value="$$createDownloadableProduct.name$$" />
-+        </actionGroup>
-+
-+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
-+
-+        <!--Assert Shopping Cart Summary-->
-+        <actionGroup ref="AssertStorefrontShoppingCartSummaryItemsActionGroup" stepKey="AssertCartSummary" >
-+            <argument name="subtotal" value="$123.00"/>
-+            <argument name="total" value="123.00"/>
-+        </actionGroup>
-+
-+        <!--Assert Product Details In Checkout cart -->
-+        <actionGroup ref="AssertStorefrontCheckoutCartItemsActionGroup" stepKey="assertProductItemInCheckOutCart">
-+            <argument name="productName" value="$$createDownloadableProduct.name$$"/>
-+            <argument name="productSku" value="$$createDownloadableProduct.sku$$"/>
-+            <argument name="productPrice" value="$123.00"/>
-+            <argument name="subtotal" value="$123.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeLinksInCart">
-+            <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-+            <argument name="userInput" value="Links"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductOptionLink1">
-+            <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-+            <argument name="userInput" value="{{downloadableLink1.title}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductOptionLink2">
-+            <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-+            <argument name="userInput" value="{{downloadableLink2.title}}"/>
-+        </actionGroup>
-+
-+        <!-- Assert product details in Mini Cart -->
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertMiniCart">
-+            <argument name="productName" value="$$createDownloadableProduct.name$$"/>
-+            <argument name="productPrice" value="$123.00"/>
-+            <argument name="cartSubtotal" value="123.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddGroupedProductToShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddGroupedProductToShoppingCartTest.xml
-new file mode 100644
-index 00000000000..247fab27143
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddGroupedProductToShoppingCartTest.xml
-@@ -0,0 +1,132 @@
-+<?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="StorefrontAddGroupedProductToShoppingCartTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Create grouped product with three simple product and Add grouped product to the cart"/>
-+            <description value="Create grouped product with three simple product and Add grouped product to the cart"/>
-+            <testCaseId value="MC-14718"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
-+            <!--Create Grouped product with three simple product -->
-+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2">
-+                <field key="price">100.00</field>
-+            </createData>
-+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="simple3">
-+                <field key="price">200.00</field>
-+            </createData>
-+            <createData entity="ApiProductWithDescription" stepKey="simple3" before="product">
-+                <field key="price">300.00</field>
-+            </createData>
-+            <createData entity="ApiGroupedProduct" stepKey="product"/>
-+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="simple1"/>
-+            </createData>
-+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addProductOne" stepKey="addProductTwo">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="simple2"/>
-+            </updateData>
-+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addProductOne" stepKey="addProductThree">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="simple3"/>
-+            </updateData>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="simple2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="simple3" stepKey="deleteProduct3"/>
-+            <deleteData createDataKey="product" stepKey="deleteGroupProduct"/>
-+        </after>
-+
-+        <!-- Fill Quantity and add Product to the cart -->
-+        <actionGroup ref="StorefrontAddThreeGroupedProductToTheCartActionGroup" stepKey="addGropedProductsToTheCart">
-+            <argument name="urlKey" value="$$product.custom_attributes[url_key]$$"/>
-+            <argument name="product1" value="$$simple1.name$$"/>
-+            <argument name="product2" value="$$simple2.name$$"/>
-+            <argument name="product3" value="$$simple3.name$$"/>
-+            <argument name="qty1" value="1"/>
-+            <argument name="qty2" value="2"/>
-+            <argument name="qty3" value="3"/>
-+        </actionGroup>
-+
-+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
-+
-+        <!--Assert Product1 items in cart -->
-+        <actionGroup ref="AssertStorefrontCheckoutCartItemsActionGroup" stepKey="assertSimpleProduct1ItemsInCheckOutCart">
-+            <argument name="productName" value="$$simple1.name$$"/>
-+            <argument name="productSku" value="$$simple1.sku$$"/>
-+            <argument name="productPrice" value="$100.00"/>
-+            <argument name="subtotal" value="$100.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!--Assert Product2 items in cart -->
-+        <actionGroup ref="AssertStorefrontCheckoutCartItemsActionGroup" stepKey="assertSimpleProduct2ItemsInCheckOutCart">
-+            <argument name="productName" value="$$simple2.name$$"/>
-+            <argument name="productSku" value="$$simple2.sku$$"/>
-+            <argument name="productPrice" value="$200.00"/>
-+            <argument name="subtotal" value="$400.00" />
-+            <argument name="qty" value="2"/>
-+        </actionGroup>
-+
-+        <!--Assert Product3 items in cart -->
-+        <actionGroup ref="AssertStorefrontCheckoutCartItemsActionGroup" stepKey="assertSimpleProduct3ItemsInCheckOutCart">
-+            <argument name="productName" value="$$simple3.name$$"/>
-+            <argument name="productSku" value="$$simple3.sku$$"/>
-+            <argument name="productPrice" value="$300.00"/>
-+            <argument name="subtotal" value="$900.00" />
-+            <argument name="qty" value="3"/>
-+        </actionGroup>
-+
-+        <!--Assert Shopping Cart Summary-->
-+        <actionGroup ref="AssertStorefrontShoppingCartSummaryWithShippingActionGroup" stepKey="AssertCartSummary" >
-+            <argument name="subtotal" value="$1,400.00"/>
-+            <argument name="shipping" value="30.00"/>
-+            <argument name="total" value="1,430.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert product1 details in Mini Cart -->
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct3MiniCart">
-+            <argument name="productName" value="$$simple3.name$$"/>
-+            <argument name="productPrice" value="$300.00"/>
-+            <argument name="cartSubtotal" value="$1,400.00" />
-+            <argument name="qty" value="3"/>
-+        </actionGroup>
-+
-+        <!-- Assert product2 details in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct2MiniCart">
-+            <argument name="productName" value="$$simple2.name$$"/>
-+            <argument name="productPrice" value="$200.00"/>
-+            <argument name="cartSubtotal" value="$1,400.00" />
-+            <argument name="qty" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Assert product3 details in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct1MiniCart">
-+            <argument name="productName" value="$$simple1.name$$"/>
-+            <argument name="productPrice" value="$100.00"/>
-+            <argument name="cartSubtotal" value="$1,400.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddOneBundleMultiSelectOptionToTheShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddOneBundleMultiSelectOptionToTheShoppingCartTest.xml
-new file mode 100644
-index 00000000000..73fa380f4bc
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddOneBundleMultiSelectOptionToTheShoppingCartTest.xml
-@@ -0,0 +1,124 @@
-+<?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="StorefrontAddOneBundleMultiSelectOptionToTheShoppingCartTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Select one multi select option of a bundle product and add to the shopping cart"/>
-+            <description value="Select one multi select option of a bundle product and add to the shopping cart "/>
-+            <testCaseId value="MC-14727"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
-+            <createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
-+            <!--Create  simple product-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
-+                <field key="price">50.00</field>
-+            </createData>
-+            <!--Create Bundle product with Multi Select option-->
-+            <createData entity="BundleProductPriceViewRange" stepKey="createBundleProduct">
-+                <requiredEntity createDataKey="createSubCategory"/>
-+            </createData>
-+            <createData entity="MultipleSelectOption" stepKey="createBundleOption1_1">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <field key="required">True</field>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption1_1"/>
-+                <requiredEntity createDataKey="simpleProduct1"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption1_1"/>
-+                <requiredEntity createDataKey="simpleProduct2"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
-+            <deleteData createDataKey="createSubCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!--Open Product page in StoreFront and assert product details -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPageAndVerifyProduct">
-+            <argument name="product" value="$$createBundleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeIsVisible">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.priceFrom}}"/>
-+            <argument name="userInput" value="From $10.00"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeIsVisible1">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.priceTo}}"/>
-+            <argument name="userInput" value="To $60.00"/>
-+        </actionGroup>
-+
-+        <!-- Click on customize And Add To Cart Button -->
-+        <actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickOnCustomizeAndAddtoCartButton"/>
-+
-+        <!-- Select One Product Option from MultiSelect option -->
-+        <selectOption selector="{{StorefrontBundledSection.multiSelectOption}}" userInput="$$simpleProduct2.name$$ +$50.00"  stepKey="selectOption2Product"/>
-+
-+        <!--Enter product Quantity and add to the cart -->
-+        <actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="enterProductQuantityAndAddToTheCart">
-+            <argument name="quantity" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
-+
-+        <!--Assert Shopping Cart Summary-->
-+        <actionGroup ref="AssertStorefrontShoppingCartSummaryWithShippingActionGroup" stepKey="AssertCartSummary" >
-+            <argument name="subtotal" value="$50.00"/>
-+            <argument name="shipping" value="5.00"/>
-+            <argument name="total" value="55.00"/>
-+        </actionGroup>
-+
-+        <!--Assert Product items in cart -->
-+        <actionGroup ref="AssertStorefrontCheckoutCartItemsActionGroup" stepKey="assertSimpleProduct1ItemsInCheckOutCart">
-+            <argument name="productName" value="$$createBundleProduct.name$$"/>
-+            <argument name="productSku" value="$$createBundleProduct.sku$$"/>
-+            <argument name="productPrice" value="$50.00"/>
-+            <argument name="subtotal" value="$50.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Grouped product options is displayed in cart -->
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductOptionTitle">
-+            <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-+            <argument name="userInput" value="$$createBundleOption1_1.title$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductOptionInCart">
-+            <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-+            <argument name="userInput" value="1 x $$simpleProduct2.name$$ $50.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product in Mini Cart -->
-+        <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProductInMiniCart">
-+            <argument name="productName" value="$$createBundleProduct.name$$"/>
-+            <argument name="productPrice" value="$50.00"/>
-+            <argument name="cartSubtotal" value="$50.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartTest.xml
-new file mode 100644
-index 00000000000..611c53dba0d
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartTest.xml
-@@ -0,0 +1,114 @@
-+<?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="StorefrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Create a simple products with all types of oprtions and add it to the cart"/>
-+            <description value="Create a simple products with all types of oprtions and add it to the cart"/>
-+            <testCaseId value="MC-14726"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <updateData createDataKey="createProduct" entity="productWithOptions" stepKey="updateProductWithCustomOptions"/>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        </before>
-+        <after>
-+            <deleteData  createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData  createDataKey="createProduct" stepKey="deleteProduct"/>
-+        </after>
-+        <!-- Open Product page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct1PageAndVerifyProduct">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Fill Option Input field -->
-+        <actionGroup ref="StorefrontFillOptionFieldInputActionGroup" stepKey="fillTheOptionFieldInput">
-+            <argument name="fieldInput" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Fill Option Text Area -->
-+        <actionGroup ref="StorefrontFillOptionTextAreaActionGroup" stepKey="fillTheOptionTextAreaInput">
-+            <argument name="fieldInput" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Attach file option-->
-+        <actionGroup ref="StorefrontAttachOptionFileActionGroup" stepKey="selectAndAttachFile"/>
-+
-+        <!--Select Option From DropDown option -->
-+        <actionGroup ref="StorefrontSelectOptionDropDownActionGroup" stepKey="selectDropDownOption"/>
-+        <scrollTo selector="{{StorefrontProductInfoMainSection.customOptionLabel(ProductOptionMultiSelect.title)}}" stepKey="scrollToMultiSelect"/>
-+
-+        <!-- Select CheckBox From CheckBox option -->
-+        <actionGroup ref="StorefrontSelectOptionCheckBoxActionGroup" stepKey="selectCheckBoxOption"/>
-+
-+        <!-- Select RadioButton From Radio Button option -->
-+        <actionGroup ref="StorefrontSelectOptionRadioButtonActionGroup" stepKey="selectRadioButtonOption"/>
-+
-+        <!-- Select option From MultiSelect option -->
-+        <actionGroup ref="StorefrontSelectOptionMultiSelectActionGroup" stepKey="selectOptionFromMultiSelect"/>
-+
-+        <!-- Generate Date -->
-+        <generateDate date="Now" format="Y" stepKey="year"/>
-+
-+        <!-- Select Month,Day and Year  From Date option -->
-+        <actionGroup ref="StorefrontSelectOptionDateActionGroup" stepKey="fillOptionDate">
-+            <argument name="month" value="11"/>
-+            <argument name="day" value="10"/>
-+            <argument name="year" value="$year"/>
-+        </actionGroup>
-+
-+        <!-- Select Month, Day, Year, Hour,Minute and DayPart from DateTime option -->
-+        <actionGroup ref="StorefrontSelectOptionDateTimeActionGroup" stepKey="fillOptionDateAndTime">
-+            <argument name="month" value="11"/>
-+            <argument name="day" value="10"/>
-+            <argument name="year" value="$year"/>
-+            <argument name="hour" value="10"/>
-+            <argument name="minute" value="20"/>
-+            <argument name="dayPart" value="AM"/>
-+        </actionGroup>
-+
-+        <!-- Select Hour,Minute and DayPart from Time option -->
-+        <actionGroup ref="StorefrontSelectOptionTimeActionGroup" stepKey="fillOptionTime">
-+            <argument name="hour" value="10"/>
-+            <argument name="minute" value="20"/>
-+            <argument name="dayPart" value="AM"/>
-+        </actionGroup>
-+
-+        <!-- Add product to the cart -->
-+        <fillField selector="{{StorefrontProductInfoMainSection.qty}}" userInput="2" stepKey="fillQuantity"/>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToTheCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="productCount" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Open Mini Cart -->
-+        <actionGroup ref="StorefrontOpenMiniCartActionGroup" stepKey="openMiniCart"/>
-+
-+        <!-- Assert Product Count in Mini Cart -->
-+        <actionGroup ref="StorefrontAssertMiniCartItemCountActionGroup" stepKey="assertProductCountAndTextInMiniCart">
-+            <argument name="productCount" value="2"/>
-+            <argument name="productCountText" value="1 Item in Cart"/>
-+        </actionGroup>
-+
-+        <!--Assert Product Items in Mini cart-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct3MiniCart">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+            <argument name="productPrice" value="$1,642.58"/>
-+            <argument name="cartSubtotal" value="$3,285.16" />
-+            <argument name="qty" value="2"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddTwoBundleMultiSelectOptionsToTheShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddTwoBundleMultiSelectOptionsToTheShoppingCartTest.xml
-new file mode 100644
-index 00000000000..e2ff7f2c98d
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddTwoBundleMultiSelectOptionsToTheShoppingCartTest.xml
-@@ -0,0 +1,127 @@
-+<?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="StorefrontAddTwoBundleMultiSelectOptionsToTheShoppingCartTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Add two products to the cart from multi select options of a bundle product"/>
-+            <description value="Add two products to the cart from multi select options of a bundle product."/>
-+            <testCaseId value="MC-14728"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
-+            <createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
-+            <!--Create  simple product-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
-+                <field key="price">50.00</field>
-+            </createData>
-+            <!--Create Bundle product with multi select option-->
-+            <createData entity="BundleProductPriceViewRange" stepKey="createBundleProduct">
-+                <requiredEntity createDataKey="createSubCategory"/>
-+            </createData>
-+            <createData entity="MultipleSelectOption" stepKey="createBundleOption1_1">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <field key="required">True</field>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption1_1"/>
-+                <requiredEntity createDataKey="simpleProduct1"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption1_1"/>
-+                <requiredEntity createDataKey="simpleProduct2"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
-+            <deleteData createDataKey="createSubCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!--Open Product page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPageAndVerifyProduct">
-+            <argument name="product" value="$$createBundleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeIsVisible">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.priceFrom}}"/>
-+            <argument name="userInput" value="From $10.00"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeIsVisible1">
-+            <argument name="selector" value="{{StorefrontProductInfoMainSection.priceTo}}"/>
-+            <argument name="userInput" value="To $60.00"/>
-+        </actionGroup>
-+
-+        <!-- Click on customize And Add To Cart Button -->
-+        <actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickOnCustomizeAndAddtoCartButton"/>
-+
-+        <!-- Select Two Products, enter the quantity and add product to the cart -->
-+        <selectOption selector="{{StorefrontBundledSection.multiSelectOption}}" parameterArray="[$$simpleProduct1.name$$ +$10.00, $$simpleProduct2.name$$ +$50.00]" stepKey="selectOptions"/>
-+        <actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="enterProductQuantityAndAddToTheCart">
-+            <argument name="quantity" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
-+
-+        <!--Assert Shopping Cart Summary-->
-+        <actionGroup ref="AssertStorefrontShoppingCartSummaryWithShippingActionGroup" stepKey="AssertCartSummary" >
-+            <argument name="subtotal" value="$60.00"/>
-+            <argument name="shipping" value="5.00"/>
-+            <argument name="total" value="65.00"/>
-+        </actionGroup>
-+
-+        <!--Assert Product items in cart -->
-+        <actionGroup ref="AssertStorefrontCheckoutCartItemsActionGroup" stepKey="assertSimpleProduct1ItemsInCheckOutCart">
-+            <argument name="productName" value="$$createBundleProduct.name$$"/>
-+            <argument name="productSku" value="$$createBundleProduct.sku$$"/>
-+            <argument name="productPrice" value="$60.00"/>
-+            <argument name="subtotal" value="$60.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Grouped product options is displayed in cart -->
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductOptionTitle">
-+            <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-+            <argument name="userInput" value="$$createBundleOption1_1.title$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductOption1InCart">
-+            <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-+            <argument name="userInput" value="1 x $$simpleProduct1.name$$ $10.00"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductOption2InCart">
-+            <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-+            <argument name="userInput" value="1 x $$simpleProduct2.name$$ $50.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product in Mini Cart -->
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct3MiniCart">
-+            <argument name="productName" value="$$createBundleProduct.name$$"/>
-+            <argument name="productPrice" value="$60.00"/>
-+            <argument name="cartSubtotal" value="$60.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontApplyPromoCodeDuringCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontApplyPromoCodeDuringCheckoutTest.xml
-new file mode 100644
-index 00000000000..bdfdfceab53
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontApplyPromoCodeDuringCheckoutTest.xml
-@@ -0,0 +1,91 @@
-+<?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="StorefrontApplyPromoCodeDuringCheckoutTest">
-+        <annotations>
-+            <features value="OnePageCheckout"/>
-+            <stories value="OnePageCheckout with Promo Code"/>
-+            <title value="Storefront apply promo code during checkout test"/>
-+            <description value="Apply promo code during checkout for physical product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13212"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <!-- Create simple product -->
-+            <createData entity="SimpleProduct2" stepKey="createProduct">
-+                <field key="price">10.00</field>
-+            </createData>
-+
-+            <!-- Create cart price rule -->
-+            <createData entity="ActiveSalesRuleForNotLoggedIn" stepKey="createCartPriceRule"/>
-+            <createData entity="SimpleSalesRuleCoupon" stepKey="createCouponForCartPriceRule">
-+                <requiredEntity createDataKey="createCartPriceRule"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete simple product -->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+
-+            <!-- Delete sales rule -->
-+            <deleteData createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
-+
-+            <!-- Admin log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to Storefront as Guest and add simple product to cart -->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Go to Checkout -->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+
-+        <!-- Fill all required fields with valid data and select Flat Rate, price = 5, shipping -->
-+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping">
-+            <argument name="shippingMethod" value="Flat Rate"/>
-+        </actionGroup>
-+
-+         <!-- Click Apply Discount Code: section is expanded. Input promo code, apply and see success message -->
-+        <actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyCoupon">
-+            <argument name="discountCode" value="$$createCouponForCartPriceRule.code$$"/>
-+        </actionGroup>
-+
-+        <!-- Apply button is disappeared -->
-+        <dontSeeElement selector="{{DiscountSection.ApplyCodeBtn}}" stepKey="dontSeeApplyButton"/>
-+
-+        <!-- Cancel coupon button is appeared -->
-+        <seeElement selector="{{DiscountSection.CancelCouponBtn}}" stepKey="seeCancelCouponButton"/>
-+
-+        <!-- Order summary contains information about applied code -->
-+        <seeElement selector="{{CheckoutPaymentSection.discount}}" stepKey="seeDiscountCouponInSummaryBlock"/>
-+        <see selector="{{CheckoutPaymentSection.discountPrice}}" userInput="-$5.00" stepKey="seeDiscountPrice"/>
-+
-+        <!-- Select payment solution -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="clickCheckMoneyOrderPayment"/>
-+
-+        <!-- Place Order: order is successfully placed -->
-+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
-+
-+        <!-- Login as admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        <!-- Verify total on order page -->
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderById">
-+            <argument name="orderId" value="$grabOrderNumber"/>
-+        </actionGroup>
-+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-+        <waitForPageLoad stepKey="waitForAdminOrderPageLoad"/>
-+        <scrollTo selector="{{AdminOrderTotalSection.grandTotal}}" stepKey="scrollToOrderTotalSection"/>
-+        <see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$$createProduct.price$$" stepKey="checkTotal"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartAndSummaryBlockItemDisplayWithDefaultDisplayLimitationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartAndSummaryBlockItemDisplayWithDefaultDisplayLimitationTest.xml
-new file mode 100644
-index 00000000000..beb2d40f94c
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartAndSummaryBlockItemDisplayWithDefaultDisplayLimitationTest.xml
-@@ -0,0 +1,343 @@
-+<?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="StorefrontCheckCartAndSummaryBlockItemDisplayWithDefaultDisplayLimitationTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Add 10 items to the cart and check cart and summary block display with default display limit"/>
-+            <description value="Add 10 items to the cart and check cart and summary block display with default display limit"/>
-+            <testCaseId value="MC-14722"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
-+            <!--Create  simple product-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
-+                <field key="price">20.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct3">
-+                <field key="price">30.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct4">
-+                <field key="price">40.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct5">
-+                <field key="price">50.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct6">
-+                <field key="price">60.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct7">
-+                <field key="price">70.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct8">
-+                <field key="price">80.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct9">
-+                <field key="price">90.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct10">
-+                <field key="price">100.00</field>
-+            </createData>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="simpleProduct3" stepKey="deleteProduct3"/>
-+            <deleteData createDataKey="simpleProduct4" stepKey="deleteProduct4"/>
-+            <deleteData createDataKey="simpleProduct5" stepKey="deleteProduct5"/>
-+            <deleteData createDataKey="simpleProduct6" stepKey="deleteProduct6"/>
-+            <deleteData createDataKey="simpleProduct7" stepKey="deleteProduct7"/>
-+            <deleteData createDataKey="simpleProduct8" stepKey="deleteProduct8"/>
-+            <deleteData createDataKey="simpleProduct9" stepKey="deleteProduct9"/>
-+            <deleteData createDataKey="simpleProduct10" stepKey="deleteProduct10"/>
-+        </after>
-+
-+        <!-- Open Product1 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct1PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct1$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product1 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct1ToTheCart">
-+            <argument name="productName" value="$$simpleProduct1.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product2 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct2PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct2$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product2 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct2ToTheCart">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product3 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct3PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct3$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product3 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct3ToTheCart">
-+            <argument name="productName" value="$$simpleProduct3.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product4 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct4PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct4$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product4 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct4ToTheCart">
-+            <argument name="productName" value="$$simpleProduct4.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product5 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct5PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct5$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product5 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct5ToTheCart">
-+            <argument name="productName" value="$$simpleProduct5.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product6 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct6PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct6$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product6 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct6ToTheCart">
-+            <argument name="productName" value="$$simpleProduct6.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product7 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct7PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct7$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product7 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct7ToTheCart">
-+            <argument name="productName" value="$$simpleProduct7.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product8 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct8PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct8$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product8 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct8ToTheCart">
-+            <argument name="productName" value="$$simpleProduct8.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product9 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct9PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct9$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product9 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct9ToTheCart">
-+            <argument name="productName" value="$$simpleProduct9.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product10 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPage10AndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct10$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product10 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct10ToTheCart">
-+            <argument name="productName" value="$$simpleProduct10.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Mini Cart -->
-+        <actionGroup ref="StorefrontOpenMiniCartActionGroup" stepKey="openMiniCart"/>
-+
-+        <!-- Assert Product Count in Mini Cart -->
-+        <actionGroup ref="StorefrontAssertMiniCartItemCountActionGroup" stepKey="assertProductCountAndTextInMiniCart">
-+            <argument name="productCount" value="10"/>
-+            <argument name="productCountText" value="10 Items in Cart"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product1 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct11MiniCart">
-+            <argument name="productName" value="$$simpleProduct1.name$$"/>
-+            <argument name="productPrice" value="$10.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product2 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct2MiniCart">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+            <argument name="productPrice" value="$20.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product3 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct3MiniCart">
-+            <argument name="productName" value="$$simpleProduct3.name$$"/>
-+            <argument name="productPrice" value="$30.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product4 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct4MiniCart">
-+            <argument name="productName" value="$$simpleProduct4.name$$"/>
-+            <argument name="productPrice" value="$40.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product5 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct5MiniCart">
-+            <argument name="productName" value="$$simpleProduct5.name$$"/>
-+            <argument name="productPrice" value="$50.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product6 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct6MiniCart">
-+            <argument name="productName" value="$$simpleProduct6.name$$"/>
-+            <argument name="productPrice" value="$60.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product7 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct7MiniCart">
-+            <argument name="productName" value="$$simpleProduct7.name$$"/>
-+            <argument name="productPrice" value="$70.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product8 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct8MiniCart">
-+            <argument name="productName" value="$$simpleProduct8.name$$"/>
-+            <argument name="productPrice" value="$80.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product9 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct9MiniCart">
-+            <argument name="productName" value="$$simpleProduct9.name$$"/>
-+            <argument name="productPrice" value="$90.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product10 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct10MiniCart">
-+            <argument name="productName" value="$$simpleProduct10.name$$"/>
-+            <argument name="productPrice" value="$100.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Order Summary -->
-+        <actionGroup ref="StorefrontCheckoutAndAssertOrderSummaryDisplayActionGroup" stepKey="AssertOrderSummary">
-+            <argument name="itemsText" value="10 Items in Cart"/>
-+        </actionGroup>
-+
-+        <!-- Assert Shipping Page -->
-+        <actionGroup ref="StorefrontAssertShippingAddressPageDisplayActionGroup" stepKey="assertShippingPageDisplay"/>
-+
-+        <!--Click on order summary tab -->
-+        <conditionalClick selector="{{CheckoutOrderSummarySection.miniCartTab}}" dependentSelector="{{CheckoutOrderSummarySection.miniCartTabClosed}}" visible="true" stepKey="clickOnOrderSummaryTab"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!-- Assert Product1 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct1InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct1.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$10.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product2 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct2InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$20.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product3 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct3InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct3.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$30.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product4 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct4InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct4.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$40.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product5 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct5InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct5.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$50.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product6 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct6InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct6.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$60.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product7 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct7InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct7.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$70.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product8 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct8InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct8.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$80.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product9 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct9InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct9.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$90.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product10 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct10InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct10.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$100.00"/>
-+        </actionGroup>
-+
-+        <!-- Verify View and Edit Cart is not displayed in Order Summary -->
-+        <dontSeeElement selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="dontSeeViewAndEditLink"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWhenMoreItemsAddedToTheCartThanDefaultDisplayLimitTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWhenMoreItemsAddedToTheCartThanDefaultDisplayLimitTest.xml
-new file mode 100644
-index 00000000000..09a5ce4c703
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWhenMoreItemsAddedToTheCartThanDefaultDisplayLimitTest.xml
-@@ -0,0 +1,286 @@
-+<?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="StorefrontCheckCartItemDisplayWhenMoreItemsAddedToTheCartThanDefaultDisplayLimitTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Add 11 Simple product to the cart and check cart display with default display limit"/>
-+            <description value="Add 11 Simple product to the cart and check cart display with default display limit"/>
-+            <testCaseId value="MC-14720"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
-+            <!--Create  simple product-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
-+                <field key="price">20.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct3">
-+                <field key="price">30.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct4">
-+                <field key="price">40.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct5">
-+                <field key="price">50.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct6">
-+                <field key="price">60.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct7">
-+                <field key="price">70.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct8">
-+                <field key="price">80.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct9">
-+                <field key="price">90.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct10">
-+                <field key="price">100.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct11">
-+                <field key="price">110.00</field>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="simpleProduct3" stepKey="deleteProduct3"/>
-+            <deleteData createDataKey="simpleProduct4" stepKey="deleteProduct4"/>
-+            <deleteData createDataKey="simpleProduct5" stepKey="deleteProduct5"/>
-+            <deleteData createDataKey="simpleProduct6" stepKey="deleteProduct6"/>
-+            <deleteData createDataKey="simpleProduct7" stepKey="deleteProduct7"/>
-+            <deleteData createDataKey="simpleProduct8" stepKey="deleteProduct8"/>
-+            <deleteData createDataKey="simpleProduct9" stepKey="deleteProduct9"/>
-+            <deleteData createDataKey="simpleProduct10" stepKey="deleteProduct10"/>
-+            <deleteData createDataKey="simpleProduct11" stepKey="deleteProduct11"/>
-+        </after>
-+
-+        <!-- Open Product1 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct1PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct1$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product1 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct1ToTheCart">
-+            <argument name="productName" value="$$simpleProduct1.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product2 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct2PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct2$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product2 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct2ToTheCart">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product3 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct3PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct3$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product3 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct3ToTheCart">
-+            <argument name="productName" value="$$simpleProduct3.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product4 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct4PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct4$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product4 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct4ToTheCart">
-+            <argument name="productName" value="$$simpleProduct4.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product5 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct5PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct5$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product5 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct5ToTheCart">
-+            <argument name="productName" value="$$simpleProduct5.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product6 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct6PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct6$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product6 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct6ToTheCart">
-+            <argument name="productName" value="$$simpleProduct6.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product7 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct7PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct7$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product7 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct7ToTheCart">
-+            <argument name="productName" value="$$simpleProduct7.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product8 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct8PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct8$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product8 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct8ToTheCart">
-+            <argument name="productName" value="$$simpleProduct8.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product9 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct9PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct9$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product9 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct9ToTheCart">
-+            <argument name="productName" value="$$simpleProduct9.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product10 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPage10AndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct10$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product10 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct10ToTheCart">
-+            <argument name="productName" value="$$simpleProduct10.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product11 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPage11AndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct11$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product11 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct11ToTheCart">
-+            <argument name="productName" value="$$simpleProduct11.name$$"/>
-+        </actionGroup>
-+
-+
-+        <!-- Assert Product details in Mini Cart -->
-+        <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductCountInMiniCart">
-+            <argument name="selector" value="{{StorefrontMinicartSection.productCount}}"/>
-+            <argument name="userInput" value="11"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeTotalNumberOfItemDisplayed">
-+            <argument name="selector" value="{{StorefrontMinicartSection.visibleItemsCountText}}"/>
-+            <argument name="userInput" value="10 of 11 Items in Cart"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="seeViewAndEditLink">
-+            <argument name="selector" value="{{StorefrontMinicartSection.viewAndEditCart}}"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product1 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct1InMiniCart">
-+            <argument name="productName" value="$$simpleProduct1.name$$"/>
-+            <argument name="productPrice" value="$10.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product2 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct2InMiniCart">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+            <argument name="productPrice" value="$20.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product3 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct3MiniCart">
-+            <argument name="productName" value="$$simpleProduct3.name$$"/>
-+            <argument name="productPrice" value="$30.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product4 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct4InMiniCart">
-+            <argument name="productName" value="$$simpleProduct4.name$$"/>
-+            <argument name="productPrice" value="$40.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product5 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct5InMiniCart">
-+            <argument name="productName" value="$$simpleProduct5.name$$"/>
-+            <argument name="productPrice" value="$50.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product6 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct6InMiniCart">
-+            <argument name="productName" value="$$simpleProduct6.name$$"/>
-+            <argument name="productPrice" value="$60.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product7 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct7InMiniCart">
-+            <argument name="productName" value="$$simpleProduct7.name$$"/>
-+            <argument name="productPrice" value="$70.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product8 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct8InMiniCart">
-+            <argument name="productName" value="$$simpleProduct8.name$$"/>
-+            <argument name="productPrice" value="$80.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product9 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct9InMiniCart">
-+            <argument name="productName" value="$$simpleProduct9.name$$"/>
-+            <argument name="productPrice" value="$90.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product10 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct10InMiniCart">
-+            <argument name="productName" value="$$simpleProduct10.name$$"/>
-+            <argument name="productPrice" value="$100.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Verify  Product11 is not displayed in Mini Cart -->
-+        <dontSee selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="$$simpleProduct11.name$$"  stepKey="dontSeeProduct11NameInMiniCart"/>
-+        <dontSee selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="110" stepKey="dontSeeProduct11PriceInMiniCart"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWithDefaultDisplayLimitAndDefaultTotalQuantityTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWithDefaultDisplayLimitAndDefaultTotalQuantityTest.xml
-new file mode 100644
-index 00000000000..2339789bd85
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWithDefaultDisplayLimitAndDefaultTotalQuantityTest.xml
-@@ -0,0 +1,256 @@
-+<?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="StorefrontCheckCartItemDisplayWithDefaultDisplayLimitAndDefaultTotalQuantityTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Add 10 items to the cart and check cart display with default display limit"/>
-+            <description value="Add 10 items to the cart and check cart display with default display limit"/>
-+            <testCaseId value="MC-14721"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!--Create  simple product-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
-+                <field key="price">20.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct3">
-+                <field key="price">30.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct4">
-+                <field key="price">40.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct5">
-+                <field key="price">50.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct6">
-+                <field key="price">60.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct7">
-+                <field key="price">70.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct8">
-+                <field key="price">80.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct9">
-+                <field key="price">90.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct10">
-+                <field key="price">100.00</field>
-+            </createData>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="simpleProduct3" stepKey="deleteProduct3"/>
-+            <deleteData createDataKey="simpleProduct4" stepKey="deleteProduct4"/>
-+            <deleteData createDataKey="simpleProduct5" stepKey="deleteProduct5"/>
-+            <deleteData createDataKey="simpleProduct6" stepKey="deleteProduct6"/>
-+            <deleteData createDataKey="simpleProduct7" stepKey="deleteProduct7"/>
-+            <deleteData createDataKey="simpleProduct8" stepKey="deleteProduct8"/>
-+            <deleteData createDataKey="simpleProduct9" stepKey="deleteProduct9"/>
-+            <deleteData createDataKey="simpleProduct10" stepKey="deleteProduct10"/>
-+        </after>
-+
-+        <!-- Open Product1 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct1PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct1$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product1 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct1ToTheCart">
-+            <argument name="productName" value="$$simpleProduct1.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product2 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct2PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct2$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product2 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct2ToTheCart">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product3 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct3PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct3$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product3 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct3ToTheCart">
-+            <argument name="productName" value="$$simpleProduct3.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product4 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct4PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct4$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product4 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct4ToTheCart">
-+            <argument name="productName" value="$$simpleProduct4.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product5 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct5PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct5$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product5 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct5ToTheCart">
-+            <argument name="productName" value="$$simpleProduct5.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product6 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct6PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct6$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product6 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct6ToTheCart">
-+            <argument name="productName" value="$$simpleProduct6.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product7 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct7PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct7$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product7 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct7ToTheCart">
-+            <argument name="productName" value="$$simpleProduct7.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product8 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct8PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct8$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product8 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct8ToTheCart">
-+            <argument name="productName" value="$$simpleProduct8.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product9 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct9PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct9$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product9 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct9ToTheCart">
-+            <argument name="productName" value="$$simpleProduct9.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product10 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPage10AndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct10$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product10 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct10ToTheCart">
-+            <argument name="productName" value="$$simpleProduct10.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Mini Cart -->
-+        <actionGroup ref="StorefrontOpenMiniCartActionGroup" stepKey="openMiniCart"/>
-+
-+        <!-- Assert Product Count in Mini Cart -->
-+        <actionGroup ref="StorefrontAssertMiniCartItemCountActionGroup" stepKey="assertProductCountAndTextInMiniCart">
-+            <argument name="productCount" value="10"/>
-+            <argument name="productCountText" value="10 Items in Cart"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product1 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct11MiniCart">
-+            <argument name="productName" value="$$simpleProduct1.name$$"/>
-+            <argument name="productPrice" value="$10.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product2 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct2MiniCart">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+            <argument name="productPrice" value="$20.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product3 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct3MiniCart">
-+            <argument name="productName" value="$$simpleProduct3.name$$"/>
-+            <argument name="productPrice" value="$30.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product4 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct4MiniCart">
-+            <argument name="productName" value="$$simpleProduct4.name$$"/>
-+            <argument name="productPrice" value="$40.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product5 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct5MiniCart">
-+            <argument name="productName" value="$$simpleProduct5.name$$"/>
-+            <argument name="productPrice" value="$50.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product6 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct6MiniCart">
-+            <argument name="productName" value="$$simpleProduct6.name$$"/>
-+            <argument name="productPrice" value="$60.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product7 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct7MiniCart">
-+            <argument name="productName" value="$$simpleProduct7.name$$"/>
-+            <argument name="productPrice" value="$70.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product8 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct8MiniCart">
-+            <argument name="productName" value="$$simpleProduct8.name$$"/>
-+            <argument name="productPrice" value="$80.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product9 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct9MiniCart">
-+            <argument name="productName" value="$$simpleProduct9.name$$"/>
-+            <argument name="productPrice" value="$90.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product10 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct10MiniCart">
-+            <argument name="productName" value="$$simpleProduct10.name$$"/>
-+            <argument name="productPrice" value="$100.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckSimpleProductCartItemDisplayWithDefaultLimitationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckSimpleProductCartItemDisplayWithDefaultLimitationTest.xml
-new file mode 100644
-index 00000000000..084c89312cc
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckSimpleProductCartItemDisplayWithDefaultLimitationTest.xml
-@@ -0,0 +1,357 @@
-+<?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="StorefrontCheckSimpleProductCartItemDisplayWithDefaultLimitationTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Add 10 SimpleProducts to the cart and check cart display with default display limit"/>
-+            <description value="Add 10 SimpleProducts to the cart and check cart display with default display limit"/>
-+            <testCaseId value="MC-14723"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
-+            <!--Create  simple product-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
-+                <field key="price">20.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct3">
-+                <field key="price">30.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct4">
-+                <field key="price">40.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct5">
-+                <field key="price">50.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct6">
-+                <field key="price">60.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct7">
-+                <field key="price">70.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct8">
-+                <field key="price">80.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct9">
-+                <field key="price">90.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct10">
-+                <field key="price">100.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct11">
-+                <field key="price">110.00</field>
-+            </createData>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="simpleProduct3" stepKey="deleteProduct3"/>
-+            <deleteData createDataKey="simpleProduct4" stepKey="deleteProduct4"/>
-+            <deleteData createDataKey="simpleProduct5" stepKey="deleteProduct5"/>
-+            <deleteData createDataKey="simpleProduct6" stepKey="deleteProduct6"/>
-+            <deleteData createDataKey="simpleProduct7" stepKey="deleteProduct7"/>
-+            <deleteData createDataKey="simpleProduct8" stepKey="deleteProduct8"/>
-+            <deleteData createDataKey="simpleProduct9" stepKey="deleteProduct9"/>
-+            <deleteData createDataKey="simpleProduct10" stepKey="deleteProduct10"/>
-+            <deleteData createDataKey="simpleProduct11" stepKey="deleteProduct11"/>
-+        </after>
-+
-+        <!-- Open Product1 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct1PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct1$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product1 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct1ToTheCart">
-+            <argument name="productName" value="$$simpleProduct1.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product2 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct2PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct2$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product2 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct2ToTheCart">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product3 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct3PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct3$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product3 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct3ToTheCart">
-+            <argument name="productName" value="$$simpleProduct3.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product4 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct4PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct4$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product4 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct4ToTheCart">
-+            <argument name="productName" value="$$simpleProduct4.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product5 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct5PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct5$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product5 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct5ToTheCart">
-+            <argument name="productName" value="$$simpleProduct5.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product6 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct6PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct6$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product6 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct6ToTheCart">
-+            <argument name="productName" value="$$simpleProduct6.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product7 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct7PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct7$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product7 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct7ToTheCart">
-+            <argument name="productName" value="$$simpleProduct7.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product8 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct8PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct8$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product8 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct8ToTheCart">
-+            <argument name="productName" value="$$simpleProduct8.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product9 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct9PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct9$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product9 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct9ToTheCart">
-+            <argument name="productName" value="$$simpleProduct9.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product10 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPage10AndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct10$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product10 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct10ToTheCart">
-+            <argument name="productName" value="$$simpleProduct10.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product11 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPage11AndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct11$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product11 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct11ToTheCart">
-+            <argument name="productName" value="$$simpleProduct11.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Mini Cart -->
-+        <actionGroup ref="StorefrontOpenMiniCartActionGroup" stepKey="openMiniCart"/>
-+
-+        <!-- Assert Product Count in Mini Cart -->
-+        <actionGroup ref="StorefrontAssertMiniCartItemCountActionGroup" stepKey="assertProductCountAndTextInMiniCart">
-+            <argument name="productCount" value="11"/>
-+            <argument name="productCountText" value="10 of 11 Items in Cart"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product1 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct11MiniCart">
-+            <argument name="productName" value="$$simpleProduct1.name$$"/>
-+            <argument name="productPrice" value="$10.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product2 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct2MiniCart">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+            <argument name="productPrice" value="$20.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product3 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct3MiniCart">
-+            <argument name="productName" value="$$simpleProduct3.name$$"/>
-+            <argument name="productPrice" value="$30.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product4 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct4MiniCart">
-+            <argument name="productName" value="$$simpleProduct4.name$$"/>
-+            <argument name="productPrice" value="$40.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product5 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct5MiniCart">
-+            <argument name="productName" value="$$simpleProduct5.name$$"/>
-+            <argument name="productPrice" value="$50.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product6 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct6MiniCart">
-+            <argument name="productName" value="$$simpleProduct6.name$$"/>
-+            <argument name="productPrice" value="$60.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product7 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct7MiniCart">
-+            <argument name="productName" value="$$simpleProduct7.name$$"/>
-+            <argument name="productPrice" value="$70.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product8 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct8MiniCart">
-+            <argument name="productName" value="$$simpleProduct8.name$$"/>
-+            <argument name="productPrice" value="$80.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product9 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct9MiniCart">
-+            <argument name="productName" value="$$simpleProduct9.name$$"/>
-+            <argument name="productPrice" value="$90.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product10 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct10MiniCart">
-+            <argument name="productName" value="$$simpleProduct10.name$$"/>
-+            <argument name="productPrice" value="$100.00"/>
-+            <argument name="cartSubtotal" value="$660.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Order Summary -->
-+        <actionGroup ref="StorefrontCheckoutAndAssertOrderSummaryDisplayActionGroup" stepKey="AssertItemsCountInOrderSummary">
-+            <argument name="itemsText" value="10 of 11 Items in Cart"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="seeViewAndEditLinkInOrderSummary">
-+            <argument name="selector" value="{{StorefrontMinicartSection.viewAndEditCart}}"/>
-+        </actionGroup>
-+
-+        <!-- Click and open order summary tab-->
-+        <conditionalClick selector="{{CheckoutOrderSummarySection.miniCartTab}}" dependentSelector="{{CheckoutOrderSummarySection.miniCartTabClosed}}" visible="true" stepKey="clickOnOrderSummaryTab"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!-- Assert Shipping Page -->
-+        <actionGroup ref="StorefrontAssertShippingAddressPageDisplayActionGroup" stepKey="assertShippingPageDisplay"/>
-+
-+        <!-- Assert Product2 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct2InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$20.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product3 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct3InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct3.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$30.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product4 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct4InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct4.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$40.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product5 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct5InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct5.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$50.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product6 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct6InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct6.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$60.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product7 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct7InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct7.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$70.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product8 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct8InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct8.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$80.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product9 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct9InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct9.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$90.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product10 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct10InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct10.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$100.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product11 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct11InOrderSummary">
-+            <argument name="productName" value="$$simpleProduct11.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$110.00"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckVirtualProductCountDisplayWithCustomDisplayConfigurationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckVirtualProductCountDisplayWithCustomDisplayConfigurationTest.xml
-new file mode 100644
-index 00000000000..1f63565899f
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckVirtualProductCountDisplayWithCustomDisplayConfigurationTest.xml
-@@ -0,0 +1,147 @@
-+<?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="StorefrontCheckVirtualProductCountDisplayWithCustomDisplayConfigurationTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Verify virtual products count in mini cart and summary block with custom display configuration"/>
-+            <description value="Verify virtual products count in mini cart and summary block with custom display configuration"/>
-+            <testCaseId value="MC-14724"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!--Set Mini Cart and Summary Block Display -->
-+            <magentoCLI stepKey="setMaxDisplayCountForMiniCart" command="config:set checkout/options/max_items_display_count 2"/>
-+            <magentoCLI stepKey="setMaxDisplayCountForOrderSummary" command="config:set checkout/sidebar/max_items_display_count 3"/>
-+            <!--Create  simple product-->
-+            <createData entity="VirtualProduct" stepKey="virtualProduct1">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <createData entity="VirtualProduct" stepKey="virtualProduct2">
-+                <field key="price">20.00</field>
-+            </createData>
-+            <createData entity="VirtualProduct" stepKey="virtualProduct3">
-+                <field key="price">30.00</field>
-+            </createData>
-+            <createData entity="VirtualProduct" stepKey="virtualProduct4">
-+                <field key="price">40.00</field>
-+            </createData>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="virtualProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="virtualProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="virtualProduct3" stepKey="deleteProduct3"/>
-+            <deleteData createDataKey="virtualProduct4" stepKey="deleteProduct4"/>
-+            <magentoCLI stepKey="setMaxDisplayCountForMiniCart" command="config:set checkout/options/max_items_display_count 10"/>
-+            <magentoCLI stepKey="setMaxDisplayCountForOrderSummary" command="config:set checkout/sidebar/max_items_display_count 10"/>
-+        </after>
-+
-+        <!-- Open Product1 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct1PageAndVerifyProduct">
-+            <argument name="product" value="$$virtualProduct1$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product1 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct1ToTheCart">
-+            <argument name="productName" value="$$virtualProduct1.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product2 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct2PageAndVerifyProduct">
-+            <argument name="product" value="$$virtualProduct2$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product2 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct2ToTheCart">
-+            <argument name="productName" value="$$virtualProduct2.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product3 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct3PageAndVerifyProduct">
-+            <argument name="product" value="$$virtualProduct3$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product3 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct3ToTheCart">
-+            <argument name="productName" value="$$virtualProduct3.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Product4 page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct4PageAndVerifyProduct">
-+            <argument name="product" value="$$virtualProduct4$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Product4 to the cart -->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct4ToTheCart">
-+            <argument name="productName" value="$$virtualProduct4.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open Mini Cart -->
-+        <actionGroup ref="StorefrontOpenMiniCartActionGroup" stepKey="openMiniCart"/>
-+
-+        <!-- Assert Product Count in Mini Cart -->
-+        <actionGroup ref="StorefrontAssertMiniCartItemCountActionGroup" stepKey="assertProductCountAndTextInMiniCart">
-+            <argument name="productCount" value="4"/>
-+            <argument name="productCountText" value="3 of 4 Items in Cart"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product1 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct11MiniCart">
-+            <argument name="productName" value="$$virtualProduct1.name$$"/>
-+            <argument name="productPrice" value="$10.00"/>
-+            <argument name="cartSubtotal" value="$100.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product2 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct2MiniCart">
-+            <argument name="productName" value="$$virtualProduct2.name$$"/>
-+            <argument name="productPrice" value="$20.00"/>
-+            <argument name="cartSubtotal" value="$100.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product3 in Mini Cart -->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct3MiniCart">
-+            <argument name="productName" value="$$virtualProduct3.name$$"/>
-+            <argument name="productPrice" value="$30.00"/>
-+            <argument name="cartSubtotal" value="$100.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Order Summary -->
-+        <actionGroup ref="StorefrontCheckoutAndAssertOrderSummaryDisplayActionGroup" stepKey="AssertItemCountInOrderSummary">
-+            <argument name="itemsText" value="2 of 4 Items in Cart"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="seeViewAndEditLinkInOrderSummary">
-+            <argument name="selector" value="{{StorefrontMinicartSection.viewAndEditCart}}"/>
-+        </actionGroup>
-+
-+        <!-- Click and open order summary tab-->
-+        <conditionalClick selector="{{CheckoutOrderSummarySection.miniCartTab}}" dependentSelector="{{CheckoutOrderSummarySection.miniCartTabClosed}}" visible="true" stepKey="clickOnOrderSummaryTab"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!-- Assert Product3 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct3InOrderSummary">
-+            <argument name="productName" value="$$virtualProduct3.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$30.00"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product4 displayed in Order Summary -->
-+        <actionGroup ref="StorefrontAssertProductDetailsInOrderSummaryActionGroup" stepKey="assertProduct4InOrderSummary">
-+            <argument name="productName" value="$$virtualProduct4.name$$"/>
-+            <argument name="qty" value="1"/>
-+            <argument name="price" value="$40.00"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
-index 1efff9783b9..40b781df9b2 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
-@@ -12,10 +12,10 @@
-         <annotations>
-             <features value="Checkout"/>
-             <stories value="Checkout via the Admin"/>
--            <title value="Customer Checkout"/>
-+            <title value="Customer Checkout via the Admin"/>
-             <description value="Should be able to place an order as a customer."/>
-             <severity value="CRITICAL"/>
--            <testCaseId value="#"/>
-+            <testCaseId value="MC-5922"/>
-             <group value="checkout"/>
-         </annotations>
-         <before>
-@@ -26,10 +26,13 @@
-             <createData entity="Simple_US_Customer" stepKey="simpleuscustomer"/>
-         </before>
-         <after>
--            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-+            <!--Clear filters-->
-+            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-+            <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingCustomerFilters"/>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-             <deleteData createDataKey="simpleproduct1" stepKey="deleteProduct1"/>
-             <deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
--            <deleteData createDataKey="simpleuscustomer" stepKey="deleteCustomer"/>
-         </after>
- 
-         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
-@@ -48,6 +51,8 @@
-         <click stepKey="s35" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
-         <waitForElement stepKey="s36" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
-         <click stepKey="s37" selector="{{CheckoutShippingMethodsSection.next}}" />
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
-         <waitForPageLoad stepKey="s39"/>
-         <waitForElement stepKey="s41" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
-         <see stepKey="s47" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
-@@ -67,6 +72,7 @@
-         <click stepKey="s81" selector="{{AdminOrdersGridSection.submitSearch22}}" />
-         <waitForPageLoad stepKey="s831"/>
-         <click stepKey="s84" selector="{{AdminOrdersGridSection.firstRow}}" />
-+        <waitForPageLoad stepKey="waitForOrderToLoad"/>
-         <see stepKey="s85" selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" />
-         <see stepKey="s87" selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="Customer" />
-         <see stepKey="s89" selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="$$simpleuscustomer.email$$" />
-@@ -76,6 +82,7 @@
- 
-         <amOnPage stepKey="s96" url="{{AdminCustomerPage.url}}"/>
-         <waitForPageLoad stepKey="s97"/>
-+        <waitForElementVisible selector="{{AdminCustomerFiltersSection.filtersButton}}" time="30" stepKey="waitFiltersButton"/>
-         <click stepKey="s98" selector="{{AdminCustomerFiltersSection.filtersButton}}"/>
-         <fillField stepKey="s99" selector="{{AdminCustomerFiltersSection.emailInput}}" userInput="$$simpleuscustomer.email$$"/>
-         <click stepKey="s100" selector="{{AdminCustomerFiltersSection.apply}}"/>
-@@ -85,12 +92,13 @@
-     </test>
-     <test name="StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRates">
-         <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Customer checkout"/>
-             <title value="Customer Checkout with multiple addresses and tax rates"/>
-             <description value="Should be able to place an order as a customer with multiple addresses and tax rates."/>
-             <testCaseId value="MAGETWO-93109"/>
--            <skip>
--                <issueId value="MQE-1187" />
--            </skip>
-+            <severity value="AVERAGE"/>
-+            <group value="checkout"/>
-         </annotations>
-         <before>
-             <createData entity="SimpleSubCategory" stepKey="simplecategory"/>
-@@ -162,7 +170,8 @@
-         <click stepKey="selectFirstShippingMethod1" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
-         <waitForElement stepKey="waitForShippingMethodSelect1" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
-         <click stepKey="clickNextOnShippingMethodLoad1" selector="{{CheckoutShippingMethodsSection.next}}" />
--        <waitForPageLoad stepKey="waitForPaymentLoad1"/>
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
-         <waitForElement stepKey="waitForPlaceOrderButton1" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
-         <see stepKey="seeBillingAddressIsCorrect1" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_NY.street[0]}}" />
-         <click stepKey="clickPlaceOrderButton1" selector="{{CheckoutPaymentSection.placeOrder}}" />
-@@ -178,16 +187,87 @@
-         <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity2"/>
-         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2" />
- 
--        <click stepKey="changeShippingAddress" selector="{{CheckoutShippingMethodsSection.shipHereButton}}"/>
--        <waitForElementNotVisible stepKey="waitForShippingMethodLoaderNotVisible" selector="{{CheckoutShippingMethodsSection.shippingMethodLoader}}" time="30"/>
--        <click stepKey="selectFirstShippingMethod2" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
--        <waitForElement stepKey="waitForShippingMethodSelect2" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
--        <click stepKey="clickNextOnShippingMethodLoad2" selector="{{CheckoutShippingMethodsSection.next}}" />
--        <waitForPageLoad stepKey="waitForPaymentLoad2"/>
--        <waitForElement stepKey="waitForPlaceOrderButton2" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
--        <see stepKey="seeBillingAddressIsCorrect2" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{UK_Not_Default_Address.street[0]}}" />
--        <click stepKey="clickPlaceOrderButton2" selector="{{CheckoutPaymentSection.placeOrder}}" />
-+        <click selector="{{CheckoutShippingMethodsSection.shipHereButton}}" stepKey="changeShippingAddress"/>
-+        <waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodLoader}}" time="30" stepKey="waitForShippingMethodLoaderNotVisible"/>
-+        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" time="30" stepKey="waitForShippingMethodRadioToBeVisible"/>
-+        <waitForPageLoad stepKey="waitForPageLoad23"/>
-+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod2"/>
-+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30"  stepKey="waitForShippingMethodSelect2"/>
-+        <click selector="{{CheckoutShippingMethodsSection.next}}"  stepKey="clickNextOnShippingMethodLoad2"/>
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
-+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton2"/>
-+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_NY.street[0]}}" stepKey="seeBillingAddressIsCorrect2" />
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrderButton2"/>
-         <waitForPageLoad stepKey="waitForOrderSuccessPage2"/>
--        <see stepKey="seeSuccessMessage2" selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" />
-+        <see selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" stepKey="seeSuccessMessage2"/>
-+    </test>
-+    <test name="StorefrontCustomerCheckoutTestWithRestrictedCountriesForPayment">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Checkout flow if payment solutions are not available"/>
-+            <title value="Checkout via Customer Checkout with restricted countries for payment"/>
-+            <description value="Should be able to place an order as a Customer with restricted countries for payment."/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-42653"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <magentoCLI command="config:set checkout/options/display_billing_address_on 1"  stepKey="setShowBillingAddressOnPaymentPage" />
-+            <magentoCLI command="config:set payment/checkmo/allowspecific 1" stepKey="allowSpecificValue"  />
-+            <magentoCLI command="config:set payment/checkmo/specificcountry GB" stepKey="specificCountryValue" />
-+            <createData entity="Simple_US_Customer" stepKey="simpleuscustomer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <magentoCLI command="config:set payment/checkmo/allowspecific 0" stepKey="allowSpecificValue" />
-+            <magentoCLI command="config:set payment/checkmo/specificcountry ''" stepKey="specificCountryValue" />
-+            <magentoCLI command="config:set checkout/options/display_billing_address_on 0" stepKey="setDisplayBillingAddressOnPaymentMethod" />
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
-+        </after>
-+        <!-- Login as Customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
-+            <argument name="Customer" value="$$simpleuscustomer$$" />
-+        </actionGroup>
-+
-+        <!-- Add product to cart -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
-+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
-+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
-+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
-+
-+        <!-- Go to checkout page -->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="customerGoToCheckoutFromMinicart" />
-+
-+        <!-- Select address -->
-+        <click stepKey="selectAddress" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
-+        <waitForElement stepKey="waitNextButton" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
-+        <click stepKey="clickNextButton" selector="{{CheckoutShippingMethodsSection.next}}" />
-+        <waitForPageLoad stepKey="waitBillingForm"/>
-+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
-+        <dontSee selector="{{CheckoutPaymentSection.paymentMethodByName('Check / Money order')}}" stepKey="paymentMethodDoesNotAvailable"/>
-+
-+        <!-- Fill UK Address and verify that payment available and checkout successful -->
-+        <uncheckOption selector="{{StorefrontCheckoutPaymentMethodSection.billingAddressSameAsShippingShared}}" stepKey="uncheckBillingAddressSameAsShippingCheckCheckBox"/>
-+        <selectOption selector="{{CheckoutPaymentSection.billingAddressSelectShared}}" userInput="New Address" stepKey="clickOnNewAddress"/>
-+        <waitForPageLoad stepKey="waitNewAddressBillingForm"/>
-+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
-+            <argument name="Address" value="updateCustomerUKAddress"/>
-+            <argument name="classPrefix" value="[aria-hidden=false]"/>
-+        </actionGroup>
-+        <click selector="{{CheckoutPaymentSection.addressAction('Update')}}" stepKey="clickUpdateBillingAddressButton" />
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="customerSelectCheckMoneyOrderPayment" />
-+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceorder">
-+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage" />
-+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
-+        </actionGroup>
-     </test>
--</tests>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml
-new file mode 100644
-index 00000000000..0cc0dcf38e3
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml
-@@ -0,0 +1,55 @@
-+<?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="StorefrontCustomerCheckoutWithoutRegionTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Checkout via the Admin"/>
-+            <title value="Shipping address is not validated in checkout when proceeding step as logged in user with default shipping address"/>
-+            <description value="Shouldn't be able to place an order as a customer without state if it's required."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="#"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="Simple_GB_Customer" stepKey="createCustomer"/>
-+            <actionGroup stepKey="loginToAdminPanel" ref="LoginAsAdmin"/>
-+            <actionGroup ref="SelectCountriesWithRequiredRegion" stepKey="setCustomCountryWithRequiredRegion">
-+                <argument name="countries" value="CustomCountryWithRequiredRegion"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <actionGroup ref="SelectCountriesWithRequiredRegion" stepKey="setDefaultCountriesWithRequiredRegion">
-+                <argument name="countries" value="DefaultCountriesWithRequiredRegions"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+        </after>
-+
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
-+            <argument name="Customer" value="$$createCustomer$$" />
-+        </actionGroup>
-+
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckoutPage"/>
-+
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNextButton"/>
-+        <see selector="{{StorefrontMessagesSection.error}}" userInput='Please specify a regionId in shipping address.' stepKey="seeErrorMessages"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerLoginDuringCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerLoginDuringCheckoutTest.xml
-new file mode 100644
-index 00000000000..3a0ba2302a6
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerLoginDuringCheckoutTest.xml
-@@ -0,0 +1,74 @@
-+<?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="StorefrontCustomerLoginDuringCheckoutTest">
-+        <annotations>
-+            <features value="OnePageCheckout"/>
-+            <stories value="Customer Login during checkout"/>
-+            <title value="Storefront customer login during checkout test"/>
-+            <description value="Logging during checkout for customer without addresses in address book"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13097"/>
-+            <group value="OnePageCheckout"/>
-+        </annotations>
-+        <before>
-+            <!-- Create simple product -->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete simple product -->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+
-+            <!-- Customer log out -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+
-+            <!-- Delete customer -->
-+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
-+                <argument name="customerEmail" value="CustomerEntityOne.email"/>
-+            </actionGroup>
-+
-+            <!-- Logout admin -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Go to Storefront as Guest and create new account -->
-+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="createNewCustomerAccount"/>
-+
-+        <!-- Sign Out -->
-+        <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+
-+        <!-- Add simple product to cart as Guest -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddSimpleProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="productCount" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Go to Checkout page -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
-+        <waitForPageLoad stepKey="waitForProceedToCheckout"/>
-+
-+        <!-- Input in field email and password for newly created customer; click Login button -->
-+        <actionGroup ref="LoginAsCustomerOnCheckoutPageActionGroup" stepKey="customerLogin">
-+            <argument name="customer" value="CustomerEntityOne"/>
-+        </actionGroup>
-+
-+        <!-- Block with email is disappeared -->
-+        <dontSeeElement selector="{{CheckoutShippingSection.email}}" stepKey="dontSeeEmailBlock"/>
-+
-+        <!-- Shipping form is pre-filed with first name and last name -->
-+        <seeInField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="seeCustomerFirstNameInField"/>
-+        <seeInField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="seeCustomerLastNameInField"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
-new file mode 100644
-index 00000000000..651c5bd8d43
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
-@@ -0,0 +1,96 @@
-+<?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="StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Checkout via the Storefront"/>
-+            <title value="Customer can place order with new addresses that was edited during checkout with several conditions"/>
-+            <description value="Customer can place order with new addresses."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-67837"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <!--Logout from customer account-->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
-+
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+        </after>
-+        <!--Go to Storefront as Customer-->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
-+            <argument name="Customer" value="$$createCustomer$$" />
-+        </actionGroup>
-+
-+        <!-- Add simple product to cart and go to checkout-->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
-+
-+        <!-- Click "+ New Address" and Fill new address-->
-+        <click selector="{{CheckoutShippingSection.newAddressButton}}" stepKey="addAddress"/>
-+        <actionGroup ref="LoggedInCheckoutWithOneAddressFieldWithoutStateField" stepKey="changeAddress">
-+            <argument name="Address" value="UK_Not_Default_Address"/>
-+            <argument name="classPrefix" value="._show"/>
-+        </actionGroup>
-+
-+        <!--Click "Save Addresses" -->
-+        <click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="saveAddress"/>
-+        <waitForPageLoad stepKey="waitForAddressSaved"/>
-+        <dontSeeElement selector="{{StorefrontCheckoutAddressPopupSection.newAddressModalPopup}}" stepKey="dontSeeModalPopup"/>
-+
-+        <!--Select Shipping Rate "Flat Rate"-->
-+        <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" stepKey="selectFlatShippingMethod"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-+
-+        <click selector="{{CheckoutShippingSection.editActiveAddress}}" stepKey="editNewAddress"/>
-+        <actionGroup ref="clearCheckoutAddressPopupFieldsActionGroup" stepKey="clearRequiredFields">
-+            <argument name="classPrefix" value="._show"/>
-+        </actionGroup>
-+
-+        <!--Close Popup and click next-->
-+        <click selector="{{StorefrontCheckoutAddressPopupSection.closeAddressModalPopup}}" stepKey="closePopup"/>
-+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
-+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
-+
-+        <!--Refresh Page and Place Order-->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
-+        <reloadPage stepKey="reloadPage"/>
-+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="waitForPlaceOrderButton"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-+        <seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="orderIsSuccessfullyPlaced"/>
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="grabOrderNumber"/>
-+
-+        <!--Verify New addresses in Customer's Address Book-->
-+        <amOnPage url="{{StorefrontCustomerAddressesPage.url}}" stepKey="goToCustomerAddressBook"/>
-+        <see userInput="{{UK_Not_Default_Address.street[0]}}"
-+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesStreet"/>
-+        <see userInput="{{UK_Not_Default_Address.city}}"
-+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesCity"/>
-+        <see userInput="{{UK_Not_Default_Address.postcode}}"
-+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesPostcode"/>
-+        <!--Order review page has address that was created during checkout-->
-+        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="goToOrderReviewPage"/>
-+        <see userInput="{{UK_Not_Default_Address.street[0]}} {{UK_Not_Default_Address.city}}, {{UK_Not_Default_Address.postcode}}"
-+             selector="{{StorefrontCustomerOrderViewSection.shippingAddress}}" stepKey="checkShippingAddress"/>
-+        <see userInput="{{US_Address_TX_Default_Billing.street[0]}}"
-+             selector="{{StorefrontCustomerOrderViewSection.billingAddress}}" stepKey="checkBillingAddress"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteBundleProductFromMiniShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteBundleProductFromMiniShoppingCartTest.xml
-new file mode 100644
-index 00000000000..8f3ddbb27f6
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteBundleProductFromMiniShoppingCartTest.xml
-@@ -0,0 +1,92 @@
-+<?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="StorefrontDeleteBundleProductFromMiniShoppingCartTest">
-+        <annotations>
-+            <stories value="DeleteBundleProduct"/>
-+            <title value="Storefront Delete Bundle Product From Mini Shopping Cart Test"/>
-+            <description value="Test log in to Shopping Cart and Delete Bundle Product From Mini Shopping Cart Test"/>
-+            <testCaseId value="MC-14682"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Shopping Cart"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
-+            <createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
-+            <!--Create  simple product-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <!--Create Bundle product-->
-+            <createData entity="BundleProductPriceViewRange" stepKey="createBundleProduct">
-+                <requiredEntity createDataKey="createSubCategory"/>
-+            </createData>
-+            <createData entity="DropDownBundleOption" stepKey="createBundleOption1_1">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <field key="required">True</field>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption1_1"/>
-+                <requiredEntity createDataKey="simpleProduct1"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
-+            <deleteData createDataKey="createSubCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Product page in StoreFront -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPageAndVerifyProduct">
-+            <argument name="product" value="$$createBundleProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Click on customize And Add To Cart Button -->
-+        <actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickOnCustomizeAndAddtoCartButton"/>
-+
-+        <!-- Select Product Quantity and add to the cart -->
-+        <actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="enterProductQuantityAndAddToTheCart">
-+            <argument name="quantity" value="1"/>
-+        </actionGroup>
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <waitForPageLoad stepKey="waitForMiniCartPanelToAppear"/>
-+
-+        <!-- Assert Product in Mini Cart -->
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct3MiniCart">
-+            <argument name="productName" value="$$createBundleProduct.name$$"/>
-+            <argument name="productPrice" value="$10.00"/>
-+            <argument name="cartSubtotal" value="$10.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="seeProductInMiniCart">
-+            <argument name="productName" value="$$createBundleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!--Remove an item from the cart using minicart-->
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProductFromMiniCart">
-+            <argument name="productName" value="$$createBundleProduct.name$$"/>
-+        </actionGroup>
-+        <reloadPage stepKey="reloadPage"/>
-+
-+        <!--Check the minicart is empty and verify AssertProductAbsentInMiniShoppingCart-->
-+        <actionGroup ref="assertMiniCartEmpty" stepKey="miniCartEnpty"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$createBundleProduct.name$$)}}" stepKey="verifyAssertProductAbsentInMiniShoppingCart"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromMiniShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromMiniShoppingCartTest.xml
-new file mode 100644
-index 00000000000..f6357bcf4ca
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromMiniShoppingCartTest.xml
-@@ -0,0 +1,100 @@
-+<?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="StorefrontDeleteConfigurableProductFromMiniShoppingCartTest">
-+        <annotations>
-+            <stories value="DeleteConfigurableProduct"/>
-+            <title value="Storefront Delete Configurable Product From Mini Shopping Cart Test"/>
-+            <description value="Test log in to Shopping Cart and Delete Configurable Product From Mini Shopping Cart Test"/>
-+            <testCaseId value="MC-14681"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Shopping Cart"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <!-- Create Default Category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create an attribute with three options to be used in the first child product -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Add the attribute just created to default attribute set -->
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Get the first option of the attribute created -->
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create Configurable product -->
-+            <createData entity="BaseConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Create a simple product and give it the attribute with the first option -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <field key="price">10.00</field>
-+            </createData>
-+
-+            <!-- Create the configurable product -->
-+            <createData entity="ConfigurableProductThreeOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+
-+            <!-- Add the first simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData  createDataKey="createConfigChildProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteProductAttribute"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Add Configurable Product to the cart -->
-+        <actionGroup ref="StorefrontAddConfigurableProductToTheCartActionGroup" stepKey="addConfigurableProductToCart">
-+            <argument name="urlKey" value="$$createConfigProduct.custom_attributes[url_key]$$" />
-+            <argument name="productAttribute" value="$$createConfigProductAttribute.default_value$$"/>
-+            <argument name="productOption" value="$$getConfigAttributeOption1.label$$"/>
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="seeProductInMiniCart">
-+            <argument name="productName" value="$$createConfigProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!--Remove an item from the cart using minicart-->
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProductFromMiniCart">
-+            <argument name="productName" value="$$createConfigProduct.name$$"/>
-+        </actionGroup>
-+        <reloadPage stepKey="reloadPage"/>
-+
-+        <!--Check the minicart is empty and verify AssertProductAbsentInMiniShoppingCart-->
-+        <actionGroup ref="assertMiniCartEmpty" stepKey="miniCartEnpty"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$createConfigProduct.name$$)}}" stepKey="verifyAssertProductAbsentInMiniShoppingCart"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteDownloadableProductFromMiniShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteDownloadableProductFromMiniShoppingCartTest.xml
-new file mode 100644
-index 00000000000..6a3f6ab4f70
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteDownloadableProductFromMiniShoppingCartTest.xml
-@@ -0,0 +1,74 @@
-+<?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="StorefrontDeleteDownloadableProductFromMiniShoppingCartTest">
-+        <annotations>
-+            <stories value="DeleteConfigurableProduct"/>
-+            <title value="Storefront Delete Downloadable Product From Mini Shopping Cart Test"/>
-+            <description value="Test log in to Shopping Cart and Delete Downloadable Product From Mini Shopping Cart Test"/>
-+            <testCaseId value="MC-14683"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Shopping Cart"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
-+            <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct"/>
-+            <createData entity="downloadableLink1" stepKey="addDownloadableLink1">
-+                <requiredEntity createDataKey="createDownloadableProduct"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createDownloadableProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Open Downloadable Product page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createDownloadableProduct.custom_attributes[url_key]$$)}}" stepKey="OpenStoreFrontProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!-- Add Downloadable product to the cart -->
-+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToTheCart">
-+            <argument name="productName" value="$$createDownloadableProduct.name$$" />
-+        </actionGroup>
-+
-+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
-+
-+        <!-- Assert product details in Mini Cart -->
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertMiniCart">
-+            <argument name="productName" value="$$createDownloadableProduct.name$$"/>
-+            <argument name="productPrice" value="$123.00"/>
-+            <argument name="cartSubtotal" value="123.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="seeProductInMiniCart">
-+            <argument name="productName" value="$$createDownloadableProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!--Remove an item from the cart using minicart-->
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProductFromMiniCart">
-+            <argument name="productName" value="$$createDownloadableProduct.name$$"/>
-+        </actionGroup>
-+        <reloadPage stepKey="reloadPage"/>
-+
-+        <!--Check the minicart is empty and verify AssertProductAbsentInMiniShoppingCart-->
-+        <actionGroup ref="assertMiniCartEmpty" stepKey="miniCartEnpty"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$createDownloadableProduct.name$$)}}" stepKey="verifyAssertProductAbsentInMiniShoppingCart"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteProductsWithCartItemsDisplayDefaultLimitationFromMiniShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteProductsWithCartItemsDisplayDefaultLimitationFromMiniShoppingCartTest.xml
-new file mode 100644
-index 00000000000..cca5268564b
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteProductsWithCartItemsDisplayDefaultLimitationFromMiniShoppingCartTest.xml
-@@ -0,0 +1,285 @@
-+<?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="StorefrontDeleteProductsWithCartItemsDisplayDefaultLimitationFromMiniShoppingCartTest">
-+        <annotations>
-+            <stories value="DeleteProductsWithCartItemsDisplayDefaultLimitation"/>
-+            <title value="Storefront Delete Products With Cart Items Display Default Limitation From Mini Shopping Cart Test"/>
-+            <description value="Test log in to Shopping Cart and Delete Products With Cart Items Display Default Limitation From Mini Shopping Cart Test"/>
-+            <testCaseId value="MC-14687"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Shopping Cart"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <!--Create  10 simple products-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
-+                <field key="price">20.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct3">
-+                <field key="price">30.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct4">
-+                <field key="price">40.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct5">
-+                <field key="price">50.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct6">
-+                <field key="price">60.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct7">
-+                <field key="price">70.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct8">
-+                <field key="price">80.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct9">
-+                <field key="price">90.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct10">
-+                <field key="price">100.00</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="simpleProduct3" stepKey="deleteProduct3"/>
-+            <deleteData createDataKey="simpleProduct4" stepKey="deleteProduct4"/>
-+            <deleteData createDataKey="simpleProduct5" stepKey="deleteProduct5"/>
-+            <deleteData createDataKey="simpleProduct6" stepKey="deleteProduct6"/>
-+            <deleteData createDataKey="simpleProduct7" stepKey="deleteProduct7"/>
-+            <deleteData createDataKey="simpleProduct8" stepKey="deleteProduct8"/>
-+            <deleteData createDataKey="simpleProduct9" stepKey="deleteProduct9"/>
-+            <deleteData createDataKey="simpleProduct10" stepKey="deleteProduct10"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Product1 page in StoreFront-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct1PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct1$$"/>
-+        </actionGroup>
-+        <!--Add Product1 to the cart-->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct1ToTheCart">
-+            <argument name="productName" value="$$simpleProduct1.name$$"/>
-+        </actionGroup>
-+
-+        <!--Open Product2 page in StoreFront-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct2PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct2$$"/>
-+        </actionGroup>
-+        <!--Add Product2 to the cart-->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct2ToTheCart">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+        </actionGroup>
-+
-+        <!--Open Product3 page in StoreFront-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct3PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct3$$"/>
-+        </actionGroup>
-+        <!--Add Product3 to the cart-->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct3ToTheCart">
-+            <argument name="productName" value="$$simpleProduct3.name$$"/>
-+        </actionGroup>
-+
-+        <!--Open Product4 page in StoreFront-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct4PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct4$$"/>
-+        </actionGroup>
-+        <!--Add Product4 to the cart-->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct4ToTheCart">
-+            <argument name="productName" value="$$simpleProduct4.name$$"/>
-+        </actionGroup>
-+
-+        <!--Open Product5 page in StoreFront-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct5PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct5$$"/>
-+        </actionGroup>
-+        <!--Add Product5 to the cart-->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct5ToTheCart">
-+            <argument name="productName" value="$$simpleProduct5.name$$"/>
-+        </actionGroup>
-+
-+        <!--Open Product6 page in StoreFront-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct6PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct6$$"/>
-+        </actionGroup>
-+        <!--Add Product6 to the cart-->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct6ToTheCart">
-+            <argument name="productName" value="$$simpleProduct6.name$$"/>
-+        </actionGroup>
-+
-+        <!--Open Product7 page in StoreFront-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct7PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct7$$"/>
-+        </actionGroup>
-+        <!--Add Product7 to the cart-->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct7ToTheCart">
-+            <argument name="productName" value="$$simpleProduct7.name$$"/>
-+        </actionGroup>
-+
-+        <!--Open Product8 page in StoreFront-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct8PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct8$$"/>
-+        </actionGroup>
-+        <!--Add Product8 to the cart-->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct8ToTheCart">
-+            <argument name="productName" value="$$simpleProduct8.name$$"/>
-+        </actionGroup>
-+
-+        <!--Open Product9 page in StoreFront-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProduct9PageAndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct9$$"/>
-+        </actionGroup>
-+        <!--Add Product9 to the cart-->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct9ToTheCart">
-+            <argument name="productName" value="$$simpleProduct9.name$$"/>
-+        </actionGroup>
-+
-+        <!--Open Product10 page in StoreFront-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPage10AndVerifyProduct">
-+            <argument name="product" value="$$simpleProduct10$$"/>
-+        </actionGroup>
-+        <!--Add Product10 to the cart-->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct10ToTheCart">
-+            <argument name="productName" value="$$simpleProduct10.name$$"/>
-+        </actionGroup>
-+
-+        <!--Open Mini Cart-->
-+        <actionGroup ref="StorefrontOpenMiniCartActionGroup" stepKey="openMiniCart"/>
-+
-+        <!--Assert Product Count in Mini Cart and verify AssertVisibleItemsQtyMessageInMiniShoppingCart-->
-+        <actionGroup ref="StorefrontAssertMiniCartItemCountActionGroup" stepKey="assertProductCountAndTextInMiniCart">
-+            <argument name="productCount" value="10"/>
-+            <argument name="productCountText" value="10 Items in Cart"/>
-+        </actionGroup>
-+
-+        <!--Assert Product1 in Mini Cart-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct11MiniCart">
-+            <argument name="productName" value="$$simpleProduct1.name$$"/>
-+            <argument name="productPrice" value="$10.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+        <!--Assert Product2 in Mini Cart-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct2MiniCart">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+            <argument name="productPrice" value="$20.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+        <!--Assert Product3 in Mini Cart-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct3MiniCart">
-+            <argument name="productName" value="$$simpleProduct3.name$$"/>
-+            <argument name="productPrice" value="$30.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+        <!--Assert Product4 in Mini Cart-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct4MiniCart">
-+            <argument name="productName" value="$$simpleProduct4.name$$"/>
-+            <argument name="productPrice" value="$40.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+        <!--Assert Product5 in Mini Cart-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct5MiniCart">
-+            <argument name="productName" value="$$simpleProduct5.name$$"/>
-+            <argument name="productPrice" value="$50.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+        <!--Assert Product6 in Mini Cart-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct6MiniCart">
-+            <argument name="productName" value="$$simpleProduct6.name$$"/>
-+            <argument name="productPrice" value="$60.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+        <!--Assert Product7 in Mini Cart-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct7MiniCart">
-+            <argument name="productName" value="$$simpleProduct7.name$$"/>
-+            <argument name="productPrice" value="$70.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+        <!--Assert Product8 in Mini Cart-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct8MiniCart">
-+            <argument name="productName" value="$$simpleProduct8.name$$"/>
-+            <argument name="productPrice" value="$80.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+        <!--Assert Product9 in Mini Cart-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct9MiniCart">
-+            <argument name="productName" value="$$simpleProduct9.name$$"/>
-+            <argument name="productPrice" value="$90.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+        <!--Assert Product10 in Mini Cart-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct10MiniCart">
-+            <argument name="productName" value="$$simpleProduct10.name$$"/>
-+            <argument name="productPrice" value="$100.00"/>
-+            <argument name="cartSubtotal" value="$550.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!--Remove products from minicart-->
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProduct1FromMiniCart">
-+            <argument name="productName" value="$$simpleProduct10.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProduct2FromMiniCart">
-+            <argument name="productName" value="$$simpleProduct9.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProduct3FromMiniCart">
-+            <argument name="productName" value="$$simpleProduct8.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProduct4FromMiniCart">
-+            <argument name="productName" value="$$simpleProduct7.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProduct5FromMiniCart">
-+            <argument name="productName" value="$$simpleProduct6.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProduct6FromMiniCart">
-+            <argument name="productName" value="$$simpleProduct5.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProduct7FromMiniCart">
-+            <argument name="productName" value="$$simpleProduct4.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProduct8FromMiniCart">
-+            <argument name="productName" value="$$simpleProduct3.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProduct9FromMiniCart">
-+            <argument name="productName" value="$$simpleProduct2.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProduct10FromMiniCart">
-+            <argument name="productName" value="$$simpleProduct1.name$$"/>
-+        </actionGroup>
-+        <reloadPage stepKey="reloadPage"/>
-+
-+        <!--Check the minicart is empty and verify EmptyCartMessage and AssertProductAbsentInMiniShoppingCart-->
-+        <actionGroup ref="assertMiniCartEmpty" stepKey="miniCartEnpty"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$simpleProduct1.name$$)}}" stepKey="verifyAssertProduct1AbsentInMiniShoppingCart"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$simpleProduct2.name$$)}}" stepKey="verifyAssertProduct2AbsentInMiniShoppingCart"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$simpleProduct3.name$$)}}" stepKey="verifyAssertProduct3AbsentInMiniShoppingCart"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$simpleProduct4.name$$)}}" stepKey="verifyAssertProduct4AbsentInMiniShoppingCart"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$simpleProduct5.name$$)}}" stepKey="verifyAssertProduct5AbsentInMiniShoppingCart"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$simpleProduct6.name$$)}}" stepKey="verifyAssertProduct6AbsentInMiniShoppingCart"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$simpleProduct7.name$$)}}" stepKey="verifyAssertProduct7AbsentInMiniShoppingCart"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$simpleProduct8.name$$)}}" stepKey="verifyAssertProduct8AbsentInMiniShoppingCart"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$simpleProduct9.name$$)}}" stepKey="verifyAssertProduct9AbsentInMiniShoppingCart"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$simpleProduct10.name$$)}}" stepKey="verifyAssertProduct10AbsentInMiniShoppingCart"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteSimpleAndVirtualProductFromMiniShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteSimpleAndVirtualProductFromMiniShoppingCartTest.xml
-new file mode 100644
-index 00000000000..b8092ccdcdc
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteSimpleAndVirtualProductFromMiniShoppingCartTest.xml
-@@ -0,0 +1,88 @@
-+<?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="StorefrontDeleteSimpleAndVirtualProductFromMiniShoppingCartTest">
-+        <annotations>
-+            <stories value="DeleteSimpleAndVirtualProduct"/>
-+            <title value="Storefront Delete Simple And Virtual Product From Mini Shopping Cart Test"/>
-+            <description value="Test log in to Shopping Cart and Delete Simple And Virtual Product From Mini Shopping Cart Test"/>
-+            <testCaseId value="MC-14685"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Shopping Cart"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <!--Create  simple product-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <!--Create  virtual product-->
-+            <createData entity="VirtualProduct" stepKey="virtualProduct">
-+                <field key="price">20.00</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="virtualProduct" stepKey="deleteVirtualproduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Add Simple Product to the cart -->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimpleProductToCart">
-+            <argument name="product" value="$$simpleProduct$$"/>
-+        </actionGroup>
-+        <!-- Add virtual Product to the cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$virtualProduct.name$$)}}" stepKey="amOnStorefrontVirtualProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProduct1ToTheCart">
-+            <argument name="productName" value="$$virtualProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert Simple and Virtual products in mini cart -->
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProductInMiniCart">
-+            <argument name="productName" value="$$simpleProduct.name$$"/>
-+            <argument name="productPrice" value="$10.00"/>
-+            <argument name="cartSubtotal" value="$30.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertVirtualProductInMiniCart">
-+            <argument name="productName" value="$$virtualProduct.name$$"/>
-+            <argument name="productPrice" value="$20.00"/>
-+            <argument name="cartSubtotal" value="$30.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Select mini Cart and verify Simple and Virtual products names in cart-->
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="seeSimpleProductInMiniCart">
-+            <argument name="productName" value="$$simpleProduct.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="seeVirtualProductInMiniCart">
-+            <argument name="productName" value="$$virtualProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!--Remove Simple and Virtual products from mini cart-->
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProductFromMiniCart">
-+            <argument name="productName" value="$$simpleProduct.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeVirtualProductFromMiniCart">
-+            <argument name="productName" value="$$virtualProduct.name$$"/>
-+        </actionGroup>
-+        <reloadPage stepKey="reloadPage"/>
-+
-+        <!--Check the minicart is empty and verify EmptyCartMessage and AssertProductAbsentInMiniShoppingCart-->
-+        <actionGroup ref="assertMiniCartEmpty" stepKey="miniCartEnpty"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$simpleProduct.name$$)}}" stepKey="verifyAssertSimpleProductAbsentInMiniShoppingCart"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$virtualProduct.name$$)}}" stepKey="verifyAssertVirtualProductAbsentInMiniShoppingCart"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteSimpleProductFromMiniShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteSimpleProductFromMiniShoppingCartTest.xml
-new file mode 100644
-index 00000000000..05198060f5d
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteSimpleProductFromMiniShoppingCartTest.xml
-@@ -0,0 +1,63 @@
-+<?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="StorefrontDeleteSimpleProductFromMiniShoppingCartTest">
-+        <annotations>
-+            <stories value="DeleteSimpleProduct"/>
-+            <title value="Storefront Delete Simple Product From Mini Shopping Cart Test"/>
-+            <description value="Test log in to Shopping Cart and Delete Simple Product From Mini Shopping Cart Test"/>
-+            <testCaseId value="MC-14686"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Shopping Cart"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <!--Create  simple product-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct">
-+                <field key="price">10.00</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Add Simple Product to the cart -->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
-+            <argument name="product" value="$$simpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product in Mini Cart -->
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct3MiniCart">
-+            <argument name="productName" value="$$simpleProduct.name$$"/>
-+            <argument name="productPrice" value="$10.00"/>
-+            <argument name="cartSubtotal" value="$10.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="seeProductInMiniCart">
-+            <argument name="productName" value="$$simpleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!--Remove an item from the cart using minicart-->
-+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProductFromMiniCart">
-+            <argument name="productName" value="$$simpleProduct.name$$"/>
-+        </actionGroup>
-+        <reloadPage stepKey="reloadPage"/>
-+
-+        <!--Check the minicart is empty and verify AssertProductAbsentInMiniShoppingCart-->
-+        <actionGroup ref="assertMiniCartEmpty" stepKey="miniCartEnpty"/>
-+        <dontSee selector="{{StorefrontMinicartSection.productLinkByName($$simpleProduct.name$$)}}" stepKey="verifyAssertProductAbsentInMiniShoppingCart"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutDataPersistTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutDataPersistTest.xml
-new file mode 100644
-index 00000000000..626f095604f
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutDataPersistTest.xml
-@@ -0,0 +1,57 @@
-+<?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="StorefrontGuestCheckoutDataPersistTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="MAGETWO-95068: Checkout data (shipping address etc) not persistant after cart update"/>
-+            <title value="Check that checkout data persist after cart update"/>
-+            <description value="Checkout data should be persist after updating cart"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-96979"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+        </after>
-+
-+        <!-- Add simple product to cart -->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+        <!-- Navigate to checkout -->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+        <!-- Fill shipping address -->
-+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping">
-+            <argument name="shippingMethod" value="Flat Rate"/>
-+        </actionGroup>
-+        <!-- Add simple product to cart -->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart1">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+        <!-- Navigate to checkout -->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart1"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="assertGuestEmail"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="assertGuestFirstName"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="assertGuestLastName"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="assertGuestStreet"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="assertGuestCity"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="assertGuestRegion"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="assertGuestPostcode"/>
-+        <seeInField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="assertGuestTelephone"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutForSpecificCountriesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutForSpecificCountriesTest.xml
-new file mode 100644
-index 00000000000..f6a332a529d
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutForSpecificCountriesTest.xml
-@@ -0,0 +1,98 @@
-+<?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="StorefrontGuestCheckoutForSpecificCountriesTest">
-+        <annotations>
-+            <features value="One Page Checkout"/>
-+            <stories value="Checkout for Specific Countries"/>
-+            <title value="Storefront guest checkout for specific countries test"/>
-+            <description value="Checkout flow if shipping rates are not available"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13414"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <!-- Create simple product -->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+
-+            <!-- Enable free shipping to specific country -  Afghanistan  -->
-+            <magentoCLI command="config:set {{EnableFreeShippingConfigData.path}} {{EnableFreeShippingConfigData.value}}" stepKey="enableFreeShipping"/>
-+            <magentoCLI command="config:set {{EnableFreeShippingToSpecificCountriesConfigData.path}} {{EnableFreeShippingToSpecificCountriesConfigData.value}}" stepKey="allowFreeShippingSpecificCountries"/>
-+            <magentoCLI command="config:set {{EnableFreeShippingToAfghanistanConfigData.path}} {{EnableFreeShippingToAfghanistanConfigData.value}}" stepKey="enableFreeShippingToAfghanistan"/>
-+
-+            <!-- Enable flat rate shipping to specific country -  Afghanistan -->
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateToSpecificCountriesConfigData.path}} {{EnableFlatRateToSpecificCountriesConfigData.value}}" stepKey="allowFlatRateSpecificCountries"/>
-+            <magentoCLI command="config:set {{EnableFlatRateToAfghanistanConfigData.path}} {{EnableFlatRateToAfghanistanConfigData.value}}" stepKey="enableFlatRateToAfghanistan"/>
-+        </before>
-+        <after>
-+            <!-- Rollback all configurations -->
-+            <magentoCLI command="config:set {{DisableFreeShippingConfigData.path}} {{DisableFreeShippingConfigData.value}}" stepKey="disableFreeShipping"/>
-+            <magentoCLI command="config:set {{EnableFreeShippingToAllAllowedCountriesConfigData.path}} {{EnableFreeShippingToAllAllowedCountriesConfigData.value}}" stepKey="allowFreeShippingToAllCountries"/>
-+            <magentoCLI command="config:set {{EnableFlatRateToAllAllowedCountriesConfigData.path}} {{EnableFlatRateToAllAllowedCountriesConfigData.value}}" stepKey="allowFlatRateToAllCountries"/>
-+
-+            <!-- Delete product -->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+        </after>
-+
-+        <!-- Add product to cart -->
-+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
-+            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="productCount" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Go to checkout page -->
-+        <actionGroup ref="OpenStoreFrontCheckoutShippingPageActionGroup" stepKey="openCheckoutShippingPage"/>
-+
-+        <!-- Assert shipping methods are unavailable -->
-+        <actionGroup ref="AssertStoreFrontShippingMethodUnavailableActionGroup" stepKey="dontSeeFlatRateShippingMethod">
-+            <argument name="shippingMethodName" value="Flat Rate"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStoreFrontShippingMethodUnavailableActionGroup" stepKey="dontFreeShippingMethod"/>
-+
-+        <!-- Assert no quotes message -->
-+        <actionGroup ref="AssertStoreFrontNoQuotesMessageActionGroup" stepKey="assertNoQuotesMessage"/>
-+
-+        <!-- Assert Next button -->
-+        <dontSeeElement selector="{{CheckoutShippingMethodsSection.next}}" stepKey="dontSeeNextButton"/>
-+
-+        <!-- Fill form with valid data for US > California -->
-+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{US_Address_CA.country}}" stepKey="selectCountry"/>
-+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{US_Address_CA.state}}" stepKey="selectState"/>
-+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{US_Address_CA.postcode}}" stepKey="fillPostcode"/>
-+
-+        <!-- Assert shipping methods are unavailable for US > California -->
-+        <actionGroup ref="AssertStoreFrontShippingMethodUnavailableActionGroup" stepKey="dontSeeFlatRateShippingMtd">
-+            <argument name="shippingMethodName" value="Flat Rate"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStoreFrontShippingMethodUnavailableActionGroup" stepKey="dontFreeShippingMtd"/>
-+
-+        <!-- Assert no quotes message for US > California -->
-+        <actionGroup ref="AssertStoreFrontNoQuotesMessageActionGroup" stepKey="assertNoQuotesMsg"/>
-+
-+        <!-- Assert Next button for US > California -->
-+        <dontSeeElement selector="{{CheckoutShippingMethodsSection.next}}" stepKey="dontSeeNextBtn"/>
-+
-+        <!-- Fill form for specific country - Afghanistan -->
-+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="Afghanistan" stepKey="selectSpecificCountry"/>
-+
-+        <!-- Assert shipping methods are available -->
-+        <actionGroup ref="AssertStoreFrontShippingMethodAvailableActionGroup" stepKey="seeFlatRateShippingMethod"/>
-+        <actionGroup ref="AssertStoreFrontShippingMethodAvailableActionGroup" stepKey="seeFreeShippingMethod">
-+            <argument name="shippingMethodName" value="Free Shipping"/>
-+        </actionGroup>
-+
-+        <!-- Assert Next button is available -->
-+        <seeElement selector="{{CheckoutShippingMethodsSection.next}}" stepKey="seeNextButton"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
-index 9d88e42447c..a77341b8697 100644
---- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
-@@ -7,15 +7,15 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontGuestCheckoutTest">
-         <annotations>
-             <features value="Checkout"/>
-             <stories value="Checkout via Guest Checkout"/>
--            <title value="Guest Checkout"/>
--            <description value="Should be able to place an order as a Guest."/>
-+            <title value="Guest Checkout - guest should be able to place an order"/>
-+            <description value="Should be able to place an order as a Guest"/>
-             <severity value="CRITICAL"/>
--            <testCaseId value="MAGETWO-72094"/>
-+            <testCaseId value="MC-12825"/>
-             <group value="checkout"/>
-         </annotations>
-         <before>
-@@ -57,15 +57,97 @@
- 
-         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
-+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
-         <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
-         <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
-         <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-+        <waitForPageLoad stepKey="waitForOrderPageToLoad"/>
-         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeAdminOrderStatus"/>
--        <see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="Guest" stepKey="seeAdminOrderGuest"/>
-+        <see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="{{CustomerEntityOne.fullname}}"  stepKey="seeAdminOrderGuest"/>
-         <see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeAdminOrderEmail"/>
-         <see selector="{{AdminOrderDetailsInformationSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderBillingAddress"/>
-         <see selector="{{AdminOrderDetailsInformationSection.shippingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderShippingAddress"/>
-         <see selector="{{AdminOrderDetailsInformationSection.itemsOrdered}}" userInput="$$createProduct.name$$" stepKey="seeAdminOrderProduct"/>
-     </test>
-+    <test name="StorefrontGuestCheckoutWithSidebarDisabledTest" extends="StorefrontGuestCheckoutTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Checkout via Guest Checkout"/>
-+            <title value="Guest Checkout when Cart sidebar disabled"/>
-+            <description value="Should be able to place an order as a Guest when Cart sidebar is disabled"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-97001"/>
-+            <group value="checkout"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <magentoCLI stepKey="disableSidebar" command="config:set checkout/sidebar/display 0" />
-+        </before>
-+        <after>
-+            <magentoCLI stepKey="enableSidebar" command="config:set checkout/sidebar/display 1" />
-+        </after>
-+        <remove keyForRemoval="guestGoToCheckoutFromMinicart" />
-+        <actionGroup ref="GoToCheckoutFromCartActionGroup" stepKey="guestGoToCheckoutFromCart" after="seeCartQuantity" />
-+    </test>
-+    <test name="StorefrontGuestCheckoutTestWithRestrictedCountriesForPayment">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Checkout flow if payment solutions are not available"/>
-+            <title value="Checkout via Guest Checkout with restricted countries for payment"/>
-+            <description value="Should be able to place an order as a Guest with restricted countries for payment."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-42653"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 1" />
-+            <magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry GB" />
-+
-+        </before>
-+        <after>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 0" />
-+            <magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry ''" />
-+        </after>
-+
-+        <!-- Add product to cart -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
-+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
-+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
-+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
-+
-+        <!-- Go to checkout page -->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromMinicart" />
-+
-+        <!-- Fill US Address and verify that no payment available -->
-+        <actionGroup ref="GuestCheckoutWithSpecificCountryOptionForPaymentMethodActionGroup" stepKey="guestCheckoutFillingShippingSection">
-+            <argument name="customerVar" value="CustomerEntityOne" />
-+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
-+            <argument name="paymentMethod" value="Check / Money order"/>
-+        </actionGroup>
-+
-+        <!-- Fill UK Address and verify that payment available and checkout successful -->
-+        <click selector="{{CheckoutHeaderSection.shippingMethodStep}}" stepKey="goToShipping" />
-+        <actionGroup ref="GuestCheckoutFillingShippingSectionWithoutRegionActionGroup" stepKey="guestCheckoutFillingShippingSectionUK">
-+            <argument name="customerVar" value="CustomerEntityOne" />
-+            <argument name="customerAddressVar" value="UK_Not_Default_Address" />
-+        </actionGroup>
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="guestSelectCheckMoneyOrderPayment" />
-+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceorder">
-+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage" />
-+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
-+        </actionGroup>
-+    </test>
- </tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
-new file mode 100644
-index 00000000000..913eb34b34d
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
-@@ -0,0 +1,95 @@
-+<?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="StorefrontOnePageCheckoutDataWhenChangeQtyTest">
-+        <annotations>
-+            <stories value="Checkout"/>
-+            <title value="One page Checkout Customer data when changing Product Qty"/>
-+            <description value="One page Checkout Customer data when changing Product Qty"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-96960"/>
-+            <useCaseId value="MAGETWO-96850"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <!--Create a product-->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+        </before>
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+        </after>
-+
-+        <!--Add product to cart and checkout-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$createProduct.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
-+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
-+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
-+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
-+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="enterCity"/>
-+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
-+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="enterPostcode"/>
-+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="enterTelephone"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+
-+        <!--Grab customer data to check it-->
-+        <grabValueFrom selector="{{CheckoutShippingSection.email}}" stepKey="grabEmail"/>
-+        <grabValueFrom selector="{{CheckoutShippingSection.firstName}}" stepKey="grabFirstName"/>
-+        <grabValueFrom selector="{{CheckoutShippingSection.lastName}}" stepKey="grabLastName"/>
-+        <grabValueFrom selector="{{CheckoutShippingSection.street}}" stepKey="grabStreet"/>
-+        <grabValueFrom selector="{{CheckoutShippingSection.city}}" stepKey="grabCity"/>
-+        <grabTextFrom selector="{{CheckoutShippingSection.region}}" stepKey="grabRegion"/>
-+        <grabValueFrom selector="{{CheckoutShippingSection.postcode}}" stepKey="grabPostcode"/>
-+        <grabValueFrom selector="{{CheckoutShippingSection.telephone}}" stepKey="grabTelephone"/>
-+
-+        <!--Select shipping method and finalize checkout-->
-+        <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-+        <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
-+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
-+
-+        <!--Go to cart page, update qty and proceed to checkout-->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
-+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
-+        <see userInput="Shopping Cart" stepKey="seeCartPageIsOpened"/>
-+        <fillField selector="{{CheckoutCartProductSection.qty($$createProduct.name$$)}}" userInput="2" stepKey="updateProductQty"/>
-+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCart"/>
-+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
-+        <grabValueFrom selector="{{CheckoutCartProductSection.qty($$createProduct.name$$)}}" stepKey="grabQty"/>
-+        <assertEquals expected="2" actual="$grabQty" stepKey="assertQty"/>
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
-+
-+        <!--Check that form is filled with customer data-->
-+        <grabValueFrom selector="{{CheckoutShippingSection.email}}" stepKey="grabEmail1"/>
-+        <grabValueFrom selector="{{CheckoutShippingSection.firstName}}" stepKey="grabFirstName1"/>
-+        <grabValueFrom selector="{{CheckoutShippingSection.lastName}}" stepKey="grabLastName1"/>
-+        <grabValueFrom selector="{{CheckoutShippingSection.street}}" stepKey="grabStreet1"/>
-+        <grabValueFrom selector="{{CheckoutShippingSection.city}}" stepKey="grabCity1"/>
-+        <grabTextFrom selector="{{CheckoutShippingSection.region}}" stepKey="grabRegion1"/>
-+        <grabValueFrom selector="{{CheckoutShippingSection.postcode}}" stepKey="grabPostcode1"/>
-+        <grabValueFrom selector="{{CheckoutShippingSection.telephone}}" stepKey="grabTelephone1"/>
-+
-+        <assertEquals expected="$grabEmail" actual="$grabEmail1" stepKey="assertEmail"/>
-+        <assertEquals expected="$grabFirstName" actual="$grabFirstName1" stepKey="assertFirstName"/>
-+        <assertEquals expected="$grabLastName" actual="$grabLastName1" stepKey="assertLastName"/>
-+        <assertEquals expected="$grabStreet" actual="$grabStreet1" stepKey="assertStreet"/>
-+        <assertEquals expected="$grabCity" actual="$grabCity1" stepKey="assertCity"/>
-+        <assertEquals expected="$grabRegion" actual="$grabRegion1" stepKey="assertRegion"/>
-+        <assertEquals expected="$grabPostcode" actual="$grabPostcode1" stepKey="assertPostcode"/>
-+        <assertEquals expected="$grabTelephone" actual="$grabTelephone1" stepKey="assertTelephone"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest.xml
-new file mode 100644
-index 00000000000..20ff67a076e
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest.xml
-@@ -0,0 +1,90 @@
-+<?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="StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Checkout via Guest Checkout"/>
-+            <title value="Persistent Data for Guest Customer with physical quote"/>
-+            <description value="One can use Persistent Data for Guest Customer with physical quote"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-13479"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleProduct2" stepKey="createProduct">
-+                <field key="price">10</field>
-+            </createData>
-+            <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
-+            <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefront"/>
-+            <executeJS function="window.localStorage.clear();" stepKey="clearLocalStorage"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShipping"/>
-+        </after>
-+        <!-- 1. Add simple product to cart and go to checkout-->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimpleProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+        <!-- 2. Go to Shopping Cart -->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckoutCartIndexPage"/>
-+        <!-- 3. Open "Estimate Shipping and Tax" section and input data -->
-+        <actionGroup ref="StorefrontCartEstimateShippingAndTaxActionGroup" stepKey="fillEstimateShippingAndTaxSection"/>
-+        <actionGroup ref="StorefrontAssertShippingMethodPresentInCartActionGroup" stepKey="assertShippingMethodFlatRateIsPresentInCart">
-+            <argument name="shippingMethod" value="Flat Rate"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAssertShippingMethodPresentInCartActionGroup" stepKey="assertShippingMethodFreeShippingIsPresentInCart">
-+            <argument name="shippingMethod" value="Free Shipping"/>
-+        </actionGroup>
-+        <!-- 4. Select Flat Rate as shipping -->
-+        <checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectFlatRateShippingMethod"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearAfterFlatRateSelection"/>
-+        <see selector="{{CheckoutCartSummarySection.total}}" userInput="15" stepKey="assertOrderTotalField"/>
-+        <!-- 5. Refresh browser page (F5) -->
-+        <reloadPage stepKey="reloadPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <actionGroup ref="StorefrontAssertCartEstimateShippingAndTaxActionGroup" stepKey="assertCartEstimateShippingAndTaxAfterPageReload"/>
-+        <actionGroup ref="StorefrontAssertCartShippingMethodSelectedActionGroup" stepKey="assertFlatRateShippingMethodIsChecked">
-+            <argument name="carrierCode" value="flatrate"/>
-+            <argument name="methodCode" value="flatrate"/>
-+        </actionGroup>
-+        <!-- 6. Go to Checkout -->
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
-+        <actionGroup ref="StorefrontAssertCheckoutEstimateShippingInformationActionGroup" stepKey="assertCheckoutEstimateShippingInformationAfterGoingToCheckout"/>
-+        <actionGroup ref="StorefrontAssertCheckoutShippingMethodSelectedActionGroup" stepKey="assertFlatRateShippingMethodIsCheckedAfterGoingToCheckout">
-+            <argument name="shippingMethod" value="Flat Rate"/>
-+        </actionGroup>
-+        <!-- 7. Change  persisted data -->
-+        <selectOption selector="{{CheckoutShippingGuestInfoSection.country}}" userInput="United Kingdom" stepKey="changeCountryField"/>
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.regionInput}}" userInput="" stepKey="changeStateProvinceField"/>
-+        <fillField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="KW1 7NQ" stepKey="changeZipPostalCodeField"/>
-+        <!-- 8. Change shipping rate, select Free Shipping -->
-+        <checkOption selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Free Shipping')}}" stepKey="checkFreeShippingAsShippingMethod"/>
-+        <!-- 9. Fill other fields -->
-+        <actionGroup ref="StorefrontFillGuestShippingInfoActionGroup" stepKey="fillOtherFieldsInCheckoutShippingSection"/>
-+        <!-- 10. Refresh browser page(F5) -->
-+        <reloadPage stepKey="reloadCheckoutPage"/>
-+        <waitForPageLoad stepKey="waitForCheckoutPageLoad"/>
-+        <actionGroup ref="StorefrontAssertGuestShippingInfoActionGroup" stepKey="assertGuestShippingPersistedInfoAfterReloadingCheckoutShippingPage"/>
-+        <actionGroup ref="StorefrontAssertCheckoutShippingMethodSelectedActionGroup" stepKey="assertFreeShippingShippingMethodIsChecked">
-+            <argument name="shippingMethod" value="Free Shipping"/>
-+        </actionGroup>
-+        <!-- 11. Go back to the shopping cart -->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckoutCartIndexPage1"/>
-+        <actionGroup ref="StorefrontAssertCartEstimateShippingAndTaxActionGroup" stepKey="assertCartEstimateShippingAndTaxAfterGoingBackToShoppingCart">
-+            <argument name="customerData" value="Simple_UK_Customer_For_Shipment"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAssertCartShippingMethodSelectedActionGroup" stepKey="assertFreeShippingShippingMethodIsCheckedAfterGoingBackToShoppingCart">
-+            <argument name="carrierCode" value="freeshipping"/>
-+            <argument name="methodCode" value="freeshipping"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml
-new file mode 100644
-index 00000000000..5e7e76ae4f0
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml
-@@ -0,0 +1,90 @@
-+<?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="StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Minicart"/>
-+            <title value="Checking Product name in Minicart and on Checkout page with different store views"/>
-+            <description value="Checking Product name in Minicart and on Checkout page with different store views"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-96466"/>
-+            <useCaseId value="MAGETWO-96421"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!--Create a product-->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+        </before>
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
-+                <argument name="customStore" value="customStore"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create store view -->
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
-+            <argument name="customStore" value="customStore"/>
-+        </actionGroup>
-+
-+        <!--Go to created product page-->
-+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="goToEditPage"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+
-+        <!--Switch to second store view and change the product name-->
-+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="switchToCustomStoreView">
-+            <argument name="storeViewName" value="{{customStore.name}}"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <click selector="{{AdminProductFormSection.productNameUseDefault}}" stepKey="uncheckUseDefault"/>
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="$$createProduct.name$$-new" stepKey="fillProductName"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
-+
-+        <!--Add product to cart-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$createProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!--Switch to second store view-->
-+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchStoreView">
-+            <argument name="storeView" value="customStore"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForStoreView"/>
-+
-+        <!--Check product name in Minicart-->
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
-+        <grabTextFrom selector="{{StorefrontMinicartSection.productName}}" stepKey="grabProductNameMinicart"/>
-+        <assertContains expected="$$createProduct.name$$" actual="$grabProductNameMinicart" stepKey="assertProductNameMinicart"/>
-+        <assertContains expectedType="string" expected="-new" actual="$grabProductNameMinicart" stepKey="assertProductNameMinicart1"/>
-+
-+        <!--Check product name in Shopping Cart page-->
-+        <click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="clickViewAndEdit"/>
-+        <waitForPageLoad stepKey="waitForShoppingCartPageLoad"/>
-+        <grabTextFrom selector="{{CheckoutCartProductSection.productName}}" stepKey="grabProductNameCart"/>
-+        <assertContains expected="$$createProduct.name$$" actual="$grabProductNameCart" stepKey="assertProductNameCart"/>
-+        <assertContains expectedType="string" expected="-new" actual="$grabProductNameCart" stepKey="assertProductNameCart1"/>
-+
-+        <!--Proceed to checkout and check product name in Order Summary area-->
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="proceedToCheckout"/>
-+        <waitForPageLoad stepKey="waitForShippingPageLoad"/>
-+        <click selector="{{CheckoutShippingGuestInfoSection.itemInCart}}" stepKey="clickItemInCart"/>
-+        <grabTextFrom selector="{{CheckoutShippingGuestInfoSection.productName}}" stepKey="grabProductNameShipping"/>
-+        <assertContains expected="$$createProduct.name$$" actual="$grabProductNameShipping" stepKey="assertProductNameShipping"/>
-+        <assertContains expectedType="string" expected="-new" actual="$grabProductNameShipping" stepKey="assertProductNameShipping1"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontRefreshPageDuringGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontRefreshPageDuringGuestCheckoutTest.xml
-new file mode 100644
-index 00000000000..1db460de449
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontRefreshPageDuringGuestCheckoutTest.xml
-@@ -0,0 +1,65 @@
-+<?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="StorefrontRefreshPageDuringGuestCheckoutTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Guest checkout"/>
-+            <title value="Storefront refresh page during guest checkout test"/>
-+            <description value="Address is not lost for guest checkout if guest refresh page during checkout"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-12084"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create simple product -->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+        </before>
-+        <after>
-+            <!-- Delete simple product -->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+
-+            <!-- Logout admin -->
-+            <actionGroup ref="logout" stepKey="logoutAsAdmin"/>
-+        </after>
-+        <!-- Add simple product to cart as Guest -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddSimpleProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="productCount" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Go to Checkout page -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
-+        <waitForPageLoad stepKey="waitForProceedToCheckout"/>
-+
-+        <!-- Fill email field and addresses form and go next -->
-+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping">
-+            <argument name="shippingMethod" value="Flat Rate"/>
-+        </actionGroup>
-+
-+        <!-- Refresh page -->
-+        <reloadPage stepKey="refreshPage"/>
-+
-+        <!-- Click Place Order and assert order is placed -->
-+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
-+
-+        <!-- Order review page has address that was created during checkout -->
-+        <amOnPage url="{{AdminOrderPage.url({$grabOrderNumber})}}" stepKey="navigateToOrderPage"/>
-+        <waitForPageLoad stepKey="waitForCreatedOrderPage"/>
-+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{CustomerAddressSimple.street[0]}} {{CustomerAddressSimple.city}}, {{CustomerAddressSimple.state}}, {{CustomerAddressSimple.postcode}}" stepKey="checkShippingAddress"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml
-new file mode 100644
-index 00000000000..b0e1dead1ff
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml
-@@ -0,0 +1,54 @@
-+<?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="StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Estimator in Shopping cart must be pre-filled by Customer default shipping address for virtual quote"/>
-+            <title value="Estimator in Shopping cart must be pre-filled by Customer default shipping address for virtual quote"/>
-+            <description value="Estimator in Shopping cart must be pre-filled by Customer default shipping address for virtual quote"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-46795"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <createData entity="VirtualProduct" stepKey="createVirtualProduct"/>
-+            <createData entity="Customer_With_Different_Default_Billing_Shipping_Addresses" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+            <deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+        </after>
-+        <!-- Steps -->
-+        <!-- Step 1: Go to Storefront as Customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
-+            <argument name="Customer" value="$$createCustomer$$" />
-+        </actionGroup>
-+        <!-- Step 2: Add virtual product to cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.custom_attributes[url_key]$)}}" stepKey="amOnPage"/>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
-+            <argument name="product" value="$$createVirtualProduct$$"/>
-+            <argument name="productCount" value="1"/>
-+        </actionGroup>
-+        <!-- Step 3: Go to Shopping Cart -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingcart"/>
-+        <!-- Step 4: Open Estimate Tax section -->
-+        <click selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" stepKey="openEstimateTaxSection"/>
-+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCountry"/>
-+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkState"/>
-+        <scrollTo selector="{{CheckoutCartSummarySection.postcode}}" stepKey="scrollToPostCodeField"/>
-+        <grabValueFrom  selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
-+        <assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
-+            <expectedResult type="string">{{US_Address_CA.postcode}}</expectedResult>
-+            <actualResult type="variable">grabTextPostCode</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdatePriceInShoppingCartAfterProductSaveTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdatePriceInShoppingCartAfterProductSaveTest.xml
-new file mode 100644
-index 00000000000..d27cb83a8ca
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdatePriceInShoppingCartAfterProductSaveTest.xml
-@@ -0,0 +1,70 @@
-+<?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="StorefrontUpdatePriceInShoppingCartAfterProductSaveTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Checkout via the Storefront"/>
-+            <title value="Update price in shopping cart after product save"/>
-+            <description value="Price in shopping cart should be updated after product save with changed price"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-58179"/>
-+            <group value="checkout"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
-+                <field key="price">100</field>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="SetCustomerDataLifetimeActionGroup" stepKey="setCustomerDataLifetime">
-+                <argument name="minutes" value="1"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="SetCustomerDataLifetimeActionGroup" stepKey="setDefaultCustomerDataLifetime"/>
-+            <magentoCLI command="indexer:reindex customer_grid" stepKey="reindexCustomerGrid"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Go to product page-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
-+
-+        <!--Add Product to Shopping Cart-->
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!--Go to Checkout-->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping"/>
-+
-+        <!--Check price-->
-+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsAreaActive}}" visible="false" stepKey="openItemProductBlock"/>
-+        <see userInput="$100.00" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="checkSummarySubtotal"/>
-+        <see userInput="$100.00" selector="{{CheckoutPaymentSection.productItemPriceByName($$createSimpleProduct.name$$)}}" stepKey="checkItemPrice"/>
-+
-+        <!--Edit product price via admin panel-->
-+        <openNewTab stepKey="openNewTab"/>
-+        <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToProductEditPage"/>
-+        <fillField userInput="120" selector="{{AdminProductFormSection.productPrice}}"  stepKey="setNewPrice"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+        <closeTab stepKey="closeTab"/>
-+
-+        <!--Check price-->
-+        <reloadPage stepKey="reloadPage"/>
-+        <waitForPageLoad stepKey="waitForCheckoutPageReload"/>
-+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsAreaActive}}" visible="false" stepKey="openItemProductBlock1"/>
-+        <see userInput="$120.00" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="checkSummarySubtotal1"/>
-+        <see userInput="$120.00" selector="{{CheckoutPaymentSection.productItemPriceByName($$createSimpleProduct.name$$)}}" stepKey="checkItemPrice1"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml
-new file mode 100644
-index 00000000000..72f6cf95a6f
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml
-@@ -0,0 +1,67 @@
-+<?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="StorefrontUpdateShoppingCartSimpleProductQtyTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Shopping cart"/>
-+            <title value="Check updating shopping cart while updating items qty"/>
-+            <description value="Check updating shopping cart while updating items qty"/>
-+            <testCaseId value="MC-14731" />
-+            <severity value="AVERAGE"/>
-+            <group value="shoppingCart"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Add the newly created product to the shopping cart -->
-+            <actionGroup ref="AddSimpleProductToCart" stepKey="addToCartFromStorefrontProductPage">
-+                <argument name="product" value="$$createProduct$$"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!-- Go to the shopping cart -->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
-+        <waitForPageLoad stepKey="waitForCheckoutPageLoad1"/>
-+
-+        <!-- Change the product QTY -->
-+        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="{{quoteQty3Price123.qty}}" stepKey="changeCartQty"/>
-+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="openShoppingCart"/>
-+        <waitForPageLoad stepKey="waitForCheckoutPageLoad2"/>
-+
-+        <!-- The price and QTY values should be updated for the product -->
-+        <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabProductQtyInCart"/>
-+        <see userInput="{{quoteQty3Price123.currency}}{{quoteQty3Price123.subtotal}}" selector="{{CheckoutCartProductSection.productSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
-+        <assertEquals stepKey="assertProductQtyInCart">
-+            <actualResult type="variable">grabProductQtyInCart</actualResult>
-+            <expectedResult type="string">{{quoteQty3Price123.qty}}</expectedResult>
-+        </assertEquals>
-+
-+        <!-- Subtotal should be updated -->
-+        <see userInput="{{quoteQty3Price123.currency}}{{quoteQty3Price123.subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertCartSubtotal"/>
-+
-+        <!-- Minicart product price and subtotal should be updated -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="openMinicart"/>
-+        <grabValueFrom selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" stepKey="grabProductQtyInMinicart"/>
-+        <assertEquals stepKey="assertProductQtyInMinicart">
-+            <actualResult type="variable">grabProductQtyInMinicart</actualResult>
-+            <expectedResult type="string">{{quoteQty3Price123.qty}}</expectedResult>
-+        </assertEquals>
-+        <see userInput="{{quoteQty3Price123.currency}}{{quoteQty3Price123.subtotal}}" selector="{{StorefrontMinicartSection.subtotal}}" stepKey="assertMinicartSubtotal"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml
-new file mode 100644
-index 00000000000..7a653f13c4e
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml
-@@ -0,0 +1,72 @@
-+<?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="StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Shopping cart"/>
-+            <title value="Check updating shopping cart while updating qty of items with custom options"/>
-+            <description value="Check updating shopping cart while updating qty of items with custom options"/>
-+            <testCaseId value="MC-14732" />
-+            <severity value="AVERAGE"/>
-+            <group value="shoppingCart"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="ApiSimpleProductWithCustomPrice" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Add two custom options to the product: field and textarea -->
-+            <updateData createDataKey="createProduct" entity="ProductWithTextFieldAndAreaOptions" stepKey="updateProductWithOption"/>
-+
-+            <!-- Go to the product page, fill the custom options values and add the product to the shopping cart -->
-+            <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProductPage"/>
-+            <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
-+            <fillField userInput="OptionField" selector="{{StorefrontProductInfoMainSection.productOptionFieldInput(ProductOptionField.title)}}" stepKey="fillProductOptionInputField"/>
-+            <fillField userInput="OptionArea" selector="{{StorefrontProductInfoMainSection.productOptionAreaInput(ProductOptionArea.title)}}" stepKey="fillProductOptionInputArea"/>
-+            <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
-+                <argument name="productName" value="$createProduct.name$"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!-- Go to the shopping cart -->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
-+        <waitForPageLoad stepKey="waitForCheckoutPageLoad"/>
-+
-+        <!-- Change the product QTY -->
-+        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="{{quoteQty11Subtotal1320.qty}}" stepKey="changeCartQty"/>
-+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="updateShoppingCart"/>
-+        <waitForPageLoad stepKey="waitShoppingCartUpdated"/>
-+
-+        <!-- The price and QTY values should be updated for the product -->
-+        <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabProductQtyInCart"/>
-+        <see userInput="{{quoteQty11Subtotal1320.currency}}{{quoteQty11Subtotal1320.subtotal}}" selector="{{CheckoutCartProductSection.productSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
-+        <assertEquals stepKey="assertProductQtyInCart">
-+            <expectedResult type="string">{{quoteQty11Subtotal1320.qty}}</expectedResult>
-+            <actualResult type="variable">grabProductQtyInCart</actualResult>
-+        </assertEquals>
-+        <see userInput="{{quoteQty11Subtotal1320.currency}}{{quoteQty11Subtotal1320.subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
-+
-+        <!-- Minicart product price and subtotal should be updated -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="openMinicart"/>
-+        <grabValueFrom selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" stepKey="grabProductQtyInMinicart"/>
-+        <assertEquals stepKey="assertProductQtyInMinicart">
-+            <expectedResult type="string">{{quoteQty11Subtotal1320.qty}}</expectedResult>
-+            <actualResult type="variable">grabProductQtyInMinicart</actualResult>
-+        </assertEquals>
-+        <see userInput="{{quoteQty11Subtotal1320.currency}}{{quoteQty11Subtotal1320.subtotal}}" selector="{{StorefrontMinicartSection.subtotal}}" stepKey="assertMinicartSubtotal"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontValidateEmailOnCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontValidateEmailOnCheckoutTest.xml
-new file mode 100644
-index 00000000000..65f5dd365b2
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontValidateEmailOnCheckoutTest.xml
-@@ -0,0 +1,56 @@
-+<?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="StorefrontValidateEmailOnCheckoutTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Guest Checkout e-mail validation"/>
-+            <title value="Guest e-mail address validation on Checkout process"/>
-+            <description value="Guest should not be able to place an order when invalid e-mail address provided"/>
-+            <stories value="Guest Checkout"/>
-+            <testCaseId value="MC-14695"/>
-+            <severity value="CRITICAL"/>
-+            <group value="checkout"/>
-+            <group value="shoppingCart"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleTwo" stepKey="simpleProduct"/>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
-+        </after>
-+
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefront">
-+            <argument name="productUrl" value="$$simpleProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
-+
-+        <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage"/>
-+        <actionGroup ref="AssertStorefrontEmailTooltipContentOnCheckoutActionGroup" stepKey="assertEmailTooltipContent"/>
-+        <actionGroup ref="AssertStorefrontEmailNoteMessageOnCheckoutActionGroup" stepKey="assertEmailNoteMessage"/>
-+
-+        <actionGroup ref="StorefrontFillEmailFieldOnCheckoutActionGroup" stepKey="fillIncorrectEmailFirstAttempt">
-+            <argument name="email" value="John"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontEmailValidationMessageOnCheckoutActionGroup" stepKey="verifyValidationErrorMessageFirstAttempt"/>
-+
-+        <actionGroup ref="StorefrontFillEmailFieldOnCheckoutActionGroup" stepKey="fillIncorrectEmailSecondAttempt">
-+            <argument name="email" value="johndoe#example.com"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontEmailValidationMessageOnCheckoutActionGroup" stepKey="verifyValidationErrorMessageSecondAttempt"/>
-+
-+        <actionGroup ref="StorefrontFillEmailFieldOnCheckoutActionGroup" stepKey="fillIncorrectEmailThirdAttempt">
-+            <argument name="email" value="johndoe@example.c"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertStorefrontEmailValidationMessageOnCheckoutActionGroup" stepKey="verifyValidationErrorMessageThirdAttempt"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml
-new file mode 100644
-index 00000000000..7318f865a0d
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml
-@@ -0,0 +1,47 @@
-+<?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="UpdateProductFromMiniShoppingCartEntityTest">
-+        <annotations>
-+            <stories value="Shopping Cart"/>
-+            <title value="Check updating product from mini shopping cart"/>
-+            <description value="Update Product Qty on Mini Shopping Cart"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-15068"/>
-+            <group value="shoppingCart"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!--Create product according to dataset.-->
-+            <createData entity="simpleProductWithoutCategory" stepKey="createProduct"/>
-+
-+            <!--Add product to cart-->
-+            <actionGroup ref="AddSimpleProductToCart" stepKey="addToCartFromStorefrontProductPage">
-+                <argument name="product" value="$$createProduct$$"/>
-+            </actionGroup>
-+        </before>
-+
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct" />
-+        </after>
-+
-+        <actionGroup ref="StorefrontUpdateProductQtyMiniShoppingCartActionGroup" stepKey="updateProductQty">
-+            <argument name="product" value="$$createProduct$$" />
-+            <argument name="quote" value="simpleOrderQty2" />
-+        </actionGroup>
-+
-+        <!-- Perform all assertions -->
-+        <actionGroup ref="AssertMiniShoppingCartSubTotalActionGroup" stepKey="checkSummary">
-+            <argument name="dataQuote" value="simpleOrderQty2"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml
-new file mode 100644
-index 00000000000..4b3e18fb318
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml
-@@ -0,0 +1,103 @@
-+<?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="ZeroSubtotalOrdersWithProcessingStatusTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="MAGETWO-71375: Zero Subtotal Orders have incorrect status"/>
-+            <title value="Checking status of Zero Subtotal Orders with 'Processing' New Order Status"/>
-+            <description value="Created order should be in Processing status"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94178"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="simplecategory"/>
-+            <createData entity="SimpleProduct" stepKey="simpleproduct">
-+                <requiredEntity createDataKey="simplecategory"/>
-+            </createData>
-+            <createData entity="PaymentMethodsSettingConfig" stepKey="paymentMethodsSettingConfig"/>
-+            <createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
-+            <!--Go to Admin page-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+
-+        <after>
-+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteSalesRule">
-+                <argument name="ruleName" value="{{ApiSalesRule.name}}"/>
-+            </actionGroup>
-+            <createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
-+            <createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>
-+            <createData entity="DisablePaymentMethodsSettingConfig" stepKey="disablePaymentMethodsSettingConfig"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+            <deleteData createDataKey="simpleproduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!--Open MARKETING > Cart Price Rules-->
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-+        <waitForPageLoad stepKey="waitForRulesPage"/>
-+
-+        <!--Add New Rule-->
-+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{ApiSalesRule.name}}" stepKey="fillRuleName"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsite"/>
-+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="chooseNotLoggedInCustomerGroup"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="{{_defaultCoupon.code}}" stepKey="fillCouponCode"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.userPerCoupon}}" userInput="99" stepKey="fillUserPerCoupon"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Percent of product price discount" stepKey="selectActionType"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="100" stepKey="fillDiscountAmount"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
-+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
-+
-+        <!--Proceed to store front and place an order with free shipping using created coupon-->
-+        <!--Add product to card-->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="AddProductToCard">
-+            <argument name="product" value="$$simpleproduct$$"/>
-+        </actionGroup>
-+
-+        <!--Proceed to shipment-->
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickToOpenCard"/>
-+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="clickToProceedToCheckout"/>
-+        <waitForPageLoad stepKey="waitForTheFormIsOpened"/>
-+
-+        <!--Fill shipping form-->
-+        <actionGroup ref="ShipmentFormFreeShippingActionGroup" stepKey="shipmentFormFreeShippingActionGroup"/>
-+
-+        <click selector="{{DiscountSection.DiscountTab}}" stepKey="clickToAddDiscount"/>
-+        <fillField selector="{{DiscountSection.DiscountInput}}" userInput="{{_defaultCoupon.code}}" stepKey="TypeDiscountCode"/>
-+        <click selector="{{DiscountSection.ApplyCodeBtn}}" stepKey="clickToApplyDiscount"/>
-+        <waitForPageLoad stepKey="WaitForDiscountToBeAdded"/>
-+        <see userInput="Your coupon was successfully applied." stepKey="verifyText"/>
-+
-+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
-+
-+        <!--Proceed to Admin panel > SALES > Orders. Created order should be in Processing status-->
-+        <amOnPage url="/admin/sales/order/" stepKey="navigateToSalesOrderPage"/>
-+        <waitForPageLoad stepKey="waitForSalesOrderPageLoaded"/>
-+
-+        <!-- Open Order -->
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
-+            <argument name="orderId" value="$grabOrderNumber"/>
-+        </actionGroup>
-+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-+        <waitForPageLoad stepKey="waitForCreatedOrderPageOpened"/>
-+
-+        <!--Verify that Created order is in Processing status-->
-+        <see selector="{{AdminShipmentOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeShipmentOrderStatus"/>
-+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
-index 1c5224d007e..f69ced3b094 100644
---- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
-+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
-@@ -144,7 +144,8 @@ class SidebarTest extends \PHPUnit\Framework\TestCase
-             'baseUrl' => $baseUrl,
-             'minicartMaxItemsVisible' => 3,
-             'websiteId' => 100,
--            'maxItemsToDisplay' => 8
-+            'maxItemsToDisplay' => 8,
-+            'storeId' => null
-         ];
- 
-         $valueMap = [
-@@ -161,7 +162,7 @@ class SidebarTest extends \PHPUnit\Framework\TestCase
-         $this->urlBuilderMock->expects($this->exactly(4))
-             ->method('getUrl')
-             ->willReturnMap($valueMap);
--        $this->storeManagerMock->expects($this->exactly(2))->method('getStore')->willReturn($storeMock);
-+        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
-         $storeMock->expects($this->once())->method('getBaseUrl')->willReturn($baseUrl);
- 
-         $this->scopeConfigMock->expects($this->at(0))
-diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php
-new file mode 100644
-index 00000000000..23840da97bd
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php
-@@ -0,0 +1,121 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Checkout\Test\Unit\Block\Checkout;
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
-+use Magento\Customer\Helper\Address as AddressHelper;
-+use Magento\Customer\Model\Session as CustomerSession;
-+use Magento\Directory\Helper\Data as DirectoryHelper;
-+use Magento\Checkout\Block\Checkout\AttributeMerger;
-+use PHPUnit\Framework\TestCase;
-+
-+class AttributeMergerTest extends TestCase
-+{
-+    /**
-+     * @var CustomerRepository
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * @var CustomerSession
-+     */
-+    private $customerSession;
-+
-+    /**
-+     * @var AddressHelper
-+     */
-+    private $addressHelper;
-+
-+    /**
-+     * @var DirectoryHelper
-+     */
-+    private $directoryHelper;
-+
-+    /**
-+     * @var AttributeMerger
-+     */
-+    private $attributeMerger;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+
-+        $this->customerRepository = $this->createMock(CustomerRepository::class);
-+        $this->customerSession = $this->createMock(CustomerSession::class);
-+        $this->addressHelper = $this->createMock(AddressHelper::class);
-+        $this->directoryHelper = $this->createMock(DirectoryHelper::class);
-+
-+        $this->attributeMerger = new AttributeMerger(
-+            $this->addressHelper,
-+            $this->customerSession,
-+            $this->customerRepository,
-+            $this->directoryHelper
-+        );
-+    }
-+
-+    /**
-+     * Tests of element attributes merging.
-+     *
-+     * @param String $validationRule - validation rule.
-+     * @param String $expectedValidation - expected mapped validation.
-+     * @dataProvider validationRulesDataProvider
-+     */
-+    public function testMerge(String $validationRule, String $expectedValidation): void
-+    {
-+        $elements = [
-+            'field' => [
-+                'visible' => true,
-+                'formElement' => 'input',
-+                'label' => __('City'),
-+                'value' =>  null,
-+                'sortOrder' => 1,
-+                'validation' => [
-+                    'input_validation' => $validationRule
-+                ],
-+            ]
-+        ];
-+
-+        $actualResult = $this->attributeMerger->merge(
-+            $elements,
-+            'provider',
-+            'dataScope',
-+            ['field' =>
-+                [
-+                    'validation' => ['length' => true]
-+                ]
-+            ]
-+        );
-+
-+        $expectedResult = [
-+            $expectedValidation => true,
-+            'length' => true
-+        ];
-+
-+        self::assertEquals($expectedResult, $actualResult['field']['validation']);
-+    }
-+
-+    /**
-+     * Provides possible validation types.
-+     *
-+     * @return array
-+     */
-+    public function validationRulesDataProvider(): array
-+    {
-+        return [
-+            ['alpha', 'validate-alpha'],
-+            ['numeric', 'validate-number'],
-+            ['alphanumeric', 'validate-alphanum'],
-+            ['alphanum-with-spaces', 'validate-alphanum-with-spaces'],
-+            ['url', 'validate-url'],
-+            ['email', 'email2'],
-+            ['length', 'validate-length']
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php
-index b3e55bb418d..31ca2a20330 100644
---- a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php
-+++ b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php
-@@ -10,15 +10,12 @@ use Magento\Checkout\Block\Checkout\LayoutProcessor;
- use Magento\Checkout\Helper\Data;
- use Magento\Customer\Model\AttributeMetadataDataProvider;
- use Magento\Customer\Model\Options;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+
- use Magento\Ui\Component\Form\AttributeMapper;
- use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
- /**
-- * LayoutProcessorTest covers a list of variations for
-- * checkout layout processor
-- *
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * LayoutProcessorTest covers a list of variations for checkout layout processor
-  */
- class LayoutProcessorTest extends \PHPUnit\Framework\TestCase
- {
-@@ -50,12 +47,10 @@ class LayoutProcessorTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @var MockObject
-      */
--    private $storeResolver;
-+    private $storeManager;
- 
-     protected function setUp()
-     {
--        $objectManager = new ObjectManager($this);
--
-         $this->attributeDataProvider = $this->getMockBuilder(AttributeMetadataDataProvider::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['loadAttributesCollection'])
-@@ -80,17 +75,21 @@ class LayoutProcessorTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        $shippingConfig = $this->getMockBuilder(\Magento\Shipping\Model\Config::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-+
-         $this->layoutProcessor = new LayoutProcessor(
-             $this->attributeDataProvider,
-             $this->attributeMapper,
--            $this->attributeMerger
-+            $this->attributeMerger,
-+            $options,
-+            $this->dataHelper,
-+            $shippingConfig,
-+            $this->storeManager
-         );
--
--        $this->storeResolver = $this->createMock(\Magento\Store\Api\StoreResolverInterface::class);
--
--        $objectManager->setBackwardCompatibleProperty($this->layoutProcessor, 'checkoutDataHelper', $this->dataHelper);
--        $objectManager->setBackwardCompatibleProperty($this->layoutProcessor, 'options', $options);
--        $objectManager->setBackwardCompatibleProperty($this->layoutProcessor, 'storeResolver', $this->storeResolver);
-     }
- 
-     /**
-@@ -277,7 +276,7 @@ class LayoutProcessorTest extends \PHPUnit\Framework\TestCase
-             'telephone' => [
-                 'config' => [
-                     'tooltip' => [
--                        'description' => __('For delivery questions.'),
-+                        'description' => ('For delivery questions.'),
-                     ],
-                 ],
-             ],
-diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
-index 54f77c95148..b54339aa2c1 100644
---- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
-+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
-@@ -35,7 +35,7 @@ class OnepageTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @var \PHPUnit_Framework_MockObject_MockObject
-      */
--    private $serializer;
-+    private $serializerMock;
- 
-     protected function setUp()
-     {
-@@ -49,7 +49,7 @@ class OnepageTest extends \PHPUnit\Framework\TestCase
-             \Magento\Checkout\Block\Checkout\LayoutProcessorInterface::class
-         );
- 
--        $this->serializer = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
-+        $this->serializerMock = $this->createMock(\Magento\Framework\Serialize\Serializer\JsonHexTag::class);
- 
-         $this->model = new \Magento\Checkout\Block\Onepage(
-             $contextMock,
-@@ -57,7 +57,8 @@ class OnepageTest extends \PHPUnit\Framework\TestCase
-             $this->configProviderMock,
-             [$this->layoutProcessorMock],
-             [],
--            $this->serializer
-+            $this->serializerMock,
-+            $this->serializerMock
-         );
-     }
- 
-@@ -93,6 +94,7 @@ class OnepageTest extends \PHPUnit\Framework\TestCase
-         $processedLayout = ['layout' => ['processed' => true]];
-         $jsonLayout = '{"layout":{"processed":true}}';
-         $this->layoutProcessorMock->expects($this->once())->method('process')->with([])->willReturn($processedLayout);
-+        $this->serializerMock->expects($this->once())->method('serialize')->willReturn($jsonLayout);
- 
-         $this->assertEquals($jsonLayout, $this->model->getJsLayout());
-     }
-@@ -101,6 +103,7 @@ class OnepageTest extends \PHPUnit\Framework\TestCase
-     {
-         $checkoutConfig = ['checkout', 'config'];
-         $this->configProviderMock->expects($this->once())->method('getConfig')->willReturn($checkoutConfig);
-+        $this->serializerMock->expects($this->once())->method('serialize')->willReturn(json_encode($checkoutConfig));
- 
-         $this->assertEquals(json_encode($checkoutConfig), $this->model->getSerializedCheckoutConfig());
-     }
-diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/AddTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/AddTest.php
-new file mode 100644
-index 00000000000..7c0e542dd67
---- /dev/null
-+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/AddTest.php
-@@ -0,0 +1,91 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Checkout\Test\Unit\Controller\Cart;
-+
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+
-+class AddTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var ObjectManagerHelper
-+     */
-+    private $objectManagerHelper;
-+
-+    /**
-+     * @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $formKeyValidator;
-+
-+    /**
-+     * @var \Magento\Framework\Controller\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $resultRedirectFactory;
-+
-+    /**
-+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $request;
-+
-+    /**
-+     * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $messageManager;
-+
-+    /**
-+     * @var \Magento\Checkout\Controller\Cart\Add|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $cartAdd;
-+
-+    /**
-+     * Init mocks for tests.
-+     *
-+     * @return void
-+     */
-+    public function setUp()
-+    {
-+        $this->formKeyValidator = $this->getMockBuilder(\Magento\Framework\Data\Form\FormKey\Validator::class)
-+            ->disableOriginalConstructor()->getMock();
-+        $this->resultRedirectFactory =
-+            $this->getMockBuilder(\Magento\Framework\Controller\Result\RedirectFactory::class)
-+                ->disableOriginalConstructor()->getMock();
-+        $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
-+            ->disableOriginalConstructor()->getmock();
-+        $this->messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
-+            ->disableOriginalConstructor()->getMock();
-+
-+        $this->objectManagerHelper = new ObjectManagerHelper($this);
-+        $this->cartAdd = $this->objectManagerHelper->getObject(
-+            \Magento\Checkout\Controller\Cart\Add::class,
-+            [
-+                '_formKeyValidator' => $this->formKeyValidator,
-+                'resultRedirectFactory' => $this->resultRedirectFactory,
-+                '_request' => $this->request,
-+                'messageManager' => $this->messageManager
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test for method execute.
-+     *
-+     * @return void
-+     */
-+    public function testExecute()
-+    {
-+        $redirect = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $path = '*/*/';
-+
-+        $this->formKeyValidator->expects($this->once())->method('validate')->with($this->request)->willReturn(false);
-+        $this->messageManager->expects($this->once())->method('addErrorMessage');
-+        $this->resultRedirectFactory->expects($this->once())->method('create')->willReturn($redirect);
-+        $redirect->expects($this->once())->method('setPath')->with($path)->willReturnSelf();
-+        $this->assertEquals($redirect, $this->cartAdd->execute());
-+    }
-+}
-diff --git a/app/code/Magento/Checkout/Test/Unit/CustomerData/CartTest.php b/app/code/Magento/Checkout/Test/Unit/CustomerData/CartTest.php
-index 75e181cbabd..e3e13cc5b1e 100644
---- a/app/code/Magento/Checkout/Test/Unit/CustomerData/CartTest.php
-+++ b/app/code/Magento/Checkout/Test/Unit/CustomerData/CartTest.php
-@@ -113,7 +113,7 @@ class CartTest extends \PHPUnit\Framework\TestCase
- 
-         $storeMock = $this->createPartialMock(\Magento\Store\Model\System\Store::class, ['getWebsiteId']);
-         $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
--        $quoteMock->expects($this->once())->method('getStore')->willReturn($storeMock);
-+        $quoteMock->expects($this->any())->method('getStore')->willReturn($storeMock);
- 
-         $productMock = $this->createPartialMock(
-             \Magento\Catalog\Model\Product::class,
-@@ -162,6 +162,7 @@ class CartTest extends \PHPUnit\Framework\TestCase
-             'isGuestCheckoutAllowed' => 1,
-             'website_id' => $websiteId,
-             'subtotalAmount' => 200,
-+            'storeId' => null
-         ];
-         $this->assertEquals($expectedResult, $this->model->getSectionData());
-     }
-@@ -199,7 +200,7 @@ class CartTest extends \PHPUnit\Framework\TestCase
- 
-         $storeMock = $this->createPartialMock(\Magento\Store\Model\System\Store::class, ['getWebsiteId']);
-         $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
--        $quoteMock->expects($this->once())->method('getStore')->willReturn($storeMock);
-+        $quoteMock->expects($this->any())->method('getStore')->willReturn($storeMock);
- 
-         $this->checkoutCartMock->expects($this->once())->method('getSummaryQty')->willReturn($summaryQty);
-         $this->checkoutHelperMock->expects($this->once())
-@@ -265,6 +266,7 @@ class CartTest extends \PHPUnit\Framework\TestCase
-             'isGuestCheckoutAllowed' => 1,
-             'website_id' => $websiteId,
-             'subtotalAmount' => 200,
-+            'storeId' => null
-         ];
-         $this->assertEquals($expectedResult, $this->model->getSectionData());
-     }
-diff --git a/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php b/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php
-index 53132ffaa74..089ea15726c 100644
---- a/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php
-+++ b/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php
-@@ -179,7 +179,7 @@ class DataTest extends \PHPUnit\Framework\TestCase
- 
-     public function testCanOnepageCheckout()
-     {
--        $this->scopeConfig->expects($this->once())->method('getValue')->with(
-+        $this->scopeConfig->expects($this->once())->method('isSetFlag')->with(
-             'checkout/options/onepage_checkout_enabled',
-             'store'
-         )->will($this->returnValue(true));
-diff --git a/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php b/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php
-index 6bd0bdf258a..bc66324c298 100644
---- a/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php
-+++ b/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php
-@@ -318,6 +318,12 @@ class CartTest extends \PHPUnit\Framework\TestCase
-         $this->productRepository->expects($this->any())
-             ->method('getById')
-             ->will($this->returnValue($product));
-+
-+        $this->eventManagerMock->expects($this->at(0))->method('dispatch')->with(
-+            'checkout_cart_product_add_before',
-+            ['info' => $requestInfo, 'product' => $product]
-+        );
-+
-         $this->quoteMock->expects($this->once())
-         ->method('addProduct')
-         ->will($this->returnValue(1));
-@@ -325,7 +331,7 @@ class CartTest extends \PHPUnit\Framework\TestCase
-             ->method('getQuote')
-             ->will($this->returnValue($this->quoteMock));
- 
--        $this->eventManagerMock->expects($this->at(0))->method('dispatch')->with(
-+        $this->eventManagerMock->expects($this->at(1))->method('dispatch')->with(
-             'checkout_cart_product_add_after',
-             ['quote_item' => 1, 'product' => $product]
-         );
-@@ -363,6 +369,12 @@ class CartTest extends \PHPUnit\Framework\TestCase
-         $this->productRepository->expects($this->any())
-             ->method('getById')
-             ->will($this->returnValue($product));
-+
-+        $this->eventManagerMock->expects($this->once())->method('dispatch')->with(
-+            'checkout_cart_product_add_before',
-+            ['info' => 4, 'product' => $product]
-+        );
-+
-         $this->quoteMock->expects($this->once())
-             ->method('addProduct')
-             ->will($this->returnValue('error'));
-@@ -370,10 +382,6 @@ class CartTest extends \PHPUnit\Framework\TestCase
-             ->method('getQuote')
-             ->will($this->returnValue($this->quoteMock));
- 
--        $this->eventManagerMock->expects($this->never())->method('dispatch')->with(
--            'checkout_cart_product_add_after',
--            ['quote_item' => 1, 'product' => $product]
--        );
-         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-         $this->cart->addProduct(4, 4);
-     }
-@@ -399,6 +407,11 @@ class CartTest extends \PHPUnit\Framework\TestCase
-             ->method('getById')
-             ->will($this->returnValue($product));
- 
-+        $this->eventManagerMock->expects($this->never())->method('dispatch')->with(
-+            'checkout_cart_product_add_before',
-+            ['info' => 'bad', 'product' => $product]
-+        );
-+
-         $this->eventManagerMock->expects($this->never())->method('dispatch')->with(
-             'checkout_cart_product_add_after',
-             ['quote_item' => 1, 'product' => $product]
-diff --git a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
-index 853ae0157e6..1de0ebce10f 100644
---- a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
-+++ b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
-@@ -273,7 +273,7 @@ class GuestPaymentInformationManagementTest extends \PHPUnit\Framework\TestCase
-      */
-     private function getMockForAssignBillingAddress(
-         int $cartId,
--        \PHPUnit_Framework_MockObject_MockObject  $billingAddressMock
-+        \PHPUnit_Framework_MockObject_MockObject $billingAddressMock
-     ) : void {
-         $quoteIdMask = $this->createPartialMock(QuoteIdMask::class, ['getQuoteId', 'load']);
-         $this->quoteIdMaskFactoryMock->method('create')
-@@ -287,9 +287,11 @@ class GuestPaymentInformationManagementTest extends \PHPUnit\Framework\TestCase
-         $billingAddressId = 1;
-         $quote = $this->createMock(Quote::class);
-         $quoteBillingAddress = $this->createMock(Address::class);
-+        $shippingRate = $this->createPartialMock(\Magento\Quote\Model\Quote\Address\Rate::class, []);
-+        $shippingRate->setCarrier('flatrate');
-         $quoteShippingAddress = $this->createPartialMock(
-             Address::class,
--            ['setLimitCarrier', 'getShippingMethod']
-+            ['setLimitCarrier', 'getShippingMethod', 'getShippingRateByCode']
-         );
-         $this->cartRepositoryMock->method('getActive')
-             ->with($cartId)
-@@ -309,6 +311,9 @@ class GuestPaymentInformationManagementTest extends \PHPUnit\Framework\TestCase
-         $quote->expects($this->once())
-             ->method('setBillingAddress')
-             ->with($billingAddressMock);
-+        $quoteShippingAddress->expects($this->any())
-+            ->method('getShippingRateByCode')
-+            ->willReturn($shippingRate);
-         $quote->expects($this->once())
-             ->method('setDataChanges')
-             ->willReturnSelf();
-diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php
-index 350f9954208..3cc80e14fd0 100644
---- a/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php
-+++ b/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php
-@@ -43,7 +43,7 @@ class DepersonalizePluginTest extends \PHPUnit\Framework\TestCase
-         );
-         $this->checkoutSessionMock = $this->createPartialMock(\Magento\Checkout\Model\Session::class, ['clearStorage']);
-         $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
--        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\Manager::class);
-+        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\ModuleManagerInterface::class);
-         $this->cacheConfigMock = $this->createMock(\Magento\PageCache\Model\Config::class);
-         $this->depersonalizeCheckerMock = $this->createMock(\Magento\PageCache\Model\DepersonalizeChecker::class);
- 
-diff --git a/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
-index 77c15fccfa8..df5c255398e 100644
---- a/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
-+++ b/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
-@@ -163,6 +163,31 @@ class PaymentInformationManagementTest extends \PHPUnit\Framework\TestCase
-         $this->model->savePaymentInformationAndPlaceOrder($cartId, $paymentMock, $billingAddressMock);
-     }
- 
-+    /**
-+     * Test for save payment and place order with new billing address
-+     *
-+     * @return void
-+     */
-+    public function testSavePaymentInformationAndPlaceOrderWithNewBillingAddress(): void
-+    {
-+        $cartId = 100;
-+        $quoteBillingAddressId = 1;
-+        $customerId = 1;
-+        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-+        $quoteBillingAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
-+        $billingAddressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
-+        $paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class);
-+
-+        $quoteBillingAddress->method('getCustomerId')->willReturn($customerId);
-+        $quoteMock->method('getBillingAddress')->willReturn($quoteBillingAddress);
-+        $quoteBillingAddress->method('getId')->willReturn($quoteBillingAddressId);
-+        $this->cartRepositoryMock->method('getActive')->with($cartId)->willReturn($quoteMock);
-+        
-+        $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
-+        $billingAddressMock->expects($this->once())->method('setCustomerId')->with($customerId);
-+        $this->assertTrue($this->model->savePaymentInformation($cartId, $paymentMock, $billingAddressMock));
-+    }
-+
-     /**
-      * @param int $cartId
-      * @param \PHPUnit_Framework_MockObject_MockObject $billingAddressMock
-@@ -172,17 +197,21 @@ class PaymentInformationManagementTest extends \PHPUnit\Framework\TestCase
-         $billingAddressId = 1;
-         $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-         $quoteBillingAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
-+        $shippingRate = $this->createPartialMock(\Magento\Quote\Model\Quote\Address\Rate::class, []);
-+        $shippingRate->setCarrier('flatrate');
-         $quoteShippingAddress = $this->createPartialMock(
-             \Magento\Quote\Model\Quote\Address::class,
--            ['setLimitCarrier', 'getShippingMethod']
-+            ['setLimitCarrier', 'getShippingMethod', 'getShippingRateByCode']
-         );
-         $this->cartRepositoryMock->expects($this->any())->method('getActive')->with($cartId)->willReturn($quoteMock);
--        $quoteMock->expects($this->once())->method('getBillingAddress')->willReturn($quoteBillingAddress);
-+        $quoteMock->method('getBillingAddress')->willReturn($quoteBillingAddress);
-         $quoteMock->expects($this->once())->method('getShippingAddress')->willReturn($quoteShippingAddress);
-         $quoteBillingAddress->expects($this->once())->method('getId')->willReturn($billingAddressId);
-+        $quoteBillingAddress->expects($this->once())->method('getId')->willReturn($billingAddressId);
-         $quoteMock->expects($this->once())->method('removeAddress')->with($billingAddressId);
-         $quoteMock->expects($this->once())->method('setBillingAddress')->with($billingAddressMock);
-         $quoteMock->expects($this->once())->method('setDataChanges')->willReturnSelf();
-+        $quoteShippingAddress->expects($this->any())->method('getShippingRateByCode')->willReturn($shippingRate);
-         $quoteShippingAddress->expects($this->any())->method('getShippingMethod')->willReturn('flatrate_flatrate');
-         $quoteShippingAddress->expects($this->once())->method('setLimitCarrier')->with('flatrate')->willReturnSelf();
-     }
-diff --git a/app/code/Magento/Checkout/Test/Unit/Model/SidebarTest.php b/app/code/Magento/Checkout/Test/Unit/Model/SidebarTest.php
-index a196b10478c..ff7340f87f3 100644
---- a/app/code/Magento/Checkout/Test/Unit/Model/SidebarTest.php
-+++ b/app/code/Magento/Checkout/Test/Unit/Model/SidebarTest.php
-@@ -98,7 +98,7 @@ class SidebarTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @exceptedExceptionMessage The quote item isn't found. Verify the item and try again.
-+     * @expectedExceptionMessage The quote item isn't found. Verify the item and try again.
-      */
-     public function testCheckQuoteItemWithException()
-     {
-diff --git a/app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php b/app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php
-index 6070bb5d424..dabaf173d90 100644
---- a/app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php
-+++ b/app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php
-@@ -30,13 +30,14 @@ class SalesQuoteSaveAfterObserverTest extends \PHPUnit\Framework\TestCase
- 
-     public function testSalesQuoteSaveAfter()
-     {
-+        $quoteId = 7;
-         $observer = $this->createMock(\Magento\Framework\Event\Observer::class);
-         $observer->expects($this->once())->method('getEvent')->will(
-             $this->returnValue(new \Magento\Framework\DataObject(
--                ['quote' => new \Magento\Framework\DataObject(['is_checkout_cart' => 1, 'id' => 7])]
-+                ['quote' => new \Magento\Framework\DataObject(['is_checkout_cart' => 1, 'id' => $quoteId])]
-             ))
-         );
--        $this->checkoutSession->expects($this->once())->method('getQuoteId')->with(7);
-+        $this->checkoutSession->expects($this->once())->method('setQuoteId')->with($quoteId);
- 
-         $this->object->execute($observer);
-     }
-diff --git a/app/code/Magento/Checkout/etc/di.xml b/app/code/Magento/Checkout/etc/di.xml
-index 71dfd12bb47..4ebd594a285 100644
---- a/app/code/Magento/Checkout/etc/di.xml
-+++ b/app/code/Magento/Checkout/etc/di.xml
-@@ -49,7 +49,4 @@
-             </argument>
-         </arguments>
-     </type>
--    <type name="Magento\Quote\Model\Quote">
--        <plugin name="clear_addresses_after_product_delete" type="Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses"/>
--    </type>
- </config>
-diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
-index f2aced01b39..8f35fe9f37a 100644
---- a/app/code/Magento/Checkout/etc/frontend/di.xml
-+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
-@@ -59,6 +59,7 @@
-                 <item name="totalsSortOrder" xsi:type="object">Magento\Checkout\Block\Checkout\TotalsProcessor</item>
-                 <item name="directoryData" xsi:type="object">Magento\Checkout\Block\Checkout\DirectoryDataProcessor</item>
-             </argument>
-+            <argument name="serializer" xsi:type="object">Magento\Framework\Serialize\Serializer\JsonHexTag</argument>
-         </arguments>
-     </type>
-     <type name="Magento\Checkout\Block\Cart\Totals">
-@@ -83,4 +84,19 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Framework\View\Element\Message\MessageConfigurationsPool">
-+        <arguments>
-+            <argument name="configurationsMap" xsi:type="array">
-+                <item name="addCartSuccessMessage" xsi:type="array">
-+                    <item name="renderer" xsi:type="const">\Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE</item>
-+                    <item name="data" xsi:type="array">
-+                        <item name="template" xsi:type="string">Magento_Checkout::messages/addCartSuccessMessage.phtml</item>
-+                    </item>
-+                </item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Quote\Model\Quote">
-+        <plugin name="clear_addresses_after_product_delete" type="Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses"/>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Checkout/etc/frontend/sections.xml b/app/code/Magento/Checkout/etc/frontend/sections.xml
-index 35733a6119a..90c2878f501 100644
---- a/app/code/Magento/Checkout/etc/frontend/sections.xml
-+++ b/app/code/Magento/Checkout/etc/frontend/sections.xml
-@@ -46,7 +46,6 @@
-     </action>
-     <action name="rest/*/V1/guest-carts/*/payment-information">
-         <section name="cart"/>
--        <section name="checkout-data"/>
-     </action>
-     <action name="rest/*/V1/guest-carts/*/selected-payment-method">
-         <section name="cart"/>
-diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
-index a6ea2c13579..7f2f0b43903 100644
---- a/app/code/Magento/Checkout/i18n/en_US.csv
-+++ b/app/code/Magento/Checkout/i18n/en_US.csv
-@@ -182,3 +182,4 @@ Payment,Payment
- "Items in Cart","Items in Cart"
- "Close","Close"
- "Show Cross-sell Items in the Shopping Cart","Show Cross-sell Items in the Shopping Cart"
-+"You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>."
-\ No newline at end of file
-diff --git a/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html b/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
-index fb55f9b601d..03ad7d9e8d8 100644
---- a/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
-+++ b/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
-@@ -23,43 +23,43 @@
- 
- <ul>
-     <li>
--        <b>{{trans "Reason"}}</b><br />
-+        <strong>{{trans "Reason"}}</strong><br />
-         {{var reason}}
-     </li>
-     <li>
--        <b>{{trans "Checkout Type"}}</b><br />
-+        <strong>{{trans "Checkout Type"}}</strong><br />
-         {{var checkoutType}}
-     </li>
-     <li>
--        <b>{{trans "Customer:"}}</b><br />
-+        <strong>{{trans "Customer:"}}</strong><br />
-         <a href="mailto:{{var customerEmail}}">{{var customer}}</a> &lt;{{var customerEmail}}&gt;
-     </li>
-     <li>
--        <b>{{trans "Items"}}</b><br />
-+        <strong>{{trans "Items"}}</strong><br />
-         {{var items|raw}}
-     </li>
-     <li>
--        <b>{{trans "Total:"}}</b><br />
-+        <strong>{{trans "Total:"}}</strong><br />
-         {{var total}}
-     </li>
-     <li>
--        <b>{{trans "Billing Address:"}}</b><br />
-+        <strong>{{trans "Billing Address:"}}</strong><br />
-         {{var billingAddress.format('html')|raw}}
-     </li>
-     <li>
--        <b>{{trans "Shipping Address:"}}</b><br />
-+        <strong>{{trans "Shipping Address:"}}</strong><br />
-         {{var shippingAddress.format('html')|raw}}
-     </li>
-     <li>
--        <b>{{trans "Shipping Method:"}}</b><br />
-+        <strong>{{trans "Shipping Method:"}}</strong><br />
-         {{var shippingMethod}}
-     </li>
-     <li>
--        <b>{{trans "Payment Method:"}}</b><br />
-+        <strong>{{trans "Payment Method:"}}</strong><br />
-         {{var paymentMethod}}
-     </li>
-     <li>
--        <b>{{trans "Date & Time:"}}</b><br />
-+        <strong>{{trans "Date & Time:"}}</strong><br />
-         {{var dateAndTime}}
-     </li>
- </ul>
-diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
-index d4fadedf5d7..a305413bcf1 100644
---- a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
-+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
-@@ -105,7 +105,7 @@
-                                                                     <item name="trigger" xsi:type="string">opc-new-shipping-address</item>
-                                                                     <item name="buttons" xsi:type="array">
-                                                                         <item name="save" xsi:type="array">
--                                                                            <item name="text" xsi:type="string" translate="true">Save Address</item>
-+                                                                            <item name="text" xsi:type="string" translate="true">Ship here</item>
-                                                                             <item name="class" xsi:type="string">action primary action-save-address</item>
-                                                                         </item>
-                                                                         <item name="cancel" xsi:type="array">
-@@ -404,6 +404,10 @@
-                                                                         <item name="component" xsi:type="string">Magento_Checkout/js/view/summary/item/details/subtotal</item>
-                                                                         <item name="displayArea" xsi:type="string">after_details</item>
-                                                                     </item>
-+                                                                    <item name="message" xsi:type="array">
-+                                                                        <item name="component" xsi:type="string">Magento_Checkout/js/view/summary/item/details/message</item>
-+                                                                        <item name="displayArea" xsi:type="string">item_message</item>
-+                                                                    </item>
-                                                                 </item>
-                                                             </item>
-                                                         </item>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/button.phtml b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
-index c3edfe30f8b..b0087794ea8 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/button.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
-@@ -3,15 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?>
- 
- <?php if ($block->getCanViewOrder() && $block->getCanPrintOrder()) :?>
--    <a href="<?= /* @escapeNotVerified */ $block->getPrintUrl() ?>" target="_blank" class="print">
--        <?= /* @escapeNotVerified */ __('Print receipt') ?>
-+    <a href="<?= $block->escapeUrl($block->getPrintUrl()) ?>" target="_blank" class="print">
-+        <?= $block->escapeHtml(__('Print receipt')) ?>
-     </a>
-     <?= $block->getChildHtml() ?>
- <?php endif;?>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart.phtml
-index 929f053febf..e71ea8c6628 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart.phtml
-@@ -12,7 +12,9 @@
-  */
- 
- if ($block->getItemsCount()) {
-+    // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
-     echo $block->getChildHtml('with-items');
- } else {
-+    // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
-     echo $block->getChildHtml('no-items');
- }
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/additional/info.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/additional/info.phtml
-index cb92e62f1f0..b807a6db019 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart/additional/info.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/additional/info.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -16,6 +14,7 @@
- <?php
- $name = $block->getNameInLayout();
- foreach ($block->getChildNames($name) as $childName) {
-+    // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
-     echo $block->getChildBlock($childName)->setItem($block->getItem())->toHtml();
- }
- ?>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
-index 1d67b325e01..4522500d395 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
-@@ -4,16 +4,17 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
--<div class="block discount" id="block-discount" data-mage-init='{"collapsible":{"openedState": "active", "saveState": false}}'>
-+<div class="block discount"
-+     id="block-discount"
-+     data-mage-init='{"collapsible":{"openedState": "active", "saveState": false}}'
-+>
-     <div class="title" data-role="title">
--        <strong id="block-discount-heading" role="heading" aria-level="2"><?= /* @escapeNotVerified */ __('Apply Discount Code') ?></strong>
-+        <strong id="block-discount-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Apply Discount Code')) ?></strong>
-     </div>
-     <div class="content" data-role="content" aria-labelledby="block-discount-heading">
-         <form id="discount-coupon-form"
--              action="<?= /* @escapeNotVerified */ $block->getUrl('checkout/cart/couponPost') ?>"
-+              action="<?= $block->escapeUrl($block->getUrl('checkout/cart/couponPost')) ?>"
-               method="post"
-               data-mage-init='{"discountCode":{"couponCodeSelector": "#coupon_code",
-                                                "removeCouponSelector": "#remove-coupon",
-@@ -22,21 +23,30 @@
-             <div class="fieldset coupon<?= strlen($block->getCouponCode()) ? ' applied' : '' ?>">
-                 <input type="hidden" name="remove" id="remove-coupon" value="0" />
-                 <div class="field">
--                    <label for="coupon_code" class="label"><span><?= /* @escapeNotVerified */ __('Enter discount code') ?></span></label>
-+                    <label for="coupon_code" class="label"><span><?= $block->escapeHtml(__('Enter discount code')) ?></span></label>
-                     <div class="control">
--                        <input type="text" class="input-text" id="coupon_code" name="coupon_code" value="<?= $block->escapeHtml($block->getCouponCode()) ?>" placeholder="<?= $block->escapeHtml(__('Enter discount code')) ?>" <?php if (strlen($block->getCouponCode())): ?> disabled="disabled" <?php endif; ?> />
-+                        <input type="text"
-+                               class="input-text"
-+                               id="coupon_code"
-+                               name="coupon_code"
-+                               value="<?= $block->escapeHtmlAttr($block->getCouponCode()) ?>"
-+                               placeholder="<?= $block->escapeHtmlAttr(__('Enter discount code')) ?>"
-+                                <?php if (strlen($block->getCouponCode())) :?>
-+                                   disabled="disabled"
-+                                <?php endif; ?>
-+                        />
-                     </div>
-                 </div>
-                 <div class="actions-toolbar">
--                    <?php if (!strlen($block->getCouponCode())): ?>
-+                    <?php if (!strlen($block->getCouponCode())) :?>
-                     <div class="primary">
--                        <button class="action apply primary" type="button" value="<?= /* @escapeNotVerified */ __('Apply Discount') ?>">
--                            <span><?= /* @escapeNotVerified */ __('Apply Discount') ?></span>
-+                        <button class="action apply primary" type="button" value="<?= $block->escapeHtmlAttr(__('Apply Discount')) ?>">
-+                            <span><?= $block->escapeHtml(__('Apply Discount')) ?></span>
-                         </button>
-                     </div>
--                    <?php else: ?>
-+                    <?php else :?>
-                         <div class="primary">
--                            <button  type="button" class="action cancel primary" value="<?= /* @escapeNotVerified */ __('Cancel Coupon') ?>"><span><?= /* @escapeNotVerified */ __('Cancel Coupon') ?></span></button>
-+                            <button  type="button" class="action cancel primary" value="<?= $block->escapeHtmlAttr(__('Cancel Coupon')) ?>"><span><?= $block->escapeHtml(__('Cancel Coupon')) ?></span></button>
-                         </div>
-                     <?php endif; ?>
-                 </div>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
-index 71b1392d539..e1ab036c7d8 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
-@@ -4,51 +4,56 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /**  @var $block \Magento\Checkout\Block\Cart\Grid */
- ?>
--<?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
-+<?php $mergedCells = ($this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices() ? 2 : 1); ?>
- <?= $block->getChildHtml('form_before') ?>
--<form action="<?= /* @escapeNotVerified */ $block->getUrl('checkout/cart/updatePost') ?>"
-+<form action="<?= $block->escapeUrl($block->getUrl('checkout/cart/updatePost')) ?>"
-           method="post"
-           id="form-validate"
-           data-mage-init='{"Magento_Checkout/js/action/update-shopping-cart":
--              {"validationURL" : "/checkout/cart/updateItemQty"}
-+              {"validationURL" : "<?= $block->escapeUrl($block->getUrl('checkout/cart/updateItemQty')) ?>",
-+              "updateCartActionContainer": "#update_cart_action_container"}
-           }'
-           class="form form-cart">
-     <?= $block->getBlockHtml('formkey') ?>
-     <div class="cart table-wrapper<?= $mergedCells == 2 ? ' detailed' : '' ?>">
--        <?php if ($block->getPagerHtml()): ?>
--            <div class="cart-products-toolbar cart-products-toolbar-top toolbar" data-attribute="cart-products-toolbar-top"><?= $block->getPagerHtml() ?></div>
-+        <?php if ($block->getPagerHtml()) :?>
-+            <div class="cart-products-toolbar cart-products-toolbar-top toolbar"
-+                 data-attribute="cart-products-toolbar-top"><?= $block->getPagerHtml() ?>
-+            </div>
-         <?php endif ?>
-         <table id="shopping-cart-table"
-                class="cart items data table"
--               data-mage-init='{"shoppingCart":{"emptyCartButton": "action.clear",
-+               data-mage-init='{"shoppingCart":{"emptyCartButton": ".action.clear",
-                "updateCartActionContainer": "#update_cart_action_container"}}'>
--            <caption role="heading" aria-level="2" class="table-caption"><?= /* @escapeNotVerified */ __('Shopping Cart Items') ?></caption>
-+            <caption class="table-caption"><?= $block->escapeHtml(__('Shopping Cart Items')) ?></caption>
-             <thead>
-                 <tr>
--                    <th class="col item" scope="col"><span><?= /* @escapeNotVerified */ __('Item') ?></span></th>
--                    <th class="col price" scope="col"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
--                    <th class="col qty" scope="col"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
--                    <th class="col subtotal" scope="col"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
-+                    <th class="col item" scope="col"><span><?= $block->escapeHtml(__('Item')) ?></span></th>
-+                    <th class="col price" scope="col"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
-+                    <th class="col qty" scope="col"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
-+                    <th class="col subtotal" scope="col"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
-                 </tr>
-             </thead>
--            <?php foreach ($block->getItems() as $_item): ?>
-+            <?php foreach ($block->getItems() as $_item) :?>
-                 <?= $block->getItemHtml($_item) ?>
-             <?php endforeach ?>
-         </table>
--        <?php if ($block->getPagerHtml()): ?>
--            <div class="cart-products-toolbar cart-products-toolbar-bottom toolbar" data-attribute="cart-products-toolbar-bottom"><?= $block->getPagerHtml() ?></div>
-+        <?php if ($block->getPagerHtml()) :?>
-+            <div class="cart-products-toolbar cart-products-toolbar-bottom toolbar"
-+                 data-attribute="cart-products-toolbar-bottom"><?= $block->getPagerHtml() ?>
-+            </div>
-         <?php endif ?>
-     </div>
-     <div class="cart main actions">
--        <?php if ($block->getContinueShoppingUrl()): ?>
-+        <?php if ($block->getContinueShoppingUrl()) :?>
-             <a class="action continue"
-                href="<?= $block->escapeUrl($block->getContinueShoppingUrl()) ?>"
-                title="<?= $block->escapeHtml(__('Continue Shopping')) ?>">
--                <span><?= /* @escapeNotVerified */ __('Continue Shopping') ?></span>
-+                <span><?= $block->escapeHtml(__('Continue Shopping')) ?></span>
-             </a>
-         <?php endif; ?>
-         <button type="submit"
-@@ -57,7 +62,7 @@
-                 value="empty_cart"
-                 title="<?= $block->escapeHtml(__('Clear Shopping Cart')) ?>"
-                 class="action clear" id="empty_cart_button">
--            <span><?= /* @escapeNotVerified */ __('Clear Shopping Cart') ?></span>
-+            <span><?= $block->escapeHtml(__('Clear Shopping Cart')) ?></span>
-         </button>
-         <button type="submit"
-                 name="update_cart_action"
-@@ -65,7 +70,7 @@
-                 value="update_qty"
-                 title="<?= $block->escapeHtml(__('Update Shopping Cart')) ?>"
-                 class="action update">
--            <span><?= /* @escapeNotVerified */ __('Update Shopping Cart') ?></span>
-+            <span><?= $block->escapeHtml(__('Update Shopping Cart')) ?></span>
-         </button>
-         <input type="hidden" value="" id="update_cart_action_container" data-cart-item-update=""/>
-     </div>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
-index c1db2f7775c..3b09512eb50 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
-@@ -4,24 +4,23 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Catalog\Block\Product\View */
- ?>
- <?php $_product = $block->getProduct(); ?>
- <?php $buttonTitle = __('Update Cart'); ?>
--<?php if ($_product->isSaleable()): ?>
-+<?php if ($_product->isSaleable()) :?>
-     <div class="box-tocart update">
-         <fieldset class="fieldset">
--            <?php if ($block->shouldRenderQuantity()): ?>
-+            <?php if ($block->shouldRenderQuantity()) :?>
-             <div class="field qty">
--                <label class="label" for="qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></label>
-+                <label class="label" for="qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></label>
-                 <div class="control">
-                     <input type="number"
-                            name="qty"
-                            id="qty"
-+                           min="0"
-                            value=""
--                           title="<?= /* @escapeNotVerified */ __('Qty') ?>"
-+                           title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
-                            class="input-text qty"
-                            data-validate="<?= $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"/>
-                 </div>
-@@ -29,10 +28,10 @@
-             <?php endif; ?>
-             <div class="actions">
-                 <button type="submit"
--                        title="<?= /* @escapeNotVerified */ $buttonTitle ?>"
-+                        title="<?= $block->escapeHtmlAttr($buttonTitle) ?>"
-                         class="action primary tocart"
-                         id="product-updatecart-button">
--                    <span><?= /* @escapeNotVerified */ $buttonTitle ?></span>
-+                    <span><?= $block->escapeHtml($buttonTitle) ?></span>
-                 </button>
-                 <?= $block->getChildHtml('', true) ?>
-             </div>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
-index 0567c61f0db..77dde1eab48 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
-@@ -4,7 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
-+// phpcs:disable Magento2.Files.LineLength.MaxExceeded
- 
- /** @var $block \Magento\Checkout\Block\Cart\Item\Renderer */
- 
-@@ -12,108 +13,118 @@ $_item = $block->getItem();
- $product = $_item->getProduct();
- $isVisibleProduct = $product->isVisibleInSiteVisibility();
- /** @var \Magento\Msrp\Helper\Data $helper */
--$helper = $this->helper('Magento\Msrp\Helper\Data');
-+$helper = $this->helper(Magento\Msrp\Helper\Data::class);
- $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinimalPriceLessMsrp($product);
- ?>
- <tbody class="cart item">
-     <tr class="item-info">
-         <td data-th="<?= $block->escapeHtml(__('Item')) ?>" class="col item">
--            <?php if ($block->hasProductUrl()):?>
--                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl() ?>"
-+            <?php if ($block->hasProductUrl()) :?>
-+                <a href="<?= $block->escapeUrl($block->getProductUrl()) ?>"
-                    title="<?= $block->escapeHtml($block->getProductName()) ?>"
-                    tabindex="-1"
-                    class="product-item-photo">
--            <?php else:?>
-+            <?php else :?>
-                 <span class="product-item-photo">
-             <?php endif;?>
-             <?= $block->getImage($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml() ?>
--            <?php if ($block->hasProductUrl()):?>
-+            <?php if ($block->hasProductUrl()) :?>
-                 </a>
--            <?php else: ?>
-+            <?php else :?>
-                 </span>
-             <?php endif; ?>
-             <div class="product-item-details">
-                 <strong class="product-item-name">
--                    <?php if ($block->hasProductUrl()):?>
--                        <a href="<?= /* @escapeNotVerified */ $block->getProductUrl() ?>"><?= $block->escapeHtml($block->getProductName()) ?></a>
--                    <?php else: ?>
-+                    <?php if ($block->hasProductUrl()) :?>
-+                        <a href="<?= $block->escapeUrl($block->getProductUrl()) ?>"><?= $block->escapeHtml($block->getProductName()) ?></a>
-+                    <?php else :?>
-                         <?= $block->escapeHtml($block->getProductName()) ?>
-                     <?php endif; ?>
-                 </strong>
--                <?php if ($_options = $block->getOptionList()):?>
-+                <?php if ($_options = $block->getOptionList()) :?>
-                     <dl class="item-options">
--                        <?php foreach ($_options as $_option) : ?>
-+                        <?php foreach ($_options as $_option) :?>
-                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                             <dd>
--                                <?php if (isset($_formatedOptionValue['full_view'])): ?>
--                                    <?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?>
--                                <?php else: ?>
--                                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-+                                <?php if (isset($_formatedOptionValue['full_view'])) :?>
-+                                    <?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
-+                                <?php else :?>
-+                                    <?= $block->escapeHtml($_formatedOptionValue['value'], ['span']) ?>
-                                 <?php endif; ?>
-                             </dd>
-                         <?php endforeach; ?>
-                     </dl>
-                 <?php endif;?>
--                <?php if ($messages = $block->getMessages()): ?>
--                    <?php foreach ($messages as $message): ?>
--                        <div class="cart item message <?= /* @escapeNotVerified */ $message['type'] ?>"><div><?= $block->escapeHtml($message['text']) ?></div></div>
-+                <?php if ($messages = $block->getMessages()) :?>
-+                    <?php foreach ($messages as $message) :?>
-+                        <div class= "cart item message <?= $block->escapeHtmlAttr($message['type']) ?>">
-+                            <div><?= $block->escapeHtml($message['text']) ?></div>
-+                        </div>
-                     <?php endforeach; ?>
-                 <?php endif; ?>
-                 <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
--                <?php if ($addInfoBlock): ?>
-+                <?php if ($addInfoBlock) :?>
-                     <?= $addInfoBlock->setItem($_item)->toHtml() ?>
-                 <?php endif;?>
-             </div>
-         </td>
- 
--        <?php if ($canApplyMsrp): ?>
-+        <?php if ($canApplyMsrp) :?>
-             <td class="col msrp" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-                 <span class="pricing msrp">
--                    <span class="msrp notice"><?= /* @escapeNotVerified */ __('See price before order confirmation.') ?></span>
-+                    <span class="msrp notice"><?= $block->escapeHtml(__('See price before order confirmation.')) ?></span>
-                     <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
--                    <a href="#" class="action help map" id="<?= /* @escapeNotVerified */ ($helpLinkId) ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?= /* @escapeNotVerified */ $helpLinkId ?>","productName": "<?= /* @escapeNotVerified */ $product->getName() ?>","showAddToCart": false}}'>
--                        <span><?= /* @escapeNotVerified */ __("What's this?") ?></span>
-+                    <a href="#" class="action help map"
-+                       id="<?= ($block->escapeHtmlAttr($helpLinkId)) ?>"
-+                       data-mage-init='{"addToCart":{
-+                                            "helpLinkId": "#<?= $block->escapeJs($block->escapeHtml($helpLinkId)) ?>",
-+                                            "productName": "<?= $block->escapeJs($block->escapeHtml($product->getName())) ?>",
-+                                            "showAddToCart": false
-+                                            }
-+                                        }'
-+                    >
-+                        <span><?= $block->escapeHtml(__("What's this?")) ?></span>
-                     </a>
-                 </span>
-             </td>
--        <?php else: ?>
-+        <?php else :?>
-             <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-                 <?= $block->getUnitPriceHtml($_item) ?>
-             </td>
-         <?php endif; ?>
-         <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
-             <div class="field qty">
--                <label class="label" for="cart-<?= /* @escapeNotVerified */ $_item->getId() ?>-qty">
--                    <span><?= /* @escapeNotVerified */ __('Qty') ?></span>
--                </label>
-                 <div class="control qty">
--                    <input id="cart-<?= /* @escapeNotVerified */ $_item->getId() ?>-qty"
--                           name="cart[<?= /* @escapeNotVerified */ $_item->getId() ?>][qty]"
--                           data-cart-item-id="<?= $block->escapeHtml($_item->getSku()) ?>"
--                           value="<?= /* @escapeNotVerified */ $block->getQty() ?>"
--                           type="number"
--                           size="4"
--                           title="<?= $block->escapeHtml(__('Qty')) ?>"
--                           class="input-text qty"
--                           data-validate="{required:true,'validate-greater-than-zero':true}"
--                           data-role="cart-item-qty"/>
-+                    <label for="cart-<?= $block->escapeHtmlAttr($_item->getId()) ?>-qty">
-+                        <span class="label"><?= $block->escapeHtml(__('Qty')) ?></span>
-+                        <input id="cart-<?= $block->escapeHtmlAttr($_item->getId()) ?>-qty"
-+                               name="cart[<?= $block->escapeHtmlAttr($_item->getId()) ?>][qty]"
-+                               data-cart-item-id="<?= $block->escapeHtmlAttr($_item->getSku()) ?>"
-+                               value="<?= $block->escapeHtmlAttr($block->getQty()) ?>"
-+                               type="number"
-+                               size="4"
-+                               title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
-+                               class="input-text qty"
-+                               data-validate="{required:true,'validate-greater-than-zero':true}"
-+                               data-role="cart-item-qty"/>
-+                    </label>
-                 </div>
-             </div>
-         </td>
- 
-         <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
--            <?php if ($canApplyMsrp): ?>
-+            <?php if ($canApplyMsrp) :?>
-                 <span class="cart msrp subtotal">--</span>
--            <?php else: ?>
-+            <?php else :?>
-                 <?= $block->getRowTotalHtml($_item) ?>
-             <?php endif; ?>
-         </td>
-     </tr>
-     <tr class="item-actions">
--        <td colspan="100">
-+        <td colspan="4">
-             <div class="actions-toolbar">
--                <?= /* @escapeNotVerified */ $block->getActions($_item) ?>
-+                <?= /* @noEscape */ $block->getActions($_item) ?>
-             </div>
-         </td>
-     </tr>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
-index d7a625695b4..1d30cfc8dc4 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
-@@ -4,12 +4,17 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
- ?>
- <?php $_item = $block->getItem() ?>
- <div class="price-container">
--    <span class="price-label"><?= /* @escapeNotVerified */ __('Price') ?></span>
--    <span class="price-wrapper"><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?></span>
-+    <span class="price-label"><?= $block->escapeHtml(__('Price')) ?></span>
-+    <span class="price-wrapper">
-+        <?= $block->escapeHtml(
-+            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()),
-+            ['span']
-+        ) ?>
-+    </span>
- </div>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
-index 1876cf2edb7..357bbf27772 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
-@@ -4,16 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Checkout\Block\Cart\Item\Renderer\Actions\Edit */
- ?>
--<?php if ($block->isProductVisibleInSiteVisibility()): ?>
-+<?php if ($block->isProductVisibleInSiteVisibility()) :?>
-     <a class="action action-edit"
--       href="<?= /* @escapeNotVerified */ $block->getConfigureUrl() ?>"
--       title="<?= $block->escapeHtml(__('Edit item parameters')) ?>">
--        <span>
--            <?= /* @escapeNotVerified */ __('Edit') ?>
--        </span>
--   </a>
-+       href="<?= $block->escapeUrl($block->getConfigureUrl()) ?>"
-+       title="<?= $block->escapeHtmlAttr(__('Edit item parameters')) ?>">
-+        <span><?= $block->escapeHtml(__('Edit')) ?></span>
-+    </a>
- <?php endif ?>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml
-index 445721ca5d0..8b72b6c55e8 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml
-@@ -4,15 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Checkout\Block\Cart\Item\Renderer\Actions\Remove */
- ?>
- <a href="#"
-    title="<?= $block->escapeHtml(__('Remove item')) ?>"
-    class="action action-delete"
--   data-post='<?= /* @escapeNotVerified */ $block->getDeletePostJson() ?>'>
-+   data-post='<?= /* @noEscape */ $block->getDeletePostJson() ?>'>
-     <span>
--        <?= /* @escapeNotVerified */ __('Remove item') ?>
-+        <?= $block->escapeHtml(__('Remove item')) ?>
-     </span>
- </a>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
-index d329e2e8c17..b045f4ec98f 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
-@@ -4,20 +4,18 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var $block \Magento\Checkout\Block\Cart */
- ?>
--<?php if (!$block->hasError()): ?>
--<?php $methods = $block->getMethods('methods') ?: $block->getMethods('top_methods') ?>
--<ul class="checkout methods items checkout-methods-items">
--<?php foreach ($methods as $method): ?>
--    <?php $methodHtml = $block->getMethodHtml($method); ?>
--    <?php if (trim($methodHtml) !== ''): ?>
--    <li class="item"><?= /* @escapeNotVerified */ $methodHtml ?></li>
--    <?php endif; ?>
--<?php endforeach; ?>
--</ul>
-+<?php if (!$block->hasError()) :?>
-+    <?php $methods = $block->getMethods('methods') ?: $block->getMethods('top_methods') ?>
-+    <ul class="checkout methods items checkout-methods-items">
-+        <?php foreach ($methods as $method) :?>
-+            <?php $methodHtml = $block->getMethodHtml($method); ?>
-+            <?php if (trim($methodHtml) !== '') :?>
-+                <li class="item"><?= /* @noEscape */ $methodHtml ?></li>
-+            <?php endif; ?>
-+        <?php endforeach; ?>
-+    </ul>
- <?php endif; ?>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
-index e6d0260cf23..28275e02239 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
-@@ -4,17 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Checkout\Block\Cart\Sidebar */
- ?>
- 
- <div data-block="minicart" class="minicart-wrapper">
--    <a class="action showcart" href="<?= /* @escapeNotVerified */ $block->getShoppingCartUrl() ?>"
-+    <a class="action showcart" href="<?= $block->escapeUrl($block->getShoppingCartUrl()) ?>"
-        data-bind="scope: 'minicart_content'">
--        <span class="text"><?= /* @escapeNotVerified */ __('My Cart') ?></span>
-+        <span class="text"><?= $block->escapeHtml(__('My Cart')) ?></span>
-         <span class="counter qty empty"
--              data-bind="css: { empty: !!getCartParam('summary_count') == false }, blockLoader: isLoading">
-+              data-bind="css: { empty: !!getCartParam('summary_count') == false && !isLoading() }, blockLoader: isLoading">
-             <span class="counter-number"><!-- ko text: getCartParam('summary_count') --><!-- /ko --></span>
-             <span class="counter-label">
-             <!-- ko if: getCartParam('summary_count') -->
-@@ -24,7 +22,7 @@
-             </span>
-         </span>
-     </a>
--    <?php if ($block->getIsNeedToDisplaySideBar()): ?>
-+    <?php if ($block->getIsNeedToDisplaySideBar()) :?>
-         <div class="block block-minicart"
-              data-role="dropdownDialog"
-              data-mage-init='{"dropdownDialog":{
-@@ -41,17 +39,27 @@
-             </div>
-             <?= $block->getChildHtml('minicart.addons') ?>
-         </div>
-+    <?php else :?>
-+        <script>
-+            require(['jquery'], function ($) {
-+                $('a.action.showcart').click(function() {
-+                    $(document.body).trigger('processStart');
-+                });
-+            });
-+        </script>
-     <?php endif ?>
-     <script>
--        window.checkout = <?= /* @escapeNotVerified */ $block->getSerializedConfig() ?>;
-+        window.checkout = <?= /* @noEscape */ $block->getSerializedConfig() ?>;
-     </script>
-     <script type="text/x-magento-init">
-     {
-         "[data-block='minicart']": {
--            "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
-+            "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
-         },
-         "*": {
--            "Magento_Ui/js/block-loader": "<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>"
-+            "Magento_Ui/js/block-loader": "<?= $block->escapeJs(
-+                $block->escapeUrl($block->getViewFileUrl('images/loader-1.gif'))
-+            ) ?>"
-         }
-     }
-     </script>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
-index 1c0c221a550..ac150b2aa98 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
-@@ -3,13 +3,26 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
-+
- /**  @var $block \Magento\Checkout\Block\Cart */
- ?>
- <div class="cart-empty">
-     <?= $block->getChildHtml('checkout_cart_empty_widget') ?>
--    <p><?= /* @escapeNotVerified */ __('You have no items in your shopping cart.') ?></p>
--    <p><?php /* @escapeNotVerified */ echo __('Click <a href="%1">here</a> to continue shopping.',
--            $block->escapeUrl($block->getContinueShoppingUrl())) ?></p>
-+    <p><?= $block->escapeHtml(__('You have no items in your shopping cart.')) ?></p>
-+    <p><?= $block->escapeHtml(
-+        __(
-+            'Click <a href="%1">here</a> to continue shopping.',
-+            $block->escapeUrl($block->getContinueShoppingUrl())
-+        ),
-+        ['a']
-+    ) ?>
-+    </p>
-     <?= $block->getChildHtml('shopping.cart.table.after') ?>
- </div>
-+<script type="text/x-magento-init">
-+{
-+    "*": {
-+        "Magento_Checkout/js/empty-cart": {}
-+    }
-+}
-+</script>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
-index b5ddb8446ba..a44d37dccfd 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
-@@ -4,36 +4,47 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Checkout\Block\Cart\Shipping */ ?>
- 
--<div id="block-shipping" class="block shipping" data-mage-init='{"collapsible":{"openedState": "active", "saveState": true}}'>
-+<div id="block-shipping"
-+     class="block shipping"
-+     data-mage-init='{"collapsible":{"openedState": "active", "saveState": true}}'
-+>
-     <div class="title" data-role="title">
-         <strong id="block-shipping-heading" role="heading" aria-level="2">
--            <?= /* @escapeNotVerified */ $block->getQuote()->isVirtual() ? __('Estimate Tax') : __('Estimate Shipping and Tax') ?>
-+            <?= $block->getQuote()->isVirtual()
-+                ? $block->escapeHtml(__('Estimate Tax'))
-+                : $block->escapeHtml(__('Estimate Shipping and Tax'))
-+            ?>
-         </strong>
-     </div>
--    <div id="block-summary" data-bind="scope:'block-summary'" class="content" data-role="content" aria-labelledby="block-shipping-heading">
-+    <div id="block-summary"
-+         data-bind="scope:'block-summary'"
-+         class="content"
-+         data-role="content"
-+         aria-labelledby="block-shipping-heading"
-+    >
-         <!-- ko template: getTemplate() --><!-- /ko -->
-         <script type="text/x-magento-init">
-             {
-                 "#block-summary": {
--                    "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
-+                    "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
-                 }
-             }
-         </script>
-         <script>
--            window.checkoutConfig = <?= /* @escapeNotVerified */ $block->getSerializedCheckoutConfig() ?>;
-+            window.checkoutConfig = <?= /* @noEscape */ $block->getSerializedCheckoutConfig() ?>;
-             window.customerData = window.checkoutConfig.customerData;
-             window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
-             require([
-                 'mage/url',
-                 'Magento_Ui/js/block-loader'
-             ], function(url, blockLoader) {
--                blockLoader("<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>");
--                return url.setBaseUrl('<?= /* @escapeNotVerified */ $block->getBaseUrl() ?>');
-+                blockLoader(
-+                    "<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif'))) ?>"
-+                );
-+                return url.setBaseUrl('<?= $block->escapeJs($block->escapeUrl($block->getBaseUrl())) ?>');
-             })
-         </script>
-     </div>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml
-index f39b70df984..784c4c39076 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml
-@@ -15,7 +15,7 @@
-     <script type="text/x-magento-init">
-             {
-                 "#cart-totals": {
--                    "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
-+                    "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
-                 }
-             }
-     </script>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
-index 37a945b238d..533d75b6ae8 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
- 
-@@ -12,6 +12,9 @@ $_item = $block->getItem();
- ?>
- <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-     <span class="cart-price">
--        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
-+        <?= $block->escapeHtml(
-+            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getRowTotal()),
-+            ['span']
-+        ) ?>
-     </span>
- </span>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
-index 45a6ef48e36..fafbe9c7c96 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
- 
-@@ -12,6 +12,9 @@ $_item = $block->getItem();
- ?>
- <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-     <span class="cart-price">
--        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
-+        <?= $block->escapeHtml(
-+            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()),
-+            ['span']
-+        ) ?>
-     </span>
- </span>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml b/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml
-index bad5acc209b..6cf15f47701 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml
-@@ -4,7 +4,5 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml b/app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml
-new file mode 100644
-index 00000000000..a6686444d2e
---- /dev/null
-+++ b/app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml
-@@ -0,0 +1,14 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/** @var \Magento\Framework\View\Element\Template $block */
-+?>
-+
-+<?= $block->escapeHtml(__(
-+    'You added %1 to your <a href="%2">shopping cart</a>.',
-+    $block->getData('product_name'),
-+    $block->getData('cart_url')
-+), ['a']);
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
-index 47a56e8f333..55f7039f333 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
-@@ -4,13 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/** @var $block \Magento\Checkout\Block\Onepage */
- ?>
- <div id="checkout" data-bind="scope:'checkout'" class="checkout-container">
-     <div id="checkout-loader" data-role="checkout-loader" class="loading-mask" data-mage-init='{"checkoutLoader": {}}'>
-         <div class="loader">
--            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>"
--                 alt="<?= /* @escapeNotVerified */ __('Loading...') ?>"
-+            <img src="<?= $block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')) ?>"
-+                 alt="<?= $block->escapeHtmlAttr(__('Loading...')) ?>"
-                  style="position: absolute;">
-         </div>
-     </div>
-@@ -18,12 +18,12 @@
-     <script type="text/x-magento-init">
-         {
-             "#checkout": {
--                "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
-+                "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
-             }
-         }
-     </script>
-     <script>
--        window.checkoutConfig = <?= /* @escapeNotVerified */ $block->getSerializedCheckoutConfig() ?>;
-+        window.checkoutConfig = <?= /* @noEscape */ $block->getSerializedCheckoutConfig() ?>;
-         // Create aliases for customer.js model from customer module
-         window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
-         window.customerData = window.checkoutConfig.customerData;
-@@ -33,8 +33,8 @@
-             'mage/url',
-             'Magento_Ui/js/block-loader'
-         ], function(url, blockLoader) {
--            blockLoader("<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>");
--            return url.setBaseUrl('<?= /* @escapeNotVerified */ $block->getBaseUrl() ?>');
-+            blockLoader("<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif'))) ?>");
-+            return url.setBaseUrl('<?= $block->escapeJs($block->escapeUrl($block->getBaseUrl())) ?>');
-         })
-     </script>
- </div>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
-index 43791ef4967..ace2b046417 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
-@@ -4,9 +4,16 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block \Magento\Checkout\Block\Onepage\Failure */
- ?>
--<?php if ($block->getRealOrderId()) : ?><p><?= /* @escapeNotVerified */ __('Order #') . $block->getRealOrderId() ?></p><?php endif ?>
--<?php if ($error = $block->getErrorMessage()) : ?><p><?= /* @escapeNotVerified */ $error ?></p><?php endif ?>
--<p><?= /* @escapeNotVerified */ __('Click <a href="%1">here</a> to continue shopping.', $block->escapeUrl($block->getContinueShoppingUrl())) ?></p>
-+<?php if ($block->getRealOrderId()) :?>
-+    <p><?= $block->escapeHtml(__('Order #') . $block->getRealOrderId()) ?></p>
-+<?php endif ?>
-+<?php if ($error = $block->getErrorMessage()) :?>
-+    <p><?= $block->escapeHtml($error) ?></p>
-+<?php endif ?>
-+<p><?= $block->escapeHtml(
-+    __('Click <a href="%1">here</a> to continue shopping.', $block->escapeUrl($block->getContinueShoppingUrl())),
-+    ['a']
-+) ?>
-+</p>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
-index 53a1fe87835..b667764ac7b 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
-@@ -4,15 +4,21 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/** @var $block \Magento\Checkout\Block\Onepage\Link */
- ?>
--<?php if ($block->isPossibleOnepageCheckout()):?>
-+<?php if ($block->isPossibleOnepageCheckout()) :?>
-     <button type="button"
-             data-role="proceed-to-checkout"
--            title="<?= /* @escapeNotVerified */ __('Proceed to Checkout') ?>"
--            data-mage-init='{"Magento_Checkout/js/proceed-to-checkout":{"checkoutUrl":"<?= /* @escapeNotVerified */ $block->getCheckoutUrl() ?>"}}'
-+            title="<?= $block->escapeHtmlAttr(__('Proceed to Checkout')) ?>"
-+            data-mage-init='{
-+                "Magento_Checkout/js/proceed-to-checkout":{
-+                    "checkoutUrl":"<?= $block->escapeJs($block->escapeUrl($block->getCheckoutUrl())) ?>"
-+                }
-+            }'
-             class="action primary checkout<?= ($block->isDisabled()) ? ' disabled' : '' ?>"
--            <?php if ($block->isDisabled()):?>disabled="disabled"<?php endif; ?>>
--        <span><?= /* @escapeNotVerified */ __('Proceed to Checkout') ?></span>
-+            <?php if ($block->isDisabled()) :?>
-+                disabled="disabled"
-+            <?php endif; ?>>
-+        <span><?= $block->escapeHtml(__('Proceed to Checkout')) ?></span>
-     </button>
- <?php endif?>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
-index 2428cc01077..2a7ccc38e9d 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
-@@ -4,11 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block Magento\Checkout\Block\Cart\Item\Renderer */
- 
- $_item = $block->getItem();
-+$taxDataHelper = $this->helper(Magento\Tax\Helper\Data::class);
- ?>
- <tbody class="cart item">
-     <tr>
-@@ -17,47 +18,53 @@ $_item = $block->getItem();
-                 <?= $block->getImage($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml() ?>
-             </span>
-             <div class="product-item-details">
--                <strong class="product name product-item-name"><?= $block->escapeHtml($block->getProductName()) ?></strong>
--                <?php if ($_options = $block->getOptionList()):?>
--                <dl class="item-options">
--                    <?php foreach ($_options as $_option) : ?>
--                    <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
--                    <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                    <dd>
--                        <?php if (isset($_formatedOptionValue['full_view'])): ?>
--                            <?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?>
--                        <?php else: ?>
--                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
--                        <?php endif; ?>
--                    </dd>
--                    <?php endforeach; ?>
--                </dl>
-+                <strong class="product name product-item-name">
-+                    <?= $block->escapeHtml($block->getProductName()) ?>
-+                </strong>
-+                <?php if ($_options = $block->getOptionList()) :?>
-+                    <dl class="item-options">
-+                        <?php foreach ($_options as $_option) :?>
-+                            <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-+                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-+                            <dd>
-+                                <?php if (isset($_formatedOptionValue['full_view'])) :?>
-+                                    <?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
-+                                <?php else :?>
-+                                    <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
-+                                <?php endif; ?>
-+                            </dd>
-+                        <?php endforeach; ?>
-+                    </dl>
-                 <?php endif;?>
--                <?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()):?>
-+                <?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()) :?>
-                     <?= $addtInfoBlock->setItem($_item)->toHtml() ?>
-                 <?php endif;?>
-             </div>
-         </td>
-         <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
--            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-+            <?php if ($taxDataHelper->displayCartPriceInclTax() || $taxDataHelper->displayCartBothPrices()) :?>
-                 <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
-                     <?= $block->getUnitPriceInclTaxHtml($_item) ?>
-                 </span>
-             <?php endif; ?>
--            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-+            <?php if ($taxDataHelper->displayCartPriceExclTax() || $taxDataHelper->displayCartBothPrices()) :?>
-                 <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-                     <?= $block->getUnitPriceExclTaxHtml($_item) ?>
-                 </span>
-             <?php endif; ?>
-         </td>
--        <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><span class="qty"><?= /* @escapeNotVerified */ $_item->getQty() ?></span></td>
-+        <td class="col qty"
-+            data-th="<?= $block->escapeHtml(__('Qty')) ?>"
-+        >
-+            <span class="qty"><?= $block->escapeHtml($_item->getQty()) ?></span>
-+        </td>
-         <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
--            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-+            <?php if ($taxDataHelper->displayCartPriceInclTax() || $taxDataHelper->displayCartBothPrices()) :?>
-                 <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
-                     <?= $block->getRowTotalInclTaxHtml($_item) ?>
-                 </span>
-             <?php endif; ?>
--            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-+            <?php if ($taxDataHelper->displayCartPriceExclTax() || $taxDataHelper->displayCartBothPrices()) :?>
-                 <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-                     <?= $block->getRowTotalExclTaxHtml($_item) ?>
-                 </span>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
-index 7ee3e416b9a..64eefd0dad0 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
-@@ -4,12 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
- 
- $_item = $block->getItem();
- ?>
- <span class="cart-price">
--    <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
-+    <?= $block->escapeHtml(
-+        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getRowTotal()),
-+        ['span']
-+    ) ?>
- </span>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
-index 2f364aafbbc..14deb07640e 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
-@@ -4,13 +4,16 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
- 
- $_item = $block->getItem();
- ?>
--<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-+<?php $_incl = $this->helper(Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
- <span class="cart-price">
--    <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
-+    <?= $block->escapeHtml(
-+        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_incl),
-+        ['span']
-+    ) ?>
- </span>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
-index a1ec004c2a8..a65a5a50ae1 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
-@@ -4,12 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- 
- /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
- 
- $_item = $block->getItem();
- ?>
- <span class="cart-price">
--    <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
-+    <?= $block->escapeHtml(
-+        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()),
-+        ['span']
-+    ) ?>
- </span>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
-index 0ed3c05ee6d..b623e1f1c3f 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
-@@ -4,13 +4,16 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
- 
- $_item = $block->getItem();
- ?>
--<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-+<?php $_incl = $this->helper(Magento\Checkout\Helper\Data::class)->getPriceInclTax($_item); ?>
- <span class="cart-price">
--    <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
-+    <?= $block->escapeHtml(
-+        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_incl),
-+        ['span']
-+    ) ?>
- </span>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/registration.phtml b/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
-index f239fbd47de..da36b4b61d6 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/** @var $block \Magento\Checkout\Block\Registration */
- ?>
- <div id="registration" data-bind="scope:'registration'">
-     <br />
-@@ -17,8 +17,9 @@
-                         "registration": {
-                             "component": "Magento_Checkout/js/view/registration",
-                             "config": {
--                                "registrationUrl": "<?= /* @escapeNotVerified */ $block->getCreateAccountUrl() ?>",
--                                "email": "<?= /* @escapeNotVerified */ $block->getEmailAddress() ?>"
-+                                "registrationUrl":
-+                                    "<?= $block->escapeJs($block->escapeUrl($block->getCreateAccountUrl())) ?>",
-+                                "email": "<?= $block->escapeJs($block->getEmailAddress()) ?>"
-                             },
-                             "children": {
-                                 "errors": {
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml b/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
-index 892b7926525..ba1a7a20376 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
-@@ -4,10 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Checkout\Block\Shipping\Price */ ?>
- 
- <?php $shippingPrice = $block->getShippingPrice(); ?>
--<?= /* @escapeNotVerified */ $shippingPrice ?>
-+<?= $block->escapeHtml($shippingPrice) ?>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/success.phtml b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
-index b3517eab8a5..828b4eb86c3 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/success.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
-@@ -4,25 +4,23 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?>
- <div class="checkout-success">
--    <?php if ($block->getOrderId()):?>
-+    <?php if ($block->getOrderId()) :?>
-         <?php if ($block->getCanViewOrder()) :?>
--            <p><?= __('Your order number is: %1.', sprintf('<a href="%s" class="order-number"><strong>%s</strong></a>', $block->escapeHtml($block->getViewOrderUrl()), $block->escapeHtml($block->getOrderId()))) ?></p>
-+            <p><?= $block->escapeHtml(__('Your order number is: %1.', sprintf('<a href="%s" class="order-number"><strong>%s</strong></a>', $block->escapeUrl($block->getViewOrderUrl()), $block->getOrderId())), ['a', 'strong']) ?></p>
-         <?php  else :?>
--            <p><?= __('Your order # is: <span>%1</span>.', $block->escapeHtml($block->getOrderId())) ?></p>
-+            <p><?= $block->escapeHtml(__('Your order # is: <span>%1</span>.', $block->getOrderId()), ['span']) ?></p>
-         <?php endif;?>
--            <p><?= /* @escapeNotVerified */ __('We\'ll email you an order confirmation with details and tracking info.') ?></p>
-+            <p><?= $block->escapeHtml(__('We\'ll email you an order confirmation with details and tracking info.')) ?></p>
-     <?php endif;?>
- 
-     <?= $block->getAdditionalInfoHtml() ?>
- 
-     <div class="actions-toolbar">
-         <div class="primary">
--            <a class="action primary continue" href="<?= /* @escapeNotVerified */ $block->getContinueUrl() ?>"><span><?= /* @escapeNotVerified */ __('Continue Shopping') ?></span></a>
-+            <a class="action primary continue" href="<?= $block->escapeUrl($block->getContinueUrl()) ?>"><span><?= $block->escapeHtml(__('Continue Shopping')) ?></span></a>
-         </div>
-     </div>
- </div>
-diff --git a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
-index 2ea1cdd7f53..0d9da171c11 100644
---- a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
-+++ b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
-@@ -4,18 +4,40 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
-+/** @var $block \Magento\Checkout\Block\Total\DefaultTotal */
- ?>
- <tr class="totals">
--    <th colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="mark" scope="row">
--        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
--            <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
--        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
-+    <th
-+            colspan="<?= $block->escapeHtmlAttr($block->getColspan()) ?>"
-+            style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>"
-+            class="mark" scope="row"
-+    >
-+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>
-+            <strong>
-+        <?php endif; ?>
-+        <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>
-+            </strong>
-+        <?php endif; ?>
-     </th>
--    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
--        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
--            <span><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></span>
--        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
-+    <td
-+            style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>"
-+            class="amount"
-+            data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>"
-+    >
-+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>
-+            <strong>
-+        <?php endif; ?>
-+            <span>
-+                <?= $block->escapeHtml(
-+                    $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()),
-+                    ['span']
-+                ) ?>
-+            </span>
-+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>
-+            </strong>
-+        <?php endif; ?>
-     </td>
- </tr>
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/create-billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/action/create-billing-address.js
-index 7db0dc5ce74..c601bb8acf1 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/action/create-billing-address.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/create-billing-address.js
-@@ -12,6 +12,17 @@ define([
-     'use strict';
- 
-     return function (addressData) {
--        return addressConverter.formAddressDataToQuoteAddress(addressData);
-+        var address = addressConverter.formAddressDataToQuoteAddress(addressData);
-+
-+        /**
-+         * Returns new customer billing address type.
-+         *
-+         * @returns {String}
-+         */
-+        address.getType = function () {
-+            return 'new-customer-billing-address';
-+        };
-+
-+        return address;
-     };
- });
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js
-new file mode 100644
-index 00000000000..4085da82f41
---- /dev/null
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js
-@@ -0,0 +1,60 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/**
-+ * @api
-+ */
-+define([
-+    'Magento_Checkout/js/model/quote',
-+    'Magento_Checkout/js/model/url-builder',
-+    'mage/storage',
-+    'Magento_Checkout/js/model/error-processor',
-+    'Magento_Customer/js/model/customer',
-+    'Magento_Checkout/js/action/get-totals',
-+    'Magento_Checkout/js/model/full-screen-loader'
-+], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader) {
-+    'use strict';
-+
-+    return function (messageContainer, paymentData, skipBilling) {
-+        var serviceUrl,
-+            payload;
-+
-+        skipBilling = skipBilling || false;
-+        payload = {
-+            cartId: quote.getQuoteId(),
-+            paymentMethod: paymentData
-+        };
-+
-+        /**
-+         * Checkout for guest and registered customer.
-+         */
-+        if (!customer.isLoggedIn()) {
-+            serviceUrl = urlBuilder.createUrl('/guest-carts/:cartId/set-payment-information', {
-+                cartId: quote.getQuoteId()
-+            });
-+            payload.email = quote.guestEmail;
-+        } else {
-+            serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {});
-+        }
-+
-+        if (skipBilling === false) {
-+            payload.billingAddress = quote.billingAddress();
-+        }
-+
-+        fullScreenLoader.startLoader();
-+
-+        return storage.post(
-+            serviceUrl, JSON.stringify(payload)
-+        ).fail(
-+            function (response) {
-+                errorProcessor.process(response, messageContainer);
-+            }
-+        ).always(
-+            function () {
-+                fullScreenLoader.stopLoader();
-+            }
-+        );
-+    };
-+});
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js
-index 997b60503a2..d5261c976a7 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js
-@@ -7,54 +7,13 @@
-  * @api
-  */
- define([
--    'Magento_Checkout/js/model/quote',
--    'Magento_Checkout/js/model/url-builder',
--    'mage/storage',
--    'Magento_Checkout/js/model/error-processor',
--    'Magento_Customer/js/model/customer',
--    'Magento_Checkout/js/action/get-totals',
--    'Magento_Checkout/js/model/full-screen-loader'
--], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader) {
-+    'Magento_Checkout/js/action/set-payment-information-extended'
-+
-+], function (setPaymentInformationExtended) {
-     'use strict';
- 
-     return function (messageContainer, paymentData) {
--        var serviceUrl,
--            payload;
--
--        /**
--         * Checkout for guest and registered customer.
--         */
--        if (!customer.isLoggedIn()) {
--            serviceUrl = urlBuilder.createUrl('/guest-carts/:cartId/set-payment-information', {
--                cartId: quote.getQuoteId()
--            });
--            payload = {
--                cartId: quote.getQuoteId(),
--                email: quote.guestEmail,
--                paymentMethod: paymentData,
--                billingAddress: quote.billingAddress()
--            };
--        } else {
--            serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {});
--            payload = {
--                cartId: quote.getQuoteId(),
--                paymentMethod: paymentData,
--                billingAddress: quote.billingAddress()
--            };
--        }
--
--        fullScreenLoader.startLoader();
- 
--        return storage.post(
--            serviceUrl, JSON.stringify(payload)
--        ).fail(
--            function (response) {
--                errorProcessor.process(response, messageContainer);
--            }
--        ).always(
--            function () {
--                fullScreenLoader.stopLoader();
--            }
--        );
-+        return setPaymentInformationExtended(messageContainer, paymentData, false);
-     };
- });
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js
-index ce1527b3d72..1920bc4d7ac 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js
-@@ -14,7 +14,8 @@ define([
-     $.widget('mage.updateShoppingCart', {
-         options: {
-             validationURL: '',
--            eventName: 'updateCartItemQty'
-+            eventName: 'updateCartItemQty',
-+            updateCartActionContainer: ''
-         },
- 
-         /** @inheritdoc */
-@@ -31,7 +32,9 @@ define([
-          * @return {Boolean}
-          */
-         onSubmit: function (event) {
--            if (!this.options.validationURL) {
-+            var action = this.element.find(this.options.updateCartActionContainer).val();
-+
-+            if (!this.options.validationURL || action === 'empty_cart') {
-                 return true;
-             }
- 
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
-index 22b37b2da0b..1858ce946fb 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
-@@ -10,7 +10,8 @@
-  */
- define([
-     'jquery',
--    'Magento_Customer/js/customer-data'
-+    'Magento_Customer/js/customer-data',
-+    'jquery/jquery-storageapi'
- ], function ($, storage) {
-     'use strict';
- 
-@@ -23,6 +24,22 @@ define([
-             storage.set(cacheKey, data);
-         },
- 
-+        /**
-+         * @return {*}
-+         */
-+        initData = function () {
-+            return {
-+                'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
-+                'shippingAddressFromData': null, //Shipping address pulled from persistence storage
-+                'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for customer
-+                'selectedShippingRate': null, //Shipping rate pulled from persistence storage
-+                'selectedPaymentMethod': null, //Payment method pulled from persistence storage
-+                'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
-+                'billingAddressFromData': null, //Billing address pulled from persistence storage
-+                'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
-+            };
-+        },
-+
-         /**
-          * @return {*}
-          */
-@@ -30,17 +47,12 @@ define([
-             var data = storage.get(cacheKey)();
- 
-             if ($.isEmptyObject(data)) {
--                data = {
--                    'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
--                    'shippingAddressFromData': null, //Shipping address pulled from persistence storage
--                    'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for customer
--                    'selectedShippingRate': null, //Shipping rate pulled from persistence storage
--                    'selectedPaymentMethod': null, //Payment method pulled from persistence storage
--                    'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
--                    'billingAddressFromData': null, //Billing address pulled from persistence storage
--                    'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
--                };
--                saveData(data);
-+                data = $.initNamespaceStorage('mage-cache-storage').localStorage.get(cacheKey);
-+
-+                if ($.isEmptyObject(data)) {
-+                    data = initData();
-+                    saveData(data);
-+                }
-             }
- 
-             return data;
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js
-new file mode 100644
-index 00000000000..4b30ad80752
---- /dev/null
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js
-@@ -0,0 +1,16 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'Magento_Customer/js/customer-data'
-+], function (customerData) {
-+    'use strict';
-+
-+    var cartData = customerData.get('cart');
-+
-+    if (cartData().items && cartData().items.length !== 0) {
-+        customerData.reload(['cart'], false);
-+    }
-+});
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
-index a1aacf6e803..9b20a782c38 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
-@@ -58,6 +58,16 @@ define([
-             }
-             delete addressData['region_id'];
- 
-+            if (addressData['custom_attributes']) {
-+                addressData['custom_attributes'] = Object.entries(addressData['custom_attributes'])
-+                    .map(function (customAttribute) {
-+                        return {
-+                            'attribute_code': customAttribute[0],
-+                            'value': customAttribute[1]
-+                        };
-+                    });
-+            }
-+
-             return address(addressData);
-         },
- 
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js b/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js
-index 76e3d911e7d..54e49613197 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js
-@@ -14,55 +14,71 @@ define([
-     'use strict';
- 
-     var rateProcessors = [],
--        totalsProcessors = [];
-+        totalsProcessors = [],
- 
--    quote.shippingAddress.subscribe(function () {
--        var type = quote.shippingAddress().getType();
-+        /**
-+         * Estimate totals for shipping address and update shipping rates.
-+         */
-+        estimateTotalsAndUpdateRates = function () {
-+            var type = quote.shippingAddress().getType();
- 
--        if (
--            quote.isVirtual() ||
--            window.checkoutConfig.activeCarriers && window.checkoutConfig.activeCarriers.length === 0
--        ) {
--            // update totals block when estimated address was set
--            totalsProcessors['default'] = totalsDefaultProvider;
--            totalsProcessors[type] ?
--                totalsProcessors[type].estimateTotals(quote.shippingAddress()) :
--                totalsProcessors['default'].estimateTotals(quote.shippingAddress());
--        } else {
--            // check if user data not changed -> load rates from cache
--            if (!cartCache.isChanged('address', quote.shippingAddress()) &&
--                !cartCache.isChanged('cartVersion', customerData.get('cart')()['data_id']) &&
--                cartCache.get('rates')
-+            if (
-+                quote.isVirtual() ||
-+                window.checkoutConfig.activeCarriers && window.checkoutConfig.activeCarriers.length === 0
-             ) {
--                shippingService.setShippingRates(cartCache.get('rates'));
-+                // update totals block when estimated address was set
-+                totalsProcessors['default'] = totalsDefaultProvider;
-+                totalsProcessors[type] ?
-+                    totalsProcessors[type].estimateTotals(quote.shippingAddress()) :
-+                    totalsProcessors['default'].estimateTotals(quote.shippingAddress());
-+            } else {
-+                // check if user data not changed -> load rates from cache
-+                if (!cartCache.isChanged('address', quote.shippingAddress()) &&
-+                    !cartCache.isChanged('cartVersion', customerData.get('cart')()['data_id']) &&
-+                    cartCache.get('rates')
-+                ) {
-+                    shippingService.setShippingRates(cartCache.get('rates'));
- 
--                return;
-+                    return;
-+                }
-+
-+                // update rates list when estimated address was set
-+                rateProcessors['default'] = defaultProcessor;
-+                rateProcessors[type] ?
-+                    rateProcessors[type].getRates(quote.shippingAddress()) :
-+                    rateProcessors['default'].getRates(quote.shippingAddress());
-+
-+                // save rates to cache after load
-+                shippingService.getShippingRates().subscribe(function (rates) {
-+                    cartCache.set('rates', rates);
-+                });
-             }
-+        },
- 
--            // update rates list when estimated address was set
--            rateProcessors['default'] = defaultProcessor;
--            rateProcessors[type] ?
--                rateProcessors[type].getRates(quote.shippingAddress()) :
--                rateProcessors['default'].getRates(quote.shippingAddress());
-+        /**
-+         * Estimate totals for shipping address.
-+         */
-+        estimateTotalsShipping = function () {
-+            totalsDefaultProvider.estimateTotals(quote.shippingAddress());
-+        },
- 
--            // save rates to cache after load
--            shippingService.getShippingRates().subscribe(function (rates) {
--                cartCache.set('rates', rates);
--            });
--        }
--    });
--    quote.shippingMethod.subscribe(function () {
--        totalsDefaultProvider.estimateTotals(quote.shippingAddress());
--    });
--    quote.billingAddress.subscribe(function () {
--        var type = quote.billingAddress().getType();
-+        /**
-+         * Estimate totals for billing address.
-+         */
-+        estimateTotalsBilling = function () {
-+            var type = quote.billingAddress().getType();
-+
-+            if (quote.isVirtual()) {
-+                // update totals block when estimated address was set
-+                totalsProcessors['default'] = totalsDefaultProvider;
-+                totalsProcessors[type] ?
-+                    totalsProcessors[type].estimateTotals(quote.billingAddress()) :
-+                    totalsProcessors['default'].estimateTotals(quote.billingAddress());
-+            }
-+        };
- 
--        if (quote.isVirtual()) {
--            // update totals block when estimated address was set
--            totalsProcessors['default'] = totalsDefaultProvider;
--            totalsProcessors[type] ?
--                totalsProcessors[type].estimateTotals(quote.billingAddress()) :
--                totalsProcessors['default'].estimateTotals(quote.billingAddress());
--        }
--    });
-+    quote.shippingAddress.subscribe(estimateTotalsAndUpdateRates);
-+    quote.shippingMethod.subscribe(estimateTotalsShipping);
-+    quote.billingAddress.subscribe(estimateTotalsBilling);
-+    customerData.get('cart').subscribe(estimateTotalsShipping);
- });
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
-index 73f4df56790..bc0ab59b622 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
-@@ -60,14 +60,21 @@ define([
-                     this.resolveBillingAddress();
-                 }
-             }
--
-         },
- 
-         /**
-          * Resolve shipping address. Used local storage
-          */
-         resolveShippingAddress: function () {
--            var newCustomerShippingAddress = checkoutData.getNewCustomerShippingAddress();
-+            var newCustomerShippingAddress;
-+
-+            if (!checkoutData.getShippingAddressFromData() &&
-+                window.checkoutConfig.shippingAddressFromData
-+            ) {
-+                checkoutData.setShippingAddressFromData(window.checkoutConfig.shippingAddressFromData);
-+            }
-+
-+            newCustomerShippingAddress = checkoutData.getNewCustomerShippingAddress();
- 
-             if (newCustomerShippingAddress) {
-                 createShippingAddress(newCustomerShippingAddress);
-@@ -196,15 +203,24 @@ define([
-          * Resolve billing address. Used local storage
-          */
-         resolveBillingAddress: function () {
--            var selectedBillingAddress = checkoutData.getSelectedBillingAddress(),
--                newCustomerBillingAddressData = checkoutData.getNewCustomerBillingAddress();
-+            var selectedBillingAddress,
-+                newCustomerBillingAddressData;
-+
-+            if (!checkoutData.getBillingAddressFromData() &&
-+                window.checkoutConfig.billingAddressFromData
-+            ) {
-+                checkoutData.setBillingAddressFromData(window.checkoutConfig.billingAddressFromData);
-+            }
-+
-+            selectedBillingAddress = checkoutData.getSelectedBillingAddress();
-+            newCustomerBillingAddressData = checkoutData.getNewCustomerBillingAddress();
- 
-             if (selectedBillingAddress) {
--                if (selectedBillingAddress == 'new-customer-address' && newCustomerBillingAddressData) { //eslint-disable-line
-+                if (selectedBillingAddress === 'new-customer-billing-address' && newCustomerBillingAddressData) {
-                     selectBillingAddress(createBillingAddress(newCustomerBillingAddressData));
-                 } else {
-                     addressList.some(function (address) {
--                        if (selectedBillingAddress == address.getKey()) { //eslint-disable-line eqeqeq
-+                        if (selectedBillingAddress === address.getKey()) {
-                             selectBillingAddress(address);
-                         }
-                     });
-@@ -218,16 +234,31 @@ define([
-          * Apply resolved billing address to quote
-          */
-         applyBillingAddress: function () {
--            var shippingAddress;
-+            var shippingAddress,
-+                isBillingAddressInitialized;
- 
-             if (quote.billingAddress()) {
-                 selectBillingAddress(quote.billingAddress());
- 
-                 return;
-             }
-+
-+            if (quote.isVirtual() || !quote.billingAddress()) {
-+                isBillingAddressInitialized = addressList.some(function (addrs) {
-+                    if (addrs.isDefaultBilling()) {
-+                        selectBillingAddress(addrs);
-+
-+                        return true;
-+                    }
-+
-+                    return false;
-+                });
-+            }
-+
-             shippingAddress = quote.shippingAddress();
- 
--            if (shippingAddress &&
-+            if (!isBillingAddressInitialized &&
-+                shippingAddress &&
-                 shippingAddress.canUseForBilling() &&
-                 (shippingAddress.isDefaultShipping() || !quote.isVirtual())
-             ) {
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js b/app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js
-index 848a7daf71e..bf1697650e7 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js
-@@ -8,8 +8,9 @@
-  */
- define([
-     'mage/url',
--    'Magento_Ui/js/model/messageList'
--], function (url, globalMessageList) {
-+    'Magento_Ui/js/model/messageList',
-+    'mage/translate'
-+], function (url, globalMessageList, $t) {
-     'use strict';
- 
-     return {
-@@ -25,7 +26,13 @@ define([
-             if (response.status == 401) { //eslint-disable-line eqeqeq
-                 window.location.replace(url.build('customer/account/login/'));
-             } else {
--                error = JSON.parse(response.responseText);
-+                try {
-+                    error = JSON.parse(response.responseText);
-+                } catch (exception) {
-+                    error = {
-+                        message: $t('Something went wrong with your request. Please try again later.')
-+                    };
-+                }
-                 messageContainer.addErrorMessage(error);
-             }
-         }
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js b/app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js
-index a880bd423ab..4ef39421440 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js
-@@ -22,6 +22,8 @@ define([
- 
-         if (addressData.region && addressData.region['region_id']) {
-             regionId = addressData.region['region_id'];
-+        } else if (!addressData['region_id']) {
-+            regionId = undefined;
-         } else if (
-             /* eslint-disable */
-             addressData['country_id'] && addressData['country_id'] == window.checkoutConfig.defaultCountryId ||
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/payment/additional-validators.js b/app/code/Magento/Checkout/view/frontend/web/js/model/payment/additional-validators.js
-index 1cb35a4cee2..1337e1affd3 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/model/payment/additional-validators.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/payment/additional-validators.js
-@@ -35,15 +35,17 @@ define([], function () {
-          *
-          * @returns {Boolean}
-          */
--        validate: function () {
-+        validate: function (hideError) {
-             var validationResult = true;
- 
-+            hideError = hideError || false;
-+
-             if (validators.length <= 0) {
-                 return validationResult;
-             }
- 
-             validators.forEach(function (item) {
--                if (item.validate() == false) { //eslint-disable-line eqeqeq
-+                if (item.validate(hideError) == false) { //eslint-disable-line eqeqeq
-                     validationResult = false;
- 
-                     return false;
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js b/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
-index c3c5b9d68ce..c07878fcaea 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
-@@ -9,9 +9,10 @@ define(
-     [
-         'mage/storage',
-         'Magento_Checkout/js/model/error-processor',
--        'Magento_Checkout/js/model/full-screen-loader'
-+        'Magento_Checkout/js/model/full-screen-loader',
-+        'Magento_Customer/js/customer-data'
-     ],
--    function (storage, errorProcessor, fullScreenLoader) {
-+    function (storage, errorProcessor, fullScreenLoader, customerData) {
-         'use strict';
- 
-         return function (serviceUrl, payload, messageContainer) {
-@@ -23,6 +24,23 @@ define(
-                 function (response) {
-                     errorProcessor.process(response, messageContainer);
-                 }
-+            ).success(
-+                function (response) {
-+                    var clearData = {
-+                        'selectedShippingAddress': null,
-+                        'shippingAddressFromData': null,
-+                        'newCustomerShippingAddress': null,
-+                        'selectedShippingRate': null,
-+                        'selectedPaymentMethod': null,
-+                        'selectedBillingAddress': null,
-+                        'billingAddressFromData': null,
-+                        'newCustomerBillingAddress': null
-+                    };
-+
-+                    if (response.responseType !== 'error') {
-+                        customerData.set('checkout-data', clearData);
-+                    }
-+                }
-             ).always(
-                 function () {
-                     fullScreenLoader.stopLoader();
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
-index a95471d90da..0a5334a42c7 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
-@@ -14,11 +14,13 @@ define([
-         /**
-          * @param {*} postCode
-          * @param {*} countryId
-+         * @param {Array} postCodesPatterns
-          * @return {Boolean}
-          */
--        validate: function (postCode, countryId) {
--            var patterns = window.checkoutConfig.postCodes[countryId],
--                pattern, regex;
-+        validate: function (postCode, countryId, postCodesPatterns) {
-+            var pattern, regex,
-+                patterns = postCodesPatterns ? postCodesPatterns[countryId] :
-+                    window.checkoutConfig.postCodes[countryId];
- 
-             this.validatedPostCodeExample = [];
- 
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/quote.js b/app/code/Magento/Checkout/view/frontend/web/js/model/quote.js
-index 2510d1aced3..3486a927366 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/model/quote.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/quote.js
-@@ -7,7 +7,8 @@
-  */
- define([
-     'ko',
--    'underscore'
-+    'underscore',
-+    'domReady!'
- ], function (ko, _) {
-     'use strict';
- 
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
-index d31c0dca381..8b07c02e4d3 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
-@@ -35,13 +35,14 @@ define([
-     var checkoutConfig = window.checkoutConfig,
-         validators = [],
-         observedElements = [],
--        postcodeElement = null,
-+        postcodeElements = [],
-         postcodeElementName = 'postcode';
- 
-     validators.push(defaultValidator);
- 
-     return {
-         validateAddressTimeout: 0,
-+        validateZipCodeTimeout: 0,
-         validateDelay: 2000,
- 
-         /**
-@@ -101,7 +102,7 @@ define([
- 
-             if (element.index === postcodeElementName) {
-                 this.bindHandler(element, delay);
--                postcodeElement = element;
-+                postcodeElements.push(element);
-             }
-         },
- 
-@@ -133,10 +134,20 @@ define([
-                 });
-             } else {
-                 element.on('value', function () {
-+                    clearTimeout(self.validateZipCodeTimeout);
-+                    self.validateZipCodeTimeout = setTimeout(function () {
-+                        if (element.index === postcodeElementName) {
-+                            self.postcodeValidation(element);
-+                        } else {
-+                            $.each(postcodeElements, function (index, elem) {
-+                                self.postcodeValidation(elem);
-+                            });
-+                        }
-+                    }, delay);
-+
-                     if (!formPopUpState.isVisible()) {
-                         clearTimeout(self.validateAddressTimeout);
-                         self.validateAddressTimeout = setTimeout(function () {
--                            self.postcodeValidation();
-                             self.validateFields();
-                         }, delay);
-                     }
-@@ -148,8 +159,8 @@ define([
-         /**
-          * @return {*}
-          */
--        postcodeValidation: function () {
--            var countryId = $('select[name="country_id"]').val(),
-+        postcodeValidation: function (postcodeElement) {
-+            var countryId = $('select[name="country_id"]:visible').val(),
-                 validationResult,
-                 warnMessage;
- 
-@@ -178,8 +189,8 @@ define([
-          */
-         validateFields: function () {
-             var addressFlat = addressConverter.formDataProviderToFlatData(
--                    this.collectObservedData(),
--                    'shippingAddress'
-+                this.collectObservedData(),
-+                'shippingAddress'
-                 ),
-                 address;
- 
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
-index cf2a59cdba4..80481826260 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
-@@ -157,7 +157,7 @@ define([
-                 regionInput = $(this.options.regionInputId),
-                 postcode = $(this.options.postcodeId),
-                 label = regionList.parent().siblings('label'),
--                requiredLabel = regionList.parents('div.field');
-+                container = regionList.parents('div.field');
- 
-             this._clearError();
-             this._checkRegionRequired(country);
-@@ -181,15 +181,16 @@ define([
- 
-                 if (this.options.isRegionRequired) {
-                     regionList.addClass('required-entry').removeAttr('disabled');
--                    requiredLabel.addClass('required');
-+                    container.addClass('required').show();
-                 } else {
-                     regionList.removeClass('required-entry validate-select').removeAttr('data-validate');
--                    requiredLabel.removeClass('required');
-+                    container.removeClass('required');
- 
-                     if (!this.options.optionalRegionAllowed) { //eslint-disable-line max-depth
--                        regionList.attr('disabled', 'disabled');
-+                        regionList.hide();
-+                        container.hide();
-                     } else {
--                        regionList.removeAttr('disabled');
-+                        regionList.show();
-                     }
-                 }
- 
-@@ -201,12 +202,13 @@ define([
- 
-                 if (this.options.isRegionRequired) {
-                     regionInput.addClass('required-entry').removeAttr('disabled');
--                    requiredLabel.addClass('required');
-+                    container.addClass('required').show();
-                 } else {
-                     if (!this.options.optionalRegionAllowed) { //eslint-disable-line max-depth
-                         regionInput.attr('disabled', 'disabled');
-+                        container.hide();
-                     }
--                    requiredLabel.removeClass('required');
-+                    container.removeClass('required');
-                     regionInput.removeClass('required-entry');
-                 }
- 
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
-index 3ea49cd981d..eecfa65b189 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
-@@ -14,7 +14,11 @@ define([
-         _create: function () {
-             var items, i, reload;
- 
--            $(this.options.emptyCartButton).on('click', $.proxy(function () {
-+            $(this.options.emptyCartButton).on('click', $.proxy(function (event) {
-+                if (event.detail === 0) {
-+                    return;
-+                }
-+
-                 $(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
-                 $(this.options.updateCartActionContainer)
-                     .attr('name', 'update_cart_action').attr('value', 'empty_cart');
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
-index 3b5168453e1..e66c6600624 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
-@@ -25,6 +25,7 @@ define([
-             }
-         },
-         scrollHeight: 0,
-+        shoppingCartUrl: window.checkout.shoppingCartUrl,
- 
-         /**
-          * Create sidebar.
-@@ -226,7 +227,11 @@ define([
-             var productData = this._getProductById(Number(elem.data('cart-item')));
- 
-             if (!_.isUndefined(productData)) {
--                $(document).trigger('ajax:updateCartItemQty', productData['product_sku']);
-+                $(document).trigger('ajax:updateCartItemQty');
-+
-+                if (window.location.href === this.shoppingCartUrl) {
-+                    window.location.reload(false);
-+                }
-             }
-             this._hideItemButton(elem);
-         },
-@@ -253,7 +258,9 @@ define([
-             var productData = this._getProductById(Number(elem.data('cart-item')));
- 
-             if (!_.isUndefined(productData)) {
--                $(document).trigger('ajax:removeFromCart', productData['product_sku']);
-+                $(document).trigger('ajax:removeFromCart', {
-+                    productIds: [productData['product_id']]
-+                });
-             }
-         },
- 
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
-index 6b5d08c2641..a552aa01da0 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
-@@ -17,7 +17,8 @@ define([
-     'Magento_Customer/js/customer-data',
-     'Magento_Checkout/js/action/set-billing-address',
-     'Magento_Ui/js/model/messageList',
--    'mage/translate'
-+    'mage/translate',
-+    'Magento_Checkout/js/model/shipping-rates-validator'
- ],
- function (
-     ko,
-@@ -33,35 +34,29 @@ function (
-     customerData,
-     setBillingAddressAction,
-     globalMessageList,
--    $t
-+    $t,
-+    shippingRatesValidator
- ) {
-     'use strict';
- 
-     var lastSelectedBillingAddress = null,
--        newAddressOption = {
--            /**
--             * Get new address label
--             * @returns {String}
--             */
--            getAddressInline: function () {
--                return $t('New Address');
--            },
--            customerAddressId: null
--        },
-         countryData = customerData.get('directory-data'),
-         addressOptions = addressList().filter(function (address) {
--            return address.getType() == 'customer-address'; //eslint-disable-line eqeqeq
-+            return address.getType() === 'customer-address';
-         });
- 
--    addressOptions.push(newAddressOption);
--
-     return Component.extend({
-         defaults: {
--            template: 'Magento_Checkout/billing-address'
-+            template: 'Magento_Checkout/billing-address',
-+            actionsTemplate: 'Magento_Checkout/billing-address/actions',
-+            formTemplate: 'Magento_Checkout/billing-address/form',
-+            detailsTemplate: 'Magento_Checkout/billing-address/details',
-+            links: {
-+                isAddressFormVisible: '${$.billingAddressListProvider}:isNewAddressSelected'
-+            }
-         },
-         currentBillingAddress: quote.billingAddress,
--        addressOptions: addressOptions,
--        customerHasAddresses: addressOptions.length > 1,
-+        customerHasAddresses: addressOptions.length > 0,
- 
-         /**
-          * Init component
-@@ -71,6 +66,7 @@ function (
-             quote.paymentMethod.subscribe(function () {
-                 checkoutDataResolver.resolveBillingAddress();
-             }, this);
-+            shippingRatesValidator.initFields(this.get('name') + '.form-fields');
-         },
- 
-         /**
-@@ -81,7 +77,7 @@ function (
-                 .observe({
-                     selectedAddress: null,
-                     isAddressDetailsVisible: quote.billingAddress() != null,
--                    isAddressFormVisible: !customer.isLoggedIn() || addressOptions.length === 1,
-+                    isAddressFormVisible: !customer.isLoggedIn() || !addressOptions.length,
-                     isAddressSameAsShipping: false,
-                     saveInAddressBook: 1
-                 });
-@@ -144,7 +140,7 @@ function (
-         updateAddress: function () {
-             var addressData, newBillingAddress;
- 
--            if (this.selectedAddress() && this.selectedAddress() != newAddressOption) { //eslint-disable-line eqeqeq
-+            if (this.selectedAddress() && !this.isAddressFormVisible()) {
-                 selectBillingAddress(this.selectedAddress());
-                 checkoutData.setSelectedBillingAddress(this.selectedAddress().getKey());
-             } else {
-@@ -199,6 +195,13 @@ function (
-             }
-         },
- 
-+        /**
-+         * Manage cancel button visibility
-+         */
-+        canUseCancelBillingAddress: ko.computed(function () {
-+            return quote.billingAddress() || lastSelectedBillingAddress;
-+        }),
-+
-         /**
-          * Restore billing address
-          */
-@@ -208,13 +211,6 @@ function (
-             }
-         },
- 
--        /**
--         * @param {Object} address
--         */
--        onAddressChange: function (address) {
--            this.isAddressFormVisible(address == newAddressOption); //eslint-disable-line eqeqeq
--        },
--
-         /**
-          * @param {Number} countryId
-          * @return {*}
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address/list.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address/list.js
-new file mode 100644
-index 00000000000..ca3a267c016
---- /dev/null
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address/list.js
-@@ -0,0 +1,77 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'uiComponent',
-+    'Magento_Customer/js/model/address-list',
-+    'mage/translate',
-+    'Magento_Customer/js/model/customer'
-+], function (Component, addressList, $t, customer) {
-+    'use strict';
-+
-+    var newAddressOption = {
-+            /**
-+             * Get new address label
-+             * @returns {String}
-+             */
-+            getAddressInline: function () {
-+                return $t('New Address');
-+            },
-+            customerAddressId: null
-+        },
-+        addressOptions = addressList().filter(function (address) {
-+            return address.getType() === 'customer-address';
-+        });
-+
-+    return Component.extend({
-+        defaults: {
-+            template: 'Magento_Checkout/billing-address',
-+            selectedAddress: null,
-+            isNewAddressSelected: false,
-+            addressOptions: addressOptions,
-+            exports: {
-+                selectedAddress: '${ $.parentName }:selectedAddress'
-+            }
-+        },
-+
-+        /**
-+         * @returns {Object} Chainable.
-+         */
-+        initConfig: function () {
-+            this._super();
-+            this.addressOptions.push(newAddressOption);
-+
-+            return this;
-+        },
-+
-+        /**
-+         * @return {exports.initObservable}
-+         */
-+        initObservable: function () {
-+            this._super()
-+                .observe('selectedAddress isNewAddressSelected')
-+                .observe({
-+                    isNewAddressSelected: !customer.isLoggedIn() || !addressOptions.length
-+                });
-+
-+            return this;
-+        },
-+
-+        /**
-+         * @param {Object} address
-+         * @return {*}
-+         */
-+        addressOptionsText: function (address) {
-+            return address.getAddressInline();
-+        },
-+
-+        /**
-+         * @param {Object} address
-+         */
-+        onAddressChange: function (address) {
-+            this.isNewAddressSelected(address === newAddressOption);
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js b/app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js
-index 39b5ea0299a..a857d89a72b 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js
-@@ -55,6 +55,12 @@ define(
-                     checkoutDataResolver.resolveEstimationAddress();
-                     address = quote.isVirtual() ? quote.billingAddress() : quote.shippingAddress();
- 
-+                    if (!address && quote.isVirtual()) {
-+                        address = addressConverter.formAddressDataToQuoteAddress(
-+                            checkoutData.getSelectedBillingAddress()
-+                        );
-+                    }
-+
-                     if (address) {
-                         estimatedAddress = address.isEditable() ?
-                             addressConverter.quoteAddressToFormAddressData(address) :
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
-index 4a25778e754..c0de643d3a2 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
-@@ -17,7 +17,16 @@ define([
- ], function ($, Component, ko, customer, checkEmailAvailability, loginAction, quote, checkoutData, fullScreenLoader) {
-     'use strict';
- 
--    var validatedEmail = checkoutData.getValidatedEmailValue();
-+    var validatedEmail;
-+
-+    if (!checkoutData.getValidatedEmailValue() &&
-+        window.checkoutConfig.validatedEmailValue
-+    ) {
-+        checkoutData.setInputFieldEmailValue(window.checkoutConfig.validatedEmailValue);
-+        checkoutData.setValidatedEmailValue(window.checkoutConfig.validatedEmailValue);
-+    }
-+
-+    validatedEmail = checkoutData.getValidatedEmailValue();
- 
-     if (validatedEmail && !customer.isLoggedIn()) {
-         quote.guestEmail = validatedEmail;
-@@ -33,6 +42,9 @@ define([
-             listens: {
-                 email: 'emailHasChanged',
-                 emailFocused: 'validateEmail'
-+            },
-+            ignoreTmpls: {
-+                email: true
-             }
-         },
-         checkDelay: 2000,
-@@ -168,7 +180,7 @@ define([
-         },
- 
-         /**
--         * Resolves an initial sate of a login form.
-+         * Resolves an initial state of a login form.
-          *
-          * @returns {Boolean} - initial visibility state.
-          */
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
-index a2f8c8c56ff..5e29fa209a6 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
-@@ -81,6 +81,7 @@ define([
-         maxItemsToDisplay: window.checkout.maxItemsToDisplay,
-         cart: {},
- 
-+        // jscs:disable requireCamelCaseOrUpperCaseIdentifiers
-         /**
-          * @override
-          */
-@@ -101,12 +102,16 @@ define([
-                 self.isLoading(true);
-             });
- 
--            if (cartData()['website_id'] !== window.checkout.websiteId) {
-+            if (cartData().website_id !== window.checkout.websiteId ||
-+                cartData().store_id !== window.checkout.storeId
-+            ) {
-                 customerData.reload(['cart'], false);
-             }
- 
-             return this._super();
-         },
-+        //jscs:enable requireCamelCaseOrUpperCaseIdentifiers
-+
-         isLoading: ko.observable(false),
-         initSidebar: initSidebar,
- 
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/payment.js b/app/code/Magento/Checkout/view/frontend/web/js/view/payment.js
-index c17e5e40d5c..e8994c61b72 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/view/payment.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/payment.js
-@@ -66,9 +66,21 @@ define([
-         navigate: function () {
-             var self = this;
- 
--            getPaymentInformation().done(function () {
--                self.isVisible(true);
--            });
-+            if (!self.hasShippingMethod()) {
-+                this.isVisible(false);
-+                stepNavigator.setHash('shipping');
-+            } else {
-+                getPaymentInformation().done(function () {
-+                    self.isVisible(true);
-+                });
-+            }
-+        },
-+
-+        /**
-+         * @return {Boolean}
-+         */
-+        hasShippingMethod: function () {
-+            return window.checkoutConfig.selectedShippingMethod !== null;
-         },
- 
-         /**
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
-index 7b200860c4d..1b5463c0770 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
-@@ -133,15 +133,14 @@ define([
-                 event.preventDefault();
-             }
- 
--            if (this.validate() && additionalValidators.validate()) {
-+            if (this.validate() &&
-+                additionalValidators.validate() &&
-+                this.isPlaceOrderActionAllowed() === true
-+            ) {
-                 this.isPlaceOrderActionAllowed(false);
- 
-                 this.getPlaceOrderDeferredObject()
--                    .fail(
--                        function () {
--                            self.isPlaceOrderActionAllowed(true);
--                        }
--                    ).done(
-+                    .done(
-                         function () {
-                             self.afterPlaceOrder();
- 
-@@ -149,6 +148,10 @@ define([
-                                 redirectOnSuccessAction.execute();
-                             }
-                         }
-+                    ).always(
-+                        function () {
-+                            self.isPlaceOrderActionAllowed(true);
-+                        }
-                     );
- 
-                 return true;
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js b/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js
-index 683a18d0e4e..30ea9da1dd6 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js
-@@ -23,11 +23,17 @@ define([
- 
-         /** @inheritdoc */
-         initialize: function () {
-+            var stepsValue;
-+
-             this._super();
-             window.addEventListener('hashchange', _.bind(stepNavigator.handleHash, stepNavigator));
- 
-             if (!window.location.hash) {
--                stepNavigator.setHash(stepNavigator.steps().sort(stepNavigator.sortItems)[0].code);
-+                stepsValue = stepNavigator.steps();
-+
-+                if (stepsValue.length) {
-+                    stepNavigator.setHash(stepsValue.sort(stepNavigator.sortItems)[0].code);
-+                }
-             }
- 
-             stepNavigator.handleHash();
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
-index a7cb7f7e7de..c811d3a1e83 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
-@@ -247,6 +247,8 @@ define([
-          */
-         setShippingInformation: function () {
-             if (this.validateShippingInformation()) {
-+                quote.billingAddress(null);
-+                checkoutDataResolver.resolveBillingAddress();
-                 setShippingInformationAction().done(
-                     function () {
-                         stepNavigator.next();
-@@ -263,7 +265,11 @@ define([
-                 addressData,
-                 loginFormSelector = 'form[data-role=email-with-possible-login]',
-                 emailValidationResult = customer.isLoggedIn(),
--                field;
-+                field,
-+                country = registry.get(this.parentName + '.shippingAddress.shipping-address-fieldset.country_id'),
-+                countryIndexedOptions = country.indexedOptions,
-+                option = countryIndexedOptions[quote.shippingAddress().countryId],
-+                messageContainer = registry.get('checkout.errors').messageContainer;
- 
-             if (!quote.shippingMethod()) {
-                 this.errorValidationMessage(
-@@ -316,6 +322,16 @@ define([
-                     shippingAddress['save_in_address_book'] = 1;
-                 }
-                 selectShippingAddress(shippingAddress);
-+            } else if (customer.isLoggedIn() &&
-+                option &&
-+                option['is_region_required'] &&
-+                !quote.shippingAddress().region
-+            ) {
-+                messageContainer.addErrorMessage({
-+                    message: $t('Please specify a regionId in shipping address.')
-+                });
-+
-+                return false;
-             }
- 
-             if (!emailValidationResult) {
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/summary/item/details/message.js b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/item/details/message.js
-new file mode 100644
-index 00000000000..ed41fd26c47
---- /dev/null
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/item/details/message.js
-@@ -0,0 +1,30 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define(['uiComponent'], function (Component) {
-+    'use strict';
-+
-+    var quoteMessages = window.checkoutConfig.quoteMessages;
-+
-+    return Component.extend({
-+        defaults: {
-+            template: 'Magento_Checkout/summary/item/details/message'
-+        },
-+        displayArea: 'item_message',
-+        quoteMessages: quoteMessages,
-+
-+        /**
-+         * @param {Object} item
-+         * @return {null}
-+         */
-+        getMessage: function (item) {
-+            if (this.quoteMessages[item['item_id']]) {
-+                return this.quoteMessages[item['item_id']];
-+            }
-+
-+            return null;
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js
-index 3fda2603392..10d49265e3b 100644
---- a/app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js
-+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js
-@@ -21,14 +21,21 @@ define([
-          * @return {*}
-          */
-         getShippingMethodTitle: function () {
--            var shippingMethod;
-+            var shippingMethod = '',
-+                shippingMethodTitle = '';
- 
-             if (!this.isCalculated()) {
-                 return '';
-             }
-             shippingMethod = quote.shippingMethod();
- 
--            return shippingMethod ? shippingMethod['carrier_title'] + ' - ' + shippingMethod['method_title'] : '';
-+            if (typeof shippingMethod['method_title'] !== 'undefined') {
-+                shippingMethodTitle = ' - ' + shippingMethod['method_title'];
-+            }
-+
-+            return shippingMethod ?
-+                shippingMethod['carrier_title'] + shippingMethodTitle :
-+                shippingMethod['carrier_title'];
-         },
- 
-         /**
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/authentication.html b/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
-index 406a7d899b6..5b8dde81dd9 100644
---- a/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
-@@ -31,15 +31,15 @@
-         <div class="block block-customer-login"
-              data-bind="attr: {'data-label': $t('or')}">
-             <div class="block-title">
--                <strong id="block-customer-login-heading"
--                        role="heading"
--                        aria-level="2"
--                        data-bind="i18n: 'Sign In'"></strong>
-+                <strong id="block-customer-login-heading-checkout"
-+                    role="heading"
-+                    aria-level="2"
-+                    data-bind="i18n: 'Sign In'"></strong>
-             </div>
-             <!-- ko foreach: getRegion('messages') -->
-             <!-- ko template: getTemplate() --><!-- /ko -->
-             <!--/ko-->
--            <div class="block-content" aria-labelledby="block-customer-login-heading">
-+            <div class="block-content" aria-labelledby="block-customer-login-heading-checkout">
-                 <form data-role="login"
-                       data-bind="submit:login"
-                       method="post">
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
-index 5f735fbb4da..cabfcc9b3db 100644
---- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
-@@ -5,28 +5,18 @@
-  */
- -->
- <div class="checkout-billing-address">
--
-     <div class="billing-address-same-as-shipping-block field choice" data-bind="visible: canUseShippingAddress()">
-         <input type="checkbox" name="billing-address-same-as-shipping"
-                data-bind="checked: isAddressSameAsShipping, click: useShippingAddress, attr: {id: 'billing-address-same-as-shipping-' + getCode($parent)}"/>
-         <label data-bind="attr: {for: 'billing-address-same-as-shipping-' + getCode($parent)}"><span
-                 data-bind="i18n: 'My billing and shipping address are the same'"></span></label>
-     </div>
--
--    <!-- ko template: 'Magento_Checkout/billing-address/details' --><!-- /ko -->
-+    <render args="detailsTemplate"/>
-     <fieldset class="fieldset" data-bind="visible: !isAddressDetailsVisible()">
--        <!-- ko template: 'Magento_Checkout/billing-address/list' --><!-- /ko -->
--        <!-- ko template: 'Magento_Checkout/billing-address/form' --><!-- /ko -->
--        <div class="actions-toolbar">
--            <div class="primary">
--                <button class="action action-update" type="button" data-bind="click: updateAddress">
--                    <span data-bind="i18n: 'Update'"></span>
--                </button>
--                <button class="action action-cancel" type="button" data-bind="click: cancelAddressEdit">
--                    <span data-bind="i18n: 'Cancel'"></span>
--                </button>
--            </div>
-+        <each args="getRegion('billing-address-list')" render="" />
-+        <div data-bind="fadeVisible: isAddressFormVisible">
-+            <render args="formTemplate"/>
-         </div>
-+        <render args="actionsTemplate"/>
-     </fieldset>
--
- </div>
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/actions.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/actions.html
-new file mode 100644
-index 00000000000..860f340d3f7
---- /dev/null
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/actions.html
-@@ -0,0 +1,21 @@
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<div class="actions-toolbar">
-+    <div class="primary">
-+        <button class="action action-update"
-+                type="button"
-+                click="updateAddress">
-+            <span translate="'Update'"/>
-+        </button>
-+        <button class="action action-cancel"
-+                type="button"
-+                click="cancelAddressEdit"
-+                visible="canUseCancelBillingAddress()">
-+            <span translate="'Cancel'"/>
-+        </button>
-+    </div>
-+</div>
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
-index fd994a4e8a9..ea521b3a8af 100644
---- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
-@@ -4,28 +4,37 @@
-  * See COPYING.txt for license details.
-  */
- -->
--<div class="billing-address-details" data-bind="if: isAddressDetailsVisible() && currentBillingAddress()">
--    <!-- ko text: currentBillingAddress().prefix --><!-- /ko --> <!-- ko text: currentBillingAddress().firstname --><!-- /ko --> <!-- ko text: currentBillingAddress().middlename --><!-- /ko -->
--    <!-- ko text: currentBillingAddress().lastname --><!-- /ko --> <!-- ko text: currentBillingAddress().suffix --><!-- /ko --><br/>
--    <!-- ko text: _.values(currentBillingAddress().street).join(", ") --><!-- /ko --><br/>
--    <!-- ko text: currentBillingAddress().city --><!-- /ko -->, <span data-bind="html: currentBillingAddress().region"></span> <!-- ko text: currentBillingAddress().postcode --><!-- /ko --><br/>
--    <!-- ko text: getCountryName(currentBillingAddress().countryId) --><!-- /ko --><br/>
--    <!-- ko if: (currentBillingAddress().telephone) -->
--    <a data-bind="text: currentBillingAddress().telephone, attr: {'href': 'tel:' + currentBillingAddress().telephone}"></a>
--    <!-- /ko --><br/>
--    <!-- ko foreach: { data: currentBillingAddress().customAttributes, as: 'element' } -->
--        <!-- ko foreach: { data: Object.keys(element), as: 'attribute' } -->
--            <!-- ko if: (typeof element[attribute] === "object") -->
--                <!-- ko text: element[attribute].value --><!-- /ko -->
--            <!-- /ko -->
--            <!-- ko if: (typeof element[attribute] === "string") -->
--                <!-- ko text: element[attribute] --><!-- /ko -->
--            <!-- /ko --><br/>
--        <!-- /ko -->
--    <!-- /ko -->
--    <button type="button"
-+<div if="isAddressDetailsVisible() && currentBillingAddress()" class="billing-address-details">
-+    <text args="currentBillingAddress().prefix"/> <text args="currentBillingAddress().firstname"/> <text args="currentBillingAddress().middlename"/>
-+    <text args="currentBillingAddress().lastname"/> <text args="currentBillingAddress().suffix"/><br/>
-+    <text args="_.values(currentBillingAddress().street).join(', ')"/><br/>
-+    <text args="currentBillingAddress().city "/>, <span text="currentBillingAddress().region"></span> <text args="currentBillingAddress().postcode"/><br/>
-+    <text args="getCountryName(currentBillingAddress().countryId)"/><br/>
-+    <a if="currentBillingAddress().telephone" attr="'href': 'tel:' + currentBillingAddress().telephone" text="currentBillingAddress().telephone"></a><br/>
-+
-+    <each args="data: currentBillingAddress().customAttributes, as: 'element'">
-+        <each args="data: Object.keys(element), as: 'attribute'">
-+            <if args="typeof element[attribute] === 'object'">
-+                <if args="element[attribute].label">
-+                    <text args="element[attribute].label"/>
-+                </if>
-+                <ifnot args="element[attribute].label">
-+                    <if args="element[attribute].value">
-+                        <text args="element[attribute].value"/>
-+                    </if>
-+                </ifnot>
-+            </if>
-+            <if args="typeof element[attribute] === 'string'">
-+                <text args="element[attribute]"/>
-+            </if><br/>
-+        </each>
-+    </each>
-+
-+    <button visible="!isAddressSameAsShipping()"
-+            type="button"
-             class="action action-edit-address"
--            data-bind="visible: !isAddressSameAsShipping(), click: editAddress">
--        <span data-bind="i18n: 'Edit'"></span>
-+            click="editAddress">
-+        <span translate="'Edit'"></span>
-     </button>
- </div>
-+
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
-index 54fe9a1f593..e29ed99d17b 100644
---- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- -->
--<div class="billing-address-form" data-bind="fadeVisible: isAddressFormVisible">
-+<div class="billing-address-form">
-     <!-- ko foreach: getRegion('before-fields') -->
-     <!-- ko template: getTemplate() --><!-- /ko -->
-     <!--/ko-->
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html b/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
-index 8d6142e07fc..6a784fa7a04 100644
---- a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
-@@ -14,7 +14,7 @@
-       method="post">
-     <fieldset id="customer-email-fieldset" class="fieldset" data-bind="blockLoader: isLoading">
-         <div class="field required">
--            <label class="label" for="customer-email">
-+            <label class="label" for="checkout-customer-email">
-                 <span data-bind="i18n: 'Email Address'"></span>
-             </label>
-             <div class="control _with-tooltip">
-@@ -26,7 +26,7 @@
-                             mageInit: {'mage/trim-input':{}}"
-                        name="username"
-                        data-validate="{required:true, 'validate-email':true}"
--                       id="customer-email" />
-+                       id="checkout-customer-email" />
-                 <!-- ko template: 'ui/form/element/helper/tooltip' --><!-- /ko -->
-                 <span class="note" data-bind="fadeVisible: isPasswordVisible() == false"><!-- ko i18n: 'You can create an account after checkout.'--><!-- /ko --></span>
-             </div>
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
-index 2daca51a2f5..fb128a891ae 100644
---- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
-@@ -97,7 +97,7 @@
-         </div>
-     </div>
- 
--    <div id="minicart-widgets" class="minicart-widgets">
-+    <div id="minicart-widgets" class="minicart-widgets" if="getRegion('promotion').length">
-         <each args="getRegion('promotion')" render=""/>
-     </div>
- </div>
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/registration.html b/app/code/Magento/Checkout/view/frontend/web/template/registration.html
-index ea94726e544..5cc0d189e7c 100644
---- a/app/code/Magento/Checkout/view/frontend/web/template/registration.html
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/registration.html
-@@ -11,8 +11,8 @@
-     <!-- ko if: isFormVisible -->
-     <p data-bind="i18n: 'You can track your order status by creating an account.'"></p>
-     <p><span data-bind="i18n: 'Email Address'"></span>: <span data-bind="text: getEmailAddress()"></span></p>
--    <form method="get" data-bind="attr: { action: getUrl() }">
--        <input type="submit" class="action primary" data-bind="value: $t('Create an Account')" />
--    </form>
-+    <a class="action primary" data-bind="attr: { href: getUrl() }">
-+        <span data-bind="i18n: 'Create an Account'" />
-+    </a>
-     <!--/ko-->
- </div>
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
-index 2e268461d1e..cf64c0140b9 100644
---- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
-@@ -4,33 +4,40 @@
-  * See COPYING.txt for license details.
-  */
- -->
--<div class="shipping-address-item" data-bind="css: isSelected() ? 'selected-item' : 'not-selected-item'">
--    <!-- ko text: address().prefix --><!-- /ko --> <!-- ko text: address().firstname --><!-- /ko --> <!-- ko text: address().middlename --><!-- /ko -->
--    <!-- ko text: address().lastname --><!-- /ko --> <!-- ko text: address().suffix --><!-- /ko --><br/>
--    <!-- ko text: _.values(address().street).join(", ") --><!-- /ko --><br/>
--    <!-- ko text: address().city --><!-- /ko -->, <span data-bind="html: address().region"></span> <!-- ko text: address().postcode --><!-- /ko --><br/>
--    <!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
--    <!-- ko if: (address().telephone) -->
--    <a data-bind="text: address().telephone, attr: {'href': 'tel:' + address().telephone}"></a>
--    <!-- /ko --><br/>
--    <!-- ko foreach: { data: address().customAttributes, as: 'element' } -->
--        <!-- ko foreach: { data: Object.keys(element), as: 'attribute' } -->
--            <!-- ko if: (typeof element[attribute] === "object") -->
--                <!-- ko text: element[attribute].value --><!-- /ko -->
--            <!-- /ko -->
--            <!-- ko if: (typeof element[attribute] === "string") -->
--                <!-- ko text: element[attribute] --><!-- /ko -->
--            <!-- /ko --><br/>
--        <!-- /ko -->
--    <!-- /ko -->
--    <!-- ko if: (address().isEditable()) -->
--    <button type="button"
-+<div class="shipping-address-item" css="'selected-item' : isSelected() , 'not-selected-item':!isSelected()">
-+    <text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
-+    <text args="address().lastname"/> <text args="address().suffix"/><br/>
-+    <text args="_.values(address().street).join(', ')"/><br/>
-+    <text args="address().city "/>, <span text="address().region"></span> <text args="address().postcode"/><br/>
-+    <text args="getCountryName(address().countryId)"/><br/>
-+    <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
-+
-+    <each args="data: address().customAttributes, as: 'element'">
-+        <each args="data: Object.keys(element), as: 'attribute'">
-+            <if args="typeof element[attribute] === 'object'">
-+                <if args="element[attribute].label">
-+                    <text args="element[attribute].label"/>
-+                </if>
-+                <ifnot args="element[attribute].label">
-+                    <if args="element[attribute].value">
-+                        <text args="element[attribute].value"/>
-+                    </if>
-+                </ifnot>
-+            </if>
-+            <if args="typeof element[attribute] === 'string'">
-+                <text args="element[attribute]"/>
-+            </if><br/>
-+        </each>
-+    </each>
-+
-+    <button visible="address().isEditable()" type="button"
-             class="action edit-address-link"
--            data-bind="click: editAddress, visible: address().isEditable()">
--        <span data-bind="i18n: 'Edit'"></span>
-+            click="editAddress">
-+        <span translate="'Edit'"></span>
-     </button>
--    <!-- /ko -->
--    <button type="button" data-bind="click: selectAddress" class="action action-select-shipping-item">
--        <span data-bind="i18n: 'Ship Here'"></span>
-+    <!-- ko if: (!isSelected()) -->
-+    <button type="button" click="selectAddress" class="action action-select-shipping-item">
-+        <span translate="'Ship Here'"></span>
-     </button>
-+    <!-- /ko -->
- </div>
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
-index b66526f660a..541413955cb 100644
---- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
-@@ -4,23 +4,29 @@
-  * See COPYING.txt for license details.
-  */
- -->
--<!-- ko if: (visible()) -->
--    <!-- ko text: address().prefix --><!-- /ko --> <!-- ko text: address().firstname --><!-- /ko --> <!-- ko text: address().middlename --><!-- /ko -->
--    <!-- ko text: address().lastname --><!-- /ko --> <!-- ko text: address().suffix --><!-- /ko --><br/>
--    <!-- ko text: _.values(address().street).join(", ") --><!-- /ko --><br/>
--    <!-- ko text: address().city --><!-- /ko -->, <span data-bind="html: address().region"></span> <!-- ko text: address().postcode --><!-- /ko --><br/>
--    <!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
--    <!-- ko if: (address().telephone) -->
--    <a data-bind="text: address().telephone, attr: {'href': 'tel:' + address().telephone}"></a>
--    <!-- /ko --><br/>
--    <!-- ko foreach: { data: address().customAttributes, as: 'element' } -->
--        <!-- ko foreach: { data: Object.keys(element), as: 'attribute' } -->
--            <!-- ko if: (typeof element[attribute] === "object") -->
--                <!-- ko text: element[attribute].value --><!-- /ko -->
--            <!-- /ko -->
--            <!-- ko if: (typeof element[attribute] === "string") -->
--                <!-- ko text: element[attribute] --><!-- /ko -->
--            <!-- /ko --><br/>
--        <!-- /ko -->
--    <!-- /ko -->
--<!-- /ko -->
-+<if args="visible()">
-+    <text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
-+    <text args="address().lastname"/> <text args="address().suffix"/><br/>
-+    <text args="_.values(address().street).join(', ')"/><br/>
-+    <text args="address().city "/>, <span text="address().region"></span> <text args="address().postcode"/><br/>
-+    <text args="getCountryName(address().countryId)"/><br/>
-+    <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
-+
-+    <each args="data: address().customAttributes, as: 'element'">
-+        <each args="data: Object.keys(element), as: 'attribute'">
-+            <if args="typeof element[attribute] === 'object'">
-+                <if args="element[attribute].label">
-+                    <text args="element[attribute].label"/>
-+                </if>
-+                <ifnot args="element[attribute].label">
-+                    <if args="element[attribute].value">
-+                        <text args="element[attribute].value"/>
-+                    </if>
-+                </ifnot>
-+            </if>
-+            <if args="typeof element[attribute] === 'string'">
-+                <text args="element[attribute]"/>
-+            </if><br/>
-+        </each>
-+    </each>
-+</if>
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
-index a1a5aa67a96..1fcfa4b3b13 100644
---- a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
-@@ -16,12 +16,14 @@
- 
-         <!-- Address form pop up -->
-         <if args="!isFormInline">
--            <button type="button"
--                    class="action action-show-popup"
--                    click="showFormPopUp"
--                    visible="!isNewAddressAdded()">
--                <span translate="'New Address'" />
--            </button>
-+            <div class="new-address-popup">
-+                <button type="button"
-+                        class="action action-show-popup"
-+                        click="showFormPopUp"
-+                        visible="!isNewAddressAdded()">
-+                    <span translate="'New Address'" />
-+                </button>
-+            </div>
-             <div id="opc-new-shipping-address"
-                  visible="isFormPopUpVisible()"
-                  render="shippingFormTemplate" />
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html
-index 34ec91aa43c..fc74a4691a2 100644
---- a/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html
-@@ -6,7 +6,7 @@
- -->
- <div class="block items-in-cart" data-bind="mageInit: {'collapsible':{'openedState': 'active', 'active': isItemsBlockExpanded()}}">
-     <div class="title" data-role="title">
--        <strong role="heading">
-+        <strong role="heading" aria-level="1">
-             <translate args="maxCartItemsToDisplay" if="maxCartItemsToDisplay < getCartLineItemsCount()"/>
-             <translate args="'of'" if="maxCartItemsToDisplay < getCartLineItemsCount()"/>
-             <span data-bind="text: getCartLineItemsCount()"></span>
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
-index 730ceadbd91..2491ee12d26 100644
---- a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
-@@ -35,7 +35,7 @@
-                     <dd class="values" data-bind="html: full_view"></dd>
-                     <!-- /ko -->
-                     <!-- ko ifnot: ($data.full_view)-->
--                    <dd class="values" data-bind="text: value"></dd>
-+                    <dd class="values" data-bind="html: value"></dd>
-                     <!-- /ko -->
-                 <!-- /ko -->
-             </dl>
-@@ -43,3 +43,6 @@
-     </div>
-     <!-- /ko -->
- </div>
-+<!-- ko foreach: getRegion('item_message') -->
-+    <!-- ko template: getTemplate() --><!-- /ko -->
-+<!-- /ko -->
-diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/message.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/message.html
-new file mode 100644
-index 00000000000..ea8f58cccd5
---- /dev/null
-+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/message.html
-@@ -0,0 +1,9 @@
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<div class="cart item message notice" if="getMessage($parents[1])">
-+    <div data-bind="text: getMessage($parents[1])"></div>
-+</div>
-diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
-index f7b178df996..d727107a86f 100644
---- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
-+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
-@@ -12,8 +12,9 @@ use Magento\Backend\App\Action\Context;
- use Magento\Framework\Registry;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- 
--class Delete extends Agreement
-+class Delete extends Agreement implements HttpPostActionInterface
- {
-     /**
-      * @var CheckoutAgreementsRepositoryInterface
-diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
-index 8bec3b581cd..1a82108a3da 100644
---- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
-+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
-@@ -12,8 +12,9 @@ use Magento\Backend\App\Action\Context;
- use Magento\Framework\Registry;
- use Magento\Framework\App\ObjectManager;
- use Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit as BlockEdit;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- 
--class Edit extends Agreement
-+class Edit extends Agreement implements HttpGetActionInterface
- {
-     /**
-      * @var AgreementFactory
-diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php
-index b1dfd8c304d..d32ee7a4b75 100644
---- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php
-+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
- 
--class Index extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement implements HttpGetActionInterface
- {
-     /**
-      * @return void
-diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php
-index 4d482ebfc20..caa21c46823 100644
---- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php
-+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
- 
--class NewAction extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class NewAction extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement implements HttpGetActionInterface
- {
-     /**
-      * @return void
-diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php
-index 05a16d3dd42..4d4dd076ea1 100644
---- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php
-+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php
-@@ -13,8 +13,9 @@ use Magento\Framework\Registry;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\DataObject;
- use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- 
--class Save extends Agreement
-+class Save extends Agreement implements HttpPostActionInterface
- {
-     /**
-      * @var AgreementFactory
-diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
-index 1f1b5be9683..1217270d780 100644
---- a/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
-+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
-@@ -67,17 +67,18 @@ class AgreementsConfigProvider implements ConfigProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConfig()
-     {
-         $agreements = [];
-         $agreements['checkoutAgreements'] = $this->getAgreementsConfig();
-+
-         return $agreements;
-     }
- 
-     /**
--     * Returns agreements config
-+     * Returns agreements config.
-      *
-      * @return array
-      */
-@@ -99,7 +100,7 @@ class AgreementsConfigProvider implements ConfigProviderInterface
-                 'content' => $agreement->getIsHtml()
-                     ? $agreement->getContent()
-                     : nl2br($this->escaper->escapeHtml($agreement->getContent())),
--                'checkboxText' => $agreement->getCheckboxText(),
-+                'checkboxText' => $this->escaper->escapeHtml($agreement->getCheckboxText()),
-                 'mode' => $agreement->getMode(),
-                 'agreementId' => $agreement->getAgreementId()
-             ];
-diff --git a/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php b/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php
-index 70794d24a64..bc055ca9f66 100644
---- a/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php
-+++ b/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php
-@@ -14,7 +14,7 @@ class Collection extends \Magento\CheckoutAgreements\Model\ResourceModel\Agreeme
- {
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function load($printQuery = false, $logQuery = false)
-     {
-@@ -30,6 +30,8 @@ class Collection extends \Magento\CheckoutAgreements\Model\ResourceModel\Agreeme
-     }
- 
-     /**
-+     * Add stores to result
-+     *
-      * @return void
-      */
-     private function addStoresToResult()
-@@ -56,6 +58,8 @@ class Collection extends \Magento\CheckoutAgreements\Model\ResourceModel\Agreeme
-     }
- 
-     /**
-+     * Get stores for agreements
-+     *
-      * @return array
-      */
-     private function getStoresForAgreements()
-@@ -64,7 +68,7 @@ class Collection extends \Magento\CheckoutAgreements\Model\ResourceModel\Agreeme
- 
-         if (!empty($agreementId)) {
-             $select = $this->getConnection()->select()->from(
--                ['agreement_store' => 'checkout_agreement_store']
-+                ['agreement_store' => $this->getResource()->getTable('checkout_agreement_store')]
-             )->where(
-                 'agreement_store.agreement_id IN (?)',
-                 $agreementId
-diff --git a/app/code/Magento/CheckoutAgreements/Test/Mftf/Data/AdminModuleData.xml b/app/code/Magento/CheckoutAgreements/Test/Mftf/Data/AdminModuleData.xml
-new file mode 100644
-index 00000000000..d42c2c81394
---- /dev/null
-+++ b/app/code/Magento/CheckoutAgreements/Test/Mftf/Data/AdminModuleData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuStoresSettingsTermsAndConditions">
-+        <data key="pageTitle">Terms and Conditions</data>
-+        <data key="title">Terms and Conditions</data>
-+        <data key="dataUiId">magento-checkoutagreements-sales-checkoutagreement</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminStoresTermsAndConditionsNavigateMenuTest.xml b/app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminStoresTermsAndConditionsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..d2d4cb9138b
---- /dev/null
-+++ b/app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminStoresTermsAndConditionsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminStoresTermsAndConditionsNavigateMenuTest">
-+        <annotations>
-+            <features value="CheckoutAgreements"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin stores terms and conditions navigate menu test"/>
-+            <description value="Admin should be able to navigate to Stores > Terms and Conditions"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14148"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresTermsAndConditionsPage">
-+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuStoresSettingsTermsAndConditions.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuStoresSettingsTermsAndConditions.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
-index c59a3d2433e..c8309bacb0a 100644
---- a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
-+++ b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
-@@ -8,6 +8,9 @@ namespace Magento\CheckoutAgreements\Test\Unit\Model;
- use Magento\CheckoutAgreements\Model\AgreementsProvider;
- use Magento\Store\Model\ScopeInterface;
- 
-+/**
-+ * Tests for AgreementsConfigProvider.
-+ */
- class AgreementsConfigProviderTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -35,6 +38,9 @@ class AgreementsConfigProviderTest extends \PHPUnit\Framework\TestCase
-      */
-     private $agreementsFilterMock;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-@@ -59,10 +65,16 @@ class AgreementsConfigProviderTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * Test for getConfig if content is HTML.
-+     *
-+     * @return void
-+     */
-     public function testGetConfigIfContentIsHtml()
-     {
-         $content = 'content';
-         $checkboxText = 'checkbox_text';
-+        $escapedCheckboxText = 'escaped_checkbox_text';
-         $mode = \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO;
-         $agreementId = 100;
-         $expectedResult = [
-@@ -71,12 +83,12 @@ class AgreementsConfigProviderTest extends \PHPUnit\Framework\TestCase
-                 'agreements' => [
-                     [
-                         'content' => $content,
--                        'checkboxText' => $checkboxText,
-+                        'checkboxText' => $escapedCheckboxText,
-                         'mode' => $mode,
--                        'agreementId' => $agreementId
--                    ]
--                ]
--            ]
-+                        'agreementId' => $agreementId,
-+                    ],
-+                ],
-+            ],
-         ];
- 
-         $this->scopeConfigMock->expects($this->once())
-@@ -94,6 +106,11 @@ class AgreementsConfigProviderTest extends \PHPUnit\Framework\TestCase
-             ->with($searchCriteriaMock)
-             ->willReturn([$agreement]);
- 
-+        $this->escaperMock->expects($this->once())
-+            ->method('escapeHtml')
-+            ->with($checkboxText)
-+            ->willReturn($escapedCheckboxText);
-+
-         $agreement->expects($this->once())->method('getIsHtml')->willReturn(true);
-         $agreement->expects($this->once())->method('getContent')->willReturn($content);
-         $agreement->expects($this->once())->method('getCheckboxText')->willReturn($checkboxText);
-@@ -103,11 +120,17 @@ class AgreementsConfigProviderTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($expectedResult, $this->model->getConfig());
-     }
- 
-+    /**
-+     * Test for getConfig if content is not HTML.
-+     *
-+     * @return void
-+     */
-     public function testGetConfigIfContentIsNotHtml()
-     {
-         $content = 'content';
-         $escapedContent = 'escaped_content';
-         $checkboxText = 'checkbox_text';
-+        $escapedCheckboxText = 'escaped_checkbox_text';
-         $mode = \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO;
-         $agreementId = 100;
-         $expectedResult = [
-@@ -116,12 +139,12 @@ class AgreementsConfigProviderTest extends \PHPUnit\Framework\TestCase
-                 'agreements' => [
-                     [
-                         'content' => $escapedContent,
--                        'checkboxText' => $checkboxText,
-+                        'checkboxText' => $escapedCheckboxText,
-                         'mode' => $mode,
--                        'agreementId' => $agreementId
--                    ]
--                ]
--            ]
-+                        'agreementId' => $agreementId,
-+                    ],
-+                ],
-+            ],
-         ];
- 
-         $this->scopeConfigMock->expects($this->once())
-@@ -139,8 +162,11 @@ class AgreementsConfigProviderTest extends \PHPUnit\Framework\TestCase
-             ->with($searchCriteriaMock)
-             ->willReturn([$agreement]);
- 
--        $this->escaperMock->expects($this->once())->method('escapeHtml')->with($content)->willReturn($escapedContent);
--
-+        $this->escaperMock->expects($this->at(0))->method('escapeHtml')->with($content)->willReturn($escapedContent);
-+        $this->escaperMock->expects($this->at(1))
-+            ->method('escapeHtml')
-+            ->with($checkboxText)
-+            ->willReturn($escapedCheckboxText);
-         $agreement->expects($this->once())->method('getIsHtml')->willReturn(false);
-         $agreement->expects($this->once())->method('getContent')->willReturn($content);
-         $agreement->expects($this->once())->method('getCheckboxText')->willReturn($checkboxText);
-diff --git a/app/code/Magento/CheckoutAgreements/etc/db_schema.xml b/app/code/Magento/CheckoutAgreements/etc/db_schema.xml
-index 31b3111df98..09cd1c5b639 100644
---- a/app/code/Magento/CheckoutAgreements/etc/db_schema.xml
-+++ b/app/code/Magento/CheckoutAgreements/etc/db_schema.xml
-@@ -20,7 +20,7 @@
-                 default="0" comment="Is Html"/>
-         <column xsi:type="smallint" name="mode" padding="6" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Applied mode"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="agreement_id"/>
-         </constraint>
-     </table>
-@@ -29,14 +29,14 @@
-                 comment="Agreement Id"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Store Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="agreement_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CHKT_AGRT_STORE_AGRT_ID_CHKT_AGRT_AGRT_ID" table="checkout_agreement_store"
-+        <constraint xsi:type="foreign" referenceId="CHKT_AGRT_STORE_AGRT_ID_CHKT_AGRT_AGRT_ID" table="checkout_agreement_store"
-                     column="agreement_id" referenceTable="checkout_agreement" referenceColumn="agreement_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CHECKOUT_AGREEMENT_STORE_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CHECKOUT_AGREEMENT_STORE_STORE_ID_STORE_STORE_ID"
-                     table="checkout_agreement_store" column="store_id" referenceTable="store" referenceColumn="store_id"
-                     onDelete="CASCADE"/>
-     </table>
-diff --git a/app/code/Magento/CheckoutAgreements/etc/di.xml b/app/code/Magento/CheckoutAgreements/etc/di.xml
-index 081e3daa781..a8ff8f5941f 100644
---- a/app/code/Magento/CheckoutAgreements/etc/di.xml
-+++ b/app/code/Magento/CheckoutAgreements/etc/di.xml
-@@ -23,7 +23,7 @@
-     <type name="Magento\Checkout\Api\GuestPaymentInformationManagementInterface">
-         <plugin name="validate-guest-agreements" type="Magento\CheckoutAgreements\Model\Checkout\Plugin\GuestValidation"/>
-     </type>
--    <type name="\Magento\CheckoutAgreements\Model\CheckoutAgreementsList">
-+    <type name="Magento\CheckoutAgreements\Model\CheckoutAgreementsList">
-         <arguments>
-             <argument name="collectionProcessor" xsi:type="object">Magento\CheckoutAgreements\Model\Api\SearchCriteria\CollectionProcessor</argument>
-         </arguments>
-diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml
-index 3f742de0177..122160f1a10 100644
---- a/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml
-+++ b/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml
-@@ -8,7 +8,7 @@
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceBlock name="checkout_overview">
--            <block class="Magento\CheckoutAgreements\Block\Agreements" name="checkout.multishipping.agreements" as="agreements" template="Magento_CheckoutAgreements::multishipping_agreements.phtml"/>
-+            <block class="Magento\CheckoutAgreements\Block\Agreements" name="checkout.multishipping.agreements" as="agreements" template="Magento_CheckoutAgreements::additional_agreements.phtml"/>
-         </referenceBlock>
-     </body>
- </page>
-diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
-index 28a6e998d8d..9013a39f8e6 100644
---- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
-+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\CheckoutAgreements\Block\Agreements
-  */
-diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
-index b0c6384bcc9..5cb256090c1 100644
---- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
-+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Files.LineLength
- 
- ?>
- <?php
-@@ -17,30 +17,42 @@
- } ?>
- <ol id="checkout-agreements" class="agreements checkout items">
-     <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
--    <?php foreach ($block->getAgreements() as $agreement): ?>
-+    <?php foreach ($block->getAgreements() as $agreement) :?>
-         <li class="item">
--            <div class="checkout-agreement-item-content"<?= ($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
--                <?php if ($agreement->getIsHtml()):?>
--                    <?= /* @escapeNotVerified */ $agreement->getContent() ?>
--                <?php else:?>
--                    <?= nl2br($block->escapeHtml($agreement->getContent())) ?>
-+            <div class="checkout-agreement-item-content"<?= $block->escapeHtmlAttr($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
-+                <?php if ($agreement->getIsHtml()) :?>
-+                    <?= /* @noEscape */ $agreement->getContent() ?>
-+                <?php else :?>
-+                    <?= $block->escapeHtml(nl2br($agreement->getContent())) ?>
-                 <?php endif; ?>
-             </div>
--            <form id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree required">
--                <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
-+            <form id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>" class="field choice agree required">
-+                <?php if ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL) :?>
-                 <input type="checkbox"
--                       id="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>"
--                       name="agreement[<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>]"
-+                       id="agreement-<?= (int) $agreement->getAgreementId() ?>"
-+                       name="agreement[<?= (int) $agreement->getAgreementId() ?>]"
-                        value="1"
-                        title="<?= $block->escapeHtml($agreement->getCheckboxText()) ?>"
-                        class="checkbox"
-                        data-validate="{required:true}"/>
--                <label class="label" for="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>">
--                    <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
-+                <label class="label" for="agreement-<?= (int) $agreement->getAgreementId() ?>">
-+                    <span>
-+                        <?php if ($agreement->getIsHtml()) :?>
-+                            <?= /* @noEscape */ $agreement->getCheckboxText() ?>
-+                        <?php else :?>
-+                            <?= $block->escapeHtml($agreement->getCheckboxText()) ?>
-+                        <?php endif; ?>
-+                    </span>
-                 </label>
--                <?php elseif($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?>
--                <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree">
--                    <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
-+                <?php elseif ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO) :?>
-+                <div id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>" class="field choice agree">
-+                    <span>
-+                        <?php if ($agreement->getIsHtml()) :?>
-+                            <?= /* @noEscape */ $agreement->getCheckboxText() ?>
-+                        <?php else :?>
-+                            <?= $block->escapeHtml($agreement->getCheckboxText()) ?>
-+                        <?php endif; ?>
-+                    </span>
-                 </div>
-                 <?php endif; ?>
-             </form>
-diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
-index 3400770f5ce..fb2d5168d21 100644
---- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
-+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
-@@ -4,7 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// @deprecated
-+// phpcs:disable Magento2.Files.LineLength
- 
- ?>
- <?php
-@@ -17,31 +18,43 @@
- } ?>
- <ol id="checkout-agreements" class="agreements checkout items">
-     <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
--    <?php foreach ($block->getAgreements() as $agreement): ?>
-+    <?php foreach ($block->getAgreements() as $agreement) :?>
-         <li class="item">
--            <div class="checkout-agreement-item-content"<?= ($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
--                <?php if ($agreement->getIsHtml()):?>
--                    <?= /* @escapeNotVerified */ $agreement->getContent() ?>
--                <?php else:?>
--                    <?= nl2br($block->escapeHtml($agreement->getContent())) ?>
-+            <div class="checkout-agreement-item-content"<?= $block->escapeHtmlAttr($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
-+                <?php if ($agreement->getIsHtml()) :?>
-+                    <?= /* @noEscape */ $agreement->getContent() ?>
-+                <?php else :?>
-+                    <?= $block->escapeHtml(nl2br($agreement->getContent())) ?>
-                 <?php endif; ?>
-             </div>
--            <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
--            <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree required">
-+            <?php if ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL) :?>
-+            <div id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>" class="field choice agree required">
-                 <input type="checkbox"
--                       id="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>"
--                       name="agreement[<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>]"
-+                       id="agreement-<?= (int) $agreement->getAgreementId() ?>"
-+                       name="agreement[<?= (int) $agreement->getAgreementId() ?>]"
-                        value="1"
-                        title="<?= $block->escapeHtml($agreement->getCheckboxText()) ?>"
-                        class="checkbox"
-                        data-validate="{required:true}"/>
--                <label class="label" for="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>">
--                    <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
-+                <label class="label" for="agreement-<?= (int) $agreement->getAgreementId() ?>">
-+                    <span>
-+                        <?php if ($agreement->getIsHtml()) :?>
-+                            <?= /* @noEscape */ $agreement->getCheckboxText() ?>
-+                        <?php else :?>
-+                            <?= $block->escapeHtml($agreement->getCheckboxText()) ?>
-+                        <?php endif; ?>
-+                    </span>
-                 </label>
-             </div>
--            <?php elseif($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?>
--            <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree">
--                <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
-+            <?php elseif ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO) :?>
-+            <div id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>" class="field choice agree">
-+                <span>
-+                    <?php if ($agreement->getIsHtml()) :?>
-+                        <?= /* @noEscape */ $agreement->getCheckboxText() ?>
-+                    <?php else :?>
-+                        <?= $block->escapeHtml($agreement->getCheckboxText()) ?>
-+                    <?php endif; ?>
-+                </span>
-             </div>
-             <?php endif; ?>
-         </li>
-diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js b/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js
-index 157923323fd..cbd06b51fe1 100644
---- a/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js
-+++ b/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js
-@@ -19,7 +19,7 @@ define([
-          *
-          * @returns {Boolean}
-          */
--        validate: function () {
-+        validate: function (hideError) {
-             var isValid = true;
- 
-             if (!agreementsConfig.isEnabled || $(agreementsInputPath).length === 0) {
-@@ -28,7 +28,8 @@ define([
- 
-             $(agreementsInputPath).each(function (index, element) {
-                 if (!$.validator.validateSingleElement(element, {
--                    errorElement: 'div'
-+                    errorElement: 'div',
-+                    hideError: hideError || false
-                 })) {
-                     isValid = false;
-                 }
-diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
-index a448537d64e..4b1a68624e5 100644
---- a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
-+++ b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
-@@ -5,17 +5,17 @@
-  */
- -->
- <div data-role="checkout-agreements">
--    <div class="checkout-agreements" data-bind="visible: isVisible">
-+    <div class="checkout-agreements fieldset" data-bind="visible: isVisible">
-         <!-- ko foreach: agreements -->
-             <!-- ko if: ($parent.isAgreementRequired($data)) -->
--            <div class="checkout-agreement required">
-+            <div class="checkout-agreement field choice required">
-                 <input type="checkbox" class="required-entry"
-                        data-bind="attr: {
-                                     'id': $parent.getCheckboxId($parentContext, agreementId),
-                                     'name': 'agreement[' + agreementId + ']',
-                                     'value': agreementId
-                                     }"/>
--                <label data-bind="attr: {'for': $parent.getCheckboxId($parentContext, agreementId)}">
-+                <label class="label" data-bind="attr: {'for': $parent.getCheckboxId($parentContext, agreementId)}">
-                     <button type="button"
-                             class="action action-show"
-                             data-bind="click: function(data, event) { return $parent.showContent(data, event) }"
-diff --git a/app/code/Magento/CheckoutAgreementsGraphQl/Model/Resolver/CheckoutAgreements.php b/app/code/Magento/CheckoutAgreementsGraphQl/Model/Resolver/CheckoutAgreements.php
-new file mode 100644
-index 00000000000..3daf88226d8
---- /dev/null
-+++ b/app/code/Magento/CheckoutAgreementsGraphQl/Model/Resolver/CheckoutAgreements.php
-@@ -0,0 +1,91 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CheckoutAgreementsGraphQl\Model\Resolver;
-+
-+use Magento\CheckoutAgreements\Model\AgreementModeOptions;
-+use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\CheckoutAgreements\Api\Data\AgreementInterface;
-+use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Checkout Agreements resolver, used for GraphQL request processing
-+ */
-+class CheckoutAgreements implements ResolverInterface
-+{
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $agreementCollectionFactory;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @param CollectionFactory $agreementCollectionFactory
-+     * @param StoreManagerInterface $storeManager
-+     * @param ScopeConfigInterface $scopeConfig
-+     */
-+    public function __construct(
-+        CollectionFactory $agreementCollectionFactory,
-+        StoreManagerInterface $storeManager,
-+        ScopeConfigInterface $scopeConfig
-+    ) {
-+        $this->agreementCollectionFactory = $agreementCollectionFactory;
-+        $this->storeManager = $storeManager;
-+        $this->scopeConfig = $scopeConfig;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (!$this->scopeConfig->isSetFlag('checkout/options/enable_agreements', ScopeInterface::SCOPE_STORE)) {
-+            return [];
-+        }
-+
-+        /** @var Collection $agreementsCollection */
-+        $agreementsCollection = $this->agreementCollectionFactory->create();
-+        $agreementsCollection->addStoreFilter($this->storeManager->getStore()->getId());
-+        $agreementsCollection->addFieldToFilter(AgreementInterface::IS_ACTIVE, 1);
-+
-+        $checkoutAgreementData = [];
-+        /** @var AgreementInterface $checkoutAgreement */
-+        foreach ($agreementsCollection->getItems() as $checkoutAgreement) {
-+            $checkoutAgreementData[] = [
-+                AgreementInterface::AGREEMENT_ID => $checkoutAgreement->getAgreementId(),
-+                AgreementInterface::CONTENT => $checkoutAgreement->getContent(),
-+                AgreementInterface::NAME => $checkoutAgreement->getName(),
-+                AgreementInterface::CONTENT_HEIGHT => $checkoutAgreement->getContentHeight(),
-+                AgreementInterface::CHECKBOX_TEXT => $checkoutAgreement->getCheckboxText(),
-+                AgreementInterface::IS_HTML => $checkoutAgreement->getIsHtml(),
-+                AgreementInterface::MODE =>
-+                    AgreementModeOptions::MODE_AUTO === (int)$checkoutAgreement->getMode() ? 'AUTO' : 'MANUAL',
-+            ];
-+        }
-+        return $checkoutAgreementData;
-+    }
-+}
-diff --git a/app/code/Magento/CheckoutAgreementsGraphQl/README.md b/app/code/Magento/CheckoutAgreementsGraphQl/README.md
-new file mode 100644
-index 00000000000..3ef735e3937
---- /dev/null
-+++ b/app/code/Magento/CheckoutAgreementsGraphQl/README.md
-@@ -0,0 +1,4 @@
-+# CheckoutAgreementsGraphQl
-+
-+**CheckoutAgreementsGraphQl** provides type information for the GraphQl module
-+to generate Checkout Agreements fields for Checkout Agreements information endpoints.
-diff --git a/app/code/Magento/CheckoutAgreementsGraphQl/composer.json b/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
-new file mode 100644
-index 00000000000..5972d48b35e
---- /dev/null
-+++ b/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
-@@ -0,0 +1,26 @@
-+{
-+    "name": "magento/module-checkout-agreements-graph-ql",
-+    "description": "N/A",
-+    "type": "magento2-module",
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-store": "*",
-+        "magento/module-checkout-agreements": "*"
-+    },
-+    "suggest": {
-+        "magento/module-graph-ql": "*"
-+    },
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\CheckoutAgreementsGraphQl\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/CheckoutAgreementsGraphQl/etc/module.xml b/app/code/Magento/CheckoutAgreementsGraphQl/etc/module.xml
-new file mode 100644
-index 00000000000..d18e8ee17d0
---- /dev/null
-+++ b/app/code/Magento/CheckoutAgreementsGraphQl/etc/module.xml
-@@ -0,0 +1,10 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_CheckoutAgreementsGraphQl" />
-+</config>
-diff --git a/app/code/Magento/CheckoutAgreementsGraphQl/etc/schema.graphqls b/app/code/Magento/CheckoutAgreementsGraphQl/etc/schema.graphqls
-new file mode 100644
-index 00000000000..64ef9411dfc
---- /dev/null
-+++ b/app/code/Magento/CheckoutAgreementsGraphQl/etc/schema.graphqls
-@@ -0,0 +1,21 @@
-+# Copyright © Magento, Inc. All rights reserved.
-+# See COPYING.txt for license details.
-+
-+type Query {
-+    checkoutAgreements: [CheckoutAgreement] @resolver(class: "Magento\\CheckoutAgreementsGraphQl\\Model\\Resolver\\CheckoutAgreements") @doc(description: "The Checkout Agreements information")
-+}
-+
-+type CheckoutAgreement @doc(description: "Defines all Checkout Agreement information") {
-+    agreement_id: Int! @doc(description: "Checkout Agreement identifier")
-+    name: String! @doc(description: "Checkout Agreement name")
-+    content: String! @doc(description: "Checkout Agreement content")
-+    content_height: String @doc(description: "Checkout Agreement content height")
-+    checkbox_text: String! @doc(description: "Checkout Agreement checkbox text")
-+    is_html: Boolean! @doc(description: "Is Checkout Agreement content in HTML format")
-+    mode: CheckoutAgreementMode!
-+}
-+
-+enum CheckoutAgreementMode {
-+    AUTO
-+    MANUAL
-+}
-diff --git a/app/code/Magento/CheckoutAgreementsGraphQl/registration.php b/app/code/Magento/CheckoutAgreementsGraphQl/registration.php
-new file mode 100644
-index 00000000000..b0b4839f33d
---- /dev/null
-+++ b/app/code/Magento/CheckoutAgreementsGraphQl/registration.php
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CheckoutAgreementsGraphQl', __DIR__);
-diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php
-index a7410cac64d..51a9313fdef 100644
---- a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php
-+++ b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php
-@@ -13,7 +13,7 @@ use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
- class DeleteButton extends GenericButton implements ButtonProviderInterface
- {
-     /**
--     * @return array
-+     * @inheritDoc
-      */
-     public function getButtonData()
-     {
-@@ -24,7 +24,7 @@ class DeleteButton extends GenericButton implements ButtonProviderInterface
-                 'class' => 'delete',
-                 'on_click' => 'deleteConfirm(\'' . __(
-                     'Are you sure you want to do this?'
--                ) . '\', \'' . $this->getDeleteUrl() . '\')',
-+                ) . '\', \'' . $this->getDeleteUrl() . '\', {"data": {}})',
-                 'sort_order' => 20,
-             ];
-         }
-@@ -32,6 +32,8 @@ class DeleteButton extends GenericButton implements ButtonProviderInterface
-     }
- 
-     /**
-+     * URL to send delete requests to.
-+     *
-      * @return string
-      */
-     public function getDeleteUrl()
-diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php
-index 1fc599e4c85..b434fd3f5d3 100644
---- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php
-+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php
-@@ -13,7 +13,7 @@ use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
- class DeleteButton extends GenericButton implements ButtonProviderInterface
- {
-     /**
--     * @return array
-+     * @inheritDoc
-      */
-     public function getButtonData()
-     {
-@@ -24,7 +24,7 @@ class DeleteButton extends GenericButton implements ButtonProviderInterface
-                 'class' => 'delete',
-                 'on_click' => 'deleteConfirm(\'' . __(
-                     'Are you sure you want to do this?'
--                ) . '\', \'' . $this->getDeleteUrl() . '\')',
-+                ) . '\', \'' . $this->getDeleteUrl() . '\', {"data": {}})',
-                 'sort_order' => 20,
-             ];
-         }
-@@ -32,6 +32,8 @@ class DeleteButton extends GenericButton implements ButtonProviderInterface
-     }
- 
-     /**
-+     * Url to send delete requests to.
-+     *
-      * @return string
-      */
-     public function getDeleteUrl()
-diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php
-index 67ae137fb4d..08ba2c3fff3 100644
---- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php
-+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php
-@@ -5,8 +5,9 @@
-  */
- namespace Magento\Cms\Block\Adminhtml\Page\Grid\Renderer\Action;
- 
--use Magento\Store\Api\StoreResolverInterface;
--
-+/**
-+ * Url builder class used to compose dynamic urls.
-+ */
- class UrlBuilder
- {
-     /**
-@@ -32,15 +33,25 @@ class UrlBuilder
-      */
-     public function getUrl($routePath, $scope, $store)
-     {
--        $this->frontendUrlBuilder->setScope($scope);
--        $href = $this->frontendUrlBuilder->getUrl(
--            $routePath,
--            [
--                '_current' => false,
--                '_nosid' => true,
--                '_query' => [StoreResolverInterface::PARAM_NAME => $store]
--            ]
--        );
-+        if ($scope) {
-+            $this->frontendUrlBuilder->setScope($scope);
-+            $href = $this->frontendUrlBuilder->getUrl(
-+                $routePath,
-+                [
-+                    '_current' => false,
-+                    '_nosid' => true,
-+                    '_query' => [\Magento\Store\Model\StoreManagerInterface::PARAM_NAME => $store]
-+                ]
-+            );
-+        } else {
-+            $href = $this->frontendUrlBuilder->getUrl(
-+                $routePath,
-+                [
-+                    '_current' => false,
-+                    '_nosid' => true
-+                ]
-+            );
-+        }
- 
-         return $href;
-     }
-diff --git a/app/code/Magento/Cms/Block/Block.php b/app/code/Magento/Cms/Block/Block.php
-index d0d75ea6911..c611f4b1e9f 100644
---- a/app/code/Magento/Cms/Block/Block.php
-+++ b/app/code/Magento/Cms/Block/Block.php
-@@ -84,4 +84,14 @@ class Block extends AbstractBlock implements \Magento\Framework\DataObject\Ident
-     {
-         return [\Magento\Cms\Model\Block::CACHE_TAG . '_' . $this->getBlockId()];
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getCacheKeyInfo()
-+    {
-+        $cacheKeyInfo = parent::getCacheKeyInfo();
-+        $cacheKeyInfo[] = $this->_storeManager->getStore()->getId();
-+        return $cacheKeyInfo;
-+    }
- }
-diff --git a/app/code/Magento/Cms/Block/Widget/Block.php b/app/code/Magento/Cms/Block/Widget/Block.php
-index d8bd483fae5..c665f2afc5d 100644
---- a/app/code/Magento/Cms/Block/Widget/Block.php
-+++ b/app/code/Magento/Cms/Block/Widget/Block.php
-@@ -3,14 +3,22 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Cms\Block\Widget;
- 
-+use Magento\Framework\DataObject\IdentityInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Cms\Model\Block as CmsBlock;
-+use Magento\Widget\Block\BlockInterface;
-+
- /**
-  * Cms Static Block Widget
-  *
-- * @author     Magento Core Team <core@magentocommerce.com>
-+ * @author Magento Core Team <core@magentocommerce.com>
-  */
--class Block extends \Magento\Framework\View\Element\Template implements \Magento\Widget\Block\BlockInterface
-+class Block extends \Magento\Framework\View\Element\Template implements BlockInterface, IdentityInterface
- {
-     /**
-      * @var \Magento\Cms\Model\Template\FilterProvider
-@@ -31,6 +39,11 @@ class Block extends \Magento\Framework\View\Element\Template implements \Magento
-      */
-     protected $_blockFactory;
- 
-+    /**
-+     * @var CmsBlock
-+     */
-+    private $block;
-+
-     /**
-      * @param \Magento\Framework\View\Element\Template\Context $context
-      * @param \Magento\Cms\Model\Template\FilterProvider $filterProvider
-@@ -49,8 +62,9 @@ class Block extends \Magento\Framework\View\Element\Template implements \Magento
-     }
- 
-     /**
--     * Prepare block text and determine whether block output enabled or not
--     * Prevent blocks recursion if needed
-+     * Prepare block text and determine whether block output enabled or not.
-+     *
-+     * Prevent blocks recursion if needed.
-      *
-      * @return $this
-      */
-@@ -65,19 +79,63 @@ class Block extends \Magento\Framework\View\Element\Template implements \Magento
-         }
-         self::$_widgetUsageMap[$blockHash] = true;
- 
--        if ($blockId) {
--            $storeId = $this->_storeManager->getStore()->getId();
--            /** @var \Magento\Cms\Model\Block $block */
--            $block = $this->_blockFactory->create();
--            $block->setStoreId($storeId)->load($blockId);
--            if ($block->isActive()) {
-+        $block = $this->getBlock();
-+
-+        if ($block && $block->isActive()) {
-+            try {
-+                $storeId = $this->getData('store_id') ?? $this->_storeManager->getStore()->getId();
-                 $this->setText(
-                     $this->_filterProvider->getBlockFilter()->setStoreId($storeId)->filter($block->getContent())
-                 );
-+            } catch (NoSuchEntityException $e) {
-             }
-         }
--
-         unset(self::$_widgetUsageMap[$blockHash]);
-         return $this;
-     }
-+
-+    /**
-+     * Get identities of the Cms Block
-+     *
-+     * @return array
-+     */
-+    public function getIdentities()
-+    {
-+        $block = $this->getBlock();
-+
-+        if ($block) {
-+            return $block->getIdentities();
-+        }
-+
-+        return [];
-+    }
-+
-+    /**
-+     * Get block
-+     *
-+     * @return CmsBlock|null
-+     */
-+    private function getBlock(): ?CmsBlock
-+    {
-+        if ($this->block) {
-+            return $this->block;
-+        }
-+
-+        $blockId = $this->getData('block_id');
-+
-+        if ($blockId) {
-+            try {
-+                $storeId = $this->_storeManager->getStore()->getId();
-+                /** @var \Magento\Cms\Model\Block $block */
-+                $block = $this->_blockFactory->create();
-+                $block->setStoreId($storeId)->load($blockId);
-+                $this->block = $block;
-+
-+                return $block;
-+            } catch (NoSuchEntityException $e) {
-+            }
-+        }
-+
-+        return null;
-+    }
- }
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
-index 3aaf40e7d0a..4af6b684496 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Cms\Controller\Adminhtml\Block;
- 
--class Delete extends \Magento\Cms\Controller\Adminhtml\Block
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+class Delete extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostActionInterface
- {
-     /**
-      * Delete action
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
-index 87560890632..655b3eb5b91 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
-@@ -5,7 +5,12 @@
-  */
- namespace Magento\Cms\Controller\Adminhtml\Block;
- 
--class Edit extends \Magento\Cms\Controller\Adminhtml\Block
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+
-+/**
-+ * Edit CMS block action.
-+ */
-+class Edit extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
-index a4096e4d1a4..b7504a5c2b2 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
-@@ -1,12 +1,16 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Cms\Controller\Adminhtml\Block;
- 
--class Index extends \Magento\Cms\Controller\Adminhtml\Block
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+
-+/**
-+ * Index action.
-+ */
-+class Index extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
-index 92bc7ad71f5..ccdddc7c2b5 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
-@@ -6,6 +6,7 @@
-  */
- namespace Magento\Cms\Controller\Adminhtml\Block;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Backend\App\Action\Context;
- use Magento\Ui\Component\MassAction\Filter;
-@@ -14,7 +15,7 @@ use Magento\Cms\Model\ResourceModel\Block\CollectionFactory;
- /**
-  * Class MassDelete
-  */
--class MassDelete extends \Magento\Backend\App\Action
-+class MassDelete extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
-index cfac00915c9..5983594f876 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
-@@ -1,12 +1,16 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Cms\Controller\Adminhtml\Block;
- 
--class NewAction extends \Magento\Cms\Controller\Adminhtml\Block
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+
-+/**
-+ * Create CMS block action.
-+ */
-+class NewAction extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
-index 40974b7a4b5..0c6c6470398 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
-@@ -1,11 +1,11 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Cms\Controller\Adminhtml\Block;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Backend\App\Action\Context;
- use Magento\Cms\Api\BlockRepositoryInterface;
- use Magento\Cms\Model\Block;
-@@ -14,7 +14,10 @@ use Magento\Framework\App\Request\DataPersistorInterface;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Registry;
- 
--class Save extends \Magento\Cms\Controller\Adminhtml\Block
-+/**
-+ * Save CMS block action.
-+ */
-+class Save extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostActionInterface
- {
-     /**
-      * @var DataPersistorInterface
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
-index 16c99e9857c..15bb4093053 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
-@@ -1,12 +1,16 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Cms\Controller\Adminhtml\Page;
- 
--class Delete extends \Magento\Backend\App\Action
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Delete CMS page action.
-+ */
-+class Delete extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
-index 6d51c28b6ac..f50fb2b19c0 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
-@@ -1,14 +1,17 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Cms\Controller\Adminhtml\Page;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Backend\App\Action;
- 
--class Edit extends \Magento\Backend\App\Action
-+/**
-+ * Edit CMS page action.
-+ */
-+class Edit extends \Magento\Backend\App\Action implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
-index 75f9ad70dc4..d0ee1453eda 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
-@@ -1,15 +1,20 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Cms\Controller\Adminhtml\Page;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Backend\App\Action\Context;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\App\Request\DataPersistorInterface;
- use Magento\Framework\View\Result\PageFactory;
- 
--class Index extends \Magento\Backend\App\Action
-+/**
-+ * Index action.
-+ */
-+class Index extends \Magento\Backend\App\Action implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -23,16 +28,24 @@ class Index extends \Magento\Backend\App\Action
-      */
-     protected $resultPageFactory;
- 
-+    /**
-+     * @var DataPersistorInterface
-+     */
-+    private $dataPersistor;
-+
-     /**
-      * @param Context $context
-      * @param PageFactory $resultPageFactory
-+     * @param DataPersistorInterface $dataPersistor
-      */
-     public function __construct(
-         Context $context,
--        PageFactory $resultPageFactory
-+        PageFactory $resultPageFactory,
-+        DataPersistorInterface $dataPersistor = null
-     ) {
-         parent::__construct($context);
-         $this->resultPageFactory = $resultPageFactory;
-+        $this->dataPersistor = $dataPersistor ?: ObjectManager::getInstance()->get(DataPersistorInterface::class);
-     }
- 
-     /**
-@@ -49,8 +62,7 @@ class Index extends \Magento\Backend\App\Action
-         $resultPage->addBreadcrumb(__('Manage Pages'), __('Manage Pages'));
-         $resultPage->getConfig()->getTitle()->prepend(__('Pages'));
- 
--        $dataPersistor = $this->_objectManager->get(\Magento\Framework\App\Request\DataPersistorInterface::class);
--        $dataPersistor->clear('cms_page');
-+        $this->dataPersistor->clear('cms_page');
- 
-         return $resultPage;
-     }
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
-index a1d32aa97a3..222849f9760 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Cms\Controller\Adminhtml\Page;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Backend\App\Action\Context;
- use Magento\Ui\Component\MassAction\Filter;
-@@ -13,7 +14,7 @@ use Magento\Cms\Model\ResourceModel\Page\CollectionFactory;
- /**
-  * Class MassDelete
-  */
--class MassDelete extends \Magento\Backend\App\Action
-+class MassDelete extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
-index a85b8ecd5e5..0a8c667d4d7 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Cms\Controller\Adminhtml\Page;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Backend\App\Action\Context;
- use Magento\Ui\Component\MassAction\Filter;
-@@ -13,7 +14,7 @@ use Magento\Cms\Model\ResourceModel\Page\CollectionFactory;
- /**
-  * Class MassDisable
-  */
--class MassDisable extends \Magento\Backend\App\Action
-+class MassDisable extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
-index 3f26769e4c9..e2cb8d984e0 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Cms\Controller\Adminhtml\Page;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Backend\App\Action\Context;
- use Magento\Ui\Component\MassAction\Filter;
-@@ -13,7 +14,7 @@ use Magento\Cms\Model\ResourceModel\Page\CollectionFactory;
- /**
-  * Class MassEnable
-  */
--class MassEnable extends \Magento\Backend\App\Action
-+class MassEnable extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
-index 407657b05c1..6a4f4951cef 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
-@@ -6,7 +6,12 @@
-  */
- namespace Magento\Cms\Controller\Adminhtml\Page;
- 
--class NewAction extends \Magento\Backend\App\Action
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+
-+/**
-+ * Create CMS page action.
-+ */
-+class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
-index ef4fda60c0f..37cb4575317 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
-@@ -1,17 +1,20 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Cms\Controller\Adminhtml\Page;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Cms\Model\Page;
- use Magento\Framework\App\Request\DataPersistorInterface;
- use Magento\Framework\Exception\LocalizedException;
- 
--class Save extends \Magento\Backend\App\Action
-+/**
-+ * Save CMS page action.
-+ */
-+class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -127,8 +130,8 @@ class Save extends \Magento\Backend\App\Action
-     /**
-      * Process result redirect
-      *
--     * @param \Magento\Cms\Api\Data\PageInterface  $model
--     * @param \Magento\Backend\Model\View\Result\Redirect  $resultRedirect
-+     * @param \Magento\Cms\Api\Data\PageInterface $model
-+     * @param \Magento\Backend\Model\View\Result\Redirect $resultRedirect
-      * @param array $data
-      * @return \Magento\Backend\Model\View\Result\Redirect
-      * @throws LocalizedException
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
-index 1c46ac6807e..340f4b24dd1 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
-@@ -1,14 +1,18 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Cms\Controller\Adminhtml\Page\Widget;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Backend\App\Action;
- 
--class Chooser extends \Magento\Backend\App\Action
-+/**
-+ * Chooser Source action.
-+ */
-+class Chooser extends Action implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
-index 890c9bf5eae..6f57efad41e 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
-@@ -6,11 +6,12 @@
- namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- 
- /**
-  * Delete image files.
-  */
--class DeleteFiles extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
-+class DeleteFiles extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\JsonFactory
-@@ -79,7 +80,7 @@ class DeleteFiles extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
-                 $filesystem = $this->_objectManager->get(\Magento\Framework\Filesystem::class);
-                 $dir = $filesystem->getDirectoryRead(DirectoryList::MEDIA);
-                 $filePath = $path . '/' . \Magento\Framework\File\Uploader::getCorrectFileName($file);
--                if ($dir->isFile($dir->getRelativePath($filePath))) {
-+                if ($dir->isFile($dir->getRelativePath($filePath)) && !preg_match('#.htaccess#', $file)) {
-                     $this->getStorage()->deleteFile($filePath);
-                 }
-             }
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
-index a1de11c3c46..5344472a79a 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
-@@ -6,12 +6,13 @@
-  */
- namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- 
- /**
-  * Delete image folder.
-  */
--class DeleteFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
-+class DeleteFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\JsonFactory
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
-index a7f49e8a431..82d200beb6d 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
-@@ -6,12 +6,13 @@
-  */
- namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- 
- /**
-  * Creates new folder.
-  */
--class NewFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
-+class NewFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\JsonFactory
-diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
-index 5c9aa2243bc..9bad371aa84 100644
---- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
-+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
-@@ -4,14 +4,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- 
- /**
-  * Upload image.
-  */
--class Upload extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
-+class Upload extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\JsonFactory
-@@ -57,13 +61,20 @@ class Upload extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
-                     __('Directory %1 is not under storage root path.', $path)
-                 );
-             }
--            $result = $this->getStorage()->uploadFile($path, $this->getRequest()->getParam('type'));
-+            $uploaded = $this->getStorage()->uploadFile($path, $this->getRequest()->getParam('type'));
-+            $response = [
-+                'name' => $uploaded['name'],
-+                'type' => $uploaded['type'],
-+                'error' => $uploaded['error'],
-+                'size' => $uploaded['size'],
-+                'file' => $uploaded['file']
-+            ];
-         } catch (\Exception $e) {
--            $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
-+            $response = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
-         }
-         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-         $resultJson = $this->resultJsonFactory->create();
-         
--        return $resultJson->setData($result);
-+        return $resultJson->setData($response);
-     }
- }
-diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php
-index c027bd1a2b7..59ed1a6248b 100644
---- a/app/code/Magento/Cms/Controller/Index/Index.php
-+++ b/app/code/Magento/Cms/Controller/Index/Index.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Cms\Controller\Index;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Framework\App\Action\Context;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\ObjectManager;
-@@ -15,8 +17,12 @@ use Magento\Framework\Controller\Result\ForwardFactory;
- use Magento\Framework\View\Result\Page as ResultPage;
- use Magento\Cms\Helper\Page;
- use Magento\Store\Model\ScopeInterface;
-+use Magento\Framework\App\Action\Action;
- 
--class Index extends \Magento\Framework\App\Action\Action
-+/**
-+ * Home page. Needs to be accessible by POST because of the store switching.
-+ */
-+class Index extends Action implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var ForwardFactory
-diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php
-index db84ce9556d..b30beae73dc 100644
---- a/app/code/Magento/Cms/Controller/Noroute/Index.php
-+++ b/app/code/Magento/Cms/Controller/Noroute/Index.php
-@@ -6,6 +6,9 @@
-  */
- namespace Magento\Cms\Controller\Noroute;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-+ */
- class Index extends \Magento\Framework\App\Action\Action
- {
-     /**
-diff --git a/app/code/Magento/Cms/Controller/Page/View.php b/app/code/Magento/Cms/Controller/Page/View.php
-index ab02bc5e717..9d5785450ec 100644
---- a/app/code/Magento/Cms/Controller/Page/View.php
-+++ b/app/code/Magento/Cms/Controller/Page/View.php
-@@ -6,7 +6,14 @@
-  */
- namespace Magento\Cms\Controller\Page;
- 
--class View extends \Magento\Framework\App\Action\Action
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\Action;
-+
-+/**
-+ * Custom page for storefront. Needs to be accessible by POST because of the store switching.
-+ */
-+class View extends Action implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\ForwardFactory
-diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
-index abd260b260b..70e9437235a 100644
---- a/app/code/Magento/Cms/Helper/Page.php
-+++ b/app/code/Magento/Cms/Helper/Page.php
-@@ -187,7 +187,7 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
-     {
-         /** @var \Magento\Cms\Model\Page $page */
-         $page = $this->_pageFactory->create();
--        if ($pageId !== null && $pageId !== $page->getId()) {
-+        if ($pageId !== null) {
-             $page->setStoreId($this->_storeManager->getStore()->getId());
-             $page->load($pageId);
-         }
-diff --git a/app/code/Magento/Cms/Model/Block.php b/app/code/Magento/Cms/Model/Block.php
-index e65675ceee9..0261ef46a49 100644
---- a/app/code/Magento/Cms/Model/Block.php
-+++ b/app/code/Magento/Cms/Model/Block.php
-@@ -12,8 +12,8 @@ use Magento\Framework\Model\AbstractModel;
- /**
-  * CMS block model
-  *
-- * @method Block setStoreId(array $storeId)
-- * @method array getStoreId()
-+ * @method Block setStoreId(int $storeId)
-+ * @method int getStoreId()
-  */
- class Block extends AbstractModel implements BlockInterface, IdentityInterface
- {
-@@ -41,6 +41,8 @@ class Block extends AbstractModel implements BlockInterface, IdentityInterface
-     protected $_eventPrefix = 'cms_block';
- 
-     /**
-+     * Construct.
-+     *
-      * @return void
-      */
-     protected function _construct()
-diff --git a/app/code/Magento/Cms/Model/Page.php b/app/code/Magento/Cms/Model/Page.php
-index d950f484cd1..8eefe26236b 100644
---- a/app/code/Magento/Cms/Model/Page.php
-+++ b/app/code/Magento/Cms/Model/Page.php
-@@ -16,8 +16,8 @@ use Magento\Framework\Model\AbstractModel;
-  * Cms Page Model
-  *
-  * @api
-- * @method Page setStoreId(array $storeId)
-- * @method array getStoreId()
-+ * @method Page setStoreId(int $storeId)
-+ * @method int getStoreId()
-  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
-  * @since 100.0.2
-  */
-@@ -103,8 +103,7 @@ class Page extends AbstractModel implements PageInterface, IdentityInterface
-     }
- 
-     /**
--     * Check if page identifier exist for specific store
--     * return page id if page exists
-+     * Check if page identifier exist for specific store return page id if page exists
-      *
-      * @param string $identifier
-      * @param int $storeId
-@@ -116,8 +115,7 @@ class Page extends AbstractModel implements PageInterface, IdentityInterface
-     }
- 
-     /**
--     * Prepare page's statuses.
--     * Available event cms_page_get_available_statuses to customize statuses.
-+     * Prepare page's statuses, available event cms_page_get_available_statuses to customize statuses.
-      *
-      * @return array
-      */
-@@ -538,7 +536,7 @@ class Page extends AbstractModel implements PageInterface, IdentityInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 101.0.0
-      */
-     public function beforeSave()
-@@ -571,6 +569,8 @@ class Page extends AbstractModel implements PageInterface, IdentityInterface
-     }
- 
-     /**
-+     * Returns scope config.
-+     *
-      * @return ScopeConfigInterface
-      */
-     private function getScopeConfig()
-diff --git a/app/code/Magento/Cms/Model/Page/Source/PageLayout.php b/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
-index fb759348759..23a452c0fe5 100644
---- a/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
-+++ b/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
-@@ -20,6 +20,7 @@ class PageLayout implements OptionSourceInterface
- 
-     /**
-      * @var array
-+     * @deprecated since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
-      */
-     protected $options;
- 
-@@ -34,16 +35,10 @@ class PageLayout implements OptionSourceInterface
-     }
- 
-     /**
--     * Get options
--     *
--     * @return array
-+     * @inheritdoc
-      */
-     public function toOptionArray()
-     {
--        if ($this->options !== null) {
--            return $this->options;
--        }
--
-         $configOptions = $this->pageLayoutBuilder->getPageLayoutsConfig()->getOptions();
-         $options = [];
-         foreach ($configOptions as $key => $value) {
-@@ -54,6 +49,6 @@ class PageLayout implements OptionSourceInterface
-         }
-         $this->options = $options;
- 
--        return $this->options;
-+        return $options;
-     }
- }
-diff --git a/app/code/Magento/Cms/Model/Plugin/Product.php b/app/code/Magento/Cms/Model/Plugin/Product.php
-new file mode 100644
-index 00000000000..c8456d5cd6b
---- /dev/null
-+++ b/app/code/Magento/Cms/Model/Plugin/Product.php
-@@ -0,0 +1,50 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Cms\Model\Plugin;
-+
-+use Magento\Catalog\Model\Product as CatalogProduct;
-+use Magento\Cms\Model\Page;
-+
-+/**
-+ * Cleaning no-route page cache for the product details page after enabling product that is not assigned to a category
-+ */
-+class Product
-+{
-+    /**
-+     * @var Page
-+     */
-+    private $page;
-+
-+    /**
-+     * @param Page $page
-+     */
-+    public function __construct(Page $page)
-+    {
-+        $this->page = $page;
-+    }
-+
-+    /**
-+     * After get identities
-+     *
-+     * @param CatalogProduct $product
-+     * @param array $identities
-+     * @return array
-+     */
-+    public function afterGetIdentities(CatalogProduct $product, array $identities)
-+    {
-+        if ($product->getOrigData('status') > $product->getData('status')) {
-+            if (empty($product->getCategoryIds())) {
-+                $noRoutePage = $this->page->load(Page::NOROUTE_PAGE_ID);
-+                $noRoutePageId = $noRoutePage->getId();
-+                $identities[] = Page::CACHE_TAG . '_' . $noRoutePageId;
-+            }
-+        }
-+
-+        return array_unique($identities);
-+    }
-+}
-diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block.php b/app/code/Magento/Cms/Model/ResourceModel/Block.php
-index 9aab54b02bc..30e81771375 100644
---- a/app/code/Magento/Cms/Model/ResourceModel/Block.php
-+++ b/app/code/Magento/Cms/Model/ResourceModel/Block.php
-@@ -95,9 +95,11 @@ class Block extends AbstractDb
-     }
- 
-     /**
-+     * Get block id.
-+     *
-      * @param AbstractModel $object
-      * @param mixed $value
--     * @param null $field
-+     * @param string $field
-      * @return bool|int|string
-      * @throws LocalizedException
-      * @throws \Exception
-@@ -183,10 +185,12 @@ class Block extends AbstractDb
-         $entityMetadata = $this->metadataPool->getMetadata(BlockInterface::class);
-         $linkField = $entityMetadata->getLinkField();
- 
--        if ($this->_storeManager->isSingleStoreMode()) {
--            $stores = [Store::DEFAULT_STORE_ID];
--        } else {
--            $stores = (array)$object->getData('store_id');
-+        $stores = (array)$object->getData('store_id');
-+        $isDefaultStore = $this->_storeManager->isSingleStoreMode()
-+            || array_search(Store::DEFAULT_STORE_ID, $stores) !== false;
-+
-+        if (!$isDefaultStore) {
-+            $stores[] = Store::DEFAULT_STORE_ID;
-         }
- 
-         $select = $this->getConnection()->select()
-@@ -196,8 +200,11 @@ class Block extends AbstractDb
-                 'cb.' . $linkField . ' = cbs.' . $linkField,
-                 []
-             )
--            ->where('cb.identifier = ?', $object->getData('identifier'))
--            ->where('cbs.store_id IN (?)', $stores);
-+            ->where('cb.identifier = ?  ', $object->getData('identifier'));
-+
-+        if (!$isDefaultStore) {
-+            $select->where('cbs.store_id IN (?)', $stores);
-+        }
- 
-         if ($object->getId()) {
-             $select->where('cb.' . $entityMetadata->getIdentifierField() . ' <> ?', $object->getId());
-@@ -236,6 +243,8 @@ class Block extends AbstractDb
-     }
- 
-     /**
-+     * Save an object.
-+     *
-      * @param AbstractModel $object
-      * @return $this
-      * @throws \Exception
-diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
-index 5db3933dd11..1da7b99c6d8 100644
---- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
-+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
-@@ -89,8 +89,6 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
- 
-     /**
-      * @var array
--     * @deprecated
--     * @see \Magento\Cms\Model\Wysiwyg\Gallery\DefaultConfigProvider
-      */
-     protected $_windowSize;
- 
-@@ -207,6 +205,12 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
- 
-         if ($this->_authorization->isAllowed('Magento_Cms::media_gallery')) {
-             $this->configProvider->processGalleryConfig($config);
-+            $config->addData(
-+                [
-+                    'files_browser_window_width' => $this->_windowSize['width'],
-+                    'files_browser_window_height' => $this->_windowSize['height'],
-+                ]
-+            );
-         }
-         if ($config->getData('add_widgets')) {
-             $this->configProvider->processWidgetConfig($config);
-diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
-index dfd55f5346e..dfbbce99b65 100644
---- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
-+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
-@@ -3,17 +3,24 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Cms\Model\Wysiwyg\Images;
- 
- use Magento\Cms\Helper\Wysiwyg\Images;
- use Magento\Framework\App\Filesystem\DirectoryList;
- 
- /**
-- * Wysiwyg Images model
-+ * Wysiwyg Images model.
-+ *
-+ * Tightly connected with controllers responsible for managing files so it uses session and is (sort of) a part
-+ * of the presentation layer.
-  *
-  * @SuppressWarnings(PHPMD.LongVariable)
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  *
-  * @api
-  * @since 100.0.2
-@@ -270,7 +277,8 @@ class Storage extends \Magento\Framework\DataObject
-         $collection = $this->getCollection($path)
-             ->setCollectDirs(true)
-             ->setCollectFiles(false)
--            ->setCollectRecursively(false);
-+            ->setCollectRecursively(false)
-+            ->setOrder('basename', \Magento\Framework\Data\Collection\Filesystem::SORT_ORDER_ASC);
- 
-         $conditions = $this->getConditionsForExcludeDirs();
- 
-@@ -501,14 +509,6 @@ class Storage extends \Magento\Framework\DataObject
-         // create thumbnail
-         $this->resizeFile($targetPath . '/' . $uploader->getUploadedFileName(), true);
- 
--        $result['cookie'] = [
--            'name' => $this->getSession()->getName(),
--            'value' => $this->getSession()->getSessionId(),
--            'lifetime' => $this->getSession()->getCookieLifetime(),
--            'path' => $this->getSession()->getCookiePath(),
--            'domain' => $this->getSession()->getCookieDomain(),
--        ];
--
-         return $result;
-     }
- 
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCMSPageMassActionSelectActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCMSPageMassActionSelectActionGroup.xml
-new file mode 100644
-index 00000000000..2945538ed5f
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCMSPageMassActionSelectActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCMSPageMassActionSelectActionGroup">
-+        <arguments>
-+            <argument name="action" type="string" />
-+        </arguments>
-+        <click selector="{{CmsPagesPageActionsSection.massActionsButton}}" stepKey="clickMassActionDropdown"/>
-+        <click selector="{{CmsPagesPageActionsSection.massActionsOption(action)}}" stepKey="clickAction"/>
-+        <waitForPageLoad stepKey="waitForPageToReload"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCMSPagesGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCMSPagesGridActionGroup.xml
-new file mode 100644
-index 00000000000..2439953cde0
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCMSPagesGridActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenCMSPagesGridActionGroup">
-+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="navigateToCMSPagesGrid"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlockActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlockActionGroup.xml
-new file mode 100644
-index 00000000000..0f87ee90b7c
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlockActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenCmsBlockActionGroup">
-+        <arguments>
-+            <argument name="block_id" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminEditBlockPage.url(block_id)}}" stepKey="openEditCmsBlock"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpentCmsBlockActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpentCmsBlockActionGroup.xml
-new file mode 100644
-index 00000000000..0f87ee90b7c
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpentCmsBlockActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenCmsBlockActionGroup">
-+        <arguments>
-+            <argument name="block_id" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminEditBlockPage.url(block_id)}}" stepKey="openEditCmsBlock"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSPageInGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSPageInGridActionGroup.xml
-new file mode 100644
-index 00000000000..4de1157e318
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSPageInGridActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSelectCMSPageInGridActionGroup">
-+        <arguments>
-+            <argument name="identifier" type="string"/>
-+        </arguments>
-+        <checkOption selector="{{CmsPagesPageActionsSection.pageRowCheckboxByIdentifier(identifier)}}" stepKey="selectCmsPageInGrid"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSBlockContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSBlockContentActionGroup.xml
-index 553d851707b..d2f81c1c24c 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSBlockContentActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSBlockContentActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AssertBlockContent">
-         <grabValueFrom selector="{{BlockNewPageBasicFieldsSection.blockTitle}}"  stepKey="grabTextFromTitle"/>
-         <assertEquals stepKey="assertTitle" message="pass">
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageContentActionGroup.xml
-index f286c9159c6..dde62373902 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageContentActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageContentActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AssertCMSPageContent">
-         <grabValueFrom selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}"  stepKey="grabTextFromTitle"/>
-         <assertEquals stepKey="assertTitle" message="pass">
-@@ -23,4 +23,14 @@
-         <executeJS function="(el = document.querySelector('[name=\'identifier\']')) &amp;&amp; el['se' + 'tAt' + 'tribute']('data-value', el.value.split('-')[0]);" stepKey="setAttribute" />
-         <seeElement selector="{{CmsNewPagePageBasicFieldsSection.duplicatedURLKey(_duplicatedCMSPage.title)}}" stepKey="see"/>
-     </actionGroup>
-+    <actionGroup name="AssertStoreFrontCMSPage">
-+        <arguments>
-+            <argument name="cmsTitle" type="string"/>
-+            <argument name="cmsContent" type="string"/>
-+            <argument name="cmsContentHeading" type="string"/>
-+        </arguments>
-+        <see selector="{{StorefrontCMSPageSection.title}}" userInput="{{cmsTitle}}" stepKey="seeTitle"/>
-+        <see selector="{{StorefrontCMSPageSection.mainTitle}}" userInput="{{cmsContentHeading}}" stepKey="seeContentHeading"/>
-+        <see selector="{{StorefrontCMSPageSection.mainContent}}" userInput="{{cmsContent}}" stepKey="seeContent"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageInGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageInGridActionGroup.xml
-new file mode 100644
-index 00000000000..84feb0a16c4
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageInGridActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCMSPageInGridActionGroup">
-+        <arguments>
-+            <argument name="cmsPage" type="entity" />
-+        </arguments>
-+
-+        <seeElement stepKey="seeElementByCmsPageIdentifier" selector="{{AdminDataGridTableSection.rowTemplateStrict(cmsPage.identifier)}}" />
-+        <see userInput="{{cmsPage.title}}" stepKey="seeCmsPageTitle" selector="{{AdminDataGridTableSection.rowTemplateStrict(cmsPage.identifier)}}" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageNotFoundOnStorefrontActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageNotFoundOnStorefrontActionGroup.xml
-new file mode 100644
-index 00000000000..b92413a3794
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageNotFoundOnStorefrontActionGroup.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCMSPageNotFoundOnStorefrontActionGroup">
-+        <see userInput="Whoops, our bad..." stepKey="seePageErrorNotFound"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssignBlockToCMSPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssignBlockToCMSPageActionGroup.xml
-index 3fa72c2d6b5..5720e79e95a 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssignBlockToCMSPageActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssignBlockToCMSPageActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AssignBlockToCMSPage">
-         <arguments>
-             <argument name="Block" defaultValue=""/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
-index 06419356d8e..07e43347d9d 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="navigateToCreatedCMSPage">
-         <arguments>
-             <argument name="CMSPage" defaultValue=""/>
-@@ -44,4 +44,75 @@
-         <waitForPageLoad stepKey="waitForPageLoad3"/>
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskOfStagingSection" />
-     </actionGroup>
-+    <actionGroup name="DeleteCMSBlockActionGroup">
-+        <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSPagesGrid"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <click selector="{{CmsPagesPageActionsSection.select(_defaultBlock.title)}}" stepKey="ClickOnSelect"/>
-+        <click selector="{{CmsPagesPageActionsSection.delete(_defaultBlock.title)}}" stepKey="ClickOnEdit"/>
-+        <waitForPageLoad stepKey="waitForPageLoad3"/>
-+        <click selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="ClickToConfirm"/>
-+        <waitForPageLoad stepKey="waitForPageLoad4"/>
-+        <see userInput="You deleted the block." stepKey="VerifyBlockIsDeleted"/>
-+    </actionGroup>
-+    <actionGroup name="AddStoreViewToCmsPage" extends="navigateToCreatedCMSPage">
-+        <arguments>
-+            <argument name="storeViewName" type="string"/>
-+        </arguments>
-+        <remove keyForRemoval="clickExpandContentTabForPage"/>
-+        <remove keyForRemoval="waitForLoadingMaskOfStagingSection"/>
-+        <click selector="{{CmsNewPagePiwSection.header}}" stepKey="clickPageInWebsites" after="waitForPageLoad3"/>
-+        <waitForElementVisible selector="{{CmsNewPagePiwSection.selectStoreView(storeViewName)}}" stepKey="waitForStoreGridReload"/>
-+        <clickWithLeftButton selector="{{CmsNewPagePiwSection.selectStoreView(storeViewName)}}" stepKey="clickStoreView"/>
-+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
-+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
-+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see userInput="You saved the page." stepKey="seeMessage"/>
-+    </actionGroup>
-+    <actionGroup name="saveAndCloseCMSBlockWithSplitButton">
-+        <waitForElementVisible selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="waitForExpandSplitButtonToBeVisible" />
-+        <click selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
-+        <click selector="{{BlockNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveBlock"/>
-+        <waitForPageLoad stepKey="waitForPageLoadAfterClickingSave" />
-+        <see userInput="You saved the block." stepKey="assertSaveBlockSuccessMessage"/>
-+    </actionGroup>
-+    <actionGroup name="navigateToStorefrontForCreatedPage">
-+        <arguments>
-+            <argument name="page" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{page}}" stepKey="goToStorefront"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+    </actionGroup>
-+    <actionGroup name="saveCMSBlock">
-+        <waitForElementVisible selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="waitForSaveButton"/>
-+        <click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see userInput="You saved the block." stepKey="seeSuccessfulSaveMessage"/>
-+    </actionGroup>
-+    <actionGroup name="saveAndContinueEditCmsPage">
-+        <waitForElementVisible time="10" selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveAndContinueVisibility"/>
-+        <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSaveAndContinueEditCmsPage"/>
-+        <waitForPageLoad stepKey="waitForCmsPageLoad"/>
-+        <waitForElementVisible time="1" selector="{{CmsNewPagePageActionsSection.cmsPageTitle}}" stepKey="waitForCmsPageSaveButton"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+    </actionGroup>
-+    <actionGroup name="saveCmsPage">
-+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="waitForSplitButton"/>
-+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
-+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="waitForSaveCmsPage"/>
-+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSaveCmsPage"/>
-+        <waitForElementVisible time="1" selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="waitForCmsPageSaveButton"/>
-+        <see userInput="You saved the page." selector="{{CmsPagesPageActionsSection.savePageSuccessMessage}}" stepKey="assertSavePageSuccessMessage"/>
-+    </actionGroup>
-+    <actionGroup name="setLayout">
-+        <arguments>
-+            <argument name="designSection"/>
-+            <argument name="layoutOption"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{designSection.DesignTab}}" stepKey="waitForDesignTabVisible"/>
-+        <conditionalClick selector="{{designSection.DesignTab}}" dependentSelector="{{designSection.LayoutDropdown}}" visible="false" stepKey="clickOnDesignTab"/>
-+        <waitForPageLoad stepKey="waitForPageLoadDesignTab"/>
-+        <waitForElementVisible selector="{{designSection.LayoutDropdown}}" stepKey="waitForLayoutDropDown" />
-+        <selectOption selector="{{designSection.LayoutDropdown}}" userInput="{{layoutOption}}" stepKey="selectLayout"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/ClearWidgetsFromCMSContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/ClearWidgetsFromCMSContentActionGroup.xml
-new file mode 100644
-index 00000000000..2c45b9e140c
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/ClearWidgetsFromCMSContentActionGroup.xml
-@@ -0,0 +1,33 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="ClearWidgetsFromCMSContent">
-+        <amOnPage url="{{CmsPageEditPage.url('2')}}" stepKey="navigateToEditHomePagePage"/>
-+        <waitForPageLoad stepKey="waitEditHomePagePageToLoad"/>
-+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
-+        <waitForElementNotVisible selector="{{CmsWYSIWYGSection.CheckIfTabExpand}}" stepKey="waitForTabExpand"/>
-+        <executeJS function="jQuery('[id=\'cms_page_form_content_ifr\']').attr('name', 'preview-iframe')" stepKey="setPreviewFrameName"/>
-+        <switchToIFrame selector="preview-iframe" stepKey="switchToIframe"/>
-+        <fillField selector="{{TinyMCESection.EditorContent}}" userInput="Hello TinyMCE4!" stepKey="clearWidgets"/>
-+        <switchToIFrame stepKey="switchOutFromIframe"/>
-+        <executeJS function="tinyMCE.activeEditor.setContent('Hello TinyMCE4!');" stepKey="executeJSFillContent1"/>
-+        <click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget"/>
-+        <waitForPageLoad stepKey="waitSaveToBeApplied"/>
-+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the page." stepKey="seeSaveSuccess"/>
-+    </actionGroup>
-+    <actionGroup name="ClearWidgetsForCMSHomePageContentWYSIWYGDisabled">
-+        <amOnPage url="{{CmsPageEditPage.url('2')}}" stepKey="navigateToEditHomePagePage"/>
-+        <waitForPageLoad stepKey="waitForCmsPageEditPage"/>
-+        <conditionalClick selector="{{CmsNewPagePageActionsSection.contentSectionName}}" dependentSelector="{{CatalogWidgetSection.insertWidgetButton}}" visible="false" stepKey="clickShowHideEditorIfVisible"/>
-+        <waitForElementVisible selector="{{CmsNewPagePageContentSection.content}}" stepKey="waitForContentField"/>
-+        <fillField selector="{{CmsNewPagePageContentSection.content}}" userInput="CMS homepage content goes here." stepKey="resetCMSPageToDefaultContent"/>
-+        <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSave"/>
-+        <waitForPageLoad stepKey="waitForSettingsApply"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithAllValuesActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithAllValuesActionGroup.xml
-index 2225d3d34a6..a459c41ccb4 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithAllValuesActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithAllValuesActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="CreateNewPageWithAllValues">
-         <arguments>
-             <argument name="PageTitle" type="string"/>
-@@ -28,4 +28,10 @@
-         <click selector="{{CmsNewPageHierarchySection.header}}" stepKey="clickHierarchy"/>
-         <click selector="{{CmsNewPageHierarchySection.selectHierarchy(selectHierarchyOpt)}}" stepKey="clickPageCheckBoxes"/>
-     </actionGroup>
-+    <actionGroup name="CreateNewPageWithAllValuesAndContent" extends="CreateNewPageWithAllValues">
-+        <arguments>
-+            <argument name="pageContent" type="string"/>
-+        </arguments>
-+        <fillField selector="{{CmsNewPagePageContentSection.content}}" userInput="{{pageContent}}" stepKey="fillContentField" after="fillFieldContentHeading"/>
-+    </actionGroup>
- </actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml
-new file mode 100644
-index 00000000000..a4b88c544de
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml
-@@ -0,0 +1,40 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="CreateNewPageWithWidget">
-+        <arguments>
-+            <argument name="pageTitle" type="string" defaultValue="{{defaultCmsPage.title}}"/>
-+            <argument name="category" type="string"/>
-+            <argument name="condition" type="string"/>
-+            <argument name="widgetType" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="amOnCMSNewPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{pageTitle}}" stepKey="fillFieldTitle"/>
-+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
-+        <click selector="{{CmsNewPagePageActionsSection.insertWidget}}" stepKey="clickToInsertWidget"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <waitForElementVisible stepKey="waitForInsertWidgetTitle" selector="{{WidgetSection.InsertWidgetTitle}}"/>
-+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="{{widgetType}}" stepKey="selectCatalogProductsList"/>
-+        <waitForElementVisible selector="{{WidgetSection.AddParam}}" stepKey="waitForAddParam"/>
-+        <scrollTo selector="{{WidgetSection.AddParam}}" stepKey="scrollToAddParamElement"/>
-+        <click selector="{{WidgetSection.AddParam}}" stepKey="addParam"/>
-+        <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="{{condition}}" stepKey="selectCategory"/>
-+        <waitForElementVisible selector="{{WidgetSection.RuleParam}}" stepKey="waitForRuleParam"/>
-+        <click selector="{{WidgetSection.RuleParam}}" stepKey="clickToAddRuleParam"/>
-+        <click selector="{{WidgetSection.Chooser}}" stepKey="clickToSelectFromList"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <click selector="{{WidgetSection.PreCreateCategory(category)}}" stepKey="selectPreCategory" />
-+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickToSaveInsertedWidget"/>
-+        <waitForPageLoad stepKey="waitForPageLoad3"/>
-+        <click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="saveCMSPage"/>
-+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.savePageSuccessMessage}}" stepKey="waitForSuccessMessageLoggedOut" time="5"/>
-+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml
-index cbd239cde80..6de6f27e106 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="DeleteImageFromStorageActionGroup">
-         <arguments>
-             <argument name="Image"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml
-index 690ad9881c7..2a2b2ff15d3 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="DeletePageByUrlKeyActionGroup">
-         <arguments>
-             <argument name="UrlKey" type="string"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutBlockContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutBlockContentActionGroup.xml
-index ef7c925c3f8..3ffc999b41a 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutBlockContentActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutBlockContentActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="FillOutBlockContent">
-         <fillField selector="{{BlockNewPageBasicFieldsSection.blockTitle}}" userInput="{{_defaultBlock.title}}" stepKey="fillFieldTitle1"/>
-         <fillField selector="{{BlockNewPageBasicFieldsSection.identifier}}" userInput="{{_defaultBlock.identifier}}" stepKey="fillFieldIdentifier"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutCMSPageContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutCMSPageContentActionGroup.xml
-index 5caeadcea28..e47ff472ccd 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutCMSPageContentActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutCMSPageContentActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="FillOutCMSPageContent">
-         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_duplicatedCMSPage.title}}" stepKey="fillFieldTitle"/>
-         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContentTabForPage"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToMediaFolderActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToMediaFolderActionGroup.xml
-index 031481d90d1..3c447f808e7 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToMediaFolderActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToMediaFolderActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="NavigateToMediaFolderActionGroup">
-         <arguments>
-             <argument name="FolderName" type="string"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
-index 54c41647491..3016fba6cab 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="RestoreLayoutSetting">
-         <waitForElementVisible selector="{{DefaultLayoutsSection.pageLayout}}" stepKey="waittForDefaultCMSLayout" after="expandDefaultLayouts" />
-         <selectOption selector="{{DefaultLayoutsSection.pageLayout}}" userInput="1 column" stepKey="selectOneColumn" before="clickSaveConfig"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/SearchBlockOnGridPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SearchBlockOnGridPageActionGroup.xml
-index 8656f4e03a2..12205aeed8f 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/SearchBlockOnGridPageActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SearchBlockOnGridPageActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="searchBlockOnGridPage">
-         <arguments>
-             <argument name="Block" defaultValue=""/>
-@@ -16,4 +16,27 @@
-         <waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish2" />
-         <waitForElementVisible selector="{{WidgetSection.BlockPage(Block.identifier)}}" stepKey="waitForBlockTitle" />
-     </actionGroup>
-+    <actionGroup name ="deleteBlock">
-+        <arguments>
-+            <argument name="Block" defaultValue=""/>
-+        </arguments>
-+        <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSBlocksGrid"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <conditionalClick selector="{{BlockPageActionsSection.clearAll}}" dependentSelector="{{BlockPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <click selector="{{BlockPageActionsSection.FilterBtn}}" stepKey="clickFilterBtn"/>
-+        <fillField selector="{{BlockPageActionsSection.URLKey}}" userInput="{{Block.identifier}}" stepKey="fillBlockIdentifierInput"/>
-+        <click selector="{{BlockPageActionsSection.ApplyFiltersBtn}}" stepKey="applyFilter"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForGridToLoadResults" />
-+        <waitForElementVisible selector="{{BlockPageActionsSection.select(Block.identifier)}}" stepKey="waitForCMSPageGrid" />
-+        <click selector="{{BlockPageActionsSection.select(Block.identifier)}}" stepKey="clickSelect" />
-+        <waitForElementVisible selector="{{BlockPageActionsSection.edit(Block.identifier)}}" stepKey="waitForEditLink" />
-+        <click selector="{{BlockPageActionsSection.edit(Block.identifier)}}" stepKey="clickEdit" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForPageToLoad" />
-+        <click selector="{{CmsBlockBlockActionSection.deleteBlock}}" stepKey="deleteBlock"/>
-+        <waitForElementVisible selector="{{CmsBlockBlockActionSection.deleteConfirm}}" stepKey="waitForOkButtonToBeVisible"/>
-+        <click selector="{{CmsBlockBlockActionSection.deleteConfirm}}" stepKey="clickOkButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad3"/>
-+        <see userInput="You deleted the block." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml
-index 2daa1cbeca8..84704b18a40 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="clickBrowseBtnOnUploadPopup">
-         <click selector="{{MediaGallerySection.Browse}}" stepKey="clickBrowse" />
-         <waitForPageLoad stepKey="waitForPageLoad1" />
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontGoToCMSPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontGoToCMSPageActionGroup.xml
-new file mode 100644
-index 00000000000..0ec8db3f27c
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontGoToCMSPageActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontGoToCMSPageActionGroup">
-+        <arguments>
-+            <argument name="identifier" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontHomePage.url}}{{identifier}}" stepKey="amOnCmsPageOnStorefront"/>
-+        <waitForPageLoad stepKey="waitForPageLoadOnStorefront"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/VerifyTinyMCEActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/VerifyTinyMCEActionGroup.xml
-index 6c4a42d6440..ed19c291aad 100644
---- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/VerifyTinyMCEActionGroup.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/VerifyTinyMCEActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="VerifyTinyMCEActionGroup">
-         <seeElement selector="{{TinyMCESection.Style}}" stepKey="assertInfo2"/>
-         <seeElement selector="{{TinyMCESection.Bold}}" stepKey="assertInfo3"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Cms/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..3e227df56c9
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuContent">
-+        <data key="pageTitle">Content</data>
-+        <data key="title">Content</data>
-+        <data key="dataUiId">magento-backend-content</data>
-+    </entity>
-+    <entity name="AdminMenuContentElementsPages">
-+        <data key="pageTitle">Pages</data>
-+        <data key="title">Pages</data>
-+        <data key="dataUiId">magento-cms-cms-page</data>
-+    </entity>
-+    <entity name="AdminMenuContentElementsBlocks">
-+        <data key="pageTitle">Blocks</data>
-+        <data key="title">Blocks</data>
-+        <data key="dataUiId">magento-cms-cms-block</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Data/BlockData.xml b/app/code/Magento/Cms/Test/Mftf/Data/BlockData.xml
-new file mode 100644
-index 00000000000..dea047ec435
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Data/BlockData.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="Sales25offBlock" type="block">
-+        <data key="title" unique="suffix">Sales25off</data>
-+        <data key="identifier" unique="suffix">Sales25off</data>
-+        <data key="store_id">All Store Views</data>
-+        <data key="content">sales25off everything!</data>
-+        <data key="is_active">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Data/BlockPageData.xml b/app/code/Magento/Cms/Test/Mftf/Data/BlockPageData.xml
-index 9e0db2ada4a..98cd9ae30b8 100644
---- a/app/code/Magento/Cms/Test/Mftf/Data/BlockPageData.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Data/BlockPageData.xml
-@@ -7,9 +7,9 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="_defaultBlock" type="block">
--        <data key="title">Default Block</data>
-+        <data key="title" unique="suffix">Default Block</data>
-         <data key="identifier" unique="suffix" >block</data>
-         <data key="content">Here is a block test. Yeah!</data>
-         <data key="active">true</data>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml b/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
-index 84561d6cd96..5dc100573c3 100644
---- a/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="_defaultCmsPage" type="cms_page">
-         <data key="title">Test CMS Page</data>
-         <data key="content_heading">Test Content Heading</data>
-@@ -20,6 +20,15 @@
-         <data key="content">Sample page content. Yada yada yada.</data>
-         <data key="identifier" unique="suffix">test-page-</data>
-     </entity>
-+    <entity name="customCmsPage" extends="_defaultCmsPage" type="cms_page">
-+        <data key="content">Test content data1</data>
-+        <data key="identifier">url_key</data>
-+    </entity>
-+    <entity name="customCmsPage2" extends="_defaultCmsPage" type="cms_page">
-+        <data key="title">Test Second CMS Page</data>
-+        <data key="content">Test content data2</data>
-+        <data key="identifier">url_key</data>
-+    </entity>
-     <entity name="_duplicatedCMSPage" type="cms_page">
-         <data key="title">testpage</data>
-         <data key="content_heading">Test Content Heading</data>
-@@ -50,6 +59,7 @@
-         <data key="file_type">Upload File</data>
-         <data key="shareable">Yes</data>
-         <data key="file">magento-again.jpg</data>
-+        <data key="fileName">magento-again</data>
-         <data key="value">magento-again.jpg</data>
-         <data key="content">Image content. Yeah.</data>
-         <data key="height">1000</data>
-@@ -71,6 +81,7 @@
-         <data key="file_type">Upload File</data>
-         <data key="shareable">Yes</data>
-         <data key="value">magento3.jpg</data>
-+        <data key="file">magento3.jpg</data>
-         <data key="fileName">magento3</data>
-         <data key="extension">jpg</data>
-         <data key="content">Image content. Yeah.</data>
-@@ -80,4 +91,19 @@
-     <entity name="ImageFolder" type="uploadImage">
-         <data key="name" unique="suffix">Test</data>
-     </entity>
-+    <entity name="_longContentCmsPage" type="cms_page">
-+        <data key="title">Test CMS Page</data>
-+        <data key="content_heading">Test Content Heading</data>
-+        <data key="content">1&lt;br/&gt;2&lt;br/&gt;3&lt;br/&gt;4&lt;br/&gt;5&lt;br/&gt;6&lt;br/&gt;7&lt;br/&gt;8&lt;br/&gt;9&lt;br/&gt;10&lt;br/&gt;11&lt;br/&gt;12&lt;br/&gt;13&lt;br/&gt;14&lt;br/&gt;15&lt;br/&gt;16&lt;br/&gt;17&lt;br/&gt;18&lt;br/&gt;19&lt;br/&gt;20&lt;br/&gt;line21&lt;br/&gt;22&lt;br/&gt;23&lt;br/&gt;24&lt;br/&gt;25&lt;br/&gt;26&lt;br/&gt;line27&lt;br/&gt;2&lt;br/&gt;3&lt;br/&gt;4&lt;br/&gt;5</data>
-+        <data key="identifier" unique="suffix">test-page-</data>
-+    </entity>
-+    <entity name="_emptyCmsPage" type="cms_page">
-+        <data key="title" unique="suffix">Test CMS Page</data>
-+        <data key="identifier" unique="suffix">test-page-</data>
-+    </entity>
-+    <entity name="_emptyCmsBlock" type="block">
-+        <data key="title" unique="suffix">Test CMS Block</data>
-+        <data key="identifier" unique="suffix" >block</data>
-+        <data key="active">true</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Data/NewCMSPageData.xml b/app/code/Magento/Cms/Test/Mftf/Data/NewCMSPageData.xml
-new file mode 100644
-index 00000000000..61dfb051d10
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Data/NewCMSPageData.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="defaultCmsPage" type="block">
-+        <data key="title" unique="suffix">CMSpage</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml b/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
-new file mode 100644
-index 00000000000..46a96895940
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
-@@ -0,0 +1,31 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="WysiwygEnabledByDefault">
-+        <data key="path">cms/wysiwyg/enabled</data>
-+        <data key="scope_id">0</data>
-+        <data key="value">enabled</data>
-+    </entity>
-+    <entity name="WysiwygDisabledByDefault">
-+        <data key="path">cms/wysiwyg/enabled</data>
-+        <data key="scope_id">0</data>
-+        <data key="value">hidden</data>
-+    </entity>
-+    <entity name="WysiwygTinyMCE3Enable">
-+        <data key="path">cms/wysiwyg/editor</data>
-+        <data key="scope_id">0</data>
-+        <data key="value">Magento_Tinymce3/tinymce3Adapter</data>
-+    </entity>
-+    <entity name="WysiwygTinyMCE4Enable">
-+        <data key="path">cms/wysiwyg/editor</data>
-+        <data key="scope_id">0</data>
-+        <data key="value">mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Metadata/block-meta.xml b/app/code/Magento/Cms/Test/Mftf/Metadata/block-meta.xml
-index d764275f7c4..c007c89b313 100644
---- a/app/code/Magento/Cms/Test/Mftf/Metadata/block-meta.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Metadata/block-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateBlock" dataType="block" type="create" auth="adminOauth" url="/V1/cmsBlock" method="POST">
-         <contentType>application/json</contentType>
-         <object key="block" dataType="block">
-diff --git a/app/code/Magento/Cms/Test/Mftf/Metadata/cms-meta.xml b/app/code/Magento/Cms/Test/Mftf/Metadata/cms-meta.xml
-index 495ca2ee0c2..44a9d9452e8 100644
---- a/app/code/Magento/Cms/Test/Mftf/Metadata/cms-meta.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Metadata/cms-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateCMSPage" dataType="cms_page" type="create" auth="adminOauth" url="/V1/cmsPage" method="POST">
-         <contentType>application/json</contentType>
-         <object key="page" dataType="cms_page">
-diff --git a/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsEditBlockPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsEditBlockPage.xml
-new file mode 100644
-index 00000000000..f7ee5f5aca9
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsEditBlockPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminEditBlockPage" url="cms/block/edit/block_id/{{id}}" area="admin" module="Magento_Cms" parameterized="true">
-+        <section name="AdminUpdateBlockSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Page/CmsBlocksPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsBlocksPage.xml
-index 790c2feafca..1d9564fee86 100644
---- a/app/code/Magento/Cms/Test/Mftf/Page/CmsBlocksPage.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsBlocksPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="CmsBlocksPage" url="/cms/block/" area="admin" module="Magento_Cms">
-         <section name="BlockPageActionsSection"/>
-     </page>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Page/CmsNewBlockPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewBlockPage.xml
-index d607c1ccf39..0a2b7a7ed37 100644
---- a/app/code/Magento/Cms/Test/Mftf/Page/CmsNewBlockPage.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewBlockPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="CmsNewBlock" area="admin" url="/cms/block/new" module="Magento_Cms">
-         <section name="CmsNewBlockBlockActionsSection"/>
-         <section name="CmsNewBlockBlockBasicFieldsSection"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml
-index b165d6c044c..c844dc55ea1 100644
---- a/app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="CmsNewPagePage" url="/cms/page/new" area="admin" module="Magento_Cms">
-         <section name="CmsNewPagePageActionsSection"/>
-         <section name="CmsNewPagePageBasicFieldsSection"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Page/CmsPageEditPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsPageEditPage.xml
-new file mode 100644
-index 00000000000..73db6b61343
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsPageEditPage.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+ -->
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="CmsPageEditPage" area="admin" url="admin/cms_page/edit/page_id/{{var}}" parameterized="true" module="Magento_Cms">
-+        <section name="CmsNewPagePageActionsSection"/>
-+        <section name="CmsNewPagePageBasicFieldsSection"/>
-+        <section name="CmsNewPagePageContentSection"/>
-+        <section name="CmsNewPagePageSeoSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Page/CmsPagesPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsPagesPage.xml
-index 9dcb3d608d0..45ba6eb6cf0 100644
---- a/app/code/Magento/Cms/Test/Mftf/Page/CmsPagesPage.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsPagesPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="CmsPagesPage" url="/cms/page" area="admin" module="Magento_Cms">
-         <section name="CmsPagesPageActionsSection"/>
-     </page>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml b/app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml
-index 289d872aad8..07deacfaaef 100644
---- a/app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="StorefrontHomePage" url="/" module="Magento_Cms" area="storefront">
-         <section name="StorefrontHeaderSection"/>
-     </page>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml
-new file mode 100644
-index 00000000000..ab15570a01f
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminBlockGridSection">
-+        <element name="search" type="input" selector="//input[@placeholder='Search by keyword']"/>
-+        <element name="searchButton" type="button" selector="//div[@class='data-grid-search-control-wrap']//label[@class='data-grid-search-label']/following-sibling::button[@class='action-submit']"/>
-+        <element name="checkbox" type="checkbox" selector="//label[@class='data-grid-checkbox-cell-inner']//input[@class='admin__control-checkbox']"/>
-+        <element name="select" type="select" selector="//tr[@class='data-row']//button[@class='action-select']"/>
-+        <element name="editInSelect" type="text" selector="//a[contains(text(), 'Edit')]"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
-index 3fb56e0b179..d487517269c 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="BlockPageActionsSection">
-         <element name="addNewBlock" type="button" selector="#add" timeout="30"/>
-         <element name="select" type="button" selector="//div[text()='{{var1}}']//parent::td//following-sibling::td//button[text()='Select']" parameterized="true"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
-index 65ea1226772..2efa7f62fc4 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CmsNewBlockBlockActionsSection">
-         <element name="savePage" type="button" selector="#save-button" timeout="30"/>
-     </section>
-@@ -17,6 +17,7 @@
-         <element name="saveAndDuplicate" type="button" selector="#save_and_duplicate" timeout="10"/>
-         <element name="saveAndClose" type="button" selector="#save_and_close" timeout="10"/>
-         <element name="expandSplitButton" type="button" selector="//button[@data-ui-id='save-button-dropdown']" timeout="10"/>
-+        <element name="back" type="button" selector="#back"/>
-     </section>
-     <section name="BlockWYSIWYGSection">
-         <element name="ShowHideBtn" type="button" selector="#togglecms_block_form_content"/>
-@@ -24,4 +25,8 @@
-     <section name="BlockContentSection">
-         <element name="TextArea" type="input" selector="#cms_block_form_content"/>
-     </section>
-+    <section name="CmsBlockBlockActionSection">
-+        <element name="deleteBlock" type="button" selector="#delete" timeout="30"/>
-+        <element name="deleteConfirm" type="button" selector=".action-primary.action-accept" timeout="60"/>
-+    </section>
- </sections>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection.xml
-index 00b81686f71..79fc3bac0fb 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CmsNewBlockBlockBasicFieldsSection">
-         <element name="title" type="input" selector="input[name=title]"/>
-         <element name="identifier" type="input" selector="input[name=identifier]"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPageHierarchySection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPageHierarchySection.xml
-index e2c4f48f4ff..a2e4aecf8db 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPageHierarchySection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPageHierarchySection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CmsNewPageHierarchySection">
-         <element name="header" type="button" selector="div[data-index=hierarchy]" timeout="30"/>
-         <element name="selectHierarchy" type="button" selector="//a/span[contains(text(),'{{var1}}')]" parameterized="true" timeout="30"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
-index 810c482dffd..a340d0af1e7 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CmsNewPagePageActionsSection">
-         <element name="savePage" type="button" selector="#save_and_close" timeout="10"/>
-         <element name="reset" type="button" selector="#reset"/>
-@@ -22,5 +22,6 @@
-         <element name="content" type="input" selector="//textarea[@name='content']"/>
-         <element name="spinner" type="input" selector='//div[@data-component="cms_page_form.cms_page_form"]' />
-         <element name="saveAndClose" type="button" selector="#save_and_close" timeout="10"/>
-+        <element name="insertWidget" type="button" selector="//span[contains(text(),'Insert Widget...')]"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml
-index 468dbecb20e..7288e5d455d 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml
-@@ -7,9 +7,10 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CmsNewPagePageBasicFieldsSection">
-         <element name="pageTitle" type="input" selector="input[name=title]"/>
-+        <element name="RequiredFieldIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=title]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
-         <element name="isActive" type="button" selector="//input[@name='is_active' and @value='{{var1}}']" parameterized="true"/>
-         <element name="duplicatedURLKey" type="input" selector="//input[contains(@data-value,'{{var1}}')]" parameterized="true"/>
-     </section>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageContentSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageContentSection.xml
-index 8ec0c8349c1..05a125b9cc6 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageContentSection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageContentSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CmsNewPagePageContentSection">
-         <element name="header" type="button" selector="div[data-index=content]"/>
-         <element name="contentHeading" type="input" selector="input[name=content_heading]"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageSeoSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageSeoSection.xml
-index 0fe9c01d36f..dfd7386e09a 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageSeoSection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageSeoSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CmsNewPagePageSeoSection">
-         <element name="header" type="button" selector="div[data-index=search_engine_optimisation]" timeout="30"/>
-         <element name="urlKey" type="input" selector="input[name=identifier]"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePiwSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePiwSection.xml
-index 456de55b491..bd487e3b2c0 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePiwSection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePiwSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CmsNewPagePiwSection">
-         <element name="header" type="button" selector="div[data-index=websites]" timeout="30"/>
-         <element name="selectStoreView" type="select" selector="//option[contains(text(),'{{var1}}')]" parameterized="true"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
-index 2f28aa46af6..494c98ca44e 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CmsPagesPageActionsSection">
-         <element name="filterButton" type="input" selector="//button[text()='Filters']"/>
-         <element name="URLKey" type="input" selector="//div[@class='admin__form-field-control']/input[@name='identifier']"/>
-@@ -17,7 +17,7 @@
-         <element name="addNewPageButton" type="button" selector="#add" timeout="30"/>
-         <element name="select" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']" parameterized="true"/>
-         <element name="edit" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Edit']" parameterized="true"/>
--        <element name="preview" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Preview']" parameterized="true"/>
-+        <element name="preview" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='View']" parameterized="true"/>
-         <element name="clearAllButton" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]"/>
-         <element name="activeFilters" type="button" selector="//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]" />
-         <element name="spinner" type="input" selector='//div[@data-component="cms_page_listing.cms_page_listing.cms_page_columns"]'/>
-@@ -27,5 +27,8 @@
-         <element name="savePageSuccessMessage" type="text" selector=".message-success"/>
-         <element name="delete" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Delete']" parameterized="true"/>
-         <element name="deleteConfirm" type="button" selector=".action-primary.action-accept" timeout="60"/>
-+        <element name="pageRowCheckboxByIdentifier" type="checkbox" selector="//table[@data-role='grid']//td[count(../../..//th[./*[.='URL Key']]/preceding-sibling::th) + 1][./*[.='{{identifier}}']]/../td//input[@data-action='select-row']"  parameterized="true" />
-+        <element name="massActionsButton" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//button[contains(@class, 'action-select')]" />
-+        <element name="massActionsOption" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//span[contains(@class, 'action-menu-item') and .= '{{action}}']" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CustomVariableSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CustomVariableSection.xml
-index 354c86cfc4b..1488134ea51 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/CustomVariableSection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/CustomVariableSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CustomVariableSection">
-         <element name="GridCustomVariableCode" type="text" selector=".//*[@id='customVariablesGrid_table']/tbody//tr//td[contains(text(), '{{var1}}')]" parameterized="true"/>
-         <element name="variableCode" type="input" selector="#code"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontBlockSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontBlockSection.xml
-index fb4abe30b37..bd2f9e5a646 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontBlockSection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontBlockSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontBlockSection">
-         <element name="mediaDescription" type="text" selector=".widget.block.block-static-block>p>img"/>
-         <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
-index d7c0a41464d..4ce8842c1ad 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
-@@ -7,10 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCMSPageSection">
-         <element name="mediaDescription" type="text" selector=".column.main>p>img"/>
--        <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
-+        <element name="imageSource" type="text" selector="//img[contains(@src,'{{imageName}}')]" parameterized="true"/>
-         <element name="mainTitle" type="text" selector="#maincontent .page-title"/>
-+        <element name="mainContent" type="text" selector="#maincontent"/>
-+        <element name="footerTop" type="text" selector="footer.page-footer"/>
-+        <element name="title" type="text" selector="//div[@class='breadcrumbs']//ul/li[@class='item cms_page']"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml
-deleted file mode 100644
-index 154bf33ac56..00000000000
---- a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml
-+++ /dev/null
-@@ -1,13 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="StorefrontHeaderSection">
--    </section>
--</sections>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
-index 0f13c3de47d..ff6167ffc10 100644
---- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="TinyMCESection">
-         <element name="checkIfContentTabOpen" type="button" selector="//span[text()='Content']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
-         <element name="CheckIfTabExpand" type="button" selector="//div[@data-state-collapsible='closed']//span[text()='Content']"/>
-@@ -31,18 +31,23 @@
-         <element name="InsertImage" type="button" selector=".mce-i-image" />
-         <element name="InsertTable" type="button" selector=".mce-i-table" />
-         <element name="SpecialCharacter" type="button" selector=".mce-i-charmap" />
-+        <element name="WidgetButton" type="button" selector="span[class*='magento-widget mceNonEditable']"/>
-+        <element name="EditorContent" type="input" selector="#tinymce"/>
-     </section>
-     <section name="MediaGallerySection">
-         <element name="Browse" type="button" selector=".mce-i-browse"/>
-+        <element name="browseForImage" type="button" selector="//*[@id='srcbrowser']"/>
-         <element name="BrowseUploadImage" type="file" selector=".fileupload" />
-         <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
-         <element name="imageOrImageCopy" type="text" selector="//div[contains(@class,'media-gallery-modal')]//img[contains(@alt, '{{arg1}}.{{arg2}}')]|//img[contains(@alt,'{{arg1}}_') and contains(@alt,'.{{arg2}}')]" parameterized="true"/>
-         <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
-         <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
-         <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />
-+        <element name="ImageDescriptionTinyMCE3" type="input" selector="#alt" />
-         <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
-         <element name="UploadImage" type="file" selector=".fileupload" />
-         <element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
-+        <element name="insertBtn" type="button" selector="#insert"/>
-         <element name="InsertFile" type="text" selector="#insert_files"/>
-         <element name="CreateFolder" type="button" selector="#new_folder" />
-         <element name="DeleteSelectedBtn" type="text" selector="#delete_files"/>
-@@ -54,6 +59,7 @@
-         <element name="WysiwygArrow" type="button" selector="#d3lzaXd5Zw-- > .jstree-icon" />
-         <element name="checkIfWysiwygArrowExpand" type="button" selector="//li[@id='d3lzaXd5Zw--' and contains(@class,'jstree-closed')]" />
-         <element name="confirmDelete" type="button" selector=".action-primary.action-accept" />
-+        <element name="imageBlockByName" type="block" selector="//div[@data-row='file'][contains(., '{{imageName}}')]" parameterized="true"/>
-     </section>
-     <section name="VariableSection">
-         <element name="InsertWidget" type="button" selector="#insert_variable"/>
-@@ -74,11 +80,12 @@
-     </section>
-     <section name="WidgetSection">
-         <element name="InsertWidgetTitle" type="text" selector="//h1[contains(text(),'Insert Widget')]"/>
-+        <element name="DisplayType" type="select" selector="select[name='parameters[display_type]']"/>
-         <element name="SelectCategoryTitle" type="text" selector="//h1[contains(text(),'Select Category')]"/>
-         <element name="SelectProductTitle" type="text" selector="//h1[contains(text(),'Select Product')]"/>
-         <element name="SelectPageTitle" type="text" selector="//h1[contains(text(),'Select Page')]"/>
-         <element name="SelectBlockTitle" type="text" selector="//h1[contains(text(),'Select Block')]"/>
--        <element name="InsertWidget" type="button" selector="#insert_button"/>
-+        <element name="InsertWidget" type="button" selector="#insert_button" timeout="30"/>
-         <element name="InsertWidgetBtnDisabled" type="button" selector="//button[@id='insert_button' and contains(@class,'disabled')]"/>
-         <element name="InsertWidgetBtnEnabled" type="button" selector="//button[@id='insert_button' and not(contains(@class,'disabled'))]"/>
-         <element name="CancelBtnEnabled" type="button" selector="//button[@id='reset' and not(contains(@class,'disabled'))]"/>
-@@ -94,6 +101,10 @@
-         <element name="AddParam" type="button" selector=".rule-param-add"/>
-         <element name="ConditionsDropdown" type="select" selector="#conditions__1__new_child"/>
-         <element name="RuleParam" type="button" selector="//a[text()='...']"/>
-+        <element name="RuleParam1" type="button" selector="(//span[@class='rule-param']//a)[{{var}}]" parameterized="true"/>
-+        <element name="RuleParamSelect" type="select" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//select" parameterized="true"/>
-+        <element name="RuleParamInput" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//input" parameterized="true"/>
-+        <element name="RuleParamLabel" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//a" parameterized="true"/>
-         <element name="Chooser" type="button" selector="//img[@title='Open Chooser']"/>
-         <element name="PageSize" type="input" selector="input[name='parameters[page_size]']"/>
-         <element name="ProductAttribute" type="multiselect" selector="select[name='parameters[show_attributes][]']" />
-@@ -103,6 +114,8 @@
-         <element name="CompareBtn" type="button" selector=".action.tocompare"/>
-         <element name="ClearCompare" type="button" selector="#compare-clear-all"/>
-         <element name="AcceptClear" type="button" selector=".action-primary.action-accept" />
--
-+        <element name="ChooserName" type="input" selector="input[name='chooser_name']" />
-+        <element name="SelectPageButton" type="button" selector="//button[@title='Select Page...']"/>
-+        <element name="SelectPageFilterInput" type="input" selector="input.admin__control-text[name='{{filterName}}']" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
-new file mode 100644
-index 00000000000..11bf03c1d5e
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
-@@ -0,0 +1,70 @@
-+<?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="AdminAddImageToCMSPageTinyMCE3Test">
-+        <annotations>
-+            <features value="Cms"/>
-+            <stories value="Admin should be able to upload images with TinyMCE3 WYSIWYG"/>
-+            <group value="Cms"/>
-+            <title value="Verify that admin is able to upload image to a CMS Page with TinyMCE3 enabled"/>
-+            <description value="Verify that admin is able to upload image to CMS Page with TinyMCE3 enabled"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-95725"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
-+            <!-- Choose TinyMCE3 as the default WYSIWYG editor-->
-+            <magentoCLI command="config:set cms/wysiwyg/editor Magento_Tinymce3/tinymce3Adapter" stepKey="enableTinyMCE3"/>
-+        </before>
-+        <after>
-+            <!-- Switch WYSIWYG editor to TinyMCE4-->
-+            <comment userInput="Reset editor as TinyMCE4" stepKey="chooseTinyMCE4AsEditor"/>
-+            <magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage2"/>
-+        <waitForPageLoad stepKey="wait5"/>
-+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
-+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
-+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE3}}" stepKey="waitForTinyMCE3"/>
-+        <seeElement selector="{{TinyMCESection.TinyMCE3}}" stepKey="seeTinyMCE3" />
-+        <wait time="3" stepKey="waiting"/>
-+        <comment userInput="Click Insert image button" stepKey="clickImageButton"/>
-+        <click selector="{{TinyMCESection.InsertImageBtnTinyMCE3}}" stepKey="clickInsertImage" />
-+        <waitForPageLoad stepKey="waitForiFrameToLoad" />
-+        <!-- Switch to the Edit/Insert Image iFrame -->
-+        <comment userInput="Switching to iFrame" stepKey="insertImageiFrame"/>
-+        <executeJS function="document.querySelector('.clearlooks2 iframe').setAttribute('name', 'insert-image');" stepKey="makeIFrameInteractable"/>
-+        <switchToIFrame selector="insert-image" stepKey="switchToIFrame"/>
-+        <click selector="{{MediaGallerySection.browseForImage}}" stepKey="clickBrowse"/>
-+        <switchToIFrame stepKey="switchOutOfIFrame"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad" />
-+        <actionGroup ref="CreateImageFolder" stepKey="CreateImageFolder">
-+            <argument name="ImageFolder" value="ImageFolder"/>
-+        </actionGroup>
-+        <actionGroup ref="attachImage" stepKey="attachImage1">
-+            <argument name="Image" value="ImageUpload"/>
-+        </actionGroup>
-+        <actionGroup ref="saveImage" stepKey="insertImage"/>
-+        <!-- Switching back to the Edit/Insert Image iFrame-->
-+        <comment userInput="switching back to iFrame" stepKey="switchBackToIFrame"/>
-+        <executeJS function="document.querySelector('.clearlooks2 iframe').setAttribute('name', 'insert-image');" stepKey="makeIFrameInteractable2"/>
-+        <switchToIFrame selector="insert-image" stepKey="switchToIFrame2"/>
-+        <waitForElementVisible selector="{{MediaGallerySection.insertBtn}}" stepKey="waitForInsertBtnOnIFrame" />
-+        <fillField selector="{{MediaGallerySection.ImageDescriptionTinyMCE3}}" userInput="{{ImageUpload.content}}" stepKey="fillImageDescription" />
-+        <click selector="{{MediaGallerySection.insertBtn}}" stepKey="clickInsertBtn" />
-+        <waitForPageLoad stepKey="wait3"/>
-+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
-+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
-+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
-index 46aa4ac22e0..5baf75d43c5 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddImageToWYSIWYGBlockTest">
-         <annotations>
-             <features value="Cms"/>
-@@ -17,7 +17,7 @@
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-84376"/>
-             <skip>
--                <issueId value="MQE-1187" />
-+                <issueId value="MC-17232"/>
-             </skip>
-         </annotations>
-         <before>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
-index 995f52e42b3..e63a6be51bc 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddImageToWYSIWYGCMSTest">
-         <annotations>
-             <features value="Cms"/>
-@@ -16,6 +16,9 @@
-             <description value="Admin should be able to add image to WYSIWYG content of CMS Page"/>
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-85825"/>
-+            <skip>
-+                <issueId value="MC-17232"/>
-+            </skip>
-         </annotations>
-         <before>
-             <createData entity="_defaultCmsPage" stepKey="createCMSPage" />
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml
-index d0d8edc6abc..ce34a8d09c3 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddVariableToWYSIWYGBlockTest">
-         <annotations>
-             <features value="Cms"/>
-@@ -15,6 +15,7 @@
-             <title value="Admin should be able to add variable to WYSIWYG content of Block"/>
-             <description value="You should be able to add variable to WYSIWYG content Block"/>
-             <testCaseId value="MAGETWO-84378"/>
-+            <severity value="AVERAGE"/>
-         </annotations>
-         <before>
-             <createData entity="_defaultCmsPage" stepKey="createCMSPage" />
-@@ -48,9 +49,9 @@
-         <waitForLoadingMaskToDisappear stepKey="waitForPageLoad3"/>
-         <!--see Insert Variable button disabled-->
-         <see selector="{{VariableSection.InsertVariableBtnDisabled}}" userInput="Insert Variable" stepKey="seeInsertWidgetDisabled" />
--        <!--see Cancel button enabed-->
-+        <!--see Cancel button enabled-->
-         <see selector="{{VariableSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
--        <!--see 4 colums-->
-+        <!--see 4 columns-->
-         <see selector="{{VariableSection.ColName('Select')}}" userInput="Select" stepKey="selectCol" />
-         <see selector="{{VariableSection.ColName('Variable Name')}}" userInput="Variable Name" stepKey="variableCol" />
-         <see selector="{{VariableSection.ColName('Type')}}" userInput="Type" stepKey="typeCol" />
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml
-index a7627b5492d..3b501859e60 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddVariableToWYSIWYGCMSTest">
-         <annotations>
-             <features value="Cms"/>
-@@ -43,9 +43,9 @@
-         <waitForText userInput="Insert Variable" stepKey="waitForSlideOutOpen"/>
-         <!--see Insert Variable button disabled-->
-         <see selector="{{VariableSection.InsertVariableBtnDisabled}}" userInput="Insert Variable" stepKey="seeInsertWidgetDisabled" />
--        <!--see Cancel button enabed-->
-+        <!--see Cancel button enabled-->
-         <see selector="{{VariableSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
--        <!--see 4 colums-->
-+        <!--see 4 columns-->
-         <see selector="{{VariableSection.ColName('Select')}}" userInput="Select" stepKey="selectCol" />
-         <see selector="{{VariableSection.ColName('Variable Name')}}" userInput="Variable Name" stepKey="variableCol" />
-         <see selector="{{VariableSection.ColName('Type')}}" userInput="Type" stepKey="typeCol" />
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGBlockTest.xml
-index 4d93980da9a..ad5e769c61b 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGBlockTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGBlockTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddWidgetToWYSIWYGBlockTest">
-         <annotations>
-             <features value="Cms"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
-index 90caf89c6a0..1adb781a675 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest">
-         <annotations>
-             <features value="Cms"/>
-@@ -36,7 +36,7 @@
-         <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
-         <!--see Insert Widget button disabled-->
-         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
--        <!--see Cancel button enabed-->
-+        <!--see Cancel button enabled-->
-         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-         <!--Select "Widget Type"-->
-         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Page Link" stepKey="selectCMSPageLink" />
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
-index 89030034dde..f37038435e1 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest">
-         <annotations>
-             <features value="Cms"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
-index 5993c7e2b82..552eae40739 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest">
-         <annotations>
-             <features value="Cms"/>
-@@ -37,7 +37,7 @@
-         <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
-         <!--see Insert Widget button disabled-->
-         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
--        <!--see Cancel button enabed-->
-+        <!--see Cancel button enabled-->
-         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-         <!--Select "Widget Type"-->
-         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Category Link" stepKey="selectCatalogCategoryLink" />
-@@ -46,7 +46,9 @@
-         <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Category Link Block Template" stepKey="selectTemplate" />
-         <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectCategoryBtn" />
-         <waitForLoadingMaskToDisappear stepKey="wait3"/>
--        <click userInput="$$createPreReqCategory.name$$" stepKey="selectPreCreateCategory" />
-+        <click selector="{{AdminCategorySidebarTreeSection.expandRootCategory}}" stepKey="expandRootCategory" />
-+        <waitForElementVisible selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="expandWait" />
-+        <click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCreateCategory" />
-         <waitForElementNotVisible selector="{{WidgetSection.SelectCategoryTitle}}" stepKey="waitForSlideoutCloses1" />
-         <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
-         <waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideOutCloses2" />
-@@ -62,9 +64,19 @@
-         <see userInput="Hello CMS Page!" stepKey="seeContent"/>
-         <!--see widget on Storefront-->
-         <see userInput="$$createPreReqCategory.name$$" stepKey="seeCategoryLink"/>
-+        <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 0" stepKey="disableGenerateUrlRewrite"/>
-+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage2"/>
-+        <waitForPageLoad stepKey="wait6" />
-+        <see userInput="Hello CMS Page!" stepKey="seeContent2"/>
-+        <!--see widget on Storefront-->
-+        <grabAttributeFrom selector=".widget a" userInput="href" stepKey="dataHref" />
-+        <assertRegExp expected="|$$createPreReqCategory.name$$.html|i"
-+                      expectedType="string" actual="$dataHref" actualType="variable"
-+                      stepKey="seeProductLinkInCategory"/>
-         <after>
-             <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCatalog" />
-             <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-+            <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="enableGenerateUrlRewrite"/>
-             <actionGroup ref="logout" stepKey="logout"/>
-         </after>
-     </test>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
-index 6d626b3a917..d75d422afa2 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest">
-         <annotations>
-             <features value="Cms"/>
-@@ -41,7 +41,7 @@
-         <waitForPageLoad stepKey="wait3"/>
-         <!--see Insert Widget button disabled-->
-         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
--        <!--see Cancel button enabed-->
-+        <!--see Cancel button enabled-->
-         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-         <!--Select "Widget Type"-->
-         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Product Link" stepKey="selectCatalogProductLink" />
-@@ -50,6 +50,8 @@
-         <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Product Link Block Template" stepKey="selectTemplate" />
-         <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
-         <waitForLoadingMaskToDisappear stepKey="wait4"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.expandRootCategory}}" stepKey="expandRootCategory" />
-+        <waitForElementVisible selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="expandWait" />
-         <click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCategory" />
-         <waitForLoadingMaskToDisappear stepKey="waitLoadingMask" />
-         <click selector="{{WidgetSection.PreCreateProduct('$$createPreReqProduct.name$$')}}" stepKey="selectPreProduct" />
-@@ -69,10 +71,19 @@
-         <!--see widget on Storefront-->
-         <see userInput="Hello CMS Page!" stepKey="seeContent"/>
-         <see userInput="$$createPreReqProduct.name$$" stepKey="seeProductLink"/>
-+        <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 0" stepKey="disableGenerateUrlRewrite"/>
-+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage2"/>
-+        <waitForPageLoad stepKey="wait8" />
-+        <!--see widget on Storefront-->
-+        <grabAttributeFrom selector=".widget a" userInput="href" stepKey="dataHref" />
-+        <assertRegExp expected="|$$createPreReqCategory.name$$/$$createPreReqProduct.name$$.html|i"
-+                      expectedType="string" actual="$dataHref" actualType="variable"
-+                      stepKey="seeProductLinkInCategory"/>
-         <after>
-             <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCatalog" />
-             <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct" />
-             <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-+            <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="enableGenerateUrlRewrite"/>
-             <actionGroup ref="logout" stepKey="logout"/>
-         </after>
-     </test>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
-index 69938147444..394d79bda1a 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest">
-         <annotations>
-             <features value="Cms"/>
-@@ -42,7 +42,7 @@
-         <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
-         <!--see Insert Widget button disabled-->
-         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
--        <!--see Cancel button enabed-->
-+        <!--see Cancel button enabled-->
-         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-         <!--Select "Widget Type"-->
-         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Products List" stepKey="selectCatalogProductsList" />
-@@ -57,8 +57,29 @@
-         <click selector="{{WidgetSection.RuleParam}}" stepKey="clickRuleParam" />
-         <waitForElementVisible selector="{{WidgetSection.Chooser}}" stepKey="waitForElement" />
-         <click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser" />
--        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear3" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear4" />
-         <click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCategory" />
-+
-+        <!-- Test that the "<" operand functions correctly -->
-+        <click selector="{{WidgetSection.AddParam}}" stepKey="clickAddParamBtn2" />
-+        <waitForElementVisible selector="{{WidgetSection.ConditionsDropdown}}" stepKey="waitForDropdownVisible2"/>
-+        <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="Price" stepKey="selectPriceCondition"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear3"/>
-+        <click selector="{{WidgetSection.RuleParamLabel('2','1')}}" stepKey="clickOperatorLabel"/>
-+        <selectOption selector="{{WidgetSection.RuleParamSelect('2','1')}}" userInput="&lt;" stepKey="selectLessThanCondition"/>
-+        <click selector="{{WidgetSection.RuleParam}}" stepKey="clickRuleParam2"/>
-+        <fillField selector="{{WidgetSection.RuleParamInput('2','2')}}" userInput="125" stepKey="fillMaxPrice"/>
-+
-+        <!-- Test that the ">" operand functions correctly -->
-+        <click selector="{{WidgetSection.AddParam}}" stepKey="clickAddParamBtn3" />
-+        <waitForElementVisible selector="{{WidgetSection.ConditionsDropdown}}" stepKey="waitForDropdownVisible3"/>
-+        <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="Price" stepKey="selectPriceCondition2"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear5"/>
-+        <click selector="{{WidgetSection.RuleParamLabel('3','1')}}" stepKey="clickOperatorLabel2"/>
-+        <selectOption selector="{{WidgetSection.RuleParamSelect('3','1')}}" userInput="&gt;" stepKey="selectLessThanCondition2"/>
-+        <click selector="{{WidgetSection.RuleParam}}" stepKey="clickRuleParam3"/>
-+        <fillField selector="{{WidgetSection.RuleParamInput('3','2')}}" userInput="1" stepKey="fillMinPrice"/>
-+
-         <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
-         <waitForPageLoad stepKey="wait6" />
-         <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
-index 50441574d7a..862f51ea72f 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest">
-         <annotations>
-             <features value="Cms"/>
-@@ -17,8 +17,6 @@
-             <description value="Admin should be able to create a CMS page with widget type: Recently Compared Products"/>
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-83792"/>
--            <!--Skip test due to MC-1284-->
--            <group value="skip"/>
-         </annotations>
-         <!--Main test-->
-         <before>
-@@ -43,7 +41,7 @@
-         <waitForPageLoad stepKey="wait2"/>
-         <!--see Insert Widget button disabled-->
-         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
--        <!--see Cancel button enabed-->
-+        <!--see Cancel button enabled-->
-         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-         <!--Select "Widget Type"-->
-         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Recently Compared Products" stepKey="selectRecentlyComparedProducts" />
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
-index 1574e6bd3b4..298aed917fc 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest">
-         <annotations>
-             <features value="Cms"/>
-@@ -40,7 +40,7 @@
-         <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
-         <!--see Insert Widget button disabled-->
-         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
--        <!--see Cancel button enabed-->
-+        <!--see Cancel button enabled-->
-         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-         <!--Select "Widget Type"-->
-         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Recently Viewed Products" stepKey="selectRecentlyViewedProducts" />
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageMassActionTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageMassActionTest.xml
-new file mode 100644
-index 00000000000..7cc0719dcbe
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageMassActionTest.xml
-@@ -0,0 +1,85 @@
-+<?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="AdminCmsPageMassActionTest">
-+        <annotations>
-+            <features value="CmsPage"/>
-+            <title value="Create two CMS Pages and perform mass disable action"/>
-+            <description value="Admin should be able to perform mass actions to CMS pages"/>
-+            <stories value="Admin Grid Mass Action" />
-+            <testCaseId value="MC-14659" />
-+            <severity value="CRITICAL"/>
-+            <group value="backend"/>
-+            <group value="CMSContent"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="_defaultCmsPage" stepKey="firstCMSPage" />
-+            <createData entity="_duplicatedCMSPage" stepKey="secondCMSPage" />
-+        </before>
-+        <after>
-+            <deleteData createDataKey="firstCMSPage" stepKey="deleteFirstCMSPage" />
-+            <deleteData createDataKey="secondCMSPage" stepKey="deleteSecondCMSPage" />
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Go to Grid page-->
-+        <actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="navigateToCMSPageGrid"/>
-+        <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearPossibleGridFilters"/>
-+
-+        <!--Select pages in Grid-->
-+        <actionGroup ref="AdminSelectCMSPageInGridActionGroup" stepKey="selectFirstCMSPage">
-+            <argument name="identifier" value="$$firstCMSPage.identifier$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminSelectCMSPageInGridActionGroup" stepKey="selectSecondCMSPage">
-+            <argument name="identifier" value="$$secondCMSPage.identifier$$"/>
-+        </actionGroup>
-+
-+        <!-- Disable Pages-->
-+        <actionGroup ref="AdminCMSPageMassActionSelectActionGroup" stepKey="disablePages">
-+            <argument name="action" value="Disable" />
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
-+            <argument name="message" value="A total of 2 record(s) have been disabled." />
-+        </actionGroup>
-+
-+        <!--Verify pages in Grid-->
-+        <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearGridFilters"/>
-+        <actionGroup ref="AdminGridFilterFillInputFieldActionGroup" stepKey="filterGridByFirstCmsPageIdentifier">
-+            <argument name="filterInputName" value="identifier" />
-+            <argument name="filterValue" value="$$firstCMSPage.identifier$$" />
-+        </actionGroup>
-+        <actionGroup ref="AdminGridFilterApplyActionGroup" stepKey="applyFirstGridFilters"/>
-+        <actionGroup ref="AssertCMSPageInGridActionGroup" stepKey="assertFirstCmsPageInGrid">
-+            <argument name="cmsPage" value="$$firstCMSPage$$" />
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminGridFilterFillInputFieldActionGroup" stepKey="filterGridBySecondCmsPageIdentifier">
-+            <argument name="filterInputName" value="identifier" />
-+            <argument name="filterValue" value="$$secondCMSPage.identifier$$" />
-+        </actionGroup>
-+        <actionGroup ref="AdminGridFilterApplyActionGroup" stepKey="applySecondGridFilters"/>
-+        <actionGroup ref="AssertCMSPageInGridActionGroup" stepKey="assertSecondCmsPageInGrid">
-+            <argument name="cmsPage" value="$$secondCMSPage$$" />
-+        </actionGroup>
-+        <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearGridFiltersToIsolateTest"/>
-+
-+        <!--Verify pages are disabled on Storefront-->
-+        <actionGroup ref="StorefrontGoToCMSPageActionGroup" stepKey="goToFirstCMSPageOnStorefront">
-+            <argument name="identifier" value="$$firstCMSPage.identifier$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertCMSPageNotFoundOnStorefrontActionGroup" stepKey="seeNotFoundErrorForFirstPage"/>
-+        <actionGroup ref="StorefrontGoToCMSPageActionGroup" stepKey="goToSecondCMSPageOnStorefront">
-+            <argument name="identifier" value="$$secondCMSPage.identifier$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertCMSPageNotFoundOnStorefrontActionGroup" stepKey="seeNotFoundErrorForSecondPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminContentBlocksNavigateMenuTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentBlocksNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..19f501d6aa2
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentBlocksNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminContentBlocksNavigateMenuTest">
-+        <annotations>
-+            <features value="Cms"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin content blocks navigate menu test"/>
-+            <description value="Admin should be able to navigate to Content > Blocks"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14129"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentBlocksPage">
-+            <argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuContentElementsBlocks.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuContentElementsBlocks.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..323a1de7b9a
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminContentPagesNavigateMenuTest">
-+        <annotations>
-+            <features value="Cms"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin content pages navigate menu test"/>
-+            <description value="Admin should be able to navigate to Content > Pages"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14128"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentPagesPage">
-+            <argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuContentElementsPages.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuContentElementsPages.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsBlockTest.xml
-index 3b80204f5c3..7ab0d9209dd 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsBlockTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsBlockTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateDuplicatedCmsBlockTest">
-         <annotations>
-             <features value="Cms"/>
-@@ -23,6 +23,9 @@
-             <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-         </before>
-         <after>
-+            <actionGroup ref="deleteBlock" stepKey="deleteCreatedBlock">
-+                <argument name="Block" value="_defaultBlock"/>
-+            </actionGroup>
-             <actionGroup ref="logout" stepKey="logout"/>
-         </after>
-         <amOnPage url="{{CmsNewBlock.url}}" stepKey="amOnBlocksCreationForm"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml
-index 73e38fcdad5..fccc5b5980f 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateCmsPageTest">
-         <annotations>
-             <features value="Cms"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
-new file mode 100644
-index 00000000000..e6ab1c13060
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
-@@ -0,0 +1,74 @@
-+<?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="CheckStaticBlocksTest">
-+        <annotations>
-+            <features value="Cms"/>
-+            <stories value="MAGETWO-91559 - Static blocks with same ID appear in place of correct block"/>
-+            <title value="Check static blocks: ID should be unique per Store View"/>
-+            <description value="Check static blocks: ID should be unique per Store View"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-94229"/>
-+            <group value="Cms"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateWebsite">
-+                <argument name="newWebsiteName" value="secondWebsite"/>
-+                <argument name="websiteCode" value="second_website"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateStore">
-+                <argument name="website" value="secondWebsite"/>
-+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
-+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateStoreView">
-+                <argument name="StoreGroup" value="customStoreGroup"/>
-+                <argument name="customStore" value="customStore"/>
-+            </actionGroup>
-+        </before>
-+
-+        <!--Go to Cms blocks page-->
-+        <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSPagesGrid"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <seeInCurrentUrl url="cms/block/" stepKey="VerifyPageIsOpened"/>
-+        <!--Click to create new block-->
-+        <click selector="{{BlockPageActionsSection.addNewBlock}}" stepKey="ClickToAddNewBlock"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <seeInCurrentUrl url="cms/block/new" stepKey="VerifyNewBlockPageIsOpened"/>
-+        <actionGroup ref="FillOutBlockContent" stepKey="FillOutBlockContent"/>
-+        <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="ClickToSaveBlock"/>
-+        <waitForPageLoad stepKey="waitForPageLoad3"/>
-+        <see userInput="You saved the block." stepKey="VerifyBlockIsSaved"/>
-+        <!--Click to go back and add new block-->
-+        <click selector="{{BlockNewPagePageActionsSection.back}}" stepKey="ClickToGoBack"/>
-+        <waitForPageLoad stepKey="waitForPageLoad4"/>
-+        <click selector="{{BlockPageActionsSection.addNewBlock}}" stepKey="ClickToAddNewBlock1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad5"/>
-+        <seeInCurrentUrl url="cms/block/new" stepKey="VerifyNewBlockPageIsOpened1"/>
-+        <!--Add new BLock with the same data-->
-+        <actionGroup ref="FillOutBlockContent" stepKey="FillOutBlockContent1"/>
-+        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="Default Store View" stepKey="selectDefaultStoreView" />
-+        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="{{customStore.name}}" stepKey="selectSecondStoreView1" />
-+        <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="ClickToSaveBlock1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad6"/>
-+        <!--Verify that corresponding message is displayed-->
-+        <see userInput="A block identifier with the same properties already exists in the selected store." stepKey="VerifyBlockIsSaved1"/>
-+
-+        <after>
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
-+                <argument name="websiteName" value="secondWebsite"/>
-+            </actionGroup>
-+            <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="DeleteCMSBlockActionGroup"/>
-+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/StoreFrontMobileViewValidation.xml b/app/code/Magento/Cms/Test/Mftf/Test/StoreFrontMobileViewValidation.xml
-new file mode 100644
-index 00000000000..6165def067e
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/StoreFrontMobileViewValidation.xml
-@@ -0,0 +1,47 @@
-+<?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="StoreFrontMobileViewValidation">
-+        <annotations>
-+            <features value="Cms"/>
-+            <stories value="Mobile view page footer should stick to the bottom of page on Store front"/>
-+            <title value="Mobile view page footer should stick to the bottom of page on Store front"/>
-+            <description value="Mobile view page footer should stick to the bottom of page on Store front"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94333"/>
-+            <useCaseId value="MAGETWO-93978"/>
-+            <group value="Cms"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_longContentCmsPage" stepKey="createPreReqCMSPage"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createPreReqCMSPage" stepKey="deletePreReqCMSPage"/>
-+            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
-+        </after>
-+        <resizeWindow width="375" height="812" stepKey="resizeWindowToMobile"/>
-+        <amOnPage url="$$createPreReqCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad6" />
-+         <!--Verifying that Footer is not in visible area by default as the CMS page has lots of content which will occupy entire visible area-->
-+        <executeJS function="return document.querySelector('{{StorefrontCMSPageSection.footerTop}}').getBoundingClientRect().top" stepKey="topOfFooter"/>
-+        <assertGreaterThan stepKey="assertDefaultLoad">
-+            <actualResult type="variable">topOfFooter</actualResult>
-+            <expectedResult type="string">812</expectedResult>
-+        </assertGreaterThan>
-+         <!--Verifying that even after scroll footer section is below the main content section-->
-+        <scrollTo selector="{{StorefrontCMSPageSection.footerTop}}" stepKey="scrollToFooterSection"/>
-+        <executeJS function="return document.querySelector('{{StorefrontCMSPageSection.footerTop}}').getBoundingClientRect().top" stepKey="topOfTheFooterAfterScroll"/>
-+        <executeJS function="return document.querySelector('{{StorefrontCMSPageSection.mainContent}}').getBoundingClientRect().bottom" stepKey="bottomOfMainContent"/>
-+        <assertGreaterThan stepKey="assertAfterScroll">
-+            <actualResult type="variable">topOfTheFooterAfterScroll</actualResult>
-+            <expectedResult type="variable">bottomOfMainContent</expectedResult>
-+        </assertGreaterThan>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml
-new file mode 100644
-index 00000000000..d4796b2ef7d
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml
-@@ -0,0 +1,68 @@
-+<?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="StoreViewLanguageCorrectSwitchTest">
-+        <annotations>
-+            <features value="Cms"/>
-+            <stories value="Store view language"/>
-+            <title value="Check that Store View(language) switches correct"/>
-+            <description value="Check that Store View(language) switches correct"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-96388"/>
-+            <useCaseId value="MAGETWO-57337"/>
-+            <group value="Cms"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create Cms Pages -->
-+            <createData entity="_newDefaultCmsPage" stepKey="createFirstCmsPage"/>
-+            <createData entity="_newDefaultCmsPage" stepKey="createSecondCmsPage"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createFirstCmsPage" stepKey="deleteFirstCmsPage"/>
-+            <deleteData createDataKey="createSecondCmsPage" stepKey="deleteSecondCmsPage"/>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
-+                <argument name="customStore" value="NewStoreViewData"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create StoreView -->
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
-+            <argument name="customStore" value="NewStoreViewData"/>
-+        </actionGroup>
-+
-+        <!-- Add StoreView To Cms Page-->
-+        <actionGroup ref="AddStoreViewToCmsPage" stepKey="gotToCmsPage">
-+            <argument name="CMSPage" value="$$createSecondCmsPage$$"/>
-+            <argument name="storeViewName" value="{{NewStoreViewData.name}}"/>
-+        </actionGroup>
-+
-+        <!-- Check that Cms Page is open -->
-+        <amOnPage url="{{StorefrontHomePage.url}}/$$createFirstCmsPage.identifier$$" stepKey="gotToFirstCmsPage"/>
-+        <see userInput="$$createFirstCmsPage.title$$" stepKey="seePageTitle"/>
-+
-+        <!-- Switch StoreView and check that Cms Page is open -->
-+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchToCustomStoreView">
-+            <argument name="storeView" value="NewStoreViewData"/>
-+        </actionGroup>
-+        <amOnPage url="{{StorefrontHomePage.url}}/$$createSecondCmsPage.identifier$$" stepKey="gotToSecondCmsPage"/>
-+        <see userInput="$$createSecondCmsPage.title$$" stepKey="seePageTitle1"/>
-+
-+        <!--Open first Cms page on custom store view-->
-+        <amOnPage url="{{StorefrontHomePage.url}}/$$createFirstCmsPage.identifier$$" stepKey="gotToFirstCmsPage1"/>
-+        <see userInput="Whoops, our bad..." stepKey="seePageError"/>
-+
-+        <!--Switch to default store view and check Cms page-->
-+        <actionGroup ref="StorefrontSwitchDefaultStoreViewActionGroup" stepKey="switchToDefualtStoreView"/>
-+        <see userInput="$$createFirstCmsPage.title$$" stepKey="seePageTitle2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml
-index 3d45d4baae7..9ee2055aae6 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest">
-         <annotations>
-             <features value="Cms"/>
-diff --git a/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml
-index 2bfdc5f5037..caad1cabe78 100644
---- a/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml
-+++ b/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest">
-         <annotations>
-             <features value="Cms"/>
-diff --git a/app/code/Magento/Cms/Test/Unit/Model/BlockTest.php b/app/code/Magento/Cms/Test/Unit/Model/BlockTest.php
-new file mode 100644
-index 00000000000..448112b228a
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Unit/Model/BlockTest.php
-@@ -0,0 +1,337 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Cms\Test\Unit\Model;
-+
-+use Magento\Cms\Model\Block;
-+use Magento\Cms\Model\ResourceModel\Block as BlockResource;
-+use Magento\Framework\Event\ManagerInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Model\Context;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+
-+/**
-+ * @covers \Magento\Cms\Model\Block
-+ */
-+class BlockTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Testable Object
-+     *
-+     * @var Block
-+     */
-+    private $blockModel;
-+
-+    /**
-+     * Object Manager
-+     *
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $eventManagerMock;
-+
-+    /**
-+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $contextMock;
-+
-+    /**
-+     * @var BlockResource|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $resourceMock;
-+
-+    /**
-+     * Set Up
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->resourceMock = $this->createMock(BlockResource::class);
-+        $this->eventManagerMock = $this->createMock(ManagerInterface::class);
-+        $this->contextMock = $this->createMock(Context::class);
-+        $this->contextMock->expects($this->any())->method('getEventDispatcher')->willReturn($this->eventManagerMock);
-+        $this->objectManager = new ObjectManager($this);
-+        $this->blockModel = $this->objectManager->getObject(
-+            Block::class,
-+            [
-+                'context' => $this->contextMock,
-+                'resource' => $this->resourceMock,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test beforeSave method
-+     *
-+     * @return void
-+     *
-+     * @throws LocalizedException
-+     */
-+    public function testBeforeSave()
-+    {
-+        $blockId = 7;
-+        $this->blockModel->setData(Block::BLOCK_ID, $blockId);
-+        $this->blockModel->setData(Block::CONTENT, 'test');
-+        $this->objectManager->setBackwardCompatibleProperty($this->blockModel, '_hasDataChanges', true);
-+        $this->eventManagerMock->expects($this->atLeastOnce())->method('dispatch');
-+        $expected = $this->blockModel;
-+        $actual = $this->blockModel->beforeSave();
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test beforeSave method
-+     *
-+     * @return void
-+     *
-+     * @throws LocalizedException
-+     */
-+    public function testBeforeSaveWithException()
-+    {
-+        $blockId = 10;
-+        $this->blockModel->setData(Block::BLOCK_ID, $blockId);
-+        $this->blockModel->setData(Block::CONTENT, 'Test block_id="' . $blockId . '".');
-+        $this->objectManager->setBackwardCompatibleProperty($this->blockModel, '_hasDataChanges', false);
-+        $this->eventManagerMock->expects($this->never())->method('dispatch');
-+        $this->expectException(LocalizedException::class);
-+        $this->blockModel->beforeSave();
-+    }
-+
-+    /**
-+     * Test getIdentities method
-+     *
-+     * @return void
-+     */
-+    public function testGetIdentities()
-+    {
-+        $result = $this->blockModel->getIdentities();
-+        self::assertInternalType('array', $result);
-+    }
-+
-+    /**
-+     * Test getId method
-+     *
-+     * @return void
-+     */
-+    public function testGetId()
-+    {
-+        $blockId = 12;
-+        $this->blockModel->setData(Block::BLOCK_ID, $blockId);
-+        $expected = $blockId;
-+        $actual = $this->blockModel->getId();
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test getIdentifier method
-+     *
-+     * @return void
-+     */
-+    public function testGetIdentifier()
-+    {
-+        $identifier = 'test01';
-+        $this->blockModel->setData(Block::IDENTIFIER, $identifier);
-+        $expected = $identifier;
-+        $actual = $this->blockModel->getIdentifier();
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test getTitle method
-+     *
-+     * @return void
-+     */
-+    public function testGetTitle()
-+    {
-+        $title = 'test02';
-+        $this->blockModel->setData(Block::TITLE, $title);
-+        $expected = $title;
-+        $actual = $this->blockModel->getTitle();
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test getContent method
-+     *
-+     * @return void
-+     */
-+    public function testGetContent()
-+    {
-+        $content = 'test03';
-+        $this->blockModel->setData(Block::CONTENT, $content);
-+        $expected = $content;
-+        $actual = $this->blockModel->getContent();
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test getCreationTime method
-+     *
-+     * @return void
-+     */
-+    public function testGetCreationTime()
-+    {
-+        $creationTime = 'test04';
-+        $this->blockModel->setData(Block::CREATION_TIME, $creationTime);
-+        $expected = $creationTime;
-+        $actual = $this->blockModel->getCreationTime();
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test getUpdateTime method
-+     *
-+     * @return void
-+     */
-+    public function testGetUpdateTime()
-+    {
-+        $updateTime = 'test05';
-+        $this->blockModel->setData(Block::UPDATE_TIME, $updateTime);
-+        $expected = $updateTime;
-+        $actual = $this->blockModel->getUpdateTime();
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test isActive method
-+     *
-+     * @return void
-+     */
-+    public function testIsActive()
-+    {
-+        $isActive = true;
-+        $this->blockModel->setData(Block::IS_ACTIVE, $isActive);
-+        $result = $this->blockModel->isActive();
-+        self::assertTrue($result);
-+    }
-+
-+    /**
-+     * Test setId method
-+     *
-+     * @return void
-+     */
-+    public function testSetId()
-+    {
-+        $blockId = 15;
-+        $this->blockModel->setId($blockId);
-+        $expected = $blockId;
-+        $actual = $this->blockModel->getData(Block::BLOCK_ID);
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test setIdentifier method
-+     *
-+     * @return void
-+     */
-+    public function testSetIdentifier()
-+    {
-+        $identifier = 'test06';
-+        $this->blockModel->setIdentifier($identifier);
-+        $expected = $identifier;
-+        $actual = $this->blockModel->getData(Block::IDENTIFIER);
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test setTitle method
-+     *
-+     * @return void
-+     */
-+    public function testSetTitle()
-+    {
-+        $title = 'test07';
-+        $this->blockModel->setTitle($title);
-+        $expected = $title;
-+        $actual = $this->blockModel->getData(Block::TITLE);
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test setContent method
-+     *
-+     * @return void
-+     */
-+    public function testSetContent()
-+    {
-+        $content = 'test08';
-+        $this->blockModel->setContent($content);
-+        $expected = $content;
-+        $actual = $this->blockModel->getData(Block::CONTENT);
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test setCreationTime method
-+     *
-+     * @return void
-+     */
-+    public function testSetCreationTime()
-+    {
-+        $creationTime = 'test09';
-+        $this->blockModel->setCreationTime($creationTime);
-+        $expected = $creationTime;
-+        $actual = $this->blockModel->getData(Block::CREATION_TIME);
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test setUpdateTime method
-+     *
-+     * @return void
-+     */
-+    public function testSetUpdateTime()
-+    {
-+        $updateTime = 'test10';
-+        $this->blockModel->setUpdateTime($updateTime);
-+        $expected = $updateTime;
-+        $actual = $this->blockModel->getData(Block::UPDATE_TIME);
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test setIsActive method
-+     *
-+     * @return void
-+     */
-+    public function testSetIsActive()
-+    {
-+        $this->blockModel->setIsActive(false);
-+        $result = $this->blockModel->getData(Block::IS_ACTIVE);
-+        self::assertFalse($result);
-+    }
-+
-+    /**
-+     * Test getStores method
-+     *
-+     * @return void
-+     */
-+    public function testGetStores()
-+    {
-+        $stores = [1, 4, 9];
-+        $this->blockModel->setData('stores', $stores);
-+        $expected = $stores;
-+        $actual = $this->blockModel->getStores();
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test getAvailableStatuses method
-+     *
-+     * @return void
-+     */
-+    public function testGetAvailableStatuses()
-+    {
-+        $result = $this->blockModel->getAvailableStatuses();
-+        self::assertInternalType('array', $result);
-+    }
-+}
-diff --git a/app/code/Magento/Cms/Test/Unit/Model/Plugin/ProductTest.php b/app/code/Magento/Cms/Test/Unit/Model/Plugin/ProductTest.php
-new file mode 100644
-index 00000000000..3e8d8116236
---- /dev/null
-+++ b/app/code/Magento/Cms/Test/Unit/Model/Plugin/ProductTest.php
-@@ -0,0 +1,93 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Cms\Test\Unit\Model\Plugin;
-+
-+use Magento\Catalog\Model\Product as CatalogProduct;
-+use Magento\Cms\Model\Page;
-+use Magento\Cms\Model\Plugin\Product;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Product plugin test
-+ */
-+class ProductTest extends TestCase
-+{
-+    /**
-+     * @var Product
-+     */
-+    private $plugin;
-+
-+    /**
-+     * @var MockObject|CatalogProduct
-+     */
-+    private $product;
-+
-+    /**
-+     * @var MockObject|Page
-+     */
-+    private $page;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = new ObjectManager($this);
-+
-+        $this->product = $this->getMockBuilder(CatalogProduct::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getEntityId', 'getOrigData', 'getData', 'getCategoryIds'])
-+            ->getMock();
-+
-+        $this->page = $this->getMockBuilder(Page::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getId', 'load'])
-+            ->getMock();
-+
-+        $this->plugin = $objectManager->getObject(
-+            Product::class,
-+            [
-+                'page' => $this->page
-+            ]
-+        );
-+    }
-+
-+    public function testAfterGetIdentities()
-+    {
-+        $baseIdentities = [
-+            'SomeCacheId',
-+            'AnotherCacheId',
-+        ];
-+        $id = 12345;
-+        $pageId = 1;
-+        $expectedIdentities = [
-+            'SomeCacheId',
-+            'AnotherCacheId',
-+            Page::CACHE_TAG . '_' . $pageId,
-+        ];
-+
-+        $this->product->method('getEntityId')
-+            ->willReturn($id);
-+        $this->product->method('getOrigData')
-+            ->with('status')
-+            ->willReturn(2);
-+        $this->product->method('getData')
-+            ->with('status')
-+            ->willReturn(1);
-+        $this->page->method('getId')
-+            ->willReturn(1);
-+        $this->page->method('load')
-+            ->willReturnSelf();
-+
-+        $identities = $this->plugin->afterGetIdentities($this->product, $baseIdentities);
-+
-+        $this->assertEquals($expectedIdentities, $identities);
-+    }
-+}
-diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
-index 2dc98bcefb9..7bec1e36014 100644
---- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
-+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
-@@ -417,6 +417,10 @@ class StorageTest extends \PHPUnit\Framework\TestCase
-             ->method('setCollectRecursively')
-             ->with(false)
-             ->willReturnSelf();
-+        $storageCollectionMock->expects($this->once())
-+            ->method('setOrder')
-+            ->with('basename', \Magento\Framework\Data\Collection\Filesystem::SORT_ORDER_ASC)
-+            ->willReturnSelf();
-         $storageCollectionMock->expects($this->once())
-             ->method('getIterator')
-             ->willReturn(new \ArrayIterator($collectionArray));
-@@ -440,14 +444,7 @@ class StorageTest extends \PHPUnit\Framework\TestCase
-         $thumbnailDestination = $thumbnailTargetPath . '/' . $fileName;
-         $type = 'image';
-         $result = [
--            'result',
--            'cookie' => [
--                'name' => 'session_name',
--                'value' => '1',
--                'lifetime' => '50',
--                'path' => 'cookie/path',
--                'domain' => 'cookie_domain',
--            ],
-+            'result'
-         ];
-         $uploader = $this->getMockBuilder(\Magento\MediaStorage\Model\File\Uploader::class)
-             ->disableOriginalConstructor()
-@@ -507,17 +504,6 @@ class StorageTest extends \PHPUnit\Framework\TestCase
- 
-         $this->adapterFactoryMock->expects($this->atLeastOnce())->method('create')->willReturn($image);
- 
--        $this->sessionMock->expects($this->atLeastOnce())->method('getName')
--            ->willReturn($result['cookie']['name']);
--        $this->sessionMock->expects($this->atLeastOnce())->method('getSessionId')
--            ->willReturn($result['cookie']['value']);
--        $this->sessionMock->expects($this->atLeastOnce())->method('getCookieLifetime')
--            ->willReturn($result['cookie']['lifetime']);
--        $this->sessionMock->expects($this->atLeastOnce())->method('getCookiePath')
--            ->willReturn($result['cookie']['path']);
--        $this->sessionMock->expects($this->atLeastOnce())->method('getCookieDomain')
--            ->willReturn($result['cookie']['domain']);
--
-         $this->assertEquals($result, $this->imagesStorage->uploadFile($targetPath, $type));
-     }
- }
-diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php
-index 3dcf6c4a3fc..3095abef7bb 100644
---- a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php
-+++ b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php
-@@ -95,6 +95,7 @@ class BlockActionsTest extends \PHPUnit\Framework\TestCase
-                             'title' => __('Delete %1', $title),
-                             'message' => __('Are you sure you want to delete a %1 record?', $title)
-                         ],
-+                        'post' => true
-                     ]
-                 ],
-             ]
-diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
-index b0cc1bf061a..9b3165a2c55 100644
---- a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
-+++ b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
-@@ -70,6 +70,7 @@ class PageActionsTest extends \PHPUnit\Framework\TestCase
-                             'title' => __('Delete %1', $title),
-                             'message' => __('Are you sure you want to delete a %1 record?', $title)
-                         ],
-+                        'post' => true
-                     ]
-                 ],
-             ]
-diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
-index 54e0e17ab7a..a624823d02c 100644
---- a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
-+++ b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
-@@ -118,7 +118,8 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                         'config' => [
-                             'editorConfig' => [
-                                 'enabled' => false
--                            ]
-+                            ],
-+                            'componentType' => \Magento\Ui\Component\Container::NAME
-                         ]
-                     ]
-                 ]
-diff --git a/app/code/Magento/Cms/Ui/Component/DataProvider.php b/app/code/Magento/Cms/Ui/Component/DataProvider.php
-index 5fc9c5a8960..b02dd6ba98e 100644
---- a/app/code/Magento/Cms/Ui/Component/DataProvider.php
-+++ b/app/code/Magento/Cms/Ui/Component/DataProvider.php
-@@ -13,6 +13,9 @@ use Magento\Framework\App\RequestInterface;
- use Magento\Framework\AuthorizationInterface;
- use Magento\Framework\View\Element\UiComponent\DataProvider\Reporting;
- 
-+/**
-+ * DataProvider for cms ui.
-+ */
- class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider
- {
-     /**
-@@ -67,6 +70,8 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
-     }
- 
-     /**
-+     * Get authorization info.
-+     *
-      * @deprecated 101.0.7
-      * @return AuthorizationInterface|mixed
-      */
-@@ -95,7 +100,8 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
-                             'config' => [
-                                 'editorConfig' => [
-                                     'enabled' => false
--                                ]
-+                                ],
-+                                'componentType' => \Magento\Ui\Component\Container::NAME
-                             ]
-                         ]
-                     ]
-diff --git a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
-index 60b9f34d29a..f68ef35e534 100644
---- a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
-+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
-@@ -55,10 +55,7 @@ class BlockActions extends Column
-     }
- 
-     /**
--     * Prepare Data Source
--     *
--     * @param array $dataSource
--     * @return array
-+     * @inheritDoc
-      */
-     public function prepareDataSource(array $dataSource)
-     {
-@@ -87,7 +84,8 @@ class BlockActions extends Column
-                             'confirm' => [
-                                 'title' => __('Delete %1', $title),
-                                 'message' => __('Are you sure you want to delete a %1 record?', $title)
--                            ]
-+                            ],
-+                            'post' => true
-                         ]
-                     ];
-                 }
-@@ -99,6 +97,7 @@ class BlockActions extends Column
- 
-     /**
-      * Get instance of escaper
-+     *
-      * @return Escaper
-      * @deprecated 101.0.7
-      */
-diff --git a/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php b/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
-index ea6882e21c8..9c57aa050b0 100644
---- a/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
-+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
-@@ -27,6 +27,11 @@ class PageActions extends Column
-      */
-     protected $actionUrlBuilder;
- 
-+    /**
-+     * @var \Magento\Cms\ViewModel\Page\Grid\UrlBuilder
-+     */
-+    private $scopeUrlBuilder;
-+
-     /**
-      * @var \Magento\Framework\UrlInterface
-      */
-@@ -50,6 +55,7 @@ class PageActions extends Column
-      * @param array $components
-      * @param array $data
-      * @param string $editUrl
-+     * @param \Magento\Cms\ViewModel\Page\Grid\UrlBuilder|null $scopeUrlBuilder
-      */
-     public function __construct(
-         ContextInterface $context,
-@@ -58,19 +64,19 @@ class PageActions extends Column
-         UrlInterface $urlBuilder,
-         array $components = [],
-         array $data = [],
--        $editUrl = self::CMS_URL_PATH_EDIT
-+        $editUrl = self::CMS_URL_PATH_EDIT,
-+        \Magento\Cms\ViewModel\Page\Grid\UrlBuilder $scopeUrlBuilder = null
-     ) {
-         $this->urlBuilder = $urlBuilder;
-         $this->actionUrlBuilder = $actionUrlBuilder;
-         $this->editUrl = $editUrl;
-         parent::__construct($context, $uiComponentFactory, $components, $data);
-+        $this->scopeUrlBuilder = $scopeUrlBuilder ?: ObjectManager::getInstance()
-+            ->get(\Magento\Cms\ViewModel\Page\Grid\UrlBuilder::class);
-     }
- 
-     /**
--     * Prepare Data Source
--     *
--     * @param array $dataSource
--     * @return array
-+     * @inheritDoc
-      */
-     public function prepareDataSource(array $dataSource)
-     {
-@@ -89,12 +95,13 @@ class PageActions extends Column
-                         'confirm' => [
-                             'title' => __('Delete %1', $title),
-                             'message' => __('Are you sure you want to delete a %1 record?', $title)
--                        ]
-+                        ],
-+                        'post' => true
-                     ];
-                 }
-                 if (isset($item['identifier'])) {
-                     $item[$name]['preview'] = [
--                        'href' => $this->actionUrlBuilder->getUrl(
-+                        'href' => $this->scopeUrlBuilder->getUrl(
-                             $item['identifier'],
-                             isset($item['_first_store_id']) ? $item['_first_store_id'] : null,
-                             isset($item['store_code']) ? $item['store_code'] : null
-@@ -110,6 +117,7 @@ class PageActions extends Column
- 
-     /**
-      * Get instance of escaper
-+     *
-      * @return Escaper
-      * @deprecated 101.0.7
-      */
-diff --git a/app/code/Magento/Cms/ViewModel/Page/Grid/UrlBuilder.php b/app/code/Magento/Cms/ViewModel/Page/Grid/UrlBuilder.php
-new file mode 100644
-index 00000000000..0faf62607f5
---- /dev/null
-+++ b/app/code/Magento/Cms/ViewModel/Page/Grid/UrlBuilder.php
-@@ -0,0 +1,112 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Cms\ViewModel\Page\Grid;
-+
-+use Magento\Framework\Url\EncoderInterface;
-+use Magento\Framework\App\ActionInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Url builder class used to compose dynamic urls.
-+ */
-+class UrlBuilder
-+{
-+    /**
-+     * @var \Magento\Framework\UrlInterface
-+     */
-+    private $frontendUrlBuilder;
-+
-+    /**
-+     * @var EncoderInterface
-+     */
-+    private $urlEncoder;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @param \Magento\Framework\UrlInterface $frontendUrlBuilder
-+     * @param EncoderInterface $urlEncoder
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(
-+        \Magento\Framework\UrlInterface $frontendUrlBuilder,
-+        EncoderInterface $urlEncoder,
-+        StoreManagerInterface $storeManager
-+    ) {
-+        $this->frontendUrlBuilder = $frontendUrlBuilder;
-+        $this->urlEncoder = $urlEncoder;
-+        $this->storeManager = $storeManager;
-+    }
-+
-+    /**
-+     * Get action url
-+     *
-+     * @param string $routePath
-+     * @param string $scope
-+     * @param string $store
-+     * @return string
-+     */
-+    public function getUrl($routePath, $scope, $store)
-+    {
-+        if ($scope) {
-+            $this->frontendUrlBuilder->setScope($scope);
-+            $targetUrl = $this->frontendUrlBuilder->getUrl(
-+                $routePath,
-+                [
-+                    '_current' => false,
-+                    '_nosid' => true,
-+                    '_query' => [
-+                        StoreManagerInterface::PARAM_NAME => $store
-+                    ]
-+                ]
-+            );
-+            $href = $this->frontendUrlBuilder->getUrl(
-+                'stores/store/switch',
-+                [
-+                    '_current' => false,
-+                    '_nosid' => true,
-+                    '_query' => $this->prepareRequestQuery($store, $targetUrl)
-+                ]
-+            );
-+        } else {
-+            $href = $this->frontendUrlBuilder->getUrl(
-+                $routePath,
-+                [
-+                    '_current' => false,
-+                    '_nosid' => true
-+                ]
-+            );
-+        }
-+
-+        return $href;
-+    }
-+
-+    /**
-+     * Prepare request query
-+     *
-+     * @param string $store
-+     * @param string $href
-+     * @return array
-+     */
-+    private function prepareRequestQuery(string $store, string $href) : array
-+    {
-+        $storeView = $this->storeManager->getDefaultStoreView();
-+        $query = [
-+            StoreManagerInterface::PARAM_NAME => $store,
-+            ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlEncoder->encode($href)
-+        ];
-+        if ($storeView->getCode() !== $store) {
-+            $query['___from_store'] = $storeView->getCode();
-+        }
-+
-+        return $query;
-+    }
-+}
-diff --git a/app/code/Magento/Cms/etc/adminhtml/di.xml b/app/code/Magento/Cms/etc/adminhtml/di.xml
-index 98a8ff6e9ec..363217af4cd 100644
---- a/app/code/Magento/Cms/etc/adminhtml/di.xml
-+++ b/app/code/Magento/Cms/etc/adminhtml/di.xml
-@@ -12,6 +12,11 @@
-             <argument name="frontendUrlBuilder" xsi:type="object">Magento\Framework\Url</argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Cms\ViewModel\Page\Grid\UrlBuilder">
-+        <arguments>
-+            <argument name="frontendUrlBuilder" xsi:type="object">Magento\Framework\Url</argument>
-+        </arguments>
-+    </type>
-     <type name="Magento\Cms\Model\Wysiwyg\CompositeConfigProvider">
-         <arguments>
-             <argument name="variablePluginConfigProvider" xsi:type="array">
-diff --git a/app/code/Magento/Cms/etc/db_schema.xml b/app/code/Magento/Cms/etc/db_schema.xml
-index 2b825544f56..1e64c905bad 100644
---- a/app/code/Magento/Cms/etc/db_schema.xml
-+++ b/app/code/Magento/Cms/etc/db_schema.xml
-@@ -9,7 +9,7 @@
-         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-     <table name="cms_block" resource="default" engine="innodb" comment="CMS Block Table">
-         <column xsi:type="smallint" name="block_id" padding="6" unsigned="false" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="varchar" name="title" nullable="false" length="255" comment="Block Title"/>
-         <column xsi:type="varchar" name="identifier" nullable="false" length="255" comment="Block String Identifier"/>
-         <column xsi:type="mediumtext" name="content" nullable="true" comment="Block Content"/>
-@@ -19,10 +19,10 @@
-                 comment="Block Modification Time"/>
-         <column xsi:type="smallint" name="is_active" padding="6" unsigned="false" nullable="false" identity="false"
-                 default="1" comment="Is Block Active"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="block_id"/>
-         </constraint>
--        <index name="CMS_BLOCK_TITLE_IDENTIFIER_CONTENT" indexType="fulltext">
-+        <index referenceId="CMS_BLOCK_TITLE_IDENTIFIER_CONTENT" indexType="fulltext">
-             <column name="title"/>
-             <column name="identifier"/>
-             <column name="content"/>
-@@ -32,21 +32,21 @@
-         <column xsi:type="smallint" name="block_id" padding="6" unsigned="false" nullable="false" identity="false"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Store ID"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="block_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CMS_BLOCK_STORE_BLOCK_ID_CMS_BLOCK_BLOCK_ID" table="cms_block_store"
-+        <constraint xsi:type="foreign" referenceId="CMS_BLOCK_STORE_BLOCK_ID_CMS_BLOCK_BLOCK_ID" table="cms_block_store"
-                     column="block_id" referenceTable="cms_block" referenceColumn="block_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CMS_BLOCK_STORE_STORE_ID_STORE_STORE_ID" table="cms_block_store"
-+        <constraint xsi:type="foreign" referenceId="CMS_BLOCK_STORE_STORE_ID_STORE_STORE_ID" table="cms_block_store"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <index name="CMS_BLOCK_STORE_STORE_ID" indexType="btree">
-+        <index referenceId="CMS_BLOCK_STORE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-     <table name="cms_page" resource="default" engine="innodb" comment="CMS Page Table">
-         <column xsi:type="smallint" name="page_id" padding="6" unsigned="false" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Page Title"/>
-         <column xsi:type="varchar" name="page_layout" nullable="true" length="255" comment="Page Layout"/>
-         <column xsi:type="text" name="meta_keywords" nullable="true" comment="Page Meta Keywords"/>
-@@ -71,13 +71,13 @@
-         <column xsi:type="date" name="custom_theme_from" comment="Page Custom Theme Active From Date"/>
-         <column xsi:type="date" name="custom_theme_to" comment="Page Custom Theme Active To Date"/>
-         <column xsi:type="varchar" name="meta_title" nullable="true" length="255" comment="Page Meta Title"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="page_id"/>
-         </constraint>
--        <index name="CMS_PAGE_IDENTIFIER" indexType="btree">
-+        <index referenceId="CMS_PAGE_IDENTIFIER" indexType="btree">
-             <column name="identifier"/>
-         </index>
--        <index name="CMS_PAGE_TITLE_META_KEYWORDS_META_DESCRIPTION_IDENTIFIER_CONTENT" indexType="fulltext">
-+        <index referenceId="CMS_PAGE_TITLE_META_KEYWORDS_META_DESCRIPTION_IDENTIFIER_CONTENT" indexType="fulltext">
-             <column name="title"/>
-             <column name="meta_keywords"/>
-             <column name="meta_description"/>
-@@ -86,18 +86,19 @@
-         </index>
-     </table>
-     <table name="cms_page_store" resource="default" engine="innodb" comment="CMS Page To Store Linkage Table">
--        <column xsi:type="smallint" name="page_id" padding="6" unsigned="false" nullable="false" identity="false"/>
-+        <column xsi:type="smallint" name="page_id" padding="6" unsigned="false" nullable="false" identity="false"
-+                comment="Entity ID"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Store ID"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="page_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CMS_PAGE_STORE_PAGE_ID_CMS_PAGE_PAGE_ID" table="cms_page_store"
-+        <constraint xsi:type="foreign" referenceId="CMS_PAGE_STORE_PAGE_ID_CMS_PAGE_PAGE_ID" table="cms_page_store"
-                     column="page_id" referenceTable="cms_page" referenceColumn="page_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CMS_PAGE_STORE_STORE_ID_STORE_STORE_ID" table="cms_page_store"
-+        <constraint xsi:type="foreign" referenceId="CMS_PAGE_STORE_STORE_ID_STORE_STORE_ID" table="cms_page_store"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <index name="CMS_PAGE_STORE_STORE_ID" indexType="btree">
-+        <index referenceId="CMS_PAGE_STORE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
-index b6e13c63302..025d63115f4 100644
---- a/app/code/Magento/Cms/etc/di.xml
-+++ b/app/code/Magento/Cms/etc/di.xml
-@@ -233,5 +233,7 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Catalog\Model\Product">
-+        <plugin name="cms" type="Magento\Cms\Model\Plugin\Product" sortOrder="100"/>
-+    </type>
- </config>
--
-diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml
-index 1bc8828ef6c..6703b6c2771 100644
---- a/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml
-+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml
-@@ -9,7 +9,11 @@
-     <container name="root">
-         <block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content" name="wysiwyg_images.content" template="Magento_Cms::browser/content.phtml">
-             <block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree" name="wysiwyg_images.tree" template="Magento_Cms::browser/tree.phtml"/>
--            <block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader" name="wysiwyg_images.uploader" template="Magento_Cms::browser/content/uploader.phtml"/>
-+            <block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader" name="wysiwyg_images.uploader" template="Magento_Cms::browser/content/uploader.phtml">
-+                <arguments>
-+                    <argument name="image_upload_config_data" xsi:type="object">Magento\Backend\Block\DataProviders\ImageUploadConfig</argument>
-+                </arguments>
-+            </block>
-         </block>
-     </container>
- </layout>
-diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
-index ed376781dfa..5bba11cad79 100644
---- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
-+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-  /** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content */
- ?>
- 
-diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
-index da899918699..ff3d5f24dd5 100644
---- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
-+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
-@@ -4,16 +4,14 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-- /** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Files */
-+/** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Files */
- 
- $_width  = $block->getImagesWidth();
- $_height = $block->getImagesHeight();
- 
- ?>
--<?php if ($block->getFilesCount() > 0): ?>
--    <?php foreach ($block->getFiles() as $file): ?>
-+<?php if ($block->getFilesCount() > 0) : ?>
-+    <?php foreach ($block->getFiles() as $file) : ?>
-     <div
-         data-row="file"
-         class="filecnt"
-@@ -21,17 +19,17 @@ $_height = $block->getImagesHeight();
-         data-size="<?= $block->escapeHtmlAttr($file->getSize()) ?>"
-         data-mime-type="<?= $block->escapeHtmlAttr($file->getMimeType()) ?>"
-     >
--        <p class="nm" style="height:<?= $block->escapeHtmlAttr($_height) ?>px;width:<?= $block->escapeHtmlAttr($_width) ?>px;">
--        <?php if ($block->getFileThumbUrl($file)):?>
-+        <p class="nm" style="height:<?= $block->escapeHtmlAttr($_height) ?>px;">
-+        <?php if ($block->getFileThumbUrl($file)) : ?>
-             <img src="<?= $block->escapeHtmlAttr($block->getFileThumbUrl($file)) ?>" alt="<?= $block->escapeHtmlAttr($block->getFileName($file)) ?>"/>
-         <?php endif; ?>
-         </p>
--        <?php if ($block->getFileWidth($file)): ?>
-+        <?php if ($block->getFileWidth($file)) : ?>
-             <small><?= $block->escapeHtml($block->getFileWidth($file)) ?>x<?= $block->escapeHtml($block->getFileHeight($file)) ?> <?= $block->escapeHtml(__('px.')) ?></small><br/>
-         <?php endif; ?>
-         <small><?= $block->escapeHtml($block->getFileShortName($file)) ?></small>
-     </div>
-     <?php endforeach; ?>
--<?php else: ?>
-+<?php else : ?>
-     <div class="empty"><?= $block->escapeHtml(__('No files found')) ?></div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
-index 097235bc9fb..099efa0abdb 100644
---- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
-+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
-@@ -4,12 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader */
- 
- $filters = $block->getConfig()->getFilters() ?? [];
- $allowedExtensions = [];
-+$blockHtmlId = $block->getHtmlId();
- 
- foreach ($filters as $media_type) {
-     $allowedExtensions = array_merge($allowedExtensions, array_map(function ($fileExt) {
-@@ -17,15 +16,22 @@ foreach ($filters as $media_type) {
-     }, $media_type['files']));
- }
- 
-+$resizeConfig = $block->getImageUploadConfigData()->getIsResizeEnabled()
-+    ? "{action: 'resize', maxWidth: "
-+        . $block->escapeHtml($block->getImageUploadMaxWidth())
-+        . ", maxHeight: "
-+        . $block->escapeHtml($block->getImageUploadMaxHeight())
-+        . "}"
-+    : "{action: 'resize'}";
- ?>
- 
--<div id="<?= $block->getHtmlId() ?>" class="uploader">
-+<div id="<?= /* @noEscape */ $blockHtmlId ?>" class="uploader">
-     <span class="fileinput-button form-buttons">
-         <span><?= $block->escapeHtml(__('Upload Images')) ?></span>
-         <input class="fileupload" type="file" name="<?= $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>" data-url="<?= $block->escapeUrl($block->getConfig()->getUrl()) ?>" multiple>
-     </span>
-     <div class="clear"></div>
--    <script type="text/x-magento-template" id="<?= $block->getHtmlId() ?>-template">
-+    <script type="text/x-magento-template" id="<?= /* @noEscape */ $blockHtmlId ?>-template">
-         <div id="<%- data.id %>" class="file-row">
-             <span class="file-info"><%- data.name %> (<%- data.size %>)</span>
-             <div class="progressbar-container">
-@@ -47,7 +53,7 @@ require([
-     var maxFileSize = <?= $block->escapeJs($block->getFileSizeService()->getMaxFileSize()) ?>,
-         allowedExtensions = '<?= $block->escapeHtml(implode(' ', $allowedExtensions)) ?>';
- 
--    $('#<?= $block->getHtmlId() ?> .fileupload').fileupload({
-+    $('#<?= /* @noEscape */ $blockHtmlId ?> .fileupload').fileupload({
-         dataType: 'json',
-         formData: {
-             isAjax: 'true',
-@@ -57,9 +63,9 @@ require([
-         acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
-         allowedExtensions: allowedExtensions,
-         maxFileSize: maxFileSize,
--        dropZone: $('#<?= $block->getHtmlId() ?>').closest('[role="dialog"]'),
-+        dropZone: $('#<?= /* @noEscape */ $blockHtmlId ?>').closest('[role="dialog"]'),
-         add: function (e, data) {
--            var progressTmpl = mageTemplate('#<?= $block->getHtmlId() ?>-template'),
-+            var progressTmpl = mageTemplate('#<?= /* @noEscape */ $blockHtmlId ?>-template'),
-                 fileSize,
-                 tmpl,
-                 validationResult;
-@@ -103,7 +109,7 @@ require([
-                     }
-                 });
- 
--                $(tmpl).data('image', data).appendTo('#<?= $block->getHtmlId() ?>');
-+                $(tmpl).data('image', data).appendTo('#<?= /* @noEscape */ $blockHtmlId ?>');
- 
-                 return true;
-             });
-@@ -140,16 +146,14 @@ require([
-         }
-     });
- 
--    $('#<?= $block->getHtmlId() ?> .fileupload').fileupload('option', {
-+    $('#<?= /* @noEscape */ $blockHtmlId ?> .fileupload').fileupload('option', {
-         process: [{
-             action: 'load',
-             fileTypes: /^image\/(gif|jpeg|png)$/,
-             maxFileSize: <?= (int) $block->getFileSizeService()->getMaxFileSize() ?> * 10
--        }, {
--            action: 'resize',
--            maxWidth: <?= (float) \Magento\Framework\File\Uploader::MAX_IMAGE_WIDTH ?> ,
--            maxHeight: <?= (float) \Magento\Framework\File\Uploader::MAX_IMAGE_HEIGHT ?>
--        }, {
-+        },
-+        <?= /* @noEscape */ $resizeConfig ?>,
-+        {
-             action: 'save'
-         }]
-     });
-diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
-index 4f0ba000c1d..9603bb4f1a4 100644
---- a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
-+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-  /** @var \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree $block */
- ?>
- <div class="tree-panel" >
-@@ -16,6 +14,6 @@
-             <a onclick="jQuery('[data-role=tree]').jstree('open_all');"><?= $block->escapeHtml(__('Expand All')) ?></a>
-         </div>
-     </div>
--    <div data-role="tree" data-mage-init='<?= $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getTreeWidgetOptions())) ?>'>
-+    <div data-role="tree" data-mage-init='<?= $block->escapeHtml($this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getTreeWidgetOptions())) ?>'>
-     </div>
- </div>
-diff --git a/app/code/Magento/Cms/view/adminhtml/templates/page/edit/form/renderer/content.phtml b/app/code/Magento/Cms/view/adminhtml/templates/page/edit/form/renderer/content.phtml
-index c773750e5d6..54fe4c71fb9 100644
---- a/app/code/Magento/Cms/view/adminhtml/templates/page/edit/form/renderer/content.phtml
-+++ b/app/code/Magento/Cms/view/adminhtml/templates/page/edit/form/renderer/content.phtml
-@@ -3,14 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_element = $block->getElement() ?>
- 
--<?php if (!$_element->getNoDisplay()): ?>
-+<?php if (!$_element->getNoDisplay()) : ?>
- <div class="cms-manage-content-actions">
--    <?= trim($_element->getElementHtml()) ?>
-+    <?= /* @noEscape */ trim($_element->getElementHtml()) ?>
- </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_form.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_form.xml
-index 4b4a1a9bfe4..9218676a7f8 100644
---- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_form.xml
-+++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_form.xml
-@@ -123,6 +123,10 @@
-                     <rule name="required-entry" xsi:type="boolean">true</rule>
-                 </validation>
-                 <dataType>int</dataType>
-+                <tooltip>
-+                    <link>https://docs.magento.com/m2/ce/user_guide/configuration/scope.html</link>
-+                    <description>What is this?</description>
-+                </tooltip>
-                 <label translate="true">Store View</label>
-                 <dataScope>store_id</dataScope>
-             </settings>
-diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
-index 9f886f6f134..793fc7d26cb 100644
---- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
-+++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
-@@ -146,7 +146,6 @@
-                 <editor>
-                     <validation>
-                         <rule name="required-entry" xsi:type="boolean">true</rule>
--                        <rule name="validate-xml-identifier" xsi:type="boolean">true</rule>
-                     </validation>
-                     <editorType>text</editorType>
-                 </editor>
-diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml
-index 9781675a6d9..dd58d17cbf5 100644
---- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml
-+++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml
-@@ -207,6 +207,10 @@
-                     <rule name="required-entry" xsi:type="boolean">true</rule>
-                 </validation>
-                 <dataType>int</dataType>
-+                <tooltip>
-+                    <link>https://docs.magento.com/m2/ce/user_guide/configuration/scope.html</link>
-+                    <description>What is this?</description>
-+                </tooltip>
-                 <label translate="true">Store View</label>
-                 <dataScope>store_id</dataScope>
-             </settings>
-@@ -285,6 +289,7 @@
-             <settings>
-                 <validation>
-                     <rule name="validate-date" xsi:type="boolean">true</rule>
-+                    <rule name="validate-date-range" xsi:type="string">custom_theme_from</rule>
-                 </validation>
-                 <dataType>text</dataType>
-                 <label translate="true">To</label>
-diff --git a/app/code/Magento/Cms/view/frontend/templates/content.phtml b/app/code/Magento/Cms/view/frontend/templates/content.phtml
-index d3baf144447..f83edeb9dee 100644
---- a/app/code/Magento/Cms/view/frontend/templates/content.phtml
-+++ b/app/code/Magento/Cms/view/frontend/templates/content.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= /* @noEscape */ $pageData->getPageContent() ?>
-diff --git a/app/code/Magento/Cms/view/frontend/templates/meta.phtml b/app/code/Magento/Cms/view/frontend/templates/meta.phtml
-index 3c03fa7d9ae..40820ba37e7 100644
---- a/app/code/Magento/Cms/view/frontend/templates/meta.phtml
-+++ b/app/code/Magento/Cms/view/frontend/templates/meta.phtml
-@@ -3,13 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($pageData->getPageMetaKeywords()): ?>
-+<?php if ($pageData->getPageMetaKeywords()) : ?>
-     <meta name="keywords" content="<?= /* @noEscape */ $pageData->getPageMetaKeywords() ?>"/>
- <?php endif; ?>
--<?php if ($pageData->getPageMetaDescription()): ?>
-+<?php if ($pageData->getPageMetaDescription()) : ?>
-     <meta name="description" content="<?= /* @noEscape */ $pageData->getPageMetaDescription() ?>"/>
- <?php endif; ?>
-diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/Block/Identity.php b/app/code/Magento/CmsGraphQl/Model/Resolver/Block/Identity.php
-new file mode 100644
-index 00000000000..a40d23968c3
---- /dev/null
-+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/Block/Identity.php
-@@ -0,0 +1,37 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CmsGraphQl\Model\Resolver\Block;
-+
-+use Magento\Cms\Api\Data\BlockInterface;
-+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
-+
-+/**
-+ * Identity for resolved CMS block
-+ */
-+class Identity implements IdentityInterface
-+{
-+    /**
-+     * Get block identities from resolved data
-+     *
-+     * @param array $resolvedData
-+     * @return string[]
-+     */
-+    public function getIdentities(array $resolvedData): array
-+    {
-+        $ids = [];
-+        $items = $resolvedData['items'] ?? [];
-+        foreach ($items as $item) {
-+            if (is_array($item) && !empty($item[BlockInterface::BLOCK_ID])) {
-+                $ids[] = $item[BlockInterface::BLOCK_ID];
-+                $ids[] = $item[BlockInterface::IDENTIFIER];
-+            }
-+        }
-+
-+        return $ids;
-+    }
-+}
-diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/Blocks.php b/app/code/Magento/CmsGraphQl/Model/Resolver/Blocks.php
-new file mode 100644
-index 00000000000..e55db2a3fa4
---- /dev/null
-+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/Blocks.php
-@@ -0,0 +1,92 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CmsGraphQl\Model\Resolver;
-+
-+use Magento\CmsGraphQl\Model\Resolver\DataProvider\Block as BlockDataProvider;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+
-+/**
-+ * CMS blocks field resolver, used for GraphQL request processing
-+ */
-+class Blocks implements ResolverInterface
-+{
-+    /**
-+     * @var BlockDataProvider
-+     */
-+    private $blockDataProvider;
-+
-+    /**
-+     * @param BlockDataProvider $blockDataProvider
-+     */
-+    public function __construct(
-+        BlockDataProvider $blockDataProvider
-+    ) {
-+        $this->blockDataProvider = $blockDataProvider;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+
-+        $blockIdentifiers = $this->getBlockIdentifiers($args);
-+        $blocksData = $this->getBlocksData($blockIdentifiers);
-+
-+        $resultData = [
-+            'items' => $blocksData,
-+        ];
-+        return $resultData;
-+    }
-+
-+    /**
-+     * Get block identifiers
-+     *
-+     * @param array $args
-+     * @return string[]
-+     * @throws GraphQlInputException
-+     */
-+    private function getBlockIdentifiers(array $args): array
-+    {
-+        if (!isset($args['identifiers']) || !is_array($args['identifiers']) || count($args['identifiers']) === 0) {
-+            throw new GraphQlInputException(__('"identifiers" of CMS blocks should be specified'));
-+        }
-+
-+        return $args['identifiers'];
-+    }
-+
-+    /**
-+     * Get blocks data
-+     *
-+     * @param array $blockIdentifiers
-+     * @return array
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    private function getBlocksData(array $blockIdentifiers): array
-+    {
-+        $blocksData = [];
-+        foreach ($blockIdentifiers as $blockIdentifier) {
-+            try {
-+                $blocksData[$blockIdentifier] = $this->blockDataProvider->getData($blockIdentifier);
-+            } catch (NoSuchEntityException $e) {
-+                $blocksData[$blockIdentifier] = new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+            }
-+        }
-+        return $blocksData;
-+    }
-+}
-diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php
-new file mode 100644
-index 00000000000..fa4944381b8
---- /dev/null
-+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CmsGraphQl\Model\Resolver\DataProvider;
-+
-+use Magento\Cms\Api\BlockRepositoryInterface;
-+use Magento\Cms\Api\Data\BlockInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Widget\Model\Template\FilterEmulate;
-+
-+/**
-+ * Cms block data provider
-+ */
-+class Block
-+{
-+    /**
-+     * @var BlockRepositoryInterface
-+     */
-+    private $blockRepository;
-+
-+    /**
-+     * @var FilterEmulate
-+     */
-+    private $widgetFilter;
-+
-+    /**
-+     * @param BlockRepositoryInterface $blockRepository
-+     * @param FilterEmulate $widgetFilter
-+     */
-+    public function __construct(
-+        BlockRepositoryInterface $blockRepository,
-+        FilterEmulate $widgetFilter
-+    ) {
-+        $this->blockRepository = $blockRepository;
-+        $this->widgetFilter = $widgetFilter;
-+    }
-+
-+    /**
-+     * Get block data
-+     *
-+     * @param string $blockIdentifier
-+     * @return array
-+     * @throws NoSuchEntityException
-+     */
-+    public function getData(string $blockIdentifier): array
-+    {
-+        $block = $this->blockRepository->getById($blockIdentifier);
-+
-+        if (false === $block->isActive()) {
-+            throw new NoSuchEntityException(
-+                __('The CMS block with the "%1" ID doesn\'t exist.', $blockIdentifier)
-+            );
-+        }
-+
-+        $renderedContent = $this->widgetFilter->filter($block->getContent());
-+
-+        $blockData = [
-+            BlockInterface::BLOCK_ID => $block->getId(),
-+            BlockInterface::IDENTIFIER => $block->getIdentifier(),
-+            BlockInterface::TITLE => $block->getTitle(),
-+            BlockInterface::CONTENT => $renderedContent,
-+        ];
-+        return $blockData;
-+    }
-+}
-diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Page.php b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Page.php
-new file mode 100644
-index 00000000000..40825e70a99
---- /dev/null
-+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Page.php
-@@ -0,0 +1,119 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CmsGraphQl\Model\Resolver\DataProvider;
-+
-+use Magento\Cms\Api\Data\PageInterface;
-+use Magento\Cms\Api\GetPageByIdentifierInterface;
-+use Magento\Cms\Api\PageRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Widget\Model\Template\FilterEmulate;
-+
-+/**
-+ * Cms page data provider
-+ */
-+class Page
-+{
-+    /**
-+     * @var GetPageByIdentifierInterface
-+     */
-+    private $pageByIdentifier;
-+
-+    /**
-+     * @var PageRepositoryInterface
-+     */
-+    private $pageRepository;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var FilterEmulate
-+     */
-+    private $widgetFilter;
-+
-+    /**
-+     * @param PageRepositoryInterface $pageRepository
-+     * @param FilterEmulate $widgetFilter
-+     * @param GetPageByIdentifierInterface $getPageByIdentifier
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(
-+        PageRepositoryInterface $pageRepository,
-+        FilterEmulate $widgetFilter,
-+        GetPageByIdentifierInterface $getPageByIdentifier,
-+        StoreManagerInterface $storeManager
-+    ) {
-+
-+        $this->pageRepository = $pageRepository;
-+        $this->widgetFilter = $widgetFilter;
-+        $this->pageByIdentifier = $getPageByIdentifier;
-+        $this->storeManager = $storeManager;
-+    }
-+
-+    /**
-+     * Returns page data by page_id
-+     *
-+     * @param int $pageId
-+     * @return array
-+     * @throws NoSuchEntityException
-+     */
-+    public function getDataByPageId(int $pageId): array
-+    {
-+        $page = $this->pageRepository->getById($pageId);
-+
-+        return $this->convertPageData($page);
-+    }
-+
-+    /**
-+     * Returns page data by page identifier
-+     *
-+     * @param string $pageIdentifier
-+     * @return array
-+     * @throws NoSuchEntityException
-+     */
-+    public function getDataByPageIdentifier(string $pageIdentifier): array
-+    {
-+        $storeId = (int)$this->storeManager->getStore()->getId();
-+        $page = $this->pageByIdentifier->execute($pageIdentifier, $storeId);
-+
-+        return $this->convertPageData($page);
-+    }
-+
-+    /**
-+     * Convert page data
-+     *
-+     * @param PageInterface $page
-+     * @return array
-+     * @throws NoSuchEntityException
-+     */
-+    private function convertPageData(PageInterface $page)
-+    {
-+        if (false === $page->isActive()) {
-+            throw new NoSuchEntityException();
-+        }
-+
-+        $renderedContent = $this->widgetFilter->filter($page->getContent());
-+
-+        $pageData = [
-+            'url_key' => $page->getIdentifier(),
-+            PageInterface::TITLE => $page->getTitle(),
-+            PageInterface::CONTENT => $renderedContent,
-+            PageInterface::CONTENT_HEADING => $page->getContentHeading(),
-+            PageInterface::PAGE_LAYOUT => $page->getPageLayout(),
-+            PageInterface::META_TITLE => $page->getMetaTitle(),
-+            PageInterface::META_DESCRIPTION => $page->getMetaDescription(),
-+            PageInterface::META_KEYWORDS => $page->getMetaKeywords(),
-+            PageInterface::PAGE_ID => $page->getId(),
-+            PageInterface::IDENTIFIER => $page->getIdentifier(),
-+        ];
-+        return $pageData;
-+    }
-+}
-diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/Page.php b/app/code/Magento/CmsGraphQl/Model/Resolver/Page.php
-new file mode 100644
-index 00000000000..64891cfeaa8
---- /dev/null
-+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/Page.php
-@@ -0,0 +1,65 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CmsGraphQl\Model\Resolver;
-+
-+use Magento\CmsGraphQl\Model\Resolver\DataProvider\Page as PageDataProvider;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+
-+/**
-+ * CMS page field resolver, used for GraphQL request processing
-+ */
-+class Page implements ResolverInterface
-+{
-+    /**
-+     * @var PageDataProvider
-+     */
-+    private $pageDataProvider;
-+
-+    /**
-+     *
-+     * @param PageDataProvider $pageDataProvider
-+     */
-+    public function __construct(
-+        PageDataProvider $pageDataProvider
-+    ) {
-+        $this->pageDataProvider = $pageDataProvider;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (!isset($args['id']) && !isset($args['identifier'])) {
-+            throw new GraphQlInputException(__('"Page id/identifier should be specified'));
-+        }
-+
-+        $pageData = [];
-+
-+        try {
-+            if (isset($args['id'])) {
-+                $pageData = $this->pageDataProvider->getDataByPageId((int)$args['id']);
-+            } elseif (isset($args['identifier'])) {
-+                $pageData = $this->pageDataProvider->getDataByPageIdentifier((string)$args['identifier']);
-+            }
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+        }
-+        return $pageData;
-+    }
-+}
-diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/Page/Identity.php b/app/code/Magento/CmsGraphQl/Model/Resolver/Page/Identity.php
-new file mode 100644
-index 00000000000..abc306451e3
---- /dev/null
-+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/Page/Identity.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CmsGraphQl\Model\Resolver\Page;
-+
-+use Magento\Cms\Api\Data\PageInterface;
-+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
-+
-+/**
-+ * Identity for resolved CMS page
-+ */
-+class Identity implements IdentityInterface
-+{
-+    /**
-+     * Get page ID from resolved data
-+     *
-+     * @param array $resolvedData
-+     * @return string[]
-+     */
-+    public function getIdentities(array $resolvedData): array
-+    {
-+        return empty($resolvedData[PageInterface::PAGE_ID]) ? [] : [$resolvedData[PageInterface::PAGE_ID]];
-+    }
-+}
-diff --git a/app/code/Magento/CmsGraphQl/README.md b/app/code/Magento/CmsGraphQl/README.md
-new file mode 100644
-index 00000000000..970444837f1
---- /dev/null
-+++ b/app/code/Magento/CmsGraphQl/README.md
-@@ -0,0 +1,4 @@
-+# CmsGraphQl
-+
-+**CmsGraphQl** provides type information for the GraphQl module
-+to generate CMS fields for cms information endpoints.
-diff --git a/app/code/Magento/CmsGraphQl/composer.json b/app/code/Magento/CmsGraphQl/composer.json
-new file mode 100644
-index 00000000000..e0e8481d59b
---- /dev/null
-+++ b/app/code/Magento/CmsGraphQl/composer.json
-@@ -0,0 +1,29 @@
-+{
-+    "name": "magento/module-cms-graph-ql",
-+    "description": "N/A",
-+    "type": "magento2-module",
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-cms": "*",
-+        "magento/module-store": "*",
-+        "magento/module-widget": "*"
-+    },
-+    "suggest": {
-+        "magento/module-graph-ql": "*",
-+        "magento/module-graph-ql-cache": "*",
-+        "magento/module-store-graph-ql": "*"
-+    },
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\CmsGraphQl\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/CmsGraphQl/etc/graphql/di.xml b/app/code/Magento/CmsGraphQl/etc/graphql/di.xml
-new file mode 100644
-index 00000000000..78c1071d8e0
---- /dev/null
-+++ b/app/code/Magento/CmsGraphQl/etc/graphql/di.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
-+        <arguments>
-+            <argument name="extendedConfigData" xsi:type="array">
-+                <item name="front" xsi:type="string">web/default/front</item>
-+                <item name="cms_home_page" xsi:type="string">web/default/cms_home_page</item>
-+                <item name="no_route" xsi:type="string">web/default/no_route</item>
-+                <item name="cms_no_route" xsi:type="string">web/default/cms_no_route</item>
-+                <item name="cms_no_cookies" xsi:type="string">web/default/cms_no_cookies</item>
-+                <item name="show_cms_breadcrumbs" xsi:type="string">web/default/show_cms_breadcrumbs</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/CmsGraphQl/etc/module.xml b/app/code/Magento/CmsGraphQl/etc/module.xml
-new file mode 100644
-index 00000000000..4fca42430d1
---- /dev/null
-+++ b/app/code/Magento/CmsGraphQl/etc/module.xml
-@@ -0,0 +1,14 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_CmsGraphQl">
-+        <sequence>
-+            <module name="Magento_GraphQl"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/app/code/Magento/CmsGraphQl/etc/schema.graphqls b/app/code/Magento/CmsGraphQl/etc/schema.graphqls
-new file mode 100644
-index 00000000000..3558d853aa4
---- /dev/null
-+++ b/app/code/Magento/CmsGraphQl/etc/schema.graphqls
-@@ -0,0 +1,43 @@
-+# Copyright © Magento, Inc. All rights reserved.
-+# See COPYING.txt for license details.
-+type StoreConfig @doc(description: "The type contains information about a store config") {
-+    front : String @doc(description: "Default Web URL")
-+    cms_home_page : String @doc(description: "CMS Home Page")
-+    no_route : String @doc(description: "Default No-route URL")
-+    cms_no_route : String @doc(description: "CMS No Route Page")
-+    cms_no_cookies : String @doc(description: "CMS No Cookies Page")
-+    show_cms_breadcrumbs : Int @doc(description: "Show Breadcrumbs for CMS Pages")
-+}
-+
-+
-+type Query {
-+    cmsPage (
-+        id: Int @doc(description: "Id of the CMS page") @deprecated(reason: "The `id` is deprecated. Use `identifier` instead.") @doc(description: "The CMS page query returns information about a CMS page")
-+        identifier: String @doc(description: "Identifier of the CMS page")
-+    ): CmsPage @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Page") @doc(description: "The CMS page query returns information about a CMS page") @cache(cacheTag: "cms_p", cacheIdentity: "Magento\\CmsGraphQl\\Model\\Resolver\\Page\\Identity")
-+    cmsBlocks (
-+        identifiers: [String] @doc(description: "Identifiers of the CMS blocks")
-+    ): CmsBlocks @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Blocks") @doc(description: "The CMS block query returns information about CMS blocks") @cache(cacheTag: "cms_b", cacheIdentity: "Magento\\CmsGraphQl\\Model\\Resolver\\Block\\Identity")
-+}
-+
-+type CmsPage @doc(description: "CMS page defines all CMS page information") {
-+    identifier: String @doc(description: "Identifier of the CMS page")
-+    url_key: String @doc(description: "URL key of CMS page")
-+    title: String @doc(description: "CMS page title")
-+    content: String @doc(description: "CMS page content")
-+    content_heading: String @doc(description: "CMS page content heading")
-+    page_layout: String @doc(description: "CMS page content heading")
-+    meta_title: String @doc(description: "CMS page meta title")
-+    meta_description: String @doc(description: "CMS page meta description")
-+    meta_keywords: String @doc(description: "CMS page meta keywords")
-+}
-+
-+type CmsBlocks @doc(description: "CMS blocks information") {
-+    items: [CmsBlock] @doc(description: "An array of CMS blocks")
-+}
-+
-+type CmsBlock @doc(description: "CMS block defines all CMS block information") {
-+    identifier: String @doc(description: "CMS block identifier")
-+    title: String @doc(description: "CMS block title")
-+    content: String @doc(description: "CMS block content")
-+}
-\ No newline at end of file
-diff --git a/app/code/Magento/CmsGraphQl/registration.php b/app/code/Magento/CmsGraphQl/registration.php
-new file mode 100644
-index 00000000000..9a3fabf6c95
---- /dev/null
-+++ b/app/code/Magento/CmsGraphQl/registration.php
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CmsGraphQl', __DIR__);
-diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
-index 479b4f5c217..c63ccae8716 100644
---- a/app/code/Magento/Config/App/Config/Type/System.php
-+++ b/app/code/Magento/Config/App/Config/Type/System.php
-@@ -3,27 +3,48 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Config\App\Config\Type;
- 
-+use Magento\Framework\App\Config\ConfigSourceInterface;
- use Magento\Framework\App\Config\ConfigTypeInterface;
-+use Magento\Framework\App\Config\Spi\PostProcessorInterface;
-+use Magento\Framework\App\Config\Spi\PreProcessorInterface;
- use Magento\Framework\App\ObjectManager;
- use Magento\Config\App\Config\Type\System\Reader;
-+use Magento\Framework\App\ScopeInterface;
-+use Magento\Framework\Cache\FrontendInterface;
-+use Magento\Framework\Cache\LockGuardedCacheLoader;
-+use Magento\Framework\Lock\LockManagerInterface;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Store\Model\Config\Processor\Fallback;
-+use Magento\Framework\Encryption\Encryptor;
-+use Magento\Store\Model\ScopeInterface as StoreScope;
- 
- /**
-  * System configuration type
-+ *
-  * @api
-  * @since 100.1.2
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-  */
- class System implements ConfigTypeInterface
- {
-+    /**
-+     * Config cache tag.
-+     */
-     const CACHE_TAG = 'config_scopes';
- 
-+    /**
-+     * System config type.
-+     */
-     const CONFIG_TYPE = 'system';
- 
-     /**
--     * @var \Magento\Framework\App\Config\ConfigSourceInterface
-+     * @var string
-      */
--    private $source;
-+    private static $lockName = 'SYSTEM_CONFIG';
- 
-     /**
-      * @var array
-@@ -31,32 +52,17 @@ class System implements ConfigTypeInterface
-     private $data = [];
- 
-     /**
--     * @var \Magento\Framework\App\Config\Spi\PostProcessorInterface
-+     * @var PostProcessorInterface
-      */
-     private $postProcessor;
- 
-     /**
--     * @var \Magento\Framework\App\Config\Spi\PreProcessorInterface
--     */
--    private $preProcessor;
--
--    /**
--     * @var \Magento\Framework\Cache\FrontendInterface
-+     * @var FrontendInterface
-      */
-     private $cache;
- 
-     /**
--     * @var int
--     */
--    private $cachingNestedLevel;
--
--    /**
--     * @var \Magento\Store\Model\Config\Processor\Fallback
--     */
--    private $fallback;
--
--    /**
--     * @var \Magento\Framework\Serialize\SerializerInterface
-+     * @var SerializerInterface
-      */
-     private $serializer;
- 
-@@ -79,42 +85,62 @@ class System implements ConfigTypeInterface
-      *
-      * @var array
-      */
--    private $availableDataScopes = null;
-+    private $availableDataScopes;
- 
-     /**
--     * @param \Magento\Framework\App\Config\ConfigSourceInterface $source
--     * @param \Magento\Framework\App\Config\Spi\PostProcessorInterface $postProcessor
--     * @param \Magento\Store\Model\Config\Processor\Fallback $fallback
--     * @param \Magento\Framework\Cache\FrontendInterface $cache
--     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
--     * @param \Magento\Framework\App\Config\Spi\PreProcessorInterface $preProcessor
-+     * @var Encryptor
-+     */
-+    private $encryptor;
-+
-+    /**
-+     * @var LockGuardedCacheLoader
-+     */
-+    private $lockQuery;
-+
-+    /**
-+     * @param ConfigSourceInterface $source
-+     * @param PostProcessorInterface $postProcessor
-+     * @param Fallback $fallback
-+     * @param FrontendInterface $cache
-+     * @param SerializerInterface $serializer
-+     * @param PreProcessorInterface $preProcessor
-      * @param int $cachingNestedLevel
-      * @param string $configType
--     * @param Reader $reader
-+     * @param Reader|null $reader
-+     * @param Encryptor|null $encryptor
-+     * @param LockManagerInterface|null $locker
-+     * @param LockGuardedCacheLoader|null $lockQuery
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
--        \Magento\Framework\App\Config\ConfigSourceInterface $source,
--        \Magento\Framework\App\Config\Spi\PostProcessorInterface $postProcessor,
--        \Magento\Store\Model\Config\Processor\Fallback $fallback,
--        \Magento\Framework\Cache\FrontendInterface $cache,
--        \Magento\Framework\Serialize\SerializerInterface $serializer,
--        \Magento\Framework\App\Config\Spi\PreProcessorInterface $preProcessor,
-+        ConfigSourceInterface $source,
-+        PostProcessorInterface $postProcessor,
-+        Fallback $fallback,
-+        FrontendInterface $cache,
-+        SerializerInterface $serializer,
-+        PreProcessorInterface $preProcessor,
-         $cachingNestedLevel = 1,
-         $configType = self::CONFIG_TYPE,
--        Reader $reader = null
-+        Reader $reader = null,
-+        Encryptor $encryptor = null,
-+        LockManagerInterface $locker = null,
-+        LockGuardedCacheLoader $lockQuery = null
-     ) {
--        $this->source = $source;
-         $this->postProcessor = $postProcessor;
--        $this->preProcessor = $preProcessor;
-         $this->cache = $cache;
--        $this->cachingNestedLevel = $cachingNestedLevel;
--        $this->fallback = $fallback;
-         $this->serializer = $serializer;
-         $this->configType = $configType;
-         $this->reader = $reader ?: ObjectManager::getInstance()->get(Reader::class);
-+        $this->encryptor = $encryptor
-+            ?: ObjectManager::getInstance()->get(Encryptor::class);
-+        $this->lockQuery = $lockQuery
-+            ?: ObjectManager::getInstance()->get(LockGuardedCacheLoader::class);
-     }
- 
-     /**
-+     * Get configuration value by path
-+     *
-      * System configuration is separated by scopes (default, websites, stores). Configuration of a scope is inherited
-      * from its parent scope (store inherits website).
-      *
-@@ -136,68 +162,108 @@ class System implements ConfigTypeInterface
-     {
-         if ($path === '') {
-             $this->data = array_replace_recursive($this->loadAllData(), $this->data);
-+
-             return $this->data;
-         }
-+
-+        return $this->getWithParts($path);
-+    }
-+
-+    /**
-+     * Proceed with parts extraction from path.
-+     *
-+     * @param string $path
-+     * @return array|int|string|boolean
-+     */
-+    private function getWithParts($path)
-+    {
-         $pathParts = explode('/', $path);
--        if (count($pathParts) === 1 && $pathParts[0] !== 'default') {
-+
-+        if (count($pathParts) === 1 && $pathParts[0] !== ScopeInterface::SCOPE_DEFAULT) {
-             if (!isset($this->data[$pathParts[0]])) {
-                 $data = $this->readData();
-                 $this->data = array_replace_recursive($data, $this->data);
-             }
-+
-             return $this->data[$pathParts[0]];
-         }
-+
-         $scopeType = array_shift($pathParts);
--        if ($scopeType === 'default') {
-+
-+        if ($scopeType === ScopeInterface::SCOPE_DEFAULT) {
-             if (!isset($this->data[$scopeType])) {
-                 $this->data = array_replace_recursive($this->loadDefaultScopeData($scopeType), $this->data);
-             }
-+
-             return $this->getDataByPathParts($this->data[$scopeType], $pathParts);
-         }
-+
-         $scopeId = array_shift($pathParts);
-+
-         if (!isset($this->data[$scopeType][$scopeId])) {
--            $this->data = array_replace_recursive($this->loadScopeData($scopeType, $scopeId), $this->data);
-+            $scopeData = $this->loadScopeData($scopeType, $scopeId);
-+
-+            if (!isset($this->data[$scopeType][$scopeId])) {
-+                $this->data = array_replace_recursive($scopeData, $this->data);
-+            }
-         }
-+
-         return isset($this->data[$scopeType][$scopeId])
-             ? $this->getDataByPathParts($this->data[$scopeType][$scopeId], $pathParts)
-             : null;
-     }
- 
-     /**
--     * Load configuration data for all scopes
-+     * Load configuration data for all scopes.
-      *
-      * @return array
-      */
-     private function loadAllData()
-     {
--        $cachedData = $this->cache->load($this->configType);
--        if ($cachedData === false) {
--            $data = $this->readData();
--        } else {
--            $data = $this->serializer->unserialize($cachedData);
--        }
--        return $data;
-+        $loadAction = function () {
-+            $cachedData = $this->cache->load($this->configType);
-+            $data = false;
-+            if ($cachedData !== false) {
-+                $data = $this->serializer->unserialize($this->encryptor->decrypt($cachedData));
-+            }
-+            return $data;
-+        };
-+
-+        return $this->lockQuery->lockedLoadData(
-+            self::$lockName,
-+            $loadAction,
-+            \Closure::fromCallable([$this, 'readData']),
-+            \Closure::fromCallable([$this, 'cacheData'])
-+        );
-     }
- 
-     /**
--     * Load configuration data for default scope
-+     * Load configuration data for default scope.
-      *
-      * @param string $scopeType
-      * @return array
-      */
-     private function loadDefaultScopeData($scopeType)
-     {
--        $cachedData = $this->cache->load($this->configType . '_' . $scopeType);
--        if ($cachedData === false) {
--            $data = $this->readData();
--            $this->cacheData($data);
--        } else {
--            $data = [$scopeType => $this->serializer->unserialize($cachedData)];
--        }
--        return $data;
-+        $loadAction = function () use ($scopeType) {
-+            $cachedData = $this->cache->load($this->configType . '_' . $scopeType);
-+            $scopeData = false;
-+            if ($cachedData !== false) {
-+                $scopeData = [$scopeType => $this->serializer->unserialize($this->encryptor->decrypt($cachedData))];
-+            }
-+            return $scopeData;
-+        };
-+
-+        return $this->lockQuery->lockedLoadData(
-+            self::$lockName,
-+            $loadAction,
-+            \Closure::fromCallable([$this, 'readData']),
-+            \Closure::fromCallable([$this, 'cacheData'])
-+        );
-     }
- 
-     /**
--     * Load configuration data for a specified scope
-+     * Load configuration data for a specified scope.
-      *
-      * @param string $scopeType
-      * @param string $scopeId
-@@ -205,27 +271,39 @@ class System implements ConfigTypeInterface
-      */
-     private function loadScopeData($scopeType, $scopeId)
-     {
--        $cachedData = $this->cache->load($this->configType . '_' . $scopeType . '_' . $scopeId);
--        if ($cachedData === false) {
--            if ($this->availableDataScopes === null) {
--                $cachedScopeData = $this->cache->load($this->configType . '_scopes');
--                if ($cachedScopeData !== false) {
--                    $this->availableDataScopes = $this->serializer->unserialize($cachedScopeData);
-+        $loadAction = function () use ($scopeType, $scopeId) {
-+            $cachedData = $this->cache->load($this->configType . '_' . $scopeType . '_' . $scopeId);
-+            $scopeData = false;
-+            if ($cachedData === false) {
-+                if ($this->availableDataScopes === null) {
-+                    $cachedScopeData = $this->cache->load($this->configType . '_scopes');
-+                    if ($cachedScopeData !== false) {
-+                        $serializedCachedData = $this->encryptor->decrypt($cachedScopeData);
-+                        $this->availableDataScopes = $this->serializer->unserialize($serializedCachedData);
-+                    }
-                 }
-+                if (is_array($this->availableDataScopes) && !isset($this->availableDataScopes[$scopeType][$scopeId])) {
-+                    $scopeData = [$scopeType => [$scopeId => []]];
-+                }
-+            } else {
-+                $serializedCachedData = $this->encryptor->decrypt($cachedData);
-+                $scopeData = [$scopeType => [$scopeId => $this->serializer->unserialize($serializedCachedData)]];
-             }
--            if (is_array($this->availableDataScopes) && !isset($this->availableDataScopes[$scopeType][$scopeId])) {
--                return [$scopeType => [$scopeId => []]];
--            }
--            $data = $this->readData();
--            $this->cacheData($data);
--        } else {
--            $data = [$scopeType => [$scopeId => $this->serializer->unserialize($cachedData)]];
--        }
--        return $data;
-+
-+            return $scopeData;
-+        };
-+
-+        return $this->lockQuery->lockedLoadData(
-+            self::$lockName,
-+            $loadAction,
-+            \Closure::fromCallable([$this, 'readData']),
-+            \Closure::fromCallable([$this, 'cacheData'])
-+        );
-     }
- 
-     /**
-      * Cache configuration data.
-+     *
-      * Caches data per scope to avoid reading data for all scopes on every request
-      *
-      * @param array $data
-@@ -234,35 +312,35 @@ class System implements ConfigTypeInterface
-     private function cacheData(array $data)
-     {
-         $this->cache->save(
--            $this->serializer->serialize($data),
-+            $this->encryptor->encryptWithFastestAvailableAlgorithm($this->serializer->serialize($data)),
-             $this->configType,
-             [self::CACHE_TAG]
-         );
-         $this->cache->save(
--            $this->serializer->serialize($data['default']),
-+            $this->encryptor->encryptWithFastestAvailableAlgorithm($this->serializer->serialize($data['default'])),
-             $this->configType . '_default',
-             [self::CACHE_TAG]
-         );
-         $scopes = [];
--        foreach (['websites', 'stores'] as $curScopeType) {
-+        foreach ([StoreScope::SCOPE_WEBSITES, StoreScope::SCOPE_STORES] as $curScopeType) {
-             foreach ($data[$curScopeType] ?? [] as $curScopeId => $curScopeData) {
-                 $scopes[$curScopeType][$curScopeId] = 1;
-                 $this->cache->save(
--                    $this->serializer->serialize($curScopeData),
-+                    $this->encryptor->encryptWithFastestAvailableAlgorithm($this->serializer->serialize($curScopeData)),
-                     $this->configType . '_' . $curScopeType . '_' . $curScopeId,
-                     [self::CACHE_TAG]
-                 );
-             }
-         }
-         $this->cache->save(
--            $this->serializer->serialize($scopes),
--            $this->configType . "_scopes",
-+            $this->encryptor->encryptWithFastestAvailableAlgorithm($this->serializer->serialize($scopes)),
-+            $this->configType . '_scopes',
-             [self::CACHE_TAG]
-         );
-     }
- 
-     /**
--     * Walk nested hash map by keys from $pathParts
-+     * Walk nested hash map by keys from $pathParts.
-      *
-      * @param array $data to walk in
-      * @param array $pathParts keys path
-@@ -279,6 +357,7 @@ class System implements ConfigTypeInterface
-                 return null;
-             }
-         }
-+
-         return $data;
-     }
- 
-@@ -298,7 +377,7 @@ class System implements ConfigTypeInterface
-     }
- 
-     /**
--     * Clean cache and global variables cache
-+     * Clean cache and global variables cache.
-      *
-      * Next items cleared:
-      * - Internal property intended to store already loaded configuration data
-@@ -310,6 +389,13 @@ class System implements ConfigTypeInterface
-     public function clean()
-     {
-         $this->data = [];
--        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
-+        $cleanAction = function () {
-+            $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
-+        };
-+
-+        $this->lockQuery->lockedCleanData(
-+            self::$lockName,
-+            $cleanAction
-+        );
-     }
- }
-diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
-index 81e39a83296..8378c058c19 100644
---- a/app/code/Magento/Config/Block/System/Config/Form.php
-+++ b/app/code/Magento/Config/Block/System/Config/Form.php
-@@ -134,6 +134,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-      * @param \Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory
-      * @param \Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory
-      * @param array $data
-+     * @param SettingChecker|null $settingChecker
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-@@ -143,13 +144,15 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-         \Magento\Config\Model\Config\Structure $configStructure,
-         \Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory,
-         \Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory,
--        array $data = []
-+        array $data = [],
-+        SettingChecker $settingChecker = null
-     ) {
-         parent::__construct($context, $registry, $formFactory, $data);
-         $this->_configFactory = $configFactory;
-         $this->_configStructure = $configStructure;
-         $this->_fieldsetFactory = $fieldsetFactory;
-         $this->_fieldFactory = $fieldFactory;
-+        $this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
- 
-         $this->_scopeLabels = [
-             self::SCOPE_DEFAULT => __('[GLOBAL]'),
-@@ -158,18 +161,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-         ];
-     }
- 
--    /**
--     * @deprecated 100.1.2
--     * @return SettingChecker
--     */
--    private function getSettingChecker()
--    {
--        if ($this->settingChecker === null) {
--            $this->settingChecker = ObjectManager::getInstance()->get(SettingChecker::class);
--        }
--        return $this->settingChecker;
--    }
--
-     /**
-      * Initialize objects required to render config form
-      *
-@@ -366,9 +357,8 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
- 
-         $sharedClass = $this->_getSharedCssClass($field);
-         $requiresClass = $this->_getRequiresCssClass($field, $fieldPrefix);
-+        $isReadOnly = $this->isReadOnly($field, $path);
- 
--        $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
--            ?: $this->getSettingChecker()->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
-         $formField = $fieldset->addField(
-             $elementId,
-             $field->getType(),
-@@ -417,7 +407,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-     {
-         $data = $this->getAppConfigDataValue($path);
- 
--        $placeholderValue = $this->getSettingChecker()->getPlaceholderValue(
-+        $placeholderValue = $this->settingChecker->getPlaceholderValue(
-             $path,
-             $this->getScope(),
-             $this->getStringScopeCode()
-@@ -434,6 +424,10 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-                 $backendModel = $field->getBackendModel();
-                 // Backend models which implement ProcessorInterface are processed by ScopeConfigInterface
-                 if (!$backendModel instanceof ProcessorInterface) {
-+                    if (array_key_exists($path, $this->_configData)) {
-+                        $data = $this->_configData[$path];
-+                    }
-+
-                     $backendModel->setPath($path)
-                         ->setValue($data)
-                         ->setWebsite($this->getWebsiteCode())
-@@ -541,7 +535,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-     }
- 
-     /**
--     * @return \Magento\Backend\Block\Widget\Form|\Magento\Framework\View\Element\AbstractBlock
-+     * @inheritdoc
-      */
-     protected function _beforeToHtml()
-     {
-@@ -718,6 +712,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-      *
-      * @TODO delete this methods when {^see above^} is done
-      * @return string
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     public function getSectionCode()
-     {
-@@ -729,6 +724,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-      *
-      * @TODO delete this methods when {^see above^} is done
-      * @return string
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     public function getWebsiteCode()
-     {
-@@ -740,6 +736,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-      *
-      * @TODO delete this methods when {^see above^} is done
-      * @return string
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     public function getStoreCode()
-     {
-@@ -797,6 +794,26 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-         return $this->appConfig;
-     }
- 
-+    /**
-+     * Check Path is Readonly
-+     *
-+     * @param \Magento\Config\Model\Config\Structure\Element\Field $field
-+     * @param string $path
-+     * @return boolean
-+     */
-+    private function isReadOnly(\Magento\Config\Model\Config\Structure\Element\Field $field, $path)
-+    {
-+        $isReadOnly = $this->settingChecker->isReadOnly(
-+            $path,
-+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
-+        );
-+        if (!$isReadOnly) {
-+            $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
-+                ?: $this->settingChecker->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
-+        }
-+        return $isReadOnly;
-+    }
-+
-     /**
-      * Retrieve deployment config data value by path
-      *
-diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php
-index 63dbb2b80e3..16b18e02000 100644
---- a/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php
-+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php
-@@ -33,6 +33,8 @@ class Datetime extends \Magento\Config\Block\System\Config\Form\Field
-     }
- 
-     /**
-+     * Returns element html
-+     *
-      * @param AbstractElement $element
-      * @return string
-      * @codeCoverageIgnore
-@@ -40,7 +42,7 @@ class Datetime extends \Magento\Config\Block\System\Config\Form\Field
-     protected function _getElementHtml(AbstractElement $element)
-     {
-         return $this->dateTimeFormatter->formatObject(
--            $this->_localeDate->date(intval($element->getValue())),
-+            $this->_localeDate->date((int) $element->getValue()),
-             $this->_localeDate->getDateTimeFormat(\IntlDateFormatter::MEDIUM)
-         );
-     }
-diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php
-index 7f21bf4b92b..2e79cec7088 100644
---- a/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php
-+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php
-@@ -10,6 +10,7 @@ use Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface;
- 
- /**
-  * Backend system config datetime field renderer
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -35,6 +36,8 @@ class Notification extends \Magento\Config\Block\System\Config\Form\Field
-     }
- 
-     /**
-+     * Returns element html
-+     *
-      * @param AbstractElement $element
-      * @return string
-      */
-@@ -44,6 +47,6 @@ class Notification extends \Magento\Config\Block\System\Config\Form\Field
-         $format = $this->_localeDate->getDateTimeFormat(
-             \IntlDateFormatter::MEDIUM
-         );
--        return $this->dateTimeFormatter->formatObject($this->_localeDate->date(intval($element->getValue())), $format);
-+        return $this->dateTimeFormatter->formatObject($this->_localeDate->date((int) $element->getValue()), $format);
-     }
- }
-diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
-index d7d513bfad4..c622a48b7f2 100644
---- a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
-+++ b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
-@@ -7,17 +7,19 @@ namespace Magento\Config\Console\Command\ConfigSet;
- 
- use Magento\Config\App\Config\Type\System;
- use Magento\Config\Console\Command\ConfigSetCommand;
-+use Magento\Config\Model\Config\Factory as ConfigFactory;
- use Magento\Framework\App\Config\ConfigPathResolver;
- use Magento\Framework\App\DeploymentConfig;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Exception\CouldNotSaveException;
- use Magento\Config\Model\PreparedValueFactory;
--use Magento\Framework\App\Config\Value;
- 
- /**
-  * Processes default flow of config:set command.
-+ *
-  * This processor saves the value of configuration into database.
-  *
-- * {@inheritdoc}
-+ * @inheritdoc
-  * @api
-  * @since 100.2.0
-  */
-@@ -44,26 +46,36 @@ class DefaultProcessor implements ConfigSetProcessorInterface
-      */
-     private $preparedValueFactory;
- 
-+    /**
-+     * @var ConfigFactory
-+     */
-+    private $configFactory;
-+
-     /**
-      * @param PreparedValueFactory $preparedValueFactory The factory for prepared value
-      * @param DeploymentConfig $deploymentConfig The deployment configuration reader
-      * @param ConfigPathResolver $configPathResolver The resolver for configuration paths according to source type
-+     * @param ConfigFactory|null $configFactory
-      */
-     public function __construct(
-         PreparedValueFactory $preparedValueFactory,
-         DeploymentConfig $deploymentConfig,
--        ConfigPathResolver $configPathResolver
-+        ConfigPathResolver $configPathResolver,
-+        ConfigFactory $configFactory = null
-     ) {
-         $this->preparedValueFactory = $preparedValueFactory;
-         $this->deploymentConfig = $deploymentConfig;
-         $this->configPathResolver = $configPathResolver;
-+
-+        $this->configFactory = $configFactory ?? ObjectManager::getInstance()->get(ConfigFactory::class);
-     }
- 
-     /**
-      * Processes database flow of config:set command.
-+     *
-      * Requires installed application.
-      *
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.2.0
-      */
-     public function process($path, $value, $scope, $scopeCode)
-@@ -78,12 +90,12 @@ class DefaultProcessor implements ConfigSetProcessorInterface
-         }
- 
-         try {
--            /** @var Value $backendModel */
--            $backendModel = $this->preparedValueFactory->create($path, $value, $scope, $scopeCode);
--            if ($backendModel instanceof Value) {
--                $resourceModel = $backendModel->getResource();
--                $resourceModel->save($backendModel);
--            }
-+            $config = $this->configFactory->create(['data' => [
-+                'scope' => $scope,
-+                'scope_code' => $scopeCode,
-+            ]]);
-+            $config->setDataByPath($path, $value);
-+            $config->save();
-         } catch (\Exception $exception) {
-             throw new CouldNotSaveException(__('%1', $exception->getMessage()), $exception);
-         }
-diff --git a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
-index cb79daddbf5..999d8e41af5 100644
---- a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
-+++ b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
-@@ -114,13 +114,13 @@ class ConfigSetCommand extends Command
-                 ),
-                 new InputOption(
-                     static::OPTION_LOCK_ENV,
--                    'le',
-+                    'e',
-                     InputOption::VALUE_NONE,
-                     'Lock value which prevents modification in the Admin (will be saved in app/etc/env.php)'
-                 ),
-                 new InputOption(
-                     static::OPTION_LOCK_CONFIG,
--                    'lc',
-+                    'c',
-                     InputOption::VALUE_NONE,
-                     'Lock and share value with other installations, prevents modification in the Admin '
-                     . '(will be saved in app/etc/config.php)'
-@@ -139,8 +139,10 @@ class ConfigSetCommand extends Command
-     /**
-      * Creates and run appropriate processor, depending on input options.
-      *
--     * {@inheritdoc}
-+     * @param InputInterface $input
-+     * @param OutputInterface $output
-      * @since 100.2.0
-+     * @return int|null
-      */
-     protected function execute(InputInterface $input, OutputInterface $output)
-     {
-diff --git a/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php b/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php
-index 582f8750808..aeb57010e49 100644
---- a/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php
-+++ b/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php
-@@ -97,7 +97,7 @@ class ValueProcessor
-         $field = $configStructure->getElementByConfigPath($path);
- 
-         /** @var Value $backendModel */
--        $backendModel = $field && $field->hasBackendModel()
-+        $backendModel = $field instanceof Field && $field->hasBackendModel()
-             ? $field->getBackendModel()
-             : $this->configValueFactory->create();
- 
-diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php
-index b65f6e9d4e4..12c6ecbab9f 100644
---- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php
-+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Config\Controller\Adminhtml\System\Config;
- 
--class Edit extends AbstractScopeConfig
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Edit extends AbstractScopeConfig implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php
-index 66290a79261..03479085f3f 100644
---- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php
-+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Config\Controller\Adminhtml\System\Config;
- 
--class Index extends AbstractScopeConfig
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends AbstractScopeConfig implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
-index 290a43c9cd6..2d4b2003380 100644
---- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
-+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Config\Controller\Adminhtml\System\Config;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Config\Controller\Adminhtml\System\AbstractConfig;
- 
- /**
-@@ -13,7 +14,7 @@ use Magento\Config\Controller\Adminhtml\System\AbstractConfig;
-  * @author     Magento Core Team <core@magentocommerce.com>
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Save extends AbstractConfig
-+class Save extends AbstractConfig implements HttpPostActionInterface
- {
-     /**
-      * Backend Config Model Factory
-diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php
-index 75716fa380b..5d74eb7ea4e 100644
---- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php
-+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php
-@@ -6,7 +6,13 @@
-  */
- namespace Magento\Config\Controller\Adminhtml\System\Config;
- 
--class State extends AbstractScopeConfig
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Save current state of open tabs. GET is allowed for legacy reasons.
-+ */
-+class State extends AbstractScopeConfig implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\RawFactory
-diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
-index c6e2412f7e5..356c6ca17da 100644
---- a/app/code/Magento/Config/Model/Config.php
-+++ b/app/code/Magento/Config/Model/Config.php
-@@ -9,15 +9,32 @@ use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
- use Magento\Config\Model\Config\Structure\Element\Group;
- use Magento\Config\Model\Config\Structure\Element\Field;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\App\ScopeInterface;
-+use Magento\Framework\App\ScopeResolverPool;
-+use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
-+use Magento\Store\Model\ScopeTypeNormalizer;
- 
- /**
-  * Backend config model
-+ *
-  * Used to save configuration
-  *
-  * @author     Magento Core Team <core@magentocommerce.com>
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @api
-  * @since 100.0.2
-+ * @method string getSection()
-+ * @method void setSection(string $section)
-+ * @method string getWebsite()
-+ * @method void setWebsite(string $website)
-+ * @method string getStore()
-+ * @method void setStore(string $store)
-+ * @method string getScope()
-+ * @method void setScope(string $scope)
-+ * @method int getScopeId()
-+ * @method void setScopeId(int $scopeId)
-+ * @method string getScopeCode()
-+ * @method void setScopeCode(string $scopeCode)
-  */
- class Config extends \Magento\Framework\DataObject
- {
-@@ -87,6 +104,21 @@ class Config extends \Magento\Framework\DataObject
-      */
-     private $settingChecker;
- 
-+    /**
-+     * @var ScopeResolverPool
-+     */
-+    private $scopeResolverPool;
-+
-+    /**
-+     * @var ScopeTypeNormalizer
-+     */
-+    private $scopeTypeNormalizer;
-+
-+    /**
-+     * @var \Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface
-+     */
-+    private $pillPut;
-+
-     /**
-      * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
-      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-@@ -97,6 +129,10 @@ class Config extends \Magento\Framework\DataObject
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param Config\Reader\Source\Deployed\SettingChecker|null $settingChecker
-      * @param array $data
-+     * @param ScopeResolverPool|null $scopeResolverPool
-+     * @param ScopeTypeNormalizer|null $scopeTypeNormalizer
-+     * @param \Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface|null $pillPut
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-         \Magento\Framework\App\Config\ReinitableConfigInterface $config,
-@@ -107,7 +143,10 @@ class Config extends \Magento\Framework\DataObject
-         \Magento\Framework\App\Config\ValueFactory $configValueFactory,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
-         SettingChecker $settingChecker = null,
--        array $data = []
-+        array $data = [],
-+        ScopeResolverPool $scopeResolverPool = null,
-+        ScopeTypeNormalizer $scopeTypeNormalizer = null,
-+        \Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface $pillPut = null
-     ) {
-         parent::__construct($data);
-         $this->_eventManager = $eventManager;
-@@ -117,11 +156,19 @@ class Config extends \Magento\Framework\DataObject
-         $this->_configLoader = $configLoader;
-         $this->_configValueFactory = $configValueFactory;
-         $this->_storeManager = $storeManager;
--        $this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
-+        $this->settingChecker = $settingChecker
-+            ?? ObjectManager::getInstance()->get(SettingChecker::class);
-+        $this->scopeResolverPool = $scopeResolverPool
-+            ?? ObjectManager::getInstance()->get(ScopeResolverPool::class);
-+        $this->scopeTypeNormalizer = $scopeTypeNormalizer
-+            ?? ObjectManager::getInstance()->get(ScopeTypeNormalizer::class);
-+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(\Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface::class);
-     }
- 
-     /**
-      * Save config section
-+     *
-      * Require set: section, website, store and groups
-      *
-      * @throws \Exception
-@@ -186,6 +233,8 @@ class Config extends \Magento\Framework\DataObject
-             throw $e;
-         }
- 
-+        $this->pillPut->put();
-+
-         return $this;
-     }
- 
-@@ -237,13 +286,14 @@ class Config extends \Magento\Framework\DataObject
-      * Get field path
-      *
-      * @param Field $field
--     * @param array &$oldConfig Need for compatibility with _processGroup()
--     * @param array &$extraOldGroups Need for compatibility with _processGroup()
-+     * @param string $fieldId Need for support of clone_field feature
-+     * @param array $oldConfig Need for compatibility with _processGroup()
-+     * @param array $extraOldGroups Need for compatibility with _processGroup()
-      * @return string
-      */
--    private function getFieldPath(Field $field, array &$oldConfig, array &$extraOldGroups): string
-+    private function getFieldPath(Field $field, string $fieldId, array &$oldConfig, array &$extraOldGroups): string
-     {
--        $path = $field->getGroupPath() . '/' . $field->getId();
-+        $path = $field->getGroupPath() . '/' . $fieldId;
- 
-         /**
-          * Look for custom defined field path
-@@ -287,8 +337,8 @@ class Config extends \Magento\Framework\DataObject
-      * @param string $sectionId
-      * @param string $groupId
-      * @param array $groupData
--     * @param array &$oldConfig
--     * @param array &$extraOldGroups
-+     * @param array $oldConfig
-+     * @param array $extraOldGroups
-      * @return array
-      */
-     private function getChangedPaths(
-@@ -303,7 +353,7 @@ class Config extends \Magento\Framework\DataObject
-         if (isset($groupData['fields'])) {
-             foreach ($groupData['fields'] as $fieldId => $fieldData) {
-                 $field = $this->getField($sectionId, $groupId, $fieldId);
--                $path = $this->getFieldPath($field, $oldConfig, $extraOldGroups);
-+                $path = $this->getFieldPath($field, $fieldId, $oldConfig, $extraOldGroups);
-                 if ($this->isValueChanged($oldConfig, $path, $fieldData)) {
-                     $changedPaths[] = $path;
-                 }
-@@ -334,8 +384,8 @@ class Config extends \Magento\Framework\DataObject
-      * @param array $groupData
-      * @param array $groups
-      * @param string $sectionPath
--     * @param array &$extraOldGroups
--     * @param array &$oldConfig
-+     * @param array $extraOldGroups
-+     * @param array $oldConfig
-      * @param \Magento\Framework\DB\Transaction $saveTransaction
-      * @param \Magento\Framework\DB\Transaction $deleteTransaction
-      * @return void
-@@ -385,6 +435,11 @@ class Config extends \Magento\Framework\DataObject
-                 if (!isset($fieldData['value'])) {
-                     $fieldData['value'] = null;
-                 }
-+                
-+                if ($field->getType() == 'multiline' && is_array($fieldData['value'])) {
-+                    $fieldData['value'] = trim(implode(PHP_EOL, $fieldData['value']));
-+                }
-+                
-                 $data = [
-                     'field' => $fieldId,
-                     'groups' => $groups,
-@@ -398,7 +453,7 @@ class Config extends \Magento\Framework\DataObject
-                 $backendModel->addData($data);
-                 $this->_checkSingleStoreMode($field, $backendModel);
- 
--                $path = $this->getFieldPath($field, $extraOldGroups, $oldConfig);
-+                $path = $this->getFieldPath($field, $fieldId, $extraOldGroups, $oldConfig);
-                 $backendModel->setPath($path)->setValue($fieldData['value']);
- 
-                 $inherit = !empty($fieldData['inherit']);
-@@ -481,30 +536,37 @@ class Config extends \Magento\Framework\DataObject
-         if ($path === '') {
-             throw new \UnexpectedValueException('Path must not be empty');
-         }
-+
-         $pathParts = explode('/', $path);
-         $keyDepth = count($pathParts);
--        if ($keyDepth !== 3) {
-+        if ($keyDepth < 3) {
-             throw new \UnexpectedValueException(
--                "Allowed depth of configuration is 3 (<section>/<group>/<field>). Your configuration depth is "
--                . $keyDepth . " for path '$path'"
-+                'Minimal depth of configuration is 3. Your configuration depth is ' . $keyDepth
-             );
-         }
-+
-+        $section = array_shift($pathParts);
-+        $this->setData('section', $section);
-+
-         $data = [
--            'section' => $pathParts[0],
--            'groups' => [
--                $pathParts[1] => [
--                    'fields' => [
--                        $pathParts[2] => ['value' => $value],
--                    ],
--                ],
-+            'fields' => [
-+                array_pop($pathParts) => ['value' => $value],
-             ],
-         ];
--        $this->addData($data);
-+        while ($pathParts) {
-+            $data = [
-+                'groups' => [
-+                    array_pop($pathParts) => $data,
-+                ],
-+            ];
-+        }
-+        $groups = array_replace_recursive((array) $this->getData('groups'), $data['groups']);
-+        $this->setData('groups', $groups);
-     }
- 
-     /**
--     * Get scope name and scopeId
--     * @todo refactor to scope resolver
-+     * Set scope data
-+     *
-      * @return void
-      */
-     private function initScope()
-@@ -512,31 +574,66 @@ class Config extends \Magento\Framework\DataObject
-         if ($this->getSection() === null) {
-             $this->setSection('');
-         }
-+
-+        $scope = $this->retrieveScope();
-+        $this->setScope($this->scopeTypeNormalizer->normalize($scope->getScopeType()));
-+        $this->setScopeCode($scope->getCode());
-+        $this->setScopeId($scope->getId());
-+
-         if ($this->getWebsite() === null) {
--            $this->setWebsite('');
-+            $this->setWebsite(StoreScopeInterface::SCOPE_WEBSITES === $this->getScope() ? $scope->getId() : '');
-         }
-         if ($this->getStore() === null) {
--            $this->setStore('');
-+            $this->setStore(StoreScopeInterface::SCOPE_STORES === $this->getScope() ? $scope->getId() : '');
-         }
-+    }
- 
--        if ($this->getStore()) {
--            $scope = 'stores';
--            $store = $this->_storeManager->getStore($this->getStore());
--            $scopeId = (int)$store->getId();
--            $scopeCode = $store->getCode();
--        } elseif ($this->getWebsite()) {
--            $scope = 'websites';
--            $website = $this->_storeManager->getWebsite($this->getWebsite());
--            $scopeId = (int)$website->getId();
--            $scopeCode = $website->getCode();
-+    /**
-+     * Retrieve scope from initial data
-+     *
-+     * @return ScopeInterface
-+     */
-+    private function retrieveScope(): ScopeInterface
-+    {
-+        $scopeType = $this->getScope();
-+        if (!$scopeType) {
-+            switch (true) {
-+                case $this->getStore():
-+                    $scopeType = StoreScopeInterface::SCOPE_STORES;
-+                    $scopeIdentifier = $this->getStore();
-+                    break;
-+                case $this->getWebsite():
-+                    $scopeType = StoreScopeInterface::SCOPE_WEBSITES;
-+                    $scopeIdentifier = $this->getWebsite();
-+                    break;
-+                default:
-+                    $scopeType = ScopeInterface::SCOPE_DEFAULT;
-+                    $scopeIdentifier = null;
-+                    break;
-+            }
-         } else {
--            $scope = 'default';
--            $scopeId = 0;
--            $scopeCode = '';
-+            switch (true) {
-+                case $this->getScopeId() !== null:
-+                    $scopeIdentifier = $this->getScopeId();
-+                    break;
-+                case $this->getScopeCode() !== null:
-+                    $scopeIdentifier = $this->getScopeCode();
-+                    break;
-+                case $this->getStore() !== null:
-+                    $scopeIdentifier = $this->getStore();
-+                    break;
-+                case $this->getWebsite() !== null:
-+                    $scopeIdentifier = $this->getWebsite();
-+                    break;
-+                default:
-+                    $scopeIdentifier = null;
-+                    break;
-+            }
-         }
--        $this->setScope($scope);
--        $this->setScopeId($scopeId);
--        $this->setScopeCode($scopeCode);
-+        $scope = $this->scopeResolverPool->get($scopeType)
-+            ->getScope($scopeIdentifier);
-+
-+        return $scope;
-     }
- 
-     /**
-@@ -584,7 +681,7 @@ class Config extends \Magento\Framework\DataObject
-      * Get config data value
-      *
-      * @param string $path
--     * @param null|bool &$inherit
-+     * @param null|bool $inherit
-      * @param null|array $configData
-      * @return \Magento\Framework\Simplexml\Element
-      */
-diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
-index 9a483de6a69..f5d568f2f36 100644
---- a/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
-+++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
-@@ -10,6 +10,8 @@
- namespace Magento\Config\Model\Config\Backend\Admin;
- 
- /**
-+ * Process custom admin url during configuration value save process.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -56,8 +58,9 @@ class Usecustom extends \Magento\Framework\App\Config\Value
-     {
-         $value = $this->getValue();
-         if ($value == 1) {
--            $customUrl = $this->getData('groups/url/fields/custom/value');
--            if (empty($customUrl)) {
-+            $customUrlField = $this->getData('groups/url/fields/custom/value');
-+            $customUrlConfig = $this->_config->getValue('admin/url/custom');
-+            if (empty($customUrlField) && empty($customUrlConfig)) {
-                 throw new \Magento\Framework\Exception\LocalizedException(__('Please specify the admin custom URL.'));
-             }
-         }
-diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
-index b86b86ad3bb..25303093ace 100644
---- a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
-+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
-@@ -14,6 +14,8 @@
- namespace Magento\Config\Model\Config\Backend\Currency;
- 
- /**
-+ * Base currency class
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -26,18 +28,19 @@ abstract class AbstractCurrency extends \Magento\Framework\App\Config\Value
-      */
-     protected function _getAllowedCurrencies()
-     {
--        if (!$this->isFormData() || $this->getData('groups/options/fields/allow/inherit')) {
--            return explode(
-+        $allowValue = $this->getData('groups/options/fields/allow/value');
-+        $allowedCurrencies = $allowValue === null || $this->getData('groups/options/fields/allow/inherit')
-+            ? explode(
-                 ',',
-                 (string)$this->_config->getValue(
-                     \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
-                     $this->getScope(),
-                     $this->getScopeId()
-                 )
--            );
--        }
-+            )
-+            : (array) $allowValue;
- 
--        return (array)$this->getData('groups/options/fields/allow/value');
-+        return $allowedCurrencies;
-     }
- 
-     /**
-@@ -71,7 +74,7 @@ abstract class AbstractCurrency extends \Magento\Framework\App\Config\Value
-                 $this->getScopeId()
-             );
-         }
--        return strval($value);
-+        return (string)$value;
-     }
- 
-     /**
-@@ -88,7 +91,7 @@ abstract class AbstractCurrency extends \Magento\Framework\App\Config\Value
-                 $this->getScopeId()
-             );
-         }
--        return strval($value);
-+        return (string)$value;
-     }
- 
-     /**
-diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php b/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
-index 3f80e01802b..f29fa0611ef 100644
---- a/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
-+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
-@@ -10,6 +10,8 @@
- namespace Magento\Config\Model\Config\Backend\Currency;
- 
- /**
-+ * Cron job configuration for currency
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -47,6 +49,8 @@ class Cron extends \Magento\Framework\App\Config\Value
-     }
- 
-     /**
-+     * After save handler
-+     *
-      * @return $this
-      * @throws \Exception
-      */
-@@ -59,8 +63,8 @@ class Cron extends \Magento\Framework\App\Config\Value
-         $frequencyMonthly = \Magento\Cron\Model\Config\Source\Frequency::CRON_MONTHLY;
- 
-         $cronExprArray = [
--            intval($time[1]),                                 # Minute
--            intval($time[0]),                                 # Hour
-+            (int)$time[1],                                 # Minute
-+            (int)$time[0],                                 # Hour
-             $frequency == $frequencyMonthly ? '1' : '*',      # Day of the Month
-             '*',                                              # Month of the Year
-             $frequency == $frequencyWeekly ? '1' : '*',        # Day of the Week
-diff --git a/app/code/Magento/Config/Model/Config/Backend/Encrypted.php b/app/code/Magento/Config/Model/Config/Backend/Encrypted.php
-index 1a91e403a67..ea3b1d4c74a 100644
---- a/app/code/Magento/Config/Model/Config/Backend/Encrypted.php
-+++ b/app/code/Magento/Config/Model/Config/Backend/Encrypted.php
-@@ -9,6 +9,8 @@
- namespace Magento\Config\Model\Config\Backend;
- 
- /**
-+ * Backend model for encrypted values.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -48,9 +50,14 @@ class Encrypted extends \Magento\Framework\App\Config\Value implements
-      * Magic method called during class serialization
-      *
-      * @return string[]
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $properties = parent::__sleep();
-         return array_diff($properties, ['_encryptor']);
-     }
-@@ -59,9 +66,14 @@ class Encrypted extends \Magento\Framework\App\Config\Value implements
-      * Magic method called during class un-serialization
-      *
-      * @return void
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
-         $this->_encryptor = \Magento\Framework\App\ObjectManager::getInstance()->get(
-             \Magento\Framework\Encryption\EncryptorInterface::class
-diff --git a/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php b/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php
-index 3c36baf6f31..cff6f54b3a7 100644
---- a/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php
-+++ b/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php
-@@ -10,6 +10,8 @@
- namespace Magento\Config\Model\Config\Backend\Log;
- 
- /**
-+ * Cron logger configuration
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -73,8 +75,8 @@ class Cron extends \Magento\Framework\App\Config\Value
- 
-         if ($enabled) {
-             $cronExprArray = [
--                intval($time[1]),                                 # Minute
--                intval($time[0]),                                 # Hour
-+                (int)$time[1],                                 # Minute
-+                (int)$time[0],                                 # Hour
-                 $frequency == $frequencyMonthly ? '1' : '*',      # Day of the Month
-                 '*',                                              # Month of the Year
-                 $frequency == $frequencyWeekly ? '1' : '*',        # Day of the Week
-diff --git a/app/code/Magento/Config/Model/Config/Backend/Serialized.php b/app/code/Magento/Config/Model/Config/Backend/Serialized.php
-index 3d5713357c3..6e0b6275db8 100644
---- a/app/code/Magento/Config/Model/Config/Backend/Serialized.php
-+++ b/app/code/Magento/Config/Model/Config/Backend/Serialized.php
-@@ -9,6 +9,8 @@ use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Serialize\Serializer\Json;
- 
- /**
-+ * Serialized backend model
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -46,17 +48,32 @@ class Serialized extends \Magento\Framework\App\Config\Value
-     }
- 
-     /**
-+     * Processing object after load data
-+     *
-      * @return void
-      */
-     protected function _afterLoad()
-     {
-         $value = $this->getValue();
-         if (!is_array($value)) {
--            $this->setValue(empty($value) ? false : $this->serializer->unserialize($value));
-+            try {
-+                $this->setValue(empty($value) ? false : $this->serializer->unserialize($value));
-+            } catch (\Exception $e) {
-+                $this->_logger->critical(
-+                    sprintf(
-+                        'Failed to unserialize %s config value. The error is: %s',
-+                        $this->getPath(),
-+                        $e->getMessage()
-+                    )
-+                );
-+                $this->setValue(false);
-+            }
-         }
-     }
- 
-     /**
-+     * Processing object before save data
-+     *
-      * @return $this
-      */
-     public function beforeSave()
-diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php b/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php
-index b3474674cf7..5beff0d043a 100644
---- a/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php
-+++ b/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php
-@@ -4,12 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Locale currency source
-- */
- namespace Magento\Config\Model\Config\Source\Locale;
- 
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Locale\ListsInterface;
-+
- /**
-+ * Locale currency source.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -21,27 +24,70 @@ class Currency implements \Magento\Framework\Option\ArrayInterface
-     protected $_options;
- 
-     /**
--     * @var \Magento\Framework\Locale\ListsInterface
-+     * @var ListsInterface
-      */
-     protected $_localeLists;
- 
-     /**
--     * @param \Magento\Framework\Locale\ListsInterface $localeLists
-+     * @var ScopeConfigInterface
-      */
--    public function __construct(\Magento\Framework\Locale\ListsInterface $localeLists)
--    {
-+    private $config;
-+
-+    /**
-+     * @var array
-+     */
-+    private $installedCurrencies;
-+
-+    /**
-+     * @param ListsInterface $localeLists
-+     * @param ScopeConfigInterface $config
-+     */
-+    public function __construct(
-+        ListsInterface $localeLists,
-+        ScopeConfigInterface $config = null
-+    ) {
-         $this->_localeLists = $localeLists;
-+        $this->config = $config ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
-     }
- 
-     /**
--     * @return array
-+     * @inheritdoc
-      */
-     public function toOptionArray()
-     {
-         if (!$this->_options) {
-             $this->_options = $this->_localeLists->getOptionCurrencies();
-         }
--        $options = $this->_options;
-+
-+        $selected = array_flip($this->getInstalledCurrencies());
-+
-+        $options = array_filter(
-+            $this->_options,
-+            function ($option) use ($selected) {
-+                return isset($selected[$option['value']]);
-+            }
-+        );
-+
-         return $options;
-     }
-+
-+    /**
-+     * Retrieve Installed Currencies.
-+     *
-+     * @return array
-+     */
-+    private function getInstalledCurrencies()
-+    {
-+        if (!$this->installedCurrencies) {
-+            $this->installedCurrencies = explode(
-+                ',',
-+                $this->config->getValue(
-+                    'system/currency/installed',
-+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+                )
-+            );
-+        }
-+
-+        return $this->installedCurrencies;
-+    }
- }
-diff --git a/app/code/Magento/Config/Model/Config/Structure.php b/app/code/Magento/Config/Model/Config/Structure.php
-index 5c74220051b..a380dc82a7c 100644
---- a/app/code/Magento/Config/Model/Config/Structure.php
-+++ b/app/code/Magento/Config/Model/Config/Structure.php
-@@ -337,7 +337,6 @@ class Structure implements \Magento\Config\Model\Config\Structure\SearchInterfac
-     /**
-      * Collects config paths and their structure paths from configuration files.
-      * Returns the map of config paths and their structure paths.
--     *
-      * All paths are declared in module's system.xml.
-      *
-      * ```xml
-@@ -394,7 +393,7 @@ class Structure implements \Magento\Config\Model\Config\Structure\SearchInterfac
- 
-         foreach ($elements as $element) {
-             if (isset($element['children'])) {
--                $result = array_replace_recursive(
-+                $result = array_merge_recursive(
-                     $result,
-                     $this->getFieldsRecursively($element['children'])
-                 );
-diff --git a/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php b/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
-index 78025587c49..db815ec87ed 100644
---- a/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
-+++ b/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
-@@ -11,6 +11,8 @@ use Magento\Store\Model\StoreManagerInterface;
- use Magento\Framework\App\ObjectManager;
- 
- /**
-+ * Abstract element.
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  * @since 100.0.2
-  */
-@@ -38,7 +40,7 @@ abstract class AbstractElement implements StructureElementInterface
-     protected $_storeManager;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-@@ -48,11 +50,15 @@ abstract class AbstractElement implements StructureElementInterface
-     private $elementVisibility;
- 
-     /**
-+     * Construct.
-+     *
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      */
--    public function __construct(StoreManagerInterface $storeManager, \Magento\Framework\Module\Manager $moduleManager)
--    {
-+    public function __construct(
-+        StoreManagerInterface $storeManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-+    ) {
-         $this->_storeManager = $storeManager;
-         $this->moduleManager = $moduleManager;
-     }
-diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/AbstractComposite.php b/app/code/Magento/Config/Model/Config/Structure/Element/AbstractComposite.php
-index 724772622c3..efb918226aa 100644
---- a/app/code/Magento/Config/Model/Config/Structure/Element/AbstractComposite.php
-+++ b/app/code/Magento/Config/Model/Config/Structure/Element/AbstractComposite.php
-@@ -6,6 +6,9 @@
- namespace Magento\Config\Model\Config\Structure\Element;
- 
- /**
-+ * Abstract Composite.
-+ *
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  * @since 100.0.2
-  */
-@@ -20,12 +23,12 @@ abstract class AbstractComposite extends \Magento\Config\Model\Config\Structure\
- 
-     /**
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param Iterator $childrenIterator
-      */
-     public function __construct(
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         Iterator $childrenIterator
-     ) {
-         parent::__construct($storeManager, $moduleManager);
-diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Field.php b/app/code/Magento/Config/Model/Config/Structure/Element/Field.php
-index 0a6a600b41d..6a8cc6e7674 100644
---- a/app/code/Magento/Config/Model/Config/Structure/Element/Field.php
-+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Field.php
-@@ -8,6 +8,8 @@
- namespace Magento\Config\Model\Config\Structure\Element;
- 
- /**
-+ * Element field.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -54,7 +56,7 @@ class Field extends \Magento\Config\Model\Config\Structure\AbstractElement
- 
-     /**
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Config\Model\Config\BackendFactory $backendFactory
-      * @param \Magento\Config\Model\Config\SourceFactory $sourceFactory
-      * @param \Magento\Config\Model\Config\CommentFactory $commentFactory
-@@ -63,7 +65,7 @@ class Field extends \Magento\Config\Model\Config\Structure\AbstractElement
-      */
-     public function __construct(
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Config\Model\Config\BackendFactory $backendFactory,
-         \Magento\Config\Model\Config\SourceFactory $sourceFactory,
-         \Magento\Config\Model\Config\CommentFactory $commentFactory,
-@@ -243,6 +245,7 @@ class Field extends \Magento\Config\Model\Config\Structure\AbstractElement
-      */
-     public function getGroupPath()
-     {
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         return dirname($this->getConfigPath() ?: $this->getPath());
-     }
- 
-diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Group.php b/app/code/Magento/Config/Model/Config/Structure/Element/Group.php
-index 8003132d2b8..db479e8b795 100644
---- a/app/code/Magento/Config/Model/Config/Structure/Element/Group.php
-+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Group.php
-@@ -7,6 +7,8 @@
- namespace Magento\Config\Model\Config\Structure\Element;
- 
- /**
-+ * Group element.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -27,14 +29,14 @@ class Group extends AbstractComposite
- 
-     /**
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param Iterator\Field $childrenIterator
-      * @param \Magento\Config\Model\Config\BackendClone\Factory $cloneModelFactory
-      * @param Dependency\Mapper $dependencyMapper
-      */
-     public function __construct(
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Config\Model\Config\Structure\Element\Iterator\Field $childrenIterator,
-         \Magento\Config\Model\Config\BackendClone\Factory $cloneModelFactory,
-         \Magento\Config\Model\Config\Structure\Element\Dependency\Mapper $dependencyMapper
-diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Section.php b/app/code/Magento/Config/Model/Config/Structure/Element/Section.php
-index c3d927a1d6d..134411fbd87 100644
---- a/app/code/Magento/Config/Model/Config/Structure/Element/Section.php
-+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Section.php
-@@ -6,6 +6,8 @@
- namespace Magento\Config\Model\Config\Structure\Element;
- 
- /**
-+ * Section
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -20,13 +22,13 @@ class Section extends AbstractComposite
- 
-     /**
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param Iterator $childrenIterator
-      * @param \Magento\Framework\AuthorizationInterface $authorization
-      */
-     public function __construct(
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         Iterator $childrenIterator,
-         \Magento\Framework\AuthorizationInterface $authorization
-     ) {
-diff --git a/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php b/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php
-index f6f3a0be187..19e1acc6170 100644
---- a/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php
-+++ b/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php
-@@ -10,6 +10,8 @@
- namespace Magento\Config\Model\Config\Structure\Mapper;
- 
- /**
-+ * Sorting mapper
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -30,6 +32,8 @@ class Sorting extends \Magento\Config\Model\Config\Structure\AbstractMapper
-     }
- 
-     /**
-+     * Process config
-+     *
-      * @param array $data
-      * @return array
-      */
-@@ -55,17 +59,13 @@ class Sorting extends \Magento\Config\Model\Config\Structure\AbstractMapper
-     {
-         $sortIndexA = 0;
-         if ($this->_hasValue('sortOrder', $elementA)) {
--            $sortIndexA = floatval($elementA['sortOrder']);
-+            $sortIndexA = (float)$elementA['sortOrder'];
-         }
-         $sortIndexB = 0;
-         if ($this->_hasValue('sortOrder', $elementB)) {
--            $sortIndexB = floatval($elementB['sortOrder']);
--        }
--
--        if ($sortIndexA == $sortIndexB) {
--            return 0;
-+            $sortIndexB = (float)$elementB['sortOrder'];
-         }
- 
--        return $sortIndexA < $sortIndexB ? -1 : 1;
-+        return $sortIndexA <=> $sortIndexB;
-     }
- }
-diff --git a/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php b/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
-index bf414890d0e..830b6376c94 100644
---- a/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
-+++ b/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
-@@ -3,10 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Config\Observer\Config\Backend\Admin;
- 
- use Magento\Framework\Event\ObserverInterface;
- 
-+/**
-+ * Class AfterCustomUrlChangedObserver redirects to new custom admin URL.
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ */
- class AfterCustomUrlChangedObserver implements ObserverInterface
- {
-     /**
-@@ -56,7 +63,6 @@ class AfterCustomUrlChangedObserver implements ObserverInterface
-      *
-      * @param \Magento\Framework\Event\Observer $observer
-      * @return void
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function execute(\Magento\Framework\Event\Observer $observer)
-@@ -68,6 +74,7 @@ class AfterCustomUrlChangedObserver implements ObserverInterface
-         $this->_authSession->destroy();
-         $adminUrl = $this->_backendData->getHomePageUrl();
-         $this->_response->setRedirect($adminUrl)->sendResponse();
-+        // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-         exit(0);
-     }
- }
-diff --git a/app/code/Magento/Config/Setup/ConfigOptionsList.php b/app/code/Magento/Config/Setup/ConfigOptionsList.php
-new file mode 100644
-index 00000000000..c410eeae615
---- /dev/null
-+++ b/app/code/Magento/Config/Setup/ConfigOptionsList.php
-@@ -0,0 +1,135 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Config\Setup;
-+
-+use Magento\Framework\App\DeploymentConfig;
-+use Magento\Framework\Config\Data\ConfigData;
-+use Magento\Framework\Config\Data\ConfigDataFactory;
-+use Magento\Framework\Config\File\ConfigFilePool;
-+use Magento\Framework\Setup\ConfigOptionsListInterface;
-+use Magento\Framework\Setup\Option\SelectConfigOption;
-+
-+/**
-+ * Deployment configuration options required for the Config module.
-+ */
-+class ConfigOptionsList implements ConfigOptionsListInterface
-+{
-+    /**
-+     * Input key for the debug_logging option.
-+     */
-+    const INPUT_KEY_DEBUG_LOGGING = 'enable-debug-logging';
-+
-+    /**
-+     * Path to the debug_logging value in the deployment config.
-+     */
-+    const CONFIG_PATH_DEBUG_LOGGING = 'dev/debug/debug_logging';
-+
-+    /**
-+     * Input key for the syslog_logging option.
-+     */
-+    const INPUT_KEY_SYSLOG_LOGGING = 'enable-syslog-logging';
-+
-+    /**
-+     * Path to the syslog_logging value in the deployment config.
-+     */
-+    const CONFIG_PATH_SYSLOG_LOGGING = 'dev/syslog/syslog_logging';
-+
-+    /**
-+     * @var ConfigDataFactory
-+     */
-+    private $configDataFactory;
-+
-+    /**
-+     * @param ConfigDataFactory $configDataFactory
-+     */
-+    public function __construct(ConfigDataFactory $configDataFactory)
-+    {
-+        $this->configDataFactory = $configDataFactory;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getOptions()
-+    {
-+        return [
-+            new SelectConfigOption(
-+                self::INPUT_KEY_DEBUG_LOGGING,
-+                SelectConfigOption::FRONTEND_WIZARD_RADIO,
-+                [true, false, 1, 0],
-+                self::CONFIG_PATH_DEBUG_LOGGING,
-+                'Enable debug logging'
-+            ),
-+            new SelectConfigOption(
-+                self::INPUT_KEY_SYSLOG_LOGGING,
-+                SelectConfigOption::FRONTEND_WIZARD_RADIO,
-+                [true, false, 1, 0],
-+                self::CONFIG_PATH_SYSLOG_LOGGING,
-+                'Enable syslog logging'
-+            ),
-+        ];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function createConfig(array $options, DeploymentConfig $deploymentConfig)
-+    {
-+        $deploymentOption = [
-+            self::INPUT_KEY_DEBUG_LOGGING => self::CONFIG_PATH_DEBUG_LOGGING,
-+            self::INPUT_KEY_SYSLOG_LOGGING => self::CONFIG_PATH_SYSLOG_LOGGING,
-+        ];
-+
-+        $config = [];
-+        foreach ($deploymentOption as $inputKey => $configPath) {
-+            $configValue = $this->processBooleanConfigValue(
-+                $inputKey,
-+                $configPath,
-+                $options
-+            );
-+            if ($configValue) {
-+                $config[] = $configValue;
-+            }
-+        }
-+
-+        return $config;
-+    }
-+
-+    /**
-+     * Provide config value from input.
-+     *
-+     * @param string $inputKey
-+     * @param string $configPath
-+     * @param array $options
-+     * @return ConfigData|null
-+     */
-+    private function processBooleanConfigValue(string $inputKey, string $configPath, array &$options): ?ConfigData
-+    {
-+        $configData = null;
-+        if (isset($options[$inputKey])) {
-+            $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
-+            if ($options[$inputKey] === 'true'
-+                || $options[$inputKey] === '1') {
-+                $value = 1;
-+            } else {
-+                $value = 0;
-+            }
-+            $configData->set($configPath, $value);
-+        }
-+
-+        return $configData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function validate(array $options, DeploymentConfig $deploymentConfig)
-+    {
-+        return [];
-+    }
-+}
-diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml
-new file mode 100644
-index 00000000000..084f4ce92f0
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="SetGroupForValidVATIdIntraUnionActionGroup">
-+        <arguments>
-+            <argument name="value" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminStoresCustomerConfigurationPage.url}}" stepKey="navigateToCustomerConfigurationPage" />
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <conditionalClick stepKey="expandCreateNewAccountOptionsTab" selector="{{AdminStoresCustomerConfigurationSection.createNewAccOpt}}" dependentSelector="{{AdminStoresCustomerConfigurationSection.enableAutoAssignCustomerGroup}}" visible="false"/>
-+        <waitForElementVisible selector="{{AdminStoresCustomerConfigurationSection.createNewAccOpt}}" stepKey="waitForElementsAppeared"/>
-+        <selectOption selector="{{AdminStoresCustomerConfigurationSection.groupForValidVATIdIntraUnion}}" userInput="{{value}}" stepKey="selectValue"/>
-+        <click selector="{{AdminStoresCustomerConfigurationSection.createNewAccOpt}}" stepKey="collapseTab" />
-+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
-+        <waitForPageLoad stepKey="waitForConfigSaved"/>
-+        <see userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSaveConfigActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSaveConfigActionGroup.xml
-new file mode 100644
-index 00000000000..6ed0cfe95cb
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSaveConfigActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSaveConfigActionGroup">
-+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="clickSaveConfigBtn"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminAccountSharingActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminAccountSharingActionGroup.xml
-index 51155423e62..00bda74c7b5 100644
---- a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminAccountSharingActionGroup.xml
-+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminAccountSharingActionGroup.xml
-@@ -7,16 +7,22 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
--<actionGroup name="ConfigAdminAccountSharingActionGroup">
--    <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/system_config/edit/section/admin/" stepKey="navigateToConfigurationPage" />
--    <waitForPageLoad stepKey="wait1"/>
--    <conditionalClick stepKey="expandSecurityTab" selector="{{AdminSection.SecurityTab}}" dependentSelector="{{AdminSection.CheckIfTabExpand}}" visible="true" />
--    <waitForElementVisible selector="{{AdminSection.AdminAccountSharing}}" stepKey="waitForAdminAccountSharingDrpDown" />
--    <uncheckOption selector="{{AdminSection.EnableSystemValue}}" stepKey="uncheckUseSystemValue"/>
--    <selectOption selector="{{AdminSection.AdminAccountSharing}}" userInput="Yes" stepKey="selectYes"/>
--    <click selector="{{AdminSection.SecurityTab}}" stepKey="clollapseSecurityTab" />
--    <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
--</actionGroup>
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="ConfigAdminAccountSharingActionGroup">
-+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/system_config/edit/section/admin/" stepKey="navigateToConfigurationPage" />
-+        <waitForPageLoad stepKey="wait1"/>
-+        <conditionalClick stepKey="expandSecurityTab" selector="{{AdminSection.SecurityTab}}" dependentSelector="{{AdminSection.CheckIfTabExpand}}" visible="true" />
-+        <waitForElementVisible selector="{{AdminSection.AdminAccountSharing}}" stepKey="waitForAdminAccountSharingDrpDown" />
-+        <uncheckOption selector="{{AdminSection.EnableSystemValue}}" stepKey="uncheckUseSystemValue"/>
-+        <selectOption selector="{{AdminSection.AdminAccountSharing}}" userInput="Yes" stepKey="selectYes"/>
-+        <click selector="{{AdminSection.SecurityTab}}" stepKey="clollapseSecurityTab" />
-+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
-+    </actionGroup>
-+    <actionGroup name="EnableAdminAccountSharingActionGroup">
-+        <createData stepKey="setConfig" entity="EnableAdminAccountSharing"/>
-+    </actionGroup>
-+    <actionGroup name="DisableAdminAccountSharingActionGroup">
-+        <createData stepKey="setConfig" entity="DisableAdminAccountSharing"/>
-+    </actionGroup>
- </actionGroups>
- 
-diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminCatalogSearchActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminCatalogSearchActionGroup.xml
-new file mode 100644
-index 00000000000..2109b1cdbb5
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminCatalogSearchActionGroup.xml
-@@ -0,0 +1,36 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="ChooseElasticSearchAsSearchEngine">
-+        <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="configureSearchEngine"/>
-+        <waitForPageLoad stepKey="waitForConfigPage"/>
-+        <scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCatalogSearchTab"/>
-+        <conditionalClick selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" dependentSelector="{{AdminCatalogSearchConfigurationSection.checkIfCatalogSearchTabExpand}}" visible="true" stepKey="expandCatalogSearchTab"/>
-+        <waitForElementVisible selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" stepKey="waitForDropdownToBeVisible"/>
-+        <uncheckOption selector="{{AdminCatalogSearchConfigurationSection.searchEngineDefaultSystemValue}}" stepKey="uncheckUseSystemValue"/>
-+        <selectOption selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" userInput="elasticsearch5" stepKey="chooseES5"/>
-+        <!--<scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCatalogSearchTab2"/>-->
-+        <!--<click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseCatalogSearchTab"/>-->
-+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfiguration"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigurationSuccessMessage"/>
-+    </actionGroup>
-+    <actionGroup name="ResetSearchEngineConfiguration">
-+        <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="resetSearchEngine"/>
-+        <waitForPageLoad stepKey="waitForConfigPage2"/>
-+        <scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCatalogSearchTab2"/>
-+        <conditionalClick selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" dependentSelector="{{AdminCatalogSearchConfigurationSection.checkIfCatalogSearchTabExpand}}" visible="true" stepKey="expandCatalogSearchTab2"/>
-+        <waitForElementVisible selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" stepKey="waitForDropdownToBeVisible2"/>
-+        <selectOption selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" userInput="mysql" stepKey="chooseMySQL"/>
-+        <checkOption selector="{{AdminCatalogSearchConfigurationSection.searchEngineDefaultSystemValue}}" stepKey="checkUseSystemValue"/>
-+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfiguration2"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigurationSuccessMessage2"/>
-+    </actionGroup>
-+
-+</actionGroups>
-diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigSalesTaxClassActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigSalesTaxClassActionGroup.xml
-index 7bb2441a6a5..4e9319351a1 100644
---- a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigSalesTaxClassActionGroup.xml
-+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigSalesTaxClassActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="SetTaxClassForShipping">
-         <amOnPage url="{{AdminSalesTaxClassPage.url}}" stepKey="navigateToSalesTaxPage"/>
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-@@ -28,4 +28,32 @@
-         <click selector="{{SalesConfigSection.TaxClassesTab}}" stepKey="collapseTaxClassesTab"/>
-         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfiguration"/>
-     </actionGroup>
--    </actionGroups>
-\ No newline at end of file
-+    <actionGroup name="SetTaxApplyOnSetting">
-+        <arguments>
-+            <argument name="userInput" type="string"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationSettings}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationAlgorithm}}" visible="false" stepKey="openTaxCalcSettingsSection"/>
-+        <scrollTo selector="{{AdminConfigureTaxSection.taxCalculationApplyTaxOnInherit}}" x="0" y="-80" stepKey="goToCheckbox"/>
-+        <uncheckOption selector="{{AdminConfigureTaxSection.taxCalculationApplyTaxOnInherit}}" stepKey="enableApplyTaxOnSetting"/>
-+        <selectOption selector="{{AdminConfigureTaxSection.taxCalculationApplyTaxOn}}" userInput="{{userInput}}" stepKey="setApplyTaxOn"/>
-+        <scrollTo selector="{{SalesConfigSection.TaxClassesTab}}" stepKey="scrollToTop"/>
-+        <click selector="{{AdminConfigureTaxSection.taxCalculationSettings}}" stepKey="collapseCalcSettingsTab"/>
-+        <click selector="{{AdminConfigureTaxSection.save}}" stepKey="saveConfig"/>
-+        <waitForPageLoad stepKey="waitForConfigSaved"/>
-+        <see userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+    <actionGroup name="DisableTaxApplyOnOriginalPrice">
-+        <arguments>
-+            <argument name="userInput" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminSalesTaxClassPage.url}}" stepKey="navigateToSalesTaxPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationSettings}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationAlgorithm}}" visible="false" stepKey="openTaxCalcSettingsSection"/>
-+        <scrollTo selector="{{AdminConfigureTaxSection.taxCalculationApplyTaxOnInherit}}" x="0" y="-80" stepKey="goToCheckbox"/>
-+        <selectOption selector="{{AdminConfigureTaxSection.taxCalculationApplyTaxOn}}" userInput="{{userInput}}" stepKey="setApplyTaxOff"/>
-+        <checkOption selector="{{AdminConfigureTaxSection.taxCalculationApplyTaxOnInherit}}" stepKey="disableApplyTaxOnSetting"/>
-+        <click selector="{{AdminConfigureTaxSection.save}}" stepKey="saveConfig"/>
-+        <waitForPageLoad stepKey="waitForConfigSaved"/>
-+        <see userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
-index 80351c9d975..eefaf5f3b53 100644
---- a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
-+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
-@@ -7,27 +7,23 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="EnabledWYSIWYG">
--        <amOnPage url="admin/admin/system_config/edit/section/cms/" stepKey="navigateToConfigurationPage" />
--        <waitForPageLoad stepKey="wait1"/>
--        <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
--        <waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown1" />
--        <waitForElementVisible  selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="waitForUseSystemValueVisible"/>
--        <uncheckOption selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="uncheckUseSystemValue"/>
--        <selectOption selector="{{ContentManagementSection.EnableWYSIWYG}}" userInput="Enabled by Default" stepKey="selectOption1"/>
-+        <magentoCLI stepKey="enableWYSIWYG" command="config:set cms/wysiwyg/enabled enabled"/>
-+    </actionGroup>
-+    <actionGroup name="SwitchToTinyMCE3">
-+        <comment userInput="Choose TinyMCE3 as the default editor" stepKey="chooseTinyMCE3AsEditor"/>
-+        <conditionalClick stepKey="expandWYSIWYGOptions1" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
-+        <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox2" />
-+        <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue2"/>
-+        <waitForElementVisible selector="{{ContentManagementSection.Switcher}}" stepKey="waitForSwitcherDropdown2" />
-+        <selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 3" stepKey="switchToVersion3" />
-         <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
-         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigurationSuccessMessage"/>
-     </actionGroup>
-     <actionGroup name="DisabledWYSIWYG">
--        <amOnPage url="admin/admin/system_config/edit/section/cms/" stepKey="navigateToConfigurationPage" />
--        <waitForPageLoad stepKey="wait3"/>
--        <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
--        <waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown2" />
--        <uncheckOption selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="uncheckUseSystemValue"/>
--        <selectOption selector="{{ContentManagementSection.EnableWYSIWYG}}" userInput="Disabled Completely" stepKey="selectOption2"/>
--        <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
--        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
-+        <magentoCLI stepKey="disableWYSIWYG" command="config:set cms/wysiwyg/enabled disabled"/>
-     </actionGroup>
-     <actionGroup name="UseStaticURLForMediaContentInWYSIWYG">
-         <arguments>
-@@ -42,4 +38,15 @@
-         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
-         <waitForPageLoad stepKey="waitForPageLoad2" />
-     </actionGroup>
-+    <actionGroup name="EnabledWYSIWYGEditor">
-+        <amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <conditionalClick selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.EnableWYSIWYG}}" visible="false" stepKey="expandWYSIWYGOptionsTab"/>
-+        <waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitTabToExpand"/>
-+        <uncheckOption selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="enableEnableSystemValue"/>
-+        <selectOption selector="{{ContentManagementSection.EnableWYSIWYG}}" userInput="Enabled by Default" stepKey="enableWYSIWYG"/>
-+        <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptionsTab"/>
-+        <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
-+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration."/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWebUrlOptionsActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWebUrlOptionsActionGroup.xml
-index 056b89624a2..f1e0ea6b7e1 100644
---- a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWebUrlOptionsActionGroup.xml
-+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWebUrlOptionsActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="EnableWebUrlOptions">
-         <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
-index c3c0430a3d5..14eca30d0f7 100644
---- a/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
-+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
-@@ -7,11 +7,47 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="NavigateToDefaultLayoutsSetting">
-         <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-         <conditionalClick stepKey="expandDefaultLayouts" selector="{{WebSection.DefaultLayoutsTab}}" dependentSelector="{{WebSection.CheckIfTabExpand}}" visible="true" />
-         <waitForElementVisible selector="{{DefaultLayoutsSection.categoryLayout}}" stepKey="waittForDefaultCategoryLayout" />
-     </actionGroup>
-+
-+    <actionGroup name="NavigateToConfigurationGeneralPage">
-+        <amOnPage url="{{AdminConfigGeneralPage.url}}" stepKey="navigateToConfigGeneralPage"/>
-+        <waitForPageLoad stepKey="waitForConfigPageLoad"/>
-+    </actionGroup>
-+
-+    <actionGroup name="SelectTopDestinationsCountry">
-+        <arguments>
-+            <argument name="countries" type="entity"/>
-+        </arguments>
-+        <selectOption selector="{{CountryOptionsSection.topDestinations}}" parameterArray="[{{countries.country}}]" stepKey="selectTopDestinationsCountry"/>
-+        <click selector="#save" stepKey="saveConfig"/>
-+        <waitForPageLoad stepKey="waitForSavingConfig"/>
-+    </actionGroup>
-+
-+    <actionGroup name="UnSelectTopDestinationsCountry">
-+        <arguments>
-+            <argument name="countries" type="entity"/>
-+        </arguments>
-+        <unselectOption selector="{{CountryOptionsSection.topDestinations}}" parameterArray="[{{countries.country}}]" stepKey="unSelectTopDestinationsCountry"/>
-+        <click selector="#save" stepKey="saveConfig"/>
-+        <waitForPageLoad stepKey="waitForSavingConfig"/>
-+    </actionGroup>
-+
-+    <actionGroup name="SelectCountriesWithRequiredRegion">
-+        <arguments>
-+            <argument name="countries" type="entity"/>
-+        </arguments>
-+        <amOnPage url="{{AdminConfigGeneralPage.url}}" stepKey="navigateToAdminConfigGeneralPage"/>
-+        <conditionalClick selector="{{StateOptionsSection.stateOptions}}" dependentSelector="{{StateOptionsSection.countriesWithRequiredRegions}}" visible="false" stepKey="expandStateOptionsTab" />
-+        <waitForAjaxLoad stepKey="waitForAjax"/>
-+        <scrollTo selector="{{StateOptionsSection.countriesWithRequiredRegions}}" stepKey="scrollToForm"/>
-+        <selectOption selector="{{StateOptionsSection.countriesWithRequiredRegions}}" parameterArray="[{{countries.country}}]" stepKey="selectCountriesWithRequiredRegion"/>
-+        <click selector="#save" stepKey="saveConfig"/>
-+        <waitForPageLoad stepKey="waitForSavingConfig"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
-index 670cd236be8..e9e899a68c3 100644
---- a/app/code/Magento/Config/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
-+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="RestoreLayoutSetting">
-         <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitcherActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitcherActionGroup.xml
-index 172ace8b18c..f29ee1a4072 100644
---- a/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitcherActionGroup.xml
-+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitcherActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="SwitchToVersion4ActionGroup">
-         <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
-         <waitForPageLoad stepKey="waitForConfigPageToLoad"/>
-diff --git a/app/code/Magento/Config/Test/Mftf/Data/AllowGuestCheckoutData.xml b/app/code/Magento/Config/Test/Mftf/Data/AllowGuestCheckoutData.xml
-new file mode 100644
-index 00000000000..f89cdf1a87b
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Data/AllowGuestCheckoutData.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="EnableAllowGuestCheckout" type="allow_guest_checkout_config">
-+        <requiredEntity type="guest_checkout">AllowGuestCheckoutYes</requiredEntity>
-+    </entity>
-+    <entity name="AllowGuestCheckoutYes" type="guest_checkout">
-+        <data key="value">1</data>
-+    </entity>
-+
-+    <entity name="DisableAllowGuestCheckout" type="allow_guest_checkout_config">
-+        <requiredEntity type="guest_checkout">AllowGuestCheckoutNo</requiredEntity>
-+    </entity>
-+    <entity name="AllowGuestCheckoutNo" type="guest_checkout">
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
-new file mode 100644
-index 00000000000..53ca46e7462
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="EnableAdminAccountAllowCountry" type="admin_account_country_options_config">
-+        <requiredEntity type="admin_account_country_options_value">AdminAccountAllowCountryUS</requiredEntity>
-+    </entity>
-+    <entity name="AdminAccountAllowCountryUS" type="admin_account_country_options_value">
-+        <data key="value">US</data>
-+    </entity>
-+
-+    <entity name="DisableAdminAccountAllowCountry" type="default_admin_account_country_options_config">
-+        <requiredEntity type="checkoutTotalFlagZero">DefaultAdminAccountAllowCountry</requiredEntity>
-+    </entity>
-+    <entity name="DefaultAdminAccountAllowCountry" type="checkoutTotalFlagZero">
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml b/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml
-new file mode 100644
-index 00000000000..5647283fae1
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="SetLocaleOptions" type="locale_options_config">
-+        <requiredEntity type="code">setLocaleOptionsFrance</requiredEntity>
-+    </entity>
-+    <entity name="setLocaleOptionsFrance" type="code">
-+        <data key="value">fr_FR</data>
-+    </entity>
-+
-+    <entity name="DefaultLocaleOptions" type="locale_options_config">
-+        <requiredEntity type="code">setLocaleOptionsUSA</requiredEntity>
-+    </entity>
-+    <entity name="setLocaleOptionsUSA" type="code">
-+        <data key="value">en_US</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.xml
-new file mode 100644
-index 00000000000..85188eb6e04
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminAccountSharingYes" type="admin_account_sharing_value">
-+        <data key="value">Yes</data>
-+    </entity>
-+    <entity name="AdminAccountSharingNo" type="admin_account_sharing_value">
-+        <data key="value">No</data>
-+    </entity>
-+    <entity name="EnableAdminAccountSharing" type="admin_account_sharing_config">
-+        <requiredEntity type="admin_account_sharing_value">AdminAccountSharingYes</requiredEntity>
-+    </entity>
-+    <entity name="DisableAdminAccountSharing" type="admin_account_sharing_config">
-+        <requiredEntity type="admin_account_sharing_value">AdminAccountSharingNo</requiredEntity>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml
-new file mode 100644
-index 00000000000..eda0eb904be
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="DefaultWebUrlOptionsConfig" type="web_url_use_store">
-+        <requiredEntity type="url_use_store_value">DefaultConfigWebUrlOptions</requiredEntity>
-+    </entity>
-+    <entity name="DefaultConfigWebUrlOptions" type="url_use_store_value">
-+        <data key="value">0</data>
-+    </entity>
-+
-+    <entity name="EnableWebUrlOptionsConfig" type="web_url_use_store">
-+        <requiredEntity type="url_use_store_value">WebUrlOptionsYes</requiredEntity>
-+    </entity>
-+    <entity name="WebUrlOptionsYes" type="url_use_store_value">
-+        <data key="value">1</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/allow_guest_checkout-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/allow_guest_checkout-meta.xml
-new file mode 100644
-index 00000000000..052d9b65747
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Metadata/allow_guest_checkout-meta.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="AllowGuestCheckoutConfig" dataType="allow_guest_checkout_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/checkout/" method="POST">
-+        <object key="groups" dataType="allow_guest_checkout_config">
-+            <object key="options" dataType="allow_guest_checkout_config">
-+                <object key="fields" dataType="allow_guest_checkout_config">
-+                    <object key="guest_checkout" dataType="guest_checkout">
-+                        <field key="value">string</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml
-new file mode 100644
-index 00000000000..055a9896cd2
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="GeneralLocaleOptionsConfig" dataType="locale_options_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/general/" method="POST">
-+        <object key="groups" dataType="locale_options_config">
-+            <object key="locale" dataType="locale_options_config">
-+                <object key="fields" dataType="locale_options_config">
-+                    <object key="code" dataType="code">
-+                        <field key="value">string</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
-new file mode 100644
-index 00000000000..bd16c225af5
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
-@@ -0,0 +1,35 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="AdminAccountCountryOptionConfig" dataType="admin_account_country_options_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/general/" method="POST">
-+        <object key="groups" dataType="admin_account_country_options_config">
-+            <object key="country" dataType="admin_account_country_options_config">
-+                 <object key="fields" dataType="admin_account_country_options_config">
-+                    <object key="allow" dataType="admin_account_country_options_value">
-+                        <field key="value">string</field>
-+                    </object>
-+                 </object>
-+            </object>
-+        </object>
-+    </operation>
-+
-+    <operation name="DefaultAdminAccountCountryOptionConfig" dataType="default_admin_account_country_options_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/general/" method="POST">
-+        <object key="groups" dataType="default_admin_account_country_options_config">
-+            <object key="country" dataType="default_admin_account_country_options_config">
-+                <object key="fields" dataType="default_admin_account_country_options_config">
-+                    <object key="allow" dataType="default_admin_account_country_options_config">
-+                        <object key="inherit" dataType="checkoutTotalFlagZero">
-+                            <field key="value">string</field>
-+                        </object>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml
-new file mode 100644
-index 00000000000..e7544c4e8ae
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="AdminAccountSharingConfig" dataType="admin_account_sharing_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/admin/" method="POST">
-+        <object key="groups" dataType="admin_account_sharing_config">
-+            <object key="security" dataType="admin_account_sharing_config">
-+                 <object key="fields" dataType="admin_account_sharing_config">
-+                    <object key="admin_account_sharing" dataType="admin_account_sharing_value">
-+                        <field key="value">string</field>
-+                    </object>
-+                 </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml
-new file mode 100644
-index 00000000000..fc14ba7bbab
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="WebUrlOptionsConfig" dataType="web_url_use_store" type="create" auth="adminFormKey" url="/admin/system_config/save/section/web/"
-+               method="POST" successRegex="/messages-message-success/" returnRegex="">
-+        <object key="groups" dataType="web_url_use_store">
-+            <object key="url" dataType="web_url_use_store">
-+                 <object key="fields" dataType="web_url_use_store">
-+                    <object key="use_store" dataType="url_use_store_value">
-+                        <field key="value">string</field>
-+                    </object>
-+                 </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml
-new file mode 100644
-index 00000000000..d38035cd5e0
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminCatalogSearchConfigurationPage" url="admin/system_config/edit/section/catalog/" area="admin" module="Magento_Config">
-+        <section name="AdminCatalogSearchConfigurationSection"/>
-+        <section name="AdminCatalogSearchEngineConfigurationSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
-index 8d5aaa5830b..7a62dfff832 100644
---- a/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
-+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminConfigPage" url="admin/system_config/" area="admin" module="Magento_Config">
-         <section name="AdminConfigSection"/>
-     </page>
-@@ -18,4 +18,7 @@
-     <page name="AdminSalesTaxClassPage" url="admin/system_config/edit/section/tax/" area="admin" module="Magento_Config">
-         <section name="SalesTaxClassSection"/>
-     </page>
-+    <page name="AdminConfigGeneralPage" url="admin/system_config/edit/section/general/" area="admin" module="Magento_Config">
-+        <section name="GeneralSection"/>
-+    </page>
- </pages>
-diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminSalesConfigPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminSalesConfigPage.xml
-index 1a99ff6533d..7897a181ff4 100644
---- a/app/code/Magento/Config/Test/Mftf/Page/AdminSalesConfigPage.xml
-+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminSalesConfigPage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminSalesConfigPage" url="admin/system_config/edit/section/sales/{{var1}}" area="admin" parameterized="true" module="Magento_Config">
-         <section name="AdminSalesConfigSection"/>
-     </page>
-diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminStoresCustomerConfigurationPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminStoresCustomerConfigurationPage.xml
-new file mode 100644
-index 00000000000..6a4efb6b9e1
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminStoresCustomerConfigurationPage.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminStoresCustomerConfigurationPage" url="admin/system_config/edit/section/customer/" area="admin" module="Magento_Config">
-+        <section name="AdminStoresCustomerConfigurationSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminCatalogSearchEngineConfigurationSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminCatalogSearchEngineConfigurationSection.xml
-new file mode 100644
-index 00000000000..570d831ce58
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminCatalogSearchEngineConfigurationSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCatalogSearchEngineConfigurationSection">
-+        <element name="searchEngineOptimization" type="button" selector="#catalog_seo-head"/>
-+        <element name="openedEngineOptimization" type="button" selector="#catalog_seo-head.open"/>
-+        <element name="systemValueUseCategoriesPath" type="checkbox" selector="#catalog_seo_product_use_categories_inherit"/>
-+        <element name="selectUseCategoriesPatForProductUrls" type="select" selector="#catalog_seo_product_use_categories"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
-index a1b8c2f62f7..b5bfe9cc2ea 100644
---- a/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
-+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
-@@ -5,19 +5,13 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminConfigSection">
--        <element name="advancedReportingMenuItem" type="text" selector="//a[contains(concat(' ',normalize-space(@class),' '),'item-nav')]/span[text()='Advanced Reporting']"/>
--        <element name="advancedReportingService" type="select" selector="#analytics_general_enabled"/>
--        <element name="advancedReportingServiceLabel" type="text" selector="#row_analytics_general_enabled>td.label>label>span"/>
--        <element name="advancedReportingServiceStatus" type="text" selector="#row_analytics_general_enabled>td.value>p>span"/>
--        <element name="advancedReportingIndustry" type="select" selector="#analytics_general_vertical"/>
--        <element name="advancedReportingIndustryLabel" type="text" selector=".config-vertical-label>label>span"/>
--        <element name="advancedReportingHour" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(2)"/>
--        <element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(3)"/>
--        <element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
--        <element name="advancedReportingBlankIndustryError" type="text" selector=".message-error>div"/>
--        <element name="advancedReportingSuccessMessage" type="text" selector=".message-success>div"/>
-         <element name="saveButton" type="button" selector="#save"/>
-+        <element name="generalTab" type="text" selector="//div[@class='admin__page-nav-title title _collapsible']//strong[text()='General']"/>
-+        <element name="generalTabClosed" type="text" selector="//div[@class='admin__page-nav-title title _collapsible' and @aria-expanded='false' or @aria-expanded='0']//strong[text()='General']"/>
-+        <element name="generalTabOpened" type="text" selector="//div[@class='admin__page-nav-title title _collapsible' and @aria-expanded='true' or @aria-expanded='1']//strong[text()='General']"/>
-+        <element name="defaultConfigButton" type="button" selector="#store-change-button" timeout="30"/>
-+        <element name="defaultConfigDropdown" type="button" selector="//ul[@class='dropdown-menu']" timeout="30"/>
-     </section>
- </sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
-index 4897e8415c1..1c2e2603566 100644
---- a/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
-+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
-@@ -5,9 +5,13 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminSalesConfigSection">
-         <element name="enableMAPUseSystemValue" type="checkbox" selector="#sales_msrp_enabled_inherit"/>
-         <element name="enableMAPSelect" type="select" selector="#sales_msrp_enabled"/>
-+        <element name="giftOptions" type="select" selector="#sales_gift_options-head"/>
-+        <element name="allowGiftReceipt" type="select" selector="#sales_gift_options_allow_gift_receipt"/>
-+        <element name="allowPrintedCard" type="select" selector="#sales_gift_options_allow_printed_card"/>
-+        <element name="go" type="select" selector="//a[@id='sales_gift_options-head']/ancestor::div[@class='entry-edit-head admin__collapsible-block']"/>
-     </section>
- </sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml
-index 8278c6366b6..7b6c9f8ab3b 100644
---- a/app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml
-+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminSection">
-         <element name="CheckIfTabExpand" type="button" selector="#admin_security-head:not(.open)"/>
-         <element name="SecurityTab" type="button" selector="#admin_security-head"/>
-diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml
-new file mode 100644
-index 00000000000..823be383ce1
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminStoresCustomerConfigurationSection">
-+        <element name="createNewAccOpt" type="button" selector="#customer_create_account-head"/>
-+        <element name="enableAutoAssignCustomerGroup" type="button" selector="#customer_create_account_auto_group_assign"/>
-+        <element name="groupForValidVATIdIntraUnion" type="select" selector="#customer_create_account_viv_intra_union_group"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
-new file mode 100644
-index 00000000000..e82ad4670f9
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCatalogSearchConfigurationSection">
-+        <element name="catalogSearchTab" type="button" selector="#catalog_search-head"/>
-+        <element name="checkIfCatalogSearchTabExpand" type="button" selector="#catalog_search-head:not(.open)"/>
-+        <element name="searchEngineDefaultSystemValue" type="checkbox" selector="#catalog_search_engine_inherit"/>
-+        <element name="searchEngine" type="select" selector="#catalog_search_engine"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml b/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml
-index 78b9d1f72f6..e024d9e5b2e 100644
---- a/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml
-+++ b/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml
-@@ -7,9 +7,28 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CatalogSection">
-         <element name="storefront" type="select" selector="#catalog_frontend-head"/>
-         <element name="CheckIfTabExpand" type="button" selector="#catalog_frontend-head:not(.open)"/>
-+        <element name="price" type="button" selector="#catalog_price-head"/>
-+        <element name="checkIfPriceExpand" type="button" selector="//a[@id='catalog_price-head' and @class='open']"/>
-+        <element name="catalogPriceScope" type="select" selector="#catalog_price_scope"/>
-+        <element name="catalogPriceScopeValue" type="select" selector="//select[@id='catalog_price_scope']/option[text()='{{args}}']" parameterized="true"/>
-+        <element name="defaultProductPrice" type="input" selector="#catalog_price_default_product_price"/>
-+        <element name="save" type="button" selector="#save"/>
-+        <element name="flatCatalogCategoryCheckBox" type="checkbox" selector="#catalog_frontend_flat_catalog_category_inherit"/>
-+        <element name="flatCatalogCategory" type="select" selector="#catalog_frontend_flat_catalog_category"/>
-+        <element name="flatCatalogProduct" type="select" selector="#catalog_frontend_flat_catalog_product"/>
-+        <element name="seo" type="button" selector="#catalog_seo-head"/>
-+        <element name="CheckIfSeoTabExpand" type="button" selector="#catalog_seo-head:not(.open)"/>
-+        <element name="GenerateUrlRewrites" type="select" selector="#catalog_seo_generate_category_product_rewrites"/>
-+        <element name="successMessage" type="text" selector="#messages"/>
-+    </section>
-+    <section name="GenerateUrlRewritesConfirm">
-+        <element name="title" type="text" selector=".modal-popup.confirm h1.modal-title"/>
-+        <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
-+        <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
-+        <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
-index 18e91dc017c..9bce5065317 100644
---- a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
-+++ b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
-@@ -7,16 +7,17 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="ContentManagementSection">
--        <element name="WYSIWYGOptions" type="button" selector="#cms_wysiwyg-head"/>
-+        <element name="WYSIWYGOptions" type="button" selector="#cms_wysiwyg-head" timeout="60"/>
-         <element name="CheckIfTabExpand" type="button" selector="#cms_wysiwyg-head:not(.open)"/>
-         <element name="EnableSystemValue" type="button" selector="#cms_wysiwyg_enabled_inherit"/>
-         <element name="EnableWYSIWYG" type="button" selector="#cms_wysiwyg_enabled"/>
--        <element name="SwitcherSystemValue" type="button" selector="#cms_wysiwyg_editor_inherit"/>
-+        <element name="SwitcherSystemValue" type="button" selector="#cms_wysiwyg_editor_inherit" timeout="60"/>
-         <element name="Switcher" type="button" selector="#cms_wysiwyg_editor" />
-         <element name="StaticURL" type="button" selector="#cms_wysiwyg_use_static_urls_in_catalog" />
--        <element name="Save" type="button" selector="#save"/>
-+        <element name="Save" type="button" selector="#save" timeout="30"/>
-+        <element name="StoreConfigurationPageSuccessMessage" type="text" selector="#messages [data-ui-id='messages-message-success']"/>
-     </section>
-     <section name="WebSection">
-         <element name="DefaultLayoutsTab" type="button" selector="#web_default_layouts-head"/>
-@@ -33,4 +34,14 @@
-         <element name="addStoreCodeToUrl" type="select" selector="#web_url_use_store"/>
-         <element name="systemValueForStoreCode" type="checkbox" selector="#web_url_use_store_inherit"/>
-     </section>
-+    <section name="CountryOptionsSection">
-+        <element name="countryOptions" type="button" selector="#general_country-head"/>
-+        <element name="countryOptionsOpen" type="button" selector="#general_country-head.open"/>
-+        <element name="topDestinations" type="select" selector="#general_country_destinations"/>
-+    </section>
-+    <section name="StateOptionsSection">
-+        <element name="stateOptions" type="button" selector="#general_region-head"/>
-+        <element name="countriesWithRequiredRegions" type="select" selector="#general_region_state_required"/>
-+        <element name="allowToChooseState" type="select" selector="general_region_display_all"/>
-+    </section>
- </sections>
-diff --git a/app/code/Magento/Config/Test/Mftf/Section/SalesConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/SalesConfigSection.xml
-index f1520f5813e..fbe1fd77eaa 100644
---- a/app/code/Magento/Config/Test/Mftf/Section/SalesConfigSection.xml
-+++ b/app/code/Magento/Config/Test/Mftf/Section/SalesConfigSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="SalesConfigSection">
-         <element name="TaxClassesTab" type="button" selector="#tax_classes-head"/>
-         <element name="CheckIfTaxClassesTabExpand" type="button" selector="#tax_classes-head:not(.open)"/>
-diff --git a/app/code/Magento/Config/Test/Mftf/Section/StoreConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/StoreConfigSection.xml
-index 0ff3f3ca55d..52fc0018a94 100644
---- a/app/code/Magento/Config/Test/Mftf/Section/StoreConfigSection.xml
-+++ b/app/code/Magento/Config/Test/Mftf/Section/StoreConfigSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StoreConfigSection">
-         <element name="CheckIfTabExpand" type="button" selector="#general_store_information-head:not(.open)"/>
-         <element name="StoreInformation" type="button" selector="#general_store_information-head"/>
-diff --git a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
-new file mode 100644
-index 00000000000..b0a7ee07dda
---- /dev/null
-+++ b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
-@@ -0,0 +1,45 @@
-+<?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="CheckingCountryDropDownWithOneAllowedCountryTest">
-+        <annotations>
-+            <features value="Config"/>
-+            <stories value="MAGETWO-96107: Additional blank option in country dropdown"/>
-+            <title value="Checking country drop-down with one allowed country"/>
-+            <description value="Check country drop-down with one allowed country"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-96133"/>
-+            <group value="configuration"/>
-+        </annotations>
-+        <before>
-+            <createData entity="EnableAdminAccountAllowCountry" stepKey="setAllowedCountries"/>
-+        </before>
-+        <after>
-+            <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
-+                <argument name="customerEmail" value="CustomerEntityOne.email"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearFilters"/>
-+            <waitForPageLoad stepKey="WaitForPageToLoad"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+         <!--Flush Magento Cache-->
-+        <magentoCLI stepKey="flushCache" command="cache:flush"/>
-+         <!--Create a customer account from Storefront-->
-+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="createAnAccount">
-+            <argument name="Customer" value="CustomerEntityOne"/>
-+        </actionGroup>
-+        <click selector="{{CheckoutPaymentSection.addressBook}}" stepKey="goToAddressBook"/>
-+        <click selector="{{StorefrontCustomerAddressSection.country}}" stepKey="clickToExpandCountryDropDown"/>
-+        <see selector="{{StorefrontCustomerAddressSection.country}}" userInput="United States" stepKey="seeSelectedCountry"/>
-+        <dontSee selector="{{StorefrontCustomerAddressSection.country}}" userInput="Brazil" stepKey="canNotSeeSelectedCountry"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml b/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml
-index 0e1a6f4717c..66aacf706b0 100644
---- a/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml
-+++ b/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="VerifyAllowDynamicMediaURLsSettingIsRemoved">
-         <annotations>
-             <features value="Backend"/>
-diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php
-deleted file mode 100644
-index 40aa110382e..00000000000
---- a/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php
-+++ /dev/null
-@@ -1,181 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Config\Test\Unit\App\Config\Type;
--
--use Magento\Config\App\Config\Type\System;
--use Magento\Framework\App\Config\ConfigSourceInterface;
--use Magento\Framework\App\Config\Spi\PostProcessorInterface;
--use Magento\Framework\App\Config\Spi\PreProcessorInterface;
--use Magento\Framework\Cache\FrontendInterface;
--use Magento\Framework\Serialize\SerializerInterface;
--use Magento\Store\Model\Config\Processor\Fallback;
--use Magento\Config\App\Config\Type\System\Reader;
--
--/**
-- * Test how Class process source, cache them and retrieve value by path
-- * @package Magento\Config\Test\Unit\App\Config\Type
-- */
--class SystemTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var ConfigSourceInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $source;
--
--    /**
--     * @var PostProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $postProcessor;
--
--    /**
--     * @var PreProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $preProcessor;
--
--    /**
--     * @var Fallback|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $fallback;
--
--    /**
--     * @var FrontendInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $cache;
--
--    /**
--     * @var System
--     */
--    private $configType;
--
--    /**
--     * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $serializer;
--
--    /**
--     * @var Reader|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $reader;
--
--    public function setUp()
--    {
--        $this->source = $this->getMockBuilder(ConfigSourceInterface::class)
--            ->getMockForAbstractClass();
--        $this->postProcessor = $this->getMockBuilder(PostProcessorInterface::class)
--            ->getMockForAbstractClass();
--        $this->fallback = $this->getMockBuilder(Fallback::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->cache = $this->getMockBuilder(FrontendInterface::class)
--            ->getMockForAbstractClass();
--        $this->preProcessor = $this->getMockBuilder(PreProcessorInterface::class)
--            ->getMockForAbstractClass();
--        $this->serializer = $this->getMockBuilder(SerializerInterface::class)
--            ->getMock();
--        $this->reader = $this->getMockBuilder(Reader::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->configType = new System(
--            $this->source,
--            $this->postProcessor,
--            $this->fallback,
--            $this->cache,
--            $this->serializer,
--            $this->preProcessor,
--            1,
--            'system',
--            $this->reader
--        );
--    }
--
--    public function testGetCachedWithLoadDefaultScopeData()
--    {
--        $path = 'default/dev/unsecure/url';
--        $url = 'http://magento.test/';
--        $data = [
--            'dev' => [
--                'unsecure' => [
--                    'url' => $url
--                ]
--            ]
--        ];
--
--        $this->cache->expects($this->any())
--            ->method('load')
--            ->willReturnOnConsecutiveCalls('1', serialize($data));
--        $this->serializer->expects($this->once())
--            ->method('unserialize')
--            ->willReturn($data);
--        $this->assertEquals($url, $this->configType->get($path));
--    }
--
--    public function testGetCachedWithLoadAllData()
--    {
--        $url = 'http://magento.test/';
--        $data = [
--            'dev' => [
--                'unsecure' => [
--                    'url' => $url
--                ]
--            ]
--        ];
--
--        $this->cache->expects($this->any())
--            ->method('load')
--            ->willReturnOnConsecutiveCalls('1', serialize($data));
--        $this->serializer->expects($this->once())
--            ->method('unserialize')
--            ->willReturn($data);
--        $this->assertEquals($data, $this->configType->get(''));
--    }
--
--    public function testGetNotCached()
--    {
--        $path = 'stores/default/dev/unsecure/url';
--        $url = 'http://magento.test/';
--
--        $dataToCache = [
--            'unsecure' => [
--                'url' => $url
--            ]
--        ];
--        $data = [
--            'default' => [],
--            'websites' => [],
--            'stores' => [
--                'default' => [
--                    'dev' => [
--                        'unsecure' => [
--                            'url' => $url
--                        ]
--                    ]
--                ]
--            ]
--        ];
--        $this->cache->expects($this->any())
--            ->method('load')
--            ->willReturnOnConsecutiveCalls(false, false);
--
--        $this->serializer->expects($this->atLeastOnce())
--            ->method('serialize')
--            ->willReturn(serialize($dataToCache));
--        $this->cache->expects($this->atLeastOnce())
--            ->method('save')
--            ->willReturnSelf();
--        $this->reader->expects($this->once())
--            ->method('read')
--            ->willReturn($data);
--        $this->postProcessor->expects($this->once())
--            ->method('process')
--            ->with($data)
--            ->willReturn($data);
--
--        $this->assertEquals($url, $this->configType->get($path));
--        $this->assertEquals($url, $this->configType->get($path));
--    }
--}
-diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
-index de18d45d268..31215f1bdee 100644
---- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
-+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
-@@ -40,7 +40,11 @@ class FileTest extends \PHPUnit\Framework\TestCase
- 
-         $this->file = $objectManager->getObject(
-             \Magento\Config\Block\System\Config\Form\Field\File::class,
--            ['data' => $this->testData]
-+            [
-+                '_escaper' => $objectManager->getObject(\Magento\Framework\Escaper::class),
-+                'data' => $this->testData,
-+
-+            ]
-         );
- 
-         $formMock = new \Magento\Framework\DataObject();
-diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
-index 8a005a52ab6..b752f79f734 100644
---- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
-+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
-@@ -34,6 +34,7 @@ class ImageTest extends \PHPUnit\Framework\TestCase
-             \Magento\Config\Block\System\Config\Form\Field\Image::class,
-             [
-                 'urlBuilder' => $this->urlBuilderMock,
-+                '_escaper' => $objectManager->getObject(\Magento\Framework\Escaper::class)
-             ]
-         );
- 
-diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
-index f5c65e848b3..e7ba2e8aaa2 100644
---- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
-+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
-@@ -21,7 +21,10 @@ class AllowspecificTest extends \PHPUnit\Framework\TestCase
-     {
-         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->_object = $testHelper->getObject(
--            \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific::class
-+            \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific::class,
-+            [
-+                '_escaper' => $testHelper->getObject(\Magento\Framework\Escaper::class)
-+            ]
-         );
-         $this->_object->setData('html_id', 'spec_element');
-         $this->_formMock = $this->createPartialMock(
-diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
-index 93650dd6265..4e260b0fb2b 100644
---- a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
-+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
-@@ -102,6 +102,9 @@ class FormTest extends \PHPUnit\Framework\TestCase
-             \Magento\Config\Block\System\Config\Form\Fieldset\Factory::class
-         );
-         $this->_fieldFactoryMock = $this->createMock(\Magento\Config\Block\System\Config\Form\Field\Factory::class);
-+        $settingCheckerMock = $this->getMockBuilder(SettingChecker::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-         $this->_coreConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
- 
-         $this->_backendConfigMock = $this->createMock(\Magento\Config\Model\Config::class);
-@@ -153,6 +156,7 @@ class FormTest extends \PHPUnit\Framework\TestCase
-             'fieldsetFactory' => $this->_fieldsetFactoryMock,
-             'fieldFactory' => $this->_fieldFactoryMock,
-             'context' => $context,
-+            'settingChecker' => $settingCheckerMock,
-         ];
- 
-         $objectArguments = $helper->getConstructArguments(\Magento\Config\Block\System\Config\Form::class, $data);
-@@ -532,7 +536,7 @@ class FormTest extends \PHPUnit\Framework\TestCase
- 
-         $elementVisibilityMock = $this->getMockBuilder(ElementVisibilityInterface::class)
-             ->getMockForAbstractClass();
--        $elementVisibilityMock->expects($this->once())
-+        $elementVisibilityMock->expects($this->any())
-             ->method('isDisabled')
-             ->willReturn($isDisabled);
- 
-diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
-index 984e0fe8426..35b2406b328 100644
---- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
-+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
-@@ -7,13 +7,14 @@ namespace Magento\Config\Test\Unit\Console\Command\ConfigSet;
- 
- use Magento\Config\App\Config\Type\System;
- use Magento\Config\Console\Command\ConfigSet\DefaultProcessor;
-+use Magento\Config\Model\Config;
-+use Magento\Config\Model\Config\Factory as ConfigFactory;
- use Magento\Framework\App\Config\ConfigPathResolver;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\DeploymentConfig;
- use Magento\Store\Model\ScopeInterface;
- use Magento\Config\Model\PreparedValueFactory;
- use Magento\Framework\App\Config\Value;
--use Magento\Framework\App\Config\ValueInterface;
- use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
- use PHPUnit_Framework_MockObject_MockObject as Mock;
- 
-@@ -55,17 +56,18 @@ class DefaultProcessorTest extends \PHPUnit\Framework\TestCase
-      */
-     private $resourceModelMock;
- 
-+    /**
-+     * @var ConfigFactory|Mock
-+     */
-+    private $configFactory;
-+
-     /**
-      * @inheritdoc
-      */
-     protected function setUp()
-     {
--        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->configPathResolverMock = $this->getMockBuilder(ConfigPathResolver::class)
--            ->disableOriginalConstructor()
--            ->getMock();
-+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
-+        $this->configPathResolverMock = $this->createMock(ConfigPathResolver::class);
-         $this->resourceModelMock = $this->getMockBuilder(AbstractDb::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['save'])
-@@ -74,14 +76,14 @@ class DefaultProcessorTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->setMethods(['getResource'])
-             ->getMock();
--        $this->preparedValueFactoryMock = $this->getMockBuilder(PreparedValueFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
-+        $this->preparedValueFactoryMock = $this->createMock(PreparedValueFactory::class);
-+        $this->configFactory = $this->createMock(ConfigFactory::class);
- 
-         $this->model = new DefaultProcessor(
-             $this->preparedValueFactoryMock,
-             $this->deploymentConfigMock,
--            $this->configPathResolverMock
-+            $this->configPathResolverMock,
-+            $this->configFactory
-         );
-     }
- 
-@@ -98,15 +100,16 @@ class DefaultProcessorTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->configMockForProcessTest($path, $scope, $scopeCode);
- 
--        $this->preparedValueFactoryMock->expects($this->once())
-+        $config = $this->createMock(Config::class);
-+        $this->configFactory->expects($this->once())
-             ->method('create')
--            ->willReturn($this->valueMock);
--        $this->valueMock->expects($this->once())
--            ->method('getResource')
--            ->willReturn($this->resourceModelMock);
--        $this->resourceModelMock->expects($this->once())
-+            ->with(['data' => ['scope' => $scope, 'scope_code' => $scopeCode]])
-+            ->willReturn($config);
-+        $config->expects($this->once())
-+            ->method('setDataByPath')
-+            ->with($path, $value);
-+        $config->expects($this->once())
-             ->method('save')
--            ->with($this->valueMock)
-             ->willReturnSelf();
- 
-         $this->model->process($path, $value, $scope, $scopeCode);
-@@ -124,28 +127,6 @@ class DefaultProcessorTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
--    public function testProcessWithWrongValueInstance()
--    {
--        $path = 'test/test/test';
--        $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT;
--        $scopeCode = null;
--        $value = 'value';
--        $valueInterfaceMock = $this->getMockBuilder(ValueInterface::class)
--            ->getMockForAbstractClass();
--
--        $this->configMockForProcessTest($path, $scope, $scopeCode);
--
--        $this->preparedValueFactoryMock->expects($this->once())
--            ->method('create')
--            ->willReturn($valueInterfaceMock);
--        $this->valueMock->expects($this->never())
--            ->method('getResource');
--        $this->resourceModelMock->expects($this->never())
--            ->method('save');
--
--        $this->model->process($path, $value, $scope, $scopeCode);
--    }
--
-     /**
-      * @param string $path
-      * @param string $scope
-@@ -185,6 +166,9 @@ class DefaultProcessorTest extends \PHPUnit\Framework\TestCase
-             ->method('resolve')
-             ->willReturn('system/default/test/test/test');
- 
-+        $this->configFactory->expects($this->never())
-+            ->method('create');
-+
-         $this->model->process($path, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
-     }
- }
-diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
-index bb1e0e02259..c2685e0a265 100644
---- a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
-+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
-@@ -9,7 +9,11 @@ use Magento\Config\Model\Config\Backend\Serialized;
- use Magento\Framework\Model\Context;
- use Magento\Framework\Serialize\Serializer\Json;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Psr\Log\LoggerInterface;
- 
-+/**
-+ * Class SerializedTest
-+ */
- class SerializedTest extends \PHPUnit\Framework\TestCase
- {
-     /** @var \Magento\Config\Model\Config\Backend\Serialized */
-@@ -18,14 +22,20 @@ class SerializedTest extends \PHPUnit\Framework\TestCase
-     /** @var Json|\PHPUnit_Framework_MockObject_MockObject */
-     private $serializerMock;
- 
-+    /** @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    private $loggerMock;
-+
-     protected function setUp()
-     {
-         $objectManager = new ObjectManager($this);
-         $this->serializerMock = $this->createMock(Json::class);
-+        $this->loggerMock = $this->createMock(LoggerInterface::class);
-         $contextMock = $this->createMock(Context::class);
-         $eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
-         $contextMock->method('getEventDispatcher')
-             ->willReturn($eventManagerMock);
-+        $contextMock->method('getLogger')
-+            ->willReturn($this->loggerMock);
-         $this->serializedConfig = $objectManager->getObject(
-             Serialized::class,
-             [
-@@ -72,6 +82,20 @@ class SerializedTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
-+    public function testAfterLoadWithException()
-+    {
-+        $value = '{"key":';
-+        $expected = false;
-+        $this->serializedConfig->setValue($value);
-+        $this->serializerMock->expects($this->once())
-+            ->method('unserialize')
-+            ->willThrowException(new \Exception());
-+        $this->loggerMock->expects($this->once())
-+            ->method('critical');
-+        $this->serializedConfig->afterLoad();
-+        $this->assertEquals($expected, $this->serializedConfig->getValue());
-+    }
-+
-     /**
-      * @param string $expected
-      * @param int|double|string|array|boolean|null $value
-diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/AbstractCompositeTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/AbstractCompositeTest.php
-index 57d6fa28a78..e448b628ef0 100644
---- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/AbstractCompositeTest.php
-+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/AbstractCompositeTest.php
-@@ -8,6 +8,9 @@ namespace Magento\Config\Test\Unit\Model\Config\Structure\Element;
- use Magento\Config\Model\Config\Structure\ElementVisibilityInterface;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
- 
-+/**
-+ * Abstract composite test.
-+ */
- class AbstractCompositeTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -26,7 +29,7 @@ class AbstractCompositeTest extends \PHPUnit\Framework\TestCase
-     protected $_iteratorMock;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager | \PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Module\ModuleManagerInterface | \PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $moduleManagerMock;
- 
-@@ -53,7 +56,7 @@ class AbstractCompositeTest extends \PHPUnit\Framework\TestCase
-             ->getMockForAbstractClass();
-         $this->_iteratorMock = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Iterator::class);
-         $this->_storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManager::class);
--        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\Manager::class);
-+        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\ModuleManagerInterface::class);
-         $this->_model = $this->getMockForAbstractClass(
-             \Magento\Config\Model\Config\Structure\Element\AbstractComposite::class,
-             [$this->_storeManagerMock, $this->moduleManagerMock, $this->_iteratorMock]
-diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/StructureTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/StructureTest.php
-index 6c059f4b69b..a17faf8f358 100644
---- a/app/code/Magento/Config/Test/Unit/Model/Config/StructureTest.php
-+++ b/app/code/Magento/Config/Test/Unit/Model/Config/StructureTest.php
-@@ -418,6 +418,7 @@ class StructureTest extends \PHPUnit\Framework\TestCase
-                 'field_2'
-             ],
-             'field_3' => [
-+                'field_3',
-                 'field_3'
-             ],
-             'field_3_1' => [
-diff --git a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
-index d0568f48ded..66163e354cc 100644
---- a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
-+++ b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Config\Test\Unit\Model;
- 
-+use PHPUnit\Framework\MockObject\MockObject;
-+
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
-@@ -13,130 +15,158 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @var \Magento\Config\Model\Config
-      */
--    protected $_model;
-+    private $model;
-+
-+    /**
-+     * @var \Magento\Framework\Event\ManagerInterface|MockObject
-+     */
-+    private $eventManagerMock;
-+
-+    /**
-+     * @var \Magento\Config\Model\Config\Structure\Reader|MockObject
-+     */
-+    private $structureReaderMock;
-+
-+    /**
-+     * @var \Magento\Framework\DB\TransactionFactory|MockObject
-+     */
-+    private $transFactoryMock;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\App\Config\ReinitableConfigInterface|MockObject
-      */
--    protected $_eventManagerMock;
-+    private $appConfigMock;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Config\Model\Config\Loader|MockObject
-      */
--    protected $_structureReaderMock;
-+    private $configLoaderMock;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\App\Config\ValueFactory|MockObject
-      */
--    protected $_transFactoryMock;
-+    private $dataFactoryMock;
- 
-     /**
--     * @var \Magento\Framework\App\Config\ReinitableConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Store\Model\StoreManagerInterface|MockObject
-      */
--    protected $_appConfigMock;
-+    private $storeManager;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Config\Model\Config\Structure|MockObject
-      */
--    protected $_applicationMock;
-+    private $configStructure;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker|MockObject
-      */
--    protected $_configLoaderMock;
-+    private $settingsChecker;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\App\ScopeResolverPool|MockObject
-      */
--    protected $_dataFactoryMock;
-+    private $scopeResolverPool;
- 
-     /**
--     * @var \Magento\Store\Model\StoreManagerInterface
-+     * @var \Magento\Framework\App\ScopeResolverInterface|MockObject
-      */
--    protected $_storeManager;
-+    private $scopeResolver;
- 
-     /**
--     * @var \Magento\Config\Model\Config\Structure
-+     * @var \Magento\Framework\App\ScopeInterface|MockObject
-      */
--    protected $_configStructure;
-+    private $scope;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Store\Model\ScopeTypeNormalizer|MockObject
-      */
--    private $_settingsChecker;
-+    private $scopeTypeNormalizer;
- 
-     protected function setUp()
-     {
--        $this->_eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
--        $this->_structureReaderMock = $this->createPartialMock(
-+        $this->eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
-+        $this->structureReaderMock = $this->createPartialMock(
-             \Magento\Config\Model\Config\Structure\Reader::class,
-             ['getConfiguration']
-         );
--        $this->_configStructure = $this->createMock(\Magento\Config\Model\Config\Structure::class);
-+        $this->configStructure = $this->createMock(\Magento\Config\Model\Config\Structure::class);
- 
--        $this->_structureReaderMock->expects(
-+        $this->structureReaderMock->expects(
-             $this->any()
-         )->method(
-             'getConfiguration'
-         )->will(
--            $this->returnValue($this->_configStructure)
-+            $this->returnValue($this->configStructure)
-         );
- 
--        $this->_transFactoryMock = $this->createPartialMock(
-+        $this->transFactoryMock = $this->createPartialMock(
-             \Magento\Framework\DB\TransactionFactory::class,
-             ['create', 'addObject']
-         );
--        $this->_appConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
--        $this->_configLoaderMock = $this->createPartialMock(
-+        $this->appConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-+        $this->configLoaderMock = $this->createPartialMock(
-             \Magento\Config\Model\Config\Loader::class,
-             ['getConfigByPath']
-         );
--        $this->_dataFactoryMock = $this->createMock(\Magento\Framework\App\Config\ValueFactory::class);
-+        $this->dataFactoryMock = $this->createMock(\Magento\Framework\App\Config\ValueFactory::class);
- 
--        $this->_storeManager = $this->getMockForAbstractClass(\Magento\Store\Model\StoreManagerInterface::class);
-+        $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
- 
--        $this->_settingsChecker = $this
-+        $this->settingsChecker = $this
-             ->createMock(\Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker::class);
- 
--        $this->_model = new \Magento\Config\Model\Config(
--            $this->_appConfigMock,
--            $this->_eventManagerMock,
--            $this->_configStructure,
--            $this->_transFactoryMock,
--            $this->_configLoaderMock,
--            $this->_dataFactoryMock,
--            $this->_storeManager,
--            $this->_settingsChecker
-+        $this->scopeResolverPool = $this->createMock(\Magento\Framework\App\ScopeResolverPool::class);
-+        $this->scopeResolver = $this->createMock(\Magento\Framework\App\ScopeResolverInterface::class);
-+        $this->scopeResolverPool->method('get')
-+            ->willReturn($this->scopeResolver);
-+        $this->scope = $this->createMock(\Magento\Framework\App\ScopeInterface::class);
-+        $this->scopeResolver->method('getScope')
-+            ->willReturn($this->scope);
-+
-+        $this->scopeTypeNormalizer = $this->createMock(\Magento\Store\Model\ScopeTypeNormalizer::class);
-+
-+        $this->model = new \Magento\Config\Model\Config(
-+            $this->appConfigMock,
-+            $this->eventManagerMock,
-+            $this->configStructure,
-+            $this->transFactoryMock,
-+            $this->configLoaderMock,
-+            $this->dataFactoryMock,
-+            $this->storeManager,
-+            $this->settingsChecker,
-+            [],
-+            $this->scopeResolverPool,
-+            $this->scopeTypeNormalizer
-         );
-     }
- 
-     public function testSaveDoesNotDoAnythingIfGroupsAreNotPassed()
-     {
--        $this->_configLoaderMock->expects($this->never())->method('getConfigByPath');
--        $this->_model->save();
-+        $this->configLoaderMock->expects($this->never())->method('getConfigByPath');
-+        $this->model->save();
-     }
- 
-     public function testSaveEmptiesNonSetArguments()
-     {
--        $this->_structureReaderMock->expects($this->never())->method('getConfiguration');
--        $this->assertNull($this->_model->getSection());
--        $this->assertNull($this->_model->getWebsite());
--        $this->assertNull($this->_model->getStore());
--        $this->_model->save();
--        $this->assertSame('', $this->_model->getSection());
--        $this->assertSame('', $this->_model->getWebsite());
--        $this->assertSame('', $this->_model->getStore());
-+        $this->structureReaderMock->expects($this->never())->method('getConfiguration');
-+        $this->assertNull($this->model->getSection());
-+        $this->assertNull($this->model->getWebsite());
-+        $this->assertNull($this->model->getStore());
-+        $this->model->save();
-+        $this->assertSame('', $this->model->getSection());
-+        $this->assertSame('', $this->model->getWebsite());
-+        $this->assertSame('', $this->model->getStore());
-     }
- 
-     public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
-     {
-         $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
- 
--        $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
-+        $this->transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
- 
--        $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
-+        $this->configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
- 
--        $this->_eventManagerMock->expects(
-+        $this->eventManagerMock->expects(
-             $this->at(0)
-         )->method(
-             'dispatch'
-@@ -145,7 +175,7 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-             $this->arrayHasKey('website')
-         );
- 
--        $this->_eventManagerMock->expects(
-+        $this->eventManagerMock->expects(
-             $this->at(0)
-         )->method(
-             'dispatch'
-@@ -154,20 +184,20 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-             $this->arrayHasKey('store')
-         );
- 
--        $this->_model->setGroups(['1' => ['data']]);
--        $this->_model->save();
-+        $this->model->setGroups(['1' => ['data']]);
-+        $this->model->save();
-     }
- 
-     public function testDoNotSaveReadOnlyFields()
-     {
-         $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
--        $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
-+        $this->transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
- 
--        $this->_settingsChecker->expects($this->any())->method('isReadOnly')->will($this->returnValue(true));
--        $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
-+        $this->settingsChecker->expects($this->any())->method('isReadOnly')->will($this->returnValue(true));
-+        $this->configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
- 
--        $this->_model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
--        $this->_model->setSection('section');
-+        $this->model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
-+        $this->model->setSection('section');
- 
-         $group = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
-         $group->method('getPath')->willReturn('section/1');
-@@ -176,15 +206,15 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-         $field->method('getGroupPath')->willReturn('section/1');
-         $field->method('getId')->willReturn('key');
- 
--        $this->_configStructure->expects($this->at(0))
-+        $this->configStructure->expects($this->at(0))
-             ->method('getElement')
-             ->with('section/1')
-             ->will($this->returnValue($group));
--        $this->_configStructure->expects($this->at(1))
-+        $this->configStructure->expects($this->at(1))
-             ->method('getElement')
-             ->with('section/1')
-             ->will($this->returnValue($group));
--        $this->_configStructure->expects($this->at(2))
-+        $this->configStructure->expects($this->at(2))
-             ->method('getElement')
-             ->with('section/1/key')
-             ->will($this->returnValue($field));
-@@ -193,28 +223,28 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-             \Magento\Framework\App\Config\Value::class,
-             ['addData']
-         );
--        $this->_dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
-+        $this->dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
- 
--        $this->_transFactoryMock->expects($this->never())->method('addObject');
-+        $this->transFactoryMock->expects($this->never())->method('addObject');
-         $backendModel->expects($this->never())->method('addData');
- 
--        $this->_model->save();
-+        $this->model->save();
-     }
- 
-     public function testSaveToCheckScopeDataSet()
-     {
-         $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
--        $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
-+        $this->transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
- 
--        $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
-+        $this->configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
- 
--        $this->_eventManagerMock->expects($this->at(0))
-+        $this->eventManagerMock->expects($this->at(0))
-             ->method('dispatch')
-             ->with(
-                 $this->equalTo('admin_system_config_changed_section_section'),
-                 $this->arrayHasKey('website')
-             );
--        $this->_eventManagerMock->expects($this->at(0))
-+        $this->eventManagerMock->expects($this->at(0))
-             ->method('dispatch')
-             ->with(
-                 $this->equalTo('admin_system_config_changed_section_section'),
-@@ -228,36 +258,51 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-         $field->method('getGroupPath')->willReturn('section/1');
-         $field->method('getId')->willReturn('key');
- 
--        $this->_configStructure->expects($this->at(0))
-+        $this->configStructure->expects($this->at(0))
-             ->method('getElement')
-             ->with('section/1')
-             ->will($this->returnValue($group));
--        $this->_configStructure->expects($this->at(1))
-+        $this->configStructure->expects($this->at(1))
-             ->method('getElement')
-             ->with('section/1')
-             ->will($this->returnValue($group));
--        $this->_configStructure->expects($this->at(2))
-+        $this->configStructure->expects($this->at(2))
-             ->method('getElement')
-             ->with('section/1/key')
-             ->will($this->returnValue($field));
--        $this->_configStructure->expects($this->at(3))
-+        $this->configStructure->expects($this->at(3))
-             ->method('getElement')
-             ->with('section/1')
-             ->will($this->returnValue($group));
--        $this->_configStructure->expects($this->at(4))
-+        $this->configStructure->expects($this->at(4))
-             ->method('getElement')
-             ->with('section/1/key')
-             ->will($this->returnValue($field));
- 
-+        $this->scopeResolver->expects($this->atLeastOnce())
-+            ->method('getScope')
-+            ->with('1')
-+            ->willReturn($this->scope);
-+        $this->scope->expects($this->atLeastOnce())
-+            ->method('getScopeType')
-+            ->willReturn('website');
-+        $this->scope->expects($this->atLeastOnce())
-+            ->method('getId')
-+            ->willReturn(1);
-+        $this->scope->expects($this->atLeastOnce())
-+            ->method('getCode')
-+            ->willReturn('website_code');
-+        $this->scopeTypeNormalizer->expects($this->atLeastOnce())
-+            ->method('normalize')
-+            ->with('website')
-+            ->willReturn('websites');
-         $website = $this->createMock(\Magento\Store\Model\Website::class);
--        $website->expects($this->any())->method('getCode')->will($this->returnValue('website_code'));
--        $this->_storeManager->expects($this->any())->method('getWebsite')->will($this->returnValue($website));
--        $this->_storeManager->expects($this->any())->method('getWebsites')->will($this->returnValue([$website]));
--        $this->_storeManager->expects($this->any())->method('isSingleStoreMode')->will($this->returnValue(true));
-+        $this->storeManager->expects($this->any())->method('getWebsites')->will($this->returnValue([$website]));
-+        $this->storeManager->expects($this->any())->method('isSingleStoreMode')->will($this->returnValue(true));
- 
--        $this->_model->setWebsite('website');
--        $this->_model->setSection('section');
--        $this->_model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
-+        $this->model->setWebsite('1');
-+        $this->model->setSection('section');
-+        $this->model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
- 
-         $backendModel = $this->createPartialMock(
-             \Magento\Framework\App\Config\Value::class,
-@@ -270,7 +315,7 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-                 'groups' => [1 => ['fields' => ['key' => ['data']]]],
-                 'group_id' => null,
-                 'scope' => 'websites',
--                'scope_id' => 0,
-+                'scope_id' => 1,
-                 'scope_code' => 'website_code',
-                 'field_config' => null,
-                 'fieldset_data' => ['key' => null],
-@@ -280,27 +325,64 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-             ->with('section/1/key')
-             ->will($this->returnValue($backendModel));
- 
--        $this->_dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
-+        $this->dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
-+
-+        $this->model->save();
-+    }
- 
--        $this->_model->save();
-+    /**
-+     * @param string $path
-+     * @param string $value
-+     * @param string $section
-+     * @param array $groups
-+     * @dataProvider setDataByPathDataProvider
-+     */
-+    public function testSetDataByPath(string $path, string $value, string $section, array $groups)
-+    {
-+        $this->model->setDataByPath($path, $value);
-+        $this->assertEquals($section, $this->model->getData('section'));
-+        $this->assertEquals($groups, $this->model->getData('groups'));
-     }
- 
--    public function testSetDataByPath()
-+    /**
-+     * @return array
-+     */
-+    public function setDataByPathDataProvider(): array
-     {
--        $value = 'value';
--        $path = '<section>/<group>/<field>';
--        $this->_model->setDataByPath($path, $value);
--        $expected = [
--            'section' => '<section>',
--            'groups' => [
--                '<group>' => [
--                    'fields' => [
--                        '<field>' => ['value' => $value],
-+        return [
-+            'depth 3' => [
-+                'a/b/c',
-+                'value1',
-+                'a',
-+                [
-+                    'b' => [
-+                        'fields' => [
-+                            'c' => ['value' => 'value1'],
-+                        ],
-+                    ],
-+                ],
-+            ],
-+            'depth 5' => [
-+                'a/b/c/d/e',
-+                'value1',
-+                'a',
-+                [
-+                    'b' => [
-+                        'groups' => [
-+                            'c' => [
-+                                'groups' => [
-+                                    'd' => [
-+                                        'fields' => [
-+                                            'e' => ['value' => 'value1'],
-+                                        ],
-+                                    ],
-+                                ],
-+                            ],
-+                        ],
-                     ],
-                 ],
-             ],
-         ];
--        $this->assertSame($expected, $this->_model->getData());
-     }
- 
-     /**
-@@ -309,34 +391,31 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testSetDataByPathEmpty()
-     {
--        $this->_model->setDataByPath('', 'value');
-+        $this->model->setDataByPath('', 'value');
-     }
- 
-     /**
-      * @param string $path
--     * @param string $expectedException
--     *
-      * @dataProvider setDataByPathWrongDepthDataProvider
-      */
--    public function testSetDataByPathWrongDepth($path, $expectedException)
-+    public function testSetDataByPathWrongDepth(string $path)
-     {
--        $expectedException = 'Allowed depth of configuration is 3 (<section>/<group>/<field>). ' . $expectedException;
--        $this->expectException('\UnexpectedValueException');
-+        $currentDepth = count(explode('/', $path));
-+        $expectedException = 'Minimal depth of configuration is 3. Your configuration depth is ' . $currentDepth;
-+        $this->expectException(\UnexpectedValueException::class);
-         $this->expectExceptionMessage($expectedException);
-         $value = 'value';
--        $this->_model->setDataByPath($path, $value);
-+        $this->model->setDataByPath($path, $value);
-     }
- 
-     /**
-      * @return array
-      */
--    public function setDataByPathWrongDepthDataProvider()
-+    public function setDataByPathWrongDepthDataProvider(): array
-     {
-         return [
--            'depth 2' => ['section/group', "Your configuration depth is 2 for path 'section/group'"],
--            'depth 1' => ['section', "Your configuration depth is 1 for path 'section'"],
--            'depth 4' => ['section/group/field/sub-field', "Your configuration depth is 4 for path"
--                . " 'section/group/field/sub-field'", ],
-+            'depth 2' => ['section/group'],
-+            'depth 1' => ['section'],
-         ];
-     }
- }
-diff --git a/app/code/Magento/Config/etc/adminhtml/di.xml b/app/code/Magento/Config/etc/adminhtml/di.xml
-index 5e54f177776..189fbdf69a7 100644
---- a/app/code/Magento/Config/etc/adminhtml/di.xml
-+++ b/app/code/Magento/Config/etc/adminhtml/di.xml
-@@ -6,7 +6,6 @@
-  */
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
--    <preference for="Magento\Config\Model\Config\Structure\SearchInterface" type="Magento\Config\Model\Config\Structure" />
-     <preference for="Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface" type="Magento\Config\Model\Config\Backend\File\RequestData" />
-     <preference for="Magento\Config\Model\Config\Structure\ElementVisibilityInterface" type="Magento\Config\Model\Config\Structure\ElementVisibilityComposite" />
-     <type name="Magento\Config\Model\Config\Structure\Element\Iterator\Tab" shared="false" />
-diff --git a/app/code/Magento/Config/etc/db_schema.xml b/app/code/Magento/Config/etc/db_schema.xml
-index 3f55d582776..8aeac802fbd 100644
---- a/app/code/Magento/Config/etc/db_schema.xml
-+++ b/app/code/Magento/Config/etc/db_schema.xml
-@@ -15,10 +15,10 @@
-                 default="0" comment="Config Scope Id"/>
-         <column xsi:type="varchar" name="path" nullable="false" length="255" default="general" comment="Config Path"/>
-         <column xsi:type="text" name="value" nullable="true" comment="Config Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="config_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="CORE_CONFIG_DATA_SCOPE_SCOPE_ID_PATH">
-+        <constraint xsi:type="unique" referenceId="CORE_CONFIG_DATA_SCOPE_SCOPE_ID_PATH">
-             <column name="scope"/>
-             <column name="scope_id"/>
-             <column name="path"/>
-diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml
-index a5dd18097fb..920cac382fc 100644
---- a/app/code/Magento/Config/etc/di.xml
-+++ b/app/code/Magento/Config/etc/di.xml
-@@ -77,6 +77,11 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Framework\Lock\Backend\Cache">
-+        <arguments>
-+            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
-+        </arguments>
-+    </type>
-     <type name="Magento\Config\App\Config\Type\System">
-         <arguments>
-             <argument name="source" xsi:type="object">systemConfigSourceAggregatedProxy</argument>
-@@ -85,8 +90,18 @@
-             <argument name="preProcessor" xsi:type="object">Magento\Framework\App\Config\PreProcessorComposite</argument>
-             <argument name="serializer" xsi:type="object">Magento\Framework\Serialize\Serializer\Serialize</argument>
-             <argument name="reader" xsi:type="object">Magento\Config\App\Config\Type\System\Reader\Proxy</argument>
-+            <argument name="lockQuery" xsi:type="object">systemConfigQueryLocker</argument>
-         </arguments>
-     </type>
-+
-+    <virtualType name="systemConfigQueryLocker" type="Magento\Framework\Cache\LockGuardedCacheLoader">
-+        <arguments>
-+            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
-+            <argument name="lockTimeout" xsi:type="number">42000</argument>
-+            <argument name="delayTimeout" xsi:type="number">100</argument>
-+        </arguments>
-+    </virtualType>
-+
-     <type name="Magento\Config\App\Config\Type\System\Reader">
-         <arguments>
-             <argument name="source" xsi:type="object">systemConfigSourceAggregated</argument>
-diff --git a/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml b/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
-index e8082dae94d..49a75d36fd8 100644
---- a/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
-+++ b/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
-@@ -4,14 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @deprecated
-  * @var $block \Magento\Backend\Block\Page\System\Config\Robots\Reset
-  * @var $jsonHelper \Magento\Framework\Json\Helper\Data
-  */
--$jsonHelper = $this->helper('Magento\Framework\Json\Helper\Data');
-+$jsonHelper = $this->helper(\Magento\Framework\Json\Helper\Data::class);
- ?>
- 
- <script>
-@@ -19,8 +17,8 @@ $jsonHelper = $this->helper('Magento\Framework\Json\Helper\Data');
-         'jquery'
-     ], function ($) {
-         window.resetRobotsToDefault = function(){
--            $('#design_search_engine_robots_custom_instructions').val(<?php
--                /* @escapeNotVerified */ echo $jsonHelper->jsonEncode($block->getRobotsDefaultCustomInstructions())
-+            $('#design_search_engine_robots_custom_instructions').val(<?=
-+                /* @noEscape */ $jsonHelper->jsonEncode($block->getRobotsDefaultCustomInstructions())
-             ?>);
-         }
-     });
-diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
-index a1e26b7805d..4b8ebb39beb 100644
---- a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
-+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -22,7 +19,8 @@
-         background-color: #DFF7FF!important;
-     }
- </style>
--<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
-+<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="config-edit-form"
-+      enctype="multipart/form-data">
-     <?= $block->getBlockHtml('formkey') ?>
-     <div class="accordion">
-         <?= $block->getChildHtml('form') ?>
-@@ -32,6 +30,8 @@
- require([
-     "jquery",
-     "uiRegistry",
-+    "Magento_Ui/js/modal/confirm",
-+    "mage/translate",
-     "mage/mage",
-     "prototype",
-     "mage/adminhtml/form",
-@@ -159,7 +159,9 @@ require([
-                         var elId = $el.id;
-                         $el.replace($el.outerHTML);
-                         events.each(function(event) {
--                            Event.observe(Element.extend(document.getElementById(elId)), event.eventName, event.handler);
-+                            Event.observe(
-+                                Element.extend(document.getElementById(elId)), event.eventName, event.handler
-+                            );
-                         });
-                     } else {
-                         el.stopObserving('change', adminSystemConfig.onchangeSharedElement);
-@@ -296,7 +298,9 @@ require([
-                 if (!scopeElement || !scopeElement.checked) {
-                     eventObj.element.enable();
-                     eventObj.requires.each(function(required) {
--                        adminSystemConfig.checkRequired.call(Element.extend(required), eventObj.element, eventObj.callback);
-+                        adminSystemConfig.checkRequired.call(
-+                            Element.extend(required), eventObj.element, eventObj.callback
-+                        );
-                     }.bind(this));
-                 }
-             },
-@@ -383,6 +387,6 @@ require([
- 
-     registry.set('adminSystemConfig', adminSystemConfig);
- 
--    adminSystemConfig.navigateToElement(<?php echo /* @noEscape */ $block->getConfigSearchParamsJson(); ?>);
-+    adminSystemConfig.navigateToElement(<?= /* @noEscape */ $block->getConfigSearchParamsJson(); ?>);
- });
- </script>
-diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
-index cf235d368b9..cf188bfeb68 100644
---- a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
-+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php
-@@ -13,30 +10,30 @@ $_htmlId = $block->getHtmlId() ? $block->getHtmlId() : '_' . uniqid();
- $_colspan = $block->isAddAfter() ? 2 : 1;
- ?>
- 
--<div class="design_theme_ua_regexp" id="grid<?= /* @escapeNotVerified */ $_htmlId ?>">
-+<div class="design_theme_ua_regexp" id="grid<?= $block->escapeHtmlAttr($_htmlId) ?>">
-     <div class="admin__control-table-wrapper">
--        <table class="admin__control-table" id="<?= /* @escapeNotVerified */ $block->getElement()->getId() ?>">
-+        <table class="admin__control-table" id="<?= $block->escapeHtmlAttr($block->getElement()->getId()) ?>">
-             <thead>
-             <tr>
--                <?php foreach ($block->getColumns() as $columnName => $column): ?>
--                    <th><?= /* @escapeNotVerified */ $column['label'] ?></th>
--                <?php endforeach;?>
--                <th class="col-actions" colspan="<?= /* @escapeNotVerified */ $_colspan ?>"><?= /* @escapeNotVerified */ __('Action') ?></th>
-+                <?php foreach ($block->getColumns() as $columnName => $column) : ?>
-+                    <th><?= $block->escapeHtml($column['label']) ?></th>
-+                <?php endforeach; ?>
-+                <th class="col-actions" colspan="<?= (int)$_colspan ?>"><?= $block->escapeHtml(__('Action')) ?></th>
-             </tr>
-             </thead>
-             <tfoot>
-             <tr>
-                 <td colspan="<?= count($block->getColumns())+$_colspan ?>" class="col-actions-add">
--                    <button id="addToEndBtn<?= /* @escapeNotVerified */ $_htmlId ?>" class="action-add" title="<?= /* @escapeNotVerified */ __('Add') ?>" type="button">
--                        <span><?= /* @escapeNotVerified */ $block->getAddButtonLabel() ?></span>
-+                    <button id="addToEndBtn<?= $block->escapeHtmlAttr($_htmlId) ?>" class="action-add" title="<?= $block->escapeHtmlAttr(__('Add')) ?>" type="button">
-+                        <span><?= $block->escapeHtml($block->getAddButtonLabel()) ?></span>
-                     </button>
-                 </td>
-             </tr>
-             </tfoot>
--            <tbody id="addRow<?= /* @escapeNotVerified */ $_htmlId ?>"></tbody>
-+            <tbody id="addRow<?= $block->escapeHtmlAttr($_htmlId) ?>"></tbody>
-         </table>
-     </div>
--    <input type="hidden" name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[__empty]" value="" />
-+    <input type="hidden" name="<?= $block->escapeHtmlAttr($block->getElement()->getName()) ?>[__empty]" value="" />
- 
-     <script>
-         require([
-@@ -44,23 +41,28 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
-             'prototype'
-         ], function (mageTemplate) {
-         // create row creator
--        window.arrayRow<?= /* @escapeNotVerified */ $_htmlId ?> = {
-+        window.arrayRow<?= $block->escapeJs($_htmlId) ?> = {
- 
-             // define row prototypeJS template
-             template: mageTemplate(
-                     '<tr id="<%- _id %>">'
--                    <?php foreach ($block->getColumns() as $columnName => $column): ?>
--                            + '<td>'
--                            + '<?= /* @escapeNotVerified */ $block->renderCellTemplate($columnName) ?>'
--                            + '<\/td>'
--                        <?php endforeach; ?>
--
--                    <?php if ($block->isAddAfter()): ?>
--                            + '<td><button class="action-add" type="button" id="addAfterBtn<%- _id %>"><span><?= /* @escapeNotVerified */ __('Add after') ?><\/span><\/button><\/td>'
--                        <?php endif; ?>
-+                    <?php foreach ($block->getColumns() as $columnName => $column) : ?>
-+                        + '<td>'
-+                        + '<?= $block->escapeJs($block->renderCellTemplate($columnName)) ?>'
-+                        + '<\/td>'
-+                    <?php endforeach; ?>
- 
--                            + '<td class="col-actions"><button onclick="arrayRow<?= /* @escapeNotVerified */ $_htmlId ?>.del(\'<%- _id %>\')" class="action-delete" type="button"><span><?= /* @escapeNotVerified */ __('Delete') ?><\/span><\/button><\/td>'
--                            +'<\/tr>'
-+                    <?php if ($block->isAddAfter()) : ?>
-+                        + '<td><button class="action-add" type="button" id="addAfterBtn<%- _id %>"><span>'
-+                        + '<?= $block->escapeJs($block->escapeHtml(__('Add after'))) ?>'
-+                        + '<\/span><\/button><\/td>'
-+                    <?php endif; ?>
-+
-+                    + '<td class="col-actions"><button '
-+                    + 'onclick="arrayRow<?= $block->escapeJs($_htmlId) ?>.del(\'<%- _id %>\')" '
-+                    + 'class="action-delete" type="button">'
-+                    + '<span><?= $block->escapeJs($block->escapeHtml(__('Delete'))) ?><\/span><\/button><\/td>'
-+                    + '<\/tr>'
-             ),
- 
-             add: function(rowData, insertAfterId) {
-@@ -73,56 +75,61 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
-                 } else {
-                     var d = new Date();
-                     templateValues = {
--                <?php foreach ($block->getColumns() as $columnName => $column): ?>
--                    <?= /* @escapeNotVerified */ $columnName ?>: '',
--                        'option_extra_attrs': {},
--                    <?php endforeach; ?>
-+                        <?php foreach ($block->getColumns() as $columnName => $column) : ?>
-+                            <?= $block->escapeJs($columnName) ?>: '',
-+                                'option_extra_attrs': {},
-+                        <?php endforeach; ?>
-                         _id: '_' + d.getTime() + '_' + d.getMilliseconds()
-                 };
-             }
- 
-             // Insert new row after specified row or at the bottom
-             if (insertAfterId) {
--            Element.insert($(insertAfterId), {after: this.template(templateValues)});
--        } else {
--            Element.insert($('addRow<?= /* @escapeNotVerified */ $_htmlId ?>'), {bottom: this.template(templateValues)});
--        }
-+                Element.insert($(insertAfterId), {after: this.template(templateValues)});
-+            } else {
-+                Element.insert($('addRow<?= $block->escapeJs($_htmlId) ?>'), {bottom: this.template(templateValues)});
-+            }
- 
--        // Fill controls with data
--        if (rowData) {
--            var rowInputElementNames = Object.keys(rowData.column_values);
--            for (var i = 0; i < rowInputElementNames.length; i++) {
--                if ($(rowInputElementNames[i])) {
--                    $(rowInputElementNames[i]).setValue(rowData.column_values[rowInputElementNames[i]]);
-+            // Fill controls with data
-+            if (rowData) {
-+                var rowInputElementNames = Object.keys(rowData.column_values);
-+                for (var i = 0; i < rowInputElementNames.length; i++) {
-+                    if ($(rowInputElementNames[i])) {
-+                        $(rowInputElementNames[i]).setValue(rowData.column_values[rowInputElementNames[i]]);
-+                    }
-                 }
-             }
--        }
- 
--        // Add event for {addAfterBtn} button
--        <?php if ($block->isAddAfter()): ?>
--        Event.observe('addAfterBtn' + templateValues._id, 'click', this.add.bind(this, false, templateValues._id));
-+            // Add event for {addAfterBtn} button
-+            <?php if ($block->isAddAfter()) : ?>
-+            Event.observe('addAfterBtn' + templateValues._id, 'click', this.add.bind(this, false, templateValues._id));
-             <?php endif; ?>
--        },
-+            },
- 
--        del: function(rowId) {
--            $(rowId).remove();
--        }
-+            del: function(rowId) {
-+                $(rowId).remove();
-+            }
-         }
- 
-         // bind add action to "Add" button in last row
--        Event.observe('addToEndBtn<?= /* @escapeNotVerified */ $_htmlId ?>', 'click', arrayRow<?= /* @escapeNotVerified */ $_htmlId ?>.add.bind(arrayRow<?= /* @escapeNotVerified */ $_htmlId ?>, false, false));
-+        Event.observe('addToEndBtn<?= $block->escapeJs($_htmlId) ?>',
-+            'click',
-+            arrayRow<?= $block->escapeJs($_htmlId) ?>.add.bind(
-+                arrayRow<?= $block->escapeJs($_htmlId) ?>, false, false
-+            )
-+        );
- 
-         // add existing rows
-         <?php
-         foreach ($block->getArrayRows() as $_rowId => $_row) {
--            /* @escapeNotVerified */ echo "arrayRow{$_htmlId}.add(" . $_row->toJson() . ");\n";
-+            echo /** @noEscape */ "arrayRow{$block->escapeJs($_htmlId)}.add(" . /** @noEscape */ $_row->toJson() . ");\n";
-         }
-         ?>
- 
-         // Toggle the grid availability, if element is disabled (depending on scope)
--        <?php if ($block->getElement()->getDisabled()):?>
--        toggleValueElements({checked: true}, $('grid<?= /* @escapeNotVerified */ $_htmlId ?>').parentNode);
--            <?php endif;?>
-+        <?php if ($block->getElement()->getDisabled()) : ?>
-+        toggleValueElements({checked: true}, $('grid<?= $block->escapeJs($_htmlId) ?>').parentNode);
-+        <?php endif; ?>
-         });
-     </script>
- </div>
-diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
-index b703641acad..29768778683 100644
---- a/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
-+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <script>
- require([
-@@ -71,7 +68,7 @@ originModel.prototype = {
-     {
-         this.reload = false;
-         this.loader = new varienLoader(true);
--        this.regionsUrl = "<?= /* @escapeNotVerified */ $block->getUrl('directory/json/countryRegion') ?>";
-+        this.regionsUrl = "<?= $block->escapeJs($block->escapeUrl($block->getUrl('directory/json/countryRegion'))) ?>";
- 
-         this.bindCountryRegionRelation();
-     },
-@@ -146,21 +143,32 @@ originModel.prototype = {
-             var value = this.regionElement.value;
-             var disabled = this.regionElement.disabled;
-             if (data.length) {
--                var html = '<select name="'+this.regionElement.name+'" id="'+this.regionElement.id+'" class="required-entry select" title="'+this.regionElement.title+'"'+(disabled?" disabled":"")+'>';
-+                var select = document.createElement('select');
-+                select.setAttribute('name', this.regionElement.name);
-+                select.setAttribute('title', this.regionElement.title);
-+                select.setAttribute('id', this.regionElement.id);
-+                select.setAttribute('class', 'required-entry select');
-+                if (disabled) {
-+                    select.setAttribute('disabled', '');
-+                }
-                 for (var i in data) {
-                     if (data[i].label) {
--                        html+= '<option value="'+data[i].value+'"';
--                        if (this.regionElement.value && (this.regionElement.value == data[i].value || this.regionElement.value == data[i].label)) {
--                            html+= ' selected';
-+                        var option = document.createElement('option');
-+                        option.setAttribute('value', data[i].value);
-+                        option.innerText = data[i].label;
-+                        if (this.regionElement.value &&
-+                            (this.regionElement.value == data[i].value || this.regionElement.value == data[i].label)
-+                        ) {
-+                            option.setAttribute('selected', '');
-                         }
--                        html+='>'+data[i].label+'<\/option>';
-+                        select.add(option);
-                     }
-                 }
--                html+= '<\/select>';
- 
-                 var parentNode = this.regionElement.parentNode;
-                 var regionElementId = this.regionElement.id;
--                parentNode.innerHTML = html;
-+                parentNode.innerHTML = select.outerHTML;
-+
-                 this.regionElement = $(regionElementId);
-             } else if (this.reload) {
-                 this.clearRegionField(disabled);
-@@ -168,10 +176,18 @@ originModel.prototype = {
-         }
-     },
-     clearRegionField: function(disabled) {
--        var html = '<input type="text" name="' + this.regionElement.name + '" id="' + this.regionElement.id + '" class="input-text" title="' + this.regionElement.title + '"' + (disabled ? " disabled" : "") + '>';
-+        var text = document.createElement('input');
-+        text.setAttribute('type', 'text');
-+        text.setAttribute('name', this.regionElement.name);
-+        text.setAttribute('title', this.regionElement.title);
-+        text.setAttribute('id', this.regionElement.id);
-+        text.setAttribute('class', 'input-text');
-+        if (disabled) {
-+            text.setAttribute('disabled', '');
-+        }
-         var parentNode = this.regionElement.parentNode;
-         var regionElementId = this.regionElement.id;
--        parentNode.innerHTML = html;
-+        parentNode.innerHTML = text.outerHTML;
-         this.regionElement = $(regionElementId);
-     }
- }
-diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
-index 6677b800764..0d07051e666 100644
---- a/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
-+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
-@@ -3,34 +3,38 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Backend\Block\Template */ ?>
- <div class="field field-store-switcher">
--    <label class="label" for="store_switcher"><?= /* @escapeNotVerified */ __('Current Configuration Scope:') ?></label>
-+    <label class="label" for="store_switcher"><?= $block->escapeHtml(__('Current Configuration Scope:')) ?></label>
-     <div class="control">
--        <select id="store_switcher" class="system-config-store-switcher" onchange="location.href=this.options[this.selectedIndex].getAttribute('url')">
--        <?php foreach ($block->getStoreSelectOptions() as $_value => $_option): ?>
--        <?php if (isset($_option['is_group'])): ?>
--            <?php if ($_option['is_close']): ?>
--                </optgroup>
--            <?php else: ?>
--                <optgroup label="<?= $block->escapeHtml($_option['label']) ?>" style="<?= /* @escapeNotVerified */ $_option['style'] ?>">
-+        <select id="store_switcher" class="system-config-store-switcher"
-+                onchange="location.href=this.options[this.selectedIndex].getAttribute('url')">
-+        <?php foreach ($block->getStoreSelectOptions() as $_value => $_option) : ?>
-+            <?php if (isset($_option['is_group'])) : ?>
-+                <?php if ($_option['is_close']) : ?>
-+                    </optgroup>
-+                <?php else : ?>
-+                    <optgroup label="<?= $block->escapeHtmlAttr($_option['label']) ?>"
-+                              style="<?= $block->escapeHtmlAttr($_option['style']) ?>">
-+                <?php endif; ?>
-+                <?php continue ?>
-             <?php endif; ?>
--            <?php continue ?>
--        <?php endif; ?>
--          <option value="<?= $block->escapeHtml($_value) ?>" url="<?= /* @escapeNotVerified */ $_option['url'] ?>" <?= $_option['selected'] ? 'selected="selected"' : '' ?> style="<?= /* @escapeNotVerified */ $_option['style'] ?>">
--              <?= $block->escapeHtml($_option['label']) ?>
--          </option>
-+              <option value="<?= $block->escapeHtmlAttr($_value) ?>"
-+                      url="<?= $block->escapeUrl($_option['url']) ?>"
-+                      <?= $_option['selected'] ? 'selected="selected"' : '' ?>
-+                      style="<?= $block->escapeHtmlAttr($_option['style']) ?>">
-+                  <?= $block->escapeHtml($_option['label']) ?>
-+              </option>
-         <?php endforeach ?>
-         </select>
-     </div>
-     <?= $block->getHintHtml() ?>
--    <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
-+    <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::store')) : ?>
-         <div class="actions">
--            <a href="<?= /* @escapeNotVerified */ $block->getUrl('*/system_store') ?>"><?= /* @escapeNotVerified */ __('Stores') ?></a>
-+            <a href="<?= $block->escapeUrl($block->getUrl('*/system_store')) ?>">
-+                <?= $block->escapeHtml(__('Stores')) ?>
-+            </a>
-         </div>
-     <?php endif; ?>
- </div>
-diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml
-index d7000f28b5e..73641206a02 100644
---- a/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml
-+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml
-@@ -4,52 +4,46 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Config\Block\System\Config\Tabs */
- ?>
- 
--<?php if ($block->getTabs()): ?>
--    <div id="<?= /* @escapeNotVerified */ $block->getId() ?>" class="config-nav">
-+<?php if ($block->getTabs()) : ?>
-+    <div id="<?= $block->escapeHtmlAttr($block->getId()) ?>" class="config-nav">
-         <?php
-         /** @var $_tab \Magento\Config\Model\Config\Structure\Element\Tab */
--        foreach ($block->getTabs() as $_tab):
--            ?>
--
--            <?php
--                $activeCollapsible = false;
--                foreach ($_tab->getChildren() as $_section) {
--                    if ($block->isSectionActive($_section)) {
--                        $activeCollapsible = true;
--                    }
-+        foreach ($block->getTabs() as $_tab) :
-+            $activeCollapsible = false;
-+            foreach ($_tab->getChildren() as $_section) {
-+                if ($block->isSectionActive($_section)) {
-+                    $activeCollapsible = true;
-                 }
--            ?>
-+            } ?>
- 
-             <div class="config-nav-block admin__page-nav _collapsed
--                <?php if ($_tab->getClass()): ?>
--                    <?= /* @escapeNotVerified */ $_tab->getClass() ?>
-+                <?php if ($_tab->getClass()) : ?>
-+                    <?= $block->escapeHtmlAttr($_tab->getClass()) ?>
-                 <?php endif ?>"
--                 data-mage-init='{"collapsible":{"active": "<?= /* @escapeNotVerified */ $activeCollapsible ?>",
-+                 data-mage-init='{"collapsible":{"active": "<?= $block->escapeHtmlAttr($activeCollapsible) ?>",
-                  "openedState": "_show",
-                  "closedState": "_hide",
-                  "collapsible": true,
-                  "animate": 200}}'>
-                 <div class="admin__page-nav-title title _collapsible" data-role="title">
--                    <strong><?= /* @escapeNotVerified */ $_tab->getLabel() ?></strong>
-+                    <strong><?= $block->escapeHtml($_tab->getLabel()) ?></strong>
-                 </div>
- 
-                 <ul class="admin__page-nav-items items" data-role="content">
-                     <?php $_iterator = 1; ?>
-                     <?php
-                     /** @var $_section \Magento\Config\Model\Config\Structure\Element\Section */
--                    foreach ($_tab->getChildren() as $_section): ?>
-+                    foreach ($_tab->getChildren() as $_section) : ?>
-                         <li class="admin__page-nav-item item
--                            <?= /* @escapeNotVerified */ $_section->getClass() ?>
--                            <?php if ($block->isSectionActive($_section)): ?> _active<?php endif ?>
-+                            <?= $block->escapeHtml($_section->getClass()) ?>
-+                            <?php if ($block->isSectionActive($_section)) : ?> _active<?php endif ?>
-                             <?= $_tab->getChildren()->isLast($_section) ? ' _last' : '' ?>">
--                            <a href="<?= /* @escapeNotVerified */ $block->getSectionUrl($_section) ?>"
-+                            <a href="<?= $block->escapeUrl($block->getSectionUrl($_section)) ?>"
-                                class="admin__page-nav-link item-nav">
--                               <span><?= /* @escapeNotVerified */ $_section->getLabel() ?></span>
-+                               <span><?= $block->escapeHtml($_section->getLabel()) ?></span>
-                             </a>
-                         </li>
-                         <?php $_iterator++; ?>
-@@ -57,8 +51,6 @@
-                 </ul>
- 
-             </div>
--        <?php
--        endforeach;
--        ?>
-+        <?php endforeach; ?>
-     </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
-index 58462b873d8..7146108f61f 100644
---- a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
-+++ b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
-@@ -3,14 +3,21 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\ConfigurableImportExport\Model\Export;
- 
--use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
- use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
--use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
-+use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
- use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
- use Magento\ImportExport\Model\Import;
-+use Magento\Store\Model\Store;
-+use Magento\Store\Model\StoreManagerInterface;
- 
-+/**
-+ * Customizes output during export
-+ */
- class RowCustomizer implements RowCustomizerInterface
- {
-     /**
-@@ -36,6 +43,19 @@ class RowCustomizer implements RowCustomizerInterface
-         self::CONFIGURABLE_VARIATIONS_LABELS_COLUMN
-     ];
- 
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(StoreManagerInterface $storeManager)
-+    {
-+        $this->storeManager = $storeManager;
-+    }
-+
-     /**
-      * Prepare configurable data for export
-      *
-@@ -49,6 +69,9 @@ class RowCustomizer implements RowCustomizerInterface
-         $productCollection->addAttributeToFilter('entity_id', ['in' => $productIds])
-             ->addAttributeToFilter('type_id', ['eq' => ConfigurableProductType::TYPE_CODE]);
- 
-+        // set global scope during export
-+        $this->storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
-+
-         while ($product = $productCollection->fetchItem()) {
-             $productAttributesOptions = $product->getTypeInstance()->getConfigurableOptions($product);
-             $this->configurableData[$product->getId()] = [];
-diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
-index fdbd8560c26..2767e725cc9 100644
---- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
-+++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
-@@ -248,7 +248,7 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
-      */
-     protected function _addAttributeParams($attrSetName, array $attrParams, $attribute)
-     {
--        // save super attributes for simplier and quicker search in future
-+        // save super attributes for simpler and quicker search in future
-         if ('select' == $attrParams['type'] && 1 == $attrParams['is_global']) {
-             $this->_superAttributes[$attrParams['code']] = $attrParams;
-         }
-@@ -596,7 +596,7 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
-                     $additionalRow['_super_attribute_position'] = $position;
-                     $additionalRows[] = $additionalRow;
-                     $additionalRow = [];
--                    $position += 1;
-+                    $position ++;
-                 }
-             } else {
-                 throw new LocalizedException(
-@@ -937,7 +937,7 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
-         }
-         foreach ($dataWithExtraVirtualRows as $option) {
-             if (isset($option['_super_products_sku'])) {
--                if (in_array($option['_super_products_sku'], $skus)) {
-+                if (in_array($option['_super_products_sku'], $skus, true)) {
-                     $error = true;
-                     $this->_entityModel->addRowError(
-                         sprintf(
-diff --git a/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php
-index 4446f98cff5..8d75fd902e9 100644
---- a/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php
-+++ b/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php
-@@ -616,6 +616,83 @@ class ConfigurableTest extends \Magento\ImportExport\Test\Unit\Model\Import\Abst
-         }
-     }
- 
-+    public function testRowValidationForNumericalSkus()
-+    {
-+        // Set _attributes to avoid error in Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType.
-+        $this->setPropertyValue($this->configurable, '_attributes', [
-+            'Default' => [],
-+        ]);
-+        // Avoiding errors about attributes not being super
-+        $this->setPropertyValue(
-+            $this->configurable,
-+            '_superAttributes',
-+            [
-+                'testattr2' => [
-+                    'options' => [
-+                        'attr2val1' => 1,
-+                        'attr2val2' => 2,
-+                    ]
-+                ],
-+            ]
-+        );
-+
-+        $rowValidationDataProvider = $this->rowValidationDataProvider();
-+
-+        // Checking that variations with duplicate sku are invalid
-+        $result = $this->configurable->isRowValid($rowValidationDataProvider['duplicateProduct'], 0);
-+        $this->assertFalse($result);
-+
-+        // Checking that variations with SKUs that are the same when interpreted as number,
-+        // but different when interpreted as string are valid
-+        $result = $this->configurable->isRowValid($rowValidationDataProvider['nonDuplicateProduct'], 0);
-+        $this->assertTrue($result);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function rowValidationDataProvider()
-+    {
-+        return [
-+            'duplicateProduct' => [
-+                'sku' => 'configurableNumericalSkuDuplicateVariation',
-+                'store_view_code' => null,
-+                'attribute_set_code' => 'Default',
-+                'product_type' => 'configurable',
-+                'name' => 'Configurable Product with duplicate numerical SKUs in variations',
-+                'product_websites' => 'website_1',
-+                'configurable_variation_labels' => 'testattr2=Select Configuration',
-+                'configurable_variations' => 'sku=1234.1,'
-+                    . 'testattr2=attr2val1,'
-+                    . 'display=1|sku=1234.1,'
-+                    . 'testattr2=attr2val1,'
-+                    . 'display=0',
-+                '_store' => null,
-+                '_attribute_set' => 'Default',
-+                '_type' => 'configurable',
-+                '_product_websites' => 'website_1',
-+            ],
-+            'nonDuplicateProduct' => [
-+                'sku' => 'configurableNumericalSkuNonDuplicateVariation',
-+                'store_view_code' => null,
-+                'attribute_set_code' => 'Default',
-+                'product_type' => 'configurable',
-+                'name' => 'Configurable Product with different numerical SKUs in variations',
-+                'product_websites' => 'website_1',
-+                'configurable_variation_labels' => 'testattr2=Select Configuration',
-+                'configurable_variations' => 'sku=1234.10,'
-+                    . 'testattr2=attr2val1,'
-+                    . 'display=1|sku=1234.1,'
-+                    . 'testattr2=attr2val2,'
-+                    . 'display=0',
-+                '_store' => null,
-+                '_attribute_set' => 'Default',
-+                '_type' => 'configurable',
-+                '_product_websites' => 'website_1',
-+            ]
-+        ];
-+    }
-+
-     /**
-      * Set object property value.
-      *
-diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
-index c1aab3e7a14..419a08e14b0 100644
---- a/app/code/Magento/ConfigurableImportExport/composer.json
-+++ b/app/code/Magento/ConfigurableImportExport/composer.json
-@@ -11,7 +11,8 @@
-         "magento/module-catalog-import-export": "*",
-         "magento/module-configurable-product": "*",
-         "magento/module-eav": "*",
--        "magento/module-import-export": "*"
-+        "magento/module-import-export": "*",
-+        "magento/module-store": "*"
-     },
-     "type": "magento2-module",
-     "license": [
-diff --git a/app/code/Magento/ConfigurableImportExport/etc/module.xml b/app/code/Magento/ConfigurableImportExport/etc/module.xml
-index 7ff81f8d634..b59234ca0e7 100644
---- a/app/code/Magento/ConfigurableImportExport/etc/module.xml
-+++ b/app/code/Magento/ConfigurableImportExport/etc/module.xml
-@@ -6,6 +6,9 @@
-  */
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
--    <module name="Magento_ConfigurableImportExport" >
-+    <module name="Magento_ConfigurableImportExport">
-+        <sequence>
-+            <module name="Magento_ConfigurableProduct"/>
-+        </sequence>
-     </module>
- </config>
-diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php
-index 8848fc78dad..f2de5e72211 100644
---- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php
-+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php
-@@ -8,7 +8,6 @@ namespace Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Button;
- use Magento\Ui\Component\Control\Container;
- use Magento\Catalog\Block\Adminhtml\Product\Edit\Button\Generic;
- use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
--use Magento\Catalog\Model\Product\Type;
- 
- /**
-  * Class Save
-@@ -16,16 +15,7 @@ use Magento\Catalog\Model\Product\Type;
- class Save extends Generic
- {
-     /**
--     * @var array
--     */
--    private static $availableProductTypes = [
--        ConfigurableType::TYPE_CODE,
--        Type::TYPE_SIMPLE,
--        Type::TYPE_VIRTUAL
--    ];
--
--    /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getButtonData()
-     {
-@@ -135,7 +125,8 @@ class Save extends Generic
-     }
- 
-     /**
--     * Retrieve target for button
-+     * Retrieve target for button.
-+     *
-      * @return string
-      */
-     protected function getSaveTarget()
-@@ -148,7 +139,8 @@ class Save extends Generic
-     }
- 
-     /**
--     * Retrieve action for button
-+     * Retrieve action for button.
-+     *
-      * @return string
-      */
-     protected function getSaveAction()
-@@ -161,10 +153,12 @@ class Save extends Generic
-     }
- 
-     /**
-+     * Is configurable product.
-+     *
-      * @return boolean
-      */
-     protected function isConfigurableProduct()
-     {
--        return in_array($this->getProduct()->getTypeId(), self::$availableProductTypes);
-+        return !$this->getProduct()->isComposite() || $this->getProduct()->getTypeId() === ConfigurableType::TYPE_CODE;
-     }
- }
-diff --git a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
-index 3b657dd1ab2..77110975401 100644
---- a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
-+++ b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
-@@ -70,4 +70,14 @@ class Configurable extends Renderer implements IdentityInterface
-         }
-         return $identities;
-     }
-+
-+    /**
-+     * Get price for exact simple product added to cart
-+     *
-+     * @inheritdoc
-+     */
-+    public function getProductPriceHtml(\Magento\Catalog\Model\Product $product)
-+    {
-+        return parent::getProductPriceHtml($this->getChildProduct());
-+    }
- }
-diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
-index 2502b79921e..e07879e93a6 100644
---- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
-+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
-@@ -15,6 +15,8 @@ use Magento\Framework\Locale\Format;
- use Magento\Framework\Pricing\PriceCurrencyInterface;
- 
- /**
-+ * Confugurable product view type
-+ *
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @api
-@@ -276,6 +278,8 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
-     }
- 
-     /**
-+     * Collect price options
-+     *
-      * @return array
-      */
-     protected function getOptionPrices()
-@@ -314,6 +318,11 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
-                         ),
-                     ],
-                     'tierPrices' => $tierPrices,
-+                    'msrpPrice' => [
-+                        'amount' => $this->localeFormat->getNumber(
-+                            $product->getMsrp()
-+                        ),
-+                    ],
-                  ];
-         }
-         return $prices;
-diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php
-index 5991097e456..34f10b59f3a 100644
---- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php
-+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php
-@@ -6,10 +6,11 @@
-  */
- namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Framework\Controller\ResultFactory;
- 
--class AddAttribute extends Action
-+class AddAttribute extends Action implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
-index 6f5f106a8bb..8b4c8d29cd9 100644
---- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
-+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
-@@ -4,12 +4,21 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product\Attribute;
- 
- use Magento\Backend\App\Action;
-+use Magento\Catalog\Api\Data\ProductAttributeInterface;
- use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Json\Helper\Data;
- 
--class CreateOptions extends Action
-+/**
-+ * Creates options for product attributes
-+ */
-+class CreateOptions extends Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -19,28 +28,33 @@ class CreateOptions extends Action
-     const ADMIN_RESOURCE = 'Magento_Catalog::products';
- 
-     /**
--     * @var \Magento\Framework\Json\Helper\Data
-+     * @var Data
-      */
-     protected $jsonHelper;
- 
-     /**
--     * @var \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory
-+     * @var AttributeFactory
-      */
-     protected $attributeFactory;
- 
-+    /**
-+     * @var ProductAttributeInterface[]
-+     */
-+    private $attributes;
-+
-     /**
-      * @param Action\Context $context
--     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
-+     * @param Data $jsonHelper
-      * @param AttributeFactory $attributeFactory
-      */
-     public function __construct(
-         Action\Context $context,
--        \Magento\Framework\Json\Helper\Data $jsonHelper,
-+        Data $jsonHelper,
-         AttributeFactory $attributeFactory
-     ) {
-+        parent::__construct($context);
-         $this->jsonHelper = $jsonHelper;
-         $this->attributeFactory = $attributeFactory;
--        parent::__construct($context);
-     }
- 
-     /**
-@@ -50,7 +64,15 @@ class CreateOptions extends Action
-      */
-     public function execute()
-     {
--        $this->getResponse()->representJson($this->jsonHelper->jsonEncode($this->saveAttributeOptions()));
-+        try {
-+            $output = $this->saveAttributeOptions();
-+        } catch (LocalizedException $e) {
-+            $output = [
-+                'error' => true,
-+                'message' => $e->getMessage(),
-+            ];
-+        }
-+        $this->getResponse()->representJson($this->jsonHelper->jsonEncode($output));
-     }
- 
-     /**
-@@ -60,31 +82,103 @@ class CreateOptions extends Action
-      * @TODO Move this logic to configurable product type model
-      *   when full set of operations for attribute options during
-      *   product creation will be implemented: edit labels, remove, reorder.
--     * Currently only addition of options to end and removal of just added option is supported.
-+     * Currently only addition of options is supported.
-+     * @throws LocalizedException
-      */
-     protected function saveAttributeOptions()
-     {
--        $options = (array)$this->getRequest()->getParam('options');
-+        $attributeIds = $this->getUpdatedAttributeIds();
-         $savedOptions = [];
--        foreach ($options as $option) {
--            if (isset($option['label']) && isset($option['is_new'])) {
--                $attribute = $this->attributeFactory->create();
--                $attribute->load($option['attribute_id']);
--                $optionsBefore = $attribute->getSource()->getAllOptions(false);
--                $attribute->setOption(
--                    [
--                        'value' => ['option_0' => [$option['label']]],
--                        'order' => ['option_0' => count($optionsBefore) + 1],
--                    ]
--                );
--                $attribute->save();
--                $attribute = $this->attributeFactory->create();
--                $attribute->load($option['attribute_id']);
--                $optionsAfter = $attribute->getSource()->getAllOptions(false);
--                $newOption = array_pop($optionsAfter);
--                $savedOptions[$option['id']] = $newOption['value'];
-+        foreach ($attributeIds as $attributeId => $newOptions) {
-+            $attribute = $this->getAttribute($attributeId);
-+            $this->checkUnique($attribute, $newOptions);
-+            foreach ($newOptions as $newOption) {
-+                $lastAddedOption = $this->saveOption($attribute, $newOption);
-+                $savedOptions[$newOption['id']] = $lastAddedOption['value'];
-             }
-         }
-+
-         return $savedOptions;
-     }
-+
-+    /**
-+     * Checks unique values
-+     *
-+     * @param ProductAttributeInterface $attribute
-+     * @param array $newOptions
-+     * @return void
-+     * @throws LocalizedException
-+     */
-+    private function checkUnique(ProductAttributeInterface $attribute, array $newOptions)
-+    {
-+        $originalOptions = $attribute->getSource()->getAllOptions(false);
-+        $allOptions = array_merge($originalOptions, $newOptions);
-+        $optionValues = array_map(
-+            function ($option) {
-+                return $option['label'] ?? null;
-+            },
-+            $allOptions
-+        );
-+
-+        $uniqueValues = array_unique(array_filter($optionValues));
-+        $duplicates = array_diff_assoc($optionValues, $uniqueValues);
-+        if ($duplicates) {
-+            throw new LocalizedException(__('The value of attribute ""%1"" must be unique', $attribute->getName()));
-+        }
-+    }
-+
-+    /**
-+     * Loads the product attribute by the id
-+     *
-+     * @param int $attributeId
-+     * @return ProductAttributeInterface
-+     */
-+    private function getAttribute(int $attributeId)
-+    {
-+        if (!isset($this->attributes[$attributeId])) {
-+            $attribute = $this->attributeFactory->create();
-+            $this->attributes[$attributeId] = $attribute->load($attributeId);
-+        }
-+
-+        return $this->attributes[$attributeId];
-+    }
-+
-+    /**
-+     * Retrieve updated attribute ids with new options
-+     *
-+     * @return array
-+     */
-+    private function getUpdatedAttributeIds()
-+    {
-+        $options = (array)$this->getRequest()->getParam('options');
-+        $updatedAttributeIds = [];
-+        foreach ($options as $option) {
-+            if (isset($option['label'], $option['is_new'], $option['attribute_id'])) {
-+                $updatedAttributeIds[$option['attribute_id']][] = $option;
-+            }
-+        }
-+
-+        return $updatedAttributeIds;
-+    }
-+
-+    /**
-+     * Saves the option
-+     *
-+     * @param ProductAttributeInterface $attribute
-+     * @param array $newOption
-+     * @return array
-+     */
-+    private function saveOption(ProductAttributeInterface $attribute, array $newOption)
-+    {
-+        $optionsBefore = $attribute->getSource()->getAllOptions(false);
-+        $attribute->setOption(
-+            [
-+                'value' => ['option_0' => [$newOption['label']]],
-+                'order' => ['option_0' => count($optionsBefore) + 1],
-+            ]
-+        );
-+        $attribute->save();
-+        $optionsAfter = $attribute->getSource()->getAllOptions(false);
-+        return array_pop($optionsAfter);
-+    }
- }
-diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php
-index b6b34073db6..9f5d5062b53 100644
---- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php
-+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php
-@@ -6,10 +6,11 @@
-  */
- namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product\Attribute;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Backend\App\Action;
- use Magento\ConfigurableProduct\Model\AttributesListInterface;
- 
--class GetAttributes extends Action
-+class GetAttributes extends Action implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php
-index 5cd8b6a7d0b..b5940e36aa7 100644
---- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php
-+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php
-@@ -158,7 +158,7 @@ class Configurable
-             $configurableMatrix = json_decode($configurableMatrix, true);
- 
-             foreach ($configurableMatrix as $item) {
--                if ($item['newProduct']) {
-+                if (isset($item['newProduct']) && $item['newProduct']) {
-                     $result[$item['variationKey']] = $this->mapData($item);
- 
-                     if (isset($item['qty'])) {
-diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php
-index 8adfdea9610..104181aed4f 100644
---- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php
-+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Catalog\Controller\Adminhtml\Product\Builder;
-@@ -13,7 +15,7 @@ use Magento\Backend\App\Action\Context;
- /**
-  * Class Wizard
-  */
--class Wizard extends Action
-+class Wizard extends Action implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/ConfigurableProduct/Model/Inventory/ParentItemProcessor.php b/app/code/Magento/ConfigurableProduct/Model/Inventory/ParentItemProcessor.php
-new file mode 100644
-index 00000000000..f1567f2b196
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Model/Inventory/ParentItemProcessor.php
-@@ -0,0 +1,129 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ConfigurableProduct\Model\Inventory;
-+
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-+use Magento\Catalog\Api\Data\ProductInterface as Product;
-+use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
-+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
-+use Magento\CatalogInventory\Api\StockConfigurationInterface;
-+use Magento\CatalogInventory\Api\Data\StockItemInterface;
-+use Magento\CatalogInventory\Observer\ParentItemProcessorInterface;
-+
-+/**
-+ * Process parent stock item
-+ */
-+class ParentItemProcessor implements ParentItemProcessorInterface
-+{
-+    /**
-+     * @var Configurable
-+     */
-+    private $configurableType;
-+
-+    /**
-+     * @var StockItemCriteriaInterfaceFactory
-+     */
-+    private $criteriaInterfaceFactory;
-+
-+    /**
-+     * @var StockItemRepositoryInterface
-+     */
-+    private $stockItemRepository;
-+
-+    /**
-+     * @var StockConfigurationInterface
-+     */
-+    private $stockConfiguration;
-+
-+    /**
-+     * @param Configurable $configurableType
-+     * @param StockItemCriteriaInterfaceFactory $criteriaInterfaceFactory
-+     * @param StockItemRepositoryInterface $stockItemRepository
-+     * @param StockConfigurationInterface $stockConfiguration
-+     */
-+    public function __construct(
-+        Configurable $configurableType,
-+        StockItemCriteriaInterfaceFactory $criteriaInterfaceFactory,
-+        StockItemRepositoryInterface $stockItemRepository,
-+        StockConfigurationInterface $stockConfiguration
-+    ) {
-+        $this->configurableType = $configurableType;
-+        $this->criteriaInterfaceFactory = $criteriaInterfaceFactory;
-+        $this->stockItemRepository = $stockItemRepository;
-+        $this->stockConfiguration = $stockConfiguration;
-+    }
-+
-+    /**
-+     * Process parent products
-+     *
-+     * @param Product $product
-+     * @return void
-+     */
-+    public function process(Product $product)
-+    {
-+        $parentIds = $this->configurableType->getParentIdsByChild($product->getId());
-+        foreach ($parentIds as $productId) {
-+            $this->processStockForParent((int)$productId);
-+        }
-+    }
-+
-+    /**
-+     * Change stock item for parent product depending on children stock items
-+     *
-+     * @param int $productId
-+     * @return void
-+     */
-+    private function processStockForParent(int $productId)
-+    {
-+        $criteria = $this->criteriaInterfaceFactory->create();
-+        $criteria->setScopeFilter($this->stockConfiguration->getDefaultScopeId());
-+
-+        $criteria->setProductsFilter($productId);
-+        $stockItemCollection = $this->stockItemRepository->getList($criteria);
-+        $allItems = $stockItemCollection->getItems();
-+        if (empty($allItems)) {
-+            return;
-+        }
-+        $parentStockItem = array_shift($allItems);
-+
-+        $childrenIds = $this->configurableType->getChildrenIds($productId);
-+        $criteria->setProductsFilter($childrenIds);
-+        $stockItemCollection = $this->stockItemRepository->getList($criteria);
-+        $allItems = $stockItemCollection->getItems();
-+
-+        $childrenIsInStock = false;
-+
-+        foreach ($allItems as $childItem) {
-+            if ($childItem->getIsInStock() === true) {
-+                $childrenIsInStock = true;
-+                break;
-+            }
-+        }
-+
-+        if ($this->isNeedToUpdateParent($parentStockItem, $childrenIsInStock)) {
-+            $parentStockItem->setIsInStock($childrenIsInStock);
-+            $parentStockItem->setStockStatusChangedAuto(1);
-+            $this->stockItemRepository->save($parentStockItem);
-+        }
-+    }
-+
-+    /**
-+     * Check is parent item should be updated
-+     *
-+     * @param StockItemInterface $parentStockItem
-+     * @param bool $childrenIsInStock
-+     * @return bool
-+     */
-+    private function isNeedToUpdateParent(
-+        StockItemInterface $parentStockItem,
-+        bool $childrenIsInStock
-+    ): bool {
-+        return $parentStockItem->getIsInStock() !== $childrenIsInStock &&
-+            ($childrenIsInStock === false || $parentStockItem->getStockStatusChangedAuto());
-+    }
-+}
-diff --git a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
-index 79c2dd812ac..890564fdb30 100644
---- a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
-@@ -1,6 +1,5 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-@@ -11,6 +10,11 @@ use Magento\Framework\Exception\InputException;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Exception\StateException;
- 
-+/**
-+ * Configurable product link management.
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementInterface
- {
-     /**
-@@ -68,7 +72,7 @@ class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementI
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getChildren($sku)
-     {
-@@ -107,11 +111,15 @@ class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementI
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     * @throws InputException
-+     * @throws NoSuchEntityException
-+     * @throws StateException
-+     * @throws \Magento\Framework\Exception\CouldNotSaveException
-      */
-     public function addChild($sku, $childSku)
-     {
--        $product = $this->productRepository->get($sku);
-+        $product = $this->productRepository->get($sku, true);
-         $child = $this->productRepository->get($childSku);
- 
-         $childrenIds = array_values($this->configurableType->getChildrenIds($product->getId())[0]);
-@@ -124,7 +132,7 @@ class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementI
-             throw new StateException(__("The parent product doesn't have configurable product options."));
-         }
- 
--        $attributeIds = [];
-+        $attributeData = [];
-         foreach ($configurableProductOptions as $configurableProductOption) {
-             $attributeCode = $configurableProductOption->getProductAttribute()->getAttributeCode();
-             if (!$child->getData($attributeCode)) {
-@@ -135,9 +143,11 @@ class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementI
-                     )
-                 );
-             }
--            $attributeIds[] = $configurableProductOption->getAttributeId();
-+            $attributeData[$configurableProductOption->getAttributeId()] = [
-+                'position' => $configurableProductOption->getPosition()
-+            ];
-         }
--        $configurableOptionData = $this->getConfigurableAttributesData($attributeIds);
-+        $configurableOptionData = $this->getConfigurableAttributesData($attributeData);
- 
-         /** @var \Magento\ConfigurableProduct\Helper\Product\Options\Factory $optionFactory */
-         $optionFactory = $this->getOptionsFactory();
-@@ -150,7 +160,11 @@ class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementI
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     * @throws InputException
-+     * @throws NoSuchEntityException
-+     * @throws StateException
-+     * @throws \Magento\Framework\Exception\CouldNotSaveException
-      */
-     public function removeChild($sku, $childSku)
-     {
-@@ -199,16 +213,16 @@ class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementI
-     /**
-      * Get Configurable Attribute Data
-      *
--     * @param int[] $attributeIds
-+     * @param int[] $attributeData
-      * @return array
-      */
--    private function getConfigurableAttributesData($attributeIds)
-+    private function getConfigurableAttributesData($attributeData)
-     {
-         $configurableAttributesData = [];
-         $attributeValues = [];
-         $attributes = $this->attributeFactory->create()
-             ->getCollection()
--            ->addFieldToFilter('attribute_id', $attributeIds)
-+            ->addFieldToFilter('attribute_id', array_keys($attributeData))
-             ->getItems();
-         foreach ($attributes as $attribute) {
-             foreach ($attribute->getOptions() as $option) {
-@@ -225,6 +239,7 @@ class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementI
-                     'attribute_id' => $attribute->getId(),
-                     'code' => $attribute->getAttributeCode(),
-                     'label' => $attribute->getStoreLabel(),
-+                    'position' => $attributeData[$attribute->getId()]['position'],
-                     'values' => $attributeValues,
-                 ];
-         }
-diff --git a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
-index b4db0a4db5f..368ecad1924 100644
---- a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
-@@ -22,6 +22,7 @@ use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Store\Model\Store;
- 
- /**
-+ * Repository for performing CRUD operations for a configurable product's options.
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionRepositoryInterface
-@@ -112,7 +113,7 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function get($sku, $id)
-     {
-@@ -131,7 +132,7 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getList($sku)
-     {
-@@ -141,7 +142,7 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function delete(OptionInterface $option)
-     {
-@@ -167,7 +168,7 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function deleteById($sku, $id)
-     {
-@@ -184,7 +185,7 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-     public function save($sku, OptionInterface $option)
-@@ -213,6 +214,16 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
-                 throw new \InvalidArgumentException('Incompatible product type');
-             }
-             $option->setProductId($product->getData($metadata->getLinkField()));
-+            if (!empty($option->getProductId() && !empty($option->getAttributeId()))) {
-+                $id = $this->optionResource->getIdByProductIdAndAttributeId(
-+                    $option,
-+                    $option->getProductId(),
-+                    $option->getAttributeId()
-+                );
-+                if (!empty($id)) {
-+                    $option->setId($id);
-+                }
-+            }
-         }
- 
-         try {
-@@ -296,6 +307,7 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
- 
-     /**
-      * Get MetadataPool instance
-+     *
-      * @return MetadataPool
-      */
-     private function getMetadataPool()
-diff --git a/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php
-new file mode 100644
-index 00000000000..92b7ab0d88e
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ConfigurableProduct\Model\Plugin\Frontend;
-+
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-+use Magento\Catalog\Model\Product;
-+
-+/**
-+ *  Extender of product identities for child of configurable products
-+ */
-+class ProductIdentitiesExtender
-+{
-+    /**
-+     * @var Configurable
-+     */
-+    private $configurableType;
-+
-+    /**
-+     * @param Configurable $configurableType
-+     */
-+    public function __construct(Configurable $configurableType)
-+    {
-+        $this->configurableType = $configurableType;
-+    }
-+
-+    /**
-+     * Add child identities to product identities
-+     *
-+     * @param Product $subject
-+     * @param array $identities
-+     * @return array
-+     */
-+    public function afterGetIdentities(Product $subject, array $identities): array
-+    {
-+        foreach ($this->configurableType->getChildrenIds($subject->getId()) as $childIds) {
-+            foreach ($childIds as $childId) {
-+                $identities[] = Product::CACHE_TAG . '_' . $childId;
-+            }
-+        }
-+
-+        return array_unique($identities);
-+    }
-+}
-diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Configuration/Item/ItemProductResolver.php b/app/code/Magento/ConfigurableProduct/Model/Product/Configuration/Item/ItemProductResolver.php
-index 6c33ecc138a..7de78b6612a 100644
---- a/app/code/Magento/ConfigurableProduct/Model/Product/Configuration/Item/ItemProductResolver.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Configuration/Item/ItemProductResolver.php
-@@ -13,16 +13,17 @@ use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Catalog\Model\Product;
-+use Magento\Store\Model\ScopeInterface;
- 
- /**
-- * {@inheritdoc}
-+ * Resolves the product from a configured item.
-  */
- class ItemProductResolver implements ItemResolverInterface
- {
-     /**
-      * Path in config to the setting which defines if parent or child product should be used to generate a thumbnail.
-      */
--    const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/configurable_product_image';
-+    public const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/configurable_product_image';
- 
-     /**
-      * @var ScopeConfigInterface
-@@ -38,27 +39,21 @@ class ItemProductResolver implements ItemResolverInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Get the final product from a configured item by product type and selection.
-+     *
-+     * @param ItemInterface $item
-+     * @return ProductInterface
-      */
--    public function getFinalProduct(ItemInterface $item) : ProductInterface
-+    public function getFinalProduct(ItemInterface $item): ProductInterface
-     {
-         /**
-          * Show parent product thumbnail if it must be always shown according to the related setting in system config
-          * or if child thumbnail is not available.
-          */
--        $parentProduct = $item->getProduct();
--        $finalProduct = $parentProduct;
-+        $finalProduct = $item->getProduct();
-         $childProduct = $this->getChildProduct($item);
--        if ($childProduct !== $parentProduct) {
--            $configValue = $this->scopeConfig->getValue(
--                self::CONFIG_THUMBNAIL_SOURCE,
--                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--            );
--            $childThumb = $childProduct->getData('thumbnail');
--            $finalProduct =
--                ($configValue == Thumbnail::OPTION_USE_PARENT_IMAGE) || (!$childThumb || $childThumb == 'no_selection')
--                    ? $parentProduct
--                    : $childProduct;
-+        if ($childProduct !== null && $this->isUseChildProduct($childProduct)) {
-+            $finalProduct = $childProduct;
-         }
-         return $finalProduct;
-     }
-@@ -67,15 +62,30 @@ class ItemProductResolver implements ItemResolverInterface
-      * Get item configurable child product.
-      *
-      * @param ItemInterface $item
--     * @return Product
-+     * @return Product | null
-      */
--    private function getChildProduct(ItemInterface $item) : Product
-+    private function getChildProduct(ItemInterface $item): ?Product
-     {
-+        /** @var \Magento\Quote\Model\Quote\Item\Option $option */
-         $option = $item->getOptionByCode('simple_product');
--        $product = $item->getProduct();
--        if ($option) {
--            $product = $option->getProduct();
--        }
--        return $product;
-+        return $option ? $option->getProduct() : null;
-+    }
-+
-+    /**
-+     * Is need to use child product
-+     *
-+     * @param Product $childProduct
-+     * @return bool
-+     */
-+    private function isUseChildProduct(Product $childProduct): bool
-+    {
-+        $configValue = $this->scopeConfig->getValue(
-+            self::CONFIG_THUMBNAIL_SOURCE,
-+            ScopeInterface::SCOPE_STORE
-+        );
-+        $childThumb = $childProduct->getData('thumbnail');
-+        return $configValue !== Thumbnail::OPTION_USE_PARENT_IMAGE
-+            && $childThumb !== null
-+            && $childThumb !== 'no_selection';
-     }
- }
-diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
-index 19de63b7a97..a849d964eae 100644
---- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
-@@ -24,6 +24,7 @@ use Magento\Framework\EntityManager\MetadataPool;
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @api
-  * @since 100.0.2
-  */
-@@ -453,6 +454,10 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
-             ['group' => 'CONFIGURABLE', 'method' => __METHOD__]
-         );
-         if (!$product->hasData($this->_configurableAttributes)) {
-+            // for new product do not load configurable attributes
-+            if (!$product->getId()) {
-+                return [];
-+            }
-             $configurableAttributes = $this->getConfigurableAttributeCollection($product);
-             $this->extensionAttributesJoinProcessor->process($configurableAttributes);
-             $configurableAttributes->orderByPosition()->load();
-@@ -1227,6 +1232,8 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
-     /**
-      * Returns array of sub-products for specified configurable product
-      *
-+     * $requiredAttributeIds - one dimensional array, if provided
-+     *
-      * Result array contains all children for specified configurable product
-      *
-      * @param  \Magento\Catalog\Model\Product $product
-@@ -1240,9 +1247,12 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
-             __METHOD__,
-             $product->getData($metadata->getLinkField()),
-             $product->getStoreId(),
--            $this->getCustomerSession()->getCustomerGroupId(),
--            $requiredAttributeIds
-+            $this->getCustomerSession()->getCustomerGroupId()
-         ];
-+        if ($requiredAttributeIds !== null) {
-+            sort($requiredAttributeIds);
-+            $keyParts[] = implode('', $requiredAttributeIds);
-+        }
-         $cacheKey = $this->getUsedProductsCacheKey($keyParts);
-         return $this->loadUsedProducts($product, $cacheKey);
-     }
-@@ -1381,7 +1391,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
-      */
-     private function getUsedProductsCacheKey($keyParts)
-     {
--        return md5(implode('_', $keyParts));
-+        return sha1(implode('_', $keyParts));
-     }
- 
-     /**
-@@ -1398,23 +1408,47 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
-         $skipStockFilter = true
-     ) {
-         $collection = $this->getUsedProductCollection($product);
-+
-         if ($skipStockFilter) {
-             $collection->setFlag('has_stock_status_filter', true);
-         }
-+
-         $collection
--            ->addAttributeToSelect($this->getCatalogConfig()->getProductAttributes())
-+            ->addAttributeToSelect($this->getAttributesForCollection($product))
-             ->addFilterByRequiredOptions()
-             ->setStoreId($product->getStoreId());
- 
--        $requiredAttributes = ['name', 'price', 'weight', 'image', 'thumbnail', 'status', 'media_gallery'];
--        foreach ($requiredAttributes as $attributeCode) {
--            $collection->addAttributeToSelect($attributeCode);
--        }
--        foreach ($this->getUsedProductAttributes($product) as $usedProductAttribute) {
--            $collection->addAttributeToSelect($usedProductAttribute->getAttributeCode());
--        }
-         $collection->addMediaGalleryData();
-         $collection->addTierPriceData();
-+
-         return $collection;
-     }
-+
-+    /**
-+     * @return array
-+     */
-+    private function getAttributesForCollection(\Magento\Catalog\Model\Product $product)
-+    {
-+        $productAttributes = $this->getCatalogConfig()->getProductAttributes();
-+
-+        $requiredAttributes = [
-+            'name',
-+            'price',
-+            'weight',
-+            'image',
-+            'thumbnail',
-+            'status',
-+            'visibility',
-+            'media_gallery'
-+        ];
-+
-+        $usedAttributes = array_map(
-+            function($attr) {
-+                return $attr->getAttributeCode();
-+            },
-+            $this->getUsedProductAttributes($product)
-+        );
-+
-+        return array_unique(array_merge($productAttributes, $requiredAttributes, $usedAttributes));
-+    }
- }
-diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
-index 617297e545b..4ead9ffe0fe 100644
---- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
-@@ -12,13 +12,15 @@ use Magento\Framework\Api\AttributeValueFactory;
- use Magento\Framework\EntityManager\MetadataPool;
- 
- /**
-+ * Configurable product attribute model.
-+ *
-  * @method Attribute setProductAttribute(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $value)
-  * @method \Magento\Eav\Model\Entity\Attribute\AbstractAttribute getProductAttribute()
-  */
- class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     \Magento\ConfigurableProduct\Api\Data\OptionInterface
- {
--    /**#@+
-+    /**
-      * Constants for field names
-      */
-     const KEY_ATTRIBUTE_ID = 'attribute_id';
-@@ -27,9 +29,10 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     const KEY_IS_USE_DEFAULT = 'is_use_default';
-     const KEY_VALUES = 'values';
-     const KEY_PRODUCT_ID = 'product_id';
--    /**#@-*/
- 
--    /**#@-*/
-+    /**
-+     * @var MetadataPool|\Magento\Framework\EntityManager\MetadataPool
-+     */
-     private $metadataPool;
- 
-     /**
-@@ -85,7 +88,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getLabel()
-     {
-@@ -111,10 +114,10 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * Load configurable attribute by product and product's attribute
-+     * Load configurable attribute by product and product's attribute.
-      *
-      * @param \Magento\Catalog\Model\Product $product
--     * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute  $attribute
-+     * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
-      * @return void
-      */
-     public function loadByProductAndAttribute($product, $attribute)
-@@ -143,7 +146,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @codeCoverageIgnore
-      */
-     public function getAttributeId()
-@@ -152,7 +155,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @codeCoverageIgnore
-      */
-     public function getPosition()
-@@ -161,7 +164,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @codeCoverageIgnore
-      */
-     public function getIsUseDefault()
-@@ -170,7 +173,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @codeCoverageIgnore
-      */
-     public function getValues()
-@@ -181,8 +184,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     //@codeCoverageIgnoreStart
- 
-     /**
--     * @param string $attributeId
--     * @return $this
-+     * @inheritdoc
-      */
-     public function setAttributeId($attributeId)
-     {
-@@ -190,8 +192,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * @param string $label
--     * @return $this
-+     * @inheritdoc
-      */
-     public function setLabel($label)
-     {
-@@ -199,8 +200,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * @param int $position
--     * @return $this
-+     * @inheritdoc
-      */
-     public function setPosition($position)
-     {
-@@ -208,8 +208,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * @param bool $isUseDefault
--     * @return $this
-+     * @inheritdoc
-      */
-     public function setIsUseDefault($isUseDefault)
-     {
-@@ -217,8 +216,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * @param \Magento\ConfigurableProduct\Api\Data\OptionValueInterface[] $values
--     * @return $this
-+     * @inheritdoc
-      */
-     public function setValues(array $values = null)
-     {
-@@ -226,7 +224,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return \Magento\ConfigurableProduct\Api\Data\OptionExtensionInterface|null
-      */
-@@ -236,7 +234,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @param \Magento\ConfigurableProduct\Api\Data\OptionExtensionInterface $extensionAttributes
-      * @return $this
-@@ -248,7 +246,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getProductId()
-     {
-@@ -256,7 +254,7 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setProductId($value)
-     {
-@@ -267,9 +265,14 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
- 
-     /**
-      * @inheritdoc
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return array_diff(
-             parent::__sleep(),
-             ['metadataPool']
-@@ -278,9 +281,14 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
- 
-     /**
-      * @inheritdoc
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
-         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         $this->metadataPool = $objectManager->get(MetadataPool::class);
-diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
-index bee334596e9..f2bf3116af9 100644
---- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
-@@ -7,14 +7,15 @@
-  */
- namespace Magento\ConfigurableProduct\Model\Product\Type\Configurable;
- 
-+use Magento\Catalog\Model\Product;
-+
-+/**
-+ * Class Price for configurable product
-+ */
- class Price extends \Magento\Catalog\Model\Product\Type\Price
- {
-     /**
--     * Get product final price
--     *
--     * @param   float $qty
--     * @param   \Magento\Catalog\Model\Product $product
--     * @return  float
-+     * @inheritdoc
-      */
-     public function getFinalPrice($qty, $product)
-     {
-@@ -22,7 +23,10 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-             return $product->getCalculatedFinalPrice();
-         }
-         if ($product->getCustomOption('simple_product') && $product->getCustomOption('simple_product')->getProduct()) {
--            $finalPrice = parent::getFinalPrice($qty, $product->getCustomOption('simple_product')->getProduct());
-+            /** @var Product $simpleProduct */
-+            $simpleProduct = $product->getCustomOption('simple_product')->getProduct();
-+            $simpleProduct->setCustomerGroupId($product->getCustomerGroupId());
-+            $finalPrice = parent::getFinalPrice($qty, $simpleProduct);
-         } else {
-             $priceInfo = $product->getPriceInfo();
-             $finalPrice = $priceInfo->getPrice('final_price')->getAmount()->getValue();
-@@ -35,7 +39,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getPrice($product)
-     {
-@@ -48,6 +52,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
-                 }
-             }
-         }
-+
-         return 0;
-     }
- }
-diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Plugin.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Plugin.php
-index 16fff360632..e8b7299a03d 100644
---- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Plugin.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Plugin.php
-@@ -6,19 +6,22 @@
-  */
- namespace Magento\ConfigurableProduct\Model\Product\Type;
- 
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- 
-+/**
-+ * Type plugin.
-+ */
- class Plugin
- {
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-     /**
--     * @param Manager $moduleManager
-+     * @param ModuleManagerInterface $moduleManager
-      */
--    public function __construct(Manager $moduleManager)
-+    public function __construct(ModuleManagerInterface $moduleManager)
-     {
-         $this->moduleManager = $moduleManager;
-     }
-diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php b/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
-index 73e7f9053fa..09d25151926 100644
---- a/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\ConfigurableProduct\Model\Product;
- 
-@@ -201,10 +202,11 @@ class VariationHandler
- 
-         $keysFilter = ['item_id', 'product_id', 'stock_id', 'type_id', 'website_id'];
-         $postData['stock_data'] = array_diff_key((array)$parentProduct->getStockData(), array_flip($keysFilter));
--        if (!isset($postData['stock_data']['is_in_stock'])) {
--            $stockStatus = $parentProduct->getQuantityAndStockStatus();
-+        $stockStatus = $parentProduct->getQuantityAndStockStatus();
-+        if (isset($stockStatus['is_in_stock'])) {
-             $postData['stock_data']['is_in_stock'] = $stockStatus['is_in_stock'];
-         }
-+
-         $postData = $this->processMediaGallery($product, $postData);
-         $postData['status'] = isset($postData['status'])
-             ? $postData['status']
-@@ -262,6 +264,8 @@ class VariationHandler
-     }
- 
-     /**
-+     * Process media gallery for product
-+     *
-      * @param \Magento\Catalog\Model\Product $product
-      * @param array $productData
-      *
-diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
-index 5d9eed0a188..8fbab8142fe 100644
---- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
-@@ -40,7 +40,7 @@ class OptionSelectBuilder implements OptionSelectBuilderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSelect(AbstractAttribute $superAttribute, int $productId, ScopeInterface $scope)
-     {
-@@ -91,7 +91,7 @@ class OptionSelectBuilder implements OptionSelectBuilderInterface
-                 ]
-             ),
-             []
--        )->joinInner(
-+        )->joinLeft(
-             ['attribute_option' => $this->attributeResource->getTable('eav_attribute_option')],
-             'attribute_option.option_id = entity_value.value',
-             []
-diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
-index 81e2e99bfe9..b7bbf7aa187 100644
---- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
-@@ -12,6 +12,11 @@ use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
- use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query\BaseFinalPrice;
- use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
- use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\CatalogInventory\Model\Stock;
-+use Magento\CatalogInventory\Model\Configuration;
- 
- /**
-  * Configurable Products Price Indexer Resource model
-@@ -65,6 +70,11 @@ class Configurable implements DimensionalIndexerInterface
-      */
-     private $basePriceModifier;
- 
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-     /**
-      * @param BaseFinalPrice $baseFinalPrice
-      * @param IndexTableStructureFactory $indexTableStructureFactory
-@@ -74,6 +84,7 @@ class Configurable implements DimensionalIndexerInterface
-      * @param BasePriceModifier $basePriceModifier
-      * @param bool $fullReindexAction
-      * @param string $connectionName
-+     * @param ScopeConfigInterface $scopeConfig
-      */
-     public function __construct(
-         BaseFinalPrice $baseFinalPrice,
-@@ -83,7 +94,8 @@ class Configurable implements DimensionalIndexerInterface
-         \Magento\Framework\App\ResourceConnection $resource,
-         BasePriceModifier $basePriceModifier,
-         $fullReindexAction = false,
--        $connectionName = 'indexer'
-+        $connectionName = 'indexer',
-+        ScopeConfigInterface $scopeConfig = null
-     ) {
-         $this->baseFinalPrice = $baseFinalPrice;
-         $this->indexTableStructureFactory = $indexTableStructureFactory;
-@@ -93,10 +105,11 @@ class Configurable implements DimensionalIndexerInterface
-         $this->resource = $resource;
-         $this->fullReindexAction = $fullReindexAction;
-         $this->basePriceModifier = $basePriceModifier;
-+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @throws \Exception
-      */
-@@ -184,7 +197,19 @@ class Configurable implements DimensionalIndexerInterface
-             ['le' => $this->getTable('catalog_product_entity')],
-             'le.' . $linkField . ' = l.parent_id',
-             []
--        )->columns(
-+        );
-+
-+        // Does not make sense to extend query if out of stock products won't appear in tables for indexing
-+        if ($this->isConfigShowOutOfStock()) {
-+            $select->join(
-+                ['si' => $this->getTable('cataloginventory_stock_item')],
-+                'si.product_id = l.product_id',
-+                []
-+            );
-+            $select->where('si.is_in_stock = ?', Stock::STOCK_IN_STOCK);
-+        }
-+
-+        $select->columns(
-             [
-                 'le.entity_id',
-                 'customer_group_id',
-@@ -250,7 +275,7 @@ class Configurable implements DimensionalIndexerInterface
-     /**
-      * Get connection
-      *
--     * return \Magento\Framework\DB\Adapter\AdapterInterface
-+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
-      * @throws \DomainException
-      */
-     private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
-@@ -272,4 +297,17 @@ class Configurable implements DimensionalIndexerInterface
-     {
-         return $this->resource->getTableName($tableName, $this->connectionName);
-     }
-+
-+    /**
-+     * Is flag Show Out Of Stock setted
-+     *
-+     * @return bool
-+     */
-+    private function isConfigShowOutOfStock(): bool
-+    {
-+        return $this->scopeConfig->isSetFlag(
-+            Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
-+            ScopeInterface::SCOPE_STORE
-+        );
-+    }
- }
-diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
-new file mode 100644
-index 00000000000..59a7b81e068
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
-@@ -0,0 +1,45 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ConfigurableProduct\Model\ResourceModel\Product;
-+
-+use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
-+
-+/**
-+ * Used in Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProvider
-+ * to provide queries to select configurable product option with lowest price
-+ *
-+ * @see app/code/Magento/ConfigurableProduct/etc/di.xml
-+ */
-+class LinkedProductSelectBuilderComposite implements LinkedProductSelectBuilderInterface
-+{
-+    /**
-+     * @var LinkedProductSelectBuilderInterface[]
-+     */
-+    private $linkedProductSelectBuilder;
-+
-+    /**
-+     * @param LinkedProductSelectBuilderInterface[] $linkedProductSelectBuilder
-+     */
-+    public function __construct($linkedProductSelectBuilder)
-+    {
-+        $this->linkedProductSelectBuilder = $linkedProductSelectBuilder;
-+    }
-+
-+    /**
-+     * {@inheritdoc}
-+     */
-+    public function build($productId)
-+    {
-+        $selects = [];
-+        foreach ($this->linkedProductSelectBuilder as $productSelectBuilder) {
-+            $selects = array_merge($selects, $productSelectBuilder->build($productId));
-+        }
-+
-+        return $selects;
-+    }
-+}
-diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
-index ccff85dd971..feffd22a0fb 100644
---- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
-@@ -19,6 +19,9 @@ use Magento\Framework\App\ScopeResolverInterface;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\DB\Adapter\AdapterInterface;
- 
-+/**
-+ * Configurable product resource model.
-+ */
- class Configurable extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- {
-     /**
-@@ -173,10 +176,13 @@ class Configurable extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-             $parentId
-         );
- 
--        $childrenIds = [0 => []];
--        foreach ($this->getConnection()->fetchAll($select) as $row) {
--            $childrenIds[0][$row['product_id']] = $row['product_id'];
--        }
-+        $childrenIds = [
-+            0 => array_column(
-+                $this->getConnection()->fetchAll($select),
-+                'product_id',
-+                'product_id'
-+            )
-+        ];
- 
-         return $childrenIds;
-     }
-diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php
-index e93c44893bf..1b5ea4d020f 100644
---- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php
-@@ -1,7 +1,5 @@
- <?php
- /**
-- * Catalog super product attribute resource model
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-@@ -11,6 +9,9 @@ use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute as Con
- use Magento\Framework\DB\Adapter\AdapterInterface;
- use Magento\Store\Model\Store;
- 
-+/**
-+ * Catalog super product attribute resource model.
-+ */
- class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- {
-     /**
-@@ -52,7 +53,7 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
--     * Inititalize connection and define tables
-+     * Initialize connection and define tables
-      *
-      * @return void
-      */
-@@ -189,8 +190,7 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
--     * @param \Magento\Framework\Model\AbstractModel $object
--     * @return $this
-+     * @inheritDoc
-      */
-     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
-     {
-diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
-index 3c40d326be7..81cbbd06c52 100644
---- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
-@@ -18,6 +18,8 @@ use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Catalog\Api\Data\ProductInterface;
- 
- /**
-+ * Collection of configurable product attributes.
-+ *
-  * @api
-  * @SuppressWarnings(PHPMD.LongVariable)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -302,6 +304,8 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-     }
- 
-     /**
-+     * Load related options' data.
-+     *
-      * @return void
-      */
-     protected function loadOptions()
-@@ -354,9 +358,14 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-     /**
-      * @inheritdoc
-      * @since 100.0.6
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return array_diff(
-             parent::__sleep(),
-             [
-@@ -373,9 +382,14 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-     /**
-      * @inheritdoc
-      * @since 100.0.6
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
-         $objectManager = ObjectManager::getInstance();
-         $this->_storeManager = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
-diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
-index 1460cc51681..b76954075bc 100644
---- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
-+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
-@@ -12,6 +12,7 @@ namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configura
-  *
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @since 100.0.2
-  */
- class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-@@ -26,7 +27,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     /**
-      * @var \Magento\Catalog\Model\Product[]
-      */
--    private $products;
-+    private $products = [];
- 
-     /**
-      * Assign link table name
-@@ -41,6 +42,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
- 
-     /**
-      * Init select
-+     *
-      * @return $this|\Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection
-      */
-     protected function _initSelect()
-@@ -73,9 +75,9 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      *
-      * @return $this
-      */
--    protected function _beforeLoad()
-+    protected function _renderFilters()
-     {
--        parent::_beforeLoad();
-+        parent::_renderFilters();
-         $metadata = $this->getProductEntityMetadata();
-         $parentIds = [];
-         foreach ($this->products as $product) {
-@@ -88,8 +90,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
--     * Retrieve is flat enabled flag
--     * Return always false if magento run admin
-+     * Retrieve is flat enabled flag. Return always false if magento run admin
-      *
-      * @return bool
-      */
-diff --git a/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php b/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
-index efddb278df3..c828c0929b4 100644
---- a/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
-+++ b/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
-@@ -5,7 +5,7 @@
-  */
- namespace Magento\ConfigurableProduct\Plugin\Catalog\Model\Product\Pricing\Renderer;
- 
--use Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProviderInterface;
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as TypeConfigurable;
- 
- /**
-  * A plugin for a salable resolver.
-@@ -13,29 +13,25 @@ use Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProviderInterfac
- class SalableResolver
- {
-     /**
--     * @var LowestPriceOptionsProviderInterface
-+     * @var TypeConfigurable
-      */
--    private $lowestPriceOptionsProvider;
-+    private $typeConfigurable;
- 
-     /**
--     * @param LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
-+     * @param TypeConfigurable $typeConfigurable
-      */
--    public function __construct(
--        LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
--    ) {
--        $this->lowestPriceOptionsProvider = $lowestPriceOptionsProvider;
-+    public function __construct(TypeConfigurable $typeConfigurable)
-+    {
-+        $this->typeConfigurable = $typeConfigurable;
-     }
- 
-     /**
--     * Performs an additional check whether given configurable product has
--     * at least one configuration in-stock.
-+     * Performs an additional check whether given configurable product has at least one configuration in-stock.
-      *
-      * @param \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver $subject
-      * @param bool $result
-      * @param \Magento\Framework\Pricing\SaleableInterface $salableItem
--     *
-      * @return bool
--     *
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function afterIsSalable(
-@@ -43,10 +39,8 @@ class SalableResolver
-         $result,
-         \Magento\Framework\Pricing\SaleableInterface $salableItem
-     ) {
--        if ($salableItem->getTypeId() == 'configurable' && $result) {
--            if (!$this->lowestPriceOptionsProvider->getProducts($salableItem)) {
--                $result = false;
--            }
-+        if ($salableItem->getTypeId() === TypeConfigurable::TYPE_CODE && $result) {
-+            $result = $this->typeConfigurable->isSalable($salableItem);
-         }
- 
-         return $result;
-diff --git a/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php b/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php
-new file mode 100644
-index 00000000000..1ed4432347b
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition;
-+
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-+
-+/**
-+ * Class Product
-+ *
-+ * @package Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition
-+ */
-+class Product
-+{
-+    /**
-+     * Prepare configurable product for validation.
-+     *
-+     * @param \Magento\SalesRule\Model\Rule\Condition\Product $subject
-+     * @param \Magento\Framework\Model\AbstractModel $model
-+     * @return array
-+     */
-+    public function beforeValidate(
-+        \Magento\SalesRule\Model\Rule\Condition\Product $subject,
-+        \Magento\Framework\Model\AbstractModel $model
-+    ) {
-+        $product = $this->getProductToValidate($subject, $model);
-+        if ($model->getProduct() !== $product) {
-+            // We need to replace product only for validation and keep original product for all other cases.
-+            $clone = clone $model;
-+            $clone->setProduct($product);
-+            $model = $clone;
-+        }
-+
-+        return [$model];
-+    }
-+
-+    /**
-+     * Select proper product for validation.
-+     *
-+     * @param \Magento\SalesRule\Model\Rule\Condition\Product $subject
-+     * @param \Magento\Framework\Model\AbstractModel $model
-+     *
-+     * @return \Magento\Catalog\Api\Data\ProductInterface|\Magento\Catalog\Model\Product
-+     */
-+    private function getProductToValidate(
-+        \Magento\SalesRule\Model\Rule\Condition\Product $subject,
-+        \Magento\Framework\Model\AbstractModel $model
-+    ) {
-+        /** @var \Magento\Catalog\Model\Product $product */
-+        $product = $model->getProduct();
-+
-+        $attrCode = $subject->getAttribute();
-+
-+        /* Check for attributes which are not available for configurable products */
-+        if ($product->getTypeId() == Configurable::TYPE_CODE && !$product->hasData($attrCode)) {
-+            /** @var \Magento\Catalog\Model\AbstractModel $childProduct */
-+            $childProduct = current($model->getChildren())->getProduct();
-+            if ($childProduct->hasData($attrCode)) {
-+                $product = $childProduct;
-+            }
-+        }
-+
-+        return $product;
-+    }
-+}
-diff --git a/app/code/Magento/ConfigurableProduct/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/ConfigurableProduct/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
-new file mode 100644
-index 00000000000..8bdde2aeb0c
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
-@@ -0,0 +1,44 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ConfigurableProduct\Plugin\Tax\Model\Sales\Total\Quote;
-+
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-+use Magento\Quote\Model\Quote\Item\AbstractItem;
-+use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
-+use Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory;
-+
-+/**
-+ * Plugin for CommonTaxCollector to apply Tax Class ID from child item for configurable product
-+ */
-+class CommonTaxCollector
-+{
-+    /**
-+     * Apply Tax Class ID from child item for configurable product
-+     *
-+     * @param \Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector $subject
-+     * @param QuoteDetailsItemInterface $result
-+     * @param QuoteDetailsItemInterfaceFactory $itemDataObjectFactory
-+     * @param AbstractItem $item
-+     * @return QuoteDetailsItemInterface
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterMapItem(
-+        \Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector $subject,
-+        QuoteDetailsItemInterface $result,
-+        QuoteDetailsItemInterfaceFactory $itemDataObjectFactory,
-+        AbstractItem $item
-+    ) : QuoteDetailsItemInterface {
-+        if ($item->getProduct()->getTypeId() === Configurable::TYPE_CODE && $item->getHasChildren()) {
-+            $childItem = $item->getChildren()[0];
-+            $result->getTaxClassKey()->setValue($childItem->getProduct()->getTaxClassId());
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php b/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
-index 611523a60b0..447ba16d727 100644
---- a/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
-+++ b/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\ConfigurableProduct\Pricing\Render;
- 
-+use Magento\Catalog\Pricing\Price\TierPrice;
-+
- /**
-  * Responsible for displaying tier price box on configurable product page.
-  *
-@@ -17,9 +19,27 @@ class TierPriceBox extends FinalPriceBox
-      */
-     public function toHtml()
-     {
--        // Hide tier price block in case of MSRP.
--        if (!$this->isMsrpPriceApplicable()) {
-+        // Hide tier price block in case of MSRP or in case when no options with tier price.
-+        if (!$this->isMsrpPriceApplicable() && $this->isTierPriceApplicable()) {
-             return parent::toHtml();
-         }
-     }
-+
-+    /**
-+     * Check if at least one of simple products has tier price.
-+     *
-+     * @return bool
-+     */
-+    private function isTierPriceApplicable()
-+    {
-+        $product = $this->getSaleableItem();
-+        foreach ($product->getTypeInstance()->getUsedProducts($product) as $simpleProduct) {
-+            if ($simpleProduct->isSalable() &&
-+                !empty($simpleProduct->getPriceInfo()->getPrice(TierPrice::PRICE_CODE)->getTierPriceList())
-+            ) {
-+                return true;
-+            }
-+        }
-+        return false;
-+    }
- }
-diff --git a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
-index f69d8529fb8..c6b173453f5 100644
---- a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
-+++ b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
-@@ -6,16 +6,16 @@
- 
- namespace Magento\ConfigurableProduct\Setup\Patch\Data;
- 
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
- use Magento\Eav\Setup\EavSetup;
- use Magento\Eav\Setup\EavSetupFactory;
--use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\Setup\ModuleDataSetupInterface;
- use Magento\Framework\Setup\Patch\DataPatchInterface;
- use Magento\Framework\Setup\Patch\PatchVersionInterface;
--use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
- 
- /**
-  * Class InstallInitialConfigurableAttributes
-+ *
-  * @package Magento\ConfigurableProduct\Setup\Patch
-  */
- class InstallInitialConfigurableAttributes implements DataPatchInterface, PatchVersionInterface
-@@ -24,6 +24,7 @@ class InstallInitialConfigurableAttributes implements DataPatchInterface, PatchV
-      * @var ModuleDataSetupInterface
-      */
-     private $moduleDataSetup;
-+
-     /**
-      * @var EavSetupFactory
-      */
-@@ -43,7 +44,7 @@ class InstallInitialConfigurableAttributes implements DataPatchInterface, PatchV
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function apply()
-     {
-@@ -64,24 +65,27 @@ class InstallInitialConfigurableAttributes implements DataPatchInterface, PatchV
-             'color'
-         ];
-         foreach ($attributes as $attributeCode) {
--            $relatedProductTypes = explode(
--                ',',
--                $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode, 'apply_to')
--            );
--            if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
--                $relatedProductTypes[] = Configurable::TYPE_CODE;
--                $eavSetup->updateAttribute(
--                    \Magento\Catalog\Model\Product::ENTITY,
--                    $attributeCode,
--                    'apply_to',
--                    implode(',', $relatedProductTypes)
-+            $attribute = $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode, 'apply_to');
-+            if ($attribute) {
-+                $relatedProductTypes = explode(
-+                    ',',
-+                    $attribute
-                 );
-+                if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
-+                    $relatedProductTypes[] = Configurable::TYPE_CODE;
-+                    $eavSetup->updateAttribute(
-+                        \Magento\Catalog\Model\Product::ENTITY,
-+                        $attributeCode,
-+                        'apply_to',
-+                        implode(',', $relatedProductTypes)
-+                    );
-+                }
-             }
-         }
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getDependencies()
-     {
-@@ -89,7 +93,7 @@ class InstallInitialConfigurableAttributes implements DataPatchInterface, PatchV
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getVersion()
-     {
-@@ -97,7 +101,7 @@ class InstallInitialConfigurableAttributes implements DataPatchInterface, PatchV
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAliases()
-     {
-diff --git a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateManufacturerAttribute.php b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateManufacturerAttribute.php
-index c9a2f7d373a..1e085e0fdb3 100644
---- a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateManufacturerAttribute.php
-+++ b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateManufacturerAttribute.php
-@@ -15,8 +15,7 @@ use Magento\Framework\Setup\Patch\PatchVersionInterface;
- use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
- 
- /**
-- * Class UpdateManufacturerAttribute
-- * @package Magento\ConfigurableProduct\Setup\Patch
-+ * Update manufacturer attribute if it's presented in system.
-  */
- class UpdateManufacturerAttribute implements DataPatchInterface, PatchVersionInterface
- {
-@@ -31,7 +30,6 @@ class UpdateManufacturerAttribute implements DataPatchInterface, PatchVersionInt
-     private $eavSetupFactory;
- 
-     /**
--     * UpdateTierPriceAttribute constructor.
-      * @param ModuleDataSetupInterface $moduleDataSetup
-      * @param EavSetupFactory $eavSetupFactory
-      */
-@@ -44,30 +42,37 @@ class UpdateManufacturerAttribute implements DataPatchInterface, PatchVersionInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function apply()
-     {
-         /** @var EavSetup $eavSetup */
-         $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
--        $relatedProductTypes = explode(
--            ',',
--            $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'manufacturer', 'apply_to')
--        );
- 
--        if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
--            $relatedProductTypes[] = Configurable::TYPE_CODE;
--            $eavSetup->updateAttribute(
--                \Magento\Catalog\Model\Product::ENTITY,
--                'manufacturer',
--                'apply_to',
--                implode(',', $relatedProductTypes)
-+        if ($manufacturer = $eavSetup->getAttribute(
-+            \Magento\Catalog\Model\Product::ENTITY,
-+            'manufacturer',
-+            'apply_to'
-+        )) {
-+            $relatedProductTypes = explode(
-+                ',',
-+                $manufacturer
-             );
-+
-+            if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
-+                $relatedProductTypes[] = Configurable::TYPE_CODE;
-+                $eavSetup->updateAttribute(
-+                    \Magento\Catalog\Model\Product::ENTITY,
-+                    'manufacturer',
-+                    'apply_to',
-+                    implode(',', $relatedProductTypes)
-+                );
-+            }
-         }
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getDependencies()
-     {
-@@ -77,7 +82,7 @@ class UpdateManufacturerAttribute implements DataPatchInterface, PatchVersionInt
-     }
- 
-     /**
--     * {@inheritdoc}\
-+     * @inheritdoc
-      */
-     public static function getVersion()
-     {
-@@ -85,7 +90,7 @@ class UpdateManufacturerAttribute implements DataPatchInterface, PatchVersionInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAliases()
-     {
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminAddOptionsToAttributeActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminAddOptionsToAttributeActionGroup.xml
-new file mode 100644
-index 00000000000..4328159d6e9
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminAddOptionsToAttributeActionGroup.xml
-@@ -0,0 +1,44 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="addOptionsToAttributeActionGroup">
-+        <arguments>
-+            <argument name="option1" defaultValue="colorProductAttribute2"/>
-+            <argument name="option2" defaultValue="colorDefaultProductAttribute1"/>
-+            <argument name="option3" defaultValue="colorProductAttribute3"/>
-+            <argument name="option4" defaultValue="colorProductAttribute1"/>
-+            <argument name="option5" defaultValue="colorDefaultProductAttribute2"/>
-+        </arguments>
-+        <!--Add option 1 to attribute-->
-+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption1"/>
-+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('1')}}" time="30" stepKey="waitForOptionRow1" after="clickAddOption1"/>
-+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('0')}}" userInput="{{option1.name}}" stepKey="fillAdminLabel1" after="waitForOptionRow1"/>
-+        <!--Add option 2 to attribute-->
-+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption2" after="fillAdminLabel1"/>
-+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('2')}}" time="30" stepKey="waitForOptionRow2" after="clickAddOption2"/>
-+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('1')}}" userInput="{{option2.name}}" stepKey="fillAdminLabel2" after="waitForOptionRow2"/>
-+        <!--Add option 3 to attribute-->
-+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption3" after="fillAdminLabel2"/>
-+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('3')}}" time="30" stepKey="waitForOptionRow3" after="clickAddOption3"/>
-+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('2')}}" userInput="{{option3.name}}" stepKey="fillAdminLabel3" after="waitForOptionRow3"/>
-+        <!--Add option 4 to attribute-->
-+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption4" after="fillAdminLabel3"/>
-+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('4')}}" time="30" stepKey="waitForOptionRow4" after="clickAddOption4"/>
-+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('3')}}" userInput="{{option4.name}}" stepKey="fillAdminLabel4" after="waitForOptionRow4"/>
-+        <!--Add option 5 to attribute-->
-+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption5" after="fillAdminLabel4"/>
-+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('5')}}" time="30" stepKey="waitForOptionRow5" after="clickAddOption5"/>
-+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('4')}}" userInput="{{option5.name}}" stepKey="fillAdminLabel5" after="waitForOptionRow5"/>
-+        <!--Save attribute-->
-+        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickSaveAttribute" after="fillAdminLabel5"/>
-+        <waitForPageLoad stepKey="waitForSavingAttribute"/>
-+        <see userInput="You saved the product attribute." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
-index 63ef6cb99f8..5efc6e5601b 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Filter the product grid and view expected products-->
-     <actionGroup name="viewConfigurableProductInAdminGrid">
-         <arguments>
-@@ -60,6 +60,7 @@
-         <fillField userInput="{{product.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
-         <fillField userInput="{{product.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
-         <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="fillCategory"/>
-+        <selectOption userInput="{{product.visibility}}" selector="{{AdminProductFormSection.visibility}}" stepKey="fillVisibility"/>
-         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
-         <fillField userInput="{{product.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
- 
-@@ -103,4 +104,255 @@
-         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
-         <seeInTitle userInput="{{product.name}}" stepKey="seeProductNameInTitle"/>
-     </actionGroup>
-+
-+    <actionGroup name="generateConfigurationsByAttributeCode">
-+        <arguments>
-+            <argument name="attributeCode" type="string" defaultValue="SomeString"/>
-+        </arguments>
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
-+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="{{attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
-+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="99" stepKey="enterAttributeQuantity"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
-+    </actionGroup>
-+    <actionGroup name="createOptionsForAttribute">
-+        <arguments>
-+            <argument name="attributeName" type="string" defaultValue="{{productAttributeColor.default_label}}"/>
-+            <argument name="firstOptionName" type="string" defaultValue="option1"/>
-+            <argument name="secondOptionName" type="string" defaultValue="option2"/>
-+        </arguments>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickOnFilters"/>
-+        <fillField userInput="{{attributeName}}" selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateFirstNewValue"/>
-+        <fillField userInput="{{firstOptionName}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewFirstOption"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateSecondNewValue"/>
-+        <fillField userInput="{{secondOptionName}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewSecondOption"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
-+    </actionGroup>
-+
-+    <actionGroup name="createConfigurationsForAttribute" extends="generateConfigurationsByAttributeCode">
-+        <arguments>
-+            <argument name="attributeCode" type="string" defaultValue="SomeString"/>
-+        </arguments>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
-+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
-+    </actionGroup>
-+
-+    <actionGroup name="createConfigurationsForAttributeWithImages" extends="generateConfigurationsByAttributeCode">
-+        <arguments>
-+            <argument name="attributeCode" type="string" defaultValue="SomeString"/>
-+            <argument name="image" defaultValue="ProductImage"/>
-+        </arguments>
-+
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleSetOfImages}}" stepKey="clickOnApplySingleImageSetToAllSku" after="enterAttributeQuantity"/>
-+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.imageUploadButton}}" stepKey="seeImageSectionIsReady" after="clickOnApplySingleImageSetToAllSku"/>
-+        <attachFile selector="{{AdminCreateProductConfigurationsPanel.imageFileUpload}}" userInput="{{image.file}}" stepKey="uploadFile" after="seeImageSectionIsReady"/>
-+        <waitForElementNotVisible selector="{{AdminCreateProductConfigurationsPanel.uploadProgressBar}}" stepKey="waitForUpload" after="uploadFile"/>
-+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.imageFile(image.fileName)}}" stepKey="waitForThumbnail" after="waitForUpload"/>
-+
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2" after="clickOnNextButton4"/>
-+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup" after="clickOnSaveButton2"/>
-+    </actionGroup>
-+
-+    <actionGroup name="createConfigurationsForTwoAttribute" extends="generateConfigurationsByAttributeCode">
-+        <arguments>
-+            <argument name="secondAttributeCode" type="string"/>
-+        </arguments>
-+        <remove keyForRemoval="clickOnSelectAll"/>
-+        <remove keyForRemoval="clickFilters"/>
-+        <remove keyForRemoval="fillFilterAttributeCodeField"/>
-+        <remove keyForRemoval="clickApplyFiltersButton"/>
-+        <remove keyForRemoval="clickOnFirstCheckbox"/>
-+
-+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}" stepKey="clickOnFirstAttributeCheckbox" after="clickCreateConfigurations"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}" stepKey="clickOnSecondAttributeCheckbox" after="clickOnFirstAttributeCheckbox"/>
-+        <grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.defaultLabel(attributeCode)}}" stepKey="grabFirstAttributeDefaultLabel" after="clickOnSecondAttributeCheckbox"/>
-+        <grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.defaultLabel(secondAttributeCode)}}" stepKey="grabSecondAttributeDefaultLabel" after="grabFirstAttributeDefaultLabel"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForFirstAttribute" after="clickOnNextButton1"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForSecondAttribute" after="clickOnSelectAllForFirstAttribute"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
-+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
-+    </actionGroup>
-+
-+    <actionGroup name="saveConfiguredProduct">
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
-+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
-+    </actionGroup>
-+
-+    <actionGroup name="addNewProductConfigurationAttribute">
-+        <arguments>
-+            <argument name="attribute" type="entity"/>
-+            <argument name="firstOption" type="entity"/>
-+            <argument name="secondOption" type="entity"/>
-+        </arguments>
-+        <!-- Create new attribute -->
-+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickOnNewAttribute"/>
-+        <waitForPageLoad stepKey="waitForIFrame"/>
-+        <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
-+        <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{attribute.default_label}}" stepKey="fillDefaultLabel"/>
-+        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
-+        <waitForPageLoad stepKey="waitForSaveAttribute"/>
-+        <switchToIFrame stepKey="switchOutOfIFrame"/>
-+        <waitForPageLoad stepKey="waitForFilters"/>
-+        <!-- Find created below attribute and add option; save attribute -->
-+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickOnFilters"/>
-+        <fillField userInput="{{attribute.default_label}}" selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateFirstNewValue"/>
-+        <fillField userInput="{{firstOption.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewFirstOption"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateSecondNewValue"/>
-+        <fillField userInput="{{secondOption.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewSecondOption"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnSecondNextButton"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnThirdNextButton"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnFourthNextButton"/>
-+    </actionGroup>
-+    <actionGroup name="selectCreatedAttributeAndCreateTwoOptions" extends="addNewProductConfigurationAttribute">
-+        <remove keyForRemoval="clickOnNewAttribute"/>
-+        <remove keyForRemoval="waitForIFrame"/>
-+        <remove keyForRemoval="switchToNewAttributeIFrame"/>
-+        <remove keyForRemoval="fillDefaultLabel"/>
-+        <remove keyForRemoval="clickOnNewAttributePanel"/>
-+        <remove keyForRemoval="waitForSaveAttribute"/>
-+        <remove keyForRemoval="switchOutOfIFrame"/>
-+        <remove keyForRemoval="waitForFilters"/>
-+        <fillField userInput="{{attribute.attribute_code}}" selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
-+        <fillField userInput="{{firstOption.label}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewFirstOption"/>
-+        <fillField userInput="{{secondOption.label}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewSecondOption"/>
-+        <remove keyForRemoval="clickOnSelectAll"/>
-+        <remove keyForRemoval="clickOnSecondNextButton"/>
-+        <remove keyForRemoval="clickOnThirdNextButton"/>
-+        <remove keyForRemoval="clickOnFourthNextButton"/>
-+    </actionGroup>
-+    <actionGroup name="changeProductConfigurationsInGrid">
-+        <arguments>
-+            <argument name="firstOption" type="entity"/>
-+            <argument name="secondOption" type="entity"/>
-+        </arguments>
-+        <fillField userInput="{{firstOption.name}}" selector="{{AdminProductFormConfigurationsSection.confProductNameCell(firstOption.name)}}" stepKey="fillFieldNameForFirstAttributeOption"/>
-+        <fillField userInput="{{secondOption.name}}" selector="{{AdminProductFormConfigurationsSection.confProductNameCell(secondOption.name)}}" stepKey="fillFieldNameForSecondAttributeOption"/>
-+        <fillField userInput="{{firstOption.sku}}" selector="{{AdminProductFormConfigurationsSection.confProductSkuCell(firstOption.name)}}" stepKey="fillFieldSkuForFirstAttributeOption"/>
-+        <fillField userInput="{{secondOption.sku}}" selector="{{AdminProductFormConfigurationsSection.confProductSkuCell(secondOption.name)}}" stepKey="fillFieldSkuForSecondAttributeOption"/>
-+        <fillField userInput="{{firstOption.price}}" selector="{{AdminProductFormConfigurationsSection.confProductPriceCell(firstOption.name)}}" stepKey="fillFieldPriceForFirstAttributeOption"/>
-+        <fillField userInput="{{secondOption.price}}" selector="{{AdminProductFormConfigurationsSection.confProductPriceCell(secondOption.name)}}" stepKey="fillFieldPriceForSecondAttributeOption"/>
-+        <fillField userInput="{{firstOption.quantity}}" selector="{{AdminProductFormConfigurationsSection.confProductQuantityCell(firstOption.name)}}" stepKey="fillFieldQuantityForFirstAttributeOption"/>
-+        <fillField userInput="{{secondOption.quantity}}" selector="{{AdminProductFormConfigurationsSection.confProductQuantityCell(secondOption.name)}}" stepKey="fillFieldQuantityForSecondAttributeOption"/>
-+        <fillField userInput="{{firstOption.weight}}" selector="{{AdminProductFormConfigurationsSection.confProductWeightCell(firstOption.name)}}" stepKey="fillFieldWeightForFirstAttributeOption"/>
-+        <fillField userInput="{{secondOption.weight}}" selector="{{AdminProductFormConfigurationsSection.confProductWeightCell(secondOption.name)}}" stepKey="fillFieldWeightForSecondAttributeOption"/>
-+    </actionGroup>
-+
-+    <actionGroup name="changeProductConfigurationsInGridExceptSku" extends="changeProductConfigurationsInGrid">
-+        <remove keyForRemoval="fillFieldSkuForFirstAttributeOption"/>
-+        <remove keyForRemoval="fillFieldSkuForSecondAttributeOption"/>
-+    </actionGroup>
-+
-+    <actionGroup name="addProductToConfigurationsGrid">
-+        <arguments>
-+            <argument name="sku" type="string"/>
-+            <argument name="name" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminProductFormConfigurationsSection.actionsBtnByProductName(name)}}" stepKey="clickToExpandFirstActions"/>
-+        <click selector="{{AdminProductFormConfigurationsSection.addProduct(name)}}" stepKey="clickChooseFirstDifferentProduct"/>
-+        <switchToIFrame stepKey="switchOutOfIFrame"/>
-+        <waitForPageLoad stepKey="waitForFilters"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
-+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
-+        <click selector="{{AdminProductGridFilterSection.firstRowBySku(sku)}}" stepKey="clickOnFirstRow"/>
-+    </actionGroup>
-+
-+    <actionGroup name="addUniqueImageToConfigurableProductOption">
-+        <arguments>
-+            <argument name="image" defaultValue="ProductImage"/>
-+            <argument name="frontend_label" type="string"/>
-+            <argument name="label" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applyUniqueImagesToEachSkus}}" stepKey="clickOnApplyUniqueImagesToEachSku"/>
-+        <selectOption userInput="{{frontend_label}}" selector="{{AdminCreateProductConfigurationsPanel.selectImagesButton}}" stepKey="selectOption"/>
-+        <attachFile selector="{{AdminCreateProductConfigurationsPanel.uploadImagesButton(label)}}" userInput="{{image.file}}" stepKey="uploadFile"/>
-+        <waitForElementNotVisible selector="{{AdminCreateProductConfigurationsPanel.uploadProgressBar}}" stepKey="waitForUpload"/>
-+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.imageFile(image.fileName)}}" stepKey="waitForThumbnail"/>
-+    </actionGroup>
-+
-+    <actionGroup name="addUniquePriceToConfigurableProductOption">
-+        <arguments>
-+            <argument name="frontend_label" type="string"/>
-+            <argument name="label" type="string"/>
-+            <argument name="price" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applyUniquePricesToEachSkus}}" stepKey="clickOnApplyUniquePricesToEachSku"/>
-+        <selectOption userInput="{{frontend_label}}" selector="{{AdminCreateProductConfigurationsPanel.selectPriceButton}}" stepKey="selectOption"/>
-+        <fillField selector="{{AdminCreateProductConfigurationsPanel.price(label)}}" userInput="{{price}}" stepKey="enterAttributeQuantity"/>
-+    </actionGroup>
-+    <actionGroup name="addUniqueQuantityToConfigurableProductOption">
-+        <arguments>
-+            <argument name="frontend_label" type="string" defaultValue="{{productAttributeColor.default_label}}"/>
-+            <argument name="label" type="string" defaultValue="option1"/>
-+            <argument name="quantity" type="string" defaultValue="10"/>
-+        </arguments>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applyUniqueQuantityToEachSkus}}" stepKey="clickOnApplyUniqueQuantitiesToEachSku"/>
-+        <selectOption selector="{{AdminCreateProductConfigurationsPanel.selectQuantity}}" userInput="{{frontend_label}}" stepKey="selectOption"/>
-+        <fillField selector="{{AdminCreateProductConfigurationsPanel.applyUniqueQuantity(label)}}" userInput="{{quantity}}" stepKey="enterAttributeQuantity"/>
-+    </actionGroup>
-+
-+    <actionGroup name="saveConfigurableProductWithNewAttributeSet">
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveConfigurableProduct"/>
-+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" time="30" stepKey="waitForAttributeSetConfirmation"/>
-+        <click selector="{{AdminChooseAffectedAttributeSetPopup.addNewAttrSet}}" stepKey="clickAddNewAttributeSet"/>
-+        <fillField selector="{{AdminChooseAffectedAttributeSetPopup.createNewAttrSetName}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillFieldNewAttrSetName"/>
-+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickConfirmAttributeSet"/>
-+        <see selector="You saved the product" stepKey="seeConfigurableSaveConfirmation" after="clickConfirmAttributeSet"/>
-+    </actionGroup>
-+
-+    <actionGroup name="saveConfigurableProductAddToCurrentAttributeSet">
-+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveBtnVisible"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductAgain"/>
-+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitPopUpVisible"/>
-+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmPopup"/>
-+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
-+    </actionGroup>
-+
-+    <actionGroup name="assertConfigurableProductOnAdminProductPage">
-+        <arguments>
-+            <argument name="product" type="entity"/>
-+        </arguments>
-+        <seeInField userInput="{{ApiConfigurableProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="seeNameRequired"/>
-+        <seeInField userInput="{{ApiConfigurableProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="seeSkuRequired"/>
-+        <dontSeeInField userInput="{{ApiConfigurableProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="dontSeePriceRequired"/>
-+    </actionGroup>
-+
-+    <!--Click in Next Step and see Title-->
-+    <actionGroup name="AdminConfigurableWizardMoveToNextStepActionGroup">
-+        <arguments>
-+            <argument name="title" type="string"/>
-+        </arguments>
-+        <click selector="{{ConfigurableProductSection.nextButton}}" stepKey="clickNextButton"/>
-+        <waitForPageLoad stepKey="waitForNextStepLoaded"/>
-+        <see userInput="{{title}}" selector="{{AdminProductFormConfigurationsSection.stepsWizardTitle}}" stepKey="seeStepTitle"/>
-+    </actionGroup>
-+    <actionGroup name="AdminConfigurableProductDisableConfigurationsActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string" defaultValue="{{SimpleProduct.name}}"/>
-+        </arguments>
-+        <click selector="{{AdminProductFormConfigurationsSection.actionsBtnByProductName(productName)}}" stepKey="clickToExpandActionsSelect"/>
-+        <click selector="{{AdminProductFormConfigurationsSection.disableProductBtn}}" stepKey="clickDisableChildProduct"/>
-+        <see selector="{{AdminProductFormConfigurationsSection.confProductOptionStatusCell(productName)}}" userInput="Disabled" stepKey="seeConfigDisabled"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml
-new file mode 100644
-index 00000000000..5feaab40a76
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml
-@@ -0,0 +1,78 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateApiConfigurableProductActionGroup">
-+        <arguments>
-+            <argument name="productName" defaultValue="{{ApiConfigurableProductWithOutCategory.name}}" type="string"/>
-+        </arguments>
-+
-+        <!-- Create the configurable product based on the data in the /data folder -->
-+        <createData entity="ApiConfigurableProductWithOutCategory" stepKey="createConfigProduct">
-+            <field key="name">{{productName}}</field>
-+        </createData>
-+
-+        <!-- Create attribute with 2 options to be used in children products -->
-+        <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+        <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+            <requiredEntity createDataKey="createConfigProductAttribute"/>
-+        </createData>
-+        <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+            <requiredEntity createDataKey="createConfigProductAttribute"/>
-+        </createData>
-+        <createData entity="AddToDefaultSet" stepKey="addAttributeToAttributeSet">
-+            <requiredEntity createDataKey="createConfigProductAttribute"/>
-+        </createData>
-+        <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+            <requiredEntity createDataKey="createConfigProductAttribute"/>
-+        </getData>
-+        <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+            <requiredEntity createDataKey="createConfigProductAttribute"/>
-+        </getData>
-+
-+        <!-- Create the 2 children that will be a part of the configurable product -->
-+        <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+            <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+        </createData>
-+        <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+            <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+        </createData>
-+
-+        <!-- Assign the two products to the configurable product -->
-+        <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+            <requiredEntity createDataKey="createConfigProduct"/>
-+            <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+        </createData>
-+        <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+            <requiredEntity createDataKey="createConfigProduct"/>
-+            <requiredEntity createDataKey="createConfigChildProduct1"/>
-+        </createData>
-+        <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+            <requiredEntity createDataKey="createConfigProduct"/>
-+            <requiredEntity createDataKey="createConfigChildProduct2"/>
-+        </createData>
-+    </actionGroup>
-+
-+    <!-- Create the configurable product, children are not visible individually -->
-+    <actionGroup name="AdminCreateApiConfigurableProductWithHiddenChildActionGroup" extends="AdminCreateApiConfigurableProductActionGroup">
-+        <!-- Create the 2 children that will be a part of the configurable product -->
-+        <createData entity="ApiSimpleOneHidden" stepKey="createConfigChildProduct1">
-+            <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+        </createData>
-+        <createData entity="ApiSimpleTwoHidden" stepKey="createConfigChildProduct2">
-+            <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+        </createData>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminOrderConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminOrderConfigurableProductActionGroup.xml
-new file mode 100644
-index 00000000000..1c8fdf26735
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminOrderConfigurableProductActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOrderConfigureConfigurableProduct">
-+        <arguments>
-+            <argument name="optionName" type="string" defaultValue="option1"/>
-+            <argument name="productQty" type="string" defaultValue="1"/>
-+        </arguments>
-+        <click selector="{{AdminOrderFormItemsOrderedSection.configureButtonBySku}}" stepKey="clickConfigure"/>
-+        <waitForPageLoad stepKey="waitForConfigurePageLoad"/>
-+        <selectOption selector="{{AdminOrderFormConfigureProductSection.selectOption}}" userInput="{{optionName}}" stepKey="selectOption"/>
-+        <fillField selector="{{AdminOrderFormConfigureProductSection.quantity}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
-+        <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOk"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductAttributeNameDesignActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductAttributeNameDesignActionGroup.xml
-index eec1fd6273e..c4ad02ee141 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductAttributeNameDesignActionGroup.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductAttributeNameDesignActionGroup.xml
-@@ -7,8 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
--
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="GotoCatalogProductsPage">
- 
-         <!--Click on Catalog item-->
-@@ -69,26 +68,31 @@
- 
-         <!--Add option 1 to attribute-->
-         <click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption1"/>
-+        <waitForPageLoad stepKey="waitForOption1"/>
-         <fillField stepKey="fillInAdminFieldRed" selector="{{NewProduct.adminFieldRed}}" userInput="{{NewProductsData.adminFieldRed}}"/>
-         <fillField stepKey="fillInDefaultStoreViewFieldRed" selector="{{NewProduct.defaultStoreViewFieldRed}}" userInput="{{NewProductsData.defaultStoreViewFieldRed}}"/>
- 
-         <!--Add option 2 to attribute-->
-         <click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption2"/>
-+        <waitForPageLoad stepKey="waitForOption2"/>
-         <fillField stepKey="fillInAdminFieldBlue" selector="{{NewProduct.adminFieldBlue}}" userInput="{{NewProductsData.adminFieldBlue}}"/>
-         <fillField stepKey="fillInDefaultStoreViewFieldBlue" selector="{{NewProduct.defaultStoreViewFieldBlue}}" userInput="{{NewProductsData.defaultStoreViewFieldBlue}}"/>
- 
-         <!--Add option 3 to attribute-->
-         <click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption3"/>
-+        <waitForPageLoad stepKey="waitForOption3"/>
-         <fillField stepKey="fillInAdminFieldYellow" selector="{{NewProduct.adminFieldYellow}}" userInput="{{NewProductsData.adminFieldYellow}}"/>
-         <fillField stepKey="fillInDefaultStoreViewFieldYellow" selector="{{NewProduct.defaultStoreViewFieldYellow}}" userInput="{{NewProductsData.defaultStoreViewFieldYellow}}"/>
- 
-         <!--Add option 4 to attribute-->
-         <click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption4"/>
-+        <waitForPageLoad stepKey="waitForOption4"/>
-         <fillField stepKey="fillInAdminFieldGreen" selector="{{NewProduct.adminFieldGreen}}" userInput="{{NewProductsData.adminFieldGreen}}"/>
-         <fillField stepKey="fillInDefaultStoreViewFieldGreen" selector="{{NewProduct.defaultStoreViewFieldGreen}}" userInput="{{NewProductsData.defaultStoreViewFieldGreen}}"/>
- 
-         <!--Add option 5 to attribute-->
-         <click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption5"/>
-+        <waitForPageLoad stepKey="waitForOption5"/>
-         <fillField stepKey="fillInAdminFieldBlack" selector="{{NewProduct.adminFieldBlack}}" userInput="{{NewProductsData.adminFieldBlack}}"/>
-         <fillField stepKey="fillInDefaultStoreViewFieldBlack" selector="{{NewProduct.defaultStoreViewFieldBlack}}" userInput="{{NewProductsData.defaultStoreViewFieldBlack}}"/>
- 
-@@ -135,6 +139,7 @@
- 
-         <!--Click on Stores item-->
-         <click stepKey="clickOnStoresItem" selector="{{CatalogProductsSection.storesItem}}"/>
-+        <waitForPageLoad stepKey="waitForNavigationPanel"/>
- 
-         <!--Click on Products item-->
-         <waitForElementVisible selector="{{CatalogProductsSection.storesProductItem}}" stepKey="waitForCatalogLoad"/>
-@@ -162,5 +167,4 @@
-         <waitForPageLoad stepKey="waitForAllFilterReset"/>
- 
-     </actionGroup>
--
- </actionGroups>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductCheckoutActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductCheckoutActionGroup.xml
-index f272fa8ea73..f88ed5e1b02 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductCheckoutActionGroup.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductCheckoutActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Check configurable product in checkout cart items -->
-     <actionGroup name="CheckConfigurableProductInCheckoutCartItemsActionGroup">
-         <arguments>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontAddConfigurableProductToTheCartActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontAddConfigurableProductToTheCartActionGroup.xml
-new file mode 100644
-index 00000000000..380ffb1d0c7
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontAddConfigurableProductToTheCartActionGroup.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAddConfigurableProductToTheCartActionGroup">
-+        <arguments>
-+            <argument name="urlKey" type="string"/>
-+            <argument name="productAttribute" type="string"/>
-+            <argument name="productOption" type="string" />
-+            <argument name="qty" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{urlKey}}.html" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForProductFrontPageToLoad"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect(productAttribute)}}" userInput="{{productOption}}" stepKey="selectOption1"/>
-+        <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{qty}}" stepKey="fillProductQuantity"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="clickOnAddToCartButton"/>
-+        <waitForPageLoad stepKey="waitForProductToAddInCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+        <seeElement selector="{{StorefrontProductPageSection.successMsg}}" stepKey="seeSuccessSaveMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
-index 9c160d72acc..e2759fc0fd2 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Check configurable product on the category page -->
-     <actionGroup name="StorefrontCheckCategoryConfigurableProduct">
-         <arguments>
-@@ -21,4 +21,15 @@
-         <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
-         <seeElement selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="AssertAddToCart" />
-     </actionGroup>
-+
-+    <!-- Check configurable product out of stock on the category page -->
-+    <actionGroup name="StorefrontCheckCategoryOutOfStockConfigurableProduct">
-+        <arguments>
-+            <argument name="product" type="entity"/>
-+        </arguments>
-+        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName(product.name)}}" stepKey="assertProductName"/>
-+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
-+        <seeElement selector="{{StorefrontCategoryProductSection.ProductStockUnavailable}}" stepKey="AssertOutOfStock"/>
-+        <dontSeeElement selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="AssertAddToCart" />
-+    </actionGroup>
- </actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCheckCategoryConfigurableProductWithUpdatedPriceActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCheckCategoryConfigurableProductWithUpdatedPriceActionGroup.xml
-new file mode 100644
-index 00000000000..5d5e37ecce4
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCheckCategoryConfigurableProductWithUpdatedPriceActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontCheckCategoryConfigurableProductWithUpdatedPriceActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+            <argument name="expectedPrice" type="string"/>
-+        </arguments>
-+        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName(productName)}}" stepKey="assertProductName"/>
-+        <see userInput="{{expectedPrice}}" selector="{{StorefrontCategoryProductSection.ProductPriceByName(productName)}}" stepKey="AssertProductPrice"/>
-+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(productName)}}" stepKey="moveMouseOverProduct"/>
-+        <seeElement selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(productName)}}" stepKey="AssertAddToCart"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
-index 62e03b62151..a0c82ae356e 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Check the configurable product in comparison page -->
-     <actionGroup name="StorefrontCheckCompareConfigurableProductActionGroup">
-         <arguments>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
-index 968f8c490af..2c3e5716d6a 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Check the configurable product on the product page -->
-     <actionGroup name="StorefrontCheckConfigurableProduct">
-         <arguments>
-@@ -24,4 +24,83 @@
-         <see userInput="{{product.custom_attributes[description]}}" selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="assertProductDescription"/>
-         <see userInput="{{product.custom_attributes[short_description]}}" selector="{{StorefrontProductInfoMainSection.productShortDescription}}" stepKey="assertProductShortDescription"/>
-     </actionGroup>
--</actionGroups>
-\ No newline at end of file
-+
-+    <!-- Check Storefront Configurable Product Option -->
-+    <actionGroup name="VerifyOptionInProductStorefront">
-+        <arguments>
-+            <argument name="attributeCode" type="string"/>
-+            <argument name="optionName" type="string"/>
-+        </arguments>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.attributeOptionByAttributeID(attributeCode, optionName)}}" stepKey="verifyOptionExists"/>
-+    </actionGroup>
-+
-+    <!-- Adds Single Option Configurable Product to cart-->
-+    <actionGroup name="SelectSingleAttributeAndAddToCart">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+            <argument name="attributeCode" type="string"/>
-+            <argument name="optionName" type="string"/>
-+        </arguments>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.attributeSelectByAttributeID(attributeCode)}}" userInput="{{optionName}}" stepKey="selectAttribute"/>
-+        <click stepKey="addProduct" selector="{{StorefrontProductActionSection.addToCart}}"/>
-+        <waitForElementVisible selector="{{StorefrontQuickSearchResultsSection.messageSection}}" time="30" stepKey="waitForProductAdded"/>
-+        <see selector="{{StorefrontQuickSearchResultsSection.messageSection}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddedToCartMessage"/>
-+    </actionGroup>
-+
-+    <!-- Verify configurable product options in storefront product view -->
-+    <actionGroup name="storefrontCheckConfigurableProductOptions">
-+        <arguments>
-+            <argument name="product" type="entity"/>
-+            <argument name="firstOption" type="entity"/>
-+            <argument name="secondOption" type="entity"/>
-+        </arguments>
-+        <selectOption userInput="{{firstOption.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
-+        <see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="seeConfigurableProductName"/>
-+        <see userInput="{{firstOption.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPricePresent"/>
-+        <see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="seeConfigurableProductSku"/>
-+        <see userInput="IN STOCK" selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="assertInStock"/>
-+        <see userInput="{{colorProductAttribute.default_label}}" selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" stepKey="seeColorAttributeName"/>
-+        <dontSee userInput="As low as" selector="{{StorefrontProductInfoMainSection.productPriceLabel}}" stepKey="dontSeeProductPriceLabel1"/>
-+        <selectOption userInput="{{secondOption.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption2"/>
-+        <dontSee userInput="As low as" selector="{{StorefrontProductInfoMainSection.productPriceLabel}}" stepKey="dontSeeProductPriceLabel2"/>
-+        <see userInput="{{secondOption.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seeProductPrice2"/>
-+    </actionGroup>
-+
-+    <!-- Assert option image in storefront product page -->
-+    <actionGroup name="assertOptionImageInStorefrontProductPage">
-+        <arguments>
-+            <argument name="product" type="entity"/>
-+            <argument name="label" type="string"/>
-+            <argument name="image" defaultValue="MagentoLogo"/>
-+        </arguments>
-+        <seeInCurrentUrl url="/{{product.urlKey}}.html" stepKey="checkUrl"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <selectOption userInput="{{label}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
-+        <seeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeFirstImage"/>
-+    </actionGroup>
-+
-+    <!-- Assert option image and price in storefront product page -->
-+    <actionGroup name="AssertOptionImageAndPriceInStorefrontProductActionGroup">
-+        <arguments>
-+            <argument name="label" type="string"/>
-+            <argument name="image" type="string"/>
-+            <argument name="price" type="string"/>
-+        </arguments>
-+        <selectOption userInput="{{label}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption"/>
-+        <seeElement selector="{{StorefrontProductMediaSection.imageFile(image)}}" stepKey="seeImage"/>
-+        <see userInput="{{price}}" selector="{{StorefrontProductInfoMainSection.price}}" stepKey="seeProductPrice"/>
-+    </actionGroup>
-+
-+    <!-- Assert configurable product with special price in storefront product page -->
-+    <actionGroup name="assertConfigurableProductWithSpecialPriceOnStorefrontProductPage">
-+        <arguments>
-+            <argument name="option" type="string"/>
-+            <argument name="price" type="string"/>
-+            <argument name="specialPrice" defaultValue="specialProductPrice"/>
-+        </arguments>
-+        <selectOption userInput="{{option}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOptionWithSpecialPrice"/>
-+        <see userInput="{{specialProductPrice.price}}" selector="{{StorefrontProductInfoMainSection.productSpecialPrice}}" stepKey="seeSpecialProductPrice"/>
-+        <see userInput="Regular Price" selector="{{StorefrontProductInfoMainSection.specialProductText}}" stepKey="seeText"/>
-+        <see userInput="{{price}}" selector="{{StorefrontProductInfoMainSection.oldProductPrice}}" stepKey="seeOldProductPrice"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductAttributeActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductAttributeActionGroup.xml
-new file mode 100644
-index 00000000000..77808273815
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductAttributeActionGroup.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Check configurable product attribute options on the category page -->
-+    <actionGroup name="SelectStorefrontSideBarAttributeOption">
-+        <arguments>
-+            <argument name="categoryName" type="string"/>
-+            <argument name="attributeDefaultLabel" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{categoryName}}" stepKey="openCategoryStoreFrontPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}" stepKey="seeCategoryInFrontPage"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}" stepKey="clickOnCategory"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad1"/>
-+        <seeElement selector="{{StorefrontCategorySidebarSection.filterOptionsTitle(attributeDefaultLabel)}}" stepKey="seeAttributeOptionsTitle"/>
-+        <click selector="{{StorefrontCategorySidebarSection.filterOptionsTitle(attributeDefaultLabel)}}" stepKey="clickAttributeOptions"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
-index cc88a2c6147..e07b97c63a9 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Check Configurable Product in the Cart -->
-     <actionGroup name="StorefrontCheckCartConfigurableProductActionGroup">
-         <arguments>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
-new file mode 100644
-index 00000000000..f3b07862360
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="VerifyProductTypeOrder">
-+        <seeElement stepKey="seeConfigurableInOrder" selector="{{AdminProductDropdownOrderSection.configurableProduct}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductAttributeNameDesignData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductAttributeNameDesignData.xml
-index 73a668fd2fe..0018f5996c9 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductAttributeNameDesignData.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductAttributeNameDesignData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="NewProductsData" type="user">
-         <data key="productName" unique="prefix">Shoes</data>
-         <data key="price">60</data>
-@@ -31,5 +31,4 @@
-         <data key="configurableProduct">configurable</data>
-         <data key="errorMessage">element.disabled is not a function</data>
-     </entity>
--
- </entities>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
-index f92b388b466..e7d9d61491a 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="BaseConfigurableProduct" type="product">
-         <data key="sku" unique="suffix">configurable</data>
-         <data key="type_id">configurable</data>
-@@ -29,11 +29,24 @@
-         <data key="visibility">4</data>
-         <data key="name" unique="suffix">API Configurable Product</data>
-         <data key="urlKey" unique="suffix">api-configurable-product</data>
-+        <data key="price">123.00</data>
-+        <data key="weight">2</data>
-         <data key="status">1</data>
-         <data key="quantity">100</data>
-         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-     </entity>
-+    <entity name="ApiConfigurableProductWithOutCategory" type="product">
-+        <data key="sku" unique="suffix">api-configurable-product-with-out-category</data>
-+        <data key="type_id">configurable</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="visibility">4</data>
-+        <data key="name" unique="suffix">API Configurable Product</data>
-+        <data key="urlKey" unique="suffix">api-configurable-product</data>
-+        <data key="status">1</data>
-+        <data key="quantity">100</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+    </entity>
-     <entity name="ApiConfigurableProductWithDescription" type="product">
-         <data key="sku" unique="suffix">api-configurable-product</data>
-         <data key="type_id">configurable</data>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
-index 21dcf998a63..a1a499f33ed 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
-@@ -7,11 +7,23 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="ConfigurableProductOneOption" type="ConfigurableProductOption">
-+        <var key="attribute_id" entityKey="attribute_id" entityType="ProductAttribute" />
-+        <data key="label">option</data>
-+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
-+    </entity>
-     <entity name="ConfigurableProductTwoOptions" type="ConfigurableProductOption">
-         <var key="attribute_id" entityKey="attribute_id" entityType="ProductAttribute" />
-         <data key="label">option</data>
-         <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
-         <requiredEntity type="ValueIndex">ValueIndex2</requiredEntity>
-     </entity>
-+    <entity name="ConfigurableProductThreeOptions" type="ConfigurableProductOption">
-+        <var key="attribute_id" entityKey="attribute_id" entityType="ProductAttribute" />
-+        <data key="label">option</data>
-+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
-+        <requiredEntity type="ValueIndex">ValueIndex2</requiredEntity>
-+        <requiredEntity type="ValueIndex">ValueIndex3</requiredEntity>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConstData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConstData.xml
-index 974be1e14a3..7e21729ba15 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConstData.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConstData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
-     <entity name="CONST" type="CONST">
-         <data key="three">3</data>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml
-index f99f960f6a9..13760f74297 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="colorProductAttribute" type="product_attribute">
-         <data key="default_label" unique="suffix">Color</data>
-         <data key="input_type">Dropdown</data>
-@@ -29,6 +29,11 @@
-         <data key="name" unique="suffix">Orange</data>
-         <data key="price">99.99</data>
-     </entity>
-+    <entity name="productAttributeColor" type="product_attribute">
-+        <data key="default_label" unique="suffix">color</data>
-+        <data key="input_type">Dropdown</data>
-+        <data key="attribute_quantity">1</data>
-+    </entity>
-     <entity name="colorDefaultProductAttribute" type="product_attribute">
-         <data key="default_label">Color</data>
-         <data key="input_type">Dropdown</data>
-@@ -42,4 +47,22 @@
-         <data key="name">Black</data>
-         <data key="price">5.00</data>
-     </entity>
-+    <entity name="colorConfigurableProductAttribute1" type="product_attribute">
-+        <data key="name" unique="suffix">Green</data>
-+        <data key="sku" unique="suffix">sku-green</data>
-+        <data key="type_id">simple</data>
-+        <data key="price">1</data>
-+        <data key="visibility">1</data>
-+        <data key="quantity">1</data>
-+        <data key="weight">1</data>
-+    </entity>
-+    <entity name="colorConfigurableProductAttribute2" type="product_attribute">
-+        <data key="name" unique="suffix">Red</data>
-+        <data key="sku" unique="suffix">sku-red</data>
-+        <data key="type_id">simple</data>
-+        <data key="price">2</data>
-+        <data key="visibility">1</data>
-+        <data key="quantity">10</data>
-+        <data key="weight">1</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ValueIndexData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ValueIndexData.xml
-index 54d489a446f..537ba2bbce0 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ValueIndexData.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ValueIndexData.xml
-@@ -7,11 +7,14 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="ValueIndex1" type="ValueIndex">
-         <var key="value_index" entityKey="value" entityType="ProductAttributeOption"/>
-     </entity>
-     <entity name="ValueIndex2" type="ValueIndex">
-         <var key="value_index" entityKey="value" entityType="ProductAttributeOption"/>
-     </entity>
-+    <entity name="ValueIndex3" type="ValueIndex">
-+        <var key="value_index" entityKey="value" entityType="ProductAttributeOption"/>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_add_child-meta.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_add_child-meta.xml
-index 6a77e97d8f2..ec4da787541 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_add_child-meta.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_add_child-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="ConfigurableProductAddChild" dataType="ConfigurableProductAddChild" type="create" auth="adminOauth" url="/V1/configurable-products/{sku}/child" method="POST">
-         <contentType>application/json</contentType>
-         <field key="childSku">string</field>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_options-meta.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_options-meta.xml
-index 37e6be683c2..4d894f78009 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_options-meta.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_options-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateConfigurableProductOption" dataType="ConfigurableProductOption" type="create" auth="adminOauth" url="/V1/configurable-products/{sku}/options" method="POST">
-         <contentType>application/json</contentType>
-         <object dataType="ConfigurableProductOption" key="option">
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/extension_attribute_configurable_product_options-meta.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/extension_attribute_configurable_product_options-meta.xml
-index 2f1db19a1fd..4b12abd3053 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/extension_attribute_configurable_product_options-meta.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/extension_attribute_configurable_product_options-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateExtensionAttributeConfigProductOption" dataType="ExtensionAttributeConfigProductOption" type="create">
-         <contentType>application/json</contentType>
-         <array key="configurable_product_options">
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/valueIndex-meta.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/valueIndex-meta.xml
-index 8d955fcc944..e83faddf0e3 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/valueIndex-meta.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/valueIndex-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="ValueIndex" dataType="ValueIndex" type="create">
-         <field key="value_index">integer</field>
-     </operation>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml
-index 01a494afd10..7705b34f0af 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
-         <section name="AdminProductFormConfigurationsSection"/>
-         <section name="AdminCreateProductConfigurationsPanel"/>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
-index dac7027b739..78e4c7bced8 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
-@@ -7,8 +7,11 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminChooseAffectedAttributeSetPopup">
-         <element name="confirm" type="button" selector="button[data-index='confirm_button']" timeout="30"/>
-+        <element name="addNewAttrSet" type="radio" selector="//input[@data-index='affectedAttributeSetNew']" timeout="30"/>
-+        <element name="createNewAttrSetName" type="input" selector="//input[@name='configurableNewAttributeSetName']" timeout="30"/>
-+        <element name="closePopUp" type="button" selector="//*[contains(@class,'product_form_product_form_configurable_attribute_set')]//button[@data-role='closeBtn']" timeout="30"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
-index 77759043a05..f3c628d002e 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCreateProductConfigurationsPanel">
-         <element name="next" type="button" selector=".steps-wizard-navigation .action-next-step" timeout="30"/>
-         <element name="createNewAttribute" type="button" selector=".select-attributes-actions button[title='Create New Attribute']" timeout="30"/>
-@@ -16,14 +16,22 @@
-         <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
-         <element name="firstCheckbox" type="input" selector="tr[data-repeat-index='0'] .admin__control-checkbox"/>
-         <element name="id" type="text" selector="//tr[contains(@data-repeat-index, '0')]/td[2]/div"/>
-+        <element name="attributeCheckbox" type="checkbox" selector="//div[contains(text(), '{{arg}}')]/ancestor::tr//input[@data-action='select-row']" parameterized="true"/>
-+        <element name="defaultLabel" type="text" selector="//div[contains(text(), '{{arg}}')]/ancestor::tr//td[3]/div[@class='data-grid-cell-content']" parameterized="true"/>
- 
-         <element name="selectAll" type="button" selector=".action-select-all"/>
-         <element name="selectAllByAttribute" type="button" selector="//div[@data-attribute-title='{{attr}}']//button[contains(@class, 'action-select-all')]" parameterized="true"/>
-         <element name="createNewValue" type="input" selector=".action-create-new" timeout="30"/>
-+        <element name="attributeNameInTitle" type="input" selector="//div[contains(@class,'attribute-entity-title-block')]/div[contains(@class,'attribute-entity-title')]"/>
-         <element name="attributeName" type="input" selector="li[data-attribute-option-title=''] .admin__field-create-new .admin__control-text"/>
-+        <element name="attributeNameWithError" type="text" selector="//li[@data-attribute-option-title='']/div[contains(@class,'admin__field admin__field-create-new _error')]"/>
-         <element name="saveAttribute" type="button" selector="li[data-attribute-option-title=''] .action-save" timeout="30"/>
-         <element name="attributeCheckboxByIndex" type="input" selector="li.attribute-option:nth-of-type({{var1}}) input" parameterized="true"/>
- 
-+        <element name="applySingleSetOfImages" type="radio" selector=".admin__field-label[for='apply-single-set-radio']" timeout="30"/>
-+        <element name="imageFileUpload" type="input" selector=".steps-wizard-section input[type='file'][name='image']"/>
-+        <element name="imageUploadButton" type="button" selector=".steps-wizard-section div.gallery"/>
-+
-         <element name="applyUniquePricesByAttributeToEachSku" type="radio" selector=".admin__field-label[for='apply-unique-prices-radio']"/>
-         <element name="applySinglePriceToAllSkus" type="radio" selector=".admin__field-label[for='apply-single-price-radio']"/>
-         <element name="singlePrice" type="input" selector="#apply-single-price-input"/>
-@@ -33,7 +41,21 @@
-         <element name="attribute3" type="input" selector="#apply-single-price-input-2"/>
- 
-         <element name="applySingleQuantityToEachSkus" type="radio" selector=".admin__field-label[for='apply-single-inventory-radio']" timeout="30"/>
-+        <element name="applyUniqueQuantityToEachSkus" type="radio" selector=".admin__field-label[for='apply-unique-inventory-radio']" timeout="30"/>
-+        <element name="selectQuantity" type="select" selector="#apply-single-price-input-qty" timeout="30"/>
-+        <element name="applyUniqueQuantity" type="input" selector="//*[text()='{{option}}']/ancestor::div[contains(@class, 'admin__field _required')]//input[contains(@id, 'apply-qty-input')]" parameterized="true"/>
-+        <element name="applyUniqueImagesToEachSkus" type="radio" selector=".admin__field-label[for='apply-unique-images-radio']" timeout="30"/>
-+        <element name="applyUniquePricesToEachSkus" type="radio" selector=".admin__field-label[for='apply-unique-prices-radio']" timeout="30"/>
-+        <element name="selectImagesButton" type="select" selector="#apply-images-attributes" timeout="30"/>
-+        <element name="uploadImagesButton" type="file" selector="//*[text()='{{option}}']/../../div[@data-role='gallery']//input[@type='file']" timeout="30" parameterized="true"/>
-+        <element name="uploadProgressBar" type="text" selector=".uploader .file-row"/>
-+        <element name="imageFile" type="text" selector="//*[@data-role='gallery']//img[contains(@src, '{{url}}')]" parameterized="true"/>
-+        <element name="selectPriceButton" type="select" selector="#select-each-price" timeout="30"/>
-+        <element name="price" type="input" selector="//*[text()='{{option}}']/../..//input[contains(@id, 'apply-single-price-input')]" parameterized="true"/>
-         <element name="quantity" type="input" selector="#apply-single-inventory-input"/>
-         <element name="gridLoadingMask" type="text" selector="[data-role='spinner'][data-component*='product_attributes_listing']"/>
-+        <element name="attributeCheckboxByName" type="input" selector="//*[contains(@data-attribute-option-title,'{{arg}}')]//input[@type='checkbox']" parameterized="true"/>
-+        <element name="attributeColorCheckbox" type="select" selector="//div[contains(text(),'color') and @class='data-grid-cell-content']/../preceding-sibling::td/label/input"/>
-+        <element name="attributeRowByAttributeCode" type="block" selector="//td[count(../../..//th[./*[.='Attribute Code']]/preceding-sibling::th) + 1][./*[.='{{attribute_code}}']]/../td//input[@data-action='select-row']" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
-index 31787ca75f1..573f1265931 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
-@@ -7,8 +7,17 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminNewAttributePanel">
-+        <element name="useInSearch" type="select" selector="#is_searchable"/>
-+        <element name="visibleInAdvancedSearch" type="select" selector="#is_visible_in_advanced_search"/>
-+        <element name="comparableOnStorefront" type="select" selector="#is_comparable"/>
-+        <element name="useInLayeredNavigation" type="select" selector="#is_filterable"/>
-+        <element name="visibleOnCatalogPagesOnStorefront" type="select" selector="#is_visible_on_front"/>
-+        <element name="useInProductListing" type="select" selector="#used_in_product_listing"/>
-+        <element name="usedForStoringInProductListing" type="select" selector="#used_for_sort_by"/>
-+        <element name="storefrontPropertiesTab" type="button" selector="#front_fieldset-wrapper"/>
-+        <element name="storefrontPropertiesTitle" type="text" selector="//span[text()='Storefront Properties']"/>
-         <element name="container" type="text" selector="#create_new_attribute"/>
-         <element name="saveAttribute" type="button" selector="#save"/>
-         <element name="newAttributeIFrame" type="iframe" selector="create_new_attribute_container"/>
-@@ -20,5 +29,6 @@
-         <element name="optionAdminValue" type="input" selector="[data-role='options-container'] input[name='option[value][option_{{row}}][0]']" parameterized="true"/>
-         <element name="optionDefaultStoreValue" type="input" selector="[data-role='options-container'] input[name='option[value][option_{{row}}][1]']" parameterized="true"/>
-         <element name="deleteOption" type="button" selector="#delete_button_option_{{row}}" parameterized="true"/>
-+        <element name="deleteOptionByName" type="button" selector="//*[contains(@value, '{{arg}}')]/../following-sibling::td[contains(@id, 'delete_button_container')]/button" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductDropdownOrderSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
-new file mode 100644
-index 00000000000..6056e7f3cbd
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminProductDropdownOrderSection">
-+        <element name="configurableProduct" type="text" selector="//li[not(preceding-sibling::li[span[@title='Virtual Product']]) and not(preceding-sibling::li[span[@title='Grouped Product']]) and not(preceding-sibling::li[span[@title='Bundle Product']]) and not(preceding-sibling::li[span[@title='Downloadable Product']]) and not(following-sibling::li[span[@title='Simple Product']])]/span[@title='Configurable Product']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
-index 8a2cd192a20..c1707f6f1f0 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
-@@ -7,9 +7,10 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductFormConfigurationsSection">
-         <element name="sectionHeader" type="text" selector=".admin__collapsible-block-wrapper[data-index='configurable']"/>
-+        <element name="createdConfigurationsBlock" type="text" selector="div.admin__field.admin__field-wide"/>
-         <element name="createConfigurations" type="button" selector="button[data-index='create_configurable_products_button']" timeout="30"/>
-         <element name="currentVariationsRows" type="button" selector=".data-row"/>
-         <element name="currentVariationsNameCells" type="textarea" selector=".admin__control-fields[data-index='name_container']"/>
-@@ -18,10 +19,26 @@
-         <element name="currentVariationsQuantityCells" type="textarea" selector=".admin__control-fields[data-index='quantity_container']"/>
-         <element name="currentVariationsAttributesCells" type="textarea" selector=".admin__control-fields[data-index='attributes']"/>
-         <element name="currentVariationsStatusCells" type="textarea" selector="._no-header[data-index='status']"/>
-+        <element name="firstSKUInConfigurableProductsGrid" type="input" selector="//input[@name='configurable-matrix[0][sku]']"/>
-         <element name="actionsBtn" type="button" selector="(//button[@class='action-select']/span[contains(text(), 'Select')])[{{var1}}]" parameterized="true"/>
-+        <element name="actionsBtnByProductName" type="textarea" selector="//*[.='Attributes']/ancestor::tr/td[@data-index='attributes']//span[contains(text(), '{{var}}')]/ancestor::tr//button[@class='action-select']" parameterized="true"/>
-+        <element name="addProduct" type="button" selector="//*[.='Attributes']/ancestor::tr/td[@data-index='attributes']//span[contains(text(), '{{var}}')]/ancestor::tr//a[text()='Choose a different Product']" parameterized="true"/>
-         <element name="removeProductBtn" type="button" selector="//a[text()='Remove Product']"/>
-         <element name="disableProductBtn" type="button" selector="//a[text()='Disable Product']"/>
-         <element name="enableProductBtn" type="button" selector="//a[text()='Enable Product']"/>
-+        <element name="confProductSku" type="input" selector="//*[@name='configurable-matrix[{{arg}}][sku]']" parameterized="true"/>
-+        <element name="confProductNameCell" type="input" selector="//*[.='Attributes']/ancestor::tr//span[contains(text(), '{{var}}')]/ancestor::tr/td[@data-index='name_container']//input" parameterized="true"/>
-+        <element name="confProductSkuCell" type="input" selector="//*[.='Attributes']/ancestor::tr//span[contains(text(), '{{var}}')]/ancestor::tr/td[@data-index='sku_container']//input" parameterized="true"/>
-+        <element name="confProductPriceCell" type="input" selector="//*[.='Attributes']/ancestor::tr//span[contains(text(), '{{var}}')]/ancestor::tr/td[@data-index='price_container']//input" parameterized="true"/>
-+        <element name="confProductQuantityCell" type="input" selector="//*[.='Attributes']/ancestor::tr//span[contains(text(), '{{var}}')]/ancestor::tr/td[@data-index='quantity_container']//input" parameterized="true"/>
-+        <element name="confProductWeightCell" type="input" selector="//*[.='Attributes']/ancestor::tr//span[contains(text(), '{{var}}')]/ancestor::tr/td[@data-index='price_weight']//input" parameterized="true"/>
-+        <element name="confProductOptionStatusCell" type="text" selector="//*[.='Attributes']/ancestor::tr//span[contains(text(), '{{productName}}')]/ancestor::tr/td[@data-index='status']" parameterized="true"/>
-+        <element name="confProductSkuMessage" type="text" selector="//*[@name='configurable-matrix[{{arg}}][sku]']/following-sibling::label" parameterized="true"/>
-+        <element name="variationsSkuInputByRow" selector="[data-index='configurable-matrix'] table > tbody > tr:nth-of-type({{row}}) input[name*='sku']" type="input" parameterized="true"/>
-+        <element name="variationsSkuInputErrorByRow" selector="[data-index='configurable-matrix'] table > tbody > tr:nth-of-type({{row}}) .admin__field-error" type="text" parameterized="true"/>
-+        <element name="variationLabel" type="text" selector="//div[@data-index='configurable-matrix']/label"/>
-+        <element name="stepsWizardTitle" type="text" selector="div.content:not([style='display: none;']) .steps-wizard-title"/>
-+        <element name="attributeEntityByName" type="text" selector="//div[@class='attribute-entity']//div[normalize-space(.)='{{attributeLabel}}']" parameterized="true"/>
-     </section>
-     <section name="AdminConfigurableProductFormSection">
-         <element name="productWeight" type="input" selector=".admin__control-text[name='product[weight]']"/>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductGridActionSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductGridActionSection.xml
-index 1d4ec9270ef..e3403ce71ac 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductGridActionSection.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductGridActionSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductGridActionSection">
-         <element name="addConfigurableProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-configurable']" timeout="30"/>
-     </section>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection.xml
-index b3077d9d5d5..ea5638f6816 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CatalogProductsSection">
-         <element name="catalogItem" type="button" selector="//*[@id='menu-magento-catalog-catalog']/a/span"/>
-         <element name="productItem" type="button" selector="//*[@data-ui-id='menu-magento-catalog-catalog-products']/a"/>
-@@ -53,7 +53,6 @@
-         <element name="saveAttributeButton" type="button" selector="//*[@id='save']"/>
-         <element name="advancedAttributeProperties" type="button" selector="//*[@id='advanced_fieldset-wrapper']//*[contains(text(),'Advanced Attribute Properties')]"/>
-         <element name="attributeCodeField" type="input"  selector="//*[@id='attribute_code']"/>
--
-     </section>
- 
-     <section name="CreateProductConfigurations">
-@@ -64,5 +63,4 @@
-         <element name="checkboxBlack" type="input" selector="//fieldset[@class='admin__fieldset admin__fieldset-options']//*[contains(text(),'black')]/preceding-sibling::input"/>
-         <element name="errorMessage" type="input" selector="//div[@data-ui-id='messages-message-error']"/>
-     </section>
--
- </sections>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-index 4f96ea41eac..0853d22eda7 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-@@ -7,15 +7,19 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductInfoMainSection">
-         <element name="optionByAttributeId" type="input" selector="#attribute{{var1}}" parameterized="true"/>
-         <element name="productAttributeTitle1" type="text" selector="#product-options-wrapper div[tabindex='0'] label"/>
-+        <element name="productPrice" type="text" selector="div.price-box.price-final_price"/>
-         <element name="productAttributeOptions1" type="select" selector="#product-options-wrapper div[tabindex='0'] option"/>
-         <element name="productAttributeOptionsSelectButton" type="select" selector="#product-options-wrapper .super-attribute-select"/>
-         <element name="productAttributeOptionsError" type="text" selector="//div[@class='mage-error']"/>
-+        <element name="selectCustomOptionByName" type="radio" selector="//*[@class='options-list nested']//span[contains(text(), '{{value}}')]/../../input" parameterized="true"/>
-         <!-- Parameter is the order number of the attribute on the page (1 is the newest) -->
-         <element name="nthAttributeOnPage" type="block" selector="tr:nth-of-type({{numElement}}) .data" parameterized="true"/>
-         <element name="stockIndication" type="block" selector=".stock" />
-+        <element name="attributeSelectByAttributeID" type="select" selector="//div[@class='fieldset']//div[//span[text()='{{attribute_code}}']]//select" parameterized="true"/>
-+        <element name="attributeOptionByAttributeID" type="select" selector="//div[@class='fieldset']//div[//span[text()='{{attribute_code}}']]//option[text()='{{optionName}}']" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
-index 7dbacfa2ce6..92928c93846 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddDefaultImageConfigurableTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml
-new file mode 100644
-index 00000000000..52443a17dfe
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml
-@@ -0,0 +1,124 @@
-+<?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="AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Update product"/>
-+            <title value="Adding new options with images and prices to Configurable Product"/>
-+            <description value="Test case verifies possibility to add new options for configurable attribute for existing configurable product."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13339"/>
-+            <group value="configurableProduct"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="AdminCreateApiConfigurableProductActionGroup" stepKey="createConfigurableProduct"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="createConfigProductCreateConfigurableProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigProductAttributeCreateConfigurableProduct" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createConfigChildProduct1CreateConfigurableProduct" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2CreateConfigurableProduct" stepKey="deleteConfigChildProduct2"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open edit product page-->
-+        <amOnPage url="{{AdminProductEditPage.url($$createConfigProductCreateConfigurableProduct.id$$)}}" stepKey="goToProductEditPage"/>
-+
-+        <!--Open edit configuration wizard-->
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickEditConfigurations"/>
-+        <see userInput="Select Attributes" selector="{{AdminProductFormConfigurationsSection.stepsWizardTitle}}" stepKey="seeStepTitle"/>
-+
-+        <!--Click Next button-->
-+        <actionGroup ref="AdminConfigurableWizardMoveToNextStepActionGroup" stepKey="navigateToAttributeValuesStep">
-+            <argument name="title" value="Attribute Values"/>
-+        </actionGroup>
-+        <seeElement selector="{{AdminProductFormConfigurationsSection.attributeEntityByName($$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$)}}" stepKey="seeAttribute"/>
-+
-+        <!--Create one color option via "Create New Value" link-->
-+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue"/>
-+        <fillField userInput="{{colorDefaultProductAttribute1.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute"/>
-+
-+        <!--Click Next button-->
-+        <actionGroup ref="AdminConfigurableWizardMoveToNextStepActionGroup" stepKey="navigateToBulkStep">
-+            <argument name="title" value="Bulk Images, Price and Quantity"/>
-+        </actionGroup>
-+
-+        <!--Select Apply unique images by attribute to each SKU and color attribute in dropdown in Images-->
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applyUniqueImagesToEachSkus}}" stepKey="clickOnApplyUniqueImagesToEachSku"/>
-+        <selectOption userInput="$$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$"
-+                      selector="{{AdminCreateProductConfigurationsPanel.selectImagesButton}}" stepKey="selectAttributeOption"/>
-+
-+        <!-- Add images to configurable product attribute options -->
-+        <actionGroup ref="addUniqueImageToConfigurableProductOption" stepKey="addImageToConfigurableProductOptionOne">
-+            <argument name="image" value="ImageUpload"/>
-+            <argument name="frontend_label" value="$$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$"/>
-+            <argument name="label" value="$$getConfigAttributeOption1CreateConfigurableProduct.label$$"/>
-+        </actionGroup>
-+        <actionGroup ref="addUniqueImageToConfigurableProductOption" stepKey="addImageToConfigurableProductOptionTwo">
-+            <argument name="image" value="ImageUpload_1"/>
-+            <argument name="frontend_label" value="$$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$"/>
-+            <argument name="label" value="$$getConfigAttributeOption2CreateConfigurableProduct.label$$"/>
-+        </actionGroup>
-+        <actionGroup ref="addUniqueImageToConfigurableProductOption" stepKey="addImageToConfigurableProductOptionThree">
-+            <argument name="image" value="ImageUpload3"/>
-+            <argument name="frontend_label" value="$$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$"/>
-+            <argument name="label" value="{{colorDefaultProductAttribute1.name}}"/>
-+        </actionGroup>
-+
-+        <!--Add prices to configurable product attribute options-->
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applyUniquePricesToEachSkus}}" stepKey="clickOnApplyUniquePricesByAttributeToEachSku"/>
-+        <selectOption  userInput="$$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$"
-+                       selector="{{AdminCreateProductConfigurationsPanel.selectAttribute}}" stepKey="selectAttributes"/>
-+        <fillField userInput="10" selector="{{AdminCreateProductConfigurationsPanel.price($$getConfigAttributeOption1CreateConfigurableProduct.label$$)}}" stepKey="fillAttributePrice"/>
-+        <fillField userInput="20" selector="{{AdminCreateProductConfigurationsPanel.price($$getConfigAttributeOption2CreateConfigurableProduct.label$$)}}" stepKey="fillAttributePrice1"/>
-+        <fillField userInput="30" selector="{{AdminCreateProductConfigurationsPanel.price(colorDefaultProductAttribute1.name)}}" stepKey="fillAttributePrice2"/>
-+
-+        <!-- Add quantity to product attribute options -->
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
-+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="100" stepKey="enterAttributeQuantity"/>
-+
-+        <!--Click Next button-->
-+        <actionGroup ref="AdminConfigurableWizardMoveToNextStepActionGroup" stepKey="navigateToSummaryStep">
-+            <argument name="title" value="Summary"/>
-+        </actionGroup>
-+
-+        <!--Click Generate Configure button-->
-+        <click selector="{{ConfigurableProductSection.generateConfigure}}" stepKey="clickGenerateConfigure"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!--Go to frontend and check image and price-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProductCreateConfigurableProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
-+
-+        <actionGroup ref="AssertOptionImageAndPriceInStorefrontProductActionGroup" stepKey="assertFirstOptionImageAndPriceInStorefrontProductPage">
-+            <argument name="label" value="$$getConfigAttributeOption1CreateConfigurableProduct.label$$"/>
-+            <argument name="image" value="{{ImageUpload.filename}}"/>
-+            <argument name="price" value="10"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertOptionImageAndPriceInStorefrontProductActionGroup" stepKey="assertSecondOptionImageAndPriceInStorefrontProductPage">
-+            <argument name="label" value="$$getConfigAttributeOption2CreateConfigurableProduct.label$$"/>
-+            <argument name="image" value="{{ImageUpload_1.filename}}"/>
-+            <argument name="price" value="20"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertOptionImageAndPriceInStorefrontProductActionGroup" stepKey="assertThirdOptionImageAndPriceInStorefrontProductPage">
-+            <argument name="label" value="{{colorDefaultProductAttribute1.name}}"/>
-+            <argument name="image" value="{{ImageUpload3.filename}}"/>
-+            <argument name="price" value="30"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml
-new file mode 100644
-index 00000000000..68bf703ecda
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml
-@@ -0,0 +1,75 @@
-+<?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="AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create configurable product"/>
-+            <title value="Assert notice that existing sku automatically changed when saving product with same sku"/>
-+            <description value="Admin should not be able to create configurable product and two new options with the same sku"/>
-+            <testCaseId value="MC-13693"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete configurable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="ApiConfigurableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Delete product attribute -->
-+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteProductAttribute">
-+                <argument name="ProductAttribute" value="colorProductAttribute"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create configurable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Fill configurable product values -->
-+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!--Create product configurations-->
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations" after="fillConfigurableProductValues"/>
-+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
-+
-+        <!--Create new attribute with two option -->
-+        <actionGroup ref="addNewProductConfigurationAttribute" stepKey="createProductConfigurationAttribute">
-+            <argument name="attribute" value="colorProductAttribute"/>
-+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
-+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+
-+        <!-- Change products sku configurations in grid -->
-+        <fillField userInput="{{ApiConfigurableProduct.sku}}" selector="{{AdminProductFormConfigurationsSection.confProductSkuCell(colorConfigurableProductAttribute1.name)}}" stepKey="fillFieldSkuForFirstAttributeOption"/>
-+        <fillField userInput="{{ApiConfigurableProduct.sku}}" selector="{{AdminProductFormConfigurationsSection.confProductSkuCell(colorConfigurableProductAttribute2.name)}}" stepKey="fillFieldSkuForSecondAttributeOption"/>
-+
-+        <!-- Save product -->
-+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveBtnVisible"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductAgain"/>
-+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitPopUpVisible"/>
-+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmPopup"/>
-+
-+        <!-- Assert product auto incremented sku notice message; see success message -->
-+        <see selector="{{AdminMessagesSection.noticeMessage}}" stepKey="seeNoticeMessage" userInput="SKU for product {{ApiConfigurableProduct.name}} has been changed to {{ApiConfigurableProduct.sku}}-2."/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" stepKey="seeSuccessMessage" userInput="You saved the product."/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckConfigurableProductAttributeValueUniquenessTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckConfigurableProductAttributeValueUniquenessTest.xml
-new file mode 100644
-index 00000000000..df934446fc8
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckConfigurableProductAttributeValueUniquenessTest.xml
-@@ -0,0 +1,72 @@
-+<?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="AdminCheckConfigurableProductAttributeValueUniquenessTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <title value="Attribute value validation (check for uniqueness) in configurable products"/>
-+            <description value="Attribute value validation (check for uniqueness) in configurable products"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-17450"/>
-+            <useCaseId value="MAGETWO-99443"/>
-+            <group value="ConfigurableProduct"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="dropdownProductAttribute" stepKey="createProductAttribute"/>
-+        </before>
-+        <after>
-+            <!--Delete created data-->
-+            <comment userInput="Delete created data" stepKey="deleteCreatedData"/>
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteConfigurableProductAndOptions">
-+                <argument name="product" value="$$createConfigProduct$$"/>
-+            </actionGroup>
-+            <waitForPageLoad stepKey="waitForProductIndexPage"/>
-+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProductAttribute" stepKey="deleteAttribute"/>
-+            <actionGroup ref="logout" stepKey="logOut"/>
-+        </after>
-+        <!--Create configurable product-->
-+        <comment userInput="Create configurable product" stepKey="createConfProd"/>
-+        <createData entity="ApiCategory" stepKey="createCategory"/>
-+        <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+            <requiredEntity createDataKey="createCategory"/>
-+        </createData>
-+        <!--Go to created product page-->
-+        <comment userInput="Go to created product page" stepKey="goToProdPage"/>
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductGrid"/>
-+        <waitForPageLoad stepKey="waitForProductPage1"/>
-+        <actionGroup ref="filterProductGridByName2" stepKey="filterByName">
-+            <argument name="name" value="$$createConfigProduct.name$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductName"/>
-+        <waitForPageLoad stepKey="waitForProductEditPageToLoad"/>
-+        <!--Create configurations for the product-->
-+        <comment userInput="Create configurations for the product" stepKey="createConfigurations"/>
-+        <conditionalClick selector="{{AdminProductFormConfigurationsSection.sectionHeader}}" dependentSelector="{{AdminProductFormConfigurationsSection.createConfigurations}}" visible="false" stepKey="expandConfigurationsTab1"/>
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnCreateConfigurations1"/>
-+        <waitForPageLoad stepKey="waitForSelectAttributesPage1"/>
-+        <actionGroup ref="selectCreatedAttributeAndCreateTwoOptions" stepKey="selectCreatedAttributeAndCreateOptions">
-+            <argument name="attribute" value="dropdownProductAttribute"/>
-+            <argument name="firstOption" value="productAttributeOption1"/>
-+            <argument name="secondOption" value="productAttributeOption1"/>
-+        </actionGroup>
-+        <!--Check that system does not allow to save 2 options with same name-->
-+        <comment userInput="Check that system does not allow to save 2 options with same name" stepKey="checkOptionNameUniqueness"/>
-+        <seeElement selector="{{AdminCreateProductConfigurationsPanel.attributeNameWithError}}" stepKey="seeThatOptionWithSameNameIsNotSaved"/>
-+        <!--Click next and assert error message-->
-+        <comment userInput="Click next and assert error message" stepKey="clickNextAndAssertErrMssg"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNext"/>
-+        <waitForPageLoad time="10" stepKey="waitForPageLoad"/>
-+        <grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.attributeNameInTitle}}" stepKey="grabErrMsg"/>
-+        <see userInput='The value of attribute "$grabErrMsg" must be unique' stepKey="verifyAttributesValueUniqueness"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
-new file mode 100644
-index 00000000000..dd641fd370b
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
-@@ -0,0 +1,126 @@
-+<?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="AdminCheckValidatorConfigurableProductTest">
-+        <annotations>
-+            <stories value="Configurable Product"/>
-+            <title value="Check that validator works correctly when creating Configurations for Configurable Products"/>
-+            <description value="Verify validator works correctly for Configurable Products"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-95995"/>
-+            <useCaseId value="MAGETWO-95834"/>
-+            <group value="ConfigurableProduct"/>
-+        </annotations>
-+
-+        <before>
-+            <!--Login as admin-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create Category-->
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <!--Create Configurable product-->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
-+                <argument name="sku" value="{{ApiConfigurableProduct.name}}-thisIsShortName"/>
-+            </actionGroup>
-+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
-+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-+            <!-- Remove attribute -->
-+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
-+                <argument name="ProductAttribute" value="productDropDownAttribute"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Find the product that we just created using the product grid -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
-+            dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForProductFilterLoad"/>
-+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+
-+        <!-- Create configurations based off the Text Swatch we created earlier -->
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
-+
-+        <!--Create new attribute-->
-+        <waitForElementVisible stepKey="waitForNewAttributePageOpened" selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickCreateNewAttribute" after="waitForNewAttributePageOpened"/>
-+        <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="enterAttributePanelIFrame" after="clickCreateNewAttribute"/>
-+        <waitForElementVisible selector="{{AdminNewAttributePanel.defaultLabel}}" time="30" stepKey="waitForIframeLoad" after="enterAttributePanelIFrame"/>
-+        <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{productDropDownAttribute.attribute_code}}" stepKey="fillDefaultLabel" after="waitForIframeLoad"/>
-+        <selectOption selector="{{AdminNewAttributePanel.inputType}}" userInput="{{colorProductAttribute.input_type}}" stepKey="selectAttributeInputType" after="fillDefaultLabel"/>
-+        <!--Add option to attribute-->
-+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption1" after="selectAttributeInputType"/>
-+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('1')}}" time="30" stepKey="waitForOptionRow1" after="clickAddOption1"/>
-+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('0')}}" userInput="ThisIsLongNameNameLengthMoreThanSixtyFourThisIsLongNameNameLength" stepKey="fillAdminLabel1" after="waitForOptionRow1"/>
-+        <fillField selector="{{AdminNewAttributePanel.optionDefaultStoreValue('0')}}" userInput="{{colorProductAttribute1.name}}" stepKey="fillDefaultLabel1" after="fillAdminLabel1"/>
-+
-+        <!--Save attribute-->
-+        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
-+        <waitForPageLoad stepKey="waitForSaveAttribute"/>
-+        <switchToIFrame stepKey="switchOutOfIFrame"/>
-+
-+        <!--Find attribute in grid and select-->
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
-+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="clickOnFilters"/>
-+        <fillField selector="{{AdminDataGridHeaderSection.attributeCodeFilterInput}}" userInput="{{productDropDownAttribute.attribute_code}}" stepKey="fillFilterAttributeCodeField"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminDataGridTableSection.rowCheckbox('1')}}" stepKey="clickOnFirstCheckbox"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNextStep1"/>
-+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute(productDropDownAttribute.attribute_code)}}" stepKey="waitForNextPageOpened"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute(productDropDownAttribute.attribute_code)}}" stepKey="clickSelectAll"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNextStep2"/>
-+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" stepKey="waitForNextPageOpened2"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" stepKey="clickOnApplySinglePriceToAllSkus"/>
-+        <fillField selector="{{AdminCreateProductConfigurationsPanel.singlePrice}}" userInput="10" stepKey="enterAttributePrice"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
-+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="100" stepKey="enterAttributeQuantity"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextStep3"/>
-+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="waitForNextPageOpened3"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="generateProducts"/>
-+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveButtonVisible"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
-+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitForPopUpVisible"/>
-+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
-+        <dontSeeElement selector="{{AdminMessagesSection.success}}" stepKey="dontSeeSaveProductMessage"/>
-+
-+        <!--Close modal window-->
-+        <click selector="{{AdminChooseAffectedAttributeSetPopup.closePopUp}}" stepKey="clickOnClosePopup"/>
-+        <waitForElementNotVisible selector="{{AdminChooseAffectedAttributeSetPopup.closePopUp}}" stepKey="waitForDialogClosed"/>
-+
-+        <!--See that validation message is shown under the fields-->
-+        <scrollTo selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" stepKey="scrollTConfigurationTab"/>
-+        <see userInput="Please enter less or equal than 64 symbols." selector="{{AdminProductFormConfigurationsSection.confProductSkuMessage('0')}}" stepKey="SeeValidationMessage"/>
-+
-+        <!--Edit "SKU" with valid quantity-->
-+        <fillField stepKey="fillValidValue" selector="{{AdminProductFormConfigurationsSection.confProductSku('0')}}" userInput="{{ApiConfigurableProduct.name}}-thisIsShortName"/>
-+
-+        <!--Click on "Save"-->
-+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveBtnVisible"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductAgain"/>
-+
-+        <!--Click on "Confirm". Product is saved, success message appears -->
-+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitPopUpVisible"/>
-+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmPopup"/>
-+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
-index 17ace8419c0..2af85e1bac0 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminConfigurableProductCreateTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-@@ -36,6 +36,7 @@
-         </actionGroup>
- 
-         <!-- assert color configurations on the admin create product page -->
-+        <dontSee selector="{{AdminProductFormConfigurationsSection.variationLabel}}" stepKey="seeLabelNotVisible"/>
-         <seeNumberOfElements selector="{{AdminProductFormConfigurationsSection.currentVariationsRows}}" userInput="3" stepKey="seeNumberOfRows"/>
-         <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeName1InField"/>
-         <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeName2InField"/>
-@@ -68,4 +69,71 @@
-         <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeInDropDown2"/>
-         <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeInDropDown3"/>
-     </test>
-+
-+    <test name="AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create, Read, Update, Delete"/>
-+            <title value="admin should be able to create a configurable product after incorrect sku"/>
-+            <description value="admin should be able to create a configurable product after incorrect sku"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-96365"/>
-+            <useCaseId value="MAGETWO-94556"/>
-+            <group value="ConfigurableProduct"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminProductEditPage.url($$createConfigProduct.id$$)}}" stepKey="goToEditPage"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+        <conditionalClick selector="{{AdminProductFormConfigurationsSection.sectionHeader}}" dependentSelector="{{AdminProductFormConfigurationsSection.createConfigurations}}" visible="false" stepKey="openConfigurationSection"/>
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="openConfigurationPane"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
-+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="color" stepKey="fillFilterAttributeCodeField"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue1"/>
-+        <fillField userInput="{{colorProductAttribute2.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute1"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute1"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
-+        <click selector="{{ConfigurableProductSection.generateConfigure}}" stepKey="generateConfigure"/>
-+        <waitForPageLoad stepKey="waitForGenerateConfigure"/>
-+        <grabValueFrom selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}"  stepKey="grabTextFromContent"/>
-+        <fillField stepKey="fillMoreThan64Symbols" selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}" userInput="01234567890123456789012345678901234567890123456789012345678901234"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct1"/>
-+        <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.closePopUp}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.closePopUp}}" visible="true" stepKey="clickOnCloseInPopup"/>
-+        <see stepKey="seeErrorMessage" userInput="Please enter less or equal than 64 symbols."/>
-+        <fillField stepKey="fillCorrectSKU" selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}" userInput="$grabTextFromContent"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
-+        <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" visible="true" stepKey="clickOnConfirmInPopup"/>
-+        <see userInput="You saved the product." stepKey="seeSaveConfirmation"/>
-+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
-+        <waitForPageLoad stepKey="waitForProductAttributes"/>
-+        <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid1"/>
-+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="color" stepKey="fillFilter"/>
-+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearch"/>
-+        <click selector="{{AdminProductAttributeGridSection.AttributeCode('color')}}" stepKey="clickRowToEdit"/>
-+        <click selector="{{DropdownAttributeOptionsSection.deleteButton(1)}}" stepKey="deleteOption"/>
-+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute"/>
-+        <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid2"/>
-+        <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
-+            <argument name="sku" value="$grabTextFromContent"/>
-+        </actionGroup>
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <waitForPageLoad time="60" stepKey="waitForPageLoadInitial"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
-+    </test>
- </tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml
-index 17f17323a9e..1a694b8adf1 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminConfigurableProductDeleteTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-@@ -16,6 +16,7 @@
-             <description value="admin should be able to delete a configurable product"/>
-             <testCaseId value="MC-87"/>
-             <group value="ConfigurableProduct"/>
-+            <severity value="AVERAGE"/>
-         </annotations>
- 
-         <before>
-@@ -106,6 +107,7 @@
-             <description value="admin should be able to mass delete configurable products"/>
-             <testCaseId value="MC-99"/>
-             <group value="ConfigurableProduct"/>
-+            <severity value="AVERAGE"/>
-         </annotations>
- 
-         <before>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml
-new file mode 100644
-index 00000000000..c599a6a23f1
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml
-@@ -0,0 +1,108 @@
-+<?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="AdminConfigurableProductLongSkuTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create configurable product"/>
-+            <title value="Admin is able to create an product with a long sku below that is below the character limit"/>
-+            <description value="Try to create a product with sku slightly less than char limit. Get client side SKU length error for child products. Correct SKUs and save product succeeds."/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-5685"/>
-+            <group value="ConfigurableProduct"/>
-+        </annotations>
-+
-+        <before>
-+            <!--Create product attribute with options-->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <!--Create Category-->
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+        </before>
-+
-+        <after>
-+            <!--Clean up products-->
-+            <actionGroup ref="deleteProductByName" stepKey="cleanUpProducts">
-+                <argument name="sku" value="{{ProductWithLongNameSku.sku}}"/>
-+                <argument name="name" value="{{ProductWithLongNameSku.name}}"/>
-+            </actionGroup>
-+            <!--Clean up attribute-->
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <!--Clean up category-->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-+        </after>
-+
-+         <!--Create a configurable product with long name and sku-->
-+        <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'configurable')}}" stepKey="goToProductCreatePage"/>
-+        <waitForPageLoad stepKey="waitForProductCreatePage"/>
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{ProductWithLongNameSku.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{ProductWithLongNameSku.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{ProductWithLongNameSku.price}}" stepKey="fillProductPrice"/>
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="selectCategory"/>
-+        <!--Setup configurations-->
-+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="setupConfigurations">
-+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
-+        </actionGroup>
-+
-+         <!--See SKU length errors in Current Variations grid-->
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductFail"/>
-+        <seeInCurrentUrl url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'configurable')}}" stepKey="seeRemainOnCreateProductPage"/>
-+        <see selector="{{AdminProductFormConfigurationsSection.variationsSkuInputErrorByRow('1')}}" userInput="Please enter less or equal than 64 symbols." stepKey="seeSkuTooLongError1"/>
-+        <see selector="{{AdminProductFormConfigurationsSection.variationsSkuInputErrorByRow('2')}}" userInput="Please enter less or equal than 64 symbols." stepKey="seeSkuTooLongError2"/>
-+        <!--Fix SKU lengths-->
-+        <fillField selector="{{AdminProductFormConfigurationsSection.variationsSkuInputByRow('1')}}" userInput="LongSku-$$getConfigAttributeOption1.label$$" stepKey="fixConfigurationSku1"/>
-+        <fillField selector="{{AdminProductFormConfigurationsSection.variationsSkuInputByRow('2')}}" userInput="LongSku-$$getConfigAttributeOption2.label$$" stepKey="fixConfigurationSku2"/>
-+        <!--Save product successfully-->
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductSuccess"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
-+
-+         <!--Assert configurations on the product edit pag-->
-+        <seeNumberOfElements selector="{{AdminProductFormConfigurationsSection.currentVariationsRows}}" userInput="2" stepKey="seeNumberOfRows"/>
-+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{ProductWithLongNameSku.name}}-$$getConfigAttributeOption1.label$$" stepKey="seeChildProductName1"/>
-+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{ProductWithLongNameSku.name}}-$$getConfigAttributeOption2.label$$" stepKey="seeChildProductName2"/>
-+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="LongSku-$$getConfigAttributeOption1.label$$" stepKey="seeChildProductSku1"/>
-+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="LongSku-$$getConfigAttributeOption2.label$$" stepKey="seeChildProductSku2"/>
-+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{ProductWithLongNameSku.price}}" stepKey="seeConfigurationsPrice"/>
-+
-+         <!--Assert storefront category list page-->
-+        <amOnPage url="/" stepKey="amOnStorefront"/>
-+        <waitForPageLoad stepKey="waitForStorefrontLoad"/>
-+        <click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <see userInput="{{ProductWithLongNameSku.name}}" stepKey="assertProductPresent"/>
-+        <see userInput="{{ProductWithLongNameSku.price}}" stepKey="assertProductPricePresent"/>
-+
-+        <!--Assert storefront product details page-->
-+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName(ProductWithLongNameSku.name)}}" stepKey="clickOnProductName"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <seeInTitle userInput="{{ProductWithLongNameSku.name}}" stepKey="assertProductNameTitle"/>
-+        <see userInput="{{ProductWithLongNameSku.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
-+        <see userInput="{{ProductWithLongNameSku.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="$$createConfigProductAttribute.default_frontend_label$$" stepKey="seeColorAttributeName1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="$$getConfigAttributeOption1.label$$" stepKey="seeInDropDown1"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="$$getConfigAttributeOption2.label$$" stepKey="seeInDropDown2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml
-index c612431ec70..5633c3675ca 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminConfigurableProductChildrenOutOfStockTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest.xml
-index 77ccf7bc690..059a18200e9 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminConfigurableProductSearchTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-@@ -16,6 +16,7 @@
-             <description value="admin should be able to search for a configurable product"/>
-             <testCaseId value="MC-100"/>
-             <group value="ConfigurableProduct"/>
-+            <severity value="AVERAGE"/>
-         </annotations>
- 
-         <before>
-@@ -94,6 +95,7 @@
-             <description value="admin should be able to filter by type configurable product"/>
-             <testCaseId value="MC-66"/>
-             <group value="ConfigurableProduct"/>
-+            <severity value="AVERAGE"/>
-         </annotations>
- 
-         <before>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSetEditContentTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSetEditContentTest.xml
-new file mode 100644
-index 00000000000..42e12852f56
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSetEditContentTest.xml
-@@ -0,0 +1,40 @@
-+<?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="AdminConfigurableProductSetEditContentTest" extends="AdminSimpleProductSetEditContentTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create/edit configurable product"/>
-+            <title value="Admin should be able to set/edit product Content when editing a configurable product"/>
-+            <description value="Admin should be able to set/edit product Content when editing a configurable product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3424"/>
-+            <group value="ConfigurableProduct"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+        <after>
-+            <!-- Delete configurable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="BaseConfigurableProduct"/>
-+            </actionGroup>
-+        </after>
-+
-+        <!-- Create product -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="BaseConfigurableProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
-+            <argument name="product" value="BaseConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!--Checking content storefront-->
-+        <amOnPage url="{{BaseConfigurableProduct.name}}.html" stepKey="goToStorefront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml
-index 2282da467a9..001d4d17ec2 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminConfigurableProductUpdateAttributeTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-@@ -228,12 +228,12 @@
-         <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
-         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
-         <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
--            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="product" value="$$createConfigProduct$$"/>
-         </actionGroup>
-         <waitForPageLoad stepKey="waitForProductFilterLoad"/>
--
--        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
--        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openProduct">
-+            <argument name="product" value="$$createConfigProduct$$" />
-+        </actionGroup>
- 
-         <!-- Open the wizard for editing configurations and fill out a new attribute -->
-         <click stepKey="clickEditConfig" selector="{{AdminProductFormConfigurationsSection.createConfigurations}}"/>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
-index 154ce019f8c..1791fc002ab 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminConfigurableProductBulkUpdateTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-@@ -16,6 +16,10 @@
-             <description value="admin should be able to bulk update attributes of configurable products"/>
-             <testCaseId value="MC-88"/>
-             <group value="ConfigurableProduct"/>
-+            <severity value="AVERAGE"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-         </annotations>
- 
-         <before>
-@@ -56,7 +60,13 @@
-         <click selector="{{AdminUpdateAttributesSection.toggleDescription}}" stepKey="clickToggleDescription"/>
-         <fillField selector="{{AdminUpdateAttributesSection.description}}" userInput="MFTF automation!" stepKey="fillDescription"/>
-         <click selector="{{AdminUpdateAttributesSection.saveButton}}" stepKey="clickSave"/>
--        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 3 record(s) were updated." stepKey="seeSaveSuccess"/>
-+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeSaveSuccess"/>
-+
-+        <!-- Run cron twice -->
-+        <magentoCLI command="cron:run" stepKey="runCron1"/>
-+        <magentoCLI command="cron:run" stepKey="runCron2"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitFormToReload1"/>
- 
-         <!-- Check storefront for description -->
-         <amOnPage url="$$createProduct1.sku$$.html" stepKey="gotoProduct1"/>
-@@ -78,6 +88,7 @@
-             <description value="Admin should be able to remove a product configuration"/>
-             <testCaseId value="MC-63"/>
-             <group value="ConfigurableProduct"/>
-+            <severity value="AVERAGE"/>
-         </annotations>
- 
-         <before>
-@@ -170,6 +181,7 @@
-             <description value="Admin should be able to disable a product configuration"/>
-             <testCaseId value="MC-119"/>
-             <group value="ConfigurableProduct"/>
-+            <severity value="AVERAGE"/>
-         </annotations>
- 
-         <before>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
-new file mode 100644
-index 00000000000..11f1e9bb33c
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
-@@ -0,0 +1,43 @@
-+<?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="AdminConfigurableSetEditRelatedProductsTest" extends="AdminSimpleSetEditRelatedProductsTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create/Edit configurable product"/>
-+            <title value="Admin should be able to set/edit Related Products information when editing a configurable product"/>
-+            <description value="Admin should be able to set/edit Related Products information when editing a configurable product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3414"/>
-+            <group value="ConfigurableProduct"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+        </before>
-+        <after>
-+            <!-- Delete configurable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="_defaultProduct"/>
-+            </actionGroup>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!-- Create product -->
-+        <remove keyForRemoval="goToCreateProduct"/>
-+        <actionGroup ref="createConfigurableProduct" stepKey="fillProductForm">
-+            <argument name="product" value="_defaultProduct"/>
-+            <argument name="category" value="$$createCategory$$"/>
-+        </actionGroup>
-+
-+        <!--See related product in storefront-->
-+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToStorefront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
-new file mode 100755
-index 00000000000..2cc71964042
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
-@@ -0,0 +1,192 @@
-+<?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="AdminCreateConfigurableProductSwitchToSimpleTest" extends="AdminCreateSimpleProductSwitchToVirtualTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Product Type Switching"/>
-+            <title value="Admin should be able to switch a new product from configurable to simple"/>
-+            <description value="After selecting a configurable product when adding Admin should be switch to simple implicitly"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10926"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm">
-+            <argument name="productType" value="configurable"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Simple Product"  stepKey="seeProductTypeInGrid"/>
-+    </test>
-+    <test name="AdminCreateConfigurableProductSwitchToVirtualTest" extends="AdminCreateSimpleProductSwitchToVirtualTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Product Type Switching"/>
-+            <title value="Admin should be able to switch a new product from configurable to virtual"/>
-+            <description value="After selecting a configurable product when adding Admin should be switch to virtual implicitly"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10927"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm">
-+            <argument name="productType" value="configurable"/>
-+        </actionGroup>
-+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Virtual Product"  stepKey="seeProductTypeInGrid"/>
-+    </test>
-+    <test name="AdminCreateVirtualProductSwitchToConfigurableTest" extends="AdminCreateSimpleProductSwitchToVirtualTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Product Type Switching"/>
-+            <title value="Admin should be able to switch a new product from virtual to configurable"/>
-+            <description value="After selecting a virtual product when adding Admin should be switch to configurable implicitly"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10930"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteAttribute" createDataKey="createConfigProductAttribute"/>
-+        </after>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm">
-+            <argument name="productType" value="virtual"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <comment before="createConfiguration" stepKey="beforeCreateConfiguration" userInput="Adding Configuration to Product"/>
-+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="createConfiguration" after="fillProductForm">
-+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
-+        </actionGroup>
-+        <actionGroup ref="saveConfiguredProduct" stepKey="saveProductForm"/>
-+        <see selector="{{AdminProductGridSection.productGridCell('2', 'Type')}}" userInput="Configurable Product"  stepKey="seeProductTypeInGrid"/>
-+        <actionGroup ref="VerifyOptionInProductStorefront" stepKey="verifyConfigurableOption" after="AssertProductInStorefrontProductPage">
-+            <argument name="attributeCode" value="$createConfigProductAttribute.default_frontend_label$"/>
-+            <argument name="optionName" value="$createConfigProductAttributeOption1.option[store_labels][1][label]$"/>
-+        </actionGroup>
-+    </test>
-+    <test name="AdminCreateSimpleProductSwitchToConfigurableTest" extends="AdminCreateSimpleProductSwitchToVirtualTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Product Type Switching"/>
-+            <title value="Admin should be able to switch a new product from simple to configurable"/>
-+            <description value="After selecting a simple product when adding Admin should be switch to configurable implicitly"/>
-+            <severity value="CRITICAL"/>
-+            <useCaseId value="MAGETWO-44165"/>
-+            <testCaseId value="MAGETWO-29398"/>
-+            <group value="catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteAttribute" createDataKey="createConfigProductAttribute"/>
-+        </after>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm">
-+            <argument name="productType" value="simple"/>
-+        </actionGroup>
-+        <!-- Create configurable product from simple product page-->
-+        <comment userInput="Create configurable product" stepKey="commentCreateProduct"/>
-+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <comment before="createConfiguration" stepKey="beforeCreateConfiguration" userInput="Adding Configuration to Product"/>
-+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="createConfiguration" after="fillProductForm">
-+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
-+        </actionGroup>
-+        <actionGroup ref="saveConfiguredProduct" stepKey="saveProductForm"/>
-+        <see selector="{{AdminProductGridSection.productGridCell('2', 'Type')}}" userInput="Configurable Product"  stepKey="seeProductTypeInGrid"/>
-+        <!-- Verify product on store front -->
-+        <comment userInput="Verify product on store front" stepKey="commentVerifyProductGrid"/>
-+        <actionGroup ref="VerifyOptionInProductStorefront" stepKey="verifyConfigurableOption" after="AssertProductInStorefrontProductPage">
-+            <argument name="attributeCode" value="$createConfigProductAttribute.default_frontend_label$"/>
-+            <argument name="optionName" value="$createConfigProductAttributeOption1.option[store_labels][1][label]$"/>
-+        </actionGroup>
-+    </test>
-+    <test name="AdminCreateDownloadableProductSwitchToConfigurableTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Product Type Switching"/>
-+            <title value="Admin should be able to switch a new product from downloadable to configurable"/>
-+            <description value="After selecting a downloadable product when adding Admin should be switch to configurable implicitly"/>
-+            <severity value="CRITICAL"/>
-+            <useCaseId value="MAGETWO-44165"/>
-+            <testCaseId value="MAGETWO-29398"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <actionGroup ref="GoToProductCatalogPage" stepKey="goToProductCatalogPage"/>
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteConfigurableProduct">
-+                <argument name="product" value="_defaultProduct"/>
-+            </actionGroup>
-+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetSearch"/>
-+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
-+            <deleteData stepKey="deleteAttribute" createDataKey="createConfigProductAttribute"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Create configurable product from downloadable product page-->
-+        <comment userInput="Create configurable product" stepKey="commentCreateProduct"/>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+        <!-- Open Dropdown and select downloadable product option -->
-+        <comment stepKey="beforeOpenProductFillForm" userInput="Selecting Product from the Add Product Dropdown"/>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm">
-+            <argument name="productType" value="downloadable"/>
-+        </actionGroup>
-+        <scrollTo selector="{{AdminProductDownloadableSection.sectionHeader}}" stepKey="scrollToDownloadableInfo" />
-+        <uncheckOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkIsDownloadable"/>
-+        <!-- Fill form for Downloadable Product Type -->
-+        <comment stepKey="beforeFillProductForm" userInput="Filling Product Form"/>
-+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="SetProductUrlKey" stepKey="setProductUrl">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <comment before="createConfiguration" stepKey="beforeCreateConfiguration" userInput="Adding Configuration to Product"/>
-+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="createConfiguration">
-+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
-+        </actionGroup>
-+        <actionGroup ref="saveConfiguredProduct" stepKey="saveProductForm"/>
-+        <!-- Check that product was added with implicit type change -->
-+        <comment stepKey="beforeVerify" userInput="Verify Product Type Assigned Correctly"/>
-+        <actionGroup ref="GoToProductCatalogPage" stepKey="goToProductCatalogPage"/>
-+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetSearch"/>
-+        <actionGroup ref="filterProductGridByName" stepKey="searchForProduct">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <see selector="{{AdminProductGridSection.productGridCell('2', 'Type')}}" userInput="Configurable Product"  stepKey="seeProductTypeInGrid"/>
-+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefrontProductPage">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="VerifyOptionInProductStorefront" stepKey="verifyConfigurableOption">
-+            <argument name="attributeCode" value="$createConfigProductAttribute.default_frontend_label$"/>
-+            <argument name="optionName" value="$createConfigProductAttributeOption1.option[store_labels][1][label]$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml
-new file mode 100644
-index 00000000000..f4f607e9119
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml
-@@ -0,0 +1,82 @@
-+<?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="AdminCreateConfigurableProductBasedOnParentSkuTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create configurable product"/>
-+            <title value="Configurable product variation's sku should be based on parent SKU"/>
-+            <description value="Admin should be able to create configurable product with two new options based on parent SKU, without assigned to category and attribute set"/>
-+            <testCaseId value="MC-13689"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete configurable product with children products -->
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteProducts">
-+                <argument name="sku" value="{{ApiConfigurableProduct.sku}}"/>
-+            </actionGroup>
-+
-+            <!-- Delete product attribute -->
-+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteProductAttribute">
-+                <argument name="ProductAttribute" value="colorProductAttribute"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create configurable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Fill configurable product values -->
-+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!--Create product configurations-->
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations" after="fillConfigurableProductValues"/>
-+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
-+
-+        <!--Create new attribute with two option -->
-+        <actionGroup ref="addNewProductConfigurationAttribute" stepKey="createProductConfigurationAttribute">
-+            <argument name="attribute" value="colorProductAttribute"/>
-+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
-+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+
-+        <!-- Change product configurations except sku -->
-+        <actionGroup ref="changeProductConfigurationsInGridExceptSku" stepKey="changeProductConfigurationsInGridExceptSku">
-+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
-+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveConfigurableProductAddToCurrentAttributeSet" stepKey="saveProduct"/>
-+
-+        <!-- Assert child products generated sku in grid -->
-+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="openProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPageLoad"/>
-+        <actionGroup ref="filterProductGridByName2" stepKey="filterFirstProductByNameInGrid">
-+            <argument name="name" value="{{colorConfigurableProductAttribute1.name}}"/>
-+        </actionGroup>
-+        <see selector="{{AdminProductGridSection.productGridCell('1', 'SKU')}}" userInput="{{ApiConfigurableProduct.sku}}-{{colorConfigurableProductAttribute1.name}}"  stepKey="seeFirstProductSkuInGrid"/>
-+        <actionGroup ref="filterProductGridByName2" stepKey="filterSecondProductByNameInGrid">
-+            <argument name="name" value="{{colorConfigurableProductAttribute2.name}}"/>
-+        </actionGroup>
-+        <see selector="{{AdminProductGridSection.productGridCell('1', 'SKU')}}" userInput="{{ApiConfigurableProduct.sku}}-{{colorConfigurableProductAttribute2.name}}"  stepKey="seeSecondProductSkuInGrid"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml
-new file mode 100644
-index 00000000000..a7242b43c2b
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml
-@@ -0,0 +1,124 @@
-+<?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="AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create configurable product"/>
-+            <title value="Create configurable product with creating new category and new attribute (required fields only)"/>
-+            <description value="Admin should be able to create configurable product with creating new category and new attribute (required fields only)"/>
-+            <testCaseId value="MC-13687"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete configurable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="ApiConfigurableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Delete children products -->
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteFirstChildProduct">
-+                <argument name="sku" value="{{colorConfigurableProductAttribute1.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteSecondChildProduct">
-+                <argument name="sku" value="{{colorConfigurableProductAttribute2.sku}}"/>
-+            </actionGroup>
-+
-+            <!-- Delete product attribute -->
-+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteProductAttribute">
-+                <argument name="ProductAttribute" value="colorProductAttribute"/>
-+            </actionGroup>
-+
-+            <!-- Delete attribute set -->
-+            <actionGroup ref="deleteAttributeSetByLabel" stepKey="deleteAttributeSet">
-+                <argument name="label" value="{{ProductAttributeFrontendLabel.label}}"/>
-+            </actionGroup>
-+
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create configurable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Fill configurable product required fields only-->
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{ApiConfigurableProduct.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{ApiConfigurableProduct.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{ApiConfigurableProduct.price}}" stepKey="fillProductPrice"/>
-+
-+        <!-- Add configurable product in category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!--Create product configurations-->
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
-+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
-+
-+        <!--Create new attribute with two option -->
-+        <actionGroup ref="addNewProductConfigurationAttribute" stepKey="createProductConfigurationAttribute">
-+            <argument name="attribute" value="colorProductAttribute"/>
-+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
-+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+
-+        <!-- Change product configurations in grid -->
-+        <actionGroup ref="changeProductConfigurationsInGrid" stepKey="changeProductConfigurationsInGrid">
-+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
-+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+
-+        <!-- Save configurable product; add product to new attribute set -->
-+        <actionGroup ref="saveConfigurableProductWithNewAttributeSet" stepKey="saveConfigurableProduct"/>
-+
-+        <!-- Find configurable product in grid -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Assert configurable product on admin product page -->
-+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <actionGroup ref="assertConfigurableProductOnAdminProductPage" stepKey="assertConfigurableProductOnAdminProductPage">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Flash cache -->
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!--Assert configurable product in category -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="assertConfigurableProductInCategory">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="optionProduct" value="colorConfigurableProductAttribute1"/>
-+        </actionGroup>
-+
-+        <!--Assert configurable product on product page -->
-+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <actionGroup ref="storefrontCheckConfigurableProductOptions" stepKey="checkConfigurableProductOptions">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
-+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml
-new file mode 100644
-index 00000000000..49f3f8b5ea9
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml
-@@ -0,0 +1,123 @@
-+<?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="AdminCreateConfigurableProductWithDisabledChildrenProductsTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create configurable product"/>
-+            <title value="Create configurable product with disabled children products"/>
-+            <description value="Admin should be able to create configurable product with disabled children products, assigned to category"/>
-+            <testCaseId value="MC-13711"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create attribute with one options -->
-+            <createData entity="productAttributeWithTwoOptionsNotVisible" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create the child that will be a part of the configurable product -->
-+            <createData entity="SimpleProductOffline" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption"/>
-+            </createData>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Don't display out of stock product -->
-+            <actionGroup ref="noDisplayOutOfStockProduct" stepKey="revertDisplayOutOfStockProduct"/>
-+
-+            <!-- Delete configurable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="ApiConfigurableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Delete created data -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create configurable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Fill configurable product values -->
-+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Create product configurations and add attribute and select all options -->
-+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="generateConfigurationsByAttributeCode" after="fillConfigurableProductValues">
-+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
-+        </actionGroup>
-+
-+        <!-- Add configurable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory" after="fillConfigurableProductValues"/>
-+
-+        <!-- Add child product to configurations grid -->
-+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addSimpleProduct">
-+            <argument name="sku" value="$$createSimpleProduct.sku$$"/>
-+            <argument name="name" value="$$createConfigProductAttributeOption.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+
-+        <!-- Save configurable product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveConfigurableProduct"/>
-+
-+        <!-- Find configurable product in grid -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Assert configurable product on admin product page -->
-+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <actionGroup ref="assertConfigurableProductOnAdminProductPage" stepKey="assertConfigurableProductOnAdminProductPage">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+         <!--Assert configurable attributes block is present on product page -->
-+        <scrollTo selector="{{AdminProductFormConfigurationsSection.sectionHeader}}" stepKey="scrollToSearchEngineTab" />
-+        <seeElement selector="{{AdminProductFormConfigurationsSection.createdConfigurationsBlock}}" stepKey="seeCreatedConfigurations"/>
-+        <see userInput="$$createSimpleProduct.name$$" selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" stepKey="seeProductNameInConfigurations"/>
-+
-+        <!-- Display out of stock product -->
-+        <actionGroup ref="displayOutOfStockProduct" stepKey="displayOutOfStockProduct"/>
-+
-+        <!-- Flash cache -->
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!-- Assert configurable product is not present in category -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
-+
-+        <!-- Assert configurable product is out of stock-->
-+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see stepKey="checkForOutOfStock" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="OUT OF STOCK"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
-new file mode 100644
-index 00000000000..925e7a890ce
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
-@@ -0,0 +1,159 @@
-+<?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="AdminCreateConfigurableProductWithImagesTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create configurable product"/>
-+            <title value="Create configurable product with images"/>
-+            <description value="Admin should be able to create configurable product with images"/>
-+            <testCaseId value="MC-13713"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create first attribute with 2 options -->
-+            <createData entity="productAttributeWithTwoOptionsNotVisible" stepKey="createFirstConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOptionOne">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOptionTwo">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Create second attribute with 2 options -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createSecondConfigProductAttribute"/>
-+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOptionThree">
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption4" stepKey="createConfigProductAttributeOptionFour">
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+            </createData>
-+
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+            </createData>
-+
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete configurable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="ApiConfigurableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Delete created data -->
-+            <deleteData createDataKey="createFirstConfigProductAttribute" stepKey="deleteFirstConfigProductAttribute"/>
-+            <deleteData createDataKey="createSecondConfigProductAttribute" stepKey="deleteSecondConfigProductAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create configurable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Fill configurable product values -->
-+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add configurable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory" after="fillConfigurableProductValues"/>
-+
-+        <!-- Add image to product -->
-+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
-+            <argument name="image" value="MagentoLogo"/>
-+        </actionGroup>
-+
-+        <!-- Create product configurations -->
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations" after="addImageForProduct"/>
-+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
-+
-+         <!-- Show 100 attributes per page -->
-+        <actionGroup ref="adminDataGridSelectPerPage" stepKey="selectNumberOfAttributesPerPage">
-+            <argument name="perPage" value="100"/>
-+        </actionGroup>
-+
-+        <!--Add attributes and select all options -->
-+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeRowByAttributeCode($$createFirstConfigProductAttribute.attribute_code$$)}}" stepKey="clickOnFirstAttributeCheckbox"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeRowByAttributeCode($$createSecondConfigProductAttribute.attribute_code$$)}}" stepKey="clickOnSecondAttributeCheckbox"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute($$createFirstConfigProductAttribute.default_frontend_label$$)}}" stepKey="clickOnSelectAllInFirstAttribute"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute($$createSecondConfigProductAttribute.default_frontend_label$$)}}" stepKey="clickOnSelectAllInSecondAttribute"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
-+
-+        <!-- Add images to first product attribute options -->
-+        <actionGroup ref="addUniqueImageToConfigurableProductOption" stepKey="addImageToConfigurableProductOptionOne">
-+            <argument name="image" value="MagentoLogo"/>
-+            <argument name="frontend_label" value="$$createFirstConfigProductAttribute.default_frontend_label$$"/>
-+            <argument name="label" value="$$createConfigProductAttributeOptionOne.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+        <actionGroup ref="addUniqueImageToConfigurableProductOption" stepKey="addImageToConfigurableProductOptionTwo">
-+            <argument name="image" value="TestImageNew"/>
-+            <argument name="frontend_label" value="$$createFirstConfigProductAttribute.default_frontend_label$$"/>
-+            <argument name="label" value="$$createConfigProductAttributeOptionTwo.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+
-+        <!-- Add price to second product attribute options -->
-+        <actionGroup ref="addUniquePriceToConfigurableProductOption" stepKey="addPriceToConfigurableProductOptionThree">
-+            <argument name="frontend_label" value="$$createSecondConfigProductAttribute.default_frontend_label$$"/>
-+            <argument name="label" value="$$createConfigProductAttributeOptionThree.option[store_labels][1][label]$$"/>
-+            <argument name="price" value="{{virtualProductWithRequiredFields.price}}"/>
-+        </actionGroup>
-+        <actionGroup ref="addUniquePriceToConfigurableProductOption" stepKey="addPriceToConfigurableProductOptionFour">
-+            <argument name="frontend_label" value="$$createSecondConfigProductAttribute.default_frontend_label$$"/>
-+            <argument name="label" value="$$createConfigProductAttributeOptionFour.option[store_labels][1][label]$$"/>
-+            <argument name="price" value="{{virtualProductWithRequiredFields.price}}"/>
-+        </actionGroup>
-+
-+        <!-- Add quantity to product attribute options -->
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
-+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="100" stepKey="enterAttributeQuantity"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveConfigurableProductAddToCurrentAttributeSet" stepKey="saveProduct"/>
-+
-+        <!-- Assert configurable product in category -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="assertConfigurableProductInCategory">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="optionProduct" value="virtualProductWithRequiredFields"/>
-+        </actionGroup>
-+
-+        <!-- Assert product image in storefront product page -->
-+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
-+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="image" value="MagentoLogo"/>
-+        </actionGroup>
-+
-+        <!-- Assert product options images in storefront product page -->
-+        <actionGroup ref="assertOptionImageInStorefrontProductPage" stepKey="assertFirstOptionImageInStorefrontProductPage">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="label" value="$$createConfigProductAttributeOptionOne.option[store_labels][1][label]$$"/>
-+            <argument name="image" value="MagentoLogo"/>
-+        </actionGroup>
-+        <actionGroup ref="assertOptionImageInStorefrontProductPage" stepKey="assertSecondOptionImageInStorefrontProductPage">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="label" value="$$createConfigProductAttributeOptionTwo.option[store_labels][1][label]$$"/>
-+            <argument name="image" value="TestImageNew"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml
-new file mode 100644
-index 00000000000..0b83fdc1788
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml
-@@ -0,0 +1,140 @@
-+<?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="AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create configurable product"/>
-+            <title value="Create Configurable Product with three product, display out of stock products"/>
-+            <description value="Admin should be able to create Configurable Product with one out of stock and several in stock options, display out of stock products"/>
-+            <testCaseId value="MC-13714"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create attribute with 3 options to be used in children products -->
-+            <createData entity="productAttributeWithTwoOptionsNotVisible" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOptionOne">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOptionTwo">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOptionThree">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOptionOne">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOptionTwo">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOptionThree">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create the 3 children that will be a part of the configurable product -->
-+            <createData entity="ApiSimpleOne" stepKey="createFirstSimpleProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOptionOne"/>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createSecondSimpleProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOptionTwo"/>
-+            </createData>
-+            <createData entity="ApiSimpleOutOfStock" stepKey="createSimpleOutOfStockProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOptionThree"/>
-+            </createData>
-+
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Don't display out of stock product -->
-+            <actionGroup ref="noDisplayOutOfStockProduct" stepKey="revertDisplayOutOfStockProduct"/>
-+
-+            <!-- Delete configurable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="ApiConfigurableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Delete created data -->
-+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
-+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
-+            <deleteData createDataKey="createSimpleOutOfStockProduct" stepKey="deleteSimpleOutOfStockProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create configurable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!--Fill configurable product values -->
-+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Create product configurations and add attribute and select all options -->
-+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="generateConfigurationsByAttributeCode" after="fillConfigurableProductValues">
-+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
-+        </actionGroup>
-+
-+        <!-- Add configurable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory" after="fillConfigurableProductValues"/>
-+
-+        <!-- Add child products to configurations grid -->
-+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addFirstSimpleProduct">
-+            <argument name="sku" value="$$createFirstSimpleProduct.sku$$"/>
-+            <argument name="name" value="$$createConfigProductAttributeOptionOne.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addSecondSimpleProduct">
-+            <argument name="sku" value="$$createSecondSimpleProduct.sku$$"/>
-+            <argument name="name" value="$$createConfigProductAttributeOptionTwo.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addOutOfStockProduct">
-+            <argument name="sku" value="$$createSimpleOutOfStockProduct.sku$$"/>
-+            <argument name="name" value="$$createConfigProductAttributeOptionThree.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+
-+        <!-- Save configurable product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveConfigurableProduct"/>
-+
-+        <!-- Display out of stock product -->
-+        <actionGroup ref="displayOutOfStockProduct" stepKey="displayOutOfStockProduct"/>
-+
-+        <!-- Flash cache -->
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!--Assert configurable product in category -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="assertConfigurableProductInCategory">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="optionProduct" value="$$createFirstSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert out of stock option is absent on product page -->
-+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <dontSee userInput="$$createConfigProductAttributeOptionThree.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.optionByAttributeId($$createConfigProductAttribute.attribute_id$$)}}" stepKey="assertOptionNotAvailable" />
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml
-new file mode 100644
-index 00000000000..e24ac07c30d
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml
-@@ -0,0 +1,134 @@
-+<?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="AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create configurable product"/>
-+            <title value="Create Configurable Product with three product, don't display out of stock products"/>
-+            <description value="Admin should be able to create Configurable Product with one out of stock and several in stock options, don't display out of stock products"/>
-+            <testCaseId value="MC-13715"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create attribute with 3 options to be used in children products -->
-+            <createData entity="productAttributeWithTwoOptionsNotVisible" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOptionOne">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOptionTwo">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOptionThree">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOptionOne">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOptionTwo">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOptionThree">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create the 3 children that will be a part of the configurable product -->
-+            <createData entity="ApiSimpleOne" stepKey="createFirstSimpleProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOptionOne"/>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createSecondSimpleProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOptionTwo"/>
-+            </createData>
-+            <createData entity="ApiSimpleOutOfStock" stepKey="createSimpleOutOfStockProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOptionThree"/>
-+            </createData>
-+
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete configurable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="ApiConfigurableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Delete created data -->
-+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
-+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
-+            <deleteData createDataKey="createSimpleOutOfStockProduct" stepKey="deleteSimpleOutOfStockProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create configurable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!--Fill configurable product values -->
-+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Create product configurations and add attribute and select all options -->
-+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="generateConfigurationsByAttributeCode" after="fillConfigurableProductValues">
-+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
-+        </actionGroup>
-+
-+        <!-- Add configurable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory" after="fillConfigurableProductValues"/>
-+
-+        <!-- Add child products to configurations grid -->
-+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addFirstSimpleProduct">
-+            <argument name="sku" value="$$createFirstSimpleProduct.sku$$"/>
-+            <argument name="name" value="$$createConfigProductAttributeOptionOne.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+
-+       <actionGroup ref="addProductToConfigurationsGrid" stepKey="addSecondSimpleProduct">
-+            <argument name="sku" value="$$createSecondSimpleProduct.sku$$"/>
-+            <argument name="name" value="$$createConfigProductAttributeOptionTwo.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addOutOfStockProduct">
-+            <argument name="sku" value="$$createSimpleOutOfStockProduct.sku$$"/>
-+            <argument name="name" value="$createConfigProductAttributeOptionThree.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+
-+        <!-- Save configurable product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveConfigurableProduct"/>
-+
-+        <!-- Flash cache -->
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!--Assert configurable product in category -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="assertConfigurableProductInCategory">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="optionProduct" value="$$createFirstSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert out of stock option is absent on product page -->
-+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <dontSee userInput="$$createConfigProductAttributeOptionThree.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.optionByAttributeId($$createConfigProductAttribute.attribute_id$$)}}" stepKey="assertOptionNotAvailable"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml
-new file mode 100644
-index 00000000000..51f4bf02799
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml
-@@ -0,0 +1,111 @@
-+<?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="AdminCreateConfigurableProductWithTierPriceForOneItemTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create configurable product"/>
-+            <title value="Create configurable product with tier price for one item"/>
-+            <description value="Admin should be able to create configurable product with tier price for one item"/>
-+            <testCaseId value="MC-13695"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create attribute with 2 options to be used in children products -->
-+            <createData entity="productAttributeWithTwoOptionsNotVisible" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOptionOne">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOptionTwo">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOptionOne">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOptionTwo">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create the 2 children that will be a part of the configurable product -->
-+            <createData entity="ApiSimpleOne" stepKey="createFirstSimpleProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOptionOne"/>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createSecondSimpleProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOptionTwo"/>
-+            </createData>
-+
-+            <!--Add tier price in one product -->
-+            <createData entity="tierProductPrice" stepKey="addTierPrice">
-+            <requiredEntity createDataKey="createFirstSimpleProduct" />
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete configurable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="ApiConfigurableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Delete created data -->
-+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
-+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create configurable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitProductGridPageLoad"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!--Fill configurable product values -->
-+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Create product configurations and add attribute and select all options -->
-+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="generateConfigurationsByAttributeCode" after="fillConfigurableProductValues">
-+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
-+        </actionGroup>
-+
-+         <!-- Add associated products to configurations grid -->
-+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addFirstSimpleProduct">
-+            <argument name="sku" value="$$createFirstSimpleProduct.sku$$"/>
-+            <argument name="name" value="$$createConfigProductAttributeOptionOne.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addSecondSimpleProduct">
-+            <argument name="sku" value="$$createSecondSimpleProduct.sku$$"/>
-+            <argument name="name" value="$$createConfigProductAttributeOptionTwo.option[store_labels][1][label]$$"/>
-+        </actionGroup>
-+
-+        <!-- Save configurable product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveConfigurableProduct"/>
-+
-+        <!-- Assert product tier price on product page -->
-+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <selectOption userInput="$$createConfigProductAttributeOptionOne.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
-+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
-+            <expectedResult type="string">Buy {{tierProductPrice.quantity}} for ${{tierProductPrice.price}} each and save 27%</expectedResult>
-+            <actualResult type="variable">tierPriceText</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
-new file mode 100644
-index 00000000000..1db9b3e5b79
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
-@@ -0,0 +1,154 @@
-+<?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="AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create configurable product"/>
-+            <title value="Create configurable product with two new options assigned to category with not visible child products"/>
-+            <description value="Admin should be able to create configurable product with two new options, assigned to category, child products are not visible individually"/>
-+            <testCaseId value="MC-13685"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete configurable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="ApiConfigurableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Delete children products -->
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteFirstChildProduct">
-+                <argument name="sku" value="{{colorConfigurableProductAttribute1.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteSecondChildProduct">
-+                <argument name="sku" value="{{colorConfigurableProductAttribute2.sku}}"/>
-+            </actionGroup>
-+
-+            <!-- Delete product attribute -->
-+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteProductAttribute">
-+                <argument name="ProductAttribute" value="colorProductAttribute"/>
-+            </actionGroup>
-+
-+            <!-- Delete attribute set -->
-+            <actionGroup ref="deleteAttributeSetByLabel" stepKey="deleteAttributeSet">
-+                <argument name="label" value="{{ProductAttributeFrontendLabel.label}}"/>
-+            </actionGroup>
-+
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create configurable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Fill configurable product values -->
-+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Create product configurations -->
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations" after="fillConfigurableProductValues"/>
-+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
-+
-+        <!--Create new attribute with two options -->
-+        <actionGroup ref="addNewProductConfigurationAttribute" stepKey="createProductConfigurationAttribute">
-+            <argument name="attribute" value="colorProductAttribute"/>
-+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
-+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+
-+        <!-- Change product configurations in grid -->
-+        <actionGroup ref="changeProductConfigurationsInGrid" stepKey="changeProductConfigurationsInGrid">
-+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
-+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+
-+        <!-- Add configurable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory" after="fillConfigurableProductValues"/>
-+
-+        <!-- Save configurable product; add product to new attribute set -->
-+        <actionGroup ref="saveConfigurableProductWithNewAttributeSet" stepKey="saveConfigurableProduct"/>
-+
-+        <!-- Assert child products in grid -->
-+        <actionGroup ref="viewProductInAdminGrid" stepKey="viewFirstChildProductInAdminGrid">
-+            <argument name="product" value="colorConfigurableProductAttribute1"/>
-+        </actionGroup>
-+        <actionGroup ref="viewProductInAdminGrid" stepKey="viewSecondChildProductInAdminGrid">
-+            <argument name="product" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+
-+        <!-- Assert configurable product in grid -->
-+        <actionGroup ref="filterProductGridBySkuAndName" stepKey="findCreatedConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="{{ApiConfigurableProduct.type_id}}" stepKey="seeProductTypeInGrid"/>
-+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
-+
-+        <!-- Flash cache -->
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!--Assert configurable product in category -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="assertConfigurableProductInCategory">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="optionProduct" value="colorConfigurableProductAttribute1"/>
-+        </actionGroup>
-+
-+        <!--Assert configurable product on product page -->
-+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage" after="assertConfigurableProductInCategory"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <actionGroup ref="storefrontCheckConfigurableProductOptions" stepKey="checkConfigurableProductOptions">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
-+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+
-+        <!-- Add configurable product to the cart with selected first option -->
-+        <selectOption userInput="{{colorConfigurableProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOptionForAddingToCart"/>
-+        <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage"/>
-+
-+        <!-- Assert configurable product in cart -->
-+        <amOnPage url="/checkout/cart/" stepKey="amOnShoppingCartPage"/>
-+        <waitForPageLoad stepKey="waitForShoppingCartPageLoad"/>
-+        <actionGroup ref="StorefrontCheckCartConfigurableProductActionGroup" stepKey="storefrontCheckCartConfigurableProductActionGroup">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="optionProduct" value="colorConfigurableProductAttribute1"/>
-+            <argument name="productQuantity" value="CONST.one"/>
-+        </actionGroup>
-+
-+        <!-- Assert child products are not displayed separately: two next step -->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStoreFront"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontPageLoad"/>
-+
-+        <!-- Quick search the storefront for the first attribute option -->
-+        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{colorConfigurableProductAttribute1.sku}}]" stepKey="searchStorefrontFirstChildProduct"/>
-+        <dontSee selector="{{StorefrontCategoryProductSection.ProductTitleByName(colorConfigurableProductAttribute1.name)}}" stepKey="dontSeeConfigurableProductFirstChild"/>
-+
-+        <!-- Quick search the storefront for the second attribute option -->
-+        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{colorConfigurableProductAttribute2.sku}}]" stepKey="searchStorefrontSecondChildProduct"/>
-+        <dontSee selector="{{StorefrontCategoryProductSection.ProductTitleByName(colorConfigurableProductAttribute2.name)}}" stepKey="dontSeeConfigurableProductSecondChild"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
-new file mode 100644
-index 00000000000..934a410d58a
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
-@@ -0,0 +1,136 @@
-+<?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="AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Create configurable product"/>
-+            <title value="Create configurable product with two new options without assigned to category with not visible child products"/>
-+            <description value="Admin should be able to create configurable product with two options without assigned to category, child products are not visible individually"/>
-+            <testCaseId value="MC-13686"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete configurable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="ApiConfigurableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Delete children products -->
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteFirstChildProduct">
-+                <argument name="sku" value="{{colorConfigurableProductAttribute1.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteSecondChildProduct">
-+                <argument name="sku" value="{{colorConfigurableProductAttribute2.sku}}"/>
-+            </actionGroup>
-+
-+            <!-- Delete product attribute -->
-+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteProductAttribute">
-+                <argument name="ProductAttribute" value="colorProductAttribute"/>
-+            </actionGroup>
-+
-+            <!-- Delete attribute set -->
-+            <actionGroup ref="deleteAttributeSetByLabel" stepKey="deleteAttributeSet">
-+                <argument name="label" value="{{ProductAttributeFrontendLabel.label}}"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create configurable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Fill configurable product values -->
-+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!--Create product configurations-->
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations" after="fillConfigurableProductValues"/>
-+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
-+
-+        <!--Create new attribute with two option -->
-+        <actionGroup ref="addNewProductConfigurationAttribute" stepKey="createProductConfigurationAttribute">
-+            <argument name="attribute" value="colorProductAttribute"/>
-+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
-+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+
-+        <!-- Change product configurations in grid -->
-+        <actionGroup ref="changeProductConfigurationsInGrid" stepKey="changeProductConfigurationsInGrid">
-+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
-+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+
-+        <!-- Save configurable product; add product to new attribute set -->
-+        <actionGroup ref="saveConfigurableProductWithNewAttributeSet" stepKey="saveConfigurableProduct"/>
-+
-+        <!-- Assert Child Products in grid -->
-+        <actionGroup ref="viewProductInAdminGrid" stepKey="viewFirstChildProductInAdminGrid">
-+            <argument name="product" value="colorConfigurableProductAttribute1"/>
-+        </actionGroup>
-+        <actionGroup ref="viewProductInAdminGrid" stepKey="viewSecondChildProductInAdminGrid">
-+            <argument name="product" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+
-+        <!-- Assert Configurable Product in grid -->
-+        <actionGroup ref="filterProductGridBySkuAndName" stepKey="findCreatedConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="{{ApiConfigurableProduct.type_id}}"  stepKey="seeProductTypeInGrid"/>
-+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
-+
-+        <!-- Flash cache -->
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!-- Assert configurable product on product page -->
-+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <actionGroup ref="storefrontCheckConfigurableProductOptions" stepKey="checkConfigurableProductOptions">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
-+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
-+        </actionGroup>
-+
-+        <!-- Add configurable product to the cart with selected first option -->
-+        <selectOption userInput="{{colorConfigurableProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOptionForAddingToCart"/>
-+        <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage"/>
-+
-+        <!-- Assert configurable product in cart -->
-+        <amOnPage url="/checkout/cart/" stepKey="amOnShoppingCartPage"/>
-+        <waitForPageLoad stepKey="waitForShoppingCartPageLoad"/>
-+        <actionGroup ref="StorefrontCheckCartConfigurableProductActionGroup" stepKey="storefrontCheckCartConfigurableProductActionGroup">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="optionProduct" value="colorConfigurableProductAttribute1"/>
-+            <argument name="productQuantity" value="CONST.one"/>
-+        </actionGroup>
-+
-+        <!-- Assert child products are not displayed separately: two next step -->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStoreFront"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontPageLoad"/>
-+
-+        <!-- Quick search the storefront for the first attribute option -->
-+        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{colorConfigurableProductAttribute1.sku}}]" stepKey="searchStorefrontFirstChildProduct"/>
-+        <dontSee selector="{{StorefrontCategoryProductSection.ProductTitleByName(colorConfigurableProductAttribute1.name)}}" stepKey="dontSeeConfigurableProductFirstChild"/>
-+
-+        <!-- Quick search the storefront for the second attribute option -->
-+        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{colorConfigurableProductAttribute2.sku}}]" stepKey="searchStorefrontSecondChildProduct"/>
-+        <dontSee selector="{{StorefrontCategoryProductSection.ProductTitleByName(colorConfigurableProductAttribute2.name)}}" stepKey="dontSeeConfigurableProductSecondChild"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminDeleteConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminDeleteConfigurableProductTest.xml
-new file mode 100644
-index 00000000000..fb2920be528
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminDeleteConfigurableProductTest.xml
-@@ -0,0 +1,52 @@
-+<?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="AdminDeleteConfigurableProductTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Delete products"/>
-+            <title value="Delete configurable product test"/>
-+            <description value="Admin should be able to delete a configurable product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11020"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="BaseConfigurableProduct" stepKey="createConfigurableProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteConfigurableProductFilteredBySkuAndName">
-+            <argument name="product" value="$$createConfigurableProduct$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
-+        <!-- Verify product on Product Page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createConfigurableProduct.name$$)}}" stepKey="amOnConfigurableProductPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
-+        <!-- Search for the product by sku -->
-+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createConfigurableProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-+        <waitForPageLoad stepKey="waitForSearchButton"/>
-+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForSearchResults"/>
-+        <!-- Should not see any search results -->
-+        <dontSee userInput="$$createConfigurableProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
-+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
-+        <!-- Go to the category page that we created in the before block -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-+        <!-- Should not see the product -->
-+        <dontSee userInput="$$createConfigurableProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
-+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
-index 4461c06ed6b..aa34693ed82 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminRelatedProductsTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
-index 65e1300a4e6..e7492f4eeae 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminRemoveDefaultImageConfigurableTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml
-new file mode 100644
-index 00000000000..c303e4d19db
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml
-@@ -0,0 +1,307 @@
-+<?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="AdvanceCatalogSearchConfigurableByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search configurable product with product name"/>
-+            <description value="Guest customer should be able to advance search configurable product with product name"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-138"/>
-+            <group value="ConfigurableProduct"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/>
-+
-+            <createData entity="SimpleProduct" stepKey="simple1Handle" before="simple2Handle">
-+                <requiredEntity createDataKey="categoryHandle"/>
-+            </createData>
-+
-+            <createData entity="SimpleProduct" stepKey="simple2Handle" before="product">
-+                <requiredEntity createDataKey="categoryHandle"/>
-+            </createData>
-+
-+            <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed -->
-+            <createData entity="ApiConfigurableProductWithDescription" stepKey="product"/>
-+
-+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
-+
-+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+
-+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </getData>
-+
-+            <createData entity="SimpleOne" stepKey="childProductHandle1">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
-+            </createData>
-+            <createData entity="SimpleOne" stepKey="childProductHandle2">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
-+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="childProductHandle1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="childProductHandle2"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+    <test name="AdvanceCatalogSearchConfigurableBySkuTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search configurable product with product sku"/>
-+            <description value="Guest customer should be able to advance search configurable product with product sku"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-144"/>
-+            <group value="ConfigurableProduct"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/>
-+
-+            <createData entity="SimpleProduct" stepKey="simple1Handle" before="simple2Handle">
-+                <requiredEntity createDataKey="categoryHandle"/>
-+            </createData>
-+
-+            <createData entity="SimpleProduct" stepKey="simple2Handle" before="product">
-+                <requiredEntity createDataKey="categoryHandle"/>
-+            </createData>
-+
-+            <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed -->
-+            <createData entity="ApiConfigurableProductWithDescription" stepKey="product"/>
-+
-+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
-+
-+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+
-+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </getData>
-+
-+            <createData entity="SimpleOne" stepKey="childProductHandle1">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
-+            </createData>
-+            <createData entity="SimpleOne" stepKey="childProductHandle2">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
-+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="childProductHandle1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="childProductHandle2"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+    <test name="AdvanceCatalogSearchConfigurableByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search configurable product with product description"/>
-+            <description value="Guest customer should be able to advance search configurable product with product description"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-237"/>
-+            <group value="ConfigurableProduct"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/>
-+
-+            <createData entity="SimpleProduct" stepKey="simple1Handle" before="simple2Handle">
-+                <requiredEntity createDataKey="categoryHandle"/>
-+            </createData>
-+
-+            <createData entity="SimpleProduct" stepKey="simple2Handle" before="product">
-+                <requiredEntity createDataKey="categoryHandle"/>
-+            </createData>
-+
-+            <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed -->
-+            <createData entity="ApiConfigurableProductWithDescription" stepKey="product"/>
-+
-+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
-+
-+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+
-+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </getData>
-+
-+            <createData entity="SimpleOne" stepKey="childProductHandle1">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
-+            </createData>
-+            <createData entity="SimpleOne" stepKey="childProductHandle2">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
-+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="childProductHandle1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="childProductHandle2"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+    <test name="AdvanceCatalogSearchConfigurableByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search configurable product with product short description"/>
-+            <description value="Guest customer should be able to advance search configurable product with product short description"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-240"/>
-+            <group value="ConfigurableProduct"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/>
-+
-+            <createData entity="SimpleProduct" stepKey="simple1Handle" before="simple2Handle">
-+                <requiredEntity createDataKey="categoryHandle"/>
-+            </createData>
-+
-+            <createData entity="SimpleProduct" stepKey="simple2Handle" before="product">
-+                <requiredEntity createDataKey="categoryHandle"/>
-+            </createData>
-+
-+            <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed -->
-+            <createData entity="ApiConfigurableProductWithDescription" stepKey="product"/>
-+
-+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
-+
-+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+
-+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </createData>
-+
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+            </getData>
-+
-+            <createData entity="SimpleOne" stepKey="childProductHandle1">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
-+            </createData>
-+            <createData entity="SimpleOne" stepKey="childProductHandle2">
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="productAttributeHandle"/>
-+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
-+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="childProductHandle1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="childProductHandle2"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductAttributeNameDesignTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductAttributeNameDesignTest.xml
-index bb7792b9d37..7fbff5eac25 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductAttributeNameDesignTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductAttributeNameDesignTest.xml
-@@ -7,10 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="ConfigurableProductAttributeNameDesignTest">
-         <annotations>
-             <title value="Generation of configurable products with an attribute named 'design'"/>
-+            <description value="Generation of configurable products with an attribute named 'design'"/>
-             <features value="Product Customizable Option"/>
-             <severity value="AVERAGE"/>
-             <testCaseId value="MAGETWO-93307"/>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
-index 676c23f1cfb..a71f51526c8 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
-@@ -7,17 +7,16 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="ConfigurableProductPriceAdditionalStoreViewTest">
-         <annotations>
-             <features value="ConfigurableProductPriceStoreFront"/>
-+            <stories value="View products"/>
-             <title value="Configurable product prices should not disappear on storefront for additional store"/>
-             <description value="Configurable product price should not disappear for additional stores on frontEnd if disabled for default store"/>
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-92247"/>
--            <skip>
--                <issueId value="MAGETWO-92247"/>
--            </skip>
-+            <group value="ConfigurableProduct"/>
-         </annotations>
-         <before>
-             
-@@ -132,12 +131,13 @@
-         <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcher"/>
-         <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView"/>
-         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage"/>
--        <!--<waitForPageLoad stepKey="waitForStoreViewSwitched"/>-->
-         <waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
-         <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
- 
-         <!-- enable the config product for the second store -->
--       <waitForElementVisible selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="waitForProductEnableSlider"/>
-+       <waitForElementVisible selector="{{AdminProductFormSection.productStatusUseDefault}}" stepKey="waitForDefaultValueCheckBox"/>
-+        <click selector="{{AdminProductFormSection.productStatusUseDefault}}" stepKey="unCheckUseDefaultValueCheckBox"/>
-+        <waitForElementVisible selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="waitForProductEnableSlider"/>
-         <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="enableProductForSecondStoreView"/>
-         <seeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="seeThatProductIsEnabled"/>
-         <actionGroup ref="AdminFormSaveAndClose" stepKey="enabledConfigProductSecondStore"/>
-@@ -150,7 +150,6 @@
-         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage1"/>
-         <waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
-         <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName1"/>
--
-         <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('1')}}" stepKey="clickToExpandActionsForFirstVariation2"/>
-         <click selector="{{AdminProductFormConfigurationsSection.enableProductBtn}}" stepKey="clickEnableChildProduct1"/>
-         <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('2')}}" stepKey="clickToExpandActionsForSecondVariation2"/>
-@@ -180,7 +179,6 @@
-         <waitForPageLoad time="30" stepKey="waitForStoreViewSwitchedP1"/>
-         <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewNameP1"/>
-         <waitForElementVisible selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="waitForProductEnableSliderP1"/>
--        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="enableProductForSecondStoreViewP1"/>
-         <seeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="seeThatProduct1IsEnabled"/>
-         <actionGroup ref="AdminFormSaveAndClose" stepKey="save2UpdatedChild1"/>
- 
-@@ -200,7 +198,6 @@
-         <waitForPageLoad time="30" stepKey="waitForStoreViewSwitchedP2"/>
-         <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewNameP2"/>
-         <waitForElementVisible selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="waitForProductEnableSliderP2"/>
--        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="enableProductForSecondStoreViewP2"/>
-         <seeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="seeThatProduct2IsEnabled"/>
-         <actionGroup ref="AdminFormSaveAndClose" stepKey="save2UpdatedChild2"/>
- 
-@@ -210,6 +207,6 @@
-         <click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName"/>
-         <waitForPageLoad stepKey="waitForPageLoad4"/>
-         <see userInput="$$createConfigProduct.name$$" stepKey="assertProductPresent"/>
--        <dontSee userInput="$$createConfigChildProduct1.price$$" stepKey="assertProductPricePresent"/>
-+        <see userInput="$$createConfigChildProduct1.price$$" stepKey="assertProductPricePresent"/>
-     </test>
- </tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-index a00ce52f442..6bbb97c66cd 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CAdminTest">
-         <!--Create configurable product-->
-         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageConfigurable" after="seeSimpleProductInGrid"/>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-index 1f7b2bff0a7..47ee09e4b20 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CGuestUserTest">
-         <before>
-             <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-index 07e2ecf86ca..6f9ad93a56d 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CLoggedInUserTest">
-         <before>
-             <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NewProductsListWidgetConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NewProductsListWidgetConfigurableProductTest.xml
-new file mode 100644
-index 00000000000..eadc7dadaf7
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NewProductsListWidgetConfigurableProductTest.xml
-@@ -0,0 +1,91 @@
-+<?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="NewProductsListWidgetConfigurableProductTest" extends="NewProductsListWidgetTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="New products list widget"/>
-+            <title value="Admin should be able to set Configurable Product as new so that it shows up in the Catalog New Products List Widget"/>
-+            <description value="Admin should be able to set Configurable Product as new so that it shows up in the Catalog New Products List Widget"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-120"/>
-+            <group value="ConfigurableProduct"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+        </after>
-+
-+        <!-- A Cms page containing the New Products Widget gets created here via extends -->
-+
-+        <!-- Modify the Configurable Product that we created in the before block -->
-+        <amOnPage url="{{AdminProductEditPage.url($$createConfigProduct.id$$)}}" stepKey="amOnEditPage"/>
-+        <waitForPageLoad stepKey="waitForEditPage"/>
-+        <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
-+        <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
-+
-+        <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
-+
-+        <!-- Check for product on the CMS page with the New Products widget -->
-+        <amOnPage url="{{_newDefaultCmsPage.identifier}}" stepKey="amOnCmsPage"/>
-+        <waitForPageLoad stepKey="waitForCmsPage"/>
-+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductName"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
-new file mode 100644
-index 00000000000..cb0ea1c5de6
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
-@@ -0,0 +1,127 @@
-+<?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="NoOptionAvailableToConfigureDisabledProductTest">
-+        <annotations>
-+            <title value="Disabled variation of configurable product can't be added to shopping cart via admin"/>
-+            <description value="Disabled variation of configurable product can't be added to shopping cart via admin"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MC-17373"/>
-+            <useCaseId value="MAGETWO-72172"/>
-+            <group value="ConfigurableProduct"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <!--Create category-->
-+            <comment userInput="Create category" stepKey="commentCreateCategory"/>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <!-- Create the configurable product based on the data in the data folder -->
-+            <comment userInput="Create the configurable product based on the data in the data folder" stepKey="createConfigurableProduct"/>
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <!-- Create the configurable product with two options based on the default attribute set -->
-+            <comment userInput="Create the configurable product with two options based on the default attribute set" stepKey="configurableProductWithTwoOptions"/>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOption3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOption3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <!-- Create the 2 children that will be a part of the configurable product -->
-+            <comment userInput="Create the 2 children that will be a part of the configurable product" stepKey="createTwoChildrenProducts"/>
-+            <createData entity="ApiSimpleProductWithPrice50" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+            <createData entity="ApiSimpleProductWithPrice60" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+            <createData entity="ApiSimpleProductWithPrice70" stepKey="createConfigChildProduct3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
-+            </createData>
-+            <!-- Assign two products to the configurable product -->
-+            <comment userInput="Assign two products to the configurable product" stepKey="assignToConfigurableProduct"/>
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild3">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct3"/>
-+            </createData>
-+            <!--Create Customer-->
-+            <comment userInput="Create customer" stepKey="commentCreateCustomer"/>
-+            <createData entity="Simple_US_Customer_CA" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <!--Delete created data-->
-+            <comment userInput="Delete created data" stepKey="deleteData"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory2"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteConfigChildProduct3"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCreatedCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Disable child product -->
-+        <comment userInput="Disable child product" stepKey="disableChildProduct"/>
-+        <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct1.id$$)}}" stepKey="goToEditPage"/>
-+        <waitForPageLoad stepKey="waitForChildProductPageLoad"/>
-+        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="disableProduct"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
-+        <!--Go to created customer page-->
-+        <comment userInput="Go to created customer page" stepKey="goToCreatedCustomerPage"/>
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="createNewOrder">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickToAddProduct"/>
-+        <waitForPageLoad stepKey="waitForProductsOpened"/>
-+        <!--Find created configurable product and click on "Configure" link-->
-+        <comment userInput="Find created configurable product and click on Configure link" stepKey="goToConfigurableLink"/>
-+        <click selector="{{AdminOrderFormConfigureProductSection.configure($$createConfigProduct.id$$)}}" stepKey="clickOnConfigure"/>
-+        <!--Click on attribute drop-down and check no option 1 is available-->
-+        <comment userInput="Click on attribute drop-down and check no option 1 is available" stepKey="commentNoOptionIsAvailable"/>
-+        <waitForElement selector="{{AdminOrderFormConfigureProductSection.selectOption}}" stepKey="waitForShippingSectionLoaded"/>
-+        <click selector="{{AdminOrderFormConfigureProductSection.selectOption}}" stepKey="clickToSelectOption"/>
-+        <dontSee userInput="$$createConfigProductAttributeOption1.option[store_labels][1][label]$$" stepKey="dontSeeOption1"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
-new file mode 100644
-index 00000000000..c3459aec344
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
-@@ -0,0 +1,101 @@
-+<?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="ProductsQtyReturnAfterOrderCancel">
-+
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Cancel order"/>
-+            <title value="Product qunatity return after order cancel"/>
-+            <description value="Check Product qunatity return after order cancel"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-97228"/>
-+            <useCaseId value="MAGETWO-82221"/>
-+            <group value="ConfigurableProduct"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <actionGroup ref="logout" stepKey="amOnLogoutPage"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage1"/>
-+
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
-+            <argument name="product" value="$$createConfigProduct$$"/>
-+        </actionGroup>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="changeProductQuantity"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveChanges"/>
-+        <waitForPageLoad stepKey="waitProductGridToBeLoaded"/>
-+
-+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="navigateToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+        <fillField selector="{{StorefrontProductInfoMainSection.qty}}" userInput="4" stepKey="fillQuantity"/>
-+
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
-+            <argument name="productName" value="$$createConfigProduct.name$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
-+            <argument name="customerVar" value="CustomerEntityOne"/>
-+            <argument name="customerAddressVar" value="CustomerAddressSimple"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeOrder">
-+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
-+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
-+        </actionGroup>
-+
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
-+
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
-+            <argument name="orderId" value="$grabOrderNumber"/>
-+        </actionGroup>
-+
-+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-+        <waitForPageLoad stepKey="waitForOrderPageToLoad"/>
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
-+        <waitForPageLoad stepKey="waitForNewInvoicePageLoad"/>
-+        <fillField selector="{{AdminInvoiceItemsSection.qtyToInvoiceColumn}}" userInput="1" stepKey="ChangeQtyToInvoice"/>
-+        <click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="updateQunatity"/>
-+        <waitForPageLoad stepKey="waitPageToBeLoaded"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
-+        <waitForPageLoad stepKey="waitOrderDetailToLoad"/>
-+        <fillField selector="{{AdminShipmentItemsSection.itemQtyToShip('1')}}" userInput="1" stepKey="changeItemQtyToShip"/>
-+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
-+        <waitForPageLoad stepKey="waitShipmentSectionToLoad"/>
-+        <actionGroup ref="cancelPendingOrder" stepKey="cancelPendingOption">
-+            <argument name="orderStatus" value="Complete"/>
-+        </actionGroup>
-+
-+        <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Canceled 3" stepKey="seeCanceledQuantity"/>
-+
-+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
-+
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGridBySku">
-+            <argument name="sku" value="$$createConfigProduct.sku$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Quantity')}}" userInput="99" stepKey="seeProductSkuInGrid"/>
-+        <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
-+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductCategoryViewChildOnlyTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductCategoryViewChildOnlyTest.xml
-new file mode 100644
-index 00000000000..ac468fc92e4
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductCategoryViewChildOnlyTest.xml
-@@ -0,0 +1,129 @@
-+<?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="StorefrontConfigurableProductCategoryViewChildOnlyTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="View configurable product child in storefront"/>
-+            <title value="It should be possible to only view the child product of a configurable product"/>
-+            <description value="Create configurable product, add to category such that only child variation is visible in category"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5832"/>
-+            <group value="ConfigurableProduct"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!-- Create the category -->
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiCategory" stepKey="secondCategory"/>
-+
-+            <!-- Create an attribute with two options to be used in the first child product -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Add the attribute we just created to default attribute set -->
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Get the first option of the attribute we created -->
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Get the second option of the attribute we created -->
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create the configurable product and add it to the category -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Create a simple product and give it the attribute with the first option -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+
-+            <!-- Create a simple product and give it the attribute with the second option -->
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <!-- Add the first simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+
-+            <!-- Add the second simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+        </before>
-+
-+        <after>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteApiCategory"/>
-+            <deleteData createDataKey="secondCategory" stepKey="deleteSecondCategory"/>
-+        </after>
-+
-+        <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+
-+        <!-- Go to the product page for the first product -->
-+        <amOnPage stepKey="goToProductGrid" url="{{ProductCatalogPage.url}}"/>
-+        <waitForPageLoad stepKey="waitForProductGridLoad"/>
-+        <actionGroup stepKey="searchForSimpleProduct" ref="filterProductGridBySku2">
-+            <argument name="sku" value="$$createConfigChildProduct1.sku$$"/>
-+        </actionGroup>
-+        <actionGroup stepKey="openProductEditPage" ref="openProducForEditByClickingRowXColumnYInProductGrid"/>
-+        <!-- Edit the visibility the first simple product -->
-+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="Catalog, Search" stepKey="selectVisibilityCatalogSearch"/>
-+        <!--Add to category-->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$secondCategory.name$$]" stepKey="addProductToCategory"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
-+
-+        <!-- Go to storefront to view child product -->
-+        <amOnPage stepKey="goToStoreFront" url="{{StorefrontHomePage.url}}"/>
-+        <waitForPageLoad stepKey="waitForStorefront"/>
-+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$secondCategory.name$$)}}" stepKey="goToCategoryStorefront"/>
-+        <waitForPageLoad stepKey="waitForStorefrontCategory"/>
-+        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigChildProduct1.name$$)}}" stepKey="seeChildProductInCategory"/>
-+        <dontSeeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigChildProduct2.name$$)}}" stepKey="dontSeeOtherChildProduct"/>
-+        <dontSeeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigProduct.name$$)}}" stepKey="dontSeeParentProduct"/>
-+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigChildProduct1.name$$)}}" stepKey="clickProductName"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <seeInCurrentUrl url="$$createConfigChildProduct1.custom_attributes[url_key]$$" stepKey="seeProductPageIsAccessible"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productName($$createConfigChildProduct1.name$$)}}" stepKey="seeProductNameOnProductPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
-index c0e7c886d0c..1075f79aef1 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontConfigurableProductChildSearchTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-@@ -144,18 +144,15 @@
-         <!-- Quick search the storefront for the first attribute option -->
-         <amOnPage stepKey="goToStoreFront" url="{{StorefrontHomePage.url}}"/>
-         <waitForPageLoad stepKey="waitForStorefront"/>
--        <fillField stepKey="searchStorefront1" selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createConfigProductAttributeSelectOption1.option[store_labels][0][label]$$"/>
--        <click stepKey="clickSearch1" selector="{{StorefrontQuickSearchSection.searchButton}}"/>
-+        <submitForm selector="#search_mini_form" parameterArray="['q' => $$createConfigProductAttributeSelectOption1.option[store_labels][0][label]$$]" stepKey="searchStorefront1" />
-         <seeElement stepKey="seeProduct1" selector="{{StorefrontCategoryProductSection.ProductTitleByName('$$createConfigProduct.name$$')}}"/>
- 
-         <!-- Quick search the storefront for the second attribute option -->
--        <fillField stepKey="searchStorefront2" selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createConfigProductAttributeOption1Multiselect.option[store_labels][0][label]$$"/>
--        <click stepKey="clickSearch2" selector="{{StorefrontQuickSearchSection.searchButton}}"/>
-+        <submitForm selector="#search_mini_form" parameterArray="['q' => $$createConfigProductAttributeOption1Multiselect.option[store_labels][0][label]$$]" stepKey="searchStorefront2" />
-         <seeElement stepKey="seeProduct2" selector="{{StorefrontCategoryProductSection.ProductTitleByName('$$createConfigProduct.name$$')}}"/>
- 
-         <!-- Quick search the storefront for the first product description -->
--        <fillField stepKey="searchStorefront3" selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="'$$createConfigChildProduct1.custom_attributes[short_description]$$'"/>
--        <click stepKey="clickSearch3" selector="{{StorefrontQuickSearchSection.searchButton}}"/>
-+        <submitForm selector="#search_mini_form" parameterArray="['q' => $$createConfigChildProduct1.custom_attributes[short_description]$$]" stepKey="searchStorefront3" />
-         <seeElement stepKey="seeProduct3" selector="{{StorefrontCategoryProductSection.ProductTitleByName('$$createConfigProduct.name$$')}}"/>
-     </test>
- </tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml
-index 3b0f5752ebf..836bc2cdca9 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontConfigurableProductBasicInfoTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
-index b8e894ccf36..cc8291a83eb 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontConfigurableProductGridViewTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
-index 602e04b138e..d890d598581 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontConfigurableProductWithFileCustomOptionTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-@@ -17,7 +17,6 @@
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-93059"/>
-             <group value="ConfigurableProduct"/>
--            <group value="skip"/><!-- MAGETWO-94170 -->
-         </annotations>
- 
-         <before>
-@@ -41,7 +40,7 @@
-         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
-         
-         <!--Go to storefront-->
--        <amOnPage url="" stepKey="goToHomePage"/>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
-         <waitForPageLoad stepKey="waitForHomePageLoad"/>
-         <click selector="{{StorefrontNavigationSection.topCategory($$createCategory.name$$)}}" stepKey="goToCategoryStorefront"/>
-         <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
-new file mode 100644
-index 00000000000..57c45ee1e89
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
-@@ -0,0 +1,167 @@
-+<?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="StorefrontSortingByPriceForConfigurableProductWithCatalogRuleAppliedTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="View soting by price in storefront"/>
-+            <title value="Sorting by price for Configurable with Catalog Rule applied"/>
-+            <description value="Sort by price should be correct if the apply Catalog Rule to child product of configurable product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-69988"/>
-+            <skip>
-+                <issueId value="MC-5777"/>
-+            </skip>
-+            <group value="сonfigurable_product"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">5.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct2">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">10.00</field>
-+            </createData>
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOption3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOption3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <field key="price">15.00</field>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+                <field key="price">20.00</field>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
-+                <field key="price">25.00</field>
-+            </createData>
-+            <createData entity="ConfigurableProductThreeOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild3">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct3"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--SKU Product Attribute is enabled for Promo Rule Conditions-->
-+            <actionGroup ref="navigateToEditProductAttribute" stepKey="navigateToSkuProductAttribute">
-+                <argument name="ProductAttribute" value="sku"/>
-+            </actionGroup>
-+            <actionGroup ref="changeUseForPromoRuleConditionsProductAttribute" stepKey="changeUseForPromoRuleConditionsProductAttributeToYes">
-+                <argument name="option" value="Yes"/>
-+            </actionGroup>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex1"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache1"/>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteConfigChildProduct3"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+
-+            <!--SKU Product Attribute is disable for Promo Rule Conditions-->
-+            <actionGroup ref="navigateToEditProductAttribute" stepKey="navigateToSkuProductAttribute">
-+                <argument name="ProductAttribute" value="sku"/>
-+            </actionGroup>
-+            <actionGroup ref="changeUseForPromoRuleConditionsProductAttribute" stepKey="changeUseForPromoRuleConditionsProductAttributeToNo">
-+                <argument name="option" value="No"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-+        </after>
-+
-+        <!--Open category with products and Sort by price desc-->
-+        <actionGroup ref="GoToStorefrontCategoryPageByParameters" stepKey="goToStorefrontCategoryPage">
-+            <argument name="category" value="$$createCategory.custom_attributes[url_key]$$"/>
-+            <argument name="mode" value="grid"/>
-+            <argument name="numOfProductsPerPage" value="25"/>
-+            <argument name="sortBy" value="price"/>
-+            <argument name="sort" value="desc"/>
-+        </actionGroup>
-+        <see selector="{{StorefrontCategoryMainSection.lineProductName('1')}}" userInput="$$createConfigProduct.name$$" stepKey="seeConfigurableProduct"/>
-+        <see selector="{{StorefrontCategoryMainSection.lineProductName('2')}}" userInput="$$createSimpleProduct2.name$$" stepKey="seeSimpleProductTwo"/>
-+        <see selector="{{StorefrontCategoryMainSection.lineProductName('3')}}" userInput="$$createSimpleProduct.name$$" stepKey="seeSimpleProduct"/>
-+
-+        <!--Create and apply catalog price rule-->
-+        <actionGroup ref="newCatalogPriceRuleByUIWithConditionIsSKU" stepKey="createCatalogPriceRule">
-+            <argument name="catalogRule" value="CatalogRuleByPercentWith96Amount" />
-+            <argument name="productSku" value="$$createConfigChildProduct3.sku$$" />
-+        </actionGroup>
-+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
-+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="clickSaveAndApplyRules"/>
-+
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!--Reopen category with products and Sort by price desc-->
-+        <actionGroup ref="GoToStorefrontCategoryPageByParameters" stepKey="goToStorefrontCategoryPage2">
-+            <argument name="category" value="$$createCategory.custom_attributes[url_key]$$"/>
-+            <argument name="mode" value="grid"/>
-+            <argument name="numOfProductsPerPage" value="9"/>
-+            <argument name="sortBy" value="price"/>
-+            <argument name="sort" value="desc"/>
-+        </actionGroup>
-+        <see selector="{{StorefrontCategoryMainSection.lineProductName('1')}}" userInput="$$createConfigProduct.name$$" stepKey="seeConfigurableProduct2"/>
-+        <see selector="{{StorefrontCategoryMainSection.lineProductName('2')}}" userInput="$$createSimpleProduct2.name$$" stepKey="seeSimpleProductTwo2"/>
-+        <see selector="{{StorefrontCategoryMainSection.lineProductName('3')}}" userInput="$$createSimpleProduct.name$$" stepKey="seeSimpleProduct2"/>
-+
-+        <!-- Delete the rule -->
-+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
-+        <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
-+            <argument name="name" value="{{CatalogRuleByPercentWith96Amount.name}}"/>
-+            <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
-new file mode 100644
-index 00000000000..bb69122dc0b
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
-@@ -0,0 +1,149 @@
-+<?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="StorefrontVerifyConfigurableProductLayeredNavigationTest">
-+        <annotations>
-+            <stories value="Create configurable product"/>
-+            <title value="Out of stock configurable attribute option doesn't show in Layered Navigation"/>
-+            <description value=" Login as admin and verify out of stock configurable attribute option doesn't show in Layered Navigation"/>
-+            <testCaseId value="MC-13734"/>
-+            <severity value="CRITICAL"/>
-+            <group value="ConfigurableProduct"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Login as Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+
-+            <!-- Create Default Category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create an attribute with three options -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOption3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Add the attribute just created to default attribute set -->
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Get the first option of the attribute created -->
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Get the second option of the attribute created -->
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Get the third option of the attribute created -->
-+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOption3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create Configurable product -->
-+            <createData entity="BaseConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Create a simple product and give it the attribute with the first option -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+
-+            <!--Create a simple product and give it the attribute with the second option -->
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <!--Create a simple product and give it the attribute with the Third option -->
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
-+            </createData>
-+
-+            <!-- Create the configurable product -->
-+            <createData entity="ConfigurableProductThreeOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
-+            </createData>
-+
-+            <!-- Add the first simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+
-+            <!-- Add the second simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+
-+            <!-- Add the third simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild3">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct3"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete Created Data -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteConfigChildProduct3"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteAttribute"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Open Product Index Page and Filter First Child product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProduct">
-+            <argument name="product" value="ApiSimpleOne"/>
-+        </actionGroup>
-+
-+        <!-- Change the First Child Product stock status as 'Out Of Stock'-->
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="selectFirstRow"/>
-+        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
-+        <scrollTo selector="{{AdminProductFormSection.productQuantity}}" stepKey="scrollToProductQuantity"/>
-+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="Out of Stock" stepKey="disableProduct"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}"  stepKey="clickOnSaveButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-+
-+        <!--Open Category in Store Front and select product attribute option from sidebar -->
-+        <actionGroup ref="SelectStorefrontSideBarAttributeOption" stepKey="selectStorefrontProductAttributeOption">
-+            <argument name="categoryName" value="$$createCategory.name$$"/>
-+            <argument name="attributeDefaultLabel" value="$$createConfigProductAttribute.default_value$$"/>
-+        </actionGroup>
-+
-+        <!--Assert Out Of Stock product is not visible in Storefront Page -->
-+        <dontSee selector="{{StorefrontCategorySidebarSection.filterOption}}" userInput="$$getConfigAttributeOption1.label$$" stepKey="dontSeeOption1"/>
-+        <see selector="{{StorefrontCategorySidebarSection.filterOption}}" userInput="$$getConfigAttributeOption2.label$$" stepKey="seeOption2"/>
-+        <see selector="{{StorefrontCategorySidebarSection.filterOption}}" userInput="$$getConfigAttributeOption3.label$$" stepKey="seeOption3"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml
-new file mode 100644
-index 00000000000..36c8301b23d
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml
-@@ -0,0 +1,207 @@
-+<?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="StorefrontVisibilityOfDuplicateProductTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <title value="Visibility of duplicate product on the Storefront"/>
-+            <description value="Check visibility of duplicate product on the Storefront"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MC-17226"/>
-+            <useCaseId value="MAGETWO-64923"/>
-+            <group value="ConfigurableProduct"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create configurable product-->
-+            <comment userInput="Create configurable product" stepKey="commentCreateConfigProduct"/>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!--Delete created data-->
-+            <comment userInput="Delete created data" stepKey="commentDeleteCreatedData"/>
-+            <actionGroup ref="deleteAllDuplicateProductUsingProductGrid" stepKey="deleteDuplicatedProduct">
-+                <argument name="product" value="$$createConfigProduct$$"/>
-+            </actionGroup>
-+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
-+            <!--Delete product attributes-->
-+            <comment userInput="Delete product attributes" stepKey="deleteCommentAttributes"/>
-+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteProductAttribute">
-+                <argument name="ProductAttribute" value="colorProductAttribute"/>
-+            </actionGroup>
-+            <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGridFirst"/>
-+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteProductSecondAttribute">
-+                <argument name="ProductAttribute" value="productAttributeColor"/>
-+            </actionGroup>
-+            <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGridSecond"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Create attribute and options for product-->
-+        <comment userInput="Create attribute and options for product" stepKey="commentCreateAttributesAndOptions"/>
-+        <amOnPage url="{{AdminProductEditPage.url($$createConfigProduct.id$$)}}" stepKey="navigateToConfigProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <actionGroup ref="addProductImage" stepKey="addImageForProduct1">
-+            <argument name="image" value="MagentoLogo"/>
-+        </actionGroup>
-+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
-+        <actionGroup ref="AdminCreateAttributeFromProductPageWithScope" stepKey="createAttributeForProduct">
-+            <argument name="attributeName" value="{{colorProductAttribute.default_label}}"/>
-+            <argument name="attributeType" value="{{colorProductAttribute.input_type}}"/>
-+            <argument name="scope" value="Global"/>
-+        </actionGroup>
-+        <reloadPage stepKey="reloadPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageReload"/>
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnCreateConfigurations"/>
-+        <waitForPageLoad stepKey="waitForFilters"/>
-+        <actionGroup ref="createOptionsForAttribute" stepKey="createOptions">
-+            <argument name="attributeName" value="{{colorProductAttribute.default_label}}"/>
-+            <argument name="firstOptionName" value="{{colorConfigurableProductAttribute1.name}}"/>
-+            <argument name="secondOptionName" value="{{colorConfigurableProductAttribute2.name}}"/>
-+        </actionGroup>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnFirstNextButton"/>
-+        <waitForPageLoad stepKey="waitForBulkImagesPriceQuantityPageLoad"/>
-+        <!--Add images to configurable product attribute options-->
-+        <comment userInput="Add images to configurable product attribute options" stepKey="commentAddImages"/>
-+        <actionGroup ref="addUniqueImageToConfigurableProductOption" stepKey="addImageToConfigurableProductOptionOne">
-+            <argument name="image" value="ImageUpload"/>
-+            <argument name="frontend_label" value="{{colorProductAttribute.default_label}}"/>
-+            <argument name="label" value="{{colorConfigurableProductAttribute1.name}}"/>
-+        </actionGroup>
-+        <actionGroup ref="addUniqueImageToConfigurableProductOption" stepKey="addImageToConfigurableProductOptionTwo">
-+            <argument name="image" value="ImageUpload_1"/>
-+            <argument name="frontend_label" value="{{colorProductAttribute.default_label}}"/>
-+            <argument name="label" value="{{colorConfigurableProductAttribute2.name}}"/>
-+        </actionGroup>
-+        <!--Add price to product attribute options-->
-+        <comment userInput="Add price to product attribute options" stepKey="commentAddPrice"/>
-+        <actionGroup ref="addUniquePriceToConfigurableProductOption" stepKey="addPriceToConfigurableProductOptionFirst">
-+            <argument name="frontend_label" value="{{colorProductAttribute.default_label}}"/>
-+            <argument name="label" value="{{colorConfigurableProductAttribute1.name}}"/>
-+            <argument name="price" value="{{virtualProductWithRequiredFields.price}}"/>
-+        </actionGroup>
-+        <actionGroup ref="addUniquePriceToConfigurableProductOption" stepKey="addPriceToConfigurableProductOptionSecond">
-+            <argument name="frontend_label" value="{{colorProductAttribute.default_label}}"/>
-+            <argument name="label" value="{{colorConfigurableProductAttribute2.name}}"/>
-+            <argument name="price" value="{{virtualProductWithRequiredFields.price}}"/>
-+        </actionGroup>
-+        <!--Add quantity to product attribute options-->
-+        <comment userInput="Add quantity to product attribute options" stepKey="commentAddQuantity"/>
-+        <actionGroup ref="addUniqueQuantityToConfigurableProductOption" stepKey="addUniqueQtyForFirstOption">
-+            <argument name="frontend_label" value="{{colorProductAttribute.default_label}}"/>
-+            <argument name="label" value="{{colorConfigurableProductAttribute1.name}}"/>
-+            <argument name="quantity" value="{{virtualProductBigQty.quantity}}"/>
-+        </actionGroup>
-+        <actionGroup ref="addUniqueQuantityToConfigurableProductOption" stepKey="addUniqueQtyForSecondOption">
-+            <argument name="frontend_label" value="{{colorProductAttribute.default_label}}"/>
-+            <argument name="label" value="{{colorConfigurableProductAttribute2.name}}"/>
-+            <argument name="quantity" value="{{virtualProductBigQty.quantity}}"/>
-+        </actionGroup>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnSecondNextButton"/>
-+        <waitForPageLoad stepKey="waitForSummaryPageLoad"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButtonToGenerateConfigs"/>
-+        <waitForPageLoad stepKey="waitForConfigurableProductPageLoad"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+        <!--Duplicate the product-->
-+        <comment userInput="Duplicate the product" stepKey="commentDuplicateProduct"/>
-+        <actionGroup ref="AdminFormSaveAndDuplicate" stepKey="saveAndDuplicateProductForm"/>
-+        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="clickEnableProduct"/>
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="$$createConfigProduct.name$$-Updated" stepKey="fillProductName"/>
-+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="1" stepKey="selectInStock"/>
-+        <!--Change product image-->
-+        <comment userInput="Change product image" stepKey="commentChangeProductImage"/>
-+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
-+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
-+            <argument name="image" value="TestImageAdobe"/>
-+        </actionGroup>
-+        <!--Disable configurations-->
-+        <comment userInput="Disable configurations" stepKey="commentDisableConfigurations"/>
-+        <actionGroup ref="AdminConfigurableProductDisableConfigurationsActionGroup" stepKey="disableFirstConfig">
-+            <argument name="productName" value="{{colorConfigurableProductAttribute1.name}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminConfigurableProductDisableConfigurationsActionGroup" stepKey="disableSecondConfig">
-+            <argument name="productName" value="{{colorConfigurableProductAttribute2.name}}"/>
-+        </actionGroup>
-+        <actionGroup ref="saveProductForm" stepKey="saveDuplicatedProductForm"/>
-+        <!--Create new configurations with another attribute-->
-+        <comment userInput="Create new configurations with another attribute" stepKey="commentCreateNewConfigurations"/>
-+        <actionGroup ref="AdminCreateAttributeFromProductPageWithScope" stepKey="createAttributeForDuplicatedProduct">
-+            <argument name="attributeName" value="{{productAttributeColor.default_label}}"/>
-+            <argument name="attributeType" value="{{productAttributeColor.input_type}}"/>
-+            <argument name="scope" value="Global"/>
-+        </actionGroup>
-+        <reloadPage stepKey="reloadDuplicatedProductPage"/>
-+        <waitForPageLoad stepKey="waitForDuplicatedProductReload"/>
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="createConfigurationsDuplicatedProduct"/>
-+        <actionGroup ref="createOptionsForAttribute" stepKey="createOptionsForDuplicatedProduct">
-+            <argument name="attributeName" value="{{productAttributeColor.default_label}}"/>
-+            <argument name="firstOptionName" value="{{colorConfigurableProductAttribute1.name}}"/>
-+            <argument name="secondOptionName" value="{{colorConfigurableProductAttribute2.name}}"/>
-+        </actionGroup>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnFirstNextButtonForDuplicatedProduct"/>
-+        <waitForPageLoad stepKey="waitForBulkImagesPriceQuantityPageLoadForDuplicatedProduct"/>
-+        <actionGroup ref="addUniqueImageToConfigurableProductOption" stepKey="addImgConfigProductOption1DuplicatedProduct">
-+            <argument name="image" value="MagentoLogo"/>
-+            <argument name="frontend_label" value="{{productAttributeColor.default_label}}"/>
-+            <argument name="label" value="{{colorConfigurableProductAttribute1.name}}"/>
-+        </actionGroup>
-+        <actionGroup ref="addUniqueImageToConfigurableProductOption" stepKey="addImgConfigProductOption2DuplicatedProduct">
-+            <argument name="image" value="MagentoLogo"/>
-+            <argument name="frontend_label" value="{{productAttributeColor.default_label}}"/>
-+            <argument name="label" value="{{colorConfigurableProductAttribute2.name}}"/>
-+        </actionGroup>
-+        <actionGroup ref="addUniquePriceToConfigurableProductOption" stepKey="addPriceConfigProductOption1DuplicatedProduct">
-+            <argument name="frontend_label" value="{{productAttributeColor.default_label}}"/>
-+            <argument name="label" value="{{colorConfigurableProductAttribute1.name}}"/>
-+            <argument name="price" value="{{virtualProductWithRequiredFields.price}}"/>
-+        </actionGroup>
-+        <actionGroup ref="addUniquePriceToConfigurableProductOption" stepKey="addPriceConfigProductOption2DuplicatedProduct">
-+            <argument name="frontend_label" value="{{productAttributeColor.default_label}}"/>
-+            <argument name="label" value="{{colorConfigurableProductAttribute2.name}}"/>
-+            <argument name="price" value="{{virtualProductWithRequiredFields.price}}"/>
-+        </actionGroup>
-+        <actionGroup ref="addUniqueQuantityToConfigurableProductOption" stepKey="addUniqueQtyOption1DuplicatedProduct">
-+            <argument name="frontend_label" value="{{productAttributeColor.default_label}}"/>
-+            <argument name="label" value="{{colorConfigurableProductAttribute1.name}}"/>
-+            <argument name="quantity" value="{{virtualProductBigQty.quantity}}"/>
-+        </actionGroup>
-+        <actionGroup ref="addUniqueQuantityToConfigurableProductOption" stepKey="addUniqueQtyOption2DuplicatedProduct">
-+            <argument name="frontend_label" value="{{productAttributeColor.default_label}}"/>
-+            <argument name="label" value="{{colorConfigurableProductAttribute2.name}}"/>
-+            <argument name="quantity" value="{{virtualProductBigQty.quantity}}"/>
-+        </actionGroup>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOn2NextButtonForDuplicatedProduct"/>
-+        <waitForPageLoad stepKey="waitForSummaryPageLoadForDuplicatedProduct"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="generateConfigsForDuplicatedProduct"/>
-+        <waitForPageLoad stepKey="waitForDuplicatedProductPageLoad"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveDuplicatedProduct"/>
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        <!--Assert configurable product in category-->
-+        <comment userInput="Assert configurable product in category" stepKey="commentAssertProductInCategoryPage"/>
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigProduct.name$$-Updated)}}" stepKey="assertProductNameInCategoryPage"/>
-+        <!--Assert product options in Storefront product page-->
-+        <comment userInput="Assert product options in Storefront product page" stepKey="commentAssertProductOptions"/>
-+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.sku$$-1)}}" stepKey="amOnSimpleProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoadOnStorefront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$-Updated"  stepKey="seeConfigurableProductName"/>
-+        <see userInput="{{productAttributeColor.default_label}}" selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" stepKey="seeColorAttributeName"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="{{colorConfigurableProductAttribute1.name}}" stepKey="selectFirstOption"/>
-+        <see userInput="{{virtualProductWithRequiredFields.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertFirstOptionProductPrice"/>
-+        <seeElement selector="{{StorefrontProductMediaSection.imageFile(MagentoLogo.filename)}}" stepKey="seeFirstImage"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}"  userInput="{{colorConfigurableProductAttribute1.name}}" stepKey="selectSecondOption"/>
-+        <see userInput="{{virtualProductWithRequiredFields.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seeSecondOptionProductPrice"/>
-+        <seeElement selector="{{StorefrontProductMediaSection.imageFile(MagentoLogo.filename)}}" stepKey="seeSecondImage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php
-index 8df6df53cc0..2d73b61245a 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php
-+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php
-@@ -38,7 +38,7 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->productMock = $this->getMockBuilder(ProductInterface::class)
--            ->setMethods(['isReadonly', 'isDuplicable'])
-+            ->setMethods(['isReadonly', 'isDuplicable', 'isComposite'])
-             ->getMockForAbstractClass();
- 
-         $this->registryMock->expects(static::any())
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
-index 25d8412c910..c5c2368720b 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
-+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
-@@ -379,6 +379,9 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-                             'percentage' => $percentage,
-                         ],
-                     ],
-+                    'msrpPrice' => [
-+                        'amount' => null    ,
-+                    ]
-                 ],
-             ],
-             'priceFormat' => [],
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
-index ad2fcd1e593..c385934352a 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
-+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
-@@ -149,16 +149,19 @@ class LinkManagementTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->setMethods(['getId', 'getData'])
-             ->getMock();
--
-         $extensionAttributesMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductExtension::class)
-             ->disableOriginalConstructor()
--            ->setMethods([
--                'getConfigurableProductOptions', 'setConfigurableProductOptions', 'setConfigurableProductLinks'
--            ])
-+            ->setMethods(
-+                [
-+                    'getConfigurableProductOptions',
-+                    'setConfigurableProductOptions',
-+                    'setConfigurableProductLinks'
-+                ]
-+            )
-             ->getMock();
-         $optionMock = $this->getMockBuilder(\Magento\ConfigurableProduct\Api\Data\Option::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['getProductAttribute', 'getAttributeId'])
-+            ->setMethods(['getProductAttribute', 'getPosition', 'getAttributeId'])
-             ->getMock();
-         $productAttributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
-             ->disableOriginalConstructor()
-@@ -189,7 +192,6 @@ class LinkManagementTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->setMethods(['getValue', 'getLabel'])
-             ->getMock();
--
-         $attributeCollectionMock = $this->getMockBuilder(
-             \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection::class
-         )
-@@ -216,20 +218,18 @@ class LinkManagementTest extends \PHPUnit\Framework\TestCase
-         $productAttributeMock->expects($this->any())->method('getAttributeCode')->willReturn('color');
-         $simple->expects($this->any())->method('getData')->willReturn('color');
-         $optionMock->expects($this->any())->method('getAttributeId')->willReturn('1');
-+        $optionMock->expects($this->any())->method('getPosition')->willReturn('0');
- 
-         $optionsFactoryMock->expects($this->any())->method('create')->willReturn([$optionMock]);
-         $attributeFactoryMock->expects($this->any())->method('create')->willReturn($attributeMock);
-         $attributeMock->expects($this->any())->method('getCollection')->willReturn($attributeCollectionMock);
-         $attributeCollectionMock->expects($this->any())->method('addFieldToFilter')->willReturnSelf();
-         $attributeCollectionMock->expects($this->any())->method('getItems')->willReturn([$attributeMock]);
--
-+        $attributeMock->expects($this->any())->method('getId')->willReturn(1);
-         $attributeMock->expects($this->any())->method('getOptions')->willReturn([$attributeOptionMock]);
--
-         $extensionAttributesMock->expects($this->any())->method('setConfigurableProductOptions');
-         $extensionAttributesMock->expects($this->any())->method('setConfigurableProductLinks');
--
-         $this->productRepository->expects($this->once())->method('save');
--
-         $this->assertTrue(true, $this->object->addChild($productSku, $childSku));
-     }
- 
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php
-new file mode 100644
-index 00000000000..b4fb5ccfaa5
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php
-@@ -0,0 +1,77 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ConfigurableProduct\Test\Unit\Model\Plugin\Frontend;
-+
-+use Magento\ConfigurableProduct\Model\Plugin\Frontend\ProductIdentitiesExtender;
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-+use Magento\Catalog\Model\Product;
-+
-+/**
-+ * Class ProductIdentitiesExtenderTest
-+ */
-+class ProductIdentitiesExtenderTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject|Configurable
-+     */
-+    private $configurableTypeMock;
-+
-+    /**
-+     * @var ProductIdentitiesExtender
-+     */
-+    private $plugin;
-+
-+    /** @var  MockObject|\Magento\Catalog\Model\Product */
-+    private $product;
-+
-+    protected function setUp()
-+    {
-+        $this->product = $this->getMockBuilder(Product::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getId'])
-+            ->getMock();
-+
-+        $this->configurableTypeMock = $this->getMockBuilder(Configurable::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->plugin = new ProductIdentitiesExtender($this->configurableTypeMock);
-+    }
-+
-+    public function testAfterGetIdentities()
-+    {
-+        $identities = [
-+            'SomeCacheId',
-+            'AnotherCacheId',
-+        ];
-+        $productId = 12345;
-+        $childIdentities = [
-+            0 => [1, 2, 5, 100500]
-+        ];
-+        $expectedIdentities = [
-+            'SomeCacheId',
-+            'AnotherCacheId',
-+            Product::CACHE_TAG . '_' . 1,
-+            Product::CACHE_TAG . '_' . 2,
-+            Product::CACHE_TAG . '_' . 5,
-+            Product::CACHE_TAG . '_' . 100500,
-+        ];
-+
-+        $this->product->expects($this->once())
-+            ->method('getId')
-+            ->willReturn($productId);
-+
-+        $this->configurableTypeMock->expects($this->once())
-+            ->method('getChildrenIds')
-+            ->with($productId)
-+            ->willReturn($childIdentities);
-+
-+        $productIdentities = $this->plugin->afterGetIdentities($this->product, $identities);
-+        $this->assertEquals($expectedIdentities, $productIdentities);
-+    }
-+}
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php
-new file mode 100644
-index 00000000000..8dac2dee10d
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php
-@@ -0,0 +1,143 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Configuration\Item;
-+
-+use Magento\Catalog\Model\Config\Source\Product\Thumbnail;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
-+use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
-+use Magento\ConfigurableProduct\Model\Product\Configuration\Item\ItemProductResolver;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Quote\Model\Quote\Item\Option;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class ItemProductResolverTest extends TestCase
-+{
-+    /** @var ItemProductResolver */
-+    private $model;
-+    /** @var ItemInterface | MockObject */
-+    private $item;
-+    /** @var Product | MockObject */
-+    private $parentProduct;
-+    /** @var  ScopeConfigInterface | MockObject */
-+    private $scopeConfig;
-+    /** @var OptionInterface | MockObject */
-+    private $option;
-+    /** @var Product | MockObject */
-+    private $childProduct;
-+
-+    /**
-+     * Set up method
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->parentProduct = $this->getMockBuilder(Product::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->parentProduct
-+            ->method('getSku')
-+            ->willReturn('parent_product');
-+
-+        $this->childProduct = $this->getMockBuilder(Product::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->childProduct
-+            ->method('getSku')
-+            ->willReturn('child_product');
-+
-+        $this->option = $this->getMockBuilder(Option::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->option
-+            ->method('getProduct')
-+            ->willReturn($this->childProduct);
-+
-+        $this->item = $this->getMockBuilder(ItemInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->item
-+            ->expects($this->once())
-+            ->method('getProduct')
-+            ->willReturn($this->parentProduct);
-+
-+        $this->model = new ItemProductResolver($this->scopeConfig);
-+    }
-+
-+    /**
-+     * Test for deleted child product from configurable product
-+     */
-+    public function testGetFinalProductChildIsNull(): void
-+    {
-+        $this->scopeConfig->expects($this->never())->method('getValue');
-+        $this->childProduct->expects($this->never())->method('getData');
-+
-+        $this->item->expects($this->once())
-+            ->method('getOptionByCode')
-+            ->willReturn(null);
-+
-+        $finalProduct = $this->model->getFinalProduct($this->item);
-+        $this->assertEquals(
-+            $this->parentProduct->getSku(),
-+            $finalProduct->getSku()
-+        );
-+    }
-+
-+    /**
-+     * Tests child product from configurable product
-+     *
-+     * @dataProvider provideScopeConfig
-+     * @param string $expectedSku
-+     * @param string $scopeValue
-+     * @param string | null $thumbnail
-+     */
-+    public function testGetFinalProductChild($expectedSku, $scopeValue, $thumbnail): void
-+    {
-+        $this->item->expects($this->once())
-+            ->method('getOptionByCode')
-+            ->willReturn($this->option);
-+
-+        $this->childProduct
-+            ->expects($this->once())
-+            ->method('getData')
-+            ->willReturn($thumbnail);
-+
-+        $this->scopeConfig->expects($this->once())
-+            ->method('getValue')
-+            ->willReturn($scopeValue);
-+
-+        $finalProduct = $this->model->getFinalProduct($this->item);
-+        $this->assertEquals($expectedSku, $finalProduct->getSku());
-+    }
-+
-+    /**
-+     * Dataprovider for scope test
-+     * @return array
-+     */
-+    public function provideScopeConfig(): array
-+    {
-+        return [
-+            ['child_product', Thumbnail::OPTION_USE_OWN_IMAGE, 'thumbnail'],
-+            ['parent_product', Thumbnail::OPTION_USE_PARENT_IMAGE, 'thumbnail'],
-+
-+            ['parent_product', Thumbnail::OPTION_USE_OWN_IMAGE, null],
-+            ['parent_product', Thumbnail::OPTION_USE_OWN_IMAGE, 'no_selection'],
-+
-+            ['parent_product', Thumbnail::OPTION_USE_PARENT_IMAGE, null],
-+            ['parent_product', Thumbnail::OPTION_USE_PARENT_IMAGE, 'no_selection'],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php
-index 64b9b377644..ab52d4eb860 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php
-+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php
-@@ -6,22 +6,47 @@
- 
- namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Type\Configurable;
- 
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Configuration\Item\Option;
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price as ConfigurablePrice;
-+use Magento\Framework\Event\ManagerInterface;
-+use Magento\Framework\Pricing\Amount\AmountInterface;
-+use Magento\Framework\Pricing\Price\PriceInterface;
-+use Magento\Framework\Pricing\PriceInfo\Base as PriceInfoBase;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use PHPUnit\Framework\MockObject\MockObject;
- 
- class PriceTest extends \PHPUnit\Framework\TestCase
- {
--    /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price */
-+    /**
-+     * @var ObjectManagerHelper
-+     */
-+    protected $objectManagerHelper;
-+
-+    /**
-+     * @var ConfigurablePrice
-+     */
-     protected $model;
- 
--    /** @var ObjectManagerHelper */
--    protected $objectManagerHelper;
-+    /**
-+     * @var ManagerInterface|MockObject
-+     */
-+    private $eventManagerMock;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->objectManagerHelper = new ObjectManagerHelper($this);
- 
-+        $this->eventManagerMock = $this->createPartialMock(
-+            ManagerInterface::class,
-+            ['dispatch']
-+        );
-         $this->model = $this->objectManagerHelper->getObject(
--            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price::class
-+            ConfigurablePrice::class,
-+            ['eventManager' => $this->eventManagerMock]
-         );
-     }
- 
-@@ -29,29 +54,29 @@ class PriceTest extends \PHPUnit\Framework\TestCase
-     {
-         $finalPrice = 10;
-         $qty = 1;
--        $configurableProduct = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getCustomOption', 'getPriceInfo', 'setFinalPrice', '__wakeUp'])
--            ->getMock();
--        $customOption = $this->getMockBuilder(\Magento\Catalog\Model\Product\Configuration\Item\Option::class)
-+
-+        /** @var Product|MockObject $configurableProduct */
-+        $configurableProduct = $this->getMockBuilder(Product::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['getProduct'])
-+            ->setMethods(['getCustomOption', 'getPriceInfo', 'setFinalPrice'])
-             ->getMock();
--        $priceInfo = $this->getMockBuilder(\Magento\Framework\Pricing\PriceInfo\Base::class)
-+        /** @var PriceInfoBase|MockObject $priceInfo */
-+        $priceInfo = $this->getMockBuilder(PriceInfoBase::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['getPrice'])
-             ->getMock();
--        $price = $this->getMockBuilder(\Magento\Framework\Pricing\Price\PriceInterface::class)
-+        /** @var PriceInterface|MockObject $price */
-+        $price = $this->getMockBuilder(PriceInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $amount = $this->getMockBuilder(\Magento\Framework\Pricing\Amount\AmountInterface::class)
-+        /** @var AmountInterface|MockObject $amount */
-+        $amount = $this->getMockBuilder(AmountInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-         $configurableProduct->expects($this->any())
-             ->method('getCustomOption')
-             ->willReturnMap([['simple_product', false], ['option_ids', false]]);
--        $customOption->expects($this->never())->method('getProduct');
-         $configurableProduct->expects($this->once())->method('getPriceInfo')->willReturn($priceInfo);
-         $priceInfo->expects($this->once())->method('getPrice')->with('final_price')->willReturn($price);
-         $price->expects($this->once())->method('getAmount')->willReturn($amount);
-@@ -60,4 +85,60 @@ class PriceTest extends \PHPUnit\Framework\TestCase
- 
-         $this->assertEquals($finalPrice, $this->model->getFinalPrice($qty, $configurableProduct));
-     }
-+
-+    public function testGetFinalPriceWithSimpleProduct()
-+    {
-+        $finalPrice = 10;
-+        $qty = 1;
-+        $customerGroupId = 1;
-+
-+        /** @var Product|MockObject $configurableProduct */
-+        $configurableProduct = $this->createPartialMock(
-+            Product::class,
-+            ['getCustomOption', 'setFinalPrice', 'getCustomerGroupId']
-+        );
-+        /** @var Option|MockObject $customOption */
-+        $customOption = $this->createPartialMock(
-+            Option::class,
-+            ['getProduct']
-+        );
-+        /** @var Product|MockObject $simpleProduct */
-+        $simpleProduct = $this->createPartialMock(
-+            Product::class,
-+            ['setCustomerGroupId', 'setFinalPrice', 'getPrice', 'getTierPrice', 'getData', 'getCustomOption']
-+        );
-+
-+        $configurableProduct->method('getCustomOption')
-+            ->willReturnMap([
-+                ['simple_product', $customOption],
-+                ['option_ids', false]
-+            ]);
-+        $configurableProduct->method('getCustomerGroupId')->willReturn($customerGroupId);
-+        $configurableProduct->expects($this->atLeastOnce())
-+            ->method('setFinalPrice')
-+            ->with($finalPrice)
-+            ->willReturnSelf();
-+        $customOption->method('getProduct')->willReturn($simpleProduct);
-+        $simpleProduct->expects($this->atLeastOnce())
-+            ->method('setCustomerGroupId')
-+            ->with($customerGroupId)
-+            ->willReturnSelf();
-+        $simpleProduct->method('getPrice')->willReturn($finalPrice);
-+        $simpleProduct->method('getTierPrice')->with($qty)->willReturn($finalPrice);
-+        $simpleProduct->expects($this->atLeastOnce())
-+            ->method('setFinalPrice')
-+            ->with($finalPrice)
-+            ->willReturnSelf();
-+        $simpleProduct->method('getData')->with('final_price')->willReturn($finalPrice);
-+        $simpleProduct->method('getCustomOption')->with('option_ids')->willReturn(false);
-+        $this->eventManagerMock->expects($this->once())
-+            ->method('dispatch')
-+            ->with('catalog_product_get_final_price', ['product' => $simpleProduct, 'qty' => $qty]);
-+
-+        $this->assertEquals(
-+            $finalPrice,
-+            $this->model->getFinalPrice($qty, $configurableProduct),
-+            'The final price calculation is wrong'
-+        );
-+    }
- }
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
-index 5e9399ddd3d..c351d12fa81 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
-+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
-@@ -11,10 +11,13 @@ use Magento\Catalog\Model\Config;
- use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
- use Magento\ConfigurableProduct\Model\Product\Type\Collection\SalableProcessor;
- use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
- use Magento\ConfigurableProduct\Model\Product\Type\Configurable\AttributeFactory;
- use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection;
- use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory;
- use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ProductCollection;
-+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory
-+    as ProductCollectionFactory;
- use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\ConfigurableFactory;
- use Magento\Customer\Model\Session;
- use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
-@@ -153,9 +156,7 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->setMethods(['create'])
-             ->getMock();
--        $this->productCollectionFactory = $this->getMockBuilder(
--            \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory::class
--        )
-+        $this->productCollectionFactory = $this->getMockBuilder(ProductCollectionFactory::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['create'])
-             ->getMock();
-@@ -197,11 +198,6 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->productFactory = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterfaceFactory::class)
--            ->setMethods(['create'])
--            ->disableOriginalConstructor()
--            ->getMock();
--
-         $this->salableProcessor = $this->createMock(SalableProcessor::class);
- 
-         $this->model = $this->objectHelper->getObject(
-@@ -286,9 +282,7 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-         $product->expects($this->atLeastOnce())
-             ->method('getData')
-             ->willReturnMap($dataMap);
--        $attribute = $this->getMockBuilder(
--            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class
--        )
-+        $attribute = $this->getMockBuilder(Attribute::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['addData', 'setStoreId', 'setProductId', 'save', '__wakeup', '__sleep'])
-             ->getMock();
-@@ -385,7 +379,7 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-                     ['_cache_instance_used_product_attributes', null, []]
-                 ]
-             );
--
-+        $this->catalogConfig->expects($this->any())->method('getProductAttributes')->willReturn([]);
-         $productCollection->expects($this->atLeastOnce())->method('addAttributeToSelect')->willReturnSelf();
-         $productCollection->expects($this->once())->method('setProductFilter')->willReturnSelf();
-         $productCollection->expects($this->atLeastOnce())->method('setFlag')->willReturnSelf();
-@@ -470,9 +464,7 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-         $eavAttribute->expects($this->once())->method('getSource')->willReturn($attributeSource);
-         $eavAttribute->expects($this->atLeastOnce())->method('getStoreLabel')->willReturn('Store Label');
- 
--        $attribute = $this->getMockBuilder(
--            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class
--        )
-+        $attribute = $this->getMockBuilder(Attribute::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['getProductAttribute', '__wakeup', '__sleep'])
-             ->getMock();
-@@ -515,17 +507,34 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
-+    public function testGetConfigurableAttributesNewProduct()
-+    {
-+        $configurableAttributes = '_cache_instance_configurable_attributes';
-+
-+        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $product */
-+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-+            ->setMethods(['hasData', 'getId'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $product->expects($this->once())->method('hasData')->with($configurableAttributes)->willReturn(false);
-+        $product->expects($this->once())->method('getId')->willReturn(null);
-+
-+        $this->assertEquals([], $this->model->getConfigurableAttributes($product));
-+    }
-+
-     public function testGetConfigurableAttributes()
-     {
-         $configurableAttributes = '_cache_instance_configurable_attributes';
- 
-         /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $product */
-         $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
--            ->setMethods(['getData', 'hasData', 'setData'])
-+            ->setMethods(['getData', 'hasData', 'setData', 'getId'])
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-         $product->expects($this->once())->method('hasData')->with($configurableAttributes)->willReturn(false);
-+        $product->expects($this->once())->method('getId')->willReturn(1);
- 
-         $attributeCollection = $this->getMockBuilder(Collection::class)
-             ->setMethods(['setProductFilter', 'orderByPosition', 'load'])
-@@ -581,9 +590,7 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(['__wakeup', 'getAttributeCode', 'getOptions', 'hasData', 'getData'])
-             ->disableOriginalConstructor()
-             ->getMock();
--        $attributeMock = $this->getMockBuilder(
--            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class
--        )
-+        $attributeMock = $this->getMockBuilder(Attribute::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-@@ -689,7 +696,7 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
-         $usedAttributeMock = $this->getMockBuilder(
--            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class
-+            Attribute::class
-         )
-             ->setMethods(['getProductAttribute'])
-             ->disableOriginalConstructor()
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
-index 9802c97372b..537288618b6 100644
---- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
-+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
-@@ -112,8 +112,8 @@ class OptionSelectBuilderTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->select->expects($this->exactly(1))->method('from')->willReturnSelf();
-         $this->select->expects($this->exactly(1))->method('columns')->willReturnSelf();
--        $this->select->expects($this->exactly(6))->method('joinInner')->willReturnSelf();
--        $this->select->expects($this->exactly(3))->method('joinLeft')->willReturnSelf();
-+        $this->select->expects($this->exactly(5))->method('joinInner')->willReturnSelf();
-+        $this->select->expects($this->exactly(4))->method('joinLeft')->willReturnSelf();
-         $this->select->expects($this->exactly(1))->method('order')->willReturnSelf();
-         $this->select->expects($this->exactly(2))->method('where')->willReturnSelf();
- 
-@@ -156,8 +156,8 @@ class OptionSelectBuilderTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->select->expects($this->exactly(1))->method('from')->willReturnSelf();
-         $this->select->expects($this->exactly(0))->method('columns')->willReturnSelf();
--        $this->select->expects($this->exactly(6))->method('joinInner')->willReturnSelf();
--        $this->select->expects($this->exactly(1))->method('joinLeft')->willReturnSelf();
-+        $this->select->expects($this->exactly(5))->method('joinInner')->willReturnSelf();
-+        $this->select->expects($this->exactly(2))->method('joinLeft')->willReturnSelf();
-         $this->select->expects($this->exactly(1))->method('order')->willReturnSelf();
-         $this->select->expects($this->exactly(2))->method('where')->willReturnSelf();
- 
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolverTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolverTest.php
-new file mode 100644
-index 00000000000..7ec2ce370ac
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolverTest.php
-@@ -0,0 +1,82 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\ConfigurableProduct\Test\Unit\Plugin\Catalog\Model\Product\Pricing\Renderer;
-+
-+use Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver;
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as TypeConfigurable;
-+use Magento\ConfigurableProduct\Plugin\Catalog\Model\Product\Pricing\Renderer\SalableResolver as SalableResolverPlugin;
-+use Magento\Framework\Pricing\SaleableInterface;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class SalableResolverTest extends TestCase
-+{
-+    /**
-+     * @var TypeConfigurable|MockObject
-+     */
-+    private $typeConfigurable;
-+
-+    /**
-+     * @var SalableResolverPlugin
-+     */
-+    private $salableResolver;
-+
-+    protected function setUp()
-+    {
-+        $this->typeConfigurable = $this->createMock(TypeConfigurable::class);
-+        $this->salableResolver = new SalableResolverPlugin($this->typeConfigurable);
-+    }
-+
-+    /**
-+     * @param SaleableInterface|MockObject $salableItem
-+     * @param bool $isSalable
-+     * @param bool $typeIsSalable
-+     * @param bool $expectedResult
-+     * @return void
-+     * @dataProvider afterIsSalableDataProvider
-+     */
-+    public function testAfterIsSalable($salableItem, bool $isSalable, bool $typeIsSalable, bool $expectedResult): void
-+    {
-+        $salableResolver = $this->createMock(SalableResolver::class);
-+
-+        $this->typeConfigurable->method('isSalable')
-+            ->willReturn($typeIsSalable);
-+
-+        $result = $this->salableResolver->afterIsSalable($salableResolver, $isSalable, $salableItem);
-+        $this->assertEquals($expectedResult, $result);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function afterIsSalableDataProvider(): array
-+    {
-+        $simpleSalableItem = $this->createMock(SaleableInterface::class);
-+        $simpleSalableItem->expects($this->once())
-+            ->method('getTypeId')
-+            ->willReturn('simple');
-+
-+        $configurableSalableItem = $this->createMock(SaleableInterface::class);
-+        $configurableSalableItem->expects($this->once())
-+            ->method('getTypeId')
-+            ->willReturn('configurable');
-+
-+        return [
-+            [
-+                $simpleSalableItem,
-+                true,
-+                false,
-+                true,
-+            ],
-+            [
-+                $configurableSalableItem,
-+                true,
-+                false,
-+                false,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php
-new file mode 100644
-index 00000000000..80979148c49
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php
-@@ -0,0 +1,226 @@
-+<?php declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\ConfigurableProduct\Test\Unit\Plugin\SalesRule\Model\Rule\Condition;
-+
-+use Magento\Backend\Helper\Data;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product\Type;
-+use Magento\Catalog\Model\ProductFactory;
-+use Magento\Catalog\Model\ResourceModel\Product;
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-+use Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition\Product as ValidatorPlugin;
-+use Magento\Directory\Model\CurrencyFactory;
-+use Magento\Eav\Model\Config;
-+use Magento\Eav\Model\Entity\AbstractEntity;
-+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection;
-+use Magento\Framework\App\ScopeResolverInterface;
-+use Magento\Framework\Locale\Format;
-+use Magento\Framework\Locale\FormatInterface;
-+use Magento\Framework\Locale\ResolverInterface;
-+use Magento\Quote\Model\Quote\Item\AbstractItem;
-+use Magento\Rule\Model\Condition\Context;
-+use Magento\SalesRule\Model\Rule\Condition\Product as SalesRuleProduct;
-+
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.LongVariable)
-+ */
-+class ProductTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var SalesRuleProduct
-+     */
-+    private $validator;
-+
-+    /**
-+     * @var \Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition\Product
-+     */
-+    private $validatorPlugin;
-+
-+    public function setUp()
-+    {
-+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $this->validator = $this->createValidator();
-+        $this->validatorPlugin = $this->objectManager->getObject(ValidatorPlugin::class);
-+    }
-+
-+    /**
-+     * @return \Magento\SalesRule\Model\Rule\Condition\Product
-+     */
-+    private function createValidator(): SalesRuleProduct
-+    {
-+        /** @var Context|\PHPUnit_Framework_MockObject_MockObject $contextMock */
-+        $contextMock = $this->getMockBuilder(Context::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        /** @var Data|\PHPUnit_Framework_MockObject_MockObject $backendHelperMock */
-+        $backendHelperMock = $this->getMockBuilder(Data::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        /** @var Config|\PHPUnit_Framework_MockObject_MockObject $configMock */
-+        $configMock = $this->getMockBuilder(Config::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        /** @var ProductFactory|\PHPUnit_Framework_MockObject_MockObject $productFactoryMock */
-+        $productFactoryMock = $this->getMockBuilder(ProductFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        /** @var ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject $productRepositoryMock */
-+        $productRepositoryMock = $this->getMockBuilder(ProductRepositoryInterface::class)
-+            ->getMockForAbstractClass();
-+        $attributeLoaderInterfaceMock = $this->getMockBuilder(AbstractEntity::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributesByCode'])
-+            ->getMock();
-+        $attributeLoaderInterfaceMock
-+            ->expects($this->any())
-+            ->method('getAttributesByCode')
-+            ->willReturn([]);
-+        /** @var Product|\PHPUnit_Framework_MockObject_MockObject $productMock */
-+        $productMock = $this->getMockBuilder(Product::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['loadAllAttributes', 'getConnection', 'getTable'])
-+            ->getMock();
-+        $productMock->expects($this->any())
-+        ->method('loadAllAttributes')
-+        ->willReturn($attributeLoaderInterfaceMock);
-+        /** @var Collection|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
-+        $collectionMock = $this->getMockBuilder(Collection::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        /** @var FormatInterface|\PHPUnit_Framework_MockObject_MockObject $formatMock */
-+        $formatMock = new Format(
-+            $this->getMockBuilder(ScopeResolverInterface::class)->disableOriginalConstructor()->getMock(),
-+            $this->getMockBuilder(ResolverInterface::class)->disableOriginalConstructor()->getMock(),
-+            $this->getMockBuilder(CurrencyFactory::class)->disableOriginalConstructor()->getMock()
-+        );
-+
-+        return new SalesRuleProduct(
-+            $contextMock,
-+            $backendHelperMock,
-+            $configMock,
-+            $productFactoryMock,
-+            $productRepositoryMock,
-+            $productMock,
-+            $collectionMock,
-+            $formatMock
-+        );
-+    }
-+
-+    public function testChildIsUsedForValidation()
-+    {
-+        $configurableProductMock = $this->createProductMock();
-+        $configurableProductMock
-+            ->expects($this->any())
-+            ->method('getTypeId')
-+            ->willReturn(Configurable::TYPE_CODE);
-+        $configurableProductMock
-+            ->expects($this->any())
-+            ->method('hasData')
-+            ->with($this->equalTo('special_price'))
-+            ->willReturn(false);
-+
-+        /* @var AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
-+        $item = $this->getMockBuilder(AbstractItem::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setProduct', 'getProduct', 'getChildren'])
-+            ->getMockForAbstractClass();
-+        $item->expects($this->any())
-+            ->method('getProduct')
-+            ->willReturn($configurableProductMock);
-+
-+        $simpleProductMock = $this->createProductMock();
-+        $simpleProductMock
-+            ->expects($this->any())
-+            ->method('getTypeId')
-+            ->willReturn(Type::TYPE_SIMPLE);
-+        $simpleProductMock
-+            ->expects($this->any())
-+            ->method('hasData')
-+            ->with($this->equalTo('special_price'))
-+            ->willReturn(true);
-+
-+        $childItem = $this->getMockBuilder(AbstractItem::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getProduct'])
-+            ->getMockForAbstractClass();
-+        $childItem->expects($this->any())
-+            ->method('getProduct')
-+            ->willReturn($simpleProductMock);
-+
-+        $item->expects($this->any())
-+            ->method('getChildren')
-+            ->willReturn([$childItem]);
-+        $item->expects($this->once())
-+            ->method('setProduct')
-+            ->with($simpleProductMock);
-+
-+        $this->validator->setAttribute('special_price');
-+
-+        $this->validatorPlugin->beforeValidate($this->validator, $item);
-+    }
-+
-+    /**
-+     * @return Product|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private function createProductMock(): \PHPUnit_Framework_MockObject_MockObject
-+    {
-+        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods([
-+                'getAttribute',
-+                'getId',
-+                'setQuoteItemQty',
-+                'setQuoteItemPrice',
-+                'getTypeId',
-+                'hasData',
-+            ])
-+            ->getMock();
-+        $productMock
-+            ->expects($this->any())
-+            ->method('setQuoteItemQty')
-+            ->willReturnSelf();
-+        $productMock
-+            ->expects($this->any())
-+            ->method('setQuoteItemPrice')
-+            ->willReturnSelf();
-+
-+        return $productMock;
-+    }
-+
-+    public function testChildIsNotUsedForValidation()
-+    {
-+        $simpleProductMock = $this->createProductMock();
-+        $simpleProductMock
-+            ->expects($this->any())
-+            ->method('getTypeId')
-+            ->willReturn(Type::TYPE_SIMPLE);
-+        $simpleProductMock
-+            ->expects($this->any())
-+            ->method('hasData')
-+            ->with($this->equalTo('special_price'))
-+            ->willReturn(true);
-+
-+        /* @var AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
-+        $item = $this->getMockBuilder(AbstractItem::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setProduct', 'getProduct'])
-+            ->getMockForAbstractClass();
-+        $item->expects($this->any())
-+            ->method('getProduct')
-+            ->willReturn($simpleProductMock);
-+
-+        $this->validator->setAttribute('special_price');
-+
-+        $this->validatorPlugin->beforeValidate($this->validator, $item);
-+    }
-+}
-diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
-new file mode 100644
-index 00000000000..1a5c6c0003b
---- /dev/null
-+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
-@@ -0,0 +1,94 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ConfigurableProduct\Test\Unit\Plugin\Tax\Model\Sales\Total\Quote;
-+
-+use Magento\Catalog\Model\Product;
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-+use Magento\ConfigurableProduct\Plugin\Tax\Model\Sales\Total\Quote\CommonTaxCollector as CommonTaxCollectorPlugin;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Quote\Model\Quote\Item\AbstractItem;
-+use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
-+use Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory;
-+use Magento\Tax\Api\Data\TaxClassKeyInterface;
-+use Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector;
-+use PHPUnit\Framework\MockObject\MockObject;
-+
-+/**
-+ * Test for CommonTaxCollector plugin
-+ */
-+class CommonTaxCollectorTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var CommonTaxCollectorPlugin
-+     */
-+    private $commonTaxCollectorPlugin;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setUp()
-+    {
-+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $this->commonTaxCollectorPlugin = $this->objectManager->getObject(CommonTaxCollectorPlugin::class);
-+    }
-+
-+    /**
-+     * Test to apply Tax Class Id from child item for configurable product
-+     */
-+    public function testAfterMapItem()
-+    {
-+        $childTaxClassId = 10;
-+
-+        /** @var Product|MockObject $childProductMock */
-+        $childProductMock = $this->createPartialMock(
-+            Product::class,
-+            ['getTaxClassId']
-+        );
-+        $childProductMock->method('getTaxClassId')->willReturn($childTaxClassId);
-+        /* @var AbstractItem|MockObject $quoteItemMock */
-+        $childQuoteItemMock = $this->createMock(
-+            AbstractItem::class
-+        );
-+        $childQuoteItemMock->method('getProduct')->willReturn($childProductMock);
-+
-+        /** @var Product|MockObject $productMock */
-+        $productMock = $this->createPartialMock(
-+            Product::class,
-+            ['getTypeId']
-+        );
-+        $productMock->method('getTypeId')->willReturn(Configurable::TYPE_CODE);
-+        /* @var AbstractItem|MockObject $quoteItemMock */
-+        $quoteItemMock = $this->createPartialMock(
-+            AbstractItem::class,
-+            ['getProduct', 'getHasChildren', 'getChildren', 'getQuote', 'getAddress', 'getOptionByCode']
-+        );
-+        $quoteItemMock->method('getProduct')->willReturn($productMock);
-+        $quoteItemMock->method('getHasChildren')->willReturn(true);
-+        $quoteItemMock->method('getChildren')->willReturn([$childQuoteItemMock]);
-+
-+        /* @var TaxClassKeyInterface|MockObject $taxClassObjectMock */
-+        $taxClassObjectMock = $this->createMock(TaxClassKeyInterface::class);
-+        $taxClassObjectMock->expects($this->once())->method('setValue')->with($childTaxClassId);
-+
-+        /* @var QuoteDetailsItemInterface|MockObject $quoteDetailsItemMock */
-+        $quoteDetailsItemMock = $this->createMock(QuoteDetailsItemInterface::class);
-+        $quoteDetailsItemMock->method('getTaxClassKey')->willReturn($taxClassObjectMock);
-+
-+        $this->commonTaxCollectorPlugin->afterMapItem(
-+            $this->createMock(CommonTaxCollector::class),
-+            $quoteDetailsItemMock,
-+            $this->createMock(QuoteDetailsItemInterfaceFactory::class),
-+            $quoteItemMock
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
-index fbab25ff1be..e0cc83922e0 100644
---- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
-+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
-@@ -5,14 +5,14 @@
-  */
- namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
- 
-+use Magento\Catalog\Model\Locator\LocatorInterface;
- use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
- use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
-+use Magento\Framework\UrlInterface;
- use Magento\Ui\Component\Container;
--use Magento\Ui\Component\Form;
- use Magento\Ui\Component\DynamicRows;
-+use Magento\Ui\Component\Form;
- use Magento\Ui\Component\Modal;
--use Magento\Framework\UrlInterface;
--use Magento\Catalog\Model\Locator\LocatorInterface;
- 
- /**
-  * Data provider for Configurable panel
-@@ -90,7 +90,7 @@ class ConfigurablePanel extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function modifyData(array $data)
-     {
-@@ -98,7 +98,7 @@ class ConfigurablePanel extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-     public function modifyMeta(array $meta)
-@@ -197,7 +197,7 @@ class ConfigurablePanel extends AbstractModifier
-                                         'autoRender' => false,
-                                         'componentType' => 'insertListing',
-                                         'component' => 'Magento_ConfigurableProduct/js'
--                                            .'/components/associated-product-insert-listing',
-+                                            . '/components/associated-product-insert-listing',
-                                         'dataScope' => $this->associatedListingPrefix
-                                             . static::ASSOCIATED_PRODUCT_LISTING,
-                                         'externalProvider' => $this->associatedListingPrefix
-@@ -328,14 +328,12 @@ class ConfigurablePanel extends AbstractModifier
-                                 'component' => 'Magento_Ui/js/form/components/button',
-                                 'actions' => [
-                                     [
--                                        'targetName' =>
--                                            $this->dataScopeName . '.configurableModal',
-+                                        'targetName' => $this->dataScopeName . '.configurableModal',
-                                         'actionName' => 'trigger',
-                                         'params' => ['active', true],
-                                     ],
-                                     [
--                                        'targetName' =>
--                                            $this->dataScopeName . '.configurableModal',
-+                                        'targetName' => $this->dataScopeName . '.configurableModal',
-                                         'actionName' => 'openModal',
-                                     ],
-                                 ],
-@@ -471,8 +469,7 @@ class ConfigurablePanel extends AbstractModifier
-                         'sku',
-                         __('SKU'),
-                         [
--                            'validation' =>
--                                [
-+                            'validation' => [
-                                     'required-entry' => true,
-                                     'max_text_length' => Sku::SKU_MAX_LENGTH,
-                                 ],
-@@ -577,6 +574,7 @@ class ConfigurablePanel extends AbstractModifier
-             'dataType' => Form\Element\DataType\Text::NAME,
-             'dataScope' => $name,
-             'visibleIfCanEdit' => false,
-+            'labelVisible' => false,
-             'imports' => [
-                 'visible' => '!${$.provider}:${$.parentScope}.canEdit'
-             ],
-@@ -595,6 +593,7 @@ class ConfigurablePanel extends AbstractModifier
-             'component' => 'Magento_Ui/js/form/components/group',
-             'label' => $label,
-             'dataScope' => '',
-+            'showLabel' => false
-         ];
-         $container['children'] = [
-             $name . '_edit' => $fieldEdit,
-diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
-index b03a8a65702..76096fd6bdf 100644
---- a/app/code/Magento/ConfigurableProduct/composer.json
-+++ b/app/code/Magento/ConfigurableProduct/composer.json
-@@ -22,9 +22,11 @@
-         "magento/module-msrp": "*",
-         "magento/module-webapi": "*",
-         "magento/module-sales": "*",
-+        "magento/module-sales-rule": "*",
-         "magento/module-product-video": "*",
-         "magento/module-configurable-sample-data": "*",
--        "magento/module-product-links-sample-data": "*"
-+        "magento/module-product-links-sample-data": "*",
-+        "magento/module-tax": "*"
-     },
-     "type": "magento2-module",
-     "license": [
-diff --git a/app/code/Magento/ConfigurableProduct/etc/db_schema.xml b/app/code/Magento/ConfigurableProduct/etc/db_schema.xml
-index 7c6661a5f39..d6917e8c184 100644
---- a/app/code/Magento/ConfigurableProduct/etc/db_schema.xml
-+++ b/app/code/Magento/ConfigurableProduct/etc/db_schema.xml
-@@ -17,13 +17,13 @@
-                 default="0" comment="Attribute ID"/>
-         <column xsi:type="smallint" name="position" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Position"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="product_super_attribute_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_SPR_ATTR_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_SPR_ATTR_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_super_attribute" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_SUPER_ATTRIBUTE_PRODUCT_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_SUPER_ATTRIBUTE_PRODUCT_ID_ATTRIBUTE_ID">
-             <column name="product_id"/>
-             <column name="attribute_id"/>
-         </constraint>
-@@ -39,21 +39,21 @@
-         <column xsi:type="smallint" name="use_default" padding="5" unsigned="true" nullable="true" identity="false"
-                 default="0" comment="Use Default Value"/>
-         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="FK_309442281DF7784210ED82B2CC51E5D5"
-+        <constraint xsi:type="foreign" referenceId="FK_309442281DF7784210ED82B2CC51E5D5"
-                     table="catalog_product_super_attribute_label" column="product_super_attribute_id"
-                     referenceTable="catalog_product_super_attribute" referenceColumn="product_super_attribute_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CATALOG_PRODUCT_SUPER_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_SUPER_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID"
-                     table="catalog_product_super_attribute_label" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CAT_PRD_SPR_ATTR_LBL_PRD_SPR_ATTR_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CAT_PRD_SPR_ATTR_LBL_PRD_SPR_ATTR_ID_STORE_ID">
-             <column name="product_super_attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_SUPER_ATTRIBUTE_LABEL_STORE_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_SUPER_ATTRIBUTE_LABEL_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -65,20 +65,20 @@
-                 default="0" comment="Product ID"/>
-         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Parent ID"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="link_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CAT_PRD_SPR_LNK_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_SPR_LNK_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_super_link" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_SPR_LNK_PARENT_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_SPR_LNK_PARENT_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="catalog_product_super_link" column="parent_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CATALOG_PRODUCT_SUPER_LINK_PRODUCT_ID_PARENT_ID">
-+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_SUPER_LINK_PRODUCT_ID_PARENT_ID">
-             <column name="product_id"/>
-             <column name="parent_id"/>
-         </constraint>
--        <index name="CATALOG_PRODUCT_SUPER_LINK_PARENT_ID" indexType="btree">
-+        <index referenceId="CATALOG_PRODUCT_SUPER_LINK_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
-index a16feacc4f9..8cec84abc4f 100644
---- a/app/code/Magento/ConfigurableProduct/etc/di.xml
-+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
-@@ -125,6 +125,13 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Sales\Model\Order\ProductOption">
-+        <arguments>
-+            <argument name="processorPool" xsi:type="array">
-+                <item name="configurable" xsi:type="object">Magento\ConfigurableProduct\Model\ProductOptionProcessor</item>
-+            </argument>
-+        </arguments>
-+    </type>
-     <virtualType name="ConfigurableFinalPriceResolver" type="Magento\ConfigurableProduct\Pricing\Price\ConfigurablePriceResolver">
-         <arguments>
-             <argument name="priceResolver" xsi:type="object">Magento\ConfigurableProduct\Pricing\Price\FinalPriceResolver</argument>
-@@ -197,6 +204,13 @@
-             <argument name="productIndexer" xsi:type="object">Magento\Catalog\Model\Indexer\Product\Full</argument>
-         </arguments>
-     </type>
-+    <virtualType name="LinkedProductSelectBuilderByIndexMinPrice" type="Magento\ConfigurableProduct\Model\ResourceModel\Product\LinkedProductSelectBuilderComposite">
-+        <arguments>
-+            <argument name="linkedProductSelectBuilder" xsi:type="array">
-+                <item name="indexPrice" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\Indexer\LinkedProductSelectBuilderByIndexPrice</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-     <type name="Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProvider">
-         <arguments>
-             <argument name="linkedProductSelectBuilder" xsi:type="object">Magento\ConfigurableProduct\Model\ResourceModel\Product\LinkedProductSelectBuilder</argument>
-@@ -205,6 +219,7 @@
-     <type name="Magento\ConfigurableProduct\Model\ResourceModel\Product\LinkedProductSelectBuilder">
-         <arguments>
-             <argument name="baseSelectProcessor" xsi:type="object">Magento\ConfigurableProduct\Model\ResourceModel\Product\StockStatusBaseSelectProcessor</argument>
-+            <argument name="linkedProductSelectBuilder" xsi:type="object">LinkedProductSelectBuilderByIndexMinPrice</argument>
-         </arguments>
-     </type>
-     <type name="Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver">
-@@ -220,4 +235,31 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\SalesRule\Model\Quote\ChildrenValidationLocator">
-+        <arguments>
-+            <argument name="productTypeChildrenValidationMap" xsi:type="array">
-+                <item name="configurable" xsi:type="boolean">false</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\SalesRule\Model\Rule\Condition\Product">
-+        <plugin name="apply_rule_on_configurable_children" type="Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition\Product" />
-+    </type>
-+    <type name="Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector">
-+        <plugin name="apply_tax_class_id" type="Magento\ConfigurableProduct\Plugin\Tax\Model\Sales\Total\Quote\CommonTaxCollector" />
-+    </type>
-+    <type name="Magento\Eav\Model\Entity\Attribute\Group">
-+        <arguments>
-+            <argument name="reservedSystemNames" xsi:type="array">
-+                <item name="configurable" xsi:type="string">configurable</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\CatalogInventory\Observer\SaveInventoryDataObserver">
-+        <arguments>
-+            <argument name="parentItemProcessorPool" xsi:type="array">
-+                <item name="configurable" xsi:type="object"> Magento\ConfigurableProduct\Model\Inventory\ParentItemProcessor</item>
-+            </argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
-index bb830c36b92..df96829b354 100644
---- a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
-+++ b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
-@@ -10,4 +10,7 @@
-     <type name="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface">
-         <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_InStockOptionSelectBuilder" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder"/>
-     </type>
-+    <type name="Magento\Catalog\Model\Product">
-+        <plugin name="product_identities_extender" type="Magento\ConfigurableProduct\Model\Plugin\Frontend\ProductIdentitiesExtender" />
-+    </type>
- </config>
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
-index 110defd5248..9307da21e66 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
-@@ -8,7 +8,7 @@
- <script>
- (function ($) {
- 
--    var data = <?= /* @escapeNotVerified */ $block->getAttributesBlockJson() ?>;
-+    var data = <?= /* @noEscape */ $block->getAttributesBlockJson() ?>;
-     var set = data.set || {id: $('#attribute_set_id').val()};
-     if (data.tab == 'variations') {
-         $('[data-role=product-variations-matrix]').trigger('add', data.attribute);
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
-index 9c4612c972d..5f49d5eb474 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
-@@ -5,8 +5,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <script>
- require([
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
-index a8712cdc183..1166adca972 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
-@@ -3,39 +3,36 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-- ?>
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+?>
- 
- <?php /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Composite\Fieldset\Configurable */ ?>
- <?php $_product = $block->getProduct(); ?>
- <?php $_attributes = $block->decorateArray($block->getAllowAttributes()); ?>
--<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
--<?php if (($_product->isSaleable() || $_skipSaleableCheck) && count($_attributes)):?>
-+<?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
-+<?php if (($_product->isSaleable() || $_skipSaleableCheck) && count($_attributes)) :?>
- <fieldset id="catalog_product_composite_configure_fields_configurable" class="fieldset admin__fieldset">
-     <legend class="legend admin__legend">
--        <span><?= /* @escapeNotVerified */ __('Associated Products') ?></span>
-+        <span><?= $block->escapeHtml(__('Associated Products')) ?></span>
-     </legend>
--    <div class="product-options">
--        <div class="field admin__field _required required">
--            <?php foreach ($_attributes as $_attribute): ?>
--                <label class="label admin__field-label"><?php
--                    /* @escapeNotVerified */ echo $_attribute->getProductAttribute()
--                        ->getStoreLabel($_product->getStoreId());
--                    ?></label>
-+    <div class="product-options fieldset admin__fieldset">
-+        <?php foreach ($_attributes as $_attribute) : ?>
-+            <div class="field admin__field _required required">
-+                <label class="label admin__field-label"><?=
-+                    $block->escapeHtml($_attribute->getProductAttribute()->getStoreLabel($_product->getStoreId()));
-+                ?></label>
-                 <div class="control admin__field-control <?php
--                    if ($_attribute->getDecoratedIsLast()):
--                        ?> last<?php
-+                if ($_attribute->getDecoratedIsLast()) :
-+                    ?> last<?php
-                     endif; ?>">
--                    <select name="super_attribute[<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>]"
--                            id="attribute<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>"
-+                    <select name="super_attribute[<?= $block->escapeHtmlAttr($_attribute->getAttributeId()) ?>]"
-+                            id="attribute<?= $block->escapeHtmlAttr($_attribute->getAttributeId()) ?>"
-                             class="admin__control-select required-entry super-attribute-select">
--                        <option><?= /* @escapeNotVerified */ __('Choose an Option...') ?></option>
-+                        <option><?= $block->escapeHtml(__('Choose an Option...')) ?></option>
-                     </select>
-                 </div>
--            <?php endforeach; ?>
--        </div>
-+            </div>
-+        <?php endforeach; ?>
-     </div>
- </fieldset>
- <script>
-@@ -44,7 +41,7 @@ require([
-     "Magento_Catalog/catalog/product/composite/configure"
- ], function(){
- 
--    var config = <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>;
-+    var config = <?= /* @noEscape */ $block->getJsonConfig() ?>;
-     if (window.productConfigure) {
-         config.containerId = window.productConfigure.blockFormFields.id;
-         if (window.productConfigure.restorePhase) {
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
-index cc254740491..e996df82607 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
-@@ -4,18 +4,16 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\AttributeValues */
- ?>
- <div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'">
-     <h2 class="steps-wizard-title"><?= $block->escapeHtml(
--            __('Step 2: Attribute Values')
--        ); ?></h2>
-+        __('Step 2: Attribute Values')
-+    ); ?></h2>
-     <div class="steps-wizard-info">
-         <span><?= $block->escapeHtml(
--                __('Select values from each attribute to include in this product. Each unique combination of values creates a unique product SKU.')
--            );?></span>
-+            __('Select values from each attribute to include in this product. Each unique combination of values creates a unique product SKU.')
-+        );?></span>
-     </div>
-     <div data-bind="foreach: attributes, sortableList: attributes">
- 
-@@ -41,24 +39,24 @@
-                             data-bind="click: $parent.selectAllAttributes"
-                             title="<?= $block->escapeHtml(__('Select All')) ?>">
-                         <span><?= $block->escapeHtml(
--                                __('Select All')
--                            ); ?></span>
-+                            __('Select All')
-+                        ); ?></span>
-                     </button>
-                     <button type="button"
-                             class="action-deselect-all action-tertiary"
-                             data-bind="click: $parent.deSelectAllAttributes"
-                             title="<?= $block->escapeHtml(__('Deselect All')) ?>">
-                         <span><?= $block->escapeHtml(
--                                __('Deselect All')
--                            ); ?></span>
-+                            __('Deselect All')
-+                        ); ?></span>
-                     </button>
-                     <button type="button"
-                             class="action-remove-all action-tertiary"
-                             data-bind="click: $parent.removeAttribute.bind($parent)"
-                             title="<?= $block->escapeHtml(__('Remove Attribute')) ?>">
-                         <span><?= $block->escapeHtml(
--                                __('Remove Attribute')
--                            ); ?></span>
-+                            __('Remove Attribute')
-+                        ); ?></span>
-                     </button>
-                 </div>
-             </div>
-@@ -74,7 +72,7 @@
-                             <label data-bind="text: label, visible: label, attr:{for:id}"
-                                    class="admin__field-label"></label>
-                         </div>
--                        <div class="admin__field admin__field-create-new" data-bind="visible: !label">
-+                        <div class="admin__field admin__field-create-new" data-bind="attr:{'data-role':id}, visible: !label">
-                             <div class="admin__field-control">
-                                 <input class="admin__control-text"
-                                        name="label"
-@@ -87,8 +85,8 @@
-                                     data-action="save"
-                                     data-bind="click: $parents[1].saveOption.bind($parent)">
-                                 <span><?= $block->escapeHtml(
--                                        __('Save Option')
--                                    ); ?></span>
-+                                    __('Save Option')
-+                                ); ?></span>
-                             </button>
-                             <button type="button"
-                                     class="action-remove"
-@@ -96,8 +94,8 @@
-                                     data-action="remove"
-                                     data-bind="click: $parents[1].removeOption.bind($parent)">
-                                 <span><?= $block->escapeHtml(
--                                        __('Remove Option')
--                                    ); ?></span>
-+                                    __('Remove Option')
-+                                ); ?></span>
-                             </button>
-                         </div>
-                     </li>
-@@ -108,8 +106,8 @@
-                     data-action="addOption"
-                     data-bind="click: $parent.createOption, visible: canCreateOption">
-                 <span><?= $block->escapeHtml(
--                        __('Create New Value')
--                    ); ?></span>
-+                    __('Create New Value')
-+                ); ?></span>
-             </button>
-         </div>
-     </div>
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
-index 9d144b0f569..a792a35da80 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
-@@ -3,24 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\Bulk */
- ?>
- 
- <div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'" data-role="bulk-step">
-     <h2 class="steps-wizard-title"><?= $block->escapeHtml(__('Step 3: Bulk Images, Price and Quantity')) ?></h2>
-     <div class="steps-wizard-info">
--        <?= /* @escapeNotVerified */ __('Based on your selections %1 new products will be created. Use this step to customize images and price for your new products.', '<span class="new-products-count" data-bind="text:countVariations"></span>') ?>
-+        <?= /* @noEscape */ __('Based on your selections %1 new products will be created. Use this step to customize images and price for your new products.', '<span class="new-products-count" data-bind="text:countVariations"></span>') ?>
-     </div>
- 
-     <div data-bind="with: sections().images" class="steps-wizard-section">
-         <div data-role="section">
-             <div class="steps-wizard-section-title">
--            <span><?= $block->escapeHtml(
--                    __('Images')
--                ); ?></span>
-+            <span><?= $block->escapeHtml(__('Images')); ?></span>
-             </div>
- 
-             <ul class="steps-wizard-section-list">
-@@ -32,9 +28,7 @@
-                                value="single"
-                                data-bind="checked:type">
-                         <label for="apply-single-set-radio" class="admin__field-label">
--                        <span><?= $block->escapeHtml(
--                                __('Apply single set of images to all SKUs')
--                            ); ?></span>
-+                            <span><?= $block->escapeHtml(__('Apply single set of images to all SKUs')); ?></span>
-                         </label>
-                     </div>
-                 </li>
-@@ -71,10 +65,7 @@
-                 <div data-role="gallery"
-                      class="gallery"
-                      data-images="[]"
--                     data-types="<?= $block->escapeHtml(
--                         $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
--                     ) ?>"
--                >
-+                     data-types="<?= $block->escapeHtml($this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes())) ?>">
-                     <div class="image image-placeholder">
-                         <div data-role="uploader" class="uploader">
-                             <div class="image-browse">
-@@ -92,15 +83,12 @@
-                         </div>
-                     </div>
- 
--                    <?php foreach ($block->getImageTypes() as $typeData):
--                        ?>
-+                    <?php foreach ($block->getImageTypes() as $typeData) : ?>
-                         <input name="<?= $block->escapeHtml($typeData['name']) ?>"
-                                class="image-<?= $block->escapeHtml($typeData['code']) ?>"
-                                type="hidden"
-                                value="<?= $block->escapeHtml($typeData['value']) ?>"/>
--                        <?php
--                    endforeach;
--                    ?>
-+                        <?php endforeach; ?>
- 
-                     <script data-template="uploader" type="text/x-magento-template">
-                         <div id="<%- data.id %>" class="file-row">
-@@ -155,19 +143,12 @@
-                                 </div>
-                             </div>
-                             <ul class="item-roles" data-role="roles-labels">
--                                <?php
--                                foreach ($block->getMediaAttributes() as $attribute):
--                                    ?>
--                                    <li data-role-code="<?= $block->escapeHtml(
--                                        $attribute->getAttributeCode()
--                                    ) ?>" class="item-role item-role-<?= $block->escapeHtml(
--                                        $attribute->getAttributeCode()
--                                    ) ?>">
-+                                <?php foreach ($block->getMediaAttributes() as $attribute) :?>
-+                                    <li data-role-code="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
-+                                        class="item-role item-role-<?= $block->escapeHtml($attribute->getAttributeCode()) ?>">
-                                         <?= /* @noEscape */ $attribute->getFrontendLabel() ?>
-                                     </li>
--                                    <?php
--                                endforeach;
--                                ?>
-+                                    <?php endforeach; ?>
-                             </ul>
-                         </div>
-                     </script>
-@@ -229,9 +210,7 @@
- 
-                                 <div class="admin__field field-image-role">
-                                     <label class="admin__field-label">
--                                    <span><?= $block->escapeHtml(
--                                            __('Role')
--                                        ); ?></span>
-+                                    <span><?= $block->escapeHtml(__('Role')); ?></span>
-                                     </label>
-                                     <div class="admin__field-control">
-                                         <ul class="multiselect-alt">
-@@ -243,42 +222,28 @@
-                                                         <input class="image-type"
-                                                                data-role="type-selector"
-                                                                type="checkbox"
--                                                               value="<?= $block->escapeHtml(
--                                                                   $attribute->getAttributeCode()
--                                                               ) ?>"
-+                                                               value="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
-                                                         />
--                                                        <?= $block->escapeHtml(
--                                                            $attribute->getFrontendLabel()
--                                                        ); ?>
-+                                                        <?= $block->escapeHtml($attribute->getFrontendLabel()); ?>
-                                                     </label>
-                                                 </li>
--                                                <?php
--                                            endforeach;
--                                            ?>
-+                                                <?php endforeach; ?>
-                                         </ul>
-                                     </div>
-                                 </div>
- 
-                                 <div class="admin__field admin__field-inline field-image-size" data-role="size">
-                                     <label class="admin__field-label">
--                                    <span><?= $block->escapeHtml(
--                                            __('Image Size')
--                                        ); ?></span>
-+                                    <span><?= $block->escapeHtml(__('Image Size')); ?></span>
-                                     </label>
--                                    <div class="admin__field-value" data-message="<?= $block->escapeHtml(
--                                        __('{size}')
--                                    );?>"></div>
-+                                    <div class="admin__field-value" data-message="<?= $block->escapeHtml(__('{size}'));?>"></div>
-                                 </div>
- 
-                                 <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
-                                     <label class="admin__field-label">
--                                    <span><?= $block->escapeHtml(
--                                            __('Image Resolution')
--                                        ); ?></span>
-+                                    <span><?= $block->escapeHtml(__('Image Resolution')); ?></span>
-                                     </label>
--                                    <div class="admin__field-value" data-message="<?= $block->escapeHtml(
--                                        __('{width}^{height} px')
--                                    );?>"></div>
-+                                    <div class="admin__field-value" data-message="<?= $block->escapeHtml(__('{width}^{height} px'));?>"></div>
-                                 </div>
- 
-                                 <div class="admin__field field-image-hide">
-@@ -293,9 +258,7 @@
-                                             <% if (data.disabled == 1) { %>checked="checked"<% } %> />
- 
-                                             <label for="hide-from-product-page" class="admin__field-label">
--                                                <?= $block->escapeHtml(
--                                                    __('Hide from Product Page')
--                                                ); ?>
-+                                                <?= $block->escapeHtml(__('Hide from Product Page')); ?>
-                                             </label>
-                                         </div>
-                                     </div>
-@@ -310,9 +273,7 @@
-                 <fieldset class="admin__fieldset bulk-attribute-values">
-                     <div class="admin__field _required">
-                         <label class="admin__field-label" for="apply-images-attributes">
--                        <span><?= $block->escapeHtml(
--                                __('Select attribute')
--                            ); ?></span>
-+                        <span><?= $block->escapeHtml(__('Select attribute')); ?></span>
-                         </label>
-                         <div class="admin__field-control">
-                             <select
-@@ -322,9 +283,7 @@
-                                 options: $parent.attributes,
-                                 optionsText: 'label',
-                                 value: attribute,
--                                optionsCaption: '<?= $block->escapeHtml(
--                                    __("Select")
--                                ); ?>'
-+                                optionsCaption: '<?= $block->escapeHtml(__("Select")); ?>'
-                                 ">
-                             </select>
-                         </div>
-@@ -341,24 +300,17 @@
-                         <div data-role="gallery"
-                              class="gallery"
-                              data-images="[]"
--                             data-types="<?= $block->escapeHtml(
--                                 $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
--                             ) ?>"
--                        >
-+                             data-types="<?= $block->escapeHtml($this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes())) ?>">
-                             <div class="image image-placeholder">
-                                 <div data-role="uploader" class="uploader">
-                                     <div class="image-browse">
--                                    <span><?= $block->escapeHtml(
--                                            __('Browse Files...')
--                                        ); ?></span>
-+                                    <span><?= $block->escapeHtml(__('Browse Files...')); ?></span>
-                                         <input type="file" name="image" multiple="multiple"
-                                                data-url="<?= /* @noEscape */ $block->getUrl('catalog/product_gallery/upload') ?>" />
-                                     </div>
-                                 </div>
-                                 <div class="product-image-wrapper">
--                                    <p class="image-placeholder-text"><?= $block->escapeHtml(
--                                            __('Browse to find or drag image here')
--                                        ); ?></p>
-+                                    <p class="image-placeholder-text"><?= $block->escapeHtml(__('Browse to find or drag image here')); ?></p>
-                                 </div>
-                                 <div class="spinner">
-                                     <span></span><span></span><span></span><span></span>
-@@ -366,15 +318,12 @@
-                                 </div>
-                             </div>
- 
--                            <?php foreach ($block->getImageTypes() as $typeData):
--                                ?>
-+                            <?php foreach ($block->getImageTypes() as $typeData) :?>
-                                 <input name="<?= $block->escapeHtml($typeData['name']) ?>"
-                                        class="image-<?= $block->escapeHtml($typeData['code']) ?>"
-                                        type="hidden"
-                                        value="<?= $block->escapeHtml($typeData['value']) ?>"/>
--                                <?php
--                            endforeach;
--                            ?>
-+                                <?php endforeach; ?>
- 
-                             <script data-template="uploader" type="text/x-magento-template">
-                                 <div id="<%- data.id %>" class="file-row">
-@@ -418,15 +367,11 @@
-                                                     class="action-remove"
-                                                     data-role="delete-button"
-                                                     title="<?= $block->escapeHtml(__('Remove image')) ?>">
--                                            <span><?= $block->escapeHtml(
--                                                    __('Remove image')
--                                                ); ?></span>
-+                                            <span><?= $block->escapeHtml(__('Remove image')); ?></span>
-                                             </button>
-                                             <div class="draggable-handle"></div>
-                                         </div>
--                                        <div class="image-fade"><span><?= $block->escapeHtml(
--                                                    __('Hidden')
--                                                ); ?></span></div>
-+                                        <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')); ?></span></div>
-                                     </div>
-                                     <div class="item-description">
-                                         <div class="item-title" data-role="img-title"><%- data.label %></div>
-@@ -435,19 +380,12 @@
-                                         </div>
-                                     </div>
-                                     <ul class="item-roles" data-role="roles-labels">
--                                        <?php
--                                        foreach ($block->getMediaAttributes() as $attribute):
--                                            ?>
--                                            <li data-role-code="<?= $block->escapeHtml(
--                                                $attribute->getAttributeCode()
--                                            ) ?>" class="item-role item-role-<?= $block->escapeHtml(
--                                                $attribute->getAttributeCode()
--                                            ) ?>">
-+                                        <?php foreach ($block->getMediaAttributes() as $attribute) :?>
-+                                            <li data-role-code="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
-+                                                class="item-role item-role-<?= $block->escapeHtml($attribute->getAttributeCode()) ?>">
-                                                 <?= $block->escapeHtml($attribute->getFrontendLabel()) ?>
-                                             </li>
--                                            <?php
--                                        endforeach;
--                                        ?>
-+                                            <?php endforeach; ?>
-                                     </ul>
-                                 </div>
-                             </script>
-@@ -492,9 +430,7 @@
-                                     <fieldset class="admin__fieldset fieldset-image-panel">
-                                         <div class="admin__field field-image-description">
-                                             <label class="admin__field-label" for="image-description">
--                                            <span><?= $block->escapeHtml(
--                                                    __('Alt Text')
--                                                );?></span>
-+                                            <span><?= $block->escapeHtml(__('Alt Text'));?></span>
-                                             </label>
- 
-                                             <div class="admin__field-control">
-@@ -508,56 +444,38 @@
- 
-                                         <div class="admin__field field-image-role">
-                                             <label class="admin__field-label">
--                                            <span><?= $block->escapeHtml(
--                                                    __('Role')
--                                                );?></span>
-+                                            <span><?= $block->escapeHtml(__('Role'));?></span>
-                                             </label>
-                                             <div class="admin__field-control">
-                                                 <ul class="multiselect-alt">
--                                                    <?php
--                                                    foreach ($block->getMediaAttributes() as $attribute) :
--                                                        ?>
-+                                                    <?php foreach ($block->getMediaAttributes() as $attribute) :?>
-                                                         <li class="item">
-                                                             <label>
-                                                                 <input class="image-type"
-                                                                        data-role="type-selector"
-                                                                        type="checkbox"
--                                                                       value="<?= $block->escapeHtml(
--                                                                           $attribute->getAttributeCode()
--                                                                       ) ?>"
-+                                                                       value="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
-                                                                 />
--                                                                <?= $block->escapeHtml(
--                                                                    $attribute->getFrontendLabel()
--                                                                ) ?>
-+                                                                <?= $block->escapeHtml($attribute->getFrontendLabel()) ?>
-                                                             </label>
-                                                         </li>
--                                                        <?php
--                                                    endforeach;
--                                                    ?>
-+                                                        <?php endforeach; ?>
-                                                 </ul>
-                                             </div>
-                                         </div>
- 
-                                         <div class="admin__field admin__field-inline field-image-size" data-role="size">
-                                             <label class="admin__field-label">
--                                            <span><?= $block->escapeHtml(
--                                                    __('Image Size')
--                                                ); ?></span>
-+                                            <span><?= $block->escapeHtml(__('Image Size')); ?></span>
-                                             </label>
--                                            <div class="admin__field-value" data-message="<?= $block->escapeHtml(
--                                                __('{size}')
--                                            ); ?>"></div>
-+                                            <div class="admin__field-value" data-message="<?= $block->escapeHtml(__('{size}')); ?>"></div>
-                                         </div>
- 
-                                         <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
-                                             <label class="admin__field-label">
--                                            <span><?= $block->escapeHtml(
--                                                    __('Image Resolution')
--                                                ); ?></span>
-+                                            <span><?= $block->escapeHtml(__('Image Resolution')); ?></span>
-                                             </label>
--                                            <div class="admin__field-value" data-message="<?= $block->escapeHtml(
--                                                __('{width}^{height} px')
--                                            ); ?>"></div>
-+                                            <div class="admin__field-value" data-message="<?= $block->escapeHtml(__('{width}^{height} px')); ?>"></div>
-                                         </div>
- 
-                                         <div class="admin__field field-image-hide">
-@@ -572,9 +490,7 @@
-                                                     <% if (data.disabled == 1) { %>checked="checked"<% } %> />
- 
-                                                     <label for="hide-from-product-page" class="admin__field-label">
--                                                        <?= $block->escapeHtml(
--                                                            __('Hide from Product Page')
--                                                        ); ?>
-+                                                        <?= $block->escapeHtml(__('Hide from Product Page')); ?>
-                                                     </label>
-                                                 </div>
-                                             </div>
-@@ -593,9 +509,7 @@
-     <div data-bind="with: sections().price" class="steps-wizard-section">
-         <div data-role="section">
-             <div class="steps-wizard-section-title">
--                <span><?= $block->escapeHtml(
--                        __('Price')
--                    ); ?></span>
-+                <span><?= $block->escapeHtml(__('Price')); ?></span>
-             </div>
-             <ul class="steps-wizard-section-list">
-                 <li>
-@@ -607,9 +521,7 @@
-                                data-bind="checked:type" />
-                         <label for="apply-single-price-radio"
-                                class="admin__field-label">
--                            <span><?= $block->escapeHtml(
--                                    __('Apply single price to all SKUs')
--                                ); ?></span>
-+                            <span><?= $block->escapeHtml(__('Apply single price to all SKUs')); ?></span>
-                         </label>
-                     </div>
-                 </li>
-@@ -622,9 +534,7 @@
-                                data-bind="checked:type" />
-                         <label for="apply-unique-prices-radio"
-                                class="admin__field-label">
--                            <span><?= $block->escapeHtml(
--                                    __('Apply unique prices by attribute to each SKU')
--                                ); ?></span>
-+                            <span><?= $block->escapeHtml(__('Apply unique prices by attribute to each SKU')); ?></span>
-                         </label>
-                     </div>
-                 </li>
-@@ -637,9 +547,7 @@
-                                checked
-                                data-bind="checked:type" />
-                         <label for="skip-pricing-radio" class="admin__field-label">
--                            <span><?= $block->escapeHtml(
--                                    __('Skip price at this time')
--                                ); ?></span>
-+                            <span><?= $block->escapeHtml(__('Skip price at this time')); ?></span>
-                         </label>
-                     </div>
-                 </li>
-@@ -648,9 +556,7 @@
-                 <fieldset class="admin__fieldset bulk-attribute-values" data-bind="visible: type() == 'single'">
-                     <div class="admin__field _required">
-                         <label for="apply-single-price-input" class="admin__field-label">
--                        <span><?= $block->escapeHtml(
--                                __('Price')
--                            ); ?></span>
-+                        <span><?= $block->escapeHtml(__('Price')); ?></span>
-                         </label>
-                         <div class="admin__field-control">
-                             <div class="currency-addon">
-@@ -667,9 +573,7 @@
-                 <fieldset class="admin__fieldset bulk-attribute-values">
-                     <div class="admin__field _required">
-                         <label for="select-each-price" class="admin__field-label">
--                            <span><?= $block->escapeHtml(
--                                    __('Select attribute')
--                                ); ?></span>
-+                            <span><?= $block->escapeHtml(__('Select attribute')); ?></span>
-                         </label>
-                         <div class="admin__field-control">
-                             <select id="select-each-price" class="admin__control-select" data-bind="
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
-index cfb742e80f7..c3dc6142322 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\SelectAttributes */
- ?>
- <div class="select-attributes-block <?= /* @noEscape */ $block->getData('config/dataScope') ?>" data-role="select-attributes-step">
-@@ -13,8 +11,8 @@
-         <?= /* @noEscape */  $block->getAddNewAttributeButton() ?>
-     </div>
-     <h2 class="steps-wizard-title"><?= $block->escapeHtml(
--            __('Step 1: Select Attributes')
--        ); ?></h2>
-+        __('Step 1: Select Attributes')
-+    ); ?></h2>
-     <div class="selected-attributes" data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'">
-         <?= $block->escapeHtml(
-             __('Selected Attributes:')
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml
-index 2ded3aa1079..379e129b68c 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml
-@@ -4,14 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\Summary */
- ?>
- <div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'">
-     <h2 class="steps-wizard-title"><?= $block->escapeHtml(
--            __('Step 4: Summary')
--        ); ?></h2>
-+        __('Step 4: Summary')
-+    ); ?></h2>
- 
-     <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
-         <!-- ko if: gridNew().length -->
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
-index 07f4e39e43d..c11a1adc198 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
-@@ -4,34 +4,32 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-- /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config */
-+/** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config */
- ?>
--<div class="entry-edit form-inline" id="<?= /* @escapeNotVerified */ $block->getId() ?>" data-panel="product-variations">
-+<div class="entry-edit form-inline" id="<?= $block->escapeHtmlAttr($block->getId()) ?>" data-panel="product-variations">
-     <div data-bind="scope: 'variation-steps-wizard'" class="product-create-configuration">
-         <div class="product-create-configuration-info">
-             <div class="note" data-role="product-create-configuration-info">
--                <?= /* @escapeNotVerified */  __('Configurable products allow customers to choose options (Ex: shirt color).
--            You need to create a simple product for each configuration (Ex: a product for each color).');?>
-+                <?= $block->escapeHtml(__('Configurable products allow customers to choose options (Ex: shirt color).
-+            You need to create a simple product for each configuration (Ex: a product for each color).'));?>
-             </div>
-         </div>
-         <div class="product-create-configuration-actions" data-action="product-create-configuration-buttons">
-             <div class="product-create-configuration-action">
-                 <button type="button" data-action="open-steps-wizard" title="Create Product Configurations"
-                         class="action-secondary" data-bind="click: open">
--                <span data-role="button-label" data-edit-label="<?= /* @escapeNotVerified */  __('Edit Configurations') ?>">
--                    <?= /* @escapeNotVerified */  $block->isHasVariations()
-+                <span data-role="button-label" data-edit-label="<?= $block->escapeHtmlAttr(__('Edit Configurations')) ?>">
-+                    <?= $block->escapeHtml($block->isHasVariations()
-                         ? __('Edit Configurations')
--                        : __('Create Configurations')
--                    ?>
-+                        : __('Create Configurations'))
-+?>
-                 </span>
-                 </button>
-             </div>
-             <div class="product-create-configuration-action" data-bind="scope: 'configurableProductGrid'">
-                 <button class="action-tertiary action-menu-item" type="button" data-action="choose"
-                         data-bind="click: showManuallyGrid, visible: button">
--                    <?= /* @noEscape */ __('Add Products Manually') ?>
-+                    <?= $block->escapeHtml(__('Add Products Manually')) ?>
-                 </button>
-             </div>
-         </div>
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
-index 230e0fd14cc..22ff1992c94 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix */
- ?>
- <?php
-@@ -17,7 +15,7 @@ $currencySymbol = $block->getCurrencySymbol();
- <div id="product-variations-matrix" data-role="product-variations-matrix">
-     <div data-bind="scope: 'configurableVariations'">
-         <h3 class="hidden" data-bind="css: {hidden: !showVariations() }" class="title">
--            <?= /* @escapeNotVerified */ __('Current Variations') ?>
-+            <?= $block->escapeHtml(__('Current Variations')) ?>
-         </h3>
- 
-         <script data-template-for="variation-image" type="text/x-magento-template">
-@@ -47,22 +45,22 @@ $currencySymbol = $block->getCurrencySymbol();
-                         <thead>
-                             <tr>
-                                 <th class="data-grid-th data-grid-thumbnail-cell col-image" data-column="image">
--                                    <?= /* @escapeNotVerified */  __('Image') ?>
-+                                    <?= $block->escapeHtml(__('Image')) ?>
-                                 </th>
-                                 <th class="data-grid-th col-name" data-column="name">
--                                    <?= /* @escapeNotVerified */  __('Name') ?>
-+                                    <?= $block->escapeHtml(__('Name')) ?>
-                                 </th>
-                                 <th class="data-grid-th col-sku" data-column="sku">
--                                    <?= /* @escapeNotVerified */  __('SKU') ?>
-+                                    <?= $block->escapeHtml(__('SKU')) ?>
-                                 </th>
-                                 <th class="data-grid-th col-price" data-column="price">
--                                    <?= /* @escapeNotVerified */  __('Price') ?>
-+                                    <?= $block->escapeHtml(__('Price')) ?>
-                                 </th>
-                                 <th class="data-grid-th col-qty" data-column="qty">
--                                    <?= /* @escapeNotVerified */  __('Quantity') ?>
-+                                    <?= $block->escapeHtml(__('Quantity')) ?>
-                                 </th>
-                                 <th class="data-grid-th col-weight" data-column="weight">
--                                    <?= /* @escapeNotVerified */  __('Weight') ?>
-+                                    <?= $block->escapeHtml(__('Weight')) ?>
-                                 </th>
-                                 <!-- ko foreach: getAttributesOptions() -->
-                                     <th data-bind="attr: {class:'data-grid-th col-' + $data.attribute_code},
-@@ -70,7 +68,7 @@ $currencySymbol = $block->getCurrencySymbol();
-                                     </th>
-                                 <!-- /ko -->
-                                 <th class="data-grid-th">
--                                    <?= /* @escapeNotVerified */  __('Actions') ?>
-+                                    <?= $block->escapeHtml(__('Actions')) ?>
-                                 </th>
-                             </tr>
-                         </thead>
-@@ -88,7 +86,7 @@ $currencySymbol = $block->getCurrencySymbol();
-                                                 <input type="hidden" data-bind="
-                                                     attr: {id: $parent.getRowId(variation, 'image'),
-                                                     name: $parent.getVariationRowName(variation, 'image')}"/>
--                                                <span><?= /* @escapeNotVerified */  __('Upload Image') ?></span>
-+                                                <span><?= $block->escapeHtml(__('Upload Image')) ?></span>
-                                                 <input name="image" type="file"
-                                                        data-url="<?= $block->escapeHtml($block->getImageUploadUrl()) ?>"
-                                                        title="<?= $block->escapeHtml(__('Upload image')) ?>"/>
-@@ -102,11 +100,11 @@ $currencySymbol = $block->getCurrencySymbol();
-                                         <!-- /ko -->
-                                         <button type="button" class="action toggle no-display" data-toggle="dropdown"
-                                                 data-mage-init='{"dropdown":{}}'>
--                                            <span><?= /* @escapeNotVerified */  __('Select') ?></span>
-+                                            <span><?= $block->escapeHtml(__('Select')) ?></span>
-                                         </button>
-                                         <ul class="dropdown">
-                                             <li>
--                                                <a class="item" data-action="no-image"><?= /* @escapeNotVerified */  __('No Image') ?></a>
-+                                                <a class="item" data-action="no-image"><?= $block->escapeHtml(__('No Image')) ?></a>
-                                             </li>
-                                         </ul>
-                                     </div>
-@@ -208,7 +206,7 @@ $currencySymbol = $block->getCurrencySymbol();
-                                                     "
-                                                    data-action="choose"
-                                                    href="#">
--                                                    <?= /* @escapeNotVerified */  __('Choose a different Product') ?>
-+                                                    <?= $block->escapeHtml(__('Choose a different Product')) ?>
-                                                 </a>
-                                             </li>
-                                             <li>
-@@ -219,7 +217,7 @@ $currencySymbol = $block->getCurrencySymbol();
-                                             </li>
-                                             <li>
-                                                 <a class="action-menu-item" data-bind="click: $parent.removeProduct.bind($parent, $index())">
--                                                    <?= /* @escapeNotVerified */  __('Remove Product') ?>
-+                                                    <?= $block->escapeHtml(__('Remove Product')) ?>
-                                                 </a>
-                                             </li>
-                                         </ul>
-@@ -233,15 +231,14 @@ $currencySymbol = $block->getCurrencySymbol();
-         <!-- /ko -->
-     </div>
-     <div data-role="step-wizard-dialog"
--         data-mage-init='{"Magento_Ui/js/modal/modal":{"type":"slide","title":"<?= /* @escapeNotVerified */  __('Create Product Configurations') ?>",
-+         data-mage-init='{"Magento_Ui/js/modal/modal":{"type":"slide","title":"<?= $block->escapeJs(__('Create Product Configurations')) ?>",
-          "buttons":[]}}'
-          class="no-display">
--        <?php
--        /* @escapeNotVerified */ echo $block->getVariationWizard([
-+        <?= /* @noEscape */ $block->getVariationWizard([
-             'attributes' => $attributes,
-             'configurations' => $productMatrix
-         ]);
--        ?>
-+?>
-     </div>
- </div>
- 
-@@ -252,8 +249,8 @@ $currencySymbol = $block->getCurrencySymbol();
-                 "components": {
-                     "configurableVariations": {
-                         "component": "Magento_ConfigurableProduct/js/variations/variations",
--                        "variations": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($productMatrix) ?>,
--                        "productAttributes": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($attributes) ?>,
-+                        "variations": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($productMatrix) ?>,
-+                        "productAttributes": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($attributes) ?>,
-                         "productUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/edit', ['id' => '%id%']) ?>",
-                         "currencySymbol": "<?= /* @noEscape */ $currencySymbol ?>",
-                         "configurableProductGrid": "configurableProductGrid"
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
-index 2e386332186..7b85efdbb73 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix */
- 
- $productMatrix = $block->getProductMatrix();
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
-index 3a23257cbbf..f009962bb97 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix */
- ?>
- <?php
-@@ -48,9 +46,9 @@ $currencySymbol = $block->getCurrencySymbol();
-                         "attributeSetHandler": "<?= /* @noEscape */ $block->getForm() ?>.configurable_attribute_set_handler_modal",
-                         "wizardModalButtonName": "<?= /* @noEscape */ $block->getForm() ?>.configurable.configurable_products_button_set.create_configurable_products_button",
-                         "wizardModalButtonTitle": "<?= $block->escapeHtml(__('Edit Configurations')) ?>",
--                        "productAttributes": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($attributes) ?>,
-+                        "productAttributes": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($attributes) ?>,
-                         "productUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/edit', ['id' => '%id%']) ?>",
--                        "variations": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($productMatrix) ?>,
-+                        "variations": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($productMatrix) ?>,
-                         "currencySymbol": "<?= /* @noEscape */ $currencySymbol ?>",
-                         "attributeSetCreationUrl": "<?= /* @noEscape */ $block->getUrl('*/product_set/save') ?>"
-                     }
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
-index 6c993b243da..6b30b3eba33 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var $block \Magento\Framework\View\Element\Template */
- ?>
- <div data-role="affected-attribute-set-selector" class="no-display affected-attribute-set">
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
-index 0e0eb3464ea..cdb12b54e5e 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var $block \Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector */
- ?>
- <script>
-@@ -48,12 +46,12 @@
- 
-         $form
-             .modal({
--                title: '<?= /* @escapeNotVerified */ __('Choose Affected Attribute Set') ?>',
-+                title: '<?= $block->escapeJs(__('Choose Affected Attribute Set')) ?>',
-                 closed: function () {
-                     resetValidation();
-                 },
-                 buttons: [{
--                    text: '<?= /* @escapeNotVerified */ __('Confirm') ?>',
-+                    text: '<?= $block->escapeJs(__('Confirm')) ?>',
-                     attr: {
-                         'data-action': 'confirm'
-                     },
-@@ -77,12 +75,12 @@
- 
-                         $.ajax({
-                             type: 'POST',
--                            url: '<?= /* @escapeNotVerified */ $block->getAttributeSetCreationUrl() ?>',
-+                            url: '<?= $block->escapeUrl($block->getAttributeSetCreationUrl()) ?>',
-                             data: {
-                                 gotoEdit: 1,
-                                 attribute_set_name: $form.find('input[name=new-attribute-set-name]').val(),
-                                 skeleton_set: $('#attribute_set_id').val(),
--                                form_key: '<?= /* @escapeNotVerified */ $block->getFormKey() ?>',
-+                                form_key: '<?= $block->escapeJs($block->getFormKey()) ?>',
-                                 return_session_messages_only: 1
-                             },
-                             dataType: 'json',
-@@ -101,8 +99,8 @@
-                         return false;
-                     }
-                 },{
--                    text: '<?= /* @escapeNotVerified */ __('Cancel') ?>',
--                    id: '<?= /* @escapeNotVerified */ $block->getJsId('close-button') ?>',
-+                    text: '<?= $block->escapeJs(__('Cancel')) ?>',
-+                    id: '<?= $block->escapeJs($block->getJsId('close-button')) ?>',
-                     'class': 'action-close',
-                     click: function() {
-                         $form.modal('closeModal');
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
-index 4246d8f53a7..e6cf1e9c687 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
-@@ -3,16 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- /** @var $block \Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector */
- ?>
- <script>
- require(["jquery","mage/mage","mage/backend/suggest"], function($){
--    var options = <?php
--        /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSuggestWidgetOptions())
--    ?>;
-+    var options = <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getSuggestWidgetOptions()) ?>;
-     $('#configurable-attribute-selector')
-         .mage('suggest', options)
-         .on('suggestselect', function (event, ui) {
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
-index 94a24779450..7b04bebd4d7 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
-@@ -6,8 +6,9 @@
- define([
-     'underscore',
-     'uiRegistry',
--    'Magento_Ui/js/dynamic-rows/dynamic-rows'
--], function (_, registry, dynamicRows) {
-+    'Magento_Ui/js/dynamic-rows/dynamic-rows',
-+    'jquery'
-+], function (_, registry, dynamicRows, $) {
-     'use strict';
- 
-     return dynamicRows.extend({
-@@ -217,6 +218,8 @@ define([
- 
-             _.each(tmpData, function (row, index) {
-                 path = this.dataScope + '.' + this.index + '.' + (this.startIndex + index);
-+                row.attributes = $('<i></i>').text(row.attributes).html();
-+                row.sku = $('<i></i>').text(row.sku).html();
-                 this.source.set(path, row);
-             }, this);
- 
-@@ -401,8 +404,8 @@ define([
-             product = {
-                 'id': row.productId,
-                 'product_link': row.productUrl,
--                'name': row.name,
--                'sku': row.sku,
-+                'name': $('<i></i>').text(row.name).html(),
-+                'sku': $('<i></i>').text(row.sku).html(),
-                 'status': row.status,
-                 'price': row.price,
-                 'price_currency': row.priceCurrency,
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
-index 28e775b984b..b2ef35546ee 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
-@@ -11,9 +11,6 @@ define([
- 
-     return Abstract.extend({
-         defaults: {
--            listens: {
--                isConfigurable: 'handlePriceValue'
--            },
-             imports: {
-                 isConfigurable: '!ns = ${ $.ns }, index = configurable-matrix:isEmpty'
-             },
-@@ -22,12 +19,15 @@ define([
-             }
-         },
- 
--        /**
--         * Invokes initialize method of parent class,
--         * contains initialization logic
--         */
-+        /** @inheritdoc */
-         initialize: function () {
-             this._super();
-+            // resolve initial disable state
-+            this.handlePriceValue(this.isConfigurable);
-+            // add listener to track "configurable" type
-+            this.setListeners({
-+                isConfigurable: 'handlePriceValue'
-+            });
- 
-             return this;
-         },
-@@ -50,8 +50,9 @@ define([
-          * @param {String} isConfigurable
-          */
-         handlePriceValue: function (isConfigurable) {
-+            this.disabled(!!this.isUseDefault() || isConfigurable);
-+
-             if (isConfigurable) {
--                this.disable();
-                 this.clear();
-             }
-         }
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/paging/sizes.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/paging/sizes.js
-index a8b8f95f653..155b176bd43 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/paging/sizes.js
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/paging/sizes.js
-@@ -9,21 +9,21 @@ define([
- 
-     return Sizes.extend({
-         defaults: {
--            excludedOptions: ['100', '200']
--        },
--
--        /**
--         * @override
--         */
--        initialize: function () {
--            this._super();
--
--            this.excludedOptions.forEach(function (excludedOption) {
--                delete this.options[excludedOption];
--            }, this);
--            this.updateArray();
--
--            return this;
-+            options: {
-+                '20': {
-+                    value: 20,
-+                    label: 20
-+                },
-+                '30': {
-+                    value: 30,
-+                    label: 30
-+                },
-+                '50': {
-+                    value: 50,
-+                    label: 50
-+                }
-+            },
-+            value: 20
-         }
-     });
- });
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/attributes_values.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/attributes_values.js
-index cc565cab6b2..6c790c634ee 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/attributes_values.js
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/attributes_values.js
-@@ -90,13 +90,46 @@ define([
-          * @param {Object} option
-          */
-         saveOption: function (option) {
--            if (!_.isEmpty(option.label)) {
-+            if (this.isValidOption(option)) {
-                 this.options.remove(option);
-                 this.options.push(option);
-                 this.chosenOptions.push(option.id);
-             }
-         },
- 
-+        /**
-+         * @param {Object} newOption
-+         * @return boolean
-+         */
-+        isValidOption: function (newOption) {
-+            var duplicatedOptions = [],
-+                errorOption,
-+                allOptions = [];
-+
-+            if (_.isEmpty(newOption.label)) {
-+                return false;
-+            }
-+
-+            _.each(this.options(), function (option) {
-+                if (!_.isUndefined(allOptions[option.label]) && newOption.label === option.label) {
-+                    duplicatedOptions.push(option);
-+                }
-+
-+                allOptions[option.label] = option.label;
-+            });
-+
-+            if (duplicatedOptions.length) {
-+                _.each(duplicatedOptions, function (duplicatedOption) {
-+                    errorOption = $('[data-role="' + duplicatedOption.id + '"]');
-+                    errorOption.addClass('_error');
-+                });
-+
-+                return false;
-+            }
-+
-+            return true;
-+        },
-+
-         /**
-          * @param {Object} option
-          */
-@@ -128,6 +161,7 @@ define([
-             }));
-             attribute.opened = ko.observable(this.initialOpened(index));
-             attribute.collapsible = ko.observable(true);
-+            attribute.isValidOption = this.isValidOption;
- 
-             return attribute;
-         },
-@@ -148,22 +182,22 @@ define([
-         saveAttribute: function () {
-             var errorMessage = $.mage.__('Select options for all attributes or remove unused attributes.');
- 
--            this.attributes.each(function (attribute) {
-+            if (!this.attributes().length) {
-+                throw new Error(errorMessage);
-+            }
-+
-+            _.each(this.attributes(), function (attribute) {
-                 attribute.chosen = [];
- 
-                 if (!attribute.chosenOptions.getLength()) {
-                     throw new Error(errorMessage);
-                 }
--                attribute.chosenOptions.each(function (id) {
-+                _.each(attribute.chosenOptions(), function (id) {
-                     attribute.chosen.push(attribute.options.findWhere({
-                         id: id
-                     }));
-                 });
-             });
--
--            if (!this.attributes().length) {
--                throw new Error(errorMessage);
--            }
-         },
- 
-         /**
-@@ -184,33 +218,47 @@ define([
-          * @return {Boolean}
-          */
-         saveOptions: function () {
--            var options = [];
-+            var newOptions = [];
- 
--            this.attributes.each(function (attribute) {
--                attribute.chosenOptions.each(function (id) {
-+            _.each(this.attributes(), function (attribute) {
-+                _.each(attribute.options(), function (element) {
-                     var option = attribute.options.findWhere({
--                        id: id,
--                        'is_new': true
-+                        id: element.id
-                     });
- 
--                    if (option) {
--                        options.push(option);
-+                    if (option['is_new'] === true) {
-+                        if (!attribute.isValidOption(option)) {
-+                            throw new Error(
-+                                $.mage.__('The value of attribute ""%1"" must be unique')
-+                                    .replace('"%1"', attribute.label)
-+                            );
-+                        }
-+
-+                        newOptions.push(option);
-                     }
-                 });
-             });
- 
--            if (!options.length) {
-+            if (!newOptions.length) {
-                 return false;
-             }
-+
-             $.ajax({
-                 type: 'POST',
-                 url: this.createOptionsUrl,
-                 data: {
--                    options: options
-+                    options: newOptions
-                 },
-                 showLoader: true
-             }).done(function (savedOptions) {
--                this.attributes.each(function (attribute) {
-+                if (savedOptions.error) {
-+                    this.notificationMessage.error = savedOptions.error;
-+                    this.notificationMessage.text = savedOptions.message;
-+
-+                    return;
-+                }
-+
-+                _.each(this.attributes(), function (attribute) {
-                     _.each(savedOptions, function (newOptionId, oldOptionId) {
-                         var option = attribute.options.findWhere({
-                             id: oldOptionId
-@@ -233,7 +281,7 @@ define([
-          */
-         requestAttributes: function (attributeIds) {
-             $.ajax({
--                type: 'POST',
-+                type: 'GET',
-                 url: this.optionsUrl,
-                 data: {
-                     attributes: attributeIds
-diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
-index e7c8aa6f717..6e82fd42692 100644
---- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
-+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
-@@ -383,26 +383,48 @@ define([
-          * Chose action for the form save button
-          */
-         saveFormHandler: function () {
--            this.serializeData();
-+            this.formElement().validate();
-+
-+            if (this.formElement().source.get('params.invalid') === false) {
-+                this.serializeData();
-+            }
- 
-             if (this.checkForNewAttributes()) {
-                 this.formSaveParams = arguments;
-                 this.attributeSetHandlerModal().openModal();
-             } else {
-+                if (this.validateForm(this.formElement())) {
-+                    this.clearOutdatedData();
-+                }
-                 this.formElement().save(arguments[0], arguments[1]);
-+
-+                if (this.formElement().source.get('params.invalid')) {
-+                    this.unserializeData();
-+                }
-             }
-         },
- 
-+        /**
-+         * @param {Object} formElement
-+         *
-+         * Validates each form element and returns true, if all elements are valid.
-+         */
-+        validateForm: function (formElement) {
-+            formElement.validate();
-+
-+            return !formElement.additionalInvalid && !formElement.source.get('params.invalid');
-+        },
-+
-         /**
-          * Serialize data for specific form fields
-          *
--         * Get data from outdated fields, serialize it and produce new form fields.
-+         * Serializes some complex data fields
-          *
--         * Outdated fields:
-+         * Original fields:
-          *   - configurable-matrix;
-          *   - associated_product_ids.
-          *
--         * New fields:
-+         * Serialized fields in request:
-          *   - configurable-matrix-serialized;
-          *   - associated_product_ids_serialized.
-          */
-@@ -410,18 +432,50 @@ define([
-             if (this.source.data['configurable-matrix']) {
-                 this.source.data['configurable-matrix-serialized'] =
-                     JSON.stringify(this.source.data['configurable-matrix']);
--
--                delete this.source.data['configurable-matrix'];
-             }
- 
-             if (this.source.data['associated_product_ids']) {
-                 this.source.data['associated_product_ids_serialized'] =
-                     JSON.stringify(this.source.data['associated_product_ids']);
-+            }
-+        },
-+
-+        /**
-+         * Clear outdated data for specific form fields
-+         *
-+         * Outdated fields:
-+         *   - configurable-matrix;
-+         *   - associated_product_ids.
-+         */
-+        clearOutdatedData: function () {
-+            if (this.source.data['configurable-matrix']) {
-+                delete this.source.data['configurable-matrix'];
-+            }
- 
-+            if (this.source.data['associated_product_ids']) {
-                 delete this.source.data['associated_product_ids'];
-             }
-         },
- 
-+        /**
-+         * Unserialize data for specific form fields
-+         *
-+         * Unserializes some fields that were serialized this.serializeData
-+         */
-+        unserializeData: function () {
-+            if (this.source.data['configurable-matrix-serialized']) {
-+                this.source.data['configurable-matrix'] =
-+                    JSON.parse(this.source.data['configurable-matrix-serialized']);
-+                delete this.source.data['configurable-matrix-serialized'];
-+            }
-+
-+            if (this.source.data['associated_product_ids_serialized']) {
-+                this.source.data['associated_product_ids'] =
-+                    JSON.parse(this.source.data['associated_product_ids_serialized']);
-+                delete this.source.data['associated_product_ids_serialized'];
-+            }
-+        },
-+
-         /**
-          * Check for newly added attributes
-          * @returns {Boolean}
-@@ -445,20 +499,20 @@ define([
-          * @returns {Boolean}
-          */
-         addNewAttributeSetHandler: function () {
--            var choosenAttributeSetOption;
-+            var chosenAttributeSetOption;
- 
-             this.formElement().validate();
- 
-             if (this.formElement().source.get('params.invalid') === false) {
--                choosenAttributeSetOption = this.attributeSetSelection;
-+                chosenAttributeSetOption = this.attributeSetSelection;
- 
--                if (choosenAttributeSetOption === 'new') {
-+                if (chosenAttributeSetOption === 'new') {
-                     this.createNewAttributeSet();
- 
-                     return false;
-                 }
- 
--                if (choosenAttributeSetOption === 'existing') {
-+                if (chosenAttributeSetOption === 'existing') {
-                     this.set(
-                         'skeletonAttributeSet',
-                         this.attributeSetId
-@@ -469,6 +523,10 @@ define([
- 
-                 return true;
-             }
-+
-+            this.unserializeData();
-+
-+            return false;
-         },
- 
-         /**
-diff --git a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
-index f020e4c2c94..a6dc6c81998 100644
---- a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
-@@ -4,37 +4,28 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
--
--<?php
- /** @var \Magento\ConfigurableProduct\Pricing\Render\FinalPriceBox$block */
--
- /** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
- $priceModel = $block->getPriceType('regular_price');
--
- /** @var \Magento\Framework\Pricing\Price\PriceInterface $finalPriceModel */
- $finalPriceModel = $block->getPriceType('final_price');
- $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
- $schema = ($block->getZone() == 'item_view') ? true : false;
- ?>
- <span class="normal-price">
--    <?php
--    $arguments = [
-+    <?= /* @noEscape */ $block->renderAmount($finalPriceModel->getAmount(), [
-         'display_label' => __('As low as'),
-         'price_id' => $block->getPriceId('product-price-' . $idSuffix),
-         'price_type' => 'finalPrice',
-         'include_container' => true,
-         'schema' => $schema,
--    ];
--    /* @noEscape */ echo $block->renderAmount($finalPriceModel->getAmount(), $arguments);
--    ?>
-+    ]);
-+?>
- </span>
- 
--<?php if (!$block->isProductList() && $block->hasSpecialPrice()): ?>
-+<?php if (!$block->isProductList() && $block->hasSpecialPrice()) : ?>
-     <span class="old-price sly-old-price no-display">
--        <?php /* @escapeNotVerified */ echo $block->renderAmount($priceModel->getAmount(), [
-+        <?= /* @noEscape */ $block->renderAmount($priceModel->getAmount(), [
-             'display_label'     => __('Regular Price'),
-             'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
-             'price_type'        => 'oldPrice',
-@@ -44,14 +35,14 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
-     </span>
- <?php endif; ?>
- 
--<?php if ($block->showMinimalPrice()): ?>
--    <?php if ($block->getUseLinkForAsLowAs()):?>
--        <a href="<?= /* @escapeNotVerified */ $block->getSaleableItem()->getProductUrl() ?>" class="minimal-price-link">
--            <?= /* @escapeNotVerified */ $block->renderAmountMinimal() ?>
-+<?php if ($block->showMinimalPrice()) : ?>
-+    <?php if ($block->getUseLinkForAsLowAs()) :?>
-+        <a href="<?= $block->escapeUrl($block->getSaleableItem()->getProductUrl()) ?>" class="minimal-price-link">
-+            <?= /* @noEscape */ $block->renderAmountMinimal() ?>
-         </a>
--    <?php else:?>
-+    <?php else :?>
-         <span class="minimal-price-link">
--            <?= /* @escapeNotVerified */ $block->renderAmountMinimal() ?>
-+            <?= /* @noEscape */ $block->renderAmountMinimal() ?>
-         </span>
-     <?php endif?>
- <?php endif; ?>
-diff --git a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml
-index 18f96cfaaf3..c68419b955e 100644
---- a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml
-@@ -3,7 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- ?>
- <script type="text/x-magento-template" id="tier-prices-template">
-     <ul class="prices-tier items">
-@@ -15,10 +14,13 @@
-                 + '</span>'
-             + '</span>'; %>
-         <li class="item">
--            <%= $t('Buy %1 for %2 each and').replace('%1', item.qty).replace('%2', priceStr) %>
--                <strong class="benefit">
--                        <%= $t('save') %><span class="percent tier-<%= key %>">&nbsp;<%= item.percentage %></span>%
--                </strong>
-+            <%= '<?= $block->escapeHtml(__('Buy %1 for %2 each and', '%1', '%2')) ?>'
-+            .replace('%1', item.qty)
-+            .replace('%2', priceStr) %>
-+            <strong class="benefit">
-+                <?= $block->escapeHtml(__('save')) ?><span
-+                        class="percent tier-<%= key %>">&nbsp;<%= item.percentage %></span>%
-+            </strong>
-         </li>
-         <% }); %>
-     </ul>
-diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml b/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml
-index bad5acc209b..5902a9f25cc 100644
---- a/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
-index f5ed0679675..f7db41225c9 100644
---- a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
-+++ b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php
-@@ -13,19 +10,19 @@
- $_product    = $block->getProduct();
- $_attributes = $block->decorateArray($block->getAllowAttributes());
- ?>
--<?php if ($_product->isSaleable() && count($_attributes)):?>
--    <?php foreach ($_attributes as $_attribute): ?>
-+<?php if ($_product->isSaleable() && count($_attributes)) :?>
-+    <?php foreach ($_attributes as $_attribute) : ?>
-         <div class="field configurable required">
--            <label class="label" for="attribute<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>">
-+            <label class="label" for="attribute<?= $block->escapeHtmlAttr($_attribute->getAttributeId()) ?>">
-                 <span><?= $block->escapeHtml($_attribute->getProductAttribute()->getStoreLabel()) ?></span>
-             </label>
-             <div class="control">
--                <select name="super_attribute[<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>]"
--                        data-selector="super_attribute[<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>]"
-+                <select name="super_attribute[<?= $block->escapeHtmlAttr($_attribute->getAttributeId()) ?>]"
-+                        data-selector="super_attribute[<?= $block->escapeHtmlAttr($_attribute->getAttributeId()) ?>]"
-                         data-validate="{required:true}"
--                        id="attribute<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>"
-+                        id="attribute<?= $block->escapeHtmlAttr($_attribute->getAttributeId()) ?>"
-                         class="super-attribute-select">
--                    <option value=""><?= /* @escapeNotVerified */ __('Choose an Option...') ?></option>
-+                    <option value=""><?= $block->escapeHtml(__('Choose an Option...')) ?></option>
-                 </select>
-             </div>
-         </div>
-@@ -34,9 +31,11 @@ $_attributes = $block->decorateArray($block->getAllowAttributes());
-         {
-             "#product_addtocart_form": {
-                 "configurable": {
--                    "spConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>,
--                    "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
--                        'Magento_ConfigurableProduct') ?: 'replace'; ?>"
-+                    "spConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
-+                    "gallerySwitchStrategy": "<?= $block->escapeJs($block->getVar(
-+                        'gallery_switch_strategy',
-+                        'Magento_ConfigurableProduct'
-+                    ) ?: 'replace'); ?>"
-                 }
-             },
-             "*" : {
-diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
-index 8cabe71c175..ef40dcb9a73 100644
---- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
-+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
-@@ -291,6 +291,8 @@ define([
-             images = this.options.spConfig.images[this.simpleProduct];
- 
-             if (images) {
-+                images = this._sortImages(images);
-+
-                 if (this.options.gallerySwitchStrategy === 'prepend') {
-                     images = images.concat(initialImages);
-                 }
-@@ -309,7 +311,17 @@ define([
-                 $(this.options.mediaGallerySelector).AddFotoramaVideoEvents();
-             }
- 
--            galleryObject.first();
-+        },
-+
-+        /**
-+         * Sorting images array
-+         *
-+         * @private
-+         */
-+        _sortImages: function (images) {
-+            return _.sortBy(images, function (image) {
-+                return image.position;
-+            });
-         },
- 
-         /**
-@@ -360,7 +372,12 @@ define([
-                 index = 1,
-                 allowedProducts,
-                 i,
--                j;
-+                j,
-+                finalPrice = parseFloat(this.options.spConfig.prices.finalPrice.amount),
-+                optionFinalPrice,
-+                optionPriceDiff,
-+                optionPrices = this.options.spConfig.optionPrices,
-+                allowedProductMinPrice;
- 
-             this._clearSelect(element);
-             element.options[0] = new Option('', '');
-@@ -374,6 +391,7 @@ define([
-             if (options) {
-                 for (i = 0; i < options.length; i++) {
-                     allowedProducts = [];
-+                    optionPriceDiff = 0;
- 
-                     /* eslint-disable max-depth */
-                     if (prevConfig) {
-@@ -387,6 +405,20 @@ define([
-                         }
-                     } else {
-                         allowedProducts = options[i].products.slice(0);
-+
-+                        if (typeof allowedProducts[0] !== 'undefined' &&
-+                            typeof optionPrices[allowedProducts[0]] !== 'undefined') {
-+                            allowedProductMinPrice = this._getAllowedProductWithMinPrice(allowedProducts);
-+                            optionFinalPrice = parseFloat(optionPrices[allowedProductMinPrice].finalPrice.amount);
-+                            optionPriceDiff = optionFinalPrice - finalPrice;
-+
-+                            if (optionPriceDiff !== 0) {
-+                                options[i].label = options[i].label + ' ' + priceUtils.formatPrice(
-+                                    optionPriceDiff,
-+                                    this.options.priceFormat,
-+                                    true);
-+                            }
-+                        }
-                     }
- 
-                     if (allowedProducts.length > 0) {
-@@ -394,7 +426,7 @@ define([
-                         element.options[index] = new Option(this._getOptionLabel(options[i]), options[i].id);
- 
-                         if (typeof options[i].price !== 'undefined') {
--                            element.options[index].setAttribute('price', options[i].prices);
-+                            element.options[index].setAttribute('price', options[i].price);
-                         }
- 
-                         element.options[index].config = options[i];
-@@ -458,24 +490,56 @@ define([
-         _getPrices: function () {
-             var prices = {},
-                 elements = _.toArray(this.options.settings),
--                hasProductPrice = false;
-+                allowedProduct;
- 
-             _.each(elements, function (element) {
-                 var selected = element.options[element.selectedIndex],
-                     config = selected && selected.config,
-                     priceValue = {};
- 
--                if (config && config.allowedProducts.length === 1 && !hasProductPrice) {
-+                if (config && config.allowedProducts.length === 1) {
-                     priceValue = this._calculatePrice(config);
--                    hasProductPrice = true;
-+                } else if (element.value) {
-+                    allowedProduct = this._getAllowedProductWithMinPrice(config.allowedProducts);
-+                    priceValue = this._calculatePrice({
-+                        'allowedProducts': [
-+                            allowedProduct
-+                        ]
-+                    });
-                 }
- 
--                prices[element.attributeId] = priceValue;
-+                if (!_.isEmpty(priceValue)) {
-+                    prices.prices = priceValue;
-+                }
-             }, this);
- 
-             return prices;
-         },
- 
-+        /**
-+         * Get product with minimum price from selected options.
-+         *
-+         * @param {Array} allowedProducts
-+         * @returns {String}
-+         * @private
-+         */
-+        _getAllowedProductWithMinPrice: function (allowedProducts) {
-+            var optionPrices = this.options.spConfig.optionPrices,
-+                product = {},
-+                optionMinPrice, optionFinalPrice;
-+
-+            _.each(allowedProducts, function (allowedProduct) {
-+                optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
-+
-+                if (_.isEmpty(product) || optionFinalPrice < optionMinPrice) {
-+                    optionMinPrice = optionFinalPrice;
-+                    product = allowedProduct;
-+                }
-+            }, this);
-+
-+            return product;
-+        },
-+
-         /**
-          * Returns prices for configured products
-          *
-@@ -545,6 +609,13 @@ define([
-             } else {
-                 $(this.options.slyOldPriceSelector).hide();
-             }
-+
-+            $(document).trigger('updateMsrpPriceBlock',
-+                [
-+                    optionId,
-+                    this.options.spConfig.optionPrices
-+                ]
-+            );
-         },
- 
-         /**
-diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php b/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
-index aae39800cdd..eda2ce11daa 100644
---- a/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
-+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
-@@ -8,19 +8,25 @@ declare(strict_types=1);
- namespace Magento\ConfigurableProductGraphQl\Model;
- 
- use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as Type;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class ConfigurableProductTypeResolver implements TypeResolverInterface
- {
-     /**
--     * {@inheritdoc}
-+     * Configurable product type resolver code
-      */
--    public function resolveType(array $data) : string
-+    const TYPE_RESOLVER = 'ConfigurableProduct';
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolveType(array $data): string
-     {
--        if (isset($data['type_id']) && $data['type_id'] == 'configurable') {
--            return 'ConfigurableProduct';
-+        if (isset($data['type_id']) && $data['type_id'] == Type::TYPE_CODE) {
-+            return self::TYPE_RESOLVER;
-         }
-         return '';
-     }
-diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
-index 90ed5cf5489..36ee00d5533 100644
---- a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
-+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
-@@ -124,6 +124,8 @@ class Collection
-             $this->attributeMap[$productId][$attribute->getId()]['attribute_code']
-                 = $attribute->getProductAttribute()->getAttributeCode();
-             $this->attributeMap[$productId][$attribute->getId()]['values'] = $attributeData['options'];
-+            $this->attributeMap[$productId][$attribute->getId()]['label']
-+                = $attribute->getProductAttribute()->getStoreLabel();
-         }
- 
-         return $this->attributeMap;
-diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php
-index e63c75d5003..3e07fecb2eb 100644
---- a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php
-+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php
-@@ -16,12 +16,11 @@ use Magento\ConfigurableProductGraphQl\Model\Options\Collection as OptionCollect
- use Magento\ConfigurableProductGraphQl\Model\Variant\Collection;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
- use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class ConfigurableVariant implements ResolverInterface
- {
-@@ -72,11 +71,9 @@ class ConfigurableVariant implements ResolverInterface
-     }
- 
-     /**
--     * Fetch and format configurable variants.
--     *
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
--    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-     {
-         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-         if ($value['type_id'] !== Type::TYPE_CODE || !isset($value[$linkField])) {
-@@ -86,7 +83,7 @@ class ConfigurableVariant implements ResolverInterface
-             return $this->valueFactory->create($result);
-         }
- 
--        $this->variantCollection->addParentId((int)$value[$linkField]);
-+        $this->variantCollection->addParentProduct($value['model']);
-         $fields = $this->getProductFields($info);
-         $matchedFields = $this->attributeCollection->getRequestAttributes($fields);
-         $this->variantCollection->addEavAttributes($matchedFields);
-diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Options.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Options.php
-index 53912f7029e..aa7ed6f5525 100644
---- a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Options.php
-+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Options.php
-@@ -13,12 +13,11 @@ use Magento\ConfigurableProduct\Model\Product\Type\Configurable as Type;
- use Magento\ConfigurableProductGraphQl\Model\Options\Collection as OptionCollection;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
- use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class Options implements ResolverInterface
- {
-@@ -55,9 +54,9 @@ class Options implements ResolverInterface
-     /**
-      * Fetch and format configurable variants.
-      *
--     * {@inheritDoc}
-+     * {@inheritdoc}
-      */
--    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-     {
-         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-         if ($value['type_id'] !== Type::TYPE_CODE || !isset($value[$linkField])) {
-diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php
-index 9c275de3f09..dd2b84e1da5 100644
---- a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php
-+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php
-@@ -7,10 +7,11 @@ declare(strict_types=1);
- 
- namespace Magento\ConfigurableProductGraphQl\Model\Resolver\Variant;
- 
-+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
-+use Magento\Framework\GraphQl\Query\Resolver\Value;
-+use Magento\Catalog\Model\Product;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-@@ -19,22 +20,17 @@ use Magento\Framework\GraphQl\Query\ResolverInterface;
- class Attributes implements ResolverInterface
- {
-     /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
--    /**
--     * @param ValueFactory $valueFactory
--     */
--    public function __construct(ValueFactory $valueFactory)
--    {
--        $this->valueFactory = $valueFactory;
--    }
--
--    /**
-+     * @inheritdoc
-+     *
-      * Format product's option data to conform to GraphQL schema
-      *
--     * {@inheritdoc}
-+     * @param Field $field
-+     * @param ContextInterface $context
-+     * @param ResolveInfo $info
-+     * @param array|null $value
-+     * @param array|null $args
-+     * @throws \Exception
-+     * @return mixed|Value
-      */
-     public function resolve(
-         Field $field,
-@@ -42,38 +38,32 @@ class Attributes implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         if (!isset($value['options']) || !isset($value['product'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            return null;
-         }
- 
--        $result = function () use ($value) {
--            $data = [];
--            foreach ($value['options'] as $option) {
--                $code = $option['attribute_code'];
--                if (!isset($value['product'][$code])) {
--                    continue;
--                }
-+        $data = [];
-+        foreach ($value['options'] as $option) {
-+            $code = $option['attribute_code'];
-+            /** @var Product|null $model */
-+            $model = $value['product']['model'] ?? null;
-+            if (!$model || !$model->getData($code)) {
-+                continue;
-+            }
- 
--                foreach ($option['values'] as $optionValue) {
--                    if ($optionValue['value_index'] != $value['product'][$code]) {
--                        continue;
--                    }
--                    $data[] = [
--                        'label' => $optionValue['label'],
--                        'code' => $code,
--                        'use_default_value' => $optionValue['use_default_value'],
--                        'value_index' => $optionValue['value_index']
--                    ];
-+            foreach ($option['values'] as $optionValue) {
-+                if ($optionValue['value_index'] != $model->getData($code)) {
-+                    continue;
-                 }
-+                $data[] = [
-+                    'label' => $optionValue['label'],
-+                    'code' => $code,
-+                    'use_default_value' => $optionValue['use_default_value'],
-+                    'value_index' => $optionValue['value_index']
-+                ];
-             }
--
--            return $data;
--        };
--
--        return $this->valueFactory->create($result);
-+        }
-+        return $data;
-     }
- }
-diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
-index 0d86e165743..d517c9aa29b 100644
---- a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
-+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
-@@ -9,12 +9,11 @@ namespace Magento\ConfigurableProductGraphQl\Model\Variant;
- 
- use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Model\Product;
--use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory;
- use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ChildCollection;
--use Magento\Catalog\Model\ProductFactory;
-+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\Api\SearchCriteriaBuilder;
--use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product as DataProvider;
-+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
- 
- /**
-  * Collection for fetching configurable child product data.
-@@ -26,30 +25,20 @@ class Collection
-      */
-     private $childCollectionFactory;
- 
--    /**
--     * @var ProductFactory
--     */
--    private $productFactory;
--
-     /**
-      * @var SearchCriteriaBuilder
-      */
-     private $searchCriteriaBuilder;
- 
--    /**
--     * @var DataProvider
--     */
--    private $productDataProvider;
--
-     /**
-      * @var MetadataPool
-      */
-     private $metadataPool;
- 
-     /**
--     * @var int[]
-+     * @var Product[]
-      */
--    private $parentIds = [];
-+    private $parentProducts = [];
- 
-     /**
-      * @var array
-@@ -61,41 +50,48 @@ class Collection
-      */
-     private $attributeCodes = [];
- 
-+    /**
-+     * @var CollectionProcessorInterface
-+     */
-+    private $collectionProcessor;
-+
-     /**
-      * @param CollectionFactory $childCollectionFactory
--     * @param ProductFactory $productFactory
-      * @param SearchCriteriaBuilder $searchCriteriaBuilder
--     * @param DataProvider $productDataProvider
-      * @param MetadataPool $metadataPool
-+     * @param CollectionProcessorInterface $collectionProcessor
-      */
-     public function __construct(
-         CollectionFactory $childCollectionFactory,
--        ProductFactory $productFactory,
-         SearchCriteriaBuilder $searchCriteriaBuilder,
--        DataProvider $productDataProvider,
--        MetadataPool $metadataPool
-+        MetadataPool $metadataPool,
-+        CollectionProcessorInterface $collectionProcessor
-     ) {
-         $this->childCollectionFactory = $childCollectionFactory;
--        $this->productFactory = $productFactory;
-         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
--        $this->productDataProvider = $productDataProvider;
-         $this->metadataPool = $metadataPool;
-+        $this->collectionProcessor = $collectionProcessor;
-     }
- 
-     /**
--     * Add parent Id to collection filter
-+     * Add parent to collection filter
-      *
--     * @param int $id
-+     * @param Product $product
-      * @return void
-      */
--    public function addParentId(int $id) : void
-+    public function addParentProduct(Product $product) : void
-     {
--        if (!in_array($id, $this->parentIds) && !empty($this->childrenMap)) {
-+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-+        $productId = $product->getData($linkField);
-+
-+        if (isset($this->parentProducts[$productId])) {
-+            return;
-+        }
-+
-+        if (!empty($this->childrenMap)) {
-             $this->childrenMap = [];
--            $this->parentIds[] = $id;
--        } elseif (!in_array($id, $this->parentIds)) {
--            $this->parentIds[] = $id;
-         }
-+        $this->parentProducts[$productId] = $product;
-     }
- 
-     /**
-@@ -130,21 +126,24 @@ class Collection
-      * Fetch all children products from parent id's.
-      *
-      * @return array
-+     * @throws \Exception
-      */
-     private function fetch() : array
-     {
--        if (empty($this->parentIds) || !empty($this->childrenMap)) {
-+        if (empty($this->parentProducts) || !empty($this->childrenMap)) {
-             return $this->childrenMap;
-         }
- 
--        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
--        foreach ($this->parentIds as $id) {
-+        foreach ($this->parentProducts as $product) {
-+            $attributeData = $this->getAttributesCodes($product);
-             /** @var ChildCollection $childCollection */
-             $childCollection = $this->childCollectionFactory->create();
--            /** @var Product $product */
--            $product = $this->productFactory->create();
--            $product->setData($linkField, $id);
-             $childCollection->setProductFilter($product);
-+            $this->collectionProcessor->process(
-+                $childCollection,
-+                $this->searchCriteriaBuilder->create(),
-+                $attributeData
-+            );
- 
-             /** @var Product $childProduct */
-             foreach ($childCollection->getItems() as $childProduct) {
-@@ -160,4 +159,24 @@ class Collection
- 
-         return $this->childrenMap;
-     }
-+
-+    /**
-+     * Get attributes code
-+     *
-+     * @param \Magento\Catalog\Model\Product $currentProduct
-+     * @return array
-+     */
-+    private function getAttributesCodes(Product $currentProduct): array
-+    {
-+        $attributeCodes = [];
-+        $allowAttributes = $currentProduct->getTypeInstance()->getConfigurableAttributes($currentProduct);
-+        foreach ($allowAttributes as $attribute) {
-+            $productAttribute = $attribute->getProductAttribute();
-+            if (!\in_array($productAttribute->getAttributeCode(), $attributeCodes)) {
-+                $attributeCodes[] = $productAttribute->getAttributeCode();
-+            }
-+        }
-+
-+        return $attributeCodes;
-+    }
- }
-diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
-index 267a94a1d43..45a4323e7f4 100644
---- a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
-+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
-@@ -1,5 +1,8 @@
- # Copyright © Magento, Inc. All rights reserved.
- # See COPYING.txt for license details.
-+type Mutation {
-+    addConfigurableProductsToCart(input: AddConfigurableProductsToCartInput): AddConfigurableProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart")
-+}
- 
- type ConfigurableProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "ConfigurableProduct defines basic features of a configurable product and its simple product variants") {
-     variants: [ConfigurableVariant] @doc(description: "An array of variants of products") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\ConfigurableVariant")
-@@ -35,3 +38,30 @@ type ConfigurableProductOptionsValues @doc(description: "ConfigurableProductOpti
-     store_label: String @doc(description: "The label of the product on the current store")
-     use_default_value: Boolean @doc(description: "Indicates whether to use the default_label")
- }
-+
-+input AddConfigurableProductsToCartInput {
-+    cart_id: String!
-+    cart_items: [ConfigurableProductCartItemInput!]!
-+}
-+
-+type AddConfigurableProductsToCartOutput {
-+    cart: Cart!
-+}
-+
-+input ConfigurableProductCartItemInput {
-+    data: CartItemInput!
-+    variant_sku: String!
-+    customizable_options:[CustomizableOptionInput!]
-+}
-+
-+type ConfigurableCartItem implements CartItemInterface {
-+    customizable_options: [SelectedCustomizableOption]!
-+    configurable_options: [SelectedConfigurableOption!]!
-+}
-+
-+type SelectedConfigurableOption {
-+    id: Int!
-+    option_label: String!
-+    value_id: Int!
-+    value_label: String!
-+}
-diff --git a/app/code/Magento/Contact/Controller/Index/Index.php b/app/code/Magento/Contact/Controller/Index/Index.php
-index 4b734c4f9b6..562b0770872 100644
---- a/app/code/Magento/Contact/Controller/Index/Index.php
-+++ b/app/code/Magento/Contact/Controller/Index/Index.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Contact\Controller\Index;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Index extends \Magento\Contact\Controller\Index
-+class Index extends \Magento\Contact\Controller\Index implements HttpGetActionInterface
- {
-     /**
-      * Show Contact Us page
-diff --git a/app/code/Magento/Contact/Controller/Index/Post.php b/app/code/Magento/Contact/Controller/Index/Post.php
-index bdc2fee088d..cbe49a76726 100644
---- a/app/code/Magento/Contact/Controller/Index/Post.php
-+++ b/app/code/Magento/Contact/Controller/Index/Post.php
-@@ -7,6 +7,7 @@
- 
- namespace Magento\Contact\Controller\Index;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Contact\Model\ConfigInterface;
- use Magento\Contact\Model\MailInterface;
- use Magento\Framework\App\Action\Context;
-@@ -17,7 +18,7 @@ use Psr\Log\LoggerInterface;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\DataObject;
- 
--class Post extends \Magento\Contact\Controller\Index
-+class Post extends \Magento\Contact\Controller\Index implements HttpPostActionInterface
- {
-     /**
-      * @var DataPersistorInterface
-diff --git a/app/code/Magento/Contact/Test/Mftf/ActionGroup/AssertMessageContactUsFormActionGroup.xml b/app/code/Magento/Contact/Test/Mftf/ActionGroup/AssertMessageContactUsFormActionGroup.xml
-new file mode 100644
-index 00000000000..eec21948251
---- /dev/null
-+++ b/app/code/Magento/Contact/Test/Mftf/ActionGroup/AssertMessageContactUsFormActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+        
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertMessageContactUsFormActionGroup">
-+        <arguments>
-+            <argument name="message" type="string" defaultValue="Thanks for contacting us with your comments and questions. We'll respond to you very soon." />
-+            <argument name="messageType" type="string" defaultValue="success" />
-+        </arguments>
-+        <see userInput="{{message}}" selector="{{StorefrontContactUsMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontFillContactUsFormActionGroup.xml b/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontFillContactUsFormActionGroup.xml
-new file mode 100644
-index 00000000000..df4964ea042
---- /dev/null
-+++ b/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontFillContactUsFormActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontFillContactUsFormActionGroup">
-+        <arguments>
-+            <argument name="customer" type="entity" />
-+            <argument name="contactUsData" type="entity" />
-+        </arguments>
-+        <fillField selector="{{StorefrontContactUsFormSection.nameField}}"  userInput="{{customer.firstname}}" stepKey="fillName"/>
-+        <fillField selector="{{StorefrontContactUsFormSection.emailField}}"  userInput="{{customer.email}}" stepKey="fillEmail"/>
-+        <fillField selector="{{StorefrontContactUsFormSection.commentField}}"  userInput="{{contactUsData.comment}}" stepKey="fillComment"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontOpenContactUsPageActionGroup.xml b/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontOpenContactUsPageActionGroup.xml
-new file mode 100644
-index 00000000000..d333d5d9989
---- /dev/null
-+++ b/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontOpenContactUsPageActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontOpenContactUsPageActionGroup">
-+        <amOnPage url="{{StorefrontContactUsPage.url}}" stepKey="amOnContactUpPage"/>
-+        <waitForPageLoad stepKey="waitForContactUpPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontSubmitContactUsFormActionGroup.xml b/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontSubmitContactUsFormActionGroup.xml
-new file mode 100644
-index 00000000000..f3fe34f20c3
---- /dev/null
-+++ b/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontSubmitContactUsFormActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontSubmitContactUsFormActionGroup">
-+        <click selector="{{StorefrontContactUsFormSection.submitFormButton}}" stepKey="clickSubmitFormButton"/>
-+        <waitForPageLoad stepKey="waitForCommentSubmitted" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Contact/Test/Mftf/Data/ContactUsData.xml b/app/code/Magento/Contact/Test/Mftf/Data/ContactUsData.xml
-new file mode 100644
-index 00000000000..eadf760776c
---- /dev/null
-+++ b/app/code/Magento/Contact/Test/Mftf/Data/ContactUsData.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="DefaultContactUsData">
-+        <data key="comment" unique="suffix">Lorem ipsum dolor sit amet, ne enim aliquando eam, oblique deserunt no usu. Unique: </data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Contact/Test/Mftf/Page/StorefrontContactUsPage.xml b/app/code/Magento/Contact/Test/Mftf/Page/StorefrontContactUsPage.xml
-new file mode 100644
-index 00000000000..5e793b23385
---- /dev/null
-+++ b/app/code/Magento/Contact/Test/Mftf/Page/StorefrontContactUsPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontContactUsPage" url="/contact/" area="storefront" module="Magento_Contact">
-+        <section name="StorefrontContactUsFormSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsFormSection.xml b/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsFormSection.xml
-new file mode 100644
-index 00000000000..fdaddf33f51
---- /dev/null
-+++ b/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsFormSection.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontContactUsFormSection">
-+        <element name="nameField" type="input" selector="#contact-form input[name='name']" />
-+        <element name="emailField" type="input" selector="#contact-form input[name='email']" />
-+        <element name="phoneField" type="input" selector="#contact-form input[name='telephone']" />
-+        <element name="commentField" type="textarea" selector="#contact-form textarea[name='comment']" />
-+        <element name="submitFormButton" type="button" selector="#contact-form button[type='submit']" timeout="30" />
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsMessagesSection.xml b/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsMessagesSection.xml
-new file mode 100644
-index 00000000000..0970f1f8f6b
---- /dev/null
-+++ b/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsMessagesSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontContactUsMessagesSection">
-+        <element name="messageByType" type="block" selector="#maincontent .message-{{messageType}}" parameterized="true" />
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Contact/view/frontend/email/submitted_form.html b/app/code/Magento/Contact/view/frontend/email/submitted_form.html
-index 1bce6159c58..17146257aef 100644
---- a/app/code/Magento/Contact/view/frontend/email/submitted_form.html
-+++ b/app/code/Magento/Contact/view/frontend/email/submitted_form.html
-@@ -16,19 +16,19 @@
- 
- <table class="message-details">
-     <tr>
--        <td><b>{{trans "Name"}}</b></td>
-+        <td><strong>{{trans "Name"}}</strong></td>
-         <td>{{var data.name}}</td>
-     </tr>
-     <tr>
--        <td><b>{{trans "Email"}}</b></td>
-+        <td><strong>{{trans "Email"}}</strong></td>
-         <td>{{var data.email}}</td>
-     </tr>
-     <tr>
--        <td><b>{{trans "Phone"}}</b></td>
-+        <td><strong>{{trans "Phone"}}</strong></td>
-         <td>{{var data.telephone}}</td>
-     </tr>
- </table>
--<p><b>{{trans "Message"}}</b></p>
-+<p><strong>{{trans "Message"}}</strong></p>
- <p>{{var data.comment}}</p>
- 
- {{template config_path="design/email/footer_template"}}
-diff --git a/app/code/Magento/Contact/view/frontend/templates/form.phtml b/app/code/Magento/Contact/view/frontend/templates/form.phtml
-index d64a991bcaf..673bdc73840 100644
---- a/app/code/Magento/Contact/view/frontend/templates/form.phtml
-+++ b/app/code/Magento/Contact/view/frontend/templates/form.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /** @var \Magento\Contact\Block\ContactForm $block */
- ?>
- <form class="form contact"
-@@ -19,25 +18,25 @@
-         <div class="field name required">
-             <label class="label" for="name"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
-             <div class="control">
--                <input name="name" id="name" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" value="<?= $block->escapeHtmlAttr($this->helper('Magento\Contact\Helper\Data')->getPostValue('name') ?: $this->helper('Magento\Contact\Helper\Data')->getUserName()) ?>" class="input-text" type="text" data-validate="{required:true}"/>
-+                <input name="name" id="name" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" value="<?= $block->escapeHtmlAttr($this->helper(\Magento\Contact\Helper\Data::class)->getPostValue('name') ?: $this->helper(\Magento\Contact\Helper\Data::class)->getUserName()) ?>" class="input-text" type="text" data-validate="{required:true}"/>
-             </div>
-         </div>
-         <div class="field email required">
-             <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
-             <div class="control">
--                <input name="email" id="email" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" value="<?= $block->escapeHtmlAttr($this->helper('Magento\Contact\Helper\Data')->getPostValue('email') ?: $this->helper('Magento\Contact\Helper\Data')->getUserEmail()) ?>" class="input-text" type="email" data-validate="{required:true, 'validate-email':true}"/>
-+                <input name="email" id="email" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" value="<?= $block->escapeHtmlAttr($this->helper(\Magento\Contact\Helper\Data::class)->getPostValue('email') ?: $this->helper(\Magento\Contact\Helper\Data::class)->getUserEmail()) ?>" class="input-text" type="email" data-validate="{required:true, 'validate-email':true}"/>
-             </div>
-         </div>
-         <div class="field telephone">
-             <label class="label" for="telephone"><span><?= $block->escapeHtml(__('Phone Number')) ?></span></label>
-             <div class="control">
--                <input name="telephone" id="telephone" title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>" value="<?= $block->escapeHtmlAttr($this->helper('Magento\Contact\Helper\Data')->getPostValue('telephone')) ?>" class="input-text" type="text" />
-+                <input name="telephone" id="telephone" title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>" value="<?= $block->escapeHtmlAttr($this->helper(\Magento\Contact\Helper\Data::class)->getPostValue('telephone')) ?>" class="input-text" type="text" />
-             </div>
-         </div>
-         <div class="field comment required">
-             <label class="label" for="comment"><span><?= $block->escapeHtml(__('What’s on your mind?')) ?></span></label>
-             <div class="control">
--                <textarea name="comment" id="comment" title="<?= $block->escapeHtmlAttr(__('What’s on your mind?')) ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"><?= $block->escapeHtml($this->helper('Magento\Contact\Helper\Data')->getPostValue('comment')) ?></textarea>
-+                <textarea name="comment" id="comment" title="<?= $block->escapeHtmlAttr(__('What’s on your mind?')) ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"><?= $block->escapeHtml($this->helper(\Magento\Contact\Helper\Data::class)->getPostValue('comment')) ?></textarea>
-             </div>
-         </div>
-         <?= $block->getChildHtml('form.additional.info') ?>
-diff --git a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
-new file mode 100644
-index 00000000000..d79806eecbe
---- /dev/null
-+++ b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
-@@ -0,0 +1,52 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+*/
-+
-+& when (@media-common = true) {
-+    .contact-index-index {
-+        .column:not(.sidebar-main) {
-+            .form.contact {
-+                float: none;
-+                width: 50%;
-+            }
-+        }
-+
-+        .column:not(.sidebar-additional) {
-+            .form.contact {
-+                float: none;
-+                width: 50%;
-+            }
-+        }
-+    }
-+}
-+
-+//
-+//  Desktop
-+//  _____________________________________________
-+
-+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-+    .contact-index-index .column:not(.sidebar-additional) .form.contact {
-+        min-width: 600px;
-+    }
-+}
-+
-+//  Mobile
-+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-+    .contact-index-index {
-+        .column:not(.sidebar-main) {
-+            .form.contact {
-+                float: none;
-+                width: 100%;
-+            }
-+        }
-+
-+        .column:not(.sidebar-additional) {
-+            .form.contact {
-+                float: none;
-+                width: 100%;
-+            }
-+        }
-+    }
-+}
-+
-diff --git a/app/code/Magento/Cookie/Helper/Cookie.php b/app/code/Magento/Cookie/Helper/Cookie.php
-index 05ab02d7a2a..8bab596ab4c 100644
---- a/app/code/Magento/Cookie/Helper/Cookie.php
-+++ b/app/code/Magento/Cookie/Helper/Cookie.php
-@@ -42,7 +42,8 @@ class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param array $data
-      *
--     * @throws \InvalidArgumentException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function __construct(
-         \Magento\Framework\App\Helper\Context $context,
-diff --git a/app/code/Magento/Cookie/etc/adminhtml/system.xml b/app/code/Magento/Cookie/etc/adminhtml/system.xml
-index 26c963ddba7..97904109690 100644
---- a/app/code/Magento/Cookie/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Cookie/etc/adminhtml/system.xml
-@@ -22,7 +22,7 @@
-                     <label>Cookie Domain</label>
-                     <backend_model>Magento\Cookie\Model\Config\Backend\Domain</backend_model>
-                 </field>
--                <field id="cookie_httponly" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <field id="cookie_httponly" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                     <label>Use HTTP Only</label>
-                     <comment>
-                         <![CDATA[<strong style="color:red">Warning</strong>:  Do not set to "No". User security could be compromised.]]>
-diff --git a/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml b/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml
-index c5cfda8cd7d..8712f31e71b 100644
---- a/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml
-+++ b/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml
-@@ -4,11 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Cookie\Block\Html\Notices $block */
- ?>
--<?php if ($this->helper(\Magento\Cookie\Helper\Cookie::class)->isCookieRestrictionModeEnabled()): ?>
-+<?php if ($this->helper(\Magento\Cookie\Helper\Cookie::class)->isCookieRestrictionModeEnabled()) : ?>
-     <div role="alertdialog"
-          tabindex="-1"
-          class="message global cookie"
-diff --git a/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php b/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php
-index 2fc0f0ab4c1..eeef291fb6a 100644
---- a/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php
-+++ b/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php
-@@ -11,6 +11,9 @@
-  */
- namespace Magento\Cron\Model\Config\Backend\Product;
- 
-+/**
-+ * Cron job Alert configuration
-+ */
- class Alert extends \Magento\Framework\App\Config\Value
- {
-     /**
-@@ -61,7 +64,7 @@ class Alert extends \Magento\Framework\App\Config\Value
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return $this
-      * @throws \Exception
-@@ -72,8 +75,8 @@ class Alert extends \Magento\Framework\App\Config\Value
-         $frequency = $this->getData('groups/productalert_cron/fields/frequency/value');
- 
-         $cronExprArray = [
--            intval($time[1]), //Minute
--            intval($time[0]), //Hour
-+            (int)$time[1], //Minute
-+            (int)$time[0], //Hour
-             $frequency == \Magento\Cron\Model\Config\Source\Frequency::CRON_MONTHLY ? '1' : '*', //Day of the Month
-             '*', //Month of the Year
-             $frequency == \Magento\Cron\Model\Config\Source\Frequency::CRON_WEEKLY ? '1' : '*', //Day of the Week
-diff --git a/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php b/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php
-index 68112991664..44ed4c001d2 100644
---- a/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php
-+++ b/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php
-@@ -11,6 +11,9 @@
-  */
- namespace Magento\Cron\Model\Config\Backend;
- 
-+/**
-+ * Sitemap configuration
-+ */
- class Sitemap extends \Magento\Framework\App\Config\Value
- {
-     /**
-@@ -61,6 +64,8 @@ class Sitemap extends \Magento\Framework\App\Config\Value
-     }
- 
-     /**
-+     * After save handler
-+     *
-      * @return $this
-      * @throws \Exception
-      */
-@@ -70,8 +75,8 @@ class Sitemap extends \Magento\Framework\App\Config\Value
-         $frequency = $this->getData('groups/generate/fields/frequency/value');
- 
-         $cronExprArray = [
--            intval($time[1]), //Minute
--            intval($time[0]), //Hour
-+            (int)$time[1], //Minute
-+            (int)$time[0], //Hour
-             $frequency == \Magento\Cron\Model\Config\Source\Frequency::CRON_MONTHLY ? '1' : '*', //Day of the Month
-             '*', //Month of the Year
-             $frequency == \Magento\Cron\Model\Config\Source\Frequency::CRON_WEEKLY ? '1' : '*', //# Day of the Week
-diff --git a/app/code/Magento/Cron/Model/Schedule.php b/app/code/Magento/Cron/Model/Schedule.php
-index b127ecae6f9..582c7c811b7 100644
---- a/app/code/Magento/Cron/Model/Schedule.php
-+++ b/app/code/Magento/Cron/Model/Schedule.php
-@@ -9,6 +9,7 @@ namespace Magento\Cron\Model;
- use Magento\Framework\Exception\CronException;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-+use Magento\Framework\Intl\DateTimeFactory;
- 
- /**
-  * Crontab schedule model
-@@ -50,13 +51,19 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
-      */
-     private $timezoneConverter;
- 
-+    /**
-+     * @var DateTimeFactory
-+     */
-+    private $dateTimeFactory;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-      * @param array $data
--     * @param TimezoneInterface $timezoneConverter
-+     * @param TimezoneInterface|null $timezoneConverter
-+     * @param DateTimeFactory|null $dateTimeFactory
-      */
-     public function __construct(
-         \Magento\Framework\Model\Context $context,
-@@ -64,14 +71,16 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-         array $data = [],
--        TimezoneInterface $timezoneConverter = null
-+        TimezoneInterface $timezoneConverter = null,
-+        DateTimeFactory $dateTimeFactory = null
-     ) {
-         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
-         $this->timezoneConverter = $timezoneConverter ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
-+        $this->dateTimeFactory = $dateTimeFactory ?: ObjectManager::getInstance()->get(DateTimeFactory::class);
-     }
- 
-     /**
--     * @return void
-+     * @inheritdoc
-      */
-     public function _construct()
-     {
-@@ -79,6 +88,8 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Set cron expression.
-+     *
-      * @param string $expr
-      * @return $this
-      * @throws \Magento\Framework\Exception\CronException
-@@ -87,7 +98,7 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
-     {
-         $e = preg_split('#\s+#', $expr, null, PREG_SPLIT_NO_EMPTY);
-         if (sizeof($e) < 5 || sizeof($e) > 6) {
--            throw new CronException(__('The "%1" cron expression is invalid. Verify and try again.', $expr));
-+            throw new CronException(__('Invalid cron expression: %1', $expr));
-         }
- 
-         $this->setCronExprArr($e);
-@@ -95,7 +106,7 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
--     * Checks the observer's cron expression against time
-+     * Checks the observer's cron expression against time.
-      *
-      * Supports $this->setCronExpr('* 0-5,10-59/5 2-10,15-25 january-june/2 mon-fri')
-      *
-@@ -109,22 +120,27 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
-         if (!$e || !$time) {
-             return false;
-         }
-+        $configTimeZone = $this->timezoneConverter->getConfigTimezone();
-+        $storeDateTime = $this->dateTimeFactory->create(null, new \DateTimeZone($configTimeZone));
-         if (!is_numeric($time)) {
-             //convert time from UTC to admin store timezone
-             //we assume that all schedules in configuration (crontab.xml and DB tables) are in admin store timezone
--            $time = $this->timezoneConverter->date($time)->format('Y-m-d H:i');
--            $time = strtotime($time);
-+            $dateTimeUtc = $this->dateTimeFactory->create($time);
-+            $time = $dateTimeUtc->getTimestamp();
-         }
--        $match = $this->matchCronExpression($e[0], strftime('%M', $time))
--            && $this->matchCronExpression($e[1], strftime('%H', $time))
--            && $this->matchCronExpression($e[2], strftime('%d', $time))
--            && $this->matchCronExpression($e[3], strftime('%m', $time))
--            && $this->matchCronExpression($e[4], strftime('%w', $time));
-+        $time = $storeDateTime->setTimestamp($time);
-+        $match = $this->matchCronExpression($e[0], $time->format('i'))
-+            && $this->matchCronExpression($e[1], $time->format('H'))
-+            && $this->matchCronExpression($e[2], $time->format('d'))
-+            && $this->matchCronExpression($e[3], $time->format('m'))
-+            && $this->matchCronExpression($e[4], $time->format('w'));
- 
-         return $match;
-     }
- 
-     /**
-+     * Match cron expression.
-+     *
-      * @param string $expr
-      * @param int $num
-      * @return bool
-@@ -184,13 +200,15 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
-         }
- 
-         if ($from === false || $to === false) {
--            throw new CronException(__('The "%1" cron expression is invalid. Verify and try again.', $expr));
-+            throw new CronException(__('Invalid cron expression: %1', $expr));
-         }
- 
-         return $num >= $from && $num <= $to && $num % $mod === 0;
-     }
- 
-     /**
-+     * Get number of a month.
-+     *
-      * @param int|string $value
-      * @return bool|int|string
-      */
-diff --git a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
-index ed5e46d7a60..5c8aa1dc78a 100644
---- a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
-+++ b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
-@@ -3,18 +3,21 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- /**
-  * Handling cron jobs
-  */
- namespace Magento\Cron\Observer;
- 
-+use Magento\Cron\Model\Schedule;
- use Magento\Framework\App\State;
- use Magento\Framework\Console\Cli;
- use Magento\Framework\Event\ObserverInterface;
--use Magento\Cron\Model\Schedule;
-+use Magento\Framework\Profiler\Driver\Standard\Stat;
-+use Magento\Framework\Profiler\Driver\Standard\StatFactory;
- 
- /**
-+ * The observer for processing cron jobs.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class ProcessCronQueueObserver implements ObserverInterface
-@@ -56,6 +59,16 @@ class ProcessCronQueueObserver implements ObserverInterface
-      */
-     const SECONDS_IN_MINUTE = 60;
- 
-+    /**
-+     * How long to wait for cron group to become unlocked
-+     */
-+    const LOCK_TIMEOUT = 5;
-+
-+    /**
-+     * Static lock prefix for cron group locking
-+     */
-+    const LOCK_PREFIX = 'CRON_GROUP_';
-+
-     /**
-      * @var \Magento\Cron\Model\ResourceModel\Schedule\Collection
-      */
-@@ -116,15 +129,20 @@ class ProcessCronQueueObserver implements ObserverInterface
-      */
-     private $state;
- 
-+    /**
-+     * @var \Magento\Framework\Lock\LockManagerInterface
-+     */
-+    private $lockManager;
-+
-     /**
-      * @var array
-      */
-     private $invalid = [];
- 
-     /**
--     * @var array
-+     * @var Stat
-      */
--    private $jobs;
-+    private $statProfiler;
- 
-     /**
-      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-@@ -137,7 +155,9 @@ class ProcessCronQueueObserver implements ObserverInterface
-      * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
-      * @param \Magento\Framework\Process\PhpExecutableFinderFactory $phpExecutableFinderFactory
-      * @param \Psr\Log\LoggerInterface $logger
--     * @param \Magento\Framework\App\State $state
-+     * @param State $state
-+     * @param StatFactory $statFactory
-+     * @param \Magento\Framework\Lock\LockManagerInterface $lockManager
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -151,7 +171,9 @@ class ProcessCronQueueObserver implements ObserverInterface
-         \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
-         \Magento\Framework\Process\PhpExecutableFinderFactory $phpExecutableFinderFactory,
-         \Psr\Log\LoggerInterface $logger,
--        \Magento\Framework\App\State $state
-+        \Magento\Framework\App\State $state,
-+        StatFactory $statFactory,
-+        \Magento\Framework\Lock\LockManagerInterface $lockManager
-     ) {
-         $this->_objectManager = $objectManager;
-         $this->_scheduleFactory = $scheduleFactory;
-@@ -164,6 +186,8 @@ class ProcessCronQueueObserver implements ObserverInterface
-         $this->phpExecutableFinder = $phpExecutableFinderFactory->create();
-         $this->logger = $logger;
-         $this->state = $state;
-+        $this->statProfiler = $statFactory->create();
-+        $this->lockManager = $lockManager;
-     }
- 
-     /**
-@@ -179,27 +203,25 @@ class ProcessCronQueueObserver implements ObserverInterface
-      */
-     public function execute(\Magento\Framework\Event\Observer $observer)
-     {
--        $pendingJobs = $this->_getPendingSchedules();
-         $currentTime = $this->dateTime->gmtTimestamp();
-         $jobGroupsRoot = $this->_config->getJobs();
-+        // sort jobs groups to start from used in separated process
-+        uksort(
-+            $jobGroupsRoot,
-+            function ($a, $b) {
-+                return $this->getCronGroupConfigurationValue($b, 'use_separate_process')
-+                    - $this->getCronGroupConfigurationValue($a, 'use_separate_process');
-+            }
-+        );
- 
-         $phpPath = $this->phpExecutableFinder->find() ?: 'php';
- 
-         foreach ($jobGroupsRoot as $groupId => $jobsRoot) {
--            $this->_cleanup($groupId);
--            $this->_generate($groupId);
--            if ($this->_request->getParam('group') !== null
--                && $this->_request->getParam('group') !== '\'' . ($groupId) . '\''
--                && $this->_request->getParam('group') !== $groupId
--            ) {
-+            if (!$this->isGroupInFilter($groupId)) {
-                 continue;
-             }
--            if (($this->_request->getParam(self::STANDALONE_PROCESS_STARTED) !== '1') && (
--                    $this->_scopeConfig->getValue(
--                        'system/cron/' . $groupId . '/use_separate_process',
--                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--                    ) == 1
--                )
-+            if ($this->_request->getParam(self::STANDALONE_PROCESS_STARTED) !== '1'
-+                && $this->getCronGroupConfigurationValue($groupId, 'use_separate_process') == 1
-             ) {
-                 $this->_shell->execute(
-                     $phpPath . ' %s cron:run --group=' . $groupId . ' --' . Cli::INPUT_KEY_BOOTSTRAP . '='
-@@ -211,42 +233,42 @@ class ProcessCronQueueObserver implements ObserverInterface
-                 continue;
-             }
- 
--            /** @var \Magento\Cron\Model\Schedule $schedule */
--            foreach ($pendingJobs as $schedule) {
--                $jobConfig = isset($jobsRoot[$schedule->getJobCode()]) ? $jobsRoot[$schedule->getJobCode()] : null;
--                if (!$jobConfig) {
--                    continue;
--                }
--
--                $scheduledTime = strtotime($schedule->getScheduledAt());
--                if ($scheduledTime > $currentTime) {
--                    continue;
-+            $this->lockGroup(
-+                $groupId,
-+                function ($groupId) use ($currentTime, $jobsRoot) {
-+                    $this->cleanupJobs($groupId, $currentTime);
-+                    $this->generateSchedules($groupId);
-+                    $this->processPendingJobs($groupId, $jobsRoot, $currentTime);
-                 }
-+            );
-+        }
-+    }
- 
--                try {
--                    if ($schedule->tryLockJob()) {
--                        $this->_runJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId);
--                    }
--                } catch (\Exception $e) {
--                    $schedule->setMessages($e->getMessage());
--                    if ($schedule->getStatus() === Schedule::STATUS_ERROR) {
--                        $this->logger->critical($e);
--                    }
--                    if ($schedule->getStatus() === Schedule::STATUS_MISSED
--                        && $this->state->getMode() === State::MODE_DEVELOPER
--                    ) {
--                        $this->logger->info(
--                            sprintf(
--                                "%s Schedule Id: %s Job Code: %s",
--                                $schedule->getMessages(),
--                                $schedule->getScheduleId(),
--                                $schedule->getJobCode()
--                            )
--                        );
--                    }
--                }
--                $schedule->save();
--            }
-+    /**
-+     * Lock group
-+     *
-+     * It should be taken by standalone (child) process, not by the parent process.
-+     *
-+     * @param int $groupId
-+     * @param callable $callback
-+     *
-+     * @return void
-+     */
-+    private function lockGroup($groupId, callable $callback)
-+    {
-+        if (!$this->lockManager->lock(self::LOCK_PREFIX . $groupId, self::LOCK_TIMEOUT)) {
-+            $this->logger->warning(
-+                sprintf(
-+                    "Could not acquire lock for cron group: %s, skipping run",
-+                    $groupId
-+                )
-+            );
-+            return;
-+        }
-+        try {
-+            $callback($groupId);
-+        } finally {
-+            $this->lockManager->unlock(self::LOCK_PREFIX . $groupId);
-         }
-     }
- 
-@@ -263,24 +285,25 @@ class ProcessCronQueueObserver implements ObserverInterface
-      */
-     protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId)
-     {
--        $scheduleLifetime = (int)$this->_scopeConfig->getValue(
--            'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_LIFETIME,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--        );
-+        $jobCode = $schedule->getJobCode();
-+        $scheduleLifetime = $this->getCronGroupConfigurationValue($groupId, self::XML_PATH_SCHEDULE_LIFETIME);
-         $scheduleLifetime = $scheduleLifetime * self::SECONDS_IN_MINUTE;
-         if ($scheduledTime < $currentTime - $scheduleLifetime) {
-             $schedule->setStatus(Schedule::STATUS_MISSED);
--            throw new \Exception('Too late for the schedule');
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-+            throw new \Exception(sprintf('Cron Job %s is missed at %s', $jobCode, $schedule->getScheduledAt()));
-         }
- 
-         if (!isset($jobConfig['instance'], $jobConfig['method'])) {
-             $schedule->setStatus(Schedule::STATUS_ERROR);
--            throw new \Exception('No callbacks found');
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-+            throw new \Exception(sprintf('No callbacks found for cron job %s', $jobCode));
-         }
-         $model = $this->_objectManager->create($jobConfig['instance']);
-         $callback = [$model, $jobConfig['method']];
-         if (!is_callable($callback)) {
-             $schedule->setStatus(Schedule::STATUS_ERROR);
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception(
-                 sprintf('Invalid callback: %s::%s can\'t be called', $jobConfig['instance'], $jobConfig['method'])
-             );
-@@ -288,10 +311,21 @@ class ProcessCronQueueObserver implements ObserverInterface
- 
-         $schedule->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', $this->dateTime->gmtTimestamp()))->save();
- 
-+        $this->startProfiling();
-         try {
-+            $this->logger->info(sprintf('Cron Job %s is run', $jobCode));
-+            //phpcs:ignore Magento2.Functions.DiscouragedFunction
-             call_user_func_array($callback, [$schedule]);
-         } catch (\Throwable $e) {
-             $schedule->setStatus(Schedule::STATUS_ERROR);
-+            $this->logger->error(
-+                sprintf(
-+                    'Cron Job %s has an error: %s. Statistics: %s',
-+                    $jobCode,
-+                    $e->getMessage(),
-+                    $this->getProfilingStat()
-+                )
-+            );
-             if (!$e instanceof \Exception) {
-                 $e = new \RuntimeException(
-                     'Error when running a cron job',
-@@ -300,28 +334,96 @@ class ProcessCronQueueObserver implements ObserverInterface
-                 );
-             }
-             throw $e;
-+        } finally {
-+            $this->stopProfiling();
-         }
- 
--        $schedule->setStatus(Schedule::STATUS_SUCCESS)->setFinishedAt(strftime(
--            '%Y-%m-%d %H:%M:%S',
--            $this->dateTime->gmtTimestamp()
--        ));
-+        $schedule->setStatus(
-+            Schedule::STATUS_SUCCESS
-+        )->setFinishedAt(
-+            strftime(
-+                '%Y-%m-%d %H:%M:%S',
-+                $this->dateTime->gmtTimestamp()
-+            )
-+        );
-+
-+        $this->logger->info(
-+            sprintf(
-+                'Cron Job %s is successfully finished. Statistics: %s',
-+                $jobCode,
-+                $this->getProfilingStat()
-+            )
-+        );
-+    }
-+
-+    /**
-+     * Starts profiling
-+     *
-+     * @return void
-+     */
-+    private function startProfiling()
-+    {
-+        $this->statProfiler->clear();
-+        $this->statProfiler->start('job', microtime(true), memory_get_usage(true), memory_get_usage());
-+    }
-+
-+    /**
-+     * Stops profiling
-+     *
-+     * @return void
-+     */
-+    private function stopProfiling()
-+    {
-+        $this->statProfiler->stop('job', microtime(true), memory_get_usage(true), memory_get_usage());
-     }
- 
-     /**
--     * Return job collection from data base with status 'pending'
-+     * Retrieves statistics in the JSON format
-      *
-+     * @return string
-+     */
-+    private function getProfilingStat()
-+    {
-+        $stat = $this->statProfiler->get('job');
-+        unset($stat[Stat::START]);
-+        return json_encode($stat);
-+    }
-+
-+    /**
-+     * Return job collection from data base with status 'pending'.
-+     *
-+     * @param string $groupId
-      * @return \Magento\Cron\Model\ResourceModel\Schedule\Collection
-      */
--    protected function _getPendingSchedules()
-+    private function getPendingSchedules($groupId)
-     {
--        if (!$this->_pendingSchedules) {
--            $this->_pendingSchedules = $this->_scheduleFactory->create()->getCollection()->addFieldToFilter(
--                'status',
--                Schedule::STATUS_PENDING
--            )->load();
--        }
--        return $this->_pendingSchedules;
-+        $jobs = $this->_config->getJobs();
-+        $pendingJobs = $this->_scheduleFactory->create()->getCollection();
-+        $pendingJobs->addFieldToFilter('status', Schedule::STATUS_PENDING);
-+        $pendingJobs->addFieldToFilter('job_code', ['in' => array_keys($jobs[$groupId])]);
-+        return $pendingJobs;
-+    }
-+
-+    /**
-+     * Return job collection from database with status 'pending', 'running' or 'success'
-+     *
-+     * @param string $groupId
-+     * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-+     */
-+    private function getNonExitedSchedules($groupId)
-+    {
-+        $jobs = $this->_config->getJobs();
-+        $pendingJobs = $this->_scheduleFactory->create()->getCollection();
-+        $pendingJobs->addFieldToFilter(
-+            'status',
-+            [
-+                'in' => [
-+                    Schedule::STATUS_PENDING, Schedule::STATUS_RUNNING, Schedule::STATUS_SUCCESS
-+                ]
-+            ]
-+        );
-+        $pendingJobs->addFieldToFilter('job_code', ['in' => array_keys($jobs[$groupId])]);
-+        return $pendingJobs;
-     }
- 
-     /**
-@@ -330,22 +432,32 @@ class ProcessCronQueueObserver implements ObserverInterface
-      * @param string $groupId
-      * @return $this
-      */
--    protected function _generate($groupId)
-+    private function generateSchedules($groupId)
-     {
-         /**
-          * check if schedule generation is needed
-          */
-         $lastRun = (int)$this->_cache->load(self::CACHE_KEY_LAST_SCHEDULE_GENERATE_AT . $groupId);
--        $rawSchedulePeriod = (int)$this->_scopeConfig->getValue(
--            'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_GENERATE_EVERY,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+        $rawSchedulePeriod = (int)$this->getCronGroupConfigurationValue(
-+            $groupId,
-+            self::XML_PATH_SCHEDULE_GENERATE_EVERY
-         );
-         $schedulePeriod = $rawSchedulePeriod * self::SECONDS_IN_MINUTE;
-         if ($lastRun > $this->dateTime->gmtTimestamp() - $schedulePeriod) {
-             return $this;
-         }
- 
--        $schedules = $this->_getPendingSchedules();
-+        /**
-+         * save time schedules generation was ran with no expiration
-+         */
-+        $this->_cache->save(
-+            $this->dateTime->gmtTimestamp(),
-+            self::CACHE_KEY_LAST_SCHEDULE_GENERATE_AT . $groupId,
-+            ['crontab'],
-+            null
-+        );
-+
-+        $schedules = $this->getNonExitedSchedules($groupId);
-         $exists = [];
-         /** @var Schedule $schedule */
-         foreach ($schedules as $schedule) {
-@@ -355,21 +467,11 @@ class ProcessCronQueueObserver implements ObserverInterface
-         /**
-          * generate global crontab jobs
-          */
--        $jobs = $this->getJobs();
-+        $jobs = $this->_config->getJobs();
-         $this->invalid = [];
-         $this->_generateJobs($jobs[$groupId], $exists, $groupId);
-         $this->cleanupScheduleMismatches();
- 
--        /**
--         * save time schedules generation was ran with no expiration
--         */
--        $this->_cache->save(
--            $this->dateTime->gmtTimestamp(),
--            self::CACHE_KEY_LAST_SCHEDULE_GENERATE_AT . $groupId,
--            ['crontab'],
--            null
--        );
--
-         return $this;
-     }
- 
-@@ -379,7 +481,7 @@ class ProcessCronQueueObserver implements ObserverInterface
-      * @param   array $jobs
-      * @param   array $exists
-      * @param   string $groupId
--     * @return  $this
-+     * @return  void
-      */
-     protected function _generateJobs($jobs, $exists, $groupId)
-     {
-@@ -392,80 +494,65 @@ class ProcessCronQueueObserver implements ObserverInterface
-             $timeInterval = $this->getScheduleTimeInterval($groupId);
-             $this->saveSchedule($jobCode, $cronExpression, $timeInterval, $exists);
-         }
--        return $this;
-     }
- 
-     /**
-      * Clean expired jobs
-      *
-      * @param string $groupId
--     * @return $this
-+     * @param int $currentTime
-+     * @return void
-      */
--    protected function _cleanup($groupId)
-+    private function cleanupJobs($groupId, $currentTime)
-     {
--        $this->cleanupDisabledJobs($groupId);
--
-         // check if history cleanup is needed
-         $lastCleanup = (int)$this->_cache->load(self::CACHE_KEY_LAST_HISTORY_CLEANUP_AT . $groupId);
--        $historyCleanUp = (int)$this->_scopeConfig->getValue(
--            'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_CLEANUP_EVERY,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--        );
-+        $historyCleanUp = (int)$this->getCronGroupConfigurationValue($groupId, self::XML_PATH_HISTORY_CLEANUP_EVERY);
-         if ($lastCleanup > $this->dateTime->gmtTimestamp() - $historyCleanUp * self::SECONDS_IN_MINUTE) {
-             return $this;
-         }
--
--        // check how long the record should stay unprocessed before marked as MISSED
--        $scheduleLifetime = (int)$this->_scopeConfig->getValue(
--            'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_LIFETIME,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+        // save time history cleanup was ran with no expiration
-+        $this->_cache->save(
-+            $this->dateTime->gmtTimestamp(),
-+            self::CACHE_KEY_LAST_HISTORY_CLEANUP_AT . $groupId,
-+            ['crontab'],
-+            null
-         );
--        $scheduleLifetime = $scheduleLifetime * self::SECONDS_IN_MINUTE;
- 
--        /**
--         * @var \Magento\Cron\Model\ResourceModel\Schedule\Collection $history
--         */
--        $history = $this->_scheduleFactory->create()->getCollection()->addFieldToFilter(
--            'status',
--            ['in' => [Schedule::STATUS_SUCCESS, Schedule::STATUS_MISSED, Schedule::STATUS_ERROR]]
--        )->load();
-+        $this->cleanupDisabledJobs($groupId);
- 
--        $historySuccess = (int)$this->_scopeConfig->getValue(
--            'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_SUCCESS,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--        );
--        $historyFailure = (int)$this->_scopeConfig->getValue(
--            'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_FAILURE,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--        );
-+        $historySuccess = (int)$this->getCronGroupConfigurationValue($groupId, self::XML_PATH_HISTORY_SUCCESS);
-+        $historyFailure = (int)$this->getCronGroupConfigurationValue($groupId, self::XML_PATH_HISTORY_FAILURE);
-         $historyLifetimes = [
-             Schedule::STATUS_SUCCESS => $historySuccess * self::SECONDS_IN_MINUTE,
-             Schedule::STATUS_MISSED => $historyFailure * self::SECONDS_IN_MINUTE,
-             Schedule::STATUS_ERROR => $historyFailure * self::SECONDS_IN_MINUTE,
-+            Schedule::STATUS_PENDING => max($historyFailure, $historySuccess) * self::SECONDS_IN_MINUTE,
-         ];
- 
--        $now = $this->dateTime->gmtTimestamp();
--        /** @var Schedule $record */
--        foreach ($history as $record) {
--            $checkTime = $record->getExecutedAt() ? strtotime($record->getExecutedAt()) :
--                strtotime($record->getScheduledAt()) + $scheduleLifetime;
--            if ($checkTime < $now - $historyLifetimes[$record->getStatus()]) {
--                $record->delete();
--            }
-+        $jobs = $this->_config->getJobs()[$groupId];
-+        $scheduleResource = $this->_scheduleFactory->create()->getResource();
-+        $connection = $scheduleResource->getConnection();
-+        $count = 0;
-+        foreach ($historyLifetimes as $status => $time) {
-+            $count += $connection->delete(
-+                $scheduleResource->getMainTable(),
-+                [
-+                    'status = ?' => $status,
-+                    'job_code in (?)' => array_keys($jobs),
-+                    'created_at < ?' => $connection->formatDate($currentTime - $time)
-+                ]
-+            );
-         }
- 
--        // save time history cleanup was ran with no expiration
--        $this->_cache->save(
--            $this->dateTime->gmtTimestamp(),
--            self::CACHE_KEY_LAST_HISTORY_CLEANUP_AT . $groupId,
--            ['crontab'],
--            null
--        );
--
--        return $this;
-+        if ($count) {
-+            $this->logger->info(sprintf('%d cron jobs were cleaned', $count));
-+        }
-     }
- 
-     /**
-+     * Get config of schedule.
-+     *
-      * @param array $jobConfig
-      * @return mixed
-      */
-@@ -480,6 +567,8 @@ class ProcessCronQueueObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Save a schedule of cron job.
-+     *
-      * @param string $jobCode
-      * @param string $cronExpression
-      * @param int $timeInterval
-@@ -493,7 +582,7 @@ class ProcessCronQueueObserver implements ObserverInterface
-         for ($time = $currentTime; $time < $timeAhead; $time += self::SECONDS_IN_MINUTE) {
-             $scheduledAt = strftime('%Y-%m-%d %H:%M:00', $time);
-             $alreadyScheduled = !empty($exists[$jobCode . '/' . $scheduledAt]);
--            $schedule = $this->generateSchedule($jobCode, $cronExpression, $time);
-+            $schedule = $this->createSchedule($jobCode, $cronExpression, $time);
-             $valid = $schedule->trySchedule();
-             if (!$valid) {
-                 if ($alreadyScheduled) {
-@@ -512,12 +601,14 @@ class ProcessCronQueueObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Create a schedule of cron job.
-+     *
-      * @param string $jobCode
-      * @param string $cronExpression
-      * @param int $time
-      * @return Schedule
-      */
--    protected function generateSchedule($jobCode, $cronExpression, $time)
-+    protected function createSchedule($jobCode, $cronExpression, $time)
-     {
-         $schedule = $this->_scheduleFactory->create()
-             ->setCronExpr($cronExpression)
-@@ -530,43 +621,55 @@ class ProcessCronQueueObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Get time interval for scheduling.
-+     *
-      * @param string $groupId
-      * @return int
-      */
-     protected function getScheduleTimeInterval($groupId)
-     {
--        $scheduleAheadFor = (int)$this->_scopeConfig->getValue(
--            'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_AHEAD_FOR,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--        );
-+        $scheduleAheadFor = (int)$this->getCronGroupConfigurationValue($groupId, self::XML_PATH_SCHEDULE_AHEAD_FOR);
-         $scheduleAheadFor = $scheduleAheadFor * self::SECONDS_IN_MINUTE;
- 
-         return $scheduleAheadFor;
-     }
- 
-     /**
--     * Clean up scheduled jobs that are disabled in the configuration
--     * This can happen when you turn off a cron job in the config and flush the cache
-+     * Clean up scheduled jobs that are disabled in the configuration.
-+     *
-+     * This can happen when you turn off a cron job in the config and flush the cache.
-      *
-      * @param string $groupId
-      * @return void
-      */
-     private function cleanupDisabledJobs($groupId)
-     {
--        $jobs = $this->getJobs();
-+        $jobs = $this->_config->getJobs();
-+        $jobsToCleanup = [];
-         foreach ($jobs[$groupId] as $jobCode => $jobConfig) {
-             if (!$this->getCronExpression($jobConfig)) {
-                 /** @var \Magento\Cron\Model\ResourceModel\Schedule $scheduleResource */
--                $scheduleResource = $this->_scheduleFactory->create()->getResource();
--                $scheduleResource->getConnection()->delete($scheduleResource->getMainTable(), [
--                    'status=?' => Schedule::STATUS_PENDING,
--                    'job_code=?' => $jobCode,
--                ]);
-+                $jobsToCleanup[] = $jobCode;
-             }
-         }
-+
-+        if (count($jobsToCleanup) > 0) {
-+            $scheduleResource = $this->_scheduleFactory->create()->getResource();
-+            $count = $scheduleResource->getConnection()->delete(
-+                $scheduleResource->getMainTable(),
-+                [
-+                    'status = ?' => Schedule::STATUS_PENDING,
-+                    'job_code in (?)' => $jobsToCleanup,
-+                ]
-+            );
-+
-+            $this->logger->info(sprintf('%d cron jobs were cleaned', $count));
-+        }
-     }
- 
-     /**
-+     * Get cron expression of cron job.
-+     *
-      * @param array $jobConfig
-      * @return null|string
-      */
-@@ -586,33 +689,114 @@ class ProcessCronQueueObserver implements ObserverInterface
-     }
- 
-     /**
--     * Clean up scheduled jobs that do not match their cron expression anymore
--     * This can happen when you change the cron expression and flush the cache
-+     * Clean up scheduled jobs that do not match their cron expression anymore.
-+     *
-+     * This can happen when you change the cron expression and flush the cache.
-      *
-      * @return $this
-      */
-     private function cleanupScheduleMismatches()
-     {
-+        /** @var \Magento\Cron\Model\ResourceModel\Schedule $scheduleResource */
-+        $scheduleResource = $this->_scheduleFactory->create()->getResource();
-         foreach ($this->invalid as $jobCode => $scheduledAtList) {
--            /** @var \Magento\Cron\Model\ResourceModel\Schedule $scheduleResource */
--            $scheduleResource = $this->_scheduleFactory->create()->getResource();
--            $scheduleResource->getConnection()->delete($scheduleResource->getMainTable(), [
--                'status=?' => Schedule::STATUS_PENDING,
--                'job_code=?' => $jobCode,
--                'scheduled_at in (?)' => $scheduledAtList,
--            ]);
-+            $scheduleResource->getConnection()->delete(
-+                $scheduleResource->getMainTable(),
-+                [
-+                    'status = ?' => Schedule::STATUS_PENDING,
-+                    'job_code = ?' => $jobCode,
-+                    'scheduled_at in (?)' => $scheduledAtList,
-+                ]
-+            );
-         }
-         return $this;
-     }
- 
-     /**
--     * @return array
-+     * Get CronGroup Configuration Value.
-+     *
-+     * @param string $groupId
-+     * @param string $path
-+     * @return int
-+     */
-+    private function getCronGroupConfigurationValue($groupId, $path)
-+    {
-+        return $this->_scopeConfig->getValue(
-+            'system/cron/' . $groupId . '/' . $path,
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+        );
-+    }
-+
-+    /**
-+     * Is Group In Filter.
-+     *
-+     * @param string $groupId
-+     * @return bool
-+     */
-+    private function isGroupInFilter($groupId): bool
-+    {
-+        return !($this->_request->getParam('group') !== null
-+            && trim($this->_request->getParam('group'), "'") !== $groupId);
-+    }
-+
-+    /**
-+     * Process pending jobs.
-+     *
-+     * @param string $groupId
-+     * @param array $jobsRoot
-+     * @param int $currentTime
-+     */
-+    private function processPendingJobs($groupId, $jobsRoot, $currentTime)
-+    {
-+        $procesedJobs = [];
-+        $pendingJobs = $this->getPendingSchedules($groupId);
-+        /** @var \Magento\Cron\Model\Schedule $schedule */
-+        foreach ($pendingJobs as $schedule) {
-+            if (isset($procesedJobs[$schedule->getJobCode()])) {
-+                // process only on job per run
-+                continue;
-+            }
-+            $jobConfig = isset($jobsRoot[$schedule->getJobCode()]) ? $jobsRoot[$schedule->getJobCode()] : null;
-+            if (!$jobConfig) {
-+                continue;
-+            }
-+
-+            $scheduledTime = strtotime($schedule->getScheduledAt());
-+            if ($scheduledTime > $currentTime) {
-+                continue;
-+            }
-+
-+            try {
-+                if ($schedule->tryLockJob()) {
-+                    $this->_runJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId);
-+                }
-+            } catch (\Exception $e) {
-+                $this->processError($schedule, $e);
-+            }
-+            if ($schedule->getStatus() === Schedule::STATUS_SUCCESS) {
-+                $procesedJobs[$schedule->getJobCode()] = true;
-+            }
-+            $schedule->save();
-+        }
-+    }
-+
-+    /**
-+     * Process error messages.
-+     *
-+     * @param Schedule $schedule
-+     * @param \Exception $exception
-+     * @return void
-      */
--    private function getJobs()
-+    private function processError(\Magento\Cron\Model\Schedule $schedule, \Exception $exception)
-     {
--        if ($this->jobs === null) {
--            $this->jobs = $this->_config->getJobs();
-+        $schedule->setMessages($exception->getMessage());
-+        if ($schedule->getStatus() === Schedule::STATUS_ERROR) {
-+            $this->logger->critical($exception);
-+        }
-+        if ($schedule->getStatus() === Schedule::STATUS_MISSED
-+            && $this->state->getMode() === State::MODE_DEVELOPER
-+        ) {
-+            $this->logger->info($schedule->getMessages());
-         }
--        return $this->jobs;
-     }
- }
-diff --git a/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php b/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php
-index dd1fa0e79dc..da5539859a4 100644
---- a/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php
-+++ b/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php
-@@ -6,6 +6,9 @@
- namespace Magento\Cron\Test\Unit\Model;
- 
- use Magento\Cron\Model\Schedule;
-+use Magento\Framework\Intl\DateTimeFactory;
-+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- 
- /**
-  * Class \Magento\Cron\Test\Unit\Model\ObserverTest
-@@ -18,11 +21,27 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $helper;
- 
-+    /**
-+     * @var \Magento\Cron\Model\ResourceModel\Schedule
-+     */
-     protected $resourceJobMock;
- 
-+    /**
-+     * @var TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $timezoneConverter;
-+
-+    /**
-+     * @var DateTimeFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $dateTimeFactory;
-+
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
--        $this->helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $this->helper = new ObjectManager($this);
- 
-         $this->resourceJobMock = $this->getMockBuilder(\Magento\Cron\Model\ResourceModel\Schedule::class)
-             ->disableOriginalConstructor()
-@@ -32,18 +51,30 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-         $this->resourceJobMock->expects($this->any())
-             ->method('getIdFieldName')
-             ->will($this->returnValue('id'));
-+
-+        $this->timezoneConverter = $this->getMockBuilder(TimezoneInterface::class)
-+            ->setMethods(['date'])
-+            ->getMockForAbstractClass();
-+
-+        $this->dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class)
-+            ->setMethods(['create'])
-+            ->getMock();
-     }
- 
-     /**
-+     * Test for SetCronExpr
-+     *
-      * @param string $cronExpression
-      * @param array $expected
-+     *
-+     * @return void
-      * @dataProvider setCronExprDataProvider
-      */
--    public function testSetCronExpr($cronExpression, $expected)
-+    public function testSetCronExpr($cronExpression, $expected): void
-     {
-         // 1. Create mocks
--        /** @var \Magento\Cron\Model\Schedule $model */
--        $model = $this->helper->getObject(\Magento\Cron\Model\Schedule::class);
-+        /** @var Schedule $model */
-+        $model = $this->helper->getObject(Schedule::class);
- 
-         // 2. Run tested method
-         $model->setCronExpr($cronExpression);
-@@ -61,7 +92,7 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-      *
-      * @return array
-      */
--    public function setCronExprDataProvider()
-+    public function setCronExprDataProvider(): array
-     {
-         return [
-             ['1 2 3 4 5', [1, 2, 3, 4, 5]],
-@@ -121,27 +152,33 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test for SetCronExprException
-+     *
-      * @param string $cronExpression
-+     *
-+     * @return void
-      * @expectedException \Magento\Framework\Exception\CronException
-      * @dataProvider setCronExprExceptionDataProvider
-      */
--    public function testSetCronExprException($cronExpression)
-+    public function testSetCronExprException($cronExpression): void
-     {
-         // 1. Create mocks
--        /** @var \Magento\Cron\Model\Schedule $model */
--        $model = $this->helper->getObject(\Magento\Cron\Model\Schedule::class);
-+        /** @var Schedule $model */
-+        $model = $this->helper->getObject(Schedule::class);
- 
-         // 2. Run tested method
-         $model->setCronExpr($cronExpression);
-     }
- 
-     /**
-+     * Data provider
-+     *
-      * Here is a list of allowed characters and values for Cron expression
-      * http://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm
-      *
-      * @return array
-      */
--    public function setCronExprExceptionDataProvider()
-+    public function setCronExprExceptionDataProvider(): array
-     {
-         return [
-             [''],
-@@ -153,17 +190,31 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test for trySchedule
-+     *
-      * @param int $scheduledAt
-      * @param array $cronExprArr
-      * @param $expected
-+     *
-+     * @return void
-      * @dataProvider tryScheduleDataProvider
-      */
--    public function testTrySchedule($scheduledAt, $cronExprArr, $expected)
-+    public function testTrySchedule($scheduledAt, $cronExprArr, $expected): void
-     {
-         // 1. Create mocks
-+        $this->timezoneConverter->method('getConfigTimezone')
-+            ->willReturn('UTC');
-+
-+        $this->dateTimeFactory->method('create')
-+            ->willReturn(new \DateTime());
-+
-         /** @var \Magento\Cron\Model\Schedule $model */
-         $model = $this->helper->getObject(
--            \Magento\Cron\Model\Schedule::class
-+            \Magento\Cron\Model\Schedule::class,
-+            [
-+                'timezoneConverter' => $this->timezoneConverter,
-+                'dateTimeFactory' => $this->dateTimeFactory,
-+            ]
-         );
- 
-         // 2. Set fixtures
-@@ -177,22 +228,29 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($expected, $result);
-     }
- 
--    public function testTryScheduleWithConversionToAdminStoreTime()
-+    /**
-+     * Test for tryScheduleWithConversionToAdminStoreTime
-+     *
-+     * @return void
-+     */
-+    public function testTryScheduleWithConversionToAdminStoreTime(): void
-     {
-         $scheduledAt = '2011-12-13 14:15:16';
-         $cronExprArr = ['*', '*', '*', '*', '*'];
- 
--        // 1. Create mocks
--        $timezoneConverter = $this->createMock(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
--        $timezoneConverter->expects($this->once())
--            ->method('date')
--            ->with($scheduledAt)
--            ->willReturn(new \DateTime($scheduledAt));
-+        $this->timezoneConverter->method('getConfigTimezone')
-+            ->willReturn('UTC');
-+
-+        $this->dateTimeFactory->method('create')
-+            ->willReturn(new \DateTime());
- 
-         /** @var \Magento\Cron\Model\Schedule $model */
-         $model = $this->helper->getObject(
-             \Magento\Cron\Model\Schedule::class,
--            ['timezoneConverter' => $timezoneConverter]
-+            [
-+                'timezoneConverter' => $this->timezoneConverter,
-+                'dateTimeFactory' => $this->dateTimeFactory,
-+            ]
-         );
- 
-         // 2. Set fixtures
-@@ -207,11 +265,15 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Data provider
-+     *
-      * @return array
-      */
--    public function tryScheduleDataProvider()
-+    public function tryScheduleDataProvider(): array
-     {
-         $date = '2011-12-13 14:15:16';
-+        $timestamp = (new \DateTime($date))->getTimestamp();
-+        $day = 'Monday';
-         return [
-             [$date, [], false],
-             [$date, null, false],
-@@ -219,22 +281,26 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-             [$date, [], false],
-             [$date, null, false],
-             [$date, false, false],
--            [strtotime($date), ['*', '*', '*', '*', '*'], true],
--            [strtotime($date), ['15', '*', '*', '*', '*'], true],
--            [strtotime($date), ['*', '14', '*', '*', '*'], true],
--            [strtotime($date), ['*', '*', '13', '*', '*'], true],
--            [strtotime($date), ['*', '*', '*', '12', '*'], true],
--            [strtotime('Monday'), ['*', '*', '*', '*', '1'], true],
-+            [$timestamp, ['*', '*', '*', '*', '*'], true],
-+            [$timestamp, ['15', '*', '*', '*', '*'], true],
-+            [$timestamp, ['*', '14', '*', '*', '*'], true],
-+            [$timestamp, ['*', '*', '13', '*', '*'], true],
-+            [$timestamp, ['*', '*', '*', '12', '*'], true],
-+            [(new \DateTime($day))->getTimestamp(), ['*', '*', '*', '*', '1'], true],
-         ];
-     }
- 
-     /**
-+     * Test for matchCronExpression
-+     *
-      * @param string $cronExpressionPart
-      * @param int $dateTimePart
-      * @param bool $expectedResult
-+     *
-+     * @return void
-      * @dataProvider matchCronExpressionDataProvider
-      */
--    public function testMatchCronExpression($cronExpressionPart, $dateTimePart, $expectedResult)
-+    public function testMatchCronExpression($cronExpressionPart, $dateTimePart, $expectedResult): void
-     {
-         // 1. Create mocks
-         /** @var \Magento\Cron\Model\Schedule $model */
-@@ -248,9 +314,11 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Data provider
-+     *
-      * @return array
-      */
--    public function matchCronExpressionDataProvider()
-+    public function matchCronExpressionDataProvider(): array
-     {
-         return [
-             ['*', 0, true],
-@@ -287,11 +355,15 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test for matchCronExpressionException
-+     *
-      * @param string $cronExpressionPart
-+     *
-+     * @return void
-      * @expectedException \Magento\Framework\Exception\CronException
-      * @dataProvider matchCronExpressionExceptionDataProvider
-      */
--    public function testMatchCronExpressionException($cronExpressionPart)
-+    public function testMatchCronExpressionException($cronExpressionPart): void
-     {
-         $dateTimePart = 10;
- 
-@@ -304,24 +376,30 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Data provider
-+     *
-      * @return array
-      */
--    public function matchCronExpressionExceptionDataProvider()
-+    public function matchCronExpressionExceptionDataProvider(): array
-     {
-         return [
-             ['1/2/3'],    //Invalid cron expression, expecting 'match/modulus': 1/2/3
-             ['1/'],       //Invalid cron expression, expecting numeric modulus: 1/
--            ['-'],        //The "-" cron expression is invalid. Verify and try again.
-+            ['-'],        //Invalid cron expression
-             ['1-2-3'],    //Invalid cron expression, expecting 'from-to' structure: 1-2-3
-         ];
-     }
- 
-     /**
-+     * Test for GetNumeric
-+     *
-      * @param mixed $param
-      * @param int $expectedResult
-+     *
-+     * @return void
-      * @dataProvider getNumericDataProvider
-      */
--    public function testGetNumeric($param, $expectedResult)
-+    public function testGetNumeric($param, $expectedResult): void
-     {
-         // 1. Create mocks
-         /** @var \Magento\Cron\Model\Schedule $model */
-@@ -335,9 +413,11 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Data provider
-+     *
-      * @return array
-      */
--    public function getNumericDataProvider()
-+    public function getNumericDataProvider(): array
-     {
-         return [
-             [null, false],
-@@ -362,7 +442,12 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
--    public function testTryLockJobSuccess()
-+    /**
-+     * Test for tryLockJobSuccess
-+     *
-+     * @return void
-+     */
-+    public function testTryLockJobSuccess(): void
-     {
-         $scheduleId = 1;
- 
-@@ -386,7 +471,12 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(Schedule::STATUS_RUNNING, $model->getStatus());
-     }
- 
--    public function testTryLockJobFailure()
-+    /**
-+     * Test for tryLockJobFailure
-+     *
-+     * @return void
-+     */
-+    public function testTryLockJobFailure(): void
-     {
-         $scheduleId = 1;
- 
-diff --git a/app/code/Magento/Cron/Test/Unit/Model/System/Config/Initial/ConverterTest.php b/app/code/Magento/Cron/Test/Unit/Model/System/Config/Initial/ConverterTest.php
-new file mode 100644
-index 00000000000..703926b4c01
---- /dev/null
-+++ b/app/code/Magento/Cron/Test/Unit/Model/System/Config/Initial/ConverterTest.php
-@@ -0,0 +1,89 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Cron\Test\Unit\Model\System\Config\Initial;
-+
-+use Magento\Cron\Model\Groups\Config\Data as GroupsConfigModel;
-+use Magento\Cron\Model\System\Config\Initial\Converter as ConverterPlugin;
-+use Magento\Framework\App\Config\Initial\Converter;
-+
-+/**
-+ * Class ConverterTest
-+ *
-+ * Unit test for \Magento\Cron\Model\System\Config\Initial\Converter
-+ */
-+class ConverterTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var GroupsConfigModel|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $groupsConfigMock;
-+
-+    /**
-+     * @var Converter|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $converterMock;
-+
-+    /**
-+     * @var ConverterPlugin
-+     */
-+    private $converterPlugin;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->groupsConfigMock = $this->getMockBuilder(
-+            GroupsConfigModel::class
-+        )->disableOriginalConstructor()->getMock();
-+        $this->converterMock = $this->getMockBuilder(Converter::class)->getMock();
-+        $this->converterPlugin = new ConverterPlugin($this->groupsConfigMock);
-+    }
-+
-+    /**
-+     * Tests afterConvert method with no $result['data']['default']['system'] set
-+     */
-+    public function testAfterConvertWithNoData()
-+    {
-+        $expectedResult = ['test'];
-+        $this->groupsConfigMock->expects($this->never())
-+            ->method('get');
-+
-+        $result = $this->converterPlugin->afterConvert($this->converterMock, $expectedResult);
-+
-+        self::assertSame($expectedResult, $result);
-+    }
-+
-+    /**
-+     * Tests afterConvert method with $result['data']['default']['system'] set
-+     */
-+    public function testAfterConvertWithData()
-+    {
-+        $groups = [
-+            'group1' => ['val1' => ['value' => '1']],
-+            'group2' => ['val2' => ['value' => '2']]
-+        ];
-+        $expectedResult['data']['default']['system']['cron'] = [
-+            'group1' => [
-+                'val1' => '1'
-+            ],
-+            'group2' => [
-+                'val2' => '2'
-+            ]
-+        ];
-+        $result['data']['default']['system']['cron'] = '1';
-+
-+        $this->groupsConfigMock->expects($this->once())
-+            ->method('get')
-+            ->willReturn($groups);
-+
-+        $result = $this->converterPlugin->afterConvert($this->converterMock, $result);
-+
-+        self::assertEquals($expectedResult, $result);
-+    }
-+}
-diff --git a/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php b/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
-index d8cb79af521..462dde98f99 100644
---- a/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
-+++ b/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
-@@ -8,6 +8,7 @@ namespace Magento\Cron\Test\Unit\Observer;
- use Magento\Cron\Model\Schedule;
- use Magento\Cron\Observer\ProcessCronQueueObserver as ProcessCronQueueObserver;
- use Magento\Framework\App\State;
-+use Magento\Framework\Profiler\Driver\Standard\StatFactory;
- 
- /**
-  * Class \Magento\Cron\Test\Unit\Model\ObserverTest
-@@ -84,6 +85,11 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $appStateMock;
- 
-+    /**
-+     * @var \Magento\Framework\Lock\LockManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $lockManagerMock;
-+
-     /**
-      * @var \Magento\Cron\Model\ResourceModel\Schedule|\PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -116,6 +122,7 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-         )->disableOriginalConstructor()->getMock();
-         $this->_collection->expects($this->any())->method('addFieldToFilter')->will($this->returnSelf());
-         $this->_collection->expects($this->any())->method('load')->will($this->returnSelf());
-+
-         $this->_scheduleFactory = $this->getMockBuilder(
-             \Magento\Cron\Model\ScheduleFactory::class
-         )->setMethods(
-@@ -135,6 +142,12 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        $this->lockManagerMock = $this->getMockBuilder(\Magento\Framework\Lock\LockManagerInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->lockManagerMock->method('lock')->willReturn(true);
-+        $this->lockManagerMock->method('unlock')->willReturn(true);
-+
-         $this->observer = $this->createMock(\Magento\Framework\Event\Observer::class);
- 
-         $this->dateTimeMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\DateTime::class)
-@@ -159,6 +172,16 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-         $this->scheduleResource->method('getConnection')->willReturn($connection);
-         $connection->method('delete')->willReturn(1);
- 
-+        $this->statFactory = $this->getMockBuilder(StatFactory::class)
-+            ->setMethods(['create'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->stat = $this->getMockBuilder(\Magento\Framework\Profiler\Driver\Standard\Stat::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->statFactory->expects($this->any())->method('create')->willReturn($this->stat);
-+
-         $this->_observer = new ProcessCronQueueObserver(
-             $this->_objectManager,
-             $this->_scheduleFactory,
-@@ -170,41 +193,23 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-             $this->dateTimeMock,
-             $phpExecutableFinderFactory,
-             $this->loggerMock,
--            $this->appStateMock
-+            $this->appStateMock,
-+            $this->statFactory,
-+            $this->lockManagerMock
-         );
-     }
- 
--    /**
--     * Test case without saved cron jobs in data base
--     */
--    public function testDispatchNoPendingJobs()
--    {
--        $lastRun = $this->time + 10000000;
--        $this->_cache->expects($this->any())->method('load')->will($this->returnValue($lastRun));
--        $this->_scopeConfig->expects($this->any())->method('getValue')->will($this->returnValue(0));
--
--        $this->_config->expects($this->once())->method('getJobs')->will($this->returnValue([]));
--
--        $scheduleMock = $this->getMockBuilder(
--            \Magento\Cron\Model\Schedule::class
--        )->disableOriginalConstructor()->getMock();
--        $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
--        $this->_scheduleFactory->expects($this->once())->method('create')->will($this->returnValue($scheduleMock));
--
--        $this->_observer->execute($this->observer);
--    }
--
-     /**
-      * Test case for not existed cron jobs in files but in data base is presented
-      */
-     public function testDispatchNoJobConfig()
-     {
-         $lastRun = $this->time + 10000000;
--        $this->_cache->expects($this->any())->method('load')->will($this->returnValue($lastRun));
--        $this->_scopeConfig->expects($this->any())->method('getValue')->will($this->returnValue(0));
-+        $this->_cache->expects($this->atLeastOnce())->method('load')->will($this->returnValue($lastRun));
-+        $this->_scopeConfig->expects($this->atLeastOnce())->method('getValue')->will($this->returnValue(0));
- 
-         $this->_config->expects(
--            $this->any()
-+            $this->atLeastOnce()
-         )->method(
-             'getJobs'
-         )->will(
-@@ -212,16 +217,21 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-         );
- 
-         $schedule = $this->createPartialMock(\Magento\Cron\Model\Schedule::class, ['getJobCode', '__wakeup']);
--        $schedule->expects($this->once())->method('getJobCode')->will($this->returnValue('not_existed_job_code'));
-+        $schedule->expects($this->atLeastOnce())
-+            ->method('getJobCode')
-+            ->will($this->returnValue('not_existed_job_code'));
- 
-         $this->_collection->addItem($schedule);
- 
-         $scheduleMock = $this->getMockBuilder(
-             \Magento\Cron\Model\Schedule::class
-         )->disableOriginalConstructor()->getMock();
--        $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
--        $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
--        $this->_scheduleFactory->expects($this->any())->method('create')->will($this->returnValue($scheduleMock));
-+        $scheduleMock->expects($this->atLeastOnce())
-+            ->method('getCollection')
-+            ->will($this->returnValue($this->_collection));
-+        $this->_scheduleFactory->expects($this->atLeastOnce())
-+            ->method('create')
-+            ->will($this->returnValue($scheduleMock));
- 
-         $this->_observer->execute($this->observer);
-     }
-@@ -240,11 +250,13 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-         $schedule = $this->getMockBuilder(
-             \Magento\Cron\Model\Schedule::class
-         )->setMethods(
--            ['getJobCode', 'tryLockJob', 'getScheduledAt', '__wakeup', 'save']
-+            ['getJobCode', 'tryLockJob', 'getScheduledAt', '__wakeup', 'save', 'setFinishedAt']
-         )->disableOriginalConstructor()->getMock();
-         $schedule->expects($this->any())->method('getJobCode')->will($this->returnValue('test_job1'));
--        $schedule->expects($this->once())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
-+        $schedule->expects($this->atLeastOnce())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
-         $schedule->expects($this->once())->method('tryLockJob')->will($this->returnValue(false));
-+        $schedule->expects($this->never())->method('setFinishedAt');
-+
-         $abstractModel = $this->createMock(\Magento\Framework\Model\AbstractModel::class);
-         $schedule->expects($this->any())->method('save')->will($this->returnValue($abstractModel));
-         $this->_collection->addItem($schedule);
-@@ -262,7 +274,9 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-         )->disableOriginalConstructor()->getMock();
-         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
-         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
--        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->will($this->returnValue($scheduleMock));
-+        $this->_scheduleFactory->expects($this->atLeastOnce())
-+            ->method('create')
-+            ->will($this->returnValue($scheduleMock));
- 
-         $this->_observer->execute($this->observer);
-     }
-@@ -272,10 +286,8 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testDispatchExceptionTooLate()
-     {
--        $exceptionMessage = 'Too late for the schedule';
--        $scheduleId = 42;
-+        $exceptionMessage = 'Cron Job test_job1 is missed at 2017-07-30 15:00:00';
-         $jobCode = 'test_job1';
--        $exception = $exceptionMessage . ' Schedule Id: ' . $scheduleId . ' Job Code: ' . $jobCode;
- 
-         $lastRun = $this->time + 10000000;
-         $this->_cache->expects($this->any())->method('load')->willReturn($lastRun);
-@@ -299,25 +311,25 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-                 'getScheduleId',
-             ]
-         )->disableOriginalConstructor()->getMock();
--        $schedule->expects($this->any())->method('getJobCode')->willReturn($jobCode);
--        $schedule->expects($this->once())->method('getScheduledAt')->willReturn($dateScheduledAt);
-+        $schedule->expects($this->atLeastOnce())->method('getJobCode')->willReturn($jobCode);
-+        $schedule->expects($this->atLeastOnce())->method('getScheduledAt')->willReturn($dateScheduledAt);
-         $schedule->expects($this->once())->method('tryLockJob')->willReturn(true);
-         $schedule->expects(
--            $this->once()
-+            $this->any()
-         )->method(
-             'setStatus'
-         )->with(
-             $this->equalTo(\Magento\Cron\Model\Schedule::STATUS_MISSED)
-         )->willReturnSelf();
-         $schedule->expects($this->once())->method('setMessages')->with($this->equalTo($exceptionMessage));
--        $schedule->expects($this->any())->method('getStatus')->willReturn(Schedule::STATUS_MISSED);
--        $schedule->expects($this->once())->method('getMessages')->willReturn($exceptionMessage);
--        $schedule->expects($this->once())->method('getScheduleId')->willReturn($scheduleId);
-+        $schedule->expects($this->atLeastOnce())->method('getStatus')->willReturn(Schedule::STATUS_MISSED);
-+        $schedule->expects($this->atLeastOnce())->method('getMessages')->willReturn($exceptionMessage);
-         $schedule->expects($this->once())->method('save');
- 
-         $this->appStateMock->expects($this->once())->method('getMode')->willReturn(State::MODE_DEVELOPER);
- 
--        $this->loggerMock->expects($this->once())->method('info')->with($exception);
-+        $this->loggerMock->expects($this->once())->method('info')
-+            ->with('Cron Job test_job1 is missed at 2017-07-30 15:00:00');
- 
-         $this->_collection->addItem($schedule);
- 
-@@ -333,7 +345,7 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()->getMock();
-         $scheduleMock->expects($this->any())->method('getCollection')->willReturn($this->_collection);
-         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
--        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->willReturn($scheduleMock);
-+        $this->_scheduleFactory->expects($this->atLeastOnce())->method('create')->willReturn($scheduleMock);
- 
-         $this->_observer->execute($this->observer);
-     }
-@@ -343,7 +355,8 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testDispatchExceptionNoCallback()
-     {
--        $exceptionMessage = 'No callbacks found';
-+        $jobName = 'test_job1';
-+        $exceptionMessage = 'No callbacks found for cron job ' . $jobName;
-         $exception = new \Exception(__($exceptionMessage));
- 
-         $dateScheduledAt = date('Y-m-d H:i:s', $this->time - 86400);
-@@ -372,7 +385,7 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
- 
-         $this->loggerMock->expects($this->once())->method('critical')->with($exception);
- 
--        $jobConfig = ['test_group' => ['test_job1' => ['instance' => 'Some_Class']]];
-+        $jobConfig = ['test_group' => [$jobName => ['instance' => 'Some_Class']]];
- 
-         $this->_config->expects($this->exactly(2))->method('getJobs')->will($this->returnValue($jobConfig));
- 
-@@ -388,7 +401,7 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-         )->disableOriginalConstructor()->getMock();
-         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
-         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
--        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->will($this->returnValue($scheduleMock));
-+        $this->_scheduleFactory->expects($this->once())->method('create')->will($this->returnValue($scheduleMock));
- 
-         $this->_observer->execute($this->observer);
-     }
-@@ -453,7 +466,7 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-         )->disableOriginalConstructor()->getMock();
-         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
-         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
--        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->will($this->returnValue($scheduleMock));
-+        $this->_scheduleFactory->expects($this->once())->method('create')->will($this->returnValue($scheduleMock));
-         $this->_objectManager
-             ->expects($this->once())
-             ->method('create')
-@@ -469,7 +482,6 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-     public function dispatchExceptionInCallbackDataProvider()
-     {
-         $throwable = new \TypeError();
--
-         return [
-             'non-callable callback' => [
-                 'Not_Existed_Class',
-@@ -496,7 +508,7 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-                     'Error when running a cron job',
-                     0,
-                     $throwable
--                ),
-+                )
-             ],
-         ];
-     }
-@@ -530,23 +542,22 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-             $scheduleMethods
-         )->disableOriginalConstructor()->getMock();
-         $schedule->expects($this->any())->method('getJobCode')->will($this->returnValue('test_job1'));
--        $schedule->expects($this->once())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
--        $schedule->expects($this->once())->method('tryLockJob')->will($this->returnValue(true));
-+        $schedule->expects($this->atLeastOnce())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
-+        $schedule->expects($this->atLeastOnce())->method('tryLockJob')->will($this->returnValue(true));
-+        $schedule->expects($this->any())->method('setFinishedAt')->willReturnSelf();
- 
-         // cron start to execute some job
-         $schedule->expects($this->any())->method('setExecutedAt')->will($this->returnSelf());
--        $schedule->expects($this->at(5))->method('save');
-+        $schedule->expects($this->atLeastOnce())->method('save');
- 
-         // cron end execute some job
-         $schedule->expects(
--            $this->at(6)
-+            $this->atLeastOnce()
-         )->method(
-             'setStatus'
-         )->with(
-             $this->equalTo(\Magento\Cron\Model\Schedule::STATUS_SUCCESS)
--        )->will(
--            $this->returnSelf()
--        );
-+        )->willReturnSelf();
- 
-         $schedule->expects($this->at(8))->method('save');
- 
-@@ -565,7 +576,7 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-         )->disableOriginalConstructor()->getMock();
-         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
-         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
--        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->will($this->returnValue($scheduleMock));
-+        $this->_scheduleFactory->expects($this->once(2))->method('create')->will($this->returnValue($scheduleMock));
- 
-         $testCronJob = $this->getMockBuilder('CronJob')->setMethods(['execute'])->getMock();
-         $testCronJob->expects($this->atLeastOnce())->method('execute')->with($schedule);
-@@ -600,6 +611,8 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-         )->will(
-             $this->returnValue(['test_group' => []])
-         );
-+        $this->_config->expects($this->at(2))->method('getJobs')->will($this->returnValue($jobConfig));
-+        $this->_config->expects($this->at(3))->method('getJobs')->will($this->returnValue($jobConfig));
-         $this->_request->expects($this->any())->method('getParam')->will($this->returnValue('test_group'));
-         $this->_cache->expects(
-             $this->at(0)
-@@ -669,6 +682,8 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-         ];
-         $this->_config->expects($this->at(0))->method('getJobs')->willReturn($jobConfig);
-         $this->_config->expects($this->at(1))->method('getJobs')->willReturn($jobs);
-+        $this->_config->expects($this->at(2))->method('getJobs')->willReturn($jobs);
-+        $this->_config->expects($this->at(3))->method('getJobs')->willReturn($jobs);
-         $this->_request->expects($this->any())->method('getParam')->willReturn('default');
-         $this->_cache->expects(
-             $this->at(0)
-@@ -745,7 +760,7 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-         $this->_request->expects($this->any())->method('getParam')->will($this->returnValue('test_group'));
-         $this->_collection->addItem($schedule);
- 
--        $this->_config->expects($this->exactly(2))->method('getJobs')->will($this->returnValue($jobConfig));
-+        $this->_config->expects($this->atLeastOnce())->method('getJobs')->will($this->returnValue($jobConfig));
- 
-         $this->_cache->expects($this->at(0))->method('load')->will($this->returnValue($this->time + 10000000));
-         $this->_cache->expects($this->at(1))->method('load')->will($this->returnValue($this->time - 10000000));
-@@ -772,7 +787,7 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-         )->setMethods(['getCollection', 'getResource'])->disableOriginalConstructor()->getMock();
-         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($collection));
-         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
--        $this->_scheduleFactory->expects($this->at(1))->method('create')->will($this->returnValue($scheduleMock));
-+        $this->_scheduleFactory->expects($this->any())->method('create')->will($this->returnValue($scheduleMock));
- 
-         $this->_observer->execute($this->observer);
-     }
-@@ -796,55 +811,17 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
-         $this->_cache->expects($this->at(2))->method('load')->will($this->returnValue($this->time + 10000000));
-         $this->_scheduleFactory->expects($this->at(2))->method('create')->will($this->returnValue($scheduleMock));
- 
--        // This item was scheduled 2 days and 2 hours ago
--        $dateScheduledAt = date('Y-m-d H:i:s', $this->time - 180000);
--        /** @var \Magento\Cron\Model\Schedule|\PHPUnit_Framework_MockObject_MockObject $schedule1 */
--        $schedule1 = $this->getMockBuilder(
--            \Magento\Cron\Model\Schedule::class
--        )->disableOriginalConstructor()->setMethods(
--            ['getExecutedAt', 'getScheduledAt', 'getStatus', 'delete', '__wakeup']
--        )->getMock();
--        $schedule1->expects($this->any())->method('getExecutedAt')->will($this->returnValue(null));
--        $schedule1->expects($this->any())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
--        $schedule1->expects($this->any())->method('getStatus')->will($this->returnValue(Schedule::STATUS_MISSED));
--        //we expect this job be deleted from the list
--        $schedule1->expects($this->once())->method('delete')->will($this->returnValue(true));
--        $this->_collection->addItem($schedule1);
--
--        // This item was scheduled 1 day ago
--        $dateScheduledAt = date('Y-m-d H:i:s', $this->time - 86400);
--        $schedule2 = $this->getMockBuilder(
--            \Magento\Cron\Model\Schedule::class
--        )->disableOriginalConstructor()->setMethods(
--            ['getExecutedAt', 'getScheduledAt', 'getStatus', 'delete', '__wakeup']
--        )->getMock();
--        $schedule2->expects($this->any())->method('getExecutedAt')->will($this->returnValue(null));
--        $schedule2->expects($this->any())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
--        $schedule2->expects($this->any())->method('getStatus')->will($this->returnValue(Schedule::STATUS_MISSED));
--        //we don't expect this job be deleted from the list
--        $schedule2->expects($this->never())->method('delete');
--        $this->_collection->addItem($schedule2);
--
--        $this->_config->expects($this->exactly(2))->method('getJobs')->will($this->returnValue($jobConfig));
--
--        $this->_scopeConfig->expects($this->at(0))->method('getValue')
--            ->with($this->equalTo('system/cron/test_group/history_cleanup_every'))
--            ->will($this->returnValue(10));
--        $this->_scopeConfig->expects($this->at(1))->method('getValue')
--            ->with($this->equalTo('system/cron/test_group/schedule_lifetime'))
--            ->will($this->returnValue(2*24*60));
--        $this->_scopeConfig->expects($this->at(2))->method('getValue')
--            ->with($this->equalTo('system/cron/test_group/history_success_lifetime'))
--            ->will($this->returnValue(0));
--        $this->_scopeConfig->expects($this->at(3))->method('getValue')
--            ->with($this->equalTo('system/cron/test_group/history_failure_lifetime'))
--            ->will($this->returnValue(0));
--        $this->_scopeConfig->expects($this->at(4))->method('getValue')
--            ->with($this->equalTo('system/cron/test_group/schedule_generate_every'))
--            ->will($this->returnValue(0));
--        $this->_scopeConfig->expects($this->at(5))->method('getValue')
--            ->with($this->equalTo('system/cron/test_group/use_separate_process'))
--            ->will($this->returnValue(0));
-+        $this->_config->expects($this->atLeastOnce())->method('getJobs')->will($this->returnValue($jobConfig));
-+
-+        $this->_scopeConfig->expects($this->any())->method('getValue')
-+            ->willReturnMap([
-+                ['system/cron/test_group/use_separate_process', 0],
-+                ['system/cron/test_group/history_cleanup_every', 10],
-+                ['system/cron/test_group/schedule_lifetime', 2*24*60],
-+                ['system/cron/test_group/history_success_lifetime', 0],
-+                ['system/cron/test_group/history_failure_lifetime', 0],
-+                ['system/cron/test_group/schedule_generate_every', 0],
-+            ]);
- 
-         $this->_collection->expects($this->any())->method('addFieldToFilter')->will($this->returnSelf());
-         $this->_collection->expects($this->any())->method('load')->will($this->returnSelf());
-diff --git a/app/code/Magento/Cron/etc/db_schema.xml b/app/code/Magento/Cron/etc/db_schema.xml
-index deff05d3eec..b3061eefa63 100644
---- a/app/code/Magento/Cron/etc/db_schema.xml
-+++ b/app/code/Magento/Cron/etc/db_schema.xml
-@@ -18,13 +18,13 @@
-         <column xsi:type="timestamp" name="scheduled_at" on_update="false" nullable="true" comment="Scheduled At"/>
-         <column xsi:type="timestamp" name="executed_at" on_update="false" nullable="true" comment="Executed At"/>
-         <column xsi:type="timestamp" name="finished_at" on_update="false" nullable="true" comment="Finished At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="schedule_id"/>
-         </constraint>
--        <index name="CRON_SCHEDULE_JOB_CODE" indexType="btree">
-+        <index referenceId="CRON_SCHEDULE_JOB_CODE" indexType="btree">
-             <column name="job_code"/>
-         </index>
--        <index name="CRON_SCHEDULE_SCHEDULED_AT_STATUS" indexType="btree">
-+        <index referenceId="CRON_SCHEDULE_SCHEDULED_AT_STATUS" indexType="btree">
-             <column name="scheduled_at"/>
-             <column name="status"/>
-         </index>
-diff --git a/app/code/Magento/Cron/etc/di.xml b/app/code/Magento/Cron/etc/di.xml
-index a37f3760b70..3e3bdc20535 100644
---- a/app/code/Magento/Cron/etc/di.xml
-+++ b/app/code/Magento/Cron/etc/di.xml
-@@ -16,6 +16,18 @@
-     <type name="Magento\Framework\App\Config\Initial\Converter">
-         <plugin name="cron_system_config_initial_converter_plugin" type="Magento\Cron\Model\System\Config\Initial\Converter" />
-     </type>
-+    <virtualType name="Magento\Cron\Model\VirtualLoggerHandler" type="Magento\Framework\Logger\Handler\Base">
-+        <arguments>
-+            <argument name="fileName" xsi:type="string">/var/log/cron.log</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="Magento\Cron\Model\VirtualLogger" type="Magento\Framework\Logger\Monolog">
-+        <arguments>
-+            <argument name="handlers" xsi:type="array">
-+                <item name="system" xsi:type="object">Magento\Cron\Model\VirtualLoggerHandler</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-     <!-- @api -->
-     <virtualType name="shellBackground" type="Magento\Framework\Shell">
-         <arguments>
-@@ -25,6 +37,7 @@
-     <type name="Magento\Cron\Observer\ProcessCronQueueObserver">
-         <arguments>
-             <argument name="shell" xsi:type="object">shellBackground</argument>
-+            <argument name="logger" xsi:type="object">Magento\Cron\Model\VirtualLogger</argument>
-         </arguments>
-     </type>
-     <type name="Magento\Framework\Console\CommandListInterface">
-diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
-index 38e20355b66..34d24a8b0a7 100644
---- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
-+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
-@@ -7,10 +7,13 @@
- 
- namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Controller\ResultFactory;
-+use Magento\CurrencySymbol\Controller\Adminhtml\System\Currency as CurrencyAction;
- 
--class FetchRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
-+class FetchRates extends CurrencyAction implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * Fetch rates action
-diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php
-index 9b07777a14d..a9b1b78cbc6 100644
---- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php
-+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
- 
--class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency implements HttpGetActionInterface
- {
-     /**
-      * Currency management main page
-diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
-index ae13c4d399e..8dd6b5e6fac 100644
---- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
-+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
-@@ -7,7 +7,9 @@
- 
- namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
- 
--class SaveRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class SaveRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency implements HttpPostActionInterface
- {
-     /**
-      * Save rates action
-diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php
-index 808372bd3a6..1762a907a75 100644
---- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php
-+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol;
- 
--class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol implements HttpGetActionInterface
- {
-     /**
-      * Show Currency Symbols Management dialog
-diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
-index eee7961b02f..703117f34fc 100644
---- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
-+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol;
- 
--class Save extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class Save extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol implements HttpPostActionInterface
- {
-     /**
-      * Save custom Currency symbol
-diff --git a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
-index fcde688a1e1..6c7019986cc 100644
---- a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
-+++ b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
-@@ -187,14 +187,16 @@ class Currencysymbol
-     /**
-      * Save currency symbol to config
-      *
--     * @param  $symbols array
-+     * @param array $symbols
-      * @return $this
-      */
-     public function setCurrencySymbolsData($symbols = [])
-     {
--        foreach ($this->getCurrencySymbolsData() as $code => $values) {
--            if (isset($symbols[$code]) && ($symbols[$code] == $values['parentSymbol'] || empty($symbols[$code]))) {
--                unset($symbols[$code]);
-+        if (!$this->_storeManager->isSingleStoreMode()) {
-+            foreach ($this->getCurrencySymbolsData() as $code => $values) {
-+                if (isset($symbols[$code]) && ($symbols[$code] == $values['parentSymbol'] || empty($symbols[$code]))) {
-+                    unset($symbols[$code]);
-+                }
-             }
-         }
-         $value = [];
-diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..9166c8745c9
---- /dev/null
-+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuStoresCurrencyCurrencyRates">
-+        <data key="pageTitle">Currency Rates</data>
-+        <data key="title">Currency Rates</data>
-+        <data key="dataUiId">magento-currencysymbol-system-currency-rates</data>
-+    </entity>
-+    <entity name="AdminMenuStoresCurrencyCurrencySymbols">
-+        <data key="pageTitle">Currency Symbols</data>
-+        <data key="title">Currency Symbols</data>
-+        <data key="dataUiId">magento-currencysymbol-system-currency-symbols</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Page/ConfigCurrencySetupPage.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Page/ConfigCurrencySetupPage.xml
-new file mode 100644
-index 00000000000..f523cb58d3b
---- /dev/null
-+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Page/ConfigCurrencySetupPage.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="ConfigCurrencySetupPage" url="admin/system_config/edit/section/currency" area="admin" module="Magento_Config">
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml
-new file mode 100644
-index 00000000000..20fcd1e8936
---- /dev/null
-+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="CurrencySetupSection">
-+        <element name="allowCurrencies" type="select" selector="#currency_options_allow"/>
-+        <element name="currencyOptions" type="select" selector="#currency_options-head"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..4a33d40d2a3
---- /dev/null
-+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminStoresCurrencyRatesNavigateMenuTest">
-+        <annotations>
-+            <features value="CurrencySymbol"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin stores currency rates navigate menu test"/>
-+            <description value="Admin should be able to navigate to Stores > Currency Rates"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14150"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresCurrencyRatesPage">
-+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuStoresCurrencyCurrencyRates.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuStoresCurrencyCurrencyRates.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencySymbolsNavigateMenuTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencySymbolsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..978917772f2
---- /dev/null
-+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencySymbolsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminStoresCurrencySymbolsNavigateMenuTest">
-+        <annotations>
-+            <features value="CurrencySymbol"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin stores currency symbols navigate menu test"/>
-+            <description value="Admin should be able to navigate to Stores > Currency Symbols"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14151"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresCurrencySymbolsPage">
-+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuStoresCurrencyCurrencySymbols.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuStoresCurrencyCurrencySymbols.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
-index 0ba3c7ed2d7..9248337e5c4 100644
---- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
-+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,29 +10,33 @@
-  */
- ?>
- 
--<form id="currency-symbols-form" action="<?= /* @escapeNotVerified */ $block->getFormActionUrl() ?>" method="post">
--    <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
-+<form id="currency-symbols-form" action="<?= $block->escapeUrl($block->getFormActionUrl()) ?>" method="post">
-+    <input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
-     <fieldset class="admin__fieldset">
--        <?php foreach ($block->getCurrencySymbolsData() as $code => $data): ?>
-+        <?php foreach ($block->getCurrencySymbolsData() as $code => $data) : ?>
-         <div class="admin__field _required">
--            <label class="admin__field-label" for="custom_currency_symbol<?= /* @escapeNotVerified */ $code ?>">
--                <span><?= /* @escapeNotVerified */ $code ?> (<?= /* @escapeNotVerified */ $data['displayName'] ?>)</span>
-+            <label class="admin__field-label" for="custom_currency_symbol<?= $block->escapeHtmlAttr($code) ?>">
-+                <span><?= $block->escapeHtml($code) ?> (<?= $block->escapeHtml($data['displayName']) ?>)</span>
-             </label>
-             <div class="admin__field-control">
--                <input id="custom_currency_symbol<?= /* @escapeNotVerified */ $code ?>"
--                       class="required-entry admin__control-text"
-+                <input id="custom_currency_symbol<?= $block->escapeHtmlAttr($code) ?>"
-+                       class="required-entry admin__control-text <?= $data['inherited'] ? 'disabled' : '' ?>"
-                        type="text"
-                        value="<?= $block->escapeHtmlAttr($data['displaySymbol']) ?>"
--                       <?= $data['inherited'] ? ' disabled="disabled"' : '' ?>
--                       name="custom_currency_symbol[<?= /* @escapeNotVerified */ $code ?>]">
-+                       name="custom_currency_symbol[<?= $block->escapeHtmlAttr($code) ?>]">
-                 <div class="admin__field admin__field-option">
--                    <input id="custom_currency_symbol_inherit<?= /* @escapeNotVerified */ $code ?>"
-+                    <input id="custom_currency_symbol_inherit<?= $block->escapeHtmlAttr($code) ?>"
-                            class="admin__control-checkbox" type="checkbox"
--                           onclick="toggleUseDefault(<?= /* @escapeNotVerified */ '\'' . $code . '\',\'' . $block->escapeJs($data['parentSymbol']) . '\'' ?>)"
-+                           onclick="toggleUseDefault(<?= '\'' . $block->escapeJs($code) . '\',\'' . $block->escapeJs($data['parentSymbol']) . '\'' ?>)"
-                             <?= $data['inherited'] ? ' checked="checked"' : '' ?>
-                            value="1"
--                           name="inherit_custom_currency_symbol[<?= /* @escapeNotVerified */ $code ?>]">
--                    <label class="admin__field-label" for="custom_currency_symbol_inherit<?= /* @escapeNotVerified */ $code ?>"><span><?= /* @escapeNotVerified */ $block->getInheritText() ?></span></label>
-+                           name="inherit_custom_currency_symbol[<?= $block->escapeHtmlAttr($code) ?>]">
-+                    <label class="admin__field-label"
-+                           for="custom_currency_symbol_inherit<?= $block->escapeHtmlAttr($code) ?>">
-+                        <span>
-+                            <?= $block->escapeHtml($block->getInheritText()) ?>
-+                        </span>
-+                    </label>
-                 </div>
-             </div>
-         </div>
-@@ -49,16 +50,18 @@ require(['jquery', "mage/mage", 'prototype'], function(jQuery){
- 
-     function toggleUseDefault(code, value)
-     {
--        checkbox = $('custom_currency_symbol_inherit'+code);
--        input = $('custom_currency_symbol'+code);
--        if (checkbox.checked) {
--            input.value = value;
--            input.disabled = true;
-+        checkbox = jQuery('#custom_currency_symbol_inherit'+code);
-+        input = jQuery('#custom_currency_symbol'+code);
-+
-+        if (checkbox.is(':checked')) {
-+            input.addClass('disabled');
-+            input.val(value);
-+            input.prop('readonly', true);
-         } else {
--            input.disabled = false;
-+            input.removeClass('disabled');
-+            input.prop('readonly', false);
-         }
-     }
--
-     window.toggleUseDefault = toggleUseDefault;
- });
- </script>
-diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
-index 8e0abcb3197..18b3c7eef74 100644
---- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
-+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
-@@ -4,63 +4,59 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
--<?php
- /**
-  * @var $block \Magento\CurrencySymbol\Block\Adminhtml\System\Currency\Rate\Matrix
-  */
--?>
--<?php
-+
- $_oldRates = $block->getOldRates();
- $_newRates = $block->getNewRates();
- $_rates = ($_newRates) ? $_newRates : $_oldRates;
- ?>
--<?php if (empty($_rates)): ?>
--    <div class="message message-warning warning"><p><?= /* @escapeNotVerified */ __('You must first configure currency options before being able to see currency rates.') ?></p></div>
--<?php else: ?>
--    <form name="rateForm" id="rate-form" method="post" action="<?= /* @escapeNotVerified */ $block->getRatesFormAction() ?>">
-+<?php if (empty($_rates)) : ?>
-+    <div class="message message-warning warning"><p><?= $block->escapeHtml(__('You must first configure currency options before being able to see currency rates.')) ?></p></div>
-+<?php else : ?>
-+    <form name="rateForm" id="rate-form" method="post" action="<?= $block->escapeUrl($block->getRatesFormAction()) ?>">
-         <?= $block->getBlockHtml('formkey') ?>
-         <div class="admin__control-table-wrapper">
-             <table class="admin__control-table">
-                 <thead>
-                     <tr>
-                         <th>&nbsp;</th>
--                        <?php $_i = 0; foreach ($block->getAllowedCurrencies() as $_currencyCode): ?>
--                            <th><span><?= /* @escapeNotVerified */ $_currencyCode ?></span></th>
-+                        <?php $_i = 0; foreach ($block->getAllowedCurrencies() as $_currencyCode) : ?>
-+                            <th><span><?= $block->escapeHtml($_currencyCode) ?></span></th>
-                         <?php endforeach; ?>
-                     </tr>
-                 </thead>
--                <?php $_j = 0; foreach ($block->getDefaultCurrencies() as $_currencyCode): ?>
-+                <?php $_j = 0; foreach ($block->getDefaultCurrencies() as $_currencyCode) : ?>
-                 <tr>
--                    <?php if (isset($_rates[$_currencyCode]) && is_array($_rates[$_currencyCode])): ?>
--                        <?php foreach ($_rates[$_currencyCode] as $_rate => $_value): ?>
--                            <?php if (++$_j == 1): ?>
--                                <td><span class="admin__control-support-text"><?= /* @escapeNotVerified */ $_currencyCode ?></span></td>
-+                    <?php if (isset($_rates[$_currencyCode]) && is_array($_rates[$_currencyCode])) : ?>
-+                        <?php foreach ($_rates[$_currencyCode] as $_rate => $_value) : ?>
-+                            <?php if (++$_j == 1) : ?>
-+                                <td><span class="admin__control-support-text"><?= $block->escapeHtml($_currencyCode) ?></span></td>
-                                 <td>
-                                     <input type="text"
--                                           name="rate[<?= /* @escapeNotVerified */ $_currencyCode ?>][<?= /* @escapeNotVerified */ $_rate ?>]"
--                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>"
-+                                           name="rate[<?= $block->escapeHtmlAttr($_currencyCode) ?>][<?= $block->escapeHtmlAttr($_rate) ?>]"
-+                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $block->escapeHtmlAttr($_value) : (isset($_oldRates[$_currencyCode][$_rate]) ? $block->escapeHtmlAttr($_oldRates[$_currencyCode][$_rate]) : '')) ?>"
-                                            class="admin__control-text"
-                                             <?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
--                                    <?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
--                                    <div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
-+                                    <?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])) : ?>
-+                                    <div class="admin__field-note"><?= $block->escapeHtml(__('Old rate:')) ?> <strong><?= $block->escapeHtml($_oldRates[$_currencyCode][$_rate]) ?></strong></div>
-                                     <?php endif; ?>
-                                 </td>
--                            <?php else: ?>
-+                            <?php else : ?>
-                                 <td>
-                                     <input type="text"
--                                           name="rate[<?= /* @escapeNotVerified */ $_currencyCode ?>][<?= /* @escapeNotVerified */ $_rate ?>]"
--                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>"
-+                                           name="rate[<?= $block->escapeHtmlAttr($_currencyCode) ?>][<?= $block->escapeHtmlAttr($_rate) ?>]"
-+                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $block->escapeHtmlAttr($_value) : (isset($_oldRates[$_currencyCode][$_rate]) ? $block->escapeHtmlAttr($_oldRates[$_currencyCode][$_rate]) : '')) ?>"
-                                            class="admin__control-text"
-                                            <?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
--                                    <?php if (isset($_newRates)  && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
--                                    <div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
-+                                    <?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])) : ?>
-+                                    <div class="admin__field-note"><?= $block->escapeHtml(__('Old rate:')) ?> <strong><?= $block->escapeHtml($_oldRates[$_currencyCode][$_rate]) ?></strong></div>
-                                     <?php endif; ?>
-                                 </td>
-                             <?php endif; ?>
--                        <?php endforeach; $_j = 0; ?>
-+                        <?php endforeach; ?>
-+                        <?php $_j = 0; ?>
-                     <?php endif; ?>
-                 </tr>
-                 <?php endforeach; ?>
-diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
-index 985831c5de7..471a4a05daa 100644
---- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
-+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,7 +10,7 @@
-  */
- ?>
- <div class="admin__field">
--    <label class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Import Service') ?></span></label>
-+    <label class="admin__field-label"><span><?= $block->escapeHtml(__('Import Service')) ?></span></label>
-     <div class="admin__field-control">
-         <?= $block->getChildHtml('import_services') ?>
-     </div>
-diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
-index 42b2affa2c1..f5390bee3e4 100644
---- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
-+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,7 +10,7 @@
-  */
- ?>
- 
--<form action="<?= /* @escapeNotVerified */ $block->getImportFormAction() ?>" method="post" class="import-service">
-+<form action="<?= $block->escapeUrl($block->getImportFormAction()) ?>" method="post" class="import-service">
-     <?= $block->getBlockHtml('formkey') ?>
-     <fieldset class="admin__fieldset admin__fieldset-import-service">
-         <?= $block->getServicesHtml() ?>
-diff --git a/app/code/Magento/Customer/Api/AccountManagementInterface.php b/app/code/Magento/Customer/Api/AccountManagementInterface.php
-index d2f9fb7ebc4..10fc2349968 100644
---- a/app/code/Magento/Customer/Api/AccountManagementInterface.php
-+++ b/app/code/Magento/Customer/Api/AccountManagementInterface.php
-@@ -7,6 +7,8 @@
- 
- namespace Magento\Customer\Api;
- 
-+use Magento\Framework\Exception\InputException;
-+
- /**
-  * Interface for managing customers accounts.
-  * @api
-@@ -144,19 +146,24 @@ interface AccountManagementInterface
-     /**
-      * Reset customer password.
-      *
--     * @param string $email
-+     * @param string $email If empty value given then the customer
-+     * will be matched by the RP token.
-      * @param string $resetToken
-      * @param string $newPassword
-+     *
-      * @return bool true on success
-      * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws InputException
-      */
-     public function resetPassword($email, $resetToken, $newPassword);
- 
-     /**
-      * Check if password reset token is valid.
-      *
--     * @param int $customerId
-+     * @param int $customerId If null is given then a customer
-+     * will be matched by the RP token.
-      * @param string $resetPasswordLinkToken
-+     *
-      * @return bool True if the token is valid
-      * @throws \Magento\Framework\Exception\State\InputMismatchException If token is mismatched
-      * @throws \Magento\Framework\Exception\State\ExpiredException If token is expired
-diff --git a/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php b/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php
-index 2133ae5a323..ca9bf4dc7af 100644
---- a/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php
-+++ b/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php
-@@ -51,7 +51,7 @@ interface CustomerRepositoryInterface
-      * Retrieve customers which match a specified criteria.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#CustomerRepositoryInterface to determine
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#CustomerRepositoryInterface to determine
-      * which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-diff --git a/app/code/Magento/Customer/Api/GroupRepositoryInterface.php b/app/code/Magento/Customer/Api/GroupRepositoryInterface.php
-index 2f5e637a769..f6ba387e913 100644
---- a/app/code/Magento/Customer/Api/GroupRepositoryInterface.php
-+++ b/app/code/Magento/Customer/Api/GroupRepositoryInterface.php
-@@ -42,7 +42,7 @@ interface GroupRepositoryInterface
-      * be filtered by tax class.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#GroupRepositoryInterface to determine
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#GroupRepositoryInterface to determine
-      * which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-diff --git a/app/code/Magento/Customer/Block/Account/Dashboard.php b/app/code/Magento/Customer/Block/Account/Dashboard.php
-index fa9c8f98a8c..8e0f79d4577 100644
---- a/app/code/Magento/Customer/Block/Account/Dashboard.php
-+++ b/app/code/Magento/Customer/Block/Account/Dashboard.php
-@@ -114,10 +114,13 @@ class Dashboard extends \Magento\Framework\View\Element\Template
-      * Retrieve the Url for customer orders.
-      *
-      * @return string
-+     * @deprecated Action does not exist
-      */
-     public function getOrdersUrl()
-     {
--        return $this->_urlBuilder->getUrl('customer/order/index', ['_secure' => true]);
-+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
-+        trigger_error('Method is deprecated', E_USER_DEPRECATED);
-+        return '';
-     }
- 
-     /**
-@@ -137,7 +140,7 @@ class Dashboard extends \Magento\Framework\View\Element\Template
-      */
-     public function getWishlistUrl()
-     {
--        return $this->_urlBuilder->getUrl('customer/wishlist/index', ['_secure' => true]);
-+        return $this->_urlBuilder->getUrl('wishlist/index', ['_secure' => true]);
-     }
- 
-     /**
-diff --git a/app/code/Magento/Customer/Block/Account/Dashboard/Info.php b/app/code/Magento/Customer/Block/Account/Dashboard/Info.php
-index ded7238edc7..87132c3afb8 100644
---- a/app/code/Magento/Customer/Block/Account/Dashboard/Info.php
-+++ b/app/code/Magento/Customer/Block/Account/Dashboard/Info.php
-@@ -102,7 +102,7 @@ class Info extends \Magento\Framework\View\Element\Template
-             $this->_subscription = $this->_createSubscriber();
-             $customer = $this->getCustomer();
-             if ($customer) {
--                $this->_subscription->loadByEmail($customer->getEmail());
-+                $this->_subscription->loadByCustomerId($customer->getId());
-             }
-         }
-         return $this->_subscription;
-diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
-index 8b38946a063..04669446ffe 100644
---- a/app/code/Magento/Customer/Block/Address/Book.php
-+++ b/app/code/Magento/Customer/Block/Address/Book.php
-@@ -6,8 +6,8 @@
- namespace Magento\Customer\Block\Address;
- 
- use Magento\Customer\Api\AddressRepositoryInterface;
--use Magento\Customer\Api\CustomerRepositoryInterface;
- use Magento\Customer\Model\Address\Mapper;
-+use Magento\Customer\Block\Address\Grid as AddressesGrid;
- 
- /**
-  * Customer address book block
-@@ -24,7 +24,7 @@ class Book extends \Magento\Framework\View\Element\Template
-     protected $currentCustomer;
- 
-     /**
--     * @var CustomerRepositoryInterface
-+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
-      */
-     protected $customerRepository;
- 
-@@ -43,33 +43,44 @@ class Book extends \Magento\Framework\View\Element\Template
-      */
-     protected $addressMapper;
- 
-+    /**
-+     * @var AddressesGrid
-+     */
-+    private $addressesGrid;
-+
-     /**
-      * @param \Magento\Framework\View\Element\Template\Context $context
--     * @param CustomerRepositoryInterface $customerRepository
-+     * @param CustomerRepositoryInterface|null $customerRepository
-      * @param AddressRepositoryInterface $addressRepository
-      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
-      * @param \Magento\Customer\Model\Address\Config $addressConfig
-      * @param Mapper $addressMapper
-      * @param array $data
-+     * @param AddressesGrid|null $addressesGrid
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         \Magento\Framework\View\Element\Template\Context $context,
--        CustomerRepositoryInterface $customerRepository,
-+        \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository = null,
-         AddressRepositoryInterface $addressRepository,
-         \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
-         \Magento\Customer\Model\Address\Config $addressConfig,
-         Mapper $addressMapper,
--        array $data = []
-+        array $data = [],
-+        Grid $addressesGrid = null
-     ) {
--        $this->customerRepository = $customerRepository;
-         $this->currentCustomer = $currentCustomer;
-         $this->addressRepository = $addressRepository;
-         $this->_addressConfig = $addressConfig;
-         $this->addressMapper = $addressMapper;
-+        $this->addressesGrid = $addressesGrid ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(AddressesGrid::class);
-         parent::__construct($context, $data);
-     }
- 
-     /**
-+     * Prepare the Address Book section layout
-+     *
-      * @return $this
-      */
-     protected function _prepareLayout()
-@@ -79,14 +90,20 @@ class Book extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Generate and return "New Address" URL
-+     *
-      * @return string
-+     * @deprecated not used in this block
-+     * @see \Magento\Customer\Block\Address\Grid::getAddAddressUrl
-      */
-     public function getAddAddressUrl()
-     {
--        return $this->getUrl('customer/address/new', ['_secure' => true]);
-+        return $this->addressesGrid->getAddAddressUrl();
-     }
- 
-     /**
-+     * Generate and return "Back" URL
-+     *
-      * @return string
-      */
-     public function getBackUrl()
-@@ -98,24 +115,37 @@ class Book extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Generate and return "Delete" URL
-+     *
-      * @return string
-+     * @deprecated not used in this block
-+     * @see \Magento\Customer\Block\Address\Grid::getDeleteUrl
-      */
-     public function getDeleteUrl()
-     {
--        return $this->getUrl('customer/address/delete');
-+        return $this->addressesGrid->getDeleteUrl();
-     }
- 
-     /**
-+     * Generate and return "Edit Address" URL.
-+     *
-+     * Address ID passed in parameters
-+     *
-      * @param int $addressId
-      * @return string
-+     * @deprecated not used in this block
-+     * @see \Magento\Customer\Block\Address\Grid::getAddressEditUrl
-      */
-     public function getAddressEditUrl($addressId)
-     {
--        return $this->getUrl('customer/address/edit', ['_secure' => true, 'id' => $addressId]);
-+        return $this->addressesGrid->getAddressEditUrl($addressId);
-     }
- 
-     /**
-+     * Determines is the address primary (billing or shipping)
-+     *
-      * @return bool
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function hasPrimaryAddress()
-     {
-@@ -123,22 +153,22 @@ class Book extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get current additional customer addresses
-+     *
-+     * Will return array of address interfaces if customer have additional addresses and false in other case.
-+     *
-      * @return \Magento\Customer\Api\Data\AddressInterface[]|bool
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @deprecated not used in this block
-+     * @see \Magento\Customer\Block\Address\Grid::getAdditionalAddresses
-      */
-     public function getAdditionalAddresses()
-     {
-         try {
--            $addresses = $this->customerRepository->getById($this->currentCustomer->getCustomerId())->getAddresses();
-+            $addresses = $this->addressesGrid->getAdditionalAddresses();
-         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
--            return false;
--        }
--        $primaryAddressIds = [$this->getDefaultBilling(), $this->getDefaultShipping()];
--        foreach ($addresses as $address) {
--            if (!in_array($address->getId(), $primaryAddressIds)) {
--                $additional[] = $address;
--            }
-         }
--        return empty($additional) ? false : $additional;
-+        return empty($addresses) ? false : $addresses;
-     }
- 
-     /**
-@@ -158,23 +188,23 @@ class Book extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get current customer
-+     *
-      * @return \Magento\Customer\Api\Data\CustomerInterface|null
-      */
-     public function getCustomer()
-     {
--        $customer = $this->getData('customer');
--        if ($customer === null) {
--            try {
--                $customer = $this->customerRepository->getById($this->currentCustomer->getCustomerId());
--            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
--                return null;
--            }
--            $this->setData('customer', $customer);
-+        $customer = null;
-+        try {
-+            $customer = $this->currentCustomer->getCustomer();
-+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-         }
-         return $customer;
-     }
- 
-     /**
-+     * Get customer's default billing address
-+     *
-      * @return int|null
-      */
-     public function getDefaultBilling()
-@@ -188,8 +218,11 @@ class Book extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get customer address by ID
-+     *
-      * @param int $addressId
-      * @return \Magento\Customer\Api\Data\AddressInterface|null
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getAddressById($addressId)
-     {
-@@ -201,6 +234,8 @@ class Book extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get customer's default shipping address
-+     *
-      * @return int|null
-      */
-     public function getDefaultShipping()
-diff --git a/app/code/Magento/Customer/Block/Address/Edit.php b/app/code/Magento/Customer/Block/Address/Edit.php
-index 6a42e9670cc..afefb1138de 100644
---- a/app/code/Magento/Customer/Block/Address/Edit.php
-+++ b/app/code/Magento/Customer/Block/Address/Edit.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Customer\Block\Address;
- 
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Exception\NoSuchEntityException;
- 
- /**
-@@ -46,6 +47,11 @@ class Edit extends \Magento\Directory\Block\Data
-      */
-     protected $dataObjectHelper;
- 
-+    /**
-+     * @var \Magento\Customer\Api\AddressMetadataInterface
-+     */
-+    private $addressMetadata;
-+
-     /**
-      * Constructor
-      *
-@@ -61,6 +67,7 @@ class Edit extends \Magento\Directory\Block\Data
-      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
-      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-      * @param array $data
-+     * @param \Magento\Customer\Api\AddressMetadataInterface|null $addressMetadata
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -76,13 +83,15 @@ class Edit extends \Magento\Directory\Block\Data
-         \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory,
-         \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
-         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
--        array $data = []
-+        array $data = [],
-+        \Magento\Customer\Api\AddressMetadataInterface $addressMetadata = null
-     ) {
-         $this->_customerSession = $customerSession;
-         $this->_addressRepository = $addressRepository;
-         $this->addressDataFactory = $addressDataFactory;
-         $this->currentCustomer = $currentCustomer;
-         $this->dataObjectHelper = $dataObjectHelper;
-+        $this->addressMetadata = $addressMetadata;
-         parent::__construct(
-             $context,
-             $directoryHelper,
-@@ -103,6 +112,32 @@ class Edit extends \Magento\Directory\Block\Data
-     {
-         parent::_prepareLayout();
- 
-+        $this->initAddressObject();
-+
-+        $this->pageConfig->getTitle()->set($this->getTitle());
-+
-+        if ($postedData = $this->_customerSession->getAddressFormData(true)) {
-+            $postedData['region'] = [
-+                'region_id' => isset($postedData['region_id']) ? $postedData['region_id'] : null,
-+                'region' => $postedData['region'],
-+            ];
-+            $this->dataObjectHelper->populateWithArray(
-+                $this->_address,
-+                $postedData,
-+                \Magento\Customer\Api\Data\AddressInterface::class
-+            );
-+        }
-+        $this->precheckRequiredAttributes();
-+        return $this;
-+    }
-+
-+    /**
-+     * Initialize address object.
-+     *
-+     * @return void
-+     */
-+    private function initAddressObject()
-+    {
-         // Init address object
-         if ($addressId = $this->getRequest()->getParam('id')) {
-             try {
-@@ -124,22 +159,26 @@ class Edit extends \Magento\Directory\Block\Data
-             $this->_address->setLastname($customer->getLastname());
-             $this->_address->setSuffix($customer->getSuffix());
-         }
-+    }
- 
--        $this->pageConfig->getTitle()->set($this->getTitle());
--
--        if ($postedData = $this->_customerSession->getAddressFormData(true)) {
--            $postedData['region'] = [
--                'region_id' => isset($postedData['region_id']) ? $postedData['region_id'] : null,
--                'region' => $postedData['region'],
--            ];
--            $this->dataObjectHelper->populateWithArray(
--                $this->_address,
--                $postedData,
--                \Magento\Customer\Api\Data\AddressInterface::class
--            );
-+    /**
-+     * Precheck attributes that may be required in attribute configuration.
-+     *
-+     * @return void
-+     */
-+    private function precheckRequiredAttributes()
-+    {
-+        $precheckAttributes = $this->getData('check_attributes_on_render');
-+        $requiredAttributesPrechecked = [];
-+        if (!empty($precheckAttributes) && is_array($precheckAttributes)) {
-+            foreach ($precheckAttributes as $attributeCode) {
-+                $attributeMetadata = $this->addressMetadata->getAttributeMetadata($attributeCode);
-+                if ($attributeMetadata && $attributeMetadata->isRequired()) {
-+                    $requiredAttributesPrechecked[$attributeCode] = $attributeCode;
-+                }
-+            }
-         }
--
--        return $this;
-+        $this->setData('required_attributes_prechecked', $requiredAttributesPrechecked);
-     }
- 
-     /**
-diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
-new file mode 100644
-index 00000000000..963efc648d9
---- /dev/null
-+++ b/app/code/Magento/Customer/Block/Address/Grid.php
-@@ -0,0 +1,250 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Block\Address;
-+
-+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory as AddressCollectionFactory;
-+use Magento\Directory\Model\CountryFactory;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+
-+/**
-+ * Customer address grid
-+ *
-+ * @api
-+ */
-+class Grid extends \Magento\Framework\View\Element\Template
-+{
-+    /**
-+     * @var \Magento\Customer\Helper\Session\CurrentCustomer
-+     */
-+    private $currentCustomer;
-+
-+    /**
-+     * @var \Magento\Customer\Model\ResourceModel\Address\CollectionFactory
-+     */
-+    private $addressCollectionFactory;
-+
-+    /**
-+     * @var \Magento\Customer\Model\ResourceModel\Address\Collection
-+     */
-+    private $addressCollection;
-+
-+    /**
-+     * @var CountryFactory
-+     */
-+    private $countryFactory;
-+
-+    /**
-+     * @param \Magento\Framework\View\Element\Template\Context $context
-+     * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
-+     * @param AddressCollectionFactory $addressCollectionFactory
-+     * @param CountryFactory $countryFactory
-+     * @param array $data
-+     */
-+    public function __construct(
-+        \Magento\Framework\View\Element\Template\Context $context,
-+        \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
-+        AddressCollectionFactory $addressCollectionFactory,
-+        CountryFactory $countryFactory,
-+        array $data = []
-+    ) {
-+        $this->currentCustomer = $currentCustomer;
-+        $this->addressCollectionFactory = $addressCollectionFactory;
-+        $this->countryFactory = $countryFactory;
-+
-+        parent::__construct($context, $data);
-+    }
-+
-+    /**
-+     * Prepare the Address Book section layout
-+     *
-+     * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    protected function _prepareLayout(): void
-+    {
-+        parent::_prepareLayout();
-+        $this->preparePager();
-+    }
-+
-+    /**
-+     * Generate and return "New Address" URL
-+     *
-+     * @return string
-+     */
-+    public function getAddAddressUrl(): string
-+    {
-+        return $this->getUrl('customer/address/new', ['_secure' => true]);
-+    }
-+
-+    /**
-+     * Generate and return "Delete" URL
-+     *
-+     * @return string
-+     */
-+    public function getDeleteUrl(): string
-+    {
-+        return $this->getUrl('customer/address/delete');
-+    }
-+
-+    /**
-+     * Generate and return "Edit Address" URL.
-+     *
-+     * Address ID passed in parameters
-+     *
-+     * @param int $addressId
-+     * @return string
-+     */
-+    public function getAddressEditUrl($addressId): string
-+    {
-+        return $this->getUrl('customer/address/edit', ['_secure' => true, 'id' => $addressId]);
-+    }
-+
-+    /**
-+     * Get current additional customer addresses
-+     *
-+     * Return array of address interfaces if customer has additional addresses and false in other cases
-+     *
-+     * @return \Magento\Customer\Api\Data\AddressInterface[]
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws NoSuchEntityException
-+     */
-+    public function getAdditionalAddresses(): array
-+    {
-+        $additional = [];
-+        $addresses = $this->getAddressCollection();
-+        $primaryAddressIds = [$this->getDefaultBilling(), $this->getDefaultShipping()];
-+        foreach ($addresses as $address) {
-+            if (!in_array((int)$address->getId(), $primaryAddressIds, true)) {
-+                $additional[] = $address->getDataModel();
-+            }
-+        }
-+        return $additional;
-+    }
-+
-+    /**
-+     * Get current customer
-+     *
-+     * Return stored customer or get it from session
-+     *
-+     * @return \Magento\Customer\Api\Data\CustomerInterface
-+     */
-+    public function getCustomer(): \Magento\Customer\Api\Data\CustomerInterface
-+    {
-+        $customer = $this->getData('customer');
-+        if ($customer === null) {
-+            $customer = $this->currentCustomer->getCustomer();
-+            $this->setData('customer', $customer);
-+        }
-+        return $customer;
-+    }
-+
-+    /**
-+     * Get one string street address from the Address DTO passed in parameters
-+     *
-+     * @param \Magento\Customer\Api\Data\AddressInterface $address
-+     * @return string
-+     */
-+    public function getStreetAddress(\Magento\Customer\Api\Data\AddressInterface $address): string
-+    {
-+        $street = $address->getStreet();
-+        if (is_array($street)) {
-+            $street = implode(', ', $street);
-+        }
-+        return $street;
-+    }
-+
-+    /**
-+     * Get country name by $countryCode
-+     *
-+     * Using \Magento\Directory\Model\Country to get country name by $countryCode
-+     *
-+     * @param string $countryCode
-+     * @return string
-+     */
-+    public function getCountryByCode(string $countryCode): string
-+    {
-+        /** @var \Magento\Directory\Model\Country $country */
-+        $country = $this->countryFactory->create();
-+        return $country->loadByCode($countryCode)->getName();
-+    }
-+
-+    /**
-+     * Get default billing address
-+     *
-+     * Return address string if address found and null if not
-+     *
-+     * @return int
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function getDefaultBilling(): int
-+    {
-+        $customer = $this->getCustomer();
-+
-+        return (int)$customer->getDefaultBilling();
-+    }
-+
-+    /**
-+     * Get default shipping address
-+     *
-+     * Return address string if address found and null if not
-+     *
-+     * @return int
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function getDefaultShipping(): int
-+    {
-+        $customer = $this->getCustomer();
-+
-+        return (int)$customer->getDefaultShipping();
-+    }
-+
-+    /**
-+     * Get pager layout
-+     *
-+     * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function preparePager(): void
-+    {
-+        $addressCollection = $this->getAddressCollection();
-+        if (null !== $addressCollection) {
-+            $pager = $this->getLayout()->createBlock(
-+                \Magento\Theme\Block\Html\Pager::class,
-+                'customer.addresses.pager'
-+            )->setCollection($addressCollection);
-+            $this->setChild('pager', $pager);
-+        }
-+    }
-+
-+    /**
-+     * Get customer addresses collection.
-+     *
-+     * Filters collection by customer id
-+     *
-+     * @return \Magento\Customer\Model\ResourceModel\Address\Collection
-+     * @throws NoSuchEntityException
-+     */
-+    private function getAddressCollection(): \Magento\Customer\Model\ResourceModel\Address\Collection
-+    {
-+        if (null === $this->addressCollection) {
-+            if (null === $this->getCustomer()) {
-+                throw new NoSuchEntityException(__('Customer not logged in'));
-+            }
-+            /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
-+            $collection = $this->addressCollectionFactory->create();
-+            $collection->setOrder('entity_id', 'desc');
-+            $collection->addFieldToFilter(
-+                'entity_id',
-+                ['nin' => [$this->getDefaultBilling(), $this->getDefaultShipping()]]
-+            );
-+            $collection->setCustomerFilter([$this->getCustomer()->getId()]);
-+            $this->addressCollection = $collection;
-+        }
-+        return $this->addressCollection;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/CancelButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/CancelButton.php
-new file mode 100644
-index 00000000000..d94b9569183
---- /dev/null
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/CancelButton.php
-@@ -0,0 +1,42 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Block\Adminhtml\Edit\Address;
-+
-+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
-+use Magento\Customer\Block\Adminhtml\Edit\GenericButton;
-+
-+/**
-+ * Class CancelButton
-+ */
-+class CancelButton extends GenericButton implements ButtonProviderInterface
-+{
-+    /**
-+     * @inheritdoc
-+     *
-+     * @return array
-+     */
-+    public function getButtonData()
-+    {
-+        return [
-+            'label' => __('Cancel'),
-+            'on_click' => '',
-+            'data_attribute' => [
-+                'mage-init' => [
-+                    'Magento_Ui/js/form/button-adapter' => [
-+                        'actions' => [
-+                            [
-+                                'targetName' => 'customer_form.areas.address.address.customer_address_update_modal',
-+                                'actionName' => 'closeModal'
-+                            ],
-+                        ],
-+                    ],
-+                ],
-+            ],
-+            'sort_order' => 20
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/DeleteButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/DeleteButton.php
-new file mode 100644
-index 00000000000..da589a25df2
---- /dev/null
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/DeleteButton.php
-@@ -0,0 +1,65 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Block\Adminhtml\Edit\Address;
-+
-+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
-+use Magento\Customer\Ui\Component\Listing\Address\Column\Actions;
-+
-+/**
-+ * Delete button on edit customer address form
-+ */
-+class DeleteButton extends GenericButton implements ButtonProviderInterface
-+{
-+    /**
-+     * Get delete button data.
-+     *
-+     * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function getButtonData()
-+    {
-+        $data = [];
-+        if ($this->getAddressId()) {
-+            $data = [
-+                'label' => __('Delete'),
-+                'on_click' => '',
-+                'data_attribute' => [
-+                    'mage-init' => [
-+                        'Magento_Ui/js/form/button-adapter' => [
-+                            'actions' => [
-+                                [
-+                                    'targetName' => 'customer_address_form.customer_address_form',
-+                                    'actionName' => 'deleteAddress',
-+                                    'params' => [
-+                                        $this->getDeleteUrl(),
-+                                    ],
-+
-+                                ]
-+                            ],
-+                        ],
-+                    ],
-+                ],
-+                'sort_order' => 20
-+            ];
-+        }
-+        return $data;
-+    }
-+
-+    /**
-+     * Get delete button url.
-+     *
-+     * @return string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function getDeleteUrl(): string
-+    {
-+        return $this->getUrl(
-+            Actions::CUSTOMER_ADDRESS_PATH_DELETE,
-+            ['parent_id' => $this->getCustomerId(), 'id' => $this->getAddressId()]
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/GenericButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/GenericButton.php
-new file mode 100644
-index 00000000000..ae09ee68968
---- /dev/null
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/GenericButton.php
-@@ -0,0 +1,110 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Block\Adminhtml\Edit\Address;
-+
-+use Magento\Customer\Model\AddressFactory;
-+use Magento\Framework\App\RequestInterface;
-+use Magento\Framework\UrlInterface;
-+use Magento\Customer\Model\ResourceModel\Address;
-+use Magento\Customer\Model\ResourceModel\AddressRepository;
-+
-+/**
-+ * Class for common code for buttons on the create/edit address form
-+ */
-+class GenericButton
-+{
-+    /**
-+     * @var AddressFactory
-+     */
-+    private $addressFactory;
-+
-+    /**
-+     * @var UrlInterface
-+     */
-+    private $urlBuilder;
-+
-+    /**
-+     * @var Address
-+     */
-+    private $addressResourceModel;
-+
-+    /**
-+     * @var RequestInterface
-+     */
-+    private $request;
-+
-+    /**
-+     * @var AddressRepository
-+     */
-+    private $addressRepository;
-+
-+    /**
-+     * @param AddressFactory $addressFactory
-+     * @param UrlInterface $urlBuilder
-+     * @param Address $addressResourceModel
-+     * @param RequestInterface $request
-+     * @param AddressRepository $addressRepository
-+     */
-+    public function __construct(
-+        AddressFactory $addressFactory,
-+        UrlInterface $urlBuilder,
-+        Address $addressResourceModel,
-+        RequestInterface $request,
-+        AddressRepository $addressRepository
-+    ) {
-+        $this->addressFactory = $addressFactory;
-+        $this->urlBuilder = $urlBuilder;
-+        $this->addressResourceModel = $addressResourceModel;
-+        $this->request = $request;
-+        $this->addressRepository = $addressRepository;
-+    }
-+
-+    /**
-+     * Return address Id.
-+     *
-+     * @return int|null
-+     */
-+    public function getAddressId()
-+    {
-+        $address = $this->addressFactory->create();
-+
-+        $entityId = $this->request->getParam('entity_id');
-+        $this->addressResourceModel->load(
-+            $address,
-+            $entityId
-+        );
-+
-+        return $address->getEntityId() ?: null;
-+    }
-+
-+    /**
-+     * Get customer id.
-+     *
-+     * @return int|null
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function getCustomerId()
-+    {
-+        $addressId = $this->request->getParam('entity_id');
-+
-+        $address = $this->addressRepository->getById($addressId);
-+
-+        return $address->getCustomerId() ?: null;
-+    }
-+
-+    /**
-+     * Generate url by route and parameters
-+     *
-+     * @param   string $route
-+     * @param   array $params
-+     * @return  string
-+     */
-+    public function getUrl($route = '', array $params = []): string
-+    {
-+        return $this->urlBuilder->getUrl($route, $params);
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/SaveButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/SaveButton.php
-new file mode 100644
-index 00000000000..9d403185ca8
---- /dev/null
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/SaveButton.php
-@@ -0,0 +1,34 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Block\Adminhtml\Edit\Address;
-+
-+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
-+use Magento\Customer\Block\Adminhtml\Edit\GenericButton;
-+
-+/**
-+ * Class SaveButton
-+ */
-+class SaveButton extends GenericButton implements ButtonProviderInterface
-+{
-+    /**
-+     * @inheritdoc
-+     *
-+     * @return array
-+     */
-+    public function getButtonData()
-+    {
-+        return [
-+            'label' => __('Save'),
-+            'class' => 'save primary',
-+            'data_attribute' => [
-+                'mage-init' => ['button' => ['event' => 'save']],
-+                'form-role' => 'save',
-+            ],
-+            'sort_order' => 10
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/DeleteButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/DeleteButton.php
-index e1bb6feb236..38b2f410d2f 100644
---- a/app/code/Magento/Customer/Block/Adminhtml/Edit/DeleteButton.php
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/DeleteButton.php
-@@ -10,6 +10,7 @@ use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
- 
- /**
-  * Class DeleteButton
-+ *
-  * @package Magento\Customer\Block\Adminhtml\Edit
-  */
- class DeleteButton extends GenericButton implements ButtonProviderInterface
-@@ -36,6 +37,8 @@ class DeleteButton extends GenericButton implements ButtonProviderInterface
-     }
- 
-     /**
-+     * Get button data.
-+     *
-      * @return array
-      */
-     public function getButtonData()
-@@ -53,12 +56,15 @@ class DeleteButton extends GenericButton implements ButtonProviderInterface
-                 ],
-                 'on_click' => '',
-                 'sort_order' => 20,
-+                'aclResource' => 'Magento_Customer::delete',
-             ];
-         }
-         return $data;
-     }
- 
-     /**
-+     * Get delete url.
-+     *
-      * @return string
-      */
-     public function getDeleteUrl()
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php
-index 180cb3d66ea..ca24ac9356d 100644
---- a/app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php
-@@ -9,11 +9,14 @@ use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
- 
- /**
-  * Class InvalidateTokenButton
-+ *
-  * @package Magento\Customer\Block\Adminhtml\Edit
-  */
- class InvalidateTokenButton extends GenericButton implements ButtonProviderInterface
- {
-     /**
-+     * Get button data.
-+     *
-      * @return array
-      */
-     public function getButtonData()
-@@ -27,12 +30,15 @@ class InvalidateTokenButton extends GenericButton implements ButtonProviderInter
-                 'class' => 'invalidate-token',
-                 'on_click' => 'deleteConfirm("' . $deleteConfirmMsg . '", "' . $this->getInvalidateTokenUrl() . '")',
-                 'sort_order' => 65,
-+                'aclResource' => 'Magento_Customer::invalidate_tokens',
-             ];
-         }
-         return $data;
-     }
- 
-     /**
-+     * Get invalidate token url.
-+     *
-      * @return string
-      */
-     public function getInvalidateTokenUrl()
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
-index 9a025211c9b..0aeed1562c5 100644
---- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
-@@ -48,7 +48,7 @@ class Region extends \Magento\Backend\Block\AbstractBlock implements
- 
-         $regionId = $element->getForm()->getElement('region_id')->getValue();
- 
--        $html = '<div class="field field-state required admin__field _required">';
-+        $html = '<div class="field field-state admin__field">';
-         $element->setClass('input-text admin__control-text');
-         $element->setRequired(true);
-         $html .= $element->getLabelHtml() . '<div class="control admin__field-control">';
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php
-index f2d1dd9f0a8..f8a6b3505ae 100644
---- a/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php
-@@ -13,6 +13,8 @@ use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
- class ResetPasswordButton extends GenericButton implements ButtonProviderInterface
- {
-     /**
-+     * Retrieve button-specified settings
-+     *
-      * @return array
-      */
-     public function getButtonData()
-@@ -25,12 +27,15 @@ class ResetPasswordButton extends GenericButton implements ButtonProviderInterfa
-                 'class' => 'reset reset-password',
-                 'on_click' => sprintf("location.href = '%s';", $this->getResetPasswordUrl()),
-                 'sort_order' => 60,
-+                'aclResource' => 'Magento_Customer::reset_password',
-             ];
-         }
-         return $data;
-     }
- 
-     /**
-+     * Get reset password url
-+     *
-      * @return string
-      */
-     public function getResetPasswordUrl()
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
-index 43d9af36a56..b9ef3966169 100644
---- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
-@@ -5,11 +5,19 @@
-  */
- namespace Magento\Customer\Block\Adminhtml\Edit\Tab\Newsletter\Grid\Renderer;
- 
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\ObjectManager;
-+
- /**
-  * Adminhtml newsletter queue grid block action item renderer
-  */
- class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
- {
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * Core registry
-      *
-@@ -21,17 +29,24 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
-      * @param \Magento\Backend\Block\Context $context
-      * @param \Magento\Framework\Registry $registry
-      * @param array $data
-+     * @param Escaper|null $escaper
-      */
-     public function __construct(
-         \Magento\Backend\Block\Context $context,
-         \Magento\Framework\Registry $registry,
--        array $data = []
-+        array $data = [],
-+        Escaper $escaper = null
-     ) {
-         $this->_coreRegistry = $registry;
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-         parent::__construct($context, $data);
-     }
- 
-     /**
-+     * Render actions
-+     *
-      * @param \Magento\Framework\DataObject $row
-      * @return string
-      */
-@@ -57,15 +72,20 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
-     }
- 
-     /**
-+     * Retrieve escaped value
-+     *
-      * @param string $value
-      * @return string
-      */
-     protected function _getEscapedValue($value)
-     {
--        return addcslashes(htmlspecialchars($value), '\\\'');
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+        return addcslashes($this->escaper->escapeHtml($value), '\\\'');
-     }
- 
-     /**
-+     * Actions to html
-+     *
-      * @param array $actions
-      * @return string
-      */
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
-index bb190260e47..3d4ccb789dc 100644
---- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
-@@ -57,13 +57,14 @@ class Orders extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _construct()
-     {
-         parent::_construct();
-         $this->setId('customer_orders_grid');
--        $this->setDefaultSort('created_at', 'desc');
-+        $this->setDefaultSort('created_at');
-+        $this->setDefaultDir('desc');
-         $this->setUseAjax(true);
-     }
- 
-@@ -102,11 +103,11 @@ class Orders extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _prepareColumns()
-     {
--        $this->addColumn('increment_id', ['header' => __('Order'), 'width' => '100', 'index' => 'increment_id']);
-+        $this->addColumn('increment_id', ['header' => __('Order #'), 'width' => '100', 'index' => 'increment_id']);
- 
-         $this->addColumn(
-             'created_at',
-@@ -123,7 +124,8 @@ class Orders extends \Magento\Backend\Block\Widget\Grid\Extended
-                 'header' => __('Order Total'),
-                 'index' => 'grand_total',
-                 'type' => 'currency',
--                'currency' => 'order_currency_code'
-+                'currency' => 'order_currency_code',
-+                'rate'  => 1
-             ]
-         );
- 
-@@ -138,7 +140,7 @@ class Orders extends \Magento\Backend\Block\Widget\Grid\Extended
-             $this->addColumn(
-                 'action',
-                 [
--                    'header' => ' ',
-+                    'header' => 'Action',
-                     'filter' => false,
-                     'sortable' => false,
-                     'width' => '100px',
-@@ -162,7 +164,7 @@ class Orders extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getGridUrl()
-     {
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
-index 3f2c7cda760..e63c00ba18d 100644
---- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
-@@ -71,13 +71,14 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _construct()
-     {
-         parent::_construct();
-         $this->setId('customer_view_cart_grid');
--        $this->setDefaultSort('added_at', 'desc');
-+        $this->setDefaultSort('added_at');
-+        $this->setDefaultDir('desc');
-         $this->setSortable(false);
-         $this->setPagerVisibility(false);
-         $this->setFilterVisibility(false);
-@@ -94,7 +95,7 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
-         $quote = $this->getQuote();
- 
-         if ($quote) {
--            $collection = $quote->getItemsCollection(false);
-+            $collection = $quote->getItemsCollection(true);
-         } else {
-             $collection = $this->_dataCollectionFactory->create();
-         }
-@@ -106,7 +107,7 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _prepareColumns()
-     {
-@@ -144,7 +145,7 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getRowUrl($row)
-     {
-@@ -152,7 +153,7 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getHeadersVisibility()
-     {
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
-index 81b7b8b3f96..a6e0eb0bcbc 100644
---- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
-@@ -152,13 +152,12 @@ class PersonalInfo extends \Magento\Backend\Block\Template
-     /**
-      * Set customer registry
-      *
--     * @param \Magento\Framework\Registry $coreRegistry
-+     * @param \Magento\Framework\Registry $customerRegistry
-      * @return void
-      * @deprecated 100.1.0
-      */
-     public function setCustomerRegistry(\Magento\Customer\Model\CustomerRegistry $customerRegistry)
-     {
--
-         $this->customerRegistry = $customerRegistry;
-     }
- 
-@@ -461,7 +460,7 @@ class PersonalInfo extends \Magento\Backend\Block\Template
-             'customer/online_customers/online_minutes_interval',
-             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-         );
--        return intval($configValue) > 0 ? intval($configValue) : self::DEFAULT_ONLINE_MINUTES_INTERVAL;
-+        return (int)$configValue > 0 ? (int)$configValue : self::DEFAULT_ONLINE_MINUTES_INTERVAL;
-     }
- 
-     /**
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
-index 76c33f143e6..5eeacca4c73 100644
---- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
-@@ -147,10 +147,12 @@ class Sales extends \Magento\Backend\Block\Template
-      */
-     public function getWebsiteCount($websiteId)
-     {
--        return isset($this->_websiteCounts[$websiteId]) ? $this->_websiteCounts[$websiteId] : 0;
-+        return $this->_websiteCounts[$websiteId] ?? 0;
-     }
- 
-     /**
-+     * Returns Grouped Collection Rows
-+     *
-      * @return array
-      */
-     public function getRows()
-@@ -159,6 +161,8 @@ class Sales extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Return totals data
-+     *
-      * @return \Magento\Framework\DataObject
-      */
-     public function getTotals()
-@@ -171,7 +175,9 @@ class Sales extends \Magento\Backend\Block\Template
-      *
-      * @param float $price
-      * @param null|int $websiteId
-+     *
-      * @return string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function formatCurrency($price, $websiteId = null)
-     {
-diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Wishlist/Grid/Renderer/Description.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Wishlist/Grid/Renderer/Description.php
-index d0b47886dca..aef91184fc7 100644
---- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Wishlist/Grid/Renderer/Description.php
-+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Wishlist/Grid/Renderer/Description.php
-@@ -18,6 +18,6 @@ class Description extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abs
-      */
-     public function render(\Magento\Framework\DataObject $row)
-     {
--        return nl2br(htmlspecialchars($row->getData($this->getColumn()->getIndex())));
-+        return nl2br($this->escapeHtml($row->getData($this->getColumn()->getIndex())));
-     }
- }
-diff --git a/app/code/Magento/Customer/Block/DataProviders/AddressAttributeData.php b/app/code/Magento/Customer/Block/DataProviders/AddressAttributeData.php
-new file mode 100644
-index 00000000000..2be340c8ccc
---- /dev/null
-+++ b/app/code/Magento/Customer/Block/DataProviders/AddressAttributeData.php
-@@ -0,0 +1,62 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Block\DataProviders;
-+
-+use Magento\Framework\Escaper;
-+use Magento\Framework\View\Element\Block\ArgumentInterface;
-+use Magento\Customer\Api\AddressMetadataInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+
-+/**
-+ * Provides address attribute data into template.
-+ */
-+class AddressAttributeData implements ArgumentInterface
-+{
-+    /**
-+     * @var AddressMetadataInterface
-+     */
-+    private $addressMetadata;
-+
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-+    /**
-+     * @param AddressMetadataInterface $addressMetadata
-+     * @param Escaper $escaper
-+     */
-+    public function __construct(
-+        AddressMetadataInterface $addressMetadata,
-+        Escaper $escaper
-+    ) {
-+
-+        $this->addressMetadata = $addressMetadata;
-+        $this->escaper = $escaper;
-+    }
-+
-+    /**
-+     * Returns frontend label for attribute.
-+     *
-+     * @param string $attributeCode
-+     * @return string
-+     * @throws LocalizedException
-+     */
-+    public function getFrontendLabel(string $attributeCode): string
-+    {
-+        try {
-+            $attribute =  $this->addressMetadata->getAttributeMetadata($attributeCode);
-+            $frontendLabel = $attribute->getFrontendLabel();
-+        } catch (NoSuchEntityException $e) {
-+            $frontendLabel = '';
-+        }
-+
-+        return $this->escaper->escapeHtml(__($frontendLabel));
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php b/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
-new file mode 100644
-index 00000000000..280948439e1
---- /dev/null
-+++ b/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
-@@ -0,0 +1,50 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Block\DataProviders;
-+
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Framework\View\Element\Block\ArgumentInterface;
-+use Magento\Directory\Model\Country\Postcode\Config as PostCodeConfig;
-+
-+/**
-+ * Provides postcodes patterns into template.
-+ */
-+class PostCodesPatternsAttributeData implements ArgumentInterface
-+{
-+    /**
-+     * @var PostCodeConfig
-+     */
-+    private $postCodeConfig;
-+
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $serializer;
-+
-+    /**
-+     * Constructor
-+     *
-+     * @param PostCodeConfig $postCodeConfig
-+     * @param SerializerInterface $serializer
-+     */
-+    public function __construct(PostCodeConfig $postCodeConfig, SerializerInterface $serializer)
-+    {
-+        $this->postCodeConfig = $postCodeConfig;
-+        $this->serializer = $serializer;
-+    }
-+
-+    /**
-+     * Get serialized post codes
-+     *
-+     * @return string
-+     */
-+    public function getSerializedPostCodes(): string
-+    {
-+        return $this->serializer->serialize($this->postCodeConfig->getPostCodes());
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Block/Form/Login.php b/app/code/Magento/Customer/Block/Form/Login.php
-index 7b265ae1f0f..d3d3306a49b 100644
---- a/app/code/Magento/Customer/Block/Form/Login.php
-+++ b/app/code/Magento/Customer/Block/Form/Login.php
-@@ -47,15 +47,6 @@ class Login extends \Magento\Framework\View\Element\Template
-         $this->_customerSession = $customerSession;
-     }
- 
--    /**
--     * @return $this
--     */
--    protected function _prepareLayout()
--    {
--        $this->pageConfig->getTitle()->set(__('Customer Login'));
--        return parent::_prepareLayout();
--    }
--
-     /**
-      * Retrieve form posting url
-      *
-diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
-index f31012a52a9..a190ccde50b 100644
---- a/app/code/Magento/Customer/Block/Form/Register.php
-+++ b/app/code/Magento/Customer/Block/Form/Register.php
-@@ -6,6 +6,7 @@
- namespace Magento\Customer\Block\Form;
- 
- use Magento\Customer\Model\AccountManagement;
-+use Magento\Newsletter\Observer\PredispatchNewsletterObserver;
- 
- /**
-  * Customer register form block
-@@ -22,7 +23,7 @@ class Register extends \Magento\Directory\Block\Data
-     protected $_customerSession;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $_moduleManager;
- 
-@@ -40,7 +41,7 @@ class Register extends \Magento\Directory\Block\Data
-      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
-      * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollectionFactory
-      * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollectionFactory
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Customer\Model\Session $customerSession
-      * @param \Magento\Customer\Model\Url $customerUrl
-      * @param array $data
-@@ -54,7 +55,7 @@ class Register extends \Magento\Directory\Block\Data
-         \Magento\Framework\App\Cache\Type\Config $configCacheType,
-         \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollectionFactory,
-         \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollectionFactory,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Customer\Model\Session $customerSession,
-         \Magento\Customer\Model\Url $customerUrl,
-         array $data = []
-@@ -85,15 +86,6 @@ class Register extends \Magento\Directory\Block\Data
-         return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
-     }
- 
--    /**
--     * @return $this
--     */
--    protected function _prepareLayout()
--    {
--        $this->pageConfig->getTitle()->set(__('Create New Customer Account'));
--        return parent::_prepareLayout();
--    }
--
-     /**
-      * Retrieve form posting url
-      *
-@@ -177,11 +169,13 @@ class Register extends \Magento\Directory\Block\Data
-      */
-     public function isNewsletterEnabled()
-     {
--        return $this->_moduleManager->isOutputEnabled('Magento_Newsletter');
-+        return $this->_moduleManager->isOutputEnabled('Magento_Newsletter')
-+            && $this->getConfig(PredispatchNewsletterObserver::XML_PATH_NEWSLETTER_ACTIVE);
-     }
- 
-     /**
-      * Restore entity data from session
-+     *
-      * Entity and form code must be defined for the form
-      *
-      * @param \Magento\Customer\Model\Metadata\Form $form
-diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
-index 936563d5198..55101fb82af 100644
---- a/app/code/Magento/Customer/Block/Widget/Dob.php
-+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
-@@ -61,7 +61,7 @@ class Dob extends AbstractWidget
-     }
- 
-     /**
--     * @return void
-+     * @inheritdoc
-      */
-     public function _construct()
-     {
-@@ -70,6 +70,8 @@ class Dob extends AbstractWidget
-     }
- 
-     /**
-+     * Check if dob attribute enabled in system
-+     *
-      * @return bool
-      */
-     public function isEnabled()
-@@ -79,6 +81,8 @@ class Dob extends AbstractWidget
-     }
- 
-     /**
-+     * Check if dob attribute marked as required
-+     *
-      * @return bool
-      */
-     public function isRequired()
-@@ -88,6 +92,8 @@ class Dob extends AbstractWidget
-     }
- 
-     /**
-+     * Set date
-+     *
-      * @param string $date
-      * @return $this
-      */
-@@ -135,6 +141,8 @@ class Dob extends AbstractWidget
-     }
- 
-     /**
-+     * Get day
-+     *
-      * @return string|bool
-      */
-     public function getDay()
-@@ -143,6 +151,8 @@ class Dob extends AbstractWidget
-     }
- 
-     /**
-+     * Get month
-+     *
-      * @return string|bool
-      */
-     public function getMonth()
-@@ -151,6 +161,8 @@ class Dob extends AbstractWidget
-     }
- 
-     /**
-+     * Get year
-+     *
-      * @return string|bool
-      */
-     public function getYear()
-@@ -168,6 +180,19 @@ class Dob extends AbstractWidget
-         return __('Date of Birth');
-     }
- 
-+    /**
-+     * Retrieve store attribute label
-+     *
-+     * @param string $attributeCode
-+     *
-+     * @return string
-+     */
-+    public function getStoreLabel($attributeCode)
-+    {
-+        $attribute = $this->_getAttribute($attributeCode);
-+        return $attribute ? __($attribute->getStoreLabel()) : '';
-+    }
-+
-     /**
-      * Create correct date field
-      *
-diff --git a/app/code/Magento/Customer/Block/Widget/Gender.php b/app/code/Magento/Customer/Block/Widget/Gender.php
-index d03c64a54fb..9df3f1072ce 100644
---- a/app/code/Magento/Customer/Block/Widget/Gender.php
-+++ b/app/code/Magento/Customer/Block/Widget/Gender.php
-@@ -64,6 +64,7 @@ class Gender extends AbstractWidget
- 
-     /**
-      * Check if gender attribute enabled in system
-+     *
-      * @return bool
-      */
-     public function isEnabled()
-@@ -73,6 +74,7 @@ class Gender extends AbstractWidget
- 
-     /**
-      * Check if gender attribute marked as required
-+     *
-      * @return bool
-      */
-     public function isRequired()
-@@ -80,6 +82,19 @@ class Gender extends AbstractWidget
-         return $this->_getAttribute('gender') ? (bool)$this->_getAttribute('gender')->isRequired() : false;
-     }
- 
-+    /**
-+     * Retrieve store attribute label
-+     *
-+     * @param string $attributeCode
-+     *
-+     * @return string
-+     */
-+    public function getStoreLabel($attributeCode)
-+    {
-+        $attribute = $this->_getAttribute($attributeCode);
-+        return $attribute ? __($attribute->getStoreLabel()) : '';
-+    }
-+
-     /**
-      * Get current customer from session
-      *
-@@ -92,6 +107,7 @@ class Gender extends AbstractWidget
- 
-     /**
-      * Returns options from gender attribute
-+     *
-      * @return OptionInterface[]
-      */
-     public function getGenderOptions()
-diff --git a/app/code/Magento/Customer/Block/Widget/Name.php b/app/code/Magento/Customer/Block/Widget/Name.php
-index d50045f4a40..6f1b051af74 100644
---- a/app/code/Magento/Customer/Block/Widget/Name.php
-+++ b/app/code/Magento/Customer/Block/Widget/Name.php
-@@ -55,7 +55,7 @@ class Name extends AbstractWidget
-     }
- 
-     /**
--     * @return void
-+     * @inheritdoc
-      */
-     public function _construct()
-     {
-@@ -245,10 +245,13 @@ class Name extends AbstractWidget
-      */
-     public function getAttributeValidationClass($attributeCode)
-     {
--        return $this->_addressHelper->getAttributeValidationClass($attributeCode);
-+        $attributeMetadata = $this->_getAttribute($attributeCode);
-+        return $attributeMetadata ? $attributeMetadata->getFrontendClass() : '';
-     }
- 
-     /**
-+     * Check if attribute is required
-+     *
-      * @param string $attributeCode
-      * @return bool
-      */
-@@ -259,6 +262,8 @@ class Name extends AbstractWidget
-     }
- 
-     /**
-+     * Check if attribute is visible
-+     *
-      * @param string $attributeCode
-      * @return bool
-      */
-diff --git a/app/code/Magento/Customer/Block/Widget/Taxvat.php b/app/code/Magento/Customer/Block/Widget/Taxvat.php
-index e5c9c01dc3a..e35f04f592a 100644
---- a/app/code/Magento/Customer/Block/Widget/Taxvat.php
-+++ b/app/code/Magento/Customer/Block/Widget/Taxvat.php
-@@ -63,4 +63,17 @@ class Taxvat extends AbstractWidget
-     {
-         return $this->_getAttribute('taxvat') ? (bool)$this->_getAttribute('taxvat')->isRequired() : false;
-     }
-+
-+    /**
-+     * Retrieve store attribute label
-+     *
-+     * @param string $attributeCode
-+     *
-+     * @return string
-+     */
-+    public function getStoreLabel($attributeCode)
-+    {
-+        $attribute = $this->_getAttribute($attributeCode);
-+        return $attribute ? __($attribute->getStoreLabel()) : '';
-+    }
- }
-diff --git a/app/code/Magento/Customer/Controller/Account/Create.php b/app/code/Magento/Customer/Controller/Account/Create.php
-index 8f1bc107547..450fe461534 100644
---- a/app/code/Magento/Customer/Controller/Account/Create.php
-+++ b/app/code/Magento/Customer/Controller/Account/Create.php
-@@ -6,12 +6,13 @@
-  */
- namespace Magento\Customer\Controller\Account;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Customer\Model\Registration;
- use Magento\Customer\Model\Session;
- use Magento\Framework\View\Result\PageFactory;
- use Magento\Framework\App\Action\Context;
- 
--class Create extends \Magento\Customer\Controller\AbstractAccount
-+class Create extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Customer\Model\Registration
-diff --git a/app/code/Magento/Customer/Controller/Account/CreatePassword.php b/app/code/Magento/Customer/Controller/Account/CreatePassword.php
-index fb2e3dd4290..d12ec57d3c3 100644
---- a/app/code/Magento/Customer/Controller/Account/CreatePassword.php
-+++ b/app/code/Magento/Customer/Controller/Account/CreatePassword.php
-@@ -1,17 +1,26 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Customer\Controller\Account;
- 
- use Magento\Customer\Api\AccountManagementInterface;
-+use Magento\Customer\Model\ForgotPasswordToken\ConfirmCustomerByToken;
- use Magento\Customer\Model\Session;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Framework\View\Result\PageFactory;
- use Magento\Framework\App\Action\Context;
-+use Magento\Framework\App\ObjectManager;
- 
--class CreatePassword extends \Magento\Customer\Controller\AbstractAccount
-+/**
-+ * Class CreatePassword
-+ *
-+ * @package Magento\Customer\Controller\Account
-+ */
-+class CreatePassword extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Customer\Api\AccountManagementInterface
-@@ -29,20 +38,30 @@ class CreatePassword extends \Magento\Customer\Controller\AbstractAccount
-     protected $resultPageFactory;
- 
-     /**
--     * @param Context $context
--     * @param Session $customerSession
--     * @param PageFactory $resultPageFactory
--     * @param AccountManagementInterface $accountManagement
-+     * @var \Magento\Customer\Model\ForgotPasswordToken\ConfirmCustomerByToken
-+     */
-+    private $confirmByToken;
-+
-+    /**
-+     * @param \Magento\Framework\App\Action\Context $context
-+     * @param \Magento\Customer\Model\Session $customerSession
-+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-+     * @param \Magento\Customer\Api\AccountManagementInterface $accountManagement
-+     * @param \Magento\Customer\Model\ForgotPasswordToken\ConfirmCustomerByToken $confirmByToken
-      */
-     public function __construct(
-         Context $context,
-         Session $customerSession,
-         PageFactory $resultPageFactory,
--        AccountManagementInterface $accountManagement
-+        AccountManagementInterface $accountManagement,
-+        ConfirmCustomerByToken $confirmByToken = null
-     ) {
-         $this->session = $customerSession;
-         $this->resultPageFactory = $resultPageFactory;
-         $this->accountManagement = $accountManagement;
-+        $this->confirmByToken = $confirmByToken
-+            ?? ObjectManager::getInstance()->get(ConfirmCustomerByToken::class);
-+
-         parent::__construct($context);
-     }
- 
-@@ -54,34 +73,37 @@ class CreatePassword extends \Magento\Customer\Controller\AbstractAccount
-     public function execute()
-     {
-         $resetPasswordToken = (string)$this->getRequest()->getParam('token');
--        $customerId = (int)$this->getRequest()->getParam('id');
--        $isDirectLink = $resetPasswordToken != '' && $customerId != 0;
-+        $isDirectLink = $resetPasswordToken != '';
-         if (!$isDirectLink) {
-             $resetPasswordToken = (string)$this->session->getRpToken();
--            $customerId = (int)$this->session->getRpCustomerId();
-         }
- 
-         try {
--            $this->accountManagement->validateResetPasswordLinkToken($customerId, $resetPasswordToken);
-+            $this->accountManagement->validateResetPasswordLinkToken(null, $resetPasswordToken);
-+
-+            $this->confirmByToken->execute($resetPasswordToken);
- 
-             if ($isDirectLink) {
-                 $this->session->setRpToken($resetPasswordToken);
--                $this->session->setRpCustomerId($customerId);
-                 $resultRedirect = $this->resultRedirectFactory->create();
-                 $resultRedirect->setPath('*/*/createpassword');
-+
-                 return $resultRedirect;
-             } else {
-                 /** @var \Magento\Framework\View\Result\Page $resultPage */
-                 $resultPage = $this->resultPageFactory->create();
--                $resultPage->getLayout()->getBlock('resetPassword')->setCustomerId($customerId)
--                    ->setResetPasswordLinkToken($resetPasswordToken);
-+                $resultPage->getLayout()
-+                           ->getBlock('resetPassword')
-+                           ->setResetPasswordLinkToken($resetPasswordToken);
-+
-                 return $resultPage;
-             }
-         } catch (\Exception $exception) {
--            $this->messageManager->addError(__('Your password reset link has expired.'));
-+            $this->messageManager->addErrorMessage(__('Your password reset link has expired.'));
-             /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
-             $resultRedirect = $this->resultRedirectFactory->create();
-             $resultRedirect->setPath('*/*/forgotpassword');
-+
-             return $resultRedirect;
-         }
-     }
-diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
-index bb94063226f..4c9c25b5f33 100644
---- a/app/code/Magento/Customer/Controller/Account/CreatePost.php
-+++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Customer\Controller\Account;
- 
-+use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Customer\Model\Account\Redirect as AccountRedirect;
- use Magento\Customer\Api\Data\AddressInterface;
- use Magento\Framework\Api\DataObjectHelper;
-@@ -37,10 +39,12 @@ use Magento\Framework\Data\Form\FormKey\Validator;
- use Magento\Customer\Controller\AbstractAccount;
- 
- /**
-+ * Post create customer action
-+ *
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class CreatePost extends AbstractAccount implements CsrfAwareActionInterface
-+class CreatePost extends AbstractAccount implements CsrfAwareActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Customer\Api\AccountManagementInterface
-@@ -132,6 +136,11 @@ class CreatePost extends AbstractAccount implements CsrfAwareActionInterface
-      */
-     private $formKeyValidator;
- 
-+    /**
-+     * @var CustomerRepository
-+     */
-+    private $customerRepository;
-+
-     /**
-      * @param Context $context
-      * @param Session $customerSession
-@@ -151,6 +160,7 @@ class CreatePost extends AbstractAccount implements CsrfAwareActionInterface
-      * @param CustomerExtractor $customerExtractor
-      * @param DataObjectHelper $dataObjectHelper
-      * @param AccountRedirect $accountRedirect
-+     * @param CustomerRepository $customerRepository
-      * @param Validator $formKeyValidator
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-@@ -174,6 +184,7 @@ class CreatePost extends AbstractAccount implements CsrfAwareActionInterface
-         CustomerExtractor $customerExtractor,
-         DataObjectHelper $dataObjectHelper,
-         AccountRedirect $accountRedirect,
-+        CustomerRepository $customerRepository,
-         Validator $formKeyValidator = null
-     ) {
-         $this->session = $customerSession;
-@@ -194,6 +205,7 @@ class CreatePost extends AbstractAccount implements CsrfAwareActionInterface
-         $this->dataObjectHelper = $dataObjectHelper;
-         $this->accountRedirect = $accountRedirect;
-         $this->formKeyValidator = $formKeyValidator ?: ObjectManager::getInstance()->get(Validator::class);
-+        $this->customerRepository = $customerRepository;
-         parent::__construct($context);
-     }
- 
-@@ -327,34 +339,29 @@ class CreatePost extends AbstractAccount implements CsrfAwareActionInterface
-             return $this->resultRedirectFactory->create()
-                 ->setUrl($this->_redirect->error($url));
-         }
--
-         $this->session->regenerateId();
--
-         try {
-             $address = $this->extractAddress();
-             $addresses = $address === null ? [] : [$address];
--
-             $customer = $this->customerExtractor->extract('customer_account_create', $this->_request);
-             $customer->setAddresses($addresses);
--
-             $password = $this->getRequest()->getParam('password');
-             $confirmation = $this->getRequest()->getParam('password_confirmation');
-             $redirectUrl = $this->session->getBeforeAuthUrl();
--
-             $this->checkPasswordConfirmation($password, $confirmation);
--
-             $customer = $this->accountManagement
-                 ->createAccount($customer, $password, $redirectUrl);
- 
-             if ($this->getRequest()->getParam('is_subscribed', false)) {
--                $this->subscriberFactory->create()->subscribeCustomerById($customer->getId());
-+                $extensionAttributes = $customer->getExtensionAttributes();
-+                $extensionAttributes->setIsSubscribed(true);
-+                $customer->setExtensionAttributes($extensionAttributes);
-+                $this->customerRepository->save($customer);
-             }
--
-             $this->_eventManager->dispatch(
-                 'customer_register_success',
-                 ['account_controller' => $this, 'customer' => $customer]
-             );
--
-             $confirmationStatus = $this->accountManagement->getConfirmationStatus($customer->getId());
-             if ($confirmationStatus === AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED) {
-                 $email = $this->customerUrl->getEmailConfirmationUrl($customer->getEmail());
-diff --git a/app/code/Magento/Customer/Controller/Account/Edit.php b/app/code/Magento/Customer/Controller/Account/Edit.php
-index 3c1e6019939..7c2b7215a05 100644
---- a/app/code/Magento/Customer/Controller/Account/Edit.php
-+++ b/app/code/Magento/Customer/Controller/Account/Edit.php
-@@ -6,13 +6,14 @@
-  */
- namespace Magento\Customer\Controller\Account;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Customer\Api\CustomerRepositoryInterface;
- use Magento\Framework\Api\DataObjectHelper;
- use Magento\Customer\Model\Session;
- use Magento\Framework\View\Result\PageFactory;
- use Magento\Framework\App\Action\Context;
- 
--class Edit extends \Magento\Customer\Controller\AbstractAccount
-+class Edit extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php
-index aa5e088f9c8..4eb41cedea2 100644
---- a/app/code/Magento/Customer/Controller/Account/EditPost.php
-+++ b/app/code/Magento/Customer/Controller/Account/EditPost.php
-@@ -7,6 +7,9 @@
- 
- namespace Magento\Customer\Controller\Account;
- 
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Customer\Model\AddressRegistry;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Customer\Model\AuthenticationInterface;
- use Magento\Customer\Model\Customer\Mapper;
- use Magento\Customer\Model\EmailNotificationInterface;
-@@ -21,8 +24,10 @@ use Magento\Customer\Api\CustomerRepositoryInterface;
- use Magento\Customer\Model\CustomerExtractor;
- use Magento\Customer\Model\Session;
- use Magento\Framework\App\Action\Context;
-+use Magento\Framework\Escaper;
- use Magento\Framework\Exception\InputException;
- use Magento\Framework\Exception\InvalidEmailOrPasswordException;
-+use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Exception\State\UserLockedException;
- use Magento\Customer\Controller\AbstractAccount;
- use Magento\Framework\Phrase;
-@@ -31,7 +36,7 @@ use Magento\Framework\Phrase;
-  * Class EditPost
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class EditPost extends AbstractAccount implements CsrfAwareActionInterface
-+class EditPost extends AbstractAccount implements CsrfAwareActionInterface, HttpPostActionInterface
- {
-     /**
-      * Form code for data extractor
-@@ -78,6 +83,16 @@ class EditPost extends AbstractAccount implements CsrfAwareActionInterface
-      */
-     private $customerMapper;
- 
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-+    /**
-+     * @var AddressRegistry
-+     */
-+    private $addressRegistry;
-+
-     /**
-      * @param Context $context
-      * @param Session $customerSession
-@@ -85,6 +100,8 @@ class EditPost extends AbstractAccount implements CsrfAwareActionInterface
-      * @param CustomerRepositoryInterface $customerRepository
-      * @param Validator $formKeyValidator
-      * @param CustomerExtractor $customerExtractor
-+     * @param Escaper|null $escaper
-+     * @param AddressRegistry|null $addressRegistry
-      */
-     public function __construct(
-         Context $context,
-@@ -92,7 +109,9 @@ class EditPost extends AbstractAccount implements CsrfAwareActionInterface
-         AccountManagementInterface $customerAccountManagement,
-         CustomerRepositoryInterface $customerRepository,
-         Validator $formKeyValidator,
--        CustomerExtractor $customerExtractor
-+        CustomerExtractor $customerExtractor,
-+        ?Escaper $escaper = null,
-+        AddressRegistry $addressRegistry = null
-     ) {
-         parent::__construct($context);
-         $this->session = $customerSession;
-@@ -100,6 +119,8 @@ class EditPost extends AbstractAccount implements CsrfAwareActionInterface
-         $this->customerRepository = $customerRepository;
-         $this->formKeyValidator = $formKeyValidator;
-         $this->customerExtractor = $customerExtractor;
-+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
-+        $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
-     }
- 
-     /**
-@@ -185,6 +206,9 @@ class EditPost extends AbstractAccount implements CsrfAwareActionInterface
-                 // whether a customer enabled change password option
-                 $isPasswordChanged = $this->changeCustomerPassword($currentCustomerDataObject->getEmail());
- 
-+                // No need to validate customer address while editing customer profile
-+                $this->disableAddressValidation($customerCandidateDataObject);
-+
-                 $this->customerRepository->save($customerCandidateDataObject);
-                 $this->getEmailNotification()->credentialsChanged(
-                     $customerCandidateDataObject,
-@@ -195,7 +219,7 @@ class EditPost extends AbstractAccount implements CsrfAwareActionInterface
-                 $this->messageManager->addSuccess(__('You saved the account information.'));
-                 return $resultRedirect->setPath('customer/account');
-             } catch (InvalidEmailOrPasswordException $e) {
--                $this->messageManager->addError($e->getMessage());
-+                $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
-             } catch (UserLockedException $e) {
-                 $message = __(
-                     'The account sign-in was incorrect or your account is disabled temporarily. '
-@@ -206,9 +230,9 @@ class EditPost extends AbstractAccount implements CsrfAwareActionInterface
-                 $this->messageManager->addError($message);
-                 return $resultRedirect->setPath('customer/account/login');
-             } catch (InputException $e) {
--                $this->messageManager->addError($e->getMessage());
-+                $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
-                 foreach ($e->getErrors() as $error) {
--                    $this->messageManager->addError($error->getMessage());
-+                    $this->messageManager->addErrorMessage($this->escaper->escapeHtml($error->getMessage()));
-                 }
-             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                 $this->messageManager->addError($e->getMessage());
-@@ -342,4 +366,18 @@ class EditPost extends AbstractAccount implements CsrfAwareActionInterface
-         }
-         return $this->customerMapper;
-     }
-+
-+    /**
-+     * Disable Customer Address Validation
-+     *
-+     * @param CustomerInterface $customer
-+     * @throws NoSuchEntityException
-+     */
-+    private function disableAddressValidation($customer)
-+    {
-+        foreach ($customer->getAddresses() as $address) {
-+            $addressModel = $this->addressRegistry->retrieve($address->getId());
-+            $addressModel->setShouldIgnoreValidation(true);
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Customer/Controller/Account/ForgotPassword.php b/app/code/Magento/Customer/Controller/Account/ForgotPassword.php
-index f115b64efeb..cfa60558077 100644
---- a/app/code/Magento/Customer/Controller/Account/ForgotPassword.php
-+++ b/app/code/Magento/Customer/Controller/Account/ForgotPassword.php
-@@ -1,16 +1,19 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Customer\Controller\Account;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Customer\Model\Session;
- use Magento\Framework\App\Action\Context;
- use Magento\Framework\View\Result\PageFactory;
- 
--class ForgotPassword extends \Magento\Customer\Controller\AbstractAccount
-+/**
-+ * Forgot Password controller
-+ */
-+class ForgotPassword extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
- {
-     /**
-      * @var PageFactory
-@@ -40,10 +43,17 @@ class ForgotPassword extends \Magento\Customer\Controller\AbstractAccount
-     /**
-      * Forgot customer password page
-      *
--     * @return \Magento\Framework\View\Result\Page
-+     * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
-      */
-     public function execute()
-     {
-+        if ($this->session->isLoggedIn()) {
-+            /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
-+            $resultRedirect = $this->resultRedirectFactory->create();
-+            $resultRedirect->setPath('*/*/');
-+            return $resultRedirect;
-+        }
-+
-         /** @var \Magento\Framework\View\Result\Page $resultPage */
-         $resultPage = $this->resultPageFactory->create();
-         $resultPage->getLayout()->getBlock('forgotPassword')->setEmailValue($this->session->getForgottenEmail());
-diff --git a/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php
-index f3024738730..3c7fca99184 100644
---- a/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php
-+++ b/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php
-@@ -6,6 +6,7 @@
-  */
- namespace Magento\Customer\Controller\Account;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Customer\Api\AccountManagementInterface;
- use Magento\Customer\Model\AccountManagement;
- use Magento\Customer\Model\Session;
-@@ -18,7 +19,7 @@ use Magento\Framework\Exception\SecurityViolationException;
-  * ForgotPasswordPost controller
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class ForgotPasswordPost extends \Magento\Customer\Controller\AbstractAccount
-+class ForgotPasswordPost extends \Magento\Customer\Controller\AbstractAccount implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Customer\Api\AccountManagementInterface
-diff --git a/app/code/Magento/Customer/Controller/Account/Index.php b/app/code/Magento/Customer/Controller/Account/Index.php
-index 2ecf79d35b1..301fd584cfa 100644
---- a/app/code/Magento/Customer/Controller/Account/Index.php
-+++ b/app/code/Magento/Customer/Controller/Account/Index.php
-@@ -6,10 +6,11 @@
-  */
- namespace Magento\Customer\Controller\Account;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\App\Action\Context;
- use Magento\Framework\View\Result\PageFactory;
- 
--class Index extends \Magento\Customer\Controller\AbstractAccount
-+class Index extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
- {
-     /**
-      * @var PageFactory
-diff --git a/app/code/Magento/Customer/Controller/Account/Login.php b/app/code/Magento/Customer/Controller/Account/Login.php
-index d685191bf43..64cc24095f9 100644
---- a/app/code/Magento/Customer/Controller/Account/Login.php
-+++ b/app/code/Magento/Customer/Controller/Account/Login.php
-@@ -6,12 +6,17 @@
-  */
- namespace Magento\Customer\Controller\Account;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Customer\Model\Session;
- use Magento\Framework\App\Action\Context;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\View\Result\PageFactory;
- use Magento\Customer\Controller\AbstractAccount;
- 
--class Login extends AbstractAccount
-+/**
-+ * Login form page. Accepts POST for backward compatibility reasons.
-+ */
-+class Login extends AbstractAccount implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var Session
-diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
-index 5c7eee78e5f..04051fbbf36 100644
---- a/app/code/Magento/Customer/Controller/Account/LoginPost.php
-+++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\Customer\Controller\Account;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Customer\Model\Account\Redirect as AccountRedirect;
- use Magento\Framework\App\Action\Context;
- use Magento\Customer\Model\Session;
-@@ -27,7 +28,7 @@ use Magento\Framework\Phrase;
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class LoginPost extends AbstractAccount implements CsrfAwareActionInterface
-+class LoginPost extends AbstractAccount implements CsrfAwareActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Customer\Api\AccountManagementInterface
-diff --git a/app/code/Magento/Customer/Controller/Account/Logout.php b/app/code/Magento/Customer/Controller/Account/Logout.php
-index 19dabf9effa..9344f482bd6 100644
---- a/app/code/Magento/Customer/Controller/Account/Logout.php
-+++ b/app/code/Magento/Customer/Controller/Account/Logout.php
-@@ -6,6 +6,8 @@
-  */
- namespace Magento\Customer\Controller\Account;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Customer\Model\Session;
- use Magento\Framework\App\Action\Context;
- use Magento\Framework\App\ObjectManager;
-@@ -13,7 +15,10 @@ use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
- use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
- use Magento\Customer\Controller\AbstractAccount;
- 
--class Logout extends AbstractAccount
-+/**
-+ * Sign out a customer.
-+ */
-+class Logout extends AbstractAccount implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var Session
-diff --git a/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php b/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php
-index c58416434c0..e00494d221d 100644
---- a/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php
-+++ b/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php
-@@ -6,10 +6,11 @@
-  */
- namespace Magento\Customer\Controller\Account;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\App\Action\Context;
- use Magento\Framework\View\Result\PageFactory;
- 
--class LogoutSuccess extends \Magento\Customer\Controller\AbstractAccount
-+class LogoutSuccess extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
- {
-     /**
-      * @var PageFactory
-diff --git a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
-index 3de44e35d24..27a00f86dd9 100644
---- a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
-+++ b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
-@@ -1,6 +1,5 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-@@ -10,11 +9,16 @@ use Magento\Customer\Api\AccountManagementInterface;
- use Magento\Customer\Api\CustomerRepositoryInterface;
- use Magento\Customer\Model\Session;
- use Magento\Framework\App\Action\Context;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Exception\InputException;
- use Magento\Customer\Model\Customer\CredentialsValidator;
--use Magento\Framework\App\ObjectManager;
- 
--class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount
-+/**
-+ * Class ResetPasswordPost
-+ *
-+ * @package Magento\Customer\Controller\Account
-+ */
-+class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Customer\Api\AccountManagementInterface
-@@ -31,17 +35,14 @@ class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount
-      */
-     protected $session;
- 
--    /**
--     * @var CredentialsValidator
--     */
--    private $credentialsValidator;
--
-     /**
-      * @param Context $context
-      * @param Session $customerSession
-      * @param AccountManagementInterface $accountManagement
-      * @param CustomerRepositoryInterface $customerRepository
-      * @param CredentialsValidator|null $credentialsValidator
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         Context $context,
-@@ -53,8 +54,6 @@ class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount
-         $this->session = $customerSession;
-         $this->accountManagement = $accountManagement;
-         $this->customerRepository = $customerRepository;
--        $this->credentialsValidator = $credentialsValidator ?: ObjectManager::getInstance()
--            ->get(CredentialsValidator::class);
-         parent::__construct($context);
-     }
- 
-@@ -70,29 +69,32 @@ class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount
-         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
-         $resultRedirect = $this->resultRedirectFactory->create();
-         $resetPasswordToken = (string)$this->getRequest()->getQuery('token');
--        $customerId = (int)$this->getRequest()->getQuery('id');
-         $password = (string)$this->getRequest()->getPost('password');
-         $passwordConfirmation = (string)$this->getRequest()->getPost('password_confirmation');
- 
-         if ($password !== $passwordConfirmation) {
-             $this->messageManager->addError(__("New Password and Confirm New Password values didn't match."));
--            $resultRedirect->setPath('*/*/createPassword', ['id' => $customerId, 'token' => $resetPasswordToken]);
-+            $resultRedirect->setPath('*/*/createPassword', ['token' => $resetPasswordToken]);
-+
-             return $resultRedirect;
-         }
-         if (iconv_strlen($password) <= 0) {
-             $this->messageManager->addError(__('Please enter a new password.'));
--            $resultRedirect->setPath('*/*/createPassword', ['id' => $customerId, 'token' => $resetPasswordToken]);
-+            $resultRedirect->setPath('*/*/createPassword', ['token' => $resetPasswordToken]);
-+
-             return $resultRedirect;
-         }
- 
-         try {
--            $customerEmail = $this->customerRepository->getById($customerId)->getEmail();
--            $this->credentialsValidator->checkPasswordDifferentFromEmail($customerEmail, $password);
--            $this->accountManagement->resetPassword($customerEmail, $resetPasswordToken, $password);
-+            $this->accountManagement->resetPassword(
-+                null,
-+                $resetPasswordToken,
-+                $password
-+            );
-             $this->session->unsRpToken();
--            $this->session->unsRpCustomerId();
-             $this->messageManager->addSuccess(__('You updated your password.'));
-             $resultRedirect->setPath('*/*/login');
-+
-             return $resultRedirect;
-         } catch (InputException $e) {
-             $this->messageManager->addError($e->getMessage());
-@@ -102,7 +104,8 @@ class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount
-         } catch (\Exception $exception) {
-             $this->messageManager->addError(__('Something went wrong while saving the new password.'));
-         }
--        $resultRedirect->setPath('*/*/createPassword', ['id' => $customerId, 'token' => $resetPasswordToken]);
-+        $resultRedirect->setPath('*/*/createPassword', ['token' => $resetPasswordToken]);
-+
-         return $resultRedirect;
-     }
- }
-diff --git a/app/code/Magento/Customer/Controller/Address/Delete.php b/app/code/Magento/Customer/Controller/Address/Delete.php
-index ef92bd2ef53..a30e15db4b3 100644
---- a/app/code/Magento/Customer/Controller/Address/Delete.php
-+++ b/app/code/Magento/Customer/Controller/Address/Delete.php
-@@ -6,9 +6,16 @@
-  */
- namespace Magento\Customer\Controller\Address;
- 
--class Delete extends \Magento\Customer\Controller\Address
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Delete customer address controller action.
-+ */
-+class Delete extends \Magento\Customer\Controller\Address implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-+     * @inheritdoc
-      * @return \Magento\Framework\Controller\Result\Redirect
-      */
-     public function execute()
-diff --git a/app/code/Magento/Customer/Controller/Address/Edit.php b/app/code/Magento/Customer/Controller/Address/Edit.php
-index a30eb10b115..0a5affefae3 100644
---- a/app/code/Magento/Customer/Controller/Address/Edit.php
-+++ b/app/code/Magento/Customer/Controller/Address/Edit.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Customer\Controller\Address;
- 
--class Edit extends \Magento\Customer\Controller\Address
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Edit extends \Magento\Customer\Controller\Address implements HttpGetActionInterface
- {
-     /**
-      * Customer address edit action
-diff --git a/app/code/Magento/Customer/Controller/Address/File/Upload.php b/app/code/Magento/Customer/Controller/Address/File/Upload.php
-new file mode 100644
-index 00000000000..adb4c7abd17
---- /dev/null
-+++ b/app/code/Magento/Customer/Controller/Address/File/Upload.php
-@@ -0,0 +1,146 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Controller\Address\File;
-+
-+use Magento\Framework\App\Action\Action;
-+use Magento\Framework\App\Action\Context;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\Api\CustomAttributesDataInterface;
-+use Magento\Customer\Api\AddressMetadataInterface;
-+use Magento\Customer\Model\FileUploader;
-+use Magento\Customer\Model\FileUploaderFactory;
-+use Magento\Framework\Controller\ResultFactory;
-+use Magento\Framework\Exception\LocalizedException;
-+use Psr\Log\LoggerInterface;
-+use Magento\Customer\Model\FileProcessorFactory;
-+
-+/**
-+ * Class for upload files for customer custom address attributes
-+ */
-+class Upload extends Action implements HttpPostActionInterface
-+{
-+    /**
-+     * @var FileUploaderFactory
-+     */
-+    private $fileUploaderFactory;
-+
-+    /**
-+     * @var AddressMetadataInterface
-+     */
-+    private $addressMetadataService;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var FileProcessorFactory
-+     */
-+    private $fileProcessorFactory;
-+
-+    /**
-+     * @param Context $context
-+     * @param FileUploaderFactory $fileUploaderFactory
-+     * @param AddressMetadataInterface $addressMetadataService
-+     * @param LoggerInterface $logger
-+     * @param FileProcessorFactory $fileProcessorFactory
-+     */
-+    public function __construct(
-+        Context $context,
-+        FileUploaderFactory $fileUploaderFactory,
-+        AddressMetadataInterface $addressMetadataService,
-+        LoggerInterface $logger,
-+        FileProcessorFactory $fileProcessorFactory
-+    ) {
-+        $this->fileUploaderFactory = $fileUploaderFactory;
-+        $this->addressMetadataService = $addressMetadataService;
-+        $this->logger = $logger;
-+        $this->fileProcessorFactory = $fileProcessorFactory;
-+        parent::__construct($context);
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function execute()
-+    {
-+        try {
-+            $requestedFiles = $this->getRequest()->getFiles('custom_attributes');
-+            if (empty($requestedFiles)) {
-+                $result = $this->processError(__('No files for upload.'));
-+            } else {
-+                $attributeCode = key($requestedFiles);
-+                $attributeMetadata = $this->addressMetadataService->getAttributeMetadata($attributeCode);
-+
-+                /** @var FileUploader $fileUploader */
-+                $fileUploader = $this->fileUploaderFactory->create([
-+                    'attributeMetadata' => $attributeMetadata,
-+                    'entityTypeCode' => AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
-+                    'scope' => CustomAttributesDataInterface::CUSTOM_ATTRIBUTES,
-+                ]);
-+
-+                $errors = $fileUploader->validate();
-+                if (true !== $errors) {
-+                    $errorMessage = implode('</br>', $errors);
-+                    $result = $this->processError(($errorMessage));
-+                } else {
-+                    $result = $fileUploader->upload();
-+                    $this->moveTmpFileToSuitableFolder($result);
-+                }
-+            }
-+        } catch (LocalizedException $e) {
-+            $result = $this->processError($e->getMessage(), $e->getCode());
-+        } catch (\Exception $e) {
-+            $this->logger->critical($e);
-+            $result = $this->processError($e->getMessage(), $e->getCode());
-+        }
-+
-+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
-+        $resultJson->setData($result);
-+        return $resultJson;
-+    }
-+
-+    /**
-+     * Move file from temporary folder to the 'customer_address' media folder
-+     *
-+     * @param array $fileInfo
-+     * @throws LocalizedException
-+     */
-+    private function moveTmpFileToSuitableFolder(&$fileInfo)
-+    {
-+        $fileName = $fileInfo['file'];
-+        $fileProcessor = $this->fileProcessorFactory
-+            ->create(['entityTypeCode' => AddressMetadataInterface::ENTITY_TYPE_ADDRESS]);
-+
-+        $newFilePath = $fileProcessor->moveTemporaryFile($fileName);
-+        $fileInfo['file'] = $newFilePath;
-+        $fileInfo['url'] = $fileProcessor->getViewUrl(
-+            $newFilePath,
-+            'file'
-+        );
-+    }
-+
-+    /**
-+     * Prepare result array for errors
-+     *
-+     * @param string $message
-+     * @param int $code
-+     * @return array
-+     */
-+    private function processError($message, $code = 0)
-+    {
-+        $result = [
-+            'error' => $message,
-+            'errorcode' => $code,
-+        ];
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Controller/Address/Form.php b/app/code/Magento/Customer/Controller/Address/Form.php
-index fc62a6c1a57..9b3f4e36be0 100644
---- a/app/code/Magento/Customer/Controller/Address/Form.php
-+++ b/app/code/Magento/Customer/Controller/Address/Form.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Customer\Controller\Address;
- 
--class Form extends \Magento\Customer\Controller\Address
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Form extends \Magento\Customer\Controller\Address implements HttpGetActionInterface
- {
-     /**
-      * Address book form
-diff --git a/app/code/Magento/Customer/Controller/Address/FormPost.php b/app/code/Magento/Customer/Controller/Address/FormPost.php
-index 60e1f6eb172..25618e31291 100644
---- a/app/code/Magento/Customer/Controller/Address/FormPost.php
-+++ b/app/code/Magento/Customer/Controller/Address/FormPost.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\Customer\Controller\Address;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Customer\Api\AddressRepositoryInterface;
- use Magento\Customer\Api\Data\AddressInterfaceFactory;
- use Magento\Customer\Api\Data\RegionInterface;
-@@ -25,9 +26,11 @@ use Magento\Framework\Reflection\DataObjectProcessor;
- use Magento\Framework\View\Result\PageFactory;
- 
- /**
-+ * Customer Address Form Post Controller
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class FormPost extends \Magento\Customer\Controller\Address
-+class FormPost extends \Magento\Customer\Controller\Address implements HttpPostActionInterface
- {
-     /**
-      * @var RegionFactory
-@@ -119,8 +122,18 @@ class FormPost extends \Magento\Customer\Controller\Address
-             \Magento\Customer\Api\Data\AddressInterface::class
-         );
-         $addressDataObject->setCustomerId($this->_getSession()->getCustomerId())
--            ->setIsDefaultBilling($this->getRequest()->getParam('default_billing', false))
--            ->setIsDefaultShipping($this->getRequest()->getParam('default_shipping', false));
-+            ->setIsDefaultBilling(
-+                $this->getRequest()->getParam(
-+                    'default_billing',
-+                    isset($existingAddressData['default_billing']) ? $existingAddressData['default_billing'] : false
-+                )
-+            )
-+            ->setIsDefaultShipping(
-+                $this->getRequest()->getParam(
-+                    'default_shipping',
-+                    isset($existingAddressData['default_shipping']) ? $existingAddressData['default_shipping'] : false
-+                )
-+            );
- 
-         return $addressDataObject;
-     }
-diff --git a/app/code/Magento/Customer/Controller/Address/Index.php b/app/code/Magento/Customer/Controller/Address/Index.php
-index ad04c7bd5c7..92c6078349d 100644
---- a/app/code/Magento/Customer/Controller/Address/Index.php
-+++ b/app/code/Magento/Customer/Controller/Address/Index.php
-@@ -6,12 +6,13 @@
-  */
- namespace Magento\Customer\Controller\Address;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Customer\Api\CustomerRepositoryInterface;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Index extends \Magento\Customer\Controller\Address
-+class Index extends \Magento\Customer\Controller\Address implements HttpGetActionInterface
- {
-     /**
-      * @var CustomerRepositoryInterface
-@@ -28,9 +29,9 @@ class Index extends \Magento\Customer\Controller\Address
-      * @param \Magento\Customer\Api\Data\RegionInterfaceFactory $regionDataFactory
-      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataProcessor
-      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
--     * @param CustomerRepositoryInterface $customerRepository
-      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
-      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-+     * @param CustomerRepositoryInterface $customerRepository
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-diff --git a/app/code/Magento/Customer/Controller/Address/NewAction.php b/app/code/Magento/Customer/Controller/Address/NewAction.php
-index e97c7460578..043c2b91db2 100644
---- a/app/code/Magento/Customer/Controller/Address/NewAction.php
-+++ b/app/code/Magento/Customer/Controller/Address/NewAction.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Customer\Controller\Address;
- 
--class NewAction extends \Magento\Customer\Controller\Address
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class NewAction extends \Magento\Customer\Controller\Address implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Framework\Controller\Result\Forward
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultBillingAddress.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultBillingAddress.php
-new file mode 100644
-index 00000000000..bf8ca4aeb5c
---- /dev/null
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultBillingAddress.php
-@@ -0,0 +1,109 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ *
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Controller\Adminhtml\Address;
-+
-+use Magento\Backend\App\Action;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\Controller\Result\Json;
-+use Magento\Framework\Controller\Result\JsonFactory;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * Class to process set default billing address action
-+ */
-+class DefaultBillingAddress extends Action implements HttpPostActionInterface
-+{
-+    /**
-+     * Authorization level of a basic admin session
-+     *
-+     * @see _isAllowed()
-+     */
-+    public const ADMIN_RESOURCE = 'Magento_Customer::manage';
-+
-+    /**
-+     * @var AddressRepositoryInterface
-+     */
-+    private $addressRepository;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var JsonFactory
-+     */
-+    private $resultJsonFactory;
-+
-+    /**
-+     * @param Action\Context $context
-+     * @param AddressRepositoryInterface $addressRepository
-+     * @param LoggerInterface $logger
-+     * @param JsonFactory $resultJsonFactory
-+     */
-+    public function __construct(
-+        Action\Context $context,
-+        AddressRepositoryInterface $addressRepository,
-+        LoggerInterface $logger,
-+        JsonFactory $resultJsonFactory
-+    ) {
-+        parent::__construct($context);
-+        $this->addressRepository = $addressRepository;
-+        $this->logger = $logger;
-+        $this->resultJsonFactory = $resultJsonFactory;
-+    }
-+
-+    /**
-+     * Execute action to set customer default billing address
-+     *
-+     * @return Json
-+     */
-+    public function execute(): Json
-+    {
-+        $customerId = $this->getRequest()->getParam('parent_id', false);
-+        $addressId = $this->getRequest()->getParam('id', false);
-+        $error = true;
-+        $message = __('There is no address id in setting default billing address.');
-+
-+        if ($addressId) {
-+            try {
-+                $address = $this->addressRepository->getById($addressId)->setCustomerId($customerId);
-+                $this->setAddressAsDefault($address);
-+                $this->addressRepository->save($address);
-+                $message = __('Default billing address has been changed.');
-+                $error = false;
-+            } catch (\Exception $e) {
-+                $message = __('We can\'t change default billing address right now.');
-+                $this->logger->critical($e);
-+            }
-+        }
-+
-+        $resultJson = $this->resultJsonFactory->create();
-+        $resultJson->setData(
-+            [
-+                'message' => $message,
-+                'error' => $error,
-+            ]
-+        );
-+
-+        return $resultJson;
-+    }
-+
-+    /**
-+     * Set address as default billing address
-+     *
-+     * @param AddressInterface $address
-+     * @return void
-+     */
-+    private function setAddressAsDefault(AddressInterface $address): void
-+    {
-+        $address->setIsDefaultBilling(true);
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultShippingAddress.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultShippingAddress.php
-new file mode 100644
-index 00000000000..81928ae2d28
---- /dev/null
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultShippingAddress.php
-@@ -0,0 +1,109 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ *
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Controller\Adminhtml\Address;
-+
-+use Magento\Backend\App\Action;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\Controller\Result\Json;
-+use Magento\Framework\Controller\Result\JsonFactory;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * Class to process set default shipping address action
-+ */
-+class DefaultShippingAddress extends Action implements HttpPostActionInterface
-+{
-+    /**
-+     * Authorization level of a basic admin session
-+     *
-+     * @see _isAllowed()
-+     */
-+    public const ADMIN_RESOURCE = 'Magento_Customer::manage';
-+
-+    /**
-+     * @var AddressRepositoryInterface
-+     */
-+    private $addressRepository;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var JsonFactory
-+     */
-+    private $resultJsonFactory;
-+
-+    /**
-+     * @param Action\Context $context
-+     * @param AddressRepositoryInterface $addressRepository
-+     * @param LoggerInterface $logger
-+     * @param JsonFactory $resultJsonFactory
-+     */
-+    public function __construct(
-+        Action\Context $context,
-+        AddressRepositoryInterface $addressRepository,
-+        LoggerInterface $logger,
-+        JsonFactory $resultJsonFactory
-+    ) {
-+        parent::__construct($context);
-+        $this->addressRepository = $addressRepository;
-+        $this->logger = $logger;
-+        $this->resultJsonFactory = $resultJsonFactory;
-+    }
-+
-+    /**
-+     * Execute action to set customer default shipping address
-+     *
-+     * @return Json
-+     */
-+    public function execute(): Json
-+    {
-+        $customerId = $this->getRequest()->getParam('parent_id', false);
-+        $addressId = $this->getRequest()->getParam('id', false);
-+        $error = true;
-+        $message = __('There is no address id in setting default shipping address.');
-+
-+        if ($addressId) {
-+            try {
-+                $address = $this->addressRepository->getById($addressId)->setCustomerId($customerId);
-+                $this->setAddressAsDefault($address);
-+                $this->addressRepository->save($address);
-+                $message = __('Default shipping address has been changed.');
-+                $error = false;
-+            } catch (\Exception $e) {
-+                $message = __('We can\'t change default shipping address right now.');
-+                $this->logger->critical($e);
-+            }
-+        }
-+
-+        $resultJson = $this->resultJsonFactory->create();
-+        $resultJson->setData(
-+            [
-+                'message' => $message,
-+                'error' => $error,
-+            ]
-+        );
-+
-+        return $resultJson;
-+    }
-+
-+    /**
-+     * Set address as default shipping address
-+     *
-+     * @param AddressInterface $address
-+     * @return void
-+     */
-+    private function setAddressAsDefault(AddressInterface $address): void
-+    {
-+        $address->setIsDefaultShipping(true);
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/Delete.php
-new file mode 100644
-index 00000000000..711cd2473cd
---- /dev/null
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/Delete.php
-@@ -0,0 +1,95 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ *
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Controller\Adminhtml\Address;
-+
-+use Magento\Backend\App\Action;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\Controller\Result\Json;
-+use Magento\Framework\Controller\Result\JsonFactory;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * Button for deletion of customer address in admin
-+ */
-+class Delete extends Action implements HttpPostActionInterface
-+{
-+    /**
-+     * Authorization level of a basic admin session
-+     *
-+     * @see _isAllowed()
-+     */
-+    public const ADMIN_RESOURCE = 'Magento_Customer::manage';
-+
-+    /**
-+     * @var AddressRepositoryInterface
-+     */
-+    private $addressRepository;
-+
-+    /**
-+     * @var JsonFactory
-+     */
-+    private $resultJsonFactory;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @param Action\Context $context
-+     * @param AddressRepositoryInterface $addressRepository
-+     * @param JsonFactory $resultJsonFactory
-+     * @param LoggerInterface $logger
-+     */
-+    public function __construct(
-+        Action\Context $context,
-+        AddressRepositoryInterface $addressRepository,
-+        JsonFactory $resultJsonFactory,
-+        LoggerInterface $logger
-+    ) {
-+        parent::__construct($context);
-+        $this->addressRepository = $addressRepository;
-+        $this->resultJsonFactory = $resultJsonFactory;
-+        $this->logger = $logger;
-+    }
-+
-+    /**
-+     * Delete customer address action
-+     *
-+     * @return Json
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function execute(): Json
-+    {
-+        $customerId = $this->getRequest()->getParam('parent_id', false);
-+        $addressId = $this->getRequest()->getParam('id', false);
-+        $error = false;
-+        $message = '';
-+        if ($addressId && $this->addressRepository->getById($addressId)->getCustomerId() === $customerId) {
-+            try {
-+                $this->addressRepository->deleteById($addressId);
-+                $message = __('You deleted the address.');
-+            } catch (\Exception $e) {
-+                $error = true;
-+                $message = __('We can\'t delete the address right now.');
-+                $this->logger->critical($e);
-+            }
-+        }
-+
-+        $resultJson = $this->resultJsonFactory->create();
-+        $resultJson->setData(
-+            [
-+                'message' => $message,
-+                'error' => $error,
-+            ]
-+        );
-+
-+        return $resultJson;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/MassDelete.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/MassDelete.php
-new file mode 100644
-index 00000000000..cd319d662a0
---- /dev/null
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/MassDelete.php
-@@ -0,0 +1,131 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Controller\Adminhtml\Address;
-+
-+use Magento\Backend\App\Action;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\Controller\Result\Json;
-+use Magento\Backend\App\Action\Context;
-+use Magento\Framework\Controller\Result\JsonFactory;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Ui\Component\MassAction\Filter;
-+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * Class to delete selected customer addresses through massaction
-+ */
-+class MassDelete extends Action implements HttpPostActionInterface
-+{
-+    /**
-+     * Authorization level of a basic admin session
-+     *
-+     * @see MassDelete::_isAllowed()
-+     */
-+    const ADMIN_RESOURCE = 'Magento_Customer::manage';
-+
-+    /**
-+     * @var Filter
-+     */
-+    private $filter;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $collectionFactory;
-+
-+    /**
-+     * @var AddressRepositoryInterface
-+     */
-+    private $addressRepository;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var JsonFactory
-+     */
-+    private $resultJsonFactory;
-+
-+    /**
-+     * @param Context $context
-+     * @param Filter $filter
-+     * @param CollectionFactory $collectionFactory
-+     * @param AddressRepositoryInterface $addressRepository
-+     * @param LoggerInterface $logger
-+     * @param JsonFactory $resultJsonFactory
-+     */
-+    public function __construct(
-+        Context $context,
-+        Filter $filter,
-+        CollectionFactory $collectionFactory,
-+        AddressRepositoryInterface $addressRepository,
-+        LoggerInterface $logger,
-+        JsonFactory $resultJsonFactory
-+    ) {
-+        $this->filter = $filter;
-+        $this->collectionFactory = $collectionFactory;
-+        $this->addressRepository = $addressRepository;
-+        $this->logger = $logger;
-+        $this->resultJsonFactory = $resultJsonFactory;
-+        parent::__construct($context);
-+    }
-+
-+    /**
-+     * Delete specified customer addresses using grid massaction
-+     *
-+     * @return Json
-+     * @throws LocalizedException
-+     */
-+    public function execute(): Json
-+    {
-+        $customerData = $this->_session->getData('customer_data');
-+        /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
-+        $collection = $this->filter->getCollection($this->collectionFactory->create());
-+        $error = false;
-+
-+        try {
-+            if ($customerData && $customerData['customer_id']) {
-+                $collection->addFieldToFilter('parent_id', $customerData['customer_id']);
-+            } else {
-+                throw new \Exception();
-+            }
-+            $collectionSize = $collection->getSize();
-+            /** @var \Magento\Customer\Model\Address $address */
-+            foreach ($collection as $address) {
-+                $this->addressRepository->deleteById($address->getId());
-+            }
-+            $message = __('A total of %1 record(s) have been deleted.', $collectionSize);
-+        } catch (NoSuchEntityException $e) {
-+            $message = __('There is no such address entity to delete.');
-+            $error = true;
-+            $this->logger->critical($e);
-+        } catch (LocalizedException $e) {
-+            $message = __($e->getMessage());
-+            $error = true;
-+            $this->logger->critical($e);
-+        } catch (\Exception $e) {
-+            $message = __('We can\'t mass delete the addresses right now.');
-+            $error = true;
-+            $this->logger->critical($e);
-+        }
-+
-+        $resultJson = $this->resultJsonFactory->create();
-+        $resultJson->setData(
-+            [
-+                'message' => $message,
-+                'error' => $error,
-+            ]
-+        );
-+
-+        return $resultJson;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/Save.php
-new file mode 100644
-index 00000000000..e4daea6f59f
---- /dev/null
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/Save.php
-@@ -0,0 +1,174 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Controller\Adminhtml\Address;
-+
-+use Magento\Backend\App\Action;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\Controller\Result\Json;
-+use Magento\Framework\Controller\Result\JsonFactory;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * Class for saving of customer address
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class Save extends Action implements HttpPostActionInterface
-+{
-+    /**
-+     * Authorization level of a basic admin session
-+     *
-+     * @see _isAllowed()
-+     */
-+    public const ADMIN_RESOURCE = 'Magento_Customer::manage';
-+
-+    /**
-+     * @var \Magento\Customer\Api\AddressRepositoryInterface
-+     */
-+    private $addressRepository;
-+
-+    /**
-+     * @var \Magento\Customer\Model\Metadata\FormFactory
-+     */
-+    private $formFactory;
-+
-+    /**
-+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * @var \Magento\Framework\Api\DataObjectHelper
-+     */
-+    private $dataObjectHelper;
-+
-+    /**
-+     * @var \Magento\Customer\Api\Data\AddressInterfaceFactory
-+     */
-+    private $addressDataFactory;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var JsonFactory
-+     */
-+    private $resultJsonFactory;
-+
-+    /**
-+     * @param Action\Context $context
-+     * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
-+     * @param \Magento\Customer\Model\Metadata\FormFactory $formFactory
-+     * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
-+     * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-+     * @param \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory
-+     * @param LoggerInterface $logger
-+     * @param JsonFactory $resultJsonFactory
-+     */
-+    public function __construct(
-+        Action\Context $context,
-+        \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
-+        \Magento\Customer\Model\Metadata\FormFactory $formFactory,
-+        \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
-+        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
-+        \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory,
-+        LoggerInterface $logger,
-+        JsonFactory $resultJsonFactory
-+    ) {
-+        parent::__construct($context);
-+        $this->addressRepository = $addressRepository;
-+        $this->formFactory = $formFactory;
-+        $this->customerRepository = $customerRepository;
-+        $this->dataObjectHelper = $dataObjectHelper;
-+        $this->addressDataFactory = $addressDataFactory;
-+        $this->logger = $logger;
-+        $this->resultJsonFactory = $resultJsonFactory;
-+    }
-+
-+    /**
-+     * Save customer address action
-+     *
-+     * @return Json
-+     */
-+    public function execute(): Json
-+    {
-+        $customerId = $this->getRequest()->getParam('parent_id', false);
-+        $addressId = $this->getRequest()->getParam('entity_id', false);
-+
-+        $error = false;
-+        try {
-+            /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
-+            $customer = $this->customerRepository->getById($customerId);
-+
-+            $addressForm = $this->formFactory->create(
-+                'customer_address',
-+                'adminhtml_customer_address',
-+                [],
-+                false,
-+                false
-+            );
-+            $addressData = $addressForm->extractData($this->getRequest());
-+            $addressData = $addressForm->compactData($addressData);
-+
-+            $addressData['region'] = [
-+                'region' => $addressData['region'] ?? null,
-+                'region_id' => $addressData['region_id'] ?? null,
-+            ];
-+            $addressToSave = $this->addressDataFactory->create();
-+            $this->dataObjectHelper->populateWithArray(
-+                $addressToSave,
-+                $addressData,
-+                \Magento\Customer\Api\Data\AddressInterface::class
-+            );
-+            $addressToSave->setCustomerId($customer->getId());
-+            $addressToSave->setIsDefaultBilling(
-+                (bool)$this->getRequest()->getParam('default_billing', false)
-+            );
-+            $addressToSave->setIsDefaultShipping(
-+                (bool)$this->getRequest()->getParam('default_shipping', false)
-+            );
-+            if ($addressId) {
-+                $addressToSave->setId($addressId);
-+                $message = __('Customer address has been updated.');
-+            } else {
-+                $addressToSave->setId(null);
-+                $message = __('New customer address has been added.');
-+            }
-+            $savedAddress = $this->addressRepository->save($addressToSave);
-+            $addressId = $savedAddress->getId();
-+        } catch (NoSuchEntityException $e) {
-+            $this->logger->critical($e);
-+            $error = true;
-+            $message = __('There is no customer with such id.');
-+        } catch (LocalizedException $e) {
-+            $error = true;
-+            $message = __($e->getMessage());
-+            $this->logger->critical($e);
-+        } catch (\Exception $e) {
-+            $error = true;
-+            $message = __('We can\'t change customer address right now.');
-+            $this->logger->critical($e);
-+        }
-+
-+        $addressId = empty($addressId) ? null : $addressId;
-+        $resultJson = $this->resultJsonFactory->create();
-+        $resultJson->setData(
-+            [
-+                'message' => $message,
-+                'error' => $error,
-+                'data' => [
-+                    'entity_id' => $addressId
-+                ]
-+            ]
-+        );
-+
-+        return $resultJson;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/Validate.php
-new file mode 100644
-index 00000000000..16a40fd9016
---- /dev/null
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/Validate.php
-@@ -0,0 +1,99 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Controller\Adminhtml\Address;
-+
-+use Magento\Backend\App\Action;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+use Magento\Framework\Controller\Result\Json;
-+use Magento\Framework\DataObject;
-+
-+/**
-+ * Class for validation of customer address form on admin.
-+ */
-+class Validate extends Action implements HttpPostActionInterface, HttpGetActionInterface
-+{
-+    /**
-+     * Authorization level of a basic admin session
-+     *
-+     * @see _isAllowed()
-+     */
-+    public const ADMIN_RESOURCE = 'Magento_Customer::manage';
-+
-+    /**
-+     * @var \Magento\Framework\Controller\Result\JsonFactory
-+     */
-+    private $resultJsonFactory;
-+
-+    /**
-+     * @var \Magento\Customer\Model\Metadata\FormFactory
-+     */
-+    private $formFactory;
-+
-+    /**
-+     * @param Action\Context $context
-+     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-+     * @param \Magento\Customer\Model\Metadata\FormFactory $formFactory
-+     */
-+    public function __construct(
-+        Action\Context $context,
-+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-+        \Magento\Customer\Model\Metadata\FormFactory $formFactory
-+    ) {
-+        parent::__construct($context);
-+        $this->resultJsonFactory = $resultJsonFactory;
-+        $this->formFactory = $formFactory;
-+    }
-+
-+    /**
-+     * AJAX customer address validation action
-+     *
-+     * @return Json
-+     */
-+    public function execute(): Json
-+    {
-+        /** @var \Magento\Framework\DataObject $response */
-+        $response = new \Magento\Framework\DataObject();
-+        $response->setError(false);
-+
-+        /** @var \Magento\Framework\DataObject $validatedResponse */
-+        $validatedResponse = $this->validateCustomerAddress($response);
-+        $resultJson = $this->resultJsonFactory->create();
-+        if ($validatedResponse->getError()) {
-+            $validatedResponse->setError(true);
-+            $validatedResponse->setMessages($response->getMessages());
-+        }
-+
-+        $resultJson->setData($validatedResponse);
-+
-+        return $resultJson;
-+    }
-+
-+    /**
-+     * Customer address validation.
-+     *
-+     * @param DataObject $response
-+     * @return \Magento\Framework\DataObject
-+     */
-+    private function validateCustomerAddress(DataObject $response): DataObject
-+    {
-+        $addressForm = $this->formFactory->create('customer_address', 'adminhtml_customer_address');
-+        $formData = $addressForm->extractData($this->getRequest());
-+
-+        $errors = $addressForm->validateData($formData);
-+        if ($errors !== true) {
-+            $messages = $response->hasMessages() ? $response->getMessages() : [];
-+            foreach ($errors as $error) {
-+                $messages[] = $error;
-+            }
-+            $response->setMessages($messages);
-+            $response->setError(true);
-+        }
-+
-+        return $response;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php b/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php
-index 7337d005a73..b69410ecbfc 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php
-@@ -7,6 +7,7 @@
- 
- namespace Magento\Customer\Controller\Adminhtml\Customer;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Integration\Api\CustomerTokenServiceInterface;
- use Magento\Customer\Api\AccountManagementInterface;
- use Magento\Customer\Api\AddressRepositoryInterface;
-@@ -25,8 +26,15 @@ use Magento\Framework\Api\DataObjectHelper;
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.NumberOfChildren)
-  */
--class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index
-+class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface
- {
-+    /**
-+     * Authorization level of a basic admin session
-+     *
-+     * @see _isAllowed()
-+     */
-+    const ADMIN_RESOURCE = 'Magento_Customer::invalidate_tokens';
-+
-     /**
-      * @var CustomerTokenServiceInterface
-      */
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php b/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
-index 506eac32302..e9034c80503 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
-@@ -10,11 +10,16 @@ use Magento\Backend\App\Action\Context;
- use Magento\Customer\Api\AddressMetadataInterface;
- use Magento\Customer\Model\FileUploader;
- use Magento\Customer\Model\FileUploaderFactory;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Framework\Exception\LocalizedException;
- use Psr\Log\LoggerInterface;
- 
--class Upload extends Action
-+/**
-+ * Uploads files for customer address
-+ */
-+class Upload extends Action implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -38,21 +43,29 @@ class Upload extends Action
-      */
-     private $logger;
- 
-+    /**
-+     * @var string
-+     */
-+    private $scope;
-+
-     /**
-      * @param Context $context
-      * @param FileUploaderFactory $fileUploaderFactory
-      * @param AddressMetadataInterface $addressMetadataService
-      * @param LoggerInterface $logger
-+     * @param string $scope
-      */
-     public function __construct(
-         Context $context,
-         FileUploaderFactory $fileUploaderFactory,
-         AddressMetadataInterface $addressMetadataService,
--        LoggerInterface $logger
-+        LoggerInterface $logger,
-+        string $scope = 'address'
-     ) {
-         $this->fileUploaderFactory = $fileUploaderFactory;
-         $this->addressMetadataService = $addressMetadataService;
-         $this->logger = $logger;
-+        $this->scope = $scope;
-         parent::__construct($context);
-     }
- 
-@@ -69,14 +82,14 @@ class Upload extends Action
-             // Must be executed before any operations with $_FILES!
-             $this->convertFilesArray();
- 
--            $attributeCode = key($_FILES['address']['name']);
-+            $attributeCode = key($_FILES[$this->scope]['name']);
-             $attributeMetadata = $this->addressMetadataService->getAttributeMetadata($attributeCode);
- 
-             /** @var FileUploader $fileUploader */
-             $fileUploader = $this->fileUploaderFactory->create([
-                 'attributeMetadata' => $attributeMetadata,
-                 'entityTypeCode' => AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
--                'scope' => 'address',
-+                'scope' => $this->scope,
-             ]);
- 
-             $errors = $fileUploader->validate();
-@@ -114,14 +127,11 @@ class Upload extends Action
-      */
-     private function convertFilesArray()
-     {
--        foreach ($_FILES['address'] as $itemKey => $item) {
--            foreach ($item as $value) {
--                if (is_array($value)) {
--                    $_FILES['address'][$itemKey] = [
--                        key($value) => current($value),
--                    ];
--                }
-+        foreach ($_FILES as $itemKey => $item) {
-+            foreach ($item as $fieldName => $value) {
-+                    $_FILES[$this->scope][$fieldName] = [$itemKey => $value];
-             }
-+            unset($_FILES[$itemKey]);
-         }
-     }
- }
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
-index 571ef57702b..ab32ea08a44 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Group;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Exception\NoSuchEntityException;
- 
--class Delete extends \Magento\Customer\Controller\Adminhtml\Group
-+class Delete extends \Magento\Customer\Controller\Adminhtml\Group implements HttpPostActionInterface
- {
-     /**
-      * Delete customer group.
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php
-index 9da132078c9..221d01a112e 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Group;
- 
--class Edit extends \Magento\Customer\Controller\Adminhtml\Group
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Edit extends \Magento\Customer\Controller\Adminhtml\Group implements HttpGetActionInterface
- {
-     /**
-      * Edit customer group action. Forward to new action.
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php
-index 1246b6a6d0b..6da79d2c40f 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Group;
- 
--class Index extends \Magento\Customer\Controller\Adminhtml\Group
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Customer\Controller\Adminhtml\Group implements HttpGetActionInterface
- {
-     /**
-      * Customer groups list.
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php
-index 2c230cd0b3f..a5c832bf0f1 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Group;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Customer\Controller\RegistryConstants;
- 
--class NewAction extends \Magento\Customer\Controller\Adminhtml\Group
-+class NewAction extends \Magento\Customer\Controller\Adminhtml\Group implements HttpGetActionInterface
- {
-     /**
-      * Initialize current group and set it in the registry.
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
-index 936d9cdbc17..7549315f9ff 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
-@@ -6,11 +6,12 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Group;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Customer\Api\Data\GroupInterfaceFactory;
- use Magento\Customer\Api\Data\GroupInterface;
- use Magento\Customer\Api\GroupRepositoryInterface;
- 
--class Save extends \Magento\Customer\Controller\Adminhtml\Group
-+class Save extends \Magento\Customer\Controller\Adminhtml\Group implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\Reflection\DataObjectProcessor
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php
-index 7a981b82b7e..ab39ca09816 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php
-@@ -5,10 +5,21 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Index;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Delete extends \Magento\Customer\Controller\Adminhtml\Index
-+/**
-+ * Delete customer action.
-+ */
-+class Delete extends \Magento\Customer\Controller\Adminhtml\Index implements HttpPostActionInterface
- {
-+    /**
-+     * Authorization level of a basic admin session
-+     *
-+     * @see _isAllowed()
-+     */
-+    const ADMIN_RESOURCE = 'Magento_Customer::delete';
-+
-     /**
-      * Delete customer action
-      *
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php
-index 90417c1ad54..25b4ddd4e17 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Index;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Customer\Api\Data\CustomerInterface;
- use Magento\Framework\Exception\NoSuchEntityException;
- 
--class Edit extends \Magento\Customer\Controller\Adminhtml\Index
-+class Edit extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface
- {
-     /**
-      * Customer edit action
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php
-index 861ac93b262..b1986c8b6f0 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php
-@@ -5,7 +5,9 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Index;
- 
--class Index extends \Magento\Customer\Controller\Adminhtml\Index
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface
- {
-     /**
-      * Customers list action
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
-index 2d0ee3ae13d..7220de03568 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
-@@ -6,16 +6,22 @@
- namespace Magento\Customer\Controller\Adminhtml\Index;
- 
- use Magento\Backend\App\Action;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Customer\Model\AddressRegistry;
- use Magento\Customer\Model\EmailNotificationInterface;
--use Magento\Customer\Test\Block\Form\Login;
- use Magento\Customer\Ui\Component\Listing\AttributeRepository;
--use Magento\Customer\Api\Data\CustomerInterface;
--use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Message\MessageInterface;
-+use Magento\Framework\App\ObjectManager;
- 
- /**
-+ * Customer inline edit action
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class InlineEdit extends \Magento\Backend\App\Action
-+class InlineEdit extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -59,6 +65,11 @@ class InlineEdit extends \Magento\Backend\App\Action
-      */
-     private $emailNotification;
- 
-+    /**
-+     * @var AddressRegistry
-+     */
-+    private $addressRegistry;
-+
-     /**
-      * @param Action\Context $context
-      * @param CustomerRepositoryInterface $customerRepository
-@@ -66,6 +77,7 @@ class InlineEdit extends \Magento\Backend\App\Action
-      * @param \Magento\Customer\Model\Customer\Mapper $customerMapper
-      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-      * @param \Psr\Log\LoggerInterface $logger
-+     * @param AddressRegistry|null $addressRegistry
-      */
-     public function __construct(
-         Action\Context $context,
-@@ -73,13 +85,15 @@ class InlineEdit extends \Magento\Backend\App\Action
-         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-         \Magento\Customer\Model\Customer\Mapper $customerMapper,
-         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
--        \Psr\Log\LoggerInterface $logger
-+        \Psr\Log\LoggerInterface $logger,
-+        AddressRegistry $addressRegistry = null
-     ) {
-         $this->customerRepository = $customerRepository;
-         $this->resultJsonFactory = $resultJsonFactory;
-         $this->customerMapper = $customerMapper;
-         $this->dataObjectHelper = $dataObjectHelper;
-         $this->logger = $logger;
-+        $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
-         parent::__construct($context);
-     }
- 
-@@ -101,7 +115,11 @@ class InlineEdit extends \Magento\Backend\App\Action
-     }
- 
-     /**
-+     * Inline edit action execute
-+     *
-      * @return \Magento\Framework\Controller\Result\Json
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function execute()
-     {
-@@ -139,7 +157,7 @@ class InlineEdit extends \Magento\Backend\App\Action
-      * Receive entity(customer|customer_address) data from request
-      *
-      * @param array $data
--     * @param null $isCustomerData
-+     * @param mixed $isCustomerData
-      * @return array
-      */
-     protected function getData(array $data, $isCustomerData = null)
-@@ -212,6 +230,8 @@ class InlineEdit extends \Magento\Backend\App\Action
-     protected function saveCustomer(CustomerInterface $customer)
-     {
-         try {
-+            // No need to validate customer address during inline edit action
-+            $this->disableAddressValidation($customer);
-             $this->customerRepository->save($customer);
-         } catch (\Magento\Framework\Exception\InputException $e) {
-             $this->getMessageManager()->addError($this->getErrorWithCustomerId($e->getMessage()));
-@@ -249,7 +269,7 @@ class InlineEdit extends \Magento\Backend\App\Action
-     protected function getErrorMessages()
-     {
-         $messages = [];
--        foreach ($this->getMessageManager()->getMessages()->getItems() as $error) {
-+        foreach ($this->getMessageManager()->getMessages()->getErrors() as $error) {
-             $messages[] = $error->getText();
-         }
-         return $messages;
-@@ -262,7 +282,7 @@ class InlineEdit extends \Magento\Backend\App\Action
-      */
-     protected function isErrorExists()
-     {
--        return (bool)$this->getMessageManager()->getMessages(true)->getCount();
-+        return (bool)$this->getMessageManager()->getMessages(true)->getCountByType(MessageInterface::TYPE_ERROR);
-     }
- 
-     /**
-@@ -297,4 +317,18 @@ class InlineEdit extends \Magento\Backend\App\Action
-     {
-         return '[Customer ID: ' . $this->getCustomer()->getId() . '] ' . __($errorText);
-     }
-+
-+    /**
-+     * Disable Customer Address Validation
-+     *
-+     * @param CustomerInterface $customer
-+     * @throws NoSuchEntityException
-+     */
-+    private function disableAddressValidation($customer)
-+    {
-+        foreach ($customer->getAddresses() as $address) {
-+            $addressModel = $this->addressRegistry->retrieve($address->getId());
-+            $addressModel->setShouldIgnoreValidation(true);
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
-index 762b872b97b..5a9c52bf9b1 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Index;
- 
-+use Magento\Customer\Model\Customer;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Backend\App\Action\Context;
- use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
- use Magento\Eav\Model\Entity\Collection\AbstractCollection;
-@@ -15,7 +17,7 @@ use Magento\Framework\Controller\ResultFactory;
- /**
-  * Class MassAssignGroup
-  */
--class MassAssignGroup extends AbstractMassAction
-+class MassAssignGroup extends AbstractMassAction implements HttpPostActionInterface
- {
-     /**
-      * @var CustomerRepositoryInterface
-@@ -51,6 +53,8 @@ class MassAssignGroup extends AbstractMassAction
-             // Verify customer exists
-             $customer = $this->customerRepository->getById($customerId);
-             $customer->setGroupId($this->getRequest()->getParam('group'));
-+            // No need to validate customer and customer address during assigning customer to the group
-+            $this->setIgnoreValidationFlag($customer);
-             $this->customerRepository->save($customer);
-             $customersUpdated++;
-         }
-@@ -64,4 +68,15 @@ class MassAssignGroup extends AbstractMassAction
- 
-         return $resultRedirect;
-     }
-+
-+    /**
-+     * Set ignore_validation_flag to skip unnecessary address and customer validation
-+     *
-+     * @param Customer $customer
-+     * @return void
-+     */
-+    private function setIgnoreValidationFlag($customer)
-+    {
-+        $customer->setData('ignore_validation_flag', true);
-+    }
- }
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php
-index 453585c881a..edaeea6a15e 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Index;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Backend\App\Action\Context;
- use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
- use Magento\Eav\Model\Entity\Collection\AbstractCollection;
-@@ -15,8 +16,15 @@ use Magento\Framework\Controller\ResultFactory;
- /**
-  * Class MassDelete
-  */
--class MassDelete extends AbstractMassAction
-+class MassDelete extends AbstractMassAction implements HttpPostActionInterface
- {
-+    /**
-+     * Authorization level of a basic admin session
-+     *
-+     * @see _isAllowed()
-+     */
-+    const ADMIN_RESOURCE = 'Magento_Customer::delete';
-+
-     /**
-      * @var CustomerRepositoryInterface
-      */
-@@ -39,8 +47,7 @@ class MassDelete extends AbstractMassAction
-     }
- 
-     /**
--     * @param AbstractCollection $collection
--     * @return \Magento\Backend\Model\View\Result\Redirect
-+     * @inheritdoc
-      */
-     protected function massAction(AbstractCollection $collection)
-     {
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php
-index e6cf2aa234e..19a16f01acf 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php
-@@ -5,7 +5,9 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Index;
- 
--class NewAction extends \Magento\Customer\Controller\Adminhtml\Index
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class NewAction extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface
- {
-     /**
-      * Create new customer action
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php
-index 37c8ed5a252..1e4fa91cbf8 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php
-@@ -5,11 +5,24 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Index;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Exception\SecurityViolationException;
- 
--class ResetPassword extends \Magento\Customer\Controller\Adminhtml\Index
-+/**
-+ * Reset password controller
-+ *
-+ * @package Magento\Customer\Controller\Adminhtml\Index
-+ */
-+class ResetPassword extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface
- {
-+    /**
-+     * Authorization level of a basic admin session
-+     *
-+     * @see _isAllowed()
-+     */
-+    const ADMIN_RESOURCE = 'Magento_Customer::reset_password';
-+
-     /**
-      * Reset password handler
-      *
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
-index 12732f81f78..38ed688a835 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
-@@ -5,6 +5,16 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Index;
- 
-+use Magento\Customer\Api\AccountManagementInterface;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Model\Address\Mapper;
-+use Magento\Customer\Model\AddressRegistry;
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\Customer\Api\Data\AddressInterfaceFactory;
-+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
-+use Magento\Framework\DataObjectFactory as ObjectFactory;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Customer\Api\AddressMetadataInterface;
- use Magento\Customer\Api\CustomerMetadataInterface;
- use Magento\Customer\Api\Data\CustomerInterface;
-@@ -12,17 +22,115 @@ use Magento\Customer\Controller\RegistryConstants;
- use Magento\Customer\Model\EmailNotificationInterface;
- use Magento\Customer\Model\Metadata\Form;
- use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\App\ObjectManager;
- 
- /**
-+ * Save customer action.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Save extends \Magento\Customer\Controller\Adminhtml\Index
-+class Save extends \Magento\Customer\Controller\Adminhtml\Index implements HttpPostActionInterface
- {
-     /**
-      * @var EmailNotificationInterface
-      */
-     private $emailNotification;
- 
-+    /**
-+     * @var AddressRegistry
-+     */
-+    private $addressRegistry;
-+
-+    /**
-+     * Constructor
-+     *
-+     * @param \Magento\Backend\App\Action\Context $context
-+     * @param \Magento\Framework\Registry $coreRegistry
-+     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-+     * @param \Magento\Customer\Model\CustomerFactory $customerFactory
-+     * @param \Magento\Customer\Model\AddressFactory $addressFactory
-+     * @param \Magento\Customer\Model\Metadata\FormFactory $formFactory
-+     * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
-+     * @param \Magento\Customer\Helper\View $viewHelper
-+     * @param \Magento\Framework\Math\Random $random
-+     * @param CustomerRepositoryInterface $customerRepository
-+     * @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
-+     * @param Mapper $addressMapper
-+     * @param AccountManagementInterface $customerAccountManagement
-+     * @param AddressRepositoryInterface $addressRepository
-+     * @param CustomerInterfaceFactory $customerDataFactory
-+     * @param AddressInterfaceFactory $addressDataFactory
-+     * @param \Magento\Customer\Model\Customer\Mapper $customerMapper
-+     * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
-+     * @param DataObjectHelper $dataObjectHelper
-+     * @param ObjectFactory $objectFactory
-+     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-+     * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-+     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-+     * @param AddressRegistry|null $addressRegistry
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     */
-+    public function __construct(
-+        \Magento\Backend\App\Action\Context $context,
-+        \Magento\Framework\Registry $coreRegistry,
-+        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
-+        \Magento\Customer\Model\CustomerFactory $customerFactory,
-+        \Magento\Customer\Model\AddressFactory $addressFactory,
-+        \Magento\Customer\Model\Metadata\FormFactory $formFactory,
-+        \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory,
-+        \Magento\Customer\Helper\View $viewHelper,
-+        \Magento\Framework\Math\Random $random,
-+        CustomerRepositoryInterface $customerRepository,
-+        \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter,
-+        Mapper $addressMapper,
-+        AccountManagementInterface $customerAccountManagement,
-+        AddressRepositoryInterface $addressRepository,
-+        CustomerInterfaceFactory $customerDataFactory,
-+        AddressInterfaceFactory $addressDataFactory,
-+        \Magento\Customer\Model\Customer\Mapper $customerMapper,
-+        \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor,
-+        DataObjectHelper $dataObjectHelper,
-+        ObjectFactory $objectFactory,
-+        \Magento\Framework\View\LayoutFactory $layoutFactory,
-+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
-+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-+        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory,
-+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-+        AddressRegistry $addressRegistry = null
-+    ) {
-+        parent::__construct(
-+            $context,
-+            $coreRegistry,
-+            $fileFactory,
-+            $customerFactory,
-+            $addressFactory,
-+            $formFactory,
-+            $subscriberFactory,
-+            $viewHelper,
-+            $random,
-+            $customerRepository,
-+            $extensibleDataObjectConverter,
-+            $addressMapper,
-+            $customerAccountManagement,
-+            $addressRepository,
-+            $customerDataFactory,
-+            $addressDataFactory,
-+            $customerMapper,
-+            $dataObjectProcessor,
-+            $dataObjectHelper,
-+            $objectFactory,
-+            $layoutFactory,
-+            $resultLayoutFactory,
-+            $resultPageFactory,
-+            $resultForwardFactory,
-+            $resultJsonFactory
-+        );
-+        $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
-+    }
-+
-     /**
-      * Reformat customer account data to be compatible with customer service interface
-      *
-@@ -107,6 +215,7 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index
-     /**
-      * Saves default_billing and default_shipping flags for customer address
-      *
-+     * @deprecated must be removed because addresses are save separately for now
-      * @param array $addressIdList
-      * @param array $extractedCustomerData
-      * @return array
-@@ -149,6 +258,7 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index
-     /**
-      * Reformat customer addresses data to be compatible with customer service interface
-      *
-+     * @deprecated addresses are saved separately for now
-      * @param array $extractedCustomerData
-      * @return array
-      */
-@@ -179,18 +289,17 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index
-     public function execute()
-     {
-         $returnToEdit = false;
--        $originalRequestData = $this->getRequest()->getPostValue();
--
-         $customerId = $this->getCurrentCustomerId();
- 
--        if ($originalRequestData) {
-+        if ($this->getRequest()->getPostValue()) {
-             try {
-                 // optional fields might be set in request for future processing by observers in other modules
-                 $customerData = $this->_extractCustomerData();
--                $addressesData = $this->_extractCustomerAddressData($customerData);
- 
-                 if ($customerId) {
-                     $currentCustomer = $this->_customerRepository->getById($customerId);
-+                    // No need to validate customer address while editing customer profile
-+                    $this->disableAddressValidation($currentCustomer);
-                     $customerData = array_merge(
-                         $this->customerMapper->toFlatArray($currentCustomer),
-                         $customerData
-@@ -205,28 +314,12 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index
-                     $customerData,
-                     \Magento\Customer\Api\Data\CustomerInterface::class
-                 );
--                $addresses = [];
--                foreach ($addressesData as $addressData) {
--                    $region = isset($addressData['region']) ? $addressData['region'] : null;
--                    $regionId = isset($addressData['region_id']) ? $addressData['region_id'] : null;
--                    $addressData['region'] = [
--                        'region' => $region,
--                        'region_id' => $regionId,
--                    ];
--                    $addressDataObject = $this->addressDataFactory->create();
--                    $this->dataObjectHelper->populateWithArray(
--                        $addressDataObject,
--                        $addressData,
--                        \Magento\Customer\Api\Data\AddressInterface::class
--                    );
--                    $addresses[] = $addressDataObject;
--                }
- 
-                 $this->_eventManager->dispatch(
-                     'adminhtml_customer_prepare_save',
-                     ['customer' => $customer, 'request' => $this->getRequest()]
-                 );
--                $customer->setAddresses($addresses);
-+
-                 if (isset($customerData['sendemail_store_id'])) {
-                     $customer->setStoreId($customerData['sendemail_store_id']);
-                 }
-@@ -269,7 +362,7 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index
-                     $messages = $exception->getMessage();
-                 }
-                 $this->_addSessionErrorMessages($messages);
--                $this->_getSession()->setCustomerFormData($originalRequestData);
-+                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData());
-                 $returnToEdit = true;
-             } catch (\Magento\Framework\Exception\AbstractAggregateException $exception) {
-                 $errors = $exception->getErrors();
-@@ -278,18 +371,19 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index
-                     $messages[] = $error->getMessage();
-                 }
-                 $this->_addSessionErrorMessages($messages);
--                $this->_getSession()->setCustomerFormData($originalRequestData);
-+                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData());
-                 $returnToEdit = true;
-             } catch (LocalizedException $exception) {
-                 $this->_addSessionErrorMessages($exception->getMessage());
--                $this->_getSession()->setCustomerFormData($originalRequestData);
-+                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData());
-                 $returnToEdit = true;
-             } catch (\Exception $exception) {
-                 $this->messageManager->addException($exception, __('Something went wrong while saving the customer.'));
--                $this->_getSession()->setCustomerFormData($originalRequestData);
-+                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData());
-                 $returnToEdit = true;
-             }
-         }
-+
-         $resultRedirect = $this->resultRedirectFactory->create();
-         if ($returnToEdit) {
-             if ($customerId) {
-@@ -380,4 +474,43 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index
- 
-         return $customerId;
-     }
-+
-+    /**
-+     * Disable Customer Address Validation
-+     *
-+     * @param CustomerInterface $customer
-+     * @throws NoSuchEntityException
-+     */
-+    private function disableAddressValidation($customer)
-+    {
-+        foreach ($customer->getAddresses() as $address) {
-+            $addressModel = $this->addressRegistry->retrieve($address->getId());
-+            $addressModel->setShouldIgnoreValidation(true);
-+        }
-+    }
-+
-+    /**
-+     * Retrieve formatted form data
-+     *
-+     * @return array
-+     */
-+    private function retrieveFormattedFormData(): array
-+    {
-+        $originalRequestData = $this->getRequest()->getPostValue();
-+
-+        /* Customer data filtration */
-+        if (isset($originalRequestData['customer'])) {
-+            $customerData = $this->_extractData(
-+                'adminhtml_customer',
-+                CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
-+                [],
-+                'customer'
-+            );
-+
-+            $customerData = array_intersect_key($customerData, $originalRequestData['customer']);
-+            $originalRequestData['customer'] = array_merge($originalRequestData['customer'], $customerData);
-+        }
-+
-+        return $originalRequestData;
-+    }
- }
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
-index 8e098a3b7ee..d91bc7424bf 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
-@@ -5,10 +5,16 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Index;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Customer\Api\Data\CustomerInterface;
- use Magento\Framework\Message\Error;
-+use Magento\Customer\Controller\Adminhtml\Index as CustomerAction;
- 
--class Validate extends \Magento\Customer\Controller\Adminhtml\Index
-+/**
-+ * Class for validation of customer
-+ */
-+class Validate extends CustomerAction implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * Customer validation
-@@ -69,40 +75,6 @@ class Validate extends \Magento\Customer\Controller\Adminhtml\Index
-         return $customer;
-     }
- 
--    /**
--     * Customer address validation.
--     *
--     * @param \Magento\Framework\DataObject $response
--     * @return void
--     */
--    protected function _validateCustomerAddress($response)
--    {
--        $addresses = $this->getRequest()->getPost('address');
--        if (!is_array($addresses)) {
--            return;
--        }
--        foreach (array_keys($addresses) as $index) {
--            if ($index == '_template_') {
--                continue;
--            }
--
--            $addressForm = $this->_formFactory->create('customer_address', 'adminhtml_customer_address');
--
--            $requestScope = sprintf('address/%s', $index);
--            $formData = $addressForm->extractData($this->getRequest(), $requestScope);
--
--            $errors = $addressForm->validateData($formData);
--            if ($errors !== true) {
--                $messages = $response->hasMessages() ? $response->getMessages() : [];
--                foreach ($errors as $error) {
--                    $messages[] = $error;
--                }
--                $response->setMessages($messages);
--                $response->setError(1);
--            }
--        }
--    }
--
-     /**
-      * AJAX customer validation action
-      *
-@@ -113,10 +85,7 @@ class Validate extends \Magento\Customer\Controller\Adminhtml\Index
-         $response = new \Magento\Framework\DataObject();
-         $response->setError(0);
- 
--        $customer = $this->_validateCustomer($response);
--        if ($customer) {
--            $this->_validateCustomerAddress($response);
--        }
-+        $this->_validateCustomer($response);
-         $resultJson = $this->resultJsonFactory->create();
-         if ($response->getError()) {
-             $response->setError(true);
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
-index 20d330354bc..02a04508622 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Customer\Controller\Adminhtml\Index;
- 
- use Magento\Customer\Api\AccountManagementInterface;
-@@ -17,7 +19,10 @@ use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\DataObjectFactory;
- 
- /**
-+ * Class Viewfile serves to show file or image by file/image name provided in request parameters.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-  */
- class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
- {
-@@ -127,8 +132,6 @@ class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
-      *
-      * @return \Magento\Framework\Controller\ResultInterface|void
-      * @throws NotFoundException
--     *
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     public function execute()
-     {
-@@ -146,6 +149,7 @@ class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
-         }
- 
-         if ($plain) {
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             $extension = pathinfo($path, PATHINFO_EXTENSION);
-             switch (strtolower($extension)) {
-                 case 'gif':
-@@ -175,6 +179,7 @@ class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
-             $resultRaw->setContents($directory->readFile($fileName));
-             return $resultRaw;
-         } else {
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             $name = pathinfo($path, PATHINFO_BASENAME);
-             $this->_fileFactory->create(
-                 $name,
-diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php
-index 3cf9a82b8b8..0262513d029 100644
---- a/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php
-+++ b/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php
-@@ -6,10 +6,11 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Online;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\View\Result\PageFactory;
- 
--class Index extends \Magento\Backend\App\Action
-+class Index extends \Magento\Backend\App\Action implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Customer/Controller/Ajax/Login.php b/app/code/Magento/Customer/Controller/Ajax/Login.php
-index 73869bc3f29..5049c83e60f 100644
---- a/app/code/Magento/Customer/Controller/Ajax/Login.php
-+++ b/app/code/Magento/Customer/Controller/Ajax/Login.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\Customer\Controller\Ajax;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Customer\Api\AccountManagementInterface;
- use Magento\Framework\Exception\EmailNotConfirmedException;
- use Magento\Framework\Exception\InvalidEmailOrPasswordException;
-@@ -23,12 +24,12 @@ use Magento\Framework\Stdlib\CookieManagerInterface;
-  * @method \Magento\Framework\App\Response\Http getResponse()
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Login extends \Magento\Framework\App\Action\Action
-+class Login extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
- {
-     /**
--     * @var \Magento\Framework\Session\Generic
-+     * @var \Magento\Customer\Model\Session
-      */
--    protected $session;
-+    protected $customerSession;
- 
-     /**
-      * @var AccountManagementInterface
-@@ -106,7 +107,6 @@ class Login extends \Magento\Framework\App\Action\Action
- 
-     /**
-      * Get account redirect.
--     * For release backward compatibility.
-      *
-      * @deprecated 100.0.10
-      * @return AccountRedirect
-@@ -132,6 +132,8 @@ class Login extends \Magento\Framework\App\Action\Action
-     }
- 
-     /**
-+     * Initializes config dependency.
-+     *
-      * @deprecated 100.0.10
-      * @return ScopeConfigInterface
-      */
-@@ -144,6 +146,8 @@ class Login extends \Magento\Framework\App\Action\Action
-     }
- 
-     /**
-+     * Sets config dependency.
-+     *
-      * @deprecated 100.0.10
-      * @param ScopeConfigInterface $value
-      * @return void
-@@ -198,25 +202,15 @@ class Login extends \Magento\Framework\App\Action\Action
-                 $response['redirectUrl'] = $this->_redirect->success($redirectRoute);
-                 $this->getAccountRedirect()->clearRedirectCookie();
-             }
--        } catch (EmailNotConfirmedException $e) {
--            $response = [
--                'errors' => true,
--                'message' => $e->getMessage()
--            ];
--        } catch (InvalidEmailOrPasswordException $e) {
--            $response = [
--                'errors' => true,
--                'message' => $e->getMessage()
--            ];
-         } catch (LocalizedException $e) {
-             $response = [
-                 'errors' => true,
--                'message' => $e->getMessage()
-+                'message' => $e->getMessage(),
-             ];
-         } catch (\Exception $e) {
-             $response = [
-                 'errors' => true,
--                'message' => __('Invalid login or password.')
-+                'message' => __('Invalid login or password.'),
-             ];
-         }
-         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-diff --git a/app/code/Magento/Customer/Controller/Ajax/Logout.php b/app/code/Magento/Customer/Controller/Ajax/Logout.php
-index 0edd41e3632..c9eadacd12e 100644
---- a/app/code/Magento/Customer/Controller/Ajax/Logout.php
-+++ b/app/code/Magento/Customer/Controller/Ajax/Logout.php
-@@ -7,18 +7,20 @@
- 
- namespace Magento\Customer\Controller\Ajax;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+
- /**
-  * Logout controller
-  *
-  * @method \Magento\Framework\App\RequestInterface getRequest()
-  * @method \Magento\Framework\App\Response\Http getResponse()
-  */
--class Logout extends \Magento\Framework\App\Action\Action
-+class Logout extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
- {
-     /**
--     * @var \Magento\Framework\Session\Generic
-+     * @var \Magento\Customer\Model\Session
-      */
--    protected $session;
-+    protected $customerSession;
- 
-     /**
-      * @var \Magento\Framework\Controller\Result\JsonFactory
-diff --git a/app/code/Magento/Customer/Controller/Section/Load.php b/app/code/Magento/Customer/Controller/Section/Load.php
-index 7a2345c9175..37cd071b136 100644
---- a/app/code/Magento/Customer/Controller/Section/Load.php
-+++ b/app/code/Magento/Customer/Controller/Section/Load.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Customer\Controller\Section;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Customer\CustomerData\Section\Identifier;
- use Magento\Customer\CustomerData\SectionPoolInterface;
- use Magento\Framework\App\Action\Context;
-@@ -13,7 +14,7 @@ use Magento\Framework\Controller\Result\JsonFactory;
- /**
-  * Customer section controller
-  */
--class Load extends \Magento\Framework\App\Action\Action
-+class Load extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
- {
-     /**
-      * @var JsonFactory
-@@ -58,7 +59,7 @@ class Load extends \Magento\Framework\App\Action\Action
-     }
- 
-     /**
--     * @return \Magento\Framework\Controller\Result\Json
-+     * @inheritdoc
-      */
-     public function execute()
-     {
-@@ -70,11 +71,11 @@ class Load extends \Magento\Framework\App\Action\Action
-             $sectionNames = $this->getRequest()->getParam('sections');
-             $sectionNames = $sectionNames ? array_unique(\explode(',', $sectionNames)) : null;
- 
--            $updateSectionId = $this->getRequest()->getParam('update_section_id');
--            if ('false' === $updateSectionId) {
--                $updateSectionId = false;
-+            $forceNewSectionTimestamp = $this->getRequest()->getParam('force_new_section_timestamp');
-+            if ('false' === $forceNewSectionTimestamp) {
-+                $forceNewSectionTimestamp = false;
-             }
--            $response = $this->sectionPool->getSectionsData($sectionNames, (bool)$updateSectionId);
-+            $response = $this->sectionPool->getSectionsData($sectionNames, (bool)$forceNewSectionTimestamp);
-         } catch (\Exception $e) {
-             $resultJson->setStatusHeader(
-                 \Zend\Http\Response::STATUS_CODE_400,
-diff --git a/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php b/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php
-index aa73e275ee0..f82a4d15ae8 100644
---- a/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php
-+++ b/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php
-@@ -5,10 +5,13 @@
-  */
- namespace Magento\Customer\CustomerData\Plugin;
- 
--use Magento\Framework\Session\SessionManager;
-+use Magento\Framework\Session\SessionManagerInterface;
- use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
- use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
- 
-+/**
-+ * Class SessionChecker
-+ */
- class SessionChecker
- {
-     /**
-@@ -36,10 +39,12 @@ class SessionChecker
-     /**
-      * Delete frontend session cookie if customer session is expired
-      *
--     * @param SessionManager $sessionManager
-+     * @param SessionManagerInterface $sessionManager
-      * @return void
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Magento\Framework\Stdlib\Cookie\FailureToSendException
-      */
--    public function beforeStart(SessionManager $sessionManager)
-+    public function beforeStart(SessionManagerInterface $sessionManager)
-     {
-         if (!$this->cookieManager->getCookie($sessionManager->getName())
-             && $this->cookieManager->getCookie('mage-cache-sessid')
-diff --git a/app/code/Magento/Customer/CustomerData/Section/Identifier.php b/app/code/Magento/Customer/CustomerData/Section/Identifier.php
-index 2a770925d1c..a8bc2c8abc1 100644
---- a/app/code/Magento/Customer/CustomerData/Section/Identifier.php
-+++ b/app/code/Magento/Customer/CustomerData/Section/Identifier.php
-@@ -43,12 +43,12 @@ class Identifier
-     /**
-      * Init mark(identifier) for sections
-      *
--     * @param bool $forceUpdate
-+     * @param bool $forceNewTimestamp
-      * @return int
-      */
--    public function initMark($forceUpdate)
-+    public function initMark($forceNewTimestamp)
-     {
--        if ($forceUpdate) {
-+        if ($forceNewTimestamp) {
-             $this->markId = time();
-             return $this->markId;
-         }
-@@ -67,19 +67,19 @@ class Identifier
-      * Mark sections with data id
-      *
-      * @param array $sectionsData
--     * @param null $sectionNames
--     * @param bool $updateIds
-+     * @param array|null $sectionNames
-+     * @param bool $forceNewTimestamp
-      * @return array
-      */
--    public function markSections(array $sectionsData, $sectionNames = null, $updateIds = false)
-+    public function markSections(array $sectionsData, $sectionNames = null, $forceNewTimestamp = false)
-     {
-         if (!$sectionNames) {
-             $sectionNames = array_keys($sectionsData);
-         }
--        $markId = $this->initMark($updateIds);
-+        $markId = $this->initMark($forceNewTimestamp);
- 
-         foreach ($sectionNames as $name) {
--            if ($updateIds || !array_key_exists(self::SECTION_KEY, $sectionsData[$name])) {
-+            if ($forceNewTimestamp || !array_key_exists(self::SECTION_KEY, $sectionsData[$name])) {
-                 $sectionsData[$name][self::SECTION_KEY] = $markId;
-             }
-         }
-diff --git a/app/code/Magento/Customer/CustomerData/SectionPool.php b/app/code/Magento/Customer/CustomerData/SectionPool.php
-index 0e0d7b992e3..efea1762d9d 100644
---- a/app/code/Magento/Customer/CustomerData/SectionPool.php
-+++ b/app/code/Magento/Customer/CustomerData/SectionPool.php
-@@ -53,12 +53,12 @@ class SectionPool implements SectionPoolInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
--    public function getSectionsData(array $sectionNames = null, $updateIds = false)
-+    public function getSectionsData(array $sectionNames = null, $forceNewTimestamp = false)
-     {
-         $sectionsData = $sectionNames ? $this->getSectionDataByNames($sectionNames) : $this->getAllSectionData();
--        $sectionsData = $this->identifier->markSections($sectionsData, $sectionNames, $updateIds);
-+        $sectionsData = $this->identifier->markSections($sectionsData, $sectionNames, $forceNewTimestamp);
-         return $sectionsData;
-     }
- 
-diff --git a/app/code/Magento/Customer/CustomerData/SectionPoolInterface.php b/app/code/Magento/Customer/CustomerData/SectionPoolInterface.php
-index c308804fd0f..ad73b9722b1 100644
---- a/app/code/Magento/Customer/CustomerData/SectionPoolInterface.php
-+++ b/app/code/Magento/Customer/CustomerData/SectionPoolInterface.php
-@@ -14,8 +14,8 @@ interface SectionPoolInterface
-      * Get section data by section names. If $sectionNames is null then return all sections data
-      *
-      * @param array $sectionNames
--     * @param bool $updateIds
-+     * @param bool $forceNewTimestamp
-      * @return array
-      */
--    public function getSectionsData(array $sectionNames = null, $updateIds = false);
-+    public function getSectionsData(array $sectionNames = null, $forceNewTimestamp = false);
- }
-diff --git a/app/code/Magento/Customer/Helper/Address.php b/app/code/Magento/Customer/Helper/Address.php
-index c74c62dc6d9..765c13b2877 100644
---- a/app/code/Magento/Customer/Helper/Address.php
-+++ b/app/code/Magento/Customer/Helper/Address.php
-@@ -10,6 +10,8 @@ use Magento\Customer\Api\CustomerMetadataInterface;
- use Magento\Customer\Api\Data\AttributeMetadataInterface;
- use Magento\Directory\Model\Country\Format;
- use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\View\Element\BlockInterface;
-+use Magento\Store\Model\ScopeInterface;
- 
- /**
-  * Customer address helper
-@@ -94,6 +96,8 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-     protected $_addressConfig;
- 
-     /**
-+     * Address constructor.
-+     *
-      * @param \Magento\Framework\App\Helper\Context $context
-      * @param \Magento\Framework\View\Element\BlockFactory $blockFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-@@ -127,6 +131,8 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-     }
- 
-     /**
-+     * Retrieve edit url.
-+     *
-      * @return void
-      */
-     public function getEditUrl()
-@@ -134,6 +140,8 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-     }
- 
-     /**
-+     * Retrieve delete url.
-+     *
-      * @return void
-      */
-     public function getDeleteUrl()
-@@ -141,6 +149,8 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-     }
- 
-     /**
-+     * Retrieve create url.
-+     *
-      * @return void
-      */
-     public function getCreateUrl()
-@@ -148,6 +158,8 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-     }
- 
-     /**
-+     * Retrieve block renderer.
-+     *
-      * @param string $renderer
-      * @return \Magento\Framework\View\Element\BlockInterface
-      */
-@@ -165,7 +177,9 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-      *
-      * @param string $key
-      * @param \Magento\Store\Model\Store|int|string $store
-+     *
-      * @return string|null
-+     * @throws NoSuchEntityException
-      */
-     public function getConfig($key, $store = null)
-     {
-@@ -174,7 +188,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-         if (!isset($this->_config[$websiteId])) {
-             $this->_config[$websiteId] = $this->scopeConfig->getValue(
-                 'customer/address',
--                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+                ScopeInterface::SCOPE_STORE,
-                 $store
-             );
-         }
-@@ -185,7 +199,10 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-      * Return Number of Lines in a Street Address for store
-      *
-      * @param \Magento\Store\Model\Store|int|string $store
-+     *
-      * @return int
-+     * @throws NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getStreetLines($store = null)
-     {
-@@ -204,6 +221,8 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-     }
- 
-     /**
-+     * Retrieve address format.
-+     *
-      * @param string $code
-      * @return Format|string
-      */
-@@ -232,7 +251,9 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-      * Determine if specified address config value can be shown
-      *
-      * @param string $key
-+     *
-      * @return bool
-+     * @throws NoSuchEntityException
-      */
-     public function canShowConfig($key)
-     {
-@@ -243,9 +264,11 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-      * Get string with frontend validation classes for attribute
-      *
-      * @param string $attributeCode
-+     *
-      * @return string
-      *
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getAttributeValidationClass($attributeCode)
-     {
-@@ -313,9 +336,9 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     public function isVatValidationEnabled($store = null)
-     {
--        return (bool)$this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_VAT_VALIDATION_ENABLED,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
-@@ -327,9 +350,9 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     public function isDisableAutoGroupAssignDefaultValue()
-     {
--        return (bool)$this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_VIV_DISABLE_AUTO_ASSIGN_DEFAULT,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         );
-     }
- 
-@@ -341,9 +364,9 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     public function hasValidateOnEachTransaction($store = null)
-     {
--        return (bool)$this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_VIV_ON_EACH_TRANSACTION,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
-@@ -358,7 +381,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-     {
-         return (string)$this->scopeConfig->getValue(
-             self::XML_PATH_VIV_TAX_CALCULATION_ADDRESS_TYPE,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            ScopeInterface::SCOPE_STORE,
-             $store
-         );
-     }
-@@ -370,9 +393,9 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     public function isVatAttributeVisible()
-     {
--        return (bool)$this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_VAT_FRONTEND_VISIBILITY,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         );
-     }
- 
-@@ -380,7 +403,10 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
-      * Retrieve attribute visibility
-      *
-      * @param string $code
-+     *
-      * @return bool
-+     * @throws NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      * @since 100.2.0
-      */
-     public function isAttributeVisible($code)
-diff --git a/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php b/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php
-index e6082de1da4..5cd09aca9f8 100644
---- a/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php
-+++ b/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php
-@@ -10,11 +10,12 @@ use Magento\Customer\Api\Data\CustomerInterfaceFactory;
- use Magento\Customer\Model\Session as CustomerSession;
- use Magento\Framework\App\RequestInterface;
- use Magento\Framework\App\ViewInterface;
--use Magento\Framework\Module\Manager as ModuleManager;
-+use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
- use Magento\Framework\View\LayoutInterface;
- 
- /**
-  * Class CurrentCustomer
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class CurrentCustomer
- {
-@@ -44,7 +45,7 @@ class CurrentCustomer
-     protected $request;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-diff --git a/app/code/Magento/Customer/Model/AccountConfirmation.php b/app/code/Magento/Customer/Model/AccountConfirmation.php
-index 7d01ff0efc4..f29330af258 100644
---- a/app/code/Magento/Customer/Model/AccountConfirmation.php
-+++ b/app/code/Magento/Customer/Model/AccountConfirmation.php
-@@ -10,8 +10,7 @@ use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\Registry;
- 
- /**
-- * Class AccountConfirmation.
-- * Checks if email confirmation required for customer.
-+ * Class AccountConfirmation. Checks if email confirmation required for customer.
-  */
- class AccountConfirmation
- {
-@@ -31,6 +30,8 @@ class AccountConfirmation
-     private $registry;
- 
-     /**
-+     * AccountConfirmation constructor.
-+     *
-      * @param ScopeConfigInterface $scopeConfig
-      * @param Registry $registry
-      */
-@@ -56,7 +57,7 @@ class AccountConfirmation
-             return false;
-         }
- 
--        return (bool)$this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_IS_CONFIRM,
-             ScopeInterface::SCOPE_WEBSITES,
-             $websiteId
-diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
-index 3aba7d1da89..15d98af86b7 100644
---- a/app/code/Magento/Customer/Model/AccountManagement.php
-+++ b/app/code/Magento/Customer/Model/AccountManagement.php
-@@ -17,9 +17,13 @@ use Magento\Customer\Helper\View as CustomerViewHelper;
- use Magento\Customer\Model\Config\Share as ConfigShare;
- use Magento\Customer\Model\Customer as CustomerModel;
- use Magento\Customer\Model\Customer\CredentialsValidator;
-+use Magento\Customer\Model\ForgotPasswordToken\GetCustomerByToken;
- use Magento\Customer\Model\Metadata\Validator;
-+use Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory;
-+use Magento\Directory\Model\AllowedCountries;
- use Magento\Eav\Model\Validator\Attribute\Backend;
- use Magento\Framework\Api\ExtensibleDataObjectConverter;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
- use Magento\Framework\App\Area;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\ObjectManager;
-@@ -43,14 +47,13 @@ use Magento\Framework\Mail\Template\TransportBuilder;
- use Magento\Framework\Math\Random;
- use Magento\Framework\Reflection\DataObjectProcessor;
- use Magento\Framework\Registry;
-+use Magento\Framework\Session\SaveHandlerInterface;
-+use Magento\Framework\Session\SessionManagerInterface;
- use Magento\Framework\Stdlib\DateTime;
- use Magento\Framework\Stdlib\StringUtils as StringHelper;
- use Magento\Store\Model\ScopeInterface;
- use Magento\Store\Model\StoreManagerInterface;
- use Psr\Log\LoggerInterface as PsrLogger;
--use Magento\Framework\Session\SessionManagerInterface;
--use Magento\Framework\Session\SaveHandlerInterface;
--use Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory;
- 
- /**
-  * Handle various customer account actions
-@@ -58,6 +61,7 @@ use Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory;
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class AccountManagement implements AccountManagementInterface
- {
-@@ -326,6 +330,26 @@ class AccountManagement implements AccountManagementInterface
-      */
-     private $accountConfirmation;
- 
-+    /**
-+     * @var SearchCriteriaBuilder
-+     */
-+    private $searchCriteriaBuilder;
-+
-+    /**
-+     * @var AddressRegistry
-+     */
-+    private $addressRegistry;
-+
-+    /**
-+     * @var AllowedCountries
-+     */
-+    private $allowedCountriesReader;
-+
-+    /**
-+     * @var GetCustomerByToken
-+     */
-+    private $getByToken;
-+
-     /**
-      * @param CustomerFactory $customerFactory
-      * @param ManagerInterface $eventManager
-@@ -356,7 +380,14 @@ class AccountManagement implements AccountManagementInterface
-      * @param SessionManagerInterface|null $sessionManager
-      * @param SaveHandlerInterface|null $saveHandler
-      * @param CollectionFactory|null $visitorCollectionFactory
-+     * @param SearchCriteriaBuilder|null $searchCriteriaBuilder
-+     * @param AddressRegistry|null $addressRegistry
-+     * @param GetCustomerByToken|null $getByToken
-+     * @param AllowedCountries|null $allowedCountriesReader
-+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * @SuppressWarnings(PHPMD.LongVariable)
-      */
-     public function __construct(
-         CustomerFactory $customerFactory,
-@@ -387,7 +418,11 @@ class AccountManagement implements AccountManagementInterface
-         AccountConfirmation $accountConfirmation = null,
-         SessionManagerInterface $sessionManager = null,
-         SaveHandlerInterface $saveHandler = null,
--        CollectionFactory $visitorCollectionFactory = null
-+        CollectionFactory $visitorCollectionFactory = null,
-+        SearchCriteriaBuilder $searchCriteriaBuilder = null,
-+        AddressRegistry $addressRegistry = null,
-+        GetCustomerByToken $getByToken = null,
-+        AllowedCountries $allowedCountriesReader = null
-     ) {
-         $this->customerFactory = $customerFactory;
-         $this->eventManager = $eventManager;
-@@ -412,17 +447,26 @@ class AccountManagement implements AccountManagementInterface
-         $this->customerModel = $customerModel;
-         $this->objectFactory = $objectFactory;
-         $this->extensibleDataObjectConverter = $extensibleDataObjectConverter;
-+        $objectManager = ObjectManager::getInstance();
-         $this->credentialsValidator =
--            $credentialsValidator ?: ObjectManager::getInstance()->get(CredentialsValidator::class);
--        $this->dateTimeFactory = $dateTimeFactory ?: ObjectManager::getInstance()->get(DateTimeFactory::class);
--        $this->accountConfirmation = $accountConfirmation ?: ObjectManager::getInstance()
-+            $credentialsValidator ?: $objectManager->get(CredentialsValidator::class);
-+        $this->dateTimeFactory = $dateTimeFactory ?: $objectManager->get(DateTimeFactory::class);
-+        $this->accountConfirmation = $accountConfirmation ?: $objectManager
-             ->get(AccountConfirmation::class);
-         $this->sessionManager = $sessionManager
--            ?: ObjectManager::getInstance()->get(SessionManagerInterface::class);
-+            ?: $objectManager->get(SessionManagerInterface::class);
-         $this->saveHandler = $saveHandler
--            ?: ObjectManager::getInstance()->get(SaveHandlerInterface::class);
-+            ?: $objectManager->get(SaveHandlerInterface::class);
-         $this->visitorCollectionFactory = $visitorCollectionFactory
--            ?: ObjectManager::getInstance()->get(CollectionFactory::class);
-+            ?: $objectManager->get(CollectionFactory::class);
-+        $this->searchCriteriaBuilder = $searchCriteriaBuilder
-+            ?: $objectManager->get(SearchCriteriaBuilder::class);
-+        $this->addressRegistry = $addressRegistry
-+            ?: $objectManager->get(AddressRegistry::class);
-+        $this->getByToken = $getByToken
-+            ?: $objectManager->get(GetCustomerByToken::class);
-+        $this->allowedCountriesReader = $allowedCountriesReader
-+            ?: $objectManager->get(AllowedCountries::class);
-     }
- 
-     /**
-@@ -488,8 +532,11 @@ class AccountManagement implements AccountManagementInterface
-      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-      * @param string $confirmationKey
-      * @return \Magento\Customer\Api\Data\CustomerInterface
--     * @throws \Magento\Framework\Exception\State\InvalidTransitionException
--     * @throws \Magento\Framework\Exception\State\InputMismatchException
-+     * @throws InputException
-+     * @throws InputMismatchException
-+     * @throws InvalidTransitionException
-+     * @throws LocalizedException
-+     * @throws NoSuchEntityException
-      */
-     private function activateCustomer($customer, $confirmationKey)
-     {
-@@ -503,6 +550,8 @@ class AccountManagement implements AccountManagementInterface
-         }
- 
-         $customer->setConfirmation(null);
-+        // No need to validate customer and customer address while activating customer
-+        $this->setIgnoreValidationFlag($customer);
-         $this->customerRepository->save($customer);
-         $this->getEmailNotification()->newAccount(
-             $customer,
-@@ -530,6 +579,7 @@ class AccountManagement implements AccountManagementInterface
-         }
-         try {
-             $this->getAuthentication()->authenticate($customerId, $password);
-+            // phpcs:disable Magento2.Exceptions.ThrowCatch
-         } catch (InvalidEmailOrPasswordException $e) {
-             throw new InvalidEmailOrPasswordException(__('Invalid login or password.'));
-         }
-@@ -568,6 +618,9 @@ class AccountManagement implements AccountManagementInterface
-         // load customer by email
-         $customer = $this->customerRepository->get($email, $websiteId);
- 
-+        // No need to validate customer address while saving customer reset password token
-+        $this->disableAddressValidation($customer);
-+
-         $newPasswordToken = $this->mathRandom->getUniqueHash();
-         $this->changeResetPasswordLinkToken($customer, $newPasswordToken);
- 
-@@ -599,15 +652,17 @@ class AccountManagement implements AccountManagementInterface
-      */
-     private function handleUnknownTemplate($template)
-     {
--        throw new InputException(__(
--            'Invalid value of "%value" provided for the %fieldName field. Possible values: %template1 or %template2.',
--            [
--                'value' => $template,
--                'fieldName' => 'template',
--                'template1' => AccountManagement::EMAIL_REMINDER,
--                'template2' => AccountManagement::EMAIL_RESET
--            ]
--        ));
-+        throw new InputException(
-+            __(
-+                'Invalid value of "%value" provided for the %fieldName field. Possible values: %template1 or %template2.',
-+                [
-+                    'value' => $template,
-+                    'fieldName' => 'template',
-+                    'template1' => AccountManagement::EMAIL_REMINDER,
-+                    'template2' => AccountManagement::EMAIL_RESET
-+                ]
-+            )
-+        );
-     }
- 
-     /**
-@@ -615,18 +670,36 @@ class AccountManagement implements AccountManagementInterface
-      */
-     public function resetPassword($email, $resetToken, $newPassword)
-     {
--        $customer = $this->customerRepository->get($email);
-+        if (!$email) {
-+            $customer = $this->getByToken->execute($resetToken);
-+            $email = $customer->getEmail();
-+        } else {
-+            $customer = $this->customerRepository->get($email);
-+        }
-+
-+        // No need to validate customer and customer address while saving customer reset password token
-+        $this->disableAddressValidation($customer);
-+        $this->setIgnoreValidationFlag($customer);
-+
-         //Validate Token and new password strength
-         $this->validateResetPasswordToken($customer->getId(), $resetToken);
-+        $this->credentialsValidator->checkPasswordDifferentFromEmail(
-+            $email,
-+            $newPassword
-+        );
-         $this->checkPasswordStrength($newPassword);
-         //Update secure data
-         $customerSecure = $this->customerRegistry->retrieveSecureData($customer->getId());
-         $customerSecure->setRpToken(null);
-         $customerSecure->setRpTokenCreatedAt(null);
-         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
--        $this->getAuthentication()->unlock($customer->getId());
--        $this->sessionManager->destroy();
-         $this->destroyCustomerSessions($customer->getId());
-+        if ($this->sessionManager->isSessionExists()) {
-+            //delete old session and move data to the new session
-+            //use this instead of $this->sessionManager->regenerateId because last one doesn't delete old session
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+            session_regenerate_id(true);
-+        }
-         $this->customerRepository->save($customer);
- 
-         return true;
-@@ -737,6 +810,8 @@ class AccountManagement implements AccountManagementInterface
- 
-     /**
-      * @inheritdoc
-+     *
-+     * @throws LocalizedException
-      */
-     public function createAccount(CustomerInterface $customer, $password = null, $redirectUrl = '')
-     {
-@@ -759,6 +834,8 @@ class AccountManagement implements AccountManagementInterface
- 
-     /**
-      * @inheritdoc
-+     *
-+     * @throws InputMismatchException
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-@@ -781,6 +858,7 @@ class AccountManagement implements AccountManagementInterface
-             if ($customer->getWebsiteId()) {
-                 $storeId = $this->storeManager->getWebsite($customer->getWebsiteId())->getDefaultStore()->getId();
-             } else {
-+                $this->storeManager->setCurrentStore(null);
-                 $storeId = $this->storeManager->getStore()->getId();
-             }
-             $customer->setStoreId($storeId);
-@@ -812,11 +890,15 @@ class AccountManagement implements AccountManagementInterface
-             throw new InputMismatchException(
-                 __('A customer with the same email address already exists in an associated website.')
-             );
-+            // phpcs:disable Magento2.Exceptions.ThrowCatch
-         } catch (LocalizedException $e) {
-             throw $e;
-         }
-         try {
-             foreach ($customerAddresses as $address) {
-+                if (!$this->isAddressAllowedForWebsite($address, $customer->getStoreId())) {
-+                    continue;
-+                }
-                 if ($address->getId()) {
-                     $newAddress = clone $address;
-                     $newAddress->setId(null);
-@@ -828,6 +910,7 @@ class AccountManagement implements AccountManagementInterface
-                 }
-             }
-             $this->customerRegistry->remove($customer->getId());
-+            // phpcs:disable Magento2.Exceptions.ThrowCatch
-         } catch (InputException $e) {
-             $this->customerRepository->delete($customer);
-             throw $e;
-@@ -864,6 +947,8 @@ class AccountManagement implements AccountManagementInterface
-      * @param CustomerInterface $customer
-      * @param string $redirectUrl
-      * @return void
-+     * @throws LocalizedException
-+     * @throws NoSuchEntityException
-      */
-     protected function sendEmailConfirmation(CustomerInterface $customer, $redirectUrl)
-     {
-@@ -886,6 +971,8 @@ class AccountManagement implements AccountManagementInterface
- 
-     /**
-      * @inheritdoc
-+     *
-+     * @throws InvalidEmailOrPasswordException
-      */
-     public function changePassword($email, $currentPassword, $newPassword)
-     {
-@@ -899,6 +986,8 @@ class AccountManagement implements AccountManagementInterface
- 
-     /**
-      * @inheritdoc
-+     *
-+     * @throws InvalidEmailOrPasswordException
-      */
-     public function changePasswordById($customerId, $currentPassword, $newPassword)
-     {
-@@ -918,13 +1007,17 @@ class AccountManagement implements AccountManagementInterface
-      * @param string $newPassword
-      * @return bool true on success
-      * @throws InputException
-+     * @throws InputMismatchException
-      * @throws InvalidEmailOrPasswordException
-+     * @throws LocalizedException
-+     * @throws NoSuchEntityException
-      * @throws UserLockedException
-      */
-     private function changePasswordForCustomer($customer, $currentPassword, $newPassword)
-     {
-         try {
-             $this->getAuthentication()->authenticate($customer->getId(), $currentPassword);
-+            // phpcs:disable Magento2.Exceptions.ThrowCatch
-         } catch (InvalidEmailOrPasswordException $e) {
-             throw new InvalidEmailOrPasswordException(
-                 __("The password doesn't match this account. Verify the password and try again.")
-@@ -938,6 +1031,7 @@ class AccountManagement implements AccountManagementInterface
-         $this->checkPasswordStrength($newPassword);
-         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
-         $this->destroyCustomerSessions($customer->getId());
-+        $this->disableAddressValidation($customer);
-         $this->customerRepository->save($customer);
- 
-         return true;
-@@ -955,6 +1049,8 @@ class AccountManagement implements AccountManagementInterface
-     }
- 
-     /**
-+     * Get EAV validator
-+     *
-      * @return Backend
-      */
-     private function getEavValidator()
-@@ -981,6 +1077,7 @@ class AccountManagement implements AccountManagementInterface
-         $result = $this->getEavValidator()->isValid($customerModel);
-         if ($result === false && is_array($this->getEavValidator()->getMessages())) {
-             return $validationResults->setIsValid(false)->setMessages(
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                 call_user_func_array(
-                     'array_merge',
-                     $this->getEavValidator()->getMessages()
-@@ -1028,15 +1125,18 @@ class AccountManagement implements AccountManagementInterface
-      *
-      * @param int $customerId
-      * @param string $resetPasswordLinkToken
-+     *
-      * @return bool
--     * @throws \Magento\Framework\Exception\State\InputMismatchException If token is mismatched
--     * @throws \Magento\Framework\Exception\State\ExpiredException If token is expired
--     * @throws \Magento\Framework\Exception\InputException If token or customer id is invalid
--     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer doesn't exist
-+     * @throws ExpiredException If token is expired
-+     * @throws InputException If token or customer id is invalid
-+     * @throws InputMismatchException If token is mismatched
-+     * @throws LocalizedException
-+     * @throws NoSuchEntityException If customer doesn't exist
-+     * @SuppressWarnings(PHPMD.LongVariable)
-      */
-     private function validateResetPasswordToken($customerId, $resetPasswordLinkToken)
-     {
--        if (empty($customerId) || $customerId < 0) {
-+        if ($customerId !== null && $customerId <= 0) {
-             throw new InputException(
-                 __(
-                     'Invalid value of "%value" provided for the %fieldName field.',
-@@ -1044,21 +1144,25 @@ class AccountManagement implements AccountManagementInterface
-                 )
-             );
-         }
-+
-+        if ($customerId === null) {
-+            //Looking for the customer.
-+            $customerId = $this->getByToken
-+                ->execute($resetPasswordLinkToken)
-+                ->getId();
-+        }
-         if (!is_string($resetPasswordLinkToken) || empty($resetPasswordLinkToken)) {
-             $params = ['fieldName' => 'resetPasswordLinkToken'];
-             throw new InputException(__('"%fieldName" is required. Enter and try again.', $params));
-         }
--
-         $customerSecureData = $this->customerRegistry->retrieveSecureData($customerId);
-         $rpToken = $customerSecureData->getRpToken();
-         $rpTokenCreatedAt = $customerSecureData->getRpTokenCreatedAt();
--
-         if (!Security::compareStrings($rpToken, $resetPasswordLinkToken)) {
-             throw new InputMismatchException(__('The password token is mismatched. Reset and try again.'));
-         } elseif ($this->isResetPasswordLinkTokenExpired($rpToken, $rpTokenCreatedAt)) {
-             throw new ExpiredException(__('The password token is expired. Reset and try again.'));
-         }
--
-         return true;
-     }
- 
-@@ -1127,6 +1231,8 @@ class AccountManagement implements AccountManagementInterface
-      *
-      * @param CustomerInterface $customer
-      * @return $this
-+     * @throws LocalizedException
-+     * @throws NoSuchEntityException
-      * @deprecated 100.1.0
-      */
-     protected function sendPasswordResetNotificationEmail($customer)
-@@ -1141,6 +1247,7 @@ class AccountManagement implements AccountManagementInterface
-      * @param int|string|null $defaultStoreId
-      * @return int
-      * @deprecated 100.1.0
-+     * @throws LocalizedException
-      */
-     protected function getWebsiteStoreId($customer, $defaultStoreId = null)
-     {
-@@ -1153,6 +1260,8 @@ class AccountManagement implements AccountManagementInterface
-     }
- 
-     /**
-+     * Get template types
-+     *
-      * @return array
-      * @deprecated 100.1.0
-      */
-@@ -1186,6 +1295,7 @@ class AccountManagement implements AccountManagementInterface
-      * @param int|null $storeId
-      * @param string $email
-      * @return $this
-+     * @throws MailException
-      * @deprecated 100.1.0
-      */
-     protected function sendEmailTemplate(
-@@ -1206,13 +1316,20 @@ class AccountManagement implements AccountManagementInterface
-         }
- 
-         $transport = $this->transportBuilder->setTemplateIdentifier($templateId)
--            ->setTemplateOptions(['area' => Area::AREA_FRONTEND, 'store' => $storeId])
-+            ->setTemplateOptions(
-+                [
-+                    'area' => Area::AREA_FRONTEND,
-+                    'store' => $storeId
-+                ]
-+            )
-             ->setTemplateVars($templateParams)
--            ->setFrom($this->scopeConfig->getValue(
--                $sender,
--                ScopeInterface::SCOPE_STORE,
--                $storeId
--            ))
-+            ->setFrom(
-+                $this->scopeConfig->getValue(
-+                    $sender,
-+                    ScopeInterface::SCOPE_STORE,
-+                    $storeId
-+                )
-+            )
-             ->addTo($email, $this->customerViewHelper->getCustomerName($customer))
-             ->getTransport();
- 
-@@ -1301,6 +1418,9 @@ class AccountManagement implements AccountManagementInterface
-      * @param string $passwordLinkToken
-      * @return bool
-      * @throws InputException
-+     * @throws InputMismatchException
-+     * @throws LocalizedException
-+     * @throws NoSuchEntityException
-      */
-     public function changeResetPasswordLinkToken($customer, $passwordLinkToken)
-     {
-@@ -1318,6 +1438,7 @@ class AccountManagement implements AccountManagementInterface
-             $customerSecure->setRpTokenCreatedAt(
-                 $this->dateTimeFactory->create()->format(DateTime::DATETIME_PHP_FORMAT)
-             );
-+            $this->setIgnoreValidationFlag($customer);
-             $this->customerRepository->save($customer);
-         }
-         return true;
-@@ -1328,6 +1449,8 @@ class AccountManagement implements AccountManagementInterface
-      *
-      * @param CustomerInterface $customer
-      * @return $this
-+     * @throws LocalizedException
-+     * @throws NoSuchEntityException
-      * @deprecated 100.1.0
-      */
-     public function sendPasswordReminderEmail($customer)
-@@ -1355,6 +1478,8 @@ class AccountManagement implements AccountManagementInterface
-      *
-      * @param CustomerInterface $customer
-      * @return $this
-+     * @throws LocalizedException
-+     * @throws NoSuchEntityException
-      * @deprecated 100.1.0
-      */
-     public function sendPasswordResetConfirmationEmail($customer)
-@@ -1399,6 +1524,7 @@ class AccountManagement implements AccountManagementInterface
-      *
-      * @param CustomerInterface $customer
-      * @return Data\CustomerSecure
-+     * @throws NoSuchEntityException
-      * @deprecated 100.1.0
-      */
-     protected function getFullCustomerObject($customer)
-@@ -1426,6 +1552,20 @@ class AccountManagement implements AccountManagementInterface
-         return $this->encryptor->getHash($password);
-     }
- 
-+    /**
-+     * Disable Customer Address Validation
-+     *
-+     * @param CustomerInterface $customer
-+     * @throws NoSuchEntityException
-+     */
-+    private function disableAddressValidation($customer)
-+    {
-+        foreach ($customer->getAddresses() as $address) {
-+            $addressModel = $this->addressRegistry->retrieve($address->getId());
-+            $addressModel->setShouldIgnoreValidation(true);
-+        }
-+    }
-+
-     /**
-      * Get email notification
-      *
-@@ -1445,6 +1585,7 @@ class AccountManagement implements AccountManagementInterface
- 
-     /**
-      * Destroy all active customer sessions by customer id (current session will not be destroyed).
-+     *
-      * Customer sessions which should be deleted are collecting from the "customer_visitor" table considering
-      * configured session lifetime.
-      *
-@@ -1468,9 +1609,32 @@ class AccountManagement implements AccountManagementInterface
-         /** @var \Magento\Customer\Model\Visitor $visitor */
-         foreach ($visitorCollection->getItems() as $visitor) {
-             $sessionId = $visitor->getSessionId();
--            $this->sessionManager->start();
-             $this->saveHandler->destroy($sessionId);
--            $this->sessionManager->writeClose();
-         }
-     }
-+
-+    /**
-+     * Set ignore_validation_flag for reset password flow to skip unnecessary address and customer validation
-+     *
-+     * @param Customer $customer
-+     * @return void
-+     */
-+    private function setIgnoreValidationFlag($customer)
-+    {
-+        $customer->setData('ignore_validation_flag', true);
-+    }
-+
-+    /**
-+     * Check is address allowed for store
-+     *
-+     * @param AddressInterface $address
-+     * @param int|null $storeId
-+     * @return bool
-+     */
-+    private function isAddressAllowedForWebsite(AddressInterface $address, $storeId): bool
-+    {
-+        $allowedCountries = $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
-+
-+        return in_array($address->getCountryId(), $allowedCountries);
-+    }
- }
-diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
-index 1dcd8516af6..ea9b103f422 100644
---- a/app/code/Magento/Customer/Model/Address.php
-+++ b/app/code/Magento/Customer/Model/Address.php
-@@ -122,6 +122,8 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
-     }
- 
-     /**
-+     * Initialize address model
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -154,9 +156,6 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
-         // Need to explicitly set this due to discrepancy in the keys between model and data object
-         $this->setIsDefaultBilling($address->isDefaultBilling());
-         $this->setIsDefaultShipping($address->isDefaultShipping());
--        if (!$this->getAttributeSetId()) {
--            $this->setAttributeSetId(AddressMetadataInterface::ATTRIBUTE_SET_ID_ADDRESS);
--        }
-         $customAttributes = $address->getCustomAttributes();
-         if ($customAttributes !== null) {
-             foreach ($customAttributes as $attribute) {
-@@ -168,17 +167,21 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Create address data object based on current address model.
-+     *
-+     * @param int|null $defaultBillingAddressId
-+     * @param int|null $defaultShippingAddressId
-+     * @return AddressInterface
-+     * Use Api/Data/AddressInterface as a result of service operations. Don't rely on the model to provide
-+     * the instance of Api/Data/AddressInterface
-+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
-     {
-         if ($this->getCustomerId() || $this->getParentId()) {
--            if ($this->getCustomer()->getDefaultBillingAddress()) {
--                $defaultBillingAddressId = $this->getCustomer()->getDefaultBillingAddress()->getId();
--            }
--            if ($this->getCustomer()->getDefaultShippingAddress()) {
--                $defaultShippingAddressId = $this->getCustomer()->getDefaultShippingAddress()->getId();
--            }
-+            $customer = $this->getCustomer();
-+            $defaultBillingAddressId = $customer->getDefaultBilling() ?: $defaultBillingAddressId;
-+            $defaultShippingAddressId = $customer->getDefaultShipping() ?: $defaultShippingAddressId;
-         }
-         return parent::getDataModel($defaultBillingAddressId, $defaultShippingAddressId);
-     }
-@@ -261,6 +264,8 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
-     }
- 
-     /**
-+     * Clone address
-+     *
-      * @return void
-      */
-     public function __clone()
-@@ -301,6 +306,8 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
-     }
- 
-     /**
-+     * Create customer model
-+     *
-      * @return Customer
-      */
-     protected function _createCustomer()
-@@ -356,7 +363,11 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Get a list of custom attribute codes.
-+     *
-+     * By default, entity can be extended only using extension attributes functionality.
-+     *
-+     * @return string[]
-      * @since 100.0.6
-      */
-     protected function getCustomAttributesCodes()
-@@ -366,6 +377,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
- 
-     /**
-      * Get new AttributeList dependency for application code.
-+     *
-      * @return \Magento\Customer\Model\Address\CustomAttributeListInterface
-      * @deprecated 100.0.6
-      */
-diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
-index 6408276630c..158461b4d9c 100644
---- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
-+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
-@@ -23,7 +23,7 @@ use Magento\Framework\Model\AbstractExtensibleModel;
-  * @method string getFirstname()
-  * @method string getMiddlename()
-  * @method string getLastname()
-- * @method int getCountryId()
-+ * @method string getCountryId()
-  * @method string getCity()
-  * @method string getTelephone()
-  * @method string getCompany()
-@@ -222,7 +222,7 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
-     }
- 
-     /**
--     * Get steet line by number
-+     * Get street line by number
-      *
-      * @param int $number
-      * @return string
-@@ -230,7 +230,7 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
-     public function getStreetLine($number)
-     {
-         $lines = $this->getStreet();
--        return isset($lines[$number - 1]) ? $lines[$number - 1] : '';
-+        return $lines[$number - 1] ?? '';
-     }
- 
-     /**
-@@ -271,7 +271,8 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
-      * Enforce format of the street field or other multiline custom attributes
-      *
-      * @param array|string $key
--     * @param null $value
-+     * @param array|string|null $value
-+     *
-      * @return \Magento\Framework\DataObject
-      */
-     public function setData($key, $value = null)
-@@ -286,6 +287,7 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
- 
-     /**
-      * Check that address can have multiline attribute by this code (as street or some custom attribute)
-+     *
-      * @param string $code
-      * @return bool
-      */
-@@ -373,6 +375,8 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
-             }
-         } elseif (is_string($region)) {
-             $this->setData('region', $region);
-+        } elseif (!$regionId && is_array($region)) {
-+            $this->setData('region', $regionId);
-         }
- 
-         return $this->getData('region');
-@@ -403,6 +407,8 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
-     }
- 
-     /**
-+     * Return Region ID
-+     *
-      * @return int
-      */
-     public function getRegionId()
-@@ -425,7 +431,9 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
-     }
- 
-     /**
--     * @return int
-+     * Get country
-+     *
-+     * @return string
-      */
-     public function getCountry()
-     {
-@@ -502,6 +510,8 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
-     }
- 
-     /**
-+     * Processing object before save data
-+     *
-      * @return $this
-      */
-     public function beforeSave()
-@@ -516,10 +526,12 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
-      *
-      * @param int|null $defaultBillingAddressId
-      * @param int|null $defaultShippingAddressId
-+     *
-      * @return AddressInterface
-      * Use Api/Data/AddressInterface as a result of service operations. Don't rely on the model to provide
-      * the instance of Api/Data/AddressInterface
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
-     {
-@@ -591,6 +603,8 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
-     }
- 
-     /**
-+     * Create region instance
-+     *
-      * @return \Magento\Directory\Model\Region
-      */
-     protected function _createRegionInstance()
-@@ -599,6 +613,8 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
-     }
- 
-     /**
-+     * Create country instance
-+     *
-      * @return \Magento\Directory\Model\Country
-      */
-     protected function _createCountryInstance()
-@@ -608,6 +624,7 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
- 
-     /**
-      * Unset Region from address
-+     *
-      * @return $this
-      * @since 100.2.0
-      */
-@@ -617,8 +634,11 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
-     }
- 
-     /**
-+     * Is company required
-+     *
-      * @return bool
-      * @since 100.2.0
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function isCompanyRequired()
-     {
-@@ -626,8 +646,11 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
-     }
- 
-     /**
-+     * Is telephone required
-+     *
-      * @return bool
-      * @since 100.2.0
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function isTelephoneRequired()
-     {
-@@ -635,8 +658,11 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
-     }
- 
-     /**
-+     * Is fax required
-+     *
-      * @return bool
-      * @since 100.2.0
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function isFaxRequired()
-     {
-diff --git a/app/code/Magento/Customer/Model/Address/AddressModelInterface.php b/app/code/Magento/Customer/Model/Address/AddressModelInterface.php
-index 0af36e87755..06de3a99a83 100644
---- a/app/code/Magento/Customer/Model/Address/AddressModelInterface.php
-+++ b/app/code/Magento/Customer/Model/Address/AddressModelInterface.php
-@@ -15,7 +15,7 @@ namespace Magento\Customer\Model\Address;
- interface AddressModelInterface
- {
-     /**
--     * Get steet line by number
-+     * Get street line by number
-      *
-      * @param int $number
-      * @return string
-diff --git a/app/code/Magento/Customer/Model/Address/CustomAttributesProcessor.php b/app/code/Magento/Customer/Model/Address/CustomAttributesProcessor.php
-new file mode 100644
-index 00000000000..d6e63e11ee4
---- /dev/null
-+++ b/app/code/Magento/Customer/Model/Address/CustomAttributesProcessor.php
-@@ -0,0 +1,112 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Model\Address;
-+
-+use Magento\Customer\Api\AddressMetadataInterface;
-+use Magento\Eav\Api\AttributeOptionManagementInterface;
-+
-+/**
-+ * Provides customer address data.
-+ */
-+class CustomAttributesProcessor
-+{
-+    /**
-+     * @var AddressMetadataInterface
-+     */
-+    private $addressMetadata;
-+
-+    /**
-+     * @var AttributeOptionManagementInterface
-+     */
-+    private $attributeOptionManager;
-+
-+    /**
-+     * @param AddressMetadataInterface $addressMetadata
-+     * @param AttributeOptionManagementInterface $attributeOptionManager
-+     */
-+    public function __construct(
-+        AddressMetadataInterface $addressMetadata,
-+        AttributeOptionManagementInterface $attributeOptionManager
-+    ) {
-+        $this->addressMetadata = $addressMetadata;
-+        $this->attributeOptionManager = $attributeOptionManager;
-+    }
-+
-+    /**
-+     * Set Labels to custom Attributes
-+     *
-+     * @param \Magento\Framework\Api\AttributeValue[] $customAttributes
-+     * @return array $customAttributes
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Magento\Framework\Exception\StateException
-+     */
-+    private function setLabelsForAttributes(array $customAttributes): array
-+    {
-+        if (!empty($customAttributes)) {
-+            foreach ($customAttributes as $customAttributeCode => $customAttribute) {
-+                $attributeOptionLabels = $this->getAttributeLabels($customAttribute, $customAttributeCode);
-+                if (!empty($attributeOptionLabels)) {
-+                    $customAttributes[$customAttributeCode]['label'] = implode(', ', $attributeOptionLabels);
-+                }
-+            }
-+        }
-+
-+        return $customAttributes;
-+    }
-+    /**
-+     * Get Labels by CustomAttribute and CustomAttributeCode
-+     *
-+     * @param array $customAttribute
-+     * @param string $customAttributeCode
-+     * @return array $attributeOptionLabels
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Magento\Framework\Exception\StateException
-+     */
-+    private function getAttributeLabels(array $customAttribute, string $customAttributeCode) : array
-+    {
-+        $attributeOptionLabels = [];
-+
-+        if (!empty($customAttribute['value'])) {
-+            $customAttributeValues = explode(',', $customAttribute['value']);
-+            $attributeOptions = $this->attributeOptionManager->getItems(
-+                \Magento\Customer\Model\Indexer\Address\AttributeProvider::ENTITY,
-+                $customAttributeCode
-+            );
-+
-+            if (!empty($attributeOptions)) {
-+                foreach ($attributeOptions as $attributeOption) {
-+                    $attributeOptionValue = $attributeOption->getValue();
-+                    if (\in_array($attributeOptionValue, $customAttributeValues, false)) {
-+                        $attributeOptionLabels[] = $attributeOption->getLabel() ?? $attributeOptionValue;
-+                    }
-+                }
-+            }
-+        }
-+
-+        return $attributeOptionLabels;
-+    }
-+
-+    /**
-+     * Filter not visible on storefront custom attributes.
-+     *
-+     * @param array $attributes
-+     * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function filterNotVisibleAttributes(array $attributes): array
-+    {
-+        $attributesMetadata = $this->addressMetadata->getAllAttributesMetadata();
-+        foreach ($attributesMetadata as $attributeMetadata) {
-+            if (!$attributeMetadata->isVisible()) {
-+                unset($attributes[$attributeMetadata->getAttributeCode()]);
-+            }
-+        }
-+
-+        return $this->setLabelsForAttributes($attributes);
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Model/Address/CustomerAddressDataFormatter.php b/app/code/Magento/Customer/Model/Address/CustomerAddressDataFormatter.php
-new file mode 100644
-index 00000000000..9202d749204
---- /dev/null
-+++ b/app/code/Magento/Customer/Model/Address/CustomerAddressDataFormatter.php
-@@ -0,0 +1,110 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Model\Address;
-+
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Customer\Model\Address\Mapper as AddressMapper;
-+use Magento\Customer\Model\Address\Config as AddressConfig;
-+
-+/**
-+ * Provides method to format customer address data.
-+ */
-+class CustomerAddressDataFormatter
-+{
-+    /**
-+     * @var AddressMapper
-+     */
-+    private $addressMapper;
-+
-+    /**
-+     * @var AddressConfig
-+     */
-+    private $addressConfig;
-+
-+    /**
-+     * @var CustomAttributesProcessor
-+     */
-+    private $customAttributesProcessor;
-+
-+    /**
-+     * @param Mapper $addressMapper
-+     * @param Config $addressConfig
-+     * @param CustomAttributesProcessor $customAttributesProcessor
-+     */
-+    public function __construct(
-+        AddressMapper $addressMapper,
-+        AddressConfig $addressConfig,
-+        CustomAttributesProcessor $customAttributesProcessor
-+    ) {
-+        $this->addressMapper = $addressMapper;
-+        $this->addressConfig = $addressConfig;
-+        $this->customAttributesProcessor = $customAttributesProcessor;
-+    }
-+
-+    /**
-+     * Prepare customer address data.
-+     *
-+     * @param AddressInterface $customerAddress
-+     * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function prepareAddress(AddressInterface $customerAddress)
-+    {
-+        $resultAddress = [
-+            'id' => $customerAddress->getId(),
-+            'customer_id' => $customerAddress->getCustomerId(),
-+            'company' => $customerAddress->getCompany(),
-+            'prefix' => $customerAddress->getPrefix(),
-+            'firstname' => $customerAddress->getFirstname(),
-+            'lastname' => $customerAddress->getLastname(),
-+            'middlename' => $customerAddress->getMiddlename(),
-+            'suffix' => $customerAddress->getSuffix(),
-+            'street' => $customerAddress->getStreet(),
-+            'city' => $customerAddress->getCity(),
-+            'region' => [
-+                'region' => $customerAddress->getRegion()->getRegion(),
-+                'region_code' => $customerAddress->getRegion()->getRegionCode(),
-+                'region_id' => $customerAddress->getRegion()->getRegionId(),
-+            ],
-+            'region_id' => $customerAddress->getRegionId(),
-+            'postcode' => $customerAddress->getPostcode(),
-+            'country_id' => $customerAddress->getCountryId(),
-+            'telephone' => $customerAddress->getTelephone(),
-+            'fax' => $customerAddress->getFax(),
-+            'default_billing' => $customerAddress->isDefaultBilling(),
-+            'default_shipping' => $customerAddress->isDefaultShipping(),
-+            'inline' => $this->getCustomerAddressInline($customerAddress),
-+            'custom_attributes' => [],
-+            'extension_attributes' => $customerAddress->getExtensionAttributes(),
-+        ];
-+
-+        if ($customerAddress->getCustomAttributes()) {
-+            $customerAddress = $customerAddress->__toArray();
-+            $resultAddress['custom_attributes'] = $this->customAttributesProcessor->filterNotVisibleAttributes(
-+                $customerAddress['custom_attributes']
-+            );
-+        }
-+
-+        return $resultAddress;
-+    }
-+
-+    /**
-+     * Set additional customer address data
-+     *
-+     * @param AddressInterface $address
-+     * @return string
-+     */
-+    private function getCustomerAddressInline(AddressInterface $address): string
-+    {
-+        $builtOutputAddressData = $this->addressMapper->toFlatArray($address);
-+        return $this->addressConfig
-+            ->getFormatByCode(AddressConfig::DEFAULT_ADDRESS_FORMAT)
-+            ->getRenderer()
-+            ->renderArray($builtOutputAddressData);
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Model/Address/CustomerAddressDataProvider.php b/app/code/Magento/Customer/Model/Address/CustomerAddressDataProvider.php
-new file mode 100644
-index 00000000000..04fdd2a7f72
---- /dev/null
-+++ b/app/code/Magento/Customer/Model/Address/CustomerAddressDataProvider.php
-@@ -0,0 +1,64 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Model\Address;
-+
-+/**
-+ * Provides customer address data.
-+ */
-+class CustomerAddressDataProvider
-+{
-+    /**
-+     * Customer addresses.
-+     *
-+     * @var array
-+     */
-+    private $customerAddresses = [];
-+
-+    /**
-+     * @var CustomerAddressDataFormatter
-+     */
-+    private $customerAddressDataFormatter;
-+
-+    /**
-+     * @param CustomerAddressDataFormatter $customerAddressDataFormatter
-+     */
-+    public function __construct(
-+        CustomerAddressDataFormatter $customerAddressDataFormatter
-+    ) {
-+        $this->customerAddressDataFormatter = $customerAddressDataFormatter;
-+    }
-+
-+    /**
-+     * Get addresses for customer.
-+     *
-+     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-+     * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function getAddressDataByCustomer(
-+        \Magento\Customer\Api\Data\CustomerInterface $customer
-+    ): array {
-+        if (!empty($this->customerAddresses)) {
-+            return $this->customerAddresses;
-+        }
-+
-+        $customerOriginAddresses = $customer->getAddresses();
-+        if (!$customerOriginAddresses) {
-+            return [];
-+        }
-+
-+        $customerAddresses = [];
-+        foreach ($customerOriginAddresses as $address) {
-+            $customerAddresses[$address->getId()] = $this->customerAddressDataFormatter->prepareAddress($address);
-+        }
-+
-+        $this->customerAddresses = $customerAddresses;
-+
-+        return $this->customerAddresses;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Model/Address/DataProvider.php b/app/code/Magento/Customer/Model/Address/DataProvider.php
-new file mode 100644
-index 00000000000..e7f9fce0217
---- /dev/null
-+++ b/app/code/Magento/Customer/Model/Address/DataProvider.php
-@@ -0,0 +1,233 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Model\Address;
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory;
-+use Magento\Eav\Model\Config;
-+use Magento\Eav\Model\Entity\Type;
-+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-+use Magento\Framework\View\Element\UiComponent\ContextInterface;
-+use Magento\Customer\Model\Address;
-+use Magento\Customer\Model\FileUploaderDataResolver;
-+use Magento\Customer\Model\AttributeMetadataResolver;
-+use Magento\Ui\Component\Form\Element\Multiline;
-+
-+/**
-+ * Dataprovider of customer addresses for customer address grid.
-+ *
-+ * @property \Magento\Customer\Model\ResourceModel\Address\Collection $collection
-+ */
-+class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-+{
-+    /**
-+     * @var CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * @var array
-+     */
-+    private $loadedData;
-+
-+    /**
-+     * Allow to manage attributes, even they are hidden on storefront
-+     *
-+     * @var bool
-+     */
-+    private $allowToShowHiddenAttributes;
-+
-+    /*
-+     * @var ContextInterface
-+     */
-+    private $context;
-+
-+    /**
-+     * @var array
-+     */
-+    private $bannedInputTypes = ['media_image'];
-+
-+    /**
-+     * @var array
-+     */
-+    private static $attributesToEliminate = [
-+        'region',
-+        'vat_is_valid',
-+        'vat_request_date',
-+        'vat_request_id',
-+        'vat_request_success'
-+    ];
-+
-+    /**
-+     * @var FileUploaderDataResolver
-+     */
-+    private $fileUploaderDataResolver;
-+
-+    /**
-+     * @var AttributeMetadataResolver
-+     */
-+    private $attributeMetadataResolver;
-+
-+    /**
-+     * DataProvider constructor.
-+     * @param string $name
-+     * @param string $primaryFieldName
-+     * @param string $requestFieldName
-+     * @param CollectionFactory $addressCollectionFactory
-+     * @param CustomerRepositoryInterface $customerRepository
-+     * @param Config $eavConfig
-+     * @param ContextInterface $context
-+     * @param FileUploaderDataResolver $fileUploaderDataResolver
-+     * @param AttributeMetadataResolver $attributeMetadataResolver
-+     * @param array $meta
-+     * @param array $data
-+     * @param bool $allowToShowHiddenAttributes
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     */
-+    public function __construct(
-+        $name,
-+        $primaryFieldName,
-+        $requestFieldName,
-+        CollectionFactory $addressCollectionFactory,
-+        CustomerRepositoryInterface $customerRepository,
-+        Config $eavConfig,
-+        ContextInterface $context,
-+        FileUploaderDataResolver $fileUploaderDataResolver,
-+        AttributeMetadataResolver $attributeMetadataResolver,
-+        array $meta = [],
-+        array $data = [],
-+        $allowToShowHiddenAttributes = true
-+    ) {
-+        parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
-+        $this->collection = $addressCollectionFactory->create();
-+        $this->collection->addAttributeToSelect('*');
-+        $this->customerRepository = $customerRepository;
-+        $this->allowToShowHiddenAttributes = $allowToShowHiddenAttributes;
-+        $this->context = $context;
-+        $this->fileUploaderDataResolver = $fileUploaderDataResolver;
-+        $this->attributeMetadataResolver = $attributeMetadataResolver;
-+        $this->meta['general']['children'] = $this->getAttributesMeta(
-+            $eavConfig->getEntityType('customer_address')
-+        );
-+    }
-+
-+    /**
-+     * Get Addresses data and process customer default billing & shipping addresses
-+     *
-+     * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    public function getData(): array
-+    {
-+        if (null !== $this->loadedData) {
-+            return $this->loadedData;
-+        }
-+        $items = $this->collection->getItems();
-+        /** @var Address $item */
-+        foreach ($items as $item) {
-+            $addressId = $item->getEntityId();
-+            $item->load($addressId);
-+            $this->loadedData[$addressId] = $item->getData();
-+            $customerId = $this->loadedData[$addressId]['parent_id'];
-+            /** @var \Magento\Customer\Model\Customer $customer */
-+            $customer = $this->customerRepository->getById($customerId);
-+            $defaultBilling = $customer->getDefaultBilling();
-+            $defaultShipping = $customer->getDefaultShipping();
-+            $this->prepareAddressData($addressId, $this->loadedData, $defaultBilling, $defaultShipping);
-+            $this->fileUploaderDataResolver->overrideFileUploaderData($item, $this->loadedData[$addressId]);
-+        }
-+
-+        if (null === $this->loadedData) {
-+            $this->loadedData[''] = $this->getDefaultData();
-+        }
-+
-+        return $this->loadedData;
-+    }
-+
-+    /**
-+     * Prepare address data
-+     *
-+     * @param int $addressId
-+     * @param array $addresses
-+     * @param string|null $defaultBilling
-+     * @param string|null $defaultShipping
-+     * @return void
-+     */
-+    private function prepareAddressData($addressId, array &$addresses, $defaultBilling, $defaultShipping): void
-+    {
-+        if (null !== $defaultBilling && $addressId === $defaultBilling) {
-+            $addresses[$addressId]['default_billing'] = '1';
-+        }
-+        if (null !== $defaultShipping && $addressId === $defaultShipping) {
-+            $addresses[$addressId]['default_shipping'] = '1';
-+        }
-+        foreach ($this->meta['general']['children'] as $attributeName => $attributeMeta) {
-+            if ($attributeMeta['arguments']['data']['config']['dataType'] === Multiline::NAME
-+                && isset($this->loadedData[$addressId][$attributeName])
-+                && !\is_array($this->loadedData[$addressId][$attributeName])
-+            ) {
-+                $this->loadedData[$addressId][$attributeName] = explode(
-+                    "\n",
-+                    $this->loadedData[$addressId][$attributeName]
-+                );
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Get default customer data for adding new address
-+     *
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     * @return array
-+     */
-+    private function getDefaultData(): array
-+    {
-+        $parentId = $this->context->getRequestParam('parent_id');
-+        $customer = $this->customerRepository->getById($parentId);
-+        $data = [
-+            'parent_id' => $parentId,
-+            'firstname' => $customer->getFirstname(),
-+            'lastname' => $customer->getLastname()
-+        ];
-+
-+        return $data;
-+    }
-+
-+    /**
-+     * Get attributes meta
-+     *
-+     * @param Type $entityType
-+     * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function getAttributesMeta(Type $entityType): array
-+    {
-+        $meta = [];
-+        $attributes = $entityType->getAttributeCollection();
-+        /* @var AbstractAttribute $attribute */
-+        foreach ($attributes as $attribute) {
-+            if (\in_array($attribute->getFrontendInput(), $this->bannedInputTypes, true)) {
-+                continue;
-+            }
-+            if (\in_array($attribute->getAttributeCode(), self::$attributesToEliminate, true)) {
-+                continue;
-+            }
-+
-+            $meta[$attribute->getAttributeCode()] = $this->attributeMetadataResolver->getAttributesMeta(
-+                $attribute,
-+                $entityType,
-+                $this->allowToShowHiddenAttributes
-+            );
-+        }
-+        $this->attributeMetadataResolver->processWebsiteMeta($meta);
-+
-+        return $meta;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Model/Address/Validator/Country.php b/app/code/Magento/Customer/Model/Address/Validator/Country.php
-index d7fb51dbbd4..e0eb1cbadd8 100644
---- a/app/code/Magento/Customer/Model/Address/Validator/Country.php
-+++ b/app/code/Magento/Customer/Model/Address/Validator/Country.php
-@@ -7,6 +7,9 @@ namespace Magento\Customer\Model\Address\Validator;
- 
- use Magento\Customer\Model\Address\AbstractAddress;
- use Magento\Customer\Model\Address\ValidatorInterface;
-+use Magento\Directory\Helper\Data;
-+use Magento\Directory\Model\AllowedCountries;
-+use Magento\Framework\Escaper;
- use Magento\Framework\App\ObjectManager;
- use Magento\Store\Model\ScopeInterface;
- 
-@@ -16,35 +19,35 @@ use Magento\Store\Model\ScopeInterface;
- class Country implements ValidatorInterface
- {
-     /**
--     * @var \Magento\Directory\Helper\Data
-+     * @var Escaper
-      */
--    private $directoryData;
-+    private $escaper;
- 
-     /**
--     * @var \Magento\Directory\Model\AllowedCountries
-+     * @var Data
-      */
--    private $allowedCountriesReader;
-+    private $directoryData;
- 
-     /**
--     * @var \Magento\Customer\Model\Config\Share
-+     * @var AllowedCountries
-      */
--    private $shareConfig;
-+    private $allowedCountriesReader;
- 
-     /**
--     * @param \Magento\Directory\Helper\Data $directoryData
--     * @param \Magento\Directory\Model\AllowedCountries|null $allowedCountriesReader
--     * @param \Magento\Customer\Model\Config\Share|null $shareConfig
-+     * @param Data $directoryData
-+     * @param AllowedCountries $allowedCountriesReader
-+     * @param Escaper|null $escaper
-      */
-     public function __construct(
--        \Magento\Directory\Helper\Data $directoryData,
--        \Magento\Directory\Model\AllowedCountries $allowedCountriesReader = null,
--        \Magento\Customer\Model\Config\Share $shareConfig = null
-+        Data $directoryData,
-+        AllowedCountries $allowedCountriesReader,
-+        Escaper $escaper = null
-     ) {
-         $this->directoryData = $directoryData;
--        $this->allowedCountriesReader = $allowedCountriesReader
--            ?: ObjectManager::getInstance()->get(\Magento\Directory\Model\AllowedCountries::class);
--        $this->shareConfig = $shareConfig
--            ?: ObjectManager::getInstance()->get(\Magento\Customer\Model\Config\Share::class);
-+        $this->allowedCountriesReader = $allowedCountriesReader;
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-     }
- 
-     /**
-@@ -76,7 +79,7 @@ class Country implements ValidatorInterface
-             //Checking if such country exists.
-             $errors[] = __(
-                 'Invalid value of "%value" provided for the %fieldName field.',
--                ['fieldName' => 'countryId', 'value' => htmlspecialchars($countryId)]
-+                ['fieldName' => 'countryId', 'value' => $this->escaper->escapeHtml($countryId)]
-             );
-         }
- 
-@@ -113,7 +116,7 @@ class Country implements ValidatorInterface
-             //If a region is selected then checking if it exists.
-             $errors[] = __(
-                 'Invalid value of "%value" provided for the %fieldName field.',
--                ['fieldName' => 'regionId', 'value' => htmlspecialchars($regionId)]
-+                ['fieldName' => 'regionId', 'value' => $this->escaper->escapeHtml($regionId)]
-             );
-         }
- 
-@@ -128,12 +131,7 @@ class Country implements ValidatorInterface
-      */
-     private function getWebsiteAllowedCountries(AbstractAddress $address): array
-     {
--        $websiteId = null;
--
--        if (!$this->shareConfig->isGlobalScope()) {
--            $websiteId = $address->getCustomer() ? $address->getCustomer()->getWebsiteId() : null;
--        }
--
--        return $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_WEBSITE, $websiteId);
-+        $storeId = $address->getData('store_id');
-+        return $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
-     }
- }
-diff --git a/app/code/Magento/Customer/Model/Attribute.php b/app/code/Magento/Customer/Model/Attribute.php
-index 98a97872f15..ae714f99308 100644
---- a/app/code/Magento/Customer/Model/Attribute.php
-+++ b/app/code/Magento/Customer/Model/Attribute.php
-@@ -202,9 +202,14 @@ class Attribute extends \Magento\Eav\Model\Attribute
- 
-     /**
-      * @inheritdoc
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $this->unsetData('entity_type');
-         return array_diff(
-             parent::__sleep(),
-@@ -214,9 +219,14 @@ class Attribute extends \Magento\Eav\Model\Attribute
- 
-     /**
-      * @inheritdoc
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
-         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         $this->indexerRegistry = $objectManager->get(\Magento\Framework\Indexer\IndexerRegistry::class);
-diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
-index 380b8a4d344..b1602e8ca19 100644
---- a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
-+++ b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Customer\Model\Attribute\Data;
- 
- use Magento\Directory\Helper\Data as DirectoryHelper;
-@@ -13,7 +14,8 @@ use Psr\Log\LoggerInterface as PsrLogger;
- use Magento\Framework\Stdlib\DateTime\TimezoneInterface as MagentoTimezone;
- 
- /**
-- * Customer Address Postal/Zip Code Attribute Data Model
-+ * Customer Address Postal/Zip Code Attribute Data Model.
-+ *
-  * This Data Model Has to Be Set Up in additional EAV attribute table
-  */
- class Postcode extends \Magento\Eav\Model\Attribute\Data\AbstractData
-@@ -40,7 +42,8 @@ class Postcode extends \Magento\Eav\Model\Attribute\Data\AbstractData
-     }
- 
-     /**
--     * Validate postal/zip code
-+     * Validate postal/zip code.
-+     *
-      * Return true and skip validation if country zip code is optional
-      *
-      * @param array|string $value
-@@ -104,7 +107,7 @@ class Postcode extends \Magento\Eav\Model\Attribute\Data\AbstractData
-     }
- 
-     /**
--     * Return formated attribute value from entity model
-+     * Return formatted attribute value from entity model
-      *
-      * @param string $format
-      * @return string|array
-diff --git a/app/code/Magento/Customer/Model/AttributeMetadataResolver.php b/app/code/Magento/Customer/Model/AttributeMetadataResolver.php
-new file mode 100644
-index 00000000000..979730eb1c9
---- /dev/null
-+++ b/app/code/Magento/Customer/Model/AttributeMetadataResolver.php
-@@ -0,0 +1,206 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Model;
-+
-+use Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryWithWebsites;
-+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Ui\DataProvider\EavValidationRules;
-+use Magento\Ui\Component\Form\Field;
-+use Magento\Eav\Model\Entity\Type;
-+use Magento\Eav\Api\Data\AttributeInterface;
-+use Magento\Framework\View\Element\UiComponent\ContextInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Customer\Model\Config\Share as ShareConfig;
-+
-+/**
-+ * Class to build meta data of the customer or customer address attribute
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class AttributeMetadataResolver
-+{
-+    /**
-+     * EAV attribute properties to fetch from meta storage
-+     * @var array
-+     */
-+    private static $metaProperties = [
-+        'dataType' => 'frontend_input',
-+        'visible' => 'is_visible',
-+        'required' => 'is_required',
-+        'label' => 'frontend_label',
-+        'sortOrder' => 'sort_order',
-+        'notice' => 'note',
-+        'default' => 'default_value',
-+        'size' => 'multiline_count',
-+    ];
-+
-+    /**
-+     * Form element mapping
-+     *
-+     * @var array
-+     */
-+    private static $formElement = [
-+        'text' => 'input',
-+        'hidden' => 'input',
-+        'boolean' => 'checkbox',
-+    ];
-+
-+    /**
-+     * @var CountryWithWebsites
-+     */
-+    private $countryWithWebsiteSource;
-+
-+    /**
-+     * @var EavValidationRules
-+     */
-+    private $eavValidationRules;
-+
-+    /**
-+     * @var FileUploaderDataResolver
-+     */
-+    private $fileUploaderDataResolver;
-+
-+    /**
-+     * @var ContextInterface
-+     */
-+    private $context;
-+
-+    /**
-+     * @var ShareConfig
-+     */
-+    private $shareConfig;
-+
-+    /**
-+     * @param CountryWithWebsites $countryWithWebsiteSource
-+     * @param EavValidationRules $eavValidationRules
-+     * @param \Magento\Customer\Model\FileUploaderDataResolver $fileUploaderDataResolver
-+     * @param ContextInterface $context
-+     * @param ShareConfig $shareConfig
-+     */
-+    public function __construct(
-+        CountryWithWebsites $countryWithWebsiteSource,
-+        EavValidationRules $eavValidationRules,
-+        fileUploaderDataResolver $fileUploaderDataResolver,
-+        ContextInterface $context,
-+        ShareConfig $shareConfig
-+    ) {
-+        $this->countryWithWebsiteSource = $countryWithWebsiteSource;
-+        $this->eavValidationRules = $eavValidationRules;
-+        $this->fileUploaderDataResolver = $fileUploaderDataResolver;
-+        $this->context = $context;
-+        $this->shareConfig = $shareConfig;
-+    }
-+
-+    /**
-+     * Get meta data of the customer or customer address attribute
-+     *
-+     * @param AbstractAttribute $attribute
-+     * @param Type $entityType
-+     * @param bool $allowToShowHiddenAttributes
-+     * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function getAttributesMeta(
-+        AbstractAttribute $attribute,
-+        Type $entityType,
-+        bool $allowToShowHiddenAttributes
-+    ): array {
-+        $meta = $this->modifyBooleanAttributeMeta($attribute);
-+        // use getDataUsingMethod, since some getters are defined and apply additional processing of returning value
-+        foreach (self::$metaProperties as $metaName => $origName) {
-+            $value = $attribute->getDataUsingMethod($origName);
-+            $meta['arguments']['data']['config'][$metaName] = ($metaName === 'label') ? __($value) : $value;
-+            if ('frontend_input' === $origName) {
-+                $meta['arguments']['data']['config']['formElement'] = self::$formElement[$value] ?? $value;
-+            }
-+        }
-+
-+        if ($attribute->usesSource()) {
-+            if ($attribute->getAttributeCode() === AddressInterface::COUNTRY_ID) {
-+                $meta['arguments']['data']['config']['options'] = $this->countryWithWebsiteSource
-+                    ->getAllOptions();
-+            } else {
-+                $meta['arguments']['data']['config']['options'] = $attribute->getSource()->getAllOptions();
-+            }
-+        }
-+
-+        $rules = $this->eavValidationRules->build($attribute, $meta['arguments']['data']['config']);
-+        if (!empty($rules)) {
-+            $meta['arguments']['data']['config']['validation'] = $rules;
-+        }
-+
-+        $meta['arguments']['data']['config']['componentType'] = Field::NAME;
-+        $meta['arguments']['data']['config']['visible'] = $this->canShowAttribute(
-+            $attribute,
-+            $allowToShowHiddenAttributes
-+        );
-+
-+        $this->fileUploaderDataResolver->overrideFileUploaderMetadata(
-+            $entityType,
-+            $attribute,
-+            $meta['arguments']['data']['config']
-+        );
-+
-+        return $meta;
-+    }
-+
-+    /**
-+     * Detect can we show attribute on specific form or not
-+     *
-+     * @param AbstractAttribute $customerAttribute
-+     * @param bool $allowToShowHiddenAttributes
-+     * @return bool
-+     */
-+    private function canShowAttribute(
-+        AbstractAttribute $customerAttribute,
-+        bool $allowToShowHiddenAttributes
-+    ) {
-+        return $allowToShowHiddenAttributes && (bool) $customerAttribute->getIsUserDefined()
-+            ? true
-+            : (bool) $customerAttribute->getIsVisible();
-+    }
-+
-+    /**
-+     * Modify boolean attribute meta data
-+     *
-+     * @param AttributeInterface $attribute
-+     * @return array
-+     */
-+    private function modifyBooleanAttributeMeta(AttributeInterface $attribute): array
-+    {
-+        $meta = [];
-+        if ($attribute->getFrontendInput() === 'boolean') {
-+            $meta['arguments']['data']['config']['prefer'] = 'toggle';
-+            $meta['arguments']['data']['config']['valueMap'] = [
-+                'true' => '1',
-+                'false' => '0',
-+            ];
-+        }
-+
-+        return $meta;
-+    }
-+
-+    /**
-+     * Add global scope parameter and filter options to website meta
-+     *
-+     * @param array $meta
-+     * @return void
-+     */
-+    public function processWebsiteMeta(&$meta): void
-+    {
-+        if (isset($meta[CustomerInterface::WEBSITE_ID]) && $this->shareConfig->isGlobalScope()) {
-+            $meta[CustomerInterface::WEBSITE_ID]['arguments']['data']['config']['isGlobalScope'] = 1;
-+        }
-+
-+        if (isset($meta[AddressInterface::COUNTRY_ID]) && !$this->shareConfig->isGlobalScope()) {
-+            $meta[AddressInterface::COUNTRY_ID]['arguments']['data']['config']['filterBy'] = [
-+                'target' => 'customer_form.customer_form_data_source:data.customer.website_id',
-+                'field' => 'website_ids'
-+            ];
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Model/Authentication.php b/app/code/Magento/Customer/Model/Authentication.php
-index 0967f1a0189..9a9a4630620 100644
---- a/app/code/Magento/Customer/Model/Authentication.php
-+++ b/app/code/Magento/Customer/Model/Authentication.php
-@@ -83,7 +83,7 @@ class Authentication implements AuthenticationInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function processAuthenticationFailure($customerId)
-     {
-@@ -120,7 +120,7 @@ class Authentication implements AuthenticationInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function unlock($customerId)
-     {
-@@ -152,7 +152,7 @@ class Authentication implements AuthenticationInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isLocked($customerId)
-     {
-@@ -161,12 +161,12 @@ class Authentication implements AuthenticationInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function authenticate($customerId, $password)
-     {
-         $customerSecure = $this->customerRegistry->retrieveSecureData($customerId);
--        $hash = $customerSecure->getPasswordHash();
-+        $hash = $customerSecure->getPasswordHash() ?? '';
-         if (!$this->encryptor->validateHash($password, $hash)) {
-             $this->processAuthenticationFailure($customerId);
-             if ($this->isLocked($customerId)) {
-diff --git a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
-index fc0fa3ebc07..40a10a1db09 100644
---- a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
-+++ b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
-@@ -87,15 +87,20 @@ class Street extends \Magento\Framework\App\Config\Value
-     {
-         $result = parent::afterDelete();
- 
--        if ($this->getScope() == \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES) {
--            $attribute = $this->_eavConfig->getAttribute('customer_address', 'street');
--            $website = $this->_storeManager->getWebsite($this->getScopeCode());
--            $attribute->setWebsite($website);
--            $attribute->load($attribute->getId());
--            $attribute->setData('scope_multiline_count', null);
--            $attribute->save();
--        }
-+        $attribute = $this->_eavConfig->getAttribute('customer_address', 'street');
-+        switch ($this->getScope()) {
-+            case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES:
-+                $website = $this->_storeManager->getWebsite($this->getScopeCode());
-+                $attribute->setWebsite($website);
-+                $attribute->load($attribute->getId());
-+                $attribute->setData('scope_multiline_count', null);
-+                break;
- 
-+            case ScopeConfigInterface::SCOPE_TYPE_DEFAULT:
-+                $attribute->setData('multiline_count', 2);
-+                break;
-+        }
-+        $attribute->save();
-         return $result;
-     }
- }
-diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
-index 6d1c1549216..1287dbe5df7 100644
---- a/app/code/Magento/Customer/Model/Customer.php
-+++ b/app/code/Magento/Customer/Model/Customer.php
-@@ -219,6 +219,13 @@ class Customer extends \Magento\Framework\Model\AbstractModel
-      */
-     private $accountConfirmation;
- 
-+    /**
-+     * Caching property to store customer address data models by the address ID.
-+     *
-+     * @var array
-+     */
-+    private $storedAddress;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -314,7 +321,10 @@ class Customer extends \Magento\Framework\Model\AbstractModel
-         $addressesData = [];
-         /** @var \Magento\Customer\Model\Address $address */
-         foreach ($this->getAddresses() as $address) {
--            $addressesData[] = $address->getDataModel();
-+            if (!isset($this->storedAddress[$address->getId()])) {
-+                $this->storedAddress[$address->getId()] = $address->getDataModel();
-+            }
-+            $addressesData[] = $this->storedAddress[$address->getId()];
-         }
-         $customerDataObject = $this->customerDataFactory->create();
-         $this->dataObjectHelper->populateWithArray(
-@@ -359,13 +369,6 @@ class Customer extends \Magento\Framework\Model\AbstractModel
-             $this->setId($customerId);
-         }
- 
--        // Need to use attribute set or future updates can cause data loss
--        if (!$this->getAttributeSetId()) {
--            $this->setAttributeSetId(
--                CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER
--            );
--        }
--
-         return $this;
-     }
- 
-@@ -961,6 +964,16 @@ class Customer extends \Magento\Framework\Model\AbstractModel
-         return $ids;
-     }
- 
-+    /**
-+     * Retrieve attribute set id for customer.
-+     *
-+     * @return int
-+     */
-+    public function getAttributeSetId()
-+    {
-+        return parent::getAttributeSetId() ?: CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER;
-+    }
-+
-     /**
-      * Set store to customer
-      *
-@@ -1041,17 +1054,6 @@ class Customer extends \Magento\Framework\Model\AbstractModel
-         return $this;
-     }
- 
--    /**
--     * Prepare customer for delete
--     *
--     * @return $this
--     */
--    public function beforeDelete()
--    {
--        //TODO : Revisit and figure handling permissions in MAGETWO-11084 Implementation: Service Context Provider
--        return parent::beforeDelete();
--    }
--
-     /**
-      * Processing object after save data
-      *
-@@ -1292,6 +1294,8 @@ class Customer extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Create Address from Factory
-+     *
-      * @return Address
-      */
-     protected function _createAddressInstance()
-@@ -1300,6 +1304,8 @@ class Customer extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Create Address Collection from Factory
-+     *
-      * @return \Magento\Customer\Model\ResourceModel\Address\Collection
-      */
-     protected function _createAddressCollection()
-@@ -1308,6 +1314,8 @@ class Customer extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Get Template Types
-+     *
-      * @return array
-      */
-     protected function getTemplateTypes()
-diff --git a/app/code/Magento/Customer/Model/Customer/DataProvider.php b/app/code/Magento/Customer/Model/Customer/DataProvider.php
-index ce976d3f62c..0b7c618e6a1 100644
---- a/app/code/Magento/Customer/Model/Customer/DataProvider.php
-+++ b/app/code/Magento/Customer/Model/Customer/DataProvider.php
-@@ -5,14 +5,11 @@
-  */
- namespace Magento\Customer\Model\Customer;
- 
--use Magento\Customer\Api\AddressMetadataInterface;
--use Magento\Customer\Api\CustomerMetadataInterface;
- use Magento\Customer\Api\Data\AddressInterface;
- use Magento\Customer\Api\Data\CustomerInterface;
- use Magento\Customer\Model\Address;
- use Magento\Customer\Model\Attribute;
- use Magento\Customer\Model\Customer;
--use Magento\Customer\Model\FileProcessor;
- use Magento\Customer\Model\FileProcessorFactory;
- use Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryWithWebsites;
- use Magento\Customer\Model\ResourceModel\Customer\Collection;
-@@ -25,12 +22,18 @@ use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Session\SessionManagerInterface;
- use Magento\Framework\View\Element\UiComponent\ContextInterface;
- use Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool;
-+use Magento\Ui\Component\Form\Element\Multiline;
- use Magento\Ui\Component\Form\Field;
- use Magento\Ui\DataProvider\EavValidationRules;
-+use Magento\Customer\Model\FileUploaderDataResolver;
- 
- /**
-+ * Supplies the data for the customer UI component
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.TooManyFields)
-  *
-+ * @deprecated \Magento\Customer\Model\Customer\DataProviderWithDefaultAddresses is used instead
-  * @api
-  * @since 100.0.2
-  */
-@@ -108,21 +111,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-      */
-     protected $session;
- 
--    /**
--     * @var FileProcessorFactory
--     */
--    private $fileProcessorFactory;
--
--    /**
--     * File types allowed for file_uploader UI component
--     *
--     * @var array
--     */
--    private $fileUploaderTypes = [
--        'image',
--        'file',
--    ];
--
-     /**
-      * Customer fields that must be removed
-      *
-@@ -146,6 +134,11 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-      */
-     private $allowToShowHiddenAttributes;
- 
-+    /**
-+     * @var FileUploaderDataResolver
-+     */
-+    private $fileUploaderDataResolver;
-+
-     /**
-      * @param string $name
-      * @param string $primaryFieldName
-@@ -155,11 +148,13 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-      * @param Config $eavConfig
-      * @param FilterPool $filterPool
-      * @param FileProcessorFactory $fileProcessorFactory
--     * @param ContextInterface $context
-      * @param array $meta
-      * @param array $data
-+     * @param ContextInterface $context
-      * @param bool $allowToShowHiddenAttributes
-+     * @param FileUploaderDataResolver|null $fileUploaderDataResolver
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         $name,
-@@ -173,7 +168,8 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-         array $meta = [],
-         array $data = [],
-         ContextInterface $context = null,
--        $allowToShowHiddenAttributes = true
-+        $allowToShowHiddenAttributes = true,
-+        $fileUploaderDataResolver = null
-     ) {
-         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
-         $this->eavValidationRules = $eavValidationRules;
-@@ -181,9 +177,10 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-         $this->collection->addAttributeToSelect('*');
-         $this->eavConfig = $eavConfig;
-         $this->filterPool = $filterPool;
--        $this->fileProcessorFactory = $fileProcessorFactory ?: $this->getFileProcessorFactory();
-         $this->context = $context ?: ObjectManager::getInstance()->get(ContextInterface::class);
-         $this->allowToShowHiddenAttributes = $allowToShowHiddenAttributes;
-+        $this->fileUploaderDataResolver = $fileUploaderDataResolver
-+            ?: ObjectManager::getInstance()->get(FileUploaderDataResolver::class);
-         $this->meta['customer']['children'] = $this->getAttributesMeta(
-             $this->eavConfig->getEntityType('customer')
-         );
-@@ -224,7 +221,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-         foreach ($items as $customer) {
-             $result['customer'] = $customer->getData();
- 
--            $this->overrideFileUploaderData($customer, $result['customer']);
-+            $this->fileUploaderDataResolver->overrideFileUploaderData($customer, $result['customer']);
- 
-             $result['customer'] = array_diff_key(
-                 $result['customer'],
-@@ -239,7 +236,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-                 $result['address'][$addressId] = $address->getData();
-                 $this->prepareAddressData($addressId, $result['address'], $result['customer']);
- 
--                $this->overrideFileUploaderData($address, $result['address'][$addressId]);
-+                $this->fileUploaderDataResolver->overrideFileUploaderData($address, $result['address'][$addressId]);
-             }
-             $this->loadedData[$customer->getId()] = $result;
-         }
-@@ -254,75 +251,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-         return $this->loadedData;
-     }
- 
--    /**
--     * Override file uploader UI component data
--     *
--     * Overrides data for attributes with frontend_input equal to 'image' or 'file'.
--     *
--     * @param Customer|Address $entity
--     * @param array $entityData
--     * @return void
--     */
--    private function overrideFileUploaderData($entity, array &$entityData)
--    {
--        $attributes = $entity->getAttributes();
--        foreach ($attributes as $attribute) {
--            /** @var Attribute $attribute */
--            if (in_array($attribute->getFrontendInput(), $this->fileUploaderTypes)) {
--                $entityData[$attribute->getAttributeCode()] = $this->getFileUploaderData(
--                    $entity->getEntityType(),
--                    $attribute,
--                    $entityData
--                );
--            }
--        }
--    }
--
--    /**
--     * Retrieve array of values required by file uploader UI component
--     *
--     * @param Type $entityType
--     * @param Attribute $attribute
--     * @param array $customerData
--     * @return array
--     * @SuppressWarnings(PHPMD.NPathComplexity)
--     */
--    private function getFileUploaderData(
--        Type $entityType,
--        Attribute $attribute,
--        array $customerData
--    ) {
--        $attributeCode = $attribute->getAttributeCode();
--
--        $file = isset($customerData[$attributeCode])
--            ? $customerData[$attributeCode]
--            : '';
--
--        /** @var FileProcessor $fileProcessor */
--        $fileProcessor = $this->getFileProcessorFactory()->create([
--            'entityTypeCode' => $entityType->getEntityTypeCode(),
--        ]);
--
--        if (!empty($file)
--            && $fileProcessor->isExist($file)
--        ) {
--            $stat = $fileProcessor->getStat($file);
--            $viewUrl = $fileProcessor->getViewUrl($file, $attribute->getFrontendInput());
--
--            return [
--                [
--                    'file' => $file,
--                    'size' => isset($stat) ? $stat['size'] : 0,
--                    'url' => isset($viewUrl) ? $viewUrl : '',
--                    'name' => basename($file),
--                    'type' => $fileProcessor->getMimeType($file),
--                ],
--            ];
--        }
--
--        return [];
--    }
--
-     /**
-      * Get attributes meta
-      *
-@@ -368,52 +296,28 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-             $meta[$code]['arguments']['data']['config']['componentType'] = Field::NAME;
-             $meta[$code]['arguments']['data']['config']['visible'] = $this->canShowAttribute($attribute);
- 
--            $this->overrideFileUploaderMetadata($entityType, $attribute, $meta[$code]['arguments']['data']['config']);
-+            $this->fileUploaderDataResolver->overrideFileUploaderMetadata(
-+                $entityType,
-+                $attribute,
-+                $meta[$code]['arguments']['data']['config']
-+            );
-         }
- 
-         $this->processWebsiteMeta($meta);
-         return $meta;
-     }
- 
--    /**
--     * Check whether the specific attribute can be shown in form: customer registration, customer edit, etc...
--     *
--     * @param Attribute $customerAttribute
--     * @return bool
--     */
--    private function canShowAttributeInForm(AbstractAttribute $customerAttribute)
--    {
--        $isRegistration = $this->context->getRequestParam($this->getRequestFieldName()) === null;
--
--        if ($customerAttribute->getEntityType()->getEntityTypeCode() === 'customer') {
--            return is_array($customerAttribute->getUsedInForms()) &&
--                (
--                    (in_array('customer_account_create', $customerAttribute->getUsedInForms()) && $isRegistration) ||
--                    (in_array('customer_account_edit', $customerAttribute->getUsedInForms()) && !$isRegistration)
--                );
--        } else {
--            return is_array($customerAttribute->getUsedInForms()) &&
--                in_array('customer_address_edit', $customerAttribute->getUsedInForms());
--        }
--    }
--
-     /**
-      * Detect can we show attribute on specific form or not
-      *
-      * @param Attribute $customerAttribute
-      * @return bool
-      */
--    private function canShowAttribute(AbstractAttribute $customerAttribute)
-+    private function canShowAttribute(AbstractAttribute $customerAttribute): bool
-     {
--        $userDefined = (bool) $customerAttribute->getIsUserDefined();
--        if (!$userDefined) {
--            return $customerAttribute->getIsVisible();
--        }
--
--        $canShowOnForm = $this->canShowAttributeInForm($customerAttribute);
--
--        return ($this->allowToShowHiddenAttributes && $canShowOnForm) ||
--            (!$this->allowToShowHiddenAttributes && $canShowOnForm && $customerAttribute->getIsVisible());
-+        return $this->allowToShowHiddenAttributes && (bool) $customerAttribute->getIsUserDefined()
-+            ? true
-+            : (bool) $customerAttribute->getIsVisible();
-     }
- 
-     /**
-@@ -466,97 +370,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-         }
-     }
- 
--    /**
--     * Override file uploader UI component metadata
--     *
--     * Overrides metadata for attributes with frontend_input equal to 'image' or 'file'.
--     *
--     * @param Type $entityType
--     * @param AbstractAttribute $attribute
--     * @param array $config
--     * @return void
--     */
--    private function overrideFileUploaderMetadata(
--        Type $entityType,
--        AbstractAttribute $attribute,
--        array &$config
--    ) {
--        if (in_array($attribute->getFrontendInput(), $this->fileUploaderTypes)) {
--            $maxFileSize = self::MAX_FILE_SIZE;
--
--            if (isset($config['validation']['max_file_size'])) {
--                $maxFileSize = (int)$config['validation']['max_file_size'];
--            }
--
--            $allowedExtensions = [];
--
--            if (isset($config['validation']['file_extensions'])) {
--                $allowedExtensions = explode(',', $config['validation']['file_extensions']);
--                array_walk($allowedExtensions, function (&$value) {
--                    $value = strtolower(trim($value));
--                });
--            }
--
--            $allowedExtensions = implode(' ', $allowedExtensions);
--
--            $entityTypeCode = $entityType->getEntityTypeCode();
--            $url = $this->getFileUploadUrl($entityTypeCode);
--
--            $config = [
--                'formElement' => 'fileUploader',
--                'componentType' => 'fileUploader',
--                'maxFileSize' => $maxFileSize,
--                'allowedExtensions' => $allowedExtensions,
--                'uploaderConfig' => [
--                    'url' => $url,
--                ],
--                'label' => $this->getMetadataValue($config, 'label'),
--                'sortOrder' => $this->getMetadataValue($config, 'sortOrder'),
--                'required' => $this->getMetadataValue($config, 'required'),
--                'visible' => $this->getMetadataValue($config, 'visible'),
--                'validation' => $this->getMetadataValue($config, 'validation'),
--            ];
--        }
--    }
--
--    /**
--     * Retrieve metadata value
--     *
--     * @param array $config
--     * @param string $name
--     * @param mixed $default
--     * @return mixed
--     */
--    private function getMetadataValue($config, $name, $default = null)
--    {
--        $value = isset($config[$name]) ? $config[$name] : $default;
--        return $value;
--    }
--
--    /**
--     * Retrieve URL to file upload
--     *
--     * @param string $entityTypeCode
--     * @return string
--     */
--    private function getFileUploadUrl($entityTypeCode)
--    {
--        switch ($entityTypeCode) {
--            case CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER:
--                $url = 'customer/file/customer_upload';
--                break;
--
--            case AddressMetadataInterface::ENTITY_TYPE_ADDRESS:
--                $url = 'customer/file/address_upload';
--                break;
--
--            default:
--                $url = '';
--                break;
--        }
--        return $url;
--    }
--
-     /**
-      * Process attributes by frontend input type
-      *
-@@ -596,23 +409,14 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-         ) {
-             $addresses[$addressId]['default_shipping'] = $customer['default_shipping'];
-         }
--        if (isset($addresses[$addressId]['street']) && !is_array($addresses[$addressId]['street'])) {
--            $addresses[$addressId]['street'] = explode("\n", $addresses[$addressId]['street']);
--        }
--    }
- 
--    /**
--     * Get FileProcessorFactory instance
--     *
--     * @return FileProcessorFactory
--     * @deprecated 100.1.3
--     */
--    private function getFileProcessorFactory()
--    {
--        if ($this->fileProcessorFactory === null) {
--            $this->fileProcessorFactory = ObjectManager::getInstance()
--                ->get(\Magento\Customer\Model\FileProcessorFactory::class);
-+        foreach ($this->meta['address']['children'] as $attributeName => $attributeMeta) {
-+            if ($attributeMeta['arguments']['data']['config']['dataType'] === Multiline::NAME
-+                && isset($addresses[$addressId][$attributeName])
-+                && !is_array($addresses[$addressId][$attributeName])
-+            ) {
-+                $addresses[$addressId][$attributeName] = explode("\n", $addresses[$addressId][$attributeName]);
-+            }
-         }
--        return $this->fileProcessorFactory;
-     }
- }
-diff --git a/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php b/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php
-new file mode 100644
-index 00000000000..6d18b881a69
---- /dev/null
-+++ b/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php
-@@ -0,0 +1,198 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Model\Customer;
-+
-+use Magento\Customer\Model\Address;
-+use Magento\Customer\Model\Customer;
-+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory;
-+use Magento\Eav\Model\Config;
-+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-+use Magento\Eav\Model\Entity\Type;
-+use Magento\Framework\Session\SessionManagerInterface;
-+use Magento\Customer\Model\FileUploaderDataResolver;
-+use Magento\Customer\Model\AttributeMetadataResolver;
-+
-+/**
-+ * Refactored version of Magento\Customer\Model\Customer\DataProvider with eliminated usage of addresses collection.
-+ */
-+class DataProviderWithDefaultAddresses extends \Magento\Ui\DataProvider\AbstractDataProvider
-+{
-+    /**
-+     * @var array
-+     */
-+    private $loadedData = [];
-+
-+    /**
-+     * @var SessionManagerInterface
-+     */
-+    private $session;
-+
-+    /**
-+     * Customer fields that must be removed
-+     *
-+     * @var array
-+     */
-+    private static $forbiddenCustomerFields = [
-+        'password_hash',
-+        'rp_token',
-+    ];
-+
-+    /**
-+     * Allow to manage attributes, even they are hidden on storefront
-+     *
-+     * @var bool
-+     */
-+    private $allowToShowHiddenAttributes;
-+
-+    /**
-+     * @var \Magento\Directory\Model\CountryFactory
-+     */
-+    private $countryFactory;
-+
-+    /**
-+     * @var FileUploaderDataResolver
-+     */
-+    private $fileUploaderDataResolver;
-+
-+    /**
-+     * @var AttributeMetadataResolver
-+     */
-+    private $attributeMetadataResolver;
-+
-+    /**
-+     * @param string $name
-+     * @param string $primaryFieldName
-+     * @param string $requestFieldName
-+     * @param CustomerCollectionFactory $customerCollectionFactory
-+     * @param Config $eavConfig
-+     * @param \Magento\Directory\Model\CountryFactory $countryFactory
-+     * @param SessionManagerInterface $session
-+     * @param FileUploaderDataResolver $fileUploaderDataResolver
-+     * @param AttributeMetadataResolver $attributeMetadataResolver
-+     * @param bool $allowToShowHiddenAttributes
-+     * @param array $meta
-+     * @param array $data
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     */
-+    public function __construct(
-+        string $name,
-+        string $primaryFieldName,
-+        string $requestFieldName,
-+        CustomerCollectionFactory $customerCollectionFactory,
-+        Config $eavConfig,
-+        \Magento\Directory\Model\CountryFactory $countryFactory,
-+        SessionManagerInterface $session,
-+        FileUploaderDataResolver $fileUploaderDataResolver,
-+        AttributeMetadataResolver $attributeMetadataResolver,
-+        $allowToShowHiddenAttributes = true,
-+        array $meta = [],
-+        array $data = []
-+    ) {
-+        parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
-+        $this->collection = $customerCollectionFactory->create();
-+        $this->collection->addAttributeToSelect('*');
-+        $this->allowToShowHiddenAttributes = $allowToShowHiddenAttributes;
-+        $this->session = $session;
-+        $this->countryFactory = $countryFactory;
-+        $this->fileUploaderDataResolver = $fileUploaderDataResolver;
-+        $this->attributeMetadataResolver = $attributeMetadataResolver;
-+        $this->meta['customer']['children'] = $this->getAttributesMeta(
-+            $eavConfig->getEntityType('customer')
-+        );
-+    }
-+
-+    /**
-+     * Get data
-+     *
-+     * @return array
-+     */
-+    public function getData(): array
-+    {
-+        if (!empty($this->loadedData)) {
-+            return $this->loadedData;
-+        }
-+        $items = $this->collection->getItems();
-+        /** @var Customer $customer */
-+        foreach ($items as $customer) {
-+            $result['customer'] = $customer->getData();
-+
-+            $this->fileUploaderDataResolver->overrideFileUploaderData($customer, $result['customer']);
-+
-+            $result['customer'] = array_diff_key(
-+                $result['customer'],
-+                array_flip(self::$forbiddenCustomerFields)
-+            );
-+            unset($result['address']);
-+
-+            $result['default_billing_address'] = $this->prepareDefaultAddress(
-+                $customer->getDefaultBillingAddress()
-+            );
-+            $result['default_shipping_address'] = $this->prepareDefaultAddress(
-+                $customer->getDefaultShippingAddress()
-+            );
-+            $result['customer_id'] = $customer->getId();
-+
-+            $this->loadedData[$customer->getId()] = $result;
-+        }
-+
-+        $data = $this->session->getCustomerFormData();
-+        if (!empty($data)) {
-+            $customerId = $data['customer']['entity_id'] ?? null;
-+            $this->loadedData[$customerId] = $data;
-+            $this->session->unsCustomerFormData();
-+        }
-+
-+        return $this->loadedData;
-+    }
-+
-+    /**
-+     * Prepare default address data.
-+     *
-+     * @param Address|false $address
-+     * @return array
-+     */
-+    private function prepareDefaultAddress($address): array
-+    {
-+        $addressData = [];
-+
-+        if (!empty($address)) {
-+            $addressData = $address->getData();
-+            if (isset($addressData['street']) && !\is_array($address['street'])) {
-+                $addressData['street'] = explode("\n", $addressData['street']);
-+            }
-+            $addressData['country'] = $this->countryFactory->create()
-+                ->loadByCode($addressData['country_id'])->getName();
-+        }
-+
-+        return $addressData;
-+    }
-+
-+    /**
-+     * Get attributes meta
-+     *
-+     * @param Type $entityType
-+     * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function getAttributesMeta(Type $entityType): array
-+    {
-+        $meta = [];
-+        $attributes = $entityType->getAttributeCollection();
-+        /* @var AbstractAttribute $attribute */
-+        foreach ($attributes as $attribute) {
-+            $meta[$attribute->getAttributeCode()] = $this->attributeMetadataResolver->getAttributesMeta(
-+                $attribute,
-+                $entityType,
-+                $this->allowToShowHiddenAttributes
-+            );
-+        }
-+        $this->attributeMetadataResolver->processWebsiteMeta($meta);
-+
-+        return $meta;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Model/Customer/Source/Group.php b/app/code/Magento/Customer/Model/Customer/Source/Group.php
-index e4c1d2e75be..efcc7d0fe93 100644
---- a/app/code/Magento/Customer/Model/Customer/Source/Group.php
-+++ b/app/code/Magento/Customer/Model/Customer/Source/Group.php
-@@ -6,11 +6,14 @@
- namespace Magento\Customer\Model\Customer\Source;
- 
- use Magento\Customer\Api\Data\GroupSearchResultsInterface;
--use Magento\Framework\Module\Manager as ModuleManager;
-+use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
- use Magento\Customer\Api\Data\GroupInterface;
- use Magento\Customer\Api\GroupRepositoryInterface;
- use Magento\Framework\Api\SearchCriteriaBuilder;
- 
-+/**
-+ * Group.
-+ */
- class Group implements GroupSourceInterface
- {
-     /**
-diff --git a/app/code/Magento/Customer/Model/CustomerAuthUpdate.php b/app/code/Magento/Customer/Model/CustomerAuthUpdate.php
-index 06de649524e..bc9bffb6ffd 100644
---- a/app/code/Magento/Customer/Model/CustomerAuthUpdate.php
-+++ b/app/code/Magento/Customer/Model/CustomerAuthUpdate.php
-@@ -6,31 +6,43 @@
- 
- namespace Magento\Customer\Model;
- 
-+use Magento\Customer\Model\ResourceModel\Customer as CustomerResourceModel;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+
- /**
-  * Customer Authentication update model.
-  */
- class CustomerAuthUpdate
- {
-     /**
--     * @var \Magento\Customer\Model\CustomerRegistry
-+     * @var CustomerRegistry
-      */
-     protected $customerRegistry;
- 
-     /**
--     * @var \Magento\Customer\Model\ResourceModel\Customer
-+     * @var CustomerResourceModel
-      */
-     protected $customerResourceModel;
- 
-     /**
--     * @param \Magento\Customer\Model\CustomerRegistry $customerRegistry
--     * @param \Magento\Customer\Model\ResourceModel\Customer $customerResourceModel
-+     * @var Customer
-+     */
-+    private $customerModel;
-+
-+    /**
-+     * @param CustomerRegistry $customerRegistry
-+     * @param CustomerResourceModel $customerResourceModel
-+     * @param Customer|null $customerModel
-      */
-     public function __construct(
--        \Magento\Customer\Model\CustomerRegistry $customerRegistry,
--        \Magento\Customer\Model\ResourceModel\Customer $customerResourceModel
-+        CustomerRegistry $customerRegistry,
-+        CustomerResourceModel $customerResourceModel,
-+        Customer $customerModel = null
-     ) {
-         $this->customerRegistry = $customerRegistry;
-         $this->customerResourceModel = $customerResourceModel;
-+        $this->customerModel = $customerModel ?: ObjectManager::getInstance()->get(Customer::class);
-     }
- 
-     /**
-@@ -38,21 +50,30 @@ class CustomerAuthUpdate
-      *
-      * @param int $customerId
-      * @return $this
-+     * @throws NoSuchEntityException
-      */
-     public function saveAuth($customerId)
-     {
-         $customerSecure = $this->customerRegistry->retrieveSecureData($customerId);
- 
-+        $this->customerResourceModel->load($this->customerModel, $customerId);
-+        $currentLockExpiresVal = $this->customerModel->getData('lock_expires');
-+        $newLockExpiresVal = $customerSecure->getData('lock_expires');
-+
-         $this->customerResourceModel->getConnection()->update(
-             $this->customerResourceModel->getTable('customer_entity'),
-             [
-                 'failures_num' => $customerSecure->getData('failures_num'),
-                 'first_failure' => $customerSecure->getData('first_failure'),
--                'lock_expires' => $customerSecure->getData('lock_expires'),
-+                'lock_expires' => $newLockExpiresVal,
-             ],
-             $this->customerResourceModel->getConnection()->quoteInto('entity_id = ?', $customerId)
-         );
- 
-+        if ($currentLockExpiresVal !== $newLockExpiresVal) {
-+            $this->customerModel->reindex();
-+        }
-+
-         return $this;
-     }
- }
-diff --git a/app/code/Magento/Customer/Model/CustomerIdProvider.php b/app/code/Magento/Customer/Model/CustomerIdProvider.php
-new file mode 100644
-index 00000000000..e670d5eb02d
---- /dev/null
-+++ b/app/code/Magento/Customer/Model/CustomerIdProvider.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Model;
-+
-+use Magento\Framework\App\RequestInterface;
-+
-+/**
-+ * Provides customer id from request.
-+ */
-+class CustomerIdProvider
-+{
-+    /**
-+     * @var RequestInterface
-+     */
-+    private $request;
-+
-+    /**
-+     * @param RequestInterface $request
-+     */
-+    public function __construct(
-+        RequestInterface $request
-+    ) {
-+        $this->request = $request;
-+    }
-+
-+    /**
-+     * Get customer id from request.
-+     *
-+     * @return int
-+     */
-+    public function getCustomerId(): int
-+    {
-+        return (int)$this->request->getParam('id');
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Model/EmailNotification.php b/app/code/Magento/Customer/Model/EmailNotification.php
-index 4b65dcca097..144c24f8e83 100644
---- a/app/code/Magento/Customer/Model/EmailNotification.php
-+++ b/app/code/Magento/Customer/Model/EmailNotification.php
-@@ -17,6 +17,8 @@ use Magento\Framework\Reflection\DataObjectProcessor;
- use Magento\Framework\Exception\LocalizedException;
- 
- /**
-+ * Customer email notification
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class EmailNotification implements EmailNotificationInterface
-diff --git a/app/code/Magento/Customer/Model/FileProcessor.php b/app/code/Magento/Customer/Model/FileProcessor.php
-index 6a8472758c1..c16faea2842 100644
---- a/app/code/Magento/Customer/Model/FileProcessor.php
-+++ b/app/code/Magento/Customer/Model/FileProcessor.php
-@@ -3,8 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Customer\Model;
- 
-+/**
-+ * Processor class for work with uploaded files
-+ */
- class FileProcessor
- {
-     /**
-@@ -232,7 +237,7 @@ class FileProcessor
-             );
-         }
- 
--        $fileName = $dispersionPath . '/' . $fileName;
-+        $fileName = $dispersionPath . '/' . $destinationFileName;
-         return $fileName;
-     }
- 
-diff --git a/app/code/Magento/Customer/Model/FileUploaderDataResolver.php b/app/code/Magento/Customer/Model/FileUploaderDataResolver.php
-new file mode 100644
-index 00000000000..535bfe97bc4
---- /dev/null
-+++ b/app/code/Magento/Customer/Model/FileUploaderDataResolver.php
-@@ -0,0 +1,204 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Model;
-+
-+use Magento\Eav\Model\Entity\Type;
-+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-+use Magento\Customer\Api\AddressMetadataInterface;
-+use Magento\Customer\Api\CustomerMetadataInterface;
-+
-+/**
-+ * Class to retrieve file uploader data for customer and customer address file & image attributes
-+ */
-+class FileUploaderDataResolver
-+{
-+    /**
-+     * Maximum file size allowed for file_uploader UI component
-+     * This constant was copied from deprecated data provider \Magento\Customer\Model\Customer\DataProvider
-+     */
-+    private const MAX_FILE_SIZE = 2097152;
-+
-+    /**
-+     * @var FileProcessorFactory
-+     */
-+    private $fileProcessorFactory;
-+
-+    /**
-+     * File types allowed for file_uploader UI component
-+     *
-+     * @var array
-+     */
-+    private $fileUploaderTypes = [
-+        'image',
-+        'file',
-+    ];
-+
-+    /**
-+     * @param FileProcessorFactory $fileProcessorFactory
-+     */
-+    public function __construct(
-+        FileProcessorFactory $fileProcessorFactory
-+    ) {
-+        $this->fileProcessorFactory = $fileProcessorFactory;
-+    }
-+
-+    /**
-+     * Override file uploader UI component data
-+     *
-+     * Overrides data for attributes with frontend_input equal to 'image' or 'file'.
-+     *
-+     * @param Customer|Address $entity
-+     * @param array $entityData
-+     * @return void
-+     */
-+    public function overrideFileUploaderData($entity, array &$entityData): void
-+    {
-+        $attributes = $entity->getAttributes();
-+        foreach ($attributes as $attribute) {
-+            /** @var Attribute $attribute */
-+            if (\in_array($attribute->getFrontendInput(), $this->fileUploaderTypes, true)) {
-+                $entityData[$attribute->getAttributeCode()] = $this->getFileUploaderData(
-+                    $entity->getEntityType(),
-+                    $attribute,
-+                    $entityData
-+                );
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Retrieve array of values required by file uploader UI component
-+     *
-+     * @param Type $entityType
-+     * @param Attribute $attribute
-+     * @param array $customerData
-+     * @return array
-+     */
-+    private function getFileUploaderData(
-+        Type $entityType,
-+        Attribute $attribute,
-+        array $customerData
-+    ): array {
-+        $attributeCode = $attribute->getAttributeCode();
-+
-+        $file = $customerData[$attributeCode] ?? null;
-+
-+        /** @var FileProcessor $fileProcessor */
-+        $fileProcessor = $this->fileProcessorFactory->create([
-+            'entityTypeCode' => $entityType->getEntityTypeCode(),
-+        ]);
-+
-+        if (!empty($file)
-+            && $fileProcessor->isExist($file)
-+        ) {
-+            $stat = $fileProcessor->getStat($file);
-+            $viewUrl = $fileProcessor->getViewUrl($file, $attribute->getFrontendInput());
-+
-+            return [
-+                [
-+                    'file' => $file,
-+                    'size' => null !== $stat ? $stat['size'] : 0,
-+                    'url' => $viewUrl ?? '',
-+                    'name' => basename($file),
-+                    'type' => $fileProcessor->getMimeType($file),
-+                ],
-+            ];
-+        }
-+
-+        return [];
-+    }
-+
-+    /**
-+     * Override file uploader UI component metadata
-+     *
-+     * Overrides metadata for attributes with frontend_input equal to 'image' or 'file'.
-+     *
-+     * @param Type $entityType
-+     * @param AbstractAttribute $attribute
-+     * @param array $config
-+     * @return void
-+     */
-+    public function overrideFileUploaderMetadata(
-+        Type $entityType,
-+        AbstractAttribute $attribute,
-+        array &$config
-+    ): void {
-+        if (\in_array($attribute->getFrontendInput(), $this->fileUploaderTypes, true)) {
-+            $maxFileSize = self::MAX_FILE_SIZE;
-+
-+            if (isset($config['validation']['max_file_size'])) {
-+                $maxFileSize = (int)$config['validation']['max_file_size'];
-+            }
-+
-+            $allowedExtensions = [];
-+
-+            if (isset($config['validation']['file_extensions'])) {
-+                $allowedExtensions = explode(',', $config['validation']['file_extensions']);
-+                array_walk($allowedExtensions, function (&$value) {
-+                    $value = strtolower(trim($value));
-+                });
-+            }
-+
-+            $allowedExtensions = implode(' ', $allowedExtensions);
-+
-+            $entityTypeCode = $entityType->getEntityTypeCode();
-+            $url = $this->getFileUploadUrl($entityTypeCode);
-+
-+            $config = [
-+                'formElement' => 'fileUploader',
-+                'componentType' => 'fileUploader',
-+                'maxFileSize' => $maxFileSize,
-+                'allowedExtensions' => $allowedExtensions,
-+                'uploaderConfig' => [
-+                    'url' => $url,
-+                ],
-+                'label' => $this->getMetadataValue($config, 'label'),
-+                'sortOrder' => $this->getMetadataValue($config, 'sortOrder'),
-+                'required' => $this->getMetadataValue($config, 'required'),
-+                'visible' => $this->getMetadataValue($config, 'visible'),
-+                'validation' => $this->getMetadataValue($config, 'validation'),
-+            ];
-+        }
-+    }
-+
-+    /**
-+     * Retrieve metadata value
-+     *
-+     * @param array $config
-+     * @param string $name
-+     * @param mixed $default
-+     * @return mixed
-+     */
-+    private function getMetadataValue($config, $name, $default = null)
-+    {
-+        return $config[$name] ?? $default;
-+    }
-+
-+    /**
-+     * Retrieve URL to file upload
-+     *
-+     * @param string $entityTypeCode
-+     * @return string
-+     */
-+    private function getFileUploadUrl($entityTypeCode): string
-+    {
-+        switch ($entityTypeCode) {
-+            case CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER:
-+                $url = 'customer/file/customer_upload';
-+                break;
-+
-+            case AddressMetadataInterface::ENTITY_TYPE_ADDRESS:
-+                $url = 'customer/file/address_upload';
-+                break;
-+
-+            default:
-+                $url = '';
-+                break;
-+        }
-+        return $url;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Model/ForgotPasswordToken/ConfirmCustomerByToken.php b/app/code/Magento/Customer/Model/ForgotPasswordToken/ConfirmCustomerByToken.php
-new file mode 100644
-index 00000000000..6aadc814a4b
---- /dev/null
-+++ b/app/code/Magento/Customer/Model/ForgotPasswordToken/ConfirmCustomerByToken.php
-@@ -0,0 +1,58 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Model\ForgotPasswordToken;
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+
-+/**
-+ * Confirm customer by reset password token
-+ */
-+class ConfirmCustomerByToken
-+{
-+    /**
-+     * @var GetCustomerByToken
-+     */
-+    private $getByToken;
-+
-+    /**
-+     * @var CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * ConfirmByToken constructor.
-+     *
-+     * @param GetCustomerByToken $getByToken
-+     * @param CustomerRepositoryInterface $customerRepository
-+     */
-+    public function __construct(
-+        GetCustomerByToken $getByToken,
-+        CustomerRepositoryInterface $customerRepository
-+    ) {
-+        $this->getByToken = $getByToken;
-+        $this->customerRepository = $customerRepository;
-+    }
-+
-+    /**
-+     * Confirm customer account my rp_token
-+     *
-+     * @param string $resetPasswordToken
-+     *
-+     * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function execute(string $resetPasswordToken): void
-+    {
-+        $customer = $this->getByToken->execute($resetPasswordToken);
-+        if ($customer->getConfirmation()) {
-+            $this->customerRepository->save(
-+                $customer->setConfirmation(null)
-+            );
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php b/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php
-new file mode 100644
-index 00000000000..09af4e296bd
---- /dev/null
-+++ b/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php
-@@ -0,0 +1,89 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Model\ForgotPasswordToken;
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Exception\State\ExpiredException;
-+use Magento\Framework\Phrase;
-+
-+/**
-+ * Get Customer By reset password token
-+ * @SuppressWarnings(PHPMD.LongVariable)
-+ */
-+class GetCustomerByToken
-+{
-+    /**
-+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * @var \Magento\Framework\Api\SearchCriteriaBuilder
-+     */
-+    private $searchCriteriaBuilder;
-+
-+    /**
-+     * ForgotPassword constructor.
-+     *
-+     * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
-+     * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
-+     */
-+    public function __construct(
-+        CustomerRepositoryInterface $customerRepository,
-+        SearchCriteriaBuilder $searchCriteriaBuilder
-+    ) {
-+        $this->customerRepository = $customerRepository;
-+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-+    }
-+
-+    /**
-+     * Get customer by rp_token
-+     *
-+     * @param string $resetPasswordToken
-+     *
-+     * @return \Magento\Customer\Api\Data\CustomerInterface
-+     * @throws ExpiredException
-+     * @throws NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function execute(string $resetPasswordToken):CustomerInterface
-+    {
-+        $this->searchCriteriaBuilder->addFilter(
-+            'rp_token',
-+            $resetPasswordToken
-+        );
-+        $this->searchCriteriaBuilder->setPageSize(1);
-+        $found = $this->customerRepository->getList(
-+            $this->searchCriteriaBuilder->create()
-+        );
-+
-+        if ($found->getTotalCount() > 1) {
-+            //Failed to generated unique RP token
-+            throw new ExpiredException(
-+                new Phrase('Reset password token expired.')
-+            );
-+        }
-+        if ($found->getTotalCount() === 0) {
-+            //Customer with such token not found.
-+            new NoSuchEntityException(
-+                new Phrase(
-+                    'No such entity with rp_token = %value',
-+                    [
-+                        'value' => $resetPasswordToken
-+                    ]
-+                )
-+            );
-+        }
-+
-+        //Unique customer found.
-+        return $found->getItems()[0];
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Model/GroupManagement.php b/app/code/Magento/Customer/Model/GroupManagement.php
-index 47d7d7ad1ac..48cb5d55061 100644
---- a/app/code/Magento/Customer/Model/GroupManagement.php
-+++ b/app/code/Magento/Customer/Model/GroupManagement.php
-@@ -8,16 +8,19 @@
- namespace Magento\Customer\Model;
- 
- use Magento\Customer\Api\Data\GroupInterface;
-+use Magento\Customer\Api\Data\GroupInterfaceFactory;
-+use Magento\Customer\Api\GroupRepositoryInterface;
-+use Magento\Framework\Api\FilterBuilder;
- use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Api\SortOrderBuilder;
- use Magento\Framework\App\Config\ScopeConfigInterface;
--use Magento\Framework\Api\FilterBuilder;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Store\Model\StoreManagerInterface;
--use Magento\Customer\Api\GroupRepositoryInterface;
--use Magento\Customer\Api\Data\GroupInterfaceFactory;
--use Magento\Customer\Model\GroupFactory;
- 
- /**
-+ * The class contains methods for getting information about a customer group
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
-@@ -65,6 +68,11 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
-      */
-     protected $filterBuilder;
- 
-+    /**
-+     * @var SortOrderBuilder
-+     */
-+    private $sortOrderBuilder;
-+
-     /**
-      * @param StoreManagerInterface $storeManager
-      * @param ScopeConfigInterface $scopeConfig
-@@ -73,6 +81,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
-      * @param GroupInterfaceFactory $groupDataFactory
-      * @param SearchCriteriaBuilder $searchCriteriaBuilder
-      * @param FilterBuilder $filterBuilder
-+     * @param SortOrderBuilder $sortOrderBuilder
-      */
-     public function __construct(
-         StoreManagerInterface $storeManager,
-@@ -81,7 +90,8 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
-         GroupRepositoryInterface $groupRepository,
-         GroupInterfaceFactory $groupDataFactory,
-         SearchCriteriaBuilder $searchCriteriaBuilder,
--        FilterBuilder $filterBuilder
-+        FilterBuilder $filterBuilder,
-+        SortOrderBuilder $sortOrderBuilder = null
-     ) {
-         $this->storeManager = $storeManager;
-         $this->scopeConfig = $scopeConfig;
-@@ -90,10 +100,12 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
-         $this->groupDataFactory = $groupDataFactory;
-         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-         $this->filterBuilder = $filterBuilder;
-+        $this->sortOrderBuilder = $sortOrderBuilder ?: ObjectManager::getInstance()
-+            ->get(SortOrderBuilder::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isReadonly($groupId)
-     {
-@@ -107,7 +119,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDefaultGroup($storeId = null)
-     {
-@@ -133,7 +145,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getNotLoggedInGroup()
-     {
-@@ -141,7 +153,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getLoggedInGroups()
-     {
-@@ -155,15 +167,20 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
-             ->setConditionType('neq')
-             ->setValue(self::CUST_GROUP_ALL)
-             ->create();
-+        $groupNameSortOrder = $this->sortOrderBuilder
-+            ->setField('customer_group_code')
-+            ->setAscendingDirection()
-+            ->create();
-         $searchCriteria = $this->searchCriteriaBuilder
-             ->addFilters($notLoggedInFilter)
-             ->addFilters($groupAll)
-+            ->addSortOrder($groupNameSortOrder)
-             ->create();
-         return $this->groupRepository->getList($searchCriteria)->getItems();
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAllCustomersGroup()
-     {
-diff --git a/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php b/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php
-index d4e0c5cce34..336e7ab770b 100644
---- a/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php
-+++ b/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php
-@@ -11,6 +11,9 @@ use Magento\Customer\Model\ResourceModel\Group\CollectionFactory as CustomerGrou
- use Magento\Framework\Indexer\DimensionFactory;
- use Magento\Framework\Indexer\DimensionProviderInterface;
- 
-+/**
-+ * Class CustomerGroupDimensionProvider
-+ */
- class CustomerGroupDimensionProvider implements DimensionProviderInterface
- {
-     /**
-@@ -34,12 +37,19 @@ class CustomerGroupDimensionProvider implements DimensionProviderInterface
-      */
-     private $dimensionFactory;
- 
-+    /**
-+     * @param CustomerGroupCollectionFactory $collectionFactory
-+     * @param DimensionFactory $dimensionFactory
-+     */
-     public function __construct(CustomerGroupCollectionFactory $collectionFactory, DimensionFactory $dimensionFactory)
-     {
-         $this->dimensionFactory = $dimensionFactory;
-         $this->collectionFactory = $collectionFactory;
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-     public function getIterator(): \Traversable
-     {
-         foreach ($this->getCustomerGroups() as $customerGroup) {
-@@ -48,6 +58,8 @@ class CustomerGroupDimensionProvider implements DimensionProviderInterface
-     }
- 
-     /**
-+     * Get Customer Groups
-+     *
-      * @return array
-      */
-     private function getCustomerGroups(): array
-diff --git a/app/code/Magento/Customer/Model/Indexer/Source.php b/app/code/Magento/Customer/Model/Indexer/Source.php
-index e4bf03e08a9..a8878e2084e 100644
---- a/app/code/Magento/Customer/Model/Indexer/Source.php
-+++ b/app/code/Magento/Customer/Model/Indexer/Source.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Customer\Model\Indexer;
- 
-+use Magento\Customer\Model\ResourceModel\Customer\Indexer\CollectionFactory;
- use Magento\Customer\Model\ResourceModel\Customer\Indexer\Collection;
- use Magento\Framework\App\ResourceConnection\SourceProviderInterface;
- use Traversable;
-@@ -25,11 +26,11 @@ class Source implements \IteratorAggregate, \Countable, SourceProviderInterface
-     private $batchSize;
- 
-     /**
--     * @param \Magento\Customer\Model\ResourceModel\Customer\Indexer\CollectionFactory $collection
-+     * @param CollectionFactory $collectionFactory
-      * @param int $batchSize
-      */
-     public function __construct(
--        \Magento\Customer\Model\ResourceModel\Customer\Indexer\CollectionFactory $collectionFactory,
-+        CollectionFactory $collectionFactory,
-         $batchSize = 10000
-     ) {
-         $this->customerCollection = $collectionFactory->create();
-@@ -37,7 +38,7 @@ class Source implements \IteratorAggregate, \Countable, SourceProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getMainTable()
-     {
-@@ -45,7 +46,7 @@ class Source implements \IteratorAggregate, \Countable, SourceProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIdFieldName()
-     {
-@@ -53,7 +54,7 @@ class Source implements \IteratorAggregate, \Countable, SourceProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function addFieldToSelect($fieldName, $alias = null)
-     {
-@@ -62,7 +63,7 @@ class Source implements \IteratorAggregate, \Countable, SourceProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSelect()
-     {
-@@ -70,7 +71,7 @@ class Source implements \IteratorAggregate, \Countable, SourceProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function addFieldToFilter($attribute, $condition = null)
-     {
-@@ -79,7 +80,7 @@ class Source implements \IteratorAggregate, \Countable, SourceProviderInterface
-     }
- 
-     /**
--     * @return int
-+     * @inheritdoc
-      */
-     public function count()
-     {
-@@ -105,4 +106,28 @@ class Source implements \IteratorAggregate, \Countable, SourceProviderInterface
-             $pageNumber++;
-         } while ($pageNumber <= $lastPage);
-     }
-+
-+    /**
-+     * Joins Attribute
-+     *
-+     * @param string $alias alias for the joined attribute
-+     * @param string|\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
-+     * @param string $bind attribute of the main entity to link with joined $filter
-+     * @param string|null $filter primary key for the joined entity (entity_id default)
-+     * @param string $joinType inner|left
-+     * @param int|null $storeId
-+     * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @see Collection::joinAttribute()
-+     */
-+    public function joinAttribute(
-+        string $alias,
-+        $attribute,
-+        string $bind,
-+        ?string $filter = null,
-+        string $joinType = 'inner',
-+        ?int $storeId = null
-+    ): void {
-+        $this->customerCollection->joinAttribute($alias, $attribute, $bind, $filter, $joinType, $storeId);
-+    }
- }
-diff --git a/app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php b/app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php
-index 5a46fdb9def..8e64fba4a9b 100644
---- a/app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php
-+++ b/app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php
-@@ -12,6 +12,7 @@ use Magento\Eav\Model\Entity\Attribute;
- use Magento\Framework\App\Cache\StateInterface;
- use Magento\Framework\App\CacheInterface;
- use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * Cache for attribute metadata
-@@ -53,6 +54,11 @@ class AttributeMetadataCache
-      */
-     private $serializer;
- 
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-     /**
-      * Constructor
-      *
-@@ -60,17 +66,21 @@ class AttributeMetadataCache
-      * @param StateInterface $state
-      * @param SerializerInterface $serializer
-      * @param AttributeMetadataHydrator $attributeMetadataHydrator
-+     * @param StoreManagerInterface $storeManager
-      */
-     public function __construct(
-         CacheInterface $cache,
-         StateInterface $state,
-         SerializerInterface $serializer,
--        AttributeMetadataHydrator $attributeMetadataHydrator
-+        AttributeMetadataHydrator $attributeMetadataHydrator,
-+        StoreManagerInterface $storeManager = null
-     ) {
-         $this->cache = $cache;
-         $this->state = $state;
-         $this->serializer = $serializer;
-         $this->attributeMetadataHydrator = $attributeMetadataHydrator;
-+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(StoreManagerInterface::class);
-     }
- 
-     /**
-@@ -82,11 +92,12 @@ class AttributeMetadataCache
-      */
-     public function load($entityType, $suffix = '')
-     {
--        if (isset($this->attributes[$entityType . $suffix])) {
--            return $this->attributes[$entityType . $suffix];
-+        $storeId = $this->storeManager->getStore()->getId();
-+        if (isset($this->attributes[$entityType . $suffix . $storeId])) {
-+            return $this->attributes[$entityType . $suffix . $storeId];
-         }
-         if ($this->isEnabled()) {
--            $cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
-+            $cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
-             $serializedData = $this->cache->load($cacheKey);
-             if ($serializedData) {
-                 $attributesData = $this->serializer->unserialize($serializedData);
-@@ -94,7 +105,7 @@ class AttributeMetadataCache
-                 foreach ($attributesData as $key => $attributeData) {
-                     $attributes[$key] = $this->attributeMetadataHydrator->hydrate($attributeData);
-                 }
--                $this->attributes[$entityType . $suffix] = $attributes;
-+                $this->attributes[$entityType . $suffix . $storeId] = $attributes;
-                 return $attributes;
-             }
-         }
-@@ -111,9 +122,10 @@ class AttributeMetadataCache
-      */
-     public function save($entityType, array $attributes, $suffix = '')
-     {
--        $this->attributes[$entityType . $suffix] = $attributes;
-+        $storeId = $this->storeManager->getStore()->getId();
-+        $this->attributes[$entityType . $suffix . $storeId] = $attributes;
-         if ($this->isEnabled()) {
--            $cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
-+            $cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
-             $attributesData = [];
-             foreach ($attributes as $key => $attribute) {
-                 $attributesData[$key] = $this->attributeMetadataHydrator->extract($attribute);
-diff --git a/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php b/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
-index 7ed806e657e..38f3fbcbdbd 100644
---- a/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
-+++ b/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
-@@ -33,20 +33,30 @@ class CustomerMetadata implements CustomerMetadataInterface
-      */
-     private $attributeMetadataDataProvider;
- 
-+    /**
-+     * List of system attributes which should be available to the clients.
-+     *
-+     * @var string[]
-+     */
-+    private $systemAttributes;
-+
-     /**
-      * @param AttributeMetadataConverter $attributeMetadataConverter
-      * @param AttributeMetadataDataProvider $attributeMetadataDataProvider
-+     * @param string[] $systemAttributes
-      */
-     public function __construct(
-         AttributeMetadataConverter $attributeMetadataConverter,
--        AttributeMetadataDataProvider $attributeMetadataDataProvider
-+        AttributeMetadataDataProvider $attributeMetadataDataProvider,
-+        array $systemAttributes = []
-     ) {
-         $this->attributeMetadataConverter = $attributeMetadataConverter;
-         $this->attributeMetadataDataProvider = $attributeMetadataDataProvider;
-+        $this->systemAttributes = $systemAttributes;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAttributes($formCode)
-     {
-@@ -67,7 +77,7 @@ class CustomerMetadata implements CustomerMetadataInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAttributeMetadata($attributeCode)
-     {
-@@ -92,7 +102,7 @@ class CustomerMetadata implements CustomerMetadataInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAllAttributesMetadata()
-     {
-@@ -116,7 +126,7 @@ class CustomerMetadata implements CustomerMetadataInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCustomAttributesMetadata($dataObjectClassName = self::DATA_INTERFACE_NAME)
-     {
-@@ -134,9 +144,10 @@ class CustomerMetadata implements CustomerMetadataInterface
-             $isDataObjectMethod = isset($this->customerDataObjectMethods['get' . $camelCaseKey])
-                 || isset($this->customerDataObjectMethods['is' . $camelCaseKey]);
- 
--            /** Even though disable_auto_group_change is system attribute, it should be available to the clients */
-             if (!$isDataObjectMethod
--                && (!$attributeMetadata->isSystem() || $attributeCode == 'disable_auto_group_change')
-+                && (!$attributeMetadata->isSystem()
-+                    || in_array($attributeCode, $this->systemAttributes)
-+                )
-             ) {
-                 $customAttributes[] = $attributeMetadata;
-             }
-diff --git a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
-index 168f00be16e..8e443e93354 100644
---- a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
-+++ b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
-@@ -12,6 +12,8 @@ use Magento\Framework\Api\ArrayObjectSearch;
- use Magento\Framework\Validator\EmailAddress;
- 
- /**
-+ * Form Element Abstract Data Model
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- abstract class AbstractData
-@@ -137,6 +139,7 @@ abstract class AbstractData
- 
-     /**
-      * Set scope visibility
-+     *
-      * Search value only in scope or search value in scope and global
-      *
-      * @param boolean $flag
-@@ -281,9 +284,14 @@ abstract class AbstractData
-         );
- 
-         if ($inputValidation !== null) {
-+            $allowWhiteSpace = false;
-+
-             switch ($inputValidation) {
-+                case 'alphanum-with-spaces':
-+                    $allowWhiteSpace = true;
-+                    // Continue to alphanumeric validation
-                 case 'alphanumeric':
--                    $validator = new \Zend_Validate_Alnum(true);
-+                    $validator = new \Zend_Validate_Alnum($allowWhiteSpace);
-                     $validator->setMessage(__('"%1" invalid type entered.', $label), \Zend_Validate_Alnum::INVALID);
-                     $validator->setMessage(
-                         __('"%1" contains non-alphabetic or non-numeric characters.', $label),
-diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Date.php b/app/code/Magento/Customer/Model/Metadata/Form/Date.php
-index b27f6627439..6f14b2e6f1d 100644
---- a/app/code/Magento/Customer/Model/Metadata/Form/Date.php
-+++ b/app/code/Magento/Customer/Model/Metadata/Form/Date.php
-@@ -12,7 +12,7 @@ use Magento\Framework\Api\ArrayObjectSearch;
- class Date extends AbstractData
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function extractValue(\Magento\Framework\App\RequestInterface $request)
-     {
-@@ -21,7 +21,7 @@ class Date extends AbstractData
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-@@ -95,21 +95,15 @@ class Date extends AbstractData
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function compactValue($value)
-     {
--        if ($value !== false) {
--            if (empty($value)) {
--                $value = null;
--            }
--            return $value;
--        }
--        return false;
-+        return $value;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function restoreValue($value)
-     {
-@@ -117,7 +111,7 @@ class Date extends AbstractData
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function outputValue($format = \Magento\Customer\Model\Metadata\ElementFactory::OUTPUT_FORMAT_TEXT)
-     {
-diff --git a/app/code/Magento/Customer/Model/Metadata/Form/File.php b/app/code/Magento/Customer/Model/Metadata/Form/File.php
-index e6e9c2b50c0..227e85ed98f 100644
---- a/app/code/Magento/Customer/Model/Metadata/Form/File.php
-+++ b/app/code/Magento/Customer/Model/Metadata/Form/File.php
-@@ -15,6 +15,8 @@ use Magento\Framework\File\UploaderFactory;
- use Magento\Framework\Filesystem;
- 
- /**
-+ * Processes files that are save for customer.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class File extends AbstractData
-@@ -66,7 +68,7 @@ class File extends AbstractData
-      * @param \Psr\Log\LoggerInterface $logger
-      * @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
-      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
--     * @param null $value
-+     * @param string|array $value
-      * @param string $entityTypeCode
-      * @param bool $isAjax
-      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
-@@ -101,7 +103,7 @@ class File extends AbstractData
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-     public function extractValue(\Magento\Framework\App\RequestInterface $request)
-@@ -109,7 +111,7 @@ class File extends AbstractData
-         $extend = $this->_getRequestValue($request);
- 
-         $attrCode = $this->getAttribute()->getAttributeCode();
--        if ($this->_requestScope) {
-+        if ($this->_requestScope || !isset($_FILES[$attrCode])) {
-             $value = [];
-             if (strpos($this->_requestScope, '/') !== false) {
-                 $scopes = explode('/', $this->_requestScope);
-@@ -160,8 +162,7 @@ class File extends AbstractData
-     }
- 
-     /**
--     * Validate file by attribute validate rules
--     * Return array of errors
-+     * Validate file by attribute validate rules. Returns array of errors.
-      *
-      * @param array $value
-      * @return string[]
-@@ -232,7 +233,7 @@ class File extends AbstractData
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-@@ -273,7 +274,7 @@ class File extends AbstractData
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return ImageContentInterface|array|string|null
-      */
-@@ -358,7 +359,7 @@ class File extends AbstractData
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function restoreValue($value)
-     {
-@@ -366,7 +367,7 @@ class File extends AbstractData
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function outputValue($format = \Magento\Customer\Model\Metadata\ElementFactory::OUTPUT_FORMAT_TEXT)
-     {
-diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Image.php b/app/code/Magento/Customer/Model/Metadata/Form/Image.php
-index 2104f941a6b..33bdf827f80 100644
---- a/app/code/Magento/Customer/Model/Metadata/Form/Image.php
-+++ b/app/code/Magento/Customer/Model/Metadata/Form/Image.php
-@@ -16,6 +16,8 @@ use Magento\Framework\File\UploaderFactory;
- use Magento\Framework\Filesystem;
- 
- /**
-+ * Metadata for form image field
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Image extends File
-@@ -32,7 +34,7 @@ class Image extends File
-      * @param \Psr\Log\LoggerInterface $logger
-      * @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
-      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
--     * @param null $value
-+     * @param null|string $value
-      * @param string $entityTypeCode
-      * @param bool $isAjax
-      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
-@@ -78,6 +80,7 @@ class Image extends File
- 
-     /**
-      * Validate file by attribute validate rules
-+     *
-      * Return array of errors
-      *
-      * @param array $value
-@@ -133,7 +136,7 @@ class Image extends File
- 
-         $maxImageHeight = ArrayObjectSearch::getArrayElementByName(
-             $rules,
--            'max_image_heght'
-+            'max_image_height'
-         );
-         if ($maxImageHeight !== null) {
-             if ($maxImageHeight < $imageProp[1]) {
-diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Text.php b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
-index c8b9a1e46a1..c639b607e27 100644
---- a/app/code/Magento/Customer/Model/Metadata/Form/Text.php
-+++ b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
-@@ -11,6 +11,9 @@ namespace Magento\Customer\Model\Metadata\Form;
- use Magento\Customer\Api\Data\AttributeMetadataInterface;
- use Magento\Framework\Api\ArrayObjectSearch;
- 
-+/**
-+ * Form Text metadata
-+ */
- class Text extends AbstractData
- {
-     /**
-@@ -52,8 +55,6 @@ class Text extends AbstractData
- 
-     /**
-      * @inheritdoc
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-     public function validateValue($value)
-     {
-@@ -66,12 +67,12 @@ class Text extends AbstractData
-             $value = $this->_value;
-         }
- 
--        if ($attribute->isRequired() && empty($value) && $value !== '0') {
--            $errors[] = __('"%1" is a required value.', $label);
-+        if (!$attribute->isRequired() && empty($value)) {
-+            return true;
-         }
- 
--        if (!$errors && !$attribute->isRequired() && empty($value)) {
--            return true;
-+        if (empty($value) && $value !== '0') {
-+            $errors[] = __('"%1" is a required value.', $label);
-         }
- 
-         $errors = $this->validateLength($value, $attribute, $errors);
-@@ -80,6 +81,7 @@ class Text extends AbstractData
-         if ($result !== true) {
-             $errors = array_merge($errors, $result);
-         }
-+
-         if (count($errors) == 0) {
-             return true;
-         }
-diff --git a/app/code/Magento/Customer/Model/Options.php b/app/code/Magento/Customer/Model/Options.php
-index 7747e309d82..71e70f8e142 100644
---- a/app/code/Magento/Customer/Model/Options.php
-+++ b/app/code/Magento/Customer/Model/Options.php
-@@ -8,7 +8,11 @@ namespace Magento\Customer\Model;
- use Magento\Config\Model\Config\Source\Nooptreq as NooptreqSource;
- use Magento\Customer\Helper\Address as AddressHelper;
- use Magento\Framework\Escaper;
-+use Magento\Store\Api\Data\StoreInterface;
- 
-+/**
-+ * Customer Options.
-+ */
- class Options
- {
-     /**
-@@ -38,7 +42,7 @@ class Options
-     /**
-      * Retrieve name prefix dropdown options
-      *
--     * @param null $store
-+     * @param null|string|bool|int|StoreInterface $store
-      * @return array|bool
-      */
-     public function getNamePrefixOptions($store = null)
-@@ -52,7 +56,7 @@ class Options
-     /**
-      * Retrieve name suffix dropdown options
-      *
--     * @param null $store
-+     * @param null|string|bool|int|StoreInterface $store
-      * @return array|bool
-      */
-     public function getNameSuffixOptions($store = null)
-@@ -64,7 +68,9 @@ class Options
-     }
- 
-     /**
--     * @param $options
-+     * Unserialize and clear name prefix or suffix options.
-+     *
-+     * @param string $options
-      * @param bool $isOptional
-      * @return array|bool
-      *
-@@ -78,6 +84,7 @@ class Options
- 
-     /**
-      * Unserialize and clear name prefix or suffix options
-+     *
-      * If field is optional, add an empty first option.
-      *
-      * @param string $options
-@@ -91,7 +98,7 @@ class Options
-             return false;
-         }
-         $result = [];
--        $options = explode(';', $options);
-+        $options = array_filter(explode(';', $options));
-         foreach ($options as $value) {
-             $value = $this->escaper->escapeHtml(trim($value));
-             $result[$value] = $value;
-diff --git a/app/code/Magento/Customer/Model/Renderer/Region.php b/app/code/Magento/Customer/Model/Renderer/Region.php
-index 5c7fcd38d6c..a26cfb96fe0 100644
---- a/app/code/Magento/Customer/Model/Renderer/Region.php
-+++ b/app/code/Magento/Customer/Model/Renderer/Region.php
-@@ -54,6 +54,8 @@ class Region implements \Magento\Framework\Data\Form\Element\Renderer\RendererIn
-     }
- 
-     /**
-+     * Render element
-+     *
-      * @param AbstractElement $element
-      * @return string
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-@@ -80,7 +82,7 @@ class Region implements \Magento\Framework\Data\Form\Element\Renderer\RendererIn
-             $regionCollection = self::$_regionCollections[$countryId];
-         }
- 
--        $regionId = intval($element->getForm()->getElement('region_id')->getValue());
-+        $regionId = (int)$element->getForm()->getElement('region_id')->getValue();
- 
-         $htmlAttributes = $element->getHtmlAttributes();
-         foreach ($htmlAttributes as $key => $attribute) {
-diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address.php b/app/code/Magento/Customer/Model/ResourceModel/Address.php
-index a52c3723108..200eaabe651 100644
---- a/app/code/Magento/Customer/Model/ResourceModel/Address.php
-+++ b/app/code/Magento/Customer/Model/ResourceModel/Address.php
-@@ -14,6 +14,7 @@ use Magento\Framework\App\ObjectManager;
- 
- /**
-  * Class Address
-+ *
-  * @package Magento\Customer\Model\ResourceModel
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
-@@ -31,8 +32,8 @@ class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
- 
-     /**
-      * @param \Magento\Eav\Model\Entity\Context $context
--     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot,
--     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite,
-+     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
-+     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite
-      * @param \Magento\Framework\Validator\Factory $validatorFactory
-      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
-      * @param array $data
-@@ -98,6 +99,9 @@ class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
-      */
-     protected function _validate($address)
-     {
-+        if ($address->getDataByKey('should_ignore_validation')) {
-+            return;
-+        };
-         $validator = $this->_validatorFactory->createValidator('customer_address', 'save');
- 
-         if (!$validator->isValid($address)) {
-@@ -110,7 +114,7 @@ class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function delete($object)
-     {
-@@ -120,6 +124,8 @@ class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
-     }
- 
-     /**
-+     * Get instance of DeleteRelation class
-+     *
-      * @deprecated 100.2.0
-      * @return DeleteRelation
-      */
-@@ -129,6 +135,8 @@ class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
-     }
- 
-     /**
-+     * Get instance of CustomerRegistry class
-+     *
-      * @deprecated 100.2.0
-      * @return CustomerRegistry
-      */
-@@ -138,6 +146,8 @@ class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
-     }
- 
-     /**
-+     * After delete entity process
-+     *
-      * @param \Magento\Customer\Model\Address $address
-      * @return $this
-      */
-diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
-new file mode 100644
-index 00000000000..4e034705908
---- /dev/null
-+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
-@@ -0,0 +1,143 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Model\ResourceModel\Address\Grid;
-+
-+use Magento\Framework\Api\Search\SearchResultInterface;
-+use Magento\Framework\Api\Search\AggregationInterface;
-+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-+
-+/**
-+ * Class getting collection of addresses assigned to customer
-+ */
-+class Collection extends AbstractCollection implements SearchResultInterface
-+{
-+    /**
-+     * @var AggregationInterface
-+     */
-+    private $aggregations;
-+
-+    /**
-+     * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
-+     * @param \Psr\Log\LoggerInterface $logger
-+     * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-+     * @param string $mainTable
-+     * @param string $eventPrefix
-+     * @param string $eventObject
-+     * @param string $resourceModel
-+     * @param string $model
-+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|string|null $connection
-+     * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-+     *
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     */
-+    public function __construct(
-+        \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
-+        \Psr\Log\LoggerInterface $logger,
-+        \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
-+        \Magento\Framework\Event\ManagerInterface $eventManager,
-+        $mainTable,
-+        $eventPrefix,
-+        $eventObject,
-+        $resourceModel,
-+        $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class,
-+        $connection = null,
-+        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
-+    ) {
-+        $this->_eventPrefix = $eventPrefix;
-+        $this->_eventObject = $eventObject;
-+        $this->_init($model, $resourceModel);
-+        $this->setMainTable($mainTable);
-+        $this->_idFieldName = 'entity_id';
-+        parent::__construct(
-+            $entityFactory,
-+            $logger,
-+            $fetchStrategy,
-+            $eventManager,
-+            $connection,
-+            $resource
-+        );
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * @return AggregationInterface
-+     */
-+    public function getAggregations()
-+    {
-+        return $this->aggregations;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * @param AggregationInterface $aggregations
-+     * @return $this
-+     */
-+    public function setAggregations($aggregations)
-+    {
-+        $this->aggregations = $aggregations;
-+        return $this;
-+    }
-+
-+    /**
-+     * Get search criteria.
-+     *
-+     * @return \Magento\Framework\Api\SearchCriteriaInterface|null
-+     */
-+    public function getSearchCriteria()
-+    {
-+        return null;
-+    }
-+
-+    /**
-+     * Set search criteria.
-+     *
-+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-+     * @return $this
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null)
-+    {
-+        return $this;
-+    }
-+
-+    /**
-+     * Get total count.
-+     *
-+     * @return int
-+     */
-+    public function getTotalCount()
-+    {
-+        return $this->getSize();
-+    }
-+
-+    /**
-+     * Set total count.
-+     *
-+     * @param int $totalCount
-+     * @return $this
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function setTotalCount($totalCount)
-+    {
-+        return $this;
-+    }
-+
-+    /**
-+     * Set items list.
-+     *
-+     * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
-+     * @return $this
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function setItems(array $items = null)
-+    {
-+        return $this;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
-index d473a4dc018..ae342a1b10d 100644
---- a/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
-+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
-@@ -7,6 +7,8 @@
-  */
- namespace Magento\Customer\Model\ResourceModel\Address;
- 
-+use Magento\Customer\Model\Address;
-+use Magento\Customer\Model\Customer;
- use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationInterface;
- 
- /**
-@@ -36,19 +38,14 @@ class Relation implements RelationInterface
-     public function processRelation(\Magento\Framework\Model\AbstractModel $object)
-     {
-         /**
--         * @var $object \Magento\Customer\Model\Address
-+         * @var $object Address
-          */
--        if (!$object->getIsCustomerSaveTransaction() && $this->isAddressDefault($object)) {
-+        if (!$object->getIsCustomerSaveTransaction() && $object->getId()) {
-             $customer = $this->customerFactory->create()->load($object->getCustomerId());
--            $changedAddresses = [];
--
--            if ($object->getIsDefaultBilling()) {
--                $changedAddresses['default_billing'] = $object->getId();
--            }
- 
--            if ($object->getIsDefaultShipping()) {
--                $changedAddresses['default_shipping'] = $object->getId();
--            }
-+            $changedAddresses = [];
-+            $changedAddresses = $this->getDefaultBillingChangedAddress($object, $customer, $changedAddresses);
-+            $changedAddresses = $this->getDefaultShippingChangedAddress($object, $customer, $changedAddresses);
- 
-             if ($changedAddresses) {
-                 $customer->getResource()->getConnection()->update(
-@@ -60,9 +57,62 @@ class Relation implements RelationInterface
-         }
-     }
- 
-+    /**
-+     * Get default billing changed address
-+     *
-+     * @param Address $object
-+     * @param Customer $customer
-+     * @param array $changedAddresses
-+     * @return array
-+     */
-+    private function getDefaultBillingChangedAddress(
-+        Address $object,
-+        Customer $customer,
-+        array $changedAddresses
-+    ): array {
-+        if ($object->getIsDefaultBilling()) {
-+            $changedAddresses['default_billing'] = $object->getId();
-+        } elseif ($customer->getDefaultBillingAddress()
-+            && $object->getIsDefaultBilling() === false
-+            && (int)$customer->getDefaultBillingAddress()->getId() === (int)$object->getId()
-+        ) {
-+            $changedAddresses['default_billing'] = null;
-+        }
-+
-+        return $changedAddresses;
-+    }
-+
-+    /**
-+     * Get default shipping changed address
-+     *
-+     * @param Address $object
-+     * @param Customer $customer
-+     * @param array $changedAddresses
-+     * @return array
-+     */
-+    private function getDefaultShippingChangedAddress(
-+        Address $object,
-+        Customer $customer,
-+        array $changedAddresses
-+    ): array {
-+        if ($object->getIsDefaultShipping()) {
-+            $changedAddresses['default_shipping'] = $object->getId();
-+        } elseif ($customer->getDefaultShippingAddress()
-+            && $object->getIsDefaultShipping() === false
-+            && (int)$customer->getDefaultShippingAddress()->getId() === (int)$object->getId()
-+        ) {
-+            $changedAddresses['default_shipping'] = null;
-+        }
-+
-+        return $changedAddresses;
-+    }
-+
-     /**
-      * Checks if address has chosen as default and has had an id
-      *
-+     * @deprecated Is not used anymore due to changes in logic of save of address.
-+     *             If address was default and becomes not default than default address id for customer must be
-+     *             set to null
-      * @param \Magento\Framework\Model\AbstractModel $object
-      * @return bool
-      */
-diff --git a/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php b/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
-index 7f69ab3c02b..3fe61785de8 100644
---- a/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
-+++ b/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
-@@ -7,6 +7,7 @@
-  */
- namespace Magento\Customer\Model\ResourceModel;
- 
-+use Magento\Customer\Api\Data\AddressInterface;
- use Magento\Customer\Model\Address as CustomerAddressModel;
- use Magento\Customer\Model\Customer as CustomerModel;
- use Magento\Customer\Model\ResourceModel\Address\Collection;
-@@ -16,6 +17,8 @@ use Magento\Framework\Api\SearchCriteriaInterface;
- use Magento\Framework\Exception\InputException;
- 
- /**
-+ * Address repository.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class AddressRepository implements \Magento\Customer\Api\AddressRepositoryInterface
-@@ -123,6 +126,7 @@ class AddressRepository implements \Magento\Customer\Api\AddressRepositoryInterf
-         } else {
-             $addressModel->updateData($address);
-         }
-+        $addressModel->setStoreId($customerModel->getStoreId());
- 
-         $errors = $addressModel->validate();
-         if ($errors !== true) {
-@@ -143,6 +147,8 @@ class AddressRepository implements \Magento\Customer\Api\AddressRepositoryInterf
-     }
- 
-     /**
-+     * Update address collection.
-+     *
-      * @param Customer $customer
-      * @param Address $address
-      * @throws \Magento\Framework\Exception\LocalizedException
-diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer.php b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
-index f5102015596..94196df6fe0 100644
---- a/app/code/Magento/Customer/Model/ResourceModel/Customer.php
-+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
-@@ -95,9 +95,12 @@ class Customer extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
-     /**
-      * Check customer scope, email and confirmation key before saving
-      *
--     * @param \Magento\Framework\DataObject $customer
-+     * @param \Magento\Framework\DataObject|\Magento\Customer\Api\Data\CustomerInterface $customer
-+     *
-      * @return $this
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws AlreadyExistsException
-+     * @throws ValidatorException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-@@ -141,9 +144,7 @@ class Customer extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
-         }
- 
-         // set confirmation key logic
--        if ($customer->getForceConfirmed() || $customer->getPasswordHash() == '') {
--            $customer->setConfirmation(null);
--        } elseif (!$customer->getId() && $customer->isConfirmationRequired()) {
-+        if (!$customer->getId() && $customer->isConfirmationRequired()) {
-             $customer->setConfirmation($customer->getRandomConfirmationKey());
-         }
-         // remove customer confirmation key from database, if empty
-@@ -151,7 +152,9 @@ class Customer extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
-             $customer->setConfirmation(null);
-         }
- 
--        $this->_validate($customer);
-+        if (!$customer->getData('ignore_validation_flag')) {
-+            $this->_validate($customer);
-+        }
- 
-         return $this;
-     }
-@@ -161,7 +164,7 @@ class Customer extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
-      *
-      * @param \Magento\Customer\Model\Customer $customer
-      * @return void
--     * @throws \Magento\Framework\Validator\Exception
-+     * @throws ValidatorException
-      */
-     protected function _validate($customer)
-     {
-diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php b/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php
-index e55c5d443c9..96f47154e87 100644
---- a/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php
-+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php
-@@ -23,41 +23,43 @@ class Relation implements \Magento\Framework\Model\ResourceModel\Db\VersionContr
-         $defaultBillingId = $customer->getData('default_billing');
-         $defaultShippingId = $customer->getData('default_shipping');
- 
--        /** @var \Magento\Customer\Model\Address $address */
--        foreach ($customer->getAddresses() as $address) {
--            if ($address->getData('_deleted')) {
--                if ($address->getId() == $defaultBillingId) {
--                    $customer->setData('default_billing', null);
--                }
-+        if (!$customer->getData('ignore_validation_flag')) {
-+            /** @var \Magento\Customer\Model\Address $address */
-+            foreach ($customer->getAddresses() as $address) {
-+                if ($address->getData('_deleted')) {
-+                    if ($address->getId() == $defaultBillingId) {
-+                        $customer->setData('default_billing', null);
-+                    }
- 
--                if ($address->getId() == $defaultShippingId) {
--                    $customer->setData('default_shipping', null);
--                }
-+                    if ($address->getId() == $defaultShippingId) {
-+                        $customer->setData('default_shipping', null);
-+                    }
- 
--                $removedAddressId = $address->getId();
--                $address->delete();
-+                    $removedAddressId = $address->getId();
-+                    $address->delete();
- 
--                // Remove deleted address from customer address collection
--                $customer->getAddressesCollection()->removeItemByKey($removedAddressId);
--            } else {
--                $address->setParentId(
--                    $customer->getId()
--                )->setStoreId(
--                    $customer->getStoreId()
--                )->setIsCustomerSaveTransaction(
--                    true
--                )->save();
-+                    // Remove deleted address from customer address collection
-+                    $customer->getAddressesCollection()->removeItemByKey($removedAddressId);
-+                } else {
-+                    $address->setParentId(
-+                        $customer->getId()
-+                    )->setStoreId(
-+                        $customer->getStoreId()
-+                    )->setIsCustomerSaveTransaction(
-+                        true
-+                    )->save();
- 
--                if (($address->getIsPrimaryBilling() ||
--                        $address->getIsDefaultBilling()) && $address->getId() != $defaultBillingId
--                ) {
--                    $customer->setData('default_billing', $address->getId());
--                }
-+                    if (($address->getIsPrimaryBilling() ||
-+                            $address->getIsDefaultBilling()) && $address->getId() != $defaultBillingId
-+                    ) {
-+                        $customer->setData('default_billing', $address->getId());
-+                    }
- 
--                if (($address->getIsPrimaryShipping() ||
--                        $address->getIsDefaultShipping()) && $address->getId() != $defaultShippingId
--                ) {
--                    $customer->setData('default_shipping', $address->getId());
-+                    if (($address->getIsPrimaryShipping() ||
-+                            $address->getIsDefaultShipping()) && $address->getId() != $defaultShippingId
-+                    ) {
-+                        $customer->setData('default_shipping', $address->getId());
-+                    }
-                 }
-             }
-         }
-diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
-index 29e35c721a3..529b0e80697 100644
---- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
-+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
-@@ -8,69 +8,80 @@ namespace Magento\Customer\Model\ResourceModel;
- 
- use Magento\Customer\Api\CustomerMetadataInterface;
- use Magento\Customer\Api\Data\CustomerInterface;
--use Magento\Customer\Model\Delegation\Data\NewOperation;
-+use Magento\Customer\Api\Data\CustomerSearchResultsInterfaceFactory;
-+use Magento\Framework\Api\ExtensibleDataObjectConverter;
-+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
-+use Magento\Customer\Model\CustomerFactory;
-+use Magento\Customer\Model\CustomerRegistry;
-+use Magento\Customer\Model\Data\CustomerSecureFactory;
- use Magento\Customer\Model\Customer\NotificationStorage;
-+use Magento\Customer\Model\Delegation\Data\NewOperation;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
- use Magento\Framework\Api\DataObjectHelper;
- use Magento\Framework\Api\ImageProcessorInterface;
- use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
- use Magento\Framework\Api\SearchCriteriaInterface;
-+use Magento\Framework\Api\Search\FilterGroup;
-+use Magento\Framework\Event\ManagerInterface;
- use Magento\Customer\Model\Delegation\Storage as DelegatedStorage;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * Customer repository.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  */
--class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInterface
-+class CustomerRepository implements CustomerRepositoryInterface
- {
-     /**
--     * @var \Magento\Customer\Model\CustomerFactory
-+     * @var CustomerFactory
-      */
-     protected $customerFactory;
- 
-     /**
--     * @var \Magento\Customer\Model\Data\CustomerSecureFactory
-+     * @var CustomerSecureFactory
-      */
-     protected $customerSecureFactory;
- 
-     /**
--     * @var \Magento\Customer\Model\CustomerRegistry
-+     * @var CustomerRegistry
-      */
-     protected $customerRegistry;
- 
-     /**
--     * @var \Magento\Customer\Model\ResourceModel\AddressRepository
-+     * @var AddressRepository
-      */
-     protected $addressRepository;
- 
-     /**
--     * @var \Magento\Customer\Model\ResourceModel\Customer
-+     * @var Customer
-      */
-     protected $customerResourceModel;
- 
-     /**
--     * @var \Magento\Customer\Api\CustomerMetadataInterface
-+     * @var CustomerMetadataInterface
-      */
-     protected $customerMetadata;
- 
-     /**
--     * @var \Magento\Customer\Api\Data\CustomerSearchResultsInterfaceFactory
-+     * @var CustomerSearchResultsInterfaceFactory
-      */
-     protected $searchResultsFactory;
- 
-     /**
--     * @var \Magento\Framework\Event\ManagerInterface
-+     * @var ManagerInterface
-      */
-     protected $eventManager;
- 
-     /**
--     * @var \Magento\Store\Model\StoreManagerInterface
-+     * @var StoreManagerInterface
-      */
-     protected $storeManager;
- 
-     /**
--     * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
-+     * @var ExtensibleDataObjectConverter
-      */
-     protected $extensibleDataObjectConverter;
- 
-@@ -85,7 +96,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-     protected $imageProcessor;
- 
-     /**
--     * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-+     * @var JoinProcessorInterface
-      */
-     protected $extensionAttributesJoinProcessor;
- 
-@@ -105,38 +116,38 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-     private $delegatedStorage;
- 
-     /**
--     * @param \Magento\Customer\Model\CustomerFactory $customerFactory
--     * @param \Magento\Customer\Model\Data\CustomerSecureFactory $customerSecureFactory
--     * @param \Magento\Customer\Model\CustomerRegistry $customerRegistry
--     * @param \Magento\Customer\Model\ResourceModel\AddressRepository $addressRepository
--     * @param \Magento\Customer\Model\ResourceModel\Customer $customerResourceModel
--     * @param \Magento\Customer\Api\CustomerMetadataInterface $customerMetadata
--     * @param \Magento\Customer\Api\Data\CustomerSearchResultsInterfaceFactory $searchResultsFactory
--     * @param \Magento\Framework\Event\ManagerInterface $eventManager
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
-+     * @param CustomerFactory $customerFactory
-+     * @param CustomerSecureFactory $customerSecureFactory
-+     * @param CustomerRegistry $customerRegistry
-+     * @param AddressRepository $addressRepository
-+     * @param Customer $customerResourceModel
-+     * @param CustomerMetadataInterface $customerMetadata
-+     * @param CustomerSearchResultsInterfaceFactory $searchResultsFactory
-+     * @param ManagerInterface $eventManager
-+     * @param StoreManagerInterface $storeManager
-+     * @param ExtensibleDataObjectConverter $extensibleDataObjectConverter
-      * @param DataObjectHelper $dataObjectHelper
-      * @param ImageProcessorInterface $imageProcessor
--     * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
-+     * @param JoinProcessorInterface $extensionAttributesJoinProcessor
-      * @param CollectionProcessorInterface $collectionProcessor
-      * @param NotificationStorage $notificationStorage
-      * @param DelegatedStorage|null $delegatedStorage
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
--        \Magento\Customer\Model\CustomerFactory $customerFactory,
--        \Magento\Customer\Model\Data\CustomerSecureFactory $customerSecureFactory,
--        \Magento\Customer\Model\CustomerRegistry $customerRegistry,
--        \Magento\Customer\Model\ResourceModel\AddressRepository $addressRepository,
--        \Magento\Customer\Model\ResourceModel\Customer $customerResourceModel,
--        \Magento\Customer\Api\CustomerMetadataInterface $customerMetadata,
--        \Magento\Customer\Api\Data\CustomerSearchResultsInterfaceFactory $searchResultsFactory,
--        \Magento\Framework\Event\ManagerInterface $eventManager,
--        \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter,
-+        CustomerFactory $customerFactory,
-+        CustomerSecureFactory $customerSecureFactory,
-+        CustomerRegistry $customerRegistry,
-+        AddressRepository $addressRepository,
-+        Customer $customerResourceModel,
-+        CustomerMetadataInterface $customerMetadata,
-+        CustomerSearchResultsInterfaceFactory $searchResultsFactory,
-+        ManagerInterface $eventManager,
-+        StoreManagerInterface $storeManager,
-+        ExtensibleDataObjectConverter $extensibleDataObjectConverter,
-         DataObjectHelper $dataObjectHelper,
-         ImageProcessorInterface $imageProcessor,
--        \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor,
-+        JoinProcessorInterface $extensionAttributesJoinProcessor,
-         CollectionProcessorInterface $collectionProcessor,
-         NotificationStorage $notificationStorage,
-         DelegatedStorage $delegatedStorage = null
-@@ -156,12 +167,18 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-         $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
-         $this->collectionProcessor = $collectionProcessor;
-         $this->notificationStorage = $notificationStorage;
--        $this->delegatedStorage = $delegatedStorage
--            ?? ObjectManager::getInstance()->get(DelegatedStorage::class);
-+        $this->delegatedStorage = $delegatedStorage ?? ObjectManager::getInstance()->get(DelegatedStorage::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Create or update a customer.
-+     *
-+     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-+     * @param string $passwordHash
-+     * @return \Magento\Customer\Api\Data\CustomerInterface
-+     * @throws \Magento\Framework\Exception\InputException If bad input is provided
-+     * @throws \Magento\Framework\Exception\State\InputMismatchException If the provided email is already used
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-@@ -192,7 +209,9 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-         $customerModel->setId($customer->getId());
-         $storeId = $customerModel->getStoreId();
-         if ($storeId === null) {
--            $customerModel->setStoreId($this->storeManager->getStore()->getId());
-+            $customerModel->setStoreId(
-+                $prevCustomerData ? $prevCustomerData->getStoreId() : $this->storeManager->getStore()->getId()
-+            );
-         }
-         // Need to use attribute set or future updates can cause data loss
-         if (!$customerModel->getAttributeSetId()) {
-@@ -204,18 +223,19 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-             $customerModel->setRpToken(null);
-             $customerModel->setRpTokenCreatedAt(null);
-         }
--        if (!array_key_exists('default_billing', $customerArr)
-+        if (!array_key_exists('addresses', $customerArr)
-             && null !== $prevCustomerDataArr
-             && array_key_exists('default_billing', $prevCustomerDataArr)
-         ) {
-             $customerModel->setDefaultBilling($prevCustomerDataArr['default_billing']);
-         }
--        if (!array_key_exists('default_shipping', $customerArr)
-+        if (!array_key_exists('addresses', $customerArr)
-             && null !== $prevCustomerDataArr
-             && array_key_exists('default_shipping', $prevCustomerDataArr)
-         ) {
-             $customerModel->setDefaultShipping($prevCustomerDataArr['default_shipping']);
-         }
-+        $this->setValidationFlag($customerArr, $customerModel);
-         $customerModel->save();
-         $this->customerRegistry->push($customerModel);
-         $customerId = $customerModel->getId();
-@@ -225,7 +245,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-         ) {
-             $customer->setAddresses($delegatedNewOperation->getCustomer()->getAddresses());
-         }
--        if ($customer->getAddresses() !== null) {
-+        if ($customer->getAddresses() !== null && !$customerModel->getData('ignore_validation_flag')) {
-             if ($customer->getId()) {
-                 $existingAddresses = $this->getById($customer->getId())->getAddresses();
-                 $getIdFunc = function ($address) {
-@@ -259,7 +279,6 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-                 'delegate_data' => $delegatedNewOperation ? $delegatedNewOperation->getAdditionalData() : [],
-             ]
-         );
--
-         return $savedCustomer;
-     }
- 
-@@ -293,7 +312,13 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Retrieve customer.
-+     *
-+     * @param string $email
-+     * @param int|null $websiteId
-+     * @return \Magento\Customer\Api\Data\CustomerInterface
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified email does not exist.
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function get($email, $websiteId = null)
-     {
-@@ -302,7 +327,12 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Get customer by Customer ID.
-+     *
-+     * @param int $customerId
-+     * @return \Magento\Customer\Api\Data\CustomerInterface
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified ID does not exist.
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getById($customerId)
-     {
-@@ -311,7 +341,15 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Retrieve customers which match a specified criteria.
-+     *
-+     * This call returns an array of objects, but detailed information about each object’s attributes might not be
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#CustomerRepositoryInterface to determine
-+     * which call to use to get detailed information about all attributes for an object.
-+     *
-+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-+     * @return \Magento\Customer\Api\Data\CustomerSearchResultsInterface
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getList(SearchCriteriaInterface $searchCriteria)
-     {
-@@ -335,7 +373,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-             ->joinAttribute('billing_telephone', 'customer_address/telephone', 'default_billing', null, 'left')
-             ->joinAttribute('billing_region', 'customer_address/region', 'default_billing', null, 'left')
-             ->joinAttribute('billing_country_id', 'customer_address/country_id', 'default_billing', null, 'left')
--            ->joinAttribute('company', 'customer_address/company', 'default_billing', null, 'left');
-+            ->joinAttribute('billing_company', 'customer_address/company', 'default_billing', null, 'left');
- 
-         $this->collectionProcessor->process($searchCriteria, $collection);
- 
-@@ -351,7 +389,11 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Delete customer.
-+     *
-+     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-+     * @return bool true on success
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function delete(CustomerInterface $customer)
-     {
-@@ -359,7 +401,12 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Delete customer by Customer ID.
-+     *
-+     * @param int $customerId
-+     * @return bool true on success
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function deleteById($customerId)
-     {
-@@ -375,15 +422,12 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-      * Helper function that adds a FilterGroup to the collection.
-      *
-      * @deprecated 100.2.0
--     * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
--     * @param \Magento\Customer\Model\ResourceModel\Customer\Collection $collection
-+     * @param FilterGroup $filterGroup
-+     * @param Collection $collection
-      * @return void
--     * @throws \Magento\Framework\Exception\InputException
-      */
--    protected function addFilterGroupToCollection(
--        \Magento\Framework\Api\Search\FilterGroup $filterGroup,
--        \Magento\Customer\Model\ResourceModel\Customer\Collection $collection
--    ) {
-+    protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collection $collection)
-+    {
-         $fields = [];
-         foreach ($filterGroup->getFilters() as $filter) {
-             $condition = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
-@@ -393,4 +437,18 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
-             $collection->addFieldToFilter($fields);
-         }
-     }
-+
-+    /**
-+     * Set ignore_validation_flag to skip model validation
-+     *
-+     * @param array $customerArray
-+     * @param Customer $customerModel
-+     * @return void
-+     */
-+    private function setValidationFlag($customerArray, $customerModel)
-+    {
-+        if (isset($customerArray['ignore_validation_flag'])) {
-+            $customerModel->setData('ignore_validation_flag', true);
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Customer/Model/ResourceModel/Group.php b/app/code/Magento/Customer/Model/ResourceModel/Group.php
-index 80203e742e0..987723c5c9f 100644
---- a/app/code/Magento/Customer/Model/ResourceModel/Group.php
-+++ b/app/code/Magento/Customer/Model/ResourceModel/Group.php
-@@ -29,8 +29,8 @@ class Group extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Abs
- 
-     /**
-      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
--     * @param Snapshot $entitySnapshot,
--     * @param RelationComposite $entityRelationComposite,
-+     * @param Snapshot $entitySnapshot
-+     * @param RelationComposite $entityRelationComposite
-      * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
-      * @param Customer\CollectionFactory $customersFactory
-      * @param string $connectionName
-@@ -110,6 +110,8 @@ class Group extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Abs
-     }
- 
-     /**
-+     * Create customers collection.
-+     *
-      * @return \Magento\Customer\Model\ResourceModel\Customer\Collection
-      */
-     protected function _createCustomersCollection()
-@@ -131,7 +133,7 @@ class Group extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Abs
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
-     {
-diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
-index 9822e2ad1b8..123a9eef4b7 100644
---- a/app/code/Magento/Customer/Model/Vat.php
-+++ b/app/code/Magento/Customer/Model/Vat.php
-@@ -179,15 +179,23 @@ class Vat
-             return $gatewayResponse;
-         }
- 
-+        $countryCodeForVatNumber = $this->getCountryCodeForVatNumber($countryCode);
-+        $requesterCountryCodeForVatNumber = $this->getCountryCodeForVatNumber($requesterCountryCode);
-+
-         try {
-             $soapClient = $this->createVatNumberValidationSoapClient();
- 
-             $requestParams = [];
--            $requestParams['countryCode'] = $countryCode;
--            $requestParams['vatNumber'] = str_replace([' ', '-'], ['', ''], $vatNumber);
--            $requestParams['requesterCountryCode'] = $requesterCountryCode;
--            $requestParams['requesterVatNumber'] = str_replace([' ', '-'], ['', ''], $requesterVatNumber);
--
-+            $requestParams['countryCode'] = $countryCodeForVatNumber;
-+            $vatNumberSanitized = $this->isCountryInEU($countryCode)
-+                ? str_replace([' ', '-', $countryCodeForVatNumber], ['', '', ''], $vatNumber)
-+                : str_replace([' ', '-'], ['', ''], $vatNumber);
-+            $requestParams['vatNumber'] = $vatNumberSanitized;
-+            $requestParams['requesterCountryCode'] = $requesterCountryCodeForVatNumber;
-+            $reqVatNumSanitized = $this->isCountryInEU($requesterCountryCode)
-+                ? str_replace([' ', '-', $requesterCountryCodeForVatNumber], ['', '', ''], $requesterVatNumber)
-+                : str_replace([' ', '-'], ['', ''], $requesterVatNumber);
-+            $requestParams['requesterVatNumber'] = $reqVatNumSanitized;
-             // Send request to service
-             $result = $soapClient->checkVatApprox($requestParams);
- 
-@@ -296,4 +304,22 @@ class Vat
-         );
-         return in_array($countryCode, $euCountries);
-     }
-+
-+    /**
-+     * Returns the country code to use in the VAT number which is not always the same as the normal country code
-+     *
-+     * @param string $countryCode
-+     * @return string
-+     */
-+    private function getCountryCodeForVatNumber(string $countryCode): string
-+    {
-+        // Greece uses a different code for VAT numbers then its country code
-+        // See: http://ec.europa.eu/taxation_customs/vies/faq.html#item_11
-+        // And https://en.wikipedia.org/wiki/VAT_identification_number:
-+        // "The full identifier starts with an ISO 3166-1 alpha-2 (2 letters) country code
-+        // (except for Greece, which uses the ISO 639-1 language code EL for the Greek language,
-+        // instead of its ISO 3166-1 alpha-2 country code GR)"
-+
-+        return $countryCode === 'GR' ? 'EL' : $countryCode;
-+    }
- }
-diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
-index 763a7afbfa8..4f129f05aa8 100644
---- a/app/code/Magento/Customer/Model/Visitor.php
-+++ b/app/code/Magento/Customer/Model/Visitor.php
-@@ -6,10 +6,15 @@
- 
- namespace Magento\Customer\Model;
- 
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\App\RequestSafetyInterface;
-+
- /**
-  * Class Visitor
-+ *
-  * @package Magento\Customer\Model
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class Visitor extends \Magento\Framework\Model\AbstractModel
- {
-@@ -65,6 +70,11 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
-      */
-     protected $indexerRegistry;
- 
-+    /**
-+     * @var RequestSafetyInterface
-+     */
-+    private $requestSafety;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -78,6 +88,7 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
-      * @param array $ignoredUserAgents
-      * @param array $ignores
-      * @param array $data
-+     * @param RequestSafetyInterface|null $requestSafety
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -93,7 +104,8 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-         array $ignoredUserAgents = [],
-         array $ignores = [],
--        array $data = []
-+        array $data = [],
-+        RequestSafetyInterface $requestSafety = null
-     ) {
-         $this->session = $session;
-         $this->httpHeader = $httpHeader;
-@@ -103,6 +115,7 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
-         $this->scopeConfig = $scopeConfig;
-         $this->dateTime = $dateTime;
-         $this->indexerRegistry = $indexerRegistry;
-+        $this->requestSafety = $requestSafety ?? ObjectManager::getInstance()->get(RequestSafetyInterface::class);
-     }
- 
-     /**
-@@ -175,7 +188,8 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
-      */
-     public function saveByRequest($observer)
-     {
--        if ($this->skipRequestLogging || $this->isModuleIgnored($observer)) {
-+        // prevent saving Visitor for safe methods, e.g. GET request
-+        if ($this->skipRequestLogging || $this->requestSafety->isSafeMethod() || $this->isModuleIgnored($observer)) {
-             return $this;
-         }
- 
-@@ -262,6 +276,7 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * Destroy binding of checkout quote
-+     *
-      * @param \Magento\Framework\Event\Observer $observer
-      * @return  \Magento\Customer\Model\Visitor
-      */
-@@ -305,11 +320,9 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
-      */
-     public function getOnlineInterval()
-     {
--        $configValue = intval(
--            $this->scopeConfig->getValue(
--                static::XML_PATH_ONLINE_INTERVAL,
--                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--            )
-+        $configValue = (int)$this->scopeConfig->getValue(
-+            static::XML_PATH_ONLINE_INTERVAL,
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-         );
-         return $configValue ?: static::DEFAULT_ONLINE_MINUTES_INTERVAL;
-     }
-diff --git a/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php b/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
-index eb7e81009c9..26c4c50009b 100644
---- a/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
-+++ b/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
-@@ -6,11 +6,15 @@
- 
- namespace Magento\Customer\Observer;
- 
-+use Magento\Customer\Model\Customer;
- use Magento\Framework\Encryption\EncryptorInterface;
- use Magento\Framework\Event\ObserverInterface;
- use Magento\Customer\Api\CustomerRepositoryInterface;
- use Magento\Customer\Model\CustomerRegistry;
- 
-+/**
-+ * Class observer UpgradeCustomerPasswordObserver to upgrade customer password hash when customer has logged in
-+ */
- class UpgradeCustomerPasswordObserver implements ObserverInterface
- {
-     /**
-@@ -61,7 +65,20 @@ class UpgradeCustomerPasswordObserver implements ObserverInterface
- 
-         if (!$this->encryptor->validateHashVersion($customerSecure->getPasswordHash(), true)) {
-             $customerSecure->setPasswordHash($this->encryptor->getHash($password, true));
-+            // No need to validate customer and customer address while upgrading customer password
-+            $this->setIgnoreValidationFlag($customer);
-             $this->customerRepository->save($customer);
-         }
-     }
-+
-+    /**
-+     * Set ignore_validation_flag to skip unnecessary address and customer validation
-+     *
-+     * @param Customer $customer
-+     * @return void
-+     */
-+    private function setIgnoreValidationFlag($customer)
-+    {
-+        $customer->setData('ignore_validation_flag', true);
-+    }
- }
-diff --git a/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php b/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
-index 7488f3fd4a9..e4978070f53 100644
---- a/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
-+++ b/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
-@@ -8,12 +8,14 @@ namespace Magento\Customer\Setup\Patch\Data;
- 
- use Magento\Directory\Model\AllowedCountries;
- use Magento\Framework\Setup\ModuleDataSetupInterface;
--use Magento\Directory\Model\AllowedCountriesFactory;
- use Magento\Store\Model\ScopeInterface;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\Framework\Setup\Patch\DataPatchInterface;
- use Magento\Framework\Setup\Patch\PatchVersionInterface;
- 
-+/**
-+ * Migrate store allowed countries to website.
-+ */
- class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, PatchVersionInterface
- {
-     /**
-@@ -27,7 +29,7 @@ class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, Patc
-     private $storeManager;
- 
-     /**
--     * @var AllowedCountriesFactory
-+     * @var AllowedCountries
-      */
-     private $allowedCountries;
- 
-@@ -48,10 +50,11 @@ class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, Patc
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function apply()
-     {
-+
-         $this->moduleDataSetup->getConnection()->beginTransaction();
- 
-         try {
-@@ -149,7 +152,7 @@ class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, Patc
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getDependencies()
-     {
-@@ -159,7 +162,7 @@ class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, Patc
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getVersion()
-     {
-@@ -167,7 +170,7 @@ class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, Patc
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAliases()
-     {
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertAddressInCustomersAddressGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertAddressInCustomersAddressGridActionGroup.xml
-new file mode 100644
-index 00000000000..53dba774d6c
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertAddressInCustomersAddressGridActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Assert customer info in customers grid row -->
-+    <actionGroup name="AdminAssertAddressInCustomersAddressGrid">
-+        <arguments>
-+            <argument name="text" type="string"/>
-+        </arguments>
-+        <see selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" userInput="{{text}}"  stepKey="seeTextInGrid"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerAccountInformationActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerAccountInformationActionGroup.xml
-new file mode 100644
-index 00000000000..a908d042fcc
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerAccountInformationActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert Customer Account Information -->
-+    <actionGroup name="AdminAssertCustomerAccountInformation" >
-+        <arguments>
-+            <argument name="firstName" type="string" defaultValue=""/>
-+            <argument name="lastName" type="string" defaultValue=""/>
-+            <argument name="email" type="string" defaultValue=""/>
-+        </arguments>
-+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" stepKey="proceedToAccountInformation"/>
-+        <seeInField userInput="{{firstName}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="firstName"/>
-+        <seeInField userInput="{{lastName}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="lastName"/>
-+        <seeInField userInput="{{email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="email"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerDefaultBillingAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerDefaultBillingAddressActionGroup.xml
-new file mode 100644
-index 00000000000..32b62470610
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerDefaultBillingAddressActionGroup.xml
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert Customer Default Billing Address -->
-+    <actionGroup name="AdminAssertCustomerDefaultBillingAddress" >
-+        <arguments>
-+            <argument name="firstName" type="string" defaultValue=""/>
-+            <argument name="lastName" type="string" defaultValue=""/>
-+            <argument name="street1" type="string" defaultValue=""/>
-+            <argument name="state" type="string" defaultValue=""/>
-+            <argument name="postcode" type="string" defaultValue=""/>
-+            <argument name="country" type="string" defaultValue=""/>
-+            <argument name="telephone" type="string" defaultValue=""/>
-+        </arguments>
-+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
-+        <see userInput="{{firstName}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="firstName"/>
-+        <see userInput="{{lastName}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="lastName"/>
-+        <see userInput="{{street1}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="street1"/>
-+        <see userInput="{{state}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="state"/>
-+        <see userInput="{{postcode}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="postcode"/>
-+        <see userInput="{{country}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="country"/>
-+        <see userInput="{{telephone}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="telephone"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerDefaultShippingAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerDefaultShippingAddressActionGroup.xml
-new file mode 100644
-index 00000000000..9d7c209121f
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerDefaultShippingAddressActionGroup.xml
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert Customer Default Shipping Address -->
-+    <actionGroup name="AdminAssertCustomerDefaultShippingAddress" >
-+        <arguments>
-+            <argument name="firstName" type="string" defaultValue=""/>
-+            <argument name="lastName" type="string" defaultValue=""/>
-+            <argument name="street1" type="string" defaultValue=""/>
-+            <argument name="state" type="string" defaultValue="" />
-+            <argument name="postcode" type="string" defaultValue=""/>
-+            <argument name="country" type="string" defaultValue=""/>
-+            <argument name="telephone" type="string" defaultValue=""/>
-+        </arguments>
-+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
-+        <see userInput="{{firstName}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="firstName"/>
-+        <see userInput="{{lastName}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="lastName"/>
-+        <see userInput="{{street1}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="street1"/>
-+        <see userInput="{{state}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="state"/>
-+        <see userInput="{{postcode}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="postcode"/>
-+        <see userInput="{{country}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="country"/>
-+        <see userInput="{{telephone}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="telephone"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerGroupOnCustomerFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerGroupOnCustomerFormActionGroup.xml
-new file mode 100644
-index 00000000000..3112f2b3efe
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerGroupOnCustomerFormActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAssertCustomerGroupOnCustomerForm">
-+        <arguments>
-+            <argument name="customerGroupName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="amOnCustomerCreatePage"/>
-+        <waitForElementVisible selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="waitForElementVisible"/>
-+        <see selector="{{AdminCustomerAccountInformationSection.group}}" userInput="{{customerGroupName}}" stepKey="assertCustomerGroupPresent"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerGroupOnProductFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerGroupOnProductFormActionGroup.xml
-new file mode 100644
-index 00000000000..0f6d6a5fcfd
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerGroupOnProductFormActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAssertCustomerGroupOnProductForm">
-+        <arguments>
-+            <argument name="customerGroupName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="amOnProductCreatePage"/>
-+        <waitForElementVisible selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="waitForAdvancedPricingLinkVisible"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>
-+        <waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForAddButtonVisible"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickAddButton"/>
-+        <see selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{customerGroupName}}" stepKey="assertCustomerGroupPresent"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerGroupPresentInGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerGroupPresentInGridActionGroup.xml
-new file mode 100644
-index 00000000000..248c93a16de
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerGroupPresentInGridActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAssertCustomerGroupPresentInGrid" extends="AdminFilterCustomerGroupByNameActionGroup">
-+        <!--- Assume we are on admin customer group page. -->
-+        <see  selector="{{AdminDataGridTableSection.column('Group')}}" userInput="{{customerGroupName}}"  after="clickApplyFiltersButton" stepKey="seeCustomerGroupNameInGrid"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersGridActionGroup.xml
-new file mode 100644
-index 00000000000..d7529b3bdd5
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersGridActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Assert customer info in customers grid row -->
-+    <actionGroup name="AdminAssertCustomerInCustomersGrid">
-+        <arguments>
-+            <argument name="text" type="string"/>
-+            <argument name="row" type="string"/>
-+        </arguments>
-+        <see selector="{{AdminCustomerGridSection.gridRow(row)}}" userInput="{{text}}"  stepKey="seeCustomerInGrid"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerNoDefaultBillingAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerNoDefaultBillingAddressActionGroup.xml
-new file mode 100644
-index 00000000000..5557025c4b1
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerNoDefaultBillingAddressActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert Customer Have No Default Billing Address -->
-+    <actionGroup name="AdminAssertCustomerNoDefaultBillingAddress" >
-+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
-+        <see userInput="The customer does not have default billing address" selector="{{AdminCustomerAddressesDefaultBillingSection.address}}" stepKey="see"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerNoDefaultShippingAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerNoDefaultShippingAddressActionGroup.xml
-new file mode 100644
-index 00000000000..e33ebbb96ee
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerNoDefaultShippingAddressActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert Customer Have No Default Shipping Address -->
-+    <actionGroup name="AdminAssertCustomerNoDefaultShippingAddress" >
-+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
-+        <see userInput="The customer does not have default shipping address" selector="{{AdminCustomerAddressesDefaultShippingSection.address}}" stepKey="see"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertErrorMessageCustomerGroupAlreadyExistsActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertErrorMessageCustomerGroupAlreadyExistsActionGroup.xml
-new file mode 100644
-index 00000000000..5eb52630d90
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertErrorMessageCustomerGroupAlreadyExistsActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAssertErrorMessageCustomerGroupAlreadyExists" extends="AdminCreateCustomerGroupActionGroup">
-+        <remove keyForRemoval="seeCustomerGroupSaveMessage"/>
-+        <waitForElementVisible selector="{{AdminMessagesSection.errorMessage}}" stepKey="waitForElementVisible"/>
-+        <see selector="{{AdminMessagesSection.errorMessage}}" userInput="Customer Group already exists." stepKey="seeErrorMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertNumberOfRecordsInCustomersAddressGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertNumberOfRecordsInCustomersAddressGridActionGroup.xml
-new file mode 100644
-index 00000000000..390f723d91f
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertNumberOfRecordsInCustomersAddressGridActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Assert number of records in customer address grid -->
-+    <actionGroup name="AdminAssertNumberOfRecordsInCustomersAddressGrid">
-+        <arguments>
-+            <argument name="number" type="string"/>
-+        </arguments>
-+        <see userInput="{{number}} records found" selector="{{AdminCustomerAddressesGridActionsSection.headerRow}}" stepKey="seeRecords"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminConfigCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminConfigCustomerActionGroup.xml
-new file mode 100644
-index 00000000000..8a3ab706869
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminConfigCustomerActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="SetCustomerDataLifetimeActionGroup">
-+        <arguments>
-+            <argument name="minutes" defaultValue="60" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCustomerConfigPage.url('#customer_online_customers-link')}}" stepKey="openCustomerConfigPage"/>
-+        <fillField userInput="{{minutes}}" selector="{{AdminCustomerConfigSection.customerDataLifetime}}" stepKey="fillCustomerDataLifetime"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
-+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerGroupActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerGroupActionGroup.xml
-new file mode 100644
-index 00000000000..ba984a4d825
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerGroupActionGroup.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateCustomerGroupActionGroup">
-+        <arguments>
-+            <argument name="groupName" type="string"/>
-+            <argument name="taxClass" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminNewCustomerGroupPage.url}}" stepKey="goToNewCustomerGroupPage"/>
-+        <waitForPageLoad stepKey="waitForNewCustomerGroupPageLoad"/>
-+
-+        <!--Set tax class for customer group-->
-+        <fillField stepKey="fillGroupName" selector="{{AdminNewCustomerGroupSection.groupName}}" userInput="{{groupName}}"/>
-+        <selectOption selector="{{AdminNewCustomerGroupSection.taxClass}}" userInput="{{taxClass}}" stepKey="selectTaxClassOption"/>
-+        <click selector="{{AdminNewCustomerGroupSection.saveCustomerGroup}}" stepKey="clickToSaveCustomerGroup"/>
-+        <waitForPageLoad stepKey="waitForCustomerGroupSaved"/>
-+        <see stepKey="seeCustomerGroupSaveMessage" userInput="You saved the customer group."/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
-new file mode 100644
-index 00000000000..02366415d9e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
-@@ -0,0 +1,65 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateCustomerWithWebsiteAndStoreViewActionGroup">
-+        <arguments>
-+            <argument name="customerData"/>
-+            <argument name="address"/>
-+            <argument name="website" type="string"/>
-+            <argument name="storeView" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersPage"/>
-+        <click stepKey="addNewCustomer" selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}"/>
-+        <selectOption stepKey="selectWebSite" selector="{{AdminCustomerAccountInformationSection.associateToWebsite}}" userInput="{{website}}"/>
-+        <fillField stepKey="FillFirstName" selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{customerData.firstname}}"/>
-+        <fillField stepKey="FillLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{customerData.lastname}}"/>
-+        <fillField stepKey="FillEmail" selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{customerData.email}}"/>
-+        <selectOption stepKey="selectStoreView" selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{storeView}}"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfThePage"/>
-+        <click stepKey="saveCustomer" selector="{{AdminCustomerAccountInformationSection.saveCustomerAndContinueEdit}}"/>
-+        <waitForPageLoad stepKey="waitForCustomersPage"/>
-+        <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>
-+        <click stepKey="goToAddresses" selector="{{AdminCustomerAccountInformationSection.addressesButton}}"/>
-+        <waitForPageLoad stepKey="waitForAddresses"/>
-+        <click stepKey="clickOnAddNewAddress" selector="{{AdminCustomerAddressesSection.addNewAddress}}"/>
-+        <waitForPageLoad stepKey="waitForAddressFields"/>
-+        <click stepKey="thickBillingAddress" selector="{{AdminCustomerAddressesSection.defaultBillingAddress}}"/>
-+        <click stepKey="thickShippingAddress" selector="{{AdminCustomerAddressesSection.defaultShippingAddress}}"/>
-+        <fillField stepKey="fillFirstNameForAddress" selector="{{AdminCustomerAddressesSection.firstNameForAddress}}" userInput="{{address.firstname}}"/>
-+        <fillField stepKey="fillLastNameForAddress" selector="{{AdminCustomerAddressesSection.lastNameForAddress}}" userInput="{{address.lastname}}"/>
-+        <fillField stepKey="fillStreetAddress" selector="{{AdminCustomerAddressesSection.streetAddress}}" userInput="{{address.street[0]}}"/>
-+        <fillField stepKey="fillCity" selector="{{AdminCustomerAddressesSection.city}}" userInput="{{address.city}}"/>
-+        <selectOption stepKey="selectCountry" selector="{{AdminCustomerAddressesSection.country}}" userInput="{{address.country}}"/>
-+        <selectOption stepKey="selectState" selector="{{AdminCustomerAddressesSection.state}}" userInput="{{address.state}}"/>
-+        <fillField stepKey="fillZip" selector="{{AdminCustomerAddressesSection.zip}}" userInput="{{address.postcode}}"/>
-+        <fillField stepKey="fillPhoneNumber" selector="{{AdminCustomerAddressesSection.phoneNumber}}" userInput="{{address.telephone}}"/>
-+        <click stepKey="saveAddress" selector="{{AdminCustomerAddressesSection.saveAddress}}"/>
-+        <waitForPageLoad stepKey="waitForAddressSave"/>
-+    </actionGroup>
-+
-+    <actionGroup name="AdminCreateCustomerWithWebSiteAndGroup">
-+        <arguments>
-+            <argument name="customerData" defaultValue="Simple_US_Customer"/>
-+            <argument name="website" type="string" defaultValue="{{_defaultWebsite.name}}"/>
-+            <argument name="storeView" type="string" defaultValue="{{_defaultStore.name}}"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersPage"/>
-+        <click stepKey="addNewCustomer" selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}"/>
-+        <selectOption stepKey="selectWebSite" selector="{{AdminCustomerAccountInformationSection.associateToWebsite}}" userInput="{{website}}"/>
-+        <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="{{customerData.group}}" stepKey="selectCustomerGroup"/>
-+        <fillField stepKey="FillFirstName" selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{customerData.firstname}}"/>
-+        <fillField stepKey="FillLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{customerData.lastname}}"/>
-+        <fillField stepKey="FillEmail" selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{customerData.email}}"/>
-+        <selectOption stepKey="selectStoreView" selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{storeView}}"/>
-+        <waitForElement selector="{{AdminCustomerAccountInformationSection.storeView}}" stepKey="waitForCustomerStoreViewExpand"/>
-+        <click stepKey="save" selector="{{AdminCustomerAccountInformationSection.saveCustomer}}"/>
-+        <waitForPageLoad stepKey="waitForCustomersPage"/>
-+        <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerGridActionGroup.xml
-new file mode 100644
-index 00000000000..86039056999
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerGridActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminFilterCustomerByEmail">
-+        <arguments>
-+            <argument name="email" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomerIndexPage"/>
-+        <waitForPageLoad stepKey="waitToCustomerIndexPageToLoad"/>
-+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerIndexPage"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
-+        <fillField userInput="{{email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
-+        <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerSaveAndContinueActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerSaveAndContinueActionGroup.xml
-new file mode 100644
-index 00000000000..03b950a6dbe
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerSaveAndContinueActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Save Customer and Assert Success Message -->
-+    <actionGroup name="AdminCustomerSaveAndContinue" >
-+        <click selector="{{AdminCustomerMainActionsSection.saveAndContinue}}" stepKey="saveAndContinue"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerShopingCartActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerShopingCartActionGroup.xml
-new file mode 100644
-index 00000000000..f5d5682e374
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerShopingCartActionGroup.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAddProductToShoppingCartActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{AdminCustomerShoppingCartProductItemSection.productItem}}" stepKey="waitForElementVisible"/>
-+        <click selector="{{AdminCustomerShoppingCartProductItemSection.productItem}}" stepKey="expandProductItem"/>
-+        <waitForElementVisible selector="{{AdminCustomerShoppingCartProductItemSection.productNameFilter}}" stepKey="waitForProductFilterFieldVisible"/>
-+        <fillField selector="{{AdminCustomerShoppingCartProductItemSection.productNameFilter}}" stepKey="setProductName"  userInput="{{productName}}"/>
-+        <click selector="{{AdminCustomerShoppingCartProductItemSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForAjaxLoad stepKey="waitForAjax"/>
-+        <waitForElementVisible selector="{{AdminCustomerShoppingCartProductItemSection.firstProductCheckbox}}" stepKey="waitForElementCheckboxVisible"/>
-+        <click selector="{{AdminCustomerShoppingCartProductItemSection.firstProductCheckbox}}" stepKey="selectFirstCheckbox"/>
-+        <click selector="{{AdminCustomerShoppingCartProductItemSection.addSelectionsToMyCartButton}}" stepKey="clickAddSelectionsToMyCartButton" after="selectFirstCheckbox"/>
-+        <waitForAjaxLoad stepKey="waitForAjax2"/>
-+        <seeElement stepKey="seeAddedProduct" selector="{{AdminCustomerShoppingCartProductItemSection.addedProductName('productName')}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteAddressInCustomersAddressGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteAddressInCustomersAddressGridActionGroup.xml
-new file mode 100644
-index 00000000000..b61b353714e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteAddressInCustomersAddressGridActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Delete customer address from grid row, row starts at 0 -->
-+    <actionGroup name="AdminDeleteAddressInCustomersAddressGrid">
-+        <arguments>
-+            <argument name="row" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminCustomerAddressesGridSection.checkboxByRow(row)}}" stepKey="clickRowCustomerAddressCheckbox"/>
-+        <click selector="{{AdminCustomerAddressesGridSection.selectLinkByRow(row)}}" stepKey="openActionsDropdown"/>
-+        <click selector="{{AdminCustomerAddressesGridSection.deleteLinkByRow(row)}}" stepKey="chooseDeleteOption"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad"/>
-+        <click selector="{{AdminCustomerAddressesGridActionsSection.ok}}" stepKey="clickOkOnPopup"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml
-new file mode 100644
-index 00000000000..d08f10b2241
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminDeleteCustomerActionGroup">
-+        <arguments>
-+            <argument name="customerEmail"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomersPage"/>
-+        <conditionalClick selector="{{AdminCustomerFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
-+        <click stepKey="chooseCustomer" selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(customerEmail)}}"/>
-+        <click stepKey="openActions" selector="{{AdminCustomerGridMainActionsSection.actions}}"/>
-+        <waitForPageLoad stepKey="waitActions"/>
-+        <click stepKey="delete" selector="{{AdminCustomerGridMainActionsSection.delete}}"/>
-+        <waitForPageLoad stepKey="waitForConfirmationAlert"/>
-+        <click stepKey="accept" selector="{{AdminCustomerGridMainActionsSection.ok}}"/>
-+        <see stepKey="seeSuccessMessage" userInput="were deleted."/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerGroupActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerGroupActionGroup.xml
-new file mode 100644
-index 00000000000..788e5f8967f
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerGroupActionGroup.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminDeleteCustomerGroupActionGroup">
-+        <arguments>
-+            <argument name="customerGroupName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCustomerGroupsIndexPage.url}}" stepKey="goToAdminCustomerGroupIndexPage"/>
-+        <waitForPageLoad time="30" stepKey="waitForCustomerGroupIndexPageLoad"/>
-+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerGroupIndexPage"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
-+        <fillField userInput="{{customerGroupName}}" selector="{{AdminDataGridHeaderSection.filterFieldInput('customer_group_code')}}" stepKey="fillNameFieldOnFiltersSection"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminCustomerGroupGridActionsSection.selectButton(customerGroupName)}}" stepKey="clickSelectButton"/>
-+        <click selector="{{AdminCustomerGroupGridActionsSection.deleteAction(customerGroupName)}}" stepKey="clickOnDeleteItem"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDeleteCustomerGroup"/>
-+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressNoZipNoStateActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressNoZipNoStateActionGroup.xml
-new file mode 100644
-index 00000000000..954b83bead1
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressNoZipNoStateActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminEditCustomerAddressNoZipNoState" extends="AdminEditCustomerAddressesFrom">
-+        <remove keyForRemoval="selectState"/>
-+        <remove keyForRemoval="fillZipCode"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.defaultBillingAddressButton}}" stepKey="setDefaultBilling" before="setDefaultShipping"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.defaultShippingAddressButton}}" stepKey="setDefaultShipping" before="fillPrefixName"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressSetDefaultShippingAndBillingActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressSetDefaultShippingAndBillingActionGroup.xml
-new file mode 100644
-index 00000000000..0c1af1cb5b6
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressSetDefaultShippingAndBillingActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminEditCustomerAddressSetDefaultShippingAndBilling" extends="AdminEditCustomerAddressesFrom">
-+        <click selector="{{AdminEditCustomerAddressesSection.defaultBillingAddressButton}}" stepKey="setDefaultBilling" before="setDefaultShipping"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.defaultShippingAddressButton}}" stepKey="setDefaultShipping" before="fillPrefixName"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressesFromActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressesFromActionGroup.xml
-new file mode 100644
-index 00000000000..9c38f23739b
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressesFromActionGroup.xml
-@@ -0,0 +1,51 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Same as "EditCustomerAddressesFromAdminActionGroup" but taking country and state from input "customerAddress" -->
-+    <actionGroup name="AdminEditCustomerAddressesFrom" >
-+        <arguments>
-+            <argument name="customerAddress" type="entity"/>
-+        </arguments>
-+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.addNewAddress}}" stepKey="addNewAddresses"/>
-+        <waitForPageLoad time="60" stepKey="wait5678" />
-+        <fillField  stepKey="fillPrefixName" userInput="{{customerAddress.prefix}}" selector="{{AdminEditCustomerAddressesSection.prefixName}}"/>
-+        <fillField  stepKey="fillMiddleName" userInput="{{customerAddress.middlename}}" selector="{{AdminEditCustomerAddressesSection.middleName}}"/>
-+        <fillField  stepKey="fillSuffixName" userInput="{{customerAddress.suffix}}" selector="{{AdminEditCustomerAddressesSection.suffixName}}"/>
-+        <fillField  stepKey="fillCompany" userInput="{{customerAddress.company}}" selector="{{AdminEditCustomerAddressesSection.company}}"/>
-+        <fillField  stepKey="fillStreetAddress" userInput="{{customerAddress.street[0]}}" selector="{{AdminEditCustomerAddressesSection.streetAddress}}"/>
-+        <fillField  stepKey="fillCity" userInput="{{customerAddress.city}}" selector="{{AdminEditCustomerAddressesSection.city}}"/>
-+        <selectOption stepKey="selectCountry" selector="{{AdminEditCustomerAddressesSection.country}}" userInput="{{customerAddress.country_id}}"/>
-+        <selectOption stepKey="selectState" selector="{{AdminEditCustomerAddressesSection.state}}" userInput="{{customerAddress.state}}"/>
-+        <fillField  stepKey="fillZipCode" userInput="{{customerAddress.postcode}}" selector="{{AdminEditCustomerAddressesSection.zipCode}}"/>
-+        <fillField  stepKey="fillPhone" userInput="{{customerAddress.telephone}}" selector="{{AdminEditCustomerAddressesSection.phone}}"/>
-+        <fillField  stepKey="fillVAT" userInput="{{customerAddress.vat_id}}" selector="{{AdminEditCustomerAddressesSection.vat}}"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="saveAddress"/>
-+        <waitForPageLoad stepKey="waitForAddressSaved"/>
-+    </actionGroup>
-+    <actionGroup name="AdminEditCustomerAddressSetDefaultShippingAndBilling" extends="AdminEditCustomerAddressesFrom">
-+        <click selector="{{AdminEditCustomerAddressesSection.defaultBillingAddressButton}}" stepKey="setDefaultBilling" before="setDefaultShipping"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.defaultShippingAddressButton}}" stepKey="setDefaultShipping" before="fillPrefixName"/>
-+    </actionGroup>
-+    <actionGroup name="AdminEditCustomerAddressNoZipNoState" extends="AdminEditCustomerAddressesFrom">
-+        <remove keyForRemoval="selectState"/>
-+        <remove keyForRemoval="fillZipCode"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.defaultBillingAddressButton}}" stepKey="setDefaultBilling" before="setDefaultShipping"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.defaultShippingAddressButton}}" stepKey="setDefaultShipping" before="fillPrefixName"/>
-+    </actionGroup>
-+    <actionGroup name="SelectDropdownCustomerAddressAttributeValueActionGroup">
-+        <arguments>
-+            <argument name="customerAddressAttribute"/>
-+            <argument name="optionValue" type="string"/>
-+        </arguments>
-+        <selectOption selector="{{AdminEditCustomerAddressesSection.dropDownAttribute(customerAddressAttribute.code)}}" userInput="{{optionValue}}" stepKey="selectOptionValue"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="saveAddress"/>
-+        <waitForPageLoad stepKey="waitForAddressSaved"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerInformationFromActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerInformationFromActionGroup.xml
-new file mode 100644
-index 00000000000..ddeefeb3c37
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerInformationFromActionGroup.xml
-@@ -0,0 +1,28 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Edit Customer Account Information Required Fields in Admin -->
-+    <actionGroup name="AdminEditCustomerAccountInformationActionGroup" >
-+        <arguments>
-+            <argument name="firstName" type="string"/>
-+            <argument name="lastName" type="string"/>
-+            <argument name="email" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" stepKey="goToAccountInformation"/>
-+        <clearField stepKey="clearFirstName" selector="{{AdminCustomerAccountInformationSection.firstName}}"/>
-+        <fillField  stepKey="fillFirstName" userInput="{{firstName}}" selector="{{AdminCustomerAccountInformationSection.firstName}}"/>
-+        <clearField stepKey="clearLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}"/>
-+        <fillField  stepKey="fillLastName" userInput="{{lastName}}" selector="{{AdminCustomerAccountInformationSection.lastName}}"/>
-+        <clearField stepKey="clearEmail" selector="{{AdminCustomerAccountInformationSection.email}}"/>
-+        <fillField  stepKey="fillEmail" userInput="{{email}}" selector="{{AdminCustomerAccountInformationSection.email}}"/>
-+        <click selector="{{AdminCustomerMainActionsSection.saveAndContinue}}" stepKey="saveAndContinue"/>
-+        <waitForPageLoad stepKey="wait"/>
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerAddressGridByPhoneNumberActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerAddressGridByPhoneNumberActionGroup.xml
-new file mode 100644
-index 00000000000..2d0d44a4cc5
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerAddressGridByPhoneNumberActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Filter customer address grid by phone number -->
-+    <actionGroup name="AdminFilterCustomerAddressGridByPhoneNumber">
-+        <arguments>
-+            <argument name="phone" type="string"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
-+        <click selector="{{AdminCustomerAddressFiltersSection.filtersButton}}" stepKey="openFilters"/>
-+        <fillField selector="{{AdminCustomerAddressFiltersSection.telephoneInput}}" userInput="{{phone}}" stepKey="fill"/>
-+        <click selector="{{AdminCustomerAddressFiltersSection.applyFilter}}" stepKey="clickApplyFilters"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerByNameActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerByNameActionGroup.xml
-new file mode 100644
-index 00000000000..c49a0dbe20a
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerByNameActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminFilterCustomerByName">
-+        <arguments>
-+            <argument name="customerName" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerGroupIndexPage"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
-+        <fillField userInput="{{customerName}}" selector="{{AdminDataGridHeaderSection.filterFieldInput('name')}}" stepKey="fillNameFieldOnFiltersSection"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerGridByEmailActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerGridByEmailActionGroup.xml
-new file mode 100644
-index 00000000000..9cab8a790ff
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerGridByEmailActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Filter customer grid by the email -->
-+    <actionGroup name="AdminFilterCustomerGridByEmail">
-+        <arguments>
-+            <argument name="email" type="string"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminCustomerFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
-+        <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilters"/>
-+        <fillField selector="{{AdminCustomerFiltersSection.emailInput}}" userInput="{{email}}" stepKey="fillEmail"/>
-+        <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="clickApplyFilters"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerGroupByNameActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerGroupByNameActionGroup.xml
-new file mode 100644
-index 00000000000..1681a8e850c
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerGroupByNameActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminFilterCustomerGroupByNameActionGroup">
-+        <arguments>
-+            <argument name="customerGroupName" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerGroupIndexPage"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
-+        <fillField userInput="{{customerGroupName}}" selector="{{AdminDataGridHeaderSection.filterFieldInput('customer_group_code')}}" stepKey="fillNameFieldOnFiltersSection"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenCustomerEditPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenCustomerEditPageActionGroup.xml
-new file mode 100644
-index 00000000000..8e6b56b19d6
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenCustomerEditPageActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenCustomerEditPageActionGroup">
-+        <arguments>
-+            <argument name="customerId" type="string" />
-+        </arguments>
-+        <amOnPage url="{{AdminEditCustomerPage.url(customerId)}}" stepKey="openCustomerEditPage" />
-+        <waitForPageLoad stepKey="waitForPageLoad" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminResetFilterInCustomerAddressGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminResetFilterInCustomerAddressGridActionGroup.xml
-new file mode 100644
-index 00000000000..135f0107841
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminResetFilterInCustomerAddressGridActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Reset customers grid filter and to default view -->
-+    <actionGroup name="AdminResetFilterInCustomerAddressGrid">
-+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
-+        <click selector="{{AdminCustomerAddressFiltersSection.viewDropdown}}" stepKey="openViewBookmarksTab"/>
-+        <click selector="{{AdminCustomerAddressFiltersSection.viewBookmark('Default View')}}" stepKey="resetToDefaultGridView"/>
-+        <waitForPageLoad stepKey="waitForGridLoad"/>
-+        <see selector="{{AdminCustomerFiltersSection.viewDropdown}}" userInput="Default View" stepKey="seeDefaultViewSelected"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminResetFilterInCustomerGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminResetFilterInCustomerGridActionGroup.xml
-new file mode 100644
-index 00000000000..5c6ff347d56
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminResetFilterInCustomerGridActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Reset customers grid filter and to default view -->
-+    <actionGroup name="AdminResetFilterInCustomerGrid">
-+        <conditionalClick selector="{{AdminCustomerFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
-+        <click selector="{{AdminCustomerFiltersSection.viewDropdown}}" stepKey="openViewBookmarksTab"/>
-+        <click selector="{{AdminCustomerFiltersSection.viewBookmark('Default View')}}" stepKey="resetToDefaultGridView"/>
-+        <waitForPageLoad stepKey="waitForGridLoad"/>
-+        <see selector="{{AdminCustomerFiltersSection.viewDropdown}}" userInput="Default View" stepKey="seeDefaultViewSelected"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAddressActionGroup.xml
-new file mode 100644
-index 00000000000..e47aa8809f0
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAddressActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSaveCustomerAddressActionGroup">
-+        <click selector="{{StorefrontCustomerAddressFormSection.saveAddress}}" stepKey="saveCustomerAddress"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You saved the address." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAndAssertSuccessMessageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAndAssertSuccessMessageActionGroup.xml
-new file mode 100644
-index 00000000000..d3907e96b0d
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAndAssertSuccessMessageActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Save Customer and Assert Success Message -->
-+    <actionGroup name="AdminSaveCustomerAndAssertSuccessMessage" >
-+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
-+        <see userInput="You saved the customer" selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="seeMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSelectAllCustomersActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSelectAllCustomersActionGroup.xml
-new file mode 100644
-index 00000000000..1a8b4da67e7
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSelectAllCustomersActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSelectAllCustomers">
-+        <checkOption selector="{{AdminCustomerGridMainActionsSection.multicheck}}" stepKey="checkAllCustomers"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSelectCustomerByEmailActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSelectCustomerByEmailActionGroup.xml
-new file mode 100644
-index 00000000000..bb84d578fd9
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSelectCustomerByEmailActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSelectCustomerByEmail">
-+        <arguments>
-+            <argument name="customerEmail" type="string"/>
-+        </arguments>
-+        <checkOption selector="{{AdminCustomerGridSection.customerCheckboxByEmail(customerEmail)}}" stepKey="checkCustomerBox"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml
-new file mode 100644
-index 00000000000..b1b82fb9fb7
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml
-@@ -0,0 +1,38 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminUpdateCustomerGroupByEmailActionGroup">
-+        <arguments>
-+            <argument name="emailAddress"/>
-+            <argument name="customerGroup" type="string"/>
-+        </arguments>
-+
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomerPage01"/>
-+
-+        <!-- Start of Action Group: searchAdminDataGridByKeyword -->
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters0"/>
-+        <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{emailAddress}}" stepKey="fillKeywordSearchField01"/>
-+        <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickKeywordSearch01"/>
-+        <waitForPageLoad stepKey="waitForPageLoad02"/>
-+        <!-- End of Action Group: searchAdminDataGridByKeyword -->
-+
-+        <click selector="{{AdminGridRow.editByValue(emailAddress)}}" stepKey="clickOnCustomer01"/>
-+        <waitForPageLoad stepKey="waitForPageLoad03"/>
-+
-+        <conditionalClick selector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" dependentSelector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" visible="true" stepKey="clickOnAccountInformation01"/>
-+        <waitForPageLoad stepKey="waitForPageLoad04"/>
-+
-+        <click selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="clickOnCustomerGroup01"/>
-+        <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="{{customerGroup}}" stepKey="selectCustomerGroup01"/>
-+
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickOnSave01"/>
-+        <waitForPageLoad stepKey="waitForPageLoad05"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAuthorizationPopUpPasswordAutoCompleteOffActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAuthorizationPopUpPasswordAutoCompleteOffActionGroup.xml
-new file mode 100644
-index 00000000000..186d0244e8c
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAuthorizationPopUpPasswordAutoCompleteOffActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertAuthorizationPopUpPasswordAutoCompleteOffActionGroup">
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.password}}" stepKey="waitPasswordFieldVisible"/>
-+        <assertElementContainsAttribute selector="{{StorefrontCustomerSignInPopupFormSection.password}}" attribute="autocomplete" expectedValue="off" stepKey="assertAuthorizationPopupPasswordAutocompleteOff"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerAccountPageTitleActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerAccountPageTitleActionGroup.xml
-new file mode 100644
-index 00000000000..132b5ca8188
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerAccountPageTitleActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCustomerAccountPageTitleActionGroup">
-+        <arguments>
-+            <argument name="pageTitle" type="string" />
-+        </arguments>
-+        <see selector="{{StorefrontCustomerAccountMainSection.pageTitle}}" userInput="{{pageTitle}}" stepKey="assertPageTitle" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerGroupNotInGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerGroupNotInGridActionGroup.xml
-new file mode 100644
-index 00000000000..26c4f23fc9a
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerGroupNotInGridActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCustomerGroupNotInGridActionGroup">
-+        <arguments>
-+            <argument name="customerGroup" type="entity" />
-+        </arguments>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="cleanFilters"/>
-+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerGroupIndexPage"/>
-+        <fillField userInput="{{customerGroup.code}}" selector="{{AdminDataGridHeaderSection.filterFieldInput('customer_group_code')}}" stepKey="fillNameFieldOnFiltersSection"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerGroupNotOnProductFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerGroupNotOnProductFormActionGroup.xml
-new file mode 100644
-index 00000000000..94e01db5c1f
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerGroupNotOnProductFormActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCustomerGroupNotOnProductFormActionGroup">
-+        <arguments>
-+            <argument name="customerGroup" type="entity" />
-+        </arguments>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>
-+        <waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupAllGroupsQty1PriceDiscountAnd10percent"/>
-+        <grabMultiple selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelectOptions('0')}}" stepKey="customerGroups" />
-+        <assertNotContains stepKey="assertCustomerGroupNotInOptions">
-+            <actualResult type="variable">customerGroups</actualResult>
-+            <expectedResult type="string">{{customerGroup.code}}</expectedResult>
-+        </assertNotContains>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerGroupOnCustomerFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerGroupOnCustomerFormActionGroup.xml
-new file mode 100644
-index 00000000000..2c8e0081e5e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerGroupOnCustomerFormActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCustomerGroupOnCustomerFormActionGroup">
-+        <arguments>
-+            <argument name="customerGroup" type="entity" />
-+        </arguments>
-+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" stepKey="clickOnAccountInfoTab" />
-+        <waitForPageLoad stepKey="waitForPageLoad" />
-+        <seeOptionIsSelected userInput="{{customerGroup.code}}" selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="verifyNeededCustomerGroupSelected" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerLoggedInActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerLoggedInActionGroup.xml
-new file mode 100644
-index 00000000000..d2d4d86d7f9
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerLoggedInActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+        
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCustomerWelcomeMessageActionGroup">
-+        <arguments>
-+            <argument name="customerFullName" type="string" />
-+        </arguments>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see userInput="Welcome, {{customerFullName}}!" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="verifyMessage" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerResetPasswordActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerResetPasswordActionGroup.xml
-new file mode 100644
-index 00000000000..644254443d1
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerResetPasswordActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCustomerResetPasswordActionGroup">
-+        <arguments>
-+            <argument name="url" type="string"/>
-+            <argument name="message" type="string" defaultValue="" />
-+            <argument name="messageType" type="string" defaultValue="success" />
-+        </arguments>
-+
-+        <waitForElementVisible selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}" stepKey="waitForMessage" />
-+        <see stepKey="seeMessage" userInput="{{message}}" selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}"/>
-+        <seeInCurrentUrl stepKey="seeCorrectCurrentUrl" url="{{url}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerChangeAccountInfoActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerChangeAccountInfoActionGroup.xml
-new file mode 100644
-index 00000000000..ab48184ed98
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerChangeAccountInfoActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+        
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertMessageCustomerChangeAccountInfoActionGroup">
-+        <arguments>
-+            <argument name="message" type="string" defaultValue="You saved the account information." />
-+            <argument name="messageType" type="string" defaultValue="success" />
-+        </arguments>
-+        <see userInput="{{message}}" selector="{{StorefrontCustomerAccountMainSection.messageByType(messageType)}}" stepKey="verifyMessage" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerCreateAccountActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerCreateAccountActionGroup.xml
-new file mode 100644
-index 00000000000..65c9b025a9c
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerCreateAccountActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+        
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertMessageCustomerCreateAccountActionGroup">
-+        <arguments>
-+            <argument name="message" type="string" defaultValue="Thank you for registering with Main Website Store." />
-+            <argument name="messageType" type="string" defaultValue="success" />
-+        </arguments>
-+        <see userInput="{{message}}" selector="{{StorefrontCustomerAccountMainSection.messageByType(messageType)}}" stepKey="verifyMessage" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerLoginActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerLoginActionGroup.xml
-new file mode 100644
-index 00000000000..6b886619858
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerLoginActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+        
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertMessageCustomerLoginActionGroup">
-+        <arguments>
-+            <argument name="message" type="string" defaultValue="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." />
-+            <argument name="messageType" type="string" defaultValue="error" />
-+        </arguments>
-+        <see userInput="{{message}}" selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerSavedCardActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerSavedCardActionGroup.xml
-new file mode 100644
-index 00000000000..94cd759e5ce
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerSavedCardActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontCustomerSavedCardActionGroup">
-+        <arguments>
-+            <argument name="card" type="entity" defaultValue="StoredPaymentMethods"/>
-+        </arguments>
-+        <see selector="{{StorefrontCustomerStoredPaymentMethodsSection.cardNumber}}" userInput="{{card.cardNumberEnding}}" stepKey="verifyCardNumber"/>
-+        <see selector="{{StorefrontCustomerStoredPaymentMethodsSection.expirationDate}}" userInput="{{card.cardExpire}}" stepKey="verifyCardExpire"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontPasswordAutocompleteOffActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontPasswordAutocompleteOffActionGroup.xml
-new file mode 100644
-index 00000000000..23a067cd94e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontPasswordAutocompleteOffActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontPasswordAutoCompleteOffActionGroup">
-+        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-+        <assertElementContainsAttribute selector="{{StorefrontCustomerSignInFormSection.passwordField}}" attribute="autocomplete" expectedValue="off" stepKey="assertSignInPasswordAutocompleteOff"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
-new file mode 100644
-index 00000000000..047f656f5ea
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
-@@ -0,0 +1,44 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="CreateCustomerActionGroup">
-+        <click stepKey="openCustomers" selector="{{AdminMenuSection.customers}}"/>
-+        <waitForAjaxLoad stepKey="waitForCatalogSubmenu" time="5"/>
-+        <click stepKey="clickOnAllCustomers" selector="{{CustomersSubmenuSection.allCustomers}}"/>
-+        <waitForPageLoad stepKey="waitForProductsPage" time="10"/>
-+        <click stepKey="addNewCustomer" selector="{{CustomersPageSection.addNewCustomerButton}}"/>
-+        <waitForPageLoad stepKey="waitForNewProductPage" time="10"/>
-+        <click stepKey="AssociateToWebsite" selector="{{NewCustomerPageSection.associateToWebsite}}"/>
-+        <click stepKey="Group" selector="{{NewCustomerPageSection.group}}"/>
-+        <fillField stepKey="FillFirstName" selector="{{NewCustomerPageSection.firstName}}" userInput="{{NewCustomerData.FirstName}}"/>
-+        <fillField stepKey="FillLastName" selector="{{NewCustomerPageSection.lastName}}" userInput="{{NewCustomerData.LastName}}"/>
-+        <fillField stepKey="FillEmail" selector="{{NewCustomerPageSection.email}}" userInput="{{NewCustomerData.Email}}"/>
-+        <scrollToTopOfPage stepKey="scrollToAddresses"/>
-+        <click stepKey="goToAddresses" selector="{{NewCustomerPageSection.addresses}}"/>
-+        <waitForAjaxLoad stepKey="waitForAddresses" time="5"/>
-+        <click stepKey="AddNewAddress" selector="{{NewCustomerPageSection.addNewAddress}}"/>
-+        <waitForPageLoad stepKey="waitForAddressFields" time="5"/>
-+        <click stepKey="thickBillingAddress" selector="{{NewCustomerPageSection.defaultBillingAddress}}"/>
-+        <click stepKey="thickShippingAddress" selector="{{NewCustomerPageSection.defaultShippingAddress}}"/>
-+        <fillField stepKey="fillFirstNameForAddress" selector="{{NewCustomerPageSection.firstNameForAddress}}" userInput="{{NewCustomerData.AddressFirstName}}"/>
-+        <fillField stepKey="fillLastNameForAddress" selector="{{NewCustomerPageSection.lastNameForAddress}}" userInput="{{NewCustomerData.AddressLastName}}"/>
-+        <fillField stepKey="fillStreetAddress" selector="{{NewCustomerPageSection.streetAddress}}" userInput="{{NewCustomerData.StreetAddress}}"/>
-+        <fillField stepKey="fillCity" selector="{{NewCustomerPageSection.city}}" userInput="{{NewCustomerData.City}}"/>
-+        <click stepKey="openCountry" selector="{{NewCustomerPageSection.country}}"/>
-+        <waitForAjaxLoad stepKey="waitForCountryList" time="5"/>
-+        <click stepKey="chooseCountry" selector="{{NewCustomerPageSection.countryArmenia}}"/>
-+        <fillField stepKey="fillZip" selector="{{NewCustomerPageSection.zip}}" userInput="{{NewCustomerData.Zip}}"/>
-+        <fillField stepKey="fillPhoneNumber" selector="{{NewCustomerPageSection.phoneNumber}}" userInput="{{NewCustomerData.PhoneNumber}}"/>
-+        <waitForPageLoad stepKey="wait" time="10"/>
-+        <click stepKey="save" selector="{{NewCustomerPageSection.saveCustomer}}"/>
-+        <waitForPageLoad stepKey="waitForCustomersPage" time="10"/>
-+        <waitForElementVisible selector="{{NewCustomerPageSection.createdSuccessMessage}}" stepKey="waitForSuccessfullyCreatedMessage" time="20"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
-new file mode 100644
-index 00000000000..06659dae156
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
-@@ -0,0 +1,46 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="DeleteCustomerActionGroup">
-+        <arguments>
-+            <argument name="lastName" defaultValue=""/>
-+        </arguments>
-+        <!--Clear filter if exist-->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingCustomerFilters"/>
-+
-+        <click stepKey="chooseCustomer" selector="{{CustomersPageSection.customerCheckbox(lastName)}}"/>
-+        <waitForAjaxLoad stepKey="waitForThick" time="2"/>
-+        <click stepKey="OpenActions" selector="{{CustomersPageSection.actions}}"/>
-+        <waitForAjaxLoad stepKey="waitForDelete" time="5"/>
-+        <click stepKey="ChooseDelete" selector="{{CustomersPageSection.delete}}"/>
-+        <waitForPageLoad stepKey="waitForDeleteItemPopup" time="10"/>
-+        <click stepKey="clickOnOk" selector="{{CustomersPageSection.ok}}"/>
-+        <waitForElementVisible stepKey="waitForSuccessfullyDeletedMessage" selector="{{CustomersPageSection.deletedSuccessMessage}}" time="10"/>
-+    </actionGroup>
-+    <actionGroup name="DeleteCustomerByEmailActionGroup">
-+        <arguments>
-+            <argument name="email" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-+        <waitForPageLoad stepKey="waitForAdminCustomerPageLoad"/>
-+        <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="clickFilterButton"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
-+        <waitForPageLoad stepKey="waitForClearFilters"/>
-+        <fillField selector="{{AdminCustomerFiltersSection.emailInput}}" userInput="{{email}}" stepKey="filterEmail"/>
-+        <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminCustomerGridSection.selectFirstRow}}" stepKey="clickOnEditButton1"/>
-+        <click selector="{{CustomersPageSection.actions}}" stepKey="clickActionsDropdown"/>
-+        <click selector="{{CustomersPageSection.delete}}" stepKey="clickDelete"/>
-+        <waitForElementVisible selector="{{CustomersPageSection.ok}}" stepKey="waitForOkToVisible"/>
-+        <click selector="{{CustomersPageSection.ok}}" stepKey="clickOkConfirmationButton"/>
-+        <waitForElementVisible stepKey="waitForSuccessfullyDeletedMessage" selector="{{CustomersPageSection.deletedSuccessMessage}}" time="30"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
-new file mode 100644
-index 00000000000..617c895bc12
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
-@@ -0,0 +1,31 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="EditCustomerAddressesFromAdminActionGroup" >
-+        <arguments>
-+            <argument name="customerAddress"/>
-+        </arguments>
-+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.addNewAddress}}" stepKey="addNewAddresses"/>
-+        <waitForPageLoad time="60" stepKey="wait5678" />
-+        <fillField  stepKey="fillPrefixName" userInput="{{customerAddress.prefix}}" selector="{{AdminEditCustomerAddressesSection.prefixName}}"/>
-+        <fillField  stepKey="fillMiddleName" userInput="{{customerAddress.middlename}}" selector="{{AdminEditCustomerAddressesSection.middleName}}"/>
-+        <fillField  stepKey="fillSuffixName" userInput="{{customerAddress.suffix}}" selector="{{AdminEditCustomerAddressesSection.suffixName}}"/>
-+        <fillField  stepKey="fillCompany" userInput="{{customerAddress.company}}" selector="{{AdminEditCustomerAddressesSection.company}}"/>
-+        <fillField  stepKey="fillStreetAddress" userInput="{{customerAddress.street}}" selector="{{AdminEditCustomerAddressesSection.streetAddress}}"/>
-+        <fillField  stepKey="fillCity" userInput="{{customerAddress.city}}" selector="{{AdminEditCustomerAddressesSection.city}}"/>
-+        <selectOption stepKey="selectCountry" selector="{{AdminEditCustomerAddressesSection.country}}" userInput="{{US_Address_CA.country_id}}"/>
-+        <selectOption stepKey="selectState" selector="{{AdminEditCustomerAddressesSection.state}}" userInput="{{US_Address_CA.state}}"/>
-+        <fillField  stepKey="fillZipCode" userInput="{{customerAddress.postcode}}" selector="{{AdminEditCustomerAddressesSection.zipCode}}"/>
-+        <fillField  stepKey="fillPhone" userInput="{{customerAddress.telephone}}" selector="{{AdminEditCustomerAddressesSection.phone}}"/>
-+        <fillField  stepKey="fillVAT" userInput="{{customerAddress.vat_id}}" selector="{{AdminEditCustomerAddressesSection.vat}}"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="saveAddress"/>
-+        <waitForPageLoad stepKey="waitForAddressSaved"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillCustomerSignInPopupFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillCustomerSignInPopupFormActionGroup.xml
-new file mode 100644
-index 00000000000..56e9cfa2c0a
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillCustomerSignInPopupFormActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="FillCustomerSignInPopupFormActionGroup" >
-+        <arguments>
-+            <argument name="customer" type="entity"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.email}}" stepKey="waitEmailFieldVisible"/>
-+        <fillField selector="{{StorefrontCustomerSignInPopupFormSection.email}}" userInput="{{customer.email}}" stepKey="fillCustomerEmail"/>
-+        <fillField selector="{{StorefrontCustomerSignInPopupFormSection.password}}" userInput="{{customer.password}}" stepKey="fillCustomerPassword"/>
-+        <click selector="{{StorefrontCustomerSignInPopupFormSection.signIn}}" stepKey="clickSignIn"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillNewCustomerAddressRequiredFieldsActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillNewCustomerAddressRequiredFieldsActionGroup.xml
-new file mode 100644
-index 00000000000..c533d1a6e55
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillNewCustomerAddressRequiredFieldsActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="FillNewCustomerAddressRequiredFieldsActionGroup">
-+        <arguments>
-+            <argument name="address" type="entity"/>
-+        </arguments>
-+        <fillField selector="{{StorefrontCustomerAddressFormSection.firstName}}" userInput="{{address.firstname}}" stepKey="fillFirstName"/>
-+        <fillField selector="{{StorefrontCustomerAddressFormSection.lastName}}" userInput="{{address.lastname}}" stepKey="fillLastName"/>
-+        <fillField selector="{{StorefrontCustomerAddressFormSection.phoneNumber}}" userInput="{{address.telephone}}" stepKey="fillPhoneNumber"/>
-+        <fillField selector="{{StorefrontCustomerAddressFormSection.streetAddress}}" userInput="{{address.street[0]}}" stepKey="fillStreetAddress"/>
-+        <fillField selector="{{StorefrontCustomerAddressFormSection.city}}" userInput="{{address.city}}" stepKey="fillCity"/>
-+        <selectOption selector="{{StorefrontCustomerAddressFormSection.state}}" userInput="{{address.state}}" stepKey="selectState"/>
-+        <fillField selector="{{StorefrontCustomerAddressFormSection.zip}}" userInput="{{address.postcode}}" stepKey="fillZip"/>
-+        <selectOption selector="{{StorefrontCustomerAddressFormSection.country}}" userInput="{{address.country}}" stepKey="selectCountry"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
-index 1a4e9071d30..703b9f542f8 100644
---- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
-@@ -6,14 +6,17 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="LoginToStorefrontActionGroup">
-         <arguments>
-             <argument name="Customer"/>
-         </arguments>
--        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
--        <fillField  stepKey="fillEmail" userInput="{{Customer.email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
--        <fillField  stepKey="fillPassword" userInput="{{Customer.password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
--        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-+        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
-+        <waitForPageLoad time="30" stepKey="waitPageFullyLoaded"/>
-+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="waitFormAppears"/>
-+        <fillField userInput="{{Customer.email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
-+        <fillField userInput="{{Customer.password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
-+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
-+        <waitForPageLoad stepKey="waitForCustomerLoggedIn" />
-     </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontWithEmailAndPasswordActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontWithEmailAndPasswordActionGroup.xml
-new file mode 100644
-index 00000000000..07145000105
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontWithEmailAndPasswordActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="LoginToStorefrontWithEmailAndPassword">
-+        <arguments>
-+            <argument name="email" type="string"/>
-+            <argument name="password" type="string"/>
-+        </arguments>
-+        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-+        <waitForPageLoad stepKey="wait"/>
-+        <fillField  stepKey="fillEmail" userInput="{{email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-+        <fillField  stepKey="fillPassword" userInput="{{password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-+        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateCustomerActionGroup.xml
-new file mode 100644
-index 00000000000..be639d245f0
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateCustomerActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="NavigateToAllCustomerPage">
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateCustomerGroupActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateCustomerGroupActionGroup.xml
-new file mode 100644
-index 00000000000..076797f3491
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateCustomerGroupActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="NavigateToCustomerGroupPage">
-+        <amOnPage url="{{AdminCustomerGroupPage.url}}" stepKey="openCustomersGridPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateThroughCustomerTabsActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateThroughCustomerTabsActionGroup.xml
-new file mode 100644
-index 00000000000..5591bee5296
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateThroughCustomerTabsActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="NavigateThroughCustomerTabsActionGroup">
-+        <arguments>
-+            <argument name="navigationItemName" type="string" />
-+        </arguments>
-+        <click selector="{{StorefrontCustomerSidebarSection.sidebarTab(navigationItemName)}}" stepKey="clickOnDesiredNavItem" />
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
-old mode 100644
-new mode 100755
-index 3d6e0fb54b0..208f4f51e38
---- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
-@@ -6,18 +6,57 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="OpenEditCustomerFromAdminActionGroup">
-         <arguments>
-             <argument name="customer"/>
-         </arguments>
-         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
--        <waitForPageLoad stepKey="waitForPageLoad1" />
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
-         <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
-         <fillField userInput="{{customer.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
-         <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
--        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-         <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEdit"/>
--        <waitForPageLoad stepKey="waitForPageLoad2" />
-+        <waitForPageLoad stepKey="waitForPageLoad3"/>
-+    </actionGroup>
-+    <actionGroup name="OpenEditCustomerAddressFromAdminActionGroup">
-+        <arguments>
-+            <argument name="address"/>
-+        </arguments>
-+        <click selector="{{AdminCustomerAccountInformationSection.addressesButton}}" stepKey="openAddressesTab"/>
-+        <waitForElementVisible selector="{{AdminCustomerAddressFiltersSection.filtersButton}}" stepKey="waitForComponentLoad"/>
-+        <click selector="{{AdminCustomerAddressFiltersSection.filtersButton}}" stepKey="openAddressesFilter"/>
-+        <fillField userInput="{{address.firstname}}" selector="{{AdminCustomerAddressFiltersSection.firstnameInput}}" stepKey="fillFirstname"/>
-+        <fillField userInput="{{address.lastname}}" selector="{{AdminCustomerAddressFiltersSection.lastnameInput}}" stepKey="fillLastname"/>
-+        <fillField userInput="{{address.telephone}}" selector="{{AdminCustomerAddressFiltersSection.telephoneInput}}" stepKey="fillCountry"/>
-+        <fillField userInput="{{address.postcode}}" selector="{{AdminCustomerAddressFiltersSection.postcodeInput}}" stepKey="fillPostcode"/>
-+        <click selector="{{AdminCustomerAddressFiltersSection.applyFilter}}" stepKey="applyAddressesFilter"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-+        <click selector="{{AdminCustomerAddressGridSection.firstRowSelectActionLink}}" stepKey="clickAction"/>
-+        <click selector="{{AdminCustomerAddressGridSection.firstRowEditActionLink}}" stepKey="clickEdit"/>
-+        <waitForPageLoad stepKey="waitForModalWindow" />
-+    </actionGroup>
-+    <actionGroup name="DeleteCustomerFromAdminActionGroup">
-+        <arguments>
-+            <argument name="customer" defaultValue="CustomerEntityOne"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
-+        <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{customer.email}}" stepKey="fillSearch"/>
-+        <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickSubmit"/>
-+        <waitForAjaxLoad stepKey="waitForLoadAjax"/>
-+        <click selector="{{AdminCustomerGridMainActionsSection.multicheck}}" stepKey="selectAll"/>
-+        <click selector="{{AdminCustomerGridMainActionsSection.actions}}" stepKey="clickActions"/>
-+        <click selector="{{AdminCustomerGridMainActionsSection.delete}}" stepKey="clickDelete"/>
-+        <waitForAjaxLoad stepKey="waitForLoadConfirmation"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="A total of 1 record(s) were deleted" stepKey="seeSuccess"/>
-+    </actionGroup>
-+    <actionGroup name="AdminClearCustomersFiltersActionGroup">
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="amOnCustomersPage"/>
-+        <waitForPageLoad stepKey="WaitForPageToLoad"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
-     </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenMyAccountPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenMyAccountPageActionGroup.xml
-new file mode 100644
-index 00000000000..6ca0f612dee
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenMyAccountPageActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="OpenMyAccountPageActionGroup">
-+        <click selector="{{LoggedInCustomerHeaderLinksSection.customerDropdownMenu}}" stepKey="openCustomerDropdownMenu"/>
-+        <click selector="{{LoggedInCustomerHeaderLinksSection.myAccount}}" stepKey="clickOnMyAccount"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenStorefrontStoredPaymentMethodsPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenStorefrontStoredPaymentMethodsPageActionGroup.xml
-new file mode 100644
-index 00000000000..9975431e9fe
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenStorefrontStoredPaymentMethodsPageActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="OpenStorefrontCustomerStoredPaymentMethodsPageActionGroup">
-+        <amOnPage url="{{StorefrontCustomerStoredPaymentMethodsPage.url}}" stepKey="goToCustomerStoredPaymentMethodsPage"/>
-+        <waitForPageLoad stepKey="waitForCustomerStoredPaymentMethodsPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SetGroupCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SetGroupCustomerActionGroup.xml
-new file mode 100644
-index 00000000000..ca5e16c4ddb
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SetGroupCustomerActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="SetCustomerGroupForSelectedCustomersViaGrid">
-+        <arguments>
-+            <argument name="groupName" type="string"/>
-+        </arguments>
-+        <click selector="{{CustomersPageSection.actions}}" stepKey="clickActions"/>
-+        <click selector="{{CustomersPageSection.actionItem('Assign a Customer Group')}}" stepKey="clickAssignAction"/>
-+        <executeJS function="document.getElementsByClassName('action-menu _active')[0].scrollBy(0, 10000)" stepKey="scrollToGroup"/>
-+        <click selector="{{CustomersPageSection.assignGroup(groupName)}}" stepKey="selectGroup"/>
-+        <waitForPageLoad stepKey="waitAfterSelectingGroup"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptModal"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
-index de8418774f7..da018871339 100644
---- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
-@@ -6,13 +6,12 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="SignUpNewUserFromStorefrontActionGroup">
-         <arguments>
--            <argument name="Customer"/>
-+            <argument name="Customer" defaultValue="CustomerEntityOne"/>
-         </arguments>
--        <amOnPage stepKey="amOnStorefrontPage"  url="/"/>
--        <waitForPageLoad stepKey="waitForStorefrontPage"/>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
-         <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
-         <fillField  stepKey="fillFirstName" userInput="{{Customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
-         <fillField  stepKey="fillLastName" userInput="{{Customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>
-@@ -25,12 +24,52 @@
-         <see stepKey="seeLastName" userInput="{{Customer.lastname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-         <see stepKey="seeEmail" userInput="{{Customer.email}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-     </actionGroup>
--    
-+
-+    <actionGroup name="StorefrontCreateCustomerSignedUpNewsletterActionGroup">
-+        <arguments>
-+            <argument name="customer" defaultValue="CustomerEntityOne"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForNavigateToCustomersPageLoad"/>
-+        <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
-+        <fillField  stepKey="fillFirstName" userInput="{{customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
-+        <fillField  stepKey="fillLastName" userInput="{{customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>
-+        <checkOption selector="{{StorefrontCustomerCreateFormSection.signUpForNewsletter}}" stepKey="checkSignUpForNewsletter"/>
-+        <fillField  stepKey="fillEmail" userInput="{{customer.email}}" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
-+        <fillField  stepKey="fillPassword" userInput="{{customer.password}}" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
-+        <fillField  stepKey="fillConfirmPassword" userInput="{{customer.password}}" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
-+        <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
-+        <waitForPageLoad stepKey="waitForCreateAccountButtonToLoad" />
-+    </actionGroup>
-+
-+    <actionGroup name="StorefrontFillRegistrationFormActionGroup" extends="StorefrontCreateCustomerSignedUpNewsletterActionGroup">
-+        <remove keyForRemoval="checkSignUpForNewsletter"/>
-+        <remove keyForRemoval="clickCreateAccountButton"/>
-+        <remove keyForRemoval="waitForCreateAccountButtonToLoad"/>
-+    </actionGroup>
-+
-+    <actionGroup name="SaveRegistrationFormActionGroup">
-+        <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
-+        <waitForPageLoad stepKey="waitForCreateAccountButtonToLoad" />
-+    </actionGroup>
-+
-+    <actionGroup name="AssertSignedUpNewsletterActionGroup">
-+        <arguments>
-+            <argument name="customer" defaultValue="CustomerEntityOne"/>
-+            <argument name="storeName" defaultValue="Main Website" type="string"/>
-+        </arguments>
-+        <see stepKey="successMessage" userInput="Thank you for registering with {{storeName}} Store." selector="{{AdminCustomerMessagesSection.successMessage}}"/>
-+        <see stepKey="seeFirstName" userInput="{{customer.firstname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-+        <see stepKey="seeLastName" userInput="{{customer.lastname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-+        <see stepKey="seeEmail" userInput="{{customer.email}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-+        <seeInCurrentUrl url="{{StorefrontCustomerDashboardPage.url}}" stepKey="seeAssertInCurrentUrl"/>
-+    </actionGroup>
-+
-     <actionGroup name="EnterCustomerAddressInfo">
-         <arguments>
-             <argument name="Address"/>
-         </arguments>
--        
-+
-         <amOnPage url="customer/address/new/" stepKey="goToAddressPage"/>
-         <waitForPageLoad stepKey="waitForAddressPage"/>
-         <fillField stepKey="fillFirstName" selector="{{StorefrontCustomerAddressSection.firstName}}" userInput="{{Address.firstname}}"/>
-@@ -40,10 +79,91 @@
-         <fillField stepKey="fillStreetAddress1" selector="{{StorefrontCustomerAddressSection.streetAddress1}}" userInput="{{Address.street[0]}}"/>
-         <fillField stepKey="fillStreetAddress2" selector="{{StorefrontCustomerAddressSection.streetAddress2}}" userInput="{{Address.street[1]}}"/>
-         <fillField stepKey="fillCityName" selector="{{StorefrontCustomerAddressSection.city}}" userInput="{{Address.city}}"/>
-+        <selectOption stepKey="selectCounty" selector="{{StorefrontCustomerAddressSection.country}}" userInput="{{Address.country_id}}"/>
-         <selectOption stepKey="selectState" selector="{{StorefrontCustomerAddressSection.stateProvince}}" userInput="{{Address.state}}"/>
-         <fillField stepKey="fillZip" selector="{{StorefrontCustomerAddressSection.zip}}" userInput="{{Address.postcode}}"/>
--        <selectOption stepKey="selectCounty" selector="{{StorefrontCustomerAddressSection.country}}" userInput="{{Address.country_id}}"/>
--        
-         <click stepKey="saveAddress" selector="{{StorefrontCustomerAddressSection.saveAddress}}"/>
-     </actionGroup>
-+    <!-- Fills State Field instead of selecting it-->
-+    <actionGroup name="EnterCustomerAddressInfoFillState" extends="EnterCustomerAddressInfo">
-+        <fillField stepKey="selectState" selector="{{StorefrontCustomerAddressSection.stateProvinceFill}}" userInput="{{Address.state}}"/>
-+    </actionGroup>
-+
-+    <actionGroup name="VerifyCustomerBillingAddress">
-+        <arguments>
-+            <argument name="address"/>
-+        </arguments>
-+        <amOnPage url="customer/address/index/" stepKey="goToAddressPage"/>
-+        <waitForPageLoad stepKey="waitForAddressPageLoad"/>
-+        <!--Verify customer default billing address-->
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.firstname}} {{address.lastname}}" stepKey="seeAssertCustomerDefaultBillingAddressFirstnameAndLastname"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.company}}" stepKey="seeAssertCustomerDefaultBillingAddressCompany"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.street[0]}}" stepKey="seeAssertCustomerDefaultBillingAddressStreet"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.street[1]}}" stepKey="seeAssertCustomerDefaultBillingAddressStreet1"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.city}}, {{address.postcode}}" stepKey="seeAssertCustomerDefaultBillingAddressCityAndPostcode"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.country}}" stepKey="seeAssertCustomerDefaultBillingAddressCountry"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.telephone}}" stepKey="seeAssertCustomerDefaultBillingAddressTelephone"/>
-+    </actionGroup>
-+    <actionGroup name="VerifyCustomerShippingAddress">
-+        <arguments>
-+            <argument name="address"/>
-+        </arguments>
-+        <amOnPage url="customer/address/index/" stepKey="goToAddressPage"/>
-+        <waitForPageLoad stepKey="waitForAddressPageLoad"/>
-+        <!--Verify customer default shipping address-->
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.firstname}} {{address.lastname}}" stepKey="seeAssertCustomerDefaultShippingAddressFirstnameAndLastname"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.company}}" stepKey="seeAssertCustomerDefaultShippingAddressCompany"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.street[0]}}" stepKey="seeAssertCustomerDefaultShippingAddressStreet"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.street[1]}}" stepKey="seeAssertCustomerDefaultShippingAddressStreet1"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.city}}, {{address.postcode}}" stepKey="seeAssertCustomerDefaultShippingAddressCityAndPostcode"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.country}}" stepKey="seeAssertCustomerDefaultShippingAddressCountry"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.telephone}}" stepKey="seeAssertCustomerDefaultShippingAddressTelephone"/>
-+    </actionGroup>
-+    <actionGroup name="VerifyCustomerBillingAddressWithState">
-+        <arguments>
-+            <argument name="address"/>
-+        </arguments>
-+        <amOnPage url="customer/address/index/" stepKey="goToAddressPage"/>
-+        <waitForPageLoad stepKey="waitForAddressPageLoad"/>
-+        <!--Verify customer default billing address-->
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.firstname}} {{address.lastname}}" stepKey="seeAssertCustomerDefaultBillingAddressFirstnameAndLastname"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.company}}" stepKey="seeAssertCustomerDefaultBillingAddressCompany"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.street[0]}}" stepKey="seeAssertCustomerDefaultBillingAddressStreet"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.street[1]}}" stepKey="seeAssertCustomerDefaultBillingAddressStreet1"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.city}}, {{address.state}}, {{address.postcode}}" stepKey="seeAssertCustomerDefaultBillingAddressCityAndPostcode"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.country}}" stepKey="seeAssertCustomerDefaultBillingAddressCountry"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" userInput="{{address.telephone}}" stepKey="seeAssertCustomerDefaultBillingAddressTelephone"/>
-+    </actionGroup>
-+    <actionGroup name="VerifyCustomerShippingAddressWithState">
-+        <arguments>
-+            <argument name="address"/>
-+        </arguments>
-+        <amOnPage url="customer/address/index/" stepKey="goToAddressPage"/>
-+        <waitForPageLoad stepKey="waitForAddressPageLoad"/>
-+        <!--Verify customer default shipping address-->
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.firstname}} {{address.lastname}}" stepKey="seeAssertCustomerDefaultShippingAddressFirstnameAndLastname"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.company}}" stepKey="seeAssertCustomerDefaultShippingAddressCompany"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.street[0]}}" stepKey="seeAssertCustomerDefaultShippingAddressStreet"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.street[1]}}" stepKey="seeAssertCustomerDefaultShippingAddressStreet1"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.city}}, {{address.state}}, {{address.postcode}}" stepKey="seeAssertCustomerDefaultShippingAddressCityAndPostcode"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.country}}" stepKey="seeAssertCustomerDefaultShippingAddressCountry"/>
-+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="{{address.telephone}}" stepKey="seeAssertCustomerDefaultShippingAddressTelephone"/>
-+    </actionGroup>
-+    <actionGroup name="VerifyCustomerNameOnFrontend">
-+        <arguments>
-+            <argument name="customer"/>
-+        </arguments>
-+        <!--Verify customer name on frontend-->
-+        <amOnPage url="customer/account/edit/" stepKey="goToAddressPage"/>
-+        <waitForPageLoad stepKey="waitForAddressPageLoad"/>
-+        <click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('Account Information')}}" stepKey="clickAccountInformationFromSidebarCurrentTab"/>
-+        <waitForPageLoad stepKey="waitForAccountInformationTabToOpen"/>
-+        <seeInField selector="{{StorefrontCustomerAccountInformationSection.firstName}}" userInput="{{customer.firstname}}" stepKey="seeAssertCustomerFirstName"/>
-+        <seeInField selector="{{StorefrontCustomerAccountInformationSection.lastName}}" userInput="{{customer.lastname}}" stepKey="seeAssertCustomerLastName"/>
-+    </actionGroup>
-+
-+    <actionGroup name="SignUpNewCustomerStorefrontActionGroup" extends="SignUpNewUserFromStorefrontActionGroup">
-+        <waitForPageLoad stepKey="waitForRegistered" after="clickCreateAccountButton"/>
-+        <remove keyForRemoval="seeThankYouMessage"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddCustomerAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddCustomerAddressActionGroup.xml
-new file mode 100644
-index 00000000000..a45fcf31f7b
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddCustomerAddressActionGroup.xml
-@@ -0,0 +1,48 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAddNewCustomerAddressActionGroup">
-+        <amOnPage url="customer/address/new/" stepKey="OpenCustomerAddNewAddress"/>
-+        <arguments>
-+            <argument name="Address"/>
-+        </arguments>
-+        <fillField  stepKey="fillFirstName" userInput="{{Address.firstname}}" selector="{{StorefrontCustomerAddressFormSection.firstName}}"/>
-+        <fillField  stepKey="fillLastName" userInput="{{Address.lastname}}" selector="{{StorefrontCustomerAddressFormSection.lastName}}"/>
-+        <fillField  stepKey="fillCompanyName" userInput="{{Address.company}}" selector="{{StorefrontCustomerAddressFormSection.company}}"/>
-+        <fillField  stepKey="fillPhoneNumber" userInput="{{Address.telephone}}" selector="{{StorefrontCustomerAddressFormSection.phoneNumber}}"/>
-+        <fillField  stepKey="fillStreetAddress" userInput="{{Address.street[0]}}" selector="{{StorefrontCustomerAddressFormSection.streetAddress}}"/>
-+        <fillField  stepKey="fillCity" userInput="{{Address.city}}" selector="{{StorefrontCustomerAddressFormSection.city}}"/>
-+        <selectOption  stepKey="selectState" userInput="{{Address.state}}" selector="{{StorefrontCustomerAddressFormSection.state}}"/>
-+        <fillField  stepKey="fillZip" userInput="{{Address.postcode}}" selector="{{StorefrontCustomerAddressFormSection.zip}}"/>
-+        <selectOption  stepKey="selectCountry" userInput="{{Address.country}}" selector="{{StorefrontCustomerAddressFormSection.country}}"/>
-+        <click stepKey="saveCustomerAddress" selector="{{StorefrontCustomerAddressFormSection.saveAddress}}"/>
-+        <see userInput="You saved the address." stepKey="verifyAddressAdded"/>
-+    </actionGroup>
-+    <actionGroup name="StorefrontAddCustomerDefaultAddressActionGroup">
-+        <amOnPage url="customer/address/new/" stepKey="OpenCustomerAddNewAddress"/>
-+        <arguments>
-+            <argument name="Address"/>
-+        </arguments>
-+        <fillField  stepKey="fillFirstName" userInput="{{Address.firstname}}" selector="{{StorefrontCustomerAddressFormSection.firstName}}"/>
-+        <fillField  stepKey="fillLastName" userInput="{{Address.lastname}}" selector="{{StorefrontCustomerAddressFormSection.lastName}}"/>
-+        <fillField  stepKey="fillCompanyName" userInput="{{Address.company}}" selector="{{StorefrontCustomerAddressFormSection.company}}"/>
-+        <fillField  stepKey="fillPhoneNumber" userInput="{{Address.telephone}}" selector="{{StorefrontCustomerAddressFormSection.phoneNumber}}"/>
-+        <fillField  stepKey="fillStreetAddress" userInput="{{Address.street[0]}}" selector="{{StorefrontCustomerAddressFormSection.streetAddress}}"/>
-+        <fillField  stepKey="fillCity" userInput="{{Address.city}}" selector="{{StorefrontCustomerAddressFormSection.city}}"/>
-+        <selectOption  stepKey="selectState" userInput="{{Address.state}}" selector="{{StorefrontCustomerAddressFormSection.state}}"/>
-+        <fillField  stepKey="fillZip" userInput="{{Address.postcode}}" selector="{{StorefrontCustomerAddressFormSection.zip}}"/>
-+        <selectOption  stepKey="selectCountry" userInput="{{Address.country}}" selector="{{StorefrontCustomerAddressFormSection.country}}"/>
-+        <click stepKey="checkUseAsDefaultBillingAddressCheckBox" selector="{{StorefrontCustomerAddressFormSection.useAsDefaultBillingAddressCheckBox}}"/>
-+        <click stepKey="checkUseAsDefaultShippingAddressCheckBox" selector="{{StorefrontCustomerAddressFormSection.useAsDefaultShippingAddressCheckBox}}"/>
-+        <click stepKey="saveCustomerAddress" selector="{{StorefrontCustomerAddressFormSection.saveAddress}}"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see userInput="You saved the address." stepKey="verifyAddressAdded"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertRegistrationPageFieldsActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertRegistrationPageFieldsActionGroup.xml
-new file mode 100644
-index 00000000000..d76277d2e5e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertRegistrationPageFieldsActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertRegistrationPageFields">
-+        <seeInCurrentUrl url="{{StorefrontCustomerCreatePage.url}}" stepKey="seeCreateNewCustomerAccountPage"/>
-+        <seeElement selector="{{StorefrontCustomerCreateFormSection.firstnameField}}" stepKey="seeFirstNameField"/>
-+        <seeElement selector="{{StorefrontCustomerCreateFormSection.lastnameField}}" stepKey="seeFLastNameField"/>
-+        <seeElement selector="{{StorefrontCustomerCreateFormSection.emailField}}" stepKey="seeEmailField"/>
-+        <seeElement selector="{{StorefrontCustomerCreateFormSection.passwordField}}" stepKey="seePasswordField"/>
-+        <seeElement selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" stepKey="seeConfirmPasswordField"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertSuccessLoginToStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertSuccessLoginToStorefrontActionGroup.xml
-new file mode 100644
-index 00000000000..475702ad692
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertSuccessLoginToStorefrontActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertSuccessLoginToStorefront" extends="LoginToStorefrontActionGroup">
-+        <arguments>
-+            <argument name="Customer" type="entity"/>
-+        </arguments>
-+        <see stepKey="assertWelcome" userInput="{{Customer.firstname}}" selector="{{StorefrontPanelHeaderSection.customerWelcome}}" after="clickSignInAccountButton"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup.xml
-new file mode 100644
-index 00000000000..dfb9d1b2c25
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup">
-+        <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}" />
-+        <waitForPageLoad stepKey="waitForCustomerSaved" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickSignInButtonActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickSignInButtonActionGroup.xml
-new file mode 100644
-index 00000000000..b12858fc103
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickSignInButtonActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontClickSignInButtonActionGroup">
-+        <click stepKey="signIn" selector="{{StorefrontPanelHeaderSection.customerLoginLink}}" />
-+        <waitForPageLoad stepKey="waitForStorefrontSignInPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickSignOnCustomerLoginFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickSignOnCustomerLoginFormActionGroup.xml
-new file mode 100644
-index 00000000000..9cd52b841fc
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickSignOnCustomerLoginFormActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontClickSignOnCustomerLoginFormActionGroup">
-+        <click stepKey="clickSignInButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" />
-+        <waitForPageLoad stepKey="waitForCustomerSignIn" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
-new file mode 100644
-index 00000000000..c3b92b1af7f
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="CustomerLogoutStorefrontByMenuItemsActionGroup">
-+        <conditionalClick selector="{{StorefrontPanelHeaderSection.customerWelcomeMenu}}"
-+                          dependentSelector="{{StorefrontPanelHeaderSection.customerLogoutLink}}"
-+                          visible="false"
-+                          stepKey="clickHeaderCustomerMenuButton" />
-+        <click selector="{{StorefrontPanelHeaderSection.customerLogoutLink}}" stepKey="clickSignOutButton" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookContainsActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookContainsActionGroup.xml
-new file mode 100644
-index 00000000000..8385dc17ecf
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookContainsActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Go to Address Book -->
-+    <actionGroup name="StorefrontCustomerAddressBookContains">
-+        <arguments>
-+            <argument name="text" type="string"/>
-+        </arguments>
-+        <see userInput="{{text}}" selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="containsText"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookNotContainsActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookNotContainsActionGroup.xml
-new file mode 100644
-index 00000000000..afef2d9a04e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookNotContainsActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Go to Address Book -->
-+    <actionGroup name="StorefrontCustomerAddressBookNotContains">
-+        <arguments>
-+            <argument name="text" type="string"/>
-+        </arguments>
-+        <dontSee userInput="{{text}}" selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="doesNotContainsText"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookNumberOfAddressesActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookNumberOfAddressesActionGroup.xml
-new file mode 100644
-index 00000000000..febc482d62e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookNumberOfAddressesActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Go to Address Book -->
-+    <actionGroup name="StorefrontCustomerAddressBookNumberOfAddresses">
-+        <arguments>
-+            <argument name="number" type="string"/>
-+        </arguments>
-+        <see userInput="{{number}} Item" selector="{{StorefrontCustomerAddressesSection.numberOfAddresses}}" stepKey="checkNumberOfAddresses"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailActionGroup.xml
-new file mode 100644
-index 00000000000..844d13aa1fe
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+        
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontCustomerChangeEmailActionGroup">
-+        <arguments>
-+            <argument name="email" type="string" />
-+            <argument name="password" type="string" />
-+        </arguments>
-+        <conditionalClick selector="{{StorefrontCustomerSidebarSection.sidebarTab('Account Information')}}" dependentSelector="{{StorefrontCustomerSidebarSection.sidebarTab('Account Information')}}" visible="true" stepKey="openAccountInfoTab" />
-+        <waitForPageLoad stepKey="waitForAccountInfoTabOpened" />
-+        <checkOption selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox" />
-+        <fillField selector="{{StorefrontCustomerAccountInformationSection.email}}" userInput="{{email}}" stepKey="fillEmail" />
-+        <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="{{password}}" stepKey="fillCurrentPassword" />
-+        <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="saveChange" />
-+        <waitForPageLoad stepKey="waitForPageLoaded" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerGoToSidebarMenuActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerGoToSidebarMenuActionGroup.xml
-new file mode 100644
-index 00000000000..84d2f353b51
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerGoToSidebarMenuActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Go to Address Book -->
-+    <actionGroup name="StorefrontCustomerGoToSidebarMenu">
-+        <arguments>
-+            <argument name="menu" type="string"/>
-+        </arguments>
-+        <click selector="{{StorefrontCustomerSidebarSection.sidebarTab(menu)}}" stepKey="goToAddressBook"/>
-+        <waitForPageLoad stepKey="waitForPageLoad" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerLogoutActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerLogoutActionGroup.xml
-new file mode 100644
-index 00000000000..295346875e3
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerLogoutActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontCustomerLogoutActionGroup">
-+        <amOnPage url="{{StorefrontCustomerLogoutPage.url}}" stepKey="storefrontSignOut"/>
-+        <waitForPageLoad stepKey="waitForSignOut"/>
-+    </actionGroup>
-+
-+    <actionGroup name="StorefrontSignOutActionGroup">
-+        <click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
-+        <click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see userInput="You are signed out" stepKey="signOut"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml
-new file mode 100644
-index 00000000000..a28593f1b77
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontCustomerResetPasswordActionGroup">
-+        <arguments>
-+            <argument name="email" type="string" />
-+        </arguments>
-+
-+        <amOnPage stepKey="amOnSignInPage" url="{{StorefrontCustomerSignInPage.url}}"/>
-+        <click stepKey="clickForgotPasswordLink" selector="{{StorefrontCustomerSignInFormSection.forgotPasswordLink}}"/>
-+        <see stepKey="seePageTitle" userInput="Forgot Your Password" selector="{{StorefrontForgotPasswordSection.pageTitle}}"/>
-+        <!-- Enter email and submit the forgot password form -->
-+        <fillField stepKey="fillEmailField" userInput="{{email}}" selector="{{StorefrontForgotPasswordSection.email}}"/>
-+        <click stepKey="clickResetPassword" selector="{{StorefrontForgotPasswordSection.resetMyPasswordButton}}"/>
-+        <waitForPageLoad stepKey="waitForPageLoaded" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormActionGroup.xml
-new file mode 100644
-index 00000000000..62d77d4548c
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontFillCustomerAccountCreationFormActionGroup">
-+        <arguments>
-+            <argument name="customer" type="entity" />
-+        </arguments>
-+
-+        <fillField  stepKey="fillFirstName" userInput="{{customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}" />
-+        <fillField  stepKey="fillLastName"  userInput="{{customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}" />
-+        <fillField  stepKey="fillEmail" userInput="{{customer.email}}" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
-+        <fillField  stepKey="fillPassword" userInput="{{customer.password}}" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
-+        <fillField  stepKey="fillConfirmPassword" userInput="{{customer.password}}" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormActionGroup.xml
-new file mode 100644
-index 00000000000..22883ada7c2
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontFillCustomerLoginFormActionGroup">
-+        <arguments>
-+            <argument name="customer" type="entity" />
-+        </arguments>
-+
-+        <fillField userInput="{{customer.email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
-+        <fillField userInput="{{customer.password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormWithWrongPasswordActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormWithWrongPasswordActionGroup.xml
-new file mode 100644
-index 00000000000..16d7fd197b5
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormWithWrongPasswordActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontFillCustomerLoginFormWithWrongPasswordActionGroup" extends="StorefrontFillCustomerLoginFormActionGroup">
-+        <remove keyForRemoval="fillPassword"/>
-+        <fillField userInput="{{customer.password}}_INCORRECT" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountCreatePageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountCreatePageActionGroup.xml
-new file mode 100644
-index 00000000000..0ae470d0497
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountCreatePageActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+        
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontOpenCustomerAccountCreatePageActionGroup">
-+        <amOnPage url="{{StorefrontCustomerCreatePage.url}}" stepKey="goToCustomerAccountCreatePage"/>
-+        <waitForPageLoad stepKey="waitForPageLoaded"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountInfoEditPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountInfoEditPageActionGroup.xml
-new file mode 100644
-index 00000000000..c1ea2da8a95
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountInfoEditPageActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+        
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontOpenCustomerAccountInfoEditPageActionGroup">
-+        <amOnPage url="{{StorefrontCustomerEditPage.url}}" stepKey="goToCustomerEditPage"/>
-+        <waitForPageLoad stepKey="waitForEditPage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerLoginPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerLoginPageActionGroup.xml
-new file mode 100644
-index 00000000000..0a5c7226552
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerLoginPageActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+        
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontOpenCustomerLoginPageActionGroup">
-+        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoaded"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenMyAccountPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenMyAccountPageActionGroup.xml
-new file mode 100644
-index 00000000000..57c350700d5
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenMyAccountPageActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontOpenMyAccountPageActionGroup">
-+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="goToMyAccountPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontRegisterCustomerFromOrderSuccessPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontRegisterCustomerFromOrderSuccessPageActionGroup.xml
-new file mode 100644
-index 00000000000..5e24592bf01
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontRegisterCustomerFromOrderSuccessPageActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontRegisterCustomerFromOrderSuccessPage">
-+        <arguments>
-+            <argument name="customer" />
-+        </arguments>
-+        <click selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="clickCreateAccountButton"/>
-+        <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{customer.password}}" stepKey="typePassword"/>
-+        <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{customer.password}}" stepKey="typeConfirmationPassword"/>
-+        <click selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}" stepKey="clickOnCreateAccount"/>
-+        <see selector="{{StorefrontMessagesSection.success}}" userInput="Thank you for registering" stepKey="verifyAccountCreated"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
-new file mode 100644
-index 00000000000..85e23940e14
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Sign out-->
-+    <actionGroup name="SignOut">
-+        <click selector="{{SignOutSection.admin}}" stepKey="clickToAdminProfile"/>
-+        <click selector="{{SignOutSection.logout}}" stepKey="clickToLogOut"/>
-+        <waitForPageLoad stepKey="waitForPageLoad" />
-+        <see userInput="You have logged out." stepKey="seeSuccessMessage" />
-+        <waitForElementVisible selector="//*[@data-ui-id='messages-message-success']" stepKey="waitForSuccessMessageLoggedOut" time="5"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/VerifyGroupCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/VerifyGroupCustomerActionGroup.xml
-new file mode 100644
-index 00000000000..712d3a59a21
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/VerifyGroupCustomerActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="VerifyCustomerGroupForCustomer">
-+        <arguments>
-+            <argument name="customerEmail" type="string"/>
-+            <argument name="groupName" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminCustomerGridSection.customerEditLinkByEmail(customerEmail)}}" stepKey="openCustomerPage"/>
-+        <waitForPageLoad stepKey="waitForCustomerPage"/>
-+        <see userInput="{{groupName}}" selector="{{AdminEditCustomerInformationSection.group}}" stepKey="checkCustomerGroup"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
-old mode 100644
-new mode 100755
-index d84dcef5b92..88f86e456e5
---- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
-@@ -7,13 +7,13 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="CustomerAddressSimple" type="address">
-         <data key="id">0</data>
-         <data key="customer_id">12</data>
-         <requiredEntity type="region">CustomerRegionOne</requiredEntity>
-         <data key="region_id">0</data>
--        <data key="country_id">USA</data>
-+        <data key="country_id">US</data>
-         <array key="street">
-             <item>7700 W Parmer Ln</item>
-             <item>Bld D</item>
-@@ -32,6 +32,7 @@
-         <data key="vat_id">vatData</data>
-         <data key="default_shipping">true</data>
-         <data key="default_billing">true</data>
-+        <data key="region_qty">66</data>
-     </entity>
-     <entity name="US_Address_TX" type="address">
-         <data key="firstname">John</data>
-@@ -43,12 +44,29 @@
-         <data key="city">Austin</data>
-         <data key="state">Texas</data>
-         <data key="country_id">US</data>
-+        <data key="country">United States</data>
-         <data key="postcode">78729</data>
-         <data key="telephone">512-345-6789</data>
-         <data key="default_billing">Yes</data>
-         <data key="default_shipping">Yes</data>
-         <requiredEntity type="region">RegionTX</requiredEntity>
-     </entity>
-+    <entity name="US_Address_TX_Default_Billing" type="address">
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="company">Magento</data>
-+        <array key="street">
-+            <item>7700 West Parmer Lane</item>
-+        </array>
-+        <data key="city">Austin</data>
-+        <data key="state">Texas</data>
-+        <data key="country_id">US</data>
-+        <data key="country">United States</data>
-+        <data key="postcode">78729</data>
-+        <data key="telephone">512-345-6789</data>
-+        <data key="default_billing">Yes</data>
-+        <requiredEntity type="region">RegionTX</requiredEntity>
-+    </entity>
-     <entity name="US_Address_NY" type="address">
-         <data key="firstname">John</data>
-         <data key="lastname">Doe</data>
-@@ -65,6 +83,40 @@
-         <data key="default_billing">Yes</data>
-         <data key="default_shipping">Yes</data>
-         <requiredEntity type="region">RegionNY</requiredEntity>
-+        <data key="country">United States</data>
-+    </entity>
-+    <entity name="US_Address_NY_Default_Shipping" type="address">
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="company">368</data>
-+        <array key="street">
-+            <item>368 Broadway St.</item>
-+            <item>113</item>
-+        </array>
-+        <data key="city">New York</data>
-+        <data key="state">New York</data>
-+        <data key="country_id">US</data>
-+        <data key="postcode">10001</data>
-+        <data key="telephone">512-345-6789</data>
-+        <data key="default_shipping">Yes</data>
-+        <requiredEntity type="region">RegionNY</requiredEntity>
-+        <data key="country">United States</data>
-+    </entity>
-+    <entity name="US_Address_NY_Not_Default_Address" type="address">
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="company">368</data>
-+        <array key="street">
-+            <item>368 Broadway St.</item>
-+            <item>Apt. 113</item>
-+        </array>
-+        <data key="city">New York</data>
-+        <data key="state">New York</data>
-+        <data key="country_id">US</data>
-+        <data key="postcode">10001</data>
-+        <data key="telephone">512-345-6789</data>
-+        <requiredEntity type="region">RegionNY</requiredEntity>
-+        <data key="country">United States</data>
-     </entity>
-     <entity name="US_Address_CA" type="address">
-         <data key="firstname">John</data>
-@@ -77,6 +129,7 @@
-         <data key="city">Los Angeles</data>
-         <data key="state">California</data>
-         <data key="country_id">US</data>
-+        <data key="country">United States</data>
-         <data key="postcode">90001</data>
-         <data key="telephone">512-345-6789</data>
-         <data key="default_billing">Yes</data>
-@@ -106,4 +159,143 @@
-         <data key="country_id">GB</data>
-         <data key="telephone">444-44-444-44</data>
-     </entity>
-+    <entity name="US_Address_Utah" type="address">
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="company">Magento</data>
-+        <array key="street">
-+            <item>1234 Some Utah address</item>
-+        </array>
-+        <data key="city">Provo</data>
-+        <data key="state">Utah</data>
-+        <data key="country_id">US</data>
-+        <data key="country">United States</data>
-+        <data key="postcode">84001</data>
-+        <data key="telephone">512-345-6789</data>
-+        <data key="default_billing">Yes</data>
-+        <data key="default_shipping">Yes</data>
-+        <requiredEntity type="region">RegionUT</requiredEntity>
-+    </entity>
-+    <entity name="UK_Simple_Address" extends="UK_Not_Default_Address">
-+        <array key="street">
-+            <item>172, Westminster Bridge Rd</item>
-+            <item>7700 xyz street</item>
-+        </array>
-+        <data key="state">California</data>
-+    </entity>
-+    <entity name="US_Default_Billing_Address_TX" type="address" extends="US_Address_TX">
-+        <data key="default_billing">false</data>
-+        <data key="default_shipping">true</data>
-+    </entity>
-+    <entity name="US_Default_Shipping_Address_CA" type="address" extends="US_Address_CA">
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">false</data>
-+    </entity>
-+    <entity name="addressNoZipNoState" type="address">
-+        <data key="country_id">United Kingdom</data>
-+        <array key="street">
-+            <item>3962 Horner Street</item>
-+        </array>
-+        <data key="company">Magento</data>
-+        <data key="telephone">334-200-4061</data>
-+        <data key="city">London</data>
-+        <data key="firstname">Fn</data>
-+        <data key="lastname">Ln</data>
-+        <data key="middlename">Mn</data>
-+        <data key="prefix">Mr</data>
-+        <data key="suffix">Sr</data>
-+        <data key="vat_id">U1234567891</data>
-+        <data key="default_shipping">true</data>
-+        <data key="default_billing">true</data>
-+    </entity>
-+    <entity name="updateCustomerUKAddress" type="address">
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="company">Magento</data>
-+        <data key="telephone">0123456789-02134567</data>
-+        <array key="street">
-+            <item>172, Westminster Bridge Rd</item>
-+            <item>7700 xyz street</item>
-+        </array>
-+        <data key="country_id">GB</data>
-+        <data key="country">United Kingdom</data>
-+        <data key="city">London</data>
-+        <!-- State not required for UK address on frontend-->
-+        <data key="state"> </data>
-+        <data key="postcode">12345</data>
-+    </entity>
-+    <entity name="updateCustomerFranceAddress" type="address">
-+        <data key="firstname">Jaen</data>
-+        <data key="lastname">Reno</data>
-+        <data key="company">Magento</data>
-+        <data key="telephone">555-888-111-999</data>
-+        <array key="street">
-+            <item>18-20 Rue Maréchal Lecler</item>
-+            <item>18-20 Rue Maréchal Lecler</item>
-+        </array>
-+        <data key="country_id">FR</data>
-+        <data key="country">France</data>
-+        <data key="city">Quintin</data>
-+        <data key="state">Côtes-d'Armor</data>
-+        <data key="postcode">12345</data>
-+    </entity>
-+    <entity name="updateCustomerNoXSSInjection" type="address">
-+        <data key="firstname">Jany</data>
-+        <data key="lastname">Doe</data>
-+        <data key="company">Magento</data>
-+        <data key="telephone">555-888-111-999</data>
-+        <array key="street">
-+            <item>7700 West Parmer Lane</item>
-+            <item>7700 West Parmer Lane</item>
-+        </array>
-+        <data key="country_id">US</data>
-+        <data key="country">United States</data>
-+        <data key="city">Denver</data>
-+        <data key="state">Colorado</data>
-+        <data key="postcode">12345</data>
-+    </entity>
-+    <entity name="PolandAddress" type="address">
-+        <data key="firstname">Mag</data>
-+        <data key="lastname">Ento</data>
-+        <data key="company">Magento</data>
-+        <array key="street">
-+            <item>Piwowarska 6</item>
-+        </array>
-+        <data key="city">Bielsko-Biała</data>
-+        <data key="state"> Bielsko</data>
-+        <data key="country_id">PL</data>
-+        <data key="country">Poland</data>
-+        <data key="postcode">43-310</data>
-+        <data key="telephone">799885616</data>
-+        <data key="default_billing">Yes</data>
-+        <data key="default_shipping">Yes</data>
-+        <requiredEntity type="region">RegionUT</requiredEntity>
-+    </entity>
-+    <entity name="DE_Address_Berlin_Not_Default_Address" type="address">
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="company">Magento</data>
-+        <array key="street">
-+            <item>Augsburger Strabe 41</item>
-+        </array>
-+        <data key="city">Berlin</data>
-+        <data key="country_id">DE</data>
-+        <data key="postcode">10789</data>
-+        <data key="telephone">333-33-333-33</data>
-+        <data key="country">Germany</data>
-+    </entity>
-+    <entity name="US_Address_California">
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="company">Magento</data>
-+        <array key="street">
-+            <item>6161 West Centinela Avenue</item>
-+        </array>
-+        <data key="city">Culver City</data>
-+        <data key="country_id">United States</data>
-+        <data key="country">United States</data>
-+        <data key="state">California</data>
-+        <data key="postcode">90230</data>
-+        <data key="telephone">555-55-555-55</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..4e433c76b3d
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,31 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuCustomers">
-+        <data key="pageTitle">Customers</data>
-+        <data key="title">Customers</data>
-+        <data key="dataUiId">magento-customer-customer</data>
-+    </entity>
-+    <entity name="AdminMenuCustomersAllCustomers">
-+        <data key="pageTitle">Customers</data>
-+        <data key="title">All Customers</data>
-+        <data key="dataUiId">magento-customer-customer-manage</data>
-+    </entity>
-+    <entity name="AdminMenuCustomersCustomerGroups">
-+        <data key="pageTitle">Customer Groups</data>
-+        <data key="title">Customer Groups</data>
-+        <data key="dataUiId">magento-customer-customer-group</data>
-+    </entity>
-+    <entity name="AdminMenuCustomersNowOnline">
-+        <data key="pageTitle">Customers Now Online</data>
-+        <data key="title">Now Online</data>
-+        <data key="dataUiId">magento-customer-customer-online</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
-new file mode 100644
-index 00000000000..870bd929eea
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
-@@ -0,0 +1,44 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="CustomerAccountSharingDefault" type="customer_account_sharing_config">
-+        <requiredEntity type="account_share_scope_value">CustomerAccountSharingPerWebsite</requiredEntity>
-+    </entity>
-+    <entity name="CustomerAccountSharingPerWebsite" type="account_share_scope_value">
-+        <data key="value">1</data>
-+    </entity>
-+
-+    <entity name="CustomerAccountSharingGlobal" type="customer_account_sharing_config">
-+        <requiredEntity type="account_share_scope_value">GlobalCustomerAccountSharing</requiredEntity>
-+    </entity>
-+    <entity name="GlobalCustomerAccountSharing" type="account_share_scope_value">
-+        <data key="value">0</data>
-+    </entity>
-+
-+    <entity name="CustomerAccountSharingSystemValue" type="customer_account_sharing_config_inherit">
-+        <requiredEntity type="account_share_scope_inherit">CustomerAccountSharingInherit</requiredEntity>
-+    </entity>
-+    <entity name="CustomerAccountSharingInherit" type="account_share_scope_inherit">
-+        <data key="inherit">true</data>
-+    </entity>
-+    <entity name="StorefrontCustomerLockoutFailuresDefaultConfigData">
-+        <!-- Magento default value -->
-+        <data key="path">customer/password/lockout_failures</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">10</data>
-+        <data key="value">10</data>
-+    </entity>
-+    <entity name="StorefrontCustomerLockoutFailures5ConfigData">
-+        <data key="path">customer/password/lockout_failures</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">5</data>
-+        <data key="value">5</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigurationData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigurationData.xml
-new file mode 100644
-index 00000000000..60d8b13887e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigurationData.xml
-@@ -0,0 +1,40 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="SetCustomerCreateNewAccountOptionsConfig" type="customer_create_new_account_config">
-+        <requiredEntity type="auto_group_assign">EnableAutomaticAssignmentCustomerGroup</requiredEntity>
-+        <requiredEntity type="viv_on_each_transaction">EnableValidateEachTransaction</requiredEntity>
-+        <requiredEntity type="vat_frontend_visibility">EnableShowVATNumberStorefront</requiredEntity>
-+    </entity>
-+    <entity name="EnableAutomaticAssignmentCustomerGroup" type="auto_group_assign">
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="EnableValidateEachTransaction" type="viv_on_each_transaction">
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="EnableShowVATNumberStorefront" type="vat_frontend_visibility">
-+        <data key="value">1</data>
-+    </entity>
-+
-+    <entity name="SetCustomerCreateNewAccountOptionsDefaultConfig" type="customer_create_new_account_config">
-+        <requiredEntity type="auto_group_assign">DefaultAutomaticAssignmentCustomerGroup</requiredEntity>
-+        <requiredEntity type="viv_on_each_transaction">DefaultValidateEachTransaction</requiredEntity>
-+        <requiredEntity type="vat_frontend_visibility">DefaultShowVATNumberStorefront</requiredEntity>
-+    </entity>
-+    <entity name="DefaultAutomaticAssignmentCustomerGroup" type="auto_group_assign">
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="DefaultValidateEachTransaction" type="viv_on_each_transaction">
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="DefaultShowVATNumberStorefront" type="vat_frontend_visibility">
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
-index 1f6a01ea815..55bc9b56c79 100644
---- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="CustomerEntityOne" type="customer">
-         <data key="group_id">0</data>
-         <data key="default_billing">defaultBillingValue</data>
-@@ -21,6 +21,7 @@
-         <data key="firstname">John</data>
-         <data key="lastname">Doe</data>
-         <data key="middlename">S</data>
-+        <data key="fullname">John Doe</data>
-         <data key="password">pwdTest123!</data>
-         <data key="prefix">Mr</data>
-         <data key="suffix">Sr</data>
-@@ -33,7 +34,7 @@
-         <!--requiredEntity type="extension_attribute">ExtensionAttributeSimple</requiredEntity-->
-     </entity>
-     <entity name="Simple_US_Customer" type="customer">
--        <data key="group_id">0</data>
-+        <data key="group_id">1</data>
-         <data key="default_billing">true</data>
-         <data key="default_shipping">true</data>
-         <data key="email" unique="prefix">John.Doe@example.com</data>
-@@ -43,8 +44,58 @@
-         <data key="password">pwdTest123!</data>
-         <data key="store_id">0</data>
-         <data key="website_id">0</data>
-+        <data key="group">General</data>
-         <requiredEntity type="address">US_Address_TX</requiredEntity>
-     </entity>
-+    <entity name="SimpleUsCustomerWithNewCustomerGroup" type="customer">
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">true</data>
-+        <data key="email" unique="prefix">John.Doe@example.com</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">John Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+        <requiredEntity type="address">US_Address_TX</requiredEntity>
-+        <var entityType="customerGroup" entityKey="id" key="group_id" />
-+    </entity>
-+    <entity name="UsCustomerAssignedToNewCustomerGroup" type="customer">
-+        <var key="group_id" entityKey="id" entityType="customerGroup" />
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">true</data>
-+        <data key="email" unique="prefix">John.Doe@example.com</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">John Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+        <requiredEntity type="address">US_Address_TX</requiredEntity>
-+    </entity>
-+    <entity name="Simple_US_Customer_Incorrect_Name" type="customer">
-+        <data key="group_id">1</data>
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">true</data>
-+        <data key="email" unique="prefix">John.Doe@example.com</data>
-+        <data key="firstname">LoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsum</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">John Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+        <requiredEntity type="address">US_Address_TX</requiredEntity>
-+    </entity>
-+    <entity name="Simple_Customer_Without_Address" type="customer">
-+        <data key="group_id">1</data>
-+        <data key="email" unique="prefix">John.Doe@example.com</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">John Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+    </entity>
-     <entity name="Simple_US_Customer_Multiple_Addresses" type="customer">
-         <data key="group_id">0</data>
-         <data key="default_billing">true</data>
-@@ -59,6 +110,34 @@
-         <requiredEntity type="address">US_Address_NY</requiredEntity>
-         <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
-     </entity>
-+    <entity name="Simple_US_Customer_Multiple_Addresses_No_Default_Address" type="customer">
-+        <data key="group_id">0</data>
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">true</data>
-+        <data key="email" unique="prefix">John.Doe@example.com</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">John Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+        <requiredEntity type="address">US_Address_NY_Not_Default_Address</requiredEntity>
-+        <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
-+    </entity>
-+    <entity name="Simple_US_Customer_With_Different_Billing_Shipping_Addresses" type="customer">
-+        <data key="group_id">0</data>
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">true</data>
-+        <data key="email" unique="prefix">John.Doe@example.com</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">John Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+        <requiredEntity type="address">US_Address_TX_Default_Billing</requiredEntity>
-+        <requiredEntity type="address">US_Address_NY_Default_Shipping</requiredEntity>
-+    </entity>
-     <entity name="Simple_US_Customer_NY" type="customer">
-         <data key="group_id">0</data>
-         <data key="default_billing">true</data>
-@@ -89,4 +168,131 @@
-         <var key="id" entityKey="id" entityType="customer"/>
-         <data key="firstname">Jane</data>
-     </entity>
-+    <entity name="Simple_US_CA_Customer" type="customer">
-+        <data key="group_id">1</data>
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">true</data>
-+        <data key="email" unique="prefix">John.Doe@example.com</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">John Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+        <requiredEntity type="address">US_Address_CA</requiredEntity>
-+    </entity>
-+    <entity name="Simple_US_Utah_Customer" type="customer">
-+        <data key="group_id">1</data>
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">true</data>
-+        <data key="email" unique="prefix">John.Doe@example.com</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">John Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+        <requiredEntity type="address">US_Address_Utah</requiredEntity>
-+    </entity>
-+    <entity name="Simple_GB_Customer" type="customer">
-+        <data key="group_id">0</data>
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">true</data>
-+        <data key="email" unique="prefix">Jane.Doe@example.com</data>
-+        <data key="firstname">Jane</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">Jane Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+        <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
-+    </entity>
-+    <entity name="Customer_With_Different_Default_Billing_Shipping_Addresses" type="customer">
-+        <data key="group_id">1</data>
-+        <data key="email" unique="prefix">John.Doe@example.com</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">John Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+        <requiredEntity type="address">US_Default_Billing_Address_TX</requiredEntity>
-+        <requiredEntity type="address">US_Default_Shipping_Address_CA</requiredEntity>
-+    </entity>
-+    <entity name="Colorado_US_Customer" type="customer">
-+        <data key="group_id">1</data>
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">true</data>
-+        <data key="email" unique="prefix">Patric.Patric@example.com</data>
-+        <data key="firstname">Patrick&lt;/title&gt;&lt;/head&gt;&lt;svg/onload=alert(&#39;XSS&#39;)&gt;</data>
-+        <data key="lastname">&lt;script&gt;alert(&#39;Last name&#39;)&lt;/script&gt;</data>
-+        <data key="password">123123^q</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+    </entity>
-+    <entity name="Customer_US_UK_DE" type="customer">
-+        <data key="group_id">0</data>
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">true</data>
-+        <data key="email" unique="prefix">John.Doe@example.com</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">John Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+        <requiredEntity type="address">US_Address_NY</requiredEntity>
-+        <requiredEntity type="address">DE_Address_Berlin_Not_Default_Address</requiredEntity>
-+        <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
-+    </entity>
-+    <entity name="Retailer_Customer" type="customer">
-+        <data key="group_id">3</data>
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">true</data>
-+        <data key="email" unique="prefix">John.Doe@example.com</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">John Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+        <requiredEntity type="address">US_Address_CA</requiredEntity>
-+    </entity>
-+    <entity name="Simple_US_Customer_Two_Addresses" type="customer">
-+        <data key="group_id">0</data>
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">true</data>
-+        <data key="email" unique="prefix">John.Doe@example.com</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">John Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+        <requiredEntity type="address">US_Address_TX</requiredEntity>
-+        <requiredEntity type="address">US_Address_NY_Not_Default_Address</requiredEntity>
-+    </entity>
-+    <entity name="Simple_US_Customer_Incorrect_Email" type="customer">
-+        <data key="group_id">0</data>
-+        <data key="default_billing">true</data>
-+        <data key="default_shipping">true</data>
-+        <data key="email">&gt;&lt;script&gt;alert(1);&lt;/script&gt;@example.com</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="fullname">John Doe</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+        <requiredEntity type="address">US_Address_CA</requiredEntity>
-+    </entity>
-+    <entity name="John_Smith_Customer" type="customer">
-+        <data key="group_id">1</data>
-+        <data key="email" unique="prefix">john.smith@example.com</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Smith</data>
-+        <data key="fullname">John Smith</data>
-+        <data key="password">pwdTest123!</data>
-+        <data key="store_id">0</data>
-+        <data key="website_id">0</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
-index cc8e16f017f..28305d37cf7 100644
---- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
-@@ -7,15 +7,31 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="NotLoggedInCustomerGroup" type="customerGroup">
-+        <data key="id">0</data>
-+        <data key="code">NOT LOGGED IN</data>
-+        <data key="tax_class_id">3</data>
-+        <data key="tax_class_name">Retail Customer</data>
-+    </entity>
-     <entity name="GeneralCustomerGroup" type="customerGroup">
-         <data key="code">General</data>
-         <data key="tax_class_id">3</data>
-         <data key="tax_class_name">Retail Customer</data>
-     </entity>
-+    <entity name="CustomerGroupChange" type="customerGroup">
-+        <data key="code" unique="suffix">Group_</data>
-+        <data key="tax_class_id">3</data>
-+        <data key="tax_class_name">Retail Customer</data>
-+    </entity>
-     <entity name="DefaultCustomerGroup" type="customerGroup">
-         <array key="group_names">
-             <item>General</item>
-         </array>
-     </entity>
-+    <entity name="CustomCustomerGroup" type="customerGroup">
-+        <data key="code" unique="suffix">Group </data>
-+        <data key="tax_class_id">3</data>
-+        <data key="tax_class_name">Retail Customer</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimple.xml b/app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimple.xml
-index fee4463709d..90540251877 100644
---- a/app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimple.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimple.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="ExtensionAttributeSimple" type="extension_attribute">
-         <data key="is_subscribed">true</data>
-     </entity>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
-new file mode 100644
-index 00000000000..347a04251f9
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
-@@ -0,0 +1,49 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="NewCustomerData" type="braintree_config_state">
-+        <data key="FirstName">Abgar</data>
-+        <data key="LastName">Abgaryan</data>
-+        <data key="Email">m@m.com</data>
-+        <data key="AddressFirstName">Abgar</data>
-+        <data key="AddressLastName">Abgaryan</data>
-+        <data key="StreetAddress">Street</data>
-+        <data key="City">Yerevan</data>
-+        <data key="Zip">9999</data>
-+        <data key="PhoneNumber">9999</data>
-+        <data key="Country">Armenia</data>
-+    </entity>
-+    <entity name="Simple_UK_Customer_For_Shipment" type="customer">
-+        <data key="firstName">John</data>
-+        <data key="lastName">Doe</data>
-+        <data key="email">johndoe@example.com</data>
-+        <data key="company">Test Company</data>
-+        <data key="streetFirstLine">39 St Maurices Road</data>
-+        <data key="streetSecondLine">ap. 654</data>
-+        <data key="city">PULDAGON</data>
-+        <data key="telephone">077 5866 0667</data>
-+        <data key="country">United Kingdom</data>
-+        <data key="region"> </data>
-+        <data key="postcode">KW1 7NQ</data>
-+    </entity>
-+    <entity name="Simple_US_CA_Customer_For_Shipment" type="customer">
-+        <data key="firstName">John</data>
-+        <data key="lastName">Doe</data>
-+        <data key="email">johndoeusca@example.com</data>
-+        <data key="company">Magento</data>
-+        <data key="streetFirstLine">123 Alphabet Drive</data>
-+        <data key="streetSecondLine">ap. 350</data>
-+        <data key="city">Los Angeles</data>
-+        <data key="telephone">555-55-555-55</data>
-+        <data key="country">United States</data>
-+        <data key="region">California</data>
-+        <data key="postcode">90240</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml b/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
-index 99741a35710..280bae7de41 100644
---- a/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="CustomerRegionOne" type="region">
-         <data key="region_code">100</data>
-         <data key="region_id">12</data>
-@@ -15,7 +15,7 @@
-     <entity name="RegionTX" type="region">
-         <data key="region">Texas</data>
-         <data key="region_code">TX</data>
--        <data key="region_id">1</data>
-+        <data key="region_id">57</data>
-     </entity>
-     <entity name="RegionCA" type="region">
-         <data key="region">California</data>
-@@ -27,4 +27,9 @@
-         <data key="region_code">NY</data>
-         <data key="region_id">43</data>
-     </entity>
-+    <entity name="RegionUT" type="region">
-+        <data key="region">Utah</data>
-+        <data key="region_code">UT</data>
-+        <data key="region_id">58</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/address-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/address-meta.xml
-index deb911f244f..10f63a5a2a8 100644
---- a/app/code/Magento/Customer/Test/Mftf/Metadata/address-meta.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/address-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateAddress" dataType="address" type="create">
-         <field key="region">region</field>
-         <field key="country_id">string</field>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer-meta.xml
-index ab2ee2aeddb..0d8aeb6614b 100644
---- a/app/code/Magento/Customer/Test/Mftf/Metadata/customer-meta.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateCustomer" dataType="customer" type="create" auth="adminOauth" url="/V1/customers" method="POST">
-         <contentType>application/json</contentType>
-         <object dataType="customer" key="customer">
-diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml
-new file mode 100644
-index 00000000000..c3132b5b6a4
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml
-@@ -0,0 +1,33 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CustomerAccountShareConfig" dataType="customer_account_sharing_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/customer/"
-+               successRegex="/messages-message-success/" returnRegex="" method="POST">
-+        <object key="groups" dataType="customer_account_sharing_config">
-+            <object key="account_share" dataType="customer_account_sharing_config">
-+                <object key="fields" dataType="customer_account_sharing_config">
-+                    <object key="scope" dataType="account_share_scope_value">
-+                        <field key="value">string</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+    <operation name="CustomerAccountShareConfigInherit" dataType="customer_account_sharing_config_inherit" type="create" auth="adminFormKey" url="/admin/system_config/save/section/customer/"
-+               method="POST">
-+        <object key="groups" dataType="customer_account_sharing_config_inherit">
-+            <object key="account_share" dataType="customer_account_sharing_config_inherit">
-+                <object key="fields" dataType="customer_account_sharing_config_inherit">
-+                    <object key="scope" dataType="account_share_scope_inherit">
-+                        <field key="inherit">boolean</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_create_new_account-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_create_new_account-meta.xml
-new file mode 100644
-index 00000000000..89ed477cb32
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_create_new_account-meta.xml
-@@ -0,0 +1,28 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CustomerCreateNewAccountOptionsConfigState" dataType="customer_create_new_account_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/customer/" method="POST">
-+        <object key="groups" dataType="customer_create_new_account_config">
-+            <object key="create_account" dataType="customer_create_new_account_config">
-+                <object key="fields" dataType="customer_create_new_account_config">
-+                    <object key="auto_group_assign" dataType="auto_group_assign">
-+                        <field key="value">string</field>
-+                    </object>
-+                    <object key="viv_on_each_transaction" dataType="viv_on_each_transaction">
-+                        <field key="value">string</field>
-+                    </object>
-+                    <object key="vat_frontend_visibility" dataType="vat_frontend_visibility">
-+                        <field key="value">string</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_extension_attribute-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_extension_attribute-meta.xml
-index 8561e937221..06c7b74aef0 100644
---- a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_extension_attribute-meta.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_extension_attribute-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateCustomerExtensionAttribute" dataType="customer_extension_attribute" type="create">
-         <field key="is_subscribed">boolean</field>
-         <field key="extension_attribute">customer_nested_extension_attribute</field>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_group-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_group-meta.xml
-new file mode 100644
-index 00000000000..3139ea278a0
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_group-meta.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CreateCustomerGroup" dataType="customerGroup" type="create" auth="adminOauth" url="/V1/customerGroups" method="POST">
-+        <contentType>application/json</contentType>
-+        <object dataType="customerGroup" key="group">
-+            <field key="code">string</field>
-+            <field key="tax_class_id">integer</field>
-+            <field key="tax_class_name">string</field>
-+        </object>
-+    </operation>
-+    <operation name="DeleteCustomerGroup" dataType="customerGroup" type="delete" auth="adminOauth" url="/V1/customerGroups/{id}" method="DELETE">
-+        <contentType>application/json</contentType>
-+    </operation>
-+</operations>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_nested_extension_attribute-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_nested_extension_attribute-meta.xml
-index eb9829cca49..a2741b7817b 100644
---- a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_nested_extension_attribute-meta.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_nested_extension_attribute-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateNestedExtensionAttribute" dataType="customer_nested_extension_attribute" type="create">
-         <field key="id">integer</field>
-         <field key="customer_id">integer</field>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/region-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/region-meta.xml
-index 3dd019462c8..5c21c5318e5 100644
---- a/app/code/Magento/Customer/Test/Mftf/Metadata/region-meta.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/region-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateRegion" dataType="region" type="create">
-         <field key="region_code">string</field>
-         <field key="region">string</field>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerConfigPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerConfigPage.xml
-new file mode 100644
-index 00000000000..282f9bb6fde
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerConfigPage.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminCustomerConfigPage" url="admin/system_config/edit/section/customer/{{tabLink}}" area="admin" parameterized="true" module="Magento_Customer">
-+        <section name="AdminCustomerConfigSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupPage.xml
-new file mode 100644
-index 00000000000..9adda6a74ba
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminCustomerGroupPage" url="/customer/group/" area="admin" module="Magento_Customer">
-+        <section name="AdminCustomerGroupMainSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupsIndexPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupsIndexPage.xml
-new file mode 100644
-index 00000000000..5981fb7c907
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupsIndexPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminCustomerGroupsIndexPage" url="/customer/group/" area="admin" module="Magento_Customer">
-+        <section name="AdminCustomerGroupGridActionsSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml
-index 06ab646aa4c..114c737e361 100644
---- a/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminCustomerPage" url="/customer/index/" area="admin" module="Magento_Customer">
-         <section name="AdminCustomerGridMainActionsSection"/>
-         <section name="AdminCustomerMessagesSection"/>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
-index 9a28bad4e0d..9bd382da8eb 100644
---- a/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
-@@ -6,9 +6,13 @@
-   */
- -->
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminEditCustomerPage" url="/customer/index/edit/id/{{var1}}" area="admin" module="Magento_Customer" parameterized="true">
-         <section name="AdminCustomerAccountInformationSection"/>
-+        <section name="AdminCustomerAddressesGridSection"/>
-+        <section name="AdminCustomerAddressesGridActionsSection"/>
-+        <section name="AdminCustomerAddressesSection"/>
-         <section name="AdminCustomerMainActionsSection"/>
-+        <section name="AdminEditCustomerAddressesSection" />
-     </page>
- </pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerGroupPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerGroupPage.xml
-new file mode 100644
-index 00000000000..2c52b3ec05c
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerGroupPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminNewCustomerGroupPage" url="/customer/group/new/" area="admin" module="Magento_Customer">
-+        <section name="AdminNewCustomerGroupSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerPage.xml
-index 646f03181d8..57a30d6f989 100644
---- a/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerPage.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminNewCustomerPage" url="/customer/index/new" area="admin" module="Magento_Customer">
-         <section name="AdminCustomerAccountInformationSection"/>
-         <section name="AdminCustomerMainActionsSection"/>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAccountChangePasswordPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAccountChangePasswordPage.xml
-new file mode 100644
-index 00000000000..43198297b17
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAccountChangePasswordPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontCustomerAccountChangePasswordPage" url="/customer/account/edit/changepass/1/" area="storefront" module="Magento_Customer">
-+        <section name="StorefrontCustomerAccountInformationSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAddressesPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAddressesPage.xml
-new file mode 100644
-index 00000000000..b9bede51330
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAddressesPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontCustomerAddressesPage" url="/customer/address/" area="storefront" module="Magento_Customer">
-+        <section name="StorefrontCustomerAddressesSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
-index ba61cbb0bca..0d273da3530 100644
---- a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
-@@ -7,8 +7,9 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="StorefrontCustomerCreatePage" url="/customer/account/create/" area="storefront" module="Magento_Customer">
--        <section name="StorefrontCustomerCreateFormSection" />
-+        <section name="StorefrontCustomerCreateFormSection"/>
-+        <section name="StoreFrontCustomerAdvancedAttributesSection"/>
-     </page>
- </pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerDashboardPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerDashboardPage.xml
-index 941e247e18b..83a4d0a4ba8 100644
---- a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerDashboardPage.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerDashboardPage.xml
-@@ -7,8 +7,12 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="StorefrontCustomerDashboardPage" url="/customer/account/" area="storefront" module="Magento_Customer">
-         <section name="StorefrontCustomerDashboardAccountInformationSection" />
-+        <section name="StorefrontCustomerResentOrdersSection"/>
-+        <section name="StorefrontCustomerSidebarSection"/>
-+        <section name="StorefrontMinicartSection"/>
-+        <section name="StorefrontCustomerFooterSection"/>
-     </page>
- </pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerEditPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerEditPage.xml
-new file mode 100644
-index 00000000000..d4cf90dde08
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerEditPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontCustomerEditPage" url="/customer/account/edit/" area="storefront" module="Magento_Customer">
-+        <section name="StorefrontCustomerAccountInformationSection"/>
-+    </page>
-+</pages>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutPage.xml
-new file mode 100644
-index 00000000000..b3cea8f2c29
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutPage.xml
-@@ -0,0 +1,11 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontCustomerLogoutPage" url="customer/account/logout/" area="storefront" module="Magento_Customer"/>
-+</pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml
-new file mode 100644
-index 00000000000..9c1fc7aa8a8
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml
-@@ -0,0 +1,11 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontCustomerLogoutSuccessPage" url="customer/account/logoutSuccess/" area="storefront" module="Magento_Customer"/>
-+</pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderPage.xml
-index bd25c67c8c9..05c4c71a61e 100644
---- a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderPage.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderPage.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="StorefrontCustomerOrderPage" url="sales/order/view/order_id/" area="storefront" module="Magento_Customer">
-         <section name="StorefrontCustomerOrderViewSection"/>
-     </page>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml
-index 7e6cebe6f3c..2305bd3a9b8 100644
---- a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="StorefrontCustomerOrderViewPage" url="sales/order/view/order_id/{{var1}}" area="storefront" module="Magento_Customer" parameterized="true">
-         <section name="StorefrontCustomerOrderSection" />
-     </page>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml
-index f6673227bea..b4814a3e4be 100644
---- a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml
-@@ -7,8 +7,9 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="StorefrontCustomerSignInPage" url="/customer/account/login/" area="storefront" module="Magento_Customer">
-         <section name="StorefrontCustomerSignInFormSection" />
-+        <section name="StorefrontCustomerLoginMessagesSection"/>
-     </page>
- </pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerStoredPaymentMethodsPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerStoredPaymentMethodsPage.xml
-new file mode 100644
-index 00000000000..bec802689a6
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerStoredPaymentMethodsPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontCustomerStoredPaymentMethodsPage" url="/vault/cards/listaction/" area="storefront" module="Magento_Customer">
-+        <section name="StorefrontCustomerStoredPaymentMethodsSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontForgotPasswordPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontForgotPasswordPage.xml
-new file mode 100644
-index 00000000000..2633a0c760c
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontForgotPasswordPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontForgotPasswordPage" url="/customer/account/forgotpassword/" area="storefront" module="Magento_Customer">
-+        <section name="StorefrontForgotPasswordSection" />
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontHomePage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontHomePage.xml
-index 6b65bd97e8c..a466ceab2f7 100644
---- a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontHomePage.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontHomePage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="StorefrontHomePage" url="/" area="storefront" module="Magento_Customer">
-         <section name="StorefrontPanelHeader" />
-     </page>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
-new file mode 100644
-index 00000000000..376b0b9f66d
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCreateUserSection">
-+        <element name="system" type="input" selector="#menu-magento-backend-system"/>
-+        <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
-+        <element name="create" type="input" selector="#add"/>
-+        <element name="usernameTextField" type="input" selector="#user_username"/>
-+        <element name="firstNameTextField" type="input" selector="#user_firstname"/>
-+        <element name="lastNameTextField" type="input" selector="#user_lastname"/>
-+        <element name="emailTextField" type="input" selector="#user_email"/>
-+        <element name="passwordTextField" type="input" selector="#user_password"/>
-+        <element name="pwConfirmationTextField" type="input" selector="#user_confirmation"/>
-+        <element name="currentPasswordField" type="input" selector="#user_current_password"/>
-+        <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
-+        <element name="saveButton" type="button" selector="#save"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
-index 647cc6e3ee1..1de280ff4d1 100644
---- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
-@@ -7,12 +7,32 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCustomerAccountInformationSection">
-+        <element name="accountInformationTab" type="button" selector="#tab_customer" timeout="30"/>
-+        <element name="statusInactive" type="button" selector=".admin__actions-switch-label"/>
-         <element name="accountInformationTitle" type="text" selector=".admin__page-nav-title"/>
-+        <element name="accountInformationButton" type="text" selector="//a/span[text()='Account Information']"/>
-+        <element name="addressesButton" type="select" selector="//a//span[contains(text(), 'Addresses')]"/>
-         <element name="firstName" type="input" selector="input[name='customer[firstname]']"/>
-         <element name="lastName" type="input" selector="input[name='customer[lastname]']"/>
-         <element name="email" type="input" selector="input[name='customer[email]']"/>
-         <element name="group" type="select" selector="[name='customer[group_id]']"/>
-+        <element name="groupIdValue" type="text" selector="//*[@name='customer[group_id]']/option"/>
-+        <element name="groupValue" type="button" selector="//span[text()='{{groupValue}}']" parameterized="true"/>
-+        <element name="associateToWebsite" type="select" selector="//select[@name='customer[website_id]']"/>
-+        <element name="saveCustomer" type="button" selector="//button[@title='Save Customer']"/>
-+        <element name="saveCustomerAndContinueEdit" type="button" selector="//button[@title='Save and Continue Edit']"/>
-+        <element name="storeView" type="select" selector="//select[@name='customer[sendemail_store_id]']"/>
-+        <element name="namePrefix" type="input" selector="//input[contains(@name, 'customer[prefix]')]"/>
-+        <element name="nameSuffix" type="input" selector="//input[contains(@name, 'customer[suffix]')]"/>
-+        <element name="dateOfBirth" type="input" selector="//input[contains(@name, 'customer[dob]')]"/>
-+        <element name="gender" type="select" selector="//select[contains(@name, 'customer[gender]')]"/>
-+        <element name="firstNameRequiredMessage" type="text" selector="//input[@name='customer[firstname]']/../label[contains(.,'This is a required field.')]"/>
-+        <element name="lastNameRequiredMessage" type="text" selector="//input[@name='customer[lastname]']/../label[contains(.,'This is a required field.')]"/>
-+        <element name="emailRequiredMessage" type="text" selector="//input[@name='customer[email]']/../label[contains(.,'This is a required field.')]"/>
-+        <element name="customAttribute" type="select" selector="//select[contains(@name, 'customer[{{attribute_code}}]')]" parameterized="true"/>
-+        <element name="disabledGroup" type="text" selector="//div[@class='admin__action-group-wrap admin__action-multiselect-wrap action-select-wrap _disabled']"/>
-+        <element name="attributeImage" type="block" selector="//div[contains(concat(' ',normalize-space(@class),' '),' file-uploader-preview ')]//img"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesComparisonListSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesComparisonListSection.xml
-new file mode 100644
-index 00000000000..46eed69f224
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesComparisonListSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerActivitiesComparisonListSection">
-+        <element name="addProductToOrder" type="text" selector="//div[@id='order-sidebar_compared']//tr[td[.='{{productName}}']]//input[contains(@name,'add')]" parameterized="true" timeout="30"/>
-+        <element name="addToOrderConfigure" type="button" selector="//div[@id='order-sidebar_compared']//tr[td[contains(.,'{{productName}}')]]//a[contains(@class, 'icon-configure')]" parameterized="true" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesConfigureSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesConfigureSection.xml
-new file mode 100644
-index 00000000000..cbe22fd26e4
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesConfigureSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerActivitiesConfigureSection">
-+        <element name="addAttribute" type="select" selector="//select[contains(concat(' ',normalize-space(@class),' '),' super-attribute-select ')]" timeout="30"/>
-+        <element name="dropdownProductSelection" type="select" selector="//option[contains(text(), '{{productName}}')]" parameterized="true" timeout="30"/>
-+        <element name="okButton" type="button" selector="//button[contains(concat(' ',normalize-space(@class),' '),' action-primary ')]" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesLastOrderedSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesLastOrderedSection.xml
-new file mode 100644
-index 00000000000..22fa1b5bd21
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesLastOrderedSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerActivitiesLastOrderedSection">
-+        <element name="addProductToOrder" type="text" selector="//div[@id='sidebar_data_reorder']//tr[td[.='{{productName}}']]//input[contains(@name,'add')]" parameterized="true" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesRecentlyViewedSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesRecentlyViewedSection.xml
-new file mode 100644
-index 00000000000..b3a01511354
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesRecentlyViewedSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerActivitiesRecentlyViewedSection">
-+        <element name="addToOrderConfigure" type="button" selector="//div[@id='sidebar_data_pviewed']//tr[td[contains(.,'{{productName}}')]]//a[contains(@class, 'icon-configure')]" parameterized="true" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesShoppingCartSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesShoppingCartSection.xml
-new file mode 100644
-index 00000000000..fb8d05f4274
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesShoppingCartSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerActivitiesShoppingCartSection">
-+        <element name="productName" type="text" selector="//div[@id='sidebar_data_cart']//td[@class='col-item']"/>
-+        <element name="productPrice" type="text" selector="//div[@id='sidebar_data_cart']//td[@class='col-price']"/>
-+        <element name="addToOrder" type="checkbox" selector="//input[contains(@id, 'sidebar-add_cart_item')]"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressFiltersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressFiltersSection.xml
-new file mode 100644
-index 00000000000..f3df6cc5e8c
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressFiltersSection.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerAddressFiltersSection">
-+        <element name="filtersButton" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
-+        <element name="firstnameInput" type="input" selector="input[name=firstname]"/>
-+        <element name="lastnameInput" type="input" selector="input[name=lastname]"/>
-+        <element name="streetInput" type="input" selector="input[name=street]"/>
-+        <element name="cityInput" type="input" selector="input[name=city]"/>
-+        <element name="stateSelector" type="select" selector="input[name=input]"/>
-+        <element name="postcodeInput" type="input" selector="input[name=postcode]"/>
-+        <element name="countryInput" type="input" selector="select[name=country_id]"/>
-+        <element name="telephoneInput" type="input" selector="input[name=telephone]"/>
-+        <element name="applyFilter" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
-+        <element name="clearAll" type="button" selector=".admin__data-grid-header .action-tertiary.action-clear" timeout="30"/>
-+        <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
-+        <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridMainActionsSection.xml
-new file mode 100644
-index 00000000000..f226d49e3bf
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridMainActionsSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerGridMainActionsSection">
-+        <element name="addNewAddress" type="button" selector=".add-new-address-button" timeout="30"/>
-+        <element name="actions" type="text" selector=".admin__data-grid-header-row .action-select"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridSection.xml
-new file mode 100644
-index 00000000000..e639fca834b
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerAddressGridSection">
-+        <element name="customerGrid" type="text" selector="table[data-role='grid']"/>
-+        <element name="firstRowSelectActionLink" type="text" selector="tr[data-repeat-index='0'] .action-select" timeout="30"/>
-+        <element name="firstRowEditActionLink" type="text" selector="tr[data-repeat-index='0'] [data-action='item-edit']" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesDefaultBillingSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesDefaultBillingSection.xml
-new file mode 100644
-index 00000000000..a85c12fda10
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesDefaultBillingSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerAddressesDefaultBillingSection">
-+        <element name="addressDetails" type="text" selector="//div[@class='customer-default-billing-address-content']//div[@class='address_details']"/>
-+        <element name="address" type="text" selector="//div[@class='customer-default-billing-address-content']//address//span"/>
-+        <element name="editButton" type="text" selector="//button[@data-index='edit_billing_address']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesDefaultShippingSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesDefaultShippingSection.xml
-new file mode 100644
-index 00000000000..610bb16874b
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesDefaultShippingSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerAddressesDefaultShippingSection">
-+        <element name="addressDetails" type="text" selector="//div[@class='customer-default-shipping-address-content']//div[@class='address_details']"/>
-+        <element name="address" type="text" selector="//div[@class='customer-default-shipping-address-content']//address//span"/>
-+        <element name="editButton" type="text" selector="//button[@data-index='edit_shipping_address']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml
-new file mode 100644
-index 00000000000..e743c4af66d
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerAddressesGridActionsSection">
-+        <element name="spinner" type="button" selector=".spinner"/>
-+        <element name="gridLoadingMask" type="button" selector=".admin__data-grid-loading-mask"/>
-+        <element name="search" type="input" selector="#fulltext"/>
-+        <element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']" timeout="30"/>
-+        <element name="actions" type="text" selector="//div[@class='admin__data-grid-header']//button[@class='action-select']"/>
-+        <element name="filters" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
-+        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']" timeout="30"/>
-+        <element name="headerRow" type="text" selector=".admin__data-grid-header-row.row.row-gutter"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridSection.xml
-new file mode 100644
-index 00000000000..5393d6c1ab9
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridSection.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerAddressesGridSection">
-+        <element name="customerAddressGrid" type="text" selector="table[data-role='grid']"/>
-+        <element name="firstRowSelectLink" type="text" selector="//tr[contains(@data-repeat-index, '0')]//button[@class='action-select']"/>
-+        <element name="firstRowEditLink" type="text" selector="//tr[contains(@data-repeat-index, '0')]//a[contains(@data-action,'item-edit')]" timeout="30"/>
-+        <element name="firstRowSetAsDefaultBillingLink" type="text" selector="//tr[contains(@data-repeat-index, '0')]//a[contains(@data-action,'item-setDefaultBilling')]" timeout="30"/>
-+        <element name="firstRowSetAsDefaultShippingLink" type="text" selector="//tr[contains(@data-repeat-index, '0')]//a[contains(@data-action,'item-setDefaultShipping')]" timeout="30"/>
-+        <element name="firstRowDeleteLink" type="text" selector="//tr[contains(@data-repeat-index, '0')]//a[contains(@data-action,'item-delete')]" timeout="30"/>
-+        <element name="firstRowCheckbox" type="checkbox" selector="//tr[contains(@data-repeat-index, '0')]//input[contains(@data-action, 'select-row')]"/>
-+        <element name="secondRowCheckbox" type="checkbox" selector="//tr[contains(@data-repeat-index, '1')]//input[contains(@data-action, 'select-row')]"/>
-+        <element name="checkboxByName" type="checkbox" selector="//div[contains(text(),'{{customer}}')]/ancestor::tr[contains(@class, 'data-row')]//input[@class='admin__control-checkbox']" parameterized="true" />
-+        <element name="rowsInGrid" type="text" selector="//tr[contains(@class,'data-row')]"/>
-+        <element name="checkboxByRow" type="checkbox" selector="//tr[contains(@data-repeat-index, '{{row}}')]//input[contains(@data-action, 'select-row')]" parameterized="true"/>
-+        <element name="selectLinkByRow" type="text" selector="//tr[contains(@data-repeat-index, '{{row}}')]//button[@class='action-select']" parameterized="true"/>
-+        <element name="deleteLinkByRow" type="text" selector="//tr[contains(@data-repeat-index, '{{row}}')]//a[contains(@data-action,'item-delete')]" parameterized="true" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml
-new file mode 100644
-index 00000000000..26df107708c
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml
-@@ -0,0 +1,39 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerAddressesSection">
-+        <element name="addNewAddress" type="button" selector="//span[text()='Add New Address']"/>
-+        <element name="defaultBillingAddress" type="button" selector="div[data-index=default_billing] .admin__actions-switch-label"/>
-+        <element name="defaultBillingAddressCheckBox" type="input" selector="//div[@class='admin__field-control']//input[@name='default_billing']"/>
-+        <element name="defaultShippingAddress" type="button" selector="div[data-index=default_shipping] .admin__actions-switch-label"/>
-+        <element name="defaultShippingAddressCheckBox" type="input" selector="//div[@class='admin__field-control']//input[@name='default_shipping']"/>
-+        <element name="firstNameForAddress" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'firstname')]"/>
-+        <element name="lastNameForAddress" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'lastname')]"/>
-+        <element name="streetAddress" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'street')]"/>
-+        <element name="city" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'city')]"/>
-+        <element name="company" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'company')]"/>
-+        <element name="region" type="select" selector="//div[@class='admin__field-control']//select[@name='region_id']"/>
-+        <element name="regionId" type="select" selector="//div[@class='admin__field-control']//select[@name='region_id']//option[@data-title='{{regionName}}']" parameterized="true"/>
-+        <element name="country" type="select" selector="//div[@class='admin__field-control']//select[contains(@name, 'country_id')]"/>
-+        <element name="countryId" type="input" selector="//div[@class='admin__field-control']//select[contains(@name, 'country_id')]//option[@value='{{countryName}}']" parameterized="true"/>
-+        <element name="state" type="select" selector="//div[@class='admin__field-control']//select[contains(@name, 'region_id')]"/>
-+        <element name="zip" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'postcode')]"/>
-+        <element name="phoneNumber" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'telephone')]"/>
-+        <element name="saveAddress" type="button" selector="//button[@title='Save']"/>
-+        <element name="customerAddressRow" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true"/>
-+        <element name="deleteButton" type="button" selector="//button[@id='delete']"/>
-+        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
-+        <element name="streetRequiredMessage" type="text" selector="//input[@name='street[0]']/../label[contains(.,'This is a required field.')]"/>
-+        <element name="cityRequiredMessage" type="text" selector="//input[@name='city']/../label[contains(.,'This is a required field.')]"/>
-+        <element name="countryRequiredMessage" type="text" selector="//select[@name='country_id']/../label[contains(.,'This is a required field.')]"/>
-+        <element name="postcodeRequiredMessage" type="text" selector="//input[@name='postcode']/../label[contains(.,'This is a required field.')]"/>
-+        <element name="phoneNumberRequiredMessage" type="text" selector="//input[@name='telephone']/../label[contains(.,'This is a required field.')]"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml
-new file mode 100644
-index 00000000000..a934d71397b
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerConfigSection">
-+        <element name="customerDataLifetime" type="input" selector="#customer_online_customers_section_data_lifetime"/>
-+        <element name="accountSharingOptionsTab" type="button" selector="#customer_account_share-head"/>
-+        <element name="shareCustomerAccountInherit" type="checkbox" selector="#customer_account_share_scope_inherit"/>
-+        <element name="shareCustomerAccount" type="select" selector="#customer_account_share_scope"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerCreateNewOrderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerCreateNewOrderSection.xml
-new file mode 100644
-index 00000000000..a0168799099
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerCreateNewOrderSection.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerCreateNewOrderSection">
-+        <element name="updateChangesBtn" type="button" selector=".order-sidebar .actions .action-default.scalable" timeout="30"/>
-+        <element name="productName" type="text" selector="#order-items_grid  span[id*=order_item]"/>
-+        <element name="productPrice" type="text" selector=".even td[class=col-price] span[class=price]"/>
-+        <element name="productQty" type="input" selector="td[class=col-qty] input"/>
-+        <element name="gridCell" type="text" selector="//div[contains(@id, 'order-items_grid')]//tbody[{{row}}]//td[count(//table[contains(@class, 'order-tables')]//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
-index 7d106a35f0e..17a4a283c26 100644
---- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
-@@ -7,11 +7,17 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCustomerFiltersSection">
-+        <element name="customerStatus" type="button" selector="select[name='status']"/>
-         <element name="filtersButton" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button" timeout="30"/>
-         <element name="nameInput" type="input" selector="input[name=name]"/>
-         <element name="emailInput" type="input" selector="input[name=email]"/>
-         <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
-+        <element name="clearAllFilters" type="text" selector=".admin__current-filters-actions-wrap.action-clear"/>
-+        <element name="clearAll" type="button" selector=".admin__data-grid-header .action-tertiary.action-clear" timeout="30"/>
-+        <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
-+        <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
-+        <element name="countryOptions" type="button" selector=".admin__data-grid-filters select[name=billing_country_id] option"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
-old mode 100644
-new mode 100755
-index 760b2c36633..d644b581088
---- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
-@@ -7,8 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCustomerGridMainActionsSection">
-         <element name="addNewCustomer" type="button" selector="#add" timeout="30"/>
-+        <element name="multicheck" type="checkbox" selector="#container>div>div.admin__data-grid-wrap>table>thead>tr>th.data-grid-multicheck-cell>div>label"/>
-+        <element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']"/>
-+        <element name="actions" type="text" selector=".action-select"/>
-+        <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{arg}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']//input" parameterized="true"/>
-+        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
-index 515d5eed112..91363c614c1 100644
---- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
-@@ -7,9 +7,14 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCustomerGridSection">
-         <element name="customerGrid" type="text" selector="table[data-role='grid']"/>
-         <element name="firstRowEditLink" type="text" selector="tr[data-repeat-index='0'] .action-menu-item" timeout="30"/>
-+        <element name="gridRow" type="text" selector="//*[@data-role='sticky-el-root']/parent::div/parent::div/following-sibling::div//tbody//*[@class='data-row'][{{row}}]" parameterized="true"/>
-+        <element name="selectFirstRow" type="checkbox" selector="//td[@class='data-grid-checkbox-cell']"/>
-+        <element name="customerCheckboxByEmail" type="checkbox" selector="//tr[@class='data-row' and //div[text()='{{customerEmail}}']]//input[@type='checkbox']" parameterized="true" timeout="30"/>
-+        <element name="customerEditLinkByEmail" type="text" selector="//tr[@class='data-row' and //div[text()='{{customerEmail}}']]//a[@class='action-menu-item']" parameterized="true" timeout="30"/>
-+        <element name="customerGroupByEmail" type="text" selector="//tr[@class='data-row' and //div[text()='{{customerEmail}}']]//div[text()='{{customerGroup}}']" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupGridActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupGridActionsSection.xml
-new file mode 100644
-index 00000000000..391292ca7fa
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupGridActionsSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerGroupGridActionsSection">
-+        <element name="selectButton" type="button" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']" timeout="30" parameterized="true"/>
-+        <element name="deleteAction" type="button" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Delete']" timeout="30" parameterized="true"/>
-+        <element name="actionsMenuButton" type="text" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='{{selectItem}}']" timeout="30" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
-new file mode 100644
-index 00000000000..4cb7f5e3f62
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerGroupMainSection">
-+        <element name="filterBtn" type="button" selector="//button[text()='Filters']"/>
-+        <element name="groupField" type="input" selector="//*[@name='customer_group_code']"/>
-+        <element name="applyFiltersBtn" type="button" selector="//*[text()='Apply Filters']"/>
-+        <element name="selectFirstRow" type="button" selector="//button[@class='action-select']"/>
-+        <element name="deleteBtn" type="button" selector="//*[text()='Delete']"/>
-+        <element name="clearAllBtn" type="button" selector="//button[text()='Clear all']"/>
-+        <element name="editButtonByCustomerGroupCode" type="button" selector="//tr[.//td[count(//th[./*[.='Group']]/preceding-sibling::th) + 1][./*[.='{{code}}']]]//a[contains(@href, '/edit/')]" parameterized="true" />
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
-index 1aadcb2fa46..18bc26bfd49 100644
---- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
-@@ -7,8 +7,12 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCustomerMainActionsSection">
-         <element name="saveButton" type="button" selector="#save" timeout="30"/>
-+        <element name="saveAndContinue" type="button" selector="#save_and_continue" timeout="30"/>
-+        <element name="resetPassword" type="button" selector="#resetPassword" timeout="30"/>
-+        <element name="manageShoppingCart" type="button" selector="#manage_quote" timeout="30"/>
-+        <element name="createOrderBtn" type="button" selector="#order" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMessagesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMessagesSection.xml
-index 08c29473a7e..b11142fd1ce 100644
---- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMessagesSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMessagesSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCustomerMessagesSection">
-         <element name="successMessage" type="text" selector=".message-success"/>
-     </section>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection.xml
-new file mode 100644
-index 00000000000..c4a4d650c1e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCustomerShoppingCartSection">
-+        <element name="createOrderButton" type="button" selector="button[title='Create Order']"/>
-+    </section>
-+
-+    <section name="AdminCustomerShoppingCartProductItemSection">
-+        <element name="productItem" type="button" selector="#dt-products"/>
-+        <element name="productNameFilter" type="input" selector="#source_products_filter_name"/>
-+        <element name="searchButton" type="button" selector="//*[@id='anchor-content']//button[@title='Search']"/>
-+        <element name="firstProductCheckbox" type="checkbox" selector="//*[@id='source_products_table']/tbody/tr[1]//*[@name='source_products']"/>
-+        <element name="addSelectionsToMyCartButton" type="button" selector="//*[@id='products_search']/div[1]//*[text()='Add selections to my cart']"/>
-+        <element name="addedProductName" type="text" selector="//*[@id='order-items_grid']//*[text()='{{var}}']" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
-new file mode 100644
-index 00000000000..0ba197999be
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminDeleteUserSection">
-+        <element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
-+        <element name="password" selector="#user_current_password" type="input"/>
-+        <element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
-+        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml
-new file mode 100644
-index 00000000000..4d66b40ee66
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml
-@@ -0,0 +1,35 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminEditCustomerAddressesSection">
-+        <element name="addresses" type="button" selector="//span[text()='Addresses']" timeout="30"/>
-+        <element name="addNewAddress" type="button" selector="//span[text()='Add New Address']"/>
-+        <element name="defaultBillingAddress" type="text" selector="input[name='default_billing']"/>
-+        <element name="defaultShippingAddress" type="text" selector="input[name='default_shipping']"/>
-+        <element name="defaultBillingAddressButton" type="text" selector="//input[@name='default_billing']/following-sibling::label"/>
-+        <element name="defaultShippingAddressButton" type="text" selector="//input[@name='default_shipping']/following-sibling::label"/>
-+        <element name="prefixName" type="text" selector="input[name='prefix']"/>
-+        <element name="firstName" type="text" selector="input[name='firstname']" />
-+        <element name="middleName" type="text" selector="input[name='middlename']" />
-+        <element name="lastName" type="text" selector="input[name='lastname']" />
-+        <element name="suffixName" type="text" selector="input[name='suffix']" />
-+        <element name="company" type="text" selector="input[name='company']" />
-+        <element name="streetAddress" type="text" selector="input[name='street[0]']" />
-+        <element name="city" type="text" selector="//*[@class='modal-component']//input[@name='city']" />
-+        <element name="country" type="select" selector="//*[@class='modal-component']//select[@name='country_id']" />
-+        <element name="state" type="select" selector="//*[@class='modal-component']//select[@name='region_id']" />
-+        <element name="dropDownAttribute" type="select" selector="//select[@name='{{var1}}']" parameterized="true"/>
-+        <element name="zipCode" type="text" selector="//*[@class='modal-component']//input[@name='postcode']" />
-+        <element name="phone" type="text" selector="//*[@class='modal-component']//input[@name='telephone']" />
-+        <element name="vat" type="text" selector="input[name='vat_id']" />
-+        <element name="save" type="button" selector="//button[@title='Save']" />
-+    </section>
-+
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml
-index 76feb2624b5..1c5bbc76e4d 100644
---- a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml
-@@ -7,8 +7,12 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminEditCustomerInformationSection">
-         <element name="orders" type="button" selector="#tab_orders_content" timeout="30"/>
-+        <element name="addresses" type="button" selector="//a[@id='tab_address']" timeout="30"/>
-+        <element name="newsLetter" type="button" selector="//a[@class='admin__page-nav-link' and @id='tab_newsletter_content']" timeout="30"/>
-+        <element name="group" type="text" selector="//th[text()='Customer Group:']/../td"/>
-+        <element name="customerTitle" type="text" selector="h1.page-title"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerNewsletterSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerNewsletterSection.xml
-new file mode 100644
-index 00000000000..51b4b54c5c8
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerNewsletterSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminEditCustomerNewsletterSection">
-+        <element name="subscribedToNewsletter" type="checkbox" selector="//div[@class='admin__field-control control']/input[@name='subscription']"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerOrdersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerOrdersSection.xml
-index bce4a7e848c..89fed43184b 100644
---- a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerOrdersSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerOrdersSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminEditCustomerOrdersSection">
-         <element name="orderGrid" type="text" selector="#customer_orders_grid_table"/>
-     </section>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminNewCustomerGroupSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminNewCustomerGroupSection.xml
-new file mode 100644
-index 00000000000..ec4a64b0146
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminNewCustomerGroupSection.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminNewCustomerGroupSection">
-+        <element name="groupName" type="input" selector="#customer_group_code"/>
-+        <element name="taxClass" type="select" selector="#tax_class_id"/>
-+        <element name="saveCustomerGroup" type="button" selector="#save"/>
-+        <element name="resetBtn" type="button" selector="#reset"/>
-+        <element name="backBtn" type="button" selector="#back"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
-new file mode 100644
-index 00000000000..7c4a76871d5
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminUserGridSection">
-+        <element name="usernameFilterTextField" type="input" selector="#permissionsUserGrid_filter_username"/>
-+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-+        <element name="usernameInFirstRow" type="text" selector=".col-username"/>
-+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-+        <element name="successMessage" type="text" selector=".message-success"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
-new file mode 100644
-index 00000000000..93a988caf3d
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="CustomersPageSection">
-+        <element name="addNewCustomerButton" type="button" selector="//*[@id='add']"/>
-+        <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
-+        <element name="actions" type="button" selector="//div[@class='col-xs-2']/div[@class='action-select-wrap']/button[@class='action-select']" timeout="30"/>
-+        <element name="delete" type="button" selector="//*[contains(@class,'admin__data-grid-header-row row row-gutter')]//*[text()='Delete']" timeout="30"/>
-+        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']" timeout="30"/>
-+        <element name="actionItem" type="button" selector="//div[@class='admin__data-grid-outer-wrap']/div[@class='admin__data-grid-header']//span[text()='{{actionItem}}']" parameterized="true" timeout="30"/>
-+        <element name="assignGroup" type="button" selector="//div[@class='admin__data-grid-outer-wrap']/div[@class='admin__data-grid-header']//ul[@class='action-submenu _active']//span[text()='{{groupName}}']" parameterized="true"/>
-+        <element name="deletedSuccessMessage" type="button" selector="//*[@class='message message-success success']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
-new file mode 100644
-index 00000000000..6eeef1ba9da
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="CustomersSubmenuSection">
-+        <element name="allCustomers" type="button" selector="//li[@id='menu-magento-customer-customer']//li[@data-ui-id='menu-magento-customer-customer-manage']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/LoggedInCustomerHeaderLinksSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/LoggedInCustomerHeaderLinksSection.xml
-new file mode 100644
-index 00000000000..907551e932f
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/LoggedInCustomerHeaderLinksSection.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="LoggedInCustomerHeaderLinksSection">
-+        <element name="customerDropdownMenu" type="button" selector=".customer-name"/>
-+        <element name="myAccount" type="button" selector="//*[contains(@class, 'page-header')]//*[contains(@class, 'customer-menu')]//a[contains(., 'My Account')]"/>
-+        <element name="myWishList" type="button" selector=".page-header .customer-menu .wishlist"/>
-+        <element name="signOut" type="button" selector=".page-header .customer-menu .authorization-link"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
-new file mode 100644
-index 00000000000..abb8aa6c1d8
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
-@@ -0,0 +1,32 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="NewCustomerPageSection">
-+        <element name="associateToWebsite" type="select" selector="//*[@class='admin__field-control _with-tooltip']//*[@class='admin__control-select']"/>
-+        <element name="group" type="select" selector="//div[@class='admin__field-control admin__control-fields required']//div[@class='admin__field-control']//select[@class='admin__control-select']"/>
-+        <element name="firstName" type="input" selector="//input[@name='customer[firstname]']"/>
-+        <element name="lastName" type="input" selector="//input[@name='customer[lastname]']"/>
-+        <element name="email" type="input" selector="//input[@name='customer[email]']"/>
-+        <element name="addresses" type="button" selector="//a[@id='tab_address']"/>
-+        <element name="addNewAddress" type="button" selector="//span[text()='Add New Addresses']"/>
-+        <element name="defaultBillingAddress" type="button" selector="//label[text()='Default Billing Address']"/>
-+        <element name="defaultShippingAddress" type="button" selector="//label[text()='Default Shipping Address']"/>
-+        <element name="firstNameForAddress" type="button" selector="//input[contains(@name, 'address')][contains(@name, 'firstname')]"/>
-+        <element name="lastNameForAddress" type="button" selector="//input[contains(@name, 'address')][contains(@name, 'lastname')]"/>
-+        <element name="streetAddress" type="button" selector="//input[contains(@name, 'street')]"/>
-+        <element name="city" type="input" selector="//input[contains(@name, 'city')]"/>
-+        <element name="country" type="select" selector="//select[contains(@name, 'country_id')]"/>
-+        <element name="countryArmenia" type="select" selector="//select[contains(@name, 'country_id')]//option[@data-title='Armenia']"/>
-+        <element name="zip" type="input" selector="//input[contains(@name, 'postcode')]"/>
-+        <element name="phoneNumber" type="input" selector="//input[contains(@name, 'telephone')]"/>
-+        <element name="saveCustomer" type="button" selector="//button[@title='Save Customer']"/>
-+        <element name="createdSuccessMessage" type="button" selector="//div[@data-ui-id='messages-message-success']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StoreFrontSignOutSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StoreFrontSignOutSection.xml
-new file mode 100644
-index 00000000000..29c1c9c01be
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StoreFrontSignOutSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StoreFrontSignOutSection">
-+        <element name="customerAccount" type="button" selector=".customer-name"/>
-+        <element name="signOut" type="button" selector="div.customer-menu  li.authorization-link"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
-new file mode 100644
-index 00000000000..9828c42211e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerAccountInformationSection">
-+        <element name="firstName" type="input" selector="#firstname"/>
-+        <element name="lastName" type="input" selector="#lastname"/>
-+        <element name="changeEmail" type="checkbox" selector=".form-edit-account input[name='change_email']"/>
-+        <element name="changePassword" type="checkbox" selector=".form-edit-account input[name='change_password']"/>
-+        <element name="testAddedAttributeFiled" type="input" selector="//input[contains(@id,'{{var}}')]" parameterized="true"/>
-+        <element name="saveButton" type="button" selector="#form-validate .action.save.primary" timeout="30"/>
-+        <element name="currentPassword" type="input" selector="#current-password"/>
-+        <element name="newPassword" type="input" selector="#password"/>
-+        <element name="confirmNewPassword" type="input" selector="#password-confirmation"/>
-+        <element name="confirmNewPasswordError" type="text" selector="#password-confirmation-error"/>
-+        <element name="email" type="input" selector=".form-edit-account input[name='email']" />
-+        <element name="emailErrorMessage" type="text" selector="#email-error"/>
-+        <element name="currentPasswordErrorMessage" type="text" selector="#current-password-error"/>
-+        <element name="emailField" type="input" selector="#email"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.xml
-new file mode 100644
-index 00000000000..a501a7ac4a6
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerAccountMainSection">
-+        <element name="pageTitle" type="text" selector="#maincontent .column.main [data-ui-id='page-title-wrapper']" />
-+        <element name="messageByType" type="block" selector="#maincontent .message-{{messageType}}" parameterized="true" />
-+        <element name="alertMessage" type="text" selector=".page.messages [role=alert]"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressFormSection.xml
-new file mode 100644
-index 00000000000..112ced1bc37
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressFormSection.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerAddressFormSection">
-+        <element name="firstName" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'firstname')]"/>
-+        <element name="lastName" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'lastname')]"/>
-+        <element name="company" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'company')]"/>
-+        <element name="phoneNumber" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'telephone')]"/>
-+        <element name="streetAddress" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'street')]"/>
-+        <element name="city" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'city')]"/>
-+        <element name="state" type="select" selector="//form[@class='form-address-edit']//select[contains(@name, 'region_id')]"/>
-+        <element name="zip" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'postcode')]"/>
-+        <element name="country" type="select" selector="//form[@class='form-address-edit']//select[contains(@name, 'country_id')]"/>
-+        <element name="useAsDefaultBillingAddressCheckBox" type="input" selector="//form[@class='form-address-edit']//input[@name='default_billing']"/>
-+        <element name="useAsDefaultShippingAddressCheckBox" type="input" selector="//form[@class='form-address-edit']//input[@name='default_shipping']"/>
-+        <element name="saveAddress" type="button" selector="//button[@title='Save Address']" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
-new file mode 100644
-index 00000000000..6e01742938e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerAddressesSection">
-+        <element name="defaultBillingAddress" type="text" selector=".box-address-billing" />
-+        <element name="billingAddressBlock" type="text" selector=".box-address-billing address" />
-+        <element name="editDefaultBillingAddress" type="text" selector="//div[@class='box-actions']//span[text()='Change Billing Address']" timeout="30"/>
-+        <element name="defaultShippingAddress" type="text" selector=".box-address-shipping" />
-+        <element name="shippingAddressBlock" type="text" selector=".box-address-shipping address" />
-+        <element name="editDefaultShippingAddress" type="text" selector="//div[@class='box-actions']//span[text()='Change Shipping Address']" timeout="30"/>
-+        <element name="addressesList" type="text" selector=".additional-addresses" />
-+        <element name="deleteAdditionalAddress" type="button" selector="//tbody//tr[{{var}}]//a[@class='action delete']" parameterized="true"/>
-+        <element name="editAdditionalAddress" type="button" selector="//tbody//tr[{{var}}]//a[@class='action edit']" parameterized="true" timeout="30"/>
-+        <element name="addNewAddress" type="button" selector="//span[text()='Add New Address']"/>
-+        <element name="numberOfAddresses" type="text" selector=".toolbar-number"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCompareProductSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCompareProductSection.xml
-new file mode 100644
-index 00000000000..c2d0d58b3c2
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCompareProductSection.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerCompareProductSection">
-+        <element name="title" type="text" selector="#block-compare-heading"/>
-+        <element name="emptyMessage" type="text" selector=".block-compare .empty"/>
-+
-+        <element name="productListMainArea" type="block" selector="#compare-items"/>
-+        <element name="productCount" type="text" selector=".block-compare .counter"/>
-+
-+        <element name="productByName" type="button" selector="//*[contains(@class, 'product-items')]//a[contains(@class, 'product-item-link')][contains(text(), '{{productName}}')]" parameterized="true"/>
-+        <element name="removeProductByName" type="button" selector="//li[contains(@class, 'product-item')]//*[contains(text(), '{{productName}}')]/../../a" parameterized="true"/>
-+
-+        <element name="compare" type="button" selector=".actions-toolbar .compare" timeout="30"/>
-+        <element name="clearAll" type="button" selector="#compare-clear-all" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
-index adf898a65f2..8881a2a012c 100644
---- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
-@@ -7,13 +7,28 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCustomerCreateFormSection">
-         <element name="firstnameField" type="input" selector="#firstname"/>
-         <element name="lastnameField" type="input" selector="#lastname"/>
-+        <element name="lastnameLabel" type="text" selector="//label[@for='lastname']"/>
-+        <element name="signUpForNewsletter" type="checkbox" selector="//div/input[@name='is_subscribed']"/>
-         <element name="emailField" type="input" selector="#email_address"/>
-         <element name="passwordField" type="input" selector="#password"/>
-         <element name="confirmPasswordField" type="input" selector="#password-confirmation"/>
-         <element name="createAccountButton" type="button" selector="button.action.submit.primary" timeout="30"/>
-     </section>
-+    <section name="StoreFrontCustomerAdvancedAttributesSection">
-+        <element name="textFieldAttribute" type="input" selector="//input[@id='{{var}}']" parameterized="true" />
-+        <element name="textAreaAttribute" type="input" selector="//textarea[@id='{{var}}']" parameterized="true" />
-+        <element name="multiLineFirstAttribute" type="input" selector="//input[@id='{{var}}_0']" parameterized="true" />
-+        <element name="multiLineSecondAttribute" type="input" selector="//input[@id='{{var}}_1']" parameterized="true" />
-+        <element name="datedAttribute" type="input" selector="//input[@id='{{var}}']" parameterized="true" />
-+        <element name="dropDownAttribute" type="select" selector="//select[@id='{{var}}']" parameterized="true" />
-+        <element name="dropDownOptionAttribute" type="text" selector="//*[@id='{{var}}']/option[2]" parameterized="true" />
-+        <element name="multiSelectFirstOptionAttribute" type="text" selector="//select[@id='{{var}}']/option[3]" parameterized="true" />
-+        <element name="yesNoAttribute" type="select" selector="//select[@id='{{var}}']" parameterized="true" />
-+        <element name="yesNoOptionAttribute" type="select" selector="//select[@id='{{var}}']/option[2]" parameterized="true" />
-+        <element name="selectedOption" type="text" selector="//select[@id='{{var}}']/option[@selected='selected']" parameterized="true"/>
-+    </section>
- </sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml
-index 21205c6d5d9..85d0fd166a7 100644
---- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml
-@@ -7,9 +7,12 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCustomerDashboardAccountInformationSection">
-         <element name="ContactInformation" type="textarea" selector=".box.box-information .box-content"/>
-+        <element name="edit" type="block" selector=".action.edit" timeout="15"/>
-+        <element name="changePassword" type="block" selector=".action.change-password" timeout="15"/>
-+        <element name="editLink" type="text" selector=".box-information .edit"/>
-     </section>
-     <section name="StorefrontCustomerAddressSection">
-         <element name="firstName" type="input" selector="#firstname"/>
-@@ -20,8 +23,12 @@
-         <element name="streetAddress2" type="input" selector="#street_2"/>
-         <element name="city" type="input" selector="#city"/>
-         <element name="stateProvince" type="select" selector="#region_id"/>
-+        <element name="stateProvinceFill" type="input" selector="#region"/>
-         <element name="zip" type="input" selector="#zip"/>
-         <element name="country" type="select" selector="#country"/>
-         <element name="saveAddress" type="button" selector="[data-action='save-address']" timeout="30"/>
-     </section>
-+    <section name="StorefrontCustomerRecentOrdersSection">
-+        <element name="orderTotal" type="text" selector=".total .price"/>
-+    </section>
- </sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerFooterSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerFooterSection.xml
-new file mode 100644
-index 00000000000..f68a69df058
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerFooterSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerFooterSection">
-+        <element name="footerBlock" type="block" selector="//footer"/>
-+        <element name="formSubscribe" type="input" selector="input#newsletter"/>
-+        <element name="buttonSubscribe" type="button" selector="//form[@id='newsletter-validate-detail']//button[contains(@class, 'subscribe')]" timeout="15"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginMessagesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginMessagesSection.xml
-new file mode 100644
-index 00000000000..a9859cf5875
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginMessagesSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerLoginMessagesSection">
-+        <element name="successMessage" type="text" selector=".message-success"/>
-+        <element name="errorMessage" type="text" selector=".message-error"/>
-+        <element name="messageByType" type="block" selector="#maincontent .message-{{messageType}}" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerMessagesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerMessagesSection.xml
-new file mode 100644
-index 00000000000..07d044921c8
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerMessagesSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerMessagesSection">
-+        <element name="successMessage" type="text" selector=".message-success"/>
-+        <element name="errorMessage" type="text" selector=".message-error"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml
-index c39dfef5f74..ec5141d84b1 100644
---- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml
-@@ -7,9 +7,15 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCustomerOrderSection">
-+        <element name="isMyOrdersSection" type="text" selector="//*[@class='page-title']//*[contains(text(), 'My Orders')]"/>
-         <element name="productCustomOptions" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd[normalize-space(.)='{{var3}}']" parameterized="true"/>
-         <element name="productCustomOptionsFile" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd[contains(.,'{{var3}}')]" parameterized="true"/>
-+        <element name="productCustomOptionsLink" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd//a[text() = '{{var3}}']" parameterized="true"/>
-+        <element name="status" type="text" selector="//td[contains(concat(' ',normalize-space(@class),' '),' col status ')]"/>
-+        <element name="viewOrder" type="button" selector="//td[contains(concat(' ',normalize-space(@class),' '),' col actions ')]/a[contains(concat(' ',normalize-space(@class),' '),' action view ')]"/>
-+        <element name="tabRefund" type="button" selector="//a[text()='Refunds']"/>
-+        <element name="grandTotalRefund" type="text" selector="td[data-th='Grand Total'] > strong > span.price"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
-index 9ea271dad7b..09b79fe8311 100644
---- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
-@@ -6,12 +6,17 @@
-   */
- -->
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCustomerOrderViewSection">
-         <element name="reorder" type="text" selector="a.action.order" timeout="30"/>
-         <element name="orderTitle" type="text" selector=".page-title span"/>
-         <element name="myOrdersTable" type="text" selector="#my-orders-table"/>
-         <element name="subtotal" type="text" selector=".subtotal .amount"/>
-         <element name="paymentMethod" type="text" selector=".payment-method dt"/>
-+        <element name="printOrderLink" type="text" selector="a.action.print" timeout="30"/>
-+        <element name="shippingAddress" type="text" selector=".box.box-order-shipping-address"/>
-+        <element name="billingAddress" type="text" selector=".box.box-order-billing-address"/>
-+        <element name="orderStatusInGrid" type="text" selector="//td[contains(.,'{{orderId}}')]/../td[contains(.,'{{status}}')]" parameterized="true"/>
-+        <element name="pager" type="block" selector=".pager"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerResentOrdersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerResentOrdersSection.xml
-new file mode 100644
-index 00000000000..6dc81a3a933
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerResentOrdersSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerResentOrdersSection">
-+        <element name="blockResentOrders" type="text" selector="//div[@class='block-title order']"/>
-+        <element name="viewOrder" type="button" selector="//td[text()='{{orderId}}']/following-sibling::td[@data-th='Actions']/a[@class='action view']" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml
-new file mode 100644
-index 00000000000..c6b9aa0372e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerSidebarSection">
-+        <element name="sidebarTab" type="text" selector="//div[@id='block-collapsible-nav']//a[text()='{{tabName}}']" parameterized="true" timeout="60"/>
-+        <element name="sidebarCurrentTab" type="text" selector="//div[@id='block-collapsible-nav']//*[contains(text(), '{{var}}')]" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
-index 9cc4a43d31b..b2c583e008a 100644
---- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
-@@ -7,10 +7,24 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCustomerSignInFormSection">
-         <element name="emailField" type="input" selector="#email"/>
-         <element name="passwordField" type="input" selector="#pass"/>
-         <element name="signInAccountButton" type="button" selector="#send2" timeout="30"/>
-+        <element name="forgotPasswordLink" type="button" selector=".action.remind" timeout="10"/>
-+        <element name="customerLoginBlock" type="text" selector=".login-container .block.block-customer-login"/>
-+    </section>
-+    <section name="StorefrontCustomerSignInPopupFormSection">
-+        <element name="errorMessage" type="input" selector="[data-ui-id='checkout-cart-validationmessages-message-error']"/>
-+        <element name="email" type="input" selector="#customer-email"/>
-+        <element name="password" type="input" selector="#pass"/>
-+        <element name="signIn" type="button" selector="#send2" timeout="30"/>
-+    </section>
-+    <section name="StorefrontCustomerSignInLinkSection">
-+        <element name="signInLink" type="button" selector=".action-auth-toggle" timeout="30"/>
-+        <element name="email" type="input" selector="#login-email"/>
-+        <element name="password" type="input" selector="#login-password"/>
-+        <element name="signInBtn" type="button" selector="//button[contains(@class, 'action-login') and not(contains(@id,'send2'))]" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerStoredPaymentMethodsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerStoredPaymentMethodsSection.xml
-new file mode 100644
-index 00000000000..d6b586e42f2
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerStoredPaymentMethodsSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerStoredPaymentMethodsSection">
-+        <element name="cardNumber" type="text" selector="td.card-number"/>
-+        <element name="expirationDate" type="text" selector="td.card-expire"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontForgotPasswordSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontForgotPasswordSection.xml
-new file mode 100644
-index 00000000000..bdae69c425d
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontForgotPasswordSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontForgotPasswordSection">
-+        <element name="pageTitle" type="text" selector=".page-title"/>
-+        <element name="email" type="input" selector="#email_address"/>
-+        <element name="resetMyPasswordButton" type="button" selector=".action.submit.primary" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
-index 65e7aa7a121..3610532c535 100644
---- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
-@@ -7,9 +7,17 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontPanelHeaderSection">
-+        <!-- Element name="WelcomeMessage" Deprecated due to incorrect naming convention please use name="welcomeMessage" -->
-         <element name="WelcomeMessage" type="text" selector=".greet.welcome span"/>
--        <element name="createAnAccountLink" type="select" selector=".panel.header li:nth-child(3)" timeout="30"/>
-+
-+        <element name="welcomeMessage" type="text" selector="header>.panel .greet.welcome" />
-+        <element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//li/a[contains(.,'Create an Account')]" timeout="30"/>
-+        <element name="notYouLink" type="button" selector=".greet.welcome span a"/>
-+        <element name="customerWelcome" type="text" selector=".panel.header .greet.welcome"/>
-+        <element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-name"/>
-+        <element name="customerLoginLink" type="button" selector=".panel.header .header.links .authorization-link a" timeout="30"/>
-+        <element name="customerLogoutLink" type="text" selector=".panel.header .customer-welcome .customer-menu .authorization-link a" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
-new file mode 100644
-index 00000000000..4442e317694
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="LoginFormSection">
-+        <element name="username" type="input" selector="#username"/>
-+        <element name="password" type="input" selector="#login"/>
-+        <element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
-+    </section>
-+
-+    <section name="SignOutSection">
-+        <element name="admin" type="button" selector=".admin__action-dropdown-text"/>
-+        <element name="logout" type="button" selector="//*[contains(text(), 'Sign Out')]"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml
-new file mode 100644
-index 00000000000..01f35439f23
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml
-@@ -0,0 +1,46 @@
-+<?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="AddingProductWithExpiredSessionTest">
-+        <annotations>
-+            <title value="Adding a product to cart from category page with an expired session"/>
-+            <description value="Adding a product to cart from category page with an expired session"/>
-+            <features value="Module/ Catalog"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-93289"/>
-+            <stories value="MAGETWO-66666: Adding a product to cart from category page with an expired session does not allow product to be added"/>
-+            <group value="customer"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+
-+        <!--Navigate to a category page -->
-+        <amOnPage url="$$createSimpleProduct.name$$.html" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+
-+        <!-- Remove PHPSESSID and form_key to replicate an expired session-->
-+        <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
-+        <resetCookie userInput="form_key" stepKey="resetCookieForCart2"/>
-+
-+        <!-- "Add to Cart" any product-->
-+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
-+        <see stepKey="assertErrorMessage" userInput="Your session has expired"/>
-+        <after>
-+            <!--Delete created product-->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml
-new file mode 100644
-index 00000000000..fba7ebd2d4d
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml
-@@ -0,0 +1,69 @@
-+<?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="AdminAddNewDefaultBillingShippingCustomerAddressTest">
-+        <annotations>
-+            <stories value="Add new default billing/shipping customer address"/>
-+            <title value="Add new default billing/shipping customer address"/>
-+            <description value="Add new default billing/shipping customer address on customer addresses tab"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-94814"/>
-+            <group value="customer"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer_Multiple_Addresses_No_Default_Address" stepKey="customer"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- -
-+        Step1. Login to admin and go to Customers > All Customers.
-+        Step2. On *Customers* page choose customer from preconditions and open it to edit
-+        Step3. Open *Addresses* tab on edit customer page and press *Add New Address* button
-+        <!- -->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
-+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses_No_Default_Address"/>
-+        </actionGroup>
-+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
-+        <waitForPageLoad stepKey="waitForAddresses"/>
-+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
-+        <seeElement selector="{{AdminCustomerAddressesDefaultBillingSection.address}}" stepKey="seeDefaultBillingAddressSectionBeforeChangingDefaultAddress"/>
-+        <see userInput="The customer does not have default billing address" selector="{{AdminCustomerAddressesDefaultBillingSection.address}}" stepKey="assertThereIsNoDefaultBillingAddressSet"/>
-+        <seeElement selector="{{AdminCustomerAddressesDefaultShippingSection.address}}" stepKey="seeDefaultShippingAddressSectionBeforeChangingDefaultAddress"/>
-+        <see userInput="The customer does not have default shipping address" selector="{{AdminCustomerAddressesDefaultShippingSection.address}}" stepKey="assertThereIsNoDefaultShippingAddressSet"/>
-+        <click selector="{{AdminCustomerAddressesSection.addNewAddress}}" stepKey="clickAddNewAddressButton"/>
-+        <waitForPageLoad stepKey="waitForAddUpdateCustomerAddressForm"/>
-+        <!--Step4. Fill all the fields with test data and press *Save* button-->
-+        <click selector="{{AdminCustomerAddressesSection.defaultBillingAddress}}" stepKey="enableDefaultBillingAddress"/>
-+        <click selector="{{AdminCustomerAddressesSection.defaultShippingAddress}}" stepKey="enableDefaultShippingAddress"/>
-+        <fillField userInput="{{US_Address_TX.firstname}}" selector="{{AdminCustomerAddressesSection.firstNameForAddress}}" stepKey="fillFirstName"/>
-+        <fillField userInput="{{US_Address_TX.lastname}}" selector="{{AdminCustomerAddressesSection.lastNameForAddress}}" stepKey="fillLastName"/>
-+        <fillField userInput="{{US_Address_TX.company}}" selector="{{AdminCustomerAddressesSection.company}}" stepKey="fillCompany"/>
-+        <fillField userInput="{{US_Address_TX.street[0]}}" selector="{{AdminCustomerAddressesSection.streetAddress}}" stepKey="fillStreet"/>
-+        <fillField userInput="{{US_Address_TX.city}}" selector="{{AdminCustomerAddressesSection.city}}" stepKey="fillCity"/>
-+        <click selector="{{AdminCustomerAddressesSection.country}}" stepKey="clickCountryToOpenListOfCountries"/>
-+        <click selector="{{AdminCustomerAddressesSection.countryId(US_Address_TX.country_id)}}" stepKey="fillCountry"/>
-+        <fillField userInput="{{US_Address_TX.postcode}}" selector="{{AdminCustomerAddressesSection.zip}}" stepKey="fillPostcode"/>
-+        <fillField userInput="{{US_Address_TX.telephone}}" selector="{{AdminCustomerAddressesSection.phoneNumber}}" stepKey="fillTelephone"/>
-+        <click selector="{{AdminCustomerAddressesSection.region}}" stepKey="clickRegionToOpenListOfRegions"/>
-+        <click selector="{{AdminCustomerAddressesSection.regionId(US_Address_TX.state)}}" stepKey="fillRegion"/>
-+        <click selector="{{AdminCustomerAddressesSection.saveAddress}}" stepKey="clickSaveCustomerAddressOnAddUpdateAddressForm"/>
-+        <waitForPageLoad stepKey="waitForNewAddressIsCreated"/>
-+        <see userInput="{{US_Address_TX.street[0]}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="assertDefaultBillingAddressIsChanged"/>
-+        <see userInput="{{US_Address_TX.street[0]}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="assertDefaultShippingAddressIsChanged"/>
-+        <click selector="{{AdminCustomerAddressesDefaultBillingSection.editButton}}" stepKey="clickEditDefaultBillingAddress"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressAddUpdateFormLoad"/>
-+        <assertElementContainsAttribute selector="{{AdminCustomerAddressesSection.defaultBillingAddressCheckBox}}" attribute="value" expectedValue="1" stepKey="assertDefaultBillingIsEnabledCustomerAddressAddUpdateForm"/>
-+        <assertElementContainsAttribute selector="{{AdminCustomerAddressesSection.defaultShippingAddressCheckBox}}" attribute="value" expectedValue="1" stepKey="assertDefaultShippingIsEnabledOnCustomerAddressAddUpdateForm"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerGroupAlreadyExistsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerGroupAlreadyExistsTest.xml
-new file mode 100644
-index 00000000000..6b1c1f29f97
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerGroupAlreadyExistsTest.xml
-@@ -0,0 +1,39 @@
-+<?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="AdminCreateCustomerGroupAlreadyExistsTest">
-+        <annotations>
-+            <features value="Create customer group already exists"/>
-+            <stories value="Create customer group"/>
-+            <title value="Create customer group already exists"/>
-+            <description value="Create customer group already exists"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5302"/>
-+            <group value="customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Steps: 1. Log in to backend as admin user.
-+                    2. Navigate to Stores > Other Settings > Customer Groups.
-+                    3. Start to create new Customer Group.
-+                    4. Fill in all data according to data set:  Group Name "General", Tax Class "Retail customer"
-+                    5. Click "Save Customer Group" button. -->
-+        <!--  Assert  "Customer Group already exists." error message displayed -->
-+        <actionGroup ref="AdminAssertErrorMessageCustomerGroupAlreadyExists" stepKey="seeErrorMessageCustomerGroupAlreadyExists">
-+            <argument name="groupName" value="{{GeneralCustomerGroup.code}}"/>
-+            <argument name="taxClass" value="{{GeneralCustomerGroup.tax_class_name}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml
-new file mode 100644
-index 00000000000..36592ab38e9
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml
-@@ -0,0 +1,63 @@
-+<?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="AdminCreateCustomerRetailerWithoutAddressTest">
-+        <annotations>
-+            <stories value="Create customer"/>
-+            <title value="Create customer, retailer without address"/>
-+            <description value="Login as admin and create customer retailer without address"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5310"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
-+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Filter the customer From grid-->
-+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
-+        <waitForPageLoad time="30" stepKey="waitToCustomerPageLoad"/>
-+        <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="Retailer" stepKey="fillCustomerGroup"/>
-+        <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
-+        <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
-+        <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
-+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
-+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
-+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
-+        <reloadPage stepKey="reloadPage"/>
-+
-+        <!--Verify Customer in grid -->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail1">
-+            <argument name="email" value="{{CustomerEntityOne.email}}"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForCustomerPageToLoad"/>
-+        <see selector="{{AdminCustomerGridSection.customerGrid}}" userInput="Retailer" stepKey="assertGroup"/>
-+        <see userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
-+        <see userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
-+        <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
-+
-+        <!--Assert Customer Form -->
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
-+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
-+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
-+        <see selector="{{AdminCustomerAccountInformationSection.groupIdValue}}" userInput="Retailer" stepKey="seeCustomerGroup1"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="seeCustomerFirstName"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="seeCustomerLastName"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeCustomerEmail"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
-index bde15b31ff1..78bae7ad60d 100644
---- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateCustomerTest">
-         <annotations>
-             <features value="Customer"/>
-@@ -19,6 +19,9 @@
-             <group value="customer"/>
-             <group value="create"/>
-         </annotations>
-+        <before>
-+            <magentoCLI command="indexer:reindex customer_grid" stepKey="reindexCustomerGrid"/>
-+        </before>
-         <after>
-             <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-         </after>
-@@ -27,17 +30,17 @@
-         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-         <waitForPageLoad stepKey="waitForLoad1"/>
-         <click selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}" stepKey="clickCreateCustomer"/>
--        <waitForElement selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="wait1"/>
-         <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
-         <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
-         <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
-         <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
--        <waitForElementNotVisible selector="div [data-role='spinner']" time="10" stepKey="waitForSpinner1"/>
-         <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
-+        <magentoCLI stepKey="reindex" command="indexer:reindex"/>
-+        <reloadPage stepKey="reloadPage"/>
-+        <waitForPageLoad stepKey="waitForLoad2"/>
-         <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
-         <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
-         <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
--        <waitForElementNotVisible selector="div [data-role='spinner']" time="10" stepKey="waitForSpinner2"/>
-         <see userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
-         <see userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
-         <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml
-new file mode 100644
-index 00000000000..cbc8b89d3f2
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml
-@@ -0,0 +1,92 @@
-+<?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="AdminCreateCustomerWithCountryPolandTest">
-+        <annotations>
-+            <stories value="Create customer"/>
-+            <title value="Create customer, from Poland"/>
-+            <description value="Login as admin and create customer with Poland address"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5311"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="Simple_Customer_Without_Address" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Filter the created customer From grid-->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
-+            <argument name="email" value="$$createCustomer.email$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton"/>
-+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
-+
-+        <!--Add the Address -->
-+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="selectAddress"/>
-+        <waitForPageLoad stepKey="waitForAddressPageToLoad"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.addNewAddress}}" stepKey="ClickOnAddNewAddressButton"/>
-+        <waitForPageLoad stepKey="waitForNewAddressPageToLoad"/>
-+        <checkOption selector="{{AdminCustomerAddressesSection.defaultBillingAddress}}" stepKey="EnableDefaultBillingAddress"/>
-+        <fillField selector="{{AdminEditCustomerAddressesSection.streetAddress}}" userInput="{{PolandAddress.street}}" stepKey="fillStreetAddress"/>
-+        <fillField selector="{{AdminEditCustomerAddressesSection.city}}" userInput="{{PolandAddress.city}}" stepKey="fillCity"/>
-+        <scrollTo selector="{{AdminEditCustomerAddressesSection.phone}}" x="0" y="-80" stepKey="scrollToPhone"/>
-+        <selectOption selector="{{AdminEditCustomerAddressesSection.country}}" userInput="{{PolandAddress.country}}" stepKey="fillCountry"/>
-+        <fillField selector="{{AdminEditCustomerAddressesSection.zipCode}}" userInput="{{PolandAddress.postcode}}" stepKey="fillPostCode"/>
-+        <fillField selector="{{AdminEditCustomerAddressesSection.phone}}" userInput="{{PolandAddress.telephone}}" stepKey="fillPhoneNumber"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="clickOnSaveButton"/>
-+        <waitForPageLoad stepKey="waitForPageToBeSaved"/>
-+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
-+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
-+
-+        <!-- Assert Customer in grid -->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail1">
-+            <argument name="email" value="$$createCustomer.email$$"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <see userInput="$$createCustomer.firstname$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
-+        <see userInput="$$createCustomer.lastname$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
-+        <see userInput="$$createCustomer.email$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
-+        <see userInput="{{PolandAddress.country}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertCountry"/>
-+        <see userInput="{{PolandAddress.postcode}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPostCode"/>
-+        <see userInput="{{PolandAddress.telephone}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPhoneNumber"/>
-+
-+        <!--Assert Customer Form -->
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
-+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
-+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="$$createCustomer.firstname$$" stepKey="seeCustomerFirstName"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="$$createCustomer.lastname$$" stepKey="seeCustomerLastName"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.email}}" userInput="$$createCustomer.email$$" stepKey="seeCustomerEmail"/>
-+        <click selector="{{AdminCustomerAccountInformationSection.addressesButton}}" stepKey="clickOnAddressButton"/>
-+        <waitForPageLoad stepKey="waitForAddressGridToLoad"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="$$createCustomer.firstname$$" stepKey="seeAFirstNameInDefaultAddressSection"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="$$createCustomer.lastname$$" stepKey="seeLastNameInDefaultAddressSection"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{PolandAddress.street}}" stepKey="seeStreetInDefaultAddressSection"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{PolandAddress.city}}" stepKey="seeLCityInDefaultAddressSection"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{PolandAddress.country}}" stepKey="seeCountrynDefaultAddressSection"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{PolandAddress.postcode}}" stepKey="seePostCodeInDefaultAddressSection"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{PolandAddress.telephone}}" stepKey="seePhoneNumberInDefaultAddressSection"/>
-+
-+        <!--Assert Customer Address Grid -->
-+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.street}}" stepKey="seeStreetAddress"/>
-+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.city}}" stepKey="seeCity"/>
-+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.country}}" stepKey="seeCountry"/>
-+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.postcode}}" stepKey="seePostCode"/>
-+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.telephone}}" stepKey="seePhoneNumber"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml
-new file mode 100644
-index 00000000000..43f2aa7f8de
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml
-@@ -0,0 +1,95 @@
-+<?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="AdminCreateCustomerWithCountryUSATest">
-+        <annotations>
-+            <stories value="Create customer"/>
-+            <title value="Create customer, from USA"/>
-+            <description value="Login as admin and create customer with USA address"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5309"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="Simple_Customer_Without_Address" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Filter the customer From grid-->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
-+            <argument name="email" value="$$createCustomer.email$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton"/>
-+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
-+
-+        <!-- Add the Address -->
-+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="selectAddress"/>
-+        <waitForPageLoad stepKey="waitForAddressPageToLoad"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.addNewAddress}}" stepKey="ClickOnAddNewAddressButton"/>
-+        <waitForPageLoad stepKey="waitForNewAddressPageToLoad"/>
-+        <checkOption selector="{{AdminCustomerAddressesSection.defaultBillingAddress}}" stepKey="EnableDefaultBillingAddress"/>
-+        <fillField selector="{{AdminEditCustomerAddressesSection.streetAddress}}" userInput="{{US_Address_CA.street}}" stepKey="fillStreetAddress"/>
-+        <fillField selector="{{AdminEditCustomerAddressesSection.city}}" userInput="{{US_Address_CA.city}}" stepKey="fillCity"/>
-+        <scrollTo selector="{{AdminEditCustomerAddressesSection.phone}}" x="0" y="-80" stepKey="scrollToPhone"/>
-+        <selectOption selector="{{AdminEditCustomerAddressesSection.country}}" userInput="{{US_Address_CA.country}}" stepKey="fillCountry"/>
-+        <selectOption selector="{{AdminEditCustomerAddressesSection.state}}" userInput="{{US_Address_CA.state}}" stepKey="fillState"/>
-+        <fillField selector="{{AdminEditCustomerAddressesSection.zipCode}}" userInput="{{US_Address_CA.postcode}}" stepKey="fillPostCode"/>
-+        <fillField selector="{{AdminEditCustomerAddressesSection.phone}}" userInput="{{US_Address_CA.telephone}}" stepKey="fillPhoneNumber"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="clickOnSaveButton"/>
-+        <waitForPageLoad stepKey="waitForPageToBeSaved"/>
-+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
-+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
-+
-+        <!-- Assert Customer in grid -->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail1">
-+            <argument name="email" value="$$createCustomer.email$$"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <see userInput="$$createCustomer.firstname$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
-+        <see userInput="$$createCustomer.lastname$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
-+        <see userInput="$$createCustomer.email$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
-+        <see userInput="{{US_Address_CA.state}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertState"/>
-+        <see userInput="{{US_Address_CA.country}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertCountry"/>
-+        <see userInput="{{US_Address_CA.postcode}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPostCode"/>
-+        <see userInput="{{US_Address_CA.telephone}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPhoneNumber"/>
-+
-+        <!--Assert Customer Form -->
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
-+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
-+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="$$createCustomer.firstname$$" stepKey="seeCustomerFirstName"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="$$createCustomer.lastname$$" stepKey="seeCustomerLastName"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.email}}" userInput="$$createCustomer.email$$" stepKey="seeCustomerEmail"/>
-+        <click selector="{{AdminCustomerAccountInformationSection.addressesButton}}" stepKey="clickOnAddressButton"/>
-+        <waitForPageLoad stepKey="waitForAddressGridToLoad"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="$$createCustomer.firstname$$" stepKey="seeAFirstNameInDefaultAddressSection"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="$$createCustomer.lastname$$" stepKey="seeLastNameInDefaultAddressSection"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{US_Address_CA.street}}" stepKey="seeStreetInDefaultAddressSection"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{US_Address_CA.city}}" stepKey="seeLCityInDefaultAddressSection"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{US_Address_CA.country}}" stepKey="seeCountrynDefaultAddressSection"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{US_Address_CA.postcode}}" stepKey="seePostCodeInDefaultAddressSection"/>
-+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{US_Address_CA.telephone}}" stepKey="seePhoneNumberInDefaultAddressSection"/>
-+
-+        <!--Assert Customer Address Grid -->
-+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.street}}" stepKey="seeStreetAddress"/>
-+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.city}}" stepKey="seeCity"/>
-+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.country}}" stepKey="seeCountry"/>
-+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.state}}" stepKey="seeState"/>
-+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.postcode}}" stepKey="seePostCode"/>
-+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.telephone}}" stepKey="seePhoneNumber"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
-new file mode 100644
-index 00000000000..872da149ed0
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
-@@ -0,0 +1,65 @@
-+<?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="AdminCreateCustomerWithCustomGroupTest">
-+        <annotations>
-+            <stories value="Create customer"/>
-+            <title value="Create customer, with custom group"/>
-+            <description value="Login as admin and create customer with custom group"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5313"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="CustomCustomerGroup" stepKey="customerGroup" />
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
-+                <argument name="email" value="{{CustomerEntityOne.email}}" />
-+            </actionGroup>
-+            <deleteData createDataKey="customerGroup" stepKey="deleteCustomerGroup"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open New Customer Page -->
-+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
-+        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
-+        <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="$$customerGroup.code$$" stepKey="fillCustomerGroup"/>
-+        <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
-+        <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
-+        <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
-+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
-+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
-+        <magentoCLI stepKey="flushMagentoCache" command="cache:flush" />
-+        <reloadPage stepKey="reloadPage"/>
-+
-+        <!--Verify Customer in grid -->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail1">
-+            <argument name="email" value="{{CustomerEntityOne.email}}"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForCustomerPageToLoad"/>
-+        <see selector="{{AdminCustomerGridSection.customerGrid}}" userInput="$$customerGroup.code$$" stepKey="assertGroup"/>
-+        <see userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
-+        <see userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
-+        <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
-+
-+        <!--Assert Customer Form -->
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
-+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
-+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
-+        <see selector="{{AdminCustomerAccountInformationSection.groupIdValue}}" userInput="$$customerGroup.code$$" stepKey="seeCustomerGroup1"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="seeCustomerFirstName"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="seeCustomerLastName"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeCustomerEmail"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml
-new file mode 100644
-index 00000000000..1b901a7b3e1
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml
-@@ -0,0 +1,70 @@
-+<?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="AdminCreateCustomerWithPrefixTest">
-+        <annotations>
-+            <stories value="Create customer"/>
-+            <title value="Create customer, with prefix"/>
-+            <description value="Login as admin and create a customer with name prefix and suffix"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5308"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
-+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open New Customer Page  and create a customer with Prefix and Suffix-->
-+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
-+        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
-+        <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="Wholesale" stepKey="fillCustomerGroup"/>
-+        <fillField selector="{{AdminCustomerAccountInformationSection.namePrefix}}" userInput="{{CustomerEntityOne.prefix}}" stepKey="fillNamePrefix"/>
-+        <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
-+        <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
-+        <fillField selector="{{AdminCustomerAccountInformationSection.nameSuffix}}" userInput="{{CustomerEntityOne.suffix}}" stepKey="fillNameSuffix"/>
-+        <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
-+        <fillField userInput="{{CustomerEntityOne.dob}}" selector="{{AdminCustomerAccountInformationSection.dateOfBirth}}" stepKey="fillDateOfBirth"/>
-+        <selectOption userInput="Male" selector="{{AdminCustomerAccountInformationSection.gender}}" stepKey="fillGender"/>
-+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
-+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
-+        <reloadPage stepKey="reloadPage"/>
-+
-+        <!--Filter the customer From grid-->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
-+            <argument name="email" value="{{CustomerEntityOne.email}}"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!-- Assert Customer in grid -->
-+        <see userInput="{{CustomerEntityOne.prefix}} {{CustomerEntityOne.firstname}} {{CustomerEntityOne.lastname}} {{CustomerEntityOne.suffix}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
-+        <see userInput="Wholesale" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertCustomerGroup"/>
-+        <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
-+        <see userInput="Jan 1, 1970" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertDateOfBirth"/>
-+        <see userInput="Male" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertGender"/>
-+
-+        <!--Assert Customer Form -->
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
-+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
-+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.namePrefix}}" userInput="{{CustomerEntityOne.prefix}}" stepKey="seeCustomerNamePrefix"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="seeCustomerFirstName"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="seeCustomerLastName"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.nameSuffix}}" userInput="{{CustomerEntityOne.suffix}}" stepKey="seeCustomerNameSuffix"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeCustomerEmail"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
-new file mode 100644
-index 00000000000..fe4bb3ee59e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
-@@ -0,0 +1,61 @@
-+<?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="AdminCreateCustomerWithoutAddressTest">
-+        <annotations>
-+            <stories value="Create customer"/>
-+            <title value="Create customer, without address"/>
-+            <description value="Login as admin and create a customer without address"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5307"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
-+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open New Customer Page -->
-+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
-+        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
-+        <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
-+        <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
-+        <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
-+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
-+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
-+        <reloadPage stepKey="reloadPage"/>
-+
-+        <!--Filter the customer From grid-->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
-+            <argument name="email" value="{{CustomerEntityOne.email}}"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!-- Assert Customer in grid -->
-+        <see userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
-+        <see userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
-+        <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
-+
-+        <!--Assert Customer Form -->
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
-+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
-+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="seeCustomerFirstName"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="seeCustomerLastName"/>
-+        <seeInField selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeCustomerEmail"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
-new file mode 100644
-index 00000000000..22ad60ff5de
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
-@@ -0,0 +1,54 @@
-+<?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="AdminCreateNewCustomerOnStorefrontSignupNewsletterTest">
-+        <annotations>
-+            <stories value="Create New Customer"/>
-+            <title value="Create New Customer on Storefront, Sign-up Newsletter"/>
-+            <description value="Test log in to Create New Customer and Create New Customer on Storefront, Sign-up Newsletter"/>
-+            <testCaseId value="MC-10914"/>
-+            <severity value="CRITICAL"/>
-+            <group value="customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteNewUser">
-+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create new customer on storefront and signup news letter-->
-+        <actionGroup ref="StorefrontCreateCustomerSignedUpNewsletterActionGroup" stepKey="createCustomer">
-+            <argument name="customer" value="CustomerEntityOne" />
-+        </actionGroup>
-+
-+        <!--Assert verify created new customer in grid-->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-+        <waitForPageLoad stepKey="waitForNavigateToCustomersPageLoad"/>
-+        <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="clickFilterButton"/>
-+        <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
-+        <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="clickApplyFilter"/>
-+        <see selector="{{AdminCustomerGridSection.customerGrid}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="seeAssertCustomerFirstNameInGrid"/>
-+        <see selector="{{AdminCustomerGridSection.customerGrid}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="seeAssertCustomerLastNameInGrid"/>
-+        <see selector="{{AdminCustomerGridSection.customerGrid}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeAssertCustomerEmailInGrid"/>
-+
-+        <!--Assert verify created new customer is subscribed to newsletter-->
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickFirstRowEditLink"/>
-+        <waitForPageLoad stepKey="waitForEditLinkLoad"/>
-+        <click selector="{{AdminEditCustomerInformationSection.newsLetter}}" stepKey="clickNewsLetter"/>
-+        <waitForPageLoad stepKey="waitForNewsletterTabToOpen"/>
-+        <seeCheckboxIsChecked selector="{{AdminEditCustomerNewsletterSection.subscribedToNewsletter}}" stepKey="seeAssertSubscribedToNewsletterCheckboxIsChecked"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontTest.xml
-new file mode 100644
-index 00000000000..fc65a271a81
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontTest.xml
-@@ -0,0 +1,40 @@
-+<?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="AdminCreateNewCustomerOnStorefrontTest">
-+        <annotations>
-+            <stories value="Create New Customer"/>
-+            <title value="Create New Customer on Storefront"/>
-+            <description value="Test log in to Create New Customer and Create New Customer on Storefront"/>
-+            <testCaseId value="MC-10915"/>
-+            <severity value="CRITICAL"/>
-+            <group value="customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteNewUser">
-+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create new customer on storefront and perform the asserts-->
-+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="signUpNewUser">
-+            <argument name="customer" value="CustomerEntityOne"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertSignedUpNewsletterActionGroup" stepKey="assertSignedUpNewsLetter">
-+            <argument name="customer" value="CustomerEntityOne"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
-new file mode 100644
-index 00000000000..de4ab9ffaa1
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
-@@ -0,0 +1,54 @@
-+<?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="AdminCreateNewCustomerTest">
-+        <annotations>
-+            <stories value="Create customer"/>
-+            <title value="Create customer, new via backend"/>
-+            <description value="Login as admin and create a new customer"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5312"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
-+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open New Customer Page -->
-+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
-+        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
-+        <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
-+        <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
-+        <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
-+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
-+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
-+        <reloadPage stepKey="reloadPage"/>
-+
-+        <!--Filter the customer From grid-->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
-+            <argument name="email" value="{{CustomerEntityOne.email}}"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
-+
-+        <!-- Assert Customer Title -->
-+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
-+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
-+        <see stepKey="seeCustomerTitle" selector="{{AdminEditCustomerInformationSection.customerTitle}}" userInput="{{CustomerEntityOne.firstname}} {{CustomerEntityOne.lastname}} "/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateRetailCustomerGroupTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateRetailCustomerGroupTest.xml
-new file mode 100644
-index 00000000000..4f1d88ffe99
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateRetailCustomerGroupTest.xml
-@@ -0,0 +1,71 @@
-+<?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="AdminCreateRetailCustomerGroupTest">
-+        <annotations>
-+            <features value="Create retail customer group"/>
-+            <stories value="Create customer group"/>
-+            <title value="Create retail customer group"/>
-+            <description value="Create retail customer group"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5301"/>
-+            <group value="customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminDeleteCustomerGroupActionGroup" stepKey="deleteCustomerGroup">
-+                <argument name="customerGroupName" value="{{CustomCustomerGroup.code}}"/>
-+            </actionGroup>
-+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilters"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Steps: 1. Log in to backend as admin user.
-+                    2. Navigate to Stores > Other Settings > Customer Groups.
-+                    3. Start to create new Customer Group.
-+                    4. Fill in all data according to data set.   Tax Class  -  "Retail customer"
-+                    5. Click "Save Customer Group" button. -->
-+        <!-- Assert "You saved the customer group." success message displayed  -->
-+        <!-- Assert created Customer Group displayed In Grid  -->
-+        <actionGroup ref="AdminCreateCustomerGroupActionGroup" stepKey="createCustomerGroup">
-+            <argument name="groupName" value="{{CustomCustomerGroup.code}}"/>
-+            <argument name="taxClass" value="{{CustomCustomerGroup.tax_class_name}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertCustomerGroupPresentInGrid" stepKey="assertCustomerGroupDisplayedInGrid">
-+            <argument name="customerGroupName" value="{{CustomCustomerGroup.code}}"/>
-+        </actionGroup>
-+
-+        <!--  6. Go to Catalog -> Products  -> click  "Add Product" button -> click "Advanced Pricing" link -> Customer Group Price -> click  "Add" button  -->
-+        <!--  Assert: Customer Group Displayed On Product Form  -->
-+        <actionGroup ref="AdminAssertCustomerGroupOnProductForm" stepKey="assertCustomerGroupDisplayedOnProductForm">
-+            <argument name="customerGroupName" value="{{CustomCustomerGroup.code}}"/>
-+        </actionGroup>
-+
-+        <!--  7. Go to Customers -> All Customers  -> click  "Add New Customer" button -->
-+        <!--  Assert   created  Customer Group  displayed On Customer Form -->
-+        <actionGroup ref="AdminAssertCustomerGroupOnCustomerForm" stepKey="assertCustomerGroupDisplayedOnCustomerForm">
-+            <argument name="customerGroupName" value="{{CustomCustomerGroup.code}}"/>
-+        </actionGroup>
-+
-+        <!-- 8. Go to Marketing - Catalog Price Rule - click  "Add New Rule" button  -->
-+        <!--   Assert   created  Customer Group  displayed On Catalog Price Rule Form -->
-+        <actionGroup ref="AdminAssertCustomerGroupOnCatalogPriceRuleForm" stepKey="assertCustomerGroupDisplayedOnCatalogPriceRuleForm">
-+            <argument name="customerGroupName" value="{{CustomCustomerGroup.code}}"/>
-+        </actionGroup>
-+
-+        <!-- 9. Go to Marketing - Cart Price Rule - click  "Add New Rule" button -->
-+        <!--   Assert   created  Customer Group  displayed On Cart Price Rule Form -->
-+        <actionGroup ref="AdminAssertCustomerGroupOnCartPriceRuleForm" stepKey="assertCustomerGroupDisplayedOnCartPriceRuleForm">
-+            <argument name="customerGroupName" value="{{CustomCustomerGroup.code}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateTaxClassCustomerGroupTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateTaxClassCustomerGroupTest.xml
-new file mode 100644
-index 00000000000..7d54ede7c16
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateTaxClassCustomerGroupTest.xml
-@@ -0,0 +1,58 @@
-+<?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="AdminCreateTaxClassCustomerGroupTest">
-+        <annotations>
-+            <features value="Create tax class customer group"/>
-+            <stories value="Create customer group"/>
-+            <title value="Create tax class customer group"/>
-+            <description value="Create tax class customer group"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5303"/>
-+            <group value="customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create Tax Class "Customer tax class"-->
-+            <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
-+            <getData entity="customerTaxClass" stepKey="customerTaxClassData">
-+                <requiredEntity createDataKey="createCustomerTaxClass"/>
-+            </getData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminDeleteCustomerGroupActionGroup" stepKey="deleteCustomerGroup">
-+                <argument name="customerGroupName" value="{{CustomCustomerGroup.code}}"/>
-+            </actionGroup>
-+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilters"/>
-+            <deleteData createDataKey="createCustomerTaxClass" stepKey="deleteCustomerTaxClass"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Steps: 1. Log in to backend as admin user.
-+                    2. Navigate to Stores > Other Settings > Customer Groups.
-+                    3. Start to create new Customer Group.
-+                    4. Fill in all data according to data set:   Tax Class "Customer tax class"
-+                    5. Click "Save Customer Group" button. -->
-+        <!-- Assert "You saved the customer group." success message displayed  -->
-+        <!-- Assert created Customer Group displayed In Grid  -->
-+        <actionGroup ref="AdminCreateCustomerGroupActionGroup" stepKey="createNewCustomerGroup">
-+            <argument name="groupName" value="{{CustomCustomerGroup.code}}"/>
-+            <argument name="taxClass" value="$$customerTaxClassData.class_name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertCustomerGroupPresentInGrid" stepKey="assertCustomerGroupDisplayedInGrid">
-+            <argument name="customerGroupName" value="{{CustomCustomerGroup.code}}"/>
-+        </actionGroup>
-+        <!-- 6. Go to Customers -> All Customers  -> click  "Add New Customer" button -->
-+        <!--  Assert   created  Customer Group  displayed On Customer Form -->
-+        <actionGroup ref="AdminAssertCustomerGroupOnCustomerForm" stepKey="assertCustomerGroupDisplayedOnCustomerForm">
-+            <argument name="customerGroupName" value="{{CustomCustomerGroup.code}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersAllCustomersNavigateMenuTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersAllCustomersNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..76e4407675e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersAllCustomersNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminCustomersAllCustomersNavigateMenuTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin customers all customers navigate menu test"/>
-+            <description value="Admin should be able to navigate to Customers > All Customers"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14113"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToAllCustomerPage">
-+            <argument name="menuUiId" value="{{AdminMenuCustomers.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuCustomersAllCustomers.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuCustomersAllCustomers.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersCustomerGroupsNavigateMenuTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersCustomerGroupsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..13a4b1c7143
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersCustomerGroupsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminCustomersCustomerGroupsNavigateMenuTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin customers customer groups navigate menu test"/>
-+            <description value="Admin should be able to navigate to Customers > Customer Groups"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14115"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCustomerGroupsPage">
-+            <argument name="menuUiId" value="{{AdminMenuCustomers.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuCustomersCustomerGroups.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuCustomersCustomerGroups.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersNowOnlineNavigateMenuTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersNowOnlineNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..e9eb7803e01
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersNowOnlineNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminCustomersNowOnlineNavigateMenuTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin customers now online navigate menu test"/>
-+            <description value="Admin should be able to navigate to Customers > Now Online"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14114"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNowOnlinePage">
-+            <argument name="menuUiId" value="{{AdminMenuCustomers.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuCustomersNowOnline.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuCustomersNowOnline.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml
-new file mode 100644
-index 00000000000..4f501c27352
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml
-@@ -0,0 +1,58 @@
-+<?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="AdminDeleteCustomerAddressesFromTheGridTest">
-+        <annotations>
-+            <title value="Admin delete customer addresses from the grid"/>
-+            <description value="Admin delete customer addresses from the grid"/>
-+            <features value="Module/ Customer"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94850"/>
-+            <stories value="MAGETWO-94346: Implement handling of large number of addresses on admin edit customer page"/>
-+            <group value="customer"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- -
-+        Step1. Login to admin and go to Customers > All Customerts.
-+        Step2. On *Customers* page choose customer from preconditions and open it to edit
-+        Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
-+        <!- -->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
-+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
-+        </actionGroup>
-+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
-+        <!--Step4. Click *Select* link in *Actions* column for target additional address-->
-+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
-+        <click selector="{{AdminCustomerAddressesGridSection.firstRowSelectLink}}" stepKey="clickOnSelectLinkInFirstRow"/>
-+        <!--Step5. Click *Delete*-->
-+        <click selector="{{AdminCustomerAddressesGridSection.firstRowDeleteLink}}" stepKey="chooseDeleteOptionInFirstRow"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad1"/>
-+        <!--Step6. Press *Ok* button on the pop-up-->
-+        <click selector="{{AdminCustomerAddressesGridActionsSection.ok}}" stepKey="clickOkOnPopup"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad2"/>
-+        <seeNumberOfElements userInput="1" selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" stepKey="seeOnlyOneCustomerAddressesInGrid"/>
-+        <!--Step7. Delete last customer address-->
-+        <click selector="{{AdminCustomerAddressesGridSection.firstRowSelectLink}}" stepKey="clickOnSelectLinkInFirstRow2"/>
-+        <click selector="{{AdminCustomerAddressesGridSection.firstRowDeleteLink}}" stepKey="chooseDeleteOptionInFirstRow2"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad3"/>
-+        <click selector="{{AdminCustomerAddressesGridActionsSection.ok}}" stepKey="clickOkOnPopup2"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad4"/>
-+        <see userInput="We couldn't find any records." selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" stepKey="checkThatCustomerAddressesGridHasNoRecords"/>
-+</test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
-new file mode 100644
-index 00000000000..a703c5a7c5d
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
-@@ -0,0 +1,54 @@
-+<?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="AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest">
-+        <annotations>
-+            <title value="Admin delete customer addresses from the grid via mass actions"/>
-+            <description value="Admin delete customer addresses from the grid via mass actions"/>
-+            <features value="Module/ Customer"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94951"/>
-+            <stories value="MAGETWO-94346: Implement handling of large number of addresses on admin edit customer page"/>
-+            <group value="customer"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- -
-+        Step1. Login to admin and go to Customers > All Customerts.
-+        Step2. On *Customers* page choose customer from preconditions and open it to edit
-+        Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
-+        <!- -->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
-+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
-+        </actionGroup>
-+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
-+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
-+        <!-- -
-+        Step4. Check checkboxes for several addresses open *Actions* dropdown at the top of addresses grid and select action *Delete*
-+        Step5. Press *Ok* button on the pop-up
-+        <!- -->
-+        <click selector="{{AdminCustomerAddressesGridSection.firstRowCheckbox}}" stepKey="tickFirstRowCustomerAddressCheckbox"/>
-+        <click selector="{{AdminCustomerAddressesGridSection.secondRowCheckbox}}" stepKey="tickSecondRowCustomerAddressCheckbox"/>
-+        <click selector="{{AdminCustomerAddressesGridActionsSection.actions}}" stepKey="openActionsDropdown"/>
-+        <click selector="{{AdminCustomerAddressesGridActionsSection.delete}}" stepKey="chooseDeleteOption"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad1"/>
-+        <click selector="{{AdminCustomerAddressesGridActionsSection.ok}}" stepKey="clickOkOnPopup"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad2"/>
-+        <see userInput="We couldn't find any records." selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" stepKey="checkThatCustomerAddressesGridHasNoRecords"/>
-+</test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerTest.xml
-new file mode 100644
-index 00000000000..7fef916fc45
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerTest.xml
-@@ -0,0 +1,47 @@
-+<?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="AdminDeleteCustomerTest">
-+        <annotations>
-+            <stories value="Delete customer"/>
-+            <title value="DeleteCustomerBackendEntityTestVariation1"/>
-+            <description value="Login as admin and delete the customer"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14587"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Create Customer -->
-+            <createData entity="CustomerEntityOne" stepKey="createCustomer"/>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Delete created customer -->
-+        <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
-+            <argument name="email" value="$$createCustomer.email$$"/>
-+        </actionGroup>
-+        <seeElement selector="{{CustomersPageSection.deletedSuccessMessage}}" stepKey="seeSuccessMessage"/>
-+        <waitForPageLoad stepKey="waitForCustomerGridPageToLoad"/>
-+
-+        <!--Assert Customer is not in Grid -->
-+        <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="clickFilterButton"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
-+        <waitForPageLoad stepKey="waitForClearFilters1"/>
-+        <fillField selector="{{AdminCustomerFiltersSection.emailInput}}" userInput="$$createCustomer.email$$" stepKey="filterEmail"/>
-+        <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <see selector="{{AdminCustomerGridSection.customerGrid}}" userInput="We couldn't find any records." stepKey="seeEmptyRecordMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
-new file mode 100644
-index 00000000000..bb455677d5e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
-@@ -0,0 +1,52 @@
-+<?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="AdminDeleteDefaultBillingCustomerAddressTest">
-+        <annotations>
-+            <title value="Admin delete default billing customer address"/>
-+            <description value="Admin delete default billing customer address"/>
-+            <features value="Module/ Customer"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94816"/>
-+            <stories value="MAGETWO-94346: Implement handling of large number of addresses on admin edit customer page"/>
-+            <group value="customer"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- -
-+        Step1. Login to admin and go to Customers > All Customers.
-+        Step2. On *Customers* page choose customer from preconditions and open it to edit
-+        <!- -->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
-+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
-+        </actionGroup>
-+        <!--Step3. Open *Addresses* tab on edit customer page and click *edit* link near *Default Billing Address* block-->
-+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
-+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
-+        <seeNumberOfElements userInput="2" selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" stepKey="seeTwoCustomerAddressesInGrid"/>
-+        <click selector="{{AdminCustomerAddressesDefaultBillingSection.editButton}}" stepKey="clickEditNearDefaultBillingAddress"/>
-+        <waitForPageLoad stepKey="waitForDefaultBillingAddressPopupLoad"/>
-+        <!--Step4. Press *Delete* button-->
-+        <click selector="{{AdminCustomerAddressesSection.deleteButton}}" stepKey="clickDeleteButton"/>
-+        <waitForPageLoad stepKey="waitForConfirmationPopupLoad"/>
-+        <click selector="{{AdminCustomerAddressesSection.ok}}" stepKey="clickOkOnPopup"/>
-+        <waitForPageLoad stepKey="waitForDefaultBillingAddressPopupLoad2"/>
-+        <seeNumberOfElements userInput="1" selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" stepKey="seeOnlyOneCustomerAddressesInGrid"/>
-+        <dontSee userInput="{{US_Address_NY.street[0]}}" stepKey="assertDefaultBillingIsSet"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml
-new file mode 100644
-index 00000000000..df317c8bf70
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml
-@@ -0,0 +1,69 @@
-+<?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="AdminEditDefaultBillingShippingCustomerAddressTest">
-+        <annotations>
-+            <stories value="Edit default billing/shipping customer address"/>
-+            <title value="Edit default billing/shipping customer address"/>
-+            <description value="Edit default billing/shipping customer address on customer addresses tab"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-94815"/>
-+            <group value="customer"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="customer"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- -
-+        Step1. Login to admin and go to Customers > All Customers.
-+        Step2. On *Customers* page choose customer from preconditions and open it to edit
-+        Step3. Open *Addresses* tab on edit customer page and press *Add New Address* button
-+        <!- -->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
-+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
-+        </actionGroup>
-+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
-+        <waitForPageLoad stepKey="waitForAddresses"/>
-+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
-+        <seeElement selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="seeDefaultBillingAddressSectionBeforeChangingDefaultAddress"/>
-+        <see userInput="{{US_Address_NY.street[0]}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="assertDefaultBillingAddressIsSetBeforeChangingDefaultAddress"/>
-+        <seeElement selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="seeDefaultShippingAddressSectionBeforeChangingDefaultAddress"/>
-+        <see userInput="{{US_Address_NY.street[0]}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="assertDefaultShippingAddressIsSetBeforeChangingDefaultAddress"/>
-+        <click selector="{{AdminCustomerAddressesSection.addNewAddress}}" stepKey="clickAddNewAddressButton"/>
-+        <waitForPageLoad stepKey="waitForAddUpdateCustomerAddressForm"/>
-+        <!--Step4. Fill all the fields with test data and press *Save* button-->
-+        <click selector="{{AdminCustomerAddressesSection.defaultBillingAddress}}" stepKey="enableDefaultBillingAddress"/>
-+        <click selector="{{AdminCustomerAddressesSection.defaultShippingAddress}}" stepKey="enableDefaultShippingAddress"/>
-+        <fillField userInput="{{US_Address_TX.firstname}}" selector="{{AdminCustomerAddressesSection.firstNameForAddress}}" stepKey="fillFirstName"/>
-+        <fillField userInput="{{US_Address_TX.lastname}}" selector="{{AdminCustomerAddressesSection.lastNameForAddress}}" stepKey="fillLastName"/>
-+        <fillField userInput="{{US_Address_TX.company}}" selector="{{AdminCustomerAddressesSection.company}}" stepKey="fillCompany"/>
-+        <fillField userInput="{{US_Address_TX.street[0]}}" selector="{{AdminCustomerAddressesSection.streetAddress}}" stepKey="fillStreet"/>
-+        <fillField userInput="{{US_Address_TX.city}}" selector="{{AdminCustomerAddressesSection.city}}" stepKey="fillCity"/>
-+        <click selector="{{AdminCustomerAddressesSection.country}}" stepKey="clickCountryToOpenListOfCountries"/>
-+        <click selector="{{AdminCustomerAddressesSection.countryId(US_Address_TX.country_id)}}" stepKey="fillCountry"/>
-+        <fillField userInput="{{US_Address_TX.postcode}}" selector="{{AdminCustomerAddressesSection.zip}}" stepKey="fillPostcode"/>
-+        <fillField userInput="{{US_Address_TX.telephone}}" selector="{{AdminCustomerAddressesSection.phoneNumber}}" stepKey="fillTelephone"/>
-+        <click selector="{{AdminCustomerAddressesSection.region}}" stepKey="clickRegionToOpenListOfRegions"/>
-+        <click selector="{{AdminCustomerAddressesSection.regionId(US_Address_TX.state)}}" stepKey="fillRegion"/>
-+        <click selector="{{AdminCustomerAddressesSection.saveAddress}}" stepKey="clickSaveCustomerAddressOnAddUpdateAddressForm"/>
-+        <waitForPageLoad stepKey="waitForNewAddressIsCreated"/>
-+        <see userInput="{{US_Address_TX.street[0]}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="assertDefaultBillingAddressIsChanged"/>
-+        <see userInput="{{US_Address_TX.street[0]}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="assertDefaultShippingAddressIsChanged"/>
-+        <click selector="{{AdminCustomerAddressesDefaultBillingSection.editButton}}" stepKey="clickEditDefaultBillingAddress"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressAddUpdateFormLoad"/>
-+        <assertElementContainsAttribute selector="{{AdminCustomerAddressesSection.defaultBillingAddressCheckBox}}" attribute="value" expectedValue="1" stepKey="assertDefaultBillingIsEnabledCustomerAddressAddUpdateForm"/>
-+        <assertElementContainsAttribute selector="{{AdminCustomerAddressesSection.defaultShippingAddressCheckBox}}" attribute="value" expectedValue="1" stepKey="assertDefaultShippingIsEnabledOnCustomerAddressAddUpdateForm"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.xml
-new file mode 100644
-index 00000000000..6a7aeab78bc
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.xml
-@@ -0,0 +1,47 @@
-+<?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="AdminExactMatchSearchInCustomerGridTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Customer Search"/>
-+            <title value="Admin customer grid exact match searching"/>
-+            <description value="Admin customer grid exact match searching with quotes in keyword"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-16335"/>
-+            <useCaseId value="MAGETWO-99605"/>
-+            <group value="customer"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer" stepKey="createFirstCustomer"/>
-+            <createData entity="Simple_US_Customer" stepKey="createSecondCustomer">
-+                <field key="firstname">&quot;Jane Doe&quot;</field>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createFirstCustomer" stepKey="deleteFirstCustomer"/>
-+            <deleteData createDataKey="createSecondCustomer" stepKey="deleteSecondCustomer"/>
-+            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+            <actionGroup ref="AdminResetFilterInCustomerAddressGrid" stepKey="clearCustomerGridFilter"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Step 1: Go to Customers > All Customers-->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+        <!--Step 2: On Customers grid page search customer by keyword with quotes-->
-+        <actionGroup ref="searchAdminDataGridByKeyword" stepKey="searchCustomer">
-+            <argument name="keyword" value="$$createSecondCustomer.firstname$$"/>
-+        </actionGroup>
-+        <!--Step 3: Check if customer is placed in a first row and clear grid filter-->
-+        <actionGroup ref="AdminAssertCustomerInCustomersGrid" stepKey="checkCustomerInGrid">
-+            <argument name="text" value="$$createSecondCustomer.fullname$$"/>
-+            <argument name="row" value="1"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminResetCustomerPasswordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminResetCustomerPasswordTest.xml
-new file mode 100644
-index 00000000000..fb67838e941
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminResetCustomerPasswordTest.xml
-@@ -0,0 +1,39 @@
-+<?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="AdminResetCustomerPasswordTest">
-+        <annotations>
-+            <stories value="Reset password"/>
-+            <title value="Admin should be able to reset customer password"/>
-+            <description value="Admin should be able to reset customer password"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-30875"/>
-+            <group value="customer"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer" stepKey="customer"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        <!--Edit customer info-->
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="OpenEditCustomerFrom">
-+            <argument name="customer" value="$$customer$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminCustomerMainActionsSection.resetPassword}}" stepKey="resetPassword"/>
-+        <see userInput="The customer will receive an email with a link to reset password." stepKey="messageThatLinkToPasswordResetIsSent"/>
-+    </test>
-+</tests>
-+
-+
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
-new file mode 100644
-index 00000000000..9f1c5e8cd92
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
-@@ -0,0 +1,47 @@
-+<?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="AdminSearchCustomerAddressByKeywordTest">
-+        <annotations>
-+            <title value="Admin search customer address by keyword"/>
-+            <description value="Admin search customer address by keyword"/>
-+            <features value="Module/ Customer"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94954"/>
-+            <stories value="MAGETWO-94346: Implement handling of large number of addresses on admin edit customer page"/>
-+            <group value="customer"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- -
-+        Step1. Login to admin and go to Customers > All Customerts.
-+        Step2. On *Customers* page choose customer from preconditions and open it to edit
-+        Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
-+        <!- -->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
-+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
-+        </actionGroup>
-+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
-+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
-+        <!--Step4. Fill *Search by keyword* filed with the query and press enter or clock on the magnifier icon-->
-+        <fillField userInput="{{US_Address_NY.street[0]}}" selector="{{AdminCustomerAddressesGridActionsSection.search}}" stepKey="FillCustomerAddressStreetInSearchByKeyword"/>
-+        <pressKey parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" selector="{{AdminCustomerAddressesGridActionsSection.search}}" stepKey="pressEnterKey"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad"/>
-+        <seeNumberOfElements userInput="1" selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" stepKey="seeOnlyOneCustomerAddressesInGrid"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml
-new file mode 100644
-index 00000000000..db8d4e1ee1e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml
-@@ -0,0 +1,57 @@
-+<?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="AdminSetCustomerDefaultBillingAddressTest">
-+        <annotations>
-+            <stories value="Set customer default billing address"/>
-+            <title value="Admin should be able to set customer default billing address"/>
-+            <description value="Admin should be able to set customer default billing address from customer addresses grid row actions"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-94952"/>
-+            <group value="customer"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer_Multiple_Addresses_No_Default_Address" stepKey="customer"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- -
-+        Step1. Login to admin and go to Customers > All Customers.
-+        Step2. On *Customers* page choose customer from preconditions and open it to edit
-+        Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
-+        <!- -->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
-+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses_No_Default_Address"/>
-+        </actionGroup>
-+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
-+        <waitForPageLoad stepKey="waitForAddresses"/>
-+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
-+        <fillField userInput="{{US_Address_NY_Not_Default_Address.street[0]}}" selector="{{AdminCustomerAddressesGridActionsSection.search}}" stepKey="fillCustomerAddressStreetInSearchByKeyword"/>
-+        <pressKey parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" selector="{{AdminCustomerAddressesGridActionsSection.search}}" stepKey="pressEnterKey"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad"/>
-+        <see userInput="The customer does not have default billing address" selector="{{AdminCustomerAddressesDefaultBillingSection.address}}" stepKey="assertThatThereIsNoDefaultBillingAddress"/>
-+        <seeNumberOfElements userInput="1" selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" stepKey="seeOnlyOneCustomerAddressesInGrid"/>
-+        <!--Step4. Click *Select* link in *Actions* column for target additional address-->
-+        <click selector="{{AdminCustomerAddressesGridSection.firstRowSelectLink}}" stepKey="clickSelectElementFromRow" />
-+        <!--Step4. Click *Set as default billing*-->
-+        <click selector="{{AdminCustomerAddressesGridSection.firstRowSetAsDefaultBillingLink}}" stepKey="clickOnSetAddressAsDefaultBilling"/>
-+        <!--Step5. Press *Ok* button on the pop-up-->
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmSetAddressAsDefaultBilling"/>
-+        <seeElement selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="seeDefaultBillingAddressSection"/>
-+        <see userInput="{{US_Address_NY_Not_Default_Address.street[0]}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="assertDefaultBillingAddressIsSet"/>
-+        <click selector="{{AdminCustomerAddressesDefaultBillingSection.editButton}}" stepKey="clickEditDefaultBillingAddress"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressAddUpdateFormLoad"/>
-+        <assertElementContainsAttribute selector="{{AdminCustomerAddressesSection.defaultBillingAddressCheckBox}}" attribute="value" expectedValue="1" stepKey="assertDefaultBillingCheckboxIsCheckedOnCustomerAddressAddUpdateForm"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml
-new file mode 100644
-index 00000000000..6e832181769
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml
-@@ -0,0 +1,57 @@
-+<?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="AdminSetCustomerDefaultShippingAddressTest">
-+        <annotations>
-+            <stories value="Set customer default shipping address"/>
-+            <title value="Admin should be able to set customer default shipping address"/>
-+            <description value="Admin should be able to set customer default shipping address from customer addresses grid row actions"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-94953"/>
-+            <group value="customer"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer_Multiple_Addresses_No_Default_Address" stepKey="customer"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- -
-+        Step1. Login to admin and go to Customers > All Customers.
-+        Step2. On *Customers* page choose customer from preconditions and open it to edit
-+        Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
-+        <!- -->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
-+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses_No_Default_Address"/>
-+        </actionGroup>
-+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
-+        <waitForPageLoad stepKey="waitForAddresses"/>
-+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
-+        <fillField userInput="{{US_Address_NY_Not_Default_Address.street[0]}}" selector="{{AdminCustomerAddressesGridActionsSection.search}}" stepKey="fillCustomerAddressStreetInSearchByKeyword"/>
-+        <pressKey parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" selector="{{AdminCustomerAddressesGridActionsSection.search}}" stepKey="pressEnterKey"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad"/>
-+        <see userInput="The customer does not have default shipping address" selector="{{AdminCustomerAddressesDefaultShippingSection.address}}" stepKey="assertThatThereIsNoDefaultShippingAddress"/>
-+        <seeNumberOfElements userInput="1" selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" stepKey="seeOnlyOneCustomerAddressesInGrid"/>
-+        <!--Step4. Click *Select* link in *Actions* column for target additional address-->
-+        <click selector="{{AdminCustomerAddressesGridSection.firstRowSelectLink}}" stepKey="clickSelectElementFromRow" />
-+        <!--Step4. Click *Set as default shipping*-->
-+        <click selector="{{AdminCustomerAddressesGridSection.firstRowSetAsDefaultShippingLink}}" stepKey="clickOnSetAddressAsDefaultShipping"/>
-+        <!--Step5. Press *Ok* button on the pop-up-->
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmSetAddressAsDefaultShipping"/>
-+        <seeElement selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="seeDefaultShippingAddressSection"/>
-+        <see userInput="{{US_Address_NY_Not_Default_Address.street[0]}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="assertDefaultShippingAddressIsSet"/>
-+        <click selector="{{AdminCustomerAddressesDefaultShippingSection.editButton}}" stepKey="clickEditDefaultShippingAddress"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressAddUpdateFormLoad"/>
-+        <assertElementContainsAttribute selector="{{AdminCustomerAddressesSection.defaultShippingAddressCheckBox}}" attribute="value" expectedValue="1" stepKey="assertDefaultShippingCheckboxIsCheckedOnCustomerAddressAddUpdateForm"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest.xml
-new file mode 100644
-index 00000000000..f58f23dee42
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest.xml
-@@ -0,0 +1,308 @@
-+<?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="AdminUpdateCustomerInfoFromDefaultToNonDefaultTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Update Customer Information in Admin"/>
-+            <title value="Update Customer Info from Default to Non-Default in Admin"/>
-+            <description value="Update Customer Info from Default to Non-Default in Admin"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13619"/>
-+            <group value="Customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData stepKey="customer" entity="Simple_Customer_Without_Address"/>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
-+            <!-- Reset customer grid filter -->
-+            <amOnPage stepKey="goToCustomersGridPage" url="{{AdminCustomerPage.url}}"/>
-+            <waitForPageLoad stepKey="waitForCustomersGrid"/>
-+            <actionGroup stepKey="resetFilter" ref="AdminResetFilterInCustomerGrid"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminCustomerPage.url}}edit/id/$$customer.id$$/" stepKey="openCustomerEditPage"/>
-+        <waitForPageLoad stepKey="waitForCustomerEditPage"/>
-+        <!-- Update Customer Account Information -->
-+        <actionGroup stepKey="editCustomerInformation" ref="AdminEditCustomerAccountInformationActionGroup">
-+            <argument name="firstName" value="$$customer.firstname$$updated"/>
-+            <argument name="lastName" value="$$customer.lastname$$updated"/>
-+            <argument name="email" value="updated$$customer.email$$"/>
-+        </actionGroup>
-+        <!--Update Customer Addresses -->
-+        <actionGroup stepKey="editCustomerAddress" ref="AdminEditCustomerAddressSetDefaultShippingAndBilling">
-+            <argument name="customerAddress" value="CustomerAddressSimple"/>
-+        </actionGroup>
-+        <actionGroup stepKey="saveAndCheckSuccessMessage" ref="AdminSaveCustomerAndAssertSuccessMessage"/>
-+        <!-- Assert Customer in Customer grid -->
-+        <amOnPage stepKey="goToCustomersGridPage" url="{{AdminCustomerPage.url}}"/>
-+        <waitForPageLoad stepKey="waitForCustomersGrid"/>
-+        <actionGroup stepKey="resetFilter" ref="AdminResetFilterInCustomerGrid"/>
-+        <actionGroup stepKey="filterByEamil" ref="AdminFilterCustomerGridByEmail">
-+            <argument name="email" value="updated$$customer.email$$"/>
-+        </actionGroup>
-+        <actionGroup stepKey="checkCustomerInGrid" ref="AdminAssertCustomerInCustomersGrid">
-+            <argument name="text" value="updated$$customer.email$$"/>
-+            <argument name="row" value="1"/>
-+        </actionGroup>
-+        <!-- Assert Customer in Customer Form -->
-+        <amOnPage url="{{AdminCustomerPage.url}}edit/id/$$customer.id$$/" stepKey="openCustomerEditPageAfterSave"/>
-+        <waitForPageLoad stepKey="waitForCustomerEditPageAfterSave"/>
-+        <!-- Assert Customer Account Information -->
-+        <actionGroup stepKey="checkCustomerAccountInformation" ref="AdminAssertCustomerAccountInformation">
-+            <argument name="firstName" value="$$customer.firstname$$updated"/>
-+            <argument name="lastName" value="$$customer.lastname$$updated"/>
-+            <argument name="email" value="updated$$customer.email$$"/>
-+        </actionGroup>
-+        <!-- Assert Customer Default Billing Address -->
-+        <actionGroup stepKey="checkDefaultBilling" ref="AdminAssertCustomerDefaultBillingAddress">
-+            <argument name="firstName" value="$$customer.firstname$$updated"/>
-+            <argument name="lastName" value="$$customer.lastname$$updated"/>
-+            <argument name="street1" value="{{CustomerAddressSimple.street[0]}}"/>
-+            <argument name="state" value="{{CustomerAddressSimple.state}}"/>
-+            <argument name="postcode" value="{{CustomerAddressSimple.postcode}}"/>
-+            <argument name="country" value="{{CustomerAddressSimple.country_id}}"/>
-+            <argument name="telephone" value="{{CustomerAddressSimple.telephone}}"/>
-+        </actionGroup>
-+        <!-- Assert Customer Default Shipping Address -->
-+        <actionGroup stepKey="checkDefaultShipping" ref="AdminAssertCustomerDefaultShippingAddress">
-+            <argument name="firstName" value="$$customer.firstname$$updated"/>
-+            <argument name="lastName" value="$$customer.lastname$$updated"/>
-+            <argument name="street1" value="{{CustomerAddressSimple.street[0]}}"/>
-+            <argument name="state" value="{{CustomerAddressSimple.state}}"/>
-+            <argument name="postcode" value="{{CustomerAddressSimple.postcode}}"/>
-+            <argument name="country" value="{{CustomerAddressSimple.country_id}}"/>
-+            <argument name="telephone" value="{{CustomerAddressSimple.telephone}}"/>
-+        </actionGroup>
-+    </test>
-+
-+    <test name="AdminUpdateCustomerAddressNoZipNoStateTest" extends="AdminUpdateCustomerInfoFromDefaultToNonDefaultTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Update Customer Information in Admin"/>
-+            <title value="Update Customer Address, without zip/state required, default billing/shipping checked in Admin"/>
-+            <description value="Update Customer Address, without zip/state required, default billing/shipping checked in Admin"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13621"/>
-+            <group value="Customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <after>
-+            <remove keyForRemoval="goToCustomersGridPage"/>
-+            <remove keyForRemoval="waitForCustomersGrid"/>
-+            <remove keyForRemoval="resetFilter"/>
-+        </after>
-+
-+        <!-- Remove steps that are not used for this test -->
-+        <remove keyForRemoval="editCustomerInformation"/>
-+        <remove keyForRemoval="goToCustomersGridPage"/>
-+        <remove keyForRemoval="waitForCustomersGrid"/>
-+        <remove keyForRemoval="resetFilter"/>
-+        <remove keyForRemoval="filterByEamil"/>
-+        <remove keyForRemoval="checkCustomerInGrid"/>
-+        <remove keyForRemoval="checkCustomerAccountInformation"/>
-+
-+        <!--Update Customer Addresses With No Zip and No State -->
-+        <actionGroup stepKey="editCustomerAddress" ref="AdminEditCustomerAddressNoZipNoState">
-+            <argument name="customerAddress" value="addressNoZipNoState"/>
-+        </actionGroup>
-+
-+        <!-- Assert Customer Default Billing Address -->
-+        <actionGroup stepKey="checkDefaultBilling" ref="AdminAssertCustomerDefaultBillingAddress">
-+            <argument name="firstName" value="$$customer.firstname$$"/>
-+            <argument name="lastName" value="$$customer.lastname$$"/>
-+            <argument name="street1" value="{{addressNoZipNoState.street[0]}}"/>
-+            <argument name="country" value="{{addressNoZipNoState.country_id}}"/>
-+            <argument name="telephone" value="{{addressNoZipNoState.telephone}}"/>
-+        </actionGroup>
-+        <!-- Assert Customer Default Shipping Address -->
-+        <actionGroup stepKey="checkDefaultShipping" ref="AdminAssertCustomerDefaultShippingAddress">
-+            <argument name="firstName" value="$$customer.firstname$$"/>
-+            <argument name="lastName" value="$$customer.lastname$$"/>
-+            <argument name="street1" value="{{addressNoZipNoState.street[0]}}"/>
-+            <argument name="country" value="{{addressNoZipNoState.country_id}}"/>
-+            <argument name="telephone" value="{{addressNoZipNoState.telephone}}"/>
-+        </actionGroup>
-+        <!-- Assert Customer Login Storefront -->
-+        <actionGroup stepKey="login" ref="StorefrontAssertSuccessLoginToStorefront" after="checkDefaultShipping" >
-+            <argument name="Customer" value="$$customer$$"/>
-+        </actionGroup>
-+    </test>
-+
-+    <test name="AdminUpdateCustomerAddressNoBillingNoShippingTest" extends="AdminUpdateCustomerInfoFromDefaultToNonDefaultTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Update Customer Information in Admin"/>
-+            <title value="Update Customer Address, default billing/shipping unchecked in Admin"/>
-+            <description value="Update Customer Address, default billing/shipping unchecked in Admin"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13622"/>
-+            <group value="Customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <after>
-+            <remove keyForRemoval="goToCustomersGridPage"/>
-+            <remove keyForRemoval="waitForCustomersGrid"/>
-+            <remove keyForRemoval="resetFilter"/>
-+        </after>
-+
-+        <!-- Remove steps that are not used for this test -->
-+        <remove keyForRemoval="editCustomerInformation"/>
-+        <remove keyForRemoval="goToCustomersGridPage"/>
-+        <remove keyForRemoval="waitForCustomersGrid"/>
-+        <remove keyForRemoval="resetFilter"/>
-+        <remove keyForRemoval="filterByEamil"/>
-+        <remove keyForRemoval="checkCustomerInGrid"/>
-+        <remove keyForRemoval="checkCustomerAccountInformation"/>
-+        <remove keyForRemoval="checkDefaultBilling"/>
-+        <remove keyForRemoval="checkDefaultShipping"/>
-+
-+        <!--Update Customer Addresses With Default Billing and Shipping Unchecked -->
-+        <actionGroup stepKey="editCustomerAddress" ref="AdminEditCustomerAddressesFrom">
-+            <argument name="customerAddress" value="CustomerAddressSimple"/>
-+        </actionGroup>
-+
-+        <!-- Check Customer Address in Customer Form -->
-+        <actionGroup stepKey="checkNoDefaultBilling" ref="AdminAssertCustomerNoDefaultBillingAddress" after="waitForCustomerEditPageAfterSave"/>
-+        <actionGroup stepKey="checkNoDefaultShipping" ref="AdminAssertCustomerNoDefaultShippingAddress" after="checkNoDefaultBilling"/>
-+        <actionGroup stepKey="resetFilter" ref="AdminResetFilterInCustomerAddressGrid" after="checkNoDefaultShipping"/>
-+        <actionGroup stepKey="searchAddress" ref="AdminFilterCustomerAddressGridByPhoneNumber" after="resetFilter">
-+            <argument name="phone" value="{{CustomerAddressSimple.telephone}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="checkAddressStreetInGrid" ref="AdminAssertAddressInCustomersAddressGrid" after="searchAddress">
-+            <argument name="text" value="{{CustomerAddressSimple.street[0]}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="checkAddressPhoneInGrid" ref="AdminAssertAddressInCustomersAddressGrid" after="checkAddressStreetInGrid">
-+            <argument name="text" value="{{CustomerAddressSimple.telephone}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="checkAddressStateInGrid" ref="AdminAssertAddressInCustomersAddressGrid" after="checkAddressPhoneInGrid">
-+            <argument name="text" value="{{CustomerAddressSimple.state}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="checkAddressCityInGrid" ref="AdminAssertAddressInCustomersAddressGrid" after="checkAddressStateInGrid">
-+            <argument name="text" value="{{CustomerAddressSimple.city}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="checkAddressCountryInGrid" ref="AdminAssertAddressInCustomersAddressGrid" after="checkAddressCityInGrid">
-+            <argument name="text" value="{{CustomerAddressSimple.country_id}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="resetFilterWhenDone" ref="AdminResetFilterInCustomerAddressGrid" after="checkAddressCountryInGrid"/>
-+        <!-- Assert Customer Login Storefront -->
-+        <actionGroup stepKey="login" ref="StorefrontAssertSuccessLoginToStorefront" after="resetFilterWhenDone" >
-+            <argument name="Customer" value="$$customer$$"/>
-+        </actionGroup>
-+    </test>
-+
-+    <test name="AdminDeleteCustomerAddressTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Delete Customer Address in Admin"/>
-+            <title value="Delete Customer Address in Admin"/>
-+            <description value="Delete Customer Address in Admin"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13623"/>
-+            <group value="Customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData stepKey="customer" entity="Simple_US_Customer_Multiple_Addresses"/>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminCustomerPage.url}}edit/id/$$customer.id$$/" stepKey="openCustomerEditPage"/>
-+        <waitForPageLoad stepKey="waitForCustomerEditPage"/>
-+        <!-- Assert Customer Default Billing Address -->
-+        <actionGroup stepKey="checkDefaultBilling" ref="AdminAssertCustomerDefaultBillingAddress">
-+            <argument name="firstName" value="$$customer.firstname$$"/>
-+            <argument name="lastName" value="$$customer.lastname$$"/>
-+            <argument name="street1" value="{{US_Address_NY.street[0]}}"/>
-+            <argument name="state" value="{{US_Address_NY.state}}"/>
-+            <argument name="postcode" value="{{US_Address_NY.postcode}}"/>
-+            <argument name="country" value="{{US_Address_NY.country}}"/>
-+            <argument name="telephone" value="{{US_Address_NY.telephone}}"/>
-+        </actionGroup>
-+        <!-- Assert Customer Default Shipping Address -->
-+        <actionGroup stepKey="checkDefaultShipping" ref="AdminAssertCustomerDefaultShippingAddress">
-+            <argument name="firstName" value="$$customer.firstname$$"/>
-+            <argument name="lastName" value="$$customer.lastname$$"/>
-+            <argument name="street1" value="{{US_Address_NY.street[0]}}"/>
-+            <argument name="state" value="{{US_Address_NY.state}}"/>
-+            <argument name="postcode" value="{{US_Address_NY.postcode}}"/>
-+            <argument name="country" value="{{US_Address_NY.country}}"/>
-+            <argument name="telephone" value="{{US_Address_NY.telephone}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="resetFilter" ref="AdminResetFilterInCustomerAddressGrid"/>
-+        <!-- Assert 2 records in Customer Address Grid -->
-+        <actionGroup stepKey="see2Record" ref="AdminAssertNumberOfRecordsInCustomersAddressGrid">
-+            <argument name="number" value="2"/>
-+        </actionGroup>
-+        <!-- Assert Address 1 in Grid -->
-+        <actionGroup stepKey="checkAddressStreetInGrid" ref="AdminAssertAddressInCustomersAddressGrid">
-+            <argument name="text" value="{{US_Address_NY.street[0]}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="checkAddressPhoneInGrid" ref="AdminAssertAddressInCustomersAddressGrid">
-+            <argument name="text" value="{{US_Address_NY.telephone}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="checkAddressStateInGrid" ref="AdminAssertAddressInCustomersAddressGrid">
-+            <argument name="text" value="{{US_Address_NY.state}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="checkAddressCityInGrid" ref="AdminAssertAddressInCustomersAddressGrid">
-+            <argument name="text" value="{{US_Address_NY.city}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="checkAddressCountryInGrid" ref="AdminAssertAddressInCustomersAddressGrid">
-+            <argument name="text" value="{{US_Address_NY.country}}"/>
-+        </actionGroup>
-+        <!-- Assert Address 2 in Grid -->
-+        <actionGroup stepKey="checkAddressStreetInGrid2" ref="AdminAssertAddressInCustomersAddressGrid">
-+            <argument name="text" value="{{UK_Not_Default_Address.street[0]}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="checkAddressPhoneInGrid2" ref="AdminAssertAddressInCustomersAddressGrid">
-+            <argument name="text" value="{{UK_Not_Default_Address.telephone}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="checkAddressCityInGrid2" ref="AdminAssertAddressInCustomersAddressGrid">
-+            <argument name="text" value="{{UK_Not_Default_Address.city}}"/>
-+        </actionGroup>
-+        <!-- Delete Customer in Customer Address Grid -->
-+        <actionGroup stepKey="deleteAddress" ref="AdminDeleteAddressInCustomersAddressGrid">
-+            <argument name="row" value="0"/>
-+        </actionGroup>
-+        <!-- Assert 1 record in Customer Address Grid -->
-+        <actionGroup stepKey="see1Record" ref="AdminAssertNumberOfRecordsInCustomersAddressGrid">
-+            <argument name="number" value="1"/>
-+        </actionGroup>
-+        <actionGroup stepKey="saveAndContinue" ref="AdminCustomerSaveAndContinue"/>
-+        <actionGroup stepKey="saveAndCheckSuccessMessage" ref="AdminSaveCustomerAndAssertSuccessMessage"/>
-+        <!-- Assert Customer Login Storefront -->
-+        <actionGroup stepKey="login" ref="StorefrontAssertSuccessLoginToStorefront">
-+            <argument name="Customer" value="$$customer$$"/>
-+        </actionGroup>
-+        <!-- Assert Customer Address Book -->
-+        <actionGroup stepKey="goToAddressBook" ref="StorefrontCustomerGoToSidebarMenu">
-+            <argument name="menu" value="Address Book"/>
-+        </actionGroup>
-+        <actionGroup stepKey="assertAddressNumber" ref="StorefrontCustomerAddressBookNumberOfAddresses">
-+            <argument name="number" value="1"/>
-+        </actionGroup>
-+        <actionGroup stepKey="assertNoAddress1" ref="StorefrontCustomerAddressBookNotContains">
-+            <argument name="text" value="{{US_Address_NY.street[0]}}"/>
-+        </actionGroup>
-+        <actionGroup stepKey="assertAddress2" ref="StorefrontCustomerAddressBookContains">
-+            <argument name="text" value="{{UK_Not_Default_Address.street[0]}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCreateCustomerRequiredFieldsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCreateCustomerRequiredFieldsTest.xml
-new file mode 100644
-index 00000000000..7dab6eefde8
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCreateCustomerRequiredFieldsTest.xml
-@@ -0,0 +1,39 @@
-+<?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="AdminVerifyCreateCustomerRequiredFieldsTest">
-+        <annotations>
-+            <stories value="Create customer"/>
-+            <title value="Create customer, verify required fields on Account Information tab"/>
-+            <description value="Login as admin and verify required fields on account information section"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5314"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open New Customer Page -->
-+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
-+        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
-+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!--Assert Required Fields -->
-+        <seeElement selector="{{AdminCustomerAccountInformationSection.firstNameRequiredMessage}}" stepKey="seeFirstNameRequiredFieldMessage"/>
-+        <seeElement selector="{{AdminCustomerAccountInformationSection.lastNameRequiredMessage}}" stepKey="seeLastNameRequiredFieldMessage"/>
-+        <seeElement selector="{{AdminCustomerAccountInformationSection.emailRequiredMessage}}" stepKey="seeEmailRequiredFieldMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressRequiredFieldsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressRequiredFieldsTest.xml
-new file mode 100644
-index 00000000000..bfb47dc9e19
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressRequiredFieldsTest.xml
-@@ -0,0 +1,49 @@
-+<?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="AdminVerifyCustomerAddressRequiredFieldsTest">
-+        <annotations>
-+            <stories value="Create customer"/>
-+            <title value="Create customer, verify required fields on Addresses tab"/>
-+            <description value="Login as admin and verify required fields on Address tab"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5315"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="Simple_Customer_Without_Address" stepKey="createCustomer"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Created Customer -->
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="editCustomerForm">
-+            <argument name="customer" value="Simple_Customer_Without_Address"/>
-+        </actionGroup>
-+        <click selector="{{AdminCustomerAccountInformationSection.addressesButton}}" stepKey="openAddressesTab"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.addNewAddress}}" stepKey="ClickOnAddNewAddressButton"/>
-+        <waitForPageLoad stepKey="waitForAdressPageToLoad"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="clickOnSaveButton"/>
-+        <waitForPageLoad stepKey="waitForPageToBeSaved"/>
-+
-+        <!--Assert Required Field Messages -->
-+        <seeElement selector="{{AdminCustomerAddressesSection.streetRequiredMessage}}" stepKey="seeStreetRequiredMessage"/>
-+        <seeElement selector="{{AdminCustomerAddressesSection.cityRequiredMessage}}" stepKey="seeCityRequiredMessage"/>
-+        <scrollTo selector="{{AdminEditCustomerAddressesSection.phone}}" x="0" y="-80" stepKey="scrollToPhone"/>
-+        <seeElement selector="{{AdminCustomerAddressesSection.countryRequiredMessage}}" stepKey="seeCountryRequiredMessage"/>
-+        <seeElement selector="{{AdminCustomerAddressesSection.postcodeRequiredMessage}}" stepKey="seePostcodeRequiredMessage"/>
-+        <seeElement selector="{{AdminCustomerAddressesSection.phoneNumberRequiredMessage}}" stepKey="seePhoneNumberRequiredMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressStateContainValuesOnceTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressStateContainValuesOnceTest.xml
-new file mode 100644
-index 00000000000..daab5fd2061
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressStateContainValuesOnceTest.xml
-@@ -0,0 +1,73 @@
-+<?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="AdminVerifyCustomerAddressStateContainValuesOnceTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Update Customer Address"/>
-+            <title value="State/Province dropdown contain values once"/>
-+            <description value="When editing a customer in the backend from the Magento Admin Panel the State/Province should only be listed once"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-99461"/>
-+            <useCaseId value="MAGETWO-99302"/>
-+            <group value="customer"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="firstCustomer"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="firstCustomer" stepKey="deleteFirstCustomer"/>
-+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteSecondCustomer">
-+                <argument name="customerEmail" value="Simple_US_Customer.email"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearFilters"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to Customers > All Customers.-->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+
-+        <!--Select created customer, Click Edit mode-->
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPageWithAddresses">
-+            <argument name="customer" value="$$firstCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Select Addresses tab-->
-+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTabOfFirstCustomer"/>
-+        <waitForPageLoad stepKey="waitForAddressesOfFirstCustomer"/>
-+
-+        <!--Click on Edit link for Default Billing Address-->
-+        <click selector="{{AdminCustomerAddressesDefaultBillingSection.editButton}}" stepKey="clickEditDefaultBillingAddress"/>
-+        <waitForPageLoad stepKey="waitForCustomerAddressAddUpdateFormLoad"/>
-+
-+        <!--Check that State/Province drop down contain all values once-->
-+        <seeNumberOfElements userInput="1" selector="{{AdminCustomerAddressesSection.regionId(US_Address_NY.state)}}" stepKey="seeOnlyOneRegionInSelectStateForFirstCustomer"/>
-+
-+        <!--Go to Customers > All customers, Click Add new Customers, fill all necessary fields, Save-->
-+        <actionGroup ref="AdminCreateCustomerWithWebSiteAndGroup" stepKey="createSimpleUSCustomerWithoutAddress"/>
-+
-+        <!--Select new created customer, Click Edit mode-->
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPageWithoutAddresses">
-+            <argument name="customer" value="Simple_US_Customer"/>
-+        </actionGroup>
-+
-+        <!--Select Addresses tab, Click on  create new addresses btn-->
-+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTabOfSecondCustomer"/>
-+        <waitForPageLoad stepKey="waitForAddressesOfSecondCustomer"/>
-+        <click selector="{{AdminCustomerAddressesSection.addNewAddress}}" stepKey="clickAddNewAddressButton"/>
-+        <waitForPageLoad stepKey="waitForAddUpdateCustomerAddressForm"/>
-+
-+        <!--Select Country = United States and check that State/Province drop down contain all values once-->
-+        <click selector="{{AdminCustomerAddressesSection.country}}" stepKey="clickCountryToOpenListOfCountries"/>
-+        <click selector="{{AdminCustomerAddressesSection.countryId(US_Address_NY.country_id)}}" stepKey="fillCountry"/>
-+        <seeNumberOfElements userInput="1" selector="{{AdminCustomerAddressesSection.regionId(US_Address_NY.state)}}" stepKey="seeOnlyOneRegionInSelectStateForSecondCustomer"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
-new file mode 100644
-index 00000000000..6de03e225ae
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
-@@ -0,0 +1,119 @@
-+<?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="AllowedCountriesRestrictionApplyOnBackendTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Country filter"/>
-+            <title value="Country filter on Customers page when allowed countries restriction for a default website is applied"/>
-+            <description value="Country filter on Customers page when allowed countries restriction for a default website is applied"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-6441"/>
-+            <useCaseId value="MAGETWO-91523"/>
-+            <group value="customer"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-+            <!--Create new website,store and store view-->
-+            <comment userInput="Create new website,store and store view" stepKey="createWebsite"/>
-+            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="goToAdminSystemStorePage"/>
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="adminCreateNewWebsite">
-+                <argument name="newWebsiteName" value="{{NewWebSiteData.name}}"/>
-+                <argument name="websiteCode" value="{{NewWebSiteData.code}}"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="adminCreateNewStore">
-+                <argument name="website" value="{{NewWebSiteData.name}}"/>
-+                <argument name="storeGroupName" value="{{NewStoreData.name}}"/>
-+                <argument name="storeGroupCode" value="{{NewStoreData.code}}"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="adminCreateNewStoreView">
-+                <argument name="StoreGroup" value="NewStoreData"/>
-+            </actionGroup>
-+            <!--Set account sharing option - Default value is 'Per Website'-->
-+            <comment userInput="Set account sharing option - Default value is 'Per Website'" stepKey="setAccountSharingOption"/>
-+            <createData entity="CustomerAccountSharingDefault" stepKey="setToAccountSharingToDefault"/>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        </before>
-+        <after>
-+            <!--delete all created data and set main website country options to default-->
-+            <comment userInput="Delete all created data and set main website country options to default" stepKey="resetConfigToDefault"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteTestWebsite">
-+                <argument name="websiteName" value="{{NewWebSiteData.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigGeneralPage2"/>
-+            <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchWebsiteActionGroup">
-+                <argument name="website" value="_defaultWebsite"/>
-+            </actionGroup>
-+            <actionGroup ref="SetWebsiteCountryOptionsToDefaultActionGroup" stepKey="setCountryOptionsToDefault"/>
-+            <createData entity="CustomerAccountSharingSystemValue" stepKey="setAccountSharingToSystemValue"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </after>
-+        <!--Check that all countries are allowed initially and get amount-->
-+        <comment userInput="Check that all countries are allowed initially and get amount" stepKey="checkAllCountriesAreAllowed"/>
-+        <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigGeneralPage"/>
-+        <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
-+        <executeJS function="return document.querySelectorAll('{{CountryOptionsSection.allowedCountries}} option').length" stepKey="countriesAmount"/>
-+        <!-- Create customer for US -->
-+        <comment userInput="Create customer for US" stepKey="createUSCustomer"/>
-+        <createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
-+        <!-- Switch to first website, allow only Canada and set Canada as default country -->
-+        <comment userInput="Switch to first website, allow only Canada and set Canada as default country" stepKey="setCanadaAsDefaultCountry"/>
-+        <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchWebsiteActionGroup">
-+            <argument name="website" value="_defaultWebsite"/>
-+        </actionGroup>
-+        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation2"/>
-+        <waitForElementVisible selector="{{CountryOptionsSection.allowedCountries}}" stepKey="waitAllowedCountriesToBeVisible"/>
-+        <uncheckOption selector="{{CountryOptionsSection.generalCountryDefaultInherit}}" stepKey="uncheckCheckbox1"/>
-+        <selectOption selector="{{CountryOptionsSection.generalCountryDefault}}" userInput="Canada" stepKey="chooseCanada1"/>
-+        <uncheckOption selector="{{CountryOptionsSection.generalCountryAllowInherit}}" stepKey="uncheckCheckbox2"/>
-+        <selectOption selector="{{CountryOptionsSection.allowedCountries}}" userInput="Canada" stepKey="chooseCanada2"/>
-+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig2"/>
-+        <waitForPageLoad stepKey="waitForSavingSystemConfiguration2"/>
-+        <!--Switch to second website and allow all countries except Canada-->
-+        <comment userInput="Switch to second website and allow all countries except Canada" stepKey="switchToWebsiteAndAllowOnlyCanada"/>
-+        <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchWebsiteActionGroup2">
-+            <argument name="website" value="NewWebSiteData"/>
-+        </actionGroup>
-+        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation3"/>
-+        <waitForElementVisible selector="{{CountryOptionsSection.allowedCountries}}" stepKey="waitAllowedCountriesToBeVisible2"/>
-+        <uncheckOption selector="{{CountryOptionsSection.generalCountryAllowInherit}}" stepKey="uncheckCheckbox3"/>
-+        <unselectOption selector="{{CountryOptionsSection.allowedCountries}}" userInput="Canada" stepKey="unselectCanada"/>
-+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig3"/>
-+        <waitForPageLoad stepKey="waitForSavingSystemConfiguration3"/>
-+        <amOnPage url="{{AdminEditCustomerPage.url($$createCustomer.id$$)}}" stepKey="goToCustomerEditPage"/>
-+        <waitForPageLoad stepKey="waitPageToLoad"/>
-+        <!--Open created customer details page and change US address to Canada address-->
-+        <comment userInput="Open created customer details page and change US address to Canada address" stepKey="changeCustomerAddressToCanada"/>
-+        <actionGroup ref="OpenEditCustomerAddressFromAdminActionGroup" stepKey="editCustomerAddress">
-+            <argument name="address" value="US_Address_CA"/>
-+        </actionGroup>
-+        <selectOption selector="{{AdminEditCustomerAddressesSection.country}}" userInput="Canada" stepKey="selectCountry"/>
-+        <selectOption selector="{{AdminEditCustomerAddressesSection.state}}" userInput="Quebec" stepKey="selectState"/>
-+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="saveAddress"/>
-+        <waitForPageLoad stepKey="waitForAddressSaved"/>
-+        <click stepKey="saveCustomer" selector="{{AdminCustomerAccountInformationSection.saveCustomerAndContinueEdit}}"/>
-+        <waitForPageLoad stepKey="waitForCustomersPage"/>
-+        <!--Go to Customers grid and check that filter countries amount is the same as initial allowed countries amount-->
-+        <comment userInput="Go to Customers grid and check that filter countries amount is the same as initial allowed countries amount" stepKey="compareCountriesAmount"/>
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersGrid"/>
-+        <waitForPageLoad stepKey="waitForCustomersGrid"/>
-+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomersGrid"/>
-+        <executeJS function="var len = document.querySelectorAll('{{AdminCustomerFiltersSection.countryOptions}}').length; return len-1;" stepKey="countriesAmount2"/>
-+        <assertEquals expected="($countriesAmount)" actual="($countriesAmount2)" stepKey="assertCountryAmounts"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/ChangeCustomerGroupTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/ChangeCustomerGroupTest.xml
-new file mode 100644
-index 00000000000..e35a1ad61dc
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/ChangeCustomerGroupTest.xml
-@@ -0,0 +1,79 @@
-+<?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="ChangingSingleCustomerGroupViaGrid">
-+        <annotations>
-+            <title value="Change a single customer group via grid"/>
-+            <description value="From the selection of All Customers select a single customer to change their group"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-10921"/>
-+            <stories value="Change Customer Group"/>
-+            <group value="customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!--Delete created product-->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="NavigateToCustomerGroupPage" stepKey="navToCustomers"/>
-+            <actionGroup ref="AdminDeleteCustomerGroupActionGroup" stepKey="deleteCustomerGroup">
-+                <argument name="customerGroupName" value="{{CustomerGroupChange.code}}"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <actionGroup ref="AdminCreateCustomerGroupActionGroup" stepKey="createCustomerGroup">
-+            <argument name="groupName" value="{{CustomerGroupChange.code}}"/>
-+            <argument name="taxClass" value="{{CustomerGroupChange.tax_class_name}}"/>
-+        </actionGroup>
-+        <actionGroup ref="NavigateToAllCustomerPage" stepKey="navToCustomers"/>
-+        <actionGroup ref="AdminFilterCustomerByName" stepKey="filterCustomer">
-+            <argument name="customerName" value="{{Simple_US_Customer.fullname}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminSelectCustomerByEmail" stepKey="selectCustomer">
-+            <argument name="customerEmail" value="$$createCustomer.email$$"/>
-+        </actionGroup>
-+        <actionGroup ref="SetCustomerGroupForSelectedCustomersViaGrid" stepKey="setCustomerGroup">
-+            <argument name="groupName" value="{{CustomerGroupChange.code}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminFilterCustomerByName" stepKey="filterCustomerAfterGroupChange">
-+            <argument name="customerName" value="{{Simple_US_Customer.fullname}}"/>
-+        </actionGroup>
-+        <actionGroup ref="VerifyCustomerGroupForCustomer" stepKey="verifyCustomerGroupSet">
-+            <argument name="customerEmail" value="$$createCustomer.email$$"/>
-+            <argument name="groupName" value="{{CustomerGroupChange.code}}"/>
-+        </actionGroup>
-+    </test>
-+
-+    <test name="ChangingAllCustomerGroupViaGrid" extends="ChangingSingleCustomerGroupViaGrid">
-+        <annotations>
-+            <title value="Change all customers' group via grid"/>
-+            <description value="Select All customers to change their group"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-10924"/>
-+            <stories value="Change Customer Group"/>
-+            <group value="customer"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+
-+        <remove keyForRemoval="filterCustomer"/>
-+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilters" before="selectCustomer"/>
-+        <actionGroup ref="AdminSelectAllCustomers" stepKey="selectCustomer"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/DeleteCustomerGroupTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/DeleteCustomerGroupTest.xml
-new file mode 100644
-index 00000000000..b19966e0102
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/DeleteCustomerGroupTest.xml
-@@ -0,0 +1,57 @@
-+<?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="DeleteCustomerGroupTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Delete Customer Group"/>
-+            <title value="Delete Customer Group in Admin Panel"/>
-+            <description value="Admin should be able to delete a Customer Group"/>
-+            <testCaseId value="MC-14590"/>
-+            <severity value="MAJOR"/>
-+            <group value="customers"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="CustomCustomerGroup" stepKey="customerGroup"/>
-+            <createData entity="UsCustomerAssignedToNewCustomerGroup" stepKey="customer">
-+                <requiredEntity createDataKey="customerGroup"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Customer Group success delete message-->
-+        <actionGroup ref="AdminDeleteCustomerGroupActionGroup" stepKey="deleteCustomerGroup">
-+            <argument name="customerGroupName" value="$$customerGroup.code$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertCustomerGroupNotInGridActionGroup" stepKey="assertCustomerGroupNotInGrid">
-+            <argument name="customerGroup" value="$$customerGroup$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
-+            <argument name="customerId" value="$$customer.id$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AssertCustomerGroupOnCustomerFormActionGroup" stepKey="assertCustomerGroupOnCustomerForm">
-+            <argument name="customerGroup" value="GeneralCustomerGroup"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="openNewProductForm"/>
-+
-+        <actionGroup ref="AssertCustomerGroupNotOnProductFormActionGroup" stepKey="assertCustomerGroupNotOnProductForm">
-+            <argument name="customerGroup" value="$$customerGroup$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-index a9563c4cc93..2b24233e8b0 100644
---- a/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CLoggedInUserTest">
-         <annotations>
-             <features value="End to End scenarios"/>
-@@ -17,6 +17,9 @@
-             <description value="New user signup and browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-87653"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-         </annotations>
-         <before>
-             <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/PasswordAutocompleteOffTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/PasswordAutocompleteOffTest.xml
-new file mode 100644
-index 00000000000..f364d24806b
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/PasswordAutocompleteOffTest.xml
-@@ -0,0 +1,61 @@
-+<?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="PasswordAutocompleteOffTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Customer Password Autocomplete"/>
-+            <title value="[Security] Autocomplete attribute with off value is added to password input"/>
-+            <description value="[Security] Autocomplete attribute with off value is added to password input"/>
-+            <testCaseId value="MC-13678"/>
-+            <severity value="CRITICAL"/>
-+            <group value="customers"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Configure Magento via CLI: disable_guest_checkout -->
-+            <magentoCLI command="config:set checkout/options/guest_checkout 0" stepKey="disableGuestCheckout"/>
-+
-+            <!-- Configure Magento via CLI: password_autocomplete_off-->
-+            <magentoCLI command="config:set customer/password/autocomplete_on_storefront 0" stepKey="turnPasswordAutocompleteOff"/>
-+
-+            <!-- Create a simple product -->
-+            <createData entity="SimpleSubCategory" stepKey="category"/>
-+            <createData entity="SimpleProduct" stepKey="product">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Set Magento configuration back to default values -->
-+            <magentoCLI command="config:set checkout/options/guest_checkout 1" stepKey="disableGuestCheckoutRollback"/>
-+            <magentoCLI command="config:set customer/password/autocomplete_on_storefront 1" stepKey="turnPasswordAutocompleteOffRollback"/>
-+
-+            <!-- Delete the simple product created in the before block -->
-+            <deleteData createDataKey="product" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!-- Go to the created product page and add it to the cart-->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="cartAddSimpleProductToCart">
-+            <argument name="product" value="$$product$$"/>
-+        </actionGroup>
-+
-+        <!--Click Sign in - on the top right of the page -->
-+        <actionGroup ref="StorefrontClickSignInButtonActionGroup" stepKey="storeFrontClickSignInButton"/>
-+
-+        <!--Verify if the password field on store front sign-in page has the autocomplete attribute set to off -->
-+        <actionGroup ref="AssertStorefrontPasswordAutoCompleteOffActionGroup" stepKey="assertStorefrontPasswordAutoCompleteOff"/>
-+
-+        <!--Proceed to checkout-->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+
-+        <!--Verify if the password field on the authorization popup has the autocomplete attribute set to off -->
-+        <actionGroup ref="AssertAuthorizationPopUpPasswordAutoCompleteOffActionGroup" stepKey="assertAuthorizationPopUpPasswordAutoCompleteOff"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddCustomerAddressTest.xml
-new file mode 100644
-index 00000000000..413bbfd06a5
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddCustomerAddressTest.xml
-@@ -0,0 +1,121 @@
-+<?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="StorefrontAddNewCustomerAddressTest">
-+        <annotations>
-+            <features value="Customer address"/>
-+            <stories value="Implement handling of large number of addresses on storefront Address book"/>
-+            <title value="Storefront - My account - Address Book - add new address"/>
-+            <description value="Storefront user should be able to create a new address via the storefront"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-97364"/>
-+            <group value="customer"/>
-+            <group value="create"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_Customer_Without_Address" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="DeleteCustomer"/>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="AmOnLogoutPage"/>
-+        </after>
-+
-+        <!--Log in to Storefront as Customer 1 -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddNewCustomerAddressActionGroup" stepKey="AddNewAddress">
-+            <argument name="Address" value="US_Address_TX"/>
-+        </actionGroup>
-+        <see userInput="{{US_Address_TX.street[0]}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesStreetOnDefaultBilling"/>
-+        <see userInput="{{US_Address_TX.city}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesCityOnDefaultBilling"/>
-+        <see userInput="{{US_Address_TX.postcode}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesPostcodeOnDefaultBilling"/>
-+        <see userInput="{{US_Address_TX.street[0]}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesStreetOnDefaultShipping"/>
-+        <see userInput="{{US_Address_TX.city}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesCityOnDefaultShipping"/>
-+        <see userInput="{{US_Address_TX.postcode}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesPostcodeOnDefaultShipping"/>
-+    </test>
-+    <test name="StorefrontAddCustomerDefaultAddressTest">
-+        <annotations>
-+            <features value="Customer address"/>
-+            <stories value="Implement handling of large number of addresses on storefront Address book"/>
-+            <title value="Storefront - My account - Address Book - add new default billing/shipping address"/>
-+            <description value="Storefront user should be able to create a new default address via the storefront"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-97364"/>
-+            <group value="customer"/>
-+            <group value="create"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="DeleteCustomer"/>
-+        </after>
-+
-+        <!--Log in to Storefront as Customer 1 -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddCustomerDefaultAddressActionGroup" stepKey="AddNewDefaultAddress">
-+            <argument name="Address" value="US_Address_TX"/>
-+        </actionGroup>
-+        <see userInput="{{US_Address_TX.street[0]}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesStreetOnDefaultBilling"/>
-+        <see userInput="{{US_Address_TX.city}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesCityOnDefaultBilling"/>
-+        <see userInput="{{US_Address_TX.postcode}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesPostcodeOnDefaultBilling"/>
-+        <see userInput="{{US_Address_TX.street[0]}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesStreetOnDefaultShipping"/>
-+        <see userInput="{{US_Address_TX.city}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesCityOnDefaultShipping"/>
-+        <see userInput="{{US_Address_TX.postcode}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesPostcodeOnDefaultShipping"/>
-+    </test>
-+    <test name="StorefrontAddCustomerNonDefaultAddressTest">
-+        <annotations>
-+            <features value="Customer address"/>
-+            <stories value="Implement handling of large number of addresses on storefront Address book"/>
-+            <title value="Storefront - My account - Address Book - add new non default billing/shipping address"/>
-+            <description value="Storefront user should be able to create a new non default address via the storefront"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-97500"/>
-+            <group value="customer"/>
-+            <group value="create"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="DeleteCustomer"/>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="AmOnLogoutPage"/>
-+        </after>
-+
-+        <!--Log in to Storefront as Customer 1 -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddNewCustomerAddressActionGroup" stepKey="AddNewNonDefaultAddress">
-+            <argument name="Address" value="US_Address_TX"/>
-+        </actionGroup>
-+        <see userInput="{{US_Address_TX.street[0]}}"
-+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesStreetOnDefaultShipping"/>
-+        <see userInput="{{US_Address_TX.city}}"
-+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesCityOnDefaultShipping"/>
-+        <see userInput="{{US_Address_TX.postcode}}"
-+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesPostcodeOnDefaultShipping"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
-new file mode 100644
-index 00000000000..0cba9159dd5
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
-@@ -0,0 +1,152 @@
-+<?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="StorefrontCheckTaxAddingValidVATIdTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="MAGETWO-91639: Tax is added despite customer group changes"/>
-+            <title value="Check tax adding when it's changed to 'Valid VAT ID - Intra-Union'"/>
-+            <description value="Tax should be applied"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-95028"/>
-+            <group value="customer"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!--Log In-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="logIn"/>
-+            <!--Create category-->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <!--Create product-->
-+            <createData entity="SimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+
-+        <!--Add new tax rates. Go to tax rule page -->
-+        <actionGroup ref="addNewTaxRuleActionGroup" stepKey="addFirstTaxRuleActionGroup"/>
-+        <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="{{TaxRule.name}}"/>
-+
-+        <!-- Add NY and CA tax rules -->
-+        <actionGroup ref="addNewTaxRateNoZip" stepKey="addSimpleTaxUK">
-+            <argument name="taxCode" value="SimpleTaxUK"/>
-+        </actionGroup>
-+        <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
-+        <waitForPageLoad stepKey="waitForNewTaxRuleCreated"/>
-+
-+        <!-- Go to tax rule page to create second Tax Rule-->
-+        <actionGroup ref="addNewTaxRuleActionGroup" stepKey="addSecondTaxRuleActionGroup"/>
-+        <fillField stepKey="fillSecondRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="{{TaxRuleZeroRate.name}}"/>
-+        <actionGroup ref="addNewTaxRateNoZip" stepKey="addSimpleTaxUKZeroRate">
-+            <argument name="taxCode" value="SimpleTaxUKZeroRate"/>
-+        </actionGroup>
-+        <actionGroup ref="addCustomerTaxClass" stepKey="addCustomerTaxClass">
-+            <argument name="customerTaxClassName" value="UK_zero"/>
-+        </actionGroup>
-+        <click stepKey="disableDefaultProdTaxClass" selector="{{AdminTaxRulesSection.defaultCustomerTaxClass}}"/>
-+        <wait stepKey="waitForDisableDefaultProdTaxClass" time="2"/>
-+        <click stepKey="clickSaveBtn" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
-+        <waitForPageLoad stepKey="waitForSecondTaxRuleCreated"/>
-+
-+        <!--Create a Customer Group (CUSTOMERS > Customer Groups)-->
-+        <actionGroup ref="AdminCreateCustomerGroupActionGroup" stepKey="createCustomerGroup">
-+            <argument name="groupName" value="test_UK"/>
-+            <argument name="taxClass" value="UK_zero"/>
-+        </actionGroup>
-+
-+        <!--Set Customer Create New Account Options Config-->
-+        <createData entity="SetCustomerCreateNewAccountOptionsConfig" stepKey="setCustomerCreateNewAccountOptionsConfig"/>
-+        <actionGroup ref="SetGroupForValidVATIdIntraUnionActionGroup" stepKey="setGroupForValidVATIdIntraUnionActionGroup" after="setCustomerCreateNewAccountOptionsConfig">
-+            <argument name="value" value="test_UK"/>
-+        </actionGroup>
-+
-+        <!--Register customer on storefront-->
-+        <actionGroup ref="SignUpNewCustomerStorefrontActionGroup" stepKey="createAnAccount">
-+            <argument name="Customer" value="CustomerEntityOne"/>
-+        </actionGroup>
-+
-+        <!--Go to My account > Address book-->
-+        <actionGroup ref="EnterCustomerAddressInfoFillState" stepKey="enterAddressInfo">
-+            <argument name="Address" value="UK_Simple_Address"/>
-+        </actionGroup>
-+
-+        <!-- Go to product visible -->
-+        <amOnPage url="$$createProduct.name$$.html" stepKey="navigateToProductPageOnDefaultStore"/>
-+        <see userInput="$$createProduct.name$$" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertFirstProductNameTitle"/>
-+
-+        <!--Add a product to the cart-->
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-+        <waitForPageLoad stepKey="waitForAddProductToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+        <!--Proceed to checkout-->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="GoToCheckoutFromMinicartActionGroup"/>
-+        <!-- Click next button to open payment section -->
-+        <click selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="clickNext"/>
-+        <waitForPageLoad stepKey="waitForShipmentPageLoad"/>
-+
-+        <!-- Check order summary in checkout -->
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
-+        <!--Verify that Tax 50% is applied -->
-+        <see userInput="$123.00" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="assertSubtotal"/>
-+        <see userInput="$5.00" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" stepKey="assertShipping"/>
-+        <see userInput="Flat Rate - Fixed" selector="{{CheckoutPaymentSection.orderSummaryShippingMethod}}" stepKey="assertShippingMethod"/>
-+        <see userInput="$61.50" selector="{{CheckoutPaymentSection.tax}}" stepKey="assertTax"/>
-+        <see userInput="$189.50" selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="assertTotal"/>
-+
-+        <after>
-+            <!-- Go to the tax rule page and delete the row we created-->
-+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-+            <waitForPageLoad stepKey="waitForRulesPage"/>
-+
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
-+                <argument name="name" value="{{TaxRule.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteSecondRule">
-+                <argument name="name" value="{{TaxRuleZeroRate.name}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <!-- Go to the tax rate page -->
-+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-+            <waitForPageLoad stepKey="waitForRatesPage"/>
-+
-+            <!-- Delete the two tax rates that were created -->
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
-+                <argument name="name" value="{{SimpleTaxUK.state}}-{{SimpleTaxUK.rate}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
-+                <argument name="name" value="{{SimpleTaxUKZeroRate.state}}-{{SimpleTaxUKZeroRate.rate}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <!--Delete created customer group-->
-+            <actionGroup ref="AdminDeleteCustomerGroupActionGroup" stepKey="deleteCustomerGroup">
-+                <argument name="customerGroupName" value="test_UK"/>
-+            </actionGroup>
-+
-+            <createData entity="SetCustomerCreateNewAccountOptionsDefaultConfig" stepKey="setCustomerCreateNewAccountOptionsDefaultConfig"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategoryFirst"/>
-+
-+            <actionGroup ref="deleteProductTaxClass" stepKey="deleteFirstProductTaxClass">
-+                <argument name="taxClassName" value="UK_zero"/>
-+            </actionGroup>
-+
-+           <!--Log Out-->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml
-new file mode 100644
-index 00000000000..2b88657c6ca
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml
-@@ -0,0 +1,156 @@
-+<?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="StorefrontClearAllCompareProductsTest">
-+        <annotations>
-+            <stories value="Compare Products"/>
-+            <title value="Clear all products from the 'Compare Products' list"/>
-+            <description value="You should be able to remove all Products in the 'Compare Products' list."/>
-+            <testCaseId value="MC-14208"/>
-+            <severity value="CRITICAL"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        
-+        <before>
-+            <!-- Create Simple Customer -->
-+            <createData entity="Simple_US_Customer_CA" stepKey="createSimpleCustomer1"/>
-+
-+            <!-- Create Simple Category -->
-+            <createData entity="SimpleSubCategory" stepKey="createSimpleCategory1"/>
-+
-+            <!-- Create Simple Products -->
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct1">
-+                <requiredEntity createDataKey="createSimpleCategory1"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct2">
-+                <requiredEntity createDataKey="createSimpleCategory1"/>
-+            </createData>
-+
-+            <!-- Create Configurable Product -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct1">
-+                <requiredEntity createDataKey="createSimpleCategory1"/>
-+            </createData>
-+
-+            <!-- Create Virtual Product -->
-+            <createData entity="VirtualProduct" stepKey="createVirtualProduct1">
-+                <requiredEntity createDataKey="createSimpleCategory1"/>
-+            </createData>
-+
-+            <!-- Create Bundled Product -->
-+            <createData entity="ApiBundleProduct" stepKey="createBundleProduct1">
-+                <requiredEntity createDataKey="createSimpleCategory1"/>
-+            </createData>
-+            <createData entity="DropDownBundleOption" stepKey="createBundleOption1">
-+                <requiredEntity createDataKey="createBundleProduct1"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
-+                <requiredEntity createDataKey="createBundleProduct1"/>
-+                <requiredEntity createDataKey="createBundleOption1"/>
-+                <requiredEntity createDataKey="createSimpleProduct1"/>
-+                <field key="qty">10</field>
-+            </createData>
-+
-+            <!-- Create Grouped Product -->
-+            <createData entity="ApiGroupedProduct2" stepKey="createGroupedProduct1">
-+                <requiredEntity createDataKey="createSimpleCategory1"/>
-+            </createData>
-+            <createData entity="OneSimpleProductLink" stepKey="addFirstProduct1">
-+                <requiredEntity createDataKey="createGroupedProduct1"/>
-+                <requiredEntity createDataKey="createSimpleProduct1"/>
-+            </createData>
-+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addFirstProduct1" stepKey="addSecondProduct1">
-+                <requiredEntity createDataKey="createGroupedProduct1"/>
-+                <requiredEntity createDataKey="createSimpleProduct2"/>
-+            </updateData>
-+
-+            <!-- Create Downloadable Product -->
-+            <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct1"/>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
-+                <requiredEntity createDataKey="createDownloadableProduct1"/>
-+            </createData>
-+
-+            <!-- Login -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+        </before>
-+        <after>
-+            <!-- Logout -->
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin1"/>
-+
-+            <!-- Delete Created Entities -->
-+            <deleteData createDataKey="createSimpleCustomer1" stepKey="deleteSimpleCustomer1"/>
-+            <deleteData createDataKey="createSimpleCategory1" stepKey="deleteSimpleCategory1"/>
-+            <deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
-+            <deleteData createDataKey="createConfigProduct1" stepKey="deleteConfigProduct1"/>
-+            <deleteData createDataKey="createVirtualProduct1" stepKey="deleteVirtualProduct1"/>
-+            <deleteData createDataKey="createBundleProduct1" stepKey="deleteBundleProduct1"/>
-+            <deleteData createDataKey="createGroupedProduct1" stepKey="deleteGroupedProduct1"/>
-+            <deleteData createDataKey="createDownloadableProduct1" stepKey="deleteDownloadableProduct1"/>
-+        </after>
-+
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer1">
-+            <argument name="Customer" value="$$createSimpleCustomer1$$" />
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage1">
-+            <argument name="productUrl" value="$$createSimpleProduct1.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton1"/>
-+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare1">
-+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage2">
-+            <argument name="productUrl" value="$$createConfigProduct1.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton2"/>
-+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare2">
-+            <argument name="productVar" value="$$createConfigProduct1$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage3">
-+            <argument name="productUrl" value="$$createVirtualProduct1.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton3"/>
-+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare3">
-+            <argument name="productVar" value="$$createVirtualProduct1$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage4">
-+            <argument name="productUrl" value="$$createBundleProduct1.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton4"/>
-+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare4">
-+            <argument name="productVar" value="$$createBundleProduct1$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage5">
-+            <argument name="productUrl" value="$$createGroupedProduct1.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton5"/>
-+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare5">
-+            <argument name="productVar" value="$$createGroupedProduct1$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage6">
-+            <argument name="productUrl" value="$$createDownloadableProduct1.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton6"/>
-+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare6">
-+            <argument name="productVar" value="$$createDownloadableProduct1$$"/>
-+        </actionGroup>
-+
-+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="amOnMyAccountDashboard1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+
-+        <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="clearComparedProducts1"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml
-index 3670cdba387..97c932f0cb2 100644
---- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontCreateCustomerTest">
-         <annotations>
-             <features value="Customer"/>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateExistingCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateExistingCustomerTest.xml
-new file mode 100644
-index 00000000000..952ac235d92
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateExistingCustomerTest.xml
-@@ -0,0 +1,39 @@
-+<?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="StorefrontCreateExistingCustomerTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Customer Registration"/>
-+            <title value="Attempt to register customer on storefront with existing email"/>
-+            <description value="Attempt to register customer on storefront with existing email"/>
-+            <testCaseId value="MC-10907"/>
-+            <severity value="MAJOR"/>
-+            <group value="customers"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer" stepKey="customer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-+        </after>
-+
-+        <actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>
-+        <actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillCreateAccountForm">
-+            <argument name="customer" value="$$customer$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="submitCreateAccountForm"/>
-+        <actionGroup ref="AssertMessageCustomerCreateAccountActionGroup" stepKey="seeErrorMessage">
-+            <argument name="messageType" value="error"/>
-+            <argument name="message" value="There is already an account with this email address."/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml
-new file mode 100644
-index 00000000000..7a966168854
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml
-@@ -0,0 +1,41 @@
-+<?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="StorefrontDeleteCustomerAddressTest">
-+        <annotations>
-+            <stories value="Delete customer address from storefront"/>
-+            <title value="User should be able to delete Customer address successfully from storefront"/>
-+            <description value="User should be able to delete Customer address successfully from storefront"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5713"/>
-+            <group value="Customer"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+        </after>
-+        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-+        <fillField  stepKey="fillEmail" userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-+        <fillField  stepKey="fillPassword" userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-+        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-+        <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
-+            <argument name="Address" value="US_Address_NY"/>
-+        </actionGroup>
-+        <see userInput="You saved the address." stepKey="verifyAddressCreated"/>
-+        <click selector="{{StorefrontCustomerAddressesSection.deleteAdditionalAddress('1')}}" stepKey="deleteAdditionalAddress"/>
-+        <waitForElementVisible selector="{{ModalConfirmationSection.modalContent}}" stepKey="waitFortheConfirmationModal"/>
-+        <see selector="{{ModalConfirmationSection.modalContent}}" userInput="Are you sure you want to delete this address?" stepKey="seeAddressDeleteConfirmationMessage"/>
-+        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="confirmDelete"/>
-+        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
-+        <see userInput="You deleted the address." stepKey="verifyDeleteAddress"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontForgotPasswordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontForgotPasswordTest.xml
-new file mode 100644
-index 00000000000..8d4be5fda3c
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontForgotPasswordTest.xml
-@@ -0,0 +1,41 @@
-+<?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="StorefrontCustomerForgotPasswordTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Customer Login"/>
-+            <title value="Forgot Password on Storefront validates customer email input"/>
-+            <description value="Forgot Password on Storefront validates customer email input"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13679"/>
-+            <group value="Customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDisableConfigData.path}} {{StorefrontCustomerCaptchaDisableConfigData.value}}" stepKey="disableCaptcha"/>
-+            <createData stepKey="customer" entity="Simple_US_Customer"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaEnableConfigData.path}} {{StorefrontCustomerCaptchaEnableConfigData.value}}" stepKey="enableCaptcha"/>
-+            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
-+        </after>
-+
-+        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-+        <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-+        <fillField  stepKey="fillPassword" userInput="something" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-+        <click stepKey="clickForgotPasswordLink" selector="{{StorefrontCustomerSignInFormSection.forgotPasswordLink}}"/>
-+        <see stepKey="seePageTitle" userInput="Forgot Your Password" selector="{{StorefrontForgotPasswordSection.pageTitle}}"/>
-+        <fillField stepKey="enterEmail" userInput="$$customer.email$$" selector="{{StorefrontForgotPasswordSection.email}}"/>
-+        <click stepKey="clickResetPassword" selector="{{StorefrontForgotPasswordSection.resetMyPasswordButton}}"/>
-+        <seeInCurrentUrl stepKey="seeInSignInPage" url="account/login"/>
-+        <see stepKey="seeSuccessMessage" userInput="If there is an account associated with $$customer.email$$ you will receive an email with a link to reset your password." selector="{{StorefrontCustomerLoginMessagesSection.successMessage}}"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLockCustomerOnLoginPageTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLockCustomerOnLoginPageTest.xml
-new file mode 100644
-index 00000000000..c69c4dd071e
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLockCustomerOnLoginPageTest.xml
-@@ -0,0 +1,92 @@
-+<?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="StorefrontLockCustomerOnLoginPageTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Lock Customer entering incorrect login credentials"/>
-+            <title value="Lock customer on Storefront with after many attempts to log in with incorrect credentials"/>
-+            <description value="Lock customer on Storefront with after many attempts to log in with incorrect credentials"/>
-+            <testCaseId value="MC-14388"/>
-+            <severity value="CRITICAL"/>
-+            <group value="customer"/>
-+            <group value="security"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDisableConfigData.path}} {{StorefrontCustomerCaptchaDisableConfigData.value}}" stepKey="disableCaptcha"/>
-+            <magentoCLI command="config:set {{StorefrontCustomerLockoutFailures5ConfigData.path}} {{StorefrontCustomerLockoutFailures5ConfigData.value}}" stepKey="setInvalidAttemptsCountConfigTo5"/>
-+            <createData stepKey="customer" entity="Simple_US_Customer"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaEnableConfigData.path}} {{StorefrontCustomerCaptchaEnableConfigData.value}}" stepKey="enableCaptcha"/>
-+            <magentoCLI command="config:set {{StorefrontCustomerLockoutFailuresDefaultConfigData.path}} {{StorefrontCustomerLockoutFailuresDefaultConfigData.value}}" stepKey="revertInvalidAttemptsCountConfig"/>
-+            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
-+        </after>
-+
-+        <actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage"/>
-+
-+        <!-- Perform 5 attempts to log in with invalid credentials -->
-+        <actionGroup ref="StorefrontFillCustomerLoginFormWithWrongPasswordActionGroup" stepKey="fillLoginFormFirstAttempt">
-+            <argument name="customer" value="$$customer$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonFirstAttempt"/>
-+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterFirstAttempt">
-+            <argument name="messageType" value="error"/>
-+            <argument name="message" value="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontFillCustomerLoginFormWithWrongPasswordActionGroup" stepKey="fillLoginFormSecondAttempt">
-+            <argument name="customer" value="$$customer$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonSecondAttempt"/>
-+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterSecondAttempt">
-+            <argument name="messageType" value="error"/>
-+            <argument name="message" value="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontFillCustomerLoginFormWithWrongPasswordActionGroup" stepKey="fillLoginFormThirdAttempt">
-+            <argument name="customer" value="$$customer$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonThirdAttempt"/>
-+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterThirdAttempt">
-+            <argument name="messageType" value="error"/>
-+            <argument name="message" value="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontFillCustomerLoginFormWithWrongPasswordActionGroup" stepKey="fillLoginFormFourthAttempt">
-+            <argument name="customer" value="$$customer$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonFourthAttempt"/>
-+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterFourthAttempt">
-+            <argument name="messageType" value="error"/>
-+            <argument name="message" value="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontFillCustomerLoginFormWithWrongPasswordActionGroup" stepKey="fillLoginFormFifthAttempt">
-+            <argument name="customer" value="$$customer$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonFifthAttempt"/>
-+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterFifthAttempt">
-+            <argument name="messageType" value="error"/>
-+            <argument name="message" value="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later"/>
-+        </actionGroup>
-+
-+        <!-- Make sure that the customer is locked -->
-+        <actionGroup ref="StorefrontFillCustomerLoginFormActionGroup" stepKey="fillLoginFormWithCorrectCredentials">
-+            <argument name="customer" value="$$customer$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonWithCorrectCredentials"/>
-+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeLockoutErrorMessage">
-+            <argument name="messageType" value="error"/>
-+            <argument name="message" value="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml
-new file mode 100644
-index 00000000000..104b5d56314
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml
-@@ -0,0 +1,35 @@
-+<?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="StorefrontLoginWithIncorrectCredentialsTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Customer Login"/>
-+            <title value="Customer Login on Storefront with Incorrect Credentials"/>
-+            <description value="Customer Login on Storefront with Incorrect Credentials"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10913"/>
-+            <group value="Customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData stepKey="customer" entity="Simple_US_Customer"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
-+        </after>
-+
-+        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-+        <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-+        <fillField  stepKey="fillPassword" userInput="$$customer.password$$INVALID" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-+        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-+        <see stepKey="seeErrorMessage" selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}" userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml
-index ec669be165e..250da687866 100644
---- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontPersistedCustomerLoginTest">
-         <annotations>
-             <features value="Customer"/>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
-new file mode 100644
-index 00000000000..5d0eec935e1
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
-@@ -0,0 +1,46 @@
-+<?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="StorefrontResetCustomerPasswordFailedTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Reset password"/>
-+            <title value="Customer tries to reset password several times"/>
-+            <description value="Customer tries to reset password several times"/>
-+            <severity value="CRITICAL" />
-+            <testCaseId value="MC-14374" />
-+            <group value="Customer"/>
-+            <group value="security"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData stepKey="customer" entity="Simple_US_Customer"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
-+        </after>
-+
-+        <actionGroup ref="StorefrontCustomerResetPasswordActionGroup" stepKey="resetPasswordFirstAttempt">
-+            <argument name="email" value="$$customer.email$$" />
-+        </actionGroup>
-+        <actionGroup ref="AssertCustomerResetPasswordActionGroup" stepKey="seePageWithSuccessMessage">
-+            <argument name="url" value="{{StorefrontCustomerSignInPage.url}}"/>
-+            <argument name="message" value="If there is an account associated with $$customer.email$$ you will receive an email with a link to reset your password."/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontCustomerResetPasswordActionGroup" stepKey="resetPasswordSecondAttempt">
-+            <argument name="email" value="$$customer.email$$" />
-+        </actionGroup>
-+        <actionGroup ref="AssertCustomerResetPasswordActionGroup" stepKey="seePageWithErrorMessage">
-+            <argument name="url" value="{{StorefrontForgotPasswordPage.url}}"/>
-+            <argument name="message" value="We received too many requests for password resets. Please wait and try again later or contact hello@example.com."/>
-+            <argument name="messageType" value="error" />
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressFranceTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressFranceTest.xml
-new file mode 100644
-index 00000000000..dae456c96a6
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressFranceTest.xml
-@@ -0,0 +1,52 @@
-+<?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="StorefrontUpdateCustomerAddressFranceTest">
-+        <annotations>
-+            <stories value="Update Customer Address"/>
-+            <title value="Update Customer Address (France) in Storefront"/>
-+            <description value="Test log in to Storefront and Update Customer Address (France) in Storefront"/>
-+            <testCaseId value="MC-10912"/>
-+            <severity value="CRITICAL"/>
-+            <group value="customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
-+                <argument name="Customer" value="CustomerEntityOne"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteNewUser">
-+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Update customer address France in storefront-->
-+        <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddress">
-+            <argument name="Address" value="updateCustomerFranceAddress"/>
-+        </actionGroup>
-+        <!--Verify customer address save success message-->
-+        <see selector="{{AdminCustomerMessagesSection.successMessage}}" userInput="You saved the address." stepKey="seeAssertCustomerAddressSuccessSaveMessage"/>
-+
-+        <!--Verify customer default billing address-->
-+        <actionGroup ref="VerifyCustomerBillingAddressWithState" stepKey="verifyBillingAddress">
-+            <argument name="address" value="updateCustomerFranceAddress"/>
-+        </actionGroup>
-+
-+        <!--Verify customer default shipping address-->
-+        <actionGroup ref="VerifyCustomerShippingAddressWithState" stepKey="verifyShippingAddress">
-+            <argument name="address" value="updateCustomerFranceAddress"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml
-new file mode 100644
-index 00000000000..d9d1c9f2e05
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml
-@@ -0,0 +1,122 @@
-+<?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="StorefrontUpdateCustomerDefaultBillingAddressFromBlockTest">
-+        <annotations>
-+            <features value="Customer address"/>
-+            <stories value="Implement handling of large number of addresses on storefront Address book"/>
-+            <title value="Add default customer address via the Storefront6"/>
-+            <description value="Storefront user should be able to create a new default address via the storefront"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-97501"/>
-+            <group value="customer"/>
-+            <group value="update"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer_With_Different_Billing_Shipping_Addresses" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="DeleteCustomer"/>
-+        </after>
-+
-+        <!--Log in to Storefront as Customer 1 -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <amOnPage url="customer/address/" stepKey="OpenCustomerAddNewAddress"/>
-+        <click stepKey="ClickEditDefaultBillingAddress" selector="{{StorefrontCustomerAddressesSection.editDefaultBillingAddress}}"/>
-+        <fillField  stepKey="fillFirstName" userInput="EditedFirstNameBilling" selector="{{StorefrontCustomerAddressFormSection.firstName}}"/>
-+        <fillField  stepKey="fillLastName" userInput="EditedLastNameBilling" selector="{{StorefrontCustomerAddressFormSection.lastName}}"/>
-+        <click stepKey="saveCustomerAddress" selector="{{StorefrontCustomerAddressFormSection.saveAddress}}"/>
-+        <see userInput="You saved the address." stepKey="verifyAddressAdded"/>
-+        <see userInput="EditedFirstNameBilling"
-+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesFirstNameOnDefaultBilling"/>
-+        <see userInput="EditedLastNameBilling"
-+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesLastNameOnDefaultBilling"/>
-+        <see userInput="{{US_Address_NY_Default_Shipping.firstname}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesFirstNameOnDefaultShipping"/>
-+        <see userInput="{{US_Address_NY_Default_Shipping.lastname}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesLastNameOnDefaultShipping"/>
-+    </test>
-+    <test name="StorefrontUpdateCustomerDefaultShippingAddressFromBlockTest">
-+        <annotations>
-+            <features value="Customer address"/>
-+            <stories value="Implement handling of large number of addresses on storefront Address book"/>
-+            <title value="Add default customer address via the Storefront611"/>
-+            <description value="Storefront user should be able to create a new default address via the storefront"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-97501"/>
-+            <group value="customer"/>
-+            <group value="update"/>
-+            <skip>
-+                <issueId value="MAGETWO-97504"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer_With_Different_Billing_Shipping_Addresses" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="DeleteCustomer"/>
-+        </after>
-+
-+        <!--Log in to Storefront as Customer 1 -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <amOnPage url="customer/address/" stepKey="OpenCustomerAddNewAddress"/>
-+        <click stepKey="ClickEditDefaultShippingAddress" selector="{{StorefrontCustomerAddressesSection.editDefaultShippingAddress}}"/>
-+        <fillField  stepKey="fillFirstName" userInput="EditedFirstNameShipping" selector="{{StorefrontCustomerAddressFormSection.firstName}}"/>
-+        <fillField  stepKey="fillLastName" userInput="EditedLastNameShipping" selector="{{StorefrontCustomerAddressFormSection.lastName}}"/>
-+        <click stepKey="saveCustomerAddress" selector="{{StorefrontCustomerAddressFormSection.saveAddress}}"/>
-+        <see userInput="You saved the address." stepKey="verifyAddressAdded"/>
-+        <see userInput="EditedFirstNameShipping"
-+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesFirstNameOnDefaultShipping"/>
-+        <see userInput="EditedLastNameShipping"
-+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesLastNameOnDefaultShipping"/>
-+        <see userInput="{{US_Address_TX_Default_Billing.firstname}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesFirstNameOnDefaultBilling"/>
-+        <see userInput="{{US_Address_TX_Default_Billing.lastname}}"
-+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesLastNameOnDefaultBilling"/>
-+    </test>
-+    <test name="StorefrontUpdateCustomerAddressFromGridTest">
-+        <annotations>
-+            <features value="Customer address"/>
-+            <stories value="Add default customer address via the Storefront7"/>
-+            <title value="Add default customer address via the Storefront7"/>
-+            <description value="Storefront user should be able to create a new default address via the storefront2"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-97502"/>
-+            <group value="customer"/>
-+            <group value="update"/>
-+        </annotations>
-+        <before>
-+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="DeleteCustomer"/>
-+        </after>
-+
-+        <!--Log in to Storefront as Customer 1 -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <amOnPage url="customer/address/" stepKey="OpenCustomerAddNewAddress"/>
-+        <click selector="{{StorefrontCustomerAddressesSection.editAdditionalAddress('1')}}" stepKey="editAdditionalAddress"/>
-+        <fillField  stepKey="fillFirstName" userInput="EditedFirstName" selector="{{StorefrontCustomerAddressFormSection.firstName}}"/>
-+        <fillField  stepKey="fillLastName" userInput="EditedLastName" selector="{{StorefrontCustomerAddressFormSection.lastName}}"/>
-+        <click stepKey="saveCustomerAddress" selector="{{StorefrontCustomerAddressFormSection.saveAddress}}"/>
-+        <see userInput="You saved the address." stepKey="verifyAddressAdded"/>
-+        <see userInput="EditedFirstName"
-+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressFirstNameOnGrid"/>
-+        <see userInput="EditedLastName"
-+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressLastNameOnGrid"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressUKTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressUKTest.xml
-new file mode 100644
-index 00000000000..7b6e695aa8d
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressUKTest.xml
-@@ -0,0 +1,57 @@
-+<?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="StorefrontUpdateCustomerAddressUKTest">
-+        <annotations>
-+            <stories value="Update Customer Address"/>
-+            <title value="Update Customer Address (UK) in Storefront"/>
-+            <description value="Test log in to Storefront and Update Customer Address (UK) in Storefront"/>
-+            <testCaseId value="MC-10911"/>
-+            <severity value="CRITICAL"/>
-+            <group value="customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
-+                <argument name="Customer" value="CustomerEntityOne"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteNewUser">
-+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Update customer address UK in storefront-->
-+        <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddress">
-+            <argument name="Address" value="updateCustomerUKAddress"/>
-+        </actionGroup>
-+        <!--Verify customer address save success message-->
-+        <see selector="{{AdminCustomerMessagesSection.successMessage}}" userInput="You saved the address." stepKey="seeAssertCustomerAddressSuccessSaveMessage"/>
-+
-+        <!--Verify customer default billing address-->
-+        <actionGroup ref="VerifyCustomerBillingAddress" stepKey="verifyBillingAddress">
-+            <argument name="address" value="updateCustomerUKAddress"/>
-+        </actionGroup>
-+
-+        <!--Verify customer default shipping address-->
-+        <actionGroup ref="VerifyCustomerShippingAddress" stepKey="verifyShippingAddress">
-+            <argument name="address" value="updateCustomerUKAddress"/>
-+        </actionGroup>
-+
-+        <!--Verify customer name on frontend-->
-+        <actionGroup ref="VerifyCustomerNameOnFrontend" stepKey="verifyVerifyCustomerName">
-+            <argument name="customer" value="CustomerEntityOne"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerPasswordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerPasswordTest.xml
-new file mode 100644
-index 00000000000..9bc253c91af
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerPasswordTest.xml
-@@ -0,0 +1,81 @@
-+<?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="StorefrontUpdateCustomerPasswordValidCurrentPasswordTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Customer Update Password"/>
-+            <title value="Update Customer Password on Storefront, Valid Current Password"/>
-+            <description value="Update Customer Password on Storefront, Valid Current Password"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10916"/>
-+            <group value="Customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData stepKey="customer" entity="Simple_US_Customer"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
-+        </after>
-+
-+        <!--Log in to Storefront as Customer -->
-+        <actionGroup stepKey="login" ref="LoginToStorefrontActionGroup">
-+            <argument name="Customer" value="$$customer$$"/>
-+        </actionGroup>
-+        <seeInCurrentUrl stepKey="onCustomerAccountPage" url="customer/account"/>
-+        <click stepKey="clickChangePassword" selector="{{StorefrontCustomerDashboardAccountInformationSection.changePassword}}"/>
-+        <fillField  stepKey="fillValidCurrentPassword" userInput="$$customer.password$$" selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}"/>
-+        <fillField  stepKey="fillNewPassword" userInput="$$customer.password$$#" selector="{{StorefrontCustomerAccountInformationSection.newPassword}}"/>
-+        <fillField  stepKey="fillNewPasswordConfirmation" userInput="$$customer.password$$#" selector="{{StorefrontCustomerAccountInformationSection.confirmNewPassword}}"/>
-+        <click stepKey="saveChange" selector="{{StorefrontCustomerAccountInformationSection.saveButton}}"/>
-+        <see stepKey="verifyMessage" userInput="You saved the account information." selector="{{StorefrontCustomerMessagesSection.successMessage}}"/>
-+        <actionGroup stepKey="logout" ref="StorefrontCustomerLogoutActionGroup"/>
-+        <actionGroup stepKey="loginWithNewPassword" ref="LoginToStorefrontWithEmailAndPassword">
-+            <argument name="email" value="$$customer.email$$"/>
-+            <argument name="password" value="$$customer.password$$#"/>
-+        </actionGroup>
-+        <see stepKey="seeMyEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}"/>
-+    </test>
-+    <test name="StorefrontUpdateCustomerPasswordInvalidCurrentPasswordTest" extends="StorefrontUpdateCustomerPasswordValidCurrentPasswordTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Customer Update Password"/>
-+            <title value="Update Customer Password on Storefront, Invalid Current Password"/>
-+            <description value="Update Customer Password on Storefront, Invalid Current Password"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10917"/>
-+            <group value="Customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <fillField  stepKey="fillValidCurrentPassword" userInput="$$customer.password$$^" selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}"/>
-+        <see stepKey="verifyMessage" userInput="The password doesn't match this account. Verify the password and try again." selector="{{StorefrontCustomerMessagesSection.errorMessage}}"/>
-+        <remove keyForRemoval="loginWithNewPassword"/>
-+        <remove keyForRemoval="seeMyEmail"/>
-+    </test>
-+    <test name="StorefrontUpdateCustomerPasswordInvalidConfirmationPasswordTest" extends="StorefrontUpdateCustomerPasswordValidCurrentPasswordTest">
-+        <annotations>
-+            <features value="Customer"/>
-+            <stories value="Customer Update Password"/>
-+            <title value="Update Customer Password on Storefront, Invalid Confirmation Password"/>
-+            <description value="Update Customer Password on Storefront, Invalid Confirmation Password"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10918"/>
-+            <group value="Customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <fillField  stepKey="fillNewPasswordConfirmation" userInput="$$customer.password$$^" selector="{{StorefrontCustomerAccountInformationSection.confirmNewPassword}}"/>
-+        <see stepKey="verifyMessage" userInput="Please enter the same value again." selector="{{StorefrontCustomerAccountInformationSection.confirmNewPasswordError}}"/>
-+        <remove keyForRemoval="loginWithNewPassword"/>
-+        <remove keyForRemoval="seeMyEmail"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontVerifyNoXssInjectionOnUpdateCustomerInformationAddAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontVerifyNoXssInjectionOnUpdateCustomerInformationAddAddressTest.xml
-new file mode 100644
-index 00000000000..e11404db9a9
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontVerifyNoXssInjectionOnUpdateCustomerInformationAddAddressTest.xml
-@@ -0,0 +1,57 @@
-+<?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="StorefrontVerifyNoXssInjectionOnUpdateCustomerInformationAddAddressTest">
-+        <annotations>
-+            <stories value="Update Customer Address"/>
-+            <title value="[Security] Verify No XSS Injection on Update Customer Information Add Address"/>
-+            <description value="Test log in to Storefront and Verify No XSS Injection on Update Customer Information Add Address"/>
-+            <testCaseId value="MC-10910"/>
-+            <severity value="CRITICAL"/>
-+            <group value="customer"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
-+                <argument name="Customer" value="Colorado_US_Customer"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteNewUser">
-+                <argument name="email" value="{{Colorado_US_Customer.email}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Update customer address in storefront-->
-+        <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddress">
-+            <argument name="Address" value="updateCustomerNoXSSInjection"/>
-+        </actionGroup>
-+        <!--Verify customer address save success message-->
-+        <see selector="{{AdminCustomerMessagesSection.successMessage}}" userInput="You saved the address." stepKey="seeAssertCustomerAddressSuccessSaveMessage"/>
-+
-+        <!--Verify customer default billing address-->
-+        <actionGroup ref="VerifyCustomerBillingAddressWithState" stepKey="verifyBillingAddress">
-+            <argument name="address" value="updateCustomerNoXSSInjection"/>
-+        </actionGroup>
-+
-+        <!--Verify customer default shipping address-->
-+        <actionGroup ref="VerifyCustomerShippingAddressWithState" stepKey="verifyShippingAddress">
-+            <argument name="address" value="updateCustomerNoXSSInjection"/>
-+        </actionGroup>
-+
-+        <!--Verify customer name on frontend-->
-+        <actionGroup ref="VerifyCustomerNameOnFrontend" stepKey="verifyVerifyCustomerName">
-+            <argument name="customer" value="Colorado_US_Customer"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml
-new file mode 100644
-index 00000000000..9979f616818
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml
-@@ -0,0 +1,39 @@
-+<?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="VerifyDisabledCustomerGroupFieldTest">
-+        <annotations>
-+            <stories value="Check that field is disabled in system Customer Group"/>
-+            <title value="Check that field is disabled in system Customer Group"/>
-+            <description value="Checks that customer_group_code field is disabled in NOT LOGGED IN Customer Group"/>
-+            <testCaseId value="MC-14206"/>
-+            <severity value="CRITICAL"/>
-+            <group value="customers"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <!-- Steps -->
-+        <!-- 1. Login to backend as admin user -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <waitForPageLoad stepKey="waitForAdminPageLoad" />
-+
-+        <!-- 2. Navigate to Customers > Customer Groups -->
-+        <amOnPage url="{{AdminCustomerGroupPage.url}}" stepKey="amOnCustomerGroupPage" />
-+        <waitForPageLoad stepKey="waitForCustomerGroupsPageLoad" />
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFilters"/>
-+
-+        <!-- 3. Select system Customer Group specified in data set from grid -->
-+        <click selector="{{AdminCustomerGroupMainSection.editButtonByCustomerGroupCode(NotLoggedInCustomerGroup.code)}}" stepKey="clickOnEditCustomerGroup" />
-+
-+        <!-- 4. Perform all assertions -->
-+        <seeInField selector="{{AdminNewCustomerGroupSection.groupName}}" userInput="{{NotLoggedInCustomerGroup.code}}" stepKey="seeNotLoggedInTextInGroupName" />
-+        <assertElementContainsAttribute selector="{{AdminNewCustomerGroupSection.groupName}}" attribute="disabled" expectedValue="true" stepKey="checkIfGroupNameIsDisabled" />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
-new file mode 100644
-index 00000000000..47f96b132b3
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
-@@ -0,0 +1,198 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Test\Unit\Block\Address;
-+
-+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory;
-+
-+/**
-+ * Unit tests for \Magento\Customer\Block\Address\Grid class
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class GridTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var \Magento\Customer\Helper\Session\CurrentCustomer|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $addressCollectionFactory;
-+
-+    /**
-+     * @var \Magento\Customer\Model\ResourceModel\Address\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $currentCustomer;
-+
-+    /**
-+     * @var \Magento\Directory\Model\CountryFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $countryFactory;
-+
-+    /**
-+     * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $urlBuilder;
-+
-+    /**
-+     * @var \Magento\Customer\Block\Address\Grid
-+     */
-+    private $gridBlock;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+
-+        $this->currentCustomer = $this->getMockBuilder(\Magento\Customer\Helper\Session\CurrentCustomer::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getCustomer'])
-+            ->getMock();
-+
-+        $this->addressCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+
-+        $this->countryFactory = $this->getMockBuilder(\Magento\Directory\Model\CountryFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+
-+        $this->urlBuilder = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
-+
-+        $this->gridBlock = $this->objectManager->getObject(
-+            \Magento\Customer\Block\Address\Grid::class,
-+            [
-+                'addressCollectionFactory' => $this->addressCollectionFactory,
-+                'currentCustomer' => $this->currentCustomer,
-+                'countryFactory' => $this->countryFactory,
-+                '_urlBuilder' => $this->urlBuilder
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test for \Magento\Customer\Block\Address\Book::getChildHtml method with 'pager' argument
-+     */
-+    public function testGetChildHtml()
-+    {
-+        $customerId = 1;
-+        $outputString = 'OutputString';
-+        /** @var \Magento\Framework\View\Element\BlockInterface|\PHPUnit_Framework_MockObject_MockObject $block */
-+        $block = $this->getMockBuilder(\Magento\Framework\View\Element\BlockInterface::class)
-+            ->setMethods(['setCollection'])
-+            ->getMockForAbstractClass();
-+        /** @var  $layout \Magento\Framework\View\LayoutInterface|\PHPUnit_Framework_MockObject_MockObject */
-+        $layout = $this->getMockForAbstractClass(\Magento\Framework\View\LayoutInterface::class);
-+        /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
-+        $customer = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
-+        /** @var \PHPUnit_Framework_MockObject_MockObject */
-+        $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setOrder', 'setCustomerFilter', 'load','addFieldToFilter'])
-+            ->getMock();
-+
-+        $layout->expects($this->atLeastOnce())->method('getChildName')->with('NameInLayout', 'pager')
-+            ->willReturn('ChildName');
-+        $layout->expects($this->atLeastOnce())->method('renderElement')->with('ChildName', true)
-+            ->willReturn('OutputString');
-+        $layout->expects($this->atLeastOnce())->method('createBlock')
-+            ->with(\Magento\Theme\Block\Html\Pager::class, 'customer.addresses.pager')->willReturn($block);
-+        $customer->expects($this->atLeastOnce())->method('getId')->willReturn($customerId);
-+        $this->currentCustomer->expects($this->atLeastOnce())->method('getCustomer')->willReturn($customer);
-+        $addressCollection->expects($this->atLeastOnce())->method('setOrder')->with('entity_id', 'desc')
-+            ->willReturnSelf();
-+        $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->with([$customerId])
-+            ->willReturnSelf();
-+        $addressCollection->expects(static::any())->method('addFieldToFilter')->willReturnSelf();
-+        $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')
-+            ->willReturn($addressCollection);
-+        $block->expects($this->atLeastOnce())->method('setCollection')->with($addressCollection)->willReturnSelf();
-+        $this->gridBlock->setNameInLayout('NameInLayout');
-+        $this->gridBlock->setLayout($layout);
-+        $this->assertEquals($outputString, $this->gridBlock->getChildHtml('pager'));
-+    }
-+
-+    /**
-+     * Test for \Magento\Customer\Block\Address\Grid::getAddressEditUrl method
-+     */
-+    public function testGetAddAddressUrl()
-+    {
-+        $addressId = 1;
-+        $expectedUrl = 'expected_url';
-+        $this->urlBuilder->expects($this->atLeastOnce())->method('getUrl')
-+            ->with('customer/address/edit', ['_secure' => true, 'id' => $addressId])
-+            ->willReturn($expectedUrl);
-+        $this->assertEquals($expectedUrl, $this->gridBlock->getAddressEditUrl($addressId));
-+    }
-+
-+    public function testGetAdditionalAddresses()
-+    {
-+        $customerId = 1;
-+        /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
-+        $customer = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
-+        /** @var \PHPUnit_Framework_MockObject_MockObject */
-+        $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setOrder', 'setCustomerFilter', 'load', 'getIterator','addFieldToFilter'])
-+            ->getMock();
-+        $addressDataModel = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
-+        $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getId', 'getDataModel'])
-+            ->getMock();
-+        $collection = [$address, $address, $address];
-+        $address->expects($this->exactly(3))->method('getId')
-+            ->willReturnOnConsecutiveCalls(1, 2, 3);
-+        $address->expects($this->atLeastOnce())->method('getDataModel')->willReturn($addressDataModel);
-+        $customer->expects($this->atLeastOnce())->method('getId')->willReturn($customerId);
-+        $customer->expects($this->atLeastOnce())->method('getDefaultBilling')->willReturn('1');
-+        $customer->expects($this->atLeastOnce())->method('getDefaultShipping')->willReturn('2');
-+
-+        $this->currentCustomer->expects($this->atLeastOnce())->method('getCustomer')->willReturn($customer);
-+        $addressCollection->expects($this->atLeastOnce())->method('setOrder')->with('entity_id', 'desc')
-+            ->willReturnSelf();
-+        $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->with([$customerId])
-+            ->willReturnSelf();
-+        $addressCollection->expects(static::any())->method('addFieldToFilter')->willReturnSelf();
-+        $addressCollection->expects($this->atLeastOnce())->method('getIterator')
-+            ->willReturn(new \ArrayIterator($collection));
-+        $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')
-+            ->willReturn($addressCollection);
-+
-+        $this->assertEquals($addressDataModel, $this->gridBlock->getAdditionalAddresses()[0]);
-+    }
-+
-+    /**
-+     * Test for \Magento\Customer\ViewModel\CustomerAddress::getStreetAddress method
-+     */
-+    public function testGetStreetAddress()
-+    {
-+        $street = ['Line 1', 'Line 2'];
-+        $expectedAddress = 'Line 1, Line 2';
-+        $address = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
-+        $address->expects($this->atLeastOnce())->method('getStreet')->willReturn($street);
-+        $this->assertEquals($expectedAddress, $this->gridBlock->getStreetAddress($address));
-+    }
-+
-+    /**
-+     * Test for \Magento\Customer\ViewModel\CustomerAddress::getCountryByCode method
-+     */
-+    public function testGetCountryByCode()
-+    {
-+        $countryId = 'US';
-+        $countryName = 'United States';
-+        $country = $this->getMockBuilder(\Magento\Directory\Model\Country::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['loadByCode', 'getName'])
-+            ->getMock();
-+        $this->countryFactory->expects($this->atLeastOnce())->method('create')->willReturn($country);
-+        $country->expects($this->atLeastOnce())->method('loadByCode')->with($countryId)->willReturnSelf();
-+        $country->expects($this->atLeastOnce())->method('getName')->willReturn($countryName);
-+        $this->assertEquals($countryName, $this->gridBlock->getCountryByCode($countryId));
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Address/DeleteButtonTest.php b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Address/DeleteButtonTest.php
-new file mode 100644
-index 00000000000..7b0da3bd422
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Address/DeleteButtonTest.php
-@@ -0,0 +1,106 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Test\Unit\Block\Adminhtml\Edit\Address;
-+
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+
-+/**
-+ * Class for \Magento\Customer\Block\Adminhtml\Edit\Address\DeleteButton unit tests
-+ */
-+class DeleteButtonTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Customer\Model\AddressFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $addressFactory;
-+
-+    /**
-+     * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $urlBuilder;
-+
-+    /**
-+     * @var \Magento\Customer\Model\ResourceModel\Address|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $addressResourceModel;
-+
-+    /**
-+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $request;
-+
-+    /**
-+     * @var \Magento\Customer\Model\ResourceModel\AddressRepository|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $addressRepository;
-+
-+    /**
-+     * @var \Magento\Customer\Block\Adminhtml\Edit\Address\DeleteButton
-+     */
-+    private $deleteButton;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->addressFactory = $this->getMockBuilder(\Magento\Customer\Model\AddressFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->urlBuilder = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
-+        $this->addressResourceModel = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->request = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
-+        $this->addressRepository = $this->getMockBuilder(
-+            \Magento\Customer\Model\ResourceModel\AddressRepository::class
-+        )
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $objectManagerHelper = new ObjectManagerHelper($this);
-+
-+        $this->deleteButton = $objectManagerHelper->getObject(
-+            \Magento\Customer\Block\Adminhtml\Edit\Address\DeleteButton::class,
-+            [
-+                'addressFactory' => $this->addressFactory,
-+                'urlBuilder' => $this->urlBuilder,
-+                'addressResourceModel' => $this->addressResourceModel,
-+                'request' => $this->request,
-+                'addressRepository' => $this->addressRepository,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Unit test for \Magento\Customer\Block\Adminhtml\Edit\Address\DeleteButton::getButtonData() method
-+     */
-+    public function testGetButtonData()
-+    {
-+        $addressId = 1;
-+        $customerId = 2;
-+
-+        /** @var \Magento\Customer\Model\Address|\PHPUnit_Framework_MockObject_MockObject $address */
-+        $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $address->expects($this->atLeastOnce())->method('getEntityId')->willReturn($addressId);
-+        $address->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($customerId);
-+        $this->addressFactory->expects($this->atLeastOnce())->method('create')->willReturn($address);
-+        $this->request->expects($this->atLeastOnce())->method('getParam')->with('entity_id')
-+            ->willReturn($addressId);
-+        $this->addressResourceModel->expects($this->atLeastOnce())->method('load')->with($address, $addressId);
-+        $this->addressRepository->expects($this->atLeastOnce())->method('getById')->with($addressId)
-+            ->willReturn($address);
-+        $this->urlBuilder->expects($this->atLeastOnce())->method('getUrl')
-+            ->with(
-+                \Magento\Customer\Ui\Component\Listing\Address\Column\Actions::CUSTOMER_ADDRESS_PATH_DELETE,
-+                ['parent_id' => $customerId, 'id' => $addressId]
-+            )->willReturn('url');
-+
-+        $buttonData = $this->deleteButton->getButtonData();
-+        $this->assertEquals('Delete', (string)$buttonData['label']);
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Test/Unit/Block/Form/RegisterTest.php b/app/code/Magento/Customer/Test/Unit/Block/Form/RegisterTest.php
-index f1629d61fe9..b93b9f40d75 100644
---- a/app/code/Magento/Customer/Test/Unit/Block/Form/RegisterTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Block/Form/RegisterTest.php
-@@ -7,6 +7,7 @@ namespace Magento\Customer\Test\Unit\Block\Form;
- 
- use Magento\Customer\Block\Form\Register;
- use Magento\Customer\Model\AccountManagement;
-+use Magento\Newsletter\Observer\PredispatchNewsletterObserver;
- 
- /**
-  * Test class for \Magento\Customer\Block\Form\Register.
-@@ -39,7 +40,7 @@ class RegisterTest extends \PHPUnit\Framework\TestCase
-     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Customer\Model\Session */
-     private $_customerSession;
- 
--    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Module\Manager */
-+    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Module\ModuleManagerInterface */
-     private $_moduleManager;
- 
-     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Customer\Model\Url */
-@@ -274,12 +275,13 @@ class RegisterTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @param $isNewsletterEnabled
--     * @param $expectedValue
-+     * @param boolean $isNewsletterEnabled
-+     * @param string $isNewsletterActive
-+     * @param boolean $expectedValue
-      *
-      * @dataProvider isNewsletterEnabledProvider
-      */
--    public function testIsNewsletterEnabled($isNewsletterEnabled, $expectedValue)
-+    public function testIsNewsletterEnabled($isNewsletterEnabled, $isNewsletterActive, $expectedValue)
-     {
-         $this->_moduleManager->expects(
-             $this->once()
-@@ -290,6 +292,17 @@ class RegisterTest extends \PHPUnit\Framework\TestCase
-         )->will(
-             $this->returnValue($isNewsletterEnabled)
-         );
-+
-+        $this->_scopeConfig->expects(
-+            $this->any()
-+        )->method(
-+            'getValue'
-+        )->with(
-+            PredispatchNewsletterObserver::XML_PATH_NEWSLETTER_ACTIVE
-+        )->will(
-+            $this->returnValue($isNewsletterActive)
-+        );
-+
-         $this->assertEquals($expectedValue, $this->_block->isNewsletterEnabled());
-     }
- 
-@@ -298,7 +311,7 @@ class RegisterTest extends \PHPUnit\Framework\TestCase
-      */
-     public function isNewsletterEnabledProvider()
-     {
--        return [[true, true], [false, false]];
-+        return [[true, true, true], [true, false, false], [false, true, false], [false, false, false]];
-     }
- 
-     /**
-diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePasswordTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePasswordTest.php
-deleted file mode 100644
-index 77f41024ba0..00000000000
---- a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePasswordTest.php
-+++ /dev/null
-@@ -1,233 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Customer\Test\Unit\Controller\Account;
--
--use Magento\Framework\Controller\Result\Redirect;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--
--/**
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class CreatePasswordTest extends \PHPUnit\Framework\TestCase
--{
--    /** @var \Magento\Customer\Controller\Account\CreatePassword */
--    protected $model;
--
--    /** @var ObjectManagerHelper */
--    protected $objectManagerHelper;
--
--    /** @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
--    protected $sessionMock;
--
--    /** @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject */
--    protected $pageFactoryMock;
--
--    /** @var \Magento\Customer\Api\AccountManagementInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $accountManagementMock;
--
--    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $requestMock;
--
--    /** @var \Magento\Framework\Controller\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject */
--    protected $redirectFactoryMock;
--
--    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $messageManagerMock;
--
--    protected function setUp()
--    {
--        $this->sessionMock = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['setRpToken', 'setRpCustomerId', 'getRpToken', 'getRpCustomerId'])
--            ->getMock();
--        $this->pageFactoryMock = $this->getMockBuilder(\Magento\Framework\View\Result\PageFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->accountManagementMock = $this->getMockBuilder(\Magento\Customer\Api\AccountManagementInterface::class)
--            ->getMockForAbstractClass();
--        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
--            ->getMockForAbstractClass();
--        $this->redirectFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\RedirectFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
--            ->getMockForAbstractClass();
--
--        $this->objectManagerHelper = new ObjectManagerHelper($this);
--        $this->model = $this->objectManagerHelper->getObject(
--            \Magento\Customer\Controller\Account\CreatePassword::class,
--            [
--                'customerSession' => $this->sessionMock,
--                'resultPageFactory' => $this->pageFactoryMock,
--                'accountManagement' => $this->accountManagementMock,
--                'request' => $this->requestMock,
--                'resultRedirectFactory' => $this->redirectFactoryMock,
--                'messageManager' => $this->messageManagerMock,
--            ]
--        );
--    }
--
--    public function testExecuteWithLink()
--    {
--        $token = 'token';
--        $customerId = '11';
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getParam')
--            ->willReturnMap(
--                [
--                    ['token', null, $token],
--                    ['id', null, $customerId],
--                ]
--            );
--
--        $this->accountManagementMock->expects($this->once())
--            ->method('validateResetPasswordLinkToken')
--            ->with($customerId, $token)
--            ->willReturn(true);
--
--        $this->sessionMock->expects($this->once())
--            ->method('setRpToken')
--            ->with($token);
--        $this->sessionMock->expects($this->once())
--            ->method('setRpCustomerId')
--            ->with($customerId);
--
--        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->redirectFactoryMock->expects($this->once())
--            ->method('create')
--            ->with([])
--            ->willReturn($redirectMock);
--
--        $redirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('*/*/createpassword', [])
--            ->willReturnSelf();
--
--        $this->assertEquals($redirectMock, $this->model->execute());
--    }
--
--    public function testExecuteWithSession()
--    {
--        $token = 'token';
--        $customerId = '11';
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getParam')
--            ->willReturnMap(
--                [
--                    ['token', null, null],
--                    ['id', null, $customerId],
--                ]
--            );
--
--        $this->sessionMock->expects($this->once())
--            ->method('getRpToken')
--            ->willReturn($token);
--        $this->sessionMock->expects($this->once())
--            ->method('getRpCustomerId')
--            ->willReturn($customerId);
--
--        $this->accountManagementMock->expects($this->once())
--            ->method('validateResetPasswordLinkToken')
--            ->with($customerId, $token)
--            ->willReturn(true);
--
--        /** @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject $pageMock */
--        $pageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->pageFactoryMock->expects($this->once())
--            ->method('create')
--            ->with(false, [])
--            ->willReturn($pageMock);
--
--        /** @var \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject $layoutMock */
--        $layoutMock = $this->getMockBuilder(\Magento\Framework\View\Layout::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $pageMock->expects($this->once())
--            ->method('getLayout')
--            ->willReturn($layoutMock);
--
--        /** @var \Magento\Customer\Block\Account\Resetpassword|\PHPUnit_Framework_MockObject_MockObject $layoutMock */
--        $blockMock = $this->getMockBuilder(\Magento\Customer\Block\Account\Resetpassword::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['setCustomerId', 'setResetPasswordLinkToken'])
--            ->getMock();
--
--        $layoutMock->expects($this->once())
--            ->method('getBlock')
--            ->with('resetPassword')
--            ->willReturn($blockMock);
--
--        $blockMock->expects($this->once())
--            ->method('setCustomerId')
--            ->with($customerId)
--            ->willReturnSelf();
--        $blockMock->expects($this->once())
--            ->method('setResetPasswordLinkToken')
--            ->with($token)
--            ->willReturnSelf();
--
--        $this->assertEquals($pageMock, $this->model->execute());
--    }
--
--    public function testExecuteWithException()
--    {
--        $token = 'token';
--        $customerId = '11';
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getParam')
--            ->willReturnMap(
--                [
--                    ['token', null, $token],
--                    ['id', null, null],
--                ]
--            );
--
--        $this->sessionMock->expects($this->once())
--            ->method('getRpToken')
--            ->willReturn($token);
--        $this->sessionMock->expects($this->once())
--            ->method('getRpCustomerId')
--            ->willReturn($customerId);
--
--        $this->accountManagementMock->expects($this->once())
--            ->method('validateResetPasswordLinkToken')
--            ->with($customerId, $token)
--            ->willThrowException(new \Exception('Exception.'));
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addError')
--            ->with(__('Your password reset link has expired.'))
--            ->willReturnSelf();
--
--        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->redirectFactoryMock->expects($this->once())
--            ->method('create')
--            ->with([])
--            ->willReturn($redirectMock);
--
--        $redirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('*/*/forgotpassword', [])
--            ->willReturnSelf();
--
--        $this->assertEquals($redirectMock, $this->model->execute());
--    }
--}
-diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/ResetPasswordPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/ResetPasswordPostTest.php
-deleted file mode 100644
-index b79ad008e5e..00000000000
---- a/app/code/Magento/Customer/Test/Unit/Controller/Account/ResetPasswordPostTest.php
-+++ /dev/null
-@@ -1,379 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Customer\Test\Unit\Controller\Account;
--
--use Magento\Framework\Controller\Result\Redirect;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--
--/**
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class ResetPasswordPostTest extends \PHPUnit\Framework\TestCase
--{
--    /** @var \Magento\Customer\Controller\Account\ResetPasswordPost */
--    protected $model;
--
--    /** @var ObjectManagerHelper */
--    protected $objectManagerHelper;
--
--    /** @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
--    protected $sessionMock;
--
--    /** @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject */
--    protected $pageFactoryMock;
--
--    /** @var \Magento\Customer\Api\AccountManagementInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $accountManagementMock;
--
--    /** @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $customerRepositoryMock;
--
--    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $requestMock;
--
--    /** @var \Magento\Framework\Controller\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject */
--    protected $redirectFactoryMock;
--
--    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $messageManagerMock;
--
--    protected function setUp()
--    {
--        $this->sessionMock = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['unsRpToken', 'unsRpCustomerId'])
--            ->getMock();
--        $this->pageFactoryMock = $this->getMockBuilder(\Magento\Framework\View\Result\PageFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->accountManagementMock = $this->getMockBuilder(\Magento\Customer\Api\AccountManagementInterface::class)
--            ->getMockForAbstractClass();
--        $this->customerRepositoryMock = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
--            ->getMockForAbstractClass();
--        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
--            ->setMethods(['getQuery', 'getPost'])
--            ->getMockForAbstractClass();
--        $this->redirectFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\RedirectFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
--            ->getMockForAbstractClass();
--
--        $this->objectManagerHelper = new ObjectManagerHelper($this);
--        $this->model = $this->objectManagerHelper->getObject(
--            \Magento\Customer\Controller\Account\ResetPasswordPost::class,
--            [
--                'customerSession' => $this->sessionMock,
--                'resultPageFactory' => $this->pageFactoryMock,
--                'accountManagement' => $this->accountManagementMock,
--                'customerRepository' => $this->customerRepositoryMock,
--                'request' => $this->requestMock,
--                'resultRedirectFactory' => $this->redirectFactoryMock,
--                'messageManager' => $this->messageManagerMock,
--            ]
--        );
--    }
--
--    public function testExecute()
--    {
--        $token = 'token';
--        $customerId = '11';
--        $password = 'password';
--        $passwordConfirmation = 'password';
--        $email = 'email@email.com';
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getQuery')
--            ->willReturnMap(
--                [
--                    ['token', $token],
--                    ['id', $customerId],
--                ]
--            );
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getPost')
--            ->willReturnMap(
--                [
--                    ['password', $password],
--                    ['password_confirmation', $passwordConfirmation],
--                ]
--            );
--
--        /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customerMock */
--        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
--            ->getMockForAbstractClass();
--
--        $this->customerRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($customerId)
--            ->willReturn($customerMock);
--
--        $customerMock->expects($this->once())
--            ->method('getEmail')
--            ->willReturn($email);
--
--        $this->accountManagementMock->expects($this->once())
--            ->method('resetPassword')
--            ->with($email, $token, $password)
--            ->willReturn(true);
--
--        $this->sessionMock->expects($this->once())
--            ->method('unsRpToken');
--        $this->sessionMock->expects($this->once())
--            ->method('unsRpCustomerId');
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addSuccess')
--            ->with(__('You updated your password.'))
--            ->willReturnSelf();
--
--        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->redirectFactoryMock->expects($this->once())
--            ->method('create')
--            ->with([])
--            ->willReturn($redirectMock);
--
--        $redirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('*/*/login', [])
--            ->willReturnSelf();
--
--        $this->assertEquals($redirectMock, $this->model->execute());
--    }
--
--    public function testExecuteWithException()
--    {
--        $token = 'token';
--        $customerId = '11';
--        $password = 'password';
--        $passwordConfirmation = 'password';
--        $email = 'email@email.com';
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getQuery')
--            ->willReturnMap(
--                [
--                    ['token', $token],
--                    ['id', $customerId],
--                ]
--            );
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getPost')
--            ->willReturnMap(
--                [
--                    ['password', $password],
--                    ['password_confirmation', $passwordConfirmation],
--                ]
--            );
--
--        /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customerMock */
--        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
--            ->getMockForAbstractClass();
--
--        $this->customerRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($customerId)
--            ->willReturn($customerMock);
--
--        $customerMock->expects($this->once())
--            ->method('getEmail')
--            ->willReturn($email);
--
--        $this->accountManagementMock->expects($this->once())
--            ->method('resetPassword')
--            ->with($email, $token, $password)
--            ->willThrowException(new \Exception('Exception.'));
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addError')
--            ->with(__('Something went wrong while saving the new password.'))
--            ->willReturnSelf();
--
--        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->redirectFactoryMock->expects($this->once())
--            ->method('create')
--            ->with([])
--            ->willReturn($redirectMock);
--
--        $redirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('*/*/createPassword', ['id' => $customerId, 'token' => $token])
--            ->willReturnSelf();
--
--        $this->assertEquals($redirectMock, $this->model->execute());
--    }
--
--    /**
--     * Test for InputException
--     */
--    public function testExecuteWithInputException()
--    {
--        $token = 'token';
--        $customerId = '11';
--        $password = 'password';
--        $passwordConfirmation = 'password';
--        $email = 'email@email.com';
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getQuery')
--            ->willReturnMap(
--                [
--                    ['token', $token],
--                    ['id', $customerId],
--                ]
--            );
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getPost')
--            ->willReturnMap(
--                [
--                    ['password', $password],
--                    ['password_confirmation', $passwordConfirmation],
--                ]
--            );
--
--        /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customerMock */
--        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
--            ->getMockForAbstractClass();
--
--        $this->customerRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($customerId)
--            ->willReturn($customerMock);
--
--        $customerMock->expects($this->once())
--            ->method('getEmail')
--            ->willReturn($email);
--
--        $this->accountManagementMock->expects($this->once())
--            ->method('resetPassword')
--            ->with($email, $token, $password)
--            ->willThrowException(new \Magento\Framework\Exception\InputException(__('InputException.')));
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addError')
--            ->with(__('InputException.'))
--            ->willReturnSelf();
--
--        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->redirectFactoryMock->expects($this->once())
--            ->method('create')
--            ->with([])
--            ->willReturn($redirectMock);
--
--        $redirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('*/*/createPassword', ['id' => $customerId, 'token' => $token])
--            ->willReturnSelf();
--
--        $this->assertEquals($redirectMock, $this->model->execute());
--    }
--
--    public function testExecuteWithWrongConfirmation()
--    {
--        $token = 'token';
--        $customerId = '11';
--        $password = 'password';
--        $passwordConfirmation = 'wrong_password';
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getQuery')
--            ->willReturnMap(
--                [
--                    ['token', $token],
--                    ['id', $customerId],
--                ]
--            );
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getPost')
--            ->willReturnMap(
--                [
--                    ['password', $password],
--                    ['password_confirmation', $passwordConfirmation],
--                ]
--            );
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addError')
--            ->with(__('New Password and Confirm New Password values didn\'t match.'))
--            ->willReturnSelf();
--
--        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->redirectFactoryMock->expects($this->once())
--            ->method('create')
--            ->with([])
--            ->willReturn($redirectMock);
--
--        $redirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('*/*/createPassword', ['id' => $customerId, 'token' => $token])
--            ->willReturnSelf();
--
--        $this->assertEquals($redirectMock, $this->model->execute());
--    }
--
--    public function testExecuteWithEmptyPassword()
--    {
--        $token = 'token';
--        $customerId = '11';
--        $password = '';
--        $passwordConfirmation = '';
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getQuery')
--            ->willReturnMap(
--                [
--                    ['token', $token],
--                    ['id', $customerId],
--                ]
--            );
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getPost')
--            ->willReturnMap(
--                [
--                    ['password', $password],
--                    ['password_confirmation', $passwordConfirmation],
--                ]
--            );
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addError')
--            ->with(__('Please enter a new password.'))
--            ->willReturnSelf();
--
--        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->redirectFactoryMock->expects($this->once())
--            ->method('create')
--            ->with([])
--            ->willReturn($redirectMock);
--
--        $redirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('*/*/createPassword', ['id' => $customerId, 'token' => $token])
--            ->willReturnSelf();
--
--        $this->assertEquals($redirectMock, $this->model->execute());
--    }
--}
-diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php
-index c2a795fc950..7ae55f44421 100644
---- a/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php
-@@ -455,14 +455,20 @@ class FormPostTest extends \PHPUnit\Framework\TestCase
-         $regionCode,
-         $newRegionId,
-         $newRegion,
--        $newRegionCode
-+        $newRegionCode,
-+        $existingDefaultBilling = false,
-+        $existingDefaultShipping = false,
-+        $setDefaultBilling = false,
-+        $setDefaultShipping = false
-     ): void {
-         $existingAddressData = [
-             'country_id' => $countryId,
-             'region_id' => $regionId,
-             'region' => $region,
-             'region_code' => $regionCode,
--            'customer_id' => $customerId
-+            'customer_id' => $customerId,
-+            'default_billing' => $existingDefaultBilling,
-+            'default_shipping' => $existingDefaultShipping,
-         ];
-         $newAddressData = [
-             'country_id' => $countryId,
-@@ -486,8 +492,8 @@ class FormPostTest extends \PHPUnit\Framework\TestCase
-             ->method('getParam')
-             ->willReturnMap([
-                 ['id', null, $addressId],
--                ['default_billing', false, $addressId],
--                ['default_shipping', false, $addressId],
-+                ['default_billing', $existingDefaultBilling, $setDefaultBilling],
-+                ['default_shipping', $existingDefaultShipping, $setDefaultShipping],
-             ]);
- 
-         $this->addressRepository->expects($this->once())
-@@ -565,11 +571,11 @@ class FormPostTest extends \PHPUnit\Framework\TestCase
-             ->willReturnSelf();
-         $this->addressData->expects($this->once())
-             ->method('setIsDefaultBilling')
--            ->with()
-+            ->with($setDefaultBilling)
-             ->willReturnSelf();
-         $this->addressData->expects($this->once())
-             ->method('setIsDefaultShipping')
--            ->with()
-+            ->with($setDefaultShipping)
-             ->willReturnSelf();
- 
-         $this->messageManager->expects($this->once())
-@@ -628,11 +634,11 @@ class FormPostTest extends \PHPUnit\Framework\TestCase
- 
-             [1, 1, 1, 2, null, null, 12, null, null],
-             [1, 1, 1, 2, 'Alaska', null, 12, null, 'CA'],
--            [1, 1, 1, 2, 'Alaska', 'AK', 12, 'California', null],
-+            [1, 1, 1, 2, 'Alaska', 'AK', 12, 'California', null, true, true, true, false],
- 
--            [1, 1, 1, 2, null, null, 12, null, null],
--            [1, 1, 1, 2, 'Alaska', null, 12, null, 'CA'],
--            [1, 1, 1, 2, 'Alaska', 'AK', 12, 'California', null],
-+            [1, 1, 1, 2, null, null, 12, null, null, false, false, true, false],
-+            [1, 1, 1, 2, 'Alaska', null, 12, null, 'CA', true, false, true, false],
-+            [1, 1, 1, 2, 'Alaska', 'AK', 12, 'California', null, true, true, true, true],
-         ];
-     }
- 
-diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Address/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Address/SaveTest.php
-new file mode 100644
-index 00000000000..1bf881ff0a9
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Unit/Controller/Address/SaveTest.php
-@@ -0,0 +1,213 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Customer\Test\Unit\Controller\Address;
-+
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Framework\Controller\Result\Json;
-+use Magento\Framework\Controller\Result\JsonFactory;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class SaveTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Customer\Controller\Adminhtml\Address\Save
-+     */
-+    private $model;
-+
-+    /**
-+     * @var \Magento\Customer\Api\AddressRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $addressRepositoryMock;
-+
-+    /**
-+     * @var \Magento\Customer\Model\Metadata\FormFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $formFactoryMock;
-+
-+    /**
-+     * @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $customerRepositoryMock;
-+
-+    /**
-+     * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $dataObjectHelperMock;
-+
-+    /**
-+     * @var \Magento\Customer\Api\Data\AddressInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $addressDataFactoryMock;
-+
-+    /**
-+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $loggerMock;
-+
-+    /**
-+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $requestMock;
-+
-+    /**
-+     * @var AddressInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $address;
-+
-+    /**
-+     * @var JsonFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $resultJsonFactory;
-+
-+    /**
-+     * @var Json|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $json;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->addressRepositoryMock = $this->createMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
-+        $this->formFactoryMock = $this->createMock(\Magento\Customer\Model\Metadata\FormFactory::class);
-+        $this->customerRepositoryMock = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-+        $this->dataObjectHelperMock = $this->createMock(\Magento\Framework\Api\DataObjectHelper ::class);
-+        $this->addressDataFactoryMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterfaceFactory::class);
-+        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
-+        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
-+        $this->address = $this->getMockBuilder(AddressInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+        $this->resultJsonFactory = $this->getMockBuilder(JsonFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $this->json = $this->getMockBuilder(Json::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->model = $objectManager->getObject(
-+            \Magento\Customer\Controller\Adminhtml\Address\Save::class,
-+            [
-+                'addressRepository'     => $this->addressRepositoryMock,
-+                'formFactory'           => $this->formFactoryMock,
-+                'customerRepository'    => $this->customerRepositoryMock,
-+                'dataObjectHelper'      => $this->dataObjectHelperMock,
-+                'addressDataFactory'    => $this->addressDataFactoryMock,
-+                'logger'            => $this->loggerMock,
-+                'request'               => $this->requestMock,
-+                'resultJsonFactory' => $this->resultJsonFactory
-+            ]
-+        );
-+    }
-+
-+    public function testExecute(): void
-+    {
-+        $addressId = 11;
-+        $customerId = 22;
-+
-+        $addressExtractedData = [
-+            'entity_id' => $addressId,
-+            'code'      => 'value',
-+            'coolness'  => false,
-+            'region'    => 'region',
-+            'region_id' => 'region_id',
-+        ];
-+
-+        $addressCompactedData = [
-+            'entity_id'        => $addressId,
-+            'default_billing'  => 'true',
-+            'default_shipping' => 'true',
-+            'code'             => 'value',
-+            'coolness'         => false,
-+            'region'           => 'region',
-+            'region_id'        => 'region_id',
-+        ];
-+
-+        $mergedAddressData = [
-+            'entity_id'        => $addressId,
-+            'default_billing'  => true,
-+            'default_shipping' => true,
-+            'code'             => 'value',
-+            'region'           => [
-+                'region'    => 'region',
-+                'region_id' => 'region_id',
-+            ],
-+            'region_id'        => 'region_id',
-+            'id'               => $addressId,
-+        ];
-+
-+        $this->requestMock->method('getParam')
-+            ->withConsecutive(['parent_id'], ['entity_id'])
-+            ->willReturnOnConsecutiveCalls(22, 1);
-+
-+        $customerMock = $this->getMockBuilder(
-+            \Magento\Customer\Api\Data\CustomerInterface::class
-+        )->disableOriginalConstructor()->getMock();
-+
-+        $this->customerRepositoryMock->expects($this->atLeastOnce())
-+            ->method('getById')
-+            ->with($customerId)
-+            ->willReturn($customerMock);
-+
-+        $customerAddressFormMock = $this->createMock(\Magento\Customer\Model\Metadata\Form::class);
-+        $customerAddressFormMock->expects($this->atLeastOnce())
-+            ->method('extractData')
-+            ->with($this->requestMock)
-+            ->willReturn($addressExtractedData);
-+        $customerAddressFormMock->expects($this->once())
-+            ->method('compactData')
-+            ->with($addressExtractedData)
-+            ->willReturn($addressCompactedData);
-+
-+        $this->formFactoryMock->expects($this->exactly(1))
-+            ->method('create')
-+            ->willReturn($customerAddressFormMock);
-+
-+        $addressMock = $this->getMockBuilder(AddressInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->addressDataFactoryMock->expects($this->once())->method('create')->willReturn($addressMock);
-+
-+        $this->dataObjectHelperMock->expects($this->atLeastOnce())
-+            ->method('populateWithArray')
-+            ->willReturn(
-+                [
-+                    $addressMock,
-+                    $mergedAddressData, AddressInterface::class,
-+                    $this->dataObjectHelperMock,
-+                ]
-+            );
-+        $this->addressRepositoryMock->expects($this->once())->method('save')->willReturn($this->address);
-+        $this->address->expects($this->once())->method('getId')->willReturn($addressId);
-+
-+        $this->resultJsonFactory->expects($this->once())
-+            ->method('create')
-+            ->willReturn($this->json);
-+        $this->json->expects($this->once())
-+            ->method('setData')
-+            ->with(
-+                [
-+                    'message' => __('Customer address has been updated.'),
-+                    'error' => false,
-+                    'data' => [
-+                        'entity_id' => $addressId
-+                    ]
-+                ]
-+            )->willReturnSelf();
-+
-+        $this->assertEquals($this->json, $this->model->execute());
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Address/ValidateTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Address/ValidateTest.php
-new file mode 100644
-index 00000000000..a724bdd2495
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Unit/Controller/Address/ValidateTest.php
-@@ -0,0 +1,118 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Customer\Test\Unit\Controller\Address;
-+
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class ValidateTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Customer\Controller\Adminhtml\Address\Validate
-+     */
-+    private $model;
-+
-+    /**
-+     * @var \Magento\Customer\Model\Metadata\FormFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $formFactoryMock;
-+
-+    /**
-+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $requestMock;
-+
-+    /**
-+     * @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $resultRedirectFactoryMock;
-+
-+    /**
-+     * @var \Magento\Framework\Controller\Result\JsonFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $resultJsonFactoryMock;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->formFactoryMock = $this->createMock(\Magento\Customer\Model\Metadata\FormFactory::class);
-+        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
-+        $this->resultJsonFactoryMock = $this->createMock(\Magento\Framework\Controller\Result\JsonFactory::class);
-+        $this->resultRedirectFactoryMock = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->model = $objectManager->getObject(
-+            \Magento\Customer\Controller\Adminhtml\Address\Validate::class,
-+            [
-+                'formFactory'           => $this->formFactoryMock,
-+                'request'               => $this->requestMock,
-+                'resultRedirectFactory' => $this->resultRedirectFactoryMock,
-+                'resultJsonFactory'     => $this->resultJsonFactoryMock,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test method \Magento\Customer\Controller\Adminhtml\Address\Save::execute
-+     *
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    public function testExecute()
-+    {
-+        $addressId = 11;
-+        $errors = ['Error Message 1', 'Error Message 2'];
-+
-+        $addressExtractedData = [
-+            'entity_id'        => $addressId,
-+            'default_billing'  => true,
-+            'default_shipping' => true,
-+            'code'             => 'value',
-+            'region'           => [
-+                'region'    => 'region',
-+                'region_id' => 'region_id',
-+            ],
-+            'region_id'        => 'region_id',
-+            'id'               => $addressId,
-+        ];
-+
-+        $customerAddressFormMock = $this->createMock(\Magento\Customer\Model\Metadata\Form::class);
-+
-+        $customerAddressFormMock->expects($this->atLeastOnce())
-+            ->method('extractData')
-+            ->with($this->requestMock)
-+            ->willReturn($addressExtractedData);
-+        $customerAddressFormMock->expects($this->once())
-+            ->method('validateData')
-+            ->with($addressExtractedData)
-+            ->willReturn($errors);
-+
-+        $this->formFactoryMock->expects($this->exactly(1))
-+            ->method('create')
-+            ->willReturn($customerAddressFormMock);
-+
-+        $resultJson = $this->createMock(\Magento\Framework\Controller\Result\Json::class);
-+        $this->resultJsonFactoryMock->method('create')
-+            ->willReturn($resultJson);
-+
-+        $validateResponseMock = $this->createPartialMock(
-+            \Magento\Framework\DataObject::class,
-+            ['getError', 'setMessages']
-+        );
-+        $validateResponseMock->method('setMessages')->willReturnSelf();
-+        $validateResponseMock->method('getError')->willReturn(1);
-+
-+        $resultJson->method('setData')->willReturnSelf();
-+
-+        $this->assertEquals($resultJson, $this->model->execute());
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php
-index 20177ab0b0d..8f8ed0e37a4 100644
---- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php
-@@ -70,7 +70,8 @@ class UploadTest extends \PHPUnit\Framework\TestCase
-             $this->context,
-             $this->fileUploaderFactory,
-             $this->addressMetadataService,
--            $this->logger
-+            $this->logger,
-+            'address'
-         );
-     }
- 
-@@ -104,27 +105,27 @@ class UploadTest extends \PHPUnit\Framework\TestCase
- 
-     public function testExecute()
-     {
--        $attributeCode = 'attribute_code';
-+        $attributeCode = 'file_address_attribute';
-+        $resultFileSize = 20000;
-+        $resultFileName = 'text.txt';
-+        $resultType = 'text/plain';
- 
-         $_FILES = [
--            'address' => [
--                'name' => [
--                    'new_0' => [
--                        $attributeCode => 'filename',
--                    ],
--                ],
-+            $attributeCode => [
-+                'name' => $resultFileName,
-+                'type' => $resultType,
-+                'size' => $resultFileSize
-             ],
-         ];
- 
--        $resultFileName = '/filename.ext1';
-         $resultFilePath = 'filepath';
-         $resultFileUrl = 'viewFileUrl';
- 
-         $result = [
-             'name' => $resultFileName,
--            'file' => $resultFileName,
--            'path' => $resultFilePath,
--            'tmp_name' => $resultFilePath . $resultFileName,
-+            'type' => $resultType,
-+            'size' => $resultFileSize,
-+            'tmp_name' => $resultFilePath . '/' . $resultFileName,
-             'url' => $resultFileUrl,
-         ];
- 
-@@ -173,15 +174,16 @@ class UploadTest extends \PHPUnit\Framework\TestCase
- 
-     public function testExecuteWithErrors()
-     {
--        $attributeCode = 'attribute_code';
-+        $attributeCode = 'file_address_attribute';
-+        $resultFileSize = 20000;
-+        $resultFileName = 'text.txt';
-+        $resultType = 'text/plain';
- 
-         $_FILES = [
--            'address' => [
--                'name' => [
--                    'new_0' => [
--                        $attributeCode => 'filename',
--                    ],
--                ],
-+            $attributeCode => [
-+                'name' => $resultFileName,
-+                'type' => $resultType,
-+                'size' => $resultFileSize
-             ],
-         ];
- 
-diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php
-index 913c4107085..45e64f6557d 100644
---- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php
-@@ -5,9 +5,14 @@
-  */
- namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
- 
-+use Magento\Customer\Model\AddressRegistry;
- use Magento\Customer\Model\EmailNotificationInterface;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\Message\MessageInterface;
- 
- /**
-+ * Unit tests for Inline customer edit
-+ *
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
-@@ -67,14 +72,27 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-     /** @var EmailNotificationInterface|\PHPUnit_Framework_MockObject_MockObject */
-     private $emailNotification;
- 
-+    /** @var AddressRegistry|\PHPUnit_Framework_MockObject_MockObject */
-+    private $addressRegistry;
-+
-     /** @var array */
-     private $items;
- 
-+    /**
-+     * Sets up mocks
-+     *
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-     protected function setUp()
-     {
-         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- 
--        $this->request = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class, [], '', false);
-+        $this->request = $this->getMockForAbstractClass(
-+            \Magento\Framework\App\RequestInterface::class,
-+            [],
-+            '',
-+            false
-+        );
-         $this->messageManager = $this->getMockForAbstractClass(
-             \Magento\Framework\Message\ManagerInterface::class,
-             [],
-@@ -124,8 +142,12 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-             '',
-             false
-         );
--        $this->logger = $this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class, [], '', false);
--
-+        $this->logger = $this->getMockForAbstractClass(
-+            \Psr\Log\LoggerInterface::class,
-+            [],
-+            '',
-+            false
-+        );
-         $this->emailNotification = $this->getMockBuilder(EmailNotificationInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-@@ -137,6 +159,7 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-                 'messageManager' => $this->messageManager,
-             ]
-         );
-+        $this->addressRegistry = $this->createMock(\Magento\Customer\Model\AddressRegistry::class);
-         $this->controller = $objectManager->getObject(
-             \Magento\Customer\Controller\Adminhtml\Index\InlineEdit::class,
-             [
-@@ -149,6 +172,7 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-                 'addressDataFactory' => $this->addressDataFactory,
-                 'addressRepository' => $this->addressRepository,
-                 'logger' => $this->logger,
-+                'addressRegistry' => $this->addressRegistry
-             ]
-         );
-         $reflection = new \ReflectionClass(get_class($this->controller));
-@@ -165,6 +189,8 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Prepare mocks for tests
-+     *
-      * @param int $populateSequence
-      */
-     protected function prepareMocksForTesting($populateSequence = 0)
-@@ -203,6 +229,9 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-             ->willReturn(12);
-     }
- 
-+    /**
-+     * Prepare mocks for update customers default billing address use case
-+     */
-     protected function prepareMocksForUpdateDefaultBilling()
-     {
-         $this->prepareMocksForProcessAddressData();
-@@ -211,12 +240,15 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-             'firstname' => 'Firstname',
-             'lastname' => 'Lastname',
-         ];
--        $this->customerData->expects($this->once())
-+        $this->customerData->expects($this->exactly(2))
-             ->method('getAddresses')
-             ->willReturn([$this->address]);
-         $this->address->expects($this->once())
-             ->method('isDefaultBilling')
-             ->willReturn(true);
-+        $this->addressRegistry->expects($this->once())
-+            ->method('retrieve')
-+            ->willReturn(new DataObject());
-         $this->dataObjectHelper->expects($this->at(0))
-             ->method('populateWithArray')
-             ->with(
-@@ -226,6 +258,9 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-             );
-     }
- 
-+    /**
-+     * Prepare mocks for processing customers address data use case
-+     */
-     protected function prepareMocksForProcessAddressData()
-     {
-         $this->customerData->expects($this->once())
-@@ -236,16 +271,20 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-             ->willReturn('Lastname');
-     }
- 
-+    /**
-+     * Prepare mocks for error messages processing test
-+     */
-     protected function prepareMocksForErrorMessagesProcessing()
-     {
-         $this->messageManager->expects($this->atLeastOnce())
-             ->method('getMessages')
-             ->willReturn($this->messageCollection);
-         $this->messageCollection->expects($this->once())
--            ->method('getItems')
-+            ->method('getErrors')
-             ->willReturn([$this->message]);
-         $this->messageCollection->expects($this->once())
--            ->method('getCount')
-+            ->method('getCountByType')
-+            ->with(MessageInterface::TYPE_ERROR)
-             ->willReturn(1);
-         $this->message->expects($this->once())
-             ->method('getText')
-@@ -259,6 +298,9 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-             ->willReturnSelf();
-     }
- 
-+    /**
-+     * Unit test for updating customers billing address use case
-+     */
-     public function testExecuteWithUpdateBilling()
-     {
-         $this->prepareMocksForTesting(1);
-@@ -279,6 +321,9 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($this->resultJson, $this->controller->execute());
-     }
- 
-+    /**
-+     * Unit test for creating customer with empty data use case
-+     */
-     public function testExecuteWithoutItems()
-     {
-         $this->resultJsonFactory->expects($this->once())
-@@ -303,6 +348,9 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($this->resultJson, $this->controller->execute());
-     }
- 
-+    /**
-+     * Unit test for verifying Localized Exception during inline edit
-+     */
-     public function testExecuteLocalizedException()
-     {
-         $exception = new \Magento\Framework\Exception\LocalizedException(__('Exception message'));
-@@ -310,6 +358,9 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-         $this->customerData->expects($this->once())
-             ->method('getDefaultBilling')
-             ->willReturn(false);
-+        $this->customerData->expects($this->once())
-+            ->method('getAddresses')
-+            ->willReturn([]);
-         $this->customerRepository->expects($this->once())
-             ->method('save')
-             ->with($this->customerData)
-@@ -325,6 +376,9 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($this->resultJson, $this->controller->execute());
-     }
- 
-+    /**
-+     * Unit test for verifying Execute Exception during inline edit
-+     */
-     public function testExecuteException()
-     {
-         $exception = new \Exception('Exception message');
-@@ -332,6 +386,9 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
-         $this->customerData->expects($this->once())
-             ->method('getDefaultBilling')
-             ->willReturn(false);
-+        $this->customerData->expects($this->once())
-+            ->method('getAddresses')
-+            ->willReturn([]);
-         $this->customerRepository->expects($this->once())
-             ->method('save')
-             ->with($this->customerData)
-diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php
-index 884aab711d1..10144bdc318 100644
---- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php
-@@ -11,6 +11,7 @@ use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHe
- 
- /**
-  * Class MassAssignGroupTest
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class MassAssignGroupTest extends \PHPUnit\Framework\TestCase
-@@ -70,12 +71,17 @@ class MassAssignGroupTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $customerRepositoryMock;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $objectManagerHelper = new ObjectManagerHelper($this);
- 
-         $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
--        $resultRedirectFactory = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
-+        $resultRedirectFactory = $this->createMock(
-+            \Magento\Backend\Model\View\Result\RedirectFactory::class
-+        );
-         $this->responseMock = $this->createMock(\Magento\Framework\App\ResponseInterface::class);
-         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-             ->disableOriginalConstructor()->getMock();
-@@ -129,7 +135,8 @@ class MassAssignGroupTest extends \PHPUnit\Framework\TestCase
-         $this->customerCollectionFactoryMock->expects($this->once())
-             ->method('create')
-             ->willReturn($this->customerCollectionMock);
--        $this->customerRepositoryMock = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
-+        $this->customerRepositoryMock = $this
-+            ->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
-             ->getMockForAbstractClass();
-         $this->massAction = $objectManagerHelper->getObject(
-             \Magento\Customer\Controller\Adminhtml\Index\MassAssignGroup::class,
-@@ -142,12 +149,18 @@ class MassAssignGroupTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * Unit test to verify mass customer group assignment use case
-+     *
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-     public function testExecute()
-     {
-         $customersIds = [10, 11, 12];
--        $customerMock = $this->getMockBuilder(
--            \Magento\Customer\Api\Data\CustomerInterface::class
--        )->getMockForAbstractClass();
-+        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-+            ->setMethods(['setData'])
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-         $this->customerCollectionMock->expects($this->any())
-             ->method('getAllIds')
-             ->willReturn($customersIds);
-@@ -168,6 +181,11 @@ class MassAssignGroupTest extends \PHPUnit\Framework\TestCase
-         $this->massAction->execute();
-     }
- 
-+    /**
-+     * Unit test to verify expected error during mass customer group assignment use case
-+     *
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-     public function testExecuteWithException()
-     {
-         $customersIds = [10, 11, 12];
-diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
-index 5372bb11a89..57f384d32d9 100644
---- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
-@@ -5,7 +5,6 @@
-  */
- namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
- 
--use Magento\Customer\Api\AddressMetadataInterface;
- use Magento\Customer\Api\CustomerMetadataInterface;
- use Magento\Customer\Api\Data\AttributeMetadataInterface;
- use Magento\Customer\Api\Data\CustomerInterface;
-@@ -15,6 +14,8 @@ use Magento\Customer\Model\Metadata\Form;
- use Magento\Framework\Controller\Result\Redirect;
- 
- /**
-+ * Testing Save Customer use case from admin page
-+ *
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @covers \Magento\Customer\Controller\Adminhtml\Index\Save
-@@ -281,7 +282,6 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-     public function testExecuteWithExistentCustomer()
-     {
-         $customerId = 22;
--        $addressId = 11;
-         $subscription = 'true';
-         $postValue = [
-             'customer' => [
-@@ -290,18 +290,6 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-                 'coolness' => false,
-                 'disable_auto_group_change' => 'false',
-             ],
--            'address' => [
--                '_template_' => '_template_',
--                $addressId => [
--                    'entity_id' => $addressId,
--                    'default_billing' => 'true',
--                    'default_shipping' => 'true',
--                    'code' => 'value',
--                    'coolness' => false,
--                    'region' => 'region',
--                    'region_id' => 'region_id',
--                ],
--            ],
-             'subscription' => $subscription,
-         ];
-         $extractedData = [
-@@ -318,22 +306,6 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             CustomerInterface::DEFAULT_BILLING => 2,
-             CustomerInterface::DEFAULT_SHIPPING => 2
-         ];
--        $addressExtractedData = [
--            'entity_id' => $addressId,
--            'code' => 'value',
--            'coolness' => false,
--            'region' => 'region',
--            'region_id' => 'region_id',
--        ];
--        $addressCompactedData = [
--            'entity_id' => $addressId,
--            'default_billing' => 'true',
--            'default_shipping' => 'true',
--            'code' => 'value',
--            'coolness' => false,
--            'region' => 'region',
--            'region_id' => 'region_id',
--        ];
-         $savedData = [
-             'entity_id' => $customerId,
-             'darkness' => true,
-@@ -341,61 +313,40 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             CustomerInterface::DEFAULT_BILLING => false,
-             CustomerInterface::DEFAULT_SHIPPING => false,
-         ];
--        $savedAddressData = [
--            'entity_id' => $addressId,
--            'default_billing' => true,
--            'default_shipping' => true,
--        ];
-         $mergedData = [
-             'entity_id' => $customerId,
-             'darkness' => true,
-             'name' => 'Name',
-             'code' => 'value',
-             'disable_auto_group_change' => 0,
--            CustomerInterface::DEFAULT_BILLING => $addressId,
--            CustomerInterface::DEFAULT_SHIPPING => $addressId,
-             'confirmation' => false,
-             'sendemail_store_id' => '1',
-             'id' => $customerId,
-         ];
--        $mergedAddressData = [
--            'entity_id' => $addressId,
--            'default_billing' => true,
--            'default_shipping' => true,
--            'code' => 'value',
--            'region' => [
--                    'region' => 'region',
--                    'region_id' => 'region_id',
--                ],
--            'region_id' => 'region_id',
--            'id' => $addressId,
--        ];
- 
-         /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
-         $attributeMock = $this->getMockBuilder(
-             \Magento\Customer\Api\Data\AttributeMetadataInterface::class
-         )->disableOriginalConstructor()->getMock();
--        $attributeMock->expects($this->exactly(2))
-+        $attributeMock->expects($this->atLeastOnce())
-             ->method('getAttributeCode')
-             ->willReturn('coolness');
--        $attributeMock->expects($this->exactly(2))
-+        $attributeMock->expects($this->atLeastOnce())
-             ->method('getFrontendInput')
-             ->willReturn('int');
-         $attributes = [$attributeMock];
- 
--        $this->requestMock->expects($this->any())
-+        $this->requestMock->expects($this->atLeastOnce())
-             ->method('getPostValue')
-             ->willReturnMap([
-                 [null, null, $postValue],
-                 [CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
--                ['address/' . $addressId, null, $postValue['address'][$addressId]],
-             ]);
--        $this->requestMock->expects($this->exactly(3))
-+        $this->requestMock->expects($this->atLeastOnce())
-             ->method('getPost')
-             ->willReturnMap(
-                 [
-                     ['customer', null, $postValue['customer']],
--                    ['address', null, $postValue['address']],
-                     ['subscription', null, $subscription],
-                 ]
-             );
-@@ -404,16 +355,15 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-         $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $objectMock->expects($this->exactly(2))
-+        $objectMock->expects($this->atLeastOnce())
-             ->method('getData')
-             ->willReturnMap(
-                 [
-                     ['customer', null, $postValue['customer']],
--                    ['address/' . $addressId, null, $postValue['address'][$addressId]],
-                 ]
-             );
- 
--        $this->objectFactoryMock->expects($this->exactly(2))
-+        $this->objectFactoryMock->expects($this->exactly(1))
-             ->method('create')
-             ->with(['data' => $postValue])
-             ->willReturn($objectMock);
-@@ -432,23 +382,7 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-         $customerFormMock->expects($this->once())
-             ->method('getAttributes')
-             ->willReturn($attributes);
--
--        $customerAddressFormMock = $this->getMockBuilder(
--            \Magento\Customer\Model\Metadata\Form::class
--        )->disableOriginalConstructor()->getMock();
--        $customerAddressFormMock->expects($this->once())
--            ->method('extractData')
--            ->with($this->requestMock, 'address/' . $addressId)
--            ->willReturn($addressExtractedData);
--        $customerAddressFormMock->expects($this->once())
--            ->method('compactData')
--            ->with($addressExtractedData)
--            ->willReturn($addressCompactedData);
--        $customerAddressFormMock->expects($this->once())
--            ->method('getAttributes')
--            ->willReturn($attributes);
--
--        $this->formFactoryMock->expects($this->exactly(2))
-+        $this->formFactoryMock->expects($this->exactly(1))
-             ->method('create')
-             ->willReturnMap(
-                 [
-@@ -461,15 +395,6 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-                         [],
-                         $customerFormMock
-                     ],
--                    [
--                        AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
--                        'adminhtml_customer_address',
--                        $savedAddressData,
--                        false,
--                        Form::DONT_IGNORE_INVISIBLE,
--                        [],
--                        $customerAddressFormMock
--                    ],
-                 ]
-             );
- 
-@@ -492,25 +417,7 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             ->with($customerMock)
-             ->willReturn($savedData);
- 
--        $addressMock = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->customerAddressRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($addressId)
--            ->willReturn($addressMock);
--
--        $this->customerAddressMapperMock->expects($this->once())
--            ->method('toFlatArray')
--            ->with($addressMock)
--            ->willReturn($savedAddressData);
--
--        $this->addressDataFactoryMock->expects($this->once())
--            ->method('create')
--            ->willReturn($addressMock);
--
--        $this->dataHelperMock->expects($this->exactly(2))
-+        $this->dataHelperMock->expects($this->atLeastOnce())
-             ->method('populateWithArray')
-             ->willReturnMap(
-                 [
-@@ -519,19 +426,9 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-                         $mergedData, \Magento\Customer\Api\Data\CustomerInterface::class,
-                         $this->dataHelperMock
-                     ],
--                    [
--                        $addressMock,
--                        $mergedAddressData, \Magento\Customer\Api\Data\AddressInterface::class,
--                        $this->dataHelperMock
--                    ],
-                 ]
-             );
- 
--        $customerMock->expects($this->once())
--            ->method('setAddresses')
--            ->with([$addressMock])
--            ->willReturnSelf();
--
-         $this->customerRepositoryMock->expects($this->once())
-             ->method('save')
-             ->with($customerMock)
-@@ -540,6 +437,10 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-         $customerEmail = 'customer@email.com';
-         $customerMock->expects($this->once())->method('getEmail')->willReturn($customerEmail);
- 
-+        $customerMock->expects($this->once())
-+            ->method('getAddresses')
-+            ->willReturn([]);
-+
-         $this->emailNotificationMock->expects($this->once())
-             ->method('credentialsChanged')
-             ->with($customerMock, $customerEmail)
-@@ -608,63 +509,33 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-     public function testExecuteWithNewCustomer()
-     {
-         $customerId = 22;
--        $addressId = 11;
-+
-         $subscription = '0';
-         $postValue = [
-             'customer' => [
-                 'coolness' => false,
-                 'disable_auto_group_change' => 'false',
-             ],
--            'address' => [
--                '_template_' => '_template_',
--                $addressId => [
--                    'entity_id' => $addressId,
--                    'code' => 'value',
--                    'coolness' => false,
--                    'region' => 'region',
--                    'region_id' => 'region_id',
--                ],
--            ],
-             'subscription' => $subscription,
-         ];
-         $extractedData = [
-             'coolness' => false,
-             'disable_auto_group_change' => 'false',
-         ];
--        $addressExtractedData = [
--            'entity_id' => $addressId,
--            'code' => 'value',
--            'coolness' => false,
--            'region' => 'region',
--            'region_id' => 'region_id',
--        ];
-         $mergedData = [
-             'disable_auto_group_change' => 0,
-             CustomerInterface::DEFAULT_BILLING => null,
-             CustomerInterface::DEFAULT_SHIPPING => null,
-             'confirmation' => false,
-         ];
--        $mergedAddressData = [
--            'entity_id' => $addressId,
--            'default_billing' => false,
--            'default_shipping' => false,
--            'code' => 'value',
--            'region' => [
--                    'region' => 'region',
--                    'region_id' => 'region_id',
--                ],
--            'region_id' => 'region_id',
--            'id' => $addressId,
--        ];
--
-         /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
-         $attributeMock = $this->getMockBuilder(
-             \Magento\Customer\Api\Data\AttributeMetadataInterface::class
-         )->disableOriginalConstructor()->getMock();
--        $attributeMock->expects($this->exactly(2))
-+        $attributeMock->expects($this->atLeastOnce())
-             ->method('getAttributeCode')
-             ->willReturn('coolness');
--        $attributeMock->expects($this->exactly(2))
-+        $attributeMock->expects($this->atLeastOnce())
-             ->method('getFrontendInput')
-             ->willReturn('int');
-         $attributes = [$attributeMock];
-@@ -674,14 +545,12 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             ->willReturnMap([
-                 [null, null, $postValue],
-                 [CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
--                ['address/' . $addressId, null, $postValue['address'][$addressId]],
-             ]);
--        $this->requestMock->expects($this->exactly(3))
-+        $this->requestMock->expects($this->atLeastOnce())
-             ->method('getPost')
-             ->willReturnMap(
-                 [
-                     ['customer', null, $postValue['customer']],
--                    ['address', null, $postValue['address']],
-                     ['subscription', null, $subscription],
-                 ]
-             );
-@@ -690,16 +559,15 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-         $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $objectMock->expects($this->exactly(2))
-+        $objectMock->expects($this->atLeastOnce())
-             ->method('getData')
-             ->willReturnMap(
-                 [
-                     ['customer', null, $postValue['customer']],
--                    ['address/' . $addressId, null, $postValue['address'][$addressId]],
-                 ]
-             );
- 
--        $this->objectFactoryMock->expects($this->exactly(2))
-+        $this->objectFactoryMock->expects($this->atLeastOnce())
-             ->method('create')
-             ->with(['data' => $postValue])
-             ->willReturn($objectMock);
-@@ -719,22 +587,7 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             ->method('getAttributes')
-             ->willReturn($attributes);
- 
--        $customerAddressFormMock = $this->getMockBuilder(
--            \Magento\Customer\Model\Metadata\Form::class
--        )->disableOriginalConstructor()->getMock();
--        $customerAddressFormMock->expects($this->once())
--            ->method('extractData')
--            ->with($this->requestMock, 'address/' . $addressId)
--            ->willReturn($addressExtractedData);
--        $customerAddressFormMock->expects($this->once())
--            ->method('compactData')
--            ->with($addressExtractedData)
--            ->willReturn($addressExtractedData);
--        $customerAddressFormMock->expects($this->once())
--            ->method('getAttributes')
--            ->willReturn($attributes);
--
--        $this->formFactoryMock->expects($this->exactly(2))
-+        $this->formFactoryMock->expects($this->exactly(1))
-             ->method('create')
-             ->willReturnMap(
-                 [
-@@ -747,15 +600,6 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-                         [],
-                         $customerFormMock
-                     ],
--                    [
--                        AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
--                        'adminhtml_customer_address',
--                        [],
--                        false,
--                        Form::DONT_IGNORE_INVISIBLE,
--                        [],
--                        $customerAddressFormMock
--                    ],
-                 ]
-             );
- 
-@@ -768,25 +612,7 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             ->method('create')
-             ->willReturn($customerMock);
- 
--        $addressMock = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->addressDataFactoryMock->expects($this->once())
--            ->method('create')
--            ->willReturn($addressMock);
--
--        $this->customerAddressRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($addressId)
--            ->willReturn($addressMock);
--
--        $this->customerAddressMapperMock->expects($this->once())
--            ->method('toFlatArray')
--            ->with($addressMock)
--            ->willReturn([]);
--
--        $this->dataHelperMock->expects($this->exactly(2))
-+        $this->dataHelperMock->expects($this->atLeastOnce())
-             ->method('populateWithArray')
-             ->willReturnMap(
-                 [
-@@ -795,11 +621,6 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-                         $mergedData, \Magento\Customer\Api\Data\CustomerInterface::class,
-                         $this->dataHelperMock
-                     ],
--                    [
--                        $addressMock,
--                        $mergedAddressData, \Magento\Customer\Api\Data\AddressInterface::class,
--                        $this->dataHelperMock
--                    ],
-                 ]
-             );
- 
-@@ -878,22 +699,24 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             'customer' => [
-                 'coolness' => false,
-                 'disable_auto_group_change' => 'false',
-+                'dob' => '3/12/1996',
-             ],
-             'subscription' => $subscription,
-         ];
-         $extractedData = [
-             'coolness' => false,
-             'disable_auto_group_change' => 'false',
-+            'dob' => '1996-03-12',
-         ];
- 
-         /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
-         $attributeMock = $this->getMockBuilder(
-             \Magento\Customer\Api\Data\AttributeMetadataInterface::class
-         )->disableOriginalConstructor()->getMock();
--        $attributeMock->expects($this->once())
-+        $attributeMock->expects($this->exactly(2))
-             ->method('getAttributeCode')
-             ->willReturn('coolness');
--        $attributeMock->expects($this->once())
-+        $attributeMock->expects($this->exactly(2))
-             ->method('getFrontendInput')
-             ->willReturn('int');
-         $attributes = [$attributeMock];
-@@ -904,12 +727,11 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-                 [null, null, $postValue],
-                 [CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
-             ]);
--        $this->requestMock->expects($this->exactly(2))
-+        $this->requestMock->expects($this->atLeastOnce())
-             ->method('getPost')
-             ->willReturnMap(
-                 [
-                     ['customer', null, $postValue['customer']],
--                    ['address', null, null],
-                 ]
-             );
- 
-@@ -917,12 +739,12 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-         $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $objectMock->expects($this->once())
-+        $objectMock->expects($this->exactly(2))
-             ->method('getData')
-             ->with('customer')
-             ->willReturn($postValue['customer']);
- 
--        $this->objectFactoryMock->expects($this->once())
-+        $this->objectFactoryMock->expects($this->exactly(2))
-             ->method('create')
-             ->with(['data' => $postValue])
-             ->willReturn($objectMock);
-@@ -930,19 +752,19 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-         $customerFormMock = $this->getMockBuilder(
-             \Magento\Customer\Model\Metadata\Form::class
-         )->disableOriginalConstructor()->getMock();
--        $customerFormMock->expects($this->once())
-+        $customerFormMock->expects($this->exactly(2))
-             ->method('extractData')
-             ->with($this->requestMock, 'customer')
-             ->willReturn($extractedData);
--        $customerFormMock->expects($this->once())
-+        $customerFormMock->expects($this->exactly(2))
-             ->method('compactData')
-             ->with($extractedData)
-             ->willReturn($extractedData);
--        $customerFormMock->expects($this->once())
-+        $customerFormMock->expects($this->exactly(2))
-             ->method('getAttributes')
-             ->willReturn($attributes);
- 
--        $this->formFactoryMock->expects($this->once())
-+        $this->formFactoryMock->expects($this->exactly(2))
-             ->method('create')
-             ->with(
-                 CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
-@@ -990,7 +812,10 @@ class SaveTest extends \PHPUnit\Framework\TestCase
- 
-         $this->sessionMock->expects($this->once())
-             ->method('setCustomerFormData')
--            ->with($postValue);
-+            ->with([
-+                'customer' => $extractedData,
-+                'subscription' => $subscription,
-+            ]);
- 
-         /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-         $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-@@ -1021,22 +846,24 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             'customer' => [
-                 'coolness' => false,
-                 'disable_auto_group_change' => 'false',
-+                'dob' => '3/12/1996',
-             ],
-             'subscription' => $subscription,
-         ];
-         $extractedData = [
-             'coolness' => false,
-             'disable_auto_group_change' => 'false',
-+            'dob' => '1996-03-12',
-         ];
- 
-         /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
-         $attributeMock = $this->getMockBuilder(
-             \Magento\Customer\Api\Data\AttributeMetadataInterface::class
-         )->disableOriginalConstructor()->getMock();
--        $attributeMock->expects($this->once())
-+        $attributeMock->expects($this->exactly(2))
-             ->method('getAttributeCode')
-             ->willReturn('coolness');
--        $attributeMock->expects($this->once())
-+        $attributeMock->expects($this->exactly(2))
-             ->method('getFrontendInput')
-             ->willReturn('int');
-         $attributes = [$attributeMock];
-@@ -1047,12 +874,11 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-                 [null, null, $postValue],
-                 [CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
-             ]);
--        $this->requestMock->expects($this->exactly(2))
-+        $this->requestMock->expects($this->atLeastOnce())
-             ->method('getPost')
-             ->willReturnMap(
-                 [
-                     ['customer', null, $postValue['customer']],
--                    ['address', null, null],
-                 ]
-             );
- 
-@@ -1060,12 +886,12 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-         $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $objectMock->expects($this->once())
-+        $objectMock->expects($this->exactly(2))
-             ->method('getData')
-             ->with('customer')
-             ->willReturn($postValue['customer']);
- 
--        $this->objectFactoryMock->expects($this->once())
-+        $this->objectFactoryMock->expects($this->exactly(2))
-             ->method('create')
-             ->with(['data' => $postValue])
-             ->willReturn($objectMock);
-@@ -1074,19 +900,19 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-         $customerFormMock = $this->getMockBuilder(
-             \Magento\Customer\Model\Metadata\Form::class
-         )->disableOriginalConstructor()->getMock();
--        $customerFormMock->expects($this->once())
-+        $customerFormMock->expects($this->exactly(2))
-             ->method('extractData')
-             ->with($this->requestMock, 'customer')
-             ->willReturn($extractedData);
--        $customerFormMock->expects($this->once())
-+        $customerFormMock->expects($this->exactly(2))
-             ->method('compactData')
-             ->with($extractedData)
-             ->willReturn($extractedData);
--        $customerFormMock->expects($this->once())
-+        $customerFormMock->expects($this->exactly(2))
-             ->method('getAttributes')
-             ->willReturn($attributes);
- 
--        $this->formFactoryMock->expects($this->once())
-+        $this->formFactoryMock->expects($this->exactly(2))
-             ->method('create')
-             ->with(
-                 CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
-@@ -1133,7 +959,10 @@ class SaveTest extends \PHPUnit\Framework\TestCase
- 
-         $this->sessionMock->expects($this->once())
-             ->method('setCustomerFormData')
--            ->with($postValue);
-+            ->with([
-+                'customer' => $extractedData,
-+                'subscription' => $subscription,
-+            ]);
- 
-         /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-         $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-@@ -1164,22 +993,24 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             'customer' => [
-                 'coolness' => false,
-                 'disable_auto_group_change' => 'false',
-+                'dob' => '3/12/1996',
-             ],
-             'subscription' => $subscription,
-         ];
-         $extractedData = [
-             'coolness' => false,
-             'disable_auto_group_change' => 'false',
-+            'dob' => '1996-03-12',
-         ];
- 
-         /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
-         $attributeMock = $this->getMockBuilder(
-             \Magento\Customer\Api\Data\AttributeMetadataInterface::class
-         )->disableOriginalConstructor()->getMock();
--        $attributeMock->expects($this->once())
-+        $attributeMock->expects($this->exactly(2))
-             ->method('getAttributeCode')
-             ->willReturn('coolness');
--        $attributeMock->expects($this->once())
-+        $attributeMock->expects($this->exactly(2))
-             ->method('getFrontendInput')
-             ->willReturn('int');
-         $attributes = [$attributeMock];
-@@ -1190,12 +1021,11 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-                 [null, null, $postValue],
-                 [CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
-             ]);
--        $this->requestMock->expects($this->exactly(2))
-+        $this->requestMock->expects($this->atLeastOnce())
-             ->method('getPost')
-             ->willReturnMap(
-                 [
-                     ['customer', null, $postValue['customer']],
--                    ['address', null, null],
-                 ]
-             );
- 
-@@ -1203,12 +1033,12 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-         $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $objectMock->expects($this->once())
-+        $objectMock->expects($this->exactly(2))
-             ->method('getData')
-             ->with('customer')
-             ->willReturn($postValue['customer']);
- 
--        $this->objectFactoryMock->expects($this->once())
-+        $this->objectFactoryMock->expects($this->exactly(2))
-             ->method('create')
-             ->with(['data' => $postValue])
-             ->willReturn($objectMock);
-@@ -1216,19 +1046,19 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-         $customerFormMock = $this->getMockBuilder(
-             \Magento\Customer\Model\Metadata\Form::class
-         )->disableOriginalConstructor()->getMock();
--        $customerFormMock->expects($this->once())
-+        $customerFormMock->expects($this->exactly(2))
-             ->method('extractData')
-             ->with($this->requestMock, 'customer')
-             ->willReturn($extractedData);
--        $customerFormMock->expects($this->once())
-+        $customerFormMock->expects($this->exactly(2))
-             ->method('compactData')
-             ->with($extractedData)
-             ->willReturn($extractedData);
--        $customerFormMock->expects($this->once())
-+        $customerFormMock->expects($this->exactly(2))
-             ->method('getAttributes')
-             ->willReturn($attributes);
- 
--        $this->formFactoryMock->expects($this->once())
-+        $this->formFactoryMock->expects($this->exactly(2))
-             ->method('create')
-             ->with(
-                 CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
-@@ -1277,7 +1107,10 @@ class SaveTest extends \PHPUnit\Framework\TestCase
- 
-         $this->sessionMock->expects($this->once())
-             ->method('setCustomerFormData')
--            ->with($postValue);
-+            ->with([
-+                'customer' => $extractedData,
-+                'subscription' => $subscription,
-+            ]);
- 
-         /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-         $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php
-index 7209ac9fd24..5adb9026016 100644
---- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php
-@@ -141,12 +141,6 @@ class ValidateTest extends \PHPUnit\Framework\TestCase
- 
-     public function testExecute()
-     {
--        $this->request->expects($this->once())
--            ->method('getPost')
--            ->willReturn([
--                '_template_' => null,
--                'address_index' => null
--            ]);
-         $customerEntityId = 2;
-         $this->request->expects($this->once())
-             ->method('getParam')
-@@ -162,11 +156,6 @@ class ValidateTest extends \PHPUnit\Framework\TestCase
-         $this->form->expects($this->once())->method('setInvisibleIgnored');
-         $this->form->expects($this->atLeastOnce())->method('extractData')->willReturn([]);
- 
--        $error = $this->createMock(\Magento\Framework\Message\Error::class);
--        $this->form->expects($this->once())
--            ->method('validateData')
--            ->willReturn([$error]);
--
-         $validationResult = $this->getMockForAbstractClass(
-             \Magento\Customer\Api\Data\ValidationResultsInterface::class,
-             [],
-@@ -188,9 +177,6 @@ class ValidateTest extends \PHPUnit\Framework\TestCase
- 
-     public function testExecuteWithoutAddresses()
-     {
--        $this->request->expects($this->once())
--            ->method('getPost')
--            ->willReturn(null);
-         $this->form->expects($this->once())
-             ->method('setInvisibleIgnored');
-         $this->form->expects($this->atLeastOnce())
-@@ -223,9 +209,6 @@ class ValidateTest extends \PHPUnit\Framework\TestCase
- 
-     public function testExecuteWithException()
-     {
--        $this->request->expects($this->once())
--            ->method('getPost')
--            ->willReturn(null);
-         $this->form->expects($this->once())
-             ->method('setInvisibleIgnored');
-         $this->form->expects($this->atLeastOnce())
-@@ -265,12 +248,6 @@ class ValidateTest extends \PHPUnit\Framework\TestCase
- 
-     public function testExecuteWithNewCustomerAndNoEntityId()
-     {
--        $this->request->expects($this->once())
--            ->method('getPost')
--            ->willReturn([
--                '_template_' => null,
--                'address_index' => null
--            ]);
-         $this->request->expects($this->once())
-             ->method('getParam')
-             ->with('customer')
-@@ -282,11 +259,6 @@ class ValidateTest extends \PHPUnit\Framework\TestCase
-         $this->form->expects($this->once())->method('setInvisibleIgnored');
-         $this->form->expects($this->atLeastOnce())->method('extractData')->willReturn([]);
- 
--        $error = $this->createMock(\Magento\Framework\Message\Error::class);
--        $this->form->expects($this->once())
--            ->method('validateData')
--            ->willReturn([$error]);
--
-         $validationResult = $this->getMockForAbstractClass(
-             \Magento\Customer\Api\Data\ValidationResultsInterface::class,
-             [],
-diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php
-index aaaa799a5e2..14ed09f7332 100644
---- a/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php
-@@ -3,13 +3,32 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
--/**
-- * Test customer ajax login controller
-- */
- namespace Magento\Customer\Test\Unit\Controller\Ajax;
- 
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Customer\Controller\Ajax\Login;
-+use Magento\Customer\Model\Account\Redirect;
-+use Magento\Customer\Model\AccountManagement;
-+use Magento\Customer\Model\Session;
-+use Magento\Framework\App\Action\Context;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\Request\Http;
-+use Magento\Framework\App\Response\RedirectInterface;
-+use Magento\Framework\App\ResponseInterface;
-+use Magento\Framework\Controller\Result\Json;
-+use Magento\Framework\Controller\Result\JsonFactory;
-+use Magento\Framework\Controller\Result\Raw;
-+use Magento\Framework\Controller\Result\RawFactory;
- use Magento\Framework\Exception\InvalidEmailOrPasswordException;
-+use Magento\Framework\Json\Helper\Data;
-+use Magento\Framework\ObjectManager\ObjectManager as FakeObjectManager;
-+use Magento\Framework\Stdlib\Cookie\CookieMetadata;
-+use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
-+use Magento\Framework\Stdlib\CookieManagerInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -17,223 +36,190 @@ use Magento\Framework\Exception\InvalidEmailOrPasswordException;
- class LoginTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\Customer\Controller\Ajax\Login
-+     * @var Login
-      */
--    protected $object;
-+    private $controller;
- 
-     /**
--     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Http|MockObject
-      */
--    protected $request;
-+    private $request;
- 
-     /**
--     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ResponseInterface|MockObject
-      */
--    protected $response;
-+    private $response;
- 
-     /**
--     * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Session|MockObject
-      */
--    protected $customerSession;
-+    private $customerSession;
- 
-     /**
--     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var FakeObjectManager|MockObject
-      */
--    protected $objectManager;
-+    private $objectManager;
- 
-     /**
--     * @var \Magento\Customer\Api\AccountManagementInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var AccountManagement|MockObject
-      */
--    protected $customerAccountManagementMock;
-+    private $accountManagement;
- 
-     /**
--     * @var \Magento\Framework\Json\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Data|MockObject
-      */
--    protected $jsonHelperMock;
-+    private $jsonHelper;
- 
-     /**
--     * @var \Magento\Framework\Controller\Result\Json|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Json|MockObject
-      */
--    protected $resultJson;
-+    private $resultJson;
- 
-     /**
--     * @var \Magento\Framework\Controller\Result\JsonFactory| \PHPUnit_Framework_MockObject_MockObject
-+     * @var JsonFactory|MockObject
-      */
--    protected $resultJsonFactory;
-+    private $resultJsonFactory;
- 
-     /**
--     * @var \Magento\Framework\Controller\Result\Raw| \PHPUnit_Framework_MockObject_MockObject
-+     * @var Raw|MockObject
-      */
--    protected $resultRaw;
-+    private $resultRaw;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var RedirectInterface|MockObject
-      */
--    protected $redirectMock;
-+    private $redirect;
- 
-     /**
--     * @var \Magento\Framework\Stdlib\CookieManagerInterface| \PHPUnit_Framework_MockObject_MockObject
-+     * @var CookieManagerInterface|MockObject
-      */
-     private $cookieManager;
- 
-     /**
--     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory| \PHPUnit_Framework_MockObject_MockObject
-+     * @var CookieMetadataFactory|MockObject
-      */
-     private $cookieMetadataFactory;
- 
-     /**
--     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadata| \PHPUnit_Framework_MockObject_MockObject
-+     * @inheritdoc
-      */
--    private $cookieMetadata;
--
--    protected function setUp()
-+    protected function setUp(): void
-     {
--        $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
--            ->disableOriginalConstructor()->getMock();
-+        $this->request = $this->getMockBuilder(Http::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-         $this->response = $this->createPartialMock(
--            \Magento\Framework\App\ResponseInterface::class,
-+            ResponseInterface::class,
-             ['setRedirect', 'sendResponse', 'representJson', 'setHttpResponseCode']
-         );
-         $this->customerSession = $this->createPartialMock(
--            \Magento\Customer\Model\Session::class,
-+            Session::class,
-             [
-                 'isLoggedIn',
-                 'getLastCustomerId',
-                 'getBeforeAuthUrl',
-                 'setBeforeAuthUrl',
-                 'setCustomerDataAsLoggedIn',
--                'regenerateId'
-+                'regenerateId',
-+                'getData'
-             ]
-         );
--        $this->objectManager = $this->createPartialMock(\Magento\Framework\ObjectManager\ObjectManager::class, ['get']);
--        $this->customerAccountManagementMock =
--            $this->createPartialMock(\Magento\Customer\Model\AccountManagement::class, ['authenticate']);
-+        $this->objectManager = $this->createPartialMock(FakeObjectManager::class, ['get']);
-+        $this->accountManagement = $this->createPartialMock(AccountManagement::class, ['authenticate']);
- 
--        $this->jsonHelperMock = $this->createPartialMock(\Magento\Framework\Json\Helper\Data::class, ['jsonDecode']);
-+        $this->jsonHelper = $this->createPartialMock(Data::class, ['jsonDecode']);
- 
--        $this->resultJson = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
-+        $this->resultJson = $this->getMockBuilder(Json::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->resultJsonFactory = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class)
-+        $this->resultJsonFactory = $this->getMockBuilder(JsonFactory::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['create'])
-             ->getMock();
- 
--        $this->cookieManager = $this->getMockBuilder(\Magento\Framework\Stdlib\CookieManagerInterface::class)
-+        $this->cookieManager = $this->getMockBuilder(CookieManagerInterface::class)
-             ->setMethods(['getCookie', 'deleteCookie'])
-             ->getMockForAbstractClass();
--        $this->cookieMetadataFactory = $this->getMockBuilder(
--            \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory::class
--        )->disableOriginalConstructor()->getMock();
--        $this->cookieMetadata = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\CookieMetadata::class)
-+        $this->cookieMetadataFactory = $this->getMockBuilder(CookieMetadataFactory::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->resultRaw = $this->getMockBuilder(\Magento\Framework\Controller\Result\Raw::class)
-+        $this->resultRaw = $this->getMockBuilder(Raw::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $resultRawFactory = $this->getMockBuilder(\Magento\Framework\Controller\Result\RawFactory::class)
-+        $resultRawFactory = $this->getMockBuilder(RawFactory::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['create'])
-             ->getMock();
--        $resultRawFactory->expects($this->atLeastOnce())
--            ->method('create')
-+        $resultRawFactory->method('create')
-             ->willReturn($this->resultRaw);
- 
--        $contextMock = $this->createMock(\Magento\Framework\App\Action\Context::class);
--        $this->redirectMock = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
--        $contextMock->expects($this->atLeastOnce())->method('getRedirect')->willReturn($this->redirectMock);
--        $contextMock->expects($this->atLeastOnce())->method('getRequest')->willReturn($this->request);
--
--        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--        $this->object = $objectManager->getObject(
--            \Magento\Customer\Controller\Ajax\Login::class,
-+        /** @var Context|MockObject $context */
-+        $context = $this->createMock(Context::class);
-+        $this->redirect = $this->createMock(RedirectInterface::class);
-+        $context->method('getRedirect')
-+            ->willReturn($this->redirect);
-+        $context->method('getRequest')
-+            ->willReturn($this->request);
-+
-+        $objectManager = new ObjectManager($this);
-+        $this->controller = $objectManager->getObject(
-+            Login::class,
-             [
--                'context' => $contextMock,
-+                'context' => $context,
-                 'customerSession' => $this->customerSession,
--                'helper' => $this->jsonHelperMock,
-+                'helper' => $this->jsonHelper,
-                 'response' => $this->response,
-                 'resultRawFactory' => $resultRawFactory,
-                 'resultJsonFactory' => $this->resultJsonFactory,
-                 'objectManager' => $this->objectManager,
--                'customerAccountManagement' => $this->customerAccountManagementMock,
-+                'customerAccountManagement' => $this->accountManagement,
-                 'cookieManager' => $this->cookieManager,
-                 'cookieMetadataFactory' => $this->cookieMetadataFactory
-             ]
-         );
-     }
- 
--    public function testLogin()
-+    /**
-+     * Checks successful login.
-+     */
-+    public function testLogin(): void
-     {
-         $jsonRequest = '{"username":"customer@example.com", "password":"password"}';
-         $loginSuccessResponse = '{"errors": false, "message":"Login successful."}';
-+        $this->withRequest($jsonRequest);
- 
--        $this->request
--            ->expects($this->any())
--            ->method('getContent')
--            ->willReturn($jsonRequest);
--
--        $this->request
--            ->expects($this->any())
--            ->method('getMethod')
--            ->willReturn('POST');
--
--        $this->request
--            ->expects($this->any())
--            ->method('isXmlHttpRequest')
--            ->willReturn(true);
--
--        $this->resultJsonFactory->expects($this->atLeastOnce())
--            ->method('create')
-+        $this->resultJsonFactory->method('create')
-             ->willReturn($this->resultJson);
- 
--        $this->jsonHelperMock
--            ->expects($this->any())
--            ->method('jsonDecode')
-+        $this->jsonHelper->method('jsonDecode')
-             ->with($jsonRequest)
-             ->willReturn(['username' => 'customer@example.com', 'password' => 'password']);
- 
--        $customerMock = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
--        $this->customerAccountManagementMock
--            ->expects($this->any())
--            ->method('authenticate')
-+        /** @var CustomerInterface|MockObject $customer */
-+        $customer = $this->getMockForAbstractClass(CustomerInterface::class);
-+        $this->accountManagement->method('authenticate')
-             ->with('customer@example.com', 'password')
--            ->willReturn($customerMock);
-+            ->willReturn($customer);
- 
--        $this->customerSession->expects($this->once())
--            ->method('setCustomerDataAsLoggedIn')
--            ->with($customerMock);
-+        $this->customerSession->method('setCustomerDataAsLoggedIn')
-+            ->with($customer);
-+        $this->customerSession->method('regenerateId');
- 
--        $this->customerSession->expects($this->once())->method('regenerateId');
-+        /** @var Redirect|MockObject $redirect */
-+        $redirect = $this->createMock(Redirect::class);
-+        $this->controller->setAccountRedirect($redirect);
-+        $redirect->method('getRedirectCookie')
-+            ->willReturn('some_url1');
- 
--        $redirectMock = $this->createMock(\Magento\Customer\Model\Account\Redirect::class);
--        $this->object->setAccountRedirect($redirectMock);
--        $redirectMock->expects($this->once())->method('getRedirectCookie')->willReturn('some_url1');
-+        $this->withCookieManager();
- 
--        $this->cookieManager->expects($this->once())
--            ->method('getCookie')
--            ->with('mage-cache-sessid')
--            ->willReturn(true);
--        $this->cookieMetadataFactory->expects($this->once())
--            ->method('createCookieMetadata')
--            ->willReturn($this->cookieMetadata);
--        $this->cookieMetadata->expects($this->once())
--            ->method('setPath')
--            ->with('/')
--            ->willReturnSelf();
--        $this->cookieManager->expects($this->once())
--            ->method('deleteCookie')
--            ->with('mage-cache-sessid', $this->cookieMetadata)
--            ->willReturnSelf();
-+        $this->withScopeConfig();
- 
--        $scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
--        $this->object->setScopeConfig($scopeConfigMock);
--        $scopeConfigMock->expects($this->once())->method('getValue')
--            ->with('customer/startup/redirect_dashboard')
--            ->willReturn(0);
--
--        $this->redirectMock->expects($this->once())->method('success')->willReturn('some_url2');
--        $this->resultRaw->expects($this->never())->method('setHttpResponseCode');
-+        $this->redirect->method('success')
-+            ->willReturn('some_url2');
-+        $this->resultRaw->expects(self::never())
-+            ->method('setHttpResponseCode');
- 
-         $result = [
-             'errors' => false,
-@@ -241,67 +227,99 @@ class LoginTest extends \PHPUnit\Framework\TestCase
-             'redirectUrl' => 'some_url2',
-         ];
- 
--        $this->resultJson
--            ->expects($this->once())
--            ->method('setData')
-+        $this->resultJson->method('setData')
-             ->with($result)
-             ->willReturn($loginSuccessResponse);
--        $this->assertEquals($loginSuccessResponse, $this->object->execute());
-+        self::assertEquals($loginSuccessResponse, $this->controller->execute());
-     }
- 
--    public function testLoginFailure()
-+    /**
-+     * Checks unsuccessful login.
-+     */
-+    public function testLoginFailure(): void
-     {
-         $jsonRequest = '{"username":"invalid@example.com", "password":"invalid"}';
-         $loginFailureResponse = '{"message":"Invalid login or password."}';
-+        $this->withRequest($jsonRequest);
- 
--        $this->request
--            ->expects($this->any())
--            ->method('getContent')
--            ->willReturn($jsonRequest);
--
--        $this->request
--            ->expects($this->any())
--            ->method('getMethod')
--            ->willReturn('POST');
--
--        $this->request
--            ->expects($this->any())
--            ->method('isXmlHttpRequest')
--            ->willReturn(true);
--
--        $this->resultJsonFactory->expects($this->once())
--            ->method('create')
-+        $this->resultJsonFactory->method('create')
-             ->willReturn($this->resultJson);
- 
--        $this->jsonHelperMock
--            ->expects($this->any())
--            ->method('jsonDecode')
-+        $this->jsonHelper->method('jsonDecode')
-             ->with($jsonRequest)
-             ->willReturn(['username' => 'invalid@example.com', 'password' => 'invalid']);
- 
--        $customerMock = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
--        $this->customerAccountManagementMock
--            ->expects($this->any())
--            ->method('authenticate')
-+        /** @var CustomerInterface|MockObject $customer */
-+        $customer = $this->getMockForAbstractClass(CustomerInterface::class);
-+        $this->accountManagement->method('authenticate')
-             ->with('invalid@example.com', 'invalid')
-             ->willThrowException(new InvalidEmailOrPasswordException(__('Invalid login or password.')));
- 
--        $this->customerSession->expects($this->never())
-+        $this->customerSession->expects(self::never())
-             ->method('setCustomerDataAsLoggedIn')
--            ->with($customerMock);
--
--        $this->customerSession->expects($this->never())->method('regenerateId');
-+            ->with($customer);
-+        $this->customerSession->expects(self::never())
-+            ->method('regenerateId');
- 
-         $result = [
-             'errors' => true,
-             'message' => __('Invalid login or password.')
-         ];
--        $this->resultJson
--            ->expects($this->once())
--            ->method('setData')
-+        $this->resultJson->method('setData')
-             ->with($result)
-             ->willReturn($loginFailureResponse);
- 
--        $this->assertEquals($loginFailureResponse, $this->object->execute());
-+        self::assertEquals($loginFailureResponse, $this->controller->execute());
-+    }
-+
-+    /**
-+     * Emulates request behavior.
-+     *
-+     * @param string $jsonRequest
-+     */
-+    private function withRequest(string $jsonRequest): void
-+    {
-+        $this->request->method('getContent')
-+            ->willReturn($jsonRequest);
-+
-+        $this->request->method('getMethod')
-+            ->willReturn('POST');
-+
-+        $this->request->method('isXmlHttpRequest')
-+            ->willReturn(true);
-+    }
-+
-+    /**
-+     * Emulates cookie manager behavior.
-+     */
-+    private function withCookieManager(): void
-+    {
-+        $this->cookieManager->method('getCookie')
-+            ->with('mage-cache-sessid')
-+            ->willReturn(true);
-+        $cookieMetadata = $this->getMockBuilder(CookieMetadata::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->cookieMetadataFactory->method('createCookieMetadata')
-+            ->willReturn($cookieMetadata);
-+        $cookieMetadata->method('setPath')
-+            ->with('/')
-+            ->willReturnSelf();
-+        $this->cookieManager->method('deleteCookie')
-+            ->with('mage-cache-sessid', $cookieMetadata)
-+            ->willReturnSelf();
-+    }
-+
-+    /**
-+     * Emulates config behavior.
-+     */
-+    private function withScopeConfig(): void
-+    {
-+        /** @var ScopeConfigInterface|MockObject $scopeConfig */
-+        $scopeConfig = $this->createMock(ScopeConfigInterface::class);
-+        $this->controller->setScopeConfig($scopeConfig);
-+        $scopeConfig->method('getValue')
-+            ->with('customer/startup/redirect_dashboard')
-+            ->willReturn(0);
-     }
- }
-diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php
-index f4bf184f9eb..5a7cf42be2c 100644
---- a/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php
-@@ -83,13 +83,13 @@ class LoadTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @param $sectionNames
--     * @param $updateSectionID
--     * @param $sectionNamesAsArray
--     * @param $updateIds
-+     * @param string $sectionNames
-+     * @param bool $forceNewSectionTimestamp
-+     * @param string[] $sectionNamesAsArray
-+     * @param bool $forceNewTimestamp
-      * @dataProvider executeDataProvider
-      */
--    public function testExecute($sectionNames, $updateSectionID, $sectionNamesAsArray, $updateIds)
-+    public function testExecute($sectionNames, $forceNewSectionTimestamp, $sectionNamesAsArray, $forceNewTimestamp)
-     {
-         $this->resultJsonFactoryMock->expects($this->once())
-             ->method('create')
-@@ -103,12 +103,12 @@ class LoadTest extends \PHPUnit\Framework\TestCase
- 
-         $this->httpRequestMock->expects($this->exactly(2))
-             ->method('getParam')
--            ->withConsecutive(['sections'], ['update_section_id'])
--            ->willReturnOnConsecutiveCalls($sectionNames, $updateSectionID);
-+            ->withConsecutive(['sections'], ['force_new_section_timestamp'])
-+            ->willReturnOnConsecutiveCalls($sectionNames, $forceNewSectionTimestamp);
- 
-         $this->sectionPoolMock->expects($this->once())
-             ->method('getSectionsData')
--            ->with($sectionNamesAsArray, $updateIds)
-+            ->with($sectionNamesAsArray, $forceNewTimestamp)
-             ->willReturn([
-                 'message' => 'some message',
-                 'someKey' => 'someValue'
-@@ -133,15 +133,15 @@ class LoadTest extends \PHPUnit\Framework\TestCase
-         return [
-             [
-                 'sectionNames' => 'sectionName1,sectionName2,sectionName3',
--                'updateSectionID' => 'updateSectionID',
-+                'forceNewSectionTimestamp' => 'forceNewSectionTimestamp',
-                 'sectionNamesAsArray' => ['sectionName1', 'sectionName2', 'sectionName3'],
--                'updateIds' => true
-+                'forceNewTimestamp' => true
-             ],
-             [
-                 'sectionNames' => null,
--                'updateSectionID' => null,
-+                'forceNewSectionTimestamp' => null,
-                 'sectionNamesAsArray' => null,
--                'updateIds' => false
-+                'forceNewTimestamp' => false
-             ],
-         ];
-     }
-diff --git a/app/code/Magento/Customer/Test/Unit/CustomerData/SectionPoolTest.php b/app/code/Magento/Customer/Test/Unit/CustomerData/SectionPoolTest.php
-index 98fee70e335..2b67df1aee2 100644
---- a/app/code/Magento/Customer/Test/Unit/CustomerData/SectionPoolTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/CustomerData/SectionPoolTest.php
-@@ -63,7 +63,7 @@ class SectionPoolTest extends \PHPUnit\Framework\TestCase
- 
-         $this->identifierMock->expects($this->once())
-             ->method('markSections')
--            //check also default value for $updateIds = false
-+            //check also default value for $forceTimestamp = false
-             ->with($allSectionsData, $sectionNames, false)
-             ->willReturn($identifierResult);
-         $modelResult = $this->model->getSectionsData($sectionNames);
-diff --git a/app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php b/app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php
-index 74af4ec57c7..0818d94afe5 100644
---- a/app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php
-@@ -212,7 +212,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase
-     public function testIsVatValidationEnabled($store, $result)
-     {
-         $this->scopeConfig->expects($this->once())
--            ->method('getValue')
-+            ->method('isSetFlag')
-             ->with(
-                 \Magento\Customer\Helper\Address::XML_PATH_VAT_VALIDATION_ENABLED,
-                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-@@ -242,7 +242,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase
-     public function testHasValidateOnEachTransaction($store, $result)
-     {
-         $this->scopeConfig->expects($this->once())
--            ->method('getValue')
-+            ->method('isSetFlag')
-             ->with(
-                 \Magento\Customer\Helper\Address::XML_PATH_VIV_ON_EACH_TRANSACTION,
-                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-@@ -297,7 +297,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase
-     public function testIsDisableAutoGroupAssignDefaultValue()
-     {
-         $this->scopeConfig->expects($this->once())
--            ->method('getValue')
-+            ->method('isSetFlag')
-             ->with(
-                 \Magento\Customer\Helper\Address::XML_PATH_VIV_DISABLE_AUTO_ASSIGN_DEFAULT,
-                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-@@ -309,7 +309,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase
-     public function testIsVatAttributeVisible()
-     {
-         $this->scopeConfig->expects($this->once())
--            ->method('getValue')
-+            ->method('isSetFlag')
-             ->with(
-                 \Magento\Customer\Helper\Address::XML_PATH_VAT_FRONTEND_VISIBILITY,
-                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-@@ -414,4 +414,17 @@ class AddressTest extends \PHPUnit\Framework\TestCase
-             ['invalid_code', false]
-         ];
-     }
-+
-+    /**
-+     * Data provider for test  testIsAttributeRequire
-+     *
-+     * @return array
-+     */
-+    public function isAttributeRequiredDataProvider()
-+    {
-+        return [
-+            ['fax', true],
-+            ['invalid_code', false]
-+        ];
-+    }
- }
-diff --git a/app/code/Magento/Customer/Test/Unit/Helper/Session/CurrentCustomerTest.php b/app/code/Magento/Customer/Test/Unit/Helper/Session/CurrentCustomerTest.php
-index 364c3700cab..03158d05db8 100644
---- a/app/code/Magento/Customer/Test/Unit/Helper/Session/CurrentCustomerTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Helper/Session/CurrentCustomerTest.php
-@@ -6,6 +6,9 @@
- 
- namespace Magento\Customer\Test\Unit\Helper\Session;
- 
-+/**
-+ * Current customer test.
-+ */
- class CurrentCustomerTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -44,7 +47,7 @@ class CurrentCustomerTest extends \PHPUnit\Framework\TestCase
-     protected $requestMock;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $moduleManagerMock;
- 
-@@ -77,7 +80,7 @@ class CurrentCustomerTest extends \PHPUnit\Framework\TestCase
-         $this->customerDataMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-         $this->customerRepositoryMock = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-         $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
--        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\Manager::class);
-+        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\ModuleManagerInterface::class);
-         $this->viewMock = $this->createMock(\Magento\Framework\App\View::class);
- 
-         $this->currentCustomer = new \Magento\Customer\Helper\Session\CurrentCustomer(
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountConfirmationTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountConfirmationTest.php
-index ae246665b28..1ce80d9d1e9 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/AccountConfirmationTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountConfirmationTest.php
-@@ -59,7 +59,7 @@ class AccountConfirmationTest extends \PHPUnit\Framework\TestCase
-         $websiteId = 1;
- 
-         $this->scopeConfig->expects($this->any())
--            ->method('getValue')
-+            ->method('isSetFlag')
-             ->with(
-                 $this->accountConfirmation::XML_PATH_IS_CONFIRM,
-                 ScopeInterface::SCOPE_WEBSITES,
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
-index 86e7683545f..5eda0c52c1d 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
-@@ -6,10 +6,14 @@
- 
- namespace Magento\Customer\Test\Unit\Model;
- 
--use Magento\Customer\Model\AccountManagement;
-+use Magento\Customer\Api\Data\CustomerInterface;
- use Magento\Customer\Model\AccountConfirmation;
-+use Magento\Customer\Model\AccountManagement;
- use Magento\Customer\Model\AuthenticationInterface;
-+use Magento\Customer\Model\Data\Customer;
- use Magento\Customer\Model\EmailNotificationInterface;
-+use Magento\Directory\Model\AllowedCountries;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
- use Magento\Framework\App\Area;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Intl\DateTimeFactory;
-@@ -142,6 +146,21 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-      */
-     private $saveHandler;
- 
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Customer\Model\AddressRegistry
-+     */
-+    private $addressRegistryMock;
-+
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject|SearchCriteriaBuilder
-+     */
-+    private $searchCriteriaBuilderMock;
-+
-+    /**
-+     * @var AllowedCountries|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $allowedCountriesReader;
-+
-     /**
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-@@ -176,9 +195,11 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $this->dateTime = $this->createMock(\Magento\Framework\Stdlib\DateTime::class);
-         $this->customer = $this->createMock(\Magento\Customer\Model\Customer::class);
-         $this->objectFactory = $this->createMock(\Magento\Framework\DataObjectFactory::class);
-+        $this->addressRegistryMock = $this->createMock(\Magento\Customer\Model\AddressRegistry::class);
-         $this->extensibleDataObjectConverter = $this->createMock(
-             \Magento\Framework\Api\ExtensibleDataObjectConverter::class
-         );
-+        $this->allowedCountriesReader = $this->createMock(AllowedCountries::class);
-         $this->authenticationMock = $this->getMockBuilder(AuthenticationInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-@@ -193,6 +214,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
- 
-         $this->dateTimeFactory = $this->createMock(DateTimeFactory::class);
-         $this->accountConfirmation = $this->createMock(AccountConfirmation::class);
-+        $this->searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
- 
-         $this->visitorCollectionFactory = $this->getMockBuilder(
-             \Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory::class
-@@ -239,6 +261,9 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-                 'sessionManager' => $this->sessionManager,
-                 'saveHandler' => $this->saveHandler,
-                 'visitorCollectionFactory' => $this->visitorCollectionFactory,
-+                'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
-+                'addressRegistry' => $this->addressRegistryMock,
-+                'allowedCountriesReader' => $this->allowedCountriesReader,
-             ]
-         );
-         $this->objectManagerHelper->setBackwardCompatibleProperty(
-@@ -268,7 +293,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $website->expects($this->once())
-             ->method('getStoreIds')
-             ->willReturn([1, 2, 3]);
--        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
-+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
-         $customer->expects($this->once())
-             ->method('getId')
-             ->willReturn($customerId);
-@@ -324,7 +349,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $website->expects($this->once())
-             ->method('getDefaultStore')
-             ->willReturn($store);
--        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
-+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
-         $customer->expects($this->atLeastOnce())
-             ->method('getId')
-             ->willReturn($customerId);
-@@ -400,7 +425,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $website->expects($this->once())
-             ->method('getDefaultStore')
-             ->willReturn($store);
--        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
-+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
-         $customer->expects($this->atLeastOnce())
-             ->method('getId')
-             ->willReturn($customerId);
-@@ -479,7 +504,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $website->expects($this->once())
-             ->method('getDefaultStore')
-             ->willReturn($store);
--        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
-+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
-         $customer->expects($this->atLeastOnce())
-             ->method('getId')
-             ->willReturn($customerId);
-@@ -534,7 +559,14 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-             ->expects($this->once())
-             ->method('delete')
-             ->with($customer);
--
-+        $this->allowedCountriesReader
-+            ->expects($this->atLeastOnce())
-+            ->method('getAllowedCountries')
-+            ->willReturn(['US' => 'US']);
-+        $address
-+            ->expects($this->atLeastOnce())
-+            ->method('getCountryId')
-+            ->willReturn('US');
-         $this->accountManagement->createAccountWithPasswordHash($customer, $hash);
-     }
- 
-@@ -548,8 +580,9 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $websiteId = 1;
-         $hash = '4nj54lkj5jfi03j49f8bgujfgsd';
- 
--        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
--            ->getMockForAbstractClass();
-+        $customerMock = $this->getMockBuilder(Customer::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
- 
-         $customerMock->expects($this->atLeastOnce())
-             ->method('getId')
-@@ -640,7 +673,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $website->expects($this->once())
-             ->method('getDefaultStore')
-             ->willReturn($store);
--        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
-+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
-         $customer->expects($this->atLeastOnce())
-             ->method('getId')
-             ->willReturn($customerId);
-@@ -707,6 +740,14 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $this->emailNotificationMock->expects($this->once())
-             ->method('newAccount')
-             ->willReturnSelf();
-+        $this->allowedCountriesReader
-+            ->expects($this->atLeastOnce())
-+            ->method('getAllowedCountries')
-+            ->willReturn(['US' => 'US']);
-+        $address
-+            ->expects($this->atLeastOnce())
-+            ->method('getCountryId')
-+            ->willReturn('US');
- 
-         $this->accountManagement->createAccount($customer);
-     }
-@@ -785,7 +826,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-                 $minCharacterSetsNum . '. Classes of characters: Lower Case, Upper Case, Digits, Special Characters.');
-         }
- 
--        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
-+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
-         $this->accountManagement->createAccount($customer, $password);
-     }
- 
-@@ -806,7 +847,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $this->expectException(\Magento\Framework\Exception\InputException::class);
-         $this->expectExceptionMessage('Please enter a password with at most 256 characters.');
- 
--        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
-+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
-         $this->accountManagement->createAccount($customer, $password);
-     }
- 
-@@ -885,7 +926,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $website->expects($this->once())
-             ->method('getDefaultStore')
-             ->willReturn($store);
--        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
-+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
-         $customer->expects($this->atLeastOnce())
-             ->method('getId')
-             ->willReturn($customerId);
-@@ -952,6 +993,14 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $this->emailNotificationMock->expects($this->once())
-             ->method('newAccount')
-             ->willReturnSelf();
-+        $this->allowedCountriesReader
-+            ->expects($this->atLeastOnce())
-+            ->method('getAllowedCountries')
-+            ->willReturn(['US' => 'US']);
-+        $address
-+            ->expects($this->atLeastOnce())
-+            ->method('getCountryId')
-+            ->willReturn('US');
- 
-         $this->accountManagement->createAccount($customer, $password);
-     }
-@@ -969,7 +1018,8 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $templateIdentifier = 'Template Identifier';
-         $sender = 'Sender';
- 
--        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-+        $customer = $this->getMockBuilder(Customer::class)
-+            ->disableOriginalConstructor()
-             ->getMock();
-         $customer->expects($this->any())
-             ->method('getStoreId')
-@@ -1001,7 +1051,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
- 
-         $this->dataObjectProcessor->expects($this->once())
-             ->method('buildOutputDataArray')
--            ->with($customer, \Magento\Customer\Api\Data\CustomerInterface::class)
-+            ->with($customer, CustomerInterface::class)
-             ->willReturn($customerData);
- 
-         $this->customerViewHelper->expects($this->any())
-@@ -1071,9 +1121,8 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-     protected function prepareInitiatePasswordReset($email, $templateIdentifier, $sender, $storeId, $customerId, $hash)
-     {
-         $websiteId = 1;
--
-+        $addressId = 5;
-         $datetime = $this->prepareDateTimeFactory();
--
-         $customerData = ['key' => 'value'];
-         $customerName = 'Customer Name';
- 
-@@ -1083,12 +1132,23 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $this->store->expects($this->any())
-             ->method('getId')
-             ->willReturn($storeId);
--
-         $this->storeManager->expects($this->any())
-             ->method('getStore')
-             ->willReturn($this->store);
- 
--        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-+        /** @var \Magento\Customer\Model\Address|\PHPUnit_Framework_MockObject_MockObject $addressModel */
-+        $addressModel = $this->getMockBuilder(\Magento\Customer\Model\Address::class)->disableOriginalConstructor()
-+            ->setMethods(['setShouldIgnoreValidation'])->getMock();
-+
-+        /** @var \Magento\Customer\Api\Data\AddressInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
-+        $address = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
-+        $address->expects($this->once())
-+            ->method('getId')
-+            ->willReturn($addressId);
-+
-+        /** @var Customer|\PHPUnit_Framework_MockObject_MockObject $customer */
-+        $customer = $this->getMockBuilder(Customer::class)
-+            ->disableOriginalConstructor()
-             ->getMock();
-         $customer->expects($this->any())
-             ->method('getEmail')
-@@ -1099,7 +1159,19 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $customer->expects($this->any())
-             ->method('getStoreId')
-             ->willReturn($storeId);
--
-+        $customer->expects($this->any())
-+            ->method('getAddresses')
-+            ->willReturn([$address]);
-+        $this->customerRepository->expects($this->once())
-+            ->method('get')
-+            ->willReturn($customer);
-+        $this->addressRegistryMock->expects($this->once())
-+            ->method('retrieve')
-+            ->with($addressId)
-+            ->willReturn($addressModel);
-+        $addressModel->expects($this->once())
-+            ->method('setShouldIgnoreValidation')
-+            ->with(true);
-         $this->customerRepository->expects($this->once())
-             ->method('get')
-             ->with($email, $websiteId)
-@@ -1108,16 +1180,13 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-             ->method('save')
-             ->with($customer)
-             ->willReturnSelf();
--
-         $this->random->expects($this->once())
-             ->method('getUniqueHash')
-             ->willReturn($hash);
--
-         $this->customerViewHelper->expects($this->any())
-             ->method('getCustomerName')
-             ->with($customer)
-             ->willReturn($customerName);
--
-         $this->customerSecure->expects($this->any())
-             ->method('setRpToken')
-             ->with($hash)
-@@ -1134,15 +1203,13 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-             ->method('setData')
-             ->with('name', $customerName)
-             ->willReturnSelf();
--
-         $this->customerRegistry->expects($this->any())
-             ->method('retrieveSecureData')
-             ->with($customerId)
-             ->willReturn($this->customerSecure);
--
-         $this->dataObjectProcessor->expects($this->any())
-             ->method('buildOutputDataArray')
--            ->with($customer, \Magento\Customer\Api\Data\CustomerInterface::class)
-+            ->with($customer, Customer::class)
-             ->willReturn($customerData);
- 
-         $this->prepareEmailSend($email, $templateIdentifier, $sender, $storeId, $customerName);
-@@ -1202,8 +1269,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
- 
-         $storeId = 1;
- 
--        mt_srand(mt_rand() + (100000000 * (float)microtime()) % PHP_INT_MAX);
--        $hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
-+        $hash = hash('sha256', microtime() . random_int(PHP_INT_MIN, PHP_INT_MAX));
- 
-         $this->emailNotificationMock->expects($this->once())
-             ->method('passwordReminder')
-@@ -1227,8 +1293,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $templateIdentifier = 'Template Identifier';
-         $sender = 'Sender';
- 
--        mt_srand(mt_rand() + (100000000 * (float)microtime()) % PHP_INT_MAX);
--        $hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
-+        $hash = hash('sha256', microtime() . random_int(PHP_INT_MIN, PHP_INT_MAX));
- 
-         $this->emailNotificationMock->expects($this->once())
-             ->method('passwordResetConfirmation')
-@@ -1252,8 +1317,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $templateIdentifier = 'Template Identifier';
-         $sender = 'Sender';
- 
--        mt_srand(mt_rand() + (100000000 * (float)microtime()) % PHP_INT_MAX);
--        $hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
-+        $hash = hash('sha256', microtime() . random_int(PHP_INT_MIN, PHP_INT_MAX));
- 
-         $this->prepareInitiatePasswordReset($email, $templateIdentifier, $sender, $storeId, $customerId, $hash);
- 
-@@ -1266,11 +1330,11 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Magento\Framework\Exception\InputException
--     * @expectedExceptionMessage Invalid value of "" provided for the customerId field
-+     * @expectedExceptionMessage Invalid value of "0" provided for the customerId field
-      */
-     public function testValidateResetPasswordTokenBadCustomerId()
-     {
--        $this->accountManagement->validateResetPasswordLinkToken(null, '');
-+        $this->accountManagement->validateResetPasswordLinkToken(0, '');
-     }
- 
-     /**
-@@ -1361,7 +1425,6 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $this->prepareDateTimeFactory();
-         $this->sessionManager = $this->getMockBuilder(\Magento\Framework\Session\SessionManagerInterface::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['destroy', 'start', 'writeClose'])
-             ->getMockForAbstractClass();
-         $this->visitorCollectionFactory = $this->getMockBuilder(
-             \Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory::class
-@@ -1414,6 +1477,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-                 'encryptor' => $this->encryptor,
-                 'dataProcessor' => $this->dataObjectProcessor,
-                 'storeManager' => $this->storeManager,
-+                'addressRegistry' => $this->addressRegistryMock,
-                 'transportBuilder' => $this->transportBuilder,
-             ]
-         );
-@@ -1436,11 +1500,15 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $passwordHash = '1a2b3f4c';
- 
-         $this->reInitModel();
--        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-+        $customer = $this->getMockBuilder(CustomerInterface::class)
-+            ->disableOriginalConstructor()
-             ->getMock();
-         $customer->expects($this->any())
-             ->method('getId')
-             ->willReturn($customerId);
-+        $customer->expects($this->once())
-+            ->method('getAddresses')
-+            ->willReturn([]);
- 
-         $this->customerRepository
-             ->expects($this->once())
-@@ -1494,8 +1562,6 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-             ->method('save')
-             ->with($customer);
- 
--        $this->sessionManager->expects($this->atLeastOnce())->method('start');
--        $this->sessionManager->expects($this->atLeastOnce())->method('writeClose');
-         $this->sessionManager->expects($this->atLeastOnce())->method('getSessionId');
- 
-         $visitor = $this->getMockBuilder(\Magento\Customer\Model\Visitor::class)
-@@ -1528,12 +1594,34 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-     {
-         $customerEmail = 'customer@example.com';
-         $customerId = '1';
-+        $addressId = 5;
-         $resetToken = 'newStringToken';
-         $newPassword = 'new_password';
- 
-         $this->reInitModel();
--        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
-+        /** @var \Magento\Customer\Model\Address|\PHPUnit_Framework_MockObject_MockObject $addressModel */
-+        $addressModel = $this->getMockBuilder(\Magento\Customer\Model\Address::class)->disableOriginalConstructor()
-+            ->setMethods(['setShouldIgnoreValidation'])->getMock();
-+
-+        /** @var \Magento\Customer\Api\Data\AddressInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
-+        $address = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
-+        $address->expects($this->any())
-+            ->method('getId')
-+            ->willReturn($addressId);
-+
-+        /** @var Customer|\PHPUnit_Framework_MockObject_MockObject $customer */
-+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
-         $customer->expects($this->any())->method('getId')->willReturn($customerId);
-+        $customer->expects($this->any())
-+            ->method('getAddresses')
-+            ->willReturn([$address]);
-+        $this->addressRegistryMock->expects($this->once())
-+            ->method('retrieve')
-+            ->with($addressId)
-+            ->willReturn($addressModel);
-+        $addressModel->expects($this->once())
-+            ->method('setShouldIgnoreValidation')
-+            ->with(true);
-         $this->customerRepository->expects($this->atLeastOnce())->method('get')->with($customerEmail)
-             ->willReturn($customer);
-         $this->customer->expects($this->atLeastOnce())->method('getResetPasswordLinkExpirationPeriod')
-@@ -1550,9 +1638,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $this->customerSecure->expects($this->once())->method('setRpTokenCreatedAt')->with(null);
-         $this->customerSecure->expects($this->any())->method('setPasswordHash')->willReturn(null);
- 
--        $this->sessionManager->expects($this->atLeastOnce())->method('destroy');
--        $this->sessionManager->expects($this->atLeastOnce())->method('start');
--        $this->sessionManager->expects($this->atLeastOnce())->method('writeClose');
-+        $this->sessionManager->method('isSessionExists')->willReturn(false);
-         $this->sessionManager->expects($this->atLeastOnce())->method('getSessionId');
-         $visitor = $this->getMockBuilder(\Magento\Customer\Model\Visitor::class)
-             ->disableOriginalConstructor()
-@@ -1609,7 +1695,8 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $password = '1234567';
-         $passwordHash = '1a2b3f4c';
- 
--        $customerData = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-+        $customerData = $this->getMockBuilder(Customer::class)
-+            ->disableOriginalConstructor()
-             ->getMock();
- 
-         $customerModel = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
-@@ -1674,7 +1761,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $customerId = 1;
-         $customerEmail = 'test1@example.com';
- 
--        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-+        $customerMock = $this->getMockBuilder(Customer::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-         $customerMock->expects($this->once())
-@@ -1744,8 +1831,9 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-             ->method('getStore')
-             ->willReturn($storeMock);
- 
--        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
--            ->getMockForAbstractClass();
-+        $customerMock = $this->getMockBuilder(Customer::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-         $customerMock->expects($this->exactly(2))
-             ->method('getId')
-             ->willReturn(null);
-@@ -1828,7 +1916,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-             ->method("setId")
-             ->with(null);
-         //Handle Customer calls
--        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
-+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
-         $customer
-             ->expects($this->atLeastOnce())
-             ->method('getWebsiteId')
-@@ -1894,6 +1982,14 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-             ->method('getWebsite')
-             ->with($websiteId)
-             ->willReturn($website);
-+        $this->allowedCountriesReader
-+            ->expects($this->atLeastOnce())
-+            ->method('getAllowedCountries')
-+            ->willReturn(['US' => 'US']);
-+        $existingAddress
-+            ->expects($this->atLeastOnce())
-+            ->method('getCountryId')
-+            ->willReturn('US');
- 
-         $this->assertSame($customer, $this->accountManagement->createAccountWithPasswordHash($customer, $hash));
-     }
-@@ -1954,7 +2050,7 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $website->expects($this->once())
-             ->method('getDefaultStore')
-             ->willReturn($store);
--        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-+        $customer = $this->createMock(Customer::class);
-         $customer->expects($this->atLeastOnce())
-             ->method('getId')
-             ->willReturn($customerId);
-@@ -2021,7 +2117,9 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-             ->method('newAccount')
-             ->willThrowException($exception);
-         $this->logger->expects($this->once())->method('error')->with($exception);
--
-+        $this->allowedCountriesReader->expects($this->atLeastOnce())
-+            ->method('getAllowedCountries')->willReturn(['US' => 'US']);
-+        $address->expects($this->atLeastOnce())->method('getCountryId')->willReturn('US');
-         $this->accountManagement->createAccount($customer);
-     }
- 
-@@ -2033,8 +2131,9 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         $storeId = 1;
-         $websiteId = 1;
-         $hash = '4nj54lkj5jfi03j49f8bgujfgsd';
--        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
--            ->getMockForAbstractClass();
-+        $customerMock = $this->getMockBuilder(Customer::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-         $customerMock->expects($this->atLeastOnce())
-             ->method('getId')
-             ->willReturn(null);
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/Address/DataProviderTest.php b/app/code/Magento/Customer/Test/Unit/Model/Address/DataProviderTest.php
-new file mode 100644
-index 00000000000..4dafd305d61
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Unit/Model/Address/DataProviderTest.php
-@@ -0,0 +1,351 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Customer\Test\Unit\Model\Address;
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Model\Address\DataProvider;
-+use Magento\Customer\Model\AttributeMetadataResolver;
-+use Magento\Customer\Model\FileUploaderDataResolver;
-+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory;
-+use Magento\Customer\Model\ResourceModel\Address\Collection as AddressCollection;
-+use Magento\Eav\Model\Config;
-+use Magento\Eav\Model\Entity\Type;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Framework\View\Element\UiComponent\ContextInterface;
-+use Magento\Customer\Model\Address as AddressModel;
-+use Magento\Ui\Component\Form\Element\Multiline;
-+use Magento\Ui\Component\Form\Field;
-+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-+
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class DataProviderTest extends \PHPUnit\Framework\TestCase
-+{
-+    private const ATTRIBUTE_CODE = 'street';
-+
-+    /**
-+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $addressCollectionFactory;
-+
-+    /**
-+     * @var AddressCollection|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $collection;
-+
-+    /**
-+     * @var CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $customer;
-+
-+    /**
-+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $eavConfig;
-+
-+    /*
-+     * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $context;
-+
-+    /**
-+     * @var AddressModel|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $address;
-+
-+    /**
-+     * @var FileUploaderDataResolver|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $fileUploaderDataResolver;
-+
-+    /**
-+     * @var AttributeMetadataResolver|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $attributeMetadataResolver;
-+
-+    /**
-+     * @var DataProvider
-+     */
-+    private $model;
-+
-+    protected function setUp()
-+    {
-+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $this->fileUploaderDataResolver = $this->getMockBuilder(FileUploaderDataResolver::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->attributeMetadataResolver = $this->getMockBuilder(AttributeMetadataResolver::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->addressCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $this->collection = $this->getMockBuilder(AddressCollection::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->customerRepository = $this->getMockForAbstractClass(CustomerRepositoryInterface::class);
-+        $this->context = $this->getMockForAbstractClass(ContextInterface::class);
-+        $this->addressCollectionFactory->expects($this->once())
-+            ->method('create')
-+            ->willReturn($this->collection);
-+        $this->eavConfig = $this->getMockBuilder(Config::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->eavConfig->expects($this->once())
-+            ->method('getEntityType')
-+            ->with('customer_address')
-+            ->willReturn($this->getTypeAddressMock([]));
-+        $this->customer = $this->getMockForAbstractClass(CustomerInterface::class);
-+        $this->address = $this->getMockBuilder(AddressModel::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->attributeMetadataResolver->expects($this->at(0))
-+            ->method('getAttributesMeta')
-+            ->willReturn(
-+                [
-+                    'arguments' => [
-+                        'data' => [
-+                            'config' => [
-+                                'dataType' => Multiline::NAME,
-+                                'formElement' => 'frontend_input',
-+                                'options' => 'test-options',
-+                                'visible' => null,
-+                                'required' => 'is_required',
-+                                'label' => __('Street'),
-+                                'sortOrder' => 'sort_order',
-+                                'default' => 'default_value',
-+                                'size' => 'multiline_count',
-+                                'componentType' => Field::NAME,
-+                            ],
-+                        ],
-+                    ],
-+                ]
-+            );
-+        $this->attributeMetadataResolver->expects($this->at(1))
-+            ->method('getAttributesMeta')
-+            ->willReturn(
-+                [
-+                    'arguments' => [
-+                        'data' => [
-+                            'config' => [
-+                                'dataType' => 'frontend_input',
-+                                'formElement' => 'frontend_input',
-+                                'visible' => null,
-+                                'required' => 'is_required',
-+                                'label' => __('frontend_label'),
-+                                'sortOrder' => 'sort_order',
-+                                'default' => 'default_value',
-+                                'size' => 'multiline_count',
-+                                'componentType' => Field::NAME,
-+                                'prefer' => 'toggle',
-+                                'valueMap' => [
-+                                    'true' => 1,
-+                                    'false' => 0,
-+                                ],
-+                            ],
-+                        ],
-+                    ],
-+                ]
-+            );
-+        $this->model = $objectManagerHelper->getObject(
-+            DataProvider::class,
-+            [
-+                'name'                      => 'test-name',
-+                'primaryFieldName'          => 'primary-field-name',
-+                'requestFieldName'          => 'request-field-name',
-+                'addressCollectionFactory' => $this->addressCollectionFactory,
-+                'customerRepository' => $this->customerRepository,
-+                'eavConfig' => $this->eavConfig,
-+                'context' => $this->context,
-+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver,
-+                'attributeMetadataResolver' => $this->attributeMetadataResolver,
-+                [],
-+                [],
-+                true
-+            ]
-+        );
-+    }
-+
-+    public function testGetDefaultData(): void
-+    {
-+        $expectedData = [
-+            '' => [
-+                'parent_id' => 1,
-+                'firstname' => 'John',
-+                'lastname' => 'Doe'
-+            ]
-+        ];
-+
-+        $this->collection->expects($this->once())
-+            ->method('getItems')
-+            ->willReturn([]);
-+
-+        $this->context->expects($this->once())
-+            ->method('getRequestParam')
-+            ->willReturn(1);
-+        $this->customerRepository->expects($this->once())
-+            ->method('getById')
-+            ->willReturn($this->customer);
-+        $this->customer->expects($this->once())
-+            ->method('getFirstname')
-+            ->willReturn('John');
-+        $this->customer->expects($this->once())
-+            ->method('getLastname')
-+            ->willReturn('Doe');
-+
-+        $this->assertEquals($expectedData, $this->model->getData());
-+    }
-+
-+    public function testGetData(): void
-+    {
-+        $expectedData = [
-+            '1' => [
-+                'parent_id' => '1',
-+                'default_billing' => '1',
-+                'default_shipping' => '1',
-+                'firstname' => 'John',
-+                'lastname' => 'Doe',
-+                'street' => [
-+                    '42000 Ave W 55 Cedar City',
-+                    'Apt. 33'
-+                ]
-+            ]
-+        ];
-+
-+        $this->collection->expects($this->once())
-+            ->method('getItems')
-+            ->willReturn([
-+                $this->address
-+            ]);
-+
-+        $this->customerRepository->expects($this->once())
-+            ->method('getById')
-+            ->willReturn($this->customer);
-+        $this->customer->expects($this->once())
-+            ->method('getDefaultBilling')
-+            ->willReturn('1');
-+        $this->customer->expects($this->once())
-+            ->method('getDefaultShipping')
-+            ->willReturn('1');
-+
-+        $this->address->expects($this->once())
-+            ->method('getEntityId')
-+            ->willReturn('1');
-+        $this->address->expects($this->once())
-+            ->method('load')
-+            ->with('1')
-+            ->willReturnSelf();
-+        $this->address->expects($this->once())
-+            ->method('getData')
-+            ->willReturn([
-+                'parent_id' => '1',
-+                'firstname' => 'John',
-+                'lastname' => 'Doe',
-+                'street' => "42000 Ave W 55 Cedar City\nApt. 33"
-+            ]);
-+        $this->fileUploaderDataResolver->expects($this->once())
-+            ->method('overrideFileUploaderData')
-+            ->willReturnSelf();
-+
-+        $this->assertEquals($expectedData, $this->model->getData());
-+    }
-+
-+    /**
-+     * Get customer address type mock
-+     *
-+     * @param array $customerAttributes
-+     * @return Type|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected function getTypeAddressMock($customerAttributes = [])
-+    {
-+        $typeAddressMock = $this->getMockBuilder(Type::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $attributesCollection = !empty($customerAttributes) ? $customerAttributes : $this->getAttributeMock();
-+        foreach ($attributesCollection as $attribute) {
-+            $attribute->expects($this->any())
-+                ->method('getEntityType')
-+                ->willReturn($typeAddressMock);
-+        }
-+
-+        $typeAddressMock->expects($this->once())
-+            ->method('getAttributeCollection')
-+            ->willReturn($attributesCollection);
-+
-+        return $typeAddressMock;
-+    }
-+
-+    /**
-+     * Get attribute mock
-+     *
-+     * @param array $options
-+     * @return AbstractAttribute[]|\PHPUnit_Framework_MockObject_MockObject[]
-+     */
-+    protected function getAttributeMock($options = []): array
-+    {
-+        $attributeMock = $this->getMockBuilder(AbstractAttribute::class)
-+            ->setMethods(
-+                [
-+                    'getAttributeCode',
-+                    'getDataUsingMethod',
-+                    'getFrontendInput',
-+                    'getIsVisible',
-+                    'getSource',
-+                    'getIsUserDefined',
-+                    'getUsedInForms',
-+                    'getEntityType',
-+                ]
-+            )
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+
-+        $attributeCode = self::ATTRIBUTE_CODE;
-+        if (isset($options[self::ATTRIBUTE_CODE]['specific_code_prefix'])) {
-+            $attributeCode .= $options[self::ATTRIBUTE_CODE]['specific_code_prefix'];
-+        }
-+
-+        $attributeMock->expects($this->exactly(2))
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+
-+        $attributeBooleanMock = $this->getMockBuilder(AbstractAttribute::class)
-+            ->setMethods(
-+                [
-+                    'getAttributeCode',
-+                    'getDataUsingMethod',
-+                    'getFrontendInput',
-+                    'getIsVisible',
-+                    'getIsUserDefined',
-+                    'getUsedInForms',
-+                    'getSource',
-+                    'getEntityType',
-+                ]
-+            )
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+
-+        $booleanAttributeCode = 'test-code-boolean';
-+        if (isset($options['test-code-boolean']['specific_code_prefix'])) {
-+            $booleanAttributeCode .= $options['test-code-boolean']['specific_code_prefix'];
-+        }
-+
-+        $attributeBooleanMock->expects($this->exactly(2))
-+            ->method('getAttributeCode')
-+            ->willReturn($booleanAttributeCode);
-+
-+        $mocks = [$attributeMock, $attributeBooleanMock];
-+        return $mocks;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/Address/Validator/CountryTest.php b/app/code/Magento/Customer/Test/Unit/Model/Address/Validator/CountryTest.php
-index d8148543a55..1e5d44e22ad 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/Address/Validator/CountryTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/Address/Validator/CountryTest.php
-@@ -27,11 +27,6 @@ class CountryTest extends \PHPUnit\Framework\TestCase
-      */
-     private $allowedCountriesReaderMock;
- 
--    /**
--     * @var \Magento\Customer\Model\Config\Share|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $shareConfigMock;
--
-     protected function setUp()
-     {
-         $this->directoryDataMock = $this->createMock(\Magento\Directory\Helper\Data::class);
-@@ -40,16 +35,17 @@ class CountryTest extends \PHPUnit\Framework\TestCase
-             \Magento\Directory\Model\AllowedCountries::class,
-             ['getAllowedCountries']
-         );
--        $this->shareConfigMock = $this->createPartialMock(
--            \Magento\Customer\Model\Config\Share::class,
--            ['isGlobalScope']
-+
-+        $escaper = $this->objectManager->getObject(
-+            \Magento\Framework\Escaper::class
-         );
-+
-         $this->model = $this->objectManager->getObject(
-             \Magento\Customer\Model\Address\Validator\Country::class,
-             [
-                 'directoryData' => $this->directoryDataMock,
-                 'allowedCountriesReader' => $this->allowedCountriesReaderMock,
--                'shareConfig' => $this->shareConfigMock,
-+                'escaper' => $escaper
-             ]
-         );
-     }
-@@ -81,10 +77,9 @@ class CountryTest extends \PHPUnit\Framework\TestCase
-             ->method('isRegionRequired')
-             ->willReturn($data['regionRequired']);
- 
--        $this->shareConfigMock->method('isGlobalScope')->willReturn(false);
-         $this->allowedCountriesReaderMock
-             ->method('getAllowedCountries')
--            ->with(ScopeInterface::SCOPE_WEBSITE, null)
-+            ->with(ScopeInterface::SCOPE_STORE, null)
-             ->willReturn($countryIds);
- 
-         $addressMock->method('getCountryId')->willReturn($data['country_id']);
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
-index 50c21379054..3cbcbdf80b2 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
-@@ -49,14 +49,14 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-     protected $sessionMock;
- 
-     /**
--     * @var \Magento\Customer\Model\FileProcessorFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Customer\Model\FileProcessor|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $fileProcessorFactory;
-+    protected $fileProcessor;
- 
-     /**
--     * @var \Magento\Customer\Model\FileProcessor|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Customer\Model\FileUploaderDataResolver|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $fileProcessor;
-+    private $fileUploaderDataResolver;
- 
-     /**
-      * Set up
-@@ -84,10 +84,9 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-         $this->fileProcessor = $this->getMockBuilder(\Magento\Customer\Model\FileProcessor::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--
--        $this->fileProcessorFactory = $this->getMockBuilder(\Magento\Customer\Model\FileProcessorFactory::class)
-+        $this->fileUploaderDataResolver = $this->getMockBuilder(\Magento\Customer\Model\FileUploaderDataResolver::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['create'])
-+            ->setMethods(['overrideFileUploaderMetadata', 'overrideFileUploaderData'])
-             ->getMock();
-     }
- 
-@@ -111,16 +110,11 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                 'requestFieldName' => 'request-field-name',
-                 'eavValidationRules' => $this->eavValidationRulesMock,
-                 'customerCollectionFactory' => $this->getCustomerCollectionFactoryMock(),
--                'eavConfig' => $this->getEavConfigMock()
-+                'eavConfig' => $this->getEavConfigMock(),
-+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver
-             ]
-         );
- 
--        $helper->setBackwardCompatibleProperty(
--            $dataProvider,
--            'fileProcessorFactory',
--            $this->fileProcessorFactory
--        );
--
-         $meta = $dataProvider->getMeta();
-         $this->assertNotEmpty($meta);
-         $this->assertEquals($expected, $meta);
-@@ -591,10 +585,6 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-         $customer->expects($this->once())
-             ->method('getAddresses')
-             ->willReturn([$address]);
--        $customer->expects($this->once())
--            ->method('getAttributes')
--            ->willReturn([]);
--
-         $address->expects($this->atLeastOnce())
-             ->method('getId')
-             ->willReturn(2);
-@@ -605,9 +595,6 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-         $address->expects($this->once())
-             ->method('getData')
-             ->willReturn($addressData);
--        $address->expects($this->once())
--            ->method('getAttributes')
--            ->willReturn([]);
- 
-         $helper = new ObjectManager($this);
-         $dataProvider = $helper->getObject(
-@@ -618,7 +605,8 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                 'requestFieldName' => 'request-field-name',
-                 'eavValidationRules' => $this->eavValidationRulesMock,
-                 'customerCollectionFactory' => $this->customerCollectionFactoryMock,
--                'eavConfig' => $this->getEavConfigMock()
-+                'eavConfig' => $this->getEavConfigMock(),
-+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver
-             ]
-         );
- 
-@@ -631,12 +619,6 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-             ->method('getCustomerFormData')
-             ->willReturn(null);
- 
--        $helper->setBackwardCompatibleProperty(
--            $dataProvider,
--            'fileProcessorFactory',
--            $this->fileProcessorFactory
--        );
--
-         $this->assertEquals(
-             [
-                 '' => [
-@@ -649,10 +631,8 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                         2 => [
-                             'firstname' => 'firstname',
-                             'lastname' => 'lastname',
--                            'street' => [
--                                'street',
--                                'street',
--                            ],
-+                            // Won't be an array because it isn't defined as a multiline field in this test
-+                            'street' => "street\nstreet",
-                             'default_billing' => 2,
-                             'default_shipping' => 2,
-                         ]
-@@ -725,10 +705,6 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-         $customer->expects($this->once())
-             ->method('getAddresses')
-             ->willReturn([$address]);
--        $customer->expects($this->once())
--            ->method('getAttributes')
--            ->willReturn([]);
--
-         $address->expects($this->atLeastOnce())
-             ->method('getId')
-             ->willReturn(2);
-@@ -743,10 +719,6 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                 'lastname' => 'lastname',
-                 'street' => "street\nstreet",
-             ]);
--        $address->expects($this->once())
--            ->method('getAttributes')
--            ->willReturn([]);
--
-         $helper = new ObjectManager($this);
-         $dataProvider = $helper->getObject(
-             \Magento\Customer\Model\Customer\DataProvider::class,
-@@ -756,7 +728,8 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                 'requestFieldName' => 'request-field-name',
-                 'eavValidationRules' => $this->eavValidationRulesMock,
-                 'customerCollectionFactory' => $this->customerCollectionFactoryMock,
--                'eavConfig' => $this->getEavConfigMock()
-+                'eavConfig' => $this->getEavConfigMock(),
-+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver
-             ]
-         );
- 
-@@ -771,12 +744,6 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-         $this->sessionMock->expects($this->once())
-             ->method('unsCustomerFormData');
- 
--        $helper->setBackwardCompatibleProperty(
--            $dataProvider,
--            'fileProcessorFactory',
--            $this->fileProcessorFactory
--        );
--
-         $this->assertEquals([$customerId => $customerFormData], $dataProvider->getData());
-     }
- 
-@@ -790,42 +757,6 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-         $customerEmail = 'user1@example.com';
- 
-         $filename = '/filename.ext1';
--        $viewUrl = 'viewUrl';
--        $mime = 'image/png';
--
--        $expectedData = [
--            $customerId => [
--                'customer' => [
--                    'email' => $customerEmail,
--                    'img1' => [
--                        [
--                            'file' => $filename,
--                            'size' => 1,
--                            'url' => $viewUrl,
--                            'name' => 'filename.ext1',
--                            'type' => $mime,
--                        ],
--                    ],
--                ],
--            ],
--        ];
--
--        $attributeMock = $this->getMockBuilder(\Magento\Customer\Model\Attribute::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $attributeMock->expects($this->exactly(2))
--            ->method('getFrontendInput')
--            ->willReturn('image');
--        $attributeMock->expects($this->exactly(2))
--            ->method('getAttributeCode')
--            ->willReturn('img1');
--
--        $entityTypeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Type::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $entityTypeMock->expects($this->once())
--            ->method('getEntityTypeCode')
--            ->willReturn(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
- 
-         $customerMock = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
-             ->disableOriginalConstructor()
-@@ -842,13 +773,6 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-         $customerMock->expects($this->once())
-             ->method('getId')
-             ->willReturn($customerId);
--        $customerMock->expects($this->once())
--            ->method('getAttributes')
--            ->willReturn([$attributeMock]);
--        $customerMock->expects($this->once())
--            ->method('getEntityType')
--            ->willReturn($entityTypeMock);
--
-         $collectionMock = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Customer\Collection::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-@@ -864,30 +788,6 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-             ->method('getCustomerFormData')
-             ->willReturn([]);
- 
--        $this->fileProcessorFactory->expects($this->any())
--            ->method('create')
--            ->with([
--                'entityTypeCode' => CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
--            ])
--            ->willReturn($this->fileProcessor);
--
--        $this->fileProcessor->expects($this->once())
--            ->method('isExist')
--            ->with($filename)
--            ->willReturn(true);
--        $this->fileProcessor->expects($this->once())
--            ->method('getStat')
--            ->with($filename)
--            ->willReturn(['size' => 1]);
--        $this->fileProcessor->expects($this->once())
--            ->method('getViewUrl')
--            ->with('/filename.ext1', 'image')
--            ->willReturn($viewUrl);
--        $this->fileProcessor->expects($this->once())
--            ->method('getMimeType')
--            ->with($filename)
--            ->willReturn($mime);
--
-         $objectManager = new ObjectManager($this);
-         $dataProvider = $objectManager->getObject(
-             \Magento\Customer\Model\Customer\DataProvider::class,
-@@ -897,7 +797,8 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                 'requestFieldName' => 'request-field-name',
-                 'eavValidationRules' => $this->eavValidationRulesMock,
-                 'customerCollectionFactory' => $this->customerCollectionFactoryMock,
--                'eavConfig' => $this->getEavConfigMock()
-+                'eavConfig' => $this->getEavConfigMock(),
-+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver
-             ]
-         );
- 
-@@ -907,108 +808,15 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-             $this->sessionMock
-         );
- 
--        $objectManager->setBackwardCompatibleProperty(
--            $dataProvider,
--            'fileProcessorFactory',
--            $this->fileProcessorFactory
--        );
--
--        $this->assertEquals($expectedData, $dataProvider->getData());
--    }
--
--    public function testGetDataWithCustomAttributeImageNoData()
--    {
--        $customerId = 1;
--        $customerEmail = 'user1@example.com';
--
--        $expectedData = [
--            $customerId => [
--                'customer' => [
-+        $this->fileUploaderDataResolver->expects($this->atLeastOnce())->method('overrideFileUploaderData')
-+            ->with(
-+                $customerMock,
-+                [
-                     'email' => $customerEmail,
--                    'img1' => [],
--                ],
--            ],
--        ];
--
--        $attributeMock = $this->getMockBuilder(\Magento\Customer\Model\Attribute::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $attributeMock->expects($this->once())
--            ->method('getFrontendInput')
--            ->willReturn('image');
--        $attributeMock->expects($this->exactly(2))
--            ->method('getAttributeCode')
--            ->willReturn('img1');
--
--        $entityTypeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Type::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $entityTypeMock->expects($this->once())
--            ->method('getEntityTypeCode')
--            ->willReturn(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
--
--        $customerMock = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $customerMock->expects($this->once())
--            ->method('getData')
--            ->willReturn([
--                'email' => $customerEmail,
--            ]);
--        $customerMock->expects($this->once())
--            ->method('getAddresses')
--            ->willReturn([]);
--        $customerMock->expects($this->once())
--            ->method('getId')
--            ->willReturn($customerId);
--        $customerMock->expects($this->once())
--            ->method('getAttributes')
--            ->willReturn([$attributeMock]);
--        $customerMock->expects($this->once())
--            ->method('getEntityType')
--            ->willReturn($entityTypeMock);
--
--        $collectionMock = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Customer\Collection::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $collectionMock->expects($this->once())
--            ->method('getItems')
--            ->willReturn([$customerMock]);
--
--        $this->customerCollectionFactoryMock->expects($this->once())
--            ->method('create')
--            ->willReturn($collectionMock);
--
--        $this->sessionMock->expects($this->once())
--            ->method('getCustomerFormData')
--            ->willReturn([]);
--
--        $objectManager = new ObjectManager($this);
--        $dataProvider = $objectManager->getObject(
--            \Magento\Customer\Model\Customer\DataProvider::class,
--            [
--                'name' => 'test-name',
--                'primaryFieldName' => 'primary-field-name',
--                'requestFieldName' => 'request-field-name',
--                'eavValidationRules' => $this->eavValidationRulesMock,
--                'customerCollectionFactory' => $this->customerCollectionFactoryMock,
--                'eavConfig' => $this->getEavConfigMock()
--            ]
--        );
--
--        $objectManager->setBackwardCompatibleProperty(
--            $dataProvider,
--            'session',
--            $this->sessionMock
--        );
--
--        $objectManager->setBackwardCompatibleProperty(
--            $dataProvider,
--            'fileProcessorFactory',
--            $this->fileProcessorFactory
--        );
--
--        $this->assertEquals($expectedData, $dataProvider->getData());
-+                    'img1' => $filename,
-+                ]
-+            );
-+        $dataProvider->getData();
-     }
- 
-     /**
-@@ -1099,13 +907,6 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                 'file_extensions' => 'ext1, eXt2 ', // Added spaces and upper-cases
-             ]);
- 
--        $this->fileProcessorFactory->expects($this->any())
--            ->method('create')
--            ->with([
--                'entityTypeCode' => CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
--            ])
--            ->willReturn($this->fileProcessor);
--
-         $objectManager = new ObjectManager($this);
-         $dataProvider = $objectManager->getObject(
-             \Magento\Customer\Model\Customer\DataProvider::class,
-@@ -1115,8 +916,7 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                 'requestFieldName' => 'request-field-name',
-                 'eavValidationRules' => $this->eavValidationRulesMock,
-                 'customerCollectionFactory' => $this->customerCollectionFactoryMock,
--                'eavConfig' => $this->eavConfigMock,
--                'fileProcessorFactory' => $this->fileProcessorFactory,
-+                'eavConfig' => $this->eavConfigMock
-             ]
-         );
- 
-@@ -1211,16 +1011,11 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                 'requestFieldName' => 'request-field-name',
-                 'eavValidationRules' => $this->eavValidationRulesMock,
-                 'customerCollectionFactory' => $this->getCustomerCollectionFactoryMock(),
--                'eavConfig' => $this->getEavConfigMock(array_merge($firstAttributesBundle, $secondAttributesBundle))
-+                'eavConfig' => $this->getEavConfigMock(array_merge($firstAttributesBundle, $secondAttributesBundle)),
-+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver
-             ]
-         );
- 
--        $helper->setBackwardCompatibleProperty(
--            $dataProvider,
--            'fileProcessorFactory',
--            $this->fileProcessorFactory
--        );
--
-         $meta = $dataProvider->getMeta();
-         $this->assertNotEmpty($meta);
-         $this->assertEquals($this->getExpectationForVisibleAttributes(), $meta);
-@@ -1284,27 +1079,23 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                 'eavValidationRules' => $this->eavValidationRulesMock,
-                 'customerCollectionFactory' => $this->getCustomerCollectionFactoryMock(),
-                 'context' => $context,
--                'eavConfig' => $this->getEavConfigMock(array_merge($firstAttributesBundle, $secondAttributesBundle))
-+                'eavConfig' => $this->getEavConfigMock(array_merge($firstAttributesBundle, $secondAttributesBundle)),
-+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver
-+
-             ]
-         );
--        $helper->setBackwardCompatibleProperty(
--            $dataProvider,
--            'fileProcessorFactory',
--            $this->fileProcessorFactory
--        );
- 
-         $meta = $dataProvider->getMeta();
-         $this->assertNotEmpty($meta);
--        $this->assertEquals($this->getExpectationForVisibleAttributes(false), $meta);
-+        $this->assertEquals($this->getExpectationForVisibleAttributes(), $meta);
-     }
- 
-     /**
-      * Retrieve all customer variations of attributes with all variations of visibility
-      *
--     * @param bool $isRegistration
-      * @return array
-      */
--    private function getCustomerAttributeExpectations($isRegistration)
-+    private function getCustomerAttributeExpectations()
-     {
-         return [
-             self::ATTRIBUTE_CODE . "_1" => [
-@@ -1314,7 +1105,7 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                             'dataType' => 'frontend_input',
-                             'formElement' => 'frontend_input',
-                             'options' => 'test-options',
--                            'visible' => !$isRegistration,
-+                            'visible' => true,
-                             'required' => 'is_required',
-                             'label' => __('frontend_label'),
-                             'sortOrder' => 'sort_order',
-@@ -1351,7 +1142,7 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                         'config' => [
-                             'dataType' => 'frontend_input',
-                             'formElement' => 'frontend_input',
--                            'visible' => $isRegistration,
-+                            'visible' => true,
-                             'required' => 'is_required',
-                             'label' => __('frontend_label'),
-                             'sortOrder' => 'sort_order',
-@@ -1374,7 +1165,7 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-                         'config' => [
-                             'dataType' => 'frontend_input',
-                             'formElement' => 'frontend_input',
--                            'visible' => $isRegistration,
-+                            'visible' => true,
-                             'required' => 'is_required',
-                             'label' => __('frontend_label'),
-                             'sortOrder' => 'sort_order',
-@@ -1397,14 +1188,13 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Retrieve all variations of attributes with all variations of visibility
-      *
--     * @param bool $isRegistration
-      * @return  array
-      */
--    private function getExpectationForVisibleAttributes($isRegistration = true)
-+    private function getExpectationForVisibleAttributes()
-     {
-         return [
-             'customer' => [
--                'children' => $this->getCustomerAttributeExpectations($isRegistration),
-+                'children' => $this->getCustomerAttributeExpectations(),
-             ],
-             'address' => [
-                 'children' => [
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php
-new file mode 100644
-index 00000000000..d5eaecb3ef3
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php
-@@ -0,0 +1,421 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Test\Unit\Model\Customer;
-+
-+use Magento\Customer\Model\AttributeMetadataResolver;
-+use Magento\Customer\Model\Customer\DataProviderWithDefaultAddresses;
-+use Magento\Customer\Model\FileUploaderDataResolver;
-+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory;
-+use Magento\Customer\Model\ResourceModel\Customer\Collection as CustomerCollection;
-+use Magento\Eav\Model\Config;
-+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-+use Magento\Eav\Model\Entity\Type;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Ui\Component\Form\Field;
-+
-+/**
-+ * Test for class \Magento\Customer\Model\Customer\DataProviderWithDefaultAddresses
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class DataProviderWithDefaultAddressesTest extends \PHPUnit\Framework\TestCase
-+{
-+    private const ATTRIBUTE_CODE = 'test-code';
-+
-+    /**
-+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $eavConfigMock;
-+
-+    /**
-+     * @var CustomerCollectionFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $customerCollectionFactoryMock;
-+
-+    /**
-+     * @var \Magento\Framework\Session\SessionManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $sessionMock;
-+
-+    /**
-+     * @var \Magento\Directory\Model\CountryFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $countryFactoryMock;
-+
-+    /**
-+     * @var \Magento\Customer\Model\Customer|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $customerMock;
-+
-+    /**
-+     * @var CustomerCollection|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $customerCollectionMock;
-+
-+    /**
-+     * @var FileUploaderDataResolver|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $fileUploaderDataResolver;
-+
-+    /**
-+     * @var AttributeMetadataResolver|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $attributeMetadataResolver;
-+
-+    /**
-+     * @return void
-+     */
-+    protected function setUp(): void
-+    {
-+        $this->eavConfigMock = $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock();
-+        $this->customerCollectionFactoryMock = $this->createPartialMock(CustomerCollectionFactory::class, ['create']);
-+        $this->sessionMock = $this->getMockBuilder(\Magento\Framework\Session\SessionManagerInterface::class)
-+            ->setMethods(['getCustomerFormData', 'unsCustomerFormData'])
-+            ->getMockForAbstractClass();
-+        $this->countryFactoryMock = $this->getMockBuilder(\Magento\Directory\Model\CountryFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create', 'loadByCode', 'getName'])
-+            ->getMock();
-+        $this->customerMock = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->customerCollectionMock = $this->getMockBuilder(CustomerCollection::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->customerCollectionMock->expects($this->once())->method('addAttributeToSelect')->with('*');
-+        $this->customerCollectionFactoryMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($this->customerCollectionMock);
-+        $this->eavConfigMock->expects($this->atLeastOnce())
-+            ->method('getEntityType')
-+            ->with('customer')
-+            ->willReturn($this->getTypeCustomerMock([]));
-+        $this->fileUploaderDataResolver = $this->getMockBuilder(FileUploaderDataResolver::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->attributeMetadataResolver = $this->getMockBuilder(AttributeMetadataResolver::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributesMeta'])
-+            ->getMock();
-+        $this->attributeMetadataResolver->expects($this->at(0))
-+            ->method('getAttributesMeta')
-+            ->willReturn(
-+                [
-+                    'arguments' => [
-+                        'data' => [
-+                            'config' => [
-+                                'dataType' => 'frontend_input',
-+                                'formElement' => 'frontend_input',
-+                                'options' => 'test-options',
-+                                'visible' => null,
-+                                'required' => 'is_required',
-+                                'label' => __('frontend_label'),
-+                                'sortOrder' => 'sort_order',
-+                                'notice' => 'note',
-+                                'default' => 'default_value',
-+                                'size' => 'multiline_count',
-+                                'componentType' => Field::NAME,
-+                            ],
-+                        ],
-+                    ],
-+                ]
-+            );
-+        $this->attributeMetadataResolver->expects($this->at(1))
-+            ->method('getAttributesMeta')
-+            ->willReturn(
-+                [
-+                    'arguments' => [
-+                        'data' => [
-+                            'config' => [
-+                                'dataType' => 'frontend_input',
-+                                'formElement' => 'frontend_input',
-+                                'visible' => null,
-+                                'required' => 'is_required',
-+                                'label' => __('frontend_label'),
-+                                'sortOrder' => 'sort_order',
-+                                'notice' => 'note',
-+                                'default' => 'default_value',
-+                                'size' => 'multiline_count',
-+                                'componentType' => Field::NAME,
-+                                'prefer' => 'toggle',
-+                                'valueMap' => [
-+                                    'true' => 1,
-+                                    'false' => 0,
-+                                ],
-+                            ],
-+                        ],
-+                    ],
-+                ]
-+            );
-+        $helper = new ObjectManager($this);
-+        $this->dataProvider = $helper->getObject(
-+            DataProviderWithDefaultAddresses::class,
-+            [
-+                'name'                      => 'test-name',
-+                'primaryFieldName'          => 'primary-field-name',
-+                'requestFieldName'          => 'request-field-name',
-+                'customerCollectionFactory' => $this->customerCollectionFactoryMock,
-+                'eavConfig'                 => $this->eavConfigMock,
-+                'countryFactory'            => $this->countryFactoryMock,
-+                'session'                   => $this->sessionMock,
-+                'fileUploaderDataResolver'  => $this->fileUploaderDataResolver,
-+                'attributeMetadataResolver' => $this->attributeMetadataResolver,
-+                true
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Run test getAttributesMeta method
-+     *
-+     * @param array $expected
-+     * @return void
-+     *
-+     * @dataProvider getAttributesMetaDataProvider
-+     */
-+    public function testGetAttributesMetaWithOptions(array $expected): void
-+    {
-+        $meta = $this->dataProvider->getMeta();
-+        $this->assertNotEmpty($meta);
-+        $this->assertEquals($expected, $meta);
-+    }
-+
-+    /**
-+     * Data provider for testGetAttributesMeta
-+     *
-+     * @return array
-+     */
-+    public function getAttributesMetaDataProvider(): array
-+    {
-+        return [
-+            [
-+                'expected' => [
-+                    'customer' => [
-+                        'children' => [
-+                            self::ATTRIBUTE_CODE => [
-+                                'arguments' => [
-+                                    'data' => [
-+                                        'config' => [
-+                                            'dataType' => 'frontend_input',
-+                                            'formElement' => 'frontend_input',
-+                                            'options' => 'test-options',
-+                                            'visible' => null,
-+                                            'required' => 'is_required',
-+                                            'label' => __('frontend_label'),
-+                                            'sortOrder' => 'sort_order',
-+                                            'notice' => 'note',
-+                                            'default' => 'default_value',
-+                                            'size' => 'multiline_count',
-+                                            'componentType' => Field::NAME,
-+                                        ],
-+                                    ],
-+                                ],
-+                            ],
-+                            'test-code-boolean' => [
-+                                'arguments' => [
-+                                    'data' => [
-+                                        'config' => [
-+                                            'dataType' => 'frontend_input',
-+                                            'formElement' => 'frontend_input',
-+                                            'visible' => null,
-+                                            'required' => 'is_required',
-+                                            'label' => __('frontend_label'),
-+                                            'sortOrder' => 'sort_order',
-+                                            'notice' => 'note',
-+                                            'default' => 'default_value',
-+                                            'size' => 'multiline_count',
-+                                            'componentType' => Field::NAME,
-+                                            'prefer' => 'toggle',
-+                                            'valueMap' => [
-+                                                'true' => 1,
-+                                                'false' => 0,
-+                                            ],
-+                                        ],
-+                                    ],
-+                                ],
-+                            ],
-+                        ],
-+                    ],
-+                ]
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * @param array $customerAttributes
-+     * @return Type|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected function getTypeCustomerMock($customerAttributes = [])
-+    {
-+        $typeCustomerMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Type::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $attributesCollection = !empty($customerAttributes) ? $customerAttributes : $this->getAttributeMock();
-+        foreach ($attributesCollection as $attribute) {
-+            $attribute->expects($this->any())
-+                ->method('getEntityType')
-+                ->willReturn($typeCustomerMock);
-+        }
-+
-+        $typeCustomerMock->expects($this->atLeastOnce())
-+            ->method('getAttributeCollection')
-+            ->willReturn($attributesCollection);
-+
-+        return $typeCustomerMock;
-+    }
-+
-+    /**
-+     * @param array $options
-+     * @return AbstractAttribute[]|\PHPUnit_Framework_MockObject_MockObject[]
-+     */
-+    protected function getAttributeMock($options = []): array
-+    {
-+        $attributeMock = $this->getMockBuilder(AbstractAttribute::class)
-+            ->setMethods(
-+                [
-+                    'getAttributeCode',
-+                    'getDataUsingMethod',
-+                    'getFrontendInput',
-+                    'getIsVisible',
-+                    'getSource',
-+                    'getIsUserDefined',
-+                    'getUsedInForms',
-+                    'getEntityType',
-+                ]
-+            )
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+
-+        $attributeCode = self::ATTRIBUTE_CODE;
-+        if (isset($options[self::ATTRIBUTE_CODE]['specific_code_prefix'])) {
-+            $attributeCode .= $options[self::ATTRIBUTE_CODE]['specific_code_prefix'];
-+        }
-+
-+        $attributeMock->expects($this->once())
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+
-+        $attributeBooleanMock = $this->getMockBuilder(AbstractAttribute::class)
-+            ->setMethods(
-+                [
-+                    'getAttributeCode',
-+                    'getDataUsingMethod',
-+                    'getFrontendInput',
-+                    'getIsVisible',
-+                    'getIsUserDefined',
-+                    'getUsedInForms',
-+                    'getSource',
-+                    'getEntityType',
-+                ]
-+            )
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+
-+        $booleanAttributeCode = 'test-code-boolean';
-+        if (isset($options['test-code-boolean']['specific_code_prefix'])) {
-+            $booleanAttributeCode .= $options['test-code-boolean']['specific_code_prefix'];
-+        }
-+
-+        $attributeBooleanMock->expects($this->once())
-+            ->method('getAttributeCode')
-+            ->willReturn($booleanAttributeCode);
-+
-+        $mocks = [$attributeMock, $attributeBooleanMock];
-+        return $mocks;
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testGetData(): void
-+    {
-+        $customerData = [
-+            'email' => 'test@test.ua',
-+            'default_billing' => 2,
-+            'default_shipping' => 2,
-+            'password_hash' => 'password_hash',
-+            'rp_token' => 'rp_token',
-+        ];
-+
-+        $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->customerCollectionMock->expects($this->once())->method('getItems')->willReturn([$this->customerMock]);
-+        $this->customerMock->expects($this->once())->method('getData')->willReturn($customerData);
-+        $this->customerMock->expects($this->atLeastOnce())->method('getId')->willReturn(1);
-+
-+        $this->customerMock->expects($this->once())->method('getDefaultBillingAddress')->willReturn($address);
-+        $this->countryFactoryMock->expects($this->once())->method('create')->willReturnSelf();
-+        $this->countryFactoryMock->expects($this->once())->method('loadByCode')->willReturnSelf();
-+        $this->countryFactoryMock->expects($this->once())->method('getName')->willReturn('Ukraine');
-+
-+        $this->sessionMock->expects($this->once())
-+            ->method('getCustomerFormData')
-+            ->willReturn(null);
-+
-+        $this->assertEquals(
-+            [
-+                1 => [
-+                    'customer' => [
-+                        'email' => 'test@test.ua',
-+                        'default_billing' => 2,
-+                        'default_shipping' => 2,
-+                    ],
-+                    'default_billing_address' => [
-+                        'country' => 'Ukraine',
-+                    ],
-+                    'default_shipping_address' => [],
-+                    'customer_id' => 1
-+                ]
-+            ],
-+            $this->dataProvider->getData()
-+        );
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testGetDataWithCustomerFormData(): void
-+    {
-+        $customerId = 11;
-+        $customerFormData = [
-+            'customer' => [
-+                'email' => 'test1@test1.ua',
-+                'default_billing' => 3,
-+                'default_shipping' => 3,
-+                'entity_id' => $customerId,
-+            ],
-+            'address' => [
-+                3 => [
-+                    'firstname' => 'firstname1',
-+                    'lastname' => 'lastname1',
-+                    'street' => [
-+                        'street1',
-+                        'street2',
-+                    ],
-+                    'default_billing' => 3,
-+                    'default_shipping' => 3,
-+                ],
-+            ],
-+        ];
-+
-+        $this->customerCollectionMock->expects($this->once())->method('getItems')->willReturn([$this->customerMock]);
-+        $this->customerMock->expects($this->once())
-+            ->method('getData')
-+            ->willReturn([
-+                'email' => 'test@test.ua',
-+                'default_billing' => 2,
-+                'default_shipping' => 2,
-+            ]);
-+        $this->customerMock->expects($this->atLeastOnce())->method('getId')->willReturn($customerId);
-+
-+        $this->sessionMock->expects($this->once())->method('getCustomerFormData')->willReturn($customerFormData);
-+        $this->sessionMock->expects($this->once())->method('unsCustomerFormData');
-+
-+        $this->assertEquals([$customerId => $customerFormData], $this->dataProvider->getData());
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/Source/GroupTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/Source/GroupTest.php
-index e07f2f0add9..9128d7c6752 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/Customer/Source/GroupTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/Source/GroupTest.php
-@@ -6,12 +6,15 @@
- namespace Magento\Customer\Test\Unit\Model\Customer\Source;
- 
- use Magento\Customer\Model\Customer\Source\Group;
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\Customer\Api\GroupRepositoryInterface;
- use Magento\Framework\Api\SearchCriteriaBuilder;
- use Magento\Framework\Api\SearchCriteria;
- use Magento\Customer\Api\Data\GroupSearchResultsInterface;
- 
-+/**
-+ * Group test.
-+ */
- class GroupTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -20,7 +23,7 @@ class GroupTest extends \PHPUnit\Framework\TestCase
-     private $model;
- 
-     /**
--     * @var Manager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $moduleManagerMock;
- 
-@@ -46,7 +49,7 @@ class GroupTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
--        $this->moduleManagerMock = $this->getMockBuilder(Manager::class)
-+        $this->moduleManagerMock = $this->getMockBuilder(ModuleManagerInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->groupRepositoryMock = $this->getMockBuilder(GroupRepositoryInterface::class)
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerAuthUpdateTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerAuthUpdateTest.php
-index a1a243066bb..81a612c519f 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/CustomerAuthUpdateTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/CustomerAuthUpdateTest.php
-@@ -5,7 +5,14 @@
-  */
- namespace Magento\Customer\Test\Unit\Model;
- 
-+use Magento\Customer\Model\Customer as CustomerModel;
- use Magento\Customer\Model\CustomerAuthUpdate;
-+use Magento\Customer\Model\CustomerRegistry;
-+use Magento\Customer\Model\Data\CustomerSecure;
-+use Magento\Customer\Model\ResourceModel\Customer as CustomerResourceModel;
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- 
- /**
-  * Class CustomerAuthUpdateTest
-@@ -18,17 +25,22 @@ class CustomerAuthUpdateTest extends \PHPUnit\Framework\TestCase
-     protected $model;
- 
-     /**
--     * @var \Magento\Customer\Model\CustomerRegistry|\PHPUnit_Framework_MockObject_MockObject
-+     * @var CustomerRegistry|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $customerRegistry;
- 
-     /**
--     * @var \Magento\Customer\Model\ResourceModel\Customer|\PHPUnit_Framework_MockObject_MockObject
-+     * @var CustomerResourceModel|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $customerResourceModel;
- 
-     /**
--     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-+     * @var CustomerModel|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $customerModel;
-+
-+    /**
-+     * @var ObjectManager
-      */
-     protected $objectManager;
- 
-@@ -37,32 +49,36 @@ class CustomerAuthUpdateTest extends \PHPUnit\Framework\TestCase
-      */
-     protected function setUp()
-     {
--        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $this->objectManager = new ObjectManager($this);
- 
-         $this->customerRegistry =
--            $this->createMock(\Magento\Customer\Model\CustomerRegistry::class);
-+            $this->createMock(CustomerRegistry::class);
-         $this->customerResourceModel =
--            $this->createMock(\Magento\Customer\Model\ResourceModel\Customer::class);
-+            $this->createMock(CustomerResourceModel::class);
-+        $this->customerModel =
-+            $this->createMock(CustomerModel::class);
- 
-         $this->model = $this->objectManager->getObject(
--            \Magento\Customer\Model\CustomerAuthUpdate::class,
-+            CustomerAuthUpdate::class,
-             [
-                 'customerRegistry' => $this->customerRegistry,
-                 'customerResourceModel' => $this->customerResourceModel,
-+                'customerModel' => $this->customerModel
-             ]
-         );
-     }
- 
-     /**
-      * test SaveAuth
-+     * @throws NoSuchEntityException
-      */
-     public function testSaveAuth()
-     {
-         $customerId = 1;
- 
--        $customerSecureMock = $this->createMock(\Magento\Customer\Model\Data\CustomerSecure::class);
-+        $customerSecureMock = $this->createMock(CustomerSecure::class);
- 
--        $dbAdapter = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
-+        $dbAdapter = $this->createMock(AdapterInterface::class);
- 
-         $this->customerRegistry->expects($this->once())
-             ->method('retrieveSecureData')
-@@ -98,6 +114,9 @@ class CustomerAuthUpdateTest extends \PHPUnit\Framework\TestCase
-                 $customerId
-             );
- 
-+        $this->customerModel->expects($this->once())
-+            ->method('reindex');
-+
-         $this->model->saveAuth($customerId);
-     }
- }
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
-index 9848a09540c..65831069aa1 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
-@@ -13,9 +13,12 @@ namespace Magento\Customer\Test\Unit\Model;
- 
- use Magento\Customer\Model\Customer;
- use Magento\Customer\Model\AccountConfirmation;
-+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory as AddressCollectionFactory;
-+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.TooManyFields)
-  */
- class CustomerTest extends \PHPUnit\Framework\TestCase
- {
-@@ -68,6 +71,21 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
-      */
-     private $accountConfirmation;
- 
-+    /**
-+     * @var AddressCollectionFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $addressesFactory;
-+
-+    /**
-+     * @var CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $customerDataFactory;
-+
-+    /**
-+     * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $dataObjectHelper;
-+
-     protected function setUp()
-     {
-         $this->_website = $this->createMock(\Magento\Store\Model\Website::class);
-@@ -100,6 +118,19 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
-         $this->_encryptor = $this->createMock(\Magento\Framework\Encryption\EncryptorInterface::class);
-         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->accountConfirmation = $this->createMock(AccountConfirmation::class);
-+        $this->addressesFactory = $this->getMockBuilder(AddressCollectionFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $this->customerDataFactory = $this->getMockBuilder(CustomerInterfaceFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $this->dataObjectHelper = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['populateWithArray'])
-+            ->getMock();
-+
-         $this->_model = $helper->getObject(
-             \Magento\Customer\Model\Customer::class,
-             [
-@@ -112,7 +143,10 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
-                 'registry' => $this->registryMock,
-                 'resource' => $this->resourceMock,
-                 'dataObjectProcessor' => $this->dataObjectProcessor,
--                'accountConfirmation' => $this->accountConfirmation
-+                'accountConfirmation' => $this->accountConfirmation,
-+                '_addressesFactory' => $this->addressesFactory,
-+                'customerDataFactory' => $this->customerDataFactory,
-+                'dataObjectHelper' => $this->dataObjectHelper
-             ]
-         );
-     }
-@@ -186,13 +220,13 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
-             ->will($this->returnValue($transportMock));
- 
-         $this->_model->setData([
--                'website_id' => 1,
--                'store_id'   => 1,
--                'email'      => 'email@example.com',
--                'firstname'  => 'FirstName',
--                'lastname'   => 'LastName',
--                'middlename' => 'MiddleName',
--                'prefix'     => 'Name Prefix',
-+            'website_id' => 1,
-+            'store_id' => 1,
-+            'email' => 'email@example.com',
-+            'firstname' => 'FirstName',
-+            'lastname' => 'LastName',
-+            'middlename' => 'MiddleName',
-+            'prefix' => 'Name Prefix',
-         ]);
-         $this->_model->sendNewAccountEmail('registered');
-     }
-@@ -307,9 +341,46 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
-         }
- 
-         $expectedResult[$attribute->getAttributeCode()] = $attribute->getValue();
--        $expectedResult['attribute_set_id'] =
--            \Magento\Customer\Api\CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER;
- 
-         $this->assertEquals($this->_model->getData(), $expectedResult);
-     }
-+
-+    /**
-+     * Test for the \Magento\Customer\Model\Customer::getDataModel() method
-+     */
-+    public function testGetDataModel()
-+    {
-+        $customerId = 1;
-+        $this->_model->setEntityId($customerId);
-+        $this->_model->setId($customerId);
-+        $addressDataModel = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
-+        $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setCustomer', 'getDataModel'])
-+            ->getMock();
-+        $address->expects($this->atLeastOnce())->method('getDataModel')->willReturn($addressDataModel);
-+        $addresses = new \ArrayIterator([$address, $address]);
-+        $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setCustomerFilter', 'addAttributeToSelect', 'getIterator', 'getItems'])
-+            ->getMock();
-+        $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->willReturnSelf();
-+        $addressCollection->expects($this->atLeastOnce())->method('addAttributeToSelect')->willReturnSelf();
-+        $addressCollection->expects($this->atLeastOnce())->method('getIterator')
-+            ->willReturn($addresses);
-+        $addressCollection->expects($this->atLeastOnce())->method('getItems')
-+            ->willReturn($addresses);
-+        $this->addressesFactory->expects($this->atLeastOnce())->method('create')->willReturn($addressCollection);
-+        $customerDataObject = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
-+        $this->customerDataFactory->expects($this->atLeastOnce())->method('create')->willReturn($customerDataObject);
-+        $this->dataObjectHelper->expects($this->atLeastOnce())->method('populateWithArray')
-+            ->with($customerDataObject, $this->_model->getData(), \Magento\Customer\Api\Data\CustomerInterface::class)
-+            ->willReturnSelf();
-+        $customerDataObject->expects($this->atLeastOnce())->method('setAddresses')
-+            ->with([$addressDataModel, $addressDataModel])
-+            ->willReturnSelf();
-+        $customerDataObject->expects($this->atLeastOnce())->method('setId')->with($customerId)->willReturnSelf();
-+        $this->_model->getDataModel();
-+        $this->assertEquals($customerDataObject, $this->_model->getDataModel());
-+    }
- }
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php
-index 658472d13ab..83915731ea5 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php
-@@ -15,7 +15,14 @@ use Magento\Framework\App\Cache\StateInterface;
- use Magento\Framework\App\CacheInterface;
- use Magento\Framework\Serialize\SerializerInterface;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Store\Model\StoreManagerInterface;
- 
-+/**
-+ * AttributeMetadataCache Test
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class AttributeMetadataCacheTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -43,6 +50,16 @@ class AttributeMetadataCacheTest extends \PHPUnit\Framework\TestCase
-      */
-     private $attributeMetadataCache;
- 
-+    /**
-+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $storeMock;
-+
-+    /**
-+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $storeManagerMock;
-+    
-     protected function setUp()
-     {
-         $objectManager = new ObjectManager($this);
-@@ -50,13 +67,18 @@ class AttributeMetadataCacheTest extends \PHPUnit\Framework\TestCase
-         $this->stateMock = $this->createMock(StateInterface::class);
-         $this->serializerMock = $this->createMock(SerializerInterface::class);
-         $this->attributeMetadataHydratorMock = $this->createMock(AttributeMetadataHydrator::class);
-+        $this->storeMock = $this->createMock(StoreInterface::class);
-+        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
-+        $this->storeManagerMock->method('getStore')->willReturn($this->storeMock);
-+        $this->storeMock->method('getId')->willReturn(1);
-         $this->attributeMetadataCache = $objectManager->getObject(
-             AttributeMetadataCache::class,
-             [
-                 'cache' => $this->cacheMock,
-                 'state' => $this->stateMock,
-                 'serializer' => $this->serializerMock,
--                'attributeMetadataHydrator' => $this->attributeMetadataHydratorMock
-+                'attributeMetadataHydrator' => $this->attributeMetadataHydratorMock,
-+                'storeManager' => $this->storeManagerMock
-             ]
-         );
-     }
-@@ -80,7 +102,8 @@ class AttributeMetadataCacheTest extends \PHPUnit\Framework\TestCase
-     {
-         $entityType = 'EntityType';
-         $suffix = 'none';
--        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
-+        $storeId = 1;
-+        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
-         $this->stateMock->expects($this->once())
-             ->method('isEnabled')
-             ->with(Type::TYPE_IDENTIFIER)
-@@ -96,7 +119,8 @@ class AttributeMetadataCacheTest extends \PHPUnit\Framework\TestCase
-     {
-         $entityType = 'EntityType';
-         $suffix = 'none';
--        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
-+        $storeId = 1;
-+        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
-         $serializedString = 'serialized string';
-         $attributeMetadataOneData = [
-             'attribute_code' => 'attribute_code',
-@@ -156,7 +180,8 @@ class AttributeMetadataCacheTest extends \PHPUnit\Framework\TestCase
-     {
-         $entityType = 'EntityType';
-         $suffix = 'none';
--        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
-+        $storeId = 1;
-+        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
-         $serializedString = 'serialized string';
-         $attributeMetadataOneData = [
-             'attribute_code' => 'attribute_code',
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
-index e4dc22ba40e..5b4b50ca821 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
-@@ -205,37 +205,32 @@ class AbstractDataTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Tests input validation rules.
-+     *
-      * @param null|string $value
-      * @param null|string $label
-      * @param null|string $inputValidation
-      * @param bool|array  $expectedOutput
-      * @dataProvider validateInputRuleDataProvider
-      */
--    public function testValidateInputRule($value, $label, $inputValidation, $expectedOutput)
-+    public function testValidateInputRule($value, $label, $inputValidation, $expectedOutput): void
-     {
-         $validationRule = $this->getMockBuilder(\Magento\Customer\Api\Data\ValidationRuleInterface::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['getName', 'getValue'])
-             ->getMockForAbstractClass();
--        $validationRule->expects($this->any())
--            ->method('getName')
--            ->will($this->returnValue('input_validation'));
--        $validationRule->expects($this->any())
--            ->method('getValue')
--            ->will($this->returnValue($inputValidation));
--
--        $this->_attributeMock->expects($this->any())->method('getStoreLabel')->will($this->returnValue($label));
--        $this->_attributeMock->expects(
--            $this->any()
--        )->method(
--            'getValidationRules'
--        )->will(
--            $this->returnValue(
--                [
--                    $validationRule,
--                ]
--            )
--        );
-+
-+        $validationRule->method('getName')
-+            ->willReturn('input_validation');
-+
-+        $validationRule->method('getValue')
-+            ->willReturn($inputValidation);
-+
-+        $this->_attributeMock->method('getStoreLabel')
-+            ->willReturn($label);
-+
-+        $this->_attributeMock->method('getValidationRules')
-+            ->willReturn([$validationRule]);
- 
-         $this->assertEquals($expectedOutput, $this->_model->validateInputRule($value));
-     }
-@@ -256,6 +251,16 @@ class AbstractDataTest extends \PHPUnit\Framework\TestCase
-                     \Zend_Validate_Alnum::NOT_ALNUM => '"mylabel" contains non-alphabetic or non-numeric characters.'
-                 ]
-             ],
-+            [
-+                'abc qaz',
-+                'mylabel',
-+                'alphanumeric',
-+                [
-+                    \Zend_Validate_Alnum::NOT_ALNUM => '"mylabel" contains non-alphabetic or non-numeric characters.'
-+                ]
-+            ],
-+            ['abcqaz', 'mylabel', 'alphanumeric', true],
-+            ['abc qaz', 'mylabel', 'alphanum-with-spaces', true],
-             [
-                 '!@#$',
-                 'mylabel',
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/DateTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/DateTest.php
-index 6329970e0ca..553efea38a8 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/DateTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/DateTest.php
-@@ -12,6 +12,9 @@ class DateTest extends AbstractFormTestCase
-     /** @var \Magento\Customer\Model\Metadata\Form\Date */
-     protected $date;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         parent::setUp();
-@@ -46,6 +49,9 @@ class DateTest extends AbstractFormTestCase
-         );
-     }
- 
-+    /**
-+     * Test extractValue
-+     */
-     public function testExtractValue()
-     {
-         $requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
-@@ -174,7 +180,7 @@ class DateTest extends AbstractFormTestCase
-         return [
-             [1, 1],
-             [false, false],
--            ['', null],
-+            [null, null],
-             ['test', 'test'],
-             [['element1', 'element2'], ['element1', 'element2']]
-         ];
-@@ -191,6 +197,9 @@ class DateTest extends AbstractFormTestCase
-         $this->assertSame($expected, $this->date->restoreValue($value));
-     }
- 
-+    /**
-+     * Test outputValue
-+     */
-     public function testOutputValue()
-     {
-         $this->assertEquals(null, $this->date->outputValue());
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
-index 0278e2b2d79..31d2a31ceae 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
-@@ -259,7 +259,7 @@ class ImageTest extends AbstractFormTestCase
-         )->getMockForAbstractClass();
-         $validationRuleMock->expects($this->any())
-             ->method('getName')
--            ->willReturn('max_image_heght');
-+            ->willReturn('max_image_height');
-         $validationRuleMock->expects($this->any())
-             ->method('getValue')
-             ->willReturn($maxImageHeight);
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php b/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
-index c655ff7056e..e67adc47b88 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Customer\Test\Unit\Model\Renderer;
- 
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+
- class RegionTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -58,6 +60,14 @@ class RegionTest extends \PHPUnit\Framework\TestCase
-                 ]
-             )
-         );
-+
-+        $objectManager = new ObjectManager($this);
-+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
-+        $reflection = new \ReflectionClass($elementMock);
-+        $reflection_property = $reflection->getProperty('_escaper');
-+        $reflection_property->setAccessible(true);
-+        $reflection_property->setValue($elementMock, $escaper);
-+
-         $formMock->expects(
-             $this->any()
-         )->method(
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/RelationTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/RelationTest.php
-index e81637cfb23..319179c5e27 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/RelationTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/RelationTest.php
-@@ -6,6 +6,7 @@
- namespace Magento\Customer\Test\Unit\Model\ResourceModel\Address;
- 
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Customer\Model\Address;
- 
- /**
-  * Class AddressTest
-@@ -40,7 +41,7 @@ class RelationTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testProcessRelation($addressId, $isDefaultBilling, $isDefaultShipping)
-     {
--        $addressModel = $this->createPartialMock(\Magento\Framework\Model\AbstractModel::class, [
-+        $addressModel = $this->createPartialMock(Address::class, [
-                 '__wakeup',
-                 'getId',
-                 'getEntityTypeId',
-@@ -55,7 +56,17 @@ class RelationTest extends \PHPUnit\Framework\TestCase
-             ]);
-         $customerModel = $this->createPartialMock(
-             \Magento\Customer\Model\Customer::class,
--            ['__wakeup', 'setDefaultBilling', 'setDefaultShipping', 'save', 'load', 'getResource', 'getId']
-+            [
-+                '__wakeup',
-+                'setDefaultBilling',
-+                'setDefaultShipping',
-+                'save',
-+                'load',
-+                'getResource',
-+                'getId',
-+                'getDefaultShippingAddress',
-+                'getDefaultBillingAddress'
-+            ]
-         );
-         $customerResource = $this->getMockForAbstractClass(
-             \Magento\Framework\Model\ResourceModel\Db\AbstractDb::class,
-@@ -88,6 +99,7 @@ class RelationTest extends \PHPUnit\Framework\TestCase
-         $this->customerFactoryMock->expects($this->any())
-             ->method('create')
-             ->willReturn($customerModel);
-+
-         if ($addressId && ($isDefaultBilling || $isDefaultShipping)) {
-             $customerId = 1;
-             $customerResource->expects($this->exactly(2))->method('getConnection')->willReturn($connectionMock);
-diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
-index bd1dc774b53..8032399e148 100644
---- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
-@@ -107,7 +107,7 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-             $this->createMock(\Magento\Customer\Model\ResourceModel\Customer::class);
-         $this->customerRegistry = $this->createMock(\Magento\Customer\Model\CustomerRegistry::class);
-         $this->dataObjectHelper = $this->createMock(\Magento\Framework\Api\DataObjectHelper::class);
--        $this->customerFactory  =
-+        $this->customerFactory =
-             $this->createPartialMock(\Magento\Customer\Model\CustomerFactory::class, ['create']);
-         $this->customerSecureFactory = $this->createPartialMock(
-             \Magento\Customer\Model\Data\CustomerSecureFactory::class,
-@@ -193,38 +193,10 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-     public function testSave()
-     {
-         $customerId = 1;
--        $storeId = 2;
- 
--        $region = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\RegionInterface::class, [], '', false);
--        $address = $this->getMockForAbstractClass(
--            \Magento\Customer\Api\Data\AddressInterface::class,
--            [],
--            '',
--            false,
--            false,
--            true,
-+        $customerModel = $this->createPartialMock(
-+            \Magento\Customer\Model\Customer::class,
-             [
--                'setCustomerId',
--                'setRegion',
--                'getRegion',
--                'getId'
--            ]
--        );
--        $address2 = $this->getMockForAbstractClass(
--            \Magento\Customer\Api\Data\AddressInterface::class,
--            [],
--            '',
--            false,
--            false,
--            true,
--            [
--                'setCustomerId',
--                'setRegion',
--                'getRegion',
--                'getId'
--            ]
--        );
--        $customerModel = $this->createPartialMock(\Magento\Customer\Model\Customer::class, [
-                 'getId',
-                 'setId',
-                 'setStoreId',
-@@ -239,14 +211,11 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-                 'setFirstFailure',
-                 'setLockExpires',
-                 'save',
--            ]);
-+            ]
-+        );
- 
-         $origCustomer = $this->customer;
- 
--        $this->customer->expects($this->atLeastOnce())
--            ->method('__toArray')
--            ->willReturn(['default_billing', 'default_shipping']);
--
-         $customerAttributesMetaData = $this->getMockForAbstractClass(
-             \Magento\Framework\Api\CustomAttributesDataInterface::class,
-             [],
-@@ -262,17 +231,23 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-                 'setAddresses'
-             ]
-         );
--        $customerSecureData = $this->createPartialMock(\Magento\Customer\Model\Data\CustomerSecure::class, [
--                'getRpToken',
--                'getRpTokenCreatedAt',
--                'getPasswordHash',
--                'getFailuresNum',
--                'getFirstFailure',
--                'getLockExpires',
--            ]);
-+        $customerSecureData = $this->createPartialMock(
-+            \Magento\Customer\Model\Data\CustomerSecure::class,
-+            [
-+            'getRpToken',
-+            'getRpTokenCreatedAt',
-+            'getPasswordHash',
-+            'getFailuresNum',
-+            'getFirstFailure',
-+            'getLockExpires',
-+            ]
-+        );
-         $this->customer->expects($this->atLeastOnce())
-             ->method('getId')
-             ->willReturn($customerId);
-+        $this->customer->expects($this->atLeastOnce())
-+            ->method('__toArray')
-+            ->willReturn([]);
-         $this->customerRegistry->expects($this->atLeastOnce())
-             ->method('retrieve')
-             ->with($customerId)
-@@ -287,28 +262,6 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->customerRegistry->expects($this->atLeastOnce())
-             ->method("remove")
-             ->with($customerId);
--        $address->expects($this->once())
--            ->method('setCustomerId')
--            ->with($customerId)
--            ->willReturnSelf();
--        $address->expects($this->once())
--            ->method('getRegion')
--            ->willReturn($region);
--        $address->expects($this->atLeastOnce())
--            ->method('getId')
--            ->willReturn(7);
--        $address->expects($this->once())
--            ->method('setRegion')
--            ->with($region);
--        $customerAttributesMetaData->expects($this->atLeastOnce())
--            ->method('getAddresses')
--            ->willReturn([$address]);
--        $customerAttributesMetaData->expects($this->at(1))
--            ->method('setAddresses')
--            ->with([]);
--        $customerAttributesMetaData->expects($this->at(2))
--            ->method('setAddresses')
--            ->with([$address]);
-         $this->extensibleDataObjectConverter->expects($this->once())
-             ->method('toNestedArray')
-             ->with($customerAttributesMetaData, [], \Magento\Customer\Api\Data\CustomerInterface::class)
-@@ -320,26 +273,9 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $customerModel->expects($this->once())
-             ->method('getStoreId')
-             ->willReturn(null);
--        $store = $this->createMock(\Magento\Store\Model\Store::class);
--        $store->expects($this->once())
--            ->method('getId')
--            ->willReturn($storeId);
--        $this->storeManager
--            ->expects($this->once())
--            ->method('getStore')
--            ->willReturn($store);
--        $customerModel->expects($this->once())
--            ->method('setStoreId')
--            ->with($storeId);
-         $customerModel->expects($this->once())
-             ->method('setId')
-             ->with($customerId);
--        $customerModel->expects($this->once())
--            ->method('getAttributeSetId')
--            ->willReturn(null);
--        $customerModel->expects($this->once())
--            ->method('setAttributeSetId')
--            ->with(\Magento\Customer\Api\CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER);
-         $customerAttributesMetaData->expects($this->atLeastOnce())
-             ->method('getId')
-             ->willReturn($customerId);
-@@ -368,16 +304,20 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
- 
-         $customerModel->expects($this->once())
-             ->method('setRpToken')
--            ->willReturnMap([
-+            ->willReturnMap(
-+                [
-                 ['rpToken', $customerModel],
-                 [null, $customerModel],
--            ]);
-+                ]
-+            );
-         $customerModel->expects($this->once())
-             ->method('setRpTokenCreatedAt')
--            ->willReturnMap([
-+            ->willReturnMap(
-+                [
-                 ['rpTokenCreatedAt', $customerModel],
-                 [null, $customerModel],
--            ]);
-+                ]
-+            );
- 
-         $customerModel->expects($this->once())
-             ->method('setPasswordHash')
-@@ -399,12 +339,6 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->customerRegistry->expects($this->once())
-             ->method('push')
-             ->with($customerModel);
--        $this->customer->expects($this->once())
--            ->method('getAddresses')
--            ->willReturn([$address, $address2]);
--        $this->addressRepository->expects($this->once())
--            ->method('save')
--            ->with($address);
-         $customerAttributesMetaData->expects($this->once())
-             ->method('getEmail')
-             ->willReturn('example@example.com');
-@@ -435,71 +369,37 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-     public function testSaveWithPasswordHash()
-     {
-         $customerId = 1;
--        $storeId = 2;
-         $passwordHash = 'ukfa4sdfa56s5df02asdf4rt';
- 
--        $customerSecureData = $this->createPartialMock(\Magento\Customer\Model\Data\CustomerSecure::class, [
--                'getRpToken',
--                'getRpTokenCreatedAt',
--                'getPasswordHash',
--                'getFailuresNum',
--                'getFirstFailure',
--                'getLockExpires',
--            ]);
--        $region = $this->getMockForAbstractClass(
--            \Magento\Customer\Api\Data\RegionInterface::class,
--            [],
--            '',
--            false
--        );
--        $address = $this->getMockForAbstractClass(
--            \Magento\Customer\Api\Data\AddressInterface::class,
--            [],
--            '',
--            false,
--            false,
--            true,
-+        $customerSecureData = $this->createPartialMock(
-+            \Magento\Customer\Model\Data\CustomerSecure::class,
-             [
--                'setCustomerId',
--                'setRegion',
--                'getRegion',
--                'getId'
-+            'getRpToken',
-+            'getRpTokenCreatedAt',
-+            'getPasswordHash',
-+            'getFailuresNum',
-+            'getFirstFailure',
-+            'getLockExpires',
-             ]
-         );
--        $address2 = $this->getMockForAbstractClass(
--            \Magento\Customer\Api\Data\AddressInterface::class,
--            [],
--            '',
--            false,
--            false,
--            true,
-+        $origCustomer = $this->customer;
-+
-+        $customerModel = $this->createPartialMock(
-+            \Magento\Customer\Model\Customer::class,
-             [
--                'setCustomerId',
--                'setRegion',
--                'getRegion',
--                'getId'
-+            'getId',
-+            'setId',
-+            'setStoreId',
-+            'getStoreId',
-+            'getAttributeSetId',
-+            'setAttributeSetId',
-+            'setRpToken',
-+            'setRpTokenCreatedAt',
-+            'getDataModel',
-+            'setPasswordHash',
-+            'save',
-             ]
-         );
--
--        $origCustomer = $this->customer;
--
--        $this->customer->expects($this->atLeastOnce())
--            ->method('__toArray')
--            ->willReturn(['default_billing', 'default_shipping']);
--
--        $customerModel = $this->createPartialMock(\Magento\Customer\Model\Customer::class, [
--                'getId',
--                'setId',
--                'setStoreId',
--                'getStoreId',
--                'getAttributeSetId',
--                'setAttributeSetId',
--                'setRpToken',
--                'setRpTokenCreatedAt',
--                'getDataModel',
--                'setPasswordHash',
--                'save',
--            ]);
-         $customerAttributesMetaData = $this->getMockForAbstractClass(
-             \Magento\Framework\Api\CustomAttributesDataInterface::class,
-             [],
-@@ -550,10 +450,12 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $customerSecureData->expects($this->once())
-             ->method('getLockExpires')
-             ->willReturn('lockExpires');
--
-         $this->customer->expects($this->atLeastOnce())
-             ->method('getId')
-             ->willReturn($customerId);
-+        $this->customer->expects($this->atLeastOnce())
-+            ->method('__toArray')
-+            ->willReturn([]);
-         $this->customerRegistry->expects($this->atLeastOnce())
-             ->method('retrieve')
-             ->with($customerId)
-@@ -565,28 +467,6 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-             ->method('save')
-             ->with($this->customer, CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, $this->customer)
-             ->willReturn($customerAttributesMetaData);
--        $address->expects($this->once())
--            ->method('setCustomerId')
--            ->with($customerId)
--            ->willReturnSelf();
--        $address->expects($this->once())
--            ->method('getRegion')
--            ->willReturn($region);
--        $address->expects($this->atLeastOnce())
--            ->method('getId')
--            ->willReturn(7);
--        $address->expects($this->once())
--            ->method('setRegion')
--            ->with($region);
--        $customerAttributesMetaData->expects($this->any())
--            ->method('getAddresses')
--            ->willReturn([$address]);
--        $customerAttributesMetaData->expects($this->at(1))
--            ->method('setAddresses')
--            ->with([]);
--        $customerAttributesMetaData->expects($this->at(2))
--            ->method('setAddresses')
--            ->with([$address]);
-         $customerAttributesMetaData
-             ->expects($this->atLeastOnce())
-             ->method('getId')
-@@ -599,29 +479,9 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-             ->method('create')
-             ->with(['data' => ['customerData']])
-             ->willReturn($customerModel);
--        $customerModel->expects($this->once())
--            ->method('getStoreId')
--            ->willReturn(null);
--        $store = $this->createMock(\Magento\Store\Model\Store::class);
--        $store->expects($this->once())
--            ->method('getId')
--            ->willReturn($storeId);
--        $this->storeManager
--            ->expects($this->once())
--            ->method('getStore')
--            ->willReturn($store);
--        $customerModel->expects($this->once())
--            ->method('setStoreId')
--            ->with($storeId);
-         $customerModel->expects($this->once())
-             ->method('setId')
-             ->with($customerId);
--        $customerModel->expects($this->once())
--            ->method('getAttributeSetId')
--            ->willReturn(null);
--        $customerModel->expects($this->once())
--            ->method('setAttributeSetId')
--            ->with(\Magento\Customer\Api\CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER);
-         $customerModel->expects($this->atLeastOnce())
-             ->method('getId')
-             ->willReturn($customerId);
-@@ -630,12 +490,6 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->customerRegistry->expects($this->once())
-             ->method('push')
-             ->with($customerModel);
--        $this->customer->expects($this->any())
--            ->method('getAddresses')
--            ->willReturn([$address, $address2]);
--        $this->addressRepository->expects($this->once())
--            ->method('save')
--            ->with($address);
-         $customerAttributesMetaData->expects($this->once())
-             ->method('getEmail')
-             ->willReturn('example@example.com');
-@@ -752,7 +606,7 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-             ->willReturnSelf();
-         $collection->expects($this->at(7))
-             ->method('joinAttribute')
--            ->with('company', 'customer_address/company', 'default_billing', null, 'left')
-+            ->with('billing_company', 'customer_address/company', 'default_billing', null, 'left')
-             ->willReturnSelf();
-         $this->collectionProcessorMock->expects($this->once())
-             ->method('process')
-diff --git a/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php
-index 8971f155f78..188bbde71c1 100644
---- a/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php
-@@ -7,6 +7,9 @@ namespace Magento\Customer\Test\Unit\Observer;
- 
- use Magento\Customer\Observer\UpgradeCustomerPasswordObserver;
- 
-+/**
-+ * Class UpgradeCustomerPasswordObserverTest for testing upgrade password observer
-+ */
- class UpgradeCustomerPasswordObserverTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -29,9 +32,13 @@ class UpgradeCustomerPasswordObserverTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $customerRegistry;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
--        $this->customerRepository = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
-+        $this->customerRepository = $this
-+            ->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
-             ->getMockForAbstractClass();
-         $this->customerRegistry = $this->getMockBuilder(\Magento\Customer\Model\CustomerRegistry::class)
-             ->disableOriginalConstructor()
-@@ -47,6 +54,9 @@ class UpgradeCustomerPasswordObserverTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * Unit test for verifying customers password upgrade observer
-+     */
-     public function testUpgradeCustomerPassword()
-     {
-         $customerId = '1';
-@@ -57,6 +67,8 @@ class UpgradeCustomerPasswordObserverTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(['getId'])
-             ->getMock();
-         $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-+            ->setMethods(['setData'])
-+            ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
-         $customerSecure = $this->getMockBuilder(\Magento\Customer\Model\Data\CustomerSecure::class)
-             ->disableOriginalConstructor()
-diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
-index 1d7905cca79..a9c6de72acb 100644
---- a/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
-@@ -175,7 +175,7 @@ class DocumentTest extends \PHPUnit\Framework\TestCase
-         $this->document->setData('original_website_id', $websiteId);
- 
-         $this->scopeConfig->expects(static::once())
--            ->method('getValue')
-+            ->method('isSetFlag')
-             ->with()
-             ->willReturn(true);
- 
-diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Form/AddressFieldsetTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Form/AddressFieldsetTest.php
-new file mode 100644
-index 00000000000..65a0443aed8
---- /dev/null
-+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Form/AddressFieldsetTest.php
-@@ -0,0 +1,69 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Test\Unit\Ui\Component\Form;
-+
-+use Magento\Customer\Ui\Component\Form\AddressFieldset;
-+use Magento\Framework\View\Element\UiComponent\ContextInterface;
-+
-+/**
-+ * Test for class \Magento\Customer\Ui\Component\Form\AddressFieldset
-+ */
-+class AddressFieldsetTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var AddressFieldset
-+     */
-+    protected $fieldset;
-+
-+    /**
-+     * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $context;
-+
-+    /**
-+     * Set up
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->context = $this->getMockForAbstractClass(
-+            \Magento\Framework\View\Element\UiComponent\ContextInterface::class
-+        );
-+        $this->fieldset = new AddressFieldset(
-+            $this->context,
-+            [],
-+            []
-+        );
-+    }
-+
-+    /**
-+     * Run test for canShow() method
-+     *
-+     * @return void
-+     *
-+     */
-+    public function testCanShow()
-+    {
-+        $this->context->expects($this->atLeastOnce())->method('getRequestParam')->with('id')
-+            ->willReturn(1);
-+        $this->assertTrue($this->fieldset->isComponentVisible());
-+    }
-+
-+    /**
-+     * Run test for canShow() method without customer id in context
-+     *
-+     * @return void
-+     *
-+     */
-+    public function testCanShowWithoutId()
-+    {
-+        $this->context->expects($this->atLeastOnce())->method('getRequestParam')->with('id')
-+            ->willReturn(null);
-+        $this->assertEquals(false, $this->fieldset->isComponentVisible());
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php
-deleted file mode 100644
-index fdd841ea88c..00000000000
---- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php
-+++ /dev/null
-@@ -1,141 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--declare(strict_types=1);
--
--namespace Magento\Customer\Test\Unit\Ui\Component\Listing\Column;
--
--use Magento\Customer\Ui\Component\Listing\Column\GroupActions;
--use Magento\Framework\Escaper;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
--use Magento\Framework\UrlInterface;
--use Magento\Framework\View\Element\UiComponent\ContextInterface;
--use Magento\Framework\View\Element\UiComponent\Processor;
--use PHPUnit_Framework_MockObject_MockObject as MockObject;
--
--/**
-- * GroupActionsTest contains unit tests for \Magento\Customer\Ui\Component\Listing\Column\GroupActions class
-- */
--class GroupActionsTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var GroupActions
--     */
--    protected $groupActions;
--
--    /**
--     * @var Escaper|MockObject
--     */
--    protected $escaper;
--
--    /**
--     * @var UrlInterface|MockObject
--     */
--    protected $urlBuilder;
--
--    /**
--     * SetUp method
--     *
--     * @return void
--     */
--    protected function setUp()
--    {
--        $objectManager = new ObjectManager($this);
--
--        $context = $this->createMock(ContextInterface::class);
--
--        $processor = $this->getMockBuilder(Processor::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $context->expects(static::never())
--            ->method('getProcessor')
--            ->willReturn($processor);
--
--        $this->urlBuilder = $this->createMock(UrlInterface::class);
--
--        $this->escaper = $this->getMockBuilder(Escaper::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['escapeHtml'])
--            ->getMock();
--
--        $this->groupActions = $objectManager->getObject(GroupActions::class, [
--            'context' => $context,
--            'urlBuilder' => $this->urlBuilder,
--            'escaper' => $this->escaper,
--        ]);
--    }
--
--    /**
--     * @covers \Magento\Customer\Ui\Component\Listing\Column\GroupActions::prepareDataSource
--     */
--    public function testPrepareDataSource()
--    {
--        $groupId = 1;
--        $groupCode = 'group code';
--        $items = [
--            'data' => [
--                'items' => [
--                    [
--                        'customer_group_id' => $groupId,
--                        'customer_group_code' => $groupCode
--                    ]
--                ]
--            ]
--        ];
--        $name = 'item_name';
--        $expectedItems = [
--            [
--                'customer_group_id' => $groupId,
--                'customer_group_code' => $groupCode,
--                $name => [
--                    'edit' => [
--                        'href' => 'test/url/edit',
--                        'label' => __('Edit'),
--                    ],
--                    'delete' => [
--                        'href' => 'test/url/delete',
--                        'label' => __('Delete'),
--                        'confirm' => [
--                            'title' => __('Delete %1', $groupCode),
--                            'message' => __('Are you sure you want to delete a %1 record?', $groupCode)
--                        ],
--                    ]
--                ],
--            ]
--        ];
--
--        $this->escaper->expects(static::once())
--            ->method('escapeHtml')
--            ->with($groupCode)
--            ->willReturn($groupCode);
--
--        $this->urlBuilder->expects(static::exactly(2))
--            ->method('getUrl')
--            ->willReturnMap(
--                [
--                    [
--                        GroupActions::URL_PATH_EDIT,
--                        [
--                            'id' => $groupId
--                        ],
--                        'test/url/edit',
--                    ],
--                    [
--                        GroupActions::URL_PATH_DELETE,
--                        [
--                            'id' => $groupId
--                        ],
--                        'test/url/delete',
--                    ],
--                ]
--            );
--
--        $this->groupActions->setData('name', $name);
--
--        $actual = $this->groupActions->prepareDataSource($items);
--        static::assertEquals($expectedItems, $actual['data']['items']);
--    }
--}
-diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
-index 130b3acd11e..07b0a760432 100644
---- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
-+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
-@@ -18,12 +18,6 @@ class ValidationRulesTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
--        $this->validationRules = $this->getMockBuilder(
--            \Magento\Customer\Ui\Component\Listing\Column\ValidationRules::class
--        )
--            ->disableOriginalConstructor()
--            ->getMock();
--
-         $this->validationRule = $this->getMockBuilder(\Magento\Customer\Api\Data\ValidationRuleInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-@@ -31,20 +25,26 @@ class ValidationRulesTest extends \PHPUnit\Framework\TestCase
-         $this->validationRules = new ValidationRules();
-     }
- 
--    public function testGetValidationRules()
-+    /**
-+     * Tests input validation rules
-+     *
-+     * @param String $validationRule - provided input validation rules
-+     * @param String $validationClass - expected input validation class
-+     * @dataProvider validationRulesDataProvider
-+     */
-+    public function testGetValidationRules(String $validationRule, String $validationClass): void
-     {
-         $expectsRules = [
-             'required-entry' => true,
--            'validate-number' => true,
-+            $validationClass => true,
-         ];
--        $this->validationRule->expects($this->atLeastOnce())
--            ->method('getName')
-+        $this->validationRule->method('getName')
-             ->willReturn('input_validation');
--        $this->validationRule->expects($this->atLeastOnce())
--            ->method('getValue')
--            ->willReturn('numeric');
- 
--        $this->assertEquals(
-+        $this->validationRule->method('getValue')
-+            ->willReturn($validationRule);
-+
-+        self::assertEquals(
-             $expectsRules,
-             $this->validationRules->getValidationRules(
-                 true,
-@@ -56,6 +56,23 @@ class ValidationRulesTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * Provides possible validation rules.
-+     *
-+     * @return array
-+     */
-+    public function validationRulesDataProvider(): array
-+    {
-+        return [
-+            ['alpha', 'validate-alpha'],
-+            ['numeric', 'validate-number'],
-+            ['alphanumeric', 'validate-alphanum'],
-+            ['alphanum-with-spaces', 'validate-alphanum-with-spaces'],
-+            ['url', 'validate-url'],
-+            ['email', 'validate-email']
-+        ];
-+    }
-+
-     public function testGetValidationRulesWithOnlyRequiredRule()
-     {
-         $expectsRules = [
-diff --git a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
-index a9a5c5b1774..468a9e7946f 100644
---- a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
-+++ b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
-@@ -72,6 +72,7 @@ class Document extends \Magento\Framework\View\Element\UiComponent\DataProvider\
- 
-     /**
-      * Document constructor.
-+     *
-      * @param AttributeValueFactory $attributeValueFactory
-      * @param GroupRepositoryInterface $groupRepository
-      * @param CustomerMetadataInterface $customerMetadata
-@@ -118,9 +119,10 @@ class Document extends \Magento\Framework\View\Element\UiComponent\DataProvider\
-     }
- 
-     /**
--     * Update customer gender value
--     * Method set gender label instead of id value
-+     * Update customer gender value. Method set gender label instead of id value
-+     *
-      * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     private function setGenderValue()
-     {
-@@ -141,9 +143,10 @@ class Document extends \Magento\Framework\View\Element\UiComponent\DataProvider\
-     }
- 
-     /**
--     * Update customer group value
--     * Method set group code instead id value
-+     * Update customer group value. Method set group code instead id value
-+     *
-      * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     private function setCustomerGroupValue()
-     {
-@@ -157,8 +160,8 @@ class Document extends \Magento\Framework\View\Element\UiComponent\DataProvider\
-     }
- 
-     /**
--     * Update website value
--     * Method set website name instead id value
-+     * Update website value. Method set website name instead id value
-+     *
-      * @return void
-      */
-     private function setWebsiteValue()
-@@ -170,22 +173,22 @@ class Document extends \Magento\Framework\View\Element\UiComponent\DataProvider\
-     }
- 
-     /**
--     * Update confirmation value
--     * Method set confirmation text value to match what is shown in grid
-+     * Update confirmation value. Method set confirmation text value to match what is shown in grid
-+     *
-      * @return void
-      */
-     private function setConfirmationValue()
-     {
-         $value = $this->getData(self::$confirmationAttributeCode);
-         $websiteId = $this->getData(self::$websiteIdAttributeCode) ?: $this->getData(self::$websiteAttributeCode);
--        $isConfirmationRequired = (bool)$this->scopeConfig->getValue(
-+        $isConfirmRequired = $this->scopeConfig->isSetFlag(
-             AccountManagement::XML_PATH_IS_CONFIRM,
-             ScopeInterface::SCOPE_WEBSITES,
-             $websiteId
-         );
- 
-         $valueText = __('Confirmation Not Required');
--        if ($isConfirmationRequired) {
-+        if ($isConfirmRequired) {
-             $valueText = $value === null ? __('Confirmed') : __('Confirmation Required');
-         }
- 
-@@ -193,8 +196,8 @@ class Document extends \Magento\Framework\View\Element\UiComponent\DataProvider\
-     }
- 
-     /**
--     * Update lock expires value
--     * Method set account lock text value to match what is shown in grid
-+     * Update lock expires value. Method set account lock text value to match what is shown in grid
-+     *
-      * @return void
-      */
-     private function setAccountLockValue()
-diff --git a/app/code/Magento/Customer/Ui/Component/Form/AddressFieldset.php b/app/code/Magento/Customer/Ui/Component/Form/AddressFieldset.php
-new file mode 100644
-index 00000000000..3e3a6e74166
---- /dev/null
-+++ b/app/code/Magento/Customer/Ui/Component/Form/AddressFieldset.php
-@@ -0,0 +1,46 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Ui\Component\Form;
-+
-+use Magento\Framework\View\Element\UiComponent\ContextInterface;
-+use Magento\Framework\View\Element\ComponentVisibilityInterface;
-+
-+/**
-+ * Customer addresses fieldset class
-+ */
-+class AddressFieldset extends \Magento\Ui\Component\Form\Fieldset implements ComponentVisibilityInterface
-+{
-+    /**
-+     * @param ContextInterface $context
-+     * @param array $components
-+     * @param array $data
-+     */
-+    public function __construct(
-+        ContextInterface $context,
-+        array $components = [],
-+        array $data = []
-+    ) {
-+        $this->context = $context;
-+
-+        parent::__construct($context, $components, $data);
-+    }
-+
-+    /**
-+     * Can show customer addresses tab in tabs or not
-+     *
-+     * Will return false for not registered customer in a case when admin user created new customer account.
-+     * Needed to hide addresses tab from create new customer page
-+     *
-+     * @return boolean
-+     */
-+    public function isComponentVisible(): bool
-+    {
-+        $customerId = $this->context->getRequestParam('id');
-+        return (bool)$customerId;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Actions.php b/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Actions.php
-new file mode 100644
-index 00000000000..6d1d7472a79
---- /dev/null
-+++ b/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Actions.php
-@@ -0,0 +1,128 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Ui\Component\Listing\Address\Column;
-+
-+use Magento\Framework\View\Element\UiComponent\ContextInterface;
-+use Magento\Framework\View\Element\UiComponentFactory;
-+use Magento\Ui\Component\Listing\Columns\Column;
-+use Magento\Framework\UrlInterface;
-+
-+/**
-+ * Prepare actions column for customer addresses grid
-+ */
-+class Actions extends Column
-+{
-+    const CUSTOMER_ADDRESS_PATH_DELETE = 'customer/address/delete';
-+    const CUSTOMER_ADDRESS_PATH_DEFAULT_SHIPPING = 'customer/address/defaultShippingAddress';
-+    const CUSTOMER_ADDRESS_PATH_DEFAULT_BILLING = 'customer/address/defaultBillingAddress';
-+
-+    /**
-+     * @var UrlInterface
-+     */
-+    private $urlBuilder;
-+
-+    /**
-+     * @param ContextInterface $context
-+     * @param UiComponentFactory $uiComponentFactory
-+     * @param UrlInterface $urlBuilder
-+     * @param array $components
-+     * @param array $data
-+     */
-+    public function __construct(
-+        ContextInterface $context,
-+        UiComponentFactory $uiComponentFactory,
-+        UrlInterface $urlBuilder,
-+        array $components = [],
-+        array $data = []
-+    ) {
-+        $this->urlBuilder = $urlBuilder;
-+        parent::__construct($context, $uiComponentFactory, $components, $data);
-+    }
-+
-+    /**
-+     * Prepare Data Source
-+     *
-+     * @param array $dataSource
-+     * @return array
-+     */
-+    public function prepareDataSource(array $dataSource): array
-+    {
-+        if (isset($dataSource['data']['items'])) {
-+            foreach ($dataSource['data']['items'] as &$item) {
-+                $name = $this->getData('name');
-+                if (isset($item['entity_id'])) {
-+                    $item[$name]['edit'] = [
-+                        'callback' => [
-+                            [
-+                                'provider' => 'customer_form.areas.address.address'
-+                                    . '.customer_address_update_modal.update_customer_address_form_loader',
-+                                'target' => 'destroyInserted',
-+                            ],
-+                            [
-+                                'provider' => 'customer_form.areas.address.address'
-+                                    . '.customer_address_update_modal',
-+                                'target' => 'openModal',
-+                            ],
-+                            [
-+                                'provider' => 'customer_form.areas.address.address'
-+                                    . '.customer_address_update_modal.update_customer_address_form_loader',
-+                                'target' => 'render',
-+                                'params' => [
-+                                    'entity_id' => $item['entity_id'],
-+                                ],
-+                            ]
-+                        ],
-+                        'href' => '#',
-+                        'label' => __('Edit'),
-+                        'hidden' => false,
-+                    ];
-+
-+                    $item[$name]['setDefaultBilling'] = [
-+                        'href' => $this->urlBuilder->getUrl(
-+                            self::CUSTOMER_ADDRESS_PATH_DEFAULT_BILLING,
-+                            ['parent_id' => $item['parent_id'], 'id' => $item['entity_id']]
-+                        ),
-+                        'label' => __('Set as default billing'),
-+                        'isAjax' => true,
-+                        'confirm' => [
-+                            'title' => __('Set address as default billing'),
-+                            'message' => __('Are you sure you want to set the address as default billing address?')
-+                        ]
-+                    ];
-+
-+                    $item[$name]['setDefaultShipping'] = [
-+                        'href' => $this->urlBuilder->getUrl(
-+                            self::CUSTOMER_ADDRESS_PATH_DEFAULT_SHIPPING,
-+                            ['parent_id' => $item['parent_id'], 'id' => $item['entity_id']]
-+                        ),
-+                        'label' => __('Set as default shipping'),
-+                        'isAjax' => true,
-+                        'confirm' => [
-+                            'title' => __('Set address as default shipping'),
-+                            'message' => __('Are you sure you want to set the address as default shipping address?')
-+                        ]
-+                    ];
-+
-+                    $item[$name]['delete'] = [
-+                        'href' => $this->urlBuilder->getUrl(
-+                            self::CUSTOMER_ADDRESS_PATH_DELETE,
-+                            ['parent_id' => $item['parent_id'], 'id' => $item['entity_id']]
-+                        ),
-+                        'label' => __('Delete'),
-+                        'isAjax' => true,
-+                        'confirm' => [
-+                            'title' => __('Delete address'),
-+                            'message' => __('Are you sure you want to delete the address?')
-+                        ]
-+                    ];
-+                }
-+            }
-+        }
-+
-+        return $dataSource;
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Countries.php b/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Countries.php
-new file mode 100644
-index 00000000000..d05d5d1c592
---- /dev/null
-+++ b/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Countries.php
-@@ -0,0 +1,41 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Ui\Component\Listing\Address\Column;
-+
-+use Magento\Framework\Data\OptionSourceInterface;
-+
-+/**
-+ * Class for process countries in customer addresses grid
-+ */
-+class Countries implements OptionSourceInterface
-+{
-+    /**
-+     * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory
-+     */
-+    private $countryCollectionFactory;
-+
-+    /**
-+     * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $collectionFactory
-+     */
-+    public function __construct(
-+        \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $collectionFactory
-+    ) {
-+        $this->countryCollectionFactory = $collectionFactory;
-+    }
-+
-+    /**
-+     * Get list of countries with country id as value and code as label
-+     *
-+     * @return array
-+     */
-+    public function toOptionArray(): array
-+    {
-+        /** @var \Magento\Directory\Model\ResourceModel\Country\Collection $countryCollection */
-+        $countryCollection = $this->countryCollectionFactory->create();
-+        return $countryCollection->toOptionArray();
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php b/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php
-new file mode 100644
-index 00000000000..c70e25ee99e
---- /dev/null
-+++ b/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php
-@@ -0,0 +1,113 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Customer\Ui\Component\Listing\Address;
-+
-+use Magento\Customer\Model\ResourceModel\Address\Grid\CollectionFactory;
-+use Magento\Directory\Model\CountryFactory;
-+use Magento\Framework\Api\Filter;
-+
-+/**
-+ * Custom DataProvider for customer addresses listing
-+ */
-+class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-+{
-+    /**
-+     * @var \Magento\Framework\App\RequestInterface $request,
-+     */
-+    private $request;
-+
-+    /**
-+     * @var CountryFactory
-+     */
-+    private $countryDirectory;
-+
-+    /**
-+     * @param string $name
-+     * @param string $primaryFieldName
-+     * @param string $requestFieldName
-+     * @param CollectionFactory $collectionFactory
-+     * @param \Magento\Framework\App\RequestInterface $request
-+     * @param CountryFactory $countryFactory
-+     * @param array $meta
-+     * @param array $data
-+     */
-+    public function __construct(
-+        $name,
-+        $primaryFieldName,
-+        $requestFieldName,
-+        CollectionFactory $collectionFactory,
-+        \Magento\Framework\App\RequestInterface $request,
-+        CountryFactory $countryFactory,
-+        array $meta = [],
-+        array $data = []
-+    ) {
-+        parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
-+        $this->collection = $collectionFactory->create();
-+        $this->countryDirectory = $countryFactory->create();
-+        $this->request = $request;
-+    }
-+
-+    /**
-+     * Add country key for default billing/shipping blocks on customer addresses tab
-+     *
-+     * @return array
-+     */
-+    public function getData(): array
-+    {
-+        $collection = $this->getCollection();
-+        $data['items'] = [];
-+        if ($this->request->getParam('parent_id')) {
-+            $collection->addFieldToFilter('parent_id', $this->request->getParam('parent_id'));
-+            $data = $collection->toArray();
-+        }
-+        foreach ($data['items'] as $key => $item) {
-+            if (isset($item['country_id']) && !isset($item['country'])) {
-+                $data['items'][$key]['country'] = $this->countryDirectory->loadByCode($item['country_id'])->getName();
-+            }
-+        }
-+
-+        return $data;
-+    }
-+
-+    /**
-+     * Add full text search filter to collection
-+     *
-+     * @param Filter $filter
-+     * @return void
-+     */
-+    public function addFilter(Filter $filter): void
-+    {
-+        if ($filter->getField() !== 'fulltext') {
-+            $this->collection->addFieldToFilter(
-+                $filter->getField(),
-+                [$filter->getConditionType() => $filter->getValue()]
-+            );
-+        } else {
-+            $value = trim($filter->getValue());
-+            $this->collection->addFieldToFilter(
-+                [
-+                    ['attribute' => 'firstname'],
-+                    ['attribute' => 'lastname'],
-+                    ['attribute' => 'street'],
-+                    ['attribute' => 'city'],
-+                    ['attribute' => 'region'],
-+                    ['attribute' => 'postcode'],
-+                    ['attribute' => 'telephone']
-+                ],
-+                [
-+                    ['like' => "%{$value}%"],
-+                    ['like' => "%{$value}%"],
-+                    ['like' => "%{$value}%"],
-+                    ['like' => "%{$value}%"],
-+                    ['like' => "%{$value}%"],
-+                    ['like' => "%{$value}%"],
-+                    ['like' => "%{$value}%"],
-+                    ['like' => "%{$value}%"],
-+                ]
-+            );
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
-index a8a3429ebad..00c5f99fab4 100644
---- a/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
-+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
-@@ -98,7 +98,8 @@ class GroupActions extends Column
-                         'confirm' => [
-                             'title' => __('Delete %1', $title),
-                             'message' => __('Are you sure you want to delete a %1 record?', $title)
--                        ]
-+                        ],
-+                        'post' => true
-                     ];
-                 }
-             }
-diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
-index b8f83421a6d..6befec8e942 100644
---- a/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
-+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
-@@ -7,6 +7,9 @@ namespace Magento\Customer\Ui\Component\Listing\Column;
- 
- use Magento\Customer\Api\Data\ValidationRuleInterface;
- 
-+/**
-+ * Provides validation classes according to corresponding rules.
-+ */
- class ValidationRules
- {
-     /**
-@@ -16,6 +19,7 @@ class ValidationRules
-         'alpha' => 'validate-alpha',
-         'numeric' => 'validate-number',
-         'alphanumeric' => 'validate-alphanum',
-+        'alphanum-with-spaces' => 'validate-alphanum-with-spaces',
-         'url' => 'validate-url',
-         'email' => 'validate-email',
-     ];
-diff --git a/app/code/Magento/Customer/etc/acl.xml b/app/code/Magento/Customer/etc/acl.xml
-index e8e6219bef4..1583c190d5c 100644
---- a/app/code/Magento/Customer/etc/acl.xml
-+++ b/app/code/Magento/Customer/etc/acl.xml
-@@ -10,7 +10,13 @@
-         <resources>
-             <resource id="Magento_Backend::admin">
-                 <resource id="Magento_Customer::customer" title="Customers" translate="title" sortOrder="40">
--                    <resource id="Magento_Customer::manage" title="All Customers" translate="title" sortOrder="10" />
-+                    <resource id="Magento_Customer::manage" title="All Customers" translate="title" sortOrder="10">
-+                        <resource id="Magento_Customer::actions" title="Actions" translate="title" sortOrder="10">
-+                            <resource id="Magento_Customer::delete" title="Delete" translate="title" sortOrder="10" />
-+                            <resource id="Magento_Customer::reset_password" title="Reset password" translate="title" sortOrder="20" />
-+                            <resource id="Magento_Customer::invalidate_tokens" title="Invalidate tokens" translate="title" sortOrder="30" />
-+                        </resource>
-+                    </resource>
-                     <resource id="Magento_Customer::online" title="Now Online" translate="title" sortOrder="20" />
-                     <resource id="Magento_Customer::group" title="Customer Groups" translate="title" sortOrder="30" />
-                 </resource>
-@@ -20,7 +26,7 @@
-                             <resource id="Magento_Customer::config_customer" title="Customers Section" translate="title" sortOrder="50" />
-                         </resource>
-                     </resource>
--                   </resource>
-+                </resource>
-             </resource>
-         </resources>
-     </acl>
-diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
-index 31e968de14d..86e5852d67a 100644
---- a/app/code/Magento/Customer/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Customer/etc/adminhtml/system.xml
-@@ -26,7 +26,7 @@
-             </group>
-             <group id="create_account" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Create New Account Options</label>
--                <field id="auto_group_assign" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <field id="auto_group_assign" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                     <label>Enable Automatic Assignment to Customer Group</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
-@@ -170,7 +170,7 @@
-                     <comment>Use 0 to disable account locking.</comment>
-                     <frontend_class>required-entry validate-digits</frontend_class>
-                 </field>
--                <field id="lockout_threshold" translate="label" sortOrder="80" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="lockout_threshold" translate="label comment" sortOrder="80" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Lockout Time (minutes)</label>
-                     <comment>Account will be unlocked after provided time.</comment>
-                     <frontend_class>required-entry validate-digits</frontend_class>
-@@ -272,16 +272,16 @@
-             </group>
-             <group id="address_templates" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Address Templates</label>
--                <field id="text" type="textarea" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="text" translate="label" type="textarea" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Text</label>
-                 </field>
--                <field id="oneline" type="textarea" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="oneline" translate="label" type="textarea" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Text One Line</label>
-                 </field>
--                <field id="html" type="textarea" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="html" translate="label" type="textarea" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>HTML</label>
-                 </field>
--                <field id="pdf" type="textarea" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="pdf" translate="label" type="textarea" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>PDF</label>
-                 </field>
-             </group>
-diff --git a/app/code/Magento/Customer/etc/db_schema.xml b/app/code/Magento/Customer/etc/db_schema.xml
-index 368ca417432..c699db06d30 100644
---- a/app/code/Magento/Customer/etc/db_schema.xml
-+++ b/app/code/Magento/Customer/etc/db_schema.xml
-@@ -9,15 +9,15 @@
-         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-     <table name="customer_entity" resource="default" engine="innodb" comment="Customer Entity">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="true" identity="false"
--                comment="Website Id"/>
-+                comment="Website ID"/>
-         <column xsi:type="varchar" name="email" nullable="true" length="255" comment="Email"/>
-         <column xsi:type="smallint" name="group_id" padding="5" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Group Id"/>
-+                default="0" comment="Group ID"/>
-         <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
--                default="0" comment="Store Id"/>
-+                default="0" comment="Store ID"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Created At"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-@@ -50,37 +50,37 @@
-         <column xsi:type="timestamp" name="first_failure" on_update="false" nullable="true" comment="First Failure"/>
-         <column xsi:type="timestamp" name="lock_expires" on_update="false" nullable="true"
-                 comment="Lock Expiration Date"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CUSTOMER_ENTITY_STORE_ID_STORE_STORE_ID" table="customer_entity"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_STORE_ID_STORE_STORE_ID" table="customer_entity"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="foreign" name="CUSTOMER_ENTITY_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-                     table="customer_entity" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="CUSTOMER_ENTITY_EMAIL_WEBSITE_ID">
-+        <constraint xsi:type="unique" referenceId="CUSTOMER_ENTITY_EMAIL_WEBSITE_ID">
-             <column name="email"/>
-             <column name="website_id"/>
-         </constraint>
--        <index name="CUSTOMER_ENTITY_STORE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_ENTITY_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="CUSTOMER_ENTITY_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_ENTITY_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="CUSTOMER_ENTITY_FIRSTNAME" indexType="btree">
-+        <index referenceId="CUSTOMER_ENTITY_FIRSTNAME" indexType="btree">
-             <column name="firstname"/>
-         </index>
--        <index name="CUSTOMER_ENTITY_LASTNAME" indexType="btree">
-+        <index referenceId="CUSTOMER_ENTITY_LASTNAME" indexType="btree">
-             <column name="lastname"/>
-         </index>
-     </table>
-     <table name="customer_address_entity" resource="default" engine="innodb" comment="Customer Address Entity">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
-         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="true" identity="false"
--                comment="Parent Id"/>
-+                comment="Parent ID"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Created At"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-@@ -111,13 +111,13 @@
-                 comment="VAT number validation request ID"/>
-         <column xsi:type="int" name="vat_request_success" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="VAT number validation request success"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CUSTOMER_ADDRESS_ENTITY_PARENT_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ADDRESS_ENTITY_PARENT_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="customer_address_entity" column="parent_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="CUSTOMER_ADDRESS_ENTITY_PARENT_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
-     </table>
-@@ -128,25 +128,25 @@
-         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Attribute Id"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CSTR_ADDR_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="customer_address_entity_datetime" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CSTR_ADDR_ENTT_DTIME_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_DTIME_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
-                     table="customer_address_entity_datetime" column="entity_id" referenceTable="customer_address_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CUSTOMER_ADDRESS_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="CUSTOMER_ADDRESS_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <index name="CUSTOMER_ADDRESS_ENTITY_DATETIME_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_DATETIME_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CUSTOMER_ADDRESS_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="value"/>
-@@ -159,26 +159,26 @@
-         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Attribute Id"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-                 comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CSTR_ADDR_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="customer_address_entity_decimal" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CSTR_ADDR_ENTT_DEC_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_DEC_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
-                     table="customer_address_entity_decimal" column="entity_id" referenceTable="customer_address_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CUSTOMER_ADDRESS_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="CUSTOMER_ADDRESS_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <index name="CUSTOMER_ADDRESS_ENTITY_DECIMAL_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_DECIMAL_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CUSTOMER_ADDRESS_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="value"/>
-@@ -186,30 +186,30 @@
-     </table>
-     <table name="customer_address_entity_int" resource="default" engine="innodb" comment="Customer Address Entity Int">
-         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
--                comment="Value Id"/>
-+                comment="Value ID"/>
-         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Attribute Id"/>
-+                default="0" comment="Attribute ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="false" identity="false" default="0"
-                 comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CSTR_ADDR_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="customer_address_entity_int" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CSTR_ADDR_ENTT_INT_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_INT_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
-                     table="customer_address_entity_int" column="entity_id" referenceTable="customer_address_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CUSTOMER_ADDRESS_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="CUSTOMER_ADDRESS_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <index name="CUSTOMER_ADDRESS_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CUSTOMER_ADDRESS_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="value"/>
-@@ -218,55 +218,55 @@
-     <table name="customer_address_entity_text" resource="default" engine="innodb"
-            comment="Customer Address Entity Text">
-         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
--                comment="Value Id"/>
-+                comment="Value ID"/>
-         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Attribute Id"/>
-+                default="0" comment="Attribute ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="text" name="value" nullable="false" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CSTR_ADDR_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="customer_address_entity_text" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CSTR_ADDR_ENTT_TEXT_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_TEXT_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
-                     table="customer_address_entity_text" column="entity_id" referenceTable="customer_address_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CUSTOMER_ADDRESS_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="CUSTOMER_ADDRESS_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <index name="CUSTOMER_ADDRESS_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
-     </table>
-     <table name="customer_address_entity_varchar" resource="default" engine="innodb"
-            comment="Customer Address Entity Varchar">
-         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
--                comment="Value Id"/>
-+                comment="Value ID"/>
-         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Attribute Id"/>
-+                default="0" comment="Attribute ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CSTR_ADDR_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="customer_address_entity_varchar" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CSTR_ADDR_ENTT_VCHR_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_VCHR_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
-                     table="customer_address_entity_varchar" column="entity_id" referenceTable="customer_address_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CUSTOMER_ADDRESS_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="CUSTOMER_ADDRESS_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <index name="CUSTOMER_ADDRESS_ENTITY_VARCHAR_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_VARCHAR_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CUSTOMER_ADDRESS_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="value"/>
-@@ -274,29 +274,29 @@
-     </table>
-     <table name="customer_entity_datetime" resource="default" engine="innodb" comment="Customer Entity Datetime">
-         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
--                comment="Value Id"/>
-+                comment="Value ID"/>
-         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Attribute Id"/>
-+                default="0" comment="Attribute ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CUSTOMER_ENTITY_DATETIME_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_DATETIME_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-                     table="customer_entity_datetime" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CUSTOMER_ENTITY_DATETIME_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_DATETIME_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="customer_entity_datetime" column="entity_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CUSTOMER_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="CUSTOMER_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <index name="CUSTOMER_ENTITY_DATETIME_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_ENTITY_DATETIME_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CUSTOMER_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-+        <index referenceId="CUSTOMER_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="value"/>
-@@ -304,30 +304,30 @@
-     </table>
-     <table name="customer_entity_decimal" resource="default" engine="innodb" comment="Customer Entity Decimal">
-         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
--                comment="Value Id"/>
-+                comment="Value ID"/>
-         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Attribute Id"/>
-+                default="0" comment="Attribute ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-                 comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CUSTOMER_ENTITY_DECIMAL_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_DECIMAL_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-                     table="customer_entity_decimal" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CUSTOMER_ENTITY_DECIMAL_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_DECIMAL_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="customer_entity_decimal" column="entity_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CUSTOMER_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="CUSTOMER_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <index name="CUSTOMER_ENTITY_DECIMAL_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_ENTITY_DECIMAL_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CUSTOMER_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-+        <index referenceId="CUSTOMER_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="value"/>
-@@ -335,30 +335,30 @@
-     </table>
-     <table name="customer_entity_int" resource="default" engine="innodb" comment="Customer Entity Int">
-         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
--                comment="Value Id"/>
-+                comment="Value ID"/>
-         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Attribute Id"/>
-+                default="0" comment="Attribute ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="false" identity="false" default="0"
-                 comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CUSTOMER_ENTITY_INT_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_INT_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-                     table="customer_entity_int" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CUSTOMER_ENTITY_INT_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_INT_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="customer_entity_int" column="entity_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CUSTOMER_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="CUSTOMER_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <index name="CUSTOMER_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CUSTOMER_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-+        <index referenceId="CUSTOMER_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="value"/>
-@@ -366,54 +366,54 @@
-     </table>
-     <table name="customer_entity_text" resource="default" engine="innodb" comment="Customer Entity Text">
-         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
--                comment="Value Id"/>
-+                comment="Value ID"/>
-         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Attribute Id"/>
-+                default="0" comment="Attribute ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="text" name="value" nullable="false" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CUSTOMER_ENTITY_TEXT_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_TEXT_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-                     table="customer_entity_text" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CUSTOMER_ENTITY_TEXT_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_TEXT_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="customer_entity_text" column="entity_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CUSTOMER_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="CUSTOMER_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <index name="CUSTOMER_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
-     </table>
-     <table name="customer_entity_varchar" resource="default" engine="innodb" comment="Customer Entity Varchar">
-         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
--                comment="Value Id"/>
-+                comment="Value ID"/>
-         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Attribute Id"/>
-+                default="0" comment="Attribute ID"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CUSTOMER_ENTITY_VARCHAR_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_VARCHAR_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-                     table="customer_entity_varchar" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CUSTOMER_ENTITY_VARCHAR_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_VARCHAR_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="customer_entity_varchar" column="entity_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CUSTOMER_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="CUSTOMER_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <index name="CUSTOMER_ENTITY_VARCHAR_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_ENTITY_VARCHAR_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="CUSTOMER_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-+        <index referenceId="CUSTOMER_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="value"/>
-@@ -425,7 +425,7 @@
-                 comment="Customer Group Code"/>
-         <column xsi:type="int" name="tax_class_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Tax Class Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="customer_group_id"/>
-         </constraint>
-     </table>
-@@ -451,10 +451,10 @@
-                 identity="false" default="0" comment="Is Filterable in Grid"/>
-         <column xsi:type="smallint" name="is_searchable_in_grid" padding="5" unsigned="true" nullable="false"
-                 identity="false" default="0" comment="Is Searchable in Grid"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="attribute_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CUSTOMER_EAV_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_EAV_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-                     table="customer_eav_attribute" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
-     </table>
-@@ -462,14 +462,14 @@
-         <column xsi:type="varchar" name="form_code" nullable="false" length="32" comment="Form Code"/>
-         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Attribute Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="form_code"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CUSTOMER_FORM_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-+        <constraint xsi:type="foreign" referenceId="CUSTOMER_FORM_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-                     table="customer_form_attribute" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <index name="CUSTOMER_FORM_ATTRIBUTE_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_FORM_ATTRIBUTE_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
-     </table>
-@@ -486,17 +486,17 @@
-         <column xsi:type="text" name="default_value" nullable="true" comment="Default Value"/>
-         <column xsi:type="smallint" name="multiline_count" padding="5" unsigned="true" nullable="true" identity="false"
-                 comment="Multiline Count"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="attribute_id"/>
-             <column name="website_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CSTR_EAV_ATTR_WS_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="CSTR_EAV_ATTR_WS_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="customer_eav_attribute_website" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CSTR_EAV_ATTR_WS_WS_ID_STORE_WS_WS_ID"
-+        <constraint xsi:type="foreign" referenceId="CSTR_EAV_ATTR_WS_WS_ID_STORE_WS_WS_ID"
-                     table="customer_eav_attribute_website" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <index name="CUSTOMER_EAV_ATTRIBUTE_WEBSITE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_EAV_ATTRIBUTE_WEBSITE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-@@ -506,15 +506,15 @@
-         <column xsi:type="int" name="customer_id" padding="11" unsigned="false" nullable="true" identity="false"
-                 comment="Customer Id"/>
-         <column xsi:type="varchar" name="session_id" nullable="true" length="64" comment="Session ID"/>
--        <column xsi:type="timestamp" name="last_visit_at" on_update="true" nullable="true" default="CURRENT_TIMESTAMP"
-+        <column xsi:type="timestamp" name="last_visit_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Last Visit Time"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="visitor_id"/>
-         </constraint>
--        <index name="CUSTOMER_VISITOR_CUSTOMER_ID" indexType="btree">
-+        <index referenceId="CUSTOMER_VISITOR_CUSTOMER_ID" indexType="btree">
-             <column name="customer_id"/>
-         </index>
--        <index name="CUSTOMER_VISITOR_LAST_VISIT_AT" indexType="btree">
-+        <index referenceId="CUSTOMER_VISITOR_LAST_VISIT_AT" indexType="btree">
-             <column name="last_visit_at"/>
-         </index>
-     </table>
-@@ -526,10 +526,10 @@
-         <column xsi:type="timestamp" name="last_login_at" on_update="false" nullable="true" comment="Last Login Time"/>
-         <column xsi:type="timestamp" name="last_logout_at" on_update="false" nullable="true"
-                 comment="Last Logout Time"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="log_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="CUSTOMER_LOG_CUSTOMER_ID">
-+        <constraint xsi:type="unique" referenceId="CUSTOMER_LOG_CUSTOMER_ID">
-             <column name="customer_id"/>
-         </constraint>
-     </table>
-diff --git a/app/code/Magento/Customer/etc/db_schema_whitelist.json b/app/code/Magento/Customer/etc/db_schema_whitelist.json
-index 4aada8f0d81..ec7a53945ab 100644
---- a/app/code/Magento/Customer/etc/db_schema_whitelist.json
-+++ b/app/code/Magento/Customer/etc/db_schema_whitelist.json
-@@ -73,7 +73,8 @@
-             "vat_request_success": true
-         },
-         "index": {
--            "CUSTOMER_ADDRESS_ENTITY_PARENT_ID": true
-+            "CUSTOMER_ADDRESS_ENTITY_PARENT_ID": true,
-+            "FTI_BA70344390184AC3F063AB2EB38BC0ED": true
-         },
-         "constraint": {
-             "PRIMARY": true,
-diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml
-index 6e8c3dc68ed..a181d6dd217 100644
---- a/app/code/Magento/Customer/etc/di.xml
-+++ b/app/code/Magento/Customer/etc/di.xml
-@@ -127,6 +127,13 @@
-             <argument name="groupManagement" xsi:type="object">Magento\Customer\Api\GroupManagementInterface\Proxy</argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Customer\Model\Metadata\CustomerMetadata">
-+        <arguments>
-+            <argument name="systemAttributes" xsi:type="array">
-+                <item name="disable_auto_group_change" xsi:type="string">disable_auto_group_change</item>
-+            </argument>
-+        </arguments>
-+    </type>
-     <virtualType name="SectionInvalidationConfigReader" type="Magento\Framework\Config\Reader\Filesystem">
-         <arguments>
-             <argument name="idAttributes" xsi:type="array">
-@@ -223,6 +230,7 @@
-                 <item name="customer_listing_data_source" xsi:type="string">Magento\Customer\Model\ResourceModel\Grid\Collection</item>
-                 <item name="customer_online_grid_data_source" xsi:type="string">Magento\Customer\Model\ResourceModel\Online\Grid\Collection</item>
-                 <item name="customer_group_listing_data_source" xsi:type="string">Magento\Customer\Model\ResourceModel\Group\Grid\Collection</item>
-+                <item name="customer_address_listing_data_source" xsi:type="string">Magento\Customer\Model\ResourceModel\Address\Grid\Collection</item>
-             </argument>
-         </arguments>
-     </type>
-@@ -449,6 +457,14 @@
-             <argument name="resourceModel" xsi:type="string">Magento\Customer\Model\ResourceModel\Group</argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Customer\Model\ResourceModel\Address\Grid\Collection">
-+        <arguments>
-+            <argument name="mainTable" xsi:type="string">customer_address_entity</argument>
-+            <argument name="eventPrefix" xsi:type="string">customer_address_entity_grid_collection</argument>
-+            <argument name="eventObject" xsi:type="string">customer_address_entity_grid_collection</argument>
-+            <argument name="resourceModel" xsi:type="string">Magento\Customer\Model\ResourceModel\Address</argument>
-+        </arguments>
-+    </type>
-     <preference
-             for="Magento\Customer\Api\AccountDelegationInterface"
-             type="Magento\Customer\Model\Delegation\AccountDelegation" />
-diff --git a/app/code/Magento/Customer/etc/frontend/di.xml b/app/code/Magento/Customer/etc/frontend/di.xml
-index 4a45c4ad48d..c31742519e5 100644
---- a/app/code/Magento/Customer/etc/frontend/di.xml
-+++ b/app/code/Magento/Customer/etc/frontend/di.xml
-@@ -57,7 +57,7 @@
-     <type name="Magento\Checkout\Block\Cart\Sidebar">
-         <plugin name="customer_cart" type="Magento\Customer\Model\Cart\ConfigPlugin" />
-     </type>
--    <type name="Magento\Framework\Session\SessionManager">
-+    <type name="Magento\Framework\Session\SessionManagerInterface">
-         <plugin name="session_checker" type="Magento\Customer\CustomerData\Plugin\SessionChecker" />
-     </type>
-     <type name="Magento\Authorization\Model\CompositeUserContext">
-@@ -77,4 +77,4 @@
-             </argument>
-         </arguments>
-     </type>
--</config>
-+</config>
-\ No newline at end of file
-diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
-index bf73d6361d4..e1c68f3d81e 100644
---- a/app/code/Magento/Customer/i18n/en_US.csv
-+++ b/app/code/Magento/Customer/i18n/en_US.csv
-@@ -47,7 +47,7 @@ Sending,Sending
- Paused,Paused
- View,View
- Unknown,Unknown
--Order,Order
-+"Order #","Order #"
- Purchased,Purchased
- "Bill-to Name","Bill-to Name"
- "Ship-to Name","Ship-to Name"
-@@ -506,10 +506,10 @@ Strong,Strong
- "Rebuild Customer grid index","Rebuild Customer grid index"
- Group,Group
- "Add New Customer","Add New Customer"
--"Are you sure to delete selected customers?","Are you sure to delete selected customers?"
-+"Are you sure you want to delete the selected customers?","Are you sure you want to delete the selected customers?"
- "Delete items","Delete items"
- "Subscribe to Newsletter","Subscribe to Newsletter"
--"Are you sure to unsubscribe selected customers from newsletter?","Are you sure to unsubscribe selected customers from newsletter?"
-+"Are you sure you want to unsubscribe the selected customers from the newsletter?","Are you sure you want to unsubscribe the selected customers from the newsletter?"
- "Unsubscribe from Newsletter","Unsubscribe from Newsletter"
- "Assign a Customer Group","Assign a Customer Group"
- Phone,Phone
-diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_address_edit.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_address_edit.xml
-new file mode 100644
-index 00000000000..3acae3acec8
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_address_edit.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <update handle="styles"/>
-+    <body>
-+        <referenceContainer name="content">
-+            <uiComponent name="customer_address_form"/>
-+        </referenceContainer>
-+    </body>
-+</page>
-diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml
-index 23b57188702..e982d8bb096 100644
---- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml
-+++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml
-@@ -15,5 +15,8 @@
-         <referenceContainer name="content">
-             <uiComponent name="customer_form"/>
-         </referenceContainer>
-+        <referenceContainer name="after.body.start">
-+            <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Configure" name="after.body.start.product_composite_configure" template="Magento_Catalog::catalog/product/composite/configure.phtml"/>
-+        </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml b/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml
-index 143b4be507a..14aa3f4763e 100644
---- a/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml
-+++ b/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml
-@@ -3,7 +3,4 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
-diff --git a/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml b/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml
-index f55562682d9..b792bc27f5b 100644
---- a/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml
-+++ b/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Adminhtml\Sales\Order\Address\Form\Renderer\Vat $block */
- 
- $_element = $block->getElement();
-@@ -13,16 +11,16 @@ $_note = $_element->getNote();
- $_class = $_element->getFieldsetHtmlClass();
- $_validateButton = $block->getValidateButton();
- ?>
--<?php if (!$_element->getNoDisplay()): ?>
-+<?php if (!$_element->getNoDisplay()) : ?>
- <div class="admin__field field-vat-number">
--    <?php if ($_element->getType() == 'hidden'): ?>
-+    <?php if ($_element->getType() == 'hidden') : ?>
-     <div class="hidden"><?= $_element->getElementHtml() ?></div>
--    <?php else: ?>
-+    <?php else : ?>
-     <?= $_element->getLabelHtml() ?>
-     <div class="admin__field-control <?= /* @noEscape */ $_element->hasValueClass() ? $block->escapeHtmlAttr($_element->getValueClass()) : 'value' ?><?= $_class ? $block->escapeHtmlAttr($_class) . '-value' : '' ?>">
-         <?= $_element->getElementHtml() ?>
--        <?php if ($_note): ?>
--            <div class="admin__field-note<?= $_class ? " {$_class}-note" : '' ?>" id="note_<?= $block->escapeHtmlAttr($_element->getId()) ?>">
-+        <?php if ($_note) : ?>
-+            <div class="admin__field-note<?= /* @noEscape */ $_class ? " {$block->escapeHtmlAttr($_class)}-note" : '' ?>" id="note_<?= $block->escapeHtmlAttr($_element->getId()) ?>">
-                 <span><?= $block->escapeHtml($_note) ?></span>
-             </div>
-         <?php endif; ?>
-diff --git a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
-index 8eb3057d0a3..ab1671ede6e 100644
---- a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
-+++ b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Adminhtml\System\Config\Validatevat $block */
- ?>
- <script>
-diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
-index 76fa53c1254..434e5606cd0 100644
---- a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
-+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
-@@ -4,11 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var \Magento\Customer\Block\Adminhtml\Edit\Tab\Cart $block */
- ?>
--<?php if ($block->getCartHeader()): ?>
-+<?php if ($block->getCartHeader()) : ?>
- <div class="content-header skip-header">
-     <table>
-         <tr>
-@@ -19,76 +17,74 @@
- <?php endif ?>
- <?= $block->getGridParentHtml() ?>
- <?php if ($block->canDisplayContainer()) : ?>
--<?php
--    $listType = $block->getJsObjectName();
--?>
--<script>
--require([
--    "Magento_Ui/js/modal/alert",
--    "Magento_Ui/js/modal/confirm",
--    "Magento_Catalog/catalog/product/composite/configure"
--], function(alert, confirm){
-+    <?php $listType = $block->getJsObjectName(); ?>
-+    <script>
-+        require([
-+            "Magento_Ui/js/modal/alert",
-+            "Magento_Ui/js/modal/confirm",
-+            "Magento_Catalog/catalog/product/composite/configure"
-+        ], function(alert, confirm){
- 
--<?= $block->escapeJs($block->getJsObjectName()) ?>cartControl = {
--    reload: function (params) {
--        if (!params) {
--            params = {};
--        }
--        <?= $block->escapeJs($block->getJsObjectName()) ?>.reloadParams = params;
--        <?= $block->escapeJs($block->getJsObjectName()) ?>.reload();
--        <?= $block->escapeJs($block->getJsObjectName()) ?>.reloadParams = {};
--    },
-+        <?= $block->escapeJs($block->getJsObjectName()) ?>cartControl = {
-+            reload: function (params) {
-+            if (!params) {
-+                params = {};
-+            }
-+            <?= $block->escapeJs($block->getJsObjectName()) ?>.reloadParams = params;
-+            <?= $block->escapeJs($block->getJsObjectName()) ?>.reload();
-+            <?= $block->escapeJs($block->getJsObjectName()) ?>.reloadParams = {};
-+        },
- 
--    configureItem: function (itemId) {
--        productConfigure.setOnLoadIFrameCallback('<?= $block->escapeJs($listType) ?>', this.cbOnLoadIframe.bind(this));
--        productConfigure.showItemConfiguration('<?= $block->escapeJs($listType) ?>', itemId);
--        return false;
--    },
-+        configureItem: function (itemId) {
-+            productConfigure.setOnLoadIFrameCallback('<?= $block->escapeJs($listType) ?>', this.cbOnLoadIframe.bind(this));
-+            productConfigure.showItemConfiguration('<?= $block->escapeJs($listType) ?>', itemId);
-+            return false;
-+        },
- 
--    cbOnLoadIframe: function (response) {
--        if (!response.ok) {
--            return;
--        }
--        this.reload();
--    },
-+        cbOnLoadIframe: function (response) {
-+            if (!response.ok) {
-+                return;
-+            }
-+            this.reload();
-+        },
- 
--    removeItem: function (itemId) {
--        var self = this;
-+        removeItem: function (itemId) {
-+            var self = this;
- 
--        if (!itemId) {
--            alert({
--                content: '<?= $block->escapeJs(__('No item specified.')) ?>'
--            });
-+            if (!itemId) {
-+                alert({
-+                    content: '<?= $block->escapeJs(__('No item specified.')) ?>'
-+                });
- 
--            return false;
--        }
-+                return false;
-+            }
- 
--        confirm({
--            content: '<?= $block->escapeJs(__('Are you sure you want to remove this item?')) ?>',
--            actions: {
--                confirm: function(){
--                    self.reload({'delete':itemId});
-+            confirm({
-+                content: '<?= $block->escapeJs(__('Are you sure you want to remove this item?')) ?>',
-+                actions: {
-+                    confirm: function(){
-+                        self.reload({'delete':itemId});
-+                    }
-                 }
--            }
--        });
--    }
--};
-+            });
-+        }
-+    };
- 
--<?php
--$params = [
--    'customer_id' => $block->getCustomerId(),
--    'website_id' => $block->getWebsiteId(),
--];
--?>
--productConfigure.addListType(
--    '<?= $block->escapeJs($listType) ?>',
--    {
--        urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/configure', $params))) ?>',
--        urlConfirm: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/update', $params))) ?>'
--    }
--);
-+    <?php
-+    $params = [
-+        'customer_id' => $block->getCustomerId(),
-+        'website_id' => $block->getWebsiteId(),
-+    ];
-+    ?>
-+    productConfigure.addListType(
-+        '<?= $block->escapeJs($listType) ?>',
-+        {
-+            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/configure', $params))) ?>',
-+            urlConfirm: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/update', $params))) ?>'
-+        }
-+    );
- 
--});
--</script>
-+    });
-+    </script>
- <?php endif ?>
- <br />
-diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml
-index 30acb16c158..12d4902fb18 100644
---- a/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml
-+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div class="entry-edit">
- <?= $block->getForm()->getHtml() ?>
-diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml
-index f43cb8ab5f0..b3baeace897 100644
---- a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml
-+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Adminhtml\Edit\Tab\View\PersonalInfo $block */
- 
- $lastLoginDateAdmin = $block->getLastLoginDate();
-@@ -25,7 +23,7 @@ $createDateStore = $block->getStoreCreateDate();
-             <th><?= $block->escapeHtml(__('Last Logged In:')) ?></th>
-             <td><?= $block->escapeHtml($lastLoginDateAdmin) ?> (<?= $block->escapeHtml($block->getCurrentStatus()) ?>)</td>
-         </tr>
--        <?php if ($lastLoginDateAdmin != $lastLoginDateStore): ?>
-+        <?php if ($lastLoginDateAdmin != $lastLoginDateStore) : ?>
-         <tr>
-             <th><?= $block->escapeHtml(__('Last Logged In (%1):', $block->getStoreLastLoginDateTimezone())) ?></th>
-             <td><?= $block->escapeHtml($lastLoginDateStore) ?> (<?= $block->escapeHtml($block->getCurrentStatus()) ?>)</td>
-@@ -43,7 +41,7 @@ $createDateStore = $block->getStoreCreateDate();
-             <th><?= $block->escapeHtml(__('Account Created:')) ?></th>
-             <td><?= $block->escapeHtml($createDateAdmin) ?></td>
-         </tr>
--        <?php if ($createDateAdmin != $createDateStore): ?>
-+        <?php if ($createDateAdmin != $createDateStore) : ?>
-             <tr>
-                 <th><?= $block->escapeHtml(__('Account Created on (%1):', $block->getStoreCreateDateTimezone())) ?></th>
-                 <td><?= $block->escapeHtml($createDateStore) ?></td>
-diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml
-index 12eae5cac9b..7b888c04046 100644
---- a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml
-+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Adminhtml\Edit\Tab\View\Sales $block */
- 
- $singleStoreMode = $block->isSingleStoreMode();
-@@ -19,7 +17,7 @@ $singleStoreMode = $block->isSingleStoreMode();
-     <table class="data-table">
-         <thead>
-         <tr>
--            <?php if (!$singleStoreMode): ?>
-+            <?php if (!$singleStoreMode) : ?>
-             <th><?= $block->escapeHtml(__('Web Site')) ?></th>
-             <th><?= $block->escapeHtml(__('Store')) ?></th>
-             <th><?= $block->escapeHtml(__('Store View')) ?></th>
-@@ -28,7 +26,7 @@ $singleStoreMode = $block->isSingleStoreMode();
-             <th class="last"><?= $block->escapeHtml(__('Average Sale')) ?></th>
-         </tr>
-         </thead>
--        <?php if (!$singleStoreMode): ?>
-+        <?php if (!$singleStoreMode) : ?>
-         <tfoot>
-         <tr>
-             <td colspan="3"><strong><?= $block->escapeHtml(__('All Store Views')) ?></strong></td>
-@@ -37,40 +35,40 @@ $singleStoreMode = $block->isSingleStoreMode();
-         </tr>
-         </tfoot>
-         <?php endif; ?>
--        <?php if ($block->getRows()): ?>
-+        <?php if ($block->getRows()) : ?>
-         <tbody>
-             <?php $_i = 0; ?>
--            <?php foreach ($block->getRows() as $_websiteId => $_groups): ?>
--            <?php $_websiteRow = false; ?>
--            <?php foreach ($_groups as $_groupId => $_stores): ?>
--                <?php $_groupRow = false; ?>
--                <?php foreach ($_stores as $_row): ?>
--                    <?php if (!$singleStoreMode): ?>
--                        <?php if ($_row->getStoreId() == 0): ?>
--                        <td colspan="3"><?= $block->escapeHtml($_row->getStoreName()) ?></td>
--                            <?php else: ?>
--                    <tr<?= ($_i++ % 2 ? ' class="even"' : '') ?>>
--                            <?php if (!$_websiteRow): ?>
--                                <td rowspan="<?= $block->escapeHtmlAttr($block->getWebsiteCount($_websiteId)) ?>"><?= $block->escapeHtml($_row->getWebsiteName()) ?></td>
--                                <?php $_websiteRow = true; ?>
-+            <?php foreach ($block->getRows() as $_websiteId => $_groups) : ?>
-+                <?php $_websiteRow = false; ?>
-+                <?php foreach ($_groups as $_groupId => $_stores) : ?>
-+                    <?php $_groupRow = false; ?>
-+                    <?php foreach ($_stores as $_row) : ?>
-+                        <?php if (!$singleStoreMode) : ?>
-+                            <?php if ($_row->getStoreId() == 0) : ?>
-+                                <td colspan="3"><?= $block->escapeHtml($_row->getStoreName()) ?></td>
-+                            <?php else : ?>
-+                                <tr<?= ($_i++ % 2 ? ' class="even"' : '') ?>>
-+                                <?php if (!$_websiteRow) : ?>
-+                                    <td rowspan="<?= $block->escapeHtmlAttr($block->getWebsiteCount($_websiteId)) ?>"><?= $block->escapeHtml($_row->getWebsiteName()) ?></td>
-+                                    <?php $_websiteRow = true; ?>
-                                 <?php endif; ?>
--                            <?php if (!$_groupRow): ?>
--                                <td rowspan="<?= count($_stores) ?>"><?= $block->escapeHtml($_row->getGroupName()) ?></td>
--                                <?php $_groupRow = true; ?>
-+                                <?php if (!$_groupRow) : ?>
-+                                    <td rowspan="<?= count($_stores) ?>"><?= $block->escapeHtml($_row->getGroupName()) ?></td>
-+                                    <?php $_groupRow = true; ?>
-                                 <?php endif; ?>
--                            <td><?= $block->escapeHtml($_row->getStoreName()) ?></td>
-+                                <td><?= $block->escapeHtml($_row->getStoreName()) ?></td>
-                             <?php endif; ?>
--                        <?php else: ?>
--                    <tr>
-+                        <?php else : ?>
-+                            <tr>
-                         <?php endif; ?>
--                    <td><?= $block->escapeHtml($block->formatCurrency($_row->getLifetime(), $_row->getWebsiteId())) ?></td>
--                    <td><?= $block->escapeHtml($block->formatCurrency($_row->getAvgsale(), $_row->getWebsiteId())) ?></td>
--                    </tr>
-+                        <td><?= $block->escapeHtml($block->formatCurrency($_row->getLifetime(), $_row->getWebsiteId())) ?></td>
-+                        <td><?= $block->escapeHtml($block->formatCurrency($_row->getAvgsale(), $_row->getWebsiteId())) ?></td>
-+                        </tr>
-                     <?php endforeach; ?>
-                 <?php endforeach; ?>
-             <?php endforeach; ?>
-         </tbody>
--        <?php else: ?>
-+        <?php else : ?>
-         <tbody>
-         <tr class="hidden"><td colspan="<?= /* @noEscape */ $singleStoreMode ? 2 : 5 ?>"></td></tr>
-         </tbody>
-diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_form.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_form.xml
-new file mode 100644
-index 00000000000..692cb2ecb96
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_form.xml
-@@ -0,0 +1,249 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd" component="Magento_Customer/js/form/components/form">
-+    <argument name="data" xsi:type="array">
-+        <item name="js_config" xsi:type="array">
-+            <item name="provider" xsi:type="string">customer_address_form.customer_address_form_data_source</item>
-+        </item>
-+        <item name="config" xsi:type="array">
-+            <item name="deleteConfirmationMessage" translate="true" xsi:type="string">Are you sure you want to delete this address?</item>
-+        </item>
-+        <item name="label" xsi:type="string" translate="true">Update Address</item>
-+        <item name="reverseMetadataMerge" xsi:type="boolean">true</item>
-+        <item name="template" xsi:type="string">templates/form/collapsible</item>
-+    </argument>
-+    <settings>
-+        <buttons>
-+            <button name="cancel" class="Magento\Customer\Block\Adminhtml\Edit\Address\CancelButton"/>
-+            <button name="delete" class="Magento\Customer\Block\Adminhtml\Edit\Address\DeleteButton"/>
-+            <button name="save" class="Magento\Customer\Block\Adminhtml\Edit\Address\SaveButton"/>
-+        </buttons>
-+        <namespace>customer_address_form</namespace>
-+        <ajaxSave>true</ajaxSave>
-+        <ajaxSaveType>simple</ajaxSaveType>
-+        <dataScope>data</dataScope>
-+        <deps>
-+            <dep>customer_address_form.customer_address_form_data_source</dep>
-+        </deps>
-+    </settings>
-+    <dataSource name="customer_address_form_data_source">
-+        <argument name="data" xsi:type="array">
-+            <item name="js_config" xsi:type="array">
-+                <item name="component" xsi:type="string">Magento_Ui/js/form/provider</item>
-+            </item>
-+        </argument>
-+        <settings>
-+            <submitUrl path="customer/address/save"/>
-+            <validateUrl path="customer/address/validate"/>
-+        </settings>
-+        <aclResource>Magento_Customer::manage</aclResource>
-+        <dataProvider class="Magento\Customer\Model\Address\DataProvider" name="customer_address_form_data_source">
-+            <settings>
-+                <requestFieldName>entity_id</requestFieldName>
-+                <primaryFieldName>entity_id</primaryFieldName>
-+            </settings>
-+        </dataProvider>
-+    </dataSource>
-+    <container name="messages" component="Magento_Ui/js/form/components/html">
-+        <argument name="data" xsi:type="array">
-+            <item name="config" xsi:type="array">
-+                <item name="additionalClasses" xsi:type="string">message message-error</item>
-+                <item name="visible" xsi:type="boolean">false</item>
-+                <item name="imports" xsi:type="array">
-+                    <item name="responseData" xsi:type="string">${ $.parentName }:responseData</item>
-+                </item>
-+                <item name="listens" xsi:type="array">
-+                    <item name="responseData.error" xsi:type="string">visible</item>
-+                    <item name="responseData.messages" xsi:type="string">content</item>
-+                </item>
-+            </item>
-+        </argument>
-+    </container>
-+    <fieldset name="general">
-+        <argument name="data" xsi:type="array">
-+            <item name="config" xsi:type="array">
-+                <item name="is_collection" xsi:type="boolean">true</item>
-+            </item>
-+        </argument>
-+        <settings>
-+            <label/>
-+            <dataScope/>
-+        </settings>
-+
-+        <field name="entity_id" formElement="hidden">
-+            <settings>
-+                <dataType>text</dataType>
-+            </settings>
-+        </field>
-+        <field name="default_billing" sortOrder="5" formElement="checkbox">
-+            <argument name="data" xsi:type="array">
-+                <item name="config" xsi:type="array">
-+                    <item name="default" xsi:type="number">0</item>
-+                </item>
-+            </argument>
-+            <settings>
-+                <dataType>boolean</dataType>
-+                <label translate="true">Default Billing Address</label>
-+                <dataScope>default_billing</dataScope>
-+            </settings>
-+            <formElements>
-+                <checkbox>
-+                    <settings>
-+                        <valueMap>
-+                            <map name="false" xsi:type="number">0</map>
-+                            <map name="true" xsi:type="number">1</map>
-+                        </valueMap>
-+                        <prefer>toggle</prefer>
-+                    </settings>
-+                </checkbox>
-+            </formElements>
-+        </field>
-+        <field name="default_shipping" sortOrder="7" formElement="checkbox">
-+            <argument name="data" xsi:type="array">
-+                <item name="config" xsi:type="array">
-+                    <item name="default" xsi:type="number">0</item>
-+                </item>
-+            </argument>
-+            <settings>
-+                <dataType>boolean</dataType>
-+                <label translate="true">Default Shipping Address</label>
-+                <dataScope>default_shipping</dataScope>
-+            </settings>
-+            <formElements>
-+                <checkbox>
-+                    <settings>
-+                        <valueMap>
-+                            <map name="false" xsi:type="number">0</map>
-+                            <map name="true" xsi:type="number">1</map>
-+                        </valueMap>
-+                        <prefer>toggle</prefer>
-+                    </settings>
-+                </checkbox>
-+            </formElements>
-+        </field>
-+        <field name="prefix" sortOrder="10" formElement="input">
-+            <settings>
-+                <dataType>text</dataType>
-+                <visible>true</visible>
-+                <label translate="true">Name Prefix</label>
-+            </settings>
-+        </field>
-+        <field name="firstname" sortOrder="20" formElement="input">
-+            <settings>
-+                <dataType>text</dataType>
-+                <visible>true</visible>
-+                <label translate="true">First Name</label>
-+                <validation>
-+                    <rule name="required-entry" xsi:type="boolean">true</rule>
-+                </validation>
-+            </settings>
-+        </field>
-+        <field name="lastname" sortOrder="30" formElement="input">
-+            <settings>
-+                <dataType>text</dataType>
-+                <visible>true</visible>
-+                <label translate="true">Last Name</label>
-+                <validation>
-+                    <rule name="required-entry" xsi:type="boolean">true</rule>
-+                </validation>
-+            </settings>
-+        </field>
-+        <field name="suffix" sortOrder="40" formElement="input">
-+            <settings>
-+                <dataType>text</dataType>
-+                <visible>true</visible>
-+                <label translate="true">Name Suffix</label>
-+            </settings>
-+        </field>
-+        <field name="middlename" sortOrder="50" formElement="input">
-+            <settings>
-+                <dataType>text</dataType>
-+                <visible>true</visible>
-+                <label translate="true">Middle Name/Initial</label>
-+            </settings>
-+        </field>
-+        <field name="company" sortOrder="60" formElement="input">
-+            <settings>
-+                <dataType>text</dataType>
-+                <visible>true</visible>
-+                <label translate="true">Company</label>
-+            </settings>
-+        </field>
-+        <field name="city" sortOrder="80" formElement="input">
-+            <settings>
-+                <dataType>text</dataType>
-+                <label translate="true">City</label>
-+                <visible>true</visible>
-+                <validation>
-+                    <rule name="required-entry" xsi:type="boolean">true</rule>
-+                </validation>
-+            </settings>
-+        </field>
-+        <field name="country_id" component="Magento_Customer/js/form/element/country" sortOrder="90" formElement="select">
-+            <settings>
-+                <validation>
-+                    <rule name="required-entry" xsi:type="boolean">true</rule>
-+                </validation>
-+                <dataType>text</dataType>
-+            </settings>
-+            <formElements>
-+                <select>
-+                    <settings>
-+                        <options class="Magento\Directory\Model\ResourceModel\Country\Collection"/>
-+                    </settings>
-+                </select>
-+            </formElements>
-+        </field>
-+        <field name="region_id" component="Magento_Customer/js/form/element/region" formElement="select">
-+            <settings>
-+                <validation>
-+                    <rule name="required-entry" xsi:type="boolean">true</rule>
-+                </validation>
-+                <dataType>text</dataType>
-+                <label translate="true">State/Province</label>
-+            </settings>
-+            <formElements>
-+                <select>
-+                    <settings>
-+                        <filterBy>
-+                            <field>country_id</field>
-+                            <target>${ $.provider }:${ $.parentScope }.country_id</target>
-+                        </filterBy>
-+                        <customEntry>region</customEntry>
-+                    </settings>
-+                </select>
-+            </formElements>
-+        </field>
-+        <field name="postcode" component="Magento_Ui/js/form/element/post-code" sortOrder="120" formElement="input">
-+            <settings>
-+                <dataType>text</dataType>
-+                <visible>true</visible>
-+                <label translate="true">Zip/Postal Code</label>
-+                <validation>
-+                    <rule name="required-entry" xsi:type="boolean">true</rule>
-+                </validation>
-+            </settings>
-+        </field>
-+        <field name="telephone" sortOrder="130" formElement="input">
-+            <settings>
-+                <dataType>text</dataType>
-+                <visible>true</visible>
-+                <label translate="true">Phone Number</label>
-+            </settings>
-+        </field>
-+        <field name="vat_id" sortOrder="140" formElement="input">
-+            <settings>
-+                <dataType>text</dataType>
-+                <label translate="true">VAT Number</label>
-+                <validation>
-+                    <rule name="validate-alphanum" xsi:type="boolean">true</rule>
-+                </validation>
-+            </settings>
-+        </field>
-+    </fieldset>
-+</form>
-diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_listing.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_listing.xml
-new file mode 100644
-index 00000000000..fb42a2c5a07
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_listing.xml
-@@ -0,0 +1,162 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<listing 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="js_config" xsi:type="array">
-+            <item name="provider" xsi:type="string">customer_address_listing.customer_address_listing_data_source</item>
-+        </item>
-+    </argument>
-+    <settings>
-+        <spinner>customer_address_columns</spinner>
-+        <deps>
-+            <dep>customer_address_listing.customer_address_listing_data_source</dep>
-+        </deps>
-+    </settings>
-+    <dataSource name="customer_address_listing_data_source" component="Magento_Ui/js/grid/provider">
-+        <settings>
-+            <filterUrlParams>
-+                <param name="id">*</param>
-+            </filterUrlParams>
-+            <storageConfig>
-+                <param name="indexField" xsi:type="string">entity_id</param>
-+            </storageConfig>
-+            <updateUrl path="mui/index/render"/>
-+        </settings>
-+        <aclResource>Magento_Customer::manage</aclResource>
-+        <dataProvider class="Magento\Customer\Ui\Component\Listing\Address\DataProvider" name="customer_address_listing_data_source">
-+            <settings>
-+                <requestFieldName>id</requestFieldName>
-+                <primaryFieldName>entity_id</primaryFieldName>
-+            </settings>
-+        </dataProvider>
-+    </dataSource>
-+    <listingToolbar name="listing_top">
-+        <bookmark name="bookmarks"/>
-+        <columnsControls name="columns_controls"/>
-+        <filterSearch name="fulltext"/>
-+        <filters name="listing_filters" component="Magento_Customer/js/grid/filters/filters">
-+            <settings>
-+                <storageConfig>
-+                    <param name="provider" xsi:type="string">customer_address_listing.customer_address_listing.listing_top.bookmarks</param>
-+                    <param name="namespace" xsi:type="string">current.filters</param>
-+                </storageConfig>
-+                <childDefaults>
-+                    <param name="provider" xsi:type="string">customer_address_listing.customer_address_listing.listing_top.listing_filters</param>
-+                    <param name="imports" xsi:type="array">
-+                        <item name="visible" xsi:type="string">customer_address_listing.customer_address_listing.listing_top.bookmarks:current.columns.${ $.index }.visible</item>
-+                    </param>
-+                </childDefaults>
-+            </settings>
-+        </filters>
-+        <massaction name="listing_massaction" component="Magento_Customer/js/grid/massactions">
-+            <action name="delete">
-+                <argument name="data" xsi:type="array">
-+                    <item name="config" xsi:type="array">
-+                        <item name="isAjax" xsi:type="boolean">true</item>
-+                    </item>
-+                </argument>
-+                <settings>
-+                    <url path="customer/address/massDelete"/>
-+                    <type>delete</type>
-+                    <label translate="true">Delete</label>
-+                    <confirm>
-+                        <message translate="true">Are you sure to delete selected address?</message>
-+                        <title translate="true">Delete items</title>
-+                    </confirm>
-+                </settings>
-+            </action>
-+        </massaction>
-+        <paging name="listing_paging"/>
-+    </listingToolbar>
-+    <columns name="customer_address_columns">
-+        <settings>
-+            <editorConfig>
-+                <param name="clientConfig" xsi:type="array">
-+                    <item name="saveUrl" xsi:type="url" path="customer/index/inlineEdit"/>
-+                    <item name="validateBeforeSave" xsi:type="boolean">false</item>
-+                </param>
-+                <param name="indexField" xsi:type="string">entity_id</param>
-+                <param name="enabled" xsi:type="boolean">true</param>
-+                <param name="selectProvider" xsi:type="string">customer_address_listing.customer_address_listing.address_columns.ids</param>
-+            </editorConfig>
-+            <childDefaults>
-+                <param name="fieldAction" xsi:type="array">
-+                    <item name="provider" xsi:type="string">customer_address_listing.customer_address_listing.address_columns_editor</item>
-+                    <item name="target" xsi:type="string">startEdit</item>
-+                    <item name="params" xsi:type="array">
-+                        <item name="0" xsi:type="string">${ $.$data.rowIndex }</item>
-+                        <item name="1" xsi:type="boolean">true</item>
-+                    </item>
-+                </param>
-+            </childDefaults>
-+        </settings>
-+        <selectionsColumn name="ids" sortOrder="10">
-+            <settings>
-+                <indexField>entity_id</indexField>
-+            </settings>
-+        </selectionsColumn>
-+        <column name="firstname" sortOrder="20">
-+            <settings>
-+                <filter>text</filter>
-+                <label translate="true">First Name</label>
-+            </settings>
-+        </column>
-+        <column name="lastname" sortOrder="40">
-+            <settings>
-+                <filter>text</filter>
-+                <label translate="true">Last Name</label>
-+            </settings>
-+        </column>
-+        <column name="street" sortOrder="80">
-+            <settings>
-+                <filter>text</filter>
-+                <label translate="true">Street Address</label>
-+            </settings>
-+        </column>
-+        <column name="city" sortOrder="81">
-+            <settings>
-+                <filter>text</filter>
-+                <label translate="true">City</label>
-+            </settings>
-+        </column>
-+        <column name="region" sortOrder="91">
-+            <settings>
-+                <filter>text</filter>
-+                <label translate="true">State</label>
-+            </settings>
-+        </column>
-+        <column name="postcode" sortOrder="92">
-+            <settings>
-+                <filter>text</filter>
-+                <label translate="true">Zip/Postal Code</label>
-+            </settings>
-+        </column>
-+        <column name="country_id" component="Magento_Ui/js/grid/columns/select" sortOrder="90">
-+            <settings>
-+                <filter>select</filter>
-+                <options class="Magento\Customer\Ui\Component\Listing\Address\Column\Countries"/>
-+                <dataType>select</dataType>
-+                <label translate="true">Country</label>
-+            </settings>
-+        </column>
-+        <column name="telephone" sortOrder="93">
-+            <settings>
-+                <filter>text</filter>
-+                <editor>
-+                    <editorType>text</editorType>
-+                </editor>
-+                <label translate="true">Phone</label>
-+            </settings>
-+        </column>
-+        <actionsColumn name="actions" class="Magento\Customer\Ui\Component\Listing\Address\Column\Actions" component="Magento_Customer/js/grid/columns/actions">
-+            <settings>
-+                <indexField>entity_id</indexField>
-+            </settings>
-+        </actionsColumn>
-+    </columns>
-+</listing>
-diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml
-index f8aa078f45e..97ae9a9953e 100644
---- a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml
-+++ b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml
-@@ -49,7 +49,7 @@
-             <action name="delete">
-                 <settings>
-                     <confirm>
--                        <message translate="true">Are you sure to delete selected customers?</message>
-+                        <message translate="true">Are you sure you want to delete the selected customers?</message>
-                         <title translate="true">Delete items</title>
-                     </confirm>
-                     <url path="customer/index/massDelete"/>
-@@ -67,7 +67,7 @@
-             <action name="unsubscribe">
-                 <settings>
-                     <confirm>
--                        <message translate="true">Are you sure to unsubscribe selected customers from newsletter?</message>
-+                        <message translate="true">Are you sure you want to unsubscribe the selected customers from the newsletter?</message>
-                         <title translate="true">Unsubscribe from Newsletter</title>
-                     </confirm>
-                     <url path="customer/index/massUnsubscribe"/>
-@@ -157,23 +157,18 @@
-         <column name="billing_telephone" sortOrder="60">
-             <settings>
-                 <filter>text</filter>
--                <editor>
--                    <editorType>text</editorType>
--                </editor>
-                 <label translate="true">Phone</label>
-             </settings>
-         </column>
-         <column name="billing_postcode" sortOrder="70">
-             <settings>
-                 <filter>text</filter>
--                <editor>
--                    <editorType>text</editorType>
--                </editor>
-                 <label translate="true">ZIP</label>
-             </settings>
-         </column>
-         <column name="billing_country_id" component="Magento_Ui/js/grid/columns/select" sortOrder="80">
-             <settings>
-+                <options class="Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryWithWebsites"/>
-                 <filter>select</filter>
-                 <dataType>select</dataType>
-                 <label translate="true">Country</label>
-@@ -268,9 +263,6 @@
-         <column name="billing_city" sortOrder="210">
-             <settings>
-                 <filter>text</filter>
--                <editor>
--                    <editorType>text</editorType>
--                </editor>
-                 <label translate="true">City</label>
-                 <visible>false</visible>
-             </settings>
-@@ -278,9 +270,6 @@
-         <column name="billing_fax" sortOrder="220">
-             <settings>
-                 <filter>text</filter>
--                <editor>
--                    <editorType>text</editorType>
--                </editor>
-                 <label translate="true">Fax</label>
-                 <visible>false</visible>
-             </settings>
-@@ -288,9 +277,6 @@
-         <column name="billing_vat_id" sortOrder="230">
-             <settings>
-                 <filter>text</filter>
--                <editor>
--                    <editorType>text</editorType>
--                </editor>
-                 <label translate="true">VAT Number</label>
-                 <visible>false</visible>
-             </settings>
-@@ -298,9 +284,6 @@
-         <column name="billing_company" sortOrder="240">
-             <settings>
-                 <filter>text</filter>
--                <editor>
--                    <editorType>text</editorType>
--                </editor>
-                 <label translate="true">Company</label>
-                 <visible>false</visible>
-             </settings>
-@@ -308,9 +291,6 @@
-         <column name="billing_firstname" sortOrder="250">
-             <settings>
-                 <filter>text</filter>
--                <editor>
--                    <editorType>text</editorType>
--                </editor>
-                 <label translate="true">Billing Firstname</label>
-                 <visible>false</visible>
-             </settings>
-@@ -318,9 +298,6 @@
-         <column name="billing_lastname" sortOrder="260">
-             <settings>
-                 <filter>text</filter>
--                <editor>
--                    <editorType>text</editorType>
--                </editor>
-                 <label translate="true">Billing Lastname</label>
-                 <visible>false</visible>
-             </settings>
-diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/address/default-address.js b/app/code/Magento/Customer/view/adminhtml/web/js/address/default-address.js
-new file mode 100644
-index 00000000000..07662cd9b10
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/web/js/address/default-address.js
-@@ -0,0 +1,50 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'Magento_Ui/js/form/components/button',
-+    'underscore'
-+], function (Button, _) {
-+    'use strict';
-+
-+    return Button.extend({
-+        defaults: {
-+            entityId: null,
-+            parentId: null,
-+            listens: {
-+                entity: 'changeVisibility'
-+            }
-+        },
-+
-+        /**
-+         * Apply action on target component,
-+         * but previously create this component from template if it is not existed
-+         *
-+         * @param {Object} action - action configuration
-+         */
-+        applyAction: function (action) {
-+            if (action.params && action.params[0]) {
-+                action.params[0]['entity_id'] = this.entityId;
-+                action.params[0]['parent_id'] = this.parentId;
-+            } else {
-+                action.params = [{
-+                    'entity_id': this.entityId,
-+                    'parent_id': this.parentId
-+                }];
-+            }
-+
-+            this._super();
-+        },
-+
-+        /**
-+         * Change visibility of the default address shipping/billing blocks
-+         *
-+         * @param {Object} entity - customer address
-+         */
-+        changeVisibility: function (entity) {
-+            this.visible(!_.isEmpty(entity));
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/components/form.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/form.js
-new file mode 100644
-index 00000000000..812dbe5975c
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/form.js
-@@ -0,0 +1,81 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+define([
-+    'jquery',
-+    'Magento_Ui/js/modal/alert',
-+    'Magento_Ui/js/modal/confirm',
-+    'Magento_Ui/js/form/form',
-+    'underscore',
-+    'mage/translate'
-+], function ($, uiAlert, uiConfirm, Form, _, $t) {
-+    'use strict';
-+
-+    return Form.extend({
-+        defaults: {
-+            deleteConfirmationMessage: '',
-+            ajaxSettings: {
-+                method: 'POST',
-+                dataType: 'json'
-+            }
-+        },
-+
-+        /**
-+         * Delete customer address by provided url.
-+         * Will call confirmation message to be sure that user is really wants to delete this address
-+         *
-+         * @param {String} url - ajax url
-+         */
-+        deleteAddress: function (url) {
-+            var that = this;
-+
-+            uiConfirm({
-+                content: this.deleteConfirmationMessage,
-+                actions: {
-+                    /** @inheritdoc */
-+                    confirm: function () {
-+                        that._delete(url);
-+                    }
-+                }
-+            });
-+        },
-+
-+        /**
-+         * Perform asynchronous DELETE request to server.
-+         * @param {String} url - ajax url
-+         * @returns {Deferred}
-+         */
-+        _delete: function (url) {
-+            var settings = _.extend({}, this.ajaxSettings, {
-+                    url: url,
-+                    data: {
-+                        'form_key': window.FORM_KEY
-+                    }
-+                }),
-+                that = this;
-+
-+            $('body').trigger('processStart');
-+
-+            return $.ajax(settings)
-+                .done(function (response) {
-+                    if (response.error) {
-+                        uiAlert({
-+                            content: response.message
-+                        });
-+                    } else {
-+                        that.trigger('deleteAddressAction', that.source.get('data.entity_id'));
-+                    }
-+                })
-+                .fail(function () {
-+                    uiAlert({
-+                        content: $t('Sorry, there has been an error processing your request. Please try again later.')
-+                    });
-+                })
-+                .always(function () {
-+                    $('body').trigger('processStop');
-+                });
-+
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-form.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-form.js
-new file mode 100644
-index 00000000000..a1ffbde62d4
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-form.js
-@@ -0,0 +1,80 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'Magento_Ui/js/form/components/insert-form'
-+], function (Insert) {
-+    'use strict';
-+
-+    return Insert.extend({
-+        defaults: {
-+            listens: {
-+                responseData: 'onResponse'
-+            },
-+            modules: {
-+                addressListing: '${ $.addressListingProvider }',
-+                addressModal: '${ $.addressModalProvider }'
-+            }
-+        },
-+
-+        /**
-+         * Close modal, reload customer address listing and save customer address
-+         *
-+         * @param {Object} responseData
-+         */
-+        onResponse: function (responseData) {
-+            var data;
-+
-+            if (!responseData.error) {
-+                this.addressModal().closeModal();
-+                this.addressListing().reload({
-+                    refresh: true
-+                });
-+                data = this.externalSource().get('data');
-+                this.saveAddress(responseData, data);
-+            }
-+        },
-+
-+        /**
-+         * Save customer address to customer form data source
-+         *
-+         * @param {Object} responseData
-+         * @param {Object} data - customer address
-+         */
-+        saveAddress: function (responseData, data) {
-+            data['entity_id'] = responseData.data['entity_id'];
-+
-+            if (parseFloat(data['default_billing'])) {
-+                this.source.set('data.default_billing_address', data);
-+            } else if (
-+                parseFloat(this.source.get('data.default_billing_address')['entity_id']) === data['entity_id']
-+            ) {
-+                this.source.set('data.default_billing_address', []);
-+            }
-+
-+            if (parseFloat(data['default_shipping'])) {
-+                this.source.set('data.default_shipping_address', data);
-+            } else if (
-+                parseFloat(this.source.get('data.default_shipping_address')['entity_id']) === data['entity_id']
-+            ) {
-+                this.source.set('data.default_shipping_address', []);
-+            }
-+        },
-+
-+        /**
-+         * Event method that closes "Edit customer address" modal and refreshes grid after customer address
-+         * was removed through "Delete" button on the "Edit customer address" modal
-+         *
-+         * @param {String} id - customer address ID to delete
-+         */
-+        onAddressDelete: function (id) {
-+            this.addressModal().closeModal();
-+            this.addressListing().reload({
-+                refresh: true
-+            });
-+            this.addressListing()._delete([parseFloat(id)]);
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-listing.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-listing.js
-new file mode 100644
-index 00000000000..912d4b32130
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-listing.js
-@@ -0,0 +1,90 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'Magento_Ui/js/form/components/insert-listing',
-+    'underscore'
-+], function (Insert, _) {
-+    'use strict';
-+
-+    return Insert.extend({
-+
-+        /**
-+         * On action call
-+         *
-+         * @param {Object} data - customer address and actions
-+         */
-+        onAction: function (data) {
-+            this[data.action + 'Action'].call(this, data.data);
-+        },
-+
-+        /**
-+         * On mass action call
-+         *
-+         * @param {Object} data - customer address
-+         */
-+        onMassAction: function (data) {
-+            this[data.action + 'Massaction'].call(this, data.data);
-+        },
-+
-+        /**
-+         * Set default billing address
-+         *
-+         * @param {Object} data - customer address
-+         */
-+        setDefaultBillingAction: function (data) {
-+            this.source.set('data.default_billing_address', data);
-+        },
-+
-+        /**
-+         * Set default shipping address
-+         *
-+         * @param {Object} data - customer address
-+         */
-+        setDefaultShippingAction: function (data) {
-+            this.source.set('data.default_shipping_address', data);
-+        },
-+
-+        /**
-+         * Delete customer address
-+         *
-+         * @param {Object} data - customer address
-+         */
-+        deleteAction: function (data) {
-+            this._delete([parseFloat(data[data['id_field_name']])]);
-+        },
-+
-+        /**
-+         * Mass action delete
-+         *
-+         * @param {Object} data - customer address
-+         */
-+        deleteMassaction: function (data) {
-+            var ids = _.map(data, function (val) {
-+                return parseFloat(val);
-+            });
-+
-+            this._delete(ids);
-+        },
-+
-+        /**
-+         * Delete customer address by ids
-+         *
-+         * @param {Array} ids
-+         */
-+        _delete: function (ids) {
-+            var defaultShippingId = parseFloat(this.source.get('data.default_shipping_address.entity_id')),
-+                defaultBillingId = parseFloat(this.source.get('data.default_billing_address.entity_id'));
-+
-+            if (ids.indexOf(defaultShippingId) !== -1) {
-+                this.source.set('data.default_shipping_address', []);
-+            }
-+
-+            if (ids.indexOf(defaultBillingId) !== -1) {
-+                this.source.set('data.default_billing_address', []);
-+            }
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/element/country.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/element/country.js
-new file mode 100644
-index 00000000000..1ed30ae388b
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/element/country.js
-@@ -0,0 +1,29 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'Magento_Ui/js/form/element/country'
-+], function (Country) {
-+    'use strict';
-+
-+    return Country.extend({
-+        defaults: {
-+            countryScope: 'data.country'
-+        },
-+
-+        /**
-+         * Set country to customer address form
-+         *
-+         * @param {String} value - country
-+         */
-+        setDifferedFromDefault: function (value) {
-+            this._super();
-+
-+            if (value) {
-+                this.source.set(this.countryScope, this.indexedOptions[value].label);
-+            }
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/element/region.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/element/region.js
-new file mode 100644
-index 00000000000..755a8e6df3d
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/element/region.js
-@@ -0,0 +1,29 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'Magento_Ui/js/form/element/region'
-+], function (Region) {
-+    'use strict';
-+
-+    return Region.extend({
-+        defaults: {
-+            regionScope: 'data.region'
-+        },
-+
-+        /**
-+         * Set region to customer address form
-+         *
-+         * @param {String} value - region
-+         */
-+        setDifferedFromDefault: function (value) {
-+            this._super();
-+
-+            if (parseFloat(value)) {
-+                this.source.set(this.regionScope, this.indexedOptions[value].label);
-+            }
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/grid/columns/actions.js b/app/code/Magento/Customer/view/adminhtml/web/js/grid/columns/actions.js
-new file mode 100644
-index 00000000000..66ef89c9413
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/web/js/grid/columns/actions.js
-@@ -0,0 +1,103 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'Magento_Ui/js/grid/columns/actions',
-+    'Magento_Ui/js/modal/alert',
-+    'underscore',
-+    'jquery',
-+    'mage/translate'
-+], function (Actions, uiAlert, _, $, $t) {
-+    'use strict';
-+
-+    return Actions.extend({
-+        defaults: {
-+            ajaxSettings: {
-+                method: 'POST',
-+                dataType: 'json'
-+            },
-+            listens: {
-+                action: 'onAction'
-+            }
-+        },
-+
-+        /**
-+         * Reload customer address listing data source after customer address delete action
-+         *
-+         * @param {Object} data
-+         */
-+        onAction: function (data) {
-+            if (data.action === 'delete') {
-+                this.source().reload({
-+                    refresh: true
-+                });
-+            }
-+        },
-+
-+        /**
-+         * Default action callback. Redirects to
-+         * the specified in action's data url.
-+         *
-+         * @param {String} actionIndex - Action's identifier.
-+         * @param {(Number|String)} recordId - Id of the record associated
-+         *      with a specified action.
-+         * @param {Object} action - Action's data.
-+         */
-+        defaultCallback: function (actionIndex, recordId, action) {
-+            if (action.isAjax) {
-+                this.request(action.href).done(function (response) {
-+                    var data;
-+
-+                    if (!response.error) {
-+                        data = _.findWhere(this.rows, {
-+                            _rowIndex: action.rowIndex
-+                        });
-+
-+                        this.trigger('action', {
-+                            action: actionIndex,
-+                            data: data
-+                        });
-+                    }
-+                }.bind(this));
-+
-+            } else {
-+                this._super();
-+            }
-+        },
-+
-+        /**
-+         * Send customer address listing ajax request
-+         *
-+         * @param {String} href
-+         */
-+        request: function (href) {
-+            var settings = _.extend({}, this.ajaxSettings, {
-+                url: href,
-+                data: {
-+                    'form_key': window.FORM_KEY
-+                }
-+            });
-+
-+            $('body').trigger('processStart');
-+
-+            return $.ajax(settings)
-+                .done(function (response) {
-+                    if (response.error) {
-+                        uiAlert({
-+                            content: response.message
-+                        });
-+                    }
-+                })
-+                .fail(function () {
-+                    uiAlert({
-+                        content: $t('Sorry, there has been an error processing your request. Please try again later.')
-+                    });
-+                })
-+                .always(function () {
-+                    $('body').trigger('processStop');
-+                });
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/chips.js b/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/chips.js
-new file mode 100644
-index 00000000000..5dbf62a209b
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/chips.js
-@@ -0,0 +1,23 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'Magento_Ui/js/grid/filters/chips'
-+], function (Chips) {
-+    'use strict';
-+
-+    return Chips.extend({
-+
-+        /**
-+         * Clear previous filters while initializing element to prevent filters sharing between customers
-+         *
-+         * @param {Object} elem
-+         */
-+        initElement: function (elem) {
-+            this.clear();
-+            this._super(elem);
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/filters.js b/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/filters.js
-new file mode 100644
-index 00000000000..f8bf7d3d7ec
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/filters.js
-@@ -0,0 +1,20 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'Magento_Ui/js/grid/filters/filters'
-+], function (Filters) {
-+    'use strict';
-+
-+    return Filters.extend({
-+        defaults: {
-+            chipsConfig: {
-+                name: '${ $.name }_chips',
-+                provider: '${ $.chipsConfig.name }',
-+                component: 'Magento_Customer/js/grid/filters/chips'
-+            }
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/grid/massactions.js b/app/code/Magento/Customer/view/adminhtml/web/js/grid/massactions.js
-new file mode 100644
-index 00000000000..384f48554a9
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/web/js/grid/massactions.js
-@@ -0,0 +1,106 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'Magento_Ui/js/grid/massactions',
-+    'Magento_Ui/js/modal/alert',
-+    'underscore',
-+    'jquery',
-+    'mage/translate'
-+], function (Massactions, uiAlert, _, $, $t) {
-+    'use strict';
-+
-+    return Massactions.extend({
-+        defaults: {
-+            ajaxSettings: {
-+                method: 'POST',
-+                dataType: 'json'
-+            },
-+            listens: {
-+                massaction: 'onAction'
-+            }
-+        },
-+
-+        /**
-+         * Reload customer addresses listing
-+         *
-+         * @param {Object} data
-+         */
-+        onAction: function (data) {
-+            if (data.action === 'delete') {
-+                this.source.reload({
-+                    refresh: true
-+                });
-+            }
-+        },
-+
-+        /**
-+         * Default action callback. Send selections data
-+         * via POST request.
-+         *
-+         * @param {Object} action - Action data.
-+         * @param {Object} data - Selections data.
-+         */
-+        defaultCallback: function (action, data) {
-+            var itemsType, selections;
-+
-+            if (action.isAjax) {
-+                itemsType = data.excludeMode ? 'excluded' : 'selected';
-+                selections = {};
-+
-+                selections[itemsType] = data[itemsType];
-+
-+                if (!selections[itemsType].length) {
-+                    selections[itemsType] = false;
-+                }
-+
-+                _.extend(selections, data.params || {});
-+
-+                this.request(action.url, selections).done(function (response) {
-+                    if (!response.error) {
-+                        this.trigger('massaction', {
-+                            action: action.type,
-+                            data: selections
-+                        });
-+                    }
-+                }.bind(this));
-+            } else {
-+                this._super();
-+            }
-+        },
-+
-+        /**
-+         * Send customer address listing mass action ajax request
-+         *
-+         * @param {String} href
-+         * @param {Object} data
-+         */
-+        request: function (href, data) {
-+            var settings = _.extend({}, this.ajaxSettings, {
-+                url: href,
-+                data: data
-+            });
-+
-+            $('body').trigger('processStart');
-+
-+            return $.ajax(settings)
-+                .done(function (response) {
-+                    if (response.error) {
-+                        uiAlert({
-+                            content: response.message
-+                        });
-+                    }
-+                })
-+                .fail(function () {
-+                    uiAlert({
-+                        content: $t('Sorry, there has been an error processing your request. Please try again later.')
-+                    });
-+                })
-+                .always(function () {
-+                    $('body').trigger('processStop');
-+                });
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Customer/view/adminhtml/web/template/default-address-wrapper.html b/app/code/Magento/Customer/view/adminhtml/web/template/default-address-wrapper.html
-new file mode 100644
-index 00000000000..2af366b0334
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/web/template/default-address-wrapper.html
-@@ -0,0 +1,7 @@
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<div class="customer-default-address-wrapper" each="data: elems, as: 'element'" render=""/>
-diff --git a/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html b/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html
-new file mode 100644
-index 00000000000..8d68b93445b
---- /dev/null
-+++ b/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html
-@@ -0,0 +1,47 @@
-+<div data-bind="attr: {class: contentClass}">
-+    <div data-bind="attr: {class: 'fieldset-wrapper address-information ' + defaultAddressClass}">
-+        <address>
-+            <div class="address_caption">
-+                <text args="title"/>
-+                <each args="data: elems, as: 'element'">
-+                    <render if="hasTemplate()"/>
-+                </each>
-+            </div>
-+            <div class="address_details" ifnot="_.isEmpty($data.address)">
-+                <text args="address.prefix" if="address.prefix"/>
-+                <text args="address.firstname"/>
-+                <text args="address.middlename" if="address.middlename"/>
-+                <text args="address.lastname"/>
-+                <text args="address.suffix" if="address.suffix"/>
-+                <br/>
-+                <if args="address.company">
-+                    <text args="address.company"/>
-+                    <br/>
-+                </if>
-+                <if args="address.street">
-+                    <text args="address.street" if="_.isString(address.street)"/>
-+                    <text args="_.values(address.street).filter(value => _.isString(value)).join(', ')"
-+                          ifnot="_.isString(address.street)"/>
-+                    <br/>
-+                </if>
-+                <text args="address.city + ', '" if="address.city"/>
-+                <text args="address.region + ', '" if="address.region"/>
-+                <if args="address.postcode">
-+                    <text args="address.postcode"/>
-+                    <br/>
-+                </if>
-+                <text args="address.country"/>
-+                <if args="address.telephone">
-+                    <br/>T: <a attr="href: 'tel:' + address.telephone" text="address.telephone"/>
-+                </if>
-+                <if args="address.fax">
-+                    <br/>F: <text args="address.fax"/>
-+                </if>
-+                <if args="address.vat_id">
-+                    <br/>VAT: <text args="address.vat_id"/>
-+                </if>
-+            </div>
-+            <translate args="notExistsMessage" if="_.isEmpty($data.address)"/>
-+        </address>
-+    </div>
-+</div>
-diff --git a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
-index 4de6644b948..5fb8b17dbb8 100644
---- a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
-+++ b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
-@@ -43,7 +43,7 @@
-             <validateUrl path="customer/index/validate"/>
-             <submitUrl path="customer/index/save"/>
-         </settings>
--        <dataProvider class="Magento\Customer\Model\Customer\DataProvider" name="customer_form_data_source">
-+        <dataProvider class="Magento\Customer\Model\Customer\DataProviderWithDefaultAddresses" name="customer_form_data_source">
-             <settings>
-                 <requestFieldName>id</requestFieldName>
-                 <primaryFieldName>entity_id</primaryFieldName>
-@@ -74,6 +74,17 @@
-                 <visible>false</visible>
-             </settings>
-         </field>
-+        <field name="confirmation" formElement="input">
-+            <argument name="data" xsi:type="array">
-+                <item name="config" xsi:type="array">
-+                    <item name="source" xsi:type="string">customer</item>
-+                </item>
-+            </argument>
-+            <settings>
-+                <dataType>text</dataType>
-+                <visible>false</visible>
-+            </settings>
-+        </field>
-         <field name="created_in" formElement="input">
-             <argument name="data" xsi:type="array">
-                 <item name="config" xsi:type="array">
-@@ -118,7 +129,7 @@
-                 </validation>
-                 <dataType>number</dataType>
-                 <tooltip>
--                    <link>http://docs.magento.com/m2/ce/user_guide/configuration/scope.html</link>
-+                    <link>https://docs.magento.com/m2/ce/user_guide/configuration/scope.html</link>
-                     <description translate="true">If your Magento installation has multiple websites, you can edit the scope to associate the customer with a specific site.</description>
-                 </tooltip>
-                 <imports>
-@@ -303,265 +314,196 @@
-             </formElements>
-         </field>
-     </fieldset>
--    <fieldset name="address">
--        <argument name="data" xsi:type="array">
--            <item name="config" xsi:type="array">
--                <item name="is_collection" xsi:type="boolean">true</item>
--                <item name="removeMessage" xsi:type="string" translate="true">Are you sure you want to delete this item?</item>
--            </item>
--        </argument>
-+    <fieldset name="address" class="Magento\Customer\Ui\Component\Form\AddressFieldset">
-         <settings>
-+            <collapsible>false</collapsible>
-             <label translate="true">Addresses</label>
-+            <componentType>fieldset</componentType>
-+            <additionalClasses>
-+                <class name="customer-address-form">true</class>
-+            </additionalClasses>
-         </settings>
--        <field name="parent_id" formElement="input">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
--            <settings>
--                <dataType>number</dataType>
--                <visible>false</visible>
--            </settings>
--        </field>
--        <field name="prefix" formElement="input">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
--            <settings>
--                <dataType>text</dataType>
--                <visible>true</visible>
--            </settings>
--        </field>
--        <field name="firstname" formElement="input">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
--            <settings>
--                <validation>
--                    <rule name="required-entry" xsi:type="boolean">true</rule>
--                </validation>
--                <dataType>text</dataType>
--                <imports>
--                    <link name="default">${ $.provider }:data.customer.firstname</link>
--                </imports>
--            </settings>
--        </field>
--        <field name="middlename" formElement="input">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
--            <settings>
--                <dataType>text</dataType>
--                <visible>true</visible>
--            </settings>
--        </field>
--        <field name="lastname" formElement="input">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
-+        <container name="customer_default_billing_address_wrapper" template="Magento_Customer/default-address-wrapper">
-+            <component name="customer_default_billing_address_content" template="Magento_Customer/default-address">
-+                <argument name="data" xsi:type="array">
-+                    <item name="config" xsi:type="array">
-+                        <item name="defaultAddressClass" xsi:type="string">billing-address</item>
-+                        <item name="title" translate="true" xsi:type="string">Default Billing Address</item>
-+                        <item name="contentClass" xsi:type="string">customer-default-billing-address-content</item>
-+                        <item name="notExistsMessage" xsi:type="string" translate="true">The customer does not have default billing address</item>
-+                        <item name="tracks" xsi:type="array">
-+                            <item name="address" xsi:type="boolean">true</item>
-+                        </item>
-+                    </item>
-+                </argument>
-+                <settings>
-+                    <imports>
-+                        <link name="address">${ $.provider}:data.default_billing_address</link>
-+                    </imports>
-+                </settings>
-+            </component>
-+            <button name="edit_billing_address" component="Magento_Customer/js/address/default-address">
-+                <argument name="data" xsi:type="array">
-+                    <item name="config" xsi:type="array">
-+                        <item name="buttonClasses" xsi:type="string">edit-default-billing-address-button</item>
-+                        <item name="actions" xsi:type="array">
-+                            <item name="0" xsi:type="array">
-+                                <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal.update_customer_address_form_loader</item>
-+                                <item name="actionName" xsi:type="string">destroyInserted</item>
-+                            </item>
-+                            <item name="1" xsi:type="array">
-+                                <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal</item>
-+                                <item name="actionName" xsi:type="string">openModal</item>
-+                            </item>
-+                            <item name="2" xsi:type="array">
-+                                <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal.update_customer_address_form_loader</item>
-+                                <item name="actionName" xsi:type="string">render</item>
-+                            </item>
-+                        </item>
-+                    </item>
-+                </argument>
-+                <settings>
-+                    <componentType>button</componentType>
-+                    <title translate="true">Edit</title>
-+                    <displayAsLink>true</displayAsLink>
-+                    <imports>
-+                        <link name="entityId">${ $.provider}:data.default_billing_address.entity_id</link>
-+                        <link name="entity">${ $.provider}:data.default_billing_address</link>
-+                    </imports>
-+                </settings>
-+            </button>
-+        </container>
-+        <container name="customer_default_shipping_address_wrapper" template="Magento_Customer/default-address-wrapper">
-+            <component name="customer_default_shipping_address_content" template="Magento_Customer/default-address">
-+                <argument name="data" xsi:type="array">
-+                    <item name="config" xsi:type="array">
-+                        <item name="defaultAddressClass" xsi:type="string">shipping-address</item>
-+                        <item name="title" xsi:type="string" translate="true">Default Shipping Address</item>
-+                        <item name="contentClass" xsi:type="string">customer-default-shipping-address-content</item>
-+                        <item name="notExistsMessage" xsi:type="string" translate="true">The customer does not have default shipping address</item>
-+                        <item name="tracks" xsi:type="array">
-+                            <item name="address" xsi:type="boolean">true</item>
-+                        </item>
-+                    </item>
-+                </argument>
-+                <settings>
-+                    <imports>
-+                        <link name="address">${ $.provider}:data.default_shipping_address</link>
-+                    </imports>
-+                </settings>
-+            </component>
-+            <button name="edit_shipping_address" component="Magento_Customer/js/address/default-address">
-+                <argument name="data" xsi:type="array">
-+                    <item name="config" xsi:type="array">
-+                        <item name="buttonClasses" xsi:type="string">edit-default-shipping-address-button</item>
-+                        <item name="actions" xsi:type="array">
-+                            <item name="0" xsi:type="array">
-+                                <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal.update_customer_address_form_loader</item>
-+                                <item name="actionName" xsi:type="string">destroyInserted</item>
-+                            </item>
-+                            <item name="1" xsi:type="array">
-+                                <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal</item>
-+                                <item name="actionName" xsi:type="string">openModal</item>
-+                            </item>
-+                            <item name="2" xsi:type="array">
-+                                <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal.update_customer_address_form_loader</item>
-+                                <item name="actionName" xsi:type="string">render</item>
-+                            </item>
-+                        </item>
-+                    </item>
-+                </argument>
-+                <settings>
-+                    <componentType>button</componentType>
-+                    <title translate="true">Edit</title>
-+                    <displayAsLink>true</displayAsLink>
-+                    <imports>
-+                        <link name="entityId">${ $.provider}:data.default_shipping_address.entity_id</link>
-+                        <link name="entity">${ $.provider}:data.default_shipping_address</link>
-+                    </imports>
-+                </settings>
-+            </button>
-+        </container>
-+        <button name="add_address" component="Magento_Customer/js/address/default-address">
-+            <argument name="data" xsi:type="array">
-+                <item name="config" xsi:type="array">
-+                    <item name="formElement" xsi:type="string">container</item>
-+                    <item name="buttonClasses" xsi:type="string">add-new-address-button</item>
-+                    <item name="actions" xsi:type="array">
-+                        <item name="0" xsi:type="array">
-+                            <item name="targetName" xsi:type="string">${ $.parentName}.customer_address_update_modal.update_customer_address_form_loader</item>
-+                            <item name="actionName" xsi:type="string">destroyInserted</item>
-+                        </item>
-+                        <item name="1" xsi:type="array">
-+                            <item name="targetName" xsi:type="string">${ $.parentName}.customer_address_update_modal</item>
-+                            <item name="actionName" xsi:type="string">openModal</item>
-+                        </item>
-+                        <item name="2" xsi:type="array">
-+                            <item name="targetName" xsi:type="string">${ $.parentName}.customer_address_update_modal.update_customer_address_form_loader</item>
-+                            <item name="actionName" xsi:type="string">render</item>
-+                        </item>
-+                    </item>
-                 </item>
-             </argument>
-             <settings>
--                <validation>
--                    <rule name="required-entry" xsi:type="boolean">true</rule>
--                </validation>
--                <dataType>text</dataType>
-+                <title translate="true">Add New Address</title>
-                 <imports>
--                    <link name="default">${ $.provider }:data.customer.lastname</link>
-+                    <link name="parentId">${ $.provider}:data.customer_id</link>
-                 </imports>
-             </settings>
--        </field>
--        <field name="suffix" sortOrder="43" formElement="input">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
--            <settings>
--                <dataType>text</dataType>
--                <visible>true</visible>
--            </settings>
--        </field>
--        <field name="company" sortOrder="44" formElement="input">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
-+        </button>
-+        <modal name="customer_address_update_modal">
-             <settings>
--                <validation>
--                    <rule name="min_text_length" xsi:type="number">0</rule>
--                </validation>
--                <dataType>text</dataType>
-+                <options>
-+                    <option name="title" xsi:type="string">Add/Update Address</option>
-+                </options>
-             </settings>
--        </field>
--        <field name="city" formElement="input">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
--            <settings>
--                <validation>
--                    <rule name="required-entry" xsi:type="boolean">true</rule>
--                </validation>
--                <dataType>text</dataType>
--            </settings>
--        </field>
--        <field name="country_id" component="Magento_Ui/js/form/element/country" formElement="select">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
--            <settings>
--                <validation>
--                    <rule name="required-entry" xsi:type="boolean">true</rule>
--                </validation>
--                <dataType>text</dataType>
-+            <insertForm name="update_customer_address_form_loader" component="Magento_Customer/js/form/components/insert-form">
-+                <argument name="data" xsi:type="array">
-+                    <item name="config" xsi:type="array">
-+                        <item name="addressListingProvider" xsi:type="string">ns = customer_address_listing, index = customer_address_listing</item>
-+                        <item name="addressModalProvider" xsi:type="string">${ $.parentName }</item>
-+                    </item>
-+                </argument>
-+                <settings>
-+                    <formSubmitType>ajax</formSubmitType>
-+                    <renderUrl path="mui/index/render_handle">
-+                        <param name="handle">customer_address_edit</param>
-+                        <param name="buttons">1</param>
-+                    </renderUrl>
-+                    <loading>false</loading>
-+                    <toolbarContainer>${ $.parentName }</toolbarContainer>
-+                    <externalProvider>${ $.ns }.customer_address_form_data_source</externalProvider>
-+                    <ns>customer_address_form</ns>
-+                    <exports>
-+                        <link name="parentId">${ $.externalProvider }:data.parent_id</link>
-+                    </exports>
-+                    <imports>
-+                        <link name="parentId">${ $.provider}:data.customer_id</link>
-+                        <link name="onAddressDelete">${ $.ns }.${ $.ns }:deleteAddressAction</link>
-+                    </imports>
-+                </settings>
-+            </insertForm>
-+        </modal>
-+        <insertListing name="customer_address_listing" component="Magento_Customer/js/form/components/insert-listing">
-+            <settings>
-+                <dataLinks>
-+                    <exports>false</exports>
-+                    <imports>true</imports>
-+                </dataLinks>
-+                <externalProvider>customer_address_listing.customer_address_listing_data_source</externalProvider>
-+                <selectionsProvider>customer_address_listing.customer_address_listing.customer_address_listing_columns.ids</selectionsProvider>
-+                <autoRender>true</autoRender>
-+                <dataScope>customer_address_listing</dataScope>
-+                <ns>customer_address_listing</ns>
-+                <exports>
-+                    <link name="parent_id">${ $.externalProvider }:params.parent_id</link>
-+                </exports>
-                 <imports>
--                    <link name="default">${ $.provider }:data.customer.website_id</link>
-+                    <link name="parent_id">${ $.provider }:data.customer.entity_id</link>
-+                    <link name="onAction">ns = ${ $.ns }, index = actions:action</link>
-+                    <link name="onMassAction">ns = ${ $.ns }, index = listing_massaction:massaction</link>
-                 </imports>
-             </settings>
--        </field>
--        <field name="region" formElement="input">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
--            <settings>
--                <dataType>text</dataType>
--                <visible>false</visible>
--            </settings>
--        </field>
--        <field name="region_id" component="Magento_Ui/js/form/element/region" formElement="select">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
--            <settings>
--                <validation>
--                    <rule name="required-entry" xsi:type="boolean">true</rule>
--                </validation>
--                <dataType>text</dataType>
--            </settings>
--            <formElements>
--                <select>
--                    <settings>
--                        <filterBy>
--                            <field>country_id</field>
--                            <target>${ $.provider }:${ $.parentScope }.country_id</target>
--                        </filterBy>
--                        <customEntry>region</customEntry>
--                    </settings>
--                </select>
--            </formElements>
--        </field>
--        <field name="postcode" component="Magento_Ui/js/form/element/post-code" formElement="input">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
--            <settings>
--                <validation>
--                    <rule name="required-entry" xsi:type="boolean">true</rule>
--                </validation>
--                <dataType>text</dataType>
--            </settings>
--        </field>
--        <field name="telephone" formElement="input">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
--            <settings>
--                <validation>
--                    <rule name="required-entry" xsi:type="boolean">true</rule>
--                </validation>
--                <dataType>text</dataType>
--            </settings>
--        </field>
--        <field name="fax" formElement="input">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
--            <settings>
--                <validation>
--                    <rule name="min_text_length" xsi:type="number">0</rule>
--                </validation>
--                <dataType>text</dataType>
--            </settings>
--        </field>
--        <field name="vat_id" formElement="input">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="source" xsi:type="string">address</item>
--                </item>
--            </argument>
--            <settings>
--                <dataType>text</dataType>
--            </settings>
--        </field>
--        <field name="default_billing" component="Magento_Ui/js/form/element/boolean" displayArea="head" formElement="checkbox">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="uniqueNs" xsi:type="string">default_billing</item>
--                    <item name="uniqueProp" xsi:type="string">value</item>
--                    <item name="source" xsi:type="array">
--                        <item name="target" xsi:type="string">customer</item>
--                        <item name="targetField" xsi:type="string">default_billing</item>
--                        <item name="referencedField" xsi:type="string">entity_id</item>
--                    </item>
--                </item>
--            </argument>
--            <settings>
--                <elementTmpl>ui/form/element/checkbox</elementTmpl>
--                <dataType>boolean</dataType>
--            </settings>
--            <formElements>
--                <checkbox>
--                    <settings>
--                        <description translate="true">Default Billing Address</description>
--                    </settings>
--                </checkbox>
--            </formElements>
--        </field>
--        <field name="default_shipping" component="Magento_Ui/js/form/element/boolean" displayArea="head" formElement="checkbox">
--            <argument name="data" xsi:type="array">
--                <item name="config" xsi:type="array">
--                    <item name="uniqueNs" xsi:type="string">default_shipping</item>
--                    <item name="uniqueProp" xsi:type="string">value</item>
--                    <item name="source" xsi:type="array">
--                        <item name="target" xsi:type="string">customer</item>
--                        <item name="targetField" xsi:type="string">default_shipping</item>
--                        <item name="referencedField" xsi:type="string">entity_id</item>
--                    </item>
--                </item>
--            </argument>
--            <settings>
--                <elementTmpl>ui/form/element/checkbox</elementTmpl>
--                <dataType>boolean</dataType>
--            </settings>
--            <formElements>
--                <checkbox>
--                    <settings>
--                        <description translate="true">Default Shipping Address</description>
--                    </settings>
--                </checkbox>
--            </formElements>
--        </field>
-+        </insertListing>
-     </fieldset>
- </form>
-diff --git a/app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html b/app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html
-index 6c17762a882..59e7f16adfd 100644
---- a/app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html
-+++ b/app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html
-@@ -21,7 +21,7 @@
-             <table class="inner-wrapper" border="0" cellspacing="0" cellpadding="0" align="center">
-                 <tr>
-                     <td align="center">
--                        <a href="{{var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])}}" target="_blank">{{trans "Set a New Password"}}</a>
-+                        <a href="{{var this.getUrl($store,'customer/account/createPassword/',[_query:[token:$customer.rp_token],_nosid:1])}}" target="_blank">{{trans "Set a New Password"}}</a>
-                     </td>
-                 </tr>
-             </table>
-diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
-index 8f65d54f458..0c5af453f23 100644
---- a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
-+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
-@@ -6,12 +6,18 @@
-  */
- -->
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <head>
-+        <title>Create New Customer Account</title>
-+    </head>
-     <body>
-         <referenceBlock name="head.components">
-             <block class="Magento\Framework\View\Element\Js\Components" name="customer_account_create_head_components" template="Magento_Customer::js/components.phtml"/>
-         </referenceBlock>
-         <referenceContainer name="content">
-             <block class="Magento\Customer\Block\Form\Register" name="customer_form_register" template="Magento_Customer::form/register.phtml">
-+                <arguments>
-+                    <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
-+                </arguments>
-                 <container name="form.additional.info" as="form_additional_info"/>
-                 <container name="customer.form.register.fields.before" as="form_fields_before" label="Form Fields Before" htmlTag="div" htmlClass="customer-form-before"/>
-             </block>
-diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml
-index 9a701c14a03..24cede5f023 100644
---- a/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml
-+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml
-@@ -7,7 +7,7 @@
- -->
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <head>
--        <title>Forgot Your Password</title>
-+        <title>Forgot Your Password?</title>
-     </head>
-     <body>
-         <referenceBlock name="root">
-diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml
-index d49dae6dee5..3518df736c4 100644
---- a/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml
-+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml
-@@ -6,6 +6,9 @@
-  */
- -->
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <head>
-+        <title>Customer Login</title>
-+    </head>
-     <body>
-         <referenceContainer name="content">
-             <!-- customer.form.login.extra -->
-diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
-index 194dfd1bc7d..f5ee2b347a5 100644
---- a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
-+++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
-@@ -17,7 +17,12 @@
-             </arguments>
-         </referenceBlock>
-         <referenceContainer name="content">
--            <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="Magento_Customer::address/edit.phtml" cacheable="false"/>
-+            <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="Magento_Customer::address/edit.phtml" cacheable="false">
-+                <arguments>
-+                    <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
-+                    <argument name="post_code_config" xsi:type="object">Magento\Customer\Block\DataProviders\PostCodesPatternsAttributeData</argument>
-+                </arguments>
-+            </block>
-         </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
-index bad120e4627..2c5e5b98e5f 100644
---- a/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
-+++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
-@@ -13,6 +13,7 @@
-         </referenceBlock>
-         <referenceContainer name="content">
-             <block class="Magento\Customer\Block\Address\Book" name="address_book" template="Magento_Customer::address/book.phtml" cacheable="false"/>
-+            <block class="Magento\Customer\Block\Address\Grid" name="address_grid" template="Magento_Customer::address/grid.phtml" cacheable="false"/>
-         </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/Customer/view/frontend/requirejs-config.js b/app/code/Magento/Customer/view/frontend/requirejs-config.js
-index 20dd53ded11..f1bf5c1d1b6 100644
---- a/app/code/Magento/Customer/view/frontend/requirejs-config.js
-+++ b/app/code/Magento/Customer/view/frontend/requirejs-config.js
-@@ -7,11 +7,13 @@ var config = {
-     map: {
-         '*': {
-             checkoutBalance:    'Magento_Customer/js/checkout-balance',
--            address:            'Magento_Customer/address',
--            changeEmailPassword: 'Magento_Customer/change-email-password',
-+            address:            'Magento_Customer/js/address',
-+            changeEmailPassword: 'Magento_Customer/js/change-email-password',
-             passwordStrengthIndicator: 'Magento_Customer/js/password-strength-indicator',
-             zxcvbn: 'Magento_Customer/js/zxcvbn',
--            addressValidation: 'Magento_Customer/js/addressValidation'
-+            addressValidation: 'Magento_Customer/js/addressValidation',
-+            'Magento_Customer/address': 'Magento_Customer/js/address',
-+            'Magento_Customer/change-email-password': 'Magento_Customer/js/change-email-password'
-         }
-     }
- };
-diff --git a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
-index ca7393f2129..0d4cf3c721d 100644
---- a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Account\AuthenticationPopup $block */
- ?>
- <div id="authenticationPopup" data-bind="scope:'authenticationPopup'" style="display: none;">
-diff --git a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
-index 2bdb6ac044a..11c55b1dc55 100644
---- a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
-@@ -4,10 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /** @var Magento\Customer\Block\Account\Customer $block */
- ?>
--<?php if($block->customerLoggedIn()): ?>
-+<?php if ($block->customerLoggedIn()) : ?>
-     <li class="customer-welcome">
-         <span class="customer-name"
-               role="link"
-@@ -16,7 +15,6 @@
-               data-toggle="dropdown"
-               data-trigger-keypress-button="true"
-               data-bind="scope: 'customer'">
--            <span data-bind="text: customer().fullname"></span>
-             <button type="button"
-                     class="action switch"
-                     tabindex="-1"
-@@ -37,10 +35,10 @@
-             }
-         }
-         </script>
--        <?php if($block->getChildHtml()):?>
--        <div class="customer-menu" data-target="dropdown">
--            <?= $block->getChildHtml() ?>
--        </div>
-+        <?php if ($block->getChildHtml()) :?>
-+            <div class="customer-menu" data-target="dropdown">
-+                <?= $block->getChildHtml() ?>
-+            </div>
-         <?php endif; ?>
-     </li>
- <?php endif; ?>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml
-index 8186bae5094..d306e8c7c73 100644
---- a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Account\Dashboard\Address $block */
- ?>
- <div class="block block-dashboard-addresses">
-diff --git a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml
-index ac8e1298b29..c4b3c9d657f 100644
---- a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Account\Dashboard\Info $block */
- ?>
- <div class="block block-dashboard-info">
-@@ -31,16 +29,16 @@
-                 </a>
-             </div>
-         </div>
--        <?php if ($block->isNewsletterEnabled()): ?>
-+        <?php if ($block->isNewsletterEnabled()) : ?>
-             <div class="box box-newsletter">
-                 <strong class="box-title">
-                     <span><?= $block->escapeHtml(__('Newsletters')) ?></span>
-                 </strong>
-                 <div class="box-content">
-                     <p>
--                        <?php if ($block->getIsSubscribed()): ?>
-+                        <?php if ($block->getIsSubscribed()) : ?>
-                             <?= $block->escapeHtml(__('You are subscribed to "General Subscription".')) ?>
--                        <?php else: ?>
-+                        <?php else : ?>
-                             <?= $block->escapeHtml(__('You aren\'t subscribed to our newsletter.')) ?>
-                         <?php endif; ?>
-                     </p>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
-index 24657a6846c..14827388e38 100644
---- a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Account\AuthorizationLink $block */
- 
- $dataPostParam = '';
-diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml
-index 20638b798d7..4816632ef9a 100644
---- a/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div class="actions-toolbar">
-     <div class="secondary"><a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a></div>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/additionalinfocustomer.phtml b/app/code/Magento/Customer/view/frontend/templates/additionalinfocustomer.phtml
-index 74b13830c91..3bfc1ca9c63 100644
---- a/app/code/Magento/Customer/view/frontend/templates/additionalinfocustomer.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/additionalinfocustomer.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,6 +10,6 @@
-  *
-  */
- ?>
--<?php if ($this->helper('Magento\Checkout\Helper\Data')->isContextCheckout()): ?>
-+<?php if ($this->helper(\Magento\Checkout\Helper\Data::class)->isContextCheckout()) : ?>
-     <input name="context" type="hidden" value="checkout" />
- <?php endif; ?>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
-index 45c13d93574..8e401f51509 100644
---- a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
-@@ -4,14 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Address\Book $block */
- ?>
- <div class="block block-addresses-default">
-     <div class="block-title"><strong><?= $block->escapeHtml(__('Default Addresses')) ?></strong></div>
-     <div class="block-content">
--        <?php if ($_pAddsses = $block->getDefaultBilling()): ?>
-+        <?php if ($_pAddsses = $block->getDefaultBilling()) : ?>
-             <div class="box box-address-billing">
-                 <strong class="box-title">
-                     <span><?= $block->escapeHtml(__('Default Billing Address')) ?></span>
-@@ -27,7 +25,7 @@
-                     </a>
-                 </div>
-             </div>
--        <?php else: ?>
-+        <?php else : ?>
-             <div class="box box-billing-address">
-                 <strong class="box-title"><span><?= $block->escapeHtml(__('Default Billing Address')) ?></span></strong>
-                 <div class="box-content">
-@@ -36,7 +34,7 @@
-             </div>
-         <?php endif ?>
- 
--        <?php if ($_pAddsses = $block->getDefaultShipping()): ?>
-+        <?php if ($_pAddsses = $block->getDefaultShipping()) : ?>
-             <div class="box box-address-shipping">
-                 <strong class="box-title">
-                     <span><?= $block->escapeHtml(__('Default Shipping Address')) ?></span>
-@@ -52,7 +50,7 @@
-                     </a>
-                 </div>
-             </div>
--        <?php else: ?>
-+        <?php else : ?>
-             <div class="box box-shipping-address">
-                 <strong class="box-title"><span><?= $block->escapeHtml(__('Default Shipping Address')) ?></span></strong>
-                 <div class="box-content">
-@@ -62,47 +60,3 @@
-         <?php endif ?>
-     </div>
- </div>
--
--<div class="block block-addresses-list">
--    <div class="block-title"><strong><?= $block->escapeHtml(__('Additional Address Entries')) ?></strong></div>
--    <div class="block-content">
--        <?php if ($_pAddsses = $block->getAdditionalAddresses()): ?>
--            <ol class="items addresses">
--                <?php foreach ($_pAddsses as $_address): ?>
--                    <li class="item">
--                        <address>
--                            <?= $block->getAddressHtml($_address) ?><br />
--                        </address>
--                        <div class="item actions">
--                            <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('customer/address/edit', ['id' => $_address->getId()])) ?>"><span><?= $block->escapeHtml(__('Edit Address')) ?></span></a>
--                            <a class="action delete" href="#" role="delete-address" data-address="<?= $block->escapeHtmlAttr($_address->getId()) ?>"><span><?= $block->escapeHtml(__('Delete Address')) ?></span></a>
--                        </div>
--                    </li>
--                <?php endforeach; ?>
--            </ol>
--        <?php else: ?>
--            <p class="empty"><?= $block->escapeHtml(__('You have no other address entries in your address book.')) ?></p>
--        <?php endif ?>
--    </div>
--</div>
--
--<div class="actions-toolbar">
--    <div class="primary">
--        <button type="button" role="add-address" title="<?= $block->escapeHtmlAttr(__('Add New Address')) ?>" class="action primary add"><span><?= $block->escapeHtml(__('Add New Address')) ?></span></button>
--    </div>
--    <div class="secondary">
--        <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
--    </div>
--</div>
--<script type="text/x-magento-init">
--    {
--        ".page-main": {
--            "address": {
--                "deleteAddress": "li.item a[role='delete-address']",
--                "deleteUrlPrefix": "<?= $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>id/",
--                "addAddress": "button[role='add-address']",
--                "addAddressLocation": "<?= $block->escapeJs($block->escapeUrl($block->getAddAddressUrl())) ?>"
--            }
--        }
--    }
--</script>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
-index 6a129a3aa4b..cf5b60568ad 100644
---- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
-@@ -4,13 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Address\Edit $block */
- ?>
--<?php $_company = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Company') ?>
--<?php $_telephone = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Telephone') ?>
--<?php $_fax = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Fax') ?>
-+<?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
-+<?php $_telephone = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Telephone::class) ?>
-+<?php $_fax = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Fax::class) ?>
- <form class="form-address-edit"
-       action="<?= $block->escapeUrl($block->getSaveUrl()) ?>"
-       method="post"
-@@ -24,36 +22,36 @@
-         <input type="hidden" name="error_url" value="<?= $block->escapeUrl($block->getErrorUrl()) ?>">
-         <?= $block->getNameBlockHtml() ?>
- 
--        <?php if ($_company->isEnabled()): ?>
-+        <?php if ($_company->isEnabled()) : ?>
-             <?= $_company->setCompany($block->getAddress()->getCompany())->toHtml() ?>
-         <?php endif ?>
- 
--        <?php if ($_telephone->isEnabled()): ?>
-+        <?php if ($_telephone->isEnabled()) : ?>
-             <?= $_telephone->setTelephone($block->getAddress()->getTelephone())->toHtml() ?>
-         <?php endif ?>
- 
--        <?php if ($_fax->isEnabled()): ?>
-+        <?php if ($_fax->isEnabled()) : ?>
-             <?= $_fax->setFax($block->getAddress()->getFax())->toHtml() ?>
-         <?php endif ?>
- 
-     </fieldset>
-     <fieldset class="fieldset">
-         <legend class="legend"><span><?= $block->escapeHtml(__('Address')) ?></span></legend><br>
--        <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-+        <?php $_streetValidationClass = $this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('street'); ?>
-         <div class="field street required">
-             <label for="street_1" class="label">
--                <span><?= $block->escapeHtml(__('Street Address')) ?></span>
-+                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?></span>
-             </label>
-             <div class="control">
-                 <input type="text"
-                        name="street[]"
-                        value="<?= $block->escapeHtmlAttr($block->getStreetLine(1)) ?>"
--                       title="<?= $block->escapeHtmlAttr(__('Street Address')) ?>"
-+                       title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?>"
-                        id="street_1"
-                        class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>"/>
-                 <div class="nested">
-                     <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
--                    <?php for ($_i = 1, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i < $_n; $_i++): ?>
-+                    <?php for ($_i = 1, $_n = $this->helper(\Magento\Customer\Helper\Address::class)->getStreetLines(); $_i < $_n; $_i++) : ?>
-                         <div class="field additional">
-                             <label class="label" for="street_<?= /* @noEscape */ $_i + 1 ?>">
-                                 <span><?= $block->escapeHtml(__('Street Address %1', $_i + 1)) ?></span>
-@@ -71,97 +69,100 @@
-             </div>
-         </div>
- 
--        <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
-+        <?php if ($this->helper(\Magento\Customer\Helper\Address::class)->isVatAttributeVisible()) : ?>
-             <div class="field taxvat">
-                 <label class="label" for="vat_id">
--                    <span><?= $block->escapeHtml(__('VAT Number')) ?></span>
-+                    <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?></span>
-                 </label>
-                 <div class="control">
-                     <input type="text"
-                            name="vat_id"
-                            value="<?= $block->escapeHtmlAttr($block->getAddress()->getVatId()) ?>"
--                           title="<?= $block->escapeHtmlAttr(__('VAT Number')) ?>"
--                           class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id')) ?>"
-+                           title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?>"
-+                           class="input-text <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('vat_id')) ?>"
-                            id="vat_id">
-                 </div>
-             </div>
-         <?php endif; ?>
-         <div class="field city required">
--            <label class="label" for="city"><span><?= $block->escapeHtml(__('City')) ?></span></label>
-+            <label class="label" for="city"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span></label>
-             <div class="control">
-                 <input type="text"
-                        name="city"
-                        value="<?= $block->escapeHtmlAttr($block->getAddress()->getCity()) ?>"
-                        title="<?= $block->escapeHtmlAttr(__('City')) ?>"
--                       class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city')) ?>"
-+                       class="input-text <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('city')) ?>"
-                        id="city">
-             </div>
-         </div>
-         <div class="field region required">
-             <label class="label" for="region_id">
--                <span><?= $block->escapeHtml(__('State/Province')) ?></span>
-+                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span>
-             </label>
-             <div class="control">
-                 <select id="region_id" name="region_id"
--                        title="<?= $block->escapeHtmlAttr(__('State/Province')) ?>"
--                        class="validate-select" <?= /* @noEscape */ !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
-+                        title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
-+                        class="validate-select region_id" <?= /* @noEscape */ !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
-                     <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
-                 </select>
-                 <input type="text"
-                        id="region"
-                        name="region"
-                        value="<?= $block->escapeHtmlAttr($block->getRegion()) ?>"
--                       title="<?= $block->escapeHtmlAttr(__('State/Province')) ?>"
--                       class="input-text validate-not-number-first <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>"<?= !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>/>
-+                       title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
-+                       class="input-text validate-not-number-first <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('region')) ?>"<?= !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>/>
-             </div>
-         </div>
-         <div class="field zip required">
-             <label class="label" for="zip">
--                <span><?= $block->escapeHtml(__('Zip/Postal Code')) ?></span>
-+                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span>
-             </label>
-             <div class="control">
-                 <input type="text"
-                        name="postcode"
-                        value="<?= $block->escapeHtmlAttr($block->getAddress()->getPostcode()) ?>"
--                       title="<?= $block->escapeHtmlAttr(__('Zip/Postal Code')) ?>"
-+                       title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>"
-                        id="zip"
--                       class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
-+                       class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('postcode')) ?>">
-+                <div role="alert" class="message warning" style="display:none">
-+                    <span></span>
-+                </div>
-             </div>
-         </div>
-         <div class="field country required">
--            <label class="label" for="country"><span><?= $block->escapeHtml(__('Country')) ?></span></label>
-+            <label class="label" for="country"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('country_id') ?></span></label>
-             <div class="control">
-                 <?= $block->getCountryHtmlSelect() ?>
-             </div>
-         </div>
- 
--        <?php if ($block->isDefaultBilling()): ?>
-+        <?php if ($block->isDefaultBilling()) : ?>
-             <div class="message info">
-                 <span><?= $block->escapeHtml(__("It's a default billing address.")) ?></span>
-             </div>
--        <?php elseif ($block->canSetAsDefaultBilling()): ?>
-+        <?php elseif ($block->canSetAsDefaultBilling()) : ?>
-             <div class="field choice set billing">
-                 <input type="checkbox" id="primary_billing" name="default_billing" value="1" class="checkbox">
-                 <label class="label" for="primary_billing">
-                     <span><?= $block->escapeHtml(__('Use as my default billing address')) ?></span>
-                 </label>
-             </div>
--        <?php else: ?>
-+        <?php else : ?>
-             <input type="hidden" name="default_billing" value="1" />
-         <?php endif; ?>
- 
--        <?php if ($block->isDefaultShipping()): ?>
-+        <?php if ($block->isDefaultShipping()) : ?>
-             <div class="message info">
-                 <span><?= $block->escapeHtml(__("It's a default shipping address.")) ?></span>
-             </div>
--        <?php elseif ($block->canSetAsDefaultShipping()): ?>
-+        <?php elseif ($block->canSetAsDefaultShipping()) : ?>
-             <div class="field choice set shipping">
-                 <input type="checkbox" id="primary_shipping" name="default_shipping" value="1" class="checkbox">
-                 <label class="label" for="primary_shipping">
-                     <span><?= $block->escapeHtml(__('Use as my default shipping address')) ?></span>
-                 </label>
-             </div>
--        <?php else: ?>
-+        <?php else : ?>
-             <input type="hidden" name="default_shipping" value="1">
-         <?php endif; ?>
-     </fieldset>
-@@ -184,7 +185,9 @@
- <script type="text/x-magento-init">
-     {
-         "#form-validate": {
--            "addressValidation": {}
-+            "addressValidation": {
-+                "postCodes": <?= /* @noEscape */ $block->getPostCodeConfig()->getSerializedPostCodes(); ?>
-+            }
-         },
-         "#country": {
-             "regionUpdater": {
-diff --git a/app/code/Magento/Customer/view/frontend/templates/address/grid.phtml b/app/code/Magento/Customer/view/frontend/templates/address/grid.phtml
-new file mode 100644
-index 00000000000..0dc8214fd28
---- /dev/null
-+++ b/app/code/Magento/Customer/view/frontend/templates/address/grid.phtml
-@@ -0,0 +1,80 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/** @var \Magento\Customer\Block\Address\Grid $block */
-+$customerAddressView = $block->getData('customer_address');
-+?>
-+
-+<div class="block block-addresses-list">
-+    <div class="block-title"><strong><?= $block->escapeHtml(__('Additional Address Entries')) ?></strong></div>
-+    <div class="block-content">
-+        <?php if ($_pAddsses = $block->getAdditionalAddresses()) : ?>
-+
-+            <div class="table-wrapper additional-addresses">
-+                <table class="data table table-additional-addresses-items history" id="additional-addresses-table">
-+                    <caption class="table-caption"><?= $block->escapeHtml(__('Additional addresses')) ?></caption>
-+                    <thead>
-+                    <tr>
-+                        <th scope="col" class="col firstname"><?= $block->escapeHtml(__('First Name')) ?></th>
-+                        <th scope="col" class="col lastname"><?= $block->escapeHtml(__('Last Name')) ?></th>
-+                        <th scope="col" class="col streetaddress"><?= $block->escapeHtml(__('Street Address')) ?></th>
-+                        <th scope="col" class="col city"><?= $block->escapeHtml(__('City')) ?></th>
-+                        <th scope="col" class="col country"><?= $block->escapeHtml(__('Country')) ?></th>
-+                        <th scope="col" class="col state"><?= $block->escapeHtml(__('State')) ?></th>
-+                        <th scope="col" class="col zip"><?= $block->escapeHtml(__('Zip/Postal Code')) ?></th>
-+                        <th scope="col" class="col phone"><?= $block->escapeHtml(__('Phone')) ?></th>
-+                        <th scope="col" class="col actions"> </th>
-+                    </tr>
-+                    </thead>
-+                    <tbody>
-+                    <?php foreach ($_pAddsses as $address) : ?>
-+                        <tr>
-+                            <td data-th="<?= $block->escapeHtml(__('First Name')) ?>" class="col firstname"><?= $block->escapeHtml($address->getFirstname()) ?></td>
-+                            <td data-th="<?= $block->escapeHtml(__('Last Name')) ?>" class="col lastname"><?= $block->escapeHtml($address->getLastname()) ?></td>
-+                            <td data-th="<?= $block->escapeHtml(__('Street Address')) ?>" class="col streetaddress"><?= $block->escapeHtml($block->getStreetAddress($address)) ?></td>
-+                            <td data-th="<?= $block->escapeHtml(__('City')) ?>" class="col city"><?= $block->escapeHtml($address->getCity()) ?></td>
-+                            <td data-th="<?= $block->escapeHtml(__('Country')) ?>" class="col country"><?= $block->escapeHtml($block->getCountryByCode($address->getCountryId())) ?></td>
-+                            <td data-th="<?= $block->escapeHtml(__('State')) ?>" class="col state"><?= $block->escapeHtml($address->getRegion()->getRegion()) ?></td>
-+                            <td data-th="<?= $block->escapeHtml(__('Zip/Postal Code')) ?>" class="col zip"><?= $block->escapeHtml($address->getPostcode()) ?></td>
-+                            <td data-th="<?= $block->escapeHtml(__('Phone')) ?>" class="col phone"><?= $block->escapeHtml($address->getTelephone()) ?></td>
-+                            <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
-+                                <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('customer/address/edit', ['id' => $address->getId()])) ?>"><span><?= $block->escapeHtml(__('Edit')) ?></span></a>
-+                                <a class="action delete" href="#" role="delete-address" data-address="<?= $block->escapeHtmlAttr($address->getId()) ?>"><span><?= $block->escapeHtml(__('Delete')) ?></span></a>
-+                            </td>
-+                        </tr>
-+                    <?php endforeach; ?>
-+                    </tbody>
-+                </table>
-+            </div>
-+            <?php if ($block->getChildHtml('pager')) : ?>
-+                <div class="customer-addresses-toolbar toolbar bottom"><?= $block->getChildHtml('pager') ?></div>
-+            <?php endif ?>
-+        <?php else : ?>
-+            <p class="empty"><?= $block->escapeHtml(__('You have no other address entries in your address book.')) ?></p>
-+        <?php endif ?>
-+    </div>
-+</div>
-+
-+<div class="actions-toolbar">
-+    <div class="primary">
-+        <button type="button" role="add-address" title="<?= $block->escapeHtmlAttr(__('Add New Address')) ?>" class="action primary add"><span><?= $block->escapeHtml(__('Add New Address')) ?></span></button>
-+    </div>
-+    <div class="secondary">
-+        <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
-+    </div>
-+</div>
-+<script type="text/x-magento-init">
-+    {
-+        ".page-main": {
-+            "address": {
-+                "deleteAddress": "td a[role='delete-address']",
-+                "deleteUrlPrefix": "<?= $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>id/",
-+                "addAddress": "button[role='add-address']",
-+                "addAddressLocation": "<?= $block->escapeJs($block->escapeUrl($block->getAddAddressUrl())) ?>"
-+            }
-+        }
-+    }
-+</script>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml b/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
-index 8edb21ac8e1..f558d305e70 100644
---- a/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Framework\View\Element\Template $block */
- ?>
- <form action="" method="post" id="form-validate" class="form send confirmation" data-mage-init='{"validation":{}}'>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
-index 75c7d9cffed..2718f03909b 100644
---- a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
-@@ -4,26 +4,24 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Form\Edit $block */
- ?>
- <form class="form form-edit-account" action="<?= $block->escapeUrl($block->getUrl('customer/account/editPost')) ?>" method="post" id="form-validate" enctype="multipart/form-data" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>" autocomplete="off">
-     <fieldset class="fieldset info">
-         <?= $block->getBlockHtml('formkey') ?>
-         <legend class="legend"><span><?= $block->escapeHtml(__('Account Information')) ?></span></legend><br>
--        <?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getCustomer())->toHtml() ?>
-+        <?= $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Name::class)->setObject($block->getCustomer())->toHtml() ?>
- 
--        <?php $_dob = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
--        <?php $_taxvat = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
--        <?php $_gender = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
--        <?php if ($_dob->isEnabled()): ?>
-+        <?php $_dob = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Dob::class) ?>
-+        <?php $_taxvat = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Taxvat::class) ?>
-+        <?php $_gender = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Gender::class) ?>
-+        <?php if ($_dob->isEnabled()) : ?>
-             <?= $_dob->setDate($block->getCustomer()->getDob())->toHtml() ?>
-         <?php endif ?>
--        <?php if ($_taxvat->isEnabled()): ?>
-+        <?php if ($_taxvat->isEnabled()) : ?>
-             <?= $_taxvat->setTaxvat($block->getCustomer()->getTaxvat())->toHtml() ?>
-         <?php endif ?>
--        <?php if ($_gender->isEnabled()): ?>
-+        <?php if ($_gender->isEnabled()) : ?>
-             <?= $_gender->setGender($block->getCustomer()->getGender())->toHtml() ?>
-         <?php endif ?>
-         <div class="field choice">
-@@ -31,7 +29,7 @@
-             <label class="label" for="change-email"><span><?= $block->escapeHtml(__('Change Email')) ?></span></label>
-         </div>
-         <div class="field choice">
--            <input type="checkbox" name="change_password" id="change-password" data-role="change-password" value="1" title="<?= $block->escapeHtmlAttr(__('Change Password')) ?>"<?php if ($block->getChangePassword()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-+            <input type="checkbox" name="change_password" id="change-password" data-role="change-password" value="1" title="<?= $block->escapeHtmlAttr(__('Change Password')) ?>"<?php if ($block->getChangePassword()) : ?> checked="checked"<?php endif; ?> class="checkbox" />
-             <label class="label" for="change-password"><span><?= $block->escapeHtml(__('Change Password')) ?></span></label>
-         </div>
-     </fieldset>
-@@ -97,7 +95,7 @@
-         var ignore = <?= /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null' ?>;
-         
-         dataForm.mage('validation', {
--        <?php if ($_dob->isEnabled()): ?>
-+        <?php if ($_dob->isEnabled()) : ?>
-             errorPlacement: function(error, element) {
-                 if (element.prop('id').search('full') !== -1) {
-                     var dobElement = $(element).parents('.customer-dob'),
-@@ -111,7 +109,7 @@
-                 }
-             },
-             ignore: ':hidden:not(' + ignore + ')'
--        <?php else: ?>
-+        <?php else : ?>
-             ignore: ignore ? ':hidden:not(' + ignore + ')' : ':hidden'
-         <?php endif ?>
-         });
-diff --git a/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
-index f8eb0bd44b6..be201afa8f6 100644
---- a/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
-@@ -6,8 +6,6 @@
-  * @var $block \Magento\Customer\Block\Account\Forgotpassword
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Account\Forgotpassword $block */
- ?>
- <form class="form password forget"
-diff --git a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
-index d85e76e4cbc..ef74b0062c0 100644
---- a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Form\Login $block */
- ?>
- <div class="block block-customer-login">
-@@ -24,13 +22,13 @@
-                 <div class="field email required">
-                     <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
-                     <div class="control">
--                        <input name="login[username]" value="<?= $block->escapeHtmlAttr($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()): ?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
-+                        <input name="login[username]" value="<?= $block->escapeHtmlAttr($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()) : ?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
-                     </div>
-                 </div>
-                 <div class="field password required">
-                     <label for="pass" class="label"><span><?= $block->escapeHtml(__('Password')) ?></span></label>
-                     <div class="control">
--                        <input name="login[password]" type="password" <?php if ($block->isAutocompleteDisabled()): ?> autocomplete="off"<?php endif; ?> class="input-text" id="pass" title="<?= $block->escapeHtmlAttr(__('Password')) ?>" data-validate="{required:true}">
-+                        <input name="login[password]" type="password" <?php if ($block->isAutocompleteDisabled()) : ?> autocomplete="off"<?php endif; ?> class="input-text" id="pass" title="<?= $block->escapeHtmlAttr(__('Password')) ?>" data-validate="{required:true}">
-                     </div>
-                 </div>
-                 <?= $block->getChildHtml('form_additional_info') ?>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml b/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
-index f7b7217a9b4..83059fab1b3 100644
---- a/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Newsletter $block */
- ?>
- <?= $block->getChildHtml('form_before') ?>
-@@ -14,7 +12,7 @@
-             <?= $block->getBlockHtml('formkey') ?>
-             <legend class="legend"><span><?= $block->escapeHtml(__('Subscription option')) ?></span></legend><br>
-             <div class="field choice">
--                <input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?= $block->escapeHtmlAttr(__('General Subscription')) ?>"<?php if ($block->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
-+                <input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?= $block->escapeHtmlAttr(__('General Subscription')) ?>"<?php if ($block->getIsSubscribed()) : ?> checked="checked"<?php endif; ?> class="checkbox">
-                 <label for="subscription" class="label"><span><?= $block->escapeHtml(__('General Subscription')) ?></span></label>
-             </div>
-             <?php /* Extensions placeholder */ ?>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
-index 6cdb8fc44f6..da0bb6e4cbc 100644
---- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Form\Register $block */
- ?>
- <?= $block->getChildHtml('form_fields_before') ?>
-@@ -17,60 +15,60 @@
-         <legend class="legend"><span><?= $block->escapeHtml(__('Personal Information')) ?></span></legend><br>
-         <input type="hidden" name="success_url" value="<?= $block->escapeUrl($block->getSuccessUrl()) ?>">
-         <input type="hidden" name="error_url" value="<?= $block->escapeUrl($block->getErrorUrl()) ?>">
--        <?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
--        <?php if ($block->isNewsletterEnabled()): ?>
-+        <?= $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Name::class)->setObject($block->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
-+        <?php if ($block->isNewsletterEnabled()) : ?>
-             <div class="field choice newsletter">
--                <input type="checkbox" name="is_subscribed" title="<?= $block->escapeHtmlAttr(__('Sign Up for Newsletter')) ?>" value="1" id="is_subscribed"<?php if ($block->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
-+                <input type="checkbox" name="is_subscribed" title="<?= $block->escapeHtmlAttr(__('Sign Up for Newsletter')) ?>" value="1" id="is_subscribed"<?php if ($block->getFormData()->getIsSubscribed()) : ?> checked="checked"<?php endif; ?> class="checkbox">
-                 <label for="is_subscribed" class="label"><span><?= $block->escapeHtml(__('Sign Up for Newsletter')) ?></span></label>
-             </div>
-             <?php /* Extensions placeholder */ ?>
-             <?= $block->getChildHtml('customer.form.register.newsletter') ?>
-         <?php endif ?>
- 
--        <?php $_dob = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
--        <?php if ($_dob->isEnabled()): ?>
-+        <?php $_dob = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Dob::class) ?>
-+        <?php if ($_dob->isEnabled()) : ?>
-             <?= $_dob->setDate($block->getFormData()->getDob())->toHtml() ?>
-         <?php endif ?>
- 
--        <?php $_taxvat = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
--        <?php if ($_taxvat->isEnabled()): ?>
-+        <?php $_taxvat = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Taxvat::class) ?>
-+        <?php if ($_taxvat->isEnabled()) : ?>
-             <?= $_taxvat->setTaxvat($block->getFormData()->getTaxvat())->toHtml() ?>
-         <?php endif ?>
- 
--        <?php $_gender = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
--        <?php if ($_gender->isEnabled()): ?>
-+        <?php $_gender = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Gender::class) ?>
-+        <?php if ($_gender->isEnabled()) : ?>
-             <?= $_gender->setGender($block->getFormData()->getGender())->toHtml() ?>
-         <?php endif ?>
-     </fieldset>
--    <?php if ($block->getShowAddressFields()): ?>
-+    <?php if ($block->getShowAddressFields()) : ?>
-         <fieldset class="fieldset address">
-             <legend class="legend"><span><?= $block->escapeHtml(__('Address Information')) ?></span></legend><br>
-             <input type="hidden" name="create_address" value="1" />
- 
--            <?php $_company = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Company') ?>
--            <?php if ($_company->isEnabled()): ?>
-+            <?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
-+            <?php if ($_company->isEnabled()) : ?>
-                 <?= $_company->setCompany($block->getFormData()->getCompany())->toHtml() ?>
-             <?php endif ?>
- 
--            <?php $_telephone = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Telephone') ?>
--            <?php if ($_telephone->isEnabled()): ?>
-+            <?php $_telephone = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Telephone::class) ?>
-+            <?php if ($_telephone->isEnabled()) : ?>
-                 <?= $_telephone->setTelephone($block->getFormData()->getTelephone())->toHtml() ?>
-             <?php endif ?>
- 
--            <?php $_fax = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Fax') ?>
--            <?php if ($_fax->isEnabled()): ?>
-+            <?php $_fax = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Fax::class) ?>
-+            <?php if ($_fax->isEnabled()) : ?>
-                 <?= $_fax->setFax($block->getFormData()->getFax())->toHtml() ?>
-             <?php endif ?>
- 
--            <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-+            <?php $_streetValidationClass = $this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('street'); ?>
- 
-             <div class="field street required">
--                <label for="street_1" class="label"><span><?= $block->escapeHtml(__('Street Address')) ?></span></label>
-+                <label for="street_1" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?></span></label>
-                 <div class="control">
--                    <input type="text" name="street[]" value="<?= $block->escapeHtmlAttr($block->getFormData()->getStreet(0)) ?>" title="<?= $block->escapeHtmlAttr(__('Street Address')) ?>" id="street_1" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
-+                    <input type="text" name="street[]" value="<?= $block->escapeHtmlAttr($block->getFormData()->getStreet(0)) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?>" id="street_1" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
-                     <div class="nested">
-                         <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
--                        <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
-+                        <?php for ($_i = 2, $_n = $this->helper(\Magento\Customer\Helper\Address::class)->getStreetLines(); $_i <= $_n; $_i++) : ?>
-                             <div class="field additional">
-                                 <label class="label" for="street_<?= /* @noEscape */ $_i ?>">
-                                     <span><?= $block->escapeHtml(__('Address')) ?></span>
-@@ -85,37 +83,37 @@
-             </div>
- 
-             <div class="field required">
--                <label for="city" class="label"><span><?= $block->escapeHtml(__('City')) ?></span></label>
-+                <label for="city" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span></label>
-                 <div class="control">
--                    <input type="text" name="city" value="<?= $block->escapeHtmlAttr($block->getFormData()->getCity()) ?>" title="<?= $block->escapeHtmlAttr(__('City')) ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city')) ?>" id="city">
-+                    <input type="text" name="city" value="<?= $block->escapeHtmlAttr($block->getFormData()->getCity()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('city')) ?>" id="city">
-                 </div>
-             </div>
- 
-             <div class="field region required">
--                <label for="region_id" class="label"><span><?= $block->escapeHtml(__('State/Province')) ?></span></label>
-+                <label for="region_id" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span></label>
-                 <div class="control">
--                    <select id="region_id" name="region_id" title="<?= $block->escapeHtmlAttr(__('State/Province')) ?>" class="validate-select" style="display:none;">
-+                    <select id="region_id" name="region_id" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="validate-select region_id" style="display:none;">
-                         <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
-                     </select>
--                    <input type="text" id="region" name="region" value="<?= $block->escapeHtml($block->getRegion()) ?>" title="<?= $block->escapeHtmlAttr(__('State/Province')) ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>" style="display:none;">
-+                    <input type="text" id="region" name="region" value="<?= $block->escapeHtml($block->getRegion()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('region')) ?>" style="display:none;">
-                 </div>
-             </div>
- 
-             <div class="field zip required">
--                <label for="zip" class="label"><span><?= $block->escapeHtml(__('Zip/Postal Code')) ?></span></label>
-+                <label for="zip" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span></label>
-                 <div class="control">
--                    <input type="text" name="postcode" value="<?= $block->escapeHtmlAttr($block->getFormData()->getPostcode()) ?>" title="<?= $block->escapeHtmlAttr(__('Zip/Postal Code')) ?>" id="zip" class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
-+                    <input type="text" name="postcode" value="<?= $block->escapeHtmlAttr($block->getFormData()->getPostcode()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>" id="zip" class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('postcode')) ?>">
-                 </div>
-             </div>
- 
-             <div class="field country required">
--                <label for="country" class="label"><span><?= $block->escapeHtml(__('Country')) ?></span></label>
-+                <label for="country" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('country_id') ?></span></label>
-                 <div class="control">
-                     <?= $block->getCountryHtmlSelect() ?>
-                 </div>
-             </div>
-             <?php $addressAttributes = $block->getChildBlock('customer_form_address_user_attributes');?>
--            <?php if ($addressAttributes): ?>
-+            <?php if ($addressAttributes) : ?>
-                 <?php $addressAttributes->setEntityType('customer_address'); ?>
-                 <?php $addressAttributes->setFieldIdFormat('address:%1$s')->setFieldNameFormat('address[%1$s]');?>
-                 <?php $block->restoreSessionData($addressAttributes->getMetadataForm(), 'address');?>
-@@ -182,7 +180,7 @@ require([
-     var ignore = <?= /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null' ?>;
- 
-     dataForm.mage('validation', {
--    <?php if ($_dob->isEnabled()): ?>
-+    <?php if ($_dob->isEnabled()) : ?>
-         errorPlacement: function(error, element) {
-             if (element.prop('id').search('full') !== -1) {
-                 var dobElement = $(element).parents('.customer-dob'),
-@@ -196,14 +194,14 @@ require([
-             }
-         },
-         ignore: ':hidden:not(' + ignore + ')'
--    <?php else: ?>
-+    <?php else : ?>
-         ignore: ignore ? ':hidden:not(' + ignore + ')' : ':hidden'
-     <?php endif ?>
-     }).find('input:text').attr('autocomplete', 'off');
- 
- });
- </script>
--<?php if ($block->getShowAddressFields()): ?>
-+<?php if ($block->getShowAddressFields()) : ?>
- <script type="text/x-magento-init">
-     {
-         "#country": {
-diff --git a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
-index 15e570da04b..76a755bab6e 100644
---- a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
-@@ -4,13 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Account\Resetpassword $block */
- ?>
--<form action="<?= $block->escapeUrl($block->getUrl('*/*/resetpasswordpost', ['_query' => ['id' => $block->getCustomerId(), 'token' => $block->getResetPasswordLinkToken()]])) ?>"
-+<form action="<?= $block->escapeUrl($block->getUrl('*/*/resetpasswordpost', ['_query' => ['token' => $block->getResetPasswordLinkToken()]])) ?>"
-       method="post"
--      <?php if ($block->isAutocompleteDisabled()) :?> autocomplete="off"<?php endif; ?>
-+        <?php if ($block->isAutocompleteDisabled()) : ?> autocomplete="off"<?php endif; ?>
-       id="form-validate"
-       class="form password reset"
-       data-mage-init='{"validation":{}}'>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/js/components.phtml b/app/code/Magento/Customer/view/frontend/templates/js/components.phtml
-index bad5acc209b..5902a9f25cc 100644
---- a/app/code/Magento/Customer/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/js/components.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/js/customer-data/invalidation-rules.phtml b/app/code/Magento/Customer/view/frontend/templates/js/customer-data/invalidation-rules.phtml
-index f8e9c3bdcf1..15d0f522657 100644
---- a/app/code/Magento/Customer/view/frontend/templates/js/customer-data/invalidation-rules.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/js/customer-data/invalidation-rules.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /* @var $block \Magento\Customer\Block\CustomerScopeData */
- ?>
- <script type="text/x-magento-init">
-diff --git a/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml b/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
-index 83c803ac8d7..3235fa56cca 100644
---- a/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
-@@ -4,11 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Form\Login\Info $block */
- ?>
--<?php if ($block->getRegistration()->isAllowed()): ?>
-+<?php if ($block->getRegistration()->isAllowed()) : ?>
- <div class="block block-new-customer">
-     <div class="block-title">
-         <strong id="block-new-customer-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('New Customers')) ?></strong>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/company.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/company.phtml
-index 001a4107d94..c38ef1a4aed 100644
---- a/app/code/Magento/Customer/view/frontend/templates/widget/company.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/widget/company.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Widget\Company $block */
- ?>
- <div class="field company <?= $block->isRequired() ? 'required' : '' ?>">
-@@ -15,12 +13,12 @@
-         </span>
-     </label>
-     <div class="control">
--        <?php
-+            <?php
-             $_validationClass = $block->escapeHtmlAttr(
--                $this->helper('Magento\Customer\Helper\Address')
-+                $this->helper(\Magento\Customer\Helper\Address::class)
-                      ->getAttributeValidationClass('company')
-             );
--        ?>
-+            ?>
-         <input type="text"
-                name="company"
-                id="company"
-diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
-index 0a37896b810..ac4b9f93e0c 100644
---- a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Widget\Dob $block */
- 
- /*
-@@ -29,7 +27,7 @@ $fieldCssClass = 'field date field-' . $block->getHtmlId();
- $fieldCssClass .= $block->isRequired() ? ' required' : '';
- ?>
- <div class="<?= $block->escapeHtmlAttr($fieldCssClass) ?>">
--    <label class="label" for="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>"><span><?= $block->escapeHtml($block->getLabel()) ?></span></label>
-+    <label class="label" for="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('dob')) ?></span></label>
-     <div class="control customer-dob">
-         <?= $block->getFieldHtml() ?>
-         <?php if ($_message = $block->getAdditionalDescription()) : ?>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/fax.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/fax.phtml
-index d7a1eb280a0..eff081f5339 100644
---- a/app/code/Magento/Customer/view/frontend/templates/widget/fax.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/widget/fax.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Widget\Fax $block */
- ?>
- 
-@@ -16,12 +14,12 @@
-         </span>
-     </label>
-     <div class="control">
--        <?php
-+            <?php
-             $_validationClass = $block->escapeHtmlAttr(
--                $this->helper('Magento\Customer\Helper\Address')
-+                $this->helper(\Magento\Customer\Helper\Address::class)
-                      ->getAttributeValidationClass('fax')
-             );
--        ?>
-+            ?>
-         <input type="text"
-                name="fax"
-                id="fax"
-diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
-index d60f0968ad4..515b44afe75 100644
---- a/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
-@@ -4,18 +4,16 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Widget\Gender $block */
- ?>
--<div class="field gender<?php if ($block->isRequired()) echo ' required' ?>">
--    <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('gender')) ?>"><span><?= $block->escapeHtml(__('Gender')) ?></span></label>
-+<div class="field gender<?= $block->isRequired() ? ' required' : ''?>">
-+    <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('gender')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('gender')) ?></span></label>
-     <div class="control">
--        <select id="<?= $block->escapeHtmlAttr($block->getFieldId('gender')) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('gender')) ?>" title="<?= $block->escapeHtmlAttr(__('Gender')) ?>"<?php if ($block->isRequired()):?> class="validate-select" data-validate="{required:true}"<?php endif; ?>>
-+        <select id="<?= $block->escapeHtmlAttr($block->getFieldId('gender')) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('gender')) ?>" title="<?= $block->escapeHtmlAttr($block->getStoreLabel('gender')) ?>"<?php if ($block->isRequired()) : ?> class="validate-select" data-validate="{required:true}"<?php endif; ?>>
-             <?php $options = $block->getGenderOptions(); ?>
--            <?php $value = $block->getGender();?>
--            <?php foreach ($options as $option):?>
--                <option value="<?= $block->escapeHtmlAttr($option->getValue()) ?>"<?php if ($option->getValue() == $value) echo ' selected="selected"' ?>><?= $block->escapeHtml(__($option->getLabel())) ?></option>
-+            <?php $value = $block->getGender(); ?>
-+            <?php foreach ($options as $option) : ?>
-+                <option value="<?= $block->escapeHtmlAttr($option->getValue()) ?>"<?= ($option->getValue() == $value) ? ' selected="selected"' : '' ?>><?= $block->escapeHtml(__($option->getLabel())) ?></option>
-             <?php endforeach;?>
-         </select>
-     </div>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
-index 223e43c9bb8..00c1f124bd2 100644
---- a/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Widget\Name $block */
- 
- /*
-@@ -26,7 +24,7 @@ $prefix = $block->showPrefix();
- $middle = $block->showMiddlename();
- $suffix = $block->showSuffix();
- ?>
--<?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()): ?>
-+<?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()) : ?>
- <div class="field required fullname <?= $block->escapeHtmlAttr($block->getContainerClassName()) ?>">
-     <label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
-     <div class="control">
-@@ -34,23 +32,23 @@ $suffix = $block->showSuffix();
-         <div class="fields">
- <?php endif; ?>
- 
--    <?php if ($prefix): ?>
--        <div class="field field-name-prefix<?php if ($block->isPrefixRequired()) echo ' required' ?>">
-+    <?php if ($prefix) : ?>
-+        <div class="field field-name-prefix<?= $block->isPrefixRequired() ? ' required' : '' ?>">
-             <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span></label>
-             <div class="control">
--                <?php if ($block->getPrefixOptions() === false): ?>
-+                <?php if ($block->getPrefixOptions() === false) : ?>
-                     <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
-                            name="<?= $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
-                            value="<?= $block->escapeHtmlAttr($block->getObject()->getPrefix()) ?>"
-                            title="<?= $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
--                           class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?php if ($block->isPrefixRequired()) echo ' data-validate="{required:true}"' ?>>
--                <?php else: ?>
-+                           class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?= $block->isPrefixRequired() ? ' data-validate="{required:true}"' : '' ?>>
-+                <?php else : ?>
-                     <select id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
-                             name="<?= $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
-                             title="<?= $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
--                            class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?php if ($block->isPrefixRequired()) echo ' data-validate="{required:true}"' ?> >
--                        <?php foreach ($block->getPrefixOptions() as $_option): ?>
--                            <option value="<?= $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getPrefix() == $_option): ?> selected="selected"<?php endif; ?>>
-+                            class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?= $block->isPrefixRequired() ? ' data-validate="{required:true}"' : '' ?> >
-+                        <?php foreach ($block->getPrefixOptions() as $_option) : ?>
-+                            <option value="<?= $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getPrefix() == $_option) : ?> selected="selected"<?php endif; ?>>
-                                 <?= $block->escapeHtml(__($_option)) ?>
-                             </option>
-                         <?php endforeach; ?>
-@@ -66,10 +64,10 @@ $suffix = $block->showSuffix();
-                        name="<?= $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
-                        value="<?= $block->escapeHtmlAttr($block->getObject()->getFirstname()) ?>"
-                        title="<?= $block->escapeHtmlAttr($block->getStoreLabel('firstname')) ?>"
--                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('firstname')) ?>" <?php if ($block->getAttributeValidationClass('firstname') == 'required-entry') echo ' data-validate="{required:true}"' ?>>
-+                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('firstname')) ?>" <?= ($block->getAttributeValidationClass('firstname') == 'required-entry') ? ' data-validate="{required:true}"' : '' ?>>
-             </div>
-         </div>
--    <?php if ($middle): ?>
-+    <?php if ($middle) : ?>
-         <?php $isMiddlenameRequired = $block->isMiddlenameRequired(); ?>
-         <div class="field field-name-middlename<?= $isMiddlenameRequired ? ' required' : '' ?>">
-             <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span></label>
-@@ -89,26 +87,26 @@ $suffix = $block->showSuffix();
-                        name="<?= $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
-                        value="<?= $block->escapeHtmlAttr($block->getObject()->getLastname()) ?>"
-                        title="<?= $block->escapeHtmlAttr($block->getStoreLabel('lastname')) ?>"
--                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('lastname')) ?>" <?php if ($block->getAttributeValidationClass('lastname') == 'required-entry') echo ' data-validate="{required:true}"' ?>>
-+                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('lastname')) ?>" <?= ($block->getAttributeValidationClass('lastname') == 'required-entry') ? ' data-validate="{required:true}"' : '' ?>>
-             </div>
-         </div>
--    <?php if ($suffix): ?>
--        <div class="field field-name-suffix<?php if ($block->isSuffixRequired()) echo ' required' ?>">
-+    <?php if ($suffix) : ?>
-+        <div class="field field-name-suffix<?= $block->isSuffixRequired() ? ' required' : '' ?>">
-             <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span></label>
-             <div class="control">
--                <?php if ($block->getSuffixOptions() === false): ?>
-+                <?php if ($block->getSuffixOptions() === false) : ?>
-                     <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
-                            name="<?= $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
-                            value="<?= $block->escapeHtmlAttr($block->getObject()->getSuffix()) ?>"
-                            title="<?= $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
--                           class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?php if ($block->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
--                <?php else: ?>
-+                           class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?= $block->isSuffixRequired() ? ' data-validate="{required:true}"' : '' ?>>
-+                <?php else : ?>
-                     <select id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
-                             name="<?= $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
-                             title="<?= $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
--                            class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?php if ($block->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
--                        <?php foreach ($block->getSuffixOptions() as $_option): ?>
--                            <option value="<?= $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getSuffix() == $_option): ?> selected="selected"<?php endif; ?>>
-+                            class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?= $block->isSuffixRequired() ? ' data-validate="{required:true}"' : '' ?>>
-+                        <?php foreach ($block->getSuffixOptions() as $_option) : ?>
-+                            <option value="<?= $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getSuffix() == $_option) : ?> selected="selected"<?php endif; ?>>
-                                 <?= $block->escapeHtml(__($_option)) ?>
-                             </option>
-                         <?php endforeach; ?>
-@@ -118,7 +116,7 @@ $suffix = $block->showSuffix();
-         </div>
-     <?php endif; ?>
- 
--    <?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()): ?>
-+    <?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()) : ?>
-             </div>
-         </fieldset>
-     </div>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
-index 4b3681d4d8f..1551ea96094 100644
---- a/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
-@@ -4,13 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Widget\Taxvat $block */
- ?>
--<div class="field taxvat<?php if ($block->isRequired()) echo ' required'; ?>">
--    <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>"><span><?= $block->escapeHtml(__('Tax/VAT number')) ?></span></label>
-+<div class="field taxvat<?= $block->isRequired() ? ' required' : ''; ?>">
-+    <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('taxvat')) ?></span></label>
-     <div class="control">
--        <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('taxvat')) ?>" value="<?= $block->escapeHtmlAttr($block->getTaxvat()) ?>" title="<?= $block->escapeHtmlAttr(__('Tax/VAT number')) ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('taxvat')) ?>" <?php if ($block->isRequired()) echo ' data-validate="{required:true}"' ?>>
-+        <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('taxvat')) ?>" value="<?= $block->escapeHtmlAttr($block->getTaxvat()) ?>" title="<?= $block->escapeHtmlAttr($block->getStoreLabel('taxvat')) ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('taxvat')) ?>" <?= $block->isRequired() ? ' data-validate="{required:true}"' : '' ?>>
-     </div>
- </div>
-diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
-index 1b61dc45573..c444a157059 100644
---- a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
-+++ b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Customer\Block\Widget\Telephone $block */
- ?>
- 
-@@ -16,12 +14,12 @@
-         </span>
-     </label>
-     <div class="control">
--        <?php
-+            <?php
-             $_validationClass = $block->escapeHtmlAttr(
--                $this->helper('Magento\Customer\Helper\Address')
--                     ->getAttributeValidationClass('fax')
-+                $this->helper(\Magento\Customer\Helper\Address::class)
-+                     ->getAttributeValidationClass('telephone')
-             );
--        ?>
-+            ?>
-         <input type="text"
-                name="telephone"
-                id="telephone"
-diff --git a/app/code/Magento/Customer/view/frontend/web/address.js b/app/code/Magento/Customer/view/frontend/web/js/address.js
-similarity index 100%
-rename from app/code/Magento/Customer/view/frontend/web/address.js
-rename to app/code/Magento/Customer/view/frontend/web/js/address.js
-diff --git a/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js b/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
-index be2960701de..c014b814ea9 100644
---- a/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
-+++ b/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
-@@ -5,25 +5,38 @@
- 
- define([
-     'jquery',
-+    'underscore',
-+    'mageUtils',
-+    'mage/translate',
-+    'Magento_Checkout/js/model/postcode-validator',
-     'jquery/ui',
-     'validation'
--], function ($) {
-+], function ($, __, utils, $t, postCodeValidator) {
-     'use strict';
- 
-     $.widget('mage.addressValidation', {
-         options: {
-             selectors: {
--                button: '[data-action=save-address]'
-+                button: '[data-action=save-address]',
-+                zip: '#zip',
-+                country: 'select[name="country_id"]:visible'
-             }
-         },
- 
-+        zipInput: null,
-+        countrySelect: null,
-+
-         /**
-          * Validation creation
-+         *
-          * @protected
-          */
-         _create: function () {
-             var button = $(this.options.selectors.button, this.element);
- 
-+            this.zipInput = $(this.options.selectors.zip, this.element);
-+            this.countrySelect = $(this.options.selectors.country, this.element);
-+
-             this.element.validation({
- 
-                 /**
-@@ -36,6 +49,75 @@ define([
-                     form.submit();
-                 }
-             });
-+
-+            this._addPostCodeValidation();
-+        },
-+
-+        /**
-+         * Add postcode validation
-+         *
-+         * @protected
-+         */
-+        _addPostCodeValidation: function () {
-+            var self = this;
-+
-+            this.zipInput.on('keyup', __.debounce(function (event) {
-+                    var valid = self._validatePostCode(event.target.value);
-+
-+                    self._renderValidationResult(valid);
-+                }, 500)
-+            );
-+
-+            this.countrySelect.on('change', function () {
-+                var valid = self._validatePostCode(self.zipInput.val());
-+
-+                self._renderValidationResult(valid);
-+            });
-+        },
-+
-+        /**
-+         * Validate post code value.
-+         *
-+         * @protected
-+         * @param {String} postCode - post code
-+         * @return {Boolean} Whether is post code valid
-+         */
-+        _validatePostCode: function (postCode) {
-+            var countryId = this.countrySelect.val();
-+
-+            if (postCode === null) {
-+                return true;
-+            }
-+
-+            return postCodeValidator.validate(postCode, countryId, this.options.postCodes);
-+        },
-+
-+        /**
-+         * Renders warning messages for invalid post code.
-+         *
-+         * @protected
-+         * @param {Boolean} valid
-+         */
-+        _renderValidationResult: function (valid) {
-+            var warnMessage,
-+                alertDiv = this.zipInput.next();
-+
-+            if (!valid) {
-+                warnMessage = $t('Provided Zip/Postal Code seems to be invalid.');
-+
-+                if (postCodeValidator.validatedPostCodeExample.length) {
-+                    warnMessage += $t(' Example: ') + postCodeValidator.validatedPostCodeExample.join('; ') + '. ';
-+                }
-+                warnMessage += $t('If you believe it is the right one you can ignore this notice.');
-+            }
-+
-+            alertDiv.children(':first').text(warnMessage);
-+
-+            if (valid) {
-+                alertDiv.hide();
-+            } else {
-+                alertDiv.show();
-+            }
-         }
-     });
- 
-diff --git a/app/code/Magento/Customer/view/frontend/web/change-email-password.js b/app/code/Magento/Customer/view/frontend/web/js/change-email-password.js
-similarity index 100%
-rename from app/code/Magento/Customer/view/frontend/web/change-email-password.js
-rename to app/code/Magento/Customer/view/frontend/web/js/change-email-password.js
-diff --git a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
-index ec21e45da68..66d37cb84e9 100644
---- a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
-+++ b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
-@@ -75,17 +75,17 @@ define([
- 
-         /**
-          * @param {Object} sectionNames
--         * @param {Number} updateSectionId
-+         * @param {Boolean} forceNewSectionTimestamp
-          * @return {*}
-          */
--        getFromServer: function (sectionNames, updateSectionId) {
-+        getFromServer: function (sectionNames, forceNewSectionTimestamp) {
-             var parameters;
- 
-             sectionNames = sectionConfig.filterClientSideSections(sectionNames);
-             parameters = _.isArray(sectionNames) ? {
-                 sections: sectionNames.join(',')
-             } : [];
--            parameters['update_section_id'] = updateSectionId;
-+            parameters['force_new_section_timestamp'] = forceNewSectionTimestamp;
- 
-             return $.getJSON(options.sectionLoadUrl, parameters).fail(function (jqXHR) {
-                 throw new Error(jqXHR);
-@@ -199,7 +199,8 @@ define([
-                 privateContent = $.cookieStorage.get(privateContentVersion),
-                 localPrivateContent = $.localStorage.get(privateContentVersion),
-                 needVersion = 'need_version',
--                expiredSectionNames = this.getExpiredSectionNames();
-+                expiredSectionNames = this.getExpiredSectionNames(),
-+                isLoading = false;
- 
-             if (privateContent &&
-                 !$.cookieStorage.isSet(privateContentVersion) &&
-@@ -208,13 +209,18 @@ define([
-                 $.cookieStorage.set(privateContentVersion, needVersion);
-                 $.localStorage.set(privateContentVersion, needVersion);
-                 this.reload([], false);
-+                isLoading = true;
-             } else if (localPrivateContent !== privateContent) {
-                 if (!$.cookieStorage.isSet(privateContentVersion)) {
-                     privateContent = needVersion;
-                     $.cookieStorage.set(privateContentVersion, privateContent);
-                 }
-                 $.localStorage.set(privateContentVersion, privateContent);
-+                _.each(dataProvider.getFromStorage(storage.keys()), function (sectionData, sectionName) {
-+                    buffer.notify(sectionName, sectionData);
-+                });
-                 this.reload([], false);
-+                isLoading = true;
-             } else if (expiredSectionNames.length > 0) {
-                 _.each(dataProvider.getFromStorage(storage.keys()), function (sectionData, sectionName) {
-                     buffer.notify(sectionName, sectionData);
-@@ -233,7 +239,7 @@ define([
-             if (!_.isEmpty(privateContent)) {
-                 countryData = this.get('directory-data');
- 
--                if (_.isEmpty(countryData())) {
-+                if (_.isEmpty(countryData()) && !isLoading) {
-                     customerData.reload(['directory-data'], false);
-                 }
-             }
-@@ -323,11 +329,11 @@ define([
- 
-         /**
-          * @param {Array} sectionNames
--         * @param {Number} updateSectionId
-+         * @param {Boolean} forceNewSectionTimestamp
-          * @return {*}
-          */
--        reload: function (sectionNames, updateSectionId) {
--            return dataProvider.getFromServer(sectionNames, updateSectionId).done(function (sections) {
-+        reload: function (sectionNames, forceNewSectionTimestamp) {
-+            return dataProvider.getFromServer(sectionNames, forceNewSectionTimestamp).done(function (sections) {
-                 $(document).trigger('customer-data-reload', [sectionNames]);
-                 buffer.update(sections);
-             });
-diff --git a/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js b/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js
-index 89d9b320c04..9742e37f2df 100644
---- a/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js
-+++ b/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js
-@@ -83,7 +83,7 @@ define([
-                 } else {
-                     isValid = $.validator.validateSingleElement(this.options.cache.input);
-                     zxcvbnScore = zxcvbn(password).score;
--                    displayScore = isValid ? zxcvbnScore : 1;
-+                    displayScore = isValid && zxcvbnScore > 0 ? zxcvbnScore : 1;
-                 }
-             }
- 
-diff --git a/app/code/Magento/CustomerAnalytics/README.md b/app/code/Magento/CustomerAnalytics/README.md
-index 8c64ce97629..9658a8e7d90 100644
---- a/app/code/Magento/CustomerAnalytics/README.md
-+++ b/app/code/Magento/CustomerAnalytics/README.md
-@@ -1,3 +1,3 @@
- # Magento_CustomerAnalytics module
- 
--The Magento_CustomerAnalytics module configures data definitions for a data collection related to the Customer module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
-+The Magento_CustomerAnalytics module configures data definitions for a data collection related to the Customer module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
-diff --git a/app/code/Magento/CustomerAnalytics/composer.json b/app/code/Magento/CustomerAnalytics/composer.json
-index 7dec4279ee2..3840c534b19 100644
---- a/app/code/Magento/CustomerAnalytics/composer.json
-+++ b/app/code/Magento/CustomerAnalytics/composer.json
-@@ -4,7 +4,8 @@
-     "require": {
-         "php": "~7.1.3||~7.2.0",
-         "magento/framework": "*",
--        "magento/module-customer": "*"
-+        "magento/module-customer": "*",
-+        "magento/module-analytics": "*"
-     },
-     "type": "magento2-module",
-     "license": [
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php b/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
-new file mode 100644
-index 00000000000..0f0b91967e4
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
-@@ -0,0 +1,65 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Context;
-+
-+use Magento\Authorization\Model\UserContextInterface;
-+use Magento\GraphQl\Model\Query\ContextParametersInterface;
-+use Magento\GraphQl\Model\Query\ContextParametersProcessorInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class AddUserInfoToContext implements ContextParametersProcessorInterface
-+{
-+    /**
-+     * @var UserContextInterface
-+     */
-+    private $userContext;
-+
-+    /**
-+     * @param UserContextInterface $userContext
-+     */
-+    public function __construct(
-+        UserContextInterface $userContext
-+    ) {
-+        $this->userContext = $userContext;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute(ContextParametersInterface $contextParameters): ContextParametersInterface
-+    {
-+        $currentUserId = $this->userContext->getUserId();
-+        if (null !== $currentUserId) {
-+            $currentUserId = (int)$currentUserId;
-+        }
-+        $contextParameters->setUserId($currentUserId);
-+
-+        $currentUserType = $this->userContext->getUserType();
-+        if (null !== $currentUserType) {
-+            $currentUserType = (int)$currentUserType;
-+        }
-+        $contextParameters->setUserType($currentUserType);
-+
-+        $contextParameters->addExtensionAttribute('is_customer', $this->isCustomer($currentUserId, $currentUserType));
-+        return $contextParameters;
-+    }
-+
-+    /**
-+     * Checking if current user is logged
-+     *
-+     * @param int|null $customerId
-+     * @param int|null $customerType
-+     * @return bool
-+     */
-+    private function isCustomer(?int $customerId, ?int $customerType): bool
-+    {
-+        return !empty($customerId) && !empty($customerType) && $customerType !== UserContextInterface::USER_TYPE_GUEST;
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php
-new file mode 100644
-index 00000000000..388b6dc2ea9
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php
-@@ -0,0 +1,115 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Customer\Address;
-+
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Customer\Api\Data\AddressInterfaceFactory;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\Api\DataObjectHelper;
-+
-+/**
-+ * Create customer address
-+ */
-+class CreateCustomerAddress
-+{
-+    /**
-+     * @var GetAllowedAddressAttributes
-+     */
-+    private $getAllowedAddressAttributes;
-+
-+    /**
-+     * @var AddressInterfaceFactory
-+     */
-+    private $addressFactory;
-+
-+    /**
-+     * @var AddressRepositoryInterface
-+     */
-+    private $addressRepository;
-+
-+    /**
-+     * @var DataObjectHelper
-+     */
-+    private $dataObjectHelper;
-+
-+    /**
-+     * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
-+     * @param AddressInterfaceFactory $addressFactory
-+     * @param AddressRepositoryInterface $addressRepository
-+     * @param DataObjectHelper $dataObjectHelper
-+     */
-+    public function __construct(
-+        GetAllowedAddressAttributes $getAllowedAddressAttributes,
-+        AddressInterfaceFactory $addressFactory,
-+        AddressRepositoryInterface $addressRepository,
-+        DataObjectHelper $dataObjectHelper
-+    ) {
-+        $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
-+        $this->addressFactory = $addressFactory;
-+        $this->addressRepository = $addressRepository;
-+        $this->dataObjectHelper = $dataObjectHelper;
-+    }
-+
-+    /**
-+     * Create customer address
-+     *
-+     * @param int $customerId
-+     * @param array $data
-+     * @return AddressInterface
-+     * @throws GraphQlInputException
-+     */
-+    public function execute(int $customerId, array $data): AddressInterface
-+    {
-+        $this->validateData($data);
-+
-+        /** @var AddressInterface $address */
-+        $address = $this->addressFactory->create();
-+        $this->dataObjectHelper->populateWithArray($address, $data, AddressInterface::class);
-+
-+        if (isset($data['region']['region_id'])) {
-+            $address->setRegionId($address->getRegion()->getRegionId());
-+        }
-+        $address->setCustomerId($customerId);
-+
-+        try {
-+            $this->addressRepository->save($address);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+        return $address;
-+    }
-+
-+    /**
-+     * Validate customer address create data
-+     *
-+     * @param array $addressData
-+     * @return void
-+     * @throws GraphQlInputException
-+     */
-+    public function validateData(array $addressData): void
-+    {
-+        $attributes = $this->getAllowedAddressAttributes->execute();
-+        $errorInput = [];
-+
-+        foreach ($attributes as $attributeName => $attributeInfo) {
-+            if ($attributeInfo->getIsRequired()
-+                && (!isset($addressData[$attributeName]) || empty($addressData[$attributeName]))
-+            ) {
-+                $errorInput[] = $attributeName;
-+            }
-+        }
-+
-+        if ($errorInput) {
-+            throw new GraphQlInputException(
-+                __('Required parameters are missing: %1', [implode(', ', $errorInput)])
-+            );
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/DeleteCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/DeleteCustomerAddress.php
-new file mode 100644
-index 00000000000..586fbebde70
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/DeleteCustomerAddress.php
-@@ -0,0 +1,60 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Customer\Address;
-+
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+
-+/**
-+ * Delete customer address
-+ */
-+class DeleteCustomerAddress
-+{
-+    /**
-+     * @var AddressRepositoryInterface
-+     */
-+    private $addressRepository;
-+
-+    /**
-+     * @param AddressRepositoryInterface $addressRepository
-+     */
-+    public function __construct(
-+        AddressRepositoryInterface $addressRepository
-+    ) {
-+        $this->addressRepository = $addressRepository;
-+    }
-+
-+    /**
-+     * Delete customer address
-+     *
-+     * @param AddressInterface $address
-+     * @return void
-+     * @throws GraphQlInputException
-+     */
-+    public function execute(AddressInterface $address): void
-+    {
-+        if ($address->isDefaultBilling()) {
-+            throw new GraphQlInputException(
-+                __('Customer Address %1 is set as default billing address and can not be deleted', [$address->getId()])
-+            );
-+        }
-+        if ($address->isDefaultShipping()) {
-+            throw new GraphQlInputException(
-+                __('Customer Address %1 is set as default shipping address and can not be deleted', [$address->getId()])
-+            );
-+        }
-+
-+        try {
-+            $this->addressRepository->delete($address);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php
-new file mode 100644
-index 00000000000..a4649bccc02
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php
-@@ -0,0 +1,130 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Customer\Address;
-+
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Framework\Api\CustomAttributesDataInterface;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Model\ResourceModel\Customer as CustomerResourceModel;
-+use Magento\Customer\Model\CustomerFactory;
-+use Magento\Framework\Webapi\ServiceOutputProcessor;
-+use Magento\Framework\Serialize\SerializerInterface;
-+
-+/**
-+ * Transform single customer address data from object to in array format
-+ */
-+class ExtractCustomerAddressData
-+{
-+    /**
-+     * @var ServiceOutputProcessor
-+     */
-+    private $serviceOutputProcessor;
-+
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $jsonSerializer;
-+
-+    /**
-+     * @var CustomerResourceModel
-+     */
-+    private $customerResourceModel;
-+
-+    /**
-+     * @var CustomerFactory
-+     */
-+    private $customerFactory;
-+
-+    /**
-+     * @param ServiceOutputProcessor $serviceOutputProcessor
-+     * @param SerializerInterface $jsonSerializer
-+     * @param CustomerResourceModel $customerResourceModel
-+     * @param CustomerFactory $customerFactory
-+     */
-+    public function __construct(
-+        ServiceOutputProcessor $serviceOutputProcessor,
-+        SerializerInterface $jsonSerializer,
-+        CustomerResourceModel $customerResourceModel,
-+        CustomerFactory $customerFactory
-+    ) {
-+        $this->serviceOutputProcessor = $serviceOutputProcessor;
-+        $this->jsonSerializer = $jsonSerializer;
-+        $this->customerResourceModel = $customerResourceModel;
-+        $this->customerFactory = $customerFactory;
-+    }
-+
-+    /**
-+     * Curate shipping and billing default options
-+     *
-+     * @param array $address
-+     * @param AddressInterface $addressObject
-+     * @return array
-+     */
-+    private function curateAddressDefaultValues(array $address, AddressInterface $addressObject) : array
-+    {
-+        $customerModel = $this->customerFactory->create();
-+        $this->customerResourceModel->load($customerModel, $addressObject->getCustomerId());
-+        $address[CustomerInterface::DEFAULT_BILLING] =
-+            ($customerModel->getDefaultBillingAddress()
-+                && $addressObject->getId() == $customerModel->getDefaultBillingAddress()->getId());
-+        $address[CustomerInterface::DEFAULT_SHIPPING] =
-+            ($customerModel->getDefaultShippingAddress()
-+                && $addressObject->getId() == $customerModel->getDefaultShippingAddress()->getId());
-+        return $address;
-+    }
-+
-+    /**
-+     * Transform single customer address data from object to in array format
-+     *
-+     * @param AddressInterface $address
-+     * @return array
-+     */
-+    public function execute(AddressInterface $address): array
-+    {
-+        $addressData = $this->serviceOutputProcessor->process(
-+            $address,
-+            AddressRepositoryInterface::class,
-+            'getById'
-+        );
-+        $addressData = $this->curateAddressDefaultValues($addressData, $address);
-+
-+        if (isset($addressData[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
-+            $addressData = array_merge(
-+                $addressData,
-+                $addressData[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY]
-+            );
-+        }
-+        $customAttributes = [];
-+        if (isset($addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES])) {
-+            foreach ($addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES] as $attribute) {
-+                $isArray = false;
-+                if (is_array($attribute['value'])) {
-+                    $isArray = true;
-+                    foreach ($attribute['value'] as $attributeValue) {
-+                        if (is_array($attributeValue)) {
-+                            $customAttributes[$attribute['attribute_code']] = $this->jsonSerializer->serialize(
-+                                $attribute['value']
-+                            );
-+                            continue;
-+                        }
-+                        $customAttributes[$attribute['attribute_code']] = implode(',', $attribute['value']);
-+                        continue;
-+                    }
-+                }
-+                if ($isArray) {
-+                    continue;
-+                }
-+                $customAttributes[$attribute['attribute_code']] = $attribute['value'];
-+            }
-+        }
-+        $addressData = array_merge($addressData, $customAttributes);
-+
-+        return $addressData;
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetAllowedAddressAttributes.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetAllowedAddressAttributes.php
-new file mode 100644
-index 00000000000..87be7607323
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetAllowedAddressAttributes.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Customer\Address;
-+
-+use Magento\Customer\Api\AddressMetadataManagementInterface;
-+use Magento\Eav\Model\Config;
-+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-+
-+/**
-+ * Get allowed address attributes
-+ */
-+class GetAllowedAddressAttributes
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $eavConfig;
-+
-+    /**
-+     * @param Config $eavConfig
-+     */
-+    public function __construct(Config $eavConfig)
-+    {
-+        $this->eavConfig = $eavConfig;
-+    }
-+
-+    /**
-+     * Get allowed address attributes
-+     *
-+     * @return AbstractAttribute[]
-+     */
-+    public function execute(): array
-+    {
-+        $attributes = $this->eavConfig->getEntityAttributes(
-+            AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS
-+        );
-+        foreach ($attributes as $attributeCode => $attribute) {
-+            if (false === $attribute->getIsVisibleOnFront()) {
-+                unset($attributes[$attributeCode]);
-+            }
-+        }
-+        return $attributes;
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddress.php
-new file mode 100644
-index 00000000000..7258f2e726f
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddress.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Customer\Address;
-+
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+
-+/**
-+ * Get customer address
-+ */
-+class GetCustomerAddress
-+{
-+    /**
-+     * @var AddressRepositoryInterface
-+     */
-+    private $addressRepository;
-+
-+    /**
-+     * @param AddressRepositoryInterface $addressRepository
-+     */
-+    public function __construct(AddressRepositoryInterface $addressRepository)
-+    {
-+        $this->addressRepository = $addressRepository;
-+    }
-+
-+    /**
-+     * Get customer address
-+     *
-+     * @param int $addressId
-+     * @param int $customerId
-+     * @return AddressInterface
-+     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-+     * @throws GraphQlAuthorizationException
-+     */
-+    public function execute(int $addressId, int $customerId): AddressInterface
-+    {
-+        try {
-+            $customerAddress = $this->addressRepository->getById($addressId);
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(
-+                __('Could not find a address with ID "%address_id"', ['address_id' => $addressId])
-+            );
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+
-+        if ((int)$customerAddress->getCustomerId() !== $customerId) {
-+            throw new GraphQlAuthorizationException(
-+                __(
-+                    'Current customer does not have permission to address with ID "%address_id"',
-+                    ['address_id' => $addressId]
-+                )
-+            );
-+        }
-+        return $customerAddress;
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/UpdateCustomerAddress.php
-new file mode 100644
-index 00000000000..65745a20bc8
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/UpdateCustomerAddress.php
-@@ -0,0 +1,111 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Customer\Address;
-+
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\Api\DataObjectHelper;
-+
-+/**
-+ * Update customer address
-+ */
-+class UpdateCustomerAddress
-+{
-+    /**
-+     * @var GetAllowedAddressAttributes
-+     */
-+    private $getAllowedAddressAttributes;
-+
-+    /**
-+     * @var AddressRepositoryInterface
-+     */
-+    private $addressRepository;
-+
-+    /**
-+     * @var DataObjectHelper
-+     */
-+    private $dataObjectHelper;
-+
-+    /**
-+     * @var array
-+     */
-+    private $restrictedKeys;
-+
-+    /**
-+     * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
-+     * @param AddressRepositoryInterface $addressRepository
-+     * @param DataObjectHelper $dataObjectHelper
-+     * @param array $restrictedKeys
-+     */
-+    public function __construct(
-+        GetAllowedAddressAttributes $getAllowedAddressAttributes,
-+        AddressRepositoryInterface $addressRepository,
-+        DataObjectHelper $dataObjectHelper,
-+        array $restrictedKeys = []
-+    ) {
-+        $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
-+        $this->addressRepository = $addressRepository;
-+        $this->dataObjectHelper = $dataObjectHelper;
-+        $this->restrictedKeys = $restrictedKeys;
-+    }
-+
-+    /**
-+     * Update customer address
-+     *
-+     * @param AddressInterface $address
-+     * @param array $data
-+     * @return void
-+     * @throws GraphQlInputException
-+     */
-+    public function execute(AddressInterface $address, array $data): void
-+    {
-+        $this->validateData($data);
-+
-+        $filteredData = array_diff_key($data, array_flip($this->restrictedKeys));
-+        $this->dataObjectHelper->populateWithArray($address, $filteredData, AddressInterface::class);
-+
-+        if (isset($data['region']['region_id'])) {
-+            $address->setRegionId($address->getRegion()->getRegionId());
-+        }
-+
-+        try {
-+            $this->addressRepository->save($address);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+    }
-+
-+    /**
-+     * Validate customer address update data
-+     *
-+     * @param array $addressData
-+     * @return void
-+     * @throws GraphQlInputException
-+     */
-+    public function validateData(array $addressData): void
-+    {
-+        $attributes = $this->getAllowedAddressAttributes->execute();
-+        $errorInput = [];
-+
-+        foreach ($attributes as $attributeName => $attributeInfo) {
-+            if ($attributeInfo->getIsRequired()
-+                && (isset($addressData[$attributeName]) && empty($addressData[$attributeName]))
-+            ) {
-+                $errorInput[] = $attributeName;
-+            }
-+        }
-+
-+        if ($errorInput) {
-+            throw new GraphQlInputException(
-+                __('Required parameters are missing: %1', [implode(', ', $errorInput)])
-+            );
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/ChangeSubscriptionStatus.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ChangeSubscriptionStatus.php
-new file mode 100644
-index 00000000000..1acb418e7bb
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ChangeSubscriptionStatus.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Customer;
-+
-+use Magento\Newsletter\Model\SubscriberFactory;
-+
-+/**
-+ * Change subscription status. Subscribe OR unsubscribe if required
-+ */
-+class ChangeSubscriptionStatus
-+{
-+    /**
-+     * @var SubscriberFactory
-+     */
-+    private $subscriberFactory;
-+
-+    /**
-+     * @param SubscriberFactory $subscriberFactory
-+     */
-+    public function __construct(
-+        SubscriberFactory $subscriberFactory
-+    ) {
-+        $this->subscriberFactory = $subscriberFactory;
-+    }
-+
-+    /**
-+     * Change subscription status. Subscribe OR unsubscribe if required
-+     *
-+     * @param int $customerId
-+     * @param bool $subscriptionStatus
-+     * @return void
-+     */
-+    public function execute(int $customerId, bool $subscriptionStatus): void
-+    {
-+        $subscriber = $this->subscriberFactory->create()->loadByCustomerId($customerId);
-+
-+        if ($subscriptionStatus === true && !$subscriber->isSubscribed()) {
-+            $this->subscriberFactory->create()->subscribeCustomerById($customerId);
-+        } elseif ($subscriptionStatus === false && $subscriber->isSubscribed()) {
-+            $this->subscriberFactory->create()->unsubscribeCustomerById($customerId);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerPassword.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerPassword.php
-new file mode 100644
-index 00000000000..3cc831e1ca4
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerPassword.php
-@@ -0,0 +1,61 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Customer;
-+
-+use Magento\Customer\Model\AuthenticationInterface;
-+use Magento\Framework\Exception\InvalidEmailOrPasswordException;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Exception\State\UserLockedException;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+
-+/**
-+ * Check customer password
-+ */
-+class CheckCustomerPassword
-+{
-+    /**
-+     * @var AuthenticationInterface
-+     */
-+    private $authentication;
-+
-+    /**
-+     * @param AuthenticationInterface $authentication
-+     */
-+    public function __construct(
-+        AuthenticationInterface $authentication
-+    ) {
-+        $this->authentication = $authentication;
-+    }
-+
-+    /**
-+     * Check customer password
-+     *
-+     * @param string $password
-+     * @param int $customerId
-+     * @throws GraphQlAuthenticationException
-+     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    public function execute(string $password, int $customerId)
-+    {
-+        try {
-+            $this->authentication->authenticate($customerId, $password);
-+        } catch (InvalidEmailOrPasswordException $e) {
-+            throw new GraphQlAuthenticationException(__($e->getMessage()), $e);
-+        } catch (UserLockedException $e) {
-+            throw new GraphQlAuthenticationException(__($e->getMessage()), $e);
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
-new file mode 100644
-index 00000000000..b7b66df0424
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
-@@ -0,0 +1,112 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Customer;
-+
-+use Magento\Customer\Api\AccountManagementInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Create new customer account
-+ */
-+class CreateCustomerAccount
-+{
-+    /**
-+     * @var DataObjectHelper
-+     */
-+    private $dataObjectHelper;
-+
-+    /**
-+     * @var CustomerInterfaceFactory
-+     */
-+    private $customerFactory;
-+
-+    /**
-+     * @var AccountManagementInterface
-+     */
-+    private $accountManagement;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var ChangeSubscriptionStatus
-+     */
-+    private $changeSubscriptionStatus;
-+
-+    /**
-+     * @param DataObjectHelper $dataObjectHelper
-+     * @param CustomerInterfaceFactory $customerFactory
-+     * @param StoreManagerInterface $storeManager
-+     * @param AccountManagementInterface $accountManagement
-+     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
-+     */
-+    public function __construct(
-+        DataObjectHelper $dataObjectHelper,
-+        CustomerInterfaceFactory $customerFactory,
-+        StoreManagerInterface $storeManager,
-+        AccountManagementInterface $accountManagement,
-+        ChangeSubscriptionStatus $changeSubscriptionStatus
-+    ) {
-+        $this->dataObjectHelper = $dataObjectHelper;
-+        $this->customerFactory = $customerFactory;
-+        $this->accountManagement = $accountManagement;
-+        $this->storeManager = $storeManager;
-+        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
-+    }
-+
-+    /**
-+     * Creates new customer account
-+     *
-+     * @param array $data
-+     * @return CustomerInterface
-+     * @throws GraphQlInputException
-+     */
-+    public function execute(array $data): CustomerInterface
-+    {
-+        try {
-+            $customer = $this->createAccount($data);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()));
-+        }
-+
-+        if (isset($data['is_subscribed'])) {
-+            $this->changeSubscriptionStatus->execute((int)$customer->getId(), (bool)$data['is_subscribed']);
-+        }
-+        return $customer;
-+    }
-+
-+    /**
-+     * Create account
-+     *
-+     * @param array $data
-+     * @return CustomerInterface
-+     * @throws LocalizedException
-+     */
-+    private function createAccount(array $data): CustomerInterface
-+    {
-+        $customerDataObject = $this->customerFactory->create();
-+        $this->dataObjectHelper->populateWithArray(
-+            $customerDataObject,
-+            $data,
-+            CustomerInterface::class
-+        );
-+        $store = $this->storeManager->getStore();
-+        $customerDataObject->setWebsiteId($store->getWebsiteId());
-+        $customerDataObject->setStoreId($store->getId());
-+
-+        $password = array_key_exists('password', $data) ? $data['password'] : null;
-+        return $this->accountManagement->createAccount($customerDataObject, $password);
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php
-new file mode 100644
-index 00000000000..de37482aca0
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php
-@@ -0,0 +1,108 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Customer;
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Framework\Webapi\ServiceOutputProcessor;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+
-+/**
-+ * Transform single customer data from object to in array format
-+ */
-+class ExtractCustomerData
-+{
-+    /**
-+     * @var ServiceOutputProcessor
-+     */
-+    private $serviceOutputProcessor;
-+
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @param ServiceOutputProcessor $serviceOutputProcessor
-+     * @param SerializerInterface $serializer
-+     */
-+    public function __construct(
-+        ServiceOutputProcessor $serviceOutputProcessor,
-+        SerializerInterface $serializer
-+    ) {
-+        $this->serviceOutputProcessor = $serviceOutputProcessor;
-+        $this->serializer = $serializer;
-+    }
-+
-+    /**
-+     * Curate default shipping and default billing keys
-+     *
-+     * @param array $arrayAddress
-+     * @return array
-+     */
-+    private function curateAddressData(array $arrayAddress): array
-+    {
-+        foreach ($arrayAddress as $key => $address) {
-+            if (!isset($address['default_shipping'])) {
-+                $arrayAddress[$key]['default_shipping'] = false;
-+            }
-+            if (!isset($address['default_billing'])) {
-+                $arrayAddress[$key]['default_billing'] = false;
-+            }
-+        }
-+        return $arrayAddress;
-+    }
-+
-+    /**
-+     * Transform single customer data from object to in array format
-+     *
-+     * @param CustomerInterface $customer
-+     * @return array
-+     * @throws LocalizedException
-+     */
-+    public function execute(CustomerInterface $customer): array
-+    {
-+        $customerData = $this->serviceOutputProcessor->process(
-+            $customer,
-+            CustomerRepositoryInterface::class,
-+            'get'
-+        );
-+        $customerData['addresses'] = $this->curateAddressData($customerData['addresses']);
-+        if (isset($customerData['extension_attributes'])) {
-+            $customerData = array_merge($customerData, $customerData['extension_attributes']);
-+        }
-+        $customAttributes = [];
-+        if (isset($customerData['custom_attributes'])) {
-+            foreach ($customerData['custom_attributes'] as $attribute) {
-+                $isArray = false;
-+                if (is_array($attribute['value'])) {
-+                    $isArray = true;
-+                    foreach ($attribute['value'] as $attributeValue) {
-+                        if (is_array($attributeValue)) {
-+                            $customAttributes[$attribute['attribute_code']] = $this->serializer->serialize(
-+                                $attribute['value']
-+                            );
-+                            continue;
-+                        }
-+                        $customAttributes[$attribute['attribute_code']] = implode(',', $attribute['value']);
-+                        continue;
-+                    }
-+                }
-+                if ($isArray) {
-+                    continue;
-+                }
-+                $customAttributes[$attribute['attribute_code']] = $attribute['value'];
-+            }
-+        }
-+        $customerData = array_merge($customerData, $customAttributes);
-+
-+        $customerData['model'] = $customer;
-+        return $customerData;
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php
-new file mode 100644
-index 00000000000..63f42ea1825
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php
-@@ -0,0 +1,97 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Customer;
-+
-+use Magento\Customer\Api\AccountManagementInterface;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Customer\Model\AuthenticationInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+
-+/**
-+ * Get customer
-+ */
-+class GetCustomer
-+{
-+    /**
-+     * @var AuthenticationInterface
-+     */
-+    private $authentication;
-+
-+    /**
-+     * @var CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * @var AccountManagementInterface
-+     */
-+    private $accountManagement;
-+
-+    /**
-+     * @param AuthenticationInterface $authentication
-+     * @param CustomerRepositoryInterface $customerRepository
-+     * @param AccountManagementInterface $accountManagement
-+     */
-+    public function __construct(
-+        AuthenticationInterface $authentication,
-+        CustomerRepositoryInterface $customerRepository,
-+        AccountManagementInterface $accountManagement
-+    ) {
-+        $this->authentication = $authentication;
-+        $this->customerRepository = $customerRepository;
-+        $this->accountManagement = $accountManagement;
-+    }
-+
-+    /**
-+     * Get customer
-+     *
-+     * @param ContextInterface $context
-+     * @return CustomerInterface
-+     * @throws GraphQlAuthenticationException
-+     * @throws GraphQlAuthorizationException
-+     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    public function execute(ContextInterface $context): CustomerInterface
-+    {
-+        $currentUserId = $context->getUserId();
-+
-+        try {
-+            $customer = $this->customerRepository->getById($currentUserId);
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(
-+                __('Customer with id "%customer_id" does not exist.', ['customer_id' => $currentUserId]),
-+                $e
-+            );
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()));
-+        }
-+
-+        if (true === $this->authentication->isLocked($currentUserId)) {
-+            throw new GraphQlAuthenticationException(__('The account is locked.'));
-+        }
-+
-+        try {
-+            $confirmationStatus = $this->accountManagement->getConfirmationStatus($currentUserId);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()));
-+        }
-+
-+        if ($confirmationStatus === AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED) {
-+            throw new GraphQlAuthenticationException(__("This account isn't confirmed. Verify and try again."));
-+        }
-+        return $customer;
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php
-new file mode 100644
-index 00000000000..56ab70d12b1
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Customer;
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Framework\Exception\AlreadyExistsException;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Exception\GraphQlAlreadyExistsException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+
-+/**
-+ * Save customer
-+ */
-+class SaveCustomer
-+{
-+    /**
-+     * @var CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * @param CustomerRepositoryInterface $customerRepository
-+     */
-+    public function __construct(
-+        CustomerRepositoryInterface $customerRepository
-+    ) {
-+        $this->customerRepository = $customerRepository;
-+    }
-+
-+    /**
-+     * Save customer
-+     *
-+     * @param CustomerInterface $customer
-+     * @throws GraphQlAlreadyExistsException
-+     * @throws GraphQlInputException
-+     */
-+    public function execute(CustomerInterface $customer): void
-+    {
-+        try {
-+            $this->customerRepository->save($customer);
-+        } catch (AlreadyExistsException $e) {
-+            throw new GraphQlAlreadyExistsException(
-+                __('A customer with the same email address already exists in an associated website.'),
-+                $e
-+            );
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php
-new file mode 100644
-index 00000000000..8601d586b3c
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php
-@@ -0,0 +1,108 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Customer;
-+
-+use Magento\Framework\GraphQl\Exception\GraphQlAlreadyExistsException;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Framework\Api\DataObjectHelper;
-+
-+/**
-+ * Update customer account data
-+ */
-+class UpdateCustomerAccount
-+{
-+    /**
-+     * @var SaveCustomer
-+     */
-+    private $saveCustomer;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var CheckCustomerPassword
-+     */
-+    private $checkCustomerPassword;
-+
-+    /**
-+     * @var DataObjectHelper
-+     */
-+    private $dataObjectHelper;
-+
-+    /**
-+     * @var ChangeSubscriptionStatus
-+     */
-+    private $changeSubscriptionStatus;
-+
-+    /**
-+     * @var array
-+     */
-+    private $restrictedKeys;
-+
-+    /**
-+     * @param SaveCustomer $saveCustomer
-+     * @param StoreManagerInterface $storeManager
-+     * @param CheckCustomerPassword $checkCustomerPassword
-+     * @param DataObjectHelper $dataObjectHelper
-+     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
-+     * @param array $restrictedKeys
-+     */
-+    public function __construct(
-+        SaveCustomer $saveCustomer,
-+        StoreManagerInterface $storeManager,
-+        CheckCustomerPassword $checkCustomerPassword,
-+        DataObjectHelper $dataObjectHelper,
-+        ChangeSubscriptionStatus $changeSubscriptionStatus,
-+        array $restrictedKeys = []
-+    ) {
-+        $this->saveCustomer = $saveCustomer;
-+        $this->storeManager = $storeManager;
-+        $this->checkCustomerPassword = $checkCustomerPassword;
-+        $this->dataObjectHelper = $dataObjectHelper;
-+        $this->restrictedKeys = $restrictedKeys;
-+        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
-+    }
-+
-+    /**
-+     * Update customer account data
-+     *
-+     * @param CustomerInterface $customer
-+     * @param array $data
-+     * @return void
-+     * @throws GraphQlAlreadyExistsException
-+     * @throws GraphQlAuthenticationException
-+     * @throws GraphQlInputException
-+     */
-+    public function execute(CustomerInterface $customer, array $data): void
-+    {
-+        if (isset($data['email']) && $customer->getEmail() !== $data['email']) {
-+            if (!isset($data['password']) || empty($data['password'])) {
-+                throw new GraphQlInputException(__('Provide the current "password" to change "email".'));
-+            }
-+
-+            $this->checkCustomerPassword->execute($data['password'], (int)$customer->getId());
-+            $customer->setEmail($data['email']);
-+        }
-+
-+        $filteredData = array_diff_key($data, array_flip($this->restrictedKeys));
-+        $this->dataObjectHelper->populateWithArray($customer, $filteredData, CustomerInterface::class);
-+
-+        $customer->setStoreId($this->storeManager->getStore()->getId());
-+
-+        $this->saveCustomer->execute($customer);
-+
-+        if (isset($data['is_subscribed'])) {
-+            $this->changeSubscriptionStatus->execute((int)$customer->getId(), (bool)$data['is_subscribed']);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
-new file mode 100644
-index 00000000000..a6b6ad71109
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
-@@ -0,0 +1,100 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Resolver;
-+
-+use Magento\Customer\Api\AccountManagementInterface;
-+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerPassword;
-+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
-+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+
-+/**
-+ * Change customer password resolver
-+ */
-+class ChangePassword implements ResolverInterface
-+{
-+    /**
-+     * @var GetCustomer
-+     */
-+    private $getCustomer;
-+
-+    /**
-+     * @var CheckCustomerPassword
-+     */
-+    private $checkCustomerPassword;
-+
-+    /**
-+     * @var AccountManagementInterface
-+     */
-+    private $accountManagement;
-+
-+    /**
-+     * @var ExtractCustomerData
-+     */
-+    private $extractCustomerData;
-+
-+    /**
-+     * @param GetCustomer $getCustomer
-+     * @param CheckCustomerPassword $checkCustomerPassword
-+     * @param AccountManagementInterface $accountManagement
-+     * @param ExtractCustomerData $extractCustomerData
-+     */
-+    public function __construct(
-+        GetCustomer $getCustomer,
-+        CheckCustomerPassword $checkCustomerPassword,
-+        AccountManagementInterface $accountManagement,
-+        ExtractCustomerData $extractCustomerData
-+    ) {
-+        $this->getCustomer = $getCustomer;
-+        $this->checkCustomerPassword = $checkCustomerPassword;
-+        $this->accountManagement = $accountManagement;
-+        $this->extractCustomerData = $extractCustomerData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        /** @var ContextInterface $context */
-+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-+        }
-+
-+        if (!isset($args['currentPassword']) || '' == trim($args['currentPassword'])) {
-+            throw new GraphQlInputException(__('Specify the "currentPassword" value.'));
-+        }
-+
-+        if (!isset($args['newPassword']) || '' == trim($args['newPassword'])) {
-+            throw new GraphQlInputException(__('Specify the "newPassword" value.'));
-+        }
-+
-+        $customerId = $context->getUserId();
-+        $this->checkCustomerPassword->execute($args['currentPassword'], $customerId);
-+
-+        try {
-+            $this->accountManagement->changePasswordById($customerId, $args['currentPassword'], $args['newPassword']);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+
-+        $customer = $this->getCustomer->execute($context);
-+        return $this->extractCustomerData->execute($customer);
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
-new file mode 100644
-index 00000000000..e12c636f0ed
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
-@@ -0,0 +1,63 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Resolver;
-+
-+use Magento\CustomerGraphQl\Model\Customer\CreateCustomerAccount;
-+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+
-+/**
-+ * Create customer account resolver
-+ */
-+class CreateCustomer implements ResolverInterface
-+{
-+    /**
-+     * @var ExtractCustomerData
-+     */
-+    private $extractCustomerData;
-+
-+    /**
-+     * @var CreateCustomerAccount
-+     */
-+    private $createCustomerAccount;
-+
-+    /**
-+     * @param ExtractCustomerData $extractCustomerData
-+     * @param CreateCustomerAccount $createCustomerAccount
-+     */
-+    public function __construct(
-+        ExtractCustomerData $extractCustomerData,
-+        CreateCustomerAccount $createCustomerAccount
-+    ) {
-+        $this->extractCustomerData = $extractCustomerData;
-+        $this->createCustomerAccount = $createCustomerAccount;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (empty($args['input']) || !is_array($args['input'])) {
-+            throw new GraphQlInputException(__('"input" value should be specified'));
-+        }
-+
-+        $customer = $this->createCustomerAccount->execute($args['input']);
-+
-+        $data = $this->extractCustomerData->execute($customer);
-+        return ['customer' => $data];
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
-new file mode 100644
-index 00000000000..077c6811300
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Resolver;
-+
-+use Magento\CustomerGraphQl\Model\Customer\Address\CreateCustomerAddress as CreateCustomerAddressModel;
-+use Magento\CustomerGraphQl\Model\Customer\Address\ExtractCustomerAddressData;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+
-+/**
-+ * Customers address create, used for GraphQL request processing
-+ */
-+class CreateCustomerAddress implements ResolverInterface
-+{
-+    /**
-+     * @var CreateCustomerAddressModel
-+     */
-+    private $createCustomerAddress;
-+
-+    /**
-+     * @var ExtractCustomerAddressData
-+     */
-+    private $extractCustomerAddressData;
-+
-+    /**
-+     * @param CreateCustomerAddressModel $createCustomerAddress
-+     * @param ExtractCustomerAddressData $extractCustomerAddressData
-+     */
-+    public function __construct(
-+        CreateCustomerAddressModel $createCustomerAddress,
-+        ExtractCustomerAddressData $extractCustomerAddressData
-+    ) {
-+        $this->createCustomerAddress = $createCustomerAddress;
-+        $this->extractCustomerAddressData = $extractCustomerAddressData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        /** @var ContextInterface $context */
-+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-+        }
-+
-+        if (empty($args['input']) || !is_array($args['input'])) {
-+            throw new GraphQlInputException(__('"input" value should be specified'));
-+        }
-+
-+        $address = $this->createCustomerAddress->execute($context->getUserId(), $args['input']);
-+        return $this->extractCustomerAddressData->execute($address);
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php
-index 1cf85381d34..d6b0b02c78f 100644
---- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php
-+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php
-@@ -7,17 +7,13 @@ declare(strict_types=1);
- 
- namespace Magento\CustomerGraphQl\Model\Resolver;
- 
--use Magento\Authorization\Model\UserContextInterface;
-+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
--use Magento\CustomerGraphQl\Model\Resolver\Customer\CustomerDataProvider;
--use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
--use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
--use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\GraphQl\Model\Query\ContextInterface;
- 
- /**
-  * Customers field resolver, used for GraphQL request processing.
-@@ -25,29 +21,29 @@ use Magento\Framework\GraphQl\Query\ResolverInterface;
- class Customer implements ResolverInterface
- {
-     /**
--     * @var CustomerDataProvider
-+     * @var GetCustomer
-      */
--    private $customerResolver;
-+    private $getCustomer;
- 
-     /**
--     * @var ValueFactory
-+     * @var ExtractCustomerData
-      */
--    private $valueFactory;
-+    private $extractCustomerData;
- 
-     /**
--     * @param CustomerDataProvider $customerResolver
--     * @param ValueFactory $valueFactory
-+     * @param GetCustomer $getCustomer
-+     * @param ExtractCustomerData $extractCustomerData
-      */
-     public function __construct(
--        CustomerDataProvider $customerResolver,
--        ValueFactory $valueFactory
-+        GetCustomer $getCustomer,
-+        ExtractCustomerData $extractCustomerData
-     ) {
--        $this->customerResolver = $customerResolver;
--        $this->valueFactory = $valueFactory;
-+        $this->getCustomer = $getCustomer;
-+        $this->extractCustomerData = $extractCustomerData;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -55,25 +51,13 @@ class Customer implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ) : Value {
-+    ) {
-         /** @var ContextInterface $context */
--        if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
--            throw new GraphQlAuthorizationException(
--                __(
--                    'Current customer does not have access to the resource "%1"',
--                    [\Magento\Customer\Model\Customer::ENTITY]
--                )
--            );
-+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-         }
- 
--        try {
--            $data = $this->customerResolver->getCustomerById($context->getUserId());
--            $result = function () use ($data) {
--                return !empty($data) ? $data : [];
--            };
--            return $this->valueFactory->create($result);
--        } catch (NoSuchEntityException $exception) {
--            throw new GraphQlNoSuchEntityException(__('Customer id %1 does not exist.', [$context->getUserId()]));
--        }
-+        $customer = $this->getCustomer->execute($context);
-+        return $this->extractCustomerData->execute($customer);
-     }
- }
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/CustomerDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/CustomerDataProvider.php
-deleted file mode 100644
-index 1a942a2ab14..00000000000
---- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/CustomerDataProvider.php
-+++ /dev/null
-@@ -1,113 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\CustomerGraphQl\Model\Resolver\Customer;
--
--use Magento\Customer\Api\CustomerRepositoryInterface;
--use Magento\Framework\Exception\LocalizedException;
--use Magento\Framework\Exception\NoSuchEntityException;
--use Magento\Framework\Serialize\SerializerInterface;
--use Magento\Framework\Webapi\ServiceOutputProcessor;
--use Magento\Customer\Api\Data\CustomerInterface;
--
--/**
-- * Customer field data provider, used for GraphQL request processing.
-- */
--class CustomerDataProvider
--{
--    /**
--     * @var CustomerRepositoryInterface
--     */
--    private $customerRepository;
--
--    /**
--     * @var ServiceOutputProcessor
--     */
--    private $serviceOutputProcessor;
--
--    /**
--     * @var SerializerInterface
--     */
--    private $jsonSerializer;
--
--    /**
--     * @param CustomerRepositoryInterface $customerRepository
--     * @param ServiceOutputProcessor $serviceOutputProcessor
--     * @param SerializerInterface $jsonSerializer
--     */
--    public function __construct(
--        CustomerRepositoryInterface $customerRepository,
--        ServiceOutputProcessor $serviceOutputProcessor,
--        SerializerInterface $jsonSerializer
--    ) {
--        $this->customerRepository = $customerRepository;
--        $this->serviceOutputProcessor = $serviceOutputProcessor;
--        $this->jsonSerializer = $jsonSerializer;
--    }
--
--    /**
--     * Get customer data by Id or empty array
--     *
--     * @param int $customerId
--     * @return array
--     * @throws NoSuchEntityException|LocalizedException
--     */
--    public function getCustomerById(int $customerId) : array
--    {
--        try {
--            $customerObject = $this->customerRepository->getById($customerId);
--        } catch (NoSuchEntityException $e) {
--            // No error should be thrown, null result should be returned
--            return [];
--        }
--        return $this->processCustomer($customerObject);
--    }
--
--    /**
--     * Transform single customer data from object to in array format
--     *
--     * @param CustomerInterface $customerObject
--     * @return array
--     */
--    private function processCustomer(CustomerInterface $customerObject) : array
--    {
--        $customer = $this->serviceOutputProcessor->process(
--            $customerObject,
--            CustomerRepositoryInterface::class,
--            'get'
--        );
--        if (isset($customer['extension_attributes'])) {
--            $customer = array_merge($customer, $customer['extension_attributes']);
--        }
--        $customAttributes = [];
--        if (isset($customer['custom_attributes'])) {
--            foreach ($customer['custom_attributes'] as $attribute) {
--                $isArray = false;
--                if (is_array($attribute['value'])) {
--                    $isArray = true;
--                    foreach ($attribute['value'] as $attributeValue) {
--                        if (is_array($attributeValue)) {
--                            $customAttributes[$attribute['attribute_code']] = $this->jsonSerializer->serialize(
--                                $attribute['value']
--                            );
--                            continue;
--                        }
--                        $customAttributes[$attribute['attribute_code']] = implode(',', $attribute['value']);
--                        continue;
--                    }
--                }
--                if ($isArray) {
--                    continue;
--                }
--                $customAttributes[$attribute['attribute_code']] = $attribute['value'];
--            }
--        }
--        $customer = array_merge($customer, $customAttributes);
--
--        return $customer;
--    }
--}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddresses.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddresses.php
-new file mode 100644
-index 00000000000..8cdf6518a4e
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddresses.php
-@@ -0,0 +1,62 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Resolver;
-+
-+use Magento\Customer\Model\Customer;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\CustomerGraphQl\Model\Customer\Address\ExtractCustomerAddressData;
-+
-+/**
-+ * Customers addresses field resolver
-+ */
-+class CustomerAddresses implements ResolverInterface
-+{
-+    /**
-+     * @var ExtractCustomerAddressData
-+     */
-+    private $extractCustomerAddressData;
-+
-+    /**
-+     * @param ExtractCustomerAddressData $extractCustomerAddressData
-+     */
-+    public function __construct(
-+        ExtractCustomerAddressData $extractCustomerAddressData
-+    ) {
-+        $this->extractCustomerAddressData = $extractCustomerAddressData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+        /** @var Customer $customer */
-+        $customer = $value['model'];
-+
-+        $addressesData = [];
-+        $addresses = $customer->getAddresses();
-+
-+        if (count($addresses)) {
-+            foreach ($addresses as $address) {
-+                $addressesData[] = $this->extractCustomerAddressData->execute($address);
-+            }
-+        }
-+        return $addressesData;
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
-new file mode 100644
-index 00000000000..da588b98b5d
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Resolver;
-+
-+use Magento\CustomerGraphQl\Model\Customer\Address\DeleteCustomerAddress as DeleteCustomerAddressModel;
-+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+
-+/**
-+ * Customers address delete, used for GraphQL request processing.
-+ */
-+class DeleteCustomerAddress implements ResolverInterface
-+{
-+    /**
-+     * @var GetCustomerAddress
-+     */
-+    private $getCustomerAddress;
-+
-+    /**
-+     * @var DeleteCustomerAddressModel
-+     */
-+    private $deleteCustomerAddress;
-+
-+    /**
-+     * @param GetCustomerAddress $getCustomerAddress
-+     * @param DeleteCustomerAddressModel $deleteCustomerAddress
-+     */
-+    public function __construct(
-+        GetCustomerAddress $getCustomerAddress,
-+        DeleteCustomerAddressModel $deleteCustomerAddress
-+    ) {
-+        $this->getCustomerAddress = $getCustomerAddress;
-+        $this->deleteCustomerAddress = $deleteCustomerAddress;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        /** @var ContextInterface $context */
-+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-+        }
-+
-+        if (empty($args['id'])) {
-+            throw new GraphQlInputException(__('Address "id" value should be specified'));
-+        }
-+
-+        $address = $this->getCustomerAddress->execute((int)$args['id'], $context->getUserId());
-+        $this->deleteCustomerAddress->execute($address);
-+        return true;
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/GenerateCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/GenerateCustomerToken.php
-new file mode 100644
-index 00000000000..4de452900e7
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/GenerateCustomerToken.php
-@@ -0,0 +1,62 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\AuthenticationException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+
-+/**
-+ * Customers Token resolver, used for GraphQL request processing.
-+ */
-+class GenerateCustomerToken implements ResolverInterface
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @param CustomerTokenServiceInterface $customerTokenService
-+     */
-+    public function __construct(
-+        CustomerTokenServiceInterface $customerTokenService
-+    ) {
-+        $this->customerTokenService = $customerTokenService;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (empty($args['email'])) {
-+            throw new GraphQlInputException(__('Specify the "email" value.'));
-+        }
-+
-+        if (empty($args['password'])) {
-+            throw new GraphQlInputException(__('Specify the "password" value.'));
-+        }
-+
-+        try {
-+            $token = $this->customerTokenService->createCustomerAccessToken($args['email'], $args['password']);
-+            return ['token' => $token];
-+        } catch (AuthenticationException $e) {
-+            throw new GraphQlAuthenticationException(__($e->getMessage()), $e);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsEmailAvailable.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsEmailAvailable.php
-new file mode 100644
-index 00000000000..91298b9e315
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsEmailAvailable.php
-@@ -0,0 +1,73 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Resolver;
-+
-+use Magento\Customer\Api\AccountManagementInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\Validator\EmailAddress as EmailValidator;
-+
-+/**
-+ * Is Customer Email Available
-+ */
-+class IsEmailAvailable implements ResolverInterface
-+{
-+    /**
-+     * @var AccountManagementInterface
-+     */
-+    private $accountManagement;
-+
-+    /**
-+     * @var EmailValidator
-+     */
-+    private $emailValidator;
-+
-+    /**
-+     * @param AccountManagementInterface $accountManagement
-+     * @param EmailValidator $emailValidator
-+     */
-+    public function __construct(
-+        AccountManagementInterface $accountManagement,
-+        EmailValidator $emailValidator
-+    ) {
-+        $this->accountManagement = $accountManagement;
-+        $this->emailValidator = $emailValidator;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (empty($args['email'])) {
-+            throw new GraphQlInputException(__('Email must be specified'));
-+        }
-+
-+        if (!$this->emailValidator->isValid($args['email'])) {
-+            throw new GraphQlInputException(__('Email is invalid'));
-+        }
-+
-+        try {
-+            $isEmailAvailable = $this->accountManagement->isEmailAvailable($args['email']);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+
-+        return [
-+            'is_email_available' => $isEmailAvailable
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
-new file mode 100644
-index 00000000000..4e49891b587
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Newsletter\Model\SubscriberFactory;
-+
-+/**
-+ * Customer is_subscribed field resolver
-+ */
-+class IsSubscribed implements ResolverInterface
-+{
-+    /**
-+     * @var SubscriberFactory
-+     */
-+    private $subscriberFactory;
-+
-+    /**
-+     * @param SubscriberFactory $subscriberFactory
-+     */
-+    public function __construct(
-+        SubscriberFactory $subscriberFactory
-+    ) {
-+        $this->subscriberFactory = $subscriberFactory;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+        /** @var Customer $customer */
-+        $customer = $value['model'];
-+
-+        $status = $this->subscriberFactory->create()->loadByCustomerId((int)$customer->getId())->isSubscribed();
-+        return (bool)$status;
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php
-new file mode 100644
-index 00000000000..715788576e0
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+
-+/**
-+ * Customers Revoke Token resolver, used for GraphQL request processing.
-+ */
-+class RevokeCustomerToken implements ResolverInterface
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @param CustomerTokenServiceInterface $customerTokenService
-+     */
-+    public function __construct(
-+        CustomerTokenServiceInterface $customerTokenService
-+    ) {
-+        $this->customerTokenService = $customerTokenService;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        /** @var ContextInterface $context */
-+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-+        }
-+
-+        return ['result' => $this->customerTokenService->revokeCustomerAccessToken($context->getUserId())];
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
-new file mode 100644
-index 00000000000..47c51c37788
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
-@@ -0,0 +1,80 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Resolver;
-+
-+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
-+use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerAccount;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+
-+/**
-+ * Update customer data resolver
-+ */
-+class UpdateCustomer implements ResolverInterface
-+{
-+    /**
-+     * @var GetCustomer
-+     */
-+    private $getCustomer;
-+
-+    /**
-+     * @var UpdateCustomerAccount
-+     */
-+    private $updateCustomerAccount;
-+
-+    /**
-+     * @var ExtractCustomerData
-+     */
-+    private $extractCustomerData;
-+
-+    /**
-+     * @param GetCustomer $getCustomer
-+     * @param UpdateCustomerAccount $updateCustomerAccount
-+     * @param ExtractCustomerData $extractCustomerData
-+     */
-+    public function __construct(
-+        GetCustomer $getCustomer,
-+        UpdateCustomerAccount $updateCustomerAccount,
-+        ExtractCustomerData $extractCustomerData
-+    ) {
-+        $this->getCustomer = $getCustomer;
-+        $this->updateCustomerAccount = $updateCustomerAccount;
-+        $this->extractCustomerData = $extractCustomerData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        /** @var ContextInterface $context */
-+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-+        }
-+
-+        if (empty($args['input']) || !is_array($args['input'])) {
-+            throw new GraphQlInputException(__('"input" value should be specified'));
-+        }
-+
-+        $customer = $this->getCustomer->execute($context);
-+        $this->updateCustomerAccount->execute($customer, $args['input']);
-+
-+        $data = $this->extractCustomerData->execute($customer);
-+        return ['customer' => $data];
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
-new file mode 100644
-index 00000000000..f57e1fafbc8
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
-@@ -0,0 +1,83 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CustomerGraphQl\Model\Resolver;
-+
-+use Magento\CustomerGraphQl\Model\Customer\Address\ExtractCustomerAddressData;
-+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
-+use Magento\CustomerGraphQl\Model\Customer\Address\UpdateCustomerAddress as UpdateCustomerAddressModel;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+
-+/**
-+ * Customers address update, used for GraphQL request processing
-+ */
-+class UpdateCustomerAddress implements ResolverInterface
-+{
-+    /**
-+     * @var GetCustomerAddress
-+     */
-+    private $getCustomerAddress;
-+
-+    /**
-+     * @var UpdateCustomerAddressModel
-+     */
-+    private $updateCustomerAddress;
-+
-+    /**
-+     * @var ExtractCustomerAddressData
-+     */
-+    private $extractCustomerAddressData;
-+
-+    /**
-+     * @param GetCustomerAddress $getCustomerAddress
-+     * @param UpdateCustomerAddressModel $updateCustomerAddress
-+     * @param ExtractCustomerAddressData $extractCustomerAddressData
-+     */
-+    public function __construct(
-+        GetCustomerAddress $getCustomerAddress,
-+        UpdateCustomerAddressModel $updateCustomerAddress,
-+        ExtractCustomerAddressData $extractCustomerAddressData
-+    ) {
-+        $this->getCustomerAddress = $getCustomerAddress;
-+        $this->updateCustomerAddress = $updateCustomerAddress;
-+        $this->extractCustomerAddressData = $extractCustomerAddressData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        /** @var ContextInterface $context */
-+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-+        }
-+
-+        if (empty($args['id'])) {
-+            throw new GraphQlInputException(__('Address "id" value must be specified'));
-+        }
-+
-+        if (empty($args['input']) || !is_array($args['input'])) {
-+            throw new GraphQlInputException(__('"input" value must be specified'));
-+        }
-+
-+        $address = $this->getCustomerAddress->execute((int)$args['id'], $context->getUserId());
-+        $this->updateCustomerAddress->execute($address, $args['input']);
-+
-+        return $this->extractCustomerAddressData->execute($address);
-+    }
-+}
-diff --git a/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md b/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md
-deleted file mode 100644
-index ae023224f4d..00000000000
---- a/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md
-+++ /dev/null
-@@ -1,3 +0,0 @@
--# Customer Graph Ql Functional Tests
--
--The Functional Test Module for **Magento Customer Graph Ql** module.
-diff --git a/app/code/Magento/CustomerGraphQl/composer.json b/app/code/Magento/CustomerGraphQl/composer.json
-index 290d925215e..39721fe79f6 100644
---- a/app/code/Magento/CustomerGraphQl/composer.json
-+++ b/app/code/Magento/CustomerGraphQl/composer.json
-@@ -4,13 +4,15 @@
-   "type": "magento2-module",
-   "require": {
-     "php": "~7.1.3||~7.2.0",
--    "magento/module-customer": "*",
-     "magento/module-authorization": "*",
-+    "magento/module-customer": "*",
-+    "magento/module-eav": "*",
-+    "magento/module-graph-ql": "*",
-+    "magento/module-newsletter": "*",
-+    "magento/module-integration": "*",
-+    "magento/module-store": "*",
-     "magento/framework": "*"
-   },
--  "suggest": {
--    "magento/module-graph-ql": "*"
--  },
-   "license": [
-     "OSL-3.0",
-     "AFL-3.0"
-diff --git a/app/code/Magento/CustomerGraphQl/etc/extension_attributes.xml b/app/code/Magento/CustomerGraphQl/etc/extension_attributes.xml
-new file mode 100644
-index 00000000000..26840551eae
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/etc/extension_attributes.xml
-@@ -0,0 +1,12 @@
-+<?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:Api/etc/extension_attributes.xsd">
-+    <extension_attributes for="Magento\GraphQl\Model\Query\ContextInterface">
-+        <attribute code="is_customer" type="boolean"/>
-+    </extension_attributes>
-+</config>
-\ No newline at end of file
-diff --git a/app/code/Magento/CustomerGraphQl/etc/graphql/di.xml b/app/code/Magento/CustomerGraphQl/etc/graphql/di.xml
-new file mode 100644
-index 00000000000..cb4ab0b7b27
---- /dev/null
-+++ b/app/code/Magento/CustomerGraphQl/etc/graphql/di.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\CustomerGraphQl\Model\Customer\UpdateCustomerData">
-+        <arguments>
-+            <argument name="restrictedKeys" xsi:type="array">
-+                <item name="email" xsi:type="const">Magento\Customer\Api\Data\CustomerInterface::EMAIL</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\GraphQl\Model\Query\ContextFactory">
-+        <arguments>
-+            <argument name="contextParametersProcessors" xsi:type="array">
-+                <item name="add_user_info_to_context" xsi:type="object">Magento\CustomerGraphQl\Model\Context\AddUserInfoToContext</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/CustomerGraphQl/etc/module.xml b/app/code/Magento/CustomerGraphQl/etc/module.xml
-index bde93c62765..eeed4862bbb 100644
---- a/app/code/Magento/CustomerGraphQl/etc/module.xml
-+++ b/app/code/Magento/CustomerGraphQl/etc/module.xml
-@@ -6,11 +6,5 @@
-  */
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
--    <module name="Magento_CustomerGraphQl" >
--        <sequence>
--            <module name="Magento_Customer"/>
--            <module name="Magento_Authorization"/>
--            <module name="Magento_GraphQl"/>
--        </sequence>
--    </module>
-+    <module name="Magento_CustomerGraphQl"/>
- </config>
-diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
-index 91b7ef1f9be..12381840750 100644
---- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
-+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
-@@ -2,7 +2,78 @@
- # See COPYING.txt for license details.
- 
- type Query {
--    customer: Customer @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\Customer") @doc(description: "The customer query returns information about a customer account")
-+    customer: Customer @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\Customer") @doc(description: "The customer query returns information about a customer account") @cache(cacheable: false)
-+    isEmailAvailable (
-+        email: String! @doc(description: "The new customer email")
-+    ): IsEmailAvailableOutput @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\IsEmailAvailable")
-+}
-+
-+type Mutation {
-+    generateCustomerToken(email: String!, password: String!): CustomerToken @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\GenerateCustomerToken") @doc(description:"Retrieve the customer token")
-+    changeCustomerPassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\ChangePassword") @doc(description:"Changes the password for the logged-in customer")
-+    createCustomer (input: CustomerInput!): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomer") @doc(description:"Create customer account")
-+    updateCustomer (input: CustomerInput!): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Update the customer's personal information")
-+    revokeCustomerToken: RevokeCustomerTokenOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\RevokeCustomerToken") @doc(description:"Revoke the customer token")
-+    createCustomerAddress(input: CustomerAddressInput!): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomerAddress") @doc(description: "Create customer address")
-+    updateCustomerAddress(id: Int!, input: CustomerAddressInput): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomerAddress") @doc(description: "Update customer address")
-+    deleteCustomerAddress(id: Int!): Boolean @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\DeleteCustomerAddress") @doc(description: "Delete customer address")
-+}
-+
-+input CustomerAddressInput {
-+    firstname: String @doc(description: "The first name of the person associated with the shipping/billing address")
-+    lastname: String @doc(description: "The family name of the person associated with the shipping/billing address")
-+    company: String @doc(description: "The customer's company")
-+    telephone: String @doc(description: "The telephone number")
-+    street: [String] @doc(description: "An array of strings that define the street number and name")
-+    city: String @doc(description: "The city or town")
-+    region: CustomerAddressRegionInput @doc(description: "An object containing the region name, region code, and region ID")
-+    postcode: String @doc(description: "The customer's ZIP or postal code")
-+    country_id: CountryCodeEnum @doc(description: "The customer's country")
-+    default_shipping: Boolean @doc(description: "Indicates whether the address is the default shipping address")
-+    default_billing: Boolean @doc(description: "Indicates whether the address is the default billing address")
-+    fax: String @doc(description: "The fax number")
-+    middlename: String @doc(description: "The middle name of the person associated with the shipping/billing address")
-+    prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs.")
-+    suffix: String @doc(description: "A value such as Sr., Jr., or III")
-+    vat_id: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
-+    custom_attributes: [CustomerAddressAttributeInput] @doc(description: "Address custom attributes")
-+}
-+
-+input CustomerAddressRegionInput @doc(description: "CustomerAddressRegionInput defines the customer's state or province") {
-+    region_code: String @doc(description: "The address region code")
-+    region: String @doc(description: "The state or province name")
-+    region_id: Int @doc(description: "Uniquely identifies the region")
-+}
-+
-+input CustomerAddressAttributeInput {
-+    attribute_code: String! @doc(description: "Attribute code")
-+    value: String! @doc(description: "Attribute value")
-+}
-+
-+type CustomerToken {
-+    token: String @doc(description: "The customer token")
-+}
-+
-+input CustomerInput {
-+    prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs.")
-+    firstname: String @doc(description: "The customer's first name")
-+    middlename: String @doc(description: "The customer's middle name")
-+    lastname: String @doc(description: "The customer's family name")
-+    suffix: String @doc(description: "A value such as Sr., Jr., or III")
-+    email: String @doc(description: "The customer's email address. Required")
-+    dob: String @doc(description: "The customer's date of birth")
-+    taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
-+    gender: Int @doc(description: "The customer's gender(Male - 1, Female - 2)")
-+    password: String @doc(description: "The customer's password")
-+    is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter")
-+}
-+
-+type CustomerOutput {
-+    customer: Customer!
-+}
-+
-+type RevokeCustomerTokenOutput {
-+    result: Boolean!
- }
- 
- type Customer @doc(description: "Customer defines the customer name and address and other details") {
-@@ -19,9 +90,10 @@ type Customer @doc(description: "Customer defines the customer name and address
-     dob: String @doc(description: "The customer's date of birth")
-     taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
-     id: Int @doc(description: "The ID assigned to the customer")
--    is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter")
--    addresses: [CustomerAddress] @doc(description: "An array containing the customer's shipping and billing addresses")
--} 
-+    is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter") @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\IsSubscribed")
-+    addresses: [CustomerAddress] @doc(description: "An array containing the customer's shipping and billing addresses") @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CustomerAddresses")
-+    gender: Int @doc(description: "The customer's gender(Male - 1, Female - 2)")
-+}
- 
- type CustomerAddress @doc(description: "CustomerAddress contains detailed information about a customer's billing and shipping addresses"){
-     id: Int @doc(description: "The ID assigned to the address object")
-@@ -43,6 +115,8 @@ type CustomerAddress @doc(description: "CustomerAddress contains detailed inform
-     vat_id: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
-     default_shipping: Boolean @doc(description: "Indicates whether the address is the default shipping address")
-     default_billing: Boolean @doc(description: "Indicates whether the address is the default billing address")
-+    custom_attributes: [CustomerAddressAttribute] @doc(description: "Address custom attributes")
-+    extension_attributes: [CustomerAddressAttribute] @doc(description: "Address extension attributes")
- }
- 
- type CustomerAddressRegion @doc(description: "CustomerAddressRegion defines the customer's state or province") {
-@@ -51,3 +125,259 @@ type CustomerAddressRegion @doc(description: "CustomerAddressRegion defines the
-     region_id: Int @doc(description: "Uniquely identifies the region")
- }
- 
-+type CustomerAddressAttribute {
-+     attribute_code: String  @doc(description: "Attribute code")
-+     value: String  @doc(description: "Attribute value")
-+}
-+
-+type IsEmailAvailableOutput {
-+    is_email_available: Boolean @doc(description: "Is email availabel value")
-+}
-+
-+enum CountryCodeEnum @doc(description: "The list of countries codes") {
-+    AF @doc(description: "Afghanistan")
-+    AX @doc(description: "Åland Islands")
-+    AL @doc(description: "Albania")
-+    DZ @doc(description: "Algeria")
-+    AS @doc(description: "American Samoa")
-+    AD @doc(description: "Andorra")
-+    AO @doc(description: "Angola")
-+    AI @doc(description: "Anguilla")
-+    AQ @doc(description: "Antarctica")
-+    AG @doc(description: "Antigua & Barbuda")
-+    AR @doc(description: "Argentina")
-+    AM @doc(description: "Armenia")
-+    AW @doc(description: "Aruba")
-+    AU @doc(description: "Australia")
-+    AT @doc(description: "Austria")
-+    AZ @doc(description: "Azerbaijan")
-+    BS @doc(description: "Bahamas")
-+    BH @doc(description: "Bahrain")
-+    BD @doc(description: "Bangladesh")
-+    BB @doc(description: "Barbados")
-+    BY @doc(description: "Belarus")
-+    BE @doc(description: "Belgium")
-+    BZ @doc(description: "Belize")
-+    BJ @doc(description: "Benin")
-+    BM @doc(description: "Bermuda")
-+    BT @doc(description: "Bhutan")
-+    BO @doc(description: "Bolivia")
-+    BA @doc(description: "Bosnia & Herzegovina")
-+    BW @doc(description: "Botswana")
-+    BV @doc(description: "Bouvet Island")
-+    BR @doc(description: "Brazil")
-+    IO @doc(description: "British Indian Ocean Territory")
-+    VG @doc(description: "British Virgin Islands")
-+    BN @doc(description: "Brunei")
-+    BG @doc(description: "Bulgaria")
-+    BF @doc(description: "Burkina Faso")
-+    BI @doc(description: "Burundi")
-+    KH @doc(description: "Cambodia")
-+    CM @doc(description: "Cameroon")
-+    CA @doc(description: "Canada")
-+    CV @doc(description: "Cape Verde")
-+    KY @doc(description: "Cayman Islands")
-+    CF @doc(description: "Central African Republic")
-+    TD @doc(description: "Chad")
-+    CL @doc(description: "Chile")
-+    CN @doc(description: "China")
-+    CX @doc(description: "Christmas Island")
-+    CC @doc(description: "Cocos (Keeling) Islands")
-+    CO @doc(description: "Colombia")
-+    KM @doc(description: "Comoros")
-+    CG @doc(description: "Congo -Brazzaville")
-+    CD @doc(description: "Congo - Kinshasa")
-+    CK @doc(description: "Cook Islands")
-+    CR @doc(description: "Costa Rica")
-+    CI @doc(description: "Côte d’Ivoire")
-+    HR @doc(description: "Croatia")
-+    CU @doc(description: "Cuba")
-+    CY @doc(description: "Cyprus")
-+    CZ @doc(description: "Czech Republic")
-+    DK @doc(description: "Denmark")
-+    DJ @doc(description: "Djibouti")
-+    DM @doc(description: "Dominica")
-+    DO @doc(description: "Dominican Republic")
-+    EC @doc(description: "Ecuador")
-+    EG @doc(description: "Egypt")
-+    SV @doc(description: "El Salvador")
-+    GQ @doc(description: "Equatorial Guinea")
-+    ER @doc(description: "Eritrea")
-+    EE @doc(description: "Estonia")
-+    ET @doc(description: "Ethiopia")
-+    FK @doc(description: "Falkland Islands")
-+    FO @doc(description: "Faroe Islands")
-+    FJ @doc(description: "Fiji")
-+    FI @doc(description: "Finland")
-+    FR @doc(description: "France")
-+    GF @doc(description: "French Guiana")
-+    PF @doc(description: "French Polynesia")
-+    TF @doc(description: "French Southern Territories")
-+    GA @doc(description: "Gabon")
-+    GM @doc(description: "Gambia")
-+    GE @doc(description: "Georgia")
-+    DE @doc(description: "Germany")
-+    GH @doc(description: "Ghana")
-+    GI @doc(description: "Gibraltar")
-+    GR @doc(description: "Greece")
-+    GL @doc(description: "Greenland")
-+    GD @doc(description: "Grenada")
-+    GP @doc(description: "Guadeloupe")
-+    GU @doc(description: "Guam")
-+    GT @doc(description: "Guatemala")
-+    GG @doc(description: "Guernsey")
-+    GN @doc(description: "Guinea")
-+    GW @doc(description: "Guinea-Bissau")
-+    GY @doc(description: "Guyana")
-+    HT @doc(description: "Haiti")
-+    HM @doc(description: "Heard &amp; McDonald Islands")
-+    HN @doc(description: "Honduras")
-+    HK @doc(description: "Hong Kong SAR China")
-+    HU @doc(description: "Hungary")
-+    IS @doc(description: "Iceland")
-+    IN @doc(description: "India")
-+    ID @doc(description: "Indonesia")
-+    IR @doc(description: "Iran")
-+    IQ @doc(description: "Iraq")
-+    IE @doc(description: "Ireland")
-+    IM @doc(description: "Isle of Man")
-+    IL @doc(description: "Israel")
-+    IT @doc(description: "Italy")
-+    JM @doc(description: "Jamaica")
-+    JP @doc(description: "Japan")
-+    JE @doc(description: "Jersey")
-+    JO @doc(description: "Jordan")
-+    KZ @doc(description: "Kazakhstan")
-+    KE @doc(description: "Kenya")
-+    KI @doc(description: "Kiribati")
-+    KW @doc(description: "Kuwait")
-+    KG @doc(description: "Kyrgyzstan")
-+    LA @doc(description: "Laos")
-+    LV @doc(description: "Latvia")
-+    LB @doc(description: "Lebanon")
-+    LS @doc(description: "Lesotho")
-+    LR @doc(description: "Liberia")
-+    LY @doc(description: "Libya")
-+    LI @doc(description: "Liechtenstein")
-+    LT @doc(description: "Lithuania")
-+    LU @doc(description: "Luxembourg")
-+    MO @doc(description: "Macau SAR China")
-+    MK @doc(description: "Macedonia")
-+    MG @doc(description: "Madagascar")
-+    MW @doc(description: "Malawi")
-+    MY @doc(description: "Malaysia")
-+    MV @doc(description: "Maldives")
-+    ML @doc(description: "Mali")
-+    MT @doc(description: "Malta")
-+    MH @doc(description: "Marshall Islands")
-+    MQ @doc(description: "Martinique")
-+    MR @doc(description: "Mauritania")
-+    MU @doc(description: "Mauritius")
-+    YT @doc(description: "Mayotte")
-+    MX @doc(description: "Mexico")
-+    FM @doc(description: "Micronesia")
-+    MD @doc(description: "Moldova")
-+    MC @doc(description: "Monaco")
-+    MN @doc(description: "Mongolia")
-+    ME @doc(description: "Montenegro")
-+    MS @doc(description: "Montserrat")
-+    MA @doc(description: "Morocco")
-+    MZ @doc(description: "Mozambique")
-+    MM @doc(description: "Myanmar (Burma)")
-+    NA @doc(description: "Namibia")
-+    NR @doc(description: "Nauru")
-+    NP @doc(description: "Nepal")
-+    NL @doc(description: "Netherlands")
-+    AN @doc(description: "Netherlands Antilles")
-+    NC @doc(description: "New Caledonia")
-+    NZ @doc(description: "New Zealand")
-+    NI @doc(description: "Nicaragua")
-+    NE @doc(description: "Niger")
-+    NG @doc(description: "Nigeria")
-+    NU @doc(description: "Niue")
-+    NF @doc(description: "Norfolk Island")
-+    MP @doc(description: "Northern Mariana Islands")
-+    KP @doc(description: "North Korea")
-+    NO @doc(description: "Norway")
-+    OM @doc(description: "Oman")
-+    PK @doc(description: "Pakistan")
-+    PW @doc(description: "Palau")
-+    PS @doc(description: "Palestinian Territories")
-+    PA @doc(description: "Panama")
-+    PG @doc(description: "Papua New Guinea")
-+    PY @doc(description: "Paraguay")
-+    PE @doc(description: "Peru")
-+    PH @doc(description: "Philippines")
-+    PN @doc(description: "Pitcairn Islands")
-+    PL @doc(description: "Poland")
-+    PT @doc(description: "Portugal")
-+    QA @doc(description: "Qatar")
-+    RE @doc(description: "Réunion")
-+    RO @doc(description: "Romania")
-+    RU @doc(description: "Russia")
-+    RW @doc(description: "Rwanda")
-+    WS @doc(description: "Samoa")
-+    SM @doc(description: "San Marino")
-+    ST @doc(description: "São Tomé & Príncipe")
-+    SA @doc(description: "Saudi Arabia")
-+    SN @doc(description: "Senegal")
-+    RS @doc(description: "Serbia")
-+    SC @doc(description: "Seychelles")
-+    SL @doc(description: "Sierra Leone")
-+    SG @doc(description: "Singapore")
-+    SK @doc(description: "Slovakia")
-+    SI @doc(description: "Slovenia")
-+    SB @doc(description: "Solomon Islands")
-+    SO @doc(description: "Somalia")
-+    ZA @doc(description: "South Africa")
-+    GS @doc(description: "South Georgia & South Sandwich Islands")
-+    KR @doc(description: "South Korea")
-+    ES @doc(description: "Spain")
-+    LK @doc(description: "Sri Lanka")
-+    BL @doc(description: "St. Barthélemy")
-+    SH @doc(description: "St. Helena")
-+    KN @doc(description: "St. Kitts & Nevis")
-+    LC @doc(description: "St. Lucia")
-+    MF @doc(description: "St. Martin")
-+    PM @doc(description: "St. Pierre & Miquelon")
-+    VC @doc(description: "St. Vincent & Grenadines")
-+    SD @doc(description: "Sudan")
-+    SR @doc(description: "Suriname")
-+    SJ @doc(description: "Svalbard & Jan Mayen")
-+    SZ @doc(description: "Swaziland")
-+    SE @doc(description: "Sweden")
-+    CH @doc(description: "Switzerland")
-+    SY @doc(description: "Syria")
-+    TW @doc(description: "Taiwan")
-+    TJ @doc(description: "Tajikistan")
-+    TZ @doc(description: "Tanzania")
-+    TH @doc(description: "Thailand")
-+    TL @doc(description: "Timor-Leste")
-+    TG @doc(description: "Togo")
-+    TK @doc(description: "Tokelau")
-+    TO @doc(description: "Tonga")
-+    TT @doc(description: "Trinidad & Tobago")
-+    TN @doc(description: "Tunisia")
-+    TR @doc(description: "Turkey")
-+    TM @doc(description: "Turkmenistan")
-+    TC @doc(description: "Turks & Caicos Islands")
-+    TV @doc(description: "Tuvalu")
-+    UG @doc(description: "Uganda")
-+    UA @doc(description: "Ukraine")
-+    AE @doc(description: "United Arab Emirates")
-+    GB @doc(description: "United Kingdom")
-+    US @doc(description: "United States")
-+    UY @doc(description: "Uruguay")
-+    UM @doc(description: "U.S. Outlying Islands")
-+    VI @doc(description: "U.S. Virgin Islands")
-+    UZ @doc(description: "Uzbekistan")
-+    VU @doc(description: "Vanuatu")
-+    VA @doc(description: "Vatican City")
-+    VE @doc(description: "Venezuela")
-+    VN @doc(description: "Vietnam")
-+    WF @doc(description: "Wallis & Futuna")
-+    EH @doc(description: "Western Sahara")
-+    YE @doc(description: "Yemen")
-+    ZM @doc(description: "Zambia")
-+    ZW @doc(description: "Zimbabwe")
-+}
-diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
-index 14f0ae324e0..9ea9e1e5bd9 100644
---- a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
-+++ b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
-@@ -15,7 +15,7 @@ namespace Magento\CustomerImportExport\Model\Export;
-  */
- class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
- {
--    /**#@+
-+    /**
-      * Permanent column names.
-      *
-      * Names that begins with underscore is not an attribute. This name convention is for
-@@ -27,23 +27,19 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
- 
-     const COLUMN_STORE = '_store';
- 
--    /**#@-*/
--
--    /**#@+
-+    /**
-      * Attribute collection name
-      */
-     const ATTRIBUTE_COLLECTION_NAME = \Magento\Customer\Model\ResourceModel\Attribute\Collection::class;
- 
--    /**#@-*/
--
--    /**#@+
-+    /**
-      * XML path to page size parameter
-      */
-     const XML_PATH_PAGE_SIZE = 'export/customer_page_size/customer';
- 
--    /**#@-*/
--
--    /**#@-*/
-+    /**
-+     * @var array
-+     */
-     protected $_attributeOverrides = [
-         'created_at' => ['backend_type' => 'datetime'],
-         'reward_update_notification' => ['source_model' => \Magento\Eav\Model\Entity\Attribute\Source\Boolean::class],
-diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
-index e1345edcf14..7a1a09efaa7 100644
---- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
-+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
-@@ -101,6 +101,13 @@ class Address extends AbstractCustomer
-      */
-     protected $_entityTable;
- 
-+    /**
-+     * Region collection instance
-+     *
-+     * @var \Magento\Directory\Model\ResourceModel\Region\Collection
-+     */
-+    private $_regionCollection;
-+
-     /**
-      * Countries and regions
-      *
-@@ -781,7 +788,7 @@ class Address extends AbstractCustomer
-     }
- 
-     /**
--     * check if address for import is empty (for customer composite mode)
-+     * Check if address for import is empty (for customer composite mode)
-      *
-      * @param array $rowData
-      * @return array
-@@ -940,7 +947,7 @@ class Address extends AbstractCustomer
-     }
- 
-     /**
--     * set customer attributes
-+     * Set customer attributes
-      *
-      * @param array $customerAttributes
-      * @return $this
-diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
-index ab940c9e845..14759bd130f 100644
---- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
-+++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
-@@ -288,9 +288,12 @@ class Customer extends AbstractCustomer
-     {
-         $firstCustomer = reset($entitiesToUpdate);
-         $columnsToUpdate = array_keys($firstCustomer);
--        $customerFieldsToUpdate = array_filter($this->customerFields, function ($field) use ($columnsToUpdate) {
--            return in_array($field, $columnsToUpdate);
--        });
-+        $customerFieldsToUpdate = array_filter(
-+            $this->customerFields,
-+            function ($field) use ($columnsToUpdate) {
-+                return in_array($field, $columnsToUpdate);
-+            }
-+        );
-         return $customerFieldsToUpdate;
-     }
- 
-@@ -423,6 +426,9 @@ class Customer extends AbstractCustomer
-             $attributeParameters = $this->_attributes[$attributeCode];
-             if (in_array($attributeParameters['type'], ['select', 'boolean'])) {
-                 $value = $this->getSelectAttrIdByValue($attributeParameters, $value);
-+                if ($attributeCode === CustomerInterface::GENDER && $value === 0) {
-+                    $value = null;
-+                }
-             } elseif ('multiselect' == $attributeParameters['type']) {
-                 $ids = [];
-                 foreach (explode($multiSeparator, mb_strtolower($value)) as $subValue) {
-@@ -519,10 +525,8 @@ class Customer extends AbstractCustomer
-                         if (!isset($attributesToSave[$tableName])) {
-                             $attributesToSave[$tableName] = [];
-                         }
--                        $attributesToSave[$tableName] = array_diff_key(
--                            $attributesToSave[$tableName],
--                            $customerAttributes
--                        ) + $customerAttributes;
-+                        $attributes = array_diff_key($attributesToSave[$tableName], $customerAttributes);
-+                        $attributesToSave[$tableName] =  $attributes + $customerAttributes;
-                     }
-                 }
-             }
-@@ -578,13 +582,9 @@ class Customer extends AbstractCustomer
-                 $this->addRowError(self::ERROR_INVALID_STORE, $rowNumber);
-             }
-             // check password
--            if (isset(
--                $rowData['password']
--            ) && strlen(
--                $rowData['password']
--            ) && $this->string->strlen(
--                $rowData['password']
--            ) < self::MIN_PASSWORD_LENGTH
-+            if (isset($rowData['password'])
-+                && strlen($rowData['password'])
-+                && $this->string->strlen($rowData['password']) < self::MIN_PASSWORD_LENGTH
-             ) {
-                 $this->addRowError(self::ERROR_PASSWORD_LENGTH, $rowNumber);
-             }
-diff --git a/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php b/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
-index 956c9695623..0f4c5f82bfe 100644
---- a/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
-+++ b/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
-@@ -270,6 +270,10 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
-     protected function _importData()
-     {
-         $result = $this->_customerEntity->importData();
-+        $this->countItemsCreated += $this->_customerEntity->getCreatedItemsCount();
-+        $this->countItemsUpdated += $this->_customerEntity->getUpdatedItemsCount();
-+        $this->countItemsDeleted += $this->_customerEntity->getDeletedItemsCount();
-+
-         if ($this->getBehavior() != \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE) {
-             return $result && $this->_addressEntity->setCustomerAttributes($this->_customerAttributes)->importData();
-         }
-@@ -299,8 +303,8 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
-         $rows = [];
-         foreach ($source as $row) {
-             $rows[] = [
--                Address::COLUMN_EMAIL => $row[Customer::COLUMN_EMAIL],
--                Address::COLUMN_WEBSITE => $row[Customer::COLUMN_WEBSITE],
-+                Address::COLUMN_EMAIL => $row[Customer::COLUMN_EMAIL] ?? null,
-+                Address::COLUMN_WEBSITE => $row[Customer::COLUMN_WEBSITE] ?? null
-             ];
-         }
-         $source->rewind();
-diff --git a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
-index f779505a380..43623019c00 100644
---- a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
-+++ b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
-@@ -13,6 +13,9 @@ use Magento\Customer\Model\ResourceModel\Customer\Collection as CustomerCollecti
- use Magento\ImportExport\Model\ResourceModel\CollectionByPagesIteratorFactory;
- use Magento\ImportExport\Model\ResourceModel\CollectionByPagesIterator;
- 
-+/**
-+ * Storage to check existing customers.
-+ */
- class Storage
- {
-     /**
-@@ -48,6 +51,11 @@ class Storage
-      */
-     private $customerCollectionFactory;
- 
-+    /**
-+     * @var CustomerCollection
-+     */
-+    public $_customerCollection;
-+
-     /**
-      * @param CustomerCollectionFactory $collectionFactory
-      * @param CollectionByPagesIteratorFactory $colIteratorFactory
-@@ -112,6 +120,8 @@ class Storage
-     }
- 
-     /**
-+     * Add a customer by an array
-+     *
-      * @param array $customer
-      * @return $this
-      */
-diff --git a/app/code/Magento/Deploy/Collector/Collector.php b/app/code/Magento/Deploy/Collector/Collector.php
-index b02c8e478d6..7742f2971a2 100644
---- a/app/code/Magento/Deploy/Collector/Collector.php
-+++ b/app/code/Magento/Deploy/Collector/Collector.php
-@@ -8,6 +8,8 @@ namespace Magento\Deploy\Collector;
- use Magento\Deploy\Source\SourcePool;
- use Magento\Deploy\Package\Package;
- use Magento\Deploy\Package\PackageFactory;
-+use Magento\Deploy\Package\PackageFile;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
- 
- /**
-@@ -43,6 +45,9 @@ class Collector implements CollectorInterface
-      * @var PackageFactory
-      */
-     private $packageFactory;
-+    
-+    /** @var \Magento\Framework\Module\ModuleManagerInterface */
-+    private $moduleManager;
- 
-     /**
-      * Default values for package primary identifiers
-@@ -61,15 +66,19 @@ class Collector implements CollectorInterface
-      * @param SourcePool $sourcePool
-      * @param FileNameResolver $fileNameResolver
-      * @param PackageFactory $packageFactory
-+     * @param ModuleManagerInterface|null $moduleManager
-      */
-     public function __construct(
-         SourcePool $sourcePool,
-         FileNameResolver $fileNameResolver,
--        PackageFactory $packageFactory
-+        PackageFactory $packageFactory,
-+        ModuleManagerInterface $moduleManager = null
-     ) {
-         $this->sourcePool = $sourcePool;
-         $this->fileNameResolver = $fileNameResolver;
-         $this->packageFactory = $packageFactory;
-+        $this->moduleManager = $moduleManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(\Magento\Framework\Module\ModuleManagerInterface::class);
-     }
- 
-     /**
-@@ -81,19 +90,11 @@ class Collector implements CollectorInterface
-         foreach ($this->sourcePool->getAll() as $source) {
-             $files = $source->get();
-             foreach ($files as $file) {
--                $file->setDeployedFileName($this->fileNameResolver->resolve($file->getFileName()));
--                $params = [
--                    'area' => $file->getArea(),
--                    'theme' => $file->getTheme(),
--                    'locale' => $file->getLocale(),
--                    'module' => $file->getModule(),
--                    'isVirtual' => (!$file->getLocale() || !$file->getTheme() || !$file->getArea())
--                ];
--                foreach ($this->packageDefaultValues as $name => $value) {
--                    if (!isset($params[$name])) {
--                        $params[$name] = $value;
--                    }
-+                if ($file->getModule() && !$this->moduleManager->isEnabled($file->getModule())) {
-+                    continue;
-                 }
-+                $file->setDeployedFileName($this->fileNameResolver->resolve($file->getFileName()));
-+                $params = $this->getParams($file);
-                 $packagePath = "{$params['area']}/{$params['theme']}/{$params['locale']}";
-                 if (!isset($packages[$packagePath])) {
-                     $packages[$packagePath] = $this->packageFactory->create($params);
-@@ -105,4 +106,27 @@ class Collector implements CollectorInterface
-         }
-         return $packages;
-     }
-+
-+    /**
-+     * Retrieve package params
-+     *
-+     * @param PackageFile $file
-+     * @return array
-+     */
-+    private function getParams(PackageFile $file)
-+    {
-+        $params = [
-+            'area' => $file->getArea(),
-+            'theme' => $file->getTheme(),
-+            'locale' => $file->getLocale(),
-+            'module' => $file->getModule(),
-+            'isVirtual' => (!$file->getLocale() || !$file->getTheme() || !$file->getArea())
-+        ];
-+        foreach ($this->packageDefaultValues as $name => $value) {
-+            if (!isset($params[$name])) {
-+                $params[$name] = $value;
-+            }
-+        }
-+        return $params;
-+    }
- }
-diff --git a/app/code/Magento/Deploy/Console/ConsoleLogger.php b/app/code/Magento/Deploy/Console/ConsoleLogger.php
-index 0ca34439c7d..e6487a79653 100644
---- a/app/code/Magento/Deploy/Console/ConsoleLogger.php
-+++ b/app/code/Magento/Deploy/Console/ConsoleLogger.php
-@@ -271,7 +271,7 @@ class ConsoleLogger extends AbstractLogger
-         return "{$title}{$titlePad}"
-         . "{$count}{$countPad}"
-         . "{$this->renderBar($output, $process)} "
--        . "{$percent}%{$percentPad}"
-+        . "{$percent}{$percentPad}"
-         . "{$process['elapsed']}   ";
-     }
- 
-diff --git a/app/code/Magento/Deploy/Console/DeployStaticOptions.php b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
-index 9a73dd5d65f..1c02d24f7e9 100644
---- a/app/code/Magento/Deploy/Console/DeployStaticOptions.php
-+++ b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\Deploy\Console;
- 
-+use Magento\Deploy\Process\Queue;
- use Symfony\Component\Console\Input\InputOption;
- use Symfony\Component\Console\Input\InputArgument;
- 
-@@ -57,6 +58,11 @@ class DeployStaticOptions
-      */
-     const JOBS_AMOUNT = 'jobs';
- 
-+    /**
-+     * Key for max execution time option
-+     */
-+    const MAX_EXECUTION_TIME = 'max-execution-time';
-+
-     /**
-      * Force run of static deploy
-      */
-@@ -150,6 +156,7 @@ class DeployStaticOptions
-      * Basic options
-      *
-      * @return array
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-     private function getBasicOptions()
-     {
-@@ -216,6 +223,13 @@ class DeployStaticOptions
-                 'Enable parallel processing using the specified number of jobs.',
-                 self::DEFAULT_JOBS_AMOUNT
-             ),
-+            new InputOption(
-+                self::MAX_EXECUTION_TIME,
-+                null,
-+                InputOption::VALUE_OPTIONAL,
-+                'The maximum expected execution time of deployment static process (in seconds).',
-+                Queue::DEFAULT_MAX_EXEC_TIME
-+            ),
-             new InputOption(
-                 self::SYMLINK_LOCALE,
-                 null,
-@@ -240,7 +254,7 @@ class DeployStaticOptions
-             new InputArgument(
-                 self::LANGUAGES_ARGUMENT,
-                 InputArgument::IS_ARRAY,
--                'Space-separated list of ISO-636 language codes for which to output static view files.'
-+                'Space-separated list of ISO-639 language codes for which to output static view files.'
-             ),
-         ];
-     }
-diff --git a/app/code/Magento/Deploy/Console/InputValidator.php b/app/code/Magento/Deploy/Console/InputValidator.php
-index b3301f60fec..772410d58a4 100644
---- a/app/code/Magento/Deploy/Console/InputValidator.php
-+++ b/app/code/Magento/Deploy/Console/InputValidator.php
-@@ -9,6 +9,8 @@ use Magento\Setup\Console\Command\DeployStaticContentCommand;
- use Magento\Deploy\Console\DeployStaticOptions as Options;
- use Magento\Framework\Validator\Locale;
- use Symfony\Component\Console\Input\InputInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Validator\RegexFactory;
- 
- /**
-  * Command input arguments validator class
-@@ -55,14 +57,24 @@ class InputValidator
-      */
-     private $localeValidator;
- 
-+    /**
-+     * @var RegexFactory
-+     */
-+    private $versionValidatorFactory;
-+
-     /**
-      * InputValidator constructor
-      *
-      * @param Locale $localeValidator
-+     * @param RegexFactory $versionValidatorFactory
-      */
--    public function __construct(Locale $localeValidator)
--    {
-+    public function __construct(
-+        Locale $localeValidator,
-+        ?RegexFactory $versionValidatorFactory = null
-+    ) {
-         $this->localeValidator = $localeValidator;
-+        $this->versionValidatorFactory = $versionValidatorFactory ?:
-+            ObjectManager::getInstance()->get(RegexFactory::class);
-     }
- 
-     /**
-@@ -85,6 +97,9 @@ class InputValidator
-             $input->getArgument(Options::LANGUAGES_ARGUMENT) ?: ['all'],
-             $input->getOption(Options::EXCLUDE_LANGUAGE)
-         );
-+        $this->checkVersionInput(
-+            $input->getOption(Options::CONTENT_VERSION) ?: ''
-+        );
-     }
- 
-     /**
-@@ -147,4 +162,29 @@ class InputValidator
-             }
-         }
-     }
-+
-+    /**
-+     * Version input checks
-+     *
-+     * @param string $contentVersion
-+     * @throws \InvalidArgumentException
-+     */
-+    private function checkVersionInput(string $contentVersion): void
-+    {
-+        if ($contentVersion) {
-+            $versionValidator = $this->versionValidatorFactory->create(
-+                [
-+                    'pattern' => '/^[A-Za-z0-9_.]+$/'
-+                ]
-+            );
-+
-+            if (!$versionValidator->isValid($contentVersion)) {
-+                throw new \InvalidArgumentException(
-+                    'Argument "' .
-+                    Options::CONTENT_VERSION
-+                    . '" has invalid value, content version should contain only characters, digits and dots'
-+                );
-+            }
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Deploy/Model/DeploymentConfig/ImporterPool.php b/app/code/Magento/Deploy/Model/DeploymentConfig/ImporterPool.php
-index a4a9ef00c4a..efcc12e0894 100644
---- a/app/code/Magento/Deploy/Model/DeploymentConfig/ImporterPool.php
-+++ b/app/code/Magento/Deploy/Model/DeploymentConfig/ImporterPool.php
-@@ -110,6 +110,8 @@ class ImporterPool
-     }
- 
-     /**
-+     * Retrieves sections names
-+     *
-      * Retrieves names of sections for configuration files whose data is read from these files for import
-      * to appropriate application sources.
-      *
-@@ -187,14 +189,7 @@ class ImporterPool
-     private function sort(array $data)
-     {
-         uasort($data, function (array $a, array $b) {
--            $a['sort_order'] = $this->getSortOrder($a);
--            $b['sort_order'] = $this->getSortOrder($b);
--
--            if ($a['sort_order'] == $b['sort_order']) {
--                return 0;
--            }
--
--            return ($a['sort_order'] < $b['sort_order']) ? -1 : 1;
-+            return $this->getSortOrder($a) <=> $this->getSortOrder($b);
-         });
- 
-         return $data;
-diff --git a/app/code/Magento/Deploy/Model/Filesystem.php b/app/code/Magento/Deploy/Model/Filesystem.php
-index 59880d2d669..bc19ee28785 100644
---- a/app/code/Magento/Deploy/Model/Filesystem.php
-+++ b/app/code/Magento/Deploy/Model/Filesystem.php
-@@ -29,8 +29,8 @@ class Filesystem
-      * Access permissions to the files are set during deploy Magento 2, directly after
-      * uploading code of Magento. Also it is possible to specify the value
-      * of inverse mask for setting access permissions to files generated by Magento.
--     * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
--     * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
-+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
-+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
-      */
-     const PERMISSIONS_FILE = 0640;
- 
-@@ -41,8 +41,8 @@ class Filesystem
-      * Access permissions to the directories are set during deploy Magento 2, directly after
-      * uploading code of Magento. Also it is possible to specify the value
-      * of inverse mask for setting access permissions to directories generated by Magento.
--     * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
--     * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
-+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
-+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
-      */
-     const PERMISSIONS_DIR = 0750;
- 
-@@ -150,6 +150,8 @@ class Filesystem
-      *
-      * @param OutputInterface $output
-      * @return void
-+     * @throws LocalizedException
-+     * @throws \Exception
-      */
-     public function regenerateStatic(
-         OutputInterface $output
-@@ -164,9 +166,12 @@ class Filesystem
-                 DirectoryList::STATIC_VIEW
-             ]
-         );
--        
-+
-+        $this->reinitCacheDirectories();
-         // Trigger code generation
-         $this->compile($output);
-+
-+        $this->reinitCacheDirectories();
-         // Trigger static assets compilation and deployment
-         $this->deployStaticContent($output);
-     }
-@@ -217,6 +222,7 @@ class Filesystem
-      *
-      * @return array
-      * @throws \InvalidArgumentException if unknown locale is provided by the store configuration
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      */
-     private function getUsedLocales()
-     {
-@@ -249,13 +255,6 @@ class Filesystem
-     protected function compile(OutputInterface $output)
-     {
-         $output->writeln('Starting compilation');
--        $this->cleanupFilesystem(
--            [
--                DirectoryList::CACHE,
--                DirectoryList::GENERATED_CODE,
--                DirectoryList::GENERATED_METADATA,
--            ]
--        );
-         $cmd = $this->functionCallPath . 'setup:di:compile';
- 
-         /**
-@@ -279,6 +278,7 @@ class Filesystem
-      *
-      * @param array $directoryCodeList
-      * @return void
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      */
-     public function cleanupFilesystem($directoryCodeList)
-     {
-@@ -320,8 +320,9 @@ class Filesystem
-      * Access permissions to the files and directories are set during deploy Magento 2, directly after
-      * uploading code of Magento. Also it is possible to specify the value
-      * of inverse mask for setting access permissions to files and directories generated by Magento.
--     * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
--     * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
-+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
-+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      */
-     protected function changePermissions($directoryCodeList, $dirPermissions, $filePermissions)
-     {
-@@ -345,8 +346,9 @@ class Filesystem
-      * Access permissions to the files and directories are set during deploy Magento 2, directly after
-      * uploading code of Magento. Also it is possible to specify the value
-      * of inverse mask for setting access permissions to files and directories generated by Magento.
--     * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
--     * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
-+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
-+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      */
-     public function lockStaticResources()
-     {
-@@ -361,4 +363,15 @@ class Filesystem
-             self::PERMISSIONS_FILE
-         );
-     }
-+
-+    /**
-+     * Flush cache and restore the basic cache directories.
-+     *
-+     * @throws LocalizedException
-+     */
-+    private function reinitCacheDirectories()
-+    {
-+        $command = $this->functionCallPath . 'cache:flush';
-+        $this->shell->execute($command);
-+    }
- }
-diff --git a/app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php b/app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php
-index 1c139d5682d..667232313a8 100644
---- a/app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php
-+++ b/app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php
-@@ -69,6 +69,7 @@ class CssUrls implements ProcessorInterface
-         /** @var PackageFile $file */
-         foreach (array_keys($package->getMap()) as $fileId) {
-             $filePath = str_replace(\Magento\Framework\View\Asset\Repository::FILE_ID_SEPARATOR, '/', $fileId);
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             if (strtolower(pathinfo($fileId, PATHINFO_EXTENSION)) == 'css') {
-                 $urlMap = $this->parseCss(
-                     $urlMap,
-@@ -100,6 +101,7 @@ class CssUrls implements ProcessorInterface
-     {
-         $cssFilePath = $this->minification->addMinifiedSign($cssFilePath);
- 
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         $cssFileBasePath = pathinfo($cssFilePath, PATHINFO_DIRNAME);
-         $urls = $this->getCssUrls($cssContent);
-         foreach ($urls as $url) {
-@@ -124,8 +126,21 @@ class CssUrls implements ProcessorInterface
-                         . str_repeat('../', count(explode('/', $cssFileBasePath)))
-                         . $this->minification->addMinifiedSign($matchedFile->getDeployedFilePath())
-                 ];
-+            } else {
-+                $filePathInBase = $package->getArea() .
-+                    '/' . Package::BASE_THEME .
-+                    '/' . $package->getLocale() .
-+                    '/' . $lookupFileId;
-+                if ($this->staticDir->isReadable($this->minification->addMinifiedSign($filePathInBase))) {
-+                    $urlMap[$url][] = [
-+                        'filePath' => $this->minification->addMinifiedSign($packagePath . '/' . $cssFilePath),
-+                        'replace' => str_repeat('../', count(explode('/', $cssFileBasePath)) + 4)
-+                            . $this->minification->addMinifiedSign($filePathInBase),
-+                    ];
-+                }
-             }
-         }
-+
-         return $urlMap;
-     }
- 
-diff --git a/app/code/Magento/Deploy/Process/Queue.php b/app/code/Magento/Deploy/Process/Queue.php
-index c4c31b8ff77..2f2a1492399 100644
---- a/app/code/Magento/Deploy/Process/Queue.php
-+++ b/app/code/Magento/Deploy/Process/Queue.php
-@@ -3,14 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Deploy\Process;
- 
- use Magento\Deploy\Package\Package;
- use Magento\Deploy\Service\DeployPackage;
- use Magento\Framework\App\ResourceConnection;
--use Psr\Log\LoggerInterface;
- use Magento\Framework\App\State as AppState;
- use Magento\Framework\Locale\ResolverInterface as LocaleResolver;
-+use Psr\Log\LoggerInterface;
- 
- /**
-  * Deployment Queue
-@@ -125,6 +127,8 @@ class Queue
-     }
- 
-     /**
-+     * Adds deployment package.
-+     *
-      * @param Package $package
-      * @param Package[] $dependencies
-      * @return bool true on success
-@@ -140,6 +144,8 @@ class Queue
-     }
- 
-     /**
-+     * Returns packages array.
-+     *
-      * @return Package[]
-      */
-     public function getPackages()
-@@ -159,9 +165,11 @@ class Queue
-         $packages = $this->packages;
-         while (count($packages) && $this->checkTimeout()) {
-             foreach ($packages as $name => $packageJob) {
-+                // Unsets each member of $packages array (passed by reference) as each is executed
-                 $this->assertAndExecute($name, $packages, $packageJob);
-             }
-             $this->logger->info('.');
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             sleep(3);
-             foreach ($this->inProgress as $name => $package) {
-                 if ($this->isDeployed($package)) {
-@@ -209,18 +217,16 @@ class Queue
-     }
- 
-     /**
-+     * Executes deployment package.
-+     *
-      * @param Package $package
-      * @param string $name
-      * @param array $packages
-      * @param bool $dependenciesNotFinished
-      * @return void
-      */
--    private function executePackage(
--        Package $package,
--        string $name,
--        array &$packages,
--        bool $dependenciesNotFinished
--    ) {
-+    private function executePackage(Package $package, string $name, array &$packages, bool $dependenciesNotFinished)
-+    {
-         if (!$dependenciesNotFinished
-             && !$this->isDeployed($package)
-             && ($this->maxProcesses < 2 || (count($this->inProgress) < $this->maxProcesses))
-@@ -244,6 +250,7 @@ class Queue
-                 }
-             }
-             $this->logger->info('.');
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             sleep(5);
-         }
-         if ($this->isCanBeParalleled()) {
-@@ -253,6 +260,8 @@ class Queue
-     }
- 
-     /**
-+     * Checks if can be parallel.
-+     *
-      * @return bool
-      */
-     private function isCanBeParalleled()
-@@ -261,9 +270,11 @@ class Queue
-     }
- 
-     /**
-+     * Executes the process.
-+     *
-      * @param Package $package
-      * @return bool true on success for main process and exit for child process
--     * @SuppressWarnings(PHPMD.ExitExpression)
-+     * @throws \RuntimeException
-      */
-     private function execute(Package $package)
-     {
-@@ -291,6 +302,7 @@ class Queue
-         );
- 
-         if ($this->isCanBeParalleled()) {
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             $pid = pcntl_fork();
-             if ($pid === -1) {
-                 throw new \RuntimeException('Unable to fork a new process');
-@@ -305,6 +317,7 @@ class Queue
-             // process child process
-             $this->inProgress = [];
-             $this->deployPackageService->deploy($package, $this->options, true);
-+            // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-             exit(0);
-         } else {
-             $this->deployPackageService->deploy($package, $this->options);
-@@ -313,6 +326,8 @@ class Queue
-     }
- 
-     /**
-+     * Checks if package is deployed.
-+     *
-      * @param Package $package
-      * @return bool
-      */
-@@ -320,12 +335,41 @@ class Queue
-     {
-         if ($this->isCanBeParalleled()) {
-             if ($package->getState() === null) {
--                $pid = pcntl_waitpid($this->getPid($package), $status, WNOHANG);
--                if ($pid === $this->getPid($package)) {
-+                $pid = $this->getPid($package);
-+
-+                // When $pid comes back as null the child process for this package has not yet started; prevents both
-+                // hanging until timeout expires (which was behaviour in 2.2.x) and the type error from strict_types
-+                if ($pid === null) {
-+                    return false;
-+                }
-+
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+                $result = pcntl_waitpid($pid, $status, WNOHANG);
-+                if ($result === $pid) {
-                     $package->setState(Package::STATE_COMPLETED);
-+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+                    $exitStatus = pcntl_wexitstatus($status);
-+
-+                    $this->logger->info(
-+                        "Exited: " . $package->getPath() . "(status: $exitStatus)",
-+                        [
-+                            'process' => $package->getPath(),
-+                            'status' => $exitStatus,
-+                        ]
-+                    );
- 
-                     unset($this->inProgress[$package->getPath()]);
-+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                     return pcntl_wexitstatus($status) === 0;
-+                } elseif ($result === -1) {
-+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+                    $errno = pcntl_errno();
-+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+                    $strerror = pcntl_strerror($errno);
-+
-+                    throw new \RuntimeException(
-+                        "Error encountered checking child process status (PID: $pid): $strerror (errno: $errno)"
-+                    );
-                 }
-                 return false;
-             }
-@@ -334,17 +378,19 @@ class Queue
-     }
- 
-     /**
-+     * Returns process ID or null if not found.
-+     *
-      * @param Package $package
-      * @return int|null
-      */
-     private function getPid(Package $package)
-     {
--        return isset($this->processIds[$package->getPath()])
--            ? $this->processIds[$package->getPath()]
--            : null;
-+        return $this->processIds[$package->getPath()] ?? null;
-     }
- 
-     /**
-+     * Checks timeout.
-+     *
-      * @return bool
-      */
-     private function checkTimeout()
-@@ -357,14 +403,31 @@ class Queue
-      *
-      * Protect against zombie process
-      *
-+     * @throws \RuntimeException
-+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      * @return void
-      */
-     public function __destruct()
-     {
-         foreach ($this->inProgress as $package) {
--            if (pcntl_waitpid($this->getPid($package), $status) === -1) {
-+            $pid = $this->getPid($package);
-+            $this->logger->info(
-+                "Reaping child process: {$package->getPath()} (PID: $pid)",
-+                [
-+                    'process' => $package->getPath(),
-+                    'pid' => $pid,
-+                ]
-+            );
-+
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+            if (pcntl_waitpid($pid, $status) === -1) {
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+                $errno = pcntl_errno();
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+                $strerror = pcntl_strerror($errno);
-+
-                 throw new \RuntimeException(
--                    'Error while waiting for package deployed: ' . $this->getPid($package) . '; Status: ' . $status
-+                    "Error encountered waiting for child process (PID: $pid): $strerror (errno: $errno)"
-                 );
-             }
-         }
-diff --git a/app/code/Magento/Deploy/Service/DeployPackage.php b/app/code/Magento/Deploy/Service/DeployPackage.php
-index 3b7b5b77a07..52cb6c60757 100644
---- a/app/code/Magento/Deploy/Service/DeployPackage.php
-+++ b/app/code/Magento/Deploy/Service/DeployPackage.php
-@@ -107,6 +107,8 @@ class DeployPackage
-     }
- 
-     /**
-+     * Execute package deploy procedure when area already emulated
-+     *
-      * @param Package $package
-      * @param array $options
-      * @param bool $skipLogging
-@@ -136,7 +138,9 @@ class DeployPackage
-                 $this->errorsCount++;
-                 $this->logger->critical($errorMessage);
-             } catch (\Exception $exception) {
--                $this->logger->critical($exception->getTraceAsString());
-+                $this->logger->critical(
-+                    'Compilation from source ' . $file->getSourcePath() . ' failed' . PHP_EOL . (string)$exception
-+                );
-                 $this->errorsCount++;
-             }
-         }
-@@ -219,7 +223,9 @@ class DeployPackage
-     private function checkFileSkip($filePath, array $options)
-     {
-         if ($filePath !== '.') {
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             $ext = strtolower(pathinfo($filePath, PATHINFO_EXTENSION));
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             $basename = pathinfo($filePath, PATHINFO_BASENAME);
-             if ($ext === 'less' && strpos($basename, '_') === 0) {
-                 return true;
-diff --git a/app/code/Magento/Deploy/Service/DeployStaticContent.php b/app/code/Magento/Deploy/Service/DeployStaticContent.php
-index 66ec6e7418a..89039971599 100644
---- a/app/code/Magento/Deploy/Service/DeployStaticContent.php
-+++ b/app/code/Magento/Deploy/Service/DeployStaticContent.php
-@@ -9,6 +9,7 @@ use Magento\Deploy\Strategy\DeployStrategyFactory;
- use Magento\Deploy\Process\QueueFactory;
- use Magento\Deploy\Console\DeployStaticOptions as Options;
- use Magento\Framework\App\View\Deployment\Version\StorageInterface;
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\ObjectManagerInterface;
- use Psr\Log\LoggerInterface;
- 
-@@ -16,6 +17,7 @@ use Psr\Log\LoggerInterface;
-  * Main service for static content deployment
-  *
-  * Aggregates services to deploy static files, static files bundles, translations and minified templates
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class DeployStaticContent
- {
-@@ -71,6 +73,7 @@ class DeployStaticContent
-      * Run deploy procedure
-      *
-      * @param array $options
-+     * @throws LocalizedException
-      * @return void
-      */
-     public function deploy(array $options)
-@@ -85,24 +88,26 @@ class DeployStaticContent
-             return;
-         }
- 
--        $queue = $this->queueFactory->create(
--            [
--                'logger' => $this->logger,
--                'options' => $options,
--                'maxProcesses' => $this->getProcessesAmount($options),
--                'deployPackageService' => $this->objectManager->create(
--                    \Magento\Deploy\Service\DeployPackage::class,
--                    [
--                        'logger' => $this->logger
--                    ]
--                )
--            ]
--        );
-+        $queueOptions = [
-+            'logger' => $this->logger,
-+            'options' => $options,
-+            'maxProcesses' => $this->getProcessesAmount($options),
-+            'deployPackageService' => $this->objectManager->create(
-+                \Magento\Deploy\Service\DeployPackage::class,
-+                [
-+                    'logger' => $this->logger
-+                ]
-+            )
-+        ];
-+
-+        if (isset($options[Options::MAX_EXECUTION_TIME])) {
-+            $queueOptions['maxExecTime'] = (int)$options[Options::MAX_EXECUTION_TIME];
-+        }
- 
-         $deployStrategy = $this->deployStrategyFactory->create(
-             $options[Options::STRATEGY],
-             [
--                'queue' => $queue
-+                'queue' => $this->queueFactory->create($queueOptions)
-             ]
-         );
- 
-@@ -133,6 +138,8 @@ class DeployStaticContent
-     }
- 
-     /**
-+     * Returns amount of parallel processes, returns zero if option wasn't set.
-+     *
-      * @param array $options
-      * @return int
-      */
-@@ -142,6 +149,8 @@ class DeployStaticContent
-     }
- 
-     /**
-+     * Checks if need to refresh only version.
-+     *
-      * @param array $options
-      * @return bool
-      */
-diff --git a/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php b/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php
-new file mode 100644
-index 00000000000..f3991222dfa
---- /dev/null
-+++ b/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php
-@@ -0,0 +1,210 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Deploy\Test\Unit\Console;
-+
-+use Magento\Framework\Validator\Regex;
-+use Magento\Framework\Validator\RegexFactory;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Deploy\Console\InputValidator;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Deploy\Console\DeployStaticOptions as Options;
-+use Magento\Framework\Validator\Locale;
-+use Symfony\Component\Console\Input\InputOption;
-+use Symfony\Component\Console\Input\InputDefinition;
-+use Symfony\Component\Console\Input\ArrayInput;
-+use InvalidArgumentException;
-+use Symfony\Component\Console\Input\InputArgument;
-+
-+/**
-+ * Class InputValidatorTest
-+ * @package Magento\Deploy\Test\Unit\Console
-+ *  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class InputValidatorTest extends TestCase
-+{
-+    /**
-+     * @var ObjectManagerHelper
-+     */
-+    protected $objectManagerHelper;
-+
-+    /**
-+     * @var InputValidator
-+     */
-+    protected $inputValidator;
-+
-+    /**
-+     * @var Locale
-+     */
-+    protected $localeValidator;
-+
-+    /**
-+     * @throws \Zend_Validate_Exception
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManagerHelper = new ObjectManagerHelper($this);
-+
-+        $regexFactoryMock = $this->getMockBuilder(RegexFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+
-+        $regexObject = new Regex('/^[A-Za-z0-9_.]+$/');
-+
-+        $regexFactoryMock->expects($this->any())->method('create')
-+            ->willReturn($regexObject);
-+
-+        $localeObjectMock = $this->getMockBuilder(Locale::class)->setMethods(['isValid'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $localeObjectMock->expects($this->any())->method('isValid')
-+            ->with('en_US')
-+            ->will($this->returnValue(true));
-+
-+        $this->inputValidator = $this->objectManagerHelper->getObject(
-+            InputValidator::class,
-+            [
-+                'localeValidator' => $localeObjectMock,
-+                'versionValidatorFactory' => $regexFactoryMock
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @throws \Zend_Validate_Exception
-+     */
-+    public function testValidate()
-+    {
-+        $input = $this->getMockBuilder(ArrayInput::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getOption', 'getArgument'])
-+            ->getMock();
-+
-+        $input->expects($this->atLeastOnce())->method('getArgument')->willReturn(['all']);
-+
-+        $input->expects($this->atLeastOnce())->method('getOption')
-+            ->willReturnMap(
-+                [
-+                    [Options::AREA, ['all']],
-+                    [Options::EXCLUDE_AREA, ['none']],
-+                    [Options::THEME, ['all']],
-+                    [Options::EXCLUDE_THEME, ['none']],
-+                    [Options::EXCLUDE_LANGUAGE, ['none']],
-+                    [Options::CONTENT_VERSION, '12345']
-+                ]
-+            );
-+
-+        /** @noinspection PhpParamsInspection */
-+        $this->inputValidator->validate($input);
-+    }
-+
-+    /**
-+     * @covers \Magento\Deploy\Console\InputValidator::checkAreasInput()
-+     */
-+    public function testCheckAreasInputException()
-+    {
-+        $options = [
-+            new InputOption(Options::AREA, null, 4, '', ['test']),
-+            new InputOption(Options::EXCLUDE_AREA, null, 4, '', ['test'])
-+        ];
-+
-+        $inputDefinition = new InputDefinition($options);
-+
-+        try {
-+            $this->inputValidator->validate(
-+                new ArrayInput([], $inputDefinition)
-+            );
-+        } catch (\Exception $e) {
-+            $this->assertContains('--area (-a) and --exclude-area cannot be used at the same time', $e->getMessage());
-+            $this->assertInstanceOf(InvalidArgumentException::class, $e);
-+        }
-+    }
-+
-+    /**
-+     * @covers \Magento\Deploy\Console\InputValidator::checkThemesInput()
-+     */
-+    public function testCheckThemesInputException()
-+    {
-+        $options = [
-+            new InputOption(Options::AREA, null, 4, '', ['all']),
-+            new InputOption(Options::EXCLUDE_AREA, null, 4, '', ['none']),
-+            new InputOption(Options::THEME, null, 4, '', ['blank']),
-+            new InputOption(Options::EXCLUDE_THEME, null, 4, '', ['luma'])
-+        ];
-+
-+        $inputDefinition = new InputDefinition($options);
-+
-+        try {
-+            $this->inputValidator->validate(
-+                new ArrayInput([], $inputDefinition)
-+            );
-+        } catch (\Exception $e) {
-+            $this->assertContains('--theme (-t) and --exclude-theme cannot be used at the same time', $e->getMessage());
-+            $this->assertInstanceOf(InvalidArgumentException::class, $e);
-+        }
-+    }
-+
-+    public function testCheckLanguagesInputException()
-+    {
-+        $options = [
-+            new InputOption(Options::AREA, null, 4, '', ['all']),
-+            new InputOption(Options::EXCLUDE_AREA, '', 4, '', ['none']),
-+            new InputOption(Options::THEME, null, 4, '', ['all']),
-+            new InputOption(Options::EXCLUDE_THEME, null, 4, '', ['none']),
-+            new InputArgument(Options::LANGUAGES_ARGUMENT, 2, '', ['en_US']),
-+            new InputOption(Options::EXCLUDE_LANGUAGE, null, 4, '', ['all'])
-+        ];
-+
-+        $inputDefinition = new InputDefinition($options);
-+
-+        try {
-+            $this->inputValidator->validate(
-+                new ArrayInput([], $inputDefinition)
-+            );
-+        } catch (\Exception $e) {
-+            $this->assertContains(
-+                '--language (-l) and --exclude-language cannot be used at the same time',
-+                $e->getMessage()
-+            );
-+
-+            $this->assertInstanceOf(InvalidArgumentException::class, $e);
-+        }
-+    }
-+
-+    public function testCheckVersionInputException()
-+    {
-+        $options = [
-+            new InputOption(Options::AREA, null, 4, '', ['all']),
-+            new InputOption(Options::EXCLUDE_AREA, null, 4, '', ['none']),
-+            new InputOption(Options::THEME, null, 4, '', ['all']),
-+            new InputOption(Options::EXCLUDE_THEME, null, 4, '', ['none']),
-+            new InputArgument(Options::LANGUAGES_ARGUMENT, 2, '', ['en_US']),
-+            new InputOption(Options::EXCLUDE_LANGUAGE, null, 4, '', ['none']),
-+            new InputOption(Options::CONTENT_VERSION, null, 4, '', '/*!#')
-+        ];
-+
-+        $inputDefinition = new InputDefinition($options);
-+
-+        try {
-+            $this->inputValidator->validate(
-+                new ArrayInput([], $inputDefinition)
-+            );
-+        } catch (\Exception $e) {
-+            $this->assertContains(
-+                'Argument "' .
-+                Options::CONTENT_VERSION
-+                . '" has invalid value, content version should contain only characters, digits and dots',
-+                $e->getMessage()
-+            );
-+
-+            $this->assertInstanceOf(InvalidArgumentException::class, $e);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php b/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php
-index 00f70c6527a..d3ff594fa61 100644
---- a/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php
-+++ b/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php
-@@ -69,6 +69,9 @@ class FilesystemTest extends \PHPUnit\Framework\TestCase
-      */
-     private $cmdPrefix;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $objectManager = new ObjectManager($this);
-@@ -124,6 +127,9 @@ class FilesystemTest extends \PHPUnit\Framework\TestCase
-         $this->cmdPrefix = PHP_BINARY . ' -f ' . BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ';
-     }
- 
-+    /**
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-     public function testRegenerateStatic()
-     {
-         $storeLocales = ['fr_FR', 'de_DE', 'nl_NL'];
-@@ -131,18 +137,16 @@ class FilesystemTest extends \PHPUnit\Framework\TestCase
-             ->willReturn($storeLocales);
- 
-         $setupDiCompileCmd = $this->cmdPrefix . 'setup:di:compile';
--        $this->shell->expects(self::at(0))
--            ->method('execute')
--            ->with($setupDiCompileCmd);
--
-         $this->initAdminLocaleMock('en_US');
- 
-         $usedLocales = ['fr_FR', 'de_DE', 'nl_NL', 'en_US'];
-+        $cacheFlushCmd = $this->cmdPrefix . 'cache:flush';
-         $staticContentDeployCmd = $this->cmdPrefix . 'setup:static-content:deploy -f '
-             . implode(' ', $usedLocales);
--        $this->shell->expects(self::at(1))
-+        $this->shell
-+            ->expects($this->exactly(4))
-             ->method('execute')
--            ->with($staticContentDeployCmd);
-+            ->withConsecutive([$cacheFlushCmd], [$setupDiCompileCmd], [$cacheFlushCmd], [$staticContentDeployCmd]);
- 
-         $this->output->expects(self::at(0))
-             ->method('writeln')
-@@ -166,6 +170,7 @@ class FilesystemTest extends \PHPUnit\Framework\TestCase
-      * @return void
-      * @expectedException \InvalidArgumentException
-      * @expectedExceptionMessage ;echo argument has invalid value, run info:language:list for list of available locales
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function testGenerateStaticForNotAllowedStoreViewLocale()
-     {
-@@ -184,6 +189,7 @@ class FilesystemTest extends \PHPUnit\Framework\TestCase
-      * @return void
-      * @expectedException \InvalidArgumentException
-      * @expectedExceptionMessage ;echo argument has invalid value, run info:language:list for list of available locales
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function testGenerateStaticForNotAllowedAdminLocale()
-     {
-diff --git a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
-index 75edc8cb4f6..396381960e5 100644
---- a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
-+++ b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Deploy\Test\Unit\Service;
- 
-+use Magento\Deploy\Console\DeployStaticOptions;
- use Magento\Deploy\Package\Package;
- use Magento\Deploy\Process\Queue;
- use Magento\Deploy\Service\Bundle;
-@@ -221,4 +222,35 @@ class DeployStaticContentTest extends \PHPUnit\Framework\TestCase
-             ]
-         ];
-     }
-+
-+    public function testMaxExecutionTimeOptionPassed()
-+    {
-+        $options = [
-+            DeployStaticOptions::MAX_EXECUTION_TIME => 100,
-+            DeployStaticOptions::REFRESH_CONTENT_VERSION_ONLY => false,
-+            DeployStaticOptions::JOBS_AMOUNT => 3,
-+            DeployStaticOptions::STRATEGY => 'compact',
-+            DeployStaticOptions::NO_JAVASCRIPT => true,
-+            DeployStaticOptions::NO_HTML_MINIFY => true,
-+        ];
-+
-+        $queueMock = $this->createMock(Queue::class);
-+        $strategyMock = $this->createMock(CompactDeploy::class);
-+        $this->queueFactory->expects($this->once())
-+            ->method('create')
-+            ->with([
-+                'logger' => $this->logger,
-+                'maxExecTime' => 100,
-+                'maxProcesses' => 3,
-+                'options' => $options,
-+                'deployPackageService' => null
-+            ])
-+            ->willReturn($queueMock);
-+        $this->deployStrategyFactory->expects($this->once())
-+            ->method('create')
-+            ->with('compact', ['queue' => $queueMock])
-+            ->willReturn($strategyMock);
-+
-+        $this->service->deploy($options);
-+    }
- }
-diff --git a/app/code/Magento/Deploy/etc/di.xml b/app/code/Magento/Deploy/etc/di.xml
-index ce7c84c9553..0c32baebf12 100644
---- a/app/code/Magento/Deploy/etc/di.xml
-+++ b/app/code/Magento/Deploy/etc/di.xml
-@@ -71,15 +71,4 @@
-             </argument>
-         </arguments>
-     </type>
--    <type name="Magento\Deploy\App\Mode\ConfigProvider">
--        <arguments>
--            <argument name="config" xsi:type="array">
--                <item name="developer" xsi:type="array">
--                    <item name="production" xsi:type="array">
--                        <item name="dev/debug/debug_logging" xsi:type="string">0</item>
--                    </item>
--                </item>
--            </argument>
--        </arguments>
--    </type>
- </config>
-diff --git a/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php b/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php
-index cc3760b6846..d224c13b5a6 100644
---- a/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php
-+++ b/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Developer\Console\Command;
- 
-@@ -25,7 +26,7 @@ class GeneratePatchCommand extends Command
-     /**
-      * Command arguments and options
-      */
--    const COMMAND_NAME = 'dev:generate:patch';
-+    const COMMAND_NAME = 'setup:db-declaration:generate-patch';
-     const MODULE_NAME = 'module';
-     const INPUT_KEY_IS_REVERTABLE = 'revertable';
-     const INPUT_KEY_PATCH_TYPE = 'type';
-@@ -47,7 +48,9 @@ class GeneratePatchCommand extends Command
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Configure command
-+     *
-+     * @inheritdoc
-      * @throws InvalidArgumentException
-      */
-     protected function configure()
-@@ -89,16 +92,16 @@ class GeneratePatchCommand extends Command
-      *
-      * @return string
-      */
--    private function getPatchTemplate()
-+    private function getPatchTemplate() : string
-     {
-         return file_get_contents(__DIR__ . '/patch_template.php.dist');
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @throws \InvalidArgumentException
-      */
--    protected function execute(InputInterface $input, OutputInterface $output)
-+    protected function execute(InputInterface $input, OutputInterface $output) : int
-     {
-         $moduleName = $input->getArgument(self::MODULE_NAME);
-         $patchName = $input->getArgument(self::INPUT_KEY_PATCH_NAME);
-diff --git a/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php b/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php
-index 25519e5c830..1680aee38dc 100644
---- a/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php
-+++ b/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php
-@@ -5,7 +5,6 @@
-  */
- namespace Magento\Developer\Console\Command;
- 
--use Magento\Framework\App\State;
- use Magento\Framework\Validator\Locale;
- use Magento\Framework\View\Asset\Repository;
- use Symfony\Component\Console\Command\Command;
-@@ -81,7 +80,7 @@ class SourceThemeDeployCommand extends Command
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function configure()
-     {
-@@ -129,7 +128,7 @@ class SourceThemeDeployCommand extends Command
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @throws \InvalidArgumentException
-      */
-     protected function execute(InputInterface $input, OutputInterface $output)
-diff --git a/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php b/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php
-index d283e693b8d..2155efa0170 100644
---- a/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php
-+++ b/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php
-@@ -3,14 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Developer\Console\Command;
- 
--use Magento\Framework\Component\ComponentRegistrar;
-+use Magento\Developer\Model\Setup\Declaration\Schema\WhitelistGenerator;
- use Magento\Framework\Config\FileResolverByModule;
--use Magento\Framework\Module\Dir;
--use Magento\Framework\Setup\Declaration\Schema\Diff\Diff;
--use Magento\Framework\Setup\JsonPersistor;
--use Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite;
-+use Magento\Framework\Exception\ConfigurationMismatchException;
- use Symfony\Component\Console\Command\Command;
- use Symfony\Component\Console\Input\InputInterface;
- use Symfony\Component\Console\Input\InputOption;
-@@ -18,6 +17,7 @@ use Symfony\Component\Console\Output\OutputInterface;
- 
- /**
-  * Command that allows to generate whitelist, that will be used, when declaration data is installed.
-+ *
-  * If whitelist already exists, new values will be added to existing whitelist.
-  */
- class TablesWhitelistGenerateCommand extends Command
-@@ -28,41 +28,20 @@ class TablesWhitelistGenerateCommand extends Command
-     const MODULE_NAME_KEY = 'module-name';
- 
-     /**
--     * @var ComponentRegistrar
--     */
--    private $componentRegistrar;
--
--    /**
--     * @var ReaderComposite
--     */
--    private $readerComposite;
--
--    /**
--     * @var JsonPersistor
--     */
--    private $jsonPersistor;
--
--    /**
--     * @var array
-+     * @var WhitelistGenerator
-      */
--    private $primaryDbSchema;
-+    private $whitelistGenerator;
- 
-     /**
--     * @param ComponentRegistrar $componentRegistrar
--     * @param ReaderComposite $readerComposite
--     * @param JsonPersistor $jsonPersistor
-+     * @param WhitelistGenerator $whitelistGenerator
-      * @param string|null $name
-      */
-     public function __construct(
--        ComponentRegistrar $componentRegistrar,
--        ReaderComposite $readerComposite,
--        JsonPersistor $jsonPersistor,
-+        WhitelistGenerator $whitelistGenerator,
-         $name = null
-     ) {
-+        $this->whitelistGenerator = $whitelistGenerator;
-         parent::__construct($name);
--        $this->componentRegistrar = $componentRegistrar;
--        $this->readerComposite = $readerComposite;
--        $this->jsonPersistor = $jsonPersistor;
-     }
- 
-     /**
-@@ -72,7 +51,7 @@ class TablesWhitelistGenerateCommand extends Command
-      */
-     protected function configure()
-     {
--        $this->setName('declaration:generate:whitelist')
-+        $this->setName('setup:db-declaration:generate-whitelist')
-             ->setDescription(
-                 'Generate whitelist of tables and columns that are allowed to be edited by declaration installer'
-             )
-@@ -90,116 +69,22 @@ class TablesWhitelistGenerateCommand extends Command
-         parent::configure();
-     }
- 
--    /**
--     * Update whitelist tables for all modules that are enabled on the moment.
--     *
--     * @param string $moduleName
--     * @return void
--     */
--    private function persistModule($moduleName)
--    {
--        $content = [];
--        $modulePath = $this->componentRegistrar->getPath('module', $moduleName);
--        $whiteListFileName = $modulePath
--            . DIRECTORY_SEPARATOR
--            . Dir::MODULE_ETC_DIR
--            . DIRECTORY_SEPARATOR
--            . Diff::GENERATED_WHITELIST_FILE_NAME;
--        //We need to load whitelist file and update it with new revision of code.
--        if (file_exists($whiteListFileName)) {
--            $content = json_decode(file_get_contents($whiteListFileName), true);
--        }
--
--        $newContent = $this->filterPrimaryTables($this->readerComposite->read($moduleName));
--
--        //Do merge between what we have before, and what we have now and filter to only certain attributes.
--        $content = array_replace_recursive(
--            $content,
--            $this->filterAttributeNames($newContent)
--        );
--        if (!empty($content)) {
--            $this->jsonPersistor->persist($content, $whiteListFileName);
--        }
--    }
--
-     /**
-      * @inheritdoc
-      */
--    protected function execute(InputInterface $input, OutputInterface $output)
-+    protected function execute(InputInterface $input, OutputInterface $output) : int
-     {
-         $moduleName = $input->getOption(self::MODULE_NAME_KEY);
- 
-         try {
--            if ($moduleName === FileResolverByModule::ALL_MODULES) {
--                foreach (array_keys($this->componentRegistrar->getPaths('module')) as $moduleName) {
--                    $this->persistModule($moduleName);
--                }
--            } else {
--                $this->persistModule($moduleName);
--            }
-+            $this->whitelistGenerator->generate($moduleName);
-+        } catch (ConfigurationMismatchException $e) {
-+            $output->writeln($e->getMessage());
-+            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
-         } catch (\Exception $e) {
-             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
-         }
- 
--        //If script comes here, that we sucessfully write whitelist configuration
-         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
-     }
--
--    /**
--     * As for whitelist we do not need any specific attributes like nullable or indexType,
--     * we need to choose only names.
--     *
--     * @param array $content
--     * @return array
--     */
--    private function filterAttributeNames(array $content)
--    {
--        $names = [];
--        $types = ['column', 'index', 'constraint'];
--
--        foreach ($content['table'] as $tableName => $tableContent) {
--            foreach ($types as $type) {
--                if (isset($tableContent[$type])) {
--                    //Add elements to whitelist
--                    foreach (array_keys($tableContent[$type]) as $elementName) {
--                        //Depends on flag column will be whitelisted or not
--                        $names[$tableName][$type][$elementName] = true;
--                    }
--                }
--            }
--        }
--
--        return $names;
--    }
--
--    /**
--     * Load db_schema content from the primary scope app/etc/db_schema.xml.
--     *
--     * @return array
--     */
--    private function getPrimaryDbSchema()
--    {
--        if (!$this->primaryDbSchema) {
--            $this->primaryDbSchema = $this->readerComposite->read('primary');
--        }
--        return $this->primaryDbSchema;
--    }
--
--    /**
--     * Filter tables from module db_schema.xml as they should not contain the primary system tables.
--     *
--     * @param array $moduleDbSchema
--     * @return array
--     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
--     */
--    private function filterPrimaryTables(array $moduleDbSchema)
--    {
--        $primaryDbSchema = $this->getPrimaryDbSchema();
--        if (isset($moduleDbSchema['table']) && isset($primaryDbSchema['table'])) {
--            foreach ($primaryDbSchema['table'] as $tableNameKey => $tableContents) {
--                unset($moduleDbSchema['table'][$tableNameKey]);
--            }
--        }
--        return $moduleDbSchema;
--    }
- }
-diff --git a/app/code/Magento/Developer/Model/Logger/Handler/Debug.php b/app/code/Magento/Developer/Model/Logger/Handler/Debug.php
-index 9bfee42fa6a..ba98524bb66 100644
---- a/app/code/Magento/Developer/Model/Logger/Handler/Debug.php
-+++ b/app/code/Magento/Developer/Model/Logger/Handler/Debug.php
-@@ -5,10 +5,10 @@
-  */
- namespace Magento\Developer\Model\Logger\Handler;
- 
-+use Magento\Config\Setup\ConfigOptionsList;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\State;
- use Magento\Framework\Filesystem\DriverInterface;
--use Magento\Store\Model\ScopeInterface;
- use Magento\Framework\App\DeploymentConfig;
- 
- /**
-@@ -37,6 +37,7 @@ class Debug extends \Magento\Framework\Logger\Handler\Debug
-      * @param ScopeConfigInterface $scopeConfig
-      * @param DeploymentConfig $deploymentConfig
-      * @param string $filePath
-+     * @throws \Exception
-      */
-     public function __construct(
-         DriverInterface $filesystem,
-@@ -53,16 +54,32 @@ class Debug extends \Magento\Framework\Logger\Handler\Debug
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isHandling(array $record)
-     {
-         if ($this->deploymentConfig->isAvailable()) {
-             return
-                 parent::isHandling($record)
--                && $this->scopeConfig->getValue('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE);
-+                && $this->isLoggingEnabled();
-         }
- 
-         return parent::isHandling($record);
-     }
-+
-+    /**
-+     * Check that logging functionality is enabled.
-+     *
-+     * @return bool
-+     */
-+    private function isLoggingEnabled(): bool
-+    {
-+        $configValue = $this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING);
-+        if ($configValue === null) {
-+            $isEnabled = $this->state->getMode() !== State::MODE_PRODUCTION;
-+        } else {
-+            $isEnabled = (bool)$configValue;
-+        }
-+        return $isEnabled;
-+    }
- }
-diff --git a/app/code/Magento/Developer/Model/Logger/Handler/Syslog.php b/app/code/Magento/Developer/Model/Logger/Handler/Syslog.php
-index 6dc276a696f..3f5ff586403 100644
---- a/app/code/Magento/Developer/Model/Logger/Handler/Syslog.php
-+++ b/app/code/Magento/Developer/Model/Logger/Handler/Syslog.php
-@@ -7,22 +7,19 @@ declare(strict_types=1);
- 
- namespace Magento\Developer\Model\Logger\Handler;
- 
-+use Magento\Config\Setup\ConfigOptionsList;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\DeploymentConfig;
- 
- /**
-- * Enable/disable syslog logging based on the store config setting.
-+ * Enable/disable syslog logging based on the deployment config setting.
-  */
- class Syslog extends \Magento\Framework\Logger\Handler\Syslog
- {
--    public const CONFIG_PATH = 'dev/syslog/syslog_logging';
--
-     /**
--     * Scope config.
--     *
--     * @var ScopeConfigInterface
-+     * @deprecated configuration value has been removed.
-      */
--    private $scopeConfig;
-+    public const CONFIG_PATH = 'dev/syslog/syslog_logging';
- 
-     /**
-      * Deployment config.
-@@ -35,6 +32,7 @@ class Syslog extends \Magento\Framework\Logger\Handler\Syslog
-      * @param ScopeConfigInterface $scopeConfig Scope config
-      * @param DeploymentConfig $deploymentConfig Deployment config
-      * @param string $ident The string ident to be added to each message
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         ScopeConfigInterface $scopeConfig,
-@@ -42,8 +40,6 @@ class Syslog extends \Magento\Framework\Logger\Handler\Syslog
-         string $ident
-     ) {
-         parent::__construct($ident);
--
--        $this->scopeConfig = $scopeConfig;
-         $this->deploymentConfig = $deploymentConfig;
-     }
- 
-@@ -53,7 +49,18 @@ class Syslog extends \Magento\Framework\Logger\Handler\Syslog
-     public function isHandling(array $record): bool
-     {
-         return parent::isHandling($record)
--            && $this->deploymentConfig->isAvailable()
--            && $this->scopeConfig->getValue(self::CONFIG_PATH);
-+            && $this->deploymentConfig->isDbAvailable()
-+            && $this->isLoggingEnabled();
-+    }
-+
-+    /**
-+     * Check that logging functionality is enabled.
-+     *
-+     * @return bool
-+     */
-+    private function isLoggingEnabled(): bool
-+    {
-+        $configValue = $this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_SYSLOG_LOGGING);
-+        return (bool)$configValue;
-     }
- }
-diff --git a/app/code/Magento/Developer/Model/Setup/Declaration/Schema/WhitelistGenerator.php b/app/code/Magento/Developer/Model/Setup/Declaration/Schema/WhitelistGenerator.php
-new file mode 100644
-index 00000000000..b752eaa111f
---- /dev/null
-+++ b/app/code/Magento/Developer/Model/Setup/Declaration/Schema/WhitelistGenerator.php
-@@ -0,0 +1,263 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Developer\Model\Setup\Declaration\Schema;
-+
-+use Magento\Framework\App\DeploymentConfig;
-+use Magento\Framework\Component\ComponentRegistrar;
-+use Magento\Framework\Config\ConfigOptionsListConstants;
-+use Magento\Framework\Config\FileResolverByModule;
-+use Magento\Framework\Exception\ConfigurationMismatchException;
-+use Magento\Framework\Module\Dir;
-+use Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite;
-+use Magento\Framework\Setup\Declaration\Schema\Declaration\TableElement\ElementNameResolver;
-+use Magento\Framework\Setup\Declaration\Schema\Diff\Diff;
-+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
-+use Magento\Framework\Setup\Declaration\Schema\SchemaConfig;
-+use Magento\Framework\Setup\JsonPersistor;
-+
-+/**
-+ * Generate whitelist declaration declarative schema.
-+ */
-+class WhitelistGenerator
-+{
-+    /**
-+     * @var SchemaConfig
-+     */
-+    private $schemaConfig;
-+
-+    /**
-+     * @var ComponentRegistrar
-+     */
-+    private $componentRegistrar;
-+
-+    /**
-+     * @var JsonPersistor
-+     */
-+    private $jsonPersistor;
-+
-+    /**
-+     * @var ReaderComposite
-+     */
-+    private $readerComposite;
-+
-+    /**
-+     * @var array
-+     */
-+    private $primaryDbSchema;
-+
-+    /**
-+     * @var ElementNameResolver
-+     */
-+    private $elementNameResolver;
-+
-+    /**
-+     * @var DeploymentConfig
-+     */
-+    private $deploymentConfig;
-+
-+    /**
-+     * @param ComponentRegistrar $componentRegistrar
-+     * @param JsonPersistor $jsonPersistor
-+     * @param SchemaConfig $schemaConfig
-+     * @param ReaderComposite $readerComposite
-+     * @param ElementNameResolver $elementNameResolver
-+     * @param DeploymentConfig $deploymentConfig
-+     */
-+    public function __construct(
-+        ComponentRegistrar $componentRegistrar,
-+        JsonPersistor $jsonPersistor,
-+        SchemaConfig $schemaConfig,
-+        ReaderComposite $readerComposite,
-+        ElementNameResolver $elementNameResolver,
-+        DeploymentConfig $deploymentConfig
-+    ) {
-+        $this->componentRegistrar = $componentRegistrar;
-+        $this->jsonPersistor = $jsonPersistor;
-+        $this->schemaConfig = $schemaConfig;
-+        $this->readerComposite = $readerComposite;
-+        $this->elementNameResolver = $elementNameResolver;
-+        $this->deploymentConfig = $deploymentConfig;
-+    }
-+
-+    /**
-+     * Generate whitelist declaration.
-+     *
-+     * @param string $moduleName
-+     * @throws ConfigurationMismatchException
-+     */
-+    public function generate(string $moduleName)
-+    {
-+        $this->checkMagentoInstallation();
-+        $schema = $this->schemaConfig->getDeclarationConfig();
-+        if ($moduleName === FileResolverByModule::ALL_MODULES) {
-+            foreach (array_keys($this->componentRegistrar->getPaths('module')) as $moduleName) {
-+                $this->persistModule($schema, $moduleName);
-+            }
-+        } else {
-+            $this->persistModule($schema, $moduleName);
-+        }
-+    }
-+
-+    /**
-+     * Check the configuration of the installed instance.
-+     *
-+     * @throws ConfigurationMismatchException
-+     */
-+    private function checkMagentoInstallation()
-+    {
-+        $tablePrefixLength = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DB_PREFIX);
-+        if ($tablePrefixLength) {
-+            throw new ConfigurationMismatchException(
-+                __('Magento was installed with a table prefix. Please re-install without prefix.')
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Update whitelist tables for all modules that are enabled on the moment.
-+     *
-+     * @param Schema $schema
-+     * @param string $moduleName
-+     * @return void
-+     */
-+    private function persistModule(Schema $schema, string $moduleName)
-+    {
-+        $content = [];
-+        $modulePath = $this->componentRegistrar->getPath('module', $moduleName);
-+        $whiteListFileName = $modulePath
-+            . DIRECTORY_SEPARATOR
-+            . Dir::MODULE_ETC_DIR
-+            . DIRECTORY_SEPARATOR
-+            . Diff::GENERATED_WHITELIST_FILE_NAME;
-+
-+        //We need to load whitelist file and update it with new revision of code.
-+        if (file_exists($whiteListFileName)) {
-+            $content = json_decode(file_get_contents($whiteListFileName), true);
-+        }
-+
-+        $data = $this->filterPrimaryTables($this->readerComposite->read($moduleName));
-+        if (!empty($data['table'])) {
-+            foreach ($data['table'] as $tableName => $tabledata) {
-+                //Do merge between what we have before, and what we have now and filter to only certain attributes.
-+                $content = array_replace_recursive(
-+                    $content,
-+                    [$tableName => $this->getElementsWithFixedName($tabledata)],
-+                    [$tableName => $this->getElementsWithAutogeneratedName(
-+                        $schema,
-+                        $tableName,
-+                        $tabledata
-+                    )]
-+                );
-+            }
-+            if (!empty($content)) {
-+                $this->jsonPersistor->persist($content, $whiteListFileName);
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Provide immutable names of the table elements.
-+     *
-+     * @param array $tableData
-+     * @return array
-+     */
-+    private function getElementsWithFixedName(array $tableData): array
-+    {
-+        $declaredStructure = [];
-+        if (!empty($tableData['column'])) {
-+            $declaredColumns = array_keys($tableData['column']);
-+            $declaredStructure['column'] = array_fill_keys($declaredColumns, true);
-+        }
-+        return $declaredStructure;
-+    }
-+
-+    /**
-+     * Provide autogenerated names of the table elements.
-+     *
-+     * @param Schema $schema
-+     * @param string $tableName
-+     * @param array $tableData
-+     * @return array
-+     */
-+    private function getElementsWithAutogeneratedName(Schema $schema, string $tableName, array $tableData) : array
-+    {
-+        $declaredStructure = [];
-+        $table = $schema->getTableByName($tableName);
-+
-+        $elementType = 'index';
-+        if (!empty($tableData[$elementType])) {
-+            foreach ($tableData[$elementType] as $tableElementData) {
-+                $indexName = $this->elementNameResolver->getFullIndexName(
-+                    $table,
-+                    $tableElementData['column'],
-+                    $tableElementData['indexType'] ?? null
-+                );
-+                $declaredStructure[$elementType][$indexName] = true;
-+            }
-+        }
-+
-+        $elementType = 'constraint';
-+        if (!empty($tableData[$elementType])) {
-+            foreach ($tableData[$elementType] as $tableElementData) {
-+                if ($tableElementData['type'] === 'foreign') {
-+                    $referenceTable = $schema->getTableByName($tableElementData['referenceTable']);
-+                    $column = $table->getColumnByName($tableElementData['column']);
-+                    $referenceColumn = $referenceTable->getColumnByName($tableElementData['referenceColumn']);
-+                    $constraintName = ($column !== false && $referenceColumn !== false) ?
-+                        $this->elementNameResolver->getFullFKName(
-+                            $table,
-+                            $column,
-+                            $referenceTable,
-+                            $referenceColumn
-+                        ) : null;
-+                } else {
-+                    $constraintName = $this->elementNameResolver->getFullIndexName(
-+                        $table,
-+                        $tableElementData['column'],
-+                        $tableElementData['type']
-+                    );
-+                }
-+                if ($constraintName) {
-+                    $declaredStructure[$elementType][$constraintName] = true;
-+                }
-+            }
-+        }
-+
-+        return $declaredStructure;
-+    }
-+
-+    /**
-+     * Load db_schema content from the primary scope app/etc/db_schema.xml.
-+     *
-+     * @return array
-+     */
-+    private function getPrimaryDbSchema(): array
-+    {
-+        if (!$this->primaryDbSchema) {
-+            $this->primaryDbSchema = $this->readerComposite->read('primary');
-+        }
-+        return $this->primaryDbSchema;
-+    }
-+
-+    /**
-+     * Filter tables from module database schema as they should not contain the primary system tables.
-+     *
-+     * @param array $moduleDbSchema
-+     * @return array
-+     */
-+    private function filterPrimaryTables(array $moduleDbSchema): array
-+    {
-+        $primaryDbSchema = $this->getPrimaryDbSchema();
-+        if (isset($moduleDbSchema['table']) && isset($primaryDbSchema['table'])) {
-+            foreach (array_keys($primaryDbSchema['table']) as $tableNameKey) {
-+                unset($moduleDbSchema['table'][$tableNameKey]);
-+            }
-+        }
-+        return $moduleDbSchema;
-+    }
-+}
-diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/TablesWhitelistGenerateCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/TablesWhitelistGenerateCommandTest.php
-deleted file mode 100644
-index 5bfc5686b05..00000000000
---- a/app/code/Magento/Developer/Test/Unit/Console/Command/TablesWhitelistGenerateCommandTest.php
-+++ /dev/null
-@@ -1,425 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Developer\Test\Unit\Console\Command;
--
--use Magento\Developer\Console\Command\TablesWhitelistGenerateCommand;
--use Magento\Framework\Component\ComponentRegistrar;
--use Magento\Framework\Setup\JsonPersistor;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--use Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite;
--use Symfony\Component\Console\Tester\CommandTester;
--
--/**
-- * Unit test for whitelist generation command.
-- *
-- * @package Magento\Developer\Test\Unit\Console\Command
-- */
--class TablesWhitelistGenerateCommandTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var TablesWhitelistGenerateCommand
--     */
--    private $model;
--
--    /**
--     * @var ObjectManagerHelper
--     */
--    private $objectManagerHelper;
--
--    /**
--     * @var ComponentRegistrar|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $componentRegistrarMock;
--
--    /**
--     * @var ReaderComposite|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $readerCompositeMock;
--
--    /**
--     * @var JsonPersistor|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $jsonPersistorMock;
--
--    /**
--     * {@inheritdoc}
--     */
--    protected function setUp()
--    {
--        $this->componentRegistrarMock = $this->getMockBuilder(ComponentRegistrar::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->readerCompositeMock = $this->getMockBuilder(ReaderComposite::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->jsonPersistorMock = $this->getMockBuilder(JsonPersistor::class)
--            ->getMock();
--        $this->objectManagerHelper = new ObjectManagerHelper($this);
--        $this->model = $this->objectManagerHelper->getObject(
--            TablesWhitelistGenerateCommand::class,
--            [
--                'componentRegistrar' => $this->componentRegistrarMock,
--                'readerComposite' => $this->readerCompositeMock,
--                'jsonPersistor' => $this->jsonPersistorMock
--            ]
--        );
--    }
--
--    /**
--     * @return array
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function whitelistTableProvider()
--    {
--        return [
--            [
--                'moduleName' => 'SomeModule',
--                'whitelist' => [
--                    'primary' => [
--                        'table' =>
--                            [
--                                'patch_list' =>
--                                    [
--                                        'column' =>
--                                            [
--                                                'patch_id' =>
--                                                    [
--                                                        'type' => 'int',
--                                                        'name' => 'patch_id',
--                                                        'identity' => 'true',
--                                                        'comment' => 'Patch Auto Increment',
--                                                    ],
--                                                'patch_name' =>
--                                                    [
--                                                        'type' => 'varchar',
--                                                        'name' => 'patch_name',
--                                                        'length' => '1024',
--                                                        'nullable' => 'false',
--                                                        'comment' => 'Patch Class Name',
--                                                    ],
--                                            ],
--                                        'constraint' =>
--                                            [
--                                                'PRIMARY' =>
--                                                    [
--                                                        'column' =>
--                                                            [
--                                                                'patch_id' => 'patch_id',
--                                                            ],
--                                                        'type' => 'primary',
--                                                        'name' => 'PRIMARY',
--                                                    ],
--                                            ],
--                                        'name' => 'patch_list',
--                                        'resource' => 'default',
--                                        'comment' => 'List of data/schema patches',
--                                    ],
--                            ],
--                    ],
--                    'SomeModule' => [
--                        'table' => [
--                            'first_table' => [
--                                'disabled' => false,
--                                'name' => 'first_table',
--                                'resource' => 'default',
--                                'engine' => 'innodb',
--                                'column' => [
--                                    'first_column' => [
--                                        'name' => 'first_column',
--                                        'xsi:type' => 'integer',
--                                        'nullable' => 1,
--                                        'unsigned' => '0',
--                                    ],
--                                    'second_column' => [
--                                        'name' => 'second_column',
--                                        'xsi:type' => 'date',
--                                        'nullable' => 0,
--                                    ]
--                                ],
--                                'index' => [
--                                    'TEST_INDEX' => [
--                                        'name' => 'TEST_INDEX',
--                                        'indexType' => 'btree',
--                                        'columns' => [
--                                            'first_column'
--                                        ]
--                                    ]
--                                ],
--                                'constraint' => [
--                                    'foreign' => [
--                                        'some_foreign_constraint' => [
--                                            'referenceTable' => 'table',
--                                            'referenceColumn' => 'column',
--                                            'table' => 'first_table',
--                                            'column' => 'first_column'
--                                        ]
--                                    ],
--                                    'primary' => [
--                                        'PRIMARY' => [
--                                            'xsi:type' => 'primary',
--                                            'name' => 'PRIMARY',
--                                            'columns' => [
--                                                'second_column'
--                                            ]
--                                        ]
--                                    ]
--                                ]
--                            ]
--                        ]
--                    ],
--                ],
--                'expected' => [
--                    'SomeModule' => [
--                        'first_table' => [
--                            'column' => [
--                                'first_column' => true,
--                                'second_column' => true,
--                            ],
--                            'index' => [
--                                'TEST_INDEX' => true,
--                            ],
--                            'constraint' => [
--                                'foreign' => true,
--                                'primary' => true,
--                            ]
--                        ]
--                    ]
--                ]
--            ],
--            [
--                'moduleName' => false,
--                'whitelist' => [
--                    'primary' => [
--                        'table' =>
--                            [
--                                'patch_list' =>
--                                    [
--                                        'column' =>
--                                            [
--                                                'patch_id' =>
--                                                    [
--                                                        'type' => 'int',
--                                                        'name' => 'patch_id',
--                                                        'identity' => 'true',
--                                                        'comment' => 'Patch Auto Increment',
--                                                    ],
--                                                'patch_name' =>
--                                                    [
--                                                        'type' => 'varchar',
--                                                        'name' => 'patch_name',
--                                                        'length' => '1024',
--                                                        'nullable' => 'false',
--                                                        'comment' => 'Patch Class Name',
--                                                    ],
--                                            ],
--                                        'constraint' =>
--                                            [
--                                                'PRIMARY' =>
--                                                    [
--                                                        'column' =>
--                                                            [
--                                                                'patch_id' => 'patch_id',
--                                                            ],
--                                                        'type' => 'primary',
--                                                        'name' => 'PRIMARY',
--                                                    ],
--                                            ],
--                                        'name' => 'patch_list',
--                                        'resource' => 'default',
--                                        'comment' => 'List of data/schema patches',
--                                    ],
--                            ],
--                    ],
--                    'SomeModule' => [
--                        'table' => [
--                            'first_table' => [
--                                'disabled' => false,
--                                'name' => 'first_table',
--                                'resource' => 'default',
--                                'engine' => 'innodb',
--                                'column' => [
--                                    'first_column' => [
--                                        'name' => 'first_column',
--                                        'xsi:type' => 'integer',
--                                        'nullable' => 1,
--                                        'unsigned' => '0',
--                                    ],
--                                    'second_column' => [
--                                        'name' => 'second_column',
--                                        'xsi:type' => 'date',
--                                        'nullable' => 0,
--                                    ]
--                                ],
--                                'index' => [
--                                    'TEST_INDEX' => [
--                                        'name' => 'TEST_INDEX',
--                                        'indexType' => 'btree',
--                                        'columns' => [
--                                            'first_column'
--                                        ]
--                                    ]
--                                ],
--                                'constraint' => [
--                                    'foreign' => [
--                                        'some_foreign_constraint' => [
--                                            'referenceTable' => 'table',
--                                            'referenceColumn' => 'column',
--                                            'table' => 'first_table',
--                                            'column' => 'first_column'
--                                        ]
--                                    ],
--                                    'primary' => [
--                                        'PRIMARY' => [
--                                            'xsi:type' => 'primary',
--                                            'name' => 'PRIMARY',
--                                            'columns' => [
--                                                'second_column'
--                                            ]
--                                        ]
--                                    ]
--                                ]
--                            ]
--                        ]
--                    ],
--                    'Module2' => [
--                        'table' => [
--                            'second_table' => [
--                                'disabled' => false,
--                                'name' => 'second_table',
--                                'resource' => 'default',
--                                'engine' => 'innodb',
--                                'column' => [
--                                    'first_column' => [
--                                        'name' => 'first_column',
--                                        'xsi:type' => 'integer',
--                                        'nullable' => 1,
--                                        'unsigned' => '0',
--                                    ],
--                                    'second_column' => [
--                                        'name' => 'second_column',
--                                        'xsi:type' => 'date',
--                                        'nullable' => 0,
--                                    ]
--                                ],
--                                'index' => [
--                                    'TEST_INDEX' => [
--                                        'name' => 'TEST_INDEX',
--                                        'indexType' => 'btree',
--                                        'columns' => [
--                                            'first_column'
--                                        ]
--                                    ]
--                                ],
--                                'constraint' => [
--                                    'foreign' => [
--                                        'some_foreign_constraint' => [
--                                            'referenceTable' => 'table',
--                                            'referenceColumn' => 'column',
--                                            'table' => 'second_table',
--                                            'column' => 'first_column'
--                                        ]
--                                    ],
--                                    'primary' => [
--                                        'PRIMARY' => [
--                                            'xsi:type' => 'primary',
--                                            'name' => 'PRIMARY',
--                                            'columns' => [
--                                                'second_column'
--                                            ]
--                                        ]
--                                    ]
--                                ]
--                            ]
--                        ]
--                    ]
--                ],
--                'expected' => [
--                    'SomeModule' => [
--                        'first_table' => [
--                            'column' => [
--                                'first_column' => true,
--                                'second_column' => true,
--                            ],
--                            'index' => [
--                                'TEST_INDEX' => true,
--                            ],
--                            'constraint' => [
--                                'foreign' => true,
--                                'primary' => true,
--                            ]
--                        ]
--                    ],
--                    'Module2' => [
--                        'second_table' => [
--                            'column' => [
--                                'first_column' => true,
--                                'second_column' => true,
--                            ],
--                            'index' => [
--                                'TEST_INDEX' => true,
--                            ],
--                            'constraint' => [
--                                'foreign' => true,
--                                'primary' => true,
--                            ]
--                        ]
--                    ]
--                ]
--            ]
--        ];
--    }
--
--    /**
--     * @dataProvider whitelistTableProvider
--     * @param string $moduleName
--     * @param array $whiteListTables
--     * @param array $expected
--     */
--    public function testCommand($moduleName, array $whiteListTables, array $expected)
--    {
--        $commandTester = new CommandTester($this->model);
--        $options = !$moduleName ? [] : ['--module-name' => $moduleName];
--
--        if (!$moduleName) {
--            $this->componentRegistrarMock->expects(self::once())
--                ->method('getPaths')
--                ->willReturn(['SomeModule' => 1, 'Module2' => 2]);
--            $this->readerCompositeMock->expects(self::exactly(3))
--                ->method('read')
--                ->withConsecutive(['SomeModule'], ['primary'], ['Module2'])
--                ->willReturnOnConsecutiveCalls(
--                    $whiteListTables['SomeModule'],
--                    $whiteListTables['primary'],
--                    $whiteListTables['Module2']
--                );
--            $this->jsonPersistorMock->expects(self::exactly(2))
--                ->method('persist')
--                ->withConsecutive(
--                    [
--                        $expected['SomeModule'],
--                        '/etc/db_schema_whitelist.json'
--                    ],
--                    [
--                        $expected['Module2'],
--                        '/etc/db_schema_whitelist.json'
--                    ]
--                );
--        } else {
--            $this->readerCompositeMock->expects(self::exactly(2))
--                ->method('read')
--                ->withConsecutive([$moduleName], ['primary'])
--                ->willReturnOnConsecutiveCalls($whiteListTables['SomeModule'], $whiteListTables['primary']);
--            $this->jsonPersistorMock->expects(self::once())
--                ->method('persist')
--                ->with(
--                    $expected['SomeModule'],
--                    '/etc/db_schema_whitelist.json'
--                );
--        }
--        $commandTester->execute($options);
--    }
--}
-diff --git a/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php b/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php
-index c116775d582..1c729c933ec 100644
---- a/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php
-+++ b/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php
-@@ -51,6 +51,9 @@ class DebugTest extends \PHPUnit\Framework\TestCase
-      */
-     private $deploymentConfigMock;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->filesystemMock = $this->getMockBuilder(DriverInterface::class)
-@@ -80,70 +83,95 @@ class DebugTest extends \PHPUnit\Framework\TestCase
-         $this->model->setFormatter($this->formatterMock);
-     }
- 
--    public function testHandle()
-+    /**
-+     * @return void
-+     */
-+    public function testHandleEnabledInDeveloperMode()
-     {
-         $this->deploymentConfigMock->expects($this->once())
-             ->method('isAvailable')
-             ->willReturn(true);
--        $this->stateMock->expects($this->never())
--            ->method('getMode');
--        $this->scopeConfigMock->expects($this->once())
--            ->method('getValue')
--            ->with('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE, null)
--            ->willReturn(true);
-+        $this->stateMock
-+            ->expects($this->once())
-+            ->method('getMode')
-+            ->willReturn(State::MODE_DEVELOPER);
-+        $this->scopeConfigMock
-+            ->expects($this->never())
-+            ->method('getValue');
- 
-         $this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
-     }
- 
--    public function testHandleDisabledByProduction()
-+    /**
-+     * @return void
-+     */
-+    public function testHandleEnabledInDefaultMode()
-     {
-         $this->deploymentConfigMock->expects($this->once())
-             ->method('isAvailable')
-             ->willReturn(true);
--        $this->stateMock->expects($this->never())
--            ->method('getMode');
--        $this->scopeConfigMock->expects($this->once())
-+        $this->stateMock
-+            ->expects($this->once())
-+            ->method('getMode')
-+            ->willReturn(State::MODE_DEFAULT);
-+        $this->scopeConfigMock
-+            ->expects($this->never())
-             ->method('getValue');
- 
--        $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
-+        $this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
-     }
- 
--    public function testHandleDisabledByConfig()
-+    /**
-+     * @return void
-+     */
-+    public function testHandleDisabledByProduction()
-     {
-         $this->deploymentConfigMock->expects($this->once())
-             ->method('isAvailable')
-             ->willReturn(true);
--        $this->stateMock->expects($this->never())
--            ->method('getMode');
--        $this->scopeConfigMock->expects($this->once())
--            ->method('getValue')
--            ->with('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE, null)
--            ->willReturn(false);
-+        $this->stateMock
-+            ->expects($this->once())
-+            ->method('getMode')
-+            ->willReturn(State::MODE_PRODUCTION);
-+        $this->scopeConfigMock
-+            ->expects($this->never())
-+            ->method('getValue');
- 
-         $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testHandleDisabledByLevel()
-     {
-         $this->deploymentConfigMock->expects($this->once())
-             ->method('isAvailable')
-             ->willReturn(true);
--        $this->stateMock->expects($this->never())
--            ->method('getMode');
--        $this->scopeConfigMock->expects($this->never())
-+        $this->stateMock
-+            ->expects($this->never())
-+            ->method('getMode')
-+            ->willReturn(State::MODE_DEVELOPER);
-+        $this->scopeConfigMock
-+            ->expects($this->never())
-             ->method('getValue');
- 
-         $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::API]));
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testDeploymentConfigIsNotAvailable()
-     {
-         $this->deploymentConfigMock->expects($this->once())
-             ->method('isAvailable')
-             ->willReturn(false);
--        $this->stateMock->expects($this->never())
-+        $this->stateMock
-+            ->expects($this->never())
-             ->method('getMode');
--        $this->scopeConfigMock->expects($this->never())
-+        $this->scopeConfigMock
-+            ->expects($this->never())
-             ->method('getValue');
- 
-         $this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
-diff --git a/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/SyslogTest.php b/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/SyslogTest.php
-index c744645b670..06c19d3f2e8 100644
---- a/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/SyslogTest.php
-+++ b/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/SyslogTest.php
-@@ -7,6 +7,7 @@ declare(strict_types=1);
- 
- namespace Magento\Developer\Test\Unit\Model\Logger\Handler;
- 
-+use Magento\Config\Setup\ConfigOptionsList;
- use Magento\Developer\Model\Logger\Handler\Syslog;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\DeploymentConfig;
-@@ -34,6 +35,9 @@ class SyslogTest extends TestCase
-      */
-     private $deploymentConfigMock;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
-@@ -46,35 +50,48 @@ class SyslogTest extends TestCase
-         );
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testIsHandling(): void
-     {
-         $record = [
-             'level' => Monolog::DEBUG,
-         ];
- 
--        $this->scopeConfigMock->expects($this->once())
--            ->method('getValue')
--            ->with(Syslog::CONFIG_PATH)
--            ->willReturn('1');
--        $this->deploymentConfigMock->expects($this->once())
--            ->method('isAvailable')
-+        $this->scopeConfigMock
-+            ->expects($this->never())
-+            ->method('getValue');
-+        $this->deploymentConfigMock
-+            ->expects($this->once())
-+            ->method('isDbAvailable')
-             ->willReturn(true);
-+        $this->deploymentConfigMock
-+            ->expects($this->once())
-+            ->method('get')
-+            ->with(ConfigOptionsList::CONFIG_PATH_SYSLOG_LOGGING)
-+            ->willReturn(1);
- 
-         $this->assertTrue(
-             $this->model->isHandling($record)
-         );
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testIsHandlingNotInstalled(): void
-     {
-         $record = [
-             'level' => Monolog::DEBUG,
-         ];
- 
--        $this->scopeConfigMock->expects($this->never())
-+        $this->scopeConfigMock
-+            ->expects($this->never())
-             ->method('getValue');
--        $this->deploymentConfigMock->expects($this->once())
--            ->method('isAvailable')
-+        $this->deploymentConfigMock
-+            ->expects($this->once())
-+            ->method('isDbAvailable')
-             ->willReturn(false);
- 
-         $this->assertFalse(
-@@ -82,19 +99,27 @@ class SyslogTest extends TestCase
-         );
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testIsHandlingDisabled(): void
-     {
-         $record = [
-             'level' => Monolog::DEBUG,
-         ];
- 
--        $this->scopeConfigMock->expects($this->once())
--            ->method('getValue')
--            ->with(Syslog::CONFIG_PATH)
--            ->willReturn('0');
--        $this->deploymentConfigMock->expects($this->once())
--            ->method('isAvailable')
-+        $this->scopeConfigMock
-+            ->expects($this->never())
-+            ->method('getValue');
-+        $this->deploymentConfigMock
-+            ->expects($this->once())
-+            ->method('isDbAvailable')
-             ->willReturn(true);
-+        $this->deploymentConfigMock
-+            ->expects($this->once())
-+            ->method('get')
-+            ->with(ConfigOptionsList::CONFIG_PATH_SYSLOG_LOGGING)
-+            ->willReturn(0);
- 
-         $this->assertFalse(
-             $this->model->isHandling($record)
-diff --git a/app/code/Magento/Developer/etc/adminhtml/system.xml b/app/code/Magento/Developer/etc/adminhtml/system.xml
-index aae99130098..c64abd6eae7 100644
---- a/app/code/Magento/Developer/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Developer/etc/adminhtml/system.xml
-@@ -6,7 +6,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="dev" translate="label">
-+        <section id="dev">
-             <group id="front_end_development_workflow" translate="label" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Frontend Development Workflow</label>
-                 <field id="type" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-@@ -25,20 +25,6 @@
-                     <backend_model>Magento\Developer\Model\Config\Backend\AllowedIps</backend_model>
-                 </field>
-             </group>
--            <group id="debug" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
--                <field id="debug_logging" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
--                    <label>Log to File</label>
--                    <comment>Not available in production mode.</comment>
--                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                </field>
--            </group>
--            <group id="syslog" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label>Syslog</label>
--                <field id="syslog_logging" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
--                    <label>Log to Syslog</label>
--                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                </field>
--            </group>
-         </section>
-     </system>
- </config>
-diff --git a/app/code/Magento/Developer/etc/di.xml b/app/code/Magento/Developer/etc/di.xml
-index 21ecf10c1b1..98adcbb3a82 100644
---- a/app/code/Magento/Developer/etc/di.xml
-+++ b/app/code/Magento/Developer/etc/di.xml
-@@ -240,4 +240,12 @@
-             </argument>
-         </arguments>
-     </type>
-+
-+    <type name="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints">
-+        <arguments>
-+            <argument name="debugHintsPath" xsi:type="string">dev/debug/template_hints_storefront</argument>
-+            <argument name="debugHintsWithParam" xsi:type="string">dev/debug/template_hints_storefront_show_with_parameter</argument>
-+            <argument name="debugHintsParameter" xsi:type="string">dev/debug/template_hints_parameter_value</argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Developer/etc/frontend/di.xml b/app/code/Magento/Developer/etc/frontend/di.xml
-index 329c158d897..aa4b3472602 100644
---- a/app/code/Magento/Developer/etc/frontend/di.xml
-+++ b/app/code/Magento/Developer/etc/frontend/di.xml
-@@ -9,11 +9,4 @@
-     <type name="Magento\Framework\View\TemplateEngineFactory">
-         <plugin name="debug_hints" type="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints" sortOrder="10"/>
-     </type>
--    <type name="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints">
--        <arguments>
--            <argument name="debugHintsPath" xsi:type="string">dev/debug/template_hints_storefront</argument>
--            <argument name="debugHintsWithParam" xsi:type="string">dev/debug/template_hints_storefront_show_with_parameter</argument>
--            <argument name="debugHintsParameter" xsi:type="string">dev/debug/template_hints_parameter_value</argument>
--        </arguments>
--    </type>
- </config>
-diff --git a/app/code/Magento/Developer/i18n/de_DE.csv b/app/code/Magento/Developer/i18n/de_DE.csv
-deleted file mode 100644
-index e9c858101b7..00000000000
---- a/app/code/Magento/Developer/i18n/de_DE.csv
-+++ /dev/null
-@@ -1,5 +0,0 @@
--"Front-end development workflow","Front-end development workflow"
--"Workflow type","Workflow type"
--"Server side less compilation","Server side less compilation"
--"Client side less compilation","Client side less compilation"
--"Not available in production mode","Not available in production mode"
-diff --git a/app/code/Magento/Developer/i18n/es_ES.csv b/app/code/Magento/Developer/i18n/es_ES.csv
-deleted file mode 100644
-index e9c858101b7..00000000000
---- a/app/code/Magento/Developer/i18n/es_ES.csv
-+++ /dev/null
-@@ -1,5 +0,0 @@
--"Front-end development workflow","Front-end development workflow"
--"Workflow type","Workflow type"
--"Server side less compilation","Server side less compilation"
--"Client side less compilation","Client side less compilation"
--"Not available in production mode","Not available in production mode"
-diff --git a/app/code/Magento/Developer/i18n/fr_FR.csv b/app/code/Magento/Developer/i18n/fr_FR.csv
-deleted file mode 100644
-index e9c858101b7..00000000000
---- a/app/code/Magento/Developer/i18n/fr_FR.csv
-+++ /dev/null
-@@ -1,5 +0,0 @@
--"Front-end development workflow","Front-end development workflow"
--"Workflow type","Workflow type"
--"Server side less compilation","Server side less compilation"
--"Client side less compilation","Client side less compilation"
--"Not available in production mode","Not available in production mode"
-diff --git a/app/code/Magento/Developer/i18n/nl_NL.csv b/app/code/Magento/Developer/i18n/nl_NL.csv
-deleted file mode 100644
-index e9c858101b7..00000000000
---- a/app/code/Magento/Developer/i18n/nl_NL.csv
-+++ /dev/null
-@@ -1,5 +0,0 @@
--"Front-end development workflow","Front-end development workflow"
--"Workflow type","Workflow type"
--"Server side less compilation","Server side less compilation"
--"Client side less compilation","Client side less compilation"
--"Not available in production mode","Not available in production mode"
-diff --git a/app/code/Magento/Developer/i18n/pt_BR.csv b/app/code/Magento/Developer/i18n/pt_BR.csv
-deleted file mode 100644
-index e9c858101b7..00000000000
---- a/app/code/Magento/Developer/i18n/pt_BR.csv
-+++ /dev/null
-@@ -1,5 +0,0 @@
--"Front-end development workflow","Front-end development workflow"
--"Workflow type","Workflow type"
--"Server side less compilation","Server side less compilation"
--"Client side less compilation","Client side less compilation"
--"Not available in production mode","Not available in production mode"
-diff --git a/app/code/Magento/Developer/i18n/zh_Hans_CN.csv b/app/code/Magento/Developer/i18n/zh_Hans_CN.csv
-deleted file mode 100644
-index e9c858101b7..00000000000
---- a/app/code/Magento/Developer/i18n/zh_Hans_CN.csv
-+++ /dev/null
-@@ -1,5 +0,0 @@
--"Front-end development workflow","Front-end development workflow"
--"Workflow type","Workflow type"
--"Server side less compilation","Server side less compilation"
--"Client side less compilation","Client side less compilation"
--"Not available in production mode","Not available in production mode"
-diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
-index d997db6ac1a..e765a815546 100644
---- a/app/code/Magento/Dhl/Model/Carrier.php
-+++ b/app/code/Magento/Dhl/Model/Carrier.php
-@@ -7,6 +7,13 @@
- namespace Magento\Dhl\Model;
- 
- use Magento\Catalog\Model\Product\Type;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\App\ProductMetadataInterface;
-+use Magento\Framework\Async\CallbackDeferred;
-+use Magento\Framework\Async\ProxyDeferredFactory;
-+use Magento\Framework\HTTP\AsyncClient\HttpResponseDeferredInterface;
-+use Magento\Framework\HTTP\AsyncClient\Request;
-+use Magento\Framework\HTTP\AsyncClientInterface;
- use Magento\Framework\Module\Dir;
- use Magento\Sales\Exception\DocumentValidationException;
- use Magento\Sales\Model\Order\Shipment;
-@@ -56,6 +63,13 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-      */
-     const CODE = 'dhl';
- 
-+    /**
-+     * DHL service prefixes used for message reference
-+     */
-+    private const SERVICE_PREFIX_QUOTE = 'QUOT';
-+    private const SERVICE_PREFIX_SHIPVAL = 'SHIP';
-+    private const SERVICE_PREFIX_TRACKING = 'TRCK';
-+
-     /**
-      * Rate request data
-      *
-@@ -189,6 +203,8 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
- 
-     /**
-      * @var \Magento\Framework\HTTP\ZendClientFactory
-+     * @deprecated Use asynchronous client.
-+     * @see $httpClient
-      */
-     protected $_httpClientFactory;
- 
-@@ -206,6 +222,21 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-      */
-     private $xmlValidator;
- 
-+    /**
-+     * @var ProductMetadataInterface
-+     */
-+    private $productMetadata;
-+
-+    /**
-+     * @var AsyncClientInterface
-+     */
-+    private $httpClient;
-+
-+    /**
-+     * @var ProxyDeferredFactory
-+     */
-+    private $proxyDeferredFactory;
-+
-     /**
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
-@@ -232,7 +263,10 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-      * @param \Magento\Framework\Stdlib\DateTime $dateTime
-      * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
-      * @param array $data
--     * @param \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator
-+     * @param \Magento\Dhl\Model\Validator\XmlValidator|null $xmlValidator
-+     * @param ProductMetadataInterface|null $productMetadata
-+     * @param AsyncClientInterface|null $httpClient
-+     * @param ProxyDeferredFactory|null $proxyDeferredFactory
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -261,7 +295,10 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-         \Magento\Framework\Stdlib\DateTime $dateTime,
-         \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory,
-         array $data = [],
--        \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator = null
-+        \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator = null,
-+        ProductMetadataInterface $productMetadata = null,
-+        ?AsyncClientInterface $httpClient = null,
-+        ?ProxyDeferredFactory $proxyDeferredFactory = null
-     ) {
-         $this->readFactory = $readFactory;
-         $this->_carrierHelper = $carrierHelper;
-@@ -293,8 +330,11 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-         if ($this->getConfigData('content_type') == self::DHL_CONTENT_TYPE_DOC) {
-             $this->_freeMethod = 'free_method_doc';
-         }
--        $this->xmlValidator = $xmlValidator
--            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(XmlValidator::class);
-+        $this->xmlValidator = $xmlValidator ?? ObjectManager::getInstance()->get(XmlValidator::class);
-+        $this->productMetadata = $productMetadata ?? ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-+        $this->httpClient = $httpClient ?? ObjectManager::getInstance()->get(AsyncClientInterface::class);
-+        $this->proxyDeferredFactory = $proxyDeferredFactory
-+            ?? ObjectManager::getInstance()->get(ProxyDeferredFactory::class);
-     }
- 
-     /**
-@@ -331,7 +371,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
- 
-         $requestDhl = clone $request;
-         $this->setStore($requestDhl->getStoreId());
--
-         $origCompanyName = $this->_getDefaultValue(
-             $requestDhl->getOrigCompanyName(),
-             \Magento\Store\Model\Information::XML_PATH_STORE_INFO_NAME
-@@ -340,18 +379,27 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-         $origState = $this->_getDefaultValue($requestDhl->getOrigState(), Shipment::XML_PATH_STORE_REGION_ID);
-         $origCity = $this->_getDefaultValue($requestDhl->getOrigCity(), Shipment::XML_PATH_STORE_CITY);
-         $origPostcode = $this->_getDefaultValue($requestDhl->getOrigPostcode(), Shipment::XML_PATH_STORE_ZIP);
--
-         $requestDhl->setOrigCompanyName($origCompanyName)
-             ->setCountryId($origCountryId)
-             ->setOrigState($origState)
-             ->setOrigCity($origCity)
-             ->setOrigPostal($origPostcode);
-         $this->setRequest($requestDhl);
--
--        $this->_result = $this->_getQuotes();
--        $this->_updateFreeMethodQuote($request);
--
--        return $this->_result;
-+        //Loading quotes
-+        //Saving $result to use proper result with the callback
-+        $this->_result = $result = $this->_getQuotes();
-+        //After quotes are loaded parsing the response.
-+        return $this->proxyDeferredFactory->createFor(
-+            Result::class,
-+            new CallbackDeferred(
-+                function () use ($request, $result) {
-+                    $this->_result = $result;
-+                    $this->_updateFreeMethodQuote($request);
-+
-+                    return $this->_result;
-+                }
-+            )
-+        );
-     }
- 
-     /**
-@@ -698,6 +746,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-      * @return array
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * phpcs:disable Generic.Metrics.NestingLevel
-      */
-     protected function _getAllItems()
-     {
-@@ -782,6 +831,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
- 
-         return $fullItems;
-     }
-+    //phpcs:enable
- 
-     /**
-      * Make pieces
-@@ -914,49 +964,117 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-     }
- 
-     /**
--     * Get shipping quotes
-+     * Process response received from DHL's API for quotes.
-      *
--     * @return \Magento\Framework\Model\AbstractModel|Result
-+     * @param array $responsesData
-+     * @return Error|Result
-      */
--    protected function _getQuotes()
-+    private function processQuotesResponses(array $responsesData)
-     {
--        $responseBody = '';
--        try {
--            for ($offset = 0; $offset <= self::UNAVAILABLE_DATE_LOOK_FORWARD; $offset++) {
--                $debugPoint = [];
--
--                $requestXml = $this->_buildQuotesRequestXml();
--                $date = date(self::REQUEST_DATE_FORMAT, strtotime($this->_getShipDate() . " +{$offset} days"));
--                $this->_setQuotesRequestXmlDate($requestXml, $date);
--
--                $request = $requestXml->asXML();
--                $debugPoint['request'] = $this->filterDebugData($request);
--                $responseBody = $this->_getCachedQuotes($request);
--                $debugPoint['from_cache'] = $responseBody === null;
--
--                if ($debugPoint['from_cache']) {
--                    $responseBody = $this->_getQuotesFromServer($request);
--                }
--
--                $debugPoint['response'] = $this->filterDebugData($responseBody);
--
--                $bodyXml = $this->_xmlElFactory->create(['data' => $responseBody]);
-+        usort(
-+            $responsesData,
-+            function (array $a, array $b): int {
-+                return $a['date'] <=> $b['date'];
-+            }
-+        );
-+        /** @var string $lastResponse */
-+        $lastResponse = '';
-+        //Processing different dates
-+        foreach ($responsesData as $responseData) {
-+            $debugPoint = [];
-+            $debugPoint['request'] = $this->filterDebugData($responseData['request']);
-+            $debugPoint['response'] = $this->filterDebugData($responseData['body']);
-+            $debugPoint['from_cache'] = $responseData['from_cache'];
-+            $unavailable = false;
-+            try {
-+                //Getting availability
-+                $bodyXml = $this->_xmlElFactory->create(['data' => $responseData['body']]);
-                 $code = $bodyXml->xpath('//GetQuoteResponse/Note/Condition/ConditionCode');
-                 if (isset($code[0]) && (int)$code[0] == self::CONDITION_CODE_SERVICE_DATE_UNAVAILABLE) {
--                    $debugPoint['info'] = sprintf(__("DHL service is not available at %s date"), $date);
--                } else {
--                    $this->_debug($debugPoint);
--                    break;
-+                    $debugPoint['info'] = sprintf(
-+                        __("DHL service is not available at %s date"),
-+                        $responseData['date']
-+                    );
-+                    $unavailable = true;
-                 }
--
--                $this->_setCachedQuotes($request, $responseBody);
-+            } catch (\Throwable $exception) {
-+                //Failed to read response
-+                $unavailable = true;
-+                $this->_errors[$exception->getCode()] = $exception->getMessage();
-+            }
-+            if ($unavailable) {
-+                //Cannot get rates.
-                 $this->_debug($debugPoint);
-+                break;
-             }
--        } catch (\Exception $e) {
--            $this->_errors[$e->getCode()] = $e->getMessage();
-+            //Caching rates
-+            $this->_setCachedQuotes($responseData['request'], $responseData['body']);
-+            $this->_debug($debugPoint);
-+            //Will only process rates available for the latest date possible.
-+            $lastResponse = $responseData['body'];
-         }
- 
--        return $this->_parseResponse($responseBody);
-+        return $this->_parseResponse($lastResponse);
-+    }
-+
-+    /**
-+     * Get shipping quotes
-+     *
-+     * @return \Magento\Framework\Model\AbstractModel|Result
-+     */
-+    protected function _getQuotes()
-+    {
-+        $responseBodies = [];
-+        /** @var HttpResponseDeferredInterface[][] $deferredResponses */
-+        $deferredResponses = [];
-+        $requestXml = $this->_buildQuotesRequestXml();
-+        for ($offset = 0; $offset <= self::UNAVAILABLE_DATE_LOOK_FORWARD; $offset++) {
-+            $date = date(self::REQUEST_DATE_FORMAT, strtotime($this->_getShipDate() . " +{$offset} days"));
-+            $this->_setQuotesRequestXmlDate($requestXml, $date);
-+            $request = $requestXml->asXML();
-+            $responseBody = $this->_getCachedQuotes($request);
-+
-+            if ($responseBody === null) {
-+                $deferredResponses[] = [
-+                    'deferred' => $this->httpClient->request(
-+                        new Request(
-+                            (string)$this->getConfigData('gateway_url'),
-+                            Request::METHOD_POST,
-+                            ['Content-Type' => 'application/xml'],
-+                            utf8_encode($request)
-+                        )
-+                    ),
-+                    'date' => $date,
-+                    'request' => $request
-+                ];
-+            } else {
-+                $responseBodies[] = [
-+                    'body' => $responseBody,
-+                    'date' => $date,
-+                    'request' => $request,
-+                    'from_cache' => true
-+                ];
-+            }
-+        }
-+
-+        return $this->proxyDeferredFactory->createFor(
-+            Result::class,
-+            new CallbackDeferred(
-+                function () use ($deferredResponses, $responseBodies) {
-+                    //Loading rates not found in cache
-+                    foreach ($deferredResponses as $deferredResponseData) {
-+                        $responseBodies[] = [
-+                            'body' => $deferredResponseData['deferred']->get()->getBody(),
-+                            'date' => $deferredResponseData['date'],
-+                            'request' => $deferredResponseData['request'],
-+                            'from_cache' => false
-+                        ];
-+                    }
-+
-+                    return $this->processQuotesResponses($responseBodies);
-+                }
-+            )
-+        );
-     }
- 
-     /**
-@@ -964,6 +1082,8 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-      *
-      * @param string $request
-      * @return string
-+     * @deprecated Use asynchronous client.
-+     * @see _getQuotes()
-      */
-     protected function _getQuotesFromServer($request)
-     {
-@@ -983,18 +1103,29 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-     protected function _buildQuotesRequestXml()
-     {
-         $rawRequest = $this->_rawRequest;
--        $xmlStr = '<?xml version = "1.0" encoding = "UTF-8"?>' .
--            '<p:DCTRequest xmlns:p="http://www.dhl.com" xmlns:p1="http://www.dhl.com/datatypes" ' .
--            'xmlns:p2="http://www.dhl.com/DCTRequestdatatypes" ' .
-+
-+        $xmlStr = '<?xml version="1.0" encoding = "UTF-8"?>' .
-+            '<req:DCTRequest schemaVersion="2.0" ' .
-+            'xmlns:req="http://www.dhl.com" ' .
-             'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' .
--            'xsi:schemaLocation="http://www.dhl.com DCT-req.xsd "/>';
-+            'xsi:schemaLocation="http://www.dhl.com DCT-req_global-2.0.xsd"/>';
-+
-         $xml = $this->_xmlElFactory->create(['data' => $xmlStr]);
-         $nodeGetQuote = $xml->addChild('GetQuote', '', '');
-         $nodeRequest = $nodeGetQuote->addChild('Request');
- 
-         $nodeServiceHeader = $nodeRequest->addChild('ServiceHeader');
--        $nodeServiceHeader->addChild('SiteID', (string)$this->getConfigData('id'));
--        $nodeServiceHeader->addChild('Password', (string)$this->getConfigData('password'));
-+        $nodeServiceHeader->addChild('MessageTime', $this->buildMessageTimestamp());
-+        $nodeServiceHeader->addChild(
-+            'MessageReference',
-+            $this->buildMessageReference(self::SERVICE_PREFIX_QUOTE)
-+        );
-+        $nodeServiceHeader->addChild('SiteID', (string) $this->getConfigData('id'));
-+        $nodeServiceHeader->addChild('Password', (string) $this->getConfigData('password'));
-+
-+        $nodeMetaData = $nodeRequest->addChild('MetaData');
-+        $nodeMetaData->addChild('SoftwareName', $this->buildSoftwareName());
-+        $nodeMetaData->addChild('SoftwareVersion', $this->buildSoftwareVersion());
- 
-         $nodeFrom = $nodeGetQuote->addChild('From');
-         $nodeFrom->addChild('CountryCode', $rawRequest->getOrigCountryId());
-@@ -1386,44 +1517,37 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-     {
-         $rawRequest = $this->_request;
- 
--        $originRegion = $this->getCountryParams(
--            $this->_scopeConfig->getValue(
--                Shipment::XML_PATH_STORE_COUNTRY_ID,
--                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
--                $this->getStore()
--            )
--        )->getRegion();
--
--        if (!$originRegion) {
--            throw new \Magento\Framework\Exception\LocalizedException(__('Wrong Region'));
--        }
--
--        if ($originRegion == 'AM') {
--            $originRegion = '';
--        }
--
-         $xmlStr = '<?xml version="1.0" encoding="UTF-8"?>' .
--            '<req:ShipmentValidateRequest' .
--            $originRegion .
-+            '<req:ShipmentRequest' .
-             ' xmlns:req="http://www.dhl.com"' .
-             ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' .
--            ' xsi:schemaLocation="http://www.dhl.com ship-val-req' .
--            ($originRegion ? '_' .
--                $originRegion : '') .
--            '.xsd" />';
-+            ' xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.0.xsd"' .
-+            ' schemaVersion="6.0" />';
-         $xml = $this->_xmlElFactory->create(['data' => $xmlStr]);
- 
-         $nodeRequest = $xml->addChild('Request', '', '');
-         $nodeServiceHeader = $nodeRequest->addChild('ServiceHeader');
-+        $nodeServiceHeader->addChild('MessageTime', $this->buildMessageTimestamp());
-+        // MessageReference must be 28 to 32 chars.
-+        $nodeServiceHeader->addChild(
-+            'MessageReference',
-+            $this->buildMessageReference(self::SERVICE_PREFIX_SHIPVAL)
-+        );
-         $nodeServiceHeader->addChild('SiteID', (string)$this->getConfigData('id'));
-         $nodeServiceHeader->addChild('Password', (string)$this->getConfigData('password'));
- 
--        if (!$originRegion) {
--            $xml->addChild('RequestedPickupTime', 'N', '');
--        }
--        if ($originRegion !== 'AP') {
--            $xml->addChild('NewShipper', 'N', '');
-+        $originRegion = $this->getCountryParams(
-+            $this->_scopeConfig->getValue(
-+                Shipment::XML_PATH_STORE_COUNTRY_ID,
-+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+                $this->getStore()
-+            )
-+        )->getRegion();
-+        if ($originRegion) {
-+            $xml->addChild('RegionCode', $originRegion, '');
-         }
-+        $xml->addChild('RequestedPickupTime', 'N', '');
-+        $xml->addChild('NewShipper', 'N', '');
-         $xml->addChild('LanguageCode', 'EN', '');
-         $xml->addChild('PiecesEnabled', 'Y', '');
- 
-@@ -1465,8 +1589,9 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-         }
- 
-         $nodeConsignee->addChild('City', $rawRequest->getRecipientAddressCity());
--        if ($originRegion !== 'AP') {
--            $nodeConsignee->addChild('Division', $rawRequest->getRecipientAddressStateOrProvinceCode());
-+        $recipientAddressStateOrProvinceCode = $rawRequest->getRecipientAddressStateOrProvinceCode();
-+        if ($recipientAddressStateOrProvinceCode) {
-+            $nodeConsignee->addChild('Division', $recipientAddressStateOrProvinceCode);
-         }
-         $nodeConsignee->addChild('PostalCode', $rawRequest->getRecipientAddressPostalCode());
-         $nodeConsignee->addChild('CountryCode', $rawRequest->getRecipientAddressCountryCode());
-@@ -1510,15 +1635,13 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-         $nodeReference->addChild('ReferenceType', 'St');
- 
-         /** Shipment Details */
--        $this->_shipmentDetails($xml, $rawRequest, $originRegion);
-+        $this->_shipmentDetails($xml, $rawRequest);
- 
-         /** Shipper */
-         $nodeShipper = $xml->addChild('Shipper', '', '');
-         $nodeShipper->addChild('ShipperID', (string)$this->getConfigData('account'));
-         $nodeShipper->addChild('CompanyName', $rawRequest->getShipperContactCompanyName());
--        if ($originRegion !== 'AP') {
--            $nodeShipper->addChild('RegisteredAccount', (string)$this->getConfigData('account'));
--        }
-+        $nodeShipper->addChild('RegisteredAccount', (string)$this->getConfigData('account'));
- 
-         $address = $rawRequest->getShipperAddressStreet1() . ' ' . $rawRequest->getShipperAddressStreet2();
-         $address = $this->string->split($address, 35, false, true);
-@@ -1531,8 +1654,9 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-         }
- 
-         $nodeShipper->addChild('City', $rawRequest->getShipperAddressCity());
--        if ($originRegion !== 'AP') {
--            $nodeShipper->addChild('Division', $rawRequest->getShipperAddressStateOrProvinceCode());
-+        $shipperAddressStateOrProvinceCode = $rawRequest->getShipperAddressStateOrProvinceCode();
-+        if ($shipperAddressStateOrProvinceCode) {
-+            $nodeShipper->addChild('Division', $shipperAddressStateOrProvinceCode);
-         }
-         $nodeShipper->addChild('PostalCode', $rawRequest->getShipperAddressPostalCode());
-         $nodeShipper->addChild('CountryCode', $rawRequest->getShipperAddressCountryCode());
-@@ -1547,7 +1671,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-         $xml->addChild('LabelImageFormat', 'PDF', '');
- 
-         $request = $xml->asXML();
--        if (!$request && !(mb_detect_encoding($request) == 'UTF-8')) {
-+        if ($request && !(mb_detect_encoding($request) == 'UTF-8')) {
-             $request = utf8_encode($request);
-         }
- 
-@@ -1555,13 +1679,15 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-         if ($responseBody === null) {
-             $debugData = ['request' => $this->filterDebugData($request)];
-             try {
--                /** @var \Magento\Framework\HTTP\ZendClient $client */
--                $client = $this->_httpClientFactory->create();
--                $client->setUri((string)$this->getConfigData('gateway_url'));
--                $client->setConfig(['maxredirects' => 0, 'timeout' => 30]);
--                $client->setRawData($request);
--                $responseBody = $client->request(\Magento\Framework\HTTP\ZendClient::POST)->getBody();
--                $responseBody = utf8_decode($responseBody);
-+                $response = $this->httpClient->request(
-+                    new Request(
-+                        (string)$this->getConfigData('gateway_url'),
-+                        Request::METHOD_POST,
-+                        ['Content-Type' => 'application/xml'],
-+                        $request
-+                    )
-+                );
-+                $responseBody = utf8_decode($response->get()->getBody());
-                 $debugData['result'] = $this->filterDebugData($responseBody);
-                 $this->_setCachedQuotes($request, $responseBody);
-             } catch (\Exception $e) {
-@@ -1584,19 +1710,13 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-      * @return void
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
-     {
-         $nodeShipmentDetails = $xml->addChild('ShipmentDetails', '', '');
-         $nodeShipmentDetails->addChild('NumberOfPieces', count($rawRequest->getPackages()));
- 
--        if ($originRegion) {
--            $nodeShipmentDetails->addChild(
--                'CurrencyCode',
--                $this->_storeManager->getWebsite($this->_request->getWebsiteId())->getBaseCurrencyCode()
--            );
--        }
--
-         $nodePieces = $nodeShipmentDetails->addChild('Pieces', '', '');
- 
-         /*
-@@ -1615,18 +1735,12 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-             }
-             $nodePiece->addChild('PieceID', ++$i);
-             $nodePiece->addChild('PackageType', $packageType);
--            $nodePiece->addChild('Weight', sprintf('%.1f', $package['params']['weight']));
-+            $nodePiece->addChild('Weight', sprintf('%.3f', $package['params']['weight']));
-             $params = $package['params'];
-             if ($params['width'] && $params['length'] && $params['height']) {
--                if (!$originRegion) {
--                    $nodePiece->addChild('Width', round($params['width']));
--                    $nodePiece->addChild('Height', round($params['height']));
--                    $nodePiece->addChild('Depth', round($params['length']));
--                } else {
--                    $nodePiece->addChild('Depth', round($params['length']));
--                    $nodePiece->addChild('Width', round($params['width']));
--                    $nodePiece->addChild('Height', round($params['height']));
--                }
-+                $nodePiece->addChild('Width', round($params['width']));
-+                $nodePiece->addChild('Height', round($params['height']));
-+                $nodePiece->addChild('Depth', round($params['length']));
-             }
-             $content = [];
-             foreach ($package['items'] as $item) {
-@@ -1635,58 +1749,40 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-             $nodePiece->addChild('PieceContents', substr(implode(',', $content), 0, 34));
-         }
- 
--        if (!$originRegion) {
--            $nodeShipmentDetails->addChild('Weight', sprintf('%.1f', $rawRequest->getPackageWeight()));
--            $nodeShipmentDetails->addChild('WeightUnit', substr($this->_getWeightUnit(), 0, 1));
--            $nodeShipmentDetails->addChild('GlobalProductCode', $rawRequest->getShippingMethod());
--            $nodeShipmentDetails->addChild('LocalProductCode', $rawRequest->getShippingMethod());
--            $nodeShipmentDetails->addChild('Date', $this->_coreDate->date('Y-m-d'));
--            $nodeShipmentDetails->addChild('Contents', 'DHL Parcel');
--            /**
--             * The DoorTo Element defines the type of delivery service that applies to the shipment.
--             * The valid values are DD (Door to Door), DA (Door to Airport) , AA and DC (Door to
--             * Door non-compliant)
--             */
--            $nodeShipmentDetails->addChild('DoorTo', 'DD');
--            $nodeShipmentDetails->addChild('DimensionUnit', substr($this->_getDimensionUnit(), 0, 1));
--            if ($package['params']['container'] == self::DHL_CONTENT_TYPE_NON_DOC) {
--                $packageType = 'CP';
--            }
--            $nodeShipmentDetails->addChild('PackageType', $packageType);
--            if ($this->isDutiable($rawRequest->getOrigCountryId(), $rawRequest->getDestCountryId())) {
--                $nodeShipmentDetails->addChild('IsDutiable', 'Y');
--            }
--            $nodeShipmentDetails->addChild(
--                'CurrencyCode',
--                $this->_storeManager->getWebsite($this->_request->getWebsiteId())->getBaseCurrencyCode()
--            );
--        } else {
--            if ($package['params']['container'] == self::DHL_CONTENT_TYPE_NON_DOC) {
--                $packageType = 'CP';
--            }
--            $nodeShipmentDetails->addChild('PackageType', $packageType);
--            $nodeShipmentDetails->addChild('Weight', sprintf('%.3f', $rawRequest->getPackageWeight()));
--            $nodeShipmentDetails->addChild('DimensionUnit', substr($this->_getDimensionUnit(), 0, 1));
--            $nodeShipmentDetails->addChild('WeightUnit', substr($this->_getWeightUnit(), 0, 1));
--            $nodeShipmentDetails->addChild('GlobalProductCode', $rawRequest->getShippingMethod());
--            $nodeShipmentDetails->addChild('LocalProductCode', $rawRequest->getShippingMethod());
--
--            /**
--             * The DoorTo Element defines the type of delivery service that applies to the shipment.
--             * The valid values are DD (Door to Door), DA (Door to Airport) , AA and DC (Door to
--             * Door non-compliant)
--             */
--            $nodeShipmentDetails->addChild('DoorTo', 'DD');
--            $nodeShipmentDetails->addChild('Date', $this->_coreDate->date('Y-m-d'));
--            $nodeShipmentDetails->addChild('Contents', 'DHL Parcel TEST');
-+        $nodeShipmentDetails->addChild('Weight', sprintf('%.3f', $rawRequest->getPackageWeight()));
-+        $nodeShipmentDetails->addChild('WeightUnit', substr($this->_getWeightUnit(), 0, 1));
-+        $nodeShipmentDetails->addChild('GlobalProductCode', $rawRequest->getShippingMethod());
-+        $nodeShipmentDetails->addChild('LocalProductCode', $rawRequest->getShippingMethod());
-+        $nodeShipmentDetails->addChild(
-+            'Date',
-+            $this->_coreDate->date('Y-m-d', strtotime('now + 1day'))
-+        );
-+        $nodeShipmentDetails->addChild('Contents', 'DHL Parcel');
-+        /**
-+         * The DoorTo Element defines the type of delivery service that applies to the shipment.
-+         * The valid values are DD (Door to Door), DA (Door to Airport) , AA and DC (Door to
-+         * Door non-compliant)
-+         */
-+        $nodeShipmentDetails->addChild('DoorTo', 'DD');
-+        $nodeShipmentDetails->addChild('DimensionUnit', substr($this->_getDimensionUnit(), 0, 1));
-+        if ($package['params']['container'] == self::DHL_CONTENT_TYPE_NON_DOC) {
-+            $packageType = 'CP';
-+        }
-+        $nodeShipmentDetails->addChild('PackageType', $packageType);
-+        if ($this->isDutiable($rawRequest->getOrigCountryId(), $rawRequest->getDestCountryId())) {
-+            $nodeShipmentDetails->addChild('IsDutiable', 'Y');
-         }
-+        $nodeShipmentDetails->addChild(
-+            'CurrencyCode',
-+            $this->_storeManager->getWebsite($this->_request->getWebsiteId())->getBaseCurrencyCode()
-+        );
-     }
- 
-     /**
-      * Get tracking
-      *
-      * @param string|string[] $trackings
--     * @return Result|null
-+     * @return \Magento\Shipping\Model\Tracking\Result|null
-      */
-     public function getTracking($trackings)
-     {
-@@ -1710,12 +1806,15 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-             '<req:KnownTrackingRequest' .
-             ' xmlns:req="http://www.dhl.com"' .
-             ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' .
--            ' xsi:schemaLocation="http://www.dhl.com TrackingRequestKnown.xsd" />';
-+            ' xsi:schemaLocation="http://www.dhl.com TrackingRequestKnown-1.0.xsd"' .
-+            ' schemaVersion="1.0" />';
- 
-         $xml = $this->_xmlElFactory->create(['data' => $xmlStr]);
- 
-         $requestNode = $xml->addChild('Request', '', '');
-         $serviceHeaderNode = $requestNode->addChild('ServiceHeader', '', '');
-+        $serviceHeaderNode->addChild('MessageTime', $this->buildMessageTimestamp());
-+        $serviceHeaderNode->addChild('MessageReference', $this->buildMessageReference(self::SERVICE_PREFIX_TRACKING));
-         $serviceHeaderNode->addChild('SiteID', (string)$this->getConfigData('id'));
-         $serviceHeaderNode->addChild('Password', (string)$this->getConfigData('password'));
- 
-@@ -1749,12 +1848,15 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-         if ($responseBody === null) {
-             $debugData = ['request' => $this->filterDebugData($request)];
-             try {
--                /** @var \Magento\Framework\HTTP\ZendClient $client */
--                $client = $this->_httpClientFactory->create();
--                $client->setUri((string)$this->getConfigData('gateway_url'));
--                $client->setConfig(['maxredirects' => 0, 'timeout' => 30]);
--                $client->setRawData($request);
--                $responseBody = $client->request(\Magento\Framework\HTTP\ZendClient::POST)->getBody();
-+                $response = $this->httpClient->request(
-+                    new Request(
-+                        (string)$this->getConfigData('gateway_url'),
-+                        Request::METHOD_POST,
-+                        ['Content-Type' => 'application/xml'],
-+                        $request
-+                    )
-+                );
-+                $responseBody = $response->get()->getBody();
-                 $debugData['result'] = $this->filterDebugData($responseBody);
-                 $this->_setCachedQuotes($request, $responseBody);
-             } catch (\Exception $e) {
-@@ -1856,6 +1958,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-                 $result->append($error);
-             }
-         }
-+        $this->_errors = [];
- 
-         $this->_result = $result;
-     }
-@@ -1950,6 +2053,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-             }
-             $result->setTrackingNumber((string)$xml->AirwayBillNumber);
-             $labelContent = (string)$xml->LabelImage->OutputImage;
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             $result->setShippingLabelContent(base64_decode($labelContent));
-         } catch (\Exception $e) {
-             throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()));
-@@ -1959,17 +2063,72 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
-     }
- 
-     /**
-+     * Verify if the shipment is dutiable
-+     *
-      * @param string $origCountryId
-      * @param string $destCountryId
-      *
-      * @return bool
-      */
--    protected function isDutiable($origCountryId, $destCountryId)
-+    protected function isDutiable($origCountryId, $destCountryId) : bool
-     {
-         $this->_checkDomesticStatus($origCountryId, $destCountryId);
- 
--        return
--            self::DHL_CONTENT_TYPE_NON_DOC == $this->getConfigData('content_type')
--            || !$this->_isDomestic;
-+        return !$this->_isDomestic;
-+    }
-+
-+    /**
-+     * Builds a datetime string to be used as the MessageTime in accordance to the expected format.
-+     *
-+     * @param string|null $datetime
-+     * @return string
-+     */
-+    private function buildMessageTimestamp(string $datetime = null): string
-+    {
-+        return $this->_coreDate->date(\DATE_RFC3339, $datetime);
-+    }
-+
-+    /**
-+     * Builds a string to be used as the MessageReference.
-+     *
-+     * @param string $servicePrefix
-+     * @return string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function buildMessageReference(string $servicePrefix): string
-+    {
-+        $validPrefixes = [
-+            self::SERVICE_PREFIX_QUOTE,
-+            self::SERVICE_PREFIX_SHIPVAL,
-+            self::SERVICE_PREFIX_TRACKING
-+        ];
-+
-+        if (!in_array($servicePrefix, $validPrefixes)) {
-+            throw new \Magento\Framework\Exception\LocalizedException(
-+                __("Invalid service prefix \"$servicePrefix\" provided while attempting to build MessageReference")
-+            );
-+        }
-+
-+        return str_replace('.', '', uniqid("MAGE_{$servicePrefix}_", true));
-+    }
-+
-+    /**
-+     * Builds a string to be used as the request SoftwareName.
-+     *
-+     * @return string
-+     */
-+    private function buildSoftwareName(): string
-+    {
-+        return substr($this->productMetadata->getName(), 0, 30);
-+    }
-+
-+    /**
-+     * Builds a string to be used as the request SoftwareVersion.
-+     *
-+     * @return string
-+     */
-+    private function buildSoftwareVersion(): string
-+    {
-+        return substr($this->productMetadata->getVersion(), 0, 10);
-     }
- }
-diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
-index 96c76a17bc3..0fde6fa8e9d 100644
---- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
-+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
-@@ -3,17 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Dhl\Test\Unit\Model;
- 
- use Magento\Dhl\Model\Carrier;
- use Magento\Dhl\Model\Validator\XmlValidator;
- use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\ProductMetadataInterface;
- use Magento\Framework\Filesystem\Directory\Read;
- use Magento\Framework\Filesystem\Directory\ReadFactory;
- use Magento\Framework\HTTP\ZendClient;
- use Magento\Framework\HTTP\ZendClientFactory;
- use Magento\Framework\Locale\ResolverInterface;
- use Magento\Framework\Module\Dir\Reader;
-+use Magento\Framework\Stdlib\DateTime\DateTime;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Framework\Xml\Security;
- use Magento\Quote\Model\Quote\Address\RateRequest;
-@@ -32,7 +35,6 @@ use Magento\Store\Model\StoreManager;
- use Magento\Store\Model\Website;
- use PHPUnit_Framework_MockObject_MockObject as MockObject;
- use Psr\Log\LoggerInterface;
--use Magento\Store\Model\ScopeInterface;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -80,14 +82,19 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-     private $xmlValidator;
- 
-     /**
--     * @var Request|MockObject
-+     * @var LoggerInterface|MockObject
-      */
--    private $request;
-+    private $logger;
- 
-     /**
--     * @var LoggerInterface|MockObject
-+     * @var DateTime|MockObject
-      */
--    private $logger;
-+    private $coreDateMock;
-+
-+    /**
-+     * @var ProductMetadataInterface
-+     */
-+    private $productMetadataMock;
- 
-     /**
-      * @inheritdoc
-@@ -96,35 +103,8 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->objectManager = new ObjectManager($this);
- 
--        $this->request = $this->getMockBuilder(Request::class)
--            ->disableOriginalConstructor()
--            ->setMethods(
--                [
--                    'getPackages',
--                    'getOrigCountryId',
--                    'setPackages',
--                    'setPackageWeight',
--                    'setPackageValue',
--                    'setValueWithDiscount',
--                    'setPackageCustomsValue',
--                    'setFreeMethodWeight',
--                    'getPackageWeight',
--                    'getFreeMethodWeight',
--                    'getOrderShipment',
--                ]
--            )
--            ->getMock();
--
-         $this->scope = $this->getMockForAbstractClass(ScopeConfigInterface::class);
- 
--        $xmlElFactory = $this->getXmlFactory();
--        $rateFactory = $this->getRateFactory();
--        $rateMethodFactory = $this->getRateMethodFactory();
--        $httpClientFactory = $this->getHttpClientFactory();
--        $configReader = $this->getConfigReader();
--        $readFactory = $this->getReadFactory();
--        $storeManager = $this->getStoreManager();
--
-         $this->error = $this->getMockBuilder(Error::class)
-             ->setMethods(['setCarrier', 'setCarrierTitle', 'setErrorMessage'])
-             ->getMock();
-@@ -135,31 +115,45 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-         $this->errorFactory->method('create')
-             ->willReturn($this->error);
- 
--        $carrierHelper = $this->getCarrierHelper();
--
-         $this->xmlValidator = $this->getMockBuilder(XmlValidator::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-         $this->logger = $this->getMockForAbstractClass(LoggerInterface::class);
- 
-+        $this->coreDateMock = $this->getMockBuilder(DateTime::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->coreDateMock->method('date')
-+            ->willReturn('currentTime');
-+
-+        $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->productMetadataMock->method('getName')
-+            ->willReturn('Software_Product_Name_30_Char_123456789');
-+        $this->productMetadataMock->method('getVersion')
-+            ->willReturn('10Char_Ver123456789');
-+
-         $this->model = $this->objectManager->getObject(
-             Carrier::class,
-             [
-                 'scopeConfig' => $this->scope,
--                'xmlSecurity' => new Security(),
--                'logger' => $this->logger,
--                'xmlElFactory' => $xmlElFactory,
--                'rateFactory' => $rateFactory,
-                 'rateErrorFactory' => $this->errorFactory,
--                'rateMethodFactory' => $rateMethodFactory,
--                'httpClientFactory' => $httpClientFactory,
--                'readFactory' => $readFactory,
--                'storeManager' => $storeManager,
--                'configReader' => $configReader,
--                'carrierHelper' => $carrierHelper,
-+                'logger' => $this->logger,
-+                'xmlSecurity' => new Security(),
-+                'xmlElFactory' => $this->getXmlFactory(),
-+                'rateFactory' => $this->getRateFactory(),
-+                'rateMethodFactory' => $this->getRateMethodFactory(),
-+                'carrierHelper' => $this->getCarrierHelper(),
-+                'configReader' => $this->getConfigReader(),
-+                'storeManager' => $this->getStoreManager(),
-+                'readFactory' => $this->getReadFactory(),
-+                'httpClientFactory' => $this->getHttpClientFactory(),
-                 'data' => ['id' => 'dhl', 'store' => '1'],
-                 'xmlValidator' => $this->xmlValidator,
-+                'coreDate' => $this->coreDateMock,
-+                'productMetadata' => $this->productMetadataMock
-             ]
-         );
-     }
-@@ -176,14 +170,14 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-             'carriers/dhl/shipment_days' => 'Mon,Tue,Wed,Thu,Fri,Sat',
-             'carriers/dhl/intl_shipment_days' => 'Mon,Tue,Wed,Thu,Fri,Sat',
-             'carriers/dhl/allowed_methods' => 'IE',
--            'carriers/dhl/international_searvice' => 'IE',
-+            'carriers/dhl/international_service' => 'IE',
-             'carriers/dhl/gateway_url' => 'https://xmlpi-ea.dhl.com/XMLShippingServlet',
-             'carriers/dhl/id' => 'some ID',
-             'carriers/dhl/password' => 'some password',
-             'carriers/dhl/content_type' => 'N',
-             'carriers/dhl/nondoc_methods' => '1,3,4,8,P,Q,E,F,H,J,M,V,Y',
-             'carriers/dhl/showmethod' => 1,
--            'carriers/dhl/title' => 'dhl Title',
-+            'carriers/dhl/title' => 'DHL Title',
-             'carriers/dhl/specificerrmsg' => 'dhl error message',
-             'carriers/dhl/unit_of_measure' => 'K',
-             'carriers/dhl/size' => '1',
-@@ -191,11 +185,16 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-             'carriers/dhl/width' => '1.6',
-             'carriers/dhl/depth' => '1.6',
-             'carriers/dhl/debug' => 1,
--            'shipping/origin/country_id' => 'GB',
-+            'shipping/origin/country_id' => 'GB'
-         ];
-         return isset($pathMap[$path]) ? $pathMap[$path] : null;
-     }
- 
-+    /**
-+     * Prepare shipping label content test
-+     *
-+     * @throws \ReflectionException
-+     */
-     public function testPrepareShippingLabelContent()
-     {
-         $xml = simplexml_load_file(
-@@ -207,6 +206,8 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Prepare shipping label content exception test
-+     *
-      * @dataProvider prepareShippingLabelContentExceptionDataProvider
-      * @expectedException \Magento\Framework\Exception\LocalizedException
-      * @expectedExceptionMessage Unable to retrieve shipping label
-@@ -217,6 +218,8 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Prepare shipping label content exception data provider
-+     *
-      * @return array
-      */
-     public function prepareShippingLabelContentExceptionDataProvider()
-@@ -236,8 +239,11 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Invoke prepare shipping label content
-+     *
-      * @param \SimpleXMLElement $xml
-      * @return \Magento\Framework\DataObject
-+     * @throws \ReflectionException
-      */
-     protected function _invokePrepareShippingLabelContent(\SimpleXMLElement $xml)
-     {
-@@ -247,38 +253,9 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-         return $method->invoke($model, $xml);
-     }
- 
--    public function testCollectRates()
--    {
--        $this->scope->method('getValue')
--            ->willReturnCallback([$this, 'scopeConfigGetValue']);
--
--        $this->scope->method('isSetFlag')
--            ->willReturn(true);
--
--        $this->httpResponse->method('getBody')
--            ->willReturn(file_get_contents(__DIR__ . '/_files/success_dhl_response_rates.xml'));
--
--        /** @var RateRequest $request */
--        $request = $this->objectManager->getObject(
--            RateRequest::class,
--            require __DIR__ . '/_files/rates_request_data_dhl.php'
--        );
--
--        $reflectionClass = new \ReflectionObject($this->httpClient);
--        $rawPostData = $reflectionClass->getProperty('raw_post_data');
--        $rawPostData->setAccessible(true);
--
--        $this->logger->expects($this->once())
--            ->method('debug')
--            ->with($this->stringContains('<SiteID>****</SiteID><Password>****</Password>'));
--
--        self::assertNotEmpty($this->model->collectRates($request)->getAllRates());
--        self::assertContains('<Weight>18.223</Weight>', $rawPostData->getValue($this->httpClient));
--        self::assertContains('<Height>0.630</Height>', $rawPostData->getValue($this->httpClient));
--        self::assertContains('<Width>0.630</Width>', $rawPostData->getValue($this->httpClient));
--        self::assertContains('<Depth>0.630</Depth>', $rawPostData->getValue($this->httpClient));
--    }
--
-+    /**
-+     * Tests that an error is returned when attempting to collect rates for an inactive shipping method.
-+     */
-     public function testCollectRatesErrorMessage()
-     {
-         $this->scope->method('getValue')
-@@ -296,187 +273,10 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($this->error, $this->model->collectRates($request));
-     }
- 
--    public function testCollectRatesFail()
--    {
--        $this->scope->expects($this->once())->method('isSetFlag')->willReturn(true);
--
--        $request = new RateRequest();
--        $request->setPackageWeight(1);
--
--        $this->assertFalse(false, $this->model->collectRates($request));
--    }
--
--    /**
--     * Test request to shipment sends valid xml values.
--     */
--    public function testRequestToShipment()
--    {
--        $this->scope->method('getValue')
--            ->willReturnCallback([$this, 'scopeConfigGetValue']);
--
--        $this->httpResponse->method('getBody')
--            ->willReturn(utf8_encode(file_get_contents(__DIR__ . '/_files/response_shipping_label.xml')));
--
--        $packages = [
--            'package' => [
--                'params' => [
--                    'width' => '3',
--                    'length' => '3',
--                    'height' => '3',
--                    'dimension_units' => 'INCH',
--                    'weight_units' => 'POUND',
--                    'weight' => '0.454000000001',
--                    'customs_value' => '10.00',
--                    'container' => Carrier::DHL_CONTENT_TYPE_NON_DOC,
--                ],
--                'items' => [
--                    'item1' => [
--                        'name' => 'item_name',
--                    ],
--                ],
--            ],
--        ];
--
--        $order = $this->getMockBuilder(Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $order->method('getSubtotal')
--            ->willReturn('10.00');
--
--        $shipment = $this->getMockBuilder(Order\Shipment::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $shipment->method('getOrder')
--            ->willReturn($order);
--
--        $this->request->method('getPackages')
--            ->willReturn($packages);
--        $this->request->method('getOrigCountryId')
--            ->willReturn('GB');
--        $this->request->method('setPackages')
--            ->willReturnSelf();
--        $this->request->method('setPackageWeight')
--            ->willReturnSelf();
--        $this->request->method('setPackageValue')
--            ->willReturnSelf();
--        $this->request->method('setValueWithDiscount')
--            ->willReturnSelf();
--        $this->request->method('setPackageCustomsValue')
--            ->willReturnSelf();
--        $this->request->method('setFreeMethodWeight')
--            ->willReturnSelf();
--        $this->request->method('getPackageWeight')
--            ->willReturn('0.454000000001');
--        $this->request->method('getFreeMethodWeight')
--            ->willReturn('0.454000000001');
--        $this->request->method('getOrderShipment')
--            ->willReturn($shipment);
--
--        $this->logger->method('debug')
--            ->with($this->stringContains('<SiteID>****</SiteID><Password>****</Password>'));
--
--        $result = $this->model->requestToShipment($this->request);
--
--        $reflectionClass = new \ReflectionObject($this->httpClient);
--        $rawPostData = $reflectionClass->getProperty('raw_post_data');
--        $rawPostData->setAccessible(true);
--
--        $this->assertNotNull($result);
--        $this->assertContains('<Weight>0.454</Weight>', $rawPostData->getValue($this->httpClient));
--    }
--
--    /**
--     * Data provider to testRequestToShipment
--     *
--     * @return array
--     */
--    public function requestToShipmentDataProvider()
--    {
--        return [
--            [
--                'GB'
--            ],
--            [
--                null
--            ]
--        ];
--    }
--
-     /**
--     * Test that shipping label request for origin country from AP region doesn't contain restricted fields.
-+     * Get DHL products test
-      *
--     * @return void
--     */
--    public function testShippingLabelRequestForAsiaPacificRegion()
--    {
--        $this->scope->method('getValue')
--            ->willReturnMap(
--                [
--                    ['shipping/origin/country_id', ScopeInterface::SCOPE_STORE, null, 'SG'],
--                    ['carriers/dhl/gateway_url', ScopeInterface::SCOPE_STORE, null, 'https://xmlpi-ea.dhl.com'],
--                ]
--            );
--
--        $this->httpResponse->method('getBody')
--            ->willReturn(utf8_encode(file_get_contents(__DIR__ . '/_files/response_shipping_label.xml')));
--
--        $packages = [
--            'package' => [
--                'params' => [
--                    'width' => '1',
--                    'length' => '1',
--                    'height' => '1',
--                    'dimension_units' => 'INCH',
--                    'weight_units' => 'POUND',
--                    'weight' => '0.45',
--                    'customs_value' => '10.00',
--                    'container' => Carrier::DHL_CONTENT_TYPE_NON_DOC,
--                ],
--                'items' => [
--                    'item1' => [
--                        'name' => 'item_name',
--                    ],
--                ],
--            ],
--        ];
--
--        $this->request->method('getPackages')->willReturn($packages);
--        $this->request->method('getOrigCountryId')->willReturn('SG');
--        $this->request->method('setPackages')->willReturnSelf();
--        $this->request->method('setPackageWeight')->willReturnSelf();
--        $this->request->method('setPackageValue')->willReturnSelf();
--        $this->request->method('setValueWithDiscount')->willReturnSelf();
--        $this->request->method('setPackageCustomsValue')->willReturnSelf();
--
--        $result = $this->model->requestToShipment($this->request);
--
--        $reflectionClass = new \ReflectionObject($this->httpClient);
--        $rawPostData = $reflectionClass->getProperty('raw_post_data');
--        $rawPostData->setAccessible(true);
--
--        $this->assertNotNull($result);
--        $requestXml = $rawPostData->getValue($this->httpClient);
--
--        $this->assertNotContains(
--            'NewShipper',
--            $requestXml,
--            'NewShipper is restricted field for AP region'
--        );
--        $this->assertNotContains(
--            'Division',
--            $requestXml,
--            'Division is restricted field for AP region'
--        );
--        $this->assertNotContains(
--            'RegisteredAccount',
--            $requestXml,
--            'RegisteredAccount is restricted field for AP region'
--        );
--    }
--    
--    /**
-      * @dataProvider dhlProductsDataProvider
--     *
-      * @param string $docType
-      * @param array $products
-      */
-@@ -486,9 +286,11 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * DHL products data provider
-+     *
-      * @return array
-      */
--    public function dhlProductsDataProvider() : array
-+    public function dhlProductsDataProvider(): array
-     {
-         return [
-             'doc' => [
-@@ -537,6 +339,113 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
-+    /**
-+     * Tests that the built MessageReference string is of the appropriate format.
-+     *
-+     * @dataProvider buildMessageReferenceDataProvider
-+     * @param $servicePrefix
-+     * @throws \ReflectionException
-+     */
-+    public function testBuildMessageReference($servicePrefix)
-+    {
-+        $method = new \ReflectionMethod($this->model, 'buildMessageReference');
-+        $method->setAccessible(true);
-+
-+        $messageReference = $method->invoke($this->model, $servicePrefix);
-+        $this->assertGreaterThanOrEqual(28, strlen($messageReference));
-+        $this->assertLessThanOrEqual(32, strlen($messageReference));
-+    }
-+
-+    /**
-+     * Build message reference data provider
-+     *
-+     * @return array
-+     */
-+    public function buildMessageReferenceDataProvider()
-+    {
-+        return [
-+            'quote_prefix' => ['QUOT'],
-+            'shipval_prefix' => ['SHIP'],
-+            'tracking_prefix' => ['TRCK']
-+        ];
-+    }
-+
-+    /**
-+     * Tests that an exception is thrown when an invalid service prefix is provided.
-+     *
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Invalid service prefix
-+     */
-+    public function testBuildMessageReferenceInvalidPrefix()
-+    {
-+        $method = new \ReflectionMethod($this->model, 'buildMessageReference');
-+        $method->setAccessible(true);
-+
-+        $method->invoke($this->model, 'INVALID');
-+    }
-+
-+    /**
-+     * Tests that the built software name string is of the appropriate format.
-+     *
-+     * @dataProvider buildSoftwareNameDataProvider
-+     * @param $productName
-+     * @throws \ReflectionException
-+     */
-+    public function testBuildSoftwareName($productName)
-+    {
-+        $method = new \ReflectionMethod($this->model, 'buildSoftwareName');
-+        $method->setAccessible(true);
-+
-+        $this->productMetadataMock->method('getName')->willReturn($productName);
-+
-+        $softwareName = $method->invoke($this->model);
-+        $this->assertLessThanOrEqual(30, strlen($softwareName));
-+    }
-+
-+    /**
-+     * Data provider for testBuildSoftwareName
-+     *
-+     * @return array
-+     */
-+    public function buildSoftwareNameDataProvider()
-+    {
-+        return [
-+            'valid_length' => ['Magento'],
-+            'exceeds_length' => ['Product_Name_Longer_Than_30_Char']
-+        ];
-+    }
-+
-+    /**
-+     * Tests that the built software version string is of the appropriate format.
-+     *
-+     * @dataProvider buildSoftwareVersionProvider
-+     * @param $productVersion
-+     * @throws \ReflectionException
-+     */
-+    public function testBuildSoftwareVersion($productVersion)
-+    {
-+        $method = new \ReflectionMethod($this->model, 'buildSoftwareVersion');
-+        $method->setAccessible(true);
-+
-+        $this->productMetadataMock->method('getVersion')->willReturn($productVersion);
-+
-+        $softwareVersion = $method->invoke($this->model);
-+        $this->assertLessThanOrEqual(10, strlen($softwareVersion));
-+    }
-+
-+    /**
-+     * Data provider for testBuildSoftwareVersion
-+     *
-+     * @return array
-+     */
-+    public function buildSoftwareVersionProvider()
-+    {
-+        return [
-+            'valid_length' => ['2.3.1'],
-+            'exceeds_length' => ['dev-MC-1000']
-+        ];
-+    }
-+
-     /**
-      * Creates mock for XML factory.
-      *
-@@ -595,19 +504,27 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->setMethods(['create'])
-             ->getMock();
--        $rateMethod = $this->getMockBuilder(Method::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['setPrice'])
--            ->getMock();
--        $rateMethod->method('setPrice')
--            ->willReturnSelf();
-+
-         $rateMethodFactory->method('create')
--            ->willReturn($rateMethod);
-+            ->willReturnCallback(
-+                function () {
-+                    $rateMethod = $this->getMockBuilder(Method::class)
-+                        ->disableOriginalConstructor()
-+                        ->setMethods(['setPrice'])
-+                        ->getMock();
-+                    $rateMethod->method('setPrice')
-+                        ->willReturnSelf();
-+
-+                    return $rateMethod;
-+                }
-+            );
- 
-         return $rateMethodFactory;
-     }
- 
-     /**
-+     * Get config reader
-+     *
-      * @return MockObject
-      */
-     private function getConfigReader(): MockObject
-@@ -622,6 +539,8 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Get read factory
-+     *
-      * @return MockObject
-      */
-     private function getReadFactory(): MockObject
-@@ -640,6 +559,8 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Get store manager
-+     *
-      * @return MockObject
-      */
-     private function getStoreManager(): MockObject
-@@ -661,6 +582,8 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Get carrier helper
-+     *
-      * @return CarrierHelper
-      */
-     private function getCarrierHelper(): CarrierHelper
-@@ -679,6 +602,8 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Get HTTP client factory
-+     *
-      * @return MockObject
-      */
-     private function getHttpClientFactory(): MockObject
-diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml
-index 3f28111f229..792465ce459 100644
---- a/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml
-+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml
-@@ -1,4 +1,4 @@
--<?xml version="1.0" encoding="UTF-8"?>
-+<?xml version="1.0"?>
- <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-@@ -83,7 +83,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Austria</name>
-         <domestic>1</domestic>
-     </AT>
-@@ -132,7 +132,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Belgium</name>
-         <domestic>1</domestic>
-     </BE>
-@@ -146,7 +146,7 @@
-         <currency>BGN</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Bulgaria</name>
-         <domestic>1</domestic>
-     </BG>
-@@ -257,7 +257,7 @@
-         <currency>CHF</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Switzerland</name>
-     </CH>
-     <CI>
-@@ -331,7 +331,7 @@
-         <currency>CZK</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Czech Republic, The</name>
-         <domestic>1</domestic>
-     </CZ>
-@@ -339,7 +339,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Germany</name>
-         <domestic>1</domestic>
-     </DE>
-@@ -353,7 +353,7 @@
-         <currency>DKK</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Denmark</name>
-         <domestic>1</domestic>
-     </DK>
-@@ -389,7 +389,7 @@
-         <currency>EEK</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Estonia</name>
-         <domestic>1</domestic>
-     </EE>
-@@ -410,7 +410,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Spain</name>
-         <domestic>1</domestic>
-     </ES>
-@@ -424,7 +424,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Finland</name>
-         <domestic>1</domestic>
-     </FI>
-@@ -457,7 +457,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>France</name>
-         <domestic>1</domestic>
-     </FR>
-@@ -471,7 +471,7 @@
-         <currency>GBP</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>United Kingdom</name>
-         <domestic>1</domestic>
-     </GB>
-@@ -549,7 +549,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Greece</name>
-         <domestic>1</domestic>
-     </GR>
-@@ -612,7 +612,7 @@
-         <currency>HUF</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Hungary</name>
-         <domestic>1</domestic>
-     </HU>
-@@ -633,7 +633,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Ireland, Republic Of</name>
-         <domestic>1</domestic>
-     </IE>
-@@ -668,14 +668,14 @@
-         <currency>ISK</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Iceland</name>
-     </IS>
-     <IT>
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Italy</name>
-         <domestic>1</domestic>
-     </IT>
-@@ -834,7 +834,7 @@
-         <currency>LTL</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Lithuania</name>
-         <domestic>1</domestic>
-     </LT>
-@@ -842,7 +842,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Luxembourg</name>
-         <domestic>1</domestic>
-     </LU>
-@@ -850,7 +850,7 @@
-         <currency>LVL</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Latvia</name>
-         <domestic>1</domestic>
-     </LV>
-@@ -1039,7 +1039,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Netherlands, The</name>
-         <domestic>1</domestic>
-     </NL>
-@@ -1047,7 +1047,7 @@
-         <currency>NOK</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Norway</name>
-     </NO>
-     <NP>
-@@ -1127,7 +1127,7 @@
-         <currency>PLN</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Poland</name>
-         <domestic>1</domestic>
-     </PL>
-@@ -1142,7 +1142,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Portugal</name>
-         <domestic>1</domestic>
-     </PT>
-@@ -1177,7 +1177,7 @@
-         <currency>RON</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Romania</name>
-         <domestic>1</domestic>
-     </RO>
-@@ -1231,7 +1231,7 @@
-         <currency>SEK</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Sweden</name>
-         <domestic>1</domestic>
-     </SE>
-@@ -1246,7 +1246,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Slovenia</name>
-         <domestic>1</domestic>
-     </SI>
-@@ -1254,7 +1254,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Slovakia</name>
-         <domestic>1</domestic>
-     </SK>
-diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_request_data.php b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_request_data.php
-new file mode 100644
-index 00000000000..f762b997352
---- /dev/null
-+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_request_data.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+return [
-+    'data' => [
-+        'dest_country_id' => 'DE',
-+        'dest_region_id' => '82',
-+        'dest_region_code' => 'BER',
-+        'dest_street' => 'Turmstraße 17',
-+        'dest_city' => 'Berlin',
-+        'dest_postcode' => '10559',
-+        'dest_postal' => '10559',
-+        'package_value' => '5',
-+        'package_value_with_discount' => '5',
-+        'package_weight' => '8.2657',
-+        'package_qty' => '1',
-+        'package_physical_value' => '5',
-+        'free_method_weight' => '5',
-+        'store_id' => '1',
-+        'website_id' => '1',
-+        'free_shipping' => '0',
-+        'limit_carrier' => null,
-+        'base_subtotal_incl_tax' => '5',
-+        'orig_country_id' => 'US',
-+        'orig_region_id' => '12',
-+        'orig_city' => 'Fremont',
-+        'orig_postcode' => '94538',
-+        'dhl_id' => 'MAGEN_8501',
-+        'dhl_password' => 'QR2GO1U74X',
-+        'dhl_account' => '799909537',
-+        'dhl_shipping_intl_key' => '54233F2B2C4E5C4B4C5E5A59565530554B405641475D5659',
-+        'girth' => null,
-+        'height' => null,
-+        'length' => null,
-+        'width' => null,
-+        'weight' => 1,
-+        'dhl_shipment_type' => 'P',
-+        'dhl_duitable' => 0,
-+        'dhl_duty_payment_type' => 'R',
-+        'dhl_content_desc' => 'Big Box',
-+        'limit_method' => 'IE',
-+        'ship_date' => '2014-01-09',
-+        'action' => 'RateEstimate',
-+        'all_items' => [],
-+    ]
-+];
-diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response.xml
-new file mode 100644
-index 00000000000..74217079664
---- /dev/null
-+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response.xml
-@@ -0,0 +1,530 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<res:DCTResponse xmlns:res="http://www.dhl.com"
-+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+                 xsi:schemaLocation="http://www.dhl.com DCT-Response_global-2.0.xsd">
-+    <GetQuoteResponse>
-+        <Response>
-+            <ServiceHeader>
-+                <MessageTime>2014-01-09T12:13:29.498+00:00</MessageTime>
-+                <SiteID>EvgeniyUSA</SiteID>
-+            </ServiceHeader>
-+        </Response>
-+        <BkgDetails>
-+            <QtdShp>
-+                <OriginServiceArea>
-+                    <FacilityCode>NUQ</FacilityCode>
-+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
-+                </OriginServiceArea>
-+                <DestinationServiceArea>
-+                    <FacilityCode>BER</FacilityCode>
-+                    <ServiceAreaCode>BER</ServiceAreaCode>
-+                </DestinationServiceArea>
-+                <GlobalProductCode>E</GlobalProductCode>
-+                <LocalProductCode>E</LocalProductCode>
-+                <ProductShortName>EXPRESS 9:00</ProductShortName>
-+                <LocalProductName>EXPRESS 9:00 NONDOC</LocalProductName>
-+                <NetworkTypeCode>TD</NetworkTypeCode>
-+                <POfferedCustAgreement>N</POfferedCustAgreement>
-+                <TransInd>Y</TransInd>
-+                <PickupDate>2014-01-09</PickupDate>
-+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
-+                <BookingTime>PT15H15M</BookingTime>
-+                <CurrencyCode>USD</CurrencyCode>
-+                <ExchangeRate>1.000000</ExchangeRate>
-+                <WeightCharge>42.060</WeightCharge>
-+                <WeightChargeTax>0.000</WeightChargeTax>
-+                <TotalTransitDays>2</TotalTransitDays>
-+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
-+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-+                <DeliveryDate>
-+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
-+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
-+                </DeliveryDate>
-+                <DeliveryTime>PT9H</DeliveryTime>
-+                <DimensionalWeight>2.205</DimensionalWeight>
-+                <WeightUnit>LB</WeightUnit>
-+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
-+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
-+                <QtdShpExChrg>
-+                    <SpecialServiceType>FF</SpecialServiceType>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <ChargeValue>3.790</ChargeValue>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>3.790</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>3.790</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>3.790</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                </QtdShpExChrg>
-+                <PricingDate>2014-01-09</PricingDate>
-+                <ShippingCharge>45.850</ShippingCharge>
-+                <TotalTaxAmount>0.000</TotalTaxAmount>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    <WeightCharge>42.060</WeightCharge>
-+                    <TotalAmount>45.850</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    <WeightCharge>42.060</WeightCharge>
-+                    <TotalAmount>45.850</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    <WeightCharge>42.060</WeightCharge>
-+                    <TotalAmount>45.850</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
-+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
-+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
-+            </QtdShp>
-+            <QtdShp>
-+                <OriginServiceArea>
-+                    <FacilityCode>NUQ</FacilityCode>
-+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
-+                </OriginServiceArea>
-+                <DestinationServiceArea>
-+                    <FacilityCode>BER</FacilityCode>
-+                    <ServiceAreaCode>BER</ServiceAreaCode>
-+                </DestinationServiceArea>
-+                <GlobalProductCode>Q</GlobalProductCode>
-+                <LocalProductCode>Q</LocalProductCode>
-+                <ProductShortName>MEDICAL EXPRESS</ProductShortName>
-+                <LocalProductName>MEDICAL EXPRESS</LocalProductName>
-+                <NetworkTypeCode>TD</NetworkTypeCode>
-+                <POfferedCustAgreement>Y</POfferedCustAgreement>
-+                <TransInd>N</TransInd>
-+                <PickupDate>2014-01-09</PickupDate>
-+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
-+                <BookingTime>PT15H15M</BookingTime>
-+                <CurrencyCode>USD</CurrencyCode>
-+                <ExchangeRate>1.000000</ExchangeRate>
-+                <WeightCharge>32.350</WeightCharge>
-+                <WeightChargeTax>0.000</WeightChargeTax>
-+                <TotalTransitDays>2</TotalTransitDays>
-+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
-+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-+                <DeliveryDate>
-+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
-+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
-+                </DeliveryDate>
-+                <DeliveryTime>PT9H</DeliveryTime>
-+                <DimensionalWeight>2.205</DimensionalWeight>
-+                <WeightUnit>LB</WeightUnit>
-+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
-+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
-+                <QtdShpExChrg>
-+                    <SpecialServiceType>FF</SpecialServiceType>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <ChargeValue>2.910</ChargeValue>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>2.910</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>2.910</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>2.910</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                </QtdShpExChrg>
-+                <PricingDate>2014-01-09</PricingDate>
-+                <ShippingCharge>35.260</ShippingCharge>
-+                <TotalTaxAmount>0.000</TotalTaxAmount>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    <WeightCharge>32.350</WeightCharge>
-+                    <TotalAmount>35.260</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    <WeightCharge>32.350</WeightCharge>
-+                    <TotalAmount>35.260</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    <WeightCharge>32.350</WeightCharge>
-+                    <TotalAmount>35.260</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
-+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
-+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
-+            </QtdShp>
-+            <QtdShp>
-+                <OriginServiceArea>
-+                    <FacilityCode>NUQ</FacilityCode>
-+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
-+                </OriginServiceArea>
-+                <DestinationServiceArea>
-+                    <FacilityCode>BER</FacilityCode>
-+                    <ServiceAreaCode>BER</ServiceAreaCode>
-+                </DestinationServiceArea>
-+                <GlobalProductCode>Y</GlobalProductCode>
-+                <LocalProductCode>Y</LocalProductCode>
-+                <ProductShortName>EXPRESS 12:00</ProductShortName>
-+                <LocalProductName>EXPRESS 12:00 NONDOC</LocalProductName>
-+                <NetworkTypeCode>TD</NetworkTypeCode>
-+                <POfferedCustAgreement>N</POfferedCustAgreement>
-+                <TransInd>Y</TransInd>
-+                <PickupDate>2014-01-09</PickupDate>
-+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
-+                <BookingTime>PT15H15M</BookingTime>
-+                <CurrencyCode>USD</CurrencyCode>
-+                <ExchangeRate>1.000000</ExchangeRate>
-+                <WeightCharge>34.290</WeightCharge>
-+                <WeightChargeTax>0.000</WeightChargeTax>
-+                <TotalTransitDays>2</TotalTransitDays>
-+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
-+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-+                <DeliveryDate>
-+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
-+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
-+                </DeliveryDate>
-+                <DeliveryTime>PT12H</DeliveryTime>
-+                <DimensionalWeight>2.205</DimensionalWeight>
-+                <WeightUnit>LB</WeightUnit>
-+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
-+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
-+                <QtdShpExChrg>
-+                    <SpecialServiceType>FF</SpecialServiceType>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <ChargeValue>3.090</ChargeValue>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>3.090</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>3.090</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>3.090</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                </QtdShpExChrg>
-+                <PricingDate>2014-01-09</PricingDate>
-+                <ShippingCharge>37.380</ShippingCharge>
-+                <TotalTaxAmount>0.000</TotalTaxAmount>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    <WeightCharge>34.290</WeightCharge>
-+                    <TotalAmount>37.380</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    <WeightCharge>34.290</WeightCharge>
-+                    <TotalAmount>37.380</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    <WeightCharge>34.290</WeightCharge>
-+                    <TotalAmount>37.380</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
-+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
-+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
-+            </QtdShp>
-+            <QtdShp>
-+                <OriginServiceArea>
-+                    <FacilityCode>NUQ</FacilityCode>
-+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
-+                </OriginServiceArea>
-+                <DestinationServiceArea>
-+                    <FacilityCode>BER</FacilityCode>
-+                    <ServiceAreaCode>BER</ServiceAreaCode>
-+                </DestinationServiceArea>
-+                <GlobalProductCode>3</GlobalProductCode>
-+                <LocalProductCode>3</LocalProductCode>
-+                <ProductShortName>B2C</ProductShortName>
-+                <LocalProductName>EXPRESS WORLDWIDE (B2C)</LocalProductName>
-+                <NetworkTypeCode>TD</NetworkTypeCode>
-+                <POfferedCustAgreement>Y</POfferedCustAgreement>
-+                <TransInd>N</TransInd>
-+                <PickupDate>2014-01-09</PickupDate>
-+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
-+                <BookingTime>PT15H15M</BookingTime>
-+                <ExchangeRate>1.000000</ExchangeRate>
-+                <WeightCharge>0</WeightCharge>
-+                <WeightChargeTax>0.000</WeightChargeTax>
-+                <TotalTransitDays>2</TotalTransitDays>
-+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
-+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-+                <DeliveryDate>
-+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
-+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
-+                </DeliveryDate>
-+                <DeliveryTime>PT23H59M</DeliveryTime>
-+                <DimensionalWeight>2.205</DimensionalWeight>
-+                <WeightUnit>LB</WeightUnit>
-+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
-+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
-+                <PricingDate>2014-01-09</PricingDate>
-+                <ShippingCharge>0.000</ShippingCharge>
-+                <TotalTaxAmount>0.000</TotalTaxAmount>
-+                <QtdSInAdCur>
-+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    <WeightCharge>0</WeightCharge>
-+                    <TotalAmount>0.000</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    <WeightCharge>0</WeightCharge>
-+                    <TotalAmount>0.000</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    <WeightCharge>0</WeightCharge>
-+                    <TotalAmount>0.000</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
-+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
-+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
-+            </QtdShp>
-+            <QtdShp>
-+                <OriginServiceArea>
-+                    <FacilityCode>NUQ</FacilityCode>
-+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
-+                </OriginServiceArea>
-+                <DestinationServiceArea>
-+                    <FacilityCode>BER</FacilityCode>
-+                    <ServiceAreaCode>BER</ServiceAreaCode>
-+                </DestinationServiceArea>
-+                <GlobalProductCode>P</GlobalProductCode>
-+                <LocalProductCode>P</LocalProductCode>
-+                <ProductShortName>EXPRESS WORLDWIDE</ProductShortName>
-+                <LocalProductName>EXPRESS WORLDWIDE NONDOC</LocalProductName>
-+                <NetworkTypeCode>TD</NetworkTypeCode>
-+                <POfferedCustAgreement>N</POfferedCustAgreement>
-+                <TransInd>Y</TransInd>
-+                <PickupDate>2014-01-09</PickupDate>
-+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
-+                <BookingTime>PT15H15M</BookingTime>
-+                <CurrencyCode>USD</CurrencyCode>
-+                <ExchangeRate>1.000000</ExchangeRate>
-+                <WeightCharge>32.350</WeightCharge>
-+                <WeightChargeTax>0.000</WeightChargeTax>
-+                <TotalTransitDays>2</TotalTransitDays>
-+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
-+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-+                <DeliveryDate>
-+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
-+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
-+                </DeliveryDate>
-+                <DeliveryTime>PT23H59M</DeliveryTime>
-+                <DimensionalWeight>2.205</DimensionalWeight>
-+                <WeightUnit>LB</WeightUnit>
-+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
-+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
-+                <QtdShpExChrg>
-+                    <SpecialServiceType>FF</SpecialServiceType>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <ChargeValue>2.910</ChargeValue>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>2.910</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>2.910</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>2.910</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                </QtdShpExChrg>
-+                <PricingDate>2014-01-09</PricingDate>
-+                <ShippingCharge>35.260</ShippingCharge>
-+                <TotalTaxAmount>0.000</TotalTaxAmount>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    <WeightCharge>32.350</WeightCharge>
-+                    <TotalAmount>35.260</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    <WeightCharge>32.350</WeightCharge>
-+                    <TotalAmount>35.260</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    <WeightCharge>32.350</WeightCharge>
-+                    <TotalAmount>35.260</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
-+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
-+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
-+            </QtdShp>
-+        </BkgDetails>
-+        <Srvs>
-+            <Srv>
-+                <GlobalProductCode>E</GlobalProductCode>
-+                <MrkSrv>
-+                    <LocalProductCode>E</LocalProductCode>
-+                    <ProductShortName>EXPRESS 9:00</ProductShortName>
-+                    <LocalProductName>EXPRESS 9:00 NONDOC</LocalProductName>
-+                    <NetworkTypeCode>TD</NetworkTypeCode>
-+                    <POfferedCustAgreement>N</POfferedCustAgreement>
-+                    <TransInd>Y</TransInd>
-+                </MrkSrv>
-+                <MrkSrv>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <MrkSrvInd>N</MrkSrvInd>
-+                </MrkSrv>
-+            </Srv>
-+            <Srv>
-+                <GlobalProductCode>Q</GlobalProductCode>
-+                <MrkSrv>
-+                    <LocalProductCode>Q</LocalProductCode>
-+                    <ProductShortName>MEDICAL EXPRESS</ProductShortName>
-+                    <LocalProductName>MEDICAL EXPRESS</LocalProductName>
-+                    <NetworkTypeCode>TD</NetworkTypeCode>
-+                    <POfferedCustAgreement>Y</POfferedCustAgreement>
-+                    <TransInd>N</TransInd>
-+                </MrkSrv>
-+                <MrkSrv>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <MrkSrvInd>N</MrkSrvInd>
-+                </MrkSrv>
-+            </Srv>
-+            <Srv>
-+                <GlobalProductCode>Y</GlobalProductCode>
-+                <MrkSrv>
-+                    <LocalProductCode>Y</LocalProductCode>
-+                    <ProductShortName>EXPRESS 12:00</ProductShortName>
-+                    <LocalProductName>EXPRESS 12:00 NONDOC</LocalProductName>
-+                    <NetworkTypeCode>TD</NetworkTypeCode>
-+                    <POfferedCustAgreement>N</POfferedCustAgreement>
-+                    <TransInd>Y</TransInd>
-+                </MrkSrv>
-+                <MrkSrv>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <MrkSrvInd>N</MrkSrvInd>
-+                </MrkSrv>
-+            </Srv>
-+            <Srv>
-+                <GlobalProductCode>3</GlobalProductCode>
-+                <MrkSrv>
-+                    <LocalProductCode>3</LocalProductCode>
-+                    <ProductShortName>B2C</ProductShortName>
-+                    <LocalProductName>EXPRESS WORLDWIDE (B2C)</LocalProductName>
-+                    <NetworkTypeCode>TD</NetworkTypeCode>
-+                    <POfferedCustAgreement>Y</POfferedCustAgreement>
-+                    <TransInd>N</TransInd>
-+                </MrkSrv>
-+            </Srv>
-+            <Srv>
-+                <GlobalProductCode>P</GlobalProductCode>
-+                <MrkSrv>
-+                    <LocalProductCode>P</LocalProductCode>
-+                    <ProductShortName>EXPRESS WORLDWIDE</ProductShortName>
-+                    <LocalProductName>EXPRESS WORLDWIDE NONDOC</LocalProductName>
-+                    <NetworkTypeCode>TD</NetworkTypeCode>
-+                    <POfferedCustAgreement>N</POfferedCustAgreement>
-+                    <TransInd>Y</TransInd>
-+                </MrkSrv>
-+                <MrkSrv>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <MrkSrvInd>N</MrkSrvInd>
-+                </MrkSrv>
-+            </Srv>
-+        </Srvs>
-+    </GetQuoteResponse>
-+</res:DCTResponse>
-diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php
-new file mode 100644
-index 00000000000..ddd7b2e4f97
---- /dev/null
-+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php
-@@ -0,0 +1,31 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+return [
-+    [
-+        'carrier' => 'dhl',
-+        'carrier_title' => 'DHL Title',
-+        'cost' => 45.85,
-+        'method' => 'E'
-+    ],
-+    [
-+        'carrier' => 'dhl',
-+        'carrier_title' => 'DHL Title',
-+        'cost' => 35.26,
-+        'method' => 'Q'
-+    ],
-+    [
-+        'carrier' => 'dhl',
-+        'carrier_title' => 'DHL Title',
-+        'cost' => 37.38,
-+        'method' => 'Y'
-+    ],
-+    [
-+        'carrier' => 'dhl',
-+        'carrier_title' => 'DHL Title',
-+        'cost' => 35.26,
-+        'method' => 'P'
-+    ]
-+];
-diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/rates_request_data_dhl.php b/app/code/Magento/Dhl/Test/Unit/Model/_files/rates_request_data_dhl.php
-deleted file mode 100644
-index 32e9c78886c..00000000000
---- a/app/code/Magento/Dhl/Test/Unit/Model/_files/rates_request_data_dhl.php
-+++ /dev/null
-@@ -1,49 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--return [
--    'data' => [
--        'dest_country_id' => 'DE',
--        'dest_region_id' => '82',
--        'dest_region_code' => 'BER',
--        'dest_street' => 'Turmstraße 17',
--        'dest_city' => 'Berlin',
--        'dest_postcode' => '10559',
--        'dest_postal' => '10559',
--        'package_value' => '5',
--        'package_value_with_discount' => '5',
--        'package_weight' => '8.2657',
--        'package_qty' => '1',
--        'package_physical_value' => '5',
--        'free_method_weight' => '5',
--        'store_id' => '1',
--        'website_id' => '1',
--        'free_shipping' => '0',
--        'limit_carrier' => null,
--        'base_subtotal_incl_tax' => '5',
--        'orig_country_id' => 'US',
--        'country_id' => 'US',
--        'region_id' => '12',
--        'city' => 'Fremont',
--        'postcode' => '94538',
--        'dhl_id' => 'MAGEN_8501',
--        'dhl_password' => 'QR2GO1U74X',
--        'dhl_account' => '799909537',
--        'dhl_shipping_intl_key' => '54233F2B2C4E5C4B4C5E5A59565530554B405641475D5659',
--        'girth' => null,
--        'height' => null,
--        'length' => null,
--        'width' => null,
--        'weight' => 1,
--        'dhl_shipment_type' => 'P',
--        'dhl_duitable' => 0,
--        'dhl_duty_payment_type' => 'R',
--        'dhl_content_desc' => 'Big Box',
--        'limit_method' => 'IE',
--        'ship_date' => '2014-01-09',
--        'action' => 'RateEstimate',
--        'all_items' => [],
--    ]
--];
-diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/success_dhl_response_rates.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/success_dhl_response_rates.xml
-deleted file mode 100644
-index b529e86ef15..00000000000
---- a/app/code/Magento/Dhl/Test/Unit/Model/_files/success_dhl_response_rates.xml
-+++ /dev/null
-@@ -1,478 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
---->
--
--<res:DCTResponse xmlns:res="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--                 xsi:schemaLocation="http://www.dhl.com DCT-Response.xsd">
--    <GetQuoteResponse>
--        <Response>
--            <ServiceHeader>
--                <MessageTime>2014-01-09T12:13:29.498+00:00</MessageTime>
--                <SiteID>EvgeniyUSA</SiteID>
--            </ServiceHeader>
--        </Response>
--        <BkgDetails>
--            <OriginServiceArea>
--                <FacilityCode>NUQ</FacilityCode>
--                <ServiceAreaCode>NUQ</ServiceAreaCode>
--            </OriginServiceArea>
--            <DestinationServiceArea>
--                <FacilityCode>BER</FacilityCode>
--                <ServiceAreaCode>BER</ServiceAreaCode>
--            </DestinationServiceArea>
--            <QtdShp>
--                <GlobalProductCode>E</GlobalProductCode>
--                <LocalProductCode>E</LocalProductCode>
--                <ProductShortName>EXPRESS 9:00</ProductShortName>
--                <LocalProductName>EXPRESS 9:00 NONDOC</LocalProductName>
--                <NetworkTypeCode>TD</NetworkTypeCode>
--                <POfferedCustAgreement>N</POfferedCustAgreement>
--                <TransInd>Y</TransInd>
--                <PickupDate>2014-01-09</PickupDate>
--                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
--                <BookingTime>PT15H15M</BookingTime>
--                <CurrencyCode>USD</CurrencyCode>
--                <ExchangeRate>1.000000</ExchangeRate>
--                <WeightCharge>42.060</WeightCharge>
--                <WeightChargeTax>0.000</WeightChargeTax>
--                <TotalTransitDays>2</TotalTransitDays>
--                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
--                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
--                <PickupNonDHLCourierCode />
--                <DeliveryNonDHLCourierCode />
--                <DeliveryDate>2014-01-13</DeliveryDate>
--                <DeliveryTime>PT9H</DeliveryTime>
--                <DimensionalWeight>2.205</DimensionalWeight>
--                <WeightUnit>LB</WeightUnit>
--                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
--                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
--                <QtdShpExChrg>
--                    <SpecialServiceType>FF</SpecialServiceType>
--                    <LocalServiceType>FF</LocalServiceType>
--                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
--                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
--                    <ChargeCodeType>SCH</ChargeCodeType>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <ChargeValue>3.790</ChargeValue>
--                    <QtdSExtrChrgInAdCur>
--                        <ChargeValue>3.790</ChargeValue>
--                        <CurrencyCode>USD</CurrencyCode>
--                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
--                    </QtdSExtrChrgInAdCur>
--                    <QtdSExtrChrgInAdCur>
--                        <ChargeValue>3.790</ChargeValue>
--                        <CurrencyCode>USD</CurrencyCode>
--                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
--                    </QtdSExtrChrgInAdCur>
--                    <QtdSExtrChrgInAdCur>
--                        <ChargeValue>3.790</ChargeValue>
--                        <CurrencyCode>USD</CurrencyCode>
--                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
--                    </QtdSExtrChrgInAdCur>
--                </QtdShpExChrg>
--                <PricingDate>2014-01-09</PricingDate>
--                <ShippingCharge>45.850</ShippingCharge>
--                <TotalTaxAmount>0.000</TotalTaxAmount>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
--                    <WeightCharge>42.060</WeightCharge>
--                    <TotalAmount>45.850</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
--                    <WeightCharge>42.060</WeightCharge>
--                    <TotalAmount>45.850</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
--                    <WeightCharge>42.060</WeightCharge>
--                    <TotalAmount>45.850</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--            </QtdShp>
--            <QtdShp>
--                <GlobalProductCode>Q</GlobalProductCode>
--                <LocalProductCode>Q</LocalProductCode>
--                <ProductShortName>MEDICAL EXPRESS</ProductShortName>
--                <LocalProductName>MEDICAL EXPRESS</LocalProductName>
--                <NetworkTypeCode>TD</NetworkTypeCode>
--                <POfferedCustAgreement>Y</POfferedCustAgreement>
--                <TransInd>N</TransInd>
--                <PickupDate>2014-01-09</PickupDate>
--                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
--                <BookingTime>PT15H15M</BookingTime>
--                <CurrencyCode>USD</CurrencyCode>
--                <ExchangeRate>1.000000</ExchangeRate>
--                <WeightCharge>32.350</WeightCharge>
--                <WeightChargeTax>0.000</WeightChargeTax>
--                <TotalTransitDays>2</TotalTransitDays>
--                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
--                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
--                <PickupNonDHLCourierCode />
--                <DeliveryNonDHLCourierCode />
--                <DeliveryDate>2014-01-13</DeliveryDate>
--                <DeliveryTime>PT9H</DeliveryTime>
--                <DimensionalWeight>2.205</DimensionalWeight>
--                <WeightUnit>LB</WeightUnit>
--                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
--                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
--                <QtdShpExChrg>
--                    <SpecialServiceType>FF</SpecialServiceType>
--                    <LocalServiceType>FF</LocalServiceType>
--                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
--                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
--                    <ChargeCodeType>SCH</ChargeCodeType>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <ChargeValue>2.910</ChargeValue>
--                    <QtdSExtrChrgInAdCur>
--                        <ChargeValue>2.910</ChargeValue>
--                        <CurrencyCode>USD</CurrencyCode>
--                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
--                    </QtdSExtrChrgInAdCur>
--                    <QtdSExtrChrgInAdCur>
--                        <ChargeValue>2.910</ChargeValue>
--                        <CurrencyCode>USD</CurrencyCode>
--                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
--                    </QtdSExtrChrgInAdCur>
--                    <QtdSExtrChrgInAdCur>
--                        <ChargeValue>2.910</ChargeValue>
--                        <CurrencyCode>USD</CurrencyCode>
--                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
--                    </QtdSExtrChrgInAdCur>
--                </QtdShpExChrg>
--                <PricingDate>2014-01-09</PricingDate>
--                <ShippingCharge>35.260</ShippingCharge>
--                <TotalTaxAmount>0.000</TotalTaxAmount>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
--                    <WeightCharge>32.350</WeightCharge>
--                    <TotalAmount>35.260</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
--                    <WeightCharge>32.350</WeightCharge>
--                    <TotalAmount>35.260</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
--                    <WeightCharge>32.350</WeightCharge>
--                    <TotalAmount>35.260</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--            </QtdShp>
--            <QtdShp>
--                <GlobalProductCode>Y</GlobalProductCode>
--                <LocalProductCode>Y</LocalProductCode>
--                <ProductShortName>EXPRESS 12:00</ProductShortName>
--                <LocalProductName>EXPRESS 12:00 NONDOC</LocalProductName>
--                <NetworkTypeCode>TD</NetworkTypeCode>
--                <POfferedCustAgreement>N</POfferedCustAgreement>
--                <TransInd>Y</TransInd>
--                <PickupDate>2014-01-09</PickupDate>
--                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
--                <BookingTime>PT15H15M</BookingTime>
--                <CurrencyCode>USD</CurrencyCode>
--                <ExchangeRate>1.000000</ExchangeRate>
--                <WeightCharge>34.290</WeightCharge>
--                <WeightChargeTax>0.000</WeightChargeTax>
--                <TotalTransitDays>2</TotalTransitDays>
--                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
--                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
--                <PickupNonDHLCourierCode />
--                <DeliveryNonDHLCourierCode />
--                <DeliveryDate>2014-01-13</DeliveryDate>
--                <DeliveryTime>PT12H</DeliveryTime>
--                <DimensionalWeight>2.205</DimensionalWeight>
--                <WeightUnit>LB</WeightUnit>
--                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
--                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
--                <QtdShpExChrg>
--                    <SpecialServiceType>FF</SpecialServiceType>
--                    <LocalServiceType>FF</LocalServiceType>
--                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
--                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
--                    <ChargeCodeType>SCH</ChargeCodeType>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <ChargeValue>3.090</ChargeValue>
--                    <QtdSExtrChrgInAdCur>
--                        <ChargeValue>3.090</ChargeValue>
--                        <CurrencyCode>USD</CurrencyCode>
--                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
--                    </QtdSExtrChrgInAdCur>
--                    <QtdSExtrChrgInAdCur>
--                        <ChargeValue>3.090</ChargeValue>
--                        <CurrencyCode>USD</CurrencyCode>
--                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
--                    </QtdSExtrChrgInAdCur>
--                    <QtdSExtrChrgInAdCur>
--                        <ChargeValue>3.090</ChargeValue>
--                        <CurrencyCode>USD</CurrencyCode>
--                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
--                    </QtdSExtrChrgInAdCur>
--                </QtdShpExChrg>
--                <PricingDate>2014-01-09</PricingDate>
--                <ShippingCharge>37.380</ShippingCharge>
--                <TotalTaxAmount>0.000</TotalTaxAmount>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
--                    <WeightCharge>34.290</WeightCharge>
--                    <TotalAmount>37.380</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
--                    <WeightCharge>34.290</WeightCharge>
--                    <TotalAmount>37.380</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
--                    <WeightCharge>34.290</WeightCharge>
--                    <TotalAmount>37.380</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--            </QtdShp>
--            <QtdShp>
--                <GlobalProductCode>3</GlobalProductCode>
--                <LocalProductCode>3</LocalProductCode>
--                <ProductShortName>B2C</ProductShortName>
--                <LocalProductName>EXPRESS WORLDWIDE (B2C)</LocalProductName>
--                <NetworkTypeCode>TD</NetworkTypeCode>
--                <POfferedCustAgreement>Y</POfferedCustAgreement>
--                <TransInd>N</TransInd>
--                <PickupDate>2014-01-09</PickupDate>
--                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
--                <BookingTime>PT15H15M</BookingTime>
--                <ExchangeRate>1.000000</ExchangeRate>
--                <WeightCharge>0</WeightCharge>
--                <WeightChargeTax>0.000</WeightChargeTax>
--                <TotalTransitDays>2</TotalTransitDays>
--                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
--                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
--                <PickupNonDHLCourierCode />
--                <DeliveryNonDHLCourierCode />
--                <DeliveryDate>2014-01-13</DeliveryDate>
--                <DeliveryTime>PT23H59M</DeliveryTime>
--                <DimensionalWeight>2.205</DimensionalWeight>
--                <WeightUnit>LB</WeightUnit>
--                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
--                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
--                <PricingDate>2014-01-09</PricingDate>
--                <ShippingCharge>0.000</ShippingCharge>
--                <TotalTaxAmount>0.000</TotalTaxAmount>
--                <QtdSInAdCur>
--                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
--                    <WeightCharge>0</WeightCharge>
--                    <TotalAmount>0.000</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
--                    <WeightCharge>0</WeightCharge>
--                    <TotalAmount>0.000</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
--                    <WeightCharge>0</WeightCharge>
--                    <TotalAmount>0.000</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--            </QtdShp>
--            <QtdShp>
--                <GlobalProductCode>P</GlobalProductCode>
--                <LocalProductCode>P</LocalProductCode>
--                <ProductShortName>EXPRESS WORLDWIDE</ProductShortName>
--                <LocalProductName>EXPRESS WORLDWIDE NONDOC</LocalProductName>
--                <NetworkTypeCode>TD</NetworkTypeCode>
--                <POfferedCustAgreement>N</POfferedCustAgreement>
--                <TransInd>Y</TransInd>
--                <PickupDate>2014-01-09</PickupDate>
--                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
--                <BookingTime>PT15H15M</BookingTime>
--                <CurrencyCode>USD</CurrencyCode>
--                <ExchangeRate>1.000000</ExchangeRate>
--                <WeightCharge>32.350</WeightCharge>
--                <WeightChargeTax>0.000</WeightChargeTax>
--                <TotalTransitDays>2</TotalTransitDays>
--                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
--                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
--                <PickupNonDHLCourierCode />
--                <DeliveryNonDHLCourierCode />
--                <DeliveryDate>2014-01-13</DeliveryDate>
--                <DeliveryTime>PT23H59M</DeliveryTime>
--                <DimensionalWeight>2.205</DimensionalWeight>
--                <WeightUnit>LB</WeightUnit>
--                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
--                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
--                <QtdShpExChrg>
--                    <SpecialServiceType>FF</SpecialServiceType>
--                    <LocalServiceType>FF</LocalServiceType>
--                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
--                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
--                    <ChargeCodeType>SCH</ChargeCodeType>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <ChargeValue>2.910</ChargeValue>
--                    <QtdSExtrChrgInAdCur>
--                        <ChargeValue>2.910</ChargeValue>
--                        <CurrencyCode>USD</CurrencyCode>
--                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
--                    </QtdSExtrChrgInAdCur>
--                    <QtdSExtrChrgInAdCur>
--                        <ChargeValue>2.910</ChargeValue>
--                        <CurrencyCode>USD</CurrencyCode>
--                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
--                    </QtdSExtrChrgInAdCur>
--                    <QtdSExtrChrgInAdCur>
--                        <ChargeValue>2.910</ChargeValue>
--                        <CurrencyCode>USD</CurrencyCode>
--                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
--                    </QtdSExtrChrgInAdCur>
--                </QtdShpExChrg>
--                <PricingDate>2014-01-09</PricingDate>
--                <ShippingCharge>35.260</ShippingCharge>
--                <TotalTaxAmount>0.000</TotalTaxAmount>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
--                    <WeightCharge>32.350</WeightCharge>
--                    <TotalAmount>35.260</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
--                    <WeightCharge>32.350</WeightCharge>
--                    <TotalAmount>35.260</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--                <QtdSInAdCur>
--                    <CurrencyCode>USD</CurrencyCode>
--                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
--                    <WeightCharge>32.350</WeightCharge>
--                    <TotalAmount>35.260</TotalAmount>
--                    <TotalTaxAmount>0.000</TotalTaxAmount>
--                    <WeightChargeTax>0.000</WeightChargeTax>
--                </QtdSInAdCur>
--            </QtdShp>
--        </BkgDetails>
--        <Srvs>
--            <Srv>
--                <GlobalProductCode>E</GlobalProductCode>
--                <MrkSrv>
--                    <LocalProductCode>E</LocalProductCode>
--                    <ProductShortName>EXPRESS 9:00</ProductShortName>
--                    <LocalProductName>EXPRESS 9:00 NONDOC</LocalProductName>
--                    <NetworkTypeCode>TD</NetworkTypeCode>
--                    <POfferedCustAgreement>N</POfferedCustAgreement>
--                    <TransInd>Y</TransInd>
--                </MrkSrv>
--                <MrkSrv>
--                    <LocalServiceType>FF</LocalServiceType>
--                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
--                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
--                    <ChargeCodeType>SCH</ChargeCodeType>
--                    <MrkSrvInd>N</MrkSrvInd>
--                </MrkSrv>
--            </Srv>
--            <Srv>
--                <GlobalProductCode>Q</GlobalProductCode>
--                <MrkSrv>
--                    <LocalProductCode>Q</LocalProductCode>
--                    <ProductShortName>MEDICAL EXPRESS</ProductShortName>
--                    <LocalProductName>MEDICAL EXPRESS</LocalProductName>
--                    <NetworkTypeCode>TD</NetworkTypeCode>
--                    <POfferedCustAgreement>Y</POfferedCustAgreement>
--                    <TransInd>N</TransInd>
--                </MrkSrv>
--                <MrkSrv>
--                    <LocalServiceType>FF</LocalServiceType>
--                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
--                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
--                    <ChargeCodeType>SCH</ChargeCodeType>
--                    <MrkSrvInd>N</MrkSrvInd>
--                </MrkSrv>
--            </Srv>
--            <Srv>
--                <GlobalProductCode>Y</GlobalProductCode>
--                <MrkSrv>
--                    <LocalProductCode>Y</LocalProductCode>
--                    <ProductShortName>EXPRESS 12:00</ProductShortName>
--                    <LocalProductName>EXPRESS 12:00 NONDOC</LocalProductName>
--                    <NetworkTypeCode>TD</NetworkTypeCode>
--                    <POfferedCustAgreement>N</POfferedCustAgreement>
--                    <TransInd>Y</TransInd>
--                </MrkSrv>
--                <MrkSrv>
--                    <LocalServiceType>FF</LocalServiceType>
--                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
--                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
--                    <ChargeCodeType>SCH</ChargeCodeType>
--                    <MrkSrvInd>N</MrkSrvInd>
--                </MrkSrv>
--            </Srv>
--            <Srv>
--                <GlobalProductCode>3</GlobalProductCode>
--                <MrkSrv>
--                    <LocalProductCode>3</LocalProductCode>
--                    <ProductShortName>B2C</ProductShortName>
--                    <LocalProductName>EXPRESS WORLDWIDE (B2C)</LocalProductName>
--                    <NetworkTypeCode>TD</NetworkTypeCode>
--                    <POfferedCustAgreement>Y</POfferedCustAgreement>
--                    <TransInd>N</TransInd>
--                </MrkSrv>
--            </Srv>
--            <Srv>
--                <GlobalProductCode>P</GlobalProductCode>
--                <MrkSrv>
--                    <LocalProductCode>P</LocalProductCode>
--                    <ProductShortName>EXPRESS WORLDWIDE</ProductShortName>
--                    <LocalProductName>EXPRESS WORLDWIDE NONDOC</LocalProductName>
--                    <NetworkTypeCode>TD</NetworkTypeCode>
--                    <POfferedCustAgreement>N</POfferedCustAgreement>
--                    <TransInd>Y</TransInd>
--                </MrkSrv>
--                <MrkSrv>
--                    <LocalServiceType>FF</LocalServiceType>
--                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
--                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
--                    <ChargeCodeType>SCH</ChargeCodeType>
--                    <MrkSrvInd>N</MrkSrvInd>
--                </MrkSrv>
--            </Srv>
--        </Srvs>
--    </GetQuoteResponse>
--</res:DCTResponse>
-diff --git a/app/code/Magento/Dhl/etc/adminhtml/system.xml b/app/code/Magento/Dhl/etc/adminhtml/system.xml
-index c0f7e209ad6..7ab37de2f36 100644
---- a/app/code/Magento/Dhl/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Dhl/etc/adminhtml/system.xml
-@@ -31,8 +31,9 @@
-                 <field id="account" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Account Number</label>
-                 </field>
--                <field id="content_type" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
--                    <label>Content Type</label>
-+                <field id="content_type" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                    <label>Content Type (Non Domestic)</label>
-+                    <comment>Whether to use Documents or NonDocuments service for non domestic shipments. (Shipments within the EU are classed as domestic)</comment>
-                     <source_model>Magento\Dhl\Model\Source\Contenttype</source_model>
-                 </field>
-                 <field id="handling_type" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-@@ -81,20 +82,14 @@
-                     </depends>
-                 </field>
-                 <field id="doc_methods" translate="label" type="multiselect" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
--                    <label>Allowed Methods</label>
-+                    <label>Documents Allowed Methods</label>
-                     <source_model>Magento\Dhl\Model\Source\Method\Doc</source_model>
--                    <depends>
--                        <field id="content_type">D</field>
--                    </depends>
-                 </field>
-                 <field id="nondoc_methods" translate="label" type="multiselect" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
--                    <label>Allowed Methods</label>
-+                    <label>Non Documents Allowed Methods</label>
-                     <source_model>Magento\Dhl\Model\Source\Method\Nondoc</source_model>
--                    <depends>
--                        <field id="content_type">N</field>
--                    </depends>
-                 </field>
--                <field id="ready_time" type="text" sortOrder="180" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                <field id="ready_time" translate="label comment" type="text" sortOrder="180" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Ready time</label>
-                     <comment>Package ready time after order submission (in hours)</comment>
-                 </field>
-diff --git a/app/code/Magento/Dhl/etc/countries.xml b/app/code/Magento/Dhl/etc/countries.xml
-index 48837dbefb5..792465ce459 100644
---- a/app/code/Magento/Dhl/etc/countries.xml
-+++ b/app/code/Magento/Dhl/etc/countries.xml
-@@ -83,7 +83,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Austria</name>
-         <domestic>1</domestic>
-     </AT>
-@@ -132,7 +132,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Belgium</name>
-         <domestic>1</domestic>
-     </BE>
-@@ -146,7 +146,7 @@
-         <currency>BGN</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Bulgaria</name>
-         <domestic>1</domestic>
-     </BG>
-@@ -257,7 +257,7 @@
-         <currency>CHF</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Switzerland</name>
-     </CH>
-     <CI>
-@@ -331,7 +331,7 @@
-         <currency>CZK</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Czech Republic, The</name>
-         <domestic>1</domestic>
-     </CZ>
-@@ -339,7 +339,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Germany</name>
-         <domestic>1</domestic>
-     </DE>
-@@ -353,7 +353,7 @@
-         <currency>DKK</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Denmark</name>
-         <domestic>1</domestic>
-     </DK>
-@@ -389,7 +389,7 @@
-         <currency>EEK</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Estonia</name>
-         <domestic>1</domestic>
-     </EE>
-@@ -410,7 +410,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Spain</name>
-         <domestic>1</domestic>
-     </ES>
-@@ -424,7 +424,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Finland</name>
-         <domestic>1</domestic>
-     </FI>
-@@ -457,7 +457,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>France</name>
-         <domestic>1</domestic>
-     </FR>
-@@ -471,7 +471,7 @@
-         <currency>GBP</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>United Kingdom</name>
-         <domestic>1</domestic>
-     </GB>
-@@ -549,7 +549,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Greece</name>
-         <domestic>1</domestic>
-     </GR>
-@@ -612,7 +612,7 @@
-         <currency>HUF</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Hungary</name>
-         <domestic>1</domestic>
-     </HU>
-@@ -633,7 +633,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Ireland, Republic Of</name>
-         <domestic>1</domestic>
-     </IE>
-@@ -668,14 +668,14 @@
-         <currency>ISK</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Iceland</name>
-     </IS>
-     <IT>
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Italy</name>
-         <domestic>1</domestic>
-     </IT>
-@@ -834,7 +834,7 @@
-         <currency>LTL</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Lithuania</name>
-         <domestic>1</domestic>
-     </LT>
-@@ -842,7 +842,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Luxembourg</name>
-         <domestic>1</domestic>
-     </LU>
-@@ -850,7 +850,7 @@
-         <currency>LVL</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Latvia</name>
-         <domestic>1</domestic>
-     </LV>
-@@ -1039,7 +1039,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Netherlands, The</name>
-         <domestic>1</domestic>
-     </NL>
-@@ -1047,7 +1047,7 @@
-         <currency>NOK</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Norway</name>
-     </NO>
-     <NP>
-@@ -1127,7 +1127,7 @@
-         <currency>PLN</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Poland</name>
-         <domestic>1</domestic>
-     </PL>
-@@ -1142,7 +1142,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Portugal</name>
-         <domestic>1</domestic>
-     </PT>
-@@ -1177,7 +1177,7 @@
-         <currency>RON</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Romania</name>
-         <domestic>1</domestic>
-     </RO>
-@@ -1231,7 +1231,7 @@
-         <currency>SEK</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Sweden</name>
-         <domestic>1</domestic>
-     </SE>
-@@ -1246,7 +1246,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Slovenia</name>
-         <domestic>1</domestic>
-     </SI>
-@@ -1254,7 +1254,7 @@
-         <currency>EUR</currency>
-         <weight_unit>KG</weight_unit>
-         <measure_unit>CM</measure_unit>
--        <region>EA</region>
-+        <region>EU</region>
-         <name>Slovakia</name>
-         <domestic>1</domestic>
-     </SK>
-diff --git a/app/code/Magento/Dhl/i18n/en_US.csv b/app/code/Magento/Dhl/i18n/en_US.csv
-index a5532c2cea9..0e4c7a8385b 100644
---- a/app/code/Magento/Dhl/i18n/en_US.csv
-+++ b/app/code/Magento/Dhl/i18n/en_US.csv
-@@ -61,6 +61,7 @@ Title,Title
- Password,Password
- "Account Number","Account Number"
- "Content Type","Content Type"
-+"Whether to use Documents or NonDocuments service for non domestic shipments. (Shipments within the EU are classed as domestic)","Whether to use Documents or NonDocuments service for non domestic shipments. (Shipments within the EU are classed as domestic)"
- "Calculate Handling Fee","Calculate Handling Fee"
- "Handling Applied","Handling Applied"
- """Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package.","""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package."
-diff --git a/app/code/Magento/Directory/Block/Data.php b/app/code/Magento/Directory/Block/Data.php
-index ca2b4b95b55..66c962d6656 100644
---- a/app/code/Magento/Directory/Block/Data.php
-+++ b/app/code/Magento/Directory/Block/Data.php
-@@ -3,9 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Directory\Block;
- 
- /**
-+ * Directory data block
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Data extends \Magento\Framework\View\Element\Template
-@@ -67,14 +71,18 @@ class Data extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Returns load url for regions
-+     *
-      * @return string
-      */
-     public function getLoadrRegionUrl()
-     {
--        return $this->getUrl('directory/json/childRegion');
-+        return $this->getUrl('directory/json/countryRegion');
-     }
- 
-     /**
-+     * Returns country collection instance
-+     *
-      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
-      */
-     public function getCountryCollection()
-@@ -103,6 +111,8 @@ class Data extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Returns country html select
-+     *
-      * @param null|string $defValue
-      * @param string $name
-      * @param string $id
-@@ -146,6 +156,8 @@ class Data extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Returns region collection
-+     *
-      * @return \Magento\Directory\Model\ResourceModel\Region\Collection
-      */
-     public function getRegionCollection()
-@@ -160,11 +172,36 @@ class Data extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Returns region html select
-+     *
-      * @return string
-+     * @deprecated
-+     * @see getRegionSelect() method for more configurations
-      */
-     public function getRegionHtmlSelect()
-     {
-+        return $this->getRegionSelect();
-+    }
-+
-+    /**
-+     * Returns region html select
-+     *
-+     * @param null|int $value
-+     * @param string $name
-+     * @param string $id
-+     * @param string $title
-+     * @return string
-+     */
-+    public function getRegionSelect(
-+        ?int $value = null,
-+        string $name = 'region',
-+        string $id = 'state',
-+        string $title = 'State/Province'
-+    ): string {
-         \Magento\Framework\Profiler::start('TEST: ' . __METHOD__, ['group' => 'TEST', 'method' => __METHOD__]);
-+        if ($value === null) {
-+            $value = (int)$this->getRegionId();
-+        }
-         $cacheKey = 'DIRECTORY_REGION_SELECT_STORE' . $this->_storeManager->getStore()->getId();
-         $cache = $this->_configCacheType->load($cacheKey);
-         if ($cache) {
-@@ -176,15 +213,15 @@ class Data extends \Magento\Framework\View\Element\Template
-         $html = $this->getLayout()->createBlock(
-             \Magento\Framework\View\Element\Html\Select::class
-         )->setName(
--            'region'
-+            $name
-         )->setTitle(
--            __('State/Province')
-+            __($title)
-         )->setId(
--            'state'
-+            $id
-         )->setClass(
-             'required-entry validate-state'
-         )->setValue(
--            intval($this->getRegionId())
-+            $value
-         )->setOptions(
-             $options
-         )->getHtml();
-@@ -193,6 +230,8 @@ class Data extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Returns country id
-+     *
-      * @return string
-      */
-     public function getCountryId()
-@@ -205,6 +244,8 @@ class Data extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Returns regions js
-+     *
-      * @return string
-      */
-     public function getRegionsJs()
-diff --git a/app/code/Magento/Directory/Helper/Data.php b/app/code/Magento/Directory/Helper/Data.php
-index 99e1d1ad539..3a5558e6d6f 100644
---- a/app/code/Magento/Directory/Helper/Data.php
-+++ b/app/code/Magento/Directory/Helper/Data.php
-@@ -6,7 +6,15 @@
- 
- namespace Magento\Directory\Helper;
- 
-+use Magento\Directory\Model\Currency;
-+use Magento\Directory\Model\CurrencyFactory;
-+use Magento\Directory\Model\ResourceModel\Country\Collection;
-+use Magento\Directory\Model\ResourceModel\Region\CollectionFactory;
-+use Magento\Framework\App\Cache\Type\Config;
-+use Magento\Framework\App\Helper\Context;
-+use Magento\Framework\Json\Helper\Data as JsonData;
- use Magento\Store\Model\ScopeInterface;
-+use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * Directory data helper
-@@ -53,7 +61,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     /**
-      * Country collection
-      *
--     * @var \Magento\Directory\Model\ResourceModel\Country\Collection
-+     * @var Collection
-      */
-     protected $_countryCollection;
- 
-@@ -86,47 +94,49 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     protected $_optZipCountries = null;
- 
-     /**
--     * @var \Magento\Framework\App\Cache\Type\Config
-+     * @var Config
-      */
-     protected $_configCacheType;
- 
-     /**
--     * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
-+     * @var CollectionFactory
-      */
-     protected $_regCollectionFactory;
- 
-     /**
--     * @var \Magento\Framework\Json\Helper\Data
-+     * @var JsonData
-      */
-     protected $jsonHelper;
- 
-     /**
--     * @var \Magento\Store\Model\StoreManagerInterface
-+     * @var StoreManagerInterface
-      */
-     protected $_storeManager;
- 
-     /**
--     * @var \Magento\Directory\Model\CurrencyFactory
-+     * @var CurrencyFactory
-      */
-     protected $_currencyFactory;
- 
-     /**
--     * @param \Magento\Framework\App\Helper\Context $context
--     * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
--     * @param \Magento\Directory\Model\ResourceModel\Country\Collection $countryCollection
--     * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regCollectionFactory,
--     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-+     * Data constructor.
-+     *
-+     * @param Context $context
-+     * @param Config $configCacheType
-+     * @param Collection $countryCollection
-+     * @param CollectionFactory $regCollectionFactory
-+     * @param JsonData $jsonHelper
-+     * @param StoreManagerInterface $storeManager
-+     * @param CurrencyFactory $currencyFactory
-      */
-     public function __construct(
--        \Magento\Framework\App\Helper\Context $context,
--        \Magento\Framework\App\Cache\Type\Config $configCacheType,
--        \Magento\Directory\Model\ResourceModel\Country\Collection $countryCollection,
--        \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regCollectionFactory,
--        \Magento\Framework\Json\Helper\Data $jsonHelper,
--        \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Directory\Model\CurrencyFactory $currencyFactory
-+        Context $context,
-+        Config $configCacheType,
-+        Collection $countryCollection,
-+        CollectionFactory $regCollectionFactory,
-+        JsonData $jsonHelper,
-+        StoreManagerInterface $storeManager,
-+        CurrencyFactory $currencyFactory
-     ) {
-         parent::__construct($context);
-         $this->_configCacheType = $configCacheType;
-@@ -155,7 +165,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      * Retrieve country collection
-      *
-      * @param null|int|string|\Magento\Store\Model\Store $store
--     * @return \Magento\Directory\Model\ResourceModel\Country\Collection
-+     * @return Collection
-      */
-     public function getCountryCollection($store = null)
-     {
-@@ -169,6 +179,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      * Retrieve regions data json
-      *
-      * @return string
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getRegionJson()
-     {
-@@ -197,8 +208,10 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      * @param float $amount
-      * @param string $from
-      * @param string $to
-+     *
-      * @return float
-      * @SuppressWarnings(PHPMD.ShortVariable)
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function currencyConvert($amount, $from, $to = null)
-     {
-@@ -251,7 +264,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      * Returns the list of countries, for which region is required
-      *
-      * @param boolean $asJson
--     * @return array
-+     * @return array|string
-      */
-     public function getCountriesWithStatesRequired($asJson = false)
-     {
-@@ -275,7 +288,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     public function isShowNonRequiredState()
-     {
--        return (bool)$this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_DISPLAY_ALL_STATES,
-             ScopeInterface::SCOPE_STORE
-         );
-@@ -303,7 +316,10 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     public function getBaseCurrencyCode()
-     {
--        return $this->scopeConfig->getValue(\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE, 'default');
-+        return $this->scopeConfig->getValue(
-+            Currency::XML_PATH_CURRENCY_BASE,
-+            'default'
-+        );
-     }
- 
-     /**
-diff --git a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
-index 4e2758b362a..c8c42b95204 100644
---- a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
-+++ b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Directory\Model\Config\Source;
- 
- /**
-@@ -14,10 +15,13 @@ namespace Magento\Directory\Model\Config\Source;
- class WeightUnit implements \Magento\Framework\Option\ArrayInterface
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function toOptionArray()
-     {
--        return [['value' => 'lbs', 'label' => __('lbs')], ['value' => 'kgs', 'label' => __('kgs')]];
-+        return [
-+            ['value' => 'lbs', 'label' => __('lbs')],
-+            ['value' => 'kgs', 'label' => __('kgs')]
-+        ];
-     }
- }
-diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
-index f39c33408f9..6a2ebb45315 100644
---- a/app/code/Magento/Directory/Model/Currency.php
-+++ b/app/code/Magento/Directory/Model/Currency.php
-@@ -225,7 +225,7 @@ class Currency extends \Magento\Framework\Model\AbstractModel
-         if ($toCurrency === null) {
-             return $price;
-         } elseif ($rate = $this->getRate($toCurrency)) {
--            return floatval($price) * floatval($rate);
-+            return (float)$price * (float)$rate;
-         }
- 
-         throw new \Exception(__(
-diff --git a/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php b/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php
-index 3e0bd536850..af49d6daaf3 100644
---- a/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php
-+++ b/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php
-@@ -5,15 +5,18 @@
-  */
- namespace Magento\Directory\Model\Currency\Import;
- 
-+use Magento\Store\Model\ScopeInterface;
-+
- /**
-  * Currency rate import model (From http://fixer.io/)
-  */
--class FixerIo extends \Magento\Directory\Model\Currency\Import\AbstractImport
-+class FixerIo extends AbstractImport
- {
-     /**
-      * @var string
-      */
--    const CURRENCY_CONVERTER_URL = 'http://api.fixer.io/latest?base={{CURRENCY_FROM}}&symbols={{CURRENCY_TO}}';
-+    const CURRENCY_CONVERTER_URL = 'http://data.fixer.io/api/latest?access_key={{ACCESS_KEY}}'
-+        . '&base={{CURRENCY_FROM}}&symbols={{CURRENCY_TO}}';
- 
-     /**
-      * Http Client Factory
-@@ -47,7 +50,7 @@ class FixerIo extends \Magento\Directory\Model\Currency\Import\AbstractImport
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function fetchRates()
-     {
-@@ -65,6 +68,13 @@ class FixerIo extends \Magento\Directory\Model\Currency\Import\AbstractImport
-         return $data;
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _convert($currencyFrom, $currencyTo)
-+    {
-+    }
-+
-     /**
-      * Return currencies convert rates in batch mode
-      *
-@@ -73,11 +83,21 @@ class FixerIo extends \Magento\Directory\Model\Currency\Import\AbstractImport
-      * @param array $currenciesTo
-      * @return array
-      */
--    private function convertBatch($data, $currencyFrom, $currenciesTo)
-+    private function convertBatch(array $data, string $currencyFrom, array $currenciesTo): array
-     {
-+        $accessKey = $this->scopeConfig->getValue('currency/fixerio/api_key', ScopeInterface::SCOPE_STORE);
-+        if (empty($accessKey)) {
-+            $this->_messages[] = __('No API Key was specified or an invalid API Key was specified.');
-+            $data[$currencyFrom] = $this->makeEmptyResponse($currenciesTo);
-+            return $data;
-+        }
-+
-         $currenciesStr = implode(',', $currenciesTo);
--        $url = str_replace('{{CURRENCY_FROM}}', $currencyFrom, self::CURRENCY_CONVERTER_URL);
--        $url = str_replace('{{CURRENCY_TO}}', $currenciesStr, $url);
-+        $url = str_replace(
-+            ['{{ACCESS_KEY}}', '{{CURRENCY_FROM}}', '{{CURRENCY_TO}}'],
-+            [$accessKey, $currencyFrom, $currenciesStr],
-+            self::CURRENCY_CONVERTER_URL
-+        );
- 
-         set_time_limit(0);
-         try {
-@@ -86,6 +106,11 @@ class FixerIo extends \Magento\Directory\Model\Currency\Import\AbstractImport
-             ini_restore('max_execution_time');
-         }
- 
-+        if (!$this->validateResponse($response, $currencyFrom)) {
-+            $data[$currencyFrom] = $this->makeEmptyResponse($currenciesTo);
-+            return $data;
-+        }
-+
-         foreach ($currenciesTo as $currencyTo) {
-             if ($currencyFrom == $currencyTo) {
-                 $data[$currencyFrom][$currencyTo] = $this->_numberFormat(1);
-@@ -110,25 +135,24 @@ class FixerIo extends \Magento\Directory\Model\Currency\Import\AbstractImport
-      * @param int $retry
-      * @return array
-      */
--    private function getServiceResponse($url, $retry = 0)
-+    private function getServiceResponse(string $url, int $retry = 0): array
-     {
-         /** @var \Magento\Framework\HTTP\ZendClient $httpClient */
-         $httpClient = $this->httpClientFactory->create();
-         $response = [];
- 
-         try {
--            $jsonResponse = $httpClient->setUri(
--                $url
--            )->setConfig(
--                [
--                    'timeout' => $this->scopeConfig->getValue(
--                        'currency/fixerio/timeout',
--                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--                    ),
--                ]
--            )->request(
--                'GET'
--            )->getBody();
-+            $jsonResponse = $httpClient->setUri($url)
-+                ->setConfig(
-+                    [
-+                        'timeout' => $this->scopeConfig->getValue(
-+                            'currency/fixerio/timeout',
-+                            ScopeInterface::SCOPE_STORE
-+                        ),
-+                    ]
-+                )
-+                ->request('GET')
-+                ->getBody();
- 
-             $response = json_decode($jsonResponse, true);
-         } catch (\Exception $e) {
-@@ -140,9 +164,38 @@ class FixerIo extends \Magento\Directory\Model\Currency\Import\AbstractImport
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Validates rates response.
-+     *
-+     * @param array $response
-+     * @param string $baseCurrency
-+     * @return bool
-      */
--    protected function _convert($currencyFrom, $currencyTo)
-+    private function validateResponse(array $response, string $baseCurrency): bool
-+    {
-+        if ($response['success']) {
-+            return true;
-+        }
-+
-+        $errorCodes = [
-+            101 => __('No API Key was specified or an invalid API Key was specified.'),
-+            102 => __('The account this API request is coming from is inactive.'),
-+            105 => __('The "%1" is not allowed as base currency for your subscription plan.', $baseCurrency),
-+            201 => __('An invalid base currency has been entered.'),
-+        ];
-+
-+        $this->_messages[] = $errorCodes[$response['error']['code']] ?? __('Currency rates can\'t be retrieved.');
-+
-+        return false;
-+    }
-+
-+    /**
-+     * Creates array for provided currencies with empty rates.
-+     *
-+     * @param array $currenciesTo
-+     * @return array
-+     */
-+    private function makeEmptyResponse(array $currenciesTo): array
-     {
-+        return array_fill_keys($currenciesTo, null);
-     }
- }
-diff --git a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
-deleted file mode 100644
-index fa3c3a9018d..00000000000
---- a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
-+++ /dev/null
-@@ -1,92 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Directory\Model\Currency\Import;
--
--/**
-- * Currency rate import model (From www.webservicex.net)
-- */
--class Webservicex extends \Magento\Directory\Model\Currency\Import\AbstractImport
--{
--    /**
--     * Currency converter url
--     */
--    const CURRENCY_CONVERTER_URL = 'http://www.webservicex.net/CurrencyConvertor.asmx/ConversionRate'
--        . '?FromCurrency={{CURRENCY_FROM}}&ToCurrency={{CURRENCY_TO}}';
--
--    /**
--     * Http Client Factory
--     *
--     * @var \Magento\Framework\HTTP\ZendClientFactory
--     */
--    protected $httpClientFactory;
--
--    /**
--     * Core scope config
--     *
--     * @var \Magento\Framework\App\Config\ScopeConfigInterface
--     */
--    private $scopeConfig;
--
--    /**
--     * Constructor
--     *
--     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
--     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
--     * @param \Magento\Framework\HTTP\ZendClientFactory|null $zendClientFactory
--     */
--    public function __construct(
--        \Magento\Directory\Model\CurrencyFactory $currencyFactory,
--        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
--        \Magento\Framework\HTTP\ZendClientFactory $zendClientFactory = null
--    ) {
--        parent::__construct($currencyFactory);
--        $this->scopeConfig = $scopeConfig;
--        $this->httpClientFactory = $zendClientFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
--            ->get(\Magento\Framework\HTTP\ZendClientFactory::class);
--    }
--
--    /**
--     * @param string $currencyFrom
--     * @param string $currencyTo
--     * @param int $retry
--     * @return float|null
--     */
--    protected function _convert($currencyFrom, $currencyTo, $retry = 0)
--    {
--        $url = str_replace('{{CURRENCY_FROM}}', $currencyFrom, self::CURRENCY_CONVERTER_URL);
--        $url = str_replace('{{CURRENCY_TO}}', $currencyTo, $url);
--        /** @var \Magento\Framework\HTTP\ZendClient $httpClient */
--        $httpClient = $this->httpClientFactory->create();
--
--        try {
--            $response = $httpClient->setUri(
--                $url
--            )->setConfig(
--                [
--                    'timeout' => $this->scopeConfig->getValue(
--                        'currency/webservicex/timeout',
--                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--                    ),
--                ]
--            )->request(
--                'GET'
--            )->getBody();
--
--            $xml = simplexml_load_string($response, null, LIBXML_NOERROR);
--            if (!$xml || (isset($xml[0]) && $xml[0] == -1)) {
--                $this->_messages[] = __('We can\'t retrieve a rate from %1.', $url);
--                return null;
--            }
--            return (double)$xml;
--        } catch (\Exception $e) {
--            if ($retry == 0) {
--                $this->_convert($currencyFrom, $currencyTo, 1);
--            } else {
--                $this->_messages[] = __('We can\'t retrieve a rate from %1.', $url);
--            }
--        }
--    }
--}
-diff --git a/app/code/Magento/Directory/Model/Currency/Import/YahooFinance.php b/app/code/Magento/Directory/Model/Currency/Import/YahooFinance.php
-deleted file mode 100644
-index 5f96b8627af..00000000000
---- a/app/code/Magento/Directory/Model/Currency/Import/YahooFinance.php
-+++ /dev/null
-@@ -1,177 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Directory\Model\Currency\Import;
--
--/**
-- * Currency rate import model (From http://query.yahooapis.com/)
-- */
--class YahooFinance extends \Magento\Directory\Model\Currency\Import\AbstractImport
--{
--    // @codingStandardsIgnoreStart
--
--    // @codingStandardsIgnoreStart
--    private $currencyConverterUrl = 'http://query.yahooapis.com/v1/public/yql?format=json&q={{YQL_STRING}}&env=store://datatables.org/alltableswithkeys';
--    // @codingStandardsIgnoreEnd
--
--    // @codingStandardsIgnoreEnd
--    private $timeoutConfigPath = 'currency/yahoofinance/timeout';
--
--    /**
--     * Http Client Factory
--     *
--     * @var \Magento\Framework\HTTP\ZendClientFactory
--     */
--    protected $httpClientFactory;
--
--    /**
--     * Core scope config
--     *
--     * @var \Magento\Framework\App\Config\ScopeConfigInterface
--     */
--    private $scopeConfig;
--
--    /**
--     * Initialize dependencies
--     *
--     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
--     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
--     * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
--     */
--    public function __construct(
--        \Magento\Directory\Model\CurrencyFactory $currencyFactory,
--        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
--        \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
--    ) {
--        parent::__construct($currencyFactory);
--        $this->scopeConfig = $scopeConfig;
--        $this->httpClientFactory = $httpClientFactory;
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function fetchRates()
--    {
--        $data = [];
--        $currencies = $this->_getCurrencyCodes();
--        $defaultCurrencies = $this->_getDefaultCurrencyCodes();
--
--        foreach ($defaultCurrencies as $currencyFrom) {
--            if (!isset($data[$currencyFrom])) {
--                $data[$currencyFrom] = [];
--            }
--            $data = $this->convertBatch($data, $currencyFrom, $currencies);
--            ksort($data[$currencyFrom]);
--        }
--        return $data;
--    }
--
--    /**
--     * Return currencies convert rates in batch mode
--     *
--     * @param array $data
--     * @param string $currencyFrom
--     * @param array $currenciesTo
--     * @return array
--     */
--    private function convertBatch($data, $currencyFrom, $currenciesTo)
--    {
--        $url = $this->buildUrl($currencyFrom, $currenciesTo);
--        set_time_limit(0);
--        try {
--            $response = $this->getServiceResponse($url);
--        } finally {
--            ini_restore('max_execution_time');
--        }
--
--        foreach ($currenciesTo as $currencyTo) {
--            if ($currencyFrom == $currencyTo) {
--                $data[$currencyFrom][$currencyTo] = $this->_numberFormat(1);
--            } else {
--                if (empty($response[$currencyFrom . $currencyTo])) {
--                    $this->_messages[] = __('We can\'t retrieve a rate from %1 for %2.', $url, $currencyTo);
--                    $data[$currencyFrom][$currencyTo] = null;
--                } else {
--                    $data[$currencyFrom][$currencyTo] = $this->_numberFormat(
--                        (double)$response[$currencyFrom . $currencyTo]
--                    );
--                }
--            }
--        }
--        return $data;
--    }
--
--    /**
--     * Get Fixer.io service response
--     *
--     * @param string $url
--     * @param int $retry
--     * @return array
--     */
--    private function getServiceResponse($url, $retry = 0)
--    {
--        /** @var \Magento\Framework\HTTP\ZendClient $httpClient */
--        $httpClient = $this->httpClientFactory->create();
--        $response = [];
--        try {
--            $jsonResponse = $httpClient->setUri(
--                $url
--            )->setConfig(
--                [
--                    'timeout' => $this->scopeConfig->getValue(
--                        $this->timeoutConfigPath,
--                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--                    ),
--                ]
--            )->request(
--                'GET'
--            )->getBody();
--
--            $jsonResponse = json_decode($jsonResponse, true);
--            if (!empty($jsonResponse['query']['results']['rate'])) {
--                $response = array_column($jsonResponse['query']['results']['rate'], 'Rate', 'id');
--            }
--        } catch (\Exception $e) {
--            if ($retry == 0) {
--                $response = $this->getServiceResponse($url, 1);
--            }
--        }
--        return $response;
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    protected function _convert($currencyFrom, $currencyTo)
--    {
--    }
--
--    /**
--     * Build url for Currency Service
--     *
--     * @param string $currencyFrom
--     * @param string[] $currenciesTo
--     * @return string
--     */
--    private function buildUrl($currencyFrom, $currenciesTo)
--    {
--        $query = urlencode('select ') . '*' . urlencode(' from yahoo.finance.xchange where pair in (');
--        $query .=
--            urlencode(
--                implode(
--                    ',',
--                    array_map(
--                        function ($currencyTo) use ($currencyFrom) {
--                            return '"' . $currencyFrom . $currencyTo . '"';
--                        },
--                        $currenciesTo
--                    )
--                )
--            );
--        $query .= ')';
--        return str_replace('{{YQL_STRING}}', $query, $this->currencyConverterUrl);
--    }
--}
-diff --git a/app/code/Magento/Directory/Model/CurrencyConfig.php b/app/code/Magento/Directory/Model/CurrencyConfig.php
-index fdb561c2241..f7230df6e86 100644
---- a/app/code/Magento/Directory/Model/CurrencyConfig.php
-+++ b/app/code/Magento/Directory/Model/CurrencyConfig.php
-@@ -57,7 +57,7 @@ class CurrencyConfig
-      */
-     public function getConfigCurrencies(string $path)
-     {
--        $result = $this->appState->getAreaCode() === Area::AREA_ADMINHTML
-+        $result = in_array($this->appState->getAreaCode(), [Area::AREA_ADMINHTML, Area::AREA_CRONTAB])
-             ? $this->getConfigForAllStores($path)
-             : $this->getConfigForCurrentStore($path);
-         sort($result);
-diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
-index a211242d377..08d320abd8b 100644
---- a/app/code/Magento/Directory/Model/PriceCurrency.php
-+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
-@@ -46,7 +46,7 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function convert($amount, $scope = null, $currency = null)
-     {
-@@ -58,17 +58,15 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION)
-     {
--        $currentCurrency = $this->getCurrency($scope, $currency);
--        $convertedValue = $this->getStore($scope)->getBaseCurrency()->convert($amount, $currentCurrency);
--        return round($convertedValue, $precision);
-+        return $this->roundPrice($this->convert($amount, $scope, $currency), $precision);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function format(
-         $amount,
-@@ -82,7 +80,7 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function convertAndFormat(
-         $amount,
-@@ -97,7 +95,7 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCurrency($scope = null, $currency = null)
-     {
-@@ -118,6 +116,8 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
-     }
- 
-     /**
-+     * Get currrency symbol
-+     *
-      * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
-      * @param \Magento\Framework\Model\AbstractModel|string|null $currency
-      * @return string
-@@ -148,13 +148,22 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
-     }
- 
-     /**
--     * Round price
-+     * @inheritdoc
-+     */
-+    public function round($price)
-+    {
-+        return round($price, 2);
-+    }
-+
-+    /**
-+     * Round price with precision
-      *
-      * @param float $price
-+     * @param int $precision
-      * @return float
-      */
--    public function round($price)
-+    public function roundPrice($price, $precision = self::DEFAULT_PRECISION)
-     {
--        return round($price, 2);
-+        return round($price, $precision);
-     }
- }
-diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country.php b/app/code/Magento/Directory/Model/ResourceModel/Country.php
-index 59fb2de85c8..d248dd407a7 100644
---- a/app/code/Magento/Directory/Model/ResourceModel/Country.php
-+++ b/app/code/Magento/Directory/Model/ResourceModel/Country.php
-@@ -5,6 +5,10 @@
-  */
- namespace Magento\Directory\Model\ResourceModel;
- 
-+use Magento\Framework\Model\ResourceModel\Db\Context;
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\ObjectManager;
-+
- /**
-  * Country Resource Model
-  *
-@@ -13,6 +17,27 @@ namespace Magento\Directory\Model\ResourceModel;
-  */
- class Country extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- {
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-+    /**
-+     * @param Context $context
-+     * @param null|string $connectionName
-+     * @param Escaper|null $escaper
-+     */
-+    public function __construct(
-+        Context $context,
-+        ?string $connectionName = null,
-+        Escaper $escaper = null
-+    ) {
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-+        parent::__construct($context, $connectionName);
-+    }
-+
-     /**
-      * Resource initialization
-      *
-@@ -44,7 +69,7 @@ class Country extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- 
-             default:
-                 throw new \Magento\Framework\Exception\LocalizedException(
--                    __('Please correct the country code: %1.', htmlspecialchars($code))
-+                    __('Please correct the country code: %1.', $this->escaper->escapeHtml($code))
-                 );
-         }
- 
-diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
-index 20140baae01..d84b11fc6ce 100644
---- a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
-+++ b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
-@@ -126,24 +126,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-      */
-     protected $_foregroundCountries = [];
- 
--    /**
--     * Add top destinition countries to head of option array
--     *
--     * @param $emptyLabel
--     * @param $options
--     * @return array
--     */
--    private function addForegroundCountriesToOptionArray($emptyLabel, $options)
--    {
--        if ($emptyLabel !== false && count($this->_foregroundCountries) !== 0 &&
--            count($options) === count($this->_foregroundCountries)
--        ) {
--            $options[] = ['value' => '', 'label' => $emptyLabel];
--            return $options;
--        }
--        return $options;
--    }
--
-     /**
-      * Define main table
-      *
-@@ -205,9 +187,10 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
- 
-     /**
-      * Add filter by country code to collection.
-+     *
-      * $countryCode can be either array of country codes or string representing one country code.
-      * $iso can be either array containing 'iso2', 'iso3' values or string with containing one of that values directly.
--     * The collection will contain countries where at least one of contry $iso fields matches $countryCode.
-+     * The collection will contain countries where at least one of country $iso fields matches $countryCode.
-      *
-      * @param string|string[] $countryCode
-      * @param string|string[] $iso
-@@ -268,24 +251,20 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-     public function toOptionArray($emptyLabel = ' ')
-     {
-         $options = $this->_toOptionArray('country_id', 'name', ['title' => 'iso2_code']);
--        $sort = [];
--        foreach ($options as $data) {
--            $name = (string)$this->_localeLists->getCountryTranslation($data['value']);
--            if (!empty($name)) {
--                $sort[$name] = $data['value'];
--            }
--        }
-+        $sort = $this->getSort($options);
-+
-         $this->_arrayUtils->ksortMultibyte($sort, $this->_localeResolver->getLocale());
-         foreach (array_reverse($this->_foregroundCountries) as $foregroundCountry) {
-             $name = array_search($foregroundCountry, $sort);
--            unset($sort[$name]);
--            $sort = [$name => $foregroundCountry] + $sort;
-+            if ($name) {
-+                unset($sort[$name]);
-+                $sort = [$name => $foregroundCountry] + $sort;
-+            }
-         }
-         $isRegionVisible = (bool)$this->helperData->isShowNonRequiredState();
- 
-         $options = [];
-         foreach ($sort as $label => $value) {
--            $options = $this->addForegroundCountriesToOptionArray($emptyLabel, $options);
-             $option = ['value' => $value, 'label' => $label];
-             if ($this->helperData->isRegionRequired($value)) {
-                 $option['is_region_required'] = true;
-@@ -297,7 +276,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-             }
-             $options[] = $option;
-         }
--        if ($emptyLabel !== false && count($options) > 0) {
-+        if ($emptyLabel !== false && count($options) > 1) {
-             array_unshift($options, ['value' => '', 'label' => $emptyLabel]);
-         }
- 
-@@ -326,7 +305,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
- 
-         foreach ($options as $key => $option) {
-             if (isset($defaultCountry[$option['value']])) {
--                $options[$key]['is_default'] = $defaultCountry[$option['value']];
-+                $options[$key]['is_default'] = !empty($defaultCountry[$option['value']]);
-             }
-         }
-     }
-@@ -365,4 +344,23 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-         }
-         return $countries;
-     }
-+
-+    /**
-+     * Get sort
-+     *
-+     * @param array $options
-+     * @return array
-+     */
-+    private function getSort(array $options): array
-+    {
-+        $sort = [];
-+        foreach ($options as $data) {
-+            $name = (string)$this->_localeLists->getCountryTranslation($data['value']);
-+            if (!empty($name)) {
-+                $sort[$name] = $data['value'];
-+            }
-+        }
-+
-+        return $sort;
-+    }
- }
-diff --git a/app/code/Magento/Directory/Model/ResourceModel/Currency.php b/app/code/Magento/Directory/Model/ResourceModel/Currency.php
-index ffbcce11cb4..5339b0c9eb5 100644
---- a/app/code/Magento/Directory/Model/ResourceModel/Currency.php
-+++ b/app/code/Magento/Directory/Model/ResourceModel/Currency.php
-@@ -216,7 +216,7 @@ class Currency extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-         $connection = $this->getConnection();
-         $bind = [':currency_from' => $code];
-         $select = $connection->select()->from(
--            $this->getTable('directory_currency_rate'),
-+            $this->_currencyRateTable,
-             ['currency_to', 'rate']
-         )->where(
-             'currency_from = :currency_from'
-diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForAustralia.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForAustralia.php
-new file mode 100644
-index 00000000000..20306d08a29
---- /dev/null
-+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForAustralia.php
-@@ -0,0 +1,102 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Directory\Setup\Patch\Data;
-+
-+use Magento\Directory\Setup\DataInstaller;
-+use Magento\Framework\Setup\ModuleDataSetupInterface;
-+use Magento\Framework\Setup\Patch\DataPatchInterface;
-+use Magento\Framework\Setup\Patch\PatchVersionInterface;
-+
-+/**
-+ * Adds Australian States
-+ */
-+class AddDataForAustralia implements DataPatchInterface, PatchVersionInterface
-+{
-+    /**
-+     * @var ModuleDataSetupInterface
-+     */
-+    private $moduleDataSetup;
-+
-+    /**
-+     * @var \Magento\Directory\Setup\DataInstallerFactory
-+     */
-+    private $dataInstallerFactory;
-+
-+    /**
-+     * @param ModuleDataSetupInterface $moduleDataSetup
-+     * @param \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
-+     */
-+    public function __construct(
-+        ModuleDataSetupInterface $moduleDataSetup,
-+        \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
-+    ) {
-+        $this->moduleDataSetup = $moduleDataSetup;
-+        $this->dataInstallerFactory = $dataInstallerFactory;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function apply()
-+    {
-+        /** @var DataInstaller $dataInstaller */
-+        $dataInstaller = $this->dataInstallerFactory->create();
-+        $dataInstaller->addCountryRegions(
-+            $this->moduleDataSetup->getConnection(),
-+            $this->getDataForAustralia()
-+        );
-+    }
-+
-+    /**
-+     * Australian states data.
-+     *
-+     * @return array
-+     */
-+    private function getDataForAustralia()
-+    {
-+        return [
-+            ['AU', 'ACT', 'Australian Capital Territory'],
-+            ['AU', 'NSW', 'New South Wales'],
-+            ['AU', 'VIC', 'Victoria'],
-+            ['AU', 'QLD', 'Queensland'],
-+            ['AU', 'SA',  'South Australia'],
-+            ['AU', 'TAS', 'Tasmania'],
-+            ['AU', 'WA',  'Western Australia'],
-+            ['AU', 'NT',  'Northern Territory']
-+        ];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public static function getDependencies()
-+    {
-+        return [
-+            InitializeDirectoryData::class,
-+            AddDataForCroatia::class,
-+            AddDataForIndia::class,
-+        ];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public static function getVersion()
-+    {
-+        return '2.0.3';
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getAliases()
-+    {
-+        return [];
-+    }
-+}
-diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
-index 69d500960d3..47f4fb0a6c7 100644
---- a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
-+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
-@@ -13,8 +13,7 @@ use Magento\Framework\Setup\Patch\DataPatchInterface;
- use Magento\Framework\Setup\Patch\PatchVersionInterface;
- 
- /**
-- * Class AddDataForIndia
-- * @package Magento\Directory\Setup\Patch\Data
-+ * Add Regions for India.
-  */
- class AddDataForIndia implements DataPatchInterface, PatchVersionInterface
- {
-@@ -29,7 +28,7 @@ class AddDataForIndia implements DataPatchInterface, PatchVersionInterface
-     private $dataInstallerFactory;
- 
-     /**
--     * AddDataForCroatia constructor.
-+     * AddDataForIndia constructor.
-      *
-      * @param ModuleDataSetupInterface $moduleDataSetup
-      * @param \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
-@@ -43,7 +42,7 @@ class AddDataForIndia implements DataPatchInterface, PatchVersionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function apply()
-     {
-@@ -103,7 +102,7 @@ class AddDataForIndia implements DataPatchInterface, PatchVersionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getDependencies()
-     {
-@@ -113,7 +112,7 @@ class AddDataForIndia implements DataPatchInterface, PatchVersionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getVersion()
-     {
-@@ -121,7 +120,7 @@ class AddDataForIndia implements DataPatchInterface, PatchVersionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAliases()
-     {
-diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForMexico.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForMexico.php
-new file mode 100644
-index 00000000000..32bdf90800d
---- /dev/null
-+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForMexico.php
-@@ -0,0 +1,127 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Directory\Setup\Patch\Data;
-+
-+use Magento\Directory\Setup\DataInstaller;
-+use Magento\Framework\Setup\ModuleDataSetupInterface;
-+use Magento\Framework\Setup\Patch\DataPatchInterface;
-+use Magento\Framework\Setup\Patch\PatchVersionInterface;
-+
-+/**
-+ * Adds Mexican States
-+ */
-+class AddDataForMexico implements DataPatchInterface, PatchVersionInterface
-+{
-+    /**
-+     * @var ModuleDataSetupInterface
-+     */
-+    private $moduleDataSetup;
-+
-+    /**
-+     * @var \Magento\Directory\Setup\DataInstallerFactory
-+     */
-+    private $dataInstallerFactory;
-+
-+    /**
-+     * @param ModuleDataSetupInterface $moduleDataSetup
-+     * @param \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
-+     */
-+    public function __construct(
-+        ModuleDataSetupInterface $moduleDataSetup,
-+        \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
-+    ) {
-+        $this->moduleDataSetup = $moduleDataSetup;
-+        $this->dataInstallerFactory = $dataInstallerFactory;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function apply()
-+    {
-+        /** @var DataInstaller $dataInstaller */
-+        $dataInstaller = $this->dataInstallerFactory->create();
-+        $dataInstaller->addCountryRegions(
-+            $this->moduleDataSetup->getConnection(),
-+            $this->getDataForMexico()
-+        );
-+    }
-+
-+    /**
-+     * Mexican states data.
-+     *
-+     * @return array
-+     */
-+    private function getDataForMexico()
-+    {
-+        return [
-+            ['MX', 'AGU', 'Aguascalientes'],
-+            ['MX', 'BCN', 'Baja California'],
-+            ['MX', 'BCS', 'Baja California Sur'],
-+            ['MX', 'CAM', 'Campeche'],
-+            ['MX', 'CHP', 'Chiapas'],
-+            ['MX', 'CHH', 'Chihuahua'],
-+            ['MX', 'CMX', 'Ciudad de México'],
-+            ['MX', 'COA', 'Coahuila'],
-+            ['MX', 'COL', 'Colima'],
-+            ['MX', 'DUR', 'Durango'],
-+            ['MX', 'MEX', 'Estado de México'],
-+            ['MX', 'GUA', 'Guanajuato'],
-+            ['MX', 'GRO', 'Guerrero'],
-+            ['MX', 'HID', 'Hidalgo'],
-+            ['MX', 'JAL', 'Jalisco'],
-+            ['MX', 'MIC', 'Michoacán'],
-+            ['MX', 'MOR', 'Morelos'],
-+            ['MX', 'NAY', 'Nayarit'],
-+            ['MX', 'NLE', 'Nuevo León'],
-+            ['MX', 'OAX', 'Oaxaca'],
-+            ['MX', 'PUE', 'Puebla'],
-+            ['MX', 'QUE', 'Querétaro'],
-+            ['MX', 'ROO', 'Quintana Roo'],
-+            ['MX', 'SLP', 'San Luis Potosí'],
-+            ['MX', 'SIN', 'Sinaloa'],
-+            ['MX', 'SON', 'Sonora'],
-+            ['MX', 'TAB', 'Tabasco'],
-+            ['MX', 'TAM', 'Tamaulipas'],
-+            ['MX', 'TLA', 'Tlaxcala'],
-+            ['MX', 'VER', 'Veracruz'],
-+            ['MX', 'YUC', 'Yucatán'],
-+            ['MX', 'ZAC', 'Zacatecas']
-+        ];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public static function getDependencies()
-+    {
-+        return [
-+            InitializeDirectoryData::class,
-+            AddDataForAustralia::class,
-+            AddDataForCroatia::class,
-+            AddDataForIndia::class,
-+        ];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public static function getVersion()
-+    {
-+        return '2.0.4';
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getAliases()
-+    {
-+        return [];
-+    }
-+}
-diff --git a/app/code/Magento/Directory/Test/Unit/Helper/DataTest.php b/app/code/Magento/Directory/Test/Unit/Helper/DataTest.php
-index 73e9f0f5fa1..6ff0f8ea0f3 100644
---- a/app/code/Magento/Directory/Test/Unit/Helper/DataTest.php
-+++ b/app/code/Magento/Directory/Test/Unit/Helper/DataTest.php
-@@ -46,6 +46,7 @@ class DataTest extends \PHPUnit\Framework\TestCase
-     {
-         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-+        $this->scopeConfigMock->expects($this->any())->method('isSetFlag')->willReturn(false);
-         $context = $this->createMock(\Magento\Framework\App\Helper\Context::class);
-         $context->expects($this->any())
-             ->method('getScopeConfig')
-diff --git a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/FixerIoTest.php b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/FixerIoTest.php
-index c1c3f2fbacb..7efcf0d6271 100644
---- a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/FixerIoTest.php
-+++ b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/FixerIoTest.php
-@@ -3,89 +3,123 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Directory\Test\Unit\Model\Currency\Import;
- 
-+use Magento\Directory\Model\Currency;
-+use Magento\Directory\Model\Currency\Import\FixerIo;
-+use Magento\Directory\Model\CurrencyFactory;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\HTTP\ZendClient;
-+use Magento\Framework\HTTP\ZendClientFactory;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+
-+/**
-+ * FixerIo Test
-+ */
- class FixerIoTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\Directory\Model\Currency\Import\FixerIo
-+     * @var FixerIo
-      */
-     private $model;
- 
-     /**
--     * @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var CurrencyFactory|MockObject
-      */
--    private $currencyFactoryMock;
-+    private $currencyFactory;
- 
-     /**
--     * @var \Magento\Framework\HTTP\ZendClientFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ZendClientFactory|MockObject
-      */
--    private $httpClientFactoryMock;
-+    private $httpClientFactory;
- 
-+    /**
-+     * @var ScopeConfigInterface|MockObject
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
--        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--
--        $this->currencyFactoryMock = $this->getMockBuilder(\Magento\Directory\Model\CurrencyFactory::class)
-+        $this->currencyFactory = $this->getMockBuilder(CurrencyFactory::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['create'])
-             ->getMock();
--        $this->httpClientFactoryMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClientFactory::class)
-+        $this->httpClientFactory = $this->getMockBuilder(ZendClientFactory::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['create'])
-             ->getMock();
--        $scopeMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
-+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
-             ->disableOriginalConstructor()
-             ->setMethods([])
-             ->getMock();
- 
--        $this->model = $objectManagerHelper->getObject(
--            \Magento\Directory\Model\Currency\Import\FixerIo::class,
--            [
--                'currencyFactory' => $this->currencyFactoryMock,
--                'scopeConfig' => $scopeMock,
--                'httpClientFactory' => $this->httpClientFactoryMock
--            ]
--        );
-+        $this->model = new FixerIo($this->currencyFactory, $this->scopeConfig, $this->httpClientFactory);
-     }
- 
--    public function testFetchRates()
-+    /**
-+     * Test Fetch Rates
-+     *
-+     * @return void
-+     */
-+    public function testFetchRates(): void
-     {
-         $currencyFromList = ['USD'];
-         $currencyToList = ['EUR', 'UAH'];
--        $responseBody = '{"base":"USD","date":"2015-10-07","rates":{"EUR":0.9022}}';
-+        $responseBody = '{"success":"true","base":"USD","date":"2015-10-07","rates":{"EUR":0.9022}}';
-         $expectedCurrencyRateList = ['USD' => ['EUR' => 0.9022, 'UAH' => null]];
--        $message = "We can't retrieve a rate from http://api.fixer.io/latest?base=USD&symbols=EUR,UAH for UAH.";
-+        $message = "We can't retrieve a rate from "
-+            . "http://data.fixer.io/api/latest?access_key=api_key&base=USD&symbols=EUR,UAH for UAH.";
-+
-+        $this->scopeConfig->method('getValue')
-+            ->withConsecutive(
-+                ['currency/fixerio/api_key', 'store'],
-+                ['currency/fixerio/timeout', 'store']
-+            )
-+            ->willReturnOnConsecutiveCalls('api_key', 100);
- 
--        /** @var \Magento\Directory\Model\Currency|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
--        $currencyMock = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
-+        /** @var Currency|MockObject $currency */
-+        $currency = $this->getMockBuilder(Currency::class)
-             ->disableOriginalConstructor()
--            ->setMethods([])
-             ->getMock();
--        /** @var \Magento\Framework\HTTP\ZendClient|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
--        $httpClientMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClient::class)
-+        /** @var ZendClient|MockObject $httpClient */
-+        $httpClient = $this->getMockBuilder(ZendClient::class)
-             ->disableOriginalConstructor()
--            ->setMethods([])
-             ->getMock();
--        /** @var \Zend_Http_Response|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
--        $httpResponseMock = $this->getMockBuilder(\Zend_Http_Response::class)
-+        /** @var DataObject|MockObject $currencyMock */
-+        $httpResponse = $this->getMockBuilder(DataObject::class)
-             ->disableOriginalConstructor()
--            ->setMethods([])
-+            ->setMethods(['getBody'])
-             ->getMock();
--        $this->currencyFactoryMock->expects($this->any())->method('create')->willReturn($currencyMock);
--        $currencyMock->expects($this->once())->method('getConfigBaseCurrencies')->willReturn($currencyFromList);
--        $currencyMock->expects($this->once())->method('getConfigAllowCurrencies')->willReturn($currencyToList);
--        $this->httpClientFactoryMock->expects($this->any())->method('create')->willReturn($httpClientMock);
--        $httpClientMock->expects($this->atLeastOnce())->method('setUri')->willReturnSelf();
--        $httpClientMock->expects($this->atLeastOnce())->method('setConfig')->willReturnSelf();
--        $httpClientMock->expects($this->atLeastOnce())->method('request')->willReturn($httpResponseMock);
--        $httpResponseMock->expects($this->any())->method('getBody')->willReturn($responseBody);
- 
--        $this->assertEquals($expectedCurrencyRateList, $this->model->fetchRates());
-+        $this->currencyFactory->method('create')
-+            ->willReturn($currency);
-+        $currency->method('getConfigBaseCurrencies')
-+            ->willReturn($currencyFromList);
-+        $currency->method('getConfigAllowCurrencies')
-+            ->willReturn($currencyToList);
-+
-+        $this->httpClientFactory->method('create')
-+            ->willReturn($httpClient);
-+        $httpClient->method('setUri')
-+            ->willReturnSelf();
-+        $httpClient->method('setConfig')
-+            ->willReturnSelf();
-+        $httpClient->method('request')
-+            ->willReturn($httpResponse);
-+        $httpResponse->method('getBody')
-+            ->willReturn($responseBody);
-+
-+        self::assertEquals($expectedCurrencyRateList, $this->model->fetchRates());
-+
-         $messages = $this->model->getMessages();
--        $this->assertNotEmpty($messages);
--        $this->assertTrue(is_array($messages));
--        $this->assertEquals($message, (string)$messages[0]);
-+        self::assertNotEmpty($messages);
-+        self::assertTrue(is_array($messages));
-+        self::assertEquals($message, (string)$messages[0]);
-     }
- }
-diff --git a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/YahooFinanceTest.php b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/YahooFinanceTest.php
-deleted file mode 100644
-index b7b9015ffdf..00000000000
---- a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/YahooFinanceTest.php
-+++ /dev/null
-@@ -1,94 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Directory\Test\Unit\Model\Currency\Import;
--
--class YahooFinanceTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Directory\Model\Currency\Import\YahooFinance
--     */
--    private $model;
--
--    /**
--     * @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $currencyFactoryMock;
--
--    /**
--     * @var \Magento\Framework\HTTP\ZendClientFactory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $httpClientFactoryMock;
--
--    protected function setUp()
--    {
--        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--
--        $this->currencyFactoryMock = $this->getMockBuilder(\Magento\Directory\Model\CurrencyFactory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--        $this->httpClientFactoryMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClientFactory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--        $scopeMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--
--        $this->model = $objectManagerHelper->getObject(
--            \Magento\Directory\Model\Currency\Import\YahooFinance::class,
--            [
--                'currencyFactory' => $this->currencyFactoryMock,
--                'scopeConfig' => $scopeMock,
--                'httpClientFactory' => $this->httpClientFactoryMock
--            ]
--        );
--    }
--
--    public function testFetchRates()
--    {
--        $currencyFromList = ['USD'];
--        $currencyToList = ['EUR', 'UAH'];
--        $responseBody = '{"query":{"count":7,"created":"2016-04-05T16:46:55Z","lang":"en-US","results":{"rate":'
--            . '[{"id":"USDEUR","Name":"USD/EUR","Rate":"0.9022","Date":"4/5/2016"}]}}}';
--        $expectedCurrencyRateList = ['USD' => ['EUR' => 0.9022, 'UAH' => null]];
--        $message = "We can't retrieve a rate from http://query.yahooapis.com/v1/public/yql?format=json"
--            . "&q=select+*+from+yahoo.finance.xchange+where+pair+in+%28%22USDEUR%22%2C%22USDUAH%22)"
--            . "&env=store://datatables.org/alltableswithkeys for UAH.";
--
--        /** @var \Magento\Directory\Model\Currency|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
--        $currencyMock = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        /** @var \Magento\Framework\HTTP\ZendClient|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
--        $httpClientMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClient::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        /** @var \Zend_Http_Response|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
--        $httpResponseMock = $this->getMockBuilder('Zend_Http_Response')
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->currencyFactoryMock->expects($this->any())->method('create')->willReturn($currencyMock);
--        $currencyMock->expects($this->once())->method('getConfigBaseCurrencies')->willReturn($currencyFromList);
--        $currencyMock->expects($this->once())->method('getConfigAllowCurrencies')->willReturn($currencyToList);
--        $this->httpClientFactoryMock->expects($this->any())->method('create')->willReturn($httpClientMock);
--        $httpClientMock->expects($this->atLeastOnce())->method('setUri')->willReturnSelf();
--        $httpClientMock->expects($this->atLeastOnce())->method('setConfig')->willReturnSelf();
--        $httpClientMock->expects($this->atLeastOnce())->method('request')->willReturn($httpResponseMock);
--        $httpResponseMock->expects($this->any())->method('getBody')->willReturn($responseBody);
--
--        $this->assertEquals($expectedCurrencyRateList, $this->model->fetchRates());
--        $messages = $this->model->getMessages();
--        $this->assertNotEmpty($messages);
--        $this->assertTrue(is_array($messages));
--        $this->assertEquals($message, (string)$messages[0]);
--    }
--}
-diff --git a/app/code/Magento/Directory/Test/Unit/Model/CurrencyConfigTest.php b/app/code/Magento/Directory/Test/Unit/Model/CurrencyConfigTest.php
-index 9b52bae26f9..e594be90b26 100644
---- a/app/code/Magento/Directory/Test/Unit/Model/CurrencyConfigTest.php
-+++ b/app/code/Magento/Directory/Test/Unit/Model/CurrencyConfigTest.php
-@@ -68,7 +68,7 @@ class CurrencyConfigTest extends TestCase
-     }
- 
-     /**
--     * Test get currency config for admin and storefront areas.
-+     * Test get currency config for admin, crontab and storefront areas.
-      *
-      * @dataProvider getConfigCurrenciesDataProvider
-      * @return void
-@@ -91,7 +91,7 @@ class CurrencyConfigTest extends TestCase
-             ->method('getCode')
-             ->willReturn('testCode');
- 
--        if ($areCode === Area::AREA_ADMINHTML) {
-+        if (in_array($areCode, [Area::AREA_ADMINHTML, Area::AREA_CRONTAB])) {
-             $this->storeManager->expects(self::once())
-                 ->method('getStores')
-                 ->willReturn([$store]);
-@@ -121,6 +121,7 @@ class CurrencyConfigTest extends TestCase
-     {
-         return [
-             ['areaCode' => Area::AREA_ADMINHTML],
-+            ['areaCode' => Area::AREA_CRONTAB],
-             ['areaCode' => Area::AREA_FRONTEND],
-         ];
-     }
-diff --git a/app/code/Magento/Directory/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Directory/Test/Unit/Model/ObserverTest.php
-deleted file mode 100644
-index 5fb7271a411..00000000000
---- a/app/code/Magento/Directory/Test/Unit/Model/ObserverTest.php
-+++ /dev/null
-@@ -1,153 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Directory\Test\Unit\Model;
--
--use Magento\Store\Model\ScopeInterface;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
--use Magento\Directory\Model\Observer;
--
--/**
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class ObserverTest extends \PHPUnit\Framework\TestCase
--{
--    /** @var  \Magento\Framework\TestFramework\Unit\Helper\ObjectManager  */
--    protected $objectManager;
--
--    /** @var Observer */
--    protected $observer;
--
--    /** @var  \Magento\Directory\Model\Currency\Import\Factory|\PHPUnit_Framework_MockObject_MockObject */
--    protected $importFactory;
--
--    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $scopeConfig;
--
--    /** @var \Magento\Framework\Mail\Template\TransportBuilder|\PHPUnit_Framework_MockObject_MockObject */
--    protected $transportBuilder;
--
--    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $storeManager;
--
--    /** @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject */
--    protected $currencyFactory;
--
--    /** @var \Magento\Framework\Translate\Inline\StateInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $inlineTranslation;
--
--    protected function setUp()
--    {
--        $this->objectManager = new ObjectManager($this);
--
--        $this->importFactory = $this->getMockBuilder(\Magento\Directory\Model\Currency\Import\Factory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\MutableScopeConfig::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getValue'])
--            ->getMock();
--        $this->transportBuilder = $this->getMockBuilder(\Magento\Framework\Mail\Template\TransportBuilder::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManager::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->currencyFactory = $this->getMockBuilder(\Magento\Directory\Model\CurrencyFactory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--        $this->inlineTranslation = $this->getMockBuilder(\Magento\Framework\Translate\Inline\StateInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->observer = $this->objectManager->getObject(
--            \Magento\Directory\Model\Observer::class,
--            [
--                'importFactory' => $this->importFactory,
--                'scopeConfig' => $this->scopeConfig,
--                'transportBuilder' => $this->transportBuilder,
--                'storeManager' => $this->storeManager,
--                'currencyFactory' => $this->currencyFactory,
--                'inlineTranslation' => $this->inlineTranslation
--            ]
--        );
--    }
--
--    public function testScheduledUpdateCurrencyRates()
--    {
--        $this->scopeConfig
--            ->expects($this->at(0))
--            ->method('getValue')
--            ->with(Observer::IMPORT_ENABLE, ScopeInterface::SCOPE_STORE)
--            ->will($this->returnValue(1));
--        $this->scopeConfig
--            ->expects($this->at(1))
--            ->method('getValue')
--            ->with(Observer::CRON_STRING_PATH, ScopeInterface::SCOPE_STORE)
--            ->will($this->returnValue('cron-path'));
--        $this->scopeConfig
--            ->expects($this->at(2))
--            ->method('getValue')
--            ->with(Observer::IMPORT_SERVICE, ScopeInterface::SCOPE_STORE)
--            ->will($this->returnValue('import-service'));
--        $importInterfaceMock = $this->getMockBuilder(\Magento\Directory\Model\Currency\Import\Webservicex::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['fetchRates', 'getMessages'])
--            ->getMock();
--        $importInterfaceMock->expects($this->once())
--            ->method('fetchRates')
--            ->will($this->returnValue([]));
--        $importInterfaceMock->expects($this->once())
--            ->method('getMessages')
--            ->will($this->returnValue([]));
--
--        $this->importFactory
--            ->expects($this->once())
--            ->method('create')
--            ->with('import-service')
--            ->will($this->returnValue($importInterfaceMock));
--
--        $currencyMock = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['saveRates', '__wakeup', '__sleep'])
--            ->getMock();
--        $currencyMock->expects($this->once())
--            ->method('saveRates')
--            ->will($this->returnValue(null));
--        $this->currencyFactory
--            ->expects($this->once())
--            ->method('create')
--            ->will($this->returnValue($currencyMock));
--
--        $this->observer->scheduledUpdateCurrencyRates(null);
--    }
--
--    /**
--     * @expectedException \Exception
--     */
--    public function testScheduledUpdateCurrencyRatesThrowsException()
--    {
--        $this->scopeConfig->expects($this->exactly(3))
--            ->method('getValue')
--            ->willReturnMap(
--                [
--                    [Observer::IMPORT_ENABLE, ScopeInterface::SCOPE_STORE, null, 1],
--                    [Observer::CRON_STRING_PATH, ScopeInterface::SCOPE_STORE, null, 'cron-path'],
--                    [Observer::IMPORT_SERVICE, ScopeInterface::SCOPE_STORE, null, 'import-service']
--                ]
--            );
--
--        $this->importFactory
--            ->expects($this->once())
--            ->method('create')
--            ->with('import-service')
--            ->willThrowException(new \Exception());
--
--        $this->observer->scheduledUpdateCurrencyRates(null);
--    }
--}
-diff --git a/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php b/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php
-index 8eb4ad78fbe..f5c6c5eeb53 100644
---- a/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php
-+++ b/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php
-@@ -99,8 +99,7 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
- 
-         $this->_model->setForegroundCountries($foregroundCountries);
-         $result = $this->_model->toOptionArray($emptyLabel);
--        $this->assertCount(count($optionsArray) + (int)(!empty($emptyLabel) && !empty($foregroundCountries)) +
--            (int)(!empty($emptyLabel)), $result);
-+        $this->assertCount(count($optionsArray) + (int)(!empty($emptyLabel)), $result);
-         foreach ($expectedResults as $index => $expectedResult) {
-             $this->assertEquals($expectedResult, $result[$index]['label']);
-         }
-@@ -121,8 +120,10 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-             [$optionsArray, false, [], ['AD', 'US', 'ES', 'BZ']],
-             [$optionsArray, false, 'US', ['US', 'AD', 'ES', 'BZ']],
-             [$optionsArray, false, ['US', 'BZ'], ['US', 'BZ', 'AD', 'ES']],
--            [$optionsArray, ' ', 'US', [' ', 'US', ' ', 'AD', 'ES', 'BZ']],
--            [$optionsArray, ' ', [], [' ', 'AD', 'US', 'ES', 'BZ']]
-+            [$optionsArray, ' ', 'US', [' ', 'US', 'AD', 'ES', 'BZ']],
-+            [$optionsArray, ' ', [], [' ', 'AD', 'US', 'ES', 'BZ']],
-+            [$optionsArray, ' ', 'UA', [' ', 'AD', 'US', 'ES', 'BZ']],
-+            [$optionsArray, ' ', ['AF', 'UA'], [' ', 'AD', 'US', 'ES', 'BZ']],
-         ];
-     }
- }
-diff --git a/app/code/Magento/Directory/etc/adminhtml/system.xml b/app/code/Magento/Directory/etc/adminhtml/system.xml
-index cae3b1c41db..ec5fa35b6a1 100644
---- a/app/code/Magento/Directory/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Directory/etc/adminhtml/system.xml
-@@ -34,21 +34,14 @@
-                     <can_be_empty>1</can_be_empty>
-                 </field>
-             </group>
--            <group id="yahoofinance" translate="label" sortOrder="33" showInDefault="1" showInWebsite="0" showInStore="0">
--                <label>Yahoo Finance Exchange</label>
--                <field id="timeout" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
--                    <label>Connection Timeout in Seconds</label>
--                </field>
--            </group>
-             <group id="fixerio" translate="label" sortOrder="35" showInDefault="1" showInWebsite="0" showInStore="0">
-                 <label>Fixer.io</label>
--                <field id="timeout" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
--                    <label>Connection Timeout in Seconds</label>
-+                <field id="api_key" translate="label" type="obscure" sortOrder="5" showInDefault="1" showInWebsite="0" showInStore="0">
-+                    <label>API Key</label>
-+                    <config_path>currency/fixerio/api_key</config_path>
-+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                 </field>
--            </group>
--            <group id="webservicex" translate="label" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
--                <label>Webservicex</label>
--                <field id="timeout" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="timeout" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
-                     <label>Connection Timeout in Seconds</label>
-                 </field>
-             </group>
-diff --git a/app/code/Magento/Directory/etc/config.xml b/app/code/Magento/Directory/etc/config.xml
-index de3ff626bc1..276d7088cc2 100644
---- a/app/code/Magento/Directory/etc/config.xml
-+++ b/app/code/Magento/Directory/etc/config.xml
-@@ -18,15 +18,10 @@
-                 <base>USD</base>
-                 <default>USD</default>
-             </options>
--            <yahoofinance>
--                <timeout>100</timeout>
--            </yahoofinance>
-             <fixerio>
-                 <timeout>100</timeout>
-+                <api_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-             </fixerio>
--            <webservicex>
--                <timeout>100</timeout>
--            </webservicex>
-             <currencyconverterapi>
-                 <timeout>100</timeout>
-             </currencyconverterapi>
-diff --git a/app/code/Magento/Directory/etc/db_schema.xml b/app/code/Magento/Directory/etc/db_schema.xml
-index 72fd929b98a..c11e0ee525e 100644
---- a/app/code/Magento/Directory/etc/db_schema.xml
-+++ b/app/code/Magento/Directory/etc/db_schema.xml
-@@ -11,7 +11,7 @@
-         <column xsi:type="varchar" name="country_id" nullable="false" length="2" comment="Country Id in ISO-2"/>
-         <column xsi:type="varchar" name="iso2_code" nullable="true" length="2" comment="Country ISO-2 format"/>
-         <column xsi:type="varchar" name="iso3_code" nullable="true" length="3" comment="Country ISO-3"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="country_id"/>
-         </constraint>
-     </table>
-@@ -21,10 +21,10 @@
-         <column xsi:type="varchar" name="country_id" nullable="true" length="2" comment="Country Id in ISO-2"/>
-         <column xsi:type="varchar" name="type" nullable="true" length="30" comment="Country Format Type"/>
-         <column xsi:type="text" name="format" nullable="false" comment="Country Format"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="country_format_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="DIRECTORY_COUNTRY_FORMAT_COUNTRY_ID_TYPE">
-+        <constraint xsi:type="unique" referenceId="DIRECTORY_COUNTRY_FORMAT_COUNTRY_ID_TYPE">
-             <column name="country_id"/>
-             <column name="type"/>
-         </constraint>
-@@ -36,10 +36,10 @@
-                 comment="Country Id in ISO-2"/>
-         <column xsi:type="varchar" name="code" nullable="true" length="32" comment="Region code"/>
-         <column xsi:type="varchar" name="default_name" nullable="true" length="255" comment="Region Name"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="region_id"/>
-         </constraint>
--        <index name="DIRECTORY_COUNTRY_REGION_COUNTRY_ID" indexType="btree">
-+        <index referenceId="DIRECTORY_COUNTRY_REGION_COUNTRY_ID" indexType="btree">
-             <column name="country_id"/>
-         </index>
-     </table>
-@@ -49,14 +49,14 @@
-         <column xsi:type="int" name="region_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Region Id"/>
-         <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Region Name"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="locale"/>
-             <column name="region_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="DIR_COUNTRY_REGION_NAME_REGION_ID_DIR_COUNTRY_REGION_REGION_ID"
-+        <constraint xsi:type="foreign" referenceId="DIR_COUNTRY_REGION_NAME_REGION_ID_DIR_COUNTRY_REGION_REGION_ID"
-                     table="directory_country_region_name" column="region_id" referenceTable="directory_country_region"
-                     referenceColumn="region_id" onDelete="CASCADE"/>
--        <index name="DIRECTORY_COUNTRY_REGION_NAME_REGION_ID" indexType="btree">
-+        <index referenceId="DIRECTORY_COUNTRY_REGION_NAME_REGION_ID" indexType="btree">
-             <column name="region_id"/>
-         </index>
-     </table>
-@@ -66,11 +66,11 @@
-         <column xsi:type="varchar" name="currency_to" nullable="false" length="3" comment="Currency Code Convert To"/>
-         <column xsi:type="decimal" name="rate" scale="12" precision="24" unsigned="false" nullable="false" default="0"
-                 comment="Currency Conversion Rate"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="currency_from"/>
-             <column name="currency_to"/>
-         </constraint>
--        <index name="DIRECTORY_CURRENCY_RATE_CURRENCY_TO" indexType="btree">
-+        <index referenceId="DIRECTORY_CURRENCY_RATE_CURRENCY_TO" indexType="btree">
-             <column name="currency_to"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Directory/etc/di.xml b/app/code/Magento/Directory/etc/di.xml
-index 4d0e51ab9f4..50cd65cc504 100644
---- a/app/code/Magento/Directory/etc/di.xml
-+++ b/app/code/Magento/Directory/etc/di.xml
-@@ -10,14 +10,6 @@
-     <type name="Magento\Directory\Model\Currency\Import\Config">
-         <arguments>
-             <argument name="servicesConfig" xsi:type="array">
--                <item name="yahoofinance" xsi:type="array">
--                    <item name="label" xsi:type="string" translatable="true">Yahoo Finance Exchange</item>
--                    <item name="class" xsi:type="string">Magento\Directory\Model\Currency\Import\YahooFinance</item>
--                </item>
--                <item name="webservicex" xsi:type="array">
--                    <item name="label" xsi:type="string" translatable="true">Webservicex</item>
--                    <item name="class" xsi:type="string">Magento\Directory\Model\Currency\Import\Webservicex</item>
--                </item>
-                 <item name="fixerio" xsi:type="array">
-                     <item name="label" xsi:type="string" translatable="true">Fixer.io</item>
-                     <item name="class" xsi:type="string">Magento\Directory\Model\Currency\Import\FixerIo</item>
-diff --git a/app/code/Magento/Directory/i18n/en_US.csv b/app/code/Magento/Directory/i18n/en_US.csv
-index 00e32ab8c85..3dcd2ceebf1 100644
---- a/app/code/Magento/Directory/i18n/en_US.csv
-+++ b/app/code/Magento/Directory/i18n/en_US.csv
-@@ -30,10 +30,8 @@ Continue,Continue
-                     "
- "Default Display Currency","Default Display Currency"
- "Allowed Currencies","Allowed Currencies"
--"Yahoo Finance Exchange","Yahoo Finance Exchange"
- "Connection Timeout in Seconds","Connection Timeout in Seconds"
- Fixer.io,Fixer.io
--Webservicex,Webservicex
- "Scheduled Import Settings","Scheduled Import Settings"
- Enabled,Enabled
- "Error Email Recipient","Error Email Recipient"
-@@ -49,3 +47,8 @@ Service,Service
- "State is Required for","State is Required for"
- "Allow to Choose State if It is Optional for Country","Allow to Choose State if It is Optional for Country"
- "Weight Unit","Weight Unit"
-+"No API Key was specified or an invalid API Key was specified.","No API Key was specified or an invalid API Key was specified."
-+"The account this API request is coming from is inactive.","The account this API request is coming from is inactive."
-+"The """%1"" is not allowed as base currency for your subscription plan.","The """%1"" is not allowed as base currency for your subscription plan."
-+"An invalid base currency has been entered.","An invalid base currency has been entered."
-+"Currency rates can't be retrieved.","Currency rates can't be retrieved."
-diff --git a/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml b/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml
-index bae7a08143c..524c86fbaf6 100644
---- a/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml
-+++ b/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * JS block for including Countries with Optional Zip
-  *
-@@ -19,7 +18,7 @@ require([
- ], function(){
- 
- //<![CDATA[
--optionalZipCountries = <?= /* @noEscape */ $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>;
-+optionalZipCountries = <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>;
- 
- function onAddressCountryChanged (countryElement) {
-     var zipElementId = countryElement.id.replace(/country_id/, 'postcode');
-diff --git a/app/code/Magento/Directory/view/frontend/templates/currency.phtml b/app/code/Magento/Directory/view/frontend/templates/currency.phtml
-index 30283effe4b..15cf9435bc5 100644
---- a/app/code/Magento/Directory/view/frontend/templates/currency.phtml
-+++ b/app/code/Magento/Directory/view/frontend/templates/currency.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * Currency switcher
-  *
-@@ -12,31 +11,31 @@
-  */
- 
- ?>
--<?php if ($block->getCurrencyCount() > 1): ?>
--<?php $currencies = $block->getCurrencies(); ?>
--<?php $currentCurrencyCode = $block->getCurrentCurrencyCode(); ?>
--<?php $id = $block->getIdModifier() ? '-' . $block->getIdModifier() : '' ?>
--<div class="switcher currency switcher-currency" id="switcher-currency<?= $block->escapeHtmlAttr($id) ?>">
--    <strong class="label switcher-label"><span><?= $block->escapeHtml(__('Currency')) ?></span></strong>
--    <div class="actions dropdown options switcher-options">
--        <div class="action toggle switcher-trigger"
--             id="switcher-currency-trigger<?= $block->escapeHtmlAttr($id) ?>"
--             data-mage-init='{"dropdown":{}}'
--             data-toggle="dropdown"
--             data-trigger-keypress-button="true">
--            <strong class="language-<?= $block->escapeHtml($block->getCurrentCurrencyCode()) ?>">
--                <span><?= $block->escapeHtml($currentCurrencyCode) ?> - <?= @$block->escapeHtml($currencies[$currentCurrencyCode]) ?></span>
--            </strong>
-+<?php if ($block->getCurrencyCount() > 1) : ?>
-+    <?php $currencies = $block->getCurrencies(); ?>
-+    <?php $currentCurrencyCode = $block->getCurrentCurrencyCode(); ?>
-+    <?php $id = $block->getIdModifier() ? '-' . $block->getIdModifier() : '' ?>
-+    <div class="switcher currency switcher-currency" id="switcher-currency<?= $block->escapeHtmlAttr($id) ?>">
-+        <strong class="label switcher-label"><span><?= $block->escapeHtml(__('Currency')) ?></span></strong>
-+        <div class="actions dropdown options switcher-options">
-+            <div class="action toggle switcher-trigger"
-+                 id="switcher-currency-trigger<?= $block->escapeHtmlAttr($id) ?>"
-+                 data-mage-init='{"dropdown":{}}'
-+                 data-toggle="dropdown"
-+                 data-trigger-keypress-button="true">
-+                <strong class="language-<?= $block->escapeHtml($block->getCurrentCurrencyCode()) ?>">
-+                    <span><?= $block->escapeHtml($currentCurrencyCode) ?> - <?= $currencies[$currentCurrencyCode] ? $block->escapeHtml($currencies[$currentCurrencyCode]) : '' ?></span>
-+                </strong>
-+            </div>
-+            <ul class="dropdown switcher-dropdown" data-target="dropdown">
-+                <?php foreach ($currencies as $_code => $_name) : ?>
-+                    <?php if ($_code != $currentCurrencyCode) : ?>
-+                        <li class="currency-<?= $block->escapeHtmlAttr($_code) ?> switcher-option">
-+                            <a href="#" data-post='<?= /* @noEscape */ $block->getSwitchCurrencyPostData($_code) ?>'><?= $block->escapeHtml($_code) ?> - <?= $block->escapeHtml($_name) ?></a>
-+                        </li>
-+                    <?php endif; ?>
-+                <?php endforeach; ?>
-+            </ul>
-         </div>
--        <ul class="dropdown switcher-dropdown" data-target="dropdown">
--            <?php foreach ($currencies as $_code => $_name): ?>
--                <?php if ($_code != $currentCurrencyCode): ?>
--                    <li class="currency-<?= $block->escapeHtmlAttr($_code) ?> switcher-option">
--                        <a href="#" data-post='<?= /* @noEscape */ $block->getSwitchCurrencyPostData($_code) ?>'><?= $block->escapeHtml($_code) ?> - <?= $block->escapeHtml($_name) ?></a>
--                    </li>
--                <?php endif; ?>
--            <?php endforeach; ?>
--        </ul>
-     </div>
--</div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml b/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml
-index 4411aa2579e..50995dbd1d0 100644
---- a/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml
-+++ b/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Framework\View\Element\Template $block */
- 
- ?>
-diff --git a/app/code/Magento/DirectoryGraphQl/Controller/HttpHeaderProcessor/CurrencyProcessor.php b/app/code/Magento/DirectoryGraphQl/Controller/HttpHeaderProcessor/CurrencyProcessor.php
-new file mode 100644
-index 00000000000..b076b6fe9e7
---- /dev/null
-+++ b/app/code/Magento/DirectoryGraphQl/Controller/HttpHeaderProcessor/CurrencyProcessor.php
-@@ -0,0 +1,105 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\DirectoryGraphQl\Controller\HttpHeaderProcessor;
-+
-+use Magento\GraphQl\Controller\HttpHeaderProcessorInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Framework\App\Http\Context as HttpContext;
-+use Magento\Framework\Session\SessionManagerInterface;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * Process the "Currency" header entry
-+ */
-+class CurrencyProcessor implements HttpHeaderProcessorInterface
-+{
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var HttpContext
-+     */
-+    private $httpContext;
-+
-+    /**
-+     * @var SessionManagerInterface
-+     */
-+    private $session;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @param StoreManagerInterface $storeManager
-+     * @param HttpContext $httpContext
-+     * @param SessionManagerInterface $session
-+     * @param LoggerInterface $logger
-+     */
-+    public function __construct(
-+        StoreManagerInterface $storeManager,
-+        HttpContext $httpContext,
-+        SessionManagerInterface $session,
-+        LoggerInterface $logger
-+    ) {
-+        $this->storeManager = $storeManager;
-+        $this->httpContext = $httpContext;
-+        $this->session = $session;
-+        $this->logger = $logger;
-+    }
-+
-+    /**
-+     * Handle the header 'Content-Currency' value.
-+     *
-+     * @param string $headerValue
-+     * @return void
-+     */
-+    public function processHeaderValue(string $headerValue) : void
-+    {
-+        try {
-+            if (!empty($headerValue)) {
-+                $headerCurrency = strtoupper(ltrim(rtrim($headerValue)));
-+                /** @var \Magento\Store\Model\Store $currentStore */
-+                $currentStore = $this->storeManager->getStore();
-+                if (in_array($headerCurrency, $currentStore->getAvailableCurrencyCodes(true))) {
-+                    $currentStore->setCurrentCurrencyCode($headerCurrency);
-+                } else {
-+                    /** @var \Magento\Store\Model\Store $store */
-+                    $store = $this->storeManager->getStore() ?? $this->storeManager->getDefaultStoreView();
-+                    //skip store not found exception as it will be handled in graphql validation
-+                    $this->logger->warning(__('Currency not allowed for store %1', [$store->getCode()]));
-+                    $this->httpContext->setValue(
-+                        HttpContext::CONTEXT_CURRENCY,
-+                        $headerCurrency,
-+                        $store->getDefaultCurrency()->getCode()
-+                    );
-+                }
-+            } else {
-+                if ($this->session->getCurrencyCode()) {
-+                    /** @var \Magento\Store\Model\Store $currentStore */
-+                    $currentStore = $this->storeManager->getStore() ?? $this->storeManager->getDefaultStoreView();
-+                    $currentStore->setCurrentCurrencyCode($this->session->getCurrencyCode());
-+                } else {
-+                    /** @var \Magento\Store\Model\Store $store */
-+                    $store = $this->storeManager->getStore() ?? $this->storeManager->getDefaultStoreView();
-+                    $this->httpContext->setValue(
-+                        HttpContext::CONTEXT_CURRENCY,
-+                        $store->getCurrentCurrency()->getCode(),
-+                        $store->getDefaultCurrency()->getCode()
-+                    );
-+                }
-+            }
-+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+            //skip store not found exception as it will be handled in graphql validation
-+            $this->logger->warning($e->getMessage());
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/DirectoryGraphQl/Controller/HttpRequestValidator/CurrencyValidator.php b/app/code/Magento/DirectoryGraphQl/Controller/HttpRequestValidator/CurrencyValidator.php
-new file mode 100644
-index 00000000000..7dab90802c2
---- /dev/null
-+++ b/app/code/Magento/DirectoryGraphQl/Controller/HttpRequestValidator/CurrencyValidator.php
-@@ -0,0 +1,62 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\DirectoryGraphQl\Controller\HttpRequestValidator;
-+
-+use Magento\Framework\App\HttpRequestInterface;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\GraphQl\Controller\HttpRequestValidatorInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Validate the "Currency" header entry
-+ */
-+class CurrencyValidator implements HttpRequestValidatorInterface
-+{
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(
-+        StoreManagerInterface $storeManager
-+    ) {
-+        $this->storeManager = $storeManager;
-+    }
-+
-+    /**
-+     * Validate the header 'Content-Currency' value.
-+     *
-+     * @param HttpRequestInterface $request
-+     * @return void
-+     * @throws GraphQlInputException
-+     */
-+    public function validate(HttpRequestInterface $request): void
-+    {
-+        try {
-+            $headerValue = $request->getHeader('Content-Currency');
-+            if (!empty($headerValue)) {
-+                $headerCurrency = strtoupper(ltrim(rtrim($headerValue)));
-+                /** @var \Magento\Store\Model\Store $currentStore */
-+                $currentStore = $this->storeManager->getStore();
-+                if (!in_array($headerCurrency, $currentStore->getAvailableCurrencyCodes(true))) {
-+                    throw new GraphQlInputException(
-+                        __('Please correct the target currency')
-+                    );
-+                }
-+            }
-+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+            $this->storeManager->setCurrentStore(null);
-+            throw new GraphQlInputException(
-+                __("Requested store is not found")
-+            );
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/DirectoryGraphQl/Model/Resolver/Countries.php b/app/code/Magento/DirectoryGraphQl/Model/Resolver/Countries.php
-new file mode 100644
-index 00000000000..dc788801f3e
---- /dev/null
-+++ b/app/code/Magento/DirectoryGraphQl/Model/Resolver/Countries.php
-@@ -0,0 +1,63 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\DirectoryGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\Reflection\DataObjectProcessor;
-+use Magento\Directory\Api\CountryInformationAcquirerInterface;
-+use Magento\Directory\Api\Data\CountryInformationInterface;
-+
-+/**
-+ * Countries field resolver, used for GraphQL request processing.
-+ */
-+class Countries implements ResolverInterface
-+{
-+    /**
-+     * @var DataObjectProcessor
-+     */
-+    private $dataProcessor;
-+
-+    /**
-+     * @var CountryInformationAcquirerInterface
-+     */
-+    private $countryInformationAcquirer;
-+
-+    /**
-+     * @param DataObjectProcessor $dataProcessor
-+     * @param CountryInformationAcquirerInterface $countryInformationAcquirer
-+     */
-+    public function __construct(
-+        DataObjectProcessor $dataProcessor,
-+        CountryInformationAcquirerInterface $countryInformationAcquirer
-+    ) {
-+        $this->dataProcessor = $dataProcessor;
-+        $this->countryInformationAcquirer = $countryInformationAcquirer;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        $countries = $this->countryInformationAcquirer->getCountriesInfo();
-+
-+        $output = [];
-+        foreach ($countries as $country) {
-+            $output[] = $this->dataProcessor->buildOutputDataArray($country, CountryInformationInterface::class);
-+        }
-+
-+        return $output;
-+    }
-+}
-diff --git a/app/code/Magento/DirectoryGraphQl/Model/Resolver/Country.php b/app/code/Magento/DirectoryGraphQl/Model/Resolver/Country.php
-new file mode 100644
-index 00000000000..ea39f12a7bc
---- /dev/null
-+++ b/app/code/Magento/DirectoryGraphQl/Model/Resolver/Country.php
-@@ -0,0 +1,67 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\DirectoryGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\Reflection\DataObjectProcessor;
-+use Magento\Directory\Api\CountryInformationAcquirerInterface;
-+use Magento\Directory\Api\Data\CountryInformationInterface;
-+
-+/**
-+ * Country field resolver, used for GraphQL request processing.
-+ */
-+class Country implements ResolverInterface
-+{
-+    /**
-+     * @var DataObjectProcessor
-+     */
-+    private $dataProcessor;
-+
-+    /**
-+     * @var CountryInformationAcquirerInterface
-+     */
-+    private $countryInformationAcquirer;
-+
-+    /**
-+     * @param DataObjectProcessor $dataProcessor
-+     * @param CountryInformationAcquirerInterface $countryInformationAcquirer
-+     */
-+    public function __construct(
-+        DataObjectProcessor $dataProcessor,
-+        CountryInformationAcquirerInterface $countryInformationAcquirer
-+    ) {
-+        $this->dataProcessor = $dataProcessor;
-+        $this->countryInformationAcquirer = $countryInformationAcquirer;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        try {
-+            $country = $this->countryInformationAcquirer->getCountryInfo($args['id']);
-+        } catch (NoSuchEntityException $exception) {
-+            throw new GraphQlNoSuchEntityException(__($exception->getMessage()), $exception);
-+        }
-+
-+        return $this->dataProcessor->buildOutputDataArray(
-+            $country,
-+            CountryInformationInterface::class
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/DirectoryGraphQl/Model/Resolver/Currency.php b/app/code/Magento/DirectoryGraphQl/Model/Resolver/Currency.php
-new file mode 100644
-index 00000000000..fb2db6c312a
---- /dev/null
-+++ b/app/code/Magento/DirectoryGraphQl/Model/Resolver/Currency.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\DirectoryGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\Reflection\DataObjectProcessor;
-+use Magento\Directory\Api\CurrencyInformationAcquirerInterface;
-+use Magento\Directory\Api\Data\CurrencyInformationInterface;
-+
-+/**
-+ * Currency field resolver, used for GraphQL request processing.
-+ */
-+class Currency implements ResolverInterface
-+{
-+    /**
-+     * @var DataObjectProcessor
-+     */
-+    private $dataProcessor;
-+
-+    /**
-+     * @var CurrencyInformationAcquirerInterface
-+     */
-+    private $currencyInformationAcquirer;
-+
-+    /**
-+     * @param DataObjectProcessor $dataProcessor
-+     * @param CurrencyInformationAcquirerInterface $currencyInformationAcquirer
-+     */
-+    public function __construct(
-+        DataObjectProcessor $dataProcessor,
-+        CurrencyInformationAcquirerInterface $currencyInformationAcquirer
-+    ) {
-+        $this->dataProcessor = $dataProcessor;
-+        $this->currencyInformationAcquirer = $currencyInformationAcquirer;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        return $this->dataProcessor->buildOutputDataArray(
-+            $this->currencyInformationAcquirer->getCurrencyInfo(),
-+            CurrencyInformationInterface::class
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/DirectoryGraphQl/README.md b/app/code/Magento/DirectoryGraphQl/README.md
-new file mode 100644
-index 00000000000..1a5c969b39e
---- /dev/null
-+++ b/app/code/Magento/DirectoryGraphQl/README.md
-@@ -0,0 +1,4 @@
-+# DirectoryGraphQl
-+
-+**DirectoryGraphQl** provides type and resolver information for the GraphQl module
-+to generate directory information endpoints.
-diff --git a/app/code/Magento/DirectoryGraphQl/Test/Mftf/README.md b/app/code/Magento/DirectoryGraphQl/Test/Mftf/README.md
-new file mode 100644
-index 00000000000..8e2e188c1fe
---- /dev/null
-+++ b/app/code/Magento/DirectoryGraphQl/Test/Mftf/README.md
-@@ -0,0 +1,3 @@
-+# Directory Graph Ql Functional Tests
-+
-+The Functional Test Module for **Magento Directory Graph Ql** module.
-diff --git a/app/code/Magento/DirectoryGraphQl/composer.json b/app/code/Magento/DirectoryGraphQl/composer.json
-new file mode 100644
-index 00000000000..d3c783e6c7b
---- /dev/null
-+++ b/app/code/Magento/DirectoryGraphQl/composer.json
-@@ -0,0 +1,24 @@
-+{
-+  "name": "magento/module-directory-graph-ql",
-+  "description": "N/A",
-+  "type": "magento2-module",
-+  "require": {
-+    "php": "~7.1.3||~7.2.0",
-+    "magento/module-directory": "*",
-+    "magento/module-store": "*",
-+    "magento/module-graph-ql": "*",
-+    "magento/framework": "*"
-+  },
-+  "license": [
-+    "OSL-3.0",
-+    "AFL-3.0"
-+  ],
-+  "autoload": {
-+    "files": [
-+      "registration.php"
-+    ],
-+    "psr-4": {
-+      "Magento\\DirectoryGraphQl\\": ""
-+    }
-+  }
-+}
-diff --git a/app/code/Magento/DirectoryGraphQl/etc/graphql/di.xml b/app/code/Magento/DirectoryGraphQl/etc/graphql/di.xml
-new file mode 100644
-index 00000000000..63f501551f5
---- /dev/null
-+++ b/app/code/Magento/DirectoryGraphQl/etc/graphql/di.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\GraphQl\Controller\HttpRequestProcessor">
-+        <arguments>
-+            <argument name="graphQlHeaders" xsi:type="array">
-+                <item name="Content-Currency" xsi:type="object">Magento\DirectoryGraphQl\Controller\HttpHeaderProcessor\CurrencyProcessor</item>
-+            </argument>
-+            <argument name="requestValidators" xsi:type="array">
-+                <item name="currencyValidator" xsi:type="object">Magento\DirectoryGraphQl\Controller\HttpRequestValidator\CurrencyValidator</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/DirectoryGraphQl/etc/module.xml b/app/code/Magento/DirectoryGraphQl/etc/module.xml
-new file mode 100644
-index 00000000000..5d6ec613f36
---- /dev/null
-+++ b/app/code/Magento/DirectoryGraphQl/etc/module.xml
-@@ -0,0 +1,10 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_DirectoryGraphQl"/>
-+</config>
-diff --git a/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls b/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
-new file mode 100644
-index 00000000000..6daf13f567d
---- /dev/null
-+++ b/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
-@@ -0,0 +1,39 @@
-+# Copyright © Magento, Inc. All rights reserved.
-+# See COPYING.txt for license details.
-+
-+type Query {
-+    currency: Currency @resolver(class: "Magento\\DirectoryGraphQl\\Model\\Resolver\\Currency") @doc(description: "The currency query returns information about store currency.") @cache(cacheable: false)
-+    countries: [Country] @resolver(class: "Magento\\DirectoryGraphQl\\Model\\Resolver\\Countries") @doc(description: "The countries query provides information for all countries.") @cache(cacheable: false)
-+    country (id: String): Country @resolver(class: "Magento\\DirectoryGraphQl\\Model\\Resolver\\Country") @doc(description: "The countries query provides information for a single country.") @cache(cacheable: false)
-+}
-+
-+type Currency {
-+    base_currency_code: String
-+    base_currency_symbol: String
-+    default_display_currecy_code: String @deprecated(reason: "Symbol was missed. Use `default_display_currency_code`.")
-+    default_display_currency_code: String
-+    default_display_currecy_symbol: String @deprecated(reason: "Symbol was missed. Use `default_display_currency_symbol`.")
-+    default_display_currency_symbol: String
-+    available_currency_codes: [String]
-+    exchange_rates: [ExchangeRate]
-+}
-+
-+type ExchangeRate {
-+    currency_to: String
-+    rate: Float
-+}
-+
-+type Country {
-+    id: String
-+    two_letter_abbreviation: String
-+    three_letter_abbreviation: String
-+    full_name_locale: String
-+    full_name_english: String
-+    available_regions: [Region]
-+}
-+
-+type Region {
-+    id: Int
-+    code: String
-+    name: String
-+}
-diff --git a/app/code/Magento/DirectoryGraphQl/registration.php b/app/code/Magento/DirectoryGraphQl/registration.php
-new file mode 100644
-index 00000000000..6bb7fd8d4e4
---- /dev/null
-+++ b/app/code/Magento/DirectoryGraphQl/registration.php
-@@ -0,0 +1,9 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_DirectoryGraphQl', __DIR__);
-diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
-index f44d9ffe2b7..973d52e865d 100644
---- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
-+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
-@@ -4,16 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Adminhtml block for fieldset of downloadable product
-- *
-- * @author     Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Composite\Fieldset;
- 
- /**
-+ * Adminhtml block for fieldset of downloadable product
-+ *
-  * @api
-  * @since 100.0.2
-+ * @deprecated
-+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
-  */
- class Downloadable extends \Magento\Downloadable\Block\Catalog\Product\Links
- {
-diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
-index e2694b3b93b..8fdf1d39530 100644
---- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
-+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
-@@ -15,6 +15,8 @@ use Magento\Framework\Registry;
-  * Adminhtml catalog product downloadable items tab and form
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-+ * @deprecated
-+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
-  */
- class Downloadable extends Widget implements TabInterface
- {
-@@ -134,6 +136,8 @@ class Downloadable extends Widget implements TabInterface
-     }
- 
-     /**
-+     * Get group code
-+     *
-      * @return string
-      */
-     public function getGroupCode()
-@@ -152,6 +156,8 @@ class Downloadable extends Widget implements TabInterface
-     }
- 
-     /**
-+     * Is downloadable
-+     *
-      * @return bool
-      */
-     public function isDownloadable()
-@@ -160,7 +166,7 @@ class Downloadable extends Widget implements TabInterface
-     }
- 
-     /**
--     * @return $this
-+     * @inheritdoc
-      */
-     protected function _prepareLayout()
-     {
-diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
-index 947e6dc1e83..47c66c98fc8 100644
---- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
-+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
-@@ -10,6 +10,9 @@ namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Download
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ *
-+ * @deprecated
-+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Links
-  */
- class Links extends \Magento\Backend\Block\Template
- {
-@@ -434,6 +437,8 @@ class Links extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Is single store mode
-+     *
-      * @return bool
-      */
-     public function isSingleStoreMode()
-@@ -442,8 +447,11 @@ class Links extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get base currency code
-+     *
-      * @param null|string|bool|int|\Magento\Store\Model\Store $storeId $storeId
-      * @return string
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getBaseCurrencyCode($storeId)
-     {
-@@ -451,8 +459,11 @@ class Links extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get base currency symbol
-+     *
-      * @param null|string|bool|int|\Magento\Store\Model\Store $storeId $storeId
-      * @return string
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getBaseCurrencySymbol($storeId)
-     {
-diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
-index 3c86bfb2f8d..f245aeeeead 100644
---- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
-+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
-@@ -9,6 +9,9 @@ namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Download
-  * Adminhtml catalog product downloadable items tab links section
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-+ *
-+ * @deprecated
-+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples
-  */
- class Samples extends \Magento\Backend\Block\Widget
- {
-diff --git a/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php
-index 65073f267c8..51efc747380 100644
---- a/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php
-+++ b/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php
-@@ -15,6 +15,8 @@ use Magento\Framework\Pricing\PriceCurrencyInterface;
- use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
- 
- /**
-+ * Item renderer.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -35,7 +37,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
-      * @param \Magento\Framework\Url\Helper\Data $urlHelper
-      * @param \Magento\Framework\Message\ManagerInterface $messageManager
-      * @param PriceCurrencyInterface $priceCurrency
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param InterpretationStrategyInterface $messageInterpretationStrategy
-      * @param \Magento\Downloadable\Helper\Catalog\Product\Configuration $downloadableProductConfiguration
-      * @param array $data
-@@ -49,7 +51,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
-         \Magento\Framework\Url\Helper\Data $urlHelper,
-         \Magento\Framework\Message\ManagerInterface $messageManager,
-         PriceCurrencyInterface $priceCurrency,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         InterpretationStrategyInterface $messageInterpretationStrategy,
-         \Magento\Downloadable\Helper\Catalog\Product\Configuration $downloadableProductConfiguration,
-         array $data = []
-@@ -103,7 +105,8 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
-     }
- 
-     /**
--     * Get list of all options for product
-+     * Get list of all options for product.
-+     *
-      * @param \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item
-      * @return array
-      */
-diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php
-index 38444de78ab..83b2797050d 100644
---- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php
-+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php
-@@ -1,14 +1,19 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\File;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Upload extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\File
-+/**
-+ * Class Upload
-+ *
-+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\File
-+ */
-+class Upload extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\File implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Downloadable\Model\Link
-@@ -96,17 +101,10 @@ class Upload extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\Fil
-                 $relativePath = rtrim($tmpPath, '/') . '/' . ltrim($result['file'], '/');
-                 $this->storageDatabase->saveFile($relativePath);
-             }
--
--            $result['cookie'] = [
--                'name' => $this->_getSession()->getName(),
--                'value' => $this->_getSession()->getSessionId(),
--                'lifetime' => $this->_getSession()->getCookieLifetime(),
--                'path' => $this->_getSession()->getCookiePath(),
--                'domain' => $this->_getSession()->getCookieDomain(),
--            ];
-         } catch (\Exception $e) {
-             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
-         }
-+
-         return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setData($result);
-     }
- }
-diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php
-index e7b1fff2768..85f9ad39c4d 100644
---- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php
-+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php
-@@ -6,6 +6,16 @@
-  */
- namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
- 
--class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product\Crosssell
-+use Magento\Catalog\Controller\Adminhtml\Product\Crosssell as CatalogCrosssell;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class Crosssell
-+ *
-+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
-+ * @deprecated Not used since cross-sell products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
-+ */
-+class Crosssell extends CatalogCrosssell implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php
-index 8a77cb2c010..b6c25bdec9f 100644
---- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php
-+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php
-@@ -6,6 +6,16 @@
-  */
- namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
- 
--class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid
-+use Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid as CatalogCrosssellGrid;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class CrosssellGrid
-+ *
-+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
-+ * @deprecated Not used since cross-sell products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
-+ */
-+class CrosssellGrid extends CatalogCrosssellGrid implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php
-index 1ef72f1deec..fe430566d63 100644
---- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php
-+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php
-@@ -6,6 +6,13 @@
-  */
- namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
- 
-+/**
-+ * Class Form
-+ *
-+ * @deprecated since downloadable information rendering moved to UI components.
-+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
-+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
-+ */
- class Form extends \Magento\Catalog\Controller\Adminhtml\Product\Edit
- {
-     /**
-diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php
-index 8c10377f74e..0352d97bca9 100644
---- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php
-+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php
-@@ -6,6 +6,16 @@
-  */
- namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
- 
--class Related extends \Magento\Catalog\Controller\Adminhtml\Product\Related
-+use Magento\Catalog\Controller\Adminhtml\Product\Related as CatalogRelated;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class Related
-+ *
-+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
-+ * @deprecated Not used since related products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
-+ */
-+class Related extends CatalogRelated implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php
-index 403b3828e39..11e9c4eb5e3 100644
---- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php
-+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php
-@@ -6,6 +6,16 @@
-  */
- namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
- 
--class RelatedGrid extends \Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid
-+use Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid as CatalogRelatedGrid;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class RelatedGrid
-+ *
-+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
-+ * @deprecated Not used since related products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
-+ */
-+class RelatedGrid extends CatalogRelatedGrid implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php
-index d712a7ec80d..a8581f38c41 100644
---- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php
-+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php
-@@ -6,6 +6,16 @@
-  */
- namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
- 
--class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product\Upsell
-+use Magento\Catalog\Controller\Adminhtml\Product\Upsell as CatalogUpsell;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class Upsell
-+ *
-+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
-+ * @deprecated Not used since upsell products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
-+ */
-+class Upsell extends CatalogUpsell implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php
-index 960909ca1b3..3e28a96948a 100644
---- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php
-+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php
-@@ -6,6 +6,16 @@
-  */
- namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
- 
--class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid
-+use Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid as CatalogUpsellGrid;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Class UpsellGrid
-+ *
-+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
-+ * @deprecated Not used since upsell products grid moved to UI components.
-+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
-+ */
-+class UpsellGrid extends CatalogUpsellGrid implements HttpPostActionInterface
- {
- }
-diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
-index f56b219f72d..a283891afc4 100644
---- a/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
-+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
-@@ -11,6 +11,9 @@ use Magento\Downloadable\Model\Sample\Builder as SampleBuilder;
- use Magento\Downloadable\Api\Data\SampleInterfaceFactory;
- use Magento\Downloadable\Api\Data\LinkInterfaceFactory;
- 
-+/**
-+ * Class for initialization downloadable info from request.
-+ */
- class Downloadable
- {
-     /**
-@@ -92,6 +95,8 @@ class Downloadable
-                     }
-                 }
-                 $extension->setDownloadableProductLinks($links);
-+            } else {
-+                $extension->setDownloadableProductLinks([]);
-             }
-             if (isset($downloadable['sample']) && is_array($downloadable['sample'])) {
-                 $samples = [];
-@@ -107,6 +112,8 @@ class Downloadable
-                     }
-                 }
-                 $extension->setDownloadableProductSamples($samples);
-+            } else {
-+                $extension->setDownloadableProductSamples([]);
-             }
-             $product->setExtensionAttributes($extension);
-             if ($product->getLinksPurchasedSeparately()) {
-diff --git a/app/code/Magento/Downloadable/Controller/Download/Link.php b/app/code/Magento/Downloadable/Controller/Download/Link.php
-index 765546d080e..4766f1699af 100644
---- a/app/code/Magento/Downloadable/Controller/Download/Link.php
-+++ b/app/code/Magento/Downloadable/Controller/Download/Link.php
-@@ -1,15 +1,21 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Downloadable\Controller\Download;
- 
- use Magento\Downloadable\Helper\Download as DownloadHelper;
- use Magento\Downloadable\Model\Link\Purchased\Item as PurchasedLink;
- use Magento\Framework\App\ResponseInterface;
- 
-+/**
-+ * Class Link executes download link action.
-+ *
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-+ */
- class Link extends \Magento\Downloadable\Controller\Download
- {
-     /**
-@@ -29,7 +35,6 @@ class Link extends \Magento\Downloadable\Controller\Download
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     public function execute()
-     {
-@@ -117,6 +122,7 @@ class Link extends \Magento\Downloadable\Controller\Download
-                     $linkPurchasedItem->setStatus(PurchasedLink::LINK_STATUS_EXPIRED);
-                 }
-                 $linkPurchasedItem->save();
-+                // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-                 exit(0);
-             } catch (\Exception $e) {
-                 $this->messageManager->addError(__('Something went wrong while getting the requested content.'));
-diff --git a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
-index 76ec791611c..f40df744dd3 100644
---- a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
-+++ b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
-@@ -1,21 +1,26 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Downloadable\Controller\Download;
- 
- use Magento\Downloadable\Helper\Download as DownloadHelper;
- use Magento\Framework\App\ResponseInterface;
- 
-+/**
-+ * Class LinkSample executes download sample link action.
-+ *
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-+ */
- class LinkSample extends \Magento\Downloadable\Controller\Download
- {
-     /**
-      * Download link's sample action
-      *
-      * @return ResponseInterface
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     public function execute()
-     {
-@@ -39,6 +44,7 @@ class LinkSample extends \Magento\Downloadable\Controller\Download
-             }
-             try {
-                 $this->_processDownload($resource, $resourceType);
-+                // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-                 exit(0);
-             } catch (\Exception $e) {
-                 $this->messageManager->addError(
-diff --git a/app/code/Magento/Downloadable/Controller/Download/Sample.php b/app/code/Magento/Downloadable/Controller/Download/Sample.php
-index 4a4f88d81b3..ac9eeac678f 100644
---- a/app/code/Magento/Downloadable/Controller/Download/Sample.php
-+++ b/app/code/Magento/Downloadable/Controller/Download/Sample.php
-@@ -1,21 +1,26 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Downloadable\Controller\Download;
- 
- use Magento\Downloadable\Helper\Download as DownloadHelper;
- use Magento\Framework\App\ResponseInterface;
- 
-+/**
-+ * Class Sample executes download sample action.
-+ *
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-+ */
- class Sample extends \Magento\Downloadable\Controller\Download
- {
-     /**
-      * Download sample action
-      *
-      * @return ResponseInterface
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     public function execute()
-     {
-@@ -36,6 +41,7 @@ class Sample extends \Magento\Downloadable\Controller\Download
-             }
-             try {
-                 $this->_processDownload($resource, $resourceType);
-+                // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-                 exit(0);
-             } catch (\Exception $e) {
-                 $this->messageManager->addError(
-diff --git a/app/code/Magento/Downloadable/Helper/Data.php b/app/code/Magento/Downloadable/Helper/Data.php
-index 96aa5bdfeff..e9b2a5ce44c 100644
---- a/app/code/Magento/Downloadable/Helper/Data.php
-+++ b/app/code/Magento/Downloadable/Helper/Data.php
-@@ -5,7 +5,9 @@
-  */
- namespace Magento\Downloadable\Helper;
- 
-+use Magento\Downloadable\Model\Link;
- use Magento\Downloadable\Model\Link\Purchased\Item;
-+use Magento\Store\Model\ScopeInterface;
- 
- /**
-  * Downloadable helper
-@@ -17,7 +19,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     /**
-      * Check is link shareable or not
-      *
--     * @param \Magento\Downloadable\Model\Link|Item $link
-+     * @param Link|Item $link
-      * @return bool
-      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-      */
-@@ -25,14 +27,14 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     {
-         $shareable = false;
-         switch ($link->getIsShareable()) {
--            case \Magento\Downloadable\Model\Link::LINK_SHAREABLE_YES:
--            case \Magento\Downloadable\Model\Link::LINK_SHAREABLE_NO:
-+            case Link::LINK_SHAREABLE_YES:
-+            case Link::LINK_SHAREABLE_NO:
-                 $shareable = (bool)$link->getIsShareable();
-                 break;
--            case \Magento\Downloadable\Model\Link::LINK_SHAREABLE_CONFIG:
--                $shareable = (bool)$this->scopeConfig->isSetFlag(
--                    \Magento\Downloadable\Model\Link::XML_PATH_CONFIG_IS_SHAREABLE,
--                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            case Link::LINK_SHAREABLE_CONFIG:
-+                $shareable = $this->scopeConfig->isSetFlag(
-+                    Link::XML_PATH_CONFIG_IS_SHAREABLE,
-+                    ScopeInterface::SCOPE_STORE
-                 );
-         }
-         return $shareable;
-diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
-index 150a5ec474f..6b7db3af511 100644
---- a/app/code/Magento/Downloadable/Helper/Download.php
-+++ b/app/code/Magento/Downloadable/Helper/Download.php
-@@ -13,6 +13,7 @@ use Magento\Framework\Exception\LocalizedException as CoreException;
- /**
-  * Downloadable Products Download Helper
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class Download extends \Magento\Framework\App\Helper\AbstractHelper
- {
-@@ -186,19 +187,20 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
-     public function getContentType()
-     {
-         $this->_getHandle();
--        if ($this->_linkType == self::LINK_TYPE_FILE) {
--            if (function_exists(
--                'mime_content_type'
--            ) && ($contentType = mime_content_type(
--                $this->_workingDirectory->getAbsolutePath($this->_resourceFile)
--            ))
-+        if ($this->_linkType === self::LINK_TYPE_FILE) {
-+            if (function_exists('mime_content_type')
-+                && ($contentType = mime_content_type(
-+                    $this->_workingDirectory->getAbsolutePath($this->_resourceFile)
-+                ))
-             ) {
-                 return $contentType;
--            } else {
--                return $this->_downloadableFile->getFileType($this->_resourceFile);
-             }
--        } elseif ($this->_linkType == self::LINK_TYPE_URL) {
--            return $this->_handle->stat($this->_resourceFile)['type'];
-+            return $this->_downloadableFile->getFileType($this->_resourceFile);
-+        }
-+        if ($this->_linkType === self::LINK_TYPE_URL) {
-+            return (is_array($this->_handle->stat($this->_resourceFile)['type'])
-+                ? end($this->_handle->stat($this->_resourceFile)['type'])
-+                : $this->_handle->stat($this->_resourceFile)['type']);
-         }
-         return $this->_contentType;
-     }
-@@ -252,10 +254,21 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
-                 );
-             }
-         }
--
-+        
-         $this->_resourceFile = $resourceFile;
-+        
-+        /**
-+        * check header for urls
-+        */
-+        if ($linkType === self::LINK_TYPE_URL) {
-+            $headers = array_change_key_case(get_headers($this->_resourceFile, 1), CASE_LOWER);
-+            if (isset($headers['location'])) {
-+                $this->_resourceFile  = is_array($headers['location']) ? current($headers['location'])
-+                    : $headers['location'];
-+            }
-+        }
-+        
-         $this->_linkType = $linkType;
--
-         return $this;
-     }
- 
-diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Indexer/Price.php b/app/code/Magento/Downloadable/Model/ResourceModel/Indexer/Price.php
-index 855fac5041b..90b458ff634 100644
---- a/app/code/Magento/Downloadable/Model/ResourceModel/Indexer/Price.php
-+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Indexer/Price.php
-@@ -6,73 +6,177 @@
- namespace Magento\Downloadable\Model\ResourceModel\Indexer;
- 
- use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier;
-+use Magento\Downloadable\Model\Product\Type;
-+use Magento\Eav\Model\Config;
-+use Magento\Framework\App\ResourceConnection;
-+use Magento\Framework\Indexer\DimensionalIndexerInterface;
-+use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query\BaseFinalPrice;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
- 
- /**
-- * Downloadable products Price indexer resource model
-- *
-- * @author      Magento Core Team <core@magentocommerce.com>
-+ * Downloadable Product Price Indexer Resource model
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
-+class Price implements DimensionalIndexerInterface
- {
-     /**
--     * @param null|int|array $entityIds
--     * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
-+     * @var BaseFinalPrice
-      */
--    protected function reindex($entityIds = null)
--    {
--        if ($this->hasEntity() || !empty($entityIds)) {
--            $this->_prepareFinalPriceData($entityIds);
--            $this->_applyCustomOption();
--            $this->_applyDownloadableLink();
--            $this->_movePriceDataToIndexTable();
--        }
-+    private $baseFinalPrice;
- 
--        return $this;
-+    /**
-+     * @var IndexTableStructureFactory
-+     */
-+    private $indexTableStructureFactory;
-+
-+    /**
-+     * @var TableMaintainer
-+     */
-+    private $tableMaintainer;
-+
-+    /**
-+     * @var MetadataPool
-+     */
-+    private $metadataPool;
-+
-+    /**
-+     * @var ResourceConnection
-+     */
-+    private $resource;
-+
-+    /**
-+     * @var string
-+     */
-+    private $connectionName;
-+
-+    /**
-+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
-+     */
-+    private $connection;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $eavConfig;
-+
-+    /**
-+     * @var BasePriceModifier
-+     */
-+    private $basePriceModifier;
-+
-+    /**
-+     * @param BaseFinalPrice $baseFinalPrice
-+     * @param IndexTableStructureFactory $indexTableStructureFactory
-+     * @param TableMaintainer $tableMaintainer
-+     * @param MetadataPool $metadataPool
-+     * @param Config $eavConfig
-+     * @param ResourceConnection $resource
-+     * @param BasePriceModifier $basePriceModifier
-+     * @param string $connectionName
-+     */
-+    public function __construct(
-+        BaseFinalPrice $baseFinalPrice,
-+        IndexTableStructureFactory $indexTableStructureFactory,
-+        TableMaintainer $tableMaintainer,
-+        MetadataPool $metadataPool,
-+        Config $eavConfig,
-+        ResourceConnection $resource,
-+        BasePriceModifier $basePriceModifier,
-+        $connectionName = 'indexer'
-+    ) {
-+        $this->baseFinalPrice = $baseFinalPrice;
-+        $this->indexTableStructureFactory = $indexTableStructureFactory;
-+        $this->tableMaintainer = $tableMaintainer;
-+        $this->connectionName = $connectionName;
-+        $this->metadataPool = $metadataPool;
-+        $this->resource = $resource;
-+        $this->eavConfig = $eavConfig;
-+        $this->basePriceModifier = $basePriceModifier;
-     }
- 
-     /**
--     * Retrieve downloadable links price temporary index table name
--     *
--     * @see _prepareDefaultFinalPriceTable()
--     *
--     * @return string
-+     * {@inheritdoc}
-+     * @param array $dimensions
-+     * @param \Traversable $entityIds
-+     * @throws \Exception
-      */
--    protected function _getDownloadableLinkPriceTable()
-+    public function executeByDimensions(array $dimensions, \Traversable $entityIds)
-     {
--        return $this->tableStrategy->getTableName('catalog_product_index_price_downlod');
-+        $temporaryPriceTable = $this->indexTableStructureFactory->create([
-+            'tableName' => $this->tableMaintainer->getMainTmpTable($dimensions),
-+            'entityField' => 'entity_id',
-+            'customerGroupField' => 'customer_group_id',
-+            'websiteField' => 'website_id',
-+            'taxClassField' => 'tax_class_id',
-+            'originalPriceField' => 'price',
-+            'finalPriceField' => 'final_price',
-+            'minPriceField' => 'min_price',
-+            'maxPriceField' => 'max_price',
-+            'tierPriceField' => 'tier_price',
-+        ]);
-+        $this->fillFinalPrice($dimensions, $entityIds, $temporaryPriceTable);
-+        $this->basePriceModifier->modifyPrice($temporaryPriceTable, iterator_to_array($entityIds));
-+        $this->applyDownloadableLink($temporaryPriceTable, $dimensions);
-     }
- 
-     /**
--     * Prepare downloadable links price temporary index table
-+     * Calculate and apply Downloadable links price to index
-      *
-+     * @param IndexTableStructure $temporaryPriceTable
-+     * @param array $dimensions
-      * @return $this
-+     * @throws \Exception
-      */
--    protected function _prepareDownloadableLinkPriceTable()
--    {
--        $this->getConnection()->delete($this->_getDownloadableLinkPriceTable());
-+    private function applyDownloadableLink(
-+        IndexTableStructure $temporaryPriceTable,
-+        array $dimensions
-+    ) {
-+        $temporaryDownloadableTableName = 'catalog_product_index_price_downlod_temp';
-+        $this->getConnection()->createTemporaryTableLike(
-+            $temporaryDownloadableTableName,
-+            $this->getTable('catalog_product_index_price_downlod_tmp'),
-+            true
-+        );
-+        $this->fillTemporaryTable($temporaryDownloadableTableName, $dimensions);
-+        $this->updateTemporaryDownloadableTable($temporaryPriceTable->getTableName(), $temporaryDownloadableTableName);
-+        $this->getConnection()->delete($temporaryDownloadableTableName);
-         return $this;
-     }
- 
-     /**
--     * Calculate and apply Downloadable links price to index
-+     * Retrieve catalog_product attribute instance by attribute code
-      *
--     * @return $this
-+     * @param string $attributeCode
-+     * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
--    protected function _applyDownloadableLink()
-+    protected function getAttribute($attributeCode)
-     {
--        $connection = $this->getConnection();
--        $table = $this->_getDownloadableLinkPriceTable();
--        $finalPriceTable = $this->_getDefaultFinalPriceTable();
--
--        $this->_prepareDownloadableLinkPriceTable();
--
--        $dlType = $this->_getAttribute('links_purchased_separately');
--        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
-+        return $this->eavConfig->getAttribute(Product::ENTITY, $attributeCode);
-+    }
- 
--        $ifPrice = $connection->getIfNullSql('dlpw.price_id', 'dlpd.price');
-+    /**
-+     * Put data into catalog product price indexer Downloadable links price  temp table
-+     *
-+     * @param string $temporaryDownloadableTableName
-+     * @param array $dimensions
-+     * @return void
-+     * @throws \Exception
-+     */
-+    private function fillTemporaryTable(string $temporaryDownloadableTableName, array $dimensions)
-+    {
-+        $dlType = $this->getAttribute('links_purchased_separately');
-+        $ifPrice = $this->getConnection()->getIfNullSql('dlpw.price_id', 'dlpd.price');
-+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
-+        $linkField = $metadata->getLinkField();
- 
--        $select = $connection->select()->from(
--            ['i' => $finalPriceTable],
-+        $select = $this->getConnection()->select()->from(
-+            ['i' => $this->tableMaintainer->getMainTmpTable($dimensions)],
-             ['entity_id', 'customer_group_id', 'website_id']
-         )->join(
-             ['dl' => $dlType->getBackend()->getTable()],
-@@ -101,30 +205,87 @@ class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\D
-                 'max_price' => new \Zend_Db_Expr('SUM(' . $ifPrice . ')'),
-             ]
-         );
-+        $query = $select->insertFromSelect($temporaryDownloadableTableName);
-+        $this->getConnection()->query($query);
-+    }
- 
--        $query = $select->insertFromSelect($table);
--        $connection->query($query);
--
--        $ifTierPrice = $connection->getCheckSql('i.tier_price IS NOT NULL', '(i.tier_price + id.min_price)', 'NULL');
-+    /**
-+     * Update data in the catalog product price indexer temp table
-+     *
-+     * @param string $temporaryPriceTableName
-+     * @param string $temporaryDownloadableTableName
-+     * @return void
-+     */
-+    private function updateTemporaryDownloadableTable(
-+        string $temporaryPriceTableName,
-+        string $temporaryDownloadableTableName
-+    ) {
-+        $ifTierPrice = $this->getConnection()->getCheckSql(
-+            'i.tier_price IS NOT NULL',
-+            '(i.tier_price + id.min_price)',
-+            'NULL'
-+        );
- 
--        $select = $connection->select()->join(
--            ['id' => $table],
-+        $selectForCrossUpdate = $this->getConnection()->select()->join(
-+            ['id' => $temporaryDownloadableTableName],
-             'i.entity_id = id.entity_id AND i.customer_group_id = id.customer_group_id' .
-             ' AND i.website_id = id.website_id',
-             []
--        )->columns(
-+        );
-+        // adds price of custom option, that was applied in DefaultPrice::_applyCustomOption
-+        $selectForCrossUpdate->columns(
-             [
-                 'min_price' => new \Zend_Db_Expr('i.min_price + id.min_price'),
-                 'max_price' => new \Zend_Db_Expr('i.max_price + id.max_price'),
-                 'tier_price' => new \Zend_Db_Expr($ifTierPrice),
-             ]
-         );
-+        $query = $selectForCrossUpdate->crossUpdateFromSelect(['i' => $temporaryPriceTableName]);
-+        $this->getConnection()->query($query);
-+    }
- 
--        $query = $select->crossUpdateFromSelect(['i' => $finalPriceTable]);
--        $connection->query($query);
-+    /**
-+     * Fill final price
-+     *
-+     * @param array $dimensions
-+     * @param \Traversable $entityIds
-+     * @param IndexTableStructure $temporaryPriceTable
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Zend_Db_Select_Exception
-+     */
-+    private function fillFinalPrice(
-+        array $dimensions,
-+        \Traversable $entityIds,
-+        IndexTableStructure $temporaryPriceTable
-+    ) {
-+        $select = $this->baseFinalPrice->getQuery($dimensions, Type::TYPE_DOWNLOADABLE, iterator_to_array($entityIds));
-+        $query = $select->insertFromSelect($temporaryPriceTable->getTableName(), [], false);
-+        $this->tableMaintainer->getConnection()->query($query);
-+    }
- 
--        $connection->delete($table);
-+    /**
-+     * Get connection
-+     *
-+     * return \Magento\Framework\DB\Adapter\AdapterInterface
-+     * @throws \DomainException
-+     */
-+    private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
-+    {
-+        if ($this->connection === null) {
-+            $this->connection = $this->resource->getConnection($this->connectionName);
-+        }
- 
--        return $this;
-+        return $this->connection;
-+    }
-+
-+    /**
-+     * Get table
-+     *
-+     * @param string $tableName
-+     * @return string
-+     */
-+    private function getTable($tableName)
-+    {
-+        return $this->resource->getTableName($tableName, $this->connectionName);
-     }
- }
-diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Link.php b/app/code/Magento/Downloadable/Model/ResourceModel/Link.php
-index 24d1d7831c9..df8427bdde6 100644
---- a/app/code/Magento/Downloadable/Model/ResourceModel/Link.php
-+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link.php
-@@ -5,10 +5,6 @@
-  */
- namespace Magento\Downloadable\Model\ResourceModel;
- 
--use Magento\Catalog\Api\Data\ProductInterface;
--use Magento\Framework\App\ObjectManager;
--use Magento\Framework\EntityManager\MetadataPool;
--
- /**
-  * Downloadable Product  Samples resource model
-  *
-@@ -17,11 +13,6 @@ use Magento\Framework\EntityManager\MetadataPool;
-  */
- class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- {
--    /**
--     * @var MetadataPool
--     */
--    private $metadataPool;
--
-     /**
-      * Catalog data
-      *
-@@ -210,10 +201,7 @@ class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-             []
-         )->join(
-             ['cpe' => $this->getTable('catalog_product_entity')],
--            sprintf(
--                'cpe.entity_id = m.product_id',
--                $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField()
--            ),
-+            'cpe.entity_id = m.product_id',
-             []
-         )->joinLeft(
-             ['st' => $this->getTable('downloadable_link_title')],
-@@ -228,22 +216,12 @@ class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Get Currency model.
-+     *
-      * @return \Magento\Directory\Model\Currency
-      */
-     protected function _createCurrency()
-     {
-         return $this->_currencyFactory->create();
-     }
--
--    /**
--     * Get MetadataPool instance
--     * @return MetadataPool
--     */
--    private function getMetadataPool()
--    {
--        if (!$this->metadataPool) {
--            $this->metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
--        }
--        return $this->metadataPool;
--    }
- }
-diff --git a/app/code/Magento/Downloadable/Model/SampleRepository.php b/app/code/Magento/Downloadable/Model/SampleRepository.php
-index 0c7d2b96f1b..07c7631fade 100644
---- a/app/code/Magento/Downloadable/Model/SampleRepository.php
-+++ b/app/code/Magento/Downloadable/Model/SampleRepository.php
-@@ -23,6 +23,7 @@ use Magento\Framework\App\ObjectManager;
- 
- /**
-  * Class SampleRepository
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class SampleRepository implements \Magento\Downloadable\Api\SampleRepositoryInterface
-@@ -100,7 +101,7 @@ class SampleRepository implements \Magento\Downloadable\Api\SampleRepositoryInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getList($sku)
-     {
-@@ -209,6 +210,8 @@ class SampleRepository implements \Magento\Downloadable\Api\SampleRepositoryInte
-     }
- 
-     /**
-+     * Save sample.
-+     *
-      * @param \Magento\Catalog\Api\Data\ProductInterface $product
-      * @param SampleInterface $sample
-      * @param bool $isGlobalScopeContent
-@@ -257,6 +260,8 @@ class SampleRepository implements \Magento\Downloadable\Api\SampleRepositoryInte
-     }
- 
-     /**
-+     * Update sample.
-+     *
-      * @param \Magento\Catalog\Api\Data\ProductInterface $product
-      * @param SampleInterface $sample
-      * @param bool $isGlobalScopeContent
-@@ -308,15 +313,18 @@ class SampleRepository implements \Magento\Downloadable\Api\SampleRepositoryInte
-             $existingSample->setTitle($sample->getTitle());
-         }
- 
--        if ($sample->getSampleType() === 'file' && $sample->getSampleFileContent() === null) {
--            $sample->setSampleFile($existingSample->getSampleFile());
-+        if ($sample->getSampleType() === 'file'
-+            && $sample->getSampleFileContent() === null
-+            && $sample->getSampleFile() !== null
-+        ) {
-+            $existingSample->setSampleFile($sample->getSampleFile());
-         }
-         $this->saveSample($product, $sample, $isGlobalScopeContent);
-         return $existingSample->getId();
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function delete($id)
-     {
-diff --git a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
-index 64305cfce9b..4f7939da478 100644
---- a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
-+++ b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
-@@ -9,6 +9,8 @@ use Magento\Framework\Event\ObserverInterface;
- use Magento\Store\Model\ScopeInterface;
- 
- /**
-+ * Saves data from order to purchased links.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class SaveDownloadableOrderItemObserver implements ObserverInterface
-@@ -92,9 +94,15 @@ class SaveDownloadableOrderItemObserver implements ObserverInterface
-         if ($purchasedLink->getId()) {
-             return $this;
-         }
-+        $storeId = $orderItem->getOrder()->getStoreId();
-+        $orderStatusToEnableItem = $this->_scopeConfig->getValue(
-+            \Magento\Downloadable\Model\Link\Purchased\Item::XML_PATH_ORDER_ITEM_STATUS,
-+            ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-         if (!$product) {
-             $product = $this->_createProductModel()->setStoreId(
--                $orderItem->getOrder()->getStoreId()
-+                $storeId
-             )->load(
-                 $orderItem->getProductId()
-             );
-@@ -123,6 +131,14 @@ class SaveDownloadableOrderItemObserver implements ObserverInterface
-                         ScopeInterface::SCOPE_STORE
-                     );
-                 $linkPurchased->setLinkSectionTitle($linkSectionTitle)->save();
-+                
-+                $linkStatus = \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING;
-+                if ($orderStatusToEnableItem == \Magento\Sales\Model\Order\Item::STATUS_PENDING
-+                    || $orderItem->getOrder()->getState() == \Magento\Sales\Model\Order::STATE_COMPLETE
-+                ) {
-+                    $linkStatus = \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE;
-+                }
-+                
-                 foreach ($linkIds as $linkId) {
-                     if (isset($links[$linkId])) {
-                         $linkPurchasedItem = $this->_createPurchasedItemModel()->setPurchasedId(
-@@ -150,7 +166,7 @@ class SaveDownloadableOrderItemObserver implements ObserverInterface
-                         )->setNumberOfDownloadsBought(
-                             $numberOfDownloads
-                         )->setStatus(
--                            \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING
-+                            $linkStatus
-                         )->setCreatedAt(
-                             $orderItem->getCreatedAt()
-                         )->setUpdatedAt(
-@@ -160,11 +176,12 @@ class SaveDownloadableOrderItemObserver implements ObserverInterface
-                 }
-             }
-         }
--
-         return $this;
-     }
- 
-     /**
-+     * Create purchased model.
-+     *
-      * @return \Magento\Downloadable\Model\Link\Purchased
-      */
-     protected function _createPurchasedModel()
-@@ -173,6 +190,8 @@ class SaveDownloadableOrderItemObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Create product model.
-+     *
-      * @return \Magento\Catalog\Model\Product
-      */
-     protected function _createProductModel()
-@@ -181,6 +200,8 @@ class SaveDownloadableOrderItemObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Create purchased item model.
-+     *
-      * @return \Magento\Downloadable\Model\Link\Purchased\Item
-      */
-     protected function _createPurchasedItemModel()
-@@ -189,6 +210,8 @@ class SaveDownloadableOrderItemObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Create items collection.
-+     *
-      * @return \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\Collection
-      */
-     protected function _createItemsCollection()
-diff --git a/app/code/Magento/Downloadable/Observer/UpdateLinkPurchasedObserver.php b/app/code/Magento/Downloadable/Observer/UpdateLinkPurchasedObserver.php
-new file mode 100644
-index 00000000000..223a3ad66b3
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Observer/UpdateLinkPurchasedObserver.php
-@@ -0,0 +1,84 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Downloadable\Observer;
-+
-+use Magento\Downloadable\Model\ResourceModel\Link\Purchased\Collection as PurchasedCollection;
-+use Magento\Downloadable\Model\ResourceModel\Link\Purchased\CollectionFactory;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\Event\Observer;
-+use Magento\Framework\Event\ObserverInterface;
-+
-+/**
-+ * Assign Downloadable links to customer created after issuing guest order.
-+ */
-+class UpdateLinkPurchasedObserver implements ObserverInterface
-+{
-+    /**
-+     * Core store config
-+     *
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * Purchased links collection factory
-+     *
-+     * @var CollectionFactory
-+     */
-+    private $purchasedCollectionFactory;
-+
-+    /**
-+     * @param ScopeConfigInterface $scopeConfig
-+     * @param CollectionFactory $purchasedCollectionFactory
-+     */
-+    public function __construct(
-+        ScopeConfigInterface $scopeConfig,
-+        CollectionFactory $purchasedCollectionFactory
-+    ) {
-+        $this->scopeConfig = $scopeConfig;
-+        $this->purchasedCollectionFactory = $purchasedCollectionFactory;
-+    }
-+
-+    /**
-+     * Link customer_id to downloadable link purchased after update order
-+     *
-+     * @param Observer $observer
-+     * @return $this
-+     */
-+    public function execute(Observer $observer)
-+    {
-+        $order = $observer->getEvent()->getOrder();
-+        $orderId = $order->getId();
-+        $customerId = $order->getCustomerId();
-+        if (!$orderId || !$customerId) {
-+            return $this;
-+        }
-+        $purchasedLinksCollection = $this->getPurchasedCollection((int)$orderId);
-+        foreach ($purchasedLinksCollection as $linkPurchased) {
-+            $linkPurchased->setCustomerId($customerId)->save();
-+        }
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * Get purchased collection by order id
-+     *
-+     * @param int $orderId
-+     * @return PurchasedCollection
-+     */
-+    private function getPurchasedCollection(int $orderId): PurchasedCollection
-+    {
-+        $purchasedCollection = $this->purchasedCollectionFactory->create()->addFieldToFilter(
-+            'order_id',
-+            ['eq' => $orderId]
-+        );
-+
-+        return $purchasedCollection;
-+    }
-+}
-diff --git a/app/code/Magento/Downloadable/Setup/Patch/Data/UpdateLinksExistDefaultAttributeValue.php b/app/code/Magento/Downloadable/Setup/Patch/Data/UpdateLinksExistDefaultAttributeValue.php
-new file mode 100644
-index 00000000000..bde9accc39d
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Setup/Patch/Data/UpdateLinksExistDefaultAttributeValue.php
-@@ -0,0 +1,82 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Downloadable\Setup\Patch\Data;
-+
-+use Magento\Eav\Setup\EavSetup;
-+use Magento\Eav\Setup\EavSetupFactory;
-+use Magento\Framework\Setup\ModuleDataSetupInterface;
-+use Magento\Framework\Setup\Patch\DataPatchInterface;
-+use Magento\Framework\Setup\Patch\PatchVersionInterface;
-+
-+/**
-+ * Remove default value from links exist attribute.
-+ */
-+class UpdateLinksExistDefaultAttributeValue implements DataPatchInterface, PatchVersionInterface
-+{
-+    /**
-+     * @var ModuleDataSetupInterface
-+     */
-+    private $moduleDataSetup;
-+
-+    /**
-+     * @var EavSetupFactory
-+     */
-+    private $eavSetupFactory;
-+
-+    /**
-+     * @param ModuleDataSetupInterface $moduleDataSetup
-+     * @param EavSetupFactory $eavSetupFactory
-+     */
-+    public function __construct(
-+        ModuleDataSetupInterface $moduleDataSetup,
-+        EavSetupFactory $eavSetupFactory
-+    ) {
-+        $this->moduleDataSetup = $moduleDataSetup;
-+        $this->eavSetupFactory = $eavSetupFactory;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function apply()
-+    {
-+        /** @var EavSetup $eavSetup */
-+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
-+        // remove default value
-+        $eavSetup->updateAttribute(
-+            \Magento\Catalog\Model\Product::ENTITY,
-+            'links_exist',
-+            'default_value',
-+            null
-+        );
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public static function getDependencies()
-+    {
-+        return [InstallDownloadableAttributes::class];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public static function getVersion()
-+    {
-+        return '2.0.3';
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getAliases()
-+    {
-+        return [];
-+    }
-+}
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminAddDownloadableLinkInformationActionGroup.xml b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminAddDownloadableLinkInformationActionGroup.xml
-new file mode 100644
-index 00000000000..37c6936cfb2
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminAddDownloadableLinkInformationActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Add information before create downloadable link -->
-+    <actionGroup name="AdminAddDownloadableLinkInformationActionGroup">
-+        <arguments>
-+            <argument name="downloadableData" type="entity" defaultValue="downloadableData"/>
-+        </arguments>
-+        <click selector="{{AdminProductDownloadableSection.sectionHeader}}" stepKey="openDownloadableSection"/>
-+        <checkOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkOptionIsDownloadable" after="openDownloadableSection"/>
-+        <fillField userInput="{{downloadableData.link_title}}" selector="{{AdminProductDownloadableSection.linksTitleInput}}" stepKey="fillLinkTitle" after="checkOptionIsDownloadable"/>
-+        <fillField userInput="{{downloadableData.sample_title}}" selector="{{AdminProductDownloadableSection.samplesTitleInput}}" stepKey="fillSampleTitle" after="fillLinkTitle"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml
-index 2e1392eb0d2..363911daa41 100644
---- a/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml
-+++ b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Fill main fields in product form-->
-     <actionGroup name="fillMainDownloadableProductForm">
-         <arguments>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/StorefrontAssertDownloadableProductIsPresentInCustomerAccountActionGroup.xml b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/StorefrontAssertDownloadableProductIsPresentInCustomerAccountActionGroup.xml
-new file mode 100644
-index 00000000000..2e4afbd8032
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/StorefrontAssertDownloadableProductIsPresentInCustomerAccountActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertDownloadableProductIsPresentInCustomerAccount">
-+        <arguments>
-+            <argument name="product"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="goToMyAccountPage"/>
-+        <click selector="{{StorefrontCustomerSidebarSection.sidebarTab('My Downloadable Products')}}" stepKey="clickDownloadableProducts"/>
-+        <waitForPageLoad stepKey="waitForDownloadableProductsPageLoad" />
-+        <seeElement selector="{{StorefrontCustomerDownloadableProductsSection.productName(product.name)}}" stepKey="seeStorefontDownloadableProductsProductName" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
-new file mode 100644
-index 00000000000..b84dbff1154
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="VerifyProductTypeOrder">
-+        <seeElement stepKey="seeDownloadableInOrder" selector="{{AdminProductDropdownOrderSection.downloadProduct}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/CatalogConfigData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/CatalogConfigData.xml
-new file mode 100644
-index 00000000000..8bb81f9c757
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/CatalogConfigData.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="EnableGuestCheckoutWithDownloadableItems">
-+        <data key="path">catalog/downloadable/disable_guest_checkout</data>
-+        <data key="scope_id">0</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="DisableGuestCheckoutWithDownloadableItems">
-+        <data key="path">catalog/downloadable/disable_guest_checkout</data>
-+        <data key="scope_id">0</data>
-+        <data key="value">1</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
-index 16f32942a37..08f1c234935 100644
---- a/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="downloadableData" type="downloadable_data">
-         <data key="link_title">Downloadable Links</data>
-         <data key="sample_title">Downloadable Samples</data>
-@@ -31,6 +31,28 @@
-         <data key="file">magento-logo.png</data>
-         <data key="sample">https://static.magento.com/sites/all/themes/mag_redesign/images/magento-logo.svg</data>
-     </entity>
-+    <entity name="downloadableLink1" type="downloadable_link">
-+        <data key="title" unique="suffix">link-1</data>
-+        <data key="price">2.43</data>
-+        <data key="number_of_downloads">2</data>
-+        <data key="sample_type">url</data>
-+        <data key="sample_url">http://example.com</data>
-+        <data key="link_type">url</data>
-+        <data key="link_url">http://example.com</data>
-+        <data key="is_shareable">0</data>
-+        <data key="sort_order">1</data>
-+    </entity>
-+    <entity name="downloadableLink2" type="downloadable_link">
-+        <data key="title" unique="suffix">link-2</data>
-+        <data key="price">3</data>
-+        <data key="number_of_downloads">3</data>
-+        <data key="sample_type">url</data>
-+        <data key="sample_url">http://example.com</data>
-+        <data key="link_type">url</data>
-+        <data key="link_url">http://example.com</data>
-+        <data key="is_shareable">1</data>
-+        <data key="sort_order">2</data>
-+    </entity>
-     <entity name="downloadableSampleFile" type="downloadable_sample">
-         <data key="title" unique="suffix">SampleFile</data>
-         <data key="file_type">Upload File</data>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
-index 2c25c2c9b82..59651383feb 100644
---- a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="DownloadableProduct" type="product">
-         <data key="sku" unique="suffix">downloadableproduct</data>
-         <data key="type_id">downloadable</data>
-@@ -19,6 +19,46 @@
-         <data key="status">1</data>
-         <data key="urlKey" unique="suffix">downloadableproduct</data>
-     </entity>
-+    <entity name="DownloadableProductOutOfStock" type="product">
-+        <data key="sku" unique="suffix">downloadableoutofstockproduct</data>
-+        <data key="type_id">downloadable</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="name" unique="suffix">DownloadableProduct</data>
-+        <data key="price">50.99</data>
-+        <data key="quantity">100</data>
-+        <data key="weight">0</data>
-+        <data key="status">0</data>
-+        <data key="urlKey" unique="suffix">downloadableproduct</data>
-+    </entity>
-+    <entity name="DownloadableProductWithOneLink" type="product">
-+        <data key="sku" unique="suffix">downloadableproduct</data>
-+        <data key="type_id">downloadable</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="name" unique="suffix">DownloadableProduct</data>
-+        <data key="price">50.99</data>
-+        <data key="quantity">100</data>
-+        <data key="weight">0</data>
-+        <data key="status">1</data>
-+        <data key="urlKey" unique="suffix">downloadableproduct</data>
-+        <data key="visibility">4</data>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-+        <requiredEntity type="downloadable_link">downloadableLink1</requiredEntity>
-+    </entity>
-+    <entity name="DownloadableProductWithTwoLink" type="product">
-+        <data key="sku" unique="suffix">downloadableproduct</data>
-+        <data key="type_id">downloadable</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="name" unique="suffix">DownloadableProduct</data>
-+        <data key="price">50.99</data>
-+        <data key="quantity">100</data>
-+        <data key="weight">0</data>
-+        <data key="status">1</data>
-+        <data key="urlKey" unique="suffix">downloadableproduct</data>
-+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-+        <requiredEntity type="downloadable_link">downloadableLink1</requiredEntity>
-+        <requiredEntity type="downloadable_link">downloadableLink2</requiredEntity>
-+    </entity>
-     <entity name="ApiDownloadableProduct" type="product">
-         <data key="sku" unique="suffix">api-downloadable-product</data>
-         <data key="type_id">downloadable</data>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Metadata/downloadable_link-meta.xml b/app/code/Magento/Downloadable/Test/Mftf/Metadata/downloadable_link-meta.xml
-index 1138b561891..2511244d445 100644
---- a/app/code/Magento/Downloadable/Test/Mftf/Metadata/downloadable_link-meta.xml
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Metadata/downloadable_link-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateDownloadableLink" dataType="downloadable_link" type="create" auth="adminOauth" url="/V1/products/{sku}/downloadable-links" method="POST">
-         <contentType>application/json</contentType>
-         <object dataType="downloadable_link" key="link">
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Metadata/link_file_content-meta.xml b/app/code/Magento/Downloadable/Test/Mftf/Metadata/link_file_content-meta.xml
-index de899a90510..d5d6c16c717 100644
---- a/app/code/Magento/Downloadable/Test/Mftf/Metadata/link_file_content-meta.xml
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Metadata/link_file_content-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateLinkFileContent" dataType="link_file_content" type="create">
-         <field key="file_data">string</field>
-         <field key="name">string</field>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Metadata/sample_file_content-meta.xml b/app/code/Magento/Downloadable/Test/Mftf/Metadata/sample_file_content-meta.xml
-index 5109263cfc2..3da91807ceb 100644
---- a/app/code/Magento/Downloadable/Test/Mftf/Metadata/sample_file_content-meta.xml
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Metadata/sample_file_content-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateSampleFileContent" dataType="sample_file_content" type="create">
-         <field key="file_data">string</field>
-         <field key="name">string</field>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/Downloadable/Test/Mftf/Page/AdminProductCreatePage.xml
-index 7d5cc562bfb..049d6d08453 100644
---- a/app/code/Magento/Downloadable/Test/Mftf/Page/AdminProductCreatePage.xml
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Page/AdminProductCreatePage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
-         <section name="AdminProductDownloadableSection"/>
-     </page>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Page/StorefrontCustomerDownloadableProductsPage.xml b/app/code/Magento/Downloadable/Test/Mftf/Page/StorefrontCustomerDownloadableProductsPage.xml
-new file mode 100644
-index 00000000000..eafb37111fd
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Page/StorefrontCustomerDownloadableProductsPage.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontCustomerDownloadableProductsPage" url="downloadable/customer/products/" area="storefront" module="Magento_Downloadable">
-+        <section name="StorefrontCustomerDownloadableProductsSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDownloadableSection.xml b/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDownloadableSection.xml
-index 1c1ce0343c9..074ed557811 100644
---- a/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDownloadableSection.xml
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDownloadableSection.xml
-@@ -7,9 +7,10 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductDownloadableSection">
-         <element name="sectionHeader" type="button" selector="div[data-index='downloadable']" timeout="30" />
-+        <element name="sectionLinkGrid" type="text" selector="//div[@data-index='link']" timeout="30"/>
-         <element name="isDownloadableProduct" type="input" selector="input[name='is_downloadable']" />
-         <element name="linksTitleInput" type="input" selector="input[name='product[links_title]']" />
-         <element name="isLinksPurchasedSeparately" type="input" selector="input[name='product[links_purchased_separately]']" />
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDropdownOrderSection.xml b/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
-new file mode 100644
-index 00000000000..39b4e303d51
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminProductDropdownOrderSection">
-+        <element name="downloadProduct" type="text" selector="//li[not(following-sibling::li[span[@title='Bundle Product']]) and not(following-sibling::li[span[@title='Simple Product']]) and not(following-sibling::li[span[@title='Configurable Product']]) and not(following-sibling::li[span[@title='Grouped Product']]) and not(following-sibling::li[span[@title='Virtual Product']])]/span[@title='Downloadable Product']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontCustomerDownloadableProductsSection.xml b/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontCustomerDownloadableProductsSection.xml
-new file mode 100644
-index 00000000000..d45a774077b
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontCustomerDownloadableProductsSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerDownloadableProductsSection">
-+        <element name="productName" type="text" selector="//table[@id='my-downloadable-products-table']//strong[contains(@class, 'product-name') and normalize-space(.)='{{productName}}']" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontDownloadableProductSection.xml b/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontDownloadableProductSection.xml
-new file mode 100644
-index 00000000000..a1db2d4d949
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontDownloadableProductSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontDownloadableProductSection">
-+        <element name="downloadableLinkBlock" type="text" selector="//div[contains(@class, 'field downloads required')]//span[text()='Downloadable Links']"/>
-+        <element name="downloadableLinkLabel" type="text" selector="//label[contains(., '{{title}}')]" parameterized="true" timeout="30"/>
-+        <element name="downloadableLinkByTitle" type="input" selector="//*[@id='downloadable-links-list']/*[contains(.,'{{title}}')]//input" parameterized="true" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
-index f2c7f6a6138..3d779740849 100644
---- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddDefaultImageDownloadableProductTest">
-         <annotations>
-             <features value="Downloadable"/>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml
-new file mode 100644
-index 00000000000..a7acdfded29
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml
-@@ -0,0 +1,50 @@
-+<?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="AdminAddDefaultVideoDownloadableProductTest" extends="AdminAddDefaultVideoSimpleProductTest">
-+        <annotations>
-+            <features value="Downloadable"/>
-+            <stories value="Add/remove images and videos for all product types and category"/>
-+            <title value="Admin should be able to add default video for a Downloadable Product"/>
-+            <description value="Admin should be able to add default video for a Downloadable Product"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-114"/>
-+            <group value="Downloadable"/>
-+        </annotations>
-+
-+        <!-- Create a downloadable product -->
-+        <!-- Replacing steps in base AdminAddDefaultVideoSimpleProductTest -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add downloadable links -->
-+        <scrollTo selector="{{AdminProductDownloadableSection.sectionHeader}}" x="0" y="-100" stepKey="scrollToSection" after="addProductVideo"/>
-+        <conditionalClick selector="{{AdminProductDownloadableSection.sectionHeader}}" dependentSelector="{{AdminProductDownloadableSection.isDownloadableProduct}}" visible="false" stepKey="openDownloadableSection" after="scrollToSection"/>
-+        <checkOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkOptionIsDownloadable" after="openDownloadableSection"/>
-+        <fillField userInput="{{downloadableData.link_title}}" selector="{{AdminProductDownloadableSection.linksTitleInput}}" stepKey="fillLinkTitle" after="checkOptionIsDownloadable"/>
-+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately" after="fillLinkTitle"/>
-+        <fillField userInput="{{downloadableData.sample_title}}" selector="{{AdminProductDownloadableSection.samplesTitleInput}}" stepKey="fillSampleTitle" after="checkOptionPurchaseSeparately"/>
-+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addDownloadableProductLinkWithMaxDownloads" after="fillSampleTitle">
-+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
-+        </actionGroup>
-+        <actionGroup ref="addDownloadableProductLink" stepKey="addDownloadableProductLink" before="saveProductForm">
-+            <argument name="link" value="downloadableLink"/>
-+        </actionGroup>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
-new file mode 100755
-index 00000000000..55740af4d83
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
-@@ -0,0 +1,31 @@
-+<?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="AdminCreateDownloadableProductSwitchToSimpleTest" extends="AdminCreateSimpleProductSwitchToVirtualTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Product Type Switching"/>
-+            <title value="Admin should be able to switch a new product from downloadable to simple"/>
-+            <description value="After selecting a downloadable product when adding Admin should be switch to simple implicitly"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-10929"/>
-+            <group value="catalog"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm">
-+            <argument name="productType" value="downloadable"/>
-+        </actionGroup>
-+        <!-- Fill form for Virtual Product Type -->
-+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Simple Product"  stepKey="seeProductTypeInGrid"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductAndAssignItToCustomStoreTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductAndAssignItToCustomStoreTest.xml
-new file mode 100644
-index 00000000000..5d7e4518525
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductAndAssignItToCustomStoreTest.xml
-@@ -0,0 +1,93 @@
-+<?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="AdminCreateDownloadableProductAndAssignItToCustomStoreTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Downloadable Product"/>
-+            <title value="Create downloadable product and assign it to custom store test"/>
-+            <description value="Admin should be able to create downloadable and assign it to custom website"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14516"/>
-+            <group value="Downloadable"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete created downloadable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="DownloadableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Delete store view -->
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteCreatedStoreView"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create store view -->
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView"/>
-+
-+        <!-- Create Downloadable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="createProduct">
-+            <argument name="productType" value="downloadable"/>
-+        </actionGroup>
-+
-+        <!-- Fill downloadable product values -->
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillDownloadableProductForm">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add downloadable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Fill downloadable link information before the creation link -->
-+        <actionGroup ref="AdminAddDownloadableLinkInformationActionGroup" stepKey="addDownloadableLinkInformation"/>
-+
-+        <!-- Links can be purchased separately -->
-+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately"/>
-+
-+        <!-- Add downloadable link -->
-+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addDownloadableProductLink">
-+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
-+        </actionGroup>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!-- Switch default store view on store view created below -->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
-+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="SwitchStoreView">
-+            <argument name="storeView" value="customStore"/>
-+        </actionGroup>
-+
-+        <!-- Assert product in custom store -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- See product link in storefront product page in custom store -->
-+        <scrollTo selector="{{StorefrontDownloadableProductSection.downloadableLinkBlock}}" stepKey="scrollToLinksInStorefront"/>
-+        <seeElement stepKey="seeDownloadableLink" selector="{{StorefrontDownloadableProductSection.downloadableLinkLabel(downloadableLinkWithMaxDownloads.title)}}"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
-new file mode 100644
-index 00000000000..0ae2c1254be
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
-@@ -0,0 +1,112 @@
-+<?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="AdminCreateDownloadableProductWithCustomOptionsTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Downloadable Product"/>
-+            <title value="Create downloadable product with custom options test"/>
-+            <description value="Admin should be able to create downloadable product with custom options"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14508"/>
-+            <group value="Downloadable"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete created downloadable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="DownloadableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create Downloadable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="createProduct">
-+            <argument name="productType" value="downloadable"/>
-+        </actionGroup>
-+
-+        <!-- Fill downloadable product values -->
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillDownloadableProductForm">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add downloadable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Open custom option panel -->
-+        <click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomizableOptions"/>
-+        <waitForPageLoad stepKey="waitForCustomOptionsOpen"/>
-+
-+        <!-- Create a first custom option with 2 values -->
-+        <actionGroup ref="AdminCreateCustomDropDownOptionsActionGroup" stepKey="createFirstCustomOption">
-+            <argument name="customOptionName" value="{{ProductOptionDropDown.title}}"/>
-+            <argument name="firstOption" value="ProductOptionValueDropdown1"/>
-+            <argument name="secondOption" value="ProductOptionValueDropdown2"/>
-+        </actionGroup>
-+
-+        <!-- Create a second custom option with 2 values -->
-+        <actionGroup ref="AdminCreateCustomDropDownOptionsActionGroup" stepKey="createSecondCustomOption">
-+            <argument name="customOptionName" value="{{ProductOptionDropDownWithLongValuesTitle.title}}"/>
-+            <argument name="firstOption" value="ProductOptionValueDropdown1"/>
-+            <argument name="secondOption" value="ProductOptionValueDropdown2"/>
-+        </actionGroup>
-+
-+        <!-- Fill downloadable link information before the creation link -->
-+        <actionGroup ref="AdminAddDownloadableLinkInformationActionGroup" stepKey="addDownloadableLinkInformation"/>
-+
-+        <!-- Links can be purchased separately -->
-+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately"/>
-+
-+        <!-- Add downloadable link -->
-+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addDownloadableProductLink">
-+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
-+        </actionGroup>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!-- Go to storefront category page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+
-+        <!-- Assert product in storefront category page -->
-+        <actionGroup ref="StorefrontCheckProductPriceInCategoryActionGroup" stepKey="StorefrontCheckCategorySimpleProduct">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Assert product custom options on product page -->
-+        <scrollTo selector="{{StorefrontDownloadableProductSection.downloadableLinkBlock}}" stepKey="scrollToLinksInStorefront"/>
-+        <seeElement stepKey="seeFirstOptionName" selector="{{StorefrontProductInfoMainSection.customOptionLabel(ProductOptionDropDown.title)}}"/>
-+        <seeElement stepKey="seeSecondOptionName" selector="{{StorefrontProductInfoMainSection.customOptionLabel(ProductOptionDropDownWithLongValuesTitle.title)}}"/>
-+
-+        <!-- Assert downloadable links data -->
-+        <scrollTo selector="{{StorefrontDownloadableProductSection.downloadableLinkBlock}}" stepKey="scrollToLinks"/>
-+        <seeElement stepKey="seeDownloadableLink" selector="{{StorefrontDownloadableProductSection.downloadableLinkLabel(downloadableLinkWithMaxDownloads.title)}}"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
-new file mode 100644
-index 00000000000..eadefabb8bb
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
-@@ -0,0 +1,112 @@
-+<?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="AdminCreateDownloadableProductWithLinkTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Downloadable Product"/>
-+            <title value="Create downloadable product with default set links"/>
-+            <description value="Admin should be able to create downloadable product with default set links"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14507"/>
-+            <group value="Downloadable"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete created downloadable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="DownloadableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create downloadable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="createProduct">
-+            <argument name="productType" value="downloadable"/>
-+        </actionGroup>
-+
-+        <!-- Fill downloadable product values -->
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillDownloadableProductForm">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add downloadable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Fill downloadable link information before the creation link -->
-+        <actionGroup ref="AdminAddDownloadableLinkInformationActionGroup" stepKey="addDownloadableLinkInformation"/>
-+
-+        <!-- Links can be purchased separately -->
-+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately"/>
-+
-+        <!-- Add first downloadable link -->
-+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addFirstDownloadableProductLink">
-+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
-+        </actionGroup>
-+
-+        <!-- Add second downloadable link -->
-+        <actionGroup ref="addDownloadableProductLink" stepKey="addSecondDownloadableProductLink">
-+            <argument name="link" value="downloadableLink"/>
-+        </actionGroup>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!-- Find downloadable product in grid -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedConfigurableProduct">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+
-+        <!-- Assert downloadable links in product form -->
-+        <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
-+        <seeElement selector="{{AdminProductDownloadableSection.addLinkTitleInput('0')}}" stepKey="seeFirstLinkTitle"/>
-+        <seeElement selector="{{AdminProductDownloadableSection.addLinkTitleInput('1')}}" stepKey="seeSecondLinkTitle"/>
-+
-+        <!-- Go to storefront category page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+
-+        <!-- Assert product in storefront category page -->
-+        <actionGroup ref="StorefrontCheckProductPriceInCategoryActionGroup" stepKey="StorefrontCheckCategorySimpleProduct">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- See product links in storefront product page -->
-+        <scrollTo selector="{{StorefrontDownloadableProductSection.downloadableLinkBlock}}" stepKey="scrollToLinksInStorefront"/>
-+        <seeElement stepKey="seeFirstDownloadableLink" selector="{{StorefrontDownloadableProductSection.downloadableLinkLabel(downloadableLinkWithMaxDownloads.title)}}"/>
-+        <seeElement stepKey="seeSecondDownloadableLink" selector="{{StorefrontDownloadableProductSection.downloadableLinkLabel(downloadableLink.title)}}"/>
-+
-+        <!-- Assert product in stock -->
-+        <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStatusInStoreFront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml
-new file mode 100644
-index 00000000000..8bd4305e6b3
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml
-@@ -0,0 +1,109 @@
-+<?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="AdminCreateDownloadableProductWithGroupPriceTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Downloadable Product"/>
-+            <title value="Create downloadable product with group price test"/>
-+            <description value="Admin should be able to create downloadable product with group price"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14514"/>
-+            <group value="Downloadable"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete created downloadable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="ApiDownloadableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create downloadable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="createProduct">
-+            <argument name="productType" value="downloadable"/>
-+        </actionGroup>
-+
-+        <!-- Add group price to product -->
-+        <actionGroup ref="AdminAddAdvancedPricingToTheProductActionGroup" stepKey="addCustomerGroupPrice">
-+            <argument name="index" value="0"/>
-+            <argument name="groupPrice" value="simpleGroupPrice"/>
-+        </actionGroup>
-+
-+        <!-- Fill downloadable product values -->
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillDownloadableProductForm">
-+            <argument name="product" value="ApiDownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add downloadable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Fill downloadable link information before the creation link -->
-+        <actionGroup ref="AdminAddDownloadableLinkInformationActionGroup" stepKey="addDownloadableLinkInformation"/>
-+
-+        <!-- Links can be purchased separately -->
-+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately"/>
-+
-+        <!-- Add first downloadable link -->
-+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addFirstDownloadableProductLink">
-+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
-+        </actionGroup>
-+
-+        <!-- Add second downloadable link -->
-+        <actionGroup ref="addDownloadableProductLink" stepKey="addSecondDownloadableProductLink">
-+            <argument name="link" value="downloadableLink"/>
-+        </actionGroup>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!-- Find downloadable product in grid -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedConfigurableProduct">
-+            <argument name="product" value="ApiDownloadableProduct"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-+        <waitForPageLoad stepKey="waitForProductFormPageLoad"/>
-+
-+        <!-- Assert downloadable links in product form -->
-+        <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
-+        <seeElement selector="{{AdminProductDownloadableSection.addLinkTitleInput('0')}}" stepKey="seeFirstLinkTitle"/>
-+        <seeElement selector="{{AdminProductDownloadableSection.addLinkTitleInput('1')}}" stepKey="seeSecondLinkTitle"/>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="ApiDownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Assert group price in storefront product page -->
-+        <see selector="{{StorefrontProductInfoMainSection.updatedPrice}}" userInput="$90.00" stepKey="assertGroupPrice"/>
-+
-+        <!-- See product link in storefront product page -->
-+        <scrollTo selector="{{StorefrontDownloadableProductSection.downloadableLinkBlock}}" stepKey="scrollToLinksInStorefront"/>
-+        <seeElement stepKey="seeFirstDownloadableLink" selector="{{StorefrontDownloadableProductSection.downloadableLinkLabel(downloadableLinkWithMaxDownloads.title)}}"/>
-+        <seeElement stepKey="seeSecondDownloadableLink" selector="{{StorefrontDownloadableProductSection.downloadableLinkLabel(downloadableLink.title)}}"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithLinkTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithLinkTest.xml
-new file mode 100644
-index 00000000000..d8bd641e84e
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithLinkTest.xml
-@@ -0,0 +1,101 @@
-+<?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="AdminCreateDownloadableProductWithDefaultSetLinksTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Downloadable Product"/>
-+            <title value="Create Downloadable Product with link"/>
-+            <description value="Admin should be able to create downloadable product with one simple link"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14506"/>
-+            <group value="Downloadable"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete created downloadable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="DownloadableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create downloadable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="createProduct">
-+            <argument name="productType" value="downloadable"/>
-+        </actionGroup>
-+
-+        <!-- Fill downloadable product values -->
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillDownloadableProductForm">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add downloadable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Fill downloadable link information before the creation link -->
-+        <actionGroup ref="AdminAddDownloadableLinkInformationActionGroup" stepKey="addDownloadableLinkInformation"/>
-+
-+        <!-- Links can be purchased separately -->
-+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately"/>
-+
-+        <!-- Add downloadable link -->
-+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addDownloadableProductLink">
-+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
-+        </actionGroup>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!-- Assert product in storefront category page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <actionGroup ref="StorefrontCheckProductPriceInCategoryActionGroup" stepKey="StorefrontCheckCategorySimpleProduct">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Assert product price in storefront product page -->
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{DownloadableProduct.price}}" stepKey="assertProductPrice"/>
-+
-+        <!-- Select product link in storefront product page-->
-+        <scrollTo selector="{{StorefrontDownloadableProductSection.downloadableLinkBlock}}" stepKey="scrollToLinks"/>
-+        <click selector="{{StorefrontDownloadableProductSection.downloadableLinkByTitle(downloadableLinkWithMaxDownloads.title)}}" stepKey="selectProductLink"/>
-+
-+        <!-- Add product with selected link to the cart -->
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
-+            <argument name="product" value="DownloadableProduct"/>
-+            <argument name="productCount" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Assert product price in cart -->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="openShoppingCartPage"/>
-+        <waitForPageLoad stepKey="waitForShoppingCartPageLoad"/>
-+        <see selector="{{CheckoutCartProductSection.ProductPriceByName(DownloadableProduct.name)}}" userInput="$51.99" stepKey="assertProductPriceInCart"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml
-new file mode 100644
-index 00000000000..3efd4b8ab27
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml
-@@ -0,0 +1,109 @@
-+<?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="AdminCreateDownloadableProductWithManageStockTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Downloadable Product"/>
-+            <title value="Create downloadable product with manage stock test"/>
-+            <description value="Admin should be able to create downloadable product with manage stock"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14510"/>
-+            <group value="Downloadable"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete created downloadable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="DownloadableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create downloadable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="createProduct">
-+            <argument name="productType" value="downloadable"/>
-+        </actionGroup>
-+
-+        <!-- Fill downloadable product values -->
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillDownloadableProductForm">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add advanced inventory data to downloadable product -->
-+        <actionGroup ref="AdminClickOnAdvancedInventoryLinkActionGroup" stepKey="clickOnAdvancedInventoryLink"/>
-+
-+        <actionGroup ref="AdminFillAdvancedInventoryQtyActionGroup" stepKey="fillAdvancedInventoryQty">
-+            <argument name="qty" value="{{DownloadableProduct.quantity}}"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminFillAdvancedInventoryOutOfStockThresholdActionGroup" stepKey="fillAdvancedInventoryOutOfStockThreshold">
-+            <argument name="qty" value="{{DownloadableProduct.quantity}}"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminSubmitAdvancedInventoryFormActionGroup" stepKey="clickDoneBtn"/>
-+
-+        <!-- Add downloadable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Fill downloadable link information before the creation link -->
-+        <actionGroup ref="AdminAddDownloadableLinkInformationActionGroup" stepKey="addDownloadableLinkInformation"/>
-+
-+        <!-- Links can be purchased separately -->
-+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately"/>
-+
-+        <!-- Add first downloadable link -->
-+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addFirstDownloadableProductLink">
-+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
-+        </actionGroup>
-+
-+        <!-- Add second downloadable link -->
-+        <actionGroup ref="addDownloadableProductLink" stepKey="addSecondDownloadableProductLink">
-+            <argument name="link" value="downloadableLink"/>
-+        </actionGroup>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!-- Find downloadable product in grid -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedConfigurableProduct">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-+        <waitForPageLoad stepKey="waitForProductFormPageLoad"/>
-+
-+        <!-- Assert downloadable links in product form -->
-+        <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
-+        <seeInField selector="{{AdminProductDownloadableSection.addLinkTitleInput('0')}}" userInput="{{downloadableLinkWithMaxDownloads.title}}" stepKey="seeFirstLinkTitle"/>
-+        <seeInField selector="{{AdminProductDownloadableSection.addLinkTitleInput('1')}}" userInput="{{downloadableLink.title}}" stepKey="seeSecondLinkTitle"/>
-+
-+        <!-- Assert product is out of stock in store front -->
-+        <amOnPage url="{{DownloadableProduct.urlKey}}.html" stepKey="navigateToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{DownloadableProduct.name}}" stepKey="seeProductNameInStoreFront"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="OUT OF STOCK" stepKey="seeProductStatusInStoreFront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml
-new file mode 100644
-index 00000000000..07f7c40bb35
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml
-@@ -0,0 +1,95 @@
-+<?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="AdminCreateDownloadableProductWithOutOfStockStatusTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Downloadable Product"/>
-+            <title value="Create downloadable product with out of stock status test"/>
-+            <description value="Admin should be able to create downloadable product with out of stock status"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14509"/>
-+            <group value="Downloadable"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete created downloadable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="DownloadableProductOutOfStock"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create Downloadable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="createProduct">
-+            <argument name="productType" value="downloadable"/>
-+        </actionGroup>
-+
-+        <!-- Fill downloadable product values -->
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillDownloadableProductForm">
-+            <argument name="product" value="DownloadableProductOutOfStock"/>
-+        </actionGroup>
-+
-+        <!-- Add downloadable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Fill downloadable link information before the creation link -->
-+        <actionGroup ref="AdminAddDownloadableLinkInformationActionGroup" stepKey="addDownloadableLinkInformation"/>
-+
-+        <!-- Links can be purchased separately -->
-+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately"/>
-+
-+        <!-- Add first downloadable link -->
-+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addFirstDownloadableProductLink">
-+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
-+        </actionGroup>
-+
-+        <!-- Add second downloadable link -->
-+        <actionGroup ref="addDownloadableProductLink" stepKey="addSecondDownloadableProductLink">
-+            <argument name="link" value="downloadableLink"/>
-+        </actionGroup>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!-- Assert product is out of stock -->
-+        <amOnPage url="{{DownloadableProductOutOfStock.urlKey}}.html" stepKey="navigateToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="OUT OF STOCK" stepKey="seeProductStatusInStoreFront"/>
-+
-+        <!-- Find downloadable product in grid -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedConfigurableProduct">
-+            <argument name="product" value="DownloadableProductOutOfStock"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-+        <waitForPageLoad stepKey="waitForProductFormPageLoad"/>
-+
-+        <!-- Assert downloadable links in product form -->
-+        <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
-+        <seeInField selector="{{AdminProductDownloadableSection.addLinkTitleInput('0')}}" userInput="{{downloadableLinkWithMaxDownloads.title}}" stepKey="seeFirstLinkTitle"/>
-+        <seeInField selector="{{AdminProductDownloadableSection.addLinkTitleInput('1')}}" userInput="{{downloadableLink.title}}" stepKey="seeSecondLinkTitle"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml
-new file mode 100644
-index 00000000000..275e72b2ec8
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml
-@@ -0,0 +1,108 @@
-+<?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="AdminCreateDownloadableProductWithSpecialPriceTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Downloadable Product"/>
-+            <title value="Create downloadable product with special price test"/>
-+            <description value="Admin should be able to create downloadable product with special price"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14513"/>
-+            <group value="Downloadable"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete created downloadable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="ApiDownloadableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create downloadable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="createProduct">
-+            <argument name="productType" value="downloadable"/>
-+        </actionGroup>
-+
-+        <!-- Add special price to product -->
-+        <actionGroup ref="AddSpecialPriceToProductActionGroup" stepKey="setSpecialPriceToCreatedProduct" after="createProduct">
-+            <argument name="price" value="{{specialProductPrice.price}}"/>
-+        </actionGroup>
-+
-+        <!-- Fill downloadable product values -->
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillDownloadableProductForm">
-+            <argument name="product" value="ApiDownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add downloadable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Fill downloadable link information before the creation link -->
-+        <actionGroup ref="AdminAddDownloadableLinkInformationActionGroup" stepKey="addDownloadableLinkInformation"/>
-+
-+        <!-- Links can be purchased separately -->
-+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately"/>
-+
-+        <!-- Add first downloadable link -->
-+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addFirstDownloadableProductLink">
-+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
-+        </actionGroup>
-+
-+        <!-- Add second downloadable link -->
-+        <actionGroup ref="addDownloadableProductLink" stepKey="addSecondDownloadableProductLink">
-+            <argument name="link" value="downloadableLink"/>
-+        </actionGroup>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!-- Find downloadable product in grid -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedConfigurableProduct">
-+            <argument name="product" value="ApiDownloadableProduct"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-+        <waitForPageLoad stepKey="waitForProductFormPageLoad"/>
-+
-+        <!-- Assert downloadable links in product form -->
-+        <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
-+        <seeElement selector="{{AdminProductDownloadableSection.addLinkTitleInput('0')}}" stepKey="seeFirstLinkTitle"/>
-+        <seeElement selector="{{AdminProductDownloadableSection.addLinkTitleInput('1')}}" stepKey="seeSecondLinkTitle"/>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="ApiDownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Assert special price in storefront product page -->
-+        <see selector="{{StorefrontProductInfoMainSection.specialPriceValue}}" userInput="$99.99" stepKey="assertSpecialPrice"/>
-+
-+        <!-- See product link in storefront product page -->
-+        <scrollTo selector="{{StorefrontDownloadableProductSection.downloadableLinkBlock}}" stepKey="scrollToLinksInStorefront"/>
-+        <seeElement stepKey="seeFirstDownloadableLink" selector="{{StorefrontDownloadableProductSection.downloadableLinkLabel(downloadableLinkWithMaxDownloads.title)}}"/>
-+        <seeElement stepKey="seeSecondDownloadableLink" selector="{{StorefrontDownloadableProductSection.downloadableLinkLabel(downloadableLink.title)}}"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithTierPriceText.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithTierPriceText.xml
-new file mode 100644
-index 00000000000..ca4e560506a
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithTierPriceText.xml
-@@ -0,0 +1,35 @@
-+<?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="AdminCreateDownloadableProductWithTierPriceText" extends="AdminCreateDownloadableProductWithGroupPriceTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Downloadable Product"/>
-+            <title value="Create downloadable product with tier price test"/>
-+            <description value="Admin should be able to create downloadable with tier price"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14515"/>
-+            <group value="Downloadable"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <remove keyForRemoval="addCustomerGroupPrice"/>
-+
-+        <!-- Add tier price to product -->
-+        <actionGroup ref="AdminAddAdvancedPricingToTheProductActionGroup" stepKey="addCustomerTierPrice" after="createProduct">
-+            <argument name="index" value="0"/>
-+            <argument name="groupPrice" value="tierProductPrice"/>
-+        </actionGroup>
-+
-+        <remove keyForRemoval="assertGroupPrice"/>
-+
-+        <!-- Assert tier price in storefront product page -->
-+        <see selector="{{StorefrontProductInfoMainSection.tierPriceText}}" userInput="Buy {{tierProductPrice.quantity}} for ${{tierProductPrice.price}} each and save 27%" stepKey="assertTierPriceText"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml
-new file mode 100644
-index 00000000000..f326a047c32
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml
-@@ -0,0 +1,101 @@
-+<?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="AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Downloadable Product"/>
-+            <title value="Create downloadable product without filling quantity and stock test"/>
-+            <description value="Admin should be able to create downloadable product without filling quantity and stock"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14512"/>
-+            <group value="Downloadable"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete created downloadable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="DownloadableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create downloadable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="createProduct">
-+            <argument name="productType" value="downloadable"/>
-+        </actionGroup>
-+
-+        <!-- Fill downloadable product values -->
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillDownloadableProductForm">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <clearField selector="{{AdminProductFormSection.productQuantity}}" stepKey="clearProductQty"/>
-+
-+        <!-- Add downloadable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Fill downloadable link information before the creation link -->
-+        <actionGroup ref="AdminAddDownloadableLinkInformationActionGroup" stepKey="addDownloadableLinkInformation"/>
-+
-+        <!-- Links can be purchased separately -->
-+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately"/>
-+
-+        <!-- Add first downloadable link -->
-+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addFirstDownloadableProductLink">
-+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
-+        </actionGroup>
-+
-+        <!-- Add second downloadable link -->
-+        <actionGroup ref="addDownloadableProductLink" stepKey="addSecondDownloadableProductLink">
-+            <argument name="link" value="downloadableLink"/>
-+        </actionGroup>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!-- Find downloadable product in grid -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedConfigurableProduct">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-+        <waitForPageLoad stepKey="waitForProductFormPageLoad"/>
-+
-+        <!-- Assert downloadable links in product form -->
-+        <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
-+        <seeInField selector="{{AdminProductDownloadableSection.addLinkTitleInput('0')}}" userInput="{{downloadableLinkWithMaxDownloads.title}}" stepKey="seeFirstLinkTitle"/>
-+        <seeInField selector="{{AdminProductDownloadableSection.addLinkTitleInput('1')}}" userInput="{{downloadableLink.title}}" stepKey="seeSecondLinkTitle"/>
-+
-+
-+        <!-- See stock status-->
-+        <seeOptionIsSelected selector="{{AdminProductFormSection.productStockStatus}}" userInput="Out of Stock" stepKey="seeStockStatus"/>
-+
-+        <!-- Assert product is out of stock -->
-+        <amOnPage url="{{DownloadableProduct.urlKey}}.html" stepKey="navigateToProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="OUT OF STOCK" stepKey="seeProductStatusInStoreFront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml
-new file mode 100644
-index 00000000000..8e33a082d0b
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml
-@@ -0,0 +1,103 @@
-+<?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="AdminCreateDownloadableProductWithoutTaxClassIdTest">
-+        <annotations>
-+            <features value="Catalog"/>
-+            <stories value="Create Downloadable Product"/>
-+            <title value="Create downloadable product without tax class id test"/>
-+            <description value="Admin should be able to create downloadable product without tax class id"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14511"/>
-+            <group value="Downloadable"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!-- Delete created downloadable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="DownloadableProduct"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create downloadable product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="createProduct">
-+            <argument name="productType" value="downloadable"/>
-+        </actionGroup>
-+
-+        <!-- Fill downloadable product values -->
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillDownloadableProductForm">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Tax class id = "none" -->
-+        <selectOption selector="{{AdminProductFormBundleSection.taxClassDropDown}}" userInput="None" stepKey="taxClassDropDown"/>
-+
-+        <!-- Add downloadable product to category -->
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Fill downloadable link information before the creation link -->
-+        <actionGroup ref="AdminAddDownloadableLinkInformationActionGroup" stepKey="addDownloadableLinkInformation"/>
-+
-+        <!-- Links can be purchased separately -->
-+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately"/>
-+
-+        <!-- Add first downloadable link -->
-+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addFirstDownloadableProductLink">
-+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
-+        </actionGroup>
-+
-+        <!-- Add second downloadable link -->
-+        <actionGroup ref="addDownloadableProductLink" stepKey="addSecondDownloadableProductLink">
-+            <argument name="link" value="downloadableLink"/>
-+        </actionGroup>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!-- Find downloadable product in grid -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedConfigurableProduct">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-+        <waitForPageLoad stepKey="waitForProductFormPageLoad"/>
-+
-+        <!-- Assert downloadable links in product form -->
-+        <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
-+        <seeInField selector="{{AdminProductDownloadableSection.addLinkTitleInput('0')}}" userInput="{{downloadableLinkWithMaxDownloads.title}}" stepKey="seeFirstLinkTitle"/>
-+        <seeInField selector="{{AdminProductDownloadableSection.addLinkTitleInput('1')}}" userInput="{{downloadableLink.title}}" stepKey="seeSecondLinkTitle"/>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- See product link in storefront product page -->
-+        <scrollTo selector="{{StorefrontDownloadableProductSection.downloadableLinkBlock}}" stepKey="scrollToLinksInStorefront"/>
-+        <seeElement stepKey="seeFirstDownloadableLink" selector="{{StorefrontDownloadableProductSection.downloadableLinkLabel(downloadableLinkWithMaxDownloads.title)}}"/>
-+        <seeElement stepKey="seeSecondDownloadableLink" selector="{{StorefrontDownloadableProductSection.downloadableLinkLabel(downloadableLink.title)}}"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml
-new file mode 100644
-index 00000000000..d3c2d6e5d71
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml
-@@ -0,0 +1,58 @@
-+<?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="AdminDeleteDownloadableProductTest">
-+        <annotations>
-+            <features value="Downloadable"/>
-+            <stories value="Downloadable product"/>
-+            <title value="Delete Downloadable Product"/>
-+            <description value="Admin should be able to delete a downloadable product"/>
-+            <testCaseId value="MC-11018"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="DownloadableProductWithTwoLink" stepKey="createDownloadableProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="downloadableLink1" stepKey="addDownloadableLink1">
-+                <requiredEntity createDataKey="createDownloadableProduct"/>
-+            </createData>
-+            <createData entity="downloadableLink2" stepKey="addDownloadableLink2">
-+                <requiredEntity createDataKey="createDownloadableProduct"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteDownloadableProductFilteredBySkuAndName">
-+            <argument name="product" value="$$createDownloadableProduct$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
-+        <!--Verify product on Product Page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createDownloadableProduct.name$$)}}" stepKey="amOnDownloadableProductPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
-+        <!-- Search for the product by sku -->
-+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createDownloadableProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-+        <waitForPageLoad stepKey="waitForSearchButton"/>
-+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForSearchResults"/>
-+        <!-- Should not see any search results -->
-+        <dontSee userInput="$$createDownloadableProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
-+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
-+        <!-- Go to the category page that we created in the before block -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-+        <!-- Should not see the product -->
-+        <dontSee userInput="$$createDownloadableProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
-+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableProductSetEditContentTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableProductSetEditContentTest.xml
-new file mode 100644
-index 00000000000..72cdf589bec
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableProductSetEditContentTest.xml
-@@ -0,0 +1,40 @@
-+<?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="AdminDownloadableProductSetEditContentTest" extends="AdminSimpleProductSetEditContentTest">
-+        <annotations>
-+            <features value="Downloadable"/>
-+            <stories value="Create/edit downloadable product"/>
-+            <title value="Admin should be able to set/edit product Content when editing a downloadable product"/>
-+            <description value="Admin should be able to set/edit product Content when editing a downloadable product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3426"/>
-+            <group value="Downloadable"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+        <after>
-+            <!-- Delete downloadable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="DownloadableProduct"/>
-+            </actionGroup>
-+        </after>
-+
-+        <!-- Create product -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!--Checking content storefront-->
-+        <amOnPage url="{{DownloadableProduct.sku}}.html" stepKey="goToStorefront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
-new file mode 100644
-index 00000000000..f70769cdfe8
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
-@@ -0,0 +1,40 @@
-+<?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="AdminDownloadableSetEditRelatedProductsTest" extends="AdminSimpleSetEditRelatedProductsTest">
-+        <annotations>
-+            <features value="Downloadable"/>
-+            <stories value="Create/edit downloadable product"/>
-+            <title value="Admin should be able to set/edit Related Products information when editing a downloadable product"/>
-+            <description value="Admin should be able to set/edit Related Products information when editing a downloadable product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3416"/>
-+            <group value="Downloadable"/>
-+        </annotations>
-+        <before></before>
-+        <after>
-+            <!-- Delete downloadable product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="DownloadableProduct"/>
-+            </actionGroup>
-+        </after>
-+
-+        <!-- Create product -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!--See related product in storefront-->
-+        <amOnPage url="{{DownloadableProduct.sku}}.html" stepKey="goToStorefront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
-index 3b10f60c973..3ee6cef4773 100644
---- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminRemoveDefaultImageDownloadableProductTest">
-         <annotations>
-             <features value="Downloadable"/>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml
-new file mode 100644
-index 00000000000..d8bbbb2b4d6
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml
-@@ -0,0 +1,50 @@
-+<?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="AdminRemoveDefaultVideoDownloadableProductTest" extends="AdminRemoveDefaultVideoSimpleProductTest">
-+        <annotations>
-+            <features value="Downloadable"/>
-+            <stories value="Add/remove images and videos for all product types and category"/>
-+            <title value="Admin should be able to remove default video from a Downloadable Product"/>
-+            <description value="Admin should be able to remove default video from a Downloadable Product"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-207"/>
-+            <group value="Downloadable"/>
-+        </annotations>
-+
-+        <!-- Create a downloadable product -->
-+        <!-- Replacing steps in base AdminRemoveDefaultVideoSimpleProductTest -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add downloadable links -->
-+        <scrollTo selector="{{AdminProductDownloadableSection.sectionHeader}}" x="0" y="-100" stepKey="scrollToSection" after="addProductVideo"/>
-+        <conditionalClick selector="{{AdminProductDownloadableSection.sectionHeader}}" dependentSelector="{{AdminProductDownloadableSection.isDownloadableProduct}}" visible="false" stepKey="openDownloadableSection" after="scrollToSection"/>
-+        <checkOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkOptionIsDownloadable" after="openDownloadableSection"/>
-+        <fillField userInput="{{downloadableData.link_title}}" selector="{{AdminProductDownloadableSection.linksTitleInput}}" stepKey="fillLinkTitle" after="checkOptionIsDownloadable"/>
-+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately" after="fillLinkTitle"/>
-+        <fillField userInput="{{downloadableData.sample_title}}" selector="{{AdminProductDownloadableSection.samplesTitleInput}}" stepKey="fillSampleTitle" after="checkOptionPurchaseSeparately"/>
-+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addDownloadableProductLinkWithMaxDownloads" after="fillSampleTitle">
-+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
-+        </actionGroup>
-+        <actionGroup ref="addDownloadableProductLink" stepKey="addDownloadableProductLink" before="saveProductForm">
-+            <argument name="link" value="downloadableLink"/>
-+        </actionGroup>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="DownloadableProduct"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml
-new file mode 100644
-index 00000000000..66177b6875d
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml
-@@ -0,0 +1,111 @@
-+<?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="AdvanceCatalogSearchDownloadableByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
-+        <annotations>
-+            <features value="Downloadable"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Downloadable product with product name"/>
-+            <description value="Guest customer should be able to advance search Downloadable product with product name"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-142"/>
-+            <group value="Downloadable"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiDownloadableProduct" stepKey="product"/>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+        </before>
-+    </test>
-+    <test name="AdvanceCatalogSearchDownloadableBySkuTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
-+        <annotations>
-+            <features value="Downloadable"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Downloadable product with product sku"/>
-+            <description value="Guest customer should be able to advance search Downloadable product with product sku"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-252"/>
-+            <group value="Downloadable"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiDownloadableProduct" stepKey="product"/>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+        </before>
-+    </test>
-+    <test name="AdvanceCatalogSearchDownloadableByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
-+        <annotations>
-+            <features value="Downloadable"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Downloadable product with product description"/>
-+            <description value="Guest customer should be able to advance search Downloadable product with product description"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-243"/>
-+            <group value="Downloadable"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiDownloadableProduct" stepKey="product"/>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+        </before>
-+    </test>
-+    <test name="AdvanceCatalogSearchDownloadableByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
-+        <annotations>
-+            <features value="Downloadable"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Downloadable product with product short description"/>
-+            <description value="Guest customer should be able to advance search Downloadable product with product short description"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-245"/>
-+            <group value="Downloadable"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiDownloadableProduct" stepKey="product"/>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+        </before>
-+    </test>
-+    <test name="AdvanceCatalogSearchDownloadableByPriceTest" extends="AdvanceCatalogSearchSimpleProductByPriceTest">
-+        <annotations>
-+            <features value="Downloadable"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Downloadable product with product price"/>
-+            <description value="Guest customer should be able to advance search Downloadable product with product price"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-246"/>
-+            <group value="Downloadable"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiDownloadableProduct" stepKey="product"/>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+        </before>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-index 4a4242811a3..75a66cec916 100644
---- a/app/code/Magento/Downloadable/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CAdminTest">
-         <!--Create Downloadable Product-->
-         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitProductPageDownloadable" after="seeSimpleProductInGrid"/>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
-new file mode 100644
-index 00000000000..b960d15b2fd
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
-@@ -0,0 +1,67 @@
-+<?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="LinkDownloadableProductFromGuestToCustomerTest">
-+        <annotations>
-+            <stories value="Customer Account"/>
-+            <title value="Customer should see downloadable products after place order as guest and registering after that"/>
-+            <description value="Verify that in 'My Downloadable Products' section in customer account user can see products."/>
-+            <severity value="AVERAGE"/>
-+            <useCaseId value="MAGETWO-98656"/>
-+            <testCaseId value="MC-16011"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set {{EnableGuestCheckoutWithDownloadableItems.path}} {{EnableGuestCheckoutWithDownloadableItems.value}}" stepKey="enableGuestCheckoutWithDownloadableItems" />
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="DownloadableProductWithOneLink" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="downloadableLink1" stepKey="addDownloadableLink">
-+                <requiredEntity createDataKey="createProduct"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{DisableGuestCheckoutWithDownloadableItems.path}} {{DisableGuestCheckoutWithDownloadableItems.value}}" stepKey="disableGuestCheckoutWithDownloadableItems" />
-+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
-+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-+        </after>
-+        <!--Step 1: Go to Storefront as Guest-->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
-+        <!--Step 2: Add downloadable product to shopping cart-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnStorefrontProductPage"/>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="productCount" value="1"/>
-+        </actionGroup>
-+        <!--Step 3: Go to checkout-->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
-+        <!--Step 4: Select Check/Money Order payment, fill required fields and click Update and Place Order-->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment"/>
-+        <actionGroup ref="GuestCheckoutSelectPaymentAndFillNewBillingAddressActionGroup" stepKey="changeAddress">
-+            <argument name="customerVar" value="Simple_US_Customer_NY"/>
-+            <argument name="customerAddressVar" value="US_Address_NY"/>
-+            <argument name="paymentMethod" value="Check / Money order"/>
-+        </actionGroup>
-+        <click selector="{{CheckoutShippingSection.updateAddress}}" stepKey="saveAddress"/>
-+        <waitForPageLoad stepKey="waitUpdateAddress"/>
-+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeOrder">
-+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
-+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
-+        </actionGroup>
-+        <!--Step 5: Create customer account after placing order-->
-+        <actionGroup ref="StorefrontRegisterCustomerFromOrderSuccessPage" stepKey="createCustomerAfterPlaceOrder">
-+            <argument name="customer" value="CustomerEntityOne"/>
-+        </actionGroup>
-+        <!--Step 6: Go To My Account -> My Downloadable Products and check if downloadable product link exist-->
-+        <actionGroup ref="StorefrontAssertDownloadableProductIsPresentInCustomerAccount" stepKey="seeStorefontMyDownloadableProductsProductName">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
-new file mode 100644
-index 00000000000..4864d11c884
---- /dev/null
-+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
-@@ -0,0 +1,55 @@
-+<?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="NewProductsListWidgetDownloadableProductTest" extends="NewProductsListWidgetTest">
-+        <annotations>
-+            <features value="Downloadable"/>
-+            <stories value="New products list widget"/>
-+            <title value="Admin should be able to set Downloadable Product as new so that it shows up in the Catalog New Products List Widget"/>
-+            <description value="Admin should be able to set Downloadable Product as new so that it shows up in the Catalog New Products List Widget"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-124"/>
-+            <group value="Downloadable"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+
-+        <!-- A Cms page containing the New Products Widget gets created here via extends -->
-+
-+        <!-- Create a Downloadable product to appear in the widget -->
-+
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-+        <waitForPageLoad stepKey="waitForProductList"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProduct"/>
-+        <click selector="{{AdminProductGridActionSection.addDownloadableProduct}}" stepKey="clickAddDownloadableProduct"/>
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{_defaultProduct.price}}" stepKey="fillProductPrice"/>
-+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQuantity"/>
-+        <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
-+        <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
-+        <click selector="{{AdminProductDownloadableSection.sectionHeader}}" stepKey="openDownloadableSection"/>
-+        <checkOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkIsDownloadable"/>
-+        <fillField userInput="This Is A Title" selector="{{AdminProductDownloadableSection.linksTitleInput}}" stepKey="fillDownloadableLinkTitle"/>
-+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkLinksPurchasedSeparately"/>
-+        <fillField userInput="This Is Another Title" selector="{{AdminProductDownloadableSection.samplesTitleInput}}" stepKey="fillDownloadableSampleTitle"/>
-+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addDownloadableLinkWithMaxDownloads">
-+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
-+
-+        <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
-+
-+        <!-- Check for product on the CMS page with the New Products widget -->
-+
-+        <amOnPage url="{{_newDefaultCmsPage.identifier}}" stepKey="amOnCmsPage"/>
-+        <waitForPageLoad stepKey="waitForCmsPage"/>
-+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductName"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php b/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
-index 8b9900d747c..06b29fce1cd 100644
---- a/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
-+++ b/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
-@@ -5,6 +5,14 @@
-  */
- namespace Magento\Downloadable\Test\Unit\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
- 
-+/**
-+ * Class LinksTest
-+ *
-+ * @package Magento\Downloadable\Test\Unit\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable
-+ *
-+ * @deprecated
-+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Links
-+ */
- class LinksTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-diff --git a/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php b/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
-index e850923bbd0..f0423606add 100644
---- a/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
-+++ b/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
-@@ -5,6 +5,14 @@
-  */
- namespace Magento\Downloadable\Test\Unit\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
- 
-+/**
-+ * Class SamplesTest
-+ *
-+ * @package Magento\Downloadable\Test\Unit\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable
-+ *
-+ * @deprecated
-+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples
-+ */
- class SamplesTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/File/UploadTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/File/UploadTest.php
-index df1f127fae3..281fb571ff5 100644
---- a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/File/UploadTest.php
-+++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/File/UploadTest.php
-@@ -59,11 +59,6 @@ class UploadTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $fileHelper;
- 
--    /**
--     * @var  \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Session
--     */
--    protected $session;
--
-     /**
-      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Controller\ResultFactory
-      */
-@@ -81,9 +76,6 @@ class UploadTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->setMethods(['create'])
-             ->getMock();
--        $this->session = $this->getMockBuilder(\Magento\Backend\Model\Session::class)
--            ->disableOriginalConstructor()
--            ->getMock();
-         $this->resultFactory = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['create'])
-@@ -108,9 +100,6 @@ class UploadTest extends \PHPUnit\Framework\TestCase
-         $this->context->expects($this->any())
-             ->method('getRequest')
-             ->will($this->returnValue($this->request));
--        $this->context->expects($this->any())
--            ->method('getSession')
--            ->will($this->returnValue($this->session));
-         $this->context->expects($this->any())
-             ->method('getResultFactory')
-             ->will($this->returnValue($this->resultFactory));
-@@ -154,11 +143,6 @@ class UploadTest extends \PHPUnit\Framework\TestCase
-         $this->uploaderFactory->expects($this->once())->method('create')->willReturn($uploader);
-         $this->fileHelper->expects($this->once())->method('uploadFromTmp')->willReturn($data);
-         $this->storageDatabase->expects($this->once())->method('saveFile');
--        $this->session->expects($this->once())->method('getName')->willReturn('Name');
--        $this->session->expects($this->once())->method('getSessionId')->willReturn('SessionId');
--        $this->session->expects($this->once())->method('getCookieLifetime')->willReturn('CookieLifetime');
--        $this->session->expects($this->once())->method('getCookiePath')->willReturn('CookiePath');
--        $this->session->expects($this->once())->method('getCookieDomain')->willReturn('CookieDomain');
-         $this->resultFactory->expects($this->once())->method('create')->willReturn($resultJson);
-         $resultJson->expects($this->once())->method('setData')->willReturnSelf();
- 
-diff --git a/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php b/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php
-index 7cb5b03b038..9551cfe982b 100644
---- a/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php
-+++ b/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php
-@@ -89,7 +89,7 @@ class DownloadTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @exectedExceptionMessage Please set resource file and link type.
-+     * @expectedExceptionMessage Please set resource file and link type.
-      */
-     public function testGetFileSizeNoResource()
-     {
-diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
-index a352c4bdf7b..c4824f913da 100644
---- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
-+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
-@@ -3,22 +3,24 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
- 
--use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
- use Magento\Catalog\Model\Locator\LocatorInterface;
-+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
- use Magento\Downloadable\Model\Product\Type;
--use Magento\Downloadable\Model\Source\TypeUpload;
- use Magento\Downloadable\Model\Source\Shareable;
--use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Downloadable\Model\Source\TypeUpload;
- use Magento\Framework\Stdlib\ArrayManager;
--use Magento\Ui\Component\DynamicRows;
- use Magento\Framework\UrlInterface;
-+use Magento\Store\Model\StoreManagerInterface;
- use Magento\Ui\Component\Container;
-+use Magento\Ui\Component\DynamicRows;
- use Magento\Ui\Component\Form;
- 
- /**
-- * Class adds a grid with links
-+ * Class adds a grid with links.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Links extends AbstractModifier
-@@ -86,7 +88,7 @@ class Links extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function modifyData(array $data)
-     {
-@@ -101,7 +103,7 @@ class Links extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-     public function modifyMeta(array $meta)
-@@ -160,6 +162,8 @@ class Links extends AbstractModifier
-     }
- 
-     /**
-+     * Returns configuration for dynamic rows
-+     *
-      * @return array
-      */
-     protected function getDynamicRows()
-@@ -180,6 +184,8 @@ class Links extends AbstractModifier
-     }
- 
-     /**
-+     * Returns Record column configuration
-+     *
-      * @return array
-      */
-     protected function getRecord()
-@@ -221,6 +227,8 @@ class Links extends AbstractModifier
-     }
- 
-     /**
-+     * Returns Title column configuration
-+     *
-      * @return array
-      */
-     protected function getTitleColumn()
-@@ -232,12 +240,14 @@ class Links extends AbstractModifier
-             'label' => __('Title'),
-             'showLabel' => false,
-             'dataScope' => '',
-+            'sortOrder' => 10,
-         ];
-         $titleField['arguments']['data']['config'] = [
-             'formElement' => Form\Element\Input::NAME,
-             'componentType' => Form\Field::NAME,
-             'dataType' => Form\Element\DataType\Text::NAME,
-             'dataScope' => 'title',
-+            'labelVisible' => false,
-             'validation' => [
-                 'required-entry' => true,
-             ],
-@@ -247,6 +257,8 @@ class Links extends AbstractModifier
-     }
- 
-     /**
-+     * Returns Price column configuration
-+     *
-      * @return array
-      */
-     protected function getPriceColumn()
-@@ -258,6 +270,7 @@ class Links extends AbstractModifier
-             'label' => __('Price'),
-             'showLabel' => false,
-             'dataScope' => '',
-+            'sortOrder' => 20,
-         ];
-         $priceField['arguments']['data']['config'] = [
-             'formElement' => Form\Element\Input::NAME,
-@@ -265,6 +278,7 @@ class Links extends AbstractModifier
-             'dataType' => Form\Element\DataType\Number::NAME,
-             'component' => 'Magento_Downloadable/js/components/price-handler',
-             'dataScope' => 'price',
-+            'labelVisible' => false,
-             'addbefore' => $this->locator->getStore()->getBaseCurrency()
-                 ->getCurrencySymbol(),
-             'validation' => [
-@@ -281,6 +295,8 @@ class Links extends AbstractModifier
-     }
- 
-     /**
-+     * Returns File column configuration
-+     *
-      * @return array
-      */
-     protected function getFileColumn()
-@@ -292,6 +308,7 @@ class Links extends AbstractModifier
-             'label' => __('File'),
-             'showLabel' => false,
-             'dataScope' => '',
-+            'sortOrder' => 30,
-         ];
-         $fileTypeField['arguments']['data']['config'] = [
-             'formElement' => Form\Element\Select::NAME,
-@@ -302,6 +319,7 @@ class Links extends AbstractModifier
-             'options' => $this->typeUpload->toOptionArray(),
-             'typeFile' => 'links_file',
-             'typeUrl' => 'link_url',
-+            'labelVisible' => false,
-         ];
-         $fileLinkUrl['arguments']['data']['config'] = [
-             'formElement' => Form\Element\Input::NAME,
-@@ -344,6 +362,8 @@ class Links extends AbstractModifier
-     }
- 
-     /**
-+     * Returns Sample column configuration
-+     *
-      * @return array
-      */
-     protected function getSampleColumn()
-@@ -355,6 +375,7 @@ class Links extends AbstractModifier
-             'label' => __('Sample'),
-             'showLabel' => false,
-             'dataScope' => '',
-+            'sortOrder' => 40,
-         ];
-         $sampleTypeField['arguments']['data']['config'] = [
-             'formElement' => Form\Element\Select::NAME,
-@@ -363,6 +384,7 @@ class Links extends AbstractModifier
-             'dataType' => Form\Element\DataType\Text::NAME,
-             'dataScope' => 'sample.type',
-             'options' => $this->typeUpload->toOptionArray(),
-+            'labelVisible' => false,
-             'typeFile' => 'sample_file',
-             'typeUrl' => 'sample_url',
-         ];
-@@ -382,6 +404,7 @@ class Links extends AbstractModifier
-             'component' => 'Magento_Downloadable/js/components/file-uploader',
-             'elementTmpl' => 'Magento_Downloadable/components/file-uploader',
-             'fileInputName' => 'link_samples',
-+            'labelVisible' => false,
-             'uploaderConfig' => [
-                 'url' => $this->urlBuilder->addSessionParam()->getUrl(
-                     'adminhtml/downloadable_file/upload',
-@@ -403,6 +426,8 @@ class Links extends AbstractModifier
-     }
- 
-     /**
-+     * Returns Sharable columns configuration
-+     *
-      * @return array
-      */
-     protected function getShareableColumn()
-@@ -413,6 +438,7 @@ class Links extends AbstractModifier
-             'componentType' => Form\Field::NAME,
-             'dataType' => Form\Element\DataType\Number::NAME,
-             'dataScope' => 'is_shareable',
-+            'sortOrder' => 50,
-             'options' => $this->shareable->toOptionArray(),
-         ];
- 
-@@ -420,6 +446,8 @@ class Links extends AbstractModifier
-     }
- 
-     /**
-+     * Returns max downloads column configuration
-+     *
-      * @return array
-      */
-     protected function getMaxDownloadsColumn()
-@@ -431,12 +459,14 @@ class Links extends AbstractModifier
-             'label' => __('Max. Downloads'),
-             'showLabel' => false,
-             'dataScope' => '',
-+            'sortOrder' => 60,
-         ];
-         $numberOfDownloadsField['arguments']['data']['config'] = [
-             'formElement' => Form\Element\Input::NAME,
-             'componentType' => Form\Field::NAME,
-             'dataType' => Form\Element\DataType\Number::NAME,
-             'dataScope' => 'number_of_downloads',
-+            'labelVisible' => false,
-             'value' => 0,
-             'validation' => [
-                 'validate-zero-or-greater' => true,
-diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
-index 1587163ba81..81c5918eb24 100644
---- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
-+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
-@@ -3,21 +3,23 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
- 
--use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
- use Magento\Catalog\Model\Locator\LocatorInterface;
-+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
- use Magento\Downloadable\Model\Product\Type;
- use Magento\Downloadable\Model\Source\TypeUpload;
--use Magento\Store\Model\StoreManagerInterface;
- use Magento\Framework\Stdlib\ArrayManager;
--use Magento\Ui\Component\DynamicRows;
- use Magento\Framework\UrlInterface;
-+use Magento\Store\Model\StoreManagerInterface;
- use Magento\Ui\Component\Container;
-+use Magento\Ui\Component\DynamicRows;
- use Magento\Ui\Component\Form;
- 
- /**
-- * Class adds a grid with samples
-+ * Class adds a grid with samples.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Samples extends AbstractModifier
-@@ -77,7 +79,7 @@ class Samples extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function modifyData(array $data)
-     {
-@@ -90,7 +92,7 @@ class Samples extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-     public function modifyMeta(array $meta)
-@@ -135,6 +137,8 @@ class Samples extends AbstractModifier
-     }
- 
-     /**
-+     * Returns configuration for dynamic rows
-+     *
-      * @return array
-      */
-     protected function getDynamicRows()
-@@ -155,6 +159,8 @@ class Samples extends AbstractModifier
-     }
- 
-     /**
-+     * Returns Record column configuration
-+     *
-      * @return array
-      */
-     protected function getRecord()
-@@ -192,6 +198,8 @@ class Samples extends AbstractModifier
-     }
- 
-     /**
-+     * Returns Title column configuration
-+     *
-      * @return array
-      */
-     protected function getTitleColumn()
-@@ -203,12 +211,14 @@ class Samples extends AbstractModifier
-             'showLabel' => false,
-             'label' => __('Title'),
-             'dataScope' => '',
-+            'sortOrder' => 10,
-         ];
-         $titleField['arguments']['data']['config'] = [
-             'formElement' => Form\Element\Input::NAME,
-             'componentType' => Form\Field::NAME,
-             'dataType' => Form\Element\DataType\Text::NAME,
-             'dataScope' => 'title',
-+            'labelVisible' => false,
-             'validation' => [
-                 'required-entry' => true,
-             ],
-@@ -218,6 +228,8 @@ class Samples extends AbstractModifier
-     }
- 
-     /**
-+     * Returns Sample column configuration
-+     *
-      * @return array
-      */
-     protected function getSampleColumn()
-@@ -229,6 +241,7 @@ class Samples extends AbstractModifier
-             'label' => __('File'),
-             'showLabel' => false,
-             'dataScope' => '',
-+            'sortOrder' => 20,
-         ];
-         $sampleType['arguments']['data']['config'] = [
-             'formElement' => Form\Element\Select::NAME,
-@@ -236,6 +249,7 @@ class Samples extends AbstractModifier
-             'component' => 'Magento_Downloadable/js/components/upload-type-handler',
-             'dataType' => Form\Element\DataType\Text::NAME,
-             'dataScope' => 'type',
-+            'labelVisible' => false,
-             'options' => $this->typeUpload->toOptionArray(),
-             'typeFile' => 'sample_file',
-             'typeUrl' => 'sample_url',
-@@ -246,6 +260,7 @@ class Samples extends AbstractModifier
-             'dataType' => Form\Element\DataType\Text::NAME,
-             'dataScope' => 'sample_url',
-             'placeholder' => 'URL',
-+            'labelVisible' => false,
-             'validation' => [
-                 'required-entry' => true,
-                 'validate-url' => true,
-diff --git a/app/code/Magento/Downloadable/etc/db_schema.xml b/app/code/Magento/Downloadable/etc/db_schema.xml
-index ed25628bcff..ccbefa4fb39 100644
---- a/app/code/Magento/Downloadable/etc/db_schema.xml
-+++ b/app/code/Magento/Downloadable/etc/db_schema.xml
-@@ -24,13 +24,13 @@
-         <column xsi:type="varchar" name="sample_url" nullable="true" length="255" comment="Sample Url"/>
-         <column xsi:type="varchar" name="sample_file" nullable="true" length="255" comment="Sample File"/>
-         <column xsi:type="varchar" name="sample_type" nullable="true" length="20" comment="Sample Type"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="link_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="DOWNLOADABLE_LINK_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_LINK_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-                     table="downloadable_link" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="DOWNLOADABLE_LINK_PRODUCT_ID_SORT_ORDER" indexType="btree">
-+        <index referenceId="DOWNLOADABLE_LINK_PRODUCT_ID_SORT_ORDER" indexType="btree">
-             <column name="product_id"/>
-             <column name="sort_order"/>
-         </index>
-@@ -42,21 +42,21 @@
-                 comment="Link ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Website ID"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="false" default="0"
-                 comment="Price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="price_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="DOWNLOADABLE_LINK_PRICE_LINK_ID_DOWNLOADABLE_LINK_LINK_ID"
-+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_LINK_PRICE_LINK_ID_DOWNLOADABLE_LINK_LINK_ID"
-                     table="downloadable_link_price" column="link_id" referenceTable="downloadable_link"
-                     referenceColumn="link_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="DOWNLOADABLE_LINK_PRICE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_LINK_PRICE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-                     table="downloadable_link_price" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <index name="DOWNLOADABLE_LINK_PRICE_LINK_ID" indexType="btree">
-+        <index referenceId="DOWNLOADABLE_LINK_PRICE_LINK_ID" indexType="btree">
-             <column name="link_id"/>
-         </index>
--        <index name="DOWNLOADABLE_LINK_PRICE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="DOWNLOADABLE_LINK_PRICE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-@@ -78,22 +78,22 @@
-         <column xsi:type="varchar" name="product_name" nullable="true" length="255" comment="Product name"/>
-         <column xsi:type="varchar" name="product_sku" nullable="true" length="255" comment="Product sku"/>
-         <column xsi:type="varchar" name="link_section_title" nullable="true" length="255" comment="Link_section_title"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="purchased_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="DL_LNK_PURCHASED_CSTR_ID_CSTR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="DL_LNK_PURCHASED_CSTR_ID_CSTR_ENTT_ENTT_ID"
-                     table="downloadable_link_purchased" column="customer_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="SET NULL"/>
--        <constraint xsi:type="foreign" name="DOWNLOADABLE_LINK_PURCHASED_ORDER_ID_SALES_ORDER_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_LINK_PURCHASED_ORDER_ID_SALES_ORDER_ENTITY_ID"
-                     table="downloadable_link_purchased" column="order_id" referenceTable="sales_order"
-                     referenceColumn="entity_id" onDelete="SET NULL"/>
--        <index name="DOWNLOADABLE_LINK_PURCHASED_ORDER_ID" indexType="btree">
-+        <index referenceId="DOWNLOADABLE_LINK_PURCHASED_ORDER_ID" indexType="btree">
-             <column name="order_id"/>
-         </index>
--        <index name="DOWNLOADABLE_LINK_PURCHASED_ORDER_ITEM_ID" indexType="btree">
-+        <index referenceId="DOWNLOADABLE_LINK_PURCHASED_ORDER_ITEM_ID" indexType="btree">
-             <column name="order_item_id"/>
-         </index>
--        <index name="DOWNLOADABLE_LINK_PURCHASED_CUSTOMER_ID" indexType="btree">
-+        <index referenceId="DOWNLOADABLE_LINK_PURCHASED_CUSTOMER_ID" indexType="btree">
-             <column name="customer_id"/>
-         </index>
-     </table>
-@@ -125,22 +125,22 @@
-                 comment="Creation Time"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Update Time"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="item_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="DL_LNK_PURCHASED_ITEM_PURCHASED_ID_DL_LNK_PURCHASED_PURCHASED_ID"
-+        <constraint xsi:type="foreign" referenceId="DL_LNK_PURCHASED_ITEM_PURCHASED_ID_DL_LNK_PURCHASED_PURCHASED_ID"
-                     table="downloadable_link_purchased_item" column="purchased_id"
-                     referenceTable="downloadable_link_purchased" referenceColumn="purchased_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="DL_LNK_PURCHASED_ITEM_ORDER_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID"
-+        <constraint xsi:type="foreign" referenceId="DL_LNK_PURCHASED_ITEM_ORDER_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID"
-                     table="downloadable_link_purchased_item" column="order_item_id" referenceTable="sales_order_item"
-                     referenceColumn="item_id" onDelete="SET NULL"/>
--        <index name="DOWNLOADABLE_LINK_PURCHASED_ITEM_LINK_HASH" indexType="btree">
-+        <index referenceId="DOWNLOADABLE_LINK_PURCHASED_ITEM_LINK_HASH" indexType="btree">
-             <column name="link_hash"/>
-         </index>
--        <index name="DOWNLOADABLE_LINK_PURCHASED_ITEM_ORDER_ITEM_ID" indexType="btree">
-+        <index referenceId="DOWNLOADABLE_LINK_PURCHASED_ITEM_ORDER_ITEM_ID" indexType="btree">
-             <column name="order_item_id"/>
-         </index>
--        <index name="DOWNLOADABLE_LINK_PURCHASED_ITEM_PURCHASED_ID" indexType="btree">
-+        <index referenceId="DOWNLOADABLE_LINK_PURCHASED_ITEM_PURCHASED_ID" indexType="btree">
-             <column name="purchased_id"/>
-         </index>
-     </table>
-@@ -152,20 +152,20 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="title_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="DOWNLOADABLE_LINK_TITLE_LINK_ID_DOWNLOADABLE_LINK_LINK_ID"
-+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_LINK_TITLE_LINK_ID_DOWNLOADABLE_LINK_LINK_ID"
-                     table="downloadable_link_title" column="link_id" referenceTable="downloadable_link"
-                     referenceColumn="link_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="DOWNLOADABLE_LINK_TITLE_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_LINK_TITLE_STORE_ID_STORE_STORE_ID"
-                     table="downloadable_link_title" column="store_id" referenceTable="store" referenceColumn="store_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="DOWNLOADABLE_LINK_TITLE_LINK_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="DOWNLOADABLE_LINK_TITLE_LINK_ID_STORE_ID">
-             <column name="link_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="DOWNLOADABLE_LINK_TITLE_STORE_ID" indexType="btree">
-+        <index referenceId="DOWNLOADABLE_LINK_TITLE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -179,13 +179,13 @@
-         <column xsi:type="varchar" name="sample_type" nullable="true" length="20" comment="Sample Type"/>
-         <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Sort Order"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="sample_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="DOWNLOADABLE_SAMPLE_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_SAMPLE_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-                     table="downloadable_sample" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="DOWNLOADABLE_SAMPLE_PRODUCT_ID" indexType="btree">
-+        <index referenceId="DOWNLOADABLE_SAMPLE_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-@@ -198,20 +198,20 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store ID"/>
-         <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="title_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="DL_SAMPLE_TTL_SAMPLE_ID_DL_SAMPLE_SAMPLE_ID"
-+        <constraint xsi:type="foreign" referenceId="DL_SAMPLE_TTL_SAMPLE_ID_DL_SAMPLE_SAMPLE_ID"
-                     table="downloadable_sample_title" column="sample_id" referenceTable="downloadable_sample"
-                     referenceColumn="sample_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="DOWNLOADABLE_SAMPLE_TITLE_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_SAMPLE_TITLE_STORE_ID_STORE_STORE_ID"
-                     table="downloadable_sample_title" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="DOWNLOADABLE_SAMPLE_TITLE_SAMPLE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="DOWNLOADABLE_SAMPLE_TITLE_SAMPLE_ID_STORE_ID">
-             <column name="sample_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="DOWNLOADABLE_SAMPLE_TITLE_STORE_ID" indexType="btree">
-+        <index referenceId="DOWNLOADABLE_SAMPLE_TITLE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -223,11 +223,11 @@
-                 identity="false"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website ID"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Minimum price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Maximum price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-@@ -241,11 +241,11 @@
-                 identity="false"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website ID"/>
--        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Minimum price"/>
--        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Maximum price"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="customer_group_id"/>
-             <column name="website_id"/>
-diff --git a/app/code/Magento/Downloadable/etc/di.xml b/app/code/Magento/Downloadable/etc/di.xml
-index 932e48e8808..4e9b0b55afb 100644
---- a/app/code/Magento/Downloadable/etc/di.xml
-+++ b/app/code/Magento/Downloadable/etc/di.xml
-@@ -77,6 +77,13 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Sales\Model\Order\ProductOption">
-+        <arguments>
-+            <argument name="processorPool" xsi:type="array">
-+                <item name="downloadable" xsi:type="object">Magento\Downloadable\Model\ProductOptionProcessor</item>
-+            </argument>
-+        </arguments>
-+    </type>
-     <preference for="Magento\Downloadable\Api\LinkRepositoryInterface" type="Magento\Downloadable\Model\LinkRepository" />
-     <preference for="Magento\Downloadable\Api\SampleRepositoryInterface" type="Magento\Downloadable\Model\SampleRepository" />
-     <preference for="Magento\Downloadable\Api\Data\LinkInterface" type="Magento\Downloadable\Model\Link" />
-diff --git a/app/code/Magento/Downloadable/etc/events.xml b/app/code/Magento/Downloadable/etc/events.xml
-index e4f03ff238d..21cc50ddc96 100644
---- a/app/code/Magento/Downloadable/etc/events.xml
-+++ b/app/code/Magento/Downloadable/etc/events.xml
-@@ -6,11 +6,12 @@
-  */
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
--    <event name="sales_order_item_save_commit_after">
-+    <event name="sales_order_item_save_after">
-         <observer name="downloadable_observer" instance="Magento\Downloadable\Observer\SaveDownloadableOrderItemObserver" />
-     </event>
--    <event name="sales_order_save_commit_after">
-+    <event name="sales_order_save_after">
-         <observer name="downloadable_observer" instance="Magento\Downloadable\Observer\SetLinkStatusObserver" />
-+        <observer name="downloadable_observer_assign_customer" instance="Magento\Downloadable\Observer\UpdateLinkPurchasedObserver" />
-     </event>
-     <event name="sales_model_service_quote_submit_success">
-         <observer name="checkout_type_onepage_save_order_after" instance="Magento\Downloadable\Observer\SetHasDownloadableProductsObserver" />
-diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml
-index 19b485f0b78..0352c98bfa5 100644
---- a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml
-+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml
-@@ -5,6 +5,10 @@
-  * See COPYING.txt for license details.
-  */
- -->
-+<!--
-+@deprecated Adminhtml Blocks extending for Downloadable products have neen moved to UI components
-+@see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
-+-->
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <update handle="downloadable_items"/>
-     <body>
-diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml
-index 843f9b40256..d424db980f7 100644
---- a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml
-+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml
-@@ -5,6 +5,10 @@
-  * See COPYING.txt for license details.
-  */
- -->
-+<!--
-+@deprecated Adminhtml Blocks extending for Downloadable products have neen moved to UI components
-+@see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
-+-->
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <update handle="downloadable_items"/>
- </page>
-diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_view_type_downloadable.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_view_type_downloadable.xml
-index d1e551ff1c9..9c88e1ba15c 100644
---- a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_view_type_downloadable.xml
-+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_view_type_downloadable.xml
-@@ -5,6 +5,10 @@
-  * See COPYING.txt for license details.
-  */
- -->
-+<!--
-+@deprecated Adminhtml Blocks extending for Downloadable products have neen moved to UI components
-+@see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
-+-->
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceBlock name="product.composite.fieldset">
-diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml
-index 843f9b40256..d424db980f7 100644
---- a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml
-+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml
-@@ -5,6 +5,10 @@
-  * See COPYING.txt for license details.
-  */
- -->
-+<!--
-+@deprecated Adminhtml Blocks extending for Downloadable products have neen moved to UI components
-+@see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
-+-->
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <update handle="downloadable_items"/>
- </page>
-diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/downloadable_items.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/downloadable_items.xml
-index 958e922334d..fec90e7049b 100644
---- a/app/code/Magento/Downloadable/view/adminhtml/layout/downloadable_items.xml
-+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/downloadable_items.xml
-@@ -5,6 +5,10 @@
-  * See COPYING.txt for license details.
-  */
- -->
-+<!--
-+@deprecated Adminhtml Blocks extending for Downloadable products have neen moved to UI components
-+@see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
-+-->
- <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_layout.xsd">
-     <!--<referenceContainer name="product_form">-->
-         <!--<block name="downloadable_items" class="Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable">-->
-diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
-index c86eb56a390..8d471a1e49e 100644
---- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
-+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
-@@ -3,58 +3,63 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+// @deprecated
- ?>
- <?php /* @var $block \Magento\Downloadable\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Downloadable */ ?>
- <?php $_linksPurchasedSeparately = $block->getLinksPurchasedSeparately(); ?>
--<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
--<?php if (($block->getProduct()->isSaleable() || $_skipSaleableCheck) && $block->hasLinks()):?>
-+<?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
-+<?php if (($block->getProduct()->isSaleable() || $_skipSaleableCheck) && $block->hasLinks()) :?>
- 
- <fieldset id="catalog_product_composite_configure_fields_downloadable"
-           class="fieldset admin__fieldset downloadable information<?= $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
--    <legend class="legend admin__legend"><span><?= /* @escapeNotVerified */ __('Downloadable Information') ?></span></legend><br />
-+    <legend class="legend admin__legend">
-+        <span><?= $block->escapeHtml(__('Downloadable Information')) ?></span>
-+    </legend><br />
-     <?php $_links = $block->getLinks(); ?>
-     <?php $_isRequired = $block->getLinkSelectionRequired(); ?>
--    <div class="field admin__field link<?php if ($_isRequired) echo ' required _required' ?>">
--        <label class="label admin__field-label"><span><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></span></label>
-+    <div class="field admin__field link <?php if ($_isRequired) { echo ' required _required'; } ?>">
-+        <label class="label admin__field-label"><span><?= $block->escapeHtml($block->getLinksTitle()) ?></span></label>
-         <div class="control admin__field-control" id="downloadable-links-list">
--            <?php foreach ($_links as $_link): ?>
-+            <?php foreach ($_links as $_link) : ?>
-                 <div class="nested admin__field-option">
--                <?php if ($_linksPurchasedSeparately): ?>
-+                <?php if ($_linksPurchasedSeparately) : ?>
-                     <input type="checkbox"
--                           class="admin__control-checkbox checkbox<?php if ($_isRequired):?> validate-one-required-by-name<?php endif; ?> product downloadable link"
--                           name="links[]" id="links_<?= /* @escapeNotVerified */ $_link->getId() ?>"
--                           value="<?= /* @escapeNotVerified */ $_link->getId() ?>" <?= /* @escapeNotVerified */ $block->getLinkCheckedValue($_link) ?>
--                           price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_link->getPrice()) ?>"/>
-+                           class="admin__control-checkbox checkbox<?php if ($_isRequired) :?> validate-one-required-by-name<?php endif; ?> product downloadable link"
-+                           name="links[]" id="links_<?= $block->escapeHtmlAttr($_link->getId()) ?>"
-+                           value="<?= $block->escapeHtmlAttr($_link->getId()) ?>"
-+                           <?= $block->escapeHtml($block->getLinkCheckedValue($_link)) ?>
-+                           price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_link->getPrice())) ?>"/>
-                     <?php endif; ?>
--                    <label for="links_<?= /* @escapeNotVerified */ $_link->getId() ?>" class="label">
-+                    <label for="links_<?= $block->escapeHtmlAttr($_link->getId()) ?>" class="label admin__field-label">
-                         <?= $block->escapeHtml($_link->getTitle()) ?>
--                        <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
--                            &nbsp;(<a href="<?= /* @escapeNotVerified */ $block->getLinkSampleUrl($_link) ?>" <?= $block->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':'' ?>><?= /* @escapeNotVerified */ __('sample') ?></a>)
-+                        <?php if ($_link->getSampleFile() || $_link->getSampleUrl()) : ?>
-+                            &nbsp;(<a href="<?= $block->escapeUrl($block->getLinkSampleUrl($_link)) ?>"
-+                                <?= /* @noEscape */ $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>>
-+                                <?= $block->escapeHtml(__('sample')) ?>
-+                            </a>)
-                         <?php endif; ?>
--                        <?php if ($_linksPurchasedSeparately): ?>
--                        <?= /* @escapeNotVerified */ $block->getFormattedLinkPrice($_link) ?>
-+                        <?php if ($_linksPurchasedSeparately) : ?>
-+                            <?= /* @noEscape */ $block->getFormattedLinkPrice($_link) ?>
-                             <br />
--                            <?= /* @escapeNotVerified */ $block->getLinkPrice($_link) ?>
-+                            <?= /* @noEscape */ $block->getLinkPrice($_link) ?>
-                         <?php endif; ?>
-                     </label>
--                <?php if ($_isRequired): ?>
-+                <?php if ($_isRequired) : ?>
-                     <script>
--require(['prototype'], function(){
-+                        require(['prototype'], function(){
- 
--    //<![CDATA[
--    $('links_<?= /* @escapeNotVerified */ $_link->getId() ?>').advaiceContainer = 'links-advice-container';
--    $('links_<?= /* @escapeNotVerified */ $_link->getId() ?>').callbackFunction = 'validateDownloadableCallback';
--    //]]>
--                    
--});
--</script>
-+                            //<![CDATA[
-+                            $('links_<?= $block->escapeJs($_link->getId()) ?>').advaiceContainer = 'links-advice-container';
-+                            $('links_<?= $block->escapeJs($_link->getId()) ?>').callbackFunction = 'validateDownloadableCallback';
-+                            //]]>
-+
-+                        });
-+                    </script>
-                 <?php endif; ?>
-             </div>
-             <?php endforeach; ?>
--        <?php if ($_isRequired): ?>
-+        <?php if ($_isRequired) : ?>
-             <span id="links-advice-container"></span>
-         <?php endif;?>
-         </div>
-diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
-index 7dc547c5e27..36032d58ab2 100644
---- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
-+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// @deprecated
- ?>
- 
- <?php
-@@ -113,7 +112,7 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
-             this.idName = idName;
-             this.config = config;
-             uploaderTemplate = new Template(this.uploaderText, this.uploaderSyntax);
--            <?php if (!$block->isReadonly()):?>
-+            <?php if (!$block->isReadonly()) :?>
-             Element.insert(
-                 elmContainer,
-                 {'top' : uploaderTemplate.evaluate({
-@@ -203,8 +202,8 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
- });
- </script>
- 
--<div data-tab-type="tab_content_downloadableInfo" id="<?= /* @escapeNotVerified */ $block->getId() ?>_content"
--    <?= /* @escapeNotVerified */ $block->getUiId('tab', 'content', $block->getId()) ?>
-+<div data-tab-type="tab_content_downloadableInfo" id="<?= $block->escapeHtmlAttr($block->getId()) ?>_content"
-+    <?= $block->escapeHtml($block->getUiId('tab', 'content', $block->getId())) ?>
- >
- <div id="alert_messages_block"><?= $block->getMessageHtml() ?></div>
- <div class="admin__field admin__field-option admin__field-is-downloaodable">
-@@ -220,11 +219,11 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
- <div style="display:none">
-     <div id="custom-advice-container"></div>
- </div>
--<?php if ($block->isReadonly()): ?>
-+<?php if ($block->isReadonly()) : ?>
-     <script>
-         require(['prototype'], function(){
- 
--        $(<?= /* @escapeNotVerified */  $block->getContentTabId() ?>).select('input', 'select', 'textarea', 'button').each(function (item){
-+        $(<?= /* @noEscape */ $block->getContentTabId() ?>).select('input', 'select', 'textarea', 'button').each(function (item){
-             item.disabled = true;
-             if (item.tagName.toLowerCase() == 'button') {
-                 item.addClassName('disabled');
-diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
-index 3ec6010218f..747ada71221 100644
---- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
-+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// @deprecated
- ?>
- <?php
- 
-@@ -16,23 +15,23 @@
- <?php $_product = $block->getProduct()?>
- <?php $block->getConfigJson() ?>
- <fieldset class="admin__fieldset downloadable-form" data-ui-id="downloadable-links">
--    <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Links') ?></span></legend><br>
--    <p class="note"><?= /* @escapeNotVerified */ __('Add links to your product files here.') ?></p>
--    <div class="admin__field" <?= !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '' ?>>
--        <label class="admin__field-label" for="downloadable_links_title"><span><?= /* @escapeNotVerified */ __('Title') ?></span></label>
-+    <legend class="admin__legend"><span><?= $block->escapeHtml(__('Links')) ?></span></legend><br>
-+    <p class="note"><?= $block->escapeHtml(__('Add links to your product files here.')) ?></p>
-+    <div class="admin__field" <?= $block->escapeHtml(!$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '') ?>>
-+        <label class="admin__field-label" for="downloadable_links_title"><span><?= $block->escapeHtml(__('Title')) ?></span></label>
-         <div class="admin__field-control">
-             <input type="text" class="admin__control-text" id="downloadable_links_title" name="product[links_title]" value="<?= $block->escapeHtml($block->getLinksTitle()) ?>" <?= ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
--            <?php if ($_product->getStoreId()): ?>
-+            <?php if ($_product->getStoreId()) : ?>
-                 <div class="admin__field admin__field-option">
-                     <input id="link_title_default" class="admin__control-checkbox" type="checkbox" name="use_default[]" value="links_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?= $block->getUsedDefault() ? 'checked="checked"' : '' ?> />
--                    <label class="admin__field-label" for="link_title_default"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>
-+                    <label class="admin__field-label" for="link_title_default"><span><?= $block->escapeHtml(__('Use Default Value')) ?></span></label>
-                 </div>
-             <?php endif; ?>
-         </div>
-     </div>
- 
--    <div class="admin__field" <?= !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[GLOBAL]') . '"' : '' ?>>
--        <label class="admin__field-label" for="downloadable_link_purchase_type"><span><?= /* @escapeNotVerified */ __('Links can be purchased separately') ?></span></label>
-+    <div class="admin__field" <?= $block->escapeHtml(!$block->isSingleStoreMode() ? ' data-config-scope="' . __('[GLOBAL]') . '"' : '') ?>>
-+        <label class="admin__field-label" for="downloadable_link_purchase_type"><span><?= $block->escapeHtml(__('Links can be purchased separately')) ?></span></label>
-         <div class="admin__field-control">
-             <div class="admin__field-control link-switcher" data-role="link-switcher">
-                 <div class="admin__field-control-group">
-@@ -40,9 +39,9 @@
-                         <input type="radio" name="product[links_purchased_separately]" value="1"
-                                class="admin__control-radio"
-                                id="link-switcher1"
--                           <?php if($block->isProductLinksCanBePurchasedSeparately()): ?>
-+                            <?php if ($block->isProductLinksCanBePurchasedSeparately()) : ?>
-                                checked="checked"
--                           <?php endif; ?>
-+                            <?php endif; ?>
-                             >
-                         <label class="admin__field-label" for="link-switcher1">
-                             <span>Yes</span>
-@@ -52,7 +51,7 @@
-                         <input type="radio" name="product[links_purchased_separately]" value="0"
-                                 class="admin__control-radio"
-                                 id="link-switcher0"
--                            <?php if(!$block->isProductLinksCanBePurchasedSeparately()): ?>
-+                            <?php if (!$block->isProductLinksCanBePurchasedSeparately()) : ?>
-                                 checked="checked"
-                             <?php endif; ?>
-                             >
-@@ -70,15 +69,15 @@
-                 <table class="admin__control-table">
-                     <thead>
-                         <tr>
--                            <th class="col-sort"><span><?= /* @escapeNotVerified */ __('Sort Order') ?></span></th>
--                            <th class="col-title _required"><span><?= /* @escapeNotVerified */ __('Title') ?></span></th>
-+                            <th class="col-sort"><span><?= $block->escapeHtml(__('Sort Order')) ?></span></th>
-+                            <th class="col-title _required"><span><?= $block->escapeHtml(__('Title')) ?></span></th>
-                             <?php if ($block->getCanReadPrice() !== false) : ?>
--                                <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
-+                                <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
-                             <?php endif; ?>
--                            <th class="col-file"><span><?= /* @escapeNotVerified */ __('Attach File or Enter Link') ?></span></th>
--                            <th class="col-sample"><span><?= /* @escapeNotVerified */ __('Sample') ?></span></th>
--                            <th class="col-share"><span><?= /* @escapeNotVerified */ __('Shareable') ?></span></th>
--                            <th class="col-limit"><span><?= /* @escapeNotVerified */ __('Max. Downloads') ?></span></th>
-+                            <th class="col-file"><span><?= $block->escapeHtml(__('Attach File or Enter Link')) ?></span></th>
-+                            <th class="col-sample"><span><?= $block->escapeHtml(__('Sample')) ?></span></th>
-+                            <th class="col-share"><span><?= $block->escapeHtml(__('Shareable')) ?></span></th>
-+                            <th class="col-limit"><span><?= $block->escapeHtml(__('Max. Downloads')) ?></span></th>
-                             <th class="col-actions">&nbsp;</th>
-                         </tr>
-                     </thead>
-@@ -92,7 +91,7 @@
-                 </table>
-             </div>
-             <div class="admin__field-note">
--                <span><?= /* @escapeNotVerified */ __('Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.') ?></span>
-+                <span><?= $block->escapeHtml(__('Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.')) ?></span>
-             </div>
-         </div>
-     </div>
-@@ -114,16 +113,16 @@ require([
-             'data.id' +
-             ' %>][sort_order]" ' +
-             'value="<%- data.sort_order %>" class="input-text admin__control-text sort" />' +
--                '<span class="draggable-handle" title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Sort Variations')) ?>"></span>' +
-+                '<span class="draggable-handle" title="<?= $block->escapeJs($block->escapeHtml(__('Sort Variations'))) ?>"></span>' +
-             '</td>'+
-             '<td class="col-title">'+
-                 '<input type="hidden" class="__delete__" name="downloadable[link][<%- data.id %>][is_delete]" value="" />'+
-                 '<input type="hidden" name="downloadable[link][<%- data.id %>][link_id]" value="<%- data.link_id %>" />'+
-                 '<input type="text" class="required-entry input-text admin__control-text" name="downloadable[link][<%- data.id %>][title]" value="<%- data.title %>" />'+
--                <?php if($_product->getStoreId()): ?>
-+                <?php if ($_product->getStoreId()) : ?>
-                     '<div class="admin__field admin__field-option">'+
-                     '<input type="checkbox" id="downloadable_link_<%- data.id %>_title" name="downloadable[link][<%- data.id %>][use_default_title]" value="1" class="admin__control-checkbox" />'+
--                    '<label for="downloadable_link_<%- data.id %>_title" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>'+
-+                    '<label for="downloadable_link_<%- data.id %>_title" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('Use Default Value'))) ?></span></label>'+
-                     '</div>' +
-                 <?php endif; ?>
-                 <?php if ($block->getCanReadPrice() == false) : ?>
-@@ -142,7 +141,7 @@ require([
-                     <?php if ($_product->getStoreId() && $block->getIsPriceWebsiteScope()) : ?>
-                         '<div class="admin__field admin__field-option">'+
-                             '<input type="checkbox" id="downloadable_link_<%- data.id %>_price" name="downloadable[link][<%- data.id %>][use_default_price]" value="1"<?php if ($block->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif; ?> class="admin__control-checkbox" />'+
--                            '<label for="downloadable_link_<%- data.id %>_price" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>' +
-+                            '<label for="downloadable_link_<%- data.id %>_price" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('Use Default Value'))) ?></span></label>' +
-                         '</div>' +
-                     <?php endif; ?>
-                 '</td>' +
-@@ -150,25 +149,25 @@ require([
-             '<td class="col-file">'+
-                 '<div class="admin__field admin__field-option">'+
-                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_link_<%- data.id %>_file_type" name="downloadable[link][<%- data.id %>][type]" value="file"<%- data.file_checked %> />' +
--                    '<label for="downloadable_link_<%- data.id %>_file_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('File') ?></span></label>'+
-+                    '<label for="downloadable_link_<%- data.id %>_file_type" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('File'))) ?></span></label>'+
-                     '<input type="hidden" class="validate-downloadable-file" id="downloadable_link_<%- data.id %>_file_save" name="downloadable[link][<%- data.id %>][file]" value="<%- data.file_save %>" />'+
- 
-                     '<div id="downloadable_link_<%- data.id %>_file" class="admin__field-uploader">'+
-                         '<div id="downloadable_link_<%- data.id %>_file-old" class="file-row-info"></div>'+
-                         '<div id="downloadable_link_<%- data.id %>_file-new" class="file-row-info new-file"></div>'+
-                         '<div class="fileinput-button form-buttons">'+
--                            '<span><?= /* @escapeNotVerified */ __('Browse Files...') ?></span>' +
--                            '<input id="downloadable_link_<%- data.id %>_file" type="file" name="<?= $block->escapeHtml($block->getFileFieldName('links')) ?>">' +
-+                            '<span><?= $block->escapeJs($block->escapeHtml(__('Browse Files...'))) ?></span>' +
-+                            '<input id="downloadable_link_<%- data.id %>_file" type="file" name="<?=  $block->escapeJs($block->escapeHtmlAttr($block->getFileFieldName('links'))) ?>">' +
-                             '<script>' +
--                                'linksUploader("#downloadable_link_<%- data.id %>_file", "<?= $block->escapeUrl($block->getUploadUrl('links')) ?>"); ' +
-+                                'linksUploader("#downloadable_link_<%- data.id %>_file", "<?=  $block->escapeJs($block->escapeUrl($block->getUploadUrl('links'))) ?>"); ' +
-                             '</scr'+'ipt>'+
-                         '</div>'+
-                     '</div>'+
-                 '</div>'+
-                 '<div class="admin__field admin__field-option admin__field-file-url">'+
-                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_link_<%- data.id %>_url_type" name="downloadable[link][<%- data.id %>][type]" value="url"<%- data.url_checked %> />' +
--                    '<label for="downloadable_link_<%- data.id %>_url_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('URL') ?></span></label>' +
--                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[link][<%- data.id %>][link_url]" value="<%- data.link_url %>" placeholder="<?= /* @escapeNotVerified */ __('URL') ?>" />'+
-+                    '<label for="downloadable_link_<%- data.id %>_url_type" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('URL'))) ?></span></label>' +
-+                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[link][<%- data.id %>][link_url]" value="<%- data.link_url %>" placeholder="<?= $block->escapeJs($block->escapeHtmlAttr(__('URL'))) ?>" />'+
-                 '</div>'+
-                 '<div>'+
-                     '<span id="downloadable_link_<%- data.id %>_link_container"></span>'+
-@@ -177,16 +176,16 @@ require([
-             '<td class="col-sample">'+
-                 '<div class="admin__field admin__field-option">'+
-                     '<input type="radio" class="admin__control-radio" id="downloadable_link_<%- data.id %>_sample_file_type" name="downloadable[link][<%- data.id %>][sample][type]" value="file"<%- data.sample_file_checked %> />' +
--                    '<label for="downloadable_link_<%- data.id %>_sample_file_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('File') ?>:</span></label>'+
-+                    '<label for="downloadable_link_<%- data.id %>_sample_file_type" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('File'))) ?>:</span></label>'+
-                     '<input type="hidden" id="downloadable_link_<%- data.id %>_sample_file_save" name="downloadable[link][<%- data.id %>][sample][file]" value="<%- data.sample_file_save %>" class="validate-downloadable-file"/>'+
-                     '<div id="downloadable_link_<%- data.id %>_sample_file" class="admin__field-uploader">'+
-                         '<div id="downloadable_link_<%- data.id %>_sample_file-old" class="file-row-info"></div>'+
-                         '<div id="downloadable_link_<%- data.id %>_sample_file-new" class="file-row-info new-file"></div>'+
-                         '<div class="fileinput-button form-buttons">'+
--                        '<span><?= /* @escapeNotVerified */ __('Browse Files...') ?></span>' +
--                        '<input id="downloadable_link_<%- data.id %>_sample_file" type="file" name="<?= $block->escapeHtml($block->getFileFieldName('link_samples'), '"') ?>">' +
-+                        '<span><?= $block->escapeJs($block->escapeHtml(__('Browse Files...'))) ?></span>' +
-+                        '<input id="downloadable_link_<%- data.id %>_sample_file" type="file" name="<?= $block->escapeJs($block->escapeHtmlAttr($block->getFileFieldName('link_samples'), '"')) ?>">' +
-                         '<script>'+
--                        'linksUploader("#downloadable_link_<%- data.id %>_sample_file", "<?= $block->escapeUrl($block->getUploadUrl('link_samples')) ?>"); ' +
-+                        'linksUploader("#downloadable_link_<%- data.id %>_sample_file", "<?=  $block->escapeJs($block->escapeUrl($block->getUploadUrl('link_samples'))) ?>"); ' +
-                         '</scr'+'ipt>'+
-                         '</div>'+
-                     '</div>'+
-@@ -194,8 +193,8 @@ require([
- 
-                 '<div class="admin__field admin__field-option admin__field-file-url">'+
-                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_link_<%- data.id %>_sample_url_type" name="downloadable[link][<%- data.id %>][sample][type]" value="url"<%- data.sample_url_checked %> />' +
--                    '<label for="downloadable_link_<%- data.id %>_sample_url_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('URL') ?></span></label>'+
--                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[link][<%- data.id %>][sample][url]" value="<%- data.sample_url %>" placeholder="<?= /* @escapeNotVerified */ __('URL') ?>" />'+
-+                    '<label for="downloadable_link_<%- data.id %>_sample_url_type" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('URL'))) ?></span></label>'+
-+                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[link][<%- data.id %>][sample][url]" value="<%- data.sample_url %>" placeholder="<?= $block->escapeJs($block->escapeHtmlAttr(__('URL'))) ?>" />'+
-                 '</div>'+
-                 '<div>'+
-                     '<span id="downloadable_link_<%- data.id %>_sample_container"></span>'+
-@@ -203,20 +202,20 @@ require([
-             '</td>'+
-             '<td class="col-share">'+
-                 '<select id="downloadable_link _<%- data.id %>_shareable" class="admin__control-select" name="downloadable[link][<%- data.id %>][is_shareable]">'+
--                    '<option value="1"><?= /* @escapeNotVerified */ __('Yes') ?></option>'+
--                    '<option value="0"><?= /* @escapeNotVerified */ __('No') ?></option>'+
--                    '<option value="2" selected="selected"><?= /* @escapeNotVerified */ __('Use config') ?></option>'+
-+                    '<option value="1"><?= $block->escapeJs($block->escapeHtml(__('Yes'))) ?></option>'+
-+                    '<option value="0"><?= $block->escapeJs($block->escapeHtml(__('No'))) ?></option>'+
-+                    '<option value="2" selected="selected"><?= $block->escapeJs($block->escapeHtml(__('Use config'))) ?></option>'+
-                 '</select>'+
-             '</td>'+
-             '<td class="col-limit">' +
-                 '<input type="text" id="downloadable_link_<%- data.id %>_downloads" name="downloadable[link][<%- data.id %>][number_of_downloads]" class="input-text validate-zero-or-greater admin__control-text downloads" value="<%- data.number_of_downloads %>" />'+
-                 '<div class="admin__field admin__field-option">' +
-                     '<input type="checkbox" class="admin__control-checkbox" id="downloadable_link_<%- data.id %>_is_unlimited" name="downloadable[link][<%- data.id %>][is_unlimited]" value="1" <%- data.is_unlimited %> />' +
--                    '<label for="downloadable_link_<%- data.id %>_is_unlimited" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Unlimited') ?></span></label>' +
-+                    '<label for="downloadable_link_<%- data.id %>_is_unlimited" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('Unlimited'))) ?></span></label>' +
-                 '</div>' +
-             '</td>'+
-             '<td class="col-action">'+
--                '<button id="downloadable_link_<%- data.id %>_delete_button" type="button" class="action-delete" title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Delete')) ?>"><span><?= /* @escapeNotVerified */ __('Delete') ?></span></button>'+
-+                '<button id="downloadable_link_<%- data.id %>_delete_button" type="button" class="action-delete" title="<?= $block->escapeJs($block->escapeHtmlAttr(__('Delete'))) ?>"><span><?= $block->escapeJs($block->escapeHtml(__('Delete'))) ?></span></button>'+
-             '</td>'+
-         '</tr>';
- 
-@@ -233,7 +232,7 @@ require([
-                     data.link_id  = 0;
-                     data.link_type = 'file';
-                     data.sample_type = 'none';
--                    data.number_of_downloads = '<?= /* @escapeNotVerified */ $block->getConfigMaxDownloads() ?>';
-+                    data.number_of_downloads = '<?= $block->escapeJs($block->getConfigMaxDownloads()) ?>';
-                     data.sort_order = this.itemCount + 1;
-                 }
- 
-@@ -324,7 +323,7 @@ require([
-                     'downloadable[link]['+data.id+'][sample]',
-                     data.sample_file_save,
-                     'downloadable_link_'+data.id+'_sample_file',
--                    <?= /* @escapeNotVerified */ $block->getConfigJson('link_samples') ?>
-+                    <?= /* @noEscape */ $block->getConfigJson('link_samples') ?>
-                 );
-                 // link file
-                 new Downloadable.FileUploader(
-@@ -334,7 +333,7 @@ require([
-                     'downloadable[link]['+data.id+']',
-                     data.file_save,
-                     'downloadable_link_'+data.id+'_file',
--                    <?= /* @escapeNotVerified */ $block->getConfigJson() ?>
-+                    <?= /* @noEscape */ $block->getConfigJson() ?>
-                 );
- 
-                 linkFile = $('downloadable_link_'+data.id+'_file_type');
-@@ -478,8 +477,8 @@ require([
-             Event.observe('add_link_item', 'click', linkItems.add.bind(linkItems));
-         }
- 
--        <?php foreach ($block->getLinkData() as $item): ?>
--            linkItems.add(<?= /* @escapeNotVerified */ $item->toJson() ?>);
-+        <?php foreach ($block->getLinkData() as $item) : ?>
-+            linkItems.add(<?= /* @noEscape */ $item->toJson() ?>);
-         <?php endforeach; ?>
- 
-     });
-diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
-index 3645a184df2..33c2afe827d 100644
---- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
-+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// @deprecated
- ?>
- <?php
- /**
-@@ -16,13 +15,13 @@ $_product = $block->getProduct();
- $block->getConfigJson();
- ?>
- <fieldset class="admin__fieldset downloadable-form" data-ui-id="downloadable-samples">
--    <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Samples') ?></span></legend><br>
--    <p class="note"><?= /* @escapeNotVerified */ __('Add product preview files here.') ?></p>
--    <div class="admin__field"<?= !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '' ?>>
--        <label class="admin__field-label" for="downloadable_samples_title"><span><?= /* @noEscape */ __('Title') ?></span></label>
-+    <legend class="admin__legend"><span><?= $block->escapeHtml(__('Samples')) ?></span></legend><br>
-+    <p class="note"><?= $block->escapeHtml(__('Add product preview files here.')) ?></p>
-+    <div class="admin__field"<?= $block->escapeHtml(!$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '') ?>>
-+        <label class="admin__field-label" for="downloadable_samples_title"><span><?= $block->escapeHtml(__('Title')) ?></span></label>
-         <div class="admin__field-control">
-             <input type="text" class="admin__control-text" id="downloadable_samples_title" name="product[samples_title]" value="<?= $block->escapeHtml($block->getSamplesTitle()) ?>" <?= /* @noEscape */ ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
--            <?php if ($_product->getStoreId()): ?>
-+            <?php if ($_product->getStoreId()) : ?>
-                 <div class="admin__field admin__field-option">
-                     <input id="sample_title_default" class="admin__control-checkbox" type="checkbox" name="use_default[]" value="samples_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?= /* @noEscape */ $block->getUsedDefault() ? 'checked="checked"' : '' ?> />
-                     <label class="admin__field-label" for="sample_title_default"><span>Use Default Value</span></label>
-@@ -36,9 +35,9 @@ $block->getConfigJson();
-                 <table class="admin__control-table">
-                     <thead>
-                         <tr>
--                            <th class="col-sort"><span><?= /* @noEscape */ __('Sort Order') ?></span></th>
--                            <th class="_required col-title"><span><?= /* @noEscape */ __('Title') ?></span></th>
--                            <th class="col-file"><span><?= /* @noEscape */ __('Attach File or Enter Link') ?></span></th>
-+                            <th class="col-sort"><span><?= $block->escapeHtml(__('Sort Order')) ?></span></th>
-+                            <th class="_required col-title"><span><?= $block->escapeHtml(__('Title')) ?></span></th>
-+                            <th class="col-file"><span><?= $block->escapeHtml(__('Attach File or Enter Link')) ?></span></th>
-                             <th class="col-actions">&nbsp;</th>
-                         </tr>
-                     </thead>
-@@ -70,30 +69,30 @@ require([
-         var sampleTemplate = '<tr>'+
-             '<td class="col-sort" data-role="draggable-handle">' +
-                 '<input data-container="link-order" type="hidden" name="downloadable[sample][<%- data.id %>][sort_order]" value="<%- data.sort_order %>" class="sort" />' +
--                '<span class="draggable-handle" title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Sort Variations')) ?>"></span>' +
-+                '<span class="draggable-handle" title="<?= $block->escapeJs($block->escapeHtmlAttr(__('Sort Variations'))) ?>"></span>' +
-             '</td>'+
-             '<td class="col-title">'+
-                 '<input type="hidden" class="__delete__" name="downloadable[sample][<%- data.id %>][is_delete]" value="" />'+
-                 '<input type="hidden" name="downloadable[sample][<%- data.id %>][sample_id]" value="<%- data.sample_id %>" />'+
-                 '<input type="text" class="required-entry input-text admin__control-text" name="downloadable[sample][<%- data.id %>][title]" value="<%- data.title %>" />'+
--                <?php if($_product->getStoreId()): ?>
-+                <?php if ($_product->getStoreId()) : ?>
-                     '<div class="admin__field admin__field-option">'+
-                         '<input type="checkbox" id="downloadable_sample_<%- data.id %>_title" name="downloadable[sample][<%- data.id %>][use_default_title]" value="1" class="admin__control-checkbox" />'+
--                        '<label for="downloadable_link_<%- data.id %>_price" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>'+
-+                        '<label for="downloadable_link_<%- data.id %>_price" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('Use Default Value'))) ?></span></label>'+
-                     '</div>' +
-                 <?php endif; ?>
-             '</td>'+
-             '<td class="col-file">'+
-                 '<div class="admin__field admin__field-option">'+
-                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_sample_<%- data.id %>_file_type" name="downloadable[sample][<%- data.id %>][type]" value="file"<%- data.file_checked %> />' +
--                    '<label for="downloadable_sample_<%- data.id %>_file_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('File') ?>:</span></label>'+
-+                    '<label for="downloadable_sample_<%- data.id %>_file_type" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('File'))) ?>:</span></label>'+
-                     '<input type="hidden" class="validate-downloadable-file" id="downloadable_sample_<%- data.id %>_file_save" name="downloadable[sample][<%- data.id %>][file]" value="<%- data.file_save %>" />'+
-                     '<div id="downloadable_sample_<%- data.id %>_file" class="admin__field-uploader">'+
-                         '<div id="downloadable_sample_<%- data.id %>_file-old" class="file-row-info"></div>'+
-                         '<div id="downloadable_sample_<%- data.id %>_file-new" class="file-row-info new-file"></div>'+
-                         '<div class="fileinput-button">'+
--                            '<span><?= /* @noEscape */ __('Browse Files...') ?></span>' +
--                            '<input id="downloadable_sample_<%- data.id %>_file" type="file" name="<?= /* @noEscape */ $block->getConfig()->getFileField() ?>" data-url="<?= $block->escapeHtml($block->getConfig()->getUrl()) ?>">' +
-+                            '<span><?= $block->escapeJs($block->escapeHtml(__('Browse Files...'))) ?></span>' +
-+                            '<input id="downloadable_sample_<%- data.id %>_file" type="file" name="<?= /* @noEscape */ $block->getConfig()->getFileField() ?>" data-url="<?= /* @noEscape */ $block->getConfig()->getUrl() ?>">' +
-                             '<script>' +
-                             '/*<![CDATA[*/' +
-                                 'sampleUploader("#downloadable_sample_<%- data.id %>_file"); ' +
-@@ -104,15 +103,15 @@ require([
-                 '</div>'+
-                 '<div class="admin__field admin__field-option admin__field-file-url">'+
-                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_sample_<%- data.id %>_url_type" name="downloadable[sample][<%- data.id %>][type]" value="url"<%- data.url_checked %> />' +
--                    '<label for="downloadable_sample_<%- data.id %>_url_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('URL') ?></span></label>' +
--                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[sample][<%- data.id %>][sample_url]" value="<%- data.sample_url %>" placeholder="<?= /* @escapeNotVerified */ __('URL') ?>" />'+
-+                    '<label for="downloadable_sample_<%- data.id %>_url_type" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('URL'))) ?></span></label>' +
-+                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[sample][<%- data.id %>][sample_url]" value="<%- data.sample_url %>" placeholder="<?= $block->escapeJs($block->escapeHtmlAttr(__('URL'))) ?>" />'+
-                 '</div>'+
-                 '<div>'+
-                     '<span id="downloadable_sample_<%- data.id %>_container"></span>'+
-                 '</div>'+
-             '</td>'+
-             '<td class="col-actions">'+
--                '<button type="button" class="action-delete" title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Delete')) ?>"><span><?= /* @escapeNotVerified */ __('Delete') ?></span></button>'+
-+                '<button type="button" class="action-delete" title="<?= $block->escapeJs($block->escapeHtmlAttr(__('Delete'))) ?>"><span><?= $block->escapeJs($block->escapeHtml(__('Delete'))) ?></span></button>'+
-             '</td>'+
-         '</tr>';
-         sampleItems = {
-@@ -288,7 +287,7 @@ require([
-             Event.observe('add_sample_item', 'click', sampleItems.add.bind(sampleItems));
-         }
- 
--        <?php foreach ($block->getSampleData() as $item): ?>
-+        <?php foreach ($block->getSampleData() as $item) : ?>
-             sampleItems.add(<?= /* @noEscape */ $item->toJson() ?>);
-         <?php endforeach; ?>
- 
-diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
-index 7438275bf58..94c8405c718 100644
---- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
-+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
-@@ -3,44 +3,42 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- 
--<?php if ($_item = $block->getItem()): ?>
--    <div class="product-title"><?= /* @escapeNotVerified */ $_item->getName() ?></div>
--    <div><strong><?= /* @escapeNotVerified */ __('SKU') ?>:</strong> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?></div>
--    <?php if ($block->getOrderOptions()): ?>
-+<?php if ($_item = $block->getItem()) : ?>
-+    <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
-+    <div><strong><?= $block->escapeHtml(__('SKU')) ?>:</strong> <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($block->getSku())) ?></div>
-+    <?php if ($block->getOrderOptions()) : ?>
-         <dl class="item-options">
--        <?php foreach ($block->getOrderOptions() as $_option): ?>
-+        <?php foreach ($block->getOrderOptions() as $_option) : ?>
-             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-             <dd>
--            <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
--                <?= /* @escapeNotVerified */ $_option['value'] ?>
--            <?php else: ?>
--                <?= $block->truncateString($_option['value'], 55, '', $_remainder) ?>
--                <?php if ($_remainder):?>
--                    ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
-+            <?php if (isset($_option['custom_view']) && $_option['custom_view']) : ?>
-+                <?= $block->escapeHtml($_option['value']) ?>
-+            <?php else : ?>
-+                <?= $block->escapeHtml($block->truncateString($_option['value'], 55, '', $_remainder)) ?>
-+                <?php if ($_remainder) :?>
-+                    ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                     <script>
--require(['prototype'], function(){
--
--    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
-+                        require(['prototype'], function(){
-+                            <?php $escapedId = $block->escapeJs($_id) ?>
-+                            $('<?= /* @noEscape */ $escapedId ?>').hide();
-+                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-+                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
- 
--});
--</script>
-+                        });
-+                    </script>
-                 <?php endif;?>
-             <?php endif;?>
-             </dd>
-         <?php endforeach; ?>
-         </dl>
-     <?php endif; ?>
--    <?php if ($block->getLinks()): ?>
-+    <?php if ($block->getLinks()) : ?>
-         <dl class="item-options">
-             <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
--            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
-+            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link) : ?>
-                 <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?></dd>
-             <?php endforeach; ?>
-         </dl>
-diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
-index b00c4b4b453..9a45066f64d 100644
---- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
-+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
-@@ -3,45 +3,42 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- 
--<?php if ($_item = $block->getItem()): ?>
--    <div class="product-title"><?= /* @escapeNotVerified */ $_item->getName() ?></div>
--    <div><strong><?= /* @escapeNotVerified */ __('SKU') ?>:</strong> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?></div>
--    <?php if ($block->getOrderOptions()): ?>
-+<?php if ($_item = $block->getItem()) : ?>
-+    <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
-+    <div><strong><?= $block->escapeHtml(__('SKU')) ?>:</strong> <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($block->getSku())) ?></div>
-+    <?php if ($block->getOrderOptions()) : ?>
-         <dl class="item-options">
--        <?php foreach ($block->getOrderOptions() as $_option): ?>
-+        <?php foreach ($block->getOrderOptions() as $_option) : ?>
-             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-             <dd>
--            <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
--                <?= /* @escapeNotVerified */ $_option['value'] ?>
--            <?php else: ?>
--                <?= $block->truncateString($_option['value'], 55, '', $_remainder) ?>
--                <?php if ($_remainder):?>
--                    ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
-+            <?php if (isset($_option['custom_view']) && $_option['custom_view']) : ?>
-+                <?= $block->escapeHtml($_option['value']) ?>
-+            <?php else : ?>
-+                <?= $block->escapeHtml($block->truncateString($_option['value'], 55, '', $_remainder)) ?>
-+                <?php if ($_remainder) :?>
-+                    ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                     <script>
--require(['prototype'], function(){
--
--    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
--
--});
--</script>
-+                        require(['prototype'], function(){
-+                            <?php $escapedId = $block->escapeJs($_id) ?>
-+                            $('<?= /* @noEscape */ $escapedId ?>').hide();
-+                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-+                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
-+                        });
-+                    </script>
-                 <?php endif;?>
-             <?php endif;?>
-             </dd>
-         <?php endforeach; ?>
-         </dl>
-     <?php endif; ?>
--    <?php if ($block->getLinks()): ?>
-+    <?php if ($block->getLinks()) : ?>
-         <dl class="item-options">
-             <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
--            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
--                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= /* @escapeNotVerified */ $_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('Unlimited') ?>)</dd>
-+            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link) : ?>
-+                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= $block->escapeHtml($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('Unlimited')) ?>)</dd>
-             <?php endforeach; ?>
-         </dl>
-     <?php endif; ?>
-diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
-index 9e6a73263bf..b5fe7b33856 100644
---- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
-+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
-@@ -3,48 +3,45 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- 
--<?php if ($_item = $block->getItem()): ?>
--    <div class="product-title"><?= /* @escapeNotVerified */ $_item->getName() ?></div>
-+<?php if ($_item = $block->getItem()) : ?>
-+    <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
-     <div class="product-sku-block">
--        <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
--        <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?>
-+        <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-+        <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($block->getSku())) ?>
-     </div>
--    <?php if ($block->getOrderOptions()): ?>
-+    <?php if ($block->getOrderOptions()) : ?>
-         <dl class="item-options">
--        <?php foreach ($block->getOrderOptions() as $_option): ?>
-+        <?php foreach ($block->getOrderOptions() as $_option) : ?>
-             <dt><?= $block->escapeHtml($_option['label']) ?>:</dt>
-             <dd>
--            <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
--                <?= /* @escapeNotVerified */ $_option['value'] ?>
--            <?php else: ?>
--                <?= $block->truncateString($_option['value'], 55, '', $_remainder) ?>
--                <?php if ($_remainder):?>
--                    ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
-+            <?php if (isset($_option['custom_view']) && $_option['custom_view']) : ?>
-+                <?= $block->escapeHtml($_option['value']) ?>
-+            <?php else : ?>
-+                <?= $block->escapeHtml($block->truncateString($_option['value'], 55, '', $_remainder)) ?>
-+                <?php if ($_remainder) :?>
-+                    ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                     <script>
--require(['prototype'], function(){
--
--    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
--    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
--
--});
--</script>
-+                        require(['prototype'], function(){
-+                            <?php $escapedId = $block->escapeJs($_id) ?>
-+                            $('<?= /* @noEscape */ $escapedId ?>').hide();
-+                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-+                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
-+                        });
-+                    </script>
-                 <?php endif;?>
-             <?php endif;?>
-             </dd>
-         <?php endforeach; ?>
-         </dl>
-     <?php endif; ?>
--    <?php if ($block->getLinks()): ?>
-+    <?php if ($block->getLinks()) : ?>
-         <dl class="item-options">
-             <dt><?= $block->escapeHtml($block->getLinksTitle()) ?>:</dt>
--            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
--                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= /* @escapeNotVerified */ $_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('U')) ?>)</dd>
-+            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link) : ?>
-+                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= $block->escapeHtml($_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('U'))) ?>)</dd>
-             <?php endforeach; ?>
-         </dl>
-     <?php endif; ?>
-diff --git a/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml b/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml
-index 45e5f0b8da7..f851558c1a5 100644
---- a/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml
-+++ b/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml
-@@ -26,17 +26,6 @@
-                 </block>
-             </block>
-         </referenceBlock>
--        <referenceContainer name="product.info.options.wrapper.bottom">
--            <block class="Magento\Catalog\Pricing\Render" name="product.price.final.copy" before="-">
--                <arguments>
--                    <argument name="price_render" xsi:type="string">product.price.render.default</argument>
--                    <argument name="price_type_code" xsi:type="string">final_price</argument>
--                    <argument name="display_msrp_help_message" xsi:type="string">1</argument>
--                    <argument name="zone" xsi:type="string">item_view</argument>
--                    <argument name="id_suffix" xsi:type="string">copy-</argument>
--                </arguments>
--            </block>
--        </referenceContainer>
-         <referenceBlock name="head.components">
-             <block class="Magento\Framework\View\Element\Js\Components" name="downloadable_page_head_components" template="Magento_Downloadable::js/components.phtml"/>
-         </referenceBlock>
-diff --git a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
-index 59d0558decd..f615966d801 100644
---- a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
-+++ b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
-@@ -6,7 +6,8 @@
- var config = {
-     map: {
-         '*': {
--            downloadable: 'Magento_Downloadable/downloadable'
-+            downloadable: 'Magento_Downloadable/js/downloadable',
-+            'Magento_Downloadable/downloadable': 'Magento_Downloadable/js/downloadable'
-         }
-     }
- };
-diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
-index 5548279a111..cb924e6b9ac 100644
---- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
-+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
-@@ -3,61 +3,58 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Downloadable\Block\Catalog\Product\Links */ ?>
- <?php $_linksPurchasedSeparately = $block->getLinksPurchasedSeparately(); ?>
--<?php if ($block->getProduct()->isSaleable() && $block->hasLinks()):?>
-+<?php if ($block->getProduct()->isSaleable() && $block->hasLinks()) :?>
-     <?php $_links = $block->getLinks(); ?>
-     <?php $_linksLength = 0; ?>
-     <?php $_isRequired = $block->getLinkSelectionRequired(); ?>
-     <legend class="legend links-title"><span><?= $block->escapeHtml($block->getLinksTitle()) ?></span></legend><br>
--    <div class="field downloads<?php if ($_isRequired) echo ' required' ?><?php if (!$_linksPurchasedSeparately) echo ' downloads-no-separately' ?>">
-+    <div class="field downloads<?php if ($_isRequired) { echo ' required'; } ?><?php if (!$_linksPurchasedSeparately) { echo ' downloads-no-separately'; } ?>">
-         <label class="label"><span><?= $block->escapeHtml($block->getLinksTitle()) ?></span></label>
-         <div class="control" id="downloadable-links-list"
-              data-mage-init='{"downloadable":{
-                  "linkElement":"input:checkbox[value]",
-                  "allElements":"#links_all",
--                 "config":<?= /* @escapeNotVerified */ $block->getJsonConfig() ?>}
-+                 "config":<?= $block->escapeHtmlAttr($block->getJsonConfig()) ?>}
-              }'
-              data-container-for="downloadable-links">
--            <?php foreach ($_links as $_link): ?>
-+            <?php foreach ($_links as $_link) : ?>
-                 <?php $_linksLength++;?>
-                 <div class="field choice" data-role="link">
--                    <?php if ($_linksPurchasedSeparately): ?>
-+                    <?php if ($_linksPurchasedSeparately) : ?>
-                         <input type="checkbox"
--                               <?php if ($_isRequired): ?>data-validate="{'validate-one-checkbox-required-by-name':'downloadable-links-list'}" <?php endif; ?>
-+                               <?php if ($_isRequired) : ?>data-validate="{'validate-one-checkbox-required-by-name':'downloadable-links-list'}" <?php endif; ?>
-                                name="links[]"
--                               id="links_<?= /* @escapeNotVerified */ $_link->getId() ?>"
--                               value="<?= /* @escapeNotVerified */ $_link->getId() ?>" <?= /* @escapeNotVerified */ $block->getLinkCheckedValue($_link) ?> />
-+                               id="links_<?= $block->escapeHtmlAttr($_link->getId()) ?>"
-+                               value="<?= $block->escapeHtmlAttr($_link->getId()) ?>" <?= $block->escapeHtml($block->getLinkCheckedValue($_link)) ?> />
-                     <?php endif; ?>
--                    <label class="label" for="links_<?= /* @escapeNotVerified */ $_link->getId() ?>">
-+                    <label class="label" for="links_<?= $block->escapeHtmlAttr($_link->getId()) ?>">
-                         <span><?= $block->escapeHtml($_link->getTitle()) ?></span>
--                        <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
-+                        <?php if ($_link->getSampleFile() || $_link->getSampleUrl()) : ?>
-                             <a class="sample link"
-                                href="<?= $block->escapeUrl($block->getLinkSampleUrl($_link)) ?>" <?= $block->getIsOpenInNewWindow() ? 'target="_blank"' : '' ?>>
--                                <?= /* @escapeNotVerified */ __('sample') ?>
-+                                <?= $block->escapeHtml(__('sample')) ?>
-                             </a>
-                         <?php endif; ?>
--                        <?php if ($_linksPurchasedSeparately): ?>
--                            <?= /* @escapeNotVerified */ $block->getLinkPrice($_link) ?>
-+                        <?php if ($_linksPurchasedSeparately) : ?>
-+                            <?= /* @noEscape */ $block->getLinkPrice($_link) ?>
-                         <?php endif; ?>
-                     </label>
-                 </div>
-             <?php endforeach; ?>
--            <?php if ($_linksPurchasedSeparately && $_linksLength > 1): ?>
-+            <?php if ($_linksPurchasedSeparately && $_linksLength > 1) : ?>
-                 <div class="field choice downloads-all">
-                     <input type="checkbox"
--                           data-notchecked="<?= /* @escapeNotVerified */ __('Select all') ?>"
--                           data-checked="<?= /* @escapeNotVerified */ __('Unselect all') ?>"
-+                           data-notchecked="<?= $block->escapeHtmlAttr(__('Select all')) ?>"
-+                           data-checked="<?= $block->escapeHtmlAttr(__('Unselect all')) ?>"
-                            id="links_all" />
--                    <label class="label" for="links_all"><span><?= /* @escapeNotVerified */ __('Select all') ?></span></label>
-+                    <label class="label" for="links_all"><span><?= $block->escapeHtml(__('Select all')) ?></span></label>
-                 </div>
-             <?php endif; ?>
-         </div>
--        <?php if ($_isRequired): ?>
-+        <?php if ($_isRequired) : ?>
-             <span id="links-advice-container"></span>
-         <?php endif;?>
-     </div>
-diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
-index c6b2281196e..3eea3803a05 100644
---- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
-+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * Downloadable product links
-  *
-@@ -13,11 +11,11 @@
-  */
- ?>
- 
--<?php if ($block->hasSamples()): ?>
-+<?php if ($block->hasSamples()) : ?>
-     <dl class="items samples">
-         <dt class="item-title samples-item-title"><?= $block->escapeHtml($block->getSamplesTitle()) ?></dt>
-         <?php $_samples = $block->getSamples() ?>
--        <?php foreach ($_samples as $_sample): ?>
-+        <?php foreach ($_samples as $_sample) : ?>
-             <dd class="item samples-item">
-                 <a href="<?= $block->escapeHtml($block->getSampleUrl($_sample)) ?>" <?= $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>
-                    class="item-link samples-item-link">
-diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
-index d4afdf5f81f..ba6d9e0abec 100644
---- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
-+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * Downloadable product type
-  *
-@@ -14,13 +12,13 @@
- ?>
- <?php $_product = $block->getProduct() ?>
- 
--<?php if ($_product->getIsSalable()): ?>
--    <div class="stock available" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
--        <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
-+<?php if ($_product->getIsSalable()) : ?>
-+    <div class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-+        <span><?= $block->escapeHtml(__('In stock')) ?></span>
-     </div>
--<?php else: ?>
--    <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
--        <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
-+<?php else : ?>
-+    <div class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-+        <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
-     </div>
- <?php endif; ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml
-index a32d854d3b4..ad631b0ebd0 100644
---- a/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml
-+++ b/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml
-@@ -3,10 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($block->getOrderHasDownloadable()): ?>
--    <?= /* @escapeNotVerified */ __('Go to <a href="%1">My Downloadable Products</a>', $block->getDownloadableProductsUrl()) ?>
-+<?php if ($block->getOrderHasDownloadable()) : ?>
-+    <?= /* @noEscape */ __('Go to <a href="%1">My Downloadable Products</a>', $block->escapeUrl($block->getDownloadableProductsUrl())) ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml b/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
-index 08cadb2d78f..eca72b35009 100644
---- a/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
-+++ b/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,55 +10,55 @@
-  */
- ?>
- <?php $_items = $block->getItems(); ?>
--<?php if (count($_items)): ?>
-+<?php if (count($_items)) : ?>
-     <div class="table-wrapper downloadable-products">
-         <table id="my-downloadable-products-table" class="data table table-downloadable-products">
--            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Downloadable Products') ?></caption>
-+            <caption class="table-caption"><?= $block->escapeHtml(__('Downloadable Products')) ?></caption>
-             <thead>
-                 <tr>
--                    <th scope="col" class="col id"><?= /* @escapeNotVerified */ __('Order #') ?></th>
--                    <th scope="col" class="col date"><?= /* @escapeNotVerified */ __('Date') ?></th>
--                    <th scope="col" class="col title"><?= /* @escapeNotVerified */ __('Title') ?></th>
--                    <th scope="col" class="col status"><?= /* @escapeNotVerified */ __('Status') ?></th>
--                    <th scope="col" class="col remaining"><?= /* @escapeNotVerified */ __('Remaining Downloads') ?></th>
-+                    <th scope="col" class="col id"><?= $block->escapeHtml(__('Order #')) ?></th>
-+                    <th scope="col" class="col date"><?= $block->escapeHtml(__('Date')) ?></th>
-+                    <th scope="col" class="col title"><?= $block->escapeHtml(__('Title')) ?></th>
-+                    <th scope="col" class="col status"><?= $block->escapeHtml(__('Status')) ?></th>
-+                    <th scope="col" class="col remaining"><?= $block->escapeHtml(__('Remaining Downloads')) ?></th>
-                 </tr>
-             </thead>
-             <tbody>
--            <?php foreach ($_items as $_item): ?>
-+            <?php foreach ($_items as $_item) : ?>
-                 <tr>
--                    <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id">
--                        <a href="<?= /* @escapeNotVerified */ $block->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>"
-+                    <td data-th="<?= $block->escapeHtmlAttr(__('Order #')) ?>" class="col id">
-+                        <a href="<?= $block->escapeUrl($block->getOrderViewUrl($_item->getPurchased()->getOrderId())) ?>"
-                             title="<?= $block->escapeHtml(__('View Order')) ?>">
--                            <?= /* @escapeNotVerified */ $_item->getPurchased()->getOrderIncrementId() ?>
-+                            <?= $block->escapeHtml($_item->getPurchased()->getOrderIncrementId()) ?>
-                         </a>
-                     </td>
--                    <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= /* @escapeNotVerified */ $block->formatDate($_item->getPurchased()->getCreatedAt()) ?></td>
--                    <td data-th="<?= $block->escapeHtml(__('Title')) ?>" class="col title">
-+                    <td data-th="<?= $block->escapeHtmlAttr(__('Date')) ?>" class="col date"><?= $block->escapeHtml($block->formatDate($_item->getPurchased()->getCreatedAt())) ?></td>
-+                    <td data-th="<?= $block->escapeHtmlAttr(__('Title')) ?>" class="col title">
-                         <strong class="product-name"><?= $block->escapeHtml($_item->getPurchased()->getProductName()) ?></strong>
--                        <?php if ($_item->getStatus() == \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE): ?>
--                        <a href="<?= /* @escapeNotVerified */ $block->getDownloadUrl($_item) ?>" title="<?= $block->escapeHtml(__('Start Download')) ?>" class="action download" <?= $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>><?= $block->escapeHtml($_item->getLinkTitle()) ?></a>
-+                        <?php if ($_item->getStatus() == \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE) : ?>
-+                        <a href="<?= $block->escapeUrl($block->getDownloadUrl($_item)) ?>" title="<?= $block->escapeHtmlAttr(__('Start Download')) ?>" class="action download" <?= /* @noEscape */ $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>><?= $block->escapeHtml($_item->getLinkTitle()) ?></a>
-                         <?php endif; ?>
-                     </td>
--                    <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status"><?= /* @escapeNotVerified */ __(ucfirst($_item->getStatus())) ?></td>
--                    <td data-th="<?= $block->escapeHtml(__('Remaining Downloads')) ?>" class="col remaining"><?= /* @escapeNotVerified */ $block->getRemainingDownloads($_item) ?></td>
-+                    <td data-th="<?= $block->escapeHtmlAttr(__('Status')) ?>" class="col status"><?= $block->escapeHtml(__(ucfirst($_item->getStatus()))) ?></td>
-+                    <td data-th="<?= $block->escapeHtmlAttr(__('Remaining Downloads')) ?>" class="col remaining"><?= $block->escapeHtml($block->getRemainingDownloads($_item)) ?></td>
-                 </tr>
-             <?php endforeach; ?>
-             </tbody>
-         </table>
-     </div>
--    <?php if ($block->getChildHtml('pager')): ?>
-+    <?php if ($block->getChildHtml('pager')) : ?>
-         <div class="toolbar downloadable-products-toolbar bottom">
-             <?= $block->getChildHtml('pager') ?>
-         </div>
-     <?php endif; ?>
--<?php else: ?>
--    <div class="message info empty"><span><?= /* @escapeNotVerified */ __('You have not purchased any downloadable products yet.') ?></span></div>
-+<?php else : ?>
-+    <div class="message info empty"><span><?= $block->escapeHtml(__('You have not purchased any downloadable products yet.')) ?></span></div>
- <?php endif; ?>
- 
- <div class="actions-toolbar">
-     <div class="secondary">
-         <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
--            <span><?= /* @escapeNotVerified */ __('Back') ?></span>
-+            <span><?= $block->escapeHtml(__('Back')) ?></span>
-         </a>
-     </div>
- </div>
-diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
-index 4882074b600..25d2302e94b 100644
---- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
-+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Downloadable\Block\Sales\Order\Email\Items\Downloadable */ ?>
- <?php $_item = $block->getItem() ?>
-@@ -13,19 +10,19 @@
- <tr>
-     <td class="item-info has-extra">
-         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
--        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
--        <?php if ($block->getItemOptions()): ?>
-+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-+        <?php if ($block->getItemOptions()) : ?>
-         <dl>
--            <?php foreach ($block->getItemOptions() as $option): ?>
--            <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
--            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
-+            <?php foreach ($block->getItemOptions() as $option) : ?>
-+            <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
-+            <dd><?= $block->escapeHtml($option['value']) ?></dd>
-             <?php endforeach; ?>
-         </dl>
-         <?php endif; ?>
--        <?php if ($links = $block->getLinks()->getPurchasedItems()): ?>
-+        <?php if ($links = $block->getLinks()->getPurchasedItems()) : ?>
-         <dl>
--            <dt><strong><em><?= /* @escapeNotVerified */  $block->getLinksTitle() ?></em></strong></dt>
--            <?php foreach ($links as $link): ?>
-+            <dt><strong><em><?= $block->escapeHtml($block->getLinksTitle()) ?></em></strong></dt>
-+            <?php foreach ($links as $link) : ?>
-                 <dd>
-                     <?= $block->escapeHtml($link->getLinkTitle()) ?>
-                 </dd>
-@@ -34,8 +31,8 @@
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
-     </td>
--    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
-+    <td class="item-qty"><?= (float)$_item->getQty() * 1 ?></td>
-     <td class="item-price">
--        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
-+        <?= /* @noEscape */ $block->getItemPrice($_item) ?>
-     </td>
- </tr>
-diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
-index 1be4ac56bad..88f3b2cc6f9 100644
---- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
-+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Downloadable\Block\Sales\Order\Email\Items\Downloadable */ ?>
- <?php $_item = $block->getItem() ?>
-@@ -13,30 +10,30 @@
- <tr>
-     <td class="item-info has-extra">
-         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
--        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
--        <?php if ($block->getItemOptions()): ?>
-+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-+        <?php if ($block->getItemOptions()) : ?>
-         <dl>
--            <?php foreach ($block->getItemOptions() as $option): ?>
--            <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
--            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
-+            <?php foreach ($block->getItemOptions() as $option) : ?>
-+            <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
-+            <dd><?= $block->escapeHtml($option['value']) ?></dd>
-             <?php endforeach; ?>
-         </dl>
-         <?php endif; ?>
--        <?php if ($links = $block->getLinks()->getPurchasedItems()): ?>
-+        <?php if ($links = $block->getLinks()->getPurchasedItems()) : ?>
-         <dl>
--            <dt><strong><em><?= /* @escapeNotVerified */  $block->getLinksTitle() ?></em></strong></dt>
--            <?php foreach ($links as $link): ?>
-+            <dt><strong><em><?= $block->escapeHtml($block->getLinksTitle()) ?></em></strong></dt>
-+            <?php foreach ($links as $link) : ?>
-                 <dd>
-                     <?= $block->escapeHtml($link->getLinkTitle()) ?>&nbsp;
--                    (<a href="<?= /* @escapeNotVerified */  $block->getPurchasedLinkUrl($link) ?>"><?= /* @escapeNotVerified */  __('download') ?></a>)
-+                    (<a href="<?= $block->escapeUrl($block->getPurchasedLinkUrl($link)) ?>"><?= $block->escapeHtml(__('download')) ?></a>)
-                 </dd>
-             <?php endforeach; ?>
-         </dl>
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
-     </td>
--    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
-+    <td class="item-qty"><?= (float)$_item->getQty() * 1 ?></td>
-     <td class="item-price">
--        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
-+        <?= /* @noEscape */ $block->getItemPrice($_item) ?>
-     </td>
- </tr>
-diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
-index 21b4ebc5989..8dc552933fd 100644
---- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
-+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /** @var $block \Magento\Downloadable\Block\Sales\Order\Email\Items\Order\Downloadable */ ?>
- <?php $_item = $block->getItem() ?>
-@@ -13,43 +11,43 @@
- <tr>
-     <td class="item-info has-extra">
-         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
--        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
--        <?php if ($block->getItemOptions()): ?>
-+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-+        <?php if ($block->getItemOptions()) : ?>
-         <dl>
--            <?php foreach ($block->getItemOptions() as $option): ?>
--            <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
--            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
-+            <?php foreach ($block->getItemOptions() as $option) : ?>
-+            <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
-+            <dd><?= $block->escapeHtml($option['value']) ?></dd>
-             <?php endforeach; ?>
-         </dl>
-         <?php endif; ?>
--        <?php if ($links = $block->getLinks()->getPurchasedItems()): ?>
-+        <?php if ($links = $block->getLinks()->getPurchasedItems()) : ?>
-         <dl>
--            <dt><strong><em><?= /* @escapeNotVerified */  $block->getLinksTitle() ?></em></strong></dt>
--            <?php foreach ($links as $link): ?>
-+            <dt><strong><em><?= $block->escapeHtml($block->getLinksTitle()) ?></em></strong></dt>
-+            <?php foreach ($links as $link) : ?>
-                 <dd>
-                     <?= $block->escapeHtml($link->getLinkTitle()) ?>&nbsp;
--                    (<a href="<?= /* @escapeNotVerified */  $block->getPurchasedLinkUrl($link) ?>"><?= /* @escapeNotVerified */  __('download') ?></a>)
-+                    (<a href="<?= $block->escapeUrl($block->getPurchasedLinkUrl($link)) ?>"><?= $block->escapeHtml(__('download')) ?></a>)
-                 </dd>
-             <?php endforeach; ?>
-         </dl>
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
--        <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
-+        <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper(Magento\GiftMessage\Helper\Message::class)->getGiftMessage($_item->getGiftMessageId())) : ?>
-             <table class="message-gift">
-                 <tr>
-                     <td>
--                        <h3><?= /* @escapeNotVerified */  __('Gift Message') ?></h3>
--                        <strong><?= /* @escapeNotVerified */  __('From:') ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
--                        <br /><strong><?= /* @escapeNotVerified */  __('To:') ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
--                        <br /><strong><?= /* @escapeNotVerified */  __('Message:') ?></strong>
-+                        <h3><?= $block->escapeHtml(__('Gift Message')) ?></h3>
-+                        <strong><?= $block->escapeHtml(__('From:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-+                        <br /><strong><?= $block->escapeHtml(__('To:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-+                        <br /><strong><?= $block->escapeHtml(__('Message:')) ?></strong>
-                         <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
-                     </td>
-                 </tr>
-             </table>
-         <?php endif; ?>
-     </td>
--    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQtyOrdered() * 1 ?></td>
-+    <td class="item-qty"><?= (float)$_item->getQtyOrdered() * 1 ?></td>
-     <td class="item-price">
--        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
-+        <?= /* @noEscape */ $block->getItemPrice($_item) ?>
-     </td>
- </tr>
-diff --git a/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml b/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml
-index bad5acc209b..5902a9f25cc 100644
---- a/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
-index 49422e4d2e4..491d83ac0d5 100644
---- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
-+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
-@@ -4,43 +4,41 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
- ?>
- <?php $_item = $block->getItem() ?>
- <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
--<tr class="border" id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
--    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
-+<tr class="border" id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>">
-+    <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
-         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
--        <?php if ($_options = $block->getItemOptions()): ?>
-+        <?php if ($_options = $block->getItemOptions()) : ?>
-             <dl class="item-options links">
-                 <?php foreach ($_options as $_option) : ?>
-                     <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                    <?php if (!$block->getPrintStatus()): ?>
-+                    <?php if (!$block->getPrintStatus()) : ?>
-                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
--                        <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
--                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
--                            <?php if (isset($_formatedOptionValue['full_view'])): ?>
-+                        <dd<?php if (isset($_formatedOptionValue['full_view'])) : ?> class="tooltip wrapper"<?php endif; ?>>
-+                            <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
-+                            <?php if (isset($_formatedOptionValue['full_view'])) : ?>
-                                 <div class="tooltip content">
-                                     <dl class="item options">
-                                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
-+                                        <dd><?= /* @noEscape */ $_formatedOptionValue['full_view'] ?></dd>
-                                     </dl>
-                                 </div>
-                             <?php endif; ?>
-                         </dd>
--                    <?php else: ?>
-+                    <?php else : ?>
-                         <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
-                     <?php endif; ?>
-                 <?php endforeach; ?>
-             </dl>
-         <?php endif; ?>
-         <?php /* downloadable */?>
--        <?php if ($links = $block->getLinks()): ?>
-+        <?php if ($links = $block->getLinks()) : ?>
-             <dl class="item-options links">
-                 <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
--                <?php foreach ($links->getPurchasedItems() as $link): ?>
-+                <?php foreach ($links->getPurchasedItems() as $link) : ?>
-                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
-                 <?php endforeach; ?>
-             </dl>
-@@ -53,16 +51,16 @@
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
-     </td>
--    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
--    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-+    <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
-+    <td class="col price" data-th="<?= $block->escapeHtmlAttr(__('Price')) ?>">
-         <?= $block->getItemPriceHtml() ?>
-     </td>
--    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
--    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
-+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Qty')) ?>"><?= (float)$_item->getQty() * 1 ?></td>
-+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
-         <?= $block->getItemRowTotalHtml() ?>
-     </td>
--    <td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>"><?= /* @escapeNotVerified */ $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
--    <td class="col total" data-th="<?= $block->escapeHtml(__('Row Total')) ?>">
-+    <td class="col discount" data-th="<?= $block->escapeHtmlAttr(__('Discount Amount')) ?>"><?= /* @noEscape */ $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
-+    <td class="col total" data-th="<?= $block->escapeHtmlAttr(__('Row Total')) ?>">
-         <?= $block->getItemRowTotalAfterDiscountHtml() ?>
-     </td>
- </tr>
-diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
-index 202f123a331..7ea2de6e46b 100644
---- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
-+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
-@@ -4,43 +4,41 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
- ?>
- <?php $_item = $block->getItem() ?>
- <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
--<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
--    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
-+<tr id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>">
-+    <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
-         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
--        <?php if ($_options = $block->getItemOptions()): ?>
-+        <?php if ($_options = $block->getItemOptions()) : ?>
-             <dl class="item-options links">
-                 <?php foreach ($_options as $_option) : ?>
-                     <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                    <?php if (!$block->getPrintStatus()): ?>
-+                    <?php if (!$block->getPrintStatus()) : ?>
-                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
--                        <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
--                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
--                            <?php if (isset($_formatedOptionValue['full_view'])): ?>
-+                        <dd<?php if (isset($_formatedOptionValue['full_view'])) : ?> class="tooltip wrapper"<?php endif; ?>>
-+                            <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
-+                            <?php if (isset($_formatedOptionValue['full_view'])) : ?>
-                                 <div class="tooltip content">
-                                     <dl class="item options">
-                                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
-+                                        <dd><?= /* @noEscape */ $_formatedOptionValue['full_view'] ?></dd>
-                                     </dl>
-                                 </div>
-                             <?php endif; ?>
-                         </dd>
--                    <?php else: ?>
-+                    <?php else : ?>
-                         <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
-                     <?php endif; ?>
-                 <?php endforeach; ?>
-             </dl>
-         <?php endif; ?>
-         <?php /* downloadable */ ?>
--        <?php if ($links = $block->getLinks()): ?>
-+        <?php if ($links = $block->getLinks()) : ?>
-             <dl class="item-options links">
-                 <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
--                <?php foreach ($links->getPurchasedItems() as $link): ?>
-+                <?php foreach ($links->getPurchasedItems() as $link) : ?>
-                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
-                 <?php endforeach; ?>
-             </dl>
-@@ -52,14 +50,14 @@
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
-     </td>
--    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
--    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-+    <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
-+    <td class="col price" data-th="<?= $block->escapeHtmlAttr(__('Price')) ?>">
-         <?= $block->getItemPriceHtml() ?>
-     </td>
--    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Invoiced')) ?>">
--        <span class="qty summary" data-label="<?= $block->escapeHtml(__('Qty Invoiced')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></span>
-+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Qty Invoiced')) ?>">
-+        <span class="qty summary" data-label="<?= $block->escapeHtmlAttr(__('Qty Invoiced')) ?>"><?= (float)$_item->getQty() * 1 ?></span>
-     </td>
--    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
-+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
-         <?= $block->getItemRowTotalHtml() ?>
-     </td>
- </tr>
-diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
-index c10bb0db591..368f17449bb 100644
---- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
-+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
-@@ -4,44 +4,42 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
- ?>
- <?php $_item = $block->getItem() ?>
--<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
--    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
-+<tr id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>">
-+    <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
-         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
--        <?php if ($_options = $block->getItemOptions()): ?>
-+        <?php if ($_options = $block->getItemOptions()) : ?>
-             <dl class="item-options links">
-                 <?php foreach ($_options as $_option) : ?>
-                     <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                    <?php if (!$block->getPrintStatus()): ?>
-+                    <?php if (!$block->getPrintStatus()) : ?>
-                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
--                        <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
--                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
--                            <?php if (isset($_formatedOptionValue['full_view'])): ?>
-+                        <dd<?php if (isset($_formatedOptionValue['full_view'])) : ?> class="tooltip wrapper"<?php endif; ?>>
-+                            <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
-+                            <?php if (isset($_formatedOptionValue['full_view'])) : ?>
-                                 <div class="tooltip content">
-                                     <dl class="item options">
-                                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
-+                                        <dd><?= /* @noEscape */ $_formatedOptionValue['full_view'] ?></dd>
-                                     </dl>
-                                 </div>
-                             <?php endif; ?>
-                         </dd>
--                    <?php else: ?>
-+                    <?php else : ?>
-                         <dd>
--                            <?= nl2br($block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value']))) ?>
-+                            <?= /* @noEscape */ nl2br((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?>
-                         </dd>
-                     <?php endif; ?>
-                 <?php endforeach; ?>
-             </dl>
-         <?php endif; ?>
-         <?php /* downloadable */ ?>
--        <?php if ($links = $block->getLinks()): ?>
-+        <?php if ($links = $block->getLinks()) : ?>
-             <dl class="item-options links">
-                 <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
--                <?php foreach ($links->getPurchasedItems() as $link): ?>
-+                <?php foreach ($links->getPurchasedItems() as $link) : ?>
-                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
-                 <?php endforeach; ?>
-             </dl>
-@@ -53,39 +51,39 @@
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
-     </td>
--    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
--    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-+    <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
-+    <td class="col price" data-th="<?= $block->escapeHtmlAttr(__('Price')) ?>">
-         <?= $block->getItemPriceHtml() ?>
-     </td>
--    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
-+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Qty')) ?>">
-         <ul class="items-qty">
--            <?php if ($block->getItem()->getQtyOrdered() > 0): ?>
-+            <?php if ($block->getItem()->getQtyOrdered() > 0) : ?>
-                 <li class="item">
--                    <span class="title"><?= /* @escapeNotVerified */ __('Ordered') ?></span>
--                    <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyOrdered()*1 ?></span>
-+                    <span class="title"><?= $block->escapeHtml(__('Ordered')) ?></span>
-+                    <span class="content"><?= (float)$block->getItem()->getQtyOrdered() * 1 ?></span>
-                 </li>
-             <?php endif; ?>
--            <?php if ($block->getItem()->getQtyShipped() > 0): ?>
-+            <?php if ($block->getItem()->getQtyShipped() > 0) : ?>
-                 <li class="item">
--                    <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
--                    <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyShipped() * 1 ?></span>
-+                    <span class="title"><?= $block->escapeHtml(__('Shipped')) ?></span>
-+                    <span class="content"><?= (float)$block->getItem()->getQtyShipped() * 1 ?></span>
-                 </li>
-             <?php endif; ?>
--            <?php if ($block->getItem()->getQtyCanceled() > 0): ?>
-+            <?php if ($block->getItem()->getQtyCanceled() > 0) : ?>
-                 <li class="item">
--                    <span class="title"><?= /* @escapeNotVerified */ __('Canceled') ?></span>
--                    <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyCanceled()*1 ?></span>
-+                    <span class="title"><?= $block->escapeHtml(__('Canceled')) ?></span>
-+                    <span class="content"><?= (float)$block->getItem()->getQtyCanceled() * 1 ?></span>
-                 </li>
-             <?php endif; ?>
--            <?php if ($block->getItem()->getQtyRefunded() > 0): ?>
-+            <?php if ($block->getItem()->getQtyRefunded() > 0) : ?>
-                 <li class="item">
--                    <span class="title"><?= /* @escapeNotVerified */ __('Refunded') ?></span>
--                    <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyRefunded()*1 ?></span>
-+                    <span class="title"><?= $block->escapeHtml(__('Refunded')) ?></span>
-+                    <span class="content"><?= (float)$block->getItem()->getQtyRefunded() * 1 ?></span>
-                 </li>
-             <?php endif; ?>
-         </ul>
-     </td>
--    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
-+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
-         <?= $block->getItemRowTotalHtml() ?>
-     </td>
- </tr>
-diff --git a/app/code/Magento/Downloadable/view/frontend/web/downloadable.js b/app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js
-similarity index 100%
-rename from app/code/Magento/Downloadable/view/frontend/web/downloadable.js
-rename to app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js
-diff --git a/app/code/Magento/DownloadableGraphQl/Model/DownloadableProductTypeResolver.php b/app/code/Magento/DownloadableGraphQl/Model/DownloadableProductTypeResolver.php
-index 59c007d9107..4bef5d3d57b 100644
---- a/app/code/Magento/DownloadableGraphQl/Model/DownloadableProductTypeResolver.php
-+++ b/app/code/Magento/DownloadableGraphQl/Model/DownloadableProductTypeResolver.php
-@@ -8,19 +8,21 @@ declare(strict_types=1);
- namespace Magento\DownloadableGraphQl\Model;
- 
- use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
-+use Magento\Downloadable\Model\Product\Type as Type;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class DownloadableProductTypeResolver implements TypeResolverInterface
- {
-+    const DOWNLOADABLE_PRODUCT = 'DownloadableProduct';
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolveType(array $data) : string
-     {
--        if (isset($data['type_id']) && $data['type_id'] == 'downloadable') {
--            return 'DownloadableProduct';
-+        if (isset($data['type_id']) && $data['type_id'] == Type::TYPE_DOWNLOADABLE) {
-+            return self::DOWNLOADABLE_PRODUCT;
-         }
-         return '';
-     }
-diff --git a/app/code/Magento/DownloadableGraphQl/Model/Resolver/CustomerDownloadableProducts.php b/app/code/Magento/DownloadableGraphQl/Model/Resolver/CustomerDownloadableProducts.php
-new file mode 100644
-index 00000000000..cb7a6aff2f4
---- /dev/null
-+++ b/app/code/Magento/DownloadableGraphQl/Model/Resolver/CustomerDownloadableProducts.php
-@@ -0,0 +1,88 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\DownloadableGraphQl\Model\Resolver;
-+
-+use Magento\DownloadableGraphQl\Model\ResourceModel\GetPurchasedDownloadableProducts;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\UrlInterface;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+
-+/**
-+ * @inheritdoc
-+ *
-+ * Returns available downloadable products for customer
-+ */
-+class CustomerDownloadableProducts implements ResolverInterface
-+{
-+    /**
-+     * @var GetPurchasedDownloadableProducts
-+     */
-+    private $getPurchasedDownloadableProducts;
-+
-+    /**
-+     * @var UrlInterface
-+     */
-+    private $urlBuilder;
-+
-+    /**
-+     * @param GetPurchasedDownloadableProducts $getPurchasedDownloadableProducts
-+     * @param UrlInterface $urlBuilder
-+     */
-+    public function __construct(
-+        GetPurchasedDownloadableProducts $getPurchasedDownloadableProducts,
-+        UrlInterface $urlBuilder
-+    ) {
-+        $this->getPurchasedDownloadableProducts = $getPurchasedDownloadableProducts;
-+        $this->urlBuilder = $urlBuilder;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        /** @var ContextInterface $context */
-+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-+        }
-+
-+        $purchasedProducts = $this->getPurchasedDownloadableProducts->execute($context->getUserId());
-+        $productsData = [];
-+
-+        /* The fields names are hardcoded since there's no existing name reference in the code */
-+        foreach ($purchasedProducts as $purchasedProduct) {
-+            if ($purchasedProduct['number_of_downloads_bought']) {
-+                $remainingDownloads = $purchasedProduct['number_of_downloads_bought'] -
-+                    $purchasedProduct['number_of_downloads_used'];
-+            } else {
-+                $remainingDownloads = __('Unlimited');
-+            }
-+
-+            $productsData[] = [
-+                'order_increment_id' => $purchasedProduct['order_increment_id'],
-+                'date' => $purchasedProduct['created_at'],
-+                'status' => $purchasedProduct['status'],
-+                'download_url' => $this->urlBuilder->getUrl(
-+                    'downloadable/download/link',
-+                    ['id' => $purchasedProduct['link_hash'], '_secure' => true]
-+                ),
-+                'remaining_downloads' => $remainingDownloads
-+            ];
-+        }
-+
-+        return ['items' => $productsData];
-+    }
-+}
-diff --git a/app/code/Magento/DownloadableGraphQl/Model/Resolver/Product/DownloadableOptions.php b/app/code/Magento/DownloadableGraphQl/Model/Resolver/Product/DownloadableOptions.php
-index cda853a16af..f7dd8eeba8c 100644
---- a/app/code/Magento/DownloadableGraphQl/Model/Resolver/Product/DownloadableOptions.php
-+++ b/app/code/Magento/DownloadableGraphQl/Model/Resolver/Product/DownloadableOptions.php
-@@ -7,6 +7,8 @@ declare(strict_types=1);
- 
- namespace Magento\DownloadableGraphQl\Model\Resolver\Product;
- 
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Catalog\Model\Product;
- use Magento\Downloadable\Helper\Data as DownloadableHelper;
-@@ -16,14 +18,13 @@ use Magento\Downloadable\Model\ResourceModel\Sample\Collection as SampleCollecti
- use Magento\Framework\Data\Collection;
- use Magento\Framework\GraphQl\Config\Element\Field;
- use Magento\Framework\GraphQl\Query\EnumLookup;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\UrlInterface;
- 
- /**
-- * Format for downloadable product types
-+ * @inheritdoc
-  *
-- * {@inheritdoc}
-+ * Format for downloadable product types
-  */
- class DownloadableOptions implements ResolverInterface
- {
-@@ -48,35 +49,43 @@ class DownloadableOptions implements ResolverInterface
-     private $linkCollection;
- 
-     /**
--     * @var ValueFactory
-+     * @var UrlInterface
-      */
--    private $valueFactory;
-+    private $urlBuilder;
- 
-     /**
-      * @param EnumLookup $enumLookup
-      * @param DownloadableHelper $downloadableHelper
-      * @param SampleCollection $sampleCollection
-      * @param LinkCollection $linkCollection
--     * @param ValueFactory $valueFactory
-+     * @param UrlInterface|null $urlBuilder
-      */
-     public function __construct(
-         EnumLookup $enumLookup,
-         DownloadableHelper $downloadableHelper,
-         SampleCollection $sampleCollection,
-         LinkCollection $linkCollection,
--        ValueFactory $valueFactory
-+        UrlInterface $urlBuilder
-     ) {
-         $this->enumLookup = $enumLookup;
-         $this->downloadableHelper = $downloadableHelper;
-         $this->sampleCollection = $sampleCollection;
-         $this->linkCollection = $linkCollection;
--        $this->valueFactory = $valueFactory;
-+        $this->urlBuilder = $urlBuilder;
-     }
- 
-     /**
-+     * @inheritdoc
-+     *
-      * Add downloadable options to configurable types
-      *
--     * {@inheritdoc}
-+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
-+     * @param ContextInterface $context
-+     * @param ResolveInfo $info
-+     * @param array|null $value
-+     * @param array|null $args
-+     * @throws \Exception
-+     * @return null|array
-      */
-     public function resolve(
-         Field $field,
-@@ -84,12 +93,9 @@ class DownloadableOptions implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         if (!isset($value['model'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"model" value should be specified'));
-         }
- 
-         /** @var Product $product */
-@@ -113,11 +119,7 @@ class DownloadableOptions implements ResolverInterface
-             }
-         }
- 
--        $result = function () use ($data) {
--            return $data;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $data;
-     }
- 
-     /**
-@@ -151,7 +153,10 @@ class DownloadableOptions implements ResolverInterface
-             }
- 
-             $resultData[$linkKey]['sample_file'] = $link->getSampleFile();
--            $resultData[$linkKey]['sample_url'] = $link->getSampleUrl();
-+            $resultData[$linkKey]['sample_url'] = $this->urlBuilder->getUrl(
-+                'downloadable/download/linkSample',
-+                ['link_id' => $link->getId()]
-+            );
-         }
-         return $resultData;
-     }
-@@ -162,7 +167,7 @@ class DownloadableOptions implements ResolverInterface
-      * @param Collection $samples
-      * @return array
-      */
--    private function formatSamples(Collection $samples) : array
-+    private function formatSamples(Collection $samples): array
-     {
-         $resultData = [];
-         foreach ($samples as $sampleKey => $sample) {
-@@ -173,7 +178,10 @@ class DownloadableOptions implements ResolverInterface
-             $resultData[$sampleKey]['sample_type']
-                 = $this->enumLookup->getEnumValueFromField('DownloadableFileTypeEnum', $sample->getSampleType());
-             $resultData[$sampleKey]['sample_file'] = $sample->getSampleFile();
--            $resultData[$sampleKey]['sample_url'] = $sample->getSampleUrl();
-+            $resultData[$sampleKey]['sample_url'] = $this->urlBuilder->getUrl(
-+                'downloadable/download/sample',
-+                ['sample_id' => $sample->getId()]
-+            );
-         }
-         return $resultData;
-     }
-diff --git a/app/code/Magento/DownloadableGraphQl/Model/ResourceModel/GetPurchasedDownloadableProducts.php b/app/code/Magento/DownloadableGraphQl/Model/ResourceModel/GetPurchasedDownloadableProducts.php
-new file mode 100644
-index 00000000000..e8c29e90609
---- /dev/null
-+++ b/app/code/Magento/DownloadableGraphQl/Model/ResourceModel/GetPurchasedDownloadableProducts.php
-@@ -0,0 +1,58 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\DownloadableGraphQl\Model\ResourceModel;
-+
-+use Magento\Framework\App\ResourceConnection;
-+use Magento\Downloadable\Model\Link\Purchased\Item;
-+
-+/**
-+ * Class GetPurchasedDownloadableProducts
-+ *
-+ * The model returns all purchased products for the specified customer
-+ */
-+class GetPurchasedDownloadableProducts
-+{
-+    /**
-+     * @var ResourceConnection
-+     */
-+    private $resourceConnection;
-+
-+    /**
-+     * @param ResourceConnection $resourceConnection
-+     */
-+    public function __construct(
-+        ResourceConnection $resourceConnection
-+    ) {
-+        $this->resourceConnection = $resourceConnection;
-+    }
-+
-+    /**
-+     * Return available purchased products for customer
-+     *
-+     * @param int $customerId
-+     * @return array
-+     */
-+    public function execute(int $customerId): array
-+    {
-+        $connection = $this->resourceConnection->getConnection();
-+        $allowedItemsStatuses = [Item::LINK_STATUS_PENDING_PAYMENT, Item::LINK_STATUS_PAYMENT_REVIEW];
-+        $downloadablePurchasedTable = $connection->getTableName('downloadable_link_purchased');
-+
-+        /* The fields names are hardcoded since there's no existing name reference in the code */
-+        $selectQuery = $connection->select()
-+            ->from($downloadablePurchasedTable)
-+            ->joinLeft(
-+                ['item' => $connection->getTableName('downloadable_link_purchased_item')],
-+                "$downloadablePurchasedTable.purchased_id = item.purchased_id"
-+            )
-+            ->where("$downloadablePurchasedTable.customer_id = ?", $customerId)
-+            ->where('item.status NOT IN (?)', $allowedItemsStatuses);
-+
-+        return $connection->fetchAll($selectQuery);
-+    }
-+}
-diff --git a/app/code/Magento/DownloadableGraphQl/composer.json b/app/code/Magento/DownloadableGraphQl/composer.json
-index 5c4613beabc..1c18b75a657 100644
---- a/app/code/Magento/DownloadableGraphQl/composer.json
-+++ b/app/code/Magento/DownloadableGraphQl/composer.json
-@@ -6,6 +6,7 @@
-         "php": "~7.1.3||~7.2.0",
-         "magento/module-catalog": "*",
-         "magento/module-downloadable": "*",
-+        "magento/module-graph-ql": "*",
-         "magento/framework": "*"
-     },
-     "suggest": {
-diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
-index 8e877ffe836..9e4ab3b70c6 100644
---- a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
-+++ b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
-@@ -1,6 +1,22 @@
- # Copyright © Magento, Inc. All rights reserved.
- # See COPYING.txt for license details.
- 
-+type Query {
-+    customerDownloadableProducts: CustomerDownloadableProducts @resolver(class: "Magento\\DownloadableGraphQl\\Model\\Resolver\\CustomerDownloadableProducts") @doc(description: "The query returns the contents of a customer's downloadable products") @cache(cacheable: false)
-+}
-+
-+type CustomerDownloadableProducts {
-+    items: [CustomerDownloadableProduct] @doc(description: "List of purchased downloadable items")
-+}
-+
-+type CustomerDownloadableProduct {
-+    order_increment_id: String
-+    date: String
-+    status: String
-+    download_url: String
-+    remaining_downloads: String
-+}
-+
- type DownloadableProduct implements ProductInterface, CustomizableProductInterface @doc(description: "DownloadableProduct defines a product that the customer downloads") {
-     downloadable_product_samples: [DownloadableProductSamples] @resolver(class: "Magento\\DownloadableGraphQl\\Model\\Resolver\\Product\\DownloadableOptions") @doc(description: "An array containing information about samples of this downloadable product.")
-     downloadable_product_links: [DownloadableProductLinks] @resolver(class: "Magento\\DownloadableGraphQl\\Model\\Resolver\\Product\\DownloadableOptions") @doc(description: "An array containing information about the links for this downloadable product")
-@@ -8,29 +24,29 @@ type DownloadableProduct implements ProductInterface, CustomizableProductInterfa
-     links_title: String @doc(description: "The heading above the list of downloadable products")
- }
- 
--enum DownloadableFileTypeEnum @doc(description: "This enumeration specifies whether a link or sample is a file or URL") {
-+enum DownloadableFileTypeEnum @deprecated(reason: "`sample_url` serves to get the downloadable sample") {
-     FILE
-     URL
- }
- 
- type DownloadableProductLinks @doc(description: "DownloadableProductLinks defines characteristics of a downloadable product") {
--    id: Int @doc(description: "The unique ID for the link to the downloadable product")
-+    id: Int @deprecated(reason: "This information shoud not be exposed on frontend")
-     title: String @doc(description: "The display name of the link")
-     sort_order: Int @doc(description: "A number indicating the sort order")
--    is_shareable: Boolean @doc(description: "Indicates whether the link is shareable")
-+    is_shareable: Boolean @deprecated(reason: "This information shoud not be exposed on frontend")
-     price: Float @doc(description: "The price of the downloadable product")
--    number_of_downloads: Int @doc(description: "The maximum number of times the product can be downloaded. A value of 0 means unlimited.")
--    link_type: DownloadableFileTypeEnum @doc(description: "Either FILE or URL")
--    sample_type: DownloadableFileTypeEnum @doc(description: "Either FILE or URL")
--    sample_file: String @doc(description: "The relative path to the downloadable sample")
--    sample_url: String @doc(description: "The relative URL to the downloadable sample")
-+    number_of_downloads: Int @deprecated(reason: "This information shoud not be exposed on frontend")
-+    link_type: DownloadableFileTypeEnum @deprecated(reason: "`sample_url` serves to get the downloadable sample")
-+    sample_type: DownloadableFileTypeEnum @deprecated(reason: "`sample_url` serves to get the downloadable sample")
-+    sample_file: String @deprecated(reason: "`sample_url` serves to get the downloadable sample")
-+    sample_url: String @doc(description: "URL to the downloadable sample")
- }
- 
- type DownloadableProductSamples @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") {
--    id: Int @doc(description: "The unique ID for the downloadable product sample")
-+    id: Int @deprecated(reason: "This information shoud not be exposed on frontend")
-     title: String @doc(description: "The display name of the sample")
-     sort_order: Int @doc(description: "A number indicating the sort order")
--    sample_type: DownloadableFileTypeEnum @doc(description: "Either FILE or URL")
--    sample_file: String @doc(description: "The relative path to the downloadable sample")
--    sample_url: String @doc(description: "The relative URL to the downloadable sample")
-+    sample_type: DownloadableFileTypeEnum @deprecated(reason: "`sample_url` serves to get the downloadable sample")
-+    sample_file: String @deprecated(reason: "`sample_url` serves to get the downloadable sample")
-+    sample_url: String @doc(description: "URL to the downloadable sample")
- }
-diff --git a/app/code/Magento/DownloadableImportExport/Helper/Uploader.php b/app/code/Magento/DownloadableImportExport/Helper/Uploader.php
-index 46081f77cc6..197250faaea 100644
---- a/app/code/Magento/DownloadableImportExport/Helper/Uploader.php
-+++ b/app/code/Magento/DownloadableImportExport/Helper/Uploader.php
-@@ -38,6 +38,11 @@ class Uploader extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     protected $parameters = [];
- 
-+    /**
-+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
-+     */
-+    public $connection;
-+
-     /**
-      * Construct
-      *
-diff --git a/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php b/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php
-index 8bd65ba85ab..be4b5a3fa0f 100644
---- a/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php
-+++ b/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php
-@@ -17,7 +17,7 @@ interface AttributeSetRepositoryInterface
-      * Retrieve list of Attribute Sets
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#AttributeSetRepositoryInterface to determine
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#AttributeSetRepositoryInterface to determine
-      * which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
-index c5a18a3de99..be9d2700664 100644
---- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
-+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
-@@ -4,15 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Product attribute add/edit form main tab
-- *
-- * @author     Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Eav\Block\Adminhtml\Attribute\Edit\Main;
- 
- use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
- 
-+/**
-+ * Product attribute add/edit form main tab
-+ */
- abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
- {
-     /**
-@@ -110,7 +108,6 @@ abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
- 
-         /** @var \Magento\Framework\Data\Form $form */
-         $form = $this->_formFactory->create(
--            
-             ['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
-         );
- 
-@@ -280,10 +277,11 @@ abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
-     }
- 
-     /**
--     * Processing block html after rendering
-+     * Processing block html after rendering.
-+     *
-      * Adding js block to the end of this block
-      *
--     * @param   string $html
-+     * @param string $html
-      * @return  string
-      */
-     protected function _afterToHtml($html)
-diff --git a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
-index 3189041d7f7..3bc87ed9775 100644
---- a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
-+++ b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
-@@ -143,6 +143,7 @@ abstract class AbstractData
- 
-     /**
-      * Set scope visibility
-+     *
-      * Search value only in scope or search value in scope and global
-      *
-      * @param bool $flag
-@@ -296,7 +297,7 @@ abstract class AbstractData
-      * Validate value by attribute input validation rule
-      *
-      * @param string $value
--     * @return string|true
-+     * @return array|true
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-@@ -311,9 +312,13 @@ abstract class AbstractData
- 
-         if (!empty($validateRules['input_validation'])) {
-             $label = $this->getAttribute()->getStoreLabel();
-+            $allowWhiteSpace = false;
-             switch ($validateRules['input_validation']) {
-+                case 'alphanum-with-spaces':
-+                    $allowWhiteSpace = true;
-+                    // Continue to alphanumeric validation
-                 case 'alphanumeric':
--                    $validator = new \Zend_Validate_Alnum(true);
-+                    $validator = new \Zend_Validate_Alnum($allowWhiteSpace);
-                     $validator->setMessage(__('"%1" invalid type entered.', $label), \Zend_Validate_Alnum::INVALID);
-                     $validator->setMessage(
-                         __('"%1" contains non-alphabetic or non-numeric characters.', $label),
-diff --git a/app/code/Magento/Eav/Model/Attribute/Data/File.php b/app/code/Magento/Eav/Model/Attribute/Data/File.php
-index 5e2e2716e13..a52c8826116 100644
---- a/app/code/Magento/Eav/Model/Attribute/Data/File.php
-+++ b/app/code/Magento/Eav/Model/Attribute/Data/File.php
-@@ -120,8 +120,7 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
-     }
- 
-     /**
--     * Validate file by attribute validate rules
--     * Return array of errors
-+     * Validate file by attribute validate rules and return array of errors
-      *
-      * @param array $value
-      * @return string[]
-@@ -147,7 +146,7 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
-             return $this->_fileValidator->getMessages();
-         }
- 
--        if (!is_uploaded_file($value['tmp_name'])) {
-+        if (!empty($value['tmp_name']) && !file_exists($value['tmp_name'])) {
-             return [__('"%1" is not a valid file.', $label)];
-         }
- 
-@@ -174,12 +173,22 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
-         if ($this->getIsAjaxRequest()) {
-             return true;
-         }
-+        $fileData = $value;
-+
-+        if (is_string($value) && !empty($value)) {
-+            $dir = $this->_directory->getAbsolutePath($this->getAttribute()->getEntityType()->getEntityTypeCode());
-+            $fileData = [
-+                'size' => filesize($dir . $value),
-+                'name' => $value,
-+                'tmp_name' => $dir . $value
-+            ];
-+        }
- 
-         $errors = [];
-         $attribute = $this->getAttribute();
- 
-         $toDelete = !empty($value['delete']) ? true : false;
--        $toUpload = !empty($value['tmp_name']) ? true : false;
-+        $toUpload = !empty($value['tmp_name']) || is_string($value) && !empty($value) ? true : false;
- 
-         if (!$toUpload && !$toDelete && $this->getEntity()->getData($attribute->getAttributeCode())) {
-             return true;
-@@ -195,11 +204,13 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
-         }
- 
-         if ($toUpload) {
--            $errors = array_merge($errors, $this->_validateByRules($value));
-+            $errors = array_merge($errors, $this->_validateByRules($fileData));
-         }
- 
-         if (count($errors) == 0) {
-             return true;
-+        } elseif (is_string($value) && !empty($value)) {
-+            $this->_directory->delete($dir . $value);
-         }
- 
-         return $errors;
-diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Image.php b/app/code/Magento/Eav/Model/Attribute/Data/Image.php
-index d04b7e9b940..24cd0f4fcf6 100644
---- a/app/code/Magento/Eav/Model/Attribute/Data/Image.php
-+++ b/app/code/Magento/Eav/Model/Attribute/Data/Image.php
-@@ -14,6 +14,7 @@ class Image extends \Magento\Eav\Model\Attribute\Data\File
- {
-     /**
-      * Validate file by attribute validate rules
-+     *
-      * Return array of errors
-      *
-      * @param array $value
-@@ -54,9 +55,9 @@ class Image extends \Magento\Eav\Model\Attribute\Data\File
-                 $errors[] = __('"%1" width exceeds allowed value of %2 px.', $label, $r);
-             }
-         }
--        if (!empty($rules['max_image_heght'])) {
--            if ($rules['max_image_heght'] < $imageProp[1]) {
--                $r = $rules['max_image_heght'];
-+        if (!empty($rules['max_image_height'])) {
-+            if ($rules['max_image_height'] < $imageProp[1]) {
-+                $r = $rules['max_image_height'];
-                 $errors[] = __('"%1" height exceeds allowed value of %2 px.', $label, $r);
-             }
-         }
-diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Text.php b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
-index f81fb2affd3..071b2b83e39 100644
---- a/app/code/Magento/Eav/Model/Attribute/Data/Text.php
-+++ b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
-@@ -51,12 +51,12 @@ class Text extends \Magento\Eav\Model\Attribute\Data\AbstractData
- 
-     /**
-      * Validate data
-+     *
-      * Return true or array of errors
-      *
-      * @param array|string $value
-      * @return bool|array
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function validateValue($value)
-     {
-@@ -68,24 +68,21 @@ class Text extends \Magento\Eav\Model\Attribute\Data\AbstractData
-             $value = $this->getEntity()->getDataUsingMethod($attribute->getAttributeCode());
-         }
- 
--        if ($attribute->getIsRequired() && empty($value) && $value !== '0') {
-+        if (!$attribute->getIsRequired() && empty($value)) {
-+            return true;
-+        }
-+
-+        if (empty($value) && $value !== '0' && $attribute->getDefaultValue() === null) {
-             $label = __($attribute->getStoreLabel());
-             $errors[] = __('"%1" is a required value.', $label);
-         }
- 
--        if (!$errors && !$attribute->getIsRequired() && empty($value)) {
--            return true;
--        }
-+        $validateLengthResult = $this->validateLength($attribute, $value);
-+        $errors = array_merge($errors, $validateLengthResult);
- 
--        $result = $this->validateLength($attribute, $value);
--        if (count($result) !== 0) {
--            $errors = array_merge($errors, $result);
--        }
-+        $validateInputRuleResult = $this->validateInputRule($value);
-+        $errors = array_merge($errors, $validateInputRuleResult);
- 
--        $result = $this->_validateInputRule($value);
--        if ($result !== true) {
--            $errors = array_merge($errors, $result);
--        }
-         if (count($errors) == 0) {
-             return true;
-         }
-@@ -141,7 +138,7 @@ class Text extends \Magento\Eav\Model\Attribute\Data\AbstractData
-      * @param string $value
-      * @return array errors
-      */
--    private function validateLength(\Magento\Eav\Model\Attribute $attribute, $value): array
-+    private function validateLength(\Magento\Eav\Model\Attribute $attribute, string $value): array
-     {
-         $errors = [];
-         $length = $this->_string->strlen(trim($value));
-@@ -162,4 +159,16 @@ class Text extends \Magento\Eav\Model\Attribute\Data\AbstractData
- 
-         return $errors;
-     }
-+
-+    /**
-+     * Validate value by attribute input validation rule.
-+     *
-+     * @param string $value
-+     * @return array
-+     */
-+    private function validateInputRule(string $value): array
-+    {
-+        $result = $this->_validateInputRule(trim($value));
-+        return \is_array($result) ? $result : [];
-+    }
- }
-diff --git a/app/code/Magento/Eav/Model/AttributeRepository.php b/app/code/Magento/Eav/Model/AttributeRepository.php
-index 120c868a9d4..337ae733448 100644
---- a/app/code/Magento/Eav/Model/AttributeRepository.php
-+++ b/app/code/Magento/Eav/Model/AttributeRepository.php
-@@ -142,7 +142,16 @@ class AttributeRepository implements \Magento\Eav\Api\AttributeRepositoryInterfa
-         $searchResults = $this->searchResultsFactory->create();
-         $searchResults->setSearchCriteria($searchCriteria);
-         $searchResults->setItems($attributes);
--        $searchResults->setTotalCount($attributeCollection->getSize());
-+
-+        // if $searchCriteria has no page size - we can use count() on $attributeCollection
-+        // otherwise - we have to use getSize() on $attributeCollection
-+        // with this approach we can eliminate excessive COUNT requests in case page size is empty
-+        if ($searchCriteria->getPageSize()) {
-+            $searchResults->setTotalCount($attributeCollection->getSize());
-+        } else {
-+            $searchResults->setTotalCount(count($attributeCollection));
-+        }
-+
-         return $searchResults;
-     }
- 
-diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
-index 0522ea04321..1fd71e446e6 100644
---- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
-+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
-@@ -10,6 +10,7 @@ use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
- use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
- use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
- use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
-+use Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface;
- use Magento\Framework\App\Config\Element;
- use Magento\Framework\DataObject;
- use Magento\Framework\DB\Adapter\DuplicateException;
-@@ -215,12 +216,21 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
-      */
-     protected $objectRelationProcessor;
- 
-+    /**
-+     * @var UniqueValidationInterface
-+     */
-+    private $uniqueValidator;
-+
-     /**
-      * @param Context $context
-      * @param array $data
-+     * @param UniqueValidationInterface|null $uniqueValidator
-      */
--    public function __construct(Context $context, $data = [])
--    {
-+    public function __construct(
-+        Context $context,
-+        $data = [],
-+        UniqueValidationInterface $uniqueValidator = null
-+    ) {
-         $this->_eavConfig = $context->getEavConfig();
-         $this->_resource = $context->getResource();
-         $this->_attrSetEntity = $context->getAttributeSetEntity();
-@@ -229,6 +239,8 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
-         $this->_universalFactory = $context->getUniversalFactory();
-         $this->transactionManager = $context->getTransactionManager();
-         $this->objectRelationProcessor = $context->getObjectRelationProcessor();
-+        $this->uniqueValidator = $uniqueValidator ?:
-+            ObjectManager::getInstance()->get(UniqueValidationInterface::class);
-         parent::__construct();
-         $properties = get_object_vars($this);
-         foreach ($data as $key => $value) {
-@@ -488,6 +500,7 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
-     /**
-      * Get attributes by scope
-      *
-+     * @param string $suffix
-      * @return array
-      */
-     private function getAttributesByScope($suffix)
-@@ -958,12 +971,8 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
- 
-         $data = $connection->fetchCol($select, $bind);
- 
--        $objectId = $object->getData($entityIdField);
--        if ($objectId) {
--            if (isset($data[0])) {
--                return $data[0] == $objectId;
--            }
--            return true;
-+        if ($object->getData($entityIdField)) {
-+            return $this->uniqueValidator->validate($attribute, $object, $this, $entityIdField, $data);
-         }
- 
-         return !count($data);
-@@ -1674,14 +1683,16 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
-         $connection->beginTransaction();
- 
-         try {
--            $select = $connection->select()->from($table, 'value_id')->where($where);
--            $origValueId = $connection->fetchOne($select);
-+            $select = $connection->select()->from($table, ['value_id', 'value'])->where($where);
-+            $origRow = $connection->fetchRow($select);
-+            $origValueId = $origRow['value_id'] ?? false;
-+            $origValue = $origRow['value'] ?? null;
- 
-             if ($origValueId === false && $newValue !== null) {
-                 $this->_insertAttribute($object, $attribute, $newValue);
-             } elseif ($origValueId !== false && $newValue !== null) {
-                 $this->_updateAttribute($object, $attribute, $origValueId, $newValue);
--            } elseif ($origValueId !== false && $newValue === null) {
-+            } elseif ($origValueId !== false && $newValue === null && $origValue !== null) {
-                 $connection->delete($table, $where);
-             }
-             $this->_processAttributeValues();
-@@ -1972,7 +1983,8 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
- 
-     /**
-      * Load attributes for object
--     *  if the object will not pass all attributes for this entity type will be loaded
-+     *
-+     * If the object will not pass all attributes for this entity type will be loaded
-      *
-      * @param array $attributes
-      * @param AbstractEntity|null $object
-diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
-index c605f3ce17e..e23f81607a0 100644
---- a/app/code/Magento/Eav/Model/Entity/Attribute.php
-+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
-@@ -3,10 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- namespace Magento\Eav\Model\Entity;
- 
-+use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
- use Magento\Framework\Api\AttributeValueFactory;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Stdlib\DateTime;
- use Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface;
-@@ -81,6 +82,11 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
-      */
-     protected $dateTimeFormatter;
- 
-+    /**
-+     * @var AttributeCodeValidator|null
-+     */
-+    private $attributeCodeValidator;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -101,6 +107,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
-      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-      * @param array $data
-+     * @param AttributeCodeValidator|null $attributeCodeValidator
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      * @codeCoverageIgnore
-      */
-@@ -123,7 +130,8 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
-         DateTimeFormatterInterface $dateTimeFormatter,
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
--        array $data = []
-+        array $data = [],
-+        AttributeCodeValidator $attributeCodeValidator = null
-     ) {
-         parent::__construct(
-             $context,
-@@ -146,6 +154,9 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
-         $this->_localeResolver = $localeResolver;
-         $this->reservedAttributeList = $reservedAttributeList;
-         $this->dateTimeFormatter = $dateTimeFormatter;
-+        $this->attributeCodeValidator = $attributeCodeValidator ?: ObjectManager::getInstance()->get(
-+            AttributeCodeValidator::class
-+        );
-     }
- 
-     /**
-@@ -231,6 +242,13 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
-      */
-     public function beforeSave()
-     {
-+        if (isset($this->_data['attribute_code'])
-+            && !$this->attributeCodeValidator->isValid($this->_data['attribute_code'])
-+        ) {
-+            $errorMessages = implode("\n", $this->attributeCodeValidator->getMessages());
-+            throw new LocalizedException(__($errorMessages));
-+        }
-+
-         // prevent overriding product data
-         if (isset($this->_data['attribute_code']) && $this->reservedAttributeList->isReservedAttribute($this)) {
-             throw new LocalizedException(
-@@ -241,25 +259,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
-             );
-         }
- 
--        /**
--         * Check for maximum attribute_code length
--         */
--        if (isset(
--            $this->_data['attribute_code']
--        ) && !\Zend_Validate::is(
--            $this->_data['attribute_code'],
--            'StringLength',
--            ['max' => self::ATTRIBUTE_CODE_MAX_LENGTH]
--        )
--        ) {
--            throw new LocalizedException(
--                __(
--                    'The attribute code needs to be %1 characters or fewer. Re-enter the code and try again.',
--                    self::ATTRIBUTE_CODE_MAX_LENGTH
--                )
--            );
--        }
--
-         $defaultValue = $this->getDefaultValue();
-         $hasDefaultValue = (string)$defaultValue != '';
- 
-@@ -295,6 +294,12 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
-             }
-         }
- 
-+        if ($this->getFrontendInput() == 'media_image') {
-+            if (!$this->getFrontendModel()) {
-+                $this->setFrontendModel(\Magento\Catalog\Model\Product\Attribute\Frontend\Image::class);
-+            }
-+        }
-+
-         if ($this->getBackendType() == 'gallery') {
-             if (!$this->getBackendModel()) {
-                 $this->setBackendModel(\Magento\Eav\Model\Entity\Attribute\Backend\DefaultBackend::class);
-@@ -305,9 +310,9 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
-     }
- 
-     /**
--     * Save additional data
-+     * @inheritdoc
-      *
--     * @return $this
-+     * Save additional data.
-      */
-     public function afterSave()
-     {
-@@ -316,7 +321,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
-     }
- 
-     /**
--     * @return $this
-+     * @inheritdoc
-      * @since 100.0.7
-      */
-     public function afterDelete()
-@@ -491,9 +496,14 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
-     /**
-      * @inheritdoc
-      * @since 100.0.7
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $this->unsetData('attribute_set_info');
-         return array_diff(
-             parent::__sleep(),
-@@ -504,11 +514,16 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
-     /**
-      * @inheritdoc
-      * @since 100.0.7
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
--        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-+        $objectManager = ObjectManager::getInstance();
-         $this->_localeDate = $objectManager->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
-         $this->_localeResolver = $objectManager->get(\Magento\Framework\Locale\ResolverInterface::class);
-         $this->reservedAttributeList = $objectManager->get(\Magento\Catalog\Model\Product\ReservedAttributeList::class);
-diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
-index f5c7d88919f..9ed4ac52936 100644
---- a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
-+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Eav\Model\Entity\Attribute;
- 
-@@ -119,6 +120,11 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-      */
-     protected $dataObjectHelper;
- 
-+    /**
-+     * @var FrontendLabelFactory
-+     */
-+    private $frontendLabelFactory;
-+
-     /**
-      * Serializer Instance.
-      *
-@@ -163,6 +169,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-      * @param array $data
-      * @param \Magento\Eav\Api\Data\AttributeExtensionFactory|null $eavExtensionFactory
-+     * @param FrontendLabelFactory|null $frontendLabelFactory
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      * @codeCoverageIgnore
-      */
-@@ -182,7 +189,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-         array $data = [],
--        \Magento\Eav\Api\Data\AttributeExtensionFactory $eavExtensionFactory = null
-+        \Magento\Eav\Api\Data\AttributeExtensionFactory $eavExtensionFactory = null,
-+        FrontendLabelFactory $frontendLabelFactory = null
-     ) {
-         parent::__construct(
-             $context,
-@@ -203,10 +211,13 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-         $this->dataObjectHelper = $dataObjectHelper;
-         $this->eavExtensionFactory = $eavExtensionFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
-             ->get(\Magento\Eav\Api\Data\AttributeExtensionFactory::class);
-+        $this->frontendLabelFactory = $frontendLabelFactory
-+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(FrontendLabelFactory::class);
-     }
- 
-     /**
-      * Get Serializer instance.
-+     *
-      * @deprecated 100.2.0
-      *
-      * @return Json
-@@ -235,8 +246,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     /**
-      * Load attribute data by code
-      *
--     * @param  string|int|\Magento\Eav\Model\Entity\Type $entityType
--     * @param  string $code
-+     * @param string|int|\Magento\Eav\Model\Entity\Type $entityType
-+     * @param string $code
-      * @return $this
-      * @throws LocalizedException
-      */
-@@ -287,7 +298,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @codeCoverageIgnore
-      */
-     public function getAttributeId()
-@@ -296,6 +307,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Set attribute code
-+     *
-      * @param string $data
-      * @return $this
-      * @codeCoverageIgnore
-@@ -306,7 +319,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @codeCoverageIgnore
-      */
-     public function getAttributeCode()
-@@ -315,6 +328,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Set attribute model
-+     *
-      * @param array $data
-      * @return $this
-      * @codeCoverageIgnore
-@@ -325,6 +340,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Returns attribute model
-+     *
-      * @return array
-      * @codeCoverageIgnore
-      */
-@@ -334,6 +351,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Set backend type
-+     *
-      * @param string $data
-      * @return $this
-      * @codeCoverageIgnore
-@@ -344,7 +363,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @codeCoverageIgnore
-      */
-     public function getBackendType()
-@@ -353,6 +372,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Set backend model
-+     *
-      * @param string $data
-      * @return $this
-      * @codeCoverageIgnore
-@@ -363,7 +384,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @codeCoverageIgnore
-      */
-     public function getBackendModel()
-@@ -372,6 +393,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Set backend table
-+     *
-      * @param string $data
-      * @return $this
-      * @codeCoverageIgnore
-@@ -382,6 +405,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Returns is visible on front
-+     *
-      * @return bool
-      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-      * @codeCoverageIgnore
-@@ -392,7 +417,9 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * @return string|int|bool|float
-+     * Returns default value
-+     *
-+     * @return string|null
-      * @codeCoverageIgnore
-      */
-     public function getDefaultValue()
-@@ -413,6 +440,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Returns attribute set id
-+     *
-      * @return int
-      * @codeCoverageIgnore
-      */
-@@ -422,6 +451,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Set attribute set id
-+     *
-      * @param int $id
-      * @return $this
-      * @codeCoverageIgnore
-@@ -434,7 +465,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @codeCoverageIgnore
-      */
-     public function getEntityTypeId()
-@@ -443,6 +474,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Set entity type id
-+     *
-      * @param int|string $id
-      * @return $this
-      * @codeCoverageIgnore
-@@ -455,6 +488,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Set entity type
-+     *
-      * @param string $type
-      * @return $this
-      * @codeCoverageIgnore
-@@ -486,7 +521,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     /**
-      * Set attribute name
-      *
--     * @param   string $name
-+     * @param string $name
-      * @return $this
-      * @codeCoverageIgnore
-      */
-@@ -599,9 +634,11 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     {
-         if (empty($this->_source)) {
-             if (!$this->getSourceModel()) {
--                $this->setSourceModel($this->_getDefaultSourceModel());
-+                $this->_source = $this->_getDefaultSourceModel();
-+            } else {
-+                $this->_source = $this->getSourceModel();
-             }
--            $source = $this->_universalFactory->create($this->getSourceModel());
-+            $source = $this->_universalFactory->create($this->_source);
-             if (!$source) {
-                 throw new LocalizedException(
-                     __(
-@@ -630,6 +667,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Returns default backend model
-+     *
-      * @return string
-      * @codeCoverageIgnore
-      */
-@@ -639,6 +678,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Returns default frontend model
-+     *
-      * @return string
-      * @codeCoverageIgnore
-      */
-@@ -648,6 +689,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * Returns default source model
-+     *
-      * @return string
-      * @codeCoverageIgnore
-      */
-@@ -770,7 +813,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-             if ($this->isStatic()) {
-                 $this->_dataTable = $this->getEntityType()->getValueTablePrefix();
-             } else {
--                $backendTable = trim($this->_getData('backend_table'));
-+                $backendTable = trim((string)$this->_getData('backend_table'));
-                 if (empty($backendTable)) {
-                     $entityTable = [$this->getEntityType()->getEntityTablePrefix(), $this->getBackendType()];
-                     $backendTable = $this->getResource()->getTable($entityTable);
-@@ -882,6 +925,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
- 
-     /**
-      * Retrieve flat columns definition in old format (before MMDB support)
-+     *
-      * Used in database compatible mode
-      *
-      * @deprecated 100.2.0
-@@ -1057,8 +1101,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * @inheritdoc
-      * @codeCoverageIgnoreStart
--     * {@inheritdoc}
-      */
-     public function getIsUnique()
-     {
-@@ -1077,7 +1121,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFrontendClass()
-     {
-@@ -1096,7 +1140,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFrontendInput()
-     {
-@@ -1104,7 +1148,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setFrontendInput($frontendInput)
-     {
-@@ -1112,7 +1156,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsRequired()
-     {
-@@ -1120,7 +1164,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setIsRequired($isRequired)
-     {
-@@ -1130,7 +1174,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     //@codeCoverageIgnoreEnd
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getOptions()
-     {
-@@ -1191,8 +1235,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
-+     * @inheritdoc
-      * @codeCoverageIgnoreStart
--     * {@inheritdoc}
-      */
-     public function getIsUserDefined()
-     {
-@@ -1211,7 +1255,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDefaultFrontendLabel()
-     {
-@@ -1230,10 +1274,23 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFrontendLabels()
-     {
-+        if ($this->getData(self::FRONTEND_LABELS) == null) {
-+            $attributeId = $this->getAttributeId();
-+            $storeLabels = $this->_getResource()->getStoreLabelsByAttributeId($attributeId);
-+
-+            $resultFrontedLabels = [];
-+            foreach ($storeLabels as $i => $label) {
-+                $frontendLabel = $this->frontendLabelFactory->create();
-+                $frontendLabel->setStoreId($i);
-+                $frontendLabel->setLabel($label);
-+                $resultFrontedLabels[] = $frontendLabel;
-+            }
-+            $this->setData(self::FRONTEND_LABELS, $resultFrontedLabels);
-+        }
-         return $this->_getData(self::FRONTEND_LABELS);
-     }
- 
-@@ -1249,7 +1306,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getNote()
-     {
-@@ -1268,7 +1325,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSourceModel()
-     {
-@@ -1289,7 +1346,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     //@codeCoverageIgnoreEnd
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getValidationRules()
-     {
-@@ -1316,7 +1373,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return \Magento\Eav\Api\Data\AttributeExtensionInterface|null
-      * @codeCoverageIgnore
-@@ -1333,7 +1390,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @param \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes
-      * @return $this
-@@ -1347,9 +1404,14 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     /**
-      * @inheritdoc
-      * @since 100.0.7
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return array_diff(
-             parent::__sleep(),
-             [
-@@ -1372,9 +1434,14 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
-     /**
-      * @inheritdoc
-      * @since 100.0.7
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
-         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         $this->_eavConfig = $objectManager->get(\Magento\Eav\Model\Config::class);
-diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
-index 53c32e1cbfb..86ab6f6ea6e 100644
---- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
-+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Eav\Model\Entity\Attribute\Backend;
- 
-@@ -204,12 +205,12 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
-     /**
-      * Retrieve default value
-      *
--     * @return mixed
-+     * @return string
-      */
-     public function getDefaultValue()
-     {
-         if ($this->_defaultValue === null) {
--            if ($this->getAttribute()->getDefaultValue()) {
-+            if ($this->getAttribute()->getDefaultValue() !== null) {
-                 $this->_defaultValue = $this->getAttribute()->getDefaultValue();
-             } else {
-                 $this->_defaultValue = "";
-@@ -285,7 +286,7 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
-     public function beforeSave($object)
-     {
-         $attrCode = $this->getAttribute()->getAttributeCode();
--        if (!$object->hasData($attrCode) && $this->getDefaultValue()) {
-+        if (!$object->hasData($attrCode) && $this->getDefaultValue() !== '') {
-             $object->setData($attrCode, $this->getDefaultValue());
-         }
- 
-@@ -348,9 +349,8 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
-     }
- 
-     /**
--     * By default attribute value is considered scalar that can be stored in a generic way
-+     * By default attribute value is considered scalar that can be stored in a generic way {@inheritdoc}
-      *
--     * {@inheritdoc}
-      * @codeCoverageIgnore
-      */
-     public function isScalar()
-diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
-index 3d4c9e89a03..2c7ea1ab926 100644
---- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
-+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
-@@ -20,6 +20,8 @@ use Magento\Eav\Model\Entity\Attribute;
- use Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory;
- 
- /**
-+ * EAV entity attribute form renderer.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -234,6 +236,9 @@ abstract class AbstractFrontend implements \Magento\Eav\Model\Entity\Attribute\F
-                 case 'alphanumeric':
-                     $class = 'validate-alphanum';
-                     break;
-+                case 'alphanum-with-spaces':
-+                    $class = 'validate-alphanum-with-spaces';
-+                    break;
-                 case 'numeric':
-                     $class = 'validate-digits';
-                     break;
-diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
-index 0b6ac2b998d..2e559645605 100644
---- a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
-+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
-@@ -3,11 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Eav\Model\Entity\Attribute;
- 
-+use Magento\Eav\Api\Data\AttributeGroupExtensionInterface;
- use Magento\Framework\Api\AttributeValueFactory;
-+use Magento\Framework\Exception\LocalizedException;
- 
- /**
-+ * Entity attribute group model
-+ *
-  * @api
-  * @method int getSortOrder()
-  * @method \Magento\Eav\Model\Entity\Attribute\Group setSortOrder(int $value)
-@@ -27,6 +32,11 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-      */
-     private $translitFilter;
- 
-+    /**
-+     * @var array
-+     */
-+    private $reservedSystemNames = [];
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -35,7 +45,8 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-      * @param \Magento\Framework\Filter\Translit $translitFilter
-      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
--     * @param array $data
-+     * @param array $data (optional)
-+     * @param array $reservedSystemNames (optional)
-      */
-     public function __construct(
-         \Magento\Framework\Model\Context $context,
-@@ -45,7 +56,8 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-         \Magento\Framework\Filter\Translit $translitFilter,
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
--        array $data = []
-+        array $data = [],
-+        array $reservedSystemNames = []
-     ) {
-         parent::__construct(
-             $context,
-@@ -56,6 +68,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-             $resourceCollection,
-             $data
-         );
-+        $this->reservedSystemNames = $reservedSystemNames;
-         $this->translitFilter = $translitFilter;
-     }
- 
-@@ -74,6 +87,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-      * Checks if current attribute group exists
-      *
-      * @return bool
-+     * @throws LocalizedException
-      * @codeCoverageIgnore
-      */
-     public function itemExists()
-@@ -85,6 +99,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-      * Delete groups
-      *
-      * @return $this
-+     * @throws LocalizedException
-      * @codeCoverageIgnore
-      */
-     public function deleteGroups()
-@@ -110,9 +125,10 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-                     ),
-                     '-'
-                 );
--                if (empty($attributeGroupCode)) {
-+                $isReservedSystemName = in_array(strtolower($attributeGroupCode), $this->reservedSystemNames);
-+                if (empty($attributeGroupCode) || $isReservedSystemName) {
-                     // in the following code md5 is not used for security purposes
--                    $attributeGroupCode = md5($groupName);
-+                    $attributeGroupCode = md5(strtolower($groupName));
-                 }
-                 $this->setAttributeGroupCode($attributeGroupCode);
-             }
-@@ -121,7 +137,8 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @codeCoverageIgnoreStart
-      */
-     public function getAttributeGroupId()
-@@ -130,7 +147,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAttributeGroupName()
-     {
-@@ -138,7 +155,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAttributeSetId()
-     {
-@@ -146,7 +163,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAttributeGroupId($attributeGroupId)
-     {
-@@ -154,7 +171,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAttributeGroupName($attributeGroupName)
-     {
-@@ -162,7 +179,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAttributeSetId($attributeSetId)
-     {
-@@ -170,9 +187,9 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
--     * @return \Magento\Eav\Api\Data\AttributeGroupExtensionInterface|null
-+     * @return AttributeGroupExtensionInterface|null
-      */
-     public function getExtensionAttributes()
-     {
-@@ -180,14 +197,13 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
--     * @param \Magento\Eav\Api\Data\AttributeGroupExtensionInterface $extensionAttributes
-+     * @param AttributeGroupExtensionInterface $extensionAttributes
-      * @return $this
-      */
--    public function setExtensionAttributes(
--        \Magento\Eav\Api\Data\AttributeGroupExtensionInterface $extensionAttributes
--    ) {
-+    public function setExtensionAttributes(AttributeGroupExtensionInterface $extensionAttributes)
-+    {
-         return $this->_setExtensionAttributes($extensionAttributes);
-     }
- 
-diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
-index a2c9611d26f..3c3bc083fdf 100644
---- a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
-+++ b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
-@@ -10,6 +10,9 @@ use Magento\Framework\Exception\InputException;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Exception\StateException;
- 
-+/**
-+ * Eav Option Management
-+ */
- class OptionManagement implements \Magento\Eav\Api\AttributeOptionManagementInterface
- {
-     /**
-@@ -36,7 +39,7 @@ class OptionManagement implements \Magento\Eav\Api\AttributeOptionManagementInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function add($entityType, $attributeCode, $option)
-     {
-@@ -79,7 +82,7 @@ class OptionManagement implements \Magento\Eav\Api\AttributeOptionManagementInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function delete($entityType, $attributeCode, $optionId)
-     {
-@@ -110,7 +113,7 @@ class OptionManagement implements \Magento\Eav\Api\AttributeOptionManagementInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getItems($entityType, $attributeCode)
-     {
-@@ -129,6 +132,8 @@ class OptionManagement implements \Magento\Eav\Api\AttributeOptionManagementInte
-     }
- 
-     /**
-+     * Validate option
-+     *
-      * @param \Magento\Eav\Api\Data\AttributeInterface $attribute
-      * @param int $optionId
-      * @throws NoSuchEntityException
-@@ -136,7 +141,7 @@ class OptionManagement implements \Magento\Eav\Api\AttributeOptionManagementInte
-      */
-     protected function validateOption($attribute, $optionId)
-     {
--        if (!$attribute->getSource()->getOptionText($optionId)) {
-+        if ($attribute->getSource()->getOptionText($optionId) === false) {
-             throw new NoSuchEntityException(
-                 __(
-                     'The "%1" attribute doesn\'t include an option with "%2" ID.',
-@@ -148,15 +153,19 @@ class OptionManagement implements \Magento\Eav\Api\AttributeOptionManagementInte
-     }
- 
-     /**
-+     * Returns option id
-+     *
-      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
-      * @return string
-      */
-     private function getOptionId(\Magento\Eav\Api\Data\AttributeOptionInterface $option) : string
-     {
--        return $option->getValue() ?: 'new_option';
-+        return 'id_' . ($option->getValue() ?: 'new_option');
-     }
- 
-     /**
-+     * Set option value
-+     *
-      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
-      * @param \Magento\Eav\Api\Data\AttributeInterface $attribute
-      * @param string $optionLabel
-diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
-index 0991b3f9f4b..dd4cd4217a1 100644
---- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
-+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
-@@ -3,11 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Eav\Model\Entity\Attribute\Source;
- 
- /**
-  * Entity/Attribute/Model - attribute selection source abstract
-- *
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  * @author     Magento Core Team <core@magentocommerce.com>
-  * @SuppressWarnings(PHPMD.NumberOfChildren)
-@@ -65,7 +66,7 @@ abstract class AbstractSource implements
-     {
-         $options = $this->getAllOptions();
-         // Fixed for tax_class_id and custom_design
--        if (sizeof($options) > 0) {
-+        if (count($options) > 0) {
-             foreach ($options as $option) {
-                 if (isset($option['value']) && $option['value'] == $value) {
-                     return isset($option['label']) ? $option['label'] : $option['value'];
-@@ -73,20 +74,22 @@ abstract class AbstractSource implements
-             }
-         }
-         // End
--        if (isset($options[$value])) {
-+        if (is_scalar($value) && isset($options[$value])) {
-             return $options[$value];
-         }
-         return false;
-     }
- 
-     /**
-+     * Get option id.
-+     *
-      * @param string $value
-      * @return null|string
-      */
-     public function getOptionId($value)
-     {
-         foreach ($this->getAllOptions() as $option) {
--            if (strcasecmp($option['label'], $value) == 0 || $option['value'] == $value) {
-+            if ($this->mbStrcasecmp($option['label'], $value) == 0 || $option['value'] == $value) {
-                 return $option['value'];
-             }
-         }
-@@ -164,4 +167,20 @@ abstract class AbstractSource implements
-     {
-         return $this->getAllOptions();
-     }
-+
-+    /**
-+     * Multibyte support strcasecmp function version.
-+     *
-+     * @param string $str1
-+     * @param string $str2
-+     * @return int
-+     */
-+    private function mbStrcasecmp($str1, $str2)
-+    {
-+        $encoding = mb_internal_encoding();
-+        return strcmp(
-+            mb_strtoupper($str1, $encoding),
-+            mb_strtoupper($str2, $encoding)
-+        );
-+    }
- }
-diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
-index 8f8c39bf260..f9aa1a9ed3b 100644
---- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
-+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
-@@ -9,6 +9,8 @@ use Magento\Framework\App\ObjectManager;
- use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-+ * Eav attribute default source when values are coming from another table
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -127,12 +129,14 @@ class Table extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
-     }
- 
-     /**
-+     * Add an empty option to the array
-+     *
-      * @param array $options
-      * @return array
-      */
-     private function addEmptyOption(array $options)
-     {
--        array_unshift($options, ['label' => $this->getAttribute()->getIsRequired() ? '' : ' ', 'value' => '']);
-+        array_unshift($options, ['label' => ' ', 'value' => '']);
-         return $options;
-     }
- 
-diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/UniqueValidationInterface.php b/app/code/Magento/Eav/Model/Entity/Attribute/UniqueValidationInterface.php
-new file mode 100644
-index 00000000000..b68e79d7b7d
---- /dev/null
-+++ b/app/code/Magento/Eav/Model/Entity/Attribute/UniqueValidationInterface.php
-@@ -0,0 +1,33 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Eav\Model\Entity\Attribute;
-+
-+use Magento\Framework\DataObject;
-+use Magento\Eav\Model\Entity\AbstractEntity;
-+
-+/**
-+ * Interface for unique attribute validator
-+ */
-+interface UniqueValidationInterface
-+{
-+    /**
-+     * Validate if attribute value is unique
-+     *
-+     * @param AbstractAttribute $attribute
-+     * @param DataObject $object
-+     * @param AbstractEntity $entity
-+     * @param string $entityLinkField
-+     * @param array $entityIds
-+     * @return bool
-+     */
-+    public function validate(
-+        AbstractAttribute $attribute,
-+        DataObject $object,
-+        AbstractEntity $entity,
-+        $entityLinkField,
-+        array $entityIds
-+    );
-+}
-diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/UniqueValidator.php b/app/code/Magento/Eav/Model/Entity/Attribute/UniqueValidator.php
-new file mode 100644
-index 00000000000..b1888b42bef
---- /dev/null
-+++ b/app/code/Magento/Eav/Model/Entity/Attribute/UniqueValidator.php
-@@ -0,0 +1,31 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Eav\Model\Entity\Attribute;
-+
-+use Magento\Framework\DataObject;
-+use Magento\Eav\Model\Entity\AbstractEntity;
-+
-+/**
-+ * Class for validate unique attribute value
-+ */
-+class UniqueValidator implements UniqueValidationInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function validate(
-+        AbstractAttribute $attribute,
-+        DataObject $object,
-+        AbstractEntity $entity,
-+        $entityLinkField,
-+        array $entityIds
-+    ) {
-+        if (isset($entityIds[0])) {
-+            return $entityIds[0] == $object->getData($entityLinkField);
-+        }
-+        return true;
-+    }
-+}
-diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
-index 076d7977623..e50abbc11e5 100644
---- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
-+++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
-@@ -14,6 +14,7 @@ use Magento\Framework\Exception\LocalizedException;
- /**
-  * Entity/Attribute/Model - collection abstract
-  *
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-@@ -125,6 +126,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-     protected $_resourceHelper;
- 
-     /**
-+     *
-      * @var \Magento\Framework\Validator\UniversalFactory
-      */
-     protected $_universalFactory;
-@@ -172,6 +174,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-      * Initialize collection
-      *
-      * @return void
-+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
-      */
-     protected function _construct()
-     {
-@@ -248,7 +251,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-             $this->_entity = $this->_eavEntityFactory->create()->setType($entity);
-         } else {
-             throw new LocalizedException(
--                __('The "%1" entity supplied is invalid. Verify the entity and try again.', print_r($entity, 1))
-+                __('The entity supplied to collection is invalid. Verify the entity and try again.')
-             );
-         }
-         return $this;
-@@ -282,7 +285,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-     /**
-      * Set template object for the collection
-      *
--     * @param   \Magento\Framework\DataObject $object
-+     * @param \Magento\Framework\DataObject $object
-      * @return $this
-      */
-     public function setObject($object = null)
-@@ -379,6 +382,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
- 
-         if (!empty($conditionSql)) {
-             $this->getSelect()->where($conditionSql, null, \Magento\Framework\DB\Select::TYPE_CONDITION);
-+            $this->_totalRecords = null;
-         } else {
-             throw new \Magento\Framework\Exception\LocalizedException(
-                 __('Invalid attribute identifier for filter (%1)', get_class($attribute))
-@@ -398,7 +402,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-      */
-     public function addFieldToFilter($attribute, $condition = null)
-     {
--        return $this->addAttributeToFilter($attribute, $condition);
-+        return $this->addAttributeToFilter($attribute, $condition, 'left');
-     }
- 
-     /**
-@@ -652,7 +656,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-      * @param string $bind attribute of the main entity to link with joined $filter
-      * @param string $filter primary key for the joined entity (entity_id default)
-      * @param string $joinType inner|left
--     * @param null $storeId
-+     * @param int|null $storeId
-      * @return $this
-      * @throws LocalizedException
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-@@ -946,8 +950,8 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-     /**
-      * Clone and reset collection
-      *
--     * @param null $limit
--     * @param null $offset
-+     * @param int|null $limit
-+     * @param int|null $offset
-      * @return Select
-      */
-     protected function _getAllIdsSelect($limit = null, $offset = null)
-@@ -1044,6 +1048,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-                 $this->_items[$entityId]->addData($row);
-             }
-         }
-+        $this->_setIsLoaded();
-         return $this;
-     }
- 
-@@ -1147,7 +1152,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-      * @param bool $printQuery
-      * @param bool $logQuery
-      * @return $this
--     * @throws LocalizedException
-      * @throws \Exception
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-@@ -1242,7 +1246,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
- 
-         if ($entity->getEntityTable() == \Magento\Eav\Model\Entity::DEFAULT_ENTITY_TABLE && $entity->getTypeId()) {
-             $select->where(
--                'entity_type_id =?',
-+                't_d.entity_type_id =?',
-                 $entity->getTypeId()
-             );
-         }
-@@ -1354,8 +1358,8 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-     /**
-      * Add attribute value table to the join if it wasn't added previously
-      *
--     * @param   string $attributeCode
--     * @param   string $joinType inner|left
-+     * @param string $attributeCode
-+     * @param string $joinType inner|left
-      * @return $this
-      * @throws LocalizedException
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-@@ -1449,12 +1453,12 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-     /**
-      * Adding join statement to collection select instance
-      *
--     * @param   string $method
--     * @param   object $attribute
--     * @param   string $tableAlias
--     * @param   array $condition
--     * @param   string $fieldCode
--     * @param   string $fieldAlias
-+     * @param string $method
-+     * @param object $attribute
-+     * @param string $tableAlias
-+     * @param array $condition
-+     * @param string $fieldCode
-+     * @param string $fieldAlias
-      * @return $this
-      */
-     protected function _joinAttributeToSelect($method, $attribute, $tableAlias, $condition, $fieldCode, $fieldAlias)
-@@ -1619,6 +1623,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
- 
-     /**
-      * Clear collection
-+     *
-      * @return $this
-      */
-     public function clear()
-@@ -1629,6 +1634,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
- 
-     /**
-      * Remove all items from collection
-+     *
-      * @return $this
-      */
-     public function removeAllItems()
-@@ -1652,6 +1658,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-     }
- 
-     /**
-+     * Returns main table.
-      * Returns main table name - extracted from "module/table" style and
-      * validated by db adapter
-      *
-diff --git a/app/code/Magento/Eav/Model/Entity/Collection/VersionControl/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/VersionControl/AbstractCollection.php
-index e626ed35eb1..631bfa3c2d2 100644
---- a/app/code/Magento/Eav/Model/Entity/Collection/VersionControl/AbstractCollection.php
-+++ b/app/code/Magento/Eav/Model/Entity/Collection/VersionControl/AbstractCollection.php
-@@ -7,8 +7,11 @@ namespace Magento\Eav\Model\Entity\Collection\VersionControl;
- 
- /**
-  * Class Abstract Collection
-+ *
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  * @since 100.0.2
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- abstract class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
- {
-@@ -18,6 +21,7 @@ abstract class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\A
-     protected $entitySnapshot;
- 
-     /**
-+     * AbstractCollection constructor.
-      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
-      * @param \Psr\Log\LoggerInterface $logger
-      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-@@ -27,8 +31,9 @@ abstract class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\A
-      * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
-      * @param \Magento\Eav\Model\ResourceModel\Helper $resourceHelper
-      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
--     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot,
--     * @param mixed $connection
-+     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
-+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
-+     *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      * @codeCoverageIgnore
-      */
-diff --git a/app/code/Magento/Eav/Model/Entity/GetCustomAttributeCodes.php b/app/code/Magento/Eav/Model/Entity/GetCustomAttributeCodes.php
-deleted file mode 100644
-index a77b298f5d2..00000000000
---- a/app/code/Magento/Eav/Model/Entity/GetCustomAttributeCodes.php
-+++ /dev/null
-@@ -1,52 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Eav\Model\Entity;
--
--use Magento\Framework\Api\MetadataServiceInterface;
--
--class GetCustomAttributeCodes implements GetCustomAttributeCodesInterface
--{
--    /**
--     * @var string[][]
--     */
--    private $customAttributesCodes;
--
--    /**
--     * Receive a list of custom EAV attributes using provided metadata service. The results are cached per entity type
--     *
--     * @param MetadataServiceInterface $metadataService Custom attribute metadata service to be used
--     * @return string[]
--     */
--    public function execute(MetadataServiceInterface $metadataService): array
--    {
--        $cacheKey = get_class($metadataService);
--        if (!isset($this->customAttributesCodes[$cacheKey])) {
--            $this->customAttributesCodes[$cacheKey] = $this->getEavAttributesCodes($metadataService);
--        }
--        return $this->customAttributesCodes[$cacheKey];
--    }
--
--    /**
--     * Receive a list of EAV attributes using provided metadata service.
--     *
--     * @param MetadataServiceInterface $metadataService
--     * @param string|null $entityType
--     * @return string[]
--     */
--    private function getEavAttributesCodes(MetadataServiceInterface $metadataService, string $entityType = null)
--    {
--        $attributeCodes = [];
--        $customAttributesMetadata = $metadataService->getCustomAttributesMetadata($entityType);
--        if (is_array($customAttributesMetadata)) {
--            /** @var $attribute \Magento\Framework\Api\MetadataObjectInterface */
--            foreach ($customAttributesMetadata as $attribute) {
--                $attributeCodes[] = $attribute->getAttributeCode();
--            }
--        }
--        return $attributeCodes;
--    }
--}
-diff --git a/app/code/Magento/Eav/Model/Entity/GetCustomAttributeCodesInterface.php b/app/code/Magento/Eav/Model/Entity/GetCustomAttributeCodesInterface.php
-deleted file mode 100644
-index c73d626e736..00000000000
---- a/app/code/Magento/Eav/Model/Entity/GetCustomAttributeCodesInterface.php
-+++ /dev/null
-@@ -1,20 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Eav\Model\Entity;
--
--use Magento\Framework\Api\MetadataServiceInterface;
--
--interface GetCustomAttributeCodesInterface
--{
--    /**
--     * Receive a list of custom EAV attributes using provided metadata service.
--     *
--     * @param MetadataServiceInterface $metadataService Custom attribute metadata service to be used
--     * @return string[]
--     */
--    public function execute(MetadataServiceInterface $metadataService): array;
--}
-diff --git a/app/code/Magento/Eav/Model/Entity/Type.php b/app/code/Magento/Eav/Model/Entity/Type.php
-index 80fcfd4ab58..444d58bf546 100644
---- a/app/code/Magento/Eav/Model/Entity/Type.php
-+++ b/app/code/Magento/Eav/Model/Entity/Type.php
-@@ -167,12 +167,8 @@ class Type extends \Magento\Framework\Model\AbstractModel
-      */
-     protected function _getAttributeCollection()
-     {
--        $collection = $this->_attributeFactory->create()->getCollection();
--        $objectsModel = $this->getAttributeModel();
--        if ($objectsModel) {
--            $collection->setModel($objectsModel);
--        }
--
-+        $collection = $this->_universalFactory->create($this->getEntityAttributeCollection());
-+        $collection->setItemObjectClass($this->getAttributeModel());
-         return $collection;
-     }
- 
-diff --git a/app/code/Magento/Eav/Model/Form.php b/app/code/Magento/Eav/Model/Form.php
-index c8c50521f55..a34b53eede3 100644
---- a/app/code/Magento/Eav/Model/Form.php
-+++ b/app/code/Magento/Eav/Model/Form.php
-@@ -286,7 +286,8 @@ abstract class Form
-     }
- 
-     /**
--     * Return entity type instance
-+     * Return entity type instance.
-+     *
-      * Return EAV entity type if entity type is not defined
-      *
-      * @return \Magento\Eav\Model\Entity\Type
-@@ -323,6 +324,8 @@ abstract class Form
-         if ($this->_attributes === null) {
-             $this->_attributes = [];
-             $this->_userAttributes = [];
-+            $this->_systemAttributes = [];
-+            $this->_allowedAttributes = [];
-             /** @var $attribute \Magento\Eav\Model\Attribute */
-             foreach ($this->_getFilteredFormAttributeCollection() as $attribute) {
-                 $this->_attributes[$attribute->getAttributeCode()] = $attribute;
-diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
-index 25858f6a345..5e7226e7a36 100644
---- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
-+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
-@@ -119,7 +119,7 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      */
-     private function _getMaxSortOrder(AbstractModel $object)
-     {
--        if (intval($object->getAttributeGroupId()) > 0) {
-+        if ((int)$object->getAttributeGroupId() > 0) {
-             $connection = $this->getConnection();
-             $bind = [
-                 ':attribute_set_id' => $object->getAttributeSetId(),
-@@ -171,10 +171,10 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     {
-         $frontendLabel = $object->getFrontendLabel();
-         if (is_array($frontendLabel)) {
--            if (!isset($frontendLabel[0]) || $frontendLabel[0] === null || $frontendLabel[0] == '') {
--                throw new \Magento\Framework\Exception\LocalizedException(__('The storefront label is not defined.'));
--            }
-+            $this->checkDefaultFrontendLabelExists($frontendLabel, $frontendLabel);
-             $object->setFrontendLabel($frontendLabel[0])->setStoreLabels($frontendLabel);
-+        } else {
-+            $this->setStoreLabels($object, $frontendLabel);
-         }
- 
-         /**
-@@ -225,6 +225,8 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Returns config instance
-+     *
-      * @return Config
-      * @deprecated 100.0.7
-      */
-@@ -297,10 +299,10 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      * Save in set including
-      *
-      * @param AbstractModel $object
--     * @param null $attributeEntityId
--     * @param null $attributeSetId
--     * @param null $attributeGroupId
--     * @param null $attributeSortOrder
-+     * @param int|null $attributeEntityId
-+     * @param int|null $attributeSetId
-+     * @param int|null $attributeGroupId
-+     * @param int|null $attributeSortOrder
-      * @return $this
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-@@ -636,6 +638,7 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- 
-     /**
-      * Load additional attribute data.
-+     *
-      * Load label of current active store
-      *
-      * @param EntityAttribute|AbstractModel $object
-@@ -722,9 +725,14 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      *
-      * @return array
-      * @since 100.0.7
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $properties = parent::__sleep();
-         $properties = array_diff($properties, ['_storeManager']);
-         return $properties;
-@@ -735,11 +743,55 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      *
-      * @return void
-      * @since 100.0.7
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
-         $this->_storeManager = \Magento\Framework\App\ObjectManager::getInstance()
-             ->get(\Magento\Store\Model\StoreManagerInterface::class);
-     }
-+
-+    /**
-+     * This method extracts frontend labels into array and sets array values as storeLabels into an object.
-+     *
-+     * @param AbstractModel $object
-+     * @param string|null $frontendLabel
-+     * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function setStoreLabels(AbstractModel $object, $frontendLabel)
-+    {
-+        $resultLabel = [];
-+        $frontendLabels = $object->getFrontendLabels();
-+        if (isset($frontendLabels[0])
-+            && $frontendLabels[0] instanceof \Magento\Eav\Model\Entity\Attribute\FrontendLabel
-+        ) {
-+            foreach ($frontendLabels as $label) {
-+                $resultLabel[$label->getStoreId()] = $label->getLabel();
-+            }
-+            $this->checkDefaultFrontendLabelExists($frontendLabel, $resultLabel);
-+            $object->setStoreLabels($resultLabel);
-+        }
-+    }
-+
-+    /**
-+     * This method checks whether value for default frontend label exists in attribute data.
-+     *
-+     * @param array|string|null $frontendLabel
-+     * @param array $resultLabels
-+     * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function checkDefaultFrontendLabelExists($frontendLabel, $resultLabels)
-+    {
-+        $isAdminStoreLabel = (isset($resultLabels[0]) && !empty($resultLabels[0]));
-+        if (empty($frontendLabel) && !$isAdminStoreLabel) {
-+            throw new \Magento\Framework\Exception\LocalizedException(__('The storefront label is not defined.'));
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
-index cec415e5136..6fce6bd2dc4 100644
---- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
-+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Eav\Model\ResourceModel\Entity\Attribute;
- 
- use Magento\Eav\Model\Entity\Type;
-@@ -128,7 +129,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-     /**
-      * Specify attribute set filter
-      *
--     * @param int $setId
-+     * @param int|int[] $setId
-      * @return $this
-      */
-     public function setAttributeSetFilter($setId)
-@@ -183,6 +184,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
- 
-     /**
-      * Specify multiple attribute sets filter
-+     *
-      * Result will be ordered by sort_order
-      *
-      * @param array $setIds
-@@ -225,7 +227,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-                 ->having(new \Zend_Db_Expr('COUNT(*)') . ' = ' . count($setIds));
-         }
- 
--        //$this->getSelect()->distinct(true);
-         $this->setOrder('is_user_defined', self::SORT_ORDER_ASC);
- 
-         return $this;
-@@ -475,7 +476,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSelectCountSql()
-     {
-diff --git a/app/code/Magento/Eav/Model/ResourceModel/Helper.php b/app/code/Magento/Eav/Model/ResourceModel/Helper.php
-index 65e2fb250ce..fc8a47994a6 100644
---- a/app/code/Magento/Eav/Model/ResourceModel/Helper.php
-+++ b/app/code/Magento/Eav/Model/ResourceModel/Helper.php
-@@ -46,6 +46,19 @@ class Helper extends \Magento\Framework\DB\Helper
-         \Magento\Framework\DB\Ddl\Table::TYPE_VARBINARY => 'blob',
-     ];
- 
-+    /**
-+     * Attribute types that can be united via UNION into one query
-+     * while selecting attribute`s data from tables like `catalog_product_entity_datatype`
-+     *
-+     * This helps to run one query with all data types instead of one per each data type
-+     *
-+     * This data types are determined as 'groupable' because their tables have the same structure
-+     * which means that they can be used in one UNION query
-+     *
-+     * @var array
-+     */
-+    private $_groupableTypes = ['varchar', 'text', 'decimal', 'datetime', 'int'];
-+
-     /**
-      * Returns DDL type by column type in database
-      *
-@@ -72,15 +85,41 @@ class Helper extends \Magento\Framework\DB\Helper
-     /**
-      * Groups selects to separate unions depend on type
-      *
-+     * E.g. for input array:
-+     *  [
-+     *      varchar => [select1, select2],
-+     *      text    => [select3],
-+     *      int     => [select4],
-+     *      bool    => [select5]
-+     *  ]
-+     *
-+     * The result array will be:
-+     *  [
-+     *      0 => [select1, select2, select3, select4] // contains queries for varchar & text & int
-+     *      1 => [select5]                            // contains queries for bool
-+     *  ]
-+     *
-      * @param array $selects
-      * @return array
-      */
-     public function getLoadAttributesSelectGroups($selects)
-     {
-         $mainGroup = [];
--        foreach ($selects as $selectGroup) {
--            $mainGroup = array_merge($mainGroup, $selectGroup);
-+
-+        foreach ($selects as $dataType => $selectGroup) {
-+            if (in_array($dataType, $this->_groupableTypes)) {
-+                $mainGroup['all'][] = $selectGroup;
-+                continue;
-+            }
-+
-+            $mainGroup[$dataType] = $selectGroup;
-         }
--        return $mainGroup;
-+
-+        if (array_key_exists('all', $mainGroup)) {
-+            // it is better to call array_merge once after loop instead of calling it on each loop
-+            $mainGroup['all'] = array_merge(...$mainGroup['all']);
-+        }
-+
-+        return array_values($mainGroup);
-     }
- }
-diff --git a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
-index 9febea9b7b2..7f6dfa2a5e9 100644
---- a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
-+++ b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
-@@ -5,12 +5,19 @@
-  */
- namespace Magento\Eav\Model\ResourceModel;
- 
-+use Magento\Eav\Model\Config;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\DB\Select;
-+use Magento\Framework\DB\Sql\UnionExpression;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\EntityManager\Operation\AttributeInterface;
- use Magento\Framework\Model\Entity\ScopeInterface;
- use Magento\Framework\Model\Entity\ScopeResolver;
- use Psr\Log\LoggerInterface;
- 
-+/**
-+ * EAV read handler
-+ */
- class ReadHandler implements AttributeInterface
- {
-     /**
-@@ -29,23 +36,21 @@ class ReadHandler implements AttributeInterface
-     private $logger;
- 
-     /**
--     * @var \Magento\Eav\Model\Config
-+     * @var Config
-      */
-     private $config;
- 
-     /**
--     * ReadHandler constructor.
--     *
-      * @param MetadataPool $metadataPool
-      * @param ScopeResolver $scopeResolver
-      * @param LoggerInterface $logger
--     * @param \Magento\Eav\Model\Config $config
-+     * @param Config $config
-      */
-     public function __construct(
-         MetadataPool $metadataPool,
-         ScopeResolver $scopeResolver,
-         LoggerInterface $logger,
--        \Magento\Eav\Model\Config $config
-+        Config $config
-     ) {
-         $this->metadataPool = $metadataPool;
-         $this->scopeResolver = $scopeResolver;
-@@ -59,16 +64,34 @@ class ReadHandler implements AttributeInterface
-      * @param string $entityType
-      * @return \Magento\Eav\Api\Data\AttributeInterface[]
-      * @throws \Exception if for unknown entity type
-+     * @deprecated Not used anymore
-+     * @see ReadHandler::getEntityAttributes
-      */
-     protected function getAttributes($entityType)
-     {
-         $metadata = $this->metadataPool->getMetadata($entityType);
-         $eavEntityType = $metadata->getEavEntityType();
--        $attributes = (null === $eavEntityType) ? [] : $this->config->getAttributes($eavEntityType);
--        return $attributes;
-+        return null === $eavEntityType ? [] : $this->config->getEntityAttributes($eavEntityType);
-     }
- 
-     /**
-+     * Get attribute of given entity type
-+     *
-+     * @param string $entityType
-+     * @param DataObject $entity
-+     * @return \Magento\Eav\Api\Data\AttributeInterface[]
-+     * @throws \Exception if for unknown entity type
-+     */
-+    private function getEntityAttributes(string $entityType, DataObject $entity): array
-+    {
-+        $metadata = $this->metadataPool->getMetadata($entityType);
-+        $eavEntityType = $metadata->getEavEntityType();
-+        return null === $eavEntityType ? [] : $this->config->getEntityAttributes($eavEntityType, $entity);
-+    }
-+
-+    /**
-+     * Get context variables
-+     *
-      * @param ScopeInterface $scope
-      * @return array
-      */
-@@ -82,6 +105,8 @@ class ReadHandler implements AttributeInterface
-     }
- 
-     /**
-+     * Execute read handler
-+     *
-      * @param string $entityType
-      * @param array $entityData
-      * @param array $arguments
-@@ -105,40 +130,47 @@ class ReadHandler implements AttributeInterface
-         $selects = [];
- 
-         /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute */
--        foreach ($this->getAttributes($entityType) as $attribute) {
-+        foreach ($this->getEntityAttributes($entityType, new DataObject($entityData)) as $attribute) {
-             if (!$attribute->isStatic()) {
-                 $attributeTables[$attribute->getBackend()->getTable()][] = $attribute->getAttributeId();
-                 $attributesMap[$attribute->getAttributeId()] = $attribute->getAttributeCode();
-             }
-         }
-         if (count($attributeTables)) {
--            $attributeTables = array_keys($attributeTables);
--            foreach ($attributeTables as $attributeTable) {
-+            $identifiers = null;
-+            foreach ($attributeTables as $attributeTable => $attributeIds) {
-                 $select = $connection->select()
-                     ->from(
-                         ['t' => $attributeTable],
-                         ['value' => 't.value', 'attribute_id' => 't.attribute_id']
-                     )
--                    ->where($metadata->getLinkField() . ' = ?', $entityData[$metadata->getLinkField()]);
-+                    ->where($metadata->getLinkField() . ' = ?', $entityData[$metadata->getLinkField()])
-+                    ->where('attribute_id IN (?)', $attributeIds);
-+                $attributeIdentifiers = [];
-                 foreach ($context as $scope) {
-                     //TODO: if (in table exists context field)
-                     $select->where(
--                        $metadata->getEntityConnection()->quoteIdentifier($scope->getIdentifier()) . ' IN (?)',
-+                        $connection->quoteIdentifier($scope->getIdentifier()) . ' IN (?)',
-                         $this->getContextVariables($scope)
--                    )->order('t.' . $scope->getIdentifier() . ' DESC');
-+                    );
-+                    $attributeIdentifiers[] = $scope->getIdentifier();
-                 }
-+                $attributeIdentifiers = array_unique($attributeIdentifiers);
-+                $identifiers = array_intersect($identifiers ?? $attributeIdentifiers, $attributeIdentifiers);
-                 $selects[] = $select;
-             }
--            $unionSelect = new \Magento\Framework\DB\Sql\UnionExpression(
--                $selects,
--                \Magento\Framework\DB\Select::SQL_UNION_ALL
--            );
--            foreach ($connection->fetchAll($unionSelect) as $attributeValue) {
-+            $this->applyIdentifierForSelects($selects, $identifiers);
-+            $unionSelect = new UnionExpression($selects, Select::SQL_UNION_ALL, '( %s )');
-+            $orderedUnionSelect = $connection->select();
-+            $orderedUnionSelect->from(['u' => $unionSelect]);
-+            $this->applyIdentifierForUnion($orderedUnionSelect, $identifiers);
-+            $attributes = $connection->fetchAll($orderedUnionSelect);
-+            foreach ($attributes as $attributeValue) {
-                 if (isset($attributesMap[$attributeValue['attribute_id']])) {
-                     $entityData[$attributesMap[$attributeValue['attribute_id']]] = $attributeValue['value'];
-                 } else {
-                     $this->logger->warning(
--                        "Attempt to load value of nonexistent EAV attribute '{$attributeValue['attribute_id']}' 
-+                        "Attempt to load value of nonexistent EAV attribute '{$attributeValue['attribute_id']}'
-                         for entity type '$entityType'."
-                     );
-                 }
-@@ -146,4 +178,32 @@ class ReadHandler implements AttributeInterface
-         }
-         return $entityData;
-     }
-+
-+    /**
-+     * Apply identifiers column on select array
-+     *
-+     * @param Select[] $selects
-+     * @param array $identifiers
-+     */
-+    private function applyIdentifierForSelects(array $selects, array $identifiers)
-+    {
-+        foreach ($selects as $select) {
-+            foreach ($identifiers as $identifier) {
-+                $select->columns($identifier, 't');
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Apply identifiers order on union select
-+     *
-+     * @param Select $unionSelect
-+     * @param array $identifiers
-+     */
-+    private function applyIdentifierForUnion(Select $unionSelect, array $identifiers)
-+    {
-+        foreach ($identifiers as $identifier) {
-+            $unionSelect->order($identifier);
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php b/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
-index 8159c380a66..d562773c6b5 100644
---- a/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
-+++ b/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
-@@ -123,6 +123,9 @@ class UpdateHandler implements AttributeInterface
-             $attributeSetId = isset($entityData[AttributeLoader::ATTRIBUTE_SET_ID])
-                 ? $entityData[AttributeLoader::ATTRIBUTE_SET_ID]
-                 : null; // @todo verify is it normal to not have attribute_set_id
-+            if (!isset($entityDataForSnapshot['attribute_set_id'])) {
-+                $entityDataForSnapshot['attribute_set_id'] = $attributeSetId;
-+            }
-             $snapshot = $this->readSnapshot->execute($entityType, $entityDataForSnapshot);
-             foreach ($this->getAttributes($entityType, $attributeSetId) as $attribute) {
-                 $code = $attribute->getAttributeCode();
-diff --git a/app/code/Magento/Eav/Model/Validator/Attribute/Code.php b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
-new file mode 100644
-index 00000000000..6447507ea17
---- /dev/null
-+++ b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
-@@ -0,0 +1,83 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Eav\Model\Validator\Attribute;
-+
-+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
-+use Magento\Eav\Model\Entity\Attribute;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Validator\AbstractValidator;
-+use Zend_Validate;
-+
-+/**
-+ * Class Code
-+ *
-+ * Validation EAV attribute code
-+ */
-+class Code extends AbstractValidator
-+{
-+    /**
-+     * Validation pattern for attribute code
-+     */
-+    const VALIDATION_RULE_PATTERN = '/^[a-zA-Z]+[a-zA-Z0-9_]*$/u';
-+
-+    /**
-+     * Validates the correctness of the attribute code
-+     *
-+     * @param string $attributeCode
-+     * @return bool
-+     * @throws \Zend_Validate_Exception
-+     */
-+    public function isValid($attributeCode): bool
-+    {
-+        $errorMessages = [];
-+        /**
-+         * Check attribute_code for allowed characters
-+         */
-+        if (trim($attributeCode)
-+            && !preg_match(self::VALIDATION_RULE_PATTERN, trim($attributeCode))
-+        ) {
-+            $errorMessages[] = __(
-+                'Attribute code "%1" is invalid. Please use only letters (a-z or A-Z), ' .
-+                'numbers (0-9) or underscore (_) in this field, and the first character should be a letter.',
-+                $attributeCode
-+            );
-+        }
-+
-+        /**
-+         * Check attribute_code for allowed length
-+         */
-+        $minLength = Attribute::ATTRIBUTE_CODE_MIN_LENGTH;
-+        $maxLength = Attribute::ATTRIBUTE_CODE_MAX_LENGTH;
-+        $isAllowedLength = Zend_Validate::is(
-+            trim($attributeCode),
-+            'StringLength',
-+            ['min' => $minLength, 'max' => $maxLength]
-+        );
-+        if (!$isAllowedLength) {
-+            $errorMessages[] = __(
-+                'An attribute code must not be less than %1 and more than %2 characters.',
-+                $minLength,
-+                $maxLength
-+            );
-+        }
-+
-+        /**
-+         * Check attribute_code for prohibited prefix
-+         */
-+        if (strpos($attributeCode, AbstractModifier::CONTAINER_PREFIX) === 0) {
-+            $errorMessages[] = __(
-+                '"%1" prefix is reserved by the system and cannot be used in attribute code names.',
-+                AbstractModifier::CONTAINER_PREFIX
-+            );
-+        }
-+
-+        $this->_addMessages($errorMessages);
-+
-+        return !$this->hasMessages();
-+    }
-+}
-diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
-index 6e81ddc36e9..de285e81b1d 100644
---- a/app/code/Magento/Eav/Setup/EavSetup.php
-+++ b/app/code/Magento/Eav/Setup/EavSetup.php
-@@ -9,13 +9,15 @@ namespace Magento\Eav\Setup;
- use Magento\Eav\Model\Entity\Setup\Context;
- use Magento\Eav\Model\Entity\Setup\PropertyMapperInterface;
- use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
-+use Magento\Eav\Model\Validator\Attribute\Code;
- use Magento\Framework\App\CacheInterface;
- use Magento\Framework\App\ObjectManager;
--use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Setup\ModuleDataSetupInterface;
- 
- /**
-+ * Base eav setup class.
-+ *
-  * @api
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -80,6 +82,11 @@ class EavSetup
-      */
-     private $_defaultAttributeSetName = 'Default';
- 
-+    /**
-+     * @var Code
-+     */
-+    private $attributeCodeValidator;
-+
-     /**
-      * Init
-      *
-@@ -87,21 +94,27 @@ class EavSetup
-      * @param Context $context
-      * @param CacheInterface $cache
-      * @param CollectionFactory $attrGroupCollectionFactory
-+     * @param Code|null $attributeCodeValidator
-      */
-     public function __construct(
-         ModuleDataSetupInterface $setup,
-         Context $context,
-         CacheInterface $cache,
--        CollectionFactory $attrGroupCollectionFactory
-+        CollectionFactory $attrGroupCollectionFactory,
-+        Code $attributeCodeValidator = null
-     ) {
-         $this->cache = $cache;
-         $this->attrGroupCollectionFactory = $attrGroupCollectionFactory;
-         $this->attributeMapper = $context->getAttributeMapper();
-         $this->setup = $setup;
-+        $this->attributeCodeValidator = $attributeCodeValidator ?: ObjectManager::getInstance()->get(
-+            Code::class
-+        );
-     }
- 
-     /**
--     * Gets setup model
-+     * Gets setup model.
-+     *
-      * @deprecated
-      * @return ModuleDataSetupInterface
-      */
-@@ -568,6 +581,8 @@ class EavSetup
-     }
- 
-     /**
-+     * Convert group name to attribute group code.
-+     *
-      * @param string $groupName
-      * @return string
-      * @since 100.1.0
-@@ -774,38 +789,6 @@ class EavSetup
-         return isset($array[$key]) ? $array[$key] : $default;
-     }
- 
--    /**
--     * Validate attribute data before insert into table
--     *
--     * @param  array $data
--     * @return true
--     * @throws LocalizedException
--     */
--    private function _validateAttributeData($data)
--    {
--        $minLength = \Magento\Eav\Model\Entity\Attribute::ATTRIBUTE_CODE_MIN_LENGTH;
--        $maxLength = \Magento\Eav\Model\Entity\Attribute::ATTRIBUTE_CODE_MAX_LENGTH;
--        $attributeCode = isset($data['attribute_code']) ? $data['attribute_code'] : '';
--
--        $isAllowedLength = \Zend_Validate::is(
--            trim($attributeCode),
--            'StringLength',
--            ['min' => $minLength, 'max' => $maxLength]
--        );
--
--        if (!$isAllowedLength) {
--            $errorMessage = __(
--                'An attribute code must not be less than %1 and more than %2 characters.',
--                $minLength,
--                $maxLength
--            );
--
--            throw new LocalizedException($errorMessage);
--        }
--
--        return true;
--    }
--
-     /**
-      * Add attribute to an entity type
-      *
-@@ -815,6 +798,8 @@ class EavSetup
-      * @param string $code
-      * @param array $attr
-      * @return $this
-+     * @throws LocalizedException
-+     * @throws \Zend_Validate_Exception
-      */
-     public function addAttribute($entityTypeId, $code, array $attr)
-     {
-@@ -825,7 +810,7 @@ class EavSetup
-             $this->attributeMapper->map($attr, $entityTypeId)
-         );
- 
--        $this->_validateAttributeData($data);
-+        $this->validateAttributeCode($data);
- 
-         $sortOrder = isset($attr['sort_order']) ? $attr['sort_order'] : null;
-         $attributeId = $this->getAttribute($entityTypeId, $code, 'attribute_id');
-@@ -1063,7 +1048,7 @@ class EavSetup
-                 return $this;
-             }
-         }
--      
-+
-         $attributeId = $this->getAttributeId($entityTypeId, $id);
-         if (false === $attributeId) {
-             throw new LocalizedException(__('Attribute with ID: "%1" does not exist', $id));
-@@ -1546,4 +1531,21 @@ class EavSetup
- 
-         return $this;
-     }
-+
-+    /**
-+     * Validate attribute code.
-+     *
-+     * @param array $data
-+     * @throws LocalizedException
-+     * @throws \Zend_Validate_Exception
-+     */
-+    private function validateAttributeCode(array $data): void
-+    {
-+        $attributeCode = $data['attribute_code'] ?? '';
-+        if (!$this->attributeCodeValidator->isValid($attributeCode)) {
-+            $errorMessage = implode('\n', $this->attributeCodeValidator->getMessages());
-+
-+            throw new LocalizedException(__($errorMessage));
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
-index c89f581daac..2df87c39868 100644
---- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
-+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
-@@ -143,7 +143,7 @@ class ImageTest extends \PHPUnit\Framework\TestCase
-                 'originalValue' => 'value',
-                 'isRequired' => true,
-                 'isAjaxRequest' => false,
--                'rules' => ['max_image_heght' => 2],
-+                'rules' => ['max_image_height' => 2],
-                 'expectedResult' => ['"Label" height exceeds allowed value of 2 px.']
-             ],
-             [
-@@ -151,7 +151,7 @@ class ImageTest extends \PHPUnit\Framework\TestCase
-                 'originalValue' => 'value',
-                 'isRequired' => true,
-                 'isAjaxRequest' => false,
--                'rules' => ['max_image_heght' => 2000],
-+                'rules' => ['max_image_height' => 2000],
-                 'expectedResult' => true
-             ],
-             [
-@@ -159,7 +159,7 @@ class ImageTest extends \PHPUnit\Framework\TestCase
-                 'originalValue' => 'value',
-                 'isRequired' => true,
-                 'isAjaxRequest' => false,
--                'rules' => ['max_image_heght' => 2, 'max_image_width' => 2],
-+                'rules' => ['max_image_height' => 2, 'max_image_width' => 2],
-                 'expectedResult' => [
-                     '"Label" width exceeds allowed value of 2 px.',
-                     '"Label" height exceeds allowed value of 2 px.',
-diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php
-index bbbe712b2bb..785c386b439 100644
---- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php
-+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php
-@@ -6,12 +6,18 @@
- 
- namespace Magento\Eav\Test\Unit\Model\Attribute\Data;
- 
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Stdlib\StringUtils;
-+
-+/**
-+ * Eav text attribute model test
-+ */
- class TextTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-      * @var \Magento\Eav\Model\Attribute\Data\Text
-      */
--    protected $_model;
-+    private $model;
- 
-     /**
-      * {@inheritDoc}
-@@ -21,10 +27,10 @@ class TextTest extends \PHPUnit\Framework\TestCase
-         $locale = $this->createMock(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
-         $localeResolver = $this->createMock(\Magento\Framework\Locale\ResolverInterface::class);
-         $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
--        $helper = $this->createMock(\Magento\Framework\Stdlib\StringUtils::class);
-+        $helper = new StringUtils;
- 
--        $this->_model = new \Magento\Eav\Model\Attribute\Data\Text($locale, $logger, $localeResolver, $helper);
--        $this->_model->setAttribute(
-+        $this->model = new \Magento\Eav\Model\Attribute\Data\Text($locale, $logger, $localeResolver, $helper);
-+        $this->model->setAttribute(
-             $this->createAttribute(
-                 [
-                     'store_label' => 'Test',
-@@ -41,7 +47,7 @@ class TextTest extends \PHPUnit\Framework\TestCase
-      */
-     protected function tearDown()
-     {
--        $this->_model = null;
-+        $this->model = null;
-     }
- 
-     /**
-@@ -51,7 +57,7 @@ class TextTest extends \PHPUnit\Framework\TestCase
-     {
-         $inputValue = '0';
-         $expectedResult = true;
--        $this->assertEquals($expectedResult, $this->_model->validateValue($inputValue));
-+        self::assertEquals($expectedResult, $this->model->validateValue($inputValue));
-     }
- 
-     /**
-@@ -61,8 +67,8 @@ class TextTest extends \PHPUnit\Framework\TestCase
-     {
-         $inputValue = 0;
-         $expectedResult = ['"Test" is a required value.'];
--        $result = $this->_model->validateValue($inputValue);
--        $this->assertEquals($expectedResult, [(string)$result[0]]);
-+        $result = $this->model->validateValue($inputValue);
-+        self::assertEquals($expectedResult, [(string)$result[0]]);
-     }
- 
-     /**
-@@ -79,12 +85,107 @@ class TextTest extends \PHPUnit\Framework\TestCase
-         ];
- 
-         $defaultAttributeData['validate_rules']['min_text_length'] = 2;
--        $this->_model->setAttribute($this->createAttribute($defaultAttributeData));
--        $this->assertEquals($expectedResult, $this->_model->validateValue('t'));
-+        $this->model->setAttribute($this->createAttribute($defaultAttributeData));
-+        self::assertEquals($expectedResult, $this->model->validateValue('t'));
- 
-         $defaultAttributeData['validate_rules']['max_text_length'] = 3;
--        $this->_model->setAttribute($this->createAttribute($defaultAttributeData));
--        $this->assertEquals($expectedResult, $this->_model->validateValue('test'));
-+        $this->model->setAttribute($this->createAttribute($defaultAttributeData));
-+        self::assertEquals($expectedResult, $this->model->validateValue('test'));
-+    }
-+
-+    /**
-+     * Test of alphanumeric validation.
-+     *
-+     * @param {String} $value - provided value
-+     * @param {Boolean|Array} $expectedResult - validation result
-+     * @return void
-+     * @throws LocalizedException
-+     * @dataProvider alphanumDataProvider
-+     */
-+    public function testAlphanumericValidation($value, $expectedResult): void
-+    {
-+        $defaultAttributeData = [
-+            'store_label' => 'Test',
-+            'attribute_code' => 'test',
-+            'is_required' => 1,
-+            'validate_rules' => [
-+                'min_text_length' => 0,
-+                'max_text_length' => 10,
-+                'input_validation' => 'alphanumeric'
-+            ],
-+        ];
-+
-+        $this->model->setAttribute($this->createAttribute($defaultAttributeData));
-+        self::assertEquals($expectedResult, $this->model->validateValue($value));
-+    }
-+
-+    /**
-+     * Provides possible input values.
-+     *
-+     * @return array
-+     */
-+    public function alphanumDataProvider(): array
-+    {
-+        return [
-+            ['QazWsx', true],
-+            ['QazWsx123', true],
-+            ['QazWsx 123',
-+                [\Zend_Validate_Alnum::NOT_ALNUM => '"Test" contains non-alphabetic or non-numeric characters.']
-+            ],
-+            ['QazWsx_123',
-+                [\Zend_Validate_Alnum::NOT_ALNUM => '"Test" contains non-alphabetic or non-numeric characters.']
-+            ],
-+            ['QazWsx12345', [
-+                __('"%1" length must be equal or less than %2 characters.', 'Test', 10)]
-+            ],
-+            [' 12345 ', true],
-+        ];
-+    }
-+
-+    /**
-+     * Test of alphanumeric validation with spaces.
-+     *
-+     * @param {String} $value - provided value
-+     * @param {Boolean|Array} $expectedResult - validation result
-+     * @return void
-+     * @throws LocalizedException
-+     * @dataProvider alphanumWithSpacesDataProvider
-+     */
-+    public function testAlphanumericValidationWithSpaces($value, $expectedResult): void
-+    {
-+        $defaultAttributeData = [
-+            'store_label' => 'Test',
-+            'attribute_code' => 'test',
-+            'is_required' => 1,
-+            'validate_rules' => [
-+                'min_text_length' => 0,
-+                'max_text_length' => 10,
-+                'input_validation' => 'alphanum-with-spaces'
-+            ],
-+        ];
-+
-+        $this->model->setAttribute($this->createAttribute($defaultAttributeData));
-+        self::assertEquals($expectedResult, $this->model->validateValue($value));
-+    }
-+
-+    /**
-+     * Provides possible input values.
-+     *
-+     * @return array
-+     */
-+    public function alphanumWithSpacesDataProvider(): array
-+    {
-+        return [
-+            ['QazWsx', true],
-+            ['QazWsx123', true],
-+            ['QazWsx 123', true],
-+            ['QazWsx_123',
-+                [\Zend_Validate_Alnum::NOT_ALNUM => '"Test" contains non-alphabetic or non-numeric characters.']
-+            ],
-+            ['QazWsx12345', [
-+                __('"%1" length must be equal or less than %2 characters.', 'Test', 10)]
-+            ],
-+        ];
-     }
- 
-     /**
-diff --git a/app/code/Magento/Eav/Test/Unit/Model/AttributeRepositoryTest.php b/app/code/Magento/Eav/Test/Unit/Model/AttributeRepositoryTest.php
-index 548a70e07bf..5b23bdf33a3 100644
---- a/app/code/Magento/Eav/Test/Unit/Model/AttributeRepositoryTest.php
-+++ b/app/code/Magento/Eav/Test/Unit/Model/AttributeRepositoryTest.php
-@@ -124,8 +124,13 @@ class AttributeRepositoryTest extends \PHPUnit\Framework\TestCase
-         $collectionSize = 1;
- 
-         $searchCriteriaMock = $this->getMockBuilder(SearchCriteriaInterface::class)
-+            ->setMethods(['getPageSize'])
-             ->getMockForAbstractClass();
- 
-+        $searchCriteriaMock->expects($this->any())
-+            ->method('getPageSize')
-+            ->willReturn($collectionSize);
-+
-         $attributeMock = $this->createAttributeMock($attributeCode, $attributeId);
- 
-         $attributeCollectionMock = $this->getMockBuilder(Collection::class)
-diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
-index a61c9ef4474..fd4f7472b2f 100644
---- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
-+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Eav\Test\Unit\Model\Entity\Attribute\Frontend;
- 
- use Magento\Eav\Model\Entity\Attribute\Frontend\DefaultFrontend;
-@@ -13,43 +15,44 @@ use Magento\Store\Api\Data\StoreInterface;
- use Magento\Framework\App\CacheInterface;
- use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
- use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
-+use PHPUnit\Framework\MockObject\MockObject;
- 
- class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-      * @var DefaultFrontend
-      */
--    protected $model;
-+    private $model;
- 
-     /**
--     * @var BooleanFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var BooleanFactory | MockObject
-      */
--    protected $booleanFactory;
-+    private $booleanFactory;
- 
-     /**
--     * @var Serializer|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Serializer| MockObject
-      */
--    private $serializerMock;
-+    private $serializer;
- 
-     /**
--     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var StoreManagerInterface | MockObject
-      */
--    private $storeManagerMock;
-+    private $storeManager;
- 
-     /**
--     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var StoreInterface | MockObject
-      */
--    private $storeMock;
-+    private $store;
- 
-     /**
--     * @var CacheInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var CacheInterface | MockObject
-      */
--    private $cacheMock;
-+    private $cache;
- 
-     /**
--     * @var AbstractAttribute|\PHPUnit_Framework_MockObject_MockObject
-+     * @var AbstractAttribute | MockObject
-      */
--    private $attributeMock;
-+    private $attribute;
- 
-     /**
-      * @var array
-@@ -57,10 +60,13 @@ class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
-     private $cacheTags;
- 
-     /**
--     * @var AbstractSource|\PHPUnit_Framework_MockObject_MockObject
-+     * @var AbstractSource | MockObject
-      */
--    private $sourceMock;
-+    private $source;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->cacheTags = ['tag1', 'tag2'];
-@@ -68,111 +74,108 @@ class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
-         $this->booleanFactory = $this->getMockBuilder(BooleanFactory::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->serializerMock = $this->getMockBuilder(Serializer::class)
-+        $this->serializer = $this->getMockBuilder(Serializer::class)
-             ->getMock();
--        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
-+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
-             ->getMockForAbstractClass();
--        $this->storeMock = $this->getMockBuilder(StoreInterface::class)
-+        $this->store = $this->getMockBuilder(StoreInterface::class)
-             ->getMockForAbstractClass();
--        $this->cacheMock = $this->getMockBuilder(CacheInterface::class)
-+        $this->cache = $this->getMockBuilder(CacheInterface::class)
-             ->getMockForAbstractClass();
--        $this->attributeMock = $this->getMockBuilder(AbstractAttribute::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getAttributeCode', 'getSource'])
--            ->getMockForAbstractClass();
--        $this->sourceMock = $this->getMockBuilder(AbstractSource::class)
-+        $this->attribute = $this->createAttribute();
-+        $this->source = $this->getMockBuilder(AbstractSource::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['getAllOptions'])
-             ->getMockForAbstractClass();
- 
--        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--        $this->model = $objectManager->getObject(
--            DefaultFrontend::class,
--            [
--                '_attrBooleanFactory' => $this->booleanFactory,
--                'cache' => $this->cacheMock,
--                'storeManager' => $this->storeManagerMock,
--                'serializer' => $this->serializerMock,
--                '_attribute' => $this->attributeMock,
--                'cacheTags' => $this->cacheTags
--            ]
-+        $this->model = new DefaultFrontend(
-+            $this->booleanFactory,
-+            $this->cache,
-+            null,
-+            $this->cacheTags,
-+            $this->storeManager,
-+            $this->serializer
-         );
-+
-+        $this->model->setAttribute($this->attribute);
-     }
- 
-     public function testGetClassEmpty()
-     {
--        $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
--            ->disableOriginalConstructor()
--            ->setMethods([
--                'getIsRequired',
--                'getFrontendClass',
--                'getValidateRules',
--            ])
--            ->getMock();
--        $attributeMock->expects($this->once())
--            ->method('getIsRequired')
-+        /** @var AbstractAttribute | MockObject $attribute */
-+        $attribute = $this->createAttribute();
-+        $attribute->method('getIsRequired')
-             ->willReturn(false);
--        $attributeMock->expects($this->once())
--            ->method('getFrontendClass')
-+        $attribute->method('getFrontendClass')
-             ->willReturn('');
--        $attributeMock->expects($this->exactly(2))
-+        $attribute->expects($this->exactly(2))
-             ->method('getValidateRules')
-             ->willReturn('');
- 
--        $this->model->setAttribute($attributeMock);
--        $this->assertEmpty($this->model->getClass());
-+        $this->model->setAttribute($attribute);
-+
-+        self::assertEmpty($this->model->getClass());
-     }
- 
--    public function testGetClass()
-+    /**
-+     * Validates generated html classes.
-+     *
-+     * @param String $validationRule
-+     * @param String $expectedClass
-+     * @return void
-+     * @dataProvider validationRulesDataProvider
-+     */
-+    public function testGetClass(String $validationRule, String $expectedClass): void
-     {
--        $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
--            ->disableOriginalConstructor()
--            ->setMethods([
--                'getIsRequired',
--                'getFrontendClass',
--                'getValidateRules',
--            ])
--            ->getMock();
--        $attributeMock->expects($this->once())
--            ->method('getIsRequired')
-+        /** @var AbstractAttribute | MockObject $attribute */
-+        $attribute = $this->createAttribute();
-+        $attribute->method('getIsRequired')
-             ->willReturn(true);
--        $attributeMock->expects($this->once())
--            ->method('getFrontendClass')
-+        $attribute->method('getFrontendClass')
-             ->willReturn('');
--        $attributeMock->expects($this->exactly(3))
-+        $attribute->expects($this->exactly(3))
-             ->method('getValidateRules')
-             ->willReturn([
--                'input_validation' => 'alphanumeric',
-+                'input_validation' => $validationRule,
-                 'min_text_length' => 1,
-                 'max_text_length' => 2,
-             ]);
- 
--        $this->model->setAttribute($attributeMock);
-+        $this->model->setAttribute($attribute);
-         $result = $this->model->getClass();
- 
--        $this->assertContains('validate-alphanum', $result);
--        $this->assertContains('minimum-length-1', $result);
--        $this->assertContains('maximum-length-2', $result);
--        $this->assertContains('validate-length', $result);
-+        self::assertContains($expectedClass, $result);
-+        self::assertContains('minimum-length-1', $result);
-+        self::assertContains('maximum-length-2', $result);
-+        self::assertContains('validate-length', $result);
-+    }
-+
-+    /**
-+     * Provides possible validation types.
-+     *
-+     * @return array
-+     */
-+    public function validationRulesDataProvider(): array
-+    {
-+        return [
-+            ['alphanumeric', 'validate-alphanum'],
-+            ['alphanum-with-spaces', 'validate-alphanum-with-spaces'],
-+            ['alpha', 'validate-alpha'],
-+            ['numeric', 'validate-digits'],
-+            ['url', 'validate-url'],
-+            ['email', 'validate-email'],
-+            ['length', 'validate-length']
-+        ];
-     }
- 
-     public function testGetClassLength()
-     {
--        $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
--            ->disableOriginalConstructor()
--            ->setMethods([
--                'getIsRequired',
--                'getFrontendClass',
--                'getValidateRules',
--            ])
--            ->getMock();
--        $attributeMock->expects($this->once())
--            ->method('getIsRequired')
-+        $attribute = $this->createAttribute();
-+        $attribute->method('getIsRequired')
-             ->willReturn(true);
--        $attributeMock->expects($this->once())
--            ->method('getFrontendClass')
-+        $attribute->method('getFrontendClass')
-             ->willReturn('');
--        $attributeMock->expects($this->exactly(3))
-+        $attribute->expects($this->exactly(3))
-             ->method('getValidateRules')
-             ->willReturn([
-                 'input_validation' => 'length',
-@@ -180,12 +183,31 @@ class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
-                 'max_text_length' => 2,
-             ]);
- 
--        $this->model->setAttribute($attributeMock);
-+        $this->model->setAttribute($attribute);
-         $result = $this->model->getClass();
- 
--        $this->assertContains('minimum-length-1', $result);
--        $this->assertContains('maximum-length-2', $result);
--        $this->assertContains('validate-length', $result);
-+        self::assertContains('minimum-length-1', $result);
-+        self::assertContains('maximum-length-2', $result);
-+        self::assertContains('validate-length', $result);
-+    }
-+
-+    /**
-+     * Entity attribute factory.
-+     *
-+     * @return AbstractAttribute | MockObject
-+     */
-+    private function createAttribute()
-+    {
-+        return $this->getMockBuilder(AbstractAttribute::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods([
-+                'getIsRequired',
-+                'getFrontendClass',
-+                'getValidateRules',
-+                'getAttributeCode',
-+                'getSource'
-+            ])
-+            ->getMockForAbstractClass();
-     }
- 
-     public function testGetSelectOptions()
-@@ -196,33 +218,25 @@ class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
-         $options = ['option1', 'option2'];
-         $serializedOptions = "{['option1', 'option2']}";
- 
--        $this->storeManagerMock->expects($this->once())
--            ->method('getStore')
--            ->willReturn($this->storeMock);
--        $this->storeMock->expects($this->once())
--            ->method('getId')
-+        $this->storeManager->method('getStore')
-+            ->willReturn($this->store);
-+        $this->store->method('getId')
-             ->willReturn($storeId);
--        $this->attributeMock->expects($this->once())
--            ->method('getAttributeCode')
-+        $this->attribute->method('getAttributeCode')
-             ->willReturn($attributeCode);
--        $this->cacheMock->expects($this->once())
--            ->method('load')
-+        $this->cache->method('load')
-             ->with($cacheKey)
-             ->willReturn(false);
--        $this->attributeMock->expects($this->once())
--            ->method('getSource')
--            ->willReturn($this->sourceMock);
--        $this->sourceMock->expects($this->once())
--            ->method('getAllOptions')
-+        $this->attribute->method('getSource')
-+            ->willReturn($this->source);
-+        $this->source->method('getAllOptions')
-             ->willReturn($options);
--        $this->serializerMock->expects($this->once())
--            ->method('serialize')
-+        $this->serializer->method('serialize')
-             ->with($options)
-             ->willReturn($serializedOptions);
--        $this->cacheMock->expects($this->once())
--            ->method('save')
-+        $this->cache->method('save')
-             ->with($serializedOptions, $cacheKey, $this->cacheTags);
- 
--        $this->assertSame($options, $this->model->getSelectOptions());
-+        self::assertSame($options, $this->model->getSelectOptions());
-     }
- }
-diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
-index d4c91e98d96..1584b922aba 100644
---- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
-+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
-@@ -40,6 +40,7 @@ class GroupTest extends \PHPUnit\Framework\TestCase
-             'resource' => $this->resourceMock,
-             'translitFilter' => $translitFilter,
-             'context' => $contextMock,
-+            'reservedSystemNames' => ['configurable'],
-         ];
-         $objectManager = new ObjectManager($this);
-         $this->model = $objectManager->getObject(
-@@ -67,6 +68,8 @@ class GroupTest extends \PHPUnit\Framework\TestCase
-     {
-         return [
-             ['General Group', 'general-group'],
-+            ['configurable', md5('configurable')],
-+            ['configurAble', md5('configurable')],
-             ['///', md5('///')],
-         ];
-     }
-diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
-index 2ae31a05d95..b63a4dd2c9a 100644
---- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
-+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
-@@ -59,13 +59,13 @@ class OptionManagementTest extends \PHPUnit\Framework\TestCase
-         $labelMock = $this->createMock(\Magento\Eav\Api\Data\AttributeOptionLabelInterface::class);
-         $option =
-             ['value' => [
--                'new_option' => [
-+                'id_new_option' => [
-                     0 => 'optionLabel',
-                     42 => 'labelLabel',
-                 ],
-             ],
-             'order' => [
--                'new_option' => 'optionSortOrder',
-+                'id_new_option' => 'optionSortOrder',
-             ],
-             ];
- 
-@@ -78,10 +78,10 @@ class OptionManagementTest extends \PHPUnit\Framework\TestCase
-         $labelMock->expects($this->once())->method('getStoreId')->willReturn(42);
-         $labelMock->expects($this->once())->method('getLabel')->willReturn('labelLabel');
-         $optionMock->expects($this->once())->method('getIsDefault')->willReturn(true);
--        $attributeMock->expects($this->once())->method('setDefault')->with(['new_option']);
-+        $attributeMock->expects($this->once())->method('setDefault')->with(['id_new_option']);
-         $attributeMock->expects($this->once())->method('setOption')->with($option);
-         $this->resourceModelMock->expects($this->once())->method('save')->with($attributeMock);
--        $this->assertEquals('new_option', $this->model->add($entityType, $attributeCode, $optionMock));
-+        $this->assertEquals('id_new_option', $this->model->add($entityType, $attributeCode, $optionMock));
-     }
- 
-     /**
-@@ -167,13 +167,13 @@ class OptionManagementTest extends \PHPUnit\Framework\TestCase
-         $labelMock = $this->createMock(\Magento\Eav\Api\Data\AttributeOptionLabelInterface::class);
-         $option =
-             ['value' => [
--                'new_option' => [
-+                'id_new_option' => [
-                     0 => 'optionLabel',
-                     42 => 'labelLabel',
-                 ],
-             ],
-                 'order' => [
--                    'new_option' => 'optionSortOrder',
-+                    'id_new_option' => 'optionSortOrder',
-                 ],
-             ];
- 
-@@ -186,7 +186,7 @@ class OptionManagementTest extends \PHPUnit\Framework\TestCase
-         $labelMock->expects($this->once())->method('getStoreId')->willReturn(42);
-         $labelMock->expects($this->once())->method('getLabel')->willReturn('labelLabel');
-         $optionMock->expects($this->once())->method('getIsDefault')->willReturn(true);
--        $attributeMock->expects($this->once())->method('setDefault')->with(['new_option']);
-+        $attributeMock->expects($this->once())->method('setDefault')->with(['id_new_option']);
-         $attributeMock->expects($this->once())->method('setOption')->with($option);
-         $this->resourceModelMock->expects($this->once())->method('save')->with($attributeMock)
-             ->willThrowException(new \Exception());
-diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
-index ee972c27aa8..8cf5df877a6 100644
---- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
-+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
-@@ -101,13 +101,13 @@ class BooleanTest extends \PHPUnit\Framework\TestCase
-                 'expectedJoinCondition' => [
-                     0 => [
-                         'requisites' => ['code_t1' => "table"],
--                        'condition' =>
--                            "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
-+                        'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123'"
-+                            . " AND code_t1.store_id='0'",
-                     ],
-                     1 => [
-                         'requisites' => ['code_t2' => "table"],
--                        'condition' =>
--                            "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
-+                        'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123'"
-+                            . " AND code_t2.store_id='12'",
-                     ],
-                 ],
-                 'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) ASC',
-@@ -118,13 +118,13 @@ class BooleanTest extends \PHPUnit\Framework\TestCase
-                 'expectedJoinCondition' => [
-                     0 => [
-                         'requisites' => ['code_t1' => "table"],
--                        'condition' =>
--                            "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
-+                        'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123'"
-+                            . " AND code_t1.store_id='0'",
-                     ],
-                     1 => [
-                         'requisites' => ['code_t2' => "table"],
--                        'condition' =>
--                            "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
-+                        'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123'"
-+                            . " AND code_t2.store_id='12'",
-                     ],
-                 ],
-                 'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) DESC',
-@@ -135,8 +135,8 @@ class BooleanTest extends \PHPUnit\Framework\TestCase
-                 'expectedJoinCondition' => [
-                     0 => [
-                         'requisites' => ['code_t' => "table"],
--                        'condition' =>
--                            "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
-+                        'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123'"
-+                            . " AND code_t.store_id='0'",
-                     ],
-                 ],
-                 'expectedOrder' => 'code_t.value DESC',
-@@ -147,8 +147,8 @@ class BooleanTest extends \PHPUnit\Framework\TestCase
-                 'expectedJoinCondition' => [
-                     0 => [
-                         'requisites' => ['code_t' => "table"],
--                        'condition' =>
--                            "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
-+                        'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123'"
-+                            . " AND code_t.store_id='0'",
-                     ],
-                 ],
-                 'expectedOrder' => 'code_t.value ASC',
-diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php
-index 911aecf8e7c..402497a1379 100644
---- a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php
-+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Eav\Test\Unit\Model\Entity;
- 
-+/**
-+ * Class AttributeTest.
-+ */
- class AttributeTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -13,11 +16,17 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $_model;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->_model = $this->createPartialMock(\Magento\Eav\Model\Entity\Attribute::class, ['__wakeup']);
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function tearDown()
-     {
-         $this->_model = null;
-@@ -27,6 +36,7 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
-      * @param string $givenFrontendInput
-      * @param string $expectedBackendType
-      * @dataProvider dataGetBackendTypeByInput
-+     * @return void
-      */
-     public function testGetBackendTypeByInput($givenFrontendInput, $expectedBackendType)
-     {
-@@ -112,4 +122,43 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
-             ]
-         ];
-     }
-+
-+    /**
-+     * return void
-+     */
-+    public function testGetFrontendLabels()
-+    {
-+        $attributeId = 1;
-+        $storeLabels = ['test_attribute_store1'];
-+        $frontendLabelFactory = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\FrontendLabelFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $resource = $this->getMockBuilder(\Magento\Eav\Model\ResourceModel\Entity\Attribute::class)
-+            ->setMethods(['getStoreLabelsByAttributeId'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $arguments = [
-+            '_resource' => $resource,
-+            'frontendLabelFactory' => $frontendLabelFactory,
-+        ];
-+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $this->_model = $objectManager->getObject(\Magento\Eav\Model\Entity\Attribute::class, $arguments);
-+        $this->_model->setAttributeId($attributeId);
-+
-+        $resource->expects($this->once())
-+            ->method('getStoreLabelsByAttributeId')
-+            ->with($attributeId)
-+            ->willReturn($storeLabels);
-+        $frontendLabel = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\FrontendLabel::class)
-+            ->setMethods(['setStoreId', 'setLabel'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $frontendLabelFactory->expects($this->once())
-+            ->method('create')
-+            ->willReturn($frontendLabel);
-+        $expectedFrontendLabel[] = $frontendLabel;
-+
-+        $this->assertEquals($expectedFrontendLabel, $this->_model->getFrontendLabels());
-+    }
- }
-diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/GetCustomAttributeCodesTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/GetCustomAttributeCodesTest.php
-deleted file mode 100644
-index 0ba247e1fbb..00000000000
---- a/app/code/Magento/Eav/Test/Unit/Model/Entity/GetCustomAttributeCodesTest.php
-+++ /dev/null
-@@ -1,59 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Eav\Test\Unit\Model\Entity;
--
--use Magento\Eav\Model\Entity\GetCustomAttributeCodes;
--use Magento\Framework\Api\MetadataObjectInterface;
--use Magento\Framework\Api\MetadataServiceInterface;
--use PHPUnit\Framework\TestCase;
--
--/**
-- * Provide tests for GetCustomAttributeCodes entity model.
-- */
--class GetCustomAttributeCodesTest extends TestCase
--{
--    /**
--     * Test subject.
--     *
--     * @var GetCustomAttributeCodes
--     */
--    private $getCustomAttributeCodes;
--
--    /**
--     * @inheritdoc
--     */
--    protected function setUp()
--    {
--        $this->getCustomAttributeCodes = new GetCustomAttributeCodes();
--    }
--
--    /**
--     * Test GetCustomAttributeCodes::execute() will return attribute codes from attributes metadata.
--     *
--     * @return void
--     */
--    public function testExecute()
--    {
--        $attributeCode = 'testCode';
--        $attributeMetadata = $this->getMockBuilder(MetadataObjectInterface::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getAttributeCode'])
--            ->getMockForAbstractClass();
--        $attributeMetadata->expects($this->once())
--            ->method('getAttributeCode')
--            ->willReturn($attributeCode);
--        /** @var MetadataServiceInterface|\PHPUnit_Framework_MockObject_MockObject $metadataService */
--        $metadataService = $this->getMockBuilder(MetadataServiceInterface::class)
--            ->setMethods(['getCustomAttributesMetadata'])
--            ->disableOriginalConstructor()
--            ->getMockForAbstractClass();
--        $metadataService->expects($this->once())
--            ->method('getCustomAttributesMetadata')
--            ->willReturn([$attributeMetadata]);
--        $this->assertEquals([$attributeCode], $this->getCustomAttributeCodes->execute($metadataService));
--    }
--}
-diff --git a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
-index eba73fa38d8..82e9033496b 100644
---- a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
-+++ b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
-@@ -110,7 +110,7 @@ class ReadHandlerTest extends \PHPUnit\Framework\TestCase
-         $attributeMock->method('getAttributeCode')
-             ->willReturn('attributeCode');
-         $this->configMock->expects($this->exactly($callNum))
--            ->method('getAttributes')
-+            ->method('getEntityAttributes')
-             ->willReturn([$attributeMock]);
-         $this->assertEquals($expected, $this->readHandler->execute('entity_type', $entityData));
-     }
-diff --git a/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/CodeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/CodeTest.php
-new file mode 100644
-index 00000000000..7216fad0ae7
---- /dev/null
-+++ b/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/CodeTest.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/**
-+ * Test for \Magento\Eav\Model\Validator\Attribute\Code
-+ */
-+namespace Magento\Eav\Test\Unit\Model\Validator\Attribute;
-+
-+use Magento\Eav\Model\Validator\Attribute\Code;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Class CodeTest
-+ */
-+class CodeTest extends TestCase
-+{
-+    /**
-+     * Testing \Magento\Eav\Model\Validator\Attribute\Code::isValid
-+     *
-+     * @dataProvider isValidDataProvider
-+     * @param string $attributeCode
-+     * @param bool $expected
-+     * @throws \Zend_Validate_Exception
-+     */
-+    public function testIsValid(string $attributeCode, bool $expected): void
-+    {
-+        $validator = new Code();
-+        $this->assertEquals($expected, $validator->isValid($attributeCode));
-+    }
-+
-+    /**
-+     * Data provider for testIsValid
-+     *
-+     * @return array
-+     */
-+    public function isValidDataProvider(): array
-+    {
-+        return [
-+            [
-+                'Attribute_code',
-+                true
-+            ], [
-+                'attribute_1',
-+                true
-+            ],[
-+                'Attribute_1',
-+                true
-+            ], [
-+                '_attribute_code',
-+                false
-+            ], [
-+                'attribute.code',
-+                false
-+            ], [
-+                '1attribute_code',
-+                false
-+            ], [
-+                'more_than_60_chars_more_than_60_chars_more_than_60_chars_more',
-+                false
-+            ], [
-+                'container_attribute',
-+                false,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Eav/etc/db_schema.xml b/app/code/Magento/Eav/etc/db_schema.xml
-index f930321e525..b6c42d725e5 100644
---- a/app/code/Magento/Eav/etc/db_schema.xml
-+++ b/app/code/Magento/Eav/etc/db_schema.xml
-@@ -15,7 +15,7 @@
-         <column xsi:type="varchar" name="attribute_model" nullable="true" length="255" comment="Attribute Model"/>
-         <column xsi:type="varchar" name="entity_table" nullable="true" length="255" comment="Entity Table"/>
-         <column xsi:type="varchar" name="value_table_prefix" nullable="true" length="255" comment="Value Table Prefix"/>
--        <column xsi:type="varchar" name="entity_id_field" nullable="true" length="255" comment="Entity Id Field"/>
-+        <column xsi:type="varchar" name="entity_id_field" nullable="true" length="255" comment="Entity ID Field"/>
-         <column xsi:type="smallint" name="is_data_sharing" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="1" comment="Defines Is Data Sharing"/>
-         <column xsi:type="varchar" name="data_sharing_key" nullable="true" length="100" default="default"
-@@ -33,16 +33,16 @@
-                 comment="Additional Attribute Table"/>
-         <column xsi:type="varchar" name="entity_attribute_collection" nullable="true" length="255"
-                 comment="Entity Attribute Collection"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_type_id"/>
-         </constraint>
--        <index name="EAV_ENTITY_TYPE_ENTITY_TYPE_CODE" indexType="btree">
-+        <index referenceId="EAV_ENTITY_TYPE_ENTITY_TYPE_CODE" indexType="btree">
-             <column name="entity_type_code"/>
-         </index>
-     </table>
-     <table name="eav_entity" resource="default" engine="innodb" comment="Eav Entity">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Entity Type Id"/>
-         <column xsi:type="smallint" name="attribute_set_id" padding="5" unsigned="true" nullable="false"
-@@ -58,18 +58,18 @@
-                 comment="Updated At"/>
-         <column xsi:type="smallint" name="is_active" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="1" comment="Defines Is Entity Active"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-                     table="eav_entity" column="entity_type_id" referenceTable="eav_entity_type"
-                     referenceColumn="entity_type_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_STORE_ID_STORE_STORE_ID" table="eav_entity" column="store_id"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_STORE_ID_STORE_STORE_ID" table="eav_entity" column="store_id"
-                     referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <index name="EAV_ENTITY_ENTITY_TYPE_ID" indexType="btree">
-+        <index referenceId="EAV_ENTITY_ENTITY_TYPE_ID" indexType="btree">
-             <column name="entity_type_id"/>
-         </index>
--        <index name="EAV_ENTITY_STORE_ID" indexType="btree">
-+        <index referenceId="EAV_ENTITY_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -83,32 +83,32 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store Id"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Attribute Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_DATETIME_ENTITY_ID_EAV_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_DATETIME_ENTITY_ID_EAV_ENTITY_ENTITY_ID"
-                     table="eav_entity_datetime" column="entity_id" referenceTable="eav_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ENTT_DTIME_ENTT_TYPE_ID_EAV_ENTT_TYPE_ENTT_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTT_DTIME_ENTT_TYPE_ID_EAV_ENTT_TYPE_ENTT_TYPE_ID"
-                     table="eav_entity_datetime" column="entity_type_id" referenceTable="eav_entity_type"
-                     referenceColumn="entity_type_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID" table="eav_entity_datetime"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID" table="eav_entity_datetime"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="EAV_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="EAV_ENTITY_DATETIME_STORE_ID" indexType="btree">
-+        <index referenceId="EAV_ENTITY_DATETIME_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="EAV_ENTITY_DATETIME_ATTRIBUTE_ID_VALUE" indexType="btree">
-+        <index referenceId="EAV_ENTITY_DATETIME_ATTRIBUTE_ID_VALUE" indexType="btree">
-             <column name="attribute_id"/>
-             <column name="value"/>
-         </index>
--        <index name="EAV_ENTITY_DATETIME_ENTITY_TYPE_ID_VALUE" indexType="btree">
-+        <index referenceId="EAV_ENTITY_DATETIME_ENTITY_TYPE_ID_VALUE" indexType="btree">
-             <column name="entity_type_id"/>
-             <column name="value"/>
-         </index>
-@@ -123,33 +123,33 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store Id"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-                 comment="Attribute Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_DECIMAL_ENTITY_ID_EAV_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_DECIMAL_ENTITY_ID_EAV_ENTITY_ENTITY_ID"
-                     table="eav_entity_decimal" column="entity_id" referenceTable="eav_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_DECIMAL_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_DECIMAL_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-                     table="eav_entity_decimal" column="entity_type_id" referenceTable="eav_entity_type"
-                     referenceColumn="entity_type_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID" table="eav_entity_decimal"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID" table="eav_entity_decimal"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="EAV_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="EAV_ENTITY_DECIMAL_STORE_ID" indexType="btree">
-+        <index referenceId="EAV_ENTITY_DECIMAL_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="EAV_ENTITY_DECIMAL_ATTRIBUTE_ID_VALUE" indexType="btree">
-+        <index referenceId="EAV_ENTITY_DECIMAL_ATTRIBUTE_ID_VALUE" indexType="btree">
-             <column name="attribute_id"/>
-             <column name="value"/>
-         </index>
--        <index name="EAV_ENTITY_DECIMAL_ENTITY_TYPE_ID_VALUE" indexType="btree">
-+        <index referenceId="EAV_ENTITY_DECIMAL_ENTITY_TYPE_ID_VALUE" indexType="btree">
-             <column name="entity_type_id"/>
-             <column name="value"/>
-         </index>
-@@ -164,32 +164,32 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store Id"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="false" identity="false" default="0"
-                 comment="Attribute Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_INT_ENTITY_ID_EAV_ENTITY_ENTITY_ID" table="eav_entity_int"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_INT_ENTITY_ID_EAV_ENTITY_ENTITY_ID" table="eav_entity_int"
-                     column="entity_id" referenceTable="eav_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_INT_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_INT_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-                     table="eav_entity_int" column="entity_type_id" referenceTable="eav_entity_type"
-                     referenceColumn="entity_type_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_INT_STORE_ID_STORE_STORE_ID" table="eav_entity_int"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_INT_STORE_ID_STORE_STORE_ID" table="eav_entity_int"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="EAV_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="EAV_ENTITY_INT_STORE_ID" indexType="btree">
-+        <index referenceId="EAV_ENTITY_INT_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="EAV_ENTITY_INT_ATTRIBUTE_ID_VALUE" indexType="btree">
-+        <index referenceId="EAV_ENTITY_INT_ATTRIBUTE_ID_VALUE" indexType="btree">
-             <column name="attribute_id"/>
-             <column name="value"/>
-         </index>
--        <index name="EAV_ENTITY_INT_ENTITY_TYPE_ID_VALUE" indexType="btree">
-+        <index referenceId="EAV_ENTITY_INT_ENTITY_TYPE_ID_VALUE" indexType="btree">
-             <column name="entity_type_id"/>
-             <column name="value"/>
-         </index>
-@@ -204,30 +204,30 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store Id"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="text" name="value" nullable="false" comment="Attribute Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_TEXT_ENTITY_ID_EAV_ENTITY_ENTITY_ID" table="eav_entity_text"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_TEXT_ENTITY_ID_EAV_ENTITY_ENTITY_ID" table="eav_entity_text"
-                     column="entity_id" referenceTable="eav_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_TEXT_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_TEXT_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-                     table="eav_entity_text" column="entity_type_id" referenceTable="eav_entity_type"
-                     referenceColumn="entity_type_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_TEXT_STORE_ID_STORE_STORE_ID" table="eav_entity_text"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_TEXT_STORE_ID_STORE_STORE_ID" table="eav_entity_text"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="EAV_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="EAV_ENTITY_TEXT_ENTITY_TYPE_ID" indexType="btree">
-+        <index referenceId="EAV_ENTITY_TEXT_ENTITY_TYPE_ID" indexType="btree">
-             <column name="entity_type_id"/>
-         </index>
--        <index name="EAV_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="EAV_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
--        <index name="EAV_ENTITY_TEXT_STORE_ID" indexType="btree">
-+        <index referenceId="EAV_ENTITY_TEXT_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -241,32 +241,32 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store Id"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Attribute Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_VARCHAR_ENTITY_ID_EAV_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_VARCHAR_ENTITY_ID_EAV_ENTITY_ENTITY_ID"
-                     table="eav_entity_varchar" column="entity_id" referenceTable="eav_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_VARCHAR_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_VARCHAR_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-                     table="eav_entity_varchar" column="entity_type_id" referenceTable="eav_entity_type"
-                     referenceColumn="entity_type_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID" table="eav_entity_varchar"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID" table="eav_entity_varchar"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="EAV_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
-             <column name="entity_id"/>
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="EAV_ENTITY_VARCHAR_STORE_ID" indexType="btree">
-+        <index referenceId="EAV_ENTITY_VARCHAR_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="EAV_ENTITY_VARCHAR_ATTRIBUTE_ID_VALUE" indexType="btree">
-+        <index referenceId="EAV_ENTITY_VARCHAR_ATTRIBUTE_ID_VALUE" indexType="btree">
-             <column name="attribute_id"/>
-             <column name="value"/>
-         </index>
--        <index name="EAV_ENTITY_VARCHAR_ENTITY_TYPE_ID_VALUE" indexType="btree">
-+        <index referenceId="EAV_ENTITY_VARCHAR_ENTITY_TYPE_ID_VALUE" indexType="btree">
-             <column name="entity_type_id"/>
-             <column name="value"/>
-         </index>
-@@ -295,13 +295,13 @@
-         <column xsi:type="smallint" name="is_unique" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Defines Is Unique"/>
-         <column xsi:type="varchar" name="note" nullable="true" length="255" comment="Note"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="attribute_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ATTRIBUTE_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-                     table="eav_attribute" column="entity_type_id" referenceTable="eav_entity_type"
-                     referenceColumn="entity_type_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="EAV_ATTRIBUTE_ENTITY_TYPE_ID_ATTRIBUTE_CODE">
-+        <constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_ENTITY_TYPE_ID_ATTRIBUTE_CODE">
-             <column name="entity_type_id"/>
-             <column name="attribute_code"/>
-         </constraint>
-@@ -315,18 +315,18 @@
-                 default="0" comment="Store Id"/>
-         <column xsi:type="varchar" name="increment_prefix" nullable="true" length="20" comment="Increment Prefix"/>
-         <column xsi:type="varchar" name="increment_last_id" nullable="true" length="50" comment="Last Incremented Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_store_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_STORE_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_STORE_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-                     table="eav_entity_store" column="entity_type_id" referenceTable="eav_entity_type"
-                     referenceColumn="entity_type_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_STORE_STORE_ID_STORE_STORE_ID" table="eav_entity_store"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_STORE_STORE_ID_STORE_STORE_ID" table="eav_entity_store"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <index name="EAV_ENTITY_STORE_ENTITY_TYPE_ID" indexType="btree">
-+        <index referenceId="EAV_ENTITY_STORE_ENTITY_TYPE_ID" indexType="btree">
-             <column name="entity_type_id"/>
-         </index>
--        <index name="EAV_ENTITY_STORE_STORE_ID" indexType="btree">
-+        <index referenceId="EAV_ENTITY_STORE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -338,17 +338,17 @@
-         <column xsi:type="varchar" name="attribute_set_name" nullable="true" length="255" comment="Attribute Set Name"/>
-         <column xsi:type="smallint" name="sort_order" padding="6" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Sort Order"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="attribute_set_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ATTRIBUTE_SET_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_SET_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
-                     table="eav_attribute_set" column="entity_type_id" referenceTable="eav_entity_type"
-                     referenceColumn="entity_type_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="EAV_ATTRIBUTE_SET_ENTITY_TYPE_ID_ATTRIBUTE_SET_NAME">
-+        <constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_SET_ENTITY_TYPE_ID_ATTRIBUTE_SET_NAME">
-             <column name="entity_type_id"/>
-             <column name="attribute_set_name"/>
-         </constraint>
--        <index name="EAV_ATTRIBUTE_SET_ENTITY_TYPE_ID_SORT_ORDER" indexType="btree">
-+        <index referenceId="EAV_ATTRIBUTE_SET_ENTITY_TYPE_ID_SORT_ORDER" indexType="btree">
-             <column name="entity_type_id"/>
-             <column name="sort_order"/>
-         </index>
-@@ -367,21 +367,21 @@
-         <column xsi:type="varchar" name="attribute_group_code" nullable="false" length="255"
-                 comment="Attribute Group Code"/>
-         <column xsi:type="varchar" name="tab_group_code" nullable="true" length="255" comment="Tab Group Code"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="attribute_group_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ATTR_GROUP_ATTR_SET_ID_EAV_ATTR_SET_ATTR_SET_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ATTR_GROUP_ATTR_SET_ID_EAV_ATTR_SET_ATTR_SET_ID"
-                     table="eav_attribute_group" column="attribute_set_id" referenceTable="eav_attribute_set"
-                     referenceColumn="attribute_set_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_NAME">
-+        <constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_NAME">
-             <column name="attribute_set_id"/>
-             <column name="attribute_group_name"/>
-         </constraint>
--        <constraint xsi:type="unique" name="EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_CODE">
-+        <constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_CODE">
-             <column name="attribute_set_id"/>
-             <column name="attribute_group_code"/>
-         </constraint>
--        <index name="EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_SORT_ORDER" indexType="btree">
-+        <index referenceId="EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_SORT_ORDER" indexType="btree">
-             <column name="attribute_set_id"/>
-             <column name="sort_order"/>
-         </index>
-@@ -399,28 +399,28 @@
-                 default="0" comment="Attribute Id"/>
-         <column xsi:type="smallint" name="sort_order" padding="6" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Sort Order"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_attribute_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-                     table="eav_entity_attribute" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ENTT_ATTR_ATTR_GROUP_ID_EAV_ATTR_GROUP_ATTR_GROUP_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ENTT_ATTR_ATTR_GROUP_ID_EAV_ATTR_GROUP_ATTR_GROUP_ID"
-                     table="eav_entity_attribute" column="attribute_group_id" referenceTable="eav_attribute_group"
-                     referenceColumn="attribute_group_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_SET_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_SET_ID_ATTRIBUTE_ID">
-             <column name="attribute_set_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_GROUP_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_GROUP_ID_ATTRIBUTE_ID">
-             <column name="attribute_group_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <index name="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_SET_ID_SORT_ORDER" indexType="btree">
-+        <index referenceId="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_SET_ID_SORT_ORDER" indexType="btree">
-             <column name="attribute_set_id"/>
-             <column name="sort_order"/>
-         </index>
--        <index name="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
-     </table>
-@@ -431,13 +431,13 @@
-                 default="0" comment="Attribute Id"/>
-         <column xsi:type="smallint" name="sort_order" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Sort Order"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="option_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ATTRIBUTE_OPTION_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_OPTION_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-                     table="eav_attribute_option" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <index name="EAV_ATTRIBUTE_OPTION_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="EAV_ATTRIBUTE_OPTION_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
-     </table>
-@@ -449,19 +449,19 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store Id"/>
-         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ATTR_OPT_VAL_OPT_ID_EAV_ATTR_OPT_OPT_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ATTR_OPT_VAL_OPT_ID_EAV_ATTR_OPT_OPT_ID"
-                     table="eav_attribute_option_value" column="option_id" referenceTable="eav_attribute_option"
-                     referenceColumn="option_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_STORE_STORE_ID"
-                     table="eav_attribute_option_value" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <index name="EAV_ATTRIBUTE_OPTION_VALUE_OPTION_ID" indexType="btree">
-+        <index referenceId="EAV_ATTRIBUTE_OPTION_VALUE_OPTION_ID" indexType="btree">
-             <column name="option_id"/>
-         </index>
--        <index name="EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID" indexType="btree">
-+        <index referenceId="EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -473,18 +473,18 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store Id"/>
-         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="attribute_label_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-                     table="eav_attribute_label" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID" table="eav_attribute_label"
-+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID" table="eav_attribute_label"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <index name="EAV_ATTRIBUTE_LABEL_STORE_ID" indexType="btree">
-+        <index referenceId="EAV_ATTRIBUTE_LABEL_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_STORE_ID" indexType="btree">
-+        <index referenceId="EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_STORE_ID" indexType="btree">
-             <column name="attribute_id"/>
-             <column name="store_id"/>
-         </index>
-@@ -499,17 +499,17 @@
-         <column xsi:type="varchar" name="theme" nullable="true" length="64" comment="Theme"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Store Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="type_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_FORM_TYPE_STORE_ID_STORE_STORE_ID" table="eav_form_type"
-+        <constraint xsi:type="foreign" referenceId="EAV_FORM_TYPE_STORE_ID_STORE_STORE_ID" table="eav_form_type"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="EAV_FORM_TYPE_CODE_THEME_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="EAV_FORM_TYPE_CODE_THEME_STORE_ID">
-             <column name="code"/>
-             <column name="theme"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="EAV_FORM_TYPE_STORE_ID" indexType="btree">
-+        <index referenceId="EAV_FORM_TYPE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -518,17 +518,17 @@
-                 comment="Type Id"/>
-         <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Entity Type Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="type_id"/>
-             <column name="entity_type_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_FORM_TYPE_ENTT_ENTT_TYPE_ID_EAV_ENTT_TYPE_ENTT_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_FORM_TYPE_ENTT_ENTT_TYPE_ID_EAV_ENTT_TYPE_ENTT_TYPE_ID"
-                     table="eav_form_type_entity" column="entity_type_id" referenceTable="eav_entity_type"
-                     referenceColumn="entity_type_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_FORM_TYPE_ENTITY_TYPE_ID_EAV_FORM_TYPE_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_FORM_TYPE_ENTITY_TYPE_ID_EAV_FORM_TYPE_TYPE_ID"
-                     table="eav_form_type_entity" column="type_id" referenceTable="eav_form_type"
-                     referenceColumn="type_id" onDelete="CASCADE"/>
--        <index name="EAV_FORM_TYPE_ENTITY_ENTITY_TYPE_ID" indexType="btree">
-+        <index referenceId="EAV_FORM_TYPE_ENTITY_ENTITY_TYPE_ID" indexType="btree">
-             <column name="entity_type_id"/>
-         </index>
-     </table>
-@@ -540,12 +540,12 @@
-         <column xsi:type="varchar" name="code" nullable="false" length="64" comment="Code"/>
-         <column xsi:type="int" name="sort_order" padding="11" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Sort Order"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="fieldset_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_FORM_FIELDSET_TYPE_ID_EAV_FORM_TYPE_TYPE_ID" table="eav_form_fieldset"
-+        <constraint xsi:type="foreign" referenceId="EAV_FORM_FIELDSET_TYPE_ID_EAV_FORM_TYPE_TYPE_ID" table="eav_form_fieldset"
-                     column="type_id" referenceTable="eav_form_type" referenceColumn="type_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="EAV_FORM_FIELDSET_TYPE_ID_CODE">
-+        <constraint xsi:type="unique" referenceId="EAV_FORM_FIELDSET_TYPE_ID_CODE">
-             <column name="type_id"/>
-             <column name="code"/>
-         </constraint>
-@@ -556,17 +556,17 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Store Id"/>
-         <column xsi:type="varchar" name="label" nullable="false" length="255" comment="Label"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="fieldset_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_FORM_FSET_LBL_FSET_ID_EAV_FORM_FSET_FSET_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_FORM_FSET_LBL_FSET_ID_EAV_FORM_FSET_FSET_ID"
-                     table="eav_form_fieldset_label" column="fieldset_id" referenceTable="eav_form_fieldset"
-                     referenceColumn="fieldset_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_FORM_FIELDSET_LABEL_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_FORM_FIELDSET_LABEL_STORE_ID_STORE_STORE_ID"
-                     table="eav_form_fieldset_label" column="store_id" referenceTable="store" referenceColumn="store_id"
-                     onDelete="CASCADE"/>
--        <index name="EAV_FORM_FIELDSET_LABEL_STORE_ID" indexType="btree">
-+        <index referenceId="EAV_FORM_FIELDSET_LABEL_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -581,25 +581,25 @@
-                 comment="Attribute Id"/>
-         <column xsi:type="int" name="sort_order" padding="11" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Sort Order"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="element_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_FORM_ELEMENT_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_FORM_ELEMENT_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-                     table="eav_form_element" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_FORM_ELEMENT_FIELDSET_ID_EAV_FORM_FIELDSET_FIELDSET_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_FORM_ELEMENT_FIELDSET_ID_EAV_FORM_FIELDSET_FIELDSET_ID"
-                     table="eav_form_element" column="fieldset_id" referenceTable="eav_form_fieldset"
-                     referenceColumn="fieldset_id" onDelete="SET NULL"/>
--        <constraint xsi:type="foreign" name="EAV_FORM_ELEMENT_TYPE_ID_EAV_FORM_TYPE_TYPE_ID" table="eav_form_element"
-+        <constraint xsi:type="foreign" referenceId="EAV_FORM_ELEMENT_TYPE_ID_EAV_FORM_TYPE_TYPE_ID" table="eav_form_element"
-                     column="type_id" referenceTable="eav_form_type" referenceColumn="type_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="EAV_FORM_ELEMENT_TYPE_ID_ATTRIBUTE_ID">
-+        <constraint xsi:type="unique" referenceId="EAV_FORM_ELEMENT_TYPE_ID_ATTRIBUTE_ID">
-             <column name="type_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <index name="EAV_FORM_ELEMENT_FIELDSET_ID" indexType="btree">
-+        <index referenceId="EAV_FORM_ELEMENT_FIELDSET_ID" indexType="btree">
-             <column name="fieldset_id"/>
-         </index>
--        <index name="EAV_FORM_ELEMENT_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="EAV_FORM_ELEMENT_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Eav/etc/di.xml b/app/code/Magento/Eav/etc/di.xml
-index ae4663cfc23..db6f9b0a64f 100644
---- a/app/code/Magento/Eav/etc/di.xml
-+++ b/app/code/Magento/Eav/etc/di.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-     <preference for="Magento\Eav\Model\Entity\Setup\PropertyMapperInterface" type="Magento\Eav\Model\Entity\Setup\PropertyMapper\Composite" />
-     <preference for="Magento\Eav\Model\Entity\AttributeLoaderInterface" type="Magento\Eav\Model\Entity\AttributeLoader" />
--    <preference for="Magento\Eav\Model\Entity\GetCustomAttributeCodesInterface" type="Magento\Eav\Model\Entity\GetCustomAttributeCodes" />
-+    <preference for="Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface" type="Magento\Eav\Model\Entity\Attribute\UniqueValidator" />
-     <preference for="Magento\Eav\Api\Data\AttributeInterface" type="Magento\Eav\Model\Entity\Attribute" />
-     <preference for="Magento\Eav\Api\AttributeRepositoryInterface" type="Magento\Eav\Model\AttributeRepository" />
-     <preference for="Magento\Eav\Api\Data\AttributeGroupInterface" type="Magento\Eav\Model\Entity\Attribute\Group" />
-@@ -210,4 +210,3 @@
-         </arguments>
-     </type>
- </config>
--
-diff --git a/app/code/Magento/Eav/etc/module.xml b/app/code/Magento/Eav/etc/module.xml
-index 7b2b651b2d2..97655bd4e1e 100644
---- a/app/code/Magento/Eav/etc/module.xml
-+++ b/app/code/Magento/Eav/etc/module.xml
-@@ -9,6 +9,7 @@
-     <module name="Magento_Eav" >
-         <sequence>
-             <module name="Magento_Store"/>
-+            <module name="Magento_Theme"/>
-         </sequence>
-     </module>
- </config>
-diff --git a/app/code/Magento/Eav/view/adminhtml/templates/attribute/edit/js.phtml b/app/code/Magento/Eav/view/adminhtml/templates/attribute/edit/js.phtml
-index b7b29d7cdcd..ff74eb50f72 100644
---- a/app/code/Magento/Eav/view/adminhtml/templates/attribute/edit/js.phtml
-+++ b/app/code/Magento/Eav/view/adminhtml/templates/attribute/edit/js.phtml
-@@ -5,15 +5,13 @@
-  */
- 
- /** @var \Magento\Eav\Block\Adminhtml\Attribute\Edit\Js $block */
--
--// @codingStandardsIgnoreFile
- ?>
- <script type="text/x-magento-init">
-     {
-         "*": {
-             "eavInputTypes": {
--                "inputTypes": <?= /* @escapeNotVerified */ json_encode($block->getComaptibleInputTypes())?>,
--                "hints": <?= /* @escapeNotVerified */ json_encode($block->getInputTypeHints())?>
-+                "inputTypes": <?= /* @noEscape */ json_encode($block->getComaptibleInputTypes())?>,
-+                "hints": <?= /* @noEscape */ json_encode($block->getInputTypeHints())?>
-             }
-         }
-     }
-diff --git a/app/code/Magento/EavGraphQl/Model/Resolver/AttributeOptions.php b/app/code/Magento/EavGraphQl/Model/Resolver/AttributeOptions.php
-new file mode 100644
-index 00000000000..e4c27adc602
---- /dev/null
-+++ b/app/code/Magento/EavGraphQl/Model/Resolver/AttributeOptions.php
-@@ -0,0 +1,121 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\EavGraphQl\Model\Resolver;
-+
-+use Magento\EavGraphQl\Model\Resolver\DataProvider\AttributeOptions as AttributeOptionsDataProvider;
-+use Magento\Framework\Exception\InputException;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\StateException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Query\Resolver\Value;
-+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+
-+/**
-+ * Resolve attribute options data for custom attribute.
-+ */
-+class AttributeOptions implements ResolverInterface
-+{
-+    /**
-+     * @var AttributeOptionsDataProvider
-+     */
-+    private $attributeOptionsDataProvider;
-+
-+    /**
-+     * @var AttributeOptions
-+     */
-+    private $valueFactory;
-+
-+    /**
-+     * @param AttributeOptionsDataProvider $attributeOptionsDataProvider
-+     * @param ValueFactory $valueFactory
-+     */
-+    public function __construct(
-+        AttributeOptionsDataProvider $attributeOptionsDataProvider,
-+        ValueFactory $valueFactory
-+    ) {
-+        $this->attributeOptionsDataProvider = $attributeOptionsDataProvider;
-+        $this->valueFactory = $valueFactory;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) : Value {
-+
-+        return $this->valueFactory->create(function () use ($value) {
-+            $entityType = $this->getEntityType($value);
-+            $attributeCode = $this->getAttributeCode($value);
-+
-+            $optionsData = $this->getAttributeOptionsData($entityType, $attributeCode);
-+            return $optionsData;
-+        });
-+    }
-+
-+    /**
-+     * Get entity type
-+     *
-+     * @param array $value
-+     * @return int
-+     * @throws LocalizedException
-+     */
-+    private function getEntityType(array $value): int
-+    {
-+        if (!isset($value['entity_type'])) {
-+            throw new LocalizedException(__('"Entity type should be specified'));
-+        }
-+
-+        return (int)$value['entity_type'];
-+    }
-+
-+    /**
-+     * Get attribute code
-+     *
-+     * @param array $value
-+     * @return string
-+     * @throws LocalizedException
-+     */
-+    private function getAttributeCode(array $value): string
-+    {
-+        if (!isset($value['attribute_code'])) {
-+            throw new LocalizedException(__('"Attribute code should be specified'));
-+        }
-+
-+        return $value['attribute_code'];
-+    }
-+
-+    /**
-+     * Get attribute options data
-+     *
-+     * @param int $entityType
-+     * @param string $attributeCode
-+     * @return array
-+     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    private function getAttributeOptionsData(int $entityType, string $attributeCode): array
-+    {
-+        try {
-+            $optionsData = $this->attributeOptionsDataProvider->getData($entityType, $attributeCode);
-+        } catch (InputException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        } catch (StateException $e) {
-+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+        }
-+        return $optionsData;
-+    }
-+}
-diff --git a/app/code/Magento/EavGraphQl/Model/Resolver/CustomAttributeMetadata.php b/app/code/Magento/EavGraphQl/Model/Resolver/CustomAttributeMetadata.php
-index 89d2ab9f9d0..62e3f018366 100644
---- a/app/code/Magento/EavGraphQl/Model/Resolver/CustomAttributeMetadata.php
-+++ b/app/code/Magento/EavGraphQl/Model/Resolver/CustomAttributeMetadata.php
-@@ -14,8 +14,6 @@ use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\GraphQl\Config\Element\Field;
- use Magento\Framework\GraphQl\Exception\GraphQlInputException;
- use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-@@ -28,20 +26,16 @@ class CustomAttributeMetadata implements ResolverInterface
-      */
-     private $type;
- 
--    private $valueFactory;
--
-     /**
-      * @param Type $type
--     * @param ValueFactory $valueFactory
-      */
--    public function __construct(Type $type, ValueFactory $valueFactory)
-+    public function __construct(Type $type)
-     {
-         $this->type = $type;
--        $this->valueFactory = $valueFactory;
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -49,7 +43,7 @@ class CustomAttributeMetadata implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ) : Value {
-+    ) {
-         $attributes['items'] = null;
-         $attributeInputs = $args['attributes'];
-         foreach ($attributeInputs as $attribute) {
-@@ -88,11 +82,7 @@ class CustomAttributeMetadata implements ResolverInterface
-             ];
-         }
- 
--        $result = function () use ($attributes) {
--            return $attributes;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $attributes;
-     }
- 
-     /**
-diff --git a/app/code/Magento/EavGraphQl/Model/Resolver/DataProvider/AttributeOptions.php b/app/code/Magento/EavGraphQl/Model/Resolver/DataProvider/AttributeOptions.php
-new file mode 100644
-index 00000000000..900a31c1093
---- /dev/null
-+++ b/app/code/Magento/EavGraphQl/Model/Resolver/DataProvider/AttributeOptions.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\EavGraphQl\Model\Resolver\DataProvider;
-+
-+use Magento\Eav\Api\AttributeOptionManagementInterface;
-+
-+/**
-+ * Attribute Options data provider
-+ */
-+class AttributeOptions
-+{
-+    /**
-+     * @var AttributeOptionManagementInterface
-+     */
-+    private $optionManager;
-+
-+    /**
-+     * @param AttributeOptionManagementInterface $optionManager
-+     */
-+    public function __construct(
-+        AttributeOptionManagementInterface $optionManager
-+    ) {
-+        $this->optionManager = $optionManager;
-+    }
-+
-+    /**
-+     * @param int $entityType
-+     * @param string $attributeCode
-+     * @return array
-+     */
-+    public function getData(int $entityType, string $attributeCode): array
-+    {
-+        $options = $this->optionManager->getItems($entityType, $attributeCode);
-+
-+        $optionsData = [];
-+        foreach ($options as $option) {
-+            // without empty option @see \Magento\Eav\Model\Entity\Attribute\Source\Table::getAllOptions
-+            if ($option->getValue() === '') {
-+                continue;
-+            }
-+
-+            $optionsData[] = [
-+                'label' => $option->getLabel(),
-+                'value' => $option->getValue()
-+            ];
-+        }
-+        return $optionsData;
-+    }
-+}
-diff --git a/app/code/Magento/EavGraphQl/Model/Resolver/Query/Type.php b/app/code/Magento/EavGraphQl/Model/Resolver/Query/Type.php
-index cbea3a86bbd..ef21a26f1f6 100644
---- a/app/code/Magento/EavGraphQl/Model/Resolver/Query/Type.php
-+++ b/app/code/Magento/EavGraphQl/Model/Resolver/Query/Type.php
-@@ -9,7 +9,6 @@ namespace Magento\EavGraphQl\Model\Resolver\Query;
- 
- use Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface;
- use Magento\Framework\Reflection\TypeProcessor;
--use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\GraphQl\Exception\GraphQlInputException;
- 
- /**
-@@ -37,7 +36,7 @@ class Type
-     /**
-      * @param CustomAttributeTypeLocatorInterface $typeLocator
-      * @param TypeProcessor $typeProcessor
--     * @param $customTypes
-+     * @param array $customTypes
-      */
-     public function __construct(
-         CustomAttributeTypeLocatorInterface $typeLocator,
-@@ -71,12 +70,7 @@ class Type
-             try {
-                 $type = $this->typeProcessor->translateTypeName($type);
-             } catch (\InvalidArgumentException $exception) {
--                throw new GraphQlInputException(
--                    __('Type %1 has no internal representation declared.', [$type]),
--                    null,
--                    0,
--                    false
--                );
-+                throw new GraphQlInputException(__('Cannot resolve EAV type'));
-             }
-         } else {
-             $type = $type === 'double' ? 'float' : $type;
-diff --git a/app/code/Magento/EavGraphQl/composer.json b/app/code/Magento/EavGraphQl/composer.json
-index 6da27ed27cf..a2c2d025a3d 100644
---- a/app/code/Magento/EavGraphQl/composer.json
-+++ b/app/code/Magento/EavGraphQl/composer.json
-@@ -4,7 +4,8 @@
-     "type": "magento2-module",
-     "require": {
-         "php": "~7.1.3||~7.2.0",
--        "magento/framework": "*"
-+        "magento/framework": "*",
-+        "magento/module-eav": "*"
-     },
-     "suggest": {
-         "magento/module-graph-ql": "*"
-diff --git a/app/code/Magento/EavGraphQl/etc/schema.graphqls b/app/code/Magento/EavGraphQl/etc/schema.graphqls
-index 7799498c404..0299067bd05 100644
---- a/app/code/Magento/EavGraphQl/etc/schema.graphqls
-+++ b/app/code/Magento/EavGraphQl/etc/schema.graphqls
-@@ -2,7 +2,7 @@
- # See COPYING.txt for license details.
- 
- type Query {
--    customAttributeMetadata(attributes: [AttributeInput!]!): CustomAttributeMetadata @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\CustomAttributeMetadata")  @doc(description: "The customAttributeMetadata query returns the attribute type, given an attribute code and entity type")
-+    customAttributeMetadata(attributes: [AttributeInput!]!): CustomAttributeMetadata @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\CustomAttributeMetadata")  @doc(description: "The customAttributeMetadata query returns the attribute type, given an attribute code and entity type") @cache(cacheable: false)
- }
- 
- type CustomAttributeMetadata @doc(description: "CustomAttributeMetadata defines an array of attribute_codes and entity_types") {
-@@ -13,6 +13,12 @@ type Attribute @doc(description: "Attribute contains the attribute_type of the s
-     attribute_code: String @doc(description: "The unique identifier for an attribute code. This value should be in lowercase letters without spaces.")
-     entity_type: String @doc(description: "The type of entity that defines the attribute")
-     attribute_type: String @doc(description: "The data type of the attribute")
-+    attribute_options: [AttributeOption] @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\AttributeOptions") @doc(description: "Attribute options list.")
-+}
-+
-+type AttributeOption @doc(description: "Attribute option.") {
-+    label: String @doc(description: "Attribute option label.")
-+    value: String @doc(description: "Attribute option value.")
- }
- 
- input AttributeInput @doc(description: "AttributeInput specifies the attribute_code and entity_type to search") {
-diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php
-index 009c07602fc..eb7874a9361 100644
---- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php
-+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php
-@@ -3,10 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper;
- 
- use Magento\Elasticsearch\Model\ResourceModel\Index;
- use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
- 
- /**
-  * Provide data mapping for categories fields
-@@ -18,16 +22,35 @@ class CategoryFieldsProvider implements AdditionalFieldsProviderInterface
-      */
-     private $resourceIndex;
- 
-+    /**
-+     * @var AttributeProvider
-+     */
-+    private $attributeAdapterProvider;
-+
-+    /**
-+     * @var ResolverInterface
-+     */
-+    private $fieldNameResolver;
-+
-     /**
-      * @param Index $resourceIndex
-+     * @param AttributeProvider|null $attributeAdapterProvider
-+     * @param ResolverInterface|null $fieldNameResolver
-      */
--    public function __construct(Index $resourceIndex)
--    {
-+    public function __construct(
-+        Index $resourceIndex,
-+        AttributeProvider $attributeAdapterProvider = null,
-+        ResolverInterface $fieldNameResolver = null
-+    ) {
-         $this->resourceIndex = $resourceIndex;
-+        $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
-+            ->get(AttributeProvider::class);
-+        $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
-+            ->get(ResolverInterface::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFields(array $productIds, $storeId)
-     {
-@@ -58,9 +81,19 @@ class CategoryFieldsProvider implements AdditionalFieldsProviderInterface
- 
-             if (count($categoryIds)) {
-                 $result = ['category_ids' => $categoryIds];
-+                $positionAttribute = $this->attributeAdapterProvider->getByAttributeCode('position');
-+                $categoryNameAttribute = $this->attributeAdapterProvider->getByAttributeCode('category_name');
-                 foreach ($indexData as $data) {
--                    $result['position_category_' . $data['id']] = $data['position'];
--                    $result['name_category_' . $data['id']] = $data['name'];
-+                    $categoryPositionKey = $this->fieldNameResolver->getFieldName(
-+                        $positionAttribute,
-+                        ['categoryId' => $data['id']]
-+                    );
-+                    $categoryNameKey = $this->fieldNameResolver->getFieldName(
-+                        $categoryNameAttribute,
-+                        ['categoryId' => $data['id']]
-+                    );
-+                    $result[$categoryPositionKey] = $data['position'];
-+                    $result[$categoryNameKey] = $data['name'];
-                 }
-             }
-         }
-diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php
-index 659df0f8447..f0b73803972 100644
---- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php
-+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper;
- 
- use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-@@ -14,8 +15,13 @@ use Magento\Elasticsearch\Model\ResourceModel\Index;
- use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
- use Magento\Elasticsearch\Model\Adapter\DataMapperInterface;
- use Magento\Elasticsearch\Model\Adapter\FieldType\Date as DateFieldType;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
- 
- /**
-+ * Don't use this product data mapper class.
-+ *
-  * @deprecated 100.2.0
-  * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface
-  */
-@@ -78,6 +84,16 @@ class ProductDataMapper implements DataMapperInterface
-      */
-     protected $mediaGalleryRoles;
- 
-+    /**
-+     * @var AttributeProvider
-+     */
-+    private $attributeAdapterProvider;
-+
-+    /**
-+     * @var ResolverInterface
-+     */
-+    private $fieldNameResolver;
-+
-     /**
-      * Construction for DocumentDataMapper
-      *
-@@ -87,6 +103,8 @@ class ProductDataMapper implements DataMapperInterface
-      * @param FieldMapperInterface $fieldMapper
-      * @param StoreManagerInterface $storeManager
-      * @param DateFieldType $dateFieldType
-+     * @param AttributeProvider|null $attributeAdapterProvider
-+     * @param ResolverInterface|null $fieldNameResolver
-      */
-     public function __construct(
-         Builder $builder,
-@@ -94,7 +112,9 @@ class ProductDataMapper implements DataMapperInterface
-         Index $resourceIndex,
-         FieldMapperInterface $fieldMapper,
-         StoreManagerInterface $storeManager,
--        DateFieldType $dateFieldType
-+        DateFieldType $dateFieldType,
-+        AttributeProvider $attributeAdapterProvider = null,
-+        ResolverInterface $fieldNameResolver = null
-     ) {
-         $this->builder = $builder;
-         $this->attributeContainer = $attributeContainer;
-@@ -102,6 +122,10 @@ class ProductDataMapper implements DataMapperInterface
-         $this->fieldMapper = $fieldMapper;
-         $this->storeManager = $storeManager;
-         $this->dateFieldType = $dateFieldType;
-+        $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
-+            ->get(AttributeProvider::class);
-+        $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
-+            ->get(ResolverInterface::class);
- 
-         $this->mediaGalleryRoles = [
-             self::MEDIA_ROLE_IMAGE,
-@@ -203,6 +227,8 @@ class ProductDataMapper implements DataMapperInterface
-     }
- 
-     /**
-+     * Check value.
-+     *
-      * @param mixed $value
-      * @param Attribute $attribute
-      * @param string $storeId
-@@ -232,14 +258,14 @@ class ProductDataMapper implements DataMapperInterface
-         if (!empty($data)) {
-             $i = 0;
-             foreach ($data as $tierPrice) {
--                $result['tier_price_id_'.$i] = $tierPrice['price_id'];
--                $result['tier_website_id_'.$i] = $tierPrice['website_id'];
--                $result['tier_all_groups_'.$i] = $tierPrice['all_groups'];
--                $result['tier_cust_group_'.$i] = $tierPrice['cust_group'] == GroupInterface::CUST_GROUP_ALL
-+                $result['tier_price_id_' . $i] = $tierPrice['price_id'];
-+                $result['tier_website_id_' . $i] = $tierPrice['website_id'];
-+                $result['tier_all_groups_' . $i] = $tierPrice['all_groups'];
-+                $result['tier_cust_group_' . $i] = $tierPrice['cust_group'] == GroupInterface::CUST_GROUP_ALL
-                     ? '' : $tierPrice['cust_group'];
--                $result['tier_price_qty_'.$i] = $tierPrice['price_qty'];
--                $result['tier_website_price_'.$i] = $tierPrice['website_price'];
--                $result['tier_price_'.$i] = $tierPrice['price'];
-+                $result['tier_price_qty_' . $i] = $tierPrice['price_qty'];
-+                $result['tier_website_price_' . $i] = $tierPrice['website_price'];
-+                $result['tier_price_' . $i] = $tierPrice['price'];
-                 $i++;
-             }
-         }
-@@ -293,6 +319,8 @@ class ProductDataMapper implements DataMapperInterface
-     }
- 
-     /**
-+     * Get media role image.
-+     *
-      * @param string $file
-      * @param array $roles
-      * @return string
-@@ -303,6 +331,8 @@ class ProductDataMapper implements DataMapperInterface
-     }
- 
-     /**
-+     * Get media role small image.
-+     *
-      * @param string $file
-      * @param array $roles
-      * @return string
-@@ -313,6 +343,8 @@ class ProductDataMapper implements DataMapperInterface
-     }
- 
-     /**
-+     * Get media role thumbnail.
-+     *
-      * @param string $file
-      * @param array $roles
-      * @return string
-@@ -323,6 +355,8 @@ class ProductDataMapper implements DataMapperInterface
-     }
- 
-     /**
-+     * Get media role swatch image.
-+     *
-      * @param string $file
-      * @param array $roles
-      * @return string
-@@ -364,9 +398,11 @@ class ProductDataMapper implements DataMapperInterface
-         $result = [];
-         if (array_key_exists($productId, $priceIndexData)) {
-             $productPriceIndexData = $priceIndexData[$productId];
--            $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
-             foreach ($productPriceIndexData as $customerGroupId => $price) {
--                $fieldName = 'price_' . $customerGroupId . '_' . $websiteId;
-+                $fieldName = $this->fieldMapper->getFieldName(
-+                    'price',
-+                    ['customerGroupId' => $customerGroupId, 'websiteId' => $storeId]
-+                );
-                 $result[$fieldName] = sprintf('%F', $price);
-             }
-         }
-@@ -393,13 +429,23 @@ class ProductDataMapper implements DataMapperInterface
-         if (array_key_exists($productId, $categoryIndexData)) {
-             $indexData = $categoryIndexData[$productId];
-             foreach ($indexData as $categoryData) {
--                $categoryIds[] = (int) $categoryData['id'];
-+                $categoryIds[] = (int)$categoryData['id'];
-             }
-             if (count($categoryIds)) {
-                 $result = ['category_ids' => implode(' ', $categoryIds)];
-+                $positionAttribute = $this->attributeAdapterProvider->getByAttributeCode('position');
-+                $categoryNameAttribute = $this->attributeAdapterProvider->getByAttributeCode('category_name');
-                 foreach ($indexData as $data) {
--                    $result['position_category_' . $data['id']] = $data['position'];
--                    $result['name_category_' . $data['id']] = $data['name'];
-+                    $categoryPositionKey = $this->fieldNameResolver->getFieldName(
-+                        $positionAttribute,
-+                        ['categoryId' => $data['id']]
-+                    );
-+                    $categoryNameKey = $this->fieldNameResolver->getFieldName(
-+                        $categoryNameAttribute,
-+                        ['categoryId' => $data['id']]
-+                    );
-+                    $result[$categoryPositionKey] = $data['position'];
-+                    $result[$categoryNameKey] = $data['name'];
-                 }
-             }
-         }
-diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
-new file mode 100644
-index 00000000000..26173fcf29b
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
-@@ -0,0 +1,51 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface;
-+
-+/**
-+ * Field type converter from internal index type to elastic service.
-+ */
-+class Converter implements ConverterInterface
-+{
-+    /**
-+     * Text flags for Elasticsearch index value
-+     */
-+    private const ES_NO_INDEX = false;
-+
-+    /**
-+     * Text flags for Elasticsearch no analyze index value
-+     */
-+    private const ES_NO_ANALYZE = false;
-+
-+    /**
-+     * Mapping between internal data types and elastic service.
-+     *
-+     * @var array
-+     */
-+    private $mapping = [
-+        ConverterInterface::INTERNAL_NO_INDEX_VALUE => self::ES_NO_INDEX,
-+        ConverterInterface::INTERNAL_NO_ANALYZE_VALUE => self::ES_NO_ANALYZE,
-+    ];
-+
-+    /**
-+     * Get service field index type for elasticsearch 5.
-+     *
-+     * @param string $internalType
-+     * @return string|boolean
-+     * @throws \DomainException
-+     */
-+    public function convert(string $internalType)
-+    {
-+        if (!isset($this->mapping[$internalType])) {
-+            throw new \DomainException(sprintf('Unsupported internal field index type: %s', $internalType));
-+        }
-+        return $this->mapping[$internalType];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php
-new file mode 100644
-index 00000000000..954deaec639
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php
-@@ -0,0 +1,87 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ResolverInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
-+    as FieldTypeResolver;
-+
-+/**
-+ * Field index resolver that provides index type for the attribute in mapping.
-+ * For example, we need to set ‘no’/false in the case when attribute must be present in index data,
-+ * but stay as not indexable.
-+ */
-+class IndexResolver implements ResolverInterface
-+{
-+    /**
-+     * @var ConverterInterface
-+     */
-+    private $converter;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * @var FieldTypeResolver
-+     */
-+    private $fieldTypeResolver;
-+
-+    /**
-+     * @param ConverterInterface $converter
-+     * @param FieldTypeConverterInterface $fieldTypeConverter
-+     * @param FieldTypeResolver $fieldTypeResolver
-+     */
-+    public function __construct(
-+        ConverterInterface $converter,
-+        FieldTypeConverterInterface $fieldTypeConverter,
-+        FieldTypeResolver $fieldTypeResolver
-+    ) {
-+        $this->converter = $converter;
-+        $this->fieldTypeConverter = $fieldTypeConverter;
-+        $this->fieldTypeResolver = $fieldTypeResolver;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getFieldIndex(AttributeAdapter $attribute)
-+    {
-+        $index = null;
-+        if (!$attribute->isSearchable()
-+            && !$attribute->isAlwaysIndexable()
-+            && ($this->isStringServiceFieldType($attribute) || $attribute->isComplexType())
-+            && !(($attribute->isIntegerType() || $attribute->isBooleanType())
-+                && !$attribute->isUserDefined())
-+            && !$attribute->isFloatType()
-+        ) {
-+            $index = $this->converter->convert(ConverterInterface::INTERNAL_NO_INDEX_VALUE);
-+        }
-+
-+        return $index;
-+    }
-+
-+    /**
-+     * Check if service field type for field set as 'string'
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @return bool
-+     */
-+    private function isStringServiceFieldType(AttributeAdapter $attribute): bool
-+    {
-+        $serviceFieldType = $this->fieldTypeResolver->getFieldType($attribute);
-+        $stringTypeKey = $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING);
-+
-+        return $serviceFieldType === $stringTypeKey;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
-new file mode 100644
-index 00000000000..1f6e05c9e02
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
-+
-+/**
-+ * Field type converter from internal data types to elastic service.
-+ */
-+class Converter implements ConverterInterface
-+{
-+    /**#@+
-+     * Text flags for Elasticsearch field types
-+     */
-+    private const ES_DATA_TYPE_TEXT = 'text';
-+    private const ES_DATA_TYPE_KEYWORD = 'keyword';
-+    private const ES_DATA_TYPE_FLOAT = 'float';
-+    private const ES_DATA_TYPE_INT = 'integer';
-+    private const ES_DATA_TYPE_DATE = 'date';
-+    /**#@-*/
-+
-+    /**
-+     * Mapping between internal data types and elastic service.
-+     *
-+     * @var array
-+     */
-+    private $mapping = [
-+        self::INTERNAL_DATA_TYPE_STRING => self::ES_DATA_TYPE_TEXT,
-+        self::INTERNAL_DATA_TYPE_KEYWORD => self::ES_DATA_TYPE_KEYWORD,
-+        self::INTERNAL_DATA_TYPE_FLOAT => self::ES_DATA_TYPE_FLOAT,
-+        self::INTERNAL_DATA_TYPE_INT => self::ES_DATA_TYPE_INT,
-+        self::INTERNAL_DATA_TYPE_DATE => self::ES_DATA_TYPE_DATE,
-+    ];
-+
-+    /**
-+     * Get service field type for elasticsearch 5.
-+     *
-+     * @param string $internalType
-+     * @return string
-+     * @throws \DomainException
-+     */
-+    public function convert(string $internalType): string
-+    {
-+        if (!isset($this->mapping[$internalType])) {
-+            throw new \DomainException(sprintf('Unsupported internal field type: %s', $internalType));
-+        }
-+        return $this->mapping[$internalType];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php
-new file mode 100644
-index 00000000000..fed36ff6b1c
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
-+
-+/**
-+ * Composite resolver for resolving field type.
-+ */
-+class CompositeResolver implements ResolverInterface
-+{
-+    /**
-+     * @var ResolverInterface[]
-+     */
-+    private $items;
-+
-+    /**
-+     * @param ResolverInterface[] $items
-+     */
-+    public function __construct(array $items)
-+    {
-+        foreach ($items as $item) {
-+            if (!$item instanceof ResolverInterface) {
-+                throw new \InvalidArgumentException(
-+                    sprintf('Instance of the field type resolver is expected, got %s instead.', get_class($item))
-+                );
-+            }
-+        }
-+        $this->items = $items;
-+    }
-+
-+    /**
-+     * Get field type.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @return string
-+     */
-+    public function getFieldType(AttributeAdapter $attribute): ?string
-+    {
-+        $result = null;
-+        foreach ($this->items as $item) {
-+            $result = $item->getFieldType($attribute);
-+            if (null !== $result) {
-+                break;
-+            }
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php
-new file mode 100644
-index 00000000000..e5c8dd48c7a
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
-+
-+/**
-+ * Integer type resolver.
-+ */
-+class IntegerType implements ResolverInterface
-+{
-+    /**
-+     * @var ConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * @var array
-+     */
-+    private $integerTypeAttributes;
-+
-+    /**
-+     * @param ConverterInterface $fieldTypeConverter
-+     * @param array $integerTypeAttributes
-+     */
-+    public function __construct(ConverterInterface $fieldTypeConverter, $integerTypeAttributes = ['category_ids'])
-+    {
-+        $this->fieldTypeConverter = $fieldTypeConverter;
-+        $this->integerTypeAttributes = $integerTypeAttributes;
-+    }
-+
-+    /**
-+     * Get integer field type.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @return string
-+     */
-+    public function getFieldType(AttributeAdapter $attribute): ?string
-+    {
-+        if (in_array($attribute->getAttributeCode(), $this->integerTypeAttributes, true)
-+            || (($attribute->isIntegerType() || $attribute->isBooleanType())
-+                && !$attribute->isUserDefined())
-+        ) {
-+            return $this->fieldTypeConverter->convert(ConverterInterface::INTERNAL_DATA_TYPE_INT);
-+        }
-+
-+        return null;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordType.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordType.php
-new file mode 100644
-index 00000000000..e522d4ae5e0
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordType.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
-+
-+/**
-+ * Keyword type resolver.
-+ */
-+class KeywordType implements ResolverInterface
-+{
-+    /**
-+     * @var ConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * @param ConverterInterface $fieldTypeConverter
-+     */
-+    public function __construct(ConverterInterface $fieldTypeConverter)
-+    {
-+        $this->fieldTypeConverter = $fieldTypeConverter;
-+    }
-+
-+    /**
-+     * Get field type.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @return string
-+     */
-+    public function getFieldType(AttributeAdapter $attribute): ?string
-+    {
-+        if ($attribute->isComplexType()
-+            || (!$attribute->isSearchable() && !$attribute->isAlwaysIndexable() && $attribute->isFilterable())
-+        ) {
-+            return $this->fieldTypeConverter->convert(ConverterInterface::INTERNAL_DATA_TYPE_KEYWORD);
-+        }
-+
-+        return null;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php
-index 09357216d20..5aea87e5e6a 100644
---- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php
-+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php
-@@ -3,11 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper;
- 
--use Magento\Catalog\Api\Data\ProductAttributeInterface;
- use Magento\Eav\Model\Config;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
- use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldType;
- use Magento\Framework\Registry;
- use Magento\Store\Model\StoreManagerInterface as StoreManager;
-@@ -19,222 +23,104 @@ use \Magento\Customer\Model\Session as CustomerSession;
- class ProductFieldMapper implements FieldMapperInterface
- {
-     /**
-+     * @deprecated
-      * @var Config
-      */
-     protected $eavConfig;
- 
-     /**
-+     * @deprecated
-      * @var FieldType
-      */
-     protected $fieldType;
- 
-     /**
-+     * @deprecated
-      * @var CustomerSession
-      */
-     protected $customerSession;
- 
-     /**
--     * Store manager
--     *
-+     * @deprecated
-      * @var StoreManager
-      */
-     protected $storeManager;
- 
-     /**
--     * Core registry
--     *
-+     * @deprecated
-      * @var Registry
-      */
-     protected $coreRegistry;
- 
-+    /**
-+     * @var AttributeProvider
-+     */
-+    private $attributeAdapterProvider;
-+
-+    /**
-+     * @var ResolverInterface
-+     */
-+    private $fieldNameResolver;
-+
-+    /**
-+     * @var FieldProviderInterface
-+     */
-+    private $fieldProvider;
-+
-     /**
-      * @param Config $eavConfig
-      * @param FieldType $fieldType
-      * @param CustomerSession $customerSession
-      * @param StoreManager $storeManager
-      * @param Registry $coreRegistry
-+     * @param ResolverInterface|null $fieldNameResolver
-+     * @param AttributeProvider|null $attributeAdapterProvider
-+     * @param FieldProviderInterface|null $fieldProvider
-      */
-     public function __construct(
-         Config $eavConfig,
-         FieldType $fieldType,
-         CustomerSession $customerSession,
-         StoreManager $storeManager,
--        Registry $coreRegistry
-+        Registry $coreRegistry,
-+        ResolverInterface $fieldNameResolver = null,
-+        AttributeProvider $attributeAdapterProvider = null,
-+        FieldProviderInterface $fieldProvider = null
-     ) {
-         $this->eavConfig = $eavConfig;
-         $this->fieldType = $fieldType;
-         $this->customerSession = $customerSession;
-         $this->storeManager = $storeManager;
-         $this->coreRegistry = $coreRegistry;
-+        $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
-+            ->get(ResolverInterface::class);
-+        $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
-+            ->get(AttributeProvider::class);
-+        $this->fieldProvider = $fieldProvider ?: ObjectManager::getInstance()
-+            ->get(FieldProviderInterface::class);
-     }
- 
-     /**
-+     * Get field name.
-+     *
-      * @param string $attributeCode
-      * @param array $context
-      * @return string
-      */
-     public function getFieldName($attributeCode, $context = [])
-     {
--        $attribute = $this->eavConfig->getAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode);
--        if (!$attribute || in_array($attributeCode, ['id', 'sku', 'store_id', 'visibility'], true)) {
--            return $attributeCode;
--        }
--        if ($attributeCode === 'price') {
--            return $this->getPriceFieldName($context);
--        }
--        if ($attributeCode === 'position') {
--            return $this->getPositionFiledName($context);
--        }
--        $fieldType = $this->fieldType->getFieldType($attribute);
--        $frontendInput = $attribute->getFrontendInput();
--        if (empty($context['type'])) {
--            $fieldName = $attributeCode;
--        } elseif ($context['type'] === FieldMapperInterface::TYPE_FILTER) {
--            if ($fieldType === FieldType::ES_DATA_TYPE_TEXT) {
--                return $this->getFieldName(
--                    $attributeCode,
--                    array_merge($context, ['type' => FieldMapperInterface::TYPE_QUERY])
--                );
--            }
--            $fieldName = $attributeCode;
--        } elseif ($context['type'] === FieldMapperInterface::TYPE_QUERY) {
--            $fieldName = $this->getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode);
--        } else {
--            $fieldName = 'sort_' . $attributeCode;
--        }
--
--        return $fieldName;
-+        $attributeAdapter = $this->attributeAdapterProvider->getByAttributeCode($attributeCode);
-+        return $this->fieldNameResolver->getFieldName($attributeAdapter, $context);
-     }
- 
-     /**
-+     * Get all attributes types.
-+     *
-      * @param array $context
-      * @return array
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function getAllAttributesTypes($context = [])
-     {
--        $attributeCodes = $this->eavConfig->getEntityAttributeCodes(ProductAttributeInterface::ENTITY_TYPE_CODE);
--        $allAttributes = [];
--        // List of attributes which are required to be indexable
--        $alwaysIndexableAttributes = [
--            'category_ids',
--            'visibility',
--        ];
--
--        foreach ($attributeCodes as $attributeCode) {
--            $attribute = $this->eavConfig->getAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode);
--
--            $allAttributes[$attributeCode] = [
--                'type' => $this->fieldType->getFieldType($attribute),
--            ];
--
--            if (!$attribute->getIsSearchable() && !$this->isAttributeUsedInAdvancedSearch($attribute)
--                && !in_array($attributeCode, $alwaysIndexableAttributes, true)
--            ) {
--                if ($attribute->getIsFilterable() || $attribute->getIsFilterableInSearch()) {
--                    $allAttributes[$attributeCode]['type'] = FieldType::ES_DATA_TYPE_KEYWORD;
--                } else if ($allAttributes[$attributeCode]['type'] === FieldType::ES_DATA_TYPE_TEXT) {
--                    $allAttributes[$attributeCode]['index'] = 'no';
--                }
--            } else if ($attributeCode == "category_ids") {
--                $allAttributes[$attributeCode] = [
--                    'type' => FieldType::ES_DATA_TYPE_INT,
--                ];
--            }
--
--            if ($attribute->usesSource()
--                || $attribute->getFrontendInput() === 'select'
--                || $attribute->getFrontendInput() === 'multiselect'
--            ) {
--                $allAttributes[$attributeCode]['type'] = FieldType::ES_DATA_TYPE_KEYWORD;
--
--                $allAttributes[$attributeCode . '_value'] = [
--                    'type' => FieldType::ES_DATA_TYPE_TEXT,
--                ];
--            }
--        }
--
--        return $allAttributes;
--    }
--
--    /**
--     * @param Object $attribute
--     * @return bool
--     */
--    protected function isAttributeUsedInAdvancedSearch($attribute)
--    {
--        return $attribute->getIsVisibleInAdvancedSearch()
--        || $attribute->getIsFilterable()
--        || $attribute->getIsFilterableInSearch();
--    }
--
--    /**
--     * @param string $frontendInput
--     * @param string $fieldType
--     * @param string $attributeCode
--     * @return string
--     */
--    protected function getRefinedFieldName($frontendInput, $fieldType, $attributeCode)
--    {
--        switch ($frontendInput) {
--            case 'select':
--                return in_array($fieldType, ['text','integer'], true) ? $attributeCode . '_value' : $attributeCode;
--            case 'boolean':
--                return $fieldType === 'integer' ? $attributeCode . '_value' : $attributeCode;
--            default:
--                return $attributeCode;
--        }
--    }
--
--    /**
--     * @param string $frontendInput
--     * @param string $fieldType
--     * @param string $attributeCode
--     * @return string
--     */
--    protected function getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode)
--    {
--        if ($attributeCode === '*') {
--            $fieldName = '_all';
--        } else {
--            $fieldName = $this->getRefinedFieldName($frontendInput, $fieldType, $attributeCode);
--        }
--        return $fieldName;
--    }
--
--    /**
--     * Get "position" field name
--     *
--     * @param array $context
--     * @return string
--     */
--    protected function getPositionFiledName($context)
--    {
--        if (isset($context['categoryId'])) {
--            $category = $context['categoryId'];
--        } else {
--            $category = $this->coreRegistry->registry('current_category')
--                ? $this->coreRegistry->registry('current_category')->getId()
--                : $this->storeManager->getStore()->getRootCategoryId();
--        }
--        return 'position_category_' . $category;
--    }
--
--    /**
--     * Prepare price field name for search engine
--     *
--     * @param array $context
--     * @return string
--     */
--    protected function getPriceFieldName($context)
--    {
--        $customerGroupId = !empty($context['customerGroupId'])
--            ? $context['customerGroupId']
--            : $this->customerSession->getCustomerGroupId();
--        $websiteId = !empty($context['websiteId'])
--            ? $context['websiteId']
--            : $this->storeManager->getStore()->getWebsiteId();
--        return 'price_' . $customerGroupId . '_' . $websiteId;
-+        return $this->fieldProvider->getFields($context);
-     }
- }
-diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldType.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldType.php
-index d1160329545..6891b8c6936 100644
---- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldType.php
-+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldType.php
-@@ -6,15 +6,23 @@
- namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter;
- 
- use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
- 
- /**
-  * Class FieldType
-+ *
-  * @api
-  * @since 100.1.0
-+ *
-+ * @deprecated This class provide not full data about field type. Only basic rules apply on this class.
-+ * @see ResolverInterface
-  */
- class FieldType
- {
-     /**#@+
-+     * @deprecated
-+     * @see \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+     *
-      * Text flags for Elasticsearch field types
-      */
-     const ES_DATA_TYPE_TEXT = 'text';
-@@ -28,16 +36,22 @@ class FieldType
-     /**#@-*/
- 
-     /**
-+     * Get field type.
-+     *
-+     * @deprecated
-+     * @see ResolverInterface::getFieldType
-+     *
-      * @param AbstractAttribute $attribute
-      * @return string
-      * @since 100.1.0
-      */
-     public function getFieldType($attribute)
-     {
-+        trigger_error('Class is deprecated', E_USER_DEPRECATED);
-         $backendType = $attribute->getBackendType();
-         $frontendInput = $attribute->getFrontendInput();
- 
--        if (in_array($backendType, ['timestamp', 'datetime'], true)) {
-+        if ($backendType === 'timestamp') {
-             $fieldType = self::ES_DATA_TYPE_DATE;
-         } elseif ((in_array($backendType, ['int', 'smallint'], true)
-             || (in_array($frontendInput, ['select', 'boolean'], true) && $backendType !== 'varchar'))
-diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
-index 8ffa5839a12..c05e8a44160 100644
---- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
-+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
-@@ -101,6 +101,8 @@ class Elasticsearch implements ClientInterface
-     }
- 
-     /**
-+     * Build config.
-+     *
-      * @param array $options
-      * @return array
-      */
-@@ -207,9 +209,10 @@ class Elasticsearch implements ClientInterface
-     }
- 
-     /**
-+     * Exists alias.
-+     *
-      * @param string $alias
-      * @param string $index
--     *
-      * @return bool
-      */
-     public function existsAlias($alias, $index = '')
-@@ -222,8 +225,9 @@ class Elasticsearch implements ClientInterface
-     }
- 
-     /**
--     * @param string $alias
-+     * Get alias.
-      *
-+     * @param string $alias
-      * @return array
-      */
-     public function getAlias($alias)
-@@ -268,7 +272,7 @@ class Elasticsearch implements ClientInterface
-                                 'match_mapping_type' => 'string',
-                                 'mapping' => $this->prepareFieldInfo([
-                                     'type' => 'text',
--                                    'index' => 'no',
-+                                    'index' => false,
-                                 ]),
-                             ],
-                         ],
-@@ -293,8 +297,7 @@ class Elasticsearch implements ClientInterface
-     }
- 
-     /**
--     * Fix backward compatibility of field definition.
--     * Allow to run both 2.x and 5.x servers.
-+     * Fix backward compatibility of field definition. Allow to run both 2.x and 5.x servers.
-      *
-      * @param array $fieldInfo
-      *
-@@ -346,8 +349,7 @@ class Elasticsearch implements ClientInterface
-     }
- 
-     /**
--     * Fix backward compatibility of the search queries.
--     * Allow to run both 2.x and 5.x servers.
-+     * Fix backward compatibility of the search queries. Allow to run both 2.x and 5.x servers.
-      *
-      * @param array $query
-      *
-diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php
-index 13d4f8a7296..0ae347d5791 100644
---- a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php
-+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php
-@@ -12,6 +12,7 @@ use Magento\Framework\Search\Response\QueryResponse;
- use Magento\Elasticsearch\SearchAdapter\Aggregation\Builder as AggregationBuilder;
- use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
- use \Magento\Elasticsearch\SearchAdapter\ResponseFactory;
-+use Psr\Log\LoggerInterface;
- 
- /**
-  * Elasticsearch Search Adapter
-@@ -47,28 +48,60 @@ class Adapter implements AdapterInterface
-      */
-     private $queryContainerFactory;
- 
-+    /**
-+     * Empty response from Elasticsearch.
-+     *
-+     * @var array
-+     */
-+    private static $emptyRawResponse = [
-+        "hits" =>
-+            [
-+                "hits" => []
-+            ],
-+        "aggregations" =>
-+            [
-+                "price_bucket" => [],
-+                "category_bucket" =>
-+                    [
-+                        "buckets" => []
-+
-+                    ]
-+            ]
-+    ];
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-     /**
-      * @param ConnectionManager $connectionManager
-      * @param Mapper $mapper
-      * @param ResponseFactory $responseFactory
-      * @param AggregationBuilder $aggregationBuilder
-      * @param \Magento\Elasticsearch\SearchAdapter\QueryContainerFactory $queryContainerFactory
-+     * @param LoggerInterface $logger
-      */
-     public function __construct(
-         ConnectionManager $connectionManager,
-         Mapper $mapper,
-         ResponseFactory $responseFactory,
-         AggregationBuilder $aggregationBuilder,
--        \Magento\Elasticsearch\SearchAdapter\QueryContainerFactory $queryContainerFactory
-+        \Magento\Elasticsearch\SearchAdapter\QueryContainerFactory $queryContainerFactory,
-+        LoggerInterface $logger = null
-     ) {
-         $this->connectionManager = $connectionManager;
-         $this->mapper = $mapper;
-         $this->responseFactory = $responseFactory;
-         $this->aggregationBuilder = $aggregationBuilder;
-         $this->queryContainerFactory = $queryContainerFactory;
-+        $this->logger = $logger ?: ObjectManager::getInstance()
-+            ->get(LoggerInterface::class);
-     }
- 
-     /**
-+     * Search query
-+     *
-      * @param RequestInterface $request
-      * @return QueryResponse
-      */
-@@ -76,17 +109,23 @@ class Adapter implements AdapterInterface
-     {
-         $client = $this->connectionManager->getConnection();
-         $aggregationBuilder = $this->aggregationBuilder;
--
-         $query = $this->mapper->buildQuery($request);
-         $aggregationBuilder->setQuery($this->queryContainerFactory->create(['query' => $query]));
--        $rawResponse = $client->query($query);
- 
--        $rawDocuments = isset($rawResponse['hits']['hits']) ? $rawResponse['hits']['hits'] : [];
-+        try {
-+            $rawResponse = $client->query($query);
-+        } catch (\Exception $e) {
-+            $this->logger->critical($e);
-+            // return empty search result in case an exception is thrown from Elasticsearch
-+            $rawResponse = self::$emptyRawResponse;
-+        }
- 
-+        $rawDocuments = isset($rawResponse['hits']['hits']) ? $rawResponse['hits']['hits'] : [];
-         $queryResponse = $this->responseFactory->create(
-             [
-                 'documents' => $rawDocuments,
-                 'aggregations' => $aggregationBuilder->build($request, $rawResponse),
-+                'total' => isset($rawResponse['hits']['total']) ? $rawResponse['hits']['total'] : 0
-             ]
-         );
-         return $queryResponse;
-diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php
-index db961d86962..09968db00aa 100644
---- a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php
-+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php
-@@ -3,8 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query;
- 
-+use Magento\Elasticsearch\SearchAdapter\Query\Builder\Sort;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Search\RequestInterface;
- use Magento\Elasticsearch\Model\Config;
- use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
-@@ -12,6 +15,8 @@ use Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation as Aggregation
- use Magento\Framework\App\ScopeResolverInterface;
- 
- /**
-+ * Query builder for search adapter.
-+ *
-  * @api
-  * @since 100.1.0
-  */
-@@ -41,22 +46,30 @@ class Builder
-      */
-     protected $scopeResolver;
- 
-+    /**
-+     * @var Sort
-+     */
-+    protected $sortBuilder;
-+
-     /**
-      * @param Config $clientConfig
-      * @param SearchIndexNameResolver $searchIndexNameResolver
-      * @param AggregationBuilder $aggregationBuilder
-      * @param ScopeResolverInterface $scopeResolver
-+     * @param Sort|null $sortBuilder
-      */
-     public function __construct(
-         Config $clientConfig,
-         SearchIndexNameResolver $searchIndexNameResolver,
-         AggregationBuilder $aggregationBuilder,
--        ScopeResolverInterface $scopeResolver
-+        ScopeResolverInterface $scopeResolver,
-+        Sort $sortBuilder = null
-     ) {
-         $this->clientConfig = $clientConfig;
-         $this->searchIndexNameResolver = $searchIndexNameResolver;
-         $this->aggregationBuilder = $aggregationBuilder;
-         $this->scopeResolver = $scopeResolver;
-+        $this->sortBuilder = $sortBuilder ?: ObjectManager::getInstance()->get(Sort::class);
-     }
- 
-     /**
-@@ -70,6 +83,7 @@ class Builder
-     {
-         $dimension = current($request->getDimensions());
-         $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId();
-+
-         $searchQuery = [
-             'index' => $this->searchIndexNameResolver->getIndexName($storeId, $request->getIndex()),
-             'type' => $this->clientConfig->getEntityType(),
-@@ -77,6 +91,7 @@ class Builder
-                 'from' => $request->getFrom(),
-                 'size' => $request->getSize(),
-                 'stored_fields' => ['_id', '_score'],
-+                'sort' => $this->sortBuilder->getSort($request),
-                 'query' => [],
-             ],
-         ];
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php
-index e2de4aec717..0e130c24e79 100644
---- a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php
-@@ -3,10 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Elasticsearch\Model\Adapter\BatchDataMapper;
- 
- use Magento\Elasticsearch\Model\ResourceModel\Index;
- use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
- 
- /**
-  * Provide data mapping for categories fields
-@@ -18,16 +22,35 @@ class CategoryFieldsProvider implements AdditionalFieldsProviderInterface
-      */
-     private $resourceIndex;
- 
-+    /**
-+     * @var AttributeProvider
-+     */
-+    private $attributeAdapterProvider;
-+
-+    /**
-+     * @var ResolverInterface
-+     */
-+    private $fieldNameResolver;
-+
-     /**
-      * @param Index $resourceIndex
-+     * @param AttributeProvider|null $attributeAdapterProvider
-+     * @param ResolverInterface|null $fieldNameResolver
-      */
--    public function __construct(Index $resourceIndex)
--    {
-+    public function __construct(
-+        Index $resourceIndex,
-+        AttributeProvider $attributeAdapterProvider = null,
-+        ResolverInterface $fieldNameResolver = null
-+    ) {
-         $this->resourceIndex = $resourceIndex;
-+        $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
-+            ->get(AttributeProvider::class);
-+        $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
-+            ->get(ResolverInterface::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFields(array $productIds, $storeId)
-     {
-@@ -58,9 +81,19 @@ class CategoryFieldsProvider implements AdditionalFieldsProviderInterface
- 
-             if (count($categoryIds)) {
-                 $result = ['category_ids' => implode(' ', $categoryIds)];
-+                $positionAttribute = $this->attributeAdapterProvider->getByAttributeCode('position');
-+                $categoryNameAttribute = $this->attributeAdapterProvider->getByAttributeCode('category_name');
-                 foreach ($indexData as $data) {
--                    $result['position_category_' . $data['id']] = $data['position'];
--                    $result['name_category_' . $data['id']] = $data['name'];
-+                    $categoryPositionKey = $this->fieldNameResolver->getFieldName(
-+                        $positionAttribute,
-+                        ['categoryId' => $data['id']]
-+                    );
-+                    $categoryNameKey = $this->fieldNameResolver->getFieldName(
-+                        $categoryNameAttribute,
-+                        ['categoryId' => $data['id']]
-+                    );
-+                    $result[$categoryPositionKey] = $data['position'];
-+                    $result[$categoryNameKey] = $data['name'];
-                 }
-             }
-         }
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php
-index f5e8a23525a..56c84593256 100644
---- a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php
-@@ -3,12 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Elasticsearch\Model\Adapter\BatchDataMapper;
- 
- use Magento\Elasticsearch\Model\ResourceModel\Index;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
- use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
- 
- /**
-  * Provide data mapping for price fields
-@@ -30,33 +34,53 @@ class PriceFieldsProvider implements AdditionalFieldsProviderInterface
-      */
-     private $storeManager;
- 
-+    /**
-+     * @var AttributeProvider
-+     */
-+    private $attributeAdapterProvider;
-+
-+    /**
-+     * @var ResolverInterface
-+     */
-+    private $fieldNameResolver;
-+
-     /**
-      * @param Index $resourceIndex
-      * @param DataProvider $dataProvider
-      * @param StoreManagerInterface $storeManager
-+     * @param AttributeProvider|null $attributeAdapterProvider
-+     * @param ResolverInterface|null $fieldNameResolver
-      */
-     public function __construct(
-         Index $resourceIndex,
-         DataProvider $dataProvider,
--        StoreManagerInterface $storeManager
-+        StoreManagerInterface $storeManager,
-+        AttributeProvider $attributeAdapterProvider = null,
-+        ResolverInterface $fieldNameResolver = null
-     ) {
-         $this->resourceIndex = $resourceIndex;
-         $this->dataProvider = $dataProvider;
-         $this->storeManager = $storeManager;
-+        $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
-+            ->get(AttributeProvider::class);
-+        $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
-+            ->get(ResolverInterface::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFields(array $productIds, $storeId)
-     {
-+        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
-+        
-         $priceData = $this->dataProvider->getSearchableAttribute('price')
-             ? $this->resourceIndex->getPriceIndexData($productIds, $storeId)
-             : [];
- 
-         $fields = [];
-         foreach ($productIds as $productId) {
--            $fields[$productId] = $this->getProductPriceData($productId, $storeId, $priceData);
-+            $fields[$productId] = $this->getProductPriceData($productId, $websiteId, $priceData);
-         }
- 
-         return $fields;
-@@ -75,8 +99,12 @@ class PriceFieldsProvider implements AdditionalFieldsProviderInterface
-         $result = [];
-         if (array_key_exists($productId, $priceIndexData)) {
-             $productPriceIndexData = $priceIndexData[$productId];
-+            $priceAttribute = $this->attributeAdapterProvider->getByAttributeCode('price');
-             foreach ($productPriceIndexData as $customerGroupId => $price) {
--                $fieldName = 'price_' . $customerGroupId . '_' . $websiteId;
-+                $fieldName = $this->fieldNameResolver->getFieldName(
-+                    $priceAttribute,
-+                    ['customerGroupId' => $customerGroupId, 'websiteId' => $websiteId]
-+                );
-                 $result[$fieldName] = sprintf('%F', $price);
-             }
-         }
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
-index 4d329f212dd..270ca37e2d4 100644
---- a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
-@@ -6,18 +6,24 @@
- namespace Magento\Elasticsearch\Model\Adapter\BatchDataMapper;
- 
- use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
--use Magento\Eav\Api\Data\AttributeInterface;
-+use Magento\Eav\Model\Entity\Attribute;
- use Magento\Elasticsearch\Model\Adapter\Document\Builder;
- use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
- use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
- use Magento\Elasticsearch\Model\Adapter\FieldType\Date as DateFieldType;
- use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
-+use Magento\Eav\Api\Data\AttributeOptionInterface;
- 
- /**
-  * Map product index data to search engine metadata
-  */
- class ProductDataMapper implements BatchDataMapperInterface
- {
-+    /**
-+     * @var AttributeOptionInterface[]
-+     */
-+    private $attributeOptionsCache;
-+
-     /**
-      * @var Builder
-      */
-@@ -33,11 +39,6 @@ class ProductDataMapper implements BatchDataMapperInterface
-      */
-     private $dateFieldType;
- 
--    /**
--     * @var array
--     */
--    private $attributeData = [];
--
-     /**
-      * @var array
-      */
-@@ -100,15 +101,19 @@ class ProductDataMapper implements BatchDataMapperInterface
-         $this->excludedAttributes = array_merge($this->defaultExcludedAttributes, $excludedAttributes);
-         $this->additionalFieldsProvider = $additionalFieldsProvider;
-         $this->dataProvider = $dataProvider;
-+        $this->attributeOptionsCache = [];
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Map index data for using in search engine metadata
-+     *
-+     * @param array $documentData
-+     * @param int $storeId
-+     * @param array $context
-+     * @return array
-      */
-     public function map(array $documentData, $storeId, array $context = [])
-     {
--        // reset attribute data for new store
--        $this->attributeData = [];
-         $documents = [];
- 
-         foreach ($documentData as $productId => $indexData) {
-@@ -120,9 +125,7 @@ class ProductDataMapper implements BatchDataMapperInterface
-                     $this->builder->addField($attributeCode, $value);
-                     continue;
-                 }
--                if (in_array($attributeCode, $this->excludedAttributes, true)) {
--                    continue;
--                }
-+
-                 $this->builder->addField(
-                     $this->fieldMapper->getFieldName(
-                         $attributeCode,
-@@ -146,208 +149,179 @@ class ProductDataMapper implements BatchDataMapperInterface
-     }
- 
-     /**
--     * Convert raw data retrieved from source tables to human-readable format
--     * E.g. [42 => [1 => 2]] will be converted to ['color' => '2', 'color_value' => 'red']
-+     * Convert raw data retrieved from source tables to human-readable format.
-      *
-      * @param int $productId
-      * @param array $indexData
-      * @param int $storeId
-      * @return array
-      */
--    private function convertToProductData($productId, array $indexData, $storeId)
-+    private function convertToProductData(int $productId, array $indexData, int $storeId): array
-     {
-         $productAttributes = [];
--        foreach ($indexData as $attributeId => $attributeValue) {
--            $attributeData = $this->getAttributeData($attributeId);
--            if (!$attributeData) {
-+
-+        if (isset($indexData['options'])) {
-+            // cover case with "options"
-+            // see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::prepareProductIndex
-+            $productAttributes['options'] = $indexData['options'];
-+            unset($indexData['options']);
-+        }
-+
-+        foreach ($indexData as $attributeId => $attributeValues) {
-+            $attribute = $this->dataProvider->getSearchableAttribute($attributeId);
-+            if (in_array($attribute->getAttributeCode(), $this->excludedAttributes, true)) {
-                 continue;
-             }
--            $productAttributes = array_merge(
--                $productAttributes,
--                $this->convertAttribute(
--                    $productId,
--                    $attributeId,
--                    $attributeValue,
--                    $attributeData,
--                    $storeId
--                )
--            );
-+
-+            if (!\is_array($attributeValues)) {
-+                $attributeValues = [$productId => $attributeValues];
-+            }
-+            $attributeValues = $this->prepareAttributeValues($productId, $attribute, $attributeValues, $storeId);
-+            $productAttributes += $this->convertAttribute($attribute, $attributeValues);
-         }
-+
-         return $productAttributes;
-     }
- 
-     /**
--     * Convert data for attribute: 1) add new value {attribute_code}_value for select and multiselect searchable
--     * attributes, that will contain actual value 2) add child products data to composite products
-+     * Convert data for attribute, add {attribute_code}_value for searchable attributes, that contain actual value.
-      *
--     * @param int $productId
--     * @param int $attributeId
--     * @param mixed $attributeValue
--     * @param array $attributeData
--     * @param int $storeId
-+     * @param Attribute $attribute
-+     * @param array $attributeValues
-      * @return array
-      */
--    private function convertAttribute($productId, $attributeId, $attributeValue, array $attributeData, $storeId)
-+    private function convertAttribute(Attribute $attribute, array $attributeValues): array
-     {
-         $productAttributes = [];
--        $attributeCode = $attributeData[AttributeInterface::ATTRIBUTE_CODE];
--        $attributeFrontendInput = $attributeData[AttributeInterface::FRONTEND_INPUT];
--        if (is_array($attributeValue)) {
--            if (!$attributeData['is_searchable']) {
--                $value = $this->getValueForAttribute(
--                    $productId,
--                    $attributeCode,
--                    $attributeValue,
--                    $attributeData['is_searchable']
--                );
--            } else {
--                if (($attributeFrontendInput == 'select' || $attributeFrontendInput == 'multiselect')
--                    && !in_array($attributeCode, $this->excludedAttributes)
--                ) {
--                    $value = $this->getValueForAttribute(
--                        $productId,
--                        $attributeCode,
--                        $attributeValue,
--                        $attributeData['is_searchable']
--                    );
--                    $productAttributes[$attributeCode . '_value'] = $this->getValueForAttributeOptions(
--                        $attributeData,
--                        $attributeValue
--                    );
--                } else {
--                    $value = implode(' ', $attributeValue);
--                }
--            }
--        } else {
--            $value = $attributeValue;
--        }
- 
--        // cover case with "options"
--        // see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::prepareProductIndex
--        if ($value) {
--            if ($attributeId === 'options') {
--                $productAttributes[$attributeId] = $value;
--            } else {
--                if (isset($attributeData[AttributeInterface::OPTIONS][$value])) {
--                    $productAttributes[$attributeCode . '_value'] = $attributeData[AttributeInterface::OPTIONS][$value];
-+        $retrievedValue = $this->retrieveFieldValue($attributeValues);
-+        if ($retrievedValue) {
-+            $productAttributes[$attribute->getAttributeCode()] = $retrievedValue;
-+
-+            if ($attribute->getIsSearchable()) {
-+                $attributeLabels = $this->getValuesLabels($attribute, $attributeValues);
-+                $retrievedLabel = $this->retrieveFieldValue($attributeLabels);
-+                if ($retrievedLabel) {
-+                    $productAttributes[$attribute->getAttributeCode() . '_value'] = $retrievedLabel;
-                 }
--                $productAttributes[$attributeCode] = $this->formatProductAttributeValue(
--                    $value,
--                    $attributeData,
--                    $storeId
--                );
-             }
-         }
-+
-         return $productAttributes;
-     }
- 
-     /**
--     * Get product attribute data by attribute id
-+     * Prepare attribute values.
-      *
--     * @param int $attributeId
-+     * @param int $productId
-+     * @param Attribute $attribute
-+     * @param array $attributeValues
-+     * @param int $storeId
-      * @return array
-      */
--    private function getAttributeData($attributeId)
--    {
--        if (!array_key_exists($attributeId, $this->attributeData)) {
--            $attribute = $this->dataProvider->getSearchableAttribute($attributeId);
--            if ($attribute) {
--                $options = [];
--                if ($attribute->getFrontendInput() === 'select' || $attribute->getFrontendInput() === 'multiselect') {
--                    foreach ($attribute->getOptions() as $option) {
--                        $options[$option->getValue()] = $option->getLabel();
--                    }
--                }
--                $this->attributeData[$attributeId] = [
--                    AttributeInterface::ATTRIBUTE_CODE => $attribute->getAttributeCode(),
--                    AttributeInterface::FRONTEND_INPUT => $attribute->getFrontendInput(),
--                    AttributeInterface::BACKEND_TYPE => $attribute->getBackendType(),
--                    AttributeInterface::OPTIONS => $options,
--                    'is_searchable' => $attribute->getIsSearchable(),
--                ];
--            } else {
--                $this->attributeData[$attributeId] = null;
-+    private function prepareAttributeValues(
-+        int $productId,
-+        Attribute $attribute,
-+        array $attributeValues,
-+        int $storeId
-+    ): array {
-+        if (in_array($attribute->getAttributeCode(), $this->attributesExcludedFromMerge, true)) {
-+            $attributeValues = [
-+                $productId => $attributeValues[$productId] ?? '',
-+            ];
-+        }
-+
-+        if ($attribute->getFrontendInput() === 'multiselect') {
-+            $attributeValues = $this->prepareMultiselectValues($attributeValues);
-+        }
-+
-+        if ($this->isAttributeDate($attribute)) {
-+            foreach ($attributeValues as $key => $attributeValue) {
-+                $attributeValues[$key] = $this->dateFieldType->formatDate($storeId, $attributeValue);
-             }
-         }
- 
--        return $this->attributeData[$attributeId];
-+        return $attributeValues;
-     }
- 
-     /**
--     * Format product attribute value for search engine
-+     * Prepare multiselect values.
-      *
--     * @param mixed $value
--     * @param array $attributeData
--     * @param string $storeId
--     * @return string
-+     * @param array $values
-+     * @return array
-      */
--    private function formatProductAttributeValue($value, $attributeData, $storeId)
-+    private function prepareMultiselectValues(array $values): array
-     {
--        if ($attributeData[AttributeInterface::FRONTEND_INPUT] === 'date'
--            || in_array($attributeData[AttributeInterface::BACKEND_TYPE], ['datetime', 'timestamp'])) {
--            return $this->dateFieldType->formatDate($storeId, $value);
--        } elseif ($attributeData[AttributeInterface::FRONTEND_INPUT] === 'multiselect') {
--            return str_replace(',', ' ', $value);
--        } else {
--            return $value;
--        }
-+        return \array_merge(...\array_map(function (string $value) {
-+            return \explode(',', $value);
-+        }, $values));
-     }
- 
-     /**
--     * Return single value if value exists for the productId in array, otherwise return concatenated array values
-+     * Is attribute date.
-      *
--     * @param int $productId
--     * @param string $attributeCode
--     * @param array $attributeValue
--     * @param bool $isSearchable
--     * @return mixed
-+     * @param Attribute $attribute
-+     * @return bool
-      */
--    private function getValueForAttribute($productId, $attributeCode, array $attributeValue, $isSearchable)
-+    private function isAttributeDate(Attribute $attribute): bool
-     {
--        if ((!$isSearchable || in_array($attributeCode, $this->attributesExcludedFromMerge))
--            && isset($attributeValue[$productId])
--        ) {
--            $value = $attributeValue[$productId];
--        } elseif (in_array($attributeCode, $this->attributesExcludedFromMerge) && !isset($attributeValue[$productId])) {
--            $value = '';
--        } else {
--            $value = implode(' ', $attributeValue);
--        }
--        return $value;
-+        return $attribute->getFrontendInput() === 'date'
-+            || in_array($attribute->getBackendType(), ['datetime', 'timestamp'], true);
-     }
- 
-     /**
--     * Concatenate select and multiselect attribute values
-+     * Get values labels.
-      *
--     * @param array $attributeData
--     * @param array $attributeValue
--     * @return string
-+     * @param Attribute $attribute
-+     * @param array $attributeValues
-+     * @return array
-      */
--    private function getValueForAttributeOptions(array $attributeData, array $attributeValue)
-+    private function getValuesLabels(Attribute $attribute, array $attributeValues): array
-     {
--        $result = null;
--        $selectedValues = [];
--        if ($attributeData[AttributeInterface::FRONTEND_INPUT] == 'select') {
--            foreach ($attributeValue as $selectedValue) {
--                if (isset($attributeData[AttributeInterface::OPTIONS][$selectedValue])) {
--                    $selectedValues[] = $attributeData[AttributeInterface::OPTIONS][$selectedValue];
--                }
--            }
-+        $attributeLabels = [];
-+
-+        $options = $this->getAttributeOptions($attribute);
-+        if (empty($options)) {
-+            return $attributeLabels;
-         }
--        if ($attributeData[AttributeInterface::FRONTEND_INPUT] == 'multiselect') {
--            foreach ($attributeValue as $selectedAttributeValues) {
--                $selectedAttributeValues = explode(',', $selectedAttributeValues);
--                foreach ($selectedAttributeValues as $selectedValue) {
--                    if (isset($attributeData[AttributeInterface::OPTIONS][$selectedValue])) {
--                        $selectedValues[] = $attributeData[AttributeInterface::OPTIONS][$selectedValue];
--                    }
--                }
-+
-+        foreach ($options as $option) {
-+            if (\in_array($option->getValue(), $attributeValues)) {
-+                $attributeLabels[] = $option->getLabel();
-             }
-         }
--        $selectedValues = array_unique($selectedValues);
--        if (!empty($selectedValues)) {
--            $result = implode(' ', $selectedValues);
-+
-+        return $attributeLabels;
-+    }
-+
-+    /**
-+     * Retrieve options for attribute
-+     *
-+     * @param Attribute $attribute
-+     * @return array
-+     */
-+    private function getAttributeOptions(Attribute $attribute): array
-+    {
-+        if (!isset($this->attributeOptionsCache[$attribute->getId()])) {
-+            $options = $attribute->getOptions() ?? [];
-+            $this->attributeOptionsCache[$attribute->getId()] = $options;
-         }
--        return $result;
-+
-+        return $this->attributeOptionsCache[$attribute->getId()];
-+    }
-+
-+    /**
-+     * Retrieve value for field. If field have only one value this method return it.
-+     * Otherwise will be returned array of these values.
-+     * Note: array of values must have index keys, not as associative array.
-+     *
-+     * @param array $values
-+     * @return array|string
-+     */
-+    private function retrieveFieldValue(array $values)
-+    {
-+        $values = \array_filter(\array_unique($values));
-+
-+        return count($values) === 1 ? \array_shift($values) : \array_values($values);
-     }
- }
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/ProductDataMapper.php
-index da37c8d7647..24b740b554f 100644
---- a/app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/ProductDataMapper.php
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/ProductDataMapper.php
-@@ -5,48 +5,15 @@
-  */
- namespace Magento\Elasticsearch\Model\Adapter\DataMapper;
- 
--use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
--use Magento\Store\Model\StoreManagerInterface;
--use Magento\Customer\Api\Data\GroupInterface;
- use Magento\Elasticsearch\Model\Adapter\DataMapperInterface;
- use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper\ProductDataMapper as ElasticSearch5ProductDataMapper;
- 
- /**
-+ * Don't use this product data mapper class.
-+ *
-  * @deprecated 100.2.0
-  * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface
-  */
- class ProductDataMapper extends ElasticSearch5ProductDataMapper implements DataMapperInterface
- {
--    /**
--     * Prepare category index data for product
--     *
--     * @param int $productId
--     * @param array $categoryIndexData
--     * @return array
--     */
--    protected function getProductCategoryData($productId, array $categoryIndexData)
--    {
--        $result = [];
--        $categoryIds = [];
--
--        if (array_key_exists($productId, $categoryIndexData)) {
--            $indexData = $categoryIndexData[$productId];
--            $result = $indexData;
--        }
--
--        if (array_key_exists($productId, $categoryIndexData)) {
--            $indexData = $categoryIndexData[$productId];
--            foreach ($indexData as $categoryData) {
--                $categoryIds[] = $categoryData['id'];
--            }
--            if (count($categoryIds)) {
--                $result = ['category_ids' => implode(' ', $categoryIds)];
--                foreach ($indexData as $data) {
--                    $result['position_category_' . $data['id']] = $data['position'];
--                    $result['name_category_' . $data['id']] = $data['name'];
--                }
--            }
--        }
--        return $result;
--    }
- }
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
-index 7fc45eed356..97a76de4b99 100644
---- a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
-@@ -23,6 +23,11 @@ class Elasticsearch
-     const BULK_ACTION_UPDATE = 'update';
-     /**#@-*/
- 
-+    /**
-+     * Buffer for total fields limit in mapping.
-+     */
-+    private const MAPPING_TOTAL_FIELDS_BUFFER_LIMIT = 1000;
-+
-     /**#@-*/
-     protected $connectionManager;
- 
-@@ -197,7 +202,7 @@ class Elasticsearch
- 
-         // prepare new index name and increase version
-         $indexPattern = $this->indexNameResolver->getIndexPattern($storeId, $mappedIndexerId);
--        $version = intval(str_replace($indexPattern, '', $indexName));
-+        $version = (int)(str_replace($indexPattern, '', $indexName));
-         $newIndexName = $indexPattern . ++$version;
- 
-         // remove index if already exists
-@@ -279,8 +284,9 @@ class Elasticsearch
-      * Checks whether Elasticsearch index and alias exists.
-      *
-      * @param int $storeId
--     * @param bool $checkAlias
-      * @param string $mappedIndexerId
-+     * @param bool $checkAlias
-+     *
-      * @return $this
-      */
-     public function checkIndex(
-@@ -347,13 +353,32 @@ class Elasticsearch
-     protected function prepareIndex($storeId, $indexName, $mappedIndexerId)
-     {
-         $this->indexBuilder->setStoreId($storeId);
--        $this->client->createIndex($indexName, ['settings' => $this->indexBuilder->build()]);
-+        $settings = $this->indexBuilder->build();
-+        $allAttributeTypes = $this->fieldMapper->getAllAttributesTypes([
-+            'entityType' => $mappedIndexerId,
-+            // Use store id instead of website id from context for save existing fields mapping.
-+            // In future websiteId will be eliminated due to index stored per store
-+            'websiteId' => $storeId
-+        ]);
-+        $settings['index']['mapping']['total_fields']['limit'] = $this->getMappingTotalFieldsLimit($allAttributeTypes);
-+        $this->client->createIndex($indexName, ['settings' => $settings]);
-         $this->client->addFieldsMapping(
--            $this->fieldMapper->getAllAttributesTypes(['entityType' => $mappedIndexerId]),
-+            $allAttributeTypes,
-             $indexName,
-             $this->clientConfig->getEntityType()
-         );
-         $this->preparedIndex[$storeId] = $indexName;
-         return $this;
-     }
-+
-+    /**
-+     * Get total fields limit for mapping.
-+     *
-+     * @param array $allAttributeTypes
-+     * @return int
-+     */
-+    private function getMappingTotalFieldsLimit(array $allAttributeTypes): int
-+    {
-+        return count($allAttributeTypes) + self::MAPPING_TOTAL_FIELDS_BUFFER_LIMIT;
-+    }
- }
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter.php
-new file mode 100644
-index 00000000000..54586fa357f
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter.php
-@@ -0,0 +1,188 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product;
-+
-+use Magento\Framework\Api\CustomAttributesDataInterface;
-+
-+/**
-+ * Product attribute adapter for elasticsearch context.
-+ */
-+class AttributeAdapter
-+{
-+    /**
-+     * @var CustomAttributesDataInterface
-+     */
-+    private $attribute;
-+
-+    /**
-+     * @var string
-+     */
-+    private $attributeCode;
-+
-+    /**
-+     * @param CustomAttributesDataInterface $attribute
-+     * @param string $attributeCode
-+     */
-+    public function __construct(
-+        CustomAttributesDataInterface $attribute,
-+        string $attributeCode
-+    ) {
-+        $this->attribute = $attribute;
-+        $this->attributeCode = $attributeCode;
-+    }
-+
-+    /**
-+     * Check if attribute is filterable.
-+     *
-+     * @return bool
-+     */
-+    public function isFilterable(): bool
-+    {
-+        return $this->getAttribute()->getIsFilterable() || $this->getAttribute()->getIsFilterableInSearch();
-+    }
-+
-+    /**
-+     * Check if attribute is searchable.
-+     *
-+     * @return bool
-+     */
-+    public function isSearchable(): bool
-+    {
-+        return $this->getAttribute()->getIsSearchable()
-+            || ($this->getAttribute()->getIsVisibleInAdvancedSearch()
-+                || $this->isFilterable());
-+    }
-+
-+    /**
-+     * Check if attribute is need to index always.
-+     *
-+     * @return bool
-+     */
-+    public function isAlwaysIndexable(): bool
-+    {
-+        // List of attributes which are required to be indexable
-+        $alwaysIndexableAttributes = [
-+            'category_ids',
-+            'visibility',
-+        ];
-+
-+        return in_array($this->getAttributeCode(), $alwaysIndexableAttributes, true);
-+    }
-+
-+    /**
-+     * Check if attribute has date/time type.
-+     *
-+     * @return bool
-+     */
-+    public function isDateTimeType(): bool
-+    {
-+        return in_array($this->getAttribute()->getBackendType(), ['timestamp', 'datetime'], true);
-+    }
-+
-+    /**
-+     * Check if attribute has float type.
-+     *
-+     * @return bool
-+     */
-+    public function isFloatType(): bool
-+    {
-+        return $this->getAttribute()->getBackendType() === 'decimal';
-+    }
-+
-+    /**
-+     * Check if attribute has integer type.
-+     *
-+     * @return bool
-+     */
-+    public function isIntegerType(): bool
-+    {
-+        return in_array($this->getAttribute()->getBackendType(), ['int', 'smallint'], true);
-+    }
-+
-+    /**
-+     * Check if attribute has boolean type.
-+     *
-+     * @return bool
-+     */
-+    public function isBooleanType(): bool
-+    {
-+        return in_array($this->getAttribute()->getFrontendInput(), ['select', 'boolean'], true)
-+            && $this->getAttribute()->getBackendType() !== 'varchar';
-+    }
-+
-+    /**
-+     * Check if attribute has boolean type.
-+     *
-+     * @return bool
-+     */
-+    public function isComplexType(): bool
-+    {
-+        return in_array($this->getAttribute()->getFrontendInput(), ['select', 'multiselect'], true)
-+            || $this->getAttribute()->usesSource();
-+    }
-+
-+    /**
-+     * Check if product attribute is EAV.
-+     *
-+     * @return bool
-+     */
-+    public function isEavAttribute(): bool
-+    {
-+        return $this->getAttribute() instanceof \Magento\Eav\Api\Data\AttributeInterface;
-+    }
-+
-+    /**
-+     * Get attribute code.
-+     *
-+     * @return string
-+     */
-+    public function getAttributeCode(): string
-+    {
-+        return $this->attributeCode;
-+    }
-+
-+    /**
-+     * Check if attribute is sortable.
-+     *
-+     * @return bool
-+     */
-+    public function isSortable(): bool
-+    {
-+        return (int)$this->getAttribute()->getUsedForSortBy() === 1;
-+    }
-+
-+    /**
-+     * Check if attribute is defined by user.
-+     *
-+     * @return string
-+     */
-+    public function isUserDefined(): string
-+    {
-+        return $this->getAttribute()->getIsUserDefined();
-+    }
-+
-+    /**
-+     * Frontend HTML for input element.
-+     *
-+     * @return string
-+     */
-+    public function getFrontendInput()
-+    {
-+        return $this->getAttribute()->getFrontendInput();
-+    }
-+
-+    /**
-+     * Get product attribute instance.
-+     *
-+     * @return CustomAttributesDataInterface|\Magento\Eav\Api\Data\AttributeInterface
-+     */
-+    private function getAttribute(): CustomAttributesDataInterface
-+    {
-+        return $this->attribute;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter/DummyAttribute.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter/DummyAttribute.php
-new file mode 100644
-index 00000000000..19b9f85c44b
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter/DummyAttribute.php
-@@ -0,0 +1,82 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+
-+use Magento\Framework\Api\CustomAttributesDataInterface;
-+
-+/**
-+ * Dummy class for Not EAV attribute.
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class DummyAttribute implements CustomAttributesDataInterface
-+{
-+    /**
-+     * Get an attribute value.
-+     *
-+     * @param string $attributeCode
-+     * @return \Magento\Framework\Api\AttributeInterface|null
-+     */
-+    public function getCustomAttribute($attributeCode)
-+    {
-+        return null;
-+    }
-+
-+    /**
-+     * Set an attribute value for a given attribute code
-+     *
-+     * @param string $attributeCode
-+     * @param mixed $attributeValue
-+     * @return $this
-+     */
-+    public function setCustomAttribute($attributeCode, $attributeValue)
-+    {
-+        return $this;
-+    }
-+
-+    /**
-+     * Retrieve custom attributes values.
-+     *
-+     * @return \Magento\Framework\Api\AttributeInterface[]|null
-+     */
-+    public function getCustomAttributes()
-+    {
-+        return null;
-+    }
-+
-+    /**
-+     * Set array of custom attributes
-+     *
-+     * @param \Magento\Framework\Api\AttributeInterface[] $attributes
-+     * @return $this
-+     * @throws \LogicException
-+     */
-+    public function setCustomAttributes(array $attributes)
-+    {
-+        return $this;
-+    }
-+
-+    /**
-+     * Get property value that guarantee of using an attribute in sort purposes on the storefront.
-+     *
-+     * @return bool
-+     */
-+    public function getUsedForSortBy()
-+    {
-+        return false;
-+    }
-+
-+    /**
-+     * Dummy attribute doesn't have backend type.
-+     *
-+     * @return null
-+     */
-+    public function getBackendType()
-+    {
-+        return null;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeProvider.php
-new file mode 100644
-index 00000000000..89c98d29ae0
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeProvider.php
-@@ -0,0 +1,90 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product;
-+
-+use Magento\Eav\Model\Config;
-+use Magento\Catalog\Api\Data\ProductAttributeInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter\DummyAttribute;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * Provide attribute adapter.
-+ */
-+class AttributeProvider
-+{
-+    /**
-+     * Object Manager instance
-+     *
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * Instance name to create
-+     *
-+     * @var string
-+     */
-+    private $instanceName;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $eavConfig;
-+
-+    /**
-+     * @var array
-+     */
-+    private $cachedPool = [];
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * Factory constructor
-+     *
-+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
-+     * @param Config $eavConfig
-+     * @param LoggerInterface $logger
-+     * @param string $instanceName
-+     */
-+    public function __construct(
-+        \Magento\Framework\ObjectManagerInterface $objectManager,
-+        Config $eavConfig,
-+        LoggerInterface $logger,
-+        $instanceName = AttributeAdapter::class
-+    ) {
-+        $this->objectManager = $objectManager;
-+        $this->instanceName = $instanceName;
-+        $this->eavConfig = $eavConfig;
-+        $this->logger = $logger;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getByAttributeCode(string $attributeCode): AttributeAdapter
-+    {
-+        if (!isset($this->cachedPool[$attributeCode])) {
-+            $attribute = $this->eavConfig->getAttribute(
-+                ProductAttributeInterface::ENTITY_TYPE_CODE,
-+                $attributeCode
-+            );
-+            if (null === $attribute) {
-+                $attribute = $this->objectManager->create(DummyAttribute::class);
-+            }
-+            $this->cachedPool[$attributeCode] = $this->objectManager->create(
-+                $this->instanceName,
-+                ['attribute' => $attribute, 'attributeCode' => $attributeCode]
-+            );
-+        }
-+
-+        return $this->cachedPool[$attributeCode];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/CompositeFieldProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/CompositeFieldProvider.php
-new file mode 100644
-index 00000000000..8038c8c05bc
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/CompositeFieldProvider.php
-@@ -0,0 +1,51 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product;
-+
-+/**
-+ * Provide fields for product.
-+ */
-+class CompositeFieldProvider implements FieldProviderInterface
-+{
-+    /**
-+     * @var FieldProviderInterface[]
-+     */
-+    private $providers;
-+
-+    /**
-+     * @param FieldProviderInterface[] $providers
-+     */
-+    public function __construct(array $providers)
-+    {
-+        foreach ($providers as $provider) {
-+            if (!$provider instanceof FieldProviderInterface) {
-+                throw new \InvalidArgumentException(
-+                    sprintf('Instance of the field provider is expected, got %s instead.', get_class($provider))
-+                );
-+            }
-+        }
-+        $this->providers = $providers;
-+    }
-+
-+    /**
-+     * Get fields.
-+     *
-+     * @param array $context
-+     * @return array
-+     */
-+    public function getFields(array $context = []): array
-+    {
-+        $allAttributes = [];
-+
-+        foreach ($this->providers as $provider) {
-+            $allAttributes = array_merge($allAttributes, $provider->getFields($context));
-+        }
-+
-+        return $allAttributes;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
-new file mode 100644
-index 00000000000..268fe00e4c4
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
-@@ -0,0 +1,155 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider;
-+
-+use Magento\Catalog\Api\CategoryListInterface;
-+use Magento\Customer\Api\GroupRepositoryInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
-+    as IndexTypeConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
-+    as FieldNameResolver;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Catalog\Model\ResourceModel\Category\Collection;
-+use Magento\Framework\App\ObjectManager;
-+
-+/**
-+ * Provide dynamic fields for product.
-+ */
-+class DynamicField implements FieldProviderInterface
-+{
-+    /**
-+     * Category list.
-+     *
-+     * @deprecated
-+     * @var CategoryListInterface
-+     */
-+    private $categoryList;
-+
-+    /**
-+     * Category collection.
-+     *
-+     * @var Collection
-+     */
-+    private $categoryCollection;
-+
-+    /**
-+     * Customer group repository.
-+     *
-+     * @var GroupRepositoryInterface
-+     */
-+    private $groupRepository;
-+
-+    /**
-+     * Search criteria builder.
-+     *
-+     * @var SearchCriteriaBuilder
-+     */
-+    private $searchCriteriaBuilder;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * @var IndexTypeConverterInterface
-+     */
-+    private $indexTypeConverter;
-+
-+    /**
-+     * @var AttributeProvider
-+     */
-+    private $attributeAdapterProvider;
-+
-+    /**
-+     * @var FieldNameResolver
-+     */
-+    private $fieldNameResolver;
-+
-+    /**
-+     * @param FieldTypeConverterInterface $fieldTypeConverter
-+     * @param IndexTypeConverterInterface $indexTypeConverter
-+     * @param GroupRepositoryInterface $groupRepository
-+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
-+     * @param CategoryListInterface $categoryList
-+     * @param FieldNameResolver $fieldNameResolver
-+     * @param AttributeProvider $attributeAdapterProvider
-+     * @param Collection|null $categoryCollection
-+     */
-+    public function __construct(
-+        FieldTypeConverterInterface $fieldTypeConverter,
-+        IndexTypeConverterInterface $indexTypeConverter,
-+        GroupRepositoryInterface $groupRepository,
-+        SearchCriteriaBuilder $searchCriteriaBuilder,
-+        CategoryListInterface $categoryList,
-+        FieldNameResolver $fieldNameResolver,
-+        AttributeProvider $attributeAdapterProvider,
-+        Collection $categoryCollection = null
-+    ) {
-+        $this->groupRepository = $groupRepository;
-+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-+        $this->fieldTypeConverter = $fieldTypeConverter;
-+        $this->indexTypeConverter = $indexTypeConverter;
-+        $this->categoryList = $categoryList;
-+        $this->fieldNameResolver = $fieldNameResolver;
-+        $this->attributeAdapterProvider = $attributeAdapterProvider;
-+        $this->categoryCollection = $categoryCollection ?:
-+            ObjectManager::getInstance()->get(Collection::class);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getFields(array $context = []): array
-+    {
-+        $allAttributes = [];
-+        $categoryIds = $this->categoryCollection->getAllIds();
-+        $positionAttribute = $this->attributeAdapterProvider->getByAttributeCode('position');
-+        $categoryNameAttribute = $this->attributeAdapterProvider->getByAttributeCode('category_name');
-+        foreach ($categoryIds as $categoryId) {
-+            $categoryPositionKey = $this->fieldNameResolver->getFieldName(
-+                $positionAttribute,
-+                ['categoryId' => $categoryId]
-+            );
-+            $categoryNameKey = $this->fieldNameResolver->getFieldName(
-+                $categoryNameAttribute,
-+                ['categoryId' => $categoryId]
-+            );
-+            $allAttributes[$categoryPositionKey] = [
-+                'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING),
-+                'index' => $this->indexTypeConverter->convert(IndexTypeConverterInterface::INTERNAL_NO_INDEX_VALUE)
-+            ];
-+            $allAttributes[$categoryNameKey] = [
-+                'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING),
-+                'index' => $this->indexTypeConverter->convert(IndexTypeConverterInterface::INTERNAL_NO_INDEX_VALUE)
-+            ];
-+        }
-+
-+        $searchCriteria = $this->searchCriteriaBuilder->create();
-+        $groups = $this->groupRepository->getList($searchCriteria)->getItems();
-+        $priceAttribute = $this->attributeAdapterProvider->getByAttributeCode('price');
-+        $ctx = isset($context['websiteId']) ? ['websiteId' => $context['websiteId']] : [];
-+        foreach ($groups as $group) {
-+            $ctx['customerGroupId'] = $group->getId();
-+            $groupPriceKey = $this->fieldNameResolver->getFieldName(
-+                $priceAttribute,
-+                $ctx
-+            );
-+            $allAttributes[$groupPriceKey] = [
-+                'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_FLOAT),
-+                'store' => true
-+            ];
-+        }
-+
-+        return $allAttributes;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
-new file mode 100644
-index 00000000000..535ab62dd59
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
-+
-+/**
-+ * Field type converter from internal index type to elastic service.
-+ */
-+class Converter implements ConverterInterface
-+{
-+    /**
-+     * Text flags for Elasticsearch index value
-+     */
-+    private const ES_NO_INDEX = 'no';
-+
-+    /**
-+     * Text flags for Elasticsearch no analyze index value
-+     */
-+    private const ES_NO_ANALYZE = 'not_analyzed';
-+
-+    /**
-+     * Mapping between internal data types and elastic service.
-+     *
-+     * @var array
-+     */
-+    private $mapping = [
-+        ConverterInterface::INTERNAL_NO_INDEX_VALUE => self::ES_NO_INDEX,
-+        ConverterInterface::INTERNAL_NO_ANALYZE_VALUE => self::ES_NO_ANALYZE,
-+    ];
-+
-+    /**
-+     * Get service field index type for elasticsearch 2.
-+     *
-+     * @param string $internalType
-+     * @return string|boolean
-+     * @throws \DomainException
-+     */
-+    public function convert(string $internalType)
-+    {
-+        if (!isset($this->mapping[$internalType])) {
-+            throw new \DomainException(sprintf('Unsupported internal field index type: %s', $internalType));
-+        }
-+        return $this->mapping[$internalType];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ConverterInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ConverterInterface.php
-new file mode 100644
-index 00000000000..5ecfd624300
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ConverterInterface.php
-@@ -0,0 +1,29 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
-+
-+/**
-+ * Field type converter from internal index value to elastic service.
-+ */
-+interface ConverterInterface
-+{
-+    /**#@+
-+     * Text flags for internal no index value.
-+     */
-+    public const INTERNAL_NO_INDEX_VALUE = 'no_index';
-+    public const INTERNAL_INDEX_VALUE = 'index';
-+    public const INTERNAL_NO_ANALYZE_VALUE = 'no_analyze';
-+
-+    /**
-+     * Get service field index type.
-+     *
-+     * @param string $internalType
-+     * @return string|boolean
-+     */
-+    public function convert(string $internalType);
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php
-new file mode 100644
-index 00000000000..590430a7e24
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php
-@@ -0,0 +1,44 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+
-+/**
-+ * Field index resolver that provides index type for the attribute in mapping.
-+ * For example, we need to set ‘no’/false in the case when attribute must be present in index data,
-+ * but stay as not indexable.
-+ */
-+class IndexResolver implements ResolverInterface
-+{
-+    /**
-+     * @var ConverterInterface
-+     */
-+    private $converter;
-+
-+    /**
-+     * @param ConverterInterface $converter
-+     */
-+    public function __construct(ConverterInterface $converter)
-+    {
-+        $this->converter = $converter;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getFieldIndex(AttributeAdapter $attribute)
-+    {
-+        $index = null;
-+        if (!($attribute->isSearchable() || $attribute->isAlwaysIndexable())) {
-+            $index = $this->converter->convert(ConverterInterface::INTERNAL_NO_INDEX_VALUE);
-+        }
-+
-+        return $index;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ResolverInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ResolverInterface.php
-new file mode 100644
-index 00000000000..663b1d865fb
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ResolverInterface.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+
-+/**
-+ * Field index type resolver interface.
-+ */
-+interface ResolverInterface
-+{
-+    /**
-+     * Get field index.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @return string|boolean
-+     */
-+    public function getFieldIndex(AttributeAdapter $attribute);
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryName.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryName.php
-new file mode 100644
-index 00000000000..5824aca6cdd
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryName.php
-@@ -0,0 +1,76 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Framework\Registry;
-+use Magento\Store\Model\StoreManagerInterface as StoreManager;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
-+use Magento\Framework\App\ObjectManager;
-+
-+/**
-+ * Resolver field name for Category name attribute.
-+ */
-+class CategoryName implements ResolverInterface
-+{
-+    /**
-+     * @var StoreManager
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var Registry
-+     */
-+    private $coreRegistry;
-+
-+    /**
-+     * @param StoreManager $storeManager
-+     * @param Registry $coreRegistry
-+     */
-+    public function __construct(
-+        StoreManager $storeManager = null,
-+        Registry $coreRegistry = null
-+    ) {
-+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
-+            ->get(StoreManager::class);
-+        $this->coreRegistry = $coreRegistry ?: ObjectManager::getInstance()
-+            ->get(Registry::class);
-+    }
-+
-+    /**
-+     * Get field name.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @param array $context
-+     * @return string
-+     */
-+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
-+    {
-+        if ($attribute->getAttributeCode() === 'category_name') {
-+            return 'name_category_' . $this->resolveCategoryId($context);
-+        }
-+
-+        return null;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    private function resolveCategoryId($context): int
-+    {
-+        if (isset($context['categoryId'])) {
-+            $id = $context['categoryId'];
-+        } else {
-+            $id = $this->coreRegistry->registry('current_category')
-+                ? $this->coreRegistry->registry('current_category')->getId()
-+                : $this->storeManager->getStore()->getRootCategoryId();
-+        }
-+
-+        return (int)$id;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CompositeResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CompositeResolver.php
-new file mode 100644
-index 00000000000..f1fed3f06fe
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CompositeResolver.php
-@@ -0,0 +1,57 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
-+
-+/**
-+ * Composite class for resolving field name.
-+ */
-+class CompositeResolver implements ResolverInterface
-+{
-+    /**
-+     * @var ResolverInterface[]
-+     */
-+    private $items;
-+
-+    /**
-+     * @param ResolverInterface[] $items
-+     */
-+    public function __construct(array $items)
-+    {
-+        foreach ($items as $item) {
-+            if (!$item instanceof ResolverInterface) {
-+                throw new \InvalidArgumentException(
-+                    sprintf('Instance of the field name resolver is expected, got %s instead.', get_class($item))
-+                );
-+            }
-+        }
-+        $this->items = $items;
-+    }
-+
-+    /**
-+     * Get field name.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @param array $context
-+     * @return string
-+     */
-+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
-+    {
-+        $result = null;
-+        foreach ($this->items as $item) {
-+            $result = $item->getFieldName($attribute, $context);
-+            if (null !== $result) {
-+                break;
-+            }
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
-new file mode 100644
-index 00000000000..5f319daeb3b
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
-@@ -0,0 +1,131 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
-+    as FieldTypeResolver;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+
-+/**
-+ * Default name resolver.
-+ */
-+class DefaultResolver implements ResolverInterface
-+{
-+    /**
-+     * @var FieldTypeResolver
-+     */
-+    private $fieldTypeResolver;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * @param FieldTypeResolver $fieldTypeResolver
-+     * @param FieldTypeConverterInterface $fieldTypeConverter
-+     */
-+    public function __construct(
-+        FieldTypeResolver $fieldTypeResolver,
-+        FieldTypeConverterInterface $fieldTypeConverter
-+    ) {
-+        $this->fieldTypeResolver = $fieldTypeResolver;
-+        $this->fieldTypeConverter = $fieldTypeConverter;
-+    }
-+
-+    /**
-+     * Get field name.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @param array $context
-+     * @return string
-+     */
-+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
-+    {
-+        $attributeCode = $attribute->getAttributeCode();
-+        if (empty($context['type'])) {
-+            return $attributeCode;
-+        }
-+
-+        $fieldType = $this->fieldTypeResolver->getFieldType($attribute);
-+        $frontendInput = $attribute->getFrontendInput();
-+        $fieldName = $attributeCode;
-+        if ($context['type'] === FieldMapperInterface::TYPE_FILTER) {
-+            if ($this->isStringServiceFieldType($fieldType)) {
-+                return $this->getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode);
-+            }
-+            $fieldName = $attributeCode;
-+        } elseif ($context['type'] === FieldMapperInterface::TYPE_QUERY) {
-+            $fieldName = $this->getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode);
-+        } elseif ($context['type'] == FieldMapperInterface::TYPE_SORT && $attribute->isSortable()) {
-+            $fieldName = 'sort_' . $attributeCode;
-+        }
-+
-+        return $fieldName;
-+    }
-+
-+    /**
-+     * Check if service field type for field set as 'string'
-+     *
-+     * @param string $serviceFieldType
-+     * @return bool
-+     */
-+    private function isStringServiceFieldType(string $serviceFieldType): bool
-+    {
-+        $stringTypeKey = $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING);
-+
-+        return $serviceFieldType === $stringTypeKey;
-+    }
-+
-+    /**
-+     * Get field name for query type fields.
-+     *
-+     * @param string $frontendInput
-+     * @param string $fieldType
-+     * @param string $attributeCode
-+     * @return string
-+     */
-+    private function getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode)
-+    {
-+        if ($attributeCode === '*') {
-+            $fieldName = '_all';
-+        } else {
-+            $fieldName = $this->getRefinedFieldName($frontendInput, $fieldType, $attributeCode);
-+        }
-+        return $fieldName;
-+    }
-+
-+    /**
-+     * Prepare field name for complex fields.
-+     *
-+     * @param string $frontendInput
-+     * @param string $fieldType
-+     * @param string $attributeCode
-+     * @return string
-+     */
-+    private function getRefinedFieldName($frontendInput, $fieldType, $attributeCode)
-+    {
-+        $stringTypeKey = $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING);
-+        $keywordTypeKey = $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD);
-+        switch ($frontendInput) {
-+            case 'select':
-+            case 'multiselect':
-+                return in_array($fieldType, [$stringTypeKey, $keywordTypeKey, 'integer'], true)
-+                    ? $attributeCode . '_value'
-+                    : $attributeCode;
-+            case 'boolean':
-+                return $fieldType === 'integer' ? $attributeCode . '_value' : $attributeCode;
-+            default:
-+                return $attributeCode;
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/NotEavAttribute.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/NotEavAttribute.php
-new file mode 100644
-index 00000000000..cbbd15083ee
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/NotEavAttribute.php
-@@ -0,0 +1,33 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
-+
-+/**
-+ * Resolver field name for not EAV attribute.
-+ */
-+class NotEavAttribute implements ResolverInterface
-+{
-+    /**
-+     * Get field name for not EAV attributes.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @param array $context
-+     * @return string
-+     */
-+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
-+    {
-+        if (!$attribute->isEavAttribute()) {
-+            return $attribute->getAttributeCode();
-+        }
-+
-+        return null;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Position.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Position.php
-new file mode 100644
-index 00000000000..044d5d8da9a
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Position.php
-@@ -0,0 +1,72 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Framework\Registry;
-+use Magento\Store\Model\StoreManagerInterface as StoreManager;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
-+use Magento\Framework\App\ObjectManager;
-+
-+/**
-+ * Resolver field name for position attribute.
-+ */
-+class Position implements ResolverInterface
-+{
-+    /**
-+     * @var StoreManager
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var Registry
-+     */
-+    private $coreRegistry;
-+
-+    /**
-+     * @param StoreManager $storeManager
-+     * @param Registry $coreRegistry
-+     */
-+    public function __construct(
-+        StoreManager $storeManager = null,
-+        Registry $coreRegistry = null
-+    ) {
-+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
-+            ->get(StoreManager::class);
-+        $this->coreRegistry = $coreRegistry ?: ObjectManager::getInstance()
-+            ->get(Registry::class);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
-+    {
-+        if ($attribute->getAttributeCode() === 'position') {
-+            return 'position_category_' . $this->resolveCategoryId($context);
-+        }
-+
-+        return null;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    private function resolveCategoryId($context)
-+    {
-+        if (isset($context['categoryId'])) {
-+            $id = $context['categoryId'];
-+        } else {
-+            $id = $this->coreRegistry->registry('current_category')
-+                ? $this->coreRegistry->registry('current_category')->getId()
-+                : $this->storeManager->getStore()->getRootCategoryId();
-+        }
-+
-+        return $id;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Price.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Price.php
-new file mode 100644
-index 00000000000..12e53ca2bd7
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Price.php
-@@ -0,0 +1,63 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Customer\Model\Session as CustomerSession;
-+use Magento\Store\Model\StoreManagerInterface as StoreManager;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
-+
-+/**
-+ * Resolver field name for price attribute.
-+ */
-+class Price implements ResolverInterface
-+{
-+    /**
-+     * @var CustomerSession
-+     */
-+    private $customerSession;
-+
-+    /**
-+     * @var StoreManager
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @param CustomerSession $customerSession
-+     * @param StoreManager $storeManager
-+     */
-+    public function __construct(
-+        CustomerSession $customerSession = null,
-+        StoreManager $storeManager = null
-+    ) {
-+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
-+            ->get(StoreManager::class);
-+        $this->customerSession = $customerSession ?: ObjectManager::getInstance()
-+            ->get(CustomerSession::class);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
-+    {
-+        if ($attribute->getAttributeCode() === 'price') {
-+            $customerGroupId = !empty($context['customerGroupId'])
-+                ? $context['customerGroupId']
-+                : $this->customerSession->getCustomerGroupId();
-+            $websiteId = !empty($context['websiteId'])
-+                ? $context['websiteId']
-+                : $this->storeManager->getStore()->getWebsiteId();
-+
-+            return 'price_' . $customerGroupId . '_' . $websiteId;
-+        }
-+
-+        return null;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttribute.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttribute.php
-new file mode 100644
-index 00000000000..652fc853adb
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttribute.php
-@@ -0,0 +1,35 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
-+
-+/**
-+ * Resolver field name for not special attribute.
-+ */
-+class SpecialAttribute implements ResolverInterface
-+{
-+    /**
-+     * Get field name for special list of attributes.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @param array $context
-+     * @return string
-+     */
-+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
-+    {
-+        if (in_array($attribute->getAttributeCode(), ['id', 'sku', 'store_id', 'visibility'], true)
-+            && empty($context['type'])
-+        ) {
-+            return $attribute->getAttributeCode();
-+        }
-+
-+        return null;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/ResolverInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/ResolverInterface.php
-new file mode 100644
-index 00000000000..3d36e026f70
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/ResolverInterface.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+
-+/**
-+ * Field name resolver for preparing field key for elasticsearch mapping by attribute.
-+ */
-+interface ResolverInterface
-+{
-+    /**
-+     * Get field name.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @param array $context
-+     * @return string
-+     */
-+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string;
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
-new file mode 100644
-index 00000000000..88dab836987
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
-@@ -0,0 +1,51 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType;
-+
-+/**
-+ * Field type converter from internal data types to elastic service.
-+ */
-+class Converter implements ConverterInterface
-+{
-+    /**#@+
-+     * Text flags for Elasticsearch field types
-+     */
-+    private const ES_DATA_TYPE_STRING = 'string';
-+    private const ES_DATA_TYPE_FLOAT = 'float';
-+    private const ES_DATA_TYPE_INT = 'integer';
-+    private const ES_DATA_TYPE_DATE = 'date';
-+    /**#@-*/
-+
-+    /**
-+     * Mapping between internal data types and elastic service.
-+     *
-+     * @var array
-+     */
-+    private $mapping = [
-+        self::INTERNAL_DATA_TYPE_STRING => self::ES_DATA_TYPE_STRING,
-+        self::INTERNAL_DATA_TYPE_KEYWORD => self::ES_DATA_TYPE_STRING,
-+        self::INTERNAL_DATA_TYPE_FLOAT => self::ES_DATA_TYPE_FLOAT,
-+        self::INTERNAL_DATA_TYPE_INT => self::ES_DATA_TYPE_INT,
-+        self::INTERNAL_DATA_TYPE_DATE => self::ES_DATA_TYPE_DATE,
-+    ];
-+
-+    /**
-+     * Get service field type for elasticsearch 2.
-+     *
-+     * @param string $internalType
-+     * @return string
-+     * @throws \DomainException
-+     */
-+    public function convert(string $internalType): string
-+    {
-+        if (!isset($this->mapping[$internalType])) {
-+            throw new \DomainException(sprintf('Unsupported internal field type: %s', $internalType));
-+        }
-+        return $this->mapping[$internalType];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterInterface.php
-new file mode 100644
-index 00000000000..3e7c3e9b592
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterInterface.php
-@@ -0,0 +1,33 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType;
-+
-+/**
-+ * @api
-+ * Field type converter from internal data types to elastic service.
-+ */
-+interface ConverterInterface
-+{
-+    /**#@+
-+     * Text flags for internal field types
-+     */
-+    public const INTERNAL_DATA_TYPE_STRING = 'string';
-+    public const INTERNAL_DATA_TYPE_FLOAT = 'float';
-+    public const INTERNAL_DATA_TYPE_INT = 'integer';
-+    public const INTERNAL_DATA_TYPE_DATE = 'date';
-+    public const INTERNAL_DATA_TYPE_KEYWORD = 'keyword';
-+    /**#@-*/
-+
-+    /**
-+     * Get service field type.
-+     *
-+     * @param string $internalType
-+     * @return string
-+     */
-+    public function convert(string $internalType): string;
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php
-new file mode 100644
-index 00000000000..e83502e4fe3
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
-+
-+/**
-+ * Composite resolver for resolving field type.
-+ */
-+class CompositeResolver implements ResolverInterface
-+{
-+    /**
-+     * @var ResolverInterface[]
-+     */
-+    private $items;
-+
-+    /**
-+     * @param ResolverInterface[] $items
-+     */
-+    public function __construct(array $items)
-+    {
-+        foreach ($items as $item) {
-+            if (!$item instanceof ResolverInterface) {
-+                throw new \InvalidArgumentException(
-+                    sprintf('Instance of the field type resolver is expected, got %s instead.', get_class($item))
-+                );
-+            }
-+        }
-+        $this->items = $items;
-+    }
-+
-+    /**
-+     * Get field type.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @return string
-+     */
-+    public function getFieldType(AttributeAdapter $attribute): ?string
-+    {
-+        $result = null;
-+        foreach ($this->items as $item) {
-+            $result = $item->getFieldType($attribute);
-+            if (null !== $result) {
-+                break;
-+            }
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DateTimeType.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DateTimeType.php
-new file mode 100644
-index 00000000000..a4e3c634ce7
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DateTimeType.php
-@@ -0,0 +1,46 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
-+
-+/**
-+ * Date/Time type resolver.
-+ */
-+class DateTimeType implements ResolverInterface
-+{
-+    /**
-+     * @var ConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * @param ConverterInterface $fieldTypeConverter
-+     */
-+    public function __construct(ConverterInterface $fieldTypeConverter)
-+    {
-+        $this->fieldTypeConverter = $fieldTypeConverter;
-+    }
-+
-+    /**
-+     * Get datetime field type.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @return string
-+     */
-+    public function getFieldType(AttributeAdapter $attribute): ?string
-+    {
-+        if ($attribute->isDateTimeType()) {
-+            return $this->fieldTypeConverter->convert(ConverterInterface::INTERNAL_DATA_TYPE_DATE);
-+        }
-+
-+        return null;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DefaultResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DefaultResolver.php
-new file mode 100644
-index 00000000000..be4a8cca288
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DefaultResolver.php
-@@ -0,0 +1,42 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
-+
-+/**
-+ * Default field type resolver.
-+ */
-+class DefaultResolver implements ResolverInterface
-+{
-+    /**
-+     * @var ConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * @param ConverterInterface $fieldTypeConverter
-+     */
-+    public function __construct(ConverterInterface $fieldTypeConverter)
-+    {
-+        $this->fieldTypeConverter = $fieldTypeConverter;
-+    }
-+
-+    /**
-+     * Get default field type.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @return string
-+     */
-+    public function getFieldType(AttributeAdapter $attribute): ?string
-+    {
-+        return $this->fieldTypeConverter->convert(ConverterInterface::INTERNAL_DATA_TYPE_STRING);
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/FloatType.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/FloatType.php
-new file mode 100644
-index 00000000000..a6681a7f676
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/FloatType.php
-@@ -0,0 +1,46 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
-+
-+/**
-+ * Float type resolver.
-+ */
-+class FloatType implements ResolverInterface
-+{
-+    /**
-+     * @var ConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * @param ConverterInterface $fieldTypeConverter
-+     */
-+    public function __construct(ConverterInterface $fieldTypeConverter)
-+    {
-+        $this->fieldTypeConverter = $fieldTypeConverter;
-+    }
-+
-+    /**
-+     * Get float field type.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @return string
-+     */
-+    public function getFieldType(AttributeAdapter $attribute): ?string
-+    {
-+        if ($attribute->isFloatType()) {
-+            return $this->fieldTypeConverter->convert(ConverterInterface::INTERNAL_DATA_TYPE_FLOAT);
-+        }
-+
-+        return null;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php
-new file mode 100644
-index 00000000000..7793f60cd1e
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
-+
-+/**
-+ * Integer type resolver.
-+ */
-+class IntegerType implements ResolverInterface
-+{
-+    /**
-+     * @var ConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * @param ConverterInterface $fieldTypeConverter
-+     */
-+    public function __construct(ConverterInterface $fieldTypeConverter)
-+    {
-+        $this->fieldTypeConverter = $fieldTypeConverter;
-+    }
-+
-+    /**
-+     * Get integer field type.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @return string
-+     */
-+    public function getFieldType(AttributeAdapter $attribute): ?string
-+    {
-+        if (($attribute->isIntegerType() || $attribute->isBooleanType())
-+                && !$attribute->isUserDefined()
-+        ) {
-+            return $this->fieldTypeConverter->convert(ConverterInterface::INTERNAL_DATA_TYPE_INT);
-+        }
-+
-+        return null;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ResolverInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ResolverInterface.php
-new file mode 100644
-index 00000000000..43e512ecb02
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ResolverInterface.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+
-+/**
-+ * Field type resolver interface.
-+ */
-+interface ResolverInterface
-+{
-+    /**
-+     * Get field type.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @return string
-+     */
-+    public function getFieldType(AttributeAdapter $attribute): ?string;
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
-new file mode 100644
-index 00000000000..6876b23bbb1
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
-@@ -0,0 +1,151 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider;
-+
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Eav\Model\Config;
-+use Magento\Catalog\Api\Data\ProductAttributeInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
-+    as IndexTypeConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
-+    as FieldTypeResolver;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ResolverInterface
-+    as FieldIndexResolver;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
-+
-+/**
-+ * Provide static fields for mapping of product.
-+ */
-+class StaticField implements FieldProviderInterface
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $eavConfig;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * @var IndexTypeConverterInterface
-+     */
-+    private $indexTypeConverter;
-+
-+    /**
-+     * @var AttributeProvider
-+     */
-+    private $attributeAdapterProvider;
-+
-+    /**
-+     * @var FieldTypeResolver
-+     */
-+    private $fieldTypeResolver;
-+
-+    /**
-+     * @var FieldIndexResolver
-+     */
-+    private $fieldIndexResolver;
-+
-+    /**
-+     * @var FieldName\ResolverInterface
-+     */
-+    private $fieldNameResolver;
-+
-+    /**
-+     * @param Config $eavConfig
-+     * @param FieldTypeConverterInterface $fieldTypeConverter
-+     * @param IndexTypeConverterInterface $indexTypeConverter
-+     * @param FieldTypeResolver $fieldTypeResolver
-+     * @param FieldIndexResolver $fieldIndexResolver
-+     * @param AttributeProvider $attributeAdapterProvider
-+     * @param FieldName\ResolverInterface|null $fieldNameResolver
-+     */
-+    public function __construct(
-+        Config $eavConfig,
-+        FieldTypeConverterInterface $fieldTypeConverter,
-+        IndexTypeConverterInterface $indexTypeConverter,
-+        FieldTypeResolver $fieldTypeResolver,
-+        FieldIndexResolver $fieldIndexResolver,
-+        AttributeProvider $attributeAdapterProvider,
-+        FieldName\ResolverInterface $fieldNameResolver = null
-+    ) {
-+        $this->eavConfig = $eavConfig;
-+        $this->fieldTypeConverter = $fieldTypeConverter;
-+        $this->indexTypeConverter = $indexTypeConverter;
-+        $this->fieldTypeResolver = $fieldTypeResolver;
-+        $this->fieldIndexResolver = $fieldIndexResolver;
-+        $this->attributeAdapterProvider = $attributeAdapterProvider;
-+        $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
-+            ->get(FieldName\ResolverInterface::class);
-+    }
-+
-+    /**
-+     * Get static fields.
-+     *
-+     * @param array $context
-+     * @return array
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function getFields(array $context = []): array
-+    {
-+        $attributes = $this->eavConfig->getEntityAttributes(ProductAttributeInterface::ENTITY_TYPE_CODE);
-+        $allAttributes = [];
-+
-+        foreach ($attributes as $attribute) {
-+            $attributeAdapter = $this->attributeAdapterProvider->getByAttributeCode($attribute->getAttributeCode());
-+            $fieldName = $this->fieldNameResolver->getFieldName($attributeAdapter);
-+
-+            $allAttributes[$fieldName] = [
-+                'type' => $this->fieldTypeResolver->getFieldType($attributeAdapter),
-+            ];
-+
-+            $index = $this->fieldIndexResolver->getFieldIndex($attributeAdapter);
-+            if (null !== $index) {
-+                $allAttributes[$fieldName]['index'] = $index;
-+            }
-+
-+            if ($attributeAdapter->isSortable()) {
-+                $sortFieldName = $this->fieldNameResolver->getFieldName(
-+                    $attributeAdapter,
-+                    ['type' => FieldMapperInterface::TYPE_SORT]
-+                );
-+                $allAttributes[$fieldName]['fields'][$sortFieldName] = [
-+                    'type' => $this->fieldTypeConverter->convert(
-+                        FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
-+                    ),
-+                    'index' => $this->indexTypeConverter->convert(
-+                        IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
-+                    )
-+                ];
-+            }
-+
-+            if ($attributeAdapter->isComplexType()) {
-+                $childFieldName = $this->fieldNameResolver->getFieldName(
-+                    $attributeAdapter,
-+                    ['type' => FieldMapperInterface::TYPE_QUERY]
-+                );
-+                $allAttributes[$childFieldName] = [
-+                    'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING)
-+                ];
-+            }
-+        }
-+
-+        $allAttributes['store_id'] = [
-+            'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING),
-+            'index' => $this->indexTypeConverter->convert(IndexTypeConverterInterface::INTERNAL_NO_INDEX_VALUE),
-+        ];
-+
-+        return $allAttributes;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProviderInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProviderInterface.php
-new file mode 100644
-index 00000000000..aaafb699b33
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProviderInterface.php
-@@ -0,0 +1,23 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product;
-+
-+/**
-+ * Product fields provider.
-+ * Provide fields mapping configuration for elasticsearch service of internal product attributes.
-+ */
-+interface FieldProviderInterface
-+{
-+    /**
-+     * Get fields.
-+     *
-+     * @param array $context
-+     * @return array
-+     */
-+    public function getFields(array $context = []): array;
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/ProductFieldMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/ProductFieldMapper.php
-index 2a8ccdb5c72..657605bbd01 100644
---- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/ProductFieldMapper.php
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/ProductFieldMapper.php
-@@ -5,135 +5,13 @@
-  */
- namespace Magento\Elasticsearch\Model\Adapter\FieldMapper;
- 
--use Magento\Catalog\Api\Data\ProductAttributeInterface;
--use Magento\Eav\Model\Config;
- use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
--use Magento\Framework\Registry;
--use Magento\Store\Model\StoreManagerInterface as StoreManager;
--use \Magento\Customer\Model\Session as CustomerSession;
- use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper
-     as Elasticsearch5ProductFieldMapper;
--use Magento\Elasticsearch\Model\Adapter\FieldType;
- 
- /**
-  * Class ProductFieldMapper
-  */
- class ProductFieldMapper extends Elasticsearch5ProductFieldMapper implements FieldMapperInterface
- {
--    /**
--     * @param Config $eavConfig
--     * @param FieldType $fieldType
--     * @param CustomerSession $customerSession
--     * @param StoreManager $storeManager
--     * @param Registry $coreRegistry
--     */
--    public function __construct(
--        Config $eavConfig,
--        FieldType $fieldType,
--        CustomerSession $customerSession,
--        StoreManager $storeManager,
--        Registry $coreRegistry
--    ) {
--        $this->eavConfig = $eavConfig;
--        $this->fieldType = $fieldType;
--        $this->customerSession = $customerSession;
--        $this->storeManager = $storeManager;
--        $this->coreRegistry = $coreRegistry;
--    }
--
--    /**
--     * @param string $attributeCode
--     * @param array $context
--     * @return string
--     */
--    public function getFieldName($attributeCode, $context = [])
--    {
--        $attribute = $this->eavConfig->getAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode);
--        if (!$attribute || in_array($attributeCode, ['id', 'sku', 'store_id', 'visibility'], true)) {
--            return $attributeCode;
--        }
--        if ($attributeCode === 'price') {
--            return $this->getPriceFieldName($context);
--        }
--        if ($attributeCode === 'position') {
--            return $this->getPositionFiledName($context);
--        }
--        $fieldType = $this->fieldType->getFieldType($attribute);
--        $frontendInput = $attribute->getFrontendInput();
--        if (empty($context['type'])) {
--            $fieldName = $attributeCode;
--        } elseif ($context['type'] === FieldMapperInterface::TYPE_FILTER) {
--            if ($fieldType === 'string') {
--                return $this->getFieldName(
--                    $attributeCode,
--                    array_merge($context, ['type' => FieldMapperInterface::TYPE_QUERY])
--                );
--            }
--            $fieldName = $attributeCode;
--        } elseif ($context['type'] === FieldMapperInterface::TYPE_QUERY) {
--            $fieldName = $this->getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode);
--        } else {
--            $fieldName = 'sort_' . $attributeCode;
--        }
--
--        return $fieldName;
--    }
--
--    /**
--     * @param array $context
--     * @return array
--     */
--    public function getAllAttributesTypes($context = [])
--    {
--        $attributeCodes = $this->eavConfig->getEntityAttributeCodes(ProductAttributeInterface::ENTITY_TYPE_CODE);
--        $allAttributes = [];
--        // List of attributes which are required to be indexable
--        $alwaysIndexableAttributes = [
--            'category_ids',
--            'visibility',
--        ];
--
--        foreach ($attributeCodes as $attributeCode) {
--            $attribute = $this->eavConfig->getAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode);
--
--            $allAttributes[$attributeCode] = [
--                'type' => $this->fieldType->getFieldType($attribute)
--            ];
--
--            if (!$attribute->getIsSearchable() && !$this->isAttributeUsedInAdvancedSearch($attribute)
--                && !in_array($attributeCode, $alwaysIndexableAttributes, true)
--            ) {
--                $allAttributes[$attributeCode] = array_merge(
--                    $allAttributes[$attributeCode],
--                    ['index' => 'no']
--                );
--            }
--
--            if ($attribute->getFrontendInput() === 'select' || $attribute->getFrontendInput() === 'multiselect') {
--                $allAttributes[$attributeCode . '_value'] = [
--                    'type' => FieldType::ES_DATA_TYPE_STRING,
--                ];
--            }
--        }
--
--        return $allAttributes;
--    }
--
--    /**
--     * @param string $frontendInput
--     * @param string $fieldType
--     * @param string $attributeCode
--     * @return string
--     */
--    protected function getRefinedFieldName($frontendInput, $fieldType, $attributeCode)
--    {
--        switch ($frontendInput) {
--            case 'select':
--                return in_array($fieldType, ['string','integer'], true) ? $attributeCode . '_value' : $attributeCode;
--            case 'boolean':
--                return $fieldType === 'integer' ? $attributeCode . '_value' : $attributeCode;
--            default:
--                return $attributeCode;
--        }
--    }
- }
-diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php
-index 4315597a3cf..e7d8d0672aa 100644
---- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php
-+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php
-@@ -6,15 +6,23 @@
- namespace Magento\Elasticsearch\Model\Adapter;
- 
- use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
- 
- /**
-  * Class FieldType
-+ *
-  * @api
-  * @since 100.1.0
-+ *
-+ * @deprecated This class provide not full data about field type. Only basic rules apply in this class.
-+ * @see ResolverInterface
-  */
- class FieldType
- {
-     /**#@+
-+     * @deprecated
-+     * @see \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+     *
-      * Text flags for Elasticsearch field types
-      */
-     const ES_DATA_TYPE_STRING = 'string';
-@@ -27,16 +35,21 @@ class FieldType
-     /**#@-*/
- 
-     /**
-+     * Get field type.
-+     *
-+     * @deprecated
-+     * @see ResolverInterface::getFieldType
-+     *
-      * @param AbstractAttribute $attribute
-      * @return string
--     * @since 100.1.0
-      */
-     public function getFieldType($attribute)
-     {
-+        trigger_error('Class is deprecated', E_USER_DEPRECATED);
-         $backendType = $attribute->getBackendType();
-         $frontendInput = $attribute->getFrontendInput();
- 
--        if (in_array($backendType, ['timestamp', 'datetime'], true)) {
-+        if ($backendType === 'timestamp') {
-             $fieldType = self::ES_DATA_TYPE_DATE;
-         } elseif ((in_array($backendType, ['int', 'smallint'], true)
-             || (in_array($frontendInput, ['select', 'boolean'], true) && $backendType !== 'varchar'))
-diff --git a/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php b/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php
-new file mode 100644
-index 00000000000..b3f8a56110f
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php
-@@ -0,0 +1,41 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Elasticsearch\Model\Advanced;
-+
-+use Magento\Catalog\Model\ResourceModel\Product\Collection;
-+use Magento\Catalog\Model\Config;
-+use Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategyInterface;
-+
-+/**
-+ * Strategy interface for preparing product collection.
-+ */
-+class ProductCollectionPrepareStrategy implements ProductCollectionPrepareStrategyInterface
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $catalogConfig;
-+
-+    /**
-+     * @param Config $catalogConfig
-+     */
-+    public function __construct(
-+        Config $catalogConfig
-+    ) {
-+        $this->catalogConfig = $catalogConfig;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function prepare(Collection $collection)
-+    {
-+        $collection
-+            ->addAttributeToSelect($this->catalogConfig->getProductAttributes())
-+            ->addMinimalPrice()
-+            ->addTaxPercents();
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Config.php b/app/code/Magento/Elasticsearch/Model/Config.php
-index a0f3b6433b4..387db07c62f 100644
---- a/app/code/Magento/Elasticsearch/Model/Config.php
-+++ b/app/code/Magento/Elasticsearch/Model/Config.php
-@@ -62,27 +62,36 @@ class Config implements ClientOptionsInterface
-     private $engineResolver;
- 
-     /**
--     * Constructor
-+     * Available Elasticsearch engines.
-      *
-+     * @var array
-+     */
-+    private $engineList;
-+
-+    /**
-      * @param ScopeConfigInterface $scopeConfig
-      * @param ClientResolver|null $clientResolver
-      * @param EngineResolverInterface|null $engineResolver
-      * @param string|null $prefix
-+     * @param array $engineList
-      */
-     public function __construct(
-         ScopeConfigInterface $scopeConfig,
-         ClientResolver $clientResolver = null,
-         EngineResolverInterface $engineResolver = null,
--        $prefix = null
-+        $prefix = null,
-+        $engineList = []
-     ) {
-         $this->scopeConfig = $scopeConfig;
-         $this->clientResolver = $clientResolver ?: ObjectManager::getInstance()->get(ClientResolver::class);
-         $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()->get(EngineResolverInterface::class);
-         $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine();
-+        $this->engineList = $engineList;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @since 100.1.0
-      */
-     public function prepareClientOptions($options = [])
-@@ -135,7 +144,7 @@ class Config implements ClientOptionsInterface
-      */
-     public function isElasticsearchEnabled()
-     {
--        return $this->engineResolver->getCurrentSearchEngine() === self::ENGINE_NAME;
-+        return in_array($this->engineResolver->getCurrentSearchEngine(), $this->engineList);
-     }
- 
-     /**
-@@ -150,7 +159,7 @@ class Config implements ClientOptionsInterface
-     }
- 
-     /**
--     * get Elasticsearch entity type
-+     * Get Elasticsearch entity type
-      *
-      * @return string
-      * @since 100.1.0
-diff --git a/app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php b/app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php
-index 8ebd45596d3..c4fab39dfde 100644
---- a/app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php
-+++ b/app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php
-@@ -15,6 +15,9 @@ use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
- use Magento\Store\Model\StoreManagerInterface as StoreManager;
- 
-+/**
-+ * Class Suggestions
-+ */
- class Suggestions implements SuggestedQueriesInterface
- {
-     /**
-@@ -66,6 +69,8 @@ class Suggestions implements SuggestedQueriesInterface
-     private $storeManager;
- 
-     /**
-+     * Suggestions constructor.
-+     *
-      * @param ScopeConfigInterface $scopeConfig
-      * @param Config $config
-      * @param QueryResultFactory $queryResultFactory
-@@ -90,11 +95,9 @@ class Suggestions implements SuggestedQueriesInterface
-     }
- 
-     /**
--     * {@inheritdoc}
--     *
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     * @inheritdoc
-      */
--    public function getItems(QueryInterface $query, $limit = null, $additionalFilters = null)
-+    public function getItems(QueryInterface $query)
-     {
-         $result = [];
-         if ($this->isSuggestionsAllowed()) {
-@@ -118,19 +121,23 @@ class Suggestions implements SuggestedQueriesInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isResultsCountEnabled()
-     {
--        return (bool)$this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             self::CONFIG_SUGGESTION_COUNT_RESULTS_ENABLED,
-             ScopeInterface::SCOPE_STORE
-         );
-     }
- 
-     /**
-+     * Get Suggestions
-+     *
-      * @param QueryInterface $query
-+     *
-      * @return array
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     private function getSuggestions(QueryInterface $query)
-     {
-@@ -178,6 +185,8 @@ class Suggestions implements SuggestedQueriesInterface
-     }
- 
-     /**
-+     * Fetch Query
-+     *
-      * @param array $query
-      * @return array
-      */
-@@ -200,16 +209,18 @@ class Suggestions implements SuggestedQueriesInterface
-     }
- 
-     /**
-+     * Is Search Suggestions Allowed
-+     *
-      * @return bool
-      */
-     private function isSuggestionsAllowed()
-     {
--        $isSearchSuggestionsEnabled = (bool)$this->scopeConfig->getValue(
-+        $isSuggestionsEnabled = $this->scopeConfig->isSetFlag(
-             self::CONFIG_SUGGESTION_ENABLED,
-             ScopeInterface::SCOPE_STORE
-         );
-         $isEnabled = $this->config->isElasticsearchEnabled();
--        $isSuggestionsAllowed = ($isEnabled && $isSearchSuggestionsEnabled);
-+        $isSuggestionsAllowed = ($isEnabled && $isSuggestionsEnabled);
-         return $isSuggestionsAllowed;
-     }
- }
-diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php b/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
-index cfcdbecb162..847710eaa44 100644
---- a/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
-+++ b/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
-@@ -12,6 +12,9 @@ use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter;
- use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
- use Magento\Framework\App\ScopeResolverInterface;
- 
-+/**
-+ * Indexer Handler for Elasticsearch engine.
-+ */
- class IndexerHandler implements IndexerInterface
- {
-     /**
-@@ -82,7 +85,7 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function saveIndex($dimensions, \Traversable $documents)
-     {
-@@ -97,7 +100,7 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function deleteIndex($dimensions, \Traversable $documents)
-     {
-@@ -112,7 +115,7 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function cleanIndex($dimensions)
-     {
-@@ -122,14 +125,16 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
--    public function isAvailable()
-+    public function isAvailable($dimensions = [])
-     {
-         return $this->adapter->ping();
-     }
- 
-     /**
-+     * Returns indexer id.
-+     *
-      * @return string
-      */
-     private function getIndexerId()
-diff --git a/app/code/Magento/Elasticsearch/Model/Layer/Category/ItemCollectionProvider.php b/app/code/Magento/Elasticsearch/Model/Layer/Category/ItemCollectionProvider.php
-new file mode 100644
-index 00000000000..ef2992e1fff
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Layer/Category/ItemCollectionProvider.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Elasticsearch\Model\Layer\Category;
-+
-+use Magento\Catalog\Model\Layer\ItemCollectionProviderInterface;
-+use Magento\Framework\Search\EngineResolverInterface;
-+
-+/**
-+ * Catalog search category layer collection provider.
-+ */
-+class ItemCollectionProvider implements ItemCollectionProviderInterface
-+{
-+    /**
-+     * @var EngineResolverInterface
-+     */
-+    private $engineResolver;
-+
-+    /**
-+     * @var array
-+     */
-+    private $factories;
-+
-+    /**
-+     * ItemCollectionProvider constructor.
-+     * @param EngineResolverInterface $engineResolver
-+     * @param array $factories
-+     */
-+    public function __construct(
-+        EngineResolverInterface $engineResolver,
-+        array $factories
-+    ) {
-+        $this->engineResolver = $engineResolver;
-+        $this->factories = $factories;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getCollection(\Magento\Catalog\Model\Category $category)
-+    {
-+        if (!isset($this->factories[$this->engineResolver->getCurrentSearchEngine()])) {
-+            throw new \DomainException('Undefined factory ' . $this->engineResolver->getCurrentSearchEngine());
-+        }
-+        $collection = $this->factories[$this->engineResolver->getCurrentSearchEngine()]->create();
-+        $collection->addCategoryFilter($category);
-+
-+        return $collection;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/Layer/Search/ItemCollectionProvider.php b/app/code/Magento/Elasticsearch/Model/Layer/Search/ItemCollectionProvider.php
-new file mode 100644
-index 00000000000..7d2a30b493d
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/Layer/Search/ItemCollectionProvider.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Elasticsearch\Model\Layer\Search;
-+
-+use Magento\Catalog\Model\Layer\ItemCollectionProviderInterface;
-+use Magento\Framework\Search\EngineResolverInterface;
-+
-+/**
-+ * Catalog search category layer collection provider.
-+ */
-+class ItemCollectionProvider implements ItemCollectionProviderInterface
-+{
-+    /**
-+     * @var EngineResolverInterface
-+     */
-+    private $engineResolver;
-+
-+    /**
-+     * @var array
-+     */
-+    private $factories;
-+
-+    /**
-+     * ItemCollectionProvider constructor.
-+     * @param EngineResolverInterface $engineResolver
-+     * @param array $factories
-+     */
-+    public function __construct(
-+        EngineResolverInterface $engineResolver,
-+        array $factories
-+    ) {
-+        $this->engineResolver = $engineResolver;
-+        $this->factories = $factories;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getCollection(\Magento\Catalog\Model\Category $category)
-+    {
-+        if (!isset($this->factories[$this->engineResolver->getCurrentSearchEngine()])) {
-+            throw new \DomainException('Undefined factory ' . $this->engineResolver->getCurrentSearchEngine());
-+        }
-+        $collection = $this->factories[$this->engineResolver->getCurrentSearchEngine()]->create();
-+
-+        return $collection;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php
-new file mode 100644
-index 00000000000..32cb85ff750
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php
-@@ -0,0 +1,87 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection;
-+
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
-+use Magento\Framework\Data\Collection;
-+use Magento\Framework\Api\Search\SearchCriteriaBuilder;
-+use Magento\Framework\Api\Search\SearchCriteria;
-+
-+/**
-+ * Resolve specific attributes for search criteria.
-+ */
-+class SearchCriteriaResolver implements SearchCriteriaResolverInterface
-+{
-+    /**
-+     * @var SearchCriteriaBuilder
-+     */
-+    private $builder;
-+
-+    /**
-+     * @var Collection
-+     */
-+    private $collection;
-+
-+    /**
-+     * @var string
-+     */
-+    private $searchRequestName;
-+
-+    /**
-+     * @var int
-+     */
-+    private $size;
-+
-+    /**
-+     * @var array
-+     */
-+    private $orders;
-+
-+    /**
-+     * @var int
-+     */
-+    private $currentPage;
-+
-+    /**
-+     * SearchCriteriaResolver constructor.
-+     * @param SearchCriteriaBuilder $builder
-+     * @param Collection $collection
-+     * @param string $searchRequestName
-+     * @param int $currentPage
-+     * @param int $size
-+     * @param array $orders
-+     */
-+    public function __construct(
-+        SearchCriteriaBuilder $builder,
-+        Collection $collection,
-+        string $searchRequestName,
-+        int $currentPage,
-+        int $size,
-+        ?array $orders
-+    ) {
-+        $this->builder = $builder;
-+        $this->collection = $collection;
-+        $this->searchRequestName = $searchRequestName;
-+        $this->currentPage = $currentPage;
-+        $this->size = $size;
-+        $this->orders = $orders;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(): SearchCriteria
-+    {
-+        $this->builder->setPageSize($this->size);
-+        $searchCriteria = $this->builder->create();
-+        $searchCriteria->setRequestName($this->searchRequestName);
-+        $searchCriteria->setSortOrders(array_merge(['relevance' => 'DESC'], $this->orders));
-+        $searchCriteria->setCurrentPage($this->currentPage - 1);
-+
-+        return $searchCriteria;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
-new file mode 100644
-index 00000000000..3ae2d384782
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection;
-+
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
-+use Magento\Framework\Data\Collection;
-+use Magento\Framework\Api\Search\SearchResultInterface;
-+
-+/**
-+ * Resolve specific attributes for search criteria.
-+ */
-+class SearchResultApplier implements SearchResultApplierInterface
-+{
-+    /**
-+     * @var Collection|\Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection
-+     */
-+    private $collection;
-+
-+    /**
-+     * @var SearchResultInterface
-+     */
-+    private $searchResult;
-+
-+    /**
-+     * @param Collection $collection
-+     * @param SearchResultInterface $searchResult
-+     */
-+    public function __construct(
-+        Collection $collection,
-+        SearchResultInterface $searchResult
-+    ) {
-+        $this->collection = $collection;
-+        $this->searchResult = $searchResult;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function apply()
-+    {
-+        if (empty($this->searchResult->getItems())) {
-+            $this->collection->getSelect()->where('NULL');
-+            return;
-+        }
-+        $ids = [];
-+        foreach ($this->searchResult->getItems() as $item) {
-+            $ids[] = (int)$item->getId();
-+        }
-+        $this->collection->setPageSize(null);
-+        $this->collection->getSelect()->where('e.entity_id IN (?)', $ids);
-+        $orderList = join(',', $ids);
-+        $this->collection->getSelect()->reset(\Magento\Framework\DB\Select::ORDER);
-+        $this->collection->getSelect()->order("FIELD(e.entity_id,$orderList)");
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolver.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolver.php
-new file mode 100644
-index 00000000000..109721fcc71
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolver.php
-@@ -0,0 +1,38 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection;
-+
-+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
-+use Magento\Framework\Api\Search\SearchResultInterface;
-+
-+/**
-+ * Resolve total records count.
-+ */
-+class TotalRecordsResolver implements TotalRecordsResolverInterface
-+{
-+    /**
-+     * @var SearchResultInterface
-+     */
-+    private $searchResult;
-+
-+    /**
-+     * @param SearchResultInterface $searchResult
-+     */
-+    public function __construct(
-+        SearchResultInterface $searchResult
-+    ) {
-+        $this->searchResult = $searchResult;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(): ?int
-+    {
-+        return $this->searchResult->getTotalCount();
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Observer/CategoryProductIndexer.php b/app/code/Magento/Elasticsearch/Observer/CategoryProductIndexer.php
-new file mode 100644
-index 00000000000..fd2734bb713
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Observer/CategoryProductIndexer.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Observer;
-+
-+use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
-+use Magento\Elasticsearch\Model\Config;
-+use Magento\Framework\Event\Observer;
-+use Magento\Framework\Event\ObserverInterface;
-+
-+/**
-+ * Checks if a category has changed products and depends on indexer configuration.
-+ */
-+class CategoryProductIndexer implements ObserverInterface
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var Processor
-+     */
-+    private $processor;
-+
-+    /**
-+     * @param Config $config
-+     * @param Processor $processor
-+     */
-+    public function __construct(Config $config, Processor $processor)
-+    {
-+        $this->processor = $processor;
-+        $this->config = $config;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute(Observer $observer): void
-+    {
-+        if (!$this->config->isElasticsearchEnabled()) {
-+            return;
-+        }
-+
-+        $productIds = $observer->getEvent()->getProductIds();
-+        if (!empty($productIds) && $this->processor->isIndexerScheduled()) {
-+            $this->processor->markIndexerAsInvalid();
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Adapter.php b/app/code/Magento/Elasticsearch/SearchAdapter/Adapter.php
-index 43b2bfe553a..6f9ef552351 100644
---- a/app/code/Magento/Elasticsearch/SearchAdapter/Adapter.php
-+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Adapter.php
-@@ -68,8 +68,7 @@ class Adapter implements AdapterInterface
-     }
- 
-     /**
--     * @param RequestInterface $request
--     * @return QueryResponse
-+     * @inheritdoc
-      */
-     public function query(RequestInterface $request)
-     {
-@@ -86,6 +85,7 @@ class Adapter implements AdapterInterface
-             [
-                 'documents' => $rawDocuments,
-                 'aggregations' => $aggregationBuilder->build($request, $rawResponse),
-+                'total' => isset($rawResponse['hits']['total']) ? $rawResponse['hits']['total'] : 0
-             ]
-         );
-         return $queryResponse;
-diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php
-index bcfb7f5565b..eeb48f805bc 100644
---- a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php
-+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php
-@@ -8,10 +8,13 @@ namespace Magento\Elasticsearch\SearchAdapter\Aggregation\Builder;
- use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
- use Magento\Framework\Search\Dynamic\DataProviderInterface;
- 
-+/**
-+ * Builder for term buckets.
-+ */
- class Term implements BucketBuilderInterface
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function build(
-         RequestBucketInterface $bucket,
-@@ -19,13 +22,15 @@ class Term implements BucketBuilderInterface
-         array $queryResult,
-         DataProviderInterface $dataProvider
-     ) {
-+        $buckets = $queryResult['aggregations'][$bucket->getName()]['buckets'] ?? [];
-         $values = [];
--        foreach ($queryResult['aggregations'][$bucket->getName()]['buckets'] as $resultBucket) {
-+        foreach ($buckets as $resultBucket) {
-             $values[$resultBucket['key']] = [
-                 'value' => $resultBucket['key'],
-                 'count' => $resultBucket['doc_count'],
-             ];
-         }
-+
-         return $values;
-     }
- }
-diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php b/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php
-index 0add517ba94..496a77e4c5a 100644
---- a/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php
-+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php
-@@ -9,6 +9,8 @@ use Magento\Elasticsearch\SearchAdapter\QueryAwareInterface;
- use Magento\Elasticsearch\SearchAdapter\QueryContainer;
- 
- /**
-+ * Elastic search data provider
-+ *
-  * @api
-  * @since 100.1.0
-  */
-@@ -120,7 +122,7 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.1.0
-      */
-     public function getRange()
-@@ -129,7 +131,7 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.1.0
-      */
-     public function getAggregations(\Magento\Framework\Search\Dynamic\EntityStorage $entityStorage)
-@@ -168,7 +170,7 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.1.0
-      */
-     public function getInterval(
-@@ -191,7 +193,7 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.1.0
-      */
-     public function getAggregation(
-@@ -209,7 +211,8 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte
-             'prices' => [
-                 'histogram' => [
-                     'field' => $fieldName,
--                    'interval' => $range,
-+                    'interval' => (float)$range,
-+                    'min_doc_count' => 1,
-                 ],
-             ],
-         ];
-@@ -217,7 +220,7 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte
-         $queryResult = $this->connectionManager->getConnection()
-             ->query($query);
-         foreach ($queryResult['aggregations']['prices']['buckets'] as $bucket) {
--            $key = intval($bucket['key'] / $range + 1);
-+            $key = (int)($bucket['key'] / $range + 1);
-             $result[$key] = $bucket['doc_count'];
-         }
- 
-@@ -225,7 +228,7 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.1.0
-      */
-     public function prepareData($range, array $dbRanges)
-diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder.php
-index cf75366b9b2..d0aaa4b3dd5 100644
---- a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder.php
-+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder.php
-@@ -3,19 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Elasticsearch\SearchAdapter\Query;
- 
- use Magento\Framework\Search\RequestInterface;
--use Magento\Framework\App\ScopeResolverInterface;
- use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query\Builder as Elasticsearch5Builder;
- 
- /**
-+ * Query builder for search adapter.
-+ *
-  * @api
-  * @since 100.1.0
-  */
- class Builder extends Elasticsearch5Builder
- {
--
-     /**
-      * Set initial settings for query
-      *
-@@ -34,6 +35,7 @@ class Builder extends Elasticsearch5Builder
-                 'from' => $request->getFrom(),
-                 'size' => $request->getSize(),
-                 'fields' => ['_id', '_score'],
-+                'sort' => $this->sortBuilder->getSort($request),
-                 'query' => [],
-             ],
-         ];
-diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
-index f1c3451482b..afd383c1342 100644
---- a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
-+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
-@@ -5,11 +5,18 @@
-  */
- namespace Magento\Elasticsearch\SearchAdapter\Query\Builder;
- 
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface as TypeResolver;
-+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerPool;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Search\Request\Query\BoolExpression;
- use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface;
- use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
- use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
- 
-+/**
-+ * Builder for match query.
-+ */
- class Match implements QueryInterface
- {
-     /**
-@@ -23,24 +30,53 @@ class Match implements QueryInterface
-     private $fieldMapper;
- 
-     /**
-+     * @deprecated
-+     * @see \Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer
-      * @var PreprocessorInterface[]
-      */
-     protected $preprocessorContainer;
- 
-+    /**
-+     * @var AttributeProvider
-+     */
-+    private $attributeProvider;
-+
-+    /**
-+     * @var TypeResolver
-+     */
-+    private $fieldTypeResolver;
-+
-+    /**
-+     * @var ValueTransformerPool
-+     */
-+    private $valueTransformerPool;
-+
-     /**
-      * @param FieldMapperInterface $fieldMapper
-      * @param PreprocessorInterface[] $preprocessorContainer
-+     * @param AttributeProvider|null $attributeProvider
-+     * @param TypeResolver|null $fieldTypeResolver
-+     * @param ValueTransformerPool|null $valueTransformerPool
-      */
-     public function __construct(
-         FieldMapperInterface $fieldMapper,
--        array $preprocessorContainer
-+        array $preprocessorContainer,
-+        AttributeProvider $attributeProvider = null,
-+        TypeResolver $fieldTypeResolver = null,
-+        ValueTransformerPool $valueTransformerPool = null
-     ) {
-         $this->fieldMapper = $fieldMapper;
-         $this->preprocessorContainer = $preprocessorContainer;
-+        $this->attributeProvider = $attributeProvider ?? ObjectManager::getInstance()
-+            ->get(AttributeProvider::class);
-+        $this->fieldTypeResolver = $fieldTypeResolver ?? ObjectManager::getInstance()
-+            ->get(TypeResolver::class);
-+        $this->valueTransformerPool = $valueTransformerPool ?? ObjectManager::getInstance()
-+            ->get(ValueTransformerPool::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function build(array $selectQuery, RequestQueryInterface $requestQuery, $conditionType)
-     {
-@@ -61,16 +97,14 @@ class Match implements QueryInterface
-     }
- 
-     /**
-+     * Prepare query.
-+     *
-      * @param string $queryValue
-      * @param string $conditionType
-      * @return array
-      */
-     protected function prepareQuery($queryValue, $conditionType)
-     {
--        $queryValue = $this->escape($queryValue);
--        foreach ($this->preprocessorContainer as $preprocessor) {
--            $queryValue = $preprocessor->process($queryValue);
--        }
-         $condition = $conditionType === BoolExpression::QUERY_CONDITION_NOT ?
-             self::QUERY_CONDITION_MUST_NOT : $conditionType;
-         return [
-@@ -99,10 +133,24 @@ class Match implements QueryInterface
- 
-         // Checking for quoted phrase \"phrase test\", trim escaped surrounding quotes if found
-         $count = 0;
--        $value = preg_replace('#^\\\\"(.*)\\\\"$#m', '$1', $queryValue['value'], -1, $count);
-+        $value = preg_replace('#^"(.*)"$#m', '$1', $queryValue['value'], -1, $count);
-         $condition = ($count) ? 'match_phrase' : 'match';
- 
-+        $transformedTypes = [];
-         foreach ($matches as $match) {
-+            $attributeAdapter = $this->attributeProvider->getByAttributeCode($match['field']);
-+            $fieldType = $this->fieldTypeResolver->getFieldType($attributeAdapter);
-+            $valueTransformer = $this->valueTransformerPool->get($fieldType ?? 'text');
-+            $valueTransformerHash = \spl_object_hash($valueTransformer);
-+            if (!isset($transformedTypes[$valueTransformerHash])) {
-+                $transformedTypes[$valueTransformerHash] = $valueTransformer->transform($value);
-+            }
-+            $transformedValue = $transformedTypes[$valueTransformerHash];
-+            if (null === $transformedValue) {
-+                //Value is incompatible with this field type.
-+                continue;
-+            }
-+
-             $resolvedField = $this->fieldMapper->getFieldName(
-                 $match['field'],
-                 ['type' => FieldMapperInterface::TYPE_QUERY]
-@@ -112,8 +160,8 @@ class Match implements QueryInterface
-                 'body' => [
-                     $condition => [
-                         $resolvedField => [
--                            'query' => $value,
--                            'boost' => isset($match['boost']) ? $match['boost'] : 1,
-+                            'query' => $transformedValue,
-+                            'boost' => $match['boost'] ?? 1,
-                         ],
-                     ],
-                 ],
-@@ -124,18 +172,15 @@ class Match implements QueryInterface
-     }
- 
-     /**
--     * Cut trailing plus or minus sign, and @ symbol, using of which causes InnoDB to report a syntax error.
--     * @link https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html Fulltext-boolean search docs.
--     *
-      * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
-      *
-+     * @deprecated
-+     * @see \Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer
-      * @param string $value
-      * @return string
-      */
-     protected function escape($value)
-     {
--        $value = preg_replace('/@+|[@+-]+$/', '', $value);
--
-         $pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/';
-         $replace = '\\\$1';
- 
-diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Sort.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Sort.php
-new file mode 100644
-index 00000000000..5ccf202e381
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Sort.php
-@@ -0,0 +1,106 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Elasticsearch\SearchAdapter\Query\Builder;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
-+    as FieldNameResolver;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
-+use Magento\Framework\Search\RequestInterface;
-+
-+/**
-+ * Sort builder.
-+ */
-+class Sort
-+{
-+    /**
-+     * List of fields that need to skipp by default.
-+     */
-+    private const DEFAULT_SKIPPED_FIELDS = [
-+        'entity_id',
-+    ];
-+
-+    /**
-+     * Default mapping for special fields.
-+     */
-+    private const DEFAULT_MAP = [
-+        'relevance' => '_score',
-+    ];
-+
-+    /**
-+     * @var AttributeProvider
-+     */
-+    private $attributeAdapterProvider;
-+
-+    /**
-+     * @var FieldNameResolver
-+     */
-+    private $fieldNameResolver;
-+
-+    /**
-+     * @var array
-+     */
-+    private $skippedFields;
-+
-+    /**
-+     * @var array
-+     */
-+    private $map;
-+
-+    /**
-+     * @param AttributeProvider $attributeAdapterProvider
-+     * @param FieldNameResolver $fieldNameResolver
-+     * @param array $skippedFields
-+     * @param array $map
-+     */
-+    public function __construct(
-+        AttributeProvider $attributeAdapterProvider,
-+        FieldNameResolver $fieldNameResolver,
-+        array $skippedFields = [],
-+        array $map = []
-+    ) {
-+        $this->attributeAdapterProvider = $attributeAdapterProvider;
-+        $this->fieldNameResolver = $fieldNameResolver;
-+        $this->skippedFields = array_merge(self::DEFAULT_SKIPPED_FIELDS, $skippedFields);
-+        $this->map = array_merge(self::DEFAULT_MAP, $map);
-+    }
-+
-+    /**
-+     * Prepare sort.
-+     *
-+     * @param RequestInterface $request
-+     * @return array
-+     */
-+    public function getSort(RequestInterface $request)
-+    {
-+        $sorts = [];
-+        foreach ($request->getSort() as $item) {
-+            if (in_array($item['field'], $this->skippedFields)) {
-+                continue;
-+            }
-+            $attribute = $this->attributeAdapterProvider->getByAttributeCode($item['field']);
-+            $fieldName = $this->fieldNameResolver->getFieldName($attribute);
-+            if (isset($this->map[$fieldName])) {
-+                $fieldName = $this->map[$fieldName];
-+            }
-+            if ($attribute->isSortable() && !($attribute->isFloatType() || $attribute->isIntegerType())) {
-+                $suffix = $this->fieldNameResolver->getFieldName(
-+                    $attribute,
-+                    ['type' => FieldMapperInterface::TYPE_SORT]
-+                );
-+                $fieldName .= '.' . $suffix;
-+            }
-+            $sorts[] = [
-+                $fieldName => [
-+                    'order' => strtolower($item['direction'])
-+                ]
-+            ];
-+        }
-+
-+        return $sorts;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/DateTransformer.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/DateTransformer.php
-new file mode 100644
-index 00000000000..49eca6e9d82
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/DateTransformer.php
-@@ -0,0 +1,44 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldType\Date;
-+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
-+
-+/**
-+ * Value transformer for date type fields.
-+ */
-+class DateTransformer implements ValueTransformerInterface
-+{
-+    /**
-+     * @var Date
-+     */
-+    private $dateFieldType;
-+
-+    /**
-+     * @param Date $dateFieldType
-+     */
-+    public function __construct(Date $dateFieldType)
-+    {
-+        $this->dateFieldType = $dateFieldType;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function transform(string $value): ?string
-+    {
-+        try {
-+            $formattedDate = $this->dateFieldType->formatDate(null, $value);
-+        } catch (\Exception $e) {
-+            $formattedDate = null;
-+        }
-+
-+        return $formattedDate;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/FloatTransformer.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/FloatTransformer.php
-new file mode 100644
-index 00000000000..5e330076d3d
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/FloatTransformer.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
-+
-+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
-+
-+/**
-+ * Value transformer for float type fields.
-+ */
-+class FloatTransformer implements ValueTransformerInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function transform(string $value): ?float
-+    {
-+        return \is_numeric($value) ? (float) $value : null;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/IntegerTransformer.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/IntegerTransformer.php
-new file mode 100644
-index 00000000000..0846ff3a9bd
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/IntegerTransformer.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
-+
-+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
-+
-+/**
-+ * Value transformer for integer type fields.
-+ */
-+class IntegerTransformer implements ValueTransformerInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function transform(string $value): ?int
-+    {
-+        return \is_numeric($value) ? (int) $value : null;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php
-new file mode 100644
-index 00000000000..68bec2580f6
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php
-@@ -0,0 +1,65 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
-+
-+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
-+use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
-+
-+/**
-+ * Value transformer for fields with text types.
-+ */
-+class TextTransformer implements ValueTransformerInterface
-+{
-+    /**
-+     * @var PreprocessorInterface[]
-+     */
-+    private $preprocessors;
-+
-+    /**
-+     * @param PreprocessorInterface[] $preprocessors
-+     */
-+    public function __construct(array $preprocessors = [])
-+    {
-+        foreach ($preprocessors as $preprocessor) {
-+            if (!$preprocessor instanceof PreprocessorInterface) {
-+                throw new \InvalidArgumentException(
-+                    \sprintf('"%s" is not a instance of ValueTransformerInterface.', get_class($preprocessor))
-+                );
-+            }
-+        }
-+
-+        $this->preprocessors = $preprocessors;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function transform(string $value): string
-+    {
-+        $value = $this->escape($value);
-+        foreach ($this->preprocessors as $preprocessor) {
-+            $value = $preprocessor->process($value);
-+        }
-+
-+        return $value;
-+    }
-+
-+    /**
-+     * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
-+     *
-+     * @param string $value
-+     * @return string
-+     */
-+    private function escape(string $value): string
-+    {
-+        $pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/';
-+        $replace = '\\\$1';
-+
-+        return preg_replace($pattern, $replace, $value);
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerInterface.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerInterface.php
-new file mode 100644
-index 00000000000..c84ddc69cc7
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerInterface.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\SearchAdapter\Query;
-+
-+/**
-+ * Value transformer of search term for matching with ES field types.
-+ */
-+interface ValueTransformerInterface
-+{
-+    /**
-+     * Transform value according to field type.
-+     *
-+     * @param string $value
-+     * @return mixed
-+     */
-+    public function transform(string $value);
-+}
-diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerPool.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerPool.php
-new file mode 100644
-index 00000000000..11a35d79ce1
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerPool.php
-@@ -0,0 +1,46 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\SearchAdapter\Query;
-+
-+/**
-+ * Pool of value transformers.
-+ */
-+class ValueTransformerPool
-+{
-+    /**
-+     * @var ValueTransformerInterface[]
-+     */
-+    private $transformers;
-+
-+    /**
-+     * @param ValueTransformerInterface[] $valueTransformers
-+     */
-+    public function __construct(array $valueTransformers = [])
-+    {
-+        foreach ($valueTransformers as $valueTransformer) {
-+            if (!$valueTransformer instanceof ValueTransformerInterface) {
-+                throw new \InvalidArgumentException(
-+                    \sprintf('"%s" is not a instance of ValueTransformerInterface.', get_class($valueTransformer))
-+                );
-+            }
-+        }
-+
-+        $this->transformers = $valueTransformers;
-+    }
-+
-+    /**
-+     * Get value transformer related to field type.
-+     *
-+     * @param string $fieldType
-+     * @return ValueTransformerInterface
-+     */
-+    public function get(string $fieldType): ValueTransformerInterface
-+    {
-+        return $this->transformers[$fieldType] ?? $this->transformers['default'];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php b/app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php
-index 33fda48f4af..0813975ac9a 100644
---- a/app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php
-+++ b/app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php
-@@ -76,6 +76,7 @@ class ResponseFactory
-             [
-                 'documents' => $documents,
-                 'aggregations' => $aggregations,
-+                'total' => $response['total']
-             ]
-         );
-     }
-diff --git a/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml b/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
-new file mode 100644
-index 00000000000..d8ce091fba7
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
-@@ -0,0 +1,60 @@
-+<?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="ProductQuickSearchUsingElasticSearchTest">
-+        <annotations>
-+            <features value="Search"/>
-+            <stories value="Quick Search of products on Storefront when ES 5.0+ is enabled"/>
-+            <title value="Product quick search doesn't throw exception after ES is chosen as search engine"/>
-+            <description value="Verify no elastic search exception is thrown when searching for product before catalogsearch reindexing"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-94995"/>
-+            <group value="Catalog"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="categoryFirst"/>
-+            <createData entity="SimpleProduct" stepKey="simpleProduct1">
-+                <requiredEntity createDataKey="categoryFirst"/>
-+            </createData>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="categoryFirst" stepKey="deleteCategory"/>
-+            <actionGroup ref="ResetSearchEngineConfiguration" stepKey="resetCatalogSearchConfiguration"/>
-+            <actionGroup ref="updateIndexerOnSave" stepKey="resetIndexerBackToOriginalState">
-+                <argument name="indexerName" value="catalogsearch_fulltext"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-+        </after>
-+
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <comment userInput="Change Catalog search engine option to Elastic Search 5.0+" stepKey="chooseElasticSearch5"/>
-+        <actionGroup ref="ChooseElasticSearchAsSearchEngine" stepKey="chooseES5"/>
-+        <actionGroup ref="ClearPageCacheActionGroup" stepKey="clearing"/>
-+        <actionGroup ref="updateIndexerBySchedule" stepKey="updateAnIndexerBySchedule">
-+            <argument name="indexerName" value="catalogsearch_fulltext"/>
-+        </actionGroup>
-+        <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-+        <!--Navigate to storefront and do a quick search for the product -->
-+        <comment userInput="Navigate to Storefront to check if quick search works" stepKey="commentCheckQuickSearch" />
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
-+
-+        <waitForPageLoad stepKey="waitForHomePageToLoad" time="30"/>
-+        <fillField userInput="Simple" selector="{{StorefrontQuickSearchSection.searchPhrase}}" stepKey="fillSearchBar"/>
-+        <waitForPageLoad stepKey="wait2" time="30"/>
-+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="checkUrl"/>
-+        <seeInTitle userInput="Search results for: 'Simple'" stepKey="assertQuickSearchTitle"/>
-+        <see userInput="Search results for: 'Simple'" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertQuickSearchName"/>
-+        <comment userInput="End of searching products" stepKey="endOfSearchingProducts"/>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin2"/>
-+        </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php
-new file mode 100644
-index 00000000000..98284e49ad8
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php
-@@ -0,0 +1,165 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
-+    as FieldTypeResolver;
-+use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\IndexResolver;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class IndexResolverTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var IndexResolver
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var ConverterInterface
-+     */
-+    private $converter;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * @var FieldTypeResolver
-+     */
-+    private $fieldTypeResolver;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->converter = $this->getMockBuilder(ConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['convert'])
-+            ->getMockForAbstractClass();
-+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['convert'])
-+            ->getMockForAbstractClass();
-+        $this->fieldTypeResolver = $this->getMockBuilder(FieldTypeResolver::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getFieldType'])
-+            ->getMockForAbstractClass();
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->resolver = $objectManager->getObject(
-+            IndexResolver::class,
-+            [
-+                'converter' => $this->converter,
-+                'fieldTypeConverter' => $this->fieldTypeConverter,
-+                'fieldTypeResolver' => $this->fieldTypeResolver,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldIndexProvider
-+     * @param $isSearchable
-+     * @param $isAlwaysIndexable
-+     * @param $isComplexType
-+     * @param $isIntegerType
-+     * @param $isBooleanType
-+     * @param $isUserDefined
-+     * @param $isFloatType
-+     * @param $serviceFieldType
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldName(
-+        $isSearchable,
-+        $isAlwaysIndexable,
-+        $isComplexType,
-+        $isIntegerType,
-+        $isBooleanType,
-+        $isUserDefined,
-+        $isFloatType,
-+        $serviceFieldType,
-+        $expected
-+    ) {
-+        $this->converter->expects($this->any())
-+            ->method('convert')
-+            ->willReturn('something');
-+        $this->fieldTypeResolver->expects($this->any())
-+            ->method('getFieldType')
-+            ->willReturn($serviceFieldType);
-+        $this->fieldTypeConverter->expects($this->any())
-+            ->method('convert')
-+            ->willReturn('string');
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods([
-+                'isSearchable',
-+                'isAlwaysIndexable',
-+                'isComplexType',
-+                'isIntegerType',
-+                'isBooleanType',
-+                'isUserDefined',
-+                'isFloatType',
-+            ])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('isSearchable')
-+            ->willReturn($isSearchable);
-+        $attributeMock->expects($this->any())
-+            ->method('isAlwaysIndexable')
-+            ->willReturn($isAlwaysIndexable);
-+        $attributeMock->expects($this->any())
-+            ->method('isComplexType')
-+            ->willReturn($isComplexType);
-+        $attributeMock->expects($this->any())
-+            ->method('isIntegerType')
-+            ->willReturn($isIntegerType);
-+        $attributeMock->expects($this->any())
-+            ->method('isBooleanType')
-+            ->willReturn($isBooleanType);
-+        $attributeMock->expects($this->any())
-+            ->method('isUserDefined')
-+            ->willReturn($isUserDefined);
-+        $attributeMock->expects($this->any())
-+            ->method('isFloatType')
-+            ->willReturn($isFloatType);
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldIndex($attributeMock)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldIndexProvider()
-+    {
-+        return [
-+            [true, true, true, true, true, true, true, 'string', null],
-+            [false, false, true, false, false, false, false, 'string', 'something'],
-+            [false, false, true, false, false, false, false, 'string', 'something'],
-+            [false, false, false, false, false, false, false, 'string', 'something'],
-+            [false, false, false, false, false, false, false, 'int', null],
-+            [false, false, true, true, false, true, false, 'string', 'something'],
-+            [false, false, true, false, true, true, false, 'string', 'something'],
-+            [false, false, true, false, true, false, false, 'string', null],
-+            [false, false, true, false, true, true, true, 'string', null],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerTypeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerTypeTest.php
-new file mode 100644
-index 00000000000..39155e4f4fe
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerTypeTest.php
-@@ -0,0 +1,105 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace
-+Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class IntegerTypeTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var IntegerType
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['convert'])
-+            ->getMockForAbstractClass();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->resolver = $objectManager->getObject(
-+            IntegerType::class,
-+            [
-+                'fieldTypeConverter' => $this->fieldTypeConverter,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldTypeProvider
-+     * @param $attributeCode
-+     * @param $isIntegerType
-+     * @param $isBooleanType
-+     * @param $isUserDefined
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldType($attributeCode, $isIntegerType, $isBooleanType, $isUserDefined, $expected)
-+    {
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributeCode', 'isIntegerType', 'isBooleanType', 'isUserDefined'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+        $attributeMock->expects($this->any())
-+            ->method('isIntegerType')
-+            ->willReturn($isIntegerType);
-+        $attributeMock->expects($this->any())
-+            ->method('isBooleanType')
-+            ->willReturn($isBooleanType);
-+        $attributeMock->expects($this->any())
-+            ->method('isUserDefined')
-+            ->willReturn($isUserDefined);
-+        $this->fieldTypeConverter->expects($this->any())
-+            ->method('convert')
-+            ->willReturn('something');
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldType($attributeMock)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldTypeProvider()
-+    {
-+        return [
-+            ['category_ids', true, true, true, 'something'],
-+            ['category_ids', false, false, false, 'something'],
-+            ['type', true, false, false, 'something'],
-+            ['type', false, true, false, 'something'],
-+            ['type', true, true, true, ''],
-+            ['type', false, false, true, ''],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordTypeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordTypeTest.php
-new file mode 100644
-index 00000000000..0e33498a16f
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordTypeTest.php
-@@ -0,0 +1,106 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace
-+Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\KeywordType;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class KeywordTypeTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var KeywordType
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['convert'])
-+            ->getMockForAbstractClass();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->resolver = $objectManager->getObject(
-+            KeywordType::class,
-+            [
-+                'fieldTypeConverter' => $this->fieldTypeConverter,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldTypeProvider
-+     * @param $isComplexType
-+     * @param $isSearchable
-+     * @param $isAlwaysIndexable
-+     * @param $isFilterable
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldType($isComplexType, $isSearchable, $isAlwaysIndexable, $isFilterable, $expected)
-+    {
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['isComplexType', 'isSearchable', 'isAlwaysIndexable', 'isFilterable'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('isComplexType')
-+            ->willReturn($isComplexType);
-+        $attributeMock->expects($this->any())
-+            ->method('isSearchable')
-+            ->willReturn($isSearchable);
-+        $attributeMock->expects($this->any())
-+            ->method('isAlwaysIndexable')
-+            ->willReturn($isAlwaysIndexable);
-+        $attributeMock->expects($this->any())
-+            ->method('isFilterable')
-+            ->willReturn($isFilterable);
-+        $this->fieldTypeConverter->expects($this->any())
-+            ->method('convert')
-+            ->willReturn('something');
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldType($attributeMock)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldTypeProvider()
-+    {
-+        return [
-+            [true, true, true, true, 'something'],
-+            [true, false, false, false, 'something'],
-+            [true, false, false, true, 'something'],
-+            [false, false, false, true, 'something'],
-+            [false, false, false, false, ''],
-+            [false, false, true, false, ''],
-+            [false, true, false, false, ''],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperTest.php
-deleted file mode 100644
-index 6ee32a58698..00000000000
---- a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperTest.php
-+++ /dev/null
-@@ -1,296 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Adapter\FieldMapper;
--
--use Magento\Catalog\Api\Data\ProductAttributeInterface;
--use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldType;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--
--class ProductFieldMapperTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper
--     */
--    protected $mapper;
--
--    /**
--     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $eavConfig;
--
--    /**
--     * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $coreRegistry;
--
--    /**
--     * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $customerSession;
--
--    /**
--     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $storeManager;
--
--    /**
--     * @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $eavAttributeResource;
--
--    /**
--     * @var FieldType|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $fieldType;
--
--    /**
--     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $store;
--
--    /**
--     * Set up test environment
--     *
--     * @return void
--     */
--    protected function setUp()
--    {
--        $this->eavConfig = $this->getMockBuilder(\Magento\Eav\Model\Config::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getEntityType', 'getAttribute', 'getEntityAttributeCodes'])
--            ->getMock();
--
--        $this->fieldType = $this->getMockBuilder(FieldType::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getFieldType'])
--            ->getMock();
--
--        $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getCustomerGroupId'])
--            ->getMock();
--
--        $this->storeManager = $this->storeManager = $this->getMockForAbstractClass(
--            \Magento\Store\Model\StoreManagerInterface::class,
--            [],
--            '',
--            false
--        );
--
--        $this->store = $this->getMockForAbstractClass(
--            \Magento\Store\Api\Data\StoreInterface::class,
--            [],
--            '',
--            false,
--            false,
--            true,
--            ['getWebsiteId', 'getRootCategoryId']
--        );
--
--        $this->coreRegistry = $this->createMock(\Magento\Framework\Registry::class);
--
--        $objectManager = new ObjectManagerHelper($this);
--
--        $this->eavAttributeResource = $this->createPartialMock(
--            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
--            [
--                '__wakeup',
--                'getBackendType',
--                'getFrontendInput'
--            ]
--        );
--
--        $this->mapper = $objectManager->getObject(
--            \Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper::class,
--            [
--                'eavConfig' => $this->eavConfig,
--                'storeManager' => $this->storeManager,
--                'fieldType' => $this->fieldType,
--                'customerSession' => $this->customerSession,
--                'coreRegistry' => $this->coreRegistry
--            ]
--        );
--    }
--
--    /**
--     * @dataProvider attributeCodeProvider
--     * @param string $attributeCode
--     * @param string $fieldName
--     * @param string $fieldType
--     * @param array $context
--     *
--     * @return void
--     */
--    public function testGetFieldName($attributeCode, $fieldName, $fieldType, $context = [])
--    {
--        $attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
--            ->setMethods(['getBackendType', 'getFrontendInput', 'getAttribute'])
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->customerSession->expects($this->any())
--            ->method('getCustomerGroupId')
--            ->willReturn('0');
--
--        $this->storeManager->expects($this->any())
--            ->method('getStore')
--            ->willReturn($this->store);
--        $this->store->expects($this->any())
--            ->method('getWebsiteId')
--            ->willReturn('1');
--        $this->store->expects($this->any())
--            ->method('getRootCategoryId')
--            ->willReturn('1');
--
--        $this->eavConfig->expects($this->any())->method('getAttribute')
--            ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode)
--            ->willReturn($attributeMock);
--
--        $attributeMock->expects($this->any())->method('getFrontendInput')
--            ->will($this->returnValue('select'));
--
--        $this->fieldType->expects($this->any())->method('getFieldType')
--            ->with($attributeMock)
--            ->willReturn($fieldType);
--
--        $this->assertEquals(
--            $fieldName,
--            $this->mapper->getFieldName($attributeCode, $context)
--        );
--    }
--
--    /**
--     * @return void
--     */
--    public function testGetFieldNameWithoutAttribute()
--    {
--        $this->eavConfig->expects($this->any())->method('getAttribute')
--            ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, 'attr1')
--            ->willReturn('');
--
--        $this->assertEquals(
--            'attr1',
--            $this->mapper->getFieldName('attr1', [])
--        );
--    }
--
--    /**
--     * @dataProvider attributeProvider
--     * @param string $attributeCode
--     * @param string $inputType
--     * @param array $searchAttributes
--     * @param array $expected
--     * @return void
--     */
--    public function testGetAllAttributesTypes($attributeCode, $inputType, $searchAttributes, $expected)
--    {
--        $attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->eavConfig->expects($this->any())->method('getEntityAttributeCodes')
--            ->with(ProductAttributeInterface::ENTITY_TYPE_CODE)
--            ->willReturn([$attributeCode]);
--
--        $this->eavConfig->expects($this->any())->method('getAttribute')
--            ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode)
--            ->willReturn($attributeMock);
--
--        $this->fieldType->expects($this->once())->method('getFieldType')->willReturn(FieldType::ES_DATA_TYPE_INT);
--
--        $attributeMock->expects($this->any())
--            ->method('getIsSearchable')
--            ->willReturn($searchAttributes['searchable']);
--        $attributeMock->expects($this->any())
--            ->method('getIsFilterable')
--            ->willReturn($searchAttributes['filterable']);
--        $attributeMock->expects($this->any())
--            ->method('getIsFilterableInSearch')
--            ->willReturn($searchAttributes['filterableInSearch']);
--        $attributeMock->expects($this->any())
--            ->method('getIsVisibleInAdvancedSearch')
--            ->willReturn($searchAttributes['advSearch']);
--
--        $attributeMock->expects($this->any())->method('getFrontendInput')
--            ->will($this->returnValue($inputType));
--
--        $this->assertEquals(
--            $expected,
--            $this->mapper->getAllAttributesTypes()
--        );
--    }
--
--    /**
--     * @return array
--     */
--    public function attributeCodeProvider()
--    {
--        return [
--            ['id', 'id', 'text'],
--            ['status', 'status', 'text'],
--            ['status', 'status_value', 'text', ['type'=>'default']],
--            ['price', 'price_0_1', 'text', ['type'=>'default']],
--            ['position', 'position_category_1', 'text', ['type'=>'default']],
--            ['price', 'price_2_3', 'text', ['type'=>'default', 'customerGroupId'=>'2', 'websiteId'=>'3']],
--            ['position', 'position_category_3', 'text', ['type'=>'default', 'categoryId'=>'3']],
--            ['color', 'color_value', 'text', ['type'=>'text']],
--            ['description', 'sort_description', 'text', ['type'=>'some']],
--            ['*', '_all', 'text', ['type'=>'text']],
--            ['description', 'description_value', 'text', ['type'=>'text']],
--        ];
--    }
--
--    /**
--     * @return array
--     */
--    public function attributeProvider()
--    {
--        return [
--            [
--                'category_ids',
--                'select',
--                ['searchable' => false, 'filterable' => false, 'filterableInSearch' => false, 'advSearch' => false],
--                ['category_ids' => ['type' => 'keyword'], 'category_ids_value' => ['type' => 'text']]
--            ],
--            [
--                'attr_code',
--                'text',
--                ['searchable' => false, 'filterable' => false, 'filterableInSearch' => false, 'advSearch' => false],
--                ['attr_code' => ['type' => 'integer']]
--            ],
--            [
--                'attr_code',
--                'text',
--                ['searchable' => '0', 'filterable' => '0', 'filterableInSearch' => '0', 'advSearch' => '0'],
--                ['attr_code' => ['type' => 'integer']]
--            ],
--            [
--                'attr_code',
--                'text',
--                ['searchable' => true, 'filterable' => false, 'filterableInSearch' => false, 'advSearch' => false],
--                ['attr_code' => ['type' => 'integer']]
--            ],
--            [
--                'attr_code',
--                'text',
--                ['searchable' => '1', 'filterable' => '0', 'filterableInSearch' => '0', 'advSearch' => '0'],
--                ['attr_code' => ['type' => 'integer']]
--            ],
--            [
--                'attr_code',
--                'text',
--                ['searchable' => false, 'filterable' => false, 'filterableInSearch' => false, 'advSearch' => true],
--                ['attr_code' => ['type' => 'integer']]
--            ],
--            [
--                'attr_code',
--                'text',
--                ['searchable' => '0', 'filterable' => '0', 'filterableInSearch' => '1', 'advSearch' => '0'],
--                ['attr_code' => ['type' => 'integer']]
--            ],
--        ];
--    }
--}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldTypeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldTypeTest.php
-deleted file mode 100644
-index 63c993e27c9..00000000000
---- a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldTypeTest.php
-+++ /dev/null
-@@ -1,107 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Adapter;
--
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--use PHPUnit_Framework_MockObject_MockObject as MockObject;
--
--class FieldTypeTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Elasticsearch\Model\Adapter\FieldType
--     */
--    protected $type;
--
--    /**
--     * @var \Magento\Eav\Model\Config|MockObject
--     */
--    protected $eavConfig;
--
--    /**
--     * @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $eavAttributeResource;
--
--    /**
--     * Set up test environment.
--     *
--     * @return void
--     */
--    protected function setUp()
--    {
--        $this->eavConfig = $this->getMockBuilder(\Magento\Eav\Model\Config::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getEntityType', 'getAttribute', 'getEntityAttributeCodes'])
--            ->getMock();
--
--        $objectManager = new ObjectManagerHelper($this);
--
--        $this->eavAttributeResource = $this->createPartialMock(
--            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
--            [
--                '__wakeup',
--                'getBackendType',
--                'getFrontendInput'
--            ]
--        );
--
--        $this->type = $objectManager->getObject(
--            \Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldType::class,
--            [
--                'eavConfig' => $this->eavConfig,
--            ]
--        );
--    }
--
--    /**
--     * Test getFieldType() method.
--     *
--     * @dataProvider attributeTypesProvider
--     * @param string $attributeCode
--     * @param string $backendType
--     * @param string $frontendType
--     * @param string $expectedFieldType
--     * @return void
--     */
--    public function testGetFieldType($attributeCode, $backendType, $frontendType, $expectedFieldType)
--    {
--        $attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
--            ->setMethods(['getBackendType', 'getFrontendInput', 'getAttributeCode'])
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $attributeMock->expects($this->any())->method('getBackendType')
--            ->will($this->returnValue($backendType));
--
--        $attributeMock->expects($this->any())->method('getFrontendInput')
--            ->will($this->returnValue($frontendType));
--
--        $attributeMock->expects($this->any())->method('getAttributeCode')
--            ->will($this->returnValue($attributeCode));
--
--        $this->assertEquals($expectedFieldType, $this->type->getFieldType($attributeMock));
--    }
--
--    /**
--     * @return array
--     */
--    public static function attributeTypesProvider()
--    {
--        return [
--            ['attr1', 'static', 'select', 'integer'],
--            ['attr1', 'static', 'text', 'text'],
--            ['attr1', 'timestamp', 'select', 'date'],
--            ['attr1', 'datetime', 'text', 'date'],
--            ['attr1', 'int', 'select', 'integer'],
--            ['attr1', 'decimal', 'text', 'float'],
--            ['attr1', 'varchar', 'select', 'text'],
--            ['attr1', 'array', 'multiselect', 'text'],
--            ['price', 'int', 'text', 'integer'],
--            ['tier_price', 'int', 'text', 'integer'],
--            ['tier_price', 'smallint', 'text', 'integer'],
--        ];
--    }
--}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
-index 026d385da34..8fbd183441b 100644
---- a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
-@@ -367,7 +367,7 @@ class ElasticsearchTest extends \PHPUnit\Framework\TestCase
-                                     'match_mapping_type' => 'string',
-                                     'mapping' => [
-                                         'type' => 'text',
--                                        'index' => 'no',
-+                                        'index' => false,
-                                     ],
-                                 ],
-                             ],
-@@ -434,7 +434,7 @@ class ElasticsearchTest extends \PHPUnit\Framework\TestCase
-                                     'match_mapping_type' => 'string',
-                                     'mapping' => [
-                                         'type' => 'text',
--                                        'index' => 'no',
-+                                        'index' => false,
-                                     ],
-                                 ],
-                             ],
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php
-index ca478550fa6..cfa048fc26c 100644
---- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php
-@@ -8,7 +8,10 @@ namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\BatchDataMapper;
- use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
- use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
- use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
-+use Magento\Eav\Api\Data\AttributeOptionInterface;
- use Magento\Elasticsearch\Model\Adapter\BatchDataMapper\ProductDataMapper;
-+use Magento\Elasticsearch\Model\Adapter\Document\Builder;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
- use Magento\Elasticsearch\Model\Adapter\FieldType\Date;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
- 
-@@ -59,31 +62,13 @@ class ProductDataMapperTest extends \PHPUnit\Framework\TestCase
-      */
-     protected function setUp()
-     {
--        $this->builderMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\Document\Builder::class)
--            ->setMethods(['addField', 'addFields', 'build'])
--            ->disableOriginalConstructor()
--            ->getMock();
-+        $this->builderMock = $this->createTestProxy(Builder::class);
-+        $this->fieldMapperMock = $this->createMock(FieldMapperInterface::class);
-+        $this->dataProvider = $this->createMock(DataProvider::class);
-+        $this->attribute = $this->createMock(Attribute::class);
-+        $this->additionalFieldsProvider = $this->createMock(AdditionalFieldsProviderInterface::class);
-+        $this->dateFieldTypeMock = $this->createMock(Date::class);
- 
--        $this->fieldMapperMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class)
--            ->setMethods(['getFieldName', 'getAllAttributesTypes'])
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->dataProvider = $this->getMockBuilder(DataProvider::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->attribute = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->additionalFieldsProvider = $this->getMockBuilder(AdditionalFieldsProviderInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->dateFieldTypeMock = $this->getMockBuilder(Date::class)
--            ->disableOriginalConstructor()
--            ->getMock();
-         $objectManager = new ObjectManagerHelper($this);
-         $this->model = $objectManager->getObject(
-             ProductDataMapper::class,
-@@ -97,258 +82,348 @@ class ProductDataMapperTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testGetMapAdditionalFieldsOnly()
-     {
--        $productId = 42;
-         $storeId = 1;
-+        $productId = 42;
-         $additionalFields = ['some data'];
--        $this->builderMock->expects($this->once())->method('addField')->with('store_id', $storeId);
-+        $this->builderMock->expects($this->once())
-+            ->method('addField')
-+            ->with('store_id', $storeId);
- 
--        $this->builderMock->expects($this->any())->method('addFields')
-+        $this->builderMock->expects($this->any())
-+            ->method('addFields')
-             ->withConsecutive([$additionalFields])
--            ->will(
--                $this->returnSelf()
--            );
--        $this->builderMock->expects($this->any())->method('build')->will(
--            $this->returnValue([])
--        );
--        $this->additionalFieldsProvider->expects($this->once())->method('getFields')
-+            ->will($this->returnSelf());
-+        $this->builderMock->expects($this->any())
-+            ->method('build')
-+            ->will($this->returnValue([]));
-+        $this->additionalFieldsProvider->expects($this->once())
-+            ->method('getFields')
-             ->with([$productId], $storeId)
-             ->willReturn([$productId => $additionalFields]);
- 
--        $this->assertEquals(
--            [$productId],
--            array_keys($this->model->map([$productId => []], $storeId, []))
--        );
-+        $documents = $this->model->map([$productId => []], $storeId, []);
-+        $this->assertEquals([$productId], array_keys($documents));
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testGetMapEmptyData()
-     {
-         $storeId = 1;
-+
-         $this->builderMock->expects($this->never())->method('addField');
-         $this->builderMock->expects($this->never())->method('build');
-         $this->additionalFieldsProvider->expects($this->once())
-             ->method('getFields')
--            ->with([], $storeId)->willReturn([]);
-+            ->with([], $storeId)
-+            ->willReturn([]);
- 
--        $this->assertEquals(
--            [],
--            $this->model->map([], $storeId, [])
--        );
--    }
--
--    public function testGetMapWithExcludedAttribute()
--    {
--        $productId = 42;
--        $storeId = 1;
--        $productAttributeData = ['price' => 42];
--        $attributeCode = 'price';
--        $returnAttributeData = ['store_id' => $storeId];
--
--        $this->dataProvider->expects($this->any())->method('getSearchableAttribute')
--            ->with($attributeCode)
--            ->willReturn($this->getAttribute($attributeCode, [
--                'value' => 42,
--                'backendType' => 'int',
--                'frontendInput' => 'int',
--                'options' => []
--            ]));
--
--        $this->fieldMapperMock->expects($this->never())->method('getFieldName');
--        $this->builderMock->expects($this->any())
--            ->method('addField')
--            ->with('store_id', $storeId);
--        $this->builderMock->expects($this->once())->method('build')->willReturn($returnAttributeData);
--
--        $this->additionalFieldsProvider->expects($this->once())->method('getFields')->willReturn([]);
--        $this->assertEquals(
--            [$productId => $returnAttributeData],
--            $this->model->map([$productId => $productAttributeData], $storeId, [])
--        );
-+        $documents = $this->model->map([], $storeId, []);
-+        $this->assertEquals([], $documents);
-     }
- 
-     /**
-      * @param int $productId
--     * @param array $productData
-+     * @param array $attributeData
-+     * @param array|string $attributeValue
-      * @param array $returnAttributeData
-      * @dataProvider mapProvider
-      */
--    public function testGetMap($productId, $productData, $returnAttributeData)
-+    public function testGetMap(int $productId, array $attributeData, $attributeValue, array $returnAttributeData)
-     {
-         $storeId = 1;
--        $attributeCode = $productData['attributeCode'];
--        $this->dataProvider->expects($this->any())->method('getSearchableAttribute')
--            ->with($attributeCode)
--            ->willReturn($this->getAttribute($attributeCode, $productData['attributeData']));
-+        $attributeId = 5;
-+        $context = [];
- 
--        $this->fieldMapperMock->expects($this->any())->method('getFieldName')
--            ->with($attributeCode, [])
-+        $this->dataProvider->method('getSearchableAttribute')
-+            ->with($attributeId)
-+            ->willReturn($this->getAttribute($attributeData));
-+        $this->fieldMapperMock->method('getFieldName')
-             ->willReturnArgument(0);
--        if ($productData['attributeData']['frontendInput'] === 'date') {
--            $this->dateFieldTypeMock->expects($this->once())->method('formatDate')
--                ->with($storeId, $productData['attributeValue'])
--                ->willReturnArgument(1);
--        }
--
--        $this->builderMock->expects($this->exactly(2))
--            ->method('addField')
--            ->withConsecutive(
--                ['store_id', $storeId],
--                [$attributeCode, $returnAttributeData[$attributeCode]]
--            );
-+        $this->dateFieldTypeMock->method('formatDate')
-+            ->willReturnArgument(1);
-+        $this->additionalFieldsProvider->expects($this->once())
-+            ->method('getFields')
-+            ->willReturn([]);
- 
--        $this->builderMock->expects($this->once())->method('build')->willReturn($returnAttributeData);
--        $this->additionalFieldsProvider->expects($this->once())->method('getFields')->willReturn([]);
-         $documentData = [
--            $productId => [$productData['attributeCode'] => $productData['attributeValue']]
-+            $productId => [$attributeId => $attributeValue],
-         ];
--        $this->assertEquals(
--            [$productId => $returnAttributeData],
--            $this->model->map($documentData, $storeId, [])
--        );
-+        $documents = $this->model->map($documentData, $storeId, $context);
-+        $returnAttributeData['store_id'] = $storeId;
-+        $this->assertEquals($returnAttributeData, $documents[$productId]);
-     }
- 
-     /**
--     * @param int $productId
--     * @param array $productData
--     * @param array $returnAttributeData
--     * @dataProvider mapProviderForAttributeWithOptions
-+     * @return void
-      */
--    public function testGetMapForAttributeWithOptions($productId, $productData, $returnAttributeData)
-+    public function testGetMapWithOptions()
-     {
-         $storeId = 1;
--        $attributeCode = $productData['attributeCode'];
--        $this->dataProvider->expects($this->any())->method('getSearchableAttribute')
--            ->with($attributeCode)
--            ->willReturn($this->getAttribute($attributeCode, $productData['attributeData']));
-+        $productId = 10;
-+        $context = [];
-+        $attributeValue = ['o1', 'o2'];
-+        $returnAttributeData = [
-+            'store_id' => $storeId,
-+            'options' => $attributeValue,
-+        ];
- 
--        $this->fieldMapperMock->expects($this->any())->method('getFieldName')
--            ->with($attributeCode, [])
-+        $this->dataProvider->expects($this->never())
-+            ->method('getSearchableAttribute');
-+        $this->fieldMapperMock->method('getFieldName')
-             ->willReturnArgument(0);
--        if ($productData['attributeData']['frontendInput'] === 'date') {
--            $this->dateFieldTypeMock->expects($this->once())->method('formatDate')
--                ->with($storeId, $productData['attributeValue'])
--                ->willReturnArgument(1);
--        }
--        $this->builderMock->expects($this->exactly(3))
--            ->method('addField')
--            ->withConsecutive(
--                ['store_id', $storeId],
--                [$attributeCode . '_value', $returnAttributeData[$attributeCode . '_value']],
--                [$attributeCode, $returnAttributeData[$attributeCode]]
--            );
--        $this->builderMock->expects($this->once())->method('build')->willReturn($returnAttributeData);
--        $this->additionalFieldsProvider->expects($this->once())->method('getFields')->willReturn([]);
-+        $this->additionalFieldsProvider->expects($this->once())
-+            ->method('getFields')
-+            ->willReturn([]);
-+
-         $documentData = [
--            $productId => [$productData['attributeCode'] => $productData['attributeValue']]
-+            $productId => ['options' => $attributeValue],
-         ];
--        $this->assertEquals(
--            [$productId => $returnAttributeData],
--            $this->model->map($documentData, $storeId, [])
--        );
-+        $documents = $this->model->map($documentData, $storeId, $context);
-+        $this->assertEquals($returnAttributeData, $documents[$productId]);
-     }
- 
-     /**
-      * Return attribute mock
-      *
--     * @param string $attributeCode
-      * @param array attributeData
-      * @return \PHPUnit_Framework_MockObject_MockObject
-      */
--    private function getAttribute($attributeCode, $attributeData)
-+    private function getAttribute(array $attributeData): \PHPUnit_Framework_MockObject_MockObject
-     {
--        $attribute = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $attribute->expects($this->once())->method('getAttributeCode')->willReturn($attributeCode);
--        $attribute->expects($this->once())->method('getBackendType')->willReturn($attributeData['backendType']);
--        $attribute->expects($this->any())->method('getFrontendInput')->willReturn($attributeData['frontendInput']);
--        $attribute->expects($this->any())->method('getOptions')->willReturn($attributeData['options']);
-+        $attributeMock = $this->createMock(Attribute::class);
-+        $attributeMock->method('getAttributeCode')->willReturn($attributeData['code']);
-+        $attributeMock->method('getBackendType')->willReturn($attributeData['backendType']);
-+        $attributeMock->method('getFrontendInput')->willReturn($attributeData['frontendInput']);
-+        $attributeMock->method('getIsSearchable')->willReturn($attributeData['is_searchable']);
-+        $options = [];
-+        foreach ($attributeData['options'] as $option) {
-+            $optionMock = $this->createMock(AttributeOptionInterface::class);
-+            $optionMock->method('getValue')->willReturn($option['value']);
-+            $optionMock->method('getLabel')->willReturn($option['label']);
-+            $options[] = $optionMock;
-+        }
-+        $attributeMock->method('getOptions')->willReturn($options);
- 
--        return $attribute;
-+        return $attributeMock;
-     }
- 
-     /**
-      * @return array
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
--    public static function mapProvider()
-+    public static function mapProvider(): array
-     {
-         return [
--            'text attribute' => [
--                11,
-+            'text' => [
-+                10,
-                 [
--                    'attributeCode' => 'description',
--                    'attributeValue' => 'some text',
--                    'attributeData' => [
--                        'backendType' => 'text',
--                        'frontendInput' => 'text',
--                        'options' => []
--                    ]
-+                    'code' => 'description',
-+                    'backendType' => 'text',
-+                    'frontendInput' => 'text',
-+                    'is_searchable' => false,
-+                    'options' => [],
-                 ],
-+                'some text',
-                 ['description' => 'some text'],
-             ],
--            'date time attribute' => [
--                12,
-+            'datetime' => [
-+                10,
-                 [
--                    'attributeCode' => 'created_at',
--                    'attributeValue' => '00-00-00 00:00:00',
--                    'attributeData' => [
--                        'backendType' => 'datetime',
--                        'frontendInput' => 'date',
--                        'options' => []
--                    ]
-+                    'code' => 'created_at',
-+                    'backendType' => 'datetime',
-+                    'frontendInput' => 'date',
-+                    'is_searchable' => false,
-+                    'options' => [],
-                 ],
-+                '00-00-00 00:00:00',
-                 ['created_at' => '00-00-00 00:00:00'],
- 
-             ],
--            'array value attribute' => [
--                12,
-+            'array single value' => [
-+                10,
-                 [
--                    'attributeCode' => 'attribute_array',
--                    'attributeValue' => ['one', 'two', 'three'],
--                    'attributeData' => [
--                        'backendType' => 'text',
--                        'frontendInput' => 'text',
--                        'options' => []
--                    ]
-+                    'code' => 'attribute_array',
-+                    'backendType' => 'text',
-+                    'frontendInput' => 'text',
-+                    'is_searchable' => false,
-+                    'options' => [],
-                 ],
--                ['attribute_array' => 'one two three'],
-+                [10 => 'one'],
-+                ['attribute_array' => 'one'],
-             ],
--            'multiselect value attribute' => [
--                12,
-+            'array multiple value' => [
-+                10,
-                 [
--                    'attributeCode' => 'multiselect',
--                    'attributeValue' => 'some,data with,comma',
--                    'attributeData' => [
--                        'backendType' => 'text',
--                        'frontendInput' => 'multiselect',
--                        'options' => []
--                    ]
-+                    'code' => 'attribute_array',
-+                    'backendType' => 'text',
-+                    'frontendInput' => 'text',
-+                    'is_searchable' => false,
-+                    'options' => [],
-                 ],
--                ['multiselect' => 'some data with comma'],
-+                [10 => 'one', 11 => 'two', 12 => 'three'],
-+                ['attribute_array' => ['one', 'two', 'three']],
-             ],
--        ];
--    }
--
--    /**
--     * @return array
--     */
--    public static function mapProviderForAttributeWithOptions()
--    {
--        return [
--            'select value attribute' => [
--                12,
-+            'array multiple decimal value' => [
-+                10,
-+                [
-+                    'code' => 'decimal_array',
-+                    'backendType' => 'decimal',
-+                    'frontendInput' => 'text',
-+                    'is_searchable' => false,
-+                    'options' => [],
-+                ],
-+                [10 => '0.1', 11 => '0.2', 12 => '0.3'],
-+                ['decimal_array' => ['0.1', '0.2', '0.3']],
-+            ],
-+            'array excluded from merge' => [
-+                10,
-+                [
-+                    'code' => 'status',
-+                    'backendType' => 'int',
-+                    'frontendInput' => 'select',
-+                    'is_searchable' => false,
-+                    'options' => [
-+                        ['value' => '1', 'label' => 'Enabled'],
-+                        ['value' => '2', 'label' => 'Disabled'],
-+                    ],
-+                ],
-+                [10  => '1', 11 => '2'],
-+                ['status' => '1'],
-+            ],
-+            'select without options' => [
-+                10,
-+                [
-+                    'code' => 'color',
-+                    'backendType' => 'text',
-+                    'frontendInput' => 'select',
-+                    'is_searchable' => false,
-+                    'options' => [],
-+                ],
-+                '44',
-+                ['color' => '44'],
-+            ],
-+            'unsearchable select with options' => [
-+                10,
-                 [
--                    'attributeCode' => 'color',
--                    'attributeValue' => '44',
--                    'attributeData' => [
--                        'backendType' => 'text',
--                        'frontendInput' => 'select',
--                        'options' => [new \Magento\Framework\DataObject(['value' => '44', 'label' => 'red'])]
--                    ]
-+                    'code' => 'color',
-+                    'backendType' => 'text',
-+                    'frontendInput' => 'select',
-+                    'is_searchable' => false,
-+                    'options' => [
-+                        ['value' => '44', 'label' => 'red'],
-+                        ['value' => '45', 'label' => 'black'],
-+                    ],
-                 ],
-+                '44',
-+                ['color' => '44'],
-+            ],
-+            'searchable select with options' => [
-+                10,
-+                [
-+                    'code' => 'color',
-+                    'backendType' => 'text',
-+                    'frontendInput' => 'select',
-+                    'is_searchable' => true,
-+                    'options' => [
-+                        ['value' => '44', 'label' => 'red'],
-+                        ['value' => '45', 'label' => 'black'],
-+                    ],
-+                ],
-+                '44',
-                 ['color' => '44', 'color_value' => 'red'],
-             ],
-+            'composite select with options' => [
-+                10,
-+                [
-+                    'code' => 'color',
-+                    'backendType' => 'text',
-+                    'frontendInput' => 'select',
-+                    'is_searchable' => true,
-+                    'options' => [
-+                        ['value' => '44', 'label' => 'red'],
-+                        ['value' => '45', 'label' => 'black'],
-+                    ],
-+                ],
-+                [10 => '44', 11 => '45'],
-+                ['color' => ['44', '45'], 'color_value' => ['red', 'black']],
-+            ],
-+            'multiselect without options' => [
-+                10,
-+                [
-+                    'code' => 'multicolor',
-+                    'backendType' => 'text',
-+                    'frontendInput' => 'multiselect',
-+                    'is_searchable' => false,
-+                    'options' => [],
-+                ],
-+                '44,45',
-+                ['multicolor' => [44, 45]],
-+            ],
-+            'unsearchable multiselect with options' => [
-+                10,
-+                [
-+                    'code' => 'multicolor',
-+                    'backendType' => 'text',
-+                    'frontendInput' => 'multiselect',
-+                    'is_searchable' => false,
-+                    'options' => [
-+                        ['value' => '44', 'label' => 'red'],
-+                        ['value' => '45', 'label' => 'black'],
-+                    ],
-+                ],
-+                '44,45',
-+                ['multicolor' => [44, 45]],
-+            ],
-+            'searchable multiselect with options' => [
-+                10,
-+                [
-+                    'code' => 'multicolor',
-+                    'backendType' => 'text',
-+                    'frontendInput' => 'multiselect',
-+                    'is_searchable' => true,
-+                    'options' => [
-+                        ['value' => '44', 'label' => 'red'],
-+                        ['value' => '45', 'label' => 'black'],
-+                    ],
-+                ],
-+                '44,45',
-+                ['multicolor' => [44, 45], 'multicolor_value' => ['red', 'black']],
-+            ],
-+            'composite multiselect with options' => [
-+                10,
-+                [
-+                    'code' => 'multicolor',
-+                    'backendType' => 'text',
-+                    'frontendInput' => 'multiselect',
-+                    'is_searchable' => true,
-+                    'options' => [
-+                        ['value' => '44', 'label' => 'red'],
-+                        ['value' => '45', 'label' => 'black'],
-+                        ['value' => '46', 'label' => 'green'],
-+                    ],
-+                ],
-+                [10 => '44,45', 11 => '45,46'],
-+                ['multicolor' => [44, 45, 46], 'multicolor_value' => ['red', 'black', 'green']],
-+            ],
-+            'excluded attribute' => [
-+                10,
-+                [
-+                    'code' => 'price',
-+                    'backendType' => 'int',
-+                    'frontendInput' => 'int',
-+                    'is_searchable' => false,
-+                    'options' => []
-+                ],
-+                15,
-+                []
-+            ],
-         ];
-     }
- }
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/AttributeAdapterTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/AttributeAdapterTest.php
-new file mode 100644
-index 00000000000..9ca65d8e675
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/AttributeAdapterTest.php
-@@ -0,0 +1,387 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product;
-+
-+use Magento\Framework\Api\CustomAttributesDataInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Framework\Model\AbstractExtensibleModel;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class AttributeAdapterTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter
-+     */
-+    private $adapter;
-+
-+    /**
-+     * @var AbstractExtensibleModel
-+     */
-+    private $attribute;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->attribute = $this->getMockBuilder(CustomAttributesDataInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods([
-+                'getIsFilterable',
-+                'getIsFilterableInSearch',
-+                'getIsSearchable',
-+                'getIsVisibleInAdvancedSearch',
-+                'getBackendType',
-+                'getFrontendInput',
-+                'usesSource',
-+            ])
-+            ->getMockForAbstractClass();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->adapter = $objectManager->getObject(
-+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter::class,
-+            [
-+                'attribute' => $this->attribute,
-+                'attributeCode' => 'code',
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider isFilterableProvider
-+     * @param $isFilterable
-+     * @param $isFilterableInSearch
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testIsFilterable($isFilterable, $isFilterableInSearch, $expected)
-+    {
-+        $this->attribute
-+            ->method('getIsFilterable')
-+            ->willReturn($isFilterable);
-+        $this->attribute
-+            ->method('getIsFilterableInSearch')
-+            ->willReturn($isFilterableInSearch);
-+        $this->assertEquals(
-+            $expected,
-+            $this->adapter->isFilterable()
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider isSearchableProvider
-+     * @param $isSearchable
-+     * @param $isVisibleInAdvancedSearch
-+     * @param $isFilterable
-+     * @param $isFilterableInSearch
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testIsSearchable(
-+        $isSearchable,
-+        $isVisibleInAdvancedSearch,
-+        $isFilterable,
-+        $isFilterableInSearch,
-+        $expected
-+    ) {
-+        $this->attribute
-+            ->method('getIsSearchable')
-+            ->willReturn($isSearchable);
-+        $this->attribute
-+            ->method('getIsVisibleInAdvancedSearch')
-+            ->willReturn($isVisibleInAdvancedSearch);
-+        $this->attribute
-+            ->method('getIsFilterable')
-+            ->willReturn($isFilterable);
-+        $this->attribute
-+            ->method('getIsFilterableInSearch')
-+            ->willReturn($isFilterableInSearch);
-+        $this->assertEquals(
-+            $expected,
-+            $this->adapter->isSearchable()
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider isAlwaysIndexableProvider
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testIsAlwaysIndexable($expected)
-+    {
-+        $this->assertEquals(
-+            $expected,
-+            $this->adapter->isAlwaysIndexable()
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider isDateTimeTypeProvider
-+     * @param $backendType
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testIsDateTimeType($backendType, $expected)
-+    {
-+        $this->attribute
-+            ->method('getBackendType')
-+            ->willReturn($backendType);
-+        $this->assertEquals(
-+            $expected,
-+            $this->adapter->isDateTimeType()
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider isFloatTypeProvider
-+     * @param $backendType
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testIsFloatType($backendType, $expected)
-+    {
-+        $this->attribute
-+            ->method('getBackendType')
-+            ->willReturn($backendType);
-+        $this->assertEquals(
-+            $expected,
-+            $this->adapter->isFloatType()
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider isIntegerTypeProvider
-+     * @param $backendType
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testIsIntegerType($backendType, $expected)
-+    {
-+        $this->attribute
-+            ->method('getBackendType')
-+            ->willReturn($backendType);
-+        $this->assertEquals(
-+            $expected,
-+            $this->adapter->isIntegerType()
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider isBooleanTypeProvider
-+     * @param $frontendInput
-+     * @param $backendType
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testIsBooleanType($frontendInput, $backendType, $expected)
-+    {
-+        $this->attribute
-+            ->method('getBackendType')
-+            ->willReturn($backendType);
-+        $this->attribute
-+            ->method('getFrontendInput')
-+            ->willReturn($frontendInput);
-+        $this->assertEquals(
-+            $expected,
-+            $this->adapter->isBooleanType()
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider isComplexTypeProvider
-+     * @param $frontendInput
-+     * @param $usesSource
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testIsComplexType($frontendInput, $usesSource, $expected)
-+    {
-+        $this->attribute
-+            ->method('usesSource')
-+            ->willReturn($usesSource);
-+        $this->attribute
-+            ->method('getFrontendInput')
-+            ->willReturn($frontendInput);
-+        $this->assertEquals(
-+            $expected,
-+            $this->adapter->isComplexType()
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider isEavAttributeProvider
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testIsEavAttribute($expected)
-+    {
-+        $this->assertEquals(
-+            $expected,
-+            $this->adapter->isEavAttribute()
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isEavAttributeProvider()
-+    {
-+        return [
-+            [false],
-+        ];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isComplexTypeProvider()
-+    {
-+        return [
-+            ['select', true, true],
-+            ['multiselect', true, true],
-+            ['multiselect', false, true],
-+            ['int', false, false],
-+            ['int', true, true],
-+        ];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isBooleanTypeProvider()
-+    {
-+        return [
-+            ['select', 'int', true],
-+            ['boolean', 'int', true],
-+            ['boolean', 'varchar', false],
-+            ['select', 'varchar', false],
-+            ['int', 'varchar', false],
-+            ['int', 'int', false],
-+        ];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isIntegerTypeProvider()
-+    {
-+        return [
-+            ['smallint', true],
-+            ['int', true],
-+            ['string', false],
-+        ];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isFloatTypeProvider()
-+    {
-+        return [
-+            ['decimal', true],
-+            ['int', false],
-+        ];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isDateTimeTypeProvider()
-+    {
-+        return [
-+            ['timestamp', true],
-+            ['datetime', true],
-+            ['int', false],
-+        ];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isAlwaysIndexableProvider()
-+    {
-+        return [
-+            [false]
-+        ];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isSearchableProvider()
-+    {
-+        return [
-+            [true, false, false, false, true],
-+            [false, false, false, false, false],
-+            [false, true, false, false, true],
-+            [false, false, true, false, true],
-+            [true, true, true, false, true],
-+            [true, true, false, false, true],
-+        ];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isFilterableProvider()
-+    {
-+        return [
-+            [true, false, true,],
-+            [true, false, true,],
-+            [false, false, false,]
-+        ];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isStringServiceFieldTypeProvider()
-+    {
-+        return [
-+            ['string', 'text', false,],
-+            ['text', 'text', true,]
-+        ];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldNameProvider()
-+    {
-+        return [
-+            ['name', [], 'name']
-+        ];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldTypeProvider()
-+    {
-+        return [
-+            ['type', 'type']
-+        ];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldIndexProvider()
-+    {
-+        return [
-+            ['type', 'no', 'no']
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php
-new file mode 100644
-index 00000000000..7c2a33c05aa
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php
-@@ -0,0 +1,328 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider;
-+
-+use Magento\Framework\Api\SearchCriteria;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Catalog\Api\CategoryListInterface;
-+use Magento\Customer\Api\GroupRepositoryInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
-+    as IndexTypeConverterInterface;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Catalog\Api\Data\CategorySearchResultsInterface;
-+use Magento\Catalog\Api\Data\CategoryInterface;
-+use Magento\Customer\Api\Data\GroupSearchResultsInterface;
-+use Magento\Customer\Api\Data\GroupInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
-+    as FieldNameResolver;
-+use Magento\Catalog\Model\ResourceModel\Category\Collection;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class DynamicFieldTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\DynamicField
-+     */
-+    private $provider;
-+
-+    /**
-+     * @var GroupRepositoryInterface
-+     */
-+    private $groupRepository;
-+
-+    /**
-+     * @var SearchCriteriaBuilder
-+     */
-+    private $searchCriteriaBuilder;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * @var IndexTypeConverterInterface
-+     */
-+    private $indexTypeConverter;
-+
-+    /**
-+     * @var AttributeProvider
-+     */
-+    private $attributeAdapterProvider;
-+
-+    /**
-+     * @var CategoryListInterface
-+     */
-+    private $categoryList;
-+
-+    /**
-+     * @var Collection
-+     */
-+    private $categoryCollection;
-+
-+    /**
-+     * @var FieldNameResolver
-+     */
-+    private $fieldNameResolver;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->groupRepository = $this->getMockBuilder(GroupRepositoryInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->searchCriteriaBuilder = $this->getMockBuilder(SearchCriteriaBuilder::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->indexTypeConverter = $this->getMockBuilder(IndexTypeConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->attributeAdapterProvider = $this->getMockBuilder(AttributeProvider::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getByAttributeCode', 'getByAttribute'])
-+            ->getMock();
-+        $this->fieldNameResolver = $this->getMockBuilder(FieldNameResolver::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getFieldName'])
-+            ->getMock();
-+        $this->categoryList = $this->getMockBuilder(CategoryListInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->categoryCollection = $this->getMockBuilder(Collection::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAllIds'])
-+            ->getMock();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->provider = $objectManager->getObject(
-+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\DynamicField::class,
-+            [
-+                'groupRepository' => $this->groupRepository,
-+                'searchCriteriaBuilder' => $this->searchCriteriaBuilder,
-+                'fieldTypeConverter' => $this->fieldTypeConverter,
-+                'indexTypeConverter' => $this->indexTypeConverter,
-+                'attributeAdapterProvider' => $this->attributeAdapterProvider,
-+                'categoryList' => $this->categoryList,
-+                'fieldNameResolver' => $this->fieldNameResolver,
-+                'categoryCollection' => $this->categoryCollection,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider attributeProvider
-+     * @param $complexType
-+     * @param $categoryId
-+     * @param $groupId
-+     * @param array $expected
-+     * @return void
-+     */
-+    public function testGetAllAttributesTypes(
-+        $complexType,
-+        $categoryId,
-+        $groupId,
-+        $expected
-+    ) {
-+        $searchCriteria = $this->getMockBuilder(SearchCriteria::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->searchCriteriaBuilder->expects($this->any())
-+            ->method('create')
-+            ->willReturn($searchCriteria);
-+        $groupSearchResults = $this->getMockBuilder(GroupSearchResultsInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getItems'])
-+            ->getMockForAbstractClass();
-+        $group = $this->getMockBuilder(GroupInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getId'])
-+            ->getMockForAbstractClass();
-+        $group->expects($this->any())
-+            ->method('getId')
-+            ->willReturn($groupId);
-+        $groupSearchResults->expects($this->any())
-+            ->method('getItems')
-+            ->willReturn([$group]);
-+
-+        $this->categoryCollection->expects($this->any())
-+            ->method('getAllIds')
-+            ->willReturn([$categoryId]);
-+
-+        $categoryAttributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributeCode'])
-+            ->getMock();
-+        $categoryAttributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn('category');
-+        $positionAttributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributeCode'])
-+            ->getMock();
-+        $positionAttributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn('position');
-+
-+        $this->fieldNameResolver->expects($this->any())
-+            ->method('getFieldName')
-+            ->will($this->returnCallback(
-+                function ($attribute) use ($categoryId) {
-+                    static $callCount = [];
-+                    $attributeCode = $attribute->getAttributeCode();
-+                    $callCount[$attributeCode] = !isset($callCount[$attributeCode]) ? 1 : ++$callCount[$attributeCode];
-+
-+                    if ($attributeCode === 'category') {
-+                        return 'category_name_' . $categoryId;
-+                    } elseif ($attributeCode === 'position') {
-+                        return 'position_' . $categoryId;
-+                    } elseif ($attributeCode === 'price') {
-+                        return 'price_' . $categoryId . '_1';
-+                    }
-+                }
-+            ));
-+        $priceAttributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributeCode'])
-+            ->getMock();
-+        $priceAttributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn('price');
-+        $this->indexTypeConverter->expects($this->any())
-+            ->method('convert')
-+            ->willReturn('no_index');
-+        $this->groupRepository->expects($this->any())
-+            ->method('getList')
-+            ->willReturn($groupSearchResults);
-+        $this->attributeAdapterProvider->expects($this->any())
-+            ->method('getByAttributeCode')
-+            ->with($this->anything())
-+            ->will($this->returnCallback(
-+                function ($code) use (
-+                    $categoryAttributeMock,
-+                    $positionAttributeMock,
-+                    $priceAttributeMock
-+                ) {
-+                    static $callCount = [];
-+                    $callCount[$code] = !isset($callCount[$code]) ? 1 : ++$callCount[$code];
-+
-+                    if ($code === 'position') {
-+                        return $positionAttributeMock;
-+                    } elseif ($code === 'category_name') {
-+                        return $categoryAttributeMock;
-+                    } elseif ($code === 'price') {
-+                        return $priceAttributeMock;
-+                    }
-+                }
-+            ));
-+        $this->fieldTypeConverter->expects($this->any())
-+            ->method('convert')
-+            ->with($this->anything())
-+            ->will($this->returnCallback(
-+                function ($type) use ($complexType) {
-+                    static $callCount = [];
-+                    $callCount[$type] = !isset($callCount[$type]) ? 1 : ++$callCount[$type];
-+
-+                    if ($type === 'string') {
-+                        return 'string';
-+                    }
-+                    if ($type === 'string') {
-+                        return 'string';
-+                    } elseif ($type === 'float') {
-+                        return 'float';
-+                    } else {
-+                        return $complexType;
-+                    }
-+                }
-+            ));
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->provider->getFields(['websiteId' => 1])
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function attributeProvider()
-+    {
-+        return [
-+            [
-+                'text',
-+                1,
-+                1,
-+                [
-+                    'category_name_1' => [
-+                        'type' => 'string',
-+                        'index' => 'no_index'
-+                    ],
-+                    'position_1' => [
-+                        'type' => 'string',
-+                        'index' => 'no_index'
-+                    ],
-+                    'price_1_1' => [
-+                        'type' => 'float',
-+                        'store' => true
-+                    ]
-+                ]
-+            ],
-+            [
-+                null,
-+                1,
-+                1,
-+                [
-+                    'category_name_1' => [
-+                        'type' => 'string',
-+                        'index' => 'no_index'
-+                    ],
-+                    'position_1' => [
-+                        'type' => 'string',
-+                        'index' => 'no_index'
-+                    ],
-+                    'price_1_1' => [
-+                        'type' => 'float',
-+                        'store' => true
-+                    ]
-+                ],
-+            ],
-+            [
-+                null,
-+                1,
-+                1,
-+                [
-+                    'category_name_1' => [
-+                        'type' => 'string',
-+                        'index' => 'no_index'
-+                    ],
-+                    'position_1' => [
-+                        'type' => 'string',
-+                        'index' => 'no_index'
-+                    ],
-+                    'price_1_1' => [
-+                        'type' => 'float',
-+                        'store' => true
-+                    ]
-+                ]
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php
-new file mode 100644
-index 00000000000..86bcfeb0648
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php
-@@ -0,0 +1,99 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class IndexResolverTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\IndexResolver
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var ConverterInterface
-+     */
-+    private $converter;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->converter = $this->getMockBuilder(ConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['convert'])
-+            ->getMockForAbstractClass();
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->resolver = $objectManager->getObject(
-+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\IndexResolver::class,
-+            [
-+                'converter' => $this->converter
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldIndexProvider
-+     * @param $isSearchable
-+     * @param $isAlwaysIndexable
-+     * @param $serviceFieldType
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldName(
-+        $isSearchable,
-+        $isAlwaysIndexable,
-+        $serviceFieldType,
-+        $expected
-+    ) {
-+        $this->converter->expects($this->any())
-+            ->method('convert')
-+            ->willReturn('something');
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods([
-+                'isSearchable',
-+                'isAlwaysIndexable',
-+            ])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('isSearchable')
-+            ->willReturn($isSearchable);
-+        $attributeMock->expects($this->any())
-+            ->method('isAlwaysIndexable')
-+            ->willReturn($isAlwaysIndexable);
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldIndex($attributeMock, $serviceFieldType)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldIndexProvider()
-+    {
-+        return [
-+            [true, true, 'string', null],
-+            [false, false, 'string', 'something'],
-+            [true, false, 'string', null],
-+            [false, true, 'string', null],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryNameTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryNameTest.php
-new file mode 100644
-index 00000000000..5ebeac22844
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryNameTest.php
-@@ -0,0 +1,124 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Catalog\Api\Data\CategoryInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Framework\Registry;
-+use Magento\Store\Model\StoreManagerInterface as StoreManager;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CategoryName;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class CategoryNameTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var CategoryName
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var StoreManager
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var Registry
-+     */
-+    private $coreRegistry;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->storeManager = $this->getMockBuilder(StoreManager::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getStore'])
-+            ->getMockForAbstractClass();
-+        $this->coreRegistry = $this->getMockBuilder(Registry::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['registry'])
-+            ->getMock();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->resolver = $objectManager->getObject(
-+            CategoryName::class,
-+            [
-+                'storeManager' => $this->storeManager,
-+                'coreRegistry' => $this->coreRegistry,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldNameProvider
-+     * @param $attributeCode
-+     * @param $context
-+     * @param $fromRegistry
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldName($attributeCode, $context, $fromRegistry, $expected)
-+    {
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributeCode'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+        $store = $this->getMockBuilder(StoreInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getRootCategoryId'])
-+            ->getMockForAbstractClass();
-+        $store->expects($this->any())
-+            ->method('getRootCategoryId')
-+            ->willReturn(2);
-+        $this->storeManager->expects($this->any())
-+            ->method('getStore')
-+            ->willReturn($store);
-+        $category = null;
-+        if ($fromRegistry) {
-+            $category = $this->getMockBuilder(CategoryInterface::class)
-+                ->disableOriginalConstructor()
-+                ->setMethods(['getId'])
-+                ->getMockForAbstractClass();
-+            $category->expects($this->any())
-+                ->method('getId')
-+                ->willReturn(1);
-+        }
-+        $this->coreRegistry->expects($this->any())
-+            ->method('registry')
-+            ->willReturn($category);
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldName($attributeMock, $context)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldNameProvider()
-+    {
-+        return [
-+            ['category_name', [], true, 'name_category_1'],
-+            ['category_name', [], false, 'name_category_2'],
-+            ['category_name', ['categoryId' => 3], false, 'name_category_3'],
-+            ['price', ['categoryId' => 3], false, ''],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php
-new file mode 100644
-index 00000000000..fd5c87bc951
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php
-@@ -0,0 +1,123 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
-+    as FieldTypeResolver;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class DefaultResolverTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var DefaultResolver
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var FieldTypeResolver
-+     */
-+    private $fieldTypeResolver;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = new ObjectManagerHelper($this);
-+        $this->fieldTypeResolver = $this->getMockBuilder(FieldTypeResolver::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getFieldType'])
-+            ->getMockForAbstractClass();
-+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['convert'])
-+            ->getMockForAbstractClass();
-+
-+        $this->resolver = $objectManager->getObject(
-+            DefaultResolver::class,
-+            [
-+                'fieldTypeResolver' => $this->fieldTypeResolver,
-+                'fieldTypeConverter' => $this->fieldTypeConverter
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldNameProvider
-+     * @param $fieldType
-+     * @param $attributeCode
-+     * @param $frontendInput
-+     * @param $isSortable
-+     * @param $context
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldName(
-+        $fieldType,
-+        $attributeCode,
-+        $frontendInput,
-+        $isSortable,
-+        $context,
-+        $expected
-+    ) {
-+        $this->fieldTypeConverter->expects($this->any())
-+            ->method('convert')
-+            ->willReturn('string');
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributeCode', 'getFrontendInput', 'isSortable'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+        $attributeMock->expects($this->any())
-+            ->method('getFrontendInput')
-+            ->willReturn($frontendInput);
-+        $attributeMock->expects($this->any())
-+            ->method('isSortable')
-+            ->willReturn($isSortable);
-+        $this->fieldTypeResolver->expects($this->any())
-+            ->method('getFieldType')
-+            ->willReturn($fieldType);
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldName($attributeMock, $context)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldNameProvider()
-+    {
-+        return [
-+            ['', 'code', '', false, [], 'code'],
-+            ['', 'code', '', false, ['type' => 'default'], 'code'],
-+            ['string', '*', '', false, ['type' => 'default'], '_all'],
-+            ['', 'code', '', false, ['type' => 'default'], 'code'],
-+            ['', 'code', 'select', false, ['type' => 'default'], 'code'],
-+            ['', 'code', 'boolean', false, ['type' => 'default'], 'code'],
-+            ['', 'code', '', true, ['type' => 'sort'], 'sort_code'],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/NotEavAttributeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/NotEavAttributeTest.php
-new file mode 100644
-index 00000000000..cdd8dde585a
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/NotEavAttributeTest.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\NotEavAttribute;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class NotEavAttributeTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var NotEavAttribute
-+     */
-+    private $resolver;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->resolver = $objectManager->getObject(
-+            NotEavAttribute::class
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldNameProvider
-+     * @param $attributeCode
-+     * @param $isEavAttribute
-+     * @param $context
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldName($attributeCode, $isEavAttribute, $context, $expected)
-+    {
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['isEavAttribute', 'getAttributeCode'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('isEavAttribute')
-+            ->willReturn($isEavAttribute);
-+        $attributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldName($attributeMock, $context)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldNameProvider()
-+    {
-+        return [
-+            ['code', true, [], ''],
-+            ['code', false, [], 'code'],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/PositionTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/PositionTest.php
-new file mode 100644
-index 00000000000..dcfd4d02988
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/PositionTest.php
-@@ -0,0 +1,123 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Catalog\Api\Data\CategoryInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Framework\Registry;
-+use Magento\Store\Model\StoreManagerInterface as StoreManager;
-+use Magento\Store\Api\Data\StoreInterface;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class PositionTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Position
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var StoreManager
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var Registry
-+     */
-+    private $coreRegistry;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->storeManager = $this->getMockBuilder(StoreManager::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getStore'])
-+            ->getMockForAbstractClass();
-+        $this->coreRegistry = $this->getMockBuilder(Registry::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['registry'])
-+            ->getMock();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->resolver = $objectManager->getObject(
-+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Position::class,
-+            [
-+                'storeManager' => $this->storeManager,
-+                'coreRegistry' => $this->coreRegistry,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldNameProvider
-+     * @param $attributeCode
-+     * @param $context
-+     * @param $fromRegistry
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldName($attributeCode, $context, $fromRegistry, $expected)
-+    {
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributeCode'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+        $store = $this->getMockBuilder(StoreInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getRootCategoryId'])
-+            ->getMockForAbstractClass();
-+        $store->expects($this->any())
-+            ->method('getRootCategoryId')
-+            ->willReturn(2);
-+        $this->storeManager->expects($this->any())
-+            ->method('getStore')
-+            ->willReturn($store);
-+        $category = null;
-+        if ($fromRegistry) {
-+            $category = $this->getMockBuilder(CategoryInterface::class)
-+                ->disableOriginalConstructor()
-+                ->setMethods(['getId'])
-+                ->getMockForAbstractClass();
-+            $category->expects($this->any())
-+                ->method('getId')
-+                ->willReturn(1);
-+        }
-+        $this->coreRegistry->expects($this->any())
-+            ->method('registry')
-+            ->willReturn($category);
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldName($attributeMock, $context)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldNameProvider()
-+    {
-+        return [
-+            ['position', [], true, 'position_category_1'],
-+            ['position', [], false, 'position_category_2'],
-+            ['position', ['categoryId' => 2], false, 'position_category_2'],
-+            ['price', ['categoryId' => 2], false, ''],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/PriceTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/PriceTest.php
-new file mode 100644
-index 00000000000..244da5a42e0
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/PriceTest.php
-@@ -0,0 +1,111 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Customer\Model\Session as CustomerSession;
-+use Magento\Store\Model\StoreManagerInterface as StoreManager;
-+use Magento\Store\Api\Data\StoreInterface;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class PriceTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Price
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var CustomerSession
-+     */
-+    private $customerSession;
-+
-+    /**
-+     * @var StoreManager
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->customerSession = $this->getMockBuilder(CustomerSession::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getCustomerGroupId'])
-+            ->getMock();
-+        $this->storeManager = $this->getMockBuilder(StoreManager::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getStore'])
-+            ->getMockForAbstractClass();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->resolver = $objectManager->getObject(
-+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Price::class,
-+            [
-+                'customerSession' => $this->customerSession,
-+                'storeManager' => $this->storeManager,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldNameProvider
-+     * @param $attributeCode
-+     * @param $context
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldName($attributeCode, $context, $expected)
-+    {
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributeCode'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+        $this->customerSession->expects($this->any())
-+            ->method('getCustomerGroupId')
-+            ->willReturn(1);
-+        $store = $this->getMockBuilder(StoreInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getWebsiteId'])
-+            ->getMockForAbstractClass();
-+        $store->expects($this->any())
-+            ->method('getWebsiteId')
-+            ->willReturn(2);
-+        $this->storeManager->expects($this->any())
-+            ->method('getStore')
-+            ->willReturn($store);
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldName($attributeMock, $context)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldNameProvider()
-+    {
-+        return [
-+            ['price', [], 'price_1_2'],
-+            ['price', ['customerGroupId' => 2, 'websiteId' => 3], 'price_2_3'],
-+            ['price', ['customerGroupId' => 2], 'price_2_2'],
-+            ['sku', ['customerGroupId' => 2], ''],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttributeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttributeTest.php
-new file mode 100644
-index 00000000000..dcbf64bbb20
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttributeTest.php
-@@ -0,0 +1,73 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\SpecialAttribute;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class SpecialAttributeTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var SpecialAttribute
-+     */
-+    private $resolver;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->resolver = $objectManager->getObject(
-+            SpecialAttribute::class
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldNameProvider
-+     * @param $attributeCode
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldName($attributeCode, $expected)
-+    {
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributeCode'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldName($attributeMock)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldNameProvider()
-+    {
-+        return [
-+            ['id', 'id'],
-+            ['sku', 'sku'],
-+            ['store_id', 'store_id'],
-+            ['visibility', 'visibility'],
-+            ['price', ''],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterTest.php
-new file mode 100644
-index 00000000000..842007aee29
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterTest.php
-@@ -0,0 +1,61 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType;
-+
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class ConverterTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter
-+     */
-+    private $converter;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->converter = $objectManager->getObject(
-+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter::class
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider convertProvider
-+     * @param $internalType
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testConvert($internalType, $expected)
-+    {
-+        $this->assertEquals(
-+            $expected,
-+            $this->converter->convert($internalType)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function convertProvider()
-+    {
-+        return [
-+            ['string', 'string'],
-+            ['float', 'float'],
-+            ['integer', 'integer'],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DateTimeTypeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DateTimeTypeTest.php
-new file mode 100644
-index 00000000000..ca474c4bee1
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DateTimeTypeTest.php
-@@ -0,0 +1,88 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DateTimeType;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class DateTimeTypeTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var DateTimeType
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['convert'])
-+            ->getMockForAbstractClass();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->resolver = $objectManager->getObject(
-+            DateTimeType::class,
-+            [
-+                'fieldTypeConverter' => $this->fieldTypeConverter,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldTypeProvider
-+     * @param $isDateTimeType
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldType($isDateTimeType, $expected)
-+    {
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['isDateTimeType'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('isDateTimeType')
-+            ->willReturn($isDateTimeType);
-+        $this->fieldTypeConverter->expects($this->any())
-+            ->method('convert')
-+            ->willReturn('something');
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldType($attributeMock)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldTypeProvider()
-+    {
-+        return [
-+            [true, 'something'],
-+            [false, ''],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DefaultResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DefaultResolverTest.php
-new file mode 100644
-index 00000000000..72b5320a050
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DefaultResolverTest.php
-@@ -0,0 +1,82 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DefaultResolver;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class DefaultResolverTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var DefaultResolver
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['convert'])
-+            ->getMockForAbstractClass();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->resolver = $objectManager->getObject(
-+            DefaultResolver::class,
-+            [
-+                'fieldTypeConverter' => $this->fieldTypeConverter,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldTypeProvider
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldType($expected)
-+    {
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->fieldTypeConverter->expects($this->any())
-+            ->method('convert')
-+            ->willReturn('something');
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldType($attributeMock)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldTypeProvider()
-+    {
-+        return [
-+            ['something'],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/FloatTypeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/FloatTypeTest.php
-new file mode 100644
-index 00000000000..c69a6f35b1e
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/FloatTypeTest.php
-@@ -0,0 +1,87 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class FloatTypeTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\FloatType
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['convert'])
-+            ->getMockForAbstractClass();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->resolver = $objectManager->getObject(
-+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\FloatType::class,
-+            [
-+                'fieldTypeConverter' => $this->fieldTypeConverter,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldTypeProvider
-+     * @param $isFloatType
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldType($isFloatType, $expected)
-+    {
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['isFloatType'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('isFloatType')
-+            ->willReturn($isFloatType);
-+        $this->fieldTypeConverter->expects($this->any())
-+            ->method('convert')
-+            ->willReturn('something');
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldType($attributeMock)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldTypeProvider()
-+    {
-+        return [
-+            [true, 'something'],
-+            [false, ''],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerTypeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerTypeTest.php
-new file mode 100644
-index 00000000000..7570c8971b2
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerTypeTest.php
-@@ -0,0 +1,104 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class IntegerTypeTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var IntegerType
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['convert'])
-+            ->getMockForAbstractClass();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->resolver = $objectManager->getObject(
-+            IntegerType::class,
-+            [
-+                'fieldTypeConverter' => $this->fieldTypeConverter,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldTypeProvider
-+     * @param $attributeCode
-+     * @param $isIntegerType
-+     * @param $isBooleanType
-+     * @param $isUserDefined
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldType($attributeCode, $isIntegerType, $isBooleanType, $isUserDefined, $expected)
-+    {
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributeCode', 'isIntegerType', 'isBooleanType', 'isUserDefined'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+        $attributeMock->expects($this->any())
-+            ->method('isIntegerType')
-+            ->willReturn($isIntegerType);
-+        $attributeMock->expects($this->any())
-+            ->method('isBooleanType')
-+            ->willReturn($isBooleanType);
-+        $attributeMock->expects($this->any())
-+            ->method('isUserDefined')
-+            ->willReturn($isUserDefined);
-+        $this->fieldTypeConverter->expects($this->any())
-+            ->method('convert')
-+            ->willReturn('something');
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldType($attributeMock)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldTypeProvider()
-+    {
-+        return [
-+            ['category_ids', true, true, true, null],
-+            ['category_ids', false, false, false, null],
-+            ['type', true, false, false, 'something'],
-+            ['type', false, true, false, 'something'],
-+            ['type', true, true, true, ''],
-+            ['type', false, false, true, ''],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
-new file mode 100644
-index 00000000000..de85b8b6602
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
-@@ -0,0 +1,332 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider;
-+
-+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Eav\Model\Config;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
-+    as IndexTypeConverterInterface;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
-+    as FieldTypeResolver;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ResolverInterface
-+    as FieldIndexResolver;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
-+    as FieldNameResolver;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class StaticFieldTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField
-+     */
-+    private $provider;
-+
-+    /**
-+     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $eavConfig;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * @var IndexTypeConverterInterface
-+     */
-+    private $indexTypeConverter;
-+
-+    /**
-+     * @var AttributeProvider
-+     */
-+    private $attributeAdapterProvider;
-+
-+    /**
-+     * @var FieldIndexResolver
-+     */
-+    private $fieldIndexResolver;
-+
-+    /**
-+     * @var FieldTypeResolver
-+     */
-+    private $fieldTypeResolver;
-+
-+    /**
-+     * @var FieldNameResolver
-+     */
-+    private $fieldNameResolver;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->eavConfig = $this->getMockBuilder(Config::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getEntityAttributes'])
-+            ->getMock();
-+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+        $this->indexTypeConverter = $this->getMockBuilder(IndexTypeConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+        $this->attributeAdapterProvider = $this->getMockBuilder(AttributeProvider::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getByAttributeCode'])
-+            ->getMock();
-+        $this->fieldTypeResolver = $this->getMockBuilder(FieldTypeResolver::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getFieldType'])
-+            ->getMock();
-+        $this->fieldIndexResolver = $this->getMockBuilder(FieldIndexResolver::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getFieldIndex'])
-+            ->getMock();
-+        $this->fieldNameResolver = $this->getMockBuilder(FieldNameResolver::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getFieldName'])
-+            ->getMock();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->provider = $objectManager->getObject(
-+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField::class,
-+            [
-+                'eavConfig' => $this->eavConfig,
-+                'fieldTypeConverter' => $this->fieldTypeConverter,
-+                'indexTypeConverter' => $this->indexTypeConverter,
-+                'attributeAdapterProvider' => $this->attributeAdapterProvider,
-+                'fieldIndexResolver' => $this->fieldIndexResolver,
-+                'fieldTypeResolver' => $this->fieldTypeResolver,
-+                'fieldNameResolver' => $this->fieldNameResolver,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider attributeProvider
-+     * @param string $attributeCode
-+     * @param string $inputType
-+     * @param $indexType
-+     * @param $isComplexType
-+     * @param $complexType
-+     * @param $isSortable
-+     * @param $fieldName
-+     * @param $compositeFieldName
-+     * @param $sortFieldName
-+     * @param array $expected
-+     * @return void
-+     */
-+    public function testGetAllAttributesTypes(
-+        $attributeCode,
-+        $inputType,
-+        $indexType,
-+        $isComplexType,
-+        $complexType,
-+        $isSortable,
-+        $fieldName,
-+        $compositeFieldName,
-+        $sortFieldName,
-+        $expected
-+    ) {
-+        $this->fieldTypeResolver->expects($this->any())
-+            ->method('getFieldType')
-+            ->willReturn($inputType);
-+        $this->fieldIndexResolver->expects($this->any())
-+            ->method('getFieldIndex')
-+            ->willReturn($indexType);
-+        $this->indexTypeConverter->expects($this->any())
-+            ->method('convert')
-+            ->with($this->anything())
-+            ->will($this->returnCallback(
-+                function ($type) {
-+                    if ($type === 'no_index') {
-+                        return 'no';
-+                    } elseif ($type === 'no_analyze') {
-+                        return 'not_analyzed';
-+                    }
-+                }
-+            ));
-+        $this->fieldNameResolver->expects($this->any())
-+            ->method('getFieldName')
-+            ->with($this->anything())
-+            ->will($this->returnCallback(
-+                function ($attributeMock, $context) use ($fieldName, $compositeFieldName, $sortFieldName) {
-+                    if (empty($context)) {
-+                        return $fieldName;
-+                    } elseif ($context['type'] === 'sort') {
-+                        return $sortFieldName;
-+                    } elseif ($context['type'] === 'text') {
-+                        return $compositeFieldName;
-+                    }
-+                }
-+            ));
-+
-+        $productAttributeMock = $this->getMockBuilder(AbstractAttribute::class)
-+            ->setMethods(['getAttributeCode'])
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+        $productAttributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+        $this->eavConfig->expects($this->any())->method('getEntityAttributes')
-+            ->willReturn([$productAttributeMock]);
-+
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['isComplexType', 'getAttributeCode', 'isSortable'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('isComplexType')
-+            ->willReturn($isComplexType);
-+        $attributeMock->expects($this->any())
-+            ->method('isSortable')
-+            ->willReturn($isSortable);
-+        $attributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+        $this->attributeAdapterProvider->expects($this->any())
-+            ->method('getByAttributeCode')
-+            ->with($this->anything())
-+            ->willReturn($attributeMock);
-+        $this->fieldTypeConverter->expects($this->any())
-+            ->method('convert')
-+            ->with($this->anything())
-+            ->will($this->returnCallback(
-+                function ($type) use ($complexType) {
-+                    static $callCount = [];
-+                    $callCount[$type] = !isset($callCount[$type]) ? 1 : ++$callCount[$type];
-+
-+                    if ($type === 'string') {
-+                        return 'string';
-+                    } elseif ($type === 'float') {
-+                        return 'float';
-+                    } elseif ($type === 'keyword') {
-+                        return 'string';
-+                    } else {
-+                        return $complexType;
-+                    }
-+                }
-+            ));
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->provider->getFields(['storeId' => 1])
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function attributeProvider()
-+    {
-+        return [
-+            [
-+                'category_ids',
-+                'select',
-+                true,
-+                true,
-+                'text',
-+                false,
-+                'category_ids',
-+                'category_ids_value',
-+                '',
-+                [
-+                    'category_ids' => [
-+                        'type' => 'select',
-+                        'index' => true
-+                    ],
-+                    'category_ids_value' => [
-+                        'type' => 'string'
-+                    ],
-+                    'store_id' => [
-+                        'type' => 'string',
-+                        'index' => 'no'
-+                    ]
-+                ]
-+            ],
-+            [
-+                'attr_code',
-+                'text',
-+                'no',
-+                false,
-+                null,
-+                false,
-+                'attr_code',
-+                '',
-+                '',
-+                [
-+                    'attr_code' => [
-+                        'type' => 'text',
-+                        'index' => 'no'
-+                    ],
-+                    'store_id' => [
-+                        'type' => 'string',
-+                        'index' => 'no'
-+                    ]
-+                ],
-+            ],
-+            [
-+                'attr_code',
-+                'text',
-+                null,
-+                false,
-+                null,
-+                false,
-+                'attr_code',
-+                '',
-+                '',
-+                [
-+                    'attr_code' => [
-+                        'type' => 'text'
-+                    ],
-+                    'store_id' => [
-+                        'type' => 'string',
-+                        'index' => 'no'
-+                    ]
-+                ]
-+            ],
-+            [
-+                'attr_code',
-+                'text',
-+                null,
-+                false,
-+                null,
-+                true,
-+                'attr_code',
-+                '',
-+                'sort_attr_code',
-+                [
-+                    'attr_code' => [
-+                        'type' => 'text',
-+                        'fields' => [
-+                            'sort_attr_code' => [
-+                                'type' => 'string',
-+                                'index' => 'not_analyzed'
-+                            ]
-+                        ]
-+                    ],
-+                    'store_id' => [
-+                        'type' => 'string',
-+                        'index' => 'no'
-+                    ]
-+                ]
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php
-deleted file mode 100644
-index 8b7ac6abbb1..00000000000
---- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php
-+++ /dev/null
-@@ -1,298 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper;
--
--use Magento\Catalog\Api\Data\ProductAttributeInterface;
--use Magento\Elasticsearch\Model\Adapter\FieldType;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--
--class ProductFieldMapperTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper
--     */
--    protected $mapper;
--
--    /**
--     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $eavConfig;
--
--    /**
--     * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $coreRegistry;
--
--    /**
--     * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $customerSession;
--
--    /**
--     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $storeManager;
--
--    /**
--     * @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $eavAttributeResource;
--
--    /**
--     * @var FieldType|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $fieldType;
--
--    /**
--     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $store;
--
--    /**
--     * Set up test environment
--     *
--     * @return void
--     */
--    protected function setUp()
--    {
--        $this->eavConfig = $this->getMockBuilder(\Magento\Eav\Model\Config::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getEntityType', 'getAttribute', 'getEntityAttributeCodes'])
--            ->getMock();
--
--        $this->fieldType = $this->getMockBuilder(FieldType::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getFieldType'])
--            ->getMock();
--
--        $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getCustomerGroupId'])
--            ->getMock();
--
--        $this->storeManager = $this->storeManager = $this->getMockForAbstractClass(
--            \Magento\Store\Model\StoreManagerInterface::class,
--            [],
--            '',
--            false
--        );
--
--        $this->store = $this->getMockForAbstractClass(
--            \Magento\Store\Api\Data\StoreInterface::class,
--            [],
--            '',
--            false,
--            false,
--            true,
--            ['getWebsiteId', 'getRootCategoryId']
--        );
--
--        $this->coreRegistry = $this->createMock(\Magento\Framework\Registry::class);
--
--        $objectManager = new ObjectManagerHelper($this);
--
--        $this->eavAttributeResource = $this->createPartialMock(
--            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
--            [
--                '__wakeup',
--                'getBackendType',
--                'getFrontendInput'
--            ]
--        );
--
--        $this->mapper = $objectManager->getObject(
--            \Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper::class,
--            [
--                'eavConfig' => $this->eavConfig,
--                'storeManager' => $this->storeManager,
--                'fieldType' => $this->fieldType,
--                'customerSession' => $this->customerSession,
--                'coreRegistry' => $this->coreRegistry
--            ]
--        );
--    }
--
--    /**
--     * @dataProvider attributeCodeProvider
--     * @param string $attributeCode
--     * @param string $fieldName
--     * @param string $fieldType
--     * @param array $context
--     *
--     * @return void
--     */
--    public function testGetFieldName($attributeCode, $fieldName, $fieldType, $context = [])
--    {
--        $attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
--            ->setMethods(['getBackendType', 'getFrontendInput', 'getAttribute'])
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->customerSession->expects($this->any())
--            ->method('getCustomerGroupId')
--            ->willReturn('0');
--
--        $this->storeManager->expects($this->any())
--            ->method('getStore')
--            ->willReturn($this->store);
--        $this->store->expects($this->any())
--            ->method('getWebsiteId')
--            ->willReturn('1');
--        $this->store->expects($this->any())
--            ->method('getRootCategoryId')
--            ->willReturn('1');
--
--        $this->eavConfig->expects($this->any())->method('getAttribute')
--            ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode)
--            ->willReturn($attributeMock);
--
--        $attributeMock->expects($this->any())->method('getFrontendInput')
--            ->will($this->returnValue('select'));
--
--        $this->fieldType->expects($this->any())->method('getFieldType')
--            ->with($attributeMock)
--            ->willReturn($fieldType);
--
--        $this->assertEquals(
--            $fieldName,
--            $this->mapper->getFieldName($attributeCode, $context)
--        );
--    }
--
--    /**
--     * @return void
--     */
--    public function testGetFieldNameWithoutAttribute()
--    {
--        $this->eavConfig->expects($this->any())->method('getAttribute')
--            ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, 'attr1')
--            ->willReturn('');
--
--        $this->assertEquals(
--            'attr1',
--            $this->mapper->getFieldName('attr1', [])
--        );
--    }
--
--    /**
--     * @dataProvider attributeProvider
--     * @param string $attributeCode
--     * @param string $inputType
--     * @param array $searchAttributes
--     * @param array $expected
--     * @return void
--     */
--    public function testGetAllAttributesTypes($attributeCode, $inputType, $searchAttributes, $expected)
--    {
--        $attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->eavConfig->expects($this->any())->method('getEntityAttributeCodes')
--            ->with(ProductAttributeInterface::ENTITY_TYPE_CODE)
--            ->willReturn([$attributeCode]);
--
--        $this->eavConfig->expects($this->any())->method('getAttribute')
--            ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode)
--            ->willReturn($attributeMock);
--
--        $this->fieldType->expects($this->once())->method('getFieldType')->willReturn(FieldType::ES_DATA_TYPE_INT);
--
--        $attributeMock->expects($this->any())
--            ->method('getIsSearchable')
--            ->willReturn($searchAttributes['searchable']);
--        $attributeMock->expects($this->any())
--            ->method('getIsFilterable')
--            ->willReturn($searchAttributes['filterable']);
--        $attributeMock->expects($this->any())
--            ->method('getIsFilterableInSearch')
--            ->willReturn($searchAttributes['filterableInSearch']);
--        $attributeMock->expects($this->any())
--            ->method('getIsVisibleInAdvancedSearch')
--            ->willReturn($searchAttributes['advSearch']);
--
--        $attributeMock->expects($this->any())->method('getFrontendInput')
--            ->will($this->returnValue($inputType));
--
--        $this->assertEquals(
--            $expected,
--            $this->mapper->getAllAttributesTypes()
--        );
--    }
--
--    /**
--     * @return array
--     */
--    public function attributeCodeProvider()
--    {
--        return [
--            ['id', 'id', 'string'],
--            ['status', 'status', 'string'],
--            ['status', 'status_value', 'string', ['type'=>'default']],
--            ['price', 'price_0_1', 'string', ['type'=>'default']],
--            ['position', 'position_category_1', 'string', ['type'=>'default']],
--            ['price', 'price_2_3', 'string', ['type'=>'default', 'customerGroupId'=>'2', 'websiteId'=>'3']],
--            ['position', 'position_category_3', 'string', ['type'=>'default', 'categoryId'=>'3']],
--            ['color', 'color_value', 'string', ['type'=>'text']],
--            ['description', 'sort_description', 'string', ['type'=>'some']],
--            ['*', '_all', 'string', ['type'=>'text']],
--            ['description', 'description_value', 'string', ['type'=>'text']],
--        ];
--    }
--
--    /**
--     * @return array
--     */
--    public function attributeProvider()
--    {
--        return [
--            [
--                'category_ids',
--                'text',
--                ['searchable' => false, 'filterable' => false, 'filterableInSearch' => false, 'advSearch' => false],
--                ['category_ids' => ['type' => 'integer']]
--            ],
--            [
--                'attr_code',
--                'string',
--                ['searchable' => false, 'filterable' => false, 'filterableInSearch' => false, 'advSearch' => false],
--                ['attr_code' => ['type' => 'integer', 'index' => 'no']]
--            ],
--            [
--                'attr_code',
--                'string',
--                ['searchable' => '0', 'filterable' => '0', 'filterableInSearch' => '0', 'advSearch' => '0'],
--                ['attr_code' => ['type' => 'integer', 'index' => 'no']]
--            ],
--            [
--                'attr_code',
--                'string',
--                ['searchable' => true, 'filterable' => false, 'filterableInSearch' => false, 'advSearch' => false],
--                ['attr_code' => ['type' => 'integer']]
--            ],
--            [
--                'attr_code',
--                'string',
--                ['searchable' => '1', 'filterable' => '0', 'filterableInSearch' => '0', 'advSearch' => '0'],
--                ['attr_code' => ['type' => 'integer']]
--            ],
--            [
--                'attr_code',
--                'string',
--                ['searchable' => false, 'filterable' => false, 'filterableInSearch' => false, 'advSearch' => true],
--                ['attr_code' => ['type' => 'integer']]
--            ],
--            [
--                'attr_code',
--                'string',
--                ['searchable' => '0', 'filterable' => '0', 'filterableInSearch' => '1', 'advSearch' => '0'],
--                ['attr_code' => ['type' => 'integer']]
--            ],
--        ];
--    }
--}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Observer/CategoryProductIndexerTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Observer/CategoryProductIndexerTest.php
-new file mode 100644
-index 00000000000..adebee0d591
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/Observer/CategoryProductIndexerTest.php
-@@ -0,0 +1,136 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Test\Unit\Observer;
-+
-+use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
-+use Magento\Elasticsearch\Model\Config;
-+use Magento\Elasticsearch\Observer\CategoryProductIndexer;
-+use Magento\Framework\Event;
-+use Magento\Framework\Event\Observer;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+
-+/**
-+ * Class CategoryProductIndexerTest
-+ */
-+class CategoryProductIndexerTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var CategoryProductIndexer
-+     */
-+    private $observer;
-+
-+    /**
-+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $configMock;
-+
-+    /**
-+     * @var Processor|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $processorMock;
-+
-+    /**
-+     * @var Observer|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $observerMock;
-+
-+    /**
-+     * Set Up method
-+     *
-+     * @return void
-+     */
-+    protected function setUp(): void
-+    {
-+        $this->configMock = $this->createMock(Config::class);
-+        $this->processorMock = $this->createMock(Processor::class);
-+        $this->observerMock = $this->createMock(Observer::class);
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+        $this->observer = $objectManager->getObject(
-+            CategoryProductIndexer::class,
-+            [
-+                'config' => $this->configMock,
-+                'processor' => $this->processorMock,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test if a category has changed products
-+     *
-+     * @return void
-+     */
-+    public function testExecuteIfCategoryHasChangedProducts()
-+    {
-+        $this->getProductIdsWithEnabledElasticSearch();
-+        $this->processorMock->expects($this->once())->method('isIndexerScheduled')->willReturn(true);
-+        $this->processorMock->expects($this->once())->method('markIndexerAsInvalid');
-+        $this->observer->execute($this->observerMock);
-+    }
-+
-+    /**
-+     * Test if a category has changed products and not scheduled indexer
-+     *
-+     * @return void
-+     */
-+    public function testExecuteIfCategoryHasChangedProductsAndNotScheduledIndexer(): void
-+    {
-+        $this->getProductIdsWithEnabledElasticSearch();
-+        $this->processorMock->expects($this->once())->method('isIndexerScheduled')->willReturn(false);
-+        $this->processorMock->expects($this->never())->method('markIndexerAsInvalid');
-+        $this->observer->execute($this->observerMock);
-+    }
-+
-+    /**
-+     * Test if a category has none changed products
-+     *
-+     * @return void
-+     */
-+    public function testExecuteIfCategoryHasNoneChangedProducts(): void
-+    {
-+        /** @var Event|\PHPUnit_Framework_MockObject_MockObject $eventMock */
-+        $eventMock = $this->createPartialMock(Event::class, ['getProductIds']);
-+        $this->configMock->expects($this->once())->method('isElasticsearchEnabled')->willReturn(true);
-+
-+        $eventMock->expects($this->once())->method('getProductIds')->willReturn([]);
-+        $this->observerMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
-+
-+        $this->processorMock->expects($this->never())->method('isIndexerScheduled');
-+        $this->processorMock->expects($this->never())->method('markIndexerAsInvalid');
-+
-+        $this->observer->execute($this->observerMock);
-+    }
-+
-+    /**
-+     * Test if ElasticSearch is disabled
-+     *
-+     * @return void
-+     */
-+    public function testExecuteIfElasticSearchIsDisabled(): void
-+    {
-+        /** @var Event|\PHPUnit_Framework_MockObject_MockObject $eventMock */
-+        $eventMock = $this->createPartialMock(Event::class, ['getProductIds']);
-+        $this->configMock->expects($this->once())->method('isElasticsearchEnabled')->willReturn(false);
-+        $eventMock->expects($this->never())->method('getProductIds')->willReturn([]);
-+        $this->observer->execute($this->observerMock);
-+    }
-+
-+    /**
-+     * Get product ids with enabled ElasticSearch
-+     *
-+     * @return void
-+     */
-+    private function getProductIdsWithEnabledElasticSearch(): void
-+    {
-+        /** @var Event|\PHPUnit_Framework_MockObject_MockObject $eventMock */
-+        $eventMock = $this->createPartialMock(Event::class, ['getProductIds']);
-+        $this->configMock->expects($this->once())->method('isElasticsearchEnabled')->willReturn(true);
-+        $eventMock->expects($this->once())->method('getProductIds')->willReturn([1]);
-+        $this->observerMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php
-index 41be237efe5..6258a4a20d6 100644
---- a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php
-@@ -320,6 +320,17 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
- 
-         $this->clientMock->expects($this->once())
-             ->method('query')
-+            ->with($this->callback(function ($query) {
-+                $histogramParams = $query['body']['aggregations']['prices']['histogram'];
-+                // Assert the interval is queried as a float. See MAGETWO-95471
-+                if ($histogramParams['interval'] !== 10.0) {
-+                    return false;
-+                }
-+                if (!isset($histogramParams['min_doc_count']) || $histogramParams['min_doc_count'] !== 1) {
-+                    return false;
-+                }
-+                return true;
-+            }))
-             ->willReturn([
-                 'aggregations' => [
-                     'prices' => [
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
-index 8114feb09d3..d0ffc6debcd 100644
---- a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
-@@ -5,14 +5,29 @@
-  */
- namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\Builder;
- 
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface as TypeResolver;
- use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
- use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder;
-+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
-+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerPool;
- use Magento\Framework\Search\Request\Query\Match as MatchRequestQuery;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
--use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+use PHPUnit\Framework\MockObject\MockObject as MockObject;
- 
- class MatchTest extends \PHPUnit\Framework\TestCase
- {
-+    /**
-+     * @var AttributeProvider|MockObject
-+     */
-+    private $attributeProvider;
-+
-+    /**
-+     * @var TypeResolver|MockObject
-+     */
-+    private $fieldTypeResolver;
-+
-     /**
-      * @var MatchQueryBuilder
-      */
-@@ -23,46 +38,63 @@ class MatchTest extends \PHPUnit\Framework\TestCase
-      */
-     protected function setUp()
-     {
-+        $this->attributeProvider = $this->createMock(AttributeProvider::class);
-+        $this->fieldTypeResolver = $this->createMock(TypeResolver::class);
-+
-+        $valueTransformerPoolMock = $this->createMock(ValueTransformerPool::class);
-+        $valueTransformerMock = $this->createMock(ValueTransformerInterface::class);
-+        $valueTransformerPoolMock->method('get')
-+            ->willReturn($valueTransformerMock);
-+        $valueTransformerMock->method('transform')
-+            ->willReturnArgument(0);
-+
-         $this->matchQueryBuilder = (new ObjectManager($this))->getObject(
-             MatchQueryBuilder::class,
-             [
-                 'fieldMapper' => $this->getFieldMapper(),
-                 'preprocessorContainer' => [],
-+                'attributeProvider' => $this->attributeProvider,
-+                'fieldTypeResolver' => $this->fieldTypeResolver,
-+                'valueTransformerPool' => $valueTransformerPoolMock,
-             ]
-         );
-     }
- 
-     /**
-      * Tests that method constructs a correct select query.
--     * @see MatchQueryBuilder::build
--     *
--     * @dataProvider queryValuesInvariantsProvider
-      *
--     * @param string $rawQueryValue
--     * @param string $errorMessage
-+     * @see MatchQueryBuilder::build
-      */
--    public function testBuild($rawQueryValue, $errorMessage)
-+    public function testBuild()
-     {
--        $this->assertSelectQuery(
--            $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'not'),
--            $errorMessage
--        );
--    }
-+        $attributeAdapter = $this->createMock(AttributeAdapter::class);
-+        $this->attributeProvider->expects($this->once())
-+            ->method('getByAttributeCode')
-+            ->with('some_field')
-+            ->willReturn($attributeAdapter);
-+        $this->fieldTypeResolver->expects($this->once())
-+            ->method('getFieldType')
-+            ->with($attributeAdapter)
-+            ->willReturn('text');
-+
-+        $rawQueryValue = 'query_value';
-+        $selectQuery = $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'not');
- 
--    /**
--     * @link https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html Fulltext-boolean search docs.
--     *
--     * @return array
--     */
--    public function queryValuesInvariantsProvider()
--    {
--        return [
--            ['query_value', 'Select query field must match simple raw query value.'],
--            ['query_value+', 'Specifying a trailing plus sign causes InnoDB to report a syntax error.'],
--            ['query_value-', 'Specifying a trailing minus sign causes InnoDB to report a syntax error.'],
--            ['query_@value', 'The @ symbol is reserved for use by the @distance proximity search operator.'],
--            ['query_value+@', 'The @ symbol is reserved for use by the @distance proximity search operator.'],
-+        $expectedSelectQuery = [
-+            'bool' => [
-+                'must_not' => [
-+                    [
-+                        'match' => [
-+                            'some_field' => [
-+                                'query' => $rawQueryValue,
-+                                'boost' => 43,
-+                            ],
-+                        ],
-+                    ],
-+                ],
-+            ],
-         ];
-+        $this->assertEquals($expectedSelectQuery, $selectQuery);
-     }
- 
-     /**
-@@ -76,6 +108,16 @@ class MatchTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testBuildMatchQuery($rawQueryValue, $queryValue, $match)
-     {
-+        $attributeAdapter = $this->createMock(AttributeAdapter::class);
-+        $this->attributeProvider->expects($this->once())
-+            ->method('getByAttributeCode')
-+            ->with('some_field')
-+            ->willReturn($attributeAdapter);
-+        $this->fieldTypeResolver->expects($this->once())
-+            ->method('getFieldType')
-+            ->with($attributeAdapter)
-+            ->willReturn('text');
-+
-         $query = $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'should');
- 
-         $expectedSelectQuery = [
-@@ -111,30 +153,6 @@ class MatchTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
--    /**
--     * @param array $selectQuery
--     * @param string $errorMessage
--     */
--    private function assertSelectQuery($selectQuery, $errorMessage)
--    {
--        $expectedSelectQuery = [
--            'bool' => [
--                'must_not' => [
--                    [
--                        'match' => [
--                            'some_field' => [
--                                'query' => 'query_value',
--                                'boost' => 43,
--                            ],
--                        ],
--                    ],
--                ],
--            ],
--        ];
--
--        $this->assertEquals($expectedSelectQuery, $selectQuery, $errorMessage);
--    }
--
-     /**
-      * Gets fieldMapper mock object.
-      *
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/SortTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/SortTest.php
-new file mode 100644
-index 00000000000..efd90736941
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/SortTest.php
-@@ -0,0 +1,237 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\Builder;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
-+    as FieldNameResolver;
-+use Magento\Framework\Search\RequestInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+use Magento\Elasticsearch\SearchAdapter\Query\Builder\Sort;
-+
-+/**
-+ * Class SortTest
-+ */
-+class SortTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var AttributeProvider
-+     */
-+    private $attributeAdapterProvider;
-+
-+    /**
-+     * @var FieldNameResolver
-+     */
-+    private $fieldNameResolver;
-+
-+    /**
-+     * @var Sort
-+     */
-+    private $sortBuilder;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->attributeAdapterProvider = $this->getMockBuilder(AttributeProvider::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getByAttributeCode'])
-+            ->getMock();
-+        $this->fieldNameResolver = $this->getMockBuilder(FieldNameResolver::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getFieldName'])
-+            ->getMock();
-+
-+        $this->sortBuilder = (new ObjectManager($this))->getObject(
-+            Sort::class,
-+            [
-+                'attributeAdapterProvider' => $this->attributeAdapterProvider,
-+                'fieldNameResolver' => $this->fieldNameResolver,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-+     * @dataProvider getSortProvider
-+     * @param array $sortItems
-+     * @param $isSortable
-+     * @param $isFloatType
-+     * @param $isIntegerType
-+     * @param $fieldName
-+     * @param array $expected
-+     */
-+    public function testGetSort(
-+        array $sortItems,
-+        $isSortable,
-+        $isFloatType,
-+        $isIntegerType,
-+        $fieldName,
-+        array $expected
-+    ) {
-+        /** @var MockObject|RequestInterface $request */
-+        $request = $this->getMockBuilder(RequestInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getSort'])
-+            ->getMockForAbstractClass();
-+        $request->expects($this->any())
-+            ->method('getSort')
-+            ->willReturn($sortItems);
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['isSortable', 'isFloatType', 'isIntegerType'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('isSortable')
-+            ->willReturn($isSortable);
-+        $attributeMock->expects($this->any())
-+            ->method('isFloatType')
-+            ->willReturn($isFloatType);
-+        $attributeMock->expects($this->any())
-+            ->method('isIntegerType')
-+            ->willReturn($isIntegerType);
-+        $this->attributeAdapterProvider->expects($this->any())
-+            ->method('getByAttributeCode')
-+            ->with($this->anything())
-+            ->willReturn($attributeMock);
-+        $this->fieldNameResolver->expects($this->any())
-+            ->method('getFieldName')
-+            ->with($this->anything())
-+            ->will($this->returnCallback(
-+                function ($attribute, $context) use ($fieldName) {
-+                    if (empty($context)) {
-+                        return $fieldName;
-+                    } elseif ($context['type'] === 'sort') {
-+                        return 'sort_' . $fieldName;
-+                    }
-+                }
-+            ));
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->sortBuilder->getSort($request)
-+        );
-+    }
-+
-+    /**
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     * @return array
-+     */
-+    public function getSortProvider()
-+    {
-+        return [
-+            [
-+                [
-+                    [
-+                        'field' => 'entity_id',
-+                        'direction' => 'DESC'
-+                    ]
-+                ],
-+                null,
-+                null,
-+                null,
-+                null,
-+                []
-+            ],
-+            [
-+                [
-+                    [
-+                        'field' => 'entity_id',
-+                        'direction' => 'DESC'
-+                    ],
-+                    [
-+                        'field' => 'price',
-+                        'direction' => 'DESC'
-+                    ],
-+                ],
-+                false,
-+                false,
-+                false,
-+                'price',
-+                [
-+                    [
-+                        'price' => [
-+                            'order' => 'desc'
-+                        ]
-+                    ]
-+                ]
-+            ],
-+            [
-+                [
-+                    [
-+                        'field' => 'entity_id',
-+                        'direction' => 'DESC'
-+                    ],
-+                    [
-+                        'field' => 'price',
-+                        'direction' => 'DESC'
-+                    ],
-+                ],
-+                true,
-+                true,
-+                true,
-+                'price',
-+                [
-+                    [
-+                        'price' => [
-+                            'order' => 'desc'
-+                        ]
-+                    ]
-+                ]
-+            ],
-+            [
-+                [
-+                    [
-+                        'field' => 'entity_id',
-+                        'direction' => 'DESC'
-+                    ],
-+                    [
-+                        'field' => 'name',
-+                        'direction' => 'DESC'
-+                    ],
-+                ],
-+                true,
-+                false,
-+                false,
-+                'name',
-+                [
-+                    [
-+                        'name.sort_name' => [
-+                            'order' => 'desc'
-+                        ]
-+                    ]
-+                ]
-+            ],
-+            [
-+                [
-+                    [
-+                        'field' => 'entity_id',
-+                        'direction' => 'DESC'
-+                    ],
-+                    [
-+                        'field' => 'not_eav_attribute',
-+                        'direction' => 'DESC'
-+                    ],
-+                ],
-+                false,
-+                false,
-+                false,
-+                'not_eav_attribute',
-+                [
-+                    [
-+                        'not_eav_attribute' => [
-+                            'order' => 'desc'
-+                        ]
-+                    ]
-+                ]
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php
-index 9ea241b2fbf..d89e4204572 100644
---- a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php
-+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php
-@@ -79,7 +79,7 @@ class ResponseFactoryTest extends \PHPUnit\Framework\TestCase
-                 'itemTwo' => 45,
-             ]
-         ];
--        $rawResponse = ['documents' => $documents, 'aggregations' => $aggregations];
-+        $rawResponse = ['documents' => $documents, 'aggregations' => $aggregations, 'total' => 2];
- 
-         $exceptedResponse = [
-             'documents' => [
-@@ -102,6 +102,7 @@ class ResponseFactoryTest extends \PHPUnit\Framework\TestCase
-                     'itemTwo' => 45
-                 ],
-             ],
-+            'total' => 2,
-         ];
- 
-         $this->documentFactory->expects($this->at(0))->method('create')
-@@ -118,7 +119,11 @@ class ResponseFactoryTest extends \PHPUnit\Framework\TestCase
-         $this->objectManager->expects($this->once())->method('create')
-             ->with(
-                 $this->equalTo(\Magento\Framework\Search\Response\QueryResponse::class),
--                $this->equalTo(['documents' => ['document1', 'document2'], 'aggregations' => 'aggregationsData'])
-+                $this->equalTo([
-+                    'documents' => ['document1', 'document2'],
-+                    'aggregations' => 'aggregationsData',
-+                    'total' => 2
-+                ])
-             )
-             ->will($this->returnValue('QueryResponseObject'));
- 
-diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
-index a821506f5ef..c6ac38c1e40 100644
---- a/app/code/Magento/Elasticsearch/composer.json
-+++ b/app/code/Magento/Elasticsearch/composer.json
-@@ -12,7 +12,7 @@
-         "magento/module-store": "*",
-         "magento/module-catalog-inventory": "*",
-         "magento/framework": "*",
--        "elasticsearch/elasticsearch": "~2.0|~5.1"
-+        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
-     },
-     "suggest": {
-         "magento/module-config": "*"
-diff --git a/app/code/Magento/Elasticsearch/etc/adminhtml/events.xml b/app/code/Magento/Elasticsearch/etc/adminhtml/events.xml
-new file mode 100644
-index 00000000000..a9b60aee1e6
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch/etc/adminhtml/events.xml
-@@ -0,0 +1,12 @@
-+<?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="catalog_category_change_products">
-+        <observer name="category_product_elasticsearch_indexer" instance="Magento\Elasticsearch\Observer\CategoryProductIndexer"/>
-+    </event>
-+</config>
-diff --git a/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml b/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml
-index b9fddc46f78..dd42b408ff7 100644
---- a/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml
-@@ -92,15 +92,15 @@
-                 <field id="elasticsearch5_username" translate="label" type="text" sortOrder="65" showInDefault="1" showInWebsite="0" showInStore="0">
-                     <label>Elasticsearch HTTP Username</label>
-                     <depends>
--                        <field id="elasticsearch_enable_auth">1</field>
-                         <field id="engine">elasticsearch5</field>
-+                        <field id="elasticsearch5_enable_auth">1</field>
-                     </depends>
-                 </field>
-                 <field id="elasticsearch5_password" translate="label" type="text" sortOrder="66" showInDefault="1" showInWebsite="0" showInStore="0">
-                     <label>Elasticsearch HTTP Password</label>
-                     <depends>
--                        <field id="elasticsearch_enable_auth">1</field>
-                         <field id="engine">elasticsearch5</field>
-+                        <field id="elasticsearch5_enable_auth">1</field>
-                     </depends>
-                 </field>
-                 <field id="elasticsearch5_server_timeout" translate="label" type="text" sortOrder="67" showInDefault="1" showInWebsite="0" showInStore="0">
-diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
-index 0cfaba845fd..9732ae82264 100644
---- a/app/code/Magento/Elasticsearch/etc/di.xml
-+++ b/app/code/Magento/Elasticsearch/etc/di.xml
-@@ -7,6 +7,130 @@
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapperInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver" />
-+    <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver" />
-+    <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver" />
-+    <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ResolverInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\IndexResolver" />
-+    <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter" />
-+    <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter" />
-+    <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\CompositeFieldProvider" />
-+    <type name="Magento\Elasticsearch\Model\Config">
-+        <arguments>
-+            <argument name="engineList" xsi:type="array">
-+                <item name="elasticsearch" xsi:type="string">elasticsearch</item>
-+                <item name="elasticsearch5" xsi:type="string">elasticsearch5</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <virtualType name="Magento\Elasticsearch\Model\Layer\Search\Context" type="Magento\Catalog\Model\Layer\Search\Context">
-+        <arguments>
-+            <argument name="collectionProvider" xsi:type="object">elasticsearchLayerSearchItemCollectionProvider</argument>
-+            <argument name="stateKey" xsi:type="object">Magento\CatalogSearch\Model\Layer\Search\StateKey</argument>
-+        </arguments>
-+    </virtualType>
-+    <type name="Magento\Catalog\Model\Layer\Search">
-+        <arguments>
-+            <argument name="context" xsi:type="object">Magento\Elasticsearch\Model\Layer\Search\Context</argument>
-+        </arguments>
-+    </type>
-+    <virtualType name="Magento\Elasticsearch\Model\Layer\Category\Context" type="Magento\Catalog\Model\Layer\Category\Context">
-+        <arguments>
-+            <argument name="collectionProvider" xsi:type="object">elasticsearchLayerCategoryItemCollectionProvider</argument>
-+        </arguments>
-+    </virtualType>
-+    <type name="Magento\Catalog\Model\Layer\Category">
-+        <arguments>
-+            <argument name="context" xsi:type="object">Magento\Elasticsearch\Model\Layer\Category\Context</argument>
-+        </arguments>
-+    </type>
-+    <virtualType name="elasticsearchFulltextSearchCollection" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection">
-+        <arguments>
-+            <argument name="searchRequestName" xsi:type="string">quick_search_container</argument>
-+            <argument name="searchCriteriaResolverFactory" xsi:type="object">elasticsearchSearchCriteriaResolverFactory</argument>
-+            <argument name="searchResultApplierFactory" xsi:type="object">elasticsearchSearchResultApplier\Factory</argument>
-+            <argument name="totalRecordsResolverFactory" xsi:type="object">elasticsearchTotalRecordsResolver\Factory</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearchFulltextSearchCollectionFactory" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\SearchCollectionFactory">
-+        <arguments>
-+            <argument name="instanceName" xsi:type="string">elasticsearchFulltextSearchCollection</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearchLayerSearchItemCollectionProvider" type="Magento\Elasticsearch\Model\Layer\Search\ItemCollectionProvider">
-+        <arguments>
-+            <argument name="factories" xsi:type="array">
-+                <item name="mysql" xsi:type="object">Magento\CatalogSearch\Model\ResourceModel\Fulltext\SearchCollectionFactory</item>
-+                <item name="elasticsearch" xsi:type="object">elasticsearchFulltextSearchCollectionFactory</item>
-+                <item name="elasticsearch5" xsi:type="object">elasticsearchFulltextSearchCollectionFactory</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearchCategoryCollection" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection">
-+        <arguments>
-+            <argument name="searchRequestName" xsi:type="string">catalog_view_container</argument>
-+            <argument name="searchCriteriaResolverFactory" xsi:type="object">elasticsearchSearchCriteriaResolverFactory</argument>
-+            <argument name="searchResultApplierFactory" xsi:type="object">elasticsearchSearchResultApplier\Factory</argument>
-+            <argument name="totalRecordsResolverFactory" xsi:type="object">elasticsearchTotalRecordsResolver\Factory</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearchCategoryCollectionFactory" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\SearchCollectionFactory">
-+        <arguments>
-+            <argument name="instanceName" xsi:type="string">elasticsearchCategoryCollection</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearchLayerCategoryItemCollectionProvider" type="Magento\Elasticsearch\Model\Layer\Category\ItemCollectionProvider">
-+        <arguments>
-+            <argument name="factories" xsi:type="array">
-+                <item name="mysql" xsi:type="object">Magento\CatalogSearch\Model\ResourceModel\Fulltext\CollectionFactory</item>
-+                <item name="elasticsearch" xsi:type="object">elasticsearchCategoryCollectionFactory</item>
-+                <item name="elasticsearch5" xsi:type="object">elasticsearchCategoryCollectionFactory</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearchAdvancedCollection" type="Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection">
-+        <arguments>
-+            <argument name="searchRequestName" xsi:type="string">advanced_search_container</argument>
-+            <argument name="searchCriteriaResolverFactory" xsi:type="object">elasticsearchSearchCriteriaResolverFactory</argument>
-+            <argument name="searchResultApplierFactory" xsi:type="object">elasticsearchSearchResultApplier\Factory</argument>
-+            <argument name="totalRecordsResolverFactory" xsi:type="object">elasticsearchTotalRecordsResolver\Factory</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearchAdvancedCollectionFactory" type="Magento\CatalogSearch\Model\ResourceModel\Advanced\CollectionFactory">
-+        <arguments>
-+            <argument name="instanceName" xsi:type="string">elasticsearchAdvancedCollection</argument>
-+        </arguments>
-+    </virtualType>
-+    <type name="Magento\CatalogSearch\Model\Search\ItemCollectionProvider">
-+        <arguments>
-+            <argument name="factories" xsi:type="array">
-+                <item name="elasticsearch" xsi:type="object">elasticsearchAdvancedCollectionFactory</item>
-+                <item name="elasticsearch5" xsi:type="object">elasticsearchAdvancedCollectionFactory</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategyProvider">
-+        <arguments>
-+            <argument name="strategies" xsi:type="array">
-+                <item name="elasticsearch" xsi:type="object">Magento\Elasticsearch\Model\Advanced\ProductCollectionPrepareStrategy</item>
-+                <item name="elasticsearch5" xsi:type="object">Magento\Elasticsearch\Model\Advanced\ProductCollectionPrepareStrategy</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <virtualType name="elasticsearchSearchCriteriaResolverFactory" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory">
-+        <arguments>
-+            <argument name="instanceName" xsi:type="string">Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolver</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearchSearchResultApplier\Factory" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory">
-+        <arguments>
-+            <argument name="instanceName" xsi:type="string">Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplier</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearchTotalRecordsResolver\Factory" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory">
-+        <arguments>
-+            <argument name="instanceName" xsi:type="string">Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolver</argument>
-+        </arguments>
-+    </virtualType>
-     <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver">
-         <arguments>
-             <argument name="fieldMappers" xsi:type="array">
-@@ -15,7 +139,7 @@
-         </arguments>
-     </type>
-     <preference for="Magento\Elasticsearch\Model\Adapter\DataMapperInterface" type="Magento\Elasticsearch\Model\Adapter\DataMapper\DataMapperResolver" />
--    <virtualType name="AdditionalFieldsForElasticsearchDataMapper" type="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProvider">
-+    <virtualType name="additionalFieldsProviderForElasticsearch" type="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProvider">
-         <arguments>
-             <argument name="fieldsProviders" xsi:type="array">
-                 <item name="categories" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper\CategoryFieldsProviderProxy</item>
-@@ -25,7 +149,7 @@
-     </virtualType>
-     <type name="Magento\Elasticsearch\Model\Adapter\BatchDataMapper\ProductDataMapper">
-         <arguments>
--            <argument name="additionalFieldsProvider" xsi:type="object">AdditionalFieldsForElasticsearchDataMapper</argument>
-+            <argument name="additionalFieldsProvider" xsi:type="object">additionalFieldsProviderForElasticsearch</argument>
-         </arguments>
-     </type>
-     <preference for="Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface" type="Magento\Elasticsearch\Model\Adapter\BatchDataMapper\DataMapperResolver" />
-@@ -62,7 +186,7 @@
-             </argument>
-         </arguments>
-     </type>
--    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapperProxy">
-+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapperProxy">
-         <arguments>
-             <argument name="productFieldMappers" xsi:type="array">
-                 <item name="elasticsearch" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper</item>
-@@ -271,4 +395,167 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper\CategoryFieldsProvider">
-+        <arguments>
-+            <argument name="fieldNameResolver" xsi:type="object">elasticsearch5FieldNameResolver</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper\ProductDataMapper">
-+        <arguments>
-+            <argument name="fieldNameResolver" xsi:type="object">elasticsearch5FieldNameResolver</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
-+        <arguments>
-+            <argument name="items" xsi:type="array">
-+                <item name="notEav" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\NotEavAttribute</item>
-+                <item name="special" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\SpecialAttribute</item>
-+                <item name="price" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Price</item>
-+                <item name="categoryName" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CategoryName</item>
-+                <item name="position" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Position</item>
-+                <item name="default" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <virtualType name="elasticsearch5FieldNameResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
-+        <arguments>
-+            <argument name="items" xsi:type="array">
-+                <item name="notEav" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\NotEavAttribute</item>
-+                <item name="special" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\SpecialAttribute</item>
-+                <item name="price" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Price</item>
-+                <item name="categoryName" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CategoryName</item>
-+                <item name="position" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Position</item>
-+                <item name="default" xsi:type="object">elasticsearch5FieldNameDefaultResolver</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearch5FieldNameDefaultResolver" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver">
-+        <arguments>
-+            <argument name="fieldTypeResolver" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver</argument>
-+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
-+        </arguments>
-+    </virtualType>
-+    <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver">
-+        <arguments>
-+            <argument name="items" xsi:type="array">
-+                <item name="integer" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType</item>
-+                <item name="datetime" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DateTimeType</item>
-+                <item name="float" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\FloatType</item>
-+                <item name="default" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DefaultResolver</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver">
-+        <arguments>
-+            <argument name="items" xsi:type="array">
-+                <item name="keyword" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\KeywordType</item>
-+                <item name="integer" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType</item>
-+                <item name="datetime" xsi:type="object">elasticsearch5FieldTypeDateTimeResolver</item>
-+                <item name="float" xsi:type="object">elasticsearch5FieldTypeFloatResolver</item>
-+                <item name="default" xsi:type="object">elasticsearch5FieldTypeDefaultResolver</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\CompositeFieldProvider">
-+        <arguments>
-+            <argument name="providers" xsi:type="array">
-+                <item name="static" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField</item>
-+                <item name="dynamic" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\DynamicField</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <virtualType name="elasticsearch5FieldProvider" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\CompositeFieldProvider">
-+        <arguments>
-+            <argument name="providers" xsi:type="array">
-+                <item name="static" xsi:type="object">elasticsearch5StaticFieldProvider</item>
-+                <item name="dynamic" xsi:type="object">elasticsearch5DynamicFieldProvider</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearch5StaticFieldProvider" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField">
-+        <arguments>
-+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
-+            <argument name="indexTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter</argument>
-+            <argument name="fieldIndexResolver" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\IndexResolver</argument>
-+            <argument name="fieldTypeResolver" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver</argument>
-+            <argument name="fieldNameResolver" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearch5DynamicFieldProvider" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\DynamicField">
-+        <arguments>
-+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
-+            <argument name="indexTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter</argument>
-+        </arguments>
-+    </virtualType>
-+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\KeywordType">
-+        <arguments>
-+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType">
-+        <arguments>
-+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
-+        </arguments>
-+    </type>
-+    <virtualType name="elasticsearch5FieldTypeDateTimeResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DateTimeType">
-+        <arguments>
-+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearch5FieldTypeFloatResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\FloatType">
-+        <arguments>
-+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="elasticsearch5FieldTypeDefaultResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DefaultResolver">
-+        <arguments>
-+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
-+        </arguments>
-+    </virtualType>
-+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper">
-+        <arguments>
-+            <argument name="fieldProvider" xsi:type="object">elasticsearch5FieldProvider</argument>
-+            <argument name="fieldNameResolver" xsi:type="object">elasticsearch5FieldNameResolver</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper">
-+        <arguments>
-+            <argument name="attributeAdapterProvider" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider</argument>
-+            <argument name="fieldProvider" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface</argument>
-+            <argument name="fieldNameResolver" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\IndexResolver">
-+        <arguments>
-+            <argument name="converter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter</argument>
-+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
-+            <argument name="fieldTypeResolver" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Search\Model\Search\PageSizeProvider">
-+        <arguments>
-+            <argument name="pageSizeBySearchEngine" xsi:type="array">
-+                <item name="elasticsearch" xsi:type="number">10000</item>
-+                <item name="elasticsearch5" xsi:type="number">10000</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerPool">
-+        <arguments>
-+            <argument name="valueTransformers" xsi:type="array">
-+                <item name="default" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer</item>
-+                <item name="date" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\DateTransformer</item>
-+                <item name="float" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\FloatTransformer</item>
-+                <item name="integer" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\IntegerTransformer</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer">
-+        <arguments>
-+            <argument name="preprocessors" xsi:type="array">
-+                <item name="stopwordsPreprocessor" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords</item>
-+                <item name="synonymsPreprocessor" xsi:type="object">Magento\Search\Adapter\Query\Preprocessor\Synonyms</item>
-+            </argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Elasticsearch/etc/esconfig.xml b/app/code/Magento/Elasticsearch/etc/esconfig.xml
-index 0a87b58fd3a..e540251a3c7 100644
---- a/app/code/Magento/Elasticsearch/etc/esconfig.xml
-+++ b/app/code/Magento/Elasticsearch/etc/esconfig.xml
-@@ -16,7 +16,6 @@
-         <fr_FR>french</fr_FR>
-         <nl_NL>dutch</nl_NL>
-         <pt_BR>portuguese</pt_BR>
--        <zh_Hans_CN>cjk</zh_Hans_CN>
-     </stemmer>
-     <stopwords_file>
-         <default>stopwords.csv</default>
-@@ -26,6 +25,5 @@
-         <fr_FR>stopwords_fr_FR.csv</fr_FR>
-         <nl_NL>stopwords_nl_NL.csv</nl_NL>
-         <pt_BR>stopwords_pt_BR.csv</pt_BR>
--        <zh_Hans_CN>stopwords_zh_Hans_CN.csv</zh_Hans_CN>
-     </stopwords_file>
- </config>
-diff --git a/app/code/Magento/Elasticsearch/etc/indexer.xml b/app/code/Magento/Elasticsearch/etc/indexer.xml
-index 245829396a6..f22eb8f0bd3 100644
---- a/app/code/Magento/Elasticsearch/etc/indexer.xml
-+++ b/app/code/Magento/Elasticsearch/etc/indexer.xml
-@@ -8,7 +8,9 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Indexer/etc/indexer.xsd">
-     <indexer id="catalogsearch_fulltext">
-         <dependencies>
-+            <indexer id="catalog_category_product" />
-             <indexer id="cataloginventory_stock" />
-+            <indexer id="catalog_product_price" />
-         </dependencies>
-     </indexer>
- </config>
-diff --git a/app/code/Magento/Elasticsearch/etc/search_engine.xml b/app/code/Magento/Elasticsearch/etc/search_engine.xml
-index 34b6432b15c..51af3038b9c 100644
---- a/app/code/Magento/Elasticsearch/etc/search_engine.xml
-+++ b/app/code/Magento/Elasticsearch/etc/search_engine.xml
-@@ -9,4 +9,7 @@
-     <engine name="elasticsearch">
-         <feature name="synonyms" support="true" />
-     </engine>
-+    <engine name="elasticsearch5">
-+        <feature name="synonyms" support="true" />
-+    </engine>
- </engines>
-diff --git a/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_zh_Hans_CN.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_zh_Hans_CN.csv
-deleted file mode 100644
-index 0b3ef8f89fb..00000000000
---- a/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_zh_Hans_CN.csv
-+++ /dev/null
-@@ -1,125 +0,0 @@
--的
--一
--不
--在
--人
--有
--是
--为
--以
--于
--上
--他
--而
--后
--之
--来
--及
--了
--因
--下
--可
--到
--由
--这
--与
--也
--此
--但
--并
--个
--其
--已
--无
--小
--我
--们
--起
--最
--再
--今
--去
--好
--只
--又
--或
--很
--亦
--某
--把
--那
--你
--乃
--它
--吧
--被
--比
--别
--趁
--当
--从
--到
--得
--打
--凡
--儿
--尔
--该
--各
--给
--跟
--和
--何
--还
--即
--几
--既
--看
--据
--距
--靠
--啦
--了
--另
--么
--每
--们
--嘛
--拿
--哪
--那
--您
--凭
--且
--却
--让
--仍
--啥
--如
--若
--使
--谁
--虽
--随
--同
--所
--她
--哇
--嗡
--往
--哪
--些
--向
--沿
--哟
--用
--于
--咱
--则
--怎
--曾
--至
--致
--着
--诸
--自
-\ No newline at end of file
-diff --git a/app/code/Magento/Elasticsearch6/Block/Adminhtml/System/Config/TestConnection.php b/app/code/Magento/Elasticsearch6/Block/Adminhtml/System/Config/TestConnection.php
-new file mode 100644
-index 00000000000..1b17db1a00f
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/Block/Adminhtml/System/Config/TestConnection.php
-@@ -0,0 +1,31 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Elasticsearch6\Block\Adminhtml\System\Config;
-+
-+/**
-+ * Elasticsearch 6.x test connection block
-+ */
-+class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _getFieldMapping()
-+    {
-+        $fields = [
-+            'engine' => 'catalog_search_engine',
-+            'hostname' => 'catalog_search_elasticsearch6_server_hostname',
-+            'port' => 'catalog_search_elasticsearch6_server_port',
-+            'index' => 'catalog_search_elasticsearch6_index_prefix',
-+            'enableAuth' => 'catalog_search_elasticsearch6_enable_auth',
-+            'username' => 'catalog_search_elasticsearch6_username',
-+            'password' => 'catalog_search_elasticsearch6_password',
-+            'timeout' => 'catalog_search_elasticsearch6_server_timeout',
-+        ];
-+
-+        return array_merge(parent::_getFieldMapping(), $fields);
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch6/LICENSE.txt b/app/code/Magento/Elasticsearch6/LICENSE.txt
-new file mode 100644
-index 00000000000..49525fd99da
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/LICENSE.txt
-@@ -0,0 +1,48 @@
-+
-+Open Software License ("OSL") v. 3.0
-+
-+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-+
-+Licensed under the Open Software License version 3.0
-+
-+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-+
-+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-+
-+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-+
-+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
-+
-+         4. to perform the Original Work publicly; and
-+
-+         5. to display the Original Work publicly. 
-+
-+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-+
-+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-+
-+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-+
-+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-+
-+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-+
-+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-+
-+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-+
-+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-+
-+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-+
-+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-+
-+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-+
-+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-+
-+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-+
-+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
-\ No newline at end of file
-diff --git a/app/code/Magento/Elasticsearch6/LICENSE_AFL.txt b/app/code/Magento/Elasticsearch6/LICENSE_AFL.txt
-new file mode 100644
-index 00000000000..f39d641b18a
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/LICENSE_AFL.txt
-@@ -0,0 +1,48 @@
-+
-+Academic Free License ("AFL") v. 3.0
-+
-+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-+
-+Licensed under the Academic Free License version 3.0
-+
-+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-+
-+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-+
-+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-+
-+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
-+
-+         4. to perform the Original Work publicly; and
-+
-+         5. to display the Original Work publicly.
-+
-+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-+
-+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-+
-+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-+
-+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-+
-+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-+
-+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-+
-+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-+
-+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-+
-+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-+
-+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-+
-+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-+
-+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-+
-+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-+
-+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
-diff --git a/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php b/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
-new file mode 100644
-index 00000000000..7532927f1dc
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
-@@ -0,0 +1,35 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch6\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver as Base;
-+
-+/**
-+ * Default name resolver.
-+ */
-+class DefaultResolver extends Base
-+{
-+    /**
-+     * Get field name.
-+     *
-+     * @param AttributeAdapter $attribute
-+     * @param array $context
-+     * @return string
-+     */
-+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
-+    {
-+        $fieldName = parent::getFieldName($attribute, $context);
-+
-+        if ($fieldName === '_all') {
-+            $fieldName = '_search';
-+        }
-+
-+        return $fieldName;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
-new file mode 100644
-index 00000000000..af39b24acda
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
-@@ -0,0 +1,332 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Elasticsearch6\Model\Client;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\AdvancedSearch\Model\Client\ClientInterface;
-+
-+/**
-+ * Elasticsearch client
-+ */
-+class Elasticsearch implements ClientInterface
-+{
-+    /**
-+     * Elasticsearch Client instances
-+     *
-+     * @var \Elasticsearch\Client[]
-+     */
-+    private $client;
-+
-+    /**
-+     * @var array
-+     */
-+    private $clientOptions;
-+
-+    /**
-+     * @var bool
-+     */
-+    private $pingResult;
-+
-+    /**
-+     * Initialize Elasticsearch Client
-+     *
-+     * @param array $options
-+     * @param \Elasticsearch\Client|null $elasticsearchClient
-+     * @throws LocalizedException
-+     */
-+    public function __construct(
-+        $options = [],
-+        $elasticsearchClient = null
-+    ) {
-+        if (empty($options['hostname']) || ((!empty($options['enableAuth']) &&
-+                    ($options['enableAuth'] == 1)) && (empty($options['username']) || empty($options['password'])))) {
-+            throw new LocalizedException(
-+                __('The search failed because of a search engine misconfiguration.')
-+            );
-+        }
-+
-+        if (!($elasticsearchClient instanceof \Elasticsearch\Client)) {
-+            $config = $this->buildConfig($options);
-+            $elasticsearchClient = \Elasticsearch\ClientBuilder::fromConfig($config, true);
-+        }
-+        $this->client[getmypid()] = $elasticsearchClient;
-+        $this->clientOptions = $options;
-+    }
-+
-+    /**
-+     * Get Elasticsearch Client
-+     *
-+     * @return \Elasticsearch\Client
-+     */
-+    private function getClient()
-+    {
-+        $pid = getmypid();
-+        if (!isset($this->client[$pid])) {
-+            $config = $this->buildConfig($this->clientOptions);
-+            $this->client[$pid] = \Elasticsearch\ClientBuilder::fromConfig($config, true);
-+        }
-+        return $this->client[$pid];
-+    }
-+
-+    /**
-+     * Ping the Elasticsearch client
-+     *
-+     * @return bool
-+     */
-+    public function ping()
-+    {
-+        if ($this->pingResult === null) {
-+            $this->pingResult = $this->getClient()->ping(['client' => ['timeout' => $this->clientOptions['timeout']]]);
-+        }
-+
-+        return $this->pingResult;
-+    }
-+
-+    /**
-+     * Validate connection params
-+     *
-+     * @return bool
-+     */
-+    public function testConnection()
-+    {
-+        return $this->ping();
-+    }
-+
-+    /**
-+     * Build config.
-+     *
-+     * @param array $options
-+     * @return array
-+     */
-+    private function buildConfig($options = [])
-+    {
-+        $host = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
-+        $protocol = parse_url($options['hostname'], PHP_URL_SCHEME);
-+        if (!$protocol) {
-+            $protocol = 'http';
-+        }
-+        if (!empty($options['port'])) {
-+            $host .= ':' . $options['port'];
-+        }
-+        if (!empty($options['enableAuth']) && ($options['enableAuth'] == 1)) {
-+            $host = sprintf('%s://%s:%s@%s', $protocol, $options['username'], $options['password'], $host);
-+        }
-+
-+        $options['hosts'] = [$host];
-+        return $options;
-+    }
-+
-+    /**
-+     * Performs bulk query over Elasticsearch index
-+     *
-+     * @param array $query
-+     * @return void
-+     */
-+    public function bulkQuery($query)
-+    {
-+        $this->getClient()->bulk($query);
-+    }
-+
-+    /**
-+     * Creates an Elasticsearch index.
-+     *
-+     * @param string $index
-+     * @param array $settings
-+     * @return void
-+     */
-+    public function createIndex($index, $settings)
-+    {
-+        $this->getClient()->indices()->create([
-+            'index' => $index,
-+            'body' => $settings,
-+        ]);
-+    }
-+
-+    /**
-+     * Delete an Elasticsearch index.
-+     *
-+     * @param string $index
-+     * @return void
-+     */
-+    public function deleteIndex($index)
-+    {
-+        $this->getClient()->indices()->delete(['index' => $index]);
-+    }
-+
-+    /**
-+     * Check if index is empty.
-+     *
-+     * @param string $index
-+     * @return bool
-+     */
-+    public function isEmptyIndex($index)
-+    {
-+        $stats = $this->getClient()->indices()->stats(['index' => $index, 'metric' => 'docs']);
-+        if ($stats['indices'][$index]['primaries']['docs']['count'] == 0) {
-+            return true;
-+        }
-+        return false;
-+    }
-+
-+    /**
-+     * Updates alias.
-+     *
-+     * @param string $alias
-+     * @param string $newIndex
-+     * @param string $oldIndex
-+     * @return void
-+     */
-+    public function updateAlias($alias, $newIndex, $oldIndex = '')
-+    {
-+        $params['body'] = ['actions' => []];
-+        if ($oldIndex) {
-+            $params['body']['actions'][] = ['remove' => ['alias' => $alias, 'index' => $oldIndex]];
-+        }
-+        if ($newIndex) {
-+            $params['body']['actions'][] = ['add' => ['alias' => $alias, 'index' => $newIndex]];
-+        }
-+
-+        $this->getClient()->indices()->updateAliases($params);
-+    }
-+
-+    /**
-+     * Checks whether Elasticsearch index exists
-+     *
-+     * @param string $index
-+     * @return bool
-+     */
-+    public function indexExists($index)
-+    {
-+        return $this->getClient()->indices()->exists(['index' => $index]);
-+    }
-+
-+    /**
-+     * Exists alias.
-+     *
-+     * @param string $alias
-+     * @param string $index
-+     * @return bool
-+     */
-+    public function existsAlias($alias, $index = '')
-+    {
-+        $params = ['name' => $alias];
-+        if ($index) {
-+            $params['index'] = $index;
-+        }
-+        return $this->getClient()->indices()->existsAlias($params);
-+    }
-+
-+    /**
-+     * Get alias.
-+     *
-+     * @param string $alias
-+     * @return array
-+     */
-+    public function getAlias($alias)
-+    {
-+        return $this->getClient()->indices()->getAlias(['name' => $alias]);
-+    }
-+
-+    /**
-+     * Add mapping to Elasticsearch index
-+     *
-+     * @param array $fields
-+     * @param string $index
-+     * @param string $entityType
-+     * @return void
-+     */
-+    public function addFieldsMapping(array $fields, $index, $entityType)
-+    {
-+        $params = [
-+            'index' => $index,
-+            'type' => $entityType,
-+            'body' => [
-+                $entityType => [
-+                    'properties' => [
-+                        '_search' => [
-+                            'type' => 'text'
-+                        ],
-+                    ],
-+                    'dynamic_templates' => [
-+                        [
-+                            'price_mapping' => [
-+                                'match' => 'price_*',
-+                                'match_mapping_type' => 'string',
-+                                'mapping' => [
-+                                    'type' => 'float',
-+                                    'store' => true,
-+                                ],
-+                            ],
-+                        ],
-+                        [
-+                            'string_mapping' => [
-+                                'match' => '*',
-+                                'match_mapping_type' => 'string',
-+                                'mapping' => [
-+                                    'type' => 'text',
-+                                    'index' => false,
-+                                    'copy_to' => '_search'
-+                                ],
-+                            ],
-+                        ],
-+                        [
-+                            'position_mapping' => [
-+                                'match' => 'position_*',
-+                                'match_mapping_type' => 'string',
-+                                'mapping' => [
-+                                    'type' => 'int',
-+                                ],
-+                            ],
-+                        ],
-+                    ],
-+                ],
-+            ],
-+        ];
-+
-+        foreach ($fields as $field => $fieldInfo) {
-+            $params['body'][$entityType]['properties'][$field] = $fieldInfo;
-+        }
-+
-+        $this->getClient()->indices()->putMapping($params);
-+    }
-+
-+    /**
-+     * Delete mapping in Elasticsearch index
-+     *
-+     * @param string $index
-+     * @param string $entityType
-+     * @return void
-+     */
-+    public function deleteMapping($index, $entityType)
-+    {
-+        $this->getClient()->indices()->deleteMapping([
-+            'index' => $index,
-+            'type' => $entityType,
-+        ]);
-+    }
-+
-+    /**
-+     * Execute search by $query
-+     *
-+     * @param array $query
-+     * @return array
-+     */
-+    public function query($query)
-+    {
-+        return $this->getClient()->search($query);
-+    }
-+
-+    /**
-+     * Execute suggest query
-+     *
-+     * @param array $query
-+     * @return array
-+     */
-+    public function suggest($query)
-+    {
-+        return $this->getClient()->suggest($query);
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php b/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
-new file mode 100644
-index 00000000000..d05471734bb
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
-@@ -0,0 +1,275 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Elasticsearch6\Model\DataProvider;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Search\Model\QueryInterface;
-+use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
-+use Magento\Elasticsearch\Model\Config;
-+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
-+use Magento\Search\Model\QueryResultFactory;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
-+use Magento\Store\Model\StoreManagerInterface as StoreManager;
-+
-+/**
-+ * Class Suggestions
-+ */
-+class Suggestions implements SuggestedQueriesInterface
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var QueryResultFactory
-+     */
-+    private $queryResultFactory;
-+
-+    /**
-+     * @var ConnectionManager
-+     */
-+    private $connectionManager;
-+
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @var SearchIndexNameResolver
-+     */
-+    private $searchIndexNameResolver;
-+
-+    /**
-+     * @var StoreManager
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var FieldProviderInterface
-+     */
-+    private $fieldProvider;
-+
-+    /**
-+     * Suggestions constructor.
-+     *
-+     * @param ScopeConfigInterface $scopeConfig
-+     * @param Config $config
-+     * @param QueryResultFactory $queryResultFactory
-+     * @param ConnectionManager $connectionManager
-+     * @param SearchIndexNameResolver $searchIndexNameResolver
-+     * @param StoreManager $storeManager
-+     * @param FieldProviderInterface $fieldProvider
-+     */
-+    public function __construct(
-+        ScopeConfigInterface $scopeConfig,
-+        Config $config,
-+        QueryResultFactory $queryResultFactory,
-+        ConnectionManager $connectionManager,
-+        SearchIndexNameResolver $searchIndexNameResolver,
-+        StoreManager $storeManager,
-+        FieldProviderInterface $fieldProvider
-+    ) {
-+        $this->queryResultFactory = $queryResultFactory;
-+        $this->connectionManager = $connectionManager;
-+        $this->scopeConfig = $scopeConfig;
-+        $this->config = $config;
-+        $this->searchIndexNameResolver = $searchIndexNameResolver;
-+        $this->storeManager = $storeManager;
-+        $this->fieldProvider = $fieldProvider;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getItems(QueryInterface $query)
-+    {
-+        $result = [];
-+        if ($this->isSuggestionsAllowed()) {
-+            $isResultsCountEnabled = $this->isResultsCountEnabled();
-+
-+            foreach ($this->getSuggestions($query) as $suggestion) {
-+                $count = null;
-+                if ($isResultsCountEnabled) {
-+                    $count = isset($suggestion['freq']) ? $suggestion['freq'] : null;
-+                }
-+                $result[] = $this->queryResultFactory->create(
-+                    [
-+                        'queryText' => $suggestion['text'],
-+                        'resultsCount' => $count,
-+                    ]
-+                );
-+            }
-+        }
-+
-+        return $result;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function isResultsCountEnabled()
-+    {
-+        return $this->scopeConfig->isSetFlag(
-+            SuggestedQueriesInterface::SEARCH_SUGGESTION_COUNT_RESULTS_ENABLED,
-+            ScopeInterface::SCOPE_STORE
-+        );
-+    }
-+
-+    /**
-+     * Get Suggestions
-+     *
-+     * @param QueryInterface $query
-+     *
-+     * @return array
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    private function getSuggestions(QueryInterface $query)
-+    {
-+        $suggestions = [];
-+        $searchSuggestionsCount = $this->getSearchSuggestionsCount();
-+
-+        $searchQuery = $this->initQuery($query);
-+        $searchQuery = $this->addSuggestFields($searchQuery, $searchSuggestionsCount);
-+
-+        $result = $this->fetchQuery($searchQuery);
-+
-+        if (is_array($result)) {
-+            foreach ($result['suggest'] ?? [] as $suggest) {
-+                foreach ($suggest as $token) {
-+                    foreach ($token['options'] ?? [] as $key => $suggestion) {
-+                        $suggestions[$suggestion['score'] . '_' . $key] = $suggestion;
-+                    }
-+                }
-+            }
-+            ksort($suggestions);
-+            $texts = array_unique(array_column($suggestions, 'text'));
-+            $suggestions = array_slice(
-+                array_intersect_key(array_values($suggestions), $texts),
-+                0,
-+                $searchSuggestionsCount
-+            );
-+        }
-+
-+        return $suggestions;
-+    }
-+
-+    /**
-+     * Init Search Query
-+     *
-+     * @param string $query
-+     *
-+     * @return array
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    private function initQuery($query)
-+    {
-+        $searchQuery = [
-+            'index' => $this->searchIndexNameResolver->getIndexName(
-+                $this->storeManager->getStore()->getId(),
-+                Config::ELASTICSEARCH_TYPE_DEFAULT
-+            ),
-+            'type' => Config::ELASTICSEARCH_TYPE_DEFAULT,
-+            'body' => [
-+                'suggest' => [
-+                    'text' => $query->getQueryText()
-+                ]
-+            ],
-+        ];
-+
-+        return $searchQuery;
-+    }
-+
-+    /**
-+     * Build Suggest on searchable fields.
-+     *
-+     * @param array $searchQuery
-+     * @param int $searchSuggestionsCount
-+     *
-+     * @return array
-+     */
-+    private function addSuggestFields($searchQuery, $searchSuggestionsCount)
-+    {
-+        $fields = $this->getSuggestFields();
-+        foreach ($fields as $field) {
-+            $searchQuery['body']['suggest']['phrase_' . $field] = [
-+                'phrase' => [
-+                    'field' => $field,
-+                    'analyzer' => 'standard',
-+                    'size' => $searchSuggestionsCount,
-+                    'max_errors' => 1,
-+                    'direct_generator' => [
-+                        [
-+                            'field' => $field,
-+                            'min_word_length' => 3,
-+                            'min_doc_freq' => 1,
-+                        ]
-+                    ],
-+                ],
-+            ];
-+        }
-+
-+        return $searchQuery;
-+    }
-+
-+    /**
-+     * Get fields to build suggest query on.
-+     *
-+     * @return array
-+     */
-+    private function getSuggestFields()
-+    {
-+        $fields = array_filter($this->fieldProvider->getFields(), function ($field) {
-+            return (($field['type'] ?? null) === 'text') && (($field['index'] ?? null) !== false);
-+        });
-+
-+        return array_keys($fields);
-+    }
-+
-+    /**
-+     * Fetch Query
-+     *
-+     * @param array $query
-+     * @return array
-+     */
-+    private function fetchQuery(array $query)
-+    {
-+        return $this->connectionManager->getConnection()->query($query);
-+    }
-+
-+    /**
-+     * Get search suggestions Max Count from config
-+     *
-+     * @return int
-+     */
-+    private function getSearchSuggestionsCount()
-+    {
-+        return (int) $this->scopeConfig->getValue(
-+            SuggestedQueriesInterface::SEARCH_SUGGESTION_COUNT,
-+            ScopeInterface::SCOPE_STORE
-+        );
-+    }
-+
-+    /**
-+     * Is Search Suggestions Allowed
-+     *
-+     * @return bool
-+     */
-+    private function isSuggestionsAllowed()
-+    {
-+        $isSuggestionsEnabled = $this->scopeConfig->isSetFlag(
-+            SuggestedQueriesInterface::SEARCH_SUGGESTION_ENABLED,
-+            ScopeInterface::SCOPE_STORE
-+        );
-+        $isEnabled = $this->config->isElasticsearchEnabled();
-+        $isSuggestionsAllowed = ($isEnabled && $isSuggestionsEnabled);
-+
-+        return $isSuggestionsAllowed;
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch6/README.md b/app/code/Magento/Elasticsearch6/README.md
-new file mode 100644
-index 00000000000..8bf95ad95d1
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/README.md
-@@ -0,0 +1,2 @@
-+Magento\Elasticsearch module allows to use Elastic search engine (v6) for product searching capabilities.
-+The module implements Magento\Search library interfaces.
-diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php
-new file mode 100644
-index 00000000000..a3c6e7e148f
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php
-@@ -0,0 +1,123 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch6\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
-+
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
-+    as FieldTypeResolver;
-+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
-+    as FieldTypeConverterInterface;
-+use Magento\Elasticsearch6\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver;
-+
-+/**
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class DefaultResolverTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var DefaultResolver
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var FieldTypeResolver
-+     */
-+    private $fieldTypeResolver;
-+
-+    /**
-+     * @var FieldTypeConverterInterface
-+     */
-+    private $fieldTypeConverter;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = new ObjectManagerHelper($this);
-+        $this->fieldTypeResolver = $this->getMockBuilder(FieldTypeResolver::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getFieldType'])
-+            ->getMockForAbstractClass();
-+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['convert'])
-+            ->getMockForAbstractClass();
-+
-+        $this->resolver = $objectManager->getObject(
-+            DefaultResolver::class,
-+            [
-+                'fieldTypeResolver' => $this->fieldTypeResolver,
-+                'fieldTypeConverter' => $this->fieldTypeConverter
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getFieldNameProvider
-+     * @param $fieldType
-+     * @param $attributeCode
-+     * @param $frontendInput
-+     * @param $isSortable
-+     * @param $context
-+     * @param $expected
-+     * @return void
-+     */
-+    public function testGetFieldName(
-+        $fieldType,
-+        $attributeCode,
-+        $frontendInput,
-+        $isSortable,
-+        $context,
-+        $expected
-+    ) {
-+        $this->fieldTypeConverter->expects($this->any())
-+            ->method('convert')
-+            ->willReturn('string');
-+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAttributeCode', 'getFrontendInput', 'isSortable'])
-+            ->getMock();
-+        $attributeMock->expects($this->any())
-+            ->method('getAttributeCode')
-+            ->willReturn($attributeCode);
-+        $attributeMock->expects($this->any())
-+            ->method('getFrontendInput')
-+            ->willReturn($frontendInput);
-+        $attributeMock->expects($this->any())
-+            ->method('isSortable')
-+            ->willReturn($isSortable);
-+        $this->fieldTypeResolver->expects($this->any())
-+            ->method('getFieldType')
-+            ->willReturn($fieldType);
-+
-+        $this->assertEquals(
-+            $expected,
-+            $this->resolver->getFieldName($attributeMock, $context)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getFieldNameProvider()
-+    {
-+        return [
-+            ['', 'code', '', false, [], 'code'],
-+            ['', 'code', '', false, ['type' => 'default'], 'code'],
-+            ['string', '*', '', false, ['type' => 'default'], '_search'],
-+            ['', 'code', '', false, ['type' => 'default'], 'code'],
-+            ['', 'code', 'select', false, ['type' => 'default'], 'code'],
-+            ['', 'code', 'boolean', false, ['type' => 'default'], 'code'],
-+            ['', 'code', '', true, ['type' => 'sort'], 'sort_code'],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
-new file mode 100644
-index 00000000000..8276d0dd8db
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
-@@ -0,0 +1,562 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Elasticsearch6\Test\Unit\Model\Client;
-+
-+use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+
-+class ElasticsearchTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var ElasticsearchClient
-+     */
-+    protected $model;
-+
-+    /**
-+     * @var \Elasticsearch\Client|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $elasticsearchClientMock;
-+
-+    /**
-+     * @var \Elasticsearch\Namespaces\IndicesNamespace|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $indicesMock;
-+
-+    /**
-+     * @var ObjectManagerHelper
-+     */
-+    protected $objectManager;
-+
-+    /**
-+     * Setup
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->elasticsearchClientMock = $this->getMockBuilder(\Elasticsearch\Client::class)
-+            ->setMethods([
-+                'indices',
-+                'ping',
-+                'bulk',
-+                'search',
-+                'scroll',
-+                'suggest',
-+                'info',
-+            ])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->indicesMock = $this->getMockBuilder(\Elasticsearch\Namespaces\IndicesNamespace::class)
-+            ->setMethods([
-+                'exists',
-+                'getSettings',
-+                'create',
-+                'delete',
-+                'putMapping',
-+                'deleteMapping',
-+                'stats',
-+                'updateAliases',
-+                'existsAlias',
-+                'getAlias',
-+            ])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->elasticsearchClientMock->expects($this->any())
-+            ->method('indices')
-+            ->willReturn($this->indicesMock);
-+        $this->elasticsearchClientMock->expects($this->any())
-+            ->method('ping')
-+            ->willReturn(true);
-+        $this->elasticsearchClientMock->expects($this->any())
-+            ->method('info')
-+            ->willReturn(['version' => ['number' => '6.0.0']]);
-+
-+        $this->objectManager = new ObjectManagerHelper($this);
-+        $this->model = $this->objectManager->getObject(
-+            \Magento\Elasticsearch6\Model\Client\Elasticsearch::class,
-+            [
-+                'options' => $this->getOptions(),
-+                'elasticsearchClient' => $this->elasticsearchClientMock
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function testConstructorOptionsException()
-+    {
-+        $result = $this->objectManager->getObject(
-+            \Magento\Elasticsearch6\Model\Client\Elasticsearch::class,
-+            [
-+                'options' => []
-+            ]
-+        );
-+        $this->assertNotNull($result);
-+    }
-+
-+    /**
-+     * Test client creation from the list of options
-+     */
-+    public function testConstructorWithOptions()
-+    {
-+        $result = $this->objectManager->getObject(
-+            \Magento\Elasticsearch6\Model\Client\Elasticsearch::class,
-+            [
-+                'options' => $this->getOptions()
-+            ]
-+        );
-+        $this->assertNotNull($result);
-+    }
-+
-+    /**
-+     * Test ping functionality
-+     */
-+    public function testPing()
-+    {
-+        $this->elasticsearchClientMock->expects($this->once())->method('ping')->willReturn(true);
-+        $this->assertEquals(true, $this->model->ping());
-+    }
-+
-+    /**
-+     * Test validation of connection parameters
-+     */
-+    public function testTestConnection()
-+    {
-+        $this->elasticsearchClientMock->expects($this->once())->method('ping')->willReturn(true);
-+        $this->assertEquals(true, $this->model->testConnection());
-+    }
-+
-+    /**
-+     * Test validation of connection parameters returns false
-+     */
-+    public function testTestConnectionFalse()
-+    {
-+        $this->elasticsearchClientMock->expects($this->once())->method('ping')->willReturn(false);
-+        $this->assertEquals(true, $this->model->testConnection());
-+    }
-+
-+    /**
-+     * Test validation of connection parameters
-+     */
-+    public function testTestConnectionPing()
-+    {
-+        $this->model = $this->objectManager->getObject(
-+            \Magento\Elasticsearch6\Model\Client\Elasticsearch::class,
-+            [
-+                'options' => $this->getEmptyIndexOption(),
-+                'elasticsearchClient' => $this->elasticsearchClientMock
-+            ]
-+        );
-+
-+        $this->model->ping();
-+        $this->assertEquals(true, $this->model->testConnection());
-+    }
-+
-+    /**
-+     * Test bulkQuery() method
-+     */
-+    public function testBulkQuery()
-+    {
-+        $this->elasticsearchClientMock->expects($this->once())
-+            ->method('bulk')
-+            ->with([]);
-+        $this->model->bulkQuery([]);
-+    }
-+
-+    /**
-+     * Test createIndex() method, case when such index exists
-+     */
-+    public function testCreateIndexExists()
-+    {
-+        $this->indicesMock->expects($this->once())
-+            ->method('create')
-+            ->with([
-+                'index' => 'indexName',
-+                'body' => [],
-+            ]);
-+        $this->model->createIndex('indexName', []);
-+    }
-+
-+    /**
-+     * Test deleteIndex() method.
-+     */
-+    public function testDeleteIndex()
-+    {
-+        $this->indicesMock->expects($this->once())
-+            ->method('delete')
-+            ->with(['index' => 'indexName']);
-+        $this->model->deleteIndex('indexName');
-+    }
-+
-+    /**
-+     * Test isEmptyIndex() method.
-+     */
-+    public function testIsEmptyIndex()
-+    {
-+        $indexName = 'magento2_index';
-+        $stats['indices'][$indexName]['primaries']['docs']['count'] = 0;
-+
-+        $this->indicesMock->expects($this->once())
-+            ->method('stats')
-+            ->with(['index' => $indexName, 'metric' => 'docs'])
-+            ->willReturn($stats);
-+        $this->assertTrue($this->model->isEmptyIndex($indexName));
-+    }
-+
-+    /**
-+     * Test isEmptyIndex() method returns false.
-+     */
-+    public function testIsEmptyIndexFalse()
-+    {
-+        $indexName = 'magento2_index';
-+        $stats['indices'][$indexName]['primaries']['docs']['count'] = 1;
-+
-+        $this->indicesMock->expects($this->once())
-+            ->method('stats')
-+            ->with(['index' => $indexName, 'metric' => 'docs'])
-+            ->willReturn($stats);
-+        $this->assertFalse($this->model->isEmptyIndex($indexName));
-+    }
-+
-+    /**
-+     * Test updateAlias() method with new index.
-+     */
-+    public function testUpdateAlias()
-+    {
-+        $alias = 'alias1';
-+        $index = 'index1';
-+
-+        $params['body']['actions'][] = ['add' => ['alias' => $alias, 'index' => $index]];
-+
-+        $this->indicesMock->expects($this->once())
-+            ->method('updateAliases')
-+            ->with($params);
-+        $this->model->updateAlias($alias, $index);
-+    }
-+
-+    /**
-+     * Test updateAlias() method with new and old index.
-+     */
-+    public function testUpdateAliasRemoveOldIndex()
-+    {
-+        $alias = 'alias1';
-+        $newIndex = 'index1';
-+        $oldIndex = 'indexOld';
-+
-+        $params['body']['actions'][] = ['remove' => ['alias' => $alias, 'index' => $oldIndex]];
-+        $params['body']['actions'][] = ['add' => ['alias' => $alias, 'index' => $newIndex]];
-+
-+        $this->indicesMock->expects($this->once())
-+            ->method('updateAliases')
-+            ->with($params);
-+        $this->model->updateAlias($alias, $newIndex, $oldIndex);
-+    }
-+
-+    /**
-+     * Test indexExists() method, case when no such index exists
-+     */
-+    public function testIndexExists()
-+    {
-+        $this->indicesMock->expects($this->once())
-+            ->method('exists')
-+            ->with([
-+                'index' => 'indexName',
-+            ])
-+            ->willReturn(true);
-+        $this->model->indexExists('indexName');
-+    }
-+
-+    /**
-+     * Tests existsAlias() method checking for alias.
-+     */
-+    public function testExistsAlias()
-+    {
-+        $alias = 'alias1';
-+        $params = ['name' => $alias];
-+        $this->indicesMock->expects($this->once())
-+            ->method('existsAlias')
-+            ->with($params)
-+            ->willReturn(true);
-+        $this->assertTrue($this->model->existsAlias($alias));
-+    }
-+
-+    /**
-+     * Tests existsAlias() method checking for alias and index.
-+     */
-+    public function testExistsAliasWithIndex()
-+    {
-+        $alias = 'alias1';
-+        $index = 'index1';
-+        $params = ['name' => $alias, 'index' => $index];
-+        $this->indicesMock->expects($this->once())
-+            ->method('existsAlias')
-+            ->with($params)
-+            ->willReturn(true);
-+        $this->assertTrue($this->model->existsAlias($alias, $index));
-+    }
-+
-+    /**
-+     * Test getAlias() method.
-+     */
-+    public function testGetAlias()
-+    {
-+        $alias = 'alias1';
-+        $params = ['name' => $alias];
-+        $this->indicesMock->expects($this->once())
-+            ->method('getAlias')
-+            ->with($params)
-+            ->willReturn([]);
-+        $this->assertEquals([], $this->model->getAlias($alias));
-+    }
-+
-+    /**
-+     * Test createIndexIfNotExists() method, case when operation fails
-+     * @expectedException \Exception
-+     */
-+    public function testCreateIndexFailure()
-+    {
-+        $this->indicesMock->expects($this->once())
-+            ->method('create')
-+            ->with([
-+                'index' => 'indexName',
-+                'body' => [],
-+            ])
-+            ->willThrowException(new \Exception('Something went wrong'));
-+        $this->model->createIndex('indexName', []);
-+    }
-+
-+    /**
-+     * Test testAddFieldsMapping() method
-+     */
-+    public function testAddFieldsMapping()
-+    {
-+        $this->indicesMock->expects($this->once())
-+            ->method('putMapping')
-+            ->with([
-+                'index' => 'indexName',
-+                'type' => 'product',
-+                'body' => [
-+                    'product' => [
-+                        'properties' => [
-+                            '_search' => [
-+                                'type' => 'text',
-+                            ],
-+                            'name' => [
-+                                'type' => 'text',
-+                            ],
-+                        ],
-+                        'dynamic_templates' => [
-+                            [
-+                                'price_mapping' => [
-+                                    'match' => 'price_*',
-+                                    'match_mapping_type' => 'string',
-+                                    'mapping' => [
-+                                        'type' => 'float',
-+                                        'store' => true,
-+                                    ],
-+                                ],
-+                            ],
-+                            [
-+                                'string_mapping' => [
-+                                    'match' => '*',
-+                                    'match_mapping_type' => 'string',
-+                                    'mapping' => [
-+                                        'type' => 'text',
-+                                        'index' => false,
-+                                        'copy_to' => '_search'
-+                                    ],
-+                                ],
-+                            ],
-+                            [
-+                                'position_mapping' => [
-+                                    'match' => 'position_*',
-+                                    'match_mapping_type' => 'string',
-+                                    'mapping' => [
-+                                        'type' => 'int',
-+                                    ],
-+                                ],
-+                            ],
-+                        ],
-+                    ],
-+                ],
-+            ]);
-+        $this->model->addFieldsMapping(
-+            [
-+                'name' => [
-+                    'type' => 'text',
-+                ],
-+            ],
-+            'indexName',
-+            'product'
-+        );
-+    }
-+
-+    /**
-+     * Test testAddFieldsMapping() method
-+     * @expectedException \Exception
-+     */
-+    public function testAddFieldsMappingFailure()
-+    {
-+        $this->indicesMock->expects($this->once())
-+            ->method('putMapping')
-+            ->with([
-+                'index' => 'indexName',
-+                'type' => 'product',
-+                'body' => [
-+                    'product' => [
-+                        'properties' => [
-+                            '_search' => [
-+                                'type' => 'text',
-+                            ],
-+                            'name' => [
-+                                'type' => 'text',
-+                            ],
-+                        ],
-+                        'dynamic_templates' => [
-+                            [
-+                                'price_mapping' => [
-+                                    'match' => 'price_*',
-+                                    'match_mapping_type' => 'string',
-+                                    'mapping' => [
-+                                        'type' => 'float',
-+                                        'store' => true,
-+                                    ],
-+                                ],
-+                            ],
-+                            [
-+                                'string_mapping' => [
-+                                    'match' => '*',
-+                                    'match_mapping_type' => 'string',
-+                                    'mapping' => [
-+                                        'type' => 'text',
-+                                        'index' => false,
-+                                        'copy_to' => '_search'
-+                                    ],
-+                                ],
-+                            ],
-+                            [
-+                                'position_mapping' => [
-+                                    'match' => 'position_*',
-+                                    'match_mapping_type' => 'string',
-+                                    'mapping' => [
-+                                        'type' => 'int',
-+                                    ],
-+                                ],
-+                            ],
-+                        ],
-+                    ],
-+                ],
-+            ])
-+            ->willThrowException(new \Exception('Something went wrong'));
-+        $this->model->addFieldsMapping(
-+            [
-+                'name' => [
-+                    'type' => 'text',
-+                ],
-+            ],
-+            'indexName',
-+            'product'
-+        );
-+    }
-+
-+    /**
-+     * Test deleteMapping() method
-+     */
-+    public function testDeleteMapping()
-+    {
-+        $this->indicesMock->expects($this->once())
-+            ->method('deleteMapping')
-+            ->with([
-+                'index' => 'indexName',
-+                'type' => 'product',
-+            ]);
-+        $this->model->deleteMapping(
-+            'indexName',
-+            'product'
-+        );
-+    }
-+
-+    /**
-+     * Test deleteMapping() method
-+     * @expectedException \Exception
-+     */
-+    public function testDeleteMappingFailure()
-+    {
-+        $this->indicesMock->expects($this->once())
-+            ->method('deleteMapping')
-+            ->with([
-+                'index' => 'indexName',
-+                'type' => 'product',
-+            ])
-+            ->willThrowException(new \Exception('Something went wrong'));
-+        $this->model->deleteMapping(
-+            'indexName',
-+            'product'
-+        );
-+    }
-+
-+    /**
-+     * Test query() method
-+     * @return void
-+     */
-+    public function testQuery()
-+    {
-+        $query = 'test phrase query';
-+        $this->elasticsearchClientMock->expects($this->once())
-+            ->method('search')
-+            ->with($query)
-+            ->willReturn([]);
-+        $this->assertEquals([], $this->model->query($query));
-+    }
-+
-+    /**
-+     * Test suggest() method
-+     * @return void
-+     */
-+    public function testSuggest()
-+    {
-+        $query = 'query';
-+        $this->elasticsearchClientMock->expects($this->once())
-+            ->method('suggest')
-+            ->willReturn([]);
-+        $this->assertEquals([], $this->model->suggest($query));
-+    }
-+
-+    /**
-+     * Get elasticsearch client options
-+     *
-+     * @return array
-+     */
-+    protected function getOptions()
-+    {
-+        return [
-+            'hostname' => 'localhost',
-+            'port' => '9200',
-+            'timeout' => 15,
-+            'index' => 'magento2',
-+            'enableAuth' => 1,
-+            'username' => 'user',
-+            'password' => 'passwd',
-+        ];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    protected function getEmptyIndexOption()
-+    {
-+        return [
-+            'hostname' => 'localhost',
-+            'port' => '9200',
-+            'index' => '',
-+            'timeout' => 15,
-+            'enableAuth' => 1,
-+            'username' => 'user',
-+            'password' => 'passwd',
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
-new file mode 100644
-index 00000000000..b3c60b70ffa
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
-@@ -0,0 +1,183 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Elasticsearch6\Test\Unit\Model\DataProvider;
-+
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Elasticsearch\Model\DataProvider\Suggestions;
-+use Magento\Elasticsearch\Model\Config;
-+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
-+use Magento\Search\Model\QueryResultFactory;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
-+use Magento\Store\Model\StoreManagerInterface as StoreManager;
-+use Magento\Search\Model\QueryInterface;
-+
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class SuggestionsTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var Suggestions
-+     */
-+    private $model;
-+
-+    /**
-+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $config;
-+
-+    /**
-+     * @var QueryResultFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $queryResultFactory;
-+
-+    /**
-+     * @var ConnectionManager|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $connectionManager;
-+
-+    /**
-+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @var SearchIndexNameResolver|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $searchIndexNameResolver;
-+
-+    /**
-+     * @var StoreManager|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var QueryInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $query;
-+
-+    /**
-+     * Set up test environment
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->config = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['isElasticsearchEnabled'])
-+            ->getMock();
-+
-+        $this->queryResultFactory = $this->getMockBuilder(\Magento\Search\Model\QueryResultFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+
-+        $this->connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getConnection'])
-+            ->getMock();
-+
-+        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->searchIndexNameResolver = $this
-+            ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getIndexName'])
-+            ->getMock();
-+
-+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->query = $this->getMockBuilder(\Magento\Search\Model\QueryInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $objectManager = new ObjectManagerHelper($this);
-+
-+        $this->model = $objectManager->getObject(
-+            \Magento\Elasticsearch6\Model\DataProvider\Suggestions::class,
-+            [
-+                'queryResultFactory' => $this->queryResultFactory,
-+                'connectionManager' => $this->connectionManager,
-+                'scopeConfig' => $this->scopeConfig,
-+                'config' => $this->config,
-+                'searchIndexNameResolver' => $this->searchIndexNameResolver,
-+                'storeManager' => $this->storeManager
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test getItems() method
-+     */
-+    public function testGetItems()
-+    {
-+        $this->scopeConfig->expects($this->any())
-+            ->method('getValue')
-+            ->willReturn(1);
-+
-+        $this->config->expects($this->any())
-+            ->method('isElasticsearchEnabled')
-+            ->willReturn(1);
-+
-+        $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->storeManager->expects($this->any())
-+            ->method('getStore')
-+            ->willReturn($store);
-+
-+        $store->expects($this->any())
-+            ->method('getId')
-+            ->willReturn(1);
-+
-+        $this->searchIndexNameResolver->expects($this->any())
-+            ->method('getIndexName')
-+            ->willReturn('magento2_product_1');
-+
-+        $this->query->expects($this->any())
-+            ->method('getQueryText')
-+            ->willReturn('query');
-+
-+        $client = $this->getMockBuilder(\Magento\Elasticsearch6\Model\Client\Elasticsearch::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->connectionManager->expects($this->any())
-+            ->method('getConnection')
-+            ->willReturn($client);
-+
-+        $client->expects($this->any())
-+            ->method('query')
-+            ->willReturn([
-+                'suggest' => [
-+                    'phrase_field' => [
-+                        'options' => [
-+                            'text' => 'query',
-+                            'score' => 1,
-+                            'freq' => 1,
-+                        ]
-+                    ],
-+                ],
-+            ]);
-+
-+        $query = $this->getMockBuilder(\Magento\Search\Model\QueryResult::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->queryResultFactory->expects($this->any())
-+            ->method('create')
-+            ->willReturn($query);
-+
-+        $this->assertInternalType('array', $this->model->getItems($this->query));
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch6/composer.json b/app/code/Magento/Elasticsearch6/composer.json
-new file mode 100644
-index 00000000000..26b6c8c678a
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/composer.json
-@@ -0,0 +1,30 @@
-+{
-+    "name": "magento/module-elasticsearch-6",
-+    "description": "N/A",
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-advanced-search": "*",
-+        "magento/module-catalog-search": "*",
-+        "magento/module-search": "*",
-+        "magento/module-store": "*",
-+        "magento/module-elasticsearch": "*",
-+        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
-+    },
-+    "suggest": {
-+        "magento/module-config": "*"
-+    },
-+    "type": "magento2-module",
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\Elasticsearch6\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml b/app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml
-new file mode 100644
-index 00000000000..067a0acb8c9
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml
-@@ -0,0 +1,85 @@
-+<?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_Config:etc/system_file.xsd">
-+    <system>
-+        <section id="catalog">
-+            <group id="search">
-+                <!-- Elasticsearch 6.0+ -->
-+                <field id="elasticsearch6_server_hostname" translate="label" type="text" sortOrder="71"
-+                       showInDefault="1" showInWebsite="0" showInStore="0">
-+                    <label>Elasticsearch Server Hostname</label>
-+                    <depends>
-+                        <field id="engine">elasticsearch6</field>
-+                    </depends>
-+                </field>
-+
-+                <field id="elasticsearch6_server_port" translate="label" type="text" sortOrder="72" showInDefault="1"
-+                       showInWebsite="0" showInStore="0">
-+                    <label>Elasticsearch Server Port</label>
-+                    <depends>
-+                        <field id="engine">elasticsearch6</field>
-+                    </depends>
-+                </field>
-+
-+                <field id="elasticsearch6_index_prefix" translate="label" type="text" sortOrder="73" showInDefault="1"
-+                       showInWebsite="0" showInStore="0">
-+                    <label>Elasticsearch Index Prefix</label>
-+                    <depends>
-+                        <field id="engine">elasticsearch6</field>
-+                    </depends>
-+                </field>
-+
-+                <field id="elasticsearch6_enable_auth" translate="label" type="select" sortOrder="74" showInDefault="1"
-+                       showInWebsite="0" showInStore="0">
-+                    <label>Enable Elasticsearch HTTP Auth</label>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <depends>
-+                        <field id="engine">elasticsearch6</field>
-+                    </depends>
-+                </field>
-+
-+                <field id="elasticsearch6_username" translate="label" type="text" sortOrder="75" showInDefault="1"
-+                       showInWebsite="0" showInStore="0">
-+                    <label>Elasticsearch HTTP Username</label>
-+                    <depends>
-+                        <field id="engine">elasticsearch6</field>
-+                        <field id="elasticsearch6_enable_auth">1</field>
-+                    </depends>
-+                </field>
-+
-+                <field id="elasticsearch6_password" translate="label" type="text" sortOrder="76" showInDefault="1"
-+                       showInWebsite="0" showInStore="0">
-+                    <label>Elasticsearch HTTP Password</label>
-+                    <depends>
-+                        <field id="engine">elasticsearch6</field>
-+                        <field id="elasticsearch6_enable_auth">1</field>
-+                    </depends>
-+                </field>
-+
-+                <field id="elasticsearch6_server_timeout" translate="label" type="text" sortOrder="77" showInDefault="1"
-+                       showInWebsite="0" showInStore="0">
-+                    <label>Elasticsearch Server Timeout</label>
-+                    <depends>
-+                        <field id="engine">elasticsearch6</field>
-+                    </depends>
-+                </field>
-+
-+                <field id="elasticsearch6_test_connect_wizard" translate="button_label" sortOrder="78" showInDefault="1"
-+                       showInWebsite="0" showInStore="0">
-+                    <label/>
-+                    <button_label>Test Connection</button_label>
-+                    <frontend_model>Magento\Elasticsearch6\Block\Adminhtml\System\Config\TestConnection</frontend_model>
-+                    <depends>
-+                        <field id="engine">elasticsearch6</field>
-+                    </depends>
-+                </field>
-+            </group>
-+        </section>
-+    </system>
-+</config>
-diff --git a/app/code/Magento/Elasticsearch6/etc/config.xml b/app/code/Magento/Elasticsearch6/etc/config.xml
-new file mode 100644
-index 00000000000..047ae977fde
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/etc/config.xml
-@@ -0,0 +1,20 @@
-+<?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_Store:etc/config.xsd">
-+    <default>
-+        <catalog>
-+            <search>
-+                <elasticsearch6_server_hostname>localhost</elasticsearch6_server_hostname>
-+                <elasticsearch6_server_port>9200</elasticsearch6_server_port>
-+                <elasticsearch6_index_prefix>magento2</elasticsearch6_index_prefix>
-+                <elasticsearch6_enable_auth>0</elasticsearch6_enable_auth>
-+                <elasticsearch6_server_timeout>15</elasticsearch6_server_timeout>
-+            </search>
-+        </catalog>
-+    </default>
-+</config>
-diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
-new file mode 100644
-index 00000000000..011dfa10197
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/etc/di.xml
-@@ -0,0 +1,205 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\Elasticsearch\Model\Config">
-+        <arguments>
-+            <argument name="engineList" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="string">elasticsearch6</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
-+        <arguments>
-+            <argument name="engines" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="string">Elasticsearch 6.0+</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper\CategoryFieldsProviderProxy">
-+        <arguments>
-+            <argument name="categoryFieldsProviders" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper\CategoryFieldsProvider</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper\ProductDataMapperProxy">
-+        <arguments>
-+            <argument name="dataMappers" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper\ProductDataMapper</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapperProxy">
-+        <arguments>
-+            <argument name="productFieldMappers" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="object">Magento\Elasticsearch6\Model\Adapter\FieldMapper\ProductFieldMapper</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\AdvancedSearch\Model\Client\ClientResolver">
-+        <arguments>
-+            <argument name="clientFactories" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch6\Model\Client\ElasticsearchFactory</item>
-+            </argument>
-+            <argument name="clientOptions" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch\Model\Config</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory">
-+        <arguments>
-+            <argument name="handlers" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="string">Magento\Elasticsearch\Model\Indexer\IndexerHandler</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\CatalogSearch\Model\Indexer\IndexStructureFactory">
-+        <arguments>
-+            <argument name="structures" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="string">Magento\Elasticsearch\Model\Indexer\IndexStructure</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\CatalogSearch\Model\ResourceModel\EngineProvider">
-+        <arguments>
-+            <argument name="engines" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="string">Magento\Elasticsearch\Model\ResourceModel\Engine</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\Search\Model\AdapterFactory">
-+        <arguments>
-+            <argument name="adapters" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="string">Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Adapter</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\Search\Model\EngineResolver">
-+        <arguments>
-+            <argument name="engines" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="string">elasticsearch6</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <virtualType name="Magento\Elasticsearch6\Model\Client\ElasticsearchFactory" type="Magento\AdvancedSearch\Model\Client\ClientFactory">
-+        <arguments>
-+            <argument name="clientClass" xsi:type="string">Magento\Elasticsearch6\Model\Client\Elasticsearch</argument>
-+        </arguments>
-+    </virtualType>
-+
-+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Client\ClientFactoryProxy">
-+        <arguments>
-+            <argument name="clientFactories" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="object">Magento\Elasticsearch6\Model\Client\ElasticsearchFactory</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\Framework\Search\Dynamic\IntervalFactory">
-+        <arguments>
-+            <argument name="intervals" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="string">Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Aggregation\Interval</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\Framework\Search\Dynamic\DataProviderFactory">
-+        <arguments>
-+            <argument name="dataProviders" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="string">Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+
-+    <type name="Magento\AdvancedSearch\Model\SuggestedQueries">
-+        <arguments>
-+            <argument name="data" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="string">Magento\Elasticsearch6\Model\DataProvider\Suggestions</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\Elasticsearch6\Model\DataProvider\Suggestions">
-+        <arguments>
-+            <argument name="fieldProvider" xsi:type="object">elasticsearch5FieldProvider</argument>
-+        </arguments>
-+    </type>
-+
-+    <virtualType name="elasticsearch6FieldNameResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
-+        <arguments>
-+            <argument name="items" xsi:type="array">
-+                <item name="notEav" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\NotEavAttribute</item>
-+                <item name="special" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\SpecialAttribute</item>
-+                <item name="price" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Price</item>
-+                <item name="categoryName" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CategoryName</item>
-+                <item name="position" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Position</item>
-+                <item name="default" xsi:type="object">\Magento\Elasticsearch6\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+
-+    <virtualType name="Magento\Elasticsearch6\Model\Adapter\FieldMapper\ProductFieldMapper"
-+                 type="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper">
-+        <arguments>
-+            <argument name="fieldProvider" xsi:type="object">elasticsearch5FieldProvider</argument>
-+            <argument name="fieldNameResolver" xsi:type="object">elasticsearch6FieldNameResolver</argument>
-+        </arguments>
-+    </virtualType>
-+
-+    <type name="Magento\Search\Model\Search\PageSizeProvider">
-+        <arguments>
-+            <argument name="pageSizeBySearchEngine" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="number">10000</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <virtualType name="elasticsearchLayerCategoryItemCollectionProvider" type="Magento\Elasticsearch\Model\Layer\Category\ItemCollectionProvider">
-+        <arguments>
-+            <argument name="factories" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="object">elasticsearchCategoryCollectionFactory</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+
-+    <type name="Magento\CatalogSearch\Model\Search\ItemCollectionProvider">
-+        <arguments>
-+            <argument name="factories" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="object">elasticsearchAdvancedCollectionFactory</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategyProvider">
-+        <arguments>
-+            <argument name="strategies" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="object">Magento\Elasticsearch\Model\Advanced\ProductCollectionPrepareStrategy</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <virtualType name="elasticsearchLayerSearchItemCollectionProvider" type="Magento\Elasticsearch\Model\Layer\Search\ItemCollectionProvider">
-+        <arguments>
-+            <argument name="factories" xsi:type="array">
-+                <item name="elasticsearch6" xsi:type="object">elasticsearchFulltextSearchCollectionFactory</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+</config>
-diff --git a/app/code/Magento/Elasticsearch6/etc/module.xml b/app/code/Magento/Elasticsearch6/etc/module.xml
-new file mode 100644
-index 00000000000..4fde2394dfb
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/etc/module.xml
-@@ -0,0 +1,18 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_Elasticsearch6">
-+        <sequence>
-+            <module name="Magento_CatalogSearch"/>
-+            <module name="Magento_Search"/>
-+            <module name="Magento_AdvancedSearch"/>
-+            <module name="Magento_Store"/>
-+            <module name="Magento_Elasticsearch"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/app/code/Magento/Elasticsearch6/etc/search_engine.xml b/app/code/Magento/Elasticsearch6/etc/search_engine.xml
-new file mode 100644
-index 00000000000..40bc69bfd82
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/etc/search_engine.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<engines xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Search/etc/search_engine.xsd">
-+    <engine name="elasticsearch6">
-+        <feature name="synonyms" support="true" />
-+    </engine>
-+</engines>
-diff --git a/app/code/Magento/Elasticsearch6/registration.php b/app/code/Magento/Elasticsearch6/registration.php
-new file mode 100644
-index 00000000000..7ab10e996eb
---- /dev/null
-+++ b/app/code/Magento/Elasticsearch6/registration.php
-@@ -0,0 +1,11 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+\Magento\Framework\Component\ComponentRegistrar::register(
-+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-+    'Magento_Elasticsearch6',
-+    __DIR__
-+);
-diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php
-index a2ba63d78d1..65f9e41b074 100644
---- a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php
-+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php
-@@ -41,7 +41,8 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
-      */
-     protected function _getEscapedValue($value)
-     {
--        return addcslashes(htmlspecialchars($value), '\\\'');
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+        return addcslashes($this->escapeHtml($value), '\\\'');
-     }
- 
-     /**
-diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php
-index 24c39884661..005d211a896 100644
---- a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php
-+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php
-@@ -23,7 +23,7 @@ class Sender extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
-         $str = '';
- 
-         if ($row->getTemplateSenderName()) {
--            $str .= htmlspecialchars($row->getTemplateSenderName()) . ' ';
-+            $str .= $this->escapeHtml($row->getTemplateSenderName()) . ' ';
-         }
- 
-         if ($row->getTemplateSenderEmail()) {
-diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
-index 5f22a36510c..1ea6e3f921b 100644
---- a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
-+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
-@@ -12,6 +12,8 @@
- namespace Magento\Email\Block\Adminhtml\Template;
- 
- /**
-+ * Template Preview Block
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -80,7 +82,7 @@ class Preview extends \Magento\Backend\Block\Widget
-         $template->revertDesign();
- 
-         if ($template->isPlain()) {
--            $templateProcessed = "<pre>" . htmlspecialchars($templateProcessed) . "</pre>";
-+            $templateProcessed = "<pre>" . $this->escapeHtml($templateProcessed) . "</pre>";
-         }
- 
-         \Magento\Framework\Profiler::stop($this->profilerName);
-diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
-index 9f248f2cebc..eedcf5009cc 100644
---- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
-+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
-@@ -22,21 +22,21 @@ class Delete extends \Magento\Email\Controller\Adminhtml\Email\Template
-                 if (count($template->getSystemConfigPathsWhereCurrentlyUsed()) == 0) {
-                     $template->delete();
-                     // display success message
--                    $this->messageManager->addSuccess(__('You deleted the email template.'));
-+                    $this->messageManager->addSuccessMessage(__('You deleted the email template.'));
-                     $this->_objectManager->get(\Magento\Framework\App\ReinitableConfig::class)->reinit();
-                     // go to grid
-                     $this->_redirect('adminhtml/*/');
-                     return;
-                 }
-                 // display error  message
--                $this->messageManager->addError(__('The email template is currently being used.'));
-+                $this->messageManager->addErrorMessage(__('The email template is currently being used.'));
-                 // redirect to edit form
-                 $this->_redirect('adminhtml/*/edit', ['id' => $template->getId()]);
-                 return;
-             } catch (\Magento\Framework\Exception\LocalizedException $e) {
--                $this->messageManager->addError($e->getMessage());
-+                $this->messageManager->addErrorMessage($e->getMessage());
-             } catch (\Exception $e) {
--                $this->messageManager->addError(
-+                $this->messageManager->addErrorMessage(
-                     __('We can\'t delete email template data right now. Please review log and try again.')
-                 );
-                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-@@ -52,7 +52,7 @@ class Delete extends \Magento\Email\Controller\Adminhtml\Email\Template
-             }
-         }
-         // display error message
--        $this->messageManager->addError(__('We can\'t find an email template to delete.'));
-+        $this->messageManager->addErrorMessage(__('We can\'t find an email template to delete.'));
-         // go to grid
-         $this->_redirect('adminhtml/*/');
-     }
-diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php
-index 240b688402b..998cf62a83a 100644
---- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php
-+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Email\Controller\Adminhtml\Email\Template;
- 
--class Edit extends \Magento\Email\Controller\Adminhtml\Email\Template
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Edit extends \Magento\Email\Controller\Adminhtml\Email\Template implements HttpGetActionInterface
- {
-     /**
-      * Edit transactional email action
-diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php
-index 11b38ae8e50..013f97b9ad3 100644
---- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php
-+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Email\Controller\Adminhtml\Email\Template;
- 
--class Index extends \Magento\Email\Controller\Adminhtml\Email\Template
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Email\Controller\Adminhtml\Email\Template implements HttpGetActionInterface
- {
-     /**
-      * Index action
-diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php
-index f5024943e83..87f5470440d 100644
---- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php
-+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Email\Controller\Adminhtml\Email\Template;
- 
--class NewAction extends \Magento\Email\Controller\Adminhtml\Email\Template
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class NewAction extends \Magento\Email\Controller\Adminhtml\Email\Template implements HttpGetActionInterface
- {
-     /**
-      * New transactional email action
-diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php
-index e23cd6cf17e..404f97c9371 100644
---- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php
-+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php
-@@ -21,7 +21,9 @@ class Preview extends \Magento\Email\Controller\Adminhtml\Email\Template
-             $this->_view->renderLayout();
-             $this->getResponse()->setHeader('Content-Security-Policy', "script-src 'none'");
-         } catch (\Exception $e) {
--            $this->messageManager->addError(__('An error occurred. The email template can not be opened for preview.'));
-+            $this->messageManager->addErrorMessage(
-+                __('An error occurred. The email template can not be opened for preview.')
-+            );
-             $this->_redirect('adminhtml/*/');
-         }
-     }
-diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php
-index cf31259b788..135506f4068 100644
---- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php
-+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php
-@@ -22,7 +22,7 @@ class Save extends \Magento\Email\Controller\Adminhtml\Email\Template
- 
-         $template = $this->_initTemplate('id');
-         if (!$template->getId() && $id) {
--            $this->messageManager->addError(__('This email template no longer exists.'));
-+            $this->messageManager->addErrorMessage(__('This email template no longer exists.'));
-             $this->_redirect('adminhtml/*/');
-             return;
-         }
-@@ -55,7 +55,7 @@ class Save extends \Magento\Email\Controller\Adminhtml\Email\Template
- 
-             $template->save();
-             $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setFormData(false);
--            $this->messageManager->addSuccess(__('You saved the email template.'));
-+            $this->messageManager->addSuccessMessage(__('You saved the email template.'));
-             $this->_redirect('adminhtml/*');
-         } catch (\Exception $e) {
-             $this->_objectManager->get(
-@@ -64,7 +64,7 @@ class Save extends \Magento\Email\Controller\Adminhtml\Email\Template
-                 'email_template_form_data',
-                 $request->getParams()
-             );
--            $this->messageManager->addError($e->getMessage());
-+            $this->messageManager->addErrorMessage($e->getMessage());
-             $this->_forward('new');
-         }
-     }
-diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
-index a6ecdaf24eb..5eae1d14621 100644
---- a/app/code/Magento/Email/Model/AbstractTemplate.php
-+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
-@@ -14,10 +14,12 @@ use Magento\Framework\Model\AbstractModel;
- use Magento\Store\Model\Information as StoreInformation;
- use Magento\Store\Model\ScopeInterface;
- use Magento\Store\Model\Store;
-+use Magento\MediaStorage\Helper\File\Storage\Database;
- 
- /**
-- * Template model class
-+ * Template model class.
-  *
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @author      Magento Core Team <core@magentocommerce.com>
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.TooManyFields)
-@@ -163,6 +165,11 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
-      */
-     private $urlModel;
- 
-+    /**
-+     * @var Database
-+     */
-+    private $fileStorageDatabase;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\View\DesignInterface $design
-@@ -177,6 +184,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
-      * @param \Magento\Framework\Filter\FilterManager $filterManager
-      * @param \Magento\Framework\UrlInterface $urlModel
-      * @param array $data
-+     * @param Database $fileStorageDatabase
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -193,7 +201,8 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
-         \Magento\Email\Model\TemplateFactory $templateFactory,
-         \Magento\Framework\Filter\FilterManager $filterManager,
-         \Magento\Framework\UrlInterface $urlModel,
--        array $data = []
-+        array $data = [],
-+        Database $fileStorageDatabase = null
-     ) {
-         $this->design = $design;
-         $this->area = isset($data['area']) ? $data['area'] : null;
-@@ -207,6 +216,8 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
-         $this->templateFactory = $templateFactory;
-         $this->filterManager = $filterManager;
-         $this->urlModel = $urlModel;
-+        $this->fileStorageDatabase = $fileStorageDatabase ?:
-+            \Magento\Framework\App\ObjectManager::getInstance()->get(Database::class);
-         parent::__construct($context, $registry, null, null, $data);
-     }
- 
-@@ -394,6 +405,11 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
-         if ($fileName) {
-             $uploadDir = \Magento\Email\Model\Design\Backend\Logo::UPLOAD_DIR;
-             $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
-+            if ($this->fileStorageDatabase->checkDbUsage() &&
-+                !$mediaDirectory->isFile($uploadDir . '/' . $fileName)
-+            ) {
-+                $this->fileStorageDatabase->saveFileToFilesystem($uploadDir . '/' . $fileName);
-+            }
-             if ($mediaDirectory->isFile($uploadDir . '/' . $fileName)) {
-                 return $this->storeManager->getStore()->getBaseUrl(
-                     \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
-@@ -490,7 +506,6 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
- 
-     /**
-      * Apply design config so that emails are processed within the context of the appropriate area/store/theme.
--     * Can be called multiple times without issue.
-      *
-      * @return bool
-      */
-@@ -664,8 +679,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
-     }
- 
-     /**
--     * Save current design config and replace with design config from specified store
--     * Event is not dispatched.
-+     * Save current design config and replace with design config from specified store. Event is not dispatched.
-      *
-      * @param null|bool|int|string $storeId
-      * @param string $area
-diff --git a/app/code/Magento/Email/Model/Template.php b/app/code/Magento/Email/Model/Template.php
-index 8724b725ae4..ef2c4341daf 100644
---- a/app/code/Magento/Email/Model/Template.php
-+++ b/app/code/Magento/Email/Model/Template.php
-@@ -326,7 +326,7 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
-                 $optionArray[] = ['value' => '{{' . $value . '}}', 'label' => __('%1', $label)];
-             }
-             if ($withGroup) {
--                $optionArray = ['label' => __('Template Variables'), 'value' => $optionArray];
-+                $optionArray = [['label' => __('Template Variables'), 'value' => $optionArray]];
-             }
-         }
-         return $optionArray;
-@@ -418,6 +418,8 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
-     }
- 
-     /**
-+     *  Return filter factory.
-+     *
-      * @return \Magento\Email\Model\Template\FilterFactory
-      */
-     protected function getFilterFactory()
-diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
-index 1d8218f90a0..aa018d6fd44 100644
---- a/app/code/Magento/Email/Model/Template/Filter.php
-+++ b/app/code/Magento/Email/Model/Template/Filter.php
-@@ -321,6 +321,8 @@ class Filter extends \Magento\Framework\Filter\Template
-     }
- 
-     /**
-+     * Retrieve CSS processor
-+     *
-      * @deprecated 100.1.2
-      * @return Css\Processor
-      */
-@@ -333,6 +335,8 @@ class Filter extends \Magento\Framework\Filter\Template
-     }
- 
-     /**
-+     * Retrieve pub directory
-+     *
-      * @deprecated 100.1.2
-      * @param string $dirType
-      * @return ReadInterface
-@@ -516,6 +520,7 @@ class Filter extends \Magento\Framework\Filter\Template
-      */
-     public function mediaDirective($construction)
-     {
-+        // phpcs:disable Magento2.Functions.DiscouragedFunction
-         $params = $this->getParameters(html_entity_decode($construction[2], ENT_QUOTES));
-         return $this->_storeManager->getStore()
-             ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
-@@ -523,6 +528,7 @@ class Filter extends \Magento\Framework\Filter\Template
- 
-     /**
-      * Retrieve store URL directive
-+     *
-      * Support url and direct_url properties
-      *
-      * @param string[] $construction
-@@ -607,7 +613,7 @@ class Filter extends \Magento\Framework\Filter\Template
-         if (preg_match(self::TRANS_DIRECTIVE_REGEX, $value, $matches) !== 1) {
-             return ['', []];  // malformed directive body; return without breaking list
-         }
--
-+        // phpcs:disable Magento2.Functions.DiscouragedFunction
-         $text = stripslashes($matches[2]);
- 
-         $params = [];
-@@ -683,7 +689,7 @@ class Filter extends \Magento\Framework\Filter\Template
-                     $callback = $modifier;
-                 }
-                 array_unshift($params, $value);
--                $value = call_user_func_array($callback, $params);
-+                $value = $callback(...$params);
-             }
-         }
-         return $value;
-@@ -700,7 +706,7 @@ class Filter extends \Magento\Framework\Filter\Template
-     {
-         switch ($type) {
-             case 'html':
--                return htmlspecialchars($value, ENT_QUOTES);
-+                return $this->_escaper->escapeHtml($value);
- 
-             case 'htmlentities':
-                 return htmlentities($value, ENT_QUOTES);
-@@ -950,6 +956,7 @@ class Filter extends \Magento\Framework\Filter\Template
-             }
-         } catch (ContentProcessorException $exception) {
-             $css = $exception->getMessage();
-+            // phpcs:disable Magento2.Exceptions.ThrowCatch
-         } catch (\Magento\Framework\View\Asset\File\NotFoundException $exception) {
-             $css = '';
-         }
-@@ -958,6 +965,8 @@ class Filter extends \Magento\Framework\Filter\Template
-     }
- 
-     /**
-+     * Apply Inline CSS
-+     *
-      * Merge HTML and CSS and return HTML that has CSS styles applied "inline" to the HTML tags. This is necessary
-      * in order to support all email clients.
-      *
-diff --git a/app/code/Magento/Email/Model/Transport.php b/app/code/Magento/Email/Model/Transport.php
-index 5a4d64e6d6c..90a4e6571c9 100644
---- a/app/code/Magento/Email/Model/Transport.php
-+++ b/app/code/Magento/Email/Model/Transport.php
-@@ -31,6 +31,23 @@ class Transport implements TransportInterface
-      */
-     const XML_PATH_SENDING_RETURN_PATH_EMAIL = 'system/smtp/return_path_email';
- 
-+    /**
-+     * Whether return path should be set or no.
-+     *
-+     * Possible values are:
-+     * 0 - no
-+     * 1 - yes (set value as FROM address)
-+     * 2 - use custom value
-+     *
-+     * @var int
-+     */
-+    private $isSetReturnPath;
-+
-+    /**
-+     * @var string|null
-+     */
-+    private $returnPathValue;
-+
-     /**
-      * @var Sendmail
-      */
-@@ -51,25 +68,15 @@ class Transport implements TransportInterface
-         ScopeConfigInterface $scopeConfig,
-         $parameters = null
-     ) {
--        /* configuration of whether return path should be set or no. Possible values are:
--             * 0 - no
--             * 1 - yes (set value as FROM address)
--             * 2 - use custom value
--             * @see Magento\Config\Model\Config\Source\Yesnocustom
--             */
--        $isSetReturnPath = $scopeConfig->getValue(
-+        $this->isSetReturnPath = (int) $scopeConfig->getValue(
-             self::XML_PATH_SENDING_SET_RETURN_PATH,
-             ScopeInterface::SCOPE_STORE
-         );
--        $returnPathValue = $scopeConfig->getValue(
-+        $this->returnPathValue = $scopeConfig->getValue(
-             self::XML_PATH_SENDING_RETURN_PATH_EMAIL,
-             ScopeInterface::SCOPE_STORE
-         );
- 
--        if ($isSetReturnPath == '2' && $returnPathValue !== null) {
--            $parameters .= ' -f' . \escapeshellarg($returnPathValue);
--        }
--
-         $this->zendTransport = new Sendmail($parameters);
-         $this->message = $message;
-     }
-@@ -80,9 +87,16 @@ class Transport implements TransportInterface
-     public function sendMessage()
-     {
-         try {
--            $this->zendTransport->send(
--                Message::fromString($this->message->getRawMessage())
--            );
-+            $zendMessage = Message::fromString($this->message->getRawMessage())->setEncoding('utf-8');
-+            if (2 === $this->isSetReturnPath && $this->returnPathValue) {
-+                $zendMessage->setSender($this->returnPathValue);
-+            } elseif (1 === $this->isSetReturnPath && $zendMessage->getFrom()->count()) {
-+                $fromAddressList = $zendMessage->getFrom();
-+                $fromAddressList->rewind();
-+                $zendMessage->setSender($fromAddressList->current()->getEmail());
-+            }
-+
-+            $this->zendTransport->send($zendMessage);
-         } catch (\Exception $e) {
-             throw new MailException(new Phrase($e->getMessage()), $e);
-         }
-diff --git a/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml b/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml
-new file mode 100644
-index 00000000000..d299acd28fc
---- /dev/null
-+++ b/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml
-@@ -0,0 +1,39 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+
-+    <!--Create New Template -->
-+    <actionGroup name="CreateNewTemplate">
-+        <!--Click "Add New Template" button-->
-+        <click stepKey="clickAddNewTemplateButton" selector="{{EmailTemplatesSection.addNewTemplateButton}}"/>
-+        <waitForPageLoad stepKey="waitForNewEmailTemplatesPageLoaded"/>
-+        <!--Select value for "Template" drop-down menu in "Load default template" tab-->
-+        <selectOption selector="{{EmailTemplatesSection.templateDropDown}}" stepKey="selectValueFromTemplateDropDown" userInput="Registry Update"/>
-+
-+        <!--Fill in required fields in "Template Information" tab and click "Save Template" button-->
-+        <click stepKey="clickLoadTemplateButton" selector="{{EmailTemplatesSection.loadTemplateButton}}" after="selectValueFromTemplateDropDown"/>
-+        <fillField stepKey="fillTemplateNameField" selector="{{EmailTemplatesSection.templateNameField}}" userInput="{{EmailTemplate.templateName}}" after="clickLoadTemplateButton"/>
-+        <waitForLoadingMaskToDisappear stepKey="wait1"/>
-+        <click stepKey="clickSaveTemplateButton" selector="{{EmailTemplatesSection.saveTemplateButton}}"/>
-+        <waitForPageLoad stepKey="waitForNewTemplateCreated"/>
-+    </actionGroup>
-+
-+    <!--Delete created Template-->
-+    <actionGroup name="DeleteCreatedTemplate">
-+        <switchToPreviousTab stepKey="switchToPreviousTab"/>
-+        <seeInCurrentUrl stepKey="seeCreatedTemplateUrl" url="email_template/edit/id"/>
-+        <click stepKey="clickDeleteTemplateButton" selector="{{EmailTemplatesSection.deleteTemplateButton}}"/>
-+        <acceptPopup stepKey="acceptDeletingTemplatePopUp"/>
-+        <see stepKey="SeeSuccessfulMessage" userInput="You deleted the email template."/>
-+        <click stepKey="clickResetFilterButton" selector="{{EmailTemplatesSection.resetFilterButton}}"/>
-+        <waitForElementNotVisible selector="{{MarketingEmailTemplateSection.clearSearchTemplate(EmailTemplate.templateName)}}" stepKey="waitForSearchFieldCleared"/>
-+    </actionGroup>
-+
-+</actionGroups>
-diff --git a/app/code/Magento/Email/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Email/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..5086d74efa6
---- /dev/null
-+++ b/app/code/Magento/Email/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuMarketingCommunicationsEmailTemplates">
-+        <data key="pageTitle">Email Templates</data>
-+        <data key="title">Email Templates</data>
-+        <data key="dataUiId">magento-email-template</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.xml b/app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.xml
-new file mode 100644
-index 00000000000..04e59724483
---- /dev/null
-+++ b/app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="EmailTemplate" type="template">
-+        <data key="templateName" unique="suffix">Template</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Email/Test/Mftf/Page/AdminEmailTemplatePage.xml b/app/code/Magento/Email/Test/Mftf/Page/AdminEmailTemplatePage.xml
-new file mode 100644
-index 00000000000..9636986dda8
---- /dev/null
-+++ b/app/code/Magento/Email/Test/Mftf/Page/AdminEmailTemplatePage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:/Page/etc/PageObject.xsd">
-+    <page name="AdminEmailTemplatePage" url="/admin/email_template/" area="admin" module="Email">
-+        <section name="AdminEmailTemplatePageActionSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Email/Test/Mftf/Section/EmailTemplateSection.xml b/app/code/Magento/Email/Test/Mftf/Section/EmailTemplateSection.xml
-new file mode 100644
-index 00000000000..4e877bd2423
---- /dev/null
-+++ b/app/code/Magento/Email/Test/Mftf/Section/EmailTemplateSection.xml
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+
-+    <section name="MarketingEmailTemplateSection">
-+        <element name="searchTemplateField" type="input" selector="#systemEmailTemplateGrid_filter_code"/>
-+        <element name="searchButton" type="button" selector="//*[@title='Search' and @class='action-default scalable action-secondary']"/>
-+        <element name="createdTemplate" type="button" selector="//*[normalize-space() ='{{arg}}']" parameterized="true"/>
-+        <element name="clearSearchTemplate" type="input" selector="//*[@id='systemEmailTemplateGrid_filter_code' and @value='{{arg2}}']" parameterized="true"/>
-+    </section>
-+
-+    <section name="EmailTemplatesSection">
-+        <element name="addNewTemplateButton" type="button" selector="#add"/>
-+        <element name="templateDropDown" type="select" selector="#template_select"/>
-+        <element name="loadTemplateButton" type="button" selector="#load"/>
-+        <element name="templateNameField" type="input" selector="#template_code"/>
-+        <element name="saveTemplateButton" type="button" selector="#save"/>
-+        <element name="previewTemplateButton" type="button" selector="#preview"/>
-+        <element name="deleteTemplateButton" type="button" selector="#delete"/>
-+        <element name="resetFilterButton" type="button" selector="//span[contains(text(),'Reset Filter')]"/>
-+    </section>
-+
-+</sections>
-diff --git a/app/code/Magento/Email/Test/Mftf/Test/AdminMarketingEmailTemplatesNavigateMenuTest.xml b/app/code/Magento/Email/Test/Mftf/Test/AdminMarketingEmailTemplatesNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..d512fc263ef
---- /dev/null
-+++ b/app/code/Magento/Email/Test/Mftf/Test/AdminMarketingEmailTemplatesNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminMarketingEmailTemplatesNavigateMenuTest">
-+        <annotations>
-+            <features value="Email"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin marketing email templates navigate menu test"/>
-+            <description value="Admin should be able to navigate to Marketing > Email Templates"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14173"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingEmailTemplatesPage">
-+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuMarketingCommunicationsEmailTemplates.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuMarketingCommunicationsEmailTemplates.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Email/Test/Mftf/Test/TransactionalEmailsLogoUploadTest.xml b/app/code/Magento/Email/Test/Mftf/Test/TransactionalEmailsLogoUploadTest.xml
-new file mode 100644
-index 00000000000..c3870417fa5
---- /dev/null
-+++ b/app/code/Magento/Email/Test/Mftf/Test/TransactionalEmailsLogoUploadTest.xml
-@@ -0,0 +1,40 @@
-+<?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="TransactionalEmailsLogoUploadTest">
-+        <annotations>
-+            <features value="Email"/>
-+            <stories value="Email"/>
-+            <title value="MC-13908: Uploading a Transactional Emails logo"/>
-+            <description value="Transactional Emails Logo should be able to be uploaded in the admin and previewed"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13908"/>
-+            <group value="LogoUpload"/>
-+        </annotations>
-+        <!--Login to Admin Area-->
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
-+        </before>
-+        <!--Logout from Admin Area-->
-+        <after>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-+        </after>
-+        <!--Navigate to content->Design->Config page-->
-+        <amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage" />
-+        <waitForPageLoad stepKey="waitForPageloadToViewDesignConfigPage"/>
-+        <click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView"/>
-+        <waitForPageLoad stepKey="waitForPageLoadToOpenStoreViewEditPage"/>
-+        <!--Click Upload logo in Transactional Emails and upload the image and preview it-->
-+        <click selector="{{AdminDesignConfigSection.logoWrapperOpen}}" stepKey="openTab" />
-+        <attachFile selector="{{AdminDesignConfigSection.logoUpload}}" userInput="{{MagentoLogo.file}}" stepKey="attachLogo"/>
-+        <wait time="5" stepKey="waitingForLogoToUpload" />
-+        <seeElement selector="{{AdminDesignConfigSection.logoPreview}}" stepKey="LogoPreviewIsVisible"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
-index b9a555c3207..1a493e23adb 100644
---- a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
-+++ b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
-@@ -18,7 +18,15 @@ class SenderTest extends \PHPUnit\Framework\TestCase
-     protected function setUp()
-     {
-         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--        $this->sender = $objectManager->getObject(\Magento\Email\Block\Adminhtml\Template\Grid\Renderer\Sender::class);
-+        $escaper = $objectManager->getObject(
-+            \Magento\Framework\Escaper::class
-+        );
-+        $this->sender = $objectManager->getObject(
-+            \Magento\Email\Block\Adminhtml\Template\Grid\Renderer\Sender::class,
-+            [
-+                'escaper' => $escaper
-+            ]
-+        );
-     }
- 
-     /**
-diff --git a/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php
-index 31a04b0b2bb..1ceccd4414c 100644
---- a/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php
-+++ b/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php
-@@ -12,6 +12,9 @@ namespace Magento\Email\Test\Unit\Model;
- use Magento\Email\Model\BackendTemplate;
- use Magento\Framework\ObjectManagerInterface;
- 
-+/**
-+ * Tests for  adminhtml email template model.
-+ */
- class BackendTemplateTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -46,6 +49,11 @@ class BackendTemplateTest extends \PHPUnit\Framework\TestCase
-      */
-     private $serializerMock;
- 
-+    /**
-+     * @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $databaseHelperMock;
-+
-     protected function setUp()
-     {
-         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-@@ -56,6 +64,7 @@ class BackendTemplateTest extends \PHPUnit\Framework\TestCase
-         $this->structureMock = $this->createMock(\Magento\Config\Model\Config\Structure::class);
-         $this->structureMock->expects($this->any())->method('getFieldPathsByAttribute')->willReturn(['path' => 'test']);
- 
-+        $this->databaseHelperMock = $this->createMock(\Magento\MediaStorage\Helper\File\Storage\Database::class);
-         $this->resourceModelMock = $this->createMock(\Magento\Email\Model\ResourceModel\Template::class);
-         $this->resourceModelMock->expects($this->any())
-             ->method('getSystemConfigByPathsAndTemplateId')
-@@ -64,8 +73,18 @@ class BackendTemplateTest extends \PHPUnit\Framework\TestCase
-         $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-         $objectManagerMock->expects($this->any())
-             ->method('get')
--            ->with(\Magento\Email\Model\ResourceModel\Template::class)
--            ->will($this->returnValue($this->resourceModelMock));
-+            ->willReturnCallback(
-+                function ($value) {
-+                    switch ($value) {
-+                        case \Magento\MediaStorage\Helper\File\Storage\Database::class:
-+                            return ($this->databaseHelperMock);
-+                        case \Magento\Email\Model\ResourceModel\Template::class:
-+                            return ($this->resourceModelMock);
-+                        default:
-+                            return(null);
-+                    }
-+                }
-+            );
- 
-         \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
- 
-diff --git a/app/code/Magento/Email/Test/Unit/Model/Plugin/WindowsSmtpConfigTest.php b/app/code/Magento/Email/Test/Unit/Model/Plugin/WindowsSmtpConfigTest.php
-new file mode 100644
-index 00000000000..5f7c44b988c
---- /dev/null
-+++ b/app/code/Magento/Email/Test/Unit/Model/Plugin/WindowsSmtpConfigTest.php
-@@ -0,0 +1,100 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Email\Test\Unit\Model\Plugin;
-+
-+use Magento\Email\Model\Plugin\WindowsSmtpConfig;
-+use Magento\Framework\App\Config\ReinitableConfigInterface;
-+use Magento\Framework\Mail\TransportInterface;
-+use Magento\Framework\OsInfo;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+
-+/**
-+ *  WindowsSmtpConfigTest
-+ */
-+class WindowsSmtpConfigTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var WindowsSmtpConfig
-+     */
-+    private $windowsSmtpConfig;
-+
-+    /**
-+     * @var OsInfo|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $osInfoMock;
-+
-+    /**
-+     * @var ReinitableConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $configMock;
-+
-+    /**
-+     * @var TransportInterface
-+     */
-+    private $transportMock;
-+
-+    /**
-+     * setUp
-+     *
-+     * @return void
-+     */
-+    public function setUp(): void
-+    {
-+        $objectManager = new ObjectManager($this);
-+
-+        $this->osInfoMock = $this->createMock(OsInfo::class);
-+        $this->configMock = $this->createMock(ReinitableConfigInterface::class);
-+        $this->transportMock = $this->createMock(TransportInterface::class);
-+
-+        $this->windowsSmtpConfig = $objectManager->getObject(
-+            WindowsSmtpConfig::class,
-+            [
-+                'config' => $this->configMock,
-+                'osInfo' => $this->osInfoMock
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test if SMTP settings if windows server
-+     *
-+     * @return void
-+     */
-+    public function testBeforeSendMessageOsWindows(): void
-+    {
-+        $this->osInfoMock->expects($this->once())
-+            ->method('isWindows')
-+            ->willReturn(true);
-+
-+        $this->configMock->expects($this->exactly(2))
-+            ->method('getValue')
-+            ->willReturnMap([
-+                [WindowsSmtpConfig::XML_SMTP_HOST, '127.0.0.1'],
-+                [WindowsSmtpConfig::XML_SMTP_PORT, '80']
-+            ]);
-+
-+        $this->windowsSmtpConfig->beforeSendMessage($this->transportMock);
-+    }
-+
-+    /**
-+     * Test if SMTP settings if not windows server
-+     *
-+     * @return void
-+     */
-+    public function testBeforeSendMessageOsIsWindows(): void
-+    {
-+        $this->osInfoMock->expects($this->once())
-+            ->method('isWindows')
-+            ->willReturn(false);
-+
-+        $this->configMock->expects($this->never())
-+            ->method('getValue');
-+
-+        $this->windowsSmtpConfig->beforeSendMessage($this->transportMock);
-+    }
-+}
-diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
-index b5b2cb095a4..2c9fdae111f 100644
---- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
-+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
-@@ -104,9 +104,7 @@ class FilterTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->escaper = $this->getMockBuilder(\Magento\Framework\Escaper::class)
--            ->disableOriginalConstructor()
--            ->getMock();
-+        $this->escaper = $this->objectManager->getObject(\Magento\Framework\Escaper::class);
- 
-         $this->assetRepo = $this->getMockBuilder(\Magento\Framework\View\Asset\Repository::class)
-             ->disableOriginalConstructor()
-@@ -158,23 +156,25 @@ class FilterTest extends \PHPUnit\Framework\TestCase
-     protected function getModel($mockedMethods = null)
-     {
-         return $this->getMockBuilder(\Magento\Email\Model\Template\Filter::class)
--            ->setConstructorArgs([
--                $this->string,
--                $this->logger,
--                $this->escaper,
--                $this->assetRepo,
--                $this->scopeConfig,
--                $this->coreVariableFactory,
--                $this->storeManager,
--                $this->layout,
--                $this->layoutFactory,
--                $this->appState,
--                $this->backendUrlBuilder,
--                $this->emogrifier,
--                $this->configVariables,
--                [],
--                $this->cssInliner,
--            ])
-+            ->setConstructorArgs(
-+                [
-+                    $this->string,
-+                    $this->logger,
-+                    $this->escaper,
-+                    $this->assetRepo,
-+                    $this->scopeConfig,
-+                    $this->coreVariableFactory,
-+                    $this->storeManager,
-+                    $this->layout,
-+                    $this->layoutFactory,
-+                    $this->appState,
-+                    $this->backendUrlBuilder,
-+                    $this->emogrifier,
-+                    $this->configVariables,
-+                    [],
-+                    $this->cssInliner,
-+                ]
-+            )
-             ->setMethods($mockedMethods)
-             ->getMock();
-     }
-diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/SenderResolverTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/SenderResolverTest.php
-new file mode 100644
-index 00000000000..fb25290f9d2
---- /dev/null
-+++ b/app/code/Magento/Email/Test/Unit/Model/Template/SenderResolverTest.php
-@@ -0,0 +1,112 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Email\Test\Unit\Model\Template;
-+
-+use Magento\Email\Model\Template\SenderResolver;
-+use Magento\Framework\Exception\MailException;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+/**
-+ *  SenderResolverTest
-+ */
-+class SenderResolverTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var SenderResolver
-+     */
-+    private $senderResolver;
-+
-+    /**
-+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @return void
-+     */
-+    public function setUp(): void
-+    {
-+        $objectManager = new ObjectManager($this);
-+
-+        $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
-+
-+        $this->senderResolver = $objectManager->getObject(
-+            SenderResolver::class,
-+            [
-+                'scopeConfig' => $this->scopeConfig
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test returned information for given sender's name and email
-+     *
-+     * @return void
-+     */
-+    public function testResolve(): void
-+    {
-+        $sender = 'general';
-+        $scopeId = null;
-+
-+        $this->scopeConfig->expects($this->exactly(2))
-+            ->method('getValue')
-+            ->willReturnMap([
-+               [
-+                   'trans_email/ident_' . $sender . '/name',
-+                   \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+                   $scopeId,
-+                   'Test Name'
-+               ],
-+               [
-+                   'trans_email/ident_' . $sender . '/email',
-+                   \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+                   $scopeId,
-+                   'test@email.com'
-+               ]
-+            ]);
-+
-+        $result = $this->senderResolver->resolve($sender);
-+
-+        $this->assertTrue(isset($result['name']));
-+        $this->assertEquals('Test Name', $result['name']);
-+
-+        $this->assertTrue(isset($result['email']));
-+        $this->assertEquals('test@email.com', $result['email']);
-+    }
-+
-+    /**
-+     * Test if exception is thrown in case there is no name or email in result
-+     *
-+     * @dataProvider dataProvidedSenderArray
-+     * @param array $sender
-+     *
-+     * @return void
-+     */
-+    public function testResolveThrowException(array $sender): void
-+    {
-+        $this->expectExceptionMessage('Invalid sender data');
-+        $this->expectException(MailException::class);
-+        $this->senderResolver->resolve($sender);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProvidedSenderArray()
-+    {
-+        return [
-+            [
-+                ['name' => 'Name']
-+            ],
-+            [
-+                ['email' => 'test@email.com']
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
-index 5464ca51cbe..9599cd1fef4 100644
---- a/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
-+++ b/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
-@@ -5,21 +5,37 @@
-  */
- namespace Magento\Email\Test\Unit\Model;
- 
-+use Magento\Email\Model\Template;
-+use Magento\Email\Model\Template\Config;
-+use Magento\Email\Model\Template\FilterFactory;
-+use Magento\Email\Model\TemplateFactory;
- use Magento\Framework\App\Area;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\App\TemplateTypesInterface;
-+use Magento\Framework\Filesystem;
-+use Magento\Framework\Filter\FilterManager;
-+use Magento\Framework\Model\Context;
-+use Magento\Framework\Registry;
-+use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Framework\Url;
-+use Magento\Framework\View\Asset\Repository;
- use Magento\Setup\Module\I18n\Locale;
-+use Magento\Store\Model\App\Emulation;
- use Magento\Store\Model\ScopeInterface;
-+use Magento\Store\Model\StoreManager;
-+use Magento\Theme\Model\View\Design;
-+use PHPUnit\Framework\TestCase;
- 
- /**
-  * Covers \Magento\Email\Model\Template
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class TemplateTest extends \PHPUnit\Framework\TestCase
-+class TemplateTest extends TestCase
- {
-     /**
--     * @var \Magento\Framework\Model\Context|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $context;
- 
-@@ -29,13 +45,13 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-     private $design;
- 
-     /**
--     * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Registry|\PHPUnit_Framework_MockObject_MockObject
-      * @deprecated since 2.3.0 in favor of stateful global objects elimination.
-      */
-     private $registry;
- 
-     /**
--     * @var \Magento\Store\Model\App\Emulation|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Emulation|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $appEmulation;
- 
-@@ -45,53 +61,53 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-     private $storeManager;
- 
-     /**
--     * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Filesystem|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $filesystem;
- 
-     /**
--     * @var \Magento\Framework\View\Asset\Repository|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Repository|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $assetRepo;
- 
-     /**
--     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $scopeConfig;
- 
-     /**
--     * @var \Magento\Email\Model\Template\FilterFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var FilterFactory|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $filterFactory;
- 
-     /**
--     * @var \Magento\Framework\Filter\FilterManager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var FilterManager|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $filterManager;
- 
-     /**
--     * @var \Magento\Framework\Url|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Url|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $urlModel;
- 
-     /**
--     * @var \Magento\Email\Model\Template\Config|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $emailConfig;
- 
-     /**
--     * @var \Magento\Email\Model\TemplateFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var TemplateFactory|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $templateFactory;
- 
-     /**
--     * @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Json|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $serializerMock;
- 
-     protected function setUp()
-     {
--        $this->context = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
-+        $this->context = $this->getMockBuilder(Context::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-@@ -99,11 +115,11 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->registry = $this->getMockBuilder(\Magento\Framework\Registry::class)
-+        $this->registry = $this->getMockBuilder(Registry::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->appEmulation = $this->getMockBuilder(\Magento\Store\Model\App\Emulation::class)
-+        $this->appEmulation = $this->getMockBuilder(Emulation::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-@@ -111,51 +127,51 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->assetRepo = $this->getMockBuilder(\Magento\Framework\View\Asset\Repository::class)
-+        $this->assetRepo = $this->getMockBuilder(Repository::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->filesystem = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
-+        $this->filesystem = $this->getMockBuilder(Filesystem::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
-+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->emailConfig = $this->getMockBuilder(\Magento\Email\Model\Template\Config::class)
-+        $this->emailConfig = $this->getMockBuilder(Config::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->templateFactory = $this->getMockBuilder(\Magento\Email\Model\TemplateFactory::class)
-+        $this->templateFactory = $this->getMockBuilder(TemplateFactory::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->filterManager = $this->getMockBuilder(\Magento\Framework\Filter\FilterManager::class)
-+        $this->filterManager = $this->getMockBuilder(FilterManager::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->urlModel = $this->getMockBuilder(\Magento\Framework\Url::class)
-+        $this->urlModel = $this->getMockBuilder(Url::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->filterFactory = $this->getMockBuilder(\Magento\Email\Model\Template\FilterFactory::class)
-+        $this->filterFactory = $this->getMockBuilder(FilterFactory::class)
-             ->setMethods(['create'])
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->serializerMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)->getMock();
-+        $this->serializerMock = $this->getMockBuilder(Json::class)->getMock();
-     }
- 
-     /**
-      * Return the model under test with additional methods mocked.
-      *
-      * @param array $mockedMethods
--     * @return \Magento\Email\Model\Template|\PHPUnit_Framework_MockObject_MockObject
-+     * @return Template|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected function getModelMock(array $mockedMethods = [])
-     {
--        return $this->getMockBuilder(\Magento\Email\Model\Template::class)
-+        return $this->getMockBuilder(Template::class)
-             ->setMethods(array_merge($mockedMethods, ['__wakeup', '__sleep', '_init']))
-             ->setConstructorArgs([
-                 $this->context,
-@@ -210,7 +226,7 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-             ->method('setStoreId')
-             ->will($this->returnSelf());
-         $this->filterFactory->method('create')
--            ->will($this->returnValue($filterTemplate));
-+            ->willReturn($filterTemplate);
-         $designConfig = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-             ->setMethods(['getStore'])
-             ->disableOriginalConstructor()
-@@ -219,7 +235,7 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-         $model = $this->getModelMock(['getUseAbsoluteLinks', 'getDesignConfig']);
-         $model->expects($this->once())
-             ->method('getDesignConfig')
--            ->will($this->returnValue($designConfig));
-+            ->willReturn($designConfig);
- 
-         $this->assertSame($filterTemplate, $model->getTemplateFilter());
-     }
-@@ -253,7 +269,7 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
- 
-         $model->expects($this->once())
-             ->method('getDesignParams')
--            ->will($this->returnValue($designParams));
-+            ->willReturn($designParams);
- 
-         $templateId = 'templateId';
- 
-@@ -261,11 +277,11 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-         $this->emailConfig->expects($this->once())
-             ->method('getTemplateFilename')
-             ->with($templateId)
--            ->will($this->returnValue($templateFile));
-+            ->willReturn($templateFile);
-         $this->emailConfig->expects($this->once())
-             ->method('getTemplateType')
-             ->with($templateId)
--            ->will($this->returnValue($templateType));
-+            ->willReturn($templateType);
- 
-         $modulesDir = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\ReadInterface::class)
-             ->setMethods(['readFile', 'getRelativePath'])
-@@ -275,15 +291,15 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-         $modulesDir->expects($this->once())
-             ->method('getRelativePath')
-             ->with($templateFile)
--            ->will($this->returnValue($relativePath));
-+            ->willReturn($relativePath);
-         $modulesDir->expects($this->once())
-             ->method('readFile')
--            ->will($this->returnValue($templateText));
-+            ->willReturn($templateText);
- 
-         $this->filesystem->expects($this->once())
-             ->method('getDirectoryRead')
-             ->with(DirectoryList::ROOT)
--            ->will($this->returnValue($modulesDir));
-+            ->willReturn($modulesDir);
- 
-         $model->loadDefault($templateId);
- 
-@@ -382,10 +398,10 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-         $storeId = 'storeId';
-         $designConfig->expects($this->once())
-             ->method('getStore')
--            ->will($this->returnValue($storeId));
-+            ->willReturn($storeId);
-         $model->expects($this->once())
-             ->method('getDesignConfig')
--            ->will($this->returnValue($designConfig));
-+            ->willReturn($designConfig);
- 
-         if ($loadFromDatabase) {
-             $templateId = '1';
-@@ -404,7 +420,7 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-         $this->scopeConfig->expects($this->once())
-             ->method('getValue')
-             ->with($configPath, ScopeInterface::SCOPE_STORE, $storeId)
--            ->will($this->returnValue($templateId));
-+            ->willReturn($templateId);
- 
-         $model->loadByConfigPath($configPath);
-     }
-@@ -447,13 +463,13 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-         $model = $this->getModelMock(['getSenderName', 'getSenderEmail', 'getTemplateSubject']);
-         $model->expects($this->any())
-             ->method('getSenderName')
--            ->will($this->returnValue($senderName));
-+            ->willReturn($senderName);
-         $model->expects($this->any())
-             ->method('getSenderEmail')
--            ->will($this->returnValue($senderEmail));
-+            ->willReturn($senderEmail);
-         $model->expects($this->any())
-             ->method('getTemplateSubject')
--            ->will($this->returnValue($templateSubject));
-+            ->willReturn($templateSubject);
-         $this->assertEquals($expectedValue, $model->isValidForSend());
-     }
- 
-@@ -503,7 +519,7 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-             ->getMock();
-         $model->expects($this->once())
-             ->method('getTemplateFilter')
--            ->will($this->returnValue($filterTemplate));
-+            ->willReturn($filterTemplate);
- 
-         $model->expects($this->once())
-             ->method('applyDesignConfig');
-@@ -515,10 +531,10 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-         $storeId = 'storeId';
-         $designConfig->expects($this->once())
-             ->method('getStore')
--            ->will($this->returnValue($storeId));
-+            ->willReturn($storeId);
-         $model->expects($this->once())
-             ->method('getDesignConfig')
--            ->will($this->returnValue($designConfig));
-+            ->willReturn($designConfig);
- 
-         $filterTemplate->expects($this->once())
-             ->method('setStoreId')
-@@ -528,7 +544,7 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-         $filterTemplate->expects($this->once())
-             ->method('filter')
-             ->with($templateSubject)
--            ->will($this->returnValue($expectedResult));
-+            ->willReturn($expectedResult);
- 
-         $variables = [ 'key' => 'value' ];
-         $filterTemplate->expects($this->once())
-@@ -595,19 +611,21 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-                 'templateVariables' => '{"store url=\"\"":"Store Url","var logo_url":"Email Logo Image Url",'
-                 . '"var customer.name":"Customer Name"}',
-                 'expectedResult' => [
--                    'label' => __('Template Variables'),
--                    'value' => [
--                        [
--                            'value' => '{{store url=""}}',
--                            'label' => __('%1', 'Store Url'),
--                        ],
--                        [
--                            'value' => '{{var logo_url}}',
--                            'label' => __('%1', 'Email Logo Image Url'),
--                        ],
--                        [
--                            'value' => '{{var customer.name}}',
--                            'label' => __('%1', 'Customer Name'),
-+                    [
-+                        'label' => __('Template Variables'),
-+                        'value' => [
-+                            [
-+                                'value' => '{{store url=""}}',
-+                                'label' => __('%1', 'Store Url'),
-+                            ],
-+                            [
-+                                'value' => '{{var logo_url}}',
-+                                'label' => __('%1', 'Email Logo Image Url'),
-+                            ],
-+                            [
-+                                'value' => '{{var customer.name}}',
-+                                'label' => __('%1', 'Customer Name'),
-+                            ],
-                         ],
-                     ],
-                 ],
-@@ -642,17 +660,17 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
- 
-         $model->expects($this->once())
-             ->method('applyDesignConfig')
--            ->will($this->returnValue(true));
-+            ->willReturn(true);
-         $model->expects($this->once())
-             ->method('cancelDesignConfig')
--            ->will($this->returnValue(true));
-+            ->willReturn(true);
- 
-         $vars = [ 'key' => 'value' ];
-         $model->setVars($vars);
-         $model->expects($this->once())
-             ->method('getProcessedTemplate')
-             ->with($vars)
--            ->will($this->returnValue($expectedResult));
-+            ->willReturn($expectedResult);
- 
-         $this->assertEquals($expectedResult, $model->processTemplate());
-         $this->assertTrue($model->getUseAbsoluteLinks());
-@@ -686,11 +704,11 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-         ]);
-         $model->expects($this->once())
-             ->method('loadDefault')
--            ->will($this->returnValue(true));
-+            ->willReturn(true);
- 
-         $model->expects($this->once())
-             ->method('applyDesignConfig')
--            ->will($this->returnValue(true));
-+            ->willReturn(true);
- 
-         $model->processTemplate();
-     }
-@@ -704,7 +722,7 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-         $model->expects($this->once())
-             ->method('getProcessedTemplateSubject')
-             ->with($variables)
--            ->will($this->returnValue($expectedResult));
-+            ->willReturn($expectedResult);
-         $this->assertEquals($expectedResult, $model->getSubject());
-     }
- 
-@@ -725,30 +743,32 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testGetType($templateType, $expectedResult)
-     {
--        $emailConfig = $this->getMockBuilder(\Magento\Email\Model\Template\Config::class)
-+        $emailConfig = $this->getMockBuilder(Config::class)
-             ->setMethods(['getTemplateType'])
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-         $emailConfig->expects($this->once())->method('getTemplateType')->will($this->returnValue($templateType));
- 
--        /** @var \Magento\Email\Model\Template $model */
--        $model = $this->getMockBuilder(\Magento\Email\Model\Template::class)
-+        /** @var Template $model */
-+        $model = $this->getMockBuilder(Template::class)
-             ->setMethods(['_init'])
-             ->setConstructorArgs([
--                $this->createMock(\Magento\Framework\Model\Context::class),
--                $this->createMock(\Magento\Theme\Model\View\Design::class),
--                $this->createMock(\Magento\Framework\Registry::class),
--                $this->createMock(\Magento\Store\Model\App\Emulation::class),
--                $this->createMock(\Magento\Store\Model\StoreManager::class),
--                $this->createMock(\Magento\Framework\View\Asset\Repository::class),
--                $this->createMock(\Magento\Framework\Filesystem::class),
--                $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class),
-+                $this->createMock(Context::class),
-+                $this->createMock(Design::class),
-+                $this->createMock(Registry::class),
-+                $this->createMock(Emulation::class),
-+                $this->createMock(StoreManager::class),
-+                $this->createMock(Repository::class),
-+                $this->createMock(Filesystem::class),
-+                $this->createMock(ScopeConfigInterface::class),
-                 $emailConfig,
--                $this->createMock(\Magento\Email\Model\TemplateFactory::class),
--                $this->createMock(\Magento\Framework\Filter\FilterManager::class),
--                $this->createMock(\Magento\Framework\Url::class),
--                $this->createMock(\Magento\Email\Model\Template\FilterFactory::class),
-+                $this->createMock(TemplateFactory::class),
-+                $this->createMock(FilterManager::class),
-+                $this->createMock(Url::class),
-+                $this->createMock(FilterFactory::class),
-+                [],
-+                $this->createMock(Json::class)
-             ])
-             ->getMock();
- 
-diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
-index 1011b16f853..e887adef1fb 100644
---- a/app/code/Magento/Email/composer.json
-+++ b/app/code/Magento/Email/composer.json
-@@ -12,6 +12,7 @@
-         "magento/module-config": "*",
-         "magento/module-store": "*",
-         "magento/module-theme": "*",
-+        "magento/module-media-storage": "*",
-         "magento/module-variable": "*"
-     },
-     "suggest": {
-diff --git a/app/code/Magento/Email/etc/db_schema.xml b/app/code/Magento/Email/etc/db_schema.xml
-index 53ef349a383..dbb8855e9e5 100644
---- a/app/code/Magento/Email/etc/db_schema.xml
-+++ b/app/code/Magento/Email/etc/db_schema.xml
-@@ -27,16 +27,16 @@
-         <column xsi:type="varchar" name="orig_template_code" nullable="true" length="200"
-                 comment="Original Template Code"/>
-         <column xsi:type="text" name="orig_template_variables" nullable="true" comment="Original Template Variables"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="template_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="EMAIL_TEMPLATE_TEMPLATE_CODE">
-+        <constraint xsi:type="unique" referenceId="EMAIL_TEMPLATE_TEMPLATE_CODE">
-             <column name="template_code"/>
-         </constraint>
--        <index name="EMAIL_TEMPLATE_ADDED_AT" indexType="btree">
-+        <index referenceId="EMAIL_TEMPLATE_ADDED_AT" indexType="btree">
-             <column name="added_at"/>
-         </index>
--        <index name="EMAIL_TEMPLATE_MODIFIED_AT" indexType="btree">
-+        <index referenceId="EMAIL_TEMPLATE_MODIFIED_AT" indexType="btree">
-             <column name="modified_at"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_grid_block.xml b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_grid_block.xml
-index fa15560817d..87da146d8ce 100644
---- a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_grid_block.xml
-+++ b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_grid_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.email.template.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">systemEmailTemplateGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Email\Model\ResourceModel\Template\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Email\Model\ResourceModel\Template\Collection</argument>
-                     <argument name="use_ajax" xsi:type="string">1</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-                     <argument name="grid_url" xsi:type="url" path="*/*/grid">
-diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
-index 968ad1ff357..8b1f50095d9 100644
---- a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
-+++ b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
-@@ -6,11 +6,9 @@
- 
- use Magento\Framework\App\TemplateTypesInterface;
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Email\Block\Adminhtml\Template\Edit */
- ?>
--<?php if (!$block->getEditMode()): ?>
-+<?php if (!$block->getEditMode()) : ?>
- <form action="<?= $block->escapeUrl($block->getLoadUrl()) ?>" method="post" id="email_template_load_form">
-     <?= $block->getBlockHtml('formkey') ?>
-     <fieldset class="admin__fieldset form-inline">
-@@ -19,14 +17,14 @@ use Magento\Framework\App\TemplateTypesInterface;
-             <label class="admin__field-label" for="template_select"><?= $block->escapeHtml(__('Template')) ?></label>
-             <div class="admin__field-control">
-                 <select id="template_select" name="code" class="admin__control-select required-entry">
--                    <?php foreach ($block->getTemplateOptions() as $group => $options): ?>
--                        <?php if ($group): ?>
-+                    <?php foreach ($block->getTemplateOptions() as $group => $options) : ?>
-+                        <?php if ($group) : ?>
-                             <optgroup label="<?= $block->escapeHtmlAttr($group) ?>">
-                         <?php endif; ?>
--                        <?php foreach ($options as $option): ?>
-+                        <?php foreach ($options as $option) : ?>
-                             <option value="<?= $block->escapeHtmlAttr($option['value']) ?>"<?= /* @noEscape */ $block->getOrigTemplateCode() == $option['value'] ? ' selected="selected"' : '' ?>><?= $block->escapeHtml($option['label']) ?></option>
-                         <?php endforeach; ?>
--                        <?php if ($group): ?>
-+                        <?php if ($group) : ?>
-                             </optgroup>
-                         <?php endif; ?>
-                     <?php endforeach; ?>
-@@ -150,10 +148,10 @@ require([
-             } else {
-                 $('preview_type').value = <?= (int) $block->getTemplateType() ?>;
-             }
--            if (typeof tinyMCE == 'undefined' || !tinyMCE.getInstanceById('template_text')) {
-+            if (typeof tinyMCE == 'undefined' || !tinyMCE.get('template_text')) {
-                 $('preview_text').value = $('template_text').value;
-             } else {
--                $('preview_text').value = tinyMCE.getInstanceById('template_text').getHTML();
-+                $('preview_text').value = tinyMCE.get('template_text').getHTML();
-             }
- 
-             if ($('template_styles') != undefined) {
-diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/list.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/list.phtml
-index b0e72060050..d6a72889cbb 100644
---- a/app/code/Magento/Email/view/adminhtml/templates/template/list.phtml
-+++ b/app/code/Magento/Email/view/adminhtml/templates/template/list.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getChildHtml('add_button') ?></div>
- <?= $block->getChildHtml('grid') ?>
-diff --git a/app/code/Magento/Email/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Email/view/adminhtml/ui_component/design_config_form.xml
-index 91c38c92dc7..76a914d10b2 100644
---- a/app/code/Magento/Email/view/adminhtml/ui_component/design_config_form.xml
-+++ b/app/code/Magento/Email/view/adminhtml/ui_component/design_config_form.xml
-@@ -13,7 +13,7 @@
-                 <collapsible>true</collapsible>
-                 <label translate="true">Transactional Emails</label>
-             </settings>
--            <field name="email_logo" formElement="fileUploader">
-+            <field name="email_logo" formElement="imageUploader">
-                 <settings>
-                     <notice translate="true">To optimize logo for high-resolution displays, upload an image that is 3x normal size and then specify 1x dimensions in the width/height fields below.</notice>
-                     <label translate="true">Logo Image</label>
-diff --git a/app/code/Magento/Email/view/frontend/email/header.html b/app/code/Magento/Email/view/frontend/email/header.html
-index a6895f629b6..c4f49698dc6 100644
---- a/app/code/Magento/Email/view/frontend/email/header.html
-+++ b/app/code/Magento/Email/view/frontend/email/header.html
-@@ -43,8 +43,6 @@
- 
-                                 {{if logo_height}}
-                                     height="{{var logo_height}}"
--                                {{else}}
--                                    height="52"
-                                 {{/if}}
- 
-                                 src="{{var logo_url}}"
-diff --git a/app/code/Magento/Email/view/frontend/web/logo_email.png b/app/code/Magento/Email/view/frontend/web/logo_email.png
-index d01b530456e..215e9d06edc 100644
-Binary files a/app/code/Magento/Email/view/frontend/web/logo_email.png and b/app/code/Magento/Email/view/frontend/web/logo_email.png differ
-diff --git a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php
-index 8e42e0c1313..86fc0082f7a 100644
---- a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php
-+++ b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php
-@@ -6,10 +6,12 @@
-  */
- namespace Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
- /**
-  * Key Index action
-  */
--class Index extends \Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key
-+class Index extends \Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key implements HttpGetActionInterface
- {
-     /**
-      * Render main page with form
-diff --git a/app/code/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatch.php b/app/code/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatch.php
-index aae30026b2b..9331b68675b 100644
---- a/app/code/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatch.php
-+++ b/app/code/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatch.php
-@@ -8,12 +8,18 @@ declare(strict_types=1);
- namespace Magento\EncryptionKey\Setup\Patch\Data;
- 
- use Magento\Framework\Setup\Patch\DataPatchInterface;
-+use Magento\Framework\App\ObjectManager;
- 
- /**
-  * Migrate encrypted configuration values to the latest cipher
-  */
- class SodiumChachaPatch implements DataPatchInterface
- {
-+    /**
-+     * @var \Magento\Framework\Config\ScopeInterface
-+     */
-+    private $scope;
-+
-     /**
-      * @var \Magento\Framework\Setup\ModuleDataSetupInterface
-      */
-@@ -35,25 +41,29 @@ class SodiumChachaPatch implements DataPatchInterface
-     private $state;
- 
-     /**
-+     * SodiumChachaPatch constructor.
-      * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
-      * @param \Magento\Config\Model\Config\Structure\Proxy $structure
-      * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
-      * @param \Magento\Framework\App\State $state
-+     * @param \Magento\Framework\Config\ScopeInterface|null $scope
-      */
-     public function __construct(
-         \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
-         \Magento\Config\Model\Config\Structure\Proxy $structure,
-         \Magento\Framework\Encryption\EncryptorInterface $encryptor,
--        \Magento\Framework\App\State $state
-+        \Magento\Framework\App\State $state,
-+        \Magento\Framework\Config\ScopeInterface $scope = null
-     ) {
-         $this->moduleDataSetup = $moduleDataSetup;
-         $this->structure = $structure;
-         $this->encryptor = $encryptor;
-         $this->state = $state;
-+        $this->scope = $scope ?? ObjectManager::getInstance()->get(\Magento\Framework\Config\ScopeInterface::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function apply()
-     {
-@@ -65,7 +75,7 @@ class SodiumChachaPatch implements DataPatchInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getDependencies()
-     {
-@@ -73,41 +83,67 @@ class SodiumChachaPatch implements DataPatchInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAliases()
-     {
-         return [];
-     }
- 
-+    /**
-+     * Re encrypt sensitive data in the system configuration
-+     */
-     private function reEncryptSystemConfigurationValues()
-     {
--        $structure = $this->structure;
--        $paths = $this->state->emulateAreaCode(
--            \Magento\Framework\App\Area::AREA_ADMINHTML,
--            function () use ($structure) {
--                return $structure->getFieldPathsByAttribute(
--                    'backend_model',
--                    \Magento\Config\Model\Config\Backend\Encrypted::class
--                );
--            }
-+        $table = $this->moduleDataSetup->getTable('core_config_data');
-+        $hasEncryptedData = $this->moduleDataSetup->getConnection()->fetchOne(
-+            $this->moduleDataSetup->getConnection()
-+                ->select()
-+                ->from($table, [new \Zend_Db_Expr('count(value)')])
-+                ->where('value LIKE ?', '0:2%')
-         );
--        // walk through found data and re-encrypt it
--        if ($paths) {
--            $table = $this->moduleDataSetup->getTable('core_config_data');
--            $values = $this->moduleDataSetup->getConnection()->fetchPairs(
--                $this->moduleDataSetup->getConnection()
--                    ->select()
--                    ->from($table, ['config_id', 'value'])
--                    ->where('path IN (?)', $paths)
--                    ->where('value NOT LIKE ?', '')
-+        if ($hasEncryptedData !== '0') {
-+            $currentScope = $this->scope->getCurrentScope();
-+            $structure = $this->structure;
-+            $paths = $this->state->emulateAreaCode(
-+                \Magento\Framework\App\Area::AREA_ADMINHTML,
-+                function () use ($structure) {
-+                    $this->scope->setCurrentScope(\Magento\Framework\App\Area::AREA_ADMINHTML);
-+                    /** Returns list of structure paths to be re encrypted */
-+                    $paths = $structure->getFieldPathsByAttribute(
-+                        'backend_model',
-+                        \Magento\Config\Model\Config\Backend\Encrypted::class
-+                    );
-+                    /** Returns list of mapping between configPath => [structurePaths] */
-+                    $mappedPaths = $structure->getFieldPaths();
-+                    foreach ($mappedPaths as $mappedPath => $data) {
-+                        foreach ($data as $structurePath) {
-+                            if ($structurePath !== $mappedPath && $key = array_search($structurePath, $paths)) {
-+                                $paths[$key] = $mappedPath;
-+                            }
-+                        }
-+                    }
-+
-+                    return array_unique($paths);
-+                }
-             );
--            foreach ($values as $configId => $value) {
--                $this->moduleDataSetup->getConnection()->update(
--                    $table,
--                    ['value' => $this->encryptor->encrypt($this->encryptor->decrypt($value))],
--                    ['config_id = ?' => (int)$configId]
-+            $this->scope->setCurrentScope($currentScope);
-+            // walk through found data and re-encrypt it
-+            if ($paths) {
-+                $values = $this->moduleDataSetup->getConnection()->fetchPairs(
-+                    $this->moduleDataSetup->getConnection()
-+                        ->select()
-+                        ->from($table, ['config_id', 'value'])
-+                        ->where('path IN (?)', $paths)
-+                        ->where('value NOT LIKE ?', '')
-                 );
-+                foreach ($values as $configId => $value) {
-+                    $this->moduleDataSetup->getConnection()->update(
-+                        $table,
-+                        ['value' => $this->encryptor->encrypt($this->encryptor->decrypt($value))],
-+                        ['config_id = ?' => (int)$configId]
-+                    );
-+                }
-             }
-         }
-     }
-diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
-index f6e63e04ac5..0cbd9015073 100644
---- a/app/code/Magento/Fedex/Model/Carrier.php
-+++ b/app/code/Magento/Fedex/Model/Carrier.php
-@@ -363,7 +363,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
- 
-         if ($request->getDestPostcode()) {
-             $r->setDestPostal($request->getDestPostcode());
--        } else {
-         }
- 
-         if ($request->getDestCity()) {
-@@ -986,6 +985,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-      * Return FeDex currency ISO code by Magento Base Currency Code
-      *
-      * @return string 3-digit currency code
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getCurrencyCode()
-     {
-@@ -1008,7 +1008,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-         ];
-         $currencyCode = $this->_storeManager->getStore()->getBaseCurrencyCode();
- 
--        return isset($codes[$currencyCode]) ? $codes[$currencyCode] : $currencyCode;
-+        return $codes[$currencyCode] ?? $currencyCode;
-     }
- 
-     /**
-@@ -1438,6 +1438,8 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-     }
- 
-     /**
-+     * Return Tracking Number
-+     *
-      * @param array|object $trackingIds
-      * @return string
-      */
-@@ -1452,10 +1454,10 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-     }
- 
-     /**
--     * For multi package shipments. Delete requested shipments if the current shipment
--     * request is failed
-+     * For multi package shipments. Delete requested shipments if the current shipment request is failed
-      *
-      * @param array $data
-+     *
-      * @return bool
-      */
-     public function rollBack($data)
-@@ -1475,6 +1477,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-      * Return container types of carrier
-      *
-      * @param \Magento\Framework\DataObject|null $params
-+     *
-      * @return array|bool
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-@@ -1542,6 +1545,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-      * Return delivery confirmation types of carrier
-      *
-      * @param \Magento\Framework\DataObject|null $params
-+     *
-      * @return array
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-@@ -1552,6 +1556,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
- 
-     /**
-      * Recursive replace sensitive fields in debug data by the mask
-+     *
-      * @param string $data
-      * @return string
-      */
-@@ -1569,6 +1574,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
- 
-     /**
-      * Parse track details response from Fedex
-+     *
-      * @param \stdClass $trackInfo
-      * @return array
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-@@ -1639,6 +1645,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
- 
-     /**
-      * Parse delivery datetime from tracking details
-+     *
-      * @param \stdClass $trackInfo
-      * @return \Datetime|null
-      */
-@@ -1655,8 +1662,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-     }
- 
-     /**
--     * Get delivery address details in string representation
--     * Return City, State, Country Code
-+     * Get delivery address details in string representation Return City, State, Country Code
-      *
-      * @param \stdClass $address
-      * @return \Magento\Framework\Phrase|string
-@@ -1718,6 +1724,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
- 
-     /**
-      * Append error message to rate result instance
-+     *
-      * @param string $trackingValue
-      * @param string $errorMessage
-      */
-@@ -1759,8 +1766,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-     }
- 
-     /**
--     * Defines payment type by request.
--     * Two values are available: RECIPIENT or SENDER.
-+     * Defines payment type by request. Two values are available: RECIPIENT or SENDER.
-      *
-      * @param DataObject $request
-      * @return string
-diff --git a/app/code/Magento/Fedex/Plugin/Block/DataProviders/Tracking/ChangeTitle.php b/app/code/Magento/Fedex/Plugin/Block/DataProviders/Tracking/ChangeTitle.php
-new file mode 100644
-index 00000000000..86a576f2db6
---- /dev/null
-+++ b/app/code/Magento/Fedex/Plugin/Block/DataProviders/Tracking/ChangeTitle.php
-@@ -0,0 +1,34 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Fedex\Plugin\Block\DataProviders\Tracking;
-+
-+use Magento\Fedex\Model\Carrier;
-+use Magento\Shipping\Model\Tracking\Result\Status;
-+use Magento\Shipping\Block\DataProviders\Tracking\DeliveryDateTitle as Subject;
-+
-+/**
-+ * Plugin to change delivery date title with FedEx customized value
-+ */
-+class ChangeTitle
-+{
-+    /**
-+     * Title modification in case if FedEx used as carrier
-+     *
-+     * @param Subject $subject
-+     * @param \Magento\Framework\Phrase|string $result
-+     * @param Status $trackingStatus
-+     * @return \Magento\Framework\Phrase|string
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterGetTitle(Subject $subject, $result, Status $trackingStatus)
-+    {
-+        if ($trackingStatus->getCarrier() === Carrier::CODE) {
-+            $result = __('Expected Delivery:');
-+        }
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/Fedex/Plugin/Block/Tracking/PopupDeliveryDate.php b/app/code/Magento/Fedex/Plugin/Block/Tracking/PopupDeliveryDate.php
-new file mode 100644
-index 00000000000..e1597707f9d
---- /dev/null
-+++ b/app/code/Magento/Fedex/Plugin/Block/Tracking/PopupDeliveryDate.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Fedex\Plugin\Block\Tracking;
-+
-+use Magento\Shipping\Block\Tracking\Popup;
-+use Magento\Fedex\Model\Carrier;
-+use Magento\Shipping\Model\Tracking\Result\Status;
-+
-+/**
-+ * Plugin to update delivery date value in case if Fedex used
-+ */
-+class PopupDeliveryDate
-+{
-+    /**
-+     * Show only date for expected delivery in case if Fedex is a carrier
-+     *
-+     * @param Popup $subject
-+     * @param string $result
-+     * @param string $date
-+     * @param string $time
-+     * @return string
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterFormatDeliveryDateTime(Popup $subject, $result, $date, $time)
-+    {
-+        if ($this->getCarrier($subject) === Carrier::CODE) {
-+            $result = $subject->formatDeliveryDate($date);
-+        }
-+        return $result;
-+    }
-+
-+    /**
-+     * Retrieve carrier name from tracking info
-+     *
-+     * @param Popup $subject
-+     * @return string
-+     */
-+    private function getCarrier(Popup $subject): string
-+    {
-+        foreach ($subject->getTrackingInfo() as $trackingData) {
-+            foreach ($trackingData as $trackingInfo) {
-+                if ($trackingInfo instanceof Status) {
-+                    $carrier = $trackingInfo->getCarrier();
-+                    return $carrier;
-+                }
-+            }
-+        }
-+        return '';
-+    }
-+}
-diff --git a/app/code/Magento/Fedex/etc/di.xml b/app/code/Magento/Fedex/etc/di.xml
-index f17f8f2afe6..c542b1f04d1 100644
---- a/app/code/Magento/Fedex/etc/di.xml
-+++ b/app/code/Magento/Fedex/etc/di.xml
-@@ -22,4 +22,10 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Shipping\Block\DataProviders\Tracking\DeliveryDateTitle">
-+        <plugin name="update_delivery_date_title" type="Magento\Fedex\Plugin\Block\DataProviders\Tracking\ChangeTitle"/>
-+    </type>
-+    <type name="Magento\Shipping\Block\Tracking\Popup">
-+        <plugin name="update_delivery_date_value" type="Magento\Fedex\Plugin\Block\Tracking\PopupDeliveryDate"/>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl b/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl
-index 6ae04ccee07..62795f07239 100644
---- a/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl
-+++ b/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl
-@@ -355,7 +355,7 @@
-           </xs:element>
-           <xs:element name="AppliedOptions" type="ns:ServiceOptionType" minOccurs="0" maxOccurs="unbounded">
-             <xs:annotation>
--              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this committment in the set returned to the caller.</xs:documentation>
-+              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this commitment in the set returned to the caller.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="AppliedSubOptions" type="ns:ServiceSubOptionDetail" minOccurs="0">
-@@ -473,7 +473,7 @@
-         <xs:annotation>
-           <xs:documentation>
-             For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
--            If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
-+            If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
-           </xs:documentation>
-         </xs:annotation>
-         <xs:sequence>
-@@ -916,7 +916,7 @@
-           </xs:element>
-           <xs:element name="SecondaryBarcode" type="ns:SecondaryBarcodeType" minOccurs="0">
-             <xs:annotation>
--              <xs:documentation>For customers producing their own Ground labels, this field specifies which secondary barcode will be printed on the label; so that the primary barcode produced by FedEx has the corect SCNC.</xs:documentation>
-+              <xs:documentation>For customers producing their own Ground labels, this field specifies which secondary barcode will be printed on the label; so that the primary barcode produced by FedEx has the correct SCNC.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="TermsAndConditionsLocalization" type="ns:Localization" minOccurs="0">
-@@ -1006,7 +1006,7 @@
-             <xs:annotation>
-               <xs:documentation>
-                 For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
--                If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
-+                If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
-               </xs:documentation>
-             </xs:annotation>
-           </xs:element>
-@@ -1151,7 +1151,7 @@
-       </xs:simpleType>
-       <xs:complexType name="DestinationControlDetail">
-         <xs:annotation>
--          <xs:documentation>Data required to complete the Destionation Control Statement for US exports.</xs:documentation>
-+          <xs:documentation>Data required to complete the Destination Control Statement for US exports.</xs:documentation>
-         </xs:annotation>
-         <xs:sequence>
-           <xs:element name="StatementTypes" type="ns:DestinationControlStatementType" minOccurs="0" maxOccurs="unbounded"/>
-@@ -2278,7 +2278,7 @@
-           </xs:element>
-           <xs:element name="LabelStockType" type="ns:LabelStockType" minOccurs="0">
-             <xs:annotation>
--              <xs:documentation>For thermal printer lables this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
-+              <xs:documentation>For thermal printer labels this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="LabelPrintingOrientation" type="ns:LabelPrintingOrientationType" minOccurs="0">
-@@ -2780,7 +2780,7 @@
-       </xs:simpleType>
-       <xs:complexType name="Party">
-         <xs:annotation>
--          <xs:documentation>The descriptive data for a person or company entitiy doing business with FedEx.</xs:documentation>
-+          <xs:documentation>The descriptive data for a person or company entity doing business with FedEx.</xs:documentation>
-         </xs:annotation>
-         <xs:sequence>
-           <xs:element name="AccountNumber" type="xs:string" minOccurs="0">
-@@ -3069,7 +3069,7 @@
-           </xs:element>
-           <xs:element name="AppliedOptions" type="ns:ServiceOptionType" minOccurs="0" maxOccurs="unbounded">
-             <xs:annotation>
--              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this committment in the set returned to the caller.</xs:documentation>
-+              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this commitment in the set returned to the caller.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="AppliedSubOptions" type="ns:ServiceSubOptionDetail" minOccurs="0">
-@@ -3195,7 +3195,7 @@
-       </xs:simpleType>
-       <xs:complexType name="RatedPackageDetail">
-         <xs:annotation>
--          <xs:documentation>If requesting rates using the PackageDetails element (one package at a time) in the request, the rates for each package will be returned in this element. Currently total piece total weight rates are also retuned in this element.</xs:documentation>
-+          <xs:documentation>If requesting rates using the PackageDetails element (one package at a time) in the request, the rates for each package will be returned in this element. Currently total piece total weight rates are also returned in this element.</xs:documentation>
-         </xs:annotation>
-         <xs:sequence>
-           <xs:element name="TrackingIds" type="ns:TrackingId" minOccurs="0" maxOccurs="unbounded">
-@@ -3416,7 +3416,7 @@
-           </xs:element>
-           <xs:element name="TotalWeight" type="ns:Weight" minOccurs="0">
-             <xs:annotation>
--              <xs:documentation>Identifies the total weight of the shipment being conveyed to FedEx.This is only applicable to International shipments and should only be used on the first package of a mutiple piece shipment.This value contains 1 explicit decimal position</xs:documentation>
-+              <xs:documentation>Identifies the total weight of the shipment being conveyed to FedEx.This is only applicable to International shipments and should only be used on the first package of a multiple piece shipment.This value contains 1 explicit decimal position</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="TotalInsuredValue" type="ns:Money" minOccurs="0">
-@@ -3582,7 +3582,7 @@
-         <xs:sequence>
-           <xs:element name="ReturnType" type="ns:ReturnType" minOccurs="1">
-             <xs:annotation>
--              <xs:documentation>The type of return shipment that is being requested. At present the only type of retrun shipment that is supported is PRINT_RETURN_LABEL. With this option you can print a return label to insert into the box of an outbound shipment. This option can not be used to print an outbound label.</xs:documentation>
-+              <xs:documentation>The type of return shipment that is being requested. At present the only type of return shipment that is supported is PRINT_RETURN_LABEL. With this option you can print a return label to insert into the box of an outbound shipment. This option can not be used to print an outbound label.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="Rma" type="ns:Rma" minOccurs="0">
-@@ -3655,7 +3655,7 @@
-       </xs:simpleType>
-       <xs:simpleType name="ServiceOptionType">
-         <xs:annotation>
--          <xs:documentation>These values control the optional features of service that may be combined in a commitment/rate comparision transaction.</xs:documentation>
-+          <xs:documentation>These values control the optional features of service that may be combined in a commitment/rate comparison transaction.</xs:documentation>
-         </xs:annotation>
-         <xs:restriction base="xs:string">
-           <xs:enumeration value="FREIGHT_GUARANTEE"/>
-@@ -4731,7 +4731,7 @@
-           </xs:element>
-           <xs:element name="TotalCustomerCharge" type="ns:Money" minOccurs="0">
-             <xs:annotation>
--              <xs:documentation>The calculated varibale handling charge plus the net charge.</xs:documentation>
-+              <xs:documentation>The calculated variable handling charge plus the net charge.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-         </xs:sequence>
-diff --git a/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl b/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl
-index efbf75076c2..17a6f74cc09 100644
---- a/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl
-+++ b/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl
-@@ -354,7 +354,7 @@
-           </xs:element>
-           <xs:element name="AppliedOptions" type="ns:ServiceOptionType" minOccurs="0" maxOccurs="unbounded">
-             <xs:annotation>
--              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this committment in the set returned to the caller.</xs:documentation>
-+              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this commitment in the set returned to the caller.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="AppliedSubOptions" type="ns:ServiceSubOptionDetail" minOccurs="0">
-@@ -472,7 +472,7 @@
-         <xs:annotation>
-           <xs:documentation>
-             For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
--            If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
-+            If this shipment commitment more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
-           </xs:documentation>
-         </xs:annotation>
-         <xs:sequence>
-@@ -1006,7 +1006,7 @@
-             <xs:annotation>
-               <xs:documentation>
-                 For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
--                If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
-+                If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
-               </xs:documentation>
-             </xs:annotation>
-           </xs:element>
-@@ -1148,7 +1148,7 @@
-       </xs:simpleType>
-       <xs:complexType name="DestinationControlDetail">
-         <xs:annotation>
--          <xs:documentation>Data required to complete the Destionation Control Statement for US exports.</xs:documentation>
-+          <xs:documentation>Data required to complete the Destination Control Statement for US exports.</xs:documentation>
-         </xs:annotation>
-         <xs:sequence>
-           <xs:element name="StatementTypes" type="ns:DestinationControlStatementType" minOccurs="0" maxOccurs="unbounded"/>
-@@ -2313,7 +2313,7 @@
-           </xs:element>
-           <xs:element name="LabelStockType" type="ns:LabelStockType" minOccurs="0">
-             <xs:annotation>
--              <xs:documentation>For thermal printer lables this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
-+              <xs:documentation>For thermal printer labels this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="LabelPrintingOrientation" type="ns:LabelPrintingOrientationType" minOccurs="0">
-@@ -3099,7 +3099,7 @@
-           </xs:element>
-           <xs:element name="AppliedOptions" type="ns:ServiceOptionType" minOccurs="0" maxOccurs="unbounded">
-             <xs:annotation>
--              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this committment in the set returned to the caller.</xs:documentation>
-+              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this commitment in the set returned to the caller.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="AppliedSubOptions" type="ns:ServiceSubOptionDetail" minOccurs="0">
-@@ -3216,7 +3216,7 @@
-       </xs:simpleType>
-       <xs:complexType name="RatedPackageDetail">
-         <xs:annotation>
--          <xs:documentation>If requesting rates using the PackageDetails element (one package at a time) in the request, the rates for each package will be returned in this element. Currently total piece total weight rates are also retuned in this element.</xs:documentation>
-+          <xs:documentation>If requesting rates using the PackageDetails element (one package at a time) in the request, the rates for each package will be returned in this element. Currently total piece total weight rates are also returned in this element.</xs:documentation>
-         </xs:annotation>
-         <xs:sequence>
-           <xs:element name="TrackingIds" type="ns:TrackingId" minOccurs="0" maxOccurs="unbounded">
-@@ -3622,7 +3622,7 @@
-         <xs:sequence>
-           <xs:element name="ReturnType" type="ns:ReturnType">
-             <xs:annotation>
--              <xs:documentation>The type of return shipment that is being requested. At present the only type of retrun shipment that is supported is PRINT_RETURN_LABEL. With this option you can print a return label to insert into the box of an outbound shipment. This option can not be used to print an outbound label.</xs:documentation>
-+              <xs:documentation>The type of return shipment that is being requested. At present the only type of return shipment that is supported is PRINT_RETURN_LABEL. With this option you can print a return label to insert into the box of an outbound shipment. This option can not be used to print an outbound label.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="Rma" type="ns:Rma" minOccurs="0">
-@@ -3687,7 +3687,7 @@
-       </xs:complexType>
-       <xs:simpleType name="ServiceOptionType">
-         <xs:annotation>
--          <xs:documentation>These values control the optional features of service that may be combined in a commitment/rate comparision transaction.</xs:documentation>
-+          <xs:documentation>These values control the optional features of service that may be combined in a commitment/rate comparison transaction.</xs:documentation>
-         </xs:annotation>
-         <xs:restriction base="xs:string">
-           <xs:enumeration value="FREIGHT_GUARANTEE"/>
-@@ -4611,7 +4611,7 @@
-           </xs:element>
-           <xs:element name="TotalCustomerCharge" type="ns:Money" minOccurs="0">
-             <xs:annotation>
--              <xs:documentation>The calculated varibale handling charge plus the net charge.</xs:documentation>
-+              <xs:documentation>The calculated variable handling charge plus the net charge.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-         </xs:sequence>
-diff --git a/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl b/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl
-index 6c43af98ef6..54bb57d490c 100644
---- a/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl
-+++ b/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl
-@@ -498,7 +498,7 @@
-         <xs:annotation>
-           <xs:documentation>
-             For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
--            If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
-+            If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
-           </xs:documentation>
-         </xs:annotation>
-         <xs:sequence>
-@@ -1515,12 +1515,12 @@
-       </xs:simpleType>
-       <xs:complexType name="DestinationControlDetail">
-         <xs:annotation>
--          <xs:documentation>Data required to complete the Destionation Control Statement for US exports.</xs:documentation>
-+          <xs:documentation>Data required to complete the Destination Control Statement for US exports.</xs:documentation>
-         </xs:annotation>
-         <xs:sequence>
-           <xs:element name="StatementTypes" type="ns:DestinationControlStatementType" minOccurs="1" maxOccurs="unbounded">
-             <xs:annotation>
--              <xs:documentation>List of applicable Statment types.</xs:documentation>
-+              <xs:documentation>List of applicable Statement types.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="DestinationCountries" type="xs:string" minOccurs="0">
-@@ -2524,7 +2524,7 @@
-           </xs:element>
-           <xs:element name="LabelStockType" type="ns:LabelStockType" minOccurs="0">
-             <xs:annotation>
--              <xs:documentation>For thermal printer lables this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
-+              <xs:documentation>For thermal printer labels this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="LabelPrintingOrientation" type="ns:LabelPrintingOrientationType" minOccurs="0">
-@@ -5225,7 +5225,7 @@
-           </xs:element>
-           <xs:element name="TotalCustomerCharge" type="ns:Money" minOccurs="0">
-             <xs:annotation>
--              <xs:documentation>The calculated varibale handling charge plus the net charge.</xs:documentation>
-+              <xs:documentation>The calculated variable handling charge plus the net charge.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-         </xs:sequence>
-diff --git a/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl b/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl
-index 8c11a5f6603..d8dc0fdfed4 100644
---- a/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl
-+++ b/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl
-@@ -498,7 +498,7 @@
-         <xs:annotation>
-           <xs:documentation>
-             For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
--            If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
-+            If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
-           </xs:documentation>
-         </xs:annotation>
-         <xs:sequence>
-@@ -1515,12 +1515,12 @@
-       </xs:simpleType>
-       <xs:complexType name="DestinationControlDetail">
-         <xs:annotation>
--          <xs:documentation>Data required to complete the Destionation Control Statement for US exports.</xs:documentation>
-+          <xs:documentation>Data required to complete the Destination Control Statement for US exports.</xs:documentation>
-         </xs:annotation>
-         <xs:sequence>
-           <xs:element name="StatementTypes" type="ns:DestinationControlStatementType" minOccurs="1" maxOccurs="unbounded">
-             <xs:annotation>
--              <xs:documentation>List of applicable Statment types.</xs:documentation>
-+              <xs:documentation>List of applicable Statement types.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="DestinationCountries" type="xs:string" minOccurs="0">
-@@ -2524,7 +2524,7 @@
-           </xs:element>
-           <xs:element name="LabelStockType" type="ns:LabelStockType" minOccurs="0">
-             <xs:annotation>
--              <xs:documentation>For thermal printer lables this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
-+              <xs:documentation>For thermal printer labels this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-           <xs:element name="LabelPrintingOrientation" type="ns:LabelPrintingOrientationType" minOccurs="0">
-@@ -5225,7 +5225,7 @@
-           </xs:element>
-           <xs:element name="TotalCustomerCharge" type="ns:Money" minOccurs="0">
-             <xs:annotation>
--              <xs:documentation>The calculated varibale handling charge plus the net charge.</xs:documentation>
-+              <xs:documentation>The calculated variable handling charge plus the net charge.</xs:documentation>
-             </xs:annotation>
-           </xs:element>
-         </xs:sequence>
-diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
-index c923ced8918..c15b7658318 100644
---- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
-+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
-@@ -171,7 +171,7 @@ class Items extends \Magento\Backend\Block\Template
-     /**
-      * Retrieve save url
-      *
--     * @return array
-+     * @return string
-      * @codeCoverageIgnore
-      */
-     public function getSaveUrl()
-diff --git a/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php b/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php
-index 5da8b3b5570..28a6baa436e 100644
---- a/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php
-+++ b/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\GiftMessage\Block\Cart;
- 
- use Magento\Backend\Block\Template\Context;
-@@ -10,6 +11,8 @@ use Magento\Framework\Json\Encoder;
- use Magento\GiftMessage\Model\CompositeConfigProvider;
- 
- /**
-+ * Gift options cart block.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -63,6 +66,8 @@ class GiftOptions extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Retrieve encoded js layout.
-+     *
-      * @return string
-      */
-     public function getJsLayout()
-@@ -76,7 +81,7 @@ class GiftOptions extends \Magento\Backend\Block\Template
-     /**
-      * Retrieve gift message configuration
-      *
--     * @return array
-+     * @return string
-      */
-     public function getGiftOptionsConfigJson()
-     {
-diff --git a/app/code/Magento/GiftMessage/Block/Message/Inline.php b/app/code/Magento/GiftMessage/Block/Message/Inline.php
-index e5b80848661..4a9311c1b4b 100644
---- a/app/code/Magento/GiftMessage/Block/Message/Inline.php
-+++ b/app/code/Magento/GiftMessage/Block/Message/Inline.php
-@@ -139,7 +139,7 @@ class Inline extends \Magento\Framework\View\Element\Template
-     /**
-      * Define checkout type
-      *
--     * @param $type string
-+     * @param string $type
-      * @return $this
-      * @codeCoverageIgnore
-      */
-@@ -238,7 +238,7 @@ class Inline extends \Magento\Framework\View\Element\Template
-      */
-     public function getItems()
-     {
--        if (!$this->getData('items')) {
-+        if (!$this->hasData('items')) {
-             $items = [];
- 
-             $entityItems = $this->getEntity()->getAllItems();
-@@ -278,6 +278,8 @@ class Inline extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Call method getItemsHasMessages
-+     *
-      * @deprecated Misspelled method
-      * @see getItemsHasMessages
-      */
-@@ -325,6 +327,20 @@ class Inline extends \Magento\Framework\View\Element\Template
-         return $this->escapeHtml(trim($value) != '' ? $value : $defaultValue);
-     }
- 
-+    /**
-+     * Check availability of order level functionality
-+     *
-+     * @return bool
-+     */
-+    public function isMessagesOrderAvailable()
-+    {
-+        $entity = $this->getEntity();
-+        if (!$entity->hasIsGiftOptionsAvailable()) {
-+            $this->_eventManager->dispatch('gift_options_prepare', ['entity' => $entity]);
-+        }
-+        return $entity->getIsGiftOptionsAvailable();
-+    }
-+
-     /**
-      * Check availability of giftmessages on order level
-      *
-@@ -355,7 +371,7 @@ class Inline extends \Magento\Framework\View\Element\Template
-     protected function _toHtml()
-     {
-         // render HTML when messages are allowed for order or for items only
--        if ($this->isItemsAvailable() || $this->isMessagesAvailable()) {
-+        if ($this->isItemsAvailable() || $this->isMessagesAvailable() || $this->isMessagesOrderAvailable()) {
-             return parent::_toHtml();
-         }
-         return '';
-diff --git a/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php b/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php
-index 0fdce9e9090..cb370c27863 100644
---- a/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php
-+++ b/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php
-@@ -7,6 +7,9 @@ namespace Magento\GiftMessage\Model;
- 
- use Magento\Checkout\Model\ConfigProviderInterface;
- 
-+/**
-+ * Class CompositeConfigProvider
-+ */
- class CompositeConfigProvider implements ConfigProviderInterface
- {
-     /**
-@@ -18,13 +21,13 @@ class CompositeConfigProvider implements ConfigProviderInterface
-      * @param ConfigProviderInterface[] $configProviders
-      */
-     public function __construct(
--        array $configProviders
-+        array $configProviders = []
-     ) {
-         $this->configProviders = $configProviders;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConfig()
-     {
-diff --git a/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php b/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
-index c7f145eaddb..b124897770b 100644
---- a/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
-+++ b/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
-@@ -13,6 +13,7 @@ use Magento\Framework\UrlInterface;
- use Magento\Framework\Locale\FormatInterface as LocaleFormat;
- use Magento\Framework\Data\Form\FormKey;
- use Magento\Catalog\Model\Product\Attribute\Source\Boolean;
-+use Magento\Store\Model\ScopeInterface;
- 
- /**
-  * Configuration provider for GiftMessage rendering on "Checkout cart" page.
-@@ -41,6 +42,11 @@ class GiftMessageConfigProvider implements ConfigProviderInterface
-      */
-     protected $checkoutSession;
- 
-+    /**
-+     * @var HttpContext
-+     */
-+    protected $httpContext;
-+
-     /**
-      * @var \Magento\Store\Model\StoreManagerInterface
-      */
-@@ -57,6 +63,8 @@ class GiftMessageConfigProvider implements ConfigProviderInterface
-     protected $formKey;
- 
-     /**
-+     * GiftMessageConfigProvider constructor.
-+     *
-      * @param \Magento\Framework\App\Helper\Context $context
-      * @param \Magento\GiftMessage\Api\CartRepositoryInterface $cartRepository
-      * @param \Magento\GiftMessage\Api\ItemRepositoryInterface $itemRepository
-@@ -87,28 +95,28 @@ class GiftMessageConfigProvider implements ConfigProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConfig()
-     {
-         $configuration = [];
-         $configuration['giftMessage'] = [];
--        $orderLevelGiftMessageConfiguration = (bool)$this->scopeConfiguration->getValue(
-+        $orderLevelGiftMsg = $this->scopeConfiguration->isSetFlag(
-             GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         );
--        $itemLevelGiftMessageConfiguration = (bool)$this->scopeConfiguration->getValue(
-+        $itemLevelGiftMessage = $this->scopeConfiguration->isSetFlag(
-             GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         );
--        if ($orderLevelGiftMessageConfiguration) {
-+        if ($orderLevelGiftMsg) {
-             $orderMessages = $this->getOrderLevelGiftMessages();
-             $configuration['isOrderLevelGiftOptionsEnabled'] = (bool)$this->isQuoteVirtual() ? false : true;
-             $configuration['giftMessage']['orderLevel'] = $orderMessages === null ? true : $orderMessages->getData();
-         }
- 
-         $itemMessages = $this->getItemLevelGiftMessages();
--        $configuration['isItemLevelGiftOptionsEnabled'] = $itemLevelGiftMessageConfiguration;
-+        $configuration['isItemLevelGiftOptionsEnabled'] = $itemLevelGiftMessage;
-         $configuration['giftMessage']['itemLevel'] = $itemMessages === null ? true : $itemMessages;
- 
-         $configuration['priceFormat'] = $this->localeFormat->getPriceFormat(
-@@ -168,6 +176,7 @@ class GiftMessageConfigProvider implements ConfigProviderInterface
-      * Load already specified item level gift messages and related configuration.
-      *
-      * @return \Magento\GiftMessage\Api\Data\MessageInterface[]|null
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     protected function getItemLevelGiftMessages()
-     {
-diff --git a/app/code/Magento/GiftMessage/Model/ItemRepository.php b/app/code/Magento/GiftMessage/Model/ItemRepository.php
-index 3c62a489af4..aa65bf94f36 100644
---- a/app/code/Magento/GiftMessage/Model/ItemRepository.php
-+++ b/app/code/Magento/GiftMessage/Model/ItemRepository.php
-@@ -74,7 +74,7 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function get($cartId, $itemId)
-     {
-@@ -88,7 +88,7 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
-             throw new NoSuchEntityException(
-                 __('No item with the provided ID was found in the Cart. Verify the ID and try again.')
-             );
--        };
-+        }
-         $messageId = $item->getGiftMessageId();
-         if (!$messageId) {
-             return null;
-@@ -103,7 +103,7 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function save($cartId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage, $itemId)
-     {
-@@ -121,7 +121,7 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
-                     $itemId
-                 )
-             );
--        };
-+        }
- 
-         if ($item->getIsVirtual()) {
-             throw new InvalidTransitionException(__('Gift messages can\'t be used for virtual products.'));
-diff --git a/app/code/Magento/GiftMessage/Model/OrderItemRepository.php b/app/code/Magento/GiftMessage/Model/OrderItemRepository.php
-index 943552e2b75..445ba54ac4d 100644
---- a/app/code/Magento/GiftMessage/Model/OrderItemRepository.php
-+++ b/app/code/Magento/GiftMessage/Model/OrderItemRepository.php
-@@ -80,7 +80,7 @@ class OrderItemRepository implements \Magento\GiftMessage\Api\OrderItemRepositor
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function get($orderId, $orderItemId)
-     {
-@@ -89,7 +89,7 @@ class OrderItemRepository implements \Magento\GiftMessage\Api\OrderItemRepositor
-             throw new NoSuchEntityException(
-                 __('No item with the provided ID was found in the Order. Verify the ID and try again.')
-             );
--        };
-+        }
- 
-         if (!$this->helper->isMessagesAllowed('order_item', $orderItem, $this->storeManager->getStore())) {
-             throw new NoSuchEntityException(
-@@ -111,7 +111,7 @@ class OrderItemRepository implements \Magento\GiftMessage\Api\OrderItemRepositor
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function save($orderId, $orderItemId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage)
-     {
-@@ -123,7 +123,7 @@ class OrderItemRepository implements \Magento\GiftMessage\Api\OrderItemRepositor
-             throw new NoSuchEntityException(
-                 __('No item with the provided ID was found in the Order. Verify the ID and try again.')
-             );
--        };
-+        }
- 
-         if ($order->getIsVirtual()) {
-             throw new InvalidTransitionException(__("Gift messages can't be used for virtual products."));
-diff --git a/app/code/Magento/GiftMessage/Model/OrderRepository.php b/app/code/Magento/GiftMessage/Model/OrderRepository.php
-index abf38f1287b..e943fa2a3b0 100644
---- a/app/code/Magento/GiftMessage/Model/OrderRepository.php
-+++ b/app/code/Magento/GiftMessage/Model/OrderRepository.php
-@@ -74,7 +74,7 @@ class OrderRepository implements \Magento\GiftMessage\Api\OrderRepositoryInterfa
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function get($orderId)
-     {
-@@ -98,7 +98,7 @@ class OrderRepository implements \Magento\GiftMessage\Api\OrderRepositoryInterfa
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function save($orderId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage)
-     {
-@@ -106,7 +106,7 @@ class OrderRepository implements \Magento\GiftMessage\Api\OrderRepositoryInterfa
-         $order = $this->orderFactory->create()->load($orderId);
-         if (!$order->getEntityId()) {
-             throw new NoSuchEntityException(__('No order exists with this ID. Verify your information and try again.'));
--        };
-+        }
- 
-         if (0 == $order->getTotalItemCount()) {
-             throw new InputException(
-diff --git a/app/code/Magento/GiftMessage/Model/Plugin/MergeQuoteItems.php b/app/code/Magento/GiftMessage/Model/Plugin/MergeQuoteItems.php
-new file mode 100644
-index 00000000000..2c097cc9a66
---- /dev/null
-+++ b/app/code/Magento/GiftMessage/Model/Plugin/MergeQuoteItems.php
-@@ -0,0 +1,36 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GiftMessage\Model\Plugin;
-+
-+use Magento\Quote\Model\Quote\Item;
-+use Magento\Quote\Model\Quote\Item\Processor;
-+
-+class MergeQuoteItems
-+{
-+    /**
-+     * Resolves gift message to be
-+     * applied to merged quote items.
-+     *
-+     * @param Processor $subject
-+     * @param Item $result
-+     * @param Item $source
-+     * @return Item
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterMerge(Processor $subject, Item $result, Item $source): Item
-+    {
-+        $giftMessageId = $source->getGiftMessageId();
-+
-+        if ($giftMessageId) {
-+            $result->setGiftMessageId($giftMessageId);
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php b/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php
-index adb500a8185..e1c8c0b5bf5 100644
---- a/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php
-+++ b/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php
-@@ -3,8 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\GiftMessage\Model\Type\Plugin;
- 
-+/**
-+ * Add gift message to quote plugin.
-+ */
- class Onepage
- {
-     /**
-@@ -30,9 +34,11 @@ class Onepage
-     }
- 
-     /**
-+     * Add gift message ot quote.
-+     *
-      * @param \Magento\Checkout\Model\Type\Onepage $subject
-      * @param array $result
--     * @return $this
-+     * @return array
-      */
-     public function afterSaveShippingMethod(
-         \Magento\Checkout\Model\Type\Onepage $subject,
-diff --git a/app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php b/app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php
-index 0d2280d29fe..044a0bf91c9 100644
---- a/app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php
-+++ b/app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php
-@@ -28,7 +28,10 @@ class SalesEventQuoteMerge implements ObserverInterface
-         /** @var  Quote $sourceQuote */
-         $sourceQuote = $observer->getData('source');
- 
--        $targetQuote->setGiftMessageId($sourceQuote->getGiftMessageId());
-+        $giftMessageId = $sourceQuote->getGiftMessageId();
-+        if ($giftMessageId) {
-+            $targetQuote->setGiftMessageId($giftMessageId);
-+        }
- 
-         return $this;
-     }
-diff --git a/app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml b/app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml
-new file mode 100644
-index 00000000000..f81877006c7
---- /dev/null
-+++ b/app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <actionGroup name="CheckingGiftOptionsActionGroup">
-+        <click stepKey="clickOnCheckoutWithMultipleAddresses" selector="{{MultishippingSection.checkoutWithMultipleAddresses}}"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <click stepKey="goToShippingInformation" selector="{{AdminShipmentAddressInformationSection.goToShippingInformation}}"/>
-+        <waitForPageLoad stepKey="waitForGiftOption"/>
-+        <click stepKey="thickAddGiftOptions" selector="{{GiftOptionsOnFrontSection.giftOptionCheckbox}}"/>
-+        <waitForPageLoad stepKey="waitForOptions"/>
-+        <see stepKey="seeAddGiftOptionsForIndividualItems" userInput="Add Gift Options for Individual Items"/>
-+        <dontSee stepKey="dontSeeOtherElement1" userInput="Send Gift Receipt"/>
-+        <dontSee stepKey="dontSeeOtherElement2" userInput="Add Printed Card"/>
-+    </actionGroup>
-+</actionGroups>
-+
-diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml b/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
-new file mode 100644
-index 00000000000..bb3f566f1cb
---- /dev/null
-+++ b/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="EnableGiftMessageForOrder" type="gift_message_config_state">
-+        <requiredEntity type="allow_order">AllowGiftMessageForOrder</requiredEntity>
-+    </entity>
-+    <entity name="AllowGiftMessageForOrder" type="allow_order">
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="DefaultConfigGiftMessageOptions" type="gift_message_config_state">
-+        <requiredEntity type="allow_order">OrderDefault</requiredEntity>
-+        <requiredEntity type="allow_items">ItemsDefault</requiredEntity>
-+    </entity>
-+    <entity name="OrderDefault" type="allow_order">
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="ItemsDefault" type="allow_items">
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml b/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml
-new file mode 100644
-index 00000000000..d4b7997e77d
---- /dev/null
-+++ b/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="SalesGiftMessageConfigState" dataType="gift_message_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST" successRegex="/messages-message-success/">
-+        <object key="groups" dataType="gift_message_config_state">
-+            <object key="gift_options" dataType="gift_message_config_state">
-+                <object key="fields" dataType="gift_message_config_state">
-+                    <object key="allow_order" dataType="allow_order">
-+                        <field key="value">string</field>
-+                    </object>
-+                    <object key="allow_items" dataType="allow_items">
-+                        <field key="value">string</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml b/app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml
-new file mode 100644
-index 00000000000..63243030682
---- /dev/null
-+++ b/app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="GiftOptionsOnFrontSection">
-+        <element name="giftOptionCheckbox" type="text" selector="//span[text()='Add Gift Options']"/>
-+        <element name="addGiftOptionsForIndividualItems" type="text" selector="//dt[@class='order-title individual']"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
-index a5580606134..08ebefb68d7 100644
---- a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
-+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
-@@ -111,7 +111,7 @@ class GiftMessageConfigProviderTest extends \PHPUnit\Framework\TestCase
-         );
-         $messageMock = $this->createMock(\Magento\GiftMessage\Model\Message::class);
- 
--        $this->scopeConfigMock->expects($this->atLeastOnce())->method('getValue')->willReturnMap(
-+        $this->scopeConfigMock->expects($this->atLeastOnce())->method('isSetFlag')->willReturnMap(
-             [
-                 [GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER, Scope::SCOPE_STORE, null, $orderLevel],
-                 [GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, Scope::SCOPE_STORE, null, $itemLevel]
-diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php
-index 2170864407e..f3e060ad5fc 100644
---- a/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php
-+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php
-@@ -128,7 +128,7 @@ class OrderSaveTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
--     * @expectedMessage The gift message couldn't be added to the "Test message" order.
-+     * @expectedExceptionMessage The gift message couldn't be added to the "Test message" order.
-      */
-     public function testAfterSaveIfGiftMessagesNotExist()
-     {
-@@ -146,7 +146,7 @@ class OrderSaveTest extends \PHPUnit\Framework\TestCase
-         $this->giftMessageOrderRepositoryMock
-             ->expects($this->once())
-             ->method('save')
--            ->willThrowException(new \Exception('TestMessage'));
-+            ->willThrowException(new \Exception('Test message'));
- 
-         // save Gift Messages on item level
-         $this->orderMock->expects($this->never())->method('getItems');
-@@ -155,7 +155,7 @@ class OrderSaveTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
--     * @expectedMessage The gift message couldn't be added to the "Test message" order.
-+     * @expectedExceptionMessage The gift message couldn't be added to the "Test message" order item.
-      */
-     public function testAfterSaveIfItemGiftMessagesNotExist()
-     {
-@@ -185,7 +185,7 @@ class OrderSaveTest extends \PHPUnit\Framework\TestCase
-         $this->giftMessageOrderItemRepositoryMock
-             ->expects($this->once())->method('save')
-             ->with($orderId, $orderItemId, $this->giftMessageMock)
--            ->willThrowException(new \Exception('TestMessage'));
-+            ->willThrowException(new \Exception('Test message'));
-         $this->plugin->afterSave($this->orderRepositoryMock, $this->orderMock);
-     }
- }
-diff --git a/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php b/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php
-new file mode 100644
-index 00000000000..7a3000f7c07
---- /dev/null
-+++ b/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php
-@@ -0,0 +1,81 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\GiftMessage\Test\Unit\Observer;
-+
-+use Magento\GiftMessage\Observer\SalesEventQuoteMerge;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Framework\Event\Observer;
-+use Magento\Quote\Model\Quote;
-+
-+/**
-+ *  SalesEventQuoteMergeTest
-+ */
-+class SalesEventQuoteMergeTest extends \PHPUnit\Framework\TestCase
-+{
-+
-+    /**
-+     * @var SalesEventQuoteMerge
-+     */
-+    private $salesEventQuoteMerge;
-+
-+    /**
-+     * @return void
-+     */
-+    public function setUp(): void
-+    {
-+        $objectManger = new ObjectManager($this);
-+        $this->salesEventQuoteMerge = $objectManger->getObject(SalesEventQuoteMerge::class);
-+    }
-+
-+    /**
-+     * @dataProvider dataProviderGiftMessageId
-+     *
-+     * @param null|int $giftMessageId
-+     *
-+     * @return void
-+     */
-+    public function testExecute($giftMessageId): void
-+    {
-+        $sourceQuoteMock = $this->createPartialMock(Quote::class, ['getGiftMessageId']);
-+        $sourceQuoteMock->expects($this->once())
-+            ->method('getGiftMessageId')
-+            ->willReturn($giftMessageId);
-+
-+        $targetQuoteMock = $this->createPartialMock(Quote::class, ['setGiftMessageId']);
-+
-+        if ($giftMessageId) {
-+            $targetQuoteMock->expects($this->once())
-+                ->method('setGiftMessageId');
-+        } else {
-+            $targetQuoteMock->expects($this->never())
-+                ->method('setGiftMessageId');
-+        }
-+
-+        $observer = $this->createMock(Observer::class);
-+        $observer->expects($this->exactly(2))
-+            ->method('getData')
-+            ->willReturnMap([
-+                ['quote', null, $targetQuoteMock],
-+                ['source', null, $sourceQuoteMock]
-+            ]);
-+
-+        $this->salesEventQuoteMerge->execute($observer);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderGiftMessageId(): array
-+    {
-+        return [
-+            [null],
-+            [1]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/GiftMessage/etc/db_schema.xml b/app/code/Magento/GiftMessage/etc/db_schema.xml
-index 518c6398e4c..4ae98799df0 100644
---- a/app/code/Magento/GiftMessage/etc/db_schema.xml
-+++ b/app/code/Magento/GiftMessage/etc/db_schema.xml
-@@ -15,7 +15,7 @@
-         <column xsi:type="varchar" name="sender" nullable="true" length="255" comment="Sender"/>
-         <column xsi:type="varchar" name="recipient" nullable="true" length="255" comment="Registrant"/>
-         <column xsi:type="text" name="message" nullable="true" comment="Message"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="gift_message_id"/>
-         </constraint>
-     </table>
-diff --git a/app/code/Magento/GiftMessage/etc/frontend/di.xml b/app/code/Magento/GiftMessage/etc/frontend/di.xml
-index 1566c51ee9d..a4837e0180c 100644
---- a/app/code/Magento/GiftMessage/etc/frontend/di.xml
-+++ b/app/code/Magento/GiftMessage/etc/frontend/di.xml
-@@ -43,4 +43,7 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Quote\Model\Quote\Item\Processor">
-+        <plugin name="mergeQuoteItems" type="Magento\GiftMessage\Model\Plugin\MergeQuoteItems"/>
-+    </type>
- </config>
-diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
-index 15e87b00622..264fdab0ade 100644
---- a/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
-+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
-@@ -3,15 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
--<?php if ($block->canDisplayGiftmessageForm()): ?>
-+<?php if ($block->canDisplayGiftmessageForm()) : ?>
- <div id="gift_options_giftmessage" class="giftcard-form giftcard-send-form fieldset admin__fieldset">
-     <div class="field admin__field">
--        <label class="admin__field-label" for="current_item_giftmessage_sender"><?= /* @escapeNotVerified */ __('From') ?></label>
-+        <label class="admin__field-label" for="current_item_giftmessage_sender"><?= $block->escapeHtml(__('From')) ?></label>
-         <div class="control admin__field-control">
-             <input type="text" class="input-text admin__control-text"
-                    name="current_item_giftmessage_sender"
-@@ -19,7 +16,7 @@
-         </div>
-     </div>
-     <div class="field admin__field">
--        <label class="admin__field-label" for="current_item_giftmessage_recipient"><?= /* @escapeNotVerified */ __('To') ?></label>
-+        <label class="admin__field-label" for="current_item_giftmessage_recipient"><?= $block->escapeHtml(__('To')) ?></label>
-         <div class="control admin__field-control">
-             <input type="text"
-                    class="input-text admin__control-text"
-@@ -28,7 +25,7 @@
-         </div>
-     </div>
-     <div class="field admin__field">
--        <label class="admin__field-label" for="current_item_giftmessage_message"><?= /* @escapeNotVerified */ __('Message') ?></label>
-+        <label class="admin__field-label" for="current_item_giftmessage_message"><?= $block->escapeHtml(__('Message')) ?></label>
-         <div class="control admin__field-control">
-             <textarea class="textarea admin__control-textarea"
-                       cols="15"
-diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
-index c15d717c229..908d6c91bfb 100644
---- a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
-+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php if ($block->getChildHtml()) :?>
-@@ -15,8 +12,8 @@
-             <?= $block->getChildHtml() ?>
-         </div>
-         <div class="ui-dialog-buttonset">
--            <button type="button" class="action-close" id="gift_options_cancel_button"><span><?= /* @escapeNotVerified */ __('Cancel') ?></span></button>
--            <button type="button" class="action-primary" id="gift_options_ok_button"><span><?= /* @escapeNotVerified */ __('OK') ?></span></button>
-+            <button type="button" class="action-close" id="gift_options_cancel_button"><span><?= $block->escapeHtml(__('Cancel')) ?></span></button>
-+            <button type="button" class="action-primary" id="gift_options_ok_button"><span><?= $block->escapeHtml(__('OK')) ?></span></button>
-         </div>
-     </div>
- </div>
-diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
-index 377b870ce45..1833ae0d2e3 100644
---- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
-+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
-@@ -3,29 +3,26 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php $_item = $block->getItem() ?>
--<?php if ($_item): ?>
-+<?php if ($_item) : ?>
-     <?php $_childHtml = trim($block->getChildHtml('', false));?>
--    <?php if ($_childHtml): ?>
-+    <?php if ($_childHtml) : ?>
-         <tr class="row-gift-options">
-             <td colspan="7">
--                <a class="action-link" href="#" id="gift_options_link_<?= /* @escapeNotVerified */ $_item->getId() ?>"><?= /* @escapeNotVerified */ __('Gift Options') ?></a>
-+                <a class="action-link" href="#" id="gift_options_link_<?= (int) $_item->getId() ?>"><?= $block->escapeHtml(__('Gift Options')) ?></a>
-                 <script>
- require([
-     "Magento_Sales/order/giftoptions_tooltip"
- ], function(){
- 
--    giftOptionsTooltip.addTargetLink('gift_options_link_<?= /* @escapeNotVerified */ $_item->getId() ?>', <?= /* @escapeNotVerified */ $_item->getId() ?>);
-+    giftOptionsTooltip.addTargetLink('gift_options_link_<?= (int) $_item->getId() ?>', <?= (int) $_item->getId() ?>);
- 
- });
- </script>
--                <div id="gift_options_data_<?= /* @escapeNotVerified */ $_item->getId() ?>">
--                    <?= /* @escapeNotVerified */ $_childHtml ?>
-+                <div id="gift_options_data_<?= (int) $_item->getId() ?>">
-+                    <?= /* @noEscape */ $_childHtml ?>
-                 </div>
-             </td>
-         </tr>
-diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml
-index 5b0c61375f8..edd08fdddcf 100644
---- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml
-+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml
-@@ -3,21 +3,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
--<?php if ($block->canDisplayGiftMessage()): ?>
-+<?php if ($block->canDisplayGiftMessage()) : ?>
-     <div class="no-display">
--        <div id="gift-message-form-data-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>">
-+        <div id="gift-message-form-data-<?= (int) $block->getItem()->getId() ?>">
-             <?= $block->getFormHtml() ?>
-         </div>
- 
--        <?php if ($block->getMessageText()): ?>
-+        <?php if ($block->getMessageText()) : ?>
-         <div class="gift-options-tooltip-content">
--            <div><strong><?= /* @escapeNotVerified */ __('Gift Message') ?></strong>:</div>
--            <div><?= /* @escapeNotVerified */ $block->getMessageText() ?></div>
-+            <div><strong><?= $block->escapeHtml(__('Gift Message')) ?></strong>:</div>
-+            <div><?= /* @noEscape */ $block->getMessageText() ?></div>
-         </div>
-         <?php endif; ?>
-     </div>
-diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
-index 47b5957fd27..60a6e1b222b 100644
---- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
-+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
-@@ -3,29 +3,29 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php $_childHtml = trim($block->getChildHtml('', false)); ?>
--<?php if ($_childHtml): ?>
--<?php $_item = $block->getItem() ?>
--<tr>
--    <td colspan="10" class="last">
--        <a class="action-link" href="#" id="gift_options_link_<?= /* @escapeNotVerified */ $_item->getId() ?>"><?= /* @escapeNotVerified */ __('Gift Options') ?></a>
--        <script>
--require([
--	"Magento_Sales/order/giftoptions_tooltip"
--], function(){
--
--	giftOptionsTooltip.addTargetLink('gift_options_link_<?= /* @escapeNotVerified */ $_item->getId() ?>', <?= /* @escapeNotVerified */ $_item->getId() ?>);
--
--});
--</script>
--        <div id="gift_options_data_<?= /* @escapeNotVerified */ $_item->getId() ?>">
--            <?= /* @escapeNotVerified */ $_childHtml ?>
--        </div>
--    </td>
--</tr>
-+<?php if ($_childHtml) : ?>
-+    <?php $_item = $block->getItem() ?>
-+    <tr>
-+        <td colspan="10" class="last">
-+            <a class="action-link" href="#" id="gift_options_link_<?= (int) $_item->getId() ?>">
-+                <?= $block->escapeHtml(__('Gift Options')) ?>
-+            </a>
-+            <script>
-+    require([
-+        "Magento_Sales/order/giftoptions_tooltip"
-+    ], function(){
-+        giftOptionsTooltip.addTargetLink(
-+            'gift_options_link_<?= (int) ($_item->getId()) ?>',
-+            <?= (int) $_item->getId() ?>
-+        );
-+    });
-+    </script>
-+            <div id="gift_options_data_<?= (int) $_item->getId() ?>">
-+                <?= /* @noEscape */ $_childHtml ?>
-+            </div>
-+        </td>
-+    </tr>
- <?php endif ?>
-diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml
-index 5680f1ef98a..915603e3d71 100644
---- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml
-+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml
-@@ -3,24 +3,34 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
--<?php if ($block->canDisplayGiftmessage()): ?>
--<div id="gift-message-form-data-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>" class="no-display">
--    <form id="<?= /* @escapeNotVerified */ $block->getFieldId('form') ?>" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
--        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('type') ?>" name="<?= /* @escapeNotVerified */ $block->getFieldName('type') ?>" value="order_item" />
--        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('sender') ?>" name="<?= /* @escapeNotVerified */ $block->getFieldName('sender') ?>" value="<?= /* @escapeNotVerified */ $block->getSender() ?>" />
--        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('recipient') ?>" name="<?= /* @escapeNotVerified */ $block->getFieldName('recipient') ?>"  value="<?= /* @escapeNotVerified */ $block->getRecipient() ?>" />
--        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('message') ?>" name="<?= /* @escapeNotVerified */ $block->getFieldName('message') ?>"  value="<?= /* @escapeNotVerified */ $block->getMessageText() ?>" />
-+<?php if ($block->canDisplayGiftmessage()) : ?>
-+<div id="gift-message-form-data-<?= (int) $block->getItem()->getId() ?>" class="no-display">
-+    <form id="<?= $block->escapeHtmlAttr($block->getFieldId('form')) ?>"
-+          action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
-+        <input type="hidden"
-+               id="<?= $block->escapeHtmlAttr($block->getFieldId('type')) ?>"
-+               name="<?= $block->escapeHtmlAttr($block->getFieldName('type')) ?>"
-+               value="order_item" />
-+        <input type="hidden"
-+               id="<?= $block->escapeHtmlAttr($block->getFieldId('sender')) ?>"
-+               name="<?= $block->escapeHtmlAttr($block->getFieldName('sender')) ?>"
-+               value="<?= $block->escapeHtmlAttr($block->getSender()) ?>" />
-+        <input type="hidden"
-+               id="<?= $block->escapeHtmlAttr($block->getFieldId('recipient')) ?>"
-+               name="<?= $block->escapeHtmlAttr($block->getFieldName('recipient')) ?>"
-+               value="<?= $block->escapeHtmlAttr($block->getRecipient()) ?>" />
-+        <input type="hidden"
-+               id="<?= $block->escapeHtmlAttr($block->getFieldId('message')) ?>"
-+               name="<?= $block->escapeHtmlAttr($block->getFieldName('message')) ?>"
-+               value="<?= $block->escapeHtmlAttr($block->getMessageText()) ?>" />
-     </form>
- 
--    <?php if ($block->getMessageText()): ?>
-+    <?php if ($block->getMessageText()) : ?>
-     <div class="gift-options-tooltip-content">
--        <div><strong><?= /* @escapeNotVerified */ __('Gift Message') ?></strong>: </div>
--        <div><?= /* @escapeNotVerified */ $block->getMessageText() ?></div>
-+        <div><strong><?= $block->escapeHtml(__('Gift Message')) ?></strong>: </div>
-+        <div><?= /* @noEscape */ $block->getMessageText() ?></div>
-     </div>
-     <?php endif; ?>
- </div>
-diff --git a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
-index db33efeba1a..f8a463bec37 100644
---- a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
-+++ b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
-@@ -6,8 +6,10 @@
- var config = {
-     map: {
-         '*': {
--            giftOptions:    'Magento_GiftMessage/gift-options',
--            extraOptions:   'Magento_GiftMessage/extra-options'
-+            giftOptions:    'Magento_GiftMessage/js/gift-options',
-+            extraOptions:   'Magento_GiftMessage/js/extra-options',
-+            'Magento_GiftMessage/gift-options':    'Magento_GiftMessage/js/gift-options',
-+            'Magento_GiftMessage/extra-options':   'Magento_GiftMessage/js/extra-options'
-         }
-     }
- };
-diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml
-index 0211c546431..4d8a054e67f 100644
---- a/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml
-+++ b/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml
-@@ -9,11 +9,11 @@
-     <script type="text/x-magento-init">
-         {
-             "#gift-options-cart": {
--                "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
-+                "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
-             }
-         }
-     </script>
-     <script>
--        window.giftOptionsConfig = <?= /* @escapeNotVerified */ $block->getGiftOptionsConfigJson() ?>;
-+        window.giftOptionsConfig = <?= /* @noEscape */ $block->getGiftOptionsConfigJson() ?>;
-     </script>
- </div>
-diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml
-index f98ec071467..6fcad0faaa6 100644
---- a/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml
-+++ b/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml
-@@ -4,19 +4,17 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\GiftMessage\Block\Cart\Item\Renderer\Actions\GiftOptions */
- ?>
--<?php if (!$block->isVirtual()): ?>
--    <div id="gift-options-cart-item-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>"
--        data-bind="scope:'giftOptionsCartItem-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>'"
-+<?php if (!$block->isVirtual()) : ?>
-+    <div id="gift-options-cart-item-<?= (int) $block->getItem()->getId() ?>"
-+        data-bind="scope:'giftOptionsCartItem-<?= (int) $block->getItem()->getId() ?>'"
-         class="gift-options-cart-item">
-         <!-- ko template: getTemplate() --><!-- /ko -->
-         <script type="text/x-magento-init">
-             {
--                "#gift-options-cart-item-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>": {
--                    "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
-+                "#gift-options-cart-item-<?= (int) $block->getItem()->getId() ?>": {
-+                    "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
-                 }
-             }
-         </script>
-diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
-index dec54cfeb9d..cb462a630e3 100644
---- a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
-+++ b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
-@@ -3,61 +3,62 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+//phpcs:disable Squiz.ControlStructures.ControlSignature
-+//phpcs:disable Squiz.WhiteSpace.ScopeClosingBrace
-+//phpcs:disable PSR2.ControlStructures.SwitchDeclaration
-+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
- ?>
- <?php $_giftMessage = false; ?>
--<?php switch ($block->getCheckoutType()): case 'onepage_checkout': ?>
-+<?php switch ($block->getCheckoutType()) : case 'onepage_checkout': ?>
-     <fieldset class="fieldset gift-message">
--        <legend class="legend"><span><?= /* @escapeNotVerified */ __('Do you have any gift items in your order?') ?></span></legend><br>
-+        <legend class="legend"><span><?= $block->escapeHtml(__('Do you have any gift items in your order?')) ?></span></legend><br>
- 
--        <div class="field choice" id="add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>">
-+        <div class="field choice" id="add-gift-options-<?= (int) $block->getEntity()->getId() ?>">
-             <input type="checkbox" name="allow_gift_options" id="allow_gift_options" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-container"}'<?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
--            <label for="allow_gift_options" class="label"><span><?= /* @escapeNotVerified */ __('Add Gift Options') ?></span></label>
-+            <label for="allow_gift_options" class="label"><span><?= $block->escapeHtml(__('Add Gift Options')) ?></span></label>
-         </div>
- 
-         <dl class="options-items" id="allow-gift-options-container">
-             <?php if ($block->isMessagesAvailable()): ?>
--            <dt id="add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title">
-+            <dt id="add-gift-options-for-order-<?= (int) $block->getEntity()->getId() ?>" class="order-title">
-                 <div class="field choice">
-                     <input type="checkbox" name="allow_gift_messages_for_order" id="allow_gift_options_for_order" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
--                    <label for="allow_gift_options_for_order" class="label"><span><?= /* @escapeNotVerified */ __('Gift Options for the Entire Order') ?></span></label>
-+                    <label for="allow_gift_options_for_order" class="label"><span><?= $block->escapeHtml(__('Gift Options for the Entire Order')) ?></span></label>
-                 </div>
-             </dt>
- 
-             <dd id="allow-gift-options-for-order-container" class="order-options">
--                <div class="options-order-container" id="options-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></div>
-+                <div class="options-order-container" id="options-order-container-<?= (int) $block->getEntity()->getId() ?>"></div>
-                     <button class="action action-gift"
-                             data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#allow-gift-messages-for-order-container"}}'>
--                        <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
-+                        <span><?= $block->escapeHtml(__('Gift Message')) ?></span>
-                     </button>
-                     <div id="allow-gift-messages-for-order-container" class="gift-messages-order hidden">
-                         <fieldset class="fieldset">
--                            <p><?= /* @escapeNotVerified */ __('Leave this box blank if you don\'t want to leave a gift message for the entire order.') ?></p>
-+                            <p><?= $block->escapeHtml(__('Leave this box blank if you don\'t want to leave a gift message for the entire order.')) ?></p>
-                             <div class="field from">
--                                <label for="gift-message-whole-from" class="label"><span><?= /* @escapeNotVerified */ __('From') ?></span></label>
-+                                <label for="gift-message-whole-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
-                                 <div class="control">
--                                    <input type="text" name="giftmessage[quote][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][from]" id="gift-message-whole-from" title="<?= /* @escapeNotVerified */ __('From') ?>"  value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
-+                                    <input type="text" name="giftmessage[quote][<?= (int) $block->getEntity()->getId() ?>][from]" id="gift-message-whole-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>"  value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
-                                 </div>
-                             </div>
-                             <div class="field to">
--                                <label for="gift-message-whole-to" class="label"><span><?= /* @escapeNotVerified */ __('To') ?></span></label>
-+                                <label for="gift-message-whole-to" class="label"><span><?= $block->escapeHtml(__('To')) ?></span></label>
-                                 <div class="control">
--                                    <input type="text" name="giftmessage[quote][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][to]" id="gift-message-whole-to" title="<?= /* @escapeNotVerified */ __('To') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
-+                                    <input type="text" name="giftmessage[quote][<?= (int) $block->getEntity()->getId() ?>][to]" id="gift-message-whole-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
-                                 </div>
-                             </div>
-                             <div class="field text">
--                                <label for="gift-message-whole-message" class="label"><span><?= /* @escapeNotVerified */ __('Message') ?></span></label>
-+                                <label for="gift-message-whole-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
-                                 <div class="control">
--                                    <textarea id="gift-message-whole-message" class="input-text" name="giftmessage[quote][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][message]" title="<?= /* @escapeNotVerified */ __('Message') ?>" rows="5" cols="10"><?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
-+                                    <textarea id="gift-message-whole-message" class="input-text" name="giftmessage[quote][<?= (int) $block->getEntity()->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="10"><?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
-                                 </div>
-                             </div>
-                         </fieldset>
-                         <script>
-                             require(['jquery'], function(jQuery){
--                                jQuery('#add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>')
--                                    .add('#add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>')
-+                                jQuery('#add-gift-options-<?= (int) $block->getEntity()->getId() ?>')
-+                                    .add('#add-gift-options-for-order-<?= (int) $block->getEntity()->getId() ?>')
-                                     .removeClass('hidden');
-                             });
-                         </script>
-@@ -65,21 +66,21 @@
-             </dd>
-             <?php endif ?>
-             <?php if ($block->isItemsAvailable()): ?>
--            <dt id="add-gift-options-for-items-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title individual">
-+            <dt id="add-gift-options-for-items-<?= (int) $block->getEntity()->getId() ?>" class="order-title individual">
-                 <div class="field choice">
-                     <input type="checkbox" name="allow_gift_options_for_items" id="allow_gift_options_for_items" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container"}'<?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
--                    <label for="allow_gift_options_for_items" class="label"><span><?= /* @escapeNotVerified */ __('Gift Options for Individual Items') ?></span></label>
-+                    <label for="allow_gift_options_for_items" class="label"><span><?= $block->escapeHtml(__('Gift Options for Individual Items')) ?></span></label>
-                 </div>
-             </dt>
- 
-             <dd id="allow-gift-options-for-items-container" class="order-options individual">
-                 <ol class="items">
-                     <?php foreach ($block->getItems() as $_index => $_item): ?>
--                    <?php $_product = $_item->getProduct() ?>
-+                        <?php $_product = $_item->getProduct() ?>
-                     <li class="item">
-                          <div class="product">
-                              <div class="number">
--                                 <?= /* @escapeNotVerified */ __('<span>Item %1</span> of %2', $_index+1, $block->countItems()) ?>
-+                                 <?= $block->escapeHtml(__('<span>Item %1</span> of %2', $_index+1, $block->countItems()), ['span']) ?>
-                              </div>
-                              <div class="img photo container">
-                                  <?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
-@@ -87,36 +88,36 @@
-                              <strong class="product name"><?= $block->escapeHtml($_product->getName()) ?></strong>
-                          </div>
-                          <div class="options">
--                             <div class="options-items-container" id="options-items-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-<?= /* @escapeNotVerified */ $_item->getId() ?>"></div>
-+                             <div class="options-items-container" id="options-items-container-<?= (int) $block->getEntity()->getId() ?>-<?= (int) $_item->getId() ?>"></div>
-                              <?php if ($block->isItemMessagesAvailable($_item)): ?>
-                              <button class="action action-gift"
--                                     data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
--                                 <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
-+                                     data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= (int) $_item->getId() ?>"}}'>
-+                                 <span><?= $block->escapeHtml(__('Gift Message')) ?></span>
-                              </button>
--                             <div id="gift-messages-for-item-container-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="block message hidden">
-+                             <div id="gift-messages-for-item-container-<?= (int) $_item->getId() ?>" class="block message hidden">
-                                  <fieldset class="fieldset">
--                                     <p><?= /* @escapeNotVerified */ __('Leave a box blank if you don\'t want to add a gift message for that item.') ?></p>
-+                                     <p><?= $block->escapeHtml(__('Leave a box blank if you don\'t want to add a gift message for that item.')) ?></p>
-                                      <div class="field from">
--                                         <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-from" class="label"><span><?= /* @escapeNotVerified */ __('From') ?></span></label>
-+                                         <label for="gift-message-<?= (int) $_item->getId() ?>-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
-                                          <div class="control">
--                                             <input type="text" name="giftmessage[quote_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][from]" id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-from" title="<?= /* @escapeNotVerified */ __('From') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
-+                                             <input type="text" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][from]" id="gift-message-<?= (int) $_item->getId() ?>-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
-                                          </div>
-                                      </div>
-                                      <div class="field to">
--                                        <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-to" class="label"><span><?= /* @escapeNotVerified */ __('To') ?></span></label>
-+                                        <label for="gift-message-<?= (int) $_item->getId() ?>-to" class="label"><span><?= $block->escapeHtmlAttr(__('To')) ?></span></label>
-                                         <div class="control">
--                                            <input type="text" name="giftmessage[quote_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][to]" id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-to" title="<?= /* @escapeNotVerified */ __('To') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
-+                                            <input type="text" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][to]" id="gift-message-<?= (int) $_item->getId() ?>-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
-                                         </div>
-                                      </div>
-                                      <div class="field text">
--                                         <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-message" class="label"><span><?= /* @escapeNotVerified */ __('Message') ?></span></label>
-+                                         <label for="gift-message-<?= (int) $_item->getId() ?>-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
-                                          <div class="control">
--                                            <textarea id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][message]" title="<?= /* @escapeNotVerified */ __('Message') ?>" rows="5" cols="40"><?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
-+                                            <textarea id="gift-message-<?= (int) $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="40"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
-                                          </div>
-                                      </div>
-                                 </fieldset>
-                              </div>
--                         <?php endif; ?>
-+                            <?php endif; ?>
-                          </div>
-                     </li>
-                     <?php endforeach; ?>
-@@ -124,13 +125,13 @@
-             </dd>
-             <script>
-                 require(['jquery'], function(jQuery){
--                    jQuery('#add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>')
--                        .add('#add-gift-options-for-items-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>')
-+                    jQuery('#add-gift-options-<?= (int) $block->getEntity()->getId() ?>')
-+                        .add('#add-gift-options-for-items-<?= (int) $block->getEntity()->getId() ?>')
-                         .removeClass('hidden');
-                 });
-             </script>
-             <?php endif; ?>
--            <dt class="extra-options-container" id="extra-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></dt>
-+            <dt class="extra-options-container" id="extra-options-container-<?= (int) $block->getEntity()->getId() ?>"></dt>
-         </dl>
-     </fieldset>
-     <script type="text/x-magento-init">
-@@ -140,126 +141,125 @@
-         }
-     }
-     </script>
--<?php break; ?>
-+<?php break;
-+case 'multishipping_address': ?>
-+    <fieldset id="add-gift-options-<?= (int) $block->getEntity()->getId() ?>" class="fieldset gift-message">
-+        <legend class="legend"><span><?= $block->escapeHtml(__('Do you have any gift items in your order?')) ?></span></legend><br>
- 
--<?php case 'multishipping_address': ?>
--    <fieldset id="add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="fieldset gift-message">
--        <legend class="legend"><span><?= /* @escapeNotVerified */ __('Do you have any gift items in your order?') ?></span></legend><br>
--
--        <div class="field choice" id="add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>">
--            <input type="checkbox" name="allow_gift_options_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" id="allow_gift_options_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
--            <label for="allow_gift_options_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="label"><span><?= /* @escapeNotVerified */ __('Add Gift Options') ?></span></label>
-+        <div class="field choice" id="add-gift-options-<?= (int) $block->getEntity()->getId() ?>">
-+            <input type="checkbox" name="allow_gift_options_<?= (int) $block->getEntity()->getId() ?>" id="allow_gift_options_<?= (int) $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-container-<?= (int) $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-+            <label for="allow_gift_options_<?= (int) $block->getEntity()->getId() ?>" class="label"><span><?= $block->escapeHtml(__('Add Gift Options')) ?></span></label>
-         </div>
- 
--        <dl class="options-items" id="allow-gift-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>">
--            <dt id="add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title">
-+        <dl class="options-items" id="allow-gift-options-container-<?= (int) $block->getEntity()->getId() ?>">
-+            <?php if ($block->isMessagesOrderAvailable() || $block->isMessagesAvailable()): ?>
-+            <dt id="add-gift-options-for-order-<?= (int) $block->getEntity()->getId() ?>" class="order-title">
-                 <div class="field choice">
--                    <input type="checkbox" name="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" id="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
--                    <label for="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="label"><span><?= /* @escapeNotVerified */ __('Add Gift Options for the Entire Order') ?></span></label>
-+                    <input type="checkbox" name="allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>" id="allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container-<?= (int) $block->getEntity()->getId() ?>"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-+                    <label for="allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>" class="label"><span><?= $block->escapeHtml(__('Add Gift Options for the Entire Order')) ?></span></label>
-                 </div>
-             </dt>
- 
--            <dd id="allow-gift-options-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-options">
--                <div class="options-order-container" id="options-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></div>
-+            <dd id="allow-gift-options-for-order-container-<?= (int) $block->getEntity()->getId() ?>" class="order-options">
-+                <div class="options-order-container" id="options-order-container-<?= (int) $block->getEntity()->getId() ?>"></div>
-                 <?php if ($block->isMessagesAvailable()): ?>
-                     <?php $_giftMessage = true; ?>
-                     <button class="action action-gift"
--                            data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}}'>
--                        <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
-+                            data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-order-container-<?= (int) $block->getEntity()->getId() ?>"}}'>
-+                        <span><?= $block->escapeHtml(__('Gift Message')) ?></span>
-                     </button>
--                    <div id="gift-messages-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="gift-messages-order hidden">
-+                    <div id="gift-messages-for-order-container-<?= (int) $block->getEntity()->getId() ?>" class="gift-messages-order hidden">
-                         <fieldset class="fieldset">
--                            <p><?= /* @escapeNotVerified */ __('You can leave this box blank if you don\'t want to add a gift message for this address.') ?></p>
-+                            <p><?= $block->escapeHtml(__('You can leave this box blank if you don\'t want to add a gift message for this address.')) ?></p>
-                             <div class="field from">
--                                <label for="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-from" class="label"><span><?= /* @escapeNotVerified */ __('From') ?></span></label>
-+                                <label for="gift-message-<?= (int) $block->getEntity()->getId() ?>-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
-                                 <div class="control">
--                                    <input type="text" name="giftmessage[quote_address][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][from]" id="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-from" title="<?= /* @escapeNotVerified */ __('From') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
-+                                    <input type="text" name="giftmessage[quote_address][<?= (int) $block->getEntity()->getId() ?>][from]" id="gift-message-<?= (int) $block->getEntity()->getId() ?>-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
-                                 </div>
-                             </div>
-                             <div class="field to">
--                                <label for="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-to" class="label"><span><?= /* @escapeNotVerified */ __('To') ?></span></label>
-+                                <label for="gift-message-<?= (int) $block->getEntity()->getId() ?>-to" class="label"><span><?= $block->escapeHtml(__('To')) ?></span></label>
-                                 <div class="control">
--                                    <input type="text" name="giftmessage[quote_address][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][to]" id="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-to" title="<?= /* @escapeNotVerified */ __('To') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
-+                                    <input type="text" name="giftmessage[quote_address][<?= (int) $block->getEntity()->getId() ?>][to]" id="gift-message-<?= (int) $block->getEntity()->getId() ?>-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
-                                 </div>
-                             </div>
-                             <div class="field text">
--                                <label for="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-message" class="label"><span><?= /* @escapeNotVerified */ __('Message') ?></span></label>
-+                                <label for="gift-message-<?= (int) $block->getEntity()->getId() ?>-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
-                                 <div class="control">
--                                    <textarea id="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-message" class="input-text" name="giftmessage[quote_address][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][message]" title="<?= /* @escapeNotVerified */ __('Message') ?>" rows="5" cols="40"><?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
-+                                    <textarea id="gift-message-<?= (int) $block->getEntity()->getId() ?>-message" class="input-text" name="giftmessage[quote_address][<?= (int) $block->getEntity()->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="40"><?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
-                                 </div>
-                             </div>
-                         </fieldset>
-                     </div>
--                 <?php endif; ?>
-+                <?php endif; ?>
-             </dd>
--
-+            <?php endif; ?>
-             <?php if ($block->isItemsAvailable()): ?>
--            <dt id="add-gift-options-for-items-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title individual">
-+            <dt id="add-gift-options-for-items-<?= (int) $block->getEntity()->getId() ?>" class="order-title individual">
-                 <div class="field choice">
--                    <input type="checkbox" name="allow_gift_options_for_items_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" id="allow_gift_options_for_items_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
--                    <label for="allow_gift_options_for_items_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="label"><span><?= /* @escapeNotVerified */ __('Add Gift Options for Individual Items') ?></span></label>
-+                    <input type="checkbox" name="allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>" id="allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container-<?= (int) $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-+                    <label for="allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>" class="label"><span><?= $block->escapeHtml(__('Add Gift Options for Individual Items')) ?></span></label>
-                 </div>
-             </dt>
- 
--            <dd id="allow-gift-options-for-items-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-options individual">
--                 <ol class="items">
--                 <?php foreach ($block->getItems() as $_index => $_item): ?>
--                 <?php $_product = $_item->getProduct() ?>
--                     <li class="item">
--                         <div class="product">
--                             <div class="number"><?= /* @escapeNotVerified */ __('<span>Item %1</span> of %2', $_index+1, $block->countItems()) ?></div>
--                             <div class="img photo container">
--                                 <?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
--                             </div>
--                             <strong class="product-name"><?= $block->escapeHtml($_product->getName()) ?></strong>
--                         </div>
--                         <div class="options">
--                             <div class="options-items-container" id="options-items-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-<?= /* @escapeNotVerified */ $_item->getId() ?>"></div>
--                             <input type="hidden" name="giftoptions[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][address]" value="<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" />
--
--                             <?php if ($block->isItemMessagesAvailable($_item)): ?>
--                             <?php $_giftMessage = true; ?>
--                                 <button class="action action-gift"
--                                         data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
--                                     <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
--                                 </button>
--                                 <div id="gift-messages-for-item-container-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="block message hidden">
--                                     <fieldset class="fieldset">
--                                        <p><?= /* @escapeNotVerified */ __('You can leave this box blank if you don\'t want to add a gift message for the item.') ?></p>
--                                         <input type="hidden" name="giftmessage[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][address]" value="<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" />
--                                         <div class="field from">
--                                             <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-from" class="label"><span><?= /* @escapeNotVerified */ __('From') ?></span></label>
--                                             <div class="control">
--                                                 <input type="text" name="giftmessage[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][from]" id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-from" title="<?= /* @escapeNotVerified */ __('From') ?>"  value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
--                                             </div>
--                                         </div>
--                                         <div class="field to">
--                                            <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-to" class="label"><span><?= /* @escapeNotVerified */ __('To') ?></span></label>
-+            <dd id="allow-gift-options-for-items-container-<?= (int) $block->getEntity()->getId() ?>" class="order-options individual">
-+                <ol class="items">
-+                <?php foreach ($block->getItems() as $_index => $_item): ?>
-+                     <?php $_product = $_item->getProduct() ?>
-+                    <li class="item">
-+                        <div class="product">
-+                            <div class="number"><?= $block->escapeHtml(__('<span>Item %1</span> of %2', $_index+1, $block->countItems()), ['span']) ?></div>
-+                            <div class="img photo container">
-+                             <?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
-+                            </div>
-+                            <strong class="product-name"><?= $block->escapeHtml($_product->getName()) ?></strong>
-+                        </div>
-+                        <div class="options">
-+                            <div class="options-items-container" id="options-items-container-<?= (int) $block->getEntity()->getId() ?>-<?= (int) $_item->getId() ?>"></div>
-+                            <input type="hidden" name="giftoptions[quote_address_item][<?= (int) $_item->getId() ?>][address]" value="<?= (int) $block->getEntity()->getId() ?>" />
-+                            <?php if ($block->isItemMessagesAvailable($_item)): ?>
-+                                <?php $_giftMessage = true; ?>
-+                                <button class="action action-gift"
-+                                     data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= (int) $_item->getId() ?>"}}'>
-+                                    <span><?= $block->escapeHtml(__('Gift Message')) ?></span>
-+                                </button>
-+                                <div id="gift-messages-for-item-container-<?= (int) $_item->getId() ?>" class="block message hidden">
-+                                    <fieldset class="fieldset">
-+                                        <p><?= $block->escapeHtml(__('You can leave this box blank if you don\'t want to add a gift message for the item.')) ?></p>
-+                                        <input type="hidden" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][address]" value="<?= (int) $block->getEntity()->getId() ?>" />
-+                                        <div class="field from">
-+                                            <label for="gift-message-<?= (int) $_item->getId() ?>-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
-                                             <div class="control">
--                                                <input type="text" name="giftmessage[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][to]" id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-to" title="<?= /* @escapeNotVerified */ __('To') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
-+                                                <input type="text" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][from]" id="gift-message-<?= (int) $_item->getId() ?>-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>"  value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
-                                             </div>
-                                         </div>
--                                         <div class="field text">
--                                             <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-message" class="label"><span><?= /* @escapeNotVerified */ __('Message') ?></span></label>
--                                             <div class="control">
--                                                <textarea id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][message]" title="<?= /* @escapeNotVerified */ __('Message') ?>" rows="5" cols="10"><?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
--                                             </div>
--                                         </div>
--                                     </fieldset>
--                                 </div>
--                             <?php endif; ?>
--                         </div>
--                     </li>
--                 <?php endforeach; ?>
--                 </ol>
-+                                        <div class="field to">
-+                                            <label for="gift-message-<?= (int) $_item->getId() ?>-to" class="label"><span><?= $block->escapeHtml(__('To')) ?></span></label>
-+                                            <div class="control">
-+                                                <input type="text" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][to]" id="gift-message-<?= (int) $_item->getId() ?>-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
-+                                            </div>
-+                                        </div>
-+                                        <div class="field text">
-+                                            <label for="gift-message-<?= (int) $_item->getId() ?>-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
-+                                            <div class="control">
-+                                                <textarea id="gift-message-<?= (int) $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="10"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
-+                                            </div>
-+                                        </div>
-+                                 </fieldset>
-+                                </div>
-+                            <?php endif; ?>
-+                        </div>
-+                    </li>
-+                <?php endforeach; ?>
-+                </ol>
-             </dd>
-             <?php endif; ?>
--            <dt class="extra-options-container" id="extra-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></dt>
-+            <dt class="extra-options-container" id="extra-options-container-<?= (int) $block->getEntity()->getId() ?>"></dt>
-         </dl>
-     </fieldset>
-     <script type="text/x-magento-init">
-         {
--            "#allow_gift_options_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>, #allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>, #allow_gift_options_for_items_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>": {
-+            "#allow_gift_options_<?= (int) $block->getEntity()->getId() ?>, #allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>, #allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>": {
-                 "giftOptions": {}
-             }
-         }
-diff --git a/app/code/Magento/GiftMessage/view/frontend/web/extra-options.js b/app/code/Magento/GiftMessage/view/frontend/web/js/extra-options.js
-similarity index 100%
-rename from app/code/Magento/GiftMessage/view/frontend/web/extra-options.js
-rename to app/code/Magento/GiftMessage/view/frontend/web/js/extra-options.js
-diff --git a/app/code/Magento/GiftMessage/view/frontend/web/gift-options.js b/app/code/Magento/GiftMessage/view/frontend/web/js/gift-options.js
-similarity index 100%
-rename from app/code/Magento/GiftMessage/view/frontend/web/gift-options.js
-rename to app/code/Magento/GiftMessage/view/frontend/web/js/gift-options.js
-diff --git a/app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js b/app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js
-index d025f6974f3..4c455c83a77 100644
---- a/app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js
-+++ b/app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js
-@@ -31,8 +31,9 @@ define([
- 
-             this.itemId = this.itemId || 'orderLevel';
-             model = new GiftMessage(this.itemId);
--            giftOptions.addOption(model);
-             this.model = model;
-+            this.isResultBlockVisible();
-+            giftOptions.addOption(model);
- 
-             this.model.getObservable('isClear').subscribe(function (value) {
-                 if (value == true) { //eslint-disable-line eqeqeq
-@@ -40,8 +41,6 @@ define([
-                     self.model.getObservable('alreadyAdded')(true);
-                 }
-             });
--
--            this.isResultBlockVisible();
-         },
- 
-         /**
-diff --git a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
-index 7daad72994b..e3c46bc2783 100644
---- a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
-+++ b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
-@@ -3,8 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <?php
- /** @var $block \Magento\GoogleAdwords\Block\Code */
-@@ -12,22 +10,22 @@
- <!-- Google Code for Sale Conversion Page -->
- <script>
-     /* <![CDATA[ */
--    var google_conversion_id = <?= /* @escapeNotVerified */ $block->getHelper()->getConversionId() ?>;
--    var google_conversion_language = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionLanguage() ?>";
--    var google_conversion_format = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionFormat() ?>";
--    var google_conversion_color = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionColor() ?>";
--    var google_conversion_label = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionLabel() ?>";
--    var google_conversion_value = <?= /* @escapeNotVerified */ $block->getHelper()->getConversionValue() ?>;
--    <?php if($block->getHelper()->hasSendConversionValueCurrency() && $block->getHelper()->getConversionValueCurrency()): ?>
--    var google_conversion_currency = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionValueCurrency() ?>";
-+    var google_conversion_id = <?= $block->escapeJs($block->getHelper()->getConversionId()) ?>;
-+    var google_conversion_language = "<?= $block->escapeJs($block->getHelper()->getConversionLanguage()) ?>";
-+    var google_conversion_format = "<?= $block->escapeJs($block->getHelper()->getConversionFormat()) ?>";
-+    var google_conversion_color = "<?= $block->escapeJs($block->getHelper()->getConversionColor()) ?>";
-+    var google_conversion_label = "<?= $block->escapeJs($block->getHelper()->getConversionLabel()) ?>";
-+    var google_conversion_value = <?= $block->escapeJs($block->getHelper()->getConversionValue()) ?>;
-+    <?php if ($block->getHelper()->hasSendConversionValueCurrency() && $block->getHelper()->getConversionValueCurrency()) : ?>
-+    var google_conversion_currency = "<?= $block->escapeJs($block->getHelper()->getConversionValueCurrency()) ?>";
-     <?php endif; ?>
-     /* ]]> */
- </script>
--<script src="<?= /* @escapeNotVerified */ $block->getHelper()->getConversionJsSrc() ?>"></script>
-+<script src="<?= $block->escapeHtmlAttr($block->getHelper()->getConversionJsSrc()) ?>"></script>
- <noscript>
-     <div style="display:inline;">
-         <img height="1" width="1" style="border-style:none;" alt=""
--             src="<?= /* @escapeNotVerified */ $block->getHelper()->getConversionImgSrc() ?>"/>
-+             src="<?= $block->escapeHtmlAttr($block->getHelper()->getConversionImgSrc()) ?>"/>
-     </div>
- </noscript>
- <!-- END Google Code for Sale Conversion Page -->
-diff --git a/app/code/Magento/GoogleAnalytics/Block/Ga.php b/app/code/Magento/GoogleAnalytics/Block/Ga.php
-index 7d065ea50b3..b5917407b60 100644
---- a/app/code/Magento/GoogleAnalytics/Block/Ga.php
-+++ b/app/code/Magento/GoogleAnalytics/Block/Ga.php
-@@ -75,7 +75,8 @@ class Ga extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
--     * Render regular page tracking javascript code
-+     * Render regular page tracking javascript code.
-+     *
-      * The custom "page name" may be set from layout or somewhere else. It must start from slash.
-      *
-      * @param string $accountId
-diff --git a/app/code/Magento/GoogleAnalytics/Helper/Data.php b/app/code/Magento/GoogleAnalytics/Helper/Data.php
-index 2af03c71fb1..90a207921d5 100644
---- a/app/code/Magento/GoogleAnalytics/Helper/Data.php
-+++ b/app/code/Magento/GoogleAnalytics/Helper/Data.php
-@@ -46,6 +46,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     public function isAnonymizedIpActive($store = null)
-     {
--        return $this->scopeConfig->getValue(self::XML_PATH_ANONYMIZE, ScopeInterface::SCOPE_STORE, $store);
-+        return (bool)$this->scopeConfig->getValue(self::XML_PATH_ANONYMIZE, ScopeInterface::SCOPE_STORE, $store);
-     }
- }
-diff --git a/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml b/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml
-index 892a22129ad..c3f34c5abc1 100644
---- a/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml
-+++ b/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml
-@@ -7,8 +7,8 @@
- -->
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
--        <referenceContainer name="head.additional">
-+        <referenceBlock name="head.additional">
-             <block class="Magento\GoogleAnalytics\Block\Ga" name="google_analytics" as="google_analytics" template="Magento_GoogleAnalytics::ga.phtml"/>
--        </referenceContainer>
-+        </referenceBlock>
-     </body>
- </page>
-diff --git a/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml b/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
-index ed8c0e3fe3c..f1c850087b3 100644
---- a/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
-+++ b/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\GoogleAnalytics\Block\Ga */ ?>
- <?php $accountId = $block->getConfig(\Magento\GoogleAnalytics\Helper\Data::XML_PATH_ACCOUNT) ?>
-@@ -16,9 +13,9 @@
-         "Magento_GoogleAnalytics/js/google-analytics": {
-             "isCookieRestrictionModeEnabled": <?= (int)$block->isCookieRestrictionModeEnabled() ?>,
-             "currentWebsite": <?= (int)$block->getCurrentWebsiteId() ?>,
--            "cookieName": "<?= /* @escapeNotVerified */ \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>",
--            "ordersTrackingData": <?= /* @escapeNotVerified */ json_encode($block->getOrdersTrackingData()) ?>,
--            "pageTrackingData": <?= /* @escapeNotVerified */ json_encode($block->getPageTrackingData($accountId)) ?>
-+            "cookieName": "<?= /* @noEscape */ \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>",
-+            "ordersTrackingData": <?= /* @noEscape */ json_encode($block->getOrdersTrackingData()) ?>,
-+            "pageTrackingData": <?= /* @noEscape */ json_encode($block->getPageTrackingData($accountId)) ?>
-         }
-     }
- }
-diff --git a/app/code/Magento/GoogleOptimizer/Helper/Data.php b/app/code/Magento/GoogleOptimizer/Helper/Data.php
-index 5b0291eb143..7138a7729fe 100644
---- a/app/code/Magento/GoogleOptimizer/Helper/Data.php
-+++ b/app/code/Magento/GoogleOptimizer/Helper/Data.php
-@@ -11,6 +11,8 @@ namespace Magento\GoogleOptimizer\Helper;
- use \Magento\Store\Model\ScopeInterface;
- 
- /**
-+ * Class Data
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -32,6 +34,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     protected $_analyticsHelper;
- 
-     /**
-+     * Data constructor.
-+     *
-      * @param \Magento\Framework\App\Helper\Context $context
-      * @param \Magento\GoogleAnalytics\Helper\Data $analyticsHelper
-      */
-@@ -51,7 +55,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     public function isGoogleExperimentEnabled($store = null)
-     {
--        return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, ScopeInterface::SCOPE_STORE, $store);
-+        return $this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, ScopeInterface::SCOPE_STORE, $store);
-     }
- 
-     /**
-diff --git a/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml b/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml
-index f0c703b7693..3c91c30c5cf 100644
---- a/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml
-+++ b/app/code/Magento/GoogleOptimizer/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="google" translate="label">
-+        <section id="google">
-             <group id="analytics">
-                 <field id="experiments" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                     <label>Enable Content Experiments</label>
-diff --git a/app/code/Magento/GoogleOptimizer/etc/db_schema.xml b/app/code/Magento/GoogleOptimizer/etc/db_schema.xml
-index ad3e03e490b..76c377544cf 100644
---- a/app/code/Magento/GoogleOptimizer/etc/db_schema.xml
-+++ b/app/code/Magento/GoogleOptimizer/etc/db_schema.xml
-@@ -16,12 +16,12 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Store id"/>
-         <column xsi:type="text" name="experiment_script" nullable="true" comment="Google experiment script"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="code_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="GOOGLEOPTIMIZER_CODE_STORE_ID_STORE_STORE_ID" table="googleoptimizer_code"
-+        <constraint xsi:type="foreign" referenceId="GOOGLEOPTIMIZER_CODE_STORE_ID_STORE_STORE_ID" table="googleoptimizer_code"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="GOOGLEOPTIMIZER_CODE_STORE_ID_ENTITY_ID_ENTITY_TYPE">
-+        <constraint xsi:type="unique" referenceId="GOOGLEOPTIMIZER_CODE_STORE_ID_ENTITY_ID_ENTITY_TYPE">
-             <column name="store_id"/>
-             <column name="entity_id"/>
-             <column name="entity_type"/>
-diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
-index 493cabfaee9..2d72fde91b0 100644
---- a/app/code/Magento/GraphQl/Controller/GraphQl.php
-+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
-@@ -17,16 +17,23 @@ use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
- use Magento\Framework\GraphQl\Schema\SchemaGeneratorInterface;
- use Magento\Framework\Serialize\SerializerInterface;
- use Magento\Framework\Webapi\Response;
-+use Magento\Framework\App\Response\Http as HttpResponse;
-+use Magento\Framework\GraphQl\Query\Fields as QueryFields;
-+use Magento\Framework\Controller\Result\JsonFactory;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\GraphQl\Model\Query\ContextFactoryInterface;
- 
- /**
-  * Front controller for web API GraphQL area.
-  *
-  * @api
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class GraphQl implements FrontControllerInterface
- {
-     /**
--     * @var Response
-+     * @var \Magento\Framework\Webapi\Response
-+     * @deprecated
-      */
-     private $response;
- 
-@@ -46,12 +53,13 @@ class GraphQl implements FrontControllerInterface
-     private $queryProcessor;
- 
-     /**
--     * @var \Magento\Framework\GraphQl\Exception\ExceptionFormatter
-+     * @var ExceptionFormatter
-      */
-     private $graphQlError;
- 
-     /**
--     * @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface
-+     * @var ContextInterface
-+     * @deprecated $contextFactory is used for creating Context object
-      */
-     private $resolverContext;
- 
-@@ -60,14 +68,39 @@ class GraphQl implements FrontControllerInterface
-      */
-     private $requestProcessor;
- 
-+    /**
-+     * @var QueryFields
-+     */
-+    private $queryFields;
-+
-+    /**
-+     * @var JsonFactory
-+     */
-+    private $jsonFactory;
-+
-+    /**
-+     * @var HttpResponse
-+     */
-+    private $httpResponse;
-+
-+    /**
-+     * @var ContextFactoryInterface
-+     */
-+    private $contextFactory;
-+
-     /**
-      * @param Response $response
-      * @param SchemaGeneratorInterface $schemaGenerator
-      * @param SerializerInterface $jsonSerializer
-      * @param QueryProcessor $queryProcessor
--     * @param \Magento\Framework\GraphQl\Exception\ExceptionFormatter $graphQlError
--     * @param \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $resolverContext
-+     * @param ExceptionFormatter $graphQlError
-+     * @param ContextInterface $resolverContext Deprecated. $contextFactory is used for creating Context object.
-      * @param HttpRequestProcessor $requestProcessor
-+     * @param QueryFields $queryFields
-+     * @param JsonFactory|null $jsonFactory
-+     * @param HttpResponse|null $httpResponse
-+     * @param ContextFactoryInterface $contextFactory
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-         Response $response,
-@@ -76,7 +109,11 @@ class GraphQl implements FrontControllerInterface
-         QueryProcessor $queryProcessor,
-         ExceptionFormatter $graphQlError,
-         ContextInterface $resolverContext,
--        HttpRequestProcessor $requestProcessor
-+        HttpRequestProcessor $requestProcessor,
-+        QueryFields $queryFields,
-+        JsonFactory $jsonFactory = null,
-+        HttpResponse $httpResponse = null,
-+        ContextFactoryInterface $contextFactory = null
-     ) {
-         $this->response = $response;
-         $this->schemaGenerator = $schemaGenerator;
-@@ -85,6 +122,10 @@ class GraphQl implements FrontControllerInterface
-         $this->graphQlError = $graphQlError;
-         $this->resolverContext = $resolverContext;
-         $this->requestProcessor = $requestProcessor;
-+        $this->queryFields = $queryFields;
-+        $this->jsonFactory = $jsonFactory ?: ObjectManager::getInstance()->get(JsonFactory::class);
-+        $this->httpResponse = $httpResponse ?: ObjectManager::getInstance()->get(HttpResponse::class);
-+        $this->contextFactory = $contextFactory ?: ObjectManager::getInstance()->get(ContextFactoryInterface::class);
-     }
- 
-     /**
-@@ -96,26 +137,59 @@ class GraphQl implements FrontControllerInterface
-     public function dispatch(RequestInterface $request) : ResponseInterface
-     {
-         $statusCode = 200;
-+        $jsonResult = $this->jsonFactory->create();
-         try {
-             /** @var Http $request */
--            $this->requestProcessor->processHeaders($request);
--            $data = $this->jsonSerializer->unserialize($request->getContent());
-+            $this->requestProcessor->validateRequest($request);
-+
-+            $data = $this->getDataFromRequest($request);
-+            $query = $data['query'] ?? '';
-+            $variables = $data['variables'] ?? null;
-+
-+            // We must extract queried field names to avoid instantiation of unnecessary fields in webonyx schema
-+            // Temporal coupling is required for performance optimization
-+            $this->queryFields->setQuery($query, $variables);
-             $schema = $this->schemaGenerator->generate();
-+
-             $result = $this->queryProcessor->process(
-                 $schema,
--                isset($data['query']) ? $data['query'] : '',
--                $this->resolverContext,
--                isset($data['variables']) ? $data['variables'] : []
-+                $query,
-+                $this->contextFactory->create(),
-+                $data['variables'] ?? []
-             );
-         } catch (\Exception $error) {
-             $result['errors'] = isset($result) && isset($result['errors']) ? $result['errors'] : [];
-             $result['errors'][] = $this->graphQlError->create($error);
-             $statusCode = ExceptionFormatter::HTTP_GRAPH_QL_SCHEMA_ERROR_STATUS;
-         }
--        $this->response->setBody($this->jsonSerializer->serialize($result))->setHeader(
--            'Content-Type',
--            'application/json'
--        )->setHttpResponseCode($statusCode);
--        return $this->response;
-+
-+        $jsonResult->setHttpResponseCode($statusCode);
-+        $jsonResult->setData($result);
-+        $jsonResult->renderResult($this->httpResponse);
-+        return $this->httpResponse;
-+    }
-+
-+    /**
-+     * Get data from request body or query string
-+     *
-+     * @param RequestInterface $request
-+     * @return array
-+     */
-+    private function getDataFromRequest(RequestInterface $request) : array
-+    {
-+        /** @var Http $request */
-+        if ($request->isPost()) {
-+            $data = $this->jsonSerializer->unserialize($request->getContent());
-+        } elseif ($request->isGet()) {
-+            $data = $request->getParams();
-+            $data['variables'] = isset($data['variables']) ?
-+                $this->jsonSerializer->unserialize($data['variables']) : null;
-+            $data['variables'] = is_array($data['variables']) ?
-+                $data['variables'] : null;
-+        } else {
-+            return [];
-+        }
-+
-+        return $data;
-     }
- }
-diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
-deleted file mode 100644
-index 2270f2616e6..00000000000
---- a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
-+++ /dev/null
-@@ -1,32 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\GraphQl\Controller\HttpHeaderProcessor;
--
--use Magento\Framework\Exception\LocalizedException;
--use Magento\GraphQl\Controller\HttpHeaderProcessorInterface;
--
--/**
-- * Processes the "Content-Type" header entry
-- */
--class ContentTypeProcessor implements HttpHeaderProcessorInterface
--{
--    /**
--     * Handle the mandatory application/json header
--     *
--     * {@inheritDoc}
--     * @throws LocalizedException
--     */
--    public function processHeaderValue(string $headerValue) : void
--    {
--        if (!$headerValue || strpos($headerValue, 'application/json') === false) {
--            throw new LocalizedException(
--                new \Magento\Framework\Phrase('Request content type must be application/json')
--            );
--        }
--    }
--}
-diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
-deleted file mode 100644
-index be359eafdf2..00000000000
---- a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
-+++ /dev/null
-@@ -1,55 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\GraphQl\Controller\HttpHeaderProcessor;
--
--use Magento\Framework\Exception\NoSuchEntityException;
--use Magento\Framework\GraphQl\Exception\GraphQlInputException;
--use Magento\GraphQl\Controller\HttpHeaderProcessorInterface;
--use Magento\Store\Model\StoreManagerInterface;
--
--/**
-- * Process the "Store" header entry
-- */
--class StoreProcessor implements HttpHeaderProcessorInterface
--{
--    /**
--     * @var StoreManagerInterface
--     */
--    private $storeManager;
--
--    /**
--     * StoreProcessor constructor.
--     *
--     * @param StoreManagerInterface $storeManager
--     */
--    public function __construct(StoreManagerInterface $storeManager)
--    {
--        $this->storeManager = $storeManager;
--    }
--
--    /**
--     * Handle the value of the store and set the scope
--     *
--     * {@inheritDoc}
--     * @throws NoSuchEntityException
--     */
--    public function processHeaderValue(string $headerValue) : void
--    {
--        if ($headerValue) {
--            $storeCode = ltrim(rtrim($headerValue));
--            $stores = $this->storeManager->getStores(false, true);
--            if (isset($stores[$storeCode])) {
--                $this->storeManager->setCurrentStore($storeCode);
--            } elseif (strtolower($storeCode) !== 'default') {
--                throw new GraphQlInputException(
--                    new \Magento\Framework\Phrase('Store code %1 does not exist', [$storeCode])
--                );
--            }
--        }
--    }
--}
-diff --git a/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php b/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php
-index 5e42b81a619..bb29f1fa68a 100644
---- a/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php
-+++ b/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php
-@@ -19,12 +19,19 @@ class HttpRequestProcessor
-      */
-     private $headerProcessors = [];
- 
-+    /**
-+     * @var HttpRequestValidatorInterface[] array
-+     */
-+    private $requestValidators = [];
-+
-     /**
-      * @param HttpHeaderProcessorInterface[] $graphQlHeaders
-+     * @param HttpRequestValidatorInterface[] $requestValidators
-      */
--    public function __construct(array $graphQlHeaders = [])
-+    public function __construct(array $graphQlHeaders = [], array $requestValidators = [])
-     {
-         $this->headerProcessors = $graphQlHeaders;
-+        $this->requestValidators = $requestValidators;
-     }
- 
-     /**
-@@ -39,4 +46,17 @@ class HttpRequestProcessor
-             $headerClass->processHeaderValue((string)$request->getHeader($headerName));
-         }
-     }
-+
-+    /**
-+     * Validate HTTP request
-+     *
-+     * @param Http $request
-+     * @return void
-+     */
-+    public function validateRequest(Http $request) : void
-+    {
-+        foreach ($this->requestValidators as $requestValidator) {
-+            $requestValidator->validate($request);
-+        }
-+    }
- }
-diff --git a/app/code/Magento/GraphQl/Controller/HttpRequestValidator/ContentTypeValidator.php b/app/code/Magento/GraphQl/Controller/HttpRequestValidator/ContentTypeValidator.php
-new file mode 100644
-index 00000000000..555048aac67
---- /dev/null
-+++ b/app/code/Magento/GraphQl/Controller/HttpRequestValidator/ContentTypeValidator.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Controller\HttpRequestValidator;
-+
-+use Magento\Framework\App\HttpRequestInterface;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\GraphQl\Controller\HttpRequestValidatorInterface;
-+
-+/**
-+ * Processes the "Content-Type" header entry
-+ */
-+class ContentTypeValidator implements HttpRequestValidatorInterface
-+{
-+    /**
-+     * Handle the mandatory application/json header
-+     *
-+     * @param HttpRequestInterface $request
-+     * @return void
-+     * @throws GraphQlInputException
-+     */
-+    public function validate(HttpRequestInterface $request) : void
-+    {
-+        $headerName = 'Content-Type';
-+        $requiredHeaderValue = 'application/json';
-+
-+        $headerValue = (string)$request->getHeader($headerName);
-+        if ($request->isPost()
-+            && strpos($headerValue, $requiredHeaderValue) === false
-+        ) {
-+            throw new GraphQlInputException(
-+                new \Magento\Framework\Phrase('Request content type must be application/json')
-+            );
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/GraphQl/Controller/HttpRequestValidator/HttpVerbValidator.php b/app/code/Magento/GraphQl/Controller/HttpRequestValidator/HttpVerbValidator.php
-new file mode 100644
-index 00000000000..300b3d4f44d
---- /dev/null
-+++ b/app/code/Magento/GraphQl/Controller/HttpRequestValidator/HttpVerbValidator.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Controller\HttpRequestValidator;
-+
-+use Magento\Framework\App\HttpRequestInterface;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\App\Request\Http;
-+use Magento\GraphQl\Controller\HttpRequestValidatorInterface;
-+
-+/**
-+ * Validator to check HTTP verb for Graphql requests
-+ */
-+class HttpVerbValidator implements HttpRequestValidatorInterface
-+{
-+    /**
-+     * Check if request is using correct verb for query or mutation
-+     *
-+     * @param HttpRequestInterface $request
-+     * @return void
-+     * @throws GraphQlInputException
-+     */
-+    public function validate(HttpRequestInterface $request) : void
-+    {
-+        /** @var Http $request */
-+        if (false === $request->isPost()) {
-+            $query = $request->getParam('query', '');
-+            // The easiest way to determine mutations without additional parsing
-+            if (strpos(trim($query), 'mutation') === 0) {
-+                throw new GraphQlInputException(
-+                    new \Magento\Framework\Phrase('Mutation requests allowed only for POST requests')
-+                );
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/GraphQl/Controller/HttpRequestValidatorInterface.php b/app/code/Magento/GraphQl/Controller/HttpRequestValidatorInterface.php
-new file mode 100644
-index 00000000000..2d9d50569e3
---- /dev/null
-+++ b/app/code/Magento/GraphQl/Controller/HttpRequestValidatorInterface.php
-@@ -0,0 +1,26 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Controller;
-+
-+use Magento\Framework\App\HttpRequestInterface;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+
-+/**
-+ * Use this interface to implement a validator for a Graphql HTTP requests
-+ */
-+interface HttpRequestValidatorInterface
-+{
-+    /**
-+     * Perform validation of request
-+     *
-+     * @param HttpRequestInterface $request
-+     * @return void
-+     * @throws GraphQlInputException
-+     */
-+    public function validate(HttpRequestInterface $request) : void;
-+}
-diff --git a/app/code/Magento/GraphQl/Model/EntityAttributeList.php b/app/code/Magento/GraphQl/Model/EntityAttributeList.php
-index 6b8a4f47706..3802b74f3ec 100644
---- a/app/code/Magento/GraphQl/Model/EntityAttributeList.php
-+++ b/app/code/Magento/GraphQl/Model/EntityAttributeList.php
-@@ -14,7 +14,7 @@ use Magento\Framework\Api\FilterBuilder;
- use Magento\Framework\Api\MetadataServiceInterface;
- use Magento\Framework\Api\SearchCriteriaBuilder;
- use Magento\Framework\Exception\NoSuchEntityException;
--use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
- 
- /**
-  * Iterate through all attribute sets to retrieve attributes for any given entity type
-@@ -69,7 +69,7 @@ class EntityAttributeList
-      * @param string $entityCode
-      * @param MetadataServiceInterface $metadataService
-      * @return boolean[]
--     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-      */
-     public function getDefaultEntityAttributes(
-         string $entityCode,
-@@ -93,7 +93,7 @@ class EntityAttributeList
-                     $this->attributeManagement->getAttributes($entityCode, $attributeSet->getAttributeSetId())
-                 );
-             } catch (NoSuchEntityException $exception) {
--                throw new GraphQlInputException(__('Entity code %1 does not exist.', [$entityCode]));
-+                throw new GraphQlNoSuchEntityException(__('Entity code %1 does not exist.', [$entityCode]));
-             }
-         }
-         $attributeCodes = [];
-diff --git a/app/code/Magento/GraphQl/Model/Query/Context.php b/app/code/Magento/GraphQl/Model/Query/Context.php
-new file mode 100644
-index 00000000000..a9d4bbd990f
---- /dev/null
-+++ b/app/code/Magento/GraphQl/Model/Query/Context.php
-@@ -0,0 +1,71 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Model\Query;
-+
-+/**
-+ * Concrete implementation for @see ContextInterface
-+ *
-+ * The purpose for this that GraphQL specification wants to make use of such object where multiple modules can
-+ * participate with data through extension attributes.
-+ */
-+class Context implements ContextInterface
-+{
-+    /**
-+     * @var int|null
-+     */
-+    private $userType;
-+
-+    /**
-+     * @var int|null
-+     */
-+    private $userId;
-+
-+    /**
-+     * @var ContextExtensionInterface
-+     */
-+    private $extensionAttributes;
-+
-+    /**
-+     * @param int|null $userType
-+     * @param int|null $userId
-+     * @param ContextExtensionInterface $extensionAttributes
-+     */
-+    public function __construct(
-+        ?int $userType,
-+        ?int $userId,
-+        ContextExtensionInterface $extensionAttributes
-+    ) {
-+        $this->userType = $userType;
-+        $this->userId = $userId;
-+        $this->extensionAttributes = $extensionAttributes;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getUserType(): ?int
-+    {
-+        return $this->userType;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getUserId(): ?int
-+    {
-+        return $this->userId;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getExtensionAttributes(): ContextExtensionInterface
-+    {
-+        return $this->extensionAttributes;
-+    }
-+}
-diff --git a/app/code/Magento/GraphQl/Model/Query/ContextFactory.php b/app/code/Magento/GraphQl/Model/Query/ContextFactory.php
-new file mode 100644
-index 00000000000..bfcd0d54875
---- /dev/null
-+++ b/app/code/Magento/GraphQl/Model/Query/ContextFactory.php
-@@ -0,0 +1,82 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Model\Query;
-+
-+use Magento\Framework\Api\ExtensionAttributesFactory;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\ObjectManagerInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class ContextFactory implements ContextFactoryInterface
-+{
-+    /**
-+     * @var ExtensionAttributesFactory
-+     */
-+    private $extensionAttributesFactory;
-+
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var ContextParametersProcessorInterface[]
-+     */
-+    private $contextParametersProcessors;
-+
-+    /**
-+     * @param ExtensionAttributesFactory $extensionAttributesFactory
-+     * @param ObjectManagerInterface $objectManager
-+     * @param ContextParametersProcessorInterface[] $contextParametersProcessors
-+     */
-+    public function __construct(
-+        ExtensionAttributesFactory $extensionAttributesFactory,
-+        ObjectManagerInterface $objectManager,
-+        array $contextParametersProcessors = []
-+    ) {
-+        $this->extensionAttributesFactory = $extensionAttributesFactory;
-+        $this->objectManager = $objectManager;
-+        $this->contextParametersProcessors = $contextParametersProcessors;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function create(): ContextInterface
-+    {
-+        $contextParameters = $this->objectManager->create(ContextParametersInterface::class);
-+
-+        foreach ($this->contextParametersProcessors as $contextParametersProcessor) {
-+            if (!$contextParametersProcessor instanceof ContextParametersProcessorInterface) {
-+                throw new LocalizedException(
-+                    __('ContextParametersProcessors must implement %1', ContextParametersProcessorInterface::class)
-+                );
-+            }
-+            $contextParameters = $contextParametersProcessor->execute($contextParameters);
-+        }
-+
-+        $extensionAttributes = $this->extensionAttributesFactory->create(
-+            ContextInterface::class,
-+            [
-+                'data' => $contextParameters->getExtensionAttributesData(),
-+            ]
-+        );
-+
-+        $context = $this->objectManager->create(
-+            ContextInterface::class,
-+            [
-+                'userType' => $contextParameters->getUserType(),
-+                'userId' => $contextParameters->getUserId(),
-+                'extensionAttributes' => $extensionAttributes,
-+            ]
-+        );
-+        return $context;
-+    }
-+}
-diff --git a/app/code/Magento/GraphQl/Model/Query/ContextFactoryInterface.php b/app/code/Magento/GraphQl/Model/Query/ContextFactoryInterface.php
-new file mode 100644
-index 00000000000..ceea98c39ce
---- /dev/null
-+++ b/app/code/Magento/GraphQl/Model/Query/ContextFactoryInterface.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Model\Query;
-+
-+/**
-+ * Context factory
-+ */
-+interface ContextFactoryInterface
-+{
-+    /**
-+     * Create Context object
-+     *
-+     * @return ContextInterface
-+     */
-+    public function create(): ContextInterface;
-+}
-diff --git a/app/code/Magento/GraphQl/Model/Query/ContextInterface.php b/app/code/Magento/GraphQl/Model/Query/ContextInterface.php
-new file mode 100644
-index 00000000000..84b36064e28
---- /dev/null
-+++ b/app/code/Magento/GraphQl/Model/Query/ContextInterface.php
-@@ -0,0 +1,42 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Model\Query;
-+
-+use Magento\Framework\Api\ExtensibleDataInterface;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface as BaseContextInterface;
-+
-+/**
-+ * Resolver Context is used as a shared data extensible object in all resolvers that implement @see ResolverInterface.
-+ *
-+ * GraphQL will pass the same instance of this interface to each field resolver, so these resolvers could have
-+ * shared access to the same data for ease of implementation purposes.
-+ */
-+interface ContextInterface extends BaseContextInterface, ExtensibleDataInterface
-+{
-+    /**
-+     * Get the type of a user
-+     *
-+     * @return int|null
-+     */
-+    public function getUserType(): ?int;
-+
-+    /**
-+     * Get id of the user
-+     *
-+     * @return int|null
-+     */
-+    public function getUserId(): ?int;
-+
-+    /**
-+     * Get extension attributes
-+     *
-+     * @return \Magento\GraphQl\Model\Query\ContextExtensionInterface
-+     */
-+    public function getExtensionAttributes(): \Magento\GraphQl\Model\Query\ContextExtensionInterface;
-+}
-diff --git a/app/code/Magento/GraphQl/Model/Query/ContextParameters.php b/app/code/Magento/GraphQl/Model/Query/ContextParameters.php
-new file mode 100644
-index 00000000000..8e71a96f7e1
---- /dev/null
-+++ b/app/code/Magento/GraphQl/Model/Query/ContextParameters.php
-@@ -0,0 +1,77 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Model\Query;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class ContextParameters implements ContextParametersInterface
-+{
-+    /**
-+     * @var int|null
-+     */
-+    private $userType;
-+
-+    /**
-+     * @var int|null
-+     */
-+    private $userId;
-+
-+    /**
-+     * @var array
-+     */
-+    private $extensionAttributesData = [];
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setUserType(int $userType): void
-+    {
-+        $this->userType = $userType;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getUserType(): ?int
-+    {
-+        return $this->userType;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setUserId(int $userId): void
-+    {
-+        $this->userId = $userId;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getUserId(): ?int
-+    {
-+        return $this->userId;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function addExtensionAttribute(string $key, $value): void
-+    {
-+        $this->extensionAttributesData[$key] = $value;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getExtensionAttributesData(): array
-+    {
-+        return $this->extensionAttributesData;
-+    }
-+}
-diff --git a/app/code/Magento/GraphQl/Model/Query/ContextParametersInterface.php b/app/code/Magento/GraphQl/Model/Query/ContextParametersInterface.php
-new file mode 100644
-index 00000000000..9c49c2e2b12
---- /dev/null
-+++ b/app/code/Magento/GraphQl/Model/Query/ContextParametersInterface.php
-@@ -0,0 +1,60 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Model\Query;
-+
-+/**
-+ * Provide possibility to add custom parameters to context object
-+ */
-+interface ContextParametersInterface
-+{
-+    /**
-+     * Set type of a user
-+     *
-+     * @param int $userType
-+     * @return void
-+     */
-+    public function setUserType(int $userType): void;
-+
-+    /**
-+     * Get type of a user
-+     *
-+     * @return int|null
-+     */
-+    public function getUserType(): ?int;
-+
-+    /**
-+     * Set id of a user
-+     *
-+     * @param int $userId
-+     * @return void
-+     */
-+    public function setUserId(int $userId): void;
-+
-+    /**
-+     * Get id of a user
-+     *
-+     * @return int|null
-+     */
-+    public function getUserId(): ?int;
-+
-+    /**
-+     * Add an extension attribute
-+     *
-+     * @param string $key
-+     * @param mixed $value
-+     * @return void
-+     */
-+    public function addExtensionAttribute(string $key, $value): void;
-+
-+    /**
-+     * Get extension attributes data
-+     *
-+     * @return array
-+     */
-+    public function getExtensionAttributesData(): array;
-+}
-diff --git a/app/code/Magento/GraphQl/Model/Query/ContextParametersProcessorInterface.php b/app/code/Magento/GraphQl/Model/Query/ContextParametersProcessorInterface.php
-new file mode 100644
-index 00000000000..30f1835f2a0
---- /dev/null
-+++ b/app/code/Magento/GraphQl/Model/Query/ContextParametersProcessorInterface.php
-@@ -0,0 +1,27 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Model\Query;
-+
-+/**
-+ * Adding custom parameters to context object:
-+ *
-+ * - Add new processors argument item to ContextFactory in the di.xml.
-+ * - Class must extend ContextParametersProcessorInterface.
-+ * - Implement execute method which adds additional data to the context though extension attributes.
-+ * - This data will be present in each resolver.
-+ */
-+interface ContextParametersProcessorInterface
-+{
-+    /**
-+     * Extension point for adding custom parameters to context object
-+     *
-+     * @param ContextParametersInterface $contextParameters
-+     * @return ContextParametersInterface
-+     */
-+    public function execute(ContextParametersInterface $contextParameters): ContextParametersInterface;
-+}
-diff --git a/app/code/Magento/GraphQl/Model/Query/Resolver/Context.php b/app/code/Magento/GraphQl/Model/Query/Resolver/Context.php
-index 1eae619967e..2b8e3fabd68 100644
---- a/app/code/Magento/GraphQl/Model/Query/Resolver/Context.php
-+++ b/app/code/Magento/GraphQl/Model/Query/Resolver/Context.php
-@@ -7,16 +7,12 @@ declare(strict_types=1);
- 
- namespace Magento\GraphQl\Model\Query\Resolver;
- 
--use Magento\Authorization\Model\UserContextInterface;
--use Magento\Framework\Api\AttributeValueFactory;
--use Magento\Framework\Api\ExtensionAttributesFactory;
- use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
- 
- /**
-- * Concrete implementation for @see ContextInterface
-+ * Do not use this class. It was kept for backward compatibility.
-  *
-- * The purpose for this that GraphQL specification wants to make use of such object where multiple modules can
-- * participate with data through extension attributes.
-+ * @deprecated \Magento\GraphQl\Model\Query\Context is used instead of this
-  */
- class Context extends \Magento\Framework\Model\AbstractExtensibleModel implements ContextInterface
- {
-@@ -28,43 +24,7 @@ class Context extends \Magento\Framework\Model\AbstractExtensibleModel implement
-     /**#@-*/
- 
-     /**
--     * @var UserContextInterface
--     */
--    private $userContext;
--
--    /**
--     * @param \Magento\Framework\Model\Context $context
--     * @param \Magento\Framework\Registry $registry
--     * @param ExtensionAttributesFactory $extensionFactory
--     * @param AttributeValueFactory $customAttributeFactory
--     * @param UserContextInterface|null $userContext
--     * @param array $data
--     */
--    public function __construct(
--        \Magento\Framework\Model\Context $context,
--        \Magento\Framework\Registry $registry,
--        ExtensionAttributesFactory $extensionFactory,
--        AttributeValueFactory $customAttributeFactory,
--        UserContextInterface $userContext,
--        array $data = []
--    ) {
--        parent::__construct(
--            $context,
--            $registry,
--            $extensionFactory,
--            $customAttributeFactory
--        );
--        if (isset($data['id'])) {
--            $this->setId($data['id']);
--        }
--        if (isset($data['type'])) {
--            $this->setId($data['type']);
--        }
--        $this->userContext = $userContext;
--    }
--
--    /**
--     * {@inheritdoc}
-+     * Get extension attributes
-      *
-      * @return \Magento\Framework\GraphQl\Query\Resolver\ContextExtensionInterface
-      */
-@@ -74,7 +34,7 @@ class Context extends \Magento\Framework\Model\AbstractExtensibleModel implement
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Set extension attributes
-      *
-      * @param \Magento\Framework\GraphQl\Query\Resolver\ContextExtensionInterface $extensionAttributes
-      * @return ContextInterface
-@@ -86,18 +46,20 @@ class Context extends \Magento\Framework\Model\AbstractExtensibleModel implement
-     }
- 
-     /**
--     * @inheritDoc
-+     * Get user id
-+     *
-+     * @return int
-      */
-     public function getUserId() : int
-     {
--        if (!$this->getData(self::USER_ID)) {
--            $this->setUserId((int) $this->userContext->getUserId());
--        }
-         return (int) $this->getData(self::USER_ID);
-     }
- 
-     /**
--     * @inheritDoc
-+     * Set user id
-+     *
-+     * @param int $userId
-+     * @return ContextInterface
-      */
-     public function setUserId(int $userId) : ContextInterface
-     {
-@@ -105,18 +67,20 @@ class Context extends \Magento\Framework\Model\AbstractExtensibleModel implement
-     }
- 
-     /**
--     * @inheritDoc
-+     * Get user type
-+     *
-+     * @return int
-      */
-     public function getUserType() : int
-     {
--        if (!$this->getData(self::USER_TYPE_ID)) {
--            $this->setUserType($this->userContext->getUserType());
--        }
-         return (int) $this->getData(self::USER_TYPE_ID);
-     }
- 
-     /**
--     * @inheritDoc
-+     * Set user type
-+     *
-+     * @param int $typeId
-+     * @return ContextInterface
-      */
-     public function setUserType(int $typeId) : ContextInterface
-     {
-diff --git a/app/code/Magento/GraphQl/composer.json b/app/code/Magento/GraphQl/composer.json
-index 3e821b09094..51e93f01a6e 100644
---- a/app/code/Magento/GraphQl/composer.json
-+++ b/app/code/Magento/GraphQl/composer.json
-@@ -4,13 +4,12 @@
-     "type": "magento2-module",
-     "require": {
-         "php": "~7.1.3||~7.2.0",
--        "magento/module-authorization": "*",
--        "magento/module-store": "*",
-         "magento/module-eav": "*",
-         "magento/framework": "*"
-     },
-     "suggest": {
--        "magento/module-webapi": "*"
-+        "magento/module-webapi": "*",
-+        "magento/module-graph-ql-cache": "*"
-     },
-     "license": [
-         "OSL-3.0",
-diff --git a/app/code/Magento/GraphQl/etc/di.xml b/app/code/Magento/GraphQl/etc/di.xml
-index 105fa8bf166..b356f33c4f4 100644
---- a/app/code/Magento/GraphQl/etc/di.xml
-+++ b/app/code/Magento/GraphQl/etc/di.xml
-@@ -8,9 +8,12 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-     <preference for="Magento\Framework\GraphQl\Schema\SchemaGeneratorInterface" type="Magento\Framework\GraphQl\Schema\SchemaGenerator" />
-     <preference for="Magento\Framework\GraphQl\Query\Resolver\ContextInterface" type="Magento\GraphQl\Model\Query\Resolver\Context" />
-+    <preference for="Magento\GraphQl\Model\Query\ContextInterface" type="Magento\GraphQl\Model\Query\Context" />
-     <preference for="Magento\Framework\GraphQl\Schema\Type\Entity\MapperInterface" type="Magento\Framework\GraphQl\Schema\Type\Entity\DefaultMapper"/>
-     <preference for="Magento\Framework\GraphQl\Schema\Type\Enum\DataMapperInterface" type="Magento\Framework\GraphQl\Schema\Type\Enum\DefaultDataMapper"/>
-     <preference for="Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface" type="Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeReaderComposite"/>
-+    <preference for="Magento\GraphQl\Model\Query\ContextFactoryInterface" type="Magento\GraphQl\Model\Query\ContextFactory"/>
-+    <preference for="Magento\GraphQl\Model\Query\ContextParametersInterface" type="Magento\GraphQl\Model\Query\ContextParameters"/>
-     <type name="Magento\Framework\App\AreaList">
-         <arguments>
-             <argument name="areas" xsi:type="array">
-@@ -27,7 +30,7 @@
-             <argument name="factoryMapByConfigElementType" xsi:type="array">
-                 <item name="graphql_interface" xsi:type="object">Magento\Framework\GraphQl\Config\Element\InterfaceFactory</item>
-                 <item name="graphql_type" xsi:type="object">Magento\Framework\GraphQl\Config\Element\TypeFactory</item>
--                <item name="graphql_input" xsi:type="object">Magento\Framework\GraphQl\Config\Element\TypeFactory</item>
-+                <item name="graphql_input" xsi:type="object">Magento\Framework\GraphQl\Config\Element\InputFactory</item>
-                 <item name="graphql_enum" xsi:type="object">Magento\Framework\GraphQl\Config\Element\EnumFactory</item>
-             </argument>
-         </arguments>
-@@ -55,24 +58,16 @@
-             </argument>
-         </arguments>
-     </virtualType>
--    <type name="Magento\Framework\GraphQl\Schema\Type\Output\OutputFactory">
-+    <type name="Magento\Framework\GraphQl\Schema\Type\TypeRegistry">
-         <arguments>
--            <argument name="prototypes" xsi:type="array">
-+            <argument name="configToTypeMap" xsi:type="array">
-                 <item name="Magento\Framework\GraphQl\Config\Element\Type" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Output\OutputTypeObject</item>
-+                <item name="Magento\Framework\GraphQl\Config\Element\Input" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Input\InputObjectType</item>
-                 <item name="Magento\Framework\GraphQl\Config\Element\InterfaceType" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Output\OutputInterfaceObject</item>
-                 <item name="Magento\Framework\GraphQl\Config\Element\Enum" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Enum\Enum</item>
-             </argument>
-         </arguments>
-     </type>
--    <type name="Magento\Framework\GraphQl\Schema\Type\Input\InputFactory">
--        <arguments>
--            <argument name="prototypes" xsi:type="array">
--                <item name="Magento\Framework\GraphQl\Config\Element\Type" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Input\InputObjectType</item>
--                <item name="Magento\Framework\GraphQl\Config\Element\InterfaceType" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Input\InputObjectType</item>
--                <item name="Magento\Framework\GraphQl\Config\Element\Enum" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Enum\Enum</item>
--            </argument>
--        </arguments>
--    </type>
-     <type name="Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper">
-         <arguments>
-             <argument name="formatter" xsi:type="object">Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\FormatterComposite</argument>
-@@ -97,4 +92,10 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Framework\GraphQl\Query\QueryComplexityLimiter">
-+        <arguments>
-+            <argument name="queryDepth" xsi:type="number">20</argument>
-+            <argument name="queryComplexity" xsi:type="number">300</argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/GraphQl/etc/graphql/di.xml b/app/code/Magento/GraphQl/etc/graphql/di.xml
-index f4e6ca59364..03bae5c80e1 100644
---- a/app/code/Magento/GraphQl/etc/graphql/di.xml
-+++ b/app/code/Magento/GraphQl/etc/graphql/di.xml
-@@ -27,9 +27,9 @@
-     </type>
-     <type name="Magento\GraphQl\Controller\HttpRequestProcessor">
-         <arguments>
--            <argument name="graphQlHeaders" xsi:type="array">
--                <item name="Content-Type" xsi:type="object">Magento\GraphQl\Controller\HttpHeaderProcessor\ContentTypeProcessor</item>
--                <item name="Store" xsi:type="object">Magento\GraphQl\Controller\HttpHeaderProcessor\StoreProcessor</item>
-+            <argument name="requestValidators" xsi:type="array">
-+                <item name="ContentTypeValidator" xsi:type="object">Magento\GraphQl\Controller\HttpRequestValidator\ContentTypeValidator</item>
-+                <item name="VerbValidator" xsi:type="object">Magento\GraphQl\Controller\HttpRequestValidator\HttpVerbValidator</item>
-             </argument>
-         </arguments>
-     </type>
-diff --git a/app/code/Magento/GraphQl/etc/module.xml b/app/code/Magento/GraphQl/etc/module.xml
-index 4d8b2090a85..af0f5d06d3b 100644
---- a/app/code/Magento/GraphQl/etc/module.xml
-+++ b/app/code/Magento/GraphQl/etc/module.xml
-@@ -9,7 +9,6 @@
-     <module name="Magento_GraphQl" >
-         <sequence>
-             <module name="Magento_Authorization"/>
--            <module name="Magento_Store"/>
-             <module name="Magento_Eav"/>
-         </sequence>
-     </module>
-diff --git a/app/code/Magento/GraphQl/etc/schema.graphqls b/app/code/Magento/GraphQl/etc/schema.graphqls
-index c6651cdde0c..a3211c44a2e 100644
---- a/app/code/Magento/GraphQl/etc/schema.graphqls
-+++ b/app/code/Magento/GraphQl/etc/schema.graphqls
-@@ -5,12 +5,11 @@ type Query {
- }
- 
- type Mutation {
--    placeholderMutation: String @doc(description: "Mutation type cannot be declared without fields. The placeholder will be removed when at least one mutation field is declared.")
- }
- 
- input FilterTypeInput @doc(description: "FilterTypeInput specifies which action will be performed in a query ") {
-     eq: String @doc(description: "Equals")
--    finset: [String] @doc(description: "Find in set. The value can contain a set of comma-separated values")
-+    finset: [String] @deprecated (reason: "The finset filter is deprecated. Magento doesn't recomend to store comma separated values, therefore finset filter is redundant.")
-     from: String @doc(description: "From. Must be used with 'to'")
-     gt: String @doc(description: "Greater than")
-     gteq: String @doc(description: "Greater than or equal to")
-@@ -29,9 +28,192 @@ input FilterTypeInput @doc(description: "FilterTypeInput specifies which action
- type SearchResultPageInfo @doc(description: "SearchResultPageInfo provides navigation for the query response") {
-     page_size: Int @doc(description: "Specifies the maximum number of items to return")
-     current_page: Int @doc(description: "Specifies which page of results to return")
-+    total_pages: Int @doc(description: "Total pages")
- }
- 
- enum SortEnum @doc(description: "This enumeration indicates whether to return results in ascending or descending order") {
-     ASC
-     DESC
- }
-+
-+type ComplexTextValue {
-+    html: String! @doc(description: "HTML format")
-+}
-+
-+type Money @doc(description: "A Money object defines a monetary value, including a numeric value and a currency code.") {
-+    value: Float @doc(description: "A number expressing a monetary value")
-+    currency: CurrencyEnum @doc(description: "A three-letter currency code, such as USD or EUR")
-+}
-+
-+enum CurrencyEnum @doc(description: "The list of available currency codes") {
-+    AFN
-+    ALL
-+    AZN
-+    DZD
-+    AOA
-+    ARS
-+    AMD
-+    AWG
-+    AUD
-+    BSD
-+    BHD
-+    BDT
-+    BBD
-+    BYR
-+    BZD
-+    BMD
-+    BTN
-+    BOB
-+    BAM
-+    BWP
-+    BRL
-+    GBP
-+    BND
-+    BGN
-+    BUK
-+    BIF
-+    KHR
-+    CAD
-+    CVE
-+    CZK
-+    KYD
-+    GQE
-+    CLP
-+    CNY
-+    COP
-+    KMF
-+    CDF
-+    CRC
-+    HRK
-+    CUP
-+    DKK
-+    DJF
-+    DOP
-+    XCD
-+    EGP
-+    SVC
-+    ERN
-+    EEK
-+    ETB
-+    EUR
-+    FKP
-+    FJD
-+    GMD
-+    GEK
-+    GEL
-+    GHS
-+    GIP
-+    GTQ
-+    GNF
-+    GYD
-+    HTG
-+    HNL
-+    HKD
-+    HUF
-+    ISK
-+    INR
-+    IDR
-+    IRR
-+    IQD
-+    ILS
-+    JMD
-+    JPY
-+    JOD
-+    KZT
-+    KES
-+    KWD
-+    KGS
-+    LAK
-+    LVL
-+    LBP
-+    LSL
-+    LRD
-+    LYD
-+    LTL
-+    MOP
-+    MKD
-+    MGA
-+    MWK
-+    MYR
-+    MVR
-+    LSM
-+    MRO
-+    MUR
-+    MXN
-+    MDL
-+    MNT
-+    MAD
-+    MZN
-+    MMK
-+    NAD
-+    NPR
-+    ANG
-+    YTL
-+    NZD
-+    NIC
-+    NGN
-+    KPW
-+    NOK
-+    OMR
-+    PKR
-+    PAB
-+    PGK
-+    PYG
-+    PEN
-+    PHP
-+    PLN
-+    QAR
-+    RHD
-+    RON
-+    RUB
-+    RWF
-+    SHP
-+    STD
-+    SAR
-+    RSD
-+    SCR
-+    SLL
-+    SGD
-+    SKK
-+    SBD
-+    SOS
-+    ZAR
-+    KRW
-+    LKR
-+    SDG
-+    SRD
-+    SZL
-+    SEK
-+    CHF
-+    SYP
-+    TWD
-+    TJS
-+    TZS
-+    THB
-+    TOP
-+    TTD
-+    TND
-+    TMM
-+    USD
-+    UGX
-+    UAH
-+    AED
-+    UYU
-+    UZS
-+    VUV
-+    VEB
-+    VEF
-+    VND
-+    CHE
-+    CHW
-+    XOF
-+    WST
-+    YER
-+    ZMK
-+    ZWD
-+    TRY
-+    AZM
-+    ROL
-+    TRL
-+    XPF
-+}
-diff --git a/app/code/Magento/GraphQlCache/Controller/Plugin/GraphQl.php b/app/code/Magento/GraphQlCache/Controller/Plugin/GraphQl.php
-new file mode 100644
-index 00000000000..7c026e7d413
---- /dev/null
-+++ b/app/code/Magento/GraphQlCache/Controller/Plugin/GraphQl.php
-@@ -0,0 +1,108 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Controller\Plugin;
-+
-+use Magento\Framework\App\FrontControllerInterface;
-+use Magento\Framework\App\RequestInterface;
-+use Magento\GraphQlCache\Model\CacheableQuery;
-+use Magento\Framework\App\Response\Http as HttpResponse;
-+use Magento\Framework\Controller\ResultInterface;
-+use Magento\PageCache\Model\Config;
-+use Magento\GraphQl\Controller\HttpRequestProcessor;
-+use Magento\Framework\App\Response\Http as ResponseHttp;
-+
-+/**
-+ * Plugin for handling controller after controller tags and pre-controller validation.
-+ */
-+class GraphQl
-+{
-+    /**
-+     * @var CacheableQuery
-+     */
-+    private $cacheableQuery;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var HttpResponse
-+     */
-+    private $response;
-+
-+    /**
-+     * @var HttpRequestProcessor
-+     */
-+    private $requestProcessor;
-+
-+    /**
-+     * @param CacheableQuery $cacheableQuery
-+     * @param Config $config
-+     * @param HttpResponse $response
-+     * @param HttpRequestProcessor $requestProcessor
-+     */
-+    public function __construct(
-+        CacheableQuery $cacheableQuery,
-+        Config $config,
-+        HttpResponse $response,
-+        HttpRequestProcessor $requestProcessor
-+    ) {
-+        $this->cacheableQuery = $cacheableQuery;
-+        $this->config = $config;
-+        $this->response = $response;
-+        $this->requestProcessor = $requestProcessor;
-+    }
-+
-+    /**
-+     * Process graphql headers
-+     *
-+     * @param FrontControllerInterface $subject
-+     * @param RequestInterface $request
-+     * @return void
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function beforeDispatch(
-+        FrontControllerInterface $subject,
-+        RequestInterface $request
-+    ) {
-+        /** @var \Magento\Framework\App\Request\Http $request */
-+        $this->requestProcessor->processHeaders($request);
-+    }
-+
-+    /**
-+     * Plugin for GraphQL after render from dispatch to set tag and cache headers
-+     *
-+     * @param ResultInterface $subject
-+     * @param ResultInterface $result
-+     * @param ResponseHttp $response
-+     * @return ResultInterface
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterRenderResult(ResultInterface $subject, ResultInterface $result, ResponseHttp $response)
-+    {
-+        $sendNoCacheHeaders = false;
-+        if ($this->config->isEnabled()) {
-+            if ($this->cacheableQuery->shouldPopulateCacheHeadersWithTags()) {
-+                $this->response->setPublicHeaders($this->config->getTtl());
-+                $this->response->setHeader('X-Magento-Tags', implode(',', $this->cacheableQuery->getCacheTags()), true);
-+            } else {
-+                $sendNoCacheHeaders = true;
-+            }
-+        } else {
-+            $sendNoCacheHeaders = true;
-+        }
-+
-+        if ($sendNoCacheHeaders) {
-+            $this->response->setNoCacheHeaders();
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/GraphQlCache/Model/CacheableQuery.php b/app/code/Magento/GraphQlCache/Model/CacheableQuery.php
-new file mode 100644
-index 00000000000..451e1039eec
---- /dev/null
-+++ b/app/code/Magento/GraphQlCache/Model/CacheableQuery.php
-@@ -0,0 +1,77 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Model;
-+
-+/**
-+ * CacheableQuery should be used as a singleton for collecting cache related info and tags of all entities.
-+ */
-+class CacheableQuery
-+{
-+    /**
-+     * @var string[]
-+     */
-+    private $cacheTags = [];
-+
-+    /**
-+     * @var bool
-+     */
-+    private $cacheable = true;
-+
-+    /**
-+     * Return cache tags
-+     *
-+     * @return array
-+     */
-+    public function getCacheTags(): array
-+    {
-+        return $this->cacheTags;
-+    }
-+
-+    /**
-+     * Add Cache Tags
-+     *
-+     * @param array $cacheTags
-+     * @return void
-+     */
-+    public function addCacheTags(array $cacheTags): void
-+    {
-+        $this->cacheTags = array_merge($this->cacheTags, $cacheTags);
-+    }
-+
-+    /**
-+     * Return if its valid to cache the response
-+     *
-+     * @return bool
-+     */
-+    public function isCacheable(): bool
-+    {
-+        return $this->cacheable;
-+    }
-+
-+    /**
-+     * Set cache validity
-+     *
-+     * @param bool $cacheable
-+     */
-+    public function setCacheValidity(bool $cacheable): void
-+    {
-+        $this->cacheable = $cacheable;
-+    }
-+
-+    /**
-+     * Check if query is cacheable and we have a list of tags to populate
-+     *
-+     * @return bool
-+     */
-+    public function shouldPopulateCacheHeadersWithTags() : bool
-+    {
-+        $cacheTags = $this->getCacheTags();
-+        $isQueryCaheable = $this->isCacheable();
-+        return !empty($cacheTags) && $isQueryCaheable;
-+    }
-+}
-diff --git a/app/code/Magento/GraphQlCache/Model/CacheableQueryHandler.php b/app/code/Magento/GraphQlCache/Model/CacheableQueryHandler.php
-new file mode 100644
-index 00000000000..7e624845f56
---- /dev/null
-+++ b/app/code/Magento/GraphQlCache/Model/CacheableQueryHandler.php
-@@ -0,0 +1,94 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Model;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\App\RequestInterface;
-+use Magento\GraphQlCache\Model\Resolver\IdentityPool;
-+
-+/**
-+ * Handler of collecting tagging on cache.
-+ *
-+ * This class would be used to collect tags after each operation where we need to collect tags
-+ * usually after data is fetched or resolved.
-+ */
-+class CacheableQueryHandler
-+{
-+    /**
-+     * @var CacheableQuery
-+     */
-+    private $cacheableQuery;
-+
-+    /**
-+     * @var RequestInterface
-+     */
-+    private $request;
-+
-+    /**
-+     * @var IdentityPool
-+     */
-+    private $identityPool;
-+
-+    /**
-+     * @param CacheableQuery $cacheableQuery
-+     * @param RequestInterface $request
-+     * @param IdentityPool $identityPool
-+     */
-+    public function __construct(
-+        CacheableQuery $cacheableQuery,
-+        RequestInterface $request,
-+        IdentityPool $identityPool
-+    ) {
-+        $this->cacheableQuery = $cacheableQuery;
-+        $this->request = $request;
-+        $this->identityPool = $identityPool;
-+    }
-+
-+    /**
-+     * Set cache validity to the cacheableQuery after resolving any resolver or evaluating a promise in a query
-+     *
-+     * @param array $resolvedValue
-+     * @param Field $field
-+     * @return void
-+     */
-+    public function handleCacheFromResolverResponse(array $resolvedValue, Field $field) : void
-+    {
-+        $cache = $field->getCache();
-+        $cacheIdentityClass = $cache['cacheIdentity'] ?? '';
-+        $cacheable = $cache['cacheable'] ?? true;
-+        $cacheTag = $cache['cacheTag'] ?? null;
-+
-+        $cacheTags = [];
-+        if ($cacheTag && $this->request->isGet()) {
-+            if (!empty($cacheIdentityClass)) {
-+                $cacheIdentity = $this->identityPool->get($cacheIdentityClass);
-+                $cacheTagIds = $cacheIdentity->getIdentities($resolvedValue);
-+                if (!empty($cacheTagIds)) {
-+                    $cacheTags[] = $cacheTag;
-+                    foreach ($cacheTagIds as $cacheTagId) {
-+                        $cacheTags[] = $cacheTag . '_' . $cacheTagId;
-+                    }
-+                }
-+            }
-+            $this->cacheableQuery->addCacheTags($cacheTags);
-+        }
-+        $this->setCacheValidity($cacheable);
-+    }
-+
-+    /**
-+     * Set cache validity for the graphql request
-+     *
-+     * @param bool $isValid
-+     * @return void
-+     */
-+    private function setCacheValidity(bool $isValid): void
-+    {
-+        $cacheValidity = $this->cacheableQuery->isCacheable() && $isValid;
-+        $this->cacheableQuery->setCacheValidity($cacheValidity);
-+    }
-+}
-diff --git a/app/code/Magento/GraphQlCache/Model/Plugin/App/PageCache/Identifier.php b/app/code/Magento/GraphQlCache/Model/Plugin/App/PageCache/Identifier.php
-new file mode 100644
-index 00000000000..e02a51d2c1c
---- /dev/null
-+++ b/app/code/Magento/GraphQlCache/Model/Plugin/App/PageCache/Identifier.php
-@@ -0,0 +1,73 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Model\Plugin\App\PageCache;
-+
-+/**
-+ * Handles unique identifier for graphql query
-+ */
-+class Identifier
-+{
-+    /**
-+     * @var \Magento\Framework\App\Request\Http
-+     */
-+    private $request;
-+
-+    /**
-+     * @var \Magento\Framework\App\Http\Context
-+     */
-+    private $context;
-+
-+    /**
-+     * @var \Magento\Framework\Serialize\Serializer\Json
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @var \Magento\PageCache\Model\Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @param \Magento\Framework\App\Request\Http $request
-+     * @param \Magento\Framework\App\Http\Context $context
-+     * @param \Magento\Framework\Serialize\Serializer\Json $serializer
-+     * @param \Magento\PageCache\Model\Config $config
-+     */
-+    public function __construct(
-+        \Magento\Framework\App\Request\Http $request,
-+        \Magento\Framework\App\Http\Context $context,
-+        \Magento\Framework\Serialize\Serializer\Json $serializer,
-+        \Magento\PageCache\Model\Config $config
-+    ) {
-+        $this->request = $request;
-+        $this->context = $context;
-+        $this->serializer = $serializer;
-+        $this->config = $config;
-+    }
-+
-+    /**
-+     * Add/Override a unique key identifier for graphql specific query and variables that skips X-Magento-Vary cookie
-+     *
-+     * @param \Magento\Framework\App\PageCache\Identifier $identifier
-+     * @param string $result
-+     * @return string
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterGetValue(\Magento\Framework\App\PageCache\Identifier $identifier, string $result) : string
-+    {
-+        if ($this->config->isEnabled()) {
-+            $data = [
-+                $this->request->isSecure(),
-+                $this->request->getUriString(),
-+                $this->context->getVaryString()
-+            ];
-+            $result = sha1($this->serializer->serialize($data));
-+        }
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/GraphQlCache/Model/Plugin/Query/Resolver.php b/app/code/Magento/GraphQlCache/Model/Plugin/Query/Resolver.php
-new file mode 100644
-index 00000000000..54cb5559923
---- /dev/null
-+++ b/app/code/Magento/GraphQlCache/Model/Plugin/Query/Resolver.php
-@@ -0,0 +1,73 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Model\Plugin\Query;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\GraphQl\Model\Query\Resolver\Context;
-+use Magento\Framework\GraphQl\Query\Resolver\Value;
-+use Magento\GraphQlCache\Model\CacheableQueryHandler;
-+
-+/**
-+ * Plugin to handle cache validation that can be done after each resolver
-+ */
-+class Resolver
-+{
-+    /**
-+     * @var CacheableQueryHandler
-+     */
-+    private $cacheableQueryHandler;
-+
-+    /**
-+     * @param CacheableQueryHandler $cacheableQueryHandler
-+     */
-+    public function __construct(
-+        CacheableQueryHandler $cacheableQueryHandler
-+    ) {
-+        $this->cacheableQueryHandler = $cacheableQueryHandler;
-+    }
-+
-+    /**
-+     * Set cache validity to the cacheableQuery after resolving any resolver in a query
-+     *
-+     * @param ResolverInterface $subject
-+     * @param mixed|Value $resolvedValue
-+     * @param Field $field
-+     * @param Context $context
-+     * @param ResolveInfo $info
-+     * @param array|null $value
-+     * @param array|null $args
-+     * @return mixed
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterResolve(
-+        ResolverInterface $subject,
-+        $resolvedValue,
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        /** Only if array @see \Magento\Framework\GraphQl\Query\Resolver\Value */
-+        if (is_array($resolvedValue) && !empty($field->getCache())) {
-+            $this->cacheableQueryHandler->handleCacheFromResolverResponse($resolvedValue, $field);
-+        } elseif ($resolvedValue instanceof \Magento\Framework\GraphQl\Query\Resolver\Value) {
-+            $resolvedValue->then(function () use ($resolvedValue, $field) {
-+                if (is_array($resolvedValue->promise->result) && $field) {
-+                    $this->cacheableQueryHandler->handleCacheFromResolverResponse(
-+                        $resolvedValue->promise->result,
-+                        $field
-+                    );
-+                }
-+            });
-+        }
-+        return $resolvedValue;
-+    }
-+}
-diff --git a/app/code/Magento/GraphQlCache/Model/Resolver/IdentityPool.php b/app/code/Magento/GraphQlCache/Model/Resolver/IdentityPool.php
-new file mode 100644
-index 00000000000..00ef8762c28
---- /dev/null
-+++ b/app/code/Magento/GraphQlCache/Model/Resolver/IdentityPool.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Model\Resolver;
-+
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
-+
-+/**
-+ * Pool of IdentityInterface objects
-+ */
-+class IdentityPool
-+{
-+    /**
-+     * @var IdentityInterface[]
-+     */
-+    private $identityInstances = [];
-+
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @param ObjectManagerInterface $objectManager
-+     */
-+    public function __construct(ObjectManagerInterface $objectManager)
-+    {
-+        $this->objectManager = $objectManager;
-+    }
-+
-+    /**
-+     * Get an identity resolver by class name
-+     *
-+     * @param string $identityClass
-+     * @return IdentityInterface
-+     */
-+    public function get(string $identityClass): IdentityInterface
-+    {
-+        if (!isset($this->identityInstances[$identityClass])) {
-+            $this->identityInstances[$identityClass] = $this->objectManager->create($identityClass);
-+        }
-+        return $this->identityInstances[$identityClass];
-+    }
-+}
-diff --git a/app/code/Magento/GraphQlCache/README.md b/app/code/Magento/GraphQlCache/README.md
-new file mode 100644
-index 00000000000..fd2f19f957c
---- /dev/null
-+++ b/app/code/Magento/GraphQlCache/README.md
-@@ -0,0 +1,4 @@
-+# GraphQl Cache
-+
-+**GraphQL Cache** provides the ability to cache GraphQL queries.
-+This module allows Magento's built-in cache or Varnish as the application for serving the Full Page Cache to the front end. 
-diff --git a/app/code/Magento/GraphQlCache/Test/Unit/Model/CacheableQueryHandlerTest.php b/app/code/Magento/GraphQlCache/Test/Unit/Model/CacheableQueryHandlerTest.php
-new file mode 100644
-index 00000000000..9c1be899282
---- /dev/null
-+++ b/app/code/Magento/GraphQlCache/Test/Unit/Model/CacheableQueryHandlerTest.php
-@@ -0,0 +1,99 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Test\Unit\Model;
-+
-+use Magento\Framework\App\Request\Http;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
-+use Magento\GraphQlCache\Model\CacheableQueryHandler;
-+use Magento\GraphQlCache\Model\Resolver\IdentityPool;
-+use Magento\GraphQlCache\Model\CacheableQuery;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Test CacheableQueryHandler
-+ */
-+class CacheableQueryHandlerTest extends TestCase
-+{
-+
-+    private $cacheableQueryHandler;
-+
-+    private $cacheableQueryMock;
-+
-+    private $requestMock;
-+
-+    private $identityPoolMock;
-+
-+    protected function setup(): void
-+    {
-+        $objectManager = new ObjectManager($this);
-+        $this->cacheableQueryMock = $this->createMock(CacheableQuery::class);
-+        $this->requestMock = $this->createMock(Http::class);
-+        $this->identityPoolMock = $this->createMock(IdentityPool::class);
-+        $this->cacheableQueryHandler = $objectManager->getObject(
-+            CacheableQueryHandler::class,
-+            [
-+                'cacheableQuery' => $this->cacheableQueryMock,
-+                'request' => $this->requestMock,
-+                'identityPool' => $this->identityPoolMock
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @param array $resolvedData
-+     * @param array $identities
-+     * @dataProvider resolvedDataProvider
-+     */
-+    public function testhandleCacheFromResolverResponse(
-+        array $resolvedData,
-+        array $identities,
-+        array $expectedCacheTags
-+    ): void {
-+        $cacheData = [
-+            'cacheIdentity' => IdentityInterface::class,
-+            'cacheTag' => 'cat_p'
-+        ];
-+        $fieldMock = $this->createMock(Field::class);
-+        $mockIdentity = $this->getMockBuilder($cacheData['cacheIdentity'])
-+            ->setMethods(['getIdentities'])
-+            ->getMockForAbstractClass();
-+
-+        $this->requestMock->expects($this->once())->method('isGet')->willReturn(true);
-+        $this->identityPoolMock->expects($this->once())->method('get')->willReturn($mockIdentity);
-+        $fieldMock->expects($this->once())->method('getCache')->willReturn($cacheData);
-+        $mockIdentity->expects($this->once())
-+            ->method('getIdentities')
-+            ->with($resolvedData)
-+            ->willReturn($identities);
-+        $this->cacheableQueryMock->expects($this->once())->method('addCacheTags')->with($expectedCacheTags);
-+        $this->cacheableQueryMock->expects($this->once())->method('isCacheable')->willReturn(true);
-+        $this->cacheableQueryMock->expects($this->once())->method('setCacheValidity')->with(true);
-+
-+        $this->cacheableQueryHandler->handleCacheFromResolverResponse($resolvedData, $fieldMock);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function resolvedDataProvider(): array
-+    {
-+        return [
-+            [
-+                "resolvedData" => [
-+                    "id" => 10,
-+                    "name" => "TesName",
-+                    "sku" => "TestSku"
-+                ],
-+                "identities" => [10],
-+                "expectedCacheTags" => ["cat_p", "cat_p_10"]
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/GraphQlCache/composer.json b/app/code/Magento/GraphQlCache/composer.json
-new file mode 100644
-index 00000000000..436ae95da40
---- /dev/null
-+++ b/app/code/Magento/GraphQlCache/composer.json
-@@ -0,0 +1,23 @@
-+{
-+    "name": "magento/module-graph-ql-cache",
-+    "description": "N/A",
-+    "type": "magento2-module",
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-page-cache": "*",
-+        "magento/module-graph-ql": "*"
-+    },
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\GraphQlCache\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/GraphQlCache/etc/graphql/di.xml b/app/code/Magento/GraphQlCache/etc/graphql/di.xml
-new file mode 100644
-index 00000000000..5dd8c816ce9
---- /dev/null
-+++ b/app/code/Magento/GraphQlCache/etc/graphql/di.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\Framework\App\FrontControllerInterface">
-+        <plugin name="graphql-dispatch-plugin" type="Magento\GraphQlCache\Controller\Plugin\GraphQl"/>
-+        <plugin name="front-controller-builtin-cache" type="Magento\PageCache\Model\App\FrontController\BuiltinPlugin"/>
-+        <plugin name="front-controller-varnish-cache" type="Magento\PageCache\Model\App\FrontController\VarnishPlugin"/>
-+    </type>
-+    <type name="Magento\Framework\GraphQl\Query\ResolverInterface">
-+        <plugin name="cache" type="Magento\GraphQlCache\Model\Plugin\Query\Resolver"/>
-+    </type>
-+    <type name="Magento\Framework\App\PageCache\Identifier">
-+        <plugin name="core-app-area-design-exception-plugin"
-+                type="Magento\GraphQlCache\Model\Plugin\App\PageCache\Identifier" sortOrder="1"/>
-+    </type>
-+    <type name="Magento\Framework\Controller\ResultInterface">
-+        <plugin name="graphql-result-plugin" type="Magento\GraphQlCache\Controller\Plugin\GraphQl"/>
-+        <plugin name="result-builtin-cache" type="Magento\PageCache\Model\Controller\Result\BuiltinPlugin"/>
-+        <plugin name="result-varnish-cache" type="Magento\PageCache\Model\Controller\Result\VarnishPlugin"/>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/GraphQlCache/etc/module.xml b/app/code/Magento/GraphQlCache/etc/module.xml
-new file mode 100644
-index 00000000000..3cbd4d8f0cb
---- /dev/null
-+++ b/app/code/Magento/GraphQlCache/etc/module.xml
-@@ -0,0 +1,15 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_GraphQlCache">
-+        <sequence>
-+            <module name="Magento_PageCache"/>
-+            <module name="Magento_GraphQl"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/app/code/Magento/GraphQlCache/registration.php b/app/code/Magento/GraphQlCache/registration.php
-new file mode 100644
-index 00000000000..2dfe717003a
---- /dev/null
-+++ b/app/code/Magento/GraphQlCache/registration.php
-@@ -0,0 +1,9 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_GraphQlCache', __DIR__);
-diff --git a/app/code/Magento/GroupedCatalogInventory/LICENSE.txt b/app/code/Magento/GroupedCatalogInventory/LICENSE.txt
-new file mode 100644
-index 00000000000..49525fd99da
---- /dev/null
-+++ b/app/code/Magento/GroupedCatalogInventory/LICENSE.txt
-@@ -0,0 +1,48 @@
-+
-+Open Software License ("OSL") v. 3.0
-+
-+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-+
-+Licensed under the Open Software License version 3.0
-+
-+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-+
-+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-+
-+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-+
-+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
-+
-+         4. to perform the Original Work publicly; and
-+
-+         5. to display the Original Work publicly. 
-+
-+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-+
-+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-+
-+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-+
-+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-+
-+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-+
-+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-+
-+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-+
-+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-+
-+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-+
-+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-+
-+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-+
-+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-+
-+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-+
-+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
-\ No newline at end of file
-diff --git a/app/code/Magento/GroupedCatalogInventory/LICENSE_AFL.txt b/app/code/Magento/GroupedCatalogInventory/LICENSE_AFL.txt
-new file mode 100644
-index 00000000000..f39d641b18a
---- /dev/null
-+++ b/app/code/Magento/GroupedCatalogInventory/LICENSE_AFL.txt
-@@ -0,0 +1,48 @@
-+
-+Academic Free License ("AFL") v. 3.0
-+
-+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-+
-+Licensed under the Academic Free License version 3.0
-+
-+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-+
-+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-+
-+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-+
-+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
-+
-+         4. to perform the Original Work publicly; and
-+
-+         5. to display the Original Work publicly.
-+
-+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-+
-+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-+
-+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-+
-+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-+
-+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-+
-+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-+
-+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-+
-+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-+
-+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-+
-+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-+
-+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-+
-+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-+
-+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-+
-+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
-diff --git a/app/code/Magento/GroupedCatalogInventory/Plugin/OutOfStockFilter.php b/app/code/Magento/GroupedCatalogInventory/Plugin/OutOfStockFilter.php
-new file mode 100644
-index 00000000000..599f40deddd
---- /dev/null
-+++ b/app/code/Magento/GroupedCatalogInventory/Plugin/OutOfStockFilter.php
-@@ -0,0 +1,88 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\GroupedCatalogInventory\Plugin;
-+
-+use Magento\Catalog\Model\Product;
-+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
-+use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory;
-+use Magento\CatalogInventory\Api\StockStatusRepositoryInterface;
-+use Magento\GroupedProduct\Model\Product\Type\Grouped;
-+
-+/**
-+ * Removes out of stock products from cart candidates when appropriate
-+ */
-+class OutOfStockFilter
-+{
-+    /**
-+     * @var StockStatusRepositoryInterface
-+     */
-+    private $stockStatusRepository;
-+
-+    /**
-+     * @var StockStatusCriteriaInterfaceFactory
-+     */
-+    private $criteriaInterfaceFactory;
-+
-+    /**
-+     * @param StockStatusRepositoryInterface $stockStatusRepository
-+     * @param StockStatusCriteriaInterfaceFactory $criteriaInterfaceFactory
-+     */
-+    public function __construct(
-+        StockStatusRepositoryInterface $stockStatusRepository,
-+        StockStatusCriteriaInterfaceFactory $criteriaInterfaceFactory
-+    ) {
-+        $this->stockStatusRepository = $stockStatusRepository;
-+        $this->criteriaInterfaceFactory = $criteriaInterfaceFactory;
-+    }
-+
-+    /**
-+     * Removes out of stock products for requests that don't specify the super group
-+     *
-+     * @param Grouped $subject
-+     * @param array|string $result
-+     * @param \Magento\Framework\DataObject $buyRequest
-+     * @return string|array
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterPrepareForCartAdvanced(
-+        Grouped $subject,
-+        $result,
-+        \Magento\Framework\DataObject $buyRequest
-+    ) {
-+        if (!is_array($result) && $result instanceof Product) {
-+            $result = [$result];
-+        }
-+
-+        // Only remove out-of-stock products if no quantities were specified
-+        if (is_array($result) && !empty($result) && !$buyRequest->getData('super_group')) {
-+            $productIds = [];
-+            $productIdMap = [];
-+
-+            foreach ($result as $index => $cartItem) {
-+                $productIds[] = $cartItem->getId();
-+                $productIdMap[$cartItem->getId()] = $index;
-+            }
-+
-+            $criteria = $this->criteriaInterfaceFactory->create();
-+            $criteria->setProductsFilter($productIds);
-+
-+            $stockStatusCollection = $this->stockStatusRepository->getList($criteria);
-+            foreach ($stockStatusCollection->getItems() as $status) {
-+                /** @var $status StockStatusInterface */
-+                if ($status->getStockStatus() == StockStatusInterface::STATUS_OUT_OF_STOCK) {
-+                    unset($result[$productIdMap[$status->getProductId()]]);
-+                }
-+            }
-+
-+            unset($productIdMap);
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/GroupedCatalogInventory/README.md b/app/code/Magento/GroupedCatalogInventory/README.md
-new file mode 100644
-index 00000000000..c229c7e9919
---- /dev/null
-+++ b/app/code/Magento/GroupedCatalogInventory/README.md
-@@ -0,0 +1 @@
-+Magento_GroupedCatalogInventory contains behavior related to the inventory status of items within grouped products.
-diff --git a/app/code/Magento/GroupedCatalogInventory/Test/Unit/Plugin/OutOfStockFilterTest.php b/app/code/Magento/GroupedCatalogInventory/Test/Unit/Plugin/OutOfStockFilterTest.php
-new file mode 100644
-index 00000000000..07877938e36
---- /dev/null
-+++ b/app/code/Magento/GroupedCatalogInventory/Test/Unit/Plugin/OutOfStockFilterTest.php
-@@ -0,0 +1,221 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\GroupedCatalogInventory\Test\Unit\Plugin;
-+
-+use Magento\Catalog\Model\Product;
-+use Magento\CatalogInventory\Api\Data\StockStatusCollectionInterface;
-+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
-+use Magento\CatalogInventory\Api\StockStatusCriteriaInterface;
-+use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory;
-+use Magento\CatalogInventory\Api\StockStatusRepositoryInterface;
-+use Magento\Framework\DataObject;
-+use Magento\GroupedCatalogInventory\Plugin\OutOfStockFilter;
-+use Magento\GroupedProduct\Model\Product\Type\Grouped;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class OutOfStockFilterTest extends TestCase
-+{
-+    /**
-+     * @var MockObject
-+     */
-+    private $subjectMock;
-+
-+    /**
-+     * @var MockObject
-+     */
-+    private $stockStatusRepositoryMock;
-+
-+    /**
-+     * @var MockObject
-+     */
-+    private $searchCriteriaMock;
-+
-+    /**
-+     * @var MockObject
-+     */
-+    private $searchCriteriaFactoryMock;
-+
-+    /**
-+     * @var MockObject
-+     */
-+    private $stockStatusCollectionMock;
-+
-+    /**
-+     * @param $nonArrayResult
-+     * @dataProvider nonArrayResults
-+     */
-+    public function testFilterOnlyProcessesArray($nonArrayResult)
-+    {
-+        $this->searchCriteriaMock->expects($this->never())->method('setProductsFilter');
-+        $this->stockStatusRepositoryMock->expects($this->never())->method('getList');
-+
-+        $plugin = $this->getPluginInstance();
-+
-+        $result = $plugin->afterPrepareForCartAdvanced(
-+            $this->subjectMock,
-+            $nonArrayResult,
-+            new DataObject()
-+        );
-+
-+        $this->assertSame($nonArrayResult, $result);
-+    }
-+
-+    public function testFilterIgnoresResultIfSuperGroupIsPresent()
-+    {
-+        $this->searchCriteriaMock->expects($this->never())->method('setProductsFilter');
-+        $this->stockStatusRepositoryMock->expects($this->never())->method('getList');
-+
-+        $plugin = $this->getPluginInstance();
-+
-+        $product = $this->createProductMock();
-+
-+        $result = $plugin->afterPrepareForCartAdvanced(
-+            $this->subjectMock,
-+            [$product],
-+            new DataObject(['super_group' => [123 => '1']])
-+        );
-+
-+        $this->assertSame([$product], $result);
-+    }
-+
-+    /**
-+     * @param $originalResult
-+     * @param $stockStatusCollection
-+     * @param $expectedResult
-+     * @dataProvider outOfStockProductData
-+     */
-+    public function testFilterRemovesOutOfStockProductsWhenSuperGroupIsNotPresent(
-+        $originalResult,
-+        $stockStatusCollection,
-+        $expectedResult
-+    ) {
-+        $this->stockStatusRepositoryMock
-+            ->expects($this->once())
-+            ->method('getList')
-+            ->with($this->searchCriteriaMock)
-+            ->willReturn($stockStatusCollection);
-+
-+        $plugin = $this->getPluginInstance();
-+
-+        $result = $plugin->afterPrepareForCartAdvanced(
-+            $this->subjectMock,
-+            $originalResult,
-+            new DataObject()
-+        );
-+
-+        $this->assertSame($expectedResult, $result);
-+    }
-+
-+    public function outOfStockProductData()
-+    {
-+        $product1 = $this->createProductMock();
-+        $product1->method('getId')->willReturn(123);
-+
-+        $product2 = $this->createProductMock();
-+        $product2->method('getId')->willReturn(321);
-+
-+        return [
-+            [[$product1, $product2], $this->createStatusResult([123 => false, 321 => true]), [1 => $product2]],
-+            [[$product1], $this->createStatusResult([123 => true]), [0 => $product1]],
-+            [$product1, $this->createStatusResult([123 => true]), [0 => $product1]]
-+        ];
-+    }
-+
-+    public function nonArrayResults()
-+    {
-+        return [
-+            [123],
-+            ['abc'],
-+            [new \stdClass()]
-+        ];
-+    }
-+
-+    protected function setUp()
-+    {
-+        $this->subjectMock = $this->getMockBuilder(Grouped::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->stockStatusRepositoryMock = $this->getMockBuilder(StockStatusRepositoryInterface::class)
-+            ->getMock();
-+
-+        $this->searchCriteriaFactoryMock = $this->getMockBuilder(StockStatusCriteriaInterfaceFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->searchCriteriaMock = $this->getMockBuilder(StockStatusCriteriaInterface::class)
-+            ->getMock();
-+
-+        $this->stockStatusCollectionMock = $this->getMockBuilder(StockStatusCollectionInterface::class)
-+            ->getMock();
-+
-+        $this->searchCriteriaFactoryMock
-+            ->expects($this->any())
-+            ->method('create')
-+            ->willReturn($this->searchCriteriaMock);
-+    }
-+
-+    private function createProductMock()
-+    {
-+        return $this->getMockBuilder(Product::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+    }
-+
-+    /**
-+     * @return OutOfStockFilter
-+     */
-+    private function getPluginInstance()
-+    {
-+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+
-+        /** @var OutOfStockFilter $filter */
-+        $filter = $objectManager->getObject(OutOfStockFilter::class, [
-+            'stockStatusRepository' => $this->stockStatusRepositoryMock,
-+            'criteriaInterfaceFactory' => $this->searchCriteriaFactoryMock
-+        ]);
-+
-+        return $filter;
-+    }
-+
-+    private function createStatusResult(array $productStatuses)
-+    {
-+        $result = [];
-+
-+        foreach ($productStatuses as $productId => $status) {
-+            $mock = $this->getMockBuilder(StockStatusInterface::class)
-+                ->getMock();
-+
-+            $mock->expects($this->any())
-+                ->method('getProductId')
-+                ->willReturn($productId);
-+
-+            $mock->expects($this->any())
-+                ->method('getStockStatus')
-+                ->willReturn(
-+                    $status
-+                    ? StockStatusInterface::STATUS_IN_STOCK
-+                    : StockStatusInterface::STATUS_OUT_OF_STOCK
-+                );
-+
-+            $result[] = $mock;
-+        }
-+
-+        $stockStatusCollection = $this->getMockBuilder(StockStatusCollectionInterface::class)
-+            ->getMock();
-+
-+        $stockStatusCollection
-+            ->expects($this->once())
-+            ->method('getItems')
-+            ->willReturn($result);
-+
-+        return $stockStatusCollection;
-+    }
-+}
-diff --git a/app/code/Magento/GroupedCatalogInventory/composer.json b/app/code/Magento/GroupedCatalogInventory/composer.json
-new file mode 100644
-index 00000000000..c9946bc3f36
---- /dev/null
-+++ b/app/code/Magento/GroupedCatalogInventory/composer.json
-@@ -0,0 +1,27 @@
-+{
-+    "name": "magento/module-grouped-catalog-inventory",
-+    "description": "N/A",
-+    "config": {
-+        "sort-packages": true
-+    },
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-catalog": "*",
-+        "magento/module-catalog-inventory": "*",
-+        "magento/module-grouped-product": "*"
-+    },
-+    "type": "magento2-module",
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\GroupedCatalogInventory\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/GroupedCatalogInventory/etc/di.xml b/app/code/Magento/GroupedCatalogInventory/etc/di.xml
-new file mode 100644
-index 00000000000..f38a9e845a1
---- /dev/null
-+++ b/app/code/Magento/GroupedCatalogInventory/etc/di.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\GroupedProduct\Model\Product\Type\Grouped">
-+        <plugin name="outOfStockFilter" type="Magento\GroupedCatalogInventory\Plugin\OutOfStockFilter" />
-+    </type>
-+</config>
-diff --git a/app/code/Magento/GroupedCatalogInventory/etc/module.xml b/app/code/Magento/GroupedCatalogInventory/etc/module.xml
-new file mode 100644
-index 00000000000..246f10ff679
---- /dev/null
-+++ b/app/code/Magento/GroupedCatalogInventory/etc/module.xml
-@@ -0,0 +1,15 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_GroupedCatalogInventory" >
-+        <sequence>
-+            <module name="Magento_Catalog"/>
-+            <module name="Magento_GroupedProduct"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/app/code/Magento/GroupedCatalogInventory/registration.php b/app/code/Magento/GroupedCatalogInventory/registration.php
-new file mode 100644
-index 00000000000..8899a48edf6
---- /dev/null
-+++ b/app/code/Magento/GroupedCatalogInventory/registration.php
-@@ -0,0 +1,9 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use \Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_GroupedCatalogInventory', __DIR__);
-diff --git a/app/code/Magento/GroupedImportExport/etc/di.xml b/app/code/Magento/GroupedImportExport/etc/di.xml
-index 38030b3ec94..25fd3b56975 100644
---- a/app/code/Magento/GroupedImportExport/etc/di.xml
-+++ b/app/code/Magento/GroupedImportExport/etc/di.xml
-@@ -9,7 +9,7 @@
-     <type name="Magento\CatalogImportExport\Model\Export\RowCustomizer\Composite">
-         <arguments>
-             <argument name="customizers" xsi:type="array">
--                <item name="gropedProduct" xsi:type="string">Magento\GroupedImportExport\Model\Export\RowCustomizer</item>
-+                <item name="groupedProduct" xsi:type="string">Magento\GroupedImportExport\Model\Export\RowCustomizer</item>
-             </argument>
-         </arguments>
-     </type>
-diff --git a/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php
-index 7b9523015c8..a1dc9033642 100644
---- a/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php
-+++ b/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php
-@@ -8,6 +8,7 @@ namespace Magento\GroupedProduct\Model\Product\Initialization\Helper\ProductLink
- use Magento\Catalog\Api\Data\ProductLinkExtensionFactory;
- use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
- use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Api\SimpleDataObjectConverter;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\GroupedProduct\Model\Product\Type\Grouped as TypeGrouped;
- 
-@@ -111,7 +112,7 @@ class Grouped
-                     foreach ($linkRaw['custom_attributes'] as $option) {
-                         $name = $option['attribute_code'];
-                         $value = $option['value'];
--                        $setterName = 'set' . ucfirst($name);
-+                        $setterName = 'set' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($name);
-                         // Check if setter exists
-                         if (method_exists($productLinkExtension, $setterName)) {
-                             call_user_func([$productLinkExtension, $setterName], $value);
-diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
-index e1c97c8912c..187fd27fa05 100644
---- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
-+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
-@@ -10,6 +10,8 @@ namespace Magento\GroupedProduct\Model\Product\Type;
- use Magento\Catalog\Api\ProductRepositoryInterface;
- 
- /**
-+ * Grouped product type model
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @api
-  * @since 100.0.2
-@@ -208,7 +210,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
-             $collection = $this->getAssociatedProductCollection(
-                 $product
-             )->addAttributeToSelect(
--                ['name', 'price', 'special_price', 'special_from_date', 'special_to_date', 'tax_class_id']
-+                ['name', 'price', 'special_price', 'special_from_date', 'special_to_date', 'tax_class_id', 'image']
-             )->addFilterByRequiredOptions()->setPositionOrder()->addStoreFilter(
-                 $this->getStoreFilter($product)
-             )->addAttributeToFilter(
-@@ -226,13 +228,15 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
-     }
- 
-     /**
-+     * Flush Associated Products Cache
-+     *
-      * @param \Magento\Catalog\Model\Product $product
-      * @return \Magento\Catalog\Model\Product
-      * @since 100.1.0
-      */
-     public function flushAssociatedProductsCache($product)
-     {
--        return $product->unsData($this->_keyAssociatedProducts);
-+        return $product->unsetData($this->_keyAssociatedProducts);
-     }
- 
-     /**
-@@ -323,6 +327,8 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
-     }
- 
-     /**
-+     * Returns product info
-+     *
-      * @param \Magento\Framework\DataObject $buyRequest
-      * @param \Magento\Catalog\Model\Product $product
-      * @param bool $isStrictProcessMode
-@@ -341,7 +347,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
-                 if ($isStrictProcessMode && !$subProduct->getQty()) {
-                     return __('Please specify the quantity of product(s).')->render();
-                 }
--                $productsInfo[$subProduct->getId()] = intval($subProduct->getQty());
-+                $productsInfo[$subProduct->getId()] = $subProduct->isSalable() ? (float)$subProduct->getQty() : 0;
-             }
-         }
- 
-@@ -350,6 +356,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
- 
-     /**
-      * Prepare product and its configuration to be added to some products list.
-+     *
-      * Perform standard preparation process and add logic specific to Grouped product type.
-      *
-      * @param \Magento\Framework\DataObject $buyRequest
-@@ -423,6 +430,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
- 
-     /**
-      * Retrieve products divided into groups required to purchase
-+     *
-      * At least one product in each group has to be purchased
-      *
-      * @param \Magento\Catalog\Model\Product $product
-@@ -436,8 +444,8 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
-     /**
-      * Prepare selected qty for grouped product's options
-      *
--     * @param  \Magento\Catalog\Model\Product $product
--     * @param  \Magento\Framework\DataObject $buyRequest
-+     * @param \Magento\Catalog\Model\Product $product
-+     * @param \Magento\Framework\DataObject $buyRequest
-      * @return array
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-@@ -467,25 +475,30 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
-      * @param \Magento\Catalog\Model\Product $product
-      * @return void
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
-      */
-     public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
-     {
-     }
-+    //phpcs:enable
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function beforeSave($product)
-     {
-         //clear cached associated links
-         $product->unsetData($this->_keyAssociatedProducts);
-         if ($product->hasData('product_options') && !empty($product->getData('product_options'))) {
-+            //phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception('Custom options for grouped product type are not supported');
-         }
-         return parent::beforeSave($product);
-     }
- 
-     /**
-+     * Returns msrp for children products
-+     *
-      * @param \Magento\Catalog\Model\Product $product
-      * @return int
-      */
-diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Plugin.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Plugin.php
-index 866a55c265f..4777b2bae07 100644
---- a/app/code/Magento/GroupedProduct/Model/Product/Type/Plugin.php
-+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Plugin.php
-@@ -6,19 +6,22 @@
-  */
- namespace Magento\GroupedProduct\Model\Product\Type;
- 
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- 
-+/**
-+ * Plugin.
-+ */
- class Plugin
- {
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-     /**
--     * @param Manager $moduleManager
-+     * @param ModuleManagerInterface $moduleManager
-      */
--    public function __construct(Manager $moduleManager)
-+    public function __construct(ModuleManagerInterface $moduleManager)
-     {
-         $this->moduleManager = $moduleManager;
-     }
-diff --git a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php
-index cbbb58d3c24..e1599dc772c 100644
---- a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php
-+++ b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php
-@@ -7,140 +7,211 @@
-  */
- namespace Magento\GroupedProduct\Model\ResourceModel\Product\Indexer\Price;
- 
--use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice;
- use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Framework\App\ResourceConnection;
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+use Magento\Framework\Indexer\DimensionalIndexerInterface;
-+use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
-+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
-+use Magento\GroupedProduct\Model\ResourceModel\Product\Link;
-+use Magento\GroupedProduct\Model\Product\Type\Grouped as GroupedType;
- 
--class Grouped extends DefaultPrice implements GroupedInterface
-+/**
-+ * Calculate minimal and maximal prices for Grouped products
-+ * Use calculated price for relation products
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class Grouped implements DimensionalIndexerInterface
- {
-     /**
--     * Prefix for temporary table support.
-+     * @var IndexTableStructureFactory
-      */
--    const TRANSIT_PREFIX = 'transit_';
-+    private $indexTableStructureFactory;
- 
-     /**
--     * @inheritdoc
-+     * @var TableMaintainer
-      */
--    protected function reindex($entityIds = null)
--    {
--        $this->_prepareGroupedProductPriceData($entityIds);
-+    private $tableMaintainer;
-+
-+    /**
-+     * @var MetadataPool
-+     */
-+    private $metadataPool;
-+
-+    /**
-+     * @var ResourceConnection
-+     */
-+    private $resource;
-+
-+    /**
-+     * @var string
-+     */
-+    private $connectionName;
-+
-+    /**
-+     * @var AdapterInterface
-+     */
-+    private $connection;
-+
-+    /**
-+     * @var bool
-+     */
-+    private $fullReindexAction;
-+
-+    /**
-+     * @param IndexTableStructureFactory $indexTableStructureFactory
-+     * @param TableMaintainer $tableMaintainer
-+     * @param MetadataPool $metadataPool
-+     * @param ResourceConnection $resource
-+     * @param string $connectionName
-+     * @param bool $fullReindexAction
-+     */
-+    public function __construct(
-+        IndexTableStructureFactory $indexTableStructureFactory,
-+        TableMaintainer $tableMaintainer,
-+        MetadataPool $metadataPool,
-+        ResourceConnection $resource,
-+        $connectionName = 'indexer',
-+        $fullReindexAction = false
-+    ) {
-+        $this->indexTableStructureFactory = $indexTableStructureFactory;
-+        $this->tableMaintainer = $tableMaintainer;
-+        $this->connectionName = $connectionName;
-+        $this->metadataPool = $metadataPool;
-+        $this->resource = $resource;
-+        $this->fullReindexAction = $fullReindexAction;
-     }
- 
-     /**
--     * Calculate minimal and maximal prices for Grouped products
--     * Use calculated price for relation products
--     *
--     * @param int|array $entityIds  the parent entity ids limitation
--     * @return $this
-+     * {@inheritdoc}
-+     * @param array $dimensions
-+     * @param \Traversable $entityIds
-+     * @throws \Exception
-      */
--    protected function _prepareGroupedProductPriceData($entityIds = null)
-+    public function executeByDimensions(array $dimensions, \Traversable $entityIds)
-     {
--        if (!$this->hasEntity() && empty($entityIds)) {
--            return $this;
--        }
--
--        $connection = $this->getConnection();
--        $table = $this->getIdxTable();
--
--        if (!$this->tableStrategy->getUseIdxTable()) {
--            $additionalIdxTable = $connection->getTableName(self::TRANSIT_PREFIX . $this->getIdxTable());
--            $connection->createTemporaryTableLike($additionalIdxTable, $table);
--            $query = $connection->insertFromSelect(
--                $this->_prepareGroupedProductPriceDataSelect($entityIds),
--                $additionalIdxTable,
--                []
--            );
--            $connection->query($query);
--
--            $select = $connection->select()->from($additionalIdxTable);
--            $query = $connection->insertFromSelect(
--                $select,
--                $table,
--                [],
--                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
--            );
--            $connection->query($query);
--            $connection->dropTemporaryTable($additionalIdxTable);
--        } else {
--            $query = $this->_prepareGroupedProductPriceDataSelect($entityIds)->insertFromSelect($table);
--            $connection->query($query);
--        }
--        return $this;
-+        /** @var IndexTableStructure $temporaryPriceTable */
-+        $temporaryPriceTable = $this->indexTableStructureFactory->create([
-+            'tableName' => $this->tableMaintainer->getMainTmpTable($dimensions),
-+            'entityField' => 'entity_id',
-+            'customerGroupField' => 'customer_group_id',
-+            'websiteField' => 'website_id',
-+            'taxClassField' => 'tax_class_id',
-+            'originalPriceField' => 'price',
-+            'finalPriceField' => 'final_price',
-+            'minPriceField' => 'min_price',
-+            'maxPriceField' => 'max_price',
-+            'tierPriceField' => 'tier_price',
-+        ]);
-+        $query = $this->prepareGroupedProductPriceDataSelect($dimensions, iterator_to_array($entityIds))
-+            ->insertFromSelect($temporaryPriceTable->getTableName());
-+        $this->getConnection()->query($query);
-     }
- 
-     /**
-      * Prepare data index select for Grouped products prices
-      *
--     * @param int|array $entityIds  the parent entity ids limitation
-+     * @param array $dimensions
-+     * @param array $entityIds the parent entity ids limitation
-      * @return \Magento\Framework\DB\Select
-+     * @throws \Exception
-      */
--    protected function _prepareGroupedProductPriceDataSelect($entityIds = null)
-+    private function prepareGroupedProductPriceDataSelect(array $dimensions, array $entityIds)
-     {
--        $connection = $this->getConnection();
--        $table = $this->getIdxTable();
--        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
--        $select = $connection->select()->from(
-+        $select = $this->getConnection()->select();
-+
-+        $select->from(
-             ['e' => $this->getTable('catalog_product_entity')],
-             'entity_id'
--        )->joinLeft(
-+        );
-+
-+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-+        $select->joinLeft(
-             ['l' => $this->getTable('catalog_product_link')],
--            'e.' . $linkField . ' = l.product_id AND l.link_type_id=' .
--            \Magento\GroupedProduct\Model\ResourceModel\Product\Link::LINK_TYPE_GROUPED,
-+            'e.' . $linkField . ' = l.product_id AND l.link_type_id=' . Link::LINK_TYPE_GROUPED,
-             []
--        )->join(
--            ['cg' => $this->getTable('customer_group')],
--            '',
--            ['customer_group_id']
-         );
--        $this->_addWebsiteJoinToSelect($select, true);
--        $this->_addProductWebsiteJoinToSelect($select, 'cw.website_id', 'e.entity_id');
--        $minCheckSql = $connection->getCheckSql('le.required_options = 0', 'i.min_price', 0);
--        $maxCheckSql = $connection->getCheckSql('le.required_options = 0', 'i.max_price', 0);
--        $select->columns(
--            'website_id',
--            'cw'
--        )->joinLeft(
-+        //additional information about inner products
-+        $select->joinLeft(
-             ['le' => $this->getTable('catalog_product_entity')],
-             'le.entity_id = l.linked_product_id',
-             []
--        )->joinLeft(
--            ['i' => $table],
--            'i.entity_id = l.linked_product_id AND i.website_id = cw.website_id' .
--            ' AND i.customer_group_id = cg.customer_group_id',
-+        );
-+        $select->columns(
-+            [
-+                'i.customer_group_id',
-+                'i.website_id',
-+            ]
-+        );
-+        $taxClassId = $this->getConnection()->getCheckSql('MIN(i.tax_class_id) IS NULL', '0', 'MIN(i.tax_class_id)');
-+        $minCheckSql = $this->getConnection()->getCheckSql('le.required_options = 0', 'i.min_price', 0);
-+        $maxCheckSql = $this->getConnection()->getCheckSql('le.required_options = 0', 'i.max_price', 0);
-+        $select->join(
-+            ['i' => $this->getMainTable($dimensions)],
-+            'i.entity_id = l.linked_product_id',
-             [
--                'tax_class_id' => $this->getConnection()->getCheckSql(
--                    'MIN(i.tax_class_id) IS NULL',
--                    '0',
--                    'MIN(i.tax_class_id)'
--                ),
-+                'tax_class_id' => $taxClassId,
-                 'price' => new \Zend_Db_Expr('NULL'),
-                 'final_price' => new \Zend_Db_Expr('NULL'),
-                 'min_price' => new \Zend_Db_Expr('MIN(' . $minCheckSql . ')'),
-                 'max_price' => new \Zend_Db_Expr('MAX(' . $maxCheckSql . ')'),
-                 'tier_price' => new \Zend_Db_Expr('NULL'),
-             ]
--        )->group(
--            ['e.entity_id', 'cg.customer_group_id', 'cw.website_id']
--        )->where(
-+        );
-+        $select->group(
-+            ['e.entity_id', 'i.customer_group_id', 'i.website_id']
-+        );
-+        $select->where(
-             'e.type_id=?',
--            $this->getTypeId()
-+            GroupedType::TYPE_CODE
-         );
- 
-         if ($entityIds !== null) {
-             $select->where('e.entity_id IN(?)', $entityIds);
-         }
- 
--        /**
--         * Add additional external limitation
--         */
--        $this->_eventManager->dispatch(
--            'catalog_product_prepare_index_select',
--            [
--                'select' => $select,
--                'entity_field' => new \Zend_Db_Expr('e.entity_id'),
--                'website_field' => new \Zend_Db_Expr('cw.website_id'),
--                'store_field' => new \Zend_Db_Expr('cs.store_id')
--            ]
--        );
-         return $select;
-     }
-+
-+    /**
-+     * Get main table
-+     *
-+     * @param array $dimensions
-+     * @return string
-+     */
-+    private function getMainTable($dimensions)
-+    {
-+        if ($this->fullReindexAction) {
-+            return $this->tableMaintainer->getMainReplicaTable($dimensions);
-+        }
-+        return $this->tableMaintainer->getMainTable($dimensions);
-+    }
-+
-+    /**
-+     * Get connection
-+     *
-+     * return \Magento\Framework\DB\Adapter\AdapterInterface
-+     * @throws \DomainException
-+     */
-+    private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
-+    {
-+        if ($this->connection === null) {
-+            $this->connection = $this->resource->getConnection($this->connectionName);
-+        }
-+
-+        return $this->connection;
-+    }
-+
-+    /**
-+     * Get table
-+     *
-+     * @param string $tableName
-+     * @return string
-+     */
-+    private function getTable($tableName)
-+    {
-+        return $this->resource->getTableName($tableName, $this->connectionName);
-+    }
- }
-diff --git a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php
-index 8d1548036cd..519da205108 100644
---- a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php
-+++ b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php
-@@ -8,7 +8,10 @@
- namespace Magento\GroupedProduct\Model\ResourceModel\Product\Type\Grouped;
- 
- /**
-+ * Associated products collection.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class AssociatedProductsCollection extends \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection
- {
-@@ -18,7 +21,6 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\ResourceModel\
-      * @var \Magento\Framework\Registry
-      */
-     protected $_coreRegistry = null;
--
-     /**
-      * Product types config
-      *
-@@ -39,7 +41,7 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\ResourceModel\
-      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
-@@ -65,7 +67,7 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\ResourceModel\
-         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-         \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
-diff --git a/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredRegularPrice.php b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredRegularPrice.php
-index 8b29e82d93a..6a6b3555710 100644
---- a/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredRegularPrice.php
-+++ b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredRegularPrice.php
-@@ -82,7 +82,7 @@ class ConfiguredRegularPrice extends AbstractPrice implements ConfiguredPriceInt
-             if ($this->value === null) {
-                 $price = $this->product->getPrice();
-                 $priceInCurrentCurrency = $this->priceCurrency->convertAndRound($price);
--                $this->value = $priceInCurrentCurrency ? floatval($priceInCurrentCurrency) : false;
-+                $this->value = $priceInCurrentCurrency ? (float)$priceInCurrentCurrency : false;
-             }
- 
-             return $this->value;
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.xml b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.xml
-index 720f5a2c2b9..e246612bc6c 100644
---- a/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.xml
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Check that required fields are actually required-->
-     <actionGroup name="checkRequiredFieldsInGroupedProductForm">
-         <clearField selector="{{AdminProductFormSection.productName}}" stepKey="clearProductSku"/>
-@@ -52,4 +52,22 @@
-         </arguments>
-         <fillField selector="{{AdminAddedProductsToGroupGrid.inputByProductName(productName)}}" userInput="{{qty}}" stepKey="fillDefaultQtyForLinkedProduct"/>
-     </actionGroup>
-+
-+    <!-- Assign Specified Product To Grouped Product -->
-+    <!-- Assumes web client is on grouped product edit page -->
-+    <actionGroup name="AdminAssignProductToGroup">
-+        <arguments>
-+            <argument name="product"/>
-+        </arguments>
-+
-+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection"/>
-+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection"/>
-+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>
-+        <conditionalClick selector="{{AdminAddProductsToGroupPanel.clearFilters}}" dependentSelector="{{AdminAddProductsToGroupPanel.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
-+        <click selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="showFiltersPanel"/>
-+        <fillField userInput="{{product.name}}" selector="{{AdminAddProductsToGroupPanel.nameFilter}}" stepKey="fillNameFilter"/>
-+        <click selector="{{AdminAddProductsToGroupPanel.applyFilters}}" stepKey="clickApplyFilters"/>
-+        <click selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="selectProduct"/>
-+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminOrderGroupedProductActionGroup.xml b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminOrderGroupedProductActionGroup.xml
-new file mode 100644
-index 00000000000..7028d1c8a6f
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminOrderGroupedProductActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOrderConfigureGroupedProduct">
-+        <arguments>
-+            <argument name="productSku" type="string" defaultValue="{{SimpleProduct.sku}}"/>
-+            <argument name="productQty" type="string" defaultValue="1"/>
-+        </arguments>
-+        <click selector="{{AdminOrderFormItemsOrderedSection.configureButtonBySku}}" stepKey="clickConfigure"/>
-+        <waitForPageLoad stepKey="waitForConfigurePageLoad"/>
-+        <fillField selector="{{AdminOrderFormGroupedProductSection.optionQty(productSku)}}" userInput="{{productQty}}" stepKey="fillOptionQuantity"/>
-+        <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOk"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AssertLinkPresenceOnGroupedProductPageActionGroup.xml b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AssertLinkPresenceOnGroupedProductPageActionGroup.xml
-new file mode 100644
-index 00000000000..bce78f8bf99
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AssertLinkPresenceOnGroupedProductPageActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Check for the product link. -->
-+    <!-- Assumes web client is on Grouped Product Page -->
-+    <actionGroup name="AssertLinkPresenceOnGroupedProductPage">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <see selector="{{StorefrontProductInfoMainSection.groupedProductsTable}}" userInput="{{productName}}" stepKey="seeFirstStagedGroupedProduct"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/StorefrontAddThreeGroupedProductToTheCartActionGroup.xml b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/StorefrontAddThreeGroupedProductToTheCartActionGroup.xml
-new file mode 100644
-index 00000000000..ba198ea9992
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/StorefrontAddThreeGroupedProductToTheCartActionGroup.xml
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Check that required fields are actually required-->
-+    <actionGroup name="StorefrontAddThreeGroupedProductToTheCartActionGroup">
-+        <arguments>
-+            <argument name="urlKey" type="string"/>
-+            <argument name="product1" type="string"/>
-+            <argument name="product2" type="string"/>
-+            <argument name="product3" type="string"/>
-+            <argument name="qty1" type="string"/>
-+            <argument name="qty2" type="string"/>
-+            <argument name="qty3" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontProductPage.url(urlKey)}}" stepKey="OpenStoreFrontProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <fillField stepKey="fillQuantityForProduct1" selector="{{StorefrontProductPageSection.qtyInputWithProduct(product1)}}" userInput="{{qty1}}"/>
-+        <fillField stepKey="fillQuantityForProduct2" selector="{{StorefrontProductPageSection.qtyInputWithProduct(product2)}}" userInput="{{qty2}}"/>
-+        <fillField stepKey="fillQuantityForProduct3" selector="{{StorefrontProductPageSection.qtyInputWithProduct(product3)}}" userInput="{{qty3}}"/>
-+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="clickOnAddToCartButton"/>
-+    </actionGroup>
-+</actionGroups>
-+
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
-new file mode 100644
-index 00000000000..5937267b4a6
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="VerifyProductTypeOrder">
-+        <seeElement stepKey="seeGroupedInOrder" selector="{{AdminProductDropdownOrderSection.groupedProduct}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
-index 1f9f1594f8f..ba3703e7b0e 100644
---- a/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="GroupedProduct" type="product">
-         <data key="sku" unique="suffix">groupedproduct</data>
-         <data key="type_id">grouped</data>
-@@ -18,7 +18,7 @@
-         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-     </entity>
-     <entity name="ApiGroupedProduct" type="product3">
--        <data key="sku" unique="suffix">api-grouped-product</data>
-+        <data key="sku" unique="suffix">apiGroupedProduct</data>
-         <data key="type_id">grouped</data>
-         <data key="attribute_set_id">4</data>
-         <data key="name" unique="suffix">Api Grouped Product</data>
-@@ -28,4 +28,16 @@
-         <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
-         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
-     </entity>
-+    <entity name="ApiGroupedProduct2" type="product3">
-+        <data key="sku" unique="suffix">apiGroupedProduct</data>
-+        <data key="type_id">grouped</data>
-+        <data key="attribute_set_id">4</data>
-+        <data key="name" unique="suffix">Api Grouped Product</data>
-+        <data key="status">1</data>
-+        <data key="urlKey" unique="suffix">api-grouped-product</data>
-+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
-+        <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkData.xml
-index 2c7cc254c85..882275d0060 100644
---- a/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkData.xml
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="ProductLinkSimple1" type="product_link">
-         <var key="sku" entityKey="sku" entityType="product3"/>
-         <var key="linked_product_sku" entityKey="sku" entityType="product"/>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkExtensionAttributeData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkExtensionAttributeData.xml
-index 433dc920502..b580c876a6f 100644
---- a/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkExtensionAttributeData.xml
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkExtensionAttributeData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="Qty1000" type="product_link_extension_attribute">
-         <data key="qty">1000</data>
-     </entity>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinksData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinksData.xml
-index b712e3f40af..68c95e856e2 100644
---- a/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinksData.xml
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinksData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="OneSimpleProductLink" type="product_links">
-         <requiredEntity type="product_link">ProductLinkSimple1</requiredEntity>
-     </entity>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminProductCreatePage.xml
-index d8edc37160b..7cf998cff3e 100644
---- a/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminProductCreatePage.xml
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminProductCreatePage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
-         <section name="AdminProductFormGroupedProductsSection"/>
-         <section name="AdminAddProductsToGroupPanel"/>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminAddProductsToGroupPanelSection.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminAddProductsToGroupPanelSection.xml
-index d21a067d34e..f71bb49aea1 100644
---- a/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminAddProductsToGroupPanelSection.xml
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminAddProductsToGroupPanelSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminAddProductsToGroupPanel">
-         <element name="addSelectedProducts" type="button" selector=".product_form_product_form_grouped_grouped_products_modal button.action-primary" timeout="30"/>
-         <element name="filters" type="button" selector=".product_form_product_form_grouped_grouped_products_modal [data-action='grid-filter-expand']" timeout="30"/>
-@@ -15,6 +15,7 @@
-         <element name="nameFilter" type="input" selector=".product_form_product_form_grouped_grouped_products_modal [name='name']"/>
-         <element name="firstCheckbox" type="input" selector="tr[data-repeat-index='0'] .admin__control-checkbox"/>
-         <element name="nThCheckbox" type="input" selector="tr[data-repeat-index='{{n}}'] .admin__control-checkbox" parameterized="true"/>
-+        <element name="clearFilters" type="button" selector=".product_form_product_form_grouped_grouped_products_modal [data-action='grid-filter-reset']" timeout="30"/>
-     </section>
- 
-     <section name="AdminAddedProductsToGroupGrid">
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductDropdownOrderSection.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
-new file mode 100644
-index 00000000000..3efbabd34c1
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminProductDropdownOrderSection">
-+        <element name="groupedProduct" type="text" selector="//li[not(preceding-sibling::li[span[@title='Virtual Product']]) and not(preceding-sibling::li[span[@title='Bundle Product']]) and not(preceding-sibling::li[span[@title='Downloadable Product']]) and not(following-sibling::li[span[@title='Simple Product']]) and not(following-sibling::li[span[@title='Configurable Product']])]/span[@title='Grouped Product']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductFormGroupedProductsSection.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductFormGroupedProductsSection.xml
-index adb0ac5a984..547c856d144 100644
---- a/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductFormGroupedProductsSection.xml
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductFormGroupedProductsSection.xml
-@@ -7,9 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductFormGroupedProductsSection">
-         <element name="toggleGroupedProduct" type="button" selector="div[data-index=grouped] .admin__collapsible-title"/>
-         <element name="addProductsToGroup" type="button" selector="button[data-index='grouped_products_button']" timeout="30"/>
-+        <element name="nextActionButton" type="button" selector="//*[@data-index='grouped']//*[@class='action-next']"/>
-+        <element name="previousActionButton" type="button" selector="//*[@data-index='grouped']//*[@class='action-previous']"/>
-+        <element name="positionProduct" type="input" selector="//tbody/tr[{{arg}}][contains(@class,'data-row')]/td[10]//input[@class='position-widget-input']" parameterized="true"/>
-+        <element name="nameProductFromGrid" type="text" selector="//tbody/tr[{{arg}}][contains(@class,'data-row')]/td[4]//*[@class='admin__field-control']//span" parameterized="true"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-new file mode 100644
-index 00000000000..45d8e633437
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontProductInfoMainSection">
-+        <element name="groupedProductsTable" type="text" selector="#super-product-table .product-item-name"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
-index 1bee1846ac0..5d65f826902 100644
---- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddDefaultImageGroupedProductTest">
-         <annotations>
-             <features value="GroupedProduct"/>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultVideoGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultVideoGroupedProductTest.xml
-new file mode 100644
-index 00000000000..c3a95bbef3a
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultVideoGroupedProductTest.xml
-@@ -0,0 +1,59 @@
-+<?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="AdminAddDefaultVideoGroupedProductTest"  extends="AdminAddDefaultVideoSimpleProductTest">
-+        <annotations>
-+            <features value="GroupedProduct"/>
-+            <stories value="Add/remove images and videos for all product types and category"/>
-+            <title value="Admin should be able to add default video for a Grouped Product"/>
-+            <description value="Admin should be able to add default video for a Grouped Product"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-108"/>
-+            <group value="GroupedProduct"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+        </after>
-+
-+        <!-- Create a grouped product -->
-+        <!-- Replacing steps in base AdminAddDefaultVideoSimpleProductTest -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillGroupedProductForm" stepKey="fillMainProductForm">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add two simple products to grouped product -->
-+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToSection" after="addProductVideo"/>
-+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductSection" after="scrollToSection"/>
-+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup" after="openGroupedProductSection"/>
-+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForFilter" after="clickAddProductsToGroup"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku1" after="waitForFilter">
-+            <argument name="product" value="$$simpleProduct1$$"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkOption1" after="filterProductGridBySku1"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku2" after="checkOption1">
-+            <argument name="product" value="$$simpleProduct2$$"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkOption2" after="filterProductGridBySku2"/>
-+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="addSelectedProducts" before="saveProductForm"/>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminDeleteGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminDeleteGroupedProductTest.xml
-new file mode 100644
-index 00000000000..6768dd5a1a2
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminDeleteGroupedProductTest.xml
-@@ -0,0 +1,58 @@
-+<?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="AdminDeleteGroupedProductTest">
-+        <annotations>
-+            <features value="GroupedProduct"/>
-+            <stories value="Delete product"/>
-+            <title value="Delete Grouped Product"/>
-+            <description value="Admin should be able to delete a grouped product"/>
-+            <testCaseId value="MC-11019"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="ApiProductWithDescription" stepKey="createSimpleProduct"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="ApiGroupedProduct2" stepKey="createGroupedProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
-+                <requiredEntity createDataKey="createGroupedProduct"/>
-+                <requiredEntity createDataKey="createSimpleProduct"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteGroupedProductFilteredBySkuAndName">
-+            <argument name="product" value="$$createGroupedProduct$$"/>
-+        </actionGroup>
-+        <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
-+        <!--Verify product on Product Page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createGroupedProduct.name$$)}}" stepKey="amOnGroupedProductPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
-+        <!--Search for the product by sku-->
-+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createGroupedProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-+        <waitForPageLoad stepKey="waitForSearchButton"/>
-+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForSearchResults"/>
-+        <!-- Should not see any search results -->
-+        <dontSee userInput="$$createGroupedProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
-+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
-+        <!-- Go to the category page that we created in the before block -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-+        <!-- Should not see the product -->
-+        <dontSee userInput="$$createGroupedProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
-+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductSetEditContentTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductSetEditContentTest.xml
-new file mode 100644
-index 00000000000..3938d91c515
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductSetEditContentTest.xml
-@@ -0,0 +1,40 @@
-+<?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="AdminGroupedProductSetEditContentTest" extends="AdminSimpleProductSetEditContentTest">
-+        <annotations>
-+            <features value="GroupedProduct"/>
-+            <stories value="Create/edit grouped product"/>
-+            <title value="Admin should be able to set/edit product Content when editing a grouped product"/>
-+            <description value="Admin should be able to set/edit product Content when editing a grouped product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3423"/>
-+            <group value="GroupedProduct"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+        <after>
-+            <!-- Delete grouped product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="GroupedProduct"/>
-+            </actionGroup>
-+        </after>
-+
-+        <!-- Create product -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+
-+        <!--Checking content storefront-->
-+        <amOnPage url="{{GroupedProduct.sku}}.html" stepKey="goToStorefront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml
-new file mode 100644
-index 00000000000..b59cf1e2175
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml
-@@ -0,0 +1,73 @@
-+<?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="AdminGroupedProductsAreListedWhenOutOfStock">
-+        <annotations>
-+            <features value="GroupedProduct"/>
-+            <stories value="MAGETWO-93181: Grouped product doesn't take care about his Linked Products when SalableQuantity &lt; ProductLink.ExtensionAttributes.Qty after Source Deduction"/>
-+            <title value="Products in group should show in admin list even when they are out of stock"/>
-+            <description value="Products in group should show in admin list even when they are out of stock"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-93181"/>
-+            <group value="GroupedProduct"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="category1"/>
-+            <createData entity="SimpleProduct" stepKey="simpleProduct1">
-+                <requiredEntity createDataKey="category1"/>
-+            </createData>
-+            <!--Out of Stock-->
-+            <createData entity="SimpleProduct4" stepKey="simpleProduct2">
-+                <requiredEntity createDataKey="category1"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+            <deleteData createDataKey="category1" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillGroupedProductForm" stepKey="fillMainProductForm">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+        <!-- Add two simple products to grouped product -->
-+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToSection"/>
-+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductSection"/>
-+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>
-+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForFilter"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku1">
-+            <argument name="product" value="$$simpleProduct1$$"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkOption1"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku2">
-+            <argument name="product" value="$$simpleProduct2$$"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkOption2"/>
-+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="addSelectedProducts"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+
-+        <!-- Save product -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+
-+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToProducts"/>
-+
-+        <waitForText userInput="$$simpleProduct1.name$$" stepKey="assertProductIsInTheList"/>
-+        <waitForText userInput="$$simpleProduct2.name$$" stepKey="assertProduct2IsInTheList"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
-new file mode 100644
-index 00000000000..8117d627a37
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
-@@ -0,0 +1,40 @@
-+<?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="AdminGroupedSetEditRelatedProductsTest" extends="AdminSimpleSetEditRelatedProductsTest">
-+        <annotations>
-+            <features value="GroupedProduct"/>
-+            <stories value="Create/edit grouped product"/>
-+            <title value="Admin should be able to set/edit Related Products information when editing a grouped product"/>
-+            <description value="Admin should be able to set/edit Related Products information when editing a grouped product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3755"/>
-+            <group value="GroupedProduct"/>
-+        </annotations>
-+        <before></before>
-+        <after>
-+            <!-- Delete grouped product -->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="GroupedProduct"/>
-+            </actionGroup>
-+        </after>
-+
-+        <!-- Create product -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillGroupedProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+
-+        <!--See related product in storefront-->
-+        <amOnPage url="{{GroupedProduct.sku}}.html" stepKey="goToStorefront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
-index 54062d97f7c..da7cfaeb715 100644
---- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminRemoveDefaultImageGroupedProductTest">
-         <annotations>
-             <features value="GroupedProduct"/>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultVideoGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultVideoGroupedProductTest.xml
-new file mode 100644
-index 00000000000..e322d4a1eb0
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultVideoGroupedProductTest.xml
-@@ -0,0 +1,59 @@
-+<?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="AdminRemoveDefaultVideoGroupedProductTest" extends="AdminRemoveDefaultVideoSimpleProductTest">
-+        <annotations>
-+            <features value="GroupedProduct"/>
-+            <stories value="Add/remove images and videos for all product types and category"/>
-+            <title value="Admin should be able to remove default video from a Grouped Product"/>
-+            <description value="Admin should be able to remove default video from a Grouped Product"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-203"/>
-+            <group value="GroupedProduct"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+        </after>
-+
-+        <!-- Create a grouped product -->
-+        <!-- Replacing steps in base AdminRemoveDefaultVideoSimpleProductTest -->
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillGroupedProductForm" stepKey="fillMainProductForm">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+
-+        <!-- Add two simple products to grouped product -->
-+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToSection" after="addProductVideo"/>
-+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductSection" after="scrollToSection"/>
-+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup" after="openGroupedProductSection"/>
-+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForFilter" after="clickAddProductsToGroup"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku1" after="waitForFilter">
-+            <argument name="product" value="$$simpleProduct1$$"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkOption1" after="filterProductGridBySku1"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku2" after="checkOption1">
-+            <argument name="product" value="$$simpleProduct2$$"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkOption2" after="filterProductGridBySku2"/>
-+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="addSelectedProducts" before="saveProductForm"/>
-+
-+        <!-- Assert product in storefront product page -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.xml
-new file mode 100644
-index 00000000000..ad5fbbb30ed
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.xml
-@@ -0,0 +1,207 @@
-+<?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="AdminSortingAssociatedProductsTest">
-+        <annotations>
-+            <features value="GroupedProduct"/>
-+            <stories value="MAGETWO-91633: Grouped Products: Associated Products Can't Be Sorted Between Pages"/>
-+            <title value="Grouped Products: Sorting Associated Products Between Pages"/>
-+            <description value="Make sure that products in grid were recalculated when sorting associated products between pages"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-95085"/>
-+            <group value="GroupedProduct"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <createData entity="_defaultCategory" stepKey="category"/>
-+            <!-- Create 23 products so that grid can have more than one page -->
-+            <createData entity="ApiSimpleProduct" stepKey="product1">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product2">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product3">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product4">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product5">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product6">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product7">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product8">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product9">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product10">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product11">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product12">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product13">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product14">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product15">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product16">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product17">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product18">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product19">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product20">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product21">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product22">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="product23">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!--Delete created grouped product-->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="GroupedProduct"/>
-+            </actionGroup>
-+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
-+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-+            <deleteData createDataKey="product1" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="product2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="product3" stepKey="deleteProduct3"/>
-+            <deleteData createDataKey="product4" stepKey="deleteProduct4"/>
-+            <deleteData createDataKey="product5" stepKey="deleteProduct5"/>
-+            <deleteData createDataKey="product6" stepKey="deleteProduct6"/>
-+            <deleteData createDataKey="product7" stepKey="deleteProduct7"/>
-+            <deleteData createDataKey="product8" stepKey="deleteProduct8"/>
-+            <deleteData createDataKey="product9" stepKey="deleteProduct9"/>
-+            <deleteData createDataKey="product10" stepKey="deleteProduct10"/>
-+            <deleteData createDataKey="product11" stepKey="deleteProduct11"/>
-+            <deleteData createDataKey="product12" stepKey="deleteProduct12"/>
-+            <deleteData createDataKey="product13" stepKey="deleteProduct13"/>
-+            <deleteData createDataKey="product14" stepKey="deleteProduct14"/>
-+            <deleteData createDataKey="product15" stepKey="deleteProduct15"/>
-+            <deleteData createDataKey="product16" stepKey="deleteProduct16"/>
-+            <deleteData createDataKey="product17" stepKey="deleteProduct17"/>
-+            <deleteData createDataKey="product18" stepKey="deleteProduct18"/>
-+            <deleteData createDataKey="product19" stepKey="deleteProduct19"/>
-+            <deleteData createDataKey="product20" stepKey="deleteProduct20"/>
-+            <deleteData createDataKey="product21" stepKey="deleteProduct21"/>
-+            <deleteData createDataKey="product22" stepKey="deleteProduct22"/>
-+            <deleteData createDataKey="product23" stepKey="deleteProduct23"/>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create grouped Product-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
-+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillGroupedProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="GroupedProduct"/>
-+        </actionGroup>
-+
-+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection"/>
-+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection"/>
-+        <click selector="body" stepKey="clickBodyToCorrectFocusGrouped"/>
-+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>
-+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForGroupedProductModal"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterGroupedProducts">
-+            <argument name="sku" value="api-simple-product"/>
-+        </actionGroup>
-+
-+        <!-- Select all, then start the bulk update attributes flow -->
-+        <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
-+        <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
-+
-+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts"/>
-+        <waitForPageLoad stepKey="waitForProductsAdded"/>
-+
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!--Open created Product group-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
-+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetFiltersIfExist"/>
-+        <actionGroup ref="searchProductGridByKeyword" stepKey="searchProductGridForm">
-+            <argument name="keyword" value="GroupedProduct.name"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridSection.selectRowBasedOnName(GroupedProduct.name)}}" stepKey="openGroupedProduct"/>
-+        <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
-+
-+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection2"/>
-+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection2"/>
-+
-+        <!--Change position value for the Product Position 0-->
-+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('1')}}" stepKey="grabNameProductPosition0"/>
-+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('2')}}" stepKey="grabNameProductPositionFirst"/>
-+        <fillField selector="{{AdminProductFormGroupedProductsSection.positionProduct('1')}}" userInput="21" stepKey="fillFieldProductPosition0"/>
-+        <doubleClick selector="{{AdminProductFormGroupedProductsSection.nextActionButton}}" stepKey="clickButton"/>
-+        <waitForAjaxLoad stepKey="waitForAjax1"/>
-+
-+        <!--Go to next page and verify that Products in grid were recalculated-->
-+        <doubleClick selector="{{AdminProductFormGroupedProductsSection.nextActionButton}}" stepKey="clickNextActionButton"/>
-+        <waitForAjaxLoad stepKey="waitForAjax2"/>
-+
-+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('2')}}" stepKey="grabNameProductPosition21"/>
-+        <assertEquals stepKey="assertProductsRecalculated">
-+            <actualResult type="string">$grabNameProductPosition0</actualResult>
-+            <expectedResult type="string">$grabNameProductPosition21</expectedResult>
-+        </assertEquals>
-+
-+        <!--Change position value for the product to 1-->
-+        <fillField selector="{{AdminProductFormGroupedProductsSection.positionProduct('2')}}" userInput="1" stepKey="fillFieldProductPosition1"/>
-+        <doubleClick selector="{{AdminProductFormGroupedProductsSection.previousActionButton}}" stepKey="clickButton2"/>
-+        <waitForAjaxLoad stepKey="waitForAjax3"/>
-+
-+        <!--Go to previous page and verify that Products in grid were recalculated-->
-+        <click selector="{{AdminProductFormGroupedProductsSection.previousActionButton}}" stepKey="clickPreviousActionButton"/>
-+        <waitForAjaxLoad stepKey="waitForAjax4"/>
-+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('2')}}" stepKey="grabNameProductPosition2"/>
-+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('1')}}" stepKey="grabNameProductPositionZero"/>
-+        <assertEquals stepKey="assertProductsRecalculated2">
-+            <actualResult type="string">$grabNameProductPosition2</actualResult>
-+            <expectedResult type="string">$grabNameProductPosition0</expectedResult>
-+        </assertEquals>
-+        <assertEquals stepKey="assertProductsRecalculated3">
-+            <actualResult type="string">$grabNameProductPositionFirst</actualResult>
-+            <expectedResult type="string">$grabNameProductPositionZero</expectedResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml
-new file mode 100644
-index 00000000000..2a600d38250
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml
-@@ -0,0 +1,170 @@
-+<?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="AdvanceCatalogSearchGroupedProductByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
-+        <annotations>
-+            <features value="GroupedProduct"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Grouped product with product name"/>
-+            <description value="Guest customer should be able to advance search Grouped product with product name"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-141"/>
-+            <group value="GroupedProduct"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
-+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-+            <createData entity="ApiGroupedProduct" stepKey="product"/>
-+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="simple1"/>
-+            </createData>
-+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addProductOne" stepKey="addProductTwo">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="simple2"/>
-+            </updateData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+    <test name="AdvanceCatalogSearchGroupedProductBySkuTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
-+        <annotations>
-+            <features value="GroupedProduct"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Grouped product with product sku"/>
-+            <description value="Guest customer should be able to advance search Grouped product with product sku"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-146"/>
-+            <group value="GroupedProduct"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
-+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-+            <createData entity="ApiGroupedProduct" stepKey="product"/>
-+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="simple1"/>
-+            </createData>
-+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addProductOne" stepKey="addProductTwo">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="simple2"/>
-+            </updateData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+    <test name="AdvanceCatalogSearchGroupedProductByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
-+        <annotations>
-+            <features value="GroupedProduct"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Grouped product with product description"/>
-+            <description value="Guest customer should be able to advance search Grouped product with product description"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-282"/>
-+            <group value="GroupedProduct"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
-+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-+            <createData entity="ApiGroupedProduct" stepKey="product"/>
-+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="simple1"/>
-+            </createData>
-+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addProductOne" stepKey="addProductTwo">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="simple2"/>
-+            </updateData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+    <test name="AdvanceCatalogSearchGroupedProductByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
-+        <annotations>
-+            <features value="GroupedProduct"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Grouped product with product short description"/>
-+            <description value="Guest customer should be able to advance search Grouped product with product short description"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-283"/>
-+            <group value="GroupedProduct"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
-+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-+            <createData entity="ApiGroupedProduct" stepKey="product"/>
-+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="simple1"/>
-+            </createData>
-+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addProductOne" stepKey="addProductTwo">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="simple2"/>
-+            </updateData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+    <test name="AdvanceCatalogSearchGroupedProductByPriceTest" extends="AdvanceCatalogSearchSimpleProductByPriceTest">
-+        <annotations>
-+            <features value="GroupedProduct"/>
-+            <stories value="Advanced Catalog Product Search for all product types"/>
-+            <title value="Guest customer should be able to advance search Grouped product with product price"/>
-+            <description value="Guest customer should be able to advance search Grouped product with product price"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-284"/>
-+            <group value="GroupedProduct"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
-+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-+            <createData entity="ApiGroupedProduct" stepKey="product"/>
-+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="simple1"/>
-+            </createData>
-+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addProductOne" stepKey="addProductTwo">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="simple2"/>
-+            </updateData>
-+            <getData entity="GetProduct3" stepKey="arg1">
-+                <requiredEntity createDataKey="product"/>
-+            </getData>
-+            <getData entity="GetProduct" stepKey="arg2">
-+                <requiredEntity createDataKey="simple1"/>
-+            </getData>
-+            <getData entity="GetProduct" stepKey="arg3">
-+                <requiredEntity createDataKey="simple2"/>
-+            </getData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-index 60aa6662245..dbe3dddfca8 100644
---- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CAdminTest">
-         <!--Create Grouped Product-->
-         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageGrouped" after="seeSimpleProductInGrid"/>
-diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml
-new file mode 100644
-index 00000000000..a56512f84a9
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml
-@@ -0,0 +1,71 @@
-+<?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="NewProductsListWidgetGroupedProductTest" extends="NewProductsListWidgetTest">
-+        <annotations>
-+            <features value="GroupedProduct"/>
-+            <stories value="New products list widget"/>
-+            <title value="Admin should be able to set Grouped Product as new so that it shows up in the Catalog New Products List Widget"/>
-+            <description value="Admin should be able to set Grouped Product as new so that it shows up in the Catalog New Products List Widget"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-121"/>
-+            <group value="GroupedProduct"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createProductOne">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProductTwo">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
-+            <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!-- A Cms page containing the New Products Widget gets created here via extends -->
-+
-+        <!-- Create a grouped product to appear in the widget -->
-+
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-+        <waitForPageLoad stepKey="waitForProductList"/>
-+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="toggleAddProductButton"/>
-+        <click selector="{{AdminProductGridActionSection.addGroupedProduct}}" stepKey="clickAddGroupedProduct"/>
-+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
-+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
-+        <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
-+        <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
-+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection"/>
-+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="scrollToAddProductsToGroup"/>
-+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>
-+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForGroupedProductModal"/>
-+        <actionGroup ref="filterProductGridBySku2" stepKey="filterGroupedProducts">
-+            <argument name="sku" value="api-simple-product"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('0')}}" stepKey="checkFilterResult1"/>
-+        <checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('1')}}" stepKey="checkFilterResult2"/>
-+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
-+
-+        <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
-+
-+        <!-- Check for product on the CMS page with the New Products widget -->
-+
-+        <amOnPage url="{{_newDefaultCmsPage.identifier}}" stepKey="amOnCmsPage"/>
-+        <waitForPageLoad stepKey="waitForCmsPage"/>
-+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php
-index f02849c244c..176c29add48 100644
---- a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php
-+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php
-@@ -64,7 +64,7 @@ class PriceTest extends \PHPUnit\Framework\TestCase
-         $expectedFinalPrice
-     ) {
-         $rawFinalPrice = 10;
--        $rawPriceCheckStep = 6;
-+        $rawPriceCheckStep = 5;
- 
-         $this->productMock->expects(
-             $this->any()
-@@ -155,7 +155,7 @@ class PriceTest extends \PHPUnit\Framework\TestCase
-             'custom_option_null' => [
-                 'associatedProducts' => [],
-                 'options' => [[], []],
--                'expectedPriceCall' => 6, /* product call number to check final price formed correctly */
-+                'expectedPriceCall' => 5, /* product call number to check final price formed correctly */
-                 'expectedFinalPrice' => 10, /* 10(product price) + 2(options count) * 5(qty) * 5(option price) */
-             ],
-             'custom_option_exist' => [
-@@ -165,7 +165,7 @@ class PriceTest extends \PHPUnit\Framework\TestCase
-                     ['associated_product_2', $optionMock],
-                     ['associated_product_3', $optionMock],
-                 ],
--                'expectedPriceCall' => 16, /* product call number to check final price formed correctly */
-+                'expectedPriceCall' => 15, /* product call number to check final price formed correctly */
-                 'expectedFinalPrice' => 35, /* 10(product price) + 2(options count) * 5(qty) * 5(option price) */
-             ]
-         ];
-diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php
-index 06c07a8dc34..e50d6491a6a 100644
---- a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php
-+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php
-@@ -611,9 +611,9 @@ class GroupedTest extends \PHPUnit\Framework\TestCase
- 
-     public function testFlushAssociatedProductsCache()
-     {
--        $productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['unsData']);
-+        $productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['unsetData']);
-         $productMock->expects($this->once())
--            ->method('unsData')
-+            ->method('unsetData')
-             ->with('_cache_instance_associated_products')
-             ->willReturnSelf();
-         $this->assertEquals($productMock, $this->_model->flushAssociatedProductsCache($productMock));
-diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php
-index 78fa2445ff5..cec7931c1c6 100644
---- a/app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php
-+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php
-@@ -30,7 +30,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-     protected $model;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $moduleManager;
- 
-@@ -159,9 +159,14 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-      */
-     protected function setUp()
-     {
--        $this->categoryIndexerMock = $this->getMockForAbstractClass(\Magento\Framework\Indexer\IndexerInterface::class);
-+        $this->categoryIndexerMock = $this->getMockForAbstractClass(
-+            \Magento\Framework\Indexer\IndexerInterface::class
-+        );
- 
--        $this->moduleManager = $this->createPartialMock(\Magento\Framework\Module\Manager::class, ['isEnabled']);
-+        $this->moduleManager = $this->createPartialMock(
-+            \Magento\Framework\Module\ModuleManagerInterface::class,
-+            ['isEnabled']
-+        );
-         $this->stockItemFactoryMock = $this->createPartialMock(
-             \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory::class,
-             ['create']
-diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php
-index 6ef87117dea..ad4b86351a6 100644
---- a/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php
-+++ b/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php
-@@ -21,6 +21,9 @@ use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\GroupedProduct\Model\Product\Type\Grouped as GroupedProductType;
- use Magento\GroupedProduct\Ui\DataProvider\Product\Form\Modifier\Grouped;
- use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\GroupedProduct\Model\Product\Link\CollectionProvider\Grouped as GroupedProducts;
-+use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
- 
- /**
-  * Class GroupedTest
-@@ -34,6 +37,7 @@ class GroupedTest extends AbstractModifierTest
-     const LINKED_PRODUCT_NAME = 'linked';
-     const LINKED_PRODUCT_QTY = '0';
-     const LINKED_PRODUCT_POSITION = 1;
-+    const LINKED_PRODUCT_POSITION_CALCULATED = 1;
-     const LINKED_PRODUCT_PRICE = '1';
- 
-     /**
-@@ -81,23 +85,38 @@ class GroupedTest extends AbstractModifierTest
-      */
-     protected $storeMock;
- 
-+    /**
-+     * @var GroupedProducts|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $groupedProductsMock;
-+
-+    /**
-+     * @var ProductLinkInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $productLinkFactoryMock;
-+
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->objectManager = new ObjectManager($this);
-         $this->locatorMock = $this->getMockBuilder(LocatorInterface::class)
-             ->getMockForAbstractClass();
--        $this->productMock = $this->getMockBuilder(ProductInterface::class)
-+        $this->productMock = $this->getMockBuilder(Product::class)
-             ->setMethods(['getId', 'getTypeId'])
--            ->getMockForAbstractClass();
-+            ->disableOriginalConstructor()
-+            ->getMock();
-         $this->productMock->expects($this->any())
-             ->method('getId')
-             ->willReturn(self::PRODUCT_ID);
-         $this->productMock->expects($this->any())
-             ->method('getTypeId')
-             ->willReturn(GroupedProductType::TYPE_CODE);
--        $this->linkedProductMock = $this->getMockBuilder(ProductInterface::class)
-+        $this->linkedProductMock = $this->getMockBuilder(Product::class)
-             ->setMethods(['getId', 'getName', 'getPrice'])
--            ->getMockForAbstractClass();
-+            ->disableOriginalConstructor()
-+            ->getMock();
-         $this->linkedProductMock->expects($this->any())
-             ->method('getId')
-             ->willReturn(self::LINKED_PRODUCT_ID);
-@@ -134,7 +153,7 @@ class GroupedTest extends AbstractModifierTest
-         $this->linkRepositoryMock->expects($this->any())
-             ->method('getList')
-             ->with($this->productMock)
--            ->willReturn([$this->linkMock]);
-+            ->willReturn([$this->linkedProductMock]);
-         $this->productRepositoryMock = $this->getMockBuilder(ProductRepositoryInterface::class)
-             ->setMethods(['get'])
-             ->getMockForAbstractClass();
-@@ -154,7 +173,7 @@ class GroupedTest extends AbstractModifierTest
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function createModel()
-     {
-@@ -168,6 +187,16 @@ class GroupedTest extends AbstractModifierTest
-             ->setMethods(['init', 'getUrl'])
-             ->disableOriginalConstructor()
-             ->getMock();
-+
-+        $this->groupedProductsMock = $this->getMockBuilder(GroupedProducts::class)
-+            ->setMethods(['getLinkedProducts'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->productLinkFactoryMock = $this->getMockBuilder(ProductLinkInterfaceFactory::class)
-+            ->setMethods(['create'])
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+
-         $this->imageHelperMock->expects($this->any())
-             ->method('init')
-             ->willReturn($this->imageHelperMock);
-@@ -188,16 +217,23 @@ class GroupedTest extends AbstractModifierTest
-             'localeCurrency' => $this->currencyMock,
-             'imageHelper' => $this->imageHelperMock,
-             'attributeSetRepository' => $this->attributeSetRepositoryMock,
-+            'groupedProducts' => $this->groupedProductsMock,
-+            'productLinkFactory' => $this->productLinkFactoryMock,
-         ]);
-     }
- 
-+    /**
-+     * Assert array has key
-+     *
-+     * @return void
-+     */
-     public function testModifyMeta()
-     {
-         $this->assertArrayHasKey(Grouped::GROUP_GROUPED, $this->getModel()->modifyMeta([]));
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function testModifyData()
-     {
-@@ -212,6 +248,7 @@ class GroupedTest extends AbstractModifierTest
-                             'price' => null,
-                             'qty' => self::LINKED_PRODUCT_QTY,
-                             'position' => self::LINKED_PRODUCT_POSITION,
-+                            'positionCalculated' => self::LINKED_PRODUCT_POSITION_CALCULATED,
-                             'thumbnail' => null,
-                             'type_id' => null,
-                             'status' => null,
-@@ -224,6 +261,42 @@ class GroupedTest extends AbstractModifierTest
-                 ],
-             ],
-         ];
--        $this->assertSame($expectedData, $this->getModel()->modifyData([]));
-+        $model = $this->getModel();
-+        $linkedProductMock = $this->getMockBuilder(Product::class)
-+            ->setMethods(['getId', 'getName', 'getPrice', 'getSku', 'getImage', 'getPosition', 'getQty'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $linkedProductMock->expects($this->once())
-+            ->method('getId')
-+            ->willReturn(self::LINKED_PRODUCT_ID);
-+        $linkedProductMock->expects($this->once())
-+            ->method('getName')
-+            ->willReturn(self::LINKED_PRODUCT_NAME);
-+        $linkedProductMock->expects($this->once())
-+            ->method('getPrice')
-+            ->willReturn(self::LINKED_PRODUCT_PRICE);
-+        $linkedProductMock->expects($this->once())
-+            ->method('getSku')
-+            ->willReturn(self::LINKED_PRODUCT_SKU);
-+        $linkedProductMock->expects($this->once())
-+            ->method('getImage')
-+            ->willReturn('');
-+        $linkedProductMock->expects($this->exactly(2))
-+            ->method('getPosition')
-+            ->willReturn(self::LINKED_PRODUCT_POSITION);
-+        $linkedProductMock->expects($this->once())
-+            ->method('getQty')
-+            ->willReturn(self::LINKED_PRODUCT_QTY);
-+        $this->groupedProductsMock->expects($this->once())
-+            ->method('getLinkedProducts')
-+            ->willReturn([$linkedProductMock]);
-+        $linkMock = $this->getMockBuilder(ProductLinkInterface::class)
-+            ->getMockForAbstractClass();
-+
-+        $this->productLinkFactoryMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($linkMock);
-+
-+        $this->assertSame($expectedData, $model->modifyData([]));
-     }
- }
-diff --git a/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php b/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php
-index 2d1a1d19757..2ea622c1c2b 100644
---- a/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php
-+++ b/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php
-@@ -21,6 +21,9 @@ use Magento\Catalog\Helper\Image as ImageHelper;
- use Magento\Eav\Api\AttributeSetRepositoryInterface;
- use Magento\Catalog\Model\Product\Attribute\Source\Status;
- use Magento\Framework\Locale\CurrencyInterface;
-+use Magento\GroupedProduct\Model\Product\Link\CollectionProvider\Grouped as GroupedProducts;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
- 
- /**
-  * Data provider for Grouped products
-@@ -99,6 +102,16 @@ class Grouped extends AbstractModifier
-      */
-     private static $codeQty = 'qty';
- 
-+    /**
-+     * @var GroupedProducts
-+     */
-+    private $groupedProducts;
-+
-+    /**
-+     * @var ProductLinkInterfaceFactory
-+     */
-+    private $productLinkFactory;
-+
-     /**
-      * @param LocatorInterface $locator
-      * @param UrlInterface $urlBuilder
-@@ -109,6 +122,9 @@ class Grouped extends AbstractModifier
-      * @param AttributeSetRepositoryInterface $attributeSetRepository
-      * @param CurrencyInterface $localeCurrency
-      * @param array $uiComponentsConfig
-+     * @param GroupedProducts $groupedProducts
-+     * @param \Magento\Catalog\Api\Data\ProductLinkInterfaceFactory|null $productLinkFactory
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-         LocatorInterface $locator,
-@@ -119,7 +135,9 @@ class Grouped extends AbstractModifier
-         Status $status,
-         AttributeSetRepositoryInterface $attributeSetRepository,
-         CurrencyInterface $localeCurrency,
--        array $uiComponentsConfig = []
-+        array $uiComponentsConfig = [],
-+        GroupedProducts $groupedProducts = null,
-+        \Magento\Catalog\Api\Data\ProductLinkInterfaceFactory $productLinkFactory = null
-     ) {
-         $this->locator = $locator;
-         $this->urlBuilder = $urlBuilder;
-@@ -130,10 +148,15 @@ class Grouped extends AbstractModifier
-         $this->status = $status;
-         $this->localeCurrency = $localeCurrency;
-         $this->uiComponentsConfig = array_replace_recursive($this->uiComponentsConfig, $uiComponentsConfig);
-+        $this->groupedProducts = $groupedProducts ?: ObjectManager::getInstance()->get(
-+            \Magento\GroupedProduct\Model\Product\Link\CollectionProvider\Grouped::class
-+        );
-+        $this->productLinkFactory = $productLinkFactory ?: ObjectManager::getInstance()
-+            ->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function modifyData(array $data)
-     {
-@@ -143,13 +166,15 @@ class Grouped extends AbstractModifier
-         if ($modelId) {
-             $storeId = $this->locator->getStore()->getId();
-             $data[$product->getId()]['links'][self::LINK_TYPE] = [];
--            foreach ($this->productLinkRepository->getList($product) as $linkItem) {
--                if ($linkItem->getLinkType() !== self::LINK_TYPE) {
--                    continue;
--                }
-+            $linkedItems = $this->groupedProducts->getLinkedProducts($product);
-+            usort($linkedItems, function ($a, $b) {
-+                return $a->getPosition() <=> $b->getPosition();
-+            });
-+            $productLink = $this->productLinkFactory->create();
-+            foreach ($linkedItems as $index => $linkItem) {
-                 /** @var \Magento\Catalog\Api\Data\ProductInterface $linkedProduct */
--                $linkedProduct = $this->productRepository->get($linkItem->getLinkedProductSku(), false, $storeId);
--                $data[$modelId]['links'][self::LINK_TYPE][] = $this->fillData($linkedProduct, $linkItem);
-+                $linkItem->setPosition($index);
-+                $data[$modelId]['links'][self::LINK_TYPE][] = $this->fillData($linkItem, $productLink);
-             }
-             $data[$modelId][self::DATA_SOURCE_DEFAULT]['current_store_id'] = $storeId;
-         }
-@@ -162,6 +187,7 @@ class Grouped extends AbstractModifier
-      * @param ProductInterface $linkedProduct
-      * @param ProductLinkInterface $linkItem
-      * @return array
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     protected function fillData(ProductInterface $linkedProduct, ProductLinkInterface $linkItem)
-     {
-@@ -171,11 +197,15 @@ class Grouped extends AbstractModifier
-         return [
-             'id' => $linkedProduct->getId(),
-             'name' => $linkedProduct->getName(),
--            'sku' => $linkItem->getLinkedProductSku(),
-+            'sku' => $linkedProduct->getSku(),
-             'price' => $currency->toCurrency(sprintf("%f", $linkedProduct->getPrice())),
--            'qty' => $linkItem->getExtensionAttributes()->getQty(),
--            'position' => $linkItem->getPosition(),
--            'thumbnail' => $this->imageHelper->init($linkedProduct, 'product_listing_thumbnail')->getUrl(),
-+            'qty' => $linkedProduct->getQty(),
-+            'position' => $linkedProduct->getPosition(),
-+            'positionCalculated' => $linkedProduct->getPosition(),
-+            'thumbnail' => $this->imageHelper
-+                ->init($linkedProduct, 'product_listing_thumbnail')
-+                ->setImageFile($linkedProduct->getImage())
-+                ->getUrl(),
-             'type_id' => $linkedProduct->getTypeId(),
-             'status' => $this->status->getOptionText($linkedProduct->getStatus()),
-             'attribute_set' => $this->attributeSetRepository
-@@ -185,7 +215,7 @@ class Grouped extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function modifyMeta(array $meta)
-     {
-@@ -408,8 +438,8 @@ class Grouped extends AbstractModifier
-                                 'component' => 'Magento_Ui/js/form/components/button',
-                                 'actions' => [
-                                     [
--                                        'targetName' =>
--                                            $this->uiComponentsConfig['form'] . '.' . $this->uiComponentsConfig['form']
-+                                        'targetName' => $this->uiComponentsConfig['form'] .
-+                                            '.' . $this->uiComponentsConfig['form']
-                                             . '.'
-                                             . static::GROUP_GROUPED
-                                             . '.'
-@@ -417,8 +447,8 @@ class Grouped extends AbstractModifier
-                                         'actionName' => 'openModal',
-                                     ],
-                                     [
--                                        'targetName' =>
--                                            $this->uiComponentsConfig['form'] . '.' . $this->uiComponentsConfig['form']
-+                                        'targetName' => $this->uiComponentsConfig['form'] .
-+                                            '.' . $this->uiComponentsConfig['form']
-                                             . '.'
-                                             . static::GROUP_GROUPED
-                                             . '.'
-@@ -454,7 +484,7 @@ class Grouped extends AbstractModifier
-                         'label' => null,
-                         'renderDefaultRecord' => false,
-                         'template' => 'ui/dynamic-rows/templates/grid',
--                        'component' => 'Magento_Ui/js/dynamic-rows/dynamic-rows-grid',
-+                        'component' => 'Magento_GroupedProduct/js/grouped-product-grid',
-                         'addButton' => false,
-                         'itemTemplate' => 'record',
-                         'dataScope' => 'data.links',
-@@ -555,6 +585,22 @@ class Grouped extends AbstractModifier
-                     ],
-                 ],
-             ],
-+            'positionCalculated' => [
-+                'arguments' => [
-+                    'data' => [
-+                        'config' => [
-+                            'label' => __('Position'),
-+                            'dataType' => Form\Element\DataType\Number::NAME,
-+                            'formElement' => Form\Element\Input::NAME,
-+                            'componentType' => Form\Field::NAME,
-+                            'elementTmpl' => 'Magento_GroupedProduct/components/position',
-+                            'sortOrder' => 90,
-+                            'fit' => true,
-+                            'dataScope' => 'positionCalculated'
-+                        ],
-+                    ],
-+                ],
-+            ],
-             'actionDelete' => [
-                 'arguments' => [
-                     'data' => [
-@@ -563,7 +609,7 @@ class Grouped extends AbstractModifier
-                             'componentType' => 'actionDelete',
-                             'dataType' => Form\Element\DataType\Text::NAME,
-                             'label' => __('Actions'),
--                            'sortOrder' => 90,
-+                            'sortOrder' => 100,
-                             'fit' => true,
-                         ],
-                     ],
-@@ -577,7 +623,7 @@ class Grouped extends AbstractModifier
-                             'formElement' => Form\Element\Input::NAME,
-                             'componentType' => Form\Field::NAME,
-                             'dataScope' => 'position',
--                            'sortOrder' => 100,
-+                            'sortOrder' => 110,
-                             'visible' => false,
-                         ],
-                     ],
-diff --git a/app/code/Magento/GroupedProduct/etc/di.xml b/app/code/Magento/GroupedProduct/etc/di.xml
-index 0371ef2386e..43678d0ad7a 100644
---- a/app/code/Magento/GroupedProduct/etc/di.xml
-+++ b/app/code/Magento/GroupedProduct/etc/di.xml
-@@ -88,8 +88,6 @@
-             </argument>
-         </arguments>
-     </type>
--    <preference for="Magento\GroupedProduct\Model\ResourceModel\Product\Indexer\Price\GroupedInterface"
--                type="Magento\GroupedProduct\Model\ResourceModel\Product\Indexer\Price\Grouped"/>
-     <type name="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator">
-         <arguments>
-             <argument name="estimators" xsi:type="array">
-diff --git a/app/code/Magento/GroupedProduct/etc/product_types.xml b/app/code/Magento/GroupedProduct/etc/product_types.xml
-index 8f41611353a..9f8f0534ff3 100644
---- a/app/code/Magento/GroupedProduct/etc/product_types.xml
-+++ b/app/code/Magento/GroupedProduct/etc/product_types.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Catalog:etc/product_types.xsd">
-     <type name="grouped" label="Grouped Product" modelInstance="Magento\GroupedProduct\Model\Product\Type\Grouped" composite='true' indexPriority="50" sortOrder="30">
-         <priceModel instance="Magento\GroupedProduct\Model\Product\Type\Grouped\Price" />
--        <indexerModel instance="Magento\GroupedProduct\Model\ResourceModel\Product\Indexer\Price\GroupedInterface" />
-+        <indexerModel instance="Magento\GroupedProduct\Model\ResourceModel\Product\Indexer\Price\Grouped" />
-         <stockIndexerModel instance="Magento\GroupedProduct\Model\ResourceModel\Indexer\Stock\Grouped" />
-         <customAttributes>
-             <attribute name="is_real_product" value="false"/>
-diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml
-index 503404c6cb3..fab7851df5b 100644
---- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml
-+++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="catalog.product.edit.tab.super.group.popup" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">grouped_grid_popup</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\GroupedProduct\Model\ResourceModel\Product\Type\Grouped\AssociatedProductsCollection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\GroupedProduct\Model\ResourceModel\Product\Type\Grouped\AssociatedProductsCollection</argument>
-                     <argument name="use_ajax" xsi:type="string">1</argument>
-                     <argument name="default_sort" xsi:type="string">id</argument>
-                     <argument name="default_dir" xsi:type="string">ASC</argument>
-diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
-index 6bd2c4e3c67..7c6fa500703 100644
---- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
-+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
-@@ -3,73 +3,71 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-- ?>
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+?>
- 
- <?php /* @var $block \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped */ ?>
--<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
-+<?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
- <div id="catalog_product_composite_configure_fields_grouped" class="<?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
--    <h4><?= /* @escapeNotVerified */ __('Associated Products') ?></h4>
-+    <h4><?= $block->escapeHtml(__('Associated Products')) ?></h4>
-     <div class="product-options">
-         <?php $_product = $block->getProduct(); ?>
-         <?php $block->setPreconfiguredValue(); ?>
-         <?php $_associatedProducts = $block->getAssociatedProducts(); ?>
-         <?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
--        <?php if ((!$_product->isAvailable() && !$_skipSaleableCheck) || !$_hasAssociatedProducts): ?>
--            <p class="availability out-of-stock"><?= /* @escapeNotVerified */ __('Availability:') ?> <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></p>
-+        <?php if ((!$_product->isAvailable() && !$_skipSaleableCheck) || !$_hasAssociatedProducts) : ?>
-+            <p class="availability out-of-stock"><?= $block->escapeHtml(__('Availability:')) ?> <span><?= $block->escapeHtml(__('Out of stock')) ?></span></p>
-         <?php endif; ?>
-         <table class="data-table admin__table-primary grouped-items-table" id="super-product-table">
-             <thead>
-                 <tr class="headings">
--                    <th class="col-id"><?= /* @escapeNotVerified */ __('ID') ?></th>
--                    <th class="col-sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
--                    <th class="col-name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
--                    <?php if ($block->getCanShowProductPrice($_product)): ?>
--                    <th class="col-price"><?= /* @escapeNotVerified */ __('Price') ?></th>
-+                    <th class="col-id"><?= $block->escapeHtml(__('ID')) ?></th>
-+                    <th class="col-sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-+                    <th class="col-name"><?= $block->escapeHtml(__('Product Name')) ?></th>
-+                    <?php if ($block->getCanShowProductPrice($_product)) : ?>
-+                    <th class="col-price"><?= $block->escapeHtml(__('Price')) ?></th>
-                     <?php endif; ?>
--                    <?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>
--                    <th class="col-qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
-+                    <?php if ($_product->isSaleable() || $_skipSaleableCheck) : ?>
-+                    <th class="col-qty"><?= $block->escapeHtml(__('Qty')) ?></th>
-                     <?php endif; ?>
-                 </tr>
-             </thead>
-             <tbody>
--            <?php if ($_hasAssociatedProducts): ?>
-+            <?php if ($_hasAssociatedProducts) : ?>
-                 <?php $i = 0 ?>
--            <?php foreach ($_associatedProducts as $_item): ?>
--                <tr class="<?= /* @escapeNotVerified */ (++$i % 2) ? 'even' : 'odd' ?>">
--                    <td class="col-id"><?= /* @escapeNotVerified */ $_item->getId() ?></td>
-+                <?php foreach ($_associatedProducts as $_item) : ?>
-+                <tr class="<?= $block->escapeHtmlAttr((++$i % 2) ? 'even' : 'odd') ?>">
-+                    <td class="col-id"><?= $block->escapeHtml($_item->getId()) ?></td>
-                     <td class="col-sku"><?= $block->escapeHtml($_item->getSku()) ?></td>
-                     <td class="col-name"><?= $block->escapeHtml($_item->getName()) ?></td>
--                    <?php if ($block->getCanShowProductPrice($_product)): ?>
-+                    <?php if ($block->getCanShowProductPrice($_product)) : ?>
-                     <td class="col-price">
--                        <?php if ($block->getCanShowProductPrice($_item)): ?>
--                        <?= /* @escapeNotVerified */ $block->getProductPrice($_item) ?>
-+                        <?php if ($block->getCanShowProductPrice($_item)) : ?>
-+                            <?= /* @noEscape */ $block->getProductPrice($_item) ?>
-                         <?php endif; ?>
-                     </td>
-                     <?php endif; ?>
--                    <?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>
-+                    <?php if ($_product->isSaleable() || $_skipSaleableCheck) : ?>
-                     <td class="col-qty">
--                    <?php if ($_item->isSaleable() || $_skipSaleableCheck) : ?>
-+                        <?php if ($_item->isSaleable() || $_skipSaleableCheck) : ?>
-                         <input type="text"
--                               name="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]"
--                               id="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]"
-+                               name="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
-+                               id="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
-                                maxlength="12"
--                               value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>"
--                               title="<?= /* @escapeNotVerified */ __('Qty') ?>"
-+                               value="<?= $block->escapeHtmlAttr($_item->getQty()*1) ?>"
-+                               title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
-                                class="input-text admin__control-text qty" />
--                        <input type="hidden" value="1" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_item->getPrice()) ?>" qtyId="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]" />
--                    <?php else: ?>
--                        <p class="availability out-of-stock"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></p>
-+                        <input type="hidden" value="1" price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_item->getPrice())) ?>" qtyId="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]" />
-+                    <?php else : ?>
-+                        <p class="availability out-of-stock"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></p>
-                     <?php endif; ?>
-                     </td>
-                     <?php endif; ?>
-                 </tr>
-             <?php endforeach; ?>
--            <?php else: ?>
-+            <?php else : ?>
-                <tr>
--                   <td class="empty-text" colspan="<?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>4<?php else : ?>3<?php endif; ?>"><?= /* @escapeNotVerified */ __('No options of this product are available.') ?></td>
-+                   <td class="empty-text" colspan="<?php if ($_product->isSaleable() || $_skipSaleableCheck) : ?>4<?php else : ?>3<?php endif; ?>"><?= $block->escapeHtml(__('No options of this product are available.')) ?></td>
-                </tr>
-             <?php endif; ?>
-             </tbody>
-diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
-index 2c5a24195dd..ac6161d940a 100644
---- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
-+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
-@@ -4,17 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Framework\View\Element\Template */
- 
- /** @var $block \Magento\Framework\View\Element\Template */
- $_gridPopupBlock = $block->getChildBlock('catalog.product.group.grid.popup.container')->getChildBlock('grid');
- $_gridPopupBlock->setRowClickCallback('function(){}');
- ?>
--<div id="grouped-product-container" data-mage-init='{"groupedProduct":{"gridPopup":"[data-grid-id=<?= /* @escapeNotVerified */ $_gridPopupBlock->getId() ?>]"}}'>
-+<div id="grouped-product-container" data-mage-init='{"groupedProduct":{"gridPopup":"[data-grid-id=<?= $block->escapeHtmlAttr($_gridPopupBlock->getId()) ?>]"}}'>
-     <div class="no-products-message">
--        <?= /* @escapeNotVerified */ __('There are no grouped products.') ?>
-+        <?= $block->escapeHtml(__('There are no grouped products.')) ?>
-     </div>
-     <?= $block->getChildHtml('list') ?>
-     <div data-role="add-product-dialog" class="no-display">
-diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
-index c931304fcae..0872afcc8b3 100644
---- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
-+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
-@@ -3,7 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- /* @var $block \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts */
- ?>
- <script type="text/x-magento-template" id="group-product-template">
-@@ -56,16 +56,16 @@
-                     <span></span>
-                 </th>
-                 <th data-column="name" class="no-link col-name">
--                    <span><?= /* @escapeNotVerified */ __('Name') ?></span>
-+                    <span><?= $block->escapeHtml(__('Name')) ?></span>
-                 </th>
-                 <th data-column="sku" class="no-link col-sku">
--                    <span><?= /* @escapeNotVerified */ __('SKU') ?></span>
-+                    <span><?= $block->escapeHtml(__('SKU')) ?></span>
-                 </th>
-                 <th data-column="price" class="no-link col-price">
--                    <span><?= /* @escapeNotVerified */ __('Price') ?></span>
-+                    <span><?= $block->escapeHtml(__('Price')) ?></span>
-                     </th>
-                 <th data-column="qty" class="no-link col-qty">
--                    <span><?= /* @escapeNotVerified */ __('Default Qty') ?></span>
-+                    <span><?= $block->escapeHtml(__('Default Qty')) ?></span>
-                 </th>
-                 <th data-column="actions" class="last no-link col-actions">
-                     <span></span>
-diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/web/css/grouped-product.css b/app/code/Magento/GroupedProduct/view/adminhtml/web/css/grouped-product.css
-index 3d723387d23..9142eaf9089 100644
---- a/app/code/Magento/GroupedProduct/view/adminhtml/web/css/grouped-product.css
-+++ b/app/code/Magento/GroupedProduct/view/adminhtml/web/css/grouped-product.css
-@@ -66,3 +66,49 @@
-     overflow: hidden;
-     text-overflow: ellipsis;
- }
-+
-+.position {
-+    width: 100px;
-+}
-+
-+.icon-rearrange-position > span {
-+    border: 0;
-+    clip: rect(0, 0, 0, 0);
-+    height: 1px;
-+    margin: -1px;
-+    overflow: hidden;
-+    padding: 0;
-+    position: absolute;
-+    width: 1px;
-+}
-+
-+.icon-forward,
-+.icon-backward {
-+    -webkit-font-smoothing: antialiased;
-+    font-family: 'Admin Icons';
-+    font-size: 17px;
-+    speak: none;
-+}
-+
-+.position > * {
-+    float: left;
-+    margin: 3px;
-+}
-+
-+.position-widget-input {
-+    text-align: center;
-+    width: 40px;
-+}
-+
-+.icon-forward:before {
-+    content: '\e618';
-+}
-+
-+.icon-backward:before {
-+    content: '\e619';
-+}
-+
-+.icon-rearrange-position, .icon-rearrange-position:hover   {
-+    color: #d9d9d9;
-+    text-decoration: none;
-+}
-diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product-grid.js b/app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product-grid.js
-new file mode 100644
-index 00000000000..0ac3b58d6e3
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product-grid.js
-@@ -0,0 +1,219 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'underscore',
-+    'uiRegistry',
-+    'Magento_Ui/js/dynamic-rows/dynamic-rows-grid'
-+], function (_, registry, dynamicRowsGrid) {
-+    'use strict';
-+
-+    return dynamicRowsGrid.extend({
-+
-+        /**
-+         * Set max element position
-+         *
-+         * @param {Number} position - element position
-+         * @param {Object} elem - instance
-+         */
-+        setMaxPosition: function (position, elem) {
-+
-+            if (position || position === 0) {
-+                this.checkMaxPosition(position);
-+                this.sort(position, elem);
-+
-+                if (~~position === this.maxPosition && ~~position > this.getDefaultPageBoundary() + 1) {
-+                    this.shiftNextPagesPositions(position);
-+                }
-+            } else {
-+                this.maxPosition += 1;
-+            }
-+        },
-+
-+        /**
-+         * Shift positions for next page elements
-+         *
-+         * @param {Number} position
-+         */
-+        shiftNextPagesPositions: function (position) {
-+
-+            var recordData = this.recordData(),
-+                startIndex = ~~this.currentPage() * this.pageSize,
-+                offset = position - startIndex + 1,
-+                index = startIndex;
-+
-+            if (~~this.currentPage() === this.pages()) {
-+                return false;
-+            }
-+
-+            for (index; index < recordData.length; index++) {
-+                recordData[index].position = index + offset;
-+            }
-+            this.recordData(recordData);
-+        },
-+
-+        /**
-+         * Update position for element after position from another page is entered
-+         *
-+         * @param {Object} data
-+         * @param {Object} event
-+         */
-+        updateGridPosition: function (data, event) {
-+            var inputValue = parseInt(event.target.value, 10),
-+                recordData = this.recordData(),
-+                record,
-+                previousValue,
-+                updatedRecord;
-+
-+            record = this.elems().find(function (obj) {
-+                return obj.dataScope === data.parentScope;
-+            });
-+
-+            previousValue = this.getCalculatedPosition(record);
-+
-+            if (isNaN(inputValue) || inputValue < 0 || inputValue === previousValue) {
-+                return false;
-+            }
-+
-+            this.elems([]);
-+
-+            updatedRecord = this.getUpdatedRecordIndex(recordData, record.data().id);
-+
-+            if (inputValue >= this.recordData().size() - 1) {
-+                recordData[updatedRecord].position = this.getGlobalMaxPosition() + 1;
-+            } else {
-+                recordData.forEach(function (value, index) {
-+                    if (~~value.id === ~~record.data().id) {
-+                        recordData[index].position = inputValue;
-+                    } else if (inputValue > previousValue && index <= inputValue) {
-+                        recordData[index].position = index - 1;
-+                    } else if (inputValue < previousValue && index >= inputValue) {
-+                        recordData[index].position = index + 1;
-+                    }
-+                });
-+            }
-+
-+            this.reloadGridData(recordData);
-+
-+        },
-+
-+        /**
-+         * Get updated record index
-+         *
-+         * @param  {Array} recordData
-+         * @param {Number} recordId
-+         * @return {Number}
-+         */
-+        getUpdatedRecordIndex: function (recordData, recordId) {
-+            return recordData.map(function (o) {
-+                return ~~o.id;
-+            }).indexOf(~~recordId);
-+        },
-+
-+        /**
-+         *
-+         * @param {Array} recordData - to reprocess
-+         */
-+        reloadGridData: function (recordData) {
-+            this.recordData(recordData.sort(function (a, b) {
-+                return ~~a.position - ~~b.position;
-+            }));
-+            this._updateCollection();
-+            this.reload();
-+        },
-+
-+        /**
-+         * Event handler for "Send to bottom" button
-+         *
-+         * @param {Object} positionObj
-+         * @return {Boolean}
-+         */
-+        sendToBottom: function (positionObj) {
-+
-+            var objectToUpdate = this.getObjectToUpdate(positionObj),
-+                recordData = this.recordData(),
-+                updatedRecord;
-+
-+            if (~~this.currentPage() === this.pages) {
-+                objectToUpdate.position = this.maxPosition;
-+            } else {
-+                this.elems([]);
-+                updatedRecord = this.getUpdatedRecordIndex(recordData, objectToUpdate.data().id);
-+                recordData[updatedRecord].position = this.getGlobalMaxPosition() + 1;
-+                this.reloadGridData(recordData);
-+            }
-+
-+            return false;
-+        },
-+
-+        /**
-+         * Event handler for "Send to top" button
-+         *
-+         * @param {Object} positionObj
-+         * @return {Boolean}
-+         */
-+        sendToTop: function (positionObj) {
-+            var objectToUpdate = this.getObjectToUpdate(positionObj),
-+                recordData = this.recordData(),
-+                updatedRecord;
-+
-+            //isFirst
-+            if (~~this.currentPage() === 1) {
-+                objectToUpdate.position = 0;
-+            } else {
-+                this.elems([]);
-+                updatedRecord = this.getUpdatedRecordIndex(recordData, objectToUpdate.data().id);
-+                recordData.forEach(function (value, index) {
-+                    recordData[index].position = index === updatedRecord ? 0 : value.position + 1;
-+                });
-+                this.reloadGridData(recordData);
-+            }
-+
-+            return false;
-+        },
-+
-+        /**
-+         * Get element from grid for update
-+         *
-+         * @param {Object} object
-+         * @return {*}
-+         */
-+        getObjectToUpdate: function (object) {
-+            return this.elems().filter(function (item) {
-+                return item.name === object.parentName;
-+            })[0];
-+        },
-+
-+        /**
-+         * Value function for position input
-+         *
-+         * @param {Object} data
-+         * @return {Number}
-+         */
-+        getCalculatedPosition: function (data) {
-+            return (~~this.currentPage() - 1) * this.pageSize + this.elems().pluck('name').indexOf(data.name);
-+        },
-+
-+        /**
-+         * Return Page Boundary
-+         *
-+         * @return {Number}
-+         */
-+        getDefaultPageBoundary: function () {
-+            return ~~this.currentPage() * this.pageSize - 1;
-+        },
-+
-+        /**
-+         * Returns position for last element to be moved after
-+         *
-+         * @return {Number}
-+         */
-+        getGlobalMaxPosition: function () {
-+            return _.max(this.recordData().map(function (r) {
-+                return ~~r.position;
-+            }));
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/web/template/components/position.html b/app/code/Magento/GroupedProduct/view/adminhtml/web/template/components/position.html
-new file mode 100644
-index 00000000000..050fb3c2898
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/view/adminhtml/web/template/components/position.html
-@@ -0,0 +1,19 @@
-+<div class="position">
-+    <a href="#" class="move-top icon-backward icon-rearrange-position"
-+       data-bind="
-+            click: $parent.sendToTop.bind($parent)
-+            ">
-+        <span>Top</span>
-+    </a>
-+    <input type="text" class="position-widget-input"
-+           data-bind="
-+                value: $parent.getCalculatedPosition($record()),
-+                event: {blur: $parent.updateGridPosition.bind($parent)}
-+            "/>
-+    <a href="#" class="move-bottom icon-forward icon-rearrange-position"
-+       data-bind="
-+            click: $parent.sendToBottom.bind($parent)
-+            ">
-+        <span>Bottom</span>
-+    </a>
-+</div>
-diff --git a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
-index 34de1a18cf2..c9c03b9f214 100644
---- a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
-+++ b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * Template for displaying grouped product price
-  */
-@@ -26,10 +24,10 @@ if ($minProduct) {
-         );
- }
- ?>
--<div class="price-box" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
--    <?php if ($minProduct && \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW != $block->getZone()): ?>
-+<div class="price-box">
-+    <?php if ($minProduct && \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW != $block->getZone()) : ?>
-     <p class="minimal-price">
--        <span class="price-label"><?= /* @escapeNotVerified */ __('Starting at') ?></span><?= $amountRender->toHtml() ?>
-+        <span class="price-label"><?= $block->escapeHtml(__('Starting at')) ?></span><?= $amountRender->toHtml() ?>
-     </p>
-     <?php endif ?>
- </div>
-diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
-index 89434ac7b13..b1697bfb012 100644
---- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
-+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
-@@ -3,23 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Catalog\Block\Product\View\AbstractView */?>
- <?php $_product = $block->getProduct() ?>
- 
- <?php $_associatedProducts = $block->getAssociatedProducts(); ?>
- <?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
--<?php if ($block->displayProductStockStatus()): ?>
--    <?php if ($_product->isAvailable() && $_hasAssociatedProducts): ?>
--        <div class="stock available" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
--            <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
-+<?php if ($block->displayProductStockStatus()) : ?>
-+    <?php if ($_product->isAvailable() && $_hasAssociatedProducts) : ?>
-+        <div class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-+            <span><?= $block->escapeHtml(__('In stock')) ?></span>
-         </div>
--    <?php else: ?>
--        <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
--            <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
-+    <?php else : ?>
-+        <div class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-+            <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
-         </div>
-     <?php endif; ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
-index 7fad5635f86..0257d87a2d9 100644
---- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
-+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * Grouped product data template
-  *
-@@ -19,56 +17,58 @@
- <?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
- 
- <div class="table-wrapper grouped">
--    <table class="table data grouped" id="super-product-table">
--        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Grouped product items') ?></caption>
-+    <table class="table data grouped"
-+           id="super-product-table"
-+           data-mage-init='{ "Magento_GroupedProduct/js/product-ids-resolver": {} }'>
-+        <caption class="table-caption"><?= $block->escapeHtml(__('Grouped product items')) ?></caption>
-         <thead>
-         <tr>
--            <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
--            <?php if ($_product->isSaleable()): ?>
--                <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
-+            <th class="col item" scope="col"><?= $block->escapeHtml(__('Product Name')) ?></th>
-+            <?php if ($_product->isSaleable()) : ?>
-+                <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
-             <?php endif; ?>
-         </tr>
-         </thead>
- 
--        <?php if ($_hasAssociatedProducts): ?>
--        <?php foreach ($_associatedProducts as $_item): ?>
-+        <?php if ($_hasAssociatedProducts) : ?>
-         <tbody>
-+            <?php foreach ($_associatedProducts as $_item) : ?>
-             <tr>
-                 <td data-th="<?= $block->escapeHtml(__('Product Name')) ?>" class="col item">
-                     <strong class="product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
--                    <?php if ($block->getCanShowProductPrice($_product)): ?>
--                        <?php if ($block->getCanShowProductPrice($_item)): ?>
--                            <?= /* @escapeNotVerified */ $block->getProductPrice($_item) ?>
-+                    <?php if ($block->getCanShowProductPrice($_product)) : ?>
-+                        <?php if ($block->getCanShowProductPrice($_item)) : ?>
-+                            <?= /* @noEscape */ $block->getProductPrice($_item) ?>
-+                        <?php endif; ?>
-                         <?php endif; ?>
--                     <?php endif; ?>
-                 </td>
--                <?php if ($_product->isSaleable()): ?>
-+                <?php if ($_product->isSaleable()) : ?>
-                 <td data-th="<?= $block->escapeHtml(__('Qty')) ?>" class="col qty">
--                <?php if ($_item->isSaleable()) : ?>
-+                    <?php if ($_item->isSaleable()) : ?>
-                     <div class="control qty">
-                         <input type="number"
--                               name="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]"
--                               data-selector="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]"
--                               value="<?= /* @escapeNotVerified */ $_item->getQty() * 1 ?>"
--                               title="<?= /* @escapeNotVerified */ __('Qty') ?>"
-+                               name="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
-+                               data-selector="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
-+                               value="<?= $block->escapeHtmlAttr($_item->getQty() * 1) ?>"
-+                               title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
-                                class="input-text qty"
-                                data-validate="{'validate-grouped-qty':'#super-product-table'}"
-                                data-errors-message-box="#validation-message-box"/>
-                     </div>
--                <?php else: ?>
--                    <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
--                        <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
-+                <?php else : ?>
-+                    <div class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-+                        <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
-                     </div>
-                 <?php endif; ?>
-                 </td>
-                 <?php endif; ?>
-             </tr>
--            <?php if ($block->getCanShowProductPrice($_product)
-+                <?php if ($block->getCanShowProductPrice($_product)
-                 && $block->getCanShowProductPrice($_item)
-                 && trim($block->getProductPriceHtml(
-                     $_item,
-                     \Magento\Catalog\Pricing\Price\TierPrice::PRICE_CODE
--                ))): ?>
-+                ))) : ?>
-                 <tr class="row-tier-price">
-                     <td colspan="2">
-                         <?= $block->getProductPriceHtml(
-@@ -78,14 +78,14 @@
-                     </td>
-                 </tr>
-             <?php endif; ?>
--        </tbody>
-         <?php endforeach; ?>
--        <?php else: ?>
-+        </tbody>
-+        <?php else : ?>
-         <tbody>
-             <tr>
-                 <td class="unavailable"
--                    colspan="<?php if ($_product->isSaleable()): ?>4<?php else : ?>3<?php endif; ?>">
--                    <?= /* @escapeNotVerified */ __('No options of this product are available.') ?>
-+                    colspan="<?php if ($_product->isSaleable()) : ?>4<?php else : ?>3<?php endif; ?>">
-+                    <?= $block->escapeHtml(__('No options of this product are available.')) ?>
-                 </td>
-             </tr>
-         </tbody>
-diff --git a/app/code/Magento/GroupedProduct/view/frontend/web/js/product-ids-resolver.js b/app/code/Magento/GroupedProduct/view/frontend/web/js/product-ids-resolver.js
-new file mode 100644
-index 00000000000..e6294d8043a
---- /dev/null
-+++ b/app/code/Magento/GroupedProduct/view/frontend/web/js/product-ids-resolver.js
-@@ -0,0 +1,25 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+define([
-+    'jquery',
-+    'Magento_Catalog/js/product/view/product-ids'
-+], function ($, productIds) {
-+    'use strict';
-+
-+    /**
-+     * Returns id's of products in form.
-+     *
-+     * @param {Object} config
-+     * @param {HTMLElement} element
-+     * @return {Array}
-+     */
-+    return function (config, element) {
-+        $(element).find('div[data-product-id]').each(function () {
-+            productIds.push($(this).data('productId').toString());
-+        });
-+
-+        return productIds();
-+    };
-+});
-diff --git a/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductTypeResolver.php b/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductTypeResolver.php
-index 087cf10c8d6..8818766692f 100644
---- a/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductTypeResolver.php
-+++ b/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductTypeResolver.php
-@@ -8,19 +8,21 @@ declare(strict_types=1);
- namespace Magento\GroupedProductGraphQl\Model;
- 
- use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
-+use Magento\GroupedProduct\Model\Product\Type\Grouped as Type;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class GroupedProductTypeResolver implements TypeResolverInterface
- {
-+    const GROUPED_PRODUCT = 'GroupedProduct';
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolveType(array $data) : string
-     {
--        if (isset($data['type_id']) && $data['type_id'] == 'grouped') {
--            return 'GroupedProduct';
-+        if (isset($data['type_id']) && $data['type_id'] == Type::TYPE_CODE) {
-+            return self::GROUPED_PRODUCT;
-         }
-         return '';
-     }
-diff --git a/app/code/Magento/GroupedProductGraphQl/Model/Resolver/GroupedItems.php b/app/code/Magento/GroupedProductGraphQl/Model/Resolver/GroupedItems.php
-index fafbbcf436e..d51b22ffe21 100644
---- a/app/code/Magento/GroupedProductGraphQl/Model/Resolver/GroupedItems.php
-+++ b/app/code/Magento/GroupedProductGraphQl/Model/Resolver/GroupedItems.php
-@@ -7,43 +7,34 @@ declare(strict_types=1);
- 
- namespace Magento\GroupedProductGraphQl\Model\Resolver;
- 
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- use Magento\GroupedProduct\Model\Product\Initialization\Helper\ProductLinks\Plugin\Grouped;
- 
- /**
-- * {@inheritdoc}
-+ * @inheritdoc
-  */
- class GroupedItems implements ResolverInterface
- {
--    /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
-     /**
-      * @var Product
-      */
-     private $productResolver;
- 
-     /**
--     * @param ValueFactory $valueFactory
-      * @param Product $productResolver
-      */
-     public function __construct(
--        ValueFactory $valueFactory,
-         Product $productResolver
-     ) {
--        $this->valueFactory = $valueFactory;
-         $this->productResolver = $productResolver;
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -51,14 +42,12 @@ class GroupedItems implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         if (!isset($value['model'])) {
--            $result = function () {
--                return null;
--            };
--            return $this->valueFactory->create($result);
-+            throw new LocalizedException(__('"model" value should be specified'));
-         }
- 
-+        $data = [];
-         $productModel = $value['model'];
-         $links = $productModel->getProductLinks();
-         foreach ($links as $link) {
-@@ -73,10 +62,6 @@ class GroupedItems implements ResolverInterface
-             ];
-         }
- 
--        $result = function () use ($data) {
--            return $data;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $data;
-     }
- }
-diff --git a/app/code/Magento/ImportExport/Api/Data/ExportInfoInterface.php b/app/code/Magento/ImportExport/Api/Data/ExportInfoInterface.php
-new file mode 100644
-index 00000000000..01c41e35fc4
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Api/Data/ExportInfoInterface.php
-@@ -0,0 +1,90 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ImportExport\Api\Data;
-+
-+/**
-+ * Basic interface with data needed for export operation.
-+ * @api
-+ */
-+interface ExportInfoInterface
-+{
-+    /**
-+     * Return filename.
-+     *
-+     * @return string
-+     */
-+    public function getFileName();
-+
-+    /**
-+     * Set filename into local variable.
-+     *
-+     * @param string $fileName
-+     * @return void
-+     */
-+    public function setFileName($fileName);
-+
-+    /**
-+     * Override standard entity getter.
-+     *
-+     * @return string
-+     */
-+    public function getFileFormat();
-+
-+    /**
-+     * Set file format.
-+     *
-+     * @param string $fileFormat
-+     * @return void
-+     */
-+    public function setFileFormat($fileFormat);
-+
-+    /**
-+     * Return content type.
-+     *
-+     * @return string
-+     */
-+    public function getContentType();
-+
-+    /**
-+     * Set content type.
-+     *
-+     * @param string $contentType
-+     * @return void
-+     */
-+    public function setContentType($contentType);
-+
-+    /**
-+     * Returns entity.
-+     *
-+     * @return string
-+     */
-+    public function getEntity();
-+
-+    /**
-+     * Set entity for export logic.
-+     *
-+     * @param string $entity
-+     * @return void
-+     */
-+    public function setEntity($entity);
-+
-+    /**
-+     * Returns export filter.
-+     *
-+     * @return string
-+     */
-+    public function getExportFilter();
-+
-+    /**
-+     * Set filter for export result.
-+     *
-+     * @param string $exportFilter
-+     * @return void
-+     */
-+    public function setExportFilter($exportFilter);
-+}
-diff --git a/app/code/Magento/ImportExport/Api/ExportManagementInterface.php b/app/code/Magento/ImportExport/Api/ExportManagementInterface.php
-new file mode 100644
-index 00000000000..39bb89b43c8
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Api/ExportManagementInterface.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ImportExport\Api;
-+
-+use Magento\ImportExport\Api\Data\ExportInfoInterface;
-+
-+/**
-+ * Describes how to do export operation with data interface.
-+ * @api
-+ */
-+interface ExportManagementInterface
-+{
-+    /**
-+     * Return export data.
-+     *
-+     * @param ExportInfoInterface $exportInfo
-+     * @return string
-+     */
-+    public function export(ExportInfoInterface $exportInfo);
-+}
-diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
-index dc928b4c794..d032f2f7621 100644
---- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
-+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
-@@ -237,20 +237,20 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
-         if ($attribute->getFilterOptions()) {
-             $options = [];
- 
--            foreach ($attribute->getFilterOptions() as $value => $label) {
--                $options[] = ['value' => $value, 'label' => $label];
-+            foreach ($attribute->getFilterOptions() as $optionValue => $label) {
-+                $options[] = ['value' => $optionValue, 'label' => $label];
-             }
-         } else {
-             $options = $attribute->getSource()->getAllOptions(false);
-         }
-         if ($size = count($options)) {
--            // add empty vaue option
-+            // add empty value option
-             $firstOption = reset($options);
- 
-             if ('' === $firstOption['value']) {
-                 $options[key($options)]['label'] = '';
-             } else {
--                array_unshift($options, ['value' => '', 'label' => '']);
-+                array_unshift($options, ['value' => '', 'label' => __('-- Not Selected --')]);
-             }
-             $arguments = [
-                 'name' => $this->getFilterElementName($attribute->getAttributeCode()),
-diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
-index 39d0d5c7fea..d6b96a28afc 100644
---- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
-+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
-@@ -18,7 +18,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-     /**
-      * Basic import model
-      *
--     * @var \Magento\ImportExport\Model\Import
-+     * @var Import
-      */
-     protected $_importModel;
- 
-@@ -77,8 +77,10 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-         );
- 
-         // base fieldset
--        $fieldsets['base'] = $form->addFieldset('base_fieldset', ['legend' => __('Import Settings')]);
--        $fieldsets['base']->addField(
-+        $fieldsets['base'] = $form->addFieldset(
-+            'base_fieldset',
-+            ['legend' => __('Import Settings')]
-+        )->addField(
-             'entity',
-             'select',
-             [
-@@ -95,12 +97,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-         // add behaviour fieldsets
-         $uniqueBehaviors = $this->_importModel->getUniqueEntityBehaviors();
-         foreach ($uniqueBehaviors as $behaviorCode => $behaviorClass) {
--            $fieldsets[$behaviorCode] = $form->addFieldset(
-+            $fieldset = $form->addFieldset(
-                 $behaviorCode . '_fieldset',
-                 ['legend' => __('Import Behavior'), 'class' => 'no-display']
-             );
--            /** @var $behaviorSource \Magento\ImportExport\Model\Source\Import\AbstractBehavior */
--            $fieldsets[$behaviorCode]->addField(
-+            $fieldset->addField(
-                 $behaviorCode,
-                 'select',
-                 [
-@@ -113,15 +114,16 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-                     'class' => $behaviorCode,
-                     'onchange' => 'varienImport.handleImportBehaviorSelector();',
-                     'note' => ' ',
-+                    'after_element_html' => $this->getImportBehaviorTooltip(),
-                 ]
-             );
--            $fieldsets[$behaviorCode]->addField(
--                $behaviorCode . \Magento\ImportExport\Model\Import::FIELD_NAME_VALIDATION_STRATEGY,
-+            $fieldset->addField(
-+                $behaviorCode . Import::FIELD_NAME_VALIDATION_STRATEGY,
-                 'select',
-                 [
--                    'name' => \Magento\ImportExport\Model\Import::FIELD_NAME_VALIDATION_STRATEGY,
--                    'title' => __(' '),
--                    'label' => __(' '),
-+                    'name' => Import::FIELD_NAME_VALIDATION_STRATEGY,
-+                    'title' => __('Validation Strategy'),
-+                    'label' => __('Validation Strategy'),
-                     'required' => true,
-                     'class' => $behaviorCode,
-                     'disabled' => true,
-@@ -132,11 +134,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-                     'after_element_html' => $this->getDownloadSampleFileHtml(),
-                 ]
-             );
--            $fieldsets[$behaviorCode]->addField(
--                $behaviorCode . '_' . \Magento\ImportExport\Model\Import::FIELD_NAME_ALLOWED_ERROR_COUNT,
-+            $fieldset->addField(
-+                $behaviorCode . '_' . Import::FIELD_NAME_ALLOWED_ERROR_COUNT,
-                 'text',
-                 [
--                    'name' => \Magento\ImportExport\Model\Import::FIELD_NAME_ALLOWED_ERROR_COUNT,
-+                    'name' => Import::FIELD_NAME_ALLOWED_ERROR_COUNT,
-                     'label' => __('Allowed Errors Count'),
-                     'title' => __('Allowed Errors Count'),
-                     'required' => true,
-@@ -148,11 +150,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-                     ),
-                 ]
-             );
--            $fieldsets[$behaviorCode]->addField(
--                $behaviorCode . '_' . \Magento\ImportExport\Model\Import::FIELD_FIELD_SEPARATOR,
-+            $fieldset->addField(
-+                $behaviorCode . '_' . Import::FIELD_FIELD_SEPARATOR,
-                 'text',
-                 [
--                    'name' => \Magento\ImportExport\Model\Import::FIELD_FIELD_SEPARATOR,
-+                    'name' => Import::FIELD_FIELD_SEPARATOR,
-                     'label' => __('Field separator'),
-                     'title' => __('Field separator'),
-                     'required' => true,
-@@ -161,11 +163,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-                     'value' => ',',
-                 ]
-             );
--            $fieldsets[$behaviorCode]->addField(
--                $behaviorCode . \Magento\ImportExport\Model\Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR,
-+            $fieldset->addField(
-+                $behaviorCode . Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR,
-                 'text',
-                 [
--                    'name' => \Magento\ImportExport\Model\Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR,
-+                    'name' => Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR,
-                     'label' => __('Multiple value separator'),
-                     'title' => __('Multiple value separator'),
-                     'required' => true,
-@@ -174,11 +176,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-                     'value' => Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
-                 ]
-             );
--            $fieldsets[$behaviorCode]->addField(
--                $behaviorCode . \Magento\ImportExport\Model\Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
-+            $fieldset->addField(
-+                $behaviorCode . Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
-                 'text',
-                 [
--                    'name' => \Magento\ImportExport\Model\Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
-+                    'name' => Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
-                     'label' => __('Empty attribute value constant'),
-                     'title' => __('Empty attribute value constant'),
-                     'required' => true,
-@@ -187,39 +189,43 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-                     'value' => Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
-                 ]
-             );
--            $fieldsets[$behaviorCode]->addField(
--                $behaviorCode . \Magento\ImportExport\Model\Import::FIELDS_ENCLOSURE,
-+            $fieldset->addField(
-+                $behaviorCode . Import::FIELDS_ENCLOSURE,
-                 'checkbox',
-                 [
--                    'name' => \Magento\ImportExport\Model\Import::FIELDS_ENCLOSURE,
-+                    'name' => Import::FIELDS_ENCLOSURE,
-                     'label' => __('Fields enclosure'),
-                     'title' => __('Fields enclosure'),
-                     'value' => 1,
-                 ]
-             );
-+            $fieldsets[$behaviorCode] = $fieldset;
-         }
- 
-         // fieldset for file uploading
--        $fieldsets['upload'] = $form->addFieldset(
-+        $fieldset = $form->addFieldset(
-             'upload_file_fieldset',
-             ['legend' => __('File to Import'), 'class' => 'no-display']
-         );
--        $fieldsets['upload']->addField(
--            \Magento\ImportExport\Model\Import::FIELD_NAME_SOURCE_FILE,
-+        $fieldset->addField(
-+            Import::FIELD_NAME_SOURCE_FILE,
-             'file',
-             [
--                'name' => \Magento\ImportExport\Model\Import::FIELD_NAME_SOURCE_FILE,
-+                'name' => Import::FIELD_NAME_SOURCE_FILE,
-                 'label' => __('Select File to Import'),
-                 'title' => __('Select File to Import'),
-                 'required' => true,
--                'class' => 'input-file'
-+                'class' => 'input-file',
-+                'note' => __(
-+                    'File must be saved in UTF-8 encoding for proper import'
-+                ),
-             ]
-         );
--        $fieldsets['upload']->addField(
--            \Magento\ImportExport\Model\Import::FIELD_NAME_IMG_FILE_DIR,
-+        $fieldset->addField(
-+            Import::FIELD_NAME_IMG_FILE_DIR,
-             'text',
-             [
--                'name' => \Magento\ImportExport\Model\Import::FIELD_NAME_IMG_FILE_DIR,
-+                'name' => Import::FIELD_NAME_IMG_FILE_DIR,
-                 'label' => __('Images File Directory'),
-                 'title' => __('Images File Directory'),
-                 'required' => false,
-@@ -230,6 +236,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-                 ),
-             ]
-         );
-+        $fieldsets['upload'] = $fieldset;
- 
-         $form->setUseContainer(true);
-         $this->setForm($form);
-@@ -249,4 +256,19 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-             . '</a></span>';
-         return $html;
-     }
-+
-+    /**
-+     * Get Import Behavior field tooltip
-+     *
-+     * @return string
-+     */
-+    private function getImportBehaviorTooltip()
-+    {
-+        $html = '<div class="admin__field-tooltip tooltip">
-+            <a class="admin__field-tooltip-action action-help" target="_blank" title="What is this?" 
-+                href="https://docs.magento.com/m2/ce/user_guide/system/data-import.html"><span>'
-+            . __('What is this?')
-+            . '</span></a></div>';
-+        return $html;
-+    }
- }
-diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
-index 06d8610a247..13c22a976e7 100644
---- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
-+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
-@@ -5,15 +5,19 @@
-  */
- namespace Magento\ImportExport\Controller\Adminhtml\Export;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\App\Response\Http\FileFactory;
- use Magento\ImportExport\Model\Export as ExportModel;
--use Magento\Framework\App\Filesystem\DirectoryList;
--use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\MessageQueue\PublisherInterface;
-+use Magento\ImportExport\Model\Export\Entity\ExportInfoFactory;
- 
--class Export extends ExportController
-+/**
-+ * Controller for export operation.
-+ */
-+class Export extends ExportController implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\App\Response\Http\FileFactory
-@@ -26,18 +30,38 @@ class Export extends ExportController
-     private $sessionManager;
- 
-     /**
--     * @param \Magento\Backend\App\Action\Context $context
--     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
--     * @param \Magento\Framework\Session\SessionManagerInterface $sessionManager [optional]
-+     * @var PublisherInterface
-+     */
-+    private $messagePublisher;
-+
-+    /**
-+     * @var ExportInfoFactory
-+     */
-+    private $exportInfoFactory;
-+
-+    /**
-+     * @param Context $context
-+     * @param FileFactory $fileFactory
-+     * @param \Magento\Framework\Session\SessionManagerInterface|null $sessionManager
-+     * @param PublisherInterface|null $publisher
-+     * @param ExportInfoFactory|null $exportInfoFactory
-      */
-     public function __construct(
-         Context $context,
-         FileFactory $fileFactory,
--        \Magento\Framework\Session\SessionManagerInterface $sessionManager = null
-+        \Magento\Framework\Session\SessionManagerInterface $sessionManager = null,
-+        PublisherInterface $publisher = null,
-+        ExportInfoFactory $exportInfoFactory = null
-     ) {
-         $this->fileFactory = $fileFactory;
-         $this->sessionManager = $sessionManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-             ->get(\Magento\Framework\Session\SessionManagerInterface::class);
-+        $this->messagePublisher = $publisher ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(PublisherInterface::class);
-+        $this->exportInfoFactory = $exportInfoFactory ?:
-+            \Magento\Framework\App\ObjectManager::getInstance()->get(
-+                ExportInfoFactory::class
-+            );
-         parent::__construct($context);
-     }
- 
-@@ -50,19 +74,19 @@ class Export extends ExportController
-     {
-         if ($this->getRequest()->getPost(ExportModel::FILTER_ELEMENT_GROUP)) {
-             try {
--                /** @var $model \Magento\ImportExport\Model\Export */
--                $model = $this->_objectManager->create(\Magento\ImportExport\Model\Export::class);
--                $model->setData($this->getRequest()->getParams());
-+                $params = $this->getRequest()->getParams();
-+
-+                /** @var ExportInfoFactory $dataObject */
-+                $dataObject = $this->exportInfoFactory->create(
-+                    $params['file_format'],
-+                    $params['entity'],
-+                    $params['export_filter']
-+                );
- 
--                $this->sessionManager->writeClose();
--                return $this->fileFactory->create(
--                    $model->getFileName(),
--                    $model->export(),
--                    DirectoryList::VAR_DIR,
--                    $model->getContentType()
-+                $this->messagePublisher->publish('import_export.export', $dataObject);
-+                $this->messageManager->addSuccessMessage(
-+                    __('Message is added to queue, wait to get your file soon')
-                 );
--            } catch (LocalizedException $e) {
--                $this->messageManager->addError($e->getMessage());
-             } catch (\Exception $e) {
-                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-                 $this->messageManager->addError(__('Please correct the data sent value.'));
-diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
-new file mode 100644
-index 00000000000..aade1abc3f5
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
-@@ -0,0 +1,79 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ImportExport\Controller\Adminhtml\Export\File;
-+
-+use Magento\Backend\App\Action;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\Controller\ResultFactory;
-+use Magento\Framework\Exception\FileSystemException;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
-+use Magento\Framework\Filesystem;
-+use Magento\Framework\Filesystem\DriverInterface;
-+
-+/**
-+ * Controller that delete file by name.
-+ */
-+class Delete extends ExportController implements HttpGetActionInterface
-+{
-+    /**
-+     * url to this controller
-+     */
-+    const URL = 'adminhtml/export_file/delete';
-+
-+    /**
-+     * @var Filesystem
-+     */
-+    private $filesystem;
-+
-+    /**
-+     * @var DriverInterface
-+     */
-+    private $file;
-+
-+    /**
-+     * Delete constructor.
-+     * @param Action\Context $context
-+     * @param Filesystem $filesystem
-+     * @param DriverInterface $file
-+     */
-+    public function __construct(
-+        Action\Context $context,
-+        Filesystem $filesystem,
-+        DriverInterface $file
-+    ) {
-+        $this->filesystem = $filesystem;
-+        $this->file = $file;
-+        parent::__construct($context);
-+    }
-+
-+    /**
-+     * Controller basic method implementation.
-+     *
-+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
-+     * @throws LocalizedException
-+     */
-+    public function execute()
-+    {
-+        try {
-+            if (empty($fileName = $this->getRequest()->getParam('filename'))) {
-+                throw new LocalizedException(__('Please provide export file name'));
-+            }
-+            $directory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_DIR);
-+            $path = $directory->getAbsolutePath() . 'export/' . $fileName;
-+            $this->file->deleteFile($path);
-+            /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-+            $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-+            $resultRedirect->setPath('adminhtml/export/index');
-+            return $resultRedirect;
-+        } catch (FileSystemException $exception) {
-+            throw new LocalizedException(__('There are no export file with such name %1', $fileName));
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Download.php
-new file mode 100644
-index 00000000000..aca7efef72b
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Download.php
-@@ -0,0 +1,80 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ImportExport\Controller\Adminhtml\Export\File;
-+
-+use Magento\Backend\App\Action;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Response\Http\FileFactory;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
-+use Magento\Framework\Filesystem;
-+
-+/**
-+ * Controller that download file by name.
-+ */
-+class Download extends ExportController implements HttpGetActionInterface
-+{
-+    /**
-+     * url to this controller
-+     */
-+    const URL = 'adminhtml/export_file/download/';
-+
-+    /**
-+     * @var FileFactory
-+     */
-+    private $fileFactory;
-+
-+    /**
-+     * @var Filesystem
-+     */
-+    private $filesystem;
-+
-+    /**
-+     * DownloadFile constructor.
-+     * @param Action\Context $context
-+     * @param FileFactory $fileFactory
-+     * @param Filesystem $filesystem
-+     */
-+    public function __construct(
-+        Action\Context $context,
-+        FileFactory $fileFactory,
-+        Filesystem $filesystem
-+    ) {
-+        $this->fileFactory = $fileFactory;
-+        $this->filesystem = $filesystem;
-+        parent::__construct($context);
-+    }
-+
-+    /**
-+     * Controller basic method implementation.
-+     *
-+     * @return \Magento\Framework\App\ResponseInterface
-+     * @throws LocalizedException
-+     */
-+    public function execute()
-+    {
-+        if (empty($fileName = $this->getRequest()->getParam('filename'))) {
-+            throw new LocalizedException(__('Please provide export file name'));
-+        }
-+        try {
-+            $path = 'export/' . $fileName;
-+            $directory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_DIR);
-+            if ($directory->isFile($path)) {
-+                return $this->fileFactory->create(
-+                    $path,
-+                    $directory->readFile($path),
-+                    DirectoryList::VAR_DIR
-+                );
-+            }
-+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
-+        } catch (LocalizedException | \Exception $exception) {
-+            throw new LocalizedException(__('There are no export file with such name %1', $fileName));
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
-index 05475b51619..722d32c9eb2 100644
---- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
-+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
-@@ -5,10 +5,12 @@
-  */
- namespace Magento\ImportExport\Controller\Adminhtml\Export;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class GetFilter extends ExportController
-+class GetFilter extends ExportController implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * Get grid-filter of entity attributes action.
-diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php
-index d2ca99f1a79..3dd5bfd550a 100644
---- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php
-+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\ImportExport\Controller\Adminhtml\Export;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Index extends ExportController
-+class Index extends ExportController implements HttpGetActionInterface
- {
-     /**
-      * Index action.
-diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php
-index e490ee40183..ba37cc8aacf 100644
---- a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php
-+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php
-@@ -1,20 +1,28 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\ImportExport\Controller\Adminhtml\History;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- 
--class Download extends \Magento\ImportExport\Controller\Adminhtml\History
-+/**
-+ * Download history controller
-+ */
-+class Download extends \Magento\ImportExport\Controller\Adminhtml\History implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\Controller\Result\RawFactory
-      */
-     protected $resultRawFactory;
- 
-+    /**
-+     * @var \Magento\Framework\App\Response\Http\FileFactory
-+     */
-+    private $fileFactory;
-+
-     /**
-      * @param \Magento\Backend\App\Action\Context $context
-      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php
-index df32d61cceb..3cca7ae7ccc 100644
---- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php
-+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\ImportExport\Controller\Adminhtml\Import;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\ImportExport\Controller\Adminhtml\Import as ImportController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Index extends ImportController
-+class Index extends ImportController implements HttpGetActionInterface
- {
-     /**
-      * Index action
-diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
-index 695a0e61709..e850f6af86c 100644
---- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
-+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
-@@ -5,10 +5,15 @@
-  */
- namespace Magento\ImportExport\Controller\Adminhtml\Import;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\ImportExport\Controller\Adminhtml\ImportResult as ImportResultController;
- use Magento\Framework\Controller\ResultFactory;
-+use Magento\ImportExport\Model\Import;
- 
--class Start extends ImportResultController
-+/**
-+ * Controller responsible for initiating the import process
-+ */
-+class Start extends ImportResultController implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\ImportExport\Model\Import
-@@ -62,6 +67,11 @@ class Start extends ImportResultController
- 
-             $this->importModel->setData($data);
-             $errorAggregator = $this->importModel->getErrorAggregator();
-+            $errorAggregator->initValidationStrategy(
-+                $this->importModel->getData(Import::FIELD_NAME_VALIDATION_STRATEGY),
-+                $this->importModel->getData(Import::FIELD_NAME_ALLOWED_ERROR_COUNT)
-+            );
-+
-             try {
-                 $this->importModel->importSource();
-             } catch (\Exception $e) {
-@@ -83,6 +93,20 @@ class Start extends ImportResultController
-                 $this->addErrorMessages($resultBlock, $errorAggregator);
-             } else {
-                 $this->importModel->invalidateIndex();
-+
-+                $noticeHtml = $this->historyModel->getSummary();
-+
-+                if ($this->historyModel->getErrorFile()) {
-+                    $noticeHtml .=  '<div class="import-error-wrapper">' . __('Only the first 100 errors are shown. ')
-+                                    . '<a href="'
-+                                    . $this->createDownloadUrlImportHistoryFile($this->historyModel->getErrorFile())
-+                                    . '">' . __('Download full report') . '</a></div>';
-+                }
-+
-+                $resultBlock->addNotice(
-+                    $noticeHtml
-+                );
-+
-                 $this->addErrorMessages($resultBlock, $errorAggregator);
-                 $resultBlock->addSuccess(__('Import successfully done'));
-             }
-diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
-index df9f63e79b7..c18e6662608 100644
---- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
-+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
-@@ -5,15 +5,19 @@
-  */
- namespace Magento\ImportExport\Controller\Adminhtml\Import;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\ImportExport\Controller\Adminhtml\ImportResult as ImportResultController;
- use Magento\ImportExport\Model\Import;
- use Magento\ImportExport\Block\Adminhtml\Import\Frame\Result;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\ImportExport\Model\Import\Adapter as ImportAdapter;
--use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
- 
--class Validate extends ImportResultController
-+/**
-+ * Import validate controller action.
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class Validate extends ImportResultController implements HttpPostActionInterface
- {
-     /**
-      * @var Import
-@@ -24,6 +28,7 @@ class Validate extends ImportResultController
-      * Validate uploaded files action
-      *
-      * @return \Magento\Framework\Controller\ResultInterface
-+     * @SuppressWarnings(PHPMD.Superglobals)
-      */
-     public function execute()
-     {
-@@ -42,12 +47,7 @@ class Validate extends ImportResultController
-             /** @var $import \Magento\ImportExport\Model\Import */
-             $import = $this->getImport()->setData($data);
-             try {
--                $source = ImportAdapter::findAdapterFor(
--                    $import->uploadSource(),
--                    $this->_objectManager->create(\Magento\Framework\Filesystem::class)
--                        ->getDirectoryWrite(DirectoryList::ROOT),
--                    $data[$import::FIELD_FIELD_SEPARATOR]
--                );
-+                $source = $import->uploadFileAndGetSource();
-                 $this->processValidationResult($import->validateSource($source), $resultBlock);
-             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                 $resultBlock->addError($e->getMessage());
-@@ -72,6 +72,7 @@ class Validate extends ImportResultController
-      * @param bool $validationResult
-      * @param Result $resultBlock
-      * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     private function processValidationResult($validationResult, $resultBlock)
-     {
-@@ -85,7 +86,7 @@ class Validate extends ImportResultController
-                 $resultBlock->addError(
-                     __('Data validation failed. Please fix the following errors and upload the file again.')
-                 );
--                $this->addErrorMessages($resultBlock, $errorAggregator);
-+
-                 if ($errorAggregator->getErrorsCount()) {
-                     $this->addMessageToSkipErrors($resultBlock);
-                 }
-@@ -99,6 +100,8 @@ class Validate extends ImportResultController
-                     $errorAggregator->getErrorsCount()
-                 )
-             );
-+            
-+            $this->addErrorMessages($resultBlock, $errorAggregator);
-         } else {
-             if ($errorAggregator->getErrorsCount()) {
-                 $this->collectErrors($resultBlock);
-@@ -109,6 +112,8 @@ class Validate extends ImportResultController
-     }
- 
-     /**
-+     * Provides import model.
-+     *
-      * @return Import
-      * @deprecated 100.1.0
-      */
-@@ -128,6 +133,7 @@ class Validate extends ImportResultController
-      *
-      * @param Result $resultBlock
-      * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     private function addMessageToSkipErrors(Result $resultBlock)
-     {
-@@ -148,6 +154,7 @@ class Validate extends ImportResultController
-      *
-      * @param Result $resultBlock
-      * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     private function addMessageForValidResult(Result $resultBlock)
-     {
-@@ -161,11 +168,12 @@ class Validate extends ImportResultController
-     /**
-      * Collect errors and add error messages to Result block
-      *
--     * Get all errors from ProcessingErrorAggregatorInterface and add appropriated error messages
-+     * Get all errors from Error Aggregator and add appropriated error messages
-      * to Result block.
-      *
-      * @param Result $resultBlock
-      * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     private function collectErrors(Result $resultBlock)
-     {
-diff --git a/app/code/Magento/ImportExport/Helper/Report.php b/app/code/Magento/ImportExport/Helper/Report.php
-index 0c54a95a988..012aeefd8bf 100644
---- a/app/code/Magento/ImportExport/Helper/Report.php
-+++ b/app/code/Magento/ImportExport/Helper/Report.php
-@@ -52,9 +52,9 @@ class Report extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     public function getExecutionTime($time)
-     {
--        $reportTime = $this->timeZone->date($time, $this->timeZone->getConfigTimezone());
-+        $reportTime = $this->timeZone->date($time);
-         $timeDiff = $reportTime->diff($this->timeZone->date());
--        return $timeDiff->format('%H:%M:%S');
-+        return $timeDiff->format('%H:%I:%S');
-     }
- 
-     /**
-@@ -97,6 +97,8 @@ class Report extends \Magento\Framework\App\Helper\AbstractHelper
-     }
- 
-     /**
-+     * Get report absolute path.
-+     *
-      * @param string $fileName
-      * @return string
-      */
-diff --git a/app/code/Magento/ImportExport/Model/Export.php b/app/code/Magento/ImportExport/Model/Export.php
-index 695df18fd10..850ded7c8f2 100644
---- a/app/code/Magento/ImportExport/Model/Export.php
-+++ b/app/code/Magento/ImportExport/Model/Export.php
-@@ -13,6 +13,7 @@ namespace Magento\ImportExport\Model;
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @since 100.0.2
-+ * @deprecated
-  */
- class Export extends \Magento\ImportExport\Model\AbstractModel
- {
-diff --git a/app/code/Magento/ImportExport/Model/Export/Config/Converter.php b/app/code/Magento/ImportExport/Model/Export/Config/Converter.php
-index 13b7e52c8d5..20ab81ec1cd 100644
---- a/app/code/Magento/ImportExport/Model/Export/Config/Converter.php
-+++ b/app/code/Magento/ImportExport/Model/Export/Config/Converter.php
-@@ -5,20 +5,23 @@
-  */
- namespace Magento\ImportExport\Model\Export\Config;
- 
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\Framework\App\Utility\Classes;
- 
-+/**
-+ * Converter.
-+ */
- class Converter implements \Magento\Framework\Config\ConverterInterface
- {
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-     /**
-      * @param Manager $moduleManager
-      */
--    public function __construct(Manager $moduleManager)
-+    public function __construct(ModuleManagerInterface $moduleManager)
-     {
-         $this->moduleManager = $moduleManager;
-     }
-diff --git a/app/code/Magento/ImportExport/Model/Export/Consumer.php b/app/code/Magento/ImportExport/Model/Export/Consumer.php
-new file mode 100644
-index 00000000000..27019780269
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Model/Export/Consumer.php
-@@ -0,0 +1,88 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ImportExport\Model\Export;
-+
-+use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\Framework\Exception\FileSystemException;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Filesystem;
-+use Magento\ImportExport\Api\ExportManagementInterface;
-+use Magento\ImportExport\Api\Data\ExportInfoInterface;
-+use Magento\Framework\Notification\NotifierInterface;
-+
-+/**
-+ * Consumer for export message.
-+ */
-+class Consumer
-+{
-+    /**
-+     * @var NotifierInterface
-+     */
-+    private $notifier;
-+
-+    /**
-+     * @var \Psr\Log\LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var ExportManagementInterface
-+     */
-+    private $exportManager;
-+
-+    /**
-+     * @var Filesystem
-+     */
-+    private $filesystem;
-+
-+    /**
-+     * Consumer constructor.
-+     * @param \Psr\Log\LoggerInterface $logger
-+     * @param ExportManagementInterface $exportManager
-+     * @param Filesystem $filesystem
-+     * @param NotifierInterface $notifier
-+     */
-+    public function __construct(
-+        \Psr\Log\LoggerInterface $logger,
-+        ExportManagementInterface $exportManager,
-+        Filesystem $filesystem,
-+        NotifierInterface $notifier
-+    ) {
-+        $this->logger = $logger;
-+        $this->exportManager = $exportManager;
-+        $this->filesystem = $filesystem;
-+        $this->notifier = $notifier;
-+    }
-+
-+    /**
-+     * Consumer logic.
-+     *
-+     * @param ExportInfoInterface $exportInfo
-+     * @return void
-+     */
-+    public function process(ExportInfoInterface $exportInfo)
-+    {
-+        try {
-+            $data = $this->exportManager->export($exportInfo);
-+            $fileName = $exportInfo->getFileName();
-+            $directory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
-+            $directory->writeFile('export/' . $fileName, $data);
-+
-+            $this->notifier->addMajor(
-+                __('Your export file is ready'),
-+                __('You can pick up your file at export main page')
-+            );
-+        } catch (LocalizedException | FileSystemException $exception) {
-+            $this->notifier->addCritical(
-+                __('Error during export process occurred'),
-+                __('Error during export process occurred. Please check logs for detail')
-+            );
-+            $this->logger->critical('Something went wrong while export process. ' . $exception->getMessage());
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/ExportInfo.php b/app/code/Magento/ImportExport/Model/Export/Entity/ExportInfo.php
-new file mode 100644
-index 00000000000..6dffc1827cf
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Model/Export/Entity/ExportInfo.php
-@@ -0,0 +1,121 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ImportExport\Model\Export\Entity;
-+
-+use \Magento\ImportExport\Api\Data\ExportInfoInterface;
-+
-+/**
-+ * Class ExportInfo implementation for ExportInfoInterface.
-+ */
-+class ExportInfo implements ExportInfoInterface
-+{
-+    /**
-+     * @var string
-+     */
-+    private $fileFormat;
-+
-+    /**
-+     * @var string
-+     */
-+    private $entity;
-+
-+    /**
-+     * @var string
-+     */
-+    private $fileName;
-+
-+    /**
-+     * @var string
-+     */
-+    private $contentType;
-+
-+    /**
-+     * @var mixed
-+     */
-+    private $exportFilter;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getFileFormat()
-+    {
-+        return $this->fileFormat;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setFileFormat($fileFormat)
-+    {
-+        $this->fileFormat = $fileFormat;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getFileName()
-+    {
-+        return $this->fileName;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setFileName($fileName)
-+    {
-+        $this->fileName = $fileName;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getContentType()
-+    {
-+        return $this->contentType;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setContentType($contentType)
-+    {
-+        $this->contentType = $contentType;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getEntity()
-+    {
-+        return $this->entity;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setEntity($entity)
-+    {
-+        $this->entity = $entity;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getExportFilter()
-+    {
-+        return $this->exportFilter;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setExportFilter($exportFilter)
-+    {
-+        $this->exportFilter = $exportFilter;
-+    }
-+}
-diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/ExportInfoFactory.php b/app/code/Magento/ImportExport/Model/Export/Entity/ExportInfoFactory.php
-new file mode 100644
-index 00000000000..e3cbd162aa5
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Model/Export/Entity/ExportInfoFactory.php
-@@ -0,0 +1,210 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ImportExport\Model\Export\Entity;
-+
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\ImportExport\Api\Data\ExportInfoInterface;
-+use Magento\Framework\ObjectManagerInterface;
-+use \Psr\Log\LoggerInterface;
-+use Magento\ImportExport\Model\Export\ConfigInterface;
-+use Magento\ImportExport\Model\Export\Entity\Factory as EntityFactory;
-+use Magento\ImportExport\Model\Export\Adapter\Factory as AdapterFactory;
-+use Magento\ImportExport\Model\Export\AbstractEntity;
-+
-+/**
-+ * Factory for Export Info
-+ */
-+class ExportInfoFactory
-+{
-+    /**
-+     * Object Manager
-+     *
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var \Magento\ImportExport\Model\Export\ConfigInterface
-+     */
-+    private $exportConfig;
-+
-+    /**
-+     * @var AdapterFactory
-+     */
-+    private $exportAdapterFac;
-+
-+    /**
-+     * @var EntityFactory
-+     */
-+    private $entityFactory;
-+
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * ExportInfoFactory constructor.
-+     * @param ObjectManagerInterface $objectManager
-+     * @param ConfigInterface $exportConfig
-+     * @param Factory $entityFactory
-+     * @param AdapterFactory $exportAdapterFac
-+     * @param SerializerInterface $serializer
-+     * @param LoggerInterface $logger
-+     */
-+    public function __construct(
-+        ObjectManagerInterface $objectManager,
-+        ConfigInterface $exportConfig,
-+        EntityFactory $entityFactory,
-+        AdapterFactory $exportAdapterFac,
-+        SerializerInterface $serializer,
-+        LoggerInterface $logger
-+    ) {
-+        $this->objectManager = $objectManager;
-+        $this->exportConfig = $exportConfig;
-+        $this->entityFactory = $entityFactory;
-+        $this->exportAdapterFac = $exportAdapterFac;
-+        $this->serializer = $serializer;
-+        $this->logger = $logger;
-+    }
-+
-+    /**
-+     * Create ExportInfo object.
-+     *
-+     * @param string $fileFormat
-+     * @param string $entity
-+     * @param string $exportFilter
-+     * @return ExportInfoInterface
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function create($fileFormat, $entity, $exportFilter)
-+    {
-+        $writer = $this->getWriter($fileFormat);
-+        $entityAdapter = $this->getEntityAdapter($entity, $fileFormat, $exportFilter, $writer->getContentType());
-+        $fileName = $this->generateFileName($entity, $entityAdapter, $writer->getFileExtension());
-+        /** @var ExportInfoInterface $exportInfo */
-+        $exportInfo = $this->objectManager->create(ExportInfoInterface::class);
-+        $exportInfo->setExportFilter($this->serializer->serialize($exportFilter));
-+        $exportInfo->setFileName($fileName);
-+        $exportInfo->setEntity($entity);
-+        $exportInfo->setFileFormat($fileFormat);
-+        $exportInfo->setContentType($writer->getContentType());
-+
-+        return $exportInfo;
-+    }
-+
-+    /**
-+     * Generate file name
-+     *
-+     * @param string $entity
-+     * @param AbstractEntity $entityAdapter
-+     * @param string $fileExtensions
-+     * @return string
-+     */
-+    private function generateFileName($entity, $entityAdapter, $fileExtensions)
-+    {
-+        $fileName = null;
-+        if ($entityAdapter instanceof AbstractEntity) {
-+            $fileName = $entityAdapter->getFileName();
-+        }
-+        if (!$fileName) {
-+            $fileName = $entity;
-+        }
-+
-+        return $fileName . '_' . date('Ymd_His') . '.' . $fileExtensions;
-+    }
-+
-+    /**
-+     * Create instance of entity adapter and return it.
-+     *
-+     * @param string $entity
-+     * @param string $fileFormat
-+     * @param string $exportFilter
-+     * @param string $contentType
-+     * @return \Magento\ImportExport\Model\Export\AbstractEntity|AbstractEntity
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function getEntityAdapter($entity, $fileFormat, $exportFilter, $contentType)
-+    {
-+        $entities = $this->exportConfig->getEntities();
-+        if (isset($entities[$entity])) {
-+            try {
-+                $entityAdapter = $this->entityFactory->create($entities[$entity]['model']);
-+            } catch (\Exception $e) {
-+                $this->logger->critical($e);
-+                throw new \Magento\Framework\Exception\LocalizedException(
-+                    __('Please enter a correct entity model.')
-+                );
-+            }
-+            if (!$entityAdapter instanceof \Magento\ImportExport\Model\Export\Entity\AbstractEntity &&
-+                !$entityAdapter instanceof \Magento\ImportExport\Model\Export\AbstractEntity
-+            ) {
-+                throw new \Magento\Framework\Exception\LocalizedException(
-+                    __(
-+                        'The entity adapter object must be an instance of %1 or %2.',
-+                        \Magento\ImportExport\Model\Export\Entity\AbstractEntity::class,
-+                        \Magento\ImportExport\Model\Export\AbstractEntity::class
-+                    )
-+                );
-+            }
-+            // check for entity codes integrity
-+            if ($entity != $entityAdapter->getEntityTypeCode()) {
-+                throw new \Magento\Framework\Exception\LocalizedException(
-+                    __('The input entity code is not equal to entity adapter code.')
-+                );
-+            }
-+        } else {
-+            throw new \Magento\Framework\Exception\LocalizedException(__('Please enter a correct entity.'));
-+        }
-+        $entityAdapter->setParameters([
-+            'fileFormat' => $fileFormat,
-+            'entity' => $entity,
-+            'exportFilter' => $exportFilter,
-+            'contentType' => $contentType,
-+        ]);
-+        return $entityAdapter;
-+    }
-+
-+    /**
-+     * Returns writer for a file format
-+     *
-+     * @param string $fileFormat
-+     * @return \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function getWriter($fileFormat)
-+    {
-+        $fileFormats = $this->exportConfig->getFileFormats();
-+        if (isset($fileFormats[$fileFormat])) {
-+            try {
-+                $writer = $this->exportAdapterFac->create($fileFormats[$fileFormat]['model']);
-+            } catch (\Exception $e) {
-+                $this->logger->critical($e);
-+                throw new \Magento\Framework\Exception\LocalizedException(
-+                    __('Please enter a correct entity model.')
-+                );
-+            }
-+            if (!$writer instanceof \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter) {
-+                throw new \Magento\Framework\Exception\LocalizedException(
-+                    __(
-+                        'The adapter object must be an instance of %1.',
-+                        \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter::class
-+                    )
-+                );
-+            }
-+        } else {
-+            throw new \Magento\Framework\Exception\LocalizedException(__('Please correct the file format.'));
-+        }
-+        return $writer;
-+    }
-+}
-diff --git a/app/code/Magento/ImportExport/Model/Export/ExportManagement.php b/app/code/Magento/ImportExport/Model/Export/ExportManagement.php
-new file mode 100644
-index 00000000000..b4adcdd62b6
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Model/Export/ExportManagement.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ImportExport\Model\Export;
-+
-+use Magento\Framework\EntityManager\HydratorInterface;
-+use Magento\ImportExport\Api\Data\ExportInfoInterface;
-+use Magento\ImportExport\Api\ExportManagementInterface;
-+use Magento\ImportExport\Model\ExportFactory;
-+use Magento\Framework\Serialize\SerializerInterface;
-+
-+/**
-+ * ExportManagementInterface implementation.
-+ */
-+class ExportManagement implements ExportManagementInterface
-+{
-+    /**
-+     * @var ExportFactory
-+     */
-+    private $exportModelFactory;
-+
-+    /**
-+     * @var HydratorInterface
-+     */
-+    private $hydrator;
-+
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $serializer;
-+
-+    /**
-+     * ExportManagement constructor.
-+     * @param ExportFactory $exportModelFactory
-+     * @param HydratorInterface $hydrator
-+     * @param SerializerInterface $serializer
-+     */
-+    public function __construct(
-+        ExportFactory $exportModelFactory,
-+        HydratorInterface $hydrator,
-+        SerializerInterface $serializer
-+    ) {
-+        $this->exportModelFactory = $exportModelFactory;
-+        $this->hydrator = $hydrator;
-+        $this->serializer = $serializer;
-+    }
-+
-+    /**
-+     * Export logic implementation.
-+     *
-+     * @param ExportInfoInterface $exportInfo
-+     * @return mixed|string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function export(ExportInfoInterface $exportInfo)
-+    {
-+        $arrData = $this->hydrator->extract($exportInfo);
-+        $arrData['export_filter'] = $this->serializer->unserialize($arrData['export_filter']);
-+        /** @var \Magento\ImportExport\Model\Export $exportModel */
-+        $exportModel = $this->exportModelFactory->create();
-+        $exportModel->setData($arrData);
-+        return $exportModel->export();
-+    }
-+}
-diff --git a/app/code/Magento/ImportExport/Model/History.php b/app/code/Magento/ImportExport/Model/History.php
-index 3138f150d5f..b85bf7da81a 100644
---- a/app/code/Magento/ImportExport/Model/History.php
-+++ b/app/code/Magento/ImportExport/Model/History.php
-@@ -42,6 +42,11 @@ class History extends \Magento\Framework\Model\AbstractModel
-      */
-     protected $reportHelper;
- 
-+    /**
-+     * @var \Magento\Backend\Model\Auth\Session
-+     */
-+    protected $session;
-+
-     /**
-      * Class constructor
-      *
-@@ -293,6 +298,8 @@ class History extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Load the last inserted item
-+     *
-      * @return $this
-      */
-     public function loadLastInsertItem()
-diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
-index b5e8220e0e9..2a4d6904b11 100644
---- a/app/code/Magento/ImportExport/Model/Import.php
-+++ b/app/code/Magento/ImportExport/Model/Import.php
-@@ -7,9 +7,12 @@
- namespace Magento\ImportExport\Model;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\HTTP\Adapter\FileTransferFactory;
-+use Magento\Framework\Stdlib\DateTime\DateTime;
- use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
- use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
-+use Magento\Framework\Message\ManagerInterface;
- 
- /**
-  * Import model
-@@ -19,6 +22,7 @@ use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorI
-  * @method string getBehavior() getBehavior()
-  * @method \Magento\ImportExport\Model\Import setEntity() setEntity(string $value)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  * @since 100.0.2
-  */
- class Import extends \Magento\ImportExport\Model\AbstractModel
-@@ -122,6 +126,11 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      */
-     protected $_importExportData = null;
- 
-+    /**
-+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-+     */
-+    private $_coreConfig;
-+
-     /**
-      * @var \Magento\ImportExport\Model\Import\ConfigInterface
-      */
-@@ -167,6 +176,21 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      */
-     protected $_filesystem;
- 
-+    /**
-+     * @var History
-+     */
-+    private $importHistoryModel;
-+
-+    /**
-+     * @var DateTime
-+     */
-+    private $localeDate;
-+
-+    /**
-+     * @var ManagerInterface
-+     */
-+    private $messageManager;
-+
-     /**
-      * @param \Psr\Log\LoggerInterface $logger
-      * @param \Magento\Framework\Filesystem $filesystem
-@@ -181,8 +205,9 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      * @param Source\Import\Behavior\Factory $behaviorFactory
-      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
-      * @param History $importHistoryModel
--     * @param \Magento\Framework\Stdlib\DateTime\DateTime
-+     * @param DateTime $localeDate
-      * @param array $data
-+     * @param ManagerInterface|null $messageManager
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -199,8 +224,9 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-         \Magento\ImportExport\Model\Source\Import\Behavior\Factory $behaviorFactory,
-         \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
-         \Magento\ImportExport\Model\History $importHistoryModel,
--        \Magento\Framework\Stdlib\DateTime\DateTime $localeDate,
--        array $data = []
-+        DateTime $localeDate,
-+        array $data = [],
-+        ManagerInterface $messageManager = null
-     ) {
-         $this->_importExportData = $importExportData;
-         $this->_coreConfig = $coreConfig;
-@@ -215,6 +241,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-         $this->_filesystem = $filesystem;
-         $this->importHistoryModel = $importHistoryModel;
-         $this->localeDate = $localeDate;
-+        $this->messageManager = $messageManager ?: ObjectManager::getInstance()->get(ManagerInterface::class);
-         parent::__construct($logger, $filesystem, $data);
-     }
- 
-@@ -268,6 +295,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      *
-      * @param string $sourceFile Full path to source file
-      * @return \Magento\ImportExport\Model\Import\AbstractSource
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      */
-     protected function _getSourceAdapter($sourceFile)
-     {
-@@ -283,12 +311,13 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      *
-      * @param ProcessingErrorAggregatorInterface $validationResult
-      * @return string[]
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getOperationResultMessages(ProcessingErrorAggregatorInterface $validationResult)
-     {
-         $messages = [];
-         if ($this->getProcessedRowsCount()) {
--            if ($validationResult->getErrorsCount()) {
-+            if ($validationResult->isErrorLimitExceeded()) {
-                 $messages[] = __('Data validation failed. Please fix the following errors and upload the file again.');
- 
-                 // errors info
-@@ -379,6 +408,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      * Returns number of checked entities.
-      *
-      * @return int
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getProcessedEntitiesCount()
-     {
-@@ -389,6 +419,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      * Returns number of checked rows.
-      *
-      * @return int
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getProcessedRowsCount()
-     {
-@@ -443,6 +474,8 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-     }
- 
-     /**
-+     * Process import.
-+     *
-      * @return bool
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
-@@ -455,6 +488,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      * Import possibility getter.
-      *
-      * @return bool
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function isImportAllowed()
-     {
-@@ -462,6 +496,8 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-     }
- 
-     /**
-+     * Get error aggregator instance.
-+     *
-      * @return ProcessingErrorAggregatorInterface
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
-@@ -471,7 +507,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-     }
- 
-     /**
--     * Move uploaded file and create source adapter instance.
-+     * Move uploaded file.
-      *
-      * @throws \Magento\Framework\Exception\LocalizedException
-      * @return string Source file path
-@@ -523,14 +559,27 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-         }
-         $this->_removeBom($sourceFile);
-         $this->createHistoryReport($sourceFileRelative, $entity, $extension, $result);
--        // trying to create source adapter for file and catch possible exception to be convinced in its adequacy
-+        return $sourceFile;
-+    }
-+
-+    /**
-+     * Move uploaded file and provide source instance.
-+     *
-+     * @return Import\AbstractSource
-+     * @throws \Magento\Framework\Exception\FileSystemException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function uploadFileAndGetSource()
-+    {
-+        $sourceFile = $this->uploadSource();
-         try {
--            $this->_getSourceAdapter($sourceFile);
-+            $source = $this->_getSourceAdapter($sourceFile);
-         } catch (\Exception $e) {
--            $this->_varDirectory->delete($sourceFileRelative);
-+            $this->_varDirectory->delete($this->_varDirectory->getRelativePath($sourceFile));
-             throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()));
-         }
--        return $sourceFile;
-+
-+        return $source;
-     }
- 
-     /**
-@@ -538,6 +587,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      *
-      * @param string $sourceFile
-      * @return $this
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      */
-     protected function _removeBom($sourceFile)
-     {
-@@ -557,6 +607,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      *
-      * @param \Magento\ImportExport\Model\Import\AbstractSource $source
-      * @return bool
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource $source)
-     {
-@@ -584,7 +635,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-         $messages = $this->getOperationResultMessages($errorAggregator);
-         $this->addLogComment($messages);
- 
--        $result = !$errorAggregator->getErrorsCount();
-+        $result = !$errorAggregator->isErrorLimitExceeded();
-         if ($result) {
-             $this->addLogComment(__('Import data validation is complete.'));
-         }
-@@ -595,6 +646,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      * Invalidate indexes by process codes.
-      *
-      * @return $this
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function invalidateIndex()
-     {
-@@ -661,6 +713,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      * )
-      *
-      * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getUniqueEntityBehaviors()
-     {
-@@ -710,9 +763,9 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-     /**
-      * Create history report
-      *
-+     * @param string $sourceFileRelative
-      * @param string $entity
-      * @param string $extension
--     * @param string $sourceFileRelative
-      * @param array $result
-      * @return $this
-      * @throws \Magento\Framework\Exception\LocalizedException
-@@ -751,6 +804,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      * Get count of created items
-      *
-      * @return int
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getCreatedItemsCount()
-     {
-@@ -761,6 +815,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      * Get count of updated items
-      *
-      * @return int
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getUpdatedItemsCount()
-     {
-@@ -771,6 +826,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
-      * Get count of deleted items
-      *
-      * @return int
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getDeletedItemsCount()
-     {
-diff --git a/app/code/Magento/ImportExport/Model/Import/Config/Converter.php b/app/code/Magento/ImportExport/Model/Import/Config/Converter.php
-index 8169b8fe63b..f2d1596ec3d 100644
---- a/app/code/Magento/ImportExport/Model/Import/Config/Converter.php
-+++ b/app/code/Magento/ImportExport/Model/Import/Config/Converter.php
-@@ -5,20 +5,23 @@
-  */
- namespace Magento\ImportExport\Model\Import\Config;
- 
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\Framework\App\Utility\Classes;
- 
-+/**
-+ * Converter.
-+ */
- class Converter implements \Magento\Framework\Config\ConverterInterface
- {
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-     /**
--     * @param Manager $moduleManager
-+     * @param ModuleManagerInterface $moduleManager
-      */
--    public function __construct(Manager $moduleManager)
-+    public function __construct(ModuleManagerInterface $moduleManager)
-     {
-         $this->moduleManager = $moduleManager;
-     }
-diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
-index e965e8ad207..10b29a50a40 100644
---- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
-+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
-@@ -408,7 +408,9 @@ abstract class AbstractEntity
-             if ($source->valid()) {
-                 try {
-                     $rowData = $source->current();
--                    $skuSet[$rowData['sku']] = true;
-+                    if (array_key_exists('sku', $rowData)) {
-+                        $skuSet[$rowData['sku']] = true;
-+                    }
-                 } catch (\InvalidArgumentException $e) {
-                     $this->addRowError($e->getMessage(), $this->_processedRowsCount);
-                     $this->_processedRowsCount++;
-@@ -436,7 +438,7 @@ abstract class AbstractEntity
-                 $source->next();
-             }
-         }
--        $this->_processedEntitiesCount = count($skuSet);
-+        $this->_processedEntitiesCount = (count($skuSet)) ? : $this->_processedRowsCount;
- 
-         return $this;
-     }
-@@ -554,7 +556,9 @@ abstract class AbstractEntity
-             $this->_parameters['behavior']
-         ) ||
-             $this->_parameters['behavior'] != ImportExport::BEHAVIOR_APPEND &&
-+            $this->_parameters['behavior'] != ImportExport::BEHAVIOR_ADD_UPDATE &&
-             $this->_parameters['behavior'] != ImportExport::BEHAVIOR_REPLACE &&
-+            $this->_parameters['behavior'] != ImportExport::BEHAVIOR_CUSTOM &&
-             $this->_parameters['behavior'] != ImportExport::BEHAVIOR_DELETE
-         ) {
-             return ImportExport::getDefaultBehavior();
-@@ -828,6 +832,8 @@ abstract class AbstractEntity
-     }
- 
-     /**
-+     * Get error aggregator object
-+     *
-      * @return ProcessingErrorAggregatorInterface
-      */
-     public function getErrorAggregator()
-diff --git a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
-index 7f49e2022c4..028bf2c464d 100644
---- a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
-+++ b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
-@@ -61,6 +61,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Add error via code and level
-+     *
-      * @param string $errorCode
-      * @param string $errorLevel
-      * @param int|null $rowNumber
-@@ -96,6 +98,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Add row to be skipped during import
-+     *
-      * @param int $rowNumber
-      * @return $this
-      */
-@@ -110,6 +114,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Add specific row to invalid list via row number
-+     *
-      * @param int $rowNumber
-      * @return $this
-      */
-@@ -126,6 +132,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Add error message template
-+     *
-      * @param string $code
-      * @param string $template
-      * @return $this
-@@ -138,6 +146,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Check if row is invalid by row number
-+     *
-      * @param int $rowNumber
-      * @return bool
-      */
-@@ -147,6 +157,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Get number of invalid rows
-+     *
-      * @return int
-      */
-     public function getInvalidRowsCount()
-@@ -155,6 +167,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Initialize validation strategy
-+     *
-      * @param string $validationStrategy
-      * @param int $allowedErrorCount
-      * @return $this
-@@ -178,6 +192,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Check if import has to be terminated
-+     *
-      * @return bool
-      */
-     public function hasToBeTerminated()
-@@ -186,15 +202,17 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Check if error limit has been exceeded
-+     *
-      * @return bool
-      */
-     public function isErrorLimitExceeded()
-     {
-         $isExceeded = false;
--        $errorsCount = $this->getErrorsCount([ProcessingError::ERROR_LEVEL_NOT_CRITICAL]);
-+        $errorsCount = $this->getErrorsCount();
-         if ($errorsCount > 0
-             && $this->validationStrategy == self::VALIDATION_STRATEGY_STOP_ON_ERROR
--            && $errorsCount >= $this->allowedErrorsCount
-+            && $errorsCount > $this->allowedErrorsCount
-         ) {
-             $isExceeded = true;
-         }
-@@ -203,6 +221,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Check if import has a fatal error
-+     *
-      * @return bool
-      */
-     public function hasFatalExceptions()
-@@ -211,6 +231,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Get all errors from an import process
-+     *
-      * @return ProcessingError[]
-      */
-     public function getAllErrors()
-@@ -228,6 +250,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Get a specific set of errors via codes
-+     *
-      * @param string[] $codes
-      * @return ProcessingError[]
-      */
-@@ -244,6 +268,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Get an error via row number
-+     *
-      * @param int $rowNumber
-      * @return ProcessingError[]
-      */
-@@ -258,6 +284,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Get a set rows via a set of error codes
-+     *
-      * @param array $errorCode
-      * @param array $excludedCodes
-      * @param bool $replaceCodeWithMessage
-@@ -292,6 +320,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Get the max allowed error count
-+     *
-      * @return int
-      */
-     public function getAllowedErrorsCount()
-@@ -300,6 +330,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Get current error count
-+     *
-      * @param string[] $errorLevels
-      * @return int
-      */
-@@ -318,6 +350,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Clear the error aggregator
-+     *
-      * @return $this
-      */
-     public function clear()
-@@ -331,6 +365,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Check if an error has already been added to the aggregator
-+     *
-      * @param int $rowNum
-      * @param string $errorCode
-      * @param string $columnName
-@@ -348,6 +384,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Build an error message via code, message and column name
-+     *
-      * @param string $errorCode
-      * @param string $errorMessage
-      * @param string $columnName
-@@ -369,6 +407,8 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
-     }
- 
-     /**
-+     * Process the error statistics for a given error level
-+     *
-      * @param string $errorLevel
-      * @return $this
-      */
-diff --git a/app/code/Magento/ImportExport/Model/Import/Source/Zip.php b/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
-index b7fafc43ca4..6fa87ab5d5c 100644
---- a/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
-+++ b/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\ImportExport\Model\Import\Source;
- 
-+use Magento\Framework\Exception\ValidatorException;
-+
- /**
-  * Zip import adapter.
-  */
-@@ -14,6 +16,8 @@ class Zip extends Csv
-      * @param string $file
-      * @param \Magento\Framework\Filesystem\Directory\Write $directory
-      * @param string $options
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\ValidatorException
-      */
-     public function __construct(
-         $file,
-@@ -21,10 +25,14 @@ class Zip extends Csv
-         $options
-     ) {
-         $zip = new \Magento\Framework\Archive\Zip();
--        $file = $zip->unpack(
--            $directory->getRelativePath($file),
--            $directory->getRelativePath(preg_replace('/\.zip$/i', '.csv', $file))
-+        $csvFile = $zip->unpack(
-+            $file,
-+            preg_replace('/\.zip$/i', '.csv', $file)
-         );
--        parent::__construct($file, $directory, $options);
-+        if (!$csvFile) {
-+            throw new ValidatorException(__('Sorry, but the data is invalid or the file is not uploaded.'));
-+        }
-+        $directory->delete($directory->getRelativePath($file));
-+        parent::__construct($csvFile, $directory, $options);
-     }
- }
-diff --git a/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php b/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php
-index f28aae9f8ae..e0002474e19 100644
---- a/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php
-+++ b/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\ImportExport\Model\Source\Import\Behavior;
- 
-+use Magento\ImportExport\Model\Import;
-+
- /**
-  * Import behavior source model used for defining the behaviour during the import.
-  *
-@@ -14,19 +16,19 @@ namespace Magento\ImportExport\Model\Source\Import\Behavior;
- class Basic extends \Magento\ImportExport\Model\Source\Import\AbstractBehavior
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function toArray()
-     {
-         return [
--            \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND => __('Add/Update'),
--            \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE => __('Replace'),
--            \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE => __('Delete')
-+            Import::BEHAVIOR_APPEND => __('Add/Update'),
-+            Import::BEHAVIOR_REPLACE => __('Replace'),
-+            Import::BEHAVIOR_DELETE => __('Delete')
-         ];
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCode()
-     {
-@@ -34,12 +36,23 @@ class Basic extends \Magento\ImportExport\Model\Source\Import\AbstractBehavior
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getNotes($entityCode)
-     {
-         $messages = ['catalog_product' => [
--            \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE => __("Note: Product IDs will be regenerated.")
-+            Import::BEHAVIOR_APPEND => __(
-+                "New product data is added to the existing product data for the existing entries in the database. "
-+                . "All fields except sku can be updated."
-+            ),
-+            Import::BEHAVIOR_REPLACE => __(
-+                "The existing product data is replaced with new data. <b>Exercise caution when replacing data "
-+                . "because the existing product data will be completely cleared and all references "
-+                . "in the system will be lost.</b>"
-+            ),
-+            Import::BEHAVIOR_DELETE => __(
-+                "Any entities in the import data that already exist in the database are deleted from the database."
-+            ),
-         ]];
-         return isset($messages[$entityCode]) ? $messages[$entityCode] : [];
-     }
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml
-new file mode 100644
-index 00000000000..a9100b4730b
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminImportProductsActionGroup">
-+        <arguments>
-+            <argument name="behavior" type="string"/>
-+            <argument name="importFile" type="string"/>
-+            <argument name="importMessage" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="goToImportIndexPage"/>
-+        <waitForPageLoad stepKey="AdminImportMainSectionLoad"/>
-+        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
-+        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
-+        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="{{behavior}}" stepKey="selectImportOption"/>
-+        <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="{{importFile}}" stepKey="attachFileForImport"/>
-+        <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
-+        <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
-+        <waitForPageLoad stepKey="AdminImportMainSectionLoad2"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
-+        <waitForPageLoad stepKey="AdminMessagesSection"/>
-+        <see selector="{{AdminMessagesSection.notice}}" userInput="{{importMessage}}" stepKey="seeImportMessage"/>
-+        </actionGroup>
-+    </actionGroups>
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/ImportExport/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..c09cd192d05
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuSystemDataTransferExport">
-+        <data key="pageTitle">Export</data>
-+        <data key="title">Export</data>
-+        <data key="dataUiId">magento-importexport-system-convert-export</data>
-+    </entity>
-+    <entity name="AdminMenuSystemDataTransferImport">
-+        <data key="pageTitle">Import</data>
-+        <data key="title">Import</data>
-+        <data key="dataUiId">magento-importexport-system-convert-import</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/Page/AdminExportIndexPage.xml b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminExportIndexPage.xml
-new file mode 100644
-index 00000000000..55ed3edd9bc
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminExportIndexPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminExportIndexPage" url="admin/export/" area="admin" module="Magento_ImportExport">
-+        <section name="AdminExportMainSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml
-new file mode 100644
-index 00000000000..87807eb9b0e
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminImportIndexPage" url="admin/import/" area="admin" module="Magento_ImportExport">
-+        <section name="AdminImportHeaderSection"/>
-+        <section name="AdminImportMainSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
-new file mode 100644
-index 00000000000..528ad23aaf2
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminExportAttributeSection">
-+        <element name="filterByAttributeCode" type="input" selector="#export_filter_grid_filter_attribute_code"/>
-+        <element name="resetFilter" type="button" selector="button[data-action='grid-filter-reset']" timeout="30"/>
-+        <element name="search" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
-+        <element name="chooseAttribute" type="checkbox" selector="//*[@name='export_filter[{{var}}]']/ancestor::tr//input[@type='checkbox']" parameterized="true"/>
-+        <element name="fillFilter" type="input" selector="//*[@name='export_filter[{{var}}]']/ancestor::tr//input[@type='text']" parameterized="true"/>
-+        <element name="continueBtn" type="button" selector="//*[@id='export_filter_container']/button" timeout="30"/>
-+        <element name="selectByIndex" type="button" selector="//tr[@data-repeat-index='{{var}}']//button" parameterized="true" timeout="30"/>
-+        <element name="download" type="button" selector="//tr[@data-repeat-index='{{var}}']//a[text()='Download']" parameterized="true" timeout="30"/>
-+        <element name="delete" type="button" selector="//tr[@data-repeat-index='{{var}}']//a[text()='Delete']" parameterized="true" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportMainSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportMainSection.xml
-new file mode 100644
-index 00000000000..da1d928607e
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportMainSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminExportMainSection">
-+        <element name="entityType" type="select" selector="#entity"/>
-+        <element name="entityAttributes" type="select" selector="#export_filter_form"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
-new file mode 100644
-index 00000000000..748580be094
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminImportHeaderSection">
-+        <element name="checkDataButton" type="button" selector="#upload_button" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
-new file mode 100644
-index 00000000000..2ce6b1e3577
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminImportMainSection">
-+        <element name="entityType" type="select" selector="#entity"/>
-+        <element name="importBehavior" type="select" selector="#basic_behavior"/>
-+        <element name="selectFileToImport" type="input" selector="#import_file"/>
-+        <element name="importButton" type="button" selector="#import_validation_container button" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckDoubleImportOfProductsTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckDoubleImportOfProductsTest.xml
-new file mode 100644
-index 00000000000..0f2dde99b90
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckDoubleImportOfProductsTest.xml
-@@ -0,0 +1,73 @@
-+<?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="AdminCheckDoubleImportOfProductsTest">
-+        <annotations>
-+            <description value="Checking double Import of products CSV file"/>
-+            <stories value="Import Products"/>
-+            <features value="Import/Export"/>
-+            <title value="Admin check double import of products test"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-6311"/>
-+            <group value="importExport"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create additional store views -->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createFirstStoreView">
-+                <argument name="customStore" value="secondStoreView"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
-+                <argument name="customStore" value="thirdStoreView"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <!-- Delete all imported products -->
-+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductIndexPage"/>
-+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
-+            <actionGroup ref="adminDataGridSelectPerPage" stepKey="selectNumberOfProductsPerPage">
-+                <argument name="perPage" value="100"/>
-+            </actionGroup>
-+            <actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteAllProducts"/>
-+
-+            <!-- Delete additional store views -->
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteFirstStoreView">
-+                <argument name="customStore" value="secondStoreView"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteSecondStoreView">
-+                <argument name="customStore" value="thirdStoreView"/>
-+            </actionGroup>
-+
-+            <!-- Delete category -->
-+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory">
-+                <argument name="categoryEntity" value="Gear"/>
-+            </actionGroup>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Import products with add/update behavior -->
-+        <actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProductsFirstTime">
-+            <argument name="behavior" value="Add/Update"/>
-+            <argument name="importFile" value="prepared-for-sample-data.csv"/>
-+            <argument name="importMessage" value="Created: 100, Updated: 3, Deleted: 0"/>
-+        </actionGroup>
-+
-+        <!-- Import products with add/update behavior again -->
-+        <actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProductsSecondTime">
-+            <argument name="behavior" value="Add/Update"/>
-+            <argument name="importFile" value="prepared-for-sample-data.csv"/>
-+            <argument name="importMessage" value="Created: 0, Updated: 300, Deleted: 0"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPageNavigateMenuTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPageNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..e8fb12ca521
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPageNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminExportPageNavigateMenuTest">
-+        <annotations>
-+            <features value="ImportExport"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin export page navigate menu test"/>
-+            <description value="Admin should be able to navigate to System > Export"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14157"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToExportPage">
-+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSystemDataTransferExport.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSystemDataTransferExport.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
-new file mode 100644
-index 00000000000..ceb4e93e4e9
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
-@@ -0,0 +1,123 @@
-+<?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="AdminImportProductsWithAddUpdateBehaviorTest">
-+        <annotations>
-+            <description value="Verify Magento native import products with add/update behavior."/>
-+            <stories value="Import Products"/>
-+            <features value="Import/Export"/>
-+            <title value="Verify Magento native import products with add/update behavior."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14077"/>
-+            <group value="importExport"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create Simple Product1 -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct1">
-+                <field key="name">SimpleProductForTest1</field>
-+                <field key="sku">SimpleProductForTest1</field>
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Login as Admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create Website -->
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateWebsite">
-+                <argument name="newWebsiteName" value="secondWebsite"/>
-+                <argument name="websiteCode" value="second_website"/>
-+            </actionGroup>
-+
-+            <!-- Create store group -->
-+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateStore">
-+                <argument name="website" value="secondWebsite"/>
-+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
-+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
-+            </actionGroup>
-+
-+            <!-- Create store view -->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateStoreView">
-+                <argument name="StoreGroup" value="customStoreGroup"/>
-+                <argument name="customStore" value="customStore"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <!-- Delete all products that replaced products in the before block post import -->
-+            <deleteData stepKey="deleteSimpleProduct1" url="/V1/products/SimpleProductForTest1"/>
-+            <deleteData stepKey="deleteSimpleProduct2" url="/V1/products/SimpleProductForTest2"/>
-+            <deleteData stepKey="deleteSimpleProduct3" url="/V1/products/SimpleProductForTest3"/>
-+
-+            <!-- Delete category created in the before block -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <!--Delete website created in the before block -->
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite" before="logoutFromAdmin">
-+                <argument name="websiteName" value="secondWebsite"/>
-+            </actionGroup>
-+
-+            <!-- Logout -->
-+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-+        </after>
-+
-+        <!-- Import products with add/update behavior -->
-+        <actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProducts">
-+            <argument name="behavior" value="Add/Update"/>
-+            <argument name="importFile" value="catalog_import_products.csv"/>
-+            <argument name="importMessage" value="Created: 2, Updated: 1, Deleted: 0"/>
-+        </actionGroup>
-+
-+        <!-- Assert Simple Product1 on grid-->
-+        <actionGroup ref="AssertProductOnAdminGridActionGroup" stepKey="assertSimpleProduct1OnAdminGrid">
-+            <argument name="product" value="SimpleProductAfterImport1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Simple Product1 on edit page-->
-+        <actionGroup ref="AssertProductInfoOnEditPageActionGroup" stepKey="assertSimpleProduct1OnEditPage">
-+            <argument name="product" value="SimpleProductAfterImport1"/>
-+        </actionGroup>
-+
-+        <!-- Assert Simple Product2 on grid-->
-+        <actionGroup ref="AssertProductOnAdminGridActionGroup" stepKey="assertSimpleProduct2OnAdminGrid">
-+            <argument name="product" value="SimpleProductAfterImport2"/>
-+        </actionGroup>
-+
-+        <!-- Assert Simple Product2 on edit page-->
-+        <actionGroup ref="AssertProductInfoOnEditPageActionGroup" stepKey="assertSimpleProduct2OnEditPage">
-+            <argument name="product" value="SimpleProductAfterImport2"/>
-+        </actionGroup>
-+
-+        <!-- Assert Simple Product3 on grid-->
-+        <actionGroup ref="AssertProductOnAdminGridActionGroup" stepKey="assertSimpleProduct3OnAdminGrid">
-+            <argument name="product" value="SimpleProductAfterImport3"/>
-+        </actionGroup>
-+
-+        <!-- Assert Simple Product3 on edit page-->
-+        <actionGroup ref="AssertProductInfoOnEditPageActionGroup" stepKey="assertSimpleProduct3OnEditPage">
-+            <argument name="product" value="SimpleProductAfterImport3"/>
-+        </actionGroup>
-+
-+        <!-- Assert SimpleProduct1 on store front-->
-+        <actionGroup ref="StoreFrontProductValidationActionGroup" stepKey="storeFrontSimpleProduct1Validation">
-+            <argument name="product" value="SimpleProductAfterImport1"/>
-+        </actionGroup>
-+        
-+        <!-- Assert SimpleProduct2 on store front-->
-+        <actionGroup ref="StoreFrontProductValidationActionGroup" stepKey="storeFrontSimpleProduct2Validation">
-+            <argument name="product" value="SimpleProductAfterImport2"/>
-+        </actionGroup>
-+
-+        <!-- Assert SimpleProduct3 on store front-->
-+        <actionGroup ref="StoreFrontProductValidationActionGroup" stepKey="storeFrontSimpleProduct3Validation">
-+            <argument name="product" value="SimpleProductAfterImport3"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml
-new file mode 100644
-index 00000000000..4cbb0603d90
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml
-@@ -0,0 +1,65 @@
-+<?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="AdminImportProductsWithDeleteBehaviorTest">
-+        <annotations>
-+            <description value="Verify Magento native import products with delete behavior."/>
-+            <stories value="Verify Magento native import products with delete behavior."/>
-+            <features value="Import/Export"/>
-+            <title value="Verify Magento native import products with delete behavior."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-30587"/>
-+            <group value="importExport"/>
-+        </annotations>
-+        <before>
-+            <!--Create Simple product-->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
-+                <field key="name">Simple Product for Test</field>
-+                <field key="sku">Simple Product for Test</field>
-+            </createData>
-+            <!--Create Virtual product-->
-+            <createData entity="VirtualProduct" stepKey="createVirtualProduct">
-+                <field key="name">Virtual Product for Test</field>
-+                <field key="sku">Virtual Product for Test</field>
-+            </createData>
-+            <!-- Create Downloadable product -->
-+            <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct">
-+                <field key="name">Api Downloadable Product for Test</field>
-+                <field key="sku">Api Downloadable Product for Test</field>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
-+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-+        </after>
-+        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="goToImportIndexPage"/>
-+        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
-+        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
-+        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Delete" stepKey="selectDeleteOption"/>
-+        <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="catalog_products.csv" stepKey="attachFileForImport"/>
-+        <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
-+        <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
-+        <see selector="{{AdminMessagesSection.notice}}" userInput="Created: 0, Updated: 0, Deleted: 3" stepKey="assertNotice"/>
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchSimpleProductOnBackend">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchVirtualProductOnBackend">
-+            <argument name="product" value="$$createVirtualProduct$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage1"/>
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchDownloadableProductOnBackend">
-+            <argument name="product" value="$$createDownloadableProduct$$"/>
-+        </actionGroup>
-+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
-new file mode 100644
-index 00000000000..d63a5546716
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
-@@ -0,0 +1,45 @@
-+<?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="AdminImportProductsWithReplaceBehaviorTest" extends="AdminImportProductsWithAddUpdateBehaviorTest">
-+        <annotations>
-+            <description value="Verify Magento native import products with replace behavior."/>
-+            <stories value="Import Products"/>
-+            <features value="Import/Export"/>
-+            <title value="Verify Magento native import products with replace behavior."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14076"/>
-+            <group value="importExport"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create Simple Product2 -->
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct2">
-+                <field key="name">SimpleProductForTest2</field>
-+                <field key="sku">SimpleProductForTest2</field>
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Create Simple Product3 -->
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct3">
-+                <field key="name">SimpleProductForTest3</field>
-+                <field key="sku">SimpleProductForTest3</field>
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+
-+        <!-- Import products with replace behavior -->
-+        <actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProducts">
-+            <argument name="behavior" value="Replace"/>
-+            <argument name="importFile" value="catalog_import_products.csv"/>
-+            <argument name="importMessage" value="Created: 3, Updated: 0, Deleted: 3"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminSystemImportNavigateMenuTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminSystemImportNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..9913933d857
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminSystemImportNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSystemImportNavigateMenuTest">
-+        <annotations>
-+            <features value="ImportExport"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin system import navigate menu test"/>
-+            <description value="Admin should be able to navigate to System > Import"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14156"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToImportPage">
-+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSystemDataTransferImport.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSystemDataTransferImport.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php b/app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php
-index 8e7f11984c5..679b726d8e5 100644
---- a/app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php
-+++ b/app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php
-@@ -89,12 +89,17 @@ class ReportTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testGetExecutionTime()
-     {
--        $time = '01:02:03';
--        $this->timezone->expects($this->any())->method('date')->willReturnSelf();
--        $this->timezone->expects($this->any())->method('getConfigTimezone')->willReturn('America/Los_Angeles');
--        $this->timezone->expects($this->any())->method('diff')->willReturnSelf();
--        $this->timezone->expects($this->any())->method('format')->willReturn($time);
--        $this->assertEquals($time, $this->report->getExecutionTime($time));
-+        $startDate = '2000-01-01 01:01:01';
-+        $endDate = '2000-01-01 02:03:04';
-+        $executionTime = '01:02:03';
-+
-+        $startDateMock = $this->createTestProxy(\DateTime::class, ['time' => $startDate]);
-+        $endDateMock = $this->createTestProxy(\DateTime::class, ['time' => $endDate]);
-+        $this->timezone->method('date')
-+            ->withConsecutive([$startDate], [])
-+            ->willReturnOnConsecutiveCalls($startDateMock, $endDateMock);
-+
-+        $this->assertEquals($executionTime, $this->report->getExecutionTime($startDate));
-     }
- 
-     /**
-@@ -159,6 +164,9 @@ class ReportTest extends \PHPUnit\Framework\TestCase
-         $this->report->importFileExists($fileName);
-     }
- 
-+    /**
-+     * Test importFileExists()
-+     */
-     public function testImportFileExists()
-     {
-         $this->assertEquals($this->report->importFileExists('..file..name'), true);
-diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/ConverterTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/ConverterTest.php
-index 2e102d3ae3f..c888c6b4473 100644
---- a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/ConverterTest.php
-+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/ConverterTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\ImportExport\Test\Unit\Model\Export\Config;
- 
-+/**
-+ * Converter test
-+ */
- class ConverterTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -18,7 +21,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
-     protected $filePath;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $moduleManager;
- 
-diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php
-index 288a9977097..179f3f3cada 100644
---- a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php
-+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php
-@@ -22,15 +22,15 @@ return [
-     'attributes_with_type_modelName_and_invalid_value' => [
-         '<?xml version="1.0"?><config><entity name="Name/one" model="model_one" '
-             . 'entityAttributeFilterType="model_one"/><entityType entity="Name/one" name="name_one" model="1"/>'
--            . ' <fileFormat name="name_one" model="model1"/></config>',
-+            . ' <fileFormat name="name_one" model="1model"/></config>',
-         [
-             "Element 'entityType', attribute 'model': [facet 'pattern'] The value '1' is not accepted by the " .
--            "pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
-+            "pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
-             "Element 'entityType', attribute 'model': '1' is not a valid value of the atomic type" .
-             " 'modelName'.\nLine: 1\n",
--            "Element 'fileFormat', attribute 'model': [facet 'pattern'] The value 'model1' is not " .
--            "accepted by the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
--            "Element 'fileFormat', attribute 'model': 'model1' is not a valid " .
-+            "Element 'fileFormat', attribute 'model': [facet 'pattern'] The value '1model' is not " .
-+            "accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
-+            "Element 'fileFormat', attribute 'model': '1model' is not a valid " .
-             "value of the atomic type 'modelName'.\nLine: 1\n"
-         ],
-     ],
-diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/ConverterTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/ConverterTest.php
-index 58f9a81474f..b29a04322ce 100644
---- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/ConverterTest.php
-+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/ConverterTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\ImportExport\Test\Unit\Model\Import\Config;
- 
-+/**
-+ * Converter test
-+ */
- class ConverterTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -18,7 +21,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
-     protected $filePath;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $moduleManager;
- 
-diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php
-index 357b35e8a31..409c1af9cb3 100644
---- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php
-+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php
-@@ -26,12 +26,12 @@ return [
-         ["Element 'entity', attribute 'notallowed': The attribute 'notallowed' is not allowed.\nLine: 1\n"],
-     ],
-     'entity_model_with_invalid_value' => [
--        '<?xml version="1.0"?><config><entity name="test_name" label="test_label" model="afwer34" ' .
-+        '<?xml version="1.0"?><config><entity name="test_name" label="test_label" model="34afwer" ' .
-         'behaviorModel="test" /></config>',
-         [
--            "Element 'entity', attribute 'model': [facet 'pattern'] The value 'afwer34' is not " .
--            "accepted by the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
--            "Element 'entity', attribute 'model': 'afwer34' is not a valid value of the atomic type" .
-+            "Element 'entity', attribute 'model': [facet 'pattern'] The value '34afwer' is not " .
-+            "accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
-+            "Element 'entity', attribute 'model': '34afwer' is not a valid value of the atomic type" .
-             " 'modelName'.\nLine: 1\n"
-         ],
-     ],
-@@ -40,7 +40,7 @@ return [
-         '</config>',
-         [
-             "Element 'entity', attribute 'behaviorModel': [facet 'pattern'] The value '666' is not accepted by " .
--            "the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
-+            "the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
-             "Element 'entity', attribute 'behaviorModel': '666' is not a valid value of the atomic type" .
-             " 'modelName'.\nLine: 1\n"
-         ],
-diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php
-index c913b53e8b5..c7b06a8731f 100644
---- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php
-+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php
-@@ -19,7 +19,7 @@ return [
-         '<?xml version="1.0"?><config><entity name="some_name" model="12345"/></config>',
-         [
-             "Element 'entity', attribute 'model': [facet 'pattern'] The value '12345' is not accepted by " .
--            "the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
-+            "the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
-             "Element 'entity', attribute 'model': '12345' is not a valid value of the atomic type" .
-             " 'modelName'.\nLine: 1\n"
-         ],
-@@ -28,7 +28,7 @@ return [
-         '<?xml version="1.0"?><config><entity name="some_name" behaviorModel="=--09"/></config>',
-         [
-             "Element 'entity', attribute 'behaviorModel': [facet 'pattern'] The value '=--09' is not " .
--            "accepted by the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
-+            "accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
-             "Element 'entity', attribute 'behaviorModel': '=--09' is not a valid value of the atomic type" .
-             " 'modelName'.\nLine: 1\n"
-         ],
-@@ -46,11 +46,11 @@ return [
-         ["Element 'entityType': The attribute 'model' is required but missing.\nLine: 1\n"],
-     ],
-     'entitytype_with_invalid_model_attribute_value' => [
--        '<?xml version="1.0"?><config><entityType entity="entity_name" name="some_name" model="test1"/></config>',
-+        '<?xml version="1.0"?><config><entityType entity="entity_name" name="some_name" model="1test"/></config>',
-         [
--            "Element 'entityType', attribute 'model': [facet 'pattern'] The value 'test1' is not " .
--            "accepted by the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
--            "Element 'entityType', attribute 'model': 'test1' is not a valid value of the atomic type" .
-+            "Element 'entityType', attribute 'model': [facet 'pattern'] The value '1test' is not " .
-+            "accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
-+            "Element 'entityType', attribute 'model': '1test' is not a valid value of the atomic type" .
-             " 'modelName'.\nLine: 1\n"
-         ],
-     ],
-diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php
-index a4c380d51eb..722cca4af6d 100644
---- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php
-+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php
-@@ -191,7 +191,7 @@ class ProcessingErrorAggregatorTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * Test for method initValidationStrategy. Expected exeption due null incoming parameter
-+     * Test for method initValidationStrategy. Expected exception due null incoming parameter
-      */
-     public function testInitValidationStrategyException()
-     {
-@@ -216,6 +216,7 @@ class ProcessingErrorAggregatorTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testIsErrorLimitExceededFalse()
-     {
-+        $this->model->initValidationStrategy('validation-stop-on-errors', 5);
-         $this->model->addError('systemException');
-         $this->model->addError('systemException', 'critical', 7, 'Some column name', 'Message', 'Description');
-         $this->model->addError('systemException', 'critical', 4, 'Some column name', 'Message', 'Description');
-@@ -316,7 +317,7 @@ class ProcessingErrorAggregatorTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * Test for method getErrorsByCode. Expects receive errors with code, which present in incomming parameter.
-+     * Test for method getErrorsByCode. Expects receive errors with code, which present in incoming parameter.
-      */
-     public function testGetErrorsByCodeInArray()
-     {
-@@ -328,7 +329,7 @@ class ProcessingErrorAggregatorTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * Test for method getErrorsByCode. Unexpects receive errors with code, which present in incomming parameter.
-+     * Test for method getErrorsByCode. Unexpects receive errors with code, which present in incoming parameter.
-      */
-     public function testGetErrorsByCodeNotInArray()
-     {
-diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php
-index d073f3866bf..73b4f10b3b0 100644
---- a/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php
-+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php
-@@ -32,7 +32,7 @@ class CustomTest extends \Magento\ImportExport\Test\Unit\Model\Source\Import\Abs
-     protected function setUp()
-     {
-         parent::setUp();
--        $this->_model = new \Magento\ImportExport\Model\Source\Import\Behavior\Custom([]);
-+        $this->_model = new \Magento\ImportExport\Model\Source\Import\Behavior\Custom();
-     }
- 
-     /**
-diff --git a/app/code/Magento/ImportExport/Ui/Component/Columns/ExportGridActions.php b/app/code/Magento/ImportExport/Ui/Component/Columns/ExportGridActions.php
-new file mode 100644
-index 00000000000..a7b9b072f00
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Ui/Component/Columns/ExportGridActions.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ImportExport\Ui\Component\Columns;
-+
-+use Magento\Framework\View\Element\UiComponent\ContextInterface;
-+use Magento\Framework\View\Element\UiComponentFactory;
-+use Magento\ImportExport\Controller\Adminhtml\Export\File\Download;
-+use Magento\ImportExport\Controller\Adminhtml\Export\File\Delete;
-+use Magento\Ui\Component\Listing\Columns\Column;
-+use Magento\Framework\UrlInterface;
-+
-+/**
-+ * Actions for export grid.
-+ */
-+class ExportGridActions extends Column
-+{
-+    /**
-+     * @var UrlInterface
-+     */
-+    private $urlBuilder;
-+
-+    /**
-+     * ExportGridActions constructor.
-+     * @param ContextInterface $context
-+     * @param UiComponentFactory $uiComponentFactory
-+     * @param UrlInterface $urlBuilder
-+     * @param array $components
-+     * @param array $data
-+     */
-+    public function __construct(
-+        ContextInterface $context,
-+        UiComponentFactory $uiComponentFactory,
-+        UrlInterface $urlBuilder,
-+        array $components = [],
-+        array $data = []
-+    ) {
-+        $this->urlBuilder = $urlBuilder;
-+        parent::__construct($context, $uiComponentFactory, $components, $data);
-+    }
-+
-+    /**
-+     * Prepare Data Source
-+     *
-+     * @param array $dataSource
-+     * @return array
-+     */
-+    public function prepareDataSource(array $dataSource)
-+    {
-+        if (isset($dataSource['data']['items'])) {
-+            foreach ($dataSource['data']['items'] as & $item) {
-+                $name = $this->getData('name');
-+                if (isset($item['file_name'])) {
-+                    $item[$name]['view'] = [
-+                        'href' => $this->urlBuilder->getUrl(Download::URL, ['filename' => $item['file_name']]),
-+                        'label' => __('Download')
-+                    ];
-+                    $item[$name]['delete'] = [
-+                        'href' => $this->urlBuilder->getUrl(Delete::URL, ['filename' => $item['file_name']]),
-+                        'label' => __('Delete'),
-+                        'confirm' => [
-+                            'title' => __('Delete'),
-+                            'message' => __('Are you sure you wan\'t to delete a file?')
-+                        ]
-+                    ];
-+                }
-+            }
-+        }
-+        return $dataSource;
-+    }
-+}
-diff --git a/app/code/Magento/ImportExport/Ui/DataProvider/ExportFileDataProvider.php b/app/code/Magento/ImportExport/Ui/DataProvider/ExportFileDataProvider.php
-new file mode 100644
-index 00000000000..e64a6df430e
---- /dev/null
-+++ b/app/code/Magento/ImportExport/Ui/DataProvider/ExportFileDataProvider.php
-@@ -0,0 +1,99 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ImportExport\Ui\DataProvider;
-+
-+use Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider;
-+use Magento\Framework\Filesystem\DriverInterface;
-+use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\Framework\Filesystem;
-+
-+/**
-+ * Data provider for export grid.
-+ */
-+class ExportFileDataProvider extends DataProvider
-+{
-+    /**
-+     * @var DriverInterface
-+     */
-+    private $file;
-+
-+    /**
-+     * @var Filesystem
-+     */
-+    private $fileSystem;
-+
-+    /**
-+     * @param string $name
-+     * @param string $primaryFieldName
-+     * @param string $requestFieldName
-+     * @param \Magento\Framework\Api\Search\ReportingInterface $reporting
-+     * @param \Magento\Framework\Api\Search\SearchCriteriaBuilder $searchCriteriaBuilder
-+     * @param \Magento\Framework\App\RequestInterface $request
-+     * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
-+     * @param DriverInterface $file
-+     * @param Filesystem $filesystem
-+     * @param array $meta
-+     * @param array $data
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     */
-+    public function __construct(
-+        string $name,
-+        string $primaryFieldName,
-+        string $requestFieldName,
-+        \Magento\Framework\Api\Search\ReportingInterface $reporting,
-+        \Magento\Framework\Api\Search\SearchCriteriaBuilder $searchCriteriaBuilder,
-+        \Magento\Framework\App\RequestInterface $request,
-+        \Magento\Framework\Api\FilterBuilder $filterBuilder,
-+        DriverInterface $file,
-+        Filesystem $filesystem,
-+        array $meta = [],
-+        array $data = []
-+    ) {
-+        $this->file = $file;
-+        $this->fileSystem = $filesystem;
-+        parent::__construct(
-+            $name,
-+            $primaryFieldName,
-+            $requestFieldName,
-+            $reporting,
-+            $searchCriteriaBuilder,
-+            $request,
-+            $filterBuilder,
-+            $meta,
-+            $data
-+        );
-+    }
-+
-+    /**
-+     * Returns data for grid.
-+     *
-+     * @return array
-+     * @throws \Magento\Framework\Exception\FileSystemException
-+     */
-+    public function getData()
-+    {
-+        $directory = $this->fileSystem->getDirectoryRead(DirectoryList::VAR_DIR);
-+        $emptyResponse = ['items' => [], 'totalRecords' => 0];
-+        if (!$this->file->isExists($directory->getAbsolutePath() . 'export/')) {
-+            return $emptyResponse;
-+        }
-+
-+        $files = $this->file->readDirectoryRecursively($directory->getAbsolutePath() . 'export/');
-+        if (empty($files)) {
-+            return $emptyResponse;
-+        }
-+        $result = [];
-+        foreach ($files as $file) {
-+            $result['items'][]['file_name'] = basename($file);
-+        }
-+
-+        $result['totalRecords'] = count($result['items']);
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json
-index b0ba04f5aa0..6363722eba7 100644
---- a/app/code/Magento/ImportExport/composer.json
-+++ b/app/code/Magento/ImportExport/composer.json
-@@ -12,7 +12,8 @@
-         "magento/module-catalog": "*",
-         "magento/module-eav": "*",
-         "magento/module-media-storage": "*",
--        "magento/module-store": "*"
-+        "magento/module-store": "*",
-+        "magento/module-ui": "*"
-     },
-     "type": "magento2-module",
-     "license": [
-diff --git a/app/code/Magento/ImportExport/etc/adminhtml/di.xml b/app/code/Magento/ImportExport/etc/adminhtml/di.xml
-index 03c24c7b2bf..04ee7263491 100644
---- a/app/code/Magento/ImportExport/etc/adminhtml/di.xml
-+++ b/app/code/Magento/ImportExport/etc/adminhtml/di.xml
-@@ -6,9 +6,24 @@
-  */
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
--    <type name="\Magento\ImportExport\Controller\Adminhtml\Import\Start">
-+    <type name="Magento\ImportExport\Controller\Adminhtml\Import\Start">
-         <arguments>
-             <argument name="exceptionMessageFactory" xsi:type="object">Magento\Framework\Message\ExceptionMessageLookupFactory</argument>
-         </arguments>
-     </type>
-+    <type name="Magento\ImportExport\Model\Export\Entity\ExportInfoFactory">
-+        <arguments>
-+            <argument name="serializer" xsi:type="object">Magento\Framework\Serialize\Serializer\Json</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\ImportExport\Controller\Adminhtml\Export\File\Delete">
-+        <arguments>
-+            <argument name="file" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\ImportExport\Ui\DataProvider\ExportFileDataProvider">
-+        <arguments>
-+            <argument name="file" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/ImportExport/etc/communication.xml b/app/code/Magento/ImportExport/etc/communication.xml
-new file mode 100644
-index 00000000000..7794b3e5ab2
---- /dev/null
-+++ b/app/code/Magento/ImportExport/etc/communication.xml
-@@ -0,0 +1,12 @@
-+<?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:Communication/etc/communication.xsd">
-+    <topic name="import_export.export" request="Magento\ImportExport\Api\Data\ExportInfoInterface">
-+        <handler name="exportProcessor" type="Magento\ImportExport\Model\Export\Consumer" method="process" />
-+    </topic>
-+</config>
-diff --git a/app/code/Magento/ImportExport/etc/db_schema.xml b/app/code/Magento/ImportExport/etc/db_schema.xml
-index 01f20daabf0..df451318485 100644
---- a/app/code/Magento/ImportExport/etc/db_schema.xml
-+++ b/app/code/Magento/ImportExport/etc/db_schema.xml
-@@ -12,7 +12,7 @@
-         <column xsi:type="varchar" name="entity" nullable="false" length="50" comment="Entity"/>
-         <column xsi:type="varchar" name="behavior" nullable="false" length="10" default="append" comment="Behavior"/>
-         <column xsi:type="longtext" name="data" nullable="true" comment="Data"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
-     </table>
-@@ -27,7 +27,7 @@
-         <column xsi:type="varchar" name="execution_time" nullable="true" length="255" comment="Execution time"/>
-         <column xsi:type="varchar" name="summary" nullable="true" length="255" comment="Summary"/>
-         <column xsi:type="varchar" name="error_file" nullable="false" length="255" comment="Imported file with errors"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="history_id"/>
-         </constraint>
-     </table>
-diff --git a/app/code/Magento/ImportExport/etc/di.xml b/app/code/Magento/ImportExport/etc/di.xml
-index 36c76022a41..909b526e479 100644
---- a/app/code/Magento/ImportExport/etc/di.xml
-+++ b/app/code/Magento/ImportExport/etc/di.xml
-@@ -10,6 +10,8 @@
-     <preference for="Magento\ImportExport\Model\Export\ConfigInterface" type="Magento\ImportExport\Model\Export\Config" />
-     <preference for="Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface" type="Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregator" />
-     <preference for="Magento\ImportExport\Model\Report\ReportProcessorInterface" type="Magento\ImportExport\Model\Report\Csv" />
-+    <preference for="Magento\ImportExport\Api\Data\ExportInfoInterface" type="Magento\ImportExport\Model\Export\Entity\ExportInfo" />
-+    <preference for="Magento\ImportExport\Api\ExportManagementInterface" type="Magento\ImportExport\Model\Export\ExportManagement" />
-     <type name="Magento\Framework\Module\Setup\Migration">
-         <arguments>
-             <argument name="compositeModules" xsi:type="array">
-diff --git a/app/code/Magento/ImportExport/etc/export.xsd b/app/code/Magento/ImportExport/etc/export.xsd
-index 65728a9be5c..f62dbc891ef 100644
---- a/app/code/Magento/ImportExport/etc/export.xsd
-+++ b/app/code/Magento/ImportExport/etc/export.xsd
-@@ -71,11 +71,11 @@
-     <xs:simpleType name="modelName">
-         <xs:annotation>
-             <xs:documentation>
--                Model name can contain only [A-Za-z_\\].
-+                Model name can contain only ([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+.
-             </xs:documentation>
-         </xs:annotation>
-         <xs:restriction base="xs:string">
--            <xs:pattern value="[A-Za-z_\\]+" />
-+            <xs:pattern value="([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+" />
-         </xs:restriction>
-     </xs:simpleType>
- </xs:schema>
-diff --git a/app/code/Magento/ImportExport/etc/import.xsd b/app/code/Magento/ImportExport/etc/import.xsd
-index aefa6541d7e..e73038ebc07 100644
---- a/app/code/Magento/ImportExport/etc/import.xsd
-+++ b/app/code/Magento/ImportExport/etc/import.xsd
-@@ -61,11 +61,11 @@
-     <xs:simpleType name="modelName">
-         <xs:annotation>
-             <xs:documentation>
--                Model name can contain only [A-Za-z_\\].
-+                Model name can contain only ([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+.
-             </xs:documentation>
-         </xs:annotation>
-         <xs:restriction base="xs:string">
--            <xs:pattern value="[A-Za-z_\\]+" />
-+            <xs:pattern value="([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+" />
-         </xs:restriction>
-     </xs:simpleType>
- </xs:schema>
-diff --git a/app/code/Magento/ImportExport/etc/queue.xml b/app/code/Magento/ImportExport/etc/queue.xml
-new file mode 100644
-index 00000000000..7eb96819faf
---- /dev/null
-+++ b/app/code/Magento/ImportExport/etc/queue.xml
-@@ -0,0 +1,12 @@
-+<?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-message-queue:etc/queue.xsd">
-+    <broker topic="import_export.export" exchange="magento-db" type="db">
-+        <queue name="export" consumer="exportProcessor" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\ImportExport\Model\Export\Consumer::process"/>
-+    </broker>
-+</config>
-diff --git a/app/code/Magento/ImportExport/etc/queue_consumer.xml b/app/code/Magento/ImportExport/etc/queue_consumer.xml
-new file mode 100644
-index 00000000000..2c6612ac0ef
---- /dev/null
-+++ b/app/code/Magento/ImportExport/etc/queue_consumer.xml
-@@ -0,0 +1,10 @@
-+<?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-message-queue:etc/consumer.xsd">
-+    <consumer name="exportProcessor" queue="export" connection="db" maxMessages="100" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\ImportExport\Model\Export\Consumer::process" />
-+</config>
-diff --git a/app/code/Magento/ImportExport/etc/queue_publisher.xml b/app/code/Magento/ImportExport/etc/queue_publisher.xml
-new file mode 100644
-index 00000000000..097b60bee15
---- /dev/null
-+++ b/app/code/Magento/ImportExport/etc/queue_publisher.xml
-@@ -0,0 +1,12 @@
-+<?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-message-queue:etc/publisher.xsd">
-+    <publisher topic="import_export.export">
-+        <connection name="db" exchange="magento-db" />
-+    </publisher>
-+</config>
-diff --git a/app/code/Magento/ImportExport/etc/queue_topology.xml b/app/code/Magento/ImportExport/etc/queue_topology.xml
-new file mode 100644
-index 00000000000..f77c13e2ba0
---- /dev/null
-+++ b/app/code/Magento/ImportExport/etc/queue_topology.xml
-@@ -0,0 +1,12 @@
-+<?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-message-queue:etc/topology.xsd">
-+    <exchange name="magento-db" type="topic" connection="db">
-+        <binding id="exportBinding" topic="import_export.export" destinationType="queue" destination="export"/>
-+    </exchange>
-+</config>
-diff --git a/app/code/Magento/ImportExport/i18n/en_US.csv b/app/code/Magento/ImportExport/i18n/en_US.csv
-index 60c9ee4c5a9..d7680a71ac5 100644
---- a/app/code/Magento/ImportExport/i18n/en_US.csv
-+++ b/app/code/Magento/ImportExport/i18n/en_US.csv
-@@ -18,6 +18,7 @@ Import,Import
- "Import Settings","Import Settings"
- "Import Behavior","Import Behavior"
- " "," "
-+"Validation Strategy","Validation Strategy"
- "Stop on Error","Stop on Error"
- "Skip error entries","Skip error entries"
- "Allowed Errors Count","Allowed Errors Count"
-@@ -119,3 +120,6 @@ User,User
- "Error File","Error File"
- "Execution Time","Execution Time"
- Summary,Summary
-+"New product data is added to existing product data entries in the database. All fields except SKU can be updated.","New product data is added to existing product data entries in the database. All fields except SKU can be updated."
-+"All existing product data is replaced with the imported new data. <b>Exercise caution when replacing data. All existing product data will be completely cleared and all references in the system will be lost.</b>","All existing product data is replaced with the imported new data. <b>Exercise caution when replacing data. All existing product data will be completely cleared and all references in the system will be lost.</b>"
-+"Any entities in the import data that match existing entities in the database are deleted from the database.","Any entities in the import data that match existing entities in the database are deleted from the database."
-diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml
-index 68486509793..b60fb40bfbd 100644
---- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml
-+++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml
-@@ -11,6 +11,7 @@
-             <block class="Magento\Backend\Block\Template" template="Magento_ImportExport::export/form/before.phtml" name="export.form.before" as="form_before"/>
-             <block class="Magento\ImportExport\Block\Adminhtml\Export\Edit" name="export.form.container"/>
-             <block class="Magento\ImportExport\Block\Adminhtml\Form\After" template="Magento_ImportExport::export/form/after.phtml" name="export.form.after" as="form_after"/>
-+            <uiComponent name="export_grid"/>
-         </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_history_grid_block.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_history_grid_block.xml
-index 02fc198cb0a..51e5827c8ab 100644
---- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_history_grid_block.xml
-+++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_history_grid_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.import.history.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">importHistoryGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\ImportExport\Model\ResourceModel\History\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\ImportExport\Model\ResourceModel\History\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">history_id</argument>
-                     <argument name="default_dir" xsi:type="string">desc</argument>
-                 </arguments>
-diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml
-index 4f13b759efd..fe1763d3e02 100644
---- a/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml
-+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml
-@@ -6,11 +6,11 @@
- ?>
- <div class="fieldset">
-     <div class="legend">
--        <span><?= /* @escapeNotVerified */ __('Status') ?></span>
-+        <span><?= $block->escapeHtml(__('Status')) ?></span>
-     </div><br>
-     <div class="messages">
-         <div class="message message-success success">
--            <div><?= /* @escapeNotVerified */ $block->getStatusMessage() ?></div>
-+            <div><?= $block->escapeHtml($block->getStatusMessage()) ?></div>
-         </div>
-     </div>
- </div>
-diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
-index 7e801bcd1d6..150f7dbeb10 100644
---- a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
-+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
-@@ -3,20 +3,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <fieldset class="admin__fieldset" id="export_filter_container" style="display:none;">
-     <legend class="admin__legend">
--        <span><?= /* @escapeNotVerified */ __('Entity Attributes') ?></span>
-+        <span><?= $block->escapeHtml(__('Entity Attributes')) ?></span>
-     </legend>
-     <br />
--    <form id="export_filter_form" action="<?= /* @escapeNotVerified */ $block->getUrl('*/*/export') ?>" method="post">
--        <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
-+    <form id="export_filter_form" action="<?= $block->escapeUrl($block->getUrl('*/*/export')) ?>" method="post">
-+        <input name="form_key" type="hidden" value="<?= /* @noEscape */ $block->getFormKey() ?>" />
-         <div id="export_filter_grid_container"><!-- --></div>
-     </form>
--    <button class="action- scalable" type="button" onclick="getFile();"><span><?php
--        /* @escapeNotVerified */ echo __('Continue')
-+    <button class="action- scalable" type="button" onclick="getFile();"><span><?=
-+        $block->escapeHtml(__('Continue'))
-     ?></span></button>
- </fieldset>
- <script>
-diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
-index fbdd3947836..26b241b9994 100644
---- a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
-+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
-@@ -44,7 +44,7 @@ require([
-          */
-         getFilter: function() {
-             if ($('entity') && $F('entity')) {
--                var url    = "<?= /* @escapeNotVerified */ $block->getUrl('*/*/getFilter') ?>";
-+                var url    = "<?= $block->escapeJs($block->escapeUrl($block->getUrl('*/*/getFilter'))) ?>";
-                 var entity = $F('entity');
-                 if (entity != this.previousGridEntity) {
-                     this.previousGridEntity = entity;
-diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml
-index b6c67e4167a..f629e6c9e9f 100644
---- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml
-+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml
-@@ -3,13 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <div class="entry-edit fieldset" id="import_validation_container" style="display:none;">
-     <div class="entry-edit-head legend">
-         <span class="icon-head head-edit-form fieldset-legend"
--            id="import_validation_container_header"><?= /* @escapeNotVerified */ __('Validation Results') ?></span>
-+            id="import_validation_container_header"><?= $block->escapeHtml(__('Validation Results')) ?></span>
-     </div><br>
-     <div id="import_validation_messages" class="fieldset"><!-- --></div>
- </div>
-diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
-index 8a52f4ca88e..628c1088a01 100644
---- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
-+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
-@@ -3,8 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <?php
- /** @var $block \Magento\ImportExport\Block\Adminhtml\Import\Edit\Before */
-@@ -29,25 +27,27 @@ require([
-          * List of existing behavior sets
-          * @type {Array}
-          */
--        uniqueBehaviors: <?= /* @escapeNotVerified */ $block->getUniqueBehaviors() ?>,
-+        uniqueBehaviors: <?= /* @noEscape */ $block->getUniqueBehaviors() ?>,
- 
-         /**
-          * Behaviour codes for import entities
-          * @type {Array}
-          */
--        entityBehaviors: <?= /* @escapeNotVerified */ $block->getEntityBehaviors() ?>,
-+        entityBehaviors: <?= /* @noEscape */ $block->getEntityBehaviors() ?>,
- 
-         /**
-          * Behaviour notes for import entities
-          * @type {Array}
-          */
--        entityBehaviorsNotes: <?= /* @escapeNotVerified */ $block->getEntityBehaviorsNotes() ?>,
-+        entityBehaviorsNotes: <?= /* @noEscape */ $block->getEntityBehaviorsNotes() ?>,
- 
-         /**
-          * Base url
-          * @type {string}
-          */
--        sampleFilesBaseUrl: '<?= /* @escapeNotVerified */ $block->getUrl('*/*/download/', ['filename' => 'entity-name']) ?>',
-+        sampleFilesBaseUrl: '<?= $block->escapeJs(
-+            $block->escapeUrl($block->getUrl('*/*/download/', ['filename' => 'entity-name']))
-+        ) ?>',
- 
-         /**
-          * Reset selected index
-diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml
-index fbb9baa452a..57f521fba94 100644
---- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml
-+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml
-@@ -6,6 +6,6 @@
- ?>
- <script type='text/javascript'>
- //<![CDATA[
--    top.varienImport.postToFrameComplete(<?= /* @escapeNotVerified */ $block->getResponseJson() ?>);
-+    top.varienImport.postToFrameComplete(<?= /* @noEscape */ $block->getResponseJson() ?>);
- //]]>
- </script>
-diff --git a/app/code/Magento/ImportExport/view/adminhtml/ui_component/export_grid.xml b/app/code/Magento/ImportExport/view/adminhtml/ui_component/export_grid.xml
-new file mode 100644
-index 00000000000..2b160bc9f6f
---- /dev/null
-+++ b/app/code/Magento/ImportExport/view/adminhtml/ui_component/export_grid.xml
-@@ -0,0 +1,50 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<listing
-+        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="js_config" xsi:type="array">
-+            <item name="provider" xsi:type="string">export_grid.export_grid_data_source</item>
-+        </item>
-+    </argument>
-+    <settings>
-+        <deps>
-+            <dep>export_grid.export_grid_data_source</dep>
-+        </deps>
-+        <spinner>export_grid_columns</spinner>
-+    </settings>
-+    <dataSource name="export_grid_data_source" component="Magento_Ui/js/grid/provider">
-+        <settings>
-+            <storageConfig>
-+                <param name="indexField" xsi:type="string">file_name</param>
-+            </storageConfig>
-+            <updateUrl path="mui/index/render"/>
-+        </settings>
-+        <aclResource>Magento_ImportExport::export</aclResource>
-+        <dataProvider class="Magento\ImportExport\Ui\DataProvider\ExportFileDataProvider" name="export_grid_data_source">
-+            <settings>
-+                <requestFieldName>file_name</requestFieldName>
-+                <primaryFieldName>file_name</primaryFieldName>
-+            </settings>
-+        </dataProvider>
-+    </dataSource>
-+    <columns name="export_grid_columns">
-+        <column name="file_name">
-+            <settings>
-+                <sortable>false</sortable>
-+                <label translate="true">File name</label>
-+            </settings>
-+        </column>
-+        <actionsColumn name="actions" class="Magento\ImportExport\Ui\Component\Columns\ExportGridActions">
-+            <settings>
-+                <indexField>file_name</indexField>
-+            </settings>
-+        </actionsColumn>
-+    </columns>
-+</listing>
-\ No newline at end of file
-diff --git a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
-index 6eab92f6511..fffa4503e14 100644
---- a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
-+++ b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
-@@ -58,7 +58,7 @@ class IndexerReindexCommand extends AbstractIndexerManageCommand
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function configure()
-     {
-@@ -70,7 +70,7 @@ class IndexerReindexCommand extends AbstractIndexerManageCommand
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function execute(InputInterface $input, OutputInterface $output)
-     {
-@@ -105,7 +105,9 @@ class IndexerReindexCommand extends AbstractIndexerManageCommand
-     }
- 
-     /**
--     * {@inheritdoc} Returns the ordered list of specified indexers and related indexers.
-+     * @inheritdoc
-+     *
-+     * Returns the ordered list of specified indexers and related indexers.
-      */
-     protected function getIndexers(InputInterface $input)
-     {
-@@ -187,7 +189,7 @@ class IndexerReindexCommand extends AbstractIndexerManageCommand
-                     $this->getDependentIndexerIds($id)
-                 );
-             }
--        };
-+        }
- 
-         return array_unique($dependentIndexerIds);
-     }
-@@ -272,6 +274,8 @@ class IndexerReindexCommand extends AbstractIndexerManageCommand
-     }
- 
-     /**
-+     * Get indexer registry
-+     *
-      * @return IndexerRegistry
-      * @deprecated 100.2.0
-      */
-@@ -284,6 +288,8 @@ class IndexerReindexCommand extends AbstractIndexerManageCommand
-     }
- 
-     /**
-+     * Get dependency info provider
-+     *
-      * @return DependencyInfoProvider
-      * @deprecated 100.2.0
-      */
-diff --git a/app/code/Magento/Indexer/Console/Command/IndexerSetDimensionsModeCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerSetDimensionsModeCommand.php
-new file mode 100644
-index 00000000000..51d67e2116a
---- /dev/null
-+++ b/app/code/Magento/Indexer/Console/Command/IndexerSetDimensionsModeCommand.php
-@@ -0,0 +1,207 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Indexer\Console\Command;
-+
-+use Symfony\Component\Console\Input\InputInterface;
-+use Symfony\Component\Console\Output\OutputInterface;
-+use Symfony\Component\Console\Input\InputArgument;
-+use Magento\Framework\App\ObjectManagerFactory;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\Console\Cli;
-+use Magento\Indexer\Model\ModeSwitcherInterface;
-+
-+/**
-+ * Command to set indexer dimensions mode
-+ */
-+class IndexerSetDimensionsModeCommand extends AbstractIndexerCommand
-+{
-+    const INPUT_KEY_MODE = 'mode';
-+    const INPUT_KEY_INDEXER = 'indexer';
-+    const DIMENSION_MODE_NONE = 'none';
-+    const XML_PATH_DIMENSIONS_MODE_MASK = 'indexer/%s/dimensions_mode';
-+
-+    /**
-+     * @var string
-+     */
-+    private $commandName = 'indexer:set-dimensions-mode';
-+
-+    /**
-+     * ScopeConfigInterface
-+     *
-+     * @var ScopeConfigInterface
-+     */
-+    private $configReader;
-+
-+    /**
-+     * @var ModeSwitcherInterface[]
-+     */
-+    private $dimensionProviders;
-+
-+    /**
-+     * @param ObjectManagerFactory $objectManagerFactory
-+     * @param ScopeConfigInterface $configReader
-+     * @param ModeSwitcherInterface[] $dimensionSwitchers
-+     */
-+    public function __construct(
-+        ObjectManagerFactory $objectManagerFactory,
-+        ScopeConfigInterface $configReader,
-+        array $dimensionSwitchers
-+    ) {
-+        $this->configReader = $configReader;
-+        $this->dimensionProviders = $dimensionSwitchers;
-+        parent::__construct($objectManagerFactory);
-+    }
-+
-+    /**
-+     * {@inheritdoc}
-+     */
-+    protected function configure()
-+    {
-+        $this->setName($this->commandName)
-+            ->setDescription('Set Indexer Dimensions Mode')
-+            ->setDefinition($this->getInputList());
-+        parent::configure();
-+    }
-+
-+    /**
-+     * {@inheritdoc}
-+     * @param InputInterface $input
-+     * @param OutputInterface $output
-+     * @return int
-+     */
-+    protected function execute(InputInterface $input, OutputInterface $output)
-+    {
-+        $errors = $this->validate($input);
-+        if ($errors) {
-+            throw new \InvalidArgumentException(implode(PHP_EOL, $errors));
-+        }
-+        $returnValue = Cli::RETURN_SUCCESS;
-+        /** @var \Magento\Indexer\Model\Indexer $indexer */
-+        $indexer = $this->getObjectManager()->get(\Magento\Indexer\Model\Indexer::class);
-+        try {
-+            $selectedIndexer = (string)$input->getArgument(self::INPUT_KEY_INDEXER);
-+            if (!$selectedIndexer) {
-+                $this->showAvailableModes($output);
-+            } else {
-+                $indexer->load($selectedIndexer);
-+                $currentMode = $input->getArgument(self::INPUT_KEY_MODE);
-+                $configPath = sprintf(self::XML_PATH_DIMENSIONS_MODE_MASK, $selectedIndexer);
-+                $previousMode = $this->configReader->getValue($configPath) ?: self::DIMENSION_MODE_NONE;
-+                if ($previousMode !== $currentMode) {
-+                    /** @var ModeSwitcherInterface $modeSwitcher */
-+                    $modeSwitcher = $this->dimensionProviders[$selectedIndexer];
-+                    // Switch dimensions mode
-+                    $modeSwitcher->switchMode($currentMode, $previousMode);
-+                    $output->writeln(
-+                        'Dimensions mode for indexer "' . $indexer->getTitle() . '" was changed from \''
-+                        . $previousMode . '\' to \'' . $currentMode . '\''
-+                    );
-+                } else {
-+                    $output->writeln('Dimensions mode for indexer "' . $indexer->getTitle() . '" has not been changed');
-+                }
-+            }
-+        } catch (\Exception $e) {
-+            $output->writeln('"' . $indexer->getTitle() . '" indexer process unknown error:' . PHP_EOL);
-+            $output->writeln($e->getMessage() . PHP_EOL);
-+            // we must have an exit code higher than zero to indicate something was wrong
-+            $returnValue = Cli::RETURN_FAILURE;
-+        }
-+
-+        return $returnValue;
-+    }
-+
-+    /**
-+     * Display all available indexers and modes
-+     *
-+     * @param OutputInterface $output
-+     * @return void
-+     */
-+    private function showAvailableModes(OutputInterface $output)
-+    {
-+        $output->writeln(sprintf('%-50s', 'Indexer') . 'Available modes');
-+        foreach ($this->dimensionProviders as $indexer => $provider) {
-+            $availableModes = implode(',', array_keys($provider->getDimensionModes()->getDimensions()));
-+            $output->writeln(sprintf('%-50s', $indexer) . $availableModes);
-+        }
-+    }
-+
-+    /**
-+     * Get list of arguments for the command
-+     *
-+     * @return InputArgument[]
-+     */
-+    private function getInputList(): array
-+    {
-+        $dimensionProvidersList = array_keys($this->dimensionProviders);
-+        $indexerOptionDescription = 'Indexer name [' . implode('|', $dimensionProvidersList) . ']';
-+        $arguments[] = new InputArgument(
-+            self::INPUT_KEY_INDEXER,
-+            InputArgument::OPTIONAL,
-+            $indexerOptionDescription
-+        );
-+        $modeOptionDescription = 'Indexer dimension modes' . PHP_EOL;
-+        foreach ($this->dimensionProviders as $indexer => $provider) {
-+            $availableModes = implode(',', array_keys($provider->getDimensionModes()->getDimensions()));
-+            $modeOptionDescription .= sprintf('%-30s ', $indexer) . $availableModes . PHP_EOL;
-+        }
-+        $arguments[] = new InputArgument(
-+            self::INPUT_KEY_MODE,
-+            InputArgument::OPTIONAL,
-+            $modeOptionDescription
-+        );
-+
-+        return $arguments;
-+    }
-+
-+    /**
-+     * Check if all arguments are provided
-+     *
-+     * @param InputInterface $input
-+     * @return string[]
-+     */
-+    private function validate(InputInterface $input): array
-+    {
-+        $errors = [];
-+        $inputIndexer = (string)$input->getArgument(self::INPUT_KEY_INDEXER);
-+        if ($inputIndexer) {
-+            $acceptedValues = array_keys($this->dimensionProviders);
-+            $errors = $this->validateArgument(self::INPUT_KEY_INDEXER, $inputIndexer, $acceptedValues);
-+            if (!$errors) {
-+                $inputIndexerDimensionMode = (string)$input->getArgument(self::INPUT_KEY_MODE);
-+                /** @var ModeSwitcherInterface $modeSwitcher */
-+                $modeSwitcher = $this->dimensionProviders[$inputIndexer];
-+                $acceptedValues = array_keys($modeSwitcher->getDimensionModes()->getDimensions());
-+                $errors = $this->validateArgument(self::INPUT_KEY_MODE, $inputIndexerDimensionMode, $acceptedValues);
-+            }
-+        }
-+
-+        return $errors;
-+    }
-+
-+    /**
-+     * Validate command argument and return errors in case if argument is invalid
-+     *
-+     * @param string $inputKey
-+     * @param string $inputIndexer
-+     * @param array $acceptedValues
-+     * @return string[]
-+     */
-+    private function validateArgument(string $inputKey, string $inputIndexer, array $acceptedValues): array
-+    {
-+        $errors = [];
-+        $acceptedIndexerValues = ' Accepted values for "<' . $inputKey . '>" are \'' .
-+            implode(',', $acceptedValues) . '\'';
-+        if (!$inputIndexer) {
-+            $errors[] = 'Missing argument "<' . $inputKey . '>".' . $acceptedIndexerValues;
-+        } elseif (!\in_array($inputIndexer, $acceptedValues)) {
-+            $errors[] = 'Invalid value for "<' . $inputKey . '>" argument.' . $acceptedIndexerValues;
-+        }
-+
-+        return $errors;
-+    }
-+}
-diff --git a/app/code/Magento/Indexer/Console/Command/IndexerShowDimensionsModeCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerShowDimensionsModeCommand.php
-new file mode 100644
-index 00000000000..44fff0bca68
---- /dev/null
-+++ b/app/code/Magento/Indexer/Console/Command/IndexerShowDimensionsModeCommand.php
-@@ -0,0 +1,155 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Indexer\Console\Command;
-+
-+use Symfony\Component\Console\Input\InputInterface;
-+use Symfony\Component\Console\Output\OutputInterface;
-+use Magento\Framework\App\ObjectManagerFactory;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\Console\Cli;
-+use Symfony\Component\Console\Input\InputArgument;
-+
-+/**
-+ * Command to show indexers dimension modes
-+ */
-+class IndexerShowDimensionsModeCommand extends AbstractIndexerCommand
-+{
-+    const INPUT_KEY_INDEXER = 'indexer';
-+    const DIMENSION_MODE_NONE = 'none';
-+    const XML_PATH_DIMENSIONS_MODE_MASK = 'indexer/%s/dimensions_mode';
-+    /**
-+     * @var string
-+     */
-+    private $commandName = 'indexer:show-dimensions-mode';
-+    /**
-+     * ScopeConfigInterface
-+     *
-+     * @var ScopeConfigInterface
-+     */
-+    private $configReader;
-+    /**
-+     * @var string[]
-+     */
-+    private $indexers;
-+
-+    /**
-+     * @param ObjectManagerFactory $objectManagerFactory
-+     * @param ScopeConfigInterface $configReader
-+     * @param array $indexers
-+     */
-+    public function __construct(
-+        ObjectManagerFactory $objectManagerFactory,
-+        ScopeConfigInterface $configReader,
-+        array $indexers
-+    ) {
-+        $this->configReader = $configReader;
-+        $this->indexers = $indexers;
-+        parent::__construct($objectManagerFactory);
-+    }
-+
-+    /**
-+     * {@inheritdoc}
-+     */
-+    protected function configure()
-+    {
-+        $this->setName($this->commandName)
-+            ->setDescription('Shows Indexer Dimension Mode')
-+            ->setDefinition($this->getInputList());
-+        parent::configure();
-+    }
-+
-+    /**
-+     * {@inheritdoc}
-+     * @param InputInterface $input
-+     * @param OutputInterface $output
-+     * @return int
-+     */
-+    protected function execute(InputInterface $input, OutputInterface $output)
-+    {
-+        $errors = $this->validate($input);
-+        if ($errors) {
-+            throw new \InvalidArgumentException(implode(PHP_EOL, $errors));
-+        }
-+        $returnValue = Cli::RETURN_SUCCESS;
-+        /** @var \Magento\Indexer\Model\Indexer $indexer */
-+        $indexer = $this->getObjectManager()->get(\Magento\Indexer\Model\Indexer::class);
-+        try {
-+            $selectedIndexers = $input->getArgument(self::INPUT_KEY_INDEXER);
-+            if ($selectedIndexers) {
-+                $indexersList = (array)$selectedIndexers;
-+            } else {
-+                $indexersList = $this->indexers;
-+            }
-+            foreach ($indexersList as $indexerId) {
-+                $indexer->load($indexerId);
-+                $configPath = sprintf(self::XML_PATH_DIMENSIONS_MODE_MASK, $indexerId);
-+                $mode = $this->configReader->getValue($configPath) ?: self::DIMENSION_MODE_NONE;
-+                $output->writeln(sprintf('%-50s ', $indexer->getTitle() . ':') . $mode);
-+            }
-+        } catch (\Exception $e) {
-+            $output->writeln('"' . $indexer->getTitle() . '" indexer process unknown error:' . PHP_EOL);
-+            $output->writeln($e->getMessage() . PHP_EOL);
-+            // we must have an exit code higher than zero to indicate something was wrong
-+            $returnValue = Cli::RETURN_FAILURE;
-+        }
-+
-+        return $returnValue;
-+    }
-+
-+    /**
-+     * Get list of arguments for the command
-+     *
-+     * @return InputArgument[]
-+     */
-+    private function getInputList(): array
-+    {
-+        $optionDescription = 'Space-separated list of index types or omit to apply to all indexes';
-+        $arguments[] = new InputArgument(
-+            self::INPUT_KEY_INDEXER,
-+            InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-+            $optionDescription . ' (' . implode($this->indexers) . ')'
-+        );
-+
-+        return $arguments;
-+    }
-+
-+    /**
-+     * Check if all arguments are provided
-+     *
-+     * @param InputInterface $input
-+     * @return string[]
-+     */
-+    private function validate(InputInterface $input): array
-+    {
-+        $inputIndexer = (array)$input->getArgument(self::INPUT_KEY_INDEXER);
-+        $acceptedValues = array_keys($this->indexers);
-+        $errors = $this->validateArgument(self::INPUT_KEY_INDEXER, $inputIndexer, $acceptedValues);
-+
-+        return $errors;
-+    }
-+
-+    /**
-+     * Validate command argument and return errors in case if argument is invalid
-+     *
-+     * @param string $inputKey
-+     * @param array $inputIndexer
-+     * @param array $acceptedValues
-+     * @return array
-+     */
-+    private function validateArgument(string $inputKey, array $inputIndexer, array $acceptedValues): array
-+    {
-+        $errors = [];
-+        $acceptedIndexerValues = ' Accepted values for "<' . $inputKey . '>" are \'' .
-+            implode(',', $acceptedValues) . '\'';
-+        if (!empty($inputIndexer) && !\array_intersect($inputIndexer, $acceptedValues)) {
-+            $errors[] = 'Invalid value for "<' . $inputKey . '>" argument.' . $acceptedIndexerValues;
-+        }
-+
-+        return $errors;
-+    }
-+}
-diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php
-index 02e600dbd93..35cefbcda43 100644
---- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php
-+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Indexer\Controller\Adminhtml\Indexer;
- 
--class ListAction extends \Magento\Indexer\Controller\Adminhtml\Indexer
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class ListAction extends \Magento\Indexer\Controller\Adminhtml\Indexer implements HttpGetActionInterface
- {
-     /**
-      * Display processes grid action
-diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
-index b4a4d9f06ae..3dffd514218 100644
---- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
-+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Indexer\Controller\Adminhtml\Indexer;
- 
--class MassChangelog extends \Magento\Indexer\Controller\Adminhtml\Indexer
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class MassChangelog extends \Magento\Indexer\Controller\Adminhtml\Indexer implements HttpPostActionInterface
- {
-     /**
-      * Turn mview on for the given indexers
-diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
-index 7ace4a64d38..9f7faff8843 100644
---- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
-+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Indexer\Controller\Adminhtml\Indexer;
- 
--class MassOnTheFly extends \Magento\Indexer\Controller\Adminhtml\Indexer
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class MassOnTheFly extends \Magento\Indexer\Controller\Adminhtml\Indexer implements HttpPostActionInterface
- {
-     /**
-      * Turn mview off for the given indexers
-diff --git a/app/code/Magento/Indexer/Model/DimensionMode.php b/app/code/Magento/Indexer/Model/DimensionMode.php
-new file mode 100644
-index 00000000000..5e67f70663b
---- /dev/null
-+++ b/app/code/Magento/Indexer/Model/DimensionMode.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Indexer\Model;
-+
-+/**
-+ * DTO to work with dimension mode
-+ */
-+class DimensionMode
-+{
-+    /**
-+     * @var array
-+     */
-+    private $name;
-+
-+    /**
-+     * @var array
-+     */
-+    private $dimensions;
-+
-+    /**
-+     * @param string $name
-+     * @param array $dimensions
-+     */
-+    public function __construct(string $name, array $dimensions)
-+    {
-+        $this->dimensions = (function (string ...$dimensions) {
-+            return $dimensions;
-+        })(...$dimensions);
-+        $this->name = $name;
-+    }
-+
-+    /**
-+     * Returns dimension name
-+     *
-+     * @return string
-+     */
-+    public function getName(): string
-+    {
-+        return $this->name;
-+    }
-+
-+    /**
-+     * Returns dimension modes
-+     *
-+     * @return string[]
-+     */
-+    public function getDimensions(): array
-+    {
-+        return $this->dimensions;
-+    }
-+}
-diff --git a/app/code/Magento/Indexer/Model/DimensionModes.php b/app/code/Magento/Indexer/Model/DimensionModes.php
-new file mode 100644
-index 00000000000..a9507a6f4d3
---- /dev/null
-+++ b/app/code/Magento/Indexer/Model/DimensionModes.php
-@@ -0,0 +1,43 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Indexer\Model;
-+
-+/**
-+ * DTO to work with dimension modes
-+ */
-+class DimensionModes
-+{
-+    /**
-+     * @var DimensionMode[]
-+     */
-+    private $dimensions;
-+
-+    /**
-+     * @param DimensionMode[] $dimensions
-+     */
-+    public function __construct(array $dimensions)
-+    {
-+        $this->dimensions = (function (DimensionMode ...$dimensions) {
-+            $result = [];
-+            foreach ($dimensions as $dimension) {
-+                $result[$dimension->getName()] = $dimension;
-+            }
-+            return $result;
-+        })(...$dimensions);
-+    }
-+
-+    /**
-+     * Returns dimensions and their modes
-+     *
-+     * @return array
-+     */
-+    public function getDimensions(): array
-+    {
-+        return $this->dimensions;
-+    }
-+}
-diff --git a/app/code/Magento/Indexer/Model/Indexer.php b/app/code/Magento/Indexer/Model/Indexer.php
-index 87a7cce58e1..2821a46f294 100644
---- a/app/code/Magento/Indexer/Model/Indexer.php
-+++ b/app/code/Magento/Indexer/Model/Indexer.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Indexer\Model;
- 
- use Magento\Framework\Indexer\ActionFactory;
-@@ -14,6 +15,8 @@ use Magento\Framework\Indexer\StateInterface;
- use Magento\Framework\Indexer\StructureFactory;
- 
- /**
-+ * Indexer model.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Indexer extends \Magento\Framework\DataObject implements IndexerInterface
-@@ -361,7 +364,7 @@ class Indexer extends \Magento\Framework\DataObject implements IndexerInterface
-                 return $this->getView()->getUpdated();
-             }
-         }
--        return $this->getState()->getUpdated();
-+        return $this->getState()->getUpdated() ?: '';
-     }
- 
-     /**
-diff --git a/app/code/Magento/Indexer/Model/Message/Invalid.php b/app/code/Magento/Indexer/Model/Message/Invalid.php
-index 5a3f879b0ad..79f9fcef964 100644
---- a/app/code/Magento/Indexer/Model/Message/Invalid.php
-+++ b/app/code/Magento/Indexer/Model/Message/Invalid.php
-@@ -6,6 +6,9 @@
- 
- namespace Magento\Indexer\Model\Message;
- 
-+/**
-+ * Message about invalid indexers.
-+ */
- class Invalid implements \Magento\Framework\Notification\MessageInterface
- {
-     /**
-@@ -71,7 +74,7 @@ class Invalid implements \Magento\Framework\Notification\MessageInterface
-         return __(
-             'One or more <a href="%1">indexers are invalid</a>. Make sure your <a href="%2" target="_blank">Magento cron job</a> is running.',
-             $url,
--            'http://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-cron.html#create-or-remove-the-magento-crontab'
-+            'https://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-cron.html#create-or-remove-the-magento-crontab'
-         );
-         //@codingStandardsIgnoreEnd
-     }
-diff --git a/app/code/Magento/Indexer/Model/ModeSwitcherInterface.php b/app/code/Magento/Indexer/Model/ModeSwitcherInterface.php
-new file mode 100644
-index 00000000000..8984b05365f
---- /dev/null
-+++ b/app/code/Magento/Indexer/Model/ModeSwitcherInterface.php
-@@ -0,0 +1,32 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Indexer\Model;
-+
-+/**
-+ * Interface to switch indexer mode
-+ */
-+interface ModeSwitcherInterface
-+{
-+    /**
-+     * Returns data object that contains dimension modes
-+     *
-+     * @return DimensionModes
-+     */
-+    public function getDimensionModes(): DimensionModes;
-+
-+    /**
-+     * Switch dimension mode
-+     *
-+     * @param string $currentMode
-+     * @param string $previousMode
-+     * @throws \InvalidArgumentException
-+     * @throws \Zend_Db_Exception
-+     * @return void
-+     */
-+    public function switchMode(string $currentMode, string $previousMode);
-+}
-diff --git a/app/code/Magento/Indexer/Model/ProcessManager.php b/app/code/Magento/Indexer/Model/ProcessManager.php
-index 04cd713fffb..2f2c500e028 100644
---- a/app/code/Magento/Indexer/Model/ProcessManager.php
-+++ b/app/code/Magento/Indexer/Model/ProcessManager.php
-@@ -71,6 +71,7 @@ class ProcessManager
-     private function simpleThreadExecute($userFunctions)
-     {
-         foreach ($userFunctions as $userFunction) {
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             call_user_func($userFunction);
-         }
-     }
-@@ -79,6 +80,7 @@ class ProcessManager
-      * Execute user functions in multiThreads mode
-      *
-      * @param \Traversable $userFunctions
-+     * @throws \RuntimeException
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      */
-     private function multiThreadsExecute($userFunctions)
-@@ -86,6 +88,7 @@ class ProcessManager
-         $this->resource->closeConnection(null);
-         $threadNumber = 0;
-         foreach ($userFunctions as $userFunction) {
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             $pid = pcntl_fork();
-             if ($pid == -1) {
-                 throw new \RuntimeException('Unable to fork a new process');
-@@ -95,6 +98,7 @@ class ProcessManager
-                 $this->startChildProcess($userFunction);
-             }
-         }
-+        // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock,Magento2.Functions.DiscouragedFunction
-         while (pcntl_waitpid(0, $status) != -1) {
-             //Waiting for the completion of child processes
-         }
-@@ -128,12 +132,13 @@ class ProcessManager
-      * Start child process
-      *
-      * @param callable $userFunction
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     private function startChildProcess(callable $userFunction)
-     {
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         $status = call_user_func($userFunction);
--        $status = is_integer($status) ? $status : 0;
-+        $status = is_int($status) ? $status : 0;
-+        // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-         exit($status);
-     }
- 
-@@ -146,8 +151,10 @@ class ProcessManager
-     {
-         $threadNumber++;
-         if ($threadNumber >= $this->threadsCount) {
-+            // phpcs:disable Magento2.Functions.DiscouragedFunction
-             pcntl_wait($status);
-             if (pcntl_wexitstatus($status) !== 0) {
-+                // phpcs:enable
-                 $this->failInChildProcess = true;
-             }
-             $threadNumber--;
-diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminSwitchAllIndexerToActionModeActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminSwitchAllIndexerToActionModeActionGroup.xml
-new file mode 100644
-index 00000000000..a8aa089a389
---- /dev/null
-+++ b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminSwitchAllIndexerToActionModeActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSwitchAllIndexerToActionModeActionGroup">
-+        <arguments>
-+            <argument name="action" type="string" defaultValue="Update by Schedule"/>
-+        </arguments>
-+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="onIndexManagement"/>
-+        <waitForPageLoad stepKey="waitForManagementPage"/>
-+        <selectOption userInput="selectAll" selector="{{AdminIndexManagementSection.selectMassAction}}" stepKey="checkIndexer"/>
-+        <selectOption userInput="{{action}}" selector="{{AdminIndexManagementSection.massActionSelect}}" stepKey="selectAction"/>
-+        <click selector="{{AdminIndexManagementSection.massActionSubmit}}" stepKey="clickSubmit"/>
-+        <waitForPageLoad stepKey="waitForSubmit"/>
-+        <see userInput="indexer(s) are in &quot;{{action}}&quot; mode." stepKey="seeMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminSwitchIndexerToActionModeActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminSwitchIndexerToActionModeActionGroup.xml
-new file mode 100644
-index 00000000000..7b77af08614
---- /dev/null
-+++ b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminSwitchIndexerToActionModeActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSwitchIndexerToActionModeActionGroup">
-+        <arguments>
-+            <argument name="indexerValue" type="string"/>
-+            <argument name="action" type="string" defaultValue="Update by Schedule"/>
-+        </arguments>
-+        <checkOption selector="{{AdminIndexManagementSection.indexerCheckbox(indexerValue)}}" stepKey="checkIndexer"/>
-+        <selectOption userInput="{{action}}" selector="{{AdminIndexManagementSection.massActionSelect}}" stepKey="selectAction"/>
-+        <click selector="{{AdminIndexManagementSection.massActionSubmit}}" stepKey="clickSubmit"/>
-+        <waitForPageLoad stepKey="waitForSubmit"/>
-+        <see selector="{{AdminIndexManagementSection.successMessage}}" userInput="1 indexer(s) are in &quot;{{action}}&quot; mode." stepKey="seeMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup.xml
-new file mode 100644
-index 00000000000..52444e0c26a
---- /dev/null
-+++ b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup.xml
-@@ -0,0 +1,36 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="updateIndexerBySchedule">
-+        <arguments>
-+            <argument name="indexerName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/indexer/indexer/list/" stepKey="amOnIndexManagementPage"/>
-+        <waitForPageLoad stepKey="waitForIndexManagementPageToLoad"/>
-+        <click selector="{{AdminIndexManagementSection.indexerCheckbox(indexerName)}}" stepKey="selectIndexer1"/>
-+        <selectOption selector="{{AdminIndexManagementSection.massActionSelect}}" userInput="change_mode_changelog" stepKey="selectUpdateBySchedule"/>
-+        <click selector="{{AdminIndexManagementSection.massActionSubmit}}" stepKey="submitIndexerForm"/>
-+        <!-- No re-indexing is done as part of this actionGroup since the test required no re-indexing -->
-+        <waitForPageLoad stepKey="waitForSave"/>
-+    </actionGroup>
-+    <actionGroup name="updateIndexerOnSave">
-+        <arguments>
-+            <argument name="indexerName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/indexer/indexer/list/" stepKey="amOnIndexManagementPage2"/>
-+        <waitForPageLoad stepKey="waitForIndexManagementPageToLoad2"/>
-+        <click selector="{{AdminIndexManagementSection.indexerCheckbox(indexerName)}}" stepKey="selectIndexer2"/>
-+        <selectOption selector="{{AdminIndexManagementSection.massActionSelect}}" userInput="change_mode_onthefly" stepKey="selectUpdateOnSave"/>
-+        <click selector="{{AdminIndexManagementSection.massActionSubmit}}" stepKey="submitIndexerForm2"/>
-+        <!-- No re-indexing is done as part of this actionGroup since the test required no re-indexing -->
-+        <waitForPageLoad stepKey="waitForSave2"/>
-+
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Indexer/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Indexer/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..b74d521f2cb
---- /dev/null
-+++ b/app/code/Magento/Indexer/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuSystemToolsIndexManagement">
-+        <data key="pageTitle">Index Management</data>
-+        <data key="title">Index Management</data>
-+        <data key="dataUiId">magento-indexer-system-index</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Indexer/Test/Mftf/Page/AdminIndexManagementPage.xml b/app/code/Magento/Indexer/Test/Mftf/Page/AdminIndexManagementPage.xml
-new file mode 100644
-index 00000000000..ed9a3dbb8c7
---- /dev/null
-+++ b/app/code/Magento/Indexer/Test/Mftf/Page/AdminIndexManagementPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminIndexManagementPage" url="indexer/indexer/list/" area="admin" module="Indexer">
-+        <section name="AdminIndexManagementSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml b/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml
-new file mode 100644
-index 00000000000..8e7df86d013
---- /dev/null
-+++ b/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminIndexManagementSection">
-+        <element name="catalogSearchCheckbox" type="checkbox" selector="input[value='catalogsearch_fulltext']"/>
-+        <element name="indexerCheckbox" type="checkbox" selector="input[value='{{var1}}']" parameterized="true"/>
-+        <element name="massActionSelect" type="select" selector="#gridIndexer_massaction-select"/>
-+        <element name="massActionSubmit" type="button" selector="#gridIndexer_massaction-form button"/>
-+        <element name="indexerSelect" type="select" selector="//select[contains(@class,'action-select-multiselect')]"/>
-+        <element name="indexerStatus" type="text" selector="//tr[descendant::td[contains(., '{{status}}')]]//*[contains(@class, 'col-indexer_status')]/span" parameterized="true"/>
-+        <element name="successMessage" type="text" selector="//*[@data-ui-id='messages-message-success']"/>
-+        <element name="selectMassAction" type="select" selector="#gridIndexer_massaction-mass-select"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementNavigateMenuTest.xml b/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..140c93f7f2b
---- /dev/null
-+++ b/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSystemIndexManagementNavigateMenuTest">
-+        <annotations>
-+            <features value="Indexer"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin system index management navigate menu test"/>
-+            <description value="Admin should be able to navigate to System > Index Management"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14127"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToIndexManagementPage">
-+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSystemToolsIndexManagement.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSystemToolsIndexManagement.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetDimensionsModeCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetDimensionsModeCommandTest.php
-new file mode 100644
-index 00000000000..3d913ee2860
---- /dev/null
-+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetDimensionsModeCommandTest.php
-@@ -0,0 +1,222 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Indexer\Test\Unit\Console\Command;
-+
-+use Magento\Indexer\Console\Command\IndexerSetDimensionsModeCommand;
-+use Symfony\Component\Console\Tester\CommandTester;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+
-+/**
-+ * Test for class \Magento\Indexer\Model\ModeSwitcherInterface.
-+ */
-+class IndexerSetDimensionsModeCommandTest extends AbstractIndexerCommandCommonSetup
-+{
-+    /**
-+     * Command being tested
-+     *
-+     * @var IndexerSetDimensionsModeCommand|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $command;
-+
-+    /**
-+     * ScopeConfigInterface
-+     *
-+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $configReaderMock;
-+
-+    /**
-+     * @var \Magento\Indexer\Model\ModeSwitcherInterface[]
-+     */
-+    private $dimensionProviders;
-+
-+    /**
-+     * @var \Magento\Indexer\Model\ModeSwitcherInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $dimensionModeSwitcherMock;
-+
-+    /**
-+     * @var \Magento\Indexer\Model\Indexer|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $indexerMock;
-+
-+    /**
-+     * @var \Magento\Indexer\Model\DimensionModes|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $dimensionModes;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $objectManagerHelper = new ObjectManagerHelper($this);
-+        $this->configReaderMock = $this->createMock(ScopeConfigInterface::class);
-+        $this->dimensionModeSwitcherMock =
-+            $this->createMock(\Magento\Indexer\Model\ModeSwitcherInterface::class);
-+        $this->dimensionProviders = [
-+            'indexer_title' => $this->dimensionModeSwitcherMock,
-+        ];
-+        $this->dimensionModes = $this->createMock(\Magento\Indexer\Model\DimensionModes::class);
-+        $this->command = $objectManagerHelper->getObject(
-+            IndexerSetDimensionsModeCommand::class,
-+            [
-+                'objectManagerFactory' => $this->objectManagerFactory,
-+                'configReader'         => $this->configReaderMock,
-+                'dimensionSwitchers'   => $this->dimensionProviders,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Get return value map for object manager
-+     *
-+     * @return array
-+     */
-+    protected function getObjectManagerReturnValueMap()
-+    {
-+        $result = parent::getObjectManagerReturnValueMap();
-+        $this->indexerMock = $this->createMock(\Magento\Indexer\Model\Indexer::class);
-+        $result[] = [\Magento\Indexer\Model\Indexer::class, $this->indexerMock];
-+
-+        return $result;
-+    }
-+
-+    /**
-+     * Tests method \Magento\Indexer\Console\Command\IndexerDimensionsModeCommand::execute
-+     *
-+     * @param string $indexerTitle
-+     * @param string $previousMode
-+     * @param string $command
-+     * @param string $consoleOutput
-+     * @dataProvider dimensionModesDataProvider
-+     * @return void
-+     */
-+    public function testExecuteWithAttributes($indexerTitle, $previousMode, $command, $consoleOutput)
-+    {
-+        $this->configureAdminArea();
-+        $commandTester = new CommandTester($this->command);
-+        $this->dimensionModes->method('getDimensions')->willReturn([
-+            $previousMode    => 'dimension1',
-+            $command['mode'] => 'dimension2',
-+        ]);
-+        $this->dimensionModeSwitcherMock->method('getDimensionModes')->willReturn($this->dimensionModes);
-+        $this->indexerMock->method('load')->willReturnSelf();
-+        $this->indexerMock->method('getTitle')->willReturn($indexerTitle);
-+        $commandTester->execute($command);
-+        $actualValue = $commandTester->getDisplay();
-+        $this->assertEquals(
-+            $consoleOutput,
-+            $actualValue
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dimensionModesDataProvider(): array
-+    {
-+        return [
-+            'was_changed'     => [
-+                'indexer_title' => 'indexer_title',
-+                'previousMode'  => 'none',
-+                'command'       => [
-+                    'indexer' => 'indexer_title',
-+                    'mode'    => 'store',
-+                ],
-+                'output'        =>
-+                    sprintf(
-+                        'Dimensions mode for indexer "%s" was changed from \'%s\' to \'%s\'',
-+                        'indexer_title',
-+                        'none',
-+                        'store'
-+                    ) . PHP_EOL
-+                ,
-+            ],
-+            'was_not_changed' => [
-+                'indexer_title' => 'indexer_title',
-+                'previousMode'  => 'none',
-+                'command'       => [
-+                    'indexer' => 'indexer_title',
-+                    'mode'    => 'none',
-+                ],
-+                'output'        =>
-+                    sprintf(
-+                        'Dimensions mode for indexer "%s" has not been changed',
-+                        'indexer_title'
-+                    ) . PHP_EOL
-+                ,
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Tests indexer exception of method \Magento\Indexer\Console\Command\IndexerDimensionsModeCommand::execute
-+     *
-+     * @expectedException \InvalidArgumentException
-+     * @expectedExceptionMessage
-+     *      Invalid value for "<indexer>" argument. Accepted values for "<indexer>" are 'indexer_title'
-+     * @return void
-+     */
-+    public function testExecuteWithIndxerException()
-+    {
-+        $commandTester = new CommandTester($this->command);
-+        $this->indexerMock->method('getTitle')->willReturn('indexer_title');
-+        $commandTester->execute(['indexer' => 'non_existing_title']);
-+    }
-+
-+    /**
-+     * Tests indexer exception of method \Magento\Indexer\Console\Command\IndexerDimensionsModeCommand::execute
-+     *
-+     * @expectedException \InvalidArgumentException
-+     * @expectedExceptionMessage Missing argument "<mode>". Accepted values for "<mode>" are 'store,website'
-+     * @return void
-+     */
-+    public function testExecuteWithModeException()
-+    {
-+        $commandTester = new CommandTester($this->command);
-+        $this->dimensionModes->method('getDimensions')->willReturn([
-+            'store'   => 'dimension1',
-+            'website' => 'dimension2',
-+        ]);
-+        $this->dimensionModeSwitcherMock->method('getDimensionModes')->willReturn($this->dimensionModes);
-+        $this->indexerMock->method('getTitle')->willReturn('indexer_title');
-+        $commandTester->execute([
-+            'indexer' => 'indexer_title',
-+        ]);
-+    }
-+
-+    /**
-+     * Test execution of command without any arguments
-+     *
-+     * @return void
-+     */
-+    public function testExecuteWithNoArguments()
-+    {
-+        $indexerTitle = 'indexer_title';
-+        $modesConfig = [
-+            'store'   => 'dimension1',
-+            'website' => 'dimension2',
-+        ];
-+        $this->configureAdminArea();
-+        $commandTester = new CommandTester($this->command);
-+        $this->indexerMock->method('getTitle')->willReturn($indexerTitle);
-+        $this->dimensionModes->method('getDimensions')->willReturn($modesConfig);
-+        $this->dimensionModeSwitcherMock->method('getDimensionModes')->willReturn($this->dimensionModes);
-+        $commandTester->execute([]);
-+        $actualValue = $commandTester->getDisplay();
-+        $consoleOutput = sprintf('%-50s', 'Indexer') . 'Available modes' . PHP_EOL
-+            . sprintf('%-50s', $indexerTitle) . 'store,website' . PHP_EOL;
-+        $this->assertEquals(
-+            $consoleOutput,
-+            $actualValue
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowDimensionsModeCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowDimensionsModeCommandTest.php
-new file mode 100644
-index 00000000000..53a84b96b97
---- /dev/null
-+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowDimensionsModeCommandTest.php
-@@ -0,0 +1,145 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Indexer\Test\Unit\Console\Command;
-+
-+use Magento\Indexer\Console\Command\IndexerShowDimensionsModeCommand;
-+use Symfony\Component\Console\Tester\CommandTester;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+
-+class IndexerShowDimensionsModeCommandTest extends AbstractIndexerCommandCommonSetup
-+{
-+    /**
-+     * Command being tested
-+     *
-+     * @var IndexerShowDimensionsModeCommand|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $command;
-+
-+    /**
-+     * ScopeConfigInterface
-+     *
-+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $configReaderMock;
-+
-+    /**
-+     * @var \Magento\Indexer\Model\ModeSwitcherInterface[]
-+     */
-+    private $indexers;
-+
-+    /**
-+     * @var \Magento\Indexer\Model\Indexer|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $indexerMock;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $objectManagerHelper = new ObjectManagerHelper($this);
-+        $this->configReaderMock = $this->createMock(ScopeConfigInterface::class);
-+        $this->indexers = ['indexer_1' => 'indexer_1', 'indexer_2' => 'indexer_2'];
-+        $this->command = $objectManagerHelper->getObject(
-+            IndexerShowDimensionsModeCommand::class,
-+            [
-+                'objectManagerFactory' => $this->objectManagerFactory,
-+                'configReader'         => $this->configReaderMock,
-+                'indexers'             => $this->indexers,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Get return value map for object manager
-+     *
-+     * @return array
-+     */
-+    protected function getObjectManagerReturnValueMap(): array
-+    {
-+        $result = parent::getObjectManagerReturnValueMap();
-+        $this->indexerMock = $this->createMock(\Magento\Indexer\Model\Indexer::class);
-+        $result[] = [\Magento\Indexer\Model\Indexer::class, $this->indexerMock];
-+
-+        return $result;
-+    }
-+
-+    /**
-+     * Tests method \Magento\Indexer\Console\Command\IndexerDimensionsModeCommand::execute
-+     *
-+     * @param string $command
-+     * @param string $consoleOutput
-+     * @dataProvider dimensionModesDataProvider
-+     */
-+    public function testExecuteWithAttributes($command, $consoleOutput)
-+    {
-+        $indexers = [['indexer_1'], ['indexer_2']];
-+        $indexerTitles = ['indexer_title1', 'indexer_title2'];
-+        $this->configureAdminArea();
-+        /** @var CommandTester $commandTester */
-+        $commandTester = new CommandTester($this->command);
-+        $this->indexerMock->method('load')->withConsecutive(...$indexers);
-+        $this->indexerMock->method('getTitle')->willReturnOnConsecutiveCalls(...$indexerTitles);
-+        $commandTester->execute($command);
-+        $actualValue = $commandTester->getDisplay();
-+        $this->assertEquals(
-+            $consoleOutput,
-+            $actualValue
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dimensionModesDataProvider(): array
-+    {
-+        return [
-+            'get_all'                => [
-+                'command' => [],
-+                'output'  =>
-+                    sprintf(
-+                        '%-50s ',
-+                        'indexer_title1' . ':'
-+                    ) . 'none' . PHP_EOL .
-+                    sprintf(
-+                        '%-50s ',
-+                        'indexer_title2' . ':'
-+                    ) . 'none' . PHP_EOL
-+                ,
-+            ],
-+            'get_by_index'           => [
-+                'command' => [
-+                    'indexer' => ['indexer_1'],
-+                ],
-+                'output'  =>
-+                    sprintf(
-+                        '%-50s ',
-+                        'indexer_title1' . ':'
-+                    ) . 'none' . PHP_EOL
-+                ,
-+            ],
-+            'get_by_several_indexes' => [
-+                'command' => [
-+                    'indexer' => ['indexer_1', 'indexer_2'],
-+                ],
-+                'output'  =>
-+                    sprintf(
-+                        '%-50s ',
-+                        'indexer_title1' . ':'
-+                    ) . 'none' . PHP_EOL .
-+                    sprintf(
-+                        '%-50s ',
-+                        'indexer_title2' . ':'
-+                    ) . 'none' . PHP_EOL
-+                ,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
-index 6b7cc122189..ca2da9585f9 100644
---- a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
-+++ b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
-@@ -164,7 +164,12 @@ class IndexerTest extends \PHPUnit\Framework\TestCase
-                 }
-             }
-         } else {
--            $this->assertEquals($getStateGetUpdated, $this->model->getLatestUpdated());
-+            $getLatestUpdated = $this->model->getLatestUpdated();
-+            $this->assertEquals($getStateGetUpdated, $getLatestUpdated);
-+
-+            if ($getStateGetUpdated === null) {
-+                $this->assertNotNull($getLatestUpdated);
-+            }
-         }
-     }
- 
-@@ -182,7 +187,8 @@ class IndexerTest extends \PHPUnit\Framework\TestCase
-             [true, '', '06-Jan-1944'],
-             [true, '06-Jan-1944', ''],
-             [true, '', ''],
--            [true, '06-Jan-1944', '05-Jan-1944']
-+            [true, '06-Jan-1944', '05-Jan-1944'],
-+            [false, null, null],
-         ];
-     }
- 
-diff --git a/app/code/Magento/Indexer/etc/db_schema.xml b/app/code/Magento/Indexer/etc/db_schema.xml
-index 58c447f4d26..d7cb006a2cf 100644
---- a/app/code/Magento/Indexer/etc/db_schema.xml
-+++ b/app/code/Magento/Indexer/etc/db_schema.xml
-@@ -15,10 +15,10 @@
-                 comment="Indexer Status"/>
-         <column xsi:type="datetime" name="updated" on_update="false" nullable="true" comment="Indexer Status"/>
-         <column xsi:type="varchar" name="hash_config" nullable="false" length="32" comment="Hash of indexer config"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="state_id"/>
-         </constraint>
--        <index name="INDEXER_STATE_INDEXER_ID" indexType="btree">
-+        <index referenceId="INDEXER_STATE_INDEXER_ID" indexType="btree">
-             <column name="indexer_id"/>
-         </index>
-     </table>
-@@ -31,13 +31,13 @@
-         <column xsi:type="datetime" name="updated" on_update="false" nullable="true" comment="View updated time"/>
-         <column xsi:type="int" name="version_id" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="View Version Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="state_id"/>
-         </constraint>
--        <index name="MVIEW_STATE_VIEW_ID" indexType="btree">
-+        <index referenceId="MVIEW_STATE_VIEW_ID" indexType="btree">
-             <column name="view_id"/>
-         </index>
--        <index name="MVIEW_STATE_MODE" indexType="btree">
-+        <index referenceId="MVIEW_STATE_MODE" indexType="btree">
-             <column name="mode"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Indexer/etc/di.xml b/app/code/Magento/Indexer/etc/di.xml
-index 6abaaf625e1..76e7e7a4622 100644
---- a/app/code/Magento/Indexer/etc/di.xml
-+++ b/app/code/Magento/Indexer/etc/di.xml
-@@ -42,7 +42,7 @@
-         <plugin name="page-cache-indexer-reindex-clean-cache"
-                 type="Magento\Indexer\Model\Processor\CleanCache" sortOrder="10"/>
-     </type>
--    <type name="\Magento\Indexer\Model\ProcessManager">
-+    <type name="Magento\Indexer\Model\ProcessManager">
-         <arguments>
-             <argument name="threadsCount" xsi:type="init_parameter">Magento\Indexer\Model\ProcessManager::THREADS_COUNT</argument>
-         </arguments>
-@@ -56,6 +56,8 @@
-                 <item name="show-mode" xsi:type="object">Magento\Indexer\Console\Command\IndexerShowModeCommand</item>
-                 <item name="status" xsi:type="object">Magento\Indexer\Console\Command\IndexerStatusCommand</item>
-                 <item name="reset" xsi:type="object">Magento\Indexer\Console\Command\IndexerResetStateCommand</item>
-+                <item name="set-dimensions-mode" xsi:type="object">Magento\Indexer\Console\Command\IndexerSetDimensionsModeCommand</item>
-+                <item name="show-dimensions-mode" xsi:type="object">Magento\Indexer\Console\Command\IndexerShowDimensionsModeCommand</item>
-             </argument>
-         </arguments>
-     </type>
-diff --git a/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml
-index bf6b2351f75..f1099c4133b 100644
---- a/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml
-+++ b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml
-@@ -13,7 +13,7 @@
-                     <argument name="use_ajax" xsi:type="string">0</argument>
-                     <argument name="pager_visibility" xsi:type="string">0</argument>
-                     <argument name="id" xsi:type="string">gridIndexer</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Indexer\Ui\DataProvider\Indexer\DataCollection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Indexer\Ui\DataProvider\Indexer\DataCollection</argument>
-                 </arguments>
-                 <block class="Magento\Backend\Block\Widget\Grid\Massaction" name="adminhtml.indexer.grid.grid.massaction" as="grid.massaction">
-                     <arguments>
-diff --git a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationFactory.php b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationFactory.php
-index cdca81ed98b..0b698afea1d 100644
---- a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationFactory.php
-+++ b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationFactory.php
-@@ -65,13 +65,13 @@ class IntegrationFactory
-     /**
-      * Reads value from config.
-      *
--     * @param $config
-+     * @param array $config
-      * @param string $field
-      * @param string $default
-      * @return string
-      */
-     private function extractFromConfig($config, string $field, string $default): string
-     {
--        return isset($config[$field]) ? $config[$field] : $default;
-+        return $config[$field] ?? $default;
-     }
- }
-diff --git a/app/code/Magento/InstantPurchase/README.md b/app/code/Magento/InstantPurchase/README.md
-index 534696bf353..9b618eaca99 100644
---- a/app/code/Magento/InstantPurchase/README.md
-+++ b/app/code/Magento/InstantPurchase/README.md
-@@ -10,7 +10,7 @@ Prerequisites to display the Instant Purchase button:
- 
- ## Structure
- 
--In addition to [a typical file structure for a Magento 2 module](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/build/module-file-structure.html) `PaymentMethodsIntegration` directory contains interfaces and basic implementation of integration vault payment method to the instant purchase.
-+In addition to [a typical file structure for a Magento 2 module](https://devdocs.magento.com/guides/v2.2/extension-dev-guide/build/module-file-structure.html) `PaymentMethodsIntegration` directory contains interfaces and basic implementation of integration vault payment method to the instant purchase.
- 
- ## Extensibility
- 
-@@ -22,7 +22,7 @@ All payments created for instant purchase also have `'instant-purchase' => true`
- 
- ### Payment method integration
- 
--Instant purchase support may be implemented for any payment method with [vault support](http://devdocs.magento.com/guides/v2.1/payments-integrations/vault/vault-intro.html).
-+Instant purchase support may be implemented for any payment method with [vault support](https://devdocs.magento.com/guides/v2.1/payments-integrations/vault/vault-intro.html).
- Basic implementation provided in `Magento\InstantPurchase\PaymentMethodIntegration` should be enough in most cases. It is not enabled by default to avoid issues on production sites and authors of vault payment method should verify correct work for instant purchase manually.
- To enable basic implementation just add single option to configuration of payemnt method in `config.xml`:
- 
-@@ -52,7 +52,7 @@ Basic implementation is a good start point but it's recommended to provide own i
- 
- The `Magento_InstantPurchase` module does not introduce backward incompatible changes.
- 
--You can track [backward incompatible changes in patch releases](http://devdocs.magento.com/guides/v2.2/release-notes/changes/ce_changes.html).
-+You can track [backward incompatible changes in patch releases](https://devdocs.magento.com/guides/v2.2/release-notes/changes/ce_changes.html).
- 
- ***
- 
-diff --git a/app/code/Magento/InstantPurchase/Test/Mftf/ActionGroup/AdminChangeInstantPurchaseButtonTextActionGroup.xml b/app/code/Magento/InstantPurchase/Test/Mftf/ActionGroup/AdminChangeInstantPurchaseButtonTextActionGroup.xml
-new file mode 100644
-index 00000000000..b8dda76d871
---- /dev/null
-+++ b/app/code/Magento/InstantPurchase/Test/Mftf/ActionGroup/AdminChangeInstantPurchaseButtonTextActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminChangeInstantPurchaseButtonTextActionGroup">
-+        <arguments>
-+            <argument name="buttonText" type="string" defaultValue="Instant Purchase"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminInstantPurchaseConfigSection.salesInstantPurchaseTab}}" dependentSelector="{{AdminInstantPurchaseConfigSection.salesInstantPurchaseButtonText}}" visible="false" stepKey="expandTab"/>
-+        <click selector="{{AdminInstantPurchaseConfigSection.salesInstantPurchaseButtonTextUseWebsite}}" stepKey="clickUseWebsite"/>
-+        <fillField selector="{{AdminInstantPurchaseConfigSection.salesInstantPurchaseButtonText}}" userInput="{{buttonText}}" stepKey="changeInstantPurchaseButtonText"/>
-+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfigs"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/InstantPurchase/Test/Mftf/ActionGroup/AdminChangeInstantPurchaseStatusActionGroup.xml b/app/code/Magento/InstantPurchase/Test/Mftf/ActionGroup/AdminChangeInstantPurchaseStatusActionGroup.xml
-new file mode 100644
-index 00000000000..ce13ddb46fb
---- /dev/null
-+++ b/app/code/Magento/InstantPurchase/Test/Mftf/ActionGroup/AdminChangeInstantPurchaseStatusActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminChangeInstantPurchaseStatusActionGroup">
-+        <arguments>
-+            <argument name="status" type="string" defaultValue="1"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminInstantPurchaseConfigSection.salesInstantPurchaseTab}}" dependentSelector="{{AdminInstantPurchaseConfigSection.salesInstantPurchaseActive}}" visible="false" stepKey="expandTab"/>
-+        <uncheckOption selector="{{AdminInstantPurchaseConfigSection.salesInstantPurchaseActiveUseWebsite}}" stepKey="uncheckUseSystemValue"/>
-+        <selectOption selector="{{AdminInstantPurchaseConfigSection.salesInstantPurchaseActive}}" userInput="{{status}}" stepKey="changeInstantPurchaseStatus"/>
-+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfigs"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/InstantPurchase/Test/Mftf/ActionGroup/AdminOpenInstantPurchaseConfigPageActionGroup.xml b/app/code/Magento/InstantPurchase/Test/Mftf/ActionGroup/AdminOpenInstantPurchaseConfigPageActionGroup.xml
-new file mode 100644
-index 00000000000..e25e5271dff
---- /dev/null
-+++ b/app/code/Magento/InstantPurchase/Test/Mftf/ActionGroup/AdminOpenInstantPurchaseConfigPageActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenInstantPurchaseConfigPageActionGroup">
-+        <amOnPage url="{{AdminSystemConfigInstantPurchasePage.url}}" stepKey="openInstantPurchaseConfigPage"/>
-+        <waitForPageLoad stepKey="waitForInstantPurchasePageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/InstantPurchase/Test/Mftf/Page/AdminSystemConfigInstantPurchasePage.xml b/app/code/Magento/InstantPurchase/Test/Mftf/Page/AdminSystemConfigInstantPurchasePage.xml
-new file mode 100644
-index 00000000000..ed69e3032e0
---- /dev/null
-+++ b/app/code/Magento/InstantPurchase/Test/Mftf/Page/AdminSystemConfigInstantPurchasePage.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminSystemConfigInstantPurchasePage" url="admin/system_config/edit/section/sales/#sales_instant_purchase-head" area="admin" module="Magento_InstantPurchase">
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/InstantPurchase/Test/Mftf/Section/AdminInstantPurchaseConfigSection.xml b/app/code/Magento/InstantPurchase/Test/Mftf/Section/AdminInstantPurchaseConfigSection.xml
-new file mode 100644
-index 00000000000..5b1c191d228
---- /dev/null
-+++ b/app/code/Magento/InstantPurchase/Test/Mftf/Section/AdminInstantPurchaseConfigSection.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminInstantPurchaseConfigSection">
-+        <element name="salesInstantPurchaseTab" type="button" selector="#sales_instant_purchase-head"/>
-+        <element name="salesInstantPurchaseActive" type="select" selector="#sales_instant_purchase_active"/>
-+        <element name="salesInstantPurchaseActiveUseWebsite" type="select" selector="#sales_instant_purchase_active_inherit"/>
-+        <element name="salesInstantPurchaseButtonText" type="text" selector="#sales_instant_purchase_button_text"/>
-+        <element name="salesInstantPurchaseButtonTextUseWebsite" type="checkbox" selector="#sales_instant_purchase_button_text_inherit"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/InstantPurchase/Test/Mftf/Section/StorefrontInstantPurchasePopupSection.xml b/app/code/Magento/InstantPurchase/Test/Mftf/Section/StorefrontInstantPurchasePopupSection.xml
-new file mode 100644
-index 00000000000..8e93d049ea1
---- /dev/null
-+++ b/app/code/Magento/InstantPurchase/Test/Mftf/Section/StorefrontInstantPurchasePopupSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontInstantPurchasePopupSection">
-+        <element name="modalTitle" type="text" selector=".modal-popup .modal-title"/>
-+        <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/InstantPurchase/Test/Mftf/Section/StorefrontInstantPurchaseSection.xml b/app/code/Magento/InstantPurchase/Test/Mftf/Section/StorefrontInstantPurchaseSection.xml
-new file mode 100644
-index 00000000000..1124fe0aa79
---- /dev/null
-+++ b/app/code/Magento/InstantPurchase/Test/Mftf/Section/StorefrontInstantPurchaseSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontInstantPurchaseSection">
-+        <element name="instantPurchaseButton" type="button" selector="button.instant-purchase"/>
-+        <element name="instantPurchaseButtonName" type="text" selector="button.instant-purchase span"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml b/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml
-index 4b7a6029507..76785c023ed 100644
---- a/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml
-+++ b/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml
-@@ -10,7 +10,7 @@
-         <section id="sales">
-             <group id="instant_purchase" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Instant Purchase</label>
--                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="active" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Enabled</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                     <comment>Payment method with vault and instant purchase support should be enabled.</comment>
-diff --git a/app/code/Magento/InstantPurchase/view/frontend/templates/button.phtml b/app/code/Magento/InstantPurchase/view/frontend/templates/button.phtml
-index d58b950f611..8d407a3138b 100644
---- a/app/code/Magento/InstantPurchase/view/frontend/templates/button.phtml
-+++ b/app/code/Magento/InstantPurchase/view/frontend/templates/button.phtml
-@@ -14,8 +14,8 @@
- <script type="text/x-magento-init">
-     {
-         "#instant-purchase": {
--            "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout();?>
-+            "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout();?>
-         }
-     }
- </script>
--<?php endif; ?>
-\ No newline at end of file
-+<?php endif; ?>
-diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
-index cc08796d98e..d8684e635b9 100644
---- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
-+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
-@@ -78,7 +78,7 @@ class Info extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
-     }
- 
-     /**
--     * Returns status flag about this tab can be showen or not
-+     * Returns status flag about this tab can be shown or not
-      *
-      * @return true
-      */
-diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
-index 36073af5632..4ce462bb44c 100644
---- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
-+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
-@@ -6,11 +6,12 @@
-  */
- namespace Magento\Integration\Controller\Adminhtml\Integration;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
- use Magento\Framework\Exception\IntegrationException;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Delete extends \Magento\Integration\Controller\Adminhtml\Integration
-+class Delete extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpPostActionInterface
- {
-     /**
-      * Delete the integration.
-diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
-index 97cd7b46e08..599b6017059 100644
---- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
-+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
-@@ -6,11 +6,12 @@
-  */
- namespace Magento\Integration\Controller\Adminhtml\Integration;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
- use Magento\Framework\Exception\IntegrationException;
- 
--class Edit extends \Magento\Integration\Controller\Adminhtml\Integration
-+class Edit extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface
- {
-     /**
-      * Edit integration action.
-diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php
-index bd10873a59f..f3ad4306db5 100644
---- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php
-+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php
-@@ -6,7 +6,11 @@
-  */
- namespace Magento\Integration\Controller\Adminhtml\Integration;
- 
--class Grid extends \Magento\Integration\Controller\Adminhtml\Integration
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Integration\Controller\Adminhtml\Integration as IntegrationAction;
-+
-+class Grid extends IntegrationAction implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * AJAX integrations grid.
-diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php
-index 2caf9054ce3..131e1e14947 100644
---- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php
-+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Integration\Controller\Adminhtml\Integration;
- 
--class Index extends \Magento\Integration\Controller\Adminhtml\Integration
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface
- {
-     /**
-      * Integrations grid.
-diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php
-index e05d559aa1c..7354b22ccf4 100644
---- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php
-+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Integration\Controller\Adminhtml\Integration;
- 
--class NewAction extends \Magento\Integration\Controller\Adminhtml\Integration
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class NewAction extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface
- {
-     /**
-      * New integration action.
-diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
-index 8c2e10ebf1f..8b2a94da01d 100644
---- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
-+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Integration\Controller\Adminhtml\Integration;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\Exception\IntegrationException;
- 
--class PermissionsDialog extends \Magento\Integration\Controller\Adminhtml\Integration
-+class PermissionsDialog extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface
- {
-     /**
-      * Show permissions popup.
-diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
-index cb2fcb2ba0e..8bcbb456534 100644
---- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
-+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Integration\Controller\Adminhtml\Integration;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
- use Magento\Framework\Exception\IntegrationException;
- use Magento\Framework\Exception\LocalizedException;
-@@ -17,7 +18,7 @@ use Magento\Security\Model\SecurityCookie;
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Save extends \Magento\Integration\Controller\Adminhtml\Integration
-+class Save extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpPostActionInterface
- {
-     /**
-      * @var SecurityCookie
-diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
-index dcea6da3212..4c99dafb1d9 100644
---- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
-+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Integration\Controller\Adminhtml\Integration;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Integration\Model\Integration as IntegrationModel;
- 
--class TokensDialog extends \Magento\Integration\Controller\Adminhtml\Integration
-+class TokensDialog extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface
- {
-     /**
-      * Set success message based on Integration activation or re-authorization.
-diff --git a/app/code/Magento/Integration/Model/AdminTokenService.php b/app/code/Magento/Integration/Model/AdminTokenService.php
-index 5a030325e9f..7726ff979c6 100644
---- a/app/code/Magento/Integration/Model/AdminTokenService.php
-+++ b/app/code/Magento/Integration/Model/AdminTokenService.php
-@@ -72,7 +72,7 @@ class AdminTokenService implements \Magento\Integration\Api\AdminTokenServiceInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function createAdminAccessToken($username, $password)
-     {
-@@ -110,7 +110,7 @@ class AdminTokenService implements \Magento\Integration\Api\AdminTokenServiceInt
-     {
-         $tokenCollection = $this->tokenModelCollectionFactory->create()->addFilterByAdminId($adminId);
-         if ($tokenCollection->getSize() == 0) {
--            throw new LocalizedException(__('This user has no tokens.'));
-+            return true;
-         }
-         try {
-             foreach ($tokenCollection as $token) {
-diff --git a/app/code/Magento/Integration/Model/Config/Consolidated/Converter.php b/app/code/Magento/Integration/Model/Config/Consolidated/Converter.php
-index 674a97a68d0..c10759d6027 100644
---- a/app/code/Magento/Integration/Model/Config/Consolidated/Converter.php
-+++ b/app/code/Magento/Integration/Model/Config/Consolidated/Converter.php
-@@ -36,7 +36,7 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function convert($source)
-     {
-@@ -80,9 +80,16 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
-                     $result[$integrationName][self::API_RESOURCES][] = $name;
-                 }
-             }
-+
-+            // Add root resource if any child has been added
-+            if (!empty($result[$integrationName][self::API_RESOURCES])) {
-+                array_unshift($result[$integrationName][self::API_RESOURCES], $allResources[1]['id']);
-+            }
-+
-             // Remove any duplicates added parents
--            $result[$integrationName][self::API_RESOURCES] =
--                array_values(array_unique($result[$integrationName][self::API_RESOURCES]));
-+            $result[$integrationName][self::API_RESOURCES] = array_values(
-+                array_unique($result[$integrationName][self::API_RESOURCES])
-+            );
-         }
-         return $result;
-     }
-diff --git a/app/code/Magento/Integration/Model/CustomerTokenService.php b/app/code/Magento/Integration/Model/CustomerTokenService.php
-index 3c245804a9f..7c2c444a734 100644
---- a/app/code/Magento/Integration/Model/CustomerTokenService.php
-+++ b/app/code/Magento/Integration/Model/CustomerTokenService.php
-@@ -14,7 +14,11 @@ use Magento\Integration\Model\Oauth\TokenFactory as TokenModelFactory;
- use Magento\Integration\Model\ResourceModel\Oauth\Token\CollectionFactory as TokenCollectionFactory;
- use Magento\Integration\Model\Oauth\Token\RequestThrottler;
- use Magento\Framework\Exception\AuthenticationException;
-+use Magento\Framework\Event\ManagerInterface;
- 
-+/**
-+ * @inheritdoc
-+ */
- class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServiceInterface
- {
-     /**
-@@ -24,6 +28,11 @@ class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServ
-      */
-     private $tokenModelFactory;
- 
-+    /**
-+     * @var Magento\Framework\Event\ManagerInterface
-+     */
-+    private $eventManager;
-+
-     /**
-      * Customer Account Service
-      *
-@@ -55,21 +64,25 @@ class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServ
-      * @param AccountManagementInterface $accountManagement
-      * @param TokenCollectionFactory $tokenModelCollectionFactory
-      * @param \Magento\Integration\Model\CredentialsValidator $validatorHelper
-+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-      */
-     public function __construct(
-         TokenModelFactory $tokenModelFactory,
-         AccountManagementInterface $accountManagement,
-         TokenCollectionFactory $tokenModelCollectionFactory,
--        CredentialsValidator $validatorHelper
-+        CredentialsValidator $validatorHelper,
-+        ManagerInterface $eventManager = null
-     ) {
-         $this->tokenModelFactory = $tokenModelFactory;
-         $this->accountManagement = $accountManagement;
-         $this->tokenModelCollectionFactory = $tokenModelCollectionFactory;
-         $this->validatorHelper = $validatorHelper;
-+        $this->eventManager = $eventManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(ManagerInterface::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function createCustomerAccessToken($username, $password)
-     {
-@@ -86,6 +99,7 @@ class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServ
-                 )
-             );
-         }
-+        $this->eventManager->dispatch('customer_login', ['customer' => $customerDataObject]);
-         $this->getRequestThrottler()->resetAuthenticationFailuresCount($username, RequestThrottler::USER_TYPE_CUSTOMER);
-         return $this->tokenModelFactory->create()->createCustomerToken($customerDataObject->getId())->getToken();
-     }
-diff --git a/app/code/Magento/Integration/Plugin/Model/AdminUser.php b/app/code/Magento/Integration/Plugin/Model/AdminUser.php
-index df3766250ca..7b2fa1981bc 100644
---- a/app/code/Magento/Integration/Plugin/Model/AdminUser.php
-+++ b/app/code/Magento/Integration/Plugin/Model/AdminUser.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Integration\Plugin\Model;
- 
- use Magento\Integration\Model\AdminTokenService;
-@@ -31,14 +32,15 @@ class AdminUser
-      *
-      * @param \Magento\User\Model\User $subject
-      * @param \Magento\Framework\DataObject $object
--     * @return $this
-+     * @return \Magento\User\Model\User
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function afterSave(
-         \Magento\User\Model\User $subject,
-         \Magento\Framework\DataObject $object
--    ) {
-+    ): \Magento\User\Model\User {
-         $isActive = $object->getIsActive();
--        if (isset($isActive) && $isActive == 0) {
-+        if ($isActive !== null && $isActive == 0) {
-             $this->adminTokenService->revokeAdminAccessToken($object->getId());
-         }
-         return $subject;
-diff --git a/app/code/Magento/Integration/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Integration/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..be5b3f16ad3
---- /dev/null
-+++ b/app/code/Magento/Integration/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuSystemExtensionsIntegrations">
-+        <data key="pageTitle">Integrations</data>
-+        <data key="title">Integrations</data>
-+        <data key="dataUiId">magento-integration-system-integrations</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Integration/Test/Mftf/Test/AdminSystemIntegrationsNavigateMenuTest.xml b/app/code/Magento/Integration/Test/Mftf/Test/AdminSystemIntegrationsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..3bd149d222c
---- /dev/null
-+++ b/app/code/Magento/Integration/Test/Mftf/Test/AdminSystemIntegrationsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSystemIntegrationsNavigateMenuTest">
-+        <annotations>
-+            <features value="Integration"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin system integrations navigate menu test"/>
-+            <description value="Admin should be able to navigate to System > Integrations"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14149"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToIntegrationsPage">
-+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSystemExtensionsIntegrations.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSystemExtensionsIntegrations.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php b/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php
-index e0b1113e80d..83efe4074e1 100644
---- a/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php
-+++ b/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php
-@@ -8,6 +8,9 @@ namespace Magento\Integration\Test\Unit\Model;
- 
- use Magento\Integration\Model\Oauth\Token;
- 
-+/**
-+ * Test for Magento\Integration\Model\AdminTokenService class.
-+ */
- class AdminTokenServiceTest extends \PHPUnit\Framework\TestCase
- {
-     /** \Magento\Integration\Model\AdminTokenService */
-@@ -99,10 +102,6 @@ class AdminTokenServiceTest extends \PHPUnit\Framework\TestCase
-         $this->assertTrue($this->_tokenService->revokeAdminAccessToken($adminId));
-     }
- 
--    /**
--     * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @expectedExceptionMessage This user has no tokens.
--     */
-     public function testRevokeAdminAccessTokenWithoutAdminId()
-     {
-         $this->_tokenModelCollectionMock->expects($this->once())
-diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php
-index 5b7bbace5a6..42b62acaba5 100644
---- a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php
-+++ b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php
-@@ -6,6 +6,8 @@
- return [
-     [],
-     [
-+        'id' => 'Magento_Backend::admin',
-+        'title' => 'Magento Admin (Root)',
-         'children' =>
-             [
-                 [
-diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.php b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.php
-index 54e05d5ef90..0293492c776 100644
---- a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.php
-+++ b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.php
-@@ -9,6 +9,7 @@ return [
-         'endpoint_url' => 'http://endpoint.com',
-         'identity_link_url' => 'http://www.example.com/identity',
-         'resource' => [
-+            'Magento_Backend::admin',
-             'Magento_Customer::manageParent',
-             'Magento_Customer::manage',
-             'Magento_SalesRule::quoteParent',
-@@ -17,6 +18,9 @@ return [
-     ],
-     'TestIntegration2' => [
-         'email' => 'test-integration2@magento.com',
--        'resource' => ['Magento_Sales::sales']
-+        'resource' => [
-+            'Magento_Backend::admin',
-+            'Magento_Sales::sales'
-+        ]
-     ]
- ];
-diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.xml b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.xml
-index 585fabc2429..f8bcf3fc4a2 100644
---- a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.xml
-+++ b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.xml
-@@ -18,6 +18,7 @@
-     <integration name="TestIntegration2">
-         <email>test-integration2@magento.com</email>
-         <resources>
-+            <resource name="Magento_Backend::admin" />
-             <resource name="Magento_Sales::sales" />
-         </resources>
-     </integration>
-diff --git a/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php b/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php
-index 1a7c8193432..1bc7d424708 100644
---- a/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php
-+++ b/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php
-@@ -32,6 +32,9 @@ class CustomerTokenServiceTest extends \PHPUnit\Framework\TestCase
-     /** @var \Magento\Integration\Model\Oauth\Token|\PHPUnit_Framework_MockObject_MockObject */
-     private $_tokenMock;
- 
-+    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $manager;
-+
-     protected function setUp()
-     {
-         $this->_tokenFactoryMock = $this->getMockBuilder(\Magento\Integration\Model\Oauth\TokenFactory::class)
-@@ -67,11 +70,14 @@ class CustomerTokenServiceTest extends \PHPUnit\Framework\TestCase
-             \Magento\Integration\Model\CredentialsValidator::class
-         )->disableOriginalConstructor()->getMock();
- 
-+        $this->manager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
-+
-         $this->_tokenService = new \Magento\Integration\Model\CustomerTokenService(
-             $this->_tokenFactoryMock,
-             $this->_accountManagementMock,
-             $this->_tokenModelCollectionFactoryMock,
--            $this->validatorHelperMock
-+            $this->validatorHelperMock,
-+            $this->manager
-         );
-     }
- 
-diff --git a/app/code/Magento/Integration/ViewModel/JsonSerializer.php b/app/code/Magento/Integration/ViewModel/JsonSerializer.php
-new file mode 100644
-index 00000000000..3f1df35d34e
---- /dev/null
-+++ b/app/code/Magento/Integration/ViewModel/JsonSerializer.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Integration\ViewModel;
-+
-+/**
-+ * JsonSerializer
-+ */
-+class JsonSerializer implements \Magento\Framework\View\Element\Block\ArgumentInterface
-+{
-+
-+    /**
-+     * @var \Magento\Framework\Serialize\Serializer\Json
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @param \Magento\Framework\Serialize\Serializer\Json $serializer
-+     */
-+    public function __construct(\Magento\Framework\Serialize\Serializer\Json $serializer)
-+    {
-+        $this->serializer = $serializer;
-+    }
-+
-+    /**
-+     * Returns serialized version of data
-+     *
-+     * @param array $data
-+     * @return string
-+     */
-+    public function serialize(array $data): string
-+    {
-+        return $this->serializer->serialize($data);
-+    }
-+}
-diff --git a/app/code/Magento/Integration/etc/adminhtml/system.xml b/app/code/Magento/Integration/etc/adminhtml/system.xml
-index 97aec083e7a..fe80fe10549 100644
---- a/app/code/Magento/Integration/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Integration/etc/adminhtml/system.xml
-@@ -13,48 +13,48 @@
-             <resource>Magento_Integration::config_oauth</resource>
-             <group id="access_token_lifetime" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0">
-                 <label>Access Token Expiration</label>
--                <field id="customer" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="customer" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Customer Token Lifetime (hours)</label>
-                     <comment>We will disable this feature if the value is empty.</comment>
-                 </field>
--                <field id="admin" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="admin" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Admin Token Lifetime (hours)</label>
-                     <comment>We will disable this feature if the value is empty.</comment>
-                 </field>
-             </group>
-             <group id="cleanup" translate="label" type="text" sortOrder="300" showInDefault="1" showInWebsite="0" showInStore="0">
-                 <label>Cleanup Settings</label>
--                <field id="cleanup_probability" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="cleanup_probability" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Cleanup Probability</label>
-                     <comment>Integer. Launch cleanup in X OAuth requests. 0 (not recommended) - to disable cleanup</comment>
-                 </field>
--                <field id="expiration_period" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="expiration_period" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Expiration Period</label>
-                     <comment>Cleanup entries older than X minutes.</comment>
-                 </field>
-             </group>
-             <group id="consumer" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="0" showInStore="0">
-                 <label>Consumer Settings</label>
--                <field id="expiration_period" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="expiration_period" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Expiration Period</label>
-                     <comment>Consumer key/secret will expire if not used within X seconds after Oauth token exchange starts.</comment>
-                 </field>
--                <field id="post_maxredirects" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="post_maxredirects" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>OAuth consumer credentials HTTP Post maxredirects</label>
-                     <comment>Number of maximum redirects for OAuth consumer credentials Post request.</comment>
-                 </field>
--                <field id="post_timeout" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="post_timeout" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>OAuth consumer credentials HTTP Post timeout</label>
-                     <comment>Timeout for OAuth consumer credentials Post request within X seconds.</comment>
-                 </field>
-             </group>
-             <group id="authentication_lock" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="0" showInStore="0">
-                 <label>Authentication Locks</label>
--                <field id="max_failures_count" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="max_failures_count" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Maximum Login Failures to Lock Out Account</label>
-                     <comment>Maximum Number of authentication failures to lock out account.</comment>
-                 </field>
--                <field id="timeout" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="timeout" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Lockout Time (seconds)</label>
-                     <comment>Period of time in seconds after which account will be unlocked.</comment>
-                 </field>
-diff --git a/app/code/Magento/Integration/etc/db_schema.xml b/app/code/Magento/Integration/etc/db_schema.xml
-index 9e81b867d36..cbf43d79b2c 100644
---- a/app/code/Magento/Integration/etc/db_schema.xml
-+++ b/app/code/Magento/Integration/etc/db_schema.xml
-@@ -9,7 +9,7 @@
-         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-     <table name="oauth_consumer" resource="default" engine="innodb" comment="OAuth Consumers">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Created At"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="true" default="0"
-@@ -19,19 +19,19 @@
-         <column xsi:type="varchar" name="secret" nullable="false" length="32" comment="Secret code"/>
-         <column xsi:type="text" name="callback_url" nullable="true" comment="Callback URL"/>
-         <column xsi:type="text" name="rejected_callback_url" nullable="false" comment="Rejected callback URL"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="OAUTH_CONSUMER_KEY">
-+        <constraint xsi:type="unique" referenceId="OAUTH_CONSUMER_KEY">
-             <column name="key"/>
-         </constraint>
--        <constraint xsi:type="unique" name="OAUTH_CONSUMER_SECRET">
-+        <constraint xsi:type="unique" referenceId="OAUTH_CONSUMER_SECRET">
-             <column name="secret"/>
-         </constraint>
--        <index name="OAUTH_CONSUMER_CREATED_AT" indexType="btree">
-+        <index referenceId="OAUTH_CONSUMER_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
--        <index name="OAUTH_CONSUMER_UPDATED_AT" indexType="btree">
-+        <index referenceId="OAUTH_CONSUMER_UPDATED_AT" indexType="btree">
-             <column name="updated_at"/>
-         </index>
-     </table>
-@@ -57,21 +57,21 @@
-                 comment="User type"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Token creation timestamp"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="OAUTH_TOKEN_ADMIN_ID_ADMIN_USER_USER_ID" table="oauth_token"
-+        <constraint xsi:type="foreign" referenceId="OAUTH_TOKEN_ADMIN_ID_ADMIN_USER_USER_ID" table="oauth_token"
-                     column="admin_id" referenceTable="admin_user" referenceColumn="user_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="OAUTH_TOKEN_CONSUMER_ID_OAUTH_CONSUMER_ENTITY_ID" table="oauth_token"
-+        <constraint xsi:type="foreign" referenceId="OAUTH_TOKEN_CONSUMER_ID_OAUTH_CONSUMER_ENTITY_ID" table="oauth_token"
-                     column="consumer_id" referenceTable="oauth_consumer" referenceColumn="entity_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="OAUTH_TOKEN_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID" table="oauth_token"
-+        <constraint xsi:type="foreign" referenceId="OAUTH_TOKEN_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID" table="oauth_token"
-                     column="customer_id" referenceTable="customer_entity" referenceColumn="entity_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="OAUTH_TOKEN_TOKEN">
-+        <constraint xsi:type="unique" referenceId="OAUTH_TOKEN_TOKEN">
-             <column name="token"/>
-         </constraint>
--        <index name="OAUTH_TOKEN_CONSUMER_ID" indexType="btree">
-+        <index referenceId="OAUTH_TOKEN_CONSUMER_ID" indexType="btree">
-             <column name="consumer_id"/>
-         </index>
-     </table>
-@@ -81,14 +81,14 @@
-                 comment="Nonce Timestamp"/>
-         <column xsi:type="int" name="consumer_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Consumer ID"/>
--        <constraint xsi:type="foreign" name="OAUTH_NONCE_CONSUMER_ID_OAUTH_CONSUMER_ENTITY_ID" table="oauth_nonce"
-+        <constraint xsi:type="foreign" referenceId="OAUTH_NONCE_CONSUMER_ID_OAUTH_CONSUMER_ENTITY_ID" table="oauth_nonce"
-                     column="consumer_id" referenceTable="oauth_consumer" referenceColumn="entity_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="OAUTH_NONCE_NONCE_CONSUMER_ID">
-+        <constraint xsi:type="unique" referenceId="OAUTH_NONCE_NONCE_CONSUMER_ID">
-             <column name="nonce"/>
-             <column name="consumer_id"/>
-         </constraint>
--        <index name="OAUTH_NONCE_TIMESTAMP" indexType="btree">
-+        <index referenceId="OAUTH_NONCE_TIMESTAMP" indexType="btree">
-             <column name="timestamp"/>
-         </index>
-     </table>
-@@ -107,22 +107,22 @@
-                 comment="Oauth consumer"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Creation Time"/>
--        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="0"
-+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Update Time"/>
-         <column xsi:type="smallint" name="setup_type" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Integration type - manual or config file"/>
-         <column xsi:type="varchar" name="identity_link_url" nullable="true" length="255"
-                 comment="Identity linking Url"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="integration_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="INTEGRATION_CONSUMER_ID_OAUTH_CONSUMER_ENTITY_ID" table="integration"
-+        <constraint xsi:type="foreign" referenceId="INTEGRATION_CONSUMER_ID_OAUTH_CONSUMER_ENTITY_ID" table="integration"
-                     column="consumer_id" referenceTable="oauth_consumer" referenceColumn="entity_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="INTEGRATION_NAME">
-+        <constraint xsi:type="unique" referenceId="INTEGRATION_NAME">
-             <column name="name"/>
-         </constraint>
--        <constraint xsi:type="unique" name="INTEGRATION_CONSUMER_ID">
-+        <constraint xsi:type="unique" referenceId="INTEGRATION_CONSUMER_ID">
-             <column name="consumer_id"/>
-         </constraint>
-     </table>
-@@ -136,12 +136,12 @@
-                 comment="User type (admin or customer)"/>
-         <column xsi:type="smallint" name="failures_count" padding="5" unsigned="true" nullable="true" identity="false"
-                 default="0" comment="Number of failed authentication attempts in a row"/>
--        <column xsi:type="timestamp" name="lock_expires_at" on_update="true" nullable="true" default="CURRENT_TIMESTAMP"
-+        <column xsi:type="timestamp" name="lock_expires_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Lock expiration time"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="log_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="OAUTH_TOKEN_REQUEST_LOG_USER_NAME_USER_TYPE">
-+        <constraint xsi:type="unique" referenceId="OAUTH_TOKEN_REQUEST_LOG_USER_NAME_USER_TYPE">
-             <column name="user_name"/>
-             <column name="user_type"/>
-         </constraint>
-diff --git a/app/code/Magento/Integration/etc/webapi_rest/events.xml b/app/code/Magento/Integration/etc/webapi_rest/events.xml
-new file mode 100644
-index 00000000000..e9786987342
---- /dev/null
-+++ b/app/code/Magento/Integration/etc/webapi_rest/events.xml
-@@ -0,0 +1,12 @@
-+<?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="customer_login">
-+        <observer name="customer_log_login" instance="Magento\Customer\Observer\LogLastLoginAtObserver" />
-+    </event>
-+</config>
-diff --git a/app/code/Magento/Integration/etc/webapi_soap/events.xml b/app/code/Magento/Integration/etc/webapi_soap/events.xml
-new file mode 100644
-index 00000000000..e9786987342
---- /dev/null
-+++ b/app/code/Magento/Integration/etc/webapi_soap/events.xml
-@@ -0,0 +1,12 @@
-+<?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="customer_login">
-+        <observer name="customer_log_login" instance="Magento\Customer\Observer\LogLastLoginAtObserver" />
-+    </event>
-+</config>
-diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid_block.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid_block.xml
-index 506f836f995..43b67d6904f 100644
---- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid_block.xml
-+++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid_block.xml
-@@ -13,7 +13,7 @@
-             <block class="Magento\Integration\Block\Adminhtml\Integration\Grid" name="integration.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">integrationGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Integration\Model\ResourceModel\Integration\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Integration\Model\ResourceModel\Integration\Collection</argument>
-                     <argument name="use_ajax" xsi:type="string">1</argument>
-                     <argument name="default_sort" xsi:type="string">integration_id</argument>
-                     <argument name="default_dir" xsi:type="string">asc</argument>
-diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml
-index 3264b640c88..d51ac9e41ba 100644
---- a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml
-+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml
-@@ -7,10 +7,8 @@
-  *
-  * @var \Magento\Backend\Block\Widget\Form\Container $block
-  */
--
--// @codingStandardsIgnoreFile
- ?>
--<div><p><?= /* @escapeNotVerified */ __('The integration you selected asks you to approve access to the following:') ?></p></div>
-+<div><p><?= $block->escapeHtml(__('The integration you selected asks you to approve access to the following:')) ?></p></div>
- <div id="integration-activate-permissions-tabs">
-     <?= $block->getChildHtml('tabs') ?>
- </div>
-diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
-index 2a0ac30d67d..1730509a659 100644
---- a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
-+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
-@@ -7,14 +7,11 @@
-  *
-  * @var \Magento\Integration\Block\Adminhtml\Integration\Activate\Permissions\Tab\Webapi $block
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <fieldset class="admin__fieldset form-inline entry-edit">
--    <?php if ($block->isTreeEmpty()): ?>
--        <p class="empty"><?= /* @escapeNotVerified */ __('No permissions requested') ?></p>
--    <?php else: ?>
-+    <?php if ($block->isTreeEmpty()) : ?>
-+        <p class="empty"><?= $block->escapeHtml(__('No permissions requested')) ?></p>
-+    <?php else : ?>
-         <div class="field" data-role="tree-resources-container">
-             <div class="control">
-                 <div id="resource-tree" class="tree x-tree" data-role="resource-tree"></div>
-@@ -22,7 +19,7 @@
-         </div>
-     <?php endif ?>
- </fieldset>
--<?php if (!$block->isTreeEmpty()): ?>
-+<?php if (!$block->isTreeEmpty()) : ?>
-     <script>
-         require(["jquery", "Magento_User/js/roles-tree"], function($){
-             $.widget('mage.rolesTree', $.mage.rolesTree, {
-@@ -35,8 +32,8 @@
-             });
- 
-             $('[data-role="resource-tree"]').rolesTree({
--                'treeInitData': <?= /* @escapeNotVerified */ $block->getResourcesTreeJson() ?>,
--                'treeInitSelectedData': <?= /* @escapeNotVerified */ $block->getSelectedResourcesJson() ?>
-+                'treeInitData': <?= /* @noEscape */ $block->getResourcesTreeJson() ?>,
-+                'treeInitSelectedData': <?= /* @noEscape */ $block->getSelectedResourcesJson() ?>
-             });
-         });
-     </script>
-diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
-index 8b7e787337e..ef0a667d2de 100644
---- a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
-+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
-@@ -7,23 +7,45 @@
-  *
-  * @var \Magento\Backend\Block\Template $block
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <script>
-     require([
-         "jquery",
-         'Magento_Ui/js/modal/confirm',
-         "jquery/ui",
--        "Magento_Integration/js/integration"
-+        "Magento_Integration/js/integration",
-+        'mage/dataPost'
-     ], function ($, Confirm) {
- 
-         window.integration = new Integration(
--            '<?= /* @escapeNotVerified */ $block->getUrl('*/*/permissionsDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]) ?>',
--            '<?= /* @escapeNotVerified */ $block->getUrl('*/*/tokensDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]) ?>',
--            '<?= /* @escapeNotVerified */ $block->getUrl('*/*/tokensExchange', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]) ?>',
--            '<?= /* @escapeNotVerified */ $block->getUrl('*/*') ?>',
--            '<?= /* @escapeNotVerified */ $block->getUrl('*/*/loginSuccessCallback') ?>'
-+            '<?= $block->escapeUrl(
-+                $block->getUrl(
-+                    '*/*/permissionsDialog',
-+                    ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
-+                )
-+            ) ?>',
-+            '<?= $block->escapeUrl(
-+                $block->getUrl(
-+                    '*/*/tokensDialog',
-+                    ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
-+                )
-+            ) ?>',
-+            '<?= $block->escapeUrl(
-+                $block->getUrl(
-+                    '*/*/tokensExchange',
-+                    ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
-+                )
-+            ) ?>',
-+            '<?= $block->escapeUrl(
-+                $block->getUrl(
-+                    '*/*'
-+                )
-+            ) ?>',
-+            '<?= $block->escapeUrl(
-+                $block->getUrl(
-+                    '*/*/loginSuccessCallback'
-+                )
-+            ) ?>'
-         );
- 
-         /**
-@@ -33,11 +55,11 @@
-             $('div#integrationGrid').on('click', 'button#delete', function (e) {
- 
-                 new Confirm({
--                    title: '<?= /* @escapeNotVerified */ __('Are you sure?') ?>',
--                    content: "<?= /* @escapeNotVerified */ __("Are you sure you want to delete this integration? You can't undo this action.") ?>",
-+                    title: '<?= $block->escapeHtml(__('Are you sure?')) ?>',
-+                    content: "<?= $block->escapeHtml(__("Are you sure you want to delete this integration? You can't undo this action.")) ?>",
-                     actions: {
-                         confirm: function () {
--                            window.location.href = $(e.target).data('url');
-+                            $.mage.dataPost().postData({action: $(e.target).data('url'), data: {}});
-                         }
-                     }
-                 });
-@@ -47,4 +69,4 @@
-     });
- </script>
- 
--<div id="integration-popup-container" style="display: none;"></div>
-\ No newline at end of file
-+<div id="integration-popup-container" style="display: none;"></div>
-diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml
-index c8e4c914b7c..e1d85ec5361 100644
---- a/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml
-+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml
-@@ -7,8 +7,5 @@
-  *
-  * @var \Magento\Backend\Block\Template $block
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<div><p><?= /* @escapeNotVerified */ __("Please setup or sign in into your 3rd party account to complete setup of this integration.") ?></p></div>
-+<div><p><?= $block->escapeHtml(__("Please setup or sign in into your 3rd party account to complete setup of this integration.")) ?></p></div>
-diff --git a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
-index 00f78226b6a..7d6c27954d8 100644
---- a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
-+++ b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
-@@ -4,11 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
--
--<?php
- /** @var $block \Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Webapi */
- ?>
- 
-@@ -16,32 +11,41 @@
- 
- <fieldset class="fieldset form-inline entry-edit">
-     <legend class="legend">
--        <span><?= /* @escapeNotVerified */ __('Available APIs') ?></span>
-+        <span><?= $block->escapeHtml(__('Available APIs')) ?></span>
-     </legend><br />
- 
-     <div class="field">
--        <label class="label" for="all_resources"><span><?= /* @escapeNotVerified */ __('Resource Access') ?></span></label>
-+        <label class="label" for="all_resources"><span><?= $block->escapeHtml(__('Resource Access')) ?></span></label>
- 
-         <div class="control">
--            <select id="all_resources" name="all_resources" onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
--                <option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>><?= /* @escapeNotVerified */ __('Custom') ?></option>
--                <option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>><?= /* @escapeNotVerified */ __('All') ?></option>
-+            <select id="all_resources" name="all_resources"
-+                    onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
-+                <option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>>
-+                    <?= $block->escapeHtml(__('Custom')) ?>
-+                </option>
-+                <option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>>
-+                    <?= $block->escapeHtml(__('All')) ?>
-+                </option>
-             </select>
-         </div>
-     </div>
- 
--    <div class="field<?php if ($block->isEverythingAllowed()):?> no-display<?php endif?>" data-role="tree-resources-container">
--        <label class="label"><span><?= /* @escapeNotVerified */ __('Resources') ?></span></label>
-+    <div class="field
-+        <?php if ($block->isEverythingAllowed()) :?>
-+            no-display
-+        <?php endif ?>"
-+         data-role="tree-resources-container">
-+        <label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
- 
-         <div class="control">
--            <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?php
--            echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([
--                'rolesTree' => [
--                    "treeInitData" => $block->getTree(),
--                    "treeInitSelectedData" => $block->getSelectedResources(),
--                ],
--            ]));
--            ?>'></div>
-+            <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?= /* @noEscape */
-+                $block->getJsonSerializer()->serialize([
-+                    'rolesTree' => [
-+                        "treeInitData" => $block->getTree(),
-+                        "treeInitSelectedData" => $block->getSelectedResources(),
-+                    ],
-+                ]); ?>'>
-+            </div>
-         </div>
-     </div>
- </fieldset>
-diff --git a/app/code/Magento/Integration/view/adminhtml/web/js/integration.js b/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
-index 6921f645a23..a2acc40c6b8 100644
---- a/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
-+++ b/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
-@@ -187,7 +187,7 @@ define([
-             },
- 
-             /**
--             * Function to check the location of the child popoup window.
-+             * Function to check the location of the child popup window.
-              * Once detected if the callback is successful, parent window will be reloaded
-              */
-             fnCheckLocation: function () {
-diff --git a/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php b/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
-index 6b64610caf5..0b9cb377d1d 100644
---- a/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
-+++ b/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
-@@ -8,9 +8,12 @@
- namespace Magento\LayeredNavigation\Observer\Edit\Tab\Front;
- 
- use Magento\Config\Model\Config\Source;
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\Framework\Event\ObserverInterface;
- 
-+/**
-+ * Observer for Product Attribute Form
-+ */
- class ProductAttributeFormBuildFrontTabObserver implements ObserverInterface
- {
-     /**
-@@ -19,21 +22,23 @@ class ProductAttributeFormBuildFrontTabObserver implements ObserverInterface
-     protected $optionList;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-     /**
--     * @param Manager $moduleManager
-+     * @param ModuleManagerInterface $moduleManager
-      * @param Source\Yesno $optionList
-      */
--    public function __construct(Manager $moduleManager, Source\Yesno $optionList)
-+    public function __construct(ModuleManagerInterface $moduleManager, Source\Yesno $optionList)
-     {
-         $this->optionList = $optionList;
-         $this->moduleManager = $moduleManager;
-     }
- 
-     /**
-+     * Execute
-+     *
-      * @param \Magento\Framework\Event\Observer $observer
-      * @return void
-      */
-@@ -54,8 +59,12 @@ class ProductAttributeFormBuildFrontTabObserver implements ObserverInterface
-             [
-                 'name' => 'is_filterable',
-                 'label' => __("Use in Layered Navigation"),
--                'title' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price'),
--                'note' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price.'),
-+                'title' => __('Can be used only with catalog input type Yes/No, Dropdown, Multiple Select and Price'),
-+                'note' => __(
-+                    'Can be used only with catalog input type Yes/No, Dropdown, Multiple Select and Price.
-+                    <br>Price is not compatible with <b>\'Filterable (no results)\'</b> option - 
-+                     it will make no affect on Price filter.'
-+                ),
-                 'values' => [
-                     ['value' => '0', 'label' => __('No')],
-                     ['value' => '1', 'label' => __('Filterable (with results)')],
-@@ -70,8 +79,8 @@ class ProductAttributeFormBuildFrontTabObserver implements ObserverInterface
-             [
-                 'name' => 'is_filterable_in_search',
-                 'label' => __("Use in Search Results Layered Navigation"),
--                'title' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price'),
--                'note' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price.'),
-+                'title' => __('Can be used only with catalog input type Yes/No, Dropdown, Multiple Select and Price'),
-+                'note' => __('Can be used only with catalog input type Yes/No, Dropdown, Multiple Select and Price.'),
-                 'values' => $this->optionList->toOptionArray(),
-             ]
-         );
-diff --git a/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php b/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php
-index 0f1c95df531..b98230c1ebe 100644
---- a/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php
-+++ b/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php
-@@ -7,25 +7,32 @@
-  */
- namespace Magento\LayeredNavigation\Observer\Grid;
- 
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\Framework\Event\ObserverInterface;
- 
-+/**
-+ * Product attribute grid build observer
-+ */
- class ProductAttributeGridBuildObserver implements ObserverInterface
- {
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-     /**
--     * @param Manager $moduleManager
-+     * Construct.
-+     *
-+     * @param ModuleManagerInterface $moduleManager
-      */
--    public function __construct(Manager $moduleManager)
-+    public function __construct(ModuleManagerInterface $moduleManager)
-     {
-         $this->moduleManager = $moduleManager;
-     }
- 
-     /**
-+     * Execute.
-+     *
-      * @param \Magento\Framework\Event\Observer $observer
-      * @return void
-      */
-diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml
-new file mode 100644
-index 00000000000..1e4137beacd
---- /dev/null
-+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="LayeredNavigationSection">
-+        <element name="layeredNavigation" type="select" selector="#catalog_layered_navigation-head"/>
-+        <element name="layeredNavigationBlock" type="block" selector="#catalog_layered_navigation"/>
-+        <element name="CheckIfTabExpand" type="button" selector="#catalog_layered_navigation-head:not(.open)"/>
-+        <element name="NavigationStepCalculation" type="button" selector="#catalog_layered_navigation_price_range_calculation"/>
-+        <element name="NavigationStepCalculationSystemValue" type="button" selector="#catalog_layered_navigation_price_range_calculation_inherit"/>
-+        <element name="PriceNavigationStep" type="button" selector="#catalog_layered_navigation_price_range_step"/>
-+        <element name="PriceNavigationStepSystemValue" type="button" selector="#catalog_layered_navigation_price_range_step_inherit"/>
-+    </section>
-+
-+    <section name="StorefrontLayeredNavigationSection">
-+        <element name="shoppingOptionsByName" type="button" selector="//*[text()='Shopping Options']/..//*[contains(text(),'{{arg}}')]" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminSpecifyLayerNavigationConfigurationTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminSpecifyLayerNavigationConfigurationTest.xml
-new file mode 100644
-index 00000000000..fd8763891af
---- /dev/null
-+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminSpecifyLayerNavigationConfigurationTest.xml
-@@ -0,0 +1,54 @@
-+<?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="AdminSpecifyLayerNavigationConfigurationTest">
-+        <annotations>
-+            <features value="LayerNavigation"/>
-+            <group value="LayerNavigation"/>
-+            <stories value="Magento_LayeredNavigation"/>
-+            <title value="Admin should be able to uncheck Default Value checkbox for dependent field"/>
-+            <description value="Admin should be able to uncheck Default Value checkbox for dependent field"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-12604"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-+        </before>
-+
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Configure Layered Navigation in Stores -> Configuration -> Catalog -> Layered Navigation -->
-+        <amOnPage url="{{CatalogConfigPage.url}}" stepKey="navigateToConfigurationPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <conditionalClick selector="{{LayeredNavigationSection.layeredNavigation}}" dependentSelector="{{LayeredNavigationSection.CheckIfTabExpand}}" visible="true" stepKey="expandLayeredNavigationTab"/>
-+        <waitForElementVisible selector="{{LayeredNavigationSection.NavigationStepCalculationSystemValue}}" stepKey="waitForUseSystemValueVisible"/>
-+
-+        <!-- Display Product Count = yes; Price Navigation Step Calculation = Manual; Default Price Navigation Step = 102 -->
-+        <uncheckOption selector="{{LayeredNavigationSection.NavigationStepCalculationSystemValue}}" stepKey="uncheckUseSystemValue"/>
-+        <selectOption selector="{{LayeredNavigationSection.NavigationStepCalculation}}" userInput="Manual" stepKey="selectOption"/>
-+        <uncheckOption selector="{{LayeredNavigationSection.PriceNavigationStepSystemValue}}" stepKey="uncheckUseStepSystemValue"/>
-+        <fillField selector="{{LayeredNavigationSection.PriceNavigationStep}}" userInput="102" stepKey="fillPriceNavStep"/>
-+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
-+        <waitForPageLoad stepKey="waitForSavingSystemConfiguration"/>
-+
-+        <waitForElementVisible selector="{{LayeredNavigationSection.layeredNavigationBlock}}" stepKey="waitForLayeredNav"/>
-+        <scrollTo selector="{{LayeredNavigationSection.layeredNavigationBlock}}" x="0" y="-80" stepKey="scrollToLayeredNavigation"/>
-+        <seeInField userInput="102" selector="{{LayeredNavigationSection.PriceNavigationStep}}" stepKey="seeThatValueWasSaved"/>
-+
-+        <!-- It is possible uncheck Use Default checkbox -->
-+        <checkOption selector="{{LayeredNavigationSection.NavigationStepCalculationSystemValue}}" stepKey="setStepCalculationToDefaultValue"/>
-+        <checkOption selector="{{LayeredNavigationSection.PriceNavigationStepSystemValue}}" stepKey="setPriceNavToDefaultValue"/>
-+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfiguration" />
-+        <waitForPageLoad stepKey="waitForSaveSystemConfiguration"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml
-new file mode 100644
-index 00000000000..721942f58f7
---- /dev/null
-+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml
-@@ -0,0 +1,61 @@
-+<?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="ShopByButtonInMobile">
-+        <annotations>
-+            <features value="Layered Navigation"/>
-+            <stories value="Storefront Shop By collapsible button in mobile themes"/>
-+            <title value="Storefront Shop By collapsible button works in a mobile theme"/>
-+            <description value="Storefront Shop By collapsible button should work in a mobile theme"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-6092"/>
-+            <group value="LayeredNavigation"/>
-+        </annotations>
-+        <before>
-+            <createData entity="productDropDownAttribute" stepKey="attribute"/>
-+            <createData entity="productAttributeOption1" stepKey="option1">
-+                <requiredEntity createDataKey="attribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="attributeSet">
-+                <requiredEntity createDataKey="attribute"/>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="attribute" stepKey="deleteAttribute"/>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-+            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
-+        </after>
-+        <!-- Go to default attribute set edit page and add the product attribute to the set -->
-+        <comment userInput="Go to default attribute set edit page and add the product attribute to the set" stepKey="commentAttributeSetEdit" />
-+        <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/{{AddToDefaultSet.attributeSetId}}/" stepKey="onAttributeSetEdit"/>
-+        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute($$attribute.attribute[attribute_code]$$)}}" selector2="{{AdminProductAttributeSetSection.attribute('Product Details')}}" stepKey="assignTestAttributes"/>
-+        <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickAttributeSetSave"/>
-+        <!-- Go to simple product edit page and set the product attribute to a value -->
-+        <comment userInput="Go to simple product edit page and set the product attribute to a value" stepKey="commentProductAttributeEdit" />
-+        <amOnPage url="{{AdminProductEditPage.url($$simpleProduct1.id$$)}}" stepKey="goToEditPage"/>
-+        <selectOption selector="{{AdminProductFormSection.customSelectField($$attribute.attribute[attribute_code]$$)}}" userInput="option1" stepKey="selectAttribute"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
-+        <!-- Check storefront mobile view for shop by button is functioning as expected -->
-+        <comment userInput="Check storefront mobile view for shop by button is functioning as expected" stepKey="commentCheckShopByButton" />
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
-+        <waitForPageLoad stepKey="waitForHomePageToLoad"/>
-+        <submitForm selector="#search_mini_form" parameterArray="['q' => 'Test Simple Product']" stepKey="fillSearchBar" />
-+        <resizeWindow width="600" height="800" stepKey="resizeWindow"/>
-+        <waitForPageLoad stepKey="waitForHomePageToLoad2"/>
-+        <seeElement selector="{{StorefrontCategorySidebarMobileSection.shopByButton}}" stepKey="seeShopByButton"/>
-+        <click selector="{{StorefrontCategorySidebarMobileSection.shopByButton}}" stepKey="clickShopByButton"/>
-+        <seeElement selector="{{StorefrontCategorySidebarSection.filterOptionsTitle('$$attribute.attribute[default_label]$$')}}" stepKey="seeShopByOption"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml b/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml
-index e9bf7933b94..8d3f70c2806 100644
---- a/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml
-+++ b/app/code/Magento/LayeredNavigation/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="catalog" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-+        <section id="catalog" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-             <group id="layered_navigation" translate="label" sortOrder="490" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Layered Navigation</label>
-                 <field id="display_product_count" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-@@ -20,7 +20,7 @@
-                 </field>
-                 <field id="price_range_step" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Default Price Navigation Step</label>
--                    <validate>validate-number validate-number-range number-range-0.01-1000000000</validate>
-+                    <validate>validate-number validate-number-range number-range-0.01-9999999999999999</validate>
-                     <depends>
-                         <field id="price_range_calculation">manual</field>
-                     </depends>
-diff --git a/app/code/Magento/LayeredNavigation/view/adminhtml/ui_component/product_attribute_add_form.xml b/app/code/Magento/LayeredNavigation/view/adminhtml/ui_component/product_attribute_add_form.xml
-index 000e10197af..0d7476081d1 100644
---- a/app/code/Magento/LayeredNavigation/view/adminhtml/ui_component/product_attribute_add_form.xml
-+++ b/app/code/Magento/LayeredNavigation/view/adminhtml/ui_component/product_attribute_add_form.xml
-@@ -11,6 +11,7 @@
-             <argument name="data" xsi:type="array">
-                 <item name="config" xsi:type="array">
-                     <item name="valuesForEnable" xsi:type="array">
-+                        <item name="boolean" xsi:type="string">boolean</item>
-                         <item name="select" xsi:type="string">select</item>
-                         <item name="multiselect" xsi:type="string">multiselect</item>
-                         <item name="price" xsi:type="string">price</item>
-@@ -19,7 +20,7 @@
-                 </item>
-             </argument>
-             <settings>
--                <notice translate="true">Can be used only with catalog input type Dropdown, Multiple Select and Price.</notice>
-+                <notice translate="true">Can be used only with catalog input type Yes/No (Boolean), Dropdown, Multiple Select and Price.</notice>
-                 <dataType>string</dataType>
-                 <label translate="true">Use in Layered Navigation</label>
-                 <dataScope>is_filterable</dataScope>
-@@ -36,6 +37,7 @@
-             <argument name="data" xsi:type="array">
-                 <item name="config" xsi:type="array">
-                     <item name="valuesForEnable" xsi:type="array">
-+                        <item name="boolean" xsi:type="string">boolean</item>
-                         <item name="select" xsi:type="string">select</item>
-                         <item name="multiselect" xsi:type="string">multiselect</item>
-                         <item name="price" xsi:type="string">price</item>
-@@ -45,7 +47,7 @@
-                 </item>
-             </argument>
-             <settings>
--                <notice translate="true">Can be used only with catalog input type Dropdown, Multiple Select and Price.</notice>
-+                <notice translate="true">Can be used only with catalog input type Yes/No (Boolean), Dropdown, Multiple Select and Price.</notice>
-                 <label translate="true">Use in Search Results Layered Navigation</label>
-                 <dataScope>is_filterable_in_search</dataScope>
-                 <imports>
-diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
-index fab89973d90..cd04b346b16 100644
---- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
-+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php
- /**
-@@ -16,21 +15,29 @@
- ?>
- 
- <ol class="items">
--    <?php foreach ($filterItems as $filterItem): ?>
-+    <?php foreach ($filterItems as $filterItem) : ?>
-         <li class="item">
--            <?php if ($filterItem->getCount() > 0): ?>
-+            <?php if ($filterItem->getCount() > 0) : ?>
-                 <a href="<?= $block->escapeUrl($filterItem->getUrl()) ?>">
--                    <?= /* @escapeNotVerified */ $filterItem->getLabel() ?>
--                    <?php if ($this->helper('\Magento\Catalog\Helper\Data')->shouldDisplayProductCountOnLayer()): ?>
--                        <span class="count"><?= /* @escapeNotVerified */ $filterItem->getCount() ?><span class="filter-count-label">
--                            <?php if ($filterItem->getCount() == 1):?> <?= /* @escapeNotVerified */ __('item') ?><?php else:?> <?= /* @escapeNotVerified */ __('items') ?><?php endif;?></span></span>
-+                    <?= /* @noEscape */ $filterItem->getLabel() ?>
-+                    <?php if ($this->helper(\Magento\Catalog\Helper\Data::class)->shouldDisplayProductCountOnLayer()) : ?>
-+                        <span class="count"><?= /* @noEscape */ (int)$filterItem->getCount() ?><span class="filter-count-label">
-+                            <?php if ($filterItem->getCount() == 1) :
-+                                ?> <?= $block->escapeHtml(__('item')) ?><?php
-+                            else :
-+                                ?> <?= $block->escapeHtml(__('item')) ?><?php
-+                            endif;?></span></span>
-                     <?php endif; ?>
-                 </a>
--            <?php else:?>
--                <?= /* @escapeNotVerified */ $filterItem->getLabel() ?>
--                <?php if ($this->helper('\Magento\Catalog\Helper\Data')->shouldDisplayProductCountOnLayer()): ?>
--                    <span class="count"><?= /* @escapeNotVerified */ $filterItem->getCount() ?><span class="filter-count-label">
--                        <?php if ($filterItem->getCount() == 1):?><?= /* @escapeNotVerified */ __('item') ?><?php else:?><?= /* @escapeNotVerified */ __('items') ?><?php endif;?></span></span>
-+            <?php else :?>
-+                <?= /* @noEscape */ $filterItem->getLabel() ?>
-+                <?php if ($this->helper(\Magento\Catalog\Helper\Data::class)->shouldDisplayProductCountOnLayer()) : ?>
-+                    <span class="count"><?= /* @noEscape */ (int)$filterItem->getCount() ?><span class="filter-count-label">
-+                        <?php if ($filterItem->getCount() == 1) :
-+                            ?><?= $block->escapeHtml(__('items')) ?><?php
-+                        else :
-+                            ?><?= $block->escapeHtml(__('items')) ?><?php
-+                        endif;?></span></span>
-                 <?php endif; ?>
-             <?php endif; ?>
-         </li>
-diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
-index 603f2f93ff7..ebdb6f4d565 100644
---- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
-+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -15,35 +12,35 @@
-  */
- ?>
- <?php $_filters = $block->getActiveFilters() ?>
--<?php if (!empty($_filters)): ?>
-+<?php if (!empty($_filters)) : ?>
- <div class="filter-current">
-     <strong class="block-subtitle filter-current-subtitle"
-             role="heading"
-             aria-level="2"
--            data-count="<?= count($_filters) ?>"><?= /* @escapeNotVerified */ __('Now Shopping by') ?></strong>
-+            data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $block->escapeHtml(__('Now Shopping by')) ?></strong>
-     <ol class="items">
--        <?php foreach ($_filters as $_filter): ?>
-+        <?php foreach ($_filters as $_filter) : ?>
-             <li class="item">
-                 <span class="filter-label"><?= $block->escapeHtml(__($_filter->getName())) ?></span>
--                <span class="filter-value"><?= /* @escapeNotVerified */ $block->stripTags($_filter->getLabel()) ?></span>
-+                <span class="filter-value"><?= $block->escapeHtml($block->stripTags($_filter->getLabel())) ?></span>
-                 <?php
-                 $clearLinkUrl = $_filter->getClearLinkUrl();
--                $currentFilterName = $block->escapeHtml(__($_filter->getName())) . " " . $block->stripTags($_filter->getLabel());
--                if ($clearLinkUrl):
-+                $currentFilterName = $block->escapeHtmlAttr(__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel()));
-+                if ($clearLinkUrl) :
-                     ?>
--                    <a class="action previous" href="<?= /* @escapeNotVerified */ $_filter->getRemoveUrl() ?>"
--                       title="<?= /* @escapeNotVerified */ __('Previous') ?>">
--                        <span><?= /* @escapeNotVerified */ __('Previous') ?></span>
-+                    <a class="action previous" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
-+                       title="<?= $block->escapeHtmlAttr(__('Previous')) ?>">
-+                        <span><?= $block->escapeHtml(__('Previous')) ?></span>
-                     </a>
-                     <a class="action remove"
--                       title="<?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>"
--                       href="<?= /* @escapeNotVerified */ $clearLinkUrl ?>">
-+                       title="<?= $block->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
-+                       href="<?= $block->escapeUrl($clearLinkUrl) ?>">
-                         <span><?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
-                     </a>
--                <?php else: ?>
--                    <a class="action remove" href="<?= /* @escapeNotVerified */ $_filter->getRemoveUrl() ?>"
--                       title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Remove')) . " " . $currentFilterName ?>">
--                        <span><?= /* @escapeNotVerified */ __('Remove This Item') ?></span>
-+                <?php else : ?>
-+                    <a class="action remove" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
-+                       title="<?= /* @noEscape */ $block->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
-+                        <span><?= $block->escapeHtml(__('Remove This Item')) ?></span>
-                     </a>
-                 <?php endif; ?>
-             </li>
-diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
-index b2159d2ff08..9d915956ea6 100644
---- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
-+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -15,32 +12,33 @@
-  */
- ?>
- 
--<?php if ($block->canShowBlock()): ?>
-+<?php if ($block->canShowBlock()) : ?>
-     <div class="block filter">
-         <div class="block-title filter-title">
--            <strong><?= /* @escapeNotVerified */ __('Shop By') ?></strong>
-+            <strong><?= $block->escapeHtml(__('Shop By')) ?></strong>
-         </div>
- 
-         <div class="block-content filter-content">
-             <?= $block->getChildHtml('state') ?>
- 
--            <?php if ($block->getLayer()->getState()->getFilters()): ?>
-+            <?php if ($block->getLayer()->getState()->getFilters()) : ?>
-                 <div class="block-actions filter-actions">
--                    <a href="<?= /* @escapeNotVerified */ $block->getClearUrl() ?>" class="action clear filter-clear"><span><?= /* @escapeNotVerified */ __('Clear All') ?></span></a>
-+                    <a href="<?= $block->escapeUrl($block->getClearUrl()) ?>" class="action clear filter-clear"><span><?= $block->escapeHtml(__('Clear All')) ?></span></a>
-                 </div>
-             <?php endif; ?>
-             <?php $wrapOptions = false; ?>
--            <?php foreach ($block->getFilters() as $filter): ?>
--                <?php if (!$wrapOptions): ?>
--                    <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= /* @escapeNotVerified */ __('Shopping Options') ?></strong>
-+            <?php foreach ($block->getFilters() as $filter) : ?>
-+                <?php if (!$wrapOptions) : ?>
-+                    <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= $block->escapeHtml(__('Shopping Options')) ?></strong>
-                     <dl class="filter-options" id="narrow-by-list">
--                <?php $wrapOptions = true; endif; ?>
--                    <?php if ($filter->getItemsCount()): ?>
-+                    <?php $wrapOptions = true;
-+                endif; ?>
-+                    <?php if ($filter->getItemsCount()) : ?>
-                         <dt role="heading" aria-level="3" class="filter-options-title"><?= $block->escapeHtml(__($filter->getName())) ?></dt>
--                        <dd class="filter-options-content"><?= /* @escapeNotVerified */ $block->getChildBlock('renderer')->render($filter) ?></dd>
-+                        <dd class="filter-options-content"><?= /* @noEscape */ $block->getChildBlock('renderer')->render($filter) ?></dd>
-                     <?php endif; ?>
-             <?php endforeach; ?>
--            <?php if ($wrapOptions): ?>
-+            <?php if ($wrapOptions) : ?>
-                 </dl>
-             <?php endif; ?>
-         </div>
-diff --git a/app/code/Magento/Marketplace/Block/Partners.php b/app/code/Magento/Marketplace/Block/Partners.php
-index 4f8ca798f17..30d6a2910f4 100644
---- a/app/code/Magento/Marketplace/Block/Partners.php
-+++ b/app/code/Magento/Marketplace/Block/Partners.php
-@@ -7,6 +7,8 @@
- namespace Magento\Marketplace\Block;
- 
- /**
-+ * Partners section block.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -39,7 +41,7 @@ class Partners extends \Magento\Backend\Block\Template
-     /**
-      * Gets partners
-      *
--     * @return bool|string
-+     * @return array
-      */
-     public function getPartners()
-     {
-diff --git a/app/code/Magento/Marketplace/etc/adminhtml/menu.xml b/app/code/Magento/Marketplace/etc/adminhtml/menu.xml
-index 084ca708d58..ae9e629f953 100644
---- a/app/code/Magento/Marketplace/etc/adminhtml/menu.xml
-+++ b/app/code/Magento/Marketplace/etc/adminhtml/menu.xml
-@@ -7,7 +7,6 @@
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
-     <menu>
--        <add id="Magento_Marketplace::partners" title="Find Partners &amp; Extensions" module="Magento_Marketplace" sortOrder="80"
--             action="marketplace/index" resource="Magento_Marketplace::partners"/>
-+        <add id="Magento_Marketplace::partners" title="Find Partners &amp; Extensions" translate="title" module="Magento_Marketplace" sortOrder="80" action="marketplace/index" resource="Magento_Marketplace::partners"/>
-     </menu>
- </config>
-diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
-index a37306bf1ee..ac39d72388e 100644
---- a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
-+++ b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
-@@ -3,20 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- 
- <section class="page-partners">
--    <h2 class="page-sub-title"><?= /* @escapeNotVerified */ __('Platinum Partners') ?></h2>
-+    <h2 class="page-sub-title"><?= $block->escapeHtml(__('Platinum Partners')) ?></h2>
-     <p class="partners-description">
--        <?php /* @escapeNotVerified */
--        echo __(
--            'Representing Magento\'s highest level of partner engagement, Magento Platinum Partners have established themselves as leaders and innovators of key products and services designed to help merchants and brands grow their business. ' .
--            'Magento reserves the Platinum level for select trusted partners that are committed to offering integrations of commerce features, functions, and tools, as well as back-end systems and operations, to extend and enhance the power of the Magento commerce platform.'
--        ); ?>
-+        <?= $block->escapeHtml(__(
-+            'Representing Magento\'s highest level of partner engagement, Magento Platinum Partners have established ' .
-+            'themselves as leaders and innovators of key products and services designed to help merchants and brands ' .
-+            'grow their business. Magento reserves the Platinum level for select trusted partners that are committed ' .
-+            'to offering integrations of commerce features, functions, and tools, as well as back-end systems and ' .
-+            'operations, to extend and enhance the power of the Magento commerce platform.'
-+        )); ?>
-     </p>
--    <h3 class="page-sub-sub-title"><?= /* @escapeNotVerified */ __('Featured Platinum Partners') ?></h3>
-+    <h3 class="page-sub-sub-title"><?= $block->escapeHtml(__('Featured Platinum Partners')) ?></h3>
-     <div data-role="partners-block" class="partners-block">
-         <div data-role="spinner" class="admin__data-grid-loading-mask">
-             <div class="spinner">
-@@ -29,40 +29,40 @@
-     <div class="row row-gutter partners-footer">
-         <div class="col-m-5">
-             <div class="partners-search">
--                <h2 class="page-sub-title"><?= /* @escapeNotVerified */ __('Partner search') ?></h2>
-+                <h2 class="page-sub-title"><?= $block->escapeHtml(__('Partner search')) ?></h2>
-                 <p>
--                    <?php /* @escapeNotVerified */
--                    echo __(
--                        'Magento has a thriving ecosystem of technology partners to help merchants and brands deliver the best possible customer experiences. ' .
--                        'They are recognized as experts in eCommerce, search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, and more. ' .
--                        'Visit the Magento Partner Directory to see all of our trusted partners.'
--                    ); ?>
-+                    <?= $block->escapeHtml(__(
-+                        'Magento has a thriving ecosystem of technology partners to help merchants and brands deliver ' .
-+                        'the best possible customer experiences. They are recognized as experts in eCommerce, ' .
-+                        'search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, ' .
-+                        'and more. Visit the Magento Partner Directory to see all of our trusted partners.'
-+                    )); ?>
-                 </p>
-                 <a class="action-secondary" target="_blank"
-                    href="http://partners.magento.com/partner_locator/search.aspx">
--                    <?= /* @escapeNotVerified */ __('More Partners') ?>
-+                    <?= $block->escapeHtml(__('More Partners')) ?>
-                 </a>
-             </div>
-         </div>
-         <div class="col-m-3">
-             <img
-                 class="magento-marketplace-logo"
--                src="<?php /* @escapeNotVerified */ echo $block
--                    ->getViewFileUrl('Magento_Marketplace::partners/images/magento-marketplace.svg');
--                ?>"
-+                src="<?= $block->escapeUrl($block
-+                    ->getViewFileUrl('Magento_Marketplace::partners/images/magento-marketplace.svg')); ?>"
-                 alt="Partner"/>
-         </div>
-         <div class="col-m-4">
--            <h2 class="page-sub-title"><?= /* @escapeNotVerified */ __('Magento Marketplace') ?></h2>
-+            <h2 class="page-sub-title"><?= $block->escapeHtml(__('Magento Marketplace')) ?></h2>
-             <p class="partner-description">
--                <?php /* @escapeNotVerified */ echo __(
-+                <?= $block->escapeHtml(__(
-                     'Extensions and Themes are an essential component of the Magento Ecosystem. ' .
--                    'Please visit the Magento Marketplace to see the latest innovations that developers have created to enhance your Magento Store.'
--                ); ?>
-+                    'Please visit the Magento Marketplace to see the latest innovations that developers have ' .
-+                    'created to enhance your Magento Store.'
-+                )); ?>
-             </p>
-             <a class="action-secondary" target="_blank"
-                href="https://marketplace.magento.com/">
--                <?= /* @escapeNotVerified */ __('Visit Magento Marketplaces') ?>
-+                <?= $block->escapeHtml(__('Visit Magento Marketplaces')) ?>
-             </a>
-         </div>
-     </div>
-@@ -73,8 +73,10 @@
-     {
-         "*": {
-             "Magento_Marketplace/default": {
--                "url": "<?= $block->getUrl('marketplace/partners/index',
--                    ['_current' => true, 'block' => '', 'period' => '']) ?>"
-+                "url": "<?= $block->escapeUrl($block->getUrl(
-+                    'marketplace/partners/index',
-+                    ['_current' => true, 'block' => '', 'period' => '']
-+                )) ?>"
-             }
-         }
-     }
-diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
-index b63bf9ebd50..924d6fd7410 100644
---- a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
-+++ b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- $partners = $block->getPartners();
-@@ -22,17 +19,17 @@ $partners = $block->getPartners();
-                 <?= $block->escapeHtml($partner['description']) ?>
-                 <br />
-                 <a href="<?= $block->escapeHtml($partner['url_page']) ?>" target="_blank">
--                    <?= /* @escapeNotVerified */ __('Read More') ?>
-+                    <?= $block->escapeHtml(__('Read More')) ?>
-                 </a>
-                 <br />
-                 <a href="<?= $block->escapeHtml($partner['url_partner_page']) ?>" target="_blank">
--                    <?= /* @escapeNotVerified */ __('Partner Page') ?>
-+                    <?= $block->escapeHtml(__('Partner Page')) ?>
-                 </a>
-             </p>
-         </div>
-     <?php endforeach; ?>
- <?php else : ?>
-     <p>
--        <?= /* @escapeNotVerified */ __('No partners were found') ?>
-+        <?= $block->escapeHtml(__('No partners were found')) ?>
-     </p>
- <?php endif; ?>
-diff --git a/app/code/Magento/MediaStorage/Console/Command/ImagesResizeCommand.php b/app/code/Magento/MediaStorage/Console/Command/ImagesResizeCommand.php
-index a4b78287df0..51eba1facb9 100644
---- a/app/code/Magento/MediaStorage/Console/Command/ImagesResizeCommand.php
-+++ b/app/code/Magento/MediaStorage/Console/Command/ImagesResizeCommand.php
-@@ -8,13 +8,20 @@ declare(strict_types=1);
- namespace Magento\MediaStorage\Console\Command;
- 
- use Magento\Framework\App\Area;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\App\State;
-+use Magento\Framework\ObjectManagerInterface;
- use Magento\MediaStorage\Service\ImageResize;
-+use Symfony\Component\Console\Helper\ProgressBar;
-+use Symfony\Component\Console\Helper\ProgressBarFactory;
- use Symfony\Component\Console\Input\InputInterface;
- use Symfony\Component\Console\Output\OutputInterface;
--use Symfony\Component\Console\Helper\ProgressBar;
--use Magento\Framework\ObjectManagerInterface;
- 
-+/**
-+ * Resizes product images according to theme view definitions.
-+ *
-+ * @package Magento\MediaStorage\Console\Command
-+ */
- class ImagesResizeCommand extends \Symfony\Component\Console\Command\Command
- {
-     /**
-@@ -28,28 +35,32 @@ class ImagesResizeCommand extends \Symfony\Component\Console\Command\Command
-     private $appState;
- 
-     /**
--     * @var ObjectManagerInterface
-+     * @var ProgressBarFactory
-      */
--    private $objectManager;
-+    private $progressBarFactory;
- 
-     /**
-      * @param State $appState
-      * @param ImageResize $resize
-      * @param ObjectManagerInterface $objectManager
-+     * @param ProgressBarFactory $progressBarFactory
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         State $appState,
-         ImageResize $resize,
--        ObjectManagerInterface $objectManager
-+        ObjectManagerInterface $objectManager,
-+        ProgressBarFactory $progressBarFactory = null
-     ) {
-         parent::__construct();
-         $this->resize = $resize;
-         $this->appState = $appState;
--        $this->objectManager = $objectManager;
-+        $this->progressBarFactory = $progressBarFactory
-+            ?: ObjectManager::getInstance()->get(ProgressBarFactory::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function configure()
-     {
-@@ -58,7 +69,9 @@ class ImagesResizeCommand extends \Symfony\Component\Console\Command\Command
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     * @param InputInterface $input
-+     * @param OutputInterface $output
-      */
-     protected function execute(InputInterface $input, OutputInterface $output)
-     {
-@@ -67,10 +80,12 @@ class ImagesResizeCommand extends \Symfony\Component\Console\Command\Command
-             $generator = $this->resize->resizeFromThemes();
- 
-             /** @var ProgressBar $progress */
--            $progress = $this->objectManager->create(ProgressBar::class, [
--                'output' => $output,
--                'max' => $generator->current()
--            ]);
-+            $progress = $this->progressBarFactory->create(
-+                [
-+                    'output' => $output,
-+                    'max' => $generator->current()
-+                ]
-+            );
-             $progress->setFormat(
-                 "%current%/%max% [%bar%] %percent:3s%% %elapsed% %memory:6s% \t| <info>%message%</info>"
-             );
-@@ -79,9 +94,10 @@ class ImagesResizeCommand extends \Symfony\Component\Console\Command\Command
-                 $progress->setOverwrite(false);
-             }
- 
--            for (; $generator->valid(); $generator->next()) {
-+            while ($generator->valid()) {
-                 $progress->setMessage($generator->key());
-                 $progress->advance();
-+                $generator->next();
-             }
-         } catch (\Exception $e) {
-             $output->writeln("<error>{$e->getMessage()}</error>");
-@@ -91,5 +107,7 @@ class ImagesResizeCommand extends \Symfony\Component\Console\Command\Command
- 
-         $output->write(PHP_EOL);
-         $output->writeln("<info>Product images resized successfully</info>");
-+
-+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
-     }
- }
-diff --git a/app/code/Magento/MediaStorage/Service/ImageResize.php b/app/code/Magento/MediaStorage/Service/ImageResize.php
-index 6e3929296e2..1184fb5cc46 100644
---- a/app/code/Magento/MediaStorage/Service/ImageResize.php
-+++ b/app/code/Magento/MediaStorage/Service/ImageResize.php
-@@ -22,8 +22,11 @@ use \Magento\Catalog\Model\ResourceModel\Product\Image as ProductImage;
- use Magento\Theme\Model\Config\Customization as ThemeCustomizationConfig;
- use Magento\Theme\Model\ResourceModel\Theme\Collection;
- use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\MediaStorage\Helper\File\Storage\Database;
- 
- /**
-+ * Image resize service.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class ImageResize
-@@ -83,6 +86,11 @@ class ImageResize
-      */
-     private $filesystem;
- 
-+    /**
-+     * @var Database
-+     */
-+    private $fileStorageDatabase;
-+
-     /**
-      * @param State $appState
-      * @param MediaConfig $imageConfig
-@@ -94,6 +102,7 @@ class ImageResize
-      * @param ThemeCustomizationConfig $themeCustomizationConfig
-      * @param Collection $themeCollection
-      * @param Filesystem $filesystem
-+     * @param Database $fileStorageDatabase
-      * @internal param ProductImage $gallery
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -107,7 +116,8 @@ class ImageResize
-         AssertImageFactory $assertImageFactory,
-         ThemeCustomizationConfig $themeCustomizationConfig,
-         Collection $themeCollection,
--        Filesystem $filesystem
-+        Filesystem $filesystem,
-+        Database $fileStorageDatabase = null
-     ) {
-         $this->appState = $appState;
-         $this->imageConfig = $imageConfig;
-@@ -120,18 +130,27 @@ class ImageResize
-         $this->themeCollection = $themeCollection;
-         $this->mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-         $this->filesystem = $filesystem;
-+        $this->fileStorageDatabase = $fileStorageDatabase ?:
-+            \Magento\Framework\App\ObjectManager::getInstance()->get(Database::class);
-     }
- 
-     /**
--     * Create resized images of different sizes from an original image
-+     * Create resized images of different sizes from an original image.
-+     *
-      * @param string $originalImageName
-      * @throws NotFoundException
-      */
-     public function resizeFromImageName(string $originalImageName)
-     {
--        $originalImagePath = $this->mediaDirectory->getAbsolutePath(
--            $this->imageConfig->getMediaPath($originalImageName)
--        );
-+        $mediastoragefilename = $this->imageConfig->getMediaPath($originalImageName);
-+        $originalImagePath = $this->mediaDirectory->getAbsolutePath($mediastoragefilename);
-+
-+        if ($this->fileStorageDatabase->checkDbUsage() &&
-+            !$this->mediaDirectory->isFile($mediastoragefilename)
-+        ) {
-+            $this->fileStorageDatabase->saveFileToFilesystem($mediastoragefilename);
-+        }
-+
-         if (!$this->mediaDirectory->isFile($originalImagePath)) {
-             throw new NotFoundException(__('Cannot resize image "%1" - original image not found', $originalImagePath));
-         }
-@@ -141,27 +160,33 @@ class ImageResize
-     }
- 
-     /**
--     * Create resized images of different sizes from themes
-+     * Create resized images of different sizes from themes.
-+     *
-      * @param array|null $themes
-      * @return \Generator
-      * @throws NotFoundException
-      */
-     public function resizeFromThemes(array $themes = null): \Generator
-     {
--        $count = $this->productImage->getCountAllProductImages();
-+        $count = $this->productImage->getCountUsedProductImages();
-         if (!$count) {
-             throw new NotFoundException(__('Cannot resize images - product images not found'));
-         }
- 
--        $productImages = $this->productImage->getAllProductImages();
-+        $productImages = $this->productImage->getUsedProductImages();
-         $viewImages = $this->getViewImages($themes ?? $this->getThemesInUse());
- 
-         foreach ($productImages as $image) {
-             $originalImageName = $image['filepath'];
--            $originalImagePath = $this->mediaDirectory->getAbsolutePath(
--                $this->imageConfig->getMediaPath($originalImageName)
--            );
-+            $mediastoragefilename = $this->imageConfig->getMediaPath($originalImageName);
-+            $originalImagePath = $this->mediaDirectory->getAbsolutePath($mediastoragefilename);
-+
-             foreach ($viewImages as $viewImage) {
-+                if ($this->fileStorageDatabase->checkDbUsage() &&
-+                    !$this->mediaDirectory->isFile($mediastoragefilename)
-+                ) {
-+                    $this->fileStorageDatabase->saveFileToFilesystem($mediastoragefilename);
-+                }
-                 $this->resize($viewImage, $originalImagePath, $originalImageName);
-             }
-             yield $originalImageName => $count;
-@@ -169,7 +194,8 @@ class ImageResize
-     }
- 
-     /**
--     * Search the current theme
-+     * Search the current theme.
-+     *
-      * @return array
-      */
-     private function getThemesInUse(): array
-@@ -187,7 +213,8 @@ class ImageResize
-     }
- 
-     /**
--     * Get view images data from themes
-+     * Get view images data from themes.
-+     *
-      * @param array $themes
-      * @return array
-      */
-@@ -196,10 +223,12 @@ class ImageResize
-         $viewImages = [];
-         /** @var \Magento\Theme\Model\Theme $theme */
-         foreach ($themes as $theme) {
--            $config = $this->viewConfig->getViewConfig([
--                'area' => Area::AREA_FRONTEND,
--                'themeModel' => $theme,
--            ]);
-+            $config = $this->viewConfig->getViewConfig(
-+                [
-+                    'area' => Area::AREA_FRONTEND,
-+                    'themeModel' => $theme,
-+                ]
-+            );
-             $images = $config->getMediaEntities('Magento_Catalog', ImageHelper::MEDIA_TYPE_CONFIG_NODE);
-             foreach ($images as $imageId => $imageData) {
-                 $uniqIndex = $this->getUniqueImageIndex($imageData);
-@@ -211,7 +240,8 @@ class ImageResize
-     }
- 
-     /**
--     * Get unique image index
-+     * Get unique image index.
-+     *
-      * @param array $imageData
-      * @return string
-      */
-@@ -219,11 +249,13 @@ class ImageResize
-     {
-         ksort($imageData);
-         unset($imageData['type']);
-+        // phpcs:disable Magento2.Security.InsecureFunction
-         return md5(json_encode($imageData));
-     }
- 
-     /**
--     * Make image
-+     * Make image.
-+     *
-      * @param string $originalImagePath
-      * @param array $imageParams
-      * @return Image
-@@ -241,7 +273,8 @@ class ImageResize
-     }
- 
-     /**
--     * Resize image
-+     * Resize image.
-+     *
-      * @param array $viewImage
-      * @param string $originalImagePath
-      * @param string $originalImageName
-@@ -257,9 +290,46 @@ class ImageResize
-             ]
-         );
- 
-+        if (isset($imageParams['watermark_file'])) {
-+            if ($imageParams['watermark_height'] !== null) {
-+                $image->setWatermarkHeight($imageParams['watermark_height']);
-+            }
-+
-+            if ($imageParams['watermark_width'] !== null) {
-+                $image->setWatermarkWidth($imageParams['watermark_width']);
-+            }
-+
-+            if ($imageParams['watermark_position'] !== null) {
-+                $image->setWatermarkPosition($imageParams['watermark_position']);
-+            }
-+
-+            if ($imageParams['watermark_image_opacity'] !== null) {
-+                $image->setWatermarkImageOpacity($imageParams['watermark_image_opacity']);
-+            }
-+
-+            $image->watermark($this->getWatermarkFilePath($imageParams['watermark_file']));
-+        }
-+
-         if ($imageParams['image_width'] !== null && $imageParams['image_height'] !== null) {
-             $image->resize($imageParams['image_width'], $imageParams['image_height']);
-         }
-         $image->save($imageAsset->getPath());
-+
-+        if ($this->fileStorageDatabase->checkDbUsage()) {
-+            $mediastoragefilename = $this->mediaDirectory->getRelativePath($imageAsset->getPath());
-+            $this->fileStorageDatabase->saveFile($mediastoragefilename);
-+        }
-+    }
-+
-+    /**
-+     * Returns watermark file absolute path
-+     *
-+     * @param string $file
-+     * @return string
-+     */
-+    private function getWatermarkFilePath($file)
-+    {
-+        $path = $this->imageConfig->getMediaPath('/watermark/' . $file);
-+        return $this->mediaDirectory->getAbsolutePath($path);
-     }
- }
-diff --git a/app/code/Magento/MediaStorage/Test/Unit/Service/ImageResizeTest.php b/app/code/Magento/MediaStorage/Test/Unit/Service/ImageResizeTest.php
-new file mode 100644
-index 00000000000..7fccfa04f86
---- /dev/null
-+++ b/app/code/Magento/MediaStorage/Test/Unit/Service/ImageResizeTest.php
-@@ -0,0 +1,300 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\MediaStorage\Test\Unit\Service;
-+
-+use Magento\Catalog\Model\Product\Image\ParamsBuilder;
-+use Magento\Catalog\Model\View\Asset\ImageFactory as AssetImageFactory;
-+use Magento\Catalog\Model\View\Asset\Image as AssetImage;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\Filesystem;
-+use Magento\Framework\Image\Factory as ImageFactory;
-+use Magento\Framework\Image;
-+use Magento\Catalog\Model\Product\Media\ConfigInterface as MediaConfig;
-+use Magento\Framework\App\State;
-+use Magento\Framework\View\ConfigInterface as ViewConfig;
-+use Magento\Framework\Config\View;
-+use Magento\Catalog\Model\ResourceModel\Product\Image as ProductImage;
-+use Magento\Theme\Model\Config\Customization as ThemeCustomizationConfig;
-+use Magento\Theme\Model\ResourceModel\Theme\Collection;
-+use Magento\MediaStorage\Helper\File\Storage\Database;
-+use Magento\Framework\App\Filesystem\DirectoryList;
-+
-+/**
-+ * Class ImageResizeTest
-+ *
-+ * @SuppressWarnings(PHPMD.TooManyFields)
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class ImageResizeTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\MediaStorage\Service\ImageResize
-+     */
-+    protected $service;
-+
-+    /**
-+     * @var State|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $appStateMock;
-+
-+    /**
-+     * @var MediaConfig|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $imageConfigMock;
-+
-+    /**
-+     * @var ProductImage|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $productImageMock;
-+
-+    /**
-+     * @var ImageFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $imageFactoryMock;
-+
-+    /**
-+     * @var Image|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $imageMock;
-+
-+    /**
-+     * @var ParamsBuilder|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $paramsBuilderMock;
-+
-+    /**
-+     * @var ViewConfig|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $viewConfigMock;
-+
-+    /**
-+     * @var View|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $viewMock;
-+
-+    /**
-+     * @var AssetImage|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $assetImageMock;
-+
-+    /**
-+     * @var AssetImageFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $assetImageFactoryMock;
-+
-+    /**
-+     * @var ThemeCustomizationConfig|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $themeCustomizationConfigMock;
-+
-+    /**
-+     * @var Collection|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $themeCollectionMock;
-+
-+    /**
-+     * @var Filesystem|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $filesystemMock;
-+
-+    /**
-+     * @var Database|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $databaseMock;
-+
-+    /**
-+     * @var Filesystem|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $mediaDirectoryMock;
-+
-+    /**
-+     * @var string
-+     */
-+    private $testfilename;
-+
-+    /**
-+     * @var string
-+     */
-+    private $testfilepath;
-+
-+    protected function setUp()
-+    {
-+        $this->testfilename = "image.jpg";
-+        $this->testfilepath = "/image.jpg";
-+
-+        $this->appStateMock = $this->createMock(State::class);
-+        $this->imageConfigMock = $this->createMock(MediaConfig::class);
-+        $this->productImageMock = $this->createMock(ProductImage::class);
-+        $this->imageMock = $this->createMock(Image::class);
-+        $this->imageFactoryMock = $this->createMock(ImageFactory::class);
-+        $this->paramsBuilderMock = $this->createMock(ParamsBuilder::class);
-+        $this->viewMock = $this->createMock(View::class);
-+        $this->viewConfigMock = $this->createMock(ViewConfig::class);
-+        $this->assetImageMock = $this->createMock(AssetImage::class);
-+        $this->assetImageFactoryMock = $this->createMock(AssetImageFactory::class);
-+        $this->themeCustomizationConfigMock = $this->createMock(ThemeCustomizationConfig::class);
-+        $this->themeCollectionMock = $this->createMock(Collection::class);
-+        $this->filesystemMock = $this->createMock(Filesystem::class);
-+        $this->databaseMock = $this->createMock(Database::class);
-+
-+        $this->mediaDirectoryMock = $this->getMockBuilder(Filesystem::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAbsolutePath','isFile','getRelativePath'])
-+            ->getMock();
-+
-+        $this->filesystemMock->expects($this->any())
-+            ->method('getDirectoryWrite')
-+            ->with(DirectoryList::MEDIA)
-+            ->willReturn($this->mediaDirectoryMock);
-+
-+        $this->imageFactoryMock->expects($this->any())
-+            ->method('create')
-+            ->willReturn($this->imageMock);
-+        $this->assetImageMock->expects($this->any())
-+            ->method('getPath')
-+            ->will($this->returnValue($this->testfilepath));
-+        $this->assetImageFactoryMock->expects($this->any())
-+            ->method('create')
-+            ->willReturn($this->assetImageMock);
-+
-+        $this->paramsBuilderMock->expects($this->any())
-+            ->method('build')
-+            ->willReturn(
-+                [
-+                    'keep_aspect_ratio' => null,
-+                    'keep_frame' => null,
-+                    'keep_transparency' => null,
-+                    'constrain_only' => null,
-+                    'background' => null,
-+                    'quality' => null,
-+                    'image_width' => null,
-+                    'image_height' => null
-+                ]
-+            );
-+
-+        $this->imageConfigMock->expects($this->any())
-+            ->method('getMediaPath')
-+            ->with($this->testfilename)
-+            ->willReturn($this->testfilepath);
-+        $this->mediaDirectoryMock->expects($this->any())
-+            ->method('getAbsolutePath')
-+            ->with($this->testfilepath)
-+            ->willReturn($this->testfilepath);
-+        $this->mediaDirectoryMock->expects($this->any())
-+            ->method('getRelativePath')
-+            ->with($this->testfilepath)
-+            ->willReturn($this->testfilepath);
-+
-+        $this->viewMock->expects($this->any())
-+            ->method('getMediaEntities')
-+            ->willReturn(
-+                ['product_small_image' =>
-+                    [
-+                        'type' => 'small_image',
-+                        'width' => 75,
-+                        'height' => 75
-+                    ]
-+                ]
-+            );
-+        $this->viewConfigMock->expects($this->any())
-+            ->method('getViewConfig')
-+            ->willReturn($this->viewMock);
-+
-+        $this->service = new \Magento\MediaStorage\Service\ImageResize(
-+            $this->appStateMock,
-+            $this->imageConfigMock,
-+            $this->productImageMock,
-+            $this->imageFactoryMock,
-+            $this->paramsBuilderMock,
-+            $this->viewConfigMock,
-+            $this->assetImageFactoryMock,
-+            $this->themeCustomizationConfigMock,
-+            $this->themeCollectionMock,
-+            $this->filesystemMock,
-+            $this->databaseMock
-+        );
-+    }
-+
-+    protected function tearDown()
-+    {
-+        unset($this->service);
-+    }
-+
-+    public function testResizeFromThemesMediaStorageDatabase()
-+    {
-+        $this->databaseMock->expects($this->any())
-+            ->method('checkDbUsage')
-+            ->will($this->returnValue(true));
-+
-+        $this->productImageMock->expects($this->any())
-+            ->method('getCountUsedProductImages')
-+            ->willReturn(1);
-+        $this->productImageMock->expects($this->any())
-+            ->method('getUsedProductImages')
-+            ->will(
-+                $this->returnCallback(
-+                    function () {
-+                        $data = [[ 'filepath' => $this->testfilename ]];
-+                        foreach ($data as $e) {
-+                            yield $e;
-+                        }
-+                    }
-+                )
-+            );
-+
-+        $this->mediaDirectoryMock->expects($this->any())
-+            ->method('isFile')
-+            ->with($this->testfilepath)
-+            ->will($this->returnValue(false));
-+
-+        $this->databaseMock->expects($this->once())
-+            ->method('saveFileToFilesystem')
-+            ->with($this->testfilepath);
-+        $this->databaseMock->expects($this->once())
-+            ->method('saveFile')
-+            ->with($this->testfilepath);
-+
-+        $generator = $this->service->resizeFromThemes(['test-theme']);
-+        while ($generator->valid()) {
-+            $generator->next();
-+        }
-+    }
-+
-+    public function testResizeFromImageNameMediaStorageDatabase()
-+    {
-+        $this->databaseMock->expects($this->any())
-+            ->method('checkDbUsage')
-+            ->will($this->returnValue(true));
-+
-+        $this->mediaDirectoryMock->expects($this->any())
-+            ->method('isFile')
-+            ->with($this->testfilepath)
-+            ->willReturnOnConsecutiveCalls(
-+                $this->returnValue(false),
-+                $this->returnValue(true)
-+            );
-+
-+        $this->themeCollectionMock->expects($this->any())
-+            ->method('loadRegisteredThemes')
-+            ->willReturn(
-+                [ new DataObject(['id' => '0']) ]
-+            );
-+        $this->themeCustomizationConfigMock->expects($this->any())
-+            ->method('getStoresByThemes')
-+            ->willReturn(
-+                ['0' => []]
-+            );
-+
-+        $this->databaseMock->expects($this->once())
-+            ->method('saveFileToFilesystem')
-+            ->with($this->testfilepath);
-+        $this->databaseMock->expects($this->once())
-+            ->method('saveFile')
-+            ->with($this->testfilepath);
-+
-+        $this->service->resizeFromImageName($this->testfilename);
-+    }
-+}
-diff --git a/app/code/Magento/MediaStorage/etc/adminhtml/system.xml b/app/code/Magento/MediaStorage/etc/adminhtml/system.xml
-index 09b6b237440..d7244a5d4fd 100644
---- a/app/code/Magento/MediaStorage/etc/adminhtml/system.xml
-+++ b/app/code/Magento/MediaStorage/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="system" translate="label" type="text" sortOrder="900" showInDefault="1" showInWebsite="1" showInStore="1">
-+        <section id="system" type="text" sortOrder="900" showInDefault="1" showInWebsite="1" showInStore="1">
-             <group id="media_storage_configuration" translate="label" type="text" sortOrder="900" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Storage Configuration for Media</label>
-                 <field id="media_storage" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-diff --git a/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml b/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
-index f3c301b4902..fd437161dfb 100644
---- a/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
-+++ b/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php /* @var $block \Magento\MediaStorage\Block\System\Config\System\Storage\Media\Synchronize */ ?>
-@@ -35,7 +32,7 @@ require([
-     );
- 
-     <?php $syncStorageParams = $block->getSyncStorageParams() ?>
--    addAllowedStorage(<?= /* @escapeNotVerified */ $syncStorageParams['storage_type'] ?>, '<?= /* @escapeNotVerified */ $syncStorageParams['connection_name'] ?>');
-+    addAllowedStorage(<?= $block->escapeJs($syncStorageParams['storage_type']) ?>, '<?= $block->escapeJs($syncStorageParams['connection_name']) ?>');
- 
-     defaultValues   = [];
-     defaultValues['system_media_storage_configuration_media_storage']   = $('system_media_storage_configuration_media_storage').value;
-@@ -93,7 +90,7 @@ require([
-     }
- 
-     var checkStatus = function() {
--        u = new Ajax.PeriodicalUpdater('', '<?= /* @escapeNotVerified */ $block->getAjaxStatusUpdateUrl() ?>', {
-+        u = new Ajax.PeriodicalUpdater('', '<?= $block->escapeUrl($block->getAjaxStatusUpdateUrl()) ?>', {
-             method:     'get',
-             frequency:  5,
-             loaderArea: false,
-@@ -103,7 +100,7 @@ require([
- 
-                 try {
-                     response = JSON.parse(transport.responseText);
--                    if (response.state == '<?= /* @escapeNotVerified */ \Magento\MediaStorage\Model\File\Storage\Flag::STATE_RUNNING ?>'
-+                    if (response.state == '<?= /* @noEscape */ (int)\Magento\MediaStorage\Model\File\Storage\Flag::STATE_RUNNING ?>'
-                         && response.message
-                     ) {
-                         if ($('sync_span').hasClassName('no-display')) {
-@@ -115,12 +112,12 @@ require([
-                         enableStorageSelection();
-                         $('sync_span').addClassName('no-display');
- 
--                        if (response.state == '<?= /* @escapeNotVerified */ \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED ?>') {
-+                        if (response.state == '<?= /* @noEscape */ (int)\Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED ?>') {
-                             addAllowedStorage(
-                                 $('system_media_storage_configuration_media_storage').value,
-                                 $('system_media_storage_configuration_media_database').value
-                             );
--                        } else if (response.state == '<?= /* @escapeNotVerified */ \Magento\MediaStorage\Model\File\Storage\Flag::STATE_NOTIFIED ?>') {
-+                        } else if (response.state == '<?= /* @noEscape */ (int)\Magento\MediaStorage\Model\File\Storage\Flag::STATE_NOTIFIED ?>') {
-                             if (response.has_errors) {
-                                 enableSyncButton();
-                             } else {
-@@ -155,7 +152,7 @@ require([
-             connection: $('system_media_storage_configuration_media_database').value
-         };
- 
--        new Ajax.Request('<?= /* @escapeNotVerified */ $block->getAjaxSyncUrl() ?>', {
-+        new Ajax.Request('<?= $block->escapeUrl($block->getAjaxSyncUrl()) ?>', {
-             parameters:     params,
-             loaderArea:     false,
-             asynchronous:   true
-@@ -179,7 +176,7 @@ require([
- 
- <?= $block->getButtonHtml() ?>
- <span class="sync-indicator no-display" id="sync_span">
--    <img alt="Synchronize" style="margin:0 5px" src="<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/process_spinner.gif') ?>"/>
-+    <img alt="Synchronize" style="margin:0 5px" src="<?= $block->escapeUrl($block->getViewFileUrl('images/process_spinner.gif')) ?>"/>
-     <span id="sync_message_span"></span>
- </span>
- <input type="hidden" id="synchronize-validation-input" class="required-synchronize no-display"/>
-diff --git a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
-index f301fb9289e..f5011248d77 100644
---- a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
-+++ b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
-@@ -5,9 +5,13 @@
-  */
- namespace Magento\MessageQueue\Model\Cron;
- 
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\MessageQueue\ConnectionTypeResolver;
-+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface;
- use Magento\Framework\ShellInterface;
- use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfigInterface;
- use Magento\Framework\App\DeploymentConfig;
-+use Psr\Log\LoggerInterface;
- use Symfony\Component\Process\PhpExecutableFinder;
- use Magento\MessageQueue\Model\Cron\ConsumersRunner\PidConsumerManager;
- 
-@@ -56,6 +60,16 @@ class ConsumersRunner
-      */
-     private $pidConsumerManager;
- 
-+    /**
-+     * @var ConnectionTypeResolver
-+     */
-+    private $mqConnectionTypeResolver;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-     /**
-      * @param PhpExecutableFinder $phpExecutableFinder The executable finder specifically designed
-      *        for the PHP executable
-@@ -63,19 +77,27 @@ class ConsumersRunner
-      * @param DeploymentConfig $deploymentConfig The application deployment configuration
-      * @param ShellInterface $shellBackground The shell command line wrapper for executing command in background
-      * @param PidConsumerManager $pidConsumerManager The class for checking status of process by PID
-+     * @param ConnectionTypeResolver $mqConnectionTypeResolver Consumer connection resolver
-+     * @param LoggerInterface $logger Logger
-      */
-     public function __construct(
-         PhpExecutableFinder $phpExecutableFinder,
-         ConsumerConfigInterface $consumerConfig,
-         DeploymentConfig $deploymentConfig,
-         ShellInterface $shellBackground,
--        PidConsumerManager $pidConsumerManager
-+        PidConsumerManager $pidConsumerManager,
-+        ConnectionTypeResolver $mqConnectionTypeResolver = null,
-+        LoggerInterface $logger = null
-     ) {
-         $this->phpExecutableFinder = $phpExecutableFinder;
-         $this->consumerConfig = $consumerConfig;
-         $this->deploymentConfig = $deploymentConfig;
-         $this->shellBackground = $shellBackground;
-         $this->pidConsumerManager = $pidConsumerManager;
-+        $this->mqConnectionTypeResolver = $mqConnectionTypeResolver
-+            ?: ObjectManager::getInstance()->get(ConnectionTypeResolver::class);
-+        $this->logger = $logger
-+            ?: ObjectManager::getInstance()->get(LoggerInterface::class);
-     }
- 
-     /**
-@@ -94,12 +116,12 @@ class ConsumersRunner
-         $php = $this->phpExecutableFinder->find() ?: 'php';
- 
-         foreach ($this->consumerConfig->getConsumers() as $consumer) {
--            $consumerName = $consumer->getName();
--
--            if (!$this->canBeRun($consumerName, $allowedConsumers)) {
-+            if (!$this->canBeRun($consumer, $allowedConsumers)) {
-                 continue;
-             }
- 
-+            $consumerName = $consumer->getName();
-+
-             $arguments = [
-                 $consumerName,
-                 '--pid-file-path=' . $this->getPidFilePath($consumerName),
-@@ -119,16 +141,37 @@ class ConsumersRunner
-     /**
-      * Checks that the consumer can be run
-      *
--     * @param string $consumerName The consumer name
-+     * @param ConsumerConfigItemInterface $consumerConfig The consumer config
-      * @param array $allowedConsumers The list of allowed consumers
-      *        If $allowedConsumers is empty it means that all consumers are allowed
-      * @return bool Returns true if the consumer can be run
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      */
--    private function canBeRun($consumerName, array $allowedConsumers = [])
-+    private function canBeRun(ConsumerConfigItemInterface $consumerConfig, array $allowedConsumers = []): bool
-     {
--        $allowed = empty($allowedConsumers) ?: in_array($consumerName, $allowedConsumers);
-+        $consumerName = $consumerConfig->getName();
-+        if (!empty($allowedConsumers) && !in_array($consumerName, $allowedConsumers)) {
-+            return false;
-+        }
-+
-+        if ($this->pidConsumerManager->isRun($this->getPidFilePath($consumerName))) {
-+            return false;
-+        }
-+
-+        $connectionName = $consumerConfig->getConnection();
-+        try {
-+            $this->mqConnectionTypeResolver->getConnectionType($connectionName);
-+        } catch (\LogicException $e) {
-+            $this->logger->info(sprintf(
-+                'Consumer "%s" skipped as required connection "%s" is not configured. %s',
-+                $consumerName,
-+                $connectionName,
-+                $e->getMessage()
-+            ));
-+            return false;
-+        }
- 
--        return $allowed && !$this->pidConsumerManager->isRun($this->getPidFilePath($consumerName));
-+        return true;
-     }
- 
-     /**
-diff --git a/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php b/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php
-new file mode 100644
-index 00000000000..ffa478aecf3
---- /dev/null
-+++ b/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\MessageQueue\Model;
-+
-+use Magento\Framework\MessageQueue\PoisonPill\PoisonPillCompareInterface;
-+use Magento\Framework\MessageQueue\PoisonPill\PoisonPillReadInterface;
-+
-+/**
-+ * Poison pill compare
-+ */
-+class PoisonPillCompare implements PoisonPillCompareInterface
-+{
-+    /**
-+     * @var PoisonPillReadInterface
-+     */
-+    private $poisonPillRead;
-+
-+    /**
-+     * PoisonPillCompare constructor.
-+     * @param PoisonPillReadInterface $poisonPillRead
-+     */
-+    public function __construct(
-+        PoisonPillReadInterface $poisonPillRead
-+    ) {
-+        $this->poisonPillRead = $poisonPillRead;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function isLatestVersion(string $poisonPillVersion): bool
-+    {
-+        return $poisonPillVersion === $this->poisonPillRead->getLatestVersion();
-+    }
-+}
-diff --git a/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
-new file mode 100644
-index 00000000000..e59abec8724
---- /dev/null
-+++ b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\MessageQueue\Model\ResourceModel;
-+
-+use Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface;
-+use Magento\Framework\MessageQueue\PoisonPill\PoisonPillReadInterface;
-+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-+
-+/**
-+ * PoisonPill class that enclose read and put interface.
-+ */
-+class PoisonPill extends AbstractDb implements PoisonPillPutInterface, PoisonPillReadInterface
-+{
-+    /**
-+     * Table name.
-+     */
-+    const QUEUE_POISON_PILL_TABLE = 'queue_poison_pill';
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _construct()
-+    {
-+        $this->_init(self::QUEUE_POISON_PILL_TABLE, 'version');
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function put(): string
-+    {
-+        $connection = $this->getConnection();
-+        $table = $this->getMainTable();
-+        $uuid = uniqid('version-');
-+        $version = $this->getVersionFromDb();
-+        if ($version !== '') {
-+            $connection->update($table, ['version' => $uuid]);
-+        } else {
-+            $connection->insert($table, ['version' => $uuid]);
-+        }
-+
-+        return $uuid;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getLatestVersion(): string
-+    {
-+        return $this->getVersionFromDb();
-+    }
-+
-+    /**
-+     * Returns version form DB or null.
-+     *
-+     * @return string
-+     */
-+    private function getVersionFromDb(): string
-+    {
-+        $select = $this->getConnection()->select()->from(
-+            $this->getTable(self::QUEUE_POISON_PILL_TABLE),
-+            'version'
-+        );
-+
-+        $result = $this->getConnection()->fetchOne($select);
-+
-+        return (string)$result;
-+    }
-+}
-diff --git a/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
-index bf8796a03f5..006354b997d 100644
---- a/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
-+++ b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\MessageQueue\Test\Unit\Model\Cron;
- 
-+use Magento\Framework\MessageQueue\ConnectionTypeResolver;
- use \PHPUnit_Framework_MockObject_MockObject as MockObject;
- use Magento\Framework\ShellInterface;
- use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfigInterface;
-@@ -41,6 +42,11 @@ class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
-      */
-     private $phpExecutableFinderMock;
- 
-+    /**
-+     * @var ConnectionTypeResolver
-+     */
-+    private $connectionTypeResover;
-+
-     /**
-      * @var ConsumersRunner
-      */
-@@ -66,13 +72,18 @@ class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
-         $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $this->connectionTypeResover = $this->getMockBuilder(ConnectionTypeResolver::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->connectionTypeResover->method('getConnectionType')->willReturn('something');
- 
-         $this->consumersRunner = new ConsumersRunner(
-             $this->phpExecutableFinderMock,
-             $this->consumerConfigMock,
-             $this->deploymentConfigMock,
-             $this->shellBackgroundMock,
--            $this->pidConsumerManagerMock
-+            $this->pidConsumerManagerMock,
-+            $this->connectionTypeResover
-         );
-     }
- 
-diff --git a/app/code/Magento/MessageQueue/etc/db_schema.xml b/app/code/Magento/MessageQueue/etc/db_schema.xml
-index 9cbad4d32a8..4403384e931 100644
---- a/app/code/Magento/MessageQueue/etc/db_schema.xml
-+++ b/app/code/Magento/MessageQueue/etc/db_schema.xml
-@@ -14,11 +14,14 @@
-         <column xsi:type="varchar" name="message_code" nullable="false" length="255" default="" comment="Message Code"/>
-         <column xsi:type="timestamp" name="created_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Created At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="QUEUE_LOCK_MESSAGE_CODE">
-+        <constraint xsi:type="unique" referenceId="QUEUE_LOCK_MESSAGE_CODE">
-             <column name="message_code"/>
-         </constraint>
-     </table>
-+    <table name="queue_poison_pill" resource="default" engine="innodb" comment="Sequence table for poison pill versions">
-+        <column xsi:type="varchar" name="version" length="255" nullable="false" comment="Poison Pill version."/>
-+    </table>
- </schema>
-diff --git a/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json b/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
-index f31981d2ec4..37a342b21e6 100644
---- a/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
-+++ b/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
-@@ -9,5 +9,10 @@
-             "PRIMARY": true,
-             "QUEUE_LOCK_MESSAGE_CODE": true
-         }
-+    },
-+    "queue_poison_pill": {
-+        "column": {
-+            "version": true
-+        }
-     }
--}
-\ No newline at end of file
-+}
-diff --git a/app/code/Magento/MessageQueue/etc/di.xml b/app/code/Magento/MessageQueue/etc/di.xml
-index c8f2edb8626..f60eb5fbc20 100644
---- a/app/code/Magento/MessageQueue/etc/di.xml
-+++ b/app/code/Magento/MessageQueue/etc/di.xml
-@@ -13,6 +13,9 @@
-     <preference for="Magento\Framework\MessageQueue\EnvelopeInterface" type="Magento\Framework\MessageQueue\Envelope"/>
-     <preference for="Magento\Framework\MessageQueue\ConsumerInterface" type="Magento\Framework\MessageQueue\Consumer"/>
-     <preference for="Magento\Framework\MessageQueue\MergedMessageInterface" type="Magento\Framework\MessageQueue\MergedMessage"/>
-+    <preference for="Magento\Framework\MessageQueue\PoisonPill\PoisonPillCompareInterface" type="Magento\MessageQueue\Model\PoisonPillCompare"/>
-+    <preference for="Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface" type="Magento\MessageQueue\Model\ResourceModel\PoisonPill"/>
-+    <preference for="Magento\Framework\MessageQueue\PoisonPill\PoisonPillReadInterface" type="Magento\MessageQueue\Model\ResourceModel\PoisonPill"/>
-     <type name="Magento\Framework\Console\CommandListInterface">
-         <arguments>
-             <argument name="commands" xsi:type="array">
-diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
-index b4ec34ebee1..2f6dd2da9bb 100644
---- a/app/code/Magento/Msrp/Helper/Data.php
-+++ b/app/code/Magento/Msrp/Helper/Data.php
-@@ -7,13 +7,17 @@ namespace Magento\Msrp\Helper;
- 
- use Magento\Framework\App\Helper\AbstractHelper;
- use Magento\Framework\App\Helper\Context;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Msrp\Model\Product\Attribute\Source\Type;
-+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\Catalog\Model\Product;
- use Magento\Catalog\Api\ProductRepositoryInterface;
- 
- /**
-  * Msrp data helper
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Data extends AbstractHelper
- {
-@@ -42,6 +46,11 @@ class Data extends AbstractHelper
-      */
-     protected $productRepository;
- 
-+    /**
-+     * @var MsrpPriceCalculatorInterface
-+     */
-+    private $msrpPriceCalculator;
-+
-     /**
-      * @param Context $context
-      * @param StoreManagerInterface $storeManager
-@@ -50,6 +59,7 @@ class Data extends AbstractHelper
-      * @param \Magento\Msrp\Model\Config $config
-      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-      * @param ProductRepositoryInterface $productRepository
-+     * @param MsrpPriceCalculatorInterface|null $msrpPriceCalculator
-      */
-     public function __construct(
-         Context $context,
-@@ -58,7 +68,8 @@ class Data extends AbstractHelper
-         \Magento\Msrp\Model\Msrp $msrp,
-         \Magento\Msrp\Model\Config $config,
-         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
--        ProductRepositoryInterface $productRepository
-+        ProductRepositoryInterface $productRepository,
-+        MsrpPriceCalculatorInterface $msrpPriceCalculator = null
-     ) {
-         parent::__construct($context);
-         $this->storeManager = $storeManager;
-@@ -67,17 +78,19 @@ class Data extends AbstractHelper
-         $this->config = $config;
-         $this->priceCurrency = $priceCurrency;
-         $this->productRepository = $productRepository;
-+        $this->msrpPriceCalculator = $msrpPriceCalculator
-+            ?: ObjectManager::getInstance()->get(MsrpPriceCalculatorInterface::class);
-     }
- 
-     /**
--     * Check if can apply Minimum Advertise price to product
--     * in specific visibility
-+     * Check if can apply Minimum Advertise price to product in specific visibility
-      *
-      * @param int|Product $product
-      * @param int|null $visibility Check displaying price in concrete place (by default generally)
-      * @return bool
-      *
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function canApplyMsrp($product, $visibility = null)
-     {
-@@ -111,6 +124,7 @@ class Data extends AbstractHelper
-      *
-      * @param Product $product
-      * @return string
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getMsrpPriceMessage($product)
-     {
-@@ -128,6 +142,7 @@ class Data extends AbstractHelper
-      *
-      * @param int|Product $product
-      * @return bool
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function isShowPriceOnGesture($product)
-     {
-@@ -135,8 +150,11 @@ class Data extends AbstractHelper
-     }
- 
-     /**
-+     * Check if we should show MAP proce before order confirmation
-+     *
-      * @param int|Product $product
-      * @return bool
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function isShowBeforeOrderConfirm($product)
-     {
-@@ -144,23 +162,19 @@ class Data extends AbstractHelper
-     }
- 
-     /**
-+     * Check if any MAP price is larger than as low as value.
-+     *
-      * @param int|Product $product
--     * @return bool|float
-+     * @return bool
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function isMinimalPriceLessMsrp($product)
-     {
-         if (is_numeric($product)) {
-             $product = $this->productRepository->getById($product, false, $this->storeManager->getStore()->getId());
-         }
--        $msrp = $product->getMsrp();
-+        $msrp = $this->msrpPriceCalculator->getMsrpPriceValue($product);
-         $price = $product->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE);
--        if ($msrp === null) {
--            if ($product->getTypeId() !== \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
--                return false;
--            } else {
--                $msrp = $product->getTypeInstance()->getChildrenMsrp($product);
--            }
--        }
-         if ($msrp) {
-             $msrp = $this->priceCurrency->convertAndRound($msrp);
-         }
-diff --git a/app/code/Magento/Msrp/Model/Config.php b/app/code/Magento/Msrp/Model/Config.php
-index 2ee9f41870a..3662a2cef8d 100644
---- a/app/code/Magento/Msrp/Model/Config.php
-+++ b/app/code/Magento/Msrp/Model/Config.php
-@@ -10,6 +10,9 @@ use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\Framework\Escaper;
- 
-+/**
-+ * Class Config
-+ */
- class Config
- {
-     /**#@+
-@@ -40,6 +43,8 @@ class Config
-     protected $storeId;
- 
-     /**
-+     * Config constructor.
-+     *
-      * @param ScopeConfigInterface $scopeConfig
-      * @param StoreManagerInterface $storeManager
-      * @param Escaper $escaper
-@@ -74,7 +79,7 @@ class Config
-      */
-     public function isEnabled()
-     {
--        return (bool)$this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_MSRP_ENABLED,
-             ScopeInterface::SCOPE_STORE,
-             $this->storeId
-diff --git a/app/code/Magento/Msrp/Pricing/MsrpPriceCalculator.php b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculator.php
-new file mode 100644
-index 00000000000..af5a29eb288
---- /dev/null
-+++ b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculator.php
-@@ -0,0 +1,64 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Msrp\Pricing;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class MsrpPriceCalculator implements MsrpPriceCalculatorInterface
-+{
-+    /**
-+     * @var MsrpPriceCalculatorInterface[]
-+     */
-+    private $msrpPriceCalculators;
-+
-+    /**
-+     * @param array $msrpPriceCalculators
-+     */
-+    public function __construct(array $msrpPriceCalculators = [])
-+    {
-+        $this->msrpPriceCalculators = $this->getMsrpPriceCalculators($msrpPriceCalculators);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getMsrpPriceValue(ProductInterface $product): float
-+    {
-+        $productType = $product->getTypeId();
-+        if (isset($this->msrpPriceCalculators[$productType])) {
-+            $priceCalculator = $this->msrpPriceCalculators[$productType];
-+            $msrp = $priceCalculator->getMsrpPriceValue($product);
-+        } else {
-+            $msrp = (float)$product->getMsrp();
-+        }
-+
-+        return $msrp;
-+    }
-+
-+    /**
-+     * Convert the configuration of MSRP price calculators.
-+     *
-+     * @param array $msrpPriceCalculatorsConfig
-+     * @return array
-+     */
-+    private function getMsrpPriceCalculators(array $msrpPriceCalculatorsConfig): array
-+    {
-+        $msrpPriceCalculators = [];
-+        foreach ($msrpPriceCalculatorsConfig as $msrpPriceCalculator) {
-+            if (isset($msrpPriceCalculator['productType'], $msrpPriceCalculator['priceCalculator'])) {
-+                $msrpPriceCalculators[$msrpPriceCalculator['productType']] =
-+                    $msrpPriceCalculator['priceCalculator'];
-+            }
-+        }
-+        return $msrpPriceCalculators;
-+    }
-+}
-diff --git a/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php
-new file mode 100644
-index 00000000000..c50a381a2ef
---- /dev/null
-+++ b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php
-@@ -0,0 +1,23 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Msrp\Pricing;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+
-+/**
-+ * Provide information about MSRP price of a product.
-+ */
-+interface MsrpPriceCalculatorInterface
-+{
-+    /**
-+     * Return the value of MSRP product price.
-+     *
-+     * @param ProductInterface $product
-+     * @return float
-+     */
-+    public function getMsrpPriceValue(ProductInterface $product): float;
-+}
-diff --git a/app/code/Magento/Msrp/Pricing/Price/MsrpPrice.php b/app/code/Magento/Msrp/Pricing/Price/MsrpPrice.php
-index 0bf36e7ce5d..6eb840e0c71 100644
---- a/app/code/Magento/Msrp/Pricing/Price/MsrpPrice.php
-+++ b/app/code/Magento/Msrp/Pricing/Price/MsrpPrice.php
-@@ -93,6 +93,8 @@ class MsrpPrice extends FinalPrice implements MsrpPriceInterface
-     }
- 
-     /**
-+     * Check if is minimal price is less than the msrp.
-+     *
-      * @param Product $product
-      * @return bool|float
-      */
-diff --git a/app/code/Magento/Msrp/Pricing/Render/PriceBox.php b/app/code/Magento/Msrp/Pricing/Render/PriceBox.php
-new file mode 100644
-index 00000000000..709d8da8717
---- /dev/null
-+++ b/app/code/Magento/Msrp/Pricing/Render/PriceBox.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Msrp\Pricing\Render;
-+
-+use Magento\Catalog\Model\Product;
-+use Magento\Framework\Json\Helper\Data;
-+use Magento\Framework\Math\Random;
-+use Magento\Framework\Pricing\Price\PriceInterface;
-+use Magento\Framework\Pricing\Render\RendererPool;
-+use Magento\Framework\View\Element\Template\Context;
-+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
-+
-+/**
-+ * MSRP price box render.
-+ */
-+class PriceBox extends \Magento\Catalog\Pricing\Render\PriceBox
-+{
-+    /**
-+     * @var MsrpPriceCalculatorInterface
-+     */
-+    private $msrpPriceCalculator;
-+
-+    /**
-+     * Constructor
-+     *
-+     * @param Context $context
-+     * @param Product $saleableItem
-+     * @param PriceInterface $price
-+     * @param RendererPool $rendererPool
-+     * @param Data $jsonHelper
-+     * @param Random $mathRandom
-+     * @param MsrpPriceCalculatorInterface $msrpPriceCalculator
-+     */
-+    public function __construct(
-+        Context $context,
-+        Product $saleableItem,
-+        PriceInterface $price,
-+        RendererPool $rendererPool,
-+        Data $jsonHelper,
-+        Random $mathRandom,
-+        MsrpPriceCalculatorInterface $msrpPriceCalculator
-+    ) {
-+        $this->msrpPriceCalculator = $msrpPriceCalculator;
-+        parent::__construct($context, $saleableItem, $price, $rendererPool, $jsonHelper, $mathRandom);
-+    }
-+
-+    /**
-+     * Return MSRP price calculator.
-+     *
-+     * @return MsrpPriceCalculatorInterface
-+     */
-+    public function getMsrpPriceCalculator(): MsrpPriceCalculatorInterface
-+    {
-+        return $this->msrpPriceCalculator;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function getCacheKey()
-+    {
-+        return sprintf(
-+            '%s-%s',
-+            parent::getCacheKey(),
-+            $this->getZone()
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/Msrp/Test/Mftf/Data/MsrpData.xml b/app/code/Magento/Msrp/Test/Mftf/Data/MsrpData.xml
-new file mode 100644
-index 00000000000..f311e3c06e9
---- /dev/null
-+++ b/app/code/Magento/Msrp/Test/Mftf/Data/MsrpData.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="MsrpBeforeOrderConfirmation" type="minimum_advertised_price">
-+        <data key="msrp">600</data>
-+        <data key="msrp_display_actual_price_type">Before Order Confirmation</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Msrp/Test/Mftf/Data/MsrpSettingsData.xml b/app/code/Magento/Msrp/Test/Mftf/Data/MsrpSettingsData.xml
-new file mode 100644
-index 00000000000..3922bb48689
---- /dev/null
-+++ b/app/code/Magento/Msrp/Test/Mftf/Data/MsrpSettingsData.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="MsrpEnableMAP" type="msrp_settings_config">
-+        <requiredEntity type="enabled">EnableMAP</requiredEntity>
-+    </entity>
-+    <entity name="EnableMAP" type="msrp_settings_config">
-+        <data key="value">1</data>
-+    </entity>
-+
-+    <entity name="MsrpDisableMAP" type="msrp_settings_config">
-+        <requiredEntity type="enabled">DisableMAP</requiredEntity>
-+    </entity>
-+    <entity name="DisableMAP" type="msrp_settings_config">
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Msrp/Test/Mftf/Metadata/msrp_settings-meta.xml b/app/code/Magento/Msrp/Test/Mftf/Metadata/msrp_settings-meta.xml
-new file mode 100644
-index 00000000000..be91a548ad9
---- /dev/null
-+++ b/app/code/Magento/Msrp/Test/Mftf/Metadata/msrp_settings-meta.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="MsrpSettingsConfig" dataType="msrp_settings_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST">
-+        <object key="groups" dataType="msrp_settings_config">
-+            <object key="msrp" dataType="msrp_settings_config">
-+                <object key="fields" dataType="msrp_settings_config">
-+                    <object key="enabled" dataType="enabled">
-+                        <field key="value">string</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-\ No newline at end of file
-diff --git a/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml
-new file mode 100644
-index 00000000000..d1eb1339fe8
---- /dev/null
-+++ b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml
-@@ -0,0 +1,158 @@
-+<?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="StorefrontProductWithMapAssignedConfigProductIsCorrectTest">
-+        <annotations>
-+            <features value="Msrp"/>
-+            <stories value="Minimum advertised price"/>
-+            <title value="Check that simple products with MAP assigned to configurable product displayed correctly"/>
-+            <description value="Check that simple products with MAP assigned to configurable product displayed correctly"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-12292"/>
-+            <useCaseId value="MC-10973"/>
-+            <group value="Msrp"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!--Create category-->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Create the configurable product based on the data in the /data folder -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Make the configurable product have two options, that are children of the default attribute set -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOption3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOption3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create the 2 children that will be a part of the configurable product -->
-+            <createData entity="ApiSimpleProductWithPrice50" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+            <createData entity="ApiSimpleProductWithPrice60" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+            <createData entity="ApiSimpleProductWithPrice70" stepKey="createConfigChildProduct3">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
-+            </createData>
-+
-+            <!-- Assign the two products to the configurable product -->
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild3">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct3"/>
-+            </createData>
-+
-+            <!--Enable Minimum advertised Price-->
-+            <createData entity="MsrpEnableMAP" stepKey="enableMAP"/>
-+        </before>
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteConfigChildProduct3"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+
-+            <!--Disable Minimum advertised Price-->
-+            <createData entity="MsrpDisableMAP" stepKey="disableMAP"/>
-+
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-+        </after>
-+
-+        <!-- Set Manufacturer's Suggested Retail Price to products-->
-+        <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct1.id$$)}}" stepKey="goToFirstChildProductEditPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>
-+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.msrp}}" stepKey="waitForMsrp"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.msrp}}" userInput="55" stepKey="setMsrpForFirstChildProduct"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
-+
-+        <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct2.id$$)}}" stepKey="goToSecondChildProductEditPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad1"/>
-+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton1"/>
-+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.msrp}}" stepKey="waitForMsrp1"/>
-+        <fillField selector="{{AdminProductFormAdvancedPricingSection.msrp}}" userInput="66" stepKey="setMsrpForSecondChildProduct"/>
-+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton1"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!--Clear cache-->
-+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        <!--Go to store front and check msrp for products-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToConfigProductPage"/>
-+        <waitForPageLoad stepKey="waitForLoadConfigProductPage"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="grabMapPrice"/>
-+        <assertEquals expected='$66.00' expectedType="string" actual="($grabMapPrice)" stepKey="assertMapPrice"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.clickForPriceLink}}" stepKey="checkClickForPriceLink"/>
-+
-+        <!--Check msrp for second child product-->
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption2.value$$" stepKey="selectSecondOption"/>
-+        <waitForElement selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="waitForLoad"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="grabSecondProductMapPrice"/>
-+        <assertEquals expected='$66.00' expectedType="string" actual="($grabSecondProductMapPrice)" stepKey="assertSecondProductMapPrice"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.clickForPriceLink}}" stepKey="checkClickForPriceLinkForSecondProduct"/>
-+
-+        <!--Check msrp for first child product-->
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption1.value$$" stepKey="selectFirstOption"/>
-+        <waitForElement selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="waitForLoad1"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="grabFirstProductMapPrice"/>
-+        <assertEquals expected='$55.00' expectedType="string" actual="($grabFirstProductMapPrice)" stepKey="assertFirstProductMapPrice"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.clickForPriceLink}}" stepKey="checkClickForPriceLinkForFirstProduct"/>
-+
-+        <!--Check price for third child product-->
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption3.value$$" stepKey="selectThirdOption"/>
-+        <waitForElement selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="waitForLoad2"/>
-+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="grabThirdProductMapPrice"/>
-+        <assertEquals expected='$70.00' expectedType="string" actual="($grabThirdProductMapPrice)" stepKey="assertThirdProductMapPrice"/>
-+        <dontSeeElement selector="{{StorefrontProductInfoMainSection.clickForPriceLink}}" stepKey="checkClickForPriceLinkForThirdProduct"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php b/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
-index 19f46b06ac5..e4cd411a2e0 100644
---- a/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
-+++ b/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
-@@ -6,6 +6,8 @@
- 
- namespace Magento\Msrp\Test\Unit\Helper;
- 
-+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
-+
- /**
-  * Class DataTest
-  */
-@@ -26,6 +28,14 @@ class DataTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $productMock;
- 
-+    /**
-+     * @var MsrpPriceCalculatorInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $msrpPriceCalculator;
-+
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->priceCurrencyMock = $this->createMock(\Magento\Framework\Pricing\PriceCurrencyInterface::class);
-@@ -33,6 +43,8 @@ class DataTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->setMethods(['getMsrp', 'getPriceInfo', '__wakeup'])
-             ->getMock();
-+        $this->msrpPriceCalculator = $this->getMockBuilder(MsrpPriceCalculatorInterface::class)
-+            ->getMockForAbstractClass();
- 
-         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- 
-@@ -40,10 +52,14 @@ class DataTest extends \PHPUnit\Framework\TestCase
-             \Magento\Msrp\Helper\Data::class,
-             [
-                 'priceCurrency' => $this->priceCurrencyMock,
-+                'msrpPriceCalculator' => $this->msrpPriceCalculator,
-             ]
-         );
-     }
- 
-+    /**
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-     public function testIsMinimalPriceLessMsrp()
-     {
-         $msrp = 120;
-@@ -73,12 +89,13 @@ class DataTest extends \PHPUnit\Framework\TestCase
-             ->with(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)
-             ->will($this->returnValue($finalPriceMock));
- 
--        $this->productMock->expects($this->any())
--            ->method('getMsrp')
--            ->will($this->returnValue($msrp));
-+        $this->msrpPriceCalculator
-+            ->expects($this->any())
-+            ->method('getMsrpPriceValue')
-+            ->willReturn($msrp);
-         $this->productMock->expects($this->any())
-             ->method('getPriceInfo')
--            ->will($this->returnValue($priceInfoMock));
-+            ->willReturn($priceInfoMock);
- 
-         $result = $this->helper->isMinimalPriceLessMsrp($this->productMock);
-         $this->assertTrue($result, "isMinimalPriceLessMsrp returned incorrect value");
-diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
-index 6e7bf61063a..a2e6da6de53 100644
---- a/app/code/Magento/Msrp/composer.json
-+++ b/app/code/Magento/Msrp/composer.json
-@@ -10,7 +10,6 @@
-         "magento/module-catalog": "*",
-         "magento/module-downloadable": "*",
-         "magento/module-eav": "*",
--        "magento/module-grouped-product": "*",
-         "magento/module-store": "*",
-         "magento/module-tax": "*"
-     },
-diff --git a/app/code/Magento/Msrp/etc/adminhtml/system.xml b/app/code/Magento/Msrp/etc/adminhtml/system.xml
-index 8ce0ea67343..c20d753a2e7 100644
---- a/app/code/Magento/Msrp/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Msrp/etc/adminhtml/system.xml
-@@ -10,7 +10,7 @@
-         <section id="sales">
-             <group id="msrp" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
-                 <label>Minimum Advertised Price</label>
--                <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Enable MAP</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                     <comment>
-diff --git a/app/code/Magento/Msrp/etc/di.xml b/app/code/Magento/Msrp/etc/di.xml
-index 6f197f769d4..b8392b0bb0f 100644
---- a/app/code/Magento/Msrp/etc/di.xml
-+++ b/app/code/Magento/Msrp/etc/di.xml
-@@ -7,6 +7,7 @@
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-     <preference for="\Magento\Msrp\Api\Data\ProductRender\MsrpPriceInfoInterface" type="\Magento\Msrp\Model\ProductRender\MsrpPriceInfo" />
-+    <preference for="\Magento\Msrp\Pricing\MsrpPriceCalculatorInterface" type="\Magento\Msrp\Pricing\MsrpPriceCalculator"/>
-     <virtualType name="Magento\Catalog\Pricing\Price\Pool">
-         <arguments>
-             <argument name="prices" xsi:type="array">
-diff --git a/app/code/Magento/Msrp/i18n/de_DE.csv b/app/code/Magento/Msrp/i18n/de_DE.csv
-deleted file mode 100644
-index be8e733a4bf..00000000000
---- a/app/code/Magento/Msrp/i18n/de_DE.csv
-+++ /dev/null
-@@ -1,2 +0,0 @@
--"Enabling MAP by default will hide all product prices on Storefront.","Enabling MAP by default will hide all product prices on Storefront."
--"Warning!","Warning!"
-diff --git a/app/code/Magento/Msrp/i18n/en_US.csv b/app/code/Magento/Msrp/i18n/en_US.csv
-index d647f8527ec..d47d72b2bdc 100644
---- a/app/code/Magento/Msrp/i18n/en_US.csv
-+++ b/app/code/Magento/Msrp/i18n/en_US.csv
-@@ -13,6 +13,7 @@ Price,Price
- "Add to Cart","Add to Cart"
- "Minimum Advertised Price","Minimum Advertised Price"
- "Enable MAP","Enable MAP"
-+"<strong style=""color:red"">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront.","<strong style=""color:red"">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront."
- "Display Actual Price","Display Actual Price"
- "Default Popup Text Message","Default Popup Text Message"
- "Default ""What's This"" Text Message","Default ""What's This"" Text Message"
-diff --git a/app/code/Magento/Msrp/i18n/es_ES.csv b/app/code/Magento/Msrp/i18n/es_ES.csv
-deleted file mode 100644
-index be8e733a4bf..00000000000
---- a/app/code/Magento/Msrp/i18n/es_ES.csv
-+++ /dev/null
-@@ -1,2 +0,0 @@
--"Enabling MAP by default will hide all product prices on Storefront.","Enabling MAP by default will hide all product prices on Storefront."
--"Warning!","Warning!"
-diff --git a/app/code/Magento/Msrp/i18n/fr_FR.csv b/app/code/Magento/Msrp/i18n/fr_FR.csv
-deleted file mode 100644
-index be8e733a4bf..00000000000
---- a/app/code/Magento/Msrp/i18n/fr_FR.csv
-+++ /dev/null
-@@ -1,2 +0,0 @@
--"Enabling MAP by default will hide all product prices on Storefront.","Enabling MAP by default will hide all product prices on Storefront."
--"Warning!","Warning!"
-diff --git a/app/code/Magento/Msrp/i18n/nl_NL.csv b/app/code/Magento/Msrp/i18n/nl_NL.csv
-deleted file mode 100644
-index be8e733a4bf..00000000000
---- a/app/code/Magento/Msrp/i18n/nl_NL.csv
-+++ /dev/null
-@@ -1,2 +0,0 @@
--"Enabling MAP by default will hide all product prices on Storefront.","Enabling MAP by default will hide all product prices on Storefront."
--"Warning!","Warning!"
-diff --git a/app/code/Magento/Msrp/i18n/pt_BR.csv b/app/code/Magento/Msrp/i18n/pt_BR.csv
-deleted file mode 100644
-index be8e733a4bf..00000000000
---- a/app/code/Magento/Msrp/i18n/pt_BR.csv
-+++ /dev/null
-@@ -1,2 +0,0 @@
--"Enabling MAP by default will hide all product prices on Storefront.","Enabling MAP by default will hide all product prices on Storefront."
--"Warning!","Warning!"
-diff --git a/app/code/Magento/Msrp/i18n/zh_Hans_CN.csv b/app/code/Magento/Msrp/i18n/zh_Hans_CN.csv
-deleted file mode 100644
-index be8e733a4bf..00000000000
---- a/app/code/Magento/Msrp/i18n/zh_Hans_CN.csv
-+++ /dev/null
-@@ -1,2 +0,0 @@
--"Enabling MAP by default will hide all product prices on Storefront.","Enabling MAP by default will hide all product prices on Storefront."
--"Warning!","Warning!"
-diff --git a/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml b/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml
-index 9e2dd206386..b8a3910bf21 100644
---- a/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml
-+++ b/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml
-@@ -11,7 +11,7 @@
-             <argument name="default" xsi:type="array">
-                 <item name="prices" xsi:type="array">
-                     <item name="msrp_price" xsi:type="array">
--                        <item name="render_class" xsi:type="string">Magento\Catalog\Pricing\Render\PriceBox</item>
-+                        <item name="render_class" xsi:type="string">Magento\Msrp\Pricing\Render\PriceBox</item>
-                         <item name="render_template" xsi:type="string">Magento_Msrp::product/price/msrp.phtml</item>
-                     </item>
-                 </item>
-diff --git a/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml b/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml
-new file mode 100644
-index 00000000000..b60bc71e9e7
---- /dev/null
-+++ b/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml
-@@ -0,0 +1,11 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <update handle="msrp_popup"/>
-+    <body/>
-+</page>
-\ No newline at end of file
-diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
-index 869d8156364..2ab40a7ec82 100644
---- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
-+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
-@@ -4,12 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * Template for displaying product price at product view page, gift registry and wish-list
-  *
-- * @var $block \Magento\Catalog\Pricing\Render\PriceBox
-+ * @var $block \Magento\Msrp\Pricing\Render\PriceBox
-  */
- ?>
- <?php
-@@ -20,8 +18,11 @@ $priceType = $block->getPrice();
- /** @var $product \Magento\Catalog\Model\Product */
- $product = $block->getSaleableItem();
- $productId = $product->getId();
-+
-+$amount = $block->getMsrpPriceCalculator()->getMsrpPriceValue($product);
-+
- $msrpPrice = $block->renderAmount(
--    $priceType->getCustomAmount($product->getMsrp() ?: $product->getTypeInstance()->getChildrenMsrp($product)),
-+    $priceType->getCustomAmount($amount),
-     [
-         'price_id' => $block->getPriceId() ? $block->getPriceId() : 'old-price-' . $productId,
-         'include_container' => false,
-@@ -29,73 +30,85 @@ $msrpPrice = $block->renderAmount(
-     ]
- );
- $priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElementIdPrefix() : 'product-price-';
--
--$addToCartUrl = '';
--if ($product->isSaleable()) {
--    /** @var Magento\Catalog\Block\Product\AbstractProduct $addToCartUrlGenerator */
--    $addToCartUrlGenerator = $block->getLayout()->getBlockSingleton('Magento\Catalog\Block\Product\AbstractProduct');
--    $addToCartUrl = $addToCartUrlGenerator->getAddToCartUrl(
--        $product,
--        ['_query' => [
--            \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED =>
--                $this->helper('Magento\Framework\Url\Helper\Data')->getEncodedUrl(
--                    $addToCartUrlGenerator->getAddToCartUrl($product)
--                ),
--        ]]
--    );
--}
- ?>
--<?php if ($product->getMsrp()): ?>
--    <span class="old-price map-old-price"><?= /* @escapeNotVerified */ $msrpPrice ?></span>
-+
-+<?php if ($amount) : ?>
-+    <span class="old-price map-old-price"><?= /* @noEscape */ $msrpPrice ?></span>
-+    <span class="map-fallback-price normal-price"><?= /* @noEscape */ $msrpPrice ?></span>
- <?php endif; ?>
- 
--<?php if ($priceType->isShowPriceOnGesture()): ?>
-+<?php if ($priceType->isShowPriceOnGesture()) : ?>
-     <?php
--        $priceElementId = $priceElementIdPrefix . $productId . $block->getIdSuffix();
--        $popupId = 'msrp-popup-' . $productId . $block->getRandomString(20);
--        $data = ['addToCart' => [
--            'origin'=> 'msrp',
--            'popupId' => '#' . $popupId,
--            'productName' => $block->escapeJs($block->escapeHtml($product->getName())),
--            'productId' => $productId,
--            'productIdInput' => 'input[type="hidden"][name="product"]',
--            'realPrice' => $block->getRealPriceHtml(),
--            'isSaleable' => $product->isSaleable(),
--            'msrpPrice' => $msrpPrice,
--            'priceElementId' => $priceElementId,
--            'closeButtonId' => '#map-popup-close',
--            'addToCartUrl' => $addToCartUrl,
--            'paymentButtons' => '[data-label=or]'
--        ]];
--        if ($block->getRequest()->getFullActionName() === 'catalog_product_view') {
--            $data['addToCart']['addToCartButton'] = '#product_addtocart_form [type=submit]';
--        } else {
--            $data['addToCart']['addToCartButton'] = sprintf(
--                'form:has(input[type="hidden"][name="product"][value="%s"]) button[type="submit"]',
--                (int) $productId
--            );
--        }
-+
-+    $addToCartUrl = '';
-+    if ($product->isSaleable()) {
-+        /** @var Magento\Catalog\Block\Product\AbstractProduct $addToCartUrlGenerator */
-+        $addToCartUrlGenerator = $block->getLayout()->getBlockSingleton(\Magento\Catalog\Block\Product\AbstractProduct::class);
-+        // phpcs:disable
-+        $addToCartUrl = $addToCartUrlGenerator->getAddToCartUrl(
-+            $product,
-+            ['_query' => [
-+                \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED =>
-+                    $this->helper(\Magento\Framework\Url\Helper\Data::class)->getEncodedUrl(
-+                        $addToCartUrlGenerator->getAddToCartUrl($product)
-+                    ),
-+            ]]
-+        );
-+        // phpcs:enable
-+    }
-+
-+    $priceElementId = $priceElementIdPrefix . $productId . $block->getIdSuffix();
-+    $popupId = 'msrp-popup-' . $productId . $block->getRandomString(20);
-+    $data = ['addToCart' => [
-+        'origin'=> 'msrp',
-+        'popupId' => '#' . $popupId,
-+        'productName' => $block->escapeJs($block->escapeHtml($product->getName())),
-+        'productId' => $productId,
-+        'productIdInput' => 'input[type="hidden"][name="product"]',
-+        'realPrice' => $block->getRealPriceHtml(),
-+        'isSaleable' => $product->isSaleable(),
-+        'msrpPrice' => $msrpPrice,
-+        'priceElementId' => $priceElementId,
-+        'closeButtonId' => '#map-popup-close',
-+        'addToCartUrl' => $addToCartUrl,
-+        'paymentButtons' => '[data-label=or]'
-+    ]];
-+    if ($block->getRequest()->getFullActionName() === 'catalog_product_view') {
-+        $data['addToCart']['addToCartButton'] = '#product_addtocart_form [type=submit]';
-+    } else {
-+        $data['addToCart']['addToCartButton'] = sprintf(
-+            'form:has(input[type="hidden"][name="product"][value="%s"]) button[type="submit"]',
-+            (int) $productId . ',' .
-+            sprintf(
-+                '.block.widget .price-box[data-product-id=%s]+.product-item-actions button.tocart',
-+                (int)$productId
-+            )
-+        );
-+    }
-     ?>
--    <span id="<?= /* @escapeNotVerified */ $block->getPriceId() ? $block->getPriceId() : $priceElementId ?>" style="display:none"></span>
-+    <span id="<?= $block->escapeHtmlAttr($block->getPriceId() ? $block->getPriceId() : $priceElementId) ?>" style="display:none"></span>
-     <a href="javascript:void(0);"
--       id="<?= /* @escapeNotVerified */ ($popupId) ?>"
-+       id="<?= /* @noEscape */ ($popupId) ?>"
-        class="action map-show-info"
--       data-mage-init='<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data) ?>'><?= /* @escapeNotVerified */ __('Click for price') ?>
-+       <?php //phpcs:disable ?>
-+       data-mage-init='<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($data) ?>'>
-+        <?php //phpcs:enable ?>
-+        <?= $block->escapeHtml(__('Click for price')) ?>
-     </a>
--<?php else: ?>
-+<?php else : ?>
-     <span class="msrp-message">
--     <?= /* @escapeNotVerified */ $priceType->getMsrpPriceMessage() ?>
-+     <?= $block->escapeHtml($priceType->getMsrpPriceMessage()) ?>
-     </span>
- <?php endif; ?>
- 
--<?php if ($block->getZone() == \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW): ?>
-+<?php if ($block->getZone() == \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW) : ?>
-     <?php $helpLinkId = 'msrp-help-' . $productId . $block->getRandomString(20); ?>
-     <a href="javascript:void(0);"
--       id="<?= /* @escapeNotVerified */ $helpLinkId ?>"
-+       id="<?= /* @noEscape */ $helpLinkId ?>"
-        class="action map-show-info"
-        data-mage-init='{"addToCart":{"origin": "info",
--                                     "helpLinkId": "#<?= /* @escapeNotVerified */ $helpLinkId ?>",
-+                                     "helpLinkId": "#<?= /* @noEscape */ $helpLinkId ?>",
-                                      "productName": "<?= $block->escapeJs($block->escapeHtml($product->getName())) ?>",
--                                     "closeButtonId": "#map-popup-close"}}'><span><?= /* @escapeNotVerified */ __("What's this?") ?></span>
-+                                     "closeButtonId": "#map-popup-close"}}'><span><?= $block->escapeHtml(__("What's this?")) ?></span>
-     </a>
- <?php endif; ?>
-diff --git a/app/code/Magento/Msrp/view/base/web/js/msrp.js b/app/code/Magento/Msrp/view/base/web/js/msrp.js
-index deeadd9b55b..a0bd3ec132d 100644
---- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
-+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
-@@ -4,11 +4,12 @@
-  */
- define([
-     'jquery',
-+    'Magento_Catalog/js/price-utils',
-     'underscore',
-     'jquery/ui',
-     'mage/dropdown',
-     'mage/template'
--], function ($) {
-+], function ($, priceUtils, _) {
-     'use strict';
- 
-     $.widget('mage.addToCart', {
-@@ -24,7 +25,14 @@ define([
-             // Selectors
-             cartForm: '.form.map.checkout',
-             msrpLabelId: '#map-popup-msrp',
-+            msrpPriceElement: '#map-popup-msrp .price-wrapper',
-             priceLabelId: '#map-popup-price',
-+            priceElement: '#map-popup-price .price',
-+            mapInfoLinks: '.map-show-info',
-+            displayPriceElement: '.old-price.map-old-price .price-wrapper',
-+            fallbackPriceElement: '.normal-price.map-fallback-price .price-wrapper',
-+            displayPriceContainer: '.old-price.map-old-price',
-+            fallbackPriceContainer: '.normal-price.map-fallback-price',
-             popUpAttr: '[data-role=msrp-popup-template]',
-             popupCartButtonId: '#map-popup-button',
-             paypalCheckoutButons: '[data-action=checkout-form-submit]',
-@@ -59,9 +67,11 @@ define([
-             shadowHinter: 'popup popup-pointer'
-         },
-         popupOpened: false,
-+        wasOpened: false,
- 
-         /**
-          * Creates widget instance
-+         *
-          * @private
-          */
-         _create: function () {
-@@ -73,10 +83,13 @@ define([
-                 this.initTierPopup();
-             }
-             $(this.options.cartButtonId).on('click', this._addToCartSubmit.bind(this));
-+            $(document).on('updateMsrpPriceBlock', this.onUpdateMsrpPrice.bind(this));
-+            $(this.options.cartForm).on('submit', this._onSubmitForm.bind(this));
-         },
- 
-         /**
-          * Init msrp popup
-+         *
-          * @private
-          */
-         initMsrpPopup: function () {
-@@ -89,7 +102,7 @@ define([
- 
-             $msrpPopup.find('button')
-                 .on('click',
--                this.handleMsrpAddToCart.bind(this))
-+                    this.handleMsrpAddToCart.bind(this))
-                 .filter(this.options.popupCartButtonId)
-                 .text($(this.options.addToCartButton).text());
- 
-@@ -104,6 +117,7 @@ define([
- 
-         /**
-          * Init info popup
-+         *
-          * @private
-          */
-         initInfoPopup: function () {
-@@ -212,8 +226,12 @@ define([
-             var options = this.tierOptions || this.options;
- 
-             this.popUpOptions.position.of = $(event.target);
--            this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
--            this.$popup.find(this.options.priceLabelId).html(options.realPrice);
-+
-+            if (!this.wasOpened) {
-+                this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
-+                this.$popup.find(this.options.priceLabelId).html(options.realPrice);
-+                this.wasOpened = true;
-+            }
-             this.$popup.dropdownDialog(this.popUpOptions).dropdownDialog('open');
-             this._toggle(this.$popup);
- 
-@@ -223,6 +241,7 @@ define([
-         },
- 
-         /**
-+         * Toggle MAP popup visibility
-          *
-          * @param {HTMLElement} $elem
-          * @private
-@@ -239,6 +258,7 @@ define([
-         },
- 
-         /**
-+         * Close MAP information popup
-          *
-          * @param {HTMLElement} $elem
-          */
-@@ -249,8 +269,10 @@ define([
- 
-         /**
-          * Handler for addToCart action
-+         *
-+         * @param {Object} e
-          */
--        _addToCartSubmit: function () {
-+        _addToCartSubmit: function (e) {
-             this.element.trigger('addToCart', this.element);
- 
-             if (this.element.data('stop-processing')) {
-@@ -266,9 +288,106 @@ define([
-             if (this.options.addToCartUrl) {
-                 $('.mage-dropdown-dialog > .ui-dialog-content').dropdownDialog('close');
-             }
-+
-+            e.preventDefault();
-             $(this.options.cartForm).submit();
-+        },
- 
-+        /**
-+         * Call on event updatePrice. Proxy to updateMsrpPrice method.
-+         *
-+         * @param {Event} event
-+         * @param {mixed} priceIndex
-+         * @param {Object} prices
-+         */
-+        onUpdateMsrpPrice: function onUpdateMsrpPrice(event, priceIndex, prices) {
-+
-+            var defaultMsrp,
-+                defaultPrice,
-+                msrpPrice,
-+                finalPrice;
-+
-+            defaultMsrp = _.chain(prices).map(function (price) {
-+                return price.msrpPrice.amount;
-+            }).reject(function (p) {
-+                return p === null;
-+            }).max().value();
-+
-+            defaultPrice = _.chain(prices).map(function (p) {
-+                return p.finalPrice.amount;
-+            }).min().value();
-+
-+            if (typeof priceIndex !== 'undefined') {
-+                msrpPrice = prices[priceIndex].msrpPrice.amount;
-+                finalPrice = prices[priceIndex].finalPrice.amount;
-+
-+                if (msrpPrice === null || msrpPrice <= finalPrice) {
-+                    this.updateNonMsrpPrice(priceUtils.formatPrice(finalPrice));
-+                } else {
-+                    this.updateMsrpPrice(
-+                        priceUtils.formatPrice(finalPrice),
-+                        priceUtils.formatPrice(msrpPrice),
-+                        false);
-+                }
-+            } else {
-+                this.updateMsrpPrice(
-+                    priceUtils.formatPrice(defaultPrice),
-+                    priceUtils.formatPrice(defaultMsrp),
-+                    true);
-+            }
-+        },
-+
-+        /**
-+         * Update prices for configurable product with MSRP enabled
-+         *
-+         * @param {String} finalPrice
-+         * @param {String} msrpPrice
-+         * @param {Boolean} useDefaultPrice
-+         */
-+        updateMsrpPrice: function (finalPrice, msrpPrice, useDefaultPrice) {
-+            var options = this.tierOptions || this.options;
-+
-+            $(this.options.fallbackPriceContainer).hide();
-+            $(this.options.displayPriceContainer).show();
-+            $(this.options.mapInfoLinks).show();
-+
-+            if (useDefaultPrice || !this.wasOpened) {
-+                this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
-+                this.$popup.find(this.options.priceLabelId).html(options.realPrice);
-+                $(this.options.displayPriceElement).html(msrpPrice);
-+                this.wasOpened = true;
-+            }
-+
-+            if (!useDefaultPrice) {
-+                this.$popup.find(this.options.msrpPriceElement).html(msrpPrice);
-+                this.$popup.find(this.options.priceElement).html(finalPrice);
-+                $(this.options.displayPriceElement).html(msrpPrice);
-+            }
-+        },
-+
-+        /**
-+         * Display non MAP price for irrelevant products
-+         *
-+         * @param {String} price
-+         */
-+        updateNonMsrpPrice: function (price) {
-+            $(this.options.fallbackPriceElement).html(price);
-+            $(this.options.displayPriceContainer).hide();
-+            $(this.options.mapInfoLinks).hide();
-+            $(this.options.fallbackPriceContainer).show();
-+        },
-+
-+        /**
-+         * Handler for submit form
-+         *
-+         * @private
-+         */
-+        _onSubmitForm: function () {
-+            if ($(this.options.cartForm).valid()) {
-+                $(this.options.cartButtonId).prop('disabled', true);
-+            }
-         }
-+
-     });
- 
-     return $.mage.addToCart;
-diff --git a/app/code/Magento/Msrp/view/frontend/templates/cart/subtotal.phtml b/app/code/Magento/Msrp/view/frontend/templates/cart/subtotal.phtml
-index 0bfd4589bb7..0e00a2df892 100644
---- a/app/code/Magento/Msrp/view/frontend/templates/cart/subtotal.phtml
-+++ b/app/code/Magento/Msrp/view/frontend/templates/cart/subtotal.phtml
-@@ -6,6 +6,6 @@
- ?>
- <div class="subtotal">
-     <span class="mark msrp">
--        <?= /* @escapeNotVerified */ __('Order total will be displayed before you submit the order') ?>
-+        <?= $block->escapeHtml(__('Order total will be displayed before you submit the order')) ?>
-     </span>
- </div>
-diff --git a/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml b/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml
-index d632a2fe8c1..9fa36466fb8 100644
---- a/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml
-+++ b/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <div class="cart-totals">
--    <div class="msrp totals"><?= /* @escapeNotVerified */ __('You will see the order total before you submit the order.') ?></div>
-+    <div class="msrp totals"><?= $block->escapeHtml(__('You will see the order total before you submit the order.')) ?></div>
- </div>
-diff --git a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
-index 7ccd606b8f1..8bab3085134 100644
---- a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
-+++ b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
-@@ -3,14 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var \Magento\Msrp\Block\Popup $block */
- ?>
--<?php if ($block->isEnabled()): ?>
-+<?php if ($block->isEnabled()) : ?>
-     <script data-role="msrp-popup-template" type="text/x-magento-template">
-     <div id="map-popup-click-for-price" class="map-popup">
-         <div class="popup-header">
-@@ -20,23 +17,22 @@
-             <div class="map-info-price" id="map-popup-content">
-                 <div class="price-box">
-                     <div class="map-msrp" id="map-popup-msrp-box">
--                        <span class="label"><?= /* @escapeNotVerified */ __('Price') ?></span>
-+                        <span class="label"><?= $block->escapeHtml(__('Price')) ?></span>
-                         <span class="old-price map-old-price" id="map-popup-msrp">
-                             <span class="price"></span>
-                         </span>
-                     </div>
-                     <div class="map-price" id="map-popup-price-box">
--                        <span class="label"><?= /* @escapeNotVerified */ __('Actual Price') ?></span>
-+                        <span class="label"><?= $block->escapeHtml(__('Actual Price')) ?></span>
-                         <span id="map-popup-price" class="actual-price"></span>
-                     </div>
-                 </div>
--                <form action="" method="POST" id="product_addtocart_form_from_popup" class="map-form-addtocart">
--                    <input type="hidden" name="product" class="product_id" value="" id="map-popup-product-id"/>
-+                <form action="" method="POST" class="map-form-addtocart">
-+                    <input type="hidden" name="product" class="product_id" value="" />
-                     <button type="button"
-                             title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
--                            class="action tocart primary"
--                            id="map-popup-button">
--                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                            class="action tocart primary">
-+                        <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                     </button>
-                     <div class="additional-addtocart-box">
-                         <?= $block->getChildHtml() ?>
-@@ -44,7 +40,7 @@
-                 </form>
-             </div>
-             <div class="map-text" id="map-popup-text">
--                <?= /* @escapeNotVerified */ $block->getExplanationMessage() ?>
-+                <?= /* @noEscape */ $block->getExplanationMessage() ?>
-             </div>
-         </div>
-     </div>
-@@ -56,7 +52,7 @@
-         </div>
-         <div class="popup-content">
-             <div class="map-help-text" id="map-popup-text-what-this">
--                <?= /* @escapeNotVerified */ $block->getExplanationMessageWhatsThis() ?>
-+                <?= /* @noEscape */ $block->getExplanationMessageWhatsThis() ?>
-             </div>
-         </div>
-     </div>
-diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
-index 8f697001d30..dfb66e4cc47 100644
---- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
-+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php
-@@ -16,10 +13,12 @@
-  */
- ?>
- <?php
-+    //phpcs:disable
-     /** @var $pricingHelper \Magento\Framework\Pricing\Helper\Data */
--    $pricingHelper = $this->helper('Magento\Framework\Pricing\Helper\Data');
-+    $pricingHelper = $this->helper(\Magento\Framework\Pricing\Helper\Data::class);
-     /** @var $_catalogHelper \Magento\Catalog\Helper\Data */
--    $_catalogHelper = $this->helper('Magento\Catalog\Helper\Data');
-+    $_catalogHelper = $this->helper(\Magento\Catalog\Helper\Data::class);
-+    //phpcs:enable
- 
-     /** @var $_product \Magento\Catalog\Model\Product */
-     $_product = $block->getProduct();
-@@ -27,29 +26,31 @@
-     $_msrpPrice = '';
- ?>
- <div class="price-box msrp">
--    <?php if ($_product->getMsrp()): ?>
-+    <?php if ($_product->getMsrp()) : ?>
-         <?php $_msrpPrice = $pricingHelper->currency($_product->getMsrp(), true, false) ?>
--        <span class="old-price"><?= /* @escapeNotVerified */ $_msrpPrice ?></span>
-+        <span class="old-price"><?= /* @noEscape */ $_msrpPrice ?></span>
-     <?php endif; ?>
--    <?php if ($_catalogHelper->isShowPriceOnGesture($_product)): ?>
-+    <?php if ($_catalogHelper->isShowPriceOnGesture($_product)) : ?>
-         <?php $priceElementId = 'product-price-' . $_id . $block->getIdSuffix(); ?>
--        <span id="<?= /* @escapeNotVerified */ $priceElementId ?>" style="display: none"></span>
-+        <span id="<?= /* @noEscape */ $priceElementId ?>" style="display: none"></span>
-         <?php $popupId = 'msrp-popup-' . $_id . $block->getRandomString(20); ?>
-         <a href="javascript:void(0);"
--           id="<?= /* @escapeNotVerified */ ($popupId) ?>"
--           data-mage-init='{"addToCart":{"popupId": "#<?= /* @escapeNotVerified */ ($popupId) ?>",
-+           id="<?= /* @noEscape */ ($popupId) ?>"
-+           data-mage-init='{"addToCart":{"popupId": "#<?= /* @noEscape */ ($popupId) ?>",
-                                          "productName": "<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($_product->getName())) ?>",
--                                         "realPrice": <?= /* @escapeNotVerified */ $block->getRealPriceJs($_product) ?>,
--                                         "msrpPrice": "<?= /* @escapeNotVerified */ $_msrpPrice ?>",
--                                         "priceElementId":"<?= /* @escapeNotVerified */ $priceElementId ?>",
-+                                         "realPrice": <?= /* @noEscape */ $block->getRealPriceJs($_product) ?>,
-+                                         "msrpPrice": "<?= /* @noEscape */ $_msrpPrice ?>",
-+                                         "priceElementId":"<?= /* @noEscape */ $priceElementId ?>",
-                                          "popupCartButtonId": "#map-popup-button",
--                                         "cartForm": "#wishlist-view-form"}}'><?= /* @escapeNotVerified */ __('Click for price') ?>
-+                                         "cartForm": "#wishlist-view-form"}}'><?= $block->escapeHtml(__('Click for price')) ?>
-         </a>
--    <?php else: ?>
-+    <?php else : ?>
-         <span class="msrp-message">
--            <?= /* @escapeNotVerified */ $_catalogHelper->getMsrpPriceMessage($_product) ?>
-+            <?= $block->escapeHtml($_catalogHelper->getMsrpPriceMessage($_product)) ?>
-         </span>
-     <?php endif; ?>
-     <?php $helpLinkId = 'msrp-help-' . $_id . $block->getRandomString(20); ?>
--    <a href="javascript:void(0);" id="<?= /* @escapeNotVerified */ ($helpLinkId) ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?= /* @escapeNotVerified */ ($helpLinkId) ?>", "productName": "<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($_product->getName())) ?>"}}' class="link tip"><?= /* @escapeNotVerified */ __("What's this?") ?></a>
-+    <a href="javascript:void(0);" id="<?= /* @noEscape */ ($helpLinkId) ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?= /* @noEscape */ ($helpLinkId) ?>", "productName": "<?= /* @noEscape */$block->escapeJs($block->escapeHtml($_product->getName())) ?>"}}' class="link tip">
-+        <?= $block->escapeHtml(__("What's this?")) ?>
-+    </a>
- </div>
-diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml
-index d41bec0d9eb..45f90fe3253 100644
---- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml
-+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -15,7 +12,11 @@
-  */
- ?>
- <div class="price-box msrp">
--    <?php if ($this->helper('Magento\Msrp\Helper\Data')->canApplyMsrp($block->getProduct())): ?>
--        <a href="<?= /* @escapeNotVerified */ $block->getProduct()->getProductUrl() ?>"><?= /* @escapeNotVerified */ __('Click for price') ?></a>
-+    <?php //phpcs:disable ?>
-+    <?php if ($this->helper(\Magento\Msrp\Helper\Data::class)->canApplyMsrp($block->getProduct())) : ?>
-+    <?php //phpcs:enable ?>
-+        <a href="<?= $block->escapeUrl($block->getProduct()->getProductUrl()) ?>">
-+            <?= $block->escapeHtml(__('Click for price')) ?>
-+        </a>
-     <?php endif; ?>
- </div>
-diff --git a/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php b/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php
-new file mode 100644
-index 00000000000..b6f5194ab8c
---- /dev/null
-+++ b/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php
-@@ -0,0 +1,46 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\MsrpConfigurableProduct\Pricing;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
-+
-+/**
-+ * {@inheritdoc}. Provide information for a Configurable product.
-+ */
-+class MsrpPriceCalculator implements MsrpPriceCalculatorInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getMsrpPriceValue(ProductInterface $product): float
-+    {
-+        /** @var Product $product */
-+        if ($product->getTypeId() !== Configurable::TYPE_CODE) {
-+            return 0;
-+        }
-+
-+        /** @var Configurable $configurableProduct */
-+        $configurableProduct = $product->getTypeInstance();
-+        $msrp = 0;
-+        $prices = [];
-+        foreach ($configurableProduct->getUsedProducts($product) as $item) {
-+            if ($item->getMsrp() !== null) {
-+                $prices[] = $item->getMsrp();
-+            }
-+        }
-+        if ($prices) {
-+            $msrp = (float)max($prices);
-+        }
-+
-+        return  $msrp;
-+    }
-+}
-diff --git a/app/code/Magento/MsrpConfigurableProduct/README.md b/app/code/Magento/MsrpConfigurableProduct/README.md
-new file mode 100644
-index 00000000000..8911b6e9e66
---- /dev/null
-+++ b/app/code/Magento/MsrpConfigurableProduct/README.md
-@@ -0,0 +1,3 @@
-+# MsrpConfigurableProduct
-+
-+**MsrpConfigurableProduct** provides type and resolver information for the Msrp module from the ConfigurableProduct module.
-\ No newline at end of file
-diff --git a/app/code/Magento/MsrpConfigurableProduct/composer.json b/app/code/Magento/MsrpConfigurableProduct/composer.json
-new file mode 100644
-index 00000000000..00c3cf6b030
---- /dev/null
-+++ b/app/code/Magento/MsrpConfigurableProduct/composer.json
-@@ -0,0 +1,27 @@
-+{
-+    "name": "magento/module-msrp-configurable-product",
-+    "description": "N/A",
-+    "config": {
-+        "sort-packages": true
-+    },
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-catalog": "*",
-+        "magento/module-msrp": "*",
-+        "magento/module-configurable-product": "*"
-+    },
-+    "type": "magento2-module",
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\MsrpConfigurableProduct\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/MsrpConfigurableProduct/etc/di.xml b/app/code/Magento/MsrpConfigurableProduct/etc/di.xml
-new file mode 100644
-index 00000000000..ea33c81ff7c
---- /dev/null
-+++ b/app/code/Magento/MsrpConfigurableProduct/etc/di.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="\Magento\Msrp\Pricing\MsrpPriceCalculator">
-+        <arguments>
-+            <argument name="msrpPriceCalculators" xsi:type="array">
-+                <item name="configurable" xsi:type="array">
-+                    <item name="productType" xsi:type="const">\Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE</item>
-+                    <item name="priceCalculator" xsi:type="object">\Magento\MsrpConfigurableProduct\Pricing\MsrpPriceCalculator</item>
-+                </item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-\ No newline at end of file
-diff --git a/app/code/Magento/MsrpConfigurableProduct/etc/module.xml b/app/code/Magento/MsrpConfigurableProduct/etc/module.xml
-new file mode 100644
-index 00000000000..b00e363b0b2
---- /dev/null
-+++ b/app/code/Magento/MsrpConfigurableProduct/etc/module.xml
-@@ -0,0 +1,16 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_MsrpConfigurableProduct" >
-+        <sequence>
-+            <module name="Magento_Catalog"/>
-+            <module name="Magento_Msrp"/>
-+            <module name="Magento_ConfigurableProduct"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/app/code/Magento/MsrpConfigurableProduct/registration.php b/app/code/Magento/MsrpConfigurableProduct/registration.php
-new file mode 100644
-index 00000000000..d4d58ec3c01
---- /dev/null
-+++ b/app/code/Magento/MsrpConfigurableProduct/registration.php
-@@ -0,0 +1,9 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use \Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_MsrpConfigurableProduct', __DIR__);
-diff --git a/app/code/Magento/MsrpGroupedProduct/Pricing/MsrpPriceCalculator.php b/app/code/Magento/MsrpGroupedProduct/Pricing/MsrpPriceCalculator.php
-new file mode 100644
-index 00000000000..b99f328a8b2
---- /dev/null
-+++ b/app/code/Magento/MsrpGroupedProduct/Pricing/MsrpPriceCalculator.php
-@@ -0,0 +1,36 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\MsrpGroupedProduct\Pricing;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\GroupedProduct\Model\Product\Type\Grouped;
-+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
-+
-+/**
-+ * {@inheritdoc}. Provide information for a Grouped product.
-+ */
-+class MsrpPriceCalculator implements MsrpPriceCalculatorInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getMsrpPriceValue(ProductInterface $product): float
-+    {
-+        /** @var Product $product */
-+        if ($product->getTypeId() !== Grouped::TYPE_CODE) {
-+            return 0;
-+        }
-+
-+        /** @var Grouped $groupedProduct */
-+        $groupedProduct = $product->getTypeInstance();
-+
-+        return $groupedProduct->getChildrenMsrp($product);
-+    }
-+}
-diff --git a/app/code/Magento/MsrpGroupedProduct/README.md b/app/code/Magento/MsrpGroupedProduct/README.md
-new file mode 100644
-index 00000000000..d597ba7fc18
---- /dev/null
-+++ b/app/code/Magento/MsrpGroupedProduct/README.md
-@@ -0,0 +1,3 @@
-+# MsrpGroupedProduct
-+
-+**MsrpGroupedProduct** provides type and resolver information for the Msrp module from the GroupedProduct module.
-\ No newline at end of file
-diff --git a/app/code/Magento/MsrpGroupedProduct/composer.json b/app/code/Magento/MsrpGroupedProduct/composer.json
-new file mode 100644
-index 00000000000..a626f199ad6
---- /dev/null
-+++ b/app/code/Magento/MsrpGroupedProduct/composer.json
-@@ -0,0 +1,27 @@
-+{
-+    "name": "magento/module-msrp-grouped-product",
-+    "description": "N/A",
-+    "config": {
-+        "sort-packages": true
-+    },
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-catalog": "*",
-+        "magento/module-msrp": "*",
-+        "magento/module-grouped-product": "*"
-+    },
-+    "type": "magento2-module",
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\MsrpGroupedProduct\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/MsrpGroupedProduct/etc/di.xml b/app/code/Magento/MsrpGroupedProduct/etc/di.xml
-new file mode 100644
-index 00000000000..29b25f15bc2
---- /dev/null
-+++ b/app/code/Magento/MsrpGroupedProduct/etc/di.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="\Magento\Msrp\Pricing\MsrpPriceCalculator">
-+        <arguments>
-+            <argument name="msrpPriceCalculators" xsi:type="array">
-+                <item name="grouped" xsi:type="array">
-+                    <item name="productType" xsi:type="const">\Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE</item>
-+                    <item name="priceCalculator" xsi:type="object">\Magento\MsrpGroupedProduct\Pricing\MsrpPriceCalculator</item>
-+                </item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-\ No newline at end of file
-diff --git a/app/code/Magento/MsrpGroupedProduct/etc/module.xml b/app/code/Magento/MsrpGroupedProduct/etc/module.xml
-new file mode 100644
-index 00000000000..898dd904b5d
---- /dev/null
-+++ b/app/code/Magento/MsrpGroupedProduct/etc/module.xml
-@@ -0,0 +1,16 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_MsrpGroupedProduct" >
-+        <sequence>
-+            <module name="Magento_Catalog"/>
-+            <module name="Magento_Msrp"/>
-+            <module name="Magento_GroupedProduct"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/app/code/Magento/MsrpGroupedProduct/registration.php b/app/code/Magento/MsrpGroupedProduct/registration.php
-new file mode 100644
-index 00000000000..c5a261e66c6
---- /dev/null
-+++ b/app/code/Magento/MsrpGroupedProduct/registration.php
-@@ -0,0 +1,9 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use \Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_MsrpGroupedProduct', __DIR__);
-diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php b/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php
-index 78ea9fc1d2b..f97589342bc 100644
---- a/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php
-+++ b/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Multishipping\Controller\Checkout;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
- 
--class Addresses extends \Magento\Multishipping\Controller\Checkout
-+class Addresses extends \Magento\Multishipping\Controller\Checkout implements HttpGetActionInterface
- {
-     /**
-      * Multishipping checkout select address page
-diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Index.php b/app/code/Magento/Multishipping/Controller/Checkout/Index.php
-index 1fa96cfab8a..a4314d6d518 100644
---- a/app/code/Magento/Multishipping/Controller/Checkout/Index.php
-+++ b/app/code/Magento/Multishipping/Controller/Checkout/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Multishipping\Controller\Checkout;
- 
--class Index extends \Magento\Multishipping\Controller\Checkout
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Multishipping\Controller\Checkout implements HttpGetActionInterface
- {
-     /**
-      * Index action of Multishipping checkout
-diff --git a/app/code/Magento/Multishipping/Helper/Data.php b/app/code/Magento/Multishipping/Helper/Data.php
-index c9b36e34cb3..c7f552ac923 100644
---- a/app/code/Magento/Multishipping/Helper/Data.php
-+++ b/app/code/Magento/Multishipping/Helper/Data.php
-@@ -11,16 +11,19 @@ namespace Magento\Multishipping\Helper;
-  */
- class Data extends \Magento\Framework\App\Helper\AbstractHelper
- {
--    /**#@+
-+    /*
-      * Xml paths for multishipping checkout
-+     *
-      **/
-     const XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE = 'multishipping/options/checkout_multiple';
- 
-     const XML_PATH_CHECKOUT_MULTIPLE_MAXIMUM_QUANTITY = 'multishipping/options/checkout_multiple_maximum_qty';
- 
--    /**#@-*/
--
--    /**#@-*/
-+    /**
-+     * Checkout session
-+     *
-+     * @var \Magento\Checkout\Model\Session
-+     */
-     protected $checkoutSession;
- 
-     /**
-diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
-index 9412b138955..42f5289d210 100644
---- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
-+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
-@@ -176,8 +176,6 @@ class Multishipping extends \Magento\Framework\DataObject
-     private $dataObjectHelper;
- 
-     /**
--     * Constructor
--     *
-      * @param \Magento\Checkout\Model\Session $checkoutSession
-      * @param \Magento\Customer\Model\Session $customerSession
-      * @param \Magento\Sales\Model\OrderFactory $orderFactory
-@@ -202,8 +200,9 @@ class Multishipping extends \Magento\Framework\DataObject
-      * @param array $data
-      * @param \Magento\Quote\Api\Data\CartExtensionFactory|null $cartExtensionFactory
-      * @param AllowedCountries|null $allowedCountryReader
--     * @param Multishipping\PlaceOrderFactory $placeOrderFactory
--     * @param LoggerInterface $logger
-+     * @param Multishipping\PlaceOrderFactory|null $placeOrderFactory
-+     * @param LoggerInterface|null $logger
-+     * @param \Magento\Framework\Api\DataObjectHelper|null $dataObjectHelper
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -272,6 +271,7 @@ class Multishipping extends \Magento\Framework\DataObject
- 
-     /**
-      * Initialize multishipping checkout.
-+     *
-      * Split virtual/not virtual items between default billing/shipping addresses
-      *
-      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
-@@ -337,6 +337,7 @@ class Multishipping extends \Magento\Framework\DataObject
- 
-     /**
-      * Get quote items assigned to different quote addresses populated per item qty.
-+     *
-      * Based on result array we can display each item separately
-      *
-      * @return array
-@@ -397,7 +398,7 @@ class Multishipping extends \Magento\Framework\DataObject
-     /**
-      * Assign quote items to addresses and specify items qty
-      *
--     * array structure:
-+     * Array structure:
-      * array(
-      *      $quoteItemId => array(
-      *          'qty'       => $qty,
-@@ -693,6 +694,7 @@ class Multishipping extends \Magento\Framework\DataObject
-             $order->setIsVirtual(1);
-         } else {
-             $order->setShippingAddress($this->quoteAddressToOrderAddress->convert($address));
-+            $order->setShippingMethod($address->getShippingMethod());
-         }
- 
-         $order->setPayment($this->quotePaymentToOrderPayment->convert($quote->getPayment()));
-@@ -874,7 +876,7 @@ class Multishipping extends \Magento\Framework\DataObject
-      */
-     public function save()
-     {
--        $this->getQuote()->collectTotals();
-+        $this->getQuote()->setTotalsCollectedFlag(false)->collectTotals();
-         $this->quoteRepository->save($this->getQuote());
-         return $this;
-     }
-@@ -897,13 +899,23 @@ class Multishipping extends \Magento\Framework\DataObject
-      */
-     public function validateMinimumAmount()
-     {
--        return !($this->_scopeConfig->isSetFlag(
-+        $minimumOrderActive = $this->_scopeConfig->isSetFlag(
-             'sales/minimum_order/active',
-             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--        ) && $this->_scopeConfig->isSetFlag(
-+        );
-+
-+        $minimumOrderMultiFlag = $this->_scopeConfig->isSetFlag(
-             'sales/minimum_order/multi_address',
-             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--        ) && !$this->getQuote()->validateMinimumAmount());
-+        );
-+
-+        if ($minimumOrderMultiFlag) {
-+            $result = !($minimumOrderActive && !$this->getQuote()->validateMinimumAmount());
-+        } else {
-+            $result = !($minimumOrderActive && !$this->validateMinimumAmountForAddressItems());
-+        }
-+
-+        return $result;
-     }
- 
-     /**
-@@ -927,6 +939,8 @@ class Multishipping extends \Magento\Framework\DataObject
-     }
- 
-     /**
-+     * Get minimum amount error.
-+     *
-      * @return string
-      */
-     public function getMinimumAmountError()
-@@ -1071,7 +1085,7 @@ class Multishipping extends \Magento\Framework\DataObject
-     /**
-      * Check if specified address ID belongs to customer.
-      *
--     * @param $addressId
-+     * @param mixed $addressId
-      * @return bool
-      */
-     protected function isAddressIdApplicable($addressId)
-@@ -1084,6 +1098,8 @@ class Multishipping extends \Magento\Framework\DataObject
-     }
- 
-     /**
-+     * Prepare shipping assignment.
-+     *
-      * @param \Magento\Quote\Model\Quote $quote
-      * @return \Magento\Quote\Model\Quote
-      */
-@@ -1104,6 +1120,8 @@ class Multishipping extends \Magento\Framework\DataObject
-     }
- 
-     /**
-+     * Get shipping assignment processor.
-+     *
-      * @return \Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor
-      */
-     private function getShippingAssignmentProcessor()
-@@ -1115,6 +1133,44 @@ class Multishipping extends \Magento\Framework\DataObject
-         return $this->shippingAssignmentProcessor;
-     }
- 
-+    /**
-+     * Validate minimum amount for "Checkout with Multiple Addresses" when
-+     * "Validate Each Address Separately in Multi-address Checkout" is No.
-+     *
-+     * @return bool
-+     */
-+    private function validateMinimumAmountForAddressItems()
-+    {
-+        $result = true;
-+        $storeId = $this->getQuote()->getStoreId();
-+
-+        $minAmount = $this->_scopeConfig->getValue(
-+            'sales/minimum_order/amount',
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-+        $taxInclude = $this->_scopeConfig->getValue(
-+            'sales/minimum_order/tax_including',
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-+
-+        $this->getQuote()->collectTotals();
-+        $addresses = $this->getQuote()->getAllAddresses();
-+
-+        $baseTotal = 0;
-+        foreach ($addresses as $address) {
-+            $taxes = $taxInclude ? $address->getBaseTaxAmount() : 0;
-+            $baseTotal += $address->getBaseSubtotalWithDiscount() + $taxes;
-+        }
-+
-+        if ($baseTotal < $minAmount) {
-+            $result = false;
-+        }
-+
-+        return $result;
-+    }
-+
-     /**
-      * Remove successfully placed items from quote.
-      *
-@@ -1126,7 +1182,7 @@ class Multishipping extends \Magento\Framework\DataObject
-     {
-         foreach ($shippingAddresses as $address) {
-             foreach ($address->getAllItems() as $addressItem) {
--                if (in_array($addressItem->getId(), $placedAddressItems)) {
-+                if (in_array($addressItem->getQuoteItemId(), $placedAddressItems)) {
-                     if ($addressItem->getProduct()->getIsVirtual()) {
-                         $addressItem->isDeleted(true);
-                     } else {
-@@ -1176,7 +1232,7 @@ class Multishipping extends \Magento\Framework\DataObject
-         $item = array_pop($items);
-         foreach ($addresses as $address) {
-             foreach ($address->getAllItems() as $addressItem) {
--                if ($addressItem->getId() == $item->getQuoteItemId()) {
-+                if ($addressItem->getQuoteItemId() == $item->getQuoteItemId()) {
-                     return (int)$address->getId();
-                 }
-             }
-@@ -1186,10 +1242,11 @@ class Multishipping extends \Magento\Framework\DataObject
-     }
- 
-     /**
-+     * Get quote address errors.
-+     *
-      * @param OrderInterface[] $orders
-      * @param \Magento\Quote\Model\Quote\Address[] $addresses
-      * @param \Exception[] $exceptionList
--     *
-      * @return string[]
-      * @throws NotFoundException
-      */
-diff --git a/app/code/Magento/Multishipping/Test/Mftf/Page/NewMultishippingAddressPage.xml b/app/code/Magento/Multishipping/Test/Mftf/Page/NewMultishippingAddressPage.xml
-new file mode 100644
-index 00000000000..f25687a012e
---- /dev/null
-+++ b/app/code/Magento/Multishipping/Test/Mftf/Page/NewMultishippingAddressPage.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="NewMultishippingAddressPage" url="/multishipping/checkout_address/newShipping" module="Multishipping" area="storefront">
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml b/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml
-new file mode 100644
-index 00000000000..e7d57af1172
---- /dev/null
-+++ b/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <section name="MultishippingSection">
-+        <element name="checkoutWithMultipleAddresses" type="button" selector="//span[text()='Check Out with Multiple Addresses']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
-index 94c11bef1d3..02bc9668737 100644
---- a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
-+++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
-@@ -167,13 +167,18 @@ class MultishippingTest extends \PHPUnit\Framework\TestCase
-      */
-     private $sessionMock;
- 
-+    /**
-+     * @var PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $scopeConfigMock;
-+
-     protected function setUp()
-     {
-         $this->checkoutSessionMock = $this->createSimpleMock(Session::class);
-         $this->customerSessionMock = $this->createSimpleMock(CustomerSession::class);
-         $this->orderFactoryMock = $this->createSimpleMock(OrderFactory::class);
-         $eventManagerMock = $this->createSimpleMock(ManagerInterface::class);
--        $scopeConfigMock = $this->createSimpleMock(ScopeConfigInterface::class);
-+        $this->scopeConfigMock = $this->createSimpleMock(ScopeConfigInterface::class);
-         $this->sessionMock = $this->createSimpleMock(Generic::class);
-         $addressFactoryMock = $this->createSimpleMock(AddressFactory::class);
-         $this->toOrderMock = $this->createSimpleMock(ToOrder::class);
-@@ -224,7 +229,7 @@ class MultishippingTest extends \PHPUnit\Framework\TestCase
-             $this->orderFactoryMock,
-             $this->addressRepositoryMock,
-             $eventManagerMock,
--            $scopeConfigMock,
-+            $this->scopeConfigMock,
-             $this->sessionMock,
-             $addressFactoryMock,
-             $this->toOrderMock,
-@@ -277,6 +282,10 @@ class MultishippingTest extends \PHPUnit\Framework\TestCase
-             ->willReturn(null);
- 
-         $this->quoteMock->expects($this->atLeastOnce())->method('getAllItems')->willReturn([]);
-+        $this->quoteMock->expects($this->once())
-+            ->method('__call')
-+            ->with('setTotalsCollectedFlag', [false])
-+            ->willReturnSelf();
- 
-         $this->filterBuilderMock->expects($this->atLeastOnce())->method('setField')->willReturnSelf();
-         $this->filterBuilderMock->expects($this->atLeastOnce())->method('setValue')->willReturnSelf();
-@@ -416,6 +425,10 @@ class MultishippingTest extends \PHPUnit\Framework\TestCase
-         $addressMock->expects($this->once())->method('getId')->willReturn($addressId);
-         $this->quoteMock->expects($this->once())->method('getAllShippingAddresses')->willReturn([$addressMock]);
-         $addressMock->expects($this->once())->method('setShippingMethod')->with($methodsArray[$addressId]);
-+        $this->quoteMock->expects($this->once())
-+            ->method('__call')
-+            ->with('setTotalsCollectedFlag', [false])
-+            ->willReturnSelf();
- 
-         $this->mockShippingAssignment();
- 
-@@ -659,11 +672,13 @@ class MultishippingTest extends \PHPUnit\Framework\TestCase
-                     'getId',
-                     'getCanSendNewEmailFlag',
-                     'getItems',
-+                    'setShippingMethod',
-                 ]
-             )->getMock();
-         $orderMock->method('setQuote')->with($this->quoteMock);
-         $orderMock->method('setBillingAddress')->with($orderAddressMock)->willReturnSelf();
-         $orderMock->method('setShippingAddress')->with($orderAddressMock)->willReturnSelf();
-+        $orderMock->expects($this->once())->method('setShippingMethod')->with('carrier')->willReturnSelf();
-         $orderMock->method('setPayment')->with($orderPaymentMock)->willReturnSelf();
-         $orderMock->method('addItem')->with($orderItemMock)->willReturnSelf();
-         $orderMock->method('getIncrementId')->willReturn('1');
-@@ -807,4 +822,37 @@ class MultishippingTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
-     }
-+
-+    public function testValidateMinimumAmountMultiAddressTrue()
-+    {
-+        $this->scopeConfigMock->expects($this->exactly(2))->method('isSetFlag')->withConsecutive(
-+            ['sales/minimum_order/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
-+            ['sales/minimum_order/multi_address', \Magento\Store\Model\ScopeInterface::SCOPE_STORE]
-+        )->willReturnOnConsecutiveCalls(true, true);
-+
-+        $this->checkoutSessionMock->expects($this->atLeastOnce())->method('getQuote')->willReturn($this->quoteMock);
-+        $this->quoteMock->expects($this->once())->method('validateMinimumAmount')->willReturn(false);
-+        $this->assertFalse($this->model->validateMinimumAmount());
-+    }
-+
-+    public function testValidateMinimumAmountMultiAddressFalse()
-+    {
-+        $addressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
-+        $this->scopeConfigMock->expects($this->exactly(2))->method('isSetFlag')->withConsecutive(
-+            ['sales/minimum_order/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
-+            ['sales/minimum_order/multi_address', \Magento\Store\Model\ScopeInterface::SCOPE_STORE]
-+        )->willReturnOnConsecutiveCalls(true, false);
-+
-+        $this->scopeConfigMock->expects($this->exactly(2))->method('getValue')->withConsecutive(
-+            ['sales/minimum_order/amount', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
-+            ['sales/minimum_order/tax_including', \Magento\Store\Model\ScopeInterface::SCOPE_STORE]
-+        )->willReturnOnConsecutiveCalls(100, false);
-+
-+        $this->checkoutSessionMock->expects($this->atLeastOnce())->method('getQuote')->willReturn($this->quoteMock);
-+        $this->quoteMock->expects($this->once())->method('getStoreId')->willReturn(1);
-+        $this->quoteMock->expects($this->once())->method('getAllAddresses')->willReturn([$addressMock]);
-+        $addressMock->expects($this->once())->method('getBaseSubtotalWithDiscount')->willReturn(101);
-+
-+        $this->assertTrue($this->model->validateMinimumAmount());
-+    }
- }
-diff --git a/app/code/Magento/Multishipping/etc/frontend/di.xml b/app/code/Magento/Multishipping/etc/frontend/di.xml
-index 5968e3324e3..0c2daaf4504 100644
---- a/app/code/Magento/Multishipping/etc/frontend/di.xml
-+++ b/app/code/Magento/Multishipping/etc/frontend/di.xml
-@@ -43,6 +43,6 @@
-         <plugin name="multishipping_session_mapper" type="Magento\Multishipping\Model\Checkout\Type\Multishipping\Plugin" sortOrder="50" />
-     </type>
-     <type name="Magento\Checkout\Controller\Cart">
--        <plugin name="multishipping_clear_addresses" type="Magento\Multishipping\Model\Cart\Controller\CartPlugin" />
-+        <plugin name="multishipping_clear_addresses" type="Magento\Multishipping\Model\Cart\Controller\CartPlugin" sortOrder="50" />
-     </type>
- </config>
-diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
-index 51e9e6352cf..fee3cb790a5 100644
---- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
-+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
-@@ -9,7 +9,12 @@
-     <update handle="customer_form_template_handle"/>
-     <body>
-         <referenceContainer name="content">
--            <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="Magento_Customer::address/edit.phtml" cacheable="false"/>
-+            <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="Magento_Customer::address/edit.phtml" cacheable="false">
-+                <arguments>
-+                    <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
-+                    <argument name="post_code_config" xsi:type="object">Magento\Customer\Block\DataProviders\PostCodesPatternsAttributeData</argument>
-+                </arguments>
-+            </block>
-         </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
-index 30e72182856..598cbf37d8c 100644
---- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
-+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
-@@ -4,47 +4,53 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Multishipping\Block\Checkout\Address\Select $block */
- ?>
- <div class="multicheckout">
-     <div class="block block-billing">
--    <?php foreach ($block->getAddress() as $_address): ?>
-+    <?php foreach ($block->getAddress() as $address) : ?>
-         <div class="box box-billing-address">
-             <div class="box-content">
-                 <address>
--                    <?= $block->getAddressAsHtml($_address) ?>
--                    <?php if ($block->isAddressDefaultBilling($_address)): ?>
--                        <br /><strong><?= /* @escapeNotVerified */ __('Default Billing') ?></strong>
-+                    <?= $block->getAddressAsHtml($address) ?>
-+                    <?php if ($block->isAddressDefaultBilling($address)) : ?>
-+                        <br /><strong><?= $block->escapeHtml(__('Default Billing')); ?></strong>
-                     <?php endif; ?>
--                    <?php if ($block->isAddressDefaultShipping($_address)): ?>
--                        <br /><strong><?= /* @escapeNotVerified */ __('Default Shipping') ?></strong>
-+                    <?php if ($block->isAddressDefaultShipping($address)) : ?>
-+                        <br /><strong><?= $block->escapeHtml(__('Default Shipping')); ?></strong>
-                     <?php endif; ?>
-                 </address>
-             </div>
-             <div class="box-actions">
--                <a href="<?= /* @escapeNotVerified */ $block->getEditAddressUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit Address') ?></span></a>
--                <a href="<?= /* @escapeNotVerified */ $block->getSetAddressUrl($_address) ?>" class="action select"><span><?= /* @escapeNotVerified */ __('Select Address') ?></span></a>
-+                <a href="<?= $block->escapeUrl($block->getEditAddressUrl($address)); ?>" class="action edit">
-+                    <span><?= $block->escapeHtml(__('Edit Address')); ?></span>
-+                </a>
-+                <a href="<?= $block->escapeUrl($block->getSetAddressUrl($address)); ?>" class="action select">
-+                    <span><?= $block->escapeHtml(__('Select Address')); ?></span>
-+                </a>
-             </div>
-         </div>
-     <?php endforeach; ?>
-     </div>
-     <div class="actions-toolbar">
-         <div class="primary">
--            <button type="button" class="action add primary" role="add-address" title="<?= /* @escapeNotVerified */ __('Add New Address') ?>"><span><?= /* @escapeNotVerified */ __('Add New Address') ?></span></button>
-+            <button type="button" class="action add primary" role="add-address" title="<?= $block->escapeHtml(__('Add New Address')); ?>">
-+                <span><?= $block->escapeHtml(__('Add New Address')); ?></span>
-+            </button>
-         </div>
-         <div class="secondary">
--            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Billing Information') ?></span></a>
-+            <a href="<?= $block->escapeUrl($block->getBackUrl()); ?>" class="action back">
-+                <span><?= $block->escapeHtml(__('Back to Billing Information')); ?></span>
-+            </a>
-         </div>
-     </div>
- </div>
- <script type="text/x-magento-init">
-     {
--        ".actions": {
-+        ".action": {
-             "address": {
-                 "addAddress": "button[role='add-address']",
--                "addAddressLocation": "<?= /* @escapeNotVerified */ $block->getAddNewUrl() ?>"
-+                "addAddressLocation": "<?= $block->escapeUrl($block->getAddNewUrl()); ?>"
-             }
-         }
-     }
-diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
-index 0f96f7cdb70..377f3d73127 100644
---- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
-+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Files.LineLength
- 
- ?>
- <?php
-@@ -14,17 +14,6 @@
-  * @var $block \Magento\Multishipping\Block\Checkout\Addresses
-  */
- ?>
--<form id="checkout_multishipping_form"
--      data-mage-init='{
--          "multiShipping":{},
--          "validation":{},
--          "cartUpdate": {
--               "validationURL": "/multishipping/checkout/checkItems",
--               "eventName": "updateMulticartItemQty"
--          }}'
--      action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>"
--      method="post"
--      class="multicheckout address form">
- <form id="checkout_multishipping_form"
-       data-mage-init='{
-           "multiShipping":{},
-@@ -54,7 +43,7 @@
-             </tr>
-             </thead>
-             <tbody>
--            <?php foreach ($block->getItems() as $_index => $_item): ?>
-+            <?php foreach ($block->getItems() as $_index => $_item) : ?>
-                 <?php if ($_item->getQuoteItem()) : ?>
-                     <tr>
-                         <td class="col product" data-th="<?= $block->escapeHtml(__('Product')) ?>">
-@@ -73,17 +62,18 @@
-                                            name="ship[<?= $block->escapeHtml($_index) ?>][<?= $block->escapeHtml($_item->getQuoteItemId()) ?>][qty]"
-                                            value="<?= $block->escapeHtml($_item->getQty()) ?>"
-                                            size="2"
-+                                           min="0"
-                                            class="input-text qty"
--                                           data-validate="{number: true}"/>
-+                                           data-validate="{number: true, required:true, 'validate-greater-than-zero':true}"/>
-                                 </div>
-                             </div>
-                         </td>
-                         <td class="col address" data-th="<?= $block->escapeHtml(__('Send To')) ?>">
--                            <?php if ($_item->getProduct()->getIsVirtual()): ?>
-+                            <?php if ($_item->getProduct()->getIsVirtual()) : ?>
-                                 <div class="applicable">
-                                     <?= $block->escapeHtml(__('A shipping selection is not applicable.')) ?>
-                                 </div>
--                            <?php else: ?>
-+                            <?php else : ?>
-                                 <div class="field address">
-                                     <label for="ship_<?= $block->escapeHtml($_index) ?>_<?= $block->escapeHtml($_item->getQuoteItemId()) ?>_address"
-                                            class="label">
-@@ -113,10 +103,10 @@
-         <div class="primary">
-             <button type="submit"
-                     title="<?= $block->escapeHtml(__('Go to Shipping Information')) ?>"
--                    class="action primary continue<?php if ($block->isContinueDisabled()):?> disabled<?php endif; ?>"
-+                    class="action primary continue<?= $block->isContinueDisabled() ? ' disabled' : '' ?>"
-                     data-role="can-continue"
-                     data-flag="1"
--                <?php if ($block->isContinueDisabled()):?>
-+                <?php if ($block->isContinueDisabled()) : ?>
-                     disabled="disabled"
-                 <?php endif; ?>>
-                 <span><?= $block->escapeHtml(__('Go to Shipping Information')) ?></span>
-diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
-index da553b7823d..761c1f1a784 100644
---- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
-+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
-@@ -80,35 +80,44 @@
-                                     $block->setMethodFormTemplate($code, $methodsForms[$code]);
-                                 }
-                                 ?>
--                            <dt class="item-title">
--                                <?php if ($methodsCount > 1) : ?>
--                                    <input type="radio"
--                                           id="p_method_<?= $block->escapeHtml($code); ?>"
--                                           value="<?= $block->escapeHtml($code); ?>"
--                                           name="payment[method]"
--                                           title="<?= $block->escapeHtml($_method->getTitle()) ?>"
--                                        <?php if ($checked) : ?>
--                                           checked="checked"
-+                                <div data-bind="scope: 'payment_method_<?= $block->escapeHtml($code);?>'">
-+                                    <dt class="item-title">
-+                                        <?php if ($methodsCount > 1) : ?>
-+                                            <input type="radio"
-+                                                   id="p_method_<?= $block->escapeHtml($code); ?>"
-+                                                   value="<?= $block->escapeHtml($code); ?>"
-+                                                   name="payment[method]"
-+                                                   title="<?= $block->escapeHtml($_method->getTitle()) ?>"
-+                                                   data-bind="
-+                                                       value: getCode(),
-+                                                       checked: isChecked,
-+                                                       click: selectPaymentMethod,
-+                                                       visible: isRadioButtonVisible()"
-+                                                <?php if ($checked) : ?>
-+                                                    checked="checked"
-+                                                <?php endif; ?>
-+                                                   class="radio"/>
-+                                        <?php else : ?>
-+                                            <input type="radio"
-+                                                   id="p_method_<?= $block->escapeHtml($code); ?>"
-+                                                   value="<?= $block->escapeHtml($code); ?>"
-+                                                   name="payment[method]"
-+                                                   data-bind="
-+                                                       value: getCode(),
-+                                                       afterRender: selectPaymentMethod"
-+                                                   checked="checked"
-+                                                   class="radio solo method" />
-                                         <?php endif; ?>
--                                           class="radio"/>
--                                <?php else : ?>
--                                    <input type="radio"
--                                           id="p_method_<?= $block->escapeHtml($code); ?>"
--                                           value="<?= $block->escapeHtml($code); ?>"
--                                           name="payment[method]"
--                                           checked="checked"
--                                           class="radio solo method" />
--                                <?php endif; ?>
--                                    <label for="p_method_<?= $block->escapeHtml($code); ?>">
--                                        <?= $block->escapeHtml($_method->getTitle()) ?>
--                                    </label>
--                            </dt>
--                                <?php if ($html = $block->getChildHtml('payment.method.' . $code)) : ?>
--                                    <dd class="item-content <?= $checked ? '' : 'no-display'; ?>"
--                                        data-bind="scope: 'payment_method_<?= $block->escapeHtml($code);?>'">
--                                        <?= /* @noEscape */ $html; ?>
--                                    </dd>
--                                <?php endif; ?>
-+                                        <label for="p_method_<?= $block->escapeHtml($code); ?>">
-+                                            <?= $block->escapeHtml($_method->getTitle()) ?>
-+                                        </label>
-+                                    </dt>
-+                                    <?php if ($html = $block->getChildHtml('payment.method.' . $code)) : ?>
-+                                        <dd class="item-content <?= $checked ? '' : 'no-display'; ?>">
-+                                            <?= /* @noEscape */ $html; ?>
-+                                        </dd>
-+                                    <?php endif; ?>
-+                                </div>
-                             <?php endforeach; ?>
-                         </dl>
-                         <?= $block->getChildHtml('payment_methods_after') ?>
-@@ -119,7 +128,7 @@
-         </div>
-     </div>
-     <div class="actions-toolbar">
--        <div class="primary">
-+        <div class="primary" id="parent-payment-continue">
-             <button id="payment-continue"
-                     type="button"
-                     class="action primary continue">
-@@ -152,3 +161,31 @@
-         });
-     });
- </script>
-+
-+<script>
-+    //<![CDATA[
-+    require(
-+        [
-+            'Magento_Checkout/js/model/quote',
-+            'jquery',
-+            'domReady!'
-+        ], function(quote, $) {
-+            quote.billingAddress({
-+                    city: '<?= /* @noEscape */ $block->getAddress()->getCity() ?>',
-+                    company: '<?= /* @noEscape */ $block->getAddress()->getCompany(); ?>',
-+                    countryId: '<?= /* @noEscape */ $block->getAddress()->getCountryId(); ?>',
-+                    customerAddressId: '<?= /* @noEscape */ $block->getAddress()->getCustomerAddressId(); ?>',
-+                    customerId: '<?= /* @noEscape */ $block->getAddress()->getCustomerId(); ?>',
-+                    fax: '<?= /* @noEscape */ $block->getAddress()->getFax(); ?>',
-+                    firstname: '<?= /* @noEscape */ $block->getAddress()->getFirstname(); ?>',
-+                    lastname: '<?= /* @noEscape */ $block->getAddress()->getLastname(); ?>',
-+                    postcode: '<?= /* @noEscape */ $block->getAddress()->getPostcode(); ?>',
-+                    regionId: '<?= /* @noEscape */ $block->getAddress()->getRegionId(); ?>',
-+                    regionCode: '<?= /* @noEscape */ $block->getAddress()->getRegionCode() ?>',
-+                    region: '<?= /* @noEscape */ $block->getAddress()->getRegion(); ?>',
-+                    street: <?= /* @noEscape */ json_encode($block->getAddress()->getStreet()); ?>,
-+                    telephone: '<?= /* @noEscape */ $block->getAddress()->getTelephone(); ?>'
-+            });
-+        });
-+    //]]>
-+</script>
-diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml
-index d1c39970518..2f89805a2a5 100644
---- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml
-+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml
-@@ -4,31 +4,29 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($block->getQuote()->hasVirtualItems()): ?>
-+<?php if ($block->getQuote()->hasVirtualItems()) : ?>
- <div class="block block-other">
-     <div class="block-title">
--        <strong><?= /* @escapeNotVerified */ __('Other items in your order') ?></strong>
--        <a href="<?= /* @escapeNotVerified */ $block->getVirtualProductEditUrl() ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit Items') ?></span></a>
-+        <strong><?= $block->escapeHtml(__('Other items in your order')) ?></strong>
-+        <a href="<?= $block->escapeUrl($block->getVirtualProductEditUrl()) ?>" class="action edit"><span><?= $block->escapeHtml(__('Edit Items')) ?></span></a>
-     </div>
-     <div class="block-content">
--        <p><?= /* @escapeNotVerified */ __('Shipping is not applicable.') ?></p>
-+        <p><?= $block->escapeHtml(__('Shipping is not applicable.')) ?></p>
-         <div class="table-wrapper">
-             <table class="items data table" id="unavailable-shipping-table">
--                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Other items in your order') ?></caption>
-+                <caption class="table-caption"><?= $block->escapeHtml(__('Other items in your order')) ?></caption>
-                 <thead>
-                     <tr>
--                        <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
--                        <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
-+                        <th class="col item" scope="col"><?= $block->escapeHtml(__('Product Name')) ?></th>
-+                        <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
-                     </tr>
-                 </thead>
-                 <tbody>
--                <?php foreach ($block->getVirtualQuoteItems() as $_item): ?>
-+                <?php foreach ($block->getVirtualQuoteItems() as $_item) : ?>
-                     <tr>
-                         <td class="col item" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getItemHtml($_item) ?></td>
--                        <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty() ?></td>
-+                        <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= $block->escapeHtml($_item->getQty()) ?></td>
-                     </tr>
-                 <?php endforeach; ?>
-                 </tbody>
-diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml
-index 1de8357db89..a696a693fa0 100644
---- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml
-+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml
-@@ -4,27 +4,26 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Files.LineLength
- ?>
--<strong class="product name product-item-name"><a href="<?= /* @escapeNotVerified */ $block->getProductUrl() ?>"><?= $block->escapeHtml($block->getProductName()) ?></a></strong>
--<?php if ($_options = $block->getOptionList()): ?>
-+<strong class="product name product-item-name"><a href="<?= $block->escapeUrl($block->getProductUrl()) ?>"><?= $block->escapeHtml($block->getProductName()) ?></a></strong>
-+<?php if ($_options = $block->getOptionList()) : ?>
-     <dl class="item-options">
-         <?php foreach ($_options as $_option) : ?>
-             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
--                <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
--                <?php if (isset($_formatedOptionValue['full_view'])): ?>
-+            <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
-+                <?= $block->escapeHtml($_formatedOptionValue['value'], ['span']) ?>
-+                <?php if (isset($_formatedOptionValue['full_view'])) : ?>
-                     <dl class="item options tooltip content">
-                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
-+                        <dd><?= $block->escapeHtml($_formatedOptionValue['full_view'], ['span']) ?></dd>
-                     </dl>
-                 <?php endif; ?>
-             </dd>
-         <?php endforeach; ?>
-     </dl>
- <?php endif; ?>
--<?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()): ?>
-+<?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()) : ?>
-     <?= $addtInfoBlock->setItem($block->getItem())->toHtml() ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
-index ae65caf6983..15fe496ddd8 100644
---- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
-+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
-@@ -4,7 +4,5 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
--<a class="action multicheckout" href="<?= /* @escapeNotVerified */ $block->getCheckoutUrl() ?>"><span><?= /* @escapeNotVerified */ __('Check Out with Multiple Addresses') ?></span></a>
-+<a class="action multicheckout" href="<?= $block->escapeUrl($block->getCheckoutUrl()) ?>"><span><?= $block->escapeHtml(__('Check Out with Multiple Addresses')) ?></span></a>
-diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
-index 4590b7c5840..5fff0d72e80 100644
---- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
-+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
-@@ -4,6 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
-+// phpcs:disable Magento2.Templates.ThisInTemplate
-+
- /** @var \Magento\Multishipping\Block\Checkout\Overview $block */
- ?>
- <?php $errors = $block->getCheckoutData()->getAddressErrors(); ?>
-diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
-index 5424f37efac..3505cadc5ec 100644
---- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
-+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Files.LineLength, Magento2.Templates.ThisInTemplate
- 
- ?>
- <?php
-@@ -22,14 +22,14 @@
-     </td>
-     <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-         <?php /* Including Tax */ ?>
--            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-+            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayCartPriceInclTax() || $this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices()) : ?>
-                 <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
-                     <?= $block->getUnitPriceInclTaxHtml($_item) ?>
-                 </span>
-             <?php endif; ?>
-         <?php /* end Including Tax */ ?>
-         <?php /* Excluding Tax */ ?>
--        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-+        <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayCartPriceExclTax() || $this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices()) : ?>
-             <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-                 <?= $block->getUnitPriceExclTaxHtml($_item) ?>
-             </span>
-@@ -37,17 +37,17 @@
-         <?php /* end Excluding Tax */ ?>
-     </td>
- 
--    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
-+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= $_item->getQty() * 1 ?></td>
-     <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
-     <?php /* Including Tax Subtotal */ ?>
--        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-+        <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayCartPriceInclTax() || $this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices()) : ?>
-         <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
-             <?= $block->getRowTotalInclTaxHtml($_item) ?>
-         </span>
-         <?php endif; ?>
-     <?php /* end Including Tax Subtotal */ ?>
-     <?php /* Excluding Tax Subtotal */ ?>
--    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-+    <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayCartPriceExclTax() || $this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices()) : ?>
-         <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-             <?= $block->getRowTotalExclTaxHtml($_item) ?>
-         </span>
-diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
-index f66a2093b0a..af67c087ed2 100644
---- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
-+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Files.LineLength, Magento2.Templates.ThisInTemplate
- 
- ?>
- <?php
-@@ -14,63 +14,68 @@
-  * @var $block \Magento\Multishipping\Block\Checkout\Shipping
-  */
- ?>
--<form action="<?= /* @escapeNotVerified */ $block->getPostActionUrl() ?>" method="post" id="shipping_method_form" class="form multicheckout shipping">
--    <?php foreach ($block->getAddresses() as $_index => $_address): ?>
-+<form action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>" method="post" id="shipping_method_form" class="form multicheckout shipping">
-+    <?php foreach ($block->getAddresses() as $_index => $_address) : ?>
-     <div class="block block-shipping">
--        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('Address %1 <span>of %2</span>', ($_index+1), $block->getAddressCount()) ?></strong></div>
-+        <div class="block-title"><strong><?= $block->escapeHtml(__('Address %1 <span>of %2</span>', ($_index+1), $block->getAddressCount()), ['span']) ?></strong></div>
-         <div class="block-content">
-             <div class="box box-shipping-address">
-                 <strong class="box-title">
--                    <span><?= /* @escapeNotVerified */ __('Shipping To') ?></span>
--                    <a href="<?= /* @escapeNotVerified */ $block->getAddressEditUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Change') ?></span></a>
-+                    <span><?= $block->escapeHtml(__('Shipping To')) ?></span>
-+                    <a href="<?= $block->escapeUrl($block->getAddressEditUrl($_address)) ?>" class="action edit">
-+                        <span><?= $block->escapeHtml(__('Change')) ?></span>
-+                    </a>
-                 </strong>
-                 <div class="box-content">
--                    <address><?= /* @escapeNotVerified */ $_address->format('html') ?></address>
-+                    <address><?= /* @noEscape */ $_address->format('html') ?></address>
-                 </div>
-             </div>
-             <div class="box box-shipping-method">
-                 <strong class="box-title">
--                    <span><?= /* @escapeNotVerified */ __('Shipping Method') ?></span>
-+                    <span><?= $block->escapeHtml(__('Shipping Method')) ?></span>
-                 </strong>
-                 <div class="box-content">
--                    <?php if (!($_shippingRateGroups = $block->getShippingRates($_address))): ?>
--                        <p><?= /* @escapeNotVerified */ __('Sorry, no quotes are available for this order right now.') ?></p>
--                    <?php else: ?>
-+                    <?php if (!($_shippingRateGroups = $block->getShippingRates($_address))) : ?>
-+                        <p><?= $block->escapeHtml(__('Sorry, no quotes are available for this order right now.')) ?></p>
-+                    <?php else : ?>
-                     <dl class="items methods-shipping">
--                        <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
-+                        <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates) : ?>
-                             <dt class="item-title"><?= $block->escapeHtml($block->getCarrierName($code)) ?></dt>
-                             <dd class="item-content">
-                                 <fieldset class="fieldset">
-                                     <legend class="legend">
-                                         <span><?= $block->escapeHtml($block->getCarrierName($code)) ?></span>
-                                     </legend><br>
--                                    <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
-+                                    <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate) : ?>
-                                     <div class="field choice">
--                                    <?php if ($_rate->getErrorMessage()): ?>
-+                                        <?php if ($_rate->getErrorMessage()) : ?>
-                                         <strong><?= $block->escapeHtml($_rate->getCarrierTitle()) ?>: <?= $block->escapeHtml($_rate->getErrorMessage()) ?></strong>
--                                    <?php else: ?>
-+                                        <?php else : ?>
-                                         <div class="control">
-                                             <?php if ($_sole) : ?>
--                                                <input type="radio" name="shipping_method[<?= /* @escapeNotVerified */ $_address->getId() ?>]" value="<?= $block->escapeHtml($_rate->getCode()) ?>" id="s_method_<?= /* @escapeNotVerified */ $_address->getId() ?>_<?= /* @escapeNotVerified */ $_rate->getCode() ?>" class="radio solo method" checked="checked"/>
--                                            <?php else: ?>
--                                                <input type="radio" name="shipping_method[<?= /* @escapeNotVerified */ $_address->getId() ?>]" value="<?= /* @escapeNotVerified */ $_rate->getCode() ?>" id="s_method_<?= /* @escapeNotVerified */ $_address->getId() ?>_<?= /* @escapeNotVerified */ $_rate->getCode() ?>"<?php if($_rate->getCode()===$block->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
-+                                                <input type="radio" name="shipping_method[<?= (int) $_address->getId() ?>]" value="<?= $block->escapeHtmlAttr($_rate->getCode()) ?>" id="s_method_<?= (int) $_address->getId() ?>_<?= $block->escapeHtmlAttr($_rate->getCode()) ?>" class="radio solo method" checked="checked"/>
-+                                            <?php else : ?>
-+                                                <input type="radio" name="shipping_method[<?= (int) $_address->getId() ?>]" value="<?= $block->escapeHtmlAttr($_rate->getCode()) ?>" id="s_method_<?= (int) $_address->getId() ?>_<?= $block->escapeHtmlAttr($_rate->getCode()) ?>" <?= ($_rate->getCode()===$block->getAddressShippingMethod($_address)) ? ' checked="checked"' : '' ?> class="radio" />
-                                             <?php endif; ?>
-                                         </div>
--                                        <label for="s_method_<?= /* @escapeNotVerified */ $_address->getId() ?>_<?= /* @escapeNotVerified */ $_rate->getCode() ?>"><?= $block->escapeHtml($_rate->getMethodTitle()) ?>
--                                            <?php $_excl = $block->getShippingPrice($_address, $_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
-+                                        <label for="s_method_<?= (int) $_address->getId() ?>_<?= $block->escapeHtmlAttr($_rate->getCode()) ?>">
-+                                            <?= $block->escapeHtml($_rate->getMethodTitle()) ?>
-+                                            <?php $_excl = $block->getShippingPrice($_address, $_rate->getPrice(), $this->helper(Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()); ?>
-                                             <?php $_incl = $block->getShippingPrice($_address, $_rate->getPrice(), true); ?>
--                                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
--                                            <span class="price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
--                                        <?php endif; ?>
--                                            <?= /* @escapeNotVerified */ $_incl ?>
--                                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-+                                            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
-+                                            <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
-+                                            <?php endif; ?>
-+                                                <?= $block->escapeHtml($_incl, ['span']) ?>
-+                                            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
-+                                            </span>
-+                                            <?php endif; ?>
-+                                            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
-+                                            <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-+                                                <?= $block->escapeHtml($_excl, ['span']) ?>
-                                             </span>
--                                        <?php endif; ?>
--                                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
--                                            <span class="price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>"><?= /* @escapeNotVerified */ $_excl ?></span>
--                                        <?php endif; ?>
-+                                            <?php endif; ?>
-                                         </label>
--                                    <?php endif ?>
-+                                        <?php endif ?>
-                                     </div>
-                                     <?php endforeach; ?>
-                                 </fieldset>
-@@ -78,29 +83,29 @@
-                         <?php endforeach; ?>
-                     </dl>
-                     <?php endif; ?>
--                    <?= /* @escapeNotVerified */ $block->getItemsBoxTextAfter($_address) ?>
-+                    <?= /* @noEscape */ $block->getItemsBoxTextAfter($_address) ?>
-                 </div>
-             </div>
-             <div class="box box-items">
-                 <strong class="box-title">
--                    <span><?= /* @escapeNotVerified */ __('Items') ?></span>
--                    <a href="<?= /* @escapeNotVerified */ $block->getItemsEditUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit Items') ?></span></a>
-+                    <span><?= $block->escapeHtml(__('Items')) ?></span>
-+                    <a href="<?= $block->escapeUrl($block->getItemsEditUrl($_address)) ?>" class="action edit"><span><?= $block->escapeHtml(__('Edit Items')) ?></span></a>
-                 </strong>
-                 <div class="box-content">
-                     <div class="table-wrapper">
--                        <table class="items data table" id="shipping-table-<?= /* @escapeNotVerified */ $_address->getId() ?>">
--                            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items') ?></caption>
-+                        <table class="items data table" id="shipping-table-<?= (int) $_address->getId() ?>">
-+                            <caption class="table-caption"><?= $block->escapeHtml(__('Items')) ?></caption>
-                             <thead>
-                             <tr>
--                                <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
--                                <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
-+                                <th class="col item" scope="col"><?= $block->escapeHtml(__('Product Name')) ?></th>
-+                                <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
-                             </tr>
-                             </thead>
-                             <tbody>
--                            <?php foreach ($block->getAddressItems($_address) as $_item): ?>
-+                            <?php foreach ($block->getAddressItems($_address) as $_item) : ?>
-                                 <tr>
--                                    <td class="col item" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getItemHtml($_item->getQuoteItem()) ?></td>
--                                    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty() ?></td>
-+                                    <td class="col item" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>"><?= $block->getItemHtml($_item->getQuoteItem()) ?></td>
-+                                    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Qty')) ?>"><?= $block->escapeHtml($_item->getQty()) ?></td>
-                                 </tr>
-                             <?php endforeach; ?>
-                             </tbody>
-@@ -114,10 +119,10 @@
-     <?= $block->getChildHtml('checkout_billing_items') ?>
-     <div class="actions-toolbar">
-         <div class="primary">
--            <button class="action primary continue" type="submit"><span><?= /* @escapeNotVerified */ __('Continue to Billing Information') ?></span></button>
-+            <button class="action primary continue" type="submit"><span><?= $block->escapeHtml(__('Continue to Billing Information')) ?></span></button>
-         </div>
-         <div class="secondary">
--            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Select Addresses') ?></span></a>
-+            <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back"><span><?= $block->escapeHtml(__('Back to Select Addresses')) ?></span></a>
-         </div>
-     </div>
- </form>
-diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml
-index bf520d639a5..4d8b63e6057 100644
---- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml
-+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Files.LineLength
- 
- ?>
- <?php
-@@ -15,7 +15,9 @@
-  */
- ?>
- <ol class="block multicheckout progress items" id="checkout-progress-state">
--    <?php foreach ($block->getSteps() as $_step): ?>
--        <li title="<?= /* @escapeNotVerified */ $_step->getLabel() ?>" class="item<?= ($_step->getIsActive()) ? ' active' : '' ?>"><span><?= /* @escapeNotVerified */ $_step->getLabel() ?></span></li>
-+    <?php foreach ($block->getSteps() as $_step) : ?>
-+        <li title="<?= $block->escapeHtmlAttr($_step->getLabel()) ?>" class="item<?= ($_step->getIsActive()) ? ' active' : '' ?>">
-+            <span><?= $block->escapeHtml($_step->getLabel()) ?></span>
-+        </li>
-     <?php endforeach; ?>
- </ol>
-diff --git a/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml b/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml
-index bad5acc209b..6cf15f47701 100644
---- a/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml
-@@ -4,7 +4,5 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml b/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml
-index 79e6d024658..9245aec92ac 100644
---- a/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml
-+++ b/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml
-@@ -4,29 +4,28 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Files.LineLength
- ?>
- <div class="product details">
--    <strong class="product name"><a href="<?= /* @escapeNotVerified */ $block->getProductUrl() ?>"><?= $block->escapeHtml($block->getProductName()) ?></a></strong>
--    <?php if ($_options = $block->getOptionList()): ?>
-+    <strong class="product name"><a href="<?= $block->escapeUrl($block->getProductUrl()) ?>"><?= $block->escapeHtml($block->getProductName()) ?></a></strong>
-+    <?php if ($_options = $block->getOptionList()) : ?>
-         <dl class="item options">
-             <?php foreach ($_options as $_option) : ?>
-                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                 <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
--                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
--                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-+                <dd<?= isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '' ?>>
-+                    <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
-+                    <?php if (isset($_formatedOptionValue['full_view'])) : ?>
-                         <dl class="item options tooltip content">
-                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
-+                            <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
-                         </dl>
-                     <?php endif; ?>
-                 </dd>
-             <?php endforeach; ?>
-         </dl>
-     <?php endif; ?>
--    <?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()): ?>
-+    <?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()) : ?>
-         <?= $addtInfoBlock->setItem($block->getItem())->toHtml() ?>
-     <?php endif; ?>
- </div>
-diff --git a/app/code/Magento/Multishipping/view/frontend/web/js/overview.js b/app/code/Magento/Multishipping/view/frontend/web/js/overview.js
-index 9b867cd7217..3a6d73e3049 100644
---- a/app/code/Magento/Multishipping/view/frontend/web/js/overview.js
-+++ b/app/code/Magento/Multishipping/view/frontend/web/js/overview.js
-@@ -15,7 +15,7 @@ define([
-             opacity: 0.5, // CSS opacity for the 'Place Order' button when it's clicked and then disabled.
-             pleaseWaitLoader: 'span.please-wait', // 'Submitting order information...' Ajax loader.
-             placeOrderSubmit: 'button[type="submit"]', // The 'Place Order' button.
--            agreements: '#checkout-agreements' // Container for all of the checkout agreements and terms/conditions
-+            agreements: '.checkout-agreements' // Container for all of the checkout agreements and terms/conditions
-         },
- 
-         /**
-diff --git a/app/code/Magento/MysqlMq/Model/Driver/Queue.php b/app/code/Magento/MysqlMq/Model/Driver/Queue.php
-index b8dab6fac7b..cbc2e951782 100644
---- a/app/code/Magento/MysqlMq/Model/Driver/Queue.php
-+++ b/app/code/Magento/MysqlMq/Model/Driver/Queue.php
-@@ -73,7 +73,7 @@ class Queue implements QueueInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function dequeue()
-     {
-@@ -92,7 +92,7 @@ class Queue implements QueueInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function acknowledge(EnvelopeInterface $envelope)
-     {
-@@ -103,25 +103,26 @@ class Queue implements QueueInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function subscribe($callback)
-     {
-         while (true) {
-             while ($envelope = $this->dequeue()) {
-                 try {
-+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                     call_user_func($callback, $envelope);
--                    $this->acknowledge($envelope);
-                 } catch (\Exception $e) {
-                     $this->reject($envelope);
-                 }
-             }
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             sleep($this->interval);
-         }
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionMessage = null)
-     {
-@@ -139,7 +140,7 @@ class Queue implements QueueInterface
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritDoc
-      */
-     public function push(EnvelopeInterface $envelope)
-     {
-diff --git a/app/code/Magento/MysqlMq/Model/QueueManagement.php b/app/code/Magento/MysqlMq/Model/QueueManagement.php
-index 0840add2a5c..74d2154a36b 100644
---- a/app/code/Magento/MysqlMq/Model/QueueManagement.php
-+++ b/app/code/Magento/MysqlMq/Model/QueueManagement.php
-@@ -107,9 +107,10 @@ class QueueManagement
-     }
- 
-     /**
--     * Mark messages to be deleted if sufficient amount of time passed since last update
-      * Delete marked messages
-      *
-+     * Mark messages to be deleted if sufficient amount of time passed since last update
-+     *
-      * @return void
-      */
-     public function markMessagesForDelete()
-@@ -223,7 +224,7 @@ class QueueManagement
-     }
- 
-     /**
--     * In progress message delay befor retry
-+     * In progress message delay before retry
-      *
-      * Indicates how long message will stay in IN PROGRESS status before attempted to retry
-      *
-diff --git a/app/code/Magento/MysqlMq/etc/db_schema.xml b/app/code/Magento/MysqlMq/etc/db_schema.xml
-index 02757afa53f..3850a6749a3 100644
---- a/app/code/Magento/MysqlMq/etc/db_schema.xml
-+++ b/app/code/Magento/MysqlMq/etc/db_schema.xml
-@@ -11,10 +11,10 @@
-         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
-                 comment="Queue ID"/>
-         <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Queue name"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="QUEUE_NAME">
-+        <constraint xsi:type="unique" referenceId="QUEUE_NAME">
-             <column name="name"/>
-         </constraint>
-     </table>
-@@ -23,7 +23,7 @@
-                 comment="Message ID"/>
-         <column xsi:type="varchar" name="topic_name" nullable="true" length="255" comment="Message topic"/>
-         <column xsi:type="longtext" name="body" nullable="true" comment="Message body"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
-     </table>
-@@ -41,19 +41,19 @@
-                 comment="Message status in particular queue"/>
-         <column xsi:type="smallint" name="number_of_trials" padding="5" unsigned="true" nullable="false"
-                 identity="false" default="0" comment="Number of trials to processed failed message processing"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="QUEUE_MESSAGE_STATUS_MESSAGE_ID_QUEUE_MESSAGE_ID"
-+        <constraint xsi:type="foreign" referenceId="QUEUE_MESSAGE_STATUS_MESSAGE_ID_QUEUE_MESSAGE_ID"
-                     table="queue_message_status" column="message_id" referenceTable="queue_message" referenceColumn="id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="QUEUE_MESSAGE_STATUS_QUEUE_ID_QUEUE_ID" table="queue_message_status"
-+        <constraint xsi:type="foreign" referenceId="QUEUE_MESSAGE_STATUS_QUEUE_ID_QUEUE_ID" table="queue_message_status"
-                     column="queue_id" referenceTable="queue" referenceColumn="id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="QUEUE_MESSAGE_STATUS_QUEUE_ID_MESSAGE_ID">
-+        <constraint xsi:type="unique" referenceId="QUEUE_MESSAGE_STATUS_QUEUE_ID_MESSAGE_ID">
-             <column name="queue_id"/>
-             <column name="message_id"/>
-         </constraint>
--        <index name="QUEUE_MESSAGE_STATUS_STATUS_UPDATED_AT" indexType="btree">
-+        <index referenceId="QUEUE_MESSAGE_STATUS_STATUS_UPDATED_AT" indexType="btree">
-             <column name="status"/>
-             <column name="updated_at"/>
-         </index>
-diff --git a/app/code/Magento/NewRelicReporting/Model/Config.php b/app/code/Magento/NewRelicReporting/Model/Config.php
-index 32e1078c01c..6f3ff1df574 100644
---- a/app/code/Magento/NewRelicReporting/Model/Config.php
-+++ b/app/code/Magento/NewRelicReporting/Model/Config.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\NewRelicReporting\Model;
- 
-+/**
-+ * NewRelic configuration model
-+ */
- class Config
- {
-     /**#@+
-@@ -88,7 +91,7 @@ class Config
-      */
-     public function isNewRelicEnabled()
-     {
--        return (bool)$this->scopeConfig->getValue('newrelicreporting/general/enable');
-+        return $this->scopeConfig->isSetFlag('newrelicreporting/general/enable');
-     }
- 
-     /**
-@@ -161,6 +164,16 @@ class Config
-         return (string)$this->scopeConfig->getValue('newrelicreporting/general/app_name');
-     }
- 
-+    /**
-+     * Returns configured separate apps value
-+     *
-+     * @return bool
-+     */
-+    public function isSeparateApps()
-+    {
-+        return (bool)$this->scopeConfig->getValue('newrelicreporting/general/separate_apps');
-+    }
-+
-     /**
-      * Returns config setting for overall cron to be enabled
-      *
-@@ -168,7 +181,7 @@ class Config
-      */
-     public function isCronEnabled()
-     {
--        return (bool)$this->scopeConfig->getValue('newrelicreporting/cron/enable_cron');
-+        return $this->scopeConfig->isSetFlag('newrelicreporting/cron/enable_cron');
-     }
- 
-     /**
-diff --git a/app/code/Magento/NewRelicReporting/Model/Cron/ReportModulesInfo.php b/app/code/Magento/NewRelicReporting/Model/Cron/ReportModulesInfo.php
-index 9cdc90bc46b..78c485c5bb6 100644
---- a/app/code/Magento/NewRelicReporting/Model/Cron/ReportModulesInfo.php
-+++ b/app/code/Magento/NewRelicReporting/Model/Cron/ReportModulesInfo.php
-@@ -64,6 +64,7 @@ class ReportModulesInfo
-             $moduleData = $this->collect->getModuleData();
-             if (count($moduleData['changes']) > 0) {
-                 foreach ($moduleData['changes'] as $change) {
-+                    $modelData = [];
-                     switch ($change['type']) {
-                         case Config::ENABLED:
-                             $modelData = [
-diff --git a/app/code/Magento/NewRelicReporting/Model/Module/Collect.php b/app/code/Magento/NewRelicReporting/Model/Module/Collect.php
-index 7e381762f5d..0d8a94fbed9 100644
---- a/app/code/Magento/NewRelicReporting/Model/Module/Collect.php
-+++ b/app/code/Magento/NewRelicReporting/Model/Module/Collect.php
-@@ -6,11 +6,14 @@
- namespace Magento\NewRelicReporting\Model\Module;
- 
- use Magento\Framework\Module\FullModuleList;
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\Framework\Module\ModuleListInterface;
- use Magento\NewRelicReporting\Model\Config;
- use Magento\NewRelicReporting\Model\Module;
- 
-+/**
-+ * Class for collecting data for the report
-+ */
- class Collect
- {
-     /**
-@@ -19,7 +22,7 @@ class Collect
-     protected $moduleList;
- 
-     /**
--     * @var Manager
-+     * @var ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-@@ -43,14 +46,14 @@ class Collect
-      *
-      * @param ModuleListInterface $moduleList
-      * @param FullModuleList $fullModuleList
--     * @param Manager $moduleManager
-+     * @param ModuleManagerInterface $moduleManager
-      * @param \Magento\NewRelicReporting\Model\ModuleFactory $moduleFactory
-      * @param \Magento\NewRelicReporting\Model\ResourceModel\Module\CollectionFactory $moduleCollectionFactory
-      */
-     public function __construct(
-         ModuleListInterface $moduleList,
-         FullModuleList $fullModuleList,
--        Manager $moduleManager,
-+        ModuleManagerInterface $moduleManager,
-         \Magento\NewRelicReporting\Model\ModuleFactory $moduleFactory,
-         \Magento\NewRelicReporting\Model\ResourceModel\Module\CollectionFactory $moduleCollectionFactory
-     ) {
-@@ -92,7 +95,6 @@ class Collect
-      * @param string $active
-      * @param string $setupVersion
-      * @param string $state
--     *
-      * @return array
-      */
-     protected function getNewModuleChanges($moduleName, $active, $setupVersion, $state)
-@@ -277,9 +279,7 @@ class Collect
-                 $changes = array_diff($module, $changeTest);
-                 $changesCleanArray = $this->getCleanChangesArray($changes);
- 
--                if (count($changesCleanArray) > 0 ||
--                    ($this->moduleManager->isOutputEnabled($changeTest['name']) &&
--                        $module['setup_version'] != null)) {
-+                if (!empty($changesCleanArray)) {
-                     $data = [
-                         'entity_id' => $changeTest['entity_id'],
-                         'name' => $changeTest['name'],
-diff --git a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
-index 845ed0429d2..bce42b4e900 100644
---- a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
-+++ b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
-@@ -21,7 +21,7 @@ class NewRelicWrapper
-      */
-     public function addCustomParameter($param, $value)
-     {
--        if (extension_loaded('newrelic')) {
-+        if ($this->isExtensionInstalled()) {
-             newrelic_add_custom_parameter($param, $value);
-             return true;
-         }
-@@ -31,16 +31,42 @@ class NewRelicWrapper
-     /**
-      * Wrapper for 'newrelic_notice_error' function
-      *
--     * @param  Exception $exception
-+     * @param  \Exception $exception
-      * @return void
-      */
-     public function reportError($exception)
-     {
--        if (extension_loaded('newrelic')) {
-+        if ($this->isExtensionInstalled()) {
-             newrelic_notice_error($exception->getMessage(), $exception);
-         }
-     }
- 
-+    /**
-+     * Wrapper for 'newrelic_set_appname'
-+     *
-+     * @param string $appName
-+     * @return void
-+     */
-+    public function setAppName(string $appName)
-+    {
-+        if ($this->isExtensionInstalled()) {
-+            newrelic_set_appname($appName);
-+        }
-+    }
-+
-+    /**
-+     * Wrapper for 'newrelic_name_transaction'
-+     *
-+     * @param string $transactionName
-+     * @return void
-+     */
-+    public function setTransactionName(string $transactionName): void
-+    {
-+        if ($this->isExtensionInstalled()) {
-+            newrelic_name_transaction($transactionName);
-+        }
-+    }
-+
-     /**
-      * Checks whether newrelic-php5 agent is installed
-      *
-diff --git a/app/code/Magento/NewRelicReporting/Plugin/CommandPlugin.php b/app/code/Magento/NewRelicReporting/Plugin/CommandPlugin.php
-new file mode 100644
-index 00000000000..04ad3d0504d
---- /dev/null
-+++ b/app/code/Magento/NewRelicReporting/Plugin/CommandPlugin.php
-@@ -0,0 +1,55 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\NewRelicReporting\Plugin;
-+
-+use Magento\NewRelicReporting\Model\Config;
-+use Magento\NewRelicReporting\Model\NewRelicWrapper;
-+use Symfony\Component\Console\Command\Command;
-+
-+/**
-+ * Describe NewRelic commands plugin.
-+ */
-+class CommandPlugin
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var NewRelicWrapper
-+     */
-+    private $newRelicWrapper;
-+
-+    /**
-+     * @param Config $config
-+     * @param NewRelicWrapper $newRelicWrapper
-+     */
-+    public function __construct(
-+        Config $config,
-+        NewRelicWrapper $newRelicWrapper
-+    ) {
-+        $this->config = $config;
-+        $this->newRelicWrapper = $newRelicWrapper;
-+    }
-+
-+    /**
-+     * Set NewRelic Transaction name before running command.
-+     *
-+     * @param Command $command
-+     * @param array $args
-+     * @return array
-+     */
-+    public function beforeRun(Command $command, ...$args)
-+    {
-+        $this->newRelicWrapper->setTransactionName(
-+            sprintf('CLI %s', $command->getName())
-+        );
-+
-+        return $args;
-+    }
-+}
-diff --git a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php
-new file mode 100644
-index 00000000000..8be29fa6db9
---- /dev/null
-+++ b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php
-@@ -0,0 +1,102 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\NewRelicReporting\Plugin;
-+
-+use Magento\Framework\App\State;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\NewRelicReporting\Model\Config;
-+use Magento\NewRelicReporting\Model\NewRelicWrapper;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * Handles setting which, when enabled, reports frontend and adminhtml as separate apps to New Relic.
-+ */
-+class StatePlugin
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var NewRelicWrapper
-+     */
-+    private $newRelicWrapper;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @param Config $config
-+     * @param NewRelicWrapper $newRelicWrapper
-+     * @param LoggerInterface $logger
-+     */
-+    public function __construct(
-+        Config $config,
-+        NewRelicWrapper $newRelicWrapper,
-+        LoggerInterface $logger
-+    ) {
-+        $this->config = $config;
-+        $this->newRelicWrapper = $newRelicWrapper;
-+        $this->logger = $logger;
-+    }
-+
-+    /**
-+     * Set separate appname
-+     *
-+     * @param State $subject
-+     * @param mixed $result
-+     * @return mixed
-+     */
-+    public function afterSetAreaCode(State $subject, $result)
-+    {
-+        if (!$this->shouldSetAppName()) {
-+            return $result;
-+        }
-+
-+        try {
-+            $this->newRelicWrapper->setAppName($this->appName($subject));
-+        } catch (LocalizedException $e) {
-+            $this->logger->critical($e);
-+            return $result;
-+        }
-+
-+        return $result;
-+    }
-+
-+    /**
-+     * Format appName.
-+     *
-+     * @param State $state
-+     * @return string
-+     * @throws LocalizedException
-+     */
-+    private function appName(State $state): string
-+    {
-+        $code = $state->getAreaCode();
-+        $current = $this->config->getNewRelicAppName();
-+
-+        return $current . ';' . $current . '_' . $code;
-+    }
-+
-+    /**
-+     * Check if app name should be set.
-+     *
-+     * @return bool
-+     */
-+    private function shouldSetAppName(): bool
-+    {
-+        return (
-+            $this->config->isSeparateApps() &&
-+            $this->config->getNewRelicAppName() &&
-+            $this->config->isNewRelicEnabled()
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
-index 8d8e6255ab8..3c30d95b77d 100644
---- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
-+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
-@@ -8,7 +8,6 @@ namespace Magento\NewRelicReporting\Test\Unit\Model\Module;
- use Magento\NewRelicReporting\Model\Module\Collect;
- use Magento\Framework\Module\FullModuleList;
- use Magento\Framework\Module\ModuleListInterface;
--use Magento\Framework\Module\Manager;
- use Magento\NewRelicReporting\Model\Module;
- 
- /**
-@@ -162,10 +161,6 @@ class CollectTest extends \PHPUnit\Framework\TestCase
-             ->method('getNames')
-             ->willReturn($enabledModulesMockArray);
- 
--        $this->moduleManagerMock->expects($this->any())->method('isOutputEnabled')->will(
--            $this->returnValue(false)
--        );
--
-         $this->assertInternalType(
-             'array',
-             $this->model->getModuleData()
-@@ -256,10 +251,6 @@ class CollectTest extends \PHPUnit\Framework\TestCase
-             ->method('getNames')
-             ->willReturn($enabledModulesMockArray);
- 
--        $this->moduleManagerMock->expects($this->any())->method('isOutputEnabled')->will(
--            $this->returnValue(true)
--        );
--
-         $this->assertInternalType(
-             'array',
-             $this->model->getModuleData()
-@@ -350,10 +341,6 @@ class CollectTest extends \PHPUnit\Framework\TestCase
-             ->method('getNames')
-             ->willReturn($enabledModulesMockArray);
- 
--        $this->moduleManagerMock->expects($this->any())->method('isOutputEnabled')->will(
--            $this->returnValue(true)
--        );
--
-         $this->assertInternalType(
-             'array',
-             $this->model->getModuleData()
-diff --git a/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml b/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml
-index 582b7c75238..98f9c55adbd 100644
---- a/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml
-+++ b/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml
-@@ -46,6 +46,11 @@
-                     <label>New Relic Application Name</label>
-                     <comment>This is located by navigating to Settings from the New Relic APM website</comment>
-                 </field>
-+                <field id="separate_apps" translate="label comment" type="select" sortOrder="9" showInDefault="1" showInWebsite="1" showInStore="1">
-+                    <label>Send Adminhtml and Frontend as Separate Apps</label>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <comment>In addition to the main app (which includes all PHP execution), separate apps for adminhtml and frontend will be created. Requires New Relic Application Name to be set.</comment>
-+                </field>
-             </group>
-             <group id="cron" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Cron</label>
-diff --git a/app/code/Magento/NewRelicReporting/etc/db_schema.xml b/app/code/Magento/NewRelicReporting/etc/db_schema.xml
-index 6f9ce29436f..c6e61b88f4b 100644
---- a/app/code/Magento/NewRelicReporting/etc/db_schema.xml
-+++ b/app/code/Magento/NewRelicReporting/etc/db_schema.xml
-@@ -10,13 +10,13 @@
-     <table name="reporting_counts" resource="default" engine="innodb"
-            comment="Reporting for all count related events generated via the cron job">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="varchar" name="type" nullable="true" length="255" comment="Item Reported"/>
-         <column xsi:type="int" name="count" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="Count Value"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
-     </table>
-@@ -29,44 +29,44 @@
-         <column xsi:type="varchar" name="state" nullable="true" length="255" comment="Module State"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
-     </table>
-     <table name="reporting_orders" resource="default" engine="innodb" comment="Reporting for all orders">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
--                comment="Customer Id"/>
--        <column xsi:type="decimal" name="total" scale="0" precision="10" unsigned="true" nullable="true"/>
--        <column xsi:type="decimal" name="total_base" scale="0" precision="10" unsigned="true" nullable="true"/>
-+                comment="Customer ID"/>
-+        <column xsi:type="decimal" name="total" scale="4" precision="20" unsigned="true" nullable="true"/>
-+        <column xsi:type="decimal" name="total_base" scale="4" precision="20" unsigned="true" nullable="true"/>
-         <column xsi:type="int" name="item_count" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Line Item Count"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
-     </table>
-     <table name="reporting_users" resource="default" engine="innodb" comment="Reporting for user actions">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="varchar" name="type" nullable="true" length="255" comment="User Type"/>
-         <column xsi:type="varchar" name="action" nullable="true" length="255" comment="Action Performed"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
-     </table>
-     <table name="reporting_system_updates" resource="default" engine="innodb" comment="Reporting for system updates">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="varchar" name="type" nullable="true" length="255" comment="Update Type"/>
-         <column xsi:type="varchar" name="action" nullable="true" length="255" comment="Action Performed"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
-     </table>
-diff --git a/app/code/Magento/NewRelicReporting/etc/di.xml b/app/code/Magento/NewRelicReporting/etc/di.xml
-index 2dccc45c112..15516f6df89 100644
---- a/app/code/Magento/NewRelicReporting/etc/di.xml
-+++ b/app/code/Magento/NewRelicReporting/etc/di.xml
-@@ -30,6 +30,9 @@
-     <type name="Magento\Framework\App\Http">
-         <plugin name="framework-http-newrelic" type="Magento\NewRelicReporting\Plugin\HttpPlugin"/>
-     </type>
-+    <type name="Magento\Framework\App\State">
-+        <plugin name="framework-state-newrelic" type="Magento\NewRelicReporting\Plugin\StatePlugin"/>
-+    </type>
-     <type name="Magento\Framework\Console\CommandListInterface">
-         <arguments>
-             <argument name="commands" xsi:type="array">
-@@ -37,4 +40,7 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Symfony\Component\Console\Command\Command">
-+        <plugin name="newrelic-describe-commands"  type="Magento\NewRelicReporting\Plugin\CommandPlugin"/>
-+    </type>
- </config>
-diff --git a/app/code/Magento/NewRelicReporting/i18n/en_US.csv b/app/code/Magento/NewRelicReporting/i18n/en_US.csv
-index 433b1b22fcd..5ea64d3d434 100644
---- a/app/code/Magento/NewRelicReporting/i18n/en_US.csv
-+++ b/app/code/Magento/NewRelicReporting/i18n/en_US.csv
-@@ -21,3 +21,5 @@ General,General
- "This is located by navigating to Settings from the New Relic APM website","This is located by navigating to Settings from the New Relic APM website"
- Cron,Cron
- "Enable Cron","Enable Cron"
-+"Send Adminhtml and Frontend as Separate Apps","Send Adminhtml and Frontend as Separate Apps"
-+"In addition to the main app (which includes all PHP execution), separate apps for adminhtml and frontend will be created. Requires New Relic Application Name to be set.","In addition to the main app (which includes all PHP execution), separate apps for adminhtml and frontend will be created. Requires New Relic Application Name to be set."
-diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
-index 61a17d7ad5e..0c66e46a850 100644
---- a/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
-+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
-@@ -41,7 +41,7 @@ class Problem extends \Magento\Backend\Block\Template
-     }
- 
-     /**
--     * @return void
-+     * @inheritDoc
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      */
-     protected function _construct()
-@@ -83,7 +83,7 @@ class Problem extends \Magento\Backend\Block\Template
-     /**
-      * Get the html element for unsubscribe button
-      *
--     * @return $string
-+     * @return string
-      */
-     public function getUnsubscribeButtonHtml()
-     {
-@@ -93,7 +93,7 @@ class Problem extends \Magento\Backend\Block\Template
-     /**
-      * Get the html element for delete button
-      *
--     * @return $string
-+     * @return string
-      */
-     public function getDeleteButtonHtml()
-     {
-diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
-index 04fb07d1261..0e9aada7b03 100644
---- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
-+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
-@@ -11,6 +11,9 @@
-  */
- namespace Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer;
- 
-+/**
-+ * Class Sender
-+ */
- class Sender extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
- {
-     /**
-@@ -23,10 +26,10 @@ class Sender extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
-     {
-         $str = '';
-         if ($row->getTemplateSenderName()) {
--            $str .= htmlspecialchars($row->getTemplateSenderName()) . ' ';
-+            $str .= $this->escapeHtml($row->getTemplateSenderName()) . ' ';
-         }
-         if ($row->getTemplateSenderEmail()) {
--            $str .= '[' . htmlspecialchars($row->getTemplateSenderEmail()) . ']';
-+            $str .= '[' . $this->escapeHtml($row->getTemplateSenderEmail()) . ']';
-         }
-         if ($str == '') {
-             $str .= '---';
-diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
-index f9474da452c..58a904248e9 100644
---- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
-+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
-@@ -84,7 +84,7 @@ class Preview extends \Magento\Backend\Block\Widget
-         $template->revertDesign();
- 
-         if ($template->isPlain()) {
--            $templateProcessed = "<pre>" . htmlspecialchars($templateProcessed) . "</pre>";
-+            $templateProcessed = "<pre>" . $this->escapeHtml($templateProcessed) . "</pre>";
-         }
- 
-         \Magento\Framework\Profiler::stop($this->profilerName);
-@@ -142,6 +142,8 @@ class Preview extends \Magento\Backend\Block\Widget
-     }
- 
-     /**
-+     * Return template
-+     *
-      * @param \Magento\Newsletter\Model\Template $template
-      * @param string $id
-      * @return $this
-diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php
-index 7ea3b2cb909..453a42def61 100644
---- a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php
-+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Newsletter\Controller\Adminhtml\Problem;
- 
--class Index extends \Magento\Newsletter\Controller\Adminhtml\Problem
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Newsletter\Controller\Adminhtml\Problem implements HttpGetActionInterface
- {
-     /**
-      * Newsletter problems report page
-diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php
-index b012979a11a..f99c22a4743 100644
---- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php
-+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Newsletter\Controller\Adminhtml\Queue;
- 
--class Edit extends \Magento\Newsletter\Controller\Adminhtml\Queue
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Edit extends \Magento\Newsletter\Controller\Adminhtml\Queue implements HttpGetActionInterface
- {
-     /**
-      * Core registry
-diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php
-index c992fe6c377..4f734c09e47 100644
---- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php
-+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php
-@@ -6,7 +6,11 @@
-  */
- namespace Magento\Newsletter\Controller\Adminhtml\Queue;
- 
--class Grid extends \Magento\Newsletter\Controller\Adminhtml\Queue
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+use Magento\Newsletter\Controller\Adminhtml\Queue as QueueAction;
-+
-+class Grid extends QueueAction implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * Queue list Ajax action
-diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php
-index 22c7adc5255..2d07ffabe38 100644
---- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php
-+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php
-@@ -6,7 +6,14 @@
-  */
- namespace Magento\Newsletter\Controller\Adminhtml\Queue;
- 
--class Index extends \Magento\Newsletter\Controller\Adminhtml\Queue
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Newsletter\Controller\Adminhtml\Queue as QueueAction;
-+
-+/**
-+ * Show newsletter queue. Needs to be accessible by POST because of filtering.
-+ */
-+class Index extends QueueAction implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * Queue list action
-diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
-index d3b091976e9..2dbe10bf1bd 100644
---- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
-+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
-@@ -7,7 +7,9 @@
- 
- namespace Magento\Newsletter\Controller\Adminhtml\Queue;
- 
--class Save extends \Magento\Newsletter\Controller\Adminhtml\Queue
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class Save extends \Magento\Newsletter\Controller\Adminhtml\Queue implements HttpPostActionInterface
- {
-     /**
-      * Save Newsletter queue
-diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php
-index a730b8a21a1..09cf1ae7959 100644
---- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php
-+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php
-@@ -6,7 +6,11 @@
-  */
- namespace Magento\Newsletter\Controller\Adminhtml\Subscriber;
- 
--class Index extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Newsletter\Controller\Adminhtml\Subscriber as SubscriberAction;
-+
-+class Index extends SubscriberAction implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * Newsletter subscribers page
-diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
-index 7f02e4ea134..cdef44b2da7 100644
---- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
-+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
-@@ -6,22 +6,27 @@
-  */
- namespace Magento\Newsletter\Controller\Adminhtml\Subscriber;
- 
--use Magento\Newsletter\Controller\Adminhtml\Subscriber;
- use Magento\Backend\App\Action\Context;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\App\Response\Http\FileFactory;
-+use Magento\Newsletter\Controller\Adminhtml\Subscriber;
- use Magento\Newsletter\Model\SubscriberFactory;
--use Magento\Framework\App\ObjectManager;
- 
--class MassDelete extends Subscriber
-+/**
-+ * Subscriber mass delete controller.
-+ */
-+class MassDelete extends Subscriber implements HttpPostActionInterface
- {
-     /**
-      * @var SubscriberFactory
-      */
-     private $subscriberFactory;
--    
-+
-     /**
-      * @param Context $context
-      * @param FileFactory $fileFactory
-+     * @param SubscriberFactory|null $subscriberFactory
-      */
-     public function __construct(
-         Context $context,
-@@ -31,7 +36,7 @@ class MassDelete extends Subscriber
-         $this->subscriberFactory = $subscriberFactory ?: ObjectManager::getInstance()->get(SubscriberFactory::class);
-         parent::__construct($context, $fileFactory);
-     }
--    
-+
-     /**
-      * Delete one or more subscribers action
-      *
-diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php
-index 52d46065ad0..2d167d4ccf5 100644
---- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php
-+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Newsletter\Controller\Adminhtml\Template;
- 
--class Drop extends \Magento\Newsletter\Controller\Adminhtml\Template
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class Drop extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpPostActionInterface
- {
-     /**
-      * Drop Newsletter Template
-diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php
-index a1126be35af..e60b865003f 100644
---- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php
-+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Newsletter\Controller\Adminhtml\Template;
- 
--class Edit extends \Magento\Newsletter\Controller\Adminhtml\Template
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Edit extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpGetActionInterface
- {
-     /**
-      * Core registry
-diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php
-index 5fcce53c6ab..12cdb7e262d 100644
---- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php
-+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Newsletter\Controller\Adminhtml\Template;
- 
--class Index extends \Magento\Newsletter\Controller\Adminhtml\Template
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpGetActionInterface
- {
-     /**
-      * View Templates list
-diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php
-index 054e9025a4f..c739d6ba26b 100644
---- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php
-+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Newsletter\Controller\Adminhtml\Template;
- 
--class NewAction extends \Magento\Newsletter\Controller\Adminhtml\Template
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class NewAction extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpGetActionInterface
- {
-     /**
-      * Create new Newsletter Template
-diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
-index fbce319a75f..9fd9f4335b5 100644
---- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
-+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
-@@ -6,7 +6,12 @@
-  */
- namespace Magento\Newsletter\Controller\Adminhtml\Template;
- 
--class Preview extends \Magento\Newsletter\Controller\Adminhtml\Template
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+
-+/**
-+ * View a rendered template.
-+ */
-+class Preview extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpGetActionInterface
- {
-     /**
-      * Preview Newsletter template
-diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
-index c9db0d62e2e..8fc729ea340 100644
---- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
-+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
-@@ -6,10 +6,11 @@
-  */
- namespace Magento\Newsletter\Controller\Adminhtml\Template;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\App\TemplateTypesInterface;
- use Magento\Framework\Exception\LocalizedException;
- 
--class Save extends \Magento\Newsletter\Controller\Adminhtml\Template
-+class Save extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpPostActionInterface
- {
-     /**
-      * Save Newsletter Template
-diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php
-index 419cbac10ff..d7d511e2d19 100644
---- a/app/code/Magento/Newsletter/Controller/Manage/Save.php
-+++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php
-@@ -1,16 +1,22 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Newsletter\Controller\Manage;
- 
- use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Newsletter\Model\Subscriber;
- 
--class Save extends \Magento\Newsletter\Controller\Manage
-+/**
-+ * Customers newsletter subscription save controller
-+ */
-+class Save extends \Magento\Newsletter\Controller\Manage implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\Data\Form\FormKey\Validator
-@@ -60,7 +66,7 @@ class Save extends \Magento\Newsletter\Controller\Manage
-     /**
-      * Save newsletter subscription preference action
-      *
--     * @return void|null
-+     * @return \Magento\Framework\App\ResponseInterface
-      */
-     public function execute()
-     {
-@@ -81,6 +87,8 @@ class Save extends \Magento\Newsletter\Controller\Manage
-                 $isSubscribedParam = (boolean)$this->getRequest()
-                     ->getParam('is_subscribed', false);
-                 if ($isSubscribedParam !== $isSubscribedState) {
-+                    // No need to validate customer and customer address while saving subscription preferences
-+                    $this->setIgnoreValidationFlag($customer);
-                     $this->customerRepository->save($customer);
-                     if ($isSubscribedParam) {
-                         $subscribeModel = $this->subscriberFactory->create()
-@@ -103,6 +111,17 @@ class Save extends \Magento\Newsletter\Controller\Manage
-                 $this->messageManager->addError(__('Something went wrong while saving your subscription.'));
-             }
-         }
--        $this->_redirect('customer/account/');
-+        return $this->_redirect('customer/account/');
-+    }
-+
-+    /**
-+     * Set ignore_validation_flag to skip unnecessary address and customer validation
-+     *
-+     * @param CustomerInterface $customer
-+     * @return void
-+     */
-+    private function setIgnoreValidationFlag(CustomerInterface $customer): void
-+    {
-+        $customer->setData('ignore_validation_flag', true);
-     }
- }
-diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
-index 4e338c2d1df..6f566761b2f 100644
---- a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
-+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
-@@ -4,13 +4,21 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Newsletter\Controller\Subscriber;
- 
--class Confirm extends \Magento\Newsletter\Controller\Subscriber
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+
-+/**
-+ * Confirm subscription controller.
-+ */
-+class Confirm extends \Magento\Newsletter\Controller\Subscriber implements HttpGetActionInterface
- {
-     /**
--     * Subscription confirm action
--     * @return void
-+     * Subscription confirm action.
-+     *
-+     * @return \Magento\Framework\Controller\Result\Redirect
-      */
-     public function execute()
-     {
-@@ -23,17 +31,17 @@ class Confirm extends \Magento\Newsletter\Controller\Subscriber
- 
-             if ($subscriber->getId() && $subscriber->getCode()) {
-                 if ($subscriber->confirm($code)) {
--                    $this->messageManager->addSuccess(__('Your subscription has been confirmed.'));
-+                    $this->messageManager->addSuccessMessage(__('Your subscription has been confirmed.'));
-                 } else {
--                    $this->messageManager->addError(__('This is an invalid subscription confirmation code.'));
-+                    $this->messageManager->addErrorMessage(__('This is an invalid subscription confirmation code.'));
-                 }
-             } else {
--                $this->messageManager->addError(__('This is an invalid subscription ID.'));
-+                $this->messageManager->addErrorMessage(__('This is an invalid subscription ID.'));
-             }
-         }
--
--        $resultRedirect = $this->resultRedirectFactory->create();
--        $resultRedirect->setUrl($this->_storeManager->getStore()->getBaseUrl());
--        return $resultRedirect;
-+        /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
-+        $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
-+        $redirectUrl = $this->_storeManager->getStore()->getBaseUrl();
-+        return $redirect->setUrl($redirectUrl);
-     }
- }
-diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
-index fd2a61702e9..7557f1610b4 100644
---- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
-+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
-@@ -4,12 +4,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Newsletter\Controller\Subscriber;
- 
- use Magento\Customer\Api\AccountManagementInterface as CustomerAccountManagement;
- use Magento\Customer\Model\Session;
- use Magento\Customer\Model\Url as CustomerUrl;
- use Magento\Framework\App\Action\Context;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Exception\LocalizedException;
-@@ -22,9 +24,11 @@ use Magento\Store\Model\StoreManagerInterface;
- use Magento\Newsletter\Model\SubscriberFactory;
- 
- /**
-+ * New newsletter subscription action
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class NewAction extends SubscriberController
-+class NewAction extends SubscriberController implements HttpPostActionInterface
- {
-     /**
-      * @var CustomerAccountManagement
-@@ -77,8 +81,9 @@ class NewAction extends SubscriberController
-     protected function validateEmailAvailable($email)
-     {
-         $websiteId = $this->_storeManager->getStore()->getWebsiteId();
--        if ($this->_customerSession->getCustomerDataObject()->getEmail() !== $email
--            && !$this->customerAccountManagement->isEmailAvailable($email, $websiteId)
-+        if ($this->_customerSession->isLoggedIn()
-+            && ($this->_customerSession->getCustomerDataObject()->getEmail() !== $email
-+            && !$this->customerAccountManagement->isEmailAvailable($email, $websiteId))
-         ) {
-             throw new LocalizedException(
-                 __('This email address is already assigned to another user.')
-@@ -127,7 +132,7 @@ class NewAction extends SubscriberController
-     /**
-      * New subscription action
-      *
--     * @return void
-+     * @return \Magento\Framework\Controller\Result\Redirect
-      */
-     public function execute()
-     {
-@@ -151,18 +156,20 @@ class NewAction extends SubscriberController
-                 $status = (int) $this->_subscriberFactory->create()->subscribe($email);
-                 $this->messageManager->addSuccessMessage($this->getSuccessMessage($status));
-             } catch (LocalizedException $e) {
--                $this->messageManager->addExceptionMessage(
--                    $e,
--                    __('There was a problem with the subscription: %1', $e->getMessage())
--                );
-+                $this->messageManager->addErrorMessage($e->getMessage());
-             } catch (\Exception $e) {
-                 $this->messageManager->addExceptionMessage($e, __('Something went wrong with the subscription.'));
-             }
-         }
--        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
-+        /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
-+        $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
-+        $redirectUrl = $this->_redirect->getRedirectUrl();
-+        return $redirect->setUrl($redirectUrl);
-     }
- 
-     /**
-+     * Get success message
-+     *
-      * @param int $status
-      * @return Phrase
-      */
-diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
-index efc469e15de..e37a3786e14 100644
---- a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
-+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
-@@ -1,16 +1,22 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Newsletter\Controller\Subscriber;
- 
--class Unsubscribe extends \Magento\Newsletter\Controller\Subscriber
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+/**
-+ * Controller for unsubscribing customers.
-+ */
-+class Unsubscribe extends \Magento\Newsletter\Controller\Subscriber implements HttpGetActionInterface
- {
-     /**
--     * Unsubscribe newsletter
--     * @return void
-+     * Unsubscribe newsletter.
-+     *
-+     * @return \Magento\Framework\Controller\Result\Redirect
-      */
-     public function execute()
-     {
-@@ -20,13 +26,16 @@ class Unsubscribe extends \Magento\Newsletter\Controller\Subscriber
-         if ($id && $code) {
-             try {
-                 $this->_subscriberFactory->create()->load($id)->setCheckCode($code)->unsubscribe();
--                $this->messageManager->addSuccess(__('You unsubscribed.'));
-+                $this->messageManager->addSuccessMessage(__('You unsubscribed.'));
-             } catch (\Magento\Framework\Exception\LocalizedException $e) {
--                $this->messageManager->addException($e, $e->getMessage());
-+                $this->messageManager->addErrorMessage($e, $e->getMessage());
-             } catch (\Exception $e) {
--                $this->messageManager->addException($e, __('Something went wrong while unsubscribing you.'));
-+                $this->messageManager->addErrorMessage($e, __('Something went wrong while unsubscribing you.'));
-             }
-         }
--        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
-+        /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
-+        $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
-+        $redirectUrl = $this->_redirect->getRedirectUrl();
-+        return $redirect->setUrl($redirectUrl);
-     }
- }
-diff --git a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
-index 22b31575deb..309bfadab41 100644
---- a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
-+++ b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
-@@ -12,6 +12,9 @@ use Magento\Framework\Api\ExtensionAttributesFactory;
- use Magento\Newsletter\Model\ResourceModel\Subscriber;
- use Magento\Customer\Api\Data\CustomerExtensionInterface;
- 
-+/**
-+ * Newsletter Plugin for customer
-+ */
- class CustomerPlugin
- {
-     /**
-diff --git a/app/code/Magento/Newsletter/Model/Queue.php b/app/code/Magento/Newsletter/Model/Queue.php
-index efb68fd4243..a3279f8c836 100644
---- a/app/code/Magento/Newsletter/Model/Queue.php
-+++ b/app/code/Magento/Newsletter/Model/Queue.php
-@@ -7,6 +7,7 @@ namespace Magento\Newsletter\Model;
- 
- use Magento\Framework\App\TemplateTypesInterface;
- use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-+use Magento\Framework\Stdlib\DateTime\Timezone\LocalizedDateToUtcConverterInterface;
- 
- /**
-  * Newsletter queue model.
-@@ -117,6 +118,11 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
-      */
-     private $timezone;
- 
-+    /**
-+     * @var LocalizedDateToUtcConverterInterface
-+     */
-+    private $utcConverter;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -130,6 +136,7 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-      * @param array $data
-      * @param TimezoneInterface $timezone
-+     * @param LocalizedDateToUtcConverterInterface $utcConverter
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -144,7 +151,8 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-         array $data = [],
--        TimezoneInterface $timezone = null
-+        TimezoneInterface $timezone = null,
-+        LocalizedDateToUtcConverterInterface $utcConverter = null
-     ) {
-         parent::__construct(
-             $context,
-@@ -159,9 +167,10 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
-         $this->_problemFactory = $problemFactory;
-         $this->_subscribersCollection = $subscriberCollectionFactory->create();
-         $this->_transportBuilder = $transportBuilder;
--        $this->timezone = $timezone ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
--            TimezoneInterface::class
--        );
-+
-+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-+        $this->timezone = $timezone ?: $objectManager->get(TimezoneInterface::class);
-+        $this->utcConverter = $utcConverter ?? $objectManager->get(LocalizedDateToUtcConverterInterface::class);
-     }
- 
-     /**
-@@ -196,7 +205,7 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
-         if ($startAt === null || $startAt == '') {
-             $this->setQueueStartAt(null);
-         } else {
--            $this->setQueueStartAt($this->timezone->convertConfigTimeToUtc($startAt));
-+            $this->setQueueStartAt($this->utcConverter->convertLocalizedDateToUtc($startAt));
-         }
-         return $this;
-     }
-diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
-index 189549d2a73..52009dad661 100644
---- a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
-+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
-@@ -141,8 +141,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-     }
- 
-     /**
--     * Checks if field is 'subscribers_total', 'subscribers_sent'
--     * to add specific filter or adds regular filter
-+     * Checks if field is 'subscribers_total', 'subscribers_sent' to add specific filter or adds regular filter
-      *
-      * @param string $field
-      * @param null|string|array $condition
-@@ -210,7 +209,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-     }
- 
-     /**
--     * Add filter by only ready fot sending item
-+     * Add filter by only ready for sending item
-      *
-      * @return $this
-      */
-diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
-index c7ce4b2f2f1..f9e9d57bf4b 100644
---- a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
-+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Newsletter\Model\ResourceModel;
- 
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Store\Model\StoreManagerInterface;
-+
- /**
-  * Newsletter subscriber resource model
-  *
-@@ -48,6 +51,13 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      */
-     protected $mathRandom;
- 
-+    /**
-+     * Store manager
-+     *
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-     /**
-      * Construct
-      *
-@@ -55,21 +65,23 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
-      * @param \Magento\Framework\Math\Random $mathRandom
-      * @param string $connectionName
-+     * @param StoreManagerInterface $storeManager
-      */
-     public function __construct(
-         \Magento\Framework\Model\ResourceModel\Db\Context $context,
-         \Magento\Framework\Stdlib\DateTime\DateTime $date,
-         \Magento\Framework\Math\Random $mathRandom,
--        $connectionName = null
-+        $connectionName = null,
-+        StoreManagerInterface $storeManager = null
-     ) {
-         $this->_date = $date;
-         $this->mathRandom = $mathRandom;
-+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
-         parent::__construct($context, $connectionName);
-     }
- 
-     /**
--     * Initialize resource model
--     * Get tablename from config
-+     * Initialize resource model. Get tablename from config
-      *
-      * @return void
-      */
-@@ -118,40 +130,36 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      */
-     public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)
-     {
--        $select = $this->connection
--            ->select()
--            ->from($this->getMainTable())
--            ->where('customer_id=:customer_id and store_id=:store_id');
--
--        $result = $this->connection
--            ->fetchRow(
--                $select,
--                [
--                    'customer_id' => $customer->getId(),
--                    'store_id' => $customer->getStoreId()
--                ]
--            );
-+        $storeIds = $this->storeManager->getWebsite($customer->getWebsiteId())->getStoreIds();
-+
-+        if ($customer->getId()) {
-+            $select = $this->connection
-+                ->select()
-+                ->from($this->getMainTable())
-+                ->where('customer_id = ?', $customer->getId())
-+                ->where('store_id IN (?)', $storeIds)
-+                ->limit(1);
-+
-+            $result = $this->connection->fetchRow($select);
- 
--        if ($result) {
--            return $result;
-+            if ($result) {
-+                return $result;
-+            }
-         }
- 
--        $select = $this->connection
--            ->select()
--            ->from($this->getMainTable())
--            ->where('subscriber_email=:subscriber_email and store_id=:store_id');
--
--        $result = $this->connection
--            ->fetchRow(
--                $select,
--                [
--                    'subscriber_email' => $customer->getEmail(),
--                    'store_id' => $customer->getStoreId()
--                ]
--            );
-+        if ($customer->getEmail()) {
-+            $select = $this->connection
-+                ->select()
-+                ->from($this->getMainTable())
-+                ->where('subscriber_email = ?', $customer->getEmail())
-+                ->where('store_id IN (?)', $storeIds)
-+                ->limit(1);
-+
-+            $result = $this->connection->fetchRow($select);
- 
--        if ($result) {
--            return $result;
-+            if ($result) {
-+                return $result;
-+            }
-         }
- 
-         return [];
-diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
-index 27ee8197778..11778349540 100644
---- a/app/code/Magento/Newsletter/Model/Subscriber.php
-+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
-@@ -7,6 +7,9 @@ namespace Magento\Newsletter\Model;
- 
- use Magento\Customer\Api\AccountManagementInterface;
- use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Exception\MailException;
- use Magento\Framework\Exception\NoSuchEntityException;
- 
-@@ -28,6 +31,7 @@ use Magento\Framework\Exception\NoSuchEntityException;
-  * @method int getSubscriberId()
-  * @method Subscriber setSubscriberId(int $value)
-  *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-  *
-@@ -127,6 +131,16 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
-      */
-     protected $inlineTranslation;
- 
-+    /**
-+     * @var CustomerInterfaceFactory
-+     */
-+    private $customerFactory;
-+
-+    /**
-+     * @var DataObjectHelper
-+     */
-+    private $dataObjectHelper;
-+
-     /**
-      * Initialize dependencies.
-      *
-@@ -144,6 +158,8 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
-      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
-      * @param array $data
-      * @param \Magento\Framework\Stdlib\DateTime\DateTime|null $dateTime
-+     * @param CustomerInterfaceFactory|null $customerFactory
-+     * @param DataObjectHelper|null $dataObjectHelper
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -160,7 +176,9 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-         array $data = [],
--        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime = null
-+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime = null,
-+        CustomerInterfaceFactory $customerFactory = null,
-+        DataObjectHelper $dataObjectHelper = null
-     ) {
-         $this->_newsletterData = $newsletterData;
-         $this->_scopeConfig = $scopeConfig;
-@@ -170,6 +188,10 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
-         $this->dateTime = $dateTime ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-             \Magento\Framework\Stdlib\DateTime\DateTime::class
-         );
-+        $this->customerFactory = $customerFactory ?: ObjectManager::getInstance()
-+            ->get(CustomerInterfaceFactory::class);
-+        $this->dataObjectHelper = $dataObjectHelper ?: ObjectManager::getInstance()
-+            ->get(DataObjectHelper::class);
-         $this->customerRepository = $customerRepository;
-         $this->customerAccountManagement = $customerAccountManagement;
-         $this->inlineTranslation = $inlineTranslation;
-@@ -346,7 +368,17 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
-      */
-     public function loadByEmail($subscriberEmail)
-     {
--        $this->addData($this->getResource()->loadByEmail($subscriberEmail));
-+        $storeId = $this->_storeManager->getStore()->getId();
-+        $customerData = ['store_id' => $storeId, 'email'=> $subscriberEmail];
-+
-+        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
-+        $customer = $this->customerFactory->create();
-+        $this->dataObjectHelper->populateWithArray(
-+            $customer,
-+            $customerData,
-+            \Magento\Customer\Api\Data\CustomerInterface::class
-+        );
-+        $this->addData($this->getResource()->loadByCustomerData($customer));
-         return $this;
-     }
- 
-@@ -361,6 +393,9 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
-         try {
-             $customerData = $this->customerRepository->getById($customerId);
-             $customerData->setStoreId($this->_storeManager->getStore()->getId());
-+            if ($customerData->getWebsiteId() === null) {
-+                $customerData->setWebsiteId($this->_storeManager->getStore()->getWebsiteId());
-+            }
-             $data = $this->getResource()->loadByCustomerData($customerData);
-             $this->addData($data);
-             if (!empty($data) && $customerData->getId() && !$this->getCustomerId()) {
-@@ -368,6 +403,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
-                 $this->setSubscriberConfirmCode($this->randomSequence());
-                 $this->save();
-             }
-+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-         } catch (NoSuchEntityException $e) {
-         }
-         return $this;
-@@ -459,7 +495,9 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
-                 $this->sendConfirmationSuccessEmail();
-             }
-             return $this->getStatus();
-+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
-         } catch (\Exception $e) {
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception($e->getMessage());
-         }
-     }
-@@ -497,7 +535,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
--     * unsubscribe the customer with the id provided
-+     * Unsubscribe the customer with the id provided
-      *
-      * @param int $customerId
-      * @return $this
-@@ -525,7 +563,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
-      *
-      * @param int $customerId
-      * @param bool $subscribe indicates whether the customer should be subscribed or unsubscribed
--     * @return  $this
-+     * @return $this
-      *
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-@@ -557,7 +595,12 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
-             if (AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED
-                 == $this->customerAccountManagement->getConfirmationStatus($customerId)
-             ) {
--                $status = self::STATUS_UNCONFIRMED;
-+                if ($this->getId() && $this->getStatus() == self::STATUS_SUBSCRIBED) {
-+                    // if a customer was already subscribed then keep the subscribed
-+                    $status = self::STATUS_SUBSCRIBED;
-+                } else {
-+                    $status = self::STATUS_UNCONFIRMED;
-+                }
-             } elseif ($isConfirmNeed) {
-                 if ($this->getStatus() != self::STATUS_SUBSCRIBED) {
-                     $status = self::STATUS_NOT_ACTIVE;
-@@ -566,6 +609,8 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
-         } elseif (($this->getStatus() == self::STATUS_UNCONFIRMED) && ($customerData->getConfirmation() === null)) {
-             $status = self::STATUS_SUBSCRIBED;
-             $sendInformationEmail = true;
-+        } elseif (($this->getStatus() == self::STATUS_NOT_ACTIVE) && ($customerData->getConfirmation() === null)) {
-+            $status = self::STATUS_NOT_ACTIVE;
-         } else {
-             $status = self::STATUS_UNSUBSCRIBED;
-         }
-@@ -582,16 +627,17 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
- 
-         $this->setStatus($status);
- 
-+        $storeId = $customerData->getStoreId();
-+        if ((int)$customerData->getStoreId() === 0) {
-+            $storeId = $this->_storeManager->getWebsite($customerData->getWebsiteId())->getDefaultStore()->getId();
-+        }
-+
-         if (!$this->getId()) {
--            $storeId = $customerData->getStoreId();
--            if ($customerData->getStoreId() == 0) {
--                $storeId = $this->_storeManager->getWebsite($customerData->getWebsiteId())->getDefaultStore()->getId();
--            }
-             $this->setStoreId($storeId)
-                 ->setCustomerId($customerData->getId())
-                 ->setEmail($customerData->getEmail());
-         } else {
--            $this->setStoreId($customerData->getStoreId())
-+            $this->setStoreId($storeId)
-                 ->setEmail($customerData->getEmail());
-         }
- 
-@@ -644,7 +690,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
-      * Mark receiving subscriber of queue newsletter
-      *
-      * @param  \Magento\Newsletter\Model\Queue $queue
--     * @return boolean
-+     * @return Subscriber
-      */
-     public function received(\Magento\Newsletter\Model\Queue $queue)
-     {
-diff --git a/app/code/Magento/Newsletter/Observer/PredispatchNewsletterObserver.php b/app/code/Magento/Newsletter/Observer/PredispatchNewsletterObserver.php
-new file mode 100644
-index 00000000000..9860798b2b9
---- /dev/null
-+++ b/app/code/Magento/Newsletter/Observer/PredispatchNewsletterObserver.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types = 1);
-+
-+namespace Magento\Newsletter\Observer;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\Event\Observer;
-+use Magento\Framework\Event\ObserverInterface;
-+use Magento\Framework\UrlInterface;
-+use Magento\Store\Model\ScopeInterface;
-+
-+/**
-+ * Class PredispatchNewsletterObserver
-+ */
-+class PredispatchNewsletterObserver implements ObserverInterface
-+{
-+    /**
-+     * Configuration path to newsletter active setting
-+     */
-+    const XML_PATH_NEWSLETTER_ACTIVE = 'newsletter/general/active';
-+
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @var UrlInterface
-+     */
-+    private $url;
-+
-+    /**
-+     * PredispatchNewsletterObserver constructor.
-+     *
-+     * @param ScopeConfigInterface $scopeConfig
-+     * @param UrlInterface $url
-+     */
-+    public function __construct(ScopeConfigInterface $scopeConfig, UrlInterface $url)
-+    {
-+        $this->scopeConfig = $scopeConfig;
-+        $this->url = $url;
-+    }
-+
-+    /**
-+     * Redirect newsletter routes to 404 when newsletter module is disabled.
-+     *
-+     * @param Observer $observer
-+     */
-+    public function execute(Observer $observer) : void
-+    {
-+        if (!$this->scopeConfig->getValue(
-+            self::XML_PATH_NEWSLETTER_ACTIVE,
-+            ScopeInterface::SCOPE_STORE
-+        )
-+        ) {
-+            $defaultNoRouteUrl = $this->scopeConfig->getValue(
-+                'web/default/no_route',
-+                ScopeInterface::SCOPE_STORE
-+            );
-+            $redirectUrl = $this->url->getUrl($defaultNoRouteUrl);
-+            $observer->getControllerAction()
-+                ->getResponse()
-+                ->setRedirect($redirectUrl);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
-new file mode 100644
-index 00000000000..059f157c407
---- /dev/null
-+++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
-@@ -0,0 +1,33 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+
-+    <!--Create an Account. Check Sign Up for Newsletter checkbox -->
-+    <actionGroup name="StorefrontCreateNewAccountNewsletterChecked" extends="SignUpNewUserFromStorefrontActionGroup">
-+        <click selector="{{StorefrontCustomerCreateFormSection.signUpForNewsletter}}" stepKey="selectSignUpForNewsletterCheckbox" after="fillLastName"/>
-+        <see stepKey="seeDescriptionNewsletter" userInput='You are subscribed to "General Subscription".' selector="{{CustomerMyAccountPage.DescriptionNewsletter}}" />
-+    </actionGroup>
-+
-+    <!--Create an Account. Uncheck Sign Up for Newsletter checkbox -->
-+    <actionGroup name="StorefrontCreateNewAccountNewsletterUnchecked" extends="SignUpNewUserFromStorefrontActionGroup">
-+        <arguments>
-+            <argument name="Customer"/>
-+            <argument name="Store"/>
-+        </arguments>
-+        <amOnPage stepKey="amOnStorefrontPage" url="{{Store.code}}"/>
-+        <see stepKey="seeDescriptionNewsletter" userInput="You aren't subscribed to our newsletter." selector="{{CustomerMyAccountPage.DescriptionNewsletter}}" />
-+        <see stepKey="seeThankYouMessage" userInput="Thank you for registering with NewStore."/>
-+    </actionGroup>
-+
-+    <!--Check Subscribed Newsletter via StoreFront-->
-+    <actionGroup name="CheckSubscribedNewsletterActionGroup">
-+        <amOnPage url="{{StorefrontNewsletterManagePage.url}}" stepKey="goToNewsletterManage"/>
-+        <seeCheckboxIsChecked selector="{{StorefrontNewsletterManageSection.subscriptionCheckbox}}" stepKey="checkSubscribedNewsletter"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Newsletter/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..1df1cd5f8da
---- /dev/null
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,31 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuMarketingCommunicationsNewsletterQueue">
-+        <data key="pageTitle">Newsletter Queue</data>
-+        <data key="title">Newsletter Queue</data>
-+        <data key="dataUiId">magento-newsletter-newsletter-queue</data>
-+    </entity>
-+    <entity name="AdminMenuMarketingCommunicationsNewsletterSubscribers">
-+        <data key="pageTitle">Newsletter Subscribers</data>
-+        <data key="title">Newsletter Subscribers</data>
-+        <data key="dataUiId">magento-newsletter-newsletter-subscriber</data>
-+    </entity>
-+    <entity name="AdminMenuMarketingCommunicationsNewsletterTemplate">
-+        <data key="pageTitle">Newsletter Template</data>
-+        <data key="title">Newsletter Template</data>
-+        <data key="dataUiId">magento-newsletter-newsletter-template</data>
-+    </entity>
-+    <entity name="AdminMenuReportsMarketingNewsletterProblemReports">
-+        <data key="pageTitle">Newsletter Problems Report</data>
-+        <data key="title">Newsletter Problem Reports</data>
-+        <data key="dataUiId">magento-newsletter-newsletter-problem</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Data/NewsletterTemplateData.xml b/app/code/Magento/Newsletter/Test/Mftf/Data/NewsletterTemplateData.xml
-index 9719a892aa7..fe2deed9a27 100644
---- a/app/code/Magento/Newsletter/Test/Mftf/Data/NewsletterTemplateData.xml
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Data/NewsletterTemplateData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="_defaultNewsletter" type="cms_page">
-         <data key="name" unique="suffix">Test Newsletter Template</data>
-         <data key="subject">Test Newsletter Subject</data>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Page/NewsletterTemplatePage.xml b/app/code/Magento/Newsletter/Test/Mftf/Page/NewsletterTemplatePage.xml
-index b27bc5eee9f..fa655fadab5 100644
---- a/app/code/Magento/Newsletter/Test/Mftf/Page/NewsletterTemplatePage.xml
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Page/NewsletterTemplatePage.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="NewsletterTemplateForm" url="/newsletter/template/new/" area="admin" module="Magento_Cms">
-         <section name="StorefrontNewsletterSection"/>
-         <section name="StorefrontNewsletterSection"/>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Page/StorefrontNewsletterManagePage.xml b/app/code/Magento/Newsletter/Test/Mftf/Page/StorefrontNewsletterManagePage.xml
-new file mode 100644
-index 00000000000..81fd3eb7c39
---- /dev/null
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Page/StorefrontNewsletterManagePage.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontNewsletterManagePage" url="newsletter/manage/" area="storefront" module="Magento_Newsletter">
-+        <section name="StorefrontNewsletterManageSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml
-index ef897ef6421..3525a976cd1 100644
---- a/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml
-@@ -6,20 +6,20 @@
-   */
- -->
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="BasicFieldNewsletterSection">
-         <element name="templateName" type="input" selector="#code"/>
-         <element name="templateSubject" type="input" selector="#subject"/>
-         <element name="senderName" type="input" selector="#sender_name"/>
-         <element name="senderEmail" type="input" selector="#sender_email"/>
--        <element name="save" type="button" selector="button[data-role='template-save']"/>
-+        <element name="save" type="button" selector="button[data-role='template-save']" timeout="60"/>
-         <element name="searchButton" type="button" selector=".admin__filter-actions button[title=Search]"/>
-         <element name="searchInput" type="input" selector="input[name=code]"/>
-     </section>
-     <section name="NewsletterWYSIWYGSection">
-         <element name="TextArea" type="text" selector="#text" />
-         <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by" />
--        <element name="ShowHideBtn" type="button" selector="#toggletext"/>
-+        <element name="ShowHideBtn" type="button" selector="#toggletext" timeout="60"/>
-         <element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
-         <element name="InsertWidgetIcon" type="button" selector="div[aria-label='Insert Widget']"/>
-         <element name="InsertVariableIcon" type="button" selector="div[aria-label='Insert Variable']"/>
-@@ -51,6 +51,6 @@
-         <element name="InsertImage" type="button" selector=".mce-i-image" />
-         <element name="InsertTable" type="button" selector=".mce-i-table" />
-         <element name="SpecialCharacter" type="button" selector=".mce-i-charmap" />
--        <element name="Preview" type="text" selector="//td[contains(text(),'{{var1}}')]//following-sibling::td/select//option[contains(text(), 'Preview')]" parameterized="true"/>
-+        <element name="Preview" type="text" selector="//td[contains(text(),'{{var1}}')]//following-sibling::td/select//option[contains(text(), 'Preview')]" parameterized="true" timeout="60"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml
-new file mode 100644
-index 00000000000..9248970d9e6
---- /dev/null
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontNewsletterManageSection">
-+        <element name="subscriptionCheckbox" type="checkbox" selector="#subscription" />
-+        <element name="saveButton" type="button" selector="div.primary>button"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterSection.xml
-index 01d3a36bf29..ed2f5c31605 100644
---- a/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterSection.xml
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontNewsletterSection">
-         <element name="mediaDescription" type="text" selector="body>p>img" />
-         <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml
-new file mode 100644
-index 00000000000..bb651784d4d
---- /dev/null
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerCreateFormSection">
-+        <element name="signUpForNewsletter" type="checkbox" selector="//span[contains(text(), 'Sign Up for Newsletter')]"/>
-+    </section>
-+
-+    <section name="CustomerMyAccountPage">
-+        <element name="DescriptionNewsletter" type="text" selector=".box-newsletter p"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
-index f397b84dfae..a343a20a6d5 100644
---- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddImageToWYSIWYGNewsletterTest">
-         <annotations>
-             <features value="Newsletter"/>
-@@ -16,6 +16,9 @@
-             <description value="Admin should be able to add image to WYSIWYG content Newsletter"/>
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-84377"/>
-+            <skip>
-+                <issueId value="MC-17233"/>
-+            </skip>
-         </annotations>
-         <before>
-             <actionGroup ref="LoginActionGroup" stepKey="login"/>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml
-index 353d33439f0..841d202d518 100644
---- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddVariableToWYSIWYGNewsletterTest">
-         <annotations>
-             <features value="Newsletter"/>
-@@ -15,6 +15,7 @@
-             <title value="Admin should be able to add variable to WYSIWYG Editor of Newsletter"/>
-             <description value="Admin should be able to add variable to WYSIWYG Editor Newsletter"/>
-             <testCaseId value="MAGETWO-84379"/>
-+            <severity value="AVERAGE"/>
-         </annotations>
-         <before>
-             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-@@ -48,9 +49,9 @@
-         <waitForLoadingMaskToDisappear stepKey="waitForPageLoad3"/>
-         <!--see Insert Variable button disabled-->
-         <see selector="{{VariableSection.InsertVariableBtnDisabled}}" userInput="Insert Variable" stepKey="seeInsertWidgetDisabled" />
--        <!--see Cancel button enabed-->
-+        <!--see Cancel button enabled-->
-         <see selector="{{VariableSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
--        <!--see 4 colums-->
-+        <!--see 4 columns-->
-         <see selector="{{VariableSection.ColName('Select')}}" userInput="Select" stepKey="selectCol" />
-         <see selector="{{VariableSection.ColName('Variable Name')}}" userInput="Variable Name" stepKey="variableCol" />
-         <see selector="{{VariableSection.ColName('Type')}}" userInput="Type" stepKey="typeCol" />
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml
-index a447acc1b0f..016f07b8a2f 100644
---- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminAddWidgetToWYSIWYGNewsletterTest">
-         <annotations>
-             <features value="Newsletter"/>
-@@ -16,6 +16,9 @@
-             <description value="Admin should be able to add widget to WYSIWYG Editor Newsletter"/>
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-84682"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-         </annotations>
-         <before>
-             <actionGroup ref="LoginActionGroup" stepKey="login"/>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterQueueNavigateMenuTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterQueueNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..31da588250a
---- /dev/null
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterQueueNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminMarketingNewsletterQueueNavigateMenuTest">
-+        <annotations>
-+            <features value="Newsletter"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin marketing newsletter queue navigate menu test"/>
-+            <description value="Admin should be able to navigate to Marketing > Newsletter Queue"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14189"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterQueuePage">
-+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuMarketingCommunicationsNewsletterQueue.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuMarketingCommunicationsNewsletterQueue.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..8ced2690322
---- /dev/null
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminMarketingNewsletterSubscribersNavigateMenuTest">
-+        <annotations>
-+            <features value="Newsletter"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin marketing newsletter subscribers navigate menu test"/>
-+            <description value="Admin should be able to navigate to Marketing > Newsletter Subscribers"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14190"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterSubscribersPage">
-+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuMarketingCommunicationsNewsletterSubscribers.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuMarketingCommunicationsNewsletterSubscribers.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateNavigateMenuTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..ca994aa1d62
---- /dev/null
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminMarketingNewsletterTemplateNavigateMenuTest">
-+        <annotations>
-+            <features value="Newsletter"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin marketing newsletter template navigate menu test"/>
-+            <description value="Admin should be able to navigate to Marketing > Newsletter Template"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14188"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterTemplatePage">
-+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuMarketingCommunicationsNewsletterTemplate.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuMarketingCommunicationsNewsletterTemplate.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminReportsNewsletterProblemReportsNavigateMenuTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminReportsNewsletterProblemReportsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..3891b90536a
---- /dev/null
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminReportsNewsletterProblemReportsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsNewsletterProblemReportsNavigateMenuTest">
-+        <annotations>
-+            <features value="Newsletter"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports newsletter problem reports navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Newsletter Problem Reports"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14191"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterProblemsReportPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsMarketingNewsletterProblemReports.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsMarketingNewsletterProblemReports.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
-new file mode 100644
-index 00000000000..22ca214c94a
---- /dev/null
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
-@@ -0,0 +1,68 @@
-+<?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="VerifySubscribedNewsletterDisplayedTest">
-+        <annotations>
-+            <features value="Newsletter"/>
-+            <stories value="MAGETWO-91701: Newsletter subscription is not correctly updated when user is registered on 2 stores"/>
-+            <group value="Newsletter"/>
-+            <title value="Newsletter subscription when user is registered on 2 stores"/>
-+            <description value="Newsletter subscription when user is registered on 2 stores"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-93836"/>
-+        </annotations>
-+
-+        <before>
-+            <!--Log in to Magento as admin.-->
-+            <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
-+                <argument name="newWebsiteName" value="Second"/>
-+                <argument name="websiteCode" value="Base2"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
-+                <argument name="website" value="Second"/>
-+                <argument name="storeGroupName" value="NewStore"/>
-+                <argument name="storeGroupCode" value="Base12"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
-+                <argument name="StoreGroup" value="staticStoreGroup"/>
-+                <argument name="customStore" value="staticStore"/>
-+            </actionGroup>
-+            <actionGroup ref="EnableWebUrlOptions" stepKey="addStoreCodeToUrls"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+
-+        </before>
-+        <after>
-+            <!--Delete created data and set Default Configuration-->
-+            <actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/>
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-+                <argument name="websiteName" value="Second"/>
-+            </actionGroup>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-+        </after>
-+
-+        <!--Go to store front (default) and click Create an Account.-->
-+        <actionGroup ref="StorefrontCreateNewAccountNewsletterChecked" stepKey="SignUpNewUser">
-+            <argument name="Customer" value="CustomerEntityOne"/>
-+        </actionGroup>
-+        <!--Sign Out-->
-+        <amOnPage url="customer/account/logout/" stepKey="customerOnLogoutPage"/>
-+        <waitForPageLoad stepKey="waitLogoutCustomer"/>
-+        <!--Create new Account with the same email address. (unchecked Sign Up for Newsletter checkbox)-->
-+        <actionGroup ref="StorefrontCreateNewAccountNewsletterUnchecked" stepKey="createNewAccountNewsletterUnchecked">
-+            <argument name="Customer" value="CustomerEntityOne"/>
-+            <argument name="Store" value="staticStore"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml
-index 69ea5677a09..c4636fea3fb 100644
---- a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml
-+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest">
-         <annotations>
-             <features value="Newsletter"/>
-@@ -29,6 +29,7 @@
-         <fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
-         <fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
-         <conditionalClick selector="#toggletext" dependentSelector=".mce-tinymce" visible="false" stepKey="clickBtnIfTinyMCEHidden"/>
-+        <waitForPageLoad stepKey="waitForTinyMce"/>
-         <actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4"/>
-         <actionGroup ref="VerifyMagentoEntityActionGroup" stepKey="verifyMagentoEntities"/>
-         <executeJS function="tinyMCE.get('text').setContent('Hello World From Newsletter Template!');" stepKey="executeJSFillContent"/>
-diff --git a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
-index 219f9127d4a..b64453594df 100644
---- a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
-+++ b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
-@@ -81,13 +81,17 @@ class PreviewTest extends \PHPUnit\Framework\TestCase
-         $queueFactory->expects($this->any())->method('create')->will($this->returnValue($this->queue));
- 
-         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+
-+        $escaper = $this->objectManager->getObject(\Magento\Framework\Escaper::class);
-+        $context->expects($this->once())->method('getEscaper')->willReturn($escaper);
-+
-         $this->preview = $this->objectManager->getObject(
-             \Magento\Newsletter\Block\Adminhtml\Queue\Preview::class,
-             [
-                 'context' => $context,
-                 'templateFactory' => $templateFactory,
-                 'subscriberFactory' => $subscriberFactory,
--                'queueFactory' => $queueFactory,
-+                'queueFactory' => $queueFactory
-             ]
-         );
-     }
-@@ -103,12 +107,14 @@ class PreviewTest extends \PHPUnit\Framework\TestCase
- 
-     public function testToHtmlWithId()
-     {
--        $this->request->expects($this->any())->method('getParam')->will($this->returnValueMap(
--            [
--                ['id', null, 1],
--                ['store_id', null, 0]
--            ]
--        ));
-+        $this->request->expects($this->any())->method('getParam')->will(
-+            $this->returnValueMap(
-+                [
-+                    ['id', null, 1],
-+                    ['store_id', null, 0]
-+                ]
-+            )
-+        );
-         $this->queue->expects($this->once())->method('load')->will($this->returnSelf());
-         $this->template->expects($this->any())->method('isPlain')->will($this->returnValue(true));
-         /** @var \Magento\Store\Model\Store $store */
-diff --git a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
-index 8d760100d14..bcb3479d65b 100644
---- a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
-+++ b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
-@@ -26,8 +26,14 @@ class SenderTest extends \PHPUnit\Framework\TestCase
-     protected function setUp()
-     {
-         $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $escaper = $this->objectManagerHelper->getObject(
-+            \Magento\Framework\Escaper::class
-+        );
-         $this->sender = $this->objectManagerHelper->getObject(
--            \Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer\Sender::class
-+            \Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer\Sender::class,
-+            [
-+                'escaper' => $escaper
-+            ]
-         );
-     }
- 
-@@ -75,8 +81,8 @@ class SenderTest extends \PHPUnit\Framework\TestCase
-                     'sender_email' => "<br>'email@example.com'</br>",
-                 ],
-                 [
--                    'sender' => "&lt;br&gt;'Sender'&lt;/br&gt;",
--                    'sender_email' => "&lt;br&gt;'email@example.com'&lt;/br&gt;",
-+                    'sender' => "&lt;br&gt;&#039;Sender&#039;&lt;/br&gt;",
-+                    'sender_email' => "&lt;br&gt;&#039;email@example.com&#039;&lt;/br&gt;",
-                 ],
-             ],
-             [
-diff --git a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/PreviewTest.php b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/PreviewTest.php
-index 70407b50cac..87fbca55e15 100644
---- a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/PreviewTest.php
-+++ b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/PreviewTest.php
-@@ -8,6 +8,9 @@ namespace Magento\Newsletter\Test\Unit\Block\Adminhtml\Template;
- use Magento\Framework\App\TemplateTypesInterface;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
- 
-+/**
-+ * Test for \Magento\Newsletter\Block\Adminhtml\Template\Preview
-+ */
- class PreviewTest extends \PHPUnit\Framework\TestCase
- {
-     /** @var \Magento\Newsletter\Block\Adminhtml\Template\Preview */
-@@ -36,7 +39,9 @@ class PreviewTest extends \PHPUnit\Framework\TestCase
-         $this->request = $this->createMock(\Magento\Framework\App\RequestInterface::class);
-         $this->appState = $this->createMock(\Magento\Framework\App\State::class);
-         $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
--        $this->template = $this->createPartialMock(\Magento\Newsletter\Model\Template::class, [
-+        $this->template = $this->createPartialMock(
-+            \Magento\Newsletter\Model\Template::class,
-+            [
-                 'setTemplateType',
-                 'setTemplateText',
-                 'setTemplateStyles',
-@@ -45,7 +50,8 @@ class PreviewTest extends \PHPUnit\Framework\TestCase
-                 'revertDesign',
-                 'getProcessedTemplate',
-                 'load'
--            ]);
-+            ]
-+        );
-         $templateFactory = $this->createPartialMock(\Magento\Newsletter\Model\TemplateFactory::class, ['create']);
-         $templateFactory->expects($this->once())->method('create')->willReturn($this->template);
-         $this->subscriberFactory = $this->createPartialMock(
-@@ -54,6 +60,9 @@ class PreviewTest extends \PHPUnit\Framework\TestCase
-         );
- 
-         $this->objectManagerHelper = new ObjectManagerHelper($this);
-+        $escaper = $this->objectManagerHelper->getObject(
-+            \Magento\Framework\Escaper::class
-+        );
-         $this->preview = $this->objectManagerHelper->getObject(
-             \Magento\Newsletter\Block\Adminhtml\Template\Preview::class,
-             [
-@@ -61,7 +70,8 @@ class PreviewTest extends \PHPUnit\Framework\TestCase
-                 'storeManager' => $this->storeManager,
-                 'request' => $this->request,
-                 'templateFactory' => $templateFactory,
--                'subscriberFactory' => $this->subscriberFactory
-+                'subscriberFactory' => $this->subscriberFactory,
-+                'escaper' => $escaper
-             ]
-         );
-     }
-diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/ProblemTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/ProblemTest.php
-new file mode 100644
-index 00000000000..8ee6de1e444
---- /dev/null
-+++ b/app/code/Magento/Newsletter/Test/Unit/Model/ProblemTest.php
-@@ -0,0 +1,227 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Newsletter\Test\Unit\Model;
-+
-+use Magento\Framework\Data\Collection\AbstractDb;
-+use Magento\Framework\Model\Context;
-+use Magento\Framework\Registry;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Newsletter\Model\Problem as ProblemModel;
-+use Magento\Newsletter\Model\Queue;
-+use Magento\Newsletter\Model\ResourceModel\Problem as ProblemResource;
-+use Magento\Newsletter\Model\Subscriber;
-+use Magento\Newsletter\Model\SubscriberFactory;
-+
-+/**
-+ * Class ProblemTest
-+ */
-+class ProblemTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $contextMock;
-+
-+    /**
-+     * @var Registry|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $registryMock;
-+
-+    /**
-+     * @var SubscriberFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $subscriberFactoryMock;
-+
-+    /**
-+     * @var Subscriber|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $subscriberMock;
-+
-+    /**
-+     * @var ProblemResource|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $resourceModelMock;
-+
-+    /**
-+     * @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $abstractDbMock;
-+
-+    /**
-+     * @var ObjectManager
-+     */
-+    protected $objectManager;
-+
-+    /**
-+     * @var ProblemModel
-+     */
-+    private $problemModel;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->contextMock = $this->getMockBuilder(Context::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->registryMock = $this->getMockBuilder(Registry::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->subscriberFactoryMock = $this->getMockBuilder(SubscriberFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->subscriberMock = $this->getMockBuilder(Subscriber::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->resourceModelMock = $this->getMockBuilder(ProblemResource::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->abstractDbMock = $this->getMockBuilder(AbstractDb::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->resourceModelMock->expects($this->any())
-+            ->method('getIdFieldName')
-+            ->willReturn('id');
-+
-+        $this->objectManager = new ObjectManager($this);
-+
-+        $this->problemModel = $this->objectManager->getObject(
-+            ProblemModel::class,
-+            [
-+                'context' => $this->contextMock,
-+                'registry' => $this->registryMock,
-+                'subscriberFactory' => $this->subscriberFactoryMock,
-+                'resource' => $this->resourceModelMock,
-+                'resourceCollection' => $this->abstractDbMock,
-+                'data' => [],
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testAddSubscriberData()
-+    {
-+        $subscriberId = 1;
-+        $this->subscriberMock->expects($this->once())
-+            ->method('getId')
-+            ->willReturn($subscriberId);
-+
-+        $result = $this->problemModel->addSubscriberData($this->subscriberMock);
-+
-+        self::assertEquals($result, $this->problemModel);
-+        self::assertEquals($subscriberId, $this->problemModel->getSubscriberId());
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testAddQueueData()
-+    {
-+        $queueId = 1;
-+        $queueMock =  $this->getMockBuilder(Queue::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $queueMock->expects($this->once())
-+            ->method('getId')
-+            ->willReturn($queueId);
-+
-+        $result = $this->problemModel->addQueueData($queueMock);
-+
-+        self::assertEquals($result, $this->problemModel);
-+        self::assertEquals($queueId, $this->problemModel->getQueueId());
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testAddErrorData()
-+    {
-+        $exceptionMessage = 'Some message';
-+        $exceptionCode = 111;
-+        $exception = new \Exception($exceptionMessage, $exceptionCode);
-+
-+        $result = $this->problemModel->addErrorData($exception);
-+
-+        self::assertEquals($result, $this->problemModel);
-+        self::assertEquals($exceptionMessage, $this->problemModel->getProblemErrorText());
-+        self::assertEquals($exceptionCode, $this->problemModel->getProblemErrorCode());
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testGetSubscriberWithNoSubscriberId()
-+    {
-+        self::assertNull($this->problemModel->getSubscriber());
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testGetSubscriber()
-+    {
-+        $this->setSubscriber();
-+        self::assertEquals($this->subscriberMock, $this->problemModel->getSubscriber());
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testUnsubscribeWithNoSubscriber()
-+    {
-+        $this->subscriberMock->expects($this->never())
-+            ->method('__call')
-+            ->with($this->equalTo('setSubscriberStatus'));
-+
-+        $result = $this->problemModel->unsubscribe();
-+
-+        self::assertEquals($this->problemModel, $result);
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testUnsubscribe()
-+    {
-+        $this->setSubscriber();
-+        $this->subscriberMock->expects($this->at(1))
-+            ->method('__call')
-+            ->with($this->equalTo('setSubscriberStatus'), $this->equalTo([Subscriber::STATUS_UNSUBSCRIBED]))
-+            ->willReturnSelf();
-+        $this->subscriberMock->expects($this->at(2))
-+            ->method('__call')
-+            ->with($this->equalTo('setIsStatusChanged'))
-+            ->willReturnSelf();
-+        $this->subscriberMock->expects($this->once())
-+            ->method('save');
-+
-+        $result = $this->problemModel->unsubscribe();
-+
-+        self::assertEquals($this->problemModel, $result);
-+    }
-+
-+    /**
-+     * Sets subscriber to the Problem model
-+     */
-+    private function setSubscriber()
-+    {
-+        $subscriberId = 1;
-+        $this->problemModel->setSubscriberId($subscriberId);
-+        $this->subscriberFactoryMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($this->subscriberMock);
-+        $this->subscriberMock->expects($this->once())
-+            ->method('load')
-+            ->with($subscriberId)
-+            ->willReturnSelf();
-+    }
-+}
-diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/Queue/TransportBuilderTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/Queue/TransportBuilderTest.php
-index 86d40187de8..e8b141a24c9 100644
---- a/app/code/Magento/Newsletter/Test/Unit/Model/Queue/TransportBuilderTest.php
-+++ b/app/code/Magento/Newsletter/Test/Unit/Model/Queue/TransportBuilderTest.php
-@@ -45,6 +45,11 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $mailTransportFactoryMock;
- 
-+    /**
-+     * @var \Magento\Framework\Mail\MessageInterfaceFactory | \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $messageFactoryMock;
-+
-     /**
-      * @return void
-      */
-@@ -52,7 +57,10 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
-     {
-         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->templateFactoryMock = $this->createMock(\Magento\Framework\Mail\Template\FactoryInterface::class);
--        $this->messageMock = $this->createMock(\Magento\Framework\Mail\Message::class);
-+        $this->messageMock = $this->getMockBuilder(\Magento\Framework\Mail\MessageInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setBodyHtml', 'setSubject'])
-+            ->getMockForAbstractClass();
-         $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-         $this->senderResolverMock = $this->createMock(\Magento\Framework\Mail\Template\SenderResolverInterface::class);
-         $this->mailTransportFactoryMock = $this->getMockBuilder(
-@@ -60,6 +68,11 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
-         )->disableOriginalConstructor()
-             ->setMethods(['create'])
-             ->getMock();
-+        $this->messageFactoryMock = $this->getMockBuilder(\Magento\Framework\Mail\MessageInterfaceFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMockForAbstractClass();
-+        $this->messageFactoryMock->expects($this->atLeastOnce())->method('create')->willReturn($this->messageMock);
-         $this->builder = $objectManagerHelper->getObject(
-             $this->builderClassName,
-             [
-@@ -67,7 +80,8 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
-                 'message' => $this->messageMock,
-                 'objectManager' => $this->objectManagerMock,
-                 'senderResolver' => $this->senderResolverMock,
--                'mailTransportFactory' => $this->mailTransportFactoryMock
-+                'mailTransportFactory' => $this->mailTransportFactoryMock,
-+                'messageFactory' => $this->messageFactoryMock
-             ]
-         );
-     }
-@@ -108,7 +122,7 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
-         $template->expects($this->once())
-             ->method('getProcessedTemplate')
-             ->with($vars)
--            ->will($this->returnValue($bodyText));
-+            ->willReturn($bodyText);
-         $template->expects($this->once())
-             ->method('setTemplateFilter')
-             ->with($filter);
-@@ -123,46 +137,8 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
-             $this->returnValue($template)
-         );
- 
--        $this->messageMock->expects(
--            $this->once()
--        )->method(
--            'setSubject'
--        )->with(
--            $this->equalTo('Email Subject')
--        )->will(
--            $this->returnSelf()
--        );
--        $this->messageMock->expects(
--            $this->once()
--        )->method(
--            'setBodyHtml'
--        )->with(
--            $this->equalTo($bodyText)
--        )->will(
--            $this->returnSelf()
--        );
--
--        $transport = $this->createMock(\Magento\Framework\Mail\TransportInterface::class);
--
--        $this->mailTransportFactoryMock->expects(
--            $this->at(0)
--        )->method(
--            'create'
--        )->with(
--            $this->equalTo(['message' => $this->messageMock])
--        )->will(
--            $this->returnValue($transport)
--        );
--
--        $this->objectManagerMock->expects(
--            $this->at(0)
--        )->method(
--            'create'
--        )->with(
--            $this->equalTo(\Magento\Framework\Mail\Message::class)
--        )->will(
--            $this->returnValue($transport)
--        );
-+        $this->messageMock->expects($this->once())->method('setBodyHtml')->willReturnSelf();
-+        $this->messageMock->expects($this->once())->method('setSubject')->willReturnSelf();
- 
-         $this->builder->setTemplateIdentifier(
-             'identifier'
-@@ -174,8 +150,6 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
-             $data
-         );
- 
--        $result = $this->builder->getTransport();
--
--        $this->assertInstanceOf(\Magento\Framework\Mail\TransportInterface::class, $result);
-+        $this->builder->getTransport();
-     }
- }
-diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
-index 1318cb1f98f..6ccbba9f882 100644
---- a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
-+++ b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
-@@ -62,6 +62,16 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $objectManager;
- 
-+    /**
-+     * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $dataObjectHelper;
-+
-+    /**
-+     * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $customerFactory;
-+
-     /**
-      * @var \Magento\Newsletter\Model\Subscriber
-      */
-@@ -97,6 +107,14 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
-             ]);
-         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- 
-+        $this->customerFactory = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterfaceFactory::class)
-+            ->setMethods(['create'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->dataObjectHelper = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-         $this->subscriber = $this->objectManager->getObject(
-             \Magento\Newsletter\Model\Subscriber::class,
-             [
-@@ -108,7 +126,9 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
-                 'customerRepository' => $this->customerRepository,
-                 'customerAccountManagement' => $this->customerAccountManagement,
-                 'inlineTranslation' => $this->inlineTranslation,
--                'resource' => $this->resource
-+                'resource' => $this->resource,
-+                'customerFactory' => $this->customerFactory,
-+                'dataObjectHelper' => $this->dataObjectHelper
-             ]
-         );
-     }
-@@ -116,7 +136,21 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
-     public function testSubscribe()
-     {
-         $email = 'subscriber_email@magento.com';
--        $this->resource->expects($this->any())->method('loadByEmail')->willReturn(
-+        $storeId = 1;
-+        $customerData = ['store_id' => $storeId, 'email' => $email];
-+        $storeModel = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($storeModel);
-+        $storeModel->expects($this->any())->method('getId')->willReturn($storeId);
-+        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-+        $this->customerFactory->expects($this->once())->method('create')->willReturn($customer);
-+        $this->dataObjectHelper->expects($this->once())->method('populateWithArray')->with(
-+            $customer,
-+            $customerData,
-+            \Magento\Customer\Api\Data\CustomerInterface::class
-+        );
-+        $this->resource->expects($this->any())->method('loadByCustomerData')->with($customer)->willReturn(
-             [
-                 'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
-                 'subscriber_email' => $email,
-@@ -130,7 +164,7 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
-         $this->customerSession->expects($this->any())->method('getCustomerId')->willReturn(1);
-         $customerDataModel->expects($this->any())->method('getEmail')->willReturn($email);
-         $this->customerRepository->expects($this->any())->method('getById')->willReturn($customerDataModel);
--        $customerDataModel->expects($this->any())->method('getStoreId')->willReturn(1);
-+        $customerDataModel->expects($this->any())->method('getStoreId')->willReturn($storeId);
-         $customerDataModel->expects($this->any())->method('getId')->willReturn(1);
-         $this->sendEmailCheck();
-         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
-@@ -141,7 +175,21 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
-     public function testSubscribeNotLoggedIn()
-     {
-         $email = 'subscriber_email@magento.com';
--        $this->resource->expects($this->any())->method('loadByEmail')->willReturn(
-+        $storeId = 1;
-+        $customerData = ['store_id' => $storeId, 'email' => $email];
-+        $storeModel = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($storeModel);
-+        $storeModel->expects($this->any())->method('getId')->willReturn($storeId);
-+        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-+        $this->customerFactory->expects($this->once())->method('create')->willReturn($customer);
-+        $this->dataObjectHelper->expects($this->once())->method('populateWithArray')->with(
-+            $customer,
-+            $customerData,
-+            \Magento\Customer\Api\Data\CustomerInterface::class
-+        );
-+        $this->resource->expects($this->any())->method('loadByCustomerData')->with($customer)->willReturn(
-             [
-                 'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
-                 'subscriber_email' => $email,
-@@ -155,7 +203,7 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
-         $this->customerSession->expects($this->any())->method('getCustomerId')->willReturn(1);
-         $customerDataModel->expects($this->any())->method('getEmail')->willReturn($email);
-         $this->customerRepository->expects($this->any())->method('getById')->willReturn($customerDataModel);
--        $customerDataModel->expects($this->any())->method('getStoreId')->willReturn(1);
-+        $customerDataModel->expects($this->any())->method('getStoreId')->willReturn($storeId);
-         $customerDataModel->expects($this->any())->method('getId')->willReturn(1);
-         $this->sendEmailCheck();
-         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
-@@ -165,6 +213,7 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
- 
-     public function testUpdateSubscription()
-     {
-+        $storeId = 2;
-         $customerId = 1;
-         $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-             ->getMock();
-@@ -186,7 +235,7 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
-             ->method('getConfirmationStatus')
-             ->with($customerId)
-             ->willReturn('account_confirmation_required');
--        $customerDataMock->expects($this->once())->method('getStoreId')->willReturn('store_id');
-+        $customerDataMock->expects($this->exactly(2))->method('getStoreId')->willReturn($storeId);
-         $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
- 
-         $storeModel = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-@@ -200,6 +249,7 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
- 
-     public function testUnsubscribeCustomerById()
-     {
-+        $storeId = 2;
-         $customerId = 1;
-         $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-             ->getMock();
-@@ -217,7 +267,7 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
-             );
-         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
-         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
--        $customerDataMock->expects($this->once())->method('getStoreId')->willReturn('store_id');
-+        $customerDataMock->expects($this->exactly(2))->method('getStoreId')->willReturn($storeId);
-         $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
-         $this->sendEmailCheck();
- 
-@@ -226,6 +276,7 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
- 
-     public function testSubscribeCustomerById()
-     {
-+        $storeId = 2;
-         $customerId = 1;
-         $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-             ->getMock();
-@@ -243,7 +294,7 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
-             );
-         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
-         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
--        $customerDataMock->expects($this->once())->method('getStoreId')->willReturn('store_id');
-+        $customerDataMock->expects($this->exactly(2))->method('getStoreId')->willReturn($storeId);
-         $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
-         $this->sendEmailCheck();
- 
-@@ -252,6 +303,7 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
- 
-     public function testSubscribeCustomerById1()
-     {
-+        $storeId = 2;
-         $customerId = 1;
-         $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-             ->getMock();
-@@ -269,7 +321,7 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
-             );
-         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
-         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
--        $customerDataMock->expects($this->once())->method('getStoreId')->willReturn('store_id');
-+        $customerDataMock->expects($this->exactly(2))->method('getStoreId')->willReturn($storeId);
-         $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
-         $this->sendEmailCheck();
-         $this->customerAccountManagement->expects($this->once())
-@@ -283,6 +335,7 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
- 
-     public function testSubscribeCustomerByIdAfterConfirmation()
-     {
-+        $storeId = 2;
-         $customerId = 1;
-         $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-             ->getMock();
-@@ -300,7 +353,7 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
-             );
-         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
-         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
--        $customerDataMock->expects($this->once())->method('getStoreId')->willReturn('store_id');
-+        $customerDataMock->expects($this->exactly(2))->method('getStoreId')->willReturn($storeId);
-         $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
-         $this->sendEmailCheck();
-         $this->customerAccountManagement->expects($this->never())->method('getConfirmationStatus');
-diff --git a/app/code/Magento/Newsletter/Test/Unit/Observer/PredispatchNewsletterObserverTest.php b/app/code/Magento/Newsletter/Test/Unit/Observer/PredispatchNewsletterObserverTest.php
-new file mode 100644
-index 00000000000..38d69e5128a
---- /dev/null
-+++ b/app/code/Magento/Newsletter/Test/Unit/Observer/PredispatchNewsletterObserverTest.php
-@@ -0,0 +1,147 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types = 1);
-+
-+namespace Magento\Newsletter\Test\Unit\Observer;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\Response\RedirectInterface;
-+use Magento\Framework\App\ResponseInterface;
-+use Magento\Framework\Event\Observer;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Framework\UrlInterface;
-+use Magento\Newsletter\Observer\PredispatchNewsletterObserver;
-+use Magento\Store\Model\ScopeInterface;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Test class for \Magento\Newsletter\Observer\PredispatchNewsletterObserver
-+ */
-+class PredispatchNewsletterObserverTest extends TestCase
-+{
-+    /**
-+     * @var Observer|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $mockObject;
-+
-+    /**
-+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $configMock;
-+
-+    /**
-+     * @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $urlMock;
-+
-+    /**
-+     * @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $redirectMock;
-+
-+    /**
-+     * @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $responseMock;
-+
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp() : void
-+    {
-+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->urlMock = $this->getMockBuilder(UrlInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->responseMock = $this->getMockBuilder(ResponseInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setRedirect'])
-+            ->getMockForAbstractClass();
-+        $this->redirectMock = $this->getMockBuilder(RedirectInterface::class)
-+            ->getMock();
-+        $this->objectManager = new ObjectManager($this);
-+        $this->mockObject = $this->objectManager->getObject(
-+            PredispatchNewsletterObserver::class,
-+            [
-+                'scopeConfig' => $this->configMock,
-+                'url' => $this->urlMock
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test with enabled newsletter active config.
-+     */
-+    public function testNewsletterEnabled() : void
-+    {
-+        $observerMock = $this->getMockBuilder(Observer::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getResponse', 'getData', 'setRedirect'])
-+            ->getMockForAbstractClass();
-+
-+        $this->configMock->method('getValue')
-+            ->with(PredispatchNewsletterObserver::XML_PATH_NEWSLETTER_ACTIVE, ScopeInterface::SCOPE_STORE)
-+            ->willReturn(true);
-+        $observerMock->expects($this->never())
-+            ->method('getData')
-+            ->with('controller_action')
-+            ->willReturnSelf();
-+
-+        $observerMock->expects($this->never())
-+            ->method('getResponse')
-+            ->willReturnSelf();
-+
-+        $this->assertNull($this->mockObject->execute($observerMock));
-+    }
-+
-+    /**
-+     * Test with disabled newsletter active config.
-+     */
-+    public function testNewsletterDisabled() : void
-+    {
-+        $observerMock = $this->getMockBuilder(Observer::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getControllerAction', 'getResponse'])
-+            ->getMockForAbstractClass();
-+
-+        $this->configMock->expects($this->at(0))
-+            ->method('getValue')
-+            ->with(PredispatchNewsletterObserver::XML_PATH_NEWSLETTER_ACTIVE, ScopeInterface::SCOPE_STORE)
-+            ->willReturn(false);
-+
-+        $expectedRedirectUrl = 'https://test.com/index';
-+
-+        $this->configMock->expects($this->at(1))
-+            ->method('getValue')
-+            ->with('web/default/no_route', ScopeInterface::SCOPE_STORE)
-+            ->willReturn($expectedRedirectUrl);
-+
-+        $this->urlMock->expects($this->once())
-+            ->method('getUrl')
-+            ->willReturn($expectedRedirectUrl);
-+
-+        $observerMock->expects($this->once())
-+            ->method('getControllerAction')
-+            ->willReturnSelf();
-+
-+        $observerMock->expects($this->once())
-+            ->method('getResponse')
-+            ->willReturn($this->responseMock);
-+
-+        $this->responseMock->expects($this->once())
-+            ->method('setRedirect')
-+            ->with($expectedRedirectUrl);
-+
-+        $this->assertNull($this->mockObject->execute($observerMock));
-+    }
-+}
-diff --git a/app/code/Magento/Newsletter/etc/adminhtml/system.xml b/app/code/Magento/Newsletter/etc/adminhtml/system.xml
-index 1173f643103..16af7b2158d 100644
---- a/app/code/Magento/Newsletter/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Newsletter/etc/adminhtml/system.xml
-@@ -11,39 +11,46 @@
-             <label>Newsletter</label>
-             <tab>customer</tab>
-             <resource>Magento_Newsletter::newsletter</resource>
--            <group id="subscription" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
-+            <group id="general" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <label>General Options</label>
-+                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                    <label>Enabled</label>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                </field>
-+            </group>
-+            <group id="subscription" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Subscription Options</label>
--                <field id="allow_guest_subscribe" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="allow_guest_subscribe" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Allow Guest Subscription</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
--                <field id="confirm" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="confirm" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Need to Confirm</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
--                <field id="confirm_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="confirm_email_identity" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Confirmation Email Sender</label>
-                     <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
-                 </field>
--                <field id="confirm_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="confirm_email_template" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Confirmation Email Template</label>
-                     <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
-                     <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
-                 </field>
--                <field id="success_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="success_email_identity" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Success Email Sender</label>
-                     <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
-                 </field>
--                <field id="success_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="success_email_template" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Success Email Template</label>
-                     <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
-                     <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
-                 </field>
--                <field id="un_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="un_email_identity" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Unsubscription Email Sender</label>
-                     <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
-                 </field>
--                <field id="un_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                <field id="un_email_template" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                     <label>Unsubscription Email Template</label>
-                     <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
-                     <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
-diff --git a/app/code/Magento/Newsletter/etc/config.xml b/app/code/Magento/Newsletter/etc/config.xml
-index f976ece8d71..4c5e385105c 100644
---- a/app/code/Magento/Newsletter/etc/config.xml
-+++ b/app/code/Magento/Newsletter/etc/config.xml
-@@ -8,6 +8,9 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
-     <default>
-         <newsletter>
-+            <general>
-+                <active>1</active>
-+            </general>
-             <subscription>
-                 <allow_guest_subscribe>1</allow_guest_subscribe>
-                 <confirm>0</confirm>
-diff --git a/app/code/Magento/Newsletter/etc/db_schema.xml b/app/code/Magento/Newsletter/etc/db_schema.xml
-index 5084b8b6d01..5cb572f41b6 100644
---- a/app/code/Magento/Newsletter/etc/db_schema.xml
-+++ b/app/code/Magento/Newsletter/etc/db_schema.xml
-@@ -21,19 +21,19 @@
-                 default="0" comment="Subscriber Status"/>
-         <column xsi:type="varchar" name="subscriber_confirm_code" nullable="true" length="32" default="NULL"
-                 comment="Subscriber Confirm Code"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="subscriber_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="NEWSLETTER_SUBSCRIBER_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="NEWSLETTER_SUBSCRIBER_STORE_ID_STORE_STORE_ID"
-                     table="newsletter_subscriber" column="store_id" referenceTable="store" referenceColumn="store_id"
-                     onDelete="SET NULL"/>
--        <index name="NEWSLETTER_SUBSCRIBER_CUSTOMER_ID" indexType="btree">
-+        <index referenceId="NEWSLETTER_SUBSCRIBER_CUSTOMER_ID" indexType="btree">
-             <column name="customer_id"/>
-         </index>
--        <index name="NEWSLETTER_SUBSCRIBER_STORE_ID" indexType="btree">
-+        <index referenceId="NEWSLETTER_SUBSCRIBER_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="NEWSLETTER_SUBSCRIBER_SUBSCRIBER_EMAIL" indexType="btree">
-+        <index referenceId="NEWSLETTER_SUBSCRIBER_SUBSCRIBER_EMAIL" indexType="btree">
-             <column name="subscriber_email"/>
-         </index>
-     </table>
-@@ -54,16 +54,16 @@
-                 default="1" comment="Template Actual"/>
-         <column xsi:type="timestamp" name="added_at" on_update="false" nullable="true" comment="Added At"/>
-         <column xsi:type="timestamp" name="modified_at" on_update="false" nullable="true" comment="Modified At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="template_id"/>
-         </constraint>
--        <index name="NEWSLETTER_TEMPLATE_TEMPLATE_ACTUAL" indexType="btree">
-+        <index referenceId="NEWSLETTER_TEMPLATE_TEMPLATE_ACTUAL" indexType="btree">
-             <column name="template_actual"/>
-         </index>
--        <index name="NEWSLETTER_TEMPLATE_ADDED_AT" indexType="btree">
-+        <index referenceId="NEWSLETTER_TEMPLATE_ADDED_AT" indexType="btree">
-             <column name="added_at"/>
-         </index>
--        <index name="NEWSLETTER_TEMPLATE_MODIFIED_AT" indexType="btree">
-+        <index referenceId="NEWSLETTER_TEMPLATE_MODIFIED_AT" indexType="btree">
-             <column name="modified_at"/>
-         </index>
-     </table>
-@@ -86,13 +86,13 @@
-         <column xsi:type="timestamp" name="queue_start_at" on_update="false" nullable="true" comment="Queue Start At"/>
-         <column xsi:type="timestamp" name="queue_finish_at" on_update="false" nullable="true"
-                 comment="Queue Finish At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="queue_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="NEWSLETTER_QUEUE_TEMPLATE_ID_NEWSLETTER_TEMPLATE_TEMPLATE_ID"
-+        <constraint xsi:type="foreign" referenceId="NEWSLETTER_QUEUE_TEMPLATE_ID_NEWSLETTER_TEMPLATE_TEMPLATE_ID"
-                     table="newsletter_queue" column="template_id" referenceTable="newsletter_template"
-                     referenceColumn="template_id" onDelete="CASCADE"/>
--        <index name="NEWSLETTER_QUEUE_TEMPLATE_ID" indexType="btree">
-+        <index referenceId="NEWSLETTER_QUEUE_TEMPLATE_ID" indexType="btree">
-             <column name="template_id"/>
-         </index>
-     </table>
-@@ -104,19 +104,19 @@
-         <column xsi:type="int" name="subscriber_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Subscriber Id"/>
-         <column xsi:type="timestamp" name="letter_sent_at" on_update="false" nullable="true" comment="Letter Sent At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="queue_link_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="NEWSLETTER_QUEUE_LINK_QUEUE_ID_NEWSLETTER_QUEUE_QUEUE_ID"
-+        <constraint xsi:type="foreign" referenceId="NEWSLETTER_QUEUE_LINK_QUEUE_ID_NEWSLETTER_QUEUE_QUEUE_ID"
-                     table="newsletter_queue_link" column="queue_id" referenceTable="newsletter_queue"
-                     referenceColumn="queue_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="NLTTR_QUEUE_LNK_SUBSCRIBER_ID_NLTTR_SUBSCRIBER_SUBSCRIBER_ID"
-+        <constraint xsi:type="foreign" referenceId="NLTTR_QUEUE_LNK_SUBSCRIBER_ID_NLTTR_SUBSCRIBER_SUBSCRIBER_ID"
-                     table="newsletter_queue_link" column="subscriber_id" referenceTable="newsletter_subscriber"
-                     referenceColumn="subscriber_id" onDelete="CASCADE"/>
--        <index name="NEWSLETTER_QUEUE_LINK_SUBSCRIBER_ID" indexType="btree">
-+        <index referenceId="NEWSLETTER_QUEUE_LINK_SUBSCRIBER_ID" indexType="btree">
-             <column name="subscriber_id"/>
-         </index>
--        <index name="NEWSLETTER_QUEUE_LINK_QUEUE_ID_LETTER_SENT_AT" indexType="btree">
-+        <index referenceId="NEWSLETTER_QUEUE_LINK_QUEUE_ID_LETTER_SENT_AT" indexType="btree">
-             <column name="queue_id"/>
-             <column name="letter_sent_at"/>
-         </index>
-@@ -126,17 +126,17 @@
-                 default="0" comment="Queue Id"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="queue_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="NEWSLETTER_QUEUE_STORE_LINK_QUEUE_ID_NEWSLETTER_QUEUE_QUEUE_ID"
-+        <constraint xsi:type="foreign" referenceId="NEWSLETTER_QUEUE_STORE_LINK_QUEUE_ID_NEWSLETTER_QUEUE_QUEUE_ID"
-                     table="newsletter_queue_store_link" column="queue_id" referenceTable="newsletter_queue"
-                     referenceColumn="queue_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="NEWSLETTER_QUEUE_STORE_LINK_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="NEWSLETTER_QUEUE_STORE_LINK_STORE_ID_STORE_STORE_ID"
-                     table="newsletter_queue_store_link" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <index name="NEWSLETTER_QUEUE_STORE_LINK_STORE_ID" indexType="btree">
-+        <index referenceId="NEWSLETTER_QUEUE_STORE_LINK_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -150,19 +150,19 @@
-         <column xsi:type="int" name="problem_error_code" padding="10" unsigned="true" nullable="true" identity="false"
-                 default="0" comment="Problem Error Code"/>
-         <column xsi:type="varchar" name="problem_error_text" nullable="true" length="200" comment="Problem Error Text"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="problem_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="NEWSLETTER_PROBLEM_QUEUE_ID_NEWSLETTER_QUEUE_QUEUE_ID"
-+        <constraint xsi:type="foreign" referenceId="NEWSLETTER_PROBLEM_QUEUE_ID_NEWSLETTER_QUEUE_QUEUE_ID"
-                     table="newsletter_problem" column="queue_id" referenceTable="newsletter_queue"
-                     referenceColumn="queue_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="NLTTR_PROBLEM_SUBSCRIBER_ID_NLTTR_SUBSCRIBER_SUBSCRIBER_ID"
-+        <constraint xsi:type="foreign" referenceId="NLTTR_PROBLEM_SUBSCRIBER_ID_NLTTR_SUBSCRIBER_SUBSCRIBER_ID"
-                     table="newsletter_problem" column="subscriber_id" referenceTable="newsletter_subscriber"
-                     referenceColumn="subscriber_id" onDelete="CASCADE"/>
--        <index name="NEWSLETTER_PROBLEM_SUBSCRIBER_ID" indexType="btree">
-+        <index referenceId="NEWSLETTER_PROBLEM_SUBSCRIBER_ID" indexType="btree">
-             <column name="subscriber_id"/>
-         </index>
--        <index name="NEWSLETTER_PROBLEM_QUEUE_ID" indexType="btree">
-+        <index referenceId="NEWSLETTER_PROBLEM_QUEUE_ID" indexType="btree">
-             <column name="queue_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Newsletter/etc/frontend/events.xml b/app/code/Magento/Newsletter/etc/frontend/events.xml
-new file mode 100644
-index 00000000000..6c46d562f51
---- /dev/null
-+++ b/app/code/Magento/Newsletter/etc/frontend/events.xml
-@@ -0,0 +1,12 @@
-+<?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="controller_action_predispatch_newsletter">
-+        <observer name="newsletter_enabled" instance="Magento\Newsletter\Observer\PredispatchNewsletterObserver" />
-+    </event>
-+</config>
-diff --git a/app/code/Magento/Newsletter/i18n/en_US.csv b/app/code/Magento/Newsletter/i18n/en_US.csv
-index c49fdc80da8..388b583f990 100644
---- a/app/code/Magento/Newsletter/i18n/en_US.csv
-+++ b/app/code/Magento/Newsletter/i18n/en_US.csv
-@@ -67,8 +67,8 @@ Subscribers,Subscribers
- "Something went wrong while saving this template.","Something went wrong while saving this template."
- "Newsletter Subscription","Newsletter Subscription"
- "Something went wrong while saving your subscription.","Something went wrong while saving your subscription."
--"We saved the subscription.","We saved the subscription."
--"We removed the subscription.","We removed the subscription."
-+"We have saved your subscription.","We have saved your subscription."
-+"We have removed your newsletter subscription.","We have removed your newsletter subscription."
- "Your subscription has been confirmed.","Your subscription has been confirmed."
- "This is an invalid subscription confirmation code.","This is an invalid subscription confirmation code."
- "This is an invalid subscription ID.","This is an invalid subscription ID."
-@@ -76,7 +76,7 @@ Subscribers,Subscribers
- "Sorry, but the administrator denied subscription for guests. Please <a href=""%1"">register</a>.","Sorry, but the administrator denied subscription for guests. Please <a href=""%1"">register</a>."
- "Please enter a valid email address.","Please enter a valid email address."
- "This email address is already subscribed.","This email address is already subscribed."
--"The confirmation request has been sent.","The confirmation request has been sent."
-+"A confirmation request has been sent.","A confirmation request has been sent."
- "Thank you for your subscription.","Thank you for your subscription."
- "There was a problem with the subscription: %1","There was a problem with the subscription: %1"
- "Something went wrong with the subscription.","Something went wrong with the subscription."
-@@ -151,3 +151,4 @@ Unconfirmed,Unconfirmed
- Store,Store
- "Store View","Store View"
- "Newsletter Subscriptions","Newsletter Subscriptions"
-+"We have updated your subscription.","We have updated your subscription."
-diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml
-index 3eb7de194d2..838a9dbb41b 100644
---- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml
-+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml
-@@ -11,10 +11,11 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.newslettrer.problem.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">problemGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Newsletter\Model\ResourceModel\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Newsletter\Model\ResourceModel\Grid\Collection</argument>
-                     <argument name="message_block_visibility" xsi:type="string">true</argument>
-                     <argument name="use_ajax" xsi:type="string">true</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-+                    <argument name="grid_url" xsi:type="url" path="*/*/grid"/>
-                 </arguments>
-                 <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="adminhtml.newslettrer.problem.grid.columnSet" as="grid.columnSet">
-                     <arguments>
-diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml
-index 3bfb52157bb..8a2c891c68f 100644
---- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml
-+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.newsletter.queue.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">queueGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Newsletter\Model\ResourceModel\Queue\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Newsletter\Model\ResourceModel\Queue\Grid\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">start_at</argument>
-                     <argument name="default_dir" xsi:type="string">DESC</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
-index 9de1807af18..e8600c2d49d 100644
---- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
-+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Newsletter\Block\Adminhtml\Subscriber\Grid" name="adminhtml.newslettrer.subscriber.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">subscriberGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Newsletter\Model\ResourceModel\Subscriber\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Newsletter\Model\ResourceModel\Subscriber\Grid\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">subscriber_id</argument>
-                     <argument name="default_dir" xsi:type="string">desc</argument>
-                     <argument name="use_ajax" xsi:type="string">1</argument>
-diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
-index a64185ce679..00f430cd14b 100644
---- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
-+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Backend\Block\Page $block */
- ?>
- <div id="preview" class="cms-revision-preview">
-@@ -16,7 +14,16 @@
-         </div>
-         <?php endif;?>
-     </div>
--    <iframe name="preview_iframe" id="preview_iframe" frameborder="0" title="<?= $block->escapeHtmlAttr(__('Preview')) ?>" width="100%"></iframe>
-+    <iframe
-+            name="preview_iframe"
-+            id="preview_iframe"
-+            frameborder="0"
-+            title="<?= $block->escapeHtmlAttr(__('Preview')) ?>"
-+            width="100%"
-+            sandbox="allow-forms allow-pointer-lock allow-scripts"
-+    >
-+
-+    </iframe>
-     <?= $block->getChildHtml('preview_form') ?>
- </div>
- 
-diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml
-index 2583ccea6fc..d5a24fad2ac 100644
---- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml
-+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml
-@@ -3,12 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
--<?php if ($websites = $block->getWebsites()): ?>
-+<?php if ($websites = $block->getWebsites()) : ?>
- <div class="field field-store-switcher">
-     <label class="label" for="store_switcher"><?= $block->escapeHtml(__('Choose Store View:')) ?></label>
-     <div class="control">
-@@ -16,22 +13,22 @@
-             id="store_switcher"
-             class="admin__control-select"
-             name="store_switcher">
--            <?php foreach ($websites as $website): ?>
-+            <?php foreach ($websites as $website) : ?>
-                 <?php $showWebsite = false; ?>
--                <?php foreach ($website->getGroups() as $group): ?>
-+                <?php foreach ($website->getGroups() as $group) : ?>
-                     <?php $showGroup = false; ?>
--                    <?php foreach ($block->getStores($group) as $store): ?>
--                        <?php if ($showWebsite == false): ?>
-+                    <?php foreach ($block->getStores($group) as $store) : ?>
-+                        <?php if ($showWebsite == false) : ?>
-                             <?php $showWebsite = true; ?>
-                             <optgroup label="<?= $block->escapeHtmlAttr($website->getName()) ?>"></optgroup>
-                         <?php endif; ?>
--                        <?php if ($showGroup == false): ?>
-+                        <?php if ($showGroup == false) : ?>
-                             <?php $showGroup = true; ?>
-                             <optgroup label="&nbsp;&nbsp;&nbsp;<?= $block->escapeHtmlAttr($group->getName()) ?>">
-                         <?php endif; ?>
--                        <option value="<?= $block->escapeHtmlAttr($store->getId()) ?>"<?php if ($block->getStoreId() == $store->getId()): ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($store->getName()) ?></option>
-+                        <option value="<?= $block->escapeHtmlAttr($store->getId()) ?>"<?php if ($block->getStoreId() == $store->getId()) : ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($store->getName()) ?></option>
-                     <?php endforeach; ?>
--                    <?php if ($showGroup): ?>
-+                    <?php if ($showGroup) : ?>
-                         </optgroup>
-                     <?php endif; ?>
-                 <?php endforeach; ?>
-diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml
-index 51808cab7f7..a3d88de9d35 100644
---- a/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml
-+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml
-@@ -3,13 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml('grid') ?>
- 
--<?php if ($block->getShowButtons()): ?>
-+<?php if ($block->getShowButtons()) : ?>
- <div class="form-buttons">
-     <?= $block->getUnsubscribeButtonHtml() ?>
-     <?= $block->getDeleteButtonHtml() ?>
-@@ -18,7 +15,6 @@
- <script>
- require(["prototype", "mage/adminhtml/events"], function(){
- 
--    <!--
-     problemController = {
-         checkCheckboxes:function (controlCheckbox) {
-             var elements = $('problemGrid').getElementsByClassName('problemCheckbox');
-diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
-index 52c94d0c3f8..3d52cc0dee7 100644
---- a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
-+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
-@@ -4,19 +4,17 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var $block \Magento\Newsletter\Block\Adminhtml\Queue\Edit */
- 
- ?>
- <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-     <?= $block->getBackButtonHtml() ?>
-     <?= $block->getPreviewButtonHtml() ?>
--    <?php if (!$block->getIsPreview()): ?>
-+    <?php if (!$block->getIsPreview()) : ?>
-         <?= $block->getResetButtonHtml() ?>
-         <?= $block->getSaveButtonHtml() ?>
-     <?php endif ?>
--    <?php if ($block->getCanResume()): ?>
-+    <?php if ($block->getCanResume()) : ?>
-         <?= $block->getResumeButtonHtml() ?>
-     <?php endif ?>
- </div>
-diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml
-index 902c6932f0a..c0928f4723b 100644
---- a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml
-+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml('grid') ?>
-diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
-index a405a6895b1..13bd5d5118b 100644
---- a/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
-+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
-@@ -4,16 +4,14 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Newsletter\Block\Adminhtml\Subscriber $block */
- 
- ?>
- <?= $block->getChildHtml('grid') ?>
--<?php if (count($block->getQueueAsOptions())>0 && $block->getShowQueueAdd()): ?>
-+<?php if (count($block->getQueueAsOptions())>0 && $block->getShowQueueAdd()) : ?>
- <div class="form-buttons">
-     <select id="queueList" name="queue">
--    <?php foreach ($block->getQueueAsOptions() as $_queue): ?>
-+    <?php foreach ($block->getQueueAsOptions() as $_queue) : ?>
-         <option value="<?= $block->escapeHtmlAttr($_queue['value']) ?>"><?= $block->escapeHtml($_queue['label']) ?> #<?= $block->escapeHtml($_queue['value']) ?></option>
-     <?php endforeach; ?>
-     </select>
-diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
-index 7355c06bdd6..c49a5c61a71 100644
---- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
-+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
-@@ -6,8 +6,6 @@
- 
- use Magento\Framework\App\TemplateTypesInterface;
- 
--// @codingStandardsIgnoreFile
--
- /* @var $block \Magento\Newsletter\Block\Adminhtml\Template\Edit */
- 
- ?>
-@@ -19,8 +17,7 @@ use Magento\Framework\App\TemplateTypesInterface;
-     </div>
-     <?= /* @noEscape */ $block->getForm() ?>
- </form>
--<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="newsletter_template_preview_form" target="_blank">
--    <?= $block->getBlockHtml('formkey') ?>
-+<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="get" id="newsletter_template_preview_form" target="_blank">
-     <div class="no-display">
-         <input type="hidden" id="preview_type" name="type" value="<?= /* @noEscape */ $block->isTextType() ? 1 : 2 ?>" />
-         <input type="hidden" id="preview_text" name="text" value="" />
-diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml
-index 902c6932f0a..c0928f4723b 100644
---- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml
-+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml('grid') ?>
-diff --git a/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml b/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml
-index 99190bb35fc..fd55fce8ee0 100644
---- a/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml
-+++ b/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml
-@@ -8,7 +8,7 @@
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceBlock name="customer_account_navigation">
--            <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-newsletter-subscriptions-link">
-+            <block class="Magento\Customer\Block\Account\SortLinkInterface" ifconfig="newsletter/general/active" name="customer-account-navigation-newsletter-subscriptions-link">
-                 <arguments>
-                     <argument name="path" xsi:type="string">newsletter/manage</argument>
-                     <argument name="label" xsi:type="string" translate="true">Newsletter Subscriptions</argument>
-diff --git a/app/code/Magento/Newsletter/view/frontend/layout/default.xml b/app/code/Magento/Newsletter/view/frontend/layout/default.xml
-index d84f4894a9d..32a08359333 100644
---- a/app/code/Magento/Newsletter/view/frontend/layout/default.xml
-+++ b/app/code/Magento/Newsletter/view/frontend/layout/default.xml
-@@ -8,10 +8,10 @@
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceBlock name="head.components">
--            <block class="Magento\Framework\View\Element\Js\Components" name="newsletter_head_components" template="Magento_Newsletter::js/components.phtml"/>
-+            <block class="Magento\Framework\View\Element\Js\Components" name="newsletter_head_components" template="Magento_Newsletter::js/components.phtml" ifconfig="newsletter/general/active"/>
-         </referenceBlock>
-         <referenceContainer name="footer">
--            <block class="Magento\Newsletter\Block\Subscribe" name="form.subscribe" as="subscribe" before="-" template="Magento_Newsletter::subscribe.phtml"/>
-+            <block class="Magento\Newsletter\Block\Subscribe" name="form.subscribe" as="subscribe" before="-" template="Magento_Newsletter::subscribe.phtml" ifconfig="newsletter/general/active"/>
-         </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml b/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml
-index bad5acc209b..5902a9f25cc 100644
---- a/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
-index c1a526ee951..bd6f12e1811 100644
---- a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
-+++ b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
-@@ -4,10 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Newsletter\Block\Subscribe $block */
--
- ?>
- <div class="block newsletter">
-     <div class="title"><strong><?= $block->escapeHtml(__('Newsletter')) ?></strong></div>
-@@ -19,16 +16,24 @@
-             data-mage-init='{"validation": {"errorClass": "mage-error"}}'
-             id="newsletter-validate-detail">
-             <div class="field newsletter">
--                <label class="label" for="newsletter"><span><?= $block->escapeHtml(__('Sign Up for Our Newsletter:')) ?></span></label>
-                 <div class="control">
--                    <input name="email" type="email" id="newsletter"
--                           placeholder="<?= $block->escapeHtml(__('Enter your email address')) ?>"
--                           data-mage-init='{"mage/trim-input":{}}'
--                           data-validate="{required:true, 'validate-email':true}"/>
-+                    <label for="newsletter">
-+                        <span class="label">
-+                            <?= $block->escapeHtml(__('Sign Up for Our Newsletter:')) ?>
-+                        </span>
-+                        <input name="email" type="email" id="newsletter"
-+                               placeholder="<?= $block->escapeHtml(__('Enter your email address')) ?>"
-+                               data-mage-init='{"mage/trim-input":{}}'
-+                               data-validate="{required:true, 'validate-email':true}"
-+                        />
-+                    </label>
-                 </div>
-             </div>
-             <div class="actions">
--                <button class="action subscribe primary" title="<?= $block->escapeHtmlAttr(__('Subscribe')) ?>" type="submit">
-+                <button class="action subscribe primary sr-only"
-+                        title="<?= $block->escapeHtmlAttr(__('Subscribe')) ?>"
-+                        type="submit"
-+                        aria-label="Subscribe">
-                     <span><?= $block->escapeHtml(__('Subscribe')) ?></span>
-                 </button>
-             </div>
-diff --git a/app/code/Magento/OfflinePayments/Model/Purchaseorder.php b/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
-index 2e0e58060c7..464142df5b9 100644
---- a/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
-+++ b/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\OfflinePayments\Model;
- 
-+use Magento\Framework\Exception\LocalizedException;
-+
- /**
-  * Class Purchaseorder
-  *
-@@ -46,11 +48,29 @@ class Purchaseorder extends \Magento\Payment\Model\Method\AbstractMethod
-      *
-      * @param \Magento\Framework\DataObject|mixed $data
-      * @return $this
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws LocalizedException
-      */
-     public function assignData(\Magento\Framework\DataObject $data)
-     {
-         $this->getInfoInstance()->setPoNumber($data->getPoNumber());
-         return $this;
-     }
-+
-+    /**
-+     * Validate payment method information object
-+     *
-+     * @return $this
-+     * @throws LocalizedException
-+     * @api
-+     */
-+    public function validate()
-+    {
-+        parent::validate();
-+
-+        if (empty($this->getInfoInstance()->getPoNumber())) {
-+            throw new LocalizedException(__('Purchase order number is a required field.'));
-+        }
-+
-+        return $this;
-+    }
- }
-diff --git a/app/code/Magento/OfflinePayments/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/OfflinePayments/Test/Mftf/Data/ConfigData.xml
-new file mode 100644
-index 00000000000..ec8dd46a00d
---- /dev/null
-+++ b/app/code/Magento/OfflinePayments/Test/Mftf/Data/ConfigData.xml
-@@ -0,0 +1,33 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="DisableCheckMoneyOrderPaymentMethod">
-+        <data key="path">payment/checkmo/active</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="EnableCheckMoneyOrderPaymentMethod">
-+        <!-- Magento default value -->
-+        <data key="path">payment/checkmo/active</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="DisableCashOnDeliveryPaymentMethod">
-+        <!-- Magento default value -->
-+        <data key="path">payment/cashondelivery/active</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="EnableCashOnDeliveryPaymentMethod">
-+        <data key="path">payment/cashondelivery/active</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/OfflinePayments/Test/Unit/Model/PurchaseorderTest.php b/app/code/Magento/OfflinePayments/Test/Unit/Model/PurchaseorderTest.php
-index 548e1d5fb18..2eb204651fc 100644
---- a/app/code/Magento/OfflinePayments/Test/Unit/Model/PurchaseorderTest.php
-+++ b/app/code/Magento/OfflinePayments/Test/Unit/Model/PurchaseorderTest.php
-@@ -5,10 +5,21 @@
-  */
- namespace Magento\OfflinePayments\Test\Unit\Model;
- 
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\OfflinePayments\Model\Purchaseorder;
-+use Magento\Payment\Helper\Data as PaymentHelper;
-+use Magento\Payment\Model\Info as PaymentInfo;
-+use Magento\Sales\Api\Data\OrderAddressInterface;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
- class PurchaseorderTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\OfflinePayments\Model\Purchaseorder
-+     * @var Purchaseorder
-      */
-     protected $_object;
- 
-@@ -19,15 +30,15 @@ class PurchaseorderTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
--        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--        $eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
--        $paymentDataMock = $this->createMock(\Magento\Payment\Helper\Data::class);
-+        $objectManagerHelper = new ObjectManager($this);
-+        $eventManager = $this->createMock(EventManagerInterface::class);
-+        $paymentDataMock = $this->createMock(PaymentHelper::class);
-         $this->_scopeConfig = $this->createPartialMock(
--            \Magento\Framework\App\Config\ScopeConfigInterface::class,
-+            ScopeConfigInterface::class,
-             ['getValue', 'isSetFlag']
-         );
-         $this->_object = $objectManagerHelper->getObject(
--            \Magento\OfflinePayments\Model\Purchaseorder::class,
-+            Purchaseorder::class,
-             [
-                 'eventManager' => $eventManager,
-                 'paymentData' => $paymentDataMock,
-@@ -38,13 +49,37 @@ class PurchaseorderTest extends \PHPUnit\Framework\TestCase
- 
-     public function testAssignData()
-     {
--        $data = new \Magento\Framework\DataObject([
-+        $data = new DataObject([
-             'po_number' => '12345'
-         ]);
- 
--        $instance = $this->createMock(\Magento\Payment\Model\Info::class);
-+        $instance = $this->createMock(PaymentInfo::class);
-         $this->_object->setData('info_instance', $instance);
-         $result = $this->_object->assignData($data);
-         $this->assertEquals($result, $this->_object);
-     }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Purchase order number is a required field.
-+     */
-+    public function testValidate()
-+    {
-+        $data = new DataObject([]);
-+
-+        $addressMock = $this->createMock(OrderAddressInterface::class);
-+        $addressMock->expects($this->once())->method('getCountryId')->willReturn('UY');
-+
-+        $orderMock = $this->createMock(OrderInterface::class);
-+        $orderMock->expects($this->once())->method('getBillingAddress')->willReturn($addressMock);
-+
-+        $instance = $this->createMock(Payment::class);
-+
-+        $instance->expects($this->once())->method('getOrder')->willReturn($orderMock);
-+
-+        $this->_object->setData('info_instance', $instance);
-+        $this->_object->assignData($data);
-+
-+        $this->_object->validate();
-+    }
- }
-diff --git a/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml b/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml
-index b47bd8f7490..89cc4d0986a 100644
---- a/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml
-+++ b/app/code/Magento/OfflinePayments/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="payment" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1">
-+        <section id="payment" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1">
-             <group id="checkmo" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Check / Money Order</label>
-                 <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-diff --git a/app/code/Magento/OfflinePayments/i18n/en_US.csv b/app/code/Magento/OfflinePayments/i18n/en_US.csv
-index 43a743b29e3..5a180f7af49 100644
---- a/app/code/Magento/OfflinePayments/i18n/en_US.csv
-+++ b/app/code/Magento/OfflinePayments/i18n/en_US.csv
-@@ -11,6 +11,7 @@ Enabled,Enabled
- "New Order Status","New Order Status"
- "Sort Order","Sort Order"
- Title,Title
-+"Purchase order number is a required field.","Purchase order number is a required field."
- "Payment from Applicable Countries","Payment from Applicable Countries"
- "Payment from Specific Countries","Payment from Specific Countries"
- "Make Check Payable to","Make Check Payable to"
-diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
-index e1ffd7bdaf7..a251c609ea3 100644
---- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
-+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
-@@ -4,13 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var $block \Magento\OfflinePayments\Block\Form\Banktransfer
-  */
- $instructions = $block->getInstructions();
- ?>
--<?php if ($instructions): ?>
-+<?php if ($instructions) : ?>
-     <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
-     <ul class="form-list checkout-agreements" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display:none;">
-         <li>
-diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
-index ac72b5f5707..8e8730640a8 100644
---- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
-+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
-@@ -4,14 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\OfflinePayments\Block\Form\Cashondelivery
-  */
- $instructions = $block->getInstructions();
- ?>
--<?php if ($instructions): ?>
-+<?php if ($instructions) : ?>
-     <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
-     <ul class="form-list checkout-agreements" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display:none;">
-         <li>
-diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
-index 2a1de9df69e..db1d7c87ada 100644
---- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
-+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
-@@ -4,16 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var $block \Magento\OfflinePayments\Block\Form\Checkmo
-  */
- ?>
- <fieldset class="admin__fieldset payment-method" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display:none">
--    <?php if ($block->getMethod()->getPayableTo()): ?>
-+    <?php if ($block->getMethod()->getPayableTo()) : ?>
-         <label class="label"><span><?= $block->escapeHtml(__('Make Check payable to:')) ?></span></label> <?= $block->escapeHtml($block->getMethod()->getPayableTo()) ?>
-     <?php endif; ?>
--    <?php if ($block->getMethod()->getMailingAddress()): ?>
-+    <?php if ($block->getMethod()->getMailingAddress()) : ?>
-         <div class="admin__field">
-             <label class="admin__field-label"><span><?= $block->escapeHtml(__('Send Check to:')) ?></span></label>
-             <div class="admin__field-control checkmo-mailing-address">
-diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
-index d6ee0d53eaa..c115765697f 100644
---- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
-+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var $block \Magento\OfflinePayments\Block\Form\Purchaseorder
-  */
-diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
-index 0882619db8f..36f9d35327f 100644
---- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
-+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
-@@ -4,17 +4,16 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
-  */
- ?>
- <?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
--<?php if ($block->getInfo()->getAdditionalInformation()): ?>
--    <?php if ($block->getPayableTo()): ?>
-+<?php if ($block->getInfo()->getAdditionalInformation()) : ?>
-+    <?php if ($block->getPayableTo()) : ?>
-         <br /><?= $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
-     <?php endif; ?>
--    <?php if ($block->getMailingAddress()): ?>
-+    <?php if ($block->getMailingAddress()) : ?>
-         <label><?= $block->escapeHtml(__('Send Check to:')) ?></label>
-         <div class="checkmo-mailing-address">
-             <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMailingAddress())) ?>
-diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
-index 4d63577319d..d8d952526e6 100644
---- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
-+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
-@@ -4,20 +4,19 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
-  */
- ?>
- <?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
-     {{pdf_row_separator}}
--<?php if ($block->getInfo()->getAdditionalInformation()): ?>
-+<?php if ($block->getInfo()->getAdditionalInformation()) : ?>
-     {{pdf_row_separator}}
--    <?php if ($block->getPayableTo()): ?>
-+    <?php if ($block->getPayableTo()) : ?>
-         <?= $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
-         {{pdf_row_separator}}
-     <?php endif; ?>
--    <?php if ($block->getMailingAddress()): ?>
-+    <?php if ($block->getMailingAddress()) : ?>
-         <?= $block->escapeHtml(__('Send Check to:')) ?>
-         {{pdf_row_separator}}
-         <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMailingAddress())) ?>
-diff --git a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml
-new file mode 100644
-index 00000000000..d8d952526e6
---- /dev/null
-+++ b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/**
-+ * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
-+ */
-+?>
-+<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
-+    {{pdf_row_separator}}
-+<?php if ($block->getInfo()->getAdditionalInformation()) : ?>
-+    {{pdf_row_separator}}
-+    <?php if ($block->getPayableTo()) : ?>
-+        <?= $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
-+        {{pdf_row_separator}}
-+    <?php endif; ?>
-+    <?php if ($block->getMailingAddress()) : ?>
-+        <?= $block->escapeHtml(__('Send Check to:')) ?>
-+        {{pdf_row_separator}}
-+        <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMailingAddress())) ?>
-+        {{pdf_row_separator}}
-+    <?php endif; ?>
-+<?php endif; ?>
-diff --git a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml
-new file mode 100644
-index 00000000000..4a6ea1c00b2
---- /dev/null
-+++ b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml
-@@ -0,0 +1,11 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+/**
-+ * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder
-+ */
-+?>
-+<?= $block->escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?>
-+    {{pdf_row_separator}}
-diff --git a/app/code/Magento/OfflinePayments/view/frontend/layout/multishipping_checkout_billing.xml b/app/code/Magento/OfflinePayments/view/frontend/layout/multishipping_checkout_billing.xml
-new file mode 100644
-index 00000000000..32810ecef20
---- /dev/null
-+++ b/app/code/Magento/OfflinePayments/view/frontend/layout/multishipping_checkout_billing.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <body>
-+        <referenceBlock name="checkout_billing">
-+            <arguments>
-+                <argument name="form_templates" xsi:type="array">
-+                    <item name="checkmo" xsi:type="string">Magento_OfflinePayments::multishipping/checkmo_form.phtml</item>
-+                </argument>
-+            </arguments>
-+        </referenceBlock>
-+    </body>
-+</page>
-diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
-index 7c21047fbb9..568ef7c3f69 100644
---- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
-+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
-@@ -4,13 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var $block \Magento\OfflinePayments\Block\Form\Banktransfer
-  */
- $instructions = $block->getInstructions();
- ?>
--<?php if ($instructions): ?>
-+<?php if ($instructions) : ?>
-     <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
-     <div class="items <?= /* @noEscape */ $methodCode ?> instructions agreement checkout-agreement-item-content" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display: none;">
-         <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
-diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
-index f6f019bc84c..2943f59be4a 100644
---- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
-+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
-@@ -4,14 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\OfflinePayments\Block\Form\Cashondelivery
-  */
- $instructions = $block->getInstructions();
- ?>
--<?php if ($instructions): ?>
-+<?php if ($instructions) : ?>
-     <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
-     <div class="items <?= /* @noEscape */ $methodCode ?> instructions agreement" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display: none;">
-         <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
-diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
-index de4b6ac66cf..36f58fc155a 100644
---- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
-+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
-@@ -4,18 +4,17 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var $block \Magento\OfflinePayments\Block\Form\Checkmo
-  */
- ?>
--<?php if ($block->getMethod()->getMailingAddress() || $block->getMethod()->getPayableTo()): ?>
-+<?php if ($block->getMethod()->getMailingAddress() || $block->getMethod()->getPayableTo()) : ?>
-     <dl class="items check payable" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display:none;">
--        <?php if ($block->getMethod()->getPayableTo()): ?>
-+        <?php if ($block->getMethod()->getPayableTo()) : ?>
-             <dt class="title"><?= $block->escapeHtml(__('Make Check payable to:')) ?></dt>
-             <dd class="content"><?= $block->escapeHtml($block->getMethod()->getPayableTo()) ?></dd>
-         <?php endif; ?>
--        <?php if ($block->getMethod()->getMailingAddress()): ?>
-+        <?php if ($block->getMethod()->getMailingAddress()) : ?>
-             <dt class="title"><?= $block->escapeHtml(__('Send Check to:')) ?></dt>
-             <dd class="content">
-                 <address class="checkmo mailing address">
-diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
-index 5d04977ab34..52b7df9fb91 100644
---- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
-+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var $block \Magento\OfflinePayments\Block\Form\Purchaseorder
-  */
-diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
-index cf7496b7c56..2dc226db426 100644
---- a/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
-+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
-@@ -4,21 +4,20 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
-  */
- ?>
- <dl class="payment-method checkmemo">
-     <dt class="title"><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
--    <?php if ($block->getInfo()->getAdditionalInformation()): ?>
--        <?php if ($block->getPayableTo()): ?>
-+    <?php if ($block->getInfo()->getAdditionalInformation()) : ?>
-+        <?php if ($block->getPayableTo()) : ?>
-             <dd class="content">
-                 <strong><?= $block->escapeHtml(__('Make Check payable to')) ?></strong>
-                 <?= $block->escapeHtml($block->getPayableTo()) ?>
-             </dd>
-         <?php endif; ?>
--        <?php if ($block->getMailingAddress()): ?>
-+        <?php if ($block->getMailingAddress()) : ?>
-             <dd class="content">
-                 <strong><?= $block->escapeHtml(__('Send Check to')) ?></strong>
-                 <address class="checkmo mailing address">
-diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml
-new file mode 100644
-index 00000000000..b96918243a7
---- /dev/null
-+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+?>
-+<script>
-+    require([
-+        'uiLayout',
-+        'jquery'
-+    ], function (layout, $) {
-+        $(function () {
-+            var paymentMethodData = {
-+                method: 'checkmo'
-+            };
-+            layout([
-+                {
-+                    component: 'Magento_Checkout/js/view/payment/default',
-+                    name: 'payment_method_checkmo',
-+                    method: paymentMethodData.method,
-+                    item: paymentMethodData
-+                }
-+            ]);
-+
-+            $('body').trigger('contentUpdated');
-+        })
-+    })
-+</script>
-diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
-index b546237b825..c2e6d0e9223 100644
---- a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
-+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
-@@ -80,7 +80,7 @@ class Freeshipping extends \Magento\Shipping\Model\Carrier\AbstractCarrier imple
- 
-         $this->_updateFreeMethodQuote($request);
- 
--        if ($request->getFreeShipping() || $request->getBaseSubtotalInclTax() >= $this->getConfigData(
-+        if ($request->getFreeShipping() || $request->getPackageValueWithDiscount() >= $this->getConfigData(
-             'free_shipping_subtotal'
-         )
-         ) {
-@@ -97,8 +97,18 @@ class Freeshipping extends \Magento\Shipping\Model\Carrier\AbstractCarrier imple
-             $method->setCost('0.00');
- 
-             $result->append($method);
-+        } elseif ($this->getConfigData('showmethod')) {
-+            $error = $this->_rateErrorFactory->create();
-+            $error->setCarrier($this->_code);
-+            $error->setCarrierTitle($this->getConfigData('title'));
-+            $errorMsg = $this->getConfigData('specificerrmsg');
-+            $error->setErrorMessage(
-+                $errorMsg ? $errorMsg : __(
-+                    'Sorry, but we can\'t deliver to the destination country with this shipping module.'
-+                )
-+            );
-+            return $error;
-         }
--
-         return $result;
-     }
- 
-@@ -128,6 +138,8 @@ class Freeshipping extends \Magento\Shipping\Model\Carrier\AbstractCarrier imple
-     }
- 
-     /**
-+     * Returns allowed shipping methods
-+     *
-      * @return array
-      */
-     public function getAllowedMethods()
-diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
-index 2c4fc9a4ccf..46c46243fed 100644
---- a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
-+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
-@@ -61,6 +61,7 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
-      * @param \Magento\Quote\Model\Quote\Address\RateResult\MethodFactory $resultMethodFactory
-      * @param \Magento\OfflineShipping\Model\ResourceModel\Carrier\TablerateFactory $tablerateFactory
-      * @param array $data
-+     * @throws LocalizedException
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      */
-     public function __construct(
-@@ -82,6 +83,8 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
-     }
- 
-     /**
-+     * Collect rates.
-+     *
-      * @param RateRequest $request
-      * @return \Magento\Shipping\Model\Rate\Result
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-@@ -129,8 +132,10 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
-                             $freeQty += $item->getQty() * ($child->getQty() - $freeShipping);
-                         }
-                     }
--                } elseif ($item->getFreeShipping()) {
--                    $freeShipping = is_numeric($item->getFreeShipping()) ? $item->getFreeShipping() : 0;
-+                } elseif ($item->getFreeShipping() || $item->getAddress()->getFreeShipping()) {
-+                    $freeShipping = $item->getFreeShipping() ?
-+                        $item->getFreeShipping() : $item->getAddress()->getFreeShipping();
-+                    $freeShipping = is_numeric($freeShipping) ? $freeShipping : 0;
-                     $freeQty += $item->getQty() - $freeShipping;
-                     $freePackageValue += $item->getBaseRowTotal();
-                 }
-@@ -199,6 +204,8 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
-     }
- 
-     /**
-+     * Get rate.
-+     *
-      * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
-      * @return array|bool
-      */
-@@ -208,6 +215,8 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
-     }
- 
-     /**
-+     * Get code.
-+     *
-      * @param string $type
-      * @param string $code
-      * @return array
-@@ -218,12 +227,12 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
-         $codes = [
-             'condition_name' => [
-                 'package_weight' => __('Weight vs. Destination'),
--                'package_value' => __('Price vs. Destination'),
-+                'package_value_with_discount' => __('Price vs. Destination'),
-                 'package_qty' => __('# of Items vs. Destination'),
-             ],
-             'condition_name_short' => [
-                 'package_weight' => __('Weight (and above)'),
--                'package_value' => __('Order Subtotal (and above)'),
-+                'package_value_with_discount' => __('Order Subtotal (and above)'),
-                 'package_qty' => __('# of Items (and above)'),
-             ],
-         ];
-@@ -269,7 +278,7 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
-         /** @var  \Magento\Quote\Model\Quote\Address\RateResult\Method $method */
-         $method = $this->_resultMethodFactory->create();
- 
--        $method->setCarrier('tablerate');
-+        $method->setCarrier($this->getCarrierCode());
-         $method->setCarrierTitle($this->getConfigData('title'));
- 
-         $method->setMethod('bestway');
-diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/RowParser.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/RowParser.php
-index 9431973fdfe..f7b487d37bf 100644
---- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/RowParser.php
-+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/RowParser.php
-@@ -9,6 +9,9 @@ namespace Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CSV;
- use Magento\Framework\Phrase;
- use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\LocationDirectory;
- 
-+/**
-+ * Row parser.
-+ */
- class RowParser
- {
-     /**
-@@ -26,6 +29,8 @@ class RowParser
-     }
- 
-     /**
-+     * Retrieve columns.
-+     *
-      * @return array
-      */
-     public function getColumns()
-@@ -42,6 +47,8 @@ class RowParser
-     }
- 
-     /**
-+     * Parse provided row data.
-+     *
-      * @param array $rowData
-      * @param int $rowNumber
-      * @param int $websiteId
-@@ -71,23 +78,30 @@ class RowParser
-         }
- 
-         $countryId = $this->getCountryId($rowData, $rowNumber, $columnResolver);
--        $regionId = $this->getRegionId($rowData, $rowNumber, $columnResolver, $countryId);
-+        $regionIds = $this->getRegionIds($rowData, $rowNumber, $columnResolver, $countryId);
-         $zipCode = $this->getZipCode($rowData, $columnResolver);
-         $conditionValue = $this->getConditionValue($rowData, $rowNumber, $conditionFullName, $columnResolver);
-         $price = $this->getPrice($rowData, $rowNumber, $columnResolver);
- 
--        return [
--            'website_id' => $websiteId,
--            'dest_country_id' => $countryId,
--            'dest_region_id' => $regionId,
--            'dest_zip' => $zipCode,
--            'condition_name' => $conditionShortName,
--            'condition_value' => $conditionValue,
--            'price' => $price,
--        ];
-+        $rates = [];
-+        foreach ($regionIds as $regionId) {
-+            $rates[] = [
-+                'website_id' => $websiteId,
-+                'dest_country_id' => $countryId,
-+                'dest_region_id' => $regionId,
-+                'dest_zip' => $zipCode,
-+                'condition_name' => $conditionShortName,
-+                'condition_value' => $conditionValue,
-+                'price' => $price,
-+            ];
-+        }
-+
-+        return $rates;
-     }
- 
-     /**
-+     * Get country id from provided row data.
-+     *
-      * @param array $rowData
-      * @param int $rowNumber
-      * @param ColumnResolver $columnResolver
-@@ -116,21 +130,23 @@ class RowParser
-     }
- 
-     /**
-+     * Retrieve region id from provided row data.
-+     *
-      * @param array $rowData
-      * @param int $rowNumber
-      * @param ColumnResolver $columnResolver
-      * @param int $countryId
--     * @return int|string
-+     * @return array
-      * @throws ColumnNotFoundException
-      * @throws RowException
-      */
--    private function getRegionId(array $rowData, $rowNumber, ColumnResolver $columnResolver, $countryId)
-+    private function getRegionIds(array $rowData, $rowNumber, ColumnResolver $columnResolver, $countryId)
-     {
-         $regionCode = $columnResolver->getColumnValue(ColumnResolver::COLUMN_REGION, $rowData);
-         if ($countryId !== '0' && $this->locationDirectory->hasRegionId($countryId, $regionCode)) {
--            $regionId = $this->locationDirectory->getRegionId($countryId, $regionCode);
-+            $regionIds = $this->locationDirectory->getRegionIds($countryId, $regionCode);
-         } elseif ($regionCode === '*' || $regionCode === '') {
--            $regionId = 0;
-+            $regionIds = [0];
-         } else {
-             throw new RowException(
-                 __(
-@@ -141,10 +157,12 @@ class RowParser
-                 )
-             );
-         }
--        return $regionId;
-+        return $regionIds;
-     }
- 
-     /**
-+     * Retrieve zip code from provided row data.
-+     *
-      * @param array $rowData
-      * @param ColumnResolver $columnResolver
-      * @return float|int|null|string
-@@ -160,6 +178,8 @@ class RowParser
-     }
- 
-     /**
-+     * Get condition value form provided row data.
-+     *
-      * @param array $rowData
-      * @param int $rowNumber
-      * @param string $conditionFullName
-@@ -187,6 +207,8 @@ class RowParser
-     }
- 
-     /**
-+     * Retrieve price from provided row data.
-+     *
-      * @param array $rowData
-      * @param int $rowNumber
-      * @param ColumnResolver $columnResolver
-@@ -212,6 +234,7 @@ class RowParser
- 
-     /**
-      * Parse and validate positive decimal value
-+     *
-      * Return false if value is not decimal or is not positive
-      *
-      * @param string $value
-diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Import.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Import.php
-index a5b0d7e87d2..7735f8ce899 100644
---- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Import.php
-+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Import.php
-@@ -17,6 +17,7 @@ use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CSV\RowParser;
- use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-+ * Import offline shipping.
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Import
-@@ -87,6 +88,8 @@ class Import
-     }
- 
-     /**
-+     * Check if there are errors.
-+     *
-      * @return bool
-      */
-     public function hasErrors()
-@@ -95,6 +98,8 @@ class Import
-     }
- 
-     /**
-+     * Get errors.
-+     *
-      * @return array
-      */
-     public function getErrors()
-@@ -103,6 +108,8 @@ class Import
-     }
- 
-     /**
-+     * Retrieve columns.
-+     *
-      * @return array
-      */
-     public function getColumns()
-@@ -111,6 +118,8 @@ class Import
-     }
- 
-     /**
-+     * Get data from file.
-+     *
-      * @param ReadInterface $file
-      * @param int $websiteId
-      * @param string $conditionShortName
-@@ -135,7 +144,7 @@ class Import
-                 if (empty($csvLine)) {
-                     continue;
-                 }
--                $rowData = $this->rowParser->parse(
-+                $rowsData = $this->rowParser->parse(
-                     $csvLine,
-                     $rowNumber,
-                     $websiteId,
-@@ -144,20 +153,25 @@ class Import
-                     $columnResolver
-                 );
- 
--                // protect from duplicate
--                $hash = $this->dataHashGenerator->getHash($rowData);
--                if (array_key_exists($hash, $this->uniqueHash)) {
--                    throw new RowException(
--                        __(
--                            'Duplicate Row #%1 (duplicates row #%2)',
--                            $rowNumber,
--                            $this->uniqueHash[$hash]
--                        )
--                    );
-+                foreach ($rowsData as $rowData) {
-+                    // protect from duplicate
-+                    $hash = $this->dataHashGenerator->getHash($rowData);
-+                    if (array_key_exists($hash, $this->uniqueHash)) {
-+                        throw new RowException(
-+                            __(
-+                                'Duplicate Row #%1 (duplicates row #%2)',
-+                                $rowNumber,
-+                                $this->uniqueHash[$hash]
-+                            )
-+                        );
-+                    }
-+                    $this->uniqueHash[$hash] = $rowNumber;
-+
-+                    $items[] = $rowData;
-+                }
-+                if (count($rowsData) > 1) {
-+                    $bunchSize += count($rowsData) - 1;
-                 }
--                $this->uniqueHash[$hash] = $rowNumber;
--
--                $items[] = $rowData;
-                 if (count($items) === $bunchSize) {
-                     yield $items;
-                     $items = [];
-@@ -172,6 +186,8 @@ class Import
-     }
- 
-     /**
-+     * Retrieve column headers.
-+     *
-      * @param ReadInterface $file
-      * @return array|bool
-      * @throws LocalizedException
-diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php
-index 1a311f3658a..e015f7b5463 100644
---- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php
-+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php
-@@ -6,6 +6,9 @@
- 
- namespace Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate;
- 
-+/**
-+ * Location directory.
-+ */
- class LocationDirectory
- {
-     /**
-@@ -13,6 +16,11 @@ class LocationDirectory
-      */
-     protected $regions;
- 
-+    /**
-+     * @var array
-+     */
-+    private $regionsByCode;
-+
-     /**
-      * @var array
-      */
-@@ -47,6 +55,8 @@ class LocationDirectory
-     }
- 
-     /**
-+     * Retrieve country id.
-+     *
-      * @param string $countryCode
-      * @return null|string
-      */
-@@ -88,6 +98,8 @@ class LocationDirectory
-     }
- 
-     /**
-+     * Check if there is country id with provided country code.
-+     *
-      * @param string $countryCode
-      * @return bool
-      */
-@@ -98,6 +110,8 @@ class LocationDirectory
-     }
- 
-     /**
-+     * Check if there is region id with provided region code and country id.
-+     *
-      * @param string $countryId
-      * @param string $regionCode
-      * @return bool
-@@ -115,29 +129,50 @@ class LocationDirectory
-      */
-     protected function loadRegions()
-     {
--        if ($this->regions !== null) {
-+        if ($this->regions !== null && $this->regionsByCode !== null) {
-             return $this;
-         }
- 
-         $this->regions = [];
-+        $this->regionsByCode = [];
- 
-         /** @var $collection \Magento\Directory\Model\ResourceModel\Region\Collection */
-         $collection = $this->_regionCollectionFactory->create();
-         foreach ($collection->getData() as $row) {
-             $this->regions[$row['country_id']][$row['code']] = (int)$row['region_id'];
-+            if (empty($this->regionsByCode[$row['country_id']][$row['code']])) {
-+                $this->regionsByCode[$row['country_id']][$row['code']] = [];
-+            }
-+            $this->regionsByCode[$row['country_id']][$row['code']][] = (int)$row['region_id'];
-         }
- 
-         return $this;
-     }
- 
-     /**
-+     * Retrieve region id.
-+     *
-      * @param int $countryId
-      * @param string $regionCode
-      * @return string
-+     * @deprecated
-      */
-     public function getRegionId($countryId, $regionCode)
-     {
-         $this->loadRegions();
-         return $this->regions[$countryId][$regionCode];
-     }
-+
-+    /**
-+     * Return region ids for country and region
-+     *
-+     * @param int $countryId
-+     * @param string $regionCode
-+     * @return array
-+     */
-+    public function getRegionIds($countryId, $regionCode)
-+    {
-+        $this->loadRegions();
-+        return $this->regionsByCode[$countryId][$regionCode];
-+    }
- }
-diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/RateQuery.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/RateQuery.php
-index 5b03ef0cb02..f7105b8e547 100644
---- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/RateQuery.php
-+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/RateQuery.php
-@@ -6,6 +6,9 @@
- 
- namespace Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate;
- 
-+/**
-+ * Query builder for table rate
-+ */
- class RateQuery
- {
-     /**
-@@ -24,6 +27,8 @@ class RateQuery
-     }
- 
-     /**
-+     * Prepare select
-+     *
-      * @param \Magento\Framework\DB\Select $select
-      * @return \Magento\Framework\DB\Select
-      */
-@@ -42,6 +47,7 @@ class RateQuery
-             ') OR (',
-             [
-                 "dest_country_id = :country_id AND dest_region_id = :region_id AND dest_zip = :postcode",
-+                "dest_country_id = :country_id AND dest_region_id = :region_id AND dest_zip = :postcode_prefix",
-                 "dest_country_id = :country_id AND dest_region_id = :region_id AND dest_zip = ''",
- 
-                 // Handle asterisk in dest_zip field
-@@ -51,7 +57,7 @@ class RateQuery
-                 "dest_country_id = '0' AND dest_region_id = 0 AND dest_zip = '*'",
-                 "dest_country_id = :country_id AND dest_region_id = 0 AND dest_zip = ''",
-                 "dest_country_id = :country_id AND dest_region_id = 0 AND dest_zip = :postcode",
--                "dest_country_id = :country_id AND dest_region_id = 0 AND dest_zip = '*'"
-+                "dest_country_id = :country_id AND dest_region_id = 0 AND dest_zip = :postcode_prefix"
-             ]
-         ) . ')';
-         $select->where($orWhere);
-@@ -76,6 +82,8 @@ class RateQuery
-     }
- 
-     /**
-+     * Returns query bindings
-+     *
-      * @return array
-      */
-     public function getBindings()
-@@ -85,6 +93,7 @@ class RateQuery
-             ':country_id' => $this->request->getDestCountryId(),
-             ':region_id' => (int)$this->request->getDestRegionId(),
-             ':postcode' => $this->request->getDestPostcode(),
-+            ':postcode_prefix' => $this->getDestPostcodePrefix()
-         ];
- 
-         // Render condition by condition name
-@@ -106,10 +115,26 @@ class RateQuery
-     }
- 
-     /**
-+     * Returns rate request
-+     *
-      * @return \Magento\Quote\Model\Quote\Address\RateRequest
-      */
-     public function getRequest()
-     {
-         return $this->request;
-     }
-+
-+    /**
-+     * Returns the entire postcode if it contains no dash or the part of it prior to the dash in the other case
-+     *
-+     * @return string
-+     */
-+    private function getDestPostcodePrefix()
-+    {
-+        if (!preg_match("/^(.+)-(.+)$/", $this->request->getDestPostcode(), $zipParts)) {
-+            return $this->request->getDestPostcode();
-+        }
-+
-+        return $zipParts[1];
-+    }
- }
-diff --git a/app/code/Magento/OfflineShipping/Setup/Patch/Data/UpdateShippingTablerate.php b/app/code/Magento/OfflineShipping/Setup/Patch/Data/UpdateShippingTablerate.php
-new file mode 100644
-index 00000000000..070105846fd
---- /dev/null
-+++ b/app/code/Magento/OfflineShipping/Setup/Patch/Data/UpdateShippingTablerate.php
-@@ -0,0 +1,73 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\OfflineShipping\Setup\Patch\Data;
-+
-+use Magento\Framework\Setup\Patch\DataPatchInterface;
-+use Magento\OfflineShipping\Model\Carrier\Tablerate;
-+
-+/**
-+ * Update for shipping_tablerate table for using price with discount in condition.
-+ */
-+class UpdateShippingTablerate implements DataPatchInterface
-+{
-+    /**
-+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
-+     */
-+    private $moduleDataSetup;
-+
-+    /**
-+     * PatchInitial constructor.
-+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
-+     */
-+    public function __construct(
-+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
-+    ) {
-+        $this->moduleDataSetup = $moduleDataSetup;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function apply()
-+    {
-+        $this->moduleDataSetup->getConnection()->startSetup();
-+        $connection = $this->moduleDataSetup->getConnection();
-+        $connection->update(
-+            $this->moduleDataSetup->getTable('shipping_tablerate'),
-+            ['condition_name' => 'package_value_with_discount'],
-+            [new \Zend_Db_Expr('condition_name = \'package_value\'')]
-+        );
-+        $connection->update(
-+            $this->moduleDataSetup->getTable('core_config_data'),
-+            ['value' => 'package_value_with_discount'],
-+            [
-+                new \Zend_Db_Expr('value = \'package_value\''),
-+                new \Zend_Db_Expr('path = \'carriers/tablerate/condition_name\'')
-+            ]
-+        );
-+        $this->moduleDataSetup->getConnection()->endSetup();
-+
-+        $connection->endSetup();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public static function getDependencies()
-+    {
-+        return [];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getAliases()
-+    {
-+        return [];
-+    }
-+}
-diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
-index 8d75cc32914..a1fb2e449d7 100644
---- a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
-+++ b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
-@@ -33,7 +33,10 @@ class ImportTest extends \PHPUnit\Framework\TestCase
-         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->_object = $testHelper->getObject(
-             \Magento\OfflineShipping\Block\Adminhtml\Form\Field\Import::class,
--            ['data' => $testData]
-+            [
-+                'data' => $testData,
-+                '_escaper' => $testHelper->getObject(\Magento\Framework\Escaper::class)
-+            ]
-         );
-         $this->_object->setForm($this->_formMock);
-     }
-diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/Quote/Address/FreeShippingTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/Quote/Address/FreeShippingTest.php
-index 8266a39bbbb..1f4fa5245c4 100644
---- a/app/code/Magento/OfflineShipping/Test/Unit/Model/Quote/Address/FreeShippingTest.php
-+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/Quote/Address/FreeShippingTest.php
-@@ -16,6 +16,9 @@ use Magento\Store\Api\Data\StoreInterface;
- use Magento\Store\Model\StoreManagerInterface;
- use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
-+/**
-+ * Test for Magento\OfflineShipping\Model\Quote\Address\FreeShipping class.
-+ */
- class FreeShippingTest extends \PHPUnit\Framework\TestCase
- {
-     private static $websiteId = 1;
-@@ -77,12 +80,14 @@ class FreeShippingTest extends \PHPUnit\Framework\TestCase
-                 [$fItem],
-                 [$sItem]
-             )
--            ->willReturnCallback(function () use ($fItem, $sItem, $addressFree, $fItemFree, $sItemFree) {
--                // emulate behavior of cart rule calculator
--                $fItem->getAddress()->setFreeShipping($addressFree);
--                $fItem->setFreeShipping($fItemFree);
--                $sItem->setFreeShipping($sItemFree);
--            });
-+            ->willReturnCallback(
-+                function () use ($fItem, $sItem, $addressFree, $fItemFree, $sItemFree) {
-+                    // emulate behavior of cart rule calculator
-+                    $fItem->getAddress()->setFreeShipping($addressFree);
-+                    $fItem->setFreeShipping($fItemFree);
-+                    $sItem->setFreeShipping($sItemFree);
-+                }
-+            );
- 
-         $actual = $this->model->isFreeShipping($quote, $items);
-         self::assertEquals($expected, $actual);
-@@ -133,8 +138,11 @@ class FreeShippingTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->setMethods(
-                 [
--                    'getCouponCode', 'getCustomerGroupId', 'getShippingAddress', 'getStoreId', 'getItemsQty',
--                    'getVirtualItemsQty'
-+                    'getCouponCode',
-+                    'getCustomerGroupId',
-+                    'getShippingAddress',
-+                    'getStoreId',
-+                    'isVirtual'
-                 ]
-             )
-             ->getMock();
-@@ -147,10 +155,8 @@ class FreeShippingTest extends \PHPUnit\Framework\TestCase
-             ->willReturn(self::$couponCode);
-         $quote->method('getShippingAddress')
-             ->willReturn($address);
--        $quote->method('getItemsQty')
--            ->willReturn(2);
--        $quote->method('getVirtualItemsQty')
--            ->willReturn(0);
-+        $quote->method('isVirtual')
-+            ->willReturn(false);
- 
-         return $quote;
-     }
-diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/RowParserTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/RowParserTest.php
-index 8c34e9a0d65..683790c5312 100644
---- a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/RowParserTest.php
-+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/RowParserTest.php
-@@ -37,7 +37,7 @@ class RowParserTest extends \PHPUnit\Framework\TestCase
-     protected function setUp()
-     {
-         $this->locationDirectoryMock = $this->getMockBuilder(LocationDirectory::class)
--            ->setMethods(['hasCountryId', 'getCountryId', 'hasRegionId', 'getRegionId'])
-+            ->setMethods(['hasCountryId', 'getCountryId', 'hasRegionId', 'getRegionIds'])
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->columnResolverMock = $this->getMockBuilder(ColumnResolver::class)
-@@ -92,7 +92,7 @@ class RowParserTest extends \PHPUnit\Framework\TestCase
-             $conditionShortName,
-             $columnValueMap
-         );
--        $this->assertEquals($expectedResult, $result);
-+        $this->assertEquals([$expectedResult], $result);
-     }
- 
-     /**
-diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/ImportTest.php
-index 4e433c380f7..722683decb4 100644
---- a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/ImportTest.php
-+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/ImportTest.php
-@@ -77,9 +77,6 @@ class ImportTest extends \PHPUnit\Framework\TestCase
-             ->getMock();
-         $this->dataHashGeneratorMock = $this->getMockBuilder(DataHashGenerator::class)
-             ->getMock();
--        $this->rowParserMock->expects($this->any())
--            ->method('parse')
--            ->willReturnArgument(0);
-         $this->dataHashGeneratorMock->expects($this->any())
-             ->method('getHash')
-             ->willReturnCallback(
-@@ -124,6 +121,15 @@ class ImportTest extends \PHPUnit\Framework\TestCase
-             ['a4', 'b4', 'c4', 'd4', 'e4'],
-             ['a5', 'b5', 'c5', 'd5', 'e5'],
-         ];
-+        $this->rowParserMock->expects($this->any())
-+            ->method('parse')
-+            ->willReturn(
-+                [['a1', 'b1', 'c1', 'd1', 'e1']],
-+                [['a2', 'b2', 'c2', 'd2', 'e2']],
-+                [['a3', 'b3', 'c3', 'd3', 'e3']],
-+                [['a4', 'b4', 'c4', 'd4', 'e4']],
-+                [['a5', 'b5', 'c5', 'd5', 'e5']]
-+            );
-         $file = $this->createFileMock($lines);
-         $expectedResult = [
-             [
-@@ -167,6 +173,13 @@ class ImportTest extends \PHPUnit\Framework\TestCase
-             [],
-             ['a2', 'b2', 'c2', 'd2', 'e2'],
-         ];
-+        $this->rowParserMock->expects($this->any())
-+            ->method('parse')
-+            ->willReturn(
-+                [['a1', 'b1', 'c1', 'd1', 'e1']],
-+                [['a1', 'b1', 'c1', 'd1', 'e1']],
-+                [['a2', 'b2', 'c2', 'd2', 'e2']]
-+            );
-         $file = $this->createFileMock($lines);
-         $expectedResult = [
-             [
-diff --git a/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml b/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml
-index 306aac17699..4db5f489aa4 100644
---- a/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml
-+++ b/app/code/Magento/OfflineShipping/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="carriers" translate="label" type="text" sortOrder="320" showInDefault="1" showInWebsite="1" showInStore="1">
-+        <section id="carriers" type="text" sortOrder="320" showInDefault="1" showInWebsite="1" showInStore="1">
-             <group id="flatrate" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Flat Rate</label>
-                 <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-diff --git a/app/code/Magento/OfflineShipping/etc/db_schema.xml b/app/code/Magento/OfflineShipping/etc/db_schema.xml
-index 80f4b56a172..5129e8a29b2 100644
---- a/app/code/Magento/OfflineShipping/etc/db_schema.xml
-+++ b/app/code/Magento/OfflineShipping/etc/db_schema.xml
-@@ -18,17 +18,17 @@
-                 default="0" comment="Destination Region Id"/>
-         <column xsi:type="varchar" name="dest_zip" nullable="false" length="10" default="*"
-                 comment="Destination Post Code (Zip)"/>
--        <column xsi:type="varchar" name="condition_name" nullable="false" length="20" comment="Rate Condition name"/>
-+        <column xsi:type="varchar" name="condition_name" nullable="false" length="30" comment="Rate Condition name"/>
-         <column xsi:type="decimal" name="condition_value" scale="4" precision="12" unsigned="false" nullable="false"
-                 default="0" comment="Rate condition value"/>
-         <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-                 comment="Price"/>
-         <column xsi:type="decimal" name="cost" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-                 comment="Cost"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="pk"/>
-         </constraint>
--        <constraint xsi:type="unique" name="UNQ_D60821CDB2AFACEE1566CFC02D0D4CAA">
-+        <constraint xsi:type="unique" referenceId="UNQ_D60821CDB2AFACEE1566CFC02D0D4CAA">
-             <column name="website_id"/>
-             <column name="dest_country_id"/>
-             <column name="dest_region_id"/>
-diff --git a/app/code/Magento/PageCache/Model/Cache/Server.php b/app/code/Magento/PageCache/Model/Cache/Server.php
-index 349e9faffa6..7f3a4af969d 100644
---- a/app/code/Magento/PageCache/Model/Cache/Server.php
-+++ b/app/code/Magento/PageCache/Model/Cache/Server.php
-@@ -12,6 +12,9 @@ use Magento\Framework\App\RequestInterface;
- use Zend\Uri\Uri;
- use Zend\Uri\UriFactory;
- 
-+/**
-+ * Cache server model.
-+ */
- class Server
- {
-     /**
-@@ -62,8 +65,7 @@ class Server
-             foreach ($configuredHosts as $host) {
-                 $servers[] = UriFactory::factory('')
-                     ->setHost($host['host'])
--                    ->setPort(isset($host['port']) ? $host['port'] : self::DEFAULT_PORT)
--                ;
-+                    ->setPort(isset($host['port']) ? $host['port'] : self::DEFAULT_PORT);
-             }
-         } elseif ($this->request->getHttpHost()) {
-             $servers[] = UriFactory::factory('')->setHost($this->request->getHttpHost())->setPort(self::DEFAULT_PORT);
-diff --git a/app/code/Magento/PageCache/Model/DepersonalizeChecker.php b/app/code/Magento/PageCache/Model/DepersonalizeChecker.php
-index 3023efb7a71..4012499d5da 100644
---- a/app/code/Magento/PageCache/Model/DepersonalizeChecker.php
-+++ b/app/code/Magento/PageCache/Model/DepersonalizeChecker.php
-@@ -20,7 +20,7 @@ class DepersonalizeChecker
-     /**
-      * Module manager
-      *
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     private $moduleManager;
- 
-@@ -33,12 +33,12 @@ class DepersonalizeChecker
- 
-     /**
-      * @param \Magento\Framework\App\RequestInterface $request
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param Config $cacheConfig
-      */
-     public function __construct(
-         \Magento\Framework\App\RequestInterface $request,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         Config $cacheConfig
-     ) {
-         $this->request = $request;
-diff --git a/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php b/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php
-new file mode 100644
-index 00000000000..7c9391ba221
---- /dev/null
-+++ b/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php
-@@ -0,0 +1,37 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\PageCache\Model\System\Config\Backend;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Phrase;
-+
-+/**
-+ * Access List config field.
-+ */
-+class AccessList extends Varnish
-+{
-+    /**
-+     * @inheritDoc
-+     */
-+    public function beforeSave()
-+    {
-+        parent::beforeSave();
-+
-+        $value = $this->getValue();
-+        if (!is_string($value) || !preg_match('/^[\w\s\.\-\,\:]+$/', $value)) {
-+            throw new LocalizedException(
-+                new Phrase(
-+                    'Access List value "%1" is not valid. '
-+                    . 'Please use only IP addresses and host names.',
-+                    [$value]
-+                )
-+            );
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php b/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php
-index dab8d7be16d..d9d26d0848c 100644
---- a/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php
-+++ b/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php
-@@ -6,6 +6,10 @@
- 
- namespace Magento\PageCache\Model\System\Config\Backend;
- 
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
- /**
-  * Backend model for processing Public content cache lifetime settings
-  *
-@@ -13,6 +17,36 @@ namespace Magento\PageCache\Model\System\Config\Backend;
-  */
- class Ttl extends \Magento\Framework\App\Config\Value
- {
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-+    /**
-+     * Ttl constructor.
-+     * @param \Magento\Framework\Model\Context $context
-+     * @param \Magento\Framework\Registry $registry
-+     * @param ScopeConfigInterface $config
-+     * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
-+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
-+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
-+     * @param array $data
-+     * @param Escaper|null $escaper
-+     */
-+    public function __construct(
-+        \Magento\Framework\Model\Context $context,
-+        \Magento\Framework\Registry $registry,
-+        ScopeConfigInterface $config,
-+        \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
-+        ?\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-+        ?\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-+        array $data = [],
-+        ?Escaper $escaper = null
-+    ) {
-+        parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
-+        $this->escaper = $escaper ?: ObjectManager::getInstance()->create(Escaper::class);
-+    }
-+
-     /**
-      * Throw exception if Ttl data is invalid or empty
-      *
-@@ -24,7 +58,10 @@ class Ttl extends \Magento\Framework\App\Config\Value
-         $value = $this->getValue();
-         if ($value < 0 || !preg_match('/^[0-9]+$/', $value)) {
-             throw new \Magento\Framework\Exception\LocalizedException(
--                __('Ttl value "%1" is not valid. Please use only numbers equal or greater than zero.', $value)
-+                __(
-+                    'Ttl value "%1" is not valid. Please use only numbers equal or greater than zero.',
-+                    $this->escaper->escapeHtml($value)
-+                )
-             );
-         }
-         return $this;
-diff --git a/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php b/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php
-index cf5a703142c..a50fa090de2 100644
---- a/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php
-+++ b/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php
-@@ -9,6 +9,9 @@ namespace Magento\PageCache\Model\Varnish;
- use Magento\PageCache\Model\VclGeneratorInterface;
- use Magento\PageCache\Model\VclTemplateLocatorInterface;
- 
-+/**
-+ * Varnish vcl generator model.
-+ */
- class VclGenerator implements VclGeneratorInterface
- {
-     /**
-@@ -119,7 +122,7 @@ class VclGenerator implements VclGeneratorInterface
-     private function getRegexForDesignExceptions()
-     {
-         $result = '';
--        $tpl = "%s (req.http.user-agent ~ \"%s\") {\n"."        hash_data(\"%s\");\n"."    }";
-+        $tpl = "%s (req.http.user-agent ~ \"%s\") {\n" . "        hash_data(\"%s\");\n" . "    }";
- 
-         $expressions = $this->getDesignExceptions();
- 
-@@ -143,7 +146,8 @@ class VclGenerator implements VclGeneratorInterface
- 
-     /**
-      * Get IPs access list that can purge Varnish configuration for config file generation
--     * and transform it to appropriate view
-+     *
-+     * Tansform it to appropriate view
-      *
-      * acl purge{
-      *  "127.0.0.1";
-@@ -157,7 +161,7 @@ class VclGenerator implements VclGeneratorInterface
-         $result = array_reduce(
-             $this->getAccessList(),
-             function ($ips, $ip) use ($tpl) {
--                return $ips.sprintf($tpl, trim($ip)) . "\n";
-+                return $ips . sprintf($tpl, trim($ip)) . "\n";
-             },
-             ''
-         );
-@@ -216,6 +220,8 @@ class VclGenerator implements VclGeneratorInterface
-     }
- 
-     /**
-+     * Get design exceptions array.
-+     *
-      * @return array
-      */
-     private function getDesignExceptions()
-diff --git a/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance.php b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance.php
-new file mode 100644
-index 00000000000..7017da27eee
---- /dev/null
-+++ b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance.php
-@@ -0,0 +1,108 @@
-+<?php
-+/**
-+ *
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\PageCache\Observer;
-+
-+use Magento\Framework\Event\ObserverInterface;
-+use Magento\Framework\Event\Observer;
-+use Magento\Framework\App\Cache\Manager;
-+use Magento\PageCache\Model\Cache\Type as PageCacheType;
-+use Magento\PageCache\Observer\SwitchPageCacheOnMaintenance\PageCacheState;
-+
-+/**
-+ * Switch Page Cache on maintenance.
-+ */
-+class SwitchPageCacheOnMaintenance implements ObserverInterface
-+{
-+    /**
-+     * @var Manager
-+     */
-+    private $cacheManager;
-+
-+    /**
-+     * @var PageCacheState
-+     */
-+    private $pageCacheStateStorage;
-+
-+    /**
-+     * @param Manager $cacheManager
-+     * @param PageCacheState $pageCacheStateStorage
-+     */
-+    public function __construct(Manager $cacheManager, PageCacheState $pageCacheStateStorage)
-+    {
-+        $this->cacheManager = $cacheManager;
-+        $this->pageCacheStateStorage = $pageCacheStateStorage;
-+    }
-+
-+    /**
-+     * Switches Full Page Cache.
-+     *
-+     * Depending on enabling or disabling Maintenance Mode it turns off or restores Full Page Cache state.
-+     *
-+     * @param Observer $observer
-+     * @return void
-+     */
-+    public function execute(Observer $observer): void
-+    {
-+        if ($observer->getData('isOn')) {
-+            $this->pageCacheStateStorage->save($this->isFullPageCacheEnabled());
-+            $this->turnOffFullPageCache();
-+        } else {
-+            $this->restoreFullPageCacheState();
-+        }
-+    }
-+
-+    /**
-+     * Turns off Full Page Cache.
-+     *
-+     * @return void
-+     */
-+    private function turnOffFullPageCache(): void
-+    {
-+        if (!$this->isFullPageCacheEnabled()) {
-+            return;
-+        }
-+
-+        $this->cacheManager->clean([PageCacheType::TYPE_IDENTIFIER]);
-+        $this->cacheManager->setEnabled([PageCacheType::TYPE_IDENTIFIER], false);
-+    }
-+
-+    /**
-+     * Full Page Cache state.
-+     *
-+     * @return bool
-+     */
-+    private function isFullPageCacheEnabled(): bool
-+    {
-+        $cacheStatus = $this->cacheManager->getStatus();
-+
-+        if (!array_key_exists(PageCacheType::TYPE_IDENTIFIER, $cacheStatus)) {
-+            return false;
-+        }
-+
-+        return (bool)$cacheStatus[PageCacheType::TYPE_IDENTIFIER];
-+    }
-+
-+    /**
-+     * Restores Full Page Cache state.
-+     *
-+     * Returns FPC to previous state that was before maintenance mode turning on.
-+     *
-+     * @return void
-+     */
-+    private function restoreFullPageCacheState(): void
-+    {
-+        $storedPageCacheState = $this->pageCacheStateStorage->isEnabled();
-+        $this->pageCacheStateStorage->flush();
-+
-+        if ($storedPageCacheState) {
-+            $this->cacheManager->setEnabled([PageCacheType::TYPE_IDENTIFIER], true);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php
-new file mode 100644
-index 00000000000..e4cadf728f2
---- /dev/null
-+++ b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ *
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\PageCache\Observer\SwitchPageCacheOnMaintenance;
-+
-+use Magento\Framework\Filesystem;
-+use Magento\Framework\App\Filesystem\DirectoryList;
-+
-+/**
-+ * Page Cache state.
-+ */
-+class PageCacheState
-+{
-+    /**
-+     * Full Page Cache Off state file name.
-+     */
-+    private const PAGE_CACHE_STATE_FILENAME = '.maintenance.fpc.state';
-+
-+    /**
-+     * @var Filesystem\Directory\WriteInterface
-+     */
-+    private $flagDir;
-+
-+    /**
-+     * @param Filesystem $fileSystem
-+     */
-+    public function __construct(Filesystem $fileSystem)
-+    {
-+        $this->flagDir = $fileSystem->getDirectoryWrite(DirectoryList::VAR_DIR);
-+    }
-+
-+    /**
-+     * Saves Full Page Cache state.
-+     *
-+     * Saves FPC state across requests.
-+     *
-+     * @param bool $state
-+     * @return void
-+     */
-+    public function save(bool $state): void
-+    {
-+        $this->flagDir->writeFile(self::PAGE_CACHE_STATE_FILENAME, (string)$state);
-+    }
-+
-+    /**
-+     * Returns stored Full Page Cache state.
-+     *
-+     * @return bool
-+     */
-+    public function isEnabled(): bool
-+    {
-+        if (!$this->flagDir->isExist(self::PAGE_CACHE_STATE_FILENAME)) {
-+            return false;
-+        }
-+
-+        return (bool)$this->flagDir->readFile(self::PAGE_CACHE_STATE_FILENAME);
-+    }
-+
-+    /**
-+     * Flushes Page Cache state storage.
-+     *
-+     * @return void
-+     */
-+    public function flush(): void
-+    {
-+        $this->flagDir->delete(self::PAGE_CACHE_STATE_FILENAME);
-+    }
-+}
-diff --git a/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearCacheActionGroup.xml b/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearCacheActionGroup.xml
-index cf4bd4ff43c..510dfc3554c 100644
---- a/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearCacheActionGroup.xml
-+++ b/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearCacheActionGroup.xml
-@@ -7,11 +7,19 @@
-         -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
--<actionGroup name="ClearCacheActionGroup">
--    <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/cache/" stepKey="goToNewCustomVarialePage" />
--    <waitForPageLoad stepKey="waitForPageLoad"/>
--    <click selector="{{AdminCacheManagementSection.FlushMagentoCache}}" stepKey="clickFlushMagentoCache" />
--    <waitForPageLoad stepKey="waitForCacheFlush"/>
--</actionGroup>
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="ClearCacheActionGroup">
-+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/cache/" stepKey="goToNewCustomVarialePage" />
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <click selector="{{AdminCacheManagementSection.FlushMagentoCache}}" stepKey="clickFlushMagentoCache" />
-+        <waitForPageLoad stepKey="waitForCacheFlush"/>
-+    </actionGroup>
-+    <actionGroup name="clearPageCache">
-+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/cache/" stepKey="amOnCacheManagementPage"/>
-+        <waitForPageLoad stepKey="waitForCacheManagement"/>
-+        <selectOption selector="{{AdminCacheManagementSection.massActionSelect}}" userInput="refresh" stepKey="selectRefresh"/>
-+        <click selector="{{AdminCacheManagementSection.pageCacheCheckbox}}" stepKey="selectPageCache"/>
-+        <click selector="{{AdminCacheManagementSection.massActionSubmit}}" stepKey="submitCacheForm"/>
-+        <waitForPageLoad stepKey="waitForCacheFlush"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearPageCacheActionGroup.xml b/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearPageCacheActionGroup.xml
-index 0293b1e10b8..35d5234e47c 100644
---- a/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearPageCacheActionGroup.xml
-+++ b/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearPageCacheActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="ClearPageCacheActionGroup">
-         <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/cache/" stepKey="goToCacheManagementPage" />
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-diff --git a/app/code/Magento/PageCache/Test/Mftf/Page/AdminCacheManagementPage.xml b/app/code/Magento/PageCache/Test/Mftf/Page/AdminCacheManagementPage.xml
-new file mode 100644
-index 00000000000..24fc5ffb04c
---- /dev/null
-+++ b/app/code/Magento/PageCache/Test/Mftf/Page/AdminCacheManagementPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminCacheManagementPage" url="/admin/cache" area="admin" module="PageCache">
-+        <section name="AdminCacheManagementSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
-index c91f021b571..ee0c3263356 100644
---- a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
-+++ b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
-@@ -7,12 +7,29 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCacheManagementSection">
-         <element name="FlushMagentoCache" type="button" selector="#flush_magento"/>
-         <element name="actionDropDown" type="multiselect" selector="//*[@id='cache_grid_massaction-select']//option[contains(., 'Action')]" timeout="30"/>
-         <element name="refreshOption" type="multiselect" selector="//*[@id='cache_grid_massaction-select']//option[@value='refresh']" timeout="30"/>
-         <element name="pageCacheRowCheckbox" type="checkbox" selector="//td[contains(., 'Page Cache')]/..//input[@type='checkbox']"/>
-         <element name="submit" type="button" selector="//button[@title='Submit']" timeout="30"/>
-+        <element name="massActionSelect" type="select" selector="#cache_grid_massaction-form #cache_grid_massaction-select"/>
-+        <element name="massActionSubmit" type="button" selector="#cache_grid_massaction-form button"/>
-+        <element name="configurationCheckbox" type="checkbox" selector="input[value='config']"/>
-+        <element name="layoutsCheckbox" type="checkbox" selector="input[value='layout']"/>
-+        <element name="blocksHtmlCheckbox" type="checkbox" selector="input[value='block_html']"/>
-+        <element name="collectionsDataCheckbox" type="checkbox" selector="input[value='collections']"/>
-+        <element name="reflectionDataCheckbox" type="checkbox" selector="input[value='reflection']"/>
-+        <element name="databaseDdlCheckbox" type="checkbox" selector="input[value='db_ddl']"/>
-+        <element name="compiledConfigCheckbox" type="checkbox" selector="input[value='compiled_config']"/>
-+        <element name="eavTypesAndAttrsCheckbox" type="checkbox" selector="input[value='eav']"/>
-+        <element name="customerNotificationCheckbox" type="checkbox" selector="input[value='customer_notification']"/>
-+        <element name="integrationsConfigCheckbox" type="checkbox" selector="input[value='config_integration']"/>
-+        <element name="integrationsApiCheckbox" type="checkbox" selector="input[value='config_integration_api']"/>
-+        <element name="pageCacheCheckbox" type="checkbox" selector="input[value='full_page']"/>
-+        <element name="webServicesConfigCheckbox" type="checkbox" selector="input[value='config_webservice']"/>
-+        <element name="translationsCheckbox" type="checkbox" selector="input[value='translate']"/>
-+        <element name="additionalCacheButton" type="button" selector="//*[@id='container']//button[contains(., '{{cacheType}}')]" parameterized="true" />
-     </section>
- </sections>
-diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
-new file mode 100644
-index 00000000000..bd6f7ba362b
---- /dev/null
-+++ b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
-@@ -0,0 +1,35 @@
-+<?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="FlushStaticFilesCacheButtonVisibilityTest">
-+        <annotations>
-+            <features value="PageCache"/>
-+            <stories value="Page Cache"/>
-+            <title value="Check visibility of flush static files cache button"/>
-+            <description value="Flush Static Files Cache button visibility"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-15454"/>
-+            <group value="production_mode_only"/>
-+            <group value="pagecache"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Log in to Admin Panel -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+
-+        <!-- Open Cache Management page -->
-+        <amOnPage url="{{AdminCacheManagementPage.url}}" stepKey="amOnPageCacheManagement"/>
-+        <waitForPageLoad stepKey="waitForPageCacheManagementLoad"/>
-+
-+        <!-- Check 'Flush Static Files Cache' not visible in production mode. -->
-+        <dontSee selector="{{AdminCacheManagementSection.additionalCacheButton('Flush Static Files Cache')}}" stepKey="dontSeeFlushStaticFilesButton" />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
-new file mode 100644
-index 00000000000..a3c9e7b3921
---- /dev/null
-+++ b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
-@@ -0,0 +1,29 @@
-+<?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="NewProductsListWidgetSimpleProductTest">
-+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" before="amOnCmsPage"/>
-+    </test>
-+    <test name="NewProductsListWidgetConfigurableProductTest">
-+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
-+    </test>
-+    <test name="NewProductsListWidgetGroupedProductTest">
-+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
-+    </test>
-+    <test name="NewProductsListWidgetVirtualProductTest">
-+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" before="amOnCmsPage"/>
-+    </test>
-+    <test name="NewProductsListWidgetBundleProductTest">
-+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
-+    </test>
-+    <test name="NewProductsListWidgetDownloadableProductTest">
-+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/PageCache/Test/Unit/Model/DepersonalizeCheckerTest.php b/app/code/Magento/PageCache/Test/Unit/Model/DepersonalizeCheckerTest.php
-index aeaeba93841..6857c637bab 100644
---- a/app/code/Magento/PageCache/Test/Unit/Model/DepersonalizeCheckerTest.php
-+++ b/app/code/Magento/PageCache/Test/Unit/Model/DepersonalizeCheckerTest.php
-@@ -7,6 +7,9 @@ namespace Magento\PageCache\Test\Unit\Model;
- 
- use Magento\PageCache\Model\DepersonalizeChecker;
- 
-+/**
-+ * Depersonalize checker test
-+ */
- class DepersonalizeCheckerTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -15,7 +18,7 @@ class DepersonalizeCheckerTest extends \PHPUnit\Framework\TestCase
-     private $requestMock;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $moduleManagerMock;
- 
-@@ -27,7 +30,7 @@ class DepersonalizeCheckerTest extends \PHPUnit\Framework\TestCase
-     public function setup()
-     {
-         $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
--        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\Manager::class);
-+        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\ModuleManagerInterface::class);
-         $this->cacheConfigMock = $this->createMock(\Magento\PageCache\Model\Config::class);
-     }
- 
-diff --git a/app/code/Magento/PageCache/Test/Unit/Model/System/Config/Backend/AccessListTest.php b/app/code/Magento/PageCache/Test/Unit/Model/System/Config/Backend/AccessListTest.php
-new file mode 100644
-index 00000000000..e84b412beb8
---- /dev/null
-+++ b/app/code/Magento/PageCache/Test/Unit/Model/System/Config/Backend/AccessListTest.php
-@@ -0,0 +1,92 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\PageCache\Test\Unit\Model\System\Config\Backend;
-+
-+use Magento\PageCache\Model\System\Config\Backend\AccessList;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+class AccessListTest extends TestCase
-+{
-+    /**
-+     * @var AccessList
-+     */
-+    private $accessList;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = new ObjectManager($this);
-+        $configMock = $this->getMockForAbstractClass(
-+            ScopeConfigInterface::class
-+        );
-+        $configMock->expects($this->any())
-+            ->method('getValue')
-+            ->with('system/full_page_cache/default')
-+            ->willReturn(['access_list' => 'localhost']);
-+        $this->accessList = $objectManager->getObject(
-+            AccessList::class,
-+            [
-+                'config' => $configMock,
-+                'data' => ['field' => 'access_list']
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getValidValues(): array
-+    {
-+        return [
-+            ['localhost', 'localhost'],
-+            [null, 'localhost'],
-+            ['127.0.0.1', '127.0.0.1'],
-+            ['127.0.0.1, localhost, ::2', '127.0.0.1, localhost, ::2'],
-+        ];
-+    }
-+
-+    /**
-+     * @param mixed $value
-+     * @param mixed $expectedValue
-+     * @dataProvider getValidValues
-+     */
-+    public function testBeforeSave($value, $expectedValue)
-+    {
-+        $this->accessList->setValue($value);
-+        $this->accessList->beforeSave();
-+        $this->assertEquals($expectedValue, $this->accessList->getValue());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getInvalidValues(): array
-+    {
-+        return [
-+            ['\\bull val\\'],
-+            ['{*I am not an IP*}'],
-+            ['{*I am not an IP*}, 127.0.0.1'],
-+        ];
-+    }
-+
-+    /**
-+     * @param mixed $value
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @dataProvider getInvalidValues
-+     */
-+    public function testBeforeSaveInvalid($value)
-+    {
-+        $this->accessList->setValue($value);
-+        $this->accessList->beforeSave();
-+    }
-+}
-diff --git a/app/code/Magento/PageCache/Test/Unit/Observer/SwitchPageCacheOnMaintenanceTest.php b/app/code/Magento/PageCache/Test/Unit/Observer/SwitchPageCacheOnMaintenanceTest.php
-new file mode 100644
-index 00000000000..2dbb815c709
---- /dev/null
-+++ b/app/code/Magento/PageCache/Test/Unit/Observer/SwitchPageCacheOnMaintenanceTest.php
-@@ -0,0 +1,164 @@
-+<?php
-+/**
-+ *
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\PageCache\Test\Unit\Observer;
-+
-+use PHPUnit\Framework\TestCase;
-+use Magento\PageCache\Observer\SwitchPageCacheOnMaintenance;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Framework\App\Cache\Manager;
-+use Magento\Framework\Event\Observer;
-+use Magento\PageCache\Model\Cache\Type as PageCacheType;
-+use Magento\PageCache\Observer\SwitchPageCacheOnMaintenance\PageCacheState;
-+
-+/**
-+ * SwitchPageCacheOnMaintenance observer test.
-+ */
-+class SwitchPageCacheOnMaintenanceTest extends TestCase
-+{
-+    /**
-+     * @var SwitchPageCacheOnMaintenance
-+     */
-+    private $model;
-+
-+    /**
-+     * @var Manager|\PHPUnit\Framework\MockObject\MockObject
-+     */
-+    private $cacheManager;
-+
-+    /**
-+     * @var PageCacheState|\PHPUnit\Framework\MockObject\MockObject
-+     */
-+    private $pageCacheStateStorage;
-+
-+    /**
-+     * @var Observer|\PHPUnit\Framework\MockObject\MockObject
-+     */
-+    private $observer;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-+    {
-+        $objectManager = new ObjectManager($this);
-+        $this->cacheManager = $this->createMock(Manager::class);
-+        $this->pageCacheStateStorage = $this->createMock(PageCacheState::class);
-+        $this->observer = $this->createMock(Observer::class);
-+
-+        $this->model = $objectManager->getObject(SwitchPageCacheOnMaintenance::class, [
-+            'cacheManager' => $this->cacheManager,
-+            'pageCacheStateStorage' => $this->pageCacheStateStorage,
-+        ]);
-+    }
-+
-+    /**
-+     * Tests execute when setting maintenance mode to on.
-+     *
-+     * @param array $cacheStatus
-+     * @param bool $cacheState
-+     * @param int $flushCacheCalls
-+     * @return void
-+     * @dataProvider enablingPageCacheStateProvider
-+     */
-+    public function testExecuteWhileMaintenanceEnabling(
-+        array $cacheStatus,
-+        bool $cacheState,
-+        int $flushCacheCalls
-+    ): void {
-+        $this->observer->method('getData')
-+            ->with('isOn')
-+            ->willReturn(true);
-+        $this->cacheManager->method('getStatus')
-+            ->willReturn($cacheStatus);
-+
-+        // Page Cache state will be stored.
-+        $this->pageCacheStateStorage->expects($this->once())
-+            ->method('save')
-+            ->with($cacheState);
-+
-+        // Page Cache will be cleaned and disabled
-+        $this->cacheManager->expects($this->exactly($flushCacheCalls))
-+            ->method('clean')
-+            ->with([PageCacheType::TYPE_IDENTIFIER]);
-+        $this->cacheManager->expects($this->exactly($flushCacheCalls))
-+            ->method('setEnabled')
-+            ->with([PageCacheType::TYPE_IDENTIFIER], false);
-+
-+        $this->model->execute($this->observer);
-+    }
-+
-+    /**
-+     * Tests execute when setting Maintenance Mode to off.
-+     *
-+     * @param bool $storedCacheState
-+     * @param int $enableCacheCalls
-+     * @return void
-+     * @dataProvider disablingPageCacheStateProvider
-+     */
-+    public function testExecuteWhileMaintenanceDisabling(bool $storedCacheState, int $enableCacheCalls): void
-+    {
-+        $this->observer->method('getData')
-+            ->with('isOn')
-+            ->willReturn(false);
-+
-+        $this->pageCacheStateStorage->method('isEnabled')
-+            ->willReturn($storedCacheState);
-+
-+        // Nullify Page Cache state.
-+        $this->pageCacheStateStorage->expects($this->once())
-+            ->method('flush');
-+
-+        // Page Cache will be enabled.
-+        $this->cacheManager->expects($this->exactly($enableCacheCalls))
-+            ->method('setEnabled')
-+            ->with([PageCacheType::TYPE_IDENTIFIER]);
-+
-+        $this->model->execute($this->observer);
-+    }
-+
-+    /**
-+     * Page Cache state data provider.
-+     *
-+     * @return array
-+     */
-+    public function enablingPageCacheStateProvider(): array
-+    {
-+        return [
-+            'page_cache_is_enable' => [
-+                'cache_status' => [PageCacheType::TYPE_IDENTIFIER => 1],
-+                'cache_state' => true,
-+                'flush_cache_calls' => 1,
-+            ],
-+            'page_cache_is_missing_in_system' => [
-+                'cache_status' => [],
-+                'cache_state' => false,
-+                'flush_cache_calls' => 0,
-+            ],
-+            'page_cache_is_disable' => [
-+                'cache_status' => [PageCacheType::TYPE_IDENTIFIER => 0],
-+                'cache_state' => false,
-+                'flush_cache_calls' => 0,
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Page Cache state data provider.
-+     *
-+     * @return array
-+     */
-+    public function disablingPageCacheStateProvider(): array
-+    {
-+        return [
-+            ['stored_cache_state' => true, 'enable_cache_calls' => 1],
-+            ['stored_cache_state' => false, 'enable_cache_calls' => 0],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/PageCache/etc/adminhtml/system.xml b/app/code/Magento/PageCache/etc/adminhtml/system.xml
-index 1d6c0d89073..2a4439ac6a9 100644
---- a/app/code/Magento/PageCache/etc/adminhtml/system.xml
-+++ b/app/code/Magento/PageCache/etc/adminhtml/system.xml
-@@ -20,7 +20,7 @@
-                         <label>Access list</label>
-                         <comment>IPs access list separated with ',' that can purge Varnish configuration for config file generation.
-                             If field is empty default value localhost will be saved.</comment>
--                        <backend_model>Magento\PageCache\Model\System\Config\Backend\Varnish</backend_model>
-+                        <backend_model>Magento\PageCache\Model\System\Config\Backend\AccessList</backend_model>
-                         <depends>
-                             <field id="caching_application">1</field>
-                         </depends>
-@@ -49,7 +49,7 @@
-                             <field id="caching_application">1</field>
-                         </depends>
-                     </field>
--                    <field id="export_button_version4" type="button" sortOrder="35" showInDefault="1" showInWebsite="0" showInStore="0">
-+                    <field id="export_button_version4" translate="label" type="button" sortOrder="35" showInDefault="1" showInWebsite="0" showInStore="0">
-                         <label>Export Configuration</label>
-                         <frontend_model>Magento\PageCache\Block\System\Config\Form\Field\Export\Varnish4</frontend_model>
-                         <depends>
-diff --git a/app/code/Magento/PageCache/etc/events.xml b/app/code/Magento/PageCache/etc/events.xml
-index 7584f5f36d6..3f0a2532ae6 100644
---- a/app/code/Magento/PageCache/etc/events.xml
-+++ b/app/code/Magento/PageCache/etc/events.xml
-@@ -57,4 +57,7 @@
-     <event name="customer_logout">
-         <observer name="FlushFormKey" instance="Magento\PageCache\Observer\FlushFormKey"/>
-     </event>
-+    <event name="maintenance_mode_changed">
-+        <observer name="page_cache_switcher_for_maintenance" instance="Magento\PageCache\Observer\SwitchPageCacheOnMaintenance"/>
-+    </event>
- </config>
-diff --git a/app/code/Magento/PageCache/etc/varnish4.vcl b/app/code/Magento/PageCache/etc/varnish4.vcl
-index f6b7859af7c..6de6b4e9170 100644
---- a/app/code/Magento/PageCache/etc/varnish4.vcl
-+++ b/app/code/Magento/PageCache/etc/varnish4.vcl
-@@ -86,15 +86,16 @@ sub vcl_recv {
-         } elsif (req.http.Accept-Encoding ~ "deflate" && req.http.user-agent !~ "MSIE") {
-             set req.http.Accept-Encoding = "deflate";
-         } else {
--            # unkown algorithm
-+            # unknown algorithm
-             unset req.http.Accept-Encoding;
-         }
-     }
- 
--    # Remove Google gclid parameters to minimize the cache objects
--    set req.url = regsuball(req.url,"\?gclid=[^&]+$",""); # strips when QS = "?gclid=AAA"
--    set req.url = regsuball(req.url,"\?gclid=[^&]+&","?"); # strips when QS = "?gclid=AAA&foo=bar"
--    set req.url = regsuball(req.url,"&gclid=[^&]+",""); # strips when QS = "?foo=bar&gclid=AAA" or QS = "?foo=bar&gclid=AAA&bar=baz"
-+    # Remove all marketing get parameters to minimize the cache objects
-+    if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=") {
-+        set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
-+        set req.url = regsub(req.url, "[?|&]+$", "");
-+    }
- 
-     # Static files caching
-     if (req.url ~ "^/(pub/)?(media|static)/") {
-@@ -122,6 +123,10 @@ sub vcl_hash {
-         hash_data(server.ip);
-     }
- 
-+    if (req.url ~ "/graphql") {
-+        call process_graphql_headers;
-+    }
-+
-     # To make sure http users don't see ssl warning
-     if (req.http./* {{ ssl_offloaded_header }} */) {
-         hash_data(req.http./* {{ ssl_offloaded_header }} */);
-@@ -129,6 +134,15 @@ sub vcl_hash {
-     /* {{ design_exceptions_code }} */
- }
- 
-+sub process_graphql_headers {
-+    if (req.http.Store) {
-+        hash_data(req.http.Store);
-+    }
-+    if (req.http.Content-Currency) {
-+        hash_data(req.http.Content-Currency);
-+    }
-+}
-+
- sub vcl_backend_response {
- 
-     set beresp.grace = 3d;
-diff --git a/app/code/Magento/PageCache/etc/varnish5.vcl b/app/code/Magento/PageCache/etc/varnish5.vcl
-index 388157af184..4505e746297 100644
---- a/app/code/Magento/PageCache/etc/varnish5.vcl
-+++ b/app/code/Magento/PageCache/etc/varnish5.vcl
-@@ -87,15 +87,16 @@ sub vcl_recv {
-         } elsif (req.http.Accept-Encoding ~ "deflate" && req.http.user-agent !~ "MSIE") {
-             set req.http.Accept-Encoding = "deflate";
-         } else {
--            # unkown algorithm
-+            # unknown algorithm
-             unset req.http.Accept-Encoding;
-         }
-     }
- 
--    # Remove Google gclid parameters to minimize the cache objects
--    set req.url = regsuball(req.url,"\?gclid=[^&]+$",""); # strips when QS = "?gclid=AAA"
--    set req.url = regsuball(req.url,"\?gclid=[^&]+&","?"); # strips when QS = "?gclid=AAA&foo=bar"
--    set req.url = regsuball(req.url,"&gclid=[^&]+",""); # strips when QS = "?foo=bar&gclid=AAA" or QS = "?foo=bar&gclid=AAA&bar=baz"
-+    # Remove all marketing get parameters to minimize the cache objects
-+    if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=") {
-+        set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
-+        set req.url = regsub(req.url, "[?|&]+$", "");
-+    }
- 
-     # Static files caching
-     if (req.url ~ "^/(pub/)?(media|static)/") {
-@@ -128,6 +129,19 @@ sub vcl_hash {
-         hash_data(req.http./* {{ ssl_offloaded_header }} */);
-     }
-     /* {{ design_exceptions_code }} */
-+
-+    if (req.url ~ "/graphql") {
-+        call process_graphql_headers;
-+    }
-+}
-+
-+sub process_graphql_headers {
-+    if (req.http.Store) {
-+        hash_data(req.http.Store);
-+    }
-+    if (req.http.Content-Currency) {
-+        hash_data(req.http.Content-Currency);
-+    }
- }
- 
- sub vcl_backend_response {
-diff --git a/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml b/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml
-index 52a280651da..adba26397a7 100644
---- a/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Framework\View\Element\Js\Components $block */
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js b/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
-index fccc8510ffc..2e8a4769be1 100644
---- a/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
-+++ b/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
-@@ -6,9 +6,10 @@
- define([
-     'jquery',
-     'domReady',
-+    'consoleLogger',
-     'jquery/ui',
-     'mage/cookies'
--], function ($, domReady) {
-+], function ($, domReady, consoleLogger) {
-     'use strict';
- 
-     /**
-@@ -35,7 +36,9 @@ define([
-      * @returns {Array}
-      */
-     $.fn.comments = function () {
--        var elements = [];
-+        var elements = [],
-+            contents,
-+            elementContents;
- 
-         /**
-          * @param {jQuery} element - Comment holder
-@@ -46,14 +49,35 @@ define([
-             // prevent cross origin iframe content reading
-             if ($(element).prop('tagName') === 'IFRAME') {
-                 iframeHostName = $('<a>').prop('href', $(element).prop('src'))
--                                             .prop('hostname');
-+                    .prop('hostname');
- 
-                 if (window.location.hostname !== iframeHostName) {
-                     return [];
-                 }
-             }
- 
--            $(element).contents().each(function (index, el) {
-+            /**
-+             * Rewrite jQuery contents().
-+             *
-+             * @param {jQuery} elem
-+             */
-+            contents = function (elem) {
-+                return $.map(elem, function (el) {
-+                    try {
-+                        return $.nodeName(el, 'iframe') ?
-+                            el.contentDocument || (el.contentWindow ? el.contentWindow.document : []) :
-+                            $.merge([], el.childNodes);
-+                    } catch (e) {
-+                        consoleLogger.error(e);
-+
-+                        return [];
-+                    }
-+                });
-+            };
-+
-+            elementContents = contents($(element));
-+
-+            $.each(elementContents, function (index, el) {
-                 switch (el.nodeType) {
-                     case 1: // ELEMENT_NODE
-                         lookup(el);
-diff --git a/app/code/Magento/Payment/Api/Data/PaymentAdditionalInfoInterface.php b/app/code/Magento/Payment/Api/Data/PaymentAdditionalInfoInterface.php
-new file mode 100644
-index 00000000000..8afa064efd3
---- /dev/null
-+++ b/app/code/Magento/Payment/Api/Data/PaymentAdditionalInfoInterface.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Payment\Api\Data;
-+
-+use Magento\Framework\DataObject\KeyValueObjectInterface;
-+
-+/**
-+ * Payment additional info interface.
-+ */
-+interface PaymentAdditionalInfoInterface extends KeyValueObjectInterface
-+{
-+}
-diff --git a/app/code/Magento/Payment/Gateway/Validator/AbstractValidator.php b/app/code/Magento/Payment/Gateway/Validator/AbstractValidator.php
-index f1a89505141..110fe10ee5c 100644
---- a/app/code/Magento/Payment/Gateway/Validator/AbstractValidator.php
-+++ b/app/code/Magento/Payment/Gateway/Validator/AbstractValidator.php
-@@ -3,11 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Payment\Gateway\Validator;
- 
- /**
-- * Class AbstractValidator
-- * @package Magento\Payment\Gateway\Validator
-+ * Represents a basic validator shell that can create a result
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -33,7 +36,7 @@ abstract class AbstractValidator implements ValidatorInterface
-      * @param bool $isValid
-      * @param array $fails
-      * @param array $errorCodes
--     * @return void
-+     * @return \Magento\Payment\Gateway\Validator\ResultInterface
-      */
-     protected function createResult($isValid, array $fails = [], array $errorCodes = [])
-     {
-diff --git a/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php b/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
-index b7f1368ddab..8ea97d31ed4 100644
---- a/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
-+++ b/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
-@@ -10,10 +10,9 @@ use Magento\Framework\ObjectManager\TMapFactory;
- use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
- 
- /**
-- * Class ValidatorComposite
-- * @package Magento\Payment\Gateway\Validator
-+ * Compiles a result using the results of multiple validators
-+ *
-  * @api
-- * @since 100.0.2
-  */
- class ValidatorComposite extends AbstractValidator
- {
-@@ -22,15 +21,22 @@ class ValidatorComposite extends AbstractValidator
-      */
-     private $validators;
- 
-+    /**
-+     * @var array
-+     */
-+    private $chainBreakingValidators;
-+
-     /**
-      * @param ResultInterfaceFactory $resultFactory
-      * @param TMapFactory $tmapFactory
-      * @param array $validators
-+     * @param array $chainBreakingValidators
-      */
-     public function __construct(
-         ResultInterfaceFactory $resultFactory,
-         TMapFactory $tmapFactory,
--        array $validators = []
-+        array $validators = [],
-+        array $chainBreakingValidators = []
-     ) {
-         $this->validators = $tmapFactory->create(
-             [
-@@ -38,6 +44,7 @@ class ValidatorComposite extends AbstractValidator
-                 'type' => ValidatorInterface::class
-             ]
-         );
-+        $this->chainBreakingValidators = $chainBreakingValidators;
-         parent::__construct($resultFactory);
-     }
- 
-@@ -51,7 +58,8 @@ class ValidatorComposite extends AbstractValidator
-     {
-         $isValid = true;
-         $failsDescriptionAggregate = [];
--        foreach ($this->validators as $validator) {
-+        $errorCodesAggregate = [];
-+        foreach ($this->validators as $key => $validator) {
-             $result = $validator->validate($validationSubject);
-             if (!$result->isValid()) {
-                 $isValid = false;
-@@ -59,9 +67,16 @@ class ValidatorComposite extends AbstractValidator
-                     $failsDescriptionAggregate,
-                     $result->getFailsDescription()
-                 );
-+                $errorCodesAggregate = array_merge(
-+                    $errorCodesAggregate,
-+                    $result->getErrorCodes()
-+                );
-+                if (!empty($this->chainBreakingValidators[$key])) {
-+                    break;
-+                }
-             }
-         }
- 
--        return $this->createResult($isValid, $failsDescriptionAggregate);
-+        return $this->createResult($isValid, $failsDescriptionAggregate, $errorCodesAggregate);
-     }
- }
-diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
-index 0a4990313fa..377dad8a3d2 100644
---- a/app/code/Magento/Payment/Helper/Data.php
-+++ b/app/code/Magento/Payment/Helper/Data.php
-@@ -84,6 +84,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     }
- 
-     /**
-+     * Get config name of method model
-+     *
-      * @param string $code
-      * @return string
-      */
-@@ -147,7 +149,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-             }
-             $res[] = $methodInstance;
-         }
--
-+        // phpcs:ignore Generic.PHP.NoSilencedErrors
-         @uasort(
-             $res,
-             function (MethodInterface $a, MethodInterface $b) {
-@@ -259,11 +261,12 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-         $groupRelations = [];
- 
-         foreach ($this->getPaymentMethods() as $code => $data) {
--            if (isset($data['title'])) {
--                $methods[$code] = $data['title'];
--            } else {
--                $methods[$code] = $this->getMethodInstance($code)->getConfigData('title', $store);
-+            $storeId = $store ? (int)$store->getId() : null;
-+            $storedTitle = $this->getMethodStoreTitle($code, $storeId);
-+            if (!empty($storedTitle)) {
-+                $methods[$code] = $storedTitle;
-             }
-+
-             if ($asLabelValue && $withGroups && isset($data['group'])) {
-                 $groupRelations[$code] = $data['group'];
-             }
-@@ -345,4 +348,21 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-             $store
-         );
-     }
-+
-+    /**
-+     * Get config title of payment method
-+     *
-+     * @param string $code
-+     * @param int|null $storeId
-+     * @return string
-+     */
-+    private function getMethodStoreTitle(string $code, ?int $storeId = null): string
-+    {
-+        $configPath = sprintf('%s/%s/title', self::XML_PATH_PAYMENT_METHODS, $code);
-+        return (string) $this->scopeConfig->getValue(
-+            $configPath,
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-+    }
- }
-diff --git a/app/code/Magento/Payment/Model/CcConfigProvider.php b/app/code/Magento/Payment/Model/CcConfigProvider.php
-index 15bdd0072a5..497ce93c30c 100644
---- a/app/code/Magento/Payment/Model/CcConfigProvider.php
-+++ b/app/code/Magento/Payment/Model/CcConfigProvider.php
-@@ -44,7 +44,7 @@ class CcConfigProvider implements ConfigProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConfig()
-     {
-@@ -69,7 +69,7 @@ class CcConfigProvider implements ConfigProviderInterface
-         }
- 
-         $types = $this->ccConfig->getCcAvailableTypes();
--        foreach (array_keys($types) as $code) {
-+        foreach ($types as $code => $label) {
-             if (!array_key_exists($code, $this->icons)) {
-                 $asset = $this->ccConfig->createAsset('Magento_Payment::images/cc/' . strtolower($code) . '.png');
-                 $placeholder = $this->assetSource->findSource($asset);
-@@ -78,7 +78,8 @@ class CcConfigProvider implements ConfigProviderInterface
-                     $this->icons[$code] = [
-                         'url' => $asset->getUrl(),
-                         'width' => $width,
--                        'height' => $height
-+                        'height' => $height,
-+                        'title' => __($label),
-                     ];
-                 }
-             }
-diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
-index 33200014c7e..c0ccf887b18 100644
---- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
-+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
-@@ -24,7 +24,7 @@ use Magento\Directory\Helper\Data as DirectoryHelper;
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @deprecated 100.0.6
-  * @see \Magento\Payment\Model\Method\Adapter
-- * @see http://devdocs.magento.com/guides/v2.1/payments-integrations/payment-gateway/payment-gateway-intro.html
-+ * @see https://devdocs.magento.com/guides/v2.1/payments-integrations/payment-gateway/payment-gateway-intro.html
-  * @since 100.0.2
-  */
- abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibleModel implements
-@@ -258,7 +258,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
-     }
- 
-     /**
--     * {inheritdoc}
-+     * @inheritdoc
-      * @deprecated 100.2.0
-      */
-     public function setStore($storeId)
-@@ -267,7 +267,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
-     }
- 
-     /**
--     * {inheritdoc}
-+     * @inheritdoc
-      * @deprecated 100.2.0
-      */
-     public function getStore()
-@@ -360,7 +360,8 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
-     }
- 
-     /**
--     * Check void availability
-+     * Check void availability.
-+     *
-      * @return bool
-      * @internal param \Magento\Framework\DataObject $payment
-      * @api
-@@ -372,8 +373,9 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
-     }
- 
-     /**
--     * Using internal pages for input payment data
--     * Can be used in admin
-+     * Using internal pages for input payment data.
-+     *
-+     * Can be used in admin.
-      *
-      * @return bool
-      * @deprecated 100.2.0
-@@ -715,7 +717,8 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
-     }
- 
-     /**
--     * Whether this method can accept or deny payment
-+     * Whether this method can accept or deny payment.
-+     *
-      * @return bool
-      * @api
-      * @deprecated 100.2.0
-@@ -867,8 +870,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
-     }
- 
-     /**
--     * Method that will be executed instead of authorize or capture
--     * if flag isInitializeNeeded set to true
-+     * Method that will be executed instead of authorize or capture if flag isInitializeNeeded set to true.
-      *
-      * @param string $paymentAction
-      * @param object $stateObject
-@@ -884,8 +886,9 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
-     }
- 
-     /**
--     * Get config payment action url
--     * Used to universalize payment actions when processing payment place
-+     * Get config payment action url.
-+     *
-+     * Used to universalize payment actions when processing payment place.
-      *
-      * @return string
-      * @api
-diff --git a/app/code/Magento/Payment/Model/Method/Cc.php b/app/code/Magento/Payment/Model/Method/Cc.php
-index c23ad5b535d..11629308cd4 100644
---- a/app/code/Magento/Payment/Model/Method/Cc.php
-+++ b/app/code/Magento/Payment/Model/Method/Cc.php
-@@ -10,6 +10,8 @@ use Magento\Quote\Api\Data\PaymentInterface;
- use Magento\Quote\Model\Quote\Payment;
- 
- /**
-+ * Credit Card payment method legacy implementation.
-+ *
-  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @deprecated 100.0.8
-@@ -93,6 +95,7 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
-      * @throws \Magento\Framework\Exception\LocalizedException
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-     public function validate()
-     {
-@@ -148,6 +151,22 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
-                     'JCB' => '/^35(2[8-9][0-9]{12,15}|[3-8][0-9]{13,16})/',
-                     'MI' => '/^(5(0|[6-9])|63|67(?!59|6770|6774))\d*$/',
-                     'MD' => '/^(6759(?!24|38|40|6[3-9]|70|76)|676770|676774)\d*$/',
-+
-+                    //Hipercard
-+                    'HC' => '/^((606282)|(637095)|(637568)|(637599)|(637609)|(637612))\d*$/',
-+                    //Elo
-+                    'ELO' => '/^((509091)|(636368)|(636297)|(504175)|(438935)|(40117[8-9])|(45763[1-2])|' .
-+                        '(457393)|(431274)|(50990[0-2])|(5099[7-9][0-9])|(50996[4-9])|(509[1-8][0-9][0-9])|' .
-+                        '(5090(0[0-2]|0[4-9]|1[2-9]|[24589][0-9]|3[1-9]|6[0-46-9]|7[0-24-9]))|' .
-+                        '(5067(0[0-24-8]|1[0-24-9]|2[014-9]|3[0-379]|4[0-9]|5[0-3]|6[0-5]|7[0-8]))|' .
-+                        '(6504(0[5-9]|1[0-9]|2[0-9]|3[0-9]))|' .
-+                        '(6504(8[5-9]|9[0-9])|6505(0[0-9]|1[0-9]|2[0-9]|3[0-8]))|' .
-+                        '(6505(4[1-9]|5[0-9]|6[0-9]|7[0-9]|8[0-9]|9[0-8]))|' .
-+                        '(6507(0[0-9]|1[0-8]))|(65072[0-7])|(6509(0[1-9]|1[0-9]|20))|' .
-+                        '(6516(5[2-9]|6[0-9]|7[0-9]))|(6550(0[0-9]|1[0-9]))|' .
-+                        '(6550(2[1-9]|3[0-9]|4[0-9]|5[0-8])))\d*$/',
-+                    //Aura
-+                    'AU' => '/^5078\d*$/'
-                 ];
- 
-                 $ccNumAndTypeMatches = isset(
-@@ -189,6 +208,8 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
-     }
- 
-     /**
-+     * Check if verification should be used.
-+     *
-      * @return bool
-      * @api
-      */
-@@ -202,6 +223,8 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
-     }
- 
-     /**
-+     * Get list of credit cards verification reg exp.
-+     *
-      * @return array
-      * @api
-      */
-@@ -226,6 +249,8 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
-     }
- 
-     /**
-+     * Validate expiration date
-+     *
-      * @param string $expYear
-      * @param string $expMonth
-      * @return bool
-@@ -276,6 +301,8 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
-     }
- 
-     /**
-+     * Get code for "other" credit cards.
-+     *
-      * @param string $type
-      * @return bool
-      * @api
-diff --git a/app/code/Magento/Payment/Model/PaymentAdditionalInfo.php b/app/code/Magento/Payment/Model/PaymentAdditionalInfo.php
-new file mode 100644
-index 00000000000..c4f135d5e00
---- /dev/null
-+++ b/app/code/Magento/Payment/Model/PaymentAdditionalInfo.php
-@@ -0,0 +1,60 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Payment\Model;
-+
-+use Magento\Payment\Api\Data\PaymentAdditionalInfoInterface;
-+
-+/**
-+ * Payment additional info class.
-+ */
-+class PaymentAdditionalInfo implements PaymentAdditionalInfoInterface
-+{
-+    /**
-+     * @var string
-+     */
-+    private $key;
-+
-+    /**
-+     * @var string
-+     */
-+    private $value;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getKey()
-+    {
-+        return $this->key;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getValue()
-+    {
-+        return $this->value;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setKey($key)
-+    {
-+        $this->key = $key;
-+        return $key;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setValue($value)
-+    {
-+        $this->value = $value;
-+        return $value;
-+    }
-+}
-diff --git a/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php b/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php
-index ed8185e6ded..62c1cc15bad 100644
---- a/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php
-+++ b/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php
-@@ -8,6 +8,9 @@ namespace Magento\Payment\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
- 
-+/**
-+ * Verify order payment observer
-+ */
- class SalesOrderBeforeSaveObserver implements ObserverInterface
- {
-     /**
-@@ -15,12 +18,19 @@ class SalesOrderBeforeSaveObserver implements ObserverInterface
-      *
-      * @param \Magento\Framework\Event\Observer $observer
-      * @return $this
-+     * @throws \Magento\Framework\Exception\LocalizedException in case order has no payment specified.
-      */
-     public function execute(\Magento\Framework\Event\Observer $observer)
-     {
-         /** @var \Magento\Sales\Model\Order $order */
-         $order = $observer->getEvent()->getOrder();
- 
-+        if (!$order->getPayment()) {
-+            throw new \Magento\Framework\Exception\LocalizedException(
-+                __('Please provide payment for the order.')
-+            );
-+        }
-+
-         if ($order->getPayment()->getMethodInstance()->getCode() != 'free') {
-             return $this;
-         }
-diff --git a/app/code/Magento/Payment/Test/Mftf/ActionGroup/ApplyCouponOnPaymentPageActionGroup.xml b/app/code/Magento/Payment/Test/Mftf/ActionGroup/ApplyCouponOnPaymentPageActionGroup.xml
-new file mode 100644
-index 00000000000..59e44271854
---- /dev/null
-+++ b/app/code/Magento/Payment/Test/Mftf/ActionGroup/ApplyCouponOnPaymentPageActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="ApplyCouponOnPaymentPageActionGroup">
-+        <arguments>
-+            <argument name="couponCode" type="string"/>
-+        </arguments>
-+        <click selector="{{ProductCardSection.addCoupon}}" stepKey="clickToAddDiscount"/>
-+        <fillField selector="{{ProductCardSection.addCode}}" userInput="{{couponCode}}" stepKey="TypeDiscountCode"/>
-+        <click selector="{{ProductCardSection.applyDiscount}}" stepKey="clickToApplyDiscount"/>
-+        <waitForPageLoad stepKey="WaitForDiscountToBeAdded"/>
-+        <see selector="{{ProductCardSection.discountVerificationMsg}}" userInput="Your coupon was successfully applied" stepKey="discountApplyMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Payment/Test/Mftf/Data/PaymentConfigData.xml b/app/code/Magento/Payment/Test/Mftf/Data/PaymentConfigData.xml
-new file mode 100644
-index 00000000000..510199673da
---- /dev/null
-+++ b/app/code/Magento/Payment/Test/Mftf/Data/PaymentConfigData.xml
-@@ -0,0 +1,72 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="EnablePaymentCheckMOConfigData">
-+        <data key="path">payment/checkmo/active</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="DisablePaymentCheckMOConfigData">
-+        <data key="path">payment/checkmo/active</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="EnablePaymentBankTransferConfigData">
-+        <data key="path">payment/banktransfer/active</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="DisablePaymentBankTransferConfigData">
-+        <data key="path">payment/banktransfer/active</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="EnableZeroSubtotalCheckoutConfigData">
-+        <!--Default Data-->
-+        <data key="path">payment/free/active</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="DisableZeroSubtotalCheckoutConfigData">
-+        <data key="path">payment/free/active</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="EnableCashOnDeliveryConfigData">
-+        <data key="path">payment/cashondelivery/active</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="DisableCashOnDeliveryConfigData">
-+        <data key="path">payment/cashondelivery/active</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="EnablePurchaseOrderConfigData">
-+        <data key="path">payment/purchaseorder/active</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="DisablePurchaseOrderConfigData">
-+        <data key="path">payment/purchaseorder/active</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-\ No newline at end of file
-diff --git a/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodConfigData.xml b/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodConfigData.xml
-new file mode 100644
-index 00000000000..3fd2d1b068b
---- /dev/null
-+++ b/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodConfigData.xml
-@@ -0,0 +1,47 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="BankTransferEnableConfigData">
-+        <data key="path">payment/banktransfer/active</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="BankTransferDisabledConfigData">
-+        <data key="path">payment/banktransfer/active</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="PurchaseOrderEnableConfigData">
-+        <data key="path">payment/purchaseorder/active</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="PurchaseOrderDisabledConfigData">
-+        <data key="path">payment/purchaseorder/active</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="CashOnDeliveryEnableConfigData">
-+        <data key="path">payment/cashondelivery/active</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="CashOnDeliveryDisabledConfigData">
-+        <data key="path">payment/cashondelivery/active</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml b/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml
-index feaff74a3a9..14c8bd0fecd 100644
---- a/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml
-+++ b/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="PaymentMethodCheckMoneyOrder" type="payment_method">
-         <data key="method">checkmo</data>
-     </entity>
-diff --git a/app/code/Magento/Payment/Test/Mftf/Metadata/payment_method-meta.xml b/app/code/Magento/Payment/Test/Mftf/Metadata/payment_method-meta.xml
-index eb5f272e25e..39506a68203 100644
---- a/app/code/Magento/Payment/Test/Mftf/Metadata/payment_method-meta.xml
-+++ b/app/code/Magento/Payment/Test/Mftf/Metadata/payment_method-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreatePaymentMethod" dataType="payment_method" type="create">
-         <field key="method">string</field>
-     </operation>
-diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorCompositeTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorCompositeTest.php
-index 7352cb7a4ac..5dec99e2a4b 100644
---- a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorCompositeTest.php
-+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorCompositeTest.php
-@@ -13,9 +13,9 @@ class ValidatorCompositeTest extends \PHPUnit\Framework\TestCase
-     public function testValidate()
-     {
-         $validationSubject = [];
--        $validator1 = $this->getMockBuilder(\Magento\Payment\Gateway\Validator\ValidatorInterface::class)
-+        $validator1 = $this->getMockBuilder(ValidatorInterface::class)
-             ->getMockForAbstractClass();
--        $validator2 = $this->getMockBuilder(\Magento\Payment\Gateway\Validator\ValidatorInterface::class)
-+        $validator2 = $this->getMockBuilder(ValidatorInterface::class)
-             ->getMockForAbstractClass();
-         $tMapFactory = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMapFactory::class)
-             ->disableOriginalConstructor()
-@@ -30,8 +30,8 @@ class ValidatorCompositeTest extends \PHPUnit\Framework\TestCase
-             ->with(
-                 [
-                     'array' => [
--                        'validator1' => \Magento\Payment\Gateway\Validator\ValidatorInterface::class,
--                        'validator2' => \Magento\Payment\Gateway\Validator\ValidatorInterface::class
-+                        'validator1' => ValidatorInterface::class,
-+                        'validator2' => ValidatorInterface::class
-                     ],
-                     'type' => ValidatorInterface::class
-                 ]
-@@ -54,6 +54,9 @@ class ValidatorCompositeTest extends \PHPUnit\Framework\TestCase
-         $resultFail->expects(static::once())
-             ->method('getFailsDescription')
-             ->willReturn(['Fail']);
-+        $resultFail->expects(static::once())
-+            ->method('getErrorCodes')
-+            ->willReturn(['abc123']);
- 
-         $validator1->expects(static::once())
-             ->method('validate')
-@@ -76,7 +79,7 @@ class ValidatorCompositeTest extends \PHPUnit\Framework\TestCase
-                 [
-                     'isValid' => false,
-                     'failsDescription' => ['Fail'],
--                    'errorCodes' => []
-+                    'errorCodes' => ['abc123']
-                 ]
-             )
-             ->willReturn($compositeResult);
-@@ -85,10 +88,91 @@ class ValidatorCompositeTest extends \PHPUnit\Framework\TestCase
-             $resultFactory,
-             $tMapFactory,
-             [
--                'validator1' => \Magento\Payment\Gateway\Validator\ValidatorInterface::class,
--                'validator2' => \Magento\Payment\Gateway\Validator\ValidatorInterface::class
-+                'validator1' => ValidatorInterface::class,
-+                'validator2' => ValidatorInterface::class
-             ]
-         );
-         static::assertSame($compositeResult, $validatorComposite->validate($validationSubject));
-     }
-+
-+    public function testValidateChainBreaksCorrectly()
-+    {
-+        $validationSubject = [];
-+        $validator1 = $this->getMockBuilder(ValidatorInterface::class)
-+            ->getMockForAbstractClass();
-+        $validator2 = $this->getMockBuilder(ValidatorInterface::class)
-+            ->getMockForAbstractClass();
-+        $tMapFactory = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMapFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $tMap = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMap::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $tMapFactory->expects($this->once())
-+            ->method('create')
-+            ->with(
-+                [
-+                    'array' => [
-+                        'validator1' => ValidatorInterface::class,
-+                        'validator2' => ValidatorInterface::class
-+                    ],
-+                    'type' => ValidatorInterface::class
-+                ]
-+            )
-+            ->willReturn($tMap);
-+        $tMap->expects($this->once())
-+            ->method('getIterator')
-+            ->willReturn(new \ArrayIterator([$validator1, $validator2]));
-+
-+        $resultFail = $this->getMockBuilder(\Magento\Payment\Gateway\Validator\ResultInterface::class)
-+            ->getMockForAbstractClass();
-+        $resultFail->expects($this->once())
-+            ->method('isValid')
-+            ->willReturn(false);
-+        $resultFail->expects($this->once())
-+            ->method('getFailsDescription')
-+            ->willReturn(['Fail']);
-+        $resultFail->expects($this->once())
-+            ->method('getErrorCodes')
-+            ->willReturn(['abc123']);
-+
-+        $validator1->expects($this->once())
-+            ->method('validate')
-+            ->with($validationSubject)
-+            ->willReturn($resultFail);
-+
-+        // Assert this is never called
-+        $validator2->expects($this->never())
-+            ->method('validate');
-+
-+        $compositeResult = $this->getMockBuilder(\Magento\Payment\Gateway\Validator\ResultInterface::class)
-+            ->getMockForAbstractClass();
-+        $resultFactory = $this->getMockBuilder(\Magento\Payment\Gateway\Validator\ResultInterfaceFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $resultFactory->expects($this->once())
-+            ->method('create')
-+            ->with(
-+                [
-+                    'isValid' => false,
-+                    'failsDescription' => ['Fail'],
-+                    'errorCodes' => ['abc123']
-+                ]
-+            )
-+            ->willReturn($compositeResult);
-+
-+        $validatorComposite = new ValidatorComposite(
-+            $resultFactory,
-+            $tMapFactory,
-+            [
-+                'validator1' => ValidatorInterface::class,
-+                'validator2' => ValidatorInterface::class
-+            ],
-+            ['validator1']
-+        );
-+        $this->assertSame($compositeResult, $validatorComposite->validate($validationSubject));
-+    }
- }
-diff --git a/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php b/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php
-index a8856166995..ff6aea44645 100644
---- a/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php
-+++ b/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php
-@@ -42,12 +42,14 @@ class CcConfigProviderTest extends \PHPUnit\Framework\TestCase
-                         'vi' => [
-                             'url' => 'http://cc.card/vi.png',
-                             'width' => getimagesize($imagesDirectoryPath . 'vi.png')[0],
--                            'height' => getimagesize($imagesDirectoryPath . 'vi.png')[1]
-+                            'height' => getimagesize($imagesDirectoryPath . 'vi.png')[1],
-+                            'title' => __('Visa'),
-                         ],
-                         'ae' => [
-                             'url' => 'http://cc.card/ae.png',
-                             'width' => getimagesize($imagesDirectoryPath . 'ae.png')[0],
--                            'height' => getimagesize($imagesDirectoryPath . 'ae.png')[1]
-+                            'height' => getimagesize($imagesDirectoryPath . 'ae.png')[1],
-+                            'title' => __('American Express'),
-                         ]
-                     ]
-                 ]
-@@ -56,11 +58,13 @@ class CcConfigProviderTest extends \PHPUnit\Framework\TestCase
- 
-         $ccAvailableTypesMock = [
-             'vi' => [
-+                'title' => 'Visa',
-                 'fileId' => 'Magento_Payment::images/cc/vi.png',
-                 'path' => $imagesDirectoryPath . 'vi.png',
-                 'url' => 'http://cc.card/vi.png'
-             ],
-             'ae' => [
-+                'title' => 'American Express',
-                 'fileId' => 'Magento_Payment::images/cc/ae.png',
-                 'path' => $imagesDirectoryPath . 'ae.png',
-                 'url' => 'http://cc.card/ae.png'
-@@ -68,7 +72,11 @@ class CcConfigProviderTest extends \PHPUnit\Framework\TestCase
-         ];
-         $assetMock = $this->createMock(\Magento\Framework\View\Asset\File::class);
- 
--        $this->ccConfigMock->expects($this->once())->method('getCcAvailableTypes')->willReturn($ccAvailableTypesMock);
-+        $this->ccConfigMock->expects($this->once())->method('getCcAvailableTypes')
-+            ->willReturn(array_combine(
-+                array_keys($ccAvailableTypesMock),
-+                array_column($ccAvailableTypesMock, 'title')
-+            ));
- 
-         $this->ccConfigMock->expects($this->atLeastOnce())
-             ->method('createAsset')
-diff --git a/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php b/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
-index b86fbc6b182..75916dd2ea9 100644
---- a/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
-+++ b/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
-@@ -61,7 +61,7 @@ class SalesOrderBeforeSaveObserverTest extends \PHPUnit\Framework\TestCase
-         $paymentMock = $this->getMockBuilder(
-             \Magento\Sales\Model\Order\Payment::class
-         )->disableOriginalConstructor()->setMethods([])->getMock();
--        $order->expects($this->once())->method('getPayment')->will($this->returnValue($paymentMock));
-+        $order->method('getPayment')->will($this->returnValue($paymentMock));
-         $methodInstance = $this->getMockBuilder(
-             \Magento\Payment\Model\MethodInterface::class
-         )->getMockForAbstractClass();
-@@ -86,7 +86,7 @@ class SalesOrderBeforeSaveObserverTest extends \PHPUnit\Framework\TestCase
-         $paymentMock = $this->getMockBuilder(
-             \Magento\Sales\Model\Order\Payment::class
-         )->disableOriginalConstructor()->setMethods([])->getMock();
--        $order->expects($this->once())->method('getPayment')->will($this->returnValue($paymentMock));
-+        $order->method('getPayment')->will($this->returnValue($paymentMock));
-         $methodInstance = $this->getMockBuilder(
-             \Magento\Payment\Model\MethodInterface::class
-         )->getMockForAbstractClass();
-@@ -114,7 +114,7 @@ class SalesOrderBeforeSaveObserverTest extends \PHPUnit\Framework\TestCase
-         $paymentMock = $this->getMockBuilder(
-             \Magento\Sales\Model\Order\Payment::class
-         )->disableOriginalConstructor()->setMethods([])->getMock();
--        $order->expects($this->once())->method('getPayment')->will($this->returnValue($paymentMock));
-+        $order->method('getPayment')->will($this->returnValue($paymentMock));
-         $methodInstance = $this->getMockBuilder(
-             \Magento\Payment\Model\MethodInterface::class
-         )->getMockForAbstractClass();
-@@ -156,6 +156,29 @@ class SalesOrderBeforeSaveObserverTest extends \PHPUnit\Framework\TestCase
-         $this->salesOrderBeforeSaveObserver->execute($this->observerMock);
-     }
- 
-+    /**
-+     * The method should check that the payment is available, as this is not always the case.
-+     *
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Please provide payment for the order.
-+     */
-+    public function testDoesNothingWhenNoPaymentIsAvailable()
-+    {
-+        $this->_prepareEventMockWithMethods(['getOrder']);
-+
-+        $order = $this->getMockBuilder(\Magento\Sales\Model\Order::class)->disableOriginalConstructor()->setMethods(
-+            array_merge(['__wakeup', 'getPayment'])
-+        )->getMock();
-+
-+        $this->eventMock->expects($this->once())->method('getOrder')->will(
-+            $this->returnValue($order)
-+        );
-+
-+        $order->expects($this->exactly(1))->method('getPayment')->willReturn(null);
-+
-+        $this->salesOrderBeforeSaveObserver->execute($this->observerMock);
-+    }
-+
-     /**
-      * Prepares EventMock with set of methods
-      *
-@@ -184,7 +207,7 @@ class SalesOrderBeforeSaveObserverTest extends \PHPUnit\Framework\TestCase
-         $paymentMock = $this->getMockBuilder(
-             \Magento\Sales\Model\Order\Payment::class
-         )->disableOriginalConstructor()->setMethods([])->getMock();
--        $order->expects($this->once())->method('getPayment')->will($this->returnValue($paymentMock));
-+        $order->method('getPayment')->will($this->returnValue($paymentMock));
-         $methodInstance = $this->getMockBuilder(
-             \Magento\Payment\Model\MethodInterface::class
-         )->getMockForAbstractClass();
-diff --git a/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php b/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
-index 5afaa9fcf97..fbf80de519f 100644
---- a/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
-+++ b/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
-@@ -25,8 +25,9 @@ class Options implements \Magento\Framework\Data\OptionSourceInterface
-      *
-      * @param \Magento\Payment\Helper\Data $paymentHelper
-      */
--    public function __construct(\Magento\Payment\Helper\Data $paymentHelper)
--    {
-+    public function __construct(
-+        \Magento\Payment\Helper\Data $paymentHelper
-+    ) {
-         $this->paymentHelper = $paymentHelper;
-     }
- 
-diff --git a/app/code/Magento/Payment/etc/config.xml b/app/code/Magento/Payment/etc/config.xml
-index 9fe859c96a9..663734fb066 100644
---- a/app/code/Magento/Payment/etc/config.xml
-+++ b/app/code/Magento/Payment/etc/config.xml
-@@ -13,6 +13,7 @@
-                 <model>Magento\Payment\Model\Method\Free</model>
-                 <order_status>pending</order_status>
-                 <title>No Payment Information Required</title>
-+                <payment_action>authorize</payment_action>
-                 <allowspecific>0</allowspecific>
-                 <sort_order>1</sort_order>
-             </free>
-diff --git a/app/code/Magento/Payment/etc/di.xml b/app/code/Magento/Payment/etc/di.xml
-index 74f553cc640..b7422bb00d5 100644
---- a/app/code/Magento/Payment/etc/di.xml
-+++ b/app/code/Magento/Payment/etc/di.xml
-@@ -7,6 +7,7 @@
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-     <preference for="Magento\Payment\Api\Data\PaymentMethodInterface" type="Magento\Payment\Model\PaymentMethod"/>
-+    <preference for="Magento\Payment\Api\Data\PaymentAdditionalInfoInterface" type="Magento\Payment\Model\PaymentAdditionalInfo"/>
-     <preference for="Magento\Payment\Api\PaymentMethodListInterface" type="Magento\Payment\Model\PaymentMethodList"/>
-     <preference for="Magento\Payment\Gateway\Validator\ResultInterface" type="Magento\Payment\Gateway\Validator\Result"/>
-     <preference for="Magento\Payment\Gateway\ConfigFactoryInterface" type="Magento\Payment\Gateway\Config\ConfigFactory" />
-diff --git a/app/code/Magento/Payment/etc/payment.xml b/app/code/Magento/Payment/etc/payment.xml
-index 19b5eb709c6..4afb6b01b36 100644
---- a/app/code/Magento/Payment/etc/payment.xml
-+++ b/app/code/Magento/Payment/etc/payment.xml
-@@ -41,5 +41,14 @@
-         <type id="MD" order="100">
-             <label>Maestro Domestic</label>
-         </type>
-+        <type id="HC" order="110">
-+            <label>Hipercard</label>
-+        </type>
-+        <type id="ELO" order="120">
-+            <label>Elo</label>
-+        </type>
-+        <type id="AU" order="130">
-+            <label>Aura</label>
-+        </type>
-     </credit_cards>
- </payment>
-diff --git a/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
-index 8e4127c4cbb..678bde815d3 100644
---- a/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
-+++ b/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Payment\Block\Adminhtml\Transparent\Form $block
-  */
-@@ -23,8 +22,8 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
-             <select id="<?= /* @noEscape */ $code ?>_cc_type" name="payment[cc_type]"
-                     class="required-entry validate-cc-type-select admin__control-select">
-                 <option value=""></option>
--                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
--                    <option value="<?= $block->escapeHtml($typeCode) ?>" <?php if ($typeCode == $ccType): ?>selected="selected"<?php endif ?>>
-+                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
-+                    <option value="<?= $block->escapeHtml($typeCode) ?>" <?php if ($typeCode == $ccType) : ?>selected="selected"<?php endif ?>>
-                         <?= $block->escapeHtml($typeName) ?>
-                     </option>
-                 <?php endforeach ?>
-@@ -48,18 +47,18 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
-         <div class="admin__field-control">
-             <select id="<?= /* @noEscape */ $code ?>_expiration" name="payment[cc_exp_month]"
-                     class="admin__control-select admin__control-select-month validate-cc-exp required-entry">
--                <?php foreach ($block->getCcMonths() as $k => $v): ?>
-+                <?php foreach ($block->getCcMonths() as $k => $v) : ?>
-                     <option value="<?= $block->escapeHtml($k) ?>"
--                            <?php if ($k == $ccExpMonth): ?>selected="selected"<?php endif ?>>
-+                            <?php if ($k == $ccExpMonth) : ?>selected="selected"<?php endif ?>>
-                         <?= $block->escapeHtml($v) ?>
-                     </option>
-                 <?php endforeach; ?>
-             </select>
-             <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
-                     class="admin__control-select admin__control-select-year required-entry">
--                <?php foreach ($block->getCcYears() as $k => $v): ?>
-+                <?php foreach ($block->getCcYears() as $k => $v) : ?>
-                     <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
--                            <?php if ($k == $ccExpYear): ?>selected="selected"<?php endif ?>>
-+                            <?php if ($k == $ccExpYear) : ?>selected="selected"<?php endif ?>>
-                         <?= $block->escapeHtml($v) ?>
-                     </option>
-                 <?php endforeach ?>
-@@ -67,7 +66,7 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
-         </div>
-     </div>
- 
--    <?php if ($block->hasVerification()): ?>
-+    <?php if ($block->hasVerification()) : ?>
-         <div class="field-number required admin__field _required">
-             <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_cid">
-                 <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
-diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
-index 3c55e97ec58..8b9c37f1125 100644
---- a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
-+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Payment\Block\Info $block
-  * @see \Magento\Payment\Block\Info
-@@ -13,9 +12,9 @@ $specificInfo = $block->getSpecificInformation();
- ?>
- <?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
- 
--<?php if ($specificInfo): ?>
-+<?php if ($specificInfo) : ?>
-     <table class="data-table admin__table-secondary">
--    <?php foreach ($specificInfo as $label => $value):?>
-+    <?php foreach ($specificInfo as $label => $value) : ?>
-         <tr>
-             <th><?= $block->escapeHtml($label) ?>:</th>
-             <td>
-diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
-index e95237cc820..f60c1d063ad 100644
---- a/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
-+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
-@@ -4,14 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Payment\Block\Info $block
-  * @see \Magento\Payment\Block\Info
-  */
- ?>
- <p><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></p>
--<?php if ($block->getInstructions()): ?>
-+<?php if ($block->getInstructions()) : ?>
-     <table>
-         <tbody>
-             <tr>
-diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
-index 7acac62f65d..a8583ea5549 100644
---- a/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
-+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @see \Magento\Payment\Block\Info
-  * @var \Magento\Payment\Block\Info $block
-@@ -12,8 +11,8 @@
- ?>
- <?= $block->escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
- 
--<?php if ($specificInfo = $block->getSpecificInformation()):?>
--    <?php foreach ($specificInfo as $label => $value):?>
-+<?php if ($specificInfo = $block->getSpecificInformation()) : ?>
-+    <?php foreach ($specificInfo as $label => $value) : ?>
-         <?= $block->escapeHtml($label) ?>:
-         <?= $block->escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
-         {{pdf_row_separator}}
-diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
-index 582b8ca8a24..d187b64683e 100644
---- a/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
-+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Payment\Block\Info $block
-  */
-diff --git a/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml b/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
-index 5b65bbaa3d9..36b8c978c33 100644
---- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
-+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Payment\Block\Transparent\Form $block */
- $code = $block->escapeHtml($block->getMethodCode());
- $ccType = $block->getInfoData('cc_type');
-@@ -48,9 +46,9 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
-                     data-validate='{required:true, "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"}'
-                     class="admin__control-select">
-                 <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
--                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-+                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
-                     <option
--                        value="<?= $block->escapeHtml($typeCode) ?>"<?php if ($typeCode == $ccType): ?> selected="selected"<?php endif ?>>
-+                        value="<?= $block->escapeHtml($typeCode) ?>"<?php if ($typeCode == $ccType) : ?> selected="selected"<?php endif ?>>
-                         <?= $block->escapeHtml($typeName) ?>
-                     </option>
-                 <?php endforeach ?>
-@@ -88,10 +86,10 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
-                     data-container="<?= /* @noEscape */ $code ?>-cc-month"
-                     class="admin__control-select admin__control-select-month"
-                     data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"}'>
--                <?php foreach ($block->getCcMonths() as $k => $v): ?>
-+                <?php foreach ($block->getCcMonths() as $k => $v) : ?>
-                     <option
-                         value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
--                        <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
-+                        <?php if ($k == $ccExpMonth) : ?> selected="selected"<?php endif; ?>>
-                         <?= $block->escapeHtml($v) ?>
-                     </option>
-                 <?php endforeach ?>
-@@ -100,17 +98,17 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
-             <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
-                     class="admin__control-select admin__control-select-year"
-                     data-container="<?= /* @noEscape */ $code ?>-cc-year" data-validate='{required:true}'>
--                <?php foreach ($block->getCcYears() as $k => $v): ?>
-+                <?php foreach ($block->getCcYears() as $k => $v) : ?>
-                     <option
-                         value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
--                        <?php if ($k == $ccExpYear): ?> selected="selected"<?php endif ?>>
-+                        <?php if ($k == $ccExpYear) : ?> selected="selected"<?php endif ?>>
-                         <?= $block->escapeHtml($v) ?>
-                     </option>
-                 <?php endforeach ?>
-             </select>
-         </div>
-     </div>
--    <?php if ($block->hasVerification()): ?>
-+    <?php if ($block->hasVerification()) : ?>
-         <div class="admin__field _required field-cvv" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
-             <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="admin__field-label">
-                 <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
-diff --git a/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
-index 8ef51d4794f..ece7106e912 100644
---- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
-+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Payment\Block\Transparent\Iframe $block
-  */
-@@ -14,15 +13,15 @@ $params = $block->getParams();
- <html>
- <head>
- <script>
--<?php if (isset($params['redirect'])): ?>
-+<?php if (isset($params['redirect'])) : ?>
-     window.location="<?= $block->escapeUrl($params['redirect']) ?>";
--<?php elseif (isset($params['redirect_parent'])): ?>
-+<?php elseif (isset($params['redirect_parent'])) : ?>
-     window.top.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
--<?php elseif (isset($params['error_msg'])): ?>
--    window.top.alert(<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($params['error_msg']) ?>);
--<?php elseif (isset($params['order_success'])): ?>
-+<?php elseif (isset($params['error_msg'])) : ?>
-+    window.top.alert(<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($params['error_msg']) ?>);
-+<?php elseif (isset($params['order_success'])) : ?>
-     window.top.location = "<?= $block->escapeUrl($params['order_success']) ?>";
--<?php else: ?>
-+<?php else : ?>
-     var require = window.top.require;
-     require(['jquery'], function($) {
-         $('#edit_form').trigger('processStop');
-diff --git a/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml b/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
-index 636779667f2..fb06f1a4dbf 100644
---- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
-+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var \Magento\Payment\Block\Transparent\Info $block
-  * @see \Magento\Payment\Block\Transparent\Info
-diff --git a/app/code/Magento/Payment/view/adminhtml/web/transparent.js b/app/code/Magento/Payment/view/adminhtml/web/js/transparent.js
-similarity index 100%
-rename from app/code/Magento/Payment/view/adminhtml/web/transparent.js
-rename to app/code/Magento/Payment/view/adminhtml/web/js/transparent.js
-diff --git a/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml
-new file mode 100644
-index 00000000000..a8583ea5549
---- /dev/null
-+++ b/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/**
-+ * @see \Magento\Payment\Block\Info
-+ * @var \Magento\Payment\Block\Info $block
-+ */
-+?>
-+<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
-+
-+<?php if ($specificInfo = $block->getSpecificInformation()) : ?>
-+    <?php foreach ($specificInfo as $label => $value) : ?>
-+        <?= $block->escapeHtml($label) ?>:
-+        <?= $block->escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
-+        {{pdf_row_separator}}
-+    <?php endforeach; ?>
-+<?php endif;?>
-+
-+<?= $block->escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())) ?>
-diff --git a/app/code/Magento/Payment/view/base/web/images/cc/au.png b/app/code/Magento/Payment/view/base/web/images/cc/au.png
-new file mode 100644
-index 00000000000..04cb2df8fa3
-Binary files /dev/null and b/app/code/Magento/Payment/view/base/web/images/cc/au.png differ
-diff --git a/app/code/Magento/Payment/view/base/web/images/cc/elo.png b/app/code/Magento/Payment/view/base/web/images/cc/elo.png
-new file mode 100644
-index 00000000000..eba0296a091
-Binary files /dev/null and b/app/code/Magento/Payment/view/base/web/images/cc/elo.png differ
-diff --git a/app/code/Magento/Payment/view/base/web/images/cc/hc.png b/app/code/Magento/Payment/view/base/web/images/cc/hc.png
-new file mode 100644
-index 00000000000..203e0b7e305
-Binary files /dev/null and b/app/code/Magento/Payment/view/base/web/images/cc/hc.png differ
-diff --git a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js
-index 8fb12093e36..b459b3598a8 100644
---- a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js
-+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js
-@@ -36,7 +36,7 @@ define([
-             return resultWrapper(null, false, false);
-         }
- 
--        value = value.replace(/\-|\s/g, '');
-+        value = value.replace(/\s+/g, '');
- 
-         if (!/^\d*$/.test(value)) {
-             return resultWrapper(null, false, false);
-diff --git a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js
-index 3ac67f6f310..1b387b38410 100644
---- a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js
-+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js
-@@ -110,6 +110,48 @@ define([
-                 name: 'CVC',
-                 size: 3
-             }
-+        },
-+        {
-+            title: 'Hipercard',
-+            type: 'HC',
-+            pattern: '^((606282)|(637095)|(637568)|(637599)|(637609)|(637612))\\d*$',
-+            gaps: [4, 8, 12],
-+            lengths: [13, 16],
-+            code: {
-+                name: 'CVC',
-+                size: 3
-+            }
-+        },
-+        {
-+            title: 'Elo',
-+            type: 'ELO',
-+            pattern: '^((509091)|(636368)|(636297)|(504175)|(438935)|(40117[8-9])|(45763[1-2])|' +
-+                '(457393)|(431274)|(50990[0-2])|(5099[7-9][0-9])|(50996[4-9])|(509[1-8][0-9][0-9])|' +
-+                '(5090(0[0-2]|0[4-9]|1[2-9]|[24589][0-9]|3[1-9]|6[0-46-9]|7[0-24-9]))|' +
-+                '(5067(0[0-24-8]|1[0-24-9]|2[014-9]|3[0-379]|4[0-9]|5[0-3]|6[0-5]|7[0-8]))|' +
-+                '(6504(0[5-9]|1[0-9]|2[0-9]|3[0-9]))|' +
-+                '(6504(8[5-9]|9[0-9])|6505(0[0-9]|1[0-9]|2[0-9]|3[0-8]))|' +
-+                '(6505(4[1-9]|5[0-9]|6[0-9]|7[0-9]|8[0-9]|9[0-8]))|' +
-+                '(6507(0[0-9]|1[0-8]))|(65072[0-7])|(6509(0[1-9]|1[0-9]|20))|' +
-+                '(6516(5[2-9]|6[0-9]|7[0-9]))|(6550(0[0-9]|1[0-9]))|' +
-+                '(6550(2[1-9]|3[0-9]|4[0-9]|5[0-8])))\\d*$',
-+            gaps: [4, 8, 12],
-+            lengths: [16],
-+            code: {
-+                name: 'CVC',
-+                size: 3
-+            }
-+        },
-+        {
-+            title: 'Aura',
-+            type: 'AU',
-+            pattern: '^5078\\d*$',
-+            gaps: [4, 8, 12],
-+            lengths: [19],
-+            code: {
-+                name: 'CVC',
-+                size: 3
-+            }
-         }
-     ];
- 
-diff --git a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/cvv-validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/cvv-validator.js
-index c22121622d2..7651fba1090 100644
---- a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/cvv-validator.js
-+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/cvv-validator.js
-@@ -21,7 +21,7 @@ define([], function () {
- 
-     /**
-      * CVV number validation.
--     * Validate digit count fot CVV code.
-+     * Validate digit count for CVV code.
-      *
-      * @param {*} value
-      * @param {Number} maxLength
-diff --git a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
-index c6f1bad31fc..c41be40cba1 100644
---- a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
-+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
-@@ -23,6 +23,12 @@
- }(function ($, cvvValidator, creditCardNumberValidator, yearValidator, monthValidator, creditCardData) {
-     'use strict';
- 
-+    $('.payment-method-content input[type="number"]').on('keyup', function () {
-+        if ($(this).val() < 0) {
-+            $(this).val($(this).val().replace(/^-/, ''));
-+        }
-+    });
-+
-     $.each({
-         'validate-card-type': [
-             function (number, item, allowedTypes) {
-diff --git a/app/code/Magento/Payment/view/frontend/requirejs-config.js b/app/code/Magento/Payment/view/frontend/requirejs-config.js
-index 70f93854ead..949b1554a6f 100644
---- a/app/code/Magento/Payment/view/frontend/requirejs-config.js
-+++ b/app/code/Magento/Payment/view/frontend/requirejs-config.js
-@@ -6,7 +6,8 @@
- var config = {
-     map: {
-         '*': {
--            creditCardType: 'Magento_Payment/cc-type'
-+            creditCardType: 'Magento_Payment/js/cc-type',
-+            'Magento_Payment/cc-type': 'Magento_Payment/js/cc-type'
-         }
-     }
- };
-diff --git a/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml b/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
-index 926139e60c9..5f61a3ee1d4 100644
---- a/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
-+++ b/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Payment\Block\Transparent\Form $block
-  */
-@@ -30,9 +29,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
-                     }'
-                     class="select">
-                 <option value=""><?= $block->escapeHtml(__('--Please Select--')) ?></option>
--            <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-+            <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
-                 <option value="<?= $block->escapeHtml($typeCode) ?>"
--                    <?php if ($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
-+                    <?php if ($typeCode == $ccType) : ?> selected="selected"<?php endif; ?>>
-                     <?= $block->escapeHtml($typeName) ?>
-                 </option>
-             <?php endforeach; ?>
-@@ -63,9 +62,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
-                     <div class="control">
-                         <select id="<?= /* @noEscape */ $code ?>_expiration" name="payment[cc_exp_month]" class="select month"
-                                 data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"}'>
--                            <?php foreach ($block->getCcMonths() as $k => $v): ?>
-+                            <?php foreach ($block->getCcMonths() as $k => $v) : ?>
-                                 <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
--                                    <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
-+                                    <?php if ($k == $ccExpMonth) : ?> selected="selected"<?php endif; ?>>
-                                     <?= $block->escapeHtml($v) ?>
-                                 </option>
-                             <?php endforeach; ?>
-@@ -76,9 +75,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
-                     <div class="control">
-                         <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
-                                 class="select year" data-validate='{required:true}'>
--                            <?php foreach ($block->getCcYears() as $k => $v): ?>
-+                            <?php foreach ($block->getCcYears() as $k => $v) : ?>
-                                 <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>
--                                "<?php if ($k == $ccExpYear): ?> selected="selected"<?php endif; ?>>
-+                                "<?php if ($k == $ccExpYear) : ?> selected="selected"<?php endif; ?>>
-                                     <?= $block->escapeHtml($v) ?>
-                                 </option>
-                             <?php endforeach; ?>
-@@ -88,7 +87,7 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
-             </div>
-         </div>
-     </div>
--    <?php if ($block->hasVerification()): ?>
-+    <?php if ($block->hasVerification()) : ?>
-     <div class="field cvv required" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
-         <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="label">
-             <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
-diff --git a/app/code/Magento/Payment/view/frontend/templates/info/default.phtml b/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
-index a6311b8ca0d..8649c0416f1 100644
---- a/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
-+++ b/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var \Magento\Payment\Block\Info $block
-  * @see \Magento\Payment\Block\Info
-@@ -15,11 +13,11 @@ $title = $block->escapeHtml($block->getMethod()->getTitle());
- ?>
- <dl class="payment-method">
-     <dt class="title"><?= /* @noEscape */ $title ?></dt>
--<?php if ($specificInfo):?>
-+<?php if ($specificInfo) : ?>
-     <dd class="content">
-         <table class="data table">
-             <caption class="table-caption"><?= /* @noEscape */ $title ?></caption>
--            <?php foreach ($specificInfo as $label => $value):?>
-+            <?php foreach ($specificInfo as $label => $value) : ?>
-                 <tr>
-                     <th scope="row"><?= $block->escapeHtml($label) ?></th>
-                     <td>
-diff --git a/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml b/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
-index 653d0502c63..60efae16b17 100644
---- a/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
-+++ b/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Payment\Block\Info $block
-  * @see \Magento\Payment\Block\Info
-@@ -12,7 +11,7 @@
- ?>
- <dl class="payment-method">
-     <dt class="title"><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
--<?php if ($block->getInstructions()): ?>
-+<?php if ($block->getInstructions()) : ?>
-     <dd class="content"><?= /* @noEscape */ nl2br($block->escapeHtml($block->getInstructions())) ?></dd>
- <?php endif; ?>
- </dl>
-diff --git a/app/code/Magento/Payment/view/frontend/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/frontend/templates/info/pdf/default.phtml
-index 7acac62f65d..a8583ea5549 100644
---- a/app/code/Magento/Payment/view/frontend/templates/info/pdf/default.phtml
-+++ b/app/code/Magento/Payment/view/frontend/templates/info/pdf/default.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @see \Magento\Payment\Block\Info
-  * @var \Magento\Payment\Block\Info $block
-@@ -12,8 +11,8 @@
- ?>
- <?= $block->escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
- 
--<?php if ($specificInfo = $block->getSpecificInformation()):?>
--    <?php foreach ($specificInfo as $label => $value):?>
-+<?php if ($specificInfo = $block->getSpecificInformation()) : ?>
-+    <?php foreach ($specificInfo as $label => $value) : ?>
-         <?= $block->escapeHtml($label) ?>:
-         <?= $block->escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
-         {{pdf_row_separator}}
-diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
-index 47390e321f6..290c8384537 100644
---- a/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
-+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
-@@ -4,20 +4,18 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Payment\Block\Transparent\Form $block */
- $code = $block->escapeHtml($block->getMethodCode());
- $ccExpMonth = $block->getInfoData('cc_exp_month');
- $ccExpYear = $block->getInfoData('cc_exp_year');
- $ccType = $block->getInfoData('cc_type');
--$content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') . '\" alt=\"' .
-+$content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Checkout::cvv.png')) . '\" alt=\"' .
-     $block->escapeHtml(__('Card Verification Number Visual Reference')) . '\" title=\"' .
-     $block->escapeHtml(__('Card Verification Number Visual Reference')) . '\" />';
- ?>
- 
- <!-- IFRAME for request to Payment Gateway -->
--<iframe width="0" height="0" id="<?= /* @noescape */ $code ?>-transparent-iframe"
-+<iframe width="0" height="0" id="<?= /* @noEscape */ $code ?>-transparent-iframe"
-         data-container="<?= /* @noEscape */ $code ?>-transparent-iframe" allowtransparency="true"
-         frameborder="0"  name="iframeTransparent" style="display:none;width:100%;background-color:transparent"
-         src="<?= $block->escapeUrl($block->getViewFileUrl('blank.html')) ?>"></iframe>
-@@ -47,9 +45,9 @@ $content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') .
-                             "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"
-                         }'>
-                     <option value=""><?= $block->escapeHtml(__('--Please Select--')) ?></option>
--                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-+                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
-                     <option value="<?= $block->escapeHtml($typeCode) ?>"
--                        <?php if ($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
-+                        <?php if ($typeCode == $ccType) : ?> selected="selected"<?php endif; ?>>
-                         <?= $block->escapeHtml($typeName) ?></option>
-                 <?php endforeach ?>
-                 </select>
-@@ -85,9 +83,9 @@ $content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') .
-                                         required:true,
-                                         "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"
-                                     }'>
--                            <?php foreach ($block->getCcMonths() as $k => $v): ?>
-+                            <?php foreach ($block->getCcMonths() as $k => $v) : ?>
-                                 <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
--                                    <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
-+                                    <?php if ($k == $ccExpMonth) : ?> selected="selected"<?php endif; ?>>
-                                     <?= $block->escapeHtml($v) ?>
-                                 </option>
-                             <?php endforeach ?>
-@@ -99,9 +97,9 @@ $content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') .
-                             <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
-                                     class="year" data-container="<?= /* @noEscape */ $code ?>-cc-year"
-                                     data-validate='{required:true}'>
--                            <?php foreach ($block->getCcYears() as $k => $v): ?>
-+                            <?php foreach ($block->getCcYears() as $k => $v) : ?>
-                                 <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
--                                    <?php if ($k == $ccExpYear): ?> selected="selected"<?php endif; ?>>
-+                                    <?php if ($k == $ccExpYear) : ?> selected="selected"<?php endif; ?>>
-                                     <?= $block->escapeHtml($v) ?>
-                                 </option>
-                             <?php endforeach ?>
-@@ -111,7 +109,7 @@ $content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') .
-                 </div>
-             </div>
-         </div>
--        <?php if ($block->hasVerification()): ?>
-+        <?php if ($block->hasVerification()) : ?>
-         <div class="field required cvv" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
-             <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="label">
-                 <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
-diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
-index c127371cb5f..d99cc0155c2 100644
---- a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
-+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
-@@ -4,17 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Payment\Block\Transparent\Iframe $block */
- $params = $block->getParams();
- ?>
- <html>
-     <head>
-         <script>
--        <?php if (isset($params['redirect'])): ?>
-+        <?php if (isset($params['redirect'])) : ?>
-             window.location="<?= $block->escapeUrl($params['redirect']) ?>";
--        <?php elseif (isset($params['redirect_parent'])): ?>
-+        <?php elseif (isset($params['redirect_parent'])) : ?>
-             var require = window.top.require;
-             require(
-                 [
-@@ -26,7 +24,7 @@ $params = $block->getParams();
-                     parent.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
-                 }
-             );
--        <?php elseif (isset($params['error_msg'])): ?>
-+        <?php elseif (isset($params['error_msg'])) : ?>
-             var require = window.top.require;
-             require(
-                 [
-@@ -40,13 +38,11 @@ $params = $block->getParams();
-                     $(parent).trigger('clearTimeout');
-                     fullScreenLoader.stopLoader();
-                     globalMessageList.addErrorMessage({
--                        message: $t(
--                            'A server error stopped your order from being placed. Please try to place your order again.'
--                        )
-+                        message: $t(<?= /* @noEscape */ json_encode($params['error_msg'])?>)
-                     });
-                 }
-             );
--        <?php elseif (isset($params['multishipping'])): ?>
-+        <?php elseif (isset($params['multishipping'])) : ?>
-             var require = window.top.require;
-             require(
-                 [
-@@ -58,9 +54,9 @@ $params = $block->getParams();
-                     $(parent.document).find('#multishipping-billing-form').submit();
-                 }
-             );
--        <?php elseif (isset($params['order_success'])): ?>
-+        <?php elseif (isset($params['order_success'])) : ?>
-             window.top.location = "<?= $block->escapeUrl($params['order_success']) ?>";
--        <?php else: ?>
-+        <?php else : ?>
-             var require = window.top.require;
-             require(
-                 [
-diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
-index 9304f24a3b4..084e1e0ebf3 100644
---- a/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
-+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var \Magento\Payment\Block\Transparent\Info $block
-  * @see \Magento\Payment\Block\Transparent\Info
-diff --git a/app/code/Magento/Payment/view/frontend/web/cc-type.js b/app/code/Magento/Payment/view/frontend/web/js/cc-type.js
-similarity index 100%
-rename from app/code/Magento/Payment/view/frontend/web/cc-type.js
-rename to app/code/Magento/Payment/view/frontend/web/js/cc-type.js
-diff --git a/app/code/Magento/Payment/view/frontend/web/transparent.js b/app/code/Magento/Payment/view/frontend/web/js/transparent.js
-similarity index 100%
-rename from app/code/Magento/Payment/view/frontend/web/transparent.js
-rename to app/code/Magento/Payment/view/frontend/web/js/transparent.js
-diff --git a/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js b/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js
-index 5eba4fd89d3..522bd51270e 100644
---- a/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js
-+++ b/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js
-@@ -114,26 +114,44 @@ define([
-          * @override
-          */
-         placeOrder: function () {
--            if (this.validateHandler() && additionalValidators.validate()) {
-+            var self = this;
- 
-+            if (this.validateHandler() &&
-+                additionalValidators.validate() &&
-+                this.isPlaceOrderActionAllowed() === true
-+            ) {
-                 fullScreenLoader.startLoader();
- 
-                 this.isPlaceOrderActionAllowed(false);
- 
-                 $.when(
--                    setPaymentInformationAction(
--                        this.messageContainer,
--                        {
--                            method: this.getCode()
--                        }
--                    )
--                ).done(this.done.bind(this))
--                    .fail(this.fail.bind(this));
-+                    this.setPaymentInformation()
-+                ).done(
-+                    this.done.bind(this)
-+                ).fail(
-+                    this.fail.bind(this)
-+                ).always(
-+                    function () {
-+                        self.isPlaceOrderActionAllowed(true);
-+                    }
-+                );
- 
-                 this.initTimeoutHandler();
-             }
-         },
- 
-+        /**
-+         * {Function}
-+         */
-+        setPaymentInformation: function () {
-+            return setPaymentInformationAction(
-+                this.messageContainer,
-+                {
-+                    method: this.getCode()
-+                }
-+            );
-+        },
-+
-         /**
-          * {Function}
-          */
-@@ -192,7 +210,6 @@ define([
-          */
-         fail: function () {
-             fullScreenLoader.stopLoader();
--            this.isPlaceOrderActionAllowed(true);
- 
-             return this;
-         },
-diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Depends/ButtonStylesLabel.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Depends/ButtonStylesLabel.php
-new file mode 100644
-index 00000000000..82e0e556606
---- /dev/null
-+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Depends/ButtonStylesLabel.php
-@@ -0,0 +1,26 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends;
-+
-+use Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable;
-+
-+/**
-+ * Class ButtonStylesLabel
-+ */
-+class ButtonStylesLabel extends AbstractEnable
-+{
-+    /**
-+     * Getting the name of a UI attribute
-+     *
-+     * @return string
-+     */
-+    protected function getDataAttributeName()
-+    {
-+        return 'button-label';
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php
-index 1a8a5895c43..88a33f19de2 100644
---- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php
-+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php
-@@ -7,6 +7,8 @@ namespace Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable;
- 
- /**
-  * Class Bml
-+ * @deprecated
-+ * "Enable PayPal Credit" setting was removed. Please @see "Disable Funding Options"
-  */
- class BmlApi extends AbstractEnable
- {
-diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
-new file mode 100644
-index 00000000000..bad4dad4c09
---- /dev/null
-+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
-@@ -0,0 +1,91 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect;
-+
-+use Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable;
-+use Magento\Paypal\Model\Config\StructurePlugin;
-+use Magento\Backend\Block\Template\Context;
-+use Magento\Paypal\Model\Config;
-+use Magento\Framework\Data\Form\Element\AbstractElement;
-+
-+/**
-+ * Class DisabledFundingOptions
-+ */
-+class DisabledFundingOptions extends AbstractEnable
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * DisabledFundingOptions constructor.
-+     * @param Context $context
-+     * @param Config $config
-+     * @param array $data
-+     */
-+    public function __construct(
-+        Context $context,
-+        Config $config,
-+        $data = []
-+    ) {
-+        $this->config = $config;
-+        parent::__construct($context, $data);
-+    }
-+
-+    /**
-+     * Render country field considering request parameter
-+     *
-+     * @param AbstractElement $element
-+     * @return string
-+     */
-+    public function render(AbstractElement $element)
-+    {
-+        if (!$this->isSelectedMerchantCountry('US')) {
-+            $fundingOptions = $element->getValues();
-+            $element->setValues($this->filterValuesForPaypalCredit($fundingOptions));
-+        }
-+        return parent::render($element);
-+    }
-+
-+    /**
-+     * Getting the name of a UI attribute
-+     *
-+     * @return string
-+     */
-+    protected function getDataAttributeName(): string
-+    {
-+        return 'disable-funding-options';
-+    }
-+
-+    /**
-+     * Filters array for CREDIT
-+     *
-+     * @param array $options
-+     * @return array
-+     */
-+    private function filterValuesForPaypalCredit($options): array
-+    {
-+        return array_filter($options, function ($opt) {
-+            return ($opt['value'] !== 'CREDIT');
-+        });
-+    }
-+
-+    /**
-+     * Checks for chosen Merchant country from the config/url
-+     *
-+     * @param string $country
-+     * @return bool
-+     */
-+    private function isSelectedMerchantCountry(string $country): bool
-+    {
-+        $merchantCountry = $this->getRequest()->getParam(StructurePlugin::REQUEST_PARAM_COUNTRY)
-+            ?: $this->config->getMerchantCountry();
-+        return $merchantCountry === $country;
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Block/Bml/Shortcut.php b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
-index 39e5dbd3cef..d2f5ca009a1 100644
---- a/app/code/Magento/Paypal/Block/Bml/Shortcut.php
-+++ b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
-@@ -8,7 +8,13 @@ namespace Magento\Paypal\Block\Bml;
- 
- use Magento\Catalog\Block as CatalogBlock;
- use Magento\Paypal\Helper\Shortcut\ValidatorInterface;
-+use Magento\Paypal\Model\ConfigFactory;
-+use Magento\Paypal\Model\Config;
-+use Magento\Framework\App\ObjectManager;
- 
-+/**
-+ * Class shortcut
-+ */
- class Shortcut extends \Magento\Framework\View\Element\Template implements CatalogBlock\ShortcutInterface
- {
-     /**
-@@ -66,6 +72,11 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
-      */
-     private $_shortcutValidator;
- 
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-     /**
-      * @param \Magento\Framework\View\Element\Template\Context $context
-      * @param \Magento\Payment\Helper\Data $paymentData
-@@ -77,7 +88,9 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
-      * @param string $bmlMethodCode
-      * @param string $shortcutTemplate
-      * @param array $data
-+     * @param ConfigFactory|null $config
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     * @codingStandardsIgnoreStart
-      */
-     public function __construct(
-         \Magento\Framework\View\Element\Template\Context $context,
-@@ -89,28 +102,35 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
-         $alias,
-         $bmlMethodCode,
-         $shortcutTemplate,
--        array $data = []
-+        array $data = [],
-+        ConfigFactory $config = null
-     ) {
-         $this->_paymentData = $paymentData;
-         $this->_mathRandom = $mathRandom;
-         $this->_shortcutValidator = $shortcutValidator;
--
-         $this->_paymentMethodCode = $paymentMethodCode;
-         $this->_startAction = $startAction;
-         $this->_alias = $alias;
-         $this->setTemplate($shortcutTemplate);
-         $this->_bmlMethodCode = $bmlMethodCode;
-+        $this->config = $config
-+            ? $config->create()
-+            : ObjectManager::getInstance()->get(ConfigFactory::class)->create();
-+        $this->config->setMethod($this->_paymentMethodCode);
-         parent::__construct($context, $data);
-     }
-+    //@codingStandardsIgnoreEnd
- 
-     /**
--     * @return \Magento\Framework\View\Element\AbstractBlock
-+     * @inheritdoc
-      */
-     protected function _beforeToHtml()
-     {
-         $result = parent::_beforeToHtml();
-         $isInCatalog = $this->getIsInCatalogProduct();
--        if (!$this->_shortcutValidator->validate($this->_paymentMethodCode, $isInCatalog)) {
-+        if (!$this->_shortcutValidator->validate($this->_paymentMethodCode, $isInCatalog)
-+            || (bool)(int)$this->config->getValue('in_context')
-+        ) {
-             $this->_shouldRender = false;
-             return $result;
-         }
-diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
-index 79142ecb1bf..8d1e04c1397 100644
---- a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
-+++ b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
-@@ -9,7 +9,6 @@ use Magento\Checkout\Model\Session;
- use Magento\Payment\Model\MethodInterface;
- use Magento\Paypal\Model\Config;
- use Magento\Paypal\Model\ConfigFactory;
--use Magento\Paypal\Block\Express\InContext;
- use Magento\Framework\View\Element\Template;
- use Magento\Catalog\Block\ShortcutInterface;
- use Magento\Framework\Locale\ResolverInterface;
-@@ -17,6 +16,7 @@ use Magento\Framework\View\Element\Template\Context;
- 
- /**
-  * Class Button
-+ * @deprecated @see \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton
-  */
- class Button extends Template implements ShortcutInterface
- {
-@@ -59,8 +59,8 @@ class Button extends Template implements ShortcutInterface
-      * @param Context $context
-      * @param ResolverInterface $localeResolver
-      * @param ConfigFactory $configFactory
--     * @param MethodInterface $payment
-      * @param Session $session
-+     * @param MethodInterface $payment
-      * @param array $data
-      */
-     public function __construct(
-@@ -101,8 +101,7 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
--     * Check is Paypal In-Context Express Checkout button
--     * should render in cart/mini-cart
-+     * Check is Paypal In-Context Express Checkout button should render in cart/mini-cart
-      *
-      * @return bool
-      */
-@@ -127,6 +126,8 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
-+     * Returns container id
-+     *
-      * @return string
-      */
-     public function getContainerId()
-@@ -135,6 +136,8 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
-+     * Returns link action
-+     *
-      * @return string
-      */
-     public function getLinkAction()
-@@ -143,6 +146,8 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
-+     * Returns add to cart selector
-+     *
-      * @return string
-      */
-     public function getAddToCartSelector()
-@@ -151,6 +156,8 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
-+     * Returns image url
-+     *
-      * @return string
-      */
-     public function getImageUrl()
-@@ -171,6 +178,8 @@ class Button extends Template implements ShortcutInterface
-     }
- 
-     /**
-+     * Set information if button renders in the mini cart
-+     *
-      * @param bool $isCatalog
-      * @return $this
-      */
-diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
-new file mode 100644
-index 00000000000..c6a17fa5efb
---- /dev/null
-+++ b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
-@@ -0,0 +1,223 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Block\Express\InContext\Minicart;
-+
-+use Magento\Checkout\Model\Session;
-+use Magento\Payment\Model\MethodInterface;
-+use Magento\Paypal\Model\Config;
-+use Magento\Paypal\Model\ConfigFactory;
-+use Magento\Framework\View\Element\Template;
-+use Magento\Catalog\Block\ShortcutInterface;
-+use Magento\Framework\View\Element\Template\Context;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Paypal\Model\SmartButtonConfig;
-+use Magento\Framework\UrlInterface;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+
-+/**
-+ * Class Button
-+ */
-+class SmartButton extends Template implements ShortcutInterface
-+{
-+    private const ALIAS_ELEMENT_INDEX = 'alias';
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var MethodInterface
-+     */
-+    private $payment;
-+
-+    /**
-+     * @var Session
-+     */
-+    private $session;
-+
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @var SmartButtonConfig
-+     */
-+    private $smartButtonConfig;
-+
-+    /**
-+     * @var UrlInterface
-+     */
-+    private $urlBuilder;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteId
-+     */
-+    private $quoteIdMask;
-+
-+    /**
-+     * @param Context $context
-+     * @param ConfigFactory $configFactory
-+     * @param Session $session
-+     * @param MethodInterface $payment
-+     * @param SerializerInterface $serializer
-+     * @param SmartButtonConfig $smartButtonConfig
-+     * @param UrlInterface $urlBuilder
-+     * @param QuoteIdToMaskedQuoteId $quoteIdToMaskedQuoteId
-+     * @param array $data
-+     */
-+    public function __construct(
-+        Context $context,
-+        ConfigFactory $configFactory,
-+        Session $session,
-+        MethodInterface $payment,
-+        SerializerInterface $serializer,
-+        SmartButtonConfig $smartButtonConfig,
-+        UrlInterface $urlBuilder,
-+        QuoteIdToMaskedQuoteId $quoteIdToMaskedQuoteId,
-+        array $data = []
-+    ) {
-+        parent::__construct($context, $data);
-+
-+        $this->config = $configFactory->create();
-+        $this->config->setMethod(Config::METHOD_EXPRESS);
-+        $this->payment = $payment;
-+        $this->session = $session;
-+        $this->serializer = $serializer;
-+        $this->smartButtonConfig = $smartButtonConfig;
-+        $this->urlBuilder = $urlBuilder;
-+        $this->quoteIdMask = $quoteIdToMaskedQuoteId;
-+    }
-+
-+    /**
-+     * Check `in_context` config value
-+     *
-+     * @return bool
-+     */
-+    private function isInContext(): bool
-+    {
-+        return (bool)(int) $this->config->getValue('in_context');
-+    }
-+
-+    /**
-+     * Check `visible_on_cart` config value
-+     *
-+     * @return bool
-+     */
-+    private function isVisibleOnCart(): bool
-+    {
-+        return (bool)(int) $this->config->getValue('visible_on_cart');
-+    }
-+
-+    /**
-+     * Check is Paypal In-Context Express Checkout button should render in cart/mini-cart
-+     *
-+     * @return bool
-+     */
-+    private function shouldRender(): bool
-+    {
-+        return $this->payment->isAvailable($this->session->getQuote())
-+            && $this->isInContext()
-+            && $this->isVisibleOnCart()
-+            && $this->getQuoteId()
-+            && !$this->getIsInCatalogProduct();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _toHtml()
-+    {
-+        if (!$this->shouldRender()) {
-+            return '';
-+        }
-+
-+        return parent::_toHtml();
-+    }
-+
-+    /**
-+     * Get shortcut alias
-+     *
-+     * @return string
-+     */
-+    public function getAlias()
-+    {
-+        return $this->getData(self::ALIAS_ELEMENT_INDEX);
-+    }
-+
-+    /**
-+     * Returns string to initialize js component
-+     *
-+     * @return string
-+     */
-+    public function getJsInitParams(): string
-+    {
-+        $config = [];
-+        $quoteId = $this->getQuoteId();
-+        if (!empty($quoteId)) {
-+            $clientConfig = [
-+                'quoteId' => $quoteId,
-+                'customerId' => $this->session->getQuote()->getCustomerId(),
-+                'button' => 1,
-+                'getTokenUrl' => $this->urlBuilder->getUrl(
-+                    'paypal/express/getTokenData',
-+                    ['_secure' => $this->getRequest()->isSecure()]
-+                ),
-+                'onAuthorizeUrl' => $this->urlBuilder->getUrl(
-+                    'paypal/express/onAuthorization',
-+                    ['_secure' => $this->getRequest()->isSecure()]
-+                ),
-+                'onCancelUrl' => $this->urlBuilder->getUrl(
-+                    'paypal/express/cancel',
-+                    ['_secure' => $this->getRequest()->isSecure()]
-+                )
-+            ];
-+            $smartButtonsConfig = $this->getIsShoppingCart()
-+                ? $this->smartButtonConfig->getConfig('cart')
-+                : $this->smartButtonConfig->getConfig('mini_cart');
-+            $clientConfig = array_replace_recursive($clientConfig, $smartButtonsConfig);
-+            $config = [
-+                'Magento_Paypal/js/in-context/button' => [
-+                    'clientConfig' => $clientConfig
-+                ]
-+            ];
-+        }
-+        $json = $this->serializer->serialize($config);
-+        return $json;
-+    }
-+
-+    /**
-+     * Returns container id
-+     *
-+     * @return string
-+     */
-+    public function getContainerId(): string
-+    {
-+        return $this->getData('button_id');
-+    }
-+
-+    /**
-+     * Get quote id from session
-+     *
-+     * @return string
-+     */
-+    private function getQuoteId(): string
-+    {
-+        $quoteId = (int)$this->session->getQuoteId();
-+        if (!$this->session->getQuote()->getCustomerId()) {
-+            try {
-+                $quoteId = $this->quoteIdMask->execute($quoteId);
-+            } catch (NoSuchEntityException $e) {
-+                $quoteId = "";
-+            }
-+        }
-+        return (string)$quoteId;
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php b/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
-new file mode 100644
-index 00000000000..6d355038cff
---- /dev/null
-+++ b/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
-@@ -0,0 +1,138 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Block\Express\InContext;
-+
-+use Magento\Paypal\Model\Config;
-+use Magento\Paypal\Model\ConfigFactory;
-+use Magento\Framework\View\Element\Template;
-+use Magento\Catalog\Block\ShortcutInterface;
-+use Magento\Framework\View\Element\Template\Context;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Paypal\Model\SmartButtonConfig;
-+use Magento\Framework\UrlInterface;
-+
-+/**
-+ * Class Button
-+ */
-+class SmartButton extends Template implements ShortcutInterface
-+{
-+    private const ALIAS_ELEMENT_INDEX = 'alias';
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @var SmartButtonConfig
-+     */
-+    private $smartButtonConfig;
-+
-+    /**
-+     * @var UrlInterface
-+     */
-+    private $urlBuilder;
-+
-+    /**
-+     * @param Context $context
-+     * @param ConfigFactory $configFactory
-+     * @param SerializerInterface $serializer
-+     * @param SmartButtonConfig $smartButtonConfig
-+     * @param UrlInterface $urlBuilder
-+     * @param array $data
-+     */
-+    public function __construct(
-+        Context $context,
-+        ConfigFactory $configFactory,
-+        SerializerInterface $serializer,
-+        SmartButtonConfig $smartButtonConfig,
-+        UrlInterface $urlBuilder,
-+        array $data = []
-+    ) {
-+        parent::__construct($context, $data);
-+
-+        $this->config = $configFactory->create();
-+        $this->config->setMethod(Config::METHOD_EXPRESS);
-+        $this->serializer = $serializer;
-+        $this->smartButtonConfig = $smartButtonConfig;
-+        $this->urlBuilder = $urlBuilder;
-+    }
-+
-+    /**
-+     * Check is Paypal In-Context Express Checkout button should render in cart/mini-cart
-+     *
-+     * @return bool
-+     */
-+    private function shouldRender(): bool
-+    {
-+        $isInCatalog = $this->getIsInCatalogProduct();
-+        $isInContext = (bool)(int) $this->config->getValue('in_context');
-+
-+        return ($isInContext && $isInCatalog);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _toHtml()
-+    {
-+        if (!$this->shouldRender()) {
-+            return '';
-+        }
-+
-+        return parent::_toHtml();
-+    }
-+
-+    /**
-+     * Get shortcut alias
-+     *
-+     * @return string
-+     */
-+    public function getAlias()
-+    {
-+        return $this->getData(self::ALIAS_ELEMENT_INDEX);
-+    }
-+
-+    /**
-+     * Returns string to initialize js component
-+     *
-+     * @return string
-+     */
-+    public function getJsInitParams(): string
-+    {
-+        $clientConfig = [
-+            'button' => 1,
-+            'getTokenUrl' => $this->urlBuilder->getUrl(
-+                'paypal/express/getTokenData',
-+                ['_secure' => $this->getRequest()->isSecure()]
-+            ),
-+            'onAuthorizeUrl' => $this->urlBuilder->getUrl(
-+                'paypal/express/onAuthorization',
-+                ['_secure' => $this->getRequest()->isSecure()]
-+            ),
-+            'onCancelUrl' => $this->urlBuilder->getUrl(
-+                'paypal/express/cancel',
-+                ['_secure' => $this->getRequest()->isSecure()]
-+            )
-+        ];
-+        $smartButtonsConfig = $this->smartButtonConfig->getConfig('product');
-+        $clientConfig = array_replace_recursive($clientConfig, $smartButtonsConfig);
-+        $config = [
-+            'Magento_Paypal/js/in-context/product-express-checkout' => [
-+                'clientConfig' => $clientConfig
-+            ]
-+        ];
-+
-+        return $this->serializer->serialize($config);
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Block/Express/Shortcut.php b/app/code/Magento/Paypal/Block/Express/Shortcut.php
-index bdb9279356d..16305238e17 100644
---- a/app/code/Magento/Paypal/Block/Express/Shortcut.php
-+++ b/app/code/Magento/Paypal/Block/Express/Shortcut.php
-@@ -137,7 +137,7 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
-     }
- 
-     /**
--     * @return \Magento\Framework\View\Element\AbstractBlock
-+     * @inheritdoc
-      */
-     protected function _beforeToHtml()
-     {
-@@ -145,7 +145,9 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
- 
-         $isInCatalog = $this->getIsInCatalogProduct();
- 
--        if (!$this->_shortcutValidator->validate($this->_paymentMethodCode, $isInCatalog)) {
-+        if (!$this->_shortcutValidator->validate($this->_paymentMethodCode, $isInCatalog)
-+            || (bool)(int)$this->config->getValue('in_context')
-+        ) {
-             $this->_shouldRender = false;
-             return $result;
-         }
-@@ -186,6 +188,8 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
-     }
- 
-     /**
-+     * Check if we should render component
-+     *
-      * @return bool
-      */
-     protected function shouldRender()
-diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php
-index b4c68df6e29..ca92b6a044f 100644
---- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php
-+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Paypal\Controller\Adminhtml\Billing\Agreement;
- 
--class Index extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php
-index 91f3e8d9065..c2cee0ffbc6 100644
---- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php
-+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Paypal\Controller\Adminhtml\Paypal\Reports;
- 
--class Index extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement/Index.php b/app/code/Magento/Paypal/Controller/Billing/Agreement/Index.php
-index c086efd5416..797c7d7a8f4 100644
---- a/app/code/Magento/Paypal/Controller/Billing/Agreement/Index.php
-+++ b/app/code/Magento/Paypal/Controller/Billing/Agreement/Index.php
-@@ -6,7 +6,12 @@
-  */
- namespace Magento\Paypal\Controller\Billing\Agreement;
- 
--class Index extends \Magento\Paypal\Controller\Billing\Agreement
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+/**
-+ * Index Controller.
-+ */
-+class Index extends \Magento\Paypal\Controller\Billing\Agreement implements HttpGetActionInterface
- {
-     /**
-      * View billing agreements
-@@ -16,7 +21,7 @@ class Index extends \Magento\Paypal\Controller\Billing\Agreement
-     public function execute()
-     {
-         $this->_view->loadLayout();
--        $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Billing Agreements'));
-+        $this->_view->getPage()->getConfig()->getTitle()->set(__('Billing Agreements'));
-         $this->_view->renderLayout();
-     }
- }
-diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
-index 571d73d07b6..7ad8fe658ec 100644
---- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
-+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
-@@ -7,12 +7,18 @@ namespace Magento\Paypal\Controller\Express;
- 
- use Magento\Checkout\Controller\Express\RedirectLoginInterface;
- use Magento\Framework\App\Action\Action as AppAction;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Quote\Api\Data\CartInterface;
- 
- /**
-  * Abstract Express Checkout Controller
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--abstract class AbstractExpress extends AppAction implements RedirectLoginInterface
-+abstract class AbstractExpress extends AppAction implements
-+    RedirectLoginInterface,
-+    HttpGetActionInterface,
-+    HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Paypal\Model\Express\Checkout
-@@ -127,16 +133,26 @@ abstract class AbstractExpress extends AppAction implements RedirectLoginInterfa
-     /**
-      * Instantiate quote and checkout
-      *
-+     * @param CartInterface|null $quoteObject
-+     *
-      * @return void
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
--    protected function _initCheckout()
-+    protected function _initCheckout(CartInterface $quoteObject = null)
-     {
--        $quote = $this->_getQuote();
-+        $quote = $quoteObject ? $quoteObject : $this->_getQuote();
-         if (!$quote->hasItems() || $quote->getHasError()) {
-             $this->getResponse()->setStatusHeader(403, '1.1', 'Forbidden');
-             throw new \Magento\Framework\Exception\LocalizedException(__('We can\'t initialize Express Checkout.'));
-         }
-+        if (!(float)$quote->getGrandTotal()) {
-+            throw new \Magento\Framework\Exception\LocalizedException(
-+                __(
-+                    'PayPal can\'t process orders with a zero balance due. '
-+                    . 'To finish your purchase, please go through the standard checkout process.'
-+                )
-+            );
-+        }
-         if (!isset($this->_checkoutTypes[$this->_checkoutType])) {
-             $parameters = [
-                 'params' => [
-@@ -151,6 +167,8 @@ abstract class AbstractExpress extends AppAction implements RedirectLoginInterfa
-     }
- 
-     /**
-+     * Get Proper Checkout Token
-+     *
-      * Search for proper checkout token in request or session or (un)set specified one
-      * Combined getter/setter
-      *
-@@ -221,8 +239,7 @@ abstract class AbstractExpress extends AppAction implements RedirectLoginInterfa
-     }
- 
-     /**
--     * Returns before_auth_url redirect parameter for customer session
--     * @return null
-+     * @inheritdoc
-      */
-     public function getCustomerBeforeAuthUrl()
-     {
-@@ -230,8 +247,7 @@ abstract class AbstractExpress extends AppAction implements RedirectLoginInterfa
-     }
- 
-     /**
--     * Returns a list of action flags [flag_key] => boolean
--     * @return array
-+     * @inheritdoc
-      */
-     public function getActionFlagList()
-     {
-@@ -240,6 +256,7 @@ abstract class AbstractExpress extends AppAction implements RedirectLoginInterfa
- 
-     /**
-      * Returns login url parameter for redirect
-+     *
-      * @return string
-      */
-     public function getLoginUrl()
-@@ -249,6 +266,7 @@ abstract class AbstractExpress extends AppAction implements RedirectLoginInterfa
- 
-     /**
-      * Returns action name which requires redirect
-+     *
-      * @return string
-      */
-     public function getRedirectActionName()
-@@ -269,4 +287,9 @@ abstract class AbstractExpress extends AppAction implements RedirectLoginInterfa
-             $this->_urlHelper->addRequestParam($this->_customerUrl->getLoginUrl(), ['context' => 'checkout'])
-         );
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    abstract public function execute();
- }
-diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
-index cb1b3388dc0..fc3a45e1e13 100644
---- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
-+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
-@@ -6,7 +6,17 @@
-  */
- namespace Magento\Paypal\Controller\Express\AbstractExpress;
- 
--class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\AbstractExpress
-+use Magento\Framework\App\CsrfAwareActionInterface;
-+use Magento\Paypal\Controller\Express\AbstractExpress;
-+use Magento\Framework\App\Request\InvalidRequestException;
-+use Magento\Framework\App\RequestInterface;
-+
-+/**
-+ * Returns shipping rates by server-to-server request from PayPal.
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class ShippingOptionsCallback extends AbstractExpress implements CsrfAwareActionInterface
- {
-     /**
-      * @var \Magento\Quote\Api\CartRepositoryInterface
-@@ -65,4 +75,21 @@ class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\Abstrac
-             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-         }
-     }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function createCsrfValidationException(
-+        RequestInterface $request
-+    ): ?InvalidRequestException {
-+        return null;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function validateForCsrf(RequestInterface $request): ?bool
-+    {
-+        return true;
-+    }
- }
-diff --git a/app/code/Magento/Paypal/Controller/Express/GetToken.php b/app/code/Magento/Paypal/Controller/Express/GetToken.php
-index 7c127803cb0..93e9abb4c09 100644
---- a/app/code/Magento/Paypal/Controller/Express/GetToken.php
-+++ b/app/code/Magento/Paypal/Controller/Express/GetToken.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Paypal\Controller\Express;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Checkout\Helper\Data;
- use Magento\Checkout\Helper\ExpressRedirect;
- use Magento\Checkout\Model\Type\Onepage;
-@@ -19,7 +20,7 @@ use Magento\Framework\App\ObjectManager;
-  * Class GetToken
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class GetToken extends AbstractExpress
-+class GetToken extends AbstractExpress implements HttpGetActionInterface
- {
-     /**
-      * Config mode type
-diff --git a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
-new file mode 100644
-index 00000000000..512dac4cdec
---- /dev/null
-+++ b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
-@@ -0,0 +1,206 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Controller\Express;
-+
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+use Magento\Framework\Controller\ResultFactory;
-+use Magento\Framework\Controller\ResultInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Paypal\Model\Express\Checkout;
-+use Magento\Paypal\Model\Config;
-+use Magento\Framework\App\Action\Context;
-+use Magento\Customer\Model\Session as CustomerSession;
-+use Magento\Checkout\Model\Session as CheckoutSession;
-+use Magento\Sales\Model\OrderFactory;
-+use Magento\Paypal\Model\Express\Checkout\Factory as CheckoutFactory;
-+use Magento\Framework\Session\Generic as PayPalSession;
-+use Magento\Framework\Url\Helper\Data as UrlHelper;
-+use Magento\Customer\Model\Url as CustomerUrl;
-+use Magento\Customer\Model\ResourceModel\CustomerRepository;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Api\GuestCartRepositoryInterface;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * Retrieve paypal token
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class GetTokenData extends AbstractExpress implements HttpGetActionInterface
-+{
-+    /**
-+     * Config mode type
-+     *
-+     * @var string
-+     */
-+    protected $_configType = Config::class;
-+
-+    /**
-+     * Config method type
-+     *
-+     * @var string
-+     */
-+    protected $_configMethod = Config::METHOD_WPP_EXPRESS;
-+
-+    /**
-+     * Checkout mode type
-+     *
-+     * @var string
-+     */
-+    protected $_checkoutType = Checkout::class;
-+
-+    /**
-+     * @var \Psr\Log\LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var CustomerRepository
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * @var CartRepositoryInterface
-+     */
-+    private $cartRepository;
-+
-+    /**
-+     * @var GuestCartRepositoryInterface
-+     */
-+    private $guestCartRepository;
-+
-+    /**
-+     * @param Context $context
-+     * @param CustomerSession $customerSession
-+     * @param CheckoutSession $checkoutSession
-+     * @param OrderFactory $orderFactory
-+     * @param CheckoutFactory $checkoutFactory
-+     * @param PayPalSession $paypalSession
-+     * @param UrlHelper $urlHelper
-+     * @param CustomerUrl $customerUrl
-+     * @param LoggerInterface $logger
-+     * @param CustomerRepository $customerRepository
-+     * @param CartRepositoryInterface $cartRepository
-+     * @param GuestCartRepositoryInterface $guestCartRepository
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     */
-+    public function __construct(
-+        Context $context,
-+        CustomerSession $customerSession,
-+        CheckoutSession $checkoutSession,
-+        OrderFactory $orderFactory,
-+        CheckoutFactory $checkoutFactory,
-+        PayPalSession $paypalSession,
-+        UrlHelper $urlHelper,
-+        CustomerUrl $customerUrl,
-+        LoggerInterface $logger,
-+        CustomerRepository $customerRepository,
-+        CartRepositoryInterface $cartRepository,
-+        GuestCartRepositoryInterface $guestCartRepository
-+    ) {
-+        parent::__construct(
-+            $context,
-+            $customerSession,
-+            $checkoutSession,
-+            $orderFactory,
-+            $checkoutFactory,
-+            $paypalSession,
-+            $urlHelper,
-+            $customerUrl
-+        );
-+
-+        $this->logger = $logger;
-+        $this->customerRepository = $customerRepository;
-+        $this->cartRepository = $cartRepository;
-+        $this->guestCartRepository = $guestCartRepository;
-+    }
-+
-+    /**
-+     * Get token data
-+     *
-+     * @return ResultInterface
-+     */
-+    public function execute(): ResultInterface
-+    {
-+        $controllerResult = $this->resultFactory->create(ResultFactory::TYPE_JSON);
-+        $responseContent = [
-+            'success' => true,
-+            'error_message' => '',
-+        ];
-+
-+        try {
-+            $token = $this->getToken();
-+            if ($token === null) {
-+                $token = false;
-+            }
-+            $this->_initToken($token);
-+
-+            $responseContent['token'] = $token;
-+        } catch (LocalizedException $exception) {
-+            $this->logger->critical($exception);
-+
-+            $responseContent['success'] = false;
-+            $responseContent['error_message'] = $exception->getMessage();
-+        } catch (\Exception $exception) {
-+            $this->logger->critical($exception);
-+
-+            $responseContent['success'] = false;
-+            $responseContent['error_message'] = __('Sorry, but something went wrong');
-+        }
-+
-+        return $controllerResult->setData($responseContent);
-+    }
-+
-+    /**
-+     * Get paypal token
-+     *
-+     * @return string|null
-+     * @throws LocalizedException
-+     */
-+    private function getToken(): ?string
-+    {
-+        $quoteId = $this->getRequest()->getParam('quote_id');
-+        $customerId = $this->getRequest()->getParam('customer_id') ?: $this->_customerSession->getId();
-+        $hasButton = (bool)$this->getRequest()->getParam(Checkout::PAYMENT_INFO_BUTTON);
-+
-+        if ($quoteId) {
-+            $quote = $customerId ? $this->cartRepository->get($quoteId) : $this->guestCartRepository->get($quoteId);
-+        } else {
-+            $quote = $this->_getQuote();
-+        }
-+
-+        $this->_initCheckout($quote);
-+
-+        if ($quote->getIsMultiShipping()) {
-+            $quote->setIsMultiShipping(0);
-+            $quote->removeAllAddresses();
-+        }
-+
-+        if ($customerId) {
-+            $customerData = $this->customerRepository->getById((int)$customerId);
-+
-+            $this->_checkout->setCustomerWithAddressChange(
-+                $customerData,
-+                $quote->getBillingAddress(),
-+                $quote->getShippingAddress()
-+            );
-+        }
-+
-+        // giropay urls
-+        $this->_checkout->prepareGiropayUrls(
-+            $this->_url->getUrl('checkout/onepage/success'),
-+            $this->_url->getUrl('paypal/express/cancel'),
-+            $this->_url->getUrl('checkout/onepage/success')
-+        );
-+
-+        return $this->_checkout->start(
-+            $this->_url->getUrl('*/*/return'),
-+            $this->_url->getUrl('*/*/cancel'),
-+            $hasButton
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
-new file mode 100644
-index 00000000000..62f4c4c4c45
---- /dev/null
-+++ b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
-@@ -0,0 +1,172 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Controller\Express;
-+
-+use Magento\Framework\Controller\ResultFactory;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\Controller\ResultInterface;
-+use Magento\Paypal\Model\Config as PayPalConfig;
-+use Magento\Paypal\Model\Express\Checkout as PayPalCheckout;
-+use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
-+use Magento\Framework\App\Action\Context;
-+use Magento\Customer\Model\Session as CustomerSession;
-+use Magento\Checkout\Model\Session as CheckoutSession;
-+use Magento\Sales\Model\OrderFactory;
-+use Magento\Paypal\Model\Express\Checkout\Factory as CheckoutFactory;
-+use Magento\Framework\Session\Generic as PayPalSession;
-+use Magento\Framework\Url\Helper\Data as UrlHelper;
-+use Magento\Customer\Model\Url as CustomerUrl;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Framework\UrlInterface;
-+use Magento\Quote\Api\GuestCartRepositoryInterface;
-+
-+/**
-+ * Processes data after returning from PayPal
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class OnAuthorization extends AbstractExpress implements HttpPostActionInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    protected $_configType = PayPalConfig::class;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected $_configMethod = PayPalConfig::METHOD_WPP_EXPRESS;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected $_checkoutType = PayPalCheckout::class;
-+
-+    /**
-+     * @var CartRepositoryInterface
-+     */
-+    private $cartRepository;
-+
-+    /**
-+     * Url Builder
-+     *
-+     * @var UrlInterface
-+     */
-+    private $urlBuilder;
-+
-+    /**
-+     * @var GuestCartRepositoryInterface
-+     */
-+    private $guestCartRepository;
-+
-+    /**
-+     * @param Context $context
-+     * @param CustomerSession $customerSession
-+     * @param CheckoutSession $checkoutSession
-+     * @param OrderFactory $orderFactory
-+     * @param CheckoutFactory $checkoutFactory
-+     * @param PayPalSession $paypalSession
-+     * @param UrlHelper $urlHelper
-+     * @param CustomerUrl $customerUrl
-+     * @param CartRepositoryInterface $cartRepository
-+     * @param UrlInterface $urlBuilder
-+     * @param GuestCartRepositoryInterface $guestCartRepository
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     */
-+    public function __construct(
-+        Context $context,
-+        CustomerSession $customerSession,
-+        CheckoutSession $checkoutSession,
-+        OrderFactory $orderFactory,
-+        CheckoutFactory $checkoutFactory,
-+        PayPalSession $paypalSession,
-+        UrlHelper $urlHelper,
-+        CustomerUrl $customerUrl,
-+        CartRepositoryInterface $cartRepository,
-+        UrlInterface $urlBuilder,
-+        GuestCartRepositoryInterface $guestCartRepository
-+    ) {
-+        parent::__construct(
-+            $context,
-+            $customerSession,
-+            $checkoutSession,
-+            $orderFactory,
-+            $checkoutFactory,
-+            $paypalSession,
-+            $urlHelper,
-+            $customerUrl
-+        );
-+        $this->cartRepository = $cartRepository;
-+        $this->urlBuilder = $urlBuilder;
-+        $this->guestCartRepository = $guestCartRepository;
-+    }
-+
-+    /**
-+     * Place order or redirect on Paypal review page
-+     *
-+     * @return ResultInterface
-+     */
-+    public function execute(): ResultInterface
-+    {
-+        $controllerResult = $this->resultFactory->create(ResultFactory::TYPE_JSON);
-+        $quoteId = $this->getRequest()->getParam('quoteId');
-+        $payerId = $this->getRequest()->getParam('payerId');
-+        $tokenId = $this->getRequest()->getParam('paymentToken');
-+        $customerId = $this->getRequest()->getParam('customerId') ?: $this->_customerSession->getId();
-+
-+        try {
-+            if ($quoteId) {
-+                $quote = $customerId ? $this->cartRepository->get($quoteId) : $this->guestCartRepository->get($quoteId);
-+            } else {
-+                $quote = $this->_getQuote();
-+            }
-+
-+            $responseContent = [
-+                'success' => true,
-+                'error_message' => '',
-+            ];
-+
-+            /** Populate checkout object with new data */
-+            $this->_initCheckout($quote);
-+            /**  Populate quote  with information about billing and shipping addresses*/
-+            $this->_checkout->returnFromPaypal($tokenId, $payerId);
-+            if ($this->_checkout->canSkipOrderReviewStep()) {
-+                $this->_checkout->place($tokenId);
-+                $order = $this->_checkout->getOrder();
-+                /** "last successful quote" */
-+                $this->_getCheckoutSession()->setLastQuoteId($quote->getId())->setLastSuccessQuoteId($quote->getId());
-+
-+                $this->_getCheckoutSession()->setLastOrderId($order->getId())
-+                    ->setLastRealOrderId($order->getIncrementId())
-+                    ->setLastOrderStatus($order->getStatus());
-+
-+                $this->_eventManager->dispatch(
-+                    'paypal_express_place_order_success',
-+                    [
-+                        'order' => $order,
-+                        'quote' => $quote
-+                    ]
-+                );
-+                $responseContent['redirectUrl'] = $this->urlBuilder->getUrl('checkout/onepage/success/');
-+            } else {
-+                $responseContent['redirectUrl'] = $this->urlBuilder->getUrl('paypal/express/review');
-+                $this->_checkoutSession->setQuoteId($quote->getId());
-+            }
-+        } catch (ApiProcessableException $e) {
-+            $responseContent['success'] = false;
-+            $responseContent['error_message'] = $e->getUserMessage();
-+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-+            $responseContent['success'] = false;
-+            $responseContent['error_message'] = $e->getMessage();
-+        } catch (\Exception $e) {
-+            $responseContent['success'] = false;
-+            $responseContent['error_message'] = __('We can\'t process Express Checkout approval.');
-+        }
-+
-+        return $controllerResult->setData($responseContent);
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Controller/Express/Start.php b/app/code/Magento/Paypal/Controller/Express/Start.php
-index e0a3c5381be..b381c413071 100644
---- a/app/code/Magento/Paypal/Controller/Express/Start.php
-+++ b/app/code/Magento/Paypal/Controller/Express/Start.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Paypal\Controller\Express;
- 
--class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start implements HttpGetActionInterface
- {
-     /**
-      * Config mode type
-diff --git a/app/code/Magento/Paypal/Controller/Ipn/Index.php b/app/code/Magento/Paypal/Controller/Ipn/Index.php
-index ca2670292ec..a879266bc19 100644
---- a/app/code/Magento/Paypal/Controller/Ipn/Index.php
-+++ b/app/code/Magento/Paypal/Controller/Ipn/Index.php
-@@ -4,15 +4,23 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Paypal\Controller\Ipn;
- 
-+use Magento\Framework\App\CsrfAwareActionInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\App\Request\InvalidRequestException;
-+use Magento\Framework\App\RequestInterface;
- use Magento\Framework\Exception\RemoteServiceUnavailableException;
-+use Magento\Sales\Model\OrderFactory;
- 
- /**
-  * Unified IPN controller for all supported PayPal methods
-+ *
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-  */
--class Index extends \Magento\Framework\App\Action\Action
-+class Index extends \Magento\Framework\App\Action\Action implements CsrfAwareActionInterface
- {
-     /**
-      * @var \Psr\Log\LoggerInterface
-@@ -24,26 +32,50 @@ class Index extends \Magento\Framework\App\Action\Action
-      */
-     protected $_ipnFactory;
- 
-+    /**
-+     * @var OrderFactory
-+     */
-+    private $orderFactory;
-+
-     /**
-      * @param \Magento\Framework\App\Action\Context $context
-      * @param \Magento\Paypal\Model\IpnFactory $ipnFactory
-      * @param \Psr\Log\LoggerInterface $logger
-+     * @param OrderFactory $orderFactory
-      */
-     public function __construct(
-         \Magento\Framework\App\Action\Context $context,
-         \Magento\Paypal\Model\IpnFactory $ipnFactory,
--        \Psr\Log\LoggerInterface $logger
-+        \Psr\Log\LoggerInterface $logger,
-+        OrderFactory $orderFactory = null
-     ) {
-         $this->_logger = $logger;
-         $this->_ipnFactory = $ipnFactory;
-+        $this->orderFactory = $orderFactory ?: ObjectManager::getInstance()->get(OrderFactory::class);
-         parent::__construct($context);
-     }
- 
-+    /**
-+     * @inheritDoc
-+     */
-+    public function createCsrfValidationException(
-+        RequestInterface $request
-+    ): ?InvalidRequestException {
-+        return null;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function validateForCsrf(RequestInterface $request): ?bool
-+    {
-+        return true;
-+    }
-+
-     /**
-      * Instantiate IPN model and pass IPN request to it
-      *
-      * @return void
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     public function execute()
-     {
-@@ -54,10 +86,18 @@ class Index extends \Magento\Framework\App\Action\Action
-         try {
-             $data = $this->getRequest()->getPostValue();
-             $this->_ipnFactory->create(['data' => $data])->processIpnRequest();
-+            $incrementId = $this->getRequest()->getPostValue()['invoice'];
-+            $this->_eventManager->dispatch(
-+                'paypal_checkout_success',
-+                [
-+                    'order' => $this->orderFactory->create()->loadByIncrementId($incrementId)
-+                ]
-+            );
-         } catch (RemoteServiceUnavailableException $e) {
-             $this->_logger->critical($e);
-             $this->getResponse()->setStatusHeader(503, '1.1', 'Service Unavailable')->sendResponse();
-             /** @todo eliminate usage of exit statement */
-+            // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-             exit;
-         } catch (\Exception $e) {
-             $this->_logger->critical($e);
-diff --git a/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php b/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php
-index 39cc02942cf..71ae6d4975f 100644
---- a/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php
-+++ b/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php
-@@ -6,8 +6,29 @@
-  */
- namespace Magento\Paypal\Controller\Payflow;
- 
--class CancelPayment extends \Magento\Paypal\Controller\Payflow
-+use Magento\Framework\App\CsrfAwareActionInterface;
-+use Magento\Framework\App\Request\InvalidRequestException;
-+use Magento\Framework\App\RequestInterface;
-+
-+class CancelPayment extends \Magento\Paypal\Controller\Payflow implements CsrfAwareActionInterface
- {
-+    /**
-+     * @inheritDoc
-+     */
-+    public function createCsrfValidationException(
-+        RequestInterface $request
-+    ): ?InvalidRequestException {
-+        return null;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function validateForCsrf(RequestInterface $request): ?bool
-+    {
-+        return true;
-+    }
-+
-     /**
-      * When a customer cancel payment from payflow gateway.
-      *
-diff --git a/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php b/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php
-index a370eeb40ea..d2a14febe54 100644
---- a/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php
-+++ b/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php
-@@ -1,16 +1,22 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Paypal\Controller\Payflow;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\CsrfAwareActionInterface;
-+use Magento\Framework\App\Request\InvalidRequestException;
-+use Magento\Framework\App\RequestInterface;
- use Magento\Paypal\Controller\Payflow;
- use Magento\Paypal\Model\Config;
- use Magento\Sales\Model\Order;
- 
--class ReturnUrl extends Payflow
-+/**
-+ * Paypal Payflow ReturnUrl controller class
-+ */
-+class ReturnUrl extends Payflow implements CsrfAwareActionInterface, HttpGetActionInterface
- {
-     /**
-      * @var array of allowed order states on frontend
-@@ -30,6 +36,23 @@ class ReturnUrl extends Payflow
-         Config::METHOD_PAYFLOWLINK
-     ];
- 
-+    /**
-+     * @inheritDoc
-+     */
-+    public function createCsrfValidationException(
-+        RequestInterface $request
-+    ): ?InvalidRequestException {
-+        return null;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function validateForCsrf(RequestInterface $request): ?bool
-+    {
-+        return true;
-+    }
-+
-     /**
-      * When a customer return to website from payflow gateway.
-      *
-@@ -50,7 +73,7 @@ class ReturnUrl extends Payflow
-                     $redirectBlock->setData('goto_success_page', true);
-                 } else {
-                     if ($this->checkPaymentMethod($order)) {
--                        $gotoSection = $this->_cancelPayment(strval($this->getRequest()->getParam('RESPMSG')));
-+                        $gotoSection = $this->_cancelPayment((string)$this->getRequest()->getParam('RESPMSG'));
-                         $redirectBlock->setData('goto_section', $gotoSection);
-                         $redirectBlock->setData('error_msg', __('Your payment has been declined. Please try again.'));
-                     } else {
-diff --git a/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php b/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php
-index e686c91fd4c..2d6a8f80baf 100644
---- a/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php
-+++ b/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php
-@@ -6,8 +6,29 @@
-  */
- namespace Magento\Paypal\Controller\Payflow;
- 
--class SilentPost extends \Magento\Paypal\Controller\Payflow
-+use Magento\Framework\App\CsrfAwareActionInterface;
-+use Magento\Framework\App\Request\InvalidRequestException;
-+use Magento\Framework\App\RequestInterface;
-+
-+class SilentPost extends \Magento\Paypal\Controller\Payflow implements CsrfAwareActionInterface
- {
-+    /**
-+     * @inheritDoc
-+     */
-+    public function createCsrfValidationException(
-+        RequestInterface $request
-+    ): ?InvalidRequestException {
-+        return null;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function validateForCsrf(RequestInterface $request): ?bool
-+    {
-+        return true;
-+    }
-+
-     /**
-      * Get response from PayPal by silent post method
-      *
-diff --git a/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php b/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php
-index a6fbcfd0239..4615320c945 100644
---- a/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php
-+++ b/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Paypal\Controller\Payflowexpress;
- 
--class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start implements HttpGetActionInterface
- {
-     /**
-      * Config mode type
-diff --git a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
-index 2efae34a964..e2701bab1f0 100644
---- a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
-+++ b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
-@@ -5,12 +5,14 @@
-  */
- namespace Magento\Paypal\Controller\Transparent;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\App\Action\Context;
- use Magento\Framework\Controller\Result\Json;
- use Magento\Framework\Controller\Result\JsonFactory;
- use Magento\Framework\Controller\ResultInterface;
- use Magento\Framework\Session\Generic;
- use Magento\Framework\Session\SessionManager;
-+use Magento\Framework\Session\SessionManagerInterface;
- use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
- use Magento\Paypal\Model\Payflow\Transparent;
- use Magento\Quote\Model\Quote;
-@@ -21,7 +23,7 @@ use Magento\Quote\Model\Quote;
-  * @package Magento\Paypal\Controller\Transparent
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class RequestSecureToken extends \Magento\Framework\App\Action\Action
-+class RequestSecureToken extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
- {
-     /**
-      * @var JsonFactory
-@@ -39,7 +41,7 @@ class RequestSecureToken extends \Magento\Framework\App\Action\Action
-     private $secureTokenService;
- 
-     /**
--     * @var SessionManager
-+     * @var SessionManager|SessionManagerInterface
-      */
-     private $sessionManager;
- 
-@@ -55,6 +57,7 @@ class RequestSecureToken extends \Magento\Framework\App\Action\Action
-      * @param SecureToken $secureTokenService
-      * @param SessionManager $sessionManager
-      * @param Transparent $transparent
-+     * @param SessionManagerInterface|null $sessionInterface
-      */
-     public function __construct(
-         Context $context,
-@@ -62,12 +65,13 @@ class RequestSecureToken extends \Magento\Framework\App\Action\Action
-         Generic $sessionTransparent,
-         SecureToken $secureTokenService,
-         SessionManager $sessionManager,
--        Transparent $transparent
-+        Transparent $transparent,
-+        SessionManagerInterface $sessionInterface = null
-     ) {
-         $this->resultJsonFactory = $resultJsonFactory;
-         $this->sessionTransparent = $sessionTransparent;
-         $this->secureTokenService = $secureTokenService;
--        $this->sessionManager = $sessionManager;
-+        $this->sessionManager = $sessionInterface ?: $sessionManager;
-         $this->transparent = $transparent;
-         parent::__construct($context);
-     }
-@@ -82,7 +86,11 @@ class RequestSecureToken extends \Magento\Framework\App\Action\Action
-         /** @var Quote $quote */
-         $quote = $this->sessionManager->getQuote();
- 
--        if (!$quote or !$quote instanceof Quote) {
-+        if (!$quote || !$quote instanceof Quote) {
-+            return $this->getErrorResponse();
-+        }
-+
-+        if (!$this->transparent->isActive($quote->getStoreId())) {
-             return $this->getErrorResponse();
-         }
- 
-@@ -106,6 +114,8 @@ class RequestSecureToken extends \Magento\Framework\App\Action\Action
-     }
- 
-     /**
-+     * Get error response.
-+     *
-      * @return Json
-      */
-     private function getErrorResponse()
-diff --git a/app/code/Magento/Paypal/Controller/Transparent/Response.php b/app/code/Magento/Paypal/Controller/Transparent/Response.php
-index 67ec9afff2c..05d11cedd03 100644
---- a/app/code/Magento/Paypal/Controller/Transparent/Response.php
-+++ b/app/code/Magento/Paypal/Controller/Transparent/Response.php
-@@ -6,6 +6,8 @@
- namespace Magento\Paypal\Controller\Transparent;
- 
- use Magento\Framework\App\CsrfAwareActionInterface;
-+use Magento\Framework\App\Request\InvalidRequestException;
-+use Magento\Framework\App\RequestInterface;
- use Magento\Framework\Registry;
- use Magento\Framework\App\Action\Context;
- use Magento\Framework\View\Result\LayoutFactory;
-@@ -17,13 +19,13 @@ use Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator;
- use Magento\Paypal\Model\Payflow\Transparent;
- use Magento\Sales\Api\PaymentFailuresInterface;
- use Magento\Framework\Session\Generic as Session;
--use Magento\Framework\App\RequestInterface;
--use Magento\Framework\App\Request\InvalidRequestException;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- 
- /**
-+ * Class for requesting the response result form the paypal controller.
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Response extends \Magento\Framework\App\Action\Action implements CsrfAwareActionInterface
-+class Response extends \Magento\Framework\App\Action\Action implements CsrfAwareActionInterface, HttpPostActionInterface
- {
-     /**
-      * Core registry
-@@ -112,6 +114,8 @@ class Response extends \Magento\Framework\App\Action\Action implements CsrfAware
-     }
- 
-     /**
-+     * Saves the payment in quote
-+     *
-      * @return ResultInterface
-      */
-     public function execute()
-@@ -120,7 +124,7 @@ class Response extends \Magento\Framework\App\Action\Action implements CsrfAware
-         try {
-             $response = $this->transaction->getResponseObject($this->getRequest()->getPostValue());
-             $this->responseValidator->validate($response, $this->transparent);
--            $this->transaction->savePaymentInQuote($response);
-+            $this->transaction->savePaymentInQuote($response, (int)$this->sessionTransparent->getQuoteId());
-         } catch (LocalizedException $exception) {
-             $parameters['error'] = true;
-             $parameters['error_msg'] = $exception->getMessage();
-diff --git a/app/code/Magento/Paypal/CustomerData/BillingAgreement.php b/app/code/Magento/Paypal/CustomerData/BillingAgreement.php
-index 2c4cdf55bff..a6304f32197 100644
---- a/app/code/Magento/Paypal/CustomerData/BillingAgreement.php
-+++ b/app/code/Magento/Paypal/CustomerData/BillingAgreement.php
-@@ -79,7 +79,7 @@ class BillingAgreement implements SectionSourceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSectionData()
-     {
-@@ -93,7 +93,7 @@ class BillingAgreement implements SectionSourceInterface
-                         [\Magento\Paypal\Model\Express\Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT => 1]
-                     )
-                 ),
--                'confirmMessage' => $this->escaper->escapeJs(
-+                'confirmMessage' => $this->escaper->escapeHtml(
-                     __('Would you like to sign a billing agreement to streamline further purchases with PayPal?')
-                 )
-             ];
-diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
-index 3b0f7b97482..41f122ed9b3 100644
---- a/app/code/Magento/Paypal/Model/AbstractConfig.php
-+++ b/app/code/Magento/Paypal/Model/AbstractConfig.php
-@@ -9,7 +9,6 @@ use Magento\Framework\App\ProductMetadataInterface;
- use Magento\Payment\Model\Method\ConfigInterface;
- use Magento\Payment\Model\MethodInterface;
- use Magento\Store\Model\ScopeInterface;
--use Magento\Paypal\Model\Config;
- use Magento\Framework\App\ObjectManager;
- 
- /**
-@@ -134,7 +133,7 @@ abstract class AbstractConfig implements ConfigInterface
-      * Returns payment configuration value
-      *
-      * @param string $key
--     * @param null $storeId
-+     * @param null|int $storeId
-      * @return null|string
-      *
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-@@ -224,15 +223,26 @@ abstract class AbstractConfig implements ConfigInterface
-      */
-     public function shouldUseUnilateralPayments()
-     {
--        return $this->getValue('business_account') && !$this->isWppApiAvailabe();
-+        return $this->getValue('business_account') && !$this->isWppApiAvailable();
-     }
- 
-     /**
-      * Check whether WPP API credentials are available for this method
-      *
-+     * @deprecated
-      * @return bool
-      */
-     public function isWppApiAvailabe()
-+    {
-+        return $this->isWppApiAvailable();
-+    }
-+
-+    /**
-+     * Check whether WPP API credentials are available for this method
-+     *
-+     * @return bool
-+     */
-+    public function isWppApiAvailable()
-     {
-         return $this->getValue('api_username')
-         && $this->getValue('api_password')
-@@ -243,7 +253,7 @@ abstract class AbstractConfig implements ConfigInterface
-     /**
-      * Check whether method available for checkout or not
-      *
--     * @param null $methodCode
-+     * @param null|string $methodCode
-      *
-      * @return bool
-      */
-@@ -282,11 +292,15 @@ abstract class AbstractConfig implements ConfigInterface
-                 break;
-             case Config::METHOD_WPS_BML:
-             case Config::METHOD_WPP_BML:
--                $isEnabled = $this->_scopeConfig->isSetFlag(
--                    'payment/' . Config::METHOD_WPS_BML .'/active',
-+                $disabledFunding = $this->_scopeConfig->getValue(
-+                    'payment/paypal_express/disable_funding_options',
-                     ScopeInterface::SCOPE_STORE,
-                     $this->_storeId
--                )
-+                );
-+                $isExpressCreditEnabled = $disabledFunding
-+                    ? strpos($disabledFunding, 'CREDIT') === false
-+                    : true;
-+                $isEnabled = $isExpressCreditEnabled
-                 || $this->_scopeConfig->isSetFlag(
-                     'payment/' . Config::METHOD_WPP_BML .'/active',
-                     ScopeInterface::SCOPE_STORE,
-diff --git a/app/code/Magento/Paypal/Model/Api/AbstractApi.php b/app/code/Magento/Paypal/Model/Api/AbstractApi.php
-index 6f578e44eae..73a4f691479 100644
---- a/app/code/Magento/Paypal/Model/Api/AbstractApi.php
-+++ b/app/code/Magento/Paypal/Model/Api/AbstractApi.php
-@@ -454,6 +454,7 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
- 
-     /**
-      * Prepare shipping options request
-+     *
-      * Returns false if there are no shipping options
-      *
-      * @param array &$request
-@@ -520,7 +521,7 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
-     }
- 
-     /**
--     * region_id workaround: PayPal requires state code, try to find one in the address
-+     * Region_id workaround: PayPal requires state code, try to find one in the address
-      *
-      * @param \Magento\Framework\DataObject $address
-      * @return string
-@@ -577,6 +578,7 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
- 
-     /**
-      * Filter qty in API calls
-+     *
-      * Paypal note: The value for quantity must be a positive integer. Null, zero, or negative numbers are not allowed.
-      *
-      * @param float|string|int $value
-@@ -584,7 +586,7 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
-      */
-     protected function _filterQty($value)
-     {
--        return intval($value);
-+        return (int)$value;
-     }
- 
-     /**
-diff --git a/app/code/Magento/Paypal/Model/Api/PayflowNvp.php b/app/code/Magento/Paypal/Model/Api/PayflowNvp.php
-index 6373c6d99fb..b769cbe4364 100644
---- a/app/code/Magento/Paypal/Model/Api/PayflowNvp.php
-+++ b/app/code/Magento/Paypal/Model/Api/PayflowNvp.php
-@@ -136,6 +136,9 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
-         'CVV2MATCH' => 'cvv2_check_result',
- 
-         'USERSELECTEDFUNDINGSOURCE' => 'funding_source',
-+
-+        'NOSHIPPING' => 'suppress_shipping',
-+        'REQBILLINGADDRESS' => 'require_billing_address',
-     ];
- 
-     /**
-@@ -248,6 +251,8 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
-         'PAYFLOWCOLOR',
-         'LOCALECODE',
-         'USERSELECTEDFUNDINGSOURCE',
-+        'NOSHIPPING',
-+        'REQBILLINGADDRESS',
-     ];
- 
-     /**
-@@ -727,6 +732,7 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
- 
-     /**
-      * Additional response processing.
-+     *
-      * Hack to cut off length from API type response params.
-      *
-      * @param  array $response
-@@ -784,7 +790,8 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
-     }
- 
-     /**
--     * Set specific data when negative line item case
-+     * Set specific data when negative line item case.
-+     *
-      * @return void
-      */
-     protected function _setSpecificForNegativeLineItems()
-diff --git a/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php b/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php
-index 2ebe088d31d..8965684d108 100644
---- a/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php
-+++ b/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php
-@@ -6,7 +6,7 @@
- namespace Magento\Paypal\Model\Billing;
- 
- /**
-- * Billing Agreement abstaract class
-+ * Billing Agreement abstract class
-  */
- abstract class AbstractAgreement extends \Magento\Framework\Model\AbstractModel
- {
-diff --git a/app/code/Magento/Paypal/Model/Cart.php b/app/code/Magento/Paypal/Model/Cart.php
-index cef17fab8d9..90bc2b5e632 100644
---- a/app/code/Magento/Paypal/Model/Cart.php
-+++ b/app/code/Magento/Paypal/Model/Cart.php
-@@ -9,6 +9,7 @@ namespace Magento\Paypal\Model;
- 
- /**
-  * PayPal-specific model for shopping cart items and totals
-+ *
-  * The main idea is to accommodate all possible totals into PayPal-compatible 4 totals and line items
-  */
- class Cart extends \Magento\Payment\Model\Cart
-@@ -179,7 +180,7 @@ class Cart extends \Magento\Payment\Model\Cart
-     ) {
-         $dataContainer = $salesEntity->getTaxContainer();
-         $this->addTax((double)$dataContainer->getBaseDiscountTaxCompensationAmount());
--        $this->addTax((double)$dataContainer->getBaseShippingDiscountTaxCompensationAmount());
-+        $this->addTax((double)$dataContainer->getBaseShippingDiscountTaxCompensationAmnt());
-     }
- 
-     /**
-diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
-index 34e40ac7509..e197218752b 100644
---- a/app/code/Magento/Paypal/Model/Config.php
-+++ b/app/code/Magento/Paypal/Model/Config.php
-@@ -10,6 +10,7 @@ use Magento\Payment\Helper\Formatter;
- 
- /**
-  * Config model that is aware of all \Magento\Paypal payment methods
-+ *
-  * Works with PayPal-specific system configuration
- 
-  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
-@@ -632,6 +633,7 @@ class Config extends AbstractConfig
- 
-     /**
-      * Check whether method available for checkout or not
-+     *
-      * Logic based on merchant country, methods dependence
-      *
-      * @param string|null $methodCode
-@@ -677,7 +679,7 @@ class Config extends AbstractConfig
-                 }
-                 break;
-             case self::METHOD_BILLING_AGREEMENT:
--                $result = $this->isWppApiAvailabe();
-+                $result = $this->isWppApiAvailable();
-                 break;
-         }
-         return $result;
-@@ -723,6 +725,7 @@ class Config extends AbstractConfig
- 
-     /**
-      * Check whether method supported for specified country or not
-+     *
-      * Use $_methodCode and merchant country by default
-      *
-      * @param string|null $method
-@@ -896,6 +899,7 @@ class Config extends AbstractConfig
- 
-     /**
-      * Get url for additional actions that PayPal may require customer to do after placing the order.
-+     *
-      * For instance, redirecting customer to bank for payment confirmation.
-      *
-      * @param string $token
-@@ -957,6 +961,7 @@ class Config extends AbstractConfig
- 
-     /**
-      * Express checkout shortcut pic URL getter
-+     *
-      * PayPal will ignore "pal", if there is no total amount specified
-      *
-      * @param string $localeCode
-@@ -996,6 +1001,7 @@ class Config extends AbstractConfig
- 
-     /**
-      * Get PayPal "mark" image URL
-+     *
-      * Supposed to be used on payment methods selection
-      * $staticSize is applicable for static images only
-      *
-@@ -1032,6 +1038,7 @@ class Config extends AbstractConfig
- 
-     /**
-      * Get "What Is PayPal" localized URL
-+     *
-      * Supposed to be used with "mark" as popup window
-      *
-      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-@@ -1262,6 +1269,7 @@ class Config extends AbstractConfig
- 
-     /**
-      * Whether to ask customer to create billing agreements
-+     *
-      * Unilateral payments are incompatible with the billing agreements
-      *
-      * @return bool
-@@ -1376,6 +1384,7 @@ class Config extends AbstractConfig
- 
-     /**
-      * Dynamic PayPal image URL getter
-+     *
-      * Also can render dynamic Acceptance Mark
-      *
-      * @param string $type
-@@ -1502,6 +1511,7 @@ class Config extends AbstractConfig
-             case 'allow_ba_signup':
-             case 'in_context':
-             case 'merchant_id':
-+            case 'supported_locales':
-                 return "payment/{$this->_methodCode}/{$fieldName}";
-             default:
-                 return $this->_mapMethodFieldset($fieldName);
-@@ -1626,6 +1636,7 @@ class Config extends AbstractConfig
-      *
-      * @param string $fieldName
-      * @return string|null
-+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-     protected function _mapGenericStyleFieldset($fieldName)
-     {
-@@ -1636,9 +1647,10 @@ class Config extends AbstractConfig
-             case 'paypal_hdrbackcolor':
-             case 'paypal_hdrbordercolor':
-             case 'paypal_payflowcolor':
-+            case 'disable_funding_options':
-                 return "paypal/style/{$fieldName}";
-             default:
--                return null;
-+                return $this->mapButtonStyles($fieldName);
-         }
-     }
- 
-@@ -1688,6 +1700,36 @@ class Config extends AbstractConfig
-         }
-     }
- 
-+    /**
-+     * Map PayPal button style config fields
-+     *
-+     * @param string $fieldName
-+     * @return null|string
-+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-+     */
-+    private function mapButtonStyles(string $fieldName)
-+    {
-+        $page = substr($fieldName, 0, (int)strpos($fieldName, '_page_button_'));
-+
-+        if (!$page) {
-+            return null;
-+        }
-+
-+        switch ($fieldName) {
-+            case "{$page}_page_button_customize":
-+            case "{$page}_page_button_layout":
-+            case "{$page}_page_button_size":
-+            case "{$page}_page_button_color":
-+            case "{$page}_page_button_shape":
-+            case "{$page}_page_button_label":
-+            case "{$page}_page_button_mx_installment_period":
-+            case "{$page}_page_button_br_installment_period":
-+                return "paypal/style/{$fieldName}";
-+            default:
-+                return null;
-+        }
-+    }
-+
-     /**
-      * Payment API authentication methods source getter
-      *
-@@ -1725,6 +1767,7 @@ class Config extends AbstractConfig
- 
-     /**
-      * Get Display option from stored config
-+     *
-      * @param string $section
-      *
-      * @return mixed
-@@ -1752,6 +1795,7 @@ class Config extends AbstractConfig
- 
-     /**
-      * Get Position option from stored config
-+     *
-      * @param string $section
-      *
-      * @return mixed
-@@ -1767,6 +1811,7 @@ class Config extends AbstractConfig
- 
-     /**
-      * Get Size option from stored config
-+     *
-      * @param string $section
-      *
-      * @return mixed
-diff --git a/app/code/Magento/Paypal/Model/Config/Rules/Converter.php b/app/code/Magento/Paypal/Model/Config/Rules/Converter.php
-index 2bae810a5fd..2baedaa38f5 100644
---- a/app/code/Magento/Paypal/Model/Config/Rules/Converter.php
-+++ b/app/code/Magento/Paypal/Model/Config/Rules/Converter.php
-@@ -63,6 +63,7 @@ class Converter implements ConverterInterface
-             if ($this->hasNodeElement($child)) {
-                 $result[$child->getAttribute('name')] = [
-                     'value' => $child->getAttribute('value'),
-+                    'include' => $child->getAttribute('include'),
-                     'predicate' => $this->createPredicate($child),
-                 ];
-             }
-diff --git a/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php b/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
-index c2056aea08c..5d5db0128b1 100644
---- a/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
-+++ b/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
-@@ -5,7 +5,6 @@
-  */
- namespace Magento\Paypal\Model\Config\Structure\Element;
- 
--use Magento\Framework\App\RequestInterface;
- use Magento\Config\Model\Config\Structure\Element\Field as FieldConfigStructure;
- use Magento\Paypal\Model\Config\StructurePlugin as ConfigStructurePlugin;
- 
-@@ -14,19 +13,6 @@ use Magento\Paypal\Model\Config\StructurePlugin as ConfigStructurePlugin;
-  */
- class FieldPlugin
- {
--    /**
--     * @var RequestInterface
--     */
--    private $request;
--
--    /**
--     * @param RequestInterface $request
--     */
--    public function __construct(RequestInterface $request)
--    {
--        $this->request = $request;
--    }
--
-     /**
-      * Get original configPath (not changed by PayPal configuration inheritance)
-      *
-@@ -36,7 +22,7 @@ class FieldPlugin
-      */
-     public function afterGetConfigPath(FieldConfigStructure $subject, $result)
-     {
--        if (!$result && $this->request->getParam('section') == 'payment') {
-+        if (!$result && strpos($subject->getPath(), 'payment_') === 0) {
-             $result = preg_replace(
-                 '@^(' . implode('|', ConfigStructurePlugin::getPaypalConfigCountries(true)) . ')/@',
-                 'payment/',
-diff --git a/app/code/Magento/Paypal/Model/Express.php b/app/code/Magento/Paypal/Model/Express.php
-index 4684abdc9be..946c0fd4c66 100644
---- a/app/code/Magento/Paypal/Model/Express.php
-+++ b/app/code/Magento/Paypal/Model/Express.php
-@@ -17,10 +17,12 @@ use Magento\Quote\Model\Quote;
- use Magento\Store\Model\ScopeInterface;
- 
- /**
-- * PayPal Express Module
-+ * PayPal Express Module.
-+ *
-  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class Express extends \Magento\Payment\Model\Method\AbstractMethod
- {
-@@ -44,7 +46,7 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
-      *
-      * @var bool
-      */
--    protected $_isGateway = false;
-+    protected $_isGateway = true;
- 
-     /**
-      * Availability option
-@@ -179,6 +181,11 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
-      */
-     protected $transactionBuilder;
- 
-+    /**
-+     * @var string
-+     */
-+    private static $authorizationExpiredCode = 10601;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -269,12 +276,14 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
-                 ApiProcessableException::API_MAXIMUM_AMOUNT_FILTER_DECLINE,
-                 ApiProcessableException::API_OTHER_FILTER_DECLINE,
-                 ApiProcessableException::API_ADDRESS_MATCH_FAIL,
-+                self::$authorizationExpiredCode
-             ]
-         );
-     }
- 
-     /**
-      * Store setter
-+     *
-      * Also updates store ID in config object
-      *
-      * @param \Magento\Store\Model\Store|int $store
-@@ -334,6 +343,7 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
- 
-     /**
-      * Check whether payment method can be used
-+     *
-      * @param \Magento\Quote\Api\Data\CartInterface|Quote|null $quote
-      * @return bool
-      */
-@@ -432,8 +442,8 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
-     public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
-     {
-         $authorizationTransaction = $payment->getAuthorizationTransaction();
--        $authorizationPeriod = abs(intval($this->getConfigData('authorization_honor_period')));
--        $maxAuthorizationNumber = abs(intval($this->getConfigData('child_authorization_number')));
-+        $authorizationPeriod = abs((int)$this->getConfigData('authorization_honor_period'));
-+        $maxAuthorizationNumber = abs((int)$this->getConfigData('child_authorization_number'));
-         $order = $payment->getOrder();
-         $isAuthorizationCreated = false;
- 
-@@ -538,13 +548,24 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
-      */
-     public function cancel(\Magento\Payment\Model\InfoInterface $payment)
-     {
--        $this->void($payment);
-+        try {
-+            $this->void($payment);
-+        } catch (ApiProcessableException $e) {
-+            if ((int)$e->getCode() === self::$authorizationExpiredCode) {
-+                $payment->setTransactionId(null);
-+                $payment->setIsTransactionClosed(true);
-+                $payment->setShouldCloseParentTransaction(true);
-+            } else {
-+                throw $e;
-+            }
-+        }
- 
-         return $this;
-     }
- 
-     /**
-      * Whether payment can be reviewed
-+     *
-      * @return bool
-      */
-     public function canReviewPayment()
-@@ -601,6 +622,8 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
-     }
- 
-     /**
-+     * Returns api instance
-+     *
-      * @return Api\Nvp
-      */
-     public function getApi()
-@@ -717,6 +740,7 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
- 
-     /**
-      * Check void availability
-+     *
-      * @return bool
-      * @throws \Magento\Framework\Exception\LocalizedException
-      * @internal param \Magento\Framework\DataObject $payment
-@@ -750,7 +774,7 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
-                 return false;
-             }
- 
--            $orderValidPeriod = abs(intval($this->getConfigData('order_valid_period')));
-+            $orderValidPeriod = abs((int)$this->getConfigData('order_valid_period'));
- 
-             $dateCompass = new \DateTime($orderTransaction->getCreatedAt());
-             $dateCompass->modify('+' . $orderValidPeriod . ' days');
-@@ -805,7 +829,7 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
-      */
-     protected function _isTransactionExpired(Transaction $transaction, $period)
-     {
--        $period = intval($period);
-+        $period = (int)$period;
-         if (0 == $period) {
-             return true;
-         }
-diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
-index 0388d58910d..72f166e8d07 100644
---- a/app/code/Magento/Paypal/Model/Express/Checkout.php
-+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
-@@ -17,15 +17,17 @@ use Magento\Sales\Model\Order\Email\Sender\OrderSender;
- 
- /**
-  * Wrapper that performs Paypal Express and Checkout communication
-- * Use current Paypal Express method instance
-+ *
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class Checkout
- {
-     /**
-      * Cache ID prefix for "pal" lookup
-+     *
-      * @var string
-      */
-     const PAL_CACHE_ID = 'paypal_express_checkout_pal';
-@@ -367,6 +369,7 @@ class Checkout
- 
-     /**
-      * Checkout with PayPal image URL getter
-+     *
-      * Spares API calls of getting "pal" variable, by putting it into cache per store view
-      *
-      * @return string
-@@ -599,15 +602,17 @@ class Checkout
- 
-     /**
-      * Update quote when returned from PayPal
--     * rewrite billing address by paypal
--     * save old billing address for new customer
-+     *
-+     * Rewrite billing address by paypal, save old billing address for new customer, and
-      * export shipping address in case address absence
-      *
-      * @param string $token
-+     * @param string|null $payerIdentifier
-      * @return void
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-+     * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
--    public function returnFromPaypal($token)
-+    public function returnFromPaypal($token, string $payerIdentifier = null)
-     {
-         $this->_getApi()
-             ->setToken($token)
-@@ -616,14 +621,15 @@ class Checkout
- 
-         $this->ignoreAddressValidation();
- 
-+        // check if we came from the Express Checkout button
-+        $isButton = (bool)$quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON);
-+
-         // import shipping address
-         $exportedShippingAddress = $this->_getApi()->getExportedShippingAddress();
-         if (!$quote->getIsVirtual()) {
-             $shippingAddress = $quote->getShippingAddress();
-             if ($shippingAddress) {
--                if ($exportedShippingAddress
--                    && $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1
--                ) {
-+                if ($exportedShippingAddress && $isButton) {
-                     $this->_setExportedAddressData($shippingAddress, $exportedShippingAddress);
-                     // PayPal doesn't provide detailed shipping info: prefix, middlename, lastname, suffix
-                     $shippingAddress->setPrefix(null);
-@@ -651,12 +657,11 @@ class Checkout
-         }
- 
-         // import billing address
--        $portBillingFromShipping = $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1
--            && $this->_config->getValue(
--                'requireBillingAddress'
--            ) != \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL
--            && !$quote->isVirtual();
--        if ($portBillingFromShipping) {
-+        $requireBillingAddress = (int)$this->_config->getValue(
-+            'requireBillingAddress'
-+        ) === \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
-+
-+        if ($isButton && !$requireBillingAddress && !$quote->isVirtual()) {
-             $billingAddress = clone $shippingAddress;
-             $billingAddress->unsAddressId()->unsAddressType()->setCustomerAddressId(null);
-             $data = $billingAddress->getData();
-@@ -664,11 +669,17 @@ class Checkout
-             $quote->getBillingAddress()->addData($data);
-             $quote->getShippingAddress()->setSameAsBilling(1);
-         } else {
--            $billingAddress = $quote->getBillingAddress();
-+            $billingAddress = $quote->getBillingAddress()->setCustomerAddressId(null);
-         }
-         $exportedBillingAddress = $this->_getApi()->getExportedBillingAddress();
- 
--        $this->_setExportedAddressData($billingAddress, $exportedBillingAddress);
-+        // Since country is required field for billing and shipping address,
-+        // we consider the address information to be empty if country is empty.
-+        $isEmptyAddress = ($billingAddress->getCountryId() === null);
-+
-+        if ($requireBillingAddress || $isEmptyAddress) {
-+            $this->_setExportedAddressData($billingAddress, $exportedBillingAddress);
-+        }
-         $billingAddress->setCustomerNote($exportedBillingAddress->getData('note'));
-         $quote->setBillingAddress($billingAddress);
-         $quote->setCheckoutMethod($this->getCheckoutMethod());
-@@ -677,7 +688,8 @@ class Checkout
-         $payment = $quote->getPayment();
-         $payment->setMethod($this->_methodType);
-         $this->_paypalInfo->importToPayment($this->_getApi(), $payment);
--        $payment->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_PAYER_ID, $this->_getApi()->getPayerId())
-+        $payerId = $payerIdentifier ? : $this->_getApi()->getPayerId();
-+        $payment->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_PAYER_ID, $payerId)
-             ->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_TOKEN, $token);
-         $quote->collectTotals();
-         $this->quoteRepository->save($quote);
-@@ -812,8 +824,12 @@ class Checkout
-             case \Magento\Sales\Model\Order::STATE_PROCESSING:
-             case \Magento\Sales\Model\Order::STATE_COMPLETE:
-             case \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW:
--                if (!$order->getEmailSent()) {
--                    $this->orderSender->send($order);
-+                try {
-+                    if (!$order->getEmailSent()) {
-+                        $this->orderSender->send($order);
-+                    }
-+                } catch (\Exception $e) {
-+                    $this->_logger->critical($e);
-                 }
-                 $this->_checkoutSession->start();
-                 break;
-@@ -900,17 +916,6 @@ class Checkout
-      */
-     protected function _setExportedAddressData($address, $exportedAddress)
-     {
--        // Exported data is more priority if we came from Express Checkout button
--        $isButton = (bool)$this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON);
--
--        // Since country is required field for billing and shipping address,
--        // we consider the address information to be empty if country is empty.
--        $isEmptyAddress = ($address->getCountryId() === null);
--
--        if (!$isButton && !$isEmptyAddress) {
--            return;
--        }
--
-         foreach ($exportedAddress->getExportedKeys() as $key) {
-             $data = $exportedAddress->getData($key);
-             if (!empty($data)) {
-@@ -947,6 +952,8 @@ class Checkout
-     }
- 
-     /**
-+     * Get api
-+     *
-      * @return \Magento\Paypal\Model\Api\Nvp
-      */
-     protected function _getApi()
-@@ -959,8 +966,9 @@ class Checkout
- 
-     /**
-      * Attempt to collect address shipping rates and return them for further usage in instant update API
--     * Returns empty array if it was impossible to obtain any shipping rate
--     * If there are shipping rates obtained, the method must return one of them as default.
-+     *
-+     * Returns empty array if it was impossible to obtain any shipping rate and
-+     * if there are shipping rates obtained, the method must return one of them as default.
-      *
-      * @param Address $address
-      * @param bool $mayReturnEmpty
-@@ -1044,22 +1052,20 @@ class Checkout
-      * Compare two shipping options based on their amounts
-      *
-      * This function is used as a callback comparison function in shipping options sorting process
--     * @see self::_prepareShippingOptions()
-      *
-+     * @see self::_prepareShippingOptions()
-      * @param \Magento\Framework\DataObject $option1
-      * @param \Magento\Framework\DataObject $option2
-      * @return int
-      */
-     protected static function cmpShippingOptions(DataObject $option1, DataObject $option2)
-     {
--        if ($option1->getAmount() == $option2->getAmount()) {
--            return 0;
--        }
--        return ($option1->getAmount() < $option2->getAmount()) ? -1 : 1;
-+        return $option1->getAmount() <=> $option2->getAmount();
-     }
- 
-     /**
-      * Try to find whether the code provided by PayPal corresponds to any of possible shipping rates
-+     *
-      * This method was created only because PayPal has issues with returning the selected code.
-      * If in future the issue is fixed, we don't need to attempt to match it. It would be enough to set the method code
-      * before collecting shipping rates
-@@ -1070,6 +1076,7 @@ class Checkout
-      */
-     protected function _matchShippingMethodCode(Address $address, $selectedCode)
-     {
-+        $address->collectShippingRates();
-         $options = $this->_prepareShippingOptions($address, false);
-         foreach ($options as $option) {
-             if ($selectedCode === $option['code'] // the proper case as outlined in documentation
-@@ -1085,6 +1092,7 @@ class Checkout
- 
-     /**
-      * Create payment redirect url
-+     *
-      * @param bool|null $button
-      * @param string $token
-      * @return void
-@@ -1108,6 +1116,7 @@ class Checkout
- 
-     /**
-      * Set shipping options to api
-+     *
-      * @param \Magento\Paypal\Model\Cart $cart
-      * @param \Magento\Quote\Model\Quote\Address|null $address
-      * @return void
-diff --git a/app/code/Magento/Paypal/Model/Express/LocaleResolver.php b/app/code/Magento/Paypal/Model/Express/LocaleResolver.php
-new file mode 100644
-index 00000000000..c9136d03036
---- /dev/null
-+++ b/app/code/Magento/Paypal/Model/Express/LocaleResolver.php
-@@ -0,0 +1,112 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Model\Express;
-+
-+use Magento\Framework\Locale\ResolverInterface;
-+use Magento\Paypal\Model\ConfigFactory;
-+use Magento\Paypal\Model\Config;
-+
-+/**
-+ * Resolves locale for PayPal Express.
-+ */
-+class LocaleResolver implements ResolverInterface
-+{
-+    /**
-+     * @var ResolverInterface
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * Mapping Magento locales on PayPal locales.
-+     *
-+     * @var array
-+     */
-+    private $localeMap = [
-+        'zh_Hans_CN' => 'zh_CN',
-+        'zh_Hant_HK' => 'zh_HK',
-+        'zh_Hant_TW' => 'zh_TW'
-+    ];
-+
-+    /**
-+     * @param ResolverInterface $resolver
-+     * @param ConfigFactory $configFactory
-+     */
-+    public function __construct(ResolverInterface $resolver, ConfigFactory $configFactory)
-+    {
-+        $this->resolver = $resolver;
-+        $this->config = $configFactory->create();
-+        $this->config->setMethod(Config::METHOD_EXPRESS);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getDefaultLocalePath()
-+    {
-+        return $this->resolver->getDefaultLocalePath();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setDefaultLocale($locale)
-+    {
-+        return $this->resolver->setDefaultLocale($locale);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getDefaultLocale()
-+    {
-+        return $this->resolver->getDefaultLocale();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setLocale($locale = null)
-+    {
-+        return $this->resolver->setLocale($locale);
-+    }
-+
-+    /**
-+     * Gets store's locale or the `en_US` locale if store's locale does not supported by PayPal.
-+     *
-+     * @return string
-+     * @see https://developer.paypal.com/docs/api/reference/locale-codes/#supported-locale-codes
-+     */
-+    public function getLocale(): string
-+    {
-+        $locale = $this->localeMap[$this->resolver->getLocale()] ?? $this->resolver->getLocale();
-+        $allowedLocales = $this->config->getValue('supported_locales');
-+
-+        return strpos($allowedLocales, $locale) !== false ? $locale : 'en_US';
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function emulate($scopeId)
-+    {
-+        return $this->resolver->emulate($scopeId);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function revert()
-+    {
-+        return $this->resolver->revert();
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
-index 518e8b12bfc..c8adb137299 100644
---- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
-+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
-@@ -66,14 +66,20 @@ class ExpressConfigProvider implements ConfigProviderInterface
-     protected $urlBuilder;
- 
-     /**
--     * Constructor
--     *
-+     * @var SmartButtonConfig
-+     */
-+    private $smartButtonConfig;
-+
-+    /**
-+     * ExpressConfigProvider constructor.
-      * @param ConfigFactory $configFactory
-      * @param ResolverInterface $localeResolver
-      * @param CurrentCustomer $currentCustomer
-      * @param PaypalHelper $paypalHelper
-      * @param PaymentHelper $paymentHelper
-      * @param UrlInterface $urlBuilder
-+     * @param SmartButtonConfig|null $smartButtonConfig
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function __construct(
-         ConfigFactory $configFactory,
-@@ -81,7 +87,8 @@ class ExpressConfigProvider implements ConfigProviderInterface
-         CurrentCustomer $currentCustomer,
-         PaypalHelper $paypalHelper,
-         PaymentHelper $paymentHelper,
--        UrlInterface $urlBuilder
-+        UrlInterface $urlBuilder,
-+        SmartButtonConfig $smartButtonConfig
-     ) {
-         $this->localeResolver = $localeResolver;
-         $this->config = $configFactory->create();
-@@ -89,6 +96,7 @@ class ExpressConfigProvider implements ConfigProviderInterface
-         $this->paypalHelper = $paypalHelper;
-         $this->paymentHelper = $paymentHelper;
-         $this->urlBuilder = $urlBuilder;
-+        $this->smartButtonConfig = $smartButtonConfig;
- 
-         foreach ($this->methodCodes as $code) {
-             $this->methods[$code] = $this->paymentHelper->getMethodInstance($code);
-@@ -96,7 +104,7 @@ class ExpressConfigProvider implements ConfigProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConfig()
-     {
-@@ -123,15 +131,17 @@ class ExpressConfigProvider implements ConfigProviderInterface
-             $config['payment']['paypalExpress']['inContextConfig'] = [
-                 'inContextId' => self::IN_CONTEXT_BUTTON_ID,
-                 'merchantId' => $this->config->getValue('merchant_id'),
--                'path' => $this->urlBuilder->getUrl('paypal/express/gettoken', ['_secure' => true]),
--                'clientConfig' => [
--                    'environment' => ((int) $this->config->getValue('sandbox_flag') ? 'sandbox' : 'production'),
--                    'locale' => $locale,
--                    'button' => [
--                        self::IN_CONTEXT_BUTTON_ID
--                    ]
-+            ];
-+            $clientConfig = [
-+                'button' => [
-+                    self::IN_CONTEXT_BUTTON_ID
-                 ],
-+                'getTokenUrl' => $this->urlBuilder->getUrl('paypal/express/getTokenData'),
-+                'onAuthorizeUrl' => $this->urlBuilder->getUrl('paypal/express/onAuthorization'),
-+                'onCancelUrl' => $this->urlBuilder->getUrl('paypal/express/cancel')
-             ];
-+            $clientConfig = array_replace_recursive($clientConfig, $this->smartButtonConfig->getConfig('checkout'));
-+            $config['payment']['paypalExpress']['inContextConfig']['clientConfig'] = $clientConfig;
-         }
- 
-         foreach ($this->methodCodes as $code) {
-@@ -146,6 +156,8 @@ class ExpressConfigProvider implements ConfigProviderInterface
-     }
- 
-     /**
-+     * Return setting value for in context checkout
-+     *
-      * @return bool
-      */
-     protected function isInContextCheckout()
-diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
-index da5599984b7..2a4ec764c41 100644
---- a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
-+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
-@@ -3,6 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Paypal\Model\Payflow\Service\Request;
- 
- use Magento\Framework\Math\Random;
-@@ -13,7 +16,7 @@ use Magento\Paypal\Model\Payflowpro;
- use Magento\Quote\Model\Quote;
- 
- /**
-- * Class SecureToken
-+ * Class for requesting a secure Payflow Pro token from Paypal
-  */
- class SecureToken
- {
-@@ -42,7 +45,6 @@ class SecureToken
-         Random $mathRandom,
-         Transparent $transparent
-     ) {
--
-         $this->url = $url;
-         $this->mathRandom = $mathRandom;
-         $this->transparent = $transparent;
-@@ -52,11 +54,12 @@ class SecureToken
-      * Get the Secure Token from Paypal for TR
-      *
-      * @param Quote $quote
-+     * @param string[] $urls
-      *
-      * @return DataObject
-      * @throws \Exception
-      */
--    public function requestToken(Quote $quote)
-+    public function requestToken(Quote $quote, array $urls = [])
-     {
-         $this->transparent->setStore($quote->getStoreId());
-         $request = $this->transparent->buildBasicRequest();
-@@ -64,11 +67,12 @@ class SecureToken
-         $request->setTrxtype(Payflowpro::TRXTYPE_AUTH_ONLY);
-         $request->setVerbosity('HIGH');
-         $request->setAmt(0);
-+        $request->setCurrency($quote->getBaseCurrencyCode());
-         $request->setCreatesecuretoken('Y');
-         $request->setSecuretokenid($this->mathRandom->getUniqueHash());
--        $request->setReturnurl($this->url->getUrl('paypal/transparent/response'));
--        $request->setErrorurl($this->url->getUrl('paypal/transparent/response'));
--        $request->setCancelurl($this->url->getUrl('paypal/transparent/cancel'));
-+        $request->setReturnurl($urls['return_url'] ?? $this->url->getUrl('paypal/transparent/response'));
-+        $request->setErrorurl($urls['error_url'] ?? $this->url->getUrl('paypal/transparent/response'));
-+        $request->setCancelurl($urls['cancel_url'] ?? $this->url->getUrl('paypal/transparent/response'));
-         $request->setDisablereceipt('TRUE');
-         $request->setSilenttran('TRUE');
- 
-diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
-index 06a8a5b680b..5db78e6fac5 100644
---- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
-+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
-@@ -3,12 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Paypal\Model\Payflow\Service\Response;
- 
- use Magento\Framework\DataObject;
-+use Magento\Framework\Intl\DateTimeFactory;
- use Magento\Payment\Model\Method\Logger;
- use Magento\Paypal\Model\Payflow\Service\Response\Handler\HandlerInterface;
--use Magento\Framework\Session\Generic;
- use Magento\Paypal\Model\Payflowpro;
- use Magento\Quote\Api\CartRepositoryInterface;
- use Magento\Paypal\Model\Payflow\Transparent;
-@@ -18,14 +20,10 @@ use Magento\Sales\Api\Data\OrderPaymentInterface;
- 
- /**
-  * Class Transaction
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Transaction
- {
--    /**
--     * @var Generic
--     */
--    protected $sessionTransparent;
--
-     /**
-      * @var CartRepositoryInterface
-      */
-@@ -52,27 +50,32 @@ class Transaction
-     private $logger;
- 
-     /**
--     * @param Generic $sessionTransparent
-+     * @var DateTimeFactory
-+     */
-+    private $dateTimeFactory;
-+
-+    /**
-      * @param CartRepositoryInterface $quoteRepository
-      * @param Transparent $transparent
-      * @param PaymentMethodManagementInterface $paymentManagement
-      * @param HandlerInterface $errorHandler
-      * @param Logger $logger
-+     * @param DateTimeFactory $dateTimeFactory
-      */
-     public function __construct(
--        Generic $sessionTransparent,
-         CartRepositoryInterface $quoteRepository,
-         Transparent $transparent,
-         PaymentMethodManagementInterface $paymentManagement,
-         HandlerInterface $errorHandler,
--        Logger $logger
-+        Logger $logger,
-+        DateTimeFactory $dateTimeFactory
-     ) {
--        $this->sessionTransparent = $sessionTransparent;
-         $this->quoteRepository = $quoteRepository;
-         $this->transparent = $transparent;
-         $this->paymentManagement = $paymentManagement;
-         $this->errorHandler = $errorHandler;
-         $this->logger = $logger;
-+        $this->dateTimeFactory = $dateTimeFactory;
-     }
- 
-     /**
-@@ -99,13 +102,13 @@ class Transaction
-      * Saves payment information in quote.
-      *
-      * @param DataObject $response
-+     * @param int $cartId
-      * @return void
-      * @throws \InvalidArgumentException
-      */
--    public function savePaymentInQuote($response)
-+    public function savePaymentInQuote($response, $cartId)
-     {
--        $quote = $this->quoteRepository->get($this->sessionTransparent->getQuoteId());
--
-+        $quote = $this->quoteRepository->get($cartId);
-         $payment = $this->paymentManagement->get($quote->getId());
-         if (!$payment instanceof Payment) {
-             throw new \InvalidArgumentException("Variable must contain instance of \\Quote\\Payment.");
-@@ -114,8 +117,45 @@ class Transaction
-         $payment->setData(OrderPaymentInterface::CC_TYPE, $response->getData(OrderPaymentInterface::CC_TYPE));
-         $payment->setAdditionalInformation(Payflowpro::PNREF, $response->getData(Payflowpro::PNREF));
- 
-+        $expDate = $response->getData('expdate');
-+        $expMonth = $this->getCcExpMonth($expDate);
-+        $payment->setCcExpMonth($expMonth);
-+        $expYear = $this->getCcExpYear($expDate);
-+        $payment->setCcExpYear($expYear);
-+
-         $this->errorHandler->handle($payment, $response);
- 
-         $this->paymentManagement->set($quote->getId(), $payment);
-     }
-+
-+    /**
-+     * Extracts expiration month from PayPal response expiration date.
-+     *
-+     * @param string $expDate format {MMYY}
-+     * @return int
-+     */
-+    private function getCcExpMonth(string $expDate): int
-+    {
-+        return (int)substr($expDate, 0, 2);
-+    }
-+
-+    /**
-+     * Extracts expiration year from PayPal response expiration date.
-+     *
-+     * @param string $expDate format {MMYY}
-+     * @return int
-+     */
-+    private function getCcExpYear(string $expDate): int
-+    {
-+        $last2YearDigits = (int)substr($expDate, 2, 2);
-+        $currentDate = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
-+        $first2YearDigits = (int)substr($currentDate->format('Y'), 0, 2);
-+
-+        // case when credit card expires at next century
-+        if ((int)$currentDate->format('y') > $last2YearDigits) {
-+            $first2YearDigits++;
-+        }
-+
-+        return 100 * $first2YearDigits + $last2YearDigits;
-+    }
- }
-diff --git a/app/code/Magento/Paypal/Model/Payflow/Transparent.php b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
-index c308731c695..f90c8f37924 100644
---- a/app/code/Magento/Paypal/Model/Payflow/Transparent.php
-+++ b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Paypal\Model\Payflow;
- 
-@@ -59,6 +60,11 @@ class Transparent extends Payflowpro implements TransparentInterface
-      */
-     private $paymentExtensionFactory;
- 
-+    /**
-+     * @var \Magento\Paypal\Model\CartFactory
-+     */
-+    private $payPalCartFactory;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -76,6 +82,7 @@ class Transparent extends Payflowpro implements TransparentInterface
-      * @param ResponseValidator $responseValidator
-      * @param PaymentTokenInterfaceFactory $paymentTokenFactory
-      * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory
-+     * @param \Magento\Paypal\Model\CartFactory $payPalCartFactory
-      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-      * @param array $data
-@@ -98,6 +105,7 @@ class Transparent extends Payflowpro implements TransparentInterface
-         ResponseValidator $responseValidator,
-         PaymentTokenInterfaceFactory $paymentTokenFactory,
-         OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory,
-+        \Magento\Paypal\Model\CartFactory $payPalCartFactory,
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-         array $data = []
-@@ -123,9 +131,12 @@ class Transparent extends Payflowpro implements TransparentInterface
-         $this->responseValidator = $responseValidator;
-         $this->paymentTokenFactory = $paymentTokenFactory;
-         $this->paymentExtensionFactory = $paymentExtensionFactory;
-+        $this->payPalCartFactory = $payPalCartFactory;
-     }
- 
-     /**
-+     * Gets response validator instance.
-+     *
-      * @return ResponseValidator
-      */
-     public function getResponceValidator()
-@@ -162,13 +173,19 @@ class Transparent extends Payflowpro implements TransparentInterface
-         $this->addRequestOrderInfo($request, $order);
-         $request = $this->fillCustomerContacts($order, $request);
- 
-+        /** @var \Magento\Paypal\Model\Cart $payPalCart */
-+        $payPalCart = $this->payPalCartFactory->create(['salesModel' => $order]);
-+        $payPalCart->getAmounts();
-+
-         $token = $payment->getAdditionalInformation(self::PNREF);
-         $request->setData('trxtype', self::TRXTYPE_AUTH_ONLY);
-         $request->setData('origid', $token);
-         $request->setData('amt', $this->formatPrice($amount));
-         $request->setData('currency', $order->getBaseCurrencyCode());
--        $request->setData('taxamt', $this->formatPrice($order->getBaseTaxAmount()));
--        $request->setData('freightamt', $this->formatPrice($order->getBaseShippingAmount()));
-+        $request->setData('itemamt', $this->formatPrice($payPalCart->getSubtotal()));
-+        $request->setData('taxamt', $this->formatPrice($payPalCart->getTax()));
-+        $request->setData('freightamt', $this->formatPrice($payPalCart->getShipping()));
-+        $request->setData('discount', $this->formatPrice($payPalCart->getDiscount()));
- 
-         $response = $this->postRequest($request, $this->getConfig());
-         $this->processErrors($response);
-@@ -178,6 +195,7 @@ class Transparent extends Payflowpro implements TransparentInterface
-         } catch (LocalizedException $exception) {
-             $payment->setParentTransactionId($response->getData(self::PNREF));
-             $this->void($payment);
-+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
-             throw new LocalizedException(__("The payment couldn't be processed at this time. Please try again later."));
-         }
- 
-@@ -200,10 +218,12 @@ class Transparent extends Payflowpro implements TransparentInterface
-     }
- 
-     /**
-+     * Creates vault payment token.
-+     *
-      * @param Payment $payment
-      * @param string $token
--     * @throws LocalizedException
-      * @return void
-+     * @throws \Exception
-      */
-     protected function createPaymentToken(Payment $payment, $token)
-     {
-@@ -222,8 +242,11 @@ class Transparent extends Payflowpro implements TransparentInterface
-     }
- 
-     /**
-+     * Generates CC expiration date by year and month provided in payment.
-+     *
-      * @param Payment $payment
-      * @return string
-+     * @throws \Exception
-      */
-     private function getExpirationDate(Payment $payment)
-     {
-@@ -242,6 +265,8 @@ class Transparent extends Payflowpro implements TransparentInterface
-     }
- 
-     /**
-+     * Returns payment extension attributes instance.
-+     *
-      * @param Payment $payment
-      * @return \Magento\Sales\Api\Data\OrderPaymentExtensionInterface
-      */
-diff --git a/app/code/Magento/Paypal/Model/Payflowlink.php b/app/code/Magento/Paypal/Model/Payflowlink.php
-index 1955ef3c676..47efd562570 100644
---- a/app/code/Magento/Paypal/Model/Payflowlink.php
-+++ b/app/code/Magento/Paypal/Model/Payflowlink.php
-@@ -425,6 +425,7 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
-         $request->setCreatesecuretoken('Y')
-             ->setSecuretokenid($this->mathRandom->getUniqueHash())
-             ->setTrxtype($this->_getTrxTokenType());
-+        $request = $this->updateRequestReturnUrls($request, $payment);
- 
-         $order = $payment->getOrder();
-         $request->setAmt(sprintf('%.2F', $order->getBaseTotalDue()))
-@@ -440,8 +441,7 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
-     }
- 
-     /**
--     * Get store id from response if exists
--     * or default
-+     * Get store id from response if exists or default
-      *
-      * @return int
-      */
-@@ -464,7 +464,6 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
-         /** @var \Magento\Paypal\Model\Payflow\Request $request */
-         $request = $this->_requestFactory->create();
-         $cscEditable = $this->getConfigData('csc_editable');
--
-         $data = parent::buildBasicRequest();
- 
-         $request->setData($data->getData());
-@@ -514,6 +513,7 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
- 
-     /**
-      * If response is failed throw exception
-+     *
-      * Set token data in payment object
-      *
-      * @param \Magento\Framework\DataObject $response
-@@ -558,6 +558,7 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
-      */
-     protected function _generateSecureSilentPostHash($payment)
-     {
-+        //phpcs:ignore Magento2.Security.InsecureFunction
-         $secureHash = md5($this->mathRandom->getRandomString(10));
-         $payment->setAdditionalInformation($this->_secureSilentPostHashKey, $secureHash);
-         return $secureHash;
-@@ -600,4 +601,30 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
- 
-         return $websiteUrl . 'paypal/' . $this->_callbackController . '/' . $actionName;
-     }
-+
-+    /**
-+     * Update the redirect urls on the request if they are set on the payment
-+     *
-+     * @param \Magento\Paypal\Model\Payflow\Request $request
-+     * @param \Magento\Sales\Model\Order\Payment $payment
-+     * @return \Magento\Paypal\Model\Payflow\Request
-+     */
-+    private function updateRequestReturnUrls(
-+        \Magento\Paypal\Model\Payflow\Request $request,
-+        \Magento\Sales\Model\Order\Payment $payment
-+    ): \Magento\Paypal\Model\Payflow\Request {
-+        $paymentData = $payment->getAdditionalInformation();
-+
-+        if (!empty($paymentData['cancel_url'])) {
-+            $request->setCancelurl($paymentData['cancel_url']);
-+        }
-+        if (!empty($paymentData['return_url'])) {
-+            $request->setReturnurl($paymentData['return_url']);
-+        }
-+        if (!empty($paymentData['error_url'])) {
-+            $request->setErrorurl($paymentData['error_url']);
-+        }
-+
-+        return $request;
-+    }
- }
-diff --git a/app/code/Magento/Paypal/Model/Payflowpro.php b/app/code/Magento/Paypal/Model/Payflowpro.php
-index b5fdaf4ae9f..2ba72c4b26b 100644
---- a/app/code/Magento/Paypal/Model/Payflowpro.php
-+++ b/app/code/Magento/Paypal/Model/Payflowpro.php
-@@ -420,6 +420,7 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
-             $request->setTrxtype(self::TRXTYPE_SALE);
-             $request->setOrigid($payment->getAdditionalInformation(self::PNREF));
-             $payment->unsAdditionalInformation(self::PNREF);
-+            $request->setData('currency', $payment->getOrder()->getBaseCurrencyCode());
-         } elseif ($payment->getParentTransactionId()) {
-             $request = $this->buildBasicRequest();
-             $request->setOrigid($payment->getParentTransactionId());
-@@ -472,6 +473,7 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
- 
-     /**
-      * Check void availability
-+     *
-      * @return bool
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
-@@ -584,7 +586,7 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
-     }
- 
-     /**
--     * {inheritdoc}
-+     * @inheritdoc
-      */
-     public function postRequest(DataObject $request, ConfigInterface $config)
-     {
-@@ -719,6 +721,8 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
-     }
- 
-     /**
-+     * Set billing address
-+     *
-      * @param DataObject $request
-      * @param DataObject $billing
-      *
-@@ -745,6 +749,8 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
-     }
- 
-     /**
-+     * Set shipping address
-+     *
-      * @param DataObject $request
-      * @param DataObject $shipping
-      *
-@@ -815,6 +821,8 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
-     }
- 
-     /**
-+     * Set transaction status
-+     *
-      * @param DataObject $payment
-      * @param DataObject $response
-      *
-@@ -848,6 +856,8 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
-     }
- 
-     /**
-+     * Fill customer contacts
-+     *
-      * @param DataObject $order
-      * @param DataObject $request
-      * @return DataObject
-@@ -869,6 +879,7 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
- 
-     /**
-      * Add order details to payment request
-+     *
-      * @param DataObject $request
-      * @param Order $order
-      * @return void
-@@ -883,7 +894,7 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
-         $orderIncrementId = $order->getIncrementId();
-         $request->setCustref($orderIncrementId)
-             ->setInvnum($orderIncrementId)
--            ->setComment1($orderIncrementId);
-+            ->setData('comment1', $orderIncrementId);
-     }
- 
-     /**
-@@ -917,6 +928,8 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
-     }
- 
-     /**
-+     * Make a transaction Inquiry Request
-+     *
-      * @param InfoInterface $payment
-      * @param string $transactionId
-      * @return DataObject
-diff --git a/app/code/Magento/Paypal/Model/Pro.php b/app/code/Magento/Paypal/Model/Pro.php
-index 5e9159bd2c2..4e0d45ccf3b 100644
---- a/app/code/Magento/Paypal/Model/Pro.php
-+++ b/app/code/Magento/Paypal/Model/Pro.php
-@@ -8,10 +8,10 @@ namespace Magento\Paypal\Model;
- 
- use Magento\Paypal\Model\Api\AbstractApi;
- use Magento\Sales\Api\TransactionRepositoryInterface;
--use Magento\Paypal\Model\Info;
- 
- /**
-- * PayPal Website Payments Pro implementation for payment method instances
-+ * PayPal Website Payments Pro implementation for payment method instances.
-+ *
-  * This model was created because right now PayPal Direct and PayPal Express payment methods cannot have same abstract
-  */
- class Pro
-@@ -147,7 +147,8 @@ class Pro
-     }
- 
-     /**
--     * API instance getter
-+     * API instance getter.
-+     *
-      * Sets current store id to current config instance and passes it to API
-      *
-      * @return \Magento\Paypal\Model\Api\Nvp
-@@ -229,19 +230,22 @@ class Pro
-     public function void(\Magento\Framework\DataObject $payment)
-     {
-         $authTransactionId = $this->_getParentTransactionId($payment);
--        if ($authTransactionId) {
--            $api = $this->getApi();
--            $api->setPayment($payment)->setAuthorizationId($authTransactionId)->callDoVoid();
--            $this->importPaymentInfo($api, $payment);
--        } else {
-+        if (empty($authTransactionId)) {
-             throw new \Magento\Framework\Exception\LocalizedException(
-                 __('You need an authorization transaction to void.')
-             );
-         }
-+
-+        $api = $this->getApi();
-+        $api->setPayment($payment);
-+        $api->setAuthorizationId($authTransactionId);
-+        $api->callDoVoid();
-+        $this->importPaymentInfo($api, $payment);
-     }
- 
-     /**
--     * Attempt to capture payment
-+     * Attempt to capture payment.
-+     *
-      * Will return false if the payment is not supposed to be captured
-      *
-      * @param \Magento\Framework\DataObject $payment
-diff --git a/app/code/Magento/Paypal/Model/Report/Settlement.php b/app/code/Magento/Paypal/Model/Report/Settlement.php
-index 5dc51518f0b..462ca2f9794 100644
---- a/app/code/Magento/Paypal/Model/Report/Settlement.php
-+++ b/app/code/Magento/Paypal/Model/Report/Settlement.php
-@@ -237,6 +237,7 @@ class Settlement extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * Goes to specified host/path and fetches reports from there.
-+     *
-      * Save reports to database.
-      *
-      * @param \Magento\Framework\Filesystem\Io\Sftp $connection
-@@ -446,11 +447,11 @@ class Settlement extends \Magento\Framework\Model\AbstractModel
-      */
-     private function formatAmountColumn($lineItem)
-     {
--        return intval($lineItem) / 100;
-+        return (int)$lineItem / 100;
-     }
- 
-     /**
--     * Load report by unique key (accoutn + report date)
-+     * Load report by unique key (account + report date)
-      *
-      * @return $this
-      */
-@@ -517,6 +518,7 @@ class Settlement extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * Iterate through website configurations and collect all SFTP configurations
-+     *
-      * Filter config values if necessary
-      *
-      * @param bool $automaticMode Whether to skip settings with disabled Automatic Fetching or not
-diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
-new file mode 100644
-index 00000000000..c491f2978e5
---- /dev/null
-+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
-@@ -0,0 +1,155 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Model;
-+
-+use Magento\Framework\Locale\ResolverInterface;
-+
-+/**
-+ * Smart button config
-+ */
-+class SmartButtonConfig
-+{
-+    /**
-+     * @var \Magento\Framework\Locale\ResolverInterface
-+     */
-+    private $localeResolver;
-+
-+    /**
-+     * @var ConfigFactory
-+     */
-+    private $config;
-+
-+    /**
-+     * @var array
-+     */
-+    private $defaultStyles;
-+
-+    /**
-+     * @var array
-+     */
-+    private $allowedFunding;
-+
-+    /**
-+     * @param ResolverInterface $localeResolver
-+     * @param ConfigFactory $configFactory
-+     * @param array $defaultStyles
-+     * @param array $allowedFunding
-+     */
-+    public function __construct(
-+        ResolverInterface $localeResolver,
-+        ConfigFactory $configFactory,
-+        $defaultStyles = [],
-+        $allowedFunding = []
-+    ) {
-+        $this->localeResolver = $localeResolver;
-+        $this->config = $configFactory->create();
-+        $this->config->setMethod(Config::METHOD_EXPRESS);
-+        $this->defaultStyles = $defaultStyles;
-+        $this->allowedFunding = $allowedFunding;
-+    }
-+
-+    /**
-+     * Get smart button config
-+     *
-+     * @param string $page
-+     * @return array
-+     */
-+    public function getConfig(string $page): array
-+    {
-+        return [
-+            'merchantId' => $this->config->getValue('merchant_id'),
-+            'environment' => ((int)$this->config->getValue('sandbox_flag') ? 'sandbox' : 'production'),
-+            'locale' => $this->localeResolver->getLocale(),
-+            'allowedFunding' => $this->getAllowedFunding($page),
-+            'disallowedFunding' => $this->getDisallowedFunding(),
-+            'styles' => $this->getButtonStyles($page),
-+            'isVisibleOnProductPage'  => (int)$this->config->getValue('visible_on_product')
-+        ];
-+    }
-+
-+    /**
-+     * Returns disallowed funding from configuration
-+     *
-+     * @return array
-+     */
-+    private function getDisallowedFunding(): array
-+    {
-+        $disallowedFunding = $this->config->getValue('disable_funding_options');
-+        return $disallowedFunding ? explode(',', $disallowedFunding) : [];
-+    }
-+
-+    /**
-+     * Returns allowed funding
-+     *
-+     * @param string $page
-+     * @return array
-+     */
-+    private function getAllowedFunding(string $page): array
-+    {
-+        return array_values(array_diff($this->allowedFunding[$page], $this->getDisallowedFunding()));
-+    }
-+
-+    /**
-+     * Returns button styles based on configuration
-+     *
-+     * @param string $page
-+     * @return array
-+     */
-+    private function getButtonStyles(string $page): array
-+    {
-+        $styles = $this->defaultStyles[$page];
-+        if ((boolean)$this->config->getValue("{$page}_page_button_customize")) {
-+            $styles['layout'] = $this->config->getValue("{$page}_page_button_layout");
-+            $styles['size'] = $this->config->getValue("{$page}_page_button_size");
-+            $styles['color'] = $this->config->getValue("{$page}_page_button_color");
-+            $styles['shape'] = $this->config->getValue("{$page}_page_button_shape");
-+            $styles['label'] = $this->config->getValue("{$page}_page_button_label");
-+
-+            $styles = $this->updateStyles($styles, $page);
-+        }
-+        return $styles;
-+    }
-+
-+    /**
-+     * Update styles based on locale and labels
-+     *
-+     * @param array $styles
-+     * @param string $page
-+     * @return array
-+     */
-+    private function updateStyles(array $styles, string $page): array
-+    {
-+        $locale = $this->localeResolver->getLocale();
-+
-+        $installmentPeriodLocale = [
-+            'en_MX' => 'mx',
-+            'es_MX' => 'mx',
-+            'en_BR' => 'br',
-+            'pt_BR' => 'br'
-+        ];
-+
-+        // Credit label cannot be used with any custom color option or vertical layout.
-+        if ($styles['label'] === 'credit') {
-+            $styles['color'] = 'darkblue';
-+            $styles['layout'] = 'horizontal';
-+        }
-+
-+        // Installment label is only available for specific locales
-+        if ($styles['label'] === 'installment') {
-+            if (array_key_exists($locale, $installmentPeriodLocale)) {
-+                $styles['installmentperiod'] = (int)$this->config->getValue(
-+                    $page .'_page_button_' . $installmentPeriodLocale[$locale] . '_installment_period'
-+                );
-+            } else {
-+                $styles['label'] = 'paypal';
-+            }
-+        }
-+
-+        return $styles;
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php b/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
-new file mode 100644
-index 00000000000..8ad55d045ff
---- /dev/null
-+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
-@@ -0,0 +1,110 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Model\System\Config\Source;
-+
-+/**
-+ * Get button style options
-+ */
-+class ButtonStyles
-+{
-+    /**
-+     * Button color source getter
-+     *
-+     * @return array
-+     */
-+    public function getColor(): array
-+    {
-+        return [
-+            'gold' => __('Gold'),
-+            'blue' => __('Blue'),
-+            'silver' => __('Silver'),
-+            'black' => __('Black')
-+        ];
-+    }
-+
-+    /**
-+     * Button layout source getter
-+     *
-+     * @return array
-+     */
-+    public function getLayout(): array
-+    {
-+        return [
-+            'vertical' => __('Vertical'),
-+            'horizontal' => __('Horizontal')
-+        ];
-+    }
-+
-+    /**
-+     * Button shape source getter
-+     *
-+     * @return array
-+     */
-+    public function getShape(): array
-+    {
-+        return [
-+            'pill' => __('Pill'),
-+            'rect' => __('Rectangle')
-+        ];
-+    }
-+
-+    /**
-+     * Button size source getter
-+     *
-+     * @return array
-+     */
-+    public function getSize(): array
-+    {
-+        return [
-+            'medium' => __('Medium'),
-+            'large' => __('Large'),
-+            'responsive' => __('Responsive')
-+        ];
-+    }
-+
-+    /**
-+     * Button label source getter
-+     *
-+     * @return array
-+     */
-+    public function getLabel(): array
-+    {
-+        return [
-+            'checkout' => __('Checkout'),
-+            'pay' => __('Pay'),
-+            'buynow' => __('Buy Now'),
-+            'paypal' => __('PayPal'),
-+            'installment' => __('Installment'),
-+            'credit' => __('Credit')
-+        ];
-+    }
-+
-+    /**
-+     * Brazil button installment period source getter
-+     *
-+     * @return array
-+     */
-+    public function getBrInstallmentPeriod(): array
-+    {
-+        $numbers = range(2, 12);
-+
-+        return array_combine($numbers, $numbers);
-+    }
-+
-+    /**
-+     * Mexico button installment period source getter
-+     *
-+     * @return array
-+     */
-+    public function getMxInstallmentPeriod(): array
-+    {
-+        $numbers = range(3, 12, 3);
-+
-+        return array_combine($numbers, $numbers);
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php b/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
-new file mode 100644
-index 00000000000..1a9cfe0998f
---- /dev/null
-+++ b/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
-@@ -0,0 +1,35 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Model\System\Config\Source;
-+
-+/**
-+ * Get disable funding options
-+ */
-+class DisableFundingOptions
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function toOptionArray(): array
-+    {
-+        return [
-+            [
-+                'value' => 'CREDIT',
-+                'label' => __('PayPal Credit')
-+            ],
-+            [
-+                'value' => 'CARD',
-+                'label' => __('PayPal Guest Checkout Credit Card Icons')
-+            ],
-+            [
-+                'value' => 'ELV',
-+                'label' => __('Elektronisches Lastschriftverfahren - German ELV')
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php b/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
-index 58edf68f347..861ca740606 100644
---- a/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
-+++ b/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
-@@ -9,6 +9,8 @@ use Magento\Paypal\Helper\Shortcut\Factory;
- use Magento\Framework\Event\ObserverInterface;
- use Magento\Paypal\Model\Config as PaypalConfig;
- use Magento\Framework\Event\Observer as EventObserver;
-+use Magento\Paypal\Block\Express\InContext\Minicart\SmartButton as MinicartSmartButton;
-+use Magento\Paypal\Block\Express\InContext\SmartButton as SmartButton;
- 
- /**
-  * PayPal module observer
-@@ -50,8 +52,9 @@ class AddPaypalShortcutsObserver implements ObserverInterface
-         /** @var \Magento\Catalog\Block\ShortcutButtons $shortcutButtons */
-         $shortcutButtons = $observer->getEvent()->getContainer();
-         $blocks = [
--            \Magento\Paypal\Block\Express\InContext\Minicart\Button::class =>
-+            MinicartSmartButton::class =>
-                 PaypalConfig::METHOD_WPS_EXPRESS,
-+            SmartButton::class => PaypalConfig::METHOD_WPS_EXPRESS,
-             \Magento\Paypal\Block\Express\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
-             \Magento\Paypal\Block\Bml\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
-             \Magento\Paypal\Block\WpsExpress\Shortcut::class => PaypalConfig::METHOD_WPS_EXPRESS,
-@@ -77,11 +80,9 @@ class AddPaypalShortcutsObserver implements ObserverInterface
-                 '',
-                 $params
-             );
--            $shortcut->setIsInCatalogProduct(
--                $observer->getEvent()->getIsCatalogProduct()
--            )->setShowOrPosition(
--                $observer->getEvent()->getOrPosition()
--            );
-+            $shortcut->setIsInCatalogProduct($observer->getEvent()->getIsCatalogProduct())
-+                ->setShowOrPosition($observer->getEvent()->getOrPosition())
-+                ->setIsShoppingCart((bool) $observer->getEvent()->getIsShoppingCart());
-             $shortcutButtons->addShortcut($shortcut);
-         }
-     }
-diff --git a/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php b/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php
-index 87abdf82645..edb50acc5ee 100644
---- a/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php
-+++ b/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php
-@@ -40,6 +40,10 @@ class OrderCanInvoice
-      */
-     public function afterCanInvoice(Order $order, bool $result): bool
-     {
-+        if (!$order->getPayment()) {
-+            return false;
-+        }
-+
-         if ($this->express->isOrderAuthorizationAllowed($order->getPayment())) {
-             return false;
-         }
-diff --git a/app/code/Magento/Paypal/README.md b/app/code/Magento/Paypal/README.md
-index 8f4453ae0a0..0ed4f2e9029 100644
---- a/app/code/Magento/Paypal/README.md
-+++ b/app/code/Magento/Paypal/README.md
-@@ -1,6 +1,6 @@
- Module Magento\PayPal implements integration with the PayPal payment system. Namely, it enables the following payment methods:
--*PayPal Express Checkout
--*PayPal Payments Standard
--*PayPal Payments Pro
--*PayPal Credit
--*PayFlow Payment Gateway
-+* PayPal Express Checkout
-+* PayPal Payments Standard
-+* PayPal Payments Pro
-+* PayPal Credit
-+* PayFlow Payment Gateway
-diff --git a/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
-new file mode 100644
-index 00000000000..6c4362d83e2
---- /dev/null
-+++ b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
-@@ -0,0 +1,84 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Setup\Patch\Data;
-+
-+use Magento\Framework\Setup\ModuleDataSetupInterface;
-+use Magento\Framework\Setup\Patch\DataPatchInterface;
-+use Magento\Framework\Setup\Patch\PatchVersionInterface;
-+
-+/**
-+ * Class AddPaypalOrderStates
-+ */
-+class UpdatePaypalCreditOption implements DataPatchInterface, PatchVersionInterface
-+{
-+    /**
-+     * @var ModuleDataSetupInterface
-+     */
-+    private $moduleDataSetup;
-+
-+    /**
-+     * PrepareInitialConfig constructor.
-+     * @param ModuleDataSetupInterface $moduleDataSetup
-+     */
-+    public function __construct(
-+        ModuleDataSetupInterface $moduleDataSetup
-+    ) {
-+        $this->moduleDataSetup = $moduleDataSetup;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function apply()
-+    {
-+        $this->moduleDataSetup->getConnection()->startSetup();
-+        $connection = $this->moduleDataSetup->getConnection();
-+        $select = $connection->select()
-+            ->from($this->moduleDataSetup->getTable('core_config_data'), ['scope', 'scope_id', 'value'])
-+            ->where('path = ?', 'payment/paypal_express_bml/active');
-+        foreach ($connection->fetchAll($select) as $pair) {
-+            if (!$pair['value']) {
-+                $this->moduleDataSetup->getConnection()
-+                    ->insertOnDuplicate(
-+                        $this->moduleDataSetup->getTable('core_config_data'),
-+                        [
-+                            'scope' => $pair['scope'],
-+                            'scope_id' => $pair['scope_id'],
-+                            'path' => 'paypal/style/disable_funding_options',
-+                            'value' => 'CREDIT'
-+                        ]
-+                    );
-+            }
-+        }
-+        $this->moduleDataSetup->getConnection()->endSetup();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public static function getDependencies()
-+    {
-+        return [];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public static function getVersion()
-+    {
-+        return '2.3.1';
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getAliases()
-+    {
-+        return [];
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
-new file mode 100644
-index 00000000000..32c2fab40e9
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="OpenPayPalButtonCheckoutPage">
-+        <arguments>
-+            <argument name="countryCode" type="string" defaultValue="us"/>
-+        </arguments>
-+        <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/>
-+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab(countryCode)}}" stepKey="waitForAdvancedSettingTab"/>
-+        <click selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab(countryCode)}}" stepKey="openAdvancedSettingTab"/>
-+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.frontendExperienceSettingsTab(countryCode)}}" stepKey="waitForFrontendExperienceSettingsTab"/>
-+        <click selector="{{PayPalAdvancedSettingConfigSection.frontendExperienceSettingsTab(countryCode)}}" stepKey="openFrontendExperienceSettingsTab"/>
-+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.checkoutPageTab(countryCode)}}" stepKey="waitForCheckoutPageTab"/>
-+        <click selector="{{PayPalAdvancedSettingConfigSection.checkoutPageTab(countryCode)}}" stepKey="openCheckoutPageTab"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml
-new file mode 100644
-index 00000000000..08ca6c78343
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml
-@@ -0,0 +1,40 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="EnablePayPalConfiguration">
-+        <arguments>
-+            <argument name="payPalConfigType"/>
-+            <argument name="countryCode" type="string" defaultValue="us"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="waitForOtherPayPalPaymentsSection"/>
-+        <conditionalClick selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" dependentSelector="{{OtherPayPalPaymentsConfigSection.expandedTab(countryCode)}}" visible="false" stepKey="clickOtherPayPalPaymentsSection"/>
-+        <waitForElementVisible selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="waitForWPSExpressConfigureBtn"/>
-+        <click selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="clickWPSExpressConfigureBtn"/>
-+        <waitForElementVisible selector="{{payPalConfigType.enableSolution(countryCode)}}" stepKey="waitForWPSExpressEnable"/>
-+        <selectOption selector="{{payPalConfigType.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableWPSExpressSolution"/>
-+        <seeInPopup userInput="There is already another PayPal solution enabled. Enable this solution instead?" stepKey="seeAlertMessage"/>
-+        <acceptPopup stepKey="acceptEnablePopUp"/>
-+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+    </actionGroup>
-+    <actionGroup name="CheckEnableOptionPayPalConfiguration">
-+        <arguments>
-+            <argument name="payPalConfigType"/>
-+            <argument name="enabledOption" type="string"/>
-+            <argument name="countryCode" type="string" defaultValue="us"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="waitForOtherPayPalPaymentsSection"/>
-+        <conditionalClick selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" dependentSelector="{{OtherPayPalPaymentsConfigSection.expandedTab(countryCode)}}" visible="false" stepKey="clickOtherPayPalPaymentsSection"/>
-+        <waitForElementVisible selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="waitForWPSExpressConfigureBtn"/>
-+        <click selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="clickWPSExpressConfigureBtn1"/>
-+        <waitForElementVisible selector="{{payPalConfigType.enableSolution(countryCode)}}" stepKey="waitForWPSExpressEnable"/>
-+        <seeOptionIsSelected selector="{{payPalConfigType.enableSolution(countryCode)}}" userInput="{{enabledOption}}" stepKey="seeSelectedOption"/>
-+        <click selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="clickWPSExpressConfigureBtn2"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
-new file mode 100644
-index 00000000000..bae517ffe2f
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
-@@ -0,0 +1,73 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="ConfigPayPalExpressCheckout">
-+        <arguments>
-+            <argument name="credentials" defaultValue="_CREDS"/>
-+            <argument name="countryCode" type="string" defaultValue="us"/>
-+        </arguments>
-+        <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/>
-+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab(countryCode)}}" stepKey="waitForAdvancedSettingTab"/>
-+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.email(countryCode)}}" userInput="{{credentials.paypal_express_email}}" stepKey="inputEmailAssociatedWithPayPalMerchantAccount"/>
-+        <selectOption selector ="{{PayPalExpressCheckoutConfigSection.apiMethod(countryCode)}}" userInput="API Signature" stepKey="inputAPIAuthenticationMethods"/>
-+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.username(countryCode)}}" userInput="{{credentials.paypal_express_api_username}}" stepKey="inputAPIUsername"/>
-+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.password(countryCode)}}" userInput="{{credentials.paypal_express_api_password}}" stepKey="inputAPIPassword"/>
-+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.signature(countryCode)}}" userInput="{{credentials.paypal_express_api_signature}}" stepKey="inputAPISignature"/>
-+        <selectOption selector ="{{PayPalExpressCheckoutConfigSection.sandboxMode(countryCode)}}" userInput="Yes" stepKey="enableSandboxMode"/>
-+        <selectOption selector="{{PayPalExpressCheckoutConfigSection.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableSolution"/>
-+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.merchantID(countryCode)}}" userInput="{{credentials.paypal_express_merchantID}}" stepKey="inputMerchantID"/>
-+        <!--Save configuration-->
-+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
-+    </actionGroup>
-+    <actionGroup name="CreatePayPalOrderWithSelectedPaymentMethodActionGroup" extends="CreateOrderToPrintPageActionGroup">
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPlaceOrderButton"/>
-+        <click selector="{{CheckoutPaymentSection.PayPalPaymentRadio}}" stepKey="clickPlaceOrder"/>
-+        <!--set ID for iframe of PayPal group button-->
-+        <executeJS function="jQuery('.zoid-component-frame.zoid-visible').attr('id', 'myIframe')" stepKey="clickOrderLink"/>
-+        <!--switch to iframe of PayPal group button-->
-+        <comment userInput="switch to iframe of PayPal group button" stepKey="commentSwitchToIframe"/>
-+        <switchToIFrame userInput="myIframe" stepKey="clickPrintOrderLink"/>
-+        <waitForElementVisible selector="{{CheckoutPaymentSection.PayPalBtn}}" stepKey="waitForPayPalBtn"/>
-+        <click selector="{{CheckoutPaymentSection.PayPalBtn}}" stepKey="clickPayPalBtn"/>
-+        <switchToIFrame stepKey="switchBack1"/>
-+        <!--Check in-context-->
-+        <comment userInput="Check in-context" stepKey="commentVerifyInContext"/>
-+        <switchToNextTab stepKey="switchToInContentTab"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <seeCurrentUrlMatches regex="~\//www.sandbox.paypal.com/~" stepKey="seeCurrentUrlMatchesConfigPath1"/>
-+        <waitForElement selector="{{PayPalPaymentSection.email}}" stepKey="waitForLoginForm" />
-+        <fillField selector="{{PayPalPaymentSection.email}}" userInput="{{Payer.buyerEmail}}" stepKey="fillEmail"/>
-+        <fillField selector="{{PayPalPaymentSection.password}}" userInput="{{Payer.buyerPassword}}" stepKey="fillPassword"/>
-+        <click selector="{{PayPalPaymentSection.loginBtn}}" stepKey="login"/>
-+        <waitForPageLoad stepKey="wait"/>
-+        <seeElement selector="{{PayPalPaymentSection.reviewUserInfo}}" stepKey="seePayerName"/>
-+    </actionGroup>
-+    <actionGroup name="addProductToCheckoutPage">
-+        <arguments>
-+            <argument name="Category"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontCategoryPage.url(Category.name)}}" stepKey="onCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
-+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
-+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPlaceOrderButton"/>
-+        <click selector="{{CheckoutPaymentSection.PayPalPaymentRadio}}" stepKey="clickPayPalCheckbox"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..207bf62abf3
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuReportsSalesPayPalSettlement">
-+        <data key="pageTitle">PayPal Settlement Reports</data>
-+        <data key="title">PayPal Settlement</data>
-+        <data key="dataUiId">magento-paypal-report-salesroot-paypal-settlement-reports</data>
-+    </entity>
-+    <entity name="AdminMenuSales">
-+        <data key="pageTitle">Sales</data>
-+        <data key="title">Sales</data>
-+        <data key="dataUiId">magento-sales-sales</data>
-+    </entity>
-+    <entity name="AdminMenuSalesBillingAgreements">
-+        <data key="pageTitle">Billing Agreements</data>
-+        <data key="title">Billing Agreements</data>
-+        <data key="dataUiId">magento-paypal-paypal-billing-agreement</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
-index 4cb6173a027..ae34476e9ac 100644
---- a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
-+++ b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="SamplePaypalConfig" type="paypal_config_state">
-         <requiredEntity type="business_account">SampleBusinessAccount</requiredEntity>
-         <requiredEntity type="api_username">SampleApiUsername</requiredEntity>
-@@ -38,6 +38,9 @@
-     <entity name="SampleUseProxy" type="use_proxy">
-         <data key="value">0</data>
-     </entity>
-+    <entity name="SampleMerchantID" type="use_proxy">
-+        <data key="value">someMerchantId</data>
-+    </entity>
- 
-     <!-- default configuration used to restore Magento config -->
-     <entity name="DefaultPayPalConfig" type="paypal_config_state">
-@@ -58,4 +61,42 @@
-     <entity name="DefaultApiSignature" type="api_signature">
-         <data key="value"/>
-     </entity>
-+    <entity name="Payer" type="paypal_buyer">
-+        <data key="buyerEmail">buyer.mpi@gmail.com</data>
-+        <data key="buyerPassword">12345678</data>
-+    </entity>
-+    <entity name="PayPalLabel" type="paypal">
-+        <data key="checkout">checkout</data>
-+        <data key="credit">credit</data>
-+        <data key="pay">pay</data>
-+        <data key="buynow">buy now</data>
-+        <data key="paypal">pay pal</data>
-+        <data key="installment">installment</data>
-+    </entity>
-+    <entity name="PayPalLayout" type="paypal">
-+        <data key="horizontal">horizontal</data>
-+        <data key="vertical">vertical</data>
-+    </entity>
-+    <entity name="PayPalSize" type="paypal">
-+        <data key="medium">medium</data>
-+        <data key="large">large</data>
-+        <data key="responsive">responsive</data>
-+    </entity>
-+    <entity name="PayPalShape" type="paypal">
-+        <data key="pill">pill</data>
-+        <data key="rectangle">rectangle</data>
-+    </entity>
-+    <entity name="PayPalColor" type="paypal">
-+        <data key="gold">gold</data>
-+        <data key="blue">blue</data>
-+        <data key="silver">silver</data>
-+        <data key="black">black</data>
-+    </entity>
-+    <entity name="SamplePaypalExpressConfig" type="paypal_express_config">
-+        <data key="paypal_express_email">myBusinessAccount@magento.com</data>
-+        <data key="paypal_express_api_username">myApiUsername.magento.com</data>
-+        <data key="paypal_express_api_password">somePassword</data>
-+        <data key="paypal_express_api_signature">someApiSignature</data>
-+        <data key="paypal_express_merchantID">someMerchantId</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Metadata/paypal_config-meta.xml b/app/code/Magento/Paypal/Test/Mftf/Metadata/paypal_config-meta.xml
-index 37009297ddb..7457a90150a 100644
---- a/app/code/Magento/Paypal/Test/Mftf/Metadata/paypal_config-meta.xml
-+++ b/app/code/Magento/Paypal/Test/Mftf/Metadata/paypal_config-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreatePaypalConfigState" dataType="paypal_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
-         <object key="groups" dataType="paypal_config_state">
-             <object key="paypal_alternative_payment_methods" dataType="paypal_config_state">
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Page/AdminConfigPaymentMethodsPage.xml b/app/code/Magento/Paypal/Test/Mftf/Page/AdminConfigPaymentMethodsPage.xml
-index 111e0d8b01a..28e77e82d91 100644
---- a/app/code/Magento/Paypal/Test/Mftf/Page/AdminConfigPaymentMethodsPage.xml
-+++ b/app/code/Magento/Paypal/Test/Mftf/Page/AdminConfigPaymentMethodsPage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminConfigPaymentMethodsPage" url="admin/system_config/edit/section/payment/" area="admin" module="Magento_Config">
-         <section name="OtherPaymentsConfigSection"/>
-     </page>
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml
-new file mode 100644
-index 00000000000..ca8438d5ee0
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml
-@@ -0,0 +1,31 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="OtherPayPalPaymentsConfigSection">
-+        <element name="expandTab" type="button" selector="#payment_{{countryCode}}_other_paypal_payment_solutions-head" parameterized="true"/>
-+        <element name="expandedTab" type="button" selector="#payment_{{countryCode}}_other_paypal_payment_solutions-head.open" parameterized="true"/>
-+    </section>
-+    <section name="WPSExpressConfigSection">
-+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express-head" parameterized="true"/>
-+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_enable_express_checkout" parameterized="true"/>
-+    </section>
-+    <section name="PaymentsProHostedWithExpressCheckoutConfigSection">
-+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout-head" parameterized="true"/>
-+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_enable" parameterized="true"/>
-+    </section>
-+    <section name="WPSOtherConfigSection">
-+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_other-head" parameterized="true"/>
-+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_other_express_checkout_required_enable_express_checkout" parameterized="true"/>
-+    </section>
-+    <section name="WebsitePaymentsPlusConfigSection">
-+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payments_pro_hosted_solution_{{countryCode}}-head" parameterized="true"/>
-+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payments_pro_hosted_solution_{{countryCode}}_pphs_required_settings_pphs_enable" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/OtherPaymentsConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPaymentsConfigSection.xml
-index ec4f4f4ae09..bca6f963058 100644
---- a/app/code/Magento/Paypal/Test/Mftf/Section/OtherPaymentsConfigSection.xml
-+++ b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPaymentsConfigSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="OtherPaymentsConfigSection">
-         <element name="expandedTab" type="button" selector="#payment_us_other_payment_methods-head.open"/>
-     </section>
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
-new file mode 100644
-index 00000000000..85f94cd8691
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
-@@ -0,0 +1,62 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="PayPalExpressCheckoutConfigSection">
-+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}-head" parameterized="true"/>
-+        <element name="email" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_business_account" parameterized="true"/>
-+        <element name="apiMethod" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_api_authentication" parameterized="true"/>
-+        <element name="username" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_api_username" parameterized="true"/>
-+        <element name="password" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_api_password" parameterized="true"/>
-+        <element name="signature" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_api_signature" parameterized="true"/>
-+        <element name="sandboxMode" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_sandbox_flag" parameterized="true"/>
-+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_enable_express_checkout" parameterized="true"/>
-+        <element name="merchantID" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_merchant_id" parameterized="true"/>
-+    </section>
-+    <section name="PayPalExpressCheckoutOtherCountryConfigSection">
-+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_express_checkout_other-head" parameterized="true"/>
-+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_express_checkout_other_express_checkout_required_enable_express_checkout" parameterized="true"/>
-+    </section>
-+    <section name="PayPalAdvancedSettingConfigSection">
-+        <element name="advancedSettingTab" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced-head" parameterized="true"/>
-+        <element name="frontendExperienceSettingsTab" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced_express_checkout_frontend-head" parameterized="true"/>
-+        <element name="checkoutPageTab" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button-head" parameterized="true"/>
-+       </section>
-+    <section name="ButtonCustomization">
-+        <element name="customizeDrpDown" type="button" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button_checkout_page_button_customize']//select[contains(@data-ui-id, 'button-customize')]"/>
-+        <element name="customizeNo" type="text" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button_checkout_page_button_customize']//select[contains(@data-ui-id, 'button-customize')]/option[@value='0' and @selected='selected']"/>
-+        <element name="label" type="input" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button']//select[contains(@id, 'button_label')]"/>
-+        <element name="layout" type="input" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button']//select[contains(@id, 'button_layout')]"/>
-+        <element name="size" type="input" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button']//select[contains(@id, 'button_size')]"/>
-+        <element name="shape" type="input" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button']//select[contains(@id, 'button_shape')]"/>
-+        <element name="color" type="input" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button']//select[contains(@id, 'button_color')]"/>
-+    </section>
-+    <section name="PayPalButtonOnStorefront">
-+        <element name="label" type="text" selector="[aria-label='{{label}}']" parameterized="true"/>
-+        <element name="layout" type="text" selector="[data-layout='{{layout}}']" parameterized="true"/>
-+        <element name="size" type="text" selector="[data-size='{{size}}']" parameterized="true"/>
-+        <element name="shape" type="text" selector=".paypal-button-shape-{{shape}}" parameterized="true"/>
-+        <element name="color" type="text" selector=".paypal-button-color-{{color}}" parameterized="true"/>
-+    </section>
-+    <section name="CheckoutPaymentSection">
-+        <element name="PayPalPaymentRadio" type="radio" selector="input#paypal_express.radio" timeout="30"/>
-+        <element name="PayPalBtn" type="radio" selector=".paypal-button.paypal-button-number-0" timeout="30"/>
-+    </section>
-+    <section name="PayPalPaymentSection">
-+        <element name="guestCheckout" type="input" selector="#guest"/>
-+        <element name="loginSection" type="input" selector=" #main>#login"/>
-+        <element name="email" type="input" selector="//input[contains(@name, 'email') and not(contains(@style, 'display:none'))]"/>
-+        <element name="password" type="input" selector="//input[contains(@name, 'password') and not(contains(@style, 'display:none'))]"/>
-+        <element name="loginBtn" type="input" selector="button#btnLogin"/>
-+        <element name="reviewUserInfo" type="text" selector="//p[@id='reviewUserInfo' and contains(text(),'Hi, MPI!')]"/>
-+        <element name="cartIcon" type="text" selector="#transactionCart"/>
-+        <element name="itemName" type="text" selector="//span[@title='{{productName}}']" parameterized="true"/>
-+        <element name="PayPalSubmitBtn" type="text" selector="//input[@type='submit']"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PaymentsConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PaymentsConfigSection.xml
-new file mode 100644
-index 00000000000..35162cb7d61
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Mftf/Section/PaymentsConfigSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="PaymentsConfigSection">
-+        <element name="merchantCountry" type="select" selector="//select[@name='groups[account][fields][merchant_country][value]']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Suite/suite.xml b/app/code/Magento/Paypal/Test/Mftf/Suite/suite.xml
-new file mode 100644
-index 00000000000..621f2e6a676
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Mftf/Suite/suite.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
-+    <suite name="PaypalTestSuite">
-+        <include>
-+            <test name="CheckDefaultValueOfPayPalCustomizeButtonTest"/>
-+            <test name="PayPalSmartButtonInCheckoutPage"/>
-+            <test name="CheckCreditButtonConfiguration"/>
-+        </include>
-+    </suite>
-+</suites>
-\ No newline at end of file
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml
-new file mode 100644
-index 00000000000..a6e741f0151
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml
-@@ -0,0 +1,276 @@
-+<?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="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
-+        <annotations>
-+            <features value="PayPal"/>
-+            <stories value="Payment methods"/>
-+            <title value="Conflict resolution for PayPal in United Kingdom"/>
-+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country United Kingdom"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-16679"/>
-+            <group value="paypal"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="ConfigPayPalExpressCheckout" stepKey="ConfigPayPalExpress">
-+                <argument name="credentials" value="SamplePaypalExpressConfig"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set paypal/general/merchant_country US" stepKey="setMerchantCountry"/>
-+            <magentoCLI command="config:set payment/paypal_express/active 0" stepKey="disablePayPalExpress"/>
-+            <magentoCLI command="config:set payment/wps_express/active 0" stepKey="disableWPSExpress"/>
-+            <magentoCLI command="config:set payment/hosted_pro/active 0" stepKey="disableHostedProExpress"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Change Merchant Country -->
-+        <comment userInput="Change Merchant Country" stepKey="changeMerchantCountryComment"/>
-+        <waitForElementVisible selector="{{PaymentsConfigSection.merchantCountry}}" stepKey="waitForMerchantCountry"/>
-+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="United Kingdom" stepKey="setMerchantCountry"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <!-- Enable WPS Express -->
-+        <comment userInput="Enable WPS Express" stepKey="enableWPSExpressComment"/>
-+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
-+            <argument name="payPalConfigType" value="WPSExpressConfigSection"/>
-+            <argument name="countryCode" value="gb"/>
-+        </actionGroup>
-+        <!-- Check only the correct solution is enabled -->
-+        <comment userInput="Check only the correct solution is enabled" stepKey="checkOnlyTheCorrectSolutionIsEnabledComment1"/>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
-+            <argument name="payPalConfigType" value="PayPalExpressCheckoutConfigSection"/>
-+            <argument name="enabledOption" value="No"/>
-+            <argument name="countryCode" value="gb"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
-+            <argument name="payPalConfigType" value="WPSExpressConfigSection"/>
-+            <argument name="enabledOption" value="Yes"/>
-+            <argument name="countryCode" value="gb"/>
-+        </actionGroup>
-+        <!-- Enable Pro Hosted With Express Checkout -->
-+        <comment userInput="Enable Pro Hosted With Express Checkout" stepKey="enableProHostedWithExpressCheckoutComment"/>
-+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
-+            <argument name="payPalConfigType" value="PaymentsProHostedWithExpressCheckoutConfigSection"/>
-+            <argument name="countryCode" value="gb"/>
-+        </actionGroup>
-+        <!-- Check only the correct solution is enabled -->
-+        <comment userInput="Check only the correct solution is enabled" stepKey="checkOnlyTheCorrectSolutionIsEnabledComment2"/>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
-+            <argument name="payPalConfigType" value="WPSExpressConfigSection"/>
-+            <argument name="enabledOption" value="No"/>
-+            <argument name="countryCode" value="gb"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
-+            <argument name="payPalConfigType" value="PaymentsProHostedWithExpressCheckoutConfigSection"/>
-+            <argument name="enabledOption" value="Yes"/>
-+            <argument name="countryCode" value="gb"/>
-+        </actionGroup>
-+    </test>
-+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInJapan" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
-+        <annotations>
-+            <features value="PayPal"/>
-+            <stories value="Payment methods"/>
-+            <title value="Conflict resolution for PayPal in Japan"/>
-+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Japan"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-13146"/>
-+            <group value="paypal"/>
-+        </annotations>
-+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Japan" stepKey="setMerchantCountry"/>
-+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="countryCode" value="jp"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
-+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
-+            <argument name="enabledOption" value="No"/>
-+            <argument name="countryCode" value="jp"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="enabledOption" value="Yes"/>
-+            <argument name="countryCode" value="jp"/>
-+        </actionGroup>
-+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
-+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
-+            <argument name="countryCode" value="jp"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="enabledOption" value="No"/>
-+            <argument name="countryCode" value="jp"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
-+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
-+            <argument name="enabledOption" value="Yes"/>
-+            <argument name="countryCode" value="jp"/>
-+        </actionGroup>
-+    </test>
-+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInFrance" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
-+        <annotations>
-+            <features value="PayPal"/>
-+            <stories value="Payment methods"/>
-+            <title value="Conflict resolution for PayPal in France"/>
-+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country France"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-16675"/>
-+            <group value="paypal"/>
-+        </annotations>
-+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="France" stepKey="setMerchantCountry"/>
-+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="countryCode" value="fr"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
-+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
-+            <argument name="enabledOption" value="No"/>
-+            <argument name="countryCode" value="fr"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="enabledOption" value="Yes"/>
-+            <argument name="countryCode" value="fr"/>
-+        </actionGroup>
-+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
-+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
-+            <argument name="countryCode" value="fr"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="enabledOption" value="No"/>
-+            <argument name="countryCode" value="fr"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
-+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
-+            <argument name="enabledOption" value="Yes"/>
-+            <argument name="countryCode" value="fr"/>
-+        </actionGroup>
-+    </test>
-+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInHongKong" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
-+        <annotations>
-+            <features value="PayPal"/>
-+            <stories value="Payment methods"/>
-+            <title value="Conflict resolution for PayPal in Hong Kong"/>
-+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Hong Kong"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-16676"/>
-+            <group value="paypal"/>
-+        </annotations>
-+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Hong Kong SAR China" stepKey="setMerchantCountry"/>
-+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="countryCode" value="hk"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
-+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
-+            <argument name="enabledOption" value="No"/>
-+            <argument name="countryCode" value="hk"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="enabledOption" value="Yes"/>
-+            <argument name="countryCode" value="hk"/>
-+        </actionGroup>
-+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
-+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
-+            <argument name="countryCode" value="hk"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="enabledOption" value="No"/>
-+            <argument name="countryCode" value="hk"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
-+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
-+            <argument name="enabledOption" value="Yes"/>
-+            <argument name="countryCode" value="hk"/>
-+        </actionGroup>
-+    </test>
-+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInItaly" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
-+        <annotations>
-+            <features value="PayPal"/>
-+            <stories value="Payment methods"/>
-+            <title value="Conflict resolution for PayPal in Italy"/>
-+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Italy"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-16677"/>
-+            <group value="paypal"/>
-+        </annotations>
-+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Italy" stepKey="setMerchantCountry"/>
-+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="countryCode" value="it"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
-+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
-+            <argument name="enabledOption" value="No"/>
-+            <argument name="countryCode" value="it"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="enabledOption" value="Yes"/>
-+            <argument name="countryCode" value="it"/>
-+        </actionGroup>
-+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
-+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
-+            <argument name="countryCode" value="it"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="enabledOption" value="No"/>
-+            <argument name="countryCode" value="it"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
-+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
-+            <argument name="enabledOption" value="Yes"/>
-+            <argument name="countryCode" value="it"/>
-+        </actionGroup>
-+    </test>
-+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInSpain" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
-+        <annotations>
-+            <features value="PayPal"/>
-+            <stories value="Payment methods"/>
-+            <title value="Conflict resolution for PayPal in Spain"/>
-+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Spain"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-16678"/>
-+            <group value="paypal"/>
-+        </annotations>
-+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Spain" stepKey="setMerchantCountry"/>
-+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="countryCode" value="es"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
-+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
-+            <argument name="enabledOption" value="No"/>
-+            <argument name="countryCode" value="es"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="enabledOption" value="Yes"/>
-+            <argument name="countryCode" value="es"/>
-+        </actionGroup>
-+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
-+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
-+            <argument name="countryCode" value="es"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
-+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
-+            <argument name="enabledOption" value="No"/>
-+            <argument name="countryCode" value="es"/>
-+        </actionGroup>
-+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
-+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
-+            <argument name="enabledOption" value="Yes"/>
-+            <argument name="countryCode" value="es"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml
-index 283bc324126..934449dfd13 100644
---- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml
-+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml
-@@ -7,15 +7,18 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminConfigPaymentsSectionState">
-         <annotations>
-+            <features value="PayPal"/>
-+            <stories value="Payment methods"/>
-+            <title value="Other Payment Methods section in Admin expanded by default"/>
-             <description value="Other Payment Methods section in Admin expanded by default"/>
-             <severity value="AVERAGE"/>
-             <testCaseId value="MAGETWO-92043"/>
-         </annotations>
-         <after>
--            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-+            <actionGroup ref="logout" stepKey="amOnLogoutPage"/>
-         </after>
- 
-         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..03f0167230e
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsPayPalSettlementNavigateMenuTest">
-+        <annotations>
-+            <features value="Paypal"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports paypal settlement navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > PayPal Settlement"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14193"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToPayPalSettlementPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsSalesPayPalSettlement.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsSalesPayPalSettlement.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..8c3735fcbd2
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSalesBillingAgreementsNavigateMenuTest">
-+        <annotations>
-+            <features value="Paypal"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin sales billing agreements navigate menu test"/>
-+            <description value="Admin should be able to navigate to Sales > Billing Agreements"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14194"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToBillingAgreementsPage">
-+            <argument name="menuUiId" value="{{AdminMenuSales.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSalesBillingAgreements.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSalesBillingAgreements.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/PayPalSmartButtonInCheckoutPage.xml b/app/code/Magento/Paypal/Test/Mftf/Test/PayPalSmartButtonInCheckoutPage.xml
-new file mode 100644
-index 00000000000..079b46dc1b0
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Mftf/Test/PayPalSmartButtonInCheckoutPage.xml
-@@ -0,0 +1,170 @@
-+<?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="CheckDefaultValueOfPayPalCustomizeButtonTest">
-+        <annotations>
-+            <features value="PayPal"/>
-+            <stories value="Button Configuration"/>
-+            <title value="Check Default Value Of PayPal Customize Button"/>
-+            <description value="Default value of PayPal Customize Button should be NO"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MC-10904"/>
-+            <skip>
-+                <issueId value="DEVOPS-3311"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-+            <actionGroup ref="ConfigPayPalExpressCheckout" stepKey="ConfigPayPalExpressCheckout"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-+        </after>
-+        <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <actionGroup ref="OpenPayPalButtonCheckoutPage" stepKey="openPayPalButtonCheckoutPage"/>
-+        <seeElement selector="{{ButtonCustomization.customizeDrpDown}}" stepKey="seeCustomizeDropDown"/>
-+        <seeOptionIsSelected selector="{{ButtonCustomization.customizeDrpDown}}" userInput="No" stepKey="seeNoIsDefaultValue"/>
-+        <selectOption selector="{{ButtonCustomization.customizeDrpDown}}" userInput="Yes" stepKey="enableButtonCustomization"/>
-+        <!--Verify default value-->
-+        <comment userInput="Verify default value" stepKey="commentVerifyDefaultValue1"/>
-+        <seeElement selector="{{ButtonCustomization.label}}" stepKey="seeLabel"/>
-+        <seeElement selector="{{ButtonCustomization.layout}}" stepKey="seeLayout"/>
-+        <seeElement selector="{{ButtonCustomization.size}}" stepKey="seeSize1"/>
-+        <seeElement selector="{{ButtonCustomization.shape}}" stepKey="seeShape1"/>
-+        <seeElement selector="{{ButtonCustomization.color}}" stepKey="seeColor"/>
-+    </test>
-+    <test name="CheckCreditButtonConfiguration">
-+        <annotations>
-+            <features value="PayPal"/>
-+            <stories value="Button Configuration"/>
-+            <title value="Check Credit Button Configuration"/>
-+            <description value="Admin is able to customize Credit button"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MC-10900"/>
-+            <skip>
-+                <issueId value="DEVOPS-3311"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
-+                <requiredEntity createDataKey="createPreReqCategory"/>
-+            </createData>
-+            <!-- Create Customer -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-+            <!--Config PayPal Express Checkout-->
-+            <comment userInput="config PayPal Express Checkout" stepKey="commemtConfigPayPalExpressCheckout"/>
-+            <actionGroup ref="ConfigPayPalExpressCheckout" stepKey="ConfigPayPalExpressCheckout"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteCategory" createDataKey="createPreReqCategory"/>
-+            <deleteData stepKey="deleteProduct" createDataKey="createPreReqProduct"/>
-+            <deleteData stepKey="deleteCustomer" createDataKey="createCustomer"/>
-+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-+        </after>
-+        <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <!--Navigate to button configuration setting-->
-+        <comment userInput="Navigate to button configuration setting in Admin site" stepKey="commentNavigateToButtonConfigurationInAdmin"/>
-+        <actionGroup ref="OpenPayPalButtonCheckoutPage" stepKey="openPayPalButtonCheckoutPage"/>
-+        <waitForElement selector="{{ButtonCustomization.customizeDrpDown}}" stepKey="seeCustomizeDropDown"/>
-+        <selectOption selector="{{ButtonCustomization.customizeDrpDown}}" userInput="Yes" stepKey="enableButtonCustomization"/>
-+        <!--Verify Credit Button value-->
-+        <comment userInput="Verify Credit Button value" stepKey="commentVerifyDefaultValue2"/>
-+        <selectOption selector="{{ButtonCustomization.label}}" userInput="{{PayPalLabel.credit}}" stepKey="selectCreditAsLabel"/>
-+        <seeElement selector="{{ButtonCustomization.size}}" stepKey="seeSize2"/>
-+        <seeElement selector="{{ButtonCustomization.shape}}" stepKey="seeShape2"/>
-+        <dontSeeElement selector="{{ButtonCustomization.layout}}" stepKey="dontSeeLayout"/>
-+        <dontSeeElement selector="{{ButtonCustomization.color}}" stepKey="dontSeeColor"/>
-+        <!--Customize Credit Button-->
-+        <selectOption selector="{{ButtonCustomization.size}}" userInput="{{PayPalSize.medium}}" stepKey="selectSize"/>
-+        <selectOption selector="{{ButtonCustomization.shape}}" userInput="{{PayPalShape.pill}}" stepKey="selectShape"/>
-+        <!--Save configuration-->
-+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
-+        <waitForPageLoad stepKey="waitForConfigSave"/>
-+        <openNewTab stepKey="openNewTab"/>
-+        <amOnPage url="/" stepKey="openStorefront"/>
-+        <!--Login to storefront as previously created customer-->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <actionGroup ref="addProductToCheckoutPage" stepKey="addProductToCheckoutPage">
-+            <argument name="Category" value="$$createPreReqCategory$$"/>
-+        </actionGroup>
-+        <!--set ID for iframe of PayPal group button-->
-+        <executeJS function="jQuery('.zoid-component-frame.zoid-visible').attr('id', 'myIframe')" stepKey="clickOrderLink"/>
-+        <!--switch to iframe of PayPal group button-->
-+        <comment userInput="switch to iframe of PayPal group button" stepKey="commentSwitchToIframe"/>
-+        <switchToIFrame userInput="myIframe" stepKey="clickPrintOrderLink"/>
-+        <waitForElementVisible selector="{{CheckoutPaymentSection.PayPalBtn}}" stepKey="waitForPayPalBtn"/>
-+        <seeElement selector="{{PayPalButtonOnStorefront.label(PayPalLabel.credit)}}{{PayPalButtonOnStorefront.size(PayPalSize.medium)}}" stepKey="seeButtonInMediumSize"/>
-+        <seeElement selector="{{PayPalButtonOnStorefront.label(PayPalLabel.credit)}}{{PayPalButtonOnStorefront.shape(PayPalShape.pill)}}" stepKey="seeButtonInPillShape"/>
-+    </test>
-+    <test name="PayPalSmartButtonInCheckoutPage">
-+        <annotations>
-+            <features value="PayPal"/>
-+            <stories value="Generic checkout skeleton flow"/>
-+            <title value="Mainflow of PayPal Smart Button"/>
-+            <description value="Users are able to place order using PayPal Smart Button"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13690"/>
-+            <skip>
-+                <issueId value="DEVOPS-3311"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
-+            <requiredEntity createDataKey="createPreReqCategory"/>
-+            </createData>
-+            <!-- Create Customer -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-+            <!--Config PayPal Express Checkout-->
-+            <comment userInput="config PayPal Express Checkout" stepKey="commemtConfigPayPalExpressCheckout"/>
-+            <actionGroup ref="ConfigPayPalExpressCheckout" stepKey="ConfigPayPalExpressCheckout"/>
-+            <magentoCLI command="config:set payment/paypal_express/in_context 1" stepKey="disableInContextPayPal"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteCategory" createDataKey="createPreReqCategory"/>
-+            <deleteData stepKey="deleteProduct" createDataKey="createPreReqProduct"/>
-+            <deleteData stepKey="deleteCustomer" createDataKey="createCustomer"/>
-+            <magentoCLI command="config:set payment/paypal_express/in_context 0" stepKey="enableInContextPayPal"/>
-+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-+        </after>
-+        <magentoCLI command="config:set payment/paypal_express/payment_action Authorization" stepKey="inputPaymentAction"/>
-+        <magentoCLI command="config:set payment/paypal_express/solution_type Sole" stepKey="enablePayPalGuestCheckout"/>
-+        <magentoCLI command="config:set payment/paypal_express/line_items_enabled 1" stepKey="enableTransferCartLine"/>
-+        <magentoCLI command="config:set payment/paypal_express/skip_order_review_step 1" stepKey="enableSkipOrderReview"/>
-+        <!--Login to storefront as previously created customer-->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <!--Place an order using PayPal method-->
-+        <comment userInput="Place an order using PayPal method" stepKey="commentPayPalPlaceOrder"/>
-+        <actionGroup ref="CreatePayPalOrderWithSelectedPaymentMethodActionGroup" stepKey="createPayPalOrder">
-+            <argument name="Category" value="$$createPreReqCategory$$"/>
-+        </actionGroup>
-+        <!--Open Cart on PayPal-->
-+        <comment userInput="Open Cart on PayPal" stepKey="commentOpenCart"/>
-+        <click selector="{{PayPalPaymentSection.cartIcon}}" stepKey="openCart"/>
-+        <seeElement selector="{{PayPalPaymentSection.itemName($$createPreReqProduct.name$$)}}" stepKey="seeProductname"/>
-+        <click selector="{{PayPalPaymentSection.PayPalSubmitBtn}}" stepKey="clickPayPalSubmitBtn"/>
-+        <switchToPreviousTab stepKey="switchToPreviousTab"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <!--I see order successful Page instead of Order Review Page-->
-+        <comment userInput="I see order successful Page instead of Order Review Page" stepKey="commentVerifyOrderReviewPage"/>
-+        <waitForElement selector="{{CheckoutSuccessMainSection.successTitle}}" stepKey="waitForLoadSuccessPageTitle"/>
-+        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage"/>
-+        <seeElement selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="seeOrderLink"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
-index b33d2f57239..b9ea53c1540 100644
---- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable;
- 
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+
- /**
-  * Class AbstractEnableTest
-  *
-@@ -43,8 +45,18 @@ class AbstractEnableTest extends \PHPUnit\Framework\TestCase
-             )->disableOriginalConstructor()
-             ->getMockForAbstractClass();
- 
-+        $objectManager = new ObjectManager($this);
-+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
-+        $reflection = new \ReflectionClass($this->elementMock);
-+        $reflection_property = $reflection->getProperty('_escaper');
-+        $reflection_property->setAccessible(true);
-+        $reflection_property->setValue($this->elementMock, $escaper);
-+
-         $this->abstractEnable = $objectManager->getObject(
--            \Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable\Stub::class
-+            \Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable\Stub::class,
-+            [
-+                '_escaper' => $objectManager->getObject(\Magento\Framework\Escaper::class)
-+            ]
-         );
-     }
- 
-diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
-deleted file mode 100644
-index cfdfe17b1e0..00000000000
---- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
-+++ /dev/null
-@@ -1,107 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Fieldset;
--
--class GroupTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var Group
--     */
--    protected $_model;
--
--    /**
--     * @var \Magento\Framework\Data\Form\Element\AbstractElement
--     */
--    protected $_element;
--
--    /**
--     * @var \Magento\Backend\Model\Auth\Session|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $_authSession;
--
--    /**
--     * @var \Magento\User\Model\User|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $_user;
--
--    /**
--     * @var \Magento\Config\Model\Config\Structure\Element\Group|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $_group;
--
--    protected function setUp()
--    {
--        $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--        $this->_group = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
--        $this->_element = $this->getMockForAbstractClass(
--            \Magento\Framework\Data\Form\Element\AbstractElement::class,
--            [],
--            '',
--            false,
--            true,
--            true,
--            ['getHtmlId', 'getElementHtml', 'getName', 'getElements', 'getId']
--        );
--        $this->_element->expects($this->any())
--            ->method('getHtmlId')
--            ->will($this->returnValue('html id'));
--        $this->_element->expects($this->any())
--            ->method('getElementHtml')
--            ->will($this->returnValue('element html'));
--        $this->_element->expects($this->any())
--            ->method('getName')
--            ->will($this->returnValue('name'));
--        $this->_element->expects($this->any())
--            ->method('getElements')
--            ->will($this->returnValue([]));
--        $this->_element->expects($this->any())
--            ->method('getId')
--            ->will($this->returnValue('id'));
--        $this->_user = $this->createMock(\Magento\User\Model\User::class);
--        $this->_authSession = $this->createMock(\Magento\Backend\Model\Auth\Session::class);
--        $this->_authSession->expects($this->any())
--            ->method('__call')
--            ->with('getUser')
--            ->will($this->returnValue($this->_user));
--        $this->_model = $helper->getObject(
--            \Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group::class,
--            ['authSession' => $this->_authSession]
--        );
--        $this->_model->setGroup($this->_group);
--    }
--
--    /**
--     * @param mixed $expanded
--     * @param int $expected
--     * @dataProvider isCollapseStateDataProvider
--     */
--    public function testIsCollapseState($expanded, $expected)
--    {
--        $this->_user->setExtra(['configState' => []]);
--        $this->_element->setGroup(isset($expanded) ? ['expanded' => $expanded] : []);
--        $html = $this->_model->render($this->_element);
--        $this->assertContains(
--            '<input id="' . $this->_element->getHtmlId() . '-state" name="config_state['
--                . $this->_element->getId() . ']" type="hidden" value="' . $expected . '" />',
--            $html
--        );
--    }
--
--    /**
--     * @return array
--     */
--    public function isCollapseStateDataProvider()
--    {
--        return [
--            [null, 0],
--            [false, 0],
--            ['', 0],
--            [1, 1],
--            ['1', 1],
--        ];
--    }
--}
-diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php
-new file mode 100644
-index 00000000000..2c9a33ce438
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php
-@@ -0,0 +1,142 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Multiselect;
-+
-+use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use \Magento\Framework\Data\Form\Element\AbstractElement;
-+use \Magento\Framework\App\RequestInterface;
-+use \Magento\Framework\View\Helper\Js;
-+use \Magento\Paypal\Model\Config;
-+use \Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect\DisabledFundingOptions;
-+use \Magento\Paypal\Model\Config\StructurePlugin;
-+use \PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Class DisabledFundingOptionsTest
-+ */
-+class DisabledFundingOptionsTest extends TestCase
-+{
-+    /**
-+     * @var \Magento\Paypal\Block\Adminhtml\System\Config\Multiselect\DisabledFundingOptions
-+     */
-+    private $model;
-+
-+    /**
-+     * @var \Magento\Framework\Data\Form\Element\AbstractElement
-+     */
-+    private $element;
-+
-+    /**
-+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $request;
-+
-+    /**
-+     * @var \Magento\Framework\View\Helper\Js|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $jsHelper;
-+
-+    /**
-+     * @var \Magento\Paypal\Model\Config
-+     */
-+    private $config;
-+
-+    protected function setUp()
-+    {
-+        $helper = new ObjectManager($this);
-+        $this->element = $this->getMockForAbstractClass(
-+            AbstractElement::class,
-+            [],
-+            '',
-+            false,
-+            true,
-+            true,
-+            ['getHtmlId', 'getElementHtml', 'getName']
-+        );
-+        $this->request = $this->getMockForAbstractClass(RequestInterface::class);
-+        $this->jsHelper = $this->createMock(Js::class);
-+        $this->config = $this->createMock(Config::class);
-+        $this->element->setValues($this->getDefaultFundingOptions());
-+        $this->model = $helper->getObject(
-+            DisabledFundingOptions::class,
-+            ['request' => $this->request, 'jsHelper' => $this->jsHelper, 'config' => $this->config]
-+        );
-+    }
-+
-+    /**
-+     * @param null|string $requestCountry
-+     * @param null|string $merchantCountry
-+     * @param bool $shouldContainPaypalCredit
-+     * @dataProvider isPaypalCreditAvailableDataProvider
-+     */
-+    public function testIsPaypalCreditAvailable(
-+        ?string $requestCountry,
-+        ?string $merchantCountry,
-+        bool $shouldContainPaypalCredit
-+    ) {
-+        $this->request->expects($this->any())
-+            ->method('getParam')
-+            ->will($this->returnCallback(function ($param) use ($requestCountry) {
-+                if ($param == StructurePlugin::REQUEST_PARAM_COUNTRY) {
-+                    return $requestCountry;
-+                }
-+                return $param;
-+            }));
-+        $this->config->expects($this->any())
-+            ->method('getMerchantCountry')
-+            ->will($this->returnCallback(function () use ($merchantCountry) {
-+                return $merchantCountry;
-+            }));
-+        $this->model->render($this->element);
-+        $payPalCreditOption = [
-+            'value' => 'CREDIT',
-+            'label' => __('PayPal Credit')
-+        ];
-+        $elementValues = $this->element->getValues();
-+        if ($shouldContainPaypalCredit) {
-+            $this->assertContains($payPalCreditOption, $elementValues);
-+        } else {
-+            $this->assertNotContains($payPalCreditOption, $elementValues);
-+        }
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isPaypalCreditAvailableDataProvider(): array
-+    {
-+        return [
-+            [null, 'US', true],
-+            ['US', 'US', true],
-+            ['US', 'GB', true],
-+            ['GB', 'GB', false],
-+            ['GB', 'US', false],
-+            ['GB', null, false],
-+        ];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    private function getDefaultFundingOptions(): array
-+    {
-+        return [
-+            [
-+                'value' => 'CREDIT',
-+                'label' => __('PayPal Credit')
-+            ],
-+            [
-+                'value' => 'CARD',
-+                'label' => __('PayPal Guest Checkout Credit Card Icons')
-+            ],
-+            [
-+                'value' => 'ELV',
-+                'label' => __('Elektronisches Lastschriftverfahren - German ELV')
-+            ]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php
-index b8558cdc084..3fce5dab9dd 100644
---- a/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php
-@@ -8,6 +8,8 @@ namespace Magento\Paypal\Test\Unit\Block\Bml;
- 
- use Magento\Catalog\Block as CatalogBlock;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Paypal\Model\ConfigFactory;
-+use Magento\Paypal\Model\Config;
- 
- class ShortcutTest extends \PHPUnit\Framework\TestCase
- {
-@@ -33,12 +35,24 @@ class ShortcutTest extends \PHPUnit\Framework\TestCase
-         $this->paypalShortcutHelperMock = $this->createMock(\Magento\Paypal\Helper\Shortcut\ValidatorInterface::class);
- 
-         $this->objectManagerHelper = new ObjectManagerHelper($this);
-+        $configFactoryMock = $this->getMockBuilder(ConfigFactory::class)
-+                ->disableOriginalConstructor()
-+                ->setMethods(['create'])
-+                ->getMock();
-+
-+        $configMock = $this->getMockBuilder(Config::class)
-+                ->disableOriginalConstructor()
-+                ->setMethods(['setMethod'])
-+                ->getMock();
-+        $configFactoryMock->expects($this->any())->method('create')->willReturn($configMock);
-+
-         $this->shortcut = $this->objectManagerHelper->getObject(
-             \Magento\Paypal\Block\Bml\Shortcut::class,
-             [
-                 'paymentData' => $this->paymentHelperMock,
-                 'mathRandom' => $this->randomMock,
-                 'shortcutValidator' => $this->paypalShortcutHelperMock,
-+                'config' => $configFactoryMock
-             ]
-         );
-     }
-diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Ipn/IndexTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Ipn/IndexTest.php
-index 1c7d25e37a6..890261c6522 100644
---- a/app/code/Magento/Paypal/Test/Unit/Controller/Ipn/IndexTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Ipn/IndexTest.php
-@@ -6,44 +6,105 @@
- 
- namespace Magento\Paypal\Test\Unit\Controller\Ipn;
- 
-+use Magento\Framework\Event\ManagerInterface;
-+use Magento\Paypal\Controller\Ipn\Index;
-+use Magento\Paypal\Model\IpnFactory;
-+use Magento\Paypal\Model\IpnInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\OrderFactory;
-+
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class IndexTest extends \PHPUnit\Framework\TestCase
- {
-     /** @var Index */
--    protected $model;
-+    private $model;
- 
-     /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $logger;
-+    private $loggerMock;
- 
-     /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $request;
-+    private $requestMock;
- 
-     /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $response;
-+    private $responseMock;
-+
-+    /**
-+     * @var IpnFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $ipnFactoryMock;
-+
-+    /**
-+     * @var OrderFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $orderFactoryMock;
-+
-+    /**
-+     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $eventManagerMock;
- 
-     protected function setUp()
-     {
--        $this->logger = $this->createMock(\Psr\Log\LoggerInterface::class);
--        $this->request = $this->createMock(\Magento\Framework\App\Request\Http::class);
--        $this->response = $this->createMock(\Magento\Framework\App\Response\Http::class);
-+        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
-+        $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
-+        $this->responseMock = $this->createMock(\Magento\Framework\App\Response\Http::class);
-+        $this->ipnFactoryMock = $this->createMock(IpnFactory::class);
-+        $this->orderFactoryMock = $this->createMock(OrderFactory::class);
-+        $this->eventManagerMock = $this->createMock(ManagerInterface::class);
- 
-         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->model = $objectManagerHelper->getObject(
--            \Magento\Paypal\Controller\Ipn\Index::class,
-+            Index::class,
-             [
--                'logger' => $this->logger,
--                'request' => $this->request,
--                'response' => $this->response,
-+                'logger' => $this->loggerMock,
-+                'request' => $this->requestMock,
-+                'response' => $this->responseMock,
-+                'ipnFactory' => $this->ipnFactoryMock,
-+                'orderFactory' => $this->orderFactoryMock,
-+                'eventManager' => $this->eventManagerMock
-             ]
-         );
-     }
- 
-     public function testIndexActionException()
-     {
--        $this->request->expects($this->once())->method('isPost')->will($this->returnValue(true));
-+        $this->requestMock->expects($this->once())->method('isPost')->will($this->returnValue(true));
-         $exception = new \Exception();
--        $this->request->expects($this->once())->method('getPostValue')->will($this->throwException($exception));
--        $this->logger->expects($this->once())->method('critical')->with($this->identicalTo($exception));
--        $this->response->expects($this->once())->method('setHttpResponseCode')->with(500);
-+        $this->requestMock->expects($this->once())->method('getPostValue')->will($this->throwException($exception));
-+        $this->loggerMock->expects($this->once())->method('critical')->with($this->identicalTo($exception));
-+        $this->responseMock->expects($this->once())->method('setHttpResponseCode')->with(500);
-+        $this->model->execute();
-+    }
-+
-+    public function testIndexAction()
-+    {
-+        $this->requestMock->expects($this->once())->method('isPost')->will($this->returnValue(true));
-+        $incrementId = 'incrementId';
-+        $data = [
-+            'invoice' => $incrementId,
-+            'other' => 'other data'
-+        ];
-+        $this->requestMock->expects($this->exactly(2))->method('getPostValue')->willReturn($data);
-+        $ipnMock = $this->createMock(IpnInterface::class);
-+        $this->ipnFactoryMock->expects($this->once())
-+            ->method('create')
-+            ->with(['data' => $data])
-+            ->willReturn($ipnMock);
-+        $ipnMock->expects($this->once())
-+            ->method('processIpnRequest');
-+        $orderMock = $this->createMock(Order::class);
-+        $this->orderFactoryMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($orderMock);
-+        $orderMock->expects($this->once())
-+            ->method('loadByIncrementId')
-+            ->with($incrementId)
-+            ->willReturn($orderMock);
-+        $this->eventManagerMock->expects($this->once())
-+            ->method('dispatch')
-+            ->with('paypal_checkout_success', ['order' => $orderMock]);
-         $this->model->execute();
-     }
- }
-diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php
-index bd4da25cb84..32d3f2c73b1 100644
---- a/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php
-@@ -148,9 +148,6 @@ class ReturnUrlTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->context->expects($this->any())->method('getView')->willReturn($this->view);
--        $this->context->expects($this->any())->method('getRequest')->willReturn($this->request);
--
-         $this->paymentFailures = $this->getMockBuilder(PaymentFailuresInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-@@ -160,13 +157,16 @@ class ReturnUrlTest extends \PHPUnit\Framework\TestCase
-         $this->context->method('getRequest')
-             ->willReturn($this->request);
- 
--        $this->returnUrl = $this->objectManager->getObject(ReturnUrl::class, [
--            'context' => $this->context,
--            'checkoutSession' => $this->checkoutSession,
--            'orderFactory' => $this->orderFactory,
--            'checkoutHelper' => $this->checkoutHelper,
--            'paymentFailures' => $this->paymentFailures,
--        ]);
-+        $this->returnUrl = $this->objectManager->getObject(
-+            ReturnUrl::class,
-+            [
-+                'context' => $this->context,
-+                'checkoutSession' => $this->checkoutSession,
-+                'orderFactory' => $this->orderFactory,
-+                'checkoutHelper' => $this->checkoutHelper,
-+                'paymentFailures' => $this->paymentFailures,
-+            ]
-+        );
-     }
- 
-     /**
-diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
-index 60451a98270..6752eab6a77 100644
---- a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
-@@ -3,16 +3,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Paypal\Test\Unit\Controller\Transparent;
- 
- use Magento\Framework\App\Action\Context;
- use Magento\Framework\Controller\Result\JsonFactory;
- use Magento\Framework\Session\Generic;
- use Magento\Framework\Session\SessionManager;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Paypal\Controller\Transparent\RequestSecureToken;
- use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
- use Magento\Paypal\Model\Payflow\Transparent;
-+use PHPUnit\Framework\MockObject\MockObject;
- 
- /**
-  * Class RequestSecureTokenTest
-@@ -22,39 +24,39 @@ use Magento\Paypal\Model\Payflow\Transparent;
- class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var Transparent|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Transparent|MockObject
-      */
--    protected $transparentMock;
-+    private $transparent;
- 
-     /**
--     * @var RequestSecureToken|\PHPUnit_Framework_MockObject_MockObject
-+     * @var RequestSecureToken|MockObject
-      */
--    protected $controller;
-+    private $controller;
- 
-     /**
--     * @var Context|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Context|MockObject
-      */
--    protected $contextMock;
-+    private $context;
- 
-     /**
--     * @var JsonFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var JsonFactory|MockObject
-      */
--    protected $resultJsonFactoryMock;
-+    private $resultJsonFactory;
- 
-     /**
--     * @var Generic|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Generic|MockObject
-      */
--    protected $sessionTransparentMock;
-+    private $sessionTransparent;
- 
-     /**
--     * @var SecureToken|\PHPUnit_Framework_MockObject_MockObject
-+     * @var SecureToken|MockObject
-      */
--    protected $secureTokenServiceMock;
-+    private $secureTokenService;
- 
-     /**
--     * @var SessionManager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var SessionManager|MockObject
-      */
--    protected $sessionManagerMock;
-+    private $sessionManager;
- 
-     /**
-      * Set up
-@@ -64,45 +66,46 @@ class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
-     protected function setUp()
-     {
- 
--        $this->contextMock = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
-+        $this->context = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->resultJsonFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class)
-+        $this->resultJsonFactory = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class)
-             ->setMethods(['create'])
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->sessionTransparentMock = $this->getMockBuilder(\Magento\Framework\Session\Generic::class)
-+        $this->sessionTransparent = $this->getMockBuilder(\Magento\Framework\Session\Generic::class)
-             ->setMethods(['setQuoteId'])
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->secureTokenServiceMock = $this->getMockBuilder(
-+        $this->secureTokenService = $this->getMockBuilder(
-             \Magento\Paypal\Model\Payflow\Service\Request\SecureToken::class
-         )
-             ->setMethods(['requestToken'])
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->sessionManagerMock = $this->getMockBuilder(\Magento\Framework\Session\SessionManager::class)
-+        $this->sessionManager = $this->getMockBuilder(\Magento\Framework\Session\SessionManager::class)
-             ->setMethods(['getQuote'])
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->transparentMock = $this->getMockBuilder(\Magento\Paypal\Model\Payflow\Transparent::class)
--            ->setMethods(['getCode'])
-+        $this->transparent = $this->getMockBuilder(\Magento\Paypal\Model\Payflow\Transparent::class)
-+            ->setMethods(['getCode', 'isActive'])
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-         $this->controller = new \Magento\Paypal\Controller\Transparent\RequestSecureToken(
--            $this->contextMock,
--            $this->resultJsonFactoryMock,
--            $this->sessionTransparentMock,
--            $this->secureTokenServiceMock,
--            $this->sessionManagerMock,
--            $this->transparentMock
-+            $this->context,
-+            $this->resultJsonFactory,
-+            $this->sessionTransparent,
-+            $this->secureTokenService,
-+            $this->sessionManager,
-+            $this->transparent
-         );
-     }
- 
-     public function testExecuteSuccess()
-     {
-         $quoteId = 99;
-+        $storeId = 2;
-         $tokenFields = ['fields-1', 'fields-2', 'fields-3'];
-         $secureToken = 'token_hash';
-         $resultExpectation = [
-@@ -116,6 +119,8 @@ class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
-         $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $quoteMock->method('getStoreId')
-+            ->willReturn($storeId);
-         $tokenMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-@@ -123,21 +128,23 @@ class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->sessionManagerMock->expects($this->atLeastOnce())
-+        $this->sessionManager->expects($this->atLeastOnce())
-             ->method('getQuote')
-             ->willReturn($quoteMock);
-+        $this->transparent->method('isActive')
-+            ->with($storeId)
-+            ->willReturn(true);
-         $quoteMock->expects($this->once())
-             ->method('getId')
-             ->willReturn($quoteId);
--        $this->sessionTransparentMock->expects($this->once())
-+        $this->sessionTransparent->expects($this->once())
-             ->method('setQuoteId')
-             ->with($quoteId);
--        $this->secureTokenServiceMock->expects($this->once())
-+        $this->secureTokenService->expects($this->once())
-             ->method('requestToken')
-             ->with($quoteMock)
-             ->willReturn($tokenMock);
--        $this->transparentMock->expects($this->once())
--            ->method('getCode')
-+        $this->transparent->method('getCode')
-             ->willReturn('transparent');
-         $tokenMock->expects($this->atLeastOnce())
-             ->method('getData')
-@@ -147,7 +154,7 @@ class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
-                     ['securetoken', null, $secureToken]
-                 ]
-             );
--        $this->resultJsonFactoryMock->expects($this->once())
-+        $this->resultJsonFactory->expects($this->once())
-             ->method('create')
-             ->willReturn($jsonMock);
-         $jsonMock->expects($this->once())
-@@ -161,6 +168,7 @@ class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
-     public function testExecuteTokenRequestException()
-     {
-         $quoteId = 99;
-+        $storeId = 2;
-         $resultExpectation = [
-             'success' => false,
-             'error' => true,
-@@ -170,24 +178,29 @@ class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
-         $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $quoteMock->method('getStoreId')
-+            ->willReturn($storeId);
-         $jsonMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->sessionManagerMock->expects($this->atLeastOnce())
-+        $this->sessionManager->expects($this->atLeastOnce())
-             ->method('getQuote')
-             ->willReturn($quoteMock);
-         $quoteMock->expects($this->once())
-             ->method('getId')
-             ->willReturn($quoteId);
--        $this->sessionTransparentMock->expects($this->once())
-+        $this->transparent->method('isActive')
-+            ->with($storeId)
-+            ->willReturn(true);
-+        $this->sessionTransparent->expects($this->once())
-             ->method('setQuoteId')
-             ->with($quoteId);
--        $this->secureTokenServiceMock->expects($this->once())
-+        $this->secureTokenService->expects($this->once())
-             ->method('requestToken')
-             ->with($quoteMock)
-             ->willThrowException(new \Exception());
--        $this->resultJsonFactoryMock->expects($this->once())
-+        $this->resultJsonFactory->expects($this->once())
-             ->method('create')
-             ->willReturn($jsonMock);
-         $jsonMock->expects($this->once())
-@@ -211,10 +224,10 @@ class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->sessionManagerMock->expects($this->atLeastOnce())
-+        $this->sessionManager->expects($this->atLeastOnce())
-             ->method('getQuote')
-             ->willReturn($quoteMock);
--        $this->resultJsonFactoryMock->expects($this->once())
-+        $this->resultJsonFactory->expects($this->once())
-             ->method('create')
-             ->willReturn($jsonMock);
-         $jsonMock->expects($this->once())
-diff --git a/app/code/Magento/Paypal/Test/Unit/CustomerData/BillingAgreementTest.php b/app/code/Magento/Paypal/Test/Unit/CustomerData/BillingAgreementTest.php
-index 010c3f8f71d..82e94462445 100644
---- a/app/code/Magento/Paypal/Test/Unit/CustomerData/BillingAgreementTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/CustomerData/BillingAgreementTest.php
-@@ -11,6 +11,7 @@ use Magento\Paypal\Helper\Data;
- use Magento\Paypal\Model\Config;
- use Magento\Paypal\Model\ConfigFactory;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Framework\Escaper;
- 
- class BillingAgreementTest extends \PHPUnit\Framework\TestCase
- {
-@@ -35,9 +36,16 @@ class BillingAgreementTest extends \PHPUnit\Framework\TestCase
-      */
-     private $billingAgreement;
- 
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaperMock;
-+
-     protected function setUp()
-     {
-+        $helper = new ObjectManager($this);
-         $this->paypalConfig = $this->createMock(Config::class);
-+        $this->escaperMock = $helper->getObject(Escaper::class);
-         $this->paypalConfig
-             ->expects($this->once())
-             ->method('setMethod')
-@@ -59,14 +67,13 @@ class BillingAgreementTest extends \PHPUnit\Framework\TestCase
-             ->willReturn($customerId);
- 
-         $this->paypalData = $this->createMock(Data::class);
--
--        $helper = new ObjectManager($this);
-         $this->billingAgreement = $helper->getObject(
-             BillingAgreement::class,
-             [
-                 'paypalConfigFactory' => $paypalConfigFactory,
-                 'paypalData' => $this->paypalData,
--                'currentCustomer' => $this->currentCustomer
-+                'currentCustomer' => $this->currentCustomer,
-+                'escaper' => $this->escaperMock
-             ]
-         );
-     }
-@@ -83,6 +90,10 @@ class BillingAgreementTest extends \PHPUnit\Framework\TestCase
-         $this->assertArrayHasKey('askToCreate', $result);
-         $this->assertArrayHasKey('confirmUrl', $result);
-         $this->assertArrayHasKey('confirmMessage', $result);
-+        $this->assertEquals(
-+            'Would you like to sign a billing agreement to streamline further purchases with PayPal?',
-+            $result['confirmMessage']
-+        );
-         $this->assertTrue($result['askToCreate']);
-     }
- 
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
-index 9ec93182126..7c528e5718c 100644
---- a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
-@@ -109,8 +109,8 @@ class AbstractConfigTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      *
--     * @case #1 This conf parameters must return AbstractConfig::PAYMENT_ACTION_SALE (isWppApiAvailabe == false)
--     * @case #2 This conf parameters must return configValue (isWppApiAvailabe == true)
-+     * @case #1 This conf parameters must return AbstractConfig::PAYMENT_ACTION_SALE (isWppApiAvailable == false)
-+     * @case #2 This conf parameters must return configValue (isWppApiAvailable == true)
-      * @case #3 This conf parameters must return configValue ($key != 'payment_action')
-      * @case #4 This conf parameters must return configValue (configValue == 'Sale')
-      * @case #5 This conf parameters must return configValue (shouldUseUnilateralPayments == false)
-@@ -189,14 +189,14 @@ class AbstractConfigTest extends \PHPUnit\Framework\TestCase
-      *
-      * @dataProvider isWppApiAvailabeDataProvider
-      */
--    public function testIsWppApiAvailabe($returnMap, $expectedValue)
-+    public function testIsWppApiAvailable($returnMap, $expectedValue)
-     {
-         $this->config->setMethod('paypal_express');
-         $this->scopeConfigMock->expects($this->any())
-             ->method('getValue')
-             ->willReturnMap($returnMap);
- 
--        $this->assertEquals($expectedValue, $this->config->isWppApiAvailabe());
-+        $this->assertEquals($expectedValue, $this->config->isWppApiAvailable());
-     }
- 
-     /**
-@@ -293,6 +293,48 @@ class AbstractConfigTest extends \PHPUnit\Framework\TestCase
-         $this->config->isMethodActive('method');
-     }
- 
-+    /**
-+     * Check bill me later active setting uses disable funding options
-+     *
-+     * @param string|null $disableFundingOptions
-+     * @param int $expectedFlag
-+     * @param bool $expectedValue
-+     *
-+     * @dataProvider isMethodActiveBmlDataProvider
-+     */
-+    public function testIsMethodActiveBml($disableFundingOptions, $expectedFlag, $expectedValue)
-+    {
-+        $this->scopeConfigMock->method('getValue')
-+            ->with(
-+                self::equalTo('payment/paypal_express/disable_funding_options'),
-+                self::equalTo('store')
-+            )
-+            ->willReturn($disableFundingOptions);
-+
-+        $this->scopeConfigMock->method('isSetFlag')
-+            ->with('payment/paypal_express_bml/active')
-+            ->willReturn($expectedFlag);
-+
-+        self::assertEquals($expectedValue, $this->config->isMethodActive('paypal_express_bml'));
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isMethodActiveBmlDataProvider()
-+    {
-+        return [
-+            ['CREDIT,CARD,ELV', 0, false],
-+            ['CREDIT,CARD,ELV', 1, true],
-+            ['CREDIT', 0, false],
-+            ['CREDIT', 1, true],
-+            ['CARD', 0, true],
-+            ['CARD', 1, true],
-+            [null, 0, true],
-+            [null, 1, true]
-+        ];
-+    }
-+
-     /**
-      * Checks a case, when notation code based on Magento edition.
-      */
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php b/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
-index 28837727533..88e7ee152b5 100644
---- a/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
-@@ -7,6 +7,9 @@ namespace Magento\Paypal\Test\Unit\Model;
- 
- use Magento\Paypal\Model\Cart;
- 
-+/**
-+ * @see \Magento\Paypal\Model\Cart
-+ */
- class CartTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -70,7 +73,7 @@ class CartTest extends \PHPUnit\Framework\TestCase
-     public function testInvalidGetAllItems($items)
-     {
-         $taxContainer = new \Magento\Framework\DataObject(
--            ['base_discount_tax_compensation_amount' => 0.2, 'base_shipping_discount_tax_compensation_amount' => 0.1]
-+            ['base_discount_tax_compensation_amount' => 0.2, 'base_shipping_discount_tax_compensation_amnt' => 0.1]
-         );
-         $this->_salesModel->expects($this->once())->method('getTaxContainer')->will($this->returnValue($taxContainer));
-         $this->_salesModel->expects($this->once())->method('getAllItems')->will($this->returnValue($items));
-@@ -146,7 +149,7 @@ class CartTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(
-             $values['base_tax_amount'] +
-             $values['base_discount_tax_compensation_amount'] +
--            $values['base_shipping_discount_tax_compensation_amount'],
-+            $values['base_shipping_discount_tax_compensation_amnt'],
-             $this->_model->getTax()
-         );
-         $this->assertEquals($values['base_shipping_amount'], $this->_model->getShipping());
-@@ -162,7 +165,7 @@ class CartTest extends \PHPUnit\Framework\TestCase
-             [
-                 [
-                     'base_discount_tax_compensation_amount' => 0,
--                    'base_shipping_discount_tax_compensation_amount' => 0,
-+                    'base_shipping_discount_tax_compensation_amnt' => 0,
-                     'base_subtotal' => 0,
-                     'base_tax_amount' => 0,
-                     'base_shipping_amount' => 0,
-@@ -174,7 +177,7 @@ class CartTest extends \PHPUnit\Framework\TestCase
-             [
-                 [
-                     'base_discount_tax_compensation_amount' => 1,
--                    'base_shipping_discount_tax_compensation_amount' => 2,
-+                    'base_shipping_discount_tax_compensation_amnt' => 2,
-                     'base_subtotal' => 3,
-                     'base_tax_amount' => 4,
-                     'base_shipping_amount' => 5,
-@@ -255,8 +258,8 @@ class CartTest extends \PHPUnit\Framework\TestCase
-             [
-                 'base_discount_tax_compensation_amount' =>
-                     $values['base_discount_tax_compensation_amount'],
--                'base_shipping_discount_tax_compensation_amount' =>
--                    $values['base_shipping_discount_tax_compensation_amount'],
-+                'base_shipping_discount_tax_compensation_amnt' =>
-+                    $values['base_shipping_discount_tax_compensation_amnt'],
-             ]
-         );
-         $expectedSubtotal = $values['base_subtotal'];
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/Rules/ConverterTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/Rules/ConverterTest.php
-index c1a3a5d5bd9..e7e723f1f3a 100644
---- a/app/code/Magento/Paypal/Test/Unit/Model/Config/Rules/ConverterTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/Config/Rules/ConverterTest.php
-@@ -60,6 +60,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
-                                     'value' => '0',
-                                     'predicate' => [
-                                     ],
-+                                    'include' => '',
-                                 ],
-                                 'event1' => [
-                                     'value' => '1',
-@@ -72,6 +73,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
-                                             'argument2' => 'argument2',
-                                         ],
-                                     ],
-+                                    'include' => '',
-                                 ],
-                             ],
-                         ],
-@@ -109,6 +111,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
-                                 'event0' => [
-                                     'value' => '0',
-                                     'predicate' => [],
-+                                    'include' => '',
-                                 ],
-                                 'event1' => [
-                                     'value' => '1',
-@@ -121,6 +124,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
-                                             'argument2' => 'argument2',
-                                         ],
-                                     ],
-+                                    'include' => '',
-                                 ],
-                             ],
-                         ],
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php
-index 8615b91383a..f0dda20b71c 100644
---- a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php
-@@ -7,7 +7,6 @@ namespace Magento\Paypal\Test\Unit\Model\Config\Structure\Element;
- 
- use Magento\Paypal\Model\Config\Structure\Element\FieldPlugin as FieldConfigStructurePlugin;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--use Magento\Framework\App\RequestInterface;
- use Magento\Config\Model\Config\Structure\Element\Field as FieldConfigStructureMock;
- 
- class FieldPluginTest extends \PHPUnit\Framework\TestCase
-@@ -22,11 +21,6 @@ class FieldPluginTest extends \PHPUnit\Framework\TestCase
-      */
-     private $objectManagerHelper;
- 
--    /**
--     * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $requestMock;
--
-     /**
-      * @var FieldConfigStructureMock|\PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -34,16 +28,13 @@ class FieldPluginTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
--        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
--            ->getMockForAbstractClass();
-         $this->subjectMock = $this->getMockBuilder(FieldConfigStructureMock::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-         $this->objectManagerHelper = new ObjectManagerHelper($this);
-         $this->plugin = $this->objectManagerHelper->getObject(
--            FieldConfigStructurePlugin::class,
--            ['request' => $this->requestMock]
-+            FieldConfigStructurePlugin::class
-         );
-     }
- 
-@@ -56,10 +47,9 @@ class FieldPluginTest extends \PHPUnit\Framework\TestCase
- 
-     public function testAroundGetConfigPathNonPaymentSection()
-     {
--        $this->requestMock->expects(static::once())
--            ->method('getParam')
--            ->with('section')
--            ->willReturn('non-payment');
-+        $this->subjectMock->expects($this->once())
-+            ->method('getPath')
-+            ->willReturn('non-payment/group/field');
- 
-         $this->assertNull($this->plugin->afterGetConfigPath($this->subjectMock, null));
-     }
-@@ -72,11 +62,7 @@ class FieldPluginTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testAroundGetConfigPath($subjectPath, $expectedConfigPath)
-     {
--        $this->requestMock->expects(static::once())
--            ->method('getParam')
--            ->with('section')
--            ->willReturn('payment');
--        $this->subjectMock->expects(static::once())
-+        $this->subjectMock->expects($this->exactly(2))
-             ->method('getPath')
-             ->willReturn($subjectPath);
- 
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
-index 113aa5766ed..dd3cf11b87e 100644
---- a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
-@@ -7,6 +7,7 @@ namespace Magento\Paypal\Test\Unit\Model;
- 
- use Magento\Paypal\Model\Config;
- use Magento\Store\Model\ScopeInterface;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
- 
- class ConfigTest extends \PHPUnit\Framework\TestCase
- {
-@@ -16,7 +17,7 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-     private $model;
- 
-     /**
--     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $scopeConfig;
- 
-@@ -117,14 +118,29 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testIsMethodAvailableForIsMethodActive($methodName, $expected)
-     {
--        $this->scopeConfig->expects($this->any())
--            ->method('getValue')
--            ->with('paypal/general/merchant_country')
--            ->will($this->returnValue('US'));
--        $this->scopeConfig->expects($this->exactly(2))
--            ->method('isSetFlag')
--            ->withAnyParameters()
--            ->will($this->returnValue(true));
-+        if ($methodName == Config::METHOD_WPP_BML) {
-+            $valueMap = [
-+                ['paypal/general/merchant_country', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, 'US'],
-+                ['paypal/general/merchant_country', ScopeInterface::SCOPE_STORE, null, 'US'],
-+                ['payment/paypal_express/disable_funding_options', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, []],
-+            ];
-+            $this->scopeConfig
-+                ->method('getValue')
-+                ->willReturnMap($valueMap);
-+            $this->scopeConfig->expects($this->exactly(1))
-+                ->method('isSetFlag')
-+                ->withAnyParameters()
-+                ->willReturn(true);
-+        } else {
-+            $this->scopeConfig
-+                ->method('getValue')
-+                ->with('paypal/general/merchant_country')
-+                ->willReturn('US');
-+            $this->scopeConfig->expects($this->exactly(2))
-+                ->method('isSetFlag')
-+                ->withAnyParameters()
-+                ->willReturn(true);
-+        }
- 
-         $this->model->setMethod($methodName);
-         $this->assertEquals($expected, $this->model->isMethodAvailable($methodName));
-@@ -219,6 +235,34 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals('Authorization', $this->model->getValue('payment_action'));
-     }
- 
-+    /**
-+     * @param string $name
-+     * @param string $expectedValue
-+     * @param string|null $expectedResult
-+     *
-+     * @dataProvider payPalStylesDataProvider
-+     */
-+    public function testGetSpecificConfigPathPayPalStyles($name, $expectedValue, $expectedResult)
-+    {
-+        // _mapGenericStyleFieldset
-+        $this->scopeConfig->method('getValue')
-+            ->with('paypal/style/' . $name)
-+            ->willReturn($expectedValue);
-+
-+        $this->assertEquals($expectedResult, $this->model->getValue($name));
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function payPalStylesDataProvider(): array
-+    {
-+        return [
-+            ['checkout_page_button_customize', 'value', 'value'],
-+            ['test', 'value', null],
-+        ];
-+    }
-+
-     /**
-      * @dataProvider skipOrderReviewStepDataProvider
-      */
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Express/LocaleResolverTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Express/LocaleResolverTest.php
-new file mode 100644
-index 00000000000..b9e2c959b4f
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/Express/LocaleResolverTest.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Test\Unit\Model\Express;
-+
-+use Magento\Framework\Locale\ResolverInterface;
-+use Magento\Paypal\Model\Config;
-+use Magento\Paypal\Model\ConfigFactory;
-+use Magento\Paypal\Model\Express\LocaleResolver as ExpressLocaleResolver;
-+
-+/**
-+ * Class LocaleResolverTest
-+ */
-+class LocaleResolverTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject|ResolverInterface
-+     */
-+    private $resolver;
-+
-+    /**
-+     * @var ExpressLocaleResolver
-+     */
-+    private $model;
-+
-+    protected function setUp()
-+    {
-+        $this->resolver = $this->createMock(ResolverInterface::class);
-+        /** @var Config $config */
-+        $config = $this->createMock(Config::class);
-+        $config->method('getValue')
-+            ->with('supported_locales')
-+            ->willReturn('zh_CN,zh_HK,zh_TW,fr_FR');
-+
-+        /** @var ConfigFactory $configFactory */
-+        $configFactory = $this->createPartialMock(ConfigFactory::class, ['create']);
-+        $configFactory->method('create')->willReturn($config);
-+
-+        $this->model = new ExpressLocaleResolver($this->resolver, $configFactory);
-+    }
-+
-+    /**
-+     * Tests retrieving locales for PayPal Express.
-+     *
-+     * @param string $locale
-+     * @param string $expectedLocale
-+     * @dataProvider getLocaleDataProvider
-+     */
-+    public function testGetLocale(string $locale, string $expectedLocale)
-+    {
-+        $this->resolver->method('getLocale')
-+            ->willReturn($locale);
-+
-+        $this->assertEquals($expectedLocale, $this->model->getLocale());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getLocaleDataProvider(): array
-+    {
-+        return [
-+            ['locale' => 'zh_Hans_CN', 'expectedLocale' => 'zh_CN'],
-+            ['locale' => 'zh_Hant_HK', 'expectedLocale' => 'zh_HK'],
-+            ['locale' => 'zh_Hant_TW', 'expectedLocale' => 'zh_TW'],
-+            ['locale' => 'fr_FR', 'expectedLocale' => 'fr_FR'],
-+            ['locale' => 'unknown', 'expectedLocale' => 'en_US'],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php
-index 935b4484a8d..b316f92c0ce 100644
---- a/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php
-@@ -5,7 +5,10 @@
-  */
- namespace Magento\Paypal\Test\Unit\Model;
- 
-+use Magento\Framework\UrlInterface;
- use Magento\Paypal\Model\ExpressConfigProvider;
-+use Magento\Paypal\Model\SmartButtonConfig;
-+use PHPUnit\Framework\MockObject\MockObject;
- 
- class ExpressConfigProviderTest extends \PHPUnit\Framework\TestCase
- {
-@@ -40,16 +43,19 @@ class ExpressConfigProviderTest extends \PHPUnit\Framework\TestCase
-         $payment->expects($this->atLeastOnce())->method('getCheckoutRedirectUrl')->willReturn('http://redirect.url');
-         $paymentHelper->expects($this->atLeastOnce())->method('getMethodInstance')->willReturn($payment);
- 
--        /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject $urlBuilderMock */
-+        /** @var UrlInterface|MockObject $urlBuilderMock */
-         $urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class);
- 
-+        $smartButtonConfigMock = $this->createMock(SmartButtonConfig::class);
-+
-         $configProvider = new ExpressConfigProvider(
-             $configFactory,
-             $localeResolver,
-             $currentCustomer,
-             $paypalHelper,
-             $paymentHelper,
--            $urlBuilderMock
-+            $urlBuilderMock,
-+            $smartButtonConfigMock
-         );
-         $configProvider->getConfig();
-     }
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
-index abedc573558..3b012220106 100644
---- a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
-@@ -12,6 +12,7 @@ use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Payment\Model\InfoInterface;
- use Magento\Payment\Observer\AbstractDataAssignObserver;
- use Magento\Paypal\Model\Api\Nvp;
-+use Magento\Paypal\Model\Api\ProcessableException;
- use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
- use Magento\Paypal\Model\Express;
- use Magento\Paypal\Model\Pro;
-@@ -19,7 +20,7 @@ use Magento\Quote\Api\Data\PaymentInterface;
- use Magento\Sales\Model\Order;
- use Magento\Sales\Model\Order\Payment;
- use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface;
--use \PHPUnit_Framework_MockObject_MockObject as MockObject;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
- /**
-  * Class ExpressTest
-@@ -27,10 +28,15 @@ use \PHPUnit_Framework_MockObject_MockObject as MockObject;
-  */
- class ExpressTest extends \PHPUnit\Framework\TestCase
- {
-+    /**
-+     * @var string
-+     */
-+    private static $authorizationExpiredCode = 10601;
-+
-     /**
-      * @var array
-      */
--    protected $errorCodes = [
-+    private $errorCodes = [
-         ApiProcessableException::API_INTERNAL_ERROR,
-         ApiProcessableException::API_UNABLE_PROCESS_PAYMENT_ERROR_CODE,
-         ApiProcessableException::API_DO_EXPRESS_CHECKOUT_FAIL,
-@@ -40,7 +46,7 @@ class ExpressTest extends \PHPUnit\Framework\TestCase
-         ApiProcessableException::API_COUNTRY_FILTER_DECLINE,
-         ApiProcessableException::API_MAXIMUM_AMOUNT_FILTER_DECLINE,
-         ApiProcessableException::API_OTHER_FILTER_DECLINE,
--        ApiProcessableException::API_ADDRESS_MATCH_FAIL
-+        ApiProcessableException::API_ADDRESS_MATCH_FAIL,
-     ];
- 
-     /**
-@@ -80,6 +86,7 @@ class ExpressTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
-+        $this->errorCodes[] = self::$authorizationExpiredCode;
-         $this->checkoutSession = $this->createPartialMock(
-             Session::class,
-             ['getPaypalTransactionData', 'setPaypalTransactionData']
-@@ -104,16 +111,20 @@ class ExpressTest extends \PHPUnit\Framework\TestCase
-         );
-         $this->pro = $this->createPartialMock(
-             Pro::class,
--            ['setMethod', 'getApi', 'importPaymentInfo', 'resetApi']
-+            ['setMethod', 'getApi', 'importPaymentInfo', 'resetApi', 'void']
-         );
-         $this->eventManager = $this->getMockBuilder(ManagerInterface::class)
-             ->setMethods(['dispatch'])
-             ->getMockForAbstractClass();
- 
--        $this->pro->expects($this->any())->method('getApi')->will($this->returnValue($this->nvp));
-+        $this->pro->method('getApi')
-+            ->willReturn($this->nvp);
-         $this->helper = new ObjectManager($this);
-     }
- 
-+    /**
-+     * Tests setting the list of processable errors.
-+     */
-     public function testSetApiProcessableErrors()
-     {
-         $this->nvp->expects($this->once())->method('setProcessableErrors')->with($this->errorCodes);
-@@ -128,6 +139,32 @@ class ExpressTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * Tests canceling order payment when expired authorization generates exception on a client.
-+     */
-+    public function testCancelWithExpiredAuthorizationTransaction()
-+    {
-+        $this->pro->method('void')
-+            ->willThrowException(
-+                new ProcessableException(__('PayPal gateway has rejected request.'), null, 10601)
-+            );
-+
-+        $this->model = $this->helper->getObject(Express::class, ['data' => [$this->pro]]);
-+        /** @var Payment|MockObject $paymentModel */
-+        $paymentModel = $this->createMock(Payment::class);
-+        $paymentModel->expects($this->once())
-+            ->method('setTransactionId')
-+            ->with(null);
-+        $paymentModel->expects($this->once())
-+            ->method('setIsTransactionClosed')
-+            ->with(true);
-+        $paymentModel->expects($this->once())
-+            ->method('setShouldCloseParentTransaction')
-+            ->with(true);
-+
-+        $this->model->cancel($paymentModel);
-+    }
-+
-     /**
-      * Tests order payment action.
-      *
-@@ -164,6 +201,11 @@ class ExpressTest extends \PHPUnit\Framework\TestCase
-         static::assertEquals($this->model, $this->model->order($paymentModel, 12.3));
-     }
- 
-+    /**
-+     * Tests data assigning.
-+     *
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-     public function testAssignData()
-     {
-         $transportValue = 'something';
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
-index 93a10727824..d67441227e3 100644
---- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
-@@ -49,6 +49,7 @@ class TransactionTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testSavePaymentInQuote()
-     {
-+        $cartId = 12;
-         /** @var Transaction $transactionService */
-         $transactionService = (new ObjectManager($this))->getObject(
-             Transaction::class,
-@@ -57,7 +58,7 @@ class TransactionTest extends \PHPUnit\Framework\TestCase
-             ]
-         );
- 
--        $transactionService->savePaymentInQuote(new DataObject);
-+        $transactionService->savePaymentInQuote(new DataObject, $cartId);
-     }
- 
-     /**
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
-index e6a994cba78..f6df35ae272 100644
---- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
-@@ -3,446 +3,298 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Paypal\Test\Unit\Model\Payflow;
- 
--use Magento\Paypal\Block\Payment\Info;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Payment\Model\Method\ConfigInterface as PaymentConfigInterface;
-+use Magento\Payment\Model\Method\ConfigInterfaceFactory as PaymentConfigInterfaceFactory;
-+use Magento\Paypal\Model\Cart as PayPalCart;
-+use Magento\Paypal\Model\CartFactory as PayPalCartFactory;
-+use Magento\Paypal\Model\Payflow\Service\Gateway as PayPalPayflowGateway;
-+use Magento\Paypal\Model\Payflow\Transparent as PayPalPayflowTransparent;
- use Magento\Paypal\Model\Payflowpro;
--use Magento\Paypal\Model\Payflow\Transparent;
-+use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
-+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory as PaymentExtensionInterfaceFactory;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Store\Model\StoreManagerInterface;
- use Magento\Vault\Api\Data\PaymentTokenInterface;
--use Magento\Vault\Model\CreditCardTokenFactory;
-+use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
- /**
-- * Class TransparentTest
-- *
-- * Test class for \Magento\Paypal\Model\Payflow\Transparent
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class TransparentTest extends \PHPUnit\Framework\TestCase
- {
--    /** @var Transparent|\PHPUnit_Framework_MockObject_MockObject */
--    protected $object;
--
--    /** @var \Magento\Paypal\Model\Payflow\Service\Gateway|\PHPUnit_Framework_MockObject_MockObject */
--    protected $gatewayMock;
--
--    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $storeManagerMock;
--
--    /** @var \Magento\Payment\Model\Method\ConfigInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject */
--    protected $configFactoryMock;
--
--    /** @var \Magento\Payment\Model\Method\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $configMock;
-+    /**
-+     * @var PayPalPayflowTransparent
-+     */
-+    private $subject;
- 
--    /** @var \Magento\Framework\DataObject */
--    protected $responseMock;
-+    /**
-+     * @var PaymentConfigInterface|MockObject
-+     */
-+    private $paymentConfig;
- 
--    /** @var \Magento\Sales\Model\Order\Payment\Info|\PHPUnit_Framework_MockObject_MockObject */
--    protected $paymentMock;
-+    /**
-+     * @var PayPalPayflowGateway|MockObject
-+     */
-+    private $payPalPayflowGateway;
- 
--    /** @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject */
--    protected $orderMock;
-+    /**
-+     * @var PaymentTokenInterface|MockObject
-+     */
-+    private $paymentToken;
- 
--    /** @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject */
--    protected $addressBillingMock;
-+    /**
-+     * @var PayPalCart|MockObject
-+     */
-+    private $payPalCart;
- 
--    /** @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject */
--    protected $addressShippingMock;
-+    /**
-+     * @var ScopeConfigInterface|MockObject
-+     */
-+    private $scopeConfig;
- 
-     /**
--     * @var CreditCardTokenFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Payment|MockObject
-      */
--    protected $paymentTokenFactory;
-+    private $payment;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|
--     * \Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator
-+     * @var Order|MockObject
-      */
--    protected $responseValidator;
-+    private $order;
- 
--    protected function setUp()
-+    public function setUp()
-     {
--        $this->paymentMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Payment::class)
--            ->setMethods([])
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->paymentTokenFactory = $this->getMockBuilder(CreditCardTokenFactory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--
--        $this->gatewayMock = $this->getMockBuilder(\Magento\Paypal\Model\Payflow\Service\Gateway::class)
--            ->setMethods(['postRequest'])
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
--            ->setMethods(['getStore', 'getId'])
--            ->disableOriginalConstructor()
--            ->getMockForAbstractClass();
--        $this->storeManagerMock->method('getStore')
--            ->willReturnSelf();
--        $this->configMock = $this->getMockBuilder(\Magento\Paypal\Model\PayflowConfig::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->configFactoryMock = $this->getMockBuilder(\Magento\Payment\Model\Method\ConfigInterfaceFactory::class)
--            ->setMethods(['create'])
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->configFactoryMock->method('create')
--            ->willReturn($this->configMock);
--        $this->responseMock = new \Magento\Framework\DataObject();
--        $this->responseValidator = $this->getMockBuilder(
--            \Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator::class
--        )->disableOriginalConstructor()
--            ->setMethods(['validate'])
--            ->getMock();
-+        $this->initPayment();
- 
--        $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--        $this->object = $objectHelper->getObject(
--            \Magento\Paypal\Model\Payflow\Transparent::class,
--            [
--                'gateway' => $this->gatewayMock,
--                'storeManager' => $this->storeManagerMock,
--                'configFactory' => $this->configFactoryMock,
--                'responseValidator' => $this->responseValidator,
--                'paymentTokenFactory' => $this->paymentTokenFactory
--            ]
--        );
-+        $this->subject = (new ObjectManagerHelper($this))
-+            ->getObject(
-+                PayPalPayflowTransparent::class,
-+                [
-+                    'configFactory' => $this->getPaymentConfigInterfaceFactory(),
-+                    'paymentExtensionFactory' => $this->getPaymentExtensionInterfaceFactory(),
-+                    'storeManager' => $this->getStoreManager(),
-+                    'gateway' => $this->getPayPalPayflowGateway(),
-+                    'paymentTokenFactory' => $this->getPaymentTokenFactory(),
-+                    'payPalCartFactory' => $this->getPayPalCartFactory(),
-+                    'scopeConfig' => $this->getScopeConfig(),
-+                ]
-+            );
-     }
- 
-     /**
--     * Initializing a collection Mock for Authorize method
-+     * Asserts that authorize request to Payflow gateway is valid.
-      *
--     * @return void
-+     * @dataProvider validAuthorizeRequestDataProvider
-+     * @param DataObject $validAuthorizeRequest
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\State\InvalidTransitionException
-      */
--    protected function initializationAuthorizeMock()
-+    public function testValidAuthorizeRequest(DataObject $validAuthorizeRequest)
-     {
--        $this->orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->setMethods([
--                'getCustomerId', 'getBillingAddress', 'getShippingAddress', 'getCustomerEmail',
--                'getId', 'getIncrementId', 'getBaseCurrencyCode'
--            ])
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->addressBillingMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
--            ->setMethods(
-+        $this->scopeConfig->method('getValue')
-+            ->willReturnMap(
-                 [
--                    'getFirstname',
--                    'getLastname',
--                    'getStreet',
--                    'getCity',
--                    'getRegionCode',
--                    'getPostcode',
--                    'getCountryId'
-+                    ['payment/payflowpro/user', ScopeInterface::SCOPE_STORE, null, 'user'],
-+                    ['payment/payflowpro/vendor', ScopeInterface::SCOPE_STORE, null, 'vendor'],
-+                    ['payment/payflowpro/partner', ScopeInterface::SCOPE_STORE, null, 'partner'],
-+                    ['payment/payflowpro/pwd', ScopeInterface::SCOPE_STORE, null, 'pwd'],
-+                    ['payment/payflowpro/verbosity', ScopeInterface::SCOPE_STORE, null, 'verbosity'],
-                 ]
--            )->disableOriginalConstructor()
--            ->getMock();
--        $this->addressShippingMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
--            ->setMethods(
-+            );
-+        $this->paymentConfig->method('getBuildNotationCode')->willReturn('BUTTONSOURCE');
-+        $this->payment->method('getAdditionalInformation')
-+            ->willReturnMap(
-                 [
--                    'getFirstname',
--                    'getLastname',
--                    'getStreet',
--                    'getCity',
--                    'getRegionCode',
--                    'getPostcode',
--                    'getCountryId'
-+                    [Payflowpro::PNREF, 'XXXXXXXXXXXX'],
-                 ]
--            )->disableOriginalConstructor()
--            ->getMock();
--    }
-+            );
-+        $this->order->method('getIncrementId')->willReturn('000000001');
-+        $this->order->method('getBaseCurrencyCode')->willReturn('USD');
-+        $this->payPalCart->method('getSubtotal')->willReturn(5.00);
-+        $this->payPalCart->method('getTax')->willReturn(5.00);
-+        $this->payPalCart->method('getShipping')->willReturn(5.00);
-+        $this->payPalCart->method('getDiscount')->willReturn(5.00);
-+
-+        $this->payPalPayflowGateway->expects($this->once())
-+            ->method('postRequest')
-+            ->with($this->equalTo($validAuthorizeRequest));
- 
--    /**
--     * Build data for request for operation Authorize
--     *
--     * @return void
--     */
--    protected function buildRequestData()
--    {
--        $this->paymentMock->expects($this->once())
--            ->method('getOrder')
--            ->willReturn($this->orderMock);
--        $this->orderMock->expects($this->once())
--            ->method('getBaseCurrencyCode')
--            ->willReturn('USD');
--        $this->orderMock->expects($this->once())
--            ->method('getBillingAddress')
--            ->willReturn($this->addressBillingMock);
--        $this->orderMock->expects(static::once())
--            ->method('getId')
--            ->willReturn(1);
--        $this->orderMock->expects(static::once())
--            ->method('getIncrementId')
--            ->willReturn('0000001');
--        $this->orderMock->expects($this->once())
--            ->method('getShippingAddress')
--            ->willReturn($this->addressShippingMock);
--        $this->addressBillingMock->expects($this->once())
--            ->method('getFirstname')
--            ->willReturn('Firstname');
--        $this->addressBillingMock->expects($this->once())
--            ->method('getLastname')
--            ->willReturn('Lastname');
--        $this->addressBillingMock->expects($this->once())
--            ->method('getStreet')
--            ->willReturn(['street-1', 'street-2']);
--        $this->addressBillingMock->expects($this->once())
--            ->method('getCity')
--            ->willReturn('City');
--        $this->addressBillingMock->expects($this->once())
--            ->method('getRegionCode')
--            ->willReturn('RegionCode');
--        $this->addressBillingMock->expects($this->once())
--            ->method('getPostcode')
--            ->willReturn('Postcode');
--        $this->addressBillingMock->expects($this->once())
--            ->method('getCountryId')
--            ->willReturn('CountryId');
--        $this->orderMock->expects($this->once())
--            ->method('getCustomerEmail')
--            ->willReturn('customer@email.com');
--        $this->addressShippingMock->expects($this->once())
--            ->method('getFirstname')
--            ->willReturn('Firstname');
--        $this->addressShippingMock->expects($this->once())
--            ->method('getLastname')
--            ->willReturn('Lastname');
--        $this->addressShippingMock->expects($this->once())
--            ->method('getStreet')
--            ->willReturn(['street-1', 'street-2']);
--        $this->addressShippingMock->expects($this->once())
--            ->method('getCity')
--            ->willReturn('City');
--        $this->addressShippingMock->expects($this->once())
--            ->method('getRegionCode')
--            ->willReturn('RegionCode');
--        $this->addressShippingMock->expects($this->once())
--            ->method('getPostcode')
--            ->willReturn('Postcode');
--        $this->addressShippingMock->expects($this->once())
--            ->method('getCountryId')
--            ->willReturn('CountryId');
-+        $this->subject->authorize($this->payment, 10);
-     }
- 
-     /**
--     * @return \Magento\Framework\DataObject
-+     * @return array
-      */
--    protected function crateVoidResponseMock()
-+    public function validAuthorizeRequestDataProvider(): array
-     {
--        $voidResponseMock = new \Magento\Framework\DataObject(
-+        return [
-             [
--                'result_code' => Transparent::RESPONSE_CODE_APPROVED,
--                'pnref' => 'test-pnref'
-+                new DataObject(
-+                    [
-+                        'user' => 'user',
-+                        'vendor' => 'vendor',
-+                        'partner' => 'partner',
-+                        'pwd' => 'pwd',
-+                        'verbosity' => 'verbosity',
-+                        'BUTTONSOURCE' => 'BUTTONSOURCE',
-+                        'tender' => 'C',
-+                        'custref' => '000000001',
-+                        'invnum' => '000000001',
-+                        'comment1' => '000000001',
-+                        'trxtype' => 'A',
-+                        'origid' => 'XXXXXXXXXXXX',
-+                        'amt' => '10.00',
-+                        'currency' => 'USD',
-+                        'itemamt' => '5.00',
-+                        'taxamt' => '5.00',
-+                        'freightamt' => '5.00',
-+                        'discount' => '5.00',
-+                    ]
-+                ),
-             ]
--        );
--
--        $this->responseMock->setData(Transparent::PNREF, 'test-pnref');
--
--        $this->paymentMock->expects($this->once())
--            ->method('setParentTransactionId')
--            ->with('test-pnref');
--        $this->paymentMock->expects($this->once())
--            ->method('getParentTransactionId')
--            ->willReturn('test-pnref');
--        $this->paymentMock->expects($this->once())
--            ->method('setTransactionId')
--            ->with('test-pnref')
--            ->willReturnSelf();
--        $this->paymentMock->expects($this->once())
--            ->method('setIsTransactionClosed')
--            ->with(1)
--            ->willReturnSelf();
--        $this->paymentMock->expects($this->once())
--            ->method('setShouldCloseParentTransaction')
--            ->with(1);
--
--        return $voidResponseMock;
-+        ];
-     }
- 
-     /**
--     * @expectedException  \Exception
-+     * @return PaymentConfigInterfaceFactory|MockObject
-      */
--    public function testAuthorizeException()
-+    private function getPaymentConfigInterfaceFactory()
-     {
--        $this->initializationAuthorizeMock();
--        $this->buildRequestData();
-+        $paymentConfigInterfaceFactory = $this->getMockBuilder(PaymentConfigInterfaceFactory::class)
-+            ->setMethods(['create'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->paymentConfig = $this->getMockBuilder(PaymentConfigInterface::class)
-+            ->setMethods(['setStoreId', 'setMethodInstance', 'setMethod', 'getBuildNotationCode'])
-+            ->getMockForAbstractClass();
- 
--        $this->gatewayMock->expects($this->once())
--            ->method('postRequest')
--            ->willThrowException(new \Exception());
-+        $paymentConfigInterfaceFactory->method('create')->willReturn($this->paymentConfig);
- 
--        $this->object->authorize($this->paymentMock, 33);
-+        return $paymentConfigInterfaceFactory;
-     }
- 
-     /**
--     * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @expectedExceptionMessage The payment couldn't be processed at this time. Please try again later.
-+     * @return PaymentExtensionInterfaceFactory|MockObject
-      */
--    public function testAuthorizeValidationException()
-+    private function getPaymentExtensionInterfaceFactory()
-     {
--        $this->initializationAuthorizeMock();
--        $this->buildRequestData();
--        $voidResponseMock = $this->crateVoidResponseMock();
-+        $paymentExtensionInterfaceFactory = $this->getMockBuilder(PaymentExtensionInterfaceFactory::class)
-+            ->setMethods(['create'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $orderPaymentExtension = $this->getMockBuilder(OrderPaymentExtensionInterface::class)
-+            ->setMethods(['setVaultPaymentToken'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
- 
--        $this->gatewayMock->expects($this->at(0))
--            ->method('postRequest')
--            ->willReturn($this->responseMock);
-+        $paymentExtensionInterfaceFactory->method('create')->willReturn($orderPaymentExtension);
- 
--        $this->responseValidator->expects($this->once())
--            ->method('validate')
--            ->with($this->responseMock)
--            ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('Error')));
-+        return $paymentExtensionInterfaceFactory;
-+    }
- 
--        $this->gatewayMock->expects($this->at(1))
--            ->method('postRequest')
--            ->willReturn($voidResponseMock);
-+    /**
-+     * @return StoreManagerInterface|MockObject
-+     */
-+    private function getStoreManager()
-+    {
-+        $storeManager = $this->getMockBuilder(StoreManagerInterface::class)
-+            ->getMockForAbstractClass();
-+        $store = $this->getMockBuilder(StoreInterface::class)
-+            ->getMockForAbstractClass();
-+
-+        $storeManager->method('getStore')->willReturn($store);
- 
--        $this->paymentMock->expects($this->once())
--            ->method('getAdditionalInformation')
--            ->with(Payflowpro::PNREF)
--            ->willReturn('test-pnref');
-+        return $storeManager;
-+    }
- 
--        $this->responseMock->setData('result_code', Payflowpro::RESPONSE_CODE_FRAUDSERVICE_FILTER);
-+    /**
-+     * @return PayPalPayflowGateway|MockObject
-+     */
-+    private function getPayPalPayflowGateway()
-+    {
-+        $this->payPalPayflowGateway = $this->getMockBuilder(PayPalPayflowGateway::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->payPalPayflowGateway->method('postRequest')
-+            ->willReturn(new DataObject());
- 
--        $this->object->authorize($this->paymentMock, 33);
-+        return $this->payPalPayflowGateway;
-     }
- 
-     /**
--     * @param int $resultCode
--     * @param int $origResult
--     *
--     * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @dataProvider authorizeLocalizedExceptionDataProvider
-+     * @return PaymentTokenInterfaceFactory|MockObject
-      */
--    public function testAuthorizeLocalizedException(
--        $resultCode,
--        $origResult
--    ) {
--        $this->initializationAuthorizeMock();
--        $this->buildRequestData();
-+    private function getPaymentTokenFactory()
-+    {
-+        $paymentTokenInterfaceFactory = $this->getMockBuilder(PaymentTokenInterfaceFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->paymentToken = $this->getMockBuilder(PaymentTokenInterface::class)
-+            ->getMockForAbstractClass();
- 
--        $this->responseMock->setData('result_code', $resultCode);
--        $this->responseMock->setData('origresult', $origResult);
-+        $paymentTokenInterfaceFactory->method('create')->willReturn($this->paymentToken);
- 
--        $this->gatewayMock->expects($this->exactly(1))
--            ->method('postRequest')
--            ->willReturn($this->responseMock);
--        $this->object->authorize($this->paymentMock, 33);
-+        return $paymentTokenInterfaceFactory;
-     }
- 
-     /**
--     * @return array
-+     * @return PayPalCartFactory|MockObject
-      */
--    public function authorizeLocalizedExceptionDataProvider()
-+    private function getPayPalCartFactory()
-     {
--        return [
--            [
--                'origResult' => Payflowpro::RESPONSE_CODE_APPROVED,
--                'resultCode' => Payflowpro::RESPONSE_CODE_DECLINED_BY_FILTER
--            ],
--            [
--                'origResult' => Payflowpro::RESPONSE_CODE_DECLINED_BY_FILTER,
--                'resultCode' => Payflowpro::RESPONSE_CODE_FRAUDSERVICE_FILTER
--            ],
--            [
--                'origResult' => Payflowpro::RESPONSE_CODE_DECLINED,
--                'resultCode' => 1111111111
--            ],
--            [
--                'origResult' => 3432432423,
--                'resultCode' => 23233432423
--            ],
--        ];
-+        $payPalCartFactory = $this->getMockBuilder(PayPalCartFactory::class)
-+            ->setMethods(['create'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->payPalCart = $this->getMockBuilder(PayPalCart::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $payPalCartFactory->method('create')->willReturn($this->payPalCart);
-+
-+        return $payPalCartFactory;
-     }
- 
-     /**
--     * Test method
--     * with resultCode = RESPONSE_CODE_APPROVED and Origresult != RESPONSE_CODE_FRAUDSERVICE_FILTER
-+     * @return ScopeConfigInterface|MockObject
-      */
--    public function testAuthorize()
-+    private function getScopeConfig()
-     {
--        $this->initializationAuthorizeMock();
--        $this->buildRequestData();
--
--        $paymentTokenMock = $this->createMock(PaymentTokenInterface::class);
--        $extensionAttributes = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderPaymentExtensionInterface::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['setVaultPaymentToken'])
-+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
-             ->getMockForAbstractClass();
--        $ccDetails = [
--            'cc_type' => 'VI',
--            'cc_number' => '1111'
--        ];
--
--        $this->responseMock->setData('result_code', Payflowpro::RESPONSE_CODE_APPROVED);
--        $this->responseMock->setData('origresult', 0);
--        $this->responseMock->setData('pnref', 'test-pnref');
--
--        $this->gatewayMock->expects($this->once())->method('postRequest')->willReturn($this->responseMock);
--
--        $this->responseValidator->expects($this->once())
--            ->method('validate')
--            ->with($this->responseMock);
--
--        $this->paymentMock->expects($this->once())
--            ->method('setTransactionId')
--            ->with('test-pnref')
--            ->willReturnSelf();
--        $this->paymentMock->expects($this->once())
--            ->method('setIsTransactionClosed')
--            ->with(0);
--        $this->paymentMock->expects($this->once())
--            ->method('getCcExpYear')
--            ->willReturn('2017');
--        $this->paymentMock->expects($this->once())
--            ->method('getCcExpMonth')
--            ->willReturn('12');
--        $this->paymentMock->expects(static::any())
--            ->method('getAdditionalInformation')
--            ->willReturnMap(
--                [
--                    [Transparent::CC_DETAILS, $ccDetails],
--                    [Transparent::PNREF, 'test-pnref']
--                ]
--            );
- 
--        $this->paymentTokenFactory->expects(static::once())
--            ->method('create')
--            ->willReturn($paymentTokenMock);
--        $paymentTokenMock->expects(static::once())
--            ->method('setGatewayToken')
--            ->with('test-pnref');
--        $paymentTokenMock->expects(static::once())
--            ->method('setTokenDetails')
--            ->with(json_encode($ccDetails));
--        $paymentTokenMock->expects(static::once())
--            ->method('setExpiresAt')
--            ->with('2018-01-01 00:00:00');
--
--        $this->paymentMock->expects(static::once())
--            ->method('getExtensionAttributes')
--            ->willReturn($extensionAttributes);
--        $extensionAttributes->expects(static::once())
--            ->method('setVaultPaymentToken')
--            ->with($paymentTokenMock);
--
--        $this->paymentMock->expects($this->at(8))
--            ->method('unsAdditionalInformation')
--            ->with(Transparent::CC_DETAILS);
--        $this->paymentMock->expects($this->at(9))
--            ->method('unsAdditionalInformation')
--            ->with(Transparent::PNREF);
--
--        $this->assertSame($this->object, $this->object->authorize($this->paymentMock, 33));
-+        return $this->scopeConfig;
-     }
- 
-     /**
--     * @covers \Magento\Paypal\Model\Payflow\Transparent::getInfoBlockType()
-+     * @return Payment|MockObject
-      */
--    public function testGetInfoBlockType()
-+    private function initPayment()
-     {
--        static::assertEquals(Info::class, $this->object->getInfoBlockType());
-+        $this->payment = $this->getMockBuilder(Payment::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->order = $this->getMockBuilder(Order::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->payment->method('getOrder')->willReturn($this->order);
-+        $this->payment->method('setTransactionId')->willReturnSelf();
-+        $this->payment->method('setIsTransactionClosed')->willReturnSelf();
-+        $this->payment->method('getCcExpYear')->willReturn('2019');
-+        $this->payment->method('getCcExpMonth')->willReturn('05');
-+
-+        return $this->payment;
-     }
- }
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php b/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php
-index 80c8194e076..5ac436bcf0a 100644
---- a/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php
-@@ -131,7 +131,7 @@ class PayflowlinkTest extends \PHPUnit\Framework\TestCase
-             ->method('postRequest')
-             ->willReturn($response);
- 
--        $this->payflowRequest->expects($this->exactly(3))
-+        $this->payflowRequest->expects($this->exactly(4))
-             ->method('setData')
-             ->willReturnMap(
-                 [
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php b/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php
-index 3e8af6b2ee7..7c352fc497a 100644
---- a/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php
-@@ -580,6 +580,40 @@ class PayflowproTest extends \PHPUnit\Framework\TestCase
-         $this->payflowpro->postRequest($request, $config);
-     }
- 
-+    /**
-+     * @covers \Magento\Paypal\Model\Payflowpro::addRequestOrderInfo
-+     */
-+    public function testAddRequestOrderInfo()
-+    {
-+        $orderData = [
-+            'id' => 1,
-+            'increment_id' => '0000001'
-+        ];
-+        $data = [
-+            'ponum' => $orderData['id'],
-+            'custref' => $orderData['increment_id'],
-+            'invnum' => $orderData['increment_id'],
-+            'comment1' => $orderData['increment_id']
-+        ];
-+        $expectedData = new DataObject($data);
-+        $actualData = new DataObject();
-+
-+        $orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getIncrementId', 'getId'])
-+            ->getMock();
-+        $orderMock->expects(static::once())
-+            ->method('getId')
-+            ->willReturn($orderData['id']);
-+        $orderMock->expects(static::atLeastOnce())
-+            ->method('getIncrementId')
-+            ->willReturn($orderData['increment_id']);
-+
-+        $this->payflowpro->addRequestOrderInfo($actualData, $orderMock);
-+
-+        $this->assertEquals($expectedData, $actualData);
-+    }
-+
-     /**
-      * @covers \Magento\Paypal\Model\Payflowpro::assignData
-      */
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
-new file mode 100644
-index 00000000000..ed62efe36c4
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
-@@ -0,0 +1,117 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Test\Unit\Model;
-+
-+use Magento\Paypal\Model\SmartButtonConfig;
-+use Magento\Framework\Locale\ResolverInterface;
-+use Magento\Paypal\Model\ConfigFactory;
-+
-+class SmartButtonConfigTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Paypal\Model\SmartButtonConfig
-+     */
-+    private $model;
-+
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $localeResolverMock;
-+
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $configMock;
-+
-+    protected function setUp()
-+    {
-+        $this->localeResolverMock = $this->getMockForAbstractClass(ResolverInterface::class);
-+        $this->configMock = $this->getMockBuilder(\Magento\Paypal\Model\Config::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        /** @var \PHPUnit_Framework_MockObject_MockObject $configFactoryMock */
-+        $configFactoryMock = $this->getMockBuilder(ConfigFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $configFactoryMock->expects($this->once())->method('create')->willReturn($this->configMock);
-+        $this->model = new SmartButtonConfig(
-+            $this->localeResolverMock,
-+            $configFactoryMock,
-+            $this->getDefaultStyles(),
-+            $this->getAllowedFundings()
-+        );
-+    }
-+
-+    /**
-+     * @param string $page
-+     * @param string $locale
-+     * @param string $disallowedFundings
-+     * @param string $layout
-+     * @param string $size
-+     * @param string $shape
-+     * @param string $label
-+     * @param string $color
-+     * @param string $installmentPeriodLabel
-+     * @param string $installmentPeriodLocale
-+     * @param array $expected
-+     * @dataProvider getConfigDataProvider
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     */
-+    public function testGetConfig(
-+        string $page,
-+        string $locale,
-+        bool $isCustomize,
-+        ?string $disallowedFundings,
-+        string $layout,
-+        string $size,
-+        string $shape,
-+        string $label,
-+        string $color,
-+        string $installmentPeriodLabel,
-+        string $installmentPeriodLocale,
-+        array $expected = []
-+    ) {
-+        $this->localeResolverMock->expects($this->any())->method('getLocale')->willReturn($locale);
-+        $this->configMock->expects($this->any())->method('getValue')->will($this->returnValueMap([
-+            ['merchant_id', null, 'merchant'],
-+            ['sandbox_flag', null, true],
-+            ['disable_funding_options', null, $disallowedFundings],
-+            ["{$page}_page_button_customize", null, $isCustomize],
-+            ["{$page}_page_button_layout", null, $layout],
-+            ["{$page}_page_button_size", null, $size],
-+            ["{$page}_page_button_color", null, $color],
-+            ["{$page}_page_button_shape", null, $shape],
-+            ["{$page}_page_button_label", null, $label],
-+            [$page . '_page_button_' . $installmentPeriodLocale . '_installment_period', null, $installmentPeriodLabel]
-+        ]));
-+
-+        self::assertEquals($expected, $this->model->getConfig($page));
-+    }
-+
-+    public function getConfigDataProvider()
-+    {
-+        return include __DIR__ . '/_files/expected_config.php';
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    private function getDefaultStyles()
-+    {
-+        return include __DIR__ . '/_files/default_styles.php';
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    private function getAllowedFundings()
-+    {
-+        return include __DIR__ . '/_files/allowed_fundings.php';
-+    }
-+}
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/allowed_fundings.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/allowed_fundings.php
-new file mode 100644
-index 00000000000..6b6f8ccb87e
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/allowed_fundings.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+return [
-+    'checkout' => [
-+        'CREDIT',
-+        'ELV'
-+    ],
-+    'cart' => [
-+        'CREDIT',
-+        'ELV'
-+    ],
-+    'mini_cart' => [
-+        'CREDIT',
-+        'ELV'
-+    ],
-+    'product' => [
-+        'CREDIT'
-+    ]
-+];
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/default_styles.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/default_styles.php
-new file mode 100644
-index 00000000000..87da99ed2e1
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/default_styles.php
-@@ -0,0 +1,37 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+return [
-+    'checkout' => [
-+        'layout' => 'vertical',
-+        'size' => 'responsive',
-+        'color' => 'gold',
-+        'shape' => 'rect',
-+        'label' =>'paypal'
-+    ],
-+    'cart' => [
-+        'layout' => 'vertical',
-+        'size' => 'responsive',
-+        'color' => 'gold',
-+        'shape' => 'rect',
-+        'label' =>'paypal'
-+    ],
-+    'mini_cart' => [
-+        'layout' => 'vertical',
-+        'size' => 'responsive',
-+        'color' => 'gold',
-+        'shape' => 'rect',
-+        'label' =>'paypal'
-+    ],
-+    'product' => [
-+        'layout' => 'horizontal',
-+        'size' => 'responsive',
-+        'color' => 'gold',
-+        'shape' => 'pill',
-+        'label' =>'buynow'
-+    ]
-+];
-diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php
-new file mode 100644
-index 00000000000..1442642a324
---- /dev/null
-+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php
-@@ -0,0 +1,151 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+return [
-+    'cart' => [
-+        'cart',
-+        'es_MX',
-+        true,
-+        'CREDIT',
-+        'horizontal',
-+        'small',
-+        'pillow',
-+        'installment',
-+        'blue',
-+        'my_label',
-+        'mx',
-+        [
-+            'merchantId' => 'merchant',
-+            'environment' => 'sandbox',
-+            'locale' => 'es_MX',
-+            'allowedFunding' => ['ELV'],
-+            'disallowedFunding' => ['CREDIT'],
-+            'styles' => [
-+                'layout' => 'horizontal',
-+                'size' => 'small',
-+                'color' => 'blue',
-+                'shape' => 'pillow',
-+                'label' => 'installment',
-+                'installmentperiod' => 0
-+            ],
-+            'isVisibleOnProductPage' => 0
-+        ]
-+    ],
-+    'checkout' => [
-+        'cart',
-+        'en_BR',
-+        true,
-+        null,
-+        'horizontal',
-+        'small',
-+        'pillow',
-+        'installment',
-+        'blue',
-+        'my_label',
-+        'br',
-+        [
-+            'merchantId' => 'merchant',
-+            'environment' => 'sandbox',
-+            'locale' => 'en_BR',
-+            'allowedFunding' => ['CREDIT', 'ELV'],
-+            'disallowedFunding' => [],
-+            'styles' => [
-+                'layout' => 'horizontal',
-+                'size' => 'small',
-+                'color' => 'blue',
-+                'shape' => 'pillow',
-+                'label' => 'installment',
-+                'installmentperiod' => 0
-+            ],
-+            'isVisibleOnProductPage' => 0
-+        ]
-+    ],
-+    'mini_cart' => [
-+        'cart',
-+        'en',
-+        false,
-+        null,
-+        'horizontal',
-+        'small',
-+        'pillow',
-+        'installment',
-+        'blue',
-+        'my_label',
-+        'br',
-+        [
-+            'merchantId' => 'merchant',
-+            'environment' => 'sandbox',
-+            'locale' => 'en',
-+            'allowedFunding' => ['CREDIT', 'ELV'],
-+            'disallowedFunding' => [],
-+            'styles' => [
-+                'layout' => 'vertical',
-+                'size' => 'responsive',
-+                'color' => 'gold',
-+                'shape' => 'rect',
-+                'label' => 'paypal'
-+            ],
-+            'isVisibleOnProductPage' => 0
-+        ]
-+    ],
-+    'mini_cart' => [
-+        'cart',
-+        'en',
-+        false,
-+        null,
-+        'horizontal',
-+        'small',
-+        'pillow',
-+        'installment',
-+        'blue',
-+        'my_label',
-+        'br',
-+        [
-+            'merchantId' => 'merchant',
-+            'environment' => 'sandbox',
-+            'locale' => 'en',
-+            'allowedFunding' => ['CREDIT', 'ELV'],
-+            'disallowedFunding' => [],
-+            'styles' => [
-+                'layout' => 'vertical',
-+                'size' => 'responsive',
-+                'color' => 'gold',
-+                'shape' => 'rect',
-+                'label' => 'paypal'
-+            ],
-+            'isVisibleOnProductPage' => 0
-+        ]
-+    ],
-+    'product' => [
-+        'cart',
-+        'en',
-+        false,
-+        'CREDIT',
-+        'horizontal',
-+        'small',
-+        'pillow',
-+        'installment',
-+        'blue',
-+        'my_label',
-+        'br',
-+        [
-+            'merchantId' => 'merchant',
-+            'environment' => 'sandbox',
-+            'locale' => 'en',
-+            'allowedFunding' => ['ELV'],
-+            'disallowedFunding' => ['CREDIT'],
-+            'styles' => [
-+                'layout' => 'vertical',
-+                'size' => 'responsive',
-+                'color' => 'gold',
-+                'shape' => 'rect',
-+                'label' => 'paypal',
-+            ],
-+            'isVisibleOnProductPage' => 0
-+        ]
-+    ]
-+];
-diff --git a/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php b/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
-index 7cb521073e3..542b327475d 100644
---- a/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
-+++ b/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
-@@ -9,9 +9,9 @@ use Magento\Catalog\Block\ShortcutButtons;
- use Magento\Catalog\Block\ShortcutInterface;
- use Magento\Framework\DataObject;
- use Magento\Framework\Event\Observer;
--use Magento\Framework\View\Element\Template;
- use Magento\Framework\View\Layout;
--use Magento\Paypal\Block\Express\InContext\Minicart\Button;
-+use Magento\Paypal\Block\Express\InContext\Minicart\SmartButton as MinicartButton;
-+use Magento\Paypal\Block\Express\InContext\SmartButton as Button;
- use Magento\Paypal\Helper\Shortcut\Factory;
- use Magento\Paypal\Model\Config;
- use Magento\Paypal\Observer\AddPaypalShortcutsObserver;
-@@ -119,7 +119,7 @@ class AddPaypalShortcutsObserverTest extends \PHPUnit\Framework\TestCase
-                 ++$callIndexSession;
-             }
- 
--            $blockMock = $this->getMockBuilder(Button::class)
-+            $blockMock = $this->getMockBuilder(MinicartButton::class)
-                 ->setMethods(['setIsInCatalogProduct', 'setShowOrPosition'])
-                 ->disableOriginalConstructor()
-                 ->getMockForAbstractClass();
-@@ -159,7 +159,12 @@ class AddPaypalShortcutsObserverTest extends \PHPUnit\Framework\TestCase
-         return [
-             [
-                 'blocks1' => [
--                    \Magento\Paypal\Block\Express\InContext\Minicart\Button::class => [
-+                    MinicartButton::class => [
-+                        self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
-+                        self::PAYMENT_AVAILABLE => true,
-+                        self::PAYMENT_IS_BML => false,
-+                    ],
-+                    Button::class => [
-                         self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
-                         self::PAYMENT_AVAILABLE => true,
-                         self::PAYMENT_IS_BML => false,
-@@ -198,11 +203,16 @@ class AddPaypalShortcutsObserverTest extends \PHPUnit\Framework\TestCase
-             ],
-             [
-                 'blocks2' => [
--                    \Magento\Paypal\Block\Express\InContext\Minicart\Button::class => [
-+                    MinicartButton::class => [
-                         self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
-                         self::PAYMENT_AVAILABLE => false,
-                         self::PAYMENT_IS_BML => false,
-                     ],
-+                    Button::class => [
-+                        self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
-+                        self::PAYMENT_AVAILABLE => true,
-+                        self::PAYMENT_IS_BML => false,
-+                    ],
-                     \Magento\Paypal\Block\Express\Shortcut::class => [
-                         self::PAYMENT_CODE => Config::METHOD_WPP_EXPRESS,
-                         self::PAYMENT_AVAILABLE => false,
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml
-index 99a6668c015..cbb95e376c9 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml
-@@ -132,6 +132,7 @@
-             <rule type="conflict" event=":load">
-                 <argument name="wps_other">wps_other</argument>
-             </rule>
-+            <rule type="removeCreditOptionConditional" event=":load"/>
-         </relation>
-     </payment>
- </rules>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml
-index a8aac92fccd..51297a96438 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml
-@@ -207,6 +207,7 @@
-             <rule type="paypalExpressLockConfigurationConditional" event=":load">
-                 <argument name="payflow_link_ca">payflow_link_ca</argument>
-             </rule>
-+            <rule type="removeCreditOptionConditional" event=":load"/>
-         </relation>
-     </payment>
- </rules>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_de.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_de.xml
-index fd570c9822f..46c61b52b75 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_de.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_de.xml
-@@ -26,6 +26,7 @@
-             <rule type="inContextActivate" event="activate-in-context-api"/>
-             <rule type="inContextDeactivate" event="deactivate-in-context-api"/>
-             <rule type="inContextDisableConditional" event=":load"/>
-+            <rule type="removeCreditOptionConditional" event=":load"/>
-         </relation>
-     </payment>
- </rules>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml
-index fd2bcb26676..28cc075e0c6 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml
-@@ -95,6 +95,7 @@
-             <rule type="conflict" event=":load">
-                 <argument name="wps_other">wps_other</argument>
-             </rule>
-+            <rule type="removeCreditOptionConditional" event=":load"/>
-         </relation>
-     </payment>
- </rules>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml
-index da0c1bd6353..7f1fcc08334 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml
-@@ -95,6 +95,7 @@
-             <rule type="conflict" event=":load">
-                 <argument name="wps_other">wps_other</argument>
-             </rule>
-+            <rule type="removeCreditOptionConditional" event=":load"/>
-         </relation>
-     </payment>
- </rules>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
-index a809817fe9b..d8b765b9b4d 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
-@@ -15,7 +15,7 @@
-                 <predicate name="confirm"
-                            message="There is already another PayPal solution enabled. Enable this solution instead?"
-                            event="deactivate-rule"
--                        >
-+                >
-                     <argument name="wps_express">wps_express</argument>
-                 </predicate>
-             </event>
-@@ -39,16 +39,16 @@
-                 <predicate name="confirm"
-                            message="There is already another PayPal solution enabled. Enable this solution instead?"
-                            event="deactivate-rule"
--                        >
-+                >
-                     <argument name="payments_pro_hosted_solution_with_express_checkout">payments_pro_hosted_solution_with_express_checkout</argument>
--                    <argument name="express_checkout_us">express_checkout_us</argument>
-+                    <argument name="express_checkout_gb">express_checkout_gb</argument>
-                 </predicate>
-             </event>
-         </events>
-         <relation target="payments_pro_hosted_solution_with_express_checkout">
-             <rule type="disable" event="activate-rule"/>
-         </relation>
--        <relation target="express_checkout_us">
-+        <relation target="express_checkout_gb">
-             <rule type="disable" event="activate-rule"/>
-         </relation>
-         <relation target=":self">
-@@ -56,19 +56,19 @@
-             <rule type="simpleDisable" event="deactivate-rule"/>
-             <rule type="conflict" event=":load">
-                 <argument name="payments_pro_hosted_solution_with_express_checkout">payments_pro_hosted_solution_with_express_checkout</argument>
--                <argument name="express_checkout_us">express_checkout_us</argument>
-+                <argument name="express_checkout_gb">express_checkout_gb</argument>
-             </rule>
-         </relation>
-     </payment>
-     <!-- Express Checkout -->
--    <payment id="express_checkout_us">
-+    <payment id="express_checkout_gb">
-         <events selector="[data-enable='payment']">
-             <event value="0" name="deactivate-rule"/>
-             <event value="1" name="activate-rule">
-                 <predicate name="confirm"
-                            message="There is already another PayPal solution enabled. Enable this solution instead?"
-                            event="deactivate-rule"
--                        >
-+                >
-                     <argument name="wps_express">wps_express</argument>
-                 </predicate>
-             </event>
-@@ -95,6 +95,7 @@
-             <rule type="conflict" event=":load">
-                 <argument name="wps_express">wps_express</argument>
-             </rule>
-+            <rule type="removeCreditOptionConditional" event=":load"/>
-         </relation>
-     </payment>
--</rules>
-+</rules>
-\ No newline at end of file
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml
-index 1c5dbaf22f9..50ce14e66ee 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml
-@@ -95,6 +95,7 @@
-             <rule type="conflict" event=":load">
-                 <argument name="wps_other">wps_other</argument>
-             </rule>
-+            <rule type="removeCreditOptionConditional" event=":load"/>
-         </relation>
-     </payment>
- </rules>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml
-index 2fe4ad78d4b..de059dcc59c 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml
-@@ -95,6 +95,7 @@
-             <rule type="conflict" event=":load">
-                 <argument name="wps_other">wps_other</argument>
-             </rule>
-+            <rule type="removeCreditOptionConditional" event=":load"/>
-         </relation>
-     </payment>
- </rules>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml
-index e6fe55aa904..d9fc7ef3f20 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml
-@@ -95,6 +95,7 @@
-             <rule type="conflict" event=":load">
-                 <argument name="wps_other">wps_other</argument>
-             </rule>
-+            <rule type="removeCreditOptionConditional" event=":load"/>
-         </relation>
-     </payment>
- </rules>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml
-index 79309bcee70..c5b8b09c3a2 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml
-@@ -95,6 +95,7 @@
-             <rule type="conflict" event=":load">
-                 <argument name="wps_other">wps_other</argument>
-             </rule>
-+            <rule type="removeCreditOptionConditional" event=":load"/>
-         </relation>
-     </payment>
- </rules>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml
-index a4118cc964f..972cc45505e 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml
-@@ -64,6 +64,7 @@
-             <rule type="conflict" event=":load">
-                 <argument name="wps_other">wps_other</argument>
-             </rule>
-+            <rule type="removeCreditOptionConditional" event=":load"/>
-         </relation>
-     </payment>
- </rules>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml
-index 02cb608c07c..b7924e770aa 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml
-@@ -396,6 +396,10 @@
-             <event value="0" name="deactivate-in-context-api"/>
-             <event value="1" name="activate-in-context-api"/>
-         </events>
-+        <events selector="[data-enable='disable-funding-options']">
-+            <event value="CREDIT" include="true" name="remove-option"/>
-+            <event value="CREDIT" include="false" name="add-option"/>
-+        </events>
-         <relation target="wps_express">
-             <rule type="disable" event="activate-rule"/>
-         </relation>
-@@ -433,6 +437,9 @@
-                 <argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
-                 <argument name="payflow_link_us">payflow_link_us</argument>
-             </rule>
-+            <rule type="removeCreditOption" event="remove-option"/>
-+            <rule type="addCreditOption" event="add-option"/>
-+            <rule type="removeCreditOptionConditional" event=":load"/>
-         </relation>
-     </payment>
- </rules>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml
-index c1ff4c9b1c6..ca886c7827f 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml
-@@ -75,9 +75,9 @@
-                     <label>Payments Pro</label>
-                     <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
-                     <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-+                        <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-                     </group>
--                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-+                    <group id="paypal_payflow_required" showInDefault="1" showInWebsite="1" sortOrder="10">
-                         <field id="enable_paypal_payflow">
-                             <attribute type="shared">0</attribute>
-                             <config_path>payment/paypal_payment_pro/active</config_path>
-@@ -90,12 +90,12 @@
-                         <label>Basic Settings - PayPal Payments Pro</label>
-                     </group>
-                 </group>
--                <group id="wps_express" extends="payment_all_paypal/express_checkout">
-+                <group id="wps_express" translate="label comment" extends="payment_all_paypal/express_checkout">
-                     <label>Payments Standard</label>
-                     <comment>Accept credit card and PayPal payments securely.</comment>
-                     <attribute type="activity_path">payment/wps_express/active</attribute>
-                     <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-+                        <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-                     </group>
-                     <group id="express_checkout_required">
-                         <group id="express_checkout_required_express_checkout">
-@@ -106,12 +106,23 @@
-                         <field id="enable_express_checkout">
-                             <config_path>payment/wps_express/active</config_path>
-                         </field>
--                        <field id="enable_express_checkout_bml">
-+                        <field id="enable_express_checkout_bml" showInDefault="1" showInWebsite="1">
-                             <config_path>payment/wps_express_bml/active</config_path>
-                         </field>
-+                        <field id="express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1"/>
-                     </group>
--                    <group id="settings_ec">
-+                    <group id="settings_ec" translate="label">
-                         <label>Basic Settings - PayPal Website Payments Standard</label>
-+                        <group id="settings_ec_advanced">
-+                            <group id="express_checkout_frontend">
-+                                <field id="checkout_display" showInDefault="0" showInWebsite="0" showInStore="0"/>
-+                                <group id="checkout_page_button" showInDefault="0" showInWebsite="0" showInStore="0"/>
-+                                <group id="product_page_button" showInDefault="0" showInWebsite="0" showInStore="0"/>
-+                                <group id="cart_page_button" showInDefault="0" showInWebsite="0" showInStore="0"/>
-+                                <group id="mini_cart_page_button" showInDefault="0" showInWebsite="0" showInStore="0"/>
-+                                <group id="features" showInDefault="0" showInWebsite="0" showInStore="0"/>
-+                            </group>
-+                        </group>
-                     </group>
-                 </group>
-             </group>
-@@ -124,7 +135,7 @@
-                 <group id="payflow_link_us" extends="payment_all_paypal/payflow_link"/>
-             </group>
-         </section>
--        <section id="payment_gb" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
-+        <section id="payment_gb" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-             <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
-                 <group id="express_checkout_gb" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-                     <label>PayPal Express Checkout</label>
-@@ -158,15 +169,15 @@
-                     </group>
-                 </group>
-                 <include path="Magento_Paypal::system/payments_pro_hosted_solution_with_express_checkout.xml"/>
--                <group id="wps_express" extends="payment_all_paypal/express_checkout" sortOrder="50">
-+                <group id="wps_express" translate="label comment" extends="payment_all_paypal/express_checkout" sortOrder="50">
-                     <label>Website Payments Standard</label>
-                     <comment>Accept credit card and PayPal payments securely.</comment>
-                     <attribute type="activity_path">payment/wps_express/active</attribute>
-                     <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-+                        <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-                     </group>
-                     <group id="express_checkout_required">
--                        <group id="express_checkout_required_express_checkout">
-+                        <group id="express_checkout_required_express_checkout" translate="label">
-                             <label>Website Payments Standard</label>
-                         </group>
-                         <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-@@ -178,7 +189,7 @@
-                         <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                         <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                     </group>
--                    <group id="settings_ec">
-+                    <group id="settings_ec" translate="label">
-                         <label>Basic Settings - PayPal Website Payments Standard</label>
-                     </group>
-                 </group>
-@@ -227,17 +238,17 @@
-                 <comment>Choose a secure bundled payment solution for your business.</comment>
-                 <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                 <attribute type="displayIn">other_paypal_payment_solutions</attribute>
--                <group id="wps_other" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <group id="wps_other" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-                     <label>Website Payments Standard</label>
-                     <fieldset_css>complex</fieldset_css>
-                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                     <comment>Accept credit card and PayPal payments securely.</comment>
-                     <attribute type="activity_path">payment/wps_express/active</attribute>
-                     <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-+                        <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-                     </group>
-                     <group id="express_checkout_required">
--                        <group id="express_checkout_required_express_checkout">
-+                        <group id="express_checkout_required_express_checkout" translate="label">
-                             <label>Website Payments Standard</label>
-                         </group>
-                         <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-@@ -271,7 +282,7 @@
-             <group id="paypal_group_all_in_one">
-                 <group id="wps_other" sortOrder="20"/>
-             </group>
--            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
-+            <group id="paypal_payment_gateways" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
-                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                 <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
-@@ -279,7 +290,7 @@
-                     <label>Website Payments Pro</label>
-                     <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
-                     <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-+                        <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-                     </group>
-                     <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                         <group id="paypal_payflow_api_settings">
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
-index bff076aad9c..d5287659ee7 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
-@@ -13,7 +13,7 @@
-         <comment>Add PayPal as an additional payment method to your checkout page.</comment>
-         <attribute type="activity_path">payment/paypal_express/active</attribute>
-         <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
--            <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-express-checkout.html</comment>
-+            <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-express-checkout.html</comment>
-             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-         </group>
-         <group id="express_checkout_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-@@ -158,7 +158,7 @@
-                 </depends>
-                 <validate>required-entry</validate>
-             </field>
--            <field id="enable_express_checkout_bml" translate="label comment" type="select" sortOrder="23" showInDefault="1" showInWebsite="1">
-+            <field id="enable_express_checkout_bml" translate="label comment" type="select" sortOrder="23" showInDefault="0" showInWebsite="0">
-                 <label>Enable PayPal Credit</label>
-                 <comment><![CDATA[PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
-                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-@@ -171,7 +171,7 @@
-                     <field id="enable_express_checkout"/>
-                 </requires>
-             </field>
--            <field id="express_checkout_bml_sort_order" translate="label" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
-+            <field id="express_checkout_bml_sort_order" translate="label" type="text" sortOrder="25" showInDefault="0" showInWebsite="0" showInStore="0">
-                 <label>Sort Order PayPal Credit</label>
-                 <config_path>payment/paypal_express_bml/sort_order</config_path>
-                 <frontend_class>validate-number</frontend_class>
-@@ -645,6 +645,262 @@
-                         </tooltip>
-                         <attribute type="shared">1</attribute>
-                     </field>
-+                    <field id="checkout_display" translate="label" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
-+                        <label>Customize Smart Buttons</label>
-+                        <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
-+                        <attribute type="shared">1</attribute>
-+                    </field>
-+                    <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
-+                        <label>Checkout Page</label>
-+                        <field id="checkout_page_button_customize" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
-+                            <label>Customize Button</label>
-+                            <config_path>paypal/style/checkout_page_button_customize</config_path>
-+                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                            <attribute type="shared">1</attribute>
-+                        </field>
-+                        <field id="checkout_page_button_label" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-+                            <label>Label</label>
-+                            <comment><![CDATA[The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.]]></comment>
-+                            <config_path>paypal/style/checkout_page_button_label</config_path>
-+                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\ButtonStylesLabel</frontend_model>
-+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLabel</source_model>
-+                            <depends>
-+                                <field id="checkout_page_button_customize">1</field>
-+                            </depends>
-+                            <attribute type="shared">1</attribute>
-+                        </field>
-+                        <field id="checkout_page_button_mx_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-+                            <label>Mexico Installment Period</label>
-+                            <config_path>paypal/style/checkout_page_button_mx_installment_period</config_path>
-+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getMxInstallmentPeriod</source_model>
-+                            <depends>
-+                                <field id="checkout_page_button_customize">1</field>
-+                                <field id="checkout_page_button_label">installment</field>
-+                            </depends>
-+                            <attribute type="shared">1</attribute>
-+                        </field>
-+                        <field id="checkout_page_button_br_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-+                            <label>Brazil Installment Period</label>
-+                            <config_path>paypal/style/checkout_page_button_br_installment_period</config_path>
-+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getBrInstallmentPeriod</source_model>
-+                            <depends>
-+                                <field id="checkout_page_button_customize">1</field>
-+                                <field id="checkout_page_button_label">installment</field>
-+                            </depends>
-+                            <attribute type="shared">1</attribute>
-+                        </field>
-+                        <field id="checkout_page_button_layout" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-+                            <label>Layout</label>
-+                            <config_path>paypal/style/checkout_page_button_layout</config_path>
-+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLayout</source_model>
-+                            <depends>
-+                                <field id="checkout_page_button_customize">1</field>
-+                                <field id="checkout_page_button_label" negative="1">credit</field>
-+                            </depends>
-+                            <attribute type="shared">1</attribute>
-+                        </field>
-+                        <field id="checkout_page_button_size" translate="label tooltip" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
-+                            <label>Size</label>
-+                            <config_path>paypal/style/checkout_page_button_size</config_path>
-+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getSize</source_model>
-+                            <tooltip>Select Responsive to ensure the PayPal button renders correctly on mobile devices.</tooltip>
-+                            <depends>
-+                                <field id="checkout_page_button_customize">1</field>
-+                            </depends>
-+                            <attribute type="shared">1</attribute>
-+                        </field>
-+                        <field id="checkout_page_button_shape" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
-+                            <label>Shape</label>
-+                            <config_path>paypal/style/checkout_page_button_shape</config_path>
-+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getShape</source_model>
-+                            <depends>
-+                                <field id="checkout_page_button_customize">1</field>
-+                            </depends>
-+                            <attribute type="shared">1</attribute>
-+                        </field>
-+                        <field id="checkout_page_button_color" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
-+                            <label>Color</label>
-+                            <config_path>paypal/style/checkout_page_button_color</config_path>
-+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getColor</source_model>
-+                            <depends>
-+                                <field id="checkout_page_button_customize">1</field>
-+                                <field id="checkout_page_button_label" negative="1">credit</field>
-+                            </depends>
-+                            <attribute type="shared">1</attribute>
-+                        </field>
-+                    </group>
-+                    <group id="product_page_button" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
-+                        <label>Product Pages</label>
-+                        <field id="product_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
-+                            <config_path>paypal/style/product_page_button_customize</config_path>
-+                        </field>
-+                        <field id="product_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
-+                            <config_path>paypal/style/product_page_button_label</config_path>
-+                            <depends>
-+                                <field id="product_page_button_customize">1</field>
-+                            </depends>
-+                        </field>
-+                        <field id="product_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
-+                            <config_path>paypal/style/product_page_button_mx_installment_period</config_path>
-+                            <depends>
-+                                <field id="product_page_button_customize">1</field>
-+                                <field id="product_page_button_label">installment</field>
-+                            </depends>
-+                        </field>
-+                        <field id="product_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
-+                            <config_path>paypal/style/product_page_button_br_installment_period</config_path>
-+                            <depends>
-+                                <field id="product_page_button_customize">1</field>
-+                                <field id="product_page_button_label">installment</field>
-+                            </depends>
-+                        </field>
-+                        <field id="product_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
-+                            <config_path>paypal/style/product_page_button_layout</config_path>
-+                            <depends>
-+                                <field id="product_page_button_customize">1</field>
-+                                <field id="product_page_button_label" negative="1">credit</field>
-+                            </depends>
-+                        </field>
-+                        <field id="product_page_button_size"  extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_size">
-+                            <config_path>paypal/style/product_page_button_size</config_path>
-+                            <depends>
-+                                <field id="product_page_button_customize">1</field>
-+                            </depends>
-+                        </field>
-+                        <field id="product_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
-+                            <config_path>paypal/style/product_page_button_shape</config_path>
-+                            <depends>
-+                                <field id="product_page_button_customize">1</field>
-+                            </depends>
-+                        </field>
-+                        <field id="product_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
-+                            <config_path>paypal/style/product_page_button_color</config_path>
-+                            <depends>
-+                                <field id="product_page_button_customize">1</field>
-+                                <field id="product_page_button_label" negative="1">credit</field>
-+                            </depends>
-+                        </field>
-+                    </group>
-+                    <group id="cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="110">
-+                        <label>Cart Page</label>
-+                        <field id="cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
-+                            <config_path>paypal/style/cart_page_button_customize</config_path>
-+                        </field>
-+                        <field id="cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
-+                            <config_path>paypal/style/cart_page_button_label</config_path>
-+                            <depends>
-+                                <field id="cart_page_button_customize">1</field>
-+                            </depends>
-+                        </field>
-+                        <field id="cart_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
-+                            <config_path>paypal/style/cart_page_button_mx_installment_period</config_path>
-+                            <depends>
-+                                <field id="cart_page_button_customize">1</field>
-+                                <field id="cart_page_button_label">installment</field>
-+                            </depends>
-+                        </field>
-+                        <field id="cart_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
-+                            <config_path>paypal/style/cart_page_button_br_installment_period</config_path>
-+                            <depends>
-+                                <field id="cart_page_button_customize">1</field>
-+                                <field id="cart_page_button_label">installment</field>
-+                            </depends>
-+                        </field>
-+                        <field id="cart_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
-+                            <config_path>paypal/style/cart_page_button_layout</config_path>
-+                            <depends>
-+                                <field id="cart_page_button_customize">1</field>
-+                                <field id="cart_page_button_label" negative="1">credit</field>
-+                            </depends>
-+                        </field>
-+                        <field id="cart_page_button_size"  extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_size">
-+                            <config_path>paypal/style/cart_page_button_size</config_path>
-+                            <depends>
-+                                <field id="cart_page_button_customize">1</field>
-+                            </depends>
-+                        </field>
-+                        <field id="cart_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
-+                            <config_path>paypal/style/cart_page_button_shape</config_path>
-+                            <depends>
-+                                <field id="cart_page_button_customize">1</field>
-+                            </depends>
-+                        </field>
-+                        <field id="cart_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
-+                            <config_path>paypal/style/cart_page_button_color</config_path>
-+                            <depends>
-+                                <field id="cart_page_button_customize">1</field>
-+                                <field id="cart_page_button_label" negative="1">credit</field>
-+                            </depends>
-+                        </field>
-+                    </group>
-+                    <group id="mini_cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
-+                        <label>Mini Cart</label>
-+                        <field id="mini_cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
-+                            <config_path>paypal/style/mini_cart_page_button_customize</config_path>
-+                        </field>
-+                        <field id="mini_cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
-+                            <config_path>paypal/style/mini_cart_page_button_label</config_path>
-+                            <depends>
-+                                <field id="mini_cart_page_button_customize">1</field>
-+                            </depends>
-+                        </field>
-+                        <field id="mini_cart_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
-+                            <config_path>paypal/style/mini_cart_page_button_mx_installment_period</config_path>
-+                            <depends>
-+                                <field id="mini_cart_page_button_customize">1</field>
-+                                <field id="mini_cart_page_button_label">installment</field>
-+                            </depends>
-+                        </field>
-+                        <field id="mini_cart_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
-+                            <config_path>paypal/style/mini_cart_page_button_br_installment_period</config_path>
-+                            <depends>
-+                                <field id="mini_cart_page_button_customize">1</field>
-+                                <field id="mini_cart_page_button_label">installment</field>
-+                            </depends>
-+                        </field>
-+                        <field id="mini_cart_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
-+                            <config_path>paypal/style/mini_cart_page_button_layout</config_path>
-+                            <depends>
-+                                <field id="mini_cart_page_button_customize">1</field>
-+                                <field id="mini_cart_page_button_label" negative="1">credit</field>
-+                            </depends>
-+                        </field>
-+                        <field id="mini_cart_page_button_size"  extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_size">
-+                            <config_path>paypal/style/mini_cart_page_button_size</config_path>
-+                            <depends>
-+                                <field id="mini_cart_page_button_customize">1</field>
-+                            </depends>
-+                        </field>
-+                        <field id="mini_cart_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
-+                            <config_path>paypal/style/mini_cart_page_button_shape</config_path>
-+                            <depends>
-+                                <field id="mini_cart_page_button_customize">1</field>
-+                            </depends>
-+                        </field>
-+                        <field id="mini_cart_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
-+                            <config_path>paypal/style/mini_cart_page_button_color</config_path>
-+                            <depends>
-+                                <field id="mini_cart_page_button_customize">1</field>
-+                                <field id="mini_cart_page_button_label" negative="1">credit</field>
-+                            </depends>
-+                        </field>
-+                    </group>
-+                    <group id="features" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="130">
-+                        <label>Features</label>
-+                        <field id="disable_funding_options" translate="label comment" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-+                            <label>Disable Funding Options</label>
-+                            <comment>
-+                                <![CDATA[PayPal will automatically display each enabled funding option to eligible buyers.
-+                                For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is
-+                                offered and the currency offered by the merchant is USD.]]>
-+                            </comment>
-+                            <config_path>paypal/style/disable_funding_options</config_path>
-+                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect\DisabledFundingOptions</frontend_model>
-+                            <source_model>Magento\Paypal\Model\System\Config\Source\DisableFundingOptions</source_model>
-+                            <attribute type="shared">1</attribute>
-+                            <can_be_empty>1</can_be_empty>
-+                        </field>
-+                    </group>
-                 </group>
-             </group>
-         </group>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
-index 5eb596c9c4f..cba36916c33 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
-@@ -13,7 +13,7 @@
-         <comment><![CDATA[Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)]]></comment>
-         <attribute type="activity_path">payment/payflow_advanced/active</attribute>
-         <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
--            <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-advanced.html</comment>
-+            <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-advanced.html</comment>
-             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-         </group>
-         <group id="required_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-@@ -97,7 +97,7 @@
-                     <field id="enable_payflow_advanced"/>
-                 </requires>
-             </field>
--            <field id="enable_express_checkout_bml" sortOrder="42" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml">
-+            <field id="enable_express_checkout_bml" sortOrder="42" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" showInDefault="1" showInWebsite="1">
-                 <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
-                             You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                             <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
-@@ -108,7 +108,7 @@
-                     <field id="enable_payflow_advanced"/>
-                 </requires>
-             </field>
--            <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
-+            <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1">
-                 <config_path>payment/payflow_express_bml/sort_order</config_path>
-                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
-                 <depends>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
-index d27dde02c57..ed11e8ba18d 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
-@@ -13,7 +13,7 @@
-         <comment><![CDATA[Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)]]></comment>
-         <attribute type="activity_path">payment/payflow_link/active</attribute>
-         <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
--            <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-link.html</comment>
-+            <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-link.html</comment>
-             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-         </group>
-         <group id="payflow_link_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-@@ -106,7 +106,7 @@
-                     <field id="enable_payflow_link"/>
-                 </requires>
-             </field>
--            <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="41">
-+            <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="41" showInDefault="1" showInWebsite="1">
-                 <comment><![CDATA[Payflow Link lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
-                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                         <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
-@@ -117,7 +117,7 @@
-                     <field id="enable_express_checkout"/>
-                 </requires>
-             </field>
--            <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
-+            <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1">
-                 <config_path>payment/payflow_express_bml/sort_order</config_path>
-                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
-                 <depends>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
-index 77acff48c24..727bffdaf27 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
-@@ -14,7 +14,7 @@
-         <comment><![CDATA[Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)]]></comment>
-         <attribute type="paypal_ec_separate">1</attribute>
-         <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
--            <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-+            <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-         </group>
-         <group id="pphs_required_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-@@ -46,7 +46,7 @@
-                 <frontend_class>paypal-enabler paypal-ec-separate</frontend_class>
-             </field>
- 
--            <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="21">
-+            <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="21" showInDefault="1" showInWebsite="1">
-                 <comment><![CDATA[Payments Pro Hosted Solution lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
-                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                         <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
-index fcf3fb39d1b..e5a0319bdc1 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
-@@ -14,7 +14,7 @@
-         <attribute type="activity_path">payment/payflowpro/active</attribute>
-         <attribute type="paypal_ec_separate">1</attribute>
-         <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
--            <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-pro.html</comment>
-+            <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-pro.html</comment>
-             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-         </group>
-         <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
-index 6090025024d..694e517816b 100644
---- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
-+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
-@@ -6,7 +6,7 @@
-  */
- -->
- <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
--    <group id="paypal_payflowpro_with_express_checkout" translate="label comment" extends="payment_all_paypal/paypal_payflowpro">
-+    <group id="paypal_payflowpro_with_express_checkout" translate="label" extends="payment_all_paypal/paypal_payflowpro">
-         <label>Payflow Pro</label>
-         <attribute type="paypal_ec_separate">0</attribute>
-         <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-@@ -30,7 +30,7 @@
-                     <field id="enable_paypal_payflow"/>
-                 </requires>
-             </field>
--            <field id="enable_express_checkout_bml_payflow" translate="label" type="select" sortOrder="21" showInWebsite="1" showInDefault="1">
-+            <field id="enable_express_checkout_bml_payflow" translate="label comment" type="select" sortOrder="21" showInWebsite="1" showInDefault="1">
-                 <label>Enable PayPal Credit</label>
-                 <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
-                             You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-@@ -43,7 +43,7 @@
-                     <field id="enable_paypal_payflow"/>
-                 </requires>
-             </field>
--            <field id="express_checkout_bml_sort_order" sortOrder="30" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
-+            <field id="express_checkout_bml_sort_order" sortOrder="30" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1">
-                 <config_path>payment/payflow_express_bml/sort_order</config_path>
-                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
-                 <depends>
-diff --git a/app/code/Magento/Paypal/etc/config.xml b/app/code/Magento/Paypal/etc/config.xml
-index f0df648af90..d2b6df0cf9e 100644
---- a/app/code/Magento/Paypal/etc/config.xml
-+++ b/app/code/Magento/Paypal/etc/config.xml
-@@ -10,6 +10,30 @@
-         <paypal>
-             <style>
-                 <logo></logo>
-+                <checkout_page_button_customize>0</checkout_page_button_customize>
-+                <checkout_page_button_label>paypal</checkout_page_button_label>
-+                <checkout_page_button_layout>vertical</checkout_page_button_layout>
-+                <checkout_page_button_size>responsive</checkout_page_button_size>
-+                <checkout_page_button_shape>rect</checkout_page_button_shape>
-+                <checkout_page_button_color>gold</checkout_page_button_color>
-+                <product_page_button_customize>0</product_page_button_customize>
-+                <product_page_button_label>buynow</product_page_button_label>
-+                <product_page_button_layout>horizontal</product_page_button_layout>
-+                <product_page_button_size>responsive</product_page_button_size>
-+                <product_page_button_shape>pill</product_page_button_shape>
-+                <product_page_button_color>gold</product_page_button_color>
-+                <cart_page_button_customize>0</cart_page_button_customize>
-+                <cart_page_button_label>paypal</cart_page_button_label>
-+                <cart_page_button_layout>vertical</cart_page_button_layout>
-+                <cart_page_button_size>responsive</cart_page_button_size>
-+                <cart_page_button_shape>rect</cart_page_button_shape>
-+                <cart_page_button_color>gold</cart_page_button_color>
-+                <mini_cart_page_button_customize>0</mini_cart_page_button_customize>
-+                <mini_cart_page_button_label>paypal</mini_cart_page_button_label>
-+                <mini_cart_page_button_layout>vertical</mini_cart_page_button_layout>
-+                <mini_cart_page_button_size>responsive</mini_cart_page_button_size>
-+                <mini_cart_page_button_shape>rect</mini_cart_page_button_shape>
-+                <mini_cart_page_button_color>gold</mini_cart_page_button_color>
-             </style>
-             <wpp>
-                 <api_password backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-@@ -44,6 +68,7 @@
-                 <child_authorization_number>1</child_authorization_number>
-                 <verify_peer>1</verify_peer>
-                 <skip_order_review_step>1</skip_order_review_step>
-+                <supported_locales>ar_EG,cs_CZ,da_DK,de_DE,el_GR,en_AU,en_GB,en_IN,en_US,es_ES,es_XC,fi_FI,fr_CA,fr_FR,fr_XC,he_IL,hu_HU,id_ID,it_IT,ja_JP,ko_KR,nl_NL,no_NO,pl_PL,pt_BR,pt_PT,ru_RU,sk_SK,sv_SE,th_TH,zh_CN,zh_HK,zh_TW,zh_XC</supported_locales>
-             </paypal_express>
-             <paypal_express_bml>
-                 <model>Magento\Paypal\Model\Bml</model>
-@@ -100,6 +125,7 @@
-                 <instant_purchase>
-                     <tokenFormat>\Magento\Paypal\Model\InstantPurchase\Payflow\Pro\TokenFormatter</tokenFormat>
-                 </instant_purchase>
-+                <group>paypal</group>
-             </payflowpro_cc_vault>
-             <paypal_billing_agreement>
-                 <active>1</active>
-diff --git a/app/code/Magento/Paypal/etc/db_schema.xml b/app/code/Magento/Paypal/etc/db_schema.xml
-index 2703ee4f5be..4dc283fcb48 100644
---- a/app/code/Magento/Paypal/etc/db_schema.xml
-+++ b/app/code/Magento/Paypal/etc/db_schema.xml
-@@ -21,19 +21,19 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-                 comment="Store Id"/>
-         <column xsi:type="varchar" name="agreement_label" nullable="true" length="255" comment="Agreement Label"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="agreement_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="PAYPAL_BILLING_AGREEMENT_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="PAYPAL_BILLING_AGREEMENT_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="paypal_billing_agreement" column="customer_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="PAYPAL_BILLING_AGREEMENT_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="PAYPAL_BILLING_AGREEMENT_STORE_ID_STORE_STORE_ID"
-                     table="paypal_billing_agreement" column="store_id" referenceTable="store" referenceColumn="store_id"
-                     onDelete="SET NULL"/>
--        <index name="PAYPAL_BILLING_AGREEMENT_CUSTOMER_ID" indexType="btree">
-+        <index referenceId="PAYPAL_BILLING_AGREEMENT_CUSTOMER_ID" indexType="btree">
-             <column name="customer_id"/>
-         </index>
--        <index name="PAYPAL_BILLING_AGREEMENT_STORE_ID" indexType="btree">
-+        <index referenceId="PAYPAL_BILLING_AGREEMENT_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -43,17 +43,17 @@
-                 comment="Agreement Id"/>
-         <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Order Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="agreement_id"/>
-             <column name="order_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="PAYPAL_BILLING_AGRT_ORDER_AGRT_ID_PAYPAL_BILLING_AGRT_AGRT_ID"
-+        <constraint xsi:type="foreign" referenceId="PAYPAL_BILLING_AGRT_ORDER_AGRT_ID_PAYPAL_BILLING_AGRT_AGRT_ID"
-                     table="paypal_billing_agreement_order" column="agreement_id"
-                     referenceTable="paypal_billing_agreement" referenceColumn="agreement_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="PAYPAL_BILLING_AGREEMENT_ORDER_ORDER_ID_SALES_ORDER_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="PAYPAL_BILLING_AGREEMENT_ORDER_ORDER_ID_SALES_ORDER_ENTITY_ID"
-                     table="paypal_billing_agreement_order" column="order_id" referenceTable="sales_order"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="PAYPAL_BILLING_AGREEMENT_ORDER_ORDER_ID" indexType="btree">
-+        <index referenceId="PAYPAL_BILLING_AGREEMENT_ORDER_ORDER_ID" indexType="btree">
-             <column name="order_id"/>
-         </index>
-     </table>
-@@ -64,10 +64,10 @@
-         <column xsi:type="varchar" name="account_id" nullable="true" length="64" comment="Account Id"/>
-         <column xsi:type="varchar" name="filename" nullable="true" length="24" comment="Filename"/>
-         <column xsi:type="timestamp" name="last_modified" on_update="false" nullable="true" comment="Last Modified"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="report_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="PAYPAL_SETTLEMENT_REPORT_REPORT_DATE_ACCOUNT_ID">
-+        <constraint xsi:type="unique" referenceId="PAYPAL_SETTLEMENT_REPORT_REPORT_DATE_ACCOUNT_ID">
-             <column name="report_date"/>
-             <column name="account_id"/>
-         </constraint>
-@@ -105,13 +105,13 @@
-         <column xsi:type="varchar" name="payment_tracking_id" nullable="true" length="255"
-                 comment="Payment Tracking ID"/>
-         <column xsi:type="varchar" name="store_id" nullable="true" length="50" comment="Store ID"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="row_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="FK_E183E488F593E0DE10C6EBFFEBAC9B55" table="paypal_settlement_report_row"
-+        <constraint xsi:type="foreign" referenceId="FK_E183E488F593E0DE10C6EBFFEBAC9B55" table="paypal_settlement_report_row"
-                     column="report_id" referenceTable="paypal_settlement_report" referenceColumn="report_id"
-                     onDelete="CASCADE"/>
--        <index name="PAYPAL_SETTLEMENT_REPORT_ROW_REPORT_ID" indexType="btree">
-+        <index referenceId="PAYPAL_SETTLEMENT_REPORT_ROW_REPORT_ID" indexType="btree">
-             <column name="report_id"/>
-         </index>
-     </table>
-@@ -122,26 +122,26 @@
-                 default="0" comment="Website Id"/>
-         <column xsi:type="text" name="content" nullable="true" comment="Content"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Updated At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="cert_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="PAYPAL_CERT_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID" table="paypal_cert"
-+        <constraint xsi:type="foreign" referenceId="PAYPAL_CERT_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID" table="paypal_cert"
-                     column="website_id" referenceTable="store_website" referenceColumn="website_id" onDelete="CASCADE"/>
--        <index name="PAYPAL_CERT_WEBSITE_ID" indexType="btree">
-+        <index referenceId="PAYPAL_CERT_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-     <table name="paypal_payment_transaction" resource="default" engine="innodb"
-            comment="PayPal Payflow Link Payment Transaction">
-         <column xsi:type="int" name="transaction_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="varchar" name="txn_id" nullable="true" length="100" comment="Txn Id"/>
-         <column xsi:type="blob" name="additional_information" nullable="true" comment="Additional Information"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true" comment="Created At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="transaction_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="PAYPAL_PAYMENT_TRANSACTION_TXN_ID">
-+        <constraint xsi:type="unique" referenceId="PAYPAL_PAYMENT_TRANSACTION_TXN_ID">
-             <column name="txn_id"/>
-         </constraint>
-     </table>
-diff --git a/app/code/Magento/Paypal/etc/frontend/di.xml b/app/code/Magento/Paypal/etc/frontend/di.xml
-index 407c251fc42..858eb21d4e7 100644
---- a/app/code/Magento/Paypal/etc/frontend/di.xml
-+++ b/app/code/Magento/Paypal/etc/frontend/di.xml
-@@ -86,7 +86,7 @@
-             </argument>
-         </arguments>
-     </type>
--    <type name="Magento\Paypal\Block\Express\InContext\Minicart\Button">
-+    <type name="Magento\Paypal\Block\Express\InContext\Minicart\SmartButton">
-         <arguments>
-             <argument name="data" xsi:type="array">
-                 <item name="template" xsi:type="string">Magento_Paypal::express/in-context/shortcut/button.phtml</item>
-@@ -97,6 +97,14 @@
-             <argument name="payment" xsi:type="object">Magento\Paypal\Model\Express</argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Paypal\Block\Express\InContext\SmartButton">
-+        <arguments>
-+            <argument name="data" xsi:type="array">
-+                <item name="alias" xsi:type="string">product.info.addtocart.paypalexpress</item>
-+                <item name="template" xsi:type="string">express/shortcut_button.phtml</item>
-+            </argument>
-+        </arguments>
-+    </type>
- 
- 
-     <type name="Magento\Vault\Model\Ui\TokensConfigProvider">
-@@ -116,4 +124,62 @@
-     <type name="Magento\Quote\Model\QuoteRepository\SaveHandler">
-         <plugin name="paypal-cartitem" type="Magento\Paypal\Model\Express\QuotePlugin"/>
-     </type>
-+
-+    <type name="Magento\Paypal\Model\SmartButtonConfig">
-+        <arguments>
-+            <argument name="defaultStyles" xsi:type="array">
-+                <item name="checkout" xsi:type="array">
-+                    <item name="layout" xsi:type="string">vertical</item>
-+                    <item name="size" xsi:type="string">responsive</item>
-+                    <item name="color" xsi:type="string">gold</item>
-+                    <item name="shape" xsi:type="string">rect</item>
-+                    <item name="label" xsi:type="string">paypal</item>
-+                </item>
-+                <item name="cart" xsi:type="array">
-+                    <item name="layout" xsi:type="string">vertical</item>
-+                    <item name="size" xsi:type="string">responsive</item>
-+                    <item name="color" xsi:type="string">gold</item>
-+                    <item name="shape" xsi:type="string">rect</item>
-+                    <item name="label" xsi:type="string">paypal</item>
-+                </item>
-+                <item name="mini_cart" xsi:type="array">
-+                    <item name="layout" xsi:type="string">vertical</item>
-+                    <item name="size" xsi:type="string">responsive</item>
-+                    <item name="color" xsi:type="string">gold</item>
-+                    <item name="shape" xsi:type="string">rect</item>
-+                    <item name="label" xsi:type="string">paypal</item>
-+                </item>
-+                <item name="product" xsi:type="array">
-+                    <item name="layout" xsi:type="string">horizontal</item>
-+                    <item name="size" xsi:type="string">responsive</item>
-+                    <item name="color" xsi:type="string">gold</item>
-+                    <item name="shape" xsi:type="string">pill</item>
-+                    <item name="label" xsi:type="string">buynow</item>
-+                </item>
-+            </argument>
-+            <argument name="allowedFunding" xsi:type="array">
-+                <item name="checkout" xsi:type="array">
-+                    <item name="0" xsi:type="string">CREDIT</item>
-+                    <item name="1" xsi:type="string">ELV</item>
-+                </item>
-+                <item name="cart" xsi:type="array">
-+                    <item name="0" xsi:type="string">CREDIT</item>
-+                    <item name="1" xsi:type="string">ELV</item>
-+                </item>
-+                <item name="mini_cart" xsi:type="array">
-+                    <item name="0" xsi:type="string">CREDIT</item>
-+                    <item name="1" xsi:type="string">ELV</item>
-+                </item>
-+                <item name="product" xsi:type="array">
-+                    <item name="0" xsi:type="string">CREDIT</item>
-+                </item>
-+            </argument>
-+            <argument name="localeResolver" xsi:type="object">Magento\Paypal\Model\Express\LocaleResolver</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Paypal\Block\Express\InContext\Component">
-+        <arguments>
-+            <argument name="localeResolver" xsi:type="object">Magento\Paypal\Model\Express\LocaleResolver</argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Paypal/etc/frontend/sections.xml b/app/code/Magento/Paypal/etc/frontend/sections.xml
-index 466b930fb9b..ca32d57cd9d 100644
---- a/app/code/Magento/Paypal/etc/frontend/sections.xml
-+++ b/app/code/Magento/Paypal/etc/frontend/sections.xml
-@@ -15,4 +15,8 @@
-         <section name="cart"/>
-         <section name="checkout-data"/>
-     </action>
-+    <action name="paypal/express/onAuthorization">
-+        <section name="cart"/>
-+        <section name="checkout-data"/>
-+    </action>
- </config>
-diff --git a/app/code/Magento/Paypal/etc/rules.xsd b/app/code/Magento/Paypal/etc/rules.xsd
-index 9a274a2dbd1..c4385396cc0 100644
---- a/app/code/Magento/Paypal/etc/rules.xsd
-+++ b/app/code/Magento/Paypal/etc/rules.xsd
-@@ -31,6 +31,7 @@
-         </xs:sequence>
-         <xs:attribute type="xs:string" name="value" use="required"/>
-         <xs:attribute type="xs:string" name="name" use="required"/>
-+        <xs:attribute type="xs:boolean" name="include" use="optional"/>
-     </xs:complexType>
-     <xs:complexType name="predicate">
-         <xs:sequence minOccurs="0" maxOccurs="unbounded">
-diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
-index e47264878f1..e7264a6de80 100644
---- a/app/code/Magento/Paypal/i18n/en_US.csv
-+++ b/app/code/Magento/Paypal/i18n/en_US.csv
-@@ -2,7 +2,7 @@
-                     <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
-                                 <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
-                                 from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
--                                Use PayPal’ s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
-+                                Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
-                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                                 or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
-                 ","
-@@ -697,3 +697,43 @@ User,User
-                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                                 or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
-                 "
-+"PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
-+                            You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-+                            <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>","PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
-+                            You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-+                            <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>"
-+"Customize Smart Buttons","Customize Smart Buttons"
-+"Checkout Page","Checkout Page"
-+"Label","Label"
-+"The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.","The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR."
-+"Checkout","Checkout"
-+"Credit","Credit"
-+"Pay","Pay"
-+"Buy Now","Buy Now"
-+"PayPal","PayPal"
-+"Installment","Installment"
-+"Mexico Installment Period","Mexico Installment Period"
-+"Brazil Installment Period","Brazil Installment Period"
-+"Layout","Layout"
-+"Vertical","Vertical"
-+"Horizontal","Horizontal"
-+"Size","Size"
-+"Medium","Medium"
-+"Large","Large"
-+"Responsive","Responsive"
-+"Shape","Shape"
-+"Pill","Pill"
-+"Rectangle","Rectangle"
-+"Color","Color"
-+"Gold","Gold"
-+"Blue","Blue"
-+"Silver","Silver"
-+"Black","Black"
-+"Product Pages","Product Pages"
-+"Cart Page","Cart Page"
-+"Mini Cart","Mini Cart"
-+"Features","Features"
-+"PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD.","PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD."
-+"PayPal Credit","PayPal Credit"
-+"PayPal Guest Checkout Credit Card Icons","PayPal Guest Checkout Credit Card Icons"
-+"Elektronisches Lastschriftverfahren - German ELV","Elektronisches Lastschriftverfahren - German ELV"
-diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_paypal_reports_block.xml b/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_paypal_reports_block.xml
-index 12dcc46e3ec..596381a4b11 100644
---- a/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_paypal_reports_block.xml
-+++ b/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_paypal_reports_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="paypal.report.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">settlementGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Paypal\Model\ResourceModel\Report\Settlement\Row\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Paypal\Model\ResourceModel\Report\Settlement\Row\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">row_id</argument>
-                     <argument name="default_dir" xsi:type="string">DESC</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_ordersgrid.xml b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_ordersgrid.xml
-index 76a105f5abc..0510011a6a5 100644
---- a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_ordersgrid.xml
-+++ b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_ordersgrid.xml
-@@ -9,7 +9,7 @@
-     <update handle="sales_order_grid_block"/>
-     <referenceBlock name="sales.order.grid">
-         <arguments>
--            <argument name="dataSource" xsi:type="object">
-+            <argument name="dataSource" xsi:type="object" shared="false">
-                 <updater>Magento\Paypal\Model\Billing\Agreement\OrdersUpdater</updater>
-             </argument>
-             <argument name="grid_url" xsi:type="url" path="*/*/ordersgrid"/>
-diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_view.xml b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_view.xml
-index c76539f5cb2..d9c376701db 100644
---- a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_view.xml
-+++ b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_view.xml
-@@ -12,7 +12,7 @@
- 
-         <referenceBlock name="sales.order.grid">
-             <arguments>
--                <argument name="dataSource" xsi:type="object">
-+                <argument name="dataSource" xsi:type="object" shared="false">
-                     <updater>Magento\Paypal\Model\Billing\Agreement\OrdersUpdater</updater>
-                 </argument>
-                 <argument name="grid_url" xsi:type="url" path="*/*/ordersgrid"/>
-diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/form.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/form.phtml
-index a474be1e8b8..19cebe863b7 100644
---- a/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/form.phtml
-+++ b/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/form.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /** @var \Magento\Paypal\Block\Adminhtml\Billing\Agreement\View\Form $block */
- ?>
- <?php $code = $block->escapeHtml($block->getMethodCode()) ?>
-@@ -18,7 +17,7 @@
-                     name="payment[<?= $block->escapeHtml($block->getTransportBAId()) ?>]"
-                     class="required-entry admin__control-select">
-                 <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
--                <?php foreach ($block->getBillingAgreements() as $id => $referenceId): ?>
-+                <?php foreach ($block->getBillingAgreements() as $id => $referenceId) : ?>
-                     <option value="<?= $block->escapeHtml($id) ?>">
-                         <?= $block->escapeHtml($referenceId) ?>
-                     </option>
-diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml
-index 74c020e4d5e..5cba96518f2 100644
---- a/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml
-+++ b/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml
-@@ -1,10 +1,10 @@
- <?php
--use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
-+
-+use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
- 
- /** @var \Magento\Framework\View\Element\Template $block */
- $details = $block->getData('details');
-@@ -14,9 +14,7 @@ $id = $block->escapeHtml($block->getData('id'));
- <div data-mage-init='{
-         "Magento_Paypal/js/payflowpro/vault": {
-             "container": "payment_<?= /* @noEscape */ $id ?>",
--            "publicHash": "<?= $block->escapeHtml(
--                                $block->getData(TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH)
--                            ); ?>"
-+            "publicHash": "<?= $block->escapeHtml($block->getData(TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH)); ?>"
-         }
-     }' id="payment_<?= /* @noEscape */ $id ?>" class="admin__field">
-     <div class="admin__field-control control">
-@@ -28,8 +26,6 @@ $id = $block->escapeHtml($block->getData('id'));
-         <span><?= $block->escapeHtml(__('ending')) ?></span>
-         <span><?= $block->escapeHtml($details['cc_last_4']) ?></span>
-         (<span><?= $block->escapeHtml(__('expires')) ?></span>:
--        <span><?php /* @noEscape */ echo $block->escapeHtml(
--                $details['cc_exp_month'] . "/" . $details['cc_exp_year']
--            ); ?></span>)
-+        <span><?= /* @noEscape */ $block->escapeHtml($details['cc_exp_month'] . "/" . $details['cc_exp_year']); ?></span>)
-     </div>
- </div>
-diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/payment/form/billing/agreement.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/payment/form/billing/agreement.phtml
-index 64017a72b94..a4e7b6974c7 100644
---- a/app/code/Magento/Paypal/view/adminhtml/templates/payment/form/billing/agreement.phtml
-+++ b/app/code/Magento/Paypal/view/adminhtml/templates/payment/form/billing/agreement.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /* @var $block \Magento\Paypal\Block\Payment\Form\Billing\Agreement */
- ?>
- <?php $code = $block->escapeHtml($block->getMethodCode()) ?>
-@@ -20,7 +19,7 @@
-                     name="payment[<?= $block->escapeHtml($block->getTransportName()) ?>]"
-                     class="required-entry admin__control-select">
-                 <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
--                <?php foreach ($block->getBillingAgreements() as $id => $referenceId): ?>
-+                <?php foreach ($block->getBillingAgreements() as $id => $referenceId) : ?>
-                     <option value="<?= $block->escapeHtml($id) ?>"
-                         <?= ($id == $block->getInfoData($block->getTransportName())) ?
-                             ' selected="selected"' : '';
-diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
-index e2e52d03982..689c21943cb 100644
---- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
-+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
-@@ -4,22 +4,16 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @see \Magento\Paypal\Block\System\Config\Fieldset\Hint
-  * @var \Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint $block
-  */
- $helpLink = $block->escapeUrl($block->getHelpLink());
- ?>
--<?php
--if ($helpLink):
--?>
-+<?php if ($helpLink) : ?>
-     <div class="paypal-payment-notice">
-         <?= $block->escapeHtml(__('Not sure what PayPal payment method to use? Click ')) ?>
--        <a href="<?php /* @noEscape */
--        echo $helpLink; ?>" target="_blank"><?= $block->escapeHtml(__('here')) ?></a>
-+        <a href="<?= /* @noEscape */ $helpLink; ?>" target="_blank"><?= $block->escapeHtml(__('here')) ?></a>
-         <?= $block->escapeHtml(__(' to learn more.')) ?>
-     </div>
--<?php
--endif;
--?>
-+<?php endif; ?>
-diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/advanced.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/advanced.phtml
-index 127d5bd14db..d33e4ea1ebd 100644
---- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/advanced.phtml
-+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/advanced.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /*
-  * @var $block \Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Advanced
-  */
-diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/info.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/info.phtml
-index ad53e635808..8ff97bd8725 100644
---- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/info.phtml
-+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/info.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @see \Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Info
-  * @var \Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Info $block
-diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
-index 532fa88c498..f4318b40fef 100644
---- a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
-+++ b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Paypal\Block\Adminhtml\Payflowpro\CcForm $block */
- $code = $block->escapeHtml($block->getMethodCode());
- $ccType = $block->getInfoData('cc_type');
-@@ -48,9 +46,9 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
-                     data-validate='{required:true, "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"}'
-                     class="admin__control-select">
-                 <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
--                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-+                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
-                     <option
--                        value="<?= $block->escapeHtml($typeCode) ?>"<?php if ($typeCode == $ccType): ?> selected="selected"<?php endif ?>>
-+                        value="<?= $block->escapeHtml($typeCode) ?>"<?php if ($typeCode == $ccType) : ?> selected="selected"<?php endif ?>>
-                         <?= $block->escapeHtml($typeName) ?>
-                     </option>
-                 <?php endforeach ?>
-@@ -88,10 +86,10 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
-                     data-container="<?= /* @noEscape */ $code ?>-cc-month"
-                     class="admin__control-select admin__control-select-month"
-                     data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"}'>
--                <?php foreach ($block->getCcMonths() as $k => $v): ?>
-+                <?php foreach ($block->getCcMonths() as $k => $v) : ?>
-                     <option
-                         value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
--                        <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
-+                        <?php if ($k == $ccExpMonth) : ?> selected="selected"<?php endif; ?>>
-                         <?= $block->escapeHtml($v) ?>
-                     </option>
-                 <?php endforeach ?>
-@@ -100,17 +98,17 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
-             <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
-                     class="admin__control-select admin__control-select-year"
-                     data-container="<?= /* @noEscape */ $code ?>-cc-year" data-validate='{required:true}'>
--                <?php foreach ($block->getCcYears() as $k => $v): ?>
-+                <?php foreach ($block->getCcYears() as $k => $v) : ?>
-                     <option
-                         value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
--                        <?php if ($k == $ccExpYear): ?> selected="selected"<?php endif ?>>
-+                        <?php if ($k == $ccExpYear) : ?> selected="selected"<?php endif ?>>
-                         <?= $block->escapeHtml($v) ?>
-                     </option>
-                 <?php endforeach ?>
-             </select>
-         </div>
-     </div>
--    <?php if ($block->hasVerification()): ?>
-+    <?php if ($block->hasVerification()) : ?>
-         <div class="admin__field _required field-cvv" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
-             <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="admin__field-label">
-                 <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
-@@ -128,7 +126,7 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
-         </div>
-     <?php endif; ?>
- 
--    <?php if($block->isVaultEnabled()): ?>
-+    <?php if ($block->isVaultEnabled()) : ?>
-         <div class="admin__field admin__field-option field-tooltip-content">
-             <input type="checkbox"
-                    id="<?= /* @noEscape */ $code ?>_vault"
-diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/iframe.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/iframe.phtml
-index 63d2d437503..4edb109d6a4 100644
---- a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/iframe.phtml
-+++ b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/iframe.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Payment\Block\Transparent\Iframe $block
-  */
-@@ -14,15 +13,15 @@ $params = $block->getParams();
- <html>
- <head>
- <script>
--<?php if (isset($params['redirect'])): ?>
-+<?php if (isset($params['redirect'])) : ?>
-     window.location="<?= $block->escapeUrl($params['redirect']) ?>";
--<?php elseif (isset($params['redirect_parent'])): ?>
-+<?php elseif (isset($params['redirect_parent'])) : ?>
-     window.top.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
--<?php elseif (isset($params['error_msg'])): ?>
--    window.top.alert(<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($params['error_msg']) ?>);
--<?php elseif (isset($params['order_success'])): ?>
-+<?php elseif (isset($params['error_msg'])) : ?>
-+    window.top.alert(<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($params['error_msg']) ?>);
-+<?php elseif (isset($params['order_success'])) : ?>
-     window.top.location = "<?= $block->escapeUrl($params['order_success']) ?>";
--<?php else: ?>
-+<?php else : ?>
-     var require = window.top.require;
-     require(['jquery'], function($) {
-         var cc_number = $("input[name='payment[cc_number]']").val();
-diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js b/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js
-index 4a5248cb875..555d2a80a86 100644
---- a/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js
-+++ b/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js
-@@ -585,6 +585,41 @@ define([
-                     'Please re-enable the previously enabled payment solutions.'
-                 });
-             }
-+        },
-+
-+        /**
-+         * @param {*} $target
-+         * @param {*} $owner
-+         * @param {Object} data
-+         */
-+        removeCreditOption: function ($target, $owner, data) {
-+            if ($target.find(data.dependsButtonLabel + ' option[value="credit"]').length > 0) {
-+                $target.find(data.dependsButtonLabel + ' option[value="credit"]').remove();
-+            }
-+        },
-+
-+        /**
-+         * @param {*} $target
-+         * @param {*} $owner
-+         * @param {Object} data
-+         */
-+        addCreditOption: function ($target, $owner, data) {
-+            if ($target.find(data.dependsButtonLabel + ' option[value="credit"]').length === 0) {
-+                $target.find(data.dependsButtonLabel).append('<option value="credit">Credit</option>');
-+            }
-+        },
-+
-+        /**
-+         * @param {*} $target
-+         * @param {*} $owner
-+         * @param {Object} data
-+         */
-+        removeCreditOptionConditional: function ($target, $owner, data) {
-+            if ($target.find(data.dependsDisableFundingOptions + ' option[value="CREDIT"]').length === 0 ||
-+                $target.find(data.dependsDisableFundingOptions + ' option[value="CREDIT"]:selected').length > 0
-+            ) {
-+                this.removeCreditOption($target, $owner, data);
-+            }
-         }
-     });
- });
-diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js b/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
-index 3d832db09aa..3e4a1ab0ccc 100644
---- a/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
-+++ b/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
-@@ -65,6 +65,18 @@ define([
-              */
-             dependsBmlApiSortOrder:    '[data-enable="bml-api-sort-order"]',
- 
-+            /**
-+             * An attribute of the element responsible for the visibility of the
-+             * button Label credit option (data attribute)
-+             */
-+            dependsButtonLabel: '[data-enable="button-label"]',
-+
-+            /**
-+             * An attribute of the element responsible for the visibility of the
-+             * button Label credit option on load (data attribute)
-+             */
-+            dependsDisableFundingOptions: '[data-enable="disable-funding-options"]',
-+
-             /**
-              * Templates element selectors
-              */
-@@ -119,7 +131,9 @@ define([
-                                 }
-                             };
- 
--                        if (solution.getValue($(this)) === elementEvent.value) {
-+                        if (solution.getValue($(this)) === elementEvent.value ||
-+                            $(this).prop('multiple') && solution.checkMultiselectValue($(this), elementEvent)
-+                        ) {
-                             if (predicate.name) {
-                                 require([
-                                     'Magento_Paypal/js/predicate/' + predicate.name
-@@ -147,6 +161,23 @@ define([
-             return $element.val();
-         },
- 
-+        /**
-+         * Check multiselect value based on include value
-+         *
-+         * @param {Object} $element
-+         * @param {Object} elementEvent
-+         * @returns {Boolean}
-+         */
-+        checkMultiselectValue: function ($element, elementEvent) {
-+            var isValueSelected = $.inArray(elementEvent.value, $element.val()) >= 0;
-+
-+            if (elementEvent.include) {
-+                isValueSelected = (isValueSelected ? 'true' : 'false') === elementEvent.include;
-+            }
-+
-+            return isValueSelected;
-+        },
-+
-         /**
-          * Adding event listeners
-          *
-@@ -175,6 +206,8 @@ define([
-                                 dependsMerchantId: this.dependsMerchantId,
-                                 dependsBmlSortOrder: this.dependsBmlSortOrder,
-                                 dependsBmlApiSortOrder: this.dependsBmlApiSortOrder,
-+                                dependsButtonLabel: this.dependsButtonLabel,
-+                                dependsDisableFundingOptions: this.dependsDisableFundingOptions,
-                                 solutionsElements: this.solutionsElements,
-                                 argument: instance.argument
-                             }
-diff --git a/app/code/Magento/Paypal/view/base/requirejs-config.js b/app/code/Magento/Paypal/view/base/requirejs-config.js
-index 8edc38dce6f..8c4c90bf111 100644
---- a/app/code/Magento/Paypal/view/base/requirejs-config.js
-+++ b/app/code/Magento/Paypal/view/base/requirejs-config.js
-@@ -6,7 +6,8 @@
- var config = {
-     map: {
-         '*': {
--            transparent: 'Magento_Payment/transparent'
-+            transparent: 'Magento_Payment/js/transparent',
-+            'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
-         }
-     }
- };
-diff --git a/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml
-index 73c44faff5a..ebf38dd2d99 100644
---- a/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml
-+++ b/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml
-@@ -47,9 +47,6 @@
-                                                                         <item name="paypal_express" xsi:type="array">
-                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
-                                                                         </item>
--                                                                        <item name="paypal_express_bml" xsi:type="array">
--                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
--                                                                        </item>
-                                                                         <item name="payflow_express_bml" xsi:type="array">
-                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
-                                                                         </item>
-diff --git a/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml b/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
-index 5eef5371981..712cccc3c12 100644
---- a/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
-+++ b/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
-@@ -5,10 +5,14 @@
-  * See COPYING.txt for license details.
-  */
- -->
--<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceBlock name="customer_account_navigation">
--            <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-billing-agreements-link">
-+            <block class="Magento\Customer\Block\Account\SortLinkInterface"
-+                   name="customer-account-navigation-billing-agreements-link"
-+                   ifconfig="payment/paypal_express/active"
-+            >
-                 <arguments>
-                     <argument name="path" xsi:type="string">paypal/billing_agreement</argument>
-                     <argument name="label" xsi:type="string" translate="true">Billing Agreements</argument>
-diff --git a/app/code/Magento/Paypal/view/frontend/requirejs-config.js b/app/code/Magento/Paypal/view/frontend/requirejs-config.js
-index d2cf3f9a0ce..223ade43d86 100644
---- a/app/code/Magento/Paypal/view/frontend/requirejs-config.js
-+++ b/app/code/Magento/Paypal/view/frontend/requirejs-config.js
-@@ -6,7 +6,8 @@
- var config = {
-     map: {
-         '*': {
--            orderReview: 'Magento_Paypal/order-review',
-+            orderReview: 'Magento_Paypal/js/order-review',
-+            'Magento_Paypal/order-review': 'Magento_Paypal/js/order-review',
-             paypalCheckout: 'Magento_Paypal/js/paypal-checkout'
-         }
-     },
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/billing/agreement/view.phtml b/app/code/Magento/Paypal/view/frontend/templates/billing/agreement/view.phtml
-index 7b06c19d639..40f56fb9462 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/billing/agreement/view.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/billing/agreement/view.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Paypal\Block\Billing\Agreement\View $block
-  */
-@@ -16,7 +15,7 @@ $relatedOrders = $block->getRelatedOrders();
-             <?= $block->escapeHtml(__('Billing Agreement # ')) ?>
-             <?= $block->escapeHtml($block->getReferenceId()) ?>
-         </strong>
--        <?php if ($block->getCanCancel()): ?>
-+        <?php if ($block->getCanCancel()) : ?>
-             <button data-mage-init='{"Magento_Paypal/js/in-context/billing-agreement": {
-                         "cancelMessage" : "<?= $block->escapeHtml(__('Are you sure you want to do this?')) ?>",
-                         "cancelUrl" : "<?= $block->escapeUrl($block->getCancelUrl()) ?>"
-@@ -39,7 +38,7 @@ $relatedOrders = $block->getRelatedOrders();
-                     <th scope="col" class="col id"><?= $block->escapeHtml(__('Reference ID:')) ?></th>
-                     <th scope="col" class="col status"><?= $block->escapeHtml(__('Status:')) ?></th>
-                     <th scope="col" class="col created"><?= $block->escapeHtml(__('Created:')) ?></th>
--                    <?php if ($block->getAgreementUpdatedAt()): ?>
-+                    <?php if ($block->getAgreementUpdatedAt()) : ?>
-                         <th scope="col" class="col updated"><?= $block->escapeHtml(__('Updated:')) ?></th>
-                     <?php endif; ?>
-                     <th scope="col" class="col payment"><?= $block->escapeHtml(__('Payment Method:')) ?></th>
-@@ -56,7 +55,7 @@ $relatedOrders = $block->getRelatedOrders();
-                     <td data-th="<?= $block->escapeHtml(__('Created:')) ?>" class="col created">
-                         <?= $block->escapeHtml($block->getAgreementCreatedAt()) ?>
-                     </td>
--                    <?php if ($block->getAgreementUpdatedAt()): ?>
-+                    <?php if ($block->getAgreementUpdatedAt()) : ?>
-                         <td data-th="<?= $block->escapeHtml(__('Updated:')) ?>" class="col updated">
-                             <?= $block->escapeHtml($block->getAgreementUpdatedAt()) ?>
-                         </td>
-@@ -70,7 +69,7 @@ $relatedOrders = $block->getRelatedOrders();
-         </div>
-     </div>
- </div>
--<?php if (count($relatedOrders) > 0): ?>
-+<?php if (count($relatedOrders) > 0) : ?>
-     <div class="block block-billing-orders-view">
-         <?= $block->getChildHtml('pager') ?>
-         <div class="block-title">
-@@ -91,11 +90,12 @@ $relatedOrders = $block->getRelatedOrders();
-                     </tr>
-                     </thead>
-                     <tbody>
--                        <?php foreach ($relatedOrders as $order): ?>
-+                        <?php foreach ($relatedOrders as $order) : ?>
-                             <tr>
-                                 <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id">
-                                     <?= $block->escapeHtml($block->getOrderItemValue(
--                                        $order, 'order_increment_id'
-+                                        $order,
-+                                        'order_increment_id'
-                                     )); ?>
-                                 </td>
-                                 <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date">
-@@ -103,7 +103,8 @@ $relatedOrders = $block->getRelatedOrders();
-                                 </td>
-                                 <td data-th="<?= $block->escapeHtml(__('Ship To')) ?>" class="col shipto">
-                                     <?= $block->escapeHtml($block->getOrderItemValue(
--                                        $order, 'shipping_address'
-+                                        $order,
-+                                        'shipping_address'
-                                     )); ?>
-                                 </td>
-                                 <td data-th="<?= $block->escapeHtml(__('Order Total')) ?>" class="col total">
-@@ -111,12 +112,14 @@ $relatedOrders = $block->getRelatedOrders();
-                                 </td>
-                                 <td data-th="<?= $block->escapeHtml(__('Order Status')) ?>" class="col status">
-                                     <?= $block->escapeHtml($block->getOrderItemValue(
--                                        $order, 'status_label'
-+                                        $order,
-+                                        'status_label'
-                                     )); ?>
-                                 </td>
-                                 <td data-th="" class="col actions">
-                                     <a href="<?= $block->escapeUrl($block->getOrderItemValue(
--                                        $order, 'view_url'
-+                                        $order,
-+                                        'view_url'
-                                     )); ?>" class="action view">
-                                         <span><?= $block->escapeHtml(__('View Order')) ?></span>
-                                     </a>
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml b/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml
-index 77987c948b6..c8fc6fcb36b 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Paypal\Block\Billing\Agreements $block
-  */
-@@ -13,7 +12,7 @@ $billingAgreements = $block->getBillingAgreements();
- $paymentMethods = $block->getWizardPaymentMethodOptions();
- ?>
- <div class="account-billing-agreements">
--    <?php if (count($billingAgreements) > 0): ?>
-+    <?php if (count($billingAgreements) > 0) : ?>
-         <?= $block->getChildHtml('pager') ?>
-         <div class="table-wrapper billing-agreements">
-             <table id="billing-agreements" class="data table table-billing-agreements">
-@@ -29,7 +28,7 @@ $paymentMethods = $block->getWizardPaymentMethodOptions();
-                 </tr>
-                 </thead>
-                 <tbody>
--                    <?php foreach ($billingAgreements as $item): ?>
-+                    <?php foreach ($billingAgreements as $item) : ?>
-                         <tr>
-                             <td data-th="<?= $block->escapeHtml(__('Reference ID')) ?>" class="col id">
-                                 <?= $block->escapeHtml($block->getItemValue($item, 'reference_id')) ?>
-@@ -57,13 +56,13 @@ $paymentMethods = $block->getWizardPaymentMethodOptions();
-                 </tbody>
-             </table>
-         </div>
--    <?php else: ?>
-+    <?php else : ?>
-         <div class="message info empty">
-             <span><?= $block->escapeHtml(__('There are no billing agreements yet.')) ?></span>
-         </div>
-     <?php endif; ?>
- 
--    <?php if ($paymentMethods): ?>
-+    <?php if ($paymentMethods) : ?>
-         <form action="<?= $block->escapeUrl($block->getCreateUrl()) ?>" method="post"
-               class="form form-new-agreement">
-             <fieldset class="fieldset">
-@@ -79,7 +78,7 @@ $paymentMethods = $block->getWizardPaymentMethodOptions();
-                     <div class="control">
-                         <select id="payment_method" name="payment_method">
-                             <option value=""><?= $block->escapeHtml(__('-- Please Select --')) ?></option>
--                            <?php foreach ($paymentMethods as $code => $title): ?>
-+                            <?php foreach ($paymentMethods as $code => $title) : ?>
-                                 <option value="<?= $block->escapeHtml($code) ?>">
-                                     <?= $block->escapeHtml($title) ?>
-                                 </option>
-@@ -101,7 +100,7 @@ $paymentMethods = $block->getWizardPaymentMethodOptions();
-                 </div>
-             </fieldset>
-         </form>
--    <?php else: ?>
-+    <?php else : ?>
-     <div class="actions-toolbar">
-         <div class="secondary">
-             <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/review/totals.phtml b/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/review/totals.phtml
-index 2f7191b2472..05e3321cad7 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/review/totals.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/review/totals.phtml
-@@ -4,23 +4,21 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @see \Magento\Checkout\Block\Cart\Totals
-  */
- ?>
--<?php if ($block->getTotals()): ?>
-+<?php if ($block->getTotals()) : ?>
-     <?php $_colspan = 3; ?>
--    <?= /* @escapeNotVerified */ $block->renderTotals(null, $_colspan) ?>
--    <?= /* @escapeNotVerified */ $block->renderTotals('footer', $_colspan) ?>
--    <?php if ($block->needDisplayBaseGrandtotal()):?>
-+    <?= /* @noEscape */ $block->renderTotals(null, $_colspan) ?>
-+    <?= /* @noEscape */ $block->renderTotals('footer', $_colspan) ?>
-+    <?php if ($block->needDisplayBaseGrandtotal()) : ?>
-     <tr class="totals charge">
--        <th class="mark" colspan="<?= /* @escapeNotVerified */ $_colspan ?>" scope="row">
--            <?= /* @escapeNotVerified */ __('Your credit card will be charged for') ?>
-+        <th class="mark" colspan="<?= /* @noEscape */ $_colspan ?>" scope="row">
-+            <?= $block->escapeHtml(__('Your credit card will be charged for')) ?>
-         </th>
-         <td class="amount" data-th="<?= $block->escapeHtml(__('Your credit card will be charged for')) ?>">
--            <?= /* @escapeNotVerified */ $block->displayBaseGrandtotal() ?>
-+            <?= /* @noEscape */ $block->displayBaseGrandtotal() ?>
-         </td>
-     </tr>
-     <?php endif?>
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml
-index 3725f51f0b8..66dddfb0bda 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml
-@@ -4,26 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--use Magento\Paypal\Block\Express\InContext\Minicart\Button;
--
- /**
-- * @var \Magento\Paypal\Block\Express\InContext\Minicart\Button $block
-+ * @var \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton $block
-  */
--$config = [
--    'Magento_Paypal/js/in-context/button' => [
--        'id' => $block->escapeHtml($block->getContainerId()),
--        'linkDataAction' => $block->escapeHtml($block->getLinkAction()),
--        'paypalButton' => $block->escapeHtml(Button::PAYPAL_BUTTON_ID),
--        'addToCartSelector' => $block->escapeHtml($block->getAddToCartSelector())
--    ]
--];
--
- ?>
--<div data-mage-init='<?= /* @noEscape */ json_encode($config) ?>'
-+<div data-mage-init='<?= /* @noEscape */ $block->getJsInitParams() ?>'
-      class="paypal checkout paypal-logo <?= $block->escapeHtml($block->getContainerId()) ?>-container">
--    <a data-action="<?= $block->escapeHtml($block->getLinkAction()) ?>" href="#">
--        <img class="paypal-button-hidden"
--             src="<?= $block->escapeHtml($block->getImageUrl()) ?>"
--             alt="Check out with PayPal" />
--    </a>
--</div>
-+</div>
-\ No newline at end of file
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
-index 93b5d57b318..7a94ac56232 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Paypal\Block\Express\Review $block
-  */
-@@ -12,7 +11,7 @@
- <div class="paypal-review view">
-     <div class="block block-order-details-view">
-         <div class="block-content">
--            <?php if ($block->getShippingAddress()): ?>
-+            <?php if ($block->getShippingAddress()) : ?>
-                 <div class="box box-order-shipping-method">
-                     <strong class="box-title">
-                         <span><?= $block->escapeHtml(__('Shipping Method')) ?></span>
-@@ -21,30 +20,26 @@
-                         <form method="post" id="shipping-method-form"
-                               action="<?= $block->escapeUrl($block->getShippingMethodSubmitUrl()) ?>"
-                               class="form">
--                            <?php if ($block->canEditShippingMethod()): ?>
--                                <?php if ($groups = $block->getShippingRateGroups()): ?>
-+                            <?php if ($block->canEditShippingMethod()) : ?>
-+                                <?php if ($groups = $block->getShippingRateGroups()) : ?>
-                                     <?php $currentRate = $block->getCurrentShippingRate(); ?>
-                                     <div class="field shipping required">
-                                         <select name="shipping_method" id="shipping-method" class="select">
--                                            <?php if (!$currentRate): ?>
--                                                <option value=""><?= $block->escapeHtml(__(
--                                                        'Please select a shipping method...'
--                                                    )); ?></option>
-+                                            <?php if (!$currentRate) : ?>
-+                                                <option value=""><?= $block->escapeHtml(__('Please select a shipping method...')); ?></option>
-                                             <?php endif; ?>
--                                            <?php foreach ($groups as $code => $rates): ?>
--                                                <optgroup label="<?= $block->escapeHtml($block->getCarrierName(
--                                                        $code
--                                                    )); ?>">
--                                                    <?php foreach ($rates as $rate): ?>
--                                                        <option value="<?= $block->escapeHtml(
--                                                                $block->renderShippingRateValue($rate)
--                                                            ); ?>"
-+                                            <?php foreach ($groups as $code => $rates) : ?>
-+                                                <optgroup label="<?= $block->escapeHtml($block->getCarrierName($code)); ?>">
-+                                                    <?php foreach ($rates as $rate) : ?>
-+                                                        <option value="<?=
-+                                                                        $block->escapeHtml(
-+                                                                            $block->renderShippingRateValue($rate)
-+                                                                        );
-+                                                                        ?>"
-                                                             <?= ($currentRate === $rate) ?
-                                                                 ' selected="selected"' : '';
-                                                             ?>>
--                                                            <?php /* @noEscape */ echo
--                                                                $block->renderShippingRateOption($rate);
--                                                            ?>
-+                                                            <?= /* @noEscape */ $block->renderShippingRateOption($rate); ?>
-                                                         </option>
-                                                     <?php endforeach; ?>
-                                                 </optgroup>
-@@ -61,16 +56,16 @@
-                                             </button>
-                                         </div>
-                                     </div>
--                                <?php else: ?>
-+                                <?php else : ?>
-                                     <p>
-                                         <?= $block->escapeHtml(__(
-                                             'Sorry, no quotes are available for this order right now.'
-                                         )); ?>
-                                     </p>
-                                 <?php endif; ?>
--                            <?php else: ?>
-+                            <?php else : ?>
-                                 <p>
--                                    <?php /* @noEscape */ echo $block->renderShippingRateOption(
-+                                    <?= /* @noEscape */ $block->renderShippingRateOption(
-                                         $block->getCurrentShippingRate()
-                                     ); ?>
-                                 </p>
-@@ -90,7 +85,7 @@
-                             );?>
-                         </address>
-                     </div>
--                    <?php if ($block->getCanEditShippingAddress()): ?>
-+                    <?php if ($block->getCanEditShippingAddress()) : ?>
-                         <div class="box-actions">
-                             <a href="<?= $block->escapeUrl($block->getEditUrl()) ?>" class="action edit">
-                                 <span><?= $block->escapeHtml(__('Edit')) ?></span>
-@@ -107,7 +102,7 @@
-                     <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png"
-                          alt="<?= $block->escapeHtml(__('Buy now with PayPal')) ?>"/>
-                 </div>
--            <?php if ($block->getEditUrl()): ?>
-+            <?php if ($block->getEditUrl()) : ?>
-                 <div class="box-actions">
-                     <a href="<?= $block->escapeUrl($block->getEditUrl()) ?>" class="action edit">
-                         <span><?= $block->escapeHtml(__('Edit Payment Information')) ?></span>
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/review/details.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/review/details.phtml
-index 0d61b6cdc2c..976ad328663 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/express/review/details.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/express/review/details.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @see \Magento\Paypal\Block\Express\Review\Details
-  * @var \Magento\Paypal\Block\Express\Review\Details $block
-@@ -21,7 +20,7 @@
-             <th class="col subtotal" scope="col"><?= $block->escapeHtml(__('Subtotal')) ?></th>
-         </tr>
-         </thead>
--            <?php foreach ($block->getItems() as $item): ?>
-+            <?php foreach ($block->getItems() as $item) : ?>
-                 <?= $block->getItemHtml($item) ?>
-             <?php endforeach ?>
-         <tfoot class="opc-block-summary">
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/review/shipping/method.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/review/shipping/method.phtml
-index ca84b0829ea..839d278ed22 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/express/review/shipping/method.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/express/review/shipping/method.phtml
-@@ -4,23 +4,22 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /** @var $block \Magento\Paypal\Block\Express\Review */
- ?>
- <div id="shipping-method-container">
--    <?php if ($block->getCanEditShippingMethod() || !$block->getCurrentShippingRate()): ?>
--        <?php if ($groups = $block->getShippingRateGroups()): ?>
-+    <?php if ($block->getCanEditShippingMethod() || !$block->getCurrentShippingRate()) : ?>
-+        <?php if ($groups = $block->getShippingRateGroups()) : ?>
-             <?php $currentRate = $block->getCurrentShippingRate(); ?>
-             <select name="shipping_method" id="shipping_method" class="required-entry">
--                <?php if (!$currentRate): ?>
-+                <?php if (!$currentRate) : ?>
-                     <option value="">
-                         <?= $block->escapeHtml(__('Please select a shipping method...')) ?>
-                     </option>
-                 <?php endif; ?>
--                <?php foreach ($groups as $code => $rates): ?>
-+                <?php foreach ($groups as $code => $rates) : ?>
-                     <optgroup label="<?= $block->escapeHtml($block->getCarrierName($code)) ?>"
-                               style="font-style:normal;">
--                        <?php foreach ($rates as $rate): ?>
-+                        <?php foreach ($rates as $rate) : ?>
-                             <option
-                                 value="<?= $block->escapeHtml($block->renderShippingRateValue($rate)) ?>"
-                                     <?= ($currentRate === $rate) ? ' selected="selected"' : '' ?>>
-@@ -30,14 +29,14 @@
-                     </optgroup>
-                 <?php endforeach; ?>
-             </select>
--        <?php else: ?>
-+        <?php else : ?>
-             <p>
-                 <strong>
-                     <?= $block->escapeHtml(__('Sorry, no quotes are available for this order right now.')) ?>
-                 </strong>
-             </p>
-         <?php endif; ?>
--    <?php else: ?>
-+    <?php else : ?>
-         <p>
-             <strong>
-                 <?= /* @noEscape */ $block->renderShippingRateOption($block->getCurrentShippingRate()) ?>
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/shortcut.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut.phtml
-index ce8a0e94023..1e7787817b5 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/express/shortcut.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Paypal\Block\Express\Shortcut $block
-  */
-@@ -37,7 +36,7 @@ if ($block->getIsInCatalogProduct()) {
-            src="<?= $block->escapeUrl($block->getImageUrl()) ?>"
-            alt="<?= $block->escapeHtml(__('Checkout with PayPal')) ?>"
-            title="<?= $block->escapeHtml(__('Checkout with PayPal')) ?>"/>
--    <?php if ($block->getAdditionalLinkImage()): ?>
-+    <?php if ($block->getAdditionalLinkImage()) : ?>
-         <?php $linkImage = $block->getAdditionalLinkImage(); ?>
-         <a href="<?= $block->escapeUrl($linkImage['href']) ?>">
-             <img src="<?= $block->escapeHtml($linkImage['src']) ?>" />
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/shortcut/container.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut/container.phtml
-index 9a9bac2c741..acaff92065d 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/express/shortcut/container.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut/container.phtml
-@@ -4,11 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var $block Magento\Paypal\Block\Express\Shortcut
-  */
- ?>
--<?php if ($block->getIsInCatalogProduct()): ?>
-+<?php if ($block->getIsInCatalogProduct()) : ?>
-     <input type="hidden" id="pp-checkout-url" name="return_url" value=""/>
- <?php endif; ?>
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/shortcut_button.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut_button.phtml
-new file mode 100644
-index 00000000000..a30bc2cce6d
---- /dev/null
-+++ b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut_button.phtml
-@@ -0,0 +1,11 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/**
-+ * @var \Magento\Paypal\Block\Express\Shortcut $block
-+ */
-+?>
-+<div data-mage-init='<?= /* @noEscape */ $block->getJsInitParams() ?>'></div>
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml b/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
-index 28daa150b88..c2339f85b7c 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
-@@ -3,7 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
-+
- /**
-  * @var \Magento\Paypal\Block\Payment\Info $block
-  */
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/js/components.phtml b/app/code/Magento/Paypal/view/frontend/templates/js/components.phtml
-index 7ba93077420..5902a9f25cc 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/js/components.phtml
-@@ -3,7 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml
-index 06cbc9f3e35..d5944a6f22f 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Paypal\Block\Payflow\Advanced\Form $block
-  */
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/payment/form/billing/agreement.phtml b/app/code/Magento/Paypal/view/frontend/templates/payment/form/billing/agreement.phtml
-index d9095c202f8..75ee08111bd 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/payment/form/billing/agreement.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/form/billing/agreement.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Paypal\Block\Payment\Form\Billing\Agreement $block
-  */
-@@ -18,7 +17,7 @@ $code = $block->escapeHtml($block->getMethodCode());
-         <select id="<?= /* @noEscape */ $code ?>_ba_agreement_id"
-                 name="payment[<?= $block->escapeHtml($block->getTransportName()) ?>]" class="select">
-             <option value=""><?= $block->escapeHtml(__('-- Please Select Billing Agreement--')) ?></option>
--            <?php foreach ($block->getBillingAgreements() as $id => $referenceId): ?>
-+            <?php foreach ($block->getBillingAgreements() as $id => $referenceId) : ?>
-                 <option value="<?= $block->escapeHtml($id) ?>">
-                     <?= $block->escapeHtml($referenceId) ?>
-                 </option>
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml b/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
-index 93413628174..d9fb5fb43bc 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * Note: This mark is a requirement of PayPal
-  * @var \Magento\Paypal\Block\Express\Form $block
-diff --git a/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml b/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml
-index d954eab92c6..683153b12db 100644
---- a/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml
-+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml
-@@ -4,7 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\PayPal\Block\Express\Form $block
-  * @see \Magento\PayPal\Block\Express\Form
-@@ -15,7 +14,7 @@ $code = $block->escapeHtml($block->getBillingAgreementCode());
-           id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>">
-     <div><?= $block->escapeHtml($block->getRedirectMessage()) ?></div>
-     <?php  ?>
--    <?php if ($code): ?>
-+    <?php if ($code) : ?>
-         <input type="checkbox" id="<?= /* @noEscape */ $code ?>" value="1" class="checkbox"
-                name="payment[<?= /* @noEscape */ $code ?>]">
-         <label for="<?= /* @noEscape */ $code ?>" class="label">
-diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
-index 8b4855cff68..012a1f18f9a 100644
---- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
-+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
-@@ -2,50 +2,52 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--define(
--    [
--        'uiComponent',
--        'jquery',
--        'domReady!'
--    ],
--    function (
--        Component,
--        $
--    ) {
--        'use strict';
--
--        return Component.extend({
--
--            defaults: {},
--
--            /**
--             * @returns {Object}
--             */
--            initialize: function () {
--                this._super();
--
--                return this.initEvents();
--            },
--
--            /**
--             * @returns {Object}
--             */
--            initEvents: function () {
--                $('a[data-action="' + this.linkDataAction + '"]').off('click.' + this.id)
--                    .on('click.' + this.id, this.click.bind(this));
--
--                return this;
--            },
--
--            /**
--             * @param {Object} event
--             * @returns void
--             */
--            click: function (event) {
--                event.preventDefault();
--
--                $('#' + this.paypalButton).click();
-+define([
-+    'uiComponent',
-+    'jquery',
-+    'Magento_Paypal/js/in-context/express-checkout-wrapper',
-+    'Magento_Customer/js/customer-data'
-+], function (Component, $, Wrapper, customerData) {
-+    'use strict';
-+
-+    return Component.extend(Wrapper).extend({
-+        defaults: {
-+            declinePayment: false
-+        },
-+
-+        /** @inheritdoc */
-+        initialize: function (config, element) {
-+            var cart = customerData.get('cart'),
-+                customer = customerData.get('customer');
-+
-+            this._super();
-+            this.renderPayPalButtons(element);
-+            this.declinePayment = !customer().firstname && !cart().isGuestCheckoutAllowed;
-+
-+            return this;
-+        },
-+
-+        /** @inheritdoc */
-+        beforePayment: function (resolve, reject) {
-+            var promise = $.Deferred();
-+
-+            if (this.declinePayment) {
-+                this.addError(this.signInMessage, 'warning');
-+
-+                reject();
-+            } else {
-+                promise.resolve();
-             }
--        });
--    }
--);
-+
-+            return promise;
-+        },
-+
-+        /** @inheritdoc */
-+        prepareClientConfig: function () {
-+            this._super();
-+            this.clientConfig.commit = false;
-+
-+            return this.clientConfig;
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
-new file mode 100644
-index 00000000000..ad7e86f2e99
---- /dev/null
-+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
-@@ -0,0 +1,123 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+define([
-+    'underscore',
-+    'paypalInContextExpressCheckout'
-+], function (_, paypal) {
-+    'use strict';
-+
-+    /**
-+     * Returns array of allowed funding
-+     *
-+     * @param {Object} config
-+     * @return {Array}
-+     */
-+    function getFunding(config) {
-+        return _.map(config, function (name) {
-+            return paypal.FUNDING[name];
-+        });
-+    }
-+
-+    return function (clientConfig, element) {
-+        paypal.Button.render({
-+            env: clientConfig.environment,
-+            client: clientConfig.client,
-+            locale: clientConfig.locale,
-+            funding: {
-+                allowed: getFunding(clientConfig.allowedFunding),
-+                disallowed: getFunding(clientConfig.disallowedFunding)
-+            },
-+            style: clientConfig.styles,
-+
-+            // Enable Pay Now checkout flow (optional)
-+            commit: clientConfig.commit,
-+
-+            /**
-+             * Validate payment method
-+             *
-+             * @param {Object} actions
-+             */
-+            validate: function (actions) {
-+                clientConfig.rendererComponent.validate(actions);
-+            },
-+
-+            /**
-+             * Execute logic on Paypal button click
-+             */
-+            onClick: function () {
-+                clientConfig.rendererComponent.onClick();
-+            },
-+
-+            /**
-+             * Set up a payment
-+             *
-+             * @return {*}
-+             */
-+            payment: function () {
-+                var params = {
-+                    'quote_id': clientConfig.quoteId,
-+                    'customer_id': clientConfig.customerId || '',
-+                    'form_key': clientConfig.formKey,
-+                    button: clientConfig.button
-+                };
-+
-+                return new paypal.Promise(function (resolve, reject) {
-+                    clientConfig.rendererComponent.beforePayment(resolve, reject).then(function () {
-+                        paypal.request.post(clientConfig.getTokenUrl, params).then(function (res) {
-+                            return clientConfig.rendererComponent.afterPayment(res, resolve, reject);
-+                        }).catch(function (err) {
-+                            return clientConfig.rendererComponent.catchPayment(err, resolve, reject);
-+                        });
-+                    });
-+                });
-+            },
-+
-+            /**
-+             * Execute the payment
-+             *
-+             * @param {Object} data
-+             * @param {Object} actions
-+             * @return {*}
-+             */
-+            onAuthorize: function (data, actions) {
-+                var params = {
-+                    paymentToken: data.paymentToken,
-+                    payerId: data.payerID,
-+                    quoteId: clientConfig.quoteId || '',
-+                    customerId: clientConfig.customerId || '',
-+                    'form_key': clientConfig.formKey
-+                };
-+
-+                return new paypal.Promise(function (resolve, reject) {
-+                    clientConfig.rendererComponent.beforeOnAuthorize(resolve, reject, actions).then(function () {
-+                        paypal.request.post(clientConfig.onAuthorizeUrl, params).then(function (res) {
-+                            clientConfig.rendererComponent.afterOnAuthorize(res, resolve, reject, actions);
-+                        }).catch(function (err) {
-+                            return clientConfig.rendererComponent.catchOnAuthorize(err, resolve, reject);
-+                        });
-+                    });
-+                });
-+
-+            },
-+
-+            /**
-+             * Process cancel action
-+             *
-+             * @param {Object} data
-+             * @param {Object} actions
-+             */
-+            onCancel: function (data, actions) {
-+                clientConfig.rendererComponent.onCancel(data, actions);
-+            },
-+
-+            /**
-+             * Process errors
-+             */
-+            onError: function (err) {
-+                clientConfig.rendererComponent.onError(err);
-+            }
-+        }, element);
-+    };
-+});
-diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js
-new file mode 100644
-index 00000000000..905f860fe26
---- /dev/null
-+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js
-@@ -0,0 +1,187 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+define([
-+    'jquery',
-+    'mage/translate',
-+    'Magento_Customer/js/customer-data',
-+    'Magento_Paypal/js/in-context/express-checkout-smart-buttons',
-+    'mage/cookies'
-+], function ($, $t, customerData, checkoutSmartButtons) {
-+    'use strict';
-+
-+    return {
-+        defaults: {
-+            paymentActionError: $t('Something went wrong with your request. Please try again later.'),
-+            signInMessage: $t('To check out, please sign in with your email address.')
-+        },
-+
-+        /**
-+         * Render PayPal buttons using checkout.js
-+         */
-+        renderPayPalButtons: function (element) {
-+            checkoutSmartButtons(this.prepareClientConfig(), element);
-+        },
-+
-+        /**
-+         * Validate payment method
-+         *
-+         * @param {Object} actions
-+         */
-+        validate: function (actions) {
-+            this.actions = actions || this.actions;
-+        },
-+
-+        /**
-+         * Execute logic on Paypal button click
-+         */
-+        onClick: function () {},
-+
-+        /**
-+         * Before payment execute
-+         *
-+         * @param {Function} resolve
-+         * @param {Function} reject
-+         * @return {*}
-+         */
-+        beforePayment: function (resolve, reject) { //eslint-disable-line no-unused-vars
-+            return $.Deferred().resolve();
-+        },
-+
-+        /**
-+         * After payment execute
-+         *
-+         * @param {Object} res
-+         * @param {Function} resolve
-+         * @param {Function} reject
-+         *
-+         * @return {*}
-+         */
-+        afterPayment: function (res, resolve, reject) {
-+            if (res.success) {
-+                return resolve(res.token);
-+            }
-+
-+            this.addError(res['error_message']);
-+
-+            return reject(new Error(res['error_message']));
-+        },
-+
-+        /**
-+         * Catch payment
-+         *
-+         * @param {Error} err
-+         * @param {Function} resolve
-+         * @param {Function} reject
-+         */
-+        catchPayment: function (err, resolve, reject) {
-+            this.addError(this.paymentActionError);
-+            reject(err);
-+        },
-+
-+        /**
-+         * Before onAuthorize execute
-+         *
-+         * @param {Function} resolve
-+         * @param {Function} reject
-+         * @param {Object} actions
-+         *
-+         * @return {jQuery.Deferred}
-+         */
-+        beforeOnAuthorize: function (resolve, reject, actions) { //eslint-disable-line no-unused-vars
-+            return $.Deferred().resolve();
-+        },
-+
-+        /**
-+         * After onAuthorize execute
-+         *
-+         * @param {Object} res
-+         * @param {Function} resolve
-+         * @param {Function} reject
-+         * @param {Object} actions
-+         *
-+         * @return {*}
-+         */
-+        afterOnAuthorize: function (res, resolve, reject, actions) {
-+            if (res.success) {
-+                resolve();
-+
-+                return actions.redirect(window, res.redirectUrl);
-+            }
-+
-+            this.addError(res['error_message']);
-+
-+            return reject(new Error(res['error_message']));
-+        },
-+
-+        /**
-+         * Catch payment
-+         *
-+         * @param {Error} err
-+         * @param {Function} resolve
-+         * @param {Function} reject
-+         */
-+        catchOnAuthorize: function (err, resolve, reject) {
-+            this.addError(this.paymentActionError);
-+            reject(err);
-+        },
-+
-+        /**
-+         * Process cancel action
-+         *
-+         * @param {Object} data
-+         * @param {Object} actions
-+         */
-+        onCancel: function (data, actions) {
-+            actions.redirect(window, this.clientConfig.onCancelUrl);
-+        },
-+
-+        /**
-+         * Process errors
-+         *
-+         * @param {Error} err
-+         */
-+        onError: function (err) { //eslint-disable-line no-unused-vars
-+            // Uncaught error isn't displayed in the console
-+        },
-+
-+        /**
-+         * Adds error message
-+         *
-+         * @param {String} message
-+         * @param {String} [type]
-+         */
-+        addError: function (message, type) {
-+            type = type || 'error';
-+            customerData.set('messages', {
-+                messages: [{
-+                    type: type,
-+                    text: message
-+                }],
-+                'data_id': Math.floor(Date.now() / 1000)
-+            });
-+        },
-+
-+        /**
-+         * @returns {String}
-+         */
-+        getButtonId: function () {
-+            return this.inContextId;
-+        },
-+
-+        /**
-+         * Populate client config with all required data
-+         *
-+         * @return {Object}
-+         */
-+        prepareClientConfig: function () {
-+            this.clientConfig.client = {};
-+            this.clientConfig.client[this.clientConfig.environment] = this.clientConfig.merchantId;
-+            this.clientConfig.rendererComponent = this;
-+            this.clientConfig.formKey = $.mage.cookies.get('form_key');
-+
-+            return this.clientConfig;
-+        }
-+    };
-+});
-diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js
-new file mode 100644
-index 00000000000..f4adaae06a1
---- /dev/null
-+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js
-@@ -0,0 +1,80 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+define([
-+    'underscore',
-+    'jquery',
-+    'uiComponent',
-+    'Magento_Paypal/js/in-context/express-checkout-wrapper',
-+    'Magento_Customer/js/customer-data'
-+], function (_, $, Component, Wrapper, customerData) {
-+    'use strict';
-+
-+    return Component.extend(Wrapper).extend({
-+        defaults: {
-+            productFormSelector: '#product_addtocart_form',
-+            declinePayment: false,
-+            formInvalid: false
-+        },
-+
-+        /** @inheritdoc */
-+        initialize: function (config, element) {
-+            var cart = customerData.get('cart'),
-+                customer = customerData.get('customer');
-+
-+            this._super();
-+
-+            if (config.clientConfig.isVisibleOnProductPage) {
-+                this.renderPayPalButtons(element);
-+            }
-+
-+            this.declinePayment = !customer().firstname && !cart().isGuestCheckoutAllowed;
-+
-+            return this;
-+        },
-+
-+        /** @inheritdoc */
-+        onClick: function () {
-+            var $form = $(this.productFormSelector);
-+
-+            if (!this.declinePayment) {
-+                $form.submit();
-+                this.formInvalid = !$form.validation('isValid');
-+            }
-+        },
-+
-+        /** @inheritdoc */
-+        beforePayment: function (resolve, reject) {
-+            var promise = $.Deferred();
-+
-+            if (this.declinePayment) {
-+                this.addError(this.signInMessage, 'warning');
-+                reject();
-+            } else if (this.formInvalid) {
-+                reject();
-+            } else {
-+                $(document).on('ajax:addToCart', function (e, data) {
-+                    if (_.isEmpty(data.response)) {
-+                        return promise.resolve();
-+                    }
-+
-+                    return reject();
-+                });
-+                $(document).on('ajax:addToCart:error', reject);
-+            }
-+
-+            return promise;
-+        },
-+
-+        /** @inheritdoc */
-+        prepareClientConfig: function () {
-+            this._super();
-+            this.clientConfig.quoteId = '';
-+            this.clientConfig.customerId = '';
-+            this.clientConfig.commit = false;
-+
-+            return this.clientConfig;
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Paypal/view/frontend/web/order-review.js b/app/code/Magento/Paypal/view/frontend/web/js/order-review.js
-similarity index 100%
-rename from app/code/Magento/Paypal/view/frontend/web/order-review.js
-rename to app/code/Magento/Paypal/view/frontend/web/js/order-review.js
-diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js
-index 3315a7c402d..7fb94a7e234 100644
---- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js
-+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js
-@@ -4,10 +4,9 @@
-  */
- define([
-     'Magento_Checkout/js/view/payment/default',
--    'ko',
-     'Magento_Paypal/js/model/iframe',
-     'Magento_Checkout/js/model/full-screen-loader'
--], function (Component, ko, iframe, fullScreenLoader) {
-+], function (Component, iframe, fullScreenLoader) {
-     'use strict';
- 
-     return Component.extend({
-diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
-index c56f21bc718..5c509238fe5 100644
---- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
-+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
-@@ -2,134 +2,103 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--define(
--    [
--        'underscore',
--        'jquery',
--        'Magento_Paypal/js/view/payment/method-renderer/paypal-express-abstract',
--        'Magento_Paypal/js/action/set-payment-method',
--        'Magento_Checkout/js/model/payment/additional-validators',
--        'Magento_Ui/js/lib/view/utils/dom-observer',
--        'paypalInContextExpressCheckout',
--        'Magento_Customer/js/customer-data',
--        'Magento_Ui/js/model/messageList'
--    ],
--    function (
--        _,
--        $,
--        Component,
--        setPaymentMethodAction,
--        additionalValidators,
--        domObserver,
--        paypalExpressCheckout,
--        customerData,
--        messageList
--    ) {
--        'use strict';
--
--        // State of PayPal module initialization
--        var clientInit = false;
--
--        return Component.extend({
--
--            defaults: {
--                template: 'Magento_Paypal/payment/paypal-express-in-context',
--                clientConfig: {
--                    /**
--                     * @param {Object} event
--                     */
--                    click: function (event) {
--                        event.preventDefault();
--
--                        if (additionalValidators.validate()) {
--                            paypalExpressCheckout.checkout.initXO();
--
--                            this.selectPaymentMethod();
--                            setPaymentMethodAction(this.messageContainer).done(function () {
--                                $('body').trigger('processStart');
--
--                                $.getJSON(this.path, {
--                                    button: 0
--                                }).done(function (response) {
--                                    var message = response && response.message;
--
--                                    if (message) {
--                                        if (message.type === 'error') {
--                                            messageList.addErrorMessage({
--                                                message: message.text
--                                            });
--                                        } else {
--                                            messageList.addSuccessMessage({
--                                                message: message.text
--                                            });
--                                        }
--                                    }
--
--                                    if (response && response.url) {
--                                        paypalExpressCheckout.checkout.startFlow(response.url);
--
--                                        return;
--                                    }
--
--                                    paypalExpressCheckout.checkout.closeFlow();
--                                }).fail(function () {
--                                    paypalExpressCheckout.checkout.closeFlow();
--                                }).always(function () {
--                                    $('body').trigger('processStop');
--                                    customerData.invalidate(['cart']);
--                                });
--                            }.bind(this)).fail(function () {
--                                paypalExpressCheckout.checkout.closeFlow();
--                            });
--                        }
--                    }
--                }
--            },
--
--            /**
--             * @returns {Object}
--             */
--            initialize: function () {
--                this._super();
--                this.initClient();
--
--                return this;
--            },
-+define([
-+    'jquery',
-+    'Magento_Paypal/js/view/payment/method-renderer/paypal-express-abstract',
-+    'Magento_Paypal/js/in-context/express-checkout-wrapper',
-+    'Magento_Paypal/js/action/set-payment-method',
-+    'Magento_Checkout/js/model/payment/additional-validators',
-+    'Magento_Ui/js/model/messageList',
-+    'Magento_Ui/js/lib/view/utils/async'
-+], function ($, Component, Wrapper, setPaymentMethod, additionalValidators, messageList) {
-+    'use strict';
-+
-+    return Component.extend(Wrapper).extend({
-+        defaults: {
-+            template: 'Magento_Paypal/payment/paypal-express-in-context',
-+            validationElements: 'input'
-+        },
-+
-+        /**
-+         * Listens element on change and validate it.
-+         *
-+         * @param {HTMLElement} context
-+         */
-+        initListeners: function (context) {
-+            $.async(this.validationElements, context, function (element) {
-+                $(element).on('change', function () {
-+                    this.validate();
-+                }.bind(this));
-+            }.bind(this));
-+        },
-+
-+        /**
-+         *  Validates Smart Buttons
-+         */
-+        validate: function () {
-+            this._super();
-+
-+            if (this.actions) {
-+                additionalValidators.validate(true) ? this.actions.enable() : this.actions.disable();
-+            }
-+        },
- 
--            /**
--             * @returns {Object}
--             */
--            initClient: function () {
--                var selector = '#' + this.getButtonId();
-+        /** @inheritdoc */
-+        beforePayment: function (resolve, reject) {
-+            var promise = $.Deferred();
- 
--                _.each(this.clientConfig, function (fn, name) {
--                    if (typeof fn === 'function') {
--                        this.clientConfig[name] = fn.bind(this);
--                    }
--                }, this);
-+            setPaymentMethod(this.messageContainer).done(function () {
-+                return promise.resolve();
-+            }).fail(function (response) {
-+                var error;
- 
--                if (!clientInit) {
--                    domObserver.get(selector, function () {
--                        paypalExpressCheckout.checkout.setup(this.merchantId, this.clientConfig);
--                        clientInit = true;
--                        domObserver.off(selector);
--                    }.bind(this));
--                } else {
--                    domObserver.get(selector, function () {
--                        $(selector).on('click', this.clientConfig.click);
--                        domObserver.off(selector);
--                    }.bind(this));
-+                try {
-+                    error = JSON.parse(response.responseText);
-+                } catch (exception) {
-+                    error = this.paymentActionError;
-                 }
- 
--                return this;
--            },
--
--            /**
--             * @returns {String}
--             */
--            getButtonId: function () {
--                return this.inContextId;
--            }
--        });
--    }
--);
-+                this.addError(error);
-+
-+                return reject(new Error(error));
-+            }.bind(this));
-+
-+            return promise;
-+        },
-+
-+        /**
-+         * Populate client config with all required data
-+         *
-+         * @return {Object}
-+         */
-+        prepareClientConfig: function () {
-+            this._super();
-+            this.clientConfig.quoteId = window.checkoutConfig.quoteData['entity_id'];
-+            this.clientConfig.customerId = window.customerData.id;
-+            this.clientConfig.merchantId = this.merchantId;
-+            this.clientConfig.button = 0;
-+            this.clientConfig.commit = true;
-+
-+            return this.clientConfig;
-+        },
-+
-+        /**
-+         * Adding logic to be triggered onClick action for smart buttons component
-+         */
-+        onClick: function () {
-+            additionalValidators.validate();
-+            this.selectPaymentMethod();
-+        },
-+
-+        /**
-+         * Adds error message
-+         *
-+         * @param {String} message
-+         */
-+        addError: function (message) {
-+            messageList.addErrorMessage({
-+                message: message
-+            });
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js
-index 786f1a5aa85..24d06b7d0f8 100644
---- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js
-+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js
-@@ -79,7 +79,10 @@ define([
-         placeOrder: function () {
-             var self = this;
- 
--            if (this.validateHandler() && additionalValidators.validate()) {
-+            if (this.validateHandler() &&
-+                additionalValidators.validate() &&
-+                this.isPlaceOrderActionAllowed() === true
-+            ) {
-                 this.isPlaceOrderActionAllowed(false);
-                 fullScreenLoader.startLoader();
-                 $.when(
-diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro/vault.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro/vault.js
-index d0d72bf7dcd..a0f3d3867fe 100644
---- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro/vault.js
-+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro/vault.js
-@@ -2,12 +2,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--/*browser:true*/
--/*global define*/
-+
- define([
--    'jquery',
-     'Magento_Vault/js/view/payment/method-renderer/vault'
--], function ($, VaultComponent) {
-+], function (VaultComponent) {
-     'use strict';
- 
-     return VaultComponent.extend({
-diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-abstract.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-abstract.js
-index d038f08c348..b01d0454b55 100644
---- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-abstract.js
-+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-abstract.js
-@@ -15,7 +15,7 @@ define([
- 
-     return Component.extend({
-         defaults: {
--            template: 'Magento_Paypal/payment/paypal-express-bml',
-+            template: 'Magento_Paypal/payment/payflow-express-bml',
-             billingAgreement: ''
-         },
- 
-diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-bml.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-bml.js
-deleted file mode 100644
-index 561b3c0e971..00000000000
---- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-bml.js
-+++ /dev/null
-@@ -1,16 +0,0 @@
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--define([
--    'Magento_Paypal/js/view/payment/method-renderer/paypal-express-abstract'
--], function (Component) {
--    'use strict';
--
--    return Component.extend({
--        defaults: {
--            template: 'Magento_Paypal/payment/paypal-express-bml'
--        }
--    });
--});
-diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/paypal-payments.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/paypal-payments.js
-index 9eae0dfb45e..1628bbed8f1 100644
---- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/paypal-payments.js
-+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/paypal-payments.js
-@@ -19,10 +19,6 @@ define([
-             component: paypalExpress,
-             config: window.checkoutConfig.payment.paypalExpress.inContextConfig
-         },
--        {
--            type: 'paypal_express_bml',
--            component: 'Magento_Paypal/js/view/payment/method-renderer/paypal-express-bml'
--        },
-         {
-             type: 'payflow_express',
-             component: 'Magento_Paypal/js/view/payment/method-renderer/payflow-express'
-diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/review/actions/iframe.js b/app/code/Magento/Paypal/view/frontend/web/js/view/review/actions/iframe.js
-index e181faf56e3..09dffc73baa 100644
---- a/app/code/Magento/Paypal/view/frontend/web/js/view/review/actions/iframe.js
-+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/review/actions/iframe.js
-@@ -8,9 +8,8 @@
-  */
- define([
-     'uiComponent',
--    'ko',
-     'Magento_Paypal/js/model/iframe'
--], function (Component, ko, iframe) {
-+], function (Component, iframe) {
-     'use strict';
- 
-     return Component.extend({
-diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
-index f1b14831bab..d6fb2f3e6fc 100644
---- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
-+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
-@@ -58,6 +58,7 @@
-             </div>
-             <!-- /ko -->
-         </form>
-+
-         <div class="checkout-agreements-block">
-             <!-- ko foreach: $parent.getRegion('before-place-order') -->
-                 <!-- ko template: getTemplate() --><!-- /ko -->
-diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
-deleted file mode 100644
-index 0f042824fe8..00000000000
---- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
-+++ /dev/null
-@@ -1,52 +0,0 @@
--<!--
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
---->
--<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
--    <div class="payment-method-title field choice">
--        <input type="radio"
--               name="payment[method]"
--               class="radio"
--               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
--        <label data-bind="attr: {'for': getCode()}" class="label">
--            <!-- PayPal Logo -->
--            <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-medium.png"
--                 data-bind="attr: {alt: $t('Acceptance Mark')}"
--                 class="payment-icon"/>
--            <!-- PayPal Logo -->
--            <span data-bind="text: getTitle()"></span>
--            <a href="https://www.securecheckout.billmelater.com/paycapture-content/fetch?hash=AU826TU8&content=/bmlweb/ppwpsiw.html"
--               data-bind="click: showAcceptanceWindow"
--               class="action action-help">
--                <!-- ko i18n: 'See terms' --><!-- /ko -->
--            </a>
--        </label>
--    </div>
--    <div class="payment-method-content">
--        <!-- ko foreach: getRegion('messages') -->
--        <!-- ko template: getTemplate() --><!-- /ko -->
--        <!--/ko-->
--        <fieldset class="fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
--            <div class="payment-method-note">
--                <!-- ko i18n: 'You will be redirected to the PayPal website when you place an order.' --><!-- /ko -->
--            </div>
--        </fieldset>
--        <div class="checkout-agreements-block">
--            <!-- ko foreach: $parent.getRegion('before-place-order') -->
--                <!-- ko template: getTemplate() --><!-- /ko -->
--            <!--/ko-->
--        </div>
--        <div class="actions-toolbar">
--            <div class="primary">
--                <button class="action primary checkout"
--                        type="submit"
--                        data-bind="click: continueToPayPal, enable: (getCode() == isChecked())"
--                        disabled>
--                    <span data-bind="i18n: 'Continue to PayPal'"></span>
--                </button>
--            </div>
--        </div>
--    </div>
--</div>
-diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
-index 562243decaa..5f321832523 100644
---- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
-+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
-@@ -4,41 +4,32 @@
-  * See COPYING.txt for license details.
-  */
- -->
--<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
-+<div class="payment-method" css="_active: getCode() == isChecked()" afterRender="initListeners">
-     <div class="payment-method-title field choice">
-         <input type="radio"
-                name="payment[method]"
-                class="radio"
--               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
--        <label data-bind="attr: {'for': getCode()}" class="label">
-+               attr="id: getCode()"
-+               ko-value="getCode()"
-+               ko-checked="isChecked"
-+               click="selectPaymentMethod"
-+               visible="isRadioButtonVisible()"/>
-+        <label attr="for: getCode()" class="label">
-             <!-- PayPal Logo -->
--            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark')}" class="payment-icon"/>
-+            <img attr="src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark')" class="payment-icon"/>
-             <!-- PayPal Logo -->
--            <span data-bind="text: getTitle()"></span>
--            <a data-bind="attr: {href: getPaymentAcceptanceMarkHref()}, click: showAcceptanceWindow"
--               class="action action-help">
--                <!-- ko i18n: 'What is PayPal?' --><!-- /ko -->
--            </a>
-+            <span text="getTitle()"/>
-+            <a class="action action-help"
-+               attr="href: getPaymentAcceptanceMarkHref()"
-+               click="showAcceptanceWindow"
-+               translate="'What is PayPal?'"/>
-         </label>
-     </div>
-     <div class="payment-method-content">
--        <!-- ko foreach: getRegion('messages') -->
--        <!-- ko template: getTemplate() --><!-- /ko -->
--        <!--/ko-->
-+        <each args="getRegion('messages')" render=""/>
-         <div class="checkout-agreements-block">
--            <!-- ko foreach: $parent.getRegion('before-place-order') -->
--                <!-- ko template: getTemplate() --><!-- /ko -->
--            <!--/ko-->
--        </div>
--        <div class="actions-toolbar">
--            <div class="primary">
--                <button class="action primary checkout"
--                        type="submit"
--                        data-bind="enable: (getCode() == isChecked()), attr: {id: getButtonId()}"
--                        disabled>
--                    <span data-bind="i18n: 'Continue to PayPal'"></span>
--                </button>
--            </div>
-+            <each args="$parent.getRegion('before-place-order')" render=""/>
-         </div>
-+        <div class="actions-toolbar" attr="id: getButtonId()" afterRender="renderPayPalButtons"/>
-     </div>
- </div>
-diff --git a/app/code/Magento/PaypalCaptcha/LICENSE.txt b/app/code/Magento/PaypalCaptcha/LICENSE.txt
-new file mode 100644
-index 00000000000..49525fd99da
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/LICENSE.txt
-@@ -0,0 +1,48 @@
-+
-+Open Software License ("OSL") v. 3.0
-+
-+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-+
-+Licensed under the Open Software License version 3.0
-+
-+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-+
-+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-+
-+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-+
-+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
-+
-+         4. to perform the Original Work publicly; and
-+
-+         5. to display the Original Work publicly. 
-+
-+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-+
-+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-+
-+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-+
-+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-+
-+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-+
-+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-+
-+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-+
-+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-+
-+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-+
-+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-+
-+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-+
-+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-+
-+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-+
-+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
-\ No newline at end of file
-diff --git a/app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt b/app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt
-new file mode 100644
-index 00000000000..f39d641b18a
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt
-@@ -0,0 +1,48 @@
-+
-+Academic Free License ("AFL") v. 3.0
-+
-+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-+
-+Licensed under the Academic Free License version 3.0
-+
-+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-+
-+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-+
-+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-+
-+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
-+
-+         4. to perform the Original Work publicly; and
-+
-+         5. to display the Original Work publicly.
-+
-+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-+
-+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-+
-+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-+
-+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-+
-+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-+
-+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-+
-+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-+
-+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-+
-+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-+
-+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-+
-+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-+
-+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-+
-+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-+
-+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
-diff --git a/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php b/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php
-new file mode 100644
-index 00000000000..289a1631ed1
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php
-@@ -0,0 +1,135 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalCaptcha\Model\Checkout;
-+
-+use Magento\Captcha\Helper\Data;
-+use Magento\Captcha\Model\CaptchaInterface;
-+use Magento\Checkout\Model\ConfigProviderInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Configuration provider for Captcha rendering.
-+ */
-+class ConfigProviderPayPal implements ConfigProviderInterface
-+{
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var Data
-+     */
-+    private $captchaData;
-+
-+    /**
-+     * @var string
-+     */
-+    private static $formId = 'co-payment-form';
-+
-+    /**
-+     * @param StoreManagerInterface $storeManager
-+     * @param Data $captchaData
-+     */
-+    public function __construct(
-+        StoreManagerInterface $storeManager,
-+        Data $captchaData
-+    ) {
-+        $this->storeManager = $storeManager;
-+        $this->captchaData = $captchaData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getConfig(): array
-+    {
-+        $config['captchaPayments'][self::$formId] = [
-+            'isCaseSensitive' => $this->isCaseSensitive(self::$formId),
-+            'imageHeight' => $this->getImageHeight(self::$formId),
-+            'imageSrc' => $this->getImageSrc(self::$formId),
-+            'refreshUrl' => $this->getRefreshUrl(),
-+            'isRequired' => $this->isRequired(self::$formId),
-+            'timestamp' => time()
-+        ];
-+
-+        return $config;
-+    }
-+
-+    /**
-+     * Returns is captcha case sensitive
-+     *
-+     * @param string $formId
-+     * @return bool
-+     */
-+    private function isCaseSensitive(string $formId): bool
-+    {
-+        return (bool)$this->getCaptchaModel($formId)->isCaseSensitive();
-+    }
-+
-+    /**
-+     * Returns captcha image height
-+     *
-+     * @param string $formId
-+     * @return int
-+     */
-+    private function getImageHeight(string $formId): int
-+    {
-+        return (int)$this->getCaptchaModel($formId)->getHeight();
-+    }
-+
-+    /**
-+     * Returns captcha image source path
-+     *
-+     * @param string $formId
-+     * @return string
-+     */
-+    private function getImageSrc(string $formId): string
-+    {
-+        if ($this->isRequired($formId)) {
-+            $captcha = $this->getCaptchaModel($formId);
-+            $captcha->generate();
-+            return $captcha->getImgSrc();
-+        }
-+
-+        return '';
-+    }
-+
-+    /**
-+     * Returns URL to controller action which returns new captcha image
-+     *
-+     * @return string
-+     */
-+    private function getRefreshUrl(): string
-+    {
-+        $store = $this->storeManager->getStore();
-+        return $store->getUrl('captcha/refresh', ['_secure' => $store->isCurrentlySecure()]);
-+    }
-+
-+    /**
-+     * Whether captcha is required to be inserted to this form
-+     *
-+     * @param string $formId
-+     * @return bool
-+     */
-+    private function isRequired(string $formId): bool
-+    {
-+        return (bool)$this->getCaptchaModel($formId)->isRequired();
-+    }
-+
-+    /**
-+     * Return captcha model for specified form
-+     *
-+     * @param string $formId
-+     * @return CaptchaInterface
-+     */
-+    private function getCaptchaModel(string $formId): CaptchaInterface
-+    {
-+        return $this->captchaData->getCaptcha($formId);
-+    }
-+}
-diff --git a/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php b/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php
-new file mode 100644
-index 00000000000..e7cb282b179
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php
-@@ -0,0 +1,76 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalCaptcha\Observer;
-+
-+use Magento\Captcha\Helper\Data;
-+use Magento\Framework\App\Action\Action;
-+use Magento\Framework\Event\Observer;
-+use Magento\Framework\Event\ObserverInterface;
-+use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Framework\App\ActionFlag ;
-+
-+/**
-+ * Validates Captcha for Request Token controller
-+ */
-+class CaptchaRequestToken implements ObserverInterface
-+{
-+    /**
-+     * @var Data
-+     */
-+    private $helper;
-+
-+    /**
-+     * @var Json
-+     */
-+    private $jsonSerializer;
-+
-+    /**
-+     * @var ActionFlag
-+     */
-+    private $actionFlag;
-+
-+    /**
-+     * @param Data $helper
-+     * @param Json $jsonSerializer
-+     * @param ActionFlag $actionFlag
-+     */
-+    public function __construct(Data $helper, Json $jsonSerializer, ActionFlag $actionFlag)
-+    {
-+        $this->helper = $helper;
-+        $this->jsonSerializer = $jsonSerializer;
-+        $this->actionFlag = $actionFlag;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute(Observer $observer)
-+    {
-+        $formId = 'co-payment-form';
-+        $captcha = $this->helper->getCaptcha($formId);
-+
-+        if (!$captcha->isRequired()) {
-+            return;
-+        }
-+
-+        /** @var Action $controller */
-+        $controller = $observer->getControllerAction();
-+        $word = $controller->getRequest()->getPost('captcha_string');
-+        if ($captcha->isCorrect($word)) {
-+            return;
-+        }
-+
-+        $data = $this->jsonSerializer->serialize([
-+            'success' => false,
-+            'error' => true,
-+            'error_messages' => __('Incorrect CAPTCHA.')
-+        ]);
-+        $this->actionFlag->set('', Action::FLAG_NO_DISPATCH, true);
-+        $controller->getResponse()->representJson($data);
-+    }
-+}
-diff --git a/app/code/Magento/PaypalCaptcha/README.md b/app/code/Magento/PaypalCaptcha/README.md
-new file mode 100644
-index 00000000000..71588599a5e
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/README.md
-@@ -0,0 +1 @@
-+The PayPal Captcha module provides a possibility to enable Captcha validation on Payflow Pro payment form.
-\ No newline at end of file
-diff --git a/app/code/Magento/PaypalCaptcha/composer.json b/app/code/Magento/PaypalCaptcha/composer.json
-new file mode 100644
-index 00000000000..e71ef8c0ec7
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/composer.json
-@@ -0,0 +1,30 @@
-+{
-+    "name": "magento/module-paypal-captcha",
-+    "description": "Provides CAPTCHA validation for PayPal Payflow Pro",
-+    "config": {
-+        "sort-packages": true
-+    },
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-captcha": "*",
-+        "magento/module-checkout": "*",
-+        "magento/module-store": "*"
-+    },
-+    "suggest": {
-+        "magento/module-paypal": "*"
-+    },
-+    "type": "magento2-module",
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\PaypalCaptcha\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml b/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml
-new file mode 100644
-index 00000000000..12afd8ceda6
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml
-@@ -0,0 +1,18 @@
-+<?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_Config:etc/system_file.xsd">
-+    <system>
-+        <section id="customer">
-+            <group id="captcha" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
-+                <field id="forms" translate="label comment" type="multiselect" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                    <comment>CAPTCHA for "Create user", "Forgot password", "Payflow Pro" forms is always enabled if chosen.</comment>
-+                </field>
-+            </group>
-+        </section>
-+    </system>
-+</config>
-diff --git a/app/code/Magento/PaypalCaptcha/etc/config.xml b/app/code/Magento/PaypalCaptcha/etc/config.xml
-new file mode 100644
-index 00000000000..133a78a42f7
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/etc/config.xml
-@@ -0,0 +1,30 @@
-+<?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_Store:etc/config.xsd">
-+    <default>
-+        <customer>
-+            <captcha>
-+                <shown_to_logged_in_user>
-+                    <co-payment-form>1</co-payment-form>
-+                </shown_to_logged_in_user>
-+                <always_for>
-+                    <co-payment-form>1</co-payment-form>
-+                </always_for>
-+            </captcha>
-+        </customer>
-+        <captcha translate="label">
-+            <frontend>
-+                <areas>
-+                    <co-payment-form>
-+                        <label>Payflow Pro</label>
-+                    </co-payment-form>
-+                </areas>
-+            </frontend>
-+        </captcha>
-+    </default>
-+</config>
-diff --git a/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml b/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml
-new file mode 100644
-index 00000000000..c236d5ea04c
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\Checkout\Model\CompositeConfigProvider">
-+        <arguments>
-+            <argument name="configProviders" xsi:type="array">
-+                <item name="paypal_captcha_config_provider" xsi:type="object">Magento\PaypalCaptcha\Model\Checkout\ConfigProviderPayPal</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/PaypalCaptcha/etc/frontend/events.xml b/app/code/Magento/PaypalCaptcha/etc/frontend/events.xml
-new file mode 100644
-index 00000000000..ae706c4485d
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/etc/frontend/events.xml
-@@ -0,0 +1,12 @@
-+<?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="controller_action_predispatch_paypal_transparent_requestsecuretoken">
-+        <observer name="captcha_request_token" instance="Magento\PaypalCaptcha\Observer\CaptchaRequestToken"/>
-+    </event>
-+</config>
-diff --git a/app/code/Magento/PaypalCaptcha/etc/module.xml b/app/code/Magento/PaypalCaptcha/etc/module.xml
-new file mode 100644
-index 00000000000..425c829a5d3
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/etc/module.xml
-@@ -0,0 +1,15 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_PaypalCaptcha" >
-+        <sequence>
-+            <module name="Magento_Captcha"/>
-+            <module name="Magento_Paypal"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/app/code/Magento/PaypalCaptcha/registration.php b/app/code/Magento/PaypalCaptcha/registration.php
-new file mode 100644
-index 00000000000..4dac0582a6d
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/registration.php
-@@ -0,0 +1,9 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use \Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_PaypalCaptcha', __DIR__);
-diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/PaypalCaptcha/view/frontend/layout/checkout_index_index.xml
-new file mode 100644
-index 00000000000..9837068faab
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/view/frontend/layout/checkout_index_index.xml
-@@ -0,0 +1,56 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <body>
-+        <referenceBlock name="checkout.root">
-+            <arguments>
-+                <argument name="jsLayout" xsi:type="array">
-+                    <item name="components" xsi:type="array">
-+                        <item name="checkout" xsi:type="array">
-+                            <item name="children" xsi:type="array">
-+                                <item name="steps" xsi:type="array">
-+                                    <item name="children" xsi:type="array">
-+                                        <item name="billing-step" xsi:type="array">
-+                                            <item name="children" xsi:type="array">
-+                                                <item name="payment" xsi:type="array">
-+                                                    <item name="children" xsi:type="array">
-+                                                        <item name="payments-list" xsi:type="array">
-+                                                            <item name="children" xsi:type="array">
-+                                                                <item name="paypal-captcha" xsi:type="array">
-+                                                                    <item name="component" xsi:type="string">uiComponent</item>
-+                                                                    <item name="displayArea" xsi:type="string">paypal-captcha</item>
-+                                                                    <item name="dataScope" xsi:type="string">paypal-captcha</item>
-+                                                                    <item name="provider" xsi:type="string">checkoutProvider</item>
-+                                                                    <item name="config" xsi:type="array">
-+                                                                        <item name="template" xsi:type="string">Magento_Checkout/payment/before-place-order</item>
-+                                                                    </item>
-+                                                                    <item name="children" xsi:type="array">
-+                                                                        <item name="captcha" xsi:type="array">
-+                                                                            <item name="component" xsi:type="string">Magento_PaypalCaptcha/js/view/checkout/paymentCaptcha</item>
-+                                                                            <item name="displayArea" xsi:type="string">paypal-captcha</item>
-+                                                                            <item name="formId" xsi:type="string">co-payment-form</item>
-+                                                                            <item name="configSource" xsi:type="string">checkoutConfig</item>
-+                                                                        </item>
-+                                                                    </item>
-+                                                                </item>
-+                                                            </item>
-+                                                        </item>
-+                                                    </item>
-+                                                </item>
-+                                            </item>
-+                                        </item>
-+                                    </item>
-+                                </item>
-+                            </item>
-+                        </item>
-+                    </item>
-+                </argument>
-+            </arguments>
-+        </referenceBlock>
-+    </body>
-+</page>
-diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js b/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js
-new file mode 100644
-index 00000000000..78e7add4ec6
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js
-@@ -0,0 +1,14 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+var config = {
-+    config: {
-+        mixins: {
-+            'Magento_Checkout/js/view/payment/list': {
-+                'Magento_PaypalCaptcha/js/view/payment/list-mixin': true
-+            }
-+        }
-+    }
-+};
-diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js
-new file mode 100644
-index 00000000000..f8f119e3b33
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js
-@@ -0,0 +1,44 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'jquery',
-+    'Magento_Captcha/js/view/checkout/defaultCaptcha',
-+    'Magento_Captcha/js/model/captchaList',
-+    'Magento_Captcha/js/model/captcha'
-+],
-+function ($, defaultCaptcha, captchaList, Captcha) {
-+    'use strict';
-+
-+    return defaultCaptcha.extend({
-+
-+        /** @inheritdoc */
-+        initialize: function () {
-+            var captchaConfigPayment,
-+                currentCaptcha;
-+
-+            this._super();
-+
-+            if (window[this.configSource] && window[this.configSource].captchaPayments) {
-+                captchaConfigPayment = window[this.configSource].captchaPayments;
-+
-+                $.each(captchaConfigPayment, function (formId, captchaData) {
-+                    var captcha;
-+
-+                    captchaData.formId = formId;
-+                    captcha = Captcha(captchaData);
-+                    captchaList.add(captcha);
-+                });
-+            }
-+
-+            currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
-+
-+            if (currentCaptcha != null) {
-+                currentCaptcha.setIsVisible(true);
-+                this.setCurrentCaptcha(currentCaptcha);
-+            }
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
-new file mode 100644
-index 00000000000..60172f696e9
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
-@@ -0,0 +1,54 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'jquery',
-+    'Magento_Captcha/js/model/captchaList'
-+], function ($, captchaList) {
-+    'use strict';
-+
-+    var mixin = {
-+
-+        formId: 'co-payment-form',
-+
-+        /**
-+         * Sets custom template for Payflow Pro
-+         *
-+         * @param {Object} payment
-+         * @returns {Object}
-+         */
-+        createComponent: function (payment) {
-+
-+            var component = this._super(payment);
-+
-+            if (component.component === 'Magento_Paypal/js/view/payment/method-renderer/payflowpro-method') {
-+                component.template = 'Magento_PaypalCaptcha/payment/payflowpro-form';
-+                $(window).off('clearTimeout')
-+                    .on('clearTimeout', this.clearTimeout.bind(this));
-+            }
-+
-+            return component;
-+        },
-+
-+        /**
-+         * Overrides default window.clearTimeout() to catch errors from iframe and reload Captcha.
-+         */
-+        clearTimeout: function () {
-+            var captcha = captchaList.getCaptchaByFormId(this.formId);
-+
-+            if (captcha !== null) {
-+                captcha.refresh();
-+            }
-+            clearTimeout();
-+        }
-+    };
-+
-+    /**
-+     * Overrides `Magento_Checkout/js/view/payment/list::createComponent`
-+     */
-+    return function (target) {
-+        return target.extend(mixin);
-+    };
-+});
-diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html b/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html
-new file mode 100644
-index 00000000000..fec5cf96b03
---- /dev/null
-+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html
-@@ -0,0 +1,90 @@
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
-+    <div class="payment-method-title field choice">
-+        <input type="radio"
-+               name="payment[method]"
-+               class="radio"
-+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
-+        <label class="label" data-bind="attr: {'for': getCode()}">
-+            <span data-bind="text: getTitle()"></span>
-+        </label>
-+    </div>
-+
-+    <div class="payment-method-content">
-+        <!-- ko foreach: getRegion('messages') -->
-+        <!-- ko template: getTemplate() --><!-- /ko -->
-+        <!--/ko-->
-+        <div class="payment-method-billing-address">
-+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
-+            <!-- ko template: getTemplate() --><!-- /ko -->
-+            <!--/ko-->
-+        </div>
-+        <iframe width="0"
-+                height="0"
-+                data-bind="src: getSource(), attr: {id: getCode() + '-transparent-iframe', 'data-container': getCode() + '-transparent-iframe'}"
-+                allowtransparency="true"
-+                frameborder="0"
-+                name="iframeTransparent"
-+                class="payment-method-iframe">
-+        </iframe>
-+        <form class="form" id="co-transparent-form" action="#" method="post" data-bind="mageInit: {
-+            'transparent':{
-+                'context': context(),
-+                'controller': getControllerName(),
-+                'gateway': getCode(),
-+                'orderSaveUrl':getPlaceOrderUrl(),
-+                'cgiUrl': getCgiUrl(),
-+                'dateDelim': getDateDelim(),
-+                'cardFieldsMap': getCardFieldsMap(),
-+                'nativeAction': getSaveOrderUrl()
-+            }, 'validation':[]}">
-+
-+            <!-- ko template: 'Magento_Payment/payment/cc-form' --><!-- /ko -->
-+
-+            <!-- ko if: (isVaultEnabled())-->
-+            <div class="field-tooltip-content">
-+                <input type="checkbox"
-+                       name="vault[is_enabled]"
-+                       class="checkbox-inline"
-+                       data-bind="attr: {'id': getCode() + '_enable_vault'}, checked: vaultEnabler.isActivePaymentTokenEnabler"/>
-+                <label class="label" data-bind="attr: {'for': getCode() + '_enable_vault'}">
-+                    <span><!-- ko i18n: 'Save credit card information for future use.'--><!-- /ko --></span>
-+                </label>
-+            </div>
-+            <!-- /ko -->
-+        </form>
-+        <fieldset class="fieldset payment items ccard">
-+            <!-- ko foreach: $parent.getRegion('paypal-captcha') -->
-+                <!-- ko template: getTemplate() --><!-- /ko -->
-+            <!-- /ko -->
-+        </fieldset>
-+
-+
-+        <div class="checkout-agreements-block">
-+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
-+                <!-- ko template: getTemplate() --><!-- /ko -->
-+            <!--/ko-->
-+        </div>
-+        <div class="actions-toolbar">
-+            <div class="primary">
-+                <button data-role="review-save"
-+                        type="submit"
-+                        data-bind="
-+                        attr: {title: $t('Place Order')},
-+                        enable: (getCode() == isChecked()),
-+                        click: placeOrder,
-+                        css: {disabled: !isPlaceOrderActionAllowed()}
-+                        "
-+                        class="action primary checkout"
-+                        disabled>
-+                    <span data-bind="i18n: 'Place Order'"></span>
-+                </button>
-+            </div>
-+        </div>
-+    </div>
-+</div>
-diff --git a/app/code/Magento/PaypalGraphQl/Model/PayflowLinkAdditionalDataProvider.php b/app/code/Magento/PaypalGraphQl/Model/PayflowLinkAdditionalDataProvider.php
-new file mode 100644
-index 00000000000..2bd10f474bf
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/Model/PayflowLinkAdditionalDataProvider.php
-@@ -0,0 +1,67 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model;
-+
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\Url\Validator as UrlValidator;
-+use Magento\Paypal\Model\Config;
-+use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderInterface;
-+
-+/**
-+ * Get payment additional data for Paypal Payflow Link payment
-+ */
-+class PayflowLinkAdditionalDataProvider implements AdditionalDataProviderInterface
-+{
-+    /**
-+     * @var UrlValidator
-+     */
-+    private $urlValidator;
-+
-+    /**
-+     * @param UrlValidator $urlValidator
-+     */
-+    public function __construct(UrlValidator $urlValidator)
-+    {
-+        $this->urlValidator = $urlValidator;
-+    }
-+
-+    /**
-+     * Returns additional data
-+     *
-+     * @param array $data
-+     * @return array
-+     * @throws GraphQlInputException
-+     */
-+    public function getData(array $data): array
-+    {
-+        $additionalData = $data[Config::METHOD_PAYFLOWLINK] ?? [];
-+        $this->validateUrls($additionalData);
-+
-+        return $additionalData;
-+    }
-+
-+    /**
-+     * Validate redirect urls
-+     *
-+     * @param array $data
-+     * @throws GraphQlInputException
-+     */
-+    private function validateUrls(array $data): void
-+    {
-+        $urlKeys = ['cancel_url', 'return_url', 'error_url'];
-+
-+        foreach ($urlKeys as $urlKey) {
-+            if (isset($data[$urlKey])) {
-+                if (!$this->urlValidator->isValid($data[$urlKey])) {
-+                    $errorMessage = $this->urlValidator->getMessages()['invalidUrl'] ?? "Invalid Url.";
-+                    throw new GraphQlInputException(__($errorMessage));
-+                }
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/PaypalGraphQl/Model/PayflowProAdditionalDataProvider.php b/app/code/Magento/PaypalGraphQl/Model/PayflowProAdditionalDataProvider.php
-new file mode 100644
-index 00000000000..ad5828e3455
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/Model/PayflowProAdditionalDataProvider.php
-@@ -0,0 +1,47 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model;
-+
-+use Magento\Framework\Stdlib\ArrayManager;
-+use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderInterface;
-+use Magento\Paypal\Model\Config;
-+
-+/**
-+ * Get payment additional data for Payflow pro payment
-+ */
-+class PayflowProAdditionalDataProvider implements AdditionalDataProviderInterface
-+{
-+
-+    /**
-+     * @var ArrayManager
-+     */
-+    private $arrayManager;
-+
-+    /**
-+     * @param ArrayManager $arrayManager
-+     */
-+    public function __construct(
-+        ArrayManager $arrayManager
-+    ) {
-+        $this->arrayManager = $arrayManager;
-+    }
-+
-+    /**
-+     * Returns additional data
-+     *
-+     * @param array $args
-+     * @return array
-+     */
-+    public function getData(array $args): array
-+    {
-+        if (isset($args[Config::METHOD_PAYFLOWPRO])) {
-+            return $args[Config::METHOD_PAYFLOWPRO];
-+        }
-+        return [];
-+    }
-+}
-diff --git a/app/code/Magento/PaypalGraphQl/Model/Plugin/Resolver/SetPaymentMethodOnCart.php b/app/code/Magento/PaypalGraphQl/Model/Plugin/Resolver/SetPaymentMethodOnCart.php
-new file mode 100644
-index 00000000000..62ed8e0f68b
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/Model/Plugin/Resolver/SetPaymentMethodOnCart.php
-@@ -0,0 +1,130 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Plugin\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Paypal\Model\Express\Checkout\Factory as CheckoutFactory;
-+use Magento\Framework\Stdlib\ArrayManager;
-+use Magento\PaypalGraphQl\Model\Provider\Checkout as CheckoutProvider;
-+use Magento\PaypalGraphQl\Model\Provider\Config as ConfigProvider;
-+
-+/**
-+ * Plugin to perform Paypal-specific logic when setting payment method on cart
-+ */
-+class SetPaymentMethodOnCart
-+{
-+    private const PATH_CODE = 'input/payment_method/code';
-+
-+    private const PATH_ADDITIONAL_DATA = 'input/payment_method/additional_data';
-+
-+    private $allowedPaymentMethodCodes = [];
-+
-+    /**
-+     * @var CheckoutFactory
-+     */
-+    private $checkoutFactory;
-+
-+    /**
-+     * @var ArrayManager
-+     */
-+    private $arrayManager;
-+
-+    /**
-+     * @var CheckoutProvider
-+     */
-+    private $checkoutProvider;
-+
-+    /**
-+     * @var ConfigProvider
-+     */
-+    private $configProvider;
-+
-+    /**
-+     * @param CheckoutFactory $checkoutFactory
-+     * @param ArrayManager $arrayManager
-+     * @param CheckoutProvider $checkoutProvider
-+     * @param ConfigProvider $configProvider
-+     * @param array $allowedPaymentMethodCodes
-+     */
-+    public function __construct(
-+        CheckoutFactory $checkoutFactory,
-+        ArrayManager $arrayManager,
-+        CheckoutProvider $checkoutProvider,
-+        ConfigProvider $configProvider,
-+        array $allowedPaymentMethodCodes = []
-+    ) {
-+        $this->checkoutFactory = $checkoutFactory;
-+        $this->arrayManager = $arrayManager;
-+        $this->checkoutProvider = $checkoutProvider;
-+        $this->configProvider = $configProvider;
-+        $this->allowedPaymentMethodCodes = $allowedPaymentMethodCodes;
-+    }
-+
-+    /**
-+     * Update Paypal payment information on cart
-+     *
-+     * @param ResolverInterface $subject
-+     * @param array $resolvedValue
-+     * @param Field $field
-+     * @param ContextInterface $context
-+     * @param ResolveInfo $info
-+     * @param array|null $value
-+     * @param array|null $args
-+     * @return mixed
-+     * @throws GraphQlInputException
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterResolve(
-+        ResolverInterface $subject,
-+        $resolvedValue,
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        $paymentCode = $this->arrayManager->get(self::PATH_CODE, $args) ?? '';
-+        if (!$this->isAllowedPaymentMethod($paymentCode)) {
-+            return $resolvedValue;
-+        }
-+
-+        $paypalAdditionalData = $this->arrayManager->get(self::PATH_ADDITIONAL_DATA, $args) ?? [];
-+        $payerId = $paypalAdditionalData[$paymentCode]['payer_id'] ?? null;
-+        $token = $paypalAdditionalData[$paymentCode]['token'] ?? null;
-+        $cart = $resolvedValue['cart']['model'];
-+
-+        if ($payerId && $token) {
-+            $config = $this->configProvider->getConfig($paymentCode);
-+            $checkout = $this->checkoutProvider->getCheckout($config, $cart);
-+
-+            try {
-+                $checkout->returnFromPaypal($token, $payerId);
-+            } catch (LocalizedException $e) {
-+                throw new GraphQlInputException(__($e->getMessage()));
-+            }
-+        }
-+
-+        return $resolvedValue;
-+    }
-+
-+    /**
-+     * Check if payment method code is one that should be handled by this plugin
-+     *
-+     * @param string $paymentCode
-+     * @return bool
-+     */
-+    private function isAllowedPaymentMethod(string $paymentCode): bool
-+    {
-+        return !empty($paymentCode) && in_array($paymentCode, $this->allowedPaymentMethodCodes);
-+    }
-+}
-diff --git a/app/code/Magento/PaypalGraphQl/Model/Provider/Checkout.php b/app/code/Magento/PaypalGraphQl/Model/Provider/Checkout.php
-new file mode 100644
-index 00000000000..d01d6117319
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/Model/Provider/Checkout.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Provider;
-+
-+use Magento\Paypal\Model\AbstractConfig;
-+use Magento\Paypal\Model\Express\Checkout as ExpressCheckout;
-+use Magento\Paypal\Model\Express\Checkout\Factory as CheckoutFactory;
-+use Magento\Quote\Api\Data\CartInterface;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+
-+/**
-+ * Provides correct Checkout instance for payment method
-+ */
-+class Checkout
-+{
-+    /**
-+     * @var array
-+     */
-+    private $checkoutTypes;
-+
-+    /**
-+     * @var CheckoutFactory
-+     */
-+    private $checkoutFactory;
-+
-+    /**
-+     * @param CheckoutFactory $checkoutFactory
-+     * @param array $checkoutTypes
-+     */
-+    public function __construct(
-+        CheckoutFactory $checkoutFactory,
-+        array $checkoutTypes
-+    ) {
-+        $this->checkoutFactory = $checkoutFactory;
-+        $this->checkoutTypes = $checkoutTypes;
-+    }
-+
-+    /**
-+     * Get Checkout model by payment method code
-+     *
-+     * @param AbstractConfig $config
-+     * @param CartInterface $cart
-+     * @return ExpressCheckout
-+     * @throws GraphQlInputException
-+     */
-+    public function getCheckout(AbstractConfig $config, CartInterface $cart): ExpressCheckout
-+    {
-+        try {
-+            $checkout = $this->checkoutFactory->create(
-+                $this->checkoutTypes[$config->getMethodCode()],
-+                [
-+                    'params' => [
-+                        'quote' => $cart,
-+                        'config' => $config,
-+                    ],
-+                ]
-+            );
-+        } catch (\Exception $e) {
-+            throw new GraphQlInputException(__('The requested Payment Method is not available.'));
-+        }
-+
-+        return $checkout;
-+    }
-+}
-diff --git a/app/code/Magento/PaypalGraphQl/Model/Provider/Config.php b/app/code/Magento/PaypalGraphQl/Model/Provider/Config.php
-new file mode 100644
-index 00000000000..db31e903e95
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/Model/Provider/Config.php
-@@ -0,0 +1,65 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Provider;
-+
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Paypal\Model\AbstractConfig;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+
-+/**
-+ * Provides correct Config instance for payment method
-+ */
-+class Config
-+{
-+    /**
-+     * @var array
-+     */
-+    private $configTypes;
-+
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @param ObjectManagerInterface $objectManager
-+     * @param array $configTypes
-+     */
-+    public function __construct(
-+        ObjectManagerInterface $objectManager,
-+        array $configTypes
-+    ) {
-+        $this->objectManager = $objectManager;
-+        $this->configTypes = $configTypes;
-+    }
-+
-+    /**
-+     * Get Config model by payment method code
-+     *
-+     * @param string $paymentMethod
-+     * @return AbstractConfig
-+     * @throws GraphQlInputException
-+     */
-+    public function getConfig(string $paymentMethod): AbstractConfig
-+    {
-+        //validate code string
-+        if (empty($this->configTypes[$paymentMethod]) || !class_exists($this->configTypes[$paymentMethod])) {
-+            throw new GraphQlInputException(__('The requested Payment Method is not available.'));
-+        }
-+
-+        /** @var AbstractConfig $config */
-+        $config = $this->objectManager->get($this->configTypes[$paymentMethod]);
-+        $config->setMethod($paymentMethod);
-+
-+        if (!$config->isMethodAvailable($paymentMethod)) {
-+            throw new GraphQlInputException(__('The requested Payment Method is not available.'));
-+        }
-+
-+        return $config;
-+    }
-+}
-diff --git a/app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowLinkToken.php b/app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowLinkToken.php
-new file mode 100644
-index 00000000000..ffc8fb68a3f
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowLinkToken.php
-@@ -0,0 +1,151 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Payment\Helper\Data as PaymentDataHelper;
-+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\Sales\Model\Order;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
-+
-+/**
-+ * Resolver to pull PayflowLink payment information from pending order
-+ */
-+class PayflowLinkToken implements ResolverInterface
-+{
-+    /**
-+     * @var MaskedQuoteIdToQuoteIdInterface
-+     */
-+    private $maskedQuoteIdToQuoteId;
-+
-+    /**
-+     * @var PaymentDataHelper
-+     */
-+    private $paymentDataHelper;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var CollectionFactoryInterface
-+     */
-+    private $orderCollectionFactory;
-+
-+    /**
-+     * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
-+     * @param PaymentDataHelper $paymentDataHelper
-+     * @param StoreManagerInterface $storeManager
-+     * @param CollectionFactoryInterface $orderCollectionFactory
-+     */
-+    public function __construct(
-+        MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
-+        PaymentDataHelper $paymentDataHelper,
-+        StoreManagerInterface $storeManager,
-+        CollectionFactoryInterface $orderCollectionFactory
-+    ) {
-+        $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
-+        $this->paymentDataHelper = $paymentDataHelper;
-+        $this->storeManager = $storeManager;
-+        $this->orderCollectionFactory = $orderCollectionFactory;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        $customerId = $context->getUserId();
-+        $maskedCartId = $args['input']['cart_id'] ?? '';
-+        try {
-+            $cartId = $this->maskedQuoteIdToQuoteId->execute($maskedCartId);
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+        }
-+
-+        $order = $this->getOrderFromQuoteId($cartId, $customerId);
-+        $payment = $order->getPayment();
-+        $paymentAdditionalInformation = $payment->getAdditionalInformation();
-+
-+        return [
-+            'mode' => $this->getPaymentMode($payment),
-+            'paypal_url' => $this->getPayflowLinkUrl($payment),
-+            'secure_token' => $paymentAdditionalInformation['secure_token'],
-+            'secure_token_id' => $paymentAdditionalInformation['secure_token_id'],
-+        ];
-+    }
-+
-+    /**
-+     * Retrieve an order from its corresponding quote id
-+     *
-+     * @param int $quoteId
-+     * @param int $customerId
-+     * @return Order
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    private function getOrderFromQuoteId(int $quoteId, int $customerId): Order
-+    {
-+        $storeId = (int)$this->storeManager->getStore()->getId();
-+
-+        $orderCollection = $this->orderCollectionFactory->create($customerId ?? null);
-+        $orderCollection->addFilter(Order::QUOTE_ID, $quoteId);
-+        $orderCollection->addFilter(Order::STATUS, Order::STATE_PENDING_PAYMENT);
-+        $orderCollection->addFilter(Order::STORE_ID, $storeId);
-+
-+        if ($orderCollection->getTotalCount() !== 1) {
-+            throw new GraphQlNoSuchEntityException(__('Could not find payment information for cart.'));
-+        }
-+        /** @var Order $order */
-+        $order = $orderCollection->getFirstItem();
-+
-+        return $order;
-+    }
-+
-+    /**
-+     * Get payment mode based on sandbox flag
-+     *
-+     * @param Payment $payment
-+     * @return string
-+     */
-+    private function getPaymentMode(Payment $payment): string
-+    {
-+        $sandboxFlag = $this->paymentDataHelper
-+            ->getMethodInstance($payment->getMethod())
-+            ->getConfigData('sandbox_flag');
-+
-+        return $sandboxFlag ? 'TEST' : 'LIVE';
-+    }
-+
-+    /**
-+     * Get Payflow Link url
-+     *
-+     * @param Payment $payment
-+     * @return string
-+     */
-+    private function getPayflowLinkUrl(Payment $payment): string
-+    {
-+        $configField = 'cgi_url';
-+        if ($this->getPaymentMode($payment) === 'TEST') {
-+            $configField = 'cgi_url_test_mode';
-+        }
-+
-+        return $this->paymentDataHelper->getMethodInstance($payment->getMethod())->getConfigData($configField);
-+    }
-+}
-diff --git a/app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowProResponse.php b/app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowProResponse.php
-new file mode 100644
-index 00000000000..42a5504de9a
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowProResponse.php
-@@ -0,0 +1,143 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver;
-+
-+use Magento\Paypal\Model\Payflow\Service\Response\Transaction;
-+use Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator;
-+use Magento\Sales\Api\PaymentFailuresInterface;
-+use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Paypal\Model\Payflow\Transparent;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\Stdlib\Parameters;
-+use Magento\Framework\DataObjectFactory;
-+
-+/**
-+ * Resolver for handling PayflowPro response
-+ */
-+class PayflowProResponse implements ResolverInterface
-+{
-+
-+    /**
-+     * @var Transaction
-+     */
-+    private $transaction;
-+
-+    /**
-+     * @var ResponseValidator
-+     */
-+    private $responseValidator;
-+
-+    /**
-+     * @var PaymentFailuresInterface
-+     */
-+    private $paymentFailures;
-+
-+    /**
-+     * @var Json
-+     */
-+    private $json;
-+
-+    /**
-+     * @var Transparent
-+     */
-+    private $transparent;
-+
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var Parameters
-+     */
-+    private $parameters;
-+
-+    /**
-+     * @var DataObjectFactory
-+     */
-+    private $dataObjectFactory;
-+
-+    /**
-+     * PayflowProResponse constructor.
-+     * @param Transaction $transaction
-+     * @param ResponseValidator $responseValidator
-+     * @param PaymentFailuresInterface $paymentFailures
-+     * @param Json $json
-+     * @param Transparent $transparent
-+     * @param GetCartForUser $getCartForUser
-+     * @param Parameters $parameters
-+     * @param DataObjectFactory $dataObjectFactory
-+     */
-+    public function __construct(
-+        Transaction $transaction,
-+        ResponseValidator $responseValidator,
-+        PaymentFailuresInterface $paymentFailures,
-+        Json $json,
-+        Transparent $transparent,
-+        GetCartForUser $getCartForUser,
-+        Parameters $parameters,
-+        DataObjectFactory $dataObjectFactory
-+    ) {
-+        $this->transaction = $transaction;
-+        $this->responseValidator = $responseValidator;
-+        $this->paymentFailures = $paymentFailures;
-+        $this->json = $json;
-+        $this->transparent = $transparent;
-+        $this->getCartForUser = $getCartForUser;
-+        $this->parameters = $parameters;
-+        $this->dataObjectFactory = $dataObjectFactory;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
-+        }
-+
-+        if (!isset($args['input']['paypal_payload']) || empty($args['input']['paypal_payload'])) {
-+            throw new GraphQlInputException(__('Required parameter "paypal_payload" is missing.'));
-+        }
-+
-+        $maskedCartId = $args['input']['cart_id'];
-+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
-+
-+        $paypalPayload = $args['input']['paypal_payload'] ?? '';
-+
-+        // this is a replacement for parse_str()
-+        $this->parameters->fromString(urldecode($paypalPayload));
-+        $data = $this->parameters->toArray();
-+        try {
-+            $do = $this->dataObjectFactory->create(['data' => array_change_key_case($data, CASE_LOWER)]);
-+            $this->responseValidator->validate($do, $this->transparent);
-+            $this->transaction->savePaymentInQuote($do, $cart->getId());
-+        } catch (LocalizedException $exception) {
-+            $parameters['error'] = true;
-+            $parameters['error_msg'] = $exception->getMessage();
-+            $this->paymentFailures->handle((int) $cart->getId(), $parameters['error_msg']);
-+            throw new GraphQlInputException(__($exception->getMessage()));
-+        }
-+        return [
-+            'cart' => [
-+                'model' => $cart,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowProToken.php b/app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowProToken.php
-new file mode 100644
-index 00000000000..64aec1b035c
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowProToken.php
-@@ -0,0 +1,106 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\Url\Validator as UrlValidator;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
-+use Magento\Framework\Exception\LocalizedException;
-+
-+/**
-+ * Resolver for generating PayflowProToken
-+ */
-+class PayflowProToken implements ResolverInterface
-+{
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var UrlValidator
-+     */
-+    private $urlValidator;
-+
-+    /**
-+     * @var SecureToken
-+     */
-+    private $secureTokenService;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param UrlValidator $urlValidator
-+     * @param SecureToken $secureTokenService
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        UrlValidator $urlValidator,
-+        SecureToken $secureTokenService
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->urlValidator = $urlValidator;
-+        $this->secureTokenService = $secureTokenService;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        $cartId = $args['input']['cart_id'] ?? '';
-+        $urls = $args['input']['urls'] ?? null ;
-+
-+        $customerId = $context->getUserId();
-+        $cart = $this->getCartForUser->execute($cartId, $customerId);
-+
-+        if (!empty($args['input']['urls'])) {
-+            $this->validateUrls($args['input']['urls']);
-+        }
-+
-+        try {
-+            $tokenDataObject = $this->secureTokenService->requestToken($cart, $urls);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()));
-+        }
-+
-+        return [
-+            'result'=> $tokenDataObject->getData("result"),
-+            'secure_token' => $tokenDataObject->getData("securetoken"),
-+            'secure_token_id' => $tokenDataObject->getData("securetokenid"),
-+            'response_message' => $tokenDataObject->getData("respmsg"),
-+            'result_code' =>$tokenDataObject->getData("result_code")
-+        ];
-+    }
-+
-+    /**
-+     * Validate redirect Urls
-+     *
-+     * @param array $urls
-+     * @return boolean
-+     * @throws GraphQlInputException
-+     */
-+    private function validateUrls(array $urls): bool
-+    {
-+        foreach ($urls as $url) {
-+            if (!$this->urlValidator->isValid($url)) {
-+                $errorMessage = $this->urlValidator->getMessages()['invalidUrl'] ?? "Invalid Url.";
-+                throw new GraphQlInputException(__($errorMessage));
-+            }
-+        }
-+        return true;
-+    }
-+}
-diff --git a/app/code/Magento/PaypalGraphQl/Model/Resolver/PaypalExpressToken.php b/app/code/Magento/PaypalGraphQl/Model/Resolver/PaypalExpressToken.php
-new file mode 100644
-index 00000000000..0c6449fc9d2
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/Model/Resolver/PaypalExpressToken.php
-@@ -0,0 +1,155 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\Url\Validator as UrlValidator;
-+use Magento\Checkout\Helper\Data as CheckoutHelper;
-+use Magento\PaypalGraphQl\Model\Provider\Checkout as CheckoutProvider;
-+use Magento\PaypalGraphQl\Model\Provider\Config as ConfigProvider;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+
-+/**
-+ * Resolver for generating Paypal token
-+ */
-+class PaypalExpressToken implements ResolverInterface
-+{
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var ConfigProvider
-+     */
-+    private $configProvider;
-+
-+    /**
-+     * @var CheckoutProvider
-+     */
-+    private $checkoutProvider;
-+
-+    /**
-+     * @var UrlValidator
-+     */
-+    private $urlValidator;
-+
-+    /**
-+     * @var CheckoutHelper
-+     */
-+    private $checkoutHelper;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param CheckoutProvider $checkoutProvider
-+     * @param ConfigProvider $configProvider
-+     * @param UrlValidator $urlValidator
-+     * @param CheckoutHelper $checkoutHelper
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        CheckoutProvider $checkoutProvider,
-+        ConfigProvider $configProvider,
-+        UrlValidator $urlValidator,
-+        CheckoutHelper $checkoutHelper
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->checkoutProvider = $checkoutProvider;
-+        $this->configProvider = $configProvider;
-+        $this->urlValidator = $urlValidator;
-+        $this->checkoutHelper = $checkoutHelper;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        $cartId = $args['input']['cart_id'] ?? '';
-+        $paymentCode = $args['input']['code'] ?? '';
-+        $usePaypalCredit = isset($args['input']['paypal_credit']) ? $args['input']['paypal_credit'] : false;
-+        $usedExpressButton = isset($args['input']['express_button']) ? $args['input']['express_button'] : false;
-+        $customerId = $context->getUserId();
-+
-+        $cart = $this->getCartForUser->execute($cartId, $customerId);
-+        $config = $this->configProvider->getConfig($paymentCode);
-+        $checkout = $this->checkoutProvider->getCheckout($config, $cart);
-+
-+        if ($cart->getIsMultiShipping()) {
-+            $cart->setIsMultiShipping(0);
-+            $cart->removeAllAddresses();
-+        }
-+        $checkout->setIsBml($usePaypalCredit);
-+
-+        if ($customerId) {
-+            $checkout->setCustomerWithAddressChange(
-+                $cart->getCustomer(),
-+                $cart->getBillingAddress(),
-+                $cart->getShippingAddress()
-+            );
-+        } else {
-+            if (!$this->checkoutHelper->isAllowedGuestCheckout($cart)) {
-+                throw new GraphQlInputException(__("Guest checkout is disabled."));
-+            }
-+        }
-+
-+        if (!empty($args['input']['urls'])) {
-+            $this->validateUrls($args['input']['urls']);
-+        }
-+        $checkout->prepareGiropayUrls(
-+            $args['input']['urls']['success_url'] ?? '',
-+            $args['input']['urls']['cancel_url'] ?? '',
-+            $args['input']['urls']['pending_url'] ?? ''
-+        );
-+
-+        try {
-+            $token = $checkout->start(
-+                $args['input']['urls']['return_url'] ?? '',
-+                $args['input']['urls']['cancel_url'] ?? '',
-+                $usedExpressButton
-+            );
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()));
-+        }
-+
-+        return [
-+            'token' => $token,
-+            'paypal_urls' => [
-+                'start' => $checkout->getRedirectUrl(),
-+                'edit' => $config->getExpressCheckoutEditUrl($token)
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * Validate redirect Urls
-+     *
-+     * @param array $urls
-+     * @return boolean
-+     * @throws GraphQlInputException
-+     */
-+    private function validateUrls(array $urls): bool
-+    {
-+        foreach ($urls as $url) {
-+            if (!$this->urlValidator->isValid($url)) {
-+                $errorMessage = $this->urlValidator->getMessages()['invalidUrl'] ?? "Invalid Url.";
-+                throw new GraphQlInputException(__($errorMessage));
-+            }
-+        }
-+        return true;
-+    }
-+}
-diff --git a/app/code/Magento/PaypalGraphQl/Observer/PayflowLinkSetAdditionalData.php b/app/code/Magento/PaypalGraphQl/Observer/PayflowLinkSetAdditionalData.php
-new file mode 100644
-index 00000000000..dd4ceb925c1
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/Observer/PayflowLinkSetAdditionalData.php
-@@ -0,0 +1,34 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Observer;
-+
-+use Magento\Framework\Event\Observer;
-+use Magento\Payment\Observer\AbstractDataAssignObserver;
-+use Magento\Quote\Api\Data\PaymentInterface;
-+
-+/**
-+ * Set additional data for payflow link payment
-+ */
-+class PayflowLinkSetAdditionalData extends AbstractDataAssignObserver
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute(Observer $observer): void
-+    {
-+        $dataObject = $this->readDataArgument($observer);
-+
-+        $additionalData = $dataObject->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
-+        if (!is_array($additionalData)) {
-+            return;
-+        }
-+
-+        $paymentModel = $this->readPaymentModelArgument($observer);
-+        $paymentModel->setAdditionalInformation($additionalData);
-+    }
-+}
-diff --git a/app/code/Magento/PaypalGraphQl/README.md b/app/code/Magento/PaypalGraphQl/README.md
-new file mode 100644
-index 00000000000..ad583328284
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/README.md
-@@ -0,0 +1,3 @@
-+# PaypalGraphQl
-+
-+**PaypalGraphQl** provides resolver information for using Paypal payment methods via GraphQl.
-diff --git a/app/code/Magento/PaypalGraphQl/composer.json b/app/code/Magento/PaypalGraphQl/composer.json
-new file mode 100644
-index 00000000000..c5bcae51e5a
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/composer.json
-@@ -0,0 +1,34 @@
-+{
-+    "name": "magento/module-paypal-graph-ql",
-+    "description": "GraphQl support for Paypal",
-+    "config": {
-+        "sort-packages": true
-+    },
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-quote": "*",
-+        "magento/module-checkout": "*",
-+        "magento/module-paypal": "*",
-+        "magento/module-quote-graph-ql": "*",
-+        "magento/module-sales": "*",
-+        "magento/module-payment": "*",
-+        "magento/module-store": "*"
-+    },
-+    "suggest": {
-+        "magento/module-graph-ql": "*"
-+    },
-+    "type": "magento2-module",
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\PaypalGraphQl\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml b/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
-new file mode 100644
-index 00000000000..8fa71bb7583
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
-@@ -0,0 +1,48 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\QuoteGraphQl\Model\Resolver\SetPaymentMethodOnCart">
-+        <plugin name="paypal_express_payment_method" type="Magento\PaypalGraphQl\Model\Plugin\Resolver\SetPaymentMethodOnCart"/>
-+    </type>
-+
-+    <type name="Magento\PaypalGraphQl\Model\Plugin\Resolver\SetPaymentMethodOnCart">
-+        <arguments>
-+            <argument name="allowedPaymentMethodCodes" xsi:type="array">
-+                <item name="paypal_express" xsi:type="const">\Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS</item>
-+                <item name="payflow_express" xsi:type="const">\Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\PaypalGraphQl\Model\Provider\Checkout">
-+        <arguments>
-+            <argument name="checkoutTypes" xsi:type="array">
-+                <item name="paypal_express" xsi:type="string">\Magento\Paypal\Model\Express\Checkout</item>
-+                <item name="payflow_express" xsi:type="string">\Magento\Paypal\Model\PayflowExpress\Checkout</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\PaypalGraphQl\Model\Provider\Config">
-+        <arguments>
-+            <argument name="configTypes" xsi:type="array">
-+                <item name="paypal_express" xsi:type="string">\Magento\Paypal\Model\Config</item>
-+                <item name="payflow_express" xsi:type="string">\Magento\Paypal\Model\Config</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+
-+    <type name="Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool">
-+        <arguments>
-+            <argument name="dataProviders" xsi:type="array">
-+                <item name="payflow_link" xsi:type="object">Magento\PaypalGraphQl\Model\PayflowLinkAdditionalDataProvider</item>
-+                <item name="payflowpro" xsi:type="object">\Magento\PaypalGraphQl\Model\PayflowProAdditionalDataProvider</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/PaypalGraphQl/etc/graphql/events.xml b/app/code/Magento/PaypalGraphQl/etc/graphql/events.xml
-new file mode 100644
-index 00000000000..165727fe63e
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/etc/graphql/events.xml
-@@ -0,0 +1,12 @@
-+<?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="payment_method_assign_data_payflow_link">
-+        <observer name="payflow_link_data_assigner" instance="Magento\PaypalGraphQl\Observer\PayflowLinkSetAdditionalData"/>
-+    </event>
-+</config>
-diff --git a/app/code/Magento/PaypalGraphQl/etc/module.xml b/app/code/Magento/PaypalGraphQl/etc/module.xml
-new file mode 100644
-index 00000000000..ae89ef2676a
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/etc/module.xml
-@@ -0,0 +1,16 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_PaypalGraphQl">
-+        <sequence>
-+            <module name="Magento_Quote"/>
-+            <module name="Magento_Paypal"/>
-+            <module name="Magento_QuoteGraphQl"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
-new file mode 100644
-index 00000000000..97b65fb6587
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
-@@ -0,0 +1,115 @@
-+# Copyright © Magento, Inc. All rights reserved.
-+# See COPYING.txt for license details.
-+
-+type Query {
-+    getPayflowLinkToken(input: PayflowLinkTokenInput!): PayflowLinkToken @resolver(class: "\\Magento\\PaypalGraphQl\\Model\\Resolver\\PayflowLinkToken") @doc(description: "Retrieve PayPal payment credentials for Payflow transaction.")
-+}
-+
-+type Mutation {
-+    createPaypalExpressToken(input: PaypalExpressTokenInput!): PaypalExpressToken @resolver(class: "\\Magento\\PaypalGraphQl\\Model\\Resolver\\PaypalExpressToken") @doc(description:"Initiates a PayPal checkout transaction and receives a token.")
-+    createPayflowProToken(input: PayflowProTokenInput!): PayflowProToken @resolver(class: "\\Magento\\PaypalGraphQl\\Model\\Resolver\\PayflowProToken") @doc(description: "Initiates a PayFlowPro transaction and receives a token")
-+    handlePayflowProResponse(input: PayflowProResponseInput!): PayflowProResponseOutput @resolver(class: "\\Magento\\PaypalGraphQl\\Model\\Resolver\\PayflowProResponse") @doc(description: "Handles PayFlowPro response and saves payment in Quote")
-+}
-+
-+input PaypalExpressTokenInput @doc(description:"Defines the attributes required to receive a payment token from PayPal") {
-+    cart_id: String! @doc(description:"The unique ID that identifies the customer's cart")
-+    code: String! @doc(description:"Payment method code")
-+    urls: PaypalExpressUrlsInput! @doc(description:"A set of URLs that PayPal uses to respond to a token request")
-+    use_paypal_credit: Boolean @doc(description: "Indicates whether the buyer clicked the PayPal credit button. The default value is false")
-+    express_button: Boolean @doc(description: "Indicates whether the buyer selected the quick checkout button. The default value is false")
-+}
-+
-+type PaypalExpressToken @doc(description: "Contains the token returned by PayPal and a set of URLs that allow the buyer to authorize payment and adjust checkout details") {
-+    token: String @doc(description:"The token returned by PayPal")
-+    paypal_urls: PaypalExpressUrlList @doc(description:"A set of URLs that allow the buyer to authorize payment and adjust checkout details")
-+}
-+
-+type PayflowLinkToken {
-+    secure_token: String @doc(description:"Secure token generated by PayPal")
-+    secure_token_id: String @doc(description:"Secure token ID generated by PayPal")
-+    mode: PayflowLinkMode @doc(description:"Mode for Payflow transaction")
-+    paypal_url: String @doc(description:"PayPal URL used for requesting Payflow form")
-+}
-+
-+input PaymentMethodAdditionalDataInput {
-+    paypal_express: PaypalExpressInput @doc(description:"Required input for PayPal Express Checkout payments")
-+    payflow_express: PayflowExpressInput @doc(description:"Required input for PayPal Payflow Express Checkout payments")
-+    payflow_link: PayflowLinkAdditionalDataInput @doc(description:"Required input for PayPal Payflow Link payments")
-+    payflowpro: PayflowProInput @doc(description: "Required input type for Paypal payflow pro payments")
-+}
-+
-+input PaypalExpressInput @doc(description:"Required input for PayPal Express Checkout payments") {
-+    payer_id: String! @doc(description:"The unique ID of the PayPal user")
-+    token: String! @doc(description:"The token returned by the createPaypalExpressToken mutation")
-+}
-+
-+input PayflowExpressInput @doc(description:"Required input for PayPal Payflow Express Checkout payments") {
-+    payer_id: String! @doc(description:"The unique ID of the PayPal user")
-+    token: String! @doc(description:"The token returned by the createPaypalExpressToken mutation")
-+}
-+
-+input PaypalExpressUrlsInput @doc(description:"A set of URLs that PayPal uses to respond to a token request") {
-+    return_url: String! @doc(description:"The URL of the final review page on your website where the buyer confirms the order and payment")
-+    cancel_url: String! @doc(description:"The URL of the original page on your website where the buyer initially chose PayPal as a payment type")
-+    success_url: String @doc(description:"The URL to redirect upon success. Not applicable to most PayPal solutions")
-+    pending_url: String @doc(description:"The URL to redirect for a pending transactions. Not applicable to most PayPal solutions")
-+}
-+
-+type PaypalExpressUrlList @doc(description:"A set of URLs that allow the buyer to authorize payment and adjust checkout details") {
-+    start: String @doc(description:"The URL to the PayPal login page")
-+    edit: String @doc(description:"The PayPal URL that allows the buyer to edit their checkout details")
-+}
-+
-+input PayflowLinkAdditionalDataInput {
-+    return_url: String! @doc(description:"The URL PayPal will redirect back to upon payment success")
-+    cancel_url: String! @doc(description:"The URL PayPal will redirect back to upon payment cancellation")
-+    error_url: String! @doc(description:"The URL PayPal will redirect back to upon payment error")
-+}
-+
-+input PayflowLinkTokenInput {
-+    cart_id: String! @doc(description:"The unique ID that identifies the customer's cart")
-+}
-+
-+enum PayflowLinkMode @doc(description:"Mode for Payflow Link payment: TEST or LIVE") {
-+    TEST
-+    LIVE
-+}
-+
-+input PayflowProTokenInput {
-+     cart_id: String! @doc(description:"The unique ID that identifies the customer's cart")
-+     urls: PayflowProUrlInput! @doc(description:"URL that PayPal uses for callback.")
-+}
-+
-+input PayflowProInput {
-+    cc_details: CreditCardDetailsInput! @doc(description: "Required input for credit card related information")
-+}
-+
-+input CreditCardDetailsInput {
-+    cc_type: String! @doc(description: "Credit card type")
-+    cc_exp_year: Int! @doc(description: "Credit card expiration year")
-+    cc_exp_month: Int! @doc(description: "Credit card expiration month")
-+    cc_last_4: Int! @doc(description: "Last 4 digits of the credit card")
-+}
-+
-+input PayflowProUrlInput {
-+    return_url: String! @doc(description:"The URL of the final review page on your website where the buyer confirms the order and payment")
-+    cancel_url: String! @doc(description:"The URL of the original page on your website where the buyer initially chose PayPal as a payment type")
-+    error_url: String! @doc(description:"The URL of the page on your website where any error in the transaction is handled")
-+}
-+
-+type PayflowProToken {
-+    secure_token: String!
-+    secure_token_id: String!
-+    response_message: String!
-+    result: Int!
-+    result_code: Int!
-+}
-+
-+input PayflowProResponseInput {
-+    cart_id: String!
-+    paypal_payload: String!
-+}
-+
-+type PayflowProResponseOutput {
-+    cart: Cart!
-+}
-diff --git a/app/code/Magento/PaypalGraphQl/registration.php b/app/code/Magento/PaypalGraphQl/registration.php
-new file mode 100644
-index 00000000000..2e1676bc087
---- /dev/null
-+++ b/app/code/Magento/PaypalGraphQl/registration.php
-@@ -0,0 +1,9 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use \Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_PaypalGraphQl', __DIR__);
-diff --git a/app/code/Magento/Persistent/Block/Header/Additional.php b/app/code/Magento/Persistent/Block/Header/Additional.php
-index c740f5a3469..dfde2adf1e6 100644
---- a/app/code/Magento/Persistent/Block/Header/Additional.php
-+++ b/app/code/Magento/Persistent/Block/Header/Additional.php
-@@ -5,6 +5,10 @@
-  */
- namespace Magento\Persistent\Block\Header;
- 
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Persistent\Helper\Data;
-+
- /**
-  * Remember Me block
-  *
-@@ -30,20 +34,37 @@ class Additional extends \Magento\Framework\View\Element\Html\Link
-     protected $customerRepository;
- 
-     /**
--     * Constructor
--     *
-+     * @var string
-+     */
-+    protected $_template = 'Magento_Persistent::additional.phtml';
-+
-+    /**
-+     * @var Json
-+     */
-+    private $jsonSerializer;
-+
-+    /**
-+     * @var Data
-+     */
-+    private $persistentHelper;
-+
-+    /**
-      * @param \Magento\Framework\View\Element\Template\Context $context
-      * @param \Magento\Customer\Helper\View $customerViewHelper
-      * @param \Magento\Persistent\Helper\Session $persistentSessionHelper
-      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
-      * @param array $data
-+     * @param Json|null $jsonSerializer
-+     * @param Data|null $persistentHelper
-      */
-     public function __construct(
-         \Magento\Framework\View\Element\Template\Context $context,
-         \Magento\Customer\Helper\View $customerViewHelper,
-         \Magento\Persistent\Helper\Session $persistentSessionHelper,
-         \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
--        array $data = []
-+        array $data = [],
-+        Json $jsonSerializer = null,
-+        Data $persistentHelper = null
-     ) {
-         $this->isScopePrivate = true;
-         $this->_customerViewHelper = $customerViewHelper;
-@@ -51,6 +72,8 @@ class Additional extends \Magento\Framework\View\Element\Html\Link
-         $this->customerRepository = $customerRepository;
-         parent::__construct($context, $data);
-         $this->_isScopePrivate = true;
-+        $this->jsonSerializer = $jsonSerializer ?: ObjectManager::getInstance()->get(Json::class);
-+        $this->persistentHelper = $persistentHelper ?: ObjectManager::getInstance()->get(Data::class);
-     }
- 
-     /**
-@@ -64,17 +87,26 @@ class Additional extends \Magento\Framework\View\Element\Html\Link
-     }
- 
-     /**
--     * Render additional header html
-+     * Get customer id.
-      *
--     * @return string
-+     * @return int
-      */
--    protected function _toHtml()
-+    public function getCustomerId(): int
-     {
--        if ($this->_persistentSessionHelper->getSession()->getCustomerId()) {
--            return '<span><a ' . $this->getLinkAttributes() . ' >' . __('Not you?')
--            . '</a></span>';
--        }
-+        return $this->_persistentSessionHelper->getSession()->getCustomerId();
-+    }
- 
--        return '';
-+    /**
-+     * Get persistent config.
-+     *
-+     * @return string
-+     */
-+    public function getConfig(): string
-+    {
-+        return $this->jsonSerializer->serialize(
-+            [
-+                'expirationLifetime' => $this->persistentHelper->getLifeTime(),
-+            ]
-+        );
-     }
- }
-diff --git a/app/code/Magento/Persistent/CustomerData/Persistent.php b/app/code/Magento/Persistent/CustomerData/Persistent.php
-new file mode 100644
-index 00000000000..5800e4e7aee
---- /dev/null
-+++ b/app/code/Magento/Persistent/CustomerData/Persistent.php
-@@ -0,0 +1,72 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Persistent\CustomerData;
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\CustomerData\SectionSourceInterface;
-+use Magento\Customer\Helper\View;
-+use Magento\Persistent\Helper\Session;
-+
-+/**
-+ * Customer persistent section
-+ */
-+class Persistent implements SectionSourceInterface
-+{
-+    /**
-+     * @var Session
-+     */
-+    private $persistentSession;
-+
-+    /**
-+     * @var View
-+     */
-+    private $customerViewHelper;
-+
-+    /**
-+     * @var CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * @param Session $persistentSession
-+     * @param View $customerViewHelper
-+     * @param CustomerRepositoryInterface $customerRepository
-+     */
-+    public function __construct(
-+        Session $persistentSession,
-+        View $customerViewHelper,
-+        CustomerRepositoryInterface $customerRepository
-+    ) {
-+        $this->persistentSession = $persistentSession;
-+        $this->customerViewHelper = $customerViewHelper;
-+        $this->customerRepository = $customerRepository;
-+    }
-+
-+    /**
-+     * Get data.
-+     *
-+     * @return array
-+     */
-+    public function getSectionData(): array
-+    {
-+        if (!$this->persistentSession->isPersistent()) {
-+            return [];
-+        }
-+
-+        $customerId = $this->persistentSession->getSession()->getCustomerId();
-+        if (!$customerId) {
-+            return [];
-+        }
-+
-+        $customer = $this->customerRepository->getById($customerId);
-+
-+        return [
-+            'fullname' => $this->customerViewHelper->getCustomerName($customer),
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Persistent/Helper/Data.php b/app/code/Magento/Persistent/Helper/Data.php
-index 39a9ce7a8ef..9a547c00324 100644
---- a/app/code/Magento/Persistent/Helper/Data.php
-+++ b/app/code/Magento/Persistent/Helper/Data.php
-@@ -13,6 +13,8 @@ use Magento\Framework\Module\Dir;
- use Magento\Store\Model\ScopeInterface;
- 
- /**
-+ * Helper for persistence
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -136,12 +138,10 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     public function getLifeTime($store = null)
-     {
--        $lifeTime = intval(
--            $this->scopeConfig->getValue(
--                self::XML_PATH_LIFE_TIME,
--                ScopeInterface::SCOPE_STORE,
--                $store
--            )
-+        $lifeTime = (int)$this->scopeConfig->getValue(
-+            self::XML_PATH_LIFE_TIME,
-+            ScopeInterface::SCOPE_STORE,
-+            $store
-         );
-         return $lifeTime < 0 ? 0 : $lifeTime;
-     }
-diff --git a/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php b/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php
-index 2c0259bd12b..2641102ca4d 100644
---- a/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php
-+++ b/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php
-@@ -108,8 +108,8 @@ class GuestPaymentInformationManagementPlugin
-             $this->customerSession->setCustomerId(null);
-             $this->customerSession->setCustomerGroupId(null);
-             $this->quoteManager->convertCustomerCartToGuest();
--            /** @var \Magento\Quote\Api\Data\CartInterface $quote */
--            $quote = $this->cartRepository->get($this->checkoutSession->getQuote()->getId());
-+            $quoteId = $this->checkoutSession->getQuoteId();
-+            $quote = $this->cartRepository->get($quoteId);
-             $quote->setCustomerEmail($email);
-             $quote->getAddressesCollection()->walk('setEmail', ['email' => $email]);
-             $this->cartRepository->save($quote);
-diff --git a/app/code/Magento/Persistent/Model/Observer.php b/app/code/Magento/Persistent/Model/Observer.php
-index 53fe5f95531..81c2870071a 100644
---- a/app/code/Magento/Persistent/Model/Observer.php
-+++ b/app/code/Magento/Persistent/Model/Observer.php
-@@ -86,13 +86,8 @@ class Observer
-      */
-     public function emulateWelcomeBlock($block)
-     {
--        $customerName = $this->_customerViewHelper->getCustomerName(
--            $this->customerRepository->getById($this->_persistentSession->getSession()->getCustomerId())
--        );
-+        $block->setWelcome('&nbsp;');
- 
--        $this->_applyAccountLinksPersistentData();
--        $welcomeMessage = __('Welcome, %1!', $customerName);
--        $block->setWelcome($welcomeMessage);
-         return $this;
-     }
- 
-diff --git a/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php b/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php
-new file mode 100644
-index 00000000000..be8998bc9be
---- /dev/null
-+++ b/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php
-@@ -0,0 +1,43 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Persistent\Model\Plugin;
-+
-+/**
-+ * Plugin for Magento\Framework\App\Http\Context to create new page cache variation for persistent session.
-+ */
-+class PersistentCustomerContext
-+{
-+    /**
-+     * Persistent session.
-+     *
-+     * @var \Magento\Persistent\Helper\Session
-+     */
-+    private $persistentSession;
-+
-+    /**
-+     * @param \Magento\Persistent\Helper\Session $persistentSession
-+     */
-+    public function __construct(
-+        \Magento\Persistent\Helper\Session $persistentSession
-+    ) {
-+        $this->persistentSession = $persistentSession;
-+    }
-+
-+    /**
-+     * Sets appropriate header if customer session is persistent.
-+     *
-+     * @param \Magento\Framework\App\Http\Context $subject
-+     * @return mixed
-+     */
-+    public function beforeGetVaryString(\Magento\Framework\App\Http\Context $subject)
-+    {
-+        if ($this->persistentSession->isPersistent()) {
-+            $subject->setValue('PERSISTENT', 1, 0);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
-index 8937a4920cb..8ae22e4c26c 100644
---- a/app/code/Magento/Persistent/Model/QuoteManager.php
-+++ b/app/code/Magento/Persistent/Model/QuoteManager.php
-@@ -7,6 +7,8 @@ namespace Magento\Persistent\Model;
- 
- /**
-  * Class QuoteManager
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class QuoteManager
- {
-@@ -87,6 +89,7 @@ class QuoteManager
-                 ->setCustomerLastname(null)
-                 ->setCustomerGroupId(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID)
-                 ->setIsPersistent(false)
-+                ->setCustomerIsGuest(true)
-                 ->removeAllAddresses();
-             //Create guest addresses
-             $quote->getShippingAddress();
-@@ -108,8 +111,9 @@ class QuoteManager
-      */
-     public function convertCustomerCartToGuest()
-     {
-+        $quoteId = $this->checkoutSession->getQuoteId();
-         /** @var $quote \Magento\Quote\Model\Quote */
--        $quote = $this->quoteRepository->get($this->checkoutSession->getQuote()->getId());
-+        $quote = $this->quoteRepository->get($quoteId);
-         if ($quote && $quote->getId()) {
-             $this->_setQuotePersistent = false;
-             $quote->setIsActive(true)
-diff --git a/app/code/Magento/Persistent/Model/Session.php b/app/code/Magento/Persistent/Model/Session.php
-index abc344671ab..701b4fc21d2 100644
---- a/app/code/Magento/Persistent/Model/Session.php
-+++ b/app/code/Magento/Persistent/Model/Session.php
-@@ -197,6 +197,7 @@ class Session extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * Serialize info for Resource Model to save
-+     *
-      * For new model check and set available cookie key
-      *
-      * @return $this
-@@ -354,7 +355,7 @@ class Session extends \Magento\Framework\Model\AbstractModel
-         $lifetime = $this->_coreConfig->getValue(
-             \Magento\Persistent\Helper\Data::XML_PATH_LIFE_TIME,
-             'website',
--            intval($websiteId)
-+            (int)$websiteId
-         );
- 
-         if ($lifetime) {
-diff --git a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
-index f3720960ca6..79fdf44c3c5 100644
---- a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
-+++ b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
-@@ -1,6 +1,5 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-@@ -8,6 +7,11 @@ namespace Magento\Persistent\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
- 
-+/**
-+ * Observer of expired session
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ */
- class CheckExpirePersistentQuoteObserver implements ObserverInterface
- {
-     /**
-@@ -107,8 +111,12 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
-             !$this->_persistentSession->isPersistent() &&
-             !$this->_customerSession->isLoggedIn() &&
-             $this->_checkoutSession->getQuoteId() &&
--            !$this->isRequestFromCheckoutPage($this->request)
-+            !$this->isRequestFromCheckoutPage($this->request) &&
-             // persistent session does not expire on onepage checkout page
-+            (
-+                $this->_checkoutSession->getQuote()->getIsPersistent() ||
-+                $this->_checkoutSession->getQuote()->getCustomerIsGuest()
-+            )
-         ) {
-             $this->_eventManager->dispatch('persistent_session_expired');
-             $this->quoteManager->expire();
-diff --git a/app/code/Magento/Persistent/Observer/SetCheckoutSessionPersistentDataObserver.php b/app/code/Magento/Persistent/Observer/SetCheckoutSessionPersistentDataObserver.php
-new file mode 100644
-index 00000000000..e89a09c0d2a
---- /dev/null
-+++ b/app/code/Magento/Persistent/Observer/SetCheckoutSessionPersistentDataObserver.php
-@@ -0,0 +1,90 @@
-+<?php
-+/**
-+ *
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Persistent\Observer;
-+
-+use Magento\Framework\Event\ObserverInterface;
-+
-+/**
-+ * Class SetCheckoutSessionPersistentDataObserver
-+ */
-+class SetCheckoutSessionPersistentDataObserver implements ObserverInterface
-+{
-+    /**
-+     * Persistent session
-+     *
-+     * @var \Magento\Persistent\Helper\Session
-+     */
-+    private $persistentSession = null;
-+
-+    /**
-+     * Customer session
-+     *
-+     * @var \Magento\Customer\Model\Session
-+     */
-+    private $customerSession;
-+
-+    /**
-+     * Persistent data
-+     *
-+     * @var \Magento\Persistent\Helper\Data
-+     */
-+    private $persistentData = null;
-+
-+    /**
-+     * Customer Repository
-+     *
-+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
-+     */
-+    private $customerRepository = null;
-+
-+    /**
-+     * @param \Magento\Persistent\Helper\Session $persistentSession
-+     * @param \Magento\Customer\Model\Session $customerSession
-+     * @param \Magento\Persistent\Helper\Data $persistentData
-+     * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
-+     */
-+    public function __construct(
-+        \Magento\Persistent\Helper\Session $persistentSession,
-+        \Magento\Customer\Model\Session $customerSession,
-+        \Magento\Persistent\Helper\Data $persistentData,
-+        \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
-+    ) {
-+        $this->persistentSession = $persistentSession;
-+        $this->customerSession = $customerSession;
-+        $this->persistentData = $persistentData;
-+        $this->customerRepository = $customerRepository;
-+    }
-+
-+    /**
-+     * Pass customer data from persistent session to checkout session and set quote to be loaded even if not active
-+     *
-+     * @param \Magento\Framework\Event\Observer $observer
-+     * @return void
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function execute(\Magento\Framework\Event\Observer $observer)
-+    {
-+        /** @var $checkoutSession \Magento\Checkout\Model\Session */
-+        $checkoutSession = $observer->getEvent()->getData('checkout_session');
-+        if ($this->persistentData->isShoppingCartPersist() && $this->persistentSession->isPersistent()) {
-+            $checkoutSession->setCustomerData(
-+                $this->customerRepository->getById($this->persistentSession->getSession()->getCustomerId())
-+            );
-+        }
-+        if (!(($this->persistentSession->isPersistent() && !$this->customerSession->isLoggedIn())
-+            && !$this->persistentData->isShoppingCartPersist()
-+        )) {
-+            return;
-+        }
-+        if ($checkoutSession) {
-+            $checkoutSession->setLoadInactive();
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Persistent/Observer/SetLoadPersistentQuoteObserver.php b/app/code/Magento/Persistent/Observer/SetLoadPersistentQuoteObserver.php
-deleted file mode 100644
-index 6eeab94a91c..00000000000
---- a/app/code/Magento/Persistent/Observer/SetLoadPersistentQuoteObserver.php
-+++ /dev/null
-@@ -1,78 +0,0 @@
--<?php
--/**
-- *
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Persistent\Observer;
--
--use Magento\Framework\Event\ObserverInterface;
--
--class SetLoadPersistentQuoteObserver implements ObserverInterface
--{
--    /**
--     * Customer session
--     *
--     * @var \Magento\Customer\Model\Session
--     */
--    protected $_customerSession;
--
--    /**
--     * Checkout session
--     *
--     * @var \Magento\Checkout\Model\Session
--     */
--    protected $_checkoutSession;
--
--    /**
--     * Persistent session
--     *
--     * @var \Magento\Persistent\Helper\Session
--     */
--    protected $_persistentSession = null;
--
--    /**
--     * Persistent data
--     *
--     * @var \Magento\Persistent\Helper\Data
--     */
--    protected $_persistentData = null;
--
--    /**
--     * @param \Magento\Persistent\Helper\Session $persistentSession
--     * @param \Magento\Persistent\Helper\Data $persistentData
--     * @param \Magento\Customer\Model\Session $customerSession
--     * @param \Magento\Checkout\Model\Session $checkoutSession
--     */
--    public function __construct(
--        \Magento\Persistent\Helper\Session $persistentSession,
--        \Magento\Persistent\Helper\Data $persistentData,
--        \Magento\Customer\Model\Session $customerSession,
--        \Magento\Checkout\Model\Session $checkoutSession
--    ) {
--        $this->_persistentSession = $persistentSession;
--        $this->_customerSession = $customerSession;
--        $this->_checkoutSession = $checkoutSession;
--        $this->_persistentData = $persistentData;
--    }
--
--    /**
--     * Set quote to be loaded even if not active
--     *
--     * @param \Magento\Framework\Event\Observer $observer
--     * @return void
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
--     */
--    public function execute(\Magento\Framework\Event\Observer $observer)
--    {
--        if (!(($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
--            && !$this->_persistentData->isShoppingCartPersist()
--        )) {
--            return;
--        }
--
--        if ($this->_checkoutSession) {
--            $this->_checkoutSession->setLoadInactive();
--        }
--    }
--}
-diff --git a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
-index db6b6d1ee37..2803bc998dc 100644
---- a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
-+++ b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
-@@ -1,6 +1,5 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-@@ -8,6 +7,11 @@ namespace Magento\Persistent\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
- 
-+/**
-+ * Observer for setting "is_persistent" value to quote
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ */
- class SetQuotePersistentDataObserver implements ObserverInterface
- {
-     /**
-@@ -73,8 +77,8 @@ class SetQuotePersistentDataObserver implements ObserverInterface
-         }
- 
-         if ((
--                ($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
--                && !$this->_persistentData->isShoppingCartPersist()
-+                ($this->_persistentSession->isPersistent())
-+                && $this->_persistentData->isShoppingCartPersist()
-             )
-             && $this->quoteManager->isPersistent()
-         ) {
-diff --git a/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontAssertPersistentRegistrationPageFieldsActionGroup.xml b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontAssertPersistentRegistrationPageFieldsActionGroup.xml
-new file mode 100644
-index 00000000000..34409480c9e
---- /dev/null
-+++ b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontAssertPersistentRegistrationPageFieldsActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertPersistentRegistrationPageFields" extends="StorefrontAssertRegistrationPageFields">
-+        <seeCheckboxIsChecked selector="{{StorefrontCustomerSignInFormSection.rememberMe}}" after="seeConfirmPasswordField" stepKey="seeRememberMeChecked"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
-new file mode 100644
-index 00000000000..8c0f26dd11d
---- /dev/null
-+++ b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
-@@ -0,0 +1,36 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="CustomerLoginOnStorefrontWithRememberMeChecked" extends="LoginToStorefrontActionGroup">
-+        <checkOption selector="{{StorefrontCustomerSignInFormSection.rememberMe}}"
-+                     before="clickSignInAccountButton"
-+                     stepKey="checkRememberMe"/>
-+    </actionGroup>
-+
-+    <actionGroup name="CustomerLoginOnStorefrontWithRememberMeUnChecked" extends="LoginToStorefrontActionGroup">
-+        <uncheckOption selector="{{StorefrontCustomerSignInFormSection.rememberMe}}"
-+                     before="clickSignInAccountButton"
-+                     stepKey="unCheckRememberMe"/>
-+    </actionGroup>
-+
-+    <actionGroup name="StorefrontRegisterCustomerRememberMe" extends="SignUpNewUserFromStorefrontActionGroup">
-+        <!--- Assume we are on customer registration page. -->
-+        <remove keyForRemoval="amOnStorefrontPage"/>
-+        <remove keyForRemoval="clickOnCreateAccountLink"/>
-+        <checkOption  selector="{{StorefrontCustomerSignInFormSection.rememberMe}}" before="clickCreateAccountButton"  stepKey="checkRememberMe"/>
-+    </actionGroup>
-+
-+    <actionGroup name="StorefrontCreateCustomerOnRegisterPageDoNotRememberMe" extends="SignUpNewUserFromStorefrontActionGroup">
-+        <!--- Assume we are on customer registration page. -->
-+        <remove keyForRemoval="amOnStorefrontPage"/>
-+        <remove keyForRemoval="clickOnCreateAccountLink"/>
-+        <uncheckOption  selector="{{StorefrontCustomerSignInFormSection.rememberMe}}" before="clickCreateAccountButton"  stepKey="unCheckRememberMe"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontPersistentAssertCustomerWelcomeMessageActionGroup.xml b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontPersistentAssertCustomerWelcomeMessageActionGroup.xml
-new file mode 100644
-index 00000000000..2e57c8f8e1e
---- /dev/null
-+++ b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontPersistentAssertCustomerWelcomeMessageActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAssertPersistentCustomerWelcomeMessageActionGroup">
-+        <arguments>
-+            <argument name="customerFullName" type="string" />
-+        </arguments>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" userInput="Welcome, {{customerFullName}}! Not you?"  stepKey="verifyMessage" />
-+    </actionGroup>
-+
-+    <actionGroup name="StorefrontAssertPersistentCustomerWelcomeMessageNotPresentActionGroup" extends="StorefrontAssertPersistentCustomerWelcomeMessageActionGroup">
-+        <remove keyForRemoval="verifyMessage"/>
-+        <dontSee selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" userInput="Welcome, {{customerFullName}}! Not you?" stepKey="dontSeeWelcomeMessageNotYou"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml b/app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml
-index a23d1169b68..9ae0ac6ef24 100644
---- a/app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml
-+++ b/app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- 
--<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="PersistentConfigDefault" type="persistent_config_state">
-         <requiredEntity type="persistent_options_enabled">persistentDefaultState</requiredEntity>
-     </entity>
-@@ -20,4 +20,75 @@
-     <entity name="persistentEnabledState" type="persistent_options_enabled">
-         <data key="value">1</data>
-     </entity>
-+
-+    <entity name="PersistentLogoutClearEnabled" type="persistent_config_state">
-+        <requiredEntity type="persistent_options_logout_clear">PersistentEnabledLogoutClear</requiredEntity>
-+    </entity>
-+    <entity name="PersistentEnabledLogoutClear" type="logout_clear">
-+        <data key="value">1</data>
-+    </entity>
-+
-+    <entity name="PersistentLogoutClearDisable" type="persistent_config_state">
-+        <requiredEntity type="persistent_options_logout_clear">PersistentDisableLogoutClear</requiredEntity>
-+    </entity>
-+    <entity name="PersistentDisableLogoutClear" type="logout_clear">
-+        <data key="value">0</data>
-+    </entity>
-+
-+
-+    <!-- Persistent Configurations settings -->
-+    <entity name="PersistentConfigSettings" type="persistent_config_state">
-+        <requiredEntity type="persistent_options_enabled">persistentEnabledState</requiredEntity>
-+        <requiredEntity type="persistent_options_lifetime">SecondsOfPersistentLifetime</requiredEntity>
-+        <requiredEntity type="persistent_options_remember_enabled">EnablePersistentRememberMe</requiredEntity>
-+        <requiredEntity type="persistent_options_remember_default">EnablePersistentRememberMeDefaultValue</requiredEntity>
-+        <requiredEntity type="persistent_options_logout_clear">PersistentDisableLogoutClear</requiredEntity>
-+        <requiredEntity type="persistent_options_shopping_cart">EnablePersistentShoppingCart</requiredEntity>
-+    </entity>
-+
-+    <entity name="SecondsOfPersistentLifetime" type="lifetime">
-+        <data key="value">31536000</data>
-+    </entity>
-+    <entity name="EnablePersistentRememberMe" type="persistent_options_remember_enabled">
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="EnablePersistentRememberMeDefaultValue" type="persistent_options_remember_default">
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="EnablePersistentShoppingCart" type="persistent_options_shopping_cart">
-+        <data key="value">1</data>
-+    </entity>
-+
-+    <!-- Use System Value settings -->
-+    <entity name="PersistentConfigUseSystemValue" type="persistent_config_state">
-+        <requiredEntity type="persistent_options_enabled">RestorePersistentOptionsEnabled</requiredEntity>
-+        <requiredEntity type="persistent_options_lifetime">RestorePersistentOptionsLifetime</requiredEntity>
-+        <requiredEntity type="persistent_options_remember_enabled">RestorePersistentOptionsRememberEnabled</requiredEntity>
-+        <requiredEntity type="persistent_options_remember_default">RestorePersistentOptionsRememberDefault</requiredEntity>
-+        <requiredEntity type="persistent_options_logout_clear">RestorePersistentOptionsLogout</requiredEntity>
-+        <requiredEntity type="persistent_options_shopping_cart">RestorePersistentOptionsShoppingCart</requiredEntity>
-+    </entity>
-+
-+    <entity name="RestorePersistentOptionsEnabled" type="persistent_options_enabled">
-+        <requiredEntity type="persistent_options_use_system_value">PersistentOptionsUseInherit</requiredEntity>
-+    </entity>
-+    <entity name="RestorePersistentOptionsLogout" type="persistent_options_logout_clear">
-+        <requiredEntity type="persistent_options_use_system_value">PersistentOptionsUseInherit</requiredEntity>
-+    </entity>
-+    <entity name="RestorePersistentOptionsLifetime" type="persistent_options_lifetime">
-+        <requiredEntity type="persistent_options_use_system_value">PersistentOptionsUseInherit</requiredEntity>
-+    </entity>
-+    <entity name="RestorePersistentOptionsRememberEnabled" type="persistent_options_remember_enabled">
-+        <requiredEntity type="persistent_options_use_system_value">PersistentOptionsUseInherit</requiredEntity>
-+    </entity>
-+    <entity name="RestorePersistentOptionsRememberDefault" type="persistent_options_remember_default">
-+        <requiredEntity type="persistent_options_use_system_value">PersistentOptionsUseInherit</requiredEntity>
-+    </entity>
-+    <entity name="RestorePersistentOptionsShoppingCart" type="persistent_options_shopping_cart">
-+        <requiredEntity type="persistent_options_use_system_value">PersistentOptionsUseInherit</requiredEntity>
-+    </entity>
-+
-+    <entity name="PersistentOptionsUseInherit" type="persistent_options_use_system_value">
-+        <data key="value">1</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Persistent/Test/Mftf/Metadata/persistent_config-meta.xml b/app/code/Magento/Persistent/Test/Mftf/Metadata/persistent_config-meta.xml
-index 42aae658b2e..5abcfa8a000 100644
---- a/app/code/Magento/Persistent/Test/Mftf/Metadata/persistent_config-meta.xml
-+++ b/app/code/Magento/Persistent/Test/Mftf/Metadata/persistent_config-meta.xml
-@@ -6,13 +6,46 @@
-   */
- -->
- 
--<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
--    <operation name="CreatePersistentConfigState" dataType="persistent_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/persistent/" method="POST">
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CreatePersistentConfigState" dataType="persistent_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/persistent/" method="POST" successRegex="/messages-message-success/">
-         <object key="groups" dataType="persistent_config_state">
-             <object key="options" dataType="persistent_config_state">
-                 <object key="fields" dataType="persistent_config_state">
-                     <object key="enabled" dataType="persistent_options_enabled">
-                         <field key="value">string</field>
-+                        <object key="inherit" dataType="persistent_options_use_system_value">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="logout_clear" dataType="persistent_options_logout_clear">
-+                        <field key="value">string</field>
-+                        <object key="inherit" dataType="persistent_options_use_system_value">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="lifetime" dataType="persistent_options_lifetime">
-+                        <field key="value">string</field>
-+                        <object key="inherit" dataType="persistent_options_use_system_value">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="remember_enabled" dataType="persistent_options_remember_enabled">
-+                        <field key="value">string</field>
-+                        <object key="inherit" dataType="persistent_options_use_system_value">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="remember_default" dataType="persistent_options_remember_default">
-+                        <field key="value">string</field>
-+                        <object key="inherit" dataType="persistent_options_use_system_value">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="shopping_cart" dataType="persistent_options_shopping_cart">
-+                        <field key="value">string</field>
-+                        <object key="inherit" dataType="persistent_options_use_system_value">
-+                            <field key="value">integer</field>
-+                        </object>
-                     </object>
-                 </object>
-             </object>
-diff --git a/app/code/Magento/Persistent/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Persistent/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
-new file mode 100644
-index 00000000000..c2220c33a60
---- /dev/null
-+++ b/app/code/Magento/Persistent/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerSignInFormSection">
-+        <element name="rememberMe" type="checkbox" selector="[name='persistent_remember_me']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/CheckShoppingCartBehaviorAfterSessionExpiredTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/CheckShoppingCartBehaviorAfterSessionExpiredTest.xml
-new file mode 100644
-index 00000000000..c66a2979aa7
---- /dev/null
-+++ b/app/code/Magento/Persistent/Test/Mftf/Test/CheckShoppingCartBehaviorAfterSessionExpiredTest.xml
-@@ -0,0 +1,57 @@
-+<?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="CheckShoppingCartBehaviorAfterSessionExpiredTest">
-+        <annotations>
-+            <features value="Persistent"/>
-+            <stories value="MAGETWO-91733 - Unusual behavior with the persistent shopping cart after the session is expired"/>
-+            <title value="Checking behavior with the persistent shopping cart after the session is expired"/>
-+            <description value="Checking behavior with the persistent shopping cart after the session is expired"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-95118"/>
-+            <group value="persistent"/>
-+        </annotations>
-+        <before>
-+            <!--Enable Persistence-->
-+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
-+            <!--Create product-->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <!-- Create new customer -->
-+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
-+                <argument name="Customer" value="Simple_US_Customer_NY"/>
-+            </actionGroup>
-+            <!--Add shipping information-->
-+            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
-+                <argument name="Address" value="US_Address_NY"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <!--Roll back configuration-->
-+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
-+            <!--Delete product-->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+        </after>
-+        <!-- Add simple product to cart -->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart1">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <!--Reset cookies and refresh the page-->
-+        <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
-+        <reloadPage stepKey="reloadPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <!--Check product exists in cart-->
-+        <see userInput="$$createProduct.name$$" stepKey="ProductExistsInCart"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml
-index 03509268751..a383fd4505b 100644
---- a/app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml
-+++ b/app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml
-@@ -7,10 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="GuestCheckoutWithEnabledPersistentTest">
-         <annotations>
-             <features value="Persistent"/>
-+            <stories value="Guest checkout"/>
-             <title value="Guest Checkout with Enabled Persistent"/>
-             <description value="Checkout data must be restored after page checkout reload."/>
-             <severity value="CRITICAL"/>
-diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml
-new file mode 100644
-index 00000000000..e5c77ee4143
---- /dev/null
-+++ b/app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml
-@@ -0,0 +1,84 @@
-+<?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="ShippingQuotePersistedForGuestTest">
-+        <annotations>
-+            <features value="Persistent"/>
-+            <stories value="Guest checkout"/>
-+            <title value="Estimate Shipping and Tax block sections on shipping cart saving correctly for Guest."/>
-+            <description value="Verify that 'Estimate Shipping and Tax' block sections on shipping cart saving correctly for Guest after switching to another page. And check that the shopping cart is cleared after reset persistent cookie."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-99025"/>
-+            <useCaseId value="MAGETWO-98620"/>
-+            <group value="persistent"/>
-+        </annotations>
-+        <before>
-+            <!--Enabled The Persistent Shopping Cart feature -->
-+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
-+            <createData entity="PersistentLogoutClearDisable" stepKey="persistentLogoutClearDisable"/>
-+            <!--Create simple product-->
-+            <createData entity="SimpleProduct2" stepKey="createProduct">
-+                <field key="price">150</field>
-+            </createData>
-+            <!--Create customer-->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer">
-+                <field key="firstname">John1</field>
-+                <field key="lastname">Doe1</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <!--Revert persistent configuration to default-->
-+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Step 1: Login as a Customer with remember me checked-->
-+        <actionGroup ref="CustomerLoginOnStorefrontWithRememberMeChecked" stepKey="loginToStorefrontAccountWithRememberMeChecked">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <!--Step 2: Open the Product Page and add the product to shopping cart-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPageAsLoggedUser"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCartAsLoggedUser">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+        </actionGroup>
-+        <!--Step 3: Log out, reset persistent cookie and go to homepage-->
-+        <amOnPage url="{{StorefrontCustomerSignOutPage.url}}" stepKey="signOut"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitSignOutPage"/>
-+        <resetCookie userInput="persistent_shopping_cart" stepKey="resetPersistentCookie"/>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnHomePageAfterResetPersistentCookie"/>
-+        <waitForPageLoad stepKey="waitHomePageLoadAfterResetCookie"/>
-+        <!--Check that the minicart is empty-->
-+        <actionGroup ref="assertMiniCartEmpty" after="waitHomePageLoadAfterResetCookie" stepKey="seeMinicartEmpty"/>
-+        <!--Step 4: Add the product to shopping cart and open cart-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPageAsGuestUser"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCartAsGuestUser">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartBeforeChangeShippingAndTaxSection"/>
-+        <!--Step 5: Open Estimate Shipping and Tax block and fill the sections-->
-+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingAndTax" />
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="selectUSCountry"/>
-+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="selectCaliforniaRegion"/>
-+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{US_Address_CA.postcode}}" stepKey="inputPostCode"/>
-+        <!--Step 6: Go to Homepage-->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePageAfterChangingShippingAndTaxSection"/>
-+        <!--Step 7: Go to shopping cart and check "Estimate Shipping and Tax" fields values are saved-->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" after="goToHomePageAfterChangingShippingAndTaxSection" stepKey="goToShoppingCartAfterChangingShippingAndTaxSection"/>
-+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingAndTaxAfterChanging" />
-+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCustomerCountry" />
-+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkCustomerRegion" />
-+        <grabValueFrom  selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
-+        <assertEquals  message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
-+            <expectedResult type="string">{{US_Address_CA.postcode}}</expectedResult>
-+            <actualResult type="variable">grabTextPostCode</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
-new file mode 100644
-index 00000000000..61710cbc980
---- /dev/null
-+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
-@@ -0,0 +1,79 @@
-+<?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="StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest">
-+        <annotations>
-+            <features value="Persistent"/>
-+            <stories value="MAGETWO-97278 - Incorrect use of cookies for customer"/>
-+            <title value="Checking welcome message for persistent customer after logout"/>
-+            <description value="Checking welcome message for persistent customer after logout"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-10800"/>
-+            <group value="persistent"/>
-+            <group value="customer"/>
-+        </annotations>
-+        <before>
-+            <!--Enable Persistence-->
-+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
-+            <createData entity="PersistentLogoutClearDisable" stepKey="persistentLogoutClearDisable"/>
-+
-+            <!--Create customers-->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomerForPersistent">
-+                <field key="firstname">John1</field>
-+                <field key="lastname">Doe1</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <!--Roll back configuration-->
-+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
-+            <createData entity="PersistentLogoutClearEnabled" stepKey="persistentLogoutClearEnabled"/>
-+
-+            <!-- Logout customer on Storefront-->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
-+            <!--Delete customers-->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCustomerForPersistent" stepKey="deleteCustomerForPersistent"/>
-+        </after>
-+        <!--Login as a Customer with remember me unchecked-->
-+        <actionGroup ref="CustomerLoginOnStorefrontWithRememberMeUnChecked" stepKey="loginToStorefrontAccountWithRememberMeUnchecked">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Check customer name and last name in welcome message-->
-+        <seeInCurrentUrl url="{{StorefrontCustomerDashboardPage.url}}" stepKey="seeCustomerAccountPageUrl"/>
-+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!"
-+             selector="{{StorefrontHeaderSection.welcomeMessage}}"
-+             stepKey="seeLoggedInCustomerWelcomeMessage"/>
-+        <!--Logout and check default welcome message-->
-+        <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout"/>
-+        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" stepKey="seeCustomerSignOutPageUrl"/>
-+        <see userInput="Default welcome msg!"
-+             selector="{{StorefrontHeaderSection.welcomeMessage}}"
-+             stepKey="seeDefaultWelcomeMessage"/>
-+
-+        <!--Login as a Customer with remember me checked-->
-+        <actionGroup ref="CustomerLoginOnStorefrontWithRememberMeChecked" stepKey="loginToStorefrontAccountWithRememberMeChecked">
-+            <argument name="Customer" value="$$createCustomerForPersistent$$"/>
-+        </actionGroup>
-+        <!--Check customer name and last name in welcome message-->
-+        <seeInCurrentUrl url="{{StorefrontCustomerDashboardPage.url}}" stepKey="seeCustomerAccountPageUrl1"/>
-+        <see userInput="Welcome, $$createCustomerForPersistent.firstname$$ $$createCustomerForPersistent.lastname$$!"
-+             selector="{{StorefrontHeaderSection.welcomeMessage}}"
-+             stepKey="seeLoggedInCustomerWelcomeMessage1"/>
-+
-+        <!--Logout and check persistent customer welcome message-->
-+        <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout1"/>
-+        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" stepKey="seeCustomerSignOutPageUrl1"/>
-+        <see userInput="Welcome, $$createCustomerForPersistent.firstname$$ $$createCustomerForPersistent.lastname$$! Not you?"
-+             selector="{{StorefrontHeaderSection.welcomeMessage}}"
-+             stepKey="seePersistentWelcomeMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml
-new file mode 100644
-index 00000000000..e50fc4af831
---- /dev/null
-+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml
-@@ -0,0 +1,159 @@
-+<?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="StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest">
-+        <annotations>
-+            <features value="Persistent"/>
-+            <stories value="Shopping Cart Persistence"/>
-+            <title value="Verify Shopping Cart Persistence under long-term cookie"/>
-+            <description value="Verify Shopping Cart Persistence under long-term cookie"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-12666"/>
-+            <group value="persistent"/>
-+            <group value="customer"/>
-+        </annotations>
-+        <before>
-+            <!--Enable Persistence-->
-+            <createData entity="PersistentConfigSettings" stepKey="persistentConfigSetting"/>
-+            <!--Create Simple Product 1  and Product 2 -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimple1">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createSimple2">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Set Defaults Persistence configuration-->
-+            <createData entity="PersistentConfigUseSystemValue" stepKey="persistentDefaultsConfiguration"/>
-+            <!--Delete Simple Product 1, Product 2 and Category-->
-+            <deleteData createDataKey="createSimple1" stepKey="deleteSimple1"/>
-+            <deleteData createDataKey="createSimple2" stepKey="deleteSimple2"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteJohnSmithCustomer">
-+                <argument name="customerEmail" value="John_Smith_Customer.email"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteJohnDoeCustomer">
-+                <argument name="customerEmail" value="Simple_Customer_Without_Address.email"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- 1. Go to storefront and click the Create an Account link-->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnHomePage"/>
-+        <click selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="clickCreateAnAccountLink" />
-+        <actionGroup ref="StorefrontAssertPersistentRegistrationPageFields" stepKey="assertPersistentRegistrationPageFields"/>
-+
-+        <!-- 2. Fill fields for registration, set password and unselect the Remember Me checkbox-->
-+        <actionGroup ref="StorefrontCreateCustomerOnRegisterPageDoNotRememberMe" stepKey="registrationJohnSmithCustomer">
-+            <argument name="Customer" value="John_Smith_Customer"/>
-+        </actionGroup>
-+        <!--Check customer name and last name in welcome message-->
-+        <actionGroup ref="AssertMessageCustomerCreateAccountActionGroup" stepKey="customerCreatedSuccessMessageForJohnSmith"/>
-+        <actionGroup ref="AssertCustomerWelcomeMessageActionGroup" stepKey="seeWelcomeMessageForJohnSmithCustomer">
-+            <argument name="customerFullName" value="{{John_Smith_Customer.fullname}}"/>
-+        </actionGroup>
-+
-+        <!-- 3. Put Simple Product 1 into Shopping Cart -->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimple1ProductToCartForJohnSmithCustomer">
-+            <argument name="product" value="$$createSimple1$$"/>
-+        </actionGroup>
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple1InMiniCartForJohnSmithCustomer">
-+            <argument name="productName" value="$$createSimple1.name$$"/>
-+        </actionGroup>
-+
-+        <!-- 4. Click Sign Out -->
-+        <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="logoutJohnSmithCustomer"/>
-+        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" stepKey="seeLogoutSuccessPageUrlAfterLogOutJohnSmithCustomer"/>
-+        <waitForPageLoad stepKey="waitForRedirectToHomePage"/>
-+        <waitForText selector="{{StorefrontCMSPageSection.mainContent}}" userInput="CMS homepage content goes here." stepKey="waitForLoadContentMessage"/>
-+        <actionGroup ref="StorefrontAssertPersistentCustomerWelcomeMessageNotPresentActionGroup" stepKey="dontSeeWelcomeJohnSmithCustomerNotYouMessage">
-+            <argument name="customerFullName" value="{{John_Smith_Customer.fullname}}"/>
-+        </actionGroup>
-+        <actionGroup ref="assertMiniCartEmpty" stepKey="assertMiniCartEmptyAfterJohnSmithSignOut" />
-+
-+        <!-- 5. Click the Create an Account link again and fill fields for registration of another customer, set password and check the Remember Me checkbox  -->
-+        <amOnPage url="{{StorefrontCustomerCreatePage.url}}" stepKey="amOnCustomerAccountCreatePage"/>
-+        <actionGroup ref="StorefrontRegisterCustomerRememberMe" stepKey="registrationJohnDoeCustomer">
-+            <argument name="Customer" value="Simple_Customer_Without_Address"/>
-+        </actionGroup>
-+        <!--Check customer name and last name in welcome message-->
-+        <actionGroup ref="AssertMessageCustomerCreateAccountActionGroup" stepKey="customerCreatedSuccessMessageForJohnDoe"/>
-+        <actionGroup ref="AssertCustomerWelcomeMessageActionGroup" stepKey="seeWelcomeMessageForJohnDoeCustomer">
-+            <argument name="customerFullName" value="{{Simple_Customer_Without_Address.fullname}}"/>
-+        </actionGroup>
-+        <!-- 6. Add Simple Product 1 to Shopping Cart  -->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimple1ProductToCartForJohnDoeCustomer">
-+            <argument name="product" value="$$createSimple1$$"/>
-+        </actionGroup>
-+        <see selector="{{StorefrontMinicartSection.productCount}}" userInput="1" stepKey="miniCartContainsOneProductForJohnDoeCustomer"/>
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple1InMiniCartForJohnDoeCustomer">
-+            <argument name="productName" value="$$createSimple1.name$$"/>
-+        </actionGroup>
-+
-+        <!-- 7. Click Log Out  -->
-+        <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="logoutJohnDoeCustomer"/>
-+        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" stepKey="seeLogoutSuccessPageUrlAfterLogOutJohnDoeCustomer"/>
-+        <actionGroup ref="StorefrontAssertPersistentCustomerWelcomeMessageActionGroup" stepKey="seeWelcomeForJohnDoeCustomer">
-+            <argument name="customerFullName" value="{{Simple_Customer_Without_Address.fullname}}"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForHomePageLoad"/>
-+        <waitForText selector="{{StorefrontCMSPageSection.mainContent}}" userInput="CMS homepage content goes here." stepKey="waitForLoadContentMessageOnHomePage"/>
-+        <waitForElementVisible selector="{{StorefrontMinicartSection.productCount}}" stepKey="waitForCartCounterVisible"/>
-+        <see selector="{{StorefrontMinicartSection.productCount}}" userInput="1" stepKey="miniCartContainsOneProductForGuest"/>
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple1InMiniCartForGuestCustomer">
-+            <argument name="productName" value="$$createSimple1.name$$"/>
-+        </actionGroup>
-+
-+        <!-- 8. Go to Shopping Cart and verify Simple Product 1 is present there  -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCart" />
-+        <see selector="{{CheckoutCartProductSection.productName}}" userInput="$$createSimple1.name$$" stepKey="checkSimple1InShoppingCart"/>
-+
-+        <!-- 9. Add Simple Product 2 to Shopping Cart  -->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimple2ProductToCartForGuest">
-+            <argument name="product" value="$$createSimple2$$"/>
-+        </actionGroup>
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple1InMiniCartForGuestCustomerSecondTime">
-+            <argument name="productName" value="$$createSimple1.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple2InMiniCartForGuestCustomer">
-+            <argument name="productName" value="$$createSimple2.name$$"/>
-+        </actionGroup>
-+        <see selector="{{StorefrontMinicartSection.productCount}}" userInput="2" stepKey="miniCartContainsTwoProductForGuest"/>
-+
-+        <!-- 10. Go to My Account section  -->
-+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="amOnCustomerAccountPage"/>
-+        <seeInCurrentUrl url="{{StorefrontCustomerSignInPage.url}}" stepKey="redirectToCustomerAccountLoginPage"/>
-+        <seeElement selector="{{StorefrontCustomerSignInFormSection.customerLoginBlock}}" stepKey="checkSystemRequiresToLogIn"/>
-+
-+        <!-- 11. Log in as John Doe  -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="logInAsJohnDoeCustomer">
-+            <argument name="Customer" value="Simple_Customer_Without_Address"/>
-+        </actionGroup>
-+        <see selector="{{StorefrontMinicartSection.productCount}}" userInput="2" stepKey="miniCartContainsTwoProductForJohnDoeCustomer"/>
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple1InMiniCartForJohnDoeCustomerSecondTime">
-+            <argument name="productName" value="$$createSimple1.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple2InMiniCartForJohnDoeCustomer">
-+            <argument name="productName" value="$$createSimple2.name$$"/>
-+        </actionGroup>
-+
-+        <!-- 12. Sign out and click the Not you? link  -->
-+        <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="logoutJohnDoeCustomerSecondTime"/>
-+        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" stepKey="seeLogoutSuccessPageUrlAfterLogOutJohnSmithCustomerSecondTime"/>
-+        <waitForPageLoad stepKey="waitForHomePageLoadAfter5Seconds"/>
-+        <waitForText selector="{{StorefrontCMSPageSection.mainContent}}" userInput="CMS homepage content goes here." stepKey="waitForLoadMainContentMessageOnHomePage"/>
-+        <click selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="clickOnNotYouLink" />
-+        <waitForPageLoad stepKey="waitForCustomerLoginPageLoad"/>
-+        <actionGroup ref="assertMiniCartEmpty" stepKey="assertMiniCartEmptyAfterJohnDoeSignOut" />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyThatInformationAboutViewingComparisonWishlistIsPersistedUnderLongTermCookieTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyThatInformationAboutViewingComparisonWishlistIsPersistedUnderLongTermCookieTest.xml
-new file mode 100644
-index 00000000000..dc6f87bef0b
---- /dev/null
-+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyThatInformationAboutViewingComparisonWishlistIsPersistedUnderLongTermCookieTest.xml
-@@ -0,0 +1,193 @@
-+<?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="StorefrontVerifyThatInformationAboutViewingComparisonWishlistIsPersistedUnderLongTermCookieTest">
-+        <annotations>
-+            <features value="Persistent"/>
-+            <stories value="Catalog widget"/>
-+            <title value="Verify that information about viewing, comparison, wishlist and last ordered items is persisted under long-term cookie"/>
-+            <description value="Verify that information about viewing, comparison, wishlist and last ordered items is persisted under long-term cookie"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-12180"/>
-+            <group value="persistent"/>
-+            <group value="widget"/>
-+            <group value="catalog_widget"/>
-+            <skip>
-+                <issueId value="MC-15741"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
-+            <createData entity="PersistentLogoutClearDisable" stepKey="persistentLogoutClearDisable"/>
-+            <createData entity="EnableSynchronizeWidgetProductsWithBackendStorage" stepKey="enableSynchronizeWidgetProductsWithBackendStorage"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createSecondSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <actionGroup ref="AdminCreateRecentlyProductsWidgetActionGroup" stepKey="createRecentlyComparedProductsWidget">
-+                <argument name="widget" value="RecentlyComparedProductsWidget"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateRecentlyProductsWidgetActionGroup" stepKey="createRecentlyViewedProductsWidget">
-+                <argument name="widget" value="RecentlyViewedProductsWidget"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
-+            <createData entity="PersistentLogoutClearEnabled" stepKey="persistentLogoutClearEnabled"/>
-+            <createData entity="DisableSynchronizeWidgetProductsWithBackendStorage" stepKey="disableSynchronizeWidgetProductsWithBackendStorage"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutFromCustomer"/>
-+            <actionGroup ref="AdminDeleteWidgetActionGroup" stepKey="deleteRecentlyComparedProductsWidget">
-+                <argument name="widget" value="RecentlyComparedProductsWidget"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteWidgetActionGroup" stepKey="deleteRecentlyViewedProductsWidget">
-+                <argument name="widget" value="RecentlyViewedProductsWidget"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Login to storefront from customer-->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="checkWelcomeMessage"/>
-+
-+        <!--Open the details page of Simple Product 1, Simple Product 2 and add to cart, get to the category-->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimpleProductProductToCart">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSecondSimpleProductProductToCart">
-+            <argument name="product" value="$$createSecondSimpleProduct$$"/>
-+        </actionGroup>
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageAfterAddedProductToCart"/>
-+        <!--The Recently Viewed widget displays Simple Product 1 and Simple Product 2-->
-+        <actionGroup ref="StorefrontAssertProductInRecentlyViewedWidgetActionGroup" stepKey="seeSimpleProductInRecentlyViewedWidget">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAssertProductInRecentlyViewedWidgetActionGroup" stepKey="seeSecondSimpleProductInRecentlyViewedWidget">
-+            <argument name="product" value="$$createSecondSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Add Simple Product 1 and Simple Product 2 to Wishlist-->
-+        <actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup" stepKey="addSimpleProductToWishlist">
-+            <argument name="productVar" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageAfterProductAddToWishlist"/>
-+        <actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup" stepKey="addSecondSimpleProductToWishlist">
-+            <argument name="productVar" value="$$createSecondSimpleProduct$$"/>
-+        </actionGroup>
-+        <!--The My Wishlist widget displays Simple Product 1 and Simple Product 2-->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageToCheckProductsInWishlistSidebar"/>
-+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" stepKey="checkSimpleProductInWishlistSidebar">
-+            <argument name="productVar" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" stepKey="checkSecondSimpleProductInWishlistSidebar">
-+            <argument name="productVar" value="$$createSecondSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Add to compare Simple Product and Simple Product 2-->
-+        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="addSimpleProductToCompare" >
-+            <argument name="productVar" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="addSecondSimpleProductToCompare" >
-+            <argument name="productVar" value="$$createSecondSimpleProduct$$"/>
-+        </actionGroup>
-+        <!--The Compare Products widget displays Simple Product 1 and Simple Product 2-->
-+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="checkSimpleProductInCompareSidebar">
-+            <argument name="productVar" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="checkSecondSimpleProductInCompareSidebar">
-+            <argument name="productVar" value="$$createSecondSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Click Clear all in the Compare Products widget-->
-+        <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="clearCompareList"/>
-+        <!--The Recently Compared widget displays Simple Product 1 and Simple Product 2-->
-+        <actionGroup ref="StorefrontAssertProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyComparedWidget">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAssertProductInRecentlyComparedWidgetActionGroup" stepKey="checkSecondSimpleProductInRecentlyComparedWidget">
-+            <argument name="product" value="$$createSecondSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Place the order-->
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage"/>
-+        <actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder">
-+            <argument name="shippingMethod" value="Flat Rate"/>
-+        </actionGroup>
-+        <!--The Recently Ordered widget displays Simple Product 1 and Simple Product 2-->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageToCheckProductsInRecentlyOrderedWidget"/>
-+        <actionGroup ref="StorefrontAssertProductInRecentlyOrderedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyOrderedWidget">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAssertProductInRecentlyOrderedWidgetActionGroup" stepKey="checkSecondSimpleProductInRecentlyOrderedWidget">
-+            <argument name="product" value="$$createSecondSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Sign out and check that widgets persist the information about the items-->
-+        <actionGroup ref="StorefrontSignOutActionGroup" stepKey="logoutFromCustomerToCheckThatWidgetsPersist"/>
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageAfterLogoutFromCustomer"/>
-+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="checkWelcomeMessageAfterLogoutFromCustomer"/>
-+        <seeElement selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="checkLinkNotYouAfterLogoutFromCustomer"/>
-+
-+        <actionGroup ref="StorefrontAssertProductInRecentlyViewedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyViewedWidgetAfterLogout">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" stepKey="checkSimpleProductInWishlistSidebarAfterLogout">
-+            <argument name="productVar" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAssertProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyComparedWidgetAfterLogout">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAssertProductInRecentlyOrderedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyOrderedWidgetAfterLogout">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Click the *Not you?* link and check the price for Simple Product-->
-+        <click selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="clickLinkNotYou"/>
-+        <waitForPageLoad stepKey="waitForPageLoadAfterClickLinkNotYou"/>
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageAfterClickNotYou"/>
-+        <see userInput="Default welcome msg!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="checkWelcomeMessageAfterClickLinkNotYou"/>
-+        <dontSee selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" userInput="$$createSimpleProduct.name$$" stepKey="dontSeeProductInRecentlyViewedWidget"/>
-+        <dontSee selector="{{StorefrontCustomerWishlistSidebarSection.ProductTitleByName($$createSimpleProduct.name$$)}}" stepKey="dontSeeProductInWishlistWidget"/>
-+        <dontSee selector="{{StorefrontWidgetsSection.widgetRecentlyComparedProductsGrid}}" userInput="$$createSimpleProduct.name$$" stepKey="dontSeeProductInRecentlyComparedWidget"/>
-+        <dontSee selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" userInput="$$createSimpleProduct.name$$" stepKey="dontSeeProductInRecentlyOrderedWidget"/>
-+
-+        <!--Login to storefront from customer again-->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="logInFromCustomerAfterClearLongTermCookie">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageToCheckWidgets"/>
-+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="checkWelcomeMessageAfterLogin"/>
-+
-+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" stepKey="checkSimpleProductNameInWishlistSidebarAfterLogin">
-+            <argument name="productVar" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAssertProductInRecentlyViewedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyViewedWidgetAfterLogin">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAssertProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyComparedWidgetAfterLogin">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAssertProductInRecentlyOrderedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyOrderedWidgetAfterLogin">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php b/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
-index b88b02ab4cf..407dad05c3b 100644
---- a/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
-+++ b/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
-@@ -34,44 +34,14 @@ class AdditionalTest extends \PHPUnit\Framework\TestCase
-     protected $contextMock;
- 
-     /**
--     * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $eventManagerMock;
-+    private $jsonSerializerMock;
- 
-     /**
--     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Persistent\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $scopeConfigMock;
--
--    /**
--     * @var \Magento\Framework\App\Cache\StateInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $cacheStateMock;
--
--    /**
--     * @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $cacheMock;
--
--    /**
--     * @var \Magento\Framework\Session\SidResolverInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $sidResolverMock;
--
--    /**
--     * @var \Magento\Framework\Session\SessionManagerInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $sessionMock;
--
--    /**
--     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $escaperMock;
--
--    /**
--     * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $urlBuilderMock;
-+    private $persistentHelperMock;
- 
-     /**
-      * @var \Magento\Persistent\Block\Header\Additional
-@@ -93,17 +63,7 @@ class AdditionalTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- 
--        $this->contextMock = $this->createPartialMock(\Magento\Framework\View\Element\Template\Context::class, [
--                'getEventManager',
--                'getScopeConfig',
--                'getCacheState',
--                'getCache',
--                'getInlineTranslation',
--                'getSidResolver',
--                'getSession',
--                'getEscaper',
--                'getUrlBuilder'
--            ]);
-+        $this->contextMock = $this->createPartialMock(\Magento\Framework\View\Element\Template\Context::class, []);
-         $this->customerViewHelperMock = $this->createMock(\Magento\Customer\Helper\View::class);
-         $this->persistentSessionHelperMock = $this->createPartialMock(
-             \Magento\Persistent\Helper\Session::class,
-@@ -119,103 +79,14 @@ class AdditionalTest extends \PHPUnit\Framework\TestCase
-             ['getById']
-         );
- 
--        $this->eventManagerMock = $this->getMockForAbstractClass(
--            \Magento\Framework\Event\ManagerInterface::class,
--            [],
--            '',
--            false,
--            true,
--            true,
--            ['dispatch']
--        );
--        $this->scopeConfigMock = $this->getMockForAbstractClass(
--            \Magento\Framework\App\Config\ScopeConfigInterface::class,
--            [],
--            '',
--            false,
--            true,
--            true,
--            ['getValue']
--        );
--        $this->cacheStateMock = $this->getMockForAbstractClass(
--            \Magento\Framework\App\Cache\StateInterface::class,
--            [],
--            '',
--            false,
--            true,
--            true,
--            ['isEnabled']
-+        $this->jsonSerializerMock = $this->createPartialMock(
-+            \Magento\Framework\Serialize\Serializer\Json::class,
-+            ['serialize']
-         );
--        $this->cacheMock = $this->getMockForAbstractClass(
--            \Magento\Framework\App\CacheInterface::class,
--            [],
--            '',
--            false,
--            true,
--            true,
--            ['load']
-+        $this->persistentHelperMock = $this->createPartialMock(
-+            \Magento\Persistent\Helper\Data::class,
-+            ['getLifeTime']
-         );
--        $this->sidResolverMock = $this->getMockForAbstractClass(
--            \Magento\Framework\Session\SidResolverInterface::class,
--            [],
--            '',
--            false,
--            true,
--            true,
--            ['getSessionIdQueryParam']
--        );
--        $this->sessionMock = $this->getMockForAbstractClass(
--            \Magento\Framework\Session\SessionManagerInterface::class,
--            [],
--            '',
--            false,
--            true,
--            true,
--            ['getSessionId']
--        );
--        $this->escaperMock = $this->getMockForAbstractClass(
--            \Magento\Framework\Escaper::class,
--            [],
--            '',
--            false,
--            true,
--            true,
--            ['escapeHtml']
--        );
--        $this->urlBuilderMock = $this->getMockForAbstractClass(
--            \Magento\Framework\UrlInterface::class,
--            [],
--            '',
--            false,
--            true,
--            true,
--            ['getUrl']
--        );
--
--        $this->contextMock->expects($this->once())
--            ->method('getEventManager')
--            ->willReturn($this->eventManagerMock);
--        $this->contextMock->expects($this->once())
--            ->method('getScopeConfig')
--            ->willReturn($this->scopeConfigMock);
--        $this->contextMock->expects($this->once())
--            ->method('getCacheState')
--            ->willReturn($this->cacheStateMock);
--        $this->contextMock->expects($this->once())
--            ->method('getCache')
--            ->willReturn($this->cacheMock);
--        $this->contextMock->expects($this->once())
--            ->method('getSidResolver')
--            ->willReturn($this->sidResolverMock);
--        $this->contextMock->expects($this->once())
--            ->method('getSession')
--            ->willReturn($this->sessionMock);
--        $this->contextMock->expects($this->once())
--            ->method('getEscaper')
--            ->willReturn($this->escaperMock);
--        $this->contextMock->expects($this->once())
--            ->method('getUrlBuilder')
--            ->willReturn($this->urlBuilderMock);
- 
-         $this->additional = $this->objectManager->getObject(
-             \Magento\Persistent\Block\Header\Additional::class,
-@@ -224,91 +95,48 @@ class AdditionalTest extends \PHPUnit\Framework\TestCase
-                 'customerViewHelper' => $this->customerViewHelperMock,
-                 'persistentSessionHelper' => $this->persistentSessionHelperMock,
-                 'customerRepository' => $this->customerRepositoryMock,
--                'data' => []
-+                'data' => [],
-+                'jsonSerializer' => $this->jsonSerializerMock,
-+                'persistentHelper' => $this->persistentHelperMock,
-             ]
-         );
-     }
- 
-     /**
--     * Run test toHtml method
--     *
--     * @param bool $customerId
-      * @return void
--     *
--     * @dataProvider dataProviderToHtml
-      */
--    public function testToHtml($customerId)
-+    public function testGetCustomerId(): void
-     {
--        $cacheData = false;
--        $idQueryParam = 'id-query-param';
--        $sessionId = 'session-id';
--
--        $this->additional->setData('cache_lifetime', 789);
--        $this->additional->setData('cache_key', 'cache-key');
--
--        $this->eventManagerMock->expects($this->at(0))
--            ->method('dispatch')
--            ->with('view_block_abstract_to_html_before', ['block' => $this->additional]);
--        $this->eventManagerMock->expects($this->at(1))
--            ->method('dispatch')
--            ->with('view_block_abstract_to_html_after');
--        $this->scopeConfigMock->expects($this->once())
--            ->method('getValue')
--            ->with(
--                'advanced/modules_disable_output/Magento_Persistent',
--                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--            )->willReturn(false);
--
--        // get cache
--        $this->cacheStateMock->expects($this->at(0))
--            ->method('isEnabled')
--            ->with(\Magento\Persistent\Block\Header\Additional::CACHE_GROUP)
--            ->willReturn(true);
--        // save cache
--        $this->cacheStateMock->expects($this->at(1))
--            ->method('isEnabled')
--            ->with(\Magento\Persistent\Block\Header\Additional::CACHE_GROUP)
--            ->willReturn(false);
--
--        $this->cacheMock->expects($this->once())
--            ->method('load')
--            ->willReturn($cacheData);
--        $this->sidResolverMock->expects($this->never())
--            ->method('getSessionIdQueryParam')
--            ->with($this->sessionMock)
--            ->willReturn($idQueryParam);
--        $this->sessionMock->expects($this->never())
--            ->method('getSessionId')
--            ->willReturn($sessionId);
--
--        // call protected _toHtml method
-+        $customerId = 1;
-+        /** @var \Magento\Persistent\Model\Session|\PHPUnit_Framework_MockObject_MockObject $sessionMock */
-         $sessionMock = $this->createPartialMock(\Magento\Persistent\Model\Session::class, ['getCustomerId']);
--
--        $this->persistentSessionHelperMock->expects($this->atLeastOnce())
--            ->method('getSession')
--            ->willReturn($sessionMock);
--
--        $sessionMock->expects($this->atLeastOnce())
-+        $sessionMock->expects($this->once())
-             ->method('getCustomerId')
-             ->willReturn($customerId);
-+        $this->persistentSessionHelperMock->expects($this->once())
-+            ->method('getSession')
-+            ->willReturn($sessionMock);
- 
--        if ($customerId) {
--            $this->assertEquals('<span><a  >Not you?</a></span>', $this->additional->toHtml());
--        } else {
--            $this->assertEquals('', $this->additional->toHtml());
--        }
-+        $this->assertEquals($customerId, $this->additional->getCustomerId());
-     }
- 
-     /**
--     * Data provider for dataProviderToHtml method
--     *
--     * @return array
-+     * @return void
-      */
--    public function dataProviderToHtml()
-+    public function testGetConfig(): void
-     {
--        return [
--            ['customerId' => 2],
--            ['customerId' => null],
--        ];
-+        $lifeTime = 500;
-+        $arrayToSerialize = ['expirationLifetime' => $lifeTime];
-+        $serializedArray = '{"expirationLifetime":' . $lifeTime . '}';
-+
-+        $this->persistentHelperMock->expects($this->once())
-+            ->method('getLifeTime')
-+            ->willReturn($lifeTime);
-+        $this->jsonSerializerMock->expects($this->once())
-+            ->method('serialize')
-+            ->with($arrayToSerialize)
-+            ->willReturn($serializedArray);
-+
-+        $this->assertEquals($serializedArray, $this->additional->getConfig());
-     }
- }
-diff --git a/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php b/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php
-index b9285715146..c7f84b476fa 100644
---- a/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php
-+++ b/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php
-@@ -102,8 +102,7 @@ class GuestPaymentInformationManagementPluginTest extends \PHPUnit\Framework\Tes
-             ['setCustomerEmail', 'getAddressesCollection'],
-             false
-         );
--        $this->checkoutSessionMock->expects($this->once())->method('getQuote')->willReturn($quoteMock);
--        $quoteMock->expects($this->once())->method('getId')->willReturn($cartId);
-+        $this->checkoutSessionMock->method('getQuoteId')->willReturn($cartId);
-         $this->cartRepositoryMock->expects($this->once())->method('get')->with($cartId)->willReturn($quoteMock);
-         $quoteMock->expects($this->once())->method('setCustomerEmail')->with($email);
-         /** @var \Magento\Framework\Data\Collection|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
-diff --git a/app/code/Magento/Persistent/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/Persistent/Test/Unit/Model/Layout/DepersonalizePluginTest.php
-index 9731811ea8a..5ba0182ecc5 100644
---- a/app/code/Magento/Persistent/Test/Unit/Model/Layout/DepersonalizePluginTest.php
-+++ b/app/code/Magento/Persistent/Test/Unit/Model/Layout/DepersonalizePluginTest.php
-@@ -46,9 +46,17 @@ class DepersonalizePluginTest extends \PHPUnit\Framework\TestCase
- 
-         $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
- 
--        $this->moduleManagerMock = $this->createPartialMock(\Magento\Framework\Module\Manager::class, ['isEnabled']);
--        $this->cacheConfigMock = $this->createPartialMock(\Magento\PageCache\Model\Config::class, ['isEnabled']);
--        $this->depersonalizeCheckerMock = $this->createMock(\Magento\PageCache\Model\DepersonalizeChecker::class);
-+        $this->moduleManagerMock = $this->createPartialMock(
-+            \Magento\Framework\Module\ModuleManagerInterface::class,
-+            ['isEnabled']
-+        );
-+        $this->cacheConfigMock = $this->createPartialMock(
-+            \Magento\PageCache\Model\Config::class,
-+            ['isEnabled']
-+        );
-+        $this->depersonalizeCheckerMock = $this->createMock(
-+            \Magento\PageCache\Model\DepersonalizeChecker::class
-+        );
- 
-         $this->plugin = $this->objectManager->getObject(
-             \Magento\Persistent\Model\Layout\DepersonalizePlugin::class,
-diff --git a/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
-index 7008a9eb25e..6d4db70adc6 100644
---- a/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
-+++ b/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
-@@ -80,31 +80,18 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testEmulateWelcomeBlock()
-+    /**
-+     * @return void
-+     */
-+    public function testEmulateWelcomeBlock(): void
-     {
--        $customerId = 1;
--        $customerName = 'Test Customer Name';
--        $welcomeMessage =  __('Welcome, %1!', $customerName);
--        $customerMock = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
-+        $welcomeMessage =  __('&nbsp;');
-         $block = $this->getMockBuilder(\Magento\Framework\View\Element\AbstractBlock::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['setWelcome'])
-             ->getMock();
--        $headerAdditionalBlock = $this->getMockBuilder(\Magento\Framework\View\Element\AbstractBlock::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->persistentSessionMock->expects($this->once())->method('getSession')->willReturn($this->sessionMock);
--        $this->sessionMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
--        $this->customerRepositoryMock
--            ->expects($this->once())
--            ->method('getById')
--            ->with($customerId)->willReturn($customerMock);
--        $this->customerViewHelperMock->expects($this->once())->method('getCustomerName')->willReturn($customerName);
--        $this->layoutMock->expects($this->once())
--            ->method('getBlock')
--            ->with('header.additional')
--            ->willReturn($headerAdditionalBlock);
-         $block->expects($this->once())->method('setWelcome')->with($welcomeMessage);
-+
-         $this->observer->emulateWelcomeBlock($block);
-     }
- }
-diff --git a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
-index 5b96acae1d7..e5de8e7d4aa 100644
---- a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
-+++ b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
-@@ -245,8 +245,8 @@ class QuoteManagerTest extends \PHPUnit\Framework\TestCase
-         $emailArgs = ['email' => null];
- 
-         $this->checkoutSessionMock->expects($this->once())
--            ->method('getQuote')->willReturn($this->quoteMock);
--        $this->quoteMock->expects($this->exactly(2))->method('getId')->willReturn($quoteId);
-+            ->method('getQuoteId')->willReturn($quoteId);
-+        $this->quoteMock->expects($this->once())->method('getId')->willReturn($quoteId);
-         $this->quoteRepositoryMock->expects($this->once())->method('get')->with($quoteId)->willReturn($this->quoteMock);
-         $this->quoteMock->expects($this->once())
-             ->method('setIsActive')->with(true)->willReturn($this->quoteMock);
-@@ -286,21 +286,19 @@ class QuoteManagerTest extends \PHPUnit\Framework\TestCase
-     public function testConvertCustomerCartToGuestWithEmptyQuote()
-     {
-         $this->checkoutSessionMock->expects($this->once())
--            ->method('getQuote')->willReturn($this->quoteMock);
--        $this->quoteMock->expects($this->once())->method('getId')->willReturn(null);
-+            ->method('getQuoteId')->willReturn(null);
-         $this->quoteRepositoryMock->expects($this->once())->method('get')->with(null)->willReturn(null);
--
-         $this->model->convertCustomerCartToGuest();
-     }
- 
-     public function testConvertCustomerCartToGuestWithEmptyQuoteId()
-     {
-         $this->checkoutSessionMock->expects($this->once())
--            ->method('getQuote')->willReturn($this->quoteMock);
--        $this->quoteMock->expects($this->once())->method('getId')->willReturn(1);
-+            ->method('getQuoteId')->willReturn(1);
-         $quoteWithNoId = $this->quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-         $quoteWithNoId->expects($this->once())->method('getId')->willReturn(null);
-         $this->quoteRepositoryMock->expects($this->once())->method('get')->with(1)->willReturn($quoteWithNoId);
-+        $this->quoteMock->expects($this->once())->method('getId')->willReturn(1);
-         $this->model->convertCustomerCartToGuest();
-     }
- }
-diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
-index 46dda1be365..b096dd2317a 100644
---- a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
-+++ b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
-@@ -1,12 +1,16 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- 
- namespace Magento\Persistent\Test\Unit\Observer;
- 
-+use Magento\Quote\Model\Quote;
-+
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class CheckExpirePersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -54,6 +58,11 @@ class CheckExpirePersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
-      */
-     private $requestMock;
- 
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject|Quote
-+     */
-+    private $quoteMock;
-+
-     /**
-      * @inheritdoc
-      */
-@@ -83,6 +92,10 @@ class CheckExpirePersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
-             $this->checkoutSessionMock,
-             $this->requestMock
-         );
-+        $this->quoteMock = $this->getMockBuilder(Quote::class)
-+        ->setMethods(['getCustomerIsGuest', 'getIsPersistent'])
-+        ->disableOriginalConstructor()
-+        ->getMock();
-     }
- 
-     public function testExecuteWhenCanNotApplyPersistentData()
-@@ -133,6 +146,11 @@ class CheckExpirePersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
-             ->willReturn(true);
-         $this->persistentHelperMock->expects($this->once())->method('isEnabled')->willReturn(true);
-         $this->sessionMock->expects($this->once())->method('isPersistent')->willReturn(false);
-+        $this->checkoutSessionMock
-+            ->method('getQuote')
-+            ->willReturn($this->quoteMock);
-+        $this->quoteMock->method('getCustomerIsGuest')->willReturn(true);
-+        $this->quoteMock->method('getIsPersistent')->willReturn(true);
-         $this->customerSessionMock
-             ->expects($this->atLeastOnce())
-             ->method('isLoggedIn')
-diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/SetCheckoutSessionPersistentDataObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/SetCheckoutSessionPersistentDataObserverTest.php
-new file mode 100644
-index 00000000000..01c217c1c5c
---- /dev/null
-+++ b/app/code/Magento/Persistent/Test/Unit/Observer/SetCheckoutSessionPersistentDataObserverTest.php
-@@ -0,0 +1,149 @@
-+<?php
-+/**
-+ *
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Persistent\Test\Unit\Observer;
-+
-+/**
-+ * Class SetCheckoutSessionPersistentDataObserverTest
-+ */
-+class SetCheckoutSessionPersistentDataObserverTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver
-+     */
-+    private $model;
-+
-+    /**
-+     * @var \Magento\Persistent\Helper\Data| \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $helperMock;
-+
-+    /**
-+     * @var \Magento\Persistent\Helper\Session| \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $sessionHelperMock;
-+
-+    /**
-+     * @var \Magento\Checkout\Model\Session| \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $checkoutSessionMock;
-+
-+    /**
-+     * @var \Magento\Customer\Model\Session| \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $customerSessionMock;
-+
-+    /**
-+     * @var \Magento\Persistent\Model\Session| \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $persistentSessionMock;
-+
-+    /**
-+     * @var \Magento\Customer\Api\CustomerRepositoryInterface| \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $customerRepositoryMock;
-+
-+    /**
-+     * @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $observerMock;
-+
-+    /**
-+     * @var \Magento\Framework\Event|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $eventMock;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->helperMock = $this->createMock(\Magento\Persistent\Helper\Data::class);
-+        $this->sessionHelperMock = $this->createMock(\Magento\Persistent\Helper\Session::class);
-+        $this->checkoutSessionMock = $this->createMock(\Magento\Checkout\Model\Session::class);
-+        $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
-+        $this->observerMock = $this->createMock(\Magento\Framework\Event\Observer::class);
-+        $this->eventMock = $this->createPartialMock(\Magento\Framework\Event::class, ['getData']);
-+        $this->persistentSessionMock = $this->createPartialMock(
-+            \Magento\Persistent\Model\Session::class,
-+            ['getCustomerId']
-+        );
-+        $this->customerRepositoryMock = $this->createMock(
-+            \Magento\Customer\Api\CustomerRepositoryInterface::class
-+        );
-+        $this->model = new \Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver(
-+            $this->sessionHelperMock,
-+            $this->customerSessionMock,
-+            $this->helperMock,
-+            $this->customerRepositoryMock
-+        );
-+    }
-+
-+    /**
-+     * Test execute method when session is not persistent
-+     *
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    public function testExecuteWhenSessionIsNotPersistent()
-+    {
-+        $this->observerMock->expects($this->once())
-+            ->method('getEvent')
-+            ->will($this->returnValue($this->eventMock));
-+        $this->eventMock->expects($this->once())
-+            ->method('getData')
-+            ->will($this->returnValue($this->checkoutSessionMock));
-+        $this->sessionHelperMock->expects($this->once())
-+            ->method('isPersistent')
-+            ->will($this->returnValue(false));
-+        $this->checkoutSessionMock->expects($this->never())
-+            ->method('setLoadInactive');
-+        $this->checkoutSessionMock->expects($this->never())
-+            ->method('setCustomerData');
-+        $this->model->execute($this->observerMock);
-+    }
-+
-+    /**
-+     * Test execute method when session is persistent
-+     *
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    public function testExecute()
-+    {
-+        $this->observerMock->expects($this->once())
-+            ->method('getEvent')
-+            ->will($this->returnValue($this->eventMock));
-+        $this->eventMock->expects($this->once())
-+            ->method('getData')
-+            ->will($this->returnValue($this->checkoutSessionMock));
-+        $this->sessionHelperMock->expects($this->exactly(2))
-+            ->method('isPersistent')
-+            ->will($this->returnValue(true));
-+        $this->customerSessionMock->expects($this->once())
-+            ->method('isLoggedIn')
-+            ->will($this->returnValue(false));
-+        $this->helperMock->expects($this->exactly(2))
-+            ->method('isShoppingCartPersist')
-+            ->will($this->returnValue(true));
-+        $this->persistentSessionMock->expects($this->once())
-+            ->method('getCustomerId')
-+            ->will($this->returnValue(123));
-+        $this->sessionHelperMock->expects($this->once())
-+            ->method('getSession')
-+            ->will($this->returnValue($this->persistentSessionMock));
-+        $this->customerRepositoryMock->expects($this->once())
-+            ->method('getById')
-+            ->will($this->returnValue(true)); //?
-+        $this->checkoutSessionMock->expects($this->never())
-+            ->method('setLoadInactive');
-+        $this->checkoutSessionMock->expects($this->once())
-+            ->method('setCustomerData');
-+        $this->model->execute($this->observerMock);
-+    }
-+}
-diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/SetLoadPersistentQuoteObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/SetLoadPersistentQuoteObserverTest.php
-deleted file mode 100644
-index fd78a6852ea..00000000000
---- a/app/code/Magento/Persistent/Test/Unit/Observer/SetLoadPersistentQuoteObserverTest.php
-+++ /dev/null
-@@ -1,73 +0,0 @@
--<?php
--/**
-- *
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Persistent\Test\Unit\Observer;
--
--class SetLoadPersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Persistent\Observer\SetLoadPersistentQuoteObserver
--     */
--    protected $model;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $helperMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $sessionHelperMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $checkoutSessionMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $customerSessionMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $observerMock;
--
--    protected function setUp()
--    {
--        $this->helperMock = $this->createMock(\Magento\Persistent\Helper\Data::class);
--        $this->sessionHelperMock = $this->createMock(\Magento\Persistent\Helper\Session::class);
--        $this->checkoutSessionMock = $this->createMock(\Magento\Checkout\Model\Session::class);
--        $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
--        $this->observerMock = $this->createMock(\Magento\Framework\Event\Observer::class);
--
--        $this->model = new \Magento\Persistent\Observer\SetLoadPersistentQuoteObserver(
--            $this->sessionHelperMock,
--            $this->helperMock,
--            $this->customerSessionMock,
--            $this->checkoutSessionMock
--        );
--    }
--
--    public function testExecuteWhenSessionIsNotPersistent()
--    {
--        $this->sessionHelperMock->expects($this->once())->method('isPersistent')->will($this->returnValue(false));
--        $this->checkoutSessionMock->expects($this->never())->method('setLoadInactive');
--        $this->model->execute($this->observerMock);
--    }
--
--    public function testExecute()
--    {
--        $this->sessionHelperMock->expects($this->once())->method('isPersistent')->will($this->returnValue(true));
--        $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->will($this->returnValue(false));
--        $this->helperMock->expects($this->once())->method('isShoppingCartPersist')->will($this->returnValue(true));
--        $this->checkoutSessionMock->expects($this->never())->method('setLoadInactive');
--        $this->model->execute($this->observerMock);
--    }
--}
-diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
-index 6724743789c..ffa829e8456 100644
---- a/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
-+++ b/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
-@@ -7,6 +7,9 @@
- 
- namespace Magento\Persistent\Test\Unit\Observer;
- 
-+/**
-+ * Observer test for setting "is_persistent" value to quote
-+ */
- class SetQuotePersistentDataObserverTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -83,7 +86,6 @@ class SetQuotePersistentDataObserverTest extends \PHPUnit\Framework\TestCase
-             ->method('getEvent')
-             ->will($this->returnValue($this->eventManagerMock));
-         $this->eventManagerMock->expects($this->once())->method('getQuote');
--        $this->customerSessionMock->expects($this->never())->method('isLoggedIn');
-         $this->model->execute($this->observerMock);
-     }
- 
-@@ -98,8 +100,7 @@ class SetQuotePersistentDataObserverTest extends \PHPUnit\Framework\TestCase
-             ->expects($this->once())
-             ->method('getQuote')
-             ->will($this->returnValue($this->quoteMock));
--        $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->will($this->returnValue(false));
--        $this->helperMock->expects($this->once())->method('isShoppingCartPersist')->will($this->returnValue(false));
-+        $this->helperMock->expects($this->once())->method('isShoppingCartPersist')->will($this->returnValue(true));
-         $this->quoteManagerMock->expects($this->once())->method('isPersistent')->will($this->returnValue(true));
-         $this->quoteMock->expects($this->once())->method('setIsPersistent')->with(true);
-         $this->model->execute($this->observerMock);
-diff --git a/app/code/Magento/Persistent/etc/db_schema.xml b/app/code/Magento/Persistent/etc/db_schema.xml
-index 68678fc60f0..5021d240417 100644
---- a/app/code/Magento/Persistent/etc/db_schema.xml
-+++ b/app/code/Magento/Persistent/etc/db_schema.xml
-@@ -18,22 +18,22 @@
-         <column xsi:type="text" name="info" nullable="true" comment="Session Data"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="persistent_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="PERSISTENT_SESSION_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="PERSISTENT_SESSION_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="persistent_session" column="customer_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="PERSISTENT_SESSION_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-+        <constraint xsi:type="foreign" referenceId="PERSISTENT_SESSION_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-                     table="persistent_session" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="PERSISTENT_SESSION_KEY">
-+        <constraint xsi:type="unique" referenceId="PERSISTENT_SESSION_KEY">
-             <column name="key"/>
-         </constraint>
--        <constraint xsi:type="unique" name="PERSISTENT_SESSION_CUSTOMER_ID">
-+        <constraint xsi:type="unique" referenceId="PERSISTENT_SESSION_CUSTOMER_ID">
-             <column name="customer_id"/>
-         </constraint>
--        <index name="PERSISTENT_SESSION_UPDATED_AT" indexType="btree">
-+        <index referenceId="PERSISTENT_SESSION_UPDATED_AT" indexType="btree">
-             <column name="updated_at"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Persistent/etc/di.xml b/app/code/Magento/Persistent/etc/di.xml
-index f49d4361acb..c28426b4f25 100644
---- a/app/code/Magento/Persistent/etc/di.xml
-+++ b/app/code/Magento/Persistent/etc/di.xml
-@@ -12,4 +12,7 @@
-     <type name="Magento\Customer\CustomerData\Customer">
-         <plugin name="section_data" type="Magento\Persistent\Model\Plugin\CustomerData" />
-     </type>
-+    <type name="Magento\Framework\App\Http\Context">
-+        <plugin name="persistent_page_cache_variation" type="Magento\Persistent\Model\Plugin\PersistentCustomerContext" />
-+    </type>
- </config>
-diff --git a/app/code/Magento/Persistent/etc/frontend/di.xml b/app/code/Magento/Persistent/etc/frontend/di.xml
-index f976f4de79c..3c33f8a51c4 100644
---- a/app/code/Magento/Persistent/etc/frontend/di.xml
-+++ b/app/code/Magento/Persistent/etc/frontend/di.xml
-@@ -35,4 +35,18 @@
-     <type name="Magento\Checkout\Model\GuestPaymentInformationManagement">
-         <plugin name="inject_guest_address_for_nologin" type="Magento\Persistent\Model\Checkout\GuestPaymentInformationManagementPlugin" />
-     </type>
-+    <type name="Magento\Customer\CustomerData\SectionPoolInterface">
-+        <arguments>
-+            <argument name="sectionSourceMap" xsi:type="array">
-+                <item name="persistent" xsi:type="string">Magento\Persistent\CustomerData\Persistent</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Customer\Block\CustomerData">
-+        <arguments>
-+            <argument name="expirableSectionNames" xsi:type="array">
-+                <item name="persistent" xsi:type="string">persistent</item>
-+            </argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Persistent/etc/frontend/events.xml b/app/code/Magento/Persistent/etc/frontend/events.xml
-index 193b9a10818..79720695ea6 100644
---- a/app/code/Magento/Persistent/etc/frontend/events.xml
-+++ b/app/code/Magento/Persistent/etc/frontend/events.xml
-@@ -49,7 +49,7 @@
-         <observer name="persistent" instance="Magento\Persistent\Observer\SetQuotePersistentDataObserver" />
-     </event>
-     <event name="custom_quote_process">
--        <observer name="persistent" instance="Magento\Persistent\Observer\SetLoadPersistentQuoteObserver" />
-+        <observer name="persistent" instance="Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver" />
-     </event>
-     <event name="customer_register_success">
-         <observer name="persistent" instance="Magento\Persistent\Observer\RemovePersistentCookieOnRegisterObserver" />
-diff --git a/app/code/Magento/Persistent/etc/frontend/sections.xml b/app/code/Magento/Persistent/etc/frontend/sections.xml
-new file mode 100644
-index 00000000000..16b44c502fc
---- /dev/null
-+++ b/app/code/Magento/Persistent/etc/frontend/sections.xml
-@@ -0,0 +1,13 @@
-+<?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_Customer:etc/sections.xsd">
-+    <action name="persistent/index/unsetCookie">
-+        <section name="persistent"/>
-+    </action>
-+</config>
-diff --git a/app/code/Magento/Persistent/etc/webapi_rest/events.xml b/app/code/Magento/Persistent/etc/webapi_rest/events.xml
-index 1eff845386b..79dffa18345 100644
---- a/app/code/Magento/Persistent/etc/webapi_rest/events.xml
-+++ b/app/code/Magento/Persistent/etc/webapi_rest/events.xml
-@@ -22,7 +22,7 @@
-         <observer name="persistent" instance="Magento\Persistent\Observer\SetQuotePersistentDataObserver" />
-     </event>
-     <event name="custom_quote_process">
--        <observer name="persistent" instance="Magento\Persistent\Observer\SetLoadPersistentQuoteObserver" />
-+        <observer name="persistent" instance="Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver" />
-     </event>
-     <event name="customer_register_success">
-         <observer name="persistent" instance="Magento\Persistent\Observer\RemovePersistentCookieOnRegisterObserver" />
-diff --git a/app/code/Magento/Persistent/etc/webapi_soap/events.xml b/app/code/Magento/Persistent/etc/webapi_soap/events.xml
-index 1eff845386b..79dffa18345 100644
---- a/app/code/Magento/Persistent/etc/webapi_soap/events.xml
-+++ b/app/code/Magento/Persistent/etc/webapi_soap/events.xml
-@@ -22,7 +22,7 @@
-         <observer name="persistent" instance="Magento\Persistent\Observer\SetQuotePersistentDataObserver" />
-     </event>
-     <event name="custom_quote_process">
--        <observer name="persistent" instance="Magento\Persistent\Observer\SetLoadPersistentQuoteObserver" />
-+        <observer name="persistent" instance="Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver" />
-     </event>
-     <event name="customer_register_success">
-         <observer name="persistent" instance="Magento\Persistent\Observer\RemovePersistentCookieOnRegisterObserver" />
-diff --git a/app/code/Magento/Persistent/view/frontend/requirejs-config.js b/app/code/Magento/Persistent/view/frontend/requirejs-config.js
-new file mode 100644
-index 00000000000..e30e07c454b
---- /dev/null
-+++ b/app/code/Magento/Persistent/view/frontend/requirejs-config.js
-@@ -0,0 +1,14 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+var config = {
-+    config: {
-+        mixins: {
-+            'Magento_Customer/js/customer-data': {
-+                'Magento_Persistent/js/view/customer-data-mixin': true
-+            }
-+        }
-+    }
-+};
-diff --git a/app/code/Magento/Persistent/view/frontend/templates/additional.phtml b/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
-new file mode 100644
-index 00000000000..40c8674bc02
---- /dev/null
-+++ b/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+?>
-+<?php if ($block->getCustomerId()) :?>
-+    <span>
-+        <a <?= /* @noEscape */ $block->getLinkAttributes()?>><?= $block->escapeHtml(__('Not you?'));?></a>
-+    </span>
-+<?php endif;?>
-+<script type="application/javascript">
-+    window.persistent = <?= /* @noEscape */ $block->getConfig(); ?>;
-+</script>
-+<script type="text/x-magento-init">
-+    {
-+        "li.greet.welcome > span.not-logged-in": {
-+            "Magento_Persistent/js/view/additional-welcome": {}
-+        }
-+    }
-+</script>
-diff --git a/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml b/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml
-index 1e04e8ae3b4..0447b3e1b9c 100644
---- a/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml
-+++ b/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * Customer "Remember Me" template
-  */
-@@ -15,7 +13,7 @@
- ?>
- <div id="remember-me-box" class="field choice persistent">
-     <?php $rememberMeId = 'remember_me' . $block->getRandomString(10); ?>
--    <input type="checkbox" name="persistent_remember_me" class="checkbox" id="<?= $block->escapeHtmlAttr($rememberMeId) ?>"<?php if ($block->isRememberMeChecked()): ?> checked="checked"<?php endif; ?> title="<?= $block->escapeHtmlAttr(__('Remember Me')) ?>" />
-+    <input type="checkbox" name="persistent_remember_me" class="checkbox" id="<?= $block->escapeHtmlAttr($rememberMeId) ?>"<?php if ($block->isRememberMeChecked()) : ?> checked="checked"<?php endif; ?> title="<?= $block->escapeHtmlAttr(__('Remember Me')) ?>" />
-     <label for="<?= $block->escapeHtmlAttr($rememberMeId) ?>" class="label"><span><?= $block->escapeHtml(__('Remember Me')) ?></span></label>
-     <span class="tooltip wrapper">
-         <a class="link tooltip toggle" href="#"><?= $block->escapeHtml(__('What\'s this?')) ?></a>
-diff --git a/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
-new file mode 100644
-index 00000000000..7ace6e60d1c
---- /dev/null
-+++ b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
-@@ -0,0 +1,55 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'jquery',
-+    'mage/translate',
-+    'Magento_Customer/js/customer-data'
-+], function ($, $t, customerData) {
-+    'use strict';
-+
-+    return {
-+        /**
-+         * Init.
-+         */
-+        init: function () {
-+            var persistent = customerData.get('persistent');
-+
-+            if (persistent().fullname === undefined) {
-+                customerData.get('persistent').subscribe(this.replacePersistentWelcome);
-+            } else {
-+                this.replacePersistentWelcome();
-+            }
-+        },
-+
-+        /**
-+         * Replace welcome message for customer with persistent cookie.
-+         */
-+        replacePersistentWelcome: function () {
-+            var persistent = customerData.get('persistent'),
-+                welcomeElems;
-+
-+            if (persistent().fullname !== undefined) {
-+                welcomeElems = $('li.greet.welcome > span.not-logged-in');
-+
-+                if (welcomeElems.length) {
-+                    $(welcomeElems).each(function () {
-+                        var html = $t('Welcome, %1!').replace('%1', persistent().fullname);
-+
-+                        $(this).attr('data-bind', html);
-+                        $(this).html(html);
-+                    });
-+                }
-+            }
-+        },
-+
-+        /**
-+         * @constructor
-+         */
-+        'Magento_Persistent/js/view/additional-welcome': function () {
-+            this.init();
-+        }
-+    };
-+});
-diff --git a/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js b/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js
-new file mode 100644
-index 00000000000..855404c6f6f
---- /dev/null
-+++ b/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js
-@@ -0,0 +1,51 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+define([
-+    'jquery',
-+    'mage/utils/wrapper'
-+], function ($, wrapper) {
-+    'use strict';
-+
-+    var mixin = {
-+
-+        /**
-+         * Check if persistent section is expired due to lifetime.
-+         *
-+         * @param {Function} originFn - Original method.
-+         * @return {Array}
-+         */
-+        getExpiredSectionNames: function (originFn) {
-+            var expiredSections = originFn(),
-+                storage = $.initNamespaceStorage('mage-cache-storage').localStorage,
-+                currentTimestamp = Math.floor(Date.now() / 1000),
-+                persistentIndex = expiredSections.indexOf('persistent'),
-+                persistentLifeTime = 0,
-+                sectionData;
-+
-+            if (window.persistent !== undefined && window.persistent.expirationLifetime !== undefined) {
-+                persistentLifeTime = window.persistent.expirationLifetime;
-+            }
-+
-+            if (persistentIndex !== -1) {
-+                sectionData = storage.get('persistent');
-+
-+                if (typeof sectionData === 'object' &&
-+                    sectionData['data_id'] + persistentLifeTime >= currentTimestamp
-+                ) {
-+                    expiredSections.splice(persistentIndex, 1);
-+                }
-+            }
-+
-+            return expiredSections;
-+        }
-+    };
-+
-+    /**
-+     * Override default customer-data.getExpiredSectionNames().
-+     */
-+    return function (target) {
-+        return wrapper.extend(target, mixin);
-+    };
-+});
-diff --git a/app/code/Magento/ProductAlert/Controller/Add/Price.php b/app/code/Magento/ProductAlert/Controller/Add/Price.php
-index 04e623105e6..b7519f0bc7a 100644
---- a/app/code/Magento/ProductAlert/Controller/Add/Price.php
-+++ b/app/code/Magento/ProductAlert/Controller/Add/Price.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\ProductAlert\Controller\Add;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\ProductAlert\Controller\Add as AddController;
- use Magento\Framework\App\Action\Context;
- use Magento\Customer\Model\Session as CustomerSession;
-@@ -16,7 +17,10 @@ use Magento\Framework\App\Action\Action;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Framework\Exception\NoSuchEntityException;
- 
--class Price extends AddController
-+/**
-+ * Controller for notifying about price.
-+ */
-+class Price extends AddController implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Store\Model\StoreManagerInterface
-@@ -62,6 +66,8 @@ class Price extends AddController
-     }
- 
-     /**
-+     * Method for adding info about product alert price.
-+     *
-      * @return \Magento\Framework\Controller\Result\Redirect
-      */
-     public function execute()
-@@ -75,6 +81,7 @@ class Price extends AddController
-             return $resultRedirect;
-         }
- 
-+        $store = $this->storeManager->getStore();
-         try {
-             /* @var $product \Magento\Catalog\Model\Product */
-             $product = $this->productRepository->getById($productId);
-@@ -83,11 +90,8 @@ class Price extends AddController
-                 ->setCustomerId($this->customerSession->getCustomerId())
-                 ->setProductId($product->getId())
-                 ->setPrice($product->getFinalPrice())
--                ->setWebsiteId(
--                    $this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
--                        ->getStore()
--                        ->getWebsiteId()
--                );
-+                ->setWebsiteId($store->getWebsiteId())
-+                ->setStoreId($store->getId());
-             $model->save();
-             $this->messageManager->addSuccess(__('You saved the alert subscription.'));
-         } catch (NoSuchEntityException $noEntityException) {
-diff --git a/app/code/Magento/ProductAlert/Controller/Add/Stock.php b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
-index 56d052f7e11..f36fdf5fb71 100644
---- a/app/code/Magento/ProductAlert/Controller/Add/Stock.php
-+++ b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\ProductAlert\Controller\Add;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\ProductAlert\Controller\Add as AddController;
- use Magento\Framework\App\Action\Context;
- use Magento\Customer\Model\Session as CustomerSession;
-@@ -13,29 +14,44 @@ use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Framework\App\Action\Action;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Store\Model\StoreManagerInterface;
- 
--class Stock extends AddController
-+/**
-+ * Controller for notifying about stock.
-+ */
-+class Stock extends AddController implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-      */
-     protected $productRepository;
- 
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-     /**
-      * @param \Magento\Framework\App\Action\Context $context
-      * @param \Magento\Customer\Model\Session $customerSession
-      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-+     * @param StoreManagerInterface|null $storeManager
-      */
-     public function __construct(
-         Context $context,
-         CustomerSession $customerSession,
--        ProductRepositoryInterface $productRepository
-+        ProductRepositoryInterface $productRepository,
-+        StoreManagerInterface $storeManager = null
-     ) {
-         $this->productRepository = $productRepository;
-         parent::__construct($context, $customerSession);
-+        $this->storeManager = $storeManager ?: $this->_objectManager
-+            ->get(\Magento\Store\Model\StoreManagerInterface::class);
-     }
- 
-     /**
-+     * Method for adding info about product alert stock.
-+     *
-      * @return \Magento\Framework\Controller\Result\Redirect
-      */
-     public function execute()
-@@ -52,15 +68,13 @@ class Stock extends AddController
-         try {
-             /* @var $product \Magento\Catalog\Model\Product */
-             $product = $this->productRepository->getById($productId);
-+            $store = $this->storeManager->getStore();
-             /** @var \Magento\ProductAlert\Model\Stock $model */
-             $model = $this->_objectManager->create(\Magento\ProductAlert\Model\Stock::class)
-                 ->setCustomerId($this->customerSession->getCustomerId())
-                 ->setProductId($product->getId())
--                ->setWebsiteId(
--                    $this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
--                        ->getStore()
--                        ->getWebsiteId()
--                );
-+                ->setWebsiteId($store->getWebsiteId())
-+                ->setStoreId($store->getId());
-             $model->save();
-             $this->messageManager->addSuccess(__('Alert subscription has been saved.'));
-         } catch (NoSuchEntityException $noEntityException) {
-diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
-index 7a6aeb40eb5..1b729f988e4 100644
---- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
-+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
-@@ -4,43 +4,72 @@
-  * See COPYING.txt for license details.
-  */
- 
-+declare(strict_types=1);
-+
- namespace Magento\ProductAlert\Controller\Unsubscribe;
- 
--use Magento\ProductAlert\Controller\Unsubscribe as UnsubscribeController;
--use Magento\Framework\App\Action\Context;
--use Magento\Customer\Model\Session as CustomerSession;
- use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Customer\Model\Session as CustomerSession;
-+use Magento\Framework\App\Action\Context;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Controller\Result\Redirect;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\ProductAlert\Controller\Unsubscribe as UnsubscribeController;
-+use Magento\ProductAlert\Model\StockFactory;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Catalog\Api\Data\ProductInterface;
- 
--class Stock extends UnsubscribeController
-+/**
-+ * Unsubscribing from 'back in stock alert'.
-+ */
-+class Stock extends UnsubscribeController implements HttpPostActionInterface
- {
-     /**
--     * @var \Magento\Catalog\Api\ProductRepositoryInterface
-+     * @var ProductRepositoryInterface
-      */
-     protected $productRepository;
- 
-     /**
--     * @param \Magento\Framework\App\Action\Context $context
--     * @param \Magento\Customer\Model\Session $customerSession
--     * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-+     * @var StoreManagerInterface|null
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var StockFactory|null
-+     */
-+    private $stockFactory;
-+
-+    /**
-+     * @param Context $context
-+     * @param CustomerSession $customerSession
-+     * @param ProductRepositoryInterface $productRepository
-+     * @param StoreManagerInterface|null $storeManager
-+     * @param StockFactory|null $stockFactory
-      */
-     public function __construct(
-         Context $context,
-         CustomerSession $customerSession,
--        ProductRepositoryInterface $productRepository
-+        ProductRepositoryInterface $productRepository,
-+        StoreManagerInterface $storeManager = null,
-+        StockFactory $stockFactory = null
-     ) {
-         $this->productRepository = $productRepository;
-+        $this->storeManager = $storeManager ?? ObjectManager::getInstance()->get(StoreManagerInterface::class);
-+        $this->stockFactory = $stockFactory ?? ObjectManager::getInstance()->get(StockFactory::class);
-         parent::__construct($context, $customerSession);
-     }
- 
-     /**
--     * @return \Magento\Framework\Controller\Result\Redirect
-+     * Unsubscribing from 'back in stock alert'.
-+     *
-+     * @return Redirect
-      */
-     public function execute()
-     {
-         $productId = (int)$this->getRequest()->getParam('product');
--        /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
-+        /** @var Redirect $resultRedirect */
-         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-         if (!$productId) {
-             $resultRedirect->setPath('/');
-@@ -48,18 +77,18 @@ class Stock extends UnsubscribeController
-         }
- 
-         try {
--            $product = $this->productRepository->getById($productId);
--            if (!$product->isVisibleInCatalog()) {
--                throw new NoSuchEntityException();
--            }
--
--            $model = $this->_objectManager->create(\Magento\ProductAlert\Model\Stock::class)
-+            $product = $this->retrieveProduct($productId);
-+            $model = $this->stockFactory->create()
-                 ->setCustomerId($this->customerSession->getCustomerId())
-                 ->setProductId($product->getId())
-                 ->setWebsiteId(
--                    $this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
-+                    $this->storeManager
-                         ->getStore()
-                         ->getWebsiteId()
-+                )->setStoreId(
-+                    $this->storeManager
-+                        ->getStore()
-+                        ->getId()
-                 )
-                 ->loadByParam();
-             if ($model->getId()) {
-@@ -79,4 +108,21 @@ class Stock extends UnsubscribeController
-         $resultRedirect->setUrl($product->getProductUrl());
-         return $resultRedirect;
-     }
-+
-+    /**
-+     * Retrieving product
-+     *
-+     * @param int $productId
-+     *
-+     * @return ProductInterface
-+     * @throws NoSuchEntityException
-+     */
-+    private function retrieveProduct(int $productId): ProductInterface
-+    {
-+        $product = $this->productRepository->getById($productId);
-+        if (!$product->isVisibleInCatalog()) {
-+            throw new NoSuchEntityException();
-+        }
-+        return $product;
-+    }
- }
-diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
-index 7bc4aba3515..3351166aa6a 100644
---- a/app/code/Magento/ProductAlert/Model/Email.php
-+++ b/app/code/Magento/ProductAlert/Model/Email.php
-@@ -1,10 +1,36 @@
- <?php
-+
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\ProductAlert\Model;
- 
-+use Magento\Catalog\Model\Product;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Customer\Helper\View;
-+use Magento\Framework\App\Area;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\Data\Collection\AbstractDb;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\MailException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Mail\Template\TransportBuilder;
-+use Magento\Framework\Model\AbstractModel;
-+use Magento\Framework\Model\Context;
-+use Magento\Framework\Model\ResourceModel\AbstractResource;
-+use Magento\Framework\Registry;
-+use Magento\ProductAlert\Block\Email\AbstractEmail;
-+use Magento\ProductAlert\Block\Email\Price;
-+use Magento\ProductAlert\Block\Email\Stock;
-+use Magento\ProductAlert\Helper\Data;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Store\Model\App\Emulation;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Store\Model\Website;
-+
- /**
-  * ProductAlert Email processor
-  *
-@@ -13,8 +39,10 @@ namespace Magento\ProductAlert\Model;
-  *
-  * @api
-  * @since 100.0.2
-+ * @method int getStoreId()
-+ * @method $this setStoreId()
-  */
--class Email extends \Magento\Framework\Model\AbstractModel
-+class Email extends AbstractModel
- {
-     const XML_PATH_EMAIL_PRICE_TEMPLATE = 'catalog/productalert/email_price_template';
- 
-@@ -32,14 +60,14 @@ class Email extends \Magento\Framework\Model\AbstractModel
-     /**
-      * Website Model
-      *
--     * @var \Magento\Store\Model\Website
-+     * @var Website
-      */
-     protected $_website;
- 
-     /**
-      * Customer model
-      *
--     * @var \Magento\Customer\Api\Data\CustomerInterface
-+     * @var CustomerInterface
-      */
-     protected $_customer;
- 
-@@ -60,83 +88,83 @@ class Email extends \Magento\Framework\Model\AbstractModel
-     /**
-      * Price block
-      *
--     * @var \Magento\ProductAlert\Block\Email\Price
-+     * @var Price
-      */
-     protected $_priceBlock;
- 
-     /**
-      * Stock block
-      *
--     * @var \Magento\ProductAlert\Block\Email\Stock
-+     * @var Stock
-      */
-     protected $_stockBlock;
- 
-     /**
-      * Product alert data
-      *
--     * @var \Magento\ProductAlert\Helper\Data
-+     * @var Data
-      */
-     protected $_productAlertData = null;
- 
-     /**
-      * Core store config
-      *
--     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-+     * @var ScopeConfigInterface
-      */
-     protected $_scopeConfig;
- 
-     /**
--     * @var \Magento\Store\Model\StoreManagerInterface
-+     * @var StoreManagerInterface
-      */
-     protected $_storeManager;
- 
-     /**
--     * @var \Magento\Customer\Api\CustomerRepositoryInterface
-+     * @var CustomerRepositoryInterface
-      */
-     protected $customerRepository;
- 
-     /**
--     * @var \Magento\Store\Model\App\Emulation
-+     * @var Emulation
-      */
-     protected $_appEmulation;
- 
-     /**
--     * @var \Magento\Framework\Mail\Template\TransportBuilder
-+     * @var TransportBuilder
-      */
-     protected $_transportBuilder;
- 
-     /**
--     * @var \Magento\Customer\Helper\View
-+     * @var View
-      */
-     protected $_customerHelper;
- 
-     /**
--     * @param \Magento\Framework\Model\Context $context
--     * @param \Magento\Framework\Registry $registry
--     * @param \Magento\ProductAlert\Helper\Data $productAlertData
--     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
--     * @param \Magento\Customer\Helper\View $customerHelper
--     * @param \Magento\Store\Model\App\Emulation $appEmulation
--     * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
--     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
--     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-+     * @param Context $context
-+     * @param Registry $registry
-+     * @param Data $productAlertData
-+     * @param ScopeConfigInterface $scopeConfig
-+     * @param StoreManagerInterface $storeManager
-+     * @param CustomerRepositoryInterface $customerRepository
-+     * @param View $customerHelper
-+     * @param Emulation $appEmulation
-+     * @param TransportBuilder $transportBuilder
-+     * @param AbstractResource $resource
-+     * @param AbstractDb $resourceCollection
-      * @param array $data
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
--        \Magento\Framework\Model\Context $context,
--        \Magento\Framework\Registry $registry,
--        \Magento\ProductAlert\Helper\Data $productAlertData,
--        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
--        \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
--        \Magento\Customer\Helper\View $customerHelper,
--        \Magento\Store\Model\App\Emulation $appEmulation,
--        \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
--        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
--        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-+        Context $context,
-+        Registry $registry,
-+        Data $productAlertData,
-+        ScopeConfigInterface $scopeConfig,
-+        StoreManagerInterface $storeManager,
-+        CustomerRepositoryInterface $customerRepository,
-+        View $customerHelper,
-+        Emulation $appEmulation,
-+        TransportBuilder $transportBuilder,
-+        AbstractResource $resource = null,
-+        AbstractDb $resourceCollection = null,
-         array $data = []
-     ) {
-         $this->_productAlertData = $productAlertData;
-@@ -153,6 +181,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
-      * Set model type
-      *
-      * @param string $type
-+     *
-      * @return void
-      */
-     public function setType($type)
-@@ -173,7 +202,8 @@ class Email extends \Magento\Framework\Model\AbstractModel
-     /**
-      * Set website model
-      *
--     * @param \Magento\Store\Model\Website $website
-+     * @param Website $website
-+     *
-      * @return $this
-      */
-     public function setWebsite(\Magento\Store\Model\Website $website)
-@@ -186,7 +216,9 @@ class Email extends \Magento\Framework\Model\AbstractModel
-      * Set website id
-      *
-      * @param int $websiteId
-+     *
-      * @return $this
-+     * @throws LocalizedException
-      */
-     public function setWebsiteId($websiteId)
-     {
-@@ -198,7 +230,10 @@ class Email extends \Magento\Framework\Model\AbstractModel
-      * Set customer by id
-      *
-      * @param int $customerId
-+     *
-      * @return $this
-+     * @throws LocalizedException
-+     * @throws NoSuchEntityException
-      */
-     public function setCustomerId($customerId)
-     {
-@@ -209,7 +244,8 @@ class Email extends \Magento\Framework\Model\AbstractModel
-     /**
-      * Set customer model
-      *
--     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-+     * @param CustomerInterface $customer
-+     *
-      * @return $this
-      */
-     public function setCustomerData($customer)
-@@ -235,7 +271,8 @@ class Email extends \Magento\Framework\Model\AbstractModel
-     /**
-      * Add product (price change) to collection
-      *
--     * @param \Magento\Catalog\Model\Product $product
-+     * @param Product $product
-+     *
-      * @return $this
-      */
-     public function addPriceProduct(\Magento\Catalog\Model\Product $product)
-@@ -247,7 +284,8 @@ class Email extends \Magento\Framework\Model\AbstractModel
-     /**
-      * Add product (back in stock) to collection
-      *
--     * @param \Magento\Catalog\Model\Product $product
-+     * @param Product $product
-+     *
-      * @return $this
-      */
-     public function addStockProduct(\Magento\Catalog\Model\Product $product)
-@@ -259,12 +297,13 @@ class Email extends \Magento\Framework\Model\AbstractModel
-     /**
-      * Retrieve price block
-      *
--     * @return \Magento\ProductAlert\Block\Email\Price
-+     * @return Price
-+     * @throws LocalizedException
-      */
-     protected function _getPriceBlock()
-     {
-         if ($this->_priceBlock === null) {
--            $this->_priceBlock = $this->_productAlertData->createBlock(\Magento\ProductAlert\Block\Email\Price::class);
-+            $this->_priceBlock = $this->_productAlertData->createBlock(Price::class);
-         }
-         return $this->_priceBlock;
-     }
-@@ -272,12 +311,13 @@ class Email extends \Magento\Framework\Model\AbstractModel
-     /**
-      * Retrieve stock block
-      *
--     * @return \Magento\ProductAlert\Block\Email\Stock
-+     * @return Stock
-+     * @throws LocalizedException
-      */
-     protected function _getStockBlock()
-     {
-         if ($this->_stockBlock === null) {
--            $this->_stockBlock = $this->_productAlertData->createBlock(\Magento\ProductAlert\Block\Email\Stock::class);
-+            $this->_stockBlock = $this->_productAlertData->createBlock(Stock::class);
-         }
-         return $this->_stockBlock;
-     }
-@@ -286,110 +326,131 @@ class Email extends \Magento\Framework\Model\AbstractModel
-      * Send customer email
-      *
-      * @return bool
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.NPathComplexity)
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     * @throws MailException
-+     * @throws NoSuchEntityException
-+     * @throws LocalizedException
-      */
-     public function send()
-     {
--        if ($this->_website === null || $this->_customer === null) {
--            return false;
--        }
--        if ($this->_type == 'price' && count(
--            $this->_priceProducts
--        ) == 0 || $this->_type == 'stock' && count(
--            $this->_stockProducts
--        ) == 0
--        ) {
--            return false;
--        }
--        if (!$this->_website->getDefaultGroup() || !$this->_website->getDefaultGroup()->getDefaultStore()) {
-+        if ($this->_website === null || $this->_customer === null || !$this->isExistDefaultStore()) {
-             return false;
-         }
- 
--        if ($this->_customer->getStoreId() > 0) {
--            $store = $this->_storeManager->getStore($this->_customer->getStoreId());
--        } else {
--            $store = $this->_website->getDefaultStore();
--        }
--        $storeId = $store->getId();
--
--        if ($this->_type == 'price' && !$this->_scopeConfig->getValue(
--            self::XML_PATH_EMAIL_PRICE_TEMPLATE,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
--            $storeId
--        )
--        ) {
--            return false;
--        } elseif ($this->_type == 'stock' && !$this->_scopeConfig->getValue(
--            self::XML_PATH_EMAIL_STOCK_TEMPLATE,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
--            $storeId
--        )
--        ) {
-+        $products = $this->getProducts();
-+        $templateConfigPath = $this->getTemplateConfigPath();
-+        if (!in_array($this->_type, ['price', 'stock']) || count($products) === 0 || !$templateConfigPath) {
-             return false;
-         }
- 
--        if ($this->_type != 'price' && $this->_type != 'stock') {
--            return false;
--        }
-+        $storeId = $this->getStoreId() ?: (int) $this->_customer->getStoreId();
-+        $store = $this->getStore($storeId);
- 
-         $this->_appEmulation->startEnvironmentEmulation($storeId);
- 
--        if ($this->_type == 'price') {
--            $this->_getPriceBlock()->setStore($store)->reset();
--            foreach ($this->_priceProducts as $product) {
--                $product->setCustomerGroupId($this->_customer->getGroupId());
--                $this->_getPriceBlock()->addProduct($product);
--            }
--            $block = $this->_getPriceBlock();
--            $templateId = $this->_scopeConfig->getValue(
--                self::XML_PATH_EMAIL_PRICE_TEMPLATE,
--                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
--                $storeId
--            );
--        } else {
--            $this->_getStockBlock()->setStore($store)->reset();
--            foreach ($this->_stockProducts as $product) {
--                $product->setCustomerGroupId($this->_customer->getGroupId());
--                $this->_getStockBlock()->addProduct($product);
--            }
--            $block = $this->_getStockBlock();
--            $templateId = $this->_scopeConfig->getValue(
--                self::XML_PATH_EMAIL_STOCK_TEMPLATE,
--                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
--                $storeId
--            );
-+        $block = $this->getBlock();
-+        $block->setStore($store)->reset();
-+
-+        // Add products to the block
-+        foreach ($products as $product) {
-+            $product->setCustomerGroupId($this->_customer->getGroupId());
-+            $block->addProduct($product);
-         }
- 
-+        $templateId = $this->_scopeConfig->getValue(
-+            $templateConfigPath,
-+            ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-+
-         $alertGrid = $this->_appState->emulateAreaCode(
--            \Magento\Framework\App\Area::AREA_FRONTEND,
-+            Area::AREA_FRONTEND,
-             [$block, 'toHtml']
-         );
-         $this->_appEmulation->stopEnvironmentEmulation();
- 
--        $transport = $this->_transportBuilder->setTemplateIdentifier(
-+        $customerName = $this->_customerHelper->getCustomerName($this->_customer);
-+        $this->_transportBuilder->setTemplateIdentifier(
-             $templateId
-         )->setTemplateOptions(
--            ['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => $storeId]
-+            ['area' => Area::AREA_FRONTEND, 'store' => $storeId]
-         )->setTemplateVars(
-             [
--                'customerName' => $this->_customerHelper->getCustomerName($this->_customer),
-+                'customerName' => $customerName,
-                 'alertGrid' => $alertGrid,
-             ]
-         )->setFrom(
-             $this->_scopeConfig->getValue(
-                 self::XML_PATH_EMAIL_IDENTITY,
--                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+                ScopeInterface::SCOPE_STORE,
-                 $storeId
-             )
-         )->addTo(
-             $this->_customer->getEmail(),
--            $this->_customerHelper->getCustomerName($this->_customer)
--        )->getTransport();
-+            $customerName
-+        )->getTransport()->sendMessage();
-+
-+        return true;
-+    }
-+
-+    /**
-+     * Retrieve the store for the email
-+     *
-+     * @param int $storeId
-+     * @return StoreInterface
-+     * @throws NoSuchEntityException
-+     */
-+    private function getStore(int $storeId): StoreInterface
-+    {
-+        return $this->_storeManager->getStore($storeId);
-+    }
-+
-+    /**
-+     * Retrieve the block for the email based on type
-+     *
-+     * @return Price|Stock
-+     * @throws LocalizedException
-+     */
-+    private function getBlock(): AbstractEmail
-+    {
-+        return $this->_type === 'price'
-+            ? $this->_getPriceBlock()
-+            : $this->_getStockBlock();
-+    }
- 
--        $transport->sendMessage();
-+    /**
-+     * Retrieve the products for the email based on type
-+     *
-+     * @return array
-+     */
-+    private function getProducts(): array
-+    {
-+        return $this->_type === 'price'
-+            ? $this->_priceProducts
-+            : $this->_stockProducts;
-+    }
- 
-+    /**
-+     * Retrieve template config path based on type
-+     *
-+     * @return string
-+     */
-+    private function getTemplateConfigPath(): string
-+    {
-+        return $this->_type === 'price'
-+            ? self::XML_PATH_EMAIL_PRICE_TEMPLATE
-+            : self::XML_PATH_EMAIL_STOCK_TEMPLATE;
-+    }
-+
-+    /**
-+     * Check if exists default store.
-+     *
-+     * @return bool
-+     */
-+    private function isExistDefaultStore(): bool
-+    {
-+        if (!$this->_website->getDefaultGroup() || !$this->_website->getDefaultGroup()->getDefaultStore()) {
-+            return false;
-+        }
-         return true;
-     }
- }
-diff --git a/app/code/Magento/ProductAlert/Model/Observer.php b/app/code/Magento/ProductAlert/Model/Observer.php
-index 1870989f11d..addc61d2f49 100644
---- a/app/code/Magento/ProductAlert/Model/Observer.php
-+++ b/app/code/Magento/ProductAlert/Model/Observer.php
-@@ -218,6 +218,7 @@ class Observer
-             $previousCustomer = null;
-             $email->setWebsite($website);
-             foreach ($collection as $alert) {
-+                $this->setAlertStoreId($alert, $email);
-                 try {
-                     if (!$previousCustomer || $previousCustomer->getId() != $alert->getCustomerId()) {
-                         $customer = $this->customerRepository->getById($alert->getCustomerId());
-@@ -311,6 +312,7 @@ class Observer
-             $previousCustomer = null;
-             $email->setWebsite($website);
-             foreach ($collection as $alert) {
-+                $this->setAlertStoreId($alert, $email);
-                 try {
-                     if (!$previousCustomer || $previousCustomer->getId() != $alert->getCustomerId()) {
-                         $customer = $this->customerRepository->getById($alert->getCustomerId());
-@@ -427,4 +429,21 @@ class Observer
- 
-         return $this;
-     }
-+
-+    /**
-+     * Set alert store id.
-+     *
-+     * @param \Magento\ProductAlert\Model\Price|\Magento\ProductAlert\Model\Stock $alert
-+     * @param Email $email
-+     * @return Observer
-+     */
-+    private function setAlertStoreId($alert, \Magento\ProductAlert\Model\Email $email) : Observer
-+    {
-+        $alertStoreId = $alert->getStoreId();
-+        if ($alertStoreId) {
-+            $email->setStoreId((int)$alertStoreId);
-+        }
-+
-+        return $this;
-+    }
- }
-diff --git a/app/code/Magento/ProductAlert/Model/Price.php b/app/code/Magento/ProductAlert/Model/Price.php
-index 0c12b7cfb48..ecdf4578838 100644
---- a/app/code/Magento/ProductAlert/Model/Price.php
-+++ b/app/code/Magento/ProductAlert/Model/Price.php
-@@ -26,6 +26,8 @@ use Magento\ProductAlert\Model\ResourceModel\Price\Customer\Collection;
-  * @method \Magento\ProductAlert\Model\Price setSendCount(int $value)
-  * @method int getStatus()
-  * @method \Magento\ProductAlert\Model\Price setStatus(int $value)
-+ * @method int getStoreId()
-+ * @method \Magento\ProductAlert\Model\Stock setStoreId(int $value)
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  *
-@@ -60,6 +62,8 @@ class Price extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Create customer collection.
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -68,6 +72,8 @@ class Price extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Create customer collection.
-+     *
-      * @return Collection
-      */
-     public function getCustomerCollection()
-@@ -76,6 +82,8 @@ class Price extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Load by param.
-+     *
-      * @return $this
-      */
-     public function loadByParam()
-@@ -87,6 +95,8 @@ class Price extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Method for deleting customer from website.
-+     *
-      * @param int $customerId
-      * @param int $websiteId
-      * @return $this
-diff --git a/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php b/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php
-index 710ede8ecef..c7b3d59138e 100644
---- a/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php
-+++ b/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\ProductAlert\Model\ResourceModel;
- 
-+use Magento\Framework\Model\AbstractModel;
-+
- /**
-  * Product alert for back in abstract resource model
-  *
-@@ -15,13 +17,13 @@ abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\D
-     /**
-      * Retrieve alert row by object parameters
-      *
--     * @param \Magento\Framework\Model\AbstractModel $object
-+     * @param AbstractModel $object
-      * @return array|false
-      */
--    protected function _getAlertRow(\Magento\Framework\Model\AbstractModel $object)
-+    protected function _getAlertRow(AbstractModel $object)
-     {
-         $connection = $this->getConnection();
--        if ($object->getCustomerId() && $object->getProductId() && $object->getWebsiteId()) {
-+        if ($this->isExistAllBindIds($object)) {
-             $select = $connection->select()->from(
-                 $this->getMainTable()
-             )->where(
-@@ -30,24 +32,41 @@ abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\D
-                 'product_id  = :product_id'
-             )->where(
-                 'website_id  = :website_id'
-+            )->where(
-+                'store_id = :store_id'
-             );
-             $bind = [
-                 ':customer_id' => $object->getCustomerId(),
-                 ':product_id' => $object->getProductId(),
-                 ':website_id' => $object->getWebsiteId(),
-+                ':store_id' => $object->getStoreId()
-             ];
-             return $connection->fetchRow($select, $bind);
-         }
-         return false;
-     }
- 
-+    /**
-+     * Is exists all bind ids.
-+     *
-+     * @param AbstractModel $object
-+     * @return bool
-+     */
-+    private function isExistAllBindIds(AbstractModel $object): bool
-+    {
-+        return ($object->getCustomerId()
-+            && $object->getProductId()
-+            && $object->getWebsiteId()
-+            && $object->getStoreId());
-+    }
-+
-     /**
-      * Load object data by parameters
-      *
--     * @param \Magento\Framework\Model\AbstractModel $object
-+     * @param AbstractModel $object
-      * @return $this
-      */
--    public function loadByParam(\Magento\Framework\Model\AbstractModel $object)
-+    public function loadByParam(AbstractModel $object)
-     {
-         $row = $this->_getAlertRow($object);
-         if ($row) {
-@@ -59,13 +78,13 @@ abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\D
-     /**
-      * Delete all customer alerts on website
-      *
--     * @param \Magento\Framework\Model\AbstractModel $object
-+     * @param AbstractModel $object
-      * @param int $customerId
-      * @param int $websiteId
-      * @return $this
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    public function deleteCustomer(\Magento\Framework\Model\AbstractModel $object, $customerId, $websiteId = null)
-+    public function deleteCustomer(AbstractModel $object, $customerId, $websiteId = null)
-     {
-         $connection = $this->getConnection();
-         $where = [];
-diff --git a/app/code/Magento/ProductAlert/Model/Stock.php b/app/code/Magento/ProductAlert/Model/Stock.php
-index 4d4dea5c2fe..99ba95e6339 100644
---- a/app/code/Magento/ProductAlert/Model/Stock.php
-+++ b/app/code/Magento/ProductAlert/Model/Stock.php
-@@ -24,6 +24,8 @@ use Magento\ProductAlert\Model\ResourceModel\Stock\Customer\Collection;
-  * @method \Magento\ProductAlert\Model\Stock setSendCount(int $value)
-  * @method int getStatus()
-  * @method \Magento\ProductAlert\Model\Stock setStatus(int $value)
-+ * @method int getStoreId()
-+ * @method \Magento\ProductAlert\Model\Stock setStoreId(int $value)
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  *
-@@ -58,6 +60,8 @@ class Stock extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Class constructor.
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -66,6 +70,8 @@ class Stock extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Create customer collection.
-+     *
-      * @return Collection
-      */
-     public function getCustomerCollection()
-@@ -74,6 +80,8 @@ class Stock extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Load by param.
-+     *
-      * @return $this
-      */
-     public function loadByParam()
-@@ -85,6 +93,8 @@ class Stock extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Method for deleting customer from website.
-+     *
-      * @param int $customerId
-      * @param int $websiteId
-      * @return $this
-diff --git a/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php b/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php
-index 9cd8546a018..e3a2056a89e 100644
---- a/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php
-+++ b/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\ProductAlert\Test\Unit\Model;
- 
-+use Magento\Customer\Api\Data\CustomerInterface;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\ProductAlert\Model\ProductSalability;
- 
-@@ -115,6 +116,9 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-      */
-     private $productSalabilityMock;
- 
-+    /**
-+     * @return void
-+     */
-     protected function setUp()
-     {
-         $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
-@@ -296,8 +300,8 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-             ->method('setCustomerOrder')
-             ->willReturn(new \ArrayIterator($items));
- 
--        $customer = new \Magento\Framework\DataObject(['group_id' => $id]);
--        $this->customerRepositoryMock->expects($this->once())->method('getById')->willReturn($customer);
-+        $customerMock = $this->getMockForAbstractClass(CustomerInterface::class);
-+        $this->customerRepositoryMock->expects($this->once())->method('getById')->willReturn($customerMock);
- 
-         $this->productMock->expects($this->once())->method('setCustomerGroupId')->willReturnSelf();
-         $this->productMock->expects($this->once())->method('getFinalPrice')->willReturn('655.99');
-@@ -368,7 +372,6 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testProcessStockEmailThrowsException()
-     {
--        $id = 1;
-         $this->scopeConfigMock->expects($this->any())->method('isSetFlag')->willReturn(false);
- 
-         $this->emailFactoryMock->expects($this->once())->method('create')->willReturn($this->emailMock);
-@@ -395,8 +398,8 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-             ->method('setCustomerOrder')
-             ->willReturn(new \ArrayIterator($items));
- 
--        $customer = new \Magento\Framework\DataObject(['group_id' => $id]);
--        $this->customerRepositoryMock->expects($this->once())->method('getById')->willReturn($customer);
-+        $customerMock = $this->getMockForAbstractClass(CustomerInterface::class);
-+        $this->customerRepositoryMock->expects($this->once())->method('getById')->willReturn($customerMock);
- 
-         $this->productMock->expects($this->once())->method('setCustomerGroupId')->willReturnSelf();
-         $this->productSalabilityMock->expects($this->once())->method('isSalable')->willReturn(false);
-diff --git a/app/code/Magento/ProductAlert/etc/db_schema.xml b/app/code/Magento/ProductAlert/etc/db_schema.xml
-index ddf8be8a37e..cb91560f8da 100644
---- a/app/code/Magento/ProductAlert/etc/db_schema.xml
-+++ b/app/code/Magento/ProductAlert/etc/db_schema.xml
-@@ -14,10 +14,12 @@
-                 default="0" comment="Customer id"/>
-         <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Product id"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-+        <column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="false" default="0"
-                 comment="Price amount"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Website id"/>
-+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-+                default="0" comment="Store id"/>
-         <column xsi:type="timestamp" name="add_date" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Product alert add date"/>
-         <column xsi:type="timestamp" name="last_send_date" on_update="false" nullable="true"
-@@ -26,27 +28,33 @@
-                 default="0" comment="Product alert send count"/>
-         <column xsi:type="smallint" name="status" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Product alert status"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="alert_price_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="PRODUCT_ALERT_PRICE_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_PRICE_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="product_alert_price" column="customer_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="PRODUCT_ALERT_PRICE_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_PRICE_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-                     table="product_alert_price" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="PRODUCT_ALERT_PRICE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_PRICE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-                     table="product_alert_price" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <index name="PRODUCT_ALERT_PRICE_CUSTOMER_ID" indexType="btree">
-+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_PRICE_STORE_ID_STORE_STORE_ID"
-+                    table="product_alert_stock" column="store_id" referenceTable="store"
-+                    referenceColumn="store_id" onDelete="CASCADE"/>
-+        <index referenceId="PRODUCT_ALERT_PRICE_CUSTOMER_ID" indexType="btree">
-             <column name="customer_id"/>
-         </index>
--        <index name="PRODUCT_ALERT_PRICE_PRODUCT_ID" indexType="btree">
-+        <index referenceId="PRODUCT_ALERT_PRICE_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
--        <index name="PRODUCT_ALERT_PRICE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="PRODUCT_ALERT_PRICE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-+        <index referenceId="PRODUCT_ALERT_PRICE_STORE_ID" indexType="btree">
-+            <column name="store_id"/>
-+        </index>
-     </table>
-     <table name="product_alert_stock" resource="default" engine="innodb" comment="Product Alert Stock">
-         <column xsi:type="int" name="alert_stock_id" padding="10" unsigned="true" nullable="false" identity="true"
-@@ -57,6 +65,8 @@
-                 default="0" comment="Product id"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Website id"/>
-+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-+                default="0" comment="Store id"/>
-         <column xsi:type="timestamp" name="add_date" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Product alert add date"/>
-         <column xsi:type="timestamp" name="send_date" on_update="false" nullable="true"
-@@ -65,26 +75,32 @@
-                 default="0" comment="Send Count"/>
-         <column xsi:type="smallint" name="status" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Product alert status"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="alert_stock_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="PRODUCT_ALERT_STOCK_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_STOCK_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-                     table="product_alert_stock" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="PRODUCT_ALERT_STOCK_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_STOCK_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="product_alert_stock" column="customer_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="PRODUCT_ALERT_STOCK_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_STOCK_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-                     table="product_alert_stock" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="PRODUCT_ALERT_STOCK_CUSTOMER_ID" indexType="btree">
-+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_STOCK_STORE_ID_STORE_STORE_ID"
-+                    table="product_alert_stock" column="store_id" referenceTable="store"
-+                    referenceColumn="store_id" onDelete="CASCADE"/>
-+        <index referenceId="PRODUCT_ALERT_STOCK_CUSTOMER_ID" indexType="btree">
-             <column name="customer_id"/>
-         </index>
--        <index name="PRODUCT_ALERT_STOCK_PRODUCT_ID" indexType="btree">
-+        <index referenceId="PRODUCT_ALERT_STOCK_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
--        <index name="PRODUCT_ALERT_STOCK_WEBSITE_ID" indexType="btree">
-+        <index referenceId="PRODUCT_ALERT_STOCK_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-+        <index referenceId="PRODUCT_ALERT_STOCK_STORE_ID" indexType="btree">
-+            <column name="store_id"/>
-+        </index>
-     </table>
- </schema>
-diff --git a/app/code/Magento/ProductAlert/etc/db_schema_whitelist.json b/app/code/Magento/ProductAlert/etc/db_schema_whitelist.json
-index 266d00e04c5..94c9d07c850 100644
---- a/app/code/Magento/ProductAlert/etc/db_schema_whitelist.json
-+++ b/app/code/Magento/ProductAlert/etc/db_schema_whitelist.json
-@@ -1,6 +1,7 @@
- {
-     "product_alert_price": {
-         "column": {
-+            "store_id": true,
-             "alert_price_id": true,
-             "customer_id": true,
-             "product_id": true,
-@@ -12,11 +13,13 @@
-             "status": true
-         },
-         "index": {
-+            "PRODUCT_ALERT_PRICE_STORE_ID": true,
-             "PRODUCT_ALERT_PRICE_CUSTOMER_ID": true,
-             "PRODUCT_ALERT_PRICE_PRODUCT_ID": true,
-             "PRODUCT_ALERT_PRICE_WEBSITE_ID": true
-         },
-         "constraint": {
-+            "PRODUCT_ALERT_PRICE_STORE_ID_STORE_STORE_ID": true,
-             "PRIMARY": true,
-             "PRODUCT_ALERT_PRICE_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
-             "PRODUCT_ALERT_PRICE_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID": true,
-@@ -26,6 +29,7 @@
-     },
-     "product_alert_stock": {
-         "column": {
-+            "store_id": true,
-             "alert_stock_id": true,
-             "customer_id": true,
-             "product_id": true,
-@@ -36,11 +40,13 @@
-             "status": true
-         },
-         "index": {
-+            "PRODUCT_ALERT_STOCK_STORE_ID": true,
-             "PRODUCT_ALERT_STOCK_CUSTOMER_ID": true,
-             "PRODUCT_ALERT_STOCK_PRODUCT_ID": true,
-             "PRODUCT_ALERT_STOCK_WEBSITE_ID": true
-         },
-         "constraint": {
-+            "PRODUCT_ALERT_STOCK_STORE_ID_STORE_STORE_ID": true,
-             "PRIMARY": true,
-             "PRODUCT_ALERT_STOCK_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true,
-             "PRODUCT_ALERT_STOCK_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
-@@ -48,4 +54,4 @@
-             "PRODUCT_ALERT_STOCK_PRODUCT_ID_SEQUENCE_PRODUCT_SEQUENCE_VALUE": true
-         }
-     }
--}
-\ No newline at end of file
-+}
-diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
-index 9942c94ea88..054871be526 100644
---- a/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
-+++ b/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
-@@ -4,43 +4,42 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\ProductAlert\Block\Email\Price */
- ?>
--<?php if ($_products = $block->getProducts()): ?>
--<p><?= /* @escapeNotVerified */  __('Price change alert! We wanted you to know that prices have changed for these products:') ?></p>
--<table>
--<?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
--<?php foreach ($_products as $_product): ?>
--    <tr>
--        <td class="col photo">
--            <a href="<?= /* @escapeNotVerified */  $_product->getProductUrl() ?>" title="<?= $block->escapeHtml($_product->getName()) ?>" class="product photo">
--                <?= $block->getImage($_product, 'product_thumbnail_image', ['class' => 'photo image'])->toHtml() ?>
--            </a>
--        </td>
--        <td class="col item">
--            <p>
--                <strong class="product name">
--                    <a href="<?= /* @escapeNotVerified */  $_product->getProductUrl() ?>"><?= $block->escapeHtml($_product->getName()) ?></a>
--                </strong>
--            </p>
--            <?php if ($shortDescription = $block->getFilteredContent($_product->getShortDescription())): ?>
--                <p><small><?= /* @escapeNotVerified */  $shortDescription ?></small></p>
--            <?php endif; ?>
--            <?= $block->getProductPriceHtml(
-+<?php if ($_products = $block->getProducts()) : ?>
-+    <p><?= $block->escapeHtml(__('Price change alert! We wanted you to know that prices have changed for these products:')) ?></p>
-+    <table>
-+    <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
-+    <?php foreach ($_products as $_product) : ?>
-+        <tr>
-+            <td class="col photo">
-+                <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" title="<?= $block->escapeHtml($_product->getName()) ?>" class="product photo">
-+                    <?= $block->getImage($_product, 'product_thumbnail_image', ['class' => 'photo image'])->toHtml() ?>
-+                </a>
-+            </td>
-+            <td class="col item">
-+                <p>
-+                    <strong class="product name">
-+                        <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"><?= $block->escapeHtml($_product->getName()) ?></a>
-+                    </strong>
-+                </p>
-+                <?php if ($shortDescription = $block->getFilteredContent($_product->getShortDescription())) : ?>
-+                    <p><small><?= /* @noEscape */  $shortDescription ?></small></p>
-+                <?php endif; ?>
-+                <?=
-+                $block->getProductPriceHtml(
-                     $_product,
-                     \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                     \Magento\Framework\Pricing\Render::ZONE_EMAIL,
-                     [
--                        'display_label' => __('Price:')
-+                        'display_label' => __('Price:'),
-                     ]
-                 );
-                 ?>
--            <p><small><a href="<?= /* @escapeNotVerified */  $block->getProductUnsubscribeUrl($_product->getId()) ?>"><?= /* @escapeNotVerified */  __('Click here to stop alerts for this product.') ?></a></small></p>
--        </td>
--    </tr>
--<?php endforeach; ?>
--</table>
--<p><a href="<?= /* @escapeNotVerified */  $block->getUnsubscribeUrl() ?>"><?= /* @escapeNotVerified */  __('Unsubscribe from all price alerts') ?></a></p>
-+                <p><small><a href="<?= $block->escapeUrl($block->getProductUnsubscribeUrl($_product->getId())) ?>"><?= $block->escapeHtml(__('Click here to stop alerts for this product.')) ?></a></small></p>
-+            </td>
-+        </tr>
-+    <?php endforeach; ?>
-+    </table>
-+    <p><a href="<?= $block->escapeUrl($block->getUnsubscribeUrl()) ?>"><?= $block->escapeHtml(__('Unsubscribe from all price alerts')) ?></a></p>
- <?php endif; ?>
-diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
-index ffacd605517..d90a458b442 100644
---- a/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
-+++ b/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
-@@ -4,30 +4,29 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\ProductAlert\Block\Email\Stock */
- ?>
--<?php if ($_products = $block->getProducts()): ?>
--<p><?= /* @escapeNotVerified */  __('In stock alert! We wanted you to know that these products are now available:') ?></p>
--<table>
--<?php foreach ($_products as $_product): ?>
--    <tr>
--        <td class="col photo">
--            <a href="<?= /* @escapeNotVerified */  $_product->getProductUrl() ?>" title="<?= $block->escapeHtml($_product->getName()) ?>" class="product photo">
--                <?= $block->getImage($_product, 'product_thumbnail_image', ['class' => 'photo image'])->toHtml() ?>
--            </a>
--        </td>
--        <td class="col item">
--            <p>
--                <strong class="product name">
--                    <a href="<?= /* @escapeNotVerified */  $_product->getProductUrl() ?>"><?= $block->escapeHtml($_product->getName()) ?></a>
--                </strong>
--            </p>
--            <?php if ($shortDescription = $block->getFilteredContent($_product->getShortDescription())): ?>
--                <p><small><?= /* @escapeNotVerified */  $shortDescription ?></small></p>
--            <?php endif; ?>
--            <?= $block->getProductPriceHtml(
-+<?php if ($_products = $block->getProducts()) : ?>
-+    <p><?= $block->escapeHtml(__('In stock alert! We wanted you to know that these products are now available:')) ?></p>
-+    <table>
-+    <?php foreach ($_products as $_product) : ?>
-+        <tr>
-+            <td class="col photo">
-+                <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" title="<?= $block->escapeHtml($_product->getName()) ?>" class="product photo">
-+                    <?= $block->getImage($_product, 'product_thumbnail_image', ['class' => 'photo image'])->toHtml() ?>
-+                </a>
-+            </td>
-+            <td class="col item">
-+                <p>
-+                    <strong class="product name">
-+                        <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"><?= $block->escapeHtml($_product->getName()) ?></a>
-+                    </strong>
-+                </p>
-+                <?php if ($shortDescription = $block->getFilteredContent($_product->getShortDescription())) : ?>
-+                    <p><small><?= /* @noEscape */  $shortDescription ?></small></p>
-+                <?php endif; ?>
-+                <?=
-+                $block->getProductPriceHtml(
-                     $_product,
-                     \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                     \Magento\Framework\Pricing\Render::ZONE_EMAIL,
-@@ -36,10 +35,10 @@
-                     ]
-                 );
-                 ?>
--            <p><small><a href="<?= /* @escapeNotVerified */  $block->getProductUnsubscribeUrl($_product->getId()) ?>"><?= /* @escapeNotVerified */  __('Click here to stop alerts for this product.') ?></a></small></p>
--        </td>
--    </tr>
--<?php endforeach; ?>
--</table>
--<p><a href="<?= /* @escapeNotVerified */  $block->getUnsubscribeUrl() ?>"><?= /* @escapeNotVerified */  __('Unsubscribe from all stock alerts') ?></a></p>
-+                <p><small><a href="<?= $block->escapeUrl($block->getProductUnsubscribeUrl($_product->getId())) ?>"><?= $block->escapeHtml(__('Click here to stop alerts for this product.')) ?></a></small></p>
-+            </td>
-+        </tr>
-+    <?php endforeach; ?>
-+    </table>
-+    <p><a href="<?= $block->escapeUrl($block->getUnsubscribeUrl()) ?>"><?= $block->escapeHtml(__('Unsubscribe from all stock alerts')) ?></a></p>
- <?php endif; ?>
-diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
-index 5b9553a49e7..462196d773a 100644
---- a/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
-+++ b/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
-@@ -6,7 +6,7 @@
- ?>
- <?php /* @var $block \Magento\ProductAlert\Block\Product\View */?>
- <div class="product alert <?= $block->getHtmlClass() ?>">
--    <a href="#" data-post='<?= /* @noEscape */ $block->getPostAction() ?>'
-+    <a href="<?= $block->escapeUrl($block->getSignupUrl()) ?>"
-        title="<?= $block->escapeHtml(__($block->getSignupLabel())) ?>" class="action alert">
-         <?= $block->escapeHtml(__($block->getSignupLabel())) ?>
-     </a>
-diff --git a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
-index 23721cb4b16..914b5fa2717 100644
---- a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
-+++ b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\ProductVideo\Controller\Adminhtml\Product\Gallery;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\File\Uploader;
-@@ -13,7 +14,7 @@ use Magento\Framework\File\Uploader;
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class RetrieveImage extends \Magento\Backend\App\Action
-+class RetrieveImage extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
-index ce1493b349a..42407ca6be0 100644
---- a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
-+++ b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
-@@ -19,6 +19,8 @@ class CreateHandler extends AbstractHandler
-     const ADDITIONAL_STORE_DATA_KEY = 'additional_store_data';
- 
-     /**
-+     * Execute before Plugin
-+     *
-      * @param \Magento\Catalog\Model\Product\Gallery\CreateHandler $mediaGalleryCreateHandler
-      * @param \Magento\Catalog\Model\Product $product
-      * @param array $arguments
-@@ -44,6 +46,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Execute plugin
-+     *
-      * @param \Magento\Catalog\Model\Product\Gallery\CreateHandler $mediaGalleryCreateHandler
-      * @param \Magento\Catalog\Model\Product $product
-      * @return \Magento\Catalog\Model\Product
-@@ -58,6 +62,9 @@ class CreateHandler extends AbstractHandler
-         );
- 
-         if (!empty($mediaCollection)) {
-+            if ($product->getIsDuplicate() === true) {
-+                $mediaCollection = $this->makeAllNewVideos($product->getId(), $mediaCollection);
-+            }
-             $newVideoCollection = $this->collectNewVideos($mediaCollection);
-             $this->saveVideoData($newVideoCollection, 0);
- 
-@@ -70,6 +77,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Saves video data
-+     *
-      * @param array $videoDataCollection
-      * @param int $storeId
-      * @return void
-@@ -83,6 +92,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Saves additioanal video data
-+     *
-      * @param array $videoDataCollection
-      * @return void
-      */
-@@ -99,6 +110,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Saves video data
-+     *
-      * @param array $item
-      * @return void
-      */
-@@ -111,6 +124,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Excludes current store data
-+     *
-      * @param array $mediaCollection
-      * @param int $currentStoreId
-      * @return array
-@@ -126,6 +141,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Prepare video data for saving
-+     *
-      * @param array $rowData
-      * @return array
-      */
-@@ -143,6 +160,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Loads video data
-+     *
-      * @param array $mediaCollection
-      * @param int $excludedStore
-      * @return array
-@@ -165,6 +184,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Collect video data
-+     *
-      * @param array $mediaCollection
-      * @return array
-      */
-@@ -182,6 +203,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Extract video data
-+     *
-      * @param array $rowData
-      * @return array
-      */
-@@ -194,6 +217,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Collect items for additional data adding
-+     *
-      * @param array $mediaCollection
-      * @return array
-      */
-@@ -209,6 +234,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Add additional data
-+     *
-      * @param array $mediaCollection
-      * @param array $data
-      * @return array
-@@ -229,6 +256,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Creates additional video data
-+     *
-      * @param array $storeData
-      * @param int $valueId
-      * @return array
-@@ -247,6 +276,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Collect new videos
-+     *
-      * @param array $mediaCollection
-      * @return array
-      */
-@@ -262,6 +293,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Checks if gallery item is video
-+     *
-      * @param array $item
-      * @return bool
-      */
-@@ -273,6 +306,8 @@ class CreateHandler extends AbstractHandler
-     }
- 
-     /**
-+     * Checks if video is new
-+     *
-      * @param array $item
-      * @return bool
-      */
-@@ -282,4 +317,23 @@ class CreateHandler extends AbstractHandler
-             || empty($item['video_url_default'])
-             || empty($item['video_title_default']);
-     }
-+
-+    /**
-+     * Mark all videos as new
-+     *
-+     * @param int $entityId
-+     * @param array $mediaCollection
-+     * @return array
-+     */
-+    private function makeAllNewVideos($entityId, array $mediaCollection): array
-+    {
-+        foreach ($mediaCollection as $key => $video) {
-+            if ($this->isVideoItem($video)) {
-+                unset($video['video_url_default'], $video['video_title_default']);
-+                $video['entity_id'] = $entityId;
-+                $mediaCollection[$key] = $video;
-+            }
-+        }
-+        return $mediaCollection;
-+    }
- }
-diff --git a/app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php b/app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php
-index dc64f03a42d..04a3d868d14 100644
---- a/app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php
-+++ b/app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php
-@@ -27,6 +27,8 @@ class ExternalVideoResourceBackend
-     }
- 
-     /**
-+     * Plugin for after duplicate action
-+     *
-      * @param Gallery $originalResourceModel
-      * @param array $valueIdMap
-      * @return array
-@@ -45,6 +47,8 @@ class ExternalVideoResourceBackend
-     }
- 
-     /**
-+     * Plugin for after create batch base select action
-+     *
-      * @param Gallery $originalResourceModel
-      * @param Select $select
-      * @return Select
-@@ -60,13 +64,7 @@ class ExternalVideoResourceBackend
-                     'value.store_id = value_video.store_id',
-                 ]
-             ),
--            [
--                'video_provider' => 'provider',
--                'video_url' => 'url',
--                'video_title' => 'title',
--                'video_description' => 'description',
--                'video_metadata' => 'metadata'
--            ]
-+            []
-         )->joinLeft(
-             [
-                 'default_value_video' => $originalResourceModel->getTable(
-@@ -80,14 +78,24 @@ class ExternalVideoResourceBackend
-                     'default_value.store_id = default_value_video.store_id',
-                 ]
-             ),
--            [
--                'video_provider_default' => 'provider',
--                'video_url_default' => 'url',
--                'video_title_default' => 'title',
--                'video_description_default' => 'description',
--                'video_metadata_default' => 'metadata',
--            ]
--        );
-+            []
-+        )->columns([
-+            'video_provider' => $originalResourceModel->getConnection()
-+                ->getIfNullSql('`value_video`.`provider`', '`default_value_video`.`provider`'),
-+            'video_url' => $originalResourceModel->getConnection()
-+                ->getIfNullSql('`value_video`.`url`', '`default_value_video`.`url`'),
-+            'video_title' => $originalResourceModel->getConnection()
-+                ->getIfNullSql('`value_video`.`title`', '`default_value_video`.`title`'),
-+            'video_description' => $originalResourceModel->getConnection()
-+                ->getIfNullSql('`value_video`.`description`', '`default_value_video`.`description`'),
-+            'video_metadata' => $originalResourceModel->getConnection()
-+                ->getIfNullSql('`value_video`.`metadata`', '`default_value_video`.`metadata`'),
-+            'video_provider_default' => 'default_value_video.provider',
-+            'video_url_default' => 'default_value_video.url',
-+            'video_title_default' => 'default_value_video.title',
-+            'video_description_default' => 'default_value_video.description',
-+            'video_metadata_default' => 'default_value_video.metadata',
-+        ]);
- 
-         return $select;
-     }
-diff --git a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml
-index f28a9f9359d..1ef18d5f34e 100644
---- a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml
-+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml
-@@ -6,12 +6,13 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Add video in Admin Product page -->
-     <actionGroup name="addProductVideo">
-         <arguments>
-             <argument name="video" defaultValue="mftfTestProductVideo"/>
-         </arguments>
-+        <scrollTo selector="{{AdminProductImagesSection.productImagesToggle}}" x="0" y="-100" stepKey="scrollToArea"/>
-         <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductVideoSection"/>
-         <waitForElementVisible selector="{{AdminProductImagesSection.addVideoButton}}" stepKey="waitForAddVideoButtonVisible" time="30"/>
-         <click selector="{{AdminProductImagesSection.addVideoButton}}" stepKey="addVideo"/>
-@@ -27,6 +28,7 @@
- 
-     <!-- Remove video in Admin Product page -->
-     <actionGroup name="removeProductVideo">
-+        <scrollTo selector="{{AdminProductImagesSection.productImagesToggle}}" x="0" y="-100" stepKey="scrollToArea"/>
-         <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductVideoSection"/>
-         <waitForElementVisible selector="{{AdminProductImagesSection.addVideoButton}}" stepKey="waitForAddVideoButtonVisible" time="30"/>
-         <click selector="{{AdminProductImagesSection.removeVideoButton}}" stepKey="removeVideo"/>
-@@ -37,6 +39,7 @@
-         <arguments>
-             <argument name="video" defaultValue="mftfTestProductVideo"/>
-         </arguments>
-+        <scrollTo selector="{{AdminProductImagesSection.productImagesToggle}}" x="0" y="-100" stepKey="scrollToArea"/>
-         <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductVideoSection"/>
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-         <seeElement selector="{{AdminProductImagesSection.videoTitleText(video.videoShortTitle)}}" stepKey="seeVideoTitle"/>
-@@ -48,6 +51,7 @@
-         <arguments>
-             <argument name="video" defaultValue="mftfTestProductVideo"/>
-         </arguments>
-+        <scrollTo selector="{{AdminProductImagesSection.productImagesToggle}}" x="0" y="-100" stepKey="scrollToArea"/>
-         <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductVideoSection"/>
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-         <dontSeeElement selector="{{AdminProductImagesSection.videoTitleText(video.videoShortTitle)}}" stepKey="seeVideoTitle"/>
-diff --git a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/StorefrontProductVideoActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/StorefrontProductVideoActionGroup.xml
-index 1f7750ab1f2..8f0d41f8c21 100644
---- a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/StorefrontProductVideoActionGroup.xml
-+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/StorefrontProductVideoActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Assert product video in Storefront Product page -->
-     <actionGroup name="assertProductVideoStorefrontProductPage">
-         <arguments>
-diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoConfigData.xml b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoConfigData.xml
-index b21ac404711..8fe5899e91e 100644
---- a/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoConfigData.xml
-+++ b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoConfigData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <!-- mftf test youtube api key configuration -->
-     <entity name="ProductVideoYoutubeApiKeyConfig" type="product_video_config">
-         <requiredEntity type="youtube_api_key_config">YouTubeApiKey</requiredEntity>
-diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml
-index 93d3f93ff42..5bc4ad86e0f 100644
---- a/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml
-+++ b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="mftfTestProductVideo" type="product_video">
-         <data key="videoUrl">https://youtu.be/bpOSxM0rNPM</data>
-         <data key="videoTitle">Arctic Monkeys - Do I Wanna Know? (Official Video)</data>
-diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Metadata/product_video_config-meta.xml b/app/code/Magento/ProductVideo/Test/Mftf/Metadata/product_video_config-meta.xml
-index 07d91bc0a1e..2525c3a3d0f 100644
---- a/app/code/Magento/ProductVideo/Test/Mftf/Metadata/product_video_config-meta.xml
-+++ b/app/code/Magento/ProductVideo/Test/Mftf/Metadata/product_video_config-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateProductVideoYouTubeApiKeyConfig" dataType="product_video_config" type="create" auth="adminFormKey" url="admin/system_config/save/section/catalog/" method="POST">
-         <object key="groups" dataType="product_video_config">
-             <object key="product_video" dataType="product_video_config">
-diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductImagesSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductImagesSection.xml
-index b232d24c51e..5db86267f7d 100644
---- a/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductImagesSection.xml
-+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductImagesSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductImagesSection">
-         <element name="addVideoButton" type="button" selector="#add_video_button" timeout="60"/>
-         <element name="removeVideoButton" type="button" selector="//*[@id='media_gallery_content']//button[@class='action-remove']" timeout="60"/>
-diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml
-index 89e6fd37b17..71dad6a24f1 100644
---- a/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml
-+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductNewVideoSection">
-         <element name="saveButton" type="button" selector=".action-primary.video-create-button" timeout="30"/>
-         <element name="saveButtonDisabled" type="text" selector="//button[@class='action-primary video-create-button' and @disabled='disabled']"/>
-diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-index 03e1d91df4d..e94d426ba76 100644
---- a/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-@@ -7,8 +7,12 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductInfoMainSection">
-         <element name="productVideo" type="text" selector="//*[@class='product-video' and @data-type='{{videoType}}']" parameterized="true"/>
-+        <element name="clickInVideo" type="button" selector="//*[@class='fotorama__stage__shaft']"/>
-+        <element name="videoPausedMode" type="button" selector="//*[contains(@class, 'paused-mode')]"/>
-+        <element name="videoPlayedMode" type="button" selector="//*[contains(@class,'playing-mode')]"/>
-+        <element name="frameVideo" type="button" selector="widget2"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
-new file mode 100644
-index 00000000000..2b5f87f78d5
---- /dev/null
-+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
-@@ -0,0 +1,33 @@
-+<?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="AdminAddDefaultVideoSimpleProductTest">
-+        <annotations>
-+            <group value="ProductVideo"/>
-+        </annotations>
-+        <before>
-+            <!-- Set product video Youtube api key configuration -->
-+            <createData entity="ProductVideoYoutubeApiKeyConfig" stepKey="setStoreConfig" after="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Set product video configuration to default -->
-+            <createData entity="DefaultProductVideoConfig" stepKey="setStoreDefaultConfig" before="amOnLogoutPage"/>
-+        </after>
-+
-+        <!-- Add product video -->
-+        <actionGroup ref="addProductVideo" stepKey="addProductVideo" after="fillMainProductForm"/>
-+
-+        <!-- Assert product video in admin product form -->
-+        <actionGroup ref="assertProductVideoAdminProductPage" stepKey="assertProductVideoAdminProductPage" after="saveProductForm"/>
-+
-+        <!-- Assert product video in storefront product page -->
-+        <actionGroup ref="assertProductVideoStorefrontProductPage" stepKey="assertProductVideoStorefrontProductPage" after="AssertProductInStorefrontProductPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
-new file mode 100644
-index 00000000000..d4da0ffa544
---- /dev/null
-+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminRemoveDefaultVideoSimpleProductTest">
-+        <annotations>
-+            <group value="ProductVideo"/>
-+        </annotations>
-+        <before>
-+            <!-- Set product video Youtube api key configuration -->
-+            <createData entity="ProductVideoYoutubeApiKeyConfig" stepKey="setStoreConfig" after="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Set product video configuration to default -->
-+            <createData entity="DefaultProductVideoConfig" stepKey="setStoreDefaultConfig" before="amOnLogoutPage"/>
-+        </after>
-+
-+        <!-- Add product video -->
-+        <actionGroup ref="addProductVideo" stepKey="addProductVideo" after="fillMainProductForm"/>
-+
-+        <!-- Remove product video -->
-+        <actionGroup ref="removeProductVideo" stepKey="removeProductVideo" after="saveProductForm"/>
-+
-+        <!-- Assert product video not in admin product form -->
-+        <actionGroup ref="assertProductVideoNotInAdminProductPage" stepKey="assertProductVideoNotInAdminProductPage" after="saveProductFormAfterRemove"/>
-+
-+        <!-- Assert product video not in storefront product page -->
-+        <actionGroup ref="assertProductVideoNotInStorefrontProductPage" stepKey="assertProductVideoNotInStorefrontProductPage" after="AssertProductInStorefrontProductPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml
-new file mode 100644
-index 00000000000..7249a422350
---- /dev/null
-+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml
-@@ -0,0 +1,92 @@
-+<?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="YoutubeVideoWindowOnProductPageTest">
-+        <annotations>
-+            <features value="ProductVideo"/>
-+            <stories value="MAGETWO-91707: [Sigma Beauty]Cannot pause Youtube video in IE 11"/>
-+            <testCaseId value="MAGETWO-95254"/>
-+            <title value="Youtube video window on the product page"/>
-+            <description value="Check Youtube video window on the product page"/>
-+            <severity value="MAJOR"/>
-+            <group value="ProductVideo"/>
-+        </annotations>
-+
-+        <before>
-+            <!--Log In-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create category-->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <!--Create product-->
-+            <createData entity="SimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <!-- Set product video Youtube api key configuration -->
-+            <createData entity="ProductVideoYoutubeApiKeyConfig" stepKey="setStoreConfig" after="loginAsAdmin"/>
-+        </before>
-+
-+        <!--Open simple product-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
-+        <waitForPageLoad stepKey="wait1"/>
-+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGrid"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openFirstProductForEdit"/>
-+
-+        <!-- Add product video -->
-+        <actionGroup ref="addProductVideo" stepKey="addProductVideo" after="openFirstProductForEdit"/>
-+        <!-- Assert product video in admin product form -->
-+        <actionGroup ref="assertProductVideoAdminProductPage" stepKey="assertProductVideoAdminProductPage" after="addProductVideo"/>
-+
-+        <!-- Save the product -->
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveFirstProduct"/>
-+        <waitForPageLoad stepKey="waitForFirstProductSaved"/>
-+
-+        <!-- Assert product video in storefront product page -->
-+        <amOnPage url="$$createProduct.name$$.html" stepKey="goToStorefrontCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontPageLoaded"/>
-+        <actionGroup ref="assertProductVideoStorefrontProductPage" stepKey="assertProductVideoStorefrontProductPage" after="waitForStorefrontPageLoaded"/>
-+
-+        <!--Click Play video button-->
-+        <click stepKey="clickToPlayVideo" selector="{{StorefrontProductInfoMainSection.clickInVideo}}"/>
-+        <wait stepKey="waitFiveSecondToPlayVideo" time="5"/>
-+        <switchToIFrame selector="{{StorefrontProductInfoMainSection.frameVideo}}" stepKey="switchToFrame"/>
-+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.videoPlayedMode}}" stepKey="waitForVideoPlayed"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.videoPlayedMode}}" stepKey="AssertVideoIsPlayed"/>
-+        <switchToIFrame stepKey="switchBack1"/>
-+
-+        <!--Click Pause button-->
-+        <click stepKey="clickToStopVideo" selector="{{StorefrontProductInfoMainSection.clickInVideo}}"/>
-+        <wait stepKey="waitFiveSecondToStopVideo" time="5"/>
-+        <switchToIFrame selector="{{StorefrontProductInfoMainSection.frameVideo}}" stepKey="switchToFrame2"/>
-+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.videoPausedMode}}" stepKey="waitForVideoPaused"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.videoPausedMode}}" stepKey="AssertVideoIsPaused"/>
-+        <switchToIFrame stepKey="switchBack2"/>
-+
-+        <!--Click Play video button again. Make sure that Video continued playing-->
-+        <click stepKey="clickAgainToPlayVideo" selector="{{StorefrontProductInfoMainSection.clickInVideo}}"/>
-+        <wait stepKey="waitAgainFiveSecondToPlayVideo" time="5"/>
-+        <switchToIFrame selector="{{StorefrontProductInfoMainSection.frameVideo}}" stepKey="switchToFrame3"/>
-+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.videoPlayedMode}}" stepKey="waitForVideoPlayedAgain"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.videoPlayedMode}}" stepKey="AssertVideoIsPlayedAgain"/>
-+        <switchToIFrame stepKey="switchBack3"/>
-+
-+        <after>
-+            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategoryFirst"/>
-+            <!-- Set product video configuration to default -->
-+            <createData entity="DefaultProductVideoConfig" stepKey="setStoreDefaultConfig" before="logout"/>
-+            <!--Log Out-->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+    </test>
-+</tests>
-+
-diff --git a/app/code/Magento/ProductVideo/etc/db_schema.xml b/app/code/Magento/ProductVideo/etc/db_schema.xml
-index ceaf4d7fbd8..bfe087d9a57 100644
---- a/app/code/Magento/ProductVideo/etc/db_schema.xml
-+++ b/app/code/Magento/ProductVideo/etc/db_schema.xml
-@@ -18,14 +18,14 @@
-         <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
-         <column xsi:type="text" name="description" nullable="true" comment="Page Meta Description"/>
-         <column xsi:type="text" name="metadata" nullable="true" comment="Video meta data"/>
--        <constraint xsi:type="foreign" name="FK_6FDF205946906B0E653E60AA769899F8"
-+        <constraint xsi:type="foreign" referenceId="FK_6FDF205946906B0E653E60AA769899F8"
-                     table="catalog_product_entity_media_gallery_value_video" column="value_id"
-                     referenceTable="catalog_product_entity_media_gallery" referenceColumn="value_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="CAT_PRD_ENTT_MDA_GLR_VAL_VIDEO_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_VIDEO_STORE_ID_STORE_STORE_ID"
-                     table="catalog_product_entity_media_gallery_value_video" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="CAT_PRD_ENTT_MDA_GLR_VAL_VIDEO_VAL_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_VIDEO_VAL_ID_STORE_ID">
-             <column name="value_id"/>
-             <column name="store_id"/>
-         </constraint>
-diff --git a/app/code/Magento/ProductVideo/i18n/de_DE.csv b/app/code/Magento/ProductVideo/i18n/de_DE.csv
-deleted file mode 100644
-index 70473173969..00000000000
---- a/app/code/Magento/ProductVideo/i18n/de_DE.csv
-+++ /dev/null
-@@ -1,9 +0,0 @@
--"Add video","Add video"
--"New Video","New Video"
--"Product Video","Product Video"
--"YouTube API key","YouTube API key"
--"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
--"Url","Url"
--"Preview Image","Preview Image"
--"Get Video Information","Get Video Information"
--"Youtube or Vimeo supported","Youtube or Vimeo supported"
-diff --git a/app/code/Magento/ProductVideo/i18n/en_US.csv b/app/code/Magento/ProductVideo/i18n/en_US.csv
-index 2d226c6daef..debcab151cc 100644
---- a/app/code/Magento/ProductVideo/i18n/en_US.csv
-+++ b/app/code/Magento/ProductVideo/i18n/en_US.csv
-@@ -40,3 +40,4 @@ Delete,Delete
- "Autostart base video","Autostart base video"
- "Show related video","Show related video"
- "Auto restart video","Auto restart video"
-+"Delete image in all store views","Delete image in all store views"
-diff --git a/app/code/Magento/ProductVideo/i18n/es_ES.csv b/app/code/Magento/ProductVideo/i18n/es_ES.csv
-deleted file mode 100644
-index 70473173969..00000000000
---- a/app/code/Magento/ProductVideo/i18n/es_ES.csv
-+++ /dev/null
-@@ -1,9 +0,0 @@
--"Add video","Add video"
--"New Video","New Video"
--"Product Video","Product Video"
--"YouTube API key","YouTube API key"
--"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
--"Url","Url"
--"Preview Image","Preview Image"
--"Get Video Information","Get Video Information"
--"Youtube or Vimeo supported","Youtube or Vimeo supported"
-diff --git a/app/code/Magento/ProductVideo/i18n/fr_FR.csv b/app/code/Magento/ProductVideo/i18n/fr_FR.csv
-deleted file mode 100644
-index 70473173969..00000000000
---- a/app/code/Magento/ProductVideo/i18n/fr_FR.csv
-+++ /dev/null
-@@ -1,9 +0,0 @@
--"Add video","Add video"
--"New Video","New Video"
--"Product Video","Product Video"
--"YouTube API key","YouTube API key"
--"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
--"Url","Url"
--"Preview Image","Preview Image"
--"Get Video Information","Get Video Information"
--"Youtube or Vimeo supported","Youtube or Vimeo supported"
-diff --git a/app/code/Magento/ProductVideo/i18n/nl_NL.csv b/app/code/Magento/ProductVideo/i18n/nl_NL.csv
-deleted file mode 100644
-index 70473173969..00000000000
---- a/app/code/Magento/ProductVideo/i18n/nl_NL.csv
-+++ /dev/null
-@@ -1,9 +0,0 @@
--"Add video","Add video"
--"New Video","New Video"
--"Product Video","Product Video"
--"YouTube API key","YouTube API key"
--"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
--"Url","Url"
--"Preview Image","Preview Image"
--"Get Video Information","Get Video Information"
--"Youtube or Vimeo supported","Youtube or Vimeo supported"
-diff --git a/app/code/Magento/ProductVideo/i18n/pt_BR.csv b/app/code/Magento/ProductVideo/i18n/pt_BR.csv
-deleted file mode 100644
-index 70473173969..00000000000
---- a/app/code/Magento/ProductVideo/i18n/pt_BR.csv
-+++ /dev/null
-@@ -1,9 +0,0 @@
--"Add video","Add video"
--"New Video","New Video"
--"Product Video","Product Video"
--"YouTube API key","YouTube API key"
--"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
--"Url","Url"
--"Preview Image","Preview Image"
--"Get Video Information","Get Video Information"
--"Youtube or Vimeo supported","Youtube or Vimeo supported"
-diff --git a/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv b/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv
-deleted file mode 100644
-index 70473173969..00000000000
---- a/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv
-+++ /dev/null
-@@ -1,9 +0,0 @@
--"Add video","Add video"
--"New Video","New Video"
--"Product Video","Product Video"
--"YouTube API key","YouTube API key"
--"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
--"Url","Url"
--"Preview Image","Preview Image"
--"Get Video Information","Get Video Information"
--"Youtube or Vimeo supported","Youtube or Vimeo supported"
-diff --git a/app/code/Magento/ProductVideo/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/ProductVideo/view/adminhtml/layout/catalog_product_new.xml
-index f5a22c50e6d..63bd5321ad3 100644
---- a/app/code/Magento/ProductVideo/view/adminhtml/layout/catalog_product_new.xml
-+++ b/app/code/Magento/ProductVideo/view/adminhtml/layout/catalog_product_new.xml
-@@ -6,6 +6,9 @@
-  */
- -->
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <head>
-+        <css src="Magento_ProductVideo::css/gallery-delete-tooltip.css"/>
-+    </head>
-     <body>
-         <referenceContainer name="content">
- 
-diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
-index f0ae057bc72..1548770d403 100755
---- a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
-+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
-@@ -4,17 +4,18 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Files.LineLength
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
--$elementName = $block->getElement()->getName() . '[images]';
--$formName = $block->getFormName();
-+$elementNameEscaped = $block->escapeHtmlAttr($block->getElement()->getName()) . '[images]';
-+$formNameEscaped = $block->escapeHtmlAttr($block->getFormName());
- ?>
- 
- <div class="row">
-     <div class="add-video-button-container">
-         <button id="add_video_button"
--                title="<?= $block->escapeHtml(__('Add Video')) ?>"
-+                title="<?= $block->escapeHtmlAttr(__('Add Video')) ?>"
-                 data-role="add-video-button"
-                 type="button"
-                 class="action-secondary"
-@@ -29,109 +30,94 @@ $formName = $block->getFormName();
- $element = $block->getElement();
- $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'toggleValueElements(this, this.parentNode.parentNode.parentNode)';
- ?>
--
--<div id="<?= $block->getHtmlId() ?>"
-+<div id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>"
-      class="gallery"
-      data-mage-init='{"openVideoModal":{}}'
-      data-parent-component="<?= $block->escapeHtml($block->getData('config/parentComponent')) ?>"
--     data-images="<?= $block->escapeHtml($block->getImagesJson()) ?>"
--     data-types="<?= $block->escapeHtml(
--         $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
--     ) ?>"
-+     data-images="<?= $block->escapeHtmlAttr($block->getImagesJson()) ?>"
-+     data-types='<?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes()) ?>'
- >
--
--    <?php
--    if (!$block->getElement()->getReadonly()):
--        ?>
-+    <?php if (!$block->getElement()->getReadonly()) : ?>
-         <div class="image image-placeholder">
--            <?php /* @escapeNotVerified */ echo $block->getUploaderHtml();
--            ?>
-+            <?= $block->getUploaderHtml(); ?>
-             <div class="product-image-wrapper">
-                 <p class="image-placeholder-text">
--                    <?= $block->escapeHtml(
--                        __('Browse to find or drag image here')
--                    ); ?>
-+                    <?= $block->escapeHtml(__('Browse to find or drag image here')); ?>
-                 </p>
-             </div>
-         </div>
--        <?= /* @escapeNotVerified */ $block->getChildHtml('additional_buttons') ?>
--        <?php
--    endif;
--    ?>
--    <?php
--    foreach ($block->getImageTypes() as $typeData):
--        ?>
--        <input name="<?= $block->escapeHtml($typeData['name']) ?>"
--               data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
--               class="image-<?= $block->escapeHtml($typeData['code']) ?>"
-+        <?= $block->getChildHtml('additional_buttons') ?>
-+    <?php endif; ?>
-+    <?php foreach ($block->getImageTypes() as $typeData) : ?>
-+        <input name="<?= $block->escapeHtmlAttr($typeData['name']) ?>"
-+               data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"
-+               class="image-<?= $block->escapeHtmlAttr($typeData['code']) ?>"
-                type="hidden"
--               value="<?= $block->escapeHtml($typeData['value']) ?>"/>
--        <?php
--    endforeach;
--    ?>
--    <script id="<?= /* @escapeNotVerified */ $block->getHtmlId() ?>-template" data-template="image" type="text/x-magento-template">
-+               value="<?= $block->escapeHtmlAttr($typeData['value']) ?>"/>
-+    <?php endforeach; ?>
-+    <script id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>-template" data-template="image" type="text/x-magento-template">
-         <div class="image item <% if (data.disabled == 1) { %>hidden-for-front<% } %>  <% if (data.video_url) { %>video-item<% } %>"
-              data-role="image">
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][position]"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][position]"
-                    value="<%- data.position %>"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"
-                    class="position"/>
-             <% if (data.media_type !== 'external-video') {%>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][media_type]"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][media_type]"
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"
-                    value="image"/>
-             <% } else { %>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][media_type]"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][media_type]"
-                    value="<%- data.media_type %>"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
-             <% } %>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_provider]"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][video_provider]"
-                    value="<%- data.video_provider %>"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][file]"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][file]"
-                    value="<%- data.file %>"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][value_id]"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][value_id]"
-                    value="<%- data.value_id %>"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][label]"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][label]"
-                    value="<%- data.label %>"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][disabled]"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][disabled]"
-                    value="<%- data.disabled %>"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][removed]"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][removed]"
-                    value="" class="is-removed"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_url]"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][video_url]"
-                    value="<%- data.video_url %>"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_title]"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][video_title]"
-                    value="<%- data.video_title %>"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_description]"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][video_description]"
-                    value="<%- data.video_description %>"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_metadata]"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][video_metadata]"
-                    value="<%- data.video_metadata %>"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
-             <input type="hidden"
--                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][role]"
-+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][role]"
-                    value="<%- data.video_description %>"
--                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
-+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
- 
-             <div class="product-image-wrapper">
-                 <img class="product-image"
-@@ -140,35 +126,30 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
-                      alt="<%- data.label %>"/>
- 
-                 <div class="actions">
--                    <button type="button"
--                            class="action-remove"
--                            data-role="delete-button"
--                            title="<% if (data.media_type == 'external-video') {%>
--                            <?= $block->escapeHtml(
--                                __('Delete video')
--                            ); ?>
--                        <%} else {%>
--                            <?= $block->escapeHtml(
--                                __('Delete image')
--                            ); ?>
--                        <%}%>">
--                    <span>
--                        <% if (data.media_type == 'external-video') { %>
--                        <?= $block->escapeHtml(
--                            __('Delete video')
--                        ); ?>
--                        <% } else {%>
--                        <?= $block->escapeHtml(
--                            __('Delete image')
--                        ); ?>
--                        <%} %>
--                    </span>
--                    </button>
-+                    <div class="tooltip">
-+                        <span class="delete-tooltiptext">
-+                            <?= $block->escapeHtml(__('Delete image in all store views')); ?>
-+                        </span>
-+                        <button type="button"
-+                                class="action-remove"
-+                                data-role="delete-button"
-+                                title="<% if (data.media_type == 'external-video') {%>
-+                                <?= $block->escapeHtmlAttr(__('Delete video')); ?>
-+                            <%} else {%>
-+                                <?= $block->escapeHtmlAttr(__('Delete image')); ?>
-+                            <%}%>">
-+                        <span>
-+                            <% if (data.media_type == 'external-video') { %>
-+                            <?= $block->escapeHtml(__('Delete video')); ?>
-+                            <% } else {%>
-+                            <?= $block->escapeHtml(__('Delete image')); ?>
-+                            <%} %>
-+                        </span>
-+                        </button>
-+                    </div>
-                     <div class="draggable-handle"></div>
-                 </div>
--                <div class="image-fade"><span><?= $block->escapeHtml(
--                            __('Hidden')
--                        ); ?></span></div>
-+                <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')); ?></span></div>
-             </div>
- 
-             <div class="item-description">
-@@ -183,19 +164,11 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
-             </div>
- 
-             <ul class="item-roles" data-role="roles-labels">
--                <?php
--                foreach ($block->getImageTypes() as $typeData):
--                    ?>
--                    <li data-role-code="<?= $block->escapeHtml(
--                        $typeData['code']
--                    ) ?>" class="item-role item-role-<?= $block->escapeHtml(
--                        $typeData['code']
--                    ) ?>">
-+                <?php foreach ($block->getImageTypes() as $typeData) : ?>
-+                    <li data-role-code="<?= $block->escapeHtmlAttr($typeData['code']) ?>" class="item-role item-role-<?= $block->escapeHtmlAttr($typeData['code']) ?>">
-                         <?= $block->escapeHtml($typeData['label']) ?>
-                     </li>
--                    <?php
--                endforeach;
--                ?>
-+                <?php endforeach; ?>
-             </ul>
-         </div>
-     </script>
-@@ -215,24 +188,20 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
-             <fieldset class="admin__fieldset fieldset-image-panel">
-                 <div class="admin__field field-image-description">
-                     <label class="admin__field-label" for="image-description">
--                        <span><?= /* @escapeNotVerified */ __('Alt Text') ?></span>
-+                        <span><?= $block->escapeHtml(__('Alt Text')) ?></span>
-                     </label>
- 
-                     <div class="admin__field-control">
-                             <textarea data-role="image-description"
-                                       rows="3"
-                                       class="admin__control-textarea"
--                                      name="<?php /* @escapeNotVerified */
--                                      echo $elementName
--                                      ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
-+                                      name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
-                     </div>
-                 </div>
- 
-                 <div class="admin__field field-image-role">
-                     <label class="admin__field-label">
--                            <span><?= $block->escapeHtml(
--                                    __('Role')
--                                ); ?></span>
-+                            <span><?= $block->escapeHtml(__('Role')); ?></span>
-                     </label>
-                     <div class="admin__field-control">
-                         <ul class="multiselect-alt">
-@@ -243,36 +212,30 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
-                                     <label>
-                                         <input class="image-type"
-                                                data-role="type-selector"
--                                               data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-+                                               data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"
-                                                type="checkbox"
--                                               value="<?= $block->escapeHtml(
--                                                   $attribute->getAttributeCode()
--                                               ) ?>"
-+                                               value="<?= $block->escapeHtmlAttr($attribute->getAttributeCode()) ?>"
-                                         />
--                                        <?php /* @escapeNotVerified */ echo $block->escapeHtml(
--                                            $attribute->getFrontendLabel()
--                                        ) ?>
-+                                        <?= $block->escapeHtml($attribute->getFrontendLabel()) ?>
-                                     </label>
-                                 </li>
--                                <?php
--                            endforeach;
--                            ?>
-+                            <?php endforeach; ?>
-                         </ul>
-                     </div>
-                 </div>
- 
-                 <div class="admin__field admin__field-inline field-image-size" data-role="size">
-                     <label class="admin__field-label">
--                        <span><?= /* @escapeNotVerified */ __('Image Size') ?></span>
-+                        <span><?= $block->escapeHtml(__('Image Size')) ?></span>
-                     </label>
--                    <div class="admin__field-value" data-message="<?= /* @escapeNotVerified */ __('{size}') ?>"></div>
-+                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(__('{size}')) ?>"></div>
-                 </div>
- 
-                 <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
-                     <label class="admin__field-label">
--                        <span><?= /* @escapeNotVerified */ __('Image Resolution') ?></span>
-+                        <span><?= $block->escapeHtml(__('Image Resolution')) ?></span>
-                     </label>
--                    <div class="admin__field-value" data-message="<?= /* @escapeNotVerified */ __('{width}^{height} px') ?>"></div>
-+                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(__('{width}^{height} px')) ?>"></div>
-                 </div>
- 
-                 <div class="admin__field field-image-hide">
-@@ -281,16 +244,14 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
-                             <input type="checkbox"
-                                    id="hide-from-product-page"
-                                    data-role="visibility-trigger"
--                                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-+                                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"
-                                    value="1"
-                                    class="admin__control-checkbox"
--                                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][disabled]"
-+                                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][disabled]"
-                             <% if (data.disabled == 1) { %>checked="checked"<% } %> />
- 
-                             <label for="hide-from-product-page" class="admin__field-label">
--                                <?= $block->escapeHtml(
--                                    __('Hide from Product Page')
--                                ); ?>
-+                                <?= $block->escapeHtml(__('Hide from Product Page')); ?>
-                             </label>
-                         </div>
-                     </div>
-@@ -299,28 +260,20 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
-         </div>
-     </script>
-     <div id="<?= /* @noEscape */ $block->getNewVideoBlockName() ?>" style="display:none">
--        <?= /* @escapeNotVerified */ $block->getFormHtml() ?>
-+        <?= $block->getFormHtml() ?>
-         <div id="video-player-preview-location" class="video-player-sidebar">
-             <div class="video-player-container"></div>
-             <div class="video-information title">
--                <label><?= $block->escapeHtml(
--                        __('Title:')
--                    ); ?> </label><span></span>
-+                <label><?= $block->escapeHtml(__('Title:')); ?> </label><span></span>
-             </div>
-             <div class="video-information uploaded">
--                <label><?= $block->escapeHtml(
--                        __('Uploaded:')
--                    ); ?> </label><span></span>
-+                <label><?= $block->escapeHtml(__('Uploaded:')); ?> </label><span></span>
-             </div>
-             <div class="video-information uploader">
--                <label><?= $block->escapeHtml(
--                        __('Uploader:')
--                    ); ?> </label><span></span>
-+                <label><?= $block->escapeHtml(__('Uploader:')); ?> </label><span></span>
-             </div>
-             <div class="video-information duration">
--                <label><?= $block->escapeHtml(
--                        __('Duration:')
--                    ); ?> </label><span></span>
-+                <label><?= $block->escapeHtml(__('Duration:')); ?> </label><span></span>
-             </div>
-         </div>
-     </div>
-diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml
-index dc0d8206571..e1dcab9e8b2 100644
---- a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml
-+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml
-@@ -8,30 +8,30 @@
-     <div class="add-video-button-container">
-         <button
-             id="add_video_button"
--            title="<?= /* @escapeNotVerified */ $addVideoTitle ?>"
-+            title="<?= $block->escapeHtmlAttr($addVideoTitle) ?>"
-             type="button"
-             class="action-secondary"
-             onclick="jQuery('#new-video').modal('openModal'); jQuery('#new_video_form')[0].reset();"
-             data-ui-id="widget-button-1">
--            <span><?= /* @escapeNotVerified */ __('Add Video') ?></span>
-+            <span><?= $block->escapeHtml(__('Add Video')) ?></span>
-         </button>
-     </div>
- </div>
--<div id="<?= /* @escapeNotVerified */ $htmlId ?>-container"
-+<div id="<?= $block->escapeHtmlAttr($htmlId) ?>-container"
-      class="images"
-      data-mage-init='{"baseImage":{}}'
--     data-max-file-size="<?= /* @escapeNotVerified */ $fileMaxSize ?>"
-+     data-max-file-size="<?= $block->escapeHtmlAttr($fileMaxSize) ?>"
-     >
-     <div class="image image-placeholder">
--        <input type="file" name="image" data-url="<?= /* @escapeNotVerified */ $uploadUrl ?>" multiple="multiple" />
--        <img class="spacer" src="<?= /* @escapeNotVerified */ $spacerImage ?>"/>
--        <p class="image-placeholder-text"><?= /* @escapeNotVerified */ $imagePlaceholderText ?></p>
-+        <input type="file" name="image" data-url="<?= $block->escapeUrl($uploadUrl) ?>" multiple="multiple" />
-+        <img class="spacer" src="<?= $block->escapeUrl($spacerImage) ?>"/>
-+        <p class="image-placeholder-text"><?= $block->escapeHtml($imagePlaceholderText) ?></p>
-     </div>
--    <script id="<?= /* @escapeNotVerified */ $htmlId ?>-template"
-+    <script id="<?= $block->escapeHtmlAttr($htmlId) ?>-template"
-             data-template="image"
-             type="text/x-magento-template">
-         <div class="image">
--            <img class="spacer" src="<?= /* @escapeNotVerified */ $spacerImage ?>"/>
-+            <img class="spacer" src="<?= $block->escapeUrl($spacerImage) ?>"/>
-             <img
-                 class="product-image"
-                 src="<%- data.url %>"
-@@ -42,25 +42,25 @@
-                     type="button"
-                     class="action-delete"
-                     data-role="delete-button"
--                    title="<?= /* @escapeNotVerified */ $deleteImageText ?>">
--                    <span><?= /* @escapeNotVerified */ $deleteImageText ?></span>
-+                    title="<?= $block->escapeHtmlAttr($deleteImageText) ?>">
-+                    <span><?= $block->escapeHtml($deleteImageText) ?></span>
-                 </button>
-                 <button
-                     type="button"
-                     class="action-make-base"
-                     data-role="make-base-button"
--                    title="<?= /* @escapeNotVerified */ $makeBaseText ?>">
--                    <span><?= /* @escapeNotVerified */ $makeBaseText ?></span>
-+                    title="<?= $block->escapeHtmlAttr($makeBaseText) ?>">
-+                    <span><?= $block->escapeHtml($makeBaseText) ?></span>
-                 </button>
-                 <div class="draggable-handle"></div>
-             </div>
-             <div class="image-label"></div>
--            <div class="image-fade"><span><?= /* @escapeNotVerified */ $hiddenText ?></span></div>
-+            <div class="image-fade"><span><?= $block->escapeHtml($hiddenText) ?></span></div>
-         </div>
-     </script>
- </div>
- <span class="action-manage-images" data-activate-tab="image-management">
--    <span><?= /* @escapeNotVerified */ $imageManagementText ?></span>
-+    <span><?= $block->escapeHtml($imageManagementText) ?></span>
- </span>
- <script>
-     require([
-diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
-index e9421f8e74a..7de3042b56a 100644
---- a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
-+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
-@@ -5,23 +5,23 @@
-  */
- /* @var Magento\ProductVideo\Block\Adminhtml\Product\Edit\NewVideo $block */
- ?>
--<div id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none"
--    data-modal-info='<?= /* @escapeNotVerified */ $block->getWidgetOptions() ?>'
-+<div id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>" style="display:none"
-+    data-modal-info='<?= /* @noEscape */ $block->getWidgetOptions() ?>'
- >
--    <?= /* @escapeNotVerified */ $block->getFormHtml() ?>
-+    <?= $block->getFormHtml() ?>
-     <div id="video-player-preview-location" class="video-player-sidebar">
-         <div class="video-player-container"></div>
-         <div class="video-information title">
--            <label><?= /* @escapeNotVerified */ __('Title:') ?> </label><span></span>
-+            <label><?= $block->escapeHtml(__('Title:')) ?> </label><span></span>
-         </div>
-         <div class="video-information uploaded">
--            <label><?= /* @escapeNotVerified */ __('Uploaded:') ?> </label><span></span>
-+            <label><?= $block->escapeHtml(__('Uploaded:')) ?> </label><span></span>
-         </div>
-         <div class="video-information uploader">
--            <label><?= /* @escapeNotVerified */ __('Uploader:') ?> </label><span></span>
-+            <label><?= $block->escapeHtml(__('Uploader:')) ?> </label><span></span>
-         </div>
-         <div class="video-information duration">
--            <label><?= /* @escapeNotVerified */ __('Duration:') ?> </label><span></span>
-+            <label><?= $block->escapeHtml(__('Duration:')) ?> </label><span></span>
-         </div>
-     </div>
- </div>
-diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/css/gallery-delete-tooltip.css b/app/code/Magento/ProductVideo/view/adminhtml/web/css/gallery-delete-tooltip.css
-new file mode 100644
-index 00000000000..ad779c3f29b
---- /dev/null
-+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/css/gallery-delete-tooltip.css
-@@ -0,0 +1,20 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+.gallery .tooltip .delete-tooltiptext {
-+    visibility: hidden;
-+    width: 112px;
-+    background-color: #373330;
-+    color: #F7F3EB;
-+    text-align: center;
-+    padding: 5px 0;
-+    position: absolute;
-+    z-index: 1;
-+    left: 30px;
-+    top: 91px;
-+}
-+
-+.gallery .tooltip:hover .delete-tooltiptext {
-+    visibility: visible;
-+}
-\ No newline at end of file
-diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
-index 13b0e43a84d..653434f1008 100644
---- a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
-+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
-@@ -86,6 +86,7 @@ define([
-                 this._height = this.element.data('height');
-                 this._autoplay = !!this.element.data('autoplay');
-                 this._playing = this._autoplay || false;
-+                this.useYoutubeNocookie = this.element.data('youtubenocookie') || false;
- 
-                 this._responsive = this.element.data('responsive') !== false;
- 
-@@ -163,6 +164,12 @@ define([
-                      * @private
-                      */
-                     'youtubeapiready': function () {
-+                        var host = 'https://www.youtube.com';
-+
-+                        if (self.useYoutubeNocookie) {
-+                            host = 'https://www.youtube-nocookie.com';
-+                        }
-+
-                         if (self._player !== undefined) {
-                             return;
-                         }
-@@ -177,6 +184,7 @@ define([
-                             width: self._width,
-                             videoId: self._code,
-                             playerVars: self._params,
-+                            host: host,
-                             events: {
- 
-                                 /**
-@@ -469,7 +477,8 @@ define([
-                         description: tmp.snippet.description,
-                         thumbnail: tmp.snippet.thumbnails.high.url,
-                         videoId: videoInfo.id,
--                        videoProvider: videoInfo.type
-+                        videoProvider: videoInfo.type,
-+                        useYoutubeNocookie: videoInfo.useYoutubeNocookie
-                     };
-                     this._videoInformation = respData;
-                     this.element.trigger(this._UPDATE_VIDEO_INFORMATION_TRIGGER, respData);
-@@ -600,7 +609,8 @@ define([
-                 var id,
-                     type,
-                     ampersandPosition,
--                    vimeoRegex;
-+                    vimeoRegex,
-+                    useYoutubeNocookie = false;
- 
-                 if (typeof href !== 'string') {
-                     return href;
-@@ -620,9 +630,13 @@ define([
-                         id = id.substring(0, ampersandPosition);
-                     }
- 
--                } else if (href.host.match(/youtube\.com|youtu\.be/)) {
-+                } else if (href.host.match(/youtube\.com|youtu\.be|youtube-nocookie.com/)) {
-                     id = href.pathname.replace(/^\/(embed\/|v\/)?/, '').replace(/\/.*/, '');
-                     type = 'youtube';
-+
-+                    if (href.host.match(/youtube-nocookie.com/)) {
-+                        useYoutubeNocookie = true;
-+                    }
-                 } else if (href.host.match(/vimeo\.com/)) {
-                     type = 'vimeo';
-                     vimeoRegex = new RegExp(['https?:\\/\\/(?:www\\.|player\\.)?vimeo.com\\/(?:channels\\/(?:\\w+\\/)',
-@@ -640,7 +654,7 @@ define([
-                 }
- 
-                 return id ? {
--                    id: id, type: type, s: href.search.replace(/^\?/, '')
-+                    id: id, type: type, s: href.search.replace(/^\?/, ''), useYoutubeNocookie: useYoutubeNocookie
-                 } : false;
-             }
-         });
-diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
-index 1ab10c95a51..e9b234c5f11 100644
---- a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
-+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
-@@ -21,6 +21,7 @@ define([
-             container: '.video-player-container',
-             videoClass: 'product-video',
-             reset: false,
-+            useYoutubeNocookie: false,
-             metaData: {
-                 DOM: {
-                     title: '.video-information.title span',
-@@ -86,34 +87,36 @@ define([
-          * @private
-          */
-         _doUpdate: function () {
-+            var uploaderLinkUrl,
-+                uploaderLink;
-+
-             this.reset();
--            this.element.find(this.options.container).append('<div class="' +
--            this.options.videoClass +
--            '" data-type="' +
--            this.options.videoProvider +
--            '" data-code="' +
--            this.options.videoId +
--            '" data-width="100%" data-height="100%"></div>');
-+            this.element.find(this.options.container).append(
-+                '<div class="' +
-+                this.options.videoClass +
-+                '" data-type="' +
-+                this.options.videoProvider +
-+                '" data-code="' +
-+                this.options.videoId +
-+                '" data-youtubenocookie="' +
-+                this.options.useYoutubeNocookie +
-+                '" data-width="100%" data-height="100%"></div>'
-+            );
-             this.element.find(this.options.metaData.DOM.wrapper).show();
-             this.element.find(this.options.metaData.DOM.title).text(this.options.metaData.data.title);
-             this.element.find(this.options.metaData.DOM.uploaded).text(this.options.metaData.data.uploaded);
-             this.element.find(this.options.metaData.DOM.duration).text(this.options.metaData.data.duration);
- 
-             if (this.options.videoProvider === 'youtube') {
--                this.element.find(this.options.metaData.DOM.uploader).html(
--                    '<a href="https://youtube.com/channel/' +
--                    this.options.metaData.data.uploaderUrl +
--                    '" target="_blank">' +
--                    this.options.metaData.data.uploader +
--                    '</a>'
--                );
-+                uploaderLinkUrl = 'https://youtube.com/channel/' + this.options.metaData.data.uploaderUrl;
-             } else if (this.options.videoProvider === 'vimeo') {
--                this.element.find(this.options.metaData.DOM.uploader).html(
--                    '<a href="' +
--                    this.options.metaData.data.uploaderUrl +
--                    '" target="_blank">' + this.options.metaData.data.uploader +
--                    '</a>');
-+                uploaderLinkUrl = this.options.metaData.data.uploaderUrl;
-             }
-+            uploaderLink = document.createElement('a');
-+            uploaderLink.setAttribute('href', uploaderLinkUrl);
-+            uploaderLink.setAttribute('target', '_blank');
-+            uploaderLink.innerText = this.options.metaData.data.uploader;
-+            this.element.find(this.options.metaData.DOM.uploader)[0].appendChild(uploaderLink);
-             this.element.find('.' + this.options.videoClass).productVideoLoader();
- 
-         },
-@@ -337,6 +340,7 @@ define([
-                 .createVideoPlayer({
-                     videoId: data.videoId,
-                     videoProvider: data.videoProvider,
-+                    useYoutubeNocookie: data.useYoutubeNocookie,
-                     reset: false,
-                     metaData: {
-                         DOM: {
-diff --git a/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml
-index 55486dbbb0c..bfa394b5e70 100644
---- a/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml
-+++ b/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml
-@@ -14,8 +14,8 @@
-     {
-         "[data-gallery-role=gallery-placeholder]": {
-             "Magento_ProductVideo/js/fotorama-add-video-events": {
--                "videoData": <?= /* @escapeNotVerified */ $block->getMediaGalleryDataJson() ?>,
--                "videoSettings": <?= /* @escapeNotVerified */ $block->getVideoSettingsJson() ?>,
-+                "videoData": <?= /* @noEscape */ $block->getMediaGalleryDataJson() ?>,
-+                "videoSettings": <?= /* @noEscape */ $block->getVideoSettingsJson() ?>,
-                 "optionsVideoData": <?= /* @noEscape */ $block->getOptionsMediaGalleryDataJson() ?>
-             }
-         }
-diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
-index 9bb4b9996e3..cd0f3b3d630 100644
---- a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
-+++ b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
-@@ -34,7 +34,8 @@ define([
-         var id,
-             type,
-             ampersandPosition,
--            vimeoRegex;
-+            vimeoRegex,
-+            useYoutubeNocookie = false;
- 
-         /**
-          * Get youtube ID
-@@ -68,9 +69,13 @@ define([
-                 id = _getYoutubeId(id);
-                 type = 'youtube';
-             }
--        } else if (href.host.match(/youtube\.com|youtu\.be/)) {
-+        } else if (href.host.match(/youtube\.com|youtu\.be|youtube-nocookie.com/)) {
-             id = href.pathname.replace(/^\/(embed\/|v\/)?/, '').replace(/\/.*/, '');
-             type = 'youtube';
-+
-+            if (href.host.match(/youtube-nocookie.com/)) {
-+                useYoutubeNocookie = true;
-+            }
-         } else if (href.host.match(/vimeo\.com/)) {
-             type = 'vimeo';
-             vimeoRegex = new RegExp(['https?:\\/\\/(?:www\\.|player\\.)?vimeo.com\\/(?:channels\\/(?:\\w+\\/)',
-@@ -85,7 +90,7 @@ define([
-         }
- 
-         return id ? {
--            id: id, type: type, s: href.search.replace(/^\?/, '')
-+            id: id, type: type, s: href.search.replace(/^\?/, ''), useYoutubeNocookie: useYoutubeNocookie
-         } : false;
-     }
- 
-@@ -172,12 +177,14 @@ define([
-          * @private
-          */
-         clearEvents: function () {
--            this.fotoramaItem.off(
--                'fotorama:show.' + this.PV +
--                ' fotorama:showend.' + this.PV +
--                ' fotorama:fullscreenenter.' + this.PV +
--                ' fotorama:fullscreenexit.' + this.PV
--            );
-+            if (this.fotoramaItem !== undefined) {
-+                this.fotoramaItem.off(
-+                    'fotorama:show.' + this.PV +
-+                    ' fotorama:showend.' + this.PV +
-+                    ' fotorama:fullscreenenter.' + this.PV +
-+                    ' fotorama:fullscreenexit.' + this.PV
-+                );
-+            }
-         },
- 
-         /**
-@@ -281,6 +288,7 @@ define([
-                     tmpVideoData.id = dataUrl.id;
-                     tmpVideoData.provider = dataUrl.type;
-                     tmpVideoData.videoUrl = tmpInputData.videoUrl;
-+                    tmpVideoData.useYoutubeNocookie = dataUrl.useYoutubeNocookie;
-                 }
- 
-                 videoData.push(tmpVideoData);
-@@ -442,7 +450,7 @@ define([
-                 scriptTag = document.getElementsByTagName('script')[0];
- 
-             element.async = true;
--            element.src = 'https://secure-a.vimeocdn.com/js/froogaloop2.min.js';
-+            element.src = 'https://f.vimeocdn.com/js/froogaloop2.min.js';
- 
-             /**
-              * Vimeo js framework on load callback.
-@@ -629,6 +637,8 @@ define([
-                 videoData.provider +
-                 '" data-code="' +
-                 videoData.id +
-+                '"  data-youtubenocookie="' +
-+                videoData.useYoutubeNocookie +
-                 '" data-width="100%" data-height="100%"></div>'
-             );
-         },
-diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js b/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js
-index 3519d538e52..75a2c1d75da 100644
---- a/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js
-+++ b/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js
-@@ -88,6 +88,7 @@ define(['jquery', 'jquery/ui'], function ($) {
-             this._playing = this._autoplay || false;
-             this._loop = this.element.data('loop');
-             this._rel = this.element.data('related');
-+            this.useYoutubeNocookie = this.element.data('youtubenocookie') || false;
- 
-             this._responsive = this.element.data('responsive') !== false;
- 
-@@ -164,6 +165,12 @@ define(['jquery', 'jquery/ui'], function ($) {
-                  * Handle event
-                  */
-                 'youtubeapiready': function () {
-+                    var host = 'https://www.youtube.com';
-+
-+                    if (self.useYoutubeNocookie) {
-+                        host = 'https://www.youtube-nocookie.com';
-+                    }
-+
-                     if (self._player !== undefined) {
-                         return;
-                     }
-@@ -182,6 +189,7 @@ define(['jquery', 'jquery/ui'], function ($) {
-                         width: self._width,
-                         videoId: self._code,
-                         playerVars: self._params,
-+                        host: host,
-                         events: {
- 
-                             /**
-diff --git a/app/code/Magento/Quote/Api/CartRepositoryInterface.php b/app/code/Magento/Quote/Api/CartRepositoryInterface.php
-index f507c1e83f1..ee122d1b02f 100644
---- a/app/code/Magento/Quote/Api/CartRepositoryInterface.php
-+++ b/app/code/Magento/Quote/Api/CartRepositoryInterface.php
-@@ -25,10 +25,9 @@ interface CartRepositoryInterface
-      * Enables administrative users to list carts that match specified search criteria.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included.  See http://devdocs.magento.com/codelinks/attributes.html#CartRepositoryInterface to determine
-+     * included.  See https://devdocs.magento.com/codelinks/attributes.html#CartRepositoryInterface to determine
-      * which call to use to get detailed information about all attributes for an object.
-      *
--     *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-      * @return \Magento\Quote\Api\Data\CartSearchResultsInterface
-      */
-diff --git a/app/code/Magento/Quote/Api/Data/CartInterface.php b/app/code/Magento/Quote/Api/Data/CartInterface.php
-index 551833e3eff..b87869de6b3 100644
---- a/app/code/Magento/Quote/Api/Data/CartInterface.php
-+++ b/app/code/Magento/Quote/Api/Data/CartInterface.php
-@@ -223,14 +223,14 @@ interface CartInterface extends \Magento\Framework\Api\ExtensibleDataInterface
-     /**
-      * Returns the reserved order ID for the cart.
-      *
--     * @return int|null Reserved order ID. Otherwise, null.
-+     * @return string|null Reserved order ID. Otherwise, null.
-      */
-     public function getReservedOrderId();
- 
-     /**
-      * Sets the reserved order ID for the cart.
-      *
--     * @param int $reservedOrderId
-+     * @param string $reservedOrderId
-      * @return $this
-      */
-     public function setReservedOrderId($reservedOrderId);
-diff --git a/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php b/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php
-index a9d1772684b..f1ee8bd83fe 100644
---- a/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php
-+++ b/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php
-@@ -37,7 +37,7 @@ interface GuestPaymentMethodManagementInterface
-      * List available payment methods for a specified shopping cart.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included.  See http://devdocs.magento.com/codelinks/attributes.html#GuestPaymentMethodManagementInterface to
-+     * included.  See https://devdocs.magento.com/codelinks/attributes.html#GuestPaymentMethodManagementInterface to
-      * determine which call to use to get detailed information about all attributes for an object.
-      *
-      * @param string $cartId The cart ID.
-diff --git a/app/code/Magento/Quote/Api/PaymentMethodManagementInterface.php b/app/code/Magento/Quote/Api/PaymentMethodManagementInterface.php
-index 50fac772ed3..b00a6617bea 100644
---- a/app/code/Magento/Quote/Api/PaymentMethodManagementInterface.php
-+++ b/app/code/Magento/Quote/Api/PaymentMethodManagementInterface.php
-@@ -37,7 +37,7 @@ interface PaymentMethodManagementInterface
-      * Lists available payment methods for a specified shopping cart.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included.  See http://devdocs.magento.com/codelinks/attributes.html#PaymentMethodManagementInterface to
-+     * included.  See https://devdocs.magento.com/codelinks/attributes.html#PaymentMethodManagementInterface to
-      * determine which call to use to get detailed information about all attributes for an object.
-      *
-      * @param int $cartId The cart ID.
-diff --git a/app/code/Magento/Quote/Model/BillingAddressManagement.php b/app/code/Magento/Quote/Model/BillingAddressManagement.php
-index 70a8c94fefa..bc055e71c66 100644
---- a/app/code/Magento/Quote/Model/BillingAddressManagement.php
-+++ b/app/code/Magento/Quote/Model/BillingAddressManagement.php
-@@ -14,7 +14,6 @@ use Magento\Framework\App\ObjectManager;
- 
- /**
-  * Quote billing address write service object.
-- *
-  */
- class BillingAddressManagement implements BillingAddressManagementInterface
- {
-@@ -70,13 +69,14 @@ class BillingAddressManagement implements BillingAddressManagementInterface
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address, $useForShipping = false)
-     {
-         /** @var \Magento\Quote\Model\Quote $quote */
-         $quote = $this->quoteRepository->getActive($cartId);
-+        $address->setCustomerId($quote->getCustomerId());
-         $quote->removeAddress($quote->getBillingAddress()->getId());
-         $quote->setBillingAddress($address);
-         try {
-@@ -91,7 +91,7 @@ class BillingAddressManagement implements BillingAddressManagementInterface
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function get($cartId)
-     {
-@@ -100,6 +100,8 @@ class BillingAddressManagement implements BillingAddressManagementInterface
-     }
- 
-     /**
-+     * Get shipping address assignment
-+     *
-      * @return \Magento\Quote\Model\ShippingAddressAssignment
-      * @deprecated 100.2.0
-      */
-diff --git a/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php b/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
-index e18ab8587fc..2c487cdea63 100644
---- a/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
-+++ b/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
-@@ -8,7 +8,6 @@ namespace Magento\Quote\Model\Cart;
- use Magento\Quote\Api;
- use Magento\Quote\Api\CartRepositoryInterface;
- use Magento\Quote\Api\CartTotalRepositoryInterface;
--use Magento\Catalog\Helper\Product\ConfigurationPool;
- use Magento\Framework\Api\DataObjectHelper;
- use Magento\Framework\Api\ExtensibleDataInterface;
- use Magento\Quote\Model\Cart\Totals\ItemConverter;
-@@ -40,7 +39,7 @@ class CartTotalRepository implements CartTotalRepositoryInterface
-     private $dataObjectHelper;
- 
-     /**
--     * @var ConfigurationPool
-+     * @var ItemConverter
-      */
-     private $itemConverter;
- 
-@@ -79,7 +78,7 @@ class CartTotalRepository implements CartTotalRepositoryInterface
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      *
-      * @param int $cartId The cart ID.
-      * @return Totals Quote totals data.
-diff --git a/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteId.php b/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteId.php
-new file mode 100644
-index 00000000000..37a8fcd494f
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteId.php
-@@ -0,0 +1,60 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model;
-+
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResource;
-+
-+/**
-+ * MaskedQuoteId to QuoteId resolver
-+ */
-+class MaskedQuoteIdToQuoteId implements MaskedQuoteIdToQuoteIdInterface
-+{
-+    /**
-+     * @var CartRepositoryInterface
-+     */
-+    private $cartRepository;
-+
-+    /**
-+     * @var QuoteIdMaskFactory
-+     */
-+    private $quoteIdMaskFactory;
-+
-+    /**
-+     * @var QuoteIdMaskResource
-+     */
-+    private $quoteIdMaskResource;
-+
-+    /**
-+     * @param QuoteIdMaskFactory $quoteIdMaskFactory
-+     * @param CartRepositoryInterface $cartRepository
-+     * @param QuoteIdMaskResource $quoteIdMaskResource
-+     */
-+    public function __construct(
-+        QuoteIdMaskFactory $quoteIdMaskFactory,
-+        CartRepositoryInterface $cartRepository,
-+        QuoteIdMaskResource $quoteIdMaskResource
-+    ) {
-+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
-+        $this->cartRepository = $cartRepository;
-+        $this->quoteIdMaskResource = $quoteIdMaskResource;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function execute(string $maskedQuoteId): int
-+    {
-+        $quoteIdMask = $this->quoteIdMaskFactory->create();
-+        $this->quoteIdMaskResource->load($quoteIdMask, $maskedQuoteId, 'masked_id');
-+
-+        $cart = $this->cartRepository->get($quoteIdMask->getQuoteId());
-+
-+        return (int)$cart->getId();
-+    }
-+}
-diff --git a/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteIdInterface.php b/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteIdInterface.php
-new file mode 100644
-index 00000000000..152d575e059
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteIdInterface.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model;
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+
-+/**
-+ * Converts masked quote id to the quote id (entity id)
-+ * @api
-+ */
-+interface MaskedQuoteIdToQuoteIdInterface
-+{
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return int
-+     * @throws NoSuchEntityException
-+     */
-+    public function execute(string $maskedQuoteId): int;
-+}
-diff --git a/app/code/Magento/Quote/Model/Product/Plugin/MarkQuotesRecollectMassDisabled.php b/app/code/Magento/Quote/Model/Product/Plugin/MarkQuotesRecollectMassDisabled.php
-new file mode 100644
-index 00000000000..f18bb46fa63
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/Product/Plugin/MarkQuotesRecollectMassDisabled.php
-@@ -0,0 +1,55 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model\Product\Plugin;
-+
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\Catalog\Model\Product\Action as ProductAction;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+
-+/**
-+ * Remove quote items after mass disabling products
-+ */
-+class MarkQuotesRecollectMassDisabled
-+{
-+    /** @var QuoteResource$quoteResource */
-+    private $quoteResource;
-+
-+    /**
-+     * @param QuoteResource $quoteResource
-+     */
-+    public function __construct(
-+        QuoteResource $quoteResource
-+    ) {
-+        $this->quoteResource = $quoteResource;
-+    }
-+
-+    /**
-+     * Clean quote items after mass disabling product
-+     *
-+     * @param \Magento\Catalog\Model\Product\Action $subject
-+     * @param \Magento\Catalog\Model\Product\Action $result
-+     * @param int[] $productIds
-+     * @param int[] $attrData
-+     * @param int $storeId
-+     * @return \Magento\Catalog\Model\Product\Action
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterUpdateAttributes(
-+        ProductAction $subject,
-+        ProductAction $result,
-+        $productIds,
-+        $attrData,
-+        $storeId
-+    ): ProductAction {
-+        if (isset($attrData['status']) && $attrData['status'] === Status::STATUS_DISABLED) {
-+            $this->quoteResource->markQuotesRecollect($productIds);
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
-index b7a1b7d563e..82b7913446f 100644
---- a/app/code/Magento/Quote/Model/Quote.php
-+++ b/app/code/Magento/Quote/Model/Quote.php
-@@ -7,6 +7,7 @@ namespace Magento\Quote\Model;
- 
- use Magento\Customer\Api\Data\CustomerInterface;
- use Magento\Customer\Api\Data\GroupInterface;
-+use Magento\Directory\Model\AllowedCountries;
- use Magento\Framework\Api\AttributeValueFactory;
- use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
- use Magento\Framework\Model\AbstractExtensibleModel;
-@@ -14,6 +15,7 @@ use Magento\Quote\Api\Data\PaymentInterface;
- use Magento\Quote\Model\Quote\Address;
- use Magento\Quote\Model\Quote\Address\Total as AddressTotal;
- use Magento\Sales\Model\Status;
-+use Magento\Store\Model\ScopeInterface;
- use Magento\Framework\App\ObjectManager;
- 
- /**
-@@ -359,6 +361,11 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-      */
-     private $orderIncrementIdChecker;
- 
-+    /**
-+     * @var AllowedCountries
-+     */
-+    private $allowedCountriesReader;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -401,6 +408,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
-      * @param array $data
-      * @param \Magento\Sales\Model\OrderIncrementIdChecker|null $orderIncrementIdChecker
-+     * @param AllowedCountries|null $allowedCountriesReader
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -444,7 +452,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-         array $data = [],
--        \Magento\Sales\Model\OrderIncrementIdChecker $orderIncrementIdChecker = null
-+        \Magento\Sales\Model\OrderIncrementIdChecker $orderIncrementIdChecker = null,
-+        AllowedCountries $allowedCountriesReader = null
-     ) {
-         $this->quoteValidator = $quoteValidator;
-         $this->_catalogProduct = $catalogProduct;
-@@ -481,6 +490,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-         $this->shippingAssignmentFactory = $shippingAssignmentFactory;
-         $this->orderIncrementIdChecker = $orderIncrementIdChecker ?: ObjectManager::getInstance()
-             ->get(\Magento\Sales\Model\OrderIncrementIdChecker::class);
-+        $this->allowedCountriesReader = $allowedCountriesReader
-+            ?: ObjectManager::getInstance()->get(AllowedCountries::class);
-         parent::__construct(
-             $context,
-             $registry,
-@@ -503,9 +514,10 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * @codeCoverageIgnoreStart
-+     * Returns information about quote currency, such as code, exchange rate, and so on.
-      *
--     * {@inheritdoc}
-+     * @return \Magento\Quote\Api\Data\CurrencyInterface|null Quote currency information. Otherwise, null.
-+     * @codeCoverageIgnoreStart
-      */
-     public function getCurrency()
-     {
-@@ -526,7 +538,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCurrency(\Magento\Quote\Api\Data\CurrencyInterface $currency = null)
-     {
-@@ -534,7 +546,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getItems()
-     {
-@@ -542,7 +554,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setItems(array $items = null)
-     {
-@@ -550,7 +562,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCreatedAt()
-     {
-@@ -558,7 +570,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCreatedAt($createdAt)
-     {
-@@ -566,7 +578,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getUpdatedAt()
-     {
-@@ -574,7 +586,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setUpdatedAt($updatedAt)
-     {
-@@ -582,7 +594,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConvertedAt()
-     {
-@@ -590,7 +602,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setConvertedAt($convertedAt)
-     {
-@@ -598,7 +610,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIsActive()
-     {
-@@ -606,7 +618,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setIsActive($isActive)
-     {
-@@ -614,7 +626,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setIsVirtual($isVirtual)
-     {
-@@ -622,7 +634,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getItemsCount()
-     {
-@@ -630,7 +642,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setItemsCount($itemsCount)
-     {
-@@ -638,7 +650,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getItemsQty()
-     {
-@@ -646,7 +658,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setItemsQty($itemsQty)
-     {
-@@ -654,7 +666,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getOrigOrderId()
-     {
-@@ -662,7 +674,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setOrigOrderId($origOrderId)
-     {
-@@ -670,7 +682,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getReservedOrderId()
-     {
-@@ -678,7 +690,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setReservedOrderId($reservedOrderId)
-     {
-@@ -686,7 +698,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCustomerIsGuest()
-     {
-@@ -694,7 +706,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerIsGuest($customerIsGuest)
-     {
-@@ -702,7 +714,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCustomerNote()
-     {
-@@ -710,7 +722,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerNote($customerNote)
-     {
-@@ -718,7 +730,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCustomerNoteNotify()
-     {
-@@ -726,7 +738,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerNoteNotify($customerNoteNotify)
-     {
-@@ -736,7 +748,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     //@codeCoverageIgnoreEnd
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getStoreId()
-     {
-@@ -747,7 +759,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreId($storeId)
-     {
-@@ -940,7 +952,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-                     /** @var \Magento\Quote\Model\Quote\Address $billingAddress */
-                     $billingAddress = $this->_quoteAddressFactory->create();
-                     $billingAddress->importCustomerAddressData($defaultBillingAddress);
--                    $this->setBillingAddress($billingAddress);
-+                    $this->assignAddress($billingAddress);
-                 }
-             }
- 
-@@ -958,7 +970,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-                     $shippingAddress = $this->_quoteAddressFactory->create();
-                 }
-             }
--            $this->setShippingAddress($shippingAddress);
-+
-+            $this->assignAddress($shippingAddress, false);
-         }
- 
-         return $this;
-@@ -1078,7 +1091,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCustomerTaxClassId()
-     {
-@@ -1097,7 +1110,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerTaxClassId($customerTaxClassId)
-     {
-@@ -1163,6 +1176,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
-+     * Get all shipping addresses.
-+     *
-      * @return array
-      */
-     public function getAllShippingAddresses()
-@@ -1193,6 +1208,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
-+     * Get address by id.
-      *
-      * @param int $addressId
-      * @return Address|false
-@@ -1208,6 +1224,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
-+     * Get address by customer address id.
-+     *
-      * @param int|string $addressId
-      * @return Address|false
-      */
-@@ -1242,6 +1260,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
-+     * Remove address.
-+     *
-      * @param int|string $addressId
-      * @return $this
-      */
-@@ -1294,6 +1314,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
-+     * Add address.
-+     *
-      * @param \Magento\Quote\Api\Data\AddressInterface $address
-      * @return $this
-      */
-@@ -1307,18 +1329,21 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
-+     * Set billing address.
-+     *
-      * @param \Magento\Quote\Api\Data\AddressInterface $address
-      * @return $this
-      */
-     public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $address = null)
-     {
--        $old = $this->getBillingAddress();
--
-+        $old = $this->getAddressesCollection()->getItemById($address->getId())
-+            ?? $this->getBillingAddress();
-         if (!empty($old)) {
-             $old->addData($address->getData());
-         } else {
-             $this->addAddress($address->setAddressType(Address::TYPE_BILLING));
-         }
-+
-         return $this;
-     }
- 
-@@ -1333,17 +1358,21 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-         if ($this->getIsMultiShipping()) {
-             $this->addAddress($address->setAddressType(Address::TYPE_SHIPPING));
-         } else {
--            $old = $this->getShippingAddress();
-+            $old = $this->getAddressesCollection()->getItemById($address->getId())
-+                ?? $this->getShippingAddress();
-             if (!empty($old)) {
-                 $old->addData($address->getData());
-             } else {
-                 $this->addAddress($address->setAddressType(Address::TYPE_SHIPPING));
-             }
-         }
-+
-         return $this;
-     }
- 
-     /**
-+     * Add shipping address.
-+     *
-      * @param \Magento\Quote\Api\Data\AddressInterface $address
-      * @return $this
-      */
-@@ -1357,15 +1386,14 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-      * Retrieve quote items collection
-      *
-      * @param bool $useCache
--     * @return  \Magento\Eav\Model\Entity\Collection\AbstractCollection
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
-      */
-     public function getItemsCollection($useCache = true)
-     {
--        if ($this->hasItemsCollection()) {
-+        if ($this->hasItemsCollection() && $useCache) {
-             return $this->getData('items_collection');
-         }
--        if (null === $this->_items) {
-+        if (null === $this->_items || !$useCache) {
-             $this->_items = $this->_quoteItemCollectionFactory->create();
-             $this->extensionAttributesJoinProcessor->process($this->_items);
-             $this->_items->setQuote($this);
-@@ -1382,7 +1410,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     {
-         $items = [];
-         foreach ($this->getItemsCollection() as $item) {
--            /** @var \Magento\Quote\Model\ResourceModel\Quote\Item $item */
-+            /** @var \Magento\Quote\Model\Quote\Item $item */
-             if (!$item->isDeleted()) {
-                 $items[] = $item;
-             }
-@@ -1413,7 +1441,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-      */
-     public function hasItems()
-     {
--        return sizeof($this->getAllItems()) > 0;
-+        return count($this->getAllItems()) > 0;
-     }
- 
-     /**
-@@ -1472,7 +1500,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     /**
-      * Delete quote item. If it does not have identifier then it will be only removed from collection
-      *
--     * @param   \Magento\Quote\Model\Quote\Item $item
-+     * @param \Magento\Quote\Model\Quote\Item $item
-      * @return $this
-      */
-     public function deleteItem(\Magento\Quote\Model\Quote\Item $item)
-@@ -1502,7 +1530,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     /**
-      * Remove quote item by item identifier
-      *
--     * @param   int $itemId
-+     * @param int $itemId
-      * @return $this
-      */
-     public function removeItem($itemId)
-@@ -1553,7 +1581,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     /**
-      * Adding new item to quote
-      *
--     * @param   \Magento\Quote\Model\Quote\Item $item
-+     * @param \Magento\Quote\Model\Quote\Item $item
-      * @return $this
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
-@@ -1568,8 +1596,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * Advanced func to add product to quote - processing mode can be specified there.
--     * Returns error message if product type instance can't prepare product.
-+     * Add product. Returns error message if product type instance can't prepare product.
-      *
-      * @param mixed $product
-      * @param null|float|\Magento\Framework\DataObject $request
-@@ -1608,7 +1635,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-          * Error message
-          */
-         if (is_string($cartCandidates) || $cartCandidates instanceof \Magento\Framework\Phrase) {
--            return strval($cartCandidates);
-+            return (string)$cartCandidates;
-         }
- 
-         /**
-@@ -1805,6 +1832,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
-+     * Get items summary qty.
-+     *
-      * @return int
-      */
-     public function getItemsSummaryQty()
-@@ -1832,6 +1861,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
-+     * Get item virtual qty.
-+     *
-      * @return int
-      */
-     public function getItemVirtualQty()
-@@ -1865,6 +1896,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     /*********************** PAYMENTS ***************************/
- 
-     /**
-+     * Get payments collection.
-+     *
-      * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
-      */
-     public function getPaymentsCollection()
-@@ -1882,6 +1915,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
-+     * Get payment.
-+     *
-      * @return \Magento\Quote\Model\Quote\Payment
-      */
-     public function getPayment()
-@@ -1936,6 +1971,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
-+     * Remove payment.
-+     *
-      * @return $this
-      */
-     public function removePayment()
-@@ -1973,6 +2010,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
-+     * Add message.
-+     *
-      * @param string $message
-      * @param string $index
-      * @return $this
-@@ -2061,8 +2100,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * Clears list of errors, associated with this quote.
--     * Also automatically removes error-flag from oneself.
-+     * Clears list of errors, associated with this quote. Also automatically removes error-flag from oneself.
-      *
-      * @return $this
-      */
-@@ -2074,8 +2112,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * Adds error information to the quote.
--     * Automatically sets error flag.
-+     * Adds error information to the quote. Automatically sets error flag.
-      *
-      * @param string $type An internal error type ('error', 'qty', etc.), passed then to adding messages routine
-      * @param string|null $origin Usually a name of module, that embeds error
-@@ -2202,6 +2239,8 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
-+     * Validate minimum amount.
-+     *
-      * @param bool $multishipping
-      * @return bool
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-@@ -2218,6 +2257,11 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-         if (!$minOrderActive) {
-             return true;
-         }
-+        $includeDiscount = $this->_scopeConfig->getValue(
-+            'sales/minimum_order/include_discount_amount',
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-         $minOrderMulti = $this->_scopeConfig->isSetFlag(
-             'sales/minimum_order/multi_address',
-             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-@@ -2251,7 +2295,10 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-                 $taxes = ($taxInclude) ? $address->getBaseTaxAmount() : 0;
-                 foreach ($address->getQuote()->getItemsCollection() as $item) {
-                     /** @var \Magento\Quote\Model\Quote\Item $item */
--                    $amount = $item->getBaseRowTotal() - $item->getBaseDiscountAmount() + $taxes;
-+                    $amount = $includeDiscount ?
-+                        $item->getBaseRowTotal() - $item->getBaseDiscountAmount() + $taxes :
-+                        $item->getBaseRowTotal() + $taxes;
-+
-                     if ($amount < $minAmount) {
-                         return false;
-                     }
-@@ -2261,7 +2308,9 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-             $baseTotal = 0;
-             foreach ($addresses as $address) {
-                 $taxes = ($taxInclude) ? $address->getBaseTaxAmount() : 0;
--                $baseTotal += $address->getBaseSubtotalWithDiscount() + $taxes;
-+                $baseTotal += $includeDiscount ?
-+                    $address->getBaseSubtotalWithDiscount() + $taxes :
-+                    $address->getBaseSubtotal() + $taxes;
-             }
-             if ($baseTotal < $minAmount) {
-                 return false;
-@@ -2301,7 +2350,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-      */
-     public function getIsVirtual()
-     {
--        return intval($this->isVirtual());
-+        return (int)$this->isVirtual();
-     }
- 
-     /**
-@@ -2326,7 +2375,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     /**
-      * Merge quotes
-      *
--     * @param   Quote $quote
-+     * @param Quote $quote
-      * @return $this
-      */
-     public function merge(Quote $quote)
-@@ -2341,6 +2390,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-             foreach ($this->getAllItems() as $quoteItem) {
-                 if ($quoteItem->compare($item)) {
-                     $quoteItem->setQty($quoteItem->getQty() + $item->getQty());
-+                    $this->itemProcessor->merge($item, $quoteItem);
-                     $found = true;
-                     break;
-                 }
-@@ -2451,7 +2501,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
- 
-     /**
-      * Get quote items assigned to different quote addresses populated per item qty.
--     * Based on result array we can display each item separately
-      *
-      * @return array
-      */
-@@ -2540,7 +2589,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Retrieve existing extension attributes object or create a new one.
-      *
-      * @return \Magento\Quote\Api\Data\CartExtensionInterface|null
-      */
-@@ -2550,7 +2599,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Set an extension attributes object.
-      *
-      * @param \Magento\Quote\Api\Data\CartExtensionInterface $extensionAttributes
-      * @return $this
-@@ -2559,4 +2608,34 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
-     {
-         return $this->_setExtensionAttributes($extensionAttributes);
-     }
-+
-+    /**
-+     * Check is address allowed for store
-+     *
-+     * @param Address $address
-+     * @param int|null $storeId
-+     * @return bool
-+     */
-+    private function isAddressAllowedForWebsite(Address $address, $storeId): bool
-+    {
-+        $allowedCountries = $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
-+
-+        return in_array($address->getCountryId(), $allowedCountries);
-+    }
-+
-+    /**
-+     * Assign address to quote
-+     *
-+     * @param Address $address
-+     * @param bool $isBillingAddress
-+     * @return void
-+     */
-+    private function assignAddress(Address $address, bool $isBillingAddress = true): void
-+    {
-+        if ($this->isAddressAllowedForWebsite($address, $this->getStoreId())) {
-+            $isBillingAddress
-+                ? $this->setBillingAddress($address)
-+                : $this->setShippingAddress($address);
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
-index 3eb5d688850..3ecbc69b807 100644
---- a/app/code/Magento/Quote/Model/Quote/Address.php
-+++ b/app/code/Magento/Quote/Model/Quote/Address.php
-@@ -28,8 +28,8 @@ use Magento\Store\Model\StoreManagerInterface;
-  * @method Address setAddressType(string $value)
-  * @method int getFreeShipping()
-  * @method Address setFreeShipping(int $value)
-- * @method int getCollectShippingRates()
-- * @method Address setCollectShippingRates(int $value)
-+ * @method bool getCollectShippingRates()
-+ * @method Address setCollectShippingRates(bool $value)
-  * @method Address setShippingMethod(string $value)
-  * @method string getShippingDescription()
-  * @method Address setShippingDescription(string $value)
-@@ -965,6 +965,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
- 
-     /**
-      * Request shipping rates for entire address or specified address item
-+     *
-      * Returns true if current selected shipping method code corresponds to one of the found rates
-      *
-      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
-@@ -1002,8 +1003,14 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-         /**
-          * Store and website identifiers specified from StoreManager
-          */
--        $request->setStoreId($this->storeManager->getStore()->getId());
--        $request->setWebsiteId($this->storeManager->getWebsite()->getId());
-+        if ($this->getQuote()->getStoreId()) {
-+            $storeId = $this->getQuote()->getStoreId();
-+            $request->setStoreId($storeId);
-+            $request->setWebsiteId($this->storeManager->getStore($storeId)->getWebsiteId());
-+        } else {
-+            $request->setStoreId($this->storeManager->getStore()->getId());
-+            $request->setWebsiteId($this->storeManager->getWebsite()->getId());
-+        }
-         $request->setFreeShipping($this->getFreeShipping());
-         /**
-          * Currencies need to convert in free shipping
-@@ -1142,6 +1149,11 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-             return true;
-         }
- 
-+        $includeDiscount = $this->_scopeConfig->getValue(
-+            'sales/minimum_order/include_discount_amount',
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+            $storeId
-+        );
-         $amount = $this->_scopeConfig->getValue(
-             'sales/minimum_order/amount',
-             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-@@ -1152,9 +1164,12 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-             $storeId
-         );
-+
-         $taxes = $taxInclude ? $this->getBaseTaxAmount() : 0;
- 
--        return ($this->getBaseSubtotalWithDiscount() + $taxes >= $amount);
-+        return $includeDiscount ?
-+            ($this->getBaseSubtotalWithDiscount() + $taxes >= $amount) :
-+            ($this->getBaseSubtotal() + $taxes >= $amount);
-     }
- 
-     /**
-@@ -1348,7 +1363,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     /******************************* End Total Collector Interface *******************************************/
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _getValidationRulesBeforeSave()
-     {
-@@ -1356,7 +1371,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCountryId()
-     {
-@@ -1364,7 +1379,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCountryId($countryId)
-     {
-@@ -1372,7 +1387,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getStreet()
-     {
-@@ -1381,7 +1396,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStreet($street)
-     {
-@@ -1389,7 +1404,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCompany()
-     {
-@@ -1397,7 +1412,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCompany($company)
-     {
-@@ -1405,7 +1420,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getTelephone()
-     {
-@@ -1413,7 +1428,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTelephone($telephone)
-     {
-@@ -1421,7 +1436,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFax()
-     {
-@@ -1429,7 +1444,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setFax($fax)
-     {
-@@ -1437,7 +1452,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getPostcode()
-     {
-@@ -1445,7 +1460,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPostcode($postcode)
-     {
-@@ -1453,7 +1468,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCity()
-     {
-@@ -1461,7 +1476,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCity($city)
-     {
-@@ -1469,7 +1484,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFirstname()
-     {
-@@ -1477,7 +1492,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setFirstname($firstname)
-     {
-@@ -1485,7 +1500,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getLastname()
-     {
-@@ -1493,7 +1508,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setLastname($lastname)
-     {
-@@ -1501,7 +1516,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getMiddlename()
-     {
-@@ -1509,7 +1524,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setMiddlename($middlename)
-     {
-@@ -1517,7 +1532,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getPrefix()
-     {
-@@ -1525,7 +1540,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPrefix($prefix)
-     {
-@@ -1533,7 +1548,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSuffix()
-     {
-@@ -1541,7 +1556,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSuffix($suffix)
-     {
-@@ -1549,7 +1564,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getVatId()
-     {
-@@ -1557,7 +1572,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setVatId($vatId)
-     {
-@@ -1565,7 +1580,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCustomerId()
-     {
-@@ -1573,7 +1588,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerId($customerId)
-     {
-@@ -1581,7 +1596,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getEmail()
-     {
-@@ -1594,7 +1609,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setEmail($email)
-     {
-@@ -1602,7 +1617,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRegion($region)
-     {
-@@ -1610,7 +1625,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRegionId($regionId)
-     {
-@@ -1618,7 +1633,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRegionCode($regionCode)
-     {
-@@ -1626,7 +1641,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSameAsBilling()
-     {
-@@ -1634,7 +1649,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSameAsBilling($sameAsBilling)
-     {
-@@ -1642,7 +1657,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCustomerAddressId()
-     {
-@@ -1650,7 +1665,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerAddressId($customerAddressId)
-     {
-@@ -1681,7 +1696,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     //@codeCoverageIgnoreEnd
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return \Magento\Quote\Api\Data\AddressExtensionInterface|null
-      */
-@@ -1691,7 +1706,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @param \Magento\Quote\Api\Data\AddressExtensionInterface $extensionAttributes
-      * @return $this
-@@ -1712,7 +1727,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function getCustomAttributesCodes()
-     {
-diff --git a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
-index c5b8dc1c4b1..6fdb70350ed 100644
---- a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
-+++ b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
-@@ -12,6 +12,9 @@ use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Quote\Model\QuoteAddressValidator;
- use Magento\Customer\Api\AddressRepositoryInterface;
- 
-+/**
-+ * Saves billing address for quotes.
-+ */
- class BillingAddressPersister
- {
-     /**
-@@ -37,6 +40,8 @@ class BillingAddressPersister
-     }
- 
-     /**
-+     * Save address for billing.
-+     *
-      * @param CartInterface $quote
-      * @param AddressInterface $address
-      * @param bool $useForShipping
-@@ -47,7 +52,7 @@ class BillingAddressPersister
-     public function save(CartInterface $quote, AddressInterface $address, $useForShipping = false)
-     {
-         /** @var \Magento\Quote\Model\Quote $quote */
--        $this->addressValidator->validate($address);
-+        $this->addressValidator->validateForCart($quote, $address);
-         $customerAddressId = $address->getCustomerAddressId();
-         $shippingAddress = null;
-         $addressData = [];
-diff --git a/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeListInterface.php b/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeListInterface.php
-index 4d642c31ae1..313ad23f221 100644
---- a/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeListInterface.php
-+++ b/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeListInterface.php
-@@ -12,7 +12,7 @@ namespace Magento\Quote\Model\Quote\Address;
- interface CustomAttributeListInterface
- {
-     /**
--     * Retrieve list of quote addresss custom attributes
-+     * Retrieve list of quote address custom attributes
-      *
-      * @return array
-      */
-diff --git a/app/code/Magento/Quote/Model/Quote/Address/Item.php b/app/code/Magento/Quote/Model/Quote/Address/Item.php
-index d7014403f78..ade4f9270b6 100644
---- a/app/code/Magento/Quote/Model/Quote/Address/Item.php
-+++ b/app/code/Magento/Quote/Model/Quote/Address/Item.php
-@@ -8,6 +8,8 @@ namespace Magento\Quote\Model\Quote\Address;
- use Magento\Quote\Model\Quote;
- 
- /**
-+ * Quote item model.
-+ *
-  * @api
-  * @method int getParentItemId()
-  * @method \Magento\Quote\Model\Quote\Address\Item setParentItemId(int $value)
-@@ -46,6 +48,8 @@ use Magento\Quote\Model\Quote;
-  * @method \Magento\Quote\Model\Quote\Address\Item setSuperProductId(int $value)
-  * @method int getParentProductId()
-  * @method \Magento\Quote\Model\Quote\Address\Item setParentProductId(int $value)
-+ * @method int getStoreId()
-+ * @method \Magento\Quote\Model\Quote\Address\Item setStoreId(int $value)
-  * @method string getSku()
-  * @method \Magento\Quote\Model\Quote\Address\Item setSku(string $value)
-  * @method string getImage()
-@@ -101,7 +105,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem
-     protected $_quote;
- 
-     /**
--     * @return void
-+     * @inheritdoc
-      */
-     protected function _construct()
-     {
-@@ -109,7 +113,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem
-     }
- 
-     /**
--     * @return $this|\Magento\Quote\Model\Quote\Item\AbstractItem
-+     * @inheritdoc
-      */
-     public function beforeSave()
-     {
-@@ -154,6 +158,8 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem
-     }
- 
-     /**
-+     * Import quote item.
-+     *
-      * @param \Magento\Quote\Model\Quote\Item $quoteItem
-      * @return $this
-      */
-@@ -168,6 +174,8 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem
-             $quoteItem->getProductId()
-         )->setProduct(
-             $quoteItem->getProduct()
-+        )->setStoreId(
-+            $quoteItem->getStoreId()
-         )->setSku(
-             $quoteItem->getSku()
-         )->setName(
-@@ -190,10 +198,9 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem
-     }
- 
-     /**
--     * @param string $code
--     * @return \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface|null
-+     * @inheritdoc
-      */
--    public function getOptionBycode($code)
-+    public function getOptionByCode($code)
-     {
-         if ($this->getQuoteItem()) {
-             return $this->getQuoteItem()->getOptionBycode($code);
-diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total.php b/app/code/Magento/Quote/Model/Quote/Address/Total.php
-index 42224c970ed..00060c15c10 100644
---- a/app/code/Magento/Quote/Model/Quote/Address/Total.php
-+++ b/app/code/Magento/Quote/Model/Quote/Address/Total.php
-@@ -6,6 +6,8 @@
- namespace Magento\Quote\Model\Quote\Address;
- 
- /**
-+ * Class Total
-+ *
-  * @method string getCode()
-  *
-  * @api
-@@ -54,6 +56,8 @@ class Total extends \Magento\Framework\DataObject
-      */
-     public function setTotalAmount($code, $amount)
-     {
-+        $amount = is_float($amount) ? round($amount, 4) : $amount;
-+
-         $this->totalAmounts[$code] = $amount;
-         if ($code != 'subtotal') {
-             $code = $code . '_amount';
-@@ -72,6 +76,8 @@ class Total extends \Magento\Framework\DataObject
-      */
-     public function setBaseTotalAmount($code, $amount)
-     {
-+        $amount = is_float($amount) ? round($amount, 4) : $amount;
-+
-         $this->baseTotalAmounts[$code] = $amount;
-         if ($code != 'subtotal') {
-             $code = $code . '_amount';
-@@ -167,6 +173,7 @@ class Total extends \Magento\Framework\DataObject
- 
-     /**
-      * Set the full info, which is used to capture tax related information.
-+     *
-      * If a string is used, it is assumed to be serialized.
-      *
-      * @param array|string $info
-diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
-index 84f1fc1c35a..e9a63dad6e1 100644
---- a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
-+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
-@@ -9,6 +9,9 @@ use Magento\Framework\Pricing\PriceCurrencyInterface;
- use Magento\Quote\Api\Data\AddressInterface;
- use Magento\Quote\Model\Quote\Address\FreeShippingInterface;
- 
-+/**
-+ * Collect totals for shipping.
-+ */
- class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
- {
-     /**
-@@ -111,7 +114,7 @@ class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
-     {
-         $amount = $total->getShippingAmount();
-         $shippingDescription = $total->getShippingDescription();
--        $title = ($amount != 0 && $shippingDescription)
-+        $title = ($shippingDescription)
-             ? __('Shipping & Handling (%1)', $shippingDescription)
-             : __('Shipping & Handling');
- 
-@@ -227,7 +230,7 @@ class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
-      * @param bool $addressFreeShipping
-      * @param float $itemWeight
-      * @param float $itemQty
--     * @param $freeShipping
-+     * @param bool $freeShipping
-      * @return float
-      */
-     private function getItemRowWeight(
-diff --git a/app/code/Magento/Quote/Model/Quote/Item.php b/app/code/Magento/Quote/Model/Quote/Item.php
-index fe6d712500b..2d6ff670181 100644
---- a/app/code/Magento/Quote/Model/Quote/Item.php
-+++ b/app/code/Magento/Quote/Model/Quote/Item.php
-@@ -270,7 +270,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-      */
-     public function getAddress()
-     {
--        if ($this->getQuote()->getItemsQty() == $this->getQuote()->getVirtualItemsQty()) {
-+        if ($this->getQuote()->isVirtual()) {
-             $address = $this->getQuote()->getBillingAddress();
-         } else {
-             $address = $this->getQuote()->getShippingAddress();
-@@ -282,7 +282,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     /**
-      * Declare quote model object
-      *
--     * @param   \Magento\Quote\Model\Quote $quote
-+     * @param  \Magento\Quote\Model\Quote $quote
-      * @return $this
-      */
-     public function setQuote(\Magento\Quote\Model\Quote $quote)
-@@ -719,6 +719,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
- 
-     /**
-      * Checks that item model has data changes.
-+     *
-      * Call save item options if model isn't need to save in DB
-      *
-      * @return boolean
-@@ -813,8 +814,9 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
--     * Returns formatted buy request - object, holding request received from
--     * product view page with keys and options for configured product
-+     * Get formatted buy request.
-+     *
-+     * Returns object, holding request received from product view page with keys and options for configured product.
-      *
-      * @return \Magento\Framework\DataObject
-      */
-@@ -863,6 +865,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
- 
-     /**
-      * Clears list of errors, associated with this quote item.
-+     *
-      * Also automatically removes error-flag from oneself.
-      *
-      * @return $this
-@@ -876,6 +879,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
- 
-     /**
-      * Adds error information to the quote item.
-+     *
-      * Automatically sets error flag.
-      *
-      * @param string|null $origin Usually a name of module, that embeds error
-@@ -930,9 +934,8 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
-+     * @inheritdoc
-      * @codeCoverageIgnoreStart
--     *
--     * {@inheritdoc}
-      */
-     public function getItemId()
-     {
-@@ -940,7 +943,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setItemId($itemID)
-     {
-@@ -948,7 +951,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSku()
-     {
-@@ -956,7 +959,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSku($sku)
-     {
-@@ -964,7 +967,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getQty()
-     {
-@@ -972,7 +975,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getName()
-     {
-@@ -980,7 +983,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setName($name)
-     {
-@@ -988,7 +991,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getPrice()
-     {
-@@ -996,7 +999,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPrice($price)
-     {
-@@ -1004,7 +1007,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setProductType($productType)
-     {
-@@ -1012,7 +1015,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getQuoteId()
-     {
-@@ -1020,7 +1023,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setQuoteId($quoteId)
-     {
-@@ -1051,7 +1054,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     //@codeCoverageIgnoreEnd
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return \Magento\Quote\Api\Data\CartItemExtensionInterface|null
-      */
-@@ -1061,7 +1064,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @param \Magento\Quote\Api\Data\CartItemExtensionInterface $extensionAttributes
-      * @return $this
-diff --git a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php
-index 1aca6d6c88c..a6fa6828a04 100644
---- a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php
-+++ b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php
-@@ -418,6 +418,7 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM
- 
-     /**
-      * Get item price used for quote calculation process.
-+     *
-      * This method get custom price (if it is defined) or original product final price
-      *
-      * @return float
-@@ -438,6 +439,7 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM
- 
-     /**
-      * Get item price used for quote calculation process.
-+     *
-      * This method get original custom price applied before tax calculation
-      *
-      * @return float
-@@ -502,6 +504,7 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM
- 
-     /**
-      * Get original price (retrieved from product) for item.
-+     *
-      * Original price value is in quote selected currency
-      *
-      * @return float
-@@ -519,8 +522,8 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM
-     /**
-      * Set original price to item (calculation price will be refreshed too)
-      *
--     * @param   float $price
--     * @return  \Magento\Quote\Model\Quote\Item\AbstractItem
-+     * @param float $price
-+     * @return \Magento\Quote\Model\Quote\Item\AbstractItem
-      */
-     public function setOriginalPrice($price)
-     {
-@@ -538,10 +541,10 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM
-     }
- 
-     /**
--     * Specify custom item price (used in case whe we have apply not product price to item)
-+     * Specify custom item price (used in case when we have apply not product price to item)
-      *
--     * @param   float $value
--     * @return  \Magento\Quote\Model\Quote\Item\AbstractItem
-+     * @param float $value
-+     * @return \Magento\Quote\Model\Quote\Item\AbstractItem
-      */
-     public function setCustomPrice($value)
-     {
-@@ -563,8 +566,8 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM
-     /**
-      * Specify item price (base calculation price and converted price will be refreshed too)
-      *
--     * @param   float $value
--     * @return  $this
-+     * @param float $value
-+     * @return $this
-      */
-     public function setPrice($value)
-     {
-@@ -575,6 +578,7 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM
- 
-     /**
-      * Get item price converted to quote currency
-+     *
-      * @return float
-      */
-     public function getConvertedPrice()
-@@ -589,6 +593,7 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM
- 
-     /**
-      * Set new value for converted price
-+     *
-      * @param float $value
-      * @return $this
-      */
-@@ -614,8 +619,7 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM
-     }
- 
-     /**
--     * Checking if there children calculated or parent item
--     * when we have parent quote item and its children
-+     * Checking if there children calculated or parent item when we have parent quote item and its children
-      *
-      * @return bool
-      */
-@@ -636,6 +640,8 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM
-     }
- 
-     /**
-+     * Checking can we ship product separately
-+     *
-      * Checking can we ship product separately (each child separately)
-      * or each parent product item can be shipped only like one item
-      *
-@@ -658,8 +664,9 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM
-     }
- 
-     /**
--     * Returns the total discount amounts of all the child items.  If there are no children, returns the discount
--     * amount of this item.
-+     * Returns the total discount amounts of all the child items.
-+     *
-+     * If there are no children, returns the discount amount of this item.
-      *
-      * @return float
-      */
-diff --git a/app/code/Magento/Quote/Model/Quote/Item/Compare.php b/app/code/Magento/Quote/Model/Quote/Item/Compare.php
-index ddaa636ef32..76ba324518d 100644
---- a/app/code/Magento/Quote/Model/Quote/Item/Compare.php
-+++ b/app/code/Magento/Quote/Model/Quote/Item/Compare.php
-@@ -50,7 +50,7 @@ class Compare
-         if (is_string($value) && $this->jsonValidator->isValid($value)) {
-             $value = $this->serializer->unserialize($value);
-             if (is_array($value)) {
--                unset($value['qty'], $value['uenc']);
-+                unset($value['qty'], $value['uenc'], $value['related_product'], $value['item']);
-                 $value = array_filter($value, function ($optionValue) {
-                     return !empty($optionValue);
-                 });
-diff --git a/app/code/Magento/Quote/Model/Quote/Item/Processor.php b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
-index f34591cfad1..2577008ecba 100644
---- a/app/code/Magento/Quote/Model/Quote/Item/Processor.php
-+++ b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
-@@ -5,7 +5,7 @@
-  */
- namespace Magento\Quote\Model\Quote\Item;
- 
--use \Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product;
- use Magento\Quote\Model\Quote\ItemFactory;
- use Magento\Quote\Model\Quote\Item;
- use Magento\Store\Model\StoreManagerInterface;
-@@ -53,12 +53,12 @@ class Processor
-     /**
-      * Initialize quote item object
-      *
--     * @param \Magento\Framework\DataObject $request
-+     * @param DataObject $request
-      * @param Product $product
-      *
--     * @return \Magento\Quote\Model\Quote\Item
-+     * @return Item
-      */
--    public function init(Product $product, $request)
-+    public function init(Product $product, DataObject $request): Item
-     {
-         $item = $this->quoteItemFactory->create();
- 
-@@ -82,11 +82,11 @@ class Processor
-      * Set qty and custom price for quote item
-      *
-      * @param Item $item
--     * @param \Magento\Framework\DataObject $request
-+     * @param DataObject $request
-      * @param Product $candidate
-      * @return void
-      */
--    public function prepare(Item $item, DataObject $request, Product $candidate)
-+    public function prepare(Item $item, DataObject $request, Product $candidate): void
-     {
-         /**
-          * We specify qty after we know about parent (for stock)
-@@ -103,13 +103,27 @@ class Processor
-         }
-     }
- 
-+    /**
-+     * Merge two quote items.
-+     *
-+     * @param Item $source
-+     * @param Item $target
-+     * @return Item
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function merge(Item $source, Item $target): Item
-+    {
-+        return $target;
-+    }
-+
-     /**
-      * Set store_id value to quote item
-      *
-      * @param Item $item
-      * @return void
-      */
--    protected function setItemStoreId(Item $item)
-+    protected function setItemStoreId(Item $item): void
-     {
-         if ($this->appState->getAreaCode() === \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE) {
-             $storeId = $this->storeManager->getStore($this->storeManager->getStore()->getId())
-diff --git a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
-index 32687499274..6192d3471cc 100644
---- a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
-+++ b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
-@@ -48,6 +48,8 @@ class ToOrderItem
-     }
- 
-     /**
-+     * Convert quote item(quote address item) into order item.
-+     *
-      * @param Item|AddressItem $item
-      * @param array $data
-      * @return OrderItemInterface
-@@ -63,6 +65,16 @@ class ToOrderItem
-             'to_order_item',
-             $item
-         );
-+        if ($item instanceof \Magento\Quote\Model\Quote\Address\Item) {
-+            $orderItemData = array_merge(
-+                $orderItemData,
-+                $this->objectCopyService->getDataFromFieldset(
-+                    'quote_convert_address_item',
-+                    'to_order_item',
-+                    $item
-+                )
-+            );
-+        }
-         if (!$item->getNoDiscount()) {
-             $data = array_merge(
-                 $data,
-diff --git a/app/code/Magento/Quote/Model/Quote/Item/Updater.php b/app/code/Magento/Quote/Model/Quote/Item/Updater.php
-index 6a7a3c1c183..9865ae82ac3 100644
---- a/app/code/Magento/Quote/Model/Quote/Item/Updater.php
-+++ b/app/code/Magento/Quote/Model/Quote/Item/Updater.php
-@@ -60,6 +60,7 @@ class Updater
- 
-     /**
-      * Update quote item qty.
-+     *
-      * Custom price is updated in case 'custom_price' value exists
-      *
-      * @param Item $item
-@@ -145,8 +146,8 @@ class Updater
-             $item->addOption($infoBuyRequest);
-         }
- 
--        $item->unsetData('custom_price');
--        $item->unsetData('original_custom_price');
-+        $item->setData('custom_price', null);
-+        $item->setData('original_custom_price', null);
-     }
- 
-     /**
-diff --git a/app/code/Magento/Quote/Model/Quote/TotalsCollector.php b/app/code/Magento/Quote/Model/Quote/TotalsCollector.php
-index 8fa03232a0e..9442cf2f5f1 100644
---- a/app/code/Magento/Quote/Model/Quote/TotalsCollector.php
-+++ b/app/code/Magento/Quote/Model/Quote/TotalsCollector.php
-@@ -103,6 +103,8 @@ class TotalsCollector
-     }
- 
-     /**
-+     * Collect quote totals.
-+     *
-      * @param \Magento\Quote\Model\Quote $quote
-      * @return Address\Total
-      */
-@@ -115,6 +117,8 @@ class TotalsCollector
-     }
- 
-     /**
-+     * Collect quote.
-+     *
-      * @param \Magento\Quote\Model\Quote $quote
-      * @return \Magento\Quote\Model\Quote\Address\Total
-      */
-@@ -172,6 +176,8 @@ class TotalsCollector
-     }
- 
-     /**
-+     * Validate coupon code.
-+     *
-      * @param \Magento\Quote\Model\Quote $quote
-      * @return $this
-      */
-@@ -203,11 +209,12 @@ class TotalsCollector
-      */
-     protected function _collectItemsQtys(\Magento\Quote\Model\Quote $quote)
-     {
-+        $quoteItems = $quote->getAllVisibleItems();
-         $quote->setItemsCount(0);
-         $quote->setItemsQty(0);
-         $quote->setVirtualItemsQty(0);
- 
--        foreach ($quote->getAllVisibleItems() as $item) {
-+        foreach ($quoteItems as $item) {
-             if ($item->getParentItem()) {
-                 continue;
-             }
-@@ -231,6 +238,8 @@ class TotalsCollector
-     }
- 
-     /**
-+     * Collect address total.
-+     *
-      * @param \Magento\Quote\Model\Quote $quote
-      * @param Address $address
-      * @return Address\Total
-diff --git a/app/code/Magento/Quote/Model/QuoteAddressValidator.php b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
-index 9a86829bfc4..e7750f5879d 100644
---- a/app/code/Magento/Quote/Model/QuoteAddressValidator.php
-+++ b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
-@@ -6,10 +6,13 @@
- namespace Magento\Quote\Model;
- 
- use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Quote\Api\Data\AddressInterface;
-+use Magento\Quote\Api\Data\CartInterface;
- 
- /**
-  * Quote shipping/billing address validator service.
-  *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class QuoteAddressValidator
- {
-@@ -28,7 +31,7 @@ class QuoteAddressValidator
-     protected $customerRepository;
- 
-     /**
--     * @var \Magento\Customer\Model\Session
-+     * @deprecated This class is not a part of HTML presentation layer and should not use sessions.
-      */
-     protected $customerSession;
- 
-@@ -50,44 +53,80 @@ class QuoteAddressValidator
-     }
- 
-     /**
--     * Validates the fields in a specified address data object.
-+     * Validate address.
-      *
--     * @param \Magento\Quote\Api\Data\AddressInterface $addressData The address data object.
--     * @return bool
-+     * @param AddressInterface $address
-+     * @param int|null $customerId Cart belongs to
-+     * @return void
-      * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
-      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
-      */
--    public function validate(\Magento\Quote\Api\Data\AddressInterface $addressData)
-+    private function doValidate(AddressInterface $address, ?int $customerId): void
-     {
-         //validate customer id
--        if ($addressData->getCustomerId()) {
--            $customer = $this->customerRepository->getById($addressData->getCustomerId());
-+        if ($customerId) {
-+            $customer = $this->customerRepository->getById($customerId);
-             if (!$customer->getId()) {
-                 throw new \Magento\Framework\Exception\NoSuchEntityException(
--                    __('Invalid customer id %1', $addressData->getCustomerId())
-+                    __('Invalid customer id %1', $customerId)
-                 );
-             }
-         }
- 
--        if ($addressData->getCustomerAddressId()) {
-+        if ($address->getCustomerAddressId()) {
-+            //Existing address cannot belong to a guest
-+            if (!$customerId) {
-+                throw new \Magento\Framework\Exception\NoSuchEntityException(
-+                    __('Invalid customer address id %1', $address->getCustomerAddressId())
-+                );
-+            }
-+            //Validating address ID
-             try {
--                $this->addressRepository->getById($addressData->getCustomerAddressId());
-+                $this->addressRepository->getById($address->getCustomerAddressId());
-             } catch (NoSuchEntityException $e) {
-                 throw new \Magento\Framework\Exception\NoSuchEntityException(
--                    __('Invalid address id %1', $addressData->getId())
-+                    __('Invalid address id %1', $address->getId())
-                 );
-             }
--
-+            //Finding available customer's addresses
-             $applicableAddressIds = array_map(function ($address) {
-                 /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-                 return $address->getId();
--            }, $this->customerRepository->getById($addressData->getCustomerId())->getAddresses());
--            if (!in_array($addressData->getCustomerAddressId(), $applicableAddressIds)) {
-+            }, $this->customerRepository->getById($customerId)->getAddresses());
-+            if (!in_array($address->getCustomerAddressId(), $applicableAddressIds)) {
-                 throw new \Magento\Framework\Exception\NoSuchEntityException(
--                    __('Invalid customer address id %1', $addressData->getCustomerAddressId())
-+                    __('Invalid customer address id %1', $address->getCustomerAddressId())
-                 );
-             }
-         }
-+    }
-+
-+    /**
-+     * Validates the fields in a specified address data object.
-+     *
-+     * @param \Magento\Quote\Api\Data\AddressInterface $addressData The address data object.
-+     * @return bool
-+     * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
-+     */
-+    public function validate(AddressInterface $addressData)
-+    {
-+        $this->doValidate($addressData, $addressData->getCustomerId());
-+
-         return true;
-     }
-+
-+    /**
-+     * Validate address to be used for cart.
-+     *
-+     * @param CartInterface $cart
-+     * @param AddressInterface $address
-+     * @return void
-+     * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
-+     */
-+    public function validateForCart(CartInterface $cart, AddressInterface $address): void
-+    {
-+        $this->doValidate($address, $cart->getCustomerIsGuest() ? null : $cart->getCustomer()->getId());
-+    }
- }
-diff --git a/app/code/Magento/Quote/Model/QuoteIdMask.php b/app/code/Magento/Quote/Model/QuoteIdMask.php
-index 7950ab47c36..47b02db7650 100644
---- a/app/code/Magento/Quote/Model/QuoteIdMask.php
-+++ b/app/code/Magento/Quote/Model/QuoteIdMask.php
-@@ -53,11 +53,14 @@ class QuoteIdMask extends \Magento\Framework\Model\AbstractModel
-      * Initialize quote identifier before save
-      *
-      * @return $this
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function beforeSave()
-     {
-         parent::beforeSave();
--        $this->setMaskedId($this->randomDataGenerator->getUniqueHash());
-+        if (empty($this->getMaskedId())) {
-+            $this->setMaskedId($this->randomDataGenerator->getUniqueHash());
-+        }
-         return $this;
-     }
- }
-diff --git a/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php
-new file mode 100644
-index 00000000000..2e802f47cfe
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php
-@@ -0,0 +1,61 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model;
-+
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResource;
-+
-+/**
-+ * QuoteId to MaskedQuoteId resolver
-+ */
-+class QuoteIdToMaskedQuoteId implements QuoteIdToMaskedQuoteIdInterface
-+{
-+    /**
-+     * @var QuoteIdMaskFactory
-+     */
-+    private $quoteIdMaskFactory;
-+    /**
-+     * @var CartRepositoryInterface
-+     */
-+    private $cartRepository;
-+
-+    /**
-+     * @var QuoteIdMaskResource
-+     */
-+    private $quoteIdMaskResource;
-+
-+    /**
-+     * @param QuoteIdMaskFactory $quoteIdMaskFactory
-+     * @param CartRepositoryInterface $cartRepository
-+     * @param QuoteIdMaskResource $quoteIdMaskResource
-+     */
-+    public function __construct(
-+        QuoteIdMaskFactory $quoteIdMaskFactory,
-+        CartRepositoryInterface $cartRepository,
-+        QuoteIdMaskResource $quoteIdMaskResource
-+    ) {
-+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
-+        $this->cartRepository = $cartRepository;
-+        $this->quoteIdMaskResource = $quoteIdMaskResource;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function execute(int $quoteId): string
-+    {
-+        /* Check the quote exists to avoid database constraint issues */
-+        $this->cartRepository->get($quoteId);
-+
-+        $quoteIdMask = $this->quoteIdMaskFactory->create();
-+        $this->quoteIdMaskResource->load($quoteIdMask, $quoteId, 'quote_id');
-+        $maskedId = $quoteIdMask->getMaskedId() ?? '';
-+
-+        return $maskedId;
-+    }
-+}
-diff --git a/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteIdInterface.php b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteIdInterface.php
-new file mode 100644
-index 00000000000..4d2a8ce877d
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteIdInterface.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model;
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+
-+/**
-+ * Converts quote id to the masked quote id
-+ * @api
-+ */
-+interface QuoteIdToMaskedQuoteIdInterface
-+{
-+    /**
-+     * @param int $quoteId
-+     * @return string
-+     * @throws NoSuchEntityException
-+     */
-+    public function execute(int $quoteId): string;
-+}
-diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
-index 13021ee4127..5bfbc80452b 100644
---- a/app/code/Magento/Quote/Model/QuoteManagement.php
-+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Quote\Model;
- 
-@@ -25,6 +26,7 @@ use Magento\Store\Model\StoreManagerInterface;
- /**
-  * Class QuoteManagement
-  *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  */
-@@ -36,9 +38,9 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-     protected $eventManager;
- 
-     /**
--     * @var QuoteValidator
-+     * @var SubmitQuoteValidator
-      */
--    protected $quoteValidator;
-+    private $submitQuoteValidator;
- 
-     /**
-      * @var OrderFactory
-@@ -145,9 +147,19 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-      */
-     private $addressesToSync = [];
- 
-+    /**
-+     * @var \Magento\Framework\App\RequestInterface
-+     */
-+    private $request;
-+
-+    /**
-+     * @var \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress
-+     */
-+    private $remoteAddress;
-+
-     /**
-      * @param EventManager $eventManager
--     * @param QuoteValidator $quoteValidator
-+     * @param SubmitQuoteValidator $submitQuoteValidator
-      * @param OrderFactory $orderFactory
-      * @param OrderManagement $orderManagement
-      * @param CustomerManagement $customerManagement
-@@ -159,7 +171,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
-      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
-      * @param \Magento\Customer\Model\CustomerFactory $customerModelFactory
--     * @param \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory,
-+     * @param \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory
-      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-      * @param StoreManagerInterface $storeManager
-      * @param \Magento\Checkout\Model\Session $checkoutSession
-@@ -168,11 +180,13 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-      * @param QuoteFactory $quoteFactory
-      * @param \Magento\Quote\Model\QuoteIdMaskFactory|null $quoteIdMaskFactory
-      * @param \Magento\Customer\Api\AddressRepositoryInterface|null $addressRepository
-+     * @param \Magento\Framework\App\RequestInterface|null $request
-+     * @param \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-         EventManager $eventManager,
--        QuoteValidator $quoteValidator,
-+        SubmitQuoteValidator $submitQuoteValidator,
-         OrderFactory $orderFactory,
-         OrderManagement $orderManagement,
-         CustomerManagement $customerManagement,
-@@ -192,10 +206,12 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-         \Magento\Customer\Api\AccountManagementInterface $accountManagement,
-         \Magento\Quote\Model\QuoteFactory $quoteFactory,
-         \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory = null,
--        \Magento\Customer\Api\AddressRepositoryInterface $addressRepository = null
-+        \Magento\Customer\Api\AddressRepositoryInterface $addressRepository = null,
-+        \Magento\Framework\App\RequestInterface $request = null,
-+        \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress = null
-     ) {
-         $this->eventManager = $eventManager;
--        $this->quoteValidator = $quoteValidator;
-+        $this->submitQuoteValidator = $submitQuoteValidator;
-         $this->orderFactory = $orderFactory;
-         $this->orderManagement = $orderManagement;
-         $this->customerManagement = $customerManagement;
-@@ -218,10 +234,14 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-             ->get(\Magento\Quote\Model\QuoteIdMaskFactory::class);
-         $this->addressRepository = $addressRepository ?: ObjectManager::getInstance()
-             ->get(\Magento\Customer\Api\AddressRepositoryInterface::class);
-+        $this->request = $request ?: ObjectManager::getInstance()
-+            ->get(\Magento\Framework\App\RequestInterface::class);
-+        $this->remoteAddress = $remoteAddress ?: ObjectManager::getInstance()
-+            ->get(\Magento\Framework\HTTP\PhpEnvironment\RemoteAddress::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function createEmptyCart()
-     {
-@@ -241,23 +261,25 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function createEmptyCartForCustomer($customerId)
-     {
-         $storeId = $this->storeManager->getStore()->getStoreId();
-         $quote = $this->createCustomerCart($customerId, $storeId);
- 
-+        $this->_prepareCustomerQuote($quote);
-+
-         try {
-             $this->quoteRepository->save($quote);
-         } catch (\Exception $e) {
-             throw new CouldNotSaveException(__("The quote can't be created."));
-         }
--        return $quote->getId();
-+        return (int)$quote->getId();
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function assignCustomer($cartId, $customerId, $storeId)
-     {
-@@ -280,6 +302,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-             throw new StateException(
-                 __("The customer can't be assigned to the cart because the customer already has an active cart.")
-             );
-+        // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-         }
- 
-@@ -332,32 +355,51 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
-     {
-         $quote = $this->quoteRepository->getActive($cartId);
-         if ($paymentMethod) {
--            $paymentMethod->setChecks([
--                \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_CHECKOUT,
--                \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_FOR_COUNTRY,
--                \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_FOR_CURRENCY,
--                \Magento\Payment\Model\Method\AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX,
--                \Magento\Payment\Model\Method\AbstractMethod::CHECK_ZERO_TOTAL,
--            ]);
-+            $paymentMethod->setChecks(
-+                [
-+                    \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_CHECKOUT,
-+                    \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_FOR_COUNTRY,
-+                    \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_FOR_CURRENCY,
-+                    \Magento\Payment\Model\Method\AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX,
-+                    \Magento\Payment\Model\Method\AbstractMethod::CHECK_ZERO_TOTAL
-+                ]
-+            );
-             $quote->getPayment()->setQuote($quote);
- 
-             $data = $paymentMethod->getData();
-             $quote->getPayment()->importData($data);
-+        } else {
-+            $quote->collectTotals();
-         }
- 
-         if ($quote->getCheckoutMethod() === self::METHOD_GUEST) {
-             $quote->setCustomerId(null);
-             $quote->setCustomerEmail($quote->getBillingAddress()->getEmail());
-+            if ($quote->getCustomerFirstname() === null && $quote->getCustomerLastname() === null) {
-+                $quote->setCustomerFirstname($quote->getBillingAddress()->getFirstname());
-+                $quote->setCustomerLastname($quote->getBillingAddress()->getLastname());
-+                if ($quote->getBillingAddress()->getMiddlename() === null) {
-+                    $quote->setCustomerMiddlename($quote->getBillingAddress()->getMiddlename());
-+                }
-+            }
-             $quote->setCustomerIsGuest(true);
-             $quote->setCustomerGroupId(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID);
-         }
- 
-+        $remoteAddress = $this->remoteAddress->getRemoteAddress();
-+        if ($remoteAddress !== false) {
-+            $quote->setRemoteIp($remoteAddress);
-+            $quote->setXForwardedFor(
-+                $this->request->getServer('HTTP_X_FORWARDED_FOR')
-+            );
-+        }
-+
-         $this->eventManager->dispatch('checkout_submit_before', ['quote' => $quote]);
- 
-         $order = $this->submit($quote);
-@@ -379,7 +421,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCartForCustomer($customerId)
-     {
-@@ -406,6 +448,8 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-     }
- 
-     /**
-+     * Convert quote items to order items for quote
-+     *
-      * @param Quote $quote
-      * @return array
-      */
-@@ -445,7 +489,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-     protected function submitQuote(QuoteEntity $quote, $orderData = [])
-     {
-         $order = $this->orderFactory->create();
--        $this->quoteValidator->validateBeforeSubmit($quote);
-+        $this->submitQuoteValidator->validateQuote($quote);
-         if (!$quote->getCustomerIsGuest()) {
-             if ($quote->getCustomerId()) {
-                 $this->_prepareCustomerQuote($quote);
-@@ -500,6 +544,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-         $order->setCustomerFirstname($quote->getCustomerFirstname());
-         $order->setCustomerMiddlename($quote->getCustomerMiddlename());
-         $order->setCustomerLastname($quote->getCustomerLastname());
-+        $this->submitQuoteValidator->validateOrder($order);
- 
-         $this->eventManager->dispatch(
-             'sales_model_service_quote_submit_before',
-@@ -520,26 +565,14 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-             );
-             $this->quoteRepository->save($quote);
-         } catch (\Exception $e) {
--            if (!empty($this->addressesToSync)) {
--                foreach ($this->addressesToSync as $addressId) {
--                    $this->addressRepository->deleteById($addressId);
--                }
--            }
--            $this->eventManager->dispatch(
--                'sales_model_service_quote_submit_failure',
--                [
--                    'order'     => $order,
--                    'quote'     => $quote,
--                    'exception' => $e
--                ]
--            );
-+            $this->rollbackAddresses($quote, $order, $e);
-             throw $e;
-         }
-         return $order;
-     }
- 
-     /**
--     * Prepare quote for customer order submit
-+     * Prepare address for customer quote.
-      *
-      * @param Quote $quote
-      * @return void
-@@ -559,40 +592,110 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-         if ($shipping && !$shipping->getSameAsBilling()
-             && (!$shipping->getCustomerId() || $shipping->getSaveInAddressBook())
-         ) {
--            $shippingAddress = $shipping->exportCustomerAddress();
--            if (!$hasDefaultShipping) {
--                //Make provided address as default shipping address
--                $shippingAddress->setIsDefaultShipping(true);
--                $hasDefaultShipping = true;
-+            if ($shipping->getQuoteId()) {
-+                $shippingAddress = $shipping->exportCustomerAddress();
-+            } else {
-+                $defaultShipping = $this->customerRepository->getById($customer->getId())->getDefaultShipping();
-+                if ($defaultShipping) {
-+                    try {
-+                        $shippingAddress = $this->addressRepository->getById($defaultShipping);
-+                    // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-+                    } catch (LocalizedException $e) {
-+                        // no address
-+                    }
-+                }
-+            }
-+            if (isset($shippingAddress)) {
-+                if (!$hasDefaultShipping) {
-+                    //Make provided address as default shipping address
-+                    $shippingAddress->setIsDefaultShipping(true);
-+                    $hasDefaultShipping = true;
-+                    if (!$hasDefaultBilling && !$billing->getSaveInAddressBook()) {
-+                        $shippingAddress->setIsDefaultBilling(true);
-+                        $hasDefaultBilling = true;
-+                    }
-+                }
-+                //save here new customer address
-+                $shippingAddress->setCustomerId($quote->getCustomerId());
-+                $this->addressRepository->save($shippingAddress);
-+                $quote->addCustomerAddress($shippingAddress);
-+                $shipping->setCustomerAddressData($shippingAddress);
-+                $this->addressesToSync[] = $shippingAddress->getId();
-+                $shipping->setCustomerAddressId($shippingAddress->getId());
-             }
--            //save here new customer address
--            $shippingAddress->setCustomerId($quote->getCustomerId());
--            $this->addressRepository->save($shippingAddress);
--            $quote->addCustomerAddress($shippingAddress);
--            $shipping->setCustomerAddressData($shippingAddress);
--            $this->addressesToSync[] = $shippingAddress->getId();
--            $shipping->setCustomerAddressId($shippingAddress->getId());
-         }
- 
-         if (!$billing->getCustomerId() || $billing->getSaveInAddressBook()) {
--            $billingAddress = $billing->exportCustomerAddress();
--            if (!$hasDefaultBilling) {
--                //Make provided address as default shipping address
--                if (!$hasDefaultShipping) {
-+            if ($billing->getQuoteId()) {
-+                $billingAddress = $billing->exportCustomerAddress();
-+            } else {
-+                $defaultBilling = $this->customerRepository->getById($customer->getId())->getDefaultBilling();
-+                if ($defaultBilling) {
-+                    try {
-+                        $billingAddress = $this->addressRepository->getById($defaultBilling);
-+                    // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-+                    } catch (LocalizedException $e) {
-+                        // no address
-+                    }
-+                }
-+            }
-+            if (isset($billingAddress)) {
-+                if (!$hasDefaultBilling) {
-                     //Make provided address as default shipping address
--                    $billingAddress->setIsDefaultShipping(true);
-+                    if (!$hasDefaultShipping) {
-+                        //Make provided address as default shipping address
-+                        $billingAddress->setIsDefaultShipping(true);
-+                    }
-+                    $billingAddress->setIsDefaultBilling(true);
-                 }
--                $billingAddress->setIsDefaultBilling(true);
-+                $billingAddress->setCustomerId($quote->getCustomerId());
-+                $this->addressRepository->save($billingAddress);
-+                $quote->addCustomerAddress($billingAddress);
-+                $billing->setCustomerAddressData($billingAddress);
-+                $this->addressesToSync[] = $billingAddress->getId();
-+                $billing->setCustomerAddressId($billingAddress->getId());
-             }
--            $billingAddress->setCustomerId($quote->getCustomerId());
--            $this->addressRepository->save($billingAddress);
--            $quote->addCustomerAddress($billingAddress);
--            $billing->setCustomerAddressData($billingAddress);
--            $this->addressesToSync[] = $billingAddress->getId();
--            $billing->setCustomerAddressId($billingAddress->getId());
-         }
-         if ($shipping && !$shipping->getCustomerId() && !$hasDefaultBilling) {
-             $shipping->setIsDefaultBilling(true);
-         }
-     }
-+
-+    /**
-+     * Remove related to order and quote addresses and submit exception to further processing.
-+     *
-+     * @param Quote $quote
-+     * @param \Magento\Sales\Api\Data\OrderInterface $order
-+     * @param \Exception $e
-+     * @throws \Exception
-+     */
-+    private function rollbackAddresses(
-+        QuoteEntity $quote,
-+        \Magento\Sales\Api\Data\OrderInterface $order,
-+        \Exception $e
-+    ): void {
-+        try {
-+            if (!empty($this->addressesToSync)) {
-+                foreach ($this->addressesToSync as $addressId) {
-+                    $this->addressRepository->deleteById($addressId);
-+                }
-+            }
-+            $this->eventManager->dispatch(
-+                'sales_model_service_quote_submit_failure',
-+                [
-+                    'order' => $order,
-+                    'quote' => $quote,
-+                    'exception' => $e,
-+                ]
-+            );
-+        // phpcs:ignore Magento2.Exceptions.ThrowCatch
-+        } catch (\Exception $consecutiveException) {
-+            $message = sprintf(
-+                "An exception occurred on 'sales_model_service_quote_submit_failure' event: %s",
-+                $consecutiveException->getMessage()
-+            );
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-+            throw new \Exception($message, 0, $e);
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
-index 01c21bbbe50..30931821ddc 100644
---- a/app/code/Magento/Quote/Model/QuoteRepository.php
-+++ b/app/code/Magento/Quote/Model/QuoteRepository.php
-@@ -3,27 +3,33 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Quote\Model;
- 
-+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
-+use Magento\Framework\Api\Search\FilterGroup;
-+use Magento\Framework\Api\SearchCriteria\CollectionProcessor;
- use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-+use Magento\Framework\Api\SearchCriteriaInterface;
- use Magento\Framework\App\ObjectManager;
--use Magento\Framework\Api\SortOrder;
-+use Magento\Framework\Exception\InputException;
- use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Quote\Api\CartRepositoryInterface;
- use Magento\Quote\Api\Data\CartInterface;
--use Magento\Quote\Model\Quote;
--use Magento\Store\Model\StoreManagerInterface;
--use Magento\Framework\Api\Search\FilterGroup;
--use Magento\Quote\Model\ResourceModel\Quote\Collection as QuoteCollection;
--use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory as QuoteCollectionFactory;
--use Magento\Framework\Exception\InputException;
--use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
-+use Magento\Quote\Api\Data\CartInterfaceFactory;
-+use Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory;
- use Magento\Quote\Model\QuoteRepository\SaveHandler;
- use Magento\Quote\Model\QuoteRepository\LoadHandler;
-+use Magento\Quote\Model\ResourceModel\Quote\Collection as QuoteCollection;
-+use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory as QuoteCollectionFactory;
-+use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-+ * Quote repository.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
-+class QuoteRepository implements CartRepositoryInterface
- {
-     /**
-      * @var Quote[]
-@@ -37,6 +43,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
- 
-     /**
-      * @var QuoteFactory
-+     * @deprecated
-      */
-     protected $quoteFactory;
- 
-@@ -46,13 +53,13 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
-     protected $storeManager;
- 
-     /**
--     * @var \Magento\Quote\Model\ResourceModel\Quote\Collection
-+     * @var QuoteCollection
-      * @deprecated 100.2.0
-      */
-     protected $quoteCollection;
- 
-     /**
--     * @var \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory
-+     * @var CartSearchResultsInterfaceFactory
-      */
-     protected $searchResultsDataFactory;
- 
-@@ -77,43 +84,51 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
-     private $collectionProcessor;
- 
-     /**
--     * @var \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory
-+     * @var QuoteCollectionFactory
-      */
-     private $quoteCollectionFactory;
- 
-+    /**
-+     * @var CartInterfaceFactory
-+     */
-+    private $cartFactory;
-+
-     /**
-      * Constructor
-      *
-      * @param QuoteFactory $quoteFactory
-      * @param StoreManagerInterface $storeManager
--     * @param \Magento\Quote\Model\ResourceModel\Quote\Collection $quoteCollection
--     * @param \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory $searchResultsDataFactory
-+     * @param QuoteCollection $quoteCollection
-+     * @param CartSearchResultsInterfaceFactory $searchResultsDataFactory
-      * @param JoinProcessorInterface $extensionAttributesJoinProcessor
-      * @param CollectionProcessorInterface|null $collectionProcessor
--     * @param \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory|null $quoteCollectionFactory
-+     * @param QuoteCollectionFactory|null $quoteCollectionFactory
-+     * @param CartInterfaceFactory|null $cartFactory
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         QuoteFactory $quoteFactory,
-         StoreManagerInterface $storeManager,
--        \Magento\Quote\Model\ResourceModel\Quote\Collection $quoteCollection,
--        \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory $searchResultsDataFactory,
-+        QuoteCollection $quoteCollection,
-+        CartSearchResultsInterfaceFactory $searchResultsDataFactory,
-         JoinProcessorInterface $extensionAttributesJoinProcessor,
-         CollectionProcessorInterface $collectionProcessor = null,
--        \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory $quoteCollectionFactory = null
-+        QuoteCollectionFactory $quoteCollectionFactory = null,
-+        CartInterfaceFactory $cartFactory = null
-     ) {
-         $this->quoteFactory = $quoteFactory;
-         $this->storeManager = $storeManager;
-         $this->searchResultsDataFactory = $searchResultsDataFactory;
-         $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
--        $this->collectionProcessor = $collectionProcessor ?: \Magento\Framework\App\ObjectManager::getInstance()
--            ->get(\Magento\Framework\Api\SearchCriteria\CollectionProcessor::class);
--        $this->quoteCollectionFactory = $quoteCollectionFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
--            ->get(\Magento\Quote\Model\ResourceModel\Quote\CollectionFactory::class);
-+        $this->collectionProcessor = $collectionProcessor ?: ObjectManager::getInstance()
-+            ->get(CollectionProcessor::class);
-+        $this->quoteCollectionFactory = $quoteCollectionFactory ?: ObjectManager::getInstance()
-+            ->get(QuoteCollectionFactory::class);
-+        $this->cartFactory = $cartFactory ?: ObjectManager::getInstance()->get(CartInterfaceFactory::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function get($cartId, array $sharedStoreIds = [])
-     {
-@@ -126,7 +141,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getForCustomer($customerId, array $sharedStoreIds = [])
-     {
-@@ -140,7 +155,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getActive($cartId, array $sharedStoreIds = [])
-     {
-@@ -152,7 +167,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getActiveForCustomer($customerId, array $sharedStoreIds = [])
-     {
-@@ -164,9 +179,9 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
--    public function save(\Magento\Quote\Api\Data\CartInterface $quote)
-+    public function save(CartInterface $quote)
-     {
-         if ($quote->getId()) {
-             $currentQuote = $this->get($quote->getId(), [$quote->getStoreId()]);
-@@ -184,9 +199,9 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
--    public function delete(\Magento\Quote\Api\Data\CartInterface $quote)
-+    public function delete(CartInterface $quote)
-     {
-         $quoteId = $quote->getId();
-         $customerId = $quote->getCustomerId();
-@@ -203,13 +218,13 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
-      * @param int $identifier
-      * @param int[] $sharedStoreIds
-      * @throws NoSuchEntityException
--     * @return Quote
-+     * @return CartInterface
-      */
-     protected function loadQuote($loadMethod, $loadField, $identifier, array $sharedStoreIds = [])
-     {
--        /** @var Quote $quote */
--        $quote = $this->quoteFactory->create();
--        if ($sharedStoreIds) {
-+        /** @var CartInterface $quote */
-+        $quote = $this->cartFactory->create();
-+        if ($sharedStoreIds && method_exists($quote, 'setSharedStoreIds')) {
-             $quote->setSharedStoreIds($sharedStoreIds);
-         }
-         $quote->setStoreId($this->storeManager->getStore()->getId())->$loadMethod($identifier);
-@@ -220,9 +235,9 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
--    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
-+    public function getList(SearchCriteriaInterface $searchCriteria)
-     {
-         $this->quoteCollection = $this->quoteCollectionFactory->create();
-         /** @var \Magento\Quote\Api\Data\CartSearchResultsInterface $searchData */
-@@ -265,6 +280,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
- 
-     /**
-      * Get new SaveHandler dependency for application code.
-+     *
-      * @return SaveHandler
-      * @deprecated 100.1.0
-      */
-@@ -277,6 +293,8 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
-     }
- 
-     /**
-+     * Get load handler instance.
-+     *
-      * @return LoadHandler
-      * @deprecated 100.1.0
-      */
-diff --git a/app/code/Magento/Quote/Model/QuoteRepository/SaveHandler.php b/app/code/Magento/Quote/Model/QuoteRepository/SaveHandler.php
-index 67310a1cc17..12a71648690 100644
---- a/app/code/Magento/Quote/Model/QuoteRepository/SaveHandler.php
-+++ b/app/code/Magento/Quote/Model/QuoteRepository/SaveHandler.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Quote\Model\QuoteRepository;
- 
- use Magento\Quote\Api\Data\CartInterface;
-@@ -10,7 +12,11 @@ use Magento\Customer\Api\AddressRepositoryInterface;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Exception\InputException;
-+use Magento\Quote\Api\Data\AddressInterfaceFactory;
- 
-+/**
-+ * Handler for saving quote.
-+ */
- class SaveHandler
- {
-     /**
-@@ -38,19 +44,26 @@ class SaveHandler
-      */
-     private $addressRepository;
- 
-+    /**
-+     * @var AddressInterfaceFactory
-+     */
-+    private $quoteAddressFactory;
-+
-     /**
-      * @param \Magento\Quote\Model\ResourceModel\Quote $quoteResource
-      * @param \Magento\Quote\Model\Quote\Item\CartItemPersister $cartItemPersister
-      * @param \Magento\Quote\Model\Quote\Address\BillingAddressPersister $billingAddressPersister
-      * @param \Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentPersister $shippingAssignmentPersister
-      * @param AddressRepositoryInterface $addressRepository
-+     * @param AddressInterfaceFactory|null $addressFactory
-      */
-     public function __construct(
-         \Magento\Quote\Model\ResourceModel\Quote $quoteResource,
-         \Magento\Quote\Model\Quote\Item\CartItemPersister $cartItemPersister,
-         \Magento\Quote\Model\Quote\Address\BillingAddressPersister $billingAddressPersister,
-         \Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentPersister $shippingAssignmentPersister,
--        AddressRepositoryInterface $addressRepository = null
-+        AddressRepositoryInterface $addressRepository = null,
-+        AddressInterfaceFactory $addressFactory = null
-     ) {
-         $this->quoteResourceModel = $quoteResource;
-         $this->cartItemPersister = $cartItemPersister;
-@@ -58,6 +71,8 @@ class SaveHandler
-         $this->shippingAssignmentPersister = $shippingAssignmentPersister;
-         $this->addressRepository = $addressRepository
-             ?: ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
-+        $this->quoteAddressFactory = $addressFactory ?:ObjectManager::getInstance()
-+            ->get(AddressInterfaceFactory::class);
-     }
- 
-     /**
-@@ -80,6 +95,9 @@ class SaveHandler
-                 /** @var \Magento\Quote\Model\Quote\Item $item */
-                 if (!$item->isDeleted()) {
-                     $quote->setLastAddedItem($this->cartItemPersister->save($quote, $item));
-+                } elseif (count($items) === 1) {
-+                    $quote->setBillingAddress($this->quoteAddressFactory->create());
-+                    $quote->setShippingAddress($this->quoteAddressFactory->create());
-                 }
-             }
-         }
-diff --git a/app/code/Magento/Quote/Model/QuoteValidator.php b/app/code/Magento/Quote/Model/QuoteValidator.php
-index 1f6deca4c1d..e67a0f13562 100644
---- a/app/code/Magento/Quote/Model/QuoteValidator.php
-+++ b/app/code/Magento/Quote/Model/QuoteValidator.php
-@@ -6,13 +6,17 @@
- 
- namespace Magento\Quote\Model;
- 
--use Magento\Framework\Exception\LocalizedException;
--use Magento\Quote\Model\Quote as QuoteEntity;
- use Magento\Directory\Model\AllowedCountries;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Message\Error;
-+use Magento\Quote\Model\Quote as QuoteEntity;
- use Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage as OrderAmountValidationMessage;
-+use Magento\Quote\Model\ValidationRules\QuoteValidationRuleInterface;
- 
- /**
-+ * Class to validate the quote
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -21,7 +25,7 @@ class QuoteValidator
-     /**
-      * Maximum available number
-      */
--    const MAXIMUM_AVAILABLE_NUMBER = 99999999;
-+    const MAXIMUM_AVAILABLE_NUMBER = 10000000000000000;
- 
-     /**
-      * @var AllowedCountries
-@@ -33,20 +37,29 @@ class QuoteValidator
-      */
-     private $minimumAmountMessage;
- 
-+    /**
-+     * @var QuoteValidationRuleInterface
-+     */
-+    private $quoteValidationRule;
-+
-     /**
-      * QuoteValidator constructor.
-      *
-      * @param AllowedCountries|null $allowedCountryReader
-      * @param OrderAmountValidationMessage|null $minimumAmountMessage
-+     * @param QuoteValidationRuleInterface|null $quoteValidationRule
-      */
-     public function __construct(
-         AllowedCountries $allowedCountryReader = null,
--        OrderAmountValidationMessage $minimumAmountMessage = null
-+        OrderAmountValidationMessage $minimumAmountMessage = null,
-+        QuoteValidationRuleInterface $quoteValidationRule = null
-     ) {
-         $this->allowedCountryReader = $allowedCountryReader ?: ObjectManager::getInstance()
-             ->get(AllowedCountries::class);
-         $this->minimumAmountMessage = $minimumAmountMessage ?: ObjectManager::getInstance()
-             ->get(OrderAmountValidationMessage::class);
-+        $this->quoteValidationRule = $quoteValidationRule ?: ObjectManager::getInstance()
-+            ->get(QuoteValidationRuleInterface::class);
-     }
- 
-     /**
-@@ -62,63 +75,57 @@ class QuoteValidator
-             $quote->setHasError(true);
-             $quote->addMessage(__('This item price or quantity is not valid for checkout.'));
-         }
-+
-         return $this;
-     }
- 
-     /**
--     * Validate quote before submit
-+     * Validates quote before submit.
-      *
-      * @param Quote $quote
-      * @return $this
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws LocalizedException
-      */
-     public function validateBeforeSubmit(QuoteEntity $quote)
-     {
--        if (!$quote->isVirtual()) {
--            if ($quote->getShippingAddress()->validate() !== true) {
--                throw new \Magento\Framework\Exception\LocalizedException(
--                    __(
--                        'Please check the shipping address information. %1',
--                        implode(' ', $quote->getShippingAddress()->validate())
--                    )
--                );
--            }
-+        if ($quote->getHasError()) {
-+            $errors = $this->getQuoteErrors($quote);
-+            throw new LocalizedException(__($errors ?: 'Something went wrong. Please try to place the order again.'));
-+        }
- 
--            // Checks if country id present in the allowed countries list.
--            if (!in_array(
--                $quote->getShippingAddress()->getCountryId(),
--                $this->allowedCountryReader->getAllowedCountries()
--            )) {
--                throw new \Magento\Framework\Exception\LocalizedException(
--                    __("Some addresses can't be used due to the configurations for specific countries.")
--                );
-+        foreach ($this->quoteValidationRule->validate($quote) as $validationResult) {
-+            if ($validationResult->isValid()) {
-+                continue;
-             }
- 
--            $method = $quote->getShippingAddress()->getShippingMethod();
--            $rate = $quote->getShippingAddress()->getShippingRateByCode($method);
--            if (!$method || !$rate) {
--                throw new \Magento\Framework\Exception\LocalizedException(
--                    __('The shipping method is missing. Select the shipping method and try again.')
--                );
-+            $messages = $validationResult->getErrors();
-+            $defaultMessage = array_shift($messages);
-+            if ($defaultMessage && !empty($messages)) {
-+                $defaultMessage .= ' %1';
-+            }
-+            if ($defaultMessage) {
-+                throw new LocalizedException(__($defaultMessage, implode(' ', $messages)));
-             }
--        }
--        if ($quote->getBillingAddress()->validate() !== true) {
--            throw new \Magento\Framework\Exception\LocalizedException(
--                __(
--                    'Please check the billing address information. %1',
--                    implode(' ', $quote->getBillingAddress()->validate())
--                )
--            );
--        }
--        if (!$quote->getPayment()->getMethod()) {
--            throw new \Magento\Framework\Exception\LocalizedException(
--                __('Enter a valid payment method and try again. ')
--            );
--        }
--        if (!$quote->validateMinimumAmount($quote->getIsMultiShipping())) {
--            throw new LocalizedException($this->minimumAmountMessage->getMessage());
-         }
- 
-         return $this;
-     }
-+
-+    /**
-+     * Parses quote error messages and concatenates them into single string.
-+     *
-+     * @param Quote $quote
-+     * @return string
-+     */
-+    private function getQuoteErrors(QuoteEntity $quote): string
-+    {
-+        $errors = array_map(
-+            function (Error $error) {
-+                return $error->getText();
-+            },
-+            $quote->getErrors()
-+        );
-+
-+        return implode(PHP_EOL, $errors);
-+    }
- }
-diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote.php b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
-index 946c0e0c5f3..ae26407c745 100644
---- a/app/code/Magento/Quote/Model/ResourceModel/Quote.php
-+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
-@@ -23,8 +23,8 @@ class Quote extends AbstractDb
- 
-     /**
-      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
--     * @param Snapshot $entitySnapshot,
--     * @param RelationComposite $entityRelationComposite,
-+     * @param Snapshot $entitySnapshot
-+     * @param RelationComposite $entityRelationComposite
-      * @param \Magento\SalesSequence\Model\Manager $sequenceManager
-      * @param string $connectionName
-      */
-@@ -296,7 +296,7 @@ class Quote extends AbstractDb
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function save(\Magento\Framework\Model\AbstractModel $object)
-     {
-diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
-index c7525754dff..392a815ed96 100644
---- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
-+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
-@@ -3,9 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Quote\Model\ResourceModel\Quote\Item;
- 
--use \Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
-+use Magento\Quote\Model\Quote;
-+use Magento\Quote\Model\Quote\Item as QuoteItem;
-+use Magento\Quote\Model\ResourceModel\Quote\Item as ResourceQuoteItem;
- 
- /**
-  * Quote item resource collection
-@@ -50,6 +57,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
-      */
-     private $storeManager;
- 
-+    /**
-+     * @var bool $recollectQuote
-+     */
-+    private $recollectQuote = false;
-+
-     /**
-      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
-      * @param \Psr\Log\LoggerInterface $logger
-@@ -102,7 +114,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
-      */
-     protected function _construct()
-     {
--        $this->_init(\Magento\Quote\Model\Quote\Item::class, \Magento\Quote\Model\ResourceModel\Quote\Item::class);
-+        $this->_init(QuoteItem::class, ResourceQuoteItem::class);
-     }
- 
-     /**
-@@ -110,7 +122,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
-      *
-      * @return int
-      */
--    public function getStoreId()
-+    public function getStoreId(): int
-     {
-         // Fallback to current storeId if no quote is provided
-         // (see https://github.com/magento/magento2/commit/9d3be732a88884a66d667b443b3dc1655ddd0721)
-@@ -119,12 +131,12 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
-     }
- 
-     /**
--     * Set Quote object to Collection
-+     * Set Quote object to Collection.
-      *
--     * @param \Magento\Quote\Model\Quote $quote
-+     * @param Quote $quote
-      * @return $this
-      */
--    public function setQuote($quote)
-+    public function setQuote($quote): self
-     {
-         $this->_quote = $quote;
-         $quoteId = $quote->getId();
-@@ -138,14 +150,15 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
-     }
- 
-     /**
--     * Reset the collection and inner join it to quotes table
-+     * Reset the collection and inner join it to quotes table.
-+     *
-      * Optionally can select items with specified product id only
-      *
-      * @param string $quotesTableName
-      * @param int $productId
-      * @return $this
-      */
--    public function resetJoinQuotes($quotesTableName, $productId = null)
-+    public function resetJoinQuotes($quotesTableName, $productId = null): self
-     {
-         $this->getSelect()->reset()->from(
-             ['qi' => $this->getResource()->getMainTable()],
-@@ -162,11 +175,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
-     }
- 
-     /**
--     * After load processing
-+     * After load processing.
-      *
-      * @return $this
-      */
--    protected function _afterLoad()
-+    protected function _afterLoad(): self
-     {
-         parent::_afterLoad();
- 
-@@ -195,11 +208,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
-     }
- 
-     /**
--     * Add options to items
-+     * Add options to items.
-      *
-      * @return $this
-      */
--    protected function _assignOptions()
-+    protected function _assignOptions(): self
-     {
-         $itemIds = array_keys($this->_items);
-         $optionCollection = $this->_itemOptionCollectionFactory->create()->addItemFilter($itemIds);
-@@ -213,12 +226,12 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
-     }
- 
-     /**
--     * Add products to items and item options
-+     * Add products to items and item options.
-      *
-      * @return $this
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
--    protected function _assignProducts()
-+    protected function _assignProducts(): self
-     {
-         \Magento\Framework\Profiler::start('QUOTE:' . __METHOD__, ['group' => 'QUOTE', 'method' => __METHOD__]);
-         $productCollection = $this->_productCollectionFactory->create()->setStoreId(
-@@ -230,7 +243,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
-         );
-         $this->skipStockStatusFilter($productCollection);
-         $productCollection->addOptionsToResult()->addStoreFilter()->addUrlRewrite();
--        $this->addTierPriceData($productCollection);
- 
-         $this->_eventManager->dispatch(
-             'prepare_catalog_product_collection_prices',
-@@ -241,46 +253,29 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
-             ['collection' => $productCollection]
-         );
- 
--        $recollectQuote = false;
-         foreach ($this as $item) {
-+            /** @var ProductInterface $product */
-             $product = $productCollection->getItemById($item->getProductId());
--            if ($product) {
-+            $qtyOptions = [];
-+            if ($product && $this->isValidProduct($product)) {
-                 $product->setCustomOptions([]);
--                $qtyOptions = [];
--                $optionProductIds = [];
--                foreach ($item->getOptions() as $option) {
--                    /**
--                     * Call type-specific logic for product associated with quote item
--                     */
--                    $product->getTypeInstance()->assignProductToOption(
--                        $productCollection->getItemById($option->getProductId()),
--                        $option,
--                        $product
--                    );
--
--                    if (is_object($option->getProduct()) && $option->getProduct()->getId() != $product->getId()) {
--                        $optionProductIds[$option->getProduct()->getId()] = $option->getProduct()->getId();
-+                $optionProductIds = $this->getOptionProductIds($item, $product, $productCollection);
-+                foreach ($optionProductIds as $optionProductId) {
-+                    $qtyOption = $item->getOptionByCode('product_qty_' . $optionProductId);
-+                    if ($qtyOption) {
-+                        $qtyOptions[$optionProductId] = $qtyOption;
-                     }
-                 }
--
--                if ($optionProductIds) {
--                    foreach ($optionProductIds as $optionProductId) {
--                        $qtyOption = $item->getOptionByCode('product_qty_' . $optionProductId);
--                        if ($qtyOption) {
--                            $qtyOptions[$optionProductId] = $qtyOption;
--                        }
--                    }
--                }
--
--                $item->setQtyOptions($qtyOptions)->setProduct($product);
-             } else {
-                 $item->isDeleted(true);
--                $recollectQuote = true;
-+                $this->recollectQuote = true;
-+            }
-+            if (!$item->isDeleted()) {
-+                $item->setQtyOptions($qtyOptions)->setProduct($product);
-+                $item->checkData();
-             }
--            $item->checkData();
-         }
--
--        if ($recollectQuote && $this->_quote) {
-+        if ($this->recollectQuote && $this->_quote) {
-             $this->_quote->collectTotals();
-         }
-         \Magento\Framework\Profiler::stop('QUOTE:' . __METHOD__);
-@@ -289,31 +284,67 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
-     }
- 
-     /**
--     * Prevents adding stock status filter to the collection of products.
-+     * Get product Ids from option.
-      *
-+     * @param QuoteItem $item
-+     * @param ProductInterface $product
-      * @param ProductCollection $productCollection
--     * @return void
-+     * @return array
-+     */
-+    private function getOptionProductIds(
-+        QuoteItem $item,
-+        ProductInterface $product,
-+        ProductCollection $productCollection
-+    ): array {
-+        $optionProductIds = [];
-+        foreach ($item->getOptions() as $option) {
-+            /**
-+             * Call type-specific logic for product associated with quote item
-+             */
-+            $product->getTypeInstance()->assignProductToOption(
-+                $productCollection->getItemById($option->getProductId()),
-+                $option,
-+                $product
-+            );
-+
-+            if (is_object($option->getProduct()) && $option->getProduct()->getId() != $product->getId()) {
-+                $isValidProduct = $this->isValidProduct($option->getProduct());
-+                if (!$isValidProduct && !$item->isDeleted()) {
-+                    $item->isDeleted(true);
-+                    $this->recollectQuote = true;
-+                    continue;
-+                }
-+                $optionProductIds[$option->getProduct()->getId()] = $option->getProduct()->getId();
-+            }
-+        }
-+
-+        return $optionProductIds;
-+    }
-+
-+    /**
-+     * Check is valid product.
-      *
--     * @see \Magento\CatalogInventory\Helper\Stock::addIsInStockFilterToCollection
-+     * @param ProductInterface $product
-+     * @return bool
-      */
--    private function skipStockStatusFilter(ProductCollection $productCollection)
-+    private function isValidProduct(ProductInterface $product): bool
-     {
--        $productCollection->setFlag('has_stock_status_filter', true);
-+        $result = ($product && (int)$product->getStatus() !== ProductStatus::STATUS_DISABLED);
-+
-+        return $result;
-     }
- 
-     /**
--     * Add tier prices to product collection.
-+     * Prevents adding stock status filter to the collection of products.
-      *
-      * @param ProductCollection $productCollection
-      * @return void
-+     *
-+     * @see \Magento\CatalogInventory\Helper\Stock::addIsInStockFilterToCollection
-      */
--    private function addTierPriceData(ProductCollection $productCollection)
-+    private function skipStockStatusFilter(ProductCollection $productCollection): void
-     {
--        if (empty($this->_quote)) {
--            $productCollection->addTierPriceData();
--        } else {
--            $productCollection->addTierPriceDataByGroupId($this->_quote->getCustomerGroupId());
--        }
-+        $productCollection->setFlag('has_stock_status_filter', true);
-     }
- 
-     /**
-@@ -321,7 +352,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
-      *
-      * @return void
-      */
--    private function removeItemsWithAbsentProducts()
-+    private function removeItemsWithAbsentProducts(): void
-     {
-         if (count($this->_productIds) === 0) {
-             return;
-diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
-index d8e70c68ba3..b9edcc13d00 100644
---- a/app/code/Magento/Quote/Model/ShippingAddressManagement.php
-+++ b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
-@@ -79,7 +79,7 @@ class ShippingAddressManagement implements \Magento\Quote\Model\ShippingAddressM
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritDoc
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address)
-@@ -95,7 +95,7 @@ class ShippingAddressManagement implements \Magento\Quote\Model\ShippingAddressM
-         $saveInAddressBook = $address->getSaveInAddressBook() ? 1 : 0;
-         $sameAsBilling = $address->getSameAsBilling() ? 1 : 0;
-         $customerAddressId = $address->getCustomerAddressId();
--        $this->addressValidator->validate($address);
-+        $this->addressValidator->validateForCart($quote, $address);
-         $quote->setShippingAddress($address);
-         $address = $quote->getShippingAddress();
- 
-@@ -123,7 +123,7 @@ class ShippingAddressManagement implements \Magento\Quote\Model\ShippingAddressM
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritDoc
-      */
-     public function get($cartId)
-     {
-diff --git a/app/code/Magento/Quote/Model/SubmitQuoteValidator.php b/app/code/Magento/Quote/Model/SubmitQuoteValidator.php
-new file mode 100644
-index 00000000000..b97eeb9a522
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/SubmitQuoteValidator.php
-@@ -0,0 +1,71 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Address\Validator as OrderAddressValidator;
-+
-+/**
-+ * Validates quote and order before quote submit.
-+ */
-+class SubmitQuoteValidator
-+{
-+    /**
-+     * @var QuoteValidator
-+     */
-+    private $quoteValidator;
-+
-+    /**
-+     * @var OrderAddressValidator
-+     */
-+    private $orderAddressValidator;
-+
-+    /**
-+     * @param QuoteValidator $quoteValidator
-+     * @param OrderAddressValidator $orderAddressValidator
-+     */
-+    public function __construct(
-+        QuoteValidator $quoteValidator,
-+        OrderAddressValidator $orderAddressValidator
-+    ) {
-+        $this->quoteValidator = $quoteValidator;
-+        $this->orderAddressValidator = $orderAddressValidator;
-+    }
-+
-+    /**
-+     * Validates quote.
-+     *
-+     * @param Quote $quote
-+     * @return void
-+     * @throws LocalizedException
-+     */
-+    public function validateQuote(Quote $quote): void
-+    {
-+        $this->quoteValidator->validateBeforeSubmit($quote);
-+    }
-+
-+    /**
-+     * Validates order.
-+     *
-+     * @param Order $order
-+     * @return void
-+     * @throws LocalizedException
-+     */
-+    public function validateOrder(Order $order): void
-+    {
-+        foreach ($order->getAddresses() as $address) {
-+            $errors = $this->orderAddressValidator->validate($address);
-+            if (!empty($errors)) {
-+                throw new LocalizedException(
-+                    __("Failed address validation:\n%1", implode("\n", $errors))
-+                );
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Quote/Model/ValidationRules/AllowedCountryValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/AllowedCountryValidationRule.php
-new file mode 100644
-index 00000000000..2498e9976f0
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/ValidationRules/AllowedCountryValidationRule.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model\ValidationRules;
-+
-+use Magento\Directory\Model\AllowedCountries;
-+use Magento\Framework\Validation\ValidationResultFactory;
-+use Magento\Quote\Model\Quote;
-+use Magento\Store\Model\ScopeInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class AllowedCountryValidationRule implements QuoteValidationRuleInterface
-+{
-+    /**
-+     * @var string
-+     */
-+    private $generalMessage;
-+
-+    /**
-+     * @var AllowedCountries
-+     */
-+    private $allowedCountryReader;
-+
-+    /**
-+     * @var ValidationResultFactory
-+     */
-+    private $validationResultFactory;
-+
-+    /**
-+     * @param AllowedCountries $allowedCountryReader
-+     * @param ValidationResultFactory $validationResultFactory
-+     * @param string $generalMessage
-+     */
-+    public function __construct(
-+        AllowedCountries $allowedCountryReader,
-+        ValidationResultFactory $validationResultFactory,
-+        string $generalMessage = ''
-+    ) {
-+        $this->allowedCountryReader = $allowedCountryReader;
-+        $this->validationResultFactory = $validationResultFactory;
-+        $this->generalMessage = $generalMessage;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function validate(Quote $quote): array
-+    {
-+        $validationErrors = [];
-+
-+        if (!$quote->isVirtual()) {
-+            $shippingAddress = $quote->getShippingAddress();
-+            $shippingAddress->setStoreId($quote->getStoreId());
-+            $validationResult =
-+                in_array(
-+                    $shippingAddress->getCountryId(),
-+                    $this->allowedCountryReader->getAllowedCountries(
-+                        ScopeInterface::SCOPE_STORE,
-+                        $quote->getStoreId()
-+                    )
-+                );
-+            if (!$validationResult) {
-+                $validationErrors = [__($this->generalMessage)];
-+            }
-+        }
-+
-+        return [$this->validationResultFactory->create(['errors' => $validationErrors])];
-+    }
-+}
-diff --git a/app/code/Magento/Quote/Model/ValidationRules/BillingAddressValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/BillingAddressValidationRule.php
-new file mode 100644
-index 00000000000..465aebdc418
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/ValidationRules/BillingAddressValidationRule.php
-@@ -0,0 +1,58 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model\ValidationRules;
-+
-+use Magento\Framework\Validation\ValidationResultFactory;
-+use Magento\Quote\Model\Quote;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class BillingAddressValidationRule implements QuoteValidationRuleInterface
-+{
-+    /**
-+     * @var string
-+     */
-+    private $generalMessage;
-+
-+    /**
-+     * @var ValidationResultFactory
-+     */
-+    private $validationResultFactory;
-+
-+    /**
-+     * @param ValidationResultFactory $validationResultFactory
-+     * @param string $generalMessage
-+     */
-+    public function __construct(
-+        ValidationResultFactory $validationResultFactory,
-+        string $generalMessage = ''
-+    ) {
-+        $this->validationResultFactory = $validationResultFactory;
-+        $this->generalMessage = $generalMessage;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function validate(Quote $quote): array
-+    {
-+        $validationErrors = [];
-+        $billingAddress = $quote->getBillingAddress();
-+        $billingAddress->setStoreId($quote->getStoreId());
-+        $validationResult = $billingAddress->validate();
-+        if ($validationResult !== true) {
-+            $validationErrors = [__($this->generalMessage)];
-+        }
-+        if (is_array($validationResult)) {
-+            $validationErrors = array_merge($validationErrors, $validationResult);
-+        }
-+
-+        return [$this->validationResultFactory->create(['errors' => $validationErrors])];
-+    }
-+}
-diff --git a/app/code/Magento/Quote/Model/ValidationRules/MinimumAmountValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/MinimumAmountValidationRule.php
-new file mode 100644
-index 00000000000..34e953be43c
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/ValidationRules/MinimumAmountValidationRule.php
-@@ -0,0 +1,66 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model\ValidationRules;
-+
-+use Magento\Framework\Validation\ValidationResultFactory;
-+use Magento\Quote\Model\Quote;
-+use Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class MinimumAmountValidationRule implements QuoteValidationRuleInterface
-+{
-+    /**
-+     * @var string
-+     */
-+    private $generalMessage;
-+
-+    /**
-+     * @var ValidationMessage
-+     */
-+    private $amountValidationMessage;
-+
-+    /**
-+     * @var ValidationResultFactory
-+     */
-+    private $validationResultFactory;
-+
-+    /**
-+     * @param ValidationMessage $amountValidationMessage
-+     * @param ValidationResultFactory $validationResultFactory
-+     * @param string $generalMessage
-+     */
-+    public function __construct(
-+        ValidationMessage $amountValidationMessage,
-+        ValidationResultFactory $validationResultFactory,
-+        string $generalMessage = ''
-+    ) {
-+        $this->amountValidationMessage = $amountValidationMessage;
-+        $this->validationResultFactory = $validationResultFactory;
-+        $this->generalMessage = $generalMessage;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     * @throws \Zend_Currency_Exception
-+     */
-+    public function validate(Quote $quote): array
-+    {
-+        $validationErrors = [];
-+        $validationResult = $quote->validateMinimumAmount($quote->getIsMultiShipping());
-+        if (!$validationResult) {
-+            if (!$this->generalMessage) {
-+                $this->generalMessage = $this->amountValidationMessage->getMessage();
-+            }
-+            $validationErrors = [__($this->generalMessage)];
-+        }
-+
-+        return [$this->validationResultFactory->create(['errors' => $validationErrors])];
-+    }
-+}
-diff --git a/app/code/Magento/Quote/Model/ValidationRules/PaymentMethodValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/PaymentMethodValidationRule.php
-new file mode 100644
-index 00000000000..bf2b813541f
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/ValidationRules/PaymentMethodValidationRule.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model\ValidationRules;
-+
-+use Magento\Framework\Validation\ValidationResultFactory;
-+use Magento\Quote\Model\Quote;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class PaymentMethodValidationRule implements QuoteValidationRuleInterface
-+{
-+    /**
-+     * @var string
-+     */
-+    private $generalMessage;
-+
-+    /**
-+     * @var ValidationResultFactory
-+     */
-+    private $validationResultFactory;
-+
-+    /**
-+     * @param ValidationResultFactory $validationResultFactory
-+     * @param string $generalMessage
-+     */
-+    public function __construct(
-+        ValidationResultFactory $validationResultFactory,
-+        string $generalMessage = ''
-+    ) {
-+        $this->validationResultFactory = $validationResultFactory;
-+        $this->generalMessage = $generalMessage;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function validate(Quote $quote): array
-+    {
-+        $validationErrors = [];
-+        $validationResult = $quote->getPayment()->getMethod();
-+        if (!$validationResult) {
-+            $validationErrors = [__($this->generalMessage)];
-+        }
-+
-+        return [$this->validationResultFactory->create(['errors' => $validationErrors])];
-+    }
-+}
-diff --git a/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationComposite.php b/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationComposite.php
-new file mode 100644
-index 00000000000..6a75be3acce
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationComposite.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model\ValidationRules;
-+
-+use Magento\Quote\Model\Quote;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class QuoteValidationComposite implements QuoteValidationRuleInterface
-+{
-+    /**
-+     * @var QuoteValidationRuleInterface[]
-+     */
-+    private $validationRules = [];
-+
-+    /**
-+     * @param QuoteValidationRuleInterface[] $validationRules
-+     * @throws \InvalidArgumentException
-+     */
-+    public function __construct(array $validationRules)
-+    {
-+        foreach ($validationRules as $validationRule) {
-+            if (!($validationRule instanceof QuoteValidationRuleInterface)) {
-+                throw new \InvalidArgumentException(
-+                    sprintf(
-+                        'Instance of the ValidationRuleInterface is expected, got %s instead.',
-+                        get_class($validationRule)
-+                    )
-+                );
-+            }
-+        }
-+        $this->validationRules = $validationRules;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function validate(Quote $quote): array
-+    {
-+        $aggregateResult = [];
-+
-+        foreach ($this->validationRules as $validationRule) {
-+            $ruleValidationResult = $validationRule->validate($quote);
-+            foreach ($ruleValidationResult as $item) {
-+                if (!$item->isValid()) {
-+                    array_push($aggregateResult, $item);
-+                }
-+            }
-+        }
-+
-+        return $aggregateResult;
-+    }
-+}
-diff --git a/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationRuleInterface.php b/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationRuleInterface.php
-new file mode 100644
-index 00000000000..1a777e3f1a5
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationRuleInterface.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model\ValidationRules;
-+
-+use Magento\Framework\Validation\ValidationResult;
-+use Magento\Quote\Model\Quote;
-+
-+/**
-+ * Provides validation of Quote model.
-+ */
-+interface QuoteValidationRuleInterface
-+{
-+    /**
-+     * Validate Quote model.
-+     *
-+     * @param Quote $quote
-+     * @return ValidationResult[]
-+     */
-+    public function validate(Quote $quote): array;
-+}
-diff --git a/app/code/Magento/Quote/Model/ValidationRules/ShippingAddressValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/ShippingAddressValidationRule.php
-new file mode 100644
-index 00000000000..2f215c17e6d
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/ValidationRules/ShippingAddressValidationRule.php
-@@ -0,0 +1,61 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model\ValidationRules;
-+
-+use Magento\Framework\Validation\ValidationResultFactory;
-+use Magento\Quote\Model\Quote;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class ShippingAddressValidationRule implements QuoteValidationRuleInterface
-+{
-+    /**
-+     * @var string
-+     */
-+    private $generalMessage;
-+
-+    /**
-+     * @var ValidationResultFactory
-+     */
-+    private $validationResultFactory;
-+
-+    /**
-+     * @param ValidationResultFactory $validationResultFactory
-+     * @param string $generalMessage
-+     */
-+    public function __construct(
-+        ValidationResultFactory $validationResultFactory,
-+        string $generalMessage = ''
-+    ) {
-+        $this->validationResultFactory = $validationResultFactory;
-+        $this->generalMessage = $generalMessage;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function validate(Quote $quote): array
-+    {
-+        $validationErrors = [];
-+
-+        if (!$quote->isVirtual()) {
-+            $shippingAddress = $quote->getShippingAddress();
-+            $shippingAddress->setStoreId($quote->getStoreId());
-+            $validationResult = $shippingAddress->validate();
-+            if ($validationResult !== true) {
-+                $validationErrors = [__($this->generalMessage)];
-+            }
-+            if (is_array($validationResult)) {
-+                $validationErrors = array_merge($validationErrors, $validationResult);
-+            }
-+        }
-+
-+        return [$this->validationResultFactory->create(['errors' => $validationErrors])];
-+    }
-+}
-diff --git a/app/code/Magento/Quote/Model/ValidationRules/ShippingMethodValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/ShippingMethodValidationRule.php
-new file mode 100644
-index 00000000000..3ef079f5a01
---- /dev/null
-+++ b/app/code/Magento/Quote/Model/ValidationRules/ShippingMethodValidationRule.php
-@@ -0,0 +1,60 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model\ValidationRules;
-+
-+use Magento\Framework\Validation\ValidationResultFactory;
-+use Magento\Quote\Model\Quote;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class ShippingMethodValidationRule implements QuoteValidationRuleInterface
-+{
-+    /**
-+     * @var string
-+     */
-+    private $generalMessage;
-+
-+    /**
-+     * @var ValidationResultFactory
-+     */
-+    private $validationResultFactory;
-+
-+    /**
-+     * @param ValidationResultFactory $validationResultFactory
-+     * @param string $generalMessage
-+     */
-+    public function __construct(
-+        ValidationResultFactory $validationResultFactory,
-+        string $generalMessage = ''
-+    ) {
-+        $this->validationResultFactory = $validationResultFactory;
-+        $this->generalMessage = $generalMessage;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function validate(Quote $quote): array
-+    {
-+        $validationErrors = [];
-+
-+        if (!$quote->isVirtual()) {
-+            $shippingAddress = $quote->getShippingAddress();
-+            $shippingAddress->setStoreId($quote->getStoreId());
-+            $shippingMethod = $shippingAddress->getShippingMethod();
-+            $shippingRate = $shippingAddress->getShippingRateByCode($shippingMethod);
-+            $validationResult = $shippingMethod && $shippingRate;
-+            if (!$validationResult) {
-+                $validationErrors = [__($this->generalMessage)];
-+            }
-+        }
-+
-+        return [$this->validationResultFactory->create(['errors' => $validationErrors])];
-+    }
-+}
-diff --git a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
-index 76c9a49b290..77dfec9603a 100644
---- a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
-+++ b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
-@@ -7,6 +7,11 @@ namespace Magento\Quote\Observer\Frontend\Quote\Address;
- 
- use Magento\Framework\Event\ObserverInterface;
- 
-+/**
-+ * Handle customer VAT number on collect_totals_before event of quote address.
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ */
- class CollectTotalsObserver implements ObserverInterface
- {
-     /**
-@@ -124,7 +129,7 @@ class CollectTotalsObserver implements ObserverInterface
-             );
-         }
- 
--        if ($groupId) {
-+        if ($groupId !== null) {
-             $address->setPrevQuoteCustomerGroupId($quote->getCustomerGroupId());
-             $quote->setCustomerGroupId($groupId);
-             $this->customerSession->setCustomerGroupId($groupId);
-diff --git a/app/code/Magento/Quote/Plugin/RecollectOnGroupChange.php b/app/code/Magento/Quote/Plugin/RecollectOnGroupChange.php
-new file mode 100644
-index 00000000000..03b19c6e661
---- /dev/null
-+++ b/app/code/Magento/Quote/Plugin/RecollectOnGroupChange.php
-@@ -0,0 +1,63 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Plugin;
-+
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
-+use Magento\Customer\Model\Customer;
-+use Magento\Framework\Model\AbstractModel;
-+
-+/**
-+ * Recollect quote totals after change customer group
-+ */
-+class RecollectOnGroupChange
-+{
-+    /**
-+     * @var CartRepositoryInterface
-+     */
-+    private $cartRepository;
-+
-+    /**
-+     * @param CartRepositoryInterface $cartRepository
-+     */
-+    public function __construct(
-+        CartRepositoryInterface $cartRepository
-+    ) {
-+        $this->cartRepository = $cartRepository;
-+    }
-+
-+    /**
-+     * Recollect totals if customer group change
-+     *
-+     * @param CustomerResource $subject
-+     * @param CustomerResource $result
-+     * @param AbstractModel $customer
-+     * @return CustomerResource
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterSave(CustomerResource $subject, CustomerResource $result, AbstractModel $customer)
-+    {
-+        /** @var Customer $customer */
-+        if ($customer->getOrigData('group_id') !== null
-+            && $customer->getOrigData('group_id') != $customer->getGroupId()
-+        ) {
-+            try {
-+                /** @var \Magento\Quote\Model\Quote $quote */
-+                $quote = $this->cartRepository->getActiveForCustomer($customer->getId());
-+                $quote->setCustomerGroupId($customer->getGroupId());
-+                $quote->collectTotals();
-+                $this->cartRepository->save($quote);
-+            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+                //no active cart for customer
-+            }
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/Quote/Plugin/UpdateQuoteItemStore.php b/app/code/Magento/Quote/Plugin/UpdateQuoteItemStore.php
-new file mode 100644
-index 00000000000..19a7e03264d
---- /dev/null
-+++ b/app/code/Magento/Quote/Plugin/UpdateQuoteItemStore.php
-@@ -0,0 +1,72 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Plugin;
-+
-+use Magento\Checkout\Model\Session;
-+use Magento\Quote\Model\QuoteRepository;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Store\Model\StoreSwitcherInterface;
-+
-+/**
-+ * Updates quote items store id.
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ */
-+class UpdateQuoteItemStore
-+{
-+    /**
-+     * @var QuoteRepository
-+     */
-+    private $quoteRepository;
-+
-+    /**
-+     * @var Session
-+     */
-+    private $checkoutSession;
-+
-+    /**
-+     * @param QuoteRepository $quoteRepository
-+     * @param Session $checkoutSession
-+     */
-+    public function __construct(
-+        QuoteRepository $quoteRepository,
-+        Session $checkoutSession
-+    ) {
-+        $this->quoteRepository = $quoteRepository;
-+        $this->checkoutSession = $checkoutSession;
-+    }
-+
-+    /**
-+     * Update store id in active quote after store view switching.
-+     *
-+     * @param StoreSwitcherInterface $subject
-+     * @param string $result
-+     * @param StoreInterface $fromStore store where we came from
-+     * @param StoreInterface $targetStore store where to go to
-+     * @param string $redirectUrl original url requested for redirect after switching
-+     * @return string url to be redirected after switching
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterSwitch(
-+        StoreSwitcherInterface $subject,
-+        $result,
-+        StoreInterface $fromStore,
-+        StoreInterface $targetStore,
-+        string $redirectUrl
-+    ): string {
-+        $quote = $this->checkoutSession->getQuote();
-+        if ($quote->getIsActive()) {
-+            $quote->setStoreId(
-+                $targetStore->getId()
-+            );
-+            $quote->getItemsCollection(false);
-+            $this->quoteRepository->save($quote);
-+        }
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php
-index f5372802722..6c23379a37c 100644
---- a/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php
-+++ b/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php
-@@ -3,18 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- namespace Magento\Quote\Setup\Patch\Data;
- 
--use Magento\Framework\App\ResourceConnection;
- use Magento\Quote\Setup\ConvertSerializedDataToJsonFactory;
- use Magento\Quote\Setup\QuoteSetupFactory;
- use Magento\Framework\Setup\Patch\DataPatchInterface;
- use Magento\Framework\Setup\Patch\PatchVersionInterface;
- 
- /**
-- * Class ConvertSerializedDataToJson
-- * @package Magento\Quote\Setup\Patch
-+ * Convert quote serialized data to json.
-  */
- class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInterface
- {
-@@ -36,6 +33,8 @@ class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInt
-     /**
-      * PatchInitial constructor.
-      * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
-+     * @param QuoteSetupFactory $quoteSetupFactory
-+     * @param ConvertSerializedDataToJsonFactory $convertSerializedDataToJsonFactory
-      */
-     public function __construct(
-         \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
-@@ -48,7 +47,7 @@ class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function apply()
-     {
-@@ -57,7 +56,7 @@ class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getDependencies()
-     {
-@@ -67,7 +66,7 @@ class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getVersion()
-     {
-@@ -75,7 +74,7 @@ class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAliases()
-     {
-diff --git a/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml b/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
-index d4032b5f1ac..a513b6747f6 100644
---- a/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
-+++ b/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
-@@ -7,10 +7,20 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="SimpleCartItem" type="CartItem">
-         <data key="qty">1</data>
-         <var key="quote_id" entityKey="return" entityType="GuestCart"/>
-         <var key="sku" entityKey="sku" entityType="product"/>
-     </entity>
-+    <entity name="SimpleTwoCartItems" type="CartItem">
-+        <data key="qty">2</data>
-+        <var key="quote_id" entityKey="return" entityType="GuestCart"/>
-+        <var key="sku" entityKey="sku" entityType="product"/>
-+    </entity>
-+    <entity name="NotValidCartItems" type="CartItem">
-+        <data key="qty">abc</data>
-+        <var key="quote_id" entityKey="return" entityType="GuestCart"/>
-+        <var key="sku" entityKey="sku" entityType="product"/>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml b/app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml
-index 062c4ebbad3..1d63a8a0d9f 100644
---- a/app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml
-+++ b/app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml
-@@ -8,7 +8,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
- 
-     <entity name="GuestCart" type="GuestCart">
-     </entity>
-diff --git a/app/code/Magento/Quote/Test/Mftf/Metadata/billing_address-meta.xml b/app/code/Magento/Quote/Test/Mftf/Metadata/billing_address-meta.xml
-index a21c4a30e80..d4a4c4345d7 100644
---- a/app/code/Magento/Quote/Test/Mftf/Metadata/billing_address-meta.xml
-+++ b/app/code/Magento/Quote/Test/Mftf/Metadata/billing_address-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateBillingAddress" dataType="billing_address" type="create">
-         <field key="city">string</field>
-         <field key="region">string</field>
-diff --git a/app/code/Magento/Quote/Test/Mftf/Metadata/guest_cart-meta.xml b/app/code/Magento/Quote/Test/Mftf/Metadata/guest_cart-meta.xml
-index e08a3040788..27c7af95d0f 100644
---- a/app/code/Magento/Quote/Test/Mftf/Metadata/guest_cart-meta.xml
-+++ b/app/code/Magento/Quote/Test/Mftf/Metadata/guest_cart-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateGuestCart" dataType="GuestCart" type="create" auth="anonymous" url="/V1/guest-carts" method="POST">
-         <contentType>application/json</contentType>
-     </operation>
-diff --git a/app/code/Magento/Quote/Test/Mftf/Metadata/shipping_address-meta.xml b/app/code/Magento/Quote/Test/Mftf/Metadata/shipping_address-meta.xml
-index 537f6c2a2f8..803681252a9 100644
---- a/app/code/Magento/Quote/Test/Mftf/Metadata/shipping_address-meta.xml
-+++ b/app/code/Magento/Quote/Test/Mftf/Metadata/shipping_address-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateShippingAddress" dataType="shipping_address" type="create">
-         <field key="city">string</field>
-         <field key="region">string</field>
-diff --git a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
-new file mode 100644
-index 00000000000..4ec608a18a6
---- /dev/null
-+++ b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
-@@ -0,0 +1,151 @@
-+<?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="StorefrontGuestCheckoutDisabledProductTest">
-+        <annotations>
-+            <features value="Checkout"/>
-+            <stories value="Checkout via the Storefront"/>
-+            <title value="Remove item from cart if product disabled"/>
-+            <description value="Remove item from cart if simple or configurable product is disabled"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-95857"/>
-+            <group value="checkout"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct2">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <!-- Create the configurable product based on the data in the /data folder -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Make the configurable product have two options, that are children of the default attribute set -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create the 2 children that will be a part of the configurable product -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <!-- Assign the two products to the configurable product -->
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createSimpleProduct2" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductListing"/>
-+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
-+        </after>
-+        <!-- Step 1: Add simple product to shopping cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="cartAddSimpleProductToCart">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="productCount" value="1"/>
-+        </actionGroup>
-+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.custom_attributes[url_key]$$)}}" stepKey="goToConfigProductPage"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption1.value$$" stepKey="selectOption"/>
-+        <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart" />
-+        <waitForElement selector="{{StorefrontMessagesSection.messageProductAddedToCart($$createConfigProduct.name$$)}}" time="30" stepKey="assertMessage"/>
-+        <!--Disabled via admin panel-->
-+        <openNewTab stepKey="openNewTab"/>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <!-- Find the first simple product that we just created using the product grid and go to its page-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
-+            <argument name="product" value="$$createConfigChildProduct1$$"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForFiltersToBeApplied"/>
-+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <!-- Disabled child configurable product -->
-+        <click selector="{{AdminProductFormSection.enableProductAttributeLabel}}" stepKey="clickDisableProduct"/>
-+        <actionGroup ref="saveProductForm" stepKey="clickSaveProduct"/>
-+        <!-- Disabled simple product from grid -->
-+        <actionGroup ref="ChangeStatusProductUsingProductGridActionGroup" stepKey="disabledProductFromGrid">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="status" value="Disable"/>
-+        </actionGroup>
-+        <closeTab stepKey="closeTab"/>
-+        <!-- Check cart -->
-+        <reloadPage stepKey="reloadPage"/>
-+        <waitForPageLoad stepKey="waitForCheckoutPageReload"/>
-+        <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickMiniCart"/>
-+        <dontSeeElement selector="{{StorefrontMiniCartSection.quantity}}" stepKey="dontSeeCartItem"/>
-+        <!-- Add simple product to shopping cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct2.name$$)}}" stepKey="amOnSimpleProductPage2"/>
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="cartAddSimpleProductToCart2">
-+            <argument name="product" value="$$createSimpleProduct2$$"/>
-+            <argument name="productCount" value="1"/>
-+        </actionGroup>
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckoutCartPage"/>
-+        <!-- Disabled via admin panel -->
-+        <openNewTab stepKey="openNewTab2"/>
-+        <!-- Find the first simple product that we just created using the product grid and go to its page -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage2"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct2">
-+            <argument name="product" value="$$createSimpleProduct2$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage2"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
-+        <!-- Disabled simple product from grid -->
-+        <actionGroup ref="ChangeStatusProductUsingProductGridActionGroup" stepKey="disabledProductFromGrid2">
-+            <argument name="product" value="$$createSimpleProduct2$$"/>
-+            <argument name="status" value="Disable"/>
-+        </actionGroup>
-+        <closeTab stepKey="closeTab2"/>
-+        <!--Check cart-->
-+        <reloadPage stepKey="reloadPage2"/>
-+        <waitForPageLoad stepKey="waitForCheckoutPageReload2"/>
-+        <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickMiniCart2"/>
-+        <dontSeeElement selector="{{StorefrontMiniCartSection.quantity}}" stepKey="dontSeeCartItem2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php
-index 1e999cb5e52..804f0863d2d 100644
---- a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php
-+++ b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php
-@@ -77,7 +77,8 @@ class CartTotalRepositoryTest extends \PHPUnit\Framework\TestCase
-                 'getAllVisibleItems',
-                 'getBaseCurrencyCode',
-                 'getQuoteCurrencyCode',
--                'getItemsQty'
-+                'getItemsQty',
-+                'collectTotals'
-             ]);
-         $this->quoteRepositoryMock = $this->createMock(\Magento\Quote\Api\CartRepositoryInterface::class);
-         $this->addressMock = $this->createPartialMock(
-diff --git a/app/code/Magento/Quote/Test/Unit/Model/GuestCartManagement/Plugin/AuthorizationTest.php b/app/code/Magento/Quote/Test/Unit/Model/GuestCartManagement/Plugin/AuthorizationTest.php
-index 22962aacc8d..49ed8a10bee 100644
---- a/app/code/Magento/Quote/Test/Unit/Model/GuestCartManagement/Plugin/AuthorizationTest.php
-+++ b/app/code/Magento/Quote/Test/Unit/Model/GuestCartManagement/Plugin/AuthorizationTest.php
-@@ -36,7 +36,7 @@ class AuthorizationTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Magento\Framework\Exception\StateException
--     * @expectedMessage You don't have the correct permissions to assign the customer to the cart.
-+     * @expectedExceptionMessage You don't have the correct permissions to assign the customer to the cart.
-      */
-     public function testBeforeAssignCustomer()
-     {
-diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
-index c1c131260f1..242f81b2225 100644
---- a/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
-+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
-@@ -216,6 +216,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase
-         $scopeConfigValues = [
-             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
-             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
-+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
-             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
-         ];
- 
-@@ -240,6 +241,31 @@ class AddressTest extends \PHPUnit\Framework\TestCase
-         $scopeConfigValues = [
-             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
-             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
-+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
-+            ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
-+        ];
-+
-+        $this->quote->expects($this->once())
-+            ->method('getStoreId')
-+            ->willReturn($storeId);
-+        $this->quote->expects($this->once())
-+            ->method('getIsVirtual')
-+            ->willReturn(false);
-+
-+        $this->scopeConfig->expects($this->once())
-+            ->method('isSetFlag')
-+            ->willReturnMap($scopeConfigValues);
-+
-+        $this->assertTrue($this->address->validateMinimumAmount());
-+    }
-+
-+    public function testValidateMiniumumAmountWithoutDiscount()
-+    {
-+        $storeId = 1;
-+        $scopeConfigValues = [
-+            ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
-+            ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
-+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, false],
-             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
-         ];
- 
-@@ -263,6 +289,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase
-         $scopeConfigValues = [
-             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
-             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
-+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
-             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
-         ];
- 
-diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php
-index af47f627670..8e6a3723caa 100644
---- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php
-+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php
-@@ -67,7 +67,7 @@ class UpdaterTest extends \PHPUnit\Framework\TestCase
-                 'addOption',
-                 'setCustomPrice',
-                 'setOriginalCustomPrice',
--                'unsetData',
-+                'setData',
-                 'hasData',
-                 'setIsQtyDecimal'
-             ]);
-@@ -92,7 +92,7 @@ class UpdaterTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \InvalidArgumentException
--     * @ExceptedExceptionMessage The qty value is required to update quote item.
-+     * @expectedExceptionMessage The qty value is required to update quote item.
-      */
-     public function testUpdateNoQty()
-     {
-@@ -301,7 +301,7 @@ class UpdaterTest extends \PHPUnit\Framework\TestCase
-                 'setProduct',
-                 'getData',
-                 'unsetData',
--                'hasData'
-+                'hasData',
-             ]);
-         $buyRequestMock->expects($this->never())->method('setCustomPrice');
-         $buyRequestMock->expects($this->once())->method('getData')->will($this->returnValue([]));
-@@ -353,7 +353,11 @@ class UpdaterTest extends \PHPUnit\Framework\TestCase
-             ->will($this->returnValue($buyRequestMock));
- 
-         $this->itemMock->expects($this->exactly(2))
--            ->method('unsetData');
-+            ->method('setData')
-+            ->withConsecutive(
-+                ['custom_price', null],
-+                ['original_custom_price', null]
-+            );
- 
-         $this->itemMock->expects($this->once())
-             ->method('hasData')
-diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/ItemTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/ItemTest.php
-index ef529f643d6..4c4f40da5f7 100644
---- a/app/code/Magento/Quote/Test/Unit/Model/Quote/ItemTest.php
-+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/ItemTest.php
-@@ -135,27 +135,24 @@ class ItemTest extends \PHPUnit\Framework\TestCase
-     public function testGetAddress()
-     {
-         $quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
--            ->setMethods(['getShippingAddress', 'getBillingAddress', 'getStoreId', '__wakeup'])
-+            ->setMethods(['getShippingAddress', 'getBillingAddress', 'getStoreId', '__wakeup', 'isVirtual'])
-             ->disableOriginalConstructor()
-             ->getMock();
-         $quote->expects($this->once())
-             ->method('getShippingAddress')
--            ->will($this->returnValue('shipping'));
-+            ->willReturn('shipping');
-         $quote->expects($this->once())
-             ->method('getBillingAddress')
--            ->will($this->returnValue('billing'));
-+            ->willReturn('billing');
-         $quote->expects($this->any())
-             ->method('getStoreId')
--            ->will($this->returnValue(1));
-+            ->willReturn(1);
-+        $quote->expects($this->exactly(2))
-+            ->method('isVirtual')
-+            ->willReturnOnConsecutiveCalls(false, true);
- 
-         $this->model->setQuote($quote);
--
--        $quote->setItemsQty(2);
--        $quote->setVirtualItemsQty(1);
-         $this->assertEquals('shipping', $this->model->getAddress(), 'Wrong shipping address');
--
--        $quote->setItemsQty(2);
--        $quote->setVirtualItemsQty(2);
-         $this->assertEquals('billing', $this->model->getAddress(), 'Wrong billing address');
-     }
- 
-@@ -855,18 +852,20 @@ class ItemTest extends \PHPUnit\Framework\TestCase
-     private function createOptionMock($optionCode, $optionData = [])
-     {
-         $optionMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item\Option::class)
--            ->setMethods([
--                'setData',
--                'setItem',
--                'getItem',
--                'getCode',
--                '__wakeup',
--                'isDeleted',
--                'delete',
--                'getValue',
--                'getProduct',
--                'save'
--            ])
-+            ->setMethods(
-+                [
-+                    'setData',
-+                    'setItem',
-+                    'getItem',
-+                    'getCode',
-+                    '__wakeup',
-+                    'isDeleted',
-+                    'delete',
-+                    'getValue',
-+                    'getProduct',
-+                    'save'
-+                ]
-+            )
-             ->disableOriginalConstructor()
-             ->getMock();
-         $optionMock->expects($this->any())
-diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php
-deleted file mode 100644
-index 08f5f6a8085..00000000000
---- a/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php
-+++ /dev/null
-@@ -1,128 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Quote\Test\Unit\Model;
--
--class QuoteAddressValidatorTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Quote\Model\QuoteAddressValidator
--     */
--    protected $model;
--
--    /**
--     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
--     */
--    protected $objectManager;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $addressRepositoryMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $customerRepositoryMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $quoteAddressMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $customerSessionMock;
--
--    protected function setUp()
--    {
--        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--
--        $this->addressRepositoryMock = $this->createMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
--        $this->quoteAddressMock = $this->createPartialMock(
--            \Magento\Quote\Model\Quote\Address::class,
--            ['getCustomerId', 'load', 'getId', '__wakeup']
--        );
--        $this->customerRepositoryMock = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
--        $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
--        $this->model = $this->objectManager->getObject(
--            \Magento\Quote\Model\QuoteAddressValidator::class,
--            [
--                'addressRepository' => $this->addressRepositoryMock,
--                'customerRepository' => $this->customerRepositoryMock,
--                'customerSession' => $this->customerSessionMock
--            ]
--        );
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
--     * @expectedExceptionMessage Invalid customer id 100
--     */
--    public function testValidateInvalidCustomer()
--    {
--        $customerId = 100;
--        $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
--        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
--
--        $address->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($customerId);
--        $this->customerRepositoryMock->expects($this->once())->method('getById')->with($customerId)
--            ->willReturn($customerMock);
--        $this->model->validate($address);
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
--     * @expectedExceptionMessage Invalid address id 101
--     */
--    public function testValidateInvalidAddress()
--    {
--        $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
--        $this->customerRepositoryMock->expects($this->never())->method('getById');
--        $address->expects($this->atLeastOnce())->method('getCustomerAddressId')->willReturn(101);
--        $address->expects($this->once())->method('getId')->willReturn(101);
--
--        $this->addressRepositoryMock->expects($this->once())->method('getById')
--            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException());
--
--        $this->model->validate($address);
--    }
--
--    /**
--     * Neither customer id used nor address id exists
--     */
--    public function testValidateNewAddress()
--    {
--        $this->customerRepositoryMock->expects($this->never())->method('getById');
--        $this->addressRepositoryMock->expects($this->never())->method('getById');
--        $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
--        $this->assertTrue($this->model->validate($address));
--    }
--
--    public function testValidateWithValidAddress()
--    {
--        $addressCustomer = 100;
--        $customerAddressId = 42;
--
--        $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
--        $address->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($addressCustomer);
--        $address->expects($this->atLeastOnce())->method('getCustomerAddressId')->willReturn($customerAddressId);
--        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
--        $customerAddress = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
--
--        $this->customerRepositoryMock->expects($this->exactly(2))->method('getById')->willReturn($customerMock);
--        $customerMock->expects($this->once())->method('getId')->willReturn($addressCustomer);
--
--        $this->addressRepositoryMock->expects($this->once())->method('getById')->willReturn($this->quoteAddressMock);
--        $this->quoteAddressMock->expects($this->any())->method('getCustomerId')->willReturn($addressCustomer);
--
--        $customerMock->expects($this->once())->method('getAddresses')->willReturn([$customerAddress]);
--        $customerAddress->expects($this->once())->method('getId')->willReturn(42);
--
--        $this->assertTrue($this->model->validate($address));
--    }
--}
-diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
-index 107445bb18d..cd2afc39733 100644
---- a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
-+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
-@@ -3,17 +3,23 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Quote\Test\Unit\Model;
- 
-+use Magento\Framework\App\RequestInterface;
- use Magento\Framework\Exception\NoSuchEntityException;
- 
-+use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
- use Magento\Quote\Model\CustomerManagement;
-+use Magento\Quote\Model\QuoteIdMaskFactory;
- use Magento\Sales\Api\Data\OrderAddressInterface;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.TooManyFields)
-+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
-+ * @SuppressWarnings(PHPMD.ExcessiveClassLength)
-  */
- class QuoteManagementTest extends \PHPUnit\Framework\TestCase
- {
-@@ -23,9 +29,9 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-     protected $model;
- 
-     /**
--     * @var \Magento\Quote\Model\QuoteValidator|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Quote\Model\SubmitQuoteValidator|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $quoteValidator;
-+    protected $submitQuoteValidator;
- 
-     /**
-      * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-@@ -137,6 +143,21 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-      */
-     private $quoteFactoryMock;
- 
-+    /**
-+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $requestMock;
-+
-+    /**
-+     * @var \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $remoteAddressMock;
-+
-+    /**
-+     * @var \Magento\Quote\Model\QuoteIdMaskFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $quoteIdMaskFactoryMock;
-+
-     /**
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-@@ -144,7 +165,7 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-     {
-         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- 
--        $this->quoteValidator = $this->createMock(\Magento\Quote\Model\QuoteValidator::class);
-+        $this->submitQuoteValidator = $this->createMock(\Magento\Quote\Model\SubmitQuoteValidator::class);
-         $this->eventManager = $this->getMockForAbstractClass(\Magento\Framework\Event\ManagerInterface::class);
-         $this->orderFactory = $this->createPartialMock(
-             \Magento\Sales\Api\Data\OrderInterfaceFactory::class,
-@@ -177,18 +198,24 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-             ['getStore', 'getStoreId']
-         );
- 
--        $this->quoteMock = $this->createPartialMock(\Magento\Quote\Model\Quote::class, [
--                'getId',
-+        $this->quoteMock = $this->createPartialMock(
-+            \Magento\Quote\Model\Quote::class,
-+            [
-+                'assignCustomer',
-+                'collectTotals',
-+                'getBillingAddress',
-                 'getCheckoutMethod',
-+                'getPayment',
-                 'setCheckoutMethod',
--                'setCustomerId',
-                 'setCustomerEmail',
--                'getBillingAddress',
--                'setCustomerIsGuest',
-                 'setCustomerGroupId',
--                'assignCustomer',
--                'getPayment',
--            ]);
-+                'setCustomerId',
-+                'setCustomerIsGuest',
-+                'setRemoteIp',
-+                'setXForwardedFor',
-+                'getId'
-+            ]
-+        );
- 
-         $this->quoteAddressFactory = $this->createPartialMock(
-             \Magento\Quote\Model\Quote\AddressFactory::class,
-@@ -211,7 +238,7 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-             \Magento\Quote\Model\QuoteManagement::class,
-             [
-                 'eventManager' => $this->eventManager,
--                'quoteValidator' => $this->quoteValidator,
-+                'submitQuoteValidator' => $this->submitQuoteValidator,
-                 'orderFactory' => $this->orderFactory,
-                 'orderManagement' => $this->orderManagement,
-                 'customerManagement' => $this->customerManagement,
-@@ -236,8 +263,11 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
- 
-         // Set the new dependency
-         $this->quoteIdMock = $this->createMock(\Magento\Quote\Model\QuoteIdMask::class);
--        $quoteIdFactoryMock = $this->createPartialMock(\Magento\Quote\Model\QuoteIdMaskFactory::class, ['create']);
--        $this->setPropertyValue($this->model, 'quoteIdMaskFactory', $quoteIdFactoryMock);
-+        $this->quoteIdMaskFactoryMock = $this->createPartialMock(QuoteIdMaskFactory::class, ['create']);
-+        $this->setPropertyValue($this->model, 'quoteIdMaskFactory', $this->quoteIdMaskFactoryMock);
-+
-+        $this->requestMock = $this->createPartialMockForAbstractClass(RequestInterface::class, ['getServer']);
-+        $this->remoteAddressMock = $this->createMock(RemoteAddress::class);
-     }
- 
-     public function testCreateEmptyCartAnonymous()
-@@ -283,6 +313,14 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-             ->method('getActiveForCustomer')
-             ->with($userId)
-             ->willThrowException(new NoSuchEntityException());
-+        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-+            ->setMethods(['getDefaultBilling'])->disableOriginalConstructor()->getMockForAbstractClass();
-+        $quoteAddress = $this->createPartialMock(
-+            \Magento\Quote\Model\Quote\Address::class,
-+            ['getCustomerId']
-+        );
-+        $quoteAddress->expects($this->atLeastOnce())->method('getCustomerId')->willReturn(567);
-+        $quoteMock->expects($this->atLeastOnce())->method('getBillingAddress')->willReturn($quoteAddress);
- 
-         $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($quoteMock);
-         $quoteMock->expects($this->any())->method('setStoreId')->with($storeId);
-@@ -290,6 +328,8 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
- 
-         $this->quoteRepositoryMock->expects($this->once())->method('save')->with($quoteMock);
-         $quoteMock->expects($this->once())->method('getId')->willReturn($quoteId);
-+        $this->customerRepositoryMock->expects($this->atLeastOnce())->method('getById')->willReturn($customer);
-+        $customer->expects($this->atLeastOnce())->method('getDefaultBilling')->willReturn(0);
- 
-         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturnSelf();
-         $this->storeManagerMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
-@@ -309,6 +349,17 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-             ->method('getActiveForCustomer')
-             ->with($userId)->willReturn($quoteMock);
- 
-+        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-+            ->setMethods(['getDefaultBilling'])->disableOriginalConstructor()->getMockForAbstractClass();
-+        $quoteAddress = $this->createPartialMock(
-+            \Magento\Quote\Model\Quote\Address::class,
-+            ['getCustomerId']
-+        );
-+        $quoteAddress->expects($this->atLeastOnce())->method('getCustomerId')->willReturn(567);
-+        $quoteMock->expects($this->atLeastOnce())->method('getBillingAddress')->willReturn($quoteAddress);
-+        $this->customerRepositoryMock->expects($this->atLeastOnce())->method('getById')->willReturn($customer);
-+        $customer->expects($this->atLeastOnce())->method('getDefaultBilling')->willReturn(0);
-+
-         $this->quoteFactoryMock->expects($this->never())->method('create')->willReturn($quoteMock);
-         $this->quoteRepositoryMock->expects($this->once())->method('save')->with($quoteMock);
- 
-@@ -540,7 +591,10 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-         $quoteId = 1;
-         $quoteItem = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-         $billingAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
--        $shippingAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
-+        $shippingAddress = $this->createPartialMock(
-+            \Magento\Quote\Model\Quote\Address::class,
-+            ['getQuoteId', 'getShippingMethod', 'getId']
-+        );
-         $payment = $this->createMock(\Magento\Quote\Model\Quote\Payment::class);
-         $baseOrder = $this->createMock(\Magento\Sales\Api\Data\OrderInterface::class);
-         $convertedBilling = $this->createPartialMockForAbstractClass(OrderAddressInterface::class, ['setData']);
-@@ -563,7 +617,9 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-             $shippingAddress
-         );
- 
--        $this->quoteValidator->expects($this->once())->method('validateBeforeSubmit')->with($quote);
-+        $this->submitQuoteValidator->expects($this->once())
-+            ->method('validateQuote')
-+            ->with($quote);
-         $this->quoteAddressToOrder->expects($this->once())
-             ->method('convert')
-             ->with($shippingAddress, $orderData)
-@@ -644,7 +700,7 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
- 
-         $addressMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address::class, ['getEmail']);
-         $addressMock->expects($this->once())->method('getEmail')->willReturn($email);
--        $this->quoteMock->expects($this->once())->method('getBillingAddress')->with()->willReturn($addressMock);
-+        $this->quoteMock->expects($this->any())->method('getBillingAddress')->with()->willReturn($addressMock);
- 
-         $this->quoteMock->expects($this->once())->method('setCustomerIsGuest')->with(true)->willReturnSelf();
-         $this->quoteMock->expects($this->once())
-@@ -657,7 +713,7 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-             ->setConstructorArgs(
-                 [
-                     'eventManager' => $this->eventManager,
--                    'quoteValidator' => $this->quoteValidator,
-+                    'quoteValidator' => $this->submitQuoteValidator,
-                     'orderFactory' => $this->orderFactory,
-                     'orderManagement' => $this->orderManagement,
-                     'customerManagement' => $this->customerManagement,
-@@ -675,7 +731,11 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-                     'checkoutSession' => $this->checkoutSessionMock,
-                     'customerSession' => $this->customerSessionMock,
-                     'accountManagement' => $this->accountManagementMock,
--                    'quoteFactory' => $this->quoteFactoryMock
-+                    'quoteFactory' => $this->quoteFactoryMock,
-+                    'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock,
-+                    'addressRepository' => $this->addressRepositoryMock,
-+                    'request' => $this->requestMock,
-+                    'remoteAddress' => $this->remoteAddressMock,
-                 ]
-             )
-             ->getMock();
-@@ -687,6 +747,7 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-         $service->expects($this->once())->method('submit')->willReturn($orderMock);
- 
-         $this->quoteMock->expects($this->atLeastOnce())->method('getId')->willReturn($cartId);
-+        $this->quoteMock->expects($this->once())->method('collectTotals')->willReturnSelf();
- 
-         $orderMock->expects($this->atLeastOnce())->method('getId')->willReturn($orderId);
-         $orderMock->expects($this->atLeastOnce())->method('getIncrementId')->willReturn($orderIncrementId);
-@@ -707,6 +768,8 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-         $orderId = 332;
-         $orderIncrementId = 100003332;
-         $orderStatus = 'status1';
-+        $remoteAddress = '192.168.1.10';
-+        $forwardedForIp = '192.168.1.11';
- 
-         /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\QuoteManagement $service */
-         $service = $this->getMockBuilder(\Magento\Quote\Model\QuoteManagement::class)
-@@ -714,7 +777,7 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-             ->setConstructorArgs(
-                 [
-                 'eventManager' => $this->eventManager,
--                    'quoteValidator' => $this->quoteValidator,
-+                    'quoteValidator' => $this->submitQuoteValidator,
-                     'orderFactory' => $this->orderFactory,
-                     'orderManagement' => $this->orderManagement,
-                     'customerManagement' => $this->customerManagement,
-@@ -732,7 +795,11 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-                     'checkoutSession' => $this->checkoutSessionMock,
-                     'customerSession' => $this->customerSessionMock,
-                     'accountManagement' => $this->accountManagementMock,
--                    'quoteFactory' => $this->quoteFactoryMock
-+                    'quoteFactory' => $this->quoteFactoryMock,
-+                    'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock,
-+                    'addressRepository' => $this->addressRepositoryMock,
-+                    'request' => $this->requestMock,
-+                    'remoteAddress' => $this->remoteAddressMock,
-                 ]
-             )
-             ->getMock();
-@@ -760,6 +827,17 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-             ->method('setCustomerIsGuest')
-             ->with(true);
- 
-+        $this->remoteAddressMock
-+            ->method('getRemoteAddress')
-+            ->willReturn($remoteAddress);
-+
-+        $this->requestMock
-+            ->method('getServer')
-+            ->willReturn($forwardedForIp);
-+
-+        $this->quoteMock->expects($this->once())->method('setRemoteIp')->with($remoteAddress);
-+        $this->quoteMock->expects($this->once())->method('setXForwardedFor')->with($forwardedForIp);
-+
-         $service->expects($this->once())->method('submit')->willReturn($orderMock);
- 
-         $this->quoteMock->expects($this->atLeastOnce())->method('getId')->willReturn($cartId);
-@@ -840,6 +918,7 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-             $quote->expects($this->any())
-                 ->method('getShippingAddress')
-                 ->willReturn($shippingAddress);
-+            $shippingAddress->expects($this->any())->method('getQuoteId')->willReturn($id);
-         }
-         $quote->expects($this->any())
-             ->method('getBillingAddress')
-@@ -936,6 +1015,9 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-         return $order;
-     }
- 
-+    /**
-+     * @throws NoSuchEntityException
-+     */
-     public function testGetCartForCustomer()
-     {
-         $customerId = 100;
-@@ -980,6 +1062,11 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-         return $object;
-     }
- 
-+    /**
-+     * Test submit for customer
-+     *
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-     public function testSubmitForCustomer()
-     {
-         $orderData = [];
-@@ -989,7 +1076,10 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-         $quoteId = 1;
-         $quoteItem = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-         $billingAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
--        $shippingAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
-+        $shippingAddress = $this->createPartialMock(
-+            \Magento\Quote\Model\Quote\Address::class,
-+            ['getQuoteId', 'getShippingMethod', 'getId', 'exportCustomerAddress']
-+        );
-         $payment = $this->createMock(\Magento\Quote\Model\Quote\Payment::class);
-         $baseOrder = $this->createMock(\Magento\Sales\Api\Data\OrderInterface::class);
-         $convertedBilling = $this->createPartialMockForAbstractClass(OrderAddressInterface::class, ['setData']);
-@@ -1012,7 +1102,8 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
-             $shippingAddress
-         );
- 
--        $this->quoteValidator->expects($this->once())->method('validateBeforeSubmit')->with($quote);
-+        $this->submitQuoteValidator->method('validateQuote')
-+            ->with($quote);
-         $this->quoteAddressToOrder->expects($this->once())
-             ->method('convert')
-             ->with($shippingAddress, $orderData)
-diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
-index 3101c7d0677..095e1760df8 100644
---- a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
-+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
-@@ -5,17 +5,31 @@
-  */
- namespace Magento\Quote\Test\Unit\Model;
- 
-+use Magento\Framework\Api\SearchCriteria;
-+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
- use Magento\Framework\Api\SortOrder;
- use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Quote\Api\Data\CartInterface;
-+use Magento\Quote\Api\Data\CartInterfaceFactory;
-+use Magento\Quote\Api\Data\CartSearchResultsInterface;
-+use Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory;
-+use Magento\Quote\Model\Quote;
-+use Magento\Quote\Model\QuoteRepository;
- use Magento\Quote\Model\QuoteRepository\LoadHandler;
- use Magento\Quote\Model\QuoteRepository\SaveHandler;
-+use Magento\Quote\Model\ResourceModel\Quote\Collection;
- use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory;
-+use Magento\Store\Model\Store;
-+use Magento\Store\Model\StoreManagerInterface;
-+use PHPUnit\Framework\TestCase;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.TooManyMethods)
-  */
--class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-+class QuoteRepositoryTest extends TestCase
- {
-     /**
-      * @var \Magento\Quote\Api\CartRepositoryInterface
-@@ -23,32 +37,32 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-     private $model;
- 
-     /**
--     * @var \Magento\Quote\Model\QuoteFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var CartInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-      */
--    private $quoteFactoryMock;
-+    private $cartFactoryMock;
- 
-     /**
--     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $storeManagerMock;
- 
-     /**
--     * @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Store|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $storeMock;
- 
-     /**
--     * @var \Magento\Quote\Model\Quote|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Quote|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $quoteMock;
- 
-     /**
--     * @var \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var CartSearchResultsInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $searchResultsDataFactory;
- 
-     /**
--     * @var \Magento\Quote\Model\ResourceModel\Quote\Collection|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Collection|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $quoteCollectionMock;
- 
-@@ -78,21 +92,21 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-     private $objectManagerMock;
- 
-     /**
--     * @var \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $quoteCollectionFactoryMock;
- 
-     protected function setUp()
-     {
--        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $objectManager = new ObjectManager($this);
- 
--        $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-+        $this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
-         \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerMock);
- 
--        $this->quoteFactoryMock = $this->createPartialMock(\Magento\Quote\Model\QuoteFactory::class, ['create']);
--        $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-+        $this->cartFactoryMock = $this->createPartialMock(CartInterfaceFactory::class, ['create']);
-+        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
-         $this->quoteMock = $this->createPartialMock(
--            \Magento\Quote\Model\Quote::class,
-+            Quote::class,
-             [
-                 'load',
-                 'loadByIdWithoutStore',
-@@ -108,35 +122,35 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-                 'getData'
-             ]
-         );
--        $this->storeMock = $this->createMock(\Magento\Store\Model\Store::class);
-+        $this->storeMock = $this->createMock(Store::class);
-         $this->searchResultsDataFactory = $this->createPartialMock(
--            \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory::class,
-+            CartSearchResultsInterfaceFactory::class,
-             ['create']
-         );
- 
-         $this->quoteCollectionMock =
--            $this->createMock(\Magento\Quote\Model\ResourceModel\Quote\Collection::class);
-+            $this->createMock(Collection::class);
- 
-         $this->extensionAttributesJoinProcessorMock = $this->createMock(
--            \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface::class
-+            JoinProcessorInterface::class
-         );
-         $this->collectionProcessor = $this->createMock(
--            \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface::class
-+            CollectionProcessorInterface::class
-         );
-         $this->quoteCollectionFactoryMock = $this->createPartialMock(
--            \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory::class,
-+            CollectionFactory::class,
-             ['create']
-         );
-         $this->model = $objectManager->getObject(
--            \Magento\Quote\Model\QuoteRepository::class,
-+            QuoteRepository::class,
-             [
--                'quoteFactory' => $this->quoteFactoryMock,
-                 'storeManager' => $this->storeManagerMock,
-                 'searchResultsDataFactory' => $this->searchResultsDataFactory,
-                 'quoteCollection' => $this->quoteCollectionMock,
-                 'extensionAttributesJoinProcessor' => $this->extensionAttributesJoinProcessorMock,
-                 'collectionProcessor' => $this->collectionProcessor,
--                'quoteCollectionFactory' => $this->quoteCollectionFactoryMock
-+                'quoteCollectionFactory' => $this->quoteCollectionFactoryMock,
-+                'cartFactory' => $this->cartFactoryMock
-             ]
-         );
- 
-@@ -161,7 +175,7 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-     {
-         $cartId = 14;
- 
--        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
-         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
-         $this->quoteMock->expects($this->never())->method('setSharedStoreIds');
-@@ -178,7 +192,7 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-     {
-         $cartId = 15;
- 
--        $this->quoteFactoryMock->expects(static::once())
-+        $this->cartFactoryMock->expects(static::once())
-             ->method('create')
-             ->willReturn($this->quoteMock);
-         $this->storeManagerMock->expects(static::once())
-@@ -211,7 +225,7 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-         $cartId = 15;
-         $customerId = 23;
- 
--        $this->quoteFactoryMock->expects(static::exactly(2))
-+        $this->cartFactoryMock->expects(static::exactly(2))
-             ->method('create')
-             ->willReturn($this->quoteMock);
-         $this->storeManagerMock->expects(static::exactly(2))
-@@ -249,7 +263,7 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-         $cartId = 16;
-         $sharedStoreIds = [1, 2];
- 
--        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
-         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
-         $this->quoteMock->expects($this->once())
-@@ -275,7 +289,7 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-         $cartId = 17;
-         $customerId = 23;
- 
--        $this->quoteFactoryMock->expects(static::once())
-+        $this->cartFactoryMock->expects(static::once())
-             ->method('create')
-             ->willReturn($this->quoteMock);
-         $this->storeManagerMock->expects(static::once())
-@@ -310,7 +324,7 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-     {
-         $cartId = 14;
- 
--        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
-         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
-         $this->quoteMock->expects($this->never())->method('setSharedStoreIds');
-@@ -332,7 +346,7 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-     {
-         $cartId = 15;
- 
--        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
-         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
-         $this->quoteMock->expects($this->never())->method('setSharedStoreIds');
-@@ -355,7 +369,7 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-     {
-         $cartId = 15;
- 
--        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
-         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
-         $this->quoteMock->expects($this->never())->method('setSharedStoreIds');
-@@ -379,7 +393,7 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-         $cartId = 16;
-         $sharedStoreIds = [1, 2];
- 
--        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
-         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
-         $this->quoteMock->expects($this->once())
-@@ -406,7 +420,7 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-         $cartId = 17;
-         $customerId = 23;
- 
--        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
-         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
-         $this->quoteMock->expects($this->never())->method('setSharedStoreIds');
-@@ -430,14 +444,14 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-     {
-         $cartId = 100;
-         $quoteMock = $this->createPartialMock(
--            \Magento\Quote\Model\Quote::class,
-+            Quote::class,
-             ['getId', 'getCustomerId', 'getStoreId', 'hasData', 'setData']
-         );
-         $quoteMock->expects($this->exactly(3))->method('getId')->willReturn($cartId);
-         $quoteMock->expects($this->once())->method('getCustomerId')->willReturn(2);
-         $quoteMock->expects($this->once())->method('getStoreId')->willReturn(5);
- 
--        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
-         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
-         $this->quoteMock->expects($this->once())->method('getId')->willReturn($cartId);
-@@ -481,8 +495,8 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-             ->method('load')
-             ->with($cartMock);
- 
--        $searchResult = $this->createMock(\Magento\Quote\Api\Data\CartSearchResultsInterface::class);
--        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
-+        $searchResult = $this->createMock(CartSearchResultsInterface::class);
-+        $searchCriteriaMock = $this->createMock(SearchCriteria::class);
-         $this->searchResultsDataFactory
-             ->expects($this->once())
-             ->method('create')
-@@ -495,7 +509,7 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->extensionAttributesJoinProcessorMock->expects($this->once())
-             ->method('process')
-             ->with(
--                $this->isInstanceOf(\Magento\Quote\Model\ResourceModel\Quote\Collection::class)
-+                $this->isInstanceOf(Collection::class)
-             );
-         $this->quoteCollectionMock->expects($this->atLeastOnce())->method('getItems')->willReturn([$cartMock]);
-         $searchResult->expects($this->once())->method('setTotalCount')->with($pageSize);
-diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
-index 22785f051dc..07e203f7171 100644
---- a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
-+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
-@@ -975,6 +975,7 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
-             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
-             ['sales/minimum_order/multi_address', ScopeInterface::SCOPE_STORE, $storeId, true],
-             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
-+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
-             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
-         ];
-         $this->scopeConfig->expects($this->any())
-@@ -1001,6 +1002,7 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
-             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
-             ['sales/minimum_order/multi_address', ScopeInterface::SCOPE_STORE, $storeId, true],
-             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
-+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
-             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
-         ];
-         $this->scopeConfig->expects($this->any())
-diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteValidatorTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteValidatorTest.php
-index 6865134a048..d0a3c9fab51 100644
---- a/app/code/Magento/Quote/Test/Unit/Model/QuoteValidatorTest.php
-+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteValidatorTest.php
-@@ -88,182 +88,4 @@ class QuoteValidatorTest extends \PHPUnit\Framework\TestCase
-             $this->quoteValidator->validateQuoteAmount($this->quoteMock, QuoteValidator::MAXIMUM_AVAILABLE_NUMBER + 1)
-         );
-     }
--
--    public function testCheckQuoteAmountAmountLessThanAvailable()
--    {
--        $this->quoteMock->expects($this->once())
--            ->method('getHasError')
--            ->will($this->returnValue(false));
--
--        $this->quoteMock->expects($this->never())
--            ->method('setHasError');
--
--        $this->quoteMock->expects($this->never())
--            ->method('addMessage');
--
--        $this->assertSame(
--            $this->quoteValidator,
--            $this->quoteValidator->validateQuoteAmount($this->quoteMock, QuoteValidator::MAXIMUM_AVAILABLE_NUMBER - 1)
--        );
--    }
--
--    public function testCheckQuoteAmountAmountGreaterThanAvailable()
--    {
--        $this->quoteMock->expects($this->once())
--            ->method('getHasError')
--            ->will($this->returnValue(false));
--
--        $this->quoteMock->expects($this->once())
--            ->method('setHasError')
--            ->with(true);
--
--        $this->quoteMock->expects($this->once())
--            ->method('addMessage')
--            ->with(__('This item price or quantity is not valid for checkout.'));
--
--        $this->assertSame(
--            $this->quoteValidator,
--            $this->quoteValidator->validateQuoteAmount($this->quoteMock, QuoteValidator::MAXIMUM_AVAILABLE_NUMBER + 1)
--        );
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @expectedExceptionMessage Please check the shipping address information.
--     */
--    public function testValidateBeforeSubmitThrowsExceptionIfShippingAddressIsInvalid()
--    {
--        $shippingAddressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
--        $this->quoteMock->expects($this->any())->method('getShippingAddress')->willReturn($shippingAddressMock);
--        $this->quoteMock->expects($this->any())->method('isVirtual')->willReturn(false);
--        $shippingAddressMock->expects($this->any())->method('validate')->willReturn(['Invalid Shipping Address']);
--
--        $this->quoteValidator->validateBeforeSubmit($this->quoteMock);
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @expectedExceptionMessage The shipping method is missing. Select the shipping method and try again.
--     */
--    public function testValidateBeforeSubmitThrowsExceptionIfShippingRateIsNotSelected()
--    {
--        $shippingMethod = 'checkmo';
--        $shippingAddressMock = $this->getMockBuilder(Address::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->allowedCountryReader->method('getAllowedCountries')
--            ->willReturn(['US' => 'US']);
--
--        $this->quoteMock->expects($this->any())->method('getShippingAddress')->willReturn($shippingAddressMock);
--        $this->quoteMock->expects($this->any())->method('isVirtual')->willReturn(false);
--        $shippingAddressMock->expects($this->any())->method('validate')->willReturn(true);
--        $shippingAddressMock->method('getCountryId')
--            ->willReturn('US');
--        $shippingAddressMock->expects($this->any())->method('getShippingMethod')->willReturn($shippingMethod);
--        $shippingAddressMock->expects($this->once())->method('getShippingRateByCode')->with($shippingMethod);
--
--        $this->quoteValidator->validateBeforeSubmit($this->quoteMock);
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @expectedExceptionMessage Please check the billing address information.
--     */
--    public function testValidateBeforeSubmitThrowsExceptionIfBillingAddressIsNotValid()
--    {
--        $billingAddressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
--        $this->quoteMock->expects($this->any())->method('getBillingAddress')->willReturn($billingAddressMock);
--        $this->quoteMock->expects($this->any())->method('isVirtual')->willReturn(true);
--        $billingAddressMock->expects($this->any())->method('validate')->willReturn(['Invalid Billing Address']);
--
--        $this->quoteValidator->validateBeforeSubmit($this->quoteMock);
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @expectedExceptionMessage Enter a valid payment method and try again.
--     */
--    public function testValidateBeforeSubmitThrowsExceptionIfPaymentMethodIsNotSelected()
--    {
--        $paymentMock = $this->createMock(\Magento\Quote\Model\Quote\Payment::class);
--        $billingAddressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
--        $billingAddressMock->expects($this->any())->method('validate')->willReturn(true);
--
--        $this->quoteMock->expects($this->any())->method('getBillingAddress')->willReturn($billingAddressMock);
--        $this->quoteMock->expects($this->any())->method('getPayment')->willReturn($paymentMock);
--        $this->quoteMock->expects($this->any())->method('isVirtual')->willReturn(true);
--
--        $this->quoteValidator->validateBeforeSubmit($this->quoteMock);
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @expectedExceptionMessage Minimum Order Amount Exceeded.
--     */
--    public function testValidateBeforeSubmitThrowsExceptionIfMinimumOrderAmount()
--    {
--        $paymentMock = $this->createMock(\Magento\Quote\Model\Quote\Payment::class);
--        $paymentMock->expects($this->once())->method('getMethod')->willReturn('checkmo');
--
--        $billingAddressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
--        $billingAddressMock->expects($this->any())->method('validate')->willReturn(true);
--
--        $this->quoteMock->expects($this->any())->method('getBillingAddress')->willReturn($billingAddressMock);
--        $this->quoteMock->expects($this->any())->method('getPayment')->willReturn($paymentMock);
--        $this->quoteMock->expects($this->any())->method('isVirtual')->willReturn(true);
--
--        $this->quoteMock->expects($this->any())->method('getIsMultiShipping')->willReturn(false);
--        $this->quoteMock->expects($this->any())->method('validateMinimumAmount')->willReturn(false);
--
--        $this->orderAmountValidationMessage->expects($this->once())->method('getMessage')
--            ->willReturn(__("Minimum Order Amount Exceeded."));
--
--        $this->quoteValidator->validateBeforeSubmit($this->quoteMock);
--    }
--
--    /**
--     * Test case when country id not present in allowed countries list.
--     *
--     * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @expectedExceptionMessage Some addresses can't be used due to the configurations for specific countries.
--     */
--    public function testValidateBeforeSubmitThrowsExceptionIfCountrySpecificConfigurations()
--    {
--        $this->allowedCountryReader->method('getAllowedCountries')
--            ->willReturn(['EE' => 'EE']);
--
--        $addressMock = $this->getMockBuilder(Address::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $addressMock->method('validate')
--            ->willReturn(true);
--        $addressMock->method('getCountryId')
--            ->willReturn('EU');
--
--        $paymentMock = $this->getMockBuilder(Payment::class)
--            ->setMethods(['getMethod'])
--            ->disableOriginalConstructor()
--            ->getMock();
--        $paymentMock->method('getMethod')
--            ->willReturn(true);
--
--        $billingAddressMock = $this->getMockBuilder(Address::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['validate'])
--            ->getMock();
--        $billingAddressMock->method('validate')
--            ->willReturn(true);
--
--        $this->quoteMock->method('getShippingAddress')
--            ->willReturn($addressMock);
--        $this->quoteMock->method('isVirtual')
--            ->willReturn(false);
--        $this->quoteMock->method('getBillingAddress')
--            ->willReturn($billingAddressMock);
--        $this->quoteMock->method('getPayment')
--            ->willReturn($paymentMock);
--
--        $this->quoteValidator->validateBeforeSubmit($this->quoteMock);
--    }
- }
-diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
-deleted file mode 100644
-index e3d5528d62c..00000000000
---- a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
-+++ /dev/null
-@@ -1,282 +0,0 @@
--<?php
--/**
-- *
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Quote\Test\Unit\Model;
--
--use \Magento\Quote\Model\ShippingAddressManagement;
--
--/**
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class ShippingAddressManagementTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var ShippingAddressManagement
--     */
--    protected $service;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $quoteRepositoryMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $quoteAddressMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $validatorMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $scopeConfigMock;
--
--    /**
--     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
--     */
--    protected $objectManager;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $totalsCollectorMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $addressRepository;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $amountErrorMessageMock;
--
--    protected function setUp()
--    {
--        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--        $this->quoteRepositoryMock = $this->createMock(\Magento\Quote\Api\CartRepositoryInterface::class);
--        $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
--
--        $this->quoteAddressMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address::class, [
--                'setSameAsBilling',
--                'setCollectShippingRates',
--                '__wakeup',
--                'collectTotals',
--                'save',
--                'getId',
--                'getCustomerAddressId',
--                'getSaveInAddressBook',
--                'getSameAsBilling',
--                'importCustomerAddressData',
--                'setSaveInAddressBook',
--            ]);
--        $this->validatorMock = $this->createMock(\Magento\Quote\Model\QuoteAddressValidator::class);
--        $this->totalsCollectorMock = $this->createMock(\Magento\Quote\Model\Quote\TotalsCollector::class);
--        $this->addressRepository = $this->createMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
--
--        $this->amountErrorMessageMock = $this->createPartialMock(
--            \Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage::class,
--            ['getMessage']
--        );
--
--        $this->service = $this->objectManager->getObject(
--            \Magento\Quote\Model\ShippingAddressManagement::class,
--            [
--                'quoteRepository' => $this->quoteRepositoryMock,
--                'addressValidator' => $this->validatorMock,
--                'logger' => $this->createMock(\Psr\Log\LoggerInterface::class),
--                'scopeConfig' => $this->scopeConfigMock,
--                'totalsCollector' => $this->totalsCollectorMock,
--                'addressRepository' => $this->addressRepository
--            ]
--        );
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
--     * @expected ExceptionMessage error345
--     */
--    public function testSetAddressValidationFailed()
--    {
--        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
--        $this->quoteRepositoryMock->expects($this->once())
--            ->method('getActive')
--            ->with('cart654')
--            ->will($this->returnValue($quoteMock));
--
--        $this->validatorMock->expects($this->once())->method('validate')
--            ->will($this->throwException(new \Magento\Framework\Exception\NoSuchEntityException(__('error345'))));
--
--        $this->service->assign('cart654', $this->quoteAddressMock);
--    }
--
--    public function testSetAddress()
--    {
--        $addressId = 1;
--        $customerAddressId = 150;
--
--        $quoteMock = $this->createPartialMock(
--            \Magento\Quote\Model\Quote::class,
--            ['getIsMultiShipping', 'isVirtual', 'validateMinimumAmount', 'setShippingAddress', 'getShippingAddress']
--        );
--        $this->quoteRepositoryMock->expects($this->once())
--            ->method('getActive')
--            ->with('cart867')
--            ->willReturn($quoteMock);
--        $quoteMock->expects($this->once())->method('isVirtual')->will($this->returnValue(false));
--        $quoteMock->expects($this->once())
--            ->method('setShippingAddress')
--            ->with($this->quoteAddressMock)
--            ->willReturnSelf();
--
--        $this->quoteAddressMock->expects($this->once())->method('getSaveInAddressBook')->willReturn(1);
--        $this->quoteAddressMock->expects($this->once())->method('getSameAsBilling')->willReturn(1);
--        $this->quoteAddressMock->expects($this->once())->method('getCustomerAddressId')->willReturn($customerAddressId);
--
--        $customerAddressMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
--
--        $this->addressRepository->expects($this->once())
--            ->method('getById')
--            ->with($customerAddressId)
--            ->willReturn($customerAddressMock);
--
--        $this->validatorMock->expects($this->once())->method('validate')
--            ->with($this->quoteAddressMock)
--            ->willReturn(true);
--
--        $quoteMock->expects($this->exactly(3))->method('getShippingAddress')->willReturn($this->quoteAddressMock);
--        $this->quoteAddressMock->expects($this->once())
--            ->method('importCustomerAddressData')
--            ->with($customerAddressMock)
--            ->willReturnSelf();
--
--        $this->quoteAddressMock->expects($this->once())->method('setSameAsBilling')->with(1)->willReturnSelf();
--        $this->quoteAddressMock->expects($this->once())->method('setSaveInAddressBook')->with(1)->willReturnSelf();
--        $this->quoteAddressMock->expects($this->once())
--            ->method('setCollectShippingRates')
--            ->with(true)
--            ->willReturnSelf();
--
--        $this->quoteAddressMock->expects($this->once())->method('save')->willReturnSelf();
--        $this->quoteAddressMock->expects($this->once())->method('getId')->will($this->returnValue($addressId));
--
--        $this->assertEquals($addressId, $this->service->assign('cart867', $this->quoteAddressMock));
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
--     * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
--     */
--    public function testSetAddressForVirtualProduct()
--    {
--        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
--        $this->quoteRepositoryMock->expects($this->once())
--            ->method('getActive')
--            ->with('cart867')
--            ->will($this->returnValue($quoteMock));
--        $quoteMock->expects($this->once())->method('isVirtual')->will($this->returnValue(true));
--        $quoteMock->expects($this->never())->method('setShippingAddress');
--
--        $this->quoteAddressMock->expects($this->never())->method('getCustomerAddressId');
--        $this->quoteAddressMock->expects($this->never())->method('setSaveInAddressBook');
--
--        $quoteMock->expects($this->never())->method('save');
--
--        $this->service->assign('cart867', $this->quoteAddressMock);
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\InputException
--     * @expectedExceptionMessage The address failed to save. Verify the address and try again.
--     */
--    public function testSetAddressWithInabilityToSaveQuote()
--    {
--        $this->quoteAddressMock->expects($this->once())->method('save')->willThrowException(
--            new \Exception('The address failed to save. Verify the address and try again.')
--        );
--
--        $customerAddressId = 150;
--
--        $quoteMock = $this->createPartialMock(
--            \Magento\Quote\Model\Quote::class,
--            ['getIsMultiShipping', 'isVirtual', 'validateMinimumAmount', 'setShippingAddress', 'getShippingAddress']
--        );
--        $this->quoteRepositoryMock->expects($this->once())
--            ->method('getActive')
--            ->with('cart867')
--            ->willReturn($quoteMock);
--        $quoteMock->expects($this->once())->method('isVirtual')->will($this->returnValue(false));
--        $quoteMock->expects($this->once())
--            ->method('setShippingAddress')
--            ->with($this->quoteAddressMock)
--            ->willReturnSelf();
--
--        $customerAddressMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
--
--        $this->addressRepository->expects($this->once())
--            ->method('getById')
--            ->with($customerAddressId)
--            ->willReturn($customerAddressMock);
--
--        $this->validatorMock->expects($this->once())->method('validate')
--            ->with($this->quoteAddressMock)
--            ->willReturn(true);
--
--        $this->quoteAddressMock->expects($this->once())->method('getSaveInAddressBook')->willReturn(1);
--        $this->quoteAddressMock->expects($this->once())->method('getSameAsBilling')->willReturn(1);
--        $this->quoteAddressMock->expects($this->once())->method('getCustomerAddressId')->willReturn($customerAddressId);
--
--        $quoteMock->expects($this->exactly(2))->method('getShippingAddress')->willReturn($this->quoteAddressMock);
--        $this->quoteAddressMock->expects($this->once())
--            ->method('importCustomerAddressData')
--            ->with($customerAddressMock)
--            ->willReturnSelf();
--
--        $this->quoteAddressMock->expects($this->once())->method('setSameAsBilling')->with(1)->willReturnSelf();
--        $this->quoteAddressMock->expects($this->once())->method('setSaveInAddressBook')->with(1)->willReturnSelf();
--        $this->quoteAddressMock->expects($this->once())
--            ->method('setCollectShippingRates')
--            ->with(true)
--            ->willReturnSelf();
--
--        $this->service->assign('cart867', $this->quoteAddressMock);
--    }
--
--    public function testGetAddress()
--    {
--        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
--        $this->quoteRepositoryMock->expects($this->once())->method('getActive')->with('cartId')->will(
--            $this->returnValue($quoteMock)
--        );
--
--        $addressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
--        $quoteMock->expects($this->any())->method('getShippingAddress')->will($this->returnValue($addressMock));
--        $quoteMock->expects($this->any())->method('isVirtual')->will($this->returnValue(false));
--        $this->assertEquals($addressMock, $this->service->get('cartId'));
--    }
--
--    /**
--     * @expectedException \Exception
--     * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
--     */
--    public function testGetAddressOfQuoteWithVirtualProducts()
--    {
--        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
--        $this->quoteRepositoryMock->expects($this->once())->method('getActive')->with('cartId')->will(
--            $this->returnValue($quoteMock)
--        );
--
--        $quoteMock->expects($this->any())->method('isVirtual')->will($this->returnValue(true));
--        $quoteMock->expects($this->never())->method('getShippingAddress');
--
--        $this->service->get('cartId');
--    }
--}
-diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
-index f3357f8aacd..4ea067c9be8 100644
---- a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
-+++ b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
-@@ -199,7 +199,7 @@ class CollectTotalsObserverTest extends \PHPUnit\Framework\TestCase
-             ->method('getNotLoggedInGroup')
-             ->will($this->returnValue($this->groupInterfaceMock));
-         $this->groupInterfaceMock->expects($this->once())
--            ->method('getId')->will($this->returnValue(0));
-+            ->method('getId')->will($this->returnValue(null));
-         $this->vatValidatorMock->expects($this->once())
-             ->method('isEnabled')
-             ->with($this->quoteAddressMock, $this->storeId)
-@@ -220,9 +220,6 @@ class CollectTotalsObserverTest extends \PHPUnit\Framework\TestCase
-             $this->returnValue(false)
-         );
- 
--        $groupMock = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
-         $this->customerMock->expects($this->once())->method('getId')->will($this->returnValue(null));
- 
-         /** Assertions */
-diff --git a/app/code/Magento/Quote/etc/adminhtml/di.xml b/app/code/Magento/Quote/etc/adminhtml/di.xml
-new file mode 100644
-index 00000000000..08e87c7db9e
---- /dev/null
-+++ b/app/code/Magento/Quote/etc/adminhtml/di.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\Quote\Model\ValidationRules\QuoteValidationComposite">
-+        <arguments>
-+            <argument name="validationRules" xsi:type="array">
-+                <item name="ShippingAddressValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\ShippingAddressValidationRule</item>
-+                <item name="AllowedCountryValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\AllowedCountryValidationRule</item>
-+                <item name="ShippingMethodValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\ShippingMethodValidationRule</item>
-+                <item name="BillingAddressValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\BillingAddressValidationRule</item>
-+                <item name="PaymentMethodValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\PaymentMethodValidationRule</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-\ No newline at end of file
-diff --git a/app/code/Magento/Quote/etc/db_schema.xml b/app/code/Magento/Quote/etc/db_schema.xml
-index 3bd7122e65d..b4c75fc1d21 100644
---- a/app/code/Magento/Quote/etc/db_schema.xml
-+++ b/app/code/Magento/Quote/etc/db_schema.xml
-@@ -9,7 +9,7 @@
-         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-     <table name="quote" resource="checkout" engine="innodb" comment="Sales Flat Quote">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store Id"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-@@ -37,9 +37,9 @@
-                 comment="Store Currency Code"/>
-         <column xsi:type="varchar" name="quote_currency_code" nullable="true" length="255"
-                 comment="Quote Currency Code"/>
--        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Grand Total"/>
--        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Base Grand Total"/>
-         <column xsi:type="varchar" name="checkout_method" nullable="true" length="255" comment="Checkout Method"/>
-         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
-@@ -68,36 +68,36 @@
-         <column xsi:type="varchar" name="coupon_code" nullable="true" length="255" comment="Coupon Code"/>
-         <column xsi:type="varchar" name="global_currency_code" nullable="true" length="255"
-                 comment="Global Currency Code"/>
--        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base To Global Rate"/>
--        <column xsi:type="decimal" name="base_to_quote_rate" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_to_quote_rate" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base To Quote Rate"/>
-         <column xsi:type="varchar" name="customer_taxvat" nullable="true" length="255" comment="Customer Taxvat"/>
-         <column xsi:type="varchar" name="customer_gender" nullable="true" length="255" comment="Customer Gender"/>
--        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal"/>
--        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Subtotal"/>
--        <column xsi:type="decimal" name="subtotal_with_discount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="subtotal_with_discount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Subtotal With Discount"/>
--        <column xsi:type="decimal" name="base_subtotal_with_discount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_subtotal_with_discount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Subtotal With Discount"/>
-         <column xsi:type="int" name="is_changed" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="Is Changed"/>
-         <column xsi:type="smallint" name="trigger_recollect" padding="6" unsigned="false" nullable="false"
-                 identity="false" default="0" comment="Trigger Recollect"/>
-         <column xsi:type="text" name="ext_shipping_info" nullable="true" comment="Ext Shipping Info"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="QUOTE_STORE_ID_STORE_STORE_ID" table="quote" column="store_id"
-+        <constraint xsi:type="foreign" referenceId="QUOTE_STORE_ID_STORE_STORE_ID" table="quote" column="store_id"
-                     referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <index name="QUOTE_CUSTOMER_ID_STORE_ID_IS_ACTIVE" indexType="btree">
-+        <index referenceId="QUOTE_CUSTOMER_ID_STORE_ID_IS_ACTIVE" indexType="btree">
-             <column name="customer_id"/>
-             <column name="store_id"/>
-             <column name="is_active"/>
-         </index>
--        <index name="QUOTE_STORE_ID" indexType="btree">
-+        <index referenceId="QUOTE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -108,7 +108,7 @@
-                 default="0" comment="Quote Id"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Created At"/>
--        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="0"
-+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
-         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="Customer Id"/>
-@@ -143,57 +143,57 @@
-                 comment="Shipping Description"/>
-         <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-                 comment="Weight"/>
--        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Subtotal"/>
--        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Base Subtotal"/>
--        <column xsi:type="decimal" name="subtotal_with_discount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="subtotal_with_discount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Subtotal With Discount"/>
--        <column xsi:type="decimal" name="base_subtotal_with_discount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_subtotal_with_discount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Base Subtotal With Discount"/>
--        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Tax Amount"/>
--        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Base Tax Amount"/>
--        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Shipping Amount"/>
--        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Base Shipping Amount"/>
--        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Tax Amount"/>
--        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Tax Amount"/>
--        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Discount Amount"/>
--        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Base Discount Amount"/>
--        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Grand Total"/>
--        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Base Grand Total"/>
-         <column xsi:type="text" name="customer_notes" nullable="true" comment="Customer Notes"/>
-         <column xsi:type="text" name="applied_taxes" nullable="true" comment="Applied Taxes"/>
-         <column xsi:type="varchar" name="discount_description" nullable="true" length="255"
-                 comment="Discount Description"/>
--        <column xsi:type="decimal" name="shipping_discount_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="shipping_discount_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Shipping Discount Amount"/>
--        <column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Discount Amount"/>
--        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal Incl Tax"/>
--        <column xsi:type="decimal" name="base_subtotal_total_incl_tax" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_subtotal_total_incl_tax" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Subtotal Total Incl Tax"/>
--        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="12"
-+        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Shipping Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Shipping Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Incl Tax"/>
--        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Incl Tax"/>
-         <column xsi:type="text" name="vat_id" nullable="true" comment="Vat Id"/>
-         <column xsi:type="smallint" name="vat_is_valid" padding="6" unsigned="false" nullable="true" identity="false"
-@@ -202,12 +202,14 @@
-         <column xsi:type="text" name="vat_request_date" nullable="true" comment="Vat Request Date"/>
-         <column xsi:type="smallint" name="vat_request_success" padding="6" unsigned="false" nullable="true"
-                 identity="false" comment="Vat Request Success"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <column xsi:type="text" name="validated_country_code" nullable="true" comment="Validated Country Code"/>
-+        <column xsi:type="text" name="validated_vat_number" nullable="true" comment="Validated Vat Number"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="address_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="QUOTE_ADDRESS_QUOTE_ID_QUOTE_ENTITY_ID" table="quote_address"
-+        <constraint xsi:type="foreign" referenceId="QUOTE_ADDRESS_QUOTE_ID_QUOTE_ENTITY_ID" table="quote_address"
-                     column="quote_id" referenceTable="quote" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="QUOTE_ADDRESS_QUOTE_ID" indexType="btree">
-+        <index referenceId="QUOTE_ADDRESS_QUOTE_ID" indexType="btree">
-             <column name="quote_id"/>
-         </index>
-     </table>
-@@ -218,7 +220,7 @@
-                 default="0" comment="Quote Id"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Created At"/>
--        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="0"
-+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
-         <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="Product Id"/>
-@@ -249,65 +251,65 @@
-                 comment="Custom Price"/>
-         <column xsi:type="decimal" name="discount_percent" scale="4" precision="12" unsigned="false" nullable="true"
-                 default="0" comment="Discount Percent"/>
--        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Discount Amount"/>
--        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" default="0" comment="Base Discount Amount"/>
-         <column xsi:type="decimal" name="tax_percent" scale="4" precision="12" unsigned="false" nullable="true"
-                 default="0" comment="Tax Percent"/>
--        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Tax Amount"/>
--        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Base Tax Amount"/>
--        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="row_total" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Row Total"/>
--        <column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="base_row_total" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Base Row Total"/>
--        <column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="20" unsigned="false"
-                 nullable="true" default="0" comment="Row Total With Discount"/>
-         <column xsi:type="decimal" name="row_weight" scale="4" precision="12" unsigned="false" nullable="true"
-                 default="0" comment="Row Weight"/>
-         <column xsi:type="varchar" name="product_type" nullable="true" length="255" comment="Product Type"/>
--        <column xsi:type="decimal" name="base_tax_before_discount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_tax_before_discount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Tax Before Discount"/>
--        <column xsi:type="decimal" name="tax_before_discount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tax_before_discount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Tax Before Discount"/>
-         <column xsi:type="decimal" name="original_custom_price" scale="4" precision="12" unsigned="false"
-                 nullable="true" comment="Original Custom Price"/>
-         <column xsi:type="varchar" name="redirect_url" nullable="true" length="255" comment="Redirect Url"/>
-         <column xsi:type="decimal" name="base_cost" scale="4" precision="12" unsigned="false" nullable="true"
-                 comment="Base Cost"/>
--        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Price Incl Tax"/>
--        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Price Incl Tax"/>
--        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Row Total Incl Tax"/>
--        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Row Total Incl Tax"/>
--        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="item_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="QUOTE_ITEM_PARENT_ITEM_ID_QUOTE_ITEM_ITEM_ID" table="quote_item"
-+        <constraint xsi:type="foreign" referenceId="QUOTE_ITEM_PARENT_ITEM_ID_QUOTE_ITEM_ITEM_ID" table="quote_item"
-                     column="parent_item_id" referenceTable="quote_item" referenceColumn="item_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="QUOTE_ITEM_QUOTE_ID_QUOTE_ENTITY_ID" table="quote_item" column="quote_id"
-+        <constraint xsi:type="foreign" referenceId="QUOTE_ITEM_QUOTE_ID_QUOTE_ENTITY_ID" table="quote_item" column="quote_id"
-                     referenceTable="quote" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="QUOTE_ITEM_STORE_ID_STORE_STORE_ID" table="quote_item" column="store_id"
-+        <constraint xsi:type="foreign" referenceId="QUOTE_ITEM_STORE_ID_STORE_STORE_ID" table="quote_item" column="store_id"
-                     referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
--        <index name="QUOTE_ITEM_PARENT_ITEM_ID" indexType="btree">
-+        <index referenceId="QUOTE_ITEM_PARENT_ITEM_ID" indexType="btree">
-             <column name="parent_item_id"/>
-         </index>
--        <index name="QUOTE_ITEM_PRODUCT_ID" indexType="btree">
-+        <index referenceId="QUOTE_ITEM_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
--        <index name="QUOTE_ITEM_QUOTE_ID" indexType="btree">
-+        <index referenceId="QUOTE_ITEM_QUOTE_ID" indexType="btree">
-             <column name="quote_id"/>
-         </index>
--        <index name="QUOTE_ITEM_STORE_ID" indexType="btree">
-+        <index referenceId="QUOTE_ITEM_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -322,7 +324,7 @@
-                 default="0" comment="Quote Item Id"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Created At"/>
--        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="0"
-+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
-         <column xsi:type="text" name="applied_rule_ids" nullable="true" comment="Applied Rule Ids"/>
-         <column xsi:type="text" name="additional_data" nullable="true" comment="Additional Data"/>
-@@ -330,19 +332,19 @@
-                 comment="Weight"/>
-         <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-                 comment="Qty"/>
--        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Discount Amount"/>
--        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Tax Amount"/>
--        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="row_total" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Row Total"/>
--        <column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="base_row_total" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Base Row Total"/>
--        <column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="20" unsigned="false"
-                 nullable="true" default="0" comment="Row Total With Discount"/>
--        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" default="0" comment="Base Discount Amount"/>
--        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Base Tax Amount"/>
-         <column xsi:type="decimal" name="row_weight" scale="4" precision="12" unsigned="false" nullable="true"
-                 default="0" comment="Row Weight"/>
-@@ -352,6 +354,8 @@
-                 comment="Super Product Id"/>
-         <column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="Parent Product Id"/>
-+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-+                comment="Store Id"/>
-         <column xsi:type="varchar" name="sku" nullable="true" length="255" comment="Sku"/>
-         <column xsi:type="varchar" name="image" nullable="true" length="255" comment="Image"/>
-         <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
-@@ -370,39 +374,42 @@
-                 comment="Base Price"/>
-         <column xsi:type="decimal" name="base_cost" scale="4" precision="12" unsigned="false" nullable="true"
-                 comment="Base Cost"/>
--        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Price Incl Tax"/>
--        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Price Incl Tax"/>
--        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Row Total Incl Tax"/>
--        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Row Total Incl Tax"/>
--        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="address_item_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID_QUOTE_ADDRESS_ADDRESS_ID"
-+        <constraint xsi:type="foreign" referenceId="QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID_QUOTE_ADDRESS_ADDRESS_ID"
-                     table="quote_address_item" column="quote_address_id" referenceTable="quote_address"
-                     referenceColumn="address_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="QUOTE_ADDR_ITEM_PARENT_ITEM_ID_QUOTE_ADDR_ITEM_ADDR_ITEM_ID"
-+        <constraint xsi:type="foreign" referenceId="QUOTE_ADDR_ITEM_PARENT_ITEM_ID_QUOTE_ADDR_ITEM_ADDR_ITEM_ID"
-                     table="quote_address_item" column="parent_item_id" referenceTable="quote_address_item"
-                     referenceColumn="address_item_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID"
-+        <constraint xsi:type="foreign" referenceId="QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID"
-                     table="quote_address_item" column="quote_item_id" referenceTable="quote_item"
-                     referenceColumn="item_id" onDelete="CASCADE"/>
--        <index name="QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID" indexType="btree">
-+        <index referenceId="QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID" indexType="btree">
-             <column name="quote_address_id"/>
-         </index>
--        <index name="QUOTE_ADDRESS_ITEM_PARENT_ITEM_ID" indexType="btree">
-+        <index referenceId="QUOTE_ADDRESS_ITEM_PARENT_ITEM_ID" indexType="btree">
-             <column name="parent_item_id"/>
-         </index>
--        <index name="QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID" indexType="btree">
-+        <index referenceId="QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID" indexType="btree">
-             <column name="quote_item_id"/>
-         </index>
-+        <index referenceId="QUOTE_ADDRESS_ITEM_STORE_ID" indexType="btree">
-+            <column name="store_id"/>
-+        </index>
-     </table>
-     <table name="quote_item_option" resource="checkout" engine="innodb" comment="Sales Flat Quote Item Option">
-         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"
-@@ -413,12 +420,12 @@
-                 comment="Product Id"/>
-         <column xsi:type="varchar" name="code" nullable="false" length="255" comment="Code"/>
-         <column xsi:type="text" name="value" nullable="true" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="option_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="QUOTE_ITEM_OPTION_ITEM_ID_QUOTE_ITEM_ITEM_ID" table="quote_item_option"
-+        <constraint xsi:type="foreign" referenceId="QUOTE_ITEM_OPTION_ITEM_ID_QUOTE_ITEM_ITEM_ID" table="quote_item_option"
-                     column="item_id" referenceTable="quote_item" referenceColumn="item_id" onDelete="CASCADE"/>
--        <index name="QUOTE_ITEM_OPTION_ITEM_ID" indexType="btree">
-+        <index referenceId="QUOTE_ITEM_OPTION_ITEM_ID" indexType="btree">
-             <column name="item_id"/>
-         </index>
-     </table>
-@@ -429,7 +436,7 @@
-                 default="0" comment="Quote Id"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Created At"/>
--        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="0"
-+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
-         <column xsi:type="varchar" name="method" nullable="true" length="255" comment="Method"/>
-         <column xsi:type="varchar" name="cc_type" nullable="true" length="255" comment="Cc Type"/>
-@@ -449,12 +456,12 @@
-         <column xsi:type="text" name="additional_data" nullable="true" comment="Additional Data"/>
-         <column xsi:type="varchar" name="cc_ss_issue" nullable="true" length="255" comment="Cc Ss Issue"/>
-         <column xsi:type="text" name="additional_information" nullable="true" comment="Additional Information"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="payment_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="QUOTE_PAYMENT_QUOTE_ID_QUOTE_ENTITY_ID" table="quote_payment"
-+        <constraint xsi:type="foreign" referenceId="QUOTE_PAYMENT_QUOTE_ID_QUOTE_ENTITY_ID" table="quote_payment"
-                     column="quote_id" referenceTable="quote" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="QUOTE_PAYMENT_QUOTE_ID" indexType="btree">
-+        <index referenceId="QUOTE_PAYMENT_QUOTE_ID" indexType="btree">
-             <column name="quote_id"/>
-         </index>
-     </table>
-@@ -465,43 +472,43 @@
-                 default="0" comment="Address Id"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Created At"/>
--        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="0"
-+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
-         <column xsi:type="varchar" name="carrier" nullable="true" length="255" comment="Carrier"/>
-         <column xsi:type="varchar" name="carrier_title" nullable="true" length="255" comment="Carrier Title"/>
-         <column xsi:type="varchar" name="code" nullable="true" length="255" comment="Code"/>
-         <column xsi:type="varchar" name="method" nullable="true" length="255" comment="Method"/>
-         <column xsi:type="text" name="method_description" nullable="true" comment="Method Description"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-+        <column xsi:type="decimal" name="price" scale="4" precision="20" unsigned="false" nullable="false" default="0"
-                 comment="Price"/>
-         <column xsi:type="text" name="error_message" nullable="true" comment="Error Message"/>
-         <column xsi:type="text" name="method_title" nullable="true" comment="Method Title"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rate_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="QUOTE_SHIPPING_RATE_ADDRESS_ID_QUOTE_ADDRESS_ADDRESS_ID"
-+        <constraint xsi:type="foreign" referenceId="QUOTE_SHIPPING_RATE_ADDRESS_ID_QUOTE_ADDRESS_ADDRESS_ID"
-                     table="quote_shipping_rate" column="address_id" referenceTable="quote_address"
-                     referenceColumn="address_id" onDelete="CASCADE"/>
--        <index name="QUOTE_SHIPPING_RATE_ADDRESS_ID" indexType="btree">
-+        <index referenceId="QUOTE_SHIPPING_RATE_ADDRESS_ID" indexType="btree">
-             <column name="address_id"/>
-         </index>
-     </table>
-     <table name="quote_id_mask" resource="checkout" engine="innodb" comment="Quote ID and masked ID mapping">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="int" name="quote_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Quote ID"/>
-         <column xsi:type="varchar" name="masked_id" nullable="true" length="32" comment="Masked ID"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-             <column name="quote_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="QUOTE_ID_MASK_QUOTE_ID_QUOTE_ENTITY_ID" table="quote_id_mask"
-+        <constraint xsi:type="foreign" referenceId="QUOTE_ID_MASK_QUOTE_ID_QUOTE_ENTITY_ID" table="quote_id_mask"
-                     column="quote_id" referenceTable="quote" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="QUOTE_ID_MASK_QUOTE_ID" indexType="btree">
-+        <index referenceId="QUOTE_ID_MASK_QUOTE_ID" indexType="btree">
-             <column name="quote_id"/>
-         </index>
--        <index name="QUOTE_ID_MASK_MASKED_ID" indexType="btree">
-+        <index referenceId="QUOTE_ID_MASK_MASKED_ID" indexType="btree">
-             <column name="masked_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Quote/etc/db_schema_whitelist.json b/app/code/Magento/Quote/etc/db_schema_whitelist.json
-index c2cc34293dc..5667a9a5b46 100644
---- a/app/code/Magento/Quote/etc/db_schema_whitelist.json
-+++ b/app/code/Magento/Quote/etc/db_schema_whitelist.json
-@@ -212,6 +212,7 @@
-             "product_id": true,
-             "super_product_id": true,
-             "parent_product_id": true,
-+            "store_id": true,
-             "sku": true,
-             "image": true,
-             "name": true,
-@@ -233,7 +234,8 @@
-         "index": {
-             "QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID": true,
-             "QUOTE_ADDRESS_ITEM_PARENT_ITEM_ID": true,
--            "QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID": true
-+            "QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID": true,
-+            "QUOTE_ADDRESS_ITEM_STORE_ID": true
-         },
-         "constraint": {
-             "PRIMARY": true,
-diff --git a/app/code/Magento/Quote/etc/di.xml b/app/code/Magento/Quote/etc/di.xml
-index aa6fafb5dd0..cd5e62307fd 100644
---- a/app/code/Magento/Quote/etc/di.xml
-+++ b/app/code/Magento/Quote/etc/di.xml
-@@ -11,6 +11,8 @@
-     <preference for="Magento\Quote\Api\Data\ShippingMethodInterface" type="Magento\Quote\Model\Cart\ShippingMethod" />
-     <preference for="Magento\Quote\Api\BillingAddressManagementInterface" type="Magento\Quote\Model\BillingAddressManagement" />
-     <preference for="Magento\Quote\Model\ShippingAddressManagementInterface" type="Magento\Quote\Model\ShippingAddressManagement" />
-+    <preference for="Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface" type="Magento\Quote\Model\MaskedQuoteIdToQuoteId" />
-+    <preference for="Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface" type="Magento\Quote\Model\QuoteIdToMaskedQuoteId" />
-     <preference for="Magento\Quote\Api\Data\AddressInterface" type="Magento\Quote\Model\Quote\Address" />
-     <preference for="Magento\Quote\Api\Data\CartItemInterface" type="Magento\Quote\Model\Quote\Item" />
-     <preference for="Magento\Quote\Api\Data\CartInterface" type="Magento\Quote\Model\Quote" />
-@@ -41,6 +43,7 @@
-     <preference for="Magento\Quote\Api\GuestCartTotalManagementInterface" type="Magento\Quote\Model\GuestCart\GuestCartTotalManagement" />
-     <preference for="Magento\Quote\Api\Data\EstimateAddressInterface" type="Magento\Quote\Model\EstimateAddress" />
-     <preference for="Magento\Quote\Api\Data\ProductOptionInterface" type="Magento\Quote\Model\Quote\ProductOption" />
-+    <preference for="Magento\Quote\Model\ValidationRules\QuoteValidationRuleInterface" type="Magento\Quote\Model\ValidationRules\QuoteValidationComposite\Proxy"/>
-     <type name="Magento\Webapi\Controller\Rest\ParamsOverrider">
-         <arguments>
-             <argument name="paramOverriders" xsi:type="array">
-@@ -95,4 +98,44 @@
-         <plugin name="clean_quote_items_after_product_delete" type="Magento\Quote\Model\Product\Plugin\RemoveQuoteItems"/>
-         <plugin name="update_quote_items_after_product_save" type="Magento\Quote\Model\Product\Plugin\UpdateQuoteItems"/>
-     </type>
-+    <type name="Magento\Catalog\Model\Product\Action">
-+        <plugin name="quoteProductMassChange" type="Magento\Quote\Model\Product\Plugin\MarkQuotesRecollectMassDisabled"/>
-+    </type>
-+    <type name="Magento\Quote\Model\ValidationRules\QuoteValidationComposite">
-+        <arguments>
-+            <argument name="validationRules" xsi:type="array">
-+                <item name="AllowedCountryValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\AllowedCountryValidationRule</item>
-+                <item name="ShippingAddressValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\ShippingAddressValidationRule</item>
-+                <item name="ShippingMethodValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\ShippingMethodValidationRule</item>
-+                <item name="BillingAddressValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\BillingAddressValidationRule</item>
-+                <item name="PaymentMethodValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\PaymentMethodValidationRule</item>
-+                <item name="MinimumAmountValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\MinimumAmountValidationRule</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Quote\Model\ValidationRules\AllowedCountryValidationRule">
-+        <arguments>
-+            <argument name="generalMessage" xsi:type="string" translatable="true">Some addresses can't be used due to the configurations for specific countries.</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Quote\Model\ValidationRules\ShippingAddressValidationRule">
-+        <arguments>
-+            <argument name="generalMessage" xsi:type="string" translatable="true">Please check the shipping address information.</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Quote\Model\ValidationRules\ShippingMethodValidationRule">
-+        <arguments>
-+            <argument name="generalMessage" xsi:type="string" translatable="true">The shipping method is missing. Select the shipping method and try again.</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Quote\Model\ValidationRules\BillingAddressValidationRule">
-+        <arguments>
-+            <argument name="generalMessage" xsi:type="string" translatable="true">Please check the billing address information.</argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Quote\Model\ValidationRules\PaymentMethodValidationRule">
-+        <arguments>
-+            <argument name="generalMessage" xsi:type="string" translatable="true">Enter a valid payment method and try again.</argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Quote/etc/fieldset.xml b/app/code/Magento/Quote/etc/fieldset.xml
-index 55ec76a647f..85ee20c7f85 100644
---- a/app/code/Magento/Quote/etc/fieldset.xml
-+++ b/app/code/Magento/Quote/etc/fieldset.xml
-@@ -186,6 +186,11 @@
-                 <aspect name="to_order_address" />
-             </field>
-         </fieldset>
-+        <fieldset id="quote_convert_address_item">
-+            <field name="quote_item_id">
-+                <aspect name="to_order_item" />
-+            </field>
-+        </fieldset>
-         <fieldset id="quote_convert_item">
-             <field name="sku">
-                 <aspect name="to_order_item" />
-diff --git a/app/code/Magento/Quote/etc/frontend/di.xml b/app/code/Magento/Quote/etc/frontend/di.xml
-index 25acd6763ba..ecad94fbbc2 100644
---- a/app/code/Magento/Quote/etc/frontend/di.xml
-+++ b/app/code/Magento/Quote/etc/frontend/di.xml
-@@ -12,7 +12,13 @@
-             <argument name="checkoutSession" xsi:type="object">Magento\Checkout\Model\Session\Proxy</argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Store\Model\StoreSwitcherInterface">
-+        <plugin name="update_quote_item_store_after_switch_store_view" type="Magento\Quote\Plugin\UpdateQuoteItemStore"/>
-+    </type>
-     <type name="Magento\Store\Api\StoreCookieManagerInterface">
-         <plugin name="update_quote_store_after_switch_store_view" type="Magento\Quote\Plugin\UpdateQuoteStore"/>
-     </type>
-+    <type name="Magento\Customer\Model\ResourceModel\Customer">
-+        <plugin name="cart_recollect_on_group_change" type="Magento\Quote\Plugin\RecollectOnGroupChange"/>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Quote/etc/sales.xml b/app/code/Magento/Quote/etc/sales.xml
-index 3d54a6375c8..3db72a12262 100644
---- a/app/code/Magento/Quote/etc/sales.xml
-+++ b/app/code/Magento/Quote/etc/sales.xml
-@@ -9,7 +9,7 @@
-     <section name="quote">
-         <group name="totals">
-             <item name="subtotal" instance="Magento\Quote\Model\Quote\Address\Total\Subtotal" sort_order="100"/>
--            <item name="shipping" instance="Magento\Quote\Model\Quote\Address\Total\Shipping" sort_order="250"/>
-+            <item name="shipping" instance="Magento\Quote\Model\Quote\Address\Total\Shipping" sort_order="350"/>
-             <item name="grand_total" instance="Magento\Quote\Model\Quote\Address\Total\Grand" sort_order="550"/>
-         </group>
-     </section>
-diff --git a/app/code/Magento/Quote/etc/webapi_rest/di.xml b/app/code/Magento/Quote/etc/webapi_rest/di.xml
-index 2c8da7c775e..27d5ff77534 100644
---- a/app/code/Magento/Quote/etc/webapi_rest/di.xml
-+++ b/app/code/Magento/Quote/etc/webapi_rest/di.xml
-@@ -11,5 +11,6 @@
-     </type>
-     <type name="Magento\Quote\Model\QuoteRepository">
-         <plugin name="accessControl" type="Magento\Quote\Model\QuoteRepository\Plugin\AccessChangeQuoteControl" />
-+        <plugin name="authorization" type="Magento\Quote\Model\QuoteRepository\Plugin\Authorization" />
-     </type>
- </config>
-diff --git a/app/code/Magento/Quote/etc/webapi_soap/di.xml b/app/code/Magento/Quote/etc/webapi_soap/di.xml
-index 2c8da7c775e..27d5ff77534 100644
---- a/app/code/Magento/Quote/etc/webapi_soap/di.xml
-+++ b/app/code/Magento/Quote/etc/webapi_soap/di.xml
-@@ -11,5 +11,6 @@
-     </type>
-     <type name="Magento\Quote\Model\QuoteRepository">
-         <plugin name="accessControl" type="Magento\Quote\Model\QuoteRepository\Plugin\AccessChangeQuoteControl" />
-+        <plugin name="authorization" type="Magento\Quote\Model\QuoteRepository\Plugin\Authorization" />
-     </type>
- </config>
-diff --git a/app/code/Magento/Quote/i18n/en_US.csv b/app/code/Magento/Quote/i18n/en_US.csv
-index ae7453aa0d0..b2417929749 100644
---- a/app/code/Magento/Quote/i18n/en_US.csv
-+++ b/app/code/Magento/Quote/i18n/en_US.csv
-@@ -65,3 +65,5 @@ error345,error345
- Carts,Carts
- "Manage carts","Manage carts"
- "Invalid state change requested","Invalid state change requested"
-+"Validated Country Code","Validated Country Code"
-+"Validated Vat Number","Validated Vat Number"
-diff --git a/app/code/Magento/QuoteAnalytics/README.md b/app/code/Magento/QuoteAnalytics/README.md
-index d4adcc93132..c5a3857c7af 100644
---- a/app/code/Magento/QuoteAnalytics/README.md
-+++ b/app/code/Magento/QuoteAnalytics/README.md
-@@ -1,3 +1,3 @@
- # Magento_QuoteAnalytics
- 
--The Magento_QuoteAnalytics module configures data definitions for a data collection related to the Quote module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
-+The Magento_QuoteAnalytics module configures data definitions for a data collection related to the Quote module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
-diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json
-index 90dae1ec2ad..706bed674b4 100644
---- a/app/code/Magento/QuoteAnalytics/composer.json
-+++ b/app/code/Magento/QuoteAnalytics/composer.json
-@@ -4,7 +4,8 @@
-     "require": {
-         "php": "~7.1.3||~7.2.0",
-         "magento/framework": "*",
--        "magento/module-quote": "*"
-+        "magento/module-quote": "*",
-+        "magento/module-analytics": "*"
-     },
-     "type": "magento2-module",
-     "license": [
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
-new file mode 100644
-index 00000000000..f8d7844dd05
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
-@@ -0,0 +1,57 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\Quote;
-+
-+/**
-+ * Add products to cart
-+ */
-+class AddProductsToCart
-+{
-+    /**
-+     * @var CartRepositoryInterface
-+     */
-+    private $cartRepository;
-+
-+    /**
-+     * @var AddSimpleProductToCart
-+     */
-+    private $addProductToCart;
-+
-+    /**
-+     * @param CartRepositoryInterface $cartRepository
-+     * @param AddSimpleProductToCart $addProductToCart
-+     */
-+    public function __construct(
-+        CartRepositoryInterface $cartRepository,
-+        AddSimpleProductToCart $addProductToCart
-+    ) {
-+        $this->cartRepository = $cartRepository;
-+        $this->addProductToCart = $addProductToCart;
-+    }
-+
-+    /**
-+     * Add products to cart
-+     *
-+     * @param Quote $cart
-+     * @param array $cartItems
-+     * @throws GraphQlInputException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException
-+     */
-+    public function execute(Quote $cart, array $cartItems): void
-+    {
-+        foreach ($cartItems as $cartItemData) {
-+            $this->addProductToCart->execute($cart, $cartItemData);
-+        }
-+        $this->cartRepository->save($cart);
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
-new file mode 100644
-index 00000000000..3f6cc426140
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
-@@ -0,0 +1,117 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Quote\Model\Quote;
-+
-+/**
-+ * Add simple product to cart
-+ */
-+class AddSimpleProductToCart
-+{
-+    /**
-+     * @var CreateBuyRequest
-+     */
-+    private $createBuyRequest;
-+
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @param ProductRepositoryInterface $productRepository
-+     * @param CreateBuyRequest $createBuyRequest
-+     */
-+    public function __construct(
-+        ProductRepositoryInterface $productRepository,
-+        CreateBuyRequest $createBuyRequest
-+    ) {
-+        $this->productRepository = $productRepository;
-+        $this->createBuyRequest = $createBuyRequest;
-+    }
-+
-+    /**
-+     * Add simple product to cart
-+     *
-+     * @param Quote $cart
-+     * @param array $cartItemData
-+     * @return void
-+     * @throws GraphQlNoSuchEntityException
-+     * @throws GraphQlInputException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function execute(Quote $cart, array $cartItemData): void
-+    {
-+        $sku = $this->extractSku($cartItemData);
-+        $quantity = $this->extractQuantity($cartItemData);
-+        $customizableOptions = $cartItemData['customizable_options'] ?? [];
-+
-+        try {
-+            $product = $this->productRepository->get($sku);
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(__('Could not find a product with SKU "%sku"', ['sku' => $sku]));
-+        }
-+
-+        try {
-+            $result = $cart->addProduct($product, $this->createBuyRequest->execute($quantity, $customizableOptions));
-+        } catch (\Exception $e) {
-+            throw new GraphQlInputException(
-+                __(
-+                    'Could not add the product with SKU %sku to the shopping cart: %message',
-+                    ['sku' => $sku, 'message' => $e->getMessage()]
-+                )
-+            );
-+        }
-+
-+        if (is_string($result)) {
-+            throw new GraphQlInputException(__($result));
-+        }
-+    }
-+
-+    /**
-+     * Extract SKU from cart item data
-+     *
-+     * @param array $cartItemData
-+     * @return string
-+     * @throws GraphQlInputException
-+     */
-+    private function extractSku(array $cartItemData): string
-+    {
-+        if (!isset($cartItemData['data']['sku']) || empty($cartItemData['data']['sku'])) {
-+            throw new GraphQlInputException(__('Missed "sku" in cart item data'));
-+        }
-+        return (string)$cartItemData['data']['sku'];
-+    }
-+
-+    /**
-+     * Extract quantity from cart item data
-+     *
-+     * @param array $cartItemData
-+     * @return float
-+     * @throws GraphQlInputException
-+     */
-+    private function extractQuantity(array $cartItemData): float
-+    {
-+        if (!isset($cartItemData['data']['quantity'])) {
-+            throw new GraphQlInputException(__('Missed "qty" in cart item data'));
-+        }
-+        $quantity = (float)$cartItemData['data']['quantity'];
-+
-+        if ($quantity <= 0) {
-+            throw new GraphQlInputException(
-+                __('Please enter a number greater than 0 in this field.')
-+            );
-+        }
-+        return $quantity;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php
-new file mode 100644
-index 00000000000..dd6478b4873
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Quote\Api\Data\AddressInterface;
-+use Magento\Quote\Api\Data\CartInterface;
-+use Magento\Quote\Api\BillingAddressManagementInterface;
-+
-+/**
-+ * Set billing address for a specified shopping cart
-+ */
-+class AssignBillingAddressToCart
-+{
-+    /**
-+     * @var BillingAddressManagementInterface
-+     */
-+    private $billingAddressManagement;
-+
-+    /**
-+     * @param BillingAddressManagementInterface $billingAddressManagement
-+     */
-+    public function __construct(
-+        BillingAddressManagementInterface $billingAddressManagement
-+    ) {
-+        $this->billingAddressManagement = $billingAddressManagement;
-+    }
-+
-+    /**
-+     * Assign billing address to cart
-+     *
-+     * @param CartInterface $cart
-+     * @param AddressInterface $billingAddress
-+     * @param bool $useForShipping
-+     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    public function execute(
-+        CartInterface $cart,
-+        AddressInterface $billingAddress,
-+        bool $useForShipping
-+    ): void {
-+        try {
-+            $this->billingAddressManagement->assign($cart->getId(), $billingAddress, $useForShipping);
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
-new file mode 100644
-index 00000000000..527999b245a
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
-@@ -0,0 +1,57 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Quote\Api\Data\AddressInterface;
-+use Magento\Quote\Api\Data\CartInterface;
-+use Magento\Quote\Model\ShippingAddressManagementInterface;
-+
-+/**
-+ * Assign shipping address to cart
-+ */
-+class AssignShippingAddressToCart
-+{
-+    /**
-+     * @var ShippingAddressManagementInterface
-+     */
-+    private $shippingAddressManagement;
-+
-+    /**
-+     * @param ShippingAddressManagementInterface $shippingAddressManagement
-+     */
-+    public function __construct(
-+        ShippingAddressManagementInterface $shippingAddressManagement
-+    ) {
-+        $this->shippingAddressManagement = $shippingAddressManagement;
-+    }
-+
-+    /**
-+     * Assign shipping address to cart
-+     *
-+     * @param CartInterface $cart
-+     * @param AddressInterface $shippingAddress
-+     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    public function execute(
-+        CartInterface $cart,
-+        AddressInterface $shippingAddress
-+    ): void {
-+        try {
-+            $this->shippingAddressManagement->assign($cart->getId(), $shippingAddress);
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingMethodToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingMethodToCart.php
-new file mode 100644
-index 00000000000..5b30c0774c2
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingMethodToCart.php
-@@ -0,0 +1,82 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Checkout\Api\Data\ShippingInformationInterface;
-+use Magento\Checkout\Api\Data\ShippingInformationInterfaceFactory;
-+use Magento\Checkout\Api\ShippingInformationManagementInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Quote\Api\Data\AddressInterface;
-+use Magento\Quote\Api\Data\CartInterface;
-+
-+/**
-+ * Assign shipping method to cart
-+ */
-+class AssignShippingMethodToCart
-+{
-+    /**
-+     * @var ShippingInformationInterfaceFactory
-+     */
-+    private $shippingInformationFactory;
-+
-+    /**
-+     * @var ShippingInformationManagementInterface
-+     */
-+    private $shippingInformationManagement;
-+
-+    /**
-+     * @param ShippingInformationInterfaceFactory $shippingInformationFactory
-+     * @param ShippingInformationManagementInterface $shippingInformationManagement
-+     */
-+    public function __construct(
-+        ShippingInformationInterfaceFactory $shippingInformationFactory,
-+        ShippingInformationManagementInterface $shippingInformationManagement
-+    ) {
-+        $this->shippingInformationFactory = $shippingInformationFactory;
-+        $this->shippingInformationManagement = $shippingInformationManagement;
-+    }
-+
-+    /**
-+     * Assign shipping method to cart
-+     *
-+     * @param CartInterface $cart
-+     * @param AddressInterface $quoteAddress
-+     * @param string $carrierCode
-+     * @param string $methodCode
-+     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    public function execute(
-+        CartInterface $cart,
-+        AddressInterface $quoteAddress,
-+        string $carrierCode,
-+        string $methodCode
-+    ): void {
-+        /** @var ShippingInformationInterface $shippingInformation */
-+        $shippingInformation = $this->shippingInformationFactory->create([
-+            'data' => [
-+                /* If the address is not a shipping address (but billing) the system will find the proper shipping
-+                   address for the selected cart and set the information there (actual for single shipping address) */
-+                ShippingInformationInterface::SHIPPING_ADDRESS => $quoteAddress,
-+                ShippingInformationInterface::SHIPPING_CARRIER_CODE => $carrierCode,
-+                ShippingInformationInterface::SHIPPING_METHOD_CODE => $methodCode,
-+            ],
-+        ]);
-+
-+        try {
-+            $this->shippingInformationManagement->saveAddressInformation($cart->getId(), $shippingInformation);
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/CheckCartCheckoutAllowance.php b/app/code/Magento/QuoteGraphQl/Model/Cart/CheckCartCheckoutAllowance.php
-new file mode 100644
-index 00000000000..fcadc38b0fa
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/CheckCartCheckoutAllowance.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Checkout\Helper\Data as CheckoutHelper;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Quote\Model\Quote;
-+
-+/**
-+ * Checks if guest checkout is allowed.
-+ */
-+class CheckCartCheckoutAllowance
-+{
-+    /**
-+     * @var CheckoutHelper
-+     */
-+    private $checkoutHelper;
-+
-+    /**
-+     * @param CheckoutHelper $checkoutHelper
-+     */
-+    public function __construct(
-+        CheckoutHelper $checkoutHelper
-+    ) {
-+        $this->checkoutHelper = $checkoutHelper;
-+    }
-+
-+    /**
-+     * Check if User is allowed to checkout
-+     *
-+     * @param Quote $quote
-+     * @return void
-+     * @throws GraphQlAuthorizationException
-+     */
-+    public function execute(Quote $quote): void
-+    {
-+        if (false === $quote->getCustomerIsGuest()) {
-+            return;
-+        }
-+
-+        $isAllowedGuestCheckout = (bool)$this->checkoutHelper->isAllowedGuestCheckout($quote);
-+        if (false === $isAllowedGuestCheckout) {
-+            throw new GraphQlAuthorizationException(
-+                __(
-+                    'Guest checkout is not allowed. ' .
-+                    'Register a customer account or login with existing one.'
-+                )
-+            );
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/CreateBuyRequest.php b/app/code/Magento/QuoteGraphQl/Model/Cart/CreateBuyRequest.php
-new file mode 100644
-index 00000000000..b95be8db2dc
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/CreateBuyRequest.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Framework\DataObject;
-+use Magento\Framework\DataObjectFactory;
-+
-+/**
-+ * Creates buy request that can be used for working with cart items
-+ */
-+class CreateBuyRequest
-+{
-+    /**
-+     * @var DataObjectFactory
-+     */
-+    private $dataObjectFactory;
-+
-+    /**
-+     * @param DataObjectFactory $dataObjectFactory
-+     */
-+    public function __construct(
-+        DataObjectFactory $dataObjectFactory
-+    ) {
-+        $this->dataObjectFactory = $dataObjectFactory;
-+    }
-+
-+    /**
-+     * Returns buy request for working with cart items
-+     *
-+     * @param float $qty
-+     * @param array $customizableOptionsData
-+     * @return DataObject
-+     */
-+    public function execute(float $qty, array $customizableOptionsData): DataObject
-+    {
-+        $customizableOptions = [];
-+        foreach ($customizableOptionsData as $customizableOption) {
-+            if (isset($customizableOption['value_string'])) {
-+                $customizableOptions[$customizableOption['id']] = $this->convertCustomOptionValue(
-+                    $customizableOption['value_string']
-+                );
-+            }
-+        }
-+
-+        return $this->dataObjectFactory->create(
-+            [
-+                'data' => [
-+                    'qty' => $qty,
-+                    'options' => $customizableOptions,
-+                ],
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Convert custom options value
-+     *
-+     * @param string $value
-+     * @return string|array
-+     */
-+    private function convertCustomOptionValue(string $value)
-+    {
-+        $value = trim($value);
-+        if (substr($value, 0, 1) === "[" &&
-+            substr($value, strlen($value) - 1, 1) === "]") {
-+            return explode(',', substr($value, 1, -1));
-+        }
-+        return $value;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/CreateEmptyCartForCustomer.php b/app/code/Magento/QuoteGraphQl/Model/Cart/CreateEmptyCartForCustomer.php
-new file mode 100644
-index 00000000000..481bad090da
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/CreateEmptyCartForCustomer.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Quote\Api\CartManagementInterface;
-+use Magento\Quote\Model\QuoteIdMaskFactory;
-+use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResourceModel;
-+
-+/**
-+ * Create empty cart for customer
-+ */
-+class CreateEmptyCartForCustomer
-+{
-+    /**
-+     * @var CartManagementInterface
-+     */
-+    private $cartManagement;
-+
-+    /**
-+     * @var QuoteIdMaskFactory
-+     */
-+    private $quoteIdMaskFactory;
-+
-+    /**
-+     * @var QuoteIdMaskResourceModel
-+     */
-+    private $quoteIdMaskResourceModel;
-+
-+    /**
-+     * @param CartManagementInterface $cartManagement
-+     * @param QuoteIdMaskFactory $quoteIdMaskFactory
-+     * @param QuoteIdMaskResourceModel $quoteIdMaskResourceModel
-+     */
-+    public function __construct(
-+        CartManagementInterface $cartManagement,
-+        QuoteIdMaskFactory $quoteIdMaskFactory,
-+        QuoteIdMaskResourceModel $quoteIdMaskResourceModel
-+    ) {
-+        $this->cartManagement = $cartManagement;
-+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
-+        $this->quoteIdMaskResourceModel = $quoteIdMaskResourceModel;
-+    }
-+
-+    /**
-+     * Create empty cart for customer
-+     *
-+     * @param int $customerId
-+     * @param string|null $predefinedMaskedQuoteId
-+     * @return string
-+     */
-+    public function execute(int $customerId, string $predefinedMaskedQuoteId = null): string
-+    {
-+        $quoteId = $this->cartManagement->createEmptyCartForCustomer($customerId);
-+
-+        $quoteIdMask = $this->quoteIdMaskFactory->create();
-+        $quoteIdMask->setQuoteId($quoteId);
-+
-+        if (isset($predefinedMaskedQuoteId)) {
-+            $quoteIdMask->setMaskedId($predefinedMaskedQuoteId);
-+        }
-+
-+        $this->quoteIdMaskResourceModel->save($quoteIdMask);
-+        return $quoteIdMask->getMaskedId();
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/CreateEmptyCartForGuest.php b/app/code/Magento/QuoteGraphQl/Model/Cart/CreateEmptyCartForGuest.php
-new file mode 100644
-index 00000000000..a6396ed6352
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/CreateEmptyCartForGuest.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Quote\Api\GuestCartManagementInterface;
-+use Magento\Quote\Model\QuoteIdMaskFactory;
-+use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResourceModel;
-+
-+/**
-+ * Create empty cart for guest
-+ */
-+class CreateEmptyCartForGuest
-+{
-+    /**
-+     * @var GuestCartManagementInterface
-+     */
-+    private $guestCartManagement;
-+
-+    /**
-+     * @var QuoteIdMaskFactory
-+     */
-+    private $quoteIdMaskFactory;
-+
-+    /**
-+     * @var QuoteIdMaskResourceModel
-+     */
-+    private $quoteIdMaskResourceModel;
-+
-+    /**
-+     * @param GuestCartManagementInterface $guestCartManagement
-+     * @param QuoteIdMaskFactory $quoteIdMaskFactory
-+     * @param QuoteIdMaskResourceModel $quoteIdMaskResourceModel
-+     */
-+    public function __construct(
-+        GuestCartManagementInterface $guestCartManagement,
-+        QuoteIdMaskFactory $quoteIdMaskFactory,
-+        QuoteIdMaskResourceModel $quoteIdMaskResourceModel
-+    ) {
-+        $this->guestCartManagement = $guestCartManagement;
-+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
-+        $this->quoteIdMaskResourceModel = $quoteIdMaskResourceModel;
-+    }
-+
-+    /**
-+     * Create empty cart for guest
-+     *
-+     * @param string|null $predefinedMaskedQuoteId
-+     * @return string
-+     */
-+    public function execute(string $predefinedMaskedQuoteId = null): string
-+    {
-+        $maskedQuoteId = $this->guestCartManagement->createEmptyCart();
-+
-+        if (isset($predefinedMaskedQuoteId)) {
-+            $quoteIdMask = $this->quoteIdMaskFactory->create();
-+            $this->quoteIdMaskResourceModel->load($quoteIdMask, $maskedQuoteId, 'masked_id');
-+
-+            $quoteIdMask->setMaskedId($predefinedMaskedQuoteId);
-+            $this->quoteIdMaskResourceModel->save($quoteIdMask);
-+        }
-+        return $predefinedMaskedQuoteId ?? $maskedQuoteId;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
-new file mode 100644
-index 00000000000..c4d79529322
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
-@@ -0,0 +1,73 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Customer\Model\Address\AbstractAddress;
-+use Magento\Framework\Api\ExtensibleDataObjectConverter;
-+use Magento\Quote\Api\Data\AddressInterface;
-+use Magento\Quote\Model\Quote\Address as QuoteAddress;
-+
-+/**
-+ * Extract address fields from an Quote Address model
-+ */
-+class ExtractQuoteAddressData
-+{
-+    /**
-+     * @var ExtensibleDataObjectConverter
-+     */
-+    private $dataObjectConverter;
-+
-+    /**
-+     * @param ExtensibleDataObjectConverter $dataObjectConverter
-+     */
-+    public function __construct(ExtensibleDataObjectConverter $dataObjectConverter)
-+    {
-+        $this->dataObjectConverter = $dataObjectConverter;
-+    }
-+
-+    /**
-+     * Converts Address model to flat array
-+     *
-+     * @param QuoteAddress $address
-+     * @return array
-+     */
-+    public function execute(QuoteAddress $address): array
-+    {
-+        $addressData = $this->dataObjectConverter->toFlatArray($address, [], AddressInterface::class);
-+        $addressData['model'] = $address;
-+
-+        $addressData = array_merge($addressData, [
-+            'country' => [
-+                'code' => $address->getCountryId(),
-+                'label' => $address->getCountry()
-+            ],
-+            'region' => [
-+                'code' => $address->getRegionCode(),
-+                'label' => $address->getRegion()
-+            ],
-+            'street' => $address->getStreet(),
-+            'items_weight' => $address->getWeight(),
-+            'customer_notes' => $address->getCustomerNotes()
-+        ]);
-+
-+        if (!$address->hasItems()) {
-+            return $addressData;
-+        }
-+
-+        $addressItemsData = [];
-+        foreach ($address->getAllItems() as $addressItem) {
-+            $addressItemsData[] = [
-+                'cart_item_id' => $addressItem->getQuoteItemId(),
-+                'quantity' => $addressItem->getQty()
-+            ];
-+        }
-+        $addressData['cart_items'] = $addressItemsData;
-+
-+        return $addressData;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
-new file mode 100644
-index 00000000000..9c575502954
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
-@@ -0,0 +1,114 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
-+use Magento\Quote\Model\Quote;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Get cart
-+ */
-+class GetCartForUser
-+{
-+    /**
-+     * @var MaskedQuoteIdToQuoteIdInterface
-+     */
-+    private $maskedQuoteIdToQuoteId;
-+
-+    /**
-+     * @var CartRepositoryInterface
-+     */
-+    private $cartRepository;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
-+     * @param CartRepositoryInterface $cartRepository
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(
-+        MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
-+        CartRepositoryInterface $cartRepository,
-+        StoreManagerInterface $storeManager
-+    ) {
-+        $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
-+        $this->cartRepository = $cartRepository;
-+        $this->storeManager = $storeManager;
-+    }
-+
-+    /**
-+     * Get cart for user
-+     *
-+     * @param string $cartHash
-+     * @param int|null $customerId
-+     * @return Quote
-+     * @throws GraphQlAuthorizationException
-+     * @throws GraphQlNoSuchEntityException
-+     * @throws NoSuchEntityException
-+     */
-+    public function execute(string $cartHash, ?int $customerId): Quote
-+    {
-+        try {
-+            $cartId = $this->maskedQuoteIdToQuoteId->execute($cartHash);
-+        } catch (NoSuchEntityException $exception) {
-+            throw new GraphQlNoSuchEntityException(
-+                __('Could not find a cart with ID "%masked_cart_id"', ['masked_cart_id' => $cartHash])
-+            );
-+        }
-+
-+        try {
-+            /** @var Quote $cart */
-+            $cart = $this->cartRepository->get($cartId);
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(
-+                __('Could not find a cart with ID "%masked_cart_id"', ['masked_cart_id' => $cartHash])
-+            );
-+        }
-+
-+        if (false === (bool)$cart->getIsActive()) {
-+            throw new GraphQlNoSuchEntityException(
-+                __('Current user does not have an active cart.')
-+            );
-+        }
-+
-+        if ((int)$cart->getStoreId() !== (int)$this->storeManager->getStore()->getId()) {
-+            throw new GraphQlNoSuchEntityException(
-+                __(
-+                    'Wrong store code specified for cart "%masked_cart_id"',
-+                    ['masked_cart_id' => $cartHash]
-+                )
-+            );
-+        }
-+
-+        $cartCustomerId = (int)$cart->getCustomerId();
-+
-+        /* Guest cart, allow operations */
-+        if (0 === $cartCustomerId && (null === $customerId || 0 === $customerId)) {
-+            return $cart;
-+        }
-+
-+        if ($cartCustomerId !== $customerId) {
-+            throw new GraphQlAuthorizationException(
-+                __(
-+                    'The current user cannot perform operations on cart "%masked_cart_id"',
-+                    ['masked_cart_id' => $cartHash]
-+                )
-+            );
-+        }
-+        return $cart;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/Payment/AdditionalDataProviderInterface.php b/app/code/Magento/QuoteGraphQl/Model/Cart/Payment/AdditionalDataProviderInterface.php
-new file mode 100644
-index 00000000000..f17898b2b25
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/Payment/AdditionalDataProviderInterface.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart\Payment;
-+
-+/**
-+ * Interface for payment method additional data provider
-+ */
-+interface AdditionalDataProviderInterface
-+{
-+    /**
-+     * Return Additional Data
-+     *
-+     * @param array $data
-+     * @return array
-+     */
-+    public function getData(array $data): array;
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/Payment/AdditionalDataProviderPool.php b/app/code/Magento/QuoteGraphQl/Model/Cart/Payment/AdditionalDataProviderPool.php
-new file mode 100644
-index 00000000000..b3b04a8ab72
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/Payment/AdditionalDataProviderPool.php
-@@ -0,0 +1,44 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart\Payment;
-+
-+/**
-+ * Pool model for AdditionalDataProvider
-+ */
-+class AdditionalDataProviderPool
-+{
-+    /**
-+     * @var AdditionalDataProviderInterface[]
-+     */
-+    private $dataProviders;
-+
-+    /**
-+     * @param array $dataProviders
-+     */
-+    public function __construct(array $dataProviders = [])
-+    {
-+        $this->dataProviders = $dataProviders;
-+    }
-+
-+    /**
-+     * Return additional data for the payment method
-+     *
-+     * @param string $methodCode
-+     * @param array $data
-+     * @return array
-+     */
-+    public function getData(string $methodCode, array $data): array
-+    {
-+        $additionalData = [];
-+        if (isset($this->dataProviders[$methodCode])) {
-+            $additionalData = $this->dataProviders[$methodCode]->getData($data);
-+        }
-+
-+        return $additionalData;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
-new file mode 100644
-index 00000000000..a66c0ddb1a5
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
-@@ -0,0 +1,99 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Customer\Helper\Address as AddressHelper;
-+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Quote\Model\Quote\Address as QuoteAddress;
-+use Magento\Quote\Model\Quote\AddressFactory as BaseQuoteAddressFactory;
-+
-+/**
-+ * Create QuoteAddress
-+ */
-+class QuoteAddressFactory
-+{
-+    /**
-+     * @var BaseQuoteAddressFactory
-+     */
-+    private $quoteAddressFactory;
-+
-+    /**
-+     * @var GetCustomerAddress
-+     */
-+    private $getCustomerAddress;
-+
-+    /**
-+     * @var AddressHelper
-+     */
-+    private $addressHelper;
-+
-+    /**
-+     * @param BaseQuoteAddressFactory $quoteAddressFactory
-+     * @param GetCustomerAddress $getCustomerAddress
-+     * @param AddressHelper $addressHelper
-+     */
-+    public function __construct(
-+        BaseQuoteAddressFactory $quoteAddressFactory,
-+        GetCustomerAddress $getCustomerAddress,
-+        AddressHelper $addressHelper
-+    ) {
-+        $this->quoteAddressFactory = $quoteAddressFactory;
-+        $this->getCustomerAddress = $getCustomerAddress;
-+        $this->addressHelper = $addressHelper;
-+    }
-+
-+    /**
-+     * Create QuoteAddress based on input data
-+     *
-+     * @param array $addressInput
-+     * @return QuoteAddress
-+     * @throws GraphQlInputException
-+     */
-+    public function createBasedOnInputData(array $addressInput): QuoteAddress
-+    {
-+        $addressInput['country_id'] = $addressInput['country_code'] ?? '';
-+
-+        $maxAllowedLineCount = $this->addressHelper->getStreetLines();
-+        if (is_array($addressInput['street']) && count($addressInput['street']) > $maxAllowedLineCount) {
-+            throw new GraphQlInputException(
-+                __('"Street Address" cannot contain more than %1 lines.', $maxAllowedLineCount)
-+            );
-+        }
-+
-+        $quoteAddress = $this->quoteAddressFactory->create();
-+        $quoteAddress->addData($addressInput);
-+        return $quoteAddress;
-+    }
-+
-+    /**
-+     * Create Quote Address based on Customer Address
-+     *
-+     * @param int $customerAddressId
-+     * @param int $customerId
-+     * @return QuoteAddress
-+     * @throws GraphQlAuthorizationException
-+     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    public function createBasedOnCustomerAddress(int $customerAddressId, int $customerId): QuoteAddress
-+    {
-+        $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, $customerId);
-+
-+        $quoteAddress = $this->quoteAddressFactory->create();
-+        try {
-+            $quoteAddress->importCustomerAddressData($customerAddress);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+        return $quoteAddress;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
-new file mode 100644
-index 00000000000..673debefd08
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
-@@ -0,0 +1,116 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+use Magento\Quote\Api\Data\CartInterface;
-+use Magento\Quote\Model\Quote\Address;
-+
-+/**
-+ * Set billing address for a specified shopping cart
-+ */
-+class SetBillingAddressOnCart
-+{
-+    /**
-+     * @var QuoteAddressFactory
-+     */
-+    private $quoteAddressFactory;
-+
-+    /**
-+     * @var AssignBillingAddressToCart
-+     */
-+    private $assignBillingAddressToCart;
-+
-+    /**
-+     * @param QuoteAddressFactory $quoteAddressFactory
-+     * @param AssignBillingAddressToCart $assignBillingAddressToCart
-+     */
-+    public function __construct(
-+        QuoteAddressFactory $quoteAddressFactory,
-+        AssignBillingAddressToCart $assignBillingAddressToCart
-+    ) {
-+        $this->quoteAddressFactory = $quoteAddressFactory;
-+        $this->assignBillingAddressToCart = $assignBillingAddressToCart;
-+    }
-+
-+    /**
-+     * Set billing address for a specified shopping cart
-+     *
-+     * @param ContextInterface $context
-+     * @param CartInterface $cart
-+     * @param array $billingAddressInput
-+     * @return void
-+     * @throws GraphQlAuthorizationException
-+     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    public function execute(ContextInterface $context, CartInterface $cart, array $billingAddressInput): void
-+    {
-+        $customerAddressId = $billingAddressInput['customer_address_id'] ?? null;
-+        $addressInput = $billingAddressInput['address'] ?? null;
-+        $useForShipping = isset($billingAddressInput['use_for_shipping'])
-+            ? (bool)$billingAddressInput['use_for_shipping'] : false;
-+
-+        if (null === $customerAddressId && null === $addressInput) {
-+            throw new GraphQlInputException(
-+                __('The billing address must contain either "customer_address_id" or "address".')
-+            );
-+        }
-+
-+        if ($customerAddressId && $addressInput) {
-+            throw new GraphQlInputException(
-+                __('The billing address cannot contain "customer_address_id" and "address" at the same time.')
-+            );
-+        }
-+
-+        $addresses = $cart->getAllShippingAddresses();
-+        if ($useForShipping && count($addresses) > 1) {
-+            throw new GraphQlInputException(
-+                __('Using the "use_for_shipping" option with multishipping is not possible.')
-+            );
-+        }
-+
-+        $billingAddress = $this->createBillingAddress($context, $customerAddressId, $addressInput);
-+
-+        $this->assignBillingAddressToCart->execute($cart, $billingAddress, $useForShipping);
-+    }
-+
-+    /**
-+     * Create billing address
-+     *
-+     * @param ContextInterface $context
-+     * @param int|null $customerAddressId
-+     * @param array $addressInput
-+     * @return Address
-+     * @throws GraphQlAuthorizationException
-+     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    private function createBillingAddress(
-+        ContextInterface $context,
-+        ?int $customerAddressId,
-+        ?array $addressInput
-+    ): Address {
-+        if (null === $customerAddressId) {
-+            $billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
-+        } else {
-+            if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-+                throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-+            }
-+
-+            $billingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress(
-+                (int)$customerAddressId,
-+                (int)$context->getUserId()
-+            );
-+        }
-+        return $billingAddress;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
-new file mode 100644
-index 00000000000..ceaebf19e0e
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
-@@ -0,0 +1,94 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Quote\Api\Data\PaymentInterface;
-+use Magento\Quote\Api\Data\PaymentInterfaceFactory;
-+use Magento\Quote\Api\PaymentMethodManagementInterface;
-+use Magento\Quote\Model\Quote;
-+use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
-+
-+/**
-+ * Set payment method on cart
-+ */
-+class SetPaymentMethodOnCart
-+{
-+    /**
-+     * @var PaymentMethodManagementInterface
-+     */
-+    private $paymentMethodManagement;
-+
-+    /**
-+     * @var PaymentInterfaceFactory
-+     */
-+    private $paymentFactory;
-+
-+    /**
-+     * @var AdditionalDataProviderPool
-+     */
-+    private $additionalDataProviderPool;
-+
-+    /**
-+     * @param PaymentMethodManagementInterface $paymentMethodManagement
-+     * @param PaymentInterfaceFactory $paymentFactory
-+     * @param AdditionalDataProviderPool $additionalDataProviderPool
-+     */
-+    public function __construct(
-+        PaymentMethodManagementInterface $paymentMethodManagement,
-+        PaymentInterfaceFactory $paymentFactory,
-+        AdditionalDataProviderPool $additionalDataProviderPool
-+    ) {
-+        $this->paymentMethodManagement = $paymentMethodManagement;
-+        $this->paymentFactory = $paymentFactory;
-+        $this->additionalDataProviderPool = $additionalDataProviderPool;
-+    }
-+
-+    /**
-+     * Set payment method on cart
-+     *
-+     * @param Quote $cart
-+     * @param array $paymentData
-+     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    public function execute(Quote $cart, array $paymentData): void
-+    {
-+        if (!isset($paymentData['code']) || empty($paymentData['code'])) {
-+            throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));
-+        }
-+        $paymentMethodCode = $paymentData['code'];
-+
-+        $poNumber = $paymentData['purchase_order_number'] ?? null;
-+        $additionalData = isset($paymentData['additional_data'])
-+            ? $this->additionalDataProviderPool->getData($paymentMethodCode, $paymentData['additional_data'])
-+            : [];
-+
-+        $payment = $this->paymentFactory->create(
-+            [
-+                'data' =>
-+                    [
-+                        PaymentInterface::KEY_METHOD => $paymentMethodCode,
-+                        PaymentInterface::KEY_PO_NUMBER => $poNumber,
-+                        PaymentInterface::KEY_ADDITIONAL_DATA => $additionalData,
-+                    ],
-+            ]
-+        );
-+
-+        try {
-+            $this->paymentMethodManagement->set($cart->getId(), $payment);
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
-new file mode 100644
-index 00000000000..de1d93003ab
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
-@@ -0,0 +1,84 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+use Magento\Quote\Api\Data\CartInterface;
-+
-+/**
-+ * Set single shipping address for a specified shopping cart
-+ */
-+class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
-+{
-+    /**
-+     * @var QuoteAddressFactory
-+     */
-+    private $quoteAddressFactory;
-+
-+    /**
-+     * @var AssignShippingAddressToCart
-+     */
-+    private $assignShippingAddressToCart;
-+
-+    /**
-+     * @param QuoteAddressFactory $quoteAddressFactory
-+     * @param AssignShippingAddressToCart $assignShippingAddressToCart
-+     */
-+    public function __construct(
-+        QuoteAddressFactory $quoteAddressFactory,
-+        AssignShippingAddressToCart $assignShippingAddressToCart
-+    ) {
-+        $this->quoteAddressFactory = $quoteAddressFactory;
-+        $this->assignShippingAddressToCart = $assignShippingAddressToCart;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute(ContextInterface $context, CartInterface $cart, array $shippingAddressesInput): void
-+    {
-+        if (count($shippingAddressesInput) > 1) {
-+            throw new GraphQlInputException(
-+                __('You cannot specify multiple shipping addresses.')
-+            );
-+        }
-+        $shippingAddressInput = current($shippingAddressesInput);
-+        $customerAddressId = $shippingAddressInput['customer_address_id'] ?? null;
-+        $addressInput = $shippingAddressInput['address'] ?? null;
-+
-+        if (null === $customerAddressId && null === $addressInput) {
-+            throw new GraphQlInputException(
-+                __('The shipping address must contain either "customer_address_id" or "address".')
-+            );
-+        }
-+
-+        if ($customerAddressId && $addressInput) {
-+            throw new GraphQlInputException(
-+                __('The shipping address cannot contain "customer_address_id" and "address" at the same time.')
-+            );
-+        }
-+
-+        if (null === $customerAddressId) {
-+            $addressInput['country_code'] = strtoupper($addressInput['country_code']);
-+            $shippingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
-+        } else {
-+            if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-+                throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-+            }
-+
-+            $shippingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress(
-+                (int)$customerAddressId,
-+                $context->getUserId()
-+            );
-+        }
-+
-+        $this->assignShippingAddressToCart->execute($cart, $shippingAddress);
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php
-new file mode 100644
-index 00000000000..1244023b893
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php
-@@ -0,0 +1,36 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+use Magento\Quote\Api\Data\CartInterface;
-+
-+/**
-+ * Extension point for setting shipping addresses for a specified shopping cart
-+ *
-+ * All objects that are responsible for setting shipping addresses on a cart via GraphQl
-+ * should implement this interface.
-+ */
-+interface SetShippingAddressesOnCartInterface
-+{
-+    /**
-+     * Set shipping addresses for a specified shopping cart
-+     *
-+     * @param ContextInterface $context
-+     * @param CartInterface $cart
-+     * @param array $shippingAddressesInput
-+     * @return void
-+     * @throws GraphQlInputException
-+     * @throws GraphQlAuthorizationException
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    public function execute(ContextInterface $context, CartInterface $cart, array $shippingAddressesInput): void;
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
-new file mode 100644
-index 00000000000..b2526bdc04e
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
-@@ -0,0 +1,58 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
-+use Magento\Quote\Api\Data\CartInterface;
-+
-+/**
-+ * Set single shipping method for a specified shopping cart
-+ */
-+class SetShippingMethodsOnCart implements SetShippingMethodsOnCartInterface
-+{
-+    /**
-+     * @var AssignShippingMethodToCart
-+     */
-+    private $assignShippingMethodToCart;
-+
-+    /**
-+     * @param AssignShippingMethodToCart $assignShippingMethodToCart
-+     */
-+    public function __construct(
-+        AssignShippingMethodToCart $assignShippingMethodToCart
-+    ) {
-+        $this->assignShippingMethodToCart = $assignShippingMethodToCart;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function execute(ContextInterface $context, CartInterface $cart, array $shippingMethodsInput): void
-+    {
-+        if (count($shippingMethodsInput) > 1) {
-+            throw new GraphQlInputException(
-+                __('You cannot specify multiple shipping methods.')
-+            );
-+        }
-+        $shippingMethodInput = current($shippingMethodsInput);
-+
-+        if (!isset($shippingMethodInput['carrier_code']) || empty($shippingMethodInput['carrier_code'])) {
-+            throw new GraphQlInputException(__('Required parameter "carrier_code" is missing.'));
-+        }
-+        $carrierCode = $shippingMethodInput['carrier_code'];
-+
-+        if (!isset($shippingMethodInput['method_code']) || empty($shippingMethodInput['method_code'])) {
-+            throw new GraphQlInputException(__('Required parameter "method_code" is missing.'));
-+        }
-+        $methodCode = $shippingMethodInput['method_code'];
-+
-+        $shippingAddress = $cart->getShippingAddress();
-+        $this->assignShippingMethodToCart->execute($cart, $shippingAddress, $carrierCode, $methodCode);
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCartInterface.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCartInterface.php
-new file mode 100644
-index 00000000000..fa6c6cf0923
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCartInterface.php
-@@ -0,0 +1,38 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
-+use Magento\Quote\Api\Data\CartInterface;
-+
-+/**
-+ * Extension point for setting shipping methods for a specified shopping cart
-+ *
-+ * All objects that are responsible for setting shipping methods on a cart via GraphQl
-+ * should implement this interface.
-+ */
-+interface SetShippingMethodsOnCartInterface
-+{
-+    /**
-+     * Set shipping methods for a specified shopping cart
-+     *
-+     * @param ContextInterface $context
-+     * @param CartInterface $cart
-+     * @param array $shippingMethodsInput
-+     * @return void
-+     * @throws GraphQlInputException
-+     * @throws GraphQlAuthorizationException
-+     * @throws GraphQlAuthenticationException
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    public function execute(ContextInterface $context, CartInterface $cart, array $shippingMethodsInput): void;
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/UpdateCartItem.php b/app/code/Magento/QuoteGraphQl/Model/Cart/UpdateCartItem.php
-new file mode 100644
-index 00000000000..b18c6ad6623
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/UpdateCartItem.php
-@@ -0,0 +1,147 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Cart;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Quote\Api\CartItemRepositoryInterface;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\Quote;
-+use Magento\Quote\Model\Quote\Item;
-+
-+/**
-+ * Update cart item
-+ */
-+class UpdateCartItem
-+{
-+    /**
-+     * @var CreateBuyRequest
-+     */
-+    private $createBuyRequest;
-+
-+    /**
-+     * @var CartRepositoryInterface
-+     */
-+    private $quoteRepository;
-+
-+    /**
-+     * @var CartItemRepositoryInterface
-+     */
-+    private $cartItemRepository;
-+
-+    /**
-+     * @param CartItemRepositoryInterface $cartItemRepository
-+     * @param CartRepositoryInterface $quoteRepository
-+     * @param CreateBuyRequest $createBuyRequest
-+     */
-+    public function __construct(
-+        CartItemRepositoryInterface $cartItemRepository,
-+        CartRepositoryInterface $quoteRepository,
-+        CreateBuyRequest $createBuyRequest
-+    ) {
-+        $this->cartItemRepository = $cartItemRepository;
-+        $this->quoteRepository = $quoteRepository;
-+        $this->createBuyRequest = $createBuyRequest;
-+    }
-+
-+    /**
-+     * Update cart item
-+     *
-+     * @param Quote $cart
-+     * @param int $cartItemId
-+     * @param float $quantity
-+     * @param array $customizableOptionsData
-+     * @return void
-+     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-+     * @throws NoSuchEntityException
-+     */
-+    public function execute(Quote $cart, int $cartItemId, float $quantity, array $customizableOptionsData): void
-+    {
-+        if (count($customizableOptionsData) === 0) { // Update only item's qty
-+            $this->updateItemQuantity($cartItemId, $cart, $quantity);
-+
-+            return;
-+        }
-+
-+        try {
-+            $result = $cart->updateItem(
-+                $cartItemId,
-+                $this->createBuyRequest->execute($quantity, $customizableOptionsData)
-+            );
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(
-+                __(
-+                    'Could not update cart item: %message',
-+                    ['message' => $e->getMessage()]
-+                )
-+            );
-+        }
-+
-+        if ($result->getHasError()) {
-+            throw new GraphQlInputException(
-+                __(
-+                    'Could not update cart item: %message',
-+                    ['message' => $result->getMessage()]
-+                )
-+            );
-+        }
-+
-+        $this->quoteRepository->save($cart);
-+    }
-+
-+    /**
-+     * Updates item qty for the specified cart
-+     *
-+     * @param int $itemId
-+     * @param Quote $cart
-+     * @param float $quantity
-+     * @throws GraphQlNoSuchEntityException
-+     * @throws NoSuchEntityException
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    private function updateItemQuantity(int $itemId, Quote $cart, float $quantity)
-+    {
-+        $cartItem = $cart->getItemById($itemId);
-+        if ($cartItem === false) {
-+            throw new GraphQlNoSuchEntityException(
-+                __('Could not find cart item with id: %1.', $itemId)
-+            );
-+        }
-+        $cartItem->setQty($quantity);
-+        $this->validateCartItem($cartItem);
-+        $this->cartItemRepository->save($cartItem);
-+    }
-+
-+    /**
-+     * Validate cart item
-+     *
-+     * @param Item $cartItem
-+     * @return void
-+     * @throws GraphQlInputException
-+     */
-+    private function validateCartItem(Item $cartItem): void
-+    {
-+        if ($cartItem->getHasError()) {
-+            $errors = [];
-+            foreach ($cartItem->getMessage(false) as $message) {
-+                $errors[] = $message;
-+            }
-+            if (!empty($errors)) {
-+                throw new GraphQlInputException(
-+                    __(
-+                        'Could not update the product with SKU %sku: %message',
-+                        ['sku' => $cartItem->getSku(), 'message' => __(implode("\n", $errors))]
-+                    )
-+                );
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOption.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOption.php
-new file mode 100644
-index 00000000000..3199668060e
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOption.php
-@@ -0,0 +1,66 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Quote\Model\Quote\Item as QuoteItem;
-+
-+/**
-+ * Custom Option Data provider
-+ */
-+class CustomizableOption
-+{
-+    /**
-+     * @var CustomizableOptionValueInterface
-+     */
-+    private $customizableOptionValue;
-+
-+    /**
-+     * @param CustomizableOptionValueInterface $customOptionValueDataProvider
-+     */
-+    public function __construct(
-+        CustomizableOptionValueInterface $customOptionValueDataProvider
-+    ) {
-+        $this->customizableOptionValue = $customOptionValueDataProvider;
-+    }
-+
-+    /**
-+     * Retrieve custom option data
-+     *
-+     * @param QuoteItem $cartItem
-+     * @param int $optionId
-+     * @return array
-+     * @throws LocalizedException
-+     */
-+    public function getData(QuoteItem $cartItem, int $optionId): array
-+    {
-+        $product = $cartItem->getProduct();
-+        $option = $product->getOptionById($optionId);
-+
-+        if (!$option) {
-+            return [];
-+        }
-+
-+        $selectedOption = $cartItem->getOptionByCode('option_' . $option->getId());
-+
-+        $selectedOptionValueData = $this->customizableOptionValue->getData(
-+            $cartItem,
-+            $option,
-+            $selectedOption
-+        );
-+
-+        return [
-+            'id' => $option->getId(),
-+            'label' => $option->getTitle(),
-+            'type' => $option->getType(),
-+            'values' => $selectedOptionValueData,
-+            'sort_order' => $option->getSortOrder(),
-+            'is_required' => $option->getIsRequire(),
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Composite.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Composite.php
-new file mode 100644
-index 00000000000..52978451253
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Composite.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue;
-+
-+use Magento\Catalog\Model\Product\Option;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Quote\Model\Quote\Item as QuoteItem;
-+use Magento\Quote\Model\Quote\Item\Option as SelectedOption;
-+use Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValueInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class Composite implements CustomizableOptionValueInterface
-+{
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var CustomizableOptionValueInterface[]
-+     */
-+    private $customizableOptionValues;
-+
-+    /**
-+     * @param ObjectManagerInterface $objectManager
-+     * @param CustomizableOptionValueInterface[] $customizableOptionValues
-+     */
-+    public function __construct(
-+        ObjectManagerInterface $objectManager,
-+        array $customizableOptionValues = []
-+    ) {
-+        $this->objectManager = $objectManager;
-+        $this->customizableOptionValues = $customizableOptionValues;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getData(
-+        QuoteItem $cartItem,
-+        Option $option,
-+        SelectedOption $selectedOption
-+    ): array {
-+        $optionType = $option->getType();
-+
-+        if (!array_key_exists($optionType, $this->customizableOptionValues)) {
-+            throw new GraphQlInputException(__('Option type "%1" is not supported', $optionType));
-+        }
-+        $customizableOptionValueClassName = $this->customizableOptionValues[$optionType];
-+
-+        $customizableOptionValue = $this->objectManager->get($customizableOptionValueClassName);
-+        if (!$customizableOptionValue instanceof CustomizableOptionValueInterface) {
-+            throw new LocalizedException(
-+                __('%1 doesn\'t implement CustomizableOptionValueInterface', $customizableOptionValueClassName)
-+            );
-+        }
-+        return $customizableOptionValue->getData($cartItem, $option, $selectedOption);
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Dropdown.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Dropdown.php
-new file mode 100644
-index 00000000000..74ed4034650
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Dropdown.php
-@@ -0,0 +1,65 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue;
-+
-+use Magento\Catalog\Model\Product\Option;
-+use Magento\Catalog\Model\Product\Option\Type\Select as SelectOptionType;
-+use Magento\Quote\Model\Quote\Item as QuoteItem;
-+use Magento\Quote\Model\Quote\Item\Option as SelectedOption;
-+use Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValueInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class Dropdown implements CustomizableOptionValueInterface
-+{
-+    /**
-+     * @var PriceUnitLabel
-+     */
-+    private $priceUnitLabel;
-+
-+    /**
-+     * @param PriceUnitLabel $priceUnitLabel
-+     */
-+    public function __construct(
-+        PriceUnitLabel $priceUnitLabel
-+    ) {
-+        $this->priceUnitLabel = $priceUnitLabel;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getData(
-+        QuoteItem $cartItem,
-+        Option $option,
-+        SelectedOption $selectedOption
-+    ): array {
-+        /** @var SelectOptionType $optionTypeRenderer */
-+        $optionTypeRenderer = $option->groupFactory($option->getType())
-+            ->setOption($option)
-+            ->setConfigurationItemOption($selectedOption);
-+
-+        $selectedValue = $selectedOption->getValue();
-+        $optionValue = $option->getValueById($selectedValue);
-+        $optionPriceType = (string)$optionValue->getPriceType();
-+        $priceValueUnits = $this->priceUnitLabel->getData($optionPriceType);
-+
-+        $selectedOptionValueData = [
-+            'id' => $selectedOption->getId(),
-+            'label' => $optionTypeRenderer->getFormattedOptionValue($selectedValue),
-+            'value' => $selectedValue,
-+            'price' => [
-+                'type' => strtoupper($optionPriceType),
-+                'units' => $priceValueUnits,
-+                'value' => $optionValue->getPrice(),
-+            ]
-+        ];
-+        return [$selectedOptionValueData];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Multiple.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Multiple.php
-new file mode 100644
-index 00000000000..619e84568a5
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Multiple.php
-@@ -0,0 +1,67 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue;
-+
-+use Magento\Catalog\Model\Product\Option;
-+use Magento\Catalog\Model\Product\Option\Type\DefaultType;
-+use Magento\Quote\Model\Quote\Item as QuoteItem;
-+use Magento\Quote\Model\Quote\Item\Option as SelectedOption;
-+use Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValueInterface;
-+
-+/**
-+ * Multiple Option Value Data provider
-+ */
-+class Multiple implements CustomizableOptionValueInterface
-+{
-+    /**
-+     * @var PriceUnitLabel
-+     */
-+    private $priceUnitLabel;
-+
-+    /**
-+     * @param PriceUnitLabel $priceUnitLabel
-+     */
-+    public function __construct(
-+        PriceUnitLabel $priceUnitLabel
-+    ) {
-+        $this->priceUnitLabel = $priceUnitLabel;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getData(
-+        QuoteItem $cartItem,
-+        Option $option,
-+        SelectedOption $selectedOption
-+    ): array {
-+        $selectedOptionValueData = [];
-+        $optionIds = explode(',', $selectedOption->getValue());
-+
-+        if (0 === count($optionIds)) {
-+            return $selectedOptionValueData;
-+        }
-+
-+        foreach ($optionIds as $optionId) {
-+            $optionValue = $option->getValueById($optionId);
-+            $priceValueUnits = $this->priceUnitLabel->getData($optionValue->getPriceType());
-+
-+            $selectedOptionValueData[] = [
-+                'id' => $selectedOption->getId(),
-+                'label' => $optionValue->getTitle(),
-+                'price' => [
-+                    'type' => strtoupper($optionValue->getPriceType()),
-+                    'units' => $priceValueUnits,
-+                    'value' => $optionValue->getPrice(),
-+                ],
-+            ];
-+        }
-+
-+        return $selectedOptionValueData;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/PriceUnitLabel.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/PriceUnitLabel.php
-new file mode 100644
-index 00000000000..bee2e54ed5f
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/PriceUnitLabel.php
-@@ -0,0 +1,63 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue;
-+
-+use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Store\Model\Store;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Custom Option Data provider
-+ */
-+class PriceUnitLabel
-+{
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(
-+        StoreManagerInterface $storeManager
-+    ) {
-+        $this->storeManager = $storeManager;
-+    }
-+
-+    /**
-+     * Retrieve price value unit
-+     *
-+     * @param string $priceType
-+     * @return string
-+     */
-+    public function getData(string $priceType): string
-+    {
-+        if (ProductPriceOptionsInterface::VALUE_PERCENT == $priceType) {
-+            return '%';
-+        }
-+
-+        return $this->getCurrencySymbol();
-+    }
-+
-+    /**
-+     * Get currency symbol
-+     *
-+     * @return string
-+     * @throws NoSuchEntityException
-+     */
-+    private function getCurrencySymbol(): string
-+    {
-+        /** @var Store|StoreInterface $store */
-+        $store = $this->storeManager->getStore();
-+
-+        return $store->getBaseCurrency()->getCurrencySymbol();
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Text.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Text.php
-new file mode 100644
-index 00000000000..96f11badac8
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Text.php
-@@ -0,0 +1,60 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue;
-+
-+use Magento\Catalog\Model\Product\Option;
-+use Magento\Catalog\Model\Product\Option\Type\Text as TextOptionType;
-+use Magento\Quote\Model\Quote\Item as QuoteItem;
-+use Magento\Quote\Model\Quote\Item\Option as SelectedOption;
-+use Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValueInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class Text implements CustomizableOptionValueInterface
-+{
-+    /**
-+     * @var PriceUnitLabel
-+     */
-+    private $priceUnitLabel;
-+
-+    /**
-+     * @param PriceUnitLabel $priceUnitLabel
-+     */
-+    public function __construct(
-+        PriceUnitLabel $priceUnitLabel
-+    ) {
-+        $this->priceUnitLabel = $priceUnitLabel;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getData(
-+        QuoteItem $cartItem,
-+        Option $option,
-+        SelectedOption $selectedOption
-+    ): array {
-+        /** @var TextOptionType $optionTypeRenderer */
-+        $optionTypeRenderer = $option->groupFactory($option->getType());
-+        $optionTypeRenderer->setOption($option);
-+        $priceValueUnits = $this->priceUnitLabel->getData($option->getPriceType());
-+
-+        $selectedOptionValueData = [
-+            'id' => $selectedOption->getId(),
-+            'label' => '',
-+            'value' => $optionTypeRenderer->getFormattedOptionValue($selectedOption->getValue()),
-+            'price' => [
-+                'type' => strtoupper($option->getPriceType()),
-+                'units' => $priceValueUnits,
-+                'value' => $option->getPrice(),
-+            ],
-+        ];
-+        return [$selectedOptionValueData];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValueInterface.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValueInterface.php
-new file mode 100644
-index 00000000000..fce8b80f6d4
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValueInterface.php
-@@ -0,0 +1,32 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider;
-+
-+use Magento\Catalog\Model\Product\Option;
-+use Magento\Quote\Model\Quote\Item as QuoteItem;
-+use Magento\Quote\Model\Quote\Item\Option as SelectedOption;
-+
-+/**
-+ * Customizable Option Value Data provider
-+ */
-+interface CustomizableOptionValueInterface
-+{
-+    /**
-+     * Customizable Option Value Data Provider
-+     *
-+     * @param QuoteItem $cartItem
-+     * @param Option $option
-+     * @param SelectedOption $selectedOption
-+     * @return array
-+     */
-+    public function getData(
-+        QuoteItem $cartItem,
-+        Option $option,
-+        SelectedOption $selectedOption
-+    ): array;
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php
-new file mode 100644
-index 00000000000..9876938c08b
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php
-@@ -0,0 +1,71 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\QuoteGraphQl\Model\Cart\AddProductsToCart;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+
-+/**
-+ * Add simple products to cart GraphQl resolver
-+ * {@inheritdoc}
-+ */
-+class AddSimpleProductsToCart implements ResolverInterface
-+{
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var AddProductsToCart
-+     */
-+    private $addProductsToCart;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param AddProductsToCart $addProductsToCart
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        AddProductsToCart $addProductsToCart
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->addProductsToCart = $addProductsToCart;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (empty($args['input']['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
-+        }
-+        $maskedCartId = $args['input']['cart_id'];
-+
-+        if (empty($args['input']['cart_items'])
-+            || !is_array($args['input']['cart_items'])
-+        ) {
-+            throw new GraphQlInputException(__('Required parameter "cart_items" is missing'));
-+        }
-+        $cartItems = $args['input']['cart_items'];
-+
-+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
-+        $this->addProductsToCart->execute($cart, $cartItems);
-+
-+        return [
-+            'cart' => [
-+                'model' => $cart,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php
-new file mode 100644
-index 00000000000..8251089abcd
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Api\CouponManagementInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class AppliedCoupon implements ResolverInterface
-+{
-+    /**
-+     * @var CouponManagementInterface
-+     */
-+    private $couponManagement;
-+
-+    /**
-+     * @param CouponManagementInterface $couponManagement
-+     */
-+    public function __construct(
-+        CouponManagementInterface $couponManagement
-+    ) {
-+        $this->couponManagement = $couponManagement;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+        $cart = $value['model'];
-+        $cartId = $cart->getId();
-+
-+        $appliedCoupon = $this->couponManagement->get($cartId);
-+        return $appliedCoupon ? ['code' => $appliedCoupon] : null;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
-new file mode 100644
-index 00000000000..84d2183eeac
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
-@@ -0,0 +1,93 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\CouldNotSaveException;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Api\CouponManagementInterface;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class ApplyCouponToCart implements ResolverInterface
-+{
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var CouponManagementInterface
-+     */
-+    private $couponManagement;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param CouponManagementInterface $couponManagement
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        CouponManagementInterface $couponManagement
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->couponManagement = $couponManagement;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (empty($args['input']['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
-+        }
-+        $maskedCartId = $args['input']['cart_id'];
-+
-+        if (empty($args['input']['coupon_code'])) {
-+            throw new GraphQlInputException(__('Required parameter "coupon_code" is missing'));
-+        }
-+        $couponCode = $args['input']['coupon_code'];
-+
-+        $currentUserId = $context->getUserId();
-+        $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
-+        $cartId = $cart->getId();
-+
-+        /* Check current cart does not have coupon code applied */
-+        $appliedCouponCode = $this->couponManagement->get($cartId);
-+        if (!empty($appliedCouponCode)) {
-+            throw new GraphQlInputException(
-+                __('A coupon is already applied to the cart. Please remove it to apply another')
-+            );
-+        }
-+
-+        try {
-+            $this->couponManagement->set($cartId, $couponCode);
-+        } catch (NoSuchEntityException $e) {
-+            $message = $e->getMessage();
-+            if (preg_match('/The "\d+" Cart doesn\'t contain products/', $message)) {
-+                $message = 'Cart does not contain products.';
-+            }
-+            throw new GraphQlNoSuchEntityException(__($message), $e);
-+        } catch (CouldNotSaveException $e) {
-+            throw new LocalizedException(__($e->getMessage()), $e);
-+        }
-+
-+        return [
-+            'cart' => [
-+                'model' => $cart,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AvailablePaymentMethods.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AvailablePaymentMethods.php
-new file mode 100644
-index 00000000000..907d7785505
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AvailablePaymentMethods.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Checkout\Api\PaymentInformationManagementInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Api\Data\CartInterface;
-+
-+/**
-+ * Get list of active payment methods resolver.
-+ */
-+class AvailablePaymentMethods implements ResolverInterface
-+{
-+    /**
-+     * @var PaymentInformationManagementInterface
-+     */
-+    private $informationManagement;
-+
-+    /**
-+     * @param PaymentInformationManagementInterface $informationManagement
-+     */
-+    public function __construct(PaymentInformationManagementInterface $informationManagement)
-+    {
-+        $this->informationManagement = $informationManagement;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+
-+        $cart = $value['model'];
-+        return $this->getPaymentMethodsData($cart);
-+    }
-+
-+    /**
-+     * Collect and return information about available payment methods
-+     *
-+     * @param CartInterface $cart
-+     * @return array
-+     */
-+    private function getPaymentMethodsData(CartInterface $cart): array
-+    {
-+        $paymentInformation = $this->informationManagement->getPaymentInformation($cart->getId());
-+        $paymentMethods = $paymentInformation->getPaymentMethods();
-+
-+        $paymentMethodsData = [];
-+        foreach ($paymentMethods as $paymentMethod) {
-+            $paymentMethodsData[] = [
-+                'title' => $paymentMethod->getTitle(),
-+                'code' => $paymentMethod->getCode(),
-+            ];
-+        }
-+        return $paymentMethodsData;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
-new file mode 100644
-index 00000000000..a6bb0b0d04d
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Api\Data\CartInterface;
-+use Magento\QuoteGraphQl\Model\Cart\ExtractQuoteAddressData;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class BillingAddress implements ResolverInterface
-+{
-+    /**
-+     * @var ExtractQuoteAddressData
-+     */
-+    private $extractQuoteAddressData;
-+
-+    /**
-+     * @param ExtractQuoteAddressData $extractQuoteAddressData
-+     */
-+    public function __construct(ExtractQuoteAddressData $extractQuoteAddressData)
-+    {
-+        $this->extractQuoteAddressData = $extractQuoteAddressData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+        /** @var CartInterface $cart */
-+        $cart = $value['model'];
-+
-+        $billingAddress = $cart->getBillingAddress();
-+        if (null === $billingAddress) {
-+            return null;
-+        }
-+
-+        $addressData = $this->extractQuoteAddressData->execute($billingAddress);
-+        return $addressData;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php
-new file mode 100644
-index 00000000000..16fd639685b
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class Cart implements ResolverInterface
-+{
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (empty($args['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
-+        }
-+        $maskedCartId = $args['cart_id'];
-+
-+        $currentUserId = $context->getUserId();
-+        $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
-+
-+        return [
-+            'model' => $cart,
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartAddressTypeResolver.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartAddressTypeResolver.php
-new file mode 100644
-index 00000000000..6f7c70b09cb
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartAddressTypeResolver.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Customer\Model\Address\AbstractAddress;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
-+use Magento\Quote\Model\Quote\Address;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class CartAddressTypeResolver implements TypeResolverInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolveType(array $data): string
-+    {
-+        if (!isset($data['model'])) {
-+            throw new LocalizedException(__('Missing key "model" in cart address data'));
-+        }
-+        /** @var Address $address */
-+        $address = $data['model'];
-+
-+        if ($address->getAddressType() == AbstractAddress::TYPE_SHIPPING) {
-+            $addressType = 'ShippingCartAddress';
-+        } elseif ($address->getAddressType() == AbstractAddress::TYPE_BILLING) {
-+            $addressType = 'BillingCartAddress';
-+        } else {
-+            throw new LocalizedException(__('Unsupported cart address type'));
-+        }
-+        return $addressType;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartEmail.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartEmail.php
-new file mode 100644
-index 00000000000..8d0cb114d83
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartEmail.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Model\Quote;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class CartEmail implements ResolverInterface
-+{
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+        /** @var Quote $cart */
-+        $cart = $value['model'];
-+
-+        return $cart->getCustomerEmail();
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemTypeResolver.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemTypeResolver.php
-new file mode 100644
-index 00000000000..962463860a5
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemTypeResolver.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class CartItemTypeResolver implements TypeResolverInterface
-+{
-+    /**
-+     * @var array
-+     */
-+    private $supportedTypes = [];
-+
-+    /**
-+     * @param array $supportedTypes
-+     */
-+    public function __construct(array $supportedTypes = [])
-+    {
-+        $this->supportedTypes = $supportedTypes;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolveType(array $data) : string
-+    {
-+        if (!isset($data['product'])) {
-+            throw new LocalizedException(__('Missing key "product" in cart data'));
-+        }
-+        $productData = $data['product'];
-+
-+        if (!isset($productData['type_id'])) {
-+            throw new LocalizedException(__('Missing key "type_id" in product data'));
-+        }
-+        $productTypeId = $productData['type_id'];
-+
-+        if (!isset($this->supportedTypes[$productTypeId])) {
-+            throw new LocalizedException(
-+                __('Product "%product_type" type is not supported', ['product_type' => $productTypeId])
-+            );
-+        }
-+        return $this->supportedTypes[$productTypeId];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItems.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItems.php
-new file mode 100644
-index 00000000000..f259dcd4a78
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItems.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Model\Quote\Item as QuoteItem;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class CartItems implements ResolverInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+        $cart = $value['model'];
-+
-+        $itemsData = [];
-+        foreach ($cart->getAllItems() as $cartItem) {
-+            /**
-+             * @var QuoteItem $cartItem
-+             */
-+            $productData = $cartItem->getProduct()->getData();
-+            $productData['model'] = $cartItem->getProduct();
-+
-+            $itemsData[] = [
-+                'id' => $cartItem->getItemId(),
-+                'quantity' => $cartItem->getQty(),
-+                'product' => $productData,
-+                'model' => $cartItem,
-+            ];
-+        }
-+        return $itemsData;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
-new file mode 100644
-index 00000000000..48711ec38c4
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
-@@ -0,0 +1,106 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Model\Quote;
-+use Magento\Quote\Model\Quote\Address\Total;
-+use Magento\Quote\Model\Quote\TotalsCollector;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class CartPrices implements ResolverInterface
-+{
-+    /**
-+     * @var TotalsCollector
-+     */
-+    private $totalsCollector;
-+
-+    /**
-+     * @param TotalsCollector $totalsCollector
-+     */
-+    public function __construct(
-+        TotalsCollector $totalsCollector
-+    ) {
-+        $this->totalsCollector = $totalsCollector;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+
-+        /** @var Quote $quote */
-+        $quote = $value['model'];
-+        $cartTotals = $this->totalsCollector->collectQuoteTotals($quote);
-+        $currency = $quote->getQuoteCurrencyCode();
-+
-+        return [
-+            'grand_total' => ['value' => $cartTotals->getGrandTotal(), 'currency' => $currency],
-+            'subtotal_including_tax' => ['value' => $cartTotals->getSubtotalInclTax(), 'currency' => $currency],
-+            'subtotal_excluding_tax' => ['value' => $cartTotals->getSubtotal(), 'currency' => $currency],
-+            'subtotal_with_discount_excluding_tax' => [
-+                'value' => $cartTotals->getSubtotalWithDiscount(), 'currency' => $currency
-+            ],
-+            'applied_taxes' => $this->getAppliedTaxes($cartTotals, $currency),
-+            'discount' => $this->getDiscount($cartTotals, $currency),
-+            'model' => $quote
-+        ];
-+    }
-+
-+    /**
-+     * Returns taxes applied to the current quote
-+     *
-+     * @param Total $total
-+     * @param string $currency
-+     * @return array
-+     */
-+    private function getAppliedTaxes(Total $total, string $currency): array
-+    {
-+        $appliedTaxesData = [];
-+        $appliedTaxes = $total->getAppliedTaxes();
-+
-+        if (count($appliedTaxes) === 0) {
-+            return $appliedTaxesData;
-+        }
-+
-+        foreach ($appliedTaxes as $appliedTax) {
-+            $appliedTaxesData[] = [
-+                'label' => $appliedTax['id'],
-+                'amount' => ['value' => $appliedTax['amount'], 'currency' => $currency]
-+            ];
-+        }
-+        return $appliedTaxesData;
-+    }
-+
-+    /**
-+     * Returns information about an applied discount
-+     *
-+     * @param Total $total
-+     * @param string $currency
-+     * @return array|null
-+     */
-+    private function getDiscount(Total $total, string $currency)
-+    {
-+        if ($total->getDiscountAmount() === 0) {
-+            return null;
-+        }
-+        return [
-+            'label' => explode(', ', $total->getDiscountDescription()),
-+            'amount' => ['value' => $total->getDiscountAmount(), 'currency' => $currency]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CreateEmptyCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CreateEmptyCart.php
-new file mode 100644
-index 00000000000..f020527d958
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CreateEmptyCart.php
-@@ -0,0 +1,107 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlAlreadyExistsException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
-+use Magento\QuoteGraphQl\Model\Cart\CreateEmptyCartForCustomer;
-+use Magento\QuoteGraphQl\Model\Cart\CreateEmptyCartForGuest;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class CreateEmptyCart implements ResolverInterface
-+{
-+    /**
-+     * @var CreateEmptyCartForCustomer
-+     */
-+    private $createEmptyCartForCustomer;
-+
-+    /**
-+     * @var CreateEmptyCartForGuest
-+     */
-+    private $createEmptyCartForGuest;
-+
-+    /**
-+     * @var MaskedQuoteIdToQuoteIdInterface
-+     */
-+    private $maskedQuoteIdToQuoteId;
-+
-+    /**
-+     * @param CreateEmptyCartForCustomer $createEmptyCartForCustomer
-+     * @param CreateEmptyCartForGuest $createEmptyCartForGuest
-+     * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
-+     */
-+    public function __construct(
-+        CreateEmptyCartForCustomer $createEmptyCartForCustomer,
-+        CreateEmptyCartForGuest $createEmptyCartForGuest,
-+        MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
-+    ) {
-+        $this->createEmptyCartForCustomer = $createEmptyCartForCustomer;
-+        $this->createEmptyCartForGuest = $createEmptyCartForGuest;
-+        $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        $customerId = $context->getUserId();
-+
-+        $predefinedMaskedQuoteId = null;
-+        if (isset($args['input']['cart_id'])) {
-+            $predefinedMaskedQuoteId = $args['input']['cart_id'];
-+            $this->validateMaskedId($predefinedMaskedQuoteId);
-+        }
-+
-+        $maskedQuoteId = (0 === $customerId || null === $customerId)
-+            ? $this->createEmptyCartForGuest->execute($predefinedMaskedQuoteId)
-+            : $this->createEmptyCartForCustomer->execute($customerId, $predefinedMaskedQuoteId);
-+        return $maskedQuoteId;
-+    }
-+
-+    /**
-+     * Validate masked id
-+     *
-+     * @param string $maskedId
-+     * @throws GraphQlAlreadyExistsException
-+     * @throws GraphQlInputException
-+     */
-+    private function validateMaskedId(string $maskedId): void
-+    {
-+        if (mb_strlen($maskedId) != 32) {
-+            throw new GraphQlInputException(__('Cart ID length should to be 32 symbols.'));
-+        }
-+
-+        if ($this->isQuoteWithSuchMaskedIdAlreadyExists($maskedId)) {
-+            throw new GraphQlAlreadyExistsException(__('Cart with ID "%1" already exists.', $maskedId));
-+        }
-+    }
-+
-+    /**
-+     * Check is quote with such maskedId already exists
-+     *
-+     * @param string $maskedId
-+     * @return bool
-+     */
-+    private function isQuoteWithSuchMaskedIdAlreadyExists(string $maskedId): bool
-+    {
-+        try {
-+            $this->maskedQuoteIdToQuoteId->execute($maskedId);
-+            return true;
-+        } catch (NoSuchEntityException $e) {
-+            return false;
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomizableOptions.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomizableOptions.php
-new file mode 100644
-index 00000000000..a681b2ca0d0
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomizableOptions.php
-@@ -0,0 +1,65 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Model\Quote\Item as QuoteItem;
-+use Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOption;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class CustomizableOptions implements ResolverInterface
-+{
-+    /**
-+     * @var CustomizableOption
-+     */
-+    private $customizableOption;
-+
-+    /**
-+     * @param CustomizableOption $customizableOption
-+     */
-+    public function __construct(
-+        CustomizableOption $customizableOption
-+    ) {
-+        $this->customizableOption = $customizableOption;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+
-+        /** @var QuoteItem $cartItem */
-+        $cartItem = $value['model'];
-+        $quoteItemOption = $cartItem->getOptionByCode('option_ids');
-+
-+        if (null === $quoteItemOption) {
-+            return [];
-+        }
-+
-+        $customizableOptionsData = [];
-+        $customizableOptionIds = explode(',', $quoteItemOption->getValue());
-+
-+        foreach ($customizableOptionIds as $customizableOptionId) {
-+            $customizableOption = $this->customizableOption->getData(
-+                $cartItem,
-+                (int)$customizableOptionId
-+            );
-+            $customizableOptionsData[] = $customizableOption;
-+        }
-+        return $customizableOptionsData;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php
-new file mode 100644
-index 00000000000..fd1beec0de4
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php
-@@ -0,0 +1,72 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+use Magento\Framework\Message\AbstractMessage;
-+use Magento\Quote\Model\Quote;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class GetCartMessages implements ResolverInterface
-+{
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        $cartId = $args['input']['cart_id'];
-+        if (isset($cartId) === false || empty($cartId)) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
-+        }
-+        $currentUserId = $context->getUserId();
-+        $cart = $this->getCartForUser->execute($cartId, $currentUserId);
-+        if (empty($cart->getData('has_error'))) {
-+            throw new GraphQlNoSuchEntityException(__('Requested cart hasn\'t errors.'));
-+        }
-+        return ['messages' => $this->getCartErrors($cart)];
-+    }
-+
-+    /**
-+     * Collecting cart errors
-+     *
-+     * @param Quote $cart
-+     * @return array
-+     */
-+    private function getCartErrors(Quote $cart): array
-+    {
-+        $errorMessages = [];
-+
-+        /** @var AbstractMessage $error */
-+        foreach ($cart->getErrors() as $error) {
-+            $errorMessages[] = $error->getText();
-+        }
-+
-+        return $errorMessages;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
-new file mode 100644
-index 00000000000..51cea7e3b36
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
-@@ -0,0 +1,100 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Api\CartManagementInterface;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\QuoteGraphQl\Model\Cart\CheckCartCheckoutAllowance;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class PlaceOrder implements ResolverInterface
-+{
-+    /**
-+     * @var CartManagementInterface
-+     */
-+    private $cartManagement;
-+
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var OrderRepositoryInterface
-+     */
-+    private $orderRepository;
-+
-+    /**
-+     * @var CheckCartCheckoutAllowance
-+     */
-+    private $checkCartCheckoutAllowance;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param CartManagementInterface $cartManagement
-+     * @param OrderRepositoryInterface $orderRepository
-+     * @param CheckCartCheckoutAllowance $checkCartCheckoutAllowance
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        CartManagementInterface $cartManagement,
-+        OrderRepositoryInterface $orderRepository,
-+        CheckCartCheckoutAllowance $checkCartCheckoutAllowance
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->cartManagement = $cartManagement;
-+        $this->orderRepository = $orderRepository;
-+        $this->checkCartCheckoutAllowance = $checkCartCheckoutAllowance;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (empty($args['input']['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
-+        }
-+        $maskedCartId = $args['input']['cart_id'];
-+
-+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
-+        $this->checkCartCheckoutAllowance->execute($cart);
-+
-+        if ((int)$context->getUserId() === 0) {
-+            if (!$cart->getCustomerEmail()) {
-+                throw new GraphQlInputException(__("Guest email for cart is missing."));
-+            }
-+            $cart->setCheckoutMethod(CartManagementInterface::METHOD_GUEST);
-+        }
-+
-+        try {
-+            $orderId = $this->cartManagement->placeOrder($cart->getId());
-+            $order = $this->orderRepository->get($orderId);
-+
-+            return [
-+                'order' => [
-+                    'order_id' => $order->getIncrementId(),
-+                ],
-+            ];
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__('Unable to place order: %message', ['message' => $e->getMessage()]), $e);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
-new file mode 100644
-index 00000000000..291dd9c507e
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
-@@ -0,0 +1,80 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\CouldNotDeleteException;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Api\CouponManagementInterface;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class RemoveCouponFromCart implements ResolverInterface
-+{
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var CouponManagementInterface
-+     */
-+    private $couponManagement;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param CouponManagementInterface $couponManagement
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        CouponManagementInterface $couponManagement
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->couponManagement = $couponManagement;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (empty($args['input']['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
-+        }
-+        $maskedCartId = $args['input']['cart_id'];
-+
-+        $currentUserId = $context->getUserId();
-+        $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
-+        $cartId = $cart->getId();
-+
-+        try {
-+            $this->couponManagement->remove($cartId);
-+        } catch (NoSuchEntityException $e) {
-+            $message = $e->getMessage();
-+            if (preg_match('/The "\d+" Cart doesn\'t contain products/', $message)) {
-+                $message = 'Cart does not contain products';
-+            }
-+            throw new GraphQlNoSuchEntityException(__($message), $e);
-+        } catch (CouldNotDeleteException $e) {
-+            throw new LocalizedException(__($e->getMessage()), $e);
-+        }
-+
-+        return [
-+            'cart' => [
-+                'model' => $cart,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php
-new file mode 100644
-index 00000000000..0dc7274bd47
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php
-@@ -0,0 +1,78 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Api\CartItemRepositoryInterface;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class RemoveItemFromCart implements ResolverInterface
-+{
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var CartItemRepositoryInterface
-+     */
-+    private $cartItemRepository;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param CartItemRepositoryInterface $cartItemRepository
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        CartItemRepositoryInterface $cartItemRepository
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->cartItemRepository = $cartItemRepository;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (empty($args['input']['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
-+        }
-+        $maskedCartId = $args['input']['cart_id'];
-+
-+        if (empty($args['input']['cart_item_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_item_id" is missing.'));
-+        }
-+        $itemId = $args['input']['cart_item_id'];
-+
-+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
-+
-+        try {
-+            $this->cartItemRepository->deleteById((int)$cart->getId(), $itemId);
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+
-+        return [
-+            'cart' => [
-+                'model' => $cart,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SelectedPaymentMethod.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SelectedPaymentMethod.php
-new file mode 100644
-index 00000000000..44912d249cc
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SelectedPaymentMethod.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class SelectedPaymentMethod implements ResolverInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+
-+        /** @var \Magento\Quote\Model\Quote $cart */
-+        $cart = $value['model'];
-+
-+        $payment = $cart->getPayment();
-+        if (!$payment) {
-+            return [];
-+        }
-+
-+        try {
-+            $methodTitle = $payment->getMethodInstance()->getTitle();
-+        } catch (LocalizedException $e) {
-+            $methodTitle = '';
-+        }
-+
-+        return [
-+            'code' => $payment->getMethod() ?? '',
-+            'title' => $methodTitle,
-+            'purchase_order_number' => $payment->getPoNumber(),
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetBillingAddressOnCart.php
-new file mode 100644
-index 00000000000..a56fabae273
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetBillingAddressOnCart.php
-@@ -0,0 +1,78 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+use Magento\QuoteGraphQl\Model\Cart\SetBillingAddressOnCart as SetBillingAddressOnCartModel;
-+use Magento\QuoteGraphQl\Model\Cart\CheckCartCheckoutAllowance;
-+
-+/**
-+ * Mutation resolver for setting billing address for shopping cart
-+ */
-+class SetBillingAddressOnCart implements ResolverInterface
-+{
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var SetBillingAddressOnCartModel
-+     */
-+    private $setBillingAddressOnCart;
-+
-+    /**
-+     * @var CheckCartCheckoutAllowance
-+     */
-+    private $checkCartCheckoutAllowance;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param SetBillingAddressOnCartModel $setBillingAddressOnCart
-+     * @param CheckCartCheckoutAllowance $checkCartCheckoutAllowance
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        SetBillingAddressOnCartModel $setBillingAddressOnCart,
-+        CheckCartCheckoutAllowance $checkCartCheckoutAllowance
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->setBillingAddressOnCart = $setBillingAddressOnCart;
-+        $this->checkCartCheckoutAllowance = $checkCartCheckoutAllowance;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (empty($args['input']['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
-+        }
-+        $maskedCartId = $args['input']['cart_id'];
-+
-+        if (empty($args['input']['billing_address'])) {
-+            throw new GraphQlInputException(__('Required parameter "billing_address" is missing'));
-+        }
-+        $billingAddress = $args['input']['billing_address'];
-+
-+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
-+        $this->checkCartCheckoutAllowance->execute($cart);
-+        $this->setBillingAddressOnCart->execute($context, $cart, $billingAddress);
-+
-+        return [
-+            'cart' => [
-+                'model' => $cart,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
-new file mode 100644
-index 00000000000..a029f447e36
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
-@@ -0,0 +1,105 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\CouldNotSaveException;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\Validator\EmailAddress as EmailAddressValidator;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+use Magento\QuoteGraphQl\Model\Cart\CheckCartCheckoutAllowance;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class SetGuestEmailOnCart implements ResolverInterface
-+{
-+    /**
-+     * @var CartRepositoryInterface
-+     */
-+    private $cartRepository;
-+
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var EmailAddressValidator
-+     */
-+    private $emailValidator;
-+
-+    /**
-+     * @var CheckCartCheckoutAllowance
-+     */
-+    private $checkCartCheckoutAllowance;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param CartRepositoryInterface $cartRepository
-+     * @param EmailAddressValidator $emailValidator
-+     * @param CheckCartCheckoutAllowance $checkCartCheckoutAllowance
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        CartRepositoryInterface $cartRepository,
-+        EmailAddressValidator $emailValidator,
-+        CheckCartCheckoutAllowance $checkCartCheckoutAllowance
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->cartRepository = $cartRepository;
-+        $this->emailValidator = $emailValidator;
-+        $this->checkCartCheckoutAllowance = $checkCartCheckoutAllowance;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (empty($args['input']['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
-+        }
-+        $maskedCartId = $args['input']['cart_id'];
-+
-+        if (empty($args['input']['email'])) {
-+            throw new GraphQlInputException(__('Required parameter "email" is missing'));
-+        }
-+
-+        if (false === $this->emailValidator->isValid($args['input']['email'])) {
-+            throw new GraphQlInputException(__('Invalid email format'));
-+        }
-+        $email = $args['input']['email'];
-+
-+        $currentUserId = $context->getUserId();
-+
-+        if ($currentUserId !== 0) {
-+            throw new GraphQlInputException(__('The request is not allowed for logged in customers'));
-+        }
-+
-+        $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
-+        $this->checkCartCheckoutAllowance->execute($cart);
-+        $cart->setCustomerEmail($email);
-+
-+        try {
-+            $this->cartRepository->save($cart);
-+        } catch (CouldNotSaveException $e) {
-+            throw new LocalizedException(__($e->getMessage()), $e);
-+        }
-+
-+        return [
-+            'cart' => [
-+                'model' => $cart,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php
-new file mode 100644
-index 00000000000..10ce62e49c5
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php
-@@ -0,0 +1,106 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Api\CartManagementInterface;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+use Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class SetPaymentAndPlaceOrder implements ResolverInterface
-+{
-+    /**
-+     * @var CartManagementInterface
-+     */
-+    private $cartManagement;
-+
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var OrderRepositoryInterface
-+     */
-+    private $orderRepository;
-+
-+    /**
-+     * @var SetPaymentMethodOnCart
-+     */
-+    private $setPaymentMethodOnCart;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param CartManagementInterface $cartManagement
-+     * @param OrderRepositoryInterface $orderRepository
-+     * @param SetPaymentMethodOnCart $setPaymentMethodOnCart
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        CartManagementInterface $cartManagement,
-+        OrderRepositoryInterface $orderRepository,
-+        SetPaymentMethodOnCart $setPaymentMethodOnCart
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->cartManagement = $cartManagement;
-+        $this->orderRepository = $orderRepository;
-+        $this->setPaymentMethodOnCart = $setPaymentMethodOnCart;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
-+        }
-+        $maskedCartId = $args['input']['cart_id'];
-+
-+        if (!isset($args['input']['payment_method']['code']) || empty($args['input']['payment_method']['code'])) {
-+            throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));
-+        }
-+        $paymentData = $args['input']['payment_method'];
-+
-+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
-+
-+        if ((int)$context->getUserId() === 0) {
-+            if (!$cart->getCustomerEmail()) {
-+                throw new GraphQlInputException(__("Guest email for cart is missing."));
-+            }
-+            $cart->setCheckoutMethod(CartManagementInterface::METHOD_GUEST);
-+        }
-+
-+        $this->setPaymentMethodOnCart->execute($cart, $paymentData);
-+
-+        try {
-+            $orderId = $this->cartManagement->placeOrder($cart->getId());
-+            $order = $this->orderRepository->get($orderId);
-+
-+            return [
-+                'order' => [
-+                    'order_id' => $order->getIncrementId(),
-+                ],
-+            ];
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__('Unable to place order: %message', ['message' => $e->getMessage()]), $e);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
-new file mode 100644
-index 00000000000..e8b663ed612
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
-@@ -0,0 +1,78 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\QuoteGraphQl\Model\Cart\CheckCartCheckoutAllowance;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+use Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart as SetPaymentMethodOnCartModel;
-+
-+/**
-+ * Mutation resolver for setting payment method for shopping cart
-+ */
-+class SetPaymentMethodOnCart implements ResolverInterface
-+{
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var SetPaymentMethodOnCartModel
-+     */
-+    private $setPaymentMethodOnCart;
-+
-+    /**
-+     * @var CheckCartCheckoutAllowance
-+     */
-+    private $checkCartCheckoutAllowance;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param SetPaymentMethodOnCartModel $setPaymentMethodOnCart
-+     * @param CheckCartCheckoutAllowance $checkCartCheckoutAllowance
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        SetPaymentMethodOnCartModel $setPaymentMethodOnCart,
-+        CheckCartCheckoutAllowance $checkCartCheckoutAllowance
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->setPaymentMethodOnCart = $setPaymentMethodOnCart;
-+        $this->checkCartCheckoutAllowance = $checkCartCheckoutAllowance;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (empty($args['input']['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
-+        }
-+        $maskedCartId = $args['input']['cart_id'];
-+
-+        if (empty($args['input']['payment_method']['code'])) {
-+            throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));
-+        }
-+        $paymentData = $args['input']['payment_method'];
-+
-+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
-+        $this->checkCartCheckoutAllowance->execute($cart);
-+        $this->setPaymentMethodOnCart->execute($cart, $paymentData);
-+
-+        return [
-+            'cart' => [
-+                'model' => $cart,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingAddressesOnCart.php
-new file mode 100644
-index 00000000000..b61addabf41
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingAddressesOnCart.php
-@@ -0,0 +1,78 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+use Magento\QuoteGraphQl\Model\Cart\SetShippingAddressesOnCartInterface;
-+use Magento\QuoteGraphQl\Model\Cart\CheckCartCheckoutAllowance;
-+
-+/**
-+ * Mutation resolver for setting shipping addresses for shopping cart
-+ */
-+class SetShippingAddressesOnCart implements ResolverInterface
-+{
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var SetShippingAddressesOnCartInterface
-+     */
-+    private $setShippingAddressesOnCart;
-+
-+    /**
-+     * @var CheckCartCheckoutAllowance
-+     */
-+    private $checkCartCheckoutAllowance;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param SetShippingAddressesOnCartInterface $setShippingAddressesOnCart
-+     * @param CheckCartCheckoutAllowance $checkCartCheckoutAllowance
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        SetShippingAddressesOnCartInterface $setShippingAddressesOnCart,
-+        CheckCartCheckoutAllowance $checkCartCheckoutAllowance
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->setShippingAddressesOnCart = $setShippingAddressesOnCart;
-+        $this->checkCartCheckoutAllowance = $checkCartCheckoutAllowance;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (empty($args['input']['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
-+        }
-+        $maskedCartId = $args['input']['cart_id'];
-+
-+        if (empty($args['input']['shipping_addresses'])) {
-+            throw new GraphQlInputException(__('Required parameter "shipping_addresses" is missing'));
-+        }
-+        $shippingAddresses = $args['input']['shipping_addresses'];
-+
-+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
-+        $this->checkCartCheckoutAllowance->execute($cart);
-+        $this->setShippingAddressesOnCart->execute($context, $cart, $shippingAddresses);
-+
-+        return [
-+            'cart' => [
-+                'model' => $cart,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php
-new file mode 100644
-index 00000000000..6c8bb4b24f4
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php
-@@ -0,0 +1,78 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+use Magento\QuoteGraphQl\Model\Cart\SetShippingMethodsOnCartInterface;
-+use Magento\QuoteGraphQl\Model\Cart\CheckCartCheckoutAllowance;
-+
-+/**
-+ * Mutation resolver for setting shipping methods for shopping cart
-+ */
-+class SetShippingMethodsOnCart implements ResolverInterface
-+{
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var SetShippingMethodsOnCartInterface
-+     */
-+    private $setShippingMethodsOnCart;
-+
-+    /**
-+     * @var CheckCartCheckoutAllowance
-+     */
-+    private $checkCartCheckoutAllowance;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param SetShippingMethodsOnCartInterface $setShippingMethodsOnCart
-+     * @param CheckCartCheckoutAllowance $checkCartCheckoutAllowance
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        SetShippingMethodsOnCartInterface $setShippingMethodsOnCart,
-+        CheckCartCheckoutAllowance $checkCartCheckoutAllowance
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->setShippingMethodsOnCart = $setShippingMethodsOnCart;
-+        $this->checkCartCheckoutAllowance = $checkCartCheckoutAllowance;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (empty($args['input']['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
-+        }
-+        $maskedCartId = $args['input']['cart_id'];
-+
-+        if (empty($args['input']['shipping_methods'])) {
-+            throw new GraphQlInputException(__('Required parameter "shipping_methods" is missing'));
-+        }
-+        $shippingMethods = $args['input']['shipping_methods'];
-+
-+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
-+        $this->checkCartCheckoutAllowance->execute($cart);
-+        $this->setShippingMethodsOnCart->execute($context, $cart, $shippingMethods);
-+
-+        return [
-+            'cart' => [
-+                'model' => $cart,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/AvailableShippingMethods.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/AvailableShippingMethods.php
-new file mode 100644
-index 00000000000..958934ed180
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/AvailableShippingMethods.php
-@@ -0,0 +1,119 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver\ShippingAddress;
-+
-+use Magento\Directory\Model\Currency;
-+use Magento\Framework\Api\ExtensibleDataObjectConverter;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Api\Data\ShippingMethodInterface;
-+use Magento\Quote\Model\Cart\ShippingMethodConverter;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class AvailableShippingMethods implements ResolverInterface
-+{
-+    /**
-+     * @var ExtensibleDataObjectConverter
-+     */
-+    private $dataObjectConverter;
-+
-+    /**
-+     * @var ShippingMethodConverter
-+     */
-+    private $shippingMethodConverter;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @param ExtensibleDataObjectConverter $dataObjectConverter
-+     * @param ShippingMethodConverter $shippingMethodConverter
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(
-+        ExtensibleDataObjectConverter $dataObjectConverter,
-+        ShippingMethodConverter $shippingMethodConverter,
-+        StoreManagerInterface $storeManager
-+    ) {
-+        $this->dataObjectConverter = $dataObjectConverter;
-+        $this->shippingMethodConverter = $shippingMethodConverter;
-+        $this->storeManager = $storeManager;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" values should be specified'));
-+        }
-+        $address = $value['model'];
-+
-+        // Allow shipping rates by setting country id for new addresses
-+        if (!$address->getCountryId() && $address->getCountryCode()) {
-+            $address->setCountryId($address->getCountryCode());
-+        }
-+
-+        $address->setCollectShippingRates(true);
-+        $address->collectShippingRates();
-+        $cart = $address->getQuote();
-+
-+        $methods = [];
-+        $shippingRates = $address->getGroupedAllShippingRates();
-+        foreach ($shippingRates as $carrierRates) {
-+            foreach ($carrierRates as $rate) {
-+                $methodData = $this->dataObjectConverter->toFlatArray(
-+                    $this->shippingMethodConverter->modelToDataObject($rate, $cart->getQuoteCurrencyCode()),
-+                    [],
-+                    ShippingMethodInterface::class
-+                );
-+                $methods[] = $this->processMoneyTypeData($methodData, $cart->getQuoteCurrencyCode());
-+            }
-+        }
-+        return $methods;
-+    }
-+
-+    /**
-+     * Process money type data
-+     *
-+     * @param array $data
-+     * @param string $quoteCurrencyCode
-+     * @return array
-+     * @throws NoSuchEntityException
-+     */
-+    private function processMoneyTypeData(array $data, string $quoteCurrencyCode): array
-+    {
-+        if (isset($data['amount'])) {
-+            $data['amount'] = ['value' => $data['amount'], 'currency' => $quoteCurrencyCode];
-+        }
-+
-+        if (isset($data['base_amount'])) {
-+            /** @var Currency $currency */
-+            $currency = $this->storeManager->getStore()->getBaseCurrency();
-+            $data['base_amount'] = ['value' => $data['base_amount'], 'currency' => $currency->getCode()];
-+        }
-+
-+        if (isset($data['price_excl_tax'])) {
-+            $data['price_excl_tax'] = ['value' => $data['price_excl_tax'], 'currency' => $quoteCurrencyCode];
-+        }
-+
-+        if (isset($data['price_incl_tax'])) {
-+            $data['price_incl_tax'] = ['value' => $data['price_incl_tax'], 'currency' => $quoteCurrencyCode];
-+        }
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/SelectedShippingMethod.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/SelectedShippingMethod.php
-new file mode 100644
-index 00000000000..b3599718800
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/SelectedShippingMethod.php
-@@ -0,0 +1,93 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver\ShippingAddress;
-+
-+use Magento\Directory\Model\Currency;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Model\Quote\Address;
-+use Magento\Quote\Model\Quote\Address\Rate;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class SelectedShippingMethod implements ResolverInterface
-+{
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(
-+        StoreManagerInterface $storeManager
-+    ) {
-+        $this->storeManager = $storeManager;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+        /** @var Address $address */
-+        $address = $value['model'];
-+        $rates = $address->getAllShippingRates();
-+        $carrierTitle = null;
-+        $methodTitle = null;
-+
-+        if (count($rates) > 0 && !empty($address->getShippingMethod())) {
-+            list($carrierCode, $methodCode) = explode('_', $address->getShippingMethod(), 2);
-+
-+            /** @var Rate $rate */
-+            foreach ($rates as $rate) {
-+                if ($rate->getCode() == $address->getShippingMethod()) {
-+                    $carrierTitle = $rate->getCarrierTitle();
-+                    $methodTitle = $rate->getMethodTitle();
-+                    break;
-+                }
-+            }
-+
-+            /** @var Currency $currency */
-+            $currency = $this->storeManager->getStore()->getBaseCurrency();
-+
-+            $data = [
-+                'carrier_code' => $carrierCode,
-+                'method_code' => $methodCode,
-+                'carrier_title' => $carrierTitle,
-+                'method_title' => $methodTitle,
-+                'amount' => [
-+                    'value' => $address->getShippingAmount(),
-+                    'currency' => $address->getQuote()->getQuoteCurrencyCode(),
-+                ],
-+                'base_amount' => [
-+                    'value' => $address->getBaseShippingAmount(),
-+                    'currency' => $currency->getCode(),
-+                ],
-+            ];
-+        } else {
-+            $data = [
-+                'carrier_code' => null,
-+                'method_code' => null,
-+                'carrier_title' => $carrierTitle,
-+                'method_title' => $methodTitle,
-+                'amount' => null,
-+                'base_amount' => null,
-+            ];
-+        }
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
-new file mode 100644
-index 00000000000..eb3b0966740
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Model\Quote;
-+use Magento\QuoteGraphQl\Model\Cart\ExtractQuoteAddressData;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class ShippingAddresses implements ResolverInterface
-+{
-+    /**
-+     * @var ExtractQuoteAddressData
-+     */
-+    private $extractQuoteAddressData;
-+
-+    /**
-+     * @param ExtractQuoteAddressData $extractQuoteAddressData
-+     */
-+    public function __construct(ExtractQuoteAddressData $extractQuoteAddressData)
-+    {
-+        $this->extractQuoteAddressData = $extractQuoteAddressData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+        /** @var Quote $cart */
-+        $cart = $value['model'];
-+
-+        $addressesData = [];
-+        $shippingAddresses = $cart->getAllShippingAddresses();
-+
-+        if (count($shippingAddresses)) {
-+            foreach ($shippingAddresses as $shippingAddress) {
-+                $addressesData[] = $this->extractQuoteAddressData->execute($shippingAddress);
-+            }
-+        }
-+        return $addressesData;
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php
-new file mode 100644
-index 00000000000..db6a43513cc
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php
-@@ -0,0 +1,120 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\QuoteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Quote\Api\CartItemRepositoryInterface;
-+use Magento\Quote\Model\Quote;
-+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-+use Magento\QuoteGraphQl\Model\Cart\UpdateCartItem;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class UpdateCartItems implements ResolverInterface
-+{
-+    /**
-+     * @var UpdateCartItem
-+     */
-+    private $updateCartItem;
-+
-+    /**
-+     * @var GetCartForUser
-+     */
-+    private $getCartForUser;
-+
-+    /**
-+     * @var CartItemRepositoryInterface
-+     */
-+    private $cartItemRepository;
-+
-+    /**
-+     * @param GetCartForUser $getCartForUser
-+     * @param CartItemRepositoryInterface $cartItemRepository
-+     * @param UpdateCartItem $updateCartItem
-+     */
-+    public function __construct(
-+        GetCartForUser $getCartForUser,
-+        CartItemRepositoryInterface $cartItemRepository,
-+        UpdateCartItem $updateCartItem
-+    ) {
-+        $this->getCartForUser = $getCartForUser;
-+        $this->cartItemRepository = $cartItemRepository;
-+        $this->updateCartItem = $updateCartItem;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (empty($args['input']['cart_id'])) {
-+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
-+        }
-+        $maskedCartId = $args['input']['cart_id'];
-+
-+        if (empty($args['input']['cart_items'])
-+            || !is_array($args['input']['cart_items'])
-+        ) {
-+            throw new GraphQlInputException(__('Required parameter "cart_items" is missing.'));
-+        }
-+        $cartItems = $args['input']['cart_items'];
-+
-+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
-+
-+        try {
-+            $this->processCartItems($cart, $cartItems);
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+        } catch (LocalizedException $e) {
-+            throw new GraphQlInputException(__($e->getMessage()), $e);
-+        }
-+
-+        return [
-+            'cart' => [
-+                'model' => $cart,
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Process cart items
-+     *
-+     * @param Quote $cart
-+     * @param array $items
-+     * @throws GraphQlInputException
-+     * @throws LocalizedException
-+     */
-+    private function processCartItems(Quote $cart, array $items): void
-+    {
-+        foreach ($items as $item) {
-+            if (empty($item['cart_item_id'])) {
-+                throw new GraphQlInputException(__('Required parameter "cart_item_id" for "cart_items" is missing.'));
-+            }
-+            $itemId = (int)$item['cart_item_id'];
-+            $customizableOptions = $item['customizable_options'] ?? [];
-+
-+            if (count($customizableOptions) === 0 && !isset($item['quantity'])) {
-+                throw new GraphQlInputException(__('Required parameter "quantity" for "cart_items" is missing.'));
-+            }
-+            $quantity = (float)$item['quantity'];
-+
-+            if ($quantity <= 0.0) {
-+                $this->cartItemRepository->deleteById((int)$cart->getId(), $itemId);
-+            } else {
-+                $this->updateCartItem->execute($cart, $itemId, $quantity, $customizableOptions);
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/README.md b/app/code/Magento/QuoteGraphQl/README.md
-new file mode 100644
-index 00000000000..05d6746b873
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/README.md
-@@ -0,0 +1,4 @@
-+# QuoteGraphQl
-+
-+**QuoteGraphQl** provides type and resolver information for the GraphQl module
-+to generate quote (cart) information endpoints. Also provides endpoints for modifying a quote.
-diff --git a/app/code/Magento/QuoteGraphQl/composer.json b/app/code/Magento/QuoteGraphQl/composer.json
-new file mode 100644
-index 00000000000..0eeeb77e9ec
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/composer.json
-@@ -0,0 +1,33 @@
-+{
-+    "name": "magento/module-quote-graph-ql",
-+    "description": "N/A",
-+    "type": "magento2-module",
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-quote": "*",
-+        "magento/module-checkout": "*",
-+        "magento/module-catalog": "*",
-+        "magento/module-store": "*",
-+        "magento/module-customer": "*",
-+        "magento/module-customer-graph-ql": "*",
-+        "magento/module-sales": "*",
-+        "magento/module-directory": "*",
-+        "magento/module-graph-ql": "*"
-+    },
-+    "suggest": {
-+        "magento/module-graph-ql-cache": "*"
-+    },
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\QuoteGraphQl\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/etc/di.xml b/app/code/Magento/QuoteGraphQl/etc/di.xml
-new file mode 100644
-index 00000000000..32b8b12987f
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/etc/di.xml
-@@ -0,0 +1,34 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <preference for="Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValueInterface" type="Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Composite" />
-+    <type name="Magento\QuoteGraphQl\Model\Resolver\CartItemTypeResolver">
-+        <arguments>
-+            <argument name="supportedTypes" xsi:type="array">
-+                <item name="simple" xsi:type="string">SimpleCartItem</item>
-+                <item name="virtual" xsi:type="string">VirtualCartItem</item>
-+                <item name="configurable" xsi:type="string">ConfigurableCartItem</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Composite">
-+        <arguments>
-+            <argument name="customizableOptionValues" xsi:type="array">
-+                <item name="field" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Text</item>
-+                <item name="date" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Text</item>
-+                <item name="time" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Text</item>
-+                <item name="date_time" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Text</item>
-+                <item name="area" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Text</item>
-+                <item name="drop_down" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Dropdown</item>
-+                <item name="radio" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Dropdown</item>
-+                <item name="checkbox" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Multiple</item>
-+                <item name="multiple" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Multiple</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml b/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml
-new file mode 100644
-index 00000000000..c7389cf6678
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <preference for="Magento\QuoteGraphQl\Model\Cart\SetShippingAddressesOnCartInterface"
-+                type="Magento\QuoteGraphQl\Model\Cart\SetShippingAddressesOnCart"/>
-+    <preference for="Magento\QuoteGraphQl\Model\Cart\SetShippingMethodsOnCartInterface"
-+                type="Magento\QuoteGraphQl\Model\Cart\SetShippingMethodsOnCart"/>
-+</config>
-diff --git a/app/code/Magento/QuoteGraphQl/etc/module.xml b/app/code/Magento/QuoteGraphQl/etc/module.xml
-new file mode 100644
-index 00000000000..9f29b124abb
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/etc/module.xml
-@@ -0,0 +1,10 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_QuoteGraphQl"/>
-+</config>
-diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
-new file mode 100644
-index 00000000000..78f50c1ee81
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
-@@ -0,0 +1,355 @@
-+# Copyright © Magento, Inc. All rights reserved.
-+# See COPYING.txt for license details.
-+
-+type Query {
-+    cart(cart_id: String!): Cart @resolver (class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Cart") @doc(description:"Returns information about shopping cart") @cache(cacheable: false)
-+}
-+
-+type Mutation {
-+    createEmptyCart(input: createEmptyCartInput): String @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CreateEmptyCart") @doc(description:"Creates an empty shopping cart for a guest or logged in user")
-+    addSimpleProductsToCart(input: AddSimpleProductsToCartInput): AddSimpleProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart")
-+    addVirtualProductsToCart(input: AddVirtualProductsToCartInput): AddVirtualProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart")
-+    applyCouponToCart(input: ApplyCouponToCartInput): ApplyCouponToCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ApplyCouponToCart")
-+    removeCouponFromCart(input: RemoveCouponFromCartInput): RemoveCouponFromCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\RemoveCouponFromCart")
-+    updateCartItems(input: UpdateCartItemsInput): UpdateCartItemsOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\UpdateCartItems")
-+    removeItemFromCart(input: RemoveItemFromCartInput): RemoveItemFromCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\RemoveItemFromCart")
-+    setShippingAddressesOnCart(input: SetShippingAddressesOnCartInput): SetShippingAddressesOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingAddressesOnCart")
-+    setBillingAddressOnCart(input: SetBillingAddressOnCartInput): SetBillingAddressOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetBillingAddressOnCart")
-+    setShippingMethodsOnCart(input: SetShippingMethodsOnCartInput): SetShippingMethodsOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingMethodsOnCart")
-+    setPaymentMethodOnCart(input: SetPaymentMethodOnCartInput): SetPaymentMethodOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentMethodOnCart")
-+    setGuestEmailOnCart(input: SetGuestEmailOnCartInput): SetGuestEmailOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetGuestEmailOnCart")
-+    setPaymentMethodAndPlaceOrder(input: SetPaymentMethodAndPlaceOrderInput): PlaceOrderOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentAndPlaceOrder")
-+    placeOrder(input: PlaceOrderInput): PlaceOrderOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\PlaceOrder")
-+    getCartMessages(input: GetCartMessagesInput): GetCartMessagesOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\GetCartMessages") @doc(description:"Return all shopping cart messages for a guest or logged in user")
-+}
-+
-+input createEmptyCartInput {
-+    cart_id: String
-+}
-+
-+input AddSimpleProductsToCartInput {
-+    cart_id: String!
-+    cart_items: [SimpleProductCartItemInput!]!
-+}
-+
-+input SimpleProductCartItemInput {
-+    data: CartItemInput!
-+    customizable_options:[CustomizableOptionInput!]
-+}
-+
-+input AddVirtualProductsToCartInput {
-+    cart_id: String!
-+    cart_items: [VirtualProductCartItemInput!]!
-+}
-+
-+input VirtualProductCartItemInput {
-+    data: CartItemInput!
-+    customizable_options:[CustomizableOptionInput!]
-+}
-+
-+input CartItemInput {
-+    sku: String!
-+    quantity: Float!
-+}
-+
-+input CustomizableOptionInput {
-+    id: Int!
-+    value_string: String!
-+}
-+
-+input ApplyCouponToCartInput {
-+    cart_id: String!
-+    coupon_code: String!
-+}
-+
-+input UpdateCartItemsInput {
-+    cart_id: String!
-+    cart_items: [CartItemUpdateInput!]!
-+}
-+
-+input CartItemUpdateInput {
-+    cart_item_id: Int!
-+    quantity: Float
-+    customizable_options: [CustomizableOptionInput!]
-+}
-+
-+input RemoveItemFromCartInput {
-+    cart_id: String!
-+    cart_item_id: Int!
-+}
-+
-+input SetShippingAddressesOnCartInput {
-+    cart_id: String!
-+    shipping_addresses: [ShippingAddressInput!]!
-+}
-+
-+input ShippingAddressInput {
-+    customer_address_id: Int # If provided then will be used address from address book
-+    address: CartAddressInput
-+}
-+
-+input SetBillingAddressOnCartInput {
-+    cart_id: String!
-+    billing_address: BillingAddressInput!
-+}
-+
-+input BillingAddressInput {
-+    customer_address_id: Int
-+    address: CartAddressInput
-+    use_for_shipping: Boolean
-+}
-+
-+input CartAddressInput {
-+    firstname: String!
-+    lastname: String!
-+    company: String
-+    street: [String!]!
-+    city: String!
-+    region: String
-+    postcode: String
-+    country_code: String!
-+    telephone: String!
-+    save_in_address_book: Boolean!
-+}
-+
-+input SetShippingMethodsOnCartInput {
-+    cart_id: String!
-+    shipping_methods: [ShippingMethodInput!]!
-+}
-+
-+input ShippingMethodInput {
-+    carrier_code: String!
-+    method_code: String!
-+}
-+
-+input SetPaymentMethodAndPlaceOrderInput {
-+    cart_id: String!
-+    payment_method: PaymentMethodInput!
-+}
-+
-+input PlaceOrderInput {
-+    cart_id: String!
-+}
-+
-+input SetPaymentMethodOnCartInput {
-+    cart_id: String!
-+    payment_method: PaymentMethodInput!
-+}
-+
-+input PaymentMethodInput {
-+    code: String! @doc(description:"Payment method code")
-+    purchase_order_number: String @doc(description:"Purchase order number")
-+    additional_data: PaymentMethodAdditionalDataInput @doc(description: "Additional payment data")
-+}
-+
-+input PaymentMethodAdditionalDataInput {
-+}
-+
-+input SetGuestEmailOnCartInput {
-+    cart_id: String!
-+    email: String!
-+}
-+
-+type CartPrices {
-+    grand_total: Money
-+    subtotal_including_tax: Money
-+    subtotal_excluding_tax: Money
-+    discount: CartDiscount
-+    subtotal_with_discount_excluding_tax: Money
-+    applied_taxes: [CartTaxItem]
-+}
-+
-+type CartTaxItem {
-+    amount: Money!
-+    label: String!
-+}
-+
-+type CartDiscount {
-+    amount: Money!
-+    label: [String!]!
-+}
-+
-+input GetCartMessagesInput {
-+    cart_id: String!
-+}
-+
-+type SetPaymentMethodOnCartOutput {
-+    cart: Cart!
-+}
-+
-+type SetBillingAddressOnCartOutput {
-+    cart: Cart!
-+}
-+
-+type SetShippingAddressesOnCartOutput {
-+    cart: Cart!
-+}
-+
-+type SetShippingMethodsOnCartOutput {
-+    cart: Cart!
-+}
-+
-+type ApplyCouponToCartOutput {
-+    cart: Cart!
-+}
-+
-+type PlaceOrderOutput {
-+    order: Order!
-+}
-+
-+type GetCartMessagesOutput {
-+     messages: [String]!
-+}
-+
-+type Cart {
-+    items: [CartItemInterface] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartItems")
-+    applied_coupon: AppliedCoupon @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\AppliedCoupon")
-+    email: String @resolver (class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartEmail")
-+    shipping_addresses: [ShippingCartAddress]! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddresses")
-+    billing_address: BillingCartAddress! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\BillingAddress")
-+    available_payment_methods: [AvailablePaymentMethod]  @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AvailablePaymentMethods") @doc(description: "Available payment methods")
-+    selected_payment_method: SelectedPaymentMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SelectedPaymentMethod")
-+    prices: CartPrices @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartPrices")
-+}
-+
-+interface CartAddressInterface @typeResolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartAddressTypeResolver") {
-+    firstname: String
-+    lastname: String
-+    company: String
-+    street: [String]
-+    city: String
-+    region: CartAddressRegion
-+    postcode: String
-+    country: CartAddressCountry
-+    telephone: String
-+    customer_notes: String
-+}
-+
-+type ShippingCartAddress implements CartAddressInterface {
-+    available_shipping_methods: [AvailableShippingMethod] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddress\\AvailableShippingMethods")
-+    selected_shipping_method: SelectedShippingMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddress\\SelectedShippingMethod")
-+    items_weight: Float
-+    cart_items: [CartItemQuantity]
-+}
-+
-+type BillingCartAddress implements CartAddressInterface {
-+}
-+
-+type CartItemQuantity {
-+    cart_item_id: Int!
-+    quantity: Float!
-+}
-+
-+type CartAddressRegion {
-+    code: String
-+    label: String
-+}
-+
-+type CartAddressCountry {
-+    code: String
-+    label: String
-+}
-+
-+type SelectedShippingMethod {
-+    carrier_code: String
-+    method_code: String
-+    carrier_title: String
-+    method_title: String
-+    amount: Money
-+    base_amount: Money
-+}
-+
-+type AvailableShippingMethod {
-+    carrier_code: String!
-+    carrier_title: String!
-+    method_code: String @doc(description: "Could be null if method is not available")
-+    method_title: String @doc(description: "Could be null if method is not available")
-+    error_message: String
-+    amount: Money!
-+    base_amount: Money @doc(description: "Could be null if method is not available")
-+    price_excl_tax: Money!
-+    price_incl_tax: Money!
-+    available: Boolean!
-+}
-+
-+type AvailablePaymentMethod {
-+    code: String! @doc(description: "The payment method code")
-+    title: String! @doc(description: "The payment method title.")
-+}
-+
-+type SelectedPaymentMethod {
-+    code: String! @doc(description: "The payment method code")
-+    title: String! @doc(description: "The payment method title.")
-+    purchase_order_number: String @doc(description: "The purchase order number.")
-+}
-+
-+type AppliedCoupon {
-+    code: String!
-+}
-+
-+input RemoveCouponFromCartInput {
-+    cart_id: String!
-+}
-+
-+type RemoveCouponFromCartOutput {
-+    cart: Cart
-+}
-+
-+type AddSimpleProductsToCartOutput {
-+    cart: Cart!
-+}
-+
-+type AddVirtualProductsToCartOutput {
-+    cart: Cart!
-+}
-+
-+type UpdateCartItemsOutput {
-+    cart: Cart!
-+}
-+
-+type RemoveItemFromCartOutput {
-+    cart: Cart!
-+}
-+
-+type SetGuestEmailOnCartOutput {
-+    cart: Cart!
-+}
-+
-+type SimpleCartItem implements CartItemInterface @doc(description: "Simple Cart Item") {
-+    customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
-+}
-+
-+type VirtualCartItem implements CartItemInterface @doc(description: "Virtual Cart Item") {
-+    customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
-+}
-+
-+interface CartItemInterface @typeResolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CartItemTypeResolver") {
-+    id: String!
-+    quantity: Float!
-+    product: ProductInterface!
-+}
-+
-+type SelectedCustomizableOption {
-+    id: Int!
-+    label: String!
-+    is_required: Boolean!
-+    values: [SelectedCustomizableOptionValue!]!
-+    sort_order: Int!
-+}
-+
-+type SelectedCustomizableOptionValue {
-+    id: Int!
-+    label: String!
-+    value: String
-+    price: CartItemSelectedOptionValuePrice!
-+}
-+
-+type CartItemSelectedOptionValuePrice {
-+    value: Float!
-+    units: String!
-+    type: PriceTypeEnum!
-+}
-+
-+type Order {
-+    order_id: String
-+}
-diff --git a/app/code/Magento/QuoteGraphQl/registration.php b/app/code/Magento/QuoteGraphQl/registration.php
-new file mode 100644
-index 00000000000..8c945d902ba
---- /dev/null
-+++ b/app/code/Magento/QuoteGraphQl/registration.php
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_QuoteGraphQl', __DIR__);
-diff --git a/app/code/Magento/RelatedProductGraphQl/Model/DataProvider/RelatedProductDataProvider.php b/app/code/Magento/RelatedProductGraphQl/Model/DataProvider/RelatedProductDataProvider.php
-new file mode 100644
-index 00000000000..173c0a94312
---- /dev/null
-+++ b/app/code/Magento/RelatedProductGraphQl/Model/DataProvider/RelatedProductDataProvider.php
-@@ -0,0 +1,78 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\RelatedProductGraphQl\Model\DataProvider;
-+
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Link;
-+use Magento\Catalog\Model\Product\LinkFactory;
-+
-+/**
-+ * Related Products Data Provider
-+ */
-+class RelatedProductDataProvider
-+{
-+    /**
-+     * @var LinkFactory
-+     */
-+    private $linkFactory;
-+
-+    /**
-+     * @param LinkFactory $linkFactory
-+     */
-+    public function __construct(
-+        LinkFactory $linkFactory
-+    ) {
-+        $this->linkFactory = $linkFactory;
-+    }
-+
-+    /**
-+     * Related Products Data
-+     *
-+     * @param Product $product
-+     * @param array $fields
-+     * @param int $linkType
-+     * @return array
-+     */
-+    public function getData(Product $product, array $fields, int $linkType): array
-+    {
-+        $relatedProducts = $this->getRelatedProducts($product, $fields, $linkType);
-+
-+        $productsData = [];
-+        foreach ($relatedProducts as $relatedProduct) {
-+            $productData = $relatedProduct->getData();
-+            $productData['model'] = $relatedProduct;
-+            $productsData[] = $productData;
-+        }
-+        return $productsData;
-+    }
-+
-+    /**
-+     * Get Related Products
-+     *
-+     * @param Product $product
-+     * @param array $fields
-+     * @param int $linkType
-+     * @return Product[]
-+     */
-+    private function getRelatedProducts(Product $product, array $fields, int $linkType): array
-+    {
-+        /** @var Link $link */
-+        $link = $this->linkFactory->create([ 'data' => [
-+            'link_type_id' => $linkType,
-+        ]]);
-+
-+        $collection = $link->getProductCollection();
-+        $collection->setIsStrongMode();
-+        foreach ($fields as $field) {
-+            $collection->addAttributeToSelect($field);
-+        }
-+        $collection->setProduct($product);
-+
-+        return $collection->getItems();
-+    }
-+}
-diff --git a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/CrossSellProducts.php b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/CrossSellProducts.php
-new file mode 100644
-index 00000000000..dcaa75b85f5
---- /dev/null
-+++ b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/CrossSellProducts.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\RelatedProductGraphQl\Model\Resolver;
-+
-+use Magento\Catalog\Model\Product\Link;
-+use Magento\CatalogGraphQl\Model\Resolver\Product\ProductFieldsSelector;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\RelatedProductGraphQl\Model\DataProvider\RelatedProductDataProvider;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+
-+/**
-+ * CrossSell Products Resolver
-+ */
-+class CrossSellProducts implements ResolverInterface
-+{
-+    /**
-+     * @var ProductFieldsSelector
-+     */
-+    private $productFieldsSelector;
-+
-+    /**
-+     * @var RelatedProductDataProvider
-+     */
-+    private $relatedProductDataProvider;
-+
-+    /**
-+     * @param ProductFieldsSelector $productFieldsSelector
-+     * @param RelatedProductDataProvider $relatedProductDataProvider
-+     */
-+    public function __construct(
-+        ProductFieldsSelector $productFieldsSelector,
-+        RelatedProductDataProvider $relatedProductDataProvider
-+    ) {
-+        $this->productFieldsSelector = $productFieldsSelector;
-+        $this->relatedProductDataProvider = $relatedProductDataProvider;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+        $product = $value['model'];
-+        $fields = $this->productFieldsSelector->getProductFieldsFromInfo($info, 'crosssell_products');
-+
-+        $data = $this->relatedProductDataProvider->getData($product, $fields, Link::LINK_TYPE_CROSSSELL);
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/RelatedProducts.php b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/RelatedProducts.php
-new file mode 100644
-index 00000000000..568c3282a6e
---- /dev/null
-+++ b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/RelatedProducts.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\RelatedProductGraphQl\Model\Resolver;
-+
-+use Magento\Catalog\Model\Product\Link;
-+use Magento\CatalogGraphQl\Model\Resolver\Product\ProductFieldsSelector;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\RelatedProductGraphQl\Model\DataProvider\RelatedProductDataProvider;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+
-+/**
-+ * Related Products Resolver
-+ */
-+class RelatedProducts implements ResolverInterface
-+{
-+    /**
-+     * @var ProductFieldsSelector
-+     */
-+    private $productFieldsSelector;
-+
-+    /**
-+     * @var RelatedProductDataProvider
-+     */
-+    private $relatedProductDataProvider;
-+
-+    /**
-+     * @param ProductFieldsSelector $productFieldsSelector
-+     * @param RelatedProductDataProvider $relatedProductDataProvider
-+     */
-+    public function __construct(
-+        ProductFieldsSelector $productFieldsSelector,
-+        RelatedProductDataProvider $relatedProductDataProvider
-+    ) {
-+        $this->productFieldsSelector = $productFieldsSelector;
-+        $this->relatedProductDataProvider = $relatedProductDataProvider;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+        $product = $value['model'];
-+        $fields = $this->productFieldsSelector->getProductFieldsFromInfo($info, 'related_products');
-+
-+        $data = $this->relatedProductDataProvider->getData($product, $fields, Link::LINK_TYPE_RELATED);
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/UpSellProducts.php b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/UpSellProducts.php
-new file mode 100644
-index 00000000000..df3a62408c5
---- /dev/null
-+++ b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/UpSellProducts.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\RelatedProductGraphQl\Model\Resolver;
-+
-+use Magento\Catalog\Model\Product\Link;
-+use Magento\CatalogGraphQl\Model\Resolver\Product\ProductFieldsSelector;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\RelatedProductGraphQl\Model\DataProvider\RelatedProductDataProvider;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+
-+/**
-+ * UpSell Products Resolver
-+ */
-+class UpSellProducts implements ResolverInterface
-+{
-+    /**
-+     * @var ProductFieldsSelector
-+     */
-+    private $productFieldsSelector;
-+
-+    /**
-+     * @var RelatedProductDataProvider
-+     */
-+    private $relatedProductDataProvider;
-+
-+    /**
-+     * @param ProductFieldsSelector $productFieldsSelector
-+     * @param RelatedProductDataProvider $relatedProductDataProvider
-+     */
-+    public function __construct(
-+        ProductFieldsSelector $productFieldsSelector,
-+        RelatedProductDataProvider $relatedProductDataProvider
-+    ) {
-+        $this->productFieldsSelector = $productFieldsSelector;
-+        $this->relatedProductDataProvider = $relatedProductDataProvider;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-+        }
-+        $product = $value['model'];
-+        $fields = $this->productFieldsSelector->getProductFieldsFromInfo($info, 'upsell_products');
-+
-+        $data = $this->relatedProductDataProvider->getData($product, $fields, Link::LINK_TYPE_UPSELL);
-+        return $data;
-+    }
-+}
-diff --git a/app/code/Magento/RelatedProductGraphQl/README.md b/app/code/Magento/RelatedProductGraphQl/README.md
-new file mode 100644
-index 00000000000..5b57af5af98
---- /dev/null
-+++ b/app/code/Magento/RelatedProductGraphQl/README.md
-@@ -0,0 +1,3 @@
-+# RelatedProductGraphQl
-+
-+**RelatedProductGraphQl** provides endpoints for getting  Cross Sell / Related/ Up Sell products data.
-\ No newline at end of file
-diff --git a/app/code/Magento/RelatedProductGraphQl/composer.json b/app/code/Magento/RelatedProductGraphQl/composer.json
-new file mode 100644
-index 00000000000..0d314d433f1
---- /dev/null
-+++ b/app/code/Magento/RelatedProductGraphQl/composer.json
-@@ -0,0 +1,26 @@
-+{
-+    "name": "magento/module-related-product-graph-ql",
-+    "description": "N/A",
-+    "type": "magento2-module",
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/module-catalog": "*",
-+        "magento/module-catalog-graph-ql": "*",
-+        "magento/framework": "*"
-+    },
-+    "suggest": {
-+        "magento/module-graph-ql": "*"
-+    },
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\RelatedProductGraphQl\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/RelatedProductGraphQl/etc/module.xml b/app/code/Magento/RelatedProductGraphQl/etc/module.xml
-new file mode 100644
-index 00000000000..e30775c253a
---- /dev/null
-+++ b/app/code/Magento/RelatedProductGraphQl/etc/module.xml
-@@ -0,0 +1,10 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_RelatedProductGraphQl"/>
-+</config>
-diff --git a/app/code/Magento/RelatedProductGraphQl/etc/schema.graphqls b/app/code/Magento/RelatedProductGraphQl/etc/schema.graphqls
-new file mode 100644
-index 00000000000..81c51f5035e
---- /dev/null
-+++ b/app/code/Magento/RelatedProductGraphQl/etc/schema.graphqls
-@@ -0,0 +1,8 @@
-+# Copyright © Magento, Inc. All rights reserved.
-+# See COPYING.txt for license details.
-+
-+interface ProductInterface {
-+    related_products: [ProductInterface] @doc(description: "Related Products") @resolver(class: "Magento\\RelatedProductGraphQl\\Model\\Resolver\\RelatedProducts")
-+    upsell_products: [ProductInterface] @doc(description: "Upsell Products")  @resolver(class: "Magento\\RelatedProductGraphQl\\Model\\Resolver\\UpSellProducts")
-+    crosssell_products: [ProductInterface] @doc(description: "Crosssell Products") @resolver(class: "Magento\\RelatedProductGraphQl\\Model\\Resolver\\CrossSellProducts")
-+}
-diff --git a/app/code/Magento/RelatedProductGraphQl/registration.php b/app/code/Magento/RelatedProductGraphQl/registration.php
-new file mode 100644
-index 00000000000..d18dfc27cc7
---- /dev/null
-+++ b/app/code/Magento/RelatedProductGraphQl/registration.php
-@@ -0,0 +1,9 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_RelatedProductGraphQl', __DIR__);
-diff --git a/app/code/Magento/ReleaseNotification/README.md b/app/code/Magento/ReleaseNotification/README.md
-index df3206a176f..1f6cac764b5 100644
---- a/app/code/Magento/ReleaseNotification/README.md
-+++ b/app/code/Magento/ReleaseNotification/README.md
-@@ -50,4 +50,4 @@ A clickable link to internal or external content in any text field will be creat
- 
- ### Link Format Example:
- 
--The text: `http://devdocs.magento.com/ [Magento DevDocs].` will appear as [Magento DevDocs](http://devdocs.magento.com/).
-+The text: `https://devdocs.magento.com/ [Magento DevDocs].` will appear as [Magento DevDocs](https://devdocs.magento.com/).
-diff --git a/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php b/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
-index 55f448730a5..b86f8dff2b3 100644
---- a/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
-+++ b/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
-@@ -12,6 +12,7 @@ use Magento\Framework\App\ProductMetadataInterface;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Backend\Model\Auth\Session;
- use Magento\Framework\App\CacheInterface;
-+use Magento\User\Model\User;
- 
- class CanViewNotificationTest extends \PHPUnit\Framework\TestCase
- {
-@@ -33,6 +34,11 @@ class CanViewNotificationTest extends \PHPUnit\Framework\TestCase
-     /** @var  $cacheStorageMock \PHPUnit_Framework_MockObject_MockObject|CacheInterface */
-     private $cacheStorageMock;
- 
-+    /**
-+     * @var User|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $userMock;
-+
-     public function setUp()
-     {
-         $this->cacheStorageMock = $this->getMockBuilder(CacheInterface::class)
-@@ -41,7 +47,6 @@ class CanViewNotificationTest extends \PHPUnit\Framework\TestCase
-             ->getMock();
-         $this->sessionMock = $this->getMockBuilder(Session::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['getUser', 'getId'])
-             ->getMock();
-         $this->viewerLoggerMock = $this->getMockBuilder(Logger::class)
-             ->disableOriginalConstructor()
-@@ -49,6 +54,7 @@ class CanViewNotificationTest extends \PHPUnit\Framework\TestCase
-         $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $this->userMock = $this->createMock(User::class);
-         $objectManager = new ObjectManager($this);
-         $this->canViewNotification = $objectManager->getObject(
-             CanViewNotification::class,
-@@ -65,8 +71,8 @@ class CanViewNotificationTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->sessionMock->expects($this->once())
-             ->method('getUser')
--            ->willReturn($this->sessionMock);
--        $this->sessionMock->expects($this->once())
-+            ->willReturn($this->userMock);
-+        $this->userMock->expects($this->once())
-             ->method('getId')
-             ->willReturn(1);
-         $this->cacheStorageMock->expects($this->once())
-@@ -90,8 +96,8 @@ class CanViewNotificationTest extends \PHPUnit\Framework\TestCase
-             ->willReturn(false);
-         $this->sessionMock->expects($this->once())
-             ->method('getUser')
--            ->willReturn($this->sessionMock);
--        $this->sessionMock->expects($this->once())
-+            ->willReturn($this->userMock);
-+        $this->userMock->expects($this->once())
-             ->method('getId')
-             ->willReturn(1);
-         $this->productMetadataMock->expects($this->once())
-diff --git a/app/code/Magento/ReleaseNotification/Ui/DataProvider/NotificationDataProvider.php b/app/code/Magento/ReleaseNotification/Ui/DataProvider/NotificationDataProvider.php
-index cdf7e0c6ac7..a1e558a5a2f 100644
---- a/app/code/Magento/ReleaseNotification/Ui/DataProvider/NotificationDataProvider.php
-+++ b/app/code/Magento/ReleaseNotification/Ui/DataProvider/NotificationDataProvider.php
-@@ -82,7 +82,7 @@ class NotificationDataProvider implements DataProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getData()
-     {
-@@ -95,7 +95,7 @@ class NotificationDataProvider implements DataProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getMeta()
-     {
-@@ -107,7 +107,7 @@ class NotificationDataProvider implements DataProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getName()
-     {
-@@ -115,15 +115,15 @@ class NotificationDataProvider implements DataProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConfigData()
-     {
--        return isset($this->data['config']) ? $this->data['config'] : [];
-+        return $this->data['config'] ?? [];
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setConfigData($config)
-     {
-@@ -133,7 +133,7 @@ class NotificationDataProvider implements DataProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function getFieldMetaInfo($fieldSetName, $fieldName)
-@@ -142,7 +142,7 @@ class NotificationDataProvider implements DataProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function getFieldSetMetaInfo($fieldSetName)
-@@ -151,7 +151,7 @@ class NotificationDataProvider implements DataProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function getFieldsMetaInfo($fieldSetName)
-@@ -160,7 +160,7 @@ class NotificationDataProvider implements DataProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getPrimaryFieldName()
-     {
-@@ -168,7 +168,7 @@ class NotificationDataProvider implements DataProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getRequestFieldName()
-     {
-@@ -176,31 +176,28 @@ class NotificationDataProvider implements DataProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     * @inheritdoc
-      */
-     public function addFilter(\Magento\Framework\Api\Filter $filter)
-     {
-     }
- 
-     /**
--     * {@inheritdoc}
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     * @inheritdoc
-      */
-     public function addOrder($field, $direction)
-     {
-     }
- 
-     /**
--     * {@inheritdoc}
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     * @inheritdoc
-      */
-     public function setLimit($offset, $size)
-     {
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSearchCriteria()
-     {
-@@ -208,7 +205,7 @@ class NotificationDataProvider implements DataProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSearchResult()
-     {
-diff --git a/app/code/Magento/ReleaseNotification/etc/db_schema.xml b/app/code/Magento/ReleaseNotification/etc/db_schema.xml
-index 367957fc177..6f3aa481f73 100644
---- a/app/code/Magento/ReleaseNotification/etc/db_schema.xml
-+++ b/app/code/Magento/ReleaseNotification/etc/db_schema.xml
-@@ -15,13 +15,13 @@
-                 comment="Viewer admin user ID"/>
-         <column xsi:type="varchar" name="last_view_version" nullable="false" length="16"
-                 comment="Viewer last view on product version"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="RELEASE_NOTIFICATION_VIEWER_LOG_VIEWER_ID_ADMIN_USER_USER_ID"
-+        <constraint xsi:type="foreign" referenceId="RELEASE_NOTIFICATION_VIEWER_LOG_VIEWER_ID_ADMIN_USER_USER_ID"
-                     table="release_notification_viewer_log" column="viewer_id" referenceTable="admin_user"
-                     referenceColumn="user_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="RELEASE_NOTIFICATION_VIEWER_LOG_VIEWER_ID">
-+        <constraint xsi:type="unique" referenceId="RELEASE_NOTIFICATION_VIEWER_LOG_VIEWER_ID">
-             <column name="viewer_id"/>
-         </constraint>
-     </table>
-diff --git a/app/code/Magento/ReleaseNotification/etc/di.xml b/app/code/Magento/ReleaseNotification/etc/di.xml
-index 1404a6adb0a..a4c434ff7f6 100644
---- a/app/code/Magento/ReleaseNotification/etc/di.xml
-+++ b/app/code/Magento/ReleaseNotification/etc/di.xml
-@@ -6,7 +6,6 @@
-  */
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
--    <preference for="Magento\Framework\HTTP\ClientInterface" type="Magento\Framework\HTTP\Client\Curl" />
-     <preference for="Magento\ReleaseNotification\Model\ContentProviderInterface" type="Magento\ReleaseNotification\Model\ContentProvider\Http\HttpContentProvider" />
-     <type name="Magento\Config\Model\Config\TypePool">
-         <arguments>
-diff --git a/app/code/Magento/ReleaseNotification/i18n/en_US.csv b/app/code/Magento/ReleaseNotification/i18n/en_US.csv
-index 426cdc0e863..178482dc7a9 100644
---- a/app/code/Magento/ReleaseNotification/i18n/en_US.csv
-+++ b/app/code/Magento/ReleaseNotification/i18n/en_US.csv
-@@ -5,11 +5,11 @@
- "<![CDATA[
-     <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
-     <p>To learn more about new features, see our latest Release Notes in
--    <a href=""http://devdocs.magento.com/magento-release-information.html""
-+    <a href=""https://devdocs.magento.com/magento-release-information.html""
-     target=""_blank"">DevDocs' Release Information</a>.
-     </p>]]>","<![CDATA[
-     <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
-     <p>To learn more about new features, see our latest Release Notes in
--    <a href=""http://devdocs.magento.com/magento-release-information.html""
-+    <a href=""https://devdocs.magento.com/magento-release-information.html""
-     target=""_blank"">DevDocs' Release Information</a>.
-     </p>]]>"
-diff --git a/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml b/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml
-index 3134b2a8af2..9c6d152bed2 100644
---- a/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml
-+++ b/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml
-@@ -67,7 +67,7 @@
-                         <item name="text" xsi:type="string" translate="true"><![CDATA[
-                         <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
-                         <p>To learn more about new features, see our latest Release Notes in
--                        <a href="http://devdocs.magento.com/magento-release-information.html"
-+                        <a href="https://devdocs.magento.com/magento-release-information.html"
-                         target="_blank">DevDocs' Release Information</a>.
-                         </p>]]></item>
-                     </item>
-@@ -127,7 +127,7 @@
-                         <item name="text" xsi:type="string" translate="true"><![CDATA[
-                         <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
-                         <p>To learn more about new features, see our latest Release Notes in
--                        <a href="http://devdocs.magento.com/magento-release-information.html"
-+                        <a href="https://devdocs.magento.com/magento-release-information.html"
-                         target="_blank">DevDocs' Release Information</a>.
-                         </p>]]></item>
-                     </item>
-@@ -208,7 +208,7 @@
-                         <item name="text" xsi:type="string" translate="true"><![CDATA[
-                         <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
-                         <p>To learn more about new features, see our latest Release Notes in
--                        <a href="http://devdocs.magento.com/magento-release-information.html"
-+                        <a href="https://devdocs.magento.com/magento-release-information.html"
-                         target="_blank">DevDocs' Release Information</a>.
-                         </p>]]></item>
-                     </item>
-@@ -289,7 +289,7 @@
-                         <item name="text" xsi:type="string" translate="true"><![CDATA[
-                         <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
-                         <p>To learn more about new features, see our latest Release Notes in
--                        <a href="http://devdocs.magento.com/magento-release-information.html"
-+                        <a href="https://devdocs.magento.com/magento-release-information.html"
-                         target="_blank">DevDocs' Release Information</a>.
-                         </p>]]></item>
-                     </item>
-diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
-index 2bb4dcd1efb..32073cf0b7a 100644
---- a/app/code/Magento/Reports/Block/Adminhtml/Grid.php
-+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
-@@ -6,6 +6,12 @@
- 
- namespace Magento\Reports\Block\Adminhtml;
- 
-+use Magento\Backend\Block\Template\Context;
-+use Magento\Backend\Helper\Data;
-+use Magento\Framework\Url\DecoderInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Stdlib\Parameters;
-+
- /**
-  * Backend report grid block
-  *
-@@ -15,6 +21,16 @@ namespace Magento\Reports\Block\Adminhtml;
-  */
- class Grid extends \Magento\Backend\Block\Widget\Grid
- {
-+    /**
-+     * @var DecoderInterface
-+     */
-+    private $urlDecoder;
-+
-+    /**
-+     * @var Parameters
-+     */
-+    private $parameters;
-+
-     /**
-      * Should Store Switcher block be visible
-      *
-@@ -71,6 +87,31 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
-      */
-     protected $_filterValues;
- 
-+    /**
-+     * @param Context $context
-+     * @param Data $backendHelper
-+     * @param array $data
-+     * @param DecoderInterface|null $urlDecoder
-+     * @param Parameters|null $parameters
-+     */
-+    public function __construct(
-+        Context $context,
-+        Data $backendHelper,
-+        array $data = [],
-+        DecoderInterface $urlDecoder = null,
-+        Parameters $parameters = null
-+    ) {
-+        $this->urlDecoder = $urlDecoder ?? ObjectManager::getInstance()->get(
-+            DecoderInterface::class
-+        );
-+
-+        $this->parameters = $parameters ?? ObjectManager::getInstance()->get(
-+            Parameters::class
-+        );
-+
-+        parent::__construct($context, $backendHelper, $data);
-+    }
-+
-     /**
-      * Apply sorting and filtering to collection
-      *
-@@ -86,13 +127,16 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
-         }
- 
-         if (is_string($filter)) {
--            $data = [];
--            $filter = base64_decode($filter);
--            parse_str(urldecode($filter), $data);
-+            // this is a replacement for base64_decode()
-+            $filter = $this->urlDecoder->decode($filter);
-+
-+            // this is a replacement for parse_str()
-+            $this->parameters->fromString(urldecode($filter));
-+            $data = $this->parameters->toArray();
- 
-             if (!isset($data['report_from'])) {
--                // getting all reports from 2001 year
--                $date = (new \DateTime())->setTimestamp(mktime(0, 0, 0, 1, 1, 2001));
-+                // Get records for the past month
-+                $date = new \DateTime('-1 month');
-                 $data['report_from'] = $this->_localeDate->formatDateTime(
-                     $date,
-                     \IntlDateFormatter::SHORT,
-@@ -101,7 +145,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
-             }
- 
-             if (!isset($data['report_to'])) {
--                // getting all reports from 2001 year
-                 $date = new \DateTime();
-                 $data['report_to'] = $this->_localeDate->formatDateTime(
-                     $date,
-@@ -113,7 +156,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
-             $this->_setFilterValues($data);
-         } elseif ($filter && is_array($filter)) {
-             $this->_setFilterValues($filter);
--        } elseif (0 !== sizeof($this->_defaultFilter)) {
-+        } elseif (0 !== count($this->_defaultFilter)) {
-             $this->_setFilterValues($this->_defaultFilter);
-         }
- 
-@@ -127,8 +170,8 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
-                  * Validate from and to date
-                  */
-                 try {
--                    $from = $this->_localeDate->scopeDate(null, $this->getFilter('report_from'), false);
--                    $to = $this->_localeDate->scopeDate(null, $this->getFilter('report_to'), false);
-+                    $from = $this->_localeDate->date($this->getFilter('report_from'), null, false, false);
-+                    $to = $this->_localeDate->date($this->getFilter('report_to'), null, false, false);
- 
-                     $collection->setInterval($from, $to);
-                 } catch (\Exception $e) {
-@@ -215,8 +258,8 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
- 
-     /**
-      * Return visibility of store switcher
--     * @codeCoverageIgnore
-      *
-+     * @codeCoverageIgnore
-      * @return bool
-      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-      */
-@@ -227,8 +270,8 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
- 
-     /**
-      * Return store switcher html
--     * @codeCoverageIgnore
-      *
-+     * @codeCoverageIgnore
-      * @return string
-      */
-     public function getStoreSwitcherHtml()
-@@ -250,8 +293,8 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
- 
-     /**
-      * Return visibility of date filter
--     * @codeCoverageIgnore
-      *
-+     * @codeCoverageIgnore
-      * @return bool
-      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-      */
-@@ -262,8 +305,8 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
- 
-     /**
-      * Return date filter html
--     * @codeCoverageIgnore
-      *
-+     * @codeCoverageIgnore
-      * @return string
-      */
-     public function getDateFilterHtml()
-@@ -293,8 +336,8 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
- 
-     /**
-      * Return refresh button html
--     * @codeCoverageIgnore
-      *
-+     * @codeCoverageIgnore
-      * @return string
-      */
-     public function getRefreshButtonHtml()
-@@ -328,7 +371,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
-         if (isset($this->_filters[$name])) {
-             return $this->_filters[$name];
-         } else {
--            return $this->getRequest()->getParam($name) ? htmlspecialchars($this->getRequest()->getParam($name)) : '';
-+            return $this->getRequest()->getParam($name) ? $this->escapeHtml($this->getRequest()->getParam($name)) : '';
-         }
-     }
- 
-@@ -346,8 +389,8 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
- 
-     /**
-      * Return sub-report rows count
--     * @codeCoverageIgnore
-      *
-+     * @codeCoverageIgnore
-      * @return int
-      */
-     public function getSubReportSize()
-diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
-index 158455db264..2ff87237222 100644
---- a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
-+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
-@@ -3,8 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Reports\Block\Adminhtml\Grid;
- 
-+/**
-+ * Backend reports grid
-+ */
- class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
- {
-     /**
-@@ -90,9 +94,8 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
-     /**
-      * Get resource collection name
-      *
--     * @codeCoverageIgnore
--     *
-      * @return string
-+     * @codeCoverageIgnore
-      */
-     public function getResourceCollectionName()
-     {
-@@ -100,6 +103,8 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
-+     * Return reports collection
-+     *
-      * @return \Magento\Framework\Data\Collection
-      */
-     public function getCollection()
-@@ -111,6 +116,8 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
-+     * Retrieve array of columns that should be aggregated
-+     *
-      * @return array
-      */
-     protected function _getAggregatedColumns()
-@@ -170,12 +177,7 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
-      */
-     protected function _getStoreIds()
-     {
--        $filterData = $this->getFilterData();
--        if ($filterData) {
--            $storeIds = explode(',', $filterData->getData('store_ids'));
--        } else {
--            $storeIds = [];
--        }
-+        $storeIds = $this->getFilteredStores();
-         // By default storeIds array contains only allowed stores
-         $allowedStoreIds = array_keys($this->_storeManager->getStores());
-         // And then array_intersect with post data for prevent unauthorized stores reports
-@@ -191,6 +193,8 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
-+     * Apply sorting and filtering to collection
-+     *
-      * @return $this|\Magento\Backend\Block\Widget\Grid
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-@@ -280,6 +284,8 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
-+     * Return count totals
-+     *
-      * @return array
-      */
-     public function getCountTotals()
-@@ -302,6 +308,7 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
-             );
- 
-             $this->_addOrderStatusFilter($totalsCollection, $filterData);
-+            $this->_addCustomFilter($totalsCollection, $filterData);
- 
-             if ($totalsCollection->load()->getSize() < 1 || !$filterData->getData('from')) {
-                 $this->setTotals(new \Magento\Framework\DataObject());
-@@ -313,10 +320,13 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
-                 }
-             }
-         }
-+
-         return parent::getCountTotals();
-     }
- 
-     /**
-+     * Retrieve subtotal items
-+     *
-      * @return array
-      */
-     public function getSubTotals()
-@@ -358,6 +368,8 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
-     }
- 
-     /**
-+     * Return current currency code
-+     *
-      * @return string|\Magento\Directory\Model\Currency $currencyCode
-      */
-     public function getCurrentCurrencyCode()
-@@ -397,6 +409,7 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
- 
-     /**
-      * Adds custom filter to resource collection
-+     *
-      * Can be overridden in child classes if custom filter needed
-      *
-      * @param \Magento\Reports\Model\ResourceModel\Report\Collection\AbstractCollection $collection
-@@ -409,4 +422,35 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
-     {
-         return $this;
-     }
-+
-+    /**
-+     * Return stores by website, group and store id
-+     *
-+     * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function getFilteredStores(): array
-+    {
-+        $storeIds = [];
-+
-+        $filterData = $this->getFilterData();
-+        if ($filterData) {
-+            if ($filterData->getWebsite()) {
-+                $storeIds = array_keys(
-+                    $this->_storeManager->getWebsite($filterData->getWebsite())->getStores()
-+                );
-+            }
-+
-+            if ($filterData->getGroup()) {
-+                $storeIds = array_keys(
-+                    $this->_storeManager->getGroup($filterData->getGroup())->getStores()
-+                );
-+            }
-+
-+            if ($filterData->getData('store_ids')) {
-+                $storeIds = explode(',', $filterData->getData('store_ids'));
-+            }
-+        }
-+        return is_array($storeIds) ? $storeIds : [];
-+    }
- }
-diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
-index 260d7bb5067..f22b3e7bb96 100644
---- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
-+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
-@@ -30,7 +30,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Curren
-             return $data;
-         }
- 
--        $data = floatval($data) * $this->_getRate($row);
-+        $data = (float)$data * $this->_getRate($row);
-         $data = sprintf("%f", $data);
-         $data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
-         return $data;
-diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
-index 21836f1a8c2..25a4aa1b88c 100644
---- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
-+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
-@@ -6,23 +6,61 @@
- 
- namespace Magento\Reports\Block\Adminhtml\Sales\Sales;
- 
-+use Magento\Framework\DataObject;
-+use Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Sales\Model\Order\ConfigFactory;
-+use Magento\Sales\Model\Order;
-+
- /**
-  * Adminhtml sales report grid block
-  *
-- * @author      Magento Core Team <core@magentocommerce.com>
-  * @SuppressWarnings(PHPMD.DepthOfInheritance)
-  */
- class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
- {
-     /**
--     * GROUP BY criteria
--     *
-      * @var string
-      */
-     protected $_columnGroupBy = 'period';
- 
-     /**
--     * {@inheritdoc}
-+     * @var ConfigFactory
-+     */
-+    private $configFactory;
-+
-+    /**
-+     * @param \Magento\Backend\Block\Template\Context $context
-+     * @param \Magento\Backend\Helper\Data $backendHelper
-+     * @param \Magento\Reports\Model\ResourceModel\Report\Collection\Factory $resourceFactory
-+     * @param \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory
-+     * @param \Magento\Reports\Helper\Data $reportsData
-+     * @param array $data
-+     * @param ConfigFactory|null $configFactory
-+     */
-+    public function __construct(
-+        \Magento\Backend\Block\Template\Context $context,
-+        \Magento\Backend\Helper\Data $backendHelper,
-+        \Magento\Reports\Model\ResourceModel\Report\Collection\Factory $resourceFactory,
-+        \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory,
-+        \Magento\Reports\Helper\Data $reportsData,
-+        array $data = [],
-+        ConfigFactory $configFactory = null
-+    ) {
-+        parent::__construct(
-+            $context,
-+            $backendHelper,
-+            $resourceFactory,
-+            $collectionFactory,
-+            $reportsData,
-+            $data
-+        );
-+        $this->configFactory = $configFactory ?: ObjectManager::getInstance()->get(ConfigFactory::class);
-+    }
-+
-+    /**
-+     * Reports grid constructor
-+     *
-      * @codeCoverageIgnore
-      */
-     protected function _construct()
-@@ -32,17 +70,19 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Return collection name based on report_type
-+     *
-+     * @return string
-      */
-     public function getResourceCollectionName()
-     {
--        return $this->getFilterData()->getData('report_type') == 'updated_at_order'
-+        return $this->getFilterData()->getData('report_type') === 'updated_at_order'
-             ? \Magento\Sales\Model\ResourceModel\Report\Order\Updatedat\Collection::class
-             : \Magento\Sales\Model\ResourceModel\Report\Order\Collection::class;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Initialize reports grid columns
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-@@ -103,9 +143,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-             ]
-         );
- 
--        if ($this->getFilterData()->getStoreIds()) {
--            $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
--        }
-+        $this->setStoreIds($this->_getStoreIds());
-         $currencyCode = $this->getCurrentCurrencyCode();
-         $rate = $this->getRate($currencyCode);
- 
-@@ -118,6 +156,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-                 'index' => 'total_income_amount',
-                 'total' => 'sum',
-                 'sortable' => false,
-+                'renderer' => Currency::class,
-                 'rate' => $rate,
-                 'header_css_class' => 'col-sales-total',
-                 'column_css_class' => 'col-sales-total'
-@@ -133,6 +172,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-                 'index' => 'total_revenue_amount',
-                 'total' => 'sum',
-                 'sortable' => false,
-+                'renderer' => Currency::class,
-                 'visibility_filter' => ['show_actual_columns'],
-                 'rate' => $rate,
-                 'header_css_class' => 'col-revenue',
-@@ -149,6 +189,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-                 'index' => 'total_profit_amount',
-                 'total' => 'sum',
-                 'sortable' => false,
-+                'renderer' => Currency::class,
-                 'visibility_filter' => ['show_actual_columns'],
-                 'rate' => $rate,
-                 'header_css_class' => 'col-profit',
-@@ -165,6 +206,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-                 'index' => 'total_invoiced_amount',
-                 'total' => 'sum',
-                 'sortable' => false,
-+                'renderer' => Currency::class,
-                 'rate' => $rate,
-                 'header_css_class' => 'col-invoiced',
-                 'column_css_class' => 'col-invoiced'
-@@ -180,6 +222,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-                 'index' => 'total_paid_amount',
-                 'total' => 'sum',
-                 'sortable' => false,
-+                'renderer' => Currency::class,
-                 'visibility_filter' => ['show_actual_columns'],
-                 'rate' => $rate,
-                 'header_css_class' => 'col-paid',
-@@ -196,6 +239,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-                 'index' => 'total_refunded_amount',
-                 'total' => 'sum',
-                 'sortable' => false,
-+                'renderer' => Currency::class,
-                 'rate' => $rate,
-                 'header_css_class' => 'col-refunded',
-                 'column_css_class' => 'col-refunded'
-@@ -211,6 +255,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-                 'index' => 'total_tax_amount',
-                 'total' => 'sum',
-                 'sortable' => false,
-+                'renderer' => Currency::class,
-                 'rate' => $rate,
-                 'header_css_class' => 'col-sales-tax',
-                 'column_css_class' => 'col-sales-tax'
-@@ -226,6 +271,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-                 'index' => 'total_tax_amount_actual',
-                 'total' => 'sum',
-                 'sortable' => false,
-+                'renderer' => Currency::class,
-                 'visibility_filter' => ['show_actual_columns'],
-                 'rate' => $rate,
-                 'header_css_class' => 'col-tax',
-@@ -242,6 +288,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-                 'index' => 'total_shipping_amount',
-                 'total' => 'sum',
-                 'sortable' => false,
-+                'renderer' => Currency::class,
-                 'rate' => $rate,
-                 'header_css_class' => 'col-sales-shipping',
-                 'column_css_class' => 'col-sales-shipping'
-@@ -257,6 +304,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-                 'index' => 'total_shipping_amount_actual',
-                 'total' => 'sum',
-                 'sortable' => false,
-+                'renderer' => Currency::class,
-                 'visibility_filter' => ['show_actual_columns'],
-                 'rate' => $rate,
-                 'header_css_class' => 'col-shipping',
-@@ -273,6 +321,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-                 'index' => 'total_discount_amount',
-                 'total' => 'sum',
-                 'sortable' => false,
-+                'renderer' => Currency::class,
-                 'rate' => $rate,
-                 'header_css_class' => 'col-sales-discount',
-                 'column_css_class' => 'col-sales-discount'
-@@ -288,6 +337,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-                 'index' => 'total_discount_amount_actual',
-                 'total' => 'sum',
-                 'sortable' => false,
-+                'renderer' => Currency::class,
-                 'visibility_filter' => ['show_actual_columns'],
-                 'rate' => $rate,
-                 'header_css_class' => 'col-discount',
-@@ -304,6 +354,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-                 'index' => 'total_canceled_amount',
-                 'total' => 'sum',
-                 'sortable' => false,
-+                'renderer' => Currency::class,
-                 'rate' => $rate,
-                 'header_css_class' => 'col-canceled',
-                 'column_css_class' => 'col-canceled'
-@@ -315,4 +366,30 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
- 
-         return parent::_prepareColumns();
-     }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * Filter canceled statuses for orders.
-+     *
-+     * @return Grid
-+     */
-+    protected function _prepareCollection()
-+    {
-+        /** @var DataObject $filterData */
-+        $filterData = $this->getData('filter_data');
-+        if (!$filterData->hasData('order_statuses')) {
-+            $orderConfig = $this->configFactory->create();
-+            $statusValues = [];
-+            $canceledStatuses = $orderConfig->getStateStatuses(Order::STATE_CANCELED);
-+            $statusCodes = array_keys($orderConfig->getStatuses());
-+            foreach ($statusCodes as $code) {
-+                if (!isset($canceledStatuses[$code])) {
-+                    $statusValues[] = $code;
-+                }
-+            }
-+            $filterData->setData('order_statuses', $statusValues);
-+        }
-+        return parent::_prepareCollection();
-+    }
- }
-diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
-index 79deb27423b..f65a2b964fb 100644
---- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
-+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
-@@ -53,7 +53,8 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-      * @codeCoverageIgnore
-      */
-     protected function _construct()
-@@ -64,7 +65,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getResourceCollectionName()
-     {
-@@ -74,7 +75,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _prepareColumns()
-     {
-@@ -123,7 +124,6 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-             [
-                 'header' => __('Orders'),
-                 'index' => 'orders_count',
--                'total' => 'sum',
-                 'type' => 'number',
-                 'sortable' => false,
-                 'header_css_class' => 'col-qty',
-diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
-index f81176b7a11..5a92b6ab4e7 100644
---- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
-+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
-@@ -37,6 +37,8 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
-     }
- 
-     /**
-+     * Grid constructor
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -46,6 +48,8 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
-     }
- 
-     /**
-+     * Prepare collection
-+     *
-      * @return \Magento\Backend\Block\Widget\Grid
-      */
-     protected function _prepareCollection()
-@@ -67,11 +71,16 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
- 
-         $this->setCollection($collection);
-         parent::_prepareCollection();
-+        if ($this->_isExport) {
-+            $collection->setPageSize(null);
-+        }
-         $this->getCollection()->resolveCustomerNames();
-         return $this;
-     }
- 
-     /**
-+     * Add column filter to collection
-+     *
-      * @param array $column
-      *
-      * @return $this
-@@ -90,6 +99,8 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
-     }
- 
-     /**
-+     * Prepare columns
-+     *
-      * @return \Magento\Backend\Block\Widget\Grid\Extended
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-@@ -223,6 +234,8 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
-     }
- 
-     /**
-+     * Get rows url
-+     *
-      * @param \Magento\Framework\DataObject $row
-      *
-      * @return string
-diff --git a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
-index 1ca76cb1cf9..dd42874b557 100644
---- a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
-+++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
-@@ -9,6 +9,7 @@ namespace Magento\Reports\Block\Adminhtml;
- /**
-  * Adminhtml wishlist report page content block
-  *
-+ * @deprecated
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
- class Wishlist extends \Magento\Backend\Block\Template
-@@ -44,7 +45,7 @@ class Wishlist extends \Magento\Backend\Block\Template
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _beforeToHtml()
-     {
-diff --git a/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php b/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php
-index 04a402c9ac4..12959f083d3 100644
---- a/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php
-+++ b/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php
-@@ -8,6 +8,7 @@ namespace Magento\Reports\Block\Product\Widget\Viewed;
- /**
-  * Reports Recently Viewed Products Widget
-  *
-+ * @deprecated
-  * @author     Magento Core Team <core@magentocommerce.com>
-  */
- class Item extends \Magento\Catalog\Block\Product\AbstractProduct implements \Magento\Widget\Block\BlockInterface
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
-index 3dbced45e0a..2fbff13a5b6 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
-@@ -9,13 +9,18 @@
-  *
-  * @author     Magento Core Team <core@magentocommerce.com>
-  */
-+
- namespace Magento\Reports\Controller\Adminhtml\Report;
- 
-+use Magento\Backend\Helper\Data as BackendHelper;
- use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
- 
- /**
-+ * Reports api controller
-+ *
-  * @api
-  * @since 100.0.2
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-  */
- abstract class AbstractReport extends \Magento\Backend\App\Action
- {
-@@ -41,22 +46,30 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
-      */
-     protected $timezone;
- 
-+    /**
-+     * @var BackendHelper
-+     */
-+    private $backendHelper;
-+
-     /**
-      * @param \Magento\Backend\App\Action\Context $context
-      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
-      * @param TimezoneInterface $timezone
-+     * @param BackendHelper|null $backendHelperData
-      */
-     public function __construct(
-         \Magento\Backend\App\Action\Context $context,
-         \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
-         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
--        TimezoneInterface $timezone
-+        TimezoneInterface $timezone,
-+        BackendHelper $backendHelperData = null
-     ) {
-         parent::__construct($context);
-         $this->_fileFactory = $fileFactory;
-         $this->_dateFilter = $dateFilter;
-         $this->timezone = $timezone;
-+        $this->backendHelper = $backendHelperData ?: $this->_objectManager->get(BackendHelper::class);
-     }
- 
-     /**
-@@ -103,25 +116,7 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
-             $blocks = [$blocks];
-         }
- 
--        $requestData = $this->_objectManager->get(
--            \Magento\Backend\Helper\Data::class
--        )->prepareFilterString(
--            $this->getRequest()->getParam('filter')
--        );
--        $inputFilter = new \Zend_Filter_Input(
--            ['from' => $this->_dateFilter, 'to' => $this->_dateFilter],
--            [],
--            $requestData
--        );
--        $requestData = $inputFilter->getUnescaped();
--        $requestData['store_ids'] = $this->getRequest()->getParam('store_ids');
--        $params = new \Magento\Framework\DataObject();
--
--        foreach ($requestData as $key => $value) {
--            if (!empty($value)) {
--                $params->setData($key, $value);
--            }
--        }
-+        $params = $this->initFilterData();
- 
-         foreach ($blocks as $block) {
-             if ($block) {
-@@ -147,7 +142,7 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
-             ->loadSelf();
-         $updatedAt = 'undefined';
-         if ($flag->hasData()) {
--            $updatedAt =  $this->timezone->formatDate(
-+            $updatedAt = $this->timezone->formatDate(
-                 $flag->getLastUpdate(),
-                 \IntlDateFormatter::MEDIUM,
-                 true
-@@ -155,17 +150,51 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
-         }
- 
-         $refreshStatsLink = $this->getUrl('reports/report_statistics');
--        $directRefreshLink = $this->getUrl('reports/report_statistics/refreshRecent', ['code' => $refreshCode]);
-+        $directRefreshLink = $this->getUrl('reports/report_statistics/refreshRecent');
- 
-         $this->messageManager->addNotice(
-             __(
-                 'Last updated: %1. To refresh last day\'s <a href="%2">statistics</a>, ' .
--                'click <a href="%3">here</a>.',
-+                'click <a href="#2" data-post="%3">here</a>.',
-                 $updatedAt,
-                 $refreshStatsLink,
--                $directRefreshLink
-+                str_replace(
-+                    '"',
-+                    '&quot;',
-+                    json_encode(['action' => $directRefreshLink, 'data' => ['code' => $refreshCode]])
-+                )
-             )
-         );
-         return $this;
-     }
-+
-+    /**
-+     * Init filter data
-+     *
-+     * @return \Magento\Framework\DataObject
-+     */
-+    private function initFilterData(): \Magento\Framework\DataObject
-+    {
-+        $requestData = $this->backendHelper
-+            ->prepareFilterString(
-+                $this->getRequest()->getParam('filter')
-+            );
-+
-+        $filterRules = ['from' => $this->_dateFilter, 'to' => $this->_dateFilter];
-+        $inputFilter = new \Zend_Filter_Input($filterRules, [], $requestData);
-+
-+        $requestData = $inputFilter->getUnescaped();
-+        $requestData['store_ids'] = $this->getRequest()->getParam('store_ids');
-+        $requestData['group'] = $this->getRequest()->getParam('group');
-+        $requestData['website'] = $this->getRequest()->getParam('website');
-+
-+        $params = new \Magento\Framework\DataObject();
-+
-+        foreach ($requestData as $key => $value) {
-+            if (!empty($value)) {
-+                $params->setData($key, $value);
-+            }
-+        }
-+        return $params;
-+    }
- }
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php
-index ae1c0401add..f8d0cbe9e69 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Customer;
- 
--class Accounts extends \Magento\Reports\Controller\Adminhtml\Report\Customer
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Accounts extends \Magento\Reports\Controller\Adminhtml\Report\Customer implements HttpGetActionInterface
- {
-     /**
-      * New accounts action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php
-index 56a594ac24e..be46fb6a94c 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Customer;
- 
--class Orders extends \Magento\Reports\Controller\Adminhtml\Report\Customer
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Orders extends \Magento\Reports\Controller\Adminhtml\Report\Customer implements HttpGetActionInterface
- {
-     /**
-      * Customers by number of orders action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php
-index 17928872eba..02f40e5be98 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Customer;
- 
--class Totals extends \Magento\Reports\Controller\Adminhtml\Report\Customer
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Totals extends \Magento\Reports\Controller\Adminhtml\Report\Customer implements HttpGetActionInterface
- {
-     /**
-      * Customers by orders total action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php
-index e8df3118caa..f2c03d0dc22 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Product;
- 
--class Downloads extends \Magento\Reports\Controller\Adminhtml\Report\Product
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Downloads extends \Magento\Reports\Controller\Adminhtml\Report\Product implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php
-index b5e3602383f..266d6a85341 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Product;
- 
--class Lowstock extends \Magento\Reports\Controller\Adminhtml\Report\Product
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Lowstock extends \Magento\Reports\Controller\Adminhtml\Report\Product implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php
-index 19b8258beaa..f01c46f4c14 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Product;
- 
--class Sold extends \Magento\Reports\Controller\Adminhtml\Report\Product
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Sold extends \Magento\Reports\Controller\Adminhtml\Report\Product implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php
-index 07beec5a727..980540fb1fa 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Product;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Reports\Model\Flag;
- 
--class Viewed extends \Magento\Reports\Controller\Adminhtml\Report\Product
-+class Viewed extends \Magento\Reports\Controller\Adminhtml\Report\Product implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php
-index 50b1f79abd4..481522b86f0 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Review;
- 
--class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Review
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Review implements HttpGetActionInterface
- {
-     /**
-      * Customer Reviews Report action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php
-index 3d0ebc5f568..911a313377c 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Review;
- 
--class Product extends \Magento\Reports\Controller\Adminhtml\Report\Review
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Product extends \Magento\Reports\Controller\Adminhtml\Report\Review implements HttpGetActionInterface
- {
-     /**
-      * Product reviews report action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php
-index 60f8cc87f2a..eff3796b6d4 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Reports\Model\Flag;
- 
--class Bestsellers extends \Magento\Reports\Controller\Adminhtml\Report\Sales
-+class Bestsellers extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface
- {
-     /**
-      * Bestsellers report action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php
-index 2e324bceee3..d9e83cd77b9 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Reports\Model\Flag;
- 
--class Coupons extends \Magento\Reports\Controller\Adminhtml\Report\Sales
-+class Coupons extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface
- {
-     /**
-      * Coupons report action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php
-index f533d597990..c26b0f931e6 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Reports\Model\Flag;
- 
--class Invoiced extends \Magento\Reports\Controller\Adminhtml\Report\Sales
-+class Invoiced extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface
- {
-     /**
-      * Invoice report action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php
-index 85c5fdaed42..f88e9f64b97 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Reports\Model\Flag;
- 
--class Refunded extends \Magento\Reports\Controller\Adminhtml\Report\Sales
-+class Refunded extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface
- {
-     /**
-      * Refunds report action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php
-index d6460864c5c..e3f383ab5a7 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Reports\Model\Flag;
- 
--class Sales extends \Magento\Reports\Controller\Adminhtml\Report\Sales
-+class Sales extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface
- {
-     /**
-      * Sales report action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php
-index e8ae11088f5..2e6ba487f39 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Reports\Model\Flag;
- 
--class Tax extends \Magento\Reports\Controller\Adminhtml\Report\Sales
-+class Tax extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface
- {
-     /**
-      * Tax report action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php
-index e03f2f65560..3f0567c05a9 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
- 
--class Abandoned extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Abandoned extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart implements HttpGetActionInterface
- {
-     /**
-      * Abandoned carts action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php
-index 65db66f2d2e..b41c901fe85 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
- 
--class Product extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Product extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart implements HttpGetActionInterface
- {
-     /**
-      * Products in carts action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
-index 6ba5b71b6c0..f4d2b962b9c 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
-@@ -4,21 +4,19 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Report statistics admin controller
-- *
-- * @author      Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Reports\Controller\Adminhtml\Report;
- 
- use Magento\Backend\Model\Auth\Session as AuthSession;
- use Magento\Backend\Model\Session;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- 
- /**
-+ * Report statistics admin controller.
-+ *
-  * @api
-  * @since 100.0.2
-  */
--abstract class Statistics extends \Magento\Backend\App\Action
-+abstract class Statistics extends \Magento\Backend\App\Action implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -49,7 +47,7 @@ abstract class Statistics extends \Magento\Backend\App\Action
-     /**
-      * @param \Magento\Backend\App\Action\Context $context
-      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
--     * @param [] $reportTypes
-+     * @param array $reportTypes
-      */
-     public function __construct(
-         \Magento\Backend\App\Action\Context $context,
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php
-index d9f9de39657..61ec31337db 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Statistics;
- 
--class Index extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Reports\Controller\Adminhtml\Report\Statistics implements HttpGetActionInterface
- {
-     /**
-      * Refresh statistics action
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
-index 1b7ae6398d3..b8683945935 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
-@@ -1,12 +1,17 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Statistics;
- 
--class RefreshLifetime extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+use Magento\Reports\Controller\Adminhtml\Report\Statistics;
-+
-+/**
-+ * Refresh statistics action.
-+ */
-+class RefreshLifetime extends Statistics implements HttpPostActionInterface
- {
-     /**
-      * Refresh statistics for all period
-diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
-index 1f0f6e8e405..66123938243 100644
---- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
-+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
-@@ -6,7 +6,12 @@
-  */
- namespace Magento\Reports\Controller\Adminhtml\Report\Statistics;
- 
--class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+/**
-+ * Refresh recent stats.
-+ */
-+class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Statistics implements HttpPostActionInterface
- {
-     /**
-      * Refresh statistics for last 25 hours
-diff --git a/app/code/Magento/Reports/Helper/Data.php b/app/code/Magento/Reports/Helper/Data.php
-index 411c7dde14c..cd105eb5f4b 100644
---- a/app/code/Magento/Reports/Helper/Data.php
-+++ b/app/code/Magento/Reports/Helper/Data.php
-@@ -4,15 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Reports data helper
-- */
- namespace Magento\Reports\Helper;
- 
- use Magento\Framework\Data\Collection;
--use Magento\Framework\Stdlib\DateTime;
- 
- /**
-+ * Reports data helper.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -63,22 +61,27 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
- 
-         $dateStart = new \DateTime($from);
-         $dateEnd = new \DateTime($to);
-+        $dateFormat = 'Y-m-d';
-+        $dateInterval = new \DateInterval('P1D');
-+        switch ($period) {
-+            case self::REPORT_PERIOD_TYPE_MONTH:
-+                $dateFormat = 'Y-m';
-+                $dateInterval = new \DateInterval('P1M');
-+                break;
-+            case self::REPORT_PERIOD_TYPE_YEAR:
-+                $dateFormat = 'Y';
-+                $dateInterval = new \DateInterval('P1Y');
-+                break;
-+        }
-         while ($dateStart->diff($dateEnd)->invert == 0) {
--            switch ($period) {
--                case self::REPORT_PERIOD_TYPE_DAY:
--                    $intervals[] = $dateStart->format('Y-m-d');
--                    $dateStart->add(new \DateInterval('P1D'));
--                    break;
--                case self::REPORT_PERIOD_TYPE_MONTH:
--                    $intervals[] = $dateStart->format('Y-m');
--                    $dateStart->add(new \DateInterval('P1M'));
--                    break;
--                case self::REPORT_PERIOD_TYPE_YEAR:
--                    $intervals[] = $dateStart->format('Y');
--                    $dateStart->add(new \DateInterval('P1Y'));
--                    break;
--            }
-+            $intervals[] = $dateStart->format($dateFormat);
-+            $dateStart->add($dateInterval);
-         }
-+
-+        if (!in_array($dateEnd->format($dateFormat), $intervals)) {
-+            $intervals[] = $dateEnd->format($dateFormat);
-+        }
-+
-         return $intervals;
-     }
- 
-diff --git a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
-index 5682892a77c..78b6b7d6c9a 100644
---- a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
-+++ b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
-@@ -7,8 +7,11 @@ namespace Magento\Reports\Model\Product\Index;
- 
- /**
-  * Reports Product Index Abstract Model
-+ *
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  * @since 100.0.2
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
- {
-@@ -113,7 +116,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
-     /**
-      * Retrieve visitor id
-      *
--     * if don't exists return current visitor id
-+     * If don't exists return current visitor id
-      *
-      * @return int
-      */
-@@ -128,7 +131,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
-     /**
-      * Retrieve customer id
-      *
--     * if customer don't logged in return null
-+     * If customer don't logged in return null
-      *
-      * @return int
-      */
-@@ -143,7 +146,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
-     /**
-      * Retrieve store id
-      *
--     * default return current store id
-+     * Default return current store id
-      *
-      * @return int
-      */
-@@ -156,7 +159,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
--     * On customer loggin merge visitor/customer index
-+     * On customer login merge visitor/customer index
-      *
-      * @return $this
-      */
-@@ -246,13 +249,14 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * Add product ids to current visitor/customer log
-+     *
-      * @param string[] $productIds
-      * @return $this
-      */
-     public function registerIds($productIds)
-     {
-         $this->_getResource()->registerIds($this, $productIds);
--        $this->_getSession()->unsData($this->_countCacheKey);
-+        $this->_getSession()->unsetData($this->_countCacheKey);
-         return $this;
-     }
- }
-diff --git a/app/code/Magento/Reports/Model/ReportStatus.php b/app/code/Magento/Reports/Model/ReportStatus.php
-new file mode 100644
-index 00000000000..d5d46116820
---- /dev/null
-+++ b/app/code/Magento/Reports/Model/ReportStatus.php
-@@ -0,0 +1,72 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Reports\Model;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\Exception\InputException;
-+
-+/**
-+ * Is report for specified event type is enabled in system configuration
-+ */
-+class ReportStatus
-+{
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * ReportStatus constructor.
-+     *
-+     * @param ScopeConfigInterface $scopeConfig
-+     */
-+    public function __construct(ScopeConfigInterface $scopeConfig)
-+    {
-+        $this->scopeConfig = $scopeConfig;
-+    }
-+
-+    /**
-+     * Is report for specified event type is enabled in system configuration
-+     *
-+     * @param string $reportEventType
-+     * @return bool
-+     * @throws InputException
-+     */
-+    public function isReportEnabled(string $reportEventType): bool
-+    {
-+        return $this->scopeConfig->isSetFlag('reports/options/enabled')
-+            && $this->scopeConfig->isSetFlag($this->getConfigPathByEventType($reportEventType));
-+    }
-+
-+    /**
-+     * Get Config Path By Event Type
-+     *
-+     * @param string $reportEventType
-+     * @return string
-+     * @throws InputException
-+     */
-+    private function getConfigPathByEventType(string $reportEventType): string
-+    {
-+        $typeToPathMap = [
-+            Event::EVENT_PRODUCT_VIEW => 'reports/options/product_view_enabled',
-+            Event::EVENT_PRODUCT_SEND => 'reports/options/product_send_enabled',
-+            Event::EVENT_PRODUCT_COMPARE => 'reports/options/product_compare_enabled',
-+            Event::EVENT_PRODUCT_TO_CART => 'reports/options/product_to_cart_enabled',
-+            Event::EVENT_PRODUCT_TO_WISHLIST => 'reports/options/product_to_wishlist_enabled',
-+            Event::EVENT_WISHLIST_SHARE => 'reports/options/wishlist_share_enabled',
-+        ];
-+
-+        if (!isset($typeToPathMap[$reportEventType])) {
-+            throw new InputException(
-+                __('System configuration is not found for report event type "%1"', $reportEventType)
-+            );
-+        }
-+
-+        return $typeToPathMap[$reportEventType];
-+    }
-+}
-diff --git a/app/code/Magento/Reports/Model/ResourceModel/Customer/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Customer/Collection.php
-index bc5ceda5348..b6e55af96f4 100644
---- a/app/code/Magento/Reports/Model/ResourceModel/Customer/Collection.php
-+++ b/app/code/Magento/Reports/Model/ResourceModel/Customer/Collection.php
-@@ -4,12 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Customers Report collection
-- */
- namespace Magento\Reports\Model\ResourceModel\Customer;
- 
- /**
-+ * Customers Report collection.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @api
-  * @since 100.0.2
-@@ -74,6 +73,7 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
-     protected $orderResource;
- 
-     /**
-+     * Collection constructor.
-      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
-      * @param \Psr\Log\LoggerInterface $logger
-      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-@@ -88,7 +88,7 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
-      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
-      * @param \Magento\Quote\Model\ResourceModel\Quote\Item\CollectionFactory $quoteItemFactory
-      * @param \Magento\Sales\Model\ResourceModel\Order\Collection $orderResource
--     * @param mixed $connection
-+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
-      * @param string $modelName
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
-index 82ebc74a046..d89a118bff9 100644
---- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
-+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
-@@ -3,7 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- namespace Magento\Reports\Model\ResourceModel\Order;
- 
- use Magento\Framework\DB\Select;
-@@ -81,7 +80,7 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
-      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-      * @param \Magento\Sales\Model\Order\Config $orderConfig
-      * @param \Magento\Sales\Model\ResourceModel\Report\OrderFactory $reportOrderFactory
--     * @param null $connection
-+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-@@ -446,7 +445,7 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
-                 break;
- 
-             case 'custom':
--                $dateStart = $customStart ? $customStart : $dateEnd;
-+                $dateStart = $customStart ? $customStart : $dateStart;
-                 $dateEnd = $customEnd ? $customEnd : $dateEnd;
-                 break;
- 
-@@ -770,11 +769,12 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
-      */
-     public function addRevenueToSelect($convertCurrency = false)
-     {
--        $expr = $this->getTotalsExpression(
-+        $expr = $this->getTotalsExpressionWithDiscountRefunded(
-             !$convertCurrency,
-             $this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
-             $this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
--            $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
-+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_refunded)', 0),
-+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_canceled)', 0)
-         );
-         $this->getSelect()->columns(['revenue' => $expr]);
- 
-@@ -792,11 +792,12 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
-         /**
-          * calculate average and total amount
-          */
--        $expr = $this->getTotalsExpression(
-+        $expr = $this->getTotalsExpressionWithDiscountRefunded(
-             $storeId,
-             $this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
-             $this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
--            $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
-+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_refunded)', 0),
-+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_canceled)', 0)
-         );
- 
-         $this->getSelect()->columns(
-@@ -809,13 +810,15 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
-     }
- 
-     /**
--     * Get SQL expression for totals
-+     * Get SQL expression for totals.
-      *
-      * @param int $storeId
-      * @param string $baseSubtotalRefunded
-      * @param string $baseSubtotalCanceled
-      * @param string $baseDiscountCanceled
-      * @return string
-+     * @deprecated
-+     * @see getTotalsExpressionWithDiscountRefunded
-      */
-     protected function getTotalsExpression(
-         $storeId,
-@@ -825,11 +828,41 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
-     ) {
-         $template = ($storeId != 0)
-             ? '(main_table.base_subtotal - %2$s - %1$s - ABS(main_table.base_discount_amount) - %3$s)'
--            : '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) - %3$s) '
--                . ' * main_table.base_to_global_rate)';
-+            : '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) + %3$s) '
-+            . ' * main_table.base_to_global_rate)';
-         return sprintf($template, $baseSubtotalRefunded, $baseSubtotalCanceled, $baseDiscountCanceled);
-     }
- 
-+    /**
-+     * Get SQL expression for totals with discount refunded.
-+     *
-+     * @param int $storeId
-+     * @param string $baseSubtotalRefunded
-+     * @param string $baseSubtotalCanceled
-+     * @param string $baseDiscountRefunded
-+     * @param string $baseDiscountCanceled
-+     * @return string
-+     */
-+    private function getTotalsExpressionWithDiscountRefunded(
-+        $storeId,
-+        $baseSubtotalRefunded,
-+        $baseSubtotalCanceled,
-+        $baseDiscountRefunded,
-+        $baseDiscountCanceled
-+    ) {
-+        $template = ($storeId != 0)
-+            ? '(main_table.base_subtotal - %2$s - %1$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s))'
-+            : '((main_table.base_subtotal - %1$s - %2$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s)) '
-+                . ' * main_table.base_to_global_rate)';
-+        return sprintf(
-+            $template,
-+            $baseSubtotalRefunded,
-+            $baseSubtotalCanceled,
-+            $baseDiscountRefunded,
-+            $baseDiscountCanceled
-+        );
-+    }
-+
-     /**
-      * Sort order by total amount
-      *
-diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
-index 337c87f6da0..d81f6c6f362 100644
---- a/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
-+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
-@@ -5,14 +5,15 @@
-  */
- 
- /**
-- * Products Report collection
-- *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
- namespace Magento\Reports\Model\ResourceModel\Product;
- 
- /**
-+ * Products Report collection.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @api
-  * @since 100.0.2
-  */
-@@ -75,7 +76,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
-@@ -88,7 +89,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      * @param \Magento\Reports\Model\Event\TypeFactory $eventTypeFactory
-      * @param \Magento\Catalog\Model\Product\Type $productType
-      * @param \Magento\Quote\Model\ResourceModel\Quote\Collection $quoteResource
--     * @param mixed $connection
-+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -103,7 +104,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-         \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
-@@ -149,7 +150,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
--     * Set Type for COUNT SQL Select
-+     * Set Type for COUNT SQL Select.
-+     *
-      * @codeCoverageIgnore
-      *
-      * @param int $type
-@@ -162,7 +164,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
--     * Set product entity id
-+     * Set product entity id.
-+     *
-      * @codeCoverageIgnore
-      *
-      * @param string $entityId
-@@ -175,7 +178,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
--     * Get product entity id
-+     * Get product entity id.
-+     *
-      * @codeCoverageIgnore
-      *
-      * @return int
-@@ -186,7 +190,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
--     * Set product entity table name
-+     * Set product entity table name.
-+     *
-      * @codeCoverageIgnore
-      *
-      * @param string $value
-@@ -199,7 +204,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
--     * Get product entity table name
-+     * Get product entity table name.
-+     *
-      * @codeCoverageIgnore
-      *
-      * @return string
-@@ -210,7 +216,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
--     * Get product attribute set  id
-+     * Get product attribute set id.
-+     *
-      * @codeCoverageIgnore
-      *
-      * @return int
-@@ -221,7 +228,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     }
- 
-     /**
--     * Set product attribute set id
-+     * Set product attribute set id.
-+     *
-      * @codeCoverageIgnore
-      *
-      * @param int $value
-diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php
-index 1985db0b90e..2009cd3ff9d 100644
---- a/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php
-+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php
-@@ -4,16 +4,16 @@
-  * See COPYING.txt for license details.
-  */
- 
-+namespace Magento\Reports\Model\ResourceModel\Product\Downloads;
-+
- /**
-  * Product Downloads Report collection
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-- */
--namespace Magento\Reports\Model\ResourceModel\Product\Downloads;
--
--/**
-+ *
-  * @api
-  * @since 100.0.2
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
- {
-@@ -97,4 +97,14 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-         }
-         return $this;
-     }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function getSelectCountSql()
-+    {
-+        $countSelect = parent::getSelectCountSql();
-+        $countSelect->reset(\Zend\Db\Sql\Select::GROUP);
-+        return $countSelect;
-+    }
- }
-diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php
-index 7371bc4359f..ec514f45ff6 100644
---- a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php
-+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php
-@@ -5,14 +5,16 @@
-  */
- 
- /**
-- * Reports Product Index Abstract Product Resource Collection
-- *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
- namespace Magento\Reports\Model\ResourceModel\Product\Index\Collection;
- 
- /**
-+ * Reports Product Index Abstract Product Resource Collection.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  * @since 100.0.2
-  */
-@@ -42,7 +44,7 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\ResourceModel\P
-      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
-@@ -52,7 +54,7 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\ResourceModel\P
-      * @param \Magento\Framework\Stdlib\DateTime $dateTime
-      * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
-      * @param \Magento\Customer\Model\Visitor $customerVisitor
--     * @param mixed $connection
-+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -67,7 +69,7 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\ResourceModel\P
-         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-         \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
-@@ -181,7 +183,8 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\ResourceModel\P
-     }
- 
-     /**
--     * Set customer id, that will be used in 'whereCondition'
-+     * Set customer id, that will be used in 'whereCondition'.
-+     *
-      * @codeCoverageIgnore
-      *
-      * @param int $id
-diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
-index 732d819e3b2..c02de01117a 100644
---- a/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
-+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
-@@ -14,7 +14,10 @@ namespace Magento\Reports\Model\ResourceModel\Product\Lowstock;
- use Magento\Framework\Exception\LocalizedException;
- 
- /**
-+ * Product Low Stock Report Collection.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @api
-  * @since 100.0.2
-  */
-@@ -50,7 +53,6 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Product\Collection
-     protected $_itemResource;
- 
-     /**
--     * Collection constructor.
-      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
-      * @param \Psr\Log\LoggerInterface $logger
-      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-@@ -61,7 +63,7 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Product\Collection
-      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
-@@ -92,7 +94,7 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Product\Collection
-         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-         \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
-diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection.php
-index 61dc77d1884..35a14e09e31 100644
---- a/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection.php
-+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection.php
-@@ -14,6 +14,8 @@ namespace Magento\Reports\Model\ResourceModel\Product\Sold;
- use Magento\Framework\DB\Select;
- 
- /**
-+ * Data collection.
-+ *
-  * @SuppressWarnings(PHPMD.DepthOfInheritance)
-  * @api
-  * @since 100.0.2
-@@ -21,7 +23,7 @@ use Magento\Framework\DB\Select;
- class Collection extends \Magento\Reports\Model\ResourceModel\Order\Collection
- {
-     /**
--     * Set Date range to collection
-+     * Set Date range to collection.
-      *
-      * @param int $from
-      * @param int $to
-@@ -79,6 +81,10 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Order\Collection
-         )->having(
-             'order_items.qty_ordered > ?',
-             0
-+        )->columns(
-+            'SUM(order_items.qty_ordered) as ordered_qty'
-+        )->group(
-+            'order_items.product_id'
-         );
-         return $this;
-     }
-@@ -116,6 +122,8 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Order\Collection
-     }
- 
-     /**
-+     * @inheritdoc
-+     *
-      * @return Select
-      * @since 100.2.0
-      */
-diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php
-index 671acc97010..c1c6fb2eaed 100644
---- a/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php
-+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php
-@@ -5,7 +5,11 @@
-  */
- namespace Magento\Reports\Model\ResourceModel\Quote;
- 
-+use Magento\Store\Model\Store;
-+
- /**
-+ * Collection of abandoned quotes with reports join.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -48,6 +52,24 @@ class Collection extends \Magento\Quote\Model\ResourceModel\Quote\Collection
-         $this->customerResource = $customerResource;
-     }
- 
-+    /**
-+     * Filter collections by stores.
-+     *
-+     * @param array $storeIds
-+     * @param bool $withAdmin
-+     * @return $this
-+     */
-+    public function addStoreFilter(array $storeIds, $withAdmin = true)
-+    {
-+        if ($withAdmin) {
-+            $storeIds[] = Store::DEFAULT_STORE_ID;
-+        }
-+
-+        $this->addFieldToFilter('store_id', ['in' => $storeIds]);
-+
-+        return $this;
-+    }
-+
-     /**
-      * Prepare for abandoned report
-      *
-diff --git a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php
-index 522bfa7bcf0..f2a761dbd50 100644
---- a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php
-+++ b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php
-@@ -12,6 +12,8 @@
- namespace Magento\Reports\Model\ResourceModel\Report;
- 
- /**
-+ * Class Collection
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -100,6 +102,7 @@ class Collection extends \Magento\Framework\Data\Collection
- 
-     /**
-      * Set period
-+     *
-      * @codeCoverageIgnore
-      *
-      * @param int $period
-@@ -113,6 +116,7 @@ class Collection extends \Magento\Framework\Data\Collection
- 
-     /**
-      * Set interval
-+     *
-      * @codeCoverageIgnore
-      *
-      * @param \DateTimeInterface $fromDate
-@@ -248,7 +252,7 @@ class Collection extends \Magento\Framework\Data\Collection
-             ? $this->_localeDate->convertConfigTimeToUtc($dateStart->format('Y-m-d 00:00:00'))
-             : $this->_localeDate->convertConfigTimeToUtc($dateStart->format('Y-01-01 00:00:00'));
- 
--        $interval['end'] = $dateStart->diff($dateEnd)->y == 0
-+        $interval['end'] = $dateStart->format('Y') === $dateEnd->format('Y')
-             ? $this->_localeDate->convertConfigTimeToUtc(
-                 $dateStart->setDate($dateStart->format('Y'), $dateEnd->format('m'), $dateEnd->format('d'))
-                     ->format('Y-m-d 23:59:59')
-@@ -275,6 +279,7 @@ class Collection extends \Magento\Framework\Data\Collection
- 
-     /**
-      * Set store ids
-+     *
-      * @codeCoverageIgnore
-      *
-      * @param array $storeIds
-@@ -288,6 +293,7 @@ class Collection extends \Magento\Framework\Data\Collection
- 
-     /**
-      * Get store ids
-+     *
-      * @codeCoverageIgnore
-      *
-      * @return array
-@@ -309,6 +315,7 @@ class Collection extends \Magento\Framework\Data\Collection
- 
-     /**
-      * Set page size
-+     *
-      * @codeCoverageIgnore
-      *
-      * @param int $size
-@@ -322,6 +329,7 @@ class Collection extends \Magento\Framework\Data\Collection
- 
-     /**
-      * Get page size
-+     *
-      * @codeCoverageIgnore
-      *
-      * @return int
-diff --git a/app/code/Magento/Reports/Observer/CatalogProductCompareAddProductObserver.php b/app/code/Magento/Reports/Observer/CatalogProductCompareAddProductObserver.php
-index c7da558180a..0bdc3ed3f12 100644
---- a/app/code/Magento/Reports/Observer/CatalogProductCompareAddProductObserver.php
-+++ b/app/code/Magento/Reports/Observer/CatalogProductCompareAddProductObserver.php
-@@ -6,6 +6,7 @@
- namespace Magento\Reports\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
-+use Magento\Reports\Model\Event;
- 
- /**
-  * Reports Event observer model
-@@ -32,22 +33,30 @@ class CatalogProductCompareAddProductObserver implements ObserverInterface
-      */
-     protected $eventSaver;
- 
-+    /**
-+     * @var \Magento\Reports\Model\ReportStatus
-+     */
-+    private $reportStatus;
-+
-     /**
-      * @param \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
-      * @param \Magento\Customer\Model\Session $customerSession
-      * @param \Magento\Customer\Model\Visitor $customerVisitor
-      * @param EventSaver $eventSaver
-+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
-      */
-     public function __construct(
-         \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory,
-         \Magento\Customer\Model\Session $customerSession,
-         \Magento\Customer\Model\Visitor $customerVisitor,
--        EventSaver $eventSaver
-+        EventSaver $eventSaver,
-+        \Magento\Reports\Model\ReportStatus $reportStatus
-     ) {
-         $this->_productCompFactory = $productCompFactory;
-         $this->_customerSession = $customerSession;
-         $this->_customerVisitor = $customerVisitor;
-         $this->eventSaver = $eventSaver;
-+        $this->reportStatus = $reportStatus;
-     }
- 
-     /**
-@@ -60,6 +69,9 @@ class CatalogProductCompareAddProductObserver implements ObserverInterface
-      */
-     public function execute(\Magento\Framework\Event\Observer $observer)
-     {
-+        if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_COMPARE)) {
-+            return;
-+        }
-         $productId = $observer->getEvent()->getProduct()->getId();
-         $viewData = ['product_id' => $productId];
-         if ($this->_customerSession->isLoggedIn()) {
-@@ -69,6 +81,6 @@ class CatalogProductCompareAddProductObserver implements ObserverInterface
-         }
-         $this->_productCompFactory->create()->setData($viewData)->save()->calculate();
- 
--        $this->eventSaver->save(\Magento\Reports\Model\Event::EVENT_PRODUCT_COMPARE, $productId);
-+        $this->eventSaver->save(Event::EVENT_PRODUCT_COMPARE, $productId);
-     }
- }
-diff --git a/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php b/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php
-index daa52d9daa2..26559dc27cc 100644
---- a/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php
-+++ b/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php
-@@ -17,13 +17,21 @@ class CatalogProductCompareClearObserver implements ObserverInterface
-      */
-     protected $_productCompFactory;
- 
-+    /**
-+     * @var \Magento\Reports\Model\ReportStatus
-+     */
-+    private $reportStatus;
-+
-     /**
-      * @param \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
-+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
-      */
-     public function __construct(
--        \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
-+        \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory,
-+        \Magento\Reports\Model\ReportStatus $reportStatus
-     ) {
-         $this->_productCompFactory = $productCompFactory;
-+        $this->reportStatus = $reportStatus;
-     }
- 
-     /**
-@@ -32,13 +40,15 @@ class CatalogProductCompareClearObserver implements ObserverInterface
-      * Reset count of compared products cache
-      *
-      * @param \Magento\Framework\Event\Observer $observer
--     * @return $this
-+     * @return void
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function execute(\Magento\Framework\Event\Observer $observer)
-     {
--        $this->_productCompFactory->create()->calculate();
-+        if (!$this->reportStatus->isReportEnabled(\Magento\Reports\Model\Event::EVENT_PRODUCT_VIEW)) {
-+            return;
-+        }
- 
--        return $this;
-+        $this->_productCompFactory->create()->calculate();
-     }
- }
-diff --git a/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php b/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
-index 4c4476ed7c6..b3ec141ef01 100644
---- a/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
-+++ b/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
-@@ -6,9 +6,11 @@
- namespace Magento\Reports\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
-+use Magento\Reports\Model\Event;
- 
- /**
-  * Reports Event observer model
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class CatalogProductViewObserver implements ObserverInterface
- {
-@@ -37,25 +39,33 @@ class CatalogProductViewObserver implements ObserverInterface
-      */
-     protected $eventSaver;
- 
-+    /**
-+     * @var \Magento\Reports\Model\ReportStatus
-+     */
-+    private $reportStatus;
-+
-     /**
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param \Magento\Reports\Model\Product\Index\ViewedFactory $productIndxFactory
-      * @param \Magento\Customer\Model\Session $customerSession
-      * @param \Magento\Customer\Model\Visitor $customerVisitor
-      * @param EventSaver $eventSaver
-+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
-      */
-     public function __construct(
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
-         \Magento\Reports\Model\Product\Index\ViewedFactory $productIndxFactory,
-         \Magento\Customer\Model\Session $customerSession,
-         \Magento\Customer\Model\Visitor $customerVisitor,
--        EventSaver $eventSaver
-+        EventSaver $eventSaver,
-+        \Magento\Reports\Model\ReportStatus $reportStatus
-     ) {
-         $this->_storeManager = $storeManager;
-         $this->_productIndxFactory = $productIndxFactory;
-         $this->_customerSession = $customerSession;
-         $this->_customerVisitor = $customerVisitor;
-         $this->eventSaver = $eventSaver;
-+        $this->reportStatus = $reportStatus;
-     }
- 
-     /**
-@@ -66,6 +76,10 @@ class CatalogProductViewObserver implements ObserverInterface
-      */
-     public function execute(\Magento\Framework\Event\Observer $observer)
-     {
-+        if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_VIEW)) {
-+            return;
-+        }
-+
-         $productId = $observer->getEvent()->getProduct()->getId();
- 
-         $viewData['product_id'] = $productId;
-@@ -78,6 +92,6 @@ class CatalogProductViewObserver implements ObserverInterface
- 
-         $this->_productIndxFactory->create()->setData($viewData)->save()->calculate();
- 
--        $this->eventSaver->save(\Magento\Reports\Model\Event::EVENT_PRODUCT_VIEW, $productId);
-+        $this->eventSaver->save(Event::EVENT_PRODUCT_VIEW, $productId);
-     }
- }
-diff --git a/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php b/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php
-index 1e44b3c4fbe..6a3b7832bd4 100644
---- a/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php
-+++ b/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php
-@@ -6,6 +6,7 @@
- namespace Magento\Reports\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
-+use Magento\Reports\Model\Event;
- 
- /**
-  * Reports Event observer model
-@@ -17,29 +18,39 @@ class CheckoutCartAddProductObserver implements ObserverInterface
-      */
-     protected $eventSaver;
- 
-+    /**
-+     * @var \Magento\Reports\Model\ReportStatus
-+     */
-+    private $reportStatus;
-+
-     /**
-      * @param EventSaver $eventSaver
-+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
-      */
-     public function __construct(
--        EventSaver $eventSaver
-+        EventSaver $eventSaver,
-+        \Magento\Reports\Model\ReportStatus $reportStatus
-     ) {
-         $this->eventSaver = $eventSaver;
-+        $this->reportStatus = $reportStatus;
-     }
- 
-     /**
-      * Add product to shopping cart action
-      *
-      * @param \Magento\Framework\Event\Observer $observer
--     * @return $this
-+     * @return void
-      */
-     public function execute(\Magento\Framework\Event\Observer $observer)
-     {
-+        if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_TO_CART)) {
-+            return;
-+        }
-+
-         $quoteItem = $observer->getEvent()->getItem();
-         if (!$quoteItem->getId() && !$quoteItem->getParentItem()) {
-             $productId = $quoteItem->getProductId();
--            $this->eventSaver->save(\Magento\Reports\Model\Event::EVENT_PRODUCT_TO_CART, $productId);
-+            $this->eventSaver->save(Event::EVENT_PRODUCT_TO_CART, $productId);
-         }
--
--        return $this;
-     }
- }
-diff --git a/app/code/Magento/Reports/Observer/CustomerLogoutObserver.php b/app/code/Magento/Reports/Observer/CustomerLogoutObserver.php
-index 833834d06bc..95d17ddacef 100644
---- a/app/code/Magento/Reports/Observer/CustomerLogoutObserver.php
-+++ b/app/code/Magento/Reports/Observer/CustomerLogoutObserver.php
-@@ -38,7 +38,7 @@ class CustomerLogoutObserver implements ObserverInterface
-      * Customer logout processing
-      *
-      * @param \Magento\Framework\Event\Observer $observer
--     * @return $this
-+     * @return void
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function execute(\Magento\Framework\Event\Observer $observer)
-diff --git a/app/code/Magento/Reports/Observer/SendfriendProductObserver.php b/app/code/Magento/Reports/Observer/SendfriendProductObserver.php
-index b8ae6530433..ca70b23d55e 100644
---- a/app/code/Magento/Reports/Observer/SendfriendProductObserver.php
-+++ b/app/code/Magento/Reports/Observer/SendfriendProductObserver.php
-@@ -6,6 +6,7 @@
- namespace Magento\Reports\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
-+use Magento\Reports\Model\Event;
- 
- /**
-  * Reports Event observer model
-@@ -17,13 +18,21 @@ class SendfriendProductObserver implements ObserverInterface
-      */
-     protected $eventSaver;
- 
-+    /**
-+     * @var \Magento\Reports\Model\ReportStatus
-+     */
-+    private $reportStatus;
-+
-     /**
-      * @param EventSaver $eventSaver
-+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
-      */
-     public function __construct(
--        EventSaver $eventSaver
-+        EventSaver $eventSaver,
-+        \Magento\Reports\Model\ReportStatus $reportStatus
-     ) {
-         $this->eventSaver = $eventSaver;
-+        $this->reportStatus = $reportStatus;
-     }
- 
-     /**
-@@ -34,8 +43,12 @@ class SendfriendProductObserver implements ObserverInterface
-      */
-     public function execute(\Magento\Framework\Event\Observer $observer)
-     {
-+        if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_SEND)) {
-+            return;
-+        }
-+
-         $this->eventSaver->save(
--            \Magento\Reports\Model\Event::EVENT_PRODUCT_SEND,
-+            Event::EVENT_PRODUCT_SEND,
-             $observer->getEvent()->getProduct()->getId()
-         );
-     }
-diff --git a/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php b/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php
-index 1bbd4a1666b..e4c57cf3ef2 100644
---- a/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php
-+++ b/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php
-@@ -6,6 +6,7 @@
- namespace Magento\Reports\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
-+use Magento\Reports\Model\Event;
- 
- /**
-  * Reports Event observer model
-@@ -17,13 +18,21 @@ class WishlistAddProductObserver implements ObserverInterface
-      */
-     protected $eventSaver;
- 
-+    /**
-+     * @var \Magento\Reports\Model\ReportStatus
-+     */
-+    private $reportStatus;
-+
-     /**
-      * @param EventSaver $eventSaver
-+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
-      */
-     public function __construct(
--        EventSaver $eventSaver
-+        EventSaver $eventSaver,
-+        \Magento\Reports\Model\ReportStatus $reportStatus
-     ) {
-         $this->eventSaver = $eventSaver;
-+        $this->reportStatus = $reportStatus;
-     }
- 
-     /**
-@@ -34,8 +43,12 @@ class WishlistAddProductObserver implements ObserverInterface
-      */
-     public function execute(\Magento\Framework\Event\Observer $observer)
-     {
-+        if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_TO_WISHLIST)) {
-+            return;
-+        }
-+
-         $this->eventSaver->save(
--            \Magento\Reports\Model\Event::EVENT_PRODUCT_TO_WISHLIST,
-+            Event::EVENT_PRODUCT_TO_WISHLIST,
-             $observer->getEvent()->getProduct()->getId()
-         );
-     }
-diff --git a/app/code/Magento/Reports/Observer/WishlistShareObserver.php b/app/code/Magento/Reports/Observer/WishlistShareObserver.php
-index 832429cf6a3..de6e55ceb3f 100644
---- a/app/code/Magento/Reports/Observer/WishlistShareObserver.php
-+++ b/app/code/Magento/Reports/Observer/WishlistShareObserver.php
-@@ -6,6 +6,7 @@
- namespace Magento\Reports\Observer;
- 
- use Magento\Framework\Event\ObserverInterface;
-+use Magento\Reports\Model\Event;
- 
- /**
-  * Reports Event observer model
-@@ -17,13 +18,21 @@ class WishlistShareObserver implements ObserverInterface
-      */
-     protected $eventSaver;
- 
-+    /**
-+     * @var \Magento\Reports\Model\ReportStatus
-+     */
-+    private $reportStatus;
-+
-     /**
-      * @param EventSaver $eventSaver
-+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
-      */
-     public function __construct(
--        EventSaver $eventSaver
-+        EventSaver $eventSaver,
-+        \Magento\Reports\Model\ReportStatus $reportStatus
-     ) {
-         $this->eventSaver = $eventSaver;
-+        $this->reportStatus = $reportStatus;
-     }
- 
-     /**
-@@ -34,8 +43,12 @@ class WishlistShareObserver implements ObserverInterface
-      */
-     public function execute(\Magento\Framework\Event\Observer $observer)
-     {
-+        if (!$this->reportStatus->isReportEnabled(Event::EVENT_WISHLIST_SHARE)) {
-+            return;
-+        }
-+
-         $this->eventSaver->save(
--            \Magento\Reports\Model\Event::EVENT_WISHLIST_SHARE,
-+            Event::EVENT_WISHLIST_SHARE,
-             $observer->getEvent()->getWishlist()->getId()
-         );
-     }
-diff --git a/app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminReviewOrderActionGroup.xml b/app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminReviewOrderActionGroup.xml
-new file mode 100644
-index 00000000000..003a5e6655f
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminReviewOrderActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminReviewOrderActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+        </arguments>
-+        <click stepKey="openReports" selector="{{OrderedProductsSection.reports}}"/>
-+        <waitForPageLoad stepKey="waitForReports" time="5"/>
-+        <click stepKey="openOrdered" selector="{{OrderedProductsSection.ordered}}"/>
-+        <waitForPageLoad stepKey="waitForOrdersPage" time="5"/>
-+        <click stepKey="refresh" selector="{{OrderedProductsSection.refresh}}"/>
-+        <waitForPageLoad stepKey="waitForOrderList" time="5"/>
-+        <scrollTo stepKey="scrollTo" selector="{{OrderedProductsSection.total}}"/>
-+        <see stepKey="seeOrder" userInput="{{productName}}"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml b/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml
-new file mode 100644
-index 00000000000..d367b2deb59
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml
-@@ -0,0 +1,35 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="GenerateOrderReportActionGroup">
-+        <arguments>
-+            <argument name="orderFromDate" type="string"/>
-+            <argument name="orderToDate" type="string"/>
-+        </arguments>
-+        <click selector="{{OrderReportMainSection.here}}" stepKey="clickOnHere" />
-+        <fillField selector="{{OrderReportFilterSection.dateFrom}}" userInput="{{orderFromDate}}" stepKey="fillFromDate"/>
-+        <fillField selector="{{OrderReportFilterSection.dateTo}}" userInput="{{orderToDate}}" stepKey="fillToDate"/>
-+        <selectOption selector="{{OrderReportFilterSection.orderStatus}}" userInput="Any" stepKey="selectAnyOption" />
-+        <click selector="{{OrderReportMainSection.showReport}}" stepKey="showReport" />
-+    </actionGroup>
-+    <actionGroup name="GenerateOrderReportForNotCancelActionGroup">
-+        <arguments>
-+            <argument name="orderFromDate" type="string"/>
-+            <argument name="orderToDate" type="string"/>
-+            <argument name="statuses" type="string"/>
-+        </arguments>
-+        <click selector="{{OrderReportMainSection.here}}" stepKey="clickOnHere" />
-+        <fillField selector="{{OrderReportFilterSection.dateFrom}}" userInput="{{orderFromDate}}" stepKey="fillFromDate"/>
-+        <fillField selector="{{OrderReportFilterSection.dateTo}}" userInput="{{orderToDate}}" stepKey="fillToDate"/>
-+        <selectOption selector="{{OrderReportFilterSection.orderStatus}}" userInput="Specified" stepKey="selectSpecifiedOption" />
-+        <selectOption selector="{{OrderReportFilterSection.orderStatusSpecified}}" parameterArray="{{statuses}}" stepKey="selectSpecifiedOptionStatus" />
-+        <click selector="{{OrderReportMainSection.showReport}}" stepKey="showReport" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Reports/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..e77e3ee8abd
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,86 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuReportsMarketingAbandonedCarts">
-+        <data key="pageTitle">Abandoned Carts</data>
-+        <data key="title">Abandoned Carts</data>
-+        <data key="dataUiId">magento-reports-report-shopcart-abandoned</data>
-+    </entity>
-+    <entity name="AdminMenuReportsProductsBestsellers">
-+        <data key="pageTitle">Bestsellers Report</data>
-+        <data key="title">Bestsellers</data>
-+        <data key="dataUiId">magento-reports-report-products-bestsellers</data>
-+    </entity>
-+    <entity name="AdminMenuReportsSalesCoupons">
-+        <data key="pageTitle">Coupons Report</data>
-+        <data key="title">Coupons</data>
-+        <data key="dataUiId">magento-reports-report-salesroot-coupons</data>
-+    </entity>
-+    <entity name="AdminMenuReportsProductsDownloads">
-+        <data key="pageTitle">Downloads Report</data>
-+        <data key="title">Downloads</data>
-+        <data key="dataUiId">magento-downloadable-report-products-downloads</data>
-+    </entity>
-+    <entity name="AdminMenuReportsSalesInvoiced">
-+        <data key="pageTitle">Invoice Report</data>
-+        <data key="title">Invoiced</data>
-+        <data key="dataUiId">magento-reports-report-salesroot-invoiced</data>
-+    </entity>
-+    <entity name="AdminMenuReportsProductsLowStock">
-+        <data key="pageTitle">Low Stock Report</data>
-+        <data key="title">Low Stock</data>
-+        <data key="dataUiId">magento-reports-report-products-lowstock</data>
-+    </entity>
-+    <entity name="AdminMenuReportsCustomersNew">
-+        <data key="pageTitle">New Accounts Report</data>
-+        <data key="title">New</data>
-+        <data key="dataUiId">magento-reports-report-customers-accounts</data>
-+    </entity>
-+    <entity name="AdminMenuReportsCustomersOrderCount">
-+        <data key="pageTitle">Order Count Report</data>
-+        <data key="title">Order Count</data>
-+        <data key="dataUiId">magento-reports-report-customers-orders</data>
-+    </entity>
-+    <entity name="AdminMenuReportsProductsOrdered">
-+        <data key="pageTitle">Ordered Products Report</data>
-+        <data key="title">Ordered</data>
-+        <data key="dataUiId">magento-reports-report-products-sold</data>
-+    </entity>
-+    <entity name="AdminMenuReportsSalesOrders">
-+        <data key="pageTitle">Orders Report</data>
-+        <data key="title">Orders</data>
-+        <data key="dataUiId">magento-reports-report-salesroot-sales</data>
-+    </entity>
-+    <entity name="AdminMenuReportsCustomersOrderTotal">
-+        <data key="pageTitle">Order Total Report</data>
-+        <data key="title">Order Total</data>
-+        <data key="dataUiId">magento-reports-report-customers-totals</data>
-+    </entity>
-+    <entity name="AdminMenuReportsMarketingProductsInCarts">
-+        <data key="pageTitle">Products in Carts</data>
-+        <data key="title">Products in Cart</data>
-+        <data key="dataUiId">magento-reports-report-shopcart-product</data>
-+    </entity>
-+    <entity name="AdminMenuReportsStatisticsRefreshStatistics">
-+        <data key="pageTitle">Refresh Statistics</data>
-+        <data key="title">Refresh Statistics</data>
-+        <data key="dataUiId">magento-reports-report-statistics-refresh</data>
-+    </entity>
-+    <entity name="AdminMenuReportsSalesTax">
-+        <data key="pageTitle">Tax Report</data>
-+        <data key="title">Tax</data>
-+        <data key="dataUiId">magento-reports-report-salesroot-tax</data>
-+    </entity>
-+    <entity name="AdminMenuReportsProductsViews">
-+        <data key="pageTitle">Product Views Report</data>
-+        <data key="title">Views</data>
-+        <data key="dataUiId">magento-reports-report-products-viewed</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Page/OrdersReportPage.xml b/app/code/Magento/Reports/Test/Mftf/Page/OrdersReportPage.xml
-new file mode 100644
-index 00000000000..46509089b97
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Page/OrdersReportPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="OrdersReportPage" url="reports/report_sales/sales/" area="admin" module="Reports">
-+        <section name="OrderReportFilterSection"/>
-+        <section name="OrderReportMainSection"/>
-+        <section name="GeneratedReportSection" />
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml
-new file mode 100644
-index 00000000000..bc8ac464240
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml
-@@ -0,0 +1,29 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="OrderReportMainSection">
-+        <element name="showReport" type="button" selector="#filter_form_submit" timeout="60"/>
-+        <element name="here" type="text" selector="//a[contains(text(), 'here')]" timeout="60"/>
-+    </section>
-+
-+    <section name="OrderReportFilterSection">
-+        <element name="dateFrom" type="input" selector="#sales_report_from"/>
-+        <element name="dateTo" type="input" selector="#sales_report_to"/>
-+        <element name="orderStatus" type="select" selector="#sales_report_show_order_statuses"/>
-+        <element name="optionAny" type="select" selector="//select[@id='sales_report_show_order_statuses']/option[contains(text(), 'Any')]"/>
-+        <element name="optionSpecified" type="select" selector="//select[@id='sales_report_show_order_statuses']/option[contains(text(), 'Specified')]"/>
-+        <element name="orderStatusSpecified" type="select" selector="#sales_report_order_statuses"/>
-+    </section>
-+
-+    <section name="GeneratedReportSection">
-+        <element name="ordersCount" type="text" selector="//tr[@class='totals']/th[@class=' col-orders col-orders_count col-number']"/>
-+        <element name="canceledOrders" type="text" selector="//tr[@class='totals']/th[@class=' col-canceled col-total_canceled_amount a-right']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Section/OrderedProductsSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/OrderedProductsSection.xml
-new file mode 100644
-index 00000000000..89e8497dddc
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Section/OrderedProductsSection.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="OrderedProductsSection">
-+        <element name="reports" type="button" selector="//li[@data-ui-id='menu-magento-reports-report']"/>
-+        <element name="ordered" type="button" selector="//li[@data-ui-id='menu-magento-reports-report-products-sold']"/>
-+        <element name="refresh" type="button" selector="//button[@title='Refresh']" timeout="30"/>
-+        <element name="total" type="text" selector="//tfoot//th[contains(text(), 'Total')]"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..342955e0684
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsAbandonedCartsNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports abandoned carts navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Abandoned Carts"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14159"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToAbandonedCartsPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsMarketingAbandonedCarts.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsMarketingAbandonedCarts.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..259f2cde278
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsBestsellersNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports bestsellers navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Bestsellers"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14168"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsBestsellersPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsProductsBestsellers.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsProductsBestsellers.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..321f3078bc6
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsCouponsNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports coupons navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Coupons"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14163"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsCouponsPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsSalesCoupons.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsSalesCoupons.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..584c1af6683
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsDownloadsNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports downloads navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Downloads"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14171"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsDownloadsPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsProductsDownloads.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsProductsDownloads.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..34aec0620ca
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsInvoicedNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports invoiced navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Invoiced"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14162"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsInvoicedPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsSalesInvoiced.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsSalesInvoiced.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..5d91d65a3a4
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsLowStockNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports low stock navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Low Stock"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14169"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsLowStockPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsProductsLowStock.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsProductsLowStock.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..aeb35ba65a3
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsNewNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports new navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > New"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14166"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsNewPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsCustomersNew.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsCustomersNew.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..1bfbc654746
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsOrderCountNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports order count navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Order Count"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14165"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsOrderCountPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsCustomersOrderCount.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsCustomersOrderCount.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..88c94b53f52
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsOrderTotalNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports order total navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Order Total"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14164"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsOrderTotalPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsCustomersOrderTotal.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsCustomersOrderTotal.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..e81239539a5
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsOrderedNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports ordered navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Ordered"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14170"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsOrderedPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsProductsOrdered.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsProductsOrdered.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..13fc8e73531
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsOrdersNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports orders navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Orders"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14160"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsOrdersPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsSalesOrders.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsSalesOrders.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..03877f8e58e
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsProductsInCartNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports products in cart navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Products in Cart"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14158"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsProductsInCartPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsMarketingProductsInCarts.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsMarketingProductsInCarts.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..d05fc091357
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsRefreshStatisticsNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports refresh statistics navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Refresh Statistics"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14172"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsRefreshStatisticsPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsStatisticsRefreshStatistics.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsStatisticsRefreshStatistics.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..11a065c933a
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsTaxNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports tax navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Tax"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14161"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsTaxPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsSalesTax.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsSalesTax.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..9154b96c71e
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsViewsNavigateMenuTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports views navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > Views"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14167"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsViewsPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsProductsViews.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsProductsViews.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
-new file mode 100644
-index 00000000000..0412e945362
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
-@@ -0,0 +1,94 @@
-+<?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="CancelOrdersInOrderSalesReportTest">
-+        <annotations>
-+            <features value="Reports"/>
-+            <stories value="Order Sales Report includes canceled orders"/>
-+            <group value="reports"/>
-+            <title value="Canceled orders in order sales report"/>
-+            <description value="Verify canceling of orders in order sales report"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-95960"/>
-+            <useCaseId value="MAGETWO-95823"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- log in as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- create new product -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- create new customer-->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+
-+        <!-- Create completed order -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createOrderd">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+
-+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
-+        <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl"/>
-+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
-+
-+        <!-- Create Order -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createOrder">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Cancel order -->
-+        <actionGroup ref="cancelPendingOrder" stepKey="cancelOrder"/>
-+
-+        <!-- Generate Order report for statuses  -->
-+        <amOnPage url="{{OrdersReportPage.url}}" stepKey="goToOrdersReportPage1"/>
-+        <waitForPageLoad stepKey="waitForOrdersReportPageLoad1"/>
-+        <!-- Get date -->
-+        <generateDate stepKey="generateEndDate" date="+0 day" format="m/d/Y"/>
-+        <generateDate stepKey="generateStartDate" date="-1 day" format="m/d/Y"/>
-+        <actionGroup ref="GenerateOrderReportForNotCancelActionGroup" stepKey="generateReportAfterCancelOrderBefore">
-+            <argument name="orderFromDate" value="$generateStartDate"/>
-+            <argument name="orderToDate" value="$generateEndDate"/>
-+            <argument name="statuses" value="['closed', 'complete', 'fraud', 'holded', 'payment_review', 'paypal_canceled_reversal', 'paypal_reversed', 'processing']"/>
-+        </actionGroup>
-+        <waitForElement selector="{{GeneratedReportSection.ordersCount}}" stepKey="waitForOrdersCountBefore"/>
-+        <grabTextFrom selector="{{GeneratedReportSection.ordersCount}}" stepKey="grabCanceledOrdersSpecified"/>
-+        <!-- Generate Order report -->
-+        <amOnPage url="{{OrdersReportPage.url}}" stepKey="goToOrdersReportPage2"/>
-+        <waitForPageLoad stepKey="waitForOrdersReportPageLoad2"/>
-+        <!-- Get date -->
-+        <actionGroup ref="GenerateOrderReportActionGroup" stepKey="generateReportAfterCancelOrder">
-+            <argument name="orderFromDate" value="$generateStartDate"/>
-+            <argument name="orderToDate" value="$generateEndDate"/>
-+        </actionGroup>
-+        <waitForElement selector="{{GeneratedReportSection.ordersCount}}" stepKey="waitForOrdersCount"/>
-+        <grabTextFrom selector="{{GeneratedReportSection.ordersCount}}" stepKey="grabCanceledOrdersAny"/>
-+
-+        <!-- Compare canceled orders price -->
-+        <assertEquals expected="{$grabCanceledOrdersSpecified}" expectedType="string" actual="{$grabCanceledOrdersAny}" actualType="string"  stepKey="assertEquals"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Sales/Coupons/GridTest.php b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Sales/Coupons/GridTest.php
-new file mode 100644
-index 00000000000..3c7ad9ee9e6
---- /dev/null
-+++ b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Sales/Coupons/GridTest.php
-@@ -0,0 +1,173 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Reports\Test\Unit\Block\Adminhtml\Sales\Coupons;
-+
-+/**
-+ * Test for class \Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid
-+ */
-+class GridTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid
-+     */
-+    private $model;
-+
-+    /**
-+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $storeManagerMock;
-+
-+    /**
-+     * @var \Magento\Reports\Model\ResourceModel\Report\Collection\Factory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $resourceFactoryMock;
-+
-+    /**
-+     * Set up mock objects for tested class
-+     *
-+     * @return void
-+     */
-+    protected function setUp(): void
-+    {
-+        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-+            ->getMock();
-+        $this->resourceFactoryMock = $this
-+            ->getMockBuilder(\Magento\Reports\Model\ResourceModel\Report\Collection\Factory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $aggregatedColumns = [1 => 'SUM(value)'];
-+
-+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $this->model = $objectManager->getObject(
-+            \Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid::class,
-+            [
-+                '_storeManager' => $this->storeManagerMock,
-+                '_aggregatedColumns' => $aggregatedColumns,
-+                'resourceFactory' => $this->resourceFactoryMock,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @dataProvider getCountTotalsDataProvider
-+     *
-+     * @param string $reportType
-+     * @param int $priceRuleType
-+     * @param int $collectionSize
-+     * @param bool $expectedCountTotals
-+     * @return void
-+     */
-+    public function testGetCountTotals(
-+        string $reportType,
-+        int $priceRuleType,
-+        int $collectionSize,
-+        bool $expectedCountTotals
-+    ): void {
-+        $filterData = new \Magento\Framework\DataObject();
-+        $filterData->setData('report_type', $reportType);
-+        $filterData->setData('period_type', 'day');
-+        $filterData->setData('from', '2000-01-01');
-+        $filterData->setData('to', '2000-01-30');
-+        $filterData->setData('store_ids', '1');
-+        $filterData->setData('price_rule_type', $priceRuleType);
-+        if ($priceRuleType) {
-+            $filterData->setData('rules_list', ['0,1']);
-+        }
-+        $filterData->setData('order_statuses', 'statuses');
-+        $this->model->setFilterData($filterData);
-+
-+        $resourceCollectionName = $this->model->getResourceCollectionName();
-+        $collectionMock = $this->buildBaseCollectionMock($filterData, $resourceCollectionName, $collectionSize);
-+
-+        $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-+            ->getMock();
-+        $this->storeManagerMock->method('getStores')
-+            ->willReturn([1 => $store]);
-+        $this->resourceFactoryMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($collectionMock);
-+
-+        $this->assertEquals($expectedCountTotals, $this->model->getCountTotals());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getCountTotalsDataProvider(): array
-+    {
-+        return [
-+            ['created_at_shipment', 0, 0, false],
-+            ['created_at_shipment', 0, 1, true],
-+            ['updated_at_order', 0, 1, true],
-+            ['updated_at_order', 1, 1, true],
-+        ];
-+    }
-+
-+    /**
-+     * @param \Magento\Framework\DataObject $filterData
-+     * @param string $resourceCollectionName
-+     * @param int $collectionSize
-+     * @return \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private function buildBaseCollectionMock(
-+        \Magento\Framework\DataObject $filterData,
-+        string $resourceCollectionName,
-+        int $collectionSize
-+    ): \PHPUnit_Framework_MockObject_MockObject {
-+        $collectionMock = $this->getMockBuilder($resourceCollectionName)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $collectionMock->expects($this->once())
-+            ->method('setPeriod')
-+            ->with($filterData->getData('period_type'))
-+            ->willReturnSelf();
-+        $collectionMock->expects($this->once())
-+            ->method('setDateRange')
-+            ->with($filterData->getData('from'), $filterData->getData('to'))
-+            ->willReturnSelf();
-+        $collectionMock->expects($this->once())
-+            ->method('addStoreFilter')
-+            ->with(\explode(',', $filterData->getData('store_ids')))
-+            ->willReturnSelf();
-+        $collectionMock->expects($this->once())
-+            ->method('setAggregatedColumns')
-+            ->willReturnSelf();
-+        $collectionMock->expects($this->once())
-+            ->method('isTotals')
-+            ->with(true)
-+            ->willReturnSelf();
-+        $collectionMock->expects($this->once())
-+            ->method('addOrderStatusFilter')
-+            ->with($filterData->getData('order_statuses'))
-+            ->willReturnSelf();
-+
-+        if ($filterData->getData('price_rule_type')) {
-+            $collectionMock->expects($this->once())
-+                ->method('addRuleFilter')
-+                ->with(\explode(',', $filterData->getData('rules_list')[0]))
-+                ->willReturnSelf();
-+        }
-+
-+        $collectionMock->expects($this->once())
-+            ->method('load')
-+            ->willReturnSelf();
-+        $collectionMock->expects($this->once())
-+            ->method('getSize')
-+            ->willReturn($collectionSize);
-+        if ($collectionSize) {
-+            $itemMock = $this->getMockBuilder(\Magento\Reports\Model\Item::class)
-+                ->disableOriginalConstructor()
-+                ->getMock();
-+            $collectionMock->expects($this->once())
-+                ->method('getItems')
-+                ->willReturn([$itemMock]);
-+        }
-+
-+        return $collectionMock;
-+    }
-+}
-diff --git a/app/code/Magento/Reports/Test/Unit/Helper/DataTest.php b/app/code/Magento/Reports/Test/Unit/Helper/DataTest.php
-index 25981c9d3cf..d92b51e8b9b 100644
---- a/app/code/Magento/Reports/Test/Unit/Helper/DataTest.php
-+++ b/app/code/Magento/Reports/Test/Unit/Helper/DataTest.php
-@@ -6,34 +6,41 @@
- 
- namespace Magento\Reports\Test\Unit\Helper;
- 
-+use Magento\Framework\App\Helper\Context;
-+use Magento\Framework\Data\Collection;
- use Magento\Reports\Helper\Data;
-+use Magento\Reports\Model\Item;
-+use Magento\Reports\Model\ItemFactory;
- 
-+/**
-+ * Unit tests for \Magento\Reports\Helper\Data class.
-+ */
- class DataTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\Reports\Helper\Data
-+     * @var Data
-      */
-     protected $data;
- 
-     /**
--     * @var \Magento\Framework\App\Helper\Context|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $contextMock;
- 
-     /**
--     * @var \Magento\Reports\Model\ItemFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ItemFactory|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $itemFactoryMock;
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     protected function setUp()
-     {
--        $this->contextMock = $this->getMockBuilder(\Magento\Framework\App\Helper\Context::class)
-+        $this->contextMock = $this->getMockBuilder(Context::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->itemFactoryMock = $this->getMockBuilder(\Magento\Reports\Model\ItemFactory::class)
-+        $this->itemFactoryMock = $this->getMockBuilder(ItemFactory::class)
-             ->setMethods(['create'])
-             ->disableOriginalConstructor()
-             ->getMock();
-@@ -67,12 +74,12 @@ class DataTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testPrepareIntervalsCollection($from, $to, $period, $results)
-     {
--        $collection = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
-+        $collection = $this->getMockBuilder(Collection::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['addItem'])
-             ->getMock();
- 
--        $item = $this->getMockBuilder(\Magento\Reports\Model\Item::class)
-+        $item = $this->getMockBuilder(Item::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['setPeriod', 'setIsEmpty'])
-             ->getMock();
-@@ -103,44 +110,50 @@ class DataTest extends \PHPUnit\Framework\TestCase
-             [
-                 'from' => '2000-01-15 10:00:00',
-                 'to' => '2000-01-15 11:00:00',
--                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_DAY,
--                'results' => ['2000-01-15']
-+                'period' => Data::REPORT_PERIOD_TYPE_DAY,
-+                'results' => ['2000-01-15'],
-             ],
-             [
-                 'from' => '2000-01-15 10:00:00',
-                 'to' => '2000-01-17 10:00:00',
--                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_MONTH,
--                'results' => ['2000-01']
-+                'period' => Data::REPORT_PERIOD_TYPE_MONTH,
-+                'results' => ['2000-01'],
-             ],
-             [
-                 'from' => '2000-01-15 10:00:00',
-                 'to' => '2000-02-15 10:00:00',
--                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_YEAR,
-+                'period' => Data::REPORT_PERIOD_TYPE_YEAR,
-                 'results' => ['2000']
-             ],
-             [
-                 'from' => '2000-01-15 10:00:00',
-                 'to' => '2000-01-16 11:00:00',
--                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_DAY,
--                'results' => ['2000-01-15', '2000-01-16']
-+                'period' => Data::REPORT_PERIOD_TYPE_DAY,
-+                'results' => ['2000-01-15', '2000-01-16'],
-             ],
-             [
-                 'from' => '2000-01-15 10:00:00',
-                 'to' => '2000-02-17 10:00:00',
--                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_MONTH,
--                'results' => ['2000-01', '2000-02']
-+                'period' => Data::REPORT_PERIOD_TYPE_MONTH,
-+                'results' => ['2000-01', '2000-02'],
-             ],
-             [
-                 'from' => '2000-01-15 10:00:00',
-                 'to' => '2003-02-15 10:00:00',
--                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_YEAR,
--                'results' => ['2000', '2001', '2002', '2003']
-+                'period' => Data::REPORT_PERIOD_TYPE_YEAR,
-+                'results' => ['2000', '2001', '2002', '2003'],
-+            ],
-+            [
-+                'from' => '2000-12-31 10:00:00',
-+                'to' => '2001-01-01 10:00:00',
-+                'period' => Data::REPORT_PERIOD_TYPE_YEAR,
-+                'results' => ['2000', '2001'],
-             ],
-             [
-                 'from' => '',
-                 'to' => '',
--                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_YEAR,
--                'results' => []
-+                'period' => Data::REPORT_PERIOD_TYPE_YEAR,
-+                'results' => [],
-             ]
-         ];
-     }
-diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Product/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
-index 038d37a9904..c8a16c24768 100644
---- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
-+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
-@@ -26,7 +26,7 @@ use Magento\Framework\Data\Collection\EntityFactory;
- use Magento\Framework\DB\Adapter\AdapterInterface;
- use Magento\Framework\DB\Select;
- use Magento\Framework\Event\ManagerInterface;
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface as Manager;
- use Magento\Framework\Stdlib\DateTime;
- use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-diff --git a/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductCompareAddProductObserverTest.php b/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductCompareAddProductObserverTest.php
-index 959f9ddc442..a1bb9722f6a 100644
---- a/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductCompareAddProductObserverTest.php
-+++ b/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductCompareAddProductObserverTest.php
-@@ -50,6 +50,11 @@ class CatalogProductCompareAddProductObserverTest extends \PHPUnit\Framework\Tes
-      */
-     protected $productCompModelMock;
- 
-+    /**
-+     * @var \Magento\Reports\Model\ReportStatus|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $reportStatusMock;
-+
-     /**
-      * {@inheritDoc}
-      */
-@@ -98,13 +103,19 @@ class CatalogProductCompareAddProductObserverTest extends \PHPUnit\Framework\Tes
-             ->setMethods(['save'])
-             ->getMock();
- 
-+        $this->reportStatusMock = $this->getMockBuilder(\Magento\Reports\Model\ReportStatus::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['isReportEnabled'])
-+            ->getMock();
-+
-         $this->observer = $objectManager->getObject(
-             \Magento\Reports\Observer\CatalogProductCompareAddProductObserver::class,
-             [
-                 'productCompFactory' => $this->productCompFactoryMock,
-                 'customerSession' => $this->customerSessionMock,
-                 'customerVisitor' => $this->customerVisitorMock,
--                'eventSaver' => $this->eventSaverMock
-+                'eventSaver' => $this->eventSaverMock,
-+                'reportStatus' => $this->reportStatusMock
-             ]
-         );
-     }
-@@ -127,6 +138,7 @@ class CatalogProductCompareAddProductObserverTest extends \PHPUnit\Framework\Tes
-         ];
-         $observerMock = $this->getObserverMock($productId);
- 
-+        $this->reportStatusMock->expects($this->once())->method('isReportEnabled')->willReturn(true);
-         $this->customerSessionMock->expects($this->any())->method('isLoggedIn')->willReturn($isLoggedIn);
-         $this->customerSessionMock->expects($this->any())->method('getCustomerId')->willReturn($customerId);
- 
-diff --git a/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductViewObserverTest.php b/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductViewObserverTest.php
-index d881778e3a8..0a43dde0b82 100644
---- a/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductViewObserverTest.php
-+++ b/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductViewObserverTest.php
-@@ -60,6 +60,11 @@ class CatalogProductViewObserverTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $productIndexFactoryMock;
- 
-+    /**
-+     * @var \Magento\Reports\Model\ReportStatus|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $reportStatusMock;
-+
-     /**
-      * {@inheritDoc}
-      */
-@@ -127,6 +132,11 @@ class CatalogProductViewObserverTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(['save'])
-             ->getMock();
- 
-+        $this->reportStatusMock = $this->getMockBuilder(\Magento\Reports\Model\ReportStatus::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['isReportEnabled'])
-+            ->getMock();
-+
-         $this->observer = $objectManager->getObject(
-             \Magento\Reports\Observer\CatalogProductViewObserver::class,
-             [
-@@ -134,7 +144,8 @@ class CatalogProductViewObserverTest extends \PHPUnit\Framework\TestCase
-                 'productIndxFactory' => $this->productIndexFactoryMock,
-                 'customerSession' => $this->customerSessionMock,
-                 'customerVisitor' => $this->customerVisitorMock,
--                'eventSaver' => $this->eventSaverMock
-+                'eventSaver' => $this->eventSaverMock,
-+                'reportStatus' => $this->reportStatusMock
-             ]
-         );
-     }
-@@ -161,6 +172,7 @@ class CatalogProductViewObserverTest extends \PHPUnit\Framework\TestCase
-             'store_id' => $storeId,
-         ];
- 
-+        $this->reportStatusMock->expects($this->once())->method('isReportEnabled')->willReturn(true);
-         $this->storeMock->expects($this->any())->method('getId')->willReturn($storeId);
- 
-         $this->customerSessionMock->expects($this->any())->method('isLoggedIn')->willReturn(true);
-@@ -197,6 +209,7 @@ class CatalogProductViewObserverTest extends \PHPUnit\Framework\TestCase
-             'store_id' => $storeId,
-         ];
- 
-+        $this->reportStatusMock->expects($this->once())->method('isReportEnabled')->willReturn(true);
-         $this->storeMock->expects($this->any())->method('getId')->willReturn($storeId);
- 
-         $this->customerSessionMock->expects($this->any())->method('isLoggedIn')->willReturn(false);
-diff --git a/app/code/Magento/Reports/etc/adminhtml/system.xml b/app/code/Magento/Reports/etc/adminhtml/system.xml
-index a16dfb4c68a..5a5524d41d4 100644
---- a/app/code/Magento/Reports/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Reports/etc/adminhtml/system.xml
-@@ -39,6 +39,62 @@
-                     <comment>Select day of the month.</comment>
-                 </field>
-             </group>
-+            <group id="options" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
-+                <label>General Options</label>
-+                <field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
-+                    <label>Enable Reports</label>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <comment>If disabled, all report events will be disabled</comment>
-+                </field>
-+                <field id="product_view_enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
-+                    <label>Enable "Product View" Report</label>
-+                    <comment>If enabled, will collect statistic of viewed product pages</comment>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <depends>
-+                        <field id="enabled">1</field>
-+                    </depends>
-+                </field>
-+                <field id="product_send_enabled" translate="label comment" type="select" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0">
-+                    <label>Enable "Send Product Link To Friend" Report</label>
-+                    <comment>If enabled, will collect statistic of product links sent to friend</comment>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <depends>
-+                        <field id="enabled">1</field>
-+                    </depends>
-+                </field>
-+                <field id="product_compare_enabled" translate="label comment" type="select" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0">
-+                    <label>Enable "Add Product To Compare List" Report</label>
-+                    <comment>If enabled, will collect statistic of products added to Compare List</comment>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <depends>
-+                        <field id="enabled">1</field>
-+                    </depends>
-+                </field>
-+                <field id="product_to_cart_enabled" translate="label comment" type="select" sortOrder="4" showInDefault="1" showInWebsite="0" showInStore="0">
-+                    <label>Enable "Product Added To Cart" Report</label>
-+                    <comment>If enabled, will collect statistic of products added to Cart</comment>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <depends>
-+                        <field id="enabled">1</field>
-+                    </depends>
-+                </field>
-+                <field id="product_to_wishlist_enabled" translate="label comment" type="select" sortOrder="5" showInDefault="1" showInWebsite="0" showInStore="0">
-+                    <label>Enable "Product Added To WishList" Report</label>
-+                    <comment>If enabled, will collect statistic of products added to WishList</comment>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <depends>
-+                        <field id="enabled">1</field>
-+                    </depends>
-+                </field>
-+                <field id="wishlist_share_enabled" translate="label comment" type="select" sortOrder="6" showInDefault="1" showInWebsite="0" showInStore="0">
-+                    <label>Enable "Share WishList" Report</label>
-+                    <comment>If enabled, will collect statistic of shared WishLists</comment>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <depends>
-+                        <field id="enabled">1</field>
-+                    </depends>
-+                </field>
-+            </group>
-         </section>
-     </system>
- </config>
-diff --git a/app/code/Magento/Reports/etc/config.xml b/app/code/Magento/Reports/etc/config.xml
-index ecf9569ad19..ffd2299eb68 100644
---- a/app/code/Magento/Reports/etc/config.xml
-+++ b/app/code/Magento/Reports/etc/config.xml
-@@ -19,6 +19,15 @@
-                 <ytd_start>1,1</ytd_start>
-                 <mtd_start>1</mtd_start>
-             </dashboard>
-+            <options>
-+                <enabled>1</enabled>
-+                <product_view_enabled>1</product_view_enabled>
-+                <product_send_enabled>1</product_send_enabled>
-+                <product_compare_enabled>1</product_compare_enabled>
-+                <product_to_cart_enabled>1</product_to_cart_enabled>
-+                <product_to_wishlist_enabled>1</product_to_wishlist_enabled>
-+                <wishlist_share_enabled>1</wishlist_share_enabled>
-+            </options>
-         </reports>
-     </default>
- </config>
-diff --git a/app/code/Magento/Reports/etc/db_schema.xml b/app/code/Magento/Reports/etc/db_schema.xml
-index f6c8074411b..1321ebba4d3 100644
---- a/app/code/Magento/Reports/etc/db_schema.xml
-+++ b/app/code/Magento/Reports/etc/db_schema.xml
-@@ -21,33 +21,33 @@
-                 comment="Store Id"/>
-         <column xsi:type="timestamp" name="added_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Added At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="index_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="REPORT_CMPD_PRD_IDX_CSTR_ID_CSTR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="REPORT_CMPD_PRD_IDX_CSTR_ID_CSTR_ENTT_ENTT_ID"
-                     table="report_compared_product_index" column="customer_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="REPORT_CMPD_PRD_IDX_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="REPORT_CMPD_PRD_IDX_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="report_compared_product_index" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="REPORT_COMPARED_PRODUCT_INDEX_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="REPORT_COMPARED_PRODUCT_INDEX_STORE_ID_STORE_STORE_ID"
-                     table="report_compared_product_index" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="REPORT_COMPARED_PRODUCT_INDEX_VISITOR_ID_PRODUCT_ID">
-+        <constraint xsi:type="unique" referenceId="REPORT_COMPARED_PRODUCT_INDEX_VISITOR_ID_PRODUCT_ID">
-             <column name="visitor_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="REPORT_COMPARED_PRODUCT_INDEX_CUSTOMER_ID_PRODUCT_ID">
-+        <constraint xsi:type="unique" referenceId="REPORT_COMPARED_PRODUCT_INDEX_CUSTOMER_ID_PRODUCT_ID">
-             <column name="customer_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <index name="REPORT_COMPARED_PRODUCT_INDEX_STORE_ID" indexType="btree">
-+        <index referenceId="REPORT_COMPARED_PRODUCT_INDEX_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="REPORT_COMPARED_PRODUCT_INDEX_ADDED_AT" indexType="btree">
-+        <index referenceId="REPORT_COMPARED_PRODUCT_INDEX_ADDED_AT" indexType="btree">
-             <column name="added_at"/>
-         </index>
--        <index name="REPORT_COMPARED_PRODUCT_INDEX_PRODUCT_ID" indexType="btree">
-+        <index referenceId="REPORT_COMPARED_PRODUCT_INDEX_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-@@ -65,33 +65,33 @@
-                 comment="Store Id"/>
-         <column xsi:type="timestamp" name="added_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Added At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="index_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="REPORT_VIEWED_PRD_IDX_CSTR_ID_CSTR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRD_IDX_CSTR_ID_CSTR_ENTT_ENTT_ID"
-                     table="report_viewed_product_index" column="customer_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="REPORT_VIEWED_PRD_IDX_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRD_IDX_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="report_viewed_product_index" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="REPORT_VIEWED_PRODUCT_INDEX_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRODUCT_INDEX_STORE_ID_STORE_STORE_ID"
-                     table="report_viewed_product_index" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="REPORT_VIEWED_PRODUCT_INDEX_VISITOR_ID_PRODUCT_ID">
-+        <constraint xsi:type="unique" referenceId="REPORT_VIEWED_PRODUCT_INDEX_VISITOR_ID_PRODUCT_ID">
-             <column name="visitor_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="REPORT_VIEWED_PRODUCT_INDEX_CUSTOMER_ID_PRODUCT_ID">
-+        <constraint xsi:type="unique" referenceId="REPORT_VIEWED_PRODUCT_INDEX_CUSTOMER_ID_PRODUCT_ID">
-             <column name="customer_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <index name="REPORT_VIEWED_PRODUCT_INDEX_STORE_ID" indexType="btree">
-+        <index referenceId="REPORT_VIEWED_PRODUCT_INDEX_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="REPORT_VIEWED_PRODUCT_INDEX_ADDED_AT" indexType="btree">
-+        <index referenceId="REPORT_VIEWED_PRODUCT_INDEX_ADDED_AT" indexType="btree">
-             <column name="added_at"/>
-         </index>
--        <index name="REPORT_VIEWED_PRODUCT_INDEX_PRODUCT_ID" indexType="btree">
-+        <index referenceId="REPORT_VIEWED_PRODUCT_INDEX_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-@@ -101,7 +101,7 @@
-         <column xsi:type="varchar" name="event_name" nullable="false" length="64" comment="Event Name"/>
-         <column xsi:type="smallint" name="customer_login" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Customer Login"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="event_type_id"/>
-         </constraint>
-     </table>
-@@ -120,27 +120,27 @@
-                 default="0" comment="Subtype"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Store Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="event_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="REPORT_EVENT_STORE_ID_STORE_STORE_ID" table="report_event"
-+        <constraint xsi:type="foreign" referenceId="REPORT_EVENT_STORE_ID_STORE_STORE_ID" table="report_event"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="REPORT_EVENT_EVENT_TYPE_ID_REPORT_EVENT_TYPES_EVENT_TYPE_ID"
-+        <constraint xsi:type="foreign" referenceId="REPORT_EVENT_EVENT_TYPE_ID_REPORT_EVENT_TYPES_EVENT_TYPE_ID"
-                     table="report_event" column="event_type_id" referenceTable="report_event_types"
-                     referenceColumn="event_type_id" onDelete="CASCADE"/>
--        <index name="REPORT_EVENT_EVENT_TYPE_ID" indexType="btree">
-+        <index referenceId="REPORT_EVENT_EVENT_TYPE_ID" indexType="btree">
-             <column name="event_type_id"/>
-         </index>
--        <index name="REPORT_EVENT_SUBJECT_ID" indexType="btree">
-+        <index referenceId="REPORT_EVENT_SUBJECT_ID" indexType="btree">
-             <column name="subject_id"/>
-         </index>
--        <index name="REPORT_EVENT_OBJECT_ID" indexType="btree">
-+        <index referenceId="REPORT_EVENT_OBJECT_ID" indexType="btree">
-             <column name="object_id"/>
-         </index>
--        <index name="REPORT_EVENT_SUBTYPE" indexType="btree">
-+        <index referenceId="REPORT_EVENT_SUBTYPE" indexType="btree">
-             <column name="subtype"/>
-         </index>
--        <index name="REPORT_EVENT_STORE_ID" indexType="btree">
-+        <index referenceId="REPORT_EVENT_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -159,24 +159,24 @@
-                 default="0" comment="Number of Views"/>
-         <column xsi:type="smallint" name="rating_pos" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Rating Pos"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="REPORT_VIEWED_PRODUCT_AGGREGATED_DAILY_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_DAILY_STORE_ID_STORE_STORE_ID"
-                     table="report_viewed_product_aggregated_daily" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="REPORT_VIEWED_PRD_AGGRED_DAILY_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRD_AGGRED_DAILY_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="report_viewed_product_aggregated_daily" column="product_id"
-                     referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="REPORT_VIEWED_PRD_AGGRED_DAILY_PERIOD_STORE_ID_PRD_ID">
-+        <constraint xsi:type="unique" referenceId="REPORT_VIEWED_PRD_AGGRED_DAILY_PERIOD_STORE_ID_PRD_ID">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <index name="REPORT_VIEWED_PRODUCT_AGGREGATED_DAILY_STORE_ID" indexType="btree">
-+        <index referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_DAILY_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="REPORT_VIEWED_PRODUCT_AGGREGATED_DAILY_PRODUCT_ID" indexType="btree">
-+        <index referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_DAILY_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-@@ -195,24 +195,24 @@
-                 default="0" comment="Number of Views"/>
-         <column xsi:type="smallint" name="rating_pos" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Rating Pos"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="REPORT_VIEWED_PRODUCT_AGGREGATED_MONTHLY_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_MONTHLY_STORE_ID_STORE_STORE_ID"
-                     table="report_viewed_product_aggregated_monthly" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="REPORT_VIEWED_PRD_AGGRED_MONTHLY_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRD_AGGRED_MONTHLY_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="report_viewed_product_aggregated_monthly" column="product_id"
-                     referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="REPORT_VIEWED_PRD_AGGRED_MONTHLY_PERIOD_STORE_ID_PRD_ID">
-+        <constraint xsi:type="unique" referenceId="REPORT_VIEWED_PRD_AGGRED_MONTHLY_PERIOD_STORE_ID_PRD_ID">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <index name="REPORT_VIEWED_PRODUCT_AGGREGATED_MONTHLY_STORE_ID" indexType="btree">
-+        <index referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_MONTHLY_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="REPORT_VIEWED_PRODUCT_AGGREGATED_MONTHLY_PRODUCT_ID" indexType="btree">
-+        <index referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_MONTHLY_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-@@ -231,24 +231,24 @@
-                 default="0" comment="Number of Views"/>
-         <column xsi:type="smallint" name="rating_pos" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Rating Pos"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="REPORT_VIEWED_PRODUCT_AGGREGATED_YEARLY_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_YEARLY_STORE_ID_STORE_STORE_ID"
-                     table="report_viewed_product_aggregated_yearly" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="REPORT_VIEWED_PRD_AGGRED_YEARLY_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRD_AGGRED_YEARLY_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
-                     table="report_viewed_product_aggregated_yearly" column="product_id"
-                     referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="REPORT_VIEWED_PRD_AGGRED_YEARLY_PERIOD_STORE_ID_PRD_ID">
-+        <constraint xsi:type="unique" referenceId="REPORT_VIEWED_PRD_AGGRED_YEARLY_PERIOD_STORE_ID_PRD_ID">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <index name="REPORT_VIEWED_PRODUCT_AGGREGATED_YEARLY_STORE_ID" indexType="btree">
-+        <index referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_YEARLY_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="REPORT_VIEWED_PRODUCT_AGGREGATED_YEARLY_PRODUCT_ID" indexType="btree">
-+        <index referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_YEARLY_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
-index 900dc08d571..55ca286ad3d 100644
---- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
-+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
-@@ -11,7 +11,7 @@
-         <referenceBlock name="adminhtml.report.grid">
-             <arguments>
-                 <argument name="id" xsi:type="string">gridAccounts</argument>
--                <argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Accounts\Collection\Initial</argument>
-+                <argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Accounts\Collection\Initial</argument>
-             </arguments>
-         </referenceBlock>
-         <referenceBlock name="adminhtml.report.grid.export">
-diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml
-index d886e5724cb..f97bec3c152 100644
---- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml
-+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml
-@@ -11,7 +11,7 @@
-         <referenceBlock name="adminhtml.report.grid">
-             <arguments>
-                 <argument name="id" xsi:type="string">gridOrdersCustomer</argument>
--                <argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Customer\Orders\Collection\Initial</argument>
-+                <argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Customer\Orders\Collection\Initial</argument>
-             </arguments>
-         </referenceBlock>
-         <referenceBlock name="adminhtml.report.grid.export">
-diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml
-index 4914829cf6e..e1df04237c2 100644
---- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml
-+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml
-@@ -11,7 +11,7 @@
-         <referenceBlock name="adminhtml.report.grid">
-             <arguments>
-                 <argument name="id" xsi:type="string">gridTotalsCustomer</argument>
--                <argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Customer\Totals\Collection\Initial</argument>
-+                <argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Customer\Totals\Collection\Initial</argument>
-             </arguments>
-         </referenceBlock>
-         <referenceBlock name="adminhtml.report.grid.export">
-diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml
-index 82aa475807a..0f6fbabb6a5 100644
---- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml
-+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml
-@@ -24,7 +24,7 @@
-                     <argument name="use_ajax" xsi:type="string">0</argument>
-                     <argument name="pager_visibility" xsi:type="string">0</argument>
-                     <argument name="id" xsi:type="string">gridReport</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Report\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Report\Collection</argument>
-                 </arguments>
-                 <block class="Magento\Backend\Block\Widget\Grid\Export" name="adminhtml.report.grid.export" as="grid.export">
-                     <arguments>
-diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml
-index 070c39259aa..62916fe1c1d 100644
---- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml
-+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml
-@@ -12,7 +12,7 @@
-                 <arguments>
-                     <argument name="id" xsi:type="string">gridLowstock</argument>
-                     <argument name="use_ajax" xsi:type="string">0</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Product\Lowstock\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Product\Lowstock\Collection</argument>
-                 </arguments>
-                 <block class="Magento\Backend\Block\Widget\Grid\Export" name="adminhtml.block.report.product.lowstock.export" as="grid.export">
-                     <arguments>
-diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml
-index a1b01aeeb52..22c66352b32 100644
---- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml
-+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml
-@@ -11,7 +11,7 @@
-         <referenceBlock name="adminhtml.report.grid">
-             <arguments>
-                 <argument name="id" xsi:type="string">gridProductsSold</argument>
--                <argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Product\Sold\Collection\Initial</argument>
-+                <argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Product\Sold\Collection\Initial</argument>
-             </arguments>
-         </referenceBlock>
-         <referenceBlock name="adminhtml.report.grid.export">
-diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml
-index f941ca52eef..a728f471e4d 100644
---- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml
-+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml
-@@ -13,7 +13,7 @@
-                     <argument name="id" xsi:type="string">customers_grid</argument>
-                     <argument name="default_sort" xsi:type="string">review_cnt</argument>
-                     <argument name="default_dir" xsi:type="string">desc</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Review\Customer\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Review\Customer\Collection</argument>
-                 </arguments>
-                 <block class="Magento\Backend\Block\Widget\Grid\Export" name="adminhtml.block.report.review.customer.export" as="grid.export">
-                     <arguments>
-diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml
-index 1275e761ade..26d0e8b1365 100644
---- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml
-+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml
-@@ -13,7 +13,7 @@
-                     <argument name="id" xsi:type="string">gridProducts</argument>
-                     <argument name="default_sort" xsi:type="string">review_cnt</argument>
-                     <argument name="default_dir" xsi:type="string">desc</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Review\Product\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Review\Product\Collection</argument>
-                 </arguments>
-                 <block class="Magento\Backend\Block\Widget\Grid\Export" name="adminhtml.block.report.review.product.export" as="grid.export">
-                     <arguments>
-diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml
-index 4ec984ef9fc..649dc7ceeb0 100644
---- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml
-+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml
-@@ -15,7 +15,7 @@
-                         <argument name="use_ajax" xsi:type="string">0</argument>
-                         <argument name="sortable" xsi:type="string">0</argument>
-                         <argument name="pager_visibility" xsi:type="string">0</argument>
--                        <argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Refresh\Collection</argument>
-+                        <argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Refresh\Collection</argument>
-                     </arguments>
-                     <block class="Magento\Backend\Block\Widget\Grid\Massaction" name="adminhtml.block.refresh.statistics.massactions" as="grid.massaction">
-                         <arguments>
-diff --git a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
-index 00766acac16..81453a5a17a 100644
---- a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
-+++ b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
-@@ -3,59 +3,55 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var $block \Magento\Reports\Block\Adminhtml\Grid */
--$numColumns = sizeof($block->getColumns());
- ?>
--<?php if ($block->getCollection()): ?>
--    <?php if ($block->canDisplayContainer()): ?>
--    <div id="<?= /* @escapeNotVerified */ $block->getId() ?>">
--        <?php else: ?>
-+<?php if ($block->getCollection()) : ?>
-+    <?php if ($block->canDisplayContainer()) : ?>
-+    <div id="<?= $block->escapeHtmlAttr($block->getId()) ?>">
-+        <?php else : ?>
-             <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
-         <?php endif; ?>
--        <?php if ($block->getStoreSwitcherVisibility() || $block->getDateFilterVisibility()): ?>
-+        <?php if ($block->getStoreSwitcherVisibility() || $block->getDateFilterVisibility()) : ?>
-             <div class="admin__data-grid-header admin__data-grid-toolbar">
-                 <div class="admin__data-grid-header-row">
--                    <?php if ($block->getDateFilterVisibility()): ?>
--                        <div class="admin__filter-actions" data-role="filter-form" id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_range') ?>">
-+                    <?php if ($block->getDateFilterVisibility()) : ?>
-+                        <div class="admin__filter-actions" data-role="filter-form" id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_range')) ?>">
-                             <span class="field-row">
--                                <label for="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>"
-+                                <label for="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_from')) ?>"
-                                        class="admin__control-support-text">
--                                    <span><?= /* @escapeNotVerified */ __('From') ?>:</span>
-+                                    <span><?= $block->escapeHtml(__('From')) ?>:</span>
-                                 </label>
-                                 <input class="input-text no-changes required-entry admin__control-text"
-                                        type="text"
--                                       id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>"
-+                                       id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_from')) ?>"
-                                        name="report_from"
--                                       value="<?= $block->escapeHtml($block->getFilter('report_from')) ?>">
--                                <span id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from_advice') ?>"></span>
-+                                       value="<?= $block->escapeHtmlAttr($block->getFilter('report_from')) ?>">
-+                                <span id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_from_advice')) ?>"></span>
-                             </span>
- 
-                             <span class="field-row">
--                                <label for="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>"
-+                                <label for="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_to')) ?>"
-                                        class="admin__control-support-text">
--                                    <span><?= /* @escapeNotVerified */ __('To') ?>:</span>
-+                                    <span><?= $block->escapeHtml(__('To')) ?>:</span>
-                                 </label>
-                                 <input class="input-text no-changes required-entry admin__control-text"
-                                        type="text"
--                                       id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>"
-+                                       id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_to')) ?>"
-                                        name="report_to"
--                                       value="<?= $block->escapeHtml($block->getFilter('report_to')) ?>"/>
--                                <span id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to_advice') ?>"></span>
-+                                       value="<?= $block->escapeHtmlAttr($block->getFilter('report_to')) ?>"/>
-+                                <span id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_to_advice')) ?>"></span>
-                             </span>
- 
-                             <span class="field-row admin__control-filter">
--                                 <label for="<?= /* @escapeNotVerified */ $block->getSuffixId('report_period') ?>"
-+                                 <label for="<?= $block->escapeHtmlAttr($block->getSuffixId('report_period')) ?>"
-                                         class="admin__control-support-text">
--                                     <span><?= /* @escapeNotVerified */ __('Show By') ?>:</span>
-+                                     <span><?= $block->escapeHtml(__('Show By')) ?>:</span>
-                                  </label>
--                                <select name="report_period" id="<?= /* @escapeNotVerified */ $block->getSuffixId('report_period') ?>" class="admin__control-select">
--                                    <?php foreach ($block->getPeriods() as $_value => $_label): ?>
--                                        <option value="<?= /* @escapeNotVerified */ $_value ?>" <?php if ($block->getFilter('report_period') == $_value): ?> selected<?php endif; ?>><?= /* @escapeNotVerified */ $_label ?></option>
-+                                <select name="report_period" id="<?= $block->escapeHtmlAttr($block->getSuffixId('report_period')) ?>" class="admin__control-select">
-+                                    <?php foreach ($block->getPeriods() as $_value => $_label) : ?>
-+                                        <option value="<?= $block->escapeHtmlAttr($_value) ?>" <?php if ($block->getFilter('report_period') == $_value) : ?> selected<?php endif; ?>><?= $block->escapeHtml($_label) ?></option>
-                                     <?php endforeach; ?>
-                                 </select>
-                                 <?= $block->getRefreshButtonHtml() ?>
-@@ -66,33 +62,33 @@ $numColumns = sizeof($block->getColumns());
-                                     "mage/calendar"
-                                 ], function($){
- 
--                                    $("#<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_range') ?>").dateRange({
--                                        dateFormat:"<?= /* @escapeNotVerified */ $block->getDateFormat() ?>",
--                                        buttonText:"<?= /* @escapeNotVerified */ __('Select Date') ?>",
-+                                    $("#<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_range'))) ?>").dateRange({
-+                                        dateFormat:"<?= $block->escapeJs($block->escapeHtml($block->getDateFormat())) ?>",
-+                                        buttonText:"<?= $block->escapeJs($block->escapeHtml(__('Select Date'))) ?>",
-                                         from:{
--                                            id:"<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>"
-+                                            id:"<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_from'))) ?>"
-                                         },
-                                         to:{
--                                            id:"<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>"
-+                                            id:"<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_to'))) ?>"
-                                         }
-                                     });
-                                 });
-                             </script>
-                         </div>
-                     <?php endif; ?>
--                    <?php if ($block->getChildBlock('grid.export')): ?>
-+                    <?php if ($block->getChildBlock('grid.export')) : ?>
-                         <?= $block->getChildHtml('grid.export') ?>
-                     <?php endif; ?>
-                 </div>
-             </div>
-         <?php endif; ?>
-         <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
--            <table class="data-grid" id="<?= /* @escapeNotVerified */ $block->getId() ?>_table">
-+            <table class="data-grid" id="<?= $block->escapeHtmlAttr($block->getId()) ?>_table">
-                 <?= $block->getChildHtml('grid.columnSet') ?>
-             </table>
-         </div>
-     </div>
--    <?php if ($block->canDisplayContainer()): ?>
-+    <?php if ($block->canDisplayContainer()) : ?>
-         <script>
-             require([
-                 "jquery",
-@@ -102,29 +98,31 @@ $numColumns = sizeof($block->getColumns());
-             ], function(jQuery){
- 
-                 //<![CDATA[
--                <?= /* @escapeNotVerified */ $block->getJsObjectName() ?> = new varienGrid('<?= /* @escapeNotVerified */ $block->getId() ?>', '<?= /* @escapeNotVerified */ $block->getGridUrl() ?>', '<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameSort() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameDir() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameFilter() ?>');
--                <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.useAjax = '<?php if ($block->getUseAjax()): /* @escapeNotVerified */ echo $block->getUseAjax(); endif; ?>';
--                <?php if ($block->getDateFilterVisibility()): ?>
--                <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.doFilterCallback = validateFilterDate;
--                var period_date_from = $('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>');
--                var period_date_to = $('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>');
--                period_date_from.adviceContainer = $('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from_advice') ?>');
--                period_date_to.adviceContainer = $('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to_advice') ?>');
-+                <?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?> = new varienGrid('<?= $block->escapeJs($block->escapeHtml($block->getId())) ?>', '<?= $block->escapeJs($block->escapeUrl($block->getGridUrl())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getVarNamePage())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getVarNameSort())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getVarNameDir())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getVarNameFilter())) ?>');
-+                <?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.useAjax = '<?php if ($block->getUseAjax()) :
-+                        echo $block->escapeJs($block->escapeHtml($block->getUseAjax()));
-+                    endif; ?>';
-+                <?php if ($block->getDateFilterVisibility()) : ?>
-+                    <?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.doFilterCallback = validateFilterDate;
-+                    var period_date_from = $('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_from'))) ?>');
-+                    var period_date_to = $('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_to'))) ?>');
-+                    period_date_from.adviceContainer = $('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_from_advice'))) ?>');
-+                    period_date_to.adviceContainer = $('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_to_advice'))) ?>');
- 
--                var validateFilterDate = function() {
--                    if (period_date_from && period_date_to) {
--                        var valid = true;
--                        jQuery(period_date_from).add(period_date_to).each(function() {
--                            valid = Validation.validate(this) && valid;
--                        });
--                        return valid;
--                    }
--                    else {
--                        return true;
-+                    var validateFilterDate = function() {
-+                        if (period_date_from && period_date_to) {
-+                            var valid = true;
-+                            jQuery(period_date_from).add(period_date_to).each(function() {
-+                                valid = Validation.validate(this) && valid;
-+                            });
-+                            return valid;
-+                        }
-+                        else {
-+                            return true;
-+                        }
-                     }
--                }
-                 <?php endif;?>
--                <?php if ($block->getStoreSwitcherVisibility()): ?>
-+                <?php if ($block->getStoreSwitcherVisibility()) : ?>
-                 /* Overwrite function from switcher.phtml widget*/
-                 switchStore = function(obj) {
-                     if (obj.options[obj.selectedIndex].getAttribute('website') == 'true') {
-@@ -138,9 +136,9 @@ $numColumns = sizeof($block->getColumns());
-                     if (obj.switchParams) {
-                         storeParam += obj.switchParams;
-                     }
--                    var formParam = new Array('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>', '<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>', '<?= /* @escapeNotVerified */ $block->getSuffixId('report_period') ?>');
-+                    var formParam = new Array('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_from'))) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_to'))) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('report_period'))) ?>');
-                     var paramURL = '';
--                    var switchURL = '<?= /* @escapeNotVerified */ $block->getAbsoluteGridUrl(['_current' => false]) ?>'.replace(/(store|group|website)\/\d+\//, '');
-+                    var switchURL = '<?= $block->escapeUrl($block->getAbsoluteGridUrl(['_current' => false])) ?>'.replace(/(store|group|website)\/\d+\//, '');
- 
-                     for (var i = 0; i < formParam.length; i++) {
-                         if ($(formParam[i]).value && $(formParam[i]).name) {
-diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
-index 6f93cd157a4..85145454428 100644
---- a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
-+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
-@@ -3,7 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- ?>
- 
- <div class="reports-content">
-@@ -32,7 +31,7 @@ require([
-         }
- 
-         if (jQuery('#filter_form').valid()) {
--            setLocation('<?= /* @escapeNotVerified */ $block->getFilterUrl() ?>filter/'+
-+            setLocation('<?= $block->escapeJs($block->escapeUrl($block->getFilterUrl())) ?>filter/'+
-                 Base64.encode(Form.serializeElements(elements))+'/'
-             );
-         }
-diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/refresh/statistics.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/refresh/statistics.phtml
-index 1c448f96637..4ce64f0bd00 100644
---- a/app/code/Magento/Reports/view/adminhtml/templates/report/refresh/statistics.phtml
-+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/refresh/statistics.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getButtonsHtml() ?></div>
- <?= $block->getChildHtml('grid') ?>
-diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml
-index 16b99744c42..9183145a2ca 100644
---- a/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml
-+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml
-@@ -4,27 +4,20 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/**
-+ * @deprecated
-+ */
- ?>
- <?= $block->getChildHtml('grid') ?>
- 
- <div class="switcher f-left" style="margin: 10px 10px 10px 0px; padding:15px;">
--<?php
--    /* @escapeNotVerified */ echo __('Customers that have Wish List: %1', $block->getCustomerWithWishlist())
--?>
-+<?= $block->escapeHtml(__('Customers that have Wish List: %1', $block->getCustomerWithWishlist())) ?>
- </div>
- 
- <div class="switcher" style="float: right; margin: 10px 0px 10px 10px; padding:15px;">
--    <?php
--        /* @escapeNotVerified */ echo __('Number of Wish Lists: %1', $block->getWishlistsCount())
--    ?><br />
--    <?php
--        /* @escapeNotVerified */ echo __('Number of items bought from a Wish List: %1', $block->getItemsBought())
--    ?><br />
--    <?php /* @escapeNotVerified */ echo __('Number of times Wish Lists have been shared (emailed): %1', $block->getSharedCount())
--    ?><br />
--    <?php /* @escapeNotVerified */ echo __('Number of Wish List referrals: %1', $block->getReferralsCount())
--    ?><br />
--    <?php /* @escapeNotVerified */ echo __('Number of Wish List conversions: %1', $block->getConversionsCount())
--    ?><br />
-+    <?= $block->escapeHtml(__('Number of Wish Lists: %1', $block->getWishlistsCount())) ?><br />
-+    <?= $block->escapeHtml(__('Number of items bought from a Wish List: %1', $block->getItemsBought())) ?><br />
-+    <?= $block->escapeHtml(__('Number of times Wish Lists have been shared (emailed): %1', $block->getSharedCount())) ?><br />
-+    <?= $block->escapeHtml(__('Number of Wish List referrals: %1', $block->getReferralsCount())) ?><br />
-+    <?= $block->escapeHtml(__('Number of Wish List conversions: %1', $block->getConversionsCount())) ?><br />
- </div>
-diff --git a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
-index 0a1dc5dacd9..090bda48a35 100644
---- a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
-+++ b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
-@@ -4,40 +4,40 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/**
-+ * @deprecated
-+ */
- 
--?>
--<?php
- /**
-  * @see \Magento\Backend\Block\Store\Switcher
-  */
- ?>
--<?php if ($block->isShow()): ?>
-+<?php if ($block->isShow()) : ?>
- <div class="field field-store-switcher">
--    <label class="label" for="store_switcher"><?= /* @escapeNotVerified */ __('Show Report For:') ?></label>
-+    <label class="label" for="store_switcher"><?= $block->escapeHtml(__('Show Report For:')) ?></label>
-     <div class="control">
-         <select 
-             id="store_switcher"
-             class="admin__control-select"
-             name="store_switcher"
-             onchange="return switchStore(this);">
--            <option value=""><?= /* @escapeNotVerified */ __('All Websites') ?></option>
--            <?php foreach ($block->getWebsiteCollection() as $_website): ?>
-+            <option value=""><?= $block->escapeHtml(__('All Websites')) ?></option>
-+            <?php foreach ($block->getWebsiteCollection() as $_website) : ?>
-                 <?php $showWebsite = false; ?>
--                <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
-+                <?php foreach ($block->getGroupCollection($_website) as $_group) : ?>
-                     <?php $showGroup = false; ?>
--                    <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
--                        <?php if ($showWebsite == false): ?>
-+                    <?php foreach ($block->getStoreCollection($_group) as $_store) : ?>
-+                        <?php if ($showWebsite == false) : ?>
-                             <?php $showWebsite = true; ?>
--                                <option website="true" value="<?= /* @escapeNotVerified */ $_website->getId() ?>"<?php if ($block->getRequest()->getParam('website') == $_website->getId()): ?> selected<?php endif; ?>>
--                                    <?= /* @escapeNotVerified */ $_website->getName() ?>
-+                                <option website="true" value="<?= $block->escapeHtmlAttr($_website->getId()) ?>"<?php if ($block->getRequest()->getParam('website') == $_website->getId()) : ?> selected<?php endif; ?>>
-+                                    <?= $block->escapeHtml($_website->getName()) ?>
-                                 </option>
-                         <?php endif; ?>
--                        <?php if ($showGroup == false): ?>
-+                        <?php if ($showGroup == false) : ?>
-                             <?php $showGroup = true; ?>
--                            <option group="true" value="<?= /* @escapeNotVerified */ $_group->getId() ?>"<?php if ($block->getRequest()->getParam('group') == $_group->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= /* @escapeNotVerified */ $_group->getName() ?></option>
-+                            <option group="true" value="<?= $block->escapeHtmlAttr($_group->getId()) ?>"<?php if ($block->getRequest()->getParam('group') == $_group->getId()) : ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_group->getName()) ?></option>
-                         <?php endif; ?>
--                        <option value="<?= /* @escapeNotVerified */ $_store->getId() ?>"<?php if ($block->getStoreId() == $_store->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= /* @escapeNotVerified */ $_store->getName() ?></option>
-+                        <option value="<?= $block->escapeHtmlAttr($_store->getId()) ?>"<?php if ($block->getStoreId() == $_store->getId()) : ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_store->getName()) ?></option>
-                     <?php endforeach; ?>
-                 <?php endforeach; ?>
-             <?php endforeach; ?>
-@@ -60,7 +60,7 @@ require(['prototype'], function(){
-         if(obj.switchParams){
-             storeParam+= obj.switchParams;
-         }
--        setLocation('<?= /* @escapeNotVerified */ $block->getSwitchUrl() ?>'+storeParam);
-+        setLocation('<?= $block->escapeUrl($block->getSwitchUrl()) ?>'+storeParam);
-     }
- 
- });
-diff --git a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml
-index 7edeee628be..e7a712e83e0 100644
---- a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml
-+++ b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml
-@@ -4,10 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/**
-+ * @deprecated
-+ */
- 
--?>
--<?php
- /**
-  * @see \Magento\Backend\Block\Store\Switcher
-  */
-@@ -17,32 +17,32 @@
-  */
- ?>
- 
--<?php if ($block->isShow()): ?>
-+<?php if ($block->isShow()) : ?>
- <div class="field field-store-switcher">
--    <label class="label" for="store_switcher"><?= /* @escapeNotVerified */ __('Show Report For:') ?></label>
-+    <label class="label" for="store_switcher"><?= $block->escapeHtml(__('Show Report For:')) ?></label>
-     <div class="control">
-         <select 
-             id="store_switcher"
-             class="admin__control-select"
-             name="store_switcher"
-             onchange="return switchStore(this);">
--            <option value=""><?= /* @escapeNotVerified */ __('All Websites') ?></option>
--            <?php foreach ($block->getWebsiteCollection() as $_website): ?>
-+            <option value=""><?= $block->escapeHtml(__('All Websites')) ?></option>
-+            <?php foreach ($block->getWebsiteCollection() as $_website) : ?>
-                 <?php $showWebsite = false; ?>
--                <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
-+                <?php foreach ($block->getGroupCollection($_website) as $_group) : ?>
-                     <?php $showGroup = false; ?>
--                    <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
--                        <?php if ($showWebsite == false): ?>
-+                    <?php foreach ($block->getStoreCollection($_group) as $_store) : ?>
-+                        <?php if ($showWebsite == false) : ?>
-                             <?php $showWebsite = true; ?>
--                            <option website="true" value="<?= /* @escapeNotVerified */ implode(',', $_website->getStoreIds()) ?>"<?php if ($block->getRequest()->getParam('store_ids') == implode(',', $_website->getStoreIds())): ?> selected<?php endif; ?>><?= $block->escapeHtml($_website->getName()) ?></option>
-+                            <option website="true" value="<?= $block->escapeHtmlAttr(implode(',', $_website->getStoreIds())) ?>"<?php if ($block->getRequest()->getParam('store_ids') == implode(',', $_website->getStoreIds())) : ?> selected<?php endif; ?>><?= $block->escapeHtml($_website->getName()) ?></option>
-                         <?php endif; ?>
--                        <?php if ($showGroup == false): ?>
-+                        <?php if ($showGroup == false) : ?>
-                             <?php $showGroup = true; ?>
--                            <option group="true" value="<?= /* @escapeNotVerified */ implode(',', $_group->getStoreIds()) ?>"<?php if ($block->getRequest()->getParam('store_ids') == implode(',', $_group->getStoreIds())): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_group->getName()) ?></option>
-+                            <option group="true" value="<?= $block->escapeHtmlAttr(implode(',', $_group->getStoreIds())) ?>"<?php if ($block->getRequest()->getParam('store_ids') == implode(',', $_group->getStoreIds())) : ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_group->getName()) ?></option>
-                         <?php endif; ?>
--                        <option value="<?= /* @escapeNotVerified */ $_store->getId() ?>"<?php if ($block->getStoreId() == $_store->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_store->getName()) ?></option>
-+                        <option value="<?= $block->escapeHtmlAttr($_store->getId()) ?>"<?php if ($block->getStoreId() == $_store->getId()) : ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_store->getName()) ?></option>
-                     <?php endforeach; ?>
--                    <?php if ($showGroup): ?>
-+                    <?php if ($showGroup) : ?>
-                         </optgroup>
-                     <?php endif; ?>
-                 <?php endforeach; ?>
-@@ -59,7 +59,7 @@ require(['prototype'], function(){
-         if(obj.switchParams){
-             storeParam+= obj.switchParams;
-         }
--        setLocation('<?= /* @escapeNotVerified */ $block->getSwitchUrl() ?>'+storeParam);
-+        setLocation('<?= $block->escapeUrl($block->getSwitchUrl()) ?>'+storeParam);
-     }
- 
- });
-diff --git a/app/code/Magento/Reports/view/frontend/templates/js/components.phtml b/app/code/Magento/Reports/view/frontend/templates/js/components.phtml
-index bad5acc209b..5902a9f25cc 100644
---- a/app/code/Magento/Reports/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/Reports/view/frontend/templates/js/components.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
-index a6e2f3dc722..055a26b3dc3 100644
---- a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
-+++ b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
-@@ -4,7 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/**
-+ * @deprecated
-+ */
- 
- /* @var $block \Magento\Reports\Block\Product\Widget\Viewed */
- ?>
-@@ -15,12 +17,12 @@ $type = $block->getType() . '-' . $mode;
- $class = 'widget viewed' . ' ' . $mode;
- $title = __('Recently Viewed');
- ?>
--<div class="block <?= /* @escapeNotVerified */ $class ?>" id="recently_viewed_container" data-mage-init='{"recentlyViewedProducts":{}}' data-count="<?= /* @escapeNotVerified */ $block->getCount() ?>" style="display: none;">
-+<div class="block <?= $block->escapeHtmlAttr($class) ?>" id="recently_viewed_container" data-mage-init='{"recentlyViewedProducts":{}}' data-count="<?= $block->escapeHtmlAttr($block->getCount()) ?>" style="display: none;">
-     <div class="title">
--        <strong><?= /* @escapeNotVerified */ $title ?></strong>
-+        <strong><?= $block->escapeHtml($title) ?></strong>
-     </div>
-     <div class="content">
--        <ol class="products list items <?= /* @escapeNotVerified */ $type ?>">
-+        <ol class="products list items <?= $block->escapeHtmlAttr($type) ?>">
-         </ol>
-     </div>
- </div>
-diff --git a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
-index 579239d63e1..562c9a2b63a 100644
---- a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
-+++ b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
-@@ -4,12 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/**
-+ * @deprecated
-+ */
- 
- /* @var $block \Magento\Reports\Block\Product\Widget\Viewed\Item */
--?>
- 
--<?php
- $type = $block->getType() . '-' . $block->getViewMode();
- 
- $item = $block->getProduct();
-@@ -17,19 +17,19 @@ $item = $block->getProduct();
- $image = $block->getImageType();
- $rating = 'short';
- ?>
--<div class="block" id="widget_viewed_item" data-sku="<?= /* @escapeNotVerified */ $item->getSku() ?>" style="display: none;">
-+<div class="block" id="widget_viewed_item" data-sku="<?= $block->escapeHtmlAttr($item->getSku()) ?>" style="display: none;">
-     <li class="item product">
-         <div class="product">
--            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
--            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($item) ?>" class="product photo">
-+            <?= '<!-- ' . $block->escapeHtml($image) . '-->' ?>
-+            <a href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>" class="product photo">
-                 <?= $block->getImage($item, $image)->toHtml() ?>
-             </a>
-             <div class="product details">
--                <strong class="product name"><a title="<?= $block->escapeHtml($item->getName()) ?>" href="<?= /* @escapeNotVerified */ $block->getProductUrl($item) ?>">
-+                <strong class="product name"><a title="<?= $block->escapeHtmlAttr($item->getName()) ?>" href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>">
-                     <?= $block->escapeHtml($item->getName()) ?></a>
-                 </strong>
- 
--                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-+                <?= /* @noEscape */ $block->getProductPriceHtml(
-                     $item,
-                     \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                     \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-@@ -38,51 +38,51 @@ $rating = 'short';
-                     ]
-                 ) ?>
- 
--                <?php if ($rating): ?>
-+                <?php if ($rating) : ?>
-                     <?= $block->getReviewsSummaryHtml($item, $rating) ?>
-                 <?php endif; ?>
- 
-                 <div class="product actions">
-                     <div class="primary">
--                        <?php if ($item->isSaleable()): ?>
--                            <?php if ($item->getTypeInstance()->hasRequiredOptions($item)): ?>
--                                <button class="action tocart" data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($item) ?>"}}' type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                        <?php if ($item->isSaleable()) : ?>
-+                            <?php if ($item->getTypeInstance()->hasRequiredOptions($item)) : ?>
-+                                <button class="action tocart" data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                    <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                 </button>
--                            <?php else: ?>
--                                <?php $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-+                            <?php else : ?>
-+                                <?php $postDataHelper = $this->helper(\Magento\Framework\Data\Helper\PostHelper::class);
-                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($item), ['product' => $item->getEntityId()])
-                                 ?>
-                                 <button class="action tocart"
--                                        data-post='<?= /* @escapeNotVerified */ $postData ?>'
--                                        type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                        data-post='<?= /* @noEscape */ $postData ?>'
-+                                        type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                    <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                 </button>
-                             <?php endif; ?>
--                        <?php else: ?>
--                            <?php if ($item->getIsSalable()): ?>
--                                <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
--                            <?php else: ?>
--                                <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-+                        <?php else : ?>
-+                            <?php if ($item->getIsSalable()) : ?>
-+                                <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-+                            <?php else : ?>
-+                                <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-                             <?php endif; ?>
-                         <?php endif; ?>
-                     </div>
- 
-                     <div class="secondary-addto-links" data-role="add-to-links">
--                        <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()): ?>
--                            <a href="#" data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($item) ?>'  class="action towishlist" data-action="add-to-wishlist" title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
--                                <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
-+                        <?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow()) : ?>
-+                            <a href="#" data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($item) ?>'  class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-+                                <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
-                             </a>
-                         <?php endif; ?>
--                        <?php if ($block->getAddToCompareUrl()): ?>
-+                        <?php if ($block->getAddToCompareUrl()) : ?>
-                             <?php
--                            $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');
-+                            $compareHelper = $this->helper(\Magento\Catalog\Helper\Product\Compare::class);
-                             ?>
-                             <a href="#" class="action tocompare"
--                               data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($item) ?>'
-+                               data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($item) ?>'
-                                data-role="add-to-links"
--                               title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
--                                <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
-+                               title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-+                                <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
-                             </a>
-                         <?php endif; ?>
-                     </div>
-diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
-index 56368aa0e7f..a54259280e3 100644
---- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
-+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
-@@ -4,8 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/**
-+ * @deprecated
-+ */
- ?>
- <?php
- if ($exist = $block->getRecentlyComparedProducts()) {
-@@ -25,29 +26,29 @@ if ($exist = $block->getRecentlyComparedProducts()) {
-     $description = false;
- }
- ?>
--<?php if ($exist): ?>
--<div class="block widget block-compared-products-<?= /* @escapeNotVerified */ $mode ?>">
-+<?php if ($exist) : ?>
-+<div class="block widget block-compared-products-<?= $block->escapeHtmlAttr($mode) ?>">
-     <div class="block-title">
--        <strong><?= /* @escapeNotVerified */ $title ?></strong>
-+        <strong><?= $block->escapeHtml($title) ?></strong>
-     </div>
-     <div class="block-content">
-         <?php $suffix = $block->getNameInLayout(); ?>
--        <ol class="product-items" id="widget-compared-<?= /* @escapeNotVerified */ $suffix ?>">
--            <?php foreach ($items as $_product): ?>
-+        <ol class="product-items" id="widget-compared-<?= $block->escapeHtmlAttr($suffix) ?>">
-+            <?php foreach ($items as $_product) : ?>
-                 <li class="product-item">
-                     <div class="product-item-info">
--                        <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
--                           title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
-+                        <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
-+                           title="<?= $block->escapeHtmlAttr($block->stripTags($_product->getName(), null, true)) ?>">
-                             <?= $block->getImage($_product, $image)->toHtml() ?>
-                         </a>
-                         <div class="product-item-details">
-                             <strong class="product-item-name">
--                                <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
--                                   title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>)">
--                                    <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
-+                                <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
-+                                   title="<?= $block->escapeHtmlAttr($block->stripTags($_product->getName(), null, true)) ?>)">
-+                                    <?= $block->escapeHtml($this->helper(\Magento\Catalog\Helper\Output::class)->productAttribute($_product, $_product->getName(), 'name')) ?>
-                                 </a>
-                             </strong>
--                            <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-+                            <?= /* @noEscape */ $block->getProductPriceHtml(
-                                 $_product,
-                                 \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                 \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-@@ -56,31 +57,31 @@ if ($exist = $block->getRecentlyComparedProducts()) {
-                                 ]
-                             ) ?>
-                             <div class="product-item-actions">
--                            <?php if ($_product->isSaleable()): ?>
-+                            <?php if ($_product->isSaleable()) : ?>
-                                 <div class="actions-primary">
--                                <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
-+                                <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)) : ?>
-                                     <button class="action tocart primary"
--                                            data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'
--                                            type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                            data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_product)) ?>"}}'
-+                                            type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                        <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                     </button>
--                                <?php else: ?>
-+                                <?php else : ?>
-                                     <?php
--                                    $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-+                                    $postDataHelper = $this->helper(\Magento\Framework\Data\Helper\PostHelper::class);
-                                     $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()])
-                                     ?>
-                                     <button class="action tocart primary"
--                                            data-post='<?= /* @escapeNotVerified */ $postData ?>'
--                                            type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                            data-post='<?= /* @noEscape */ $postData ?>'
-+                                            type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                        <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                     </button>
-                                 <?php endif; ?>
-                                 </div>
--                            <?php else: ?>
--                                <?php if ($_product->getIsSalable()): ?>
--                                    <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
--                                <?php else: ?>
--                                    <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-+                            <?php else : ?>
-+                                <?php if ($_product->getIsSalable()) : ?>
-+                                    <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-+                                <?php else : ?>
-+                                    <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-                                 <?php endif; ?>
-                             <?php endif; ?>
-                             </div>
-diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml
-index e125467b71f..6311f4c43e0 100644
---- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml
-+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml
-@@ -4,8 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/**
-+ * @deprecated
-+ */
- ?>
- <?php
- if ($exist = $block->getRecentlyComparedProducts()) {
-@@ -22,18 +23,17 @@ if ($exist = $block->getRecentlyComparedProducts()) {
-     $description = false;
- }
- ?>
--<?php if ($exist): ?>
-+<?php if ($exist) : ?>
- <div class="block widget block-compared-products-images">
-     <div class="block-title">
--        <strong><?= /* @escapeNotVerified */ $title ?></strong>
-+        <strong><?= $block->escapeHtml($title) ?></strong>
-     </div>
-     <div class="block-content">
--        <?php $suffix = $block->getNameInLayout(); ?>
--        <ol id="widget-compared-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-images">
--        <?php $i = 0; foreach ($items as $_product): ?>
-+        <ol id="widget-compared-<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>" class="product-items product-items-images">
-+        <?php $i = 0; foreach ($items as $_product) : ?>
-             <li class="product-item">
--                <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
--                    title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
-+                <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
-+                    title="<?= $block->escapeHtmlAttr($block->stripTags($_product->getName(), null, true)) ?>">
-                     <?= $block->getImage($_product, $image)->toHtml() ?>
-                 </a>
-             </li>
-diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml
-index ee24db7d693..b37aef8e298 100644
---- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml
-+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml
-@@ -4,22 +4,22 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/**
-+ * @deprecated
-+ */
- ?>
--<?php if ($_products = $block->getRecentlyComparedProducts()): ?>
-+<?php if ($_products = $block->getRecentlyComparedProducts()) : ?>
- <div class="block widget block-compared-products-names">
-     <div class="block-title">
--        <strong><?= /* @escapeNotVerified */ __('Recently Compared') ?></span></strong>
-+        <strong><?= $block->escapeHtml(__('Recently Compared')) ?></span></strong>
-     </div>
-     <div class="block-content">
--        <?php $suffix = $block->getNameInLayout(); ?>
--        <ol id="widget-compared-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-names">
--        <?php $i = 0; foreach ($_products as $_product): ?>
-+        <ol id="widget-compared-<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>" class="product-items product-items-names">
-+        <?php $i = 0; foreach ($_products as $_product) : ?>
-             <li class="product-item">
-                 <strong class="product-item-name">
--                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product-item-link">
--                        <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
-+                    <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" class="product-item-link">
-+                        <?= $block->escapeHtml($this->helper(\Magento\Catalog\Helper\Output::class)->productAttribute($_product, $_product->getName(), 'name')) ?>
-                     </a>
-                 </strong>
-             </li>
-diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
-index d798fe9e581..ad6b33820c7 100644
---- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
-+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
-@@ -4,11 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
-+/**
-+ * @deprecated
-+ */
- 
--<?php
- /** @var \Magento\Catalog\Block\Product\Compare\ListCompare $block */
- if ($exist = $block->getRecentlyComparedProducts()) {
-     $type = 'widget-compared';
-@@ -28,29 +27,29 @@ if ($exist = $block->getRecentlyComparedProducts()) {
- }
- ?>
- 
--<?php if ($exist):?>
--    <div class="block widget block-compared-products-<?= /* @escapeNotVerified */ $mode ?>">
-+<?php if ($exist) : ?>
-+    <div class="block widget block-compared-products-<?= $block->escapeHtmlAttr($mode) ?>">
-         <div class="block-title">
--            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
-+            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
-         </div>
-         <div class="block-content">
--            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
--            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
--                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
--                    <?php foreach ($items as $_item): ?>
-+            <?= '<!-- ' . $block->escapeHtml($image) . '-->' ?>
-+            <div class="products-<?= $block->escapeHtmlAttr($mode) ?> <?= $block->escapeHtmlAttr($mode) ?>">
-+                <ol class="product-items <?= $block->escapeHtmlAttr($type)?>">
-+                    <?php foreach ($items as $_item) : ?>
-                         <li class="product-item">
-                             <div class="product-item-info">
--                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
-+                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
-                                     <?= $block->getImage($_item, $image)->toHtml() ?>
-                                 </a>
-                                 <div class="product-item-details">
-                                     <strong class="product-item-name">
--                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
--                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
-+                                        <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
-+                                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-link">
-                                             <?= $block->escapeHtml($_item->getName()) ?>
-                                         </a>
-                                     </strong>
--                                    <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-+                                    <?= /* @noEscape */ $block->getProductPriceHtml(
-                                         $_item,
-                                         \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                         \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-@@ -58,58 +57,58 @@ if ($exist = $block->getRecentlyComparedProducts()) {
-                                             'price_id_suffix' => '-' . $type
-                                         ]
-                                     ) ?>
--                                    <?php if ($rating): ?>
-+                                    <?php if ($rating) : ?>
-                                         <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
-                                     <?php endif; ?>
--                                    <?php if ($showWishlist || $showCompare || $showCart): ?>
-+                                    <?php if ($showWishlist || $showCompare || $showCart) : ?>
-                                         <div class="product-item-actions">
--                                            <?php if ($showCart): ?>
-+                                            <?php if ($showCart) : ?>
-                                                 <div class="actions-primary">
--                                                    <?php if ($_item->isSaleable()): ?>
--                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-+                                                    <?php if ($_item->isSaleable()) : ?>
-+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)) : ?>
-                                                             <button class="action tocart primary"
--                                                                    data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
--                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                                    data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
-+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                             </button>
--                                                        <?php else: ?>
-+                                                        <?php else : ?>
-                                                             <?php
--                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-+                                                                $postDataHelper = $this->helper(\Magento\Framework\Data\Helper\PostHelper::class);
-                                                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                             ?>
-                                                             <button class="action tocart primary"
--                                                                    data-post='<?= /* @escapeNotVerified */ $postData ?>'
--                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                                    data-post='<?= /* @noEscape */ $postData ?>'
-+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                             </button>
-                                                         <?php endif; ?>
--                                                    <?php else: ?>
--                                                        <?php if ($_item->getIsSalable()): ?>
--                                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
--                                                        <?php else: ?>
--                                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-+                                                    <?php else : ?>
-+                                                        <?php if ($_item->getIsSalable()) : ?>
-+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-+                                                        <?php else : ?>
-+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-                                                         <?php endif; ?>
-                                                     <?php endif; ?>
-                                                 </div>
-                                             <?php endif; ?>
- 
--                                            <?php if ($showWishlist || $showCompare): ?>
-+                                            <?php if ($showWishlist || $showCompare) : ?>
-                                                 <div class="actions-secondary" data-role="add-to-links">
--                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-+                                                    <?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) : ?>
-                                                         <a href="#"
--                                                           data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
-+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
-                                                            data-action="add-to-wishlist"
-                                                            class="action towishlist"
--                                                           title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
--                                                            <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
-+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
-                                                         </a>
-                                                     <?php endif; ?>
--                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
--                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
-+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare) : ?>
-+                                                        <?php $compareHelper = $this->helper(\Magento\Catalog\Helper\Product\Compare::class); ?>
-                                                         <a href="#" class="action tocompare"
--                                                           data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
--                                                           title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
--                                                            <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
-+                                                           data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
-+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
-                                                         </a>
-                                                     <?php endif; ?>
-                                                 </div>
-diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
-index be1c7672a12..ba7a50eef64 100644
---- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
-+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
-@@ -4,11 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
-+/**
-+ * @deprecated
-+ */
- 
--<?php
- /** @var \Magento\Catalog\Block\Product\Compare\ListCompare $block */
- if ($exist = $block->getRecentlyComparedProducts()) {
-     $type = 'widget-compared';
-@@ -19,7 +18,7 @@ if ($exist = $block->getRecentlyComparedProducts()) {
-     $image = 'recently_compared_products_list_content_widget';
-     $title = __('Recently Compared');
-     $items = $exist;
--    $_helper = $this->helper('Magento\Catalog\Helper\Output');
-+    $_helper = $this->helper(\Magento\Catalog\Helper\Output::class);
- 
-     $showWishlist = true;
-     $showCompare = true;
-@@ -29,29 +28,29 @@ if ($exist = $block->getRecentlyComparedProducts()) {
- }
- ?>
- 
--<?php if ($exist):?>
--    <div class="block widget block-compared-products-<?= /* @escapeNotVerified */ $mode ?>">
-+<?php if ($exist) : ?>
-+    <div class="block widget block-compared-products-<?= $block->escapeHtmlAttr($mode) ?>">
-         <div class="block-title">
--            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
-+            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
-         </div>
-         <div class="block-content">
--            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
--            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
--                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
--                    <?php foreach ($items as $_item): ?>
-+            <?= '<!-- ' . $block->escapeHtml($image) . '-->' ?>
-+            <div class="products-<?= $block->escapeHtmlAttr($mode) ?> <?= $block->escapeHtmlAttr($mode) ?>">
-+                <ol class="product-items <?= $block->escapeHtmlAttr($type) ?>">
-+                    <?php foreach ($items as $_item) : ?>
-                         <li class="product-item">
-                             <div class="product-item-info">
--                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
-+                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
-                                     <?= $block->getImage($_item, $image)->toHtml() ?>
-                                 </a>
-                                 <div class="product-item-details">
-                                     <strong class="product-item-name">
--                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
--                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
-+                                        <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
-+                                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-link">
-                                             <?= $block->escapeHtml($_item->getName()) ?>
-                                         </a>
-                                     </strong>
--                                    <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-+                                    <?= /* @noEscape */ $block->getProductPriceHtml(
-                                         $_item,
-                                         \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                         \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-@@ -59,70 +58,70 @@ if ($exist = $block->getRecentlyComparedProducts()) {
-                                             'price_id_suffix' => '-' . $type
-                                         ]
-                                     ) ?>
--                                    <?php if ($rating): ?>
-+                                    <?php if ($rating) : ?>
-                                         <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
-                                     <?php endif; ?>
--                                    <?php if ($showWishlist || $showCompare || $showCart): ?>
-+                                    <?php if ($showWishlist || $showCompare || $showCart) : ?>
-                                         <div class="product-item-actions">
--                                            <?php if ($showCart): ?>
-+                                            <?php if ($showCart) : ?>
-                                                 <div class="actions-primary">
--                                                    <?php if ($_item->isSaleable()): ?>
--                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-+                                                    <?php if ($_item->isSaleable()) : ?>
-+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)) : ?>
-                                                             <button class="action tocart primary"
--                                                                    data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
--                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                                    data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeHtmlAttr($block->escapeUrl($block->getAddToCartUrl($_item))) ?>"}}'
-+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                             </button>
--                                                        <?php else: ?>
-+                                                        <?php else : ?>
-                                                             <?php
--                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-+                                                                $postDataHelper = $this->helper(\Magento\Framework\Data\Helper\PostHelper::class);
-                                                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                             ?>
-                                                             <button class="action tocart primary"
--                                                                    data-post='<?= /* @escapeNotVerified */ $postData ?>'
--                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                                    data-post='<?= /* @noEscape */ $postData ?>'
-+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                             </button>
-                                                         <?php endif; ?>
--                                                    <?php else: ?>
--                                                        <?php if ($_item->getIsSalable()): ?>
--                                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
--                                                        <?php else: ?>
--                                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-+                                                    <?php else : ?>
-+                                                        <?php if ($_item->getIsSalable()) : ?>
-+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-+                                                        <?php else : ?>
-+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-                                                         <?php endif; ?>
-                                                     <?php endif; ?>
-                                                 </div>
-                                             <?php endif; ?>
- 
--                                            <?php if ($showWishlist || $showCompare): ?>
-+                                            <?php if ($showWishlist || $showCompare) : ?>
-                                                 <div class="actions-secondary" data-role="add-to-links">
--                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-+                                                    <?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) : ?>
-                                                         <a href="#"
--                                                           data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
-+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
-                                                            data-action="add-to-wishlist"
-                                                            class="action towishlist"
--                                                           title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
--                                                            <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
-+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
-                                                         </a>
-                                                     <?php endif; ?>
--                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
--                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare) : ?>
-+                                                        <?php $compareHelper = $this->helper(\Magento\Catalog\Helper\Product\Compare::class);?>
-                                                         <a href="#" class="action tocompare"
--                                                           data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
--                                                           title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
--                                                            <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
-+                                                           data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
-+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
-                                                         </a>
-                                                     <?php endif; ?>
-                                                 </div>
-                                             <?php endif; ?>
-                                         </div>
-                                     <?php endif; ?>
--                                    <?php if ($description):?>
-+                                    <?php if ($description) : ?>
-                                         <div class="product-item-description">
--                                            <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
--                                            <a title="<?= $block->escapeHtml($_item->getName()) ?>"
--                                               href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
--                                               class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
-+                                            <?= $block->escapeHtml($_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description')) ?>
-+                                            <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
-+                                               href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
-+                                               class="action more"><?= $block->escapeHtml(__('Learn More')) ?></a>
-                                         </div>
-                                     <?php endif; ?>
-                                 </div>
-diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
-index aa7d5a7166a..16fc2b070b9 100644
---- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
-+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
-@@ -4,10 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/**
-+ * @deprecated
-+ */
- 
--?>
--<?php
- /**
-  * @var $block \Magento\Reports\Block\Product\Viewed
-  */
-@@ -30,30 +30,30 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
-     $description = false;
- }
- ?>
--<?php if ($exist): ?>
--<div class="block widget block-viewed-products-<?= /* @escapeNotVerified */ $mode ?>">
-+<?php if ($exist) : ?>
-+<div class="block widget block-viewed-products-<?= $block->escapeHtmlAttr($mode) ?>">
-     <div class="block-title">
--        <strong><?= /* @escapeNotVerified */ $title ?></strong>
-+        <strong><?= $block->escapeHtml($title) ?></strong>
-     </div>
-     <div class="block-content">
-         <?php $suffix = $block->getNameInLayout(); ?>
--        <ol class="product-items" id="widget-viewed-<?= /* @escapeNotVerified */ $suffix ?>">
--            <?php foreach ($items as $_product): ?>
-+        <ol class="product-items" id="widget-viewed-<?= $block->escapeHtmlAttr($suffix) ?>">
-+            <?php foreach ($items as $_product) : ?>
-                 <li class="product-item">
-                     <div class="product-item-info">
--                        <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
--                           title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
-+                        <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
-+                           title="<?= $block->escapeHtmlAttr($block->stripTags($_product->getName(), null, true)) ?>">
-                             <?= $block->getImage($_product, $image)->toHtml() ?>
-                         </a>
-                         <div class="product-item-details">
-                             <strong class="product-item-name">
--                                <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
--                                   title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>"
-+                                <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
-+                                   title="<?= $block->escapeHtmlAttr($block->stripTags($_product->getName(), null, true)) ?>"
-                                    class="product-item-link">
--                                    <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
-+                                    <?= $block->escapeHtml($this->helper(\Magento\Catalog\Helper\Output::class)->productAttribute($_product, $_product->getName(), 'name')) ?>
-                                 </a>
-                             </strong>
--                            <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-+                            <?= /* @noEscape */ $block->getProductPriceHtml(
-                                 $_product,
-                                 \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                 \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-@@ -62,29 +62,29 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
-                                 ]
-                             ) ?>
-                             <div class="product-item-actions">
--                                <?php if ($_product->isSaleable()): ?>
-+                                <?php if ($_product->isSaleable()) : ?>
-                                 <div class="actions-primary">
--                                    <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
-+                                    <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)) : ?>
-                                         <button class="action tocart primary"
--                                                data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'
--                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_product)) ?>"}}'
-+                                                type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                         </button>
--                                    <?php else: ?>
-+                                    <?php else : ?>
-                                         <?php
--                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-+                                            $postDataHelper = $this->helper(\Magento\Framework\Data\Helper\PostHelper::class);
-                                             $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()]);
-                                         ?>
--                                        <button type="button" class="action tocart primary" data-post='<?= /* @escapeNotVerified */ $postData ?>'>
--                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                        <button type="button" class="action tocart primary" data-post='<?= /* @noEscape */ $postData ?>'>
-+                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                         </button>
-                                     <?php endif; ?>
-                                 </div>
--                                <?php else: ?>
--                                    <?php if ($_product->getIsSalable()): ?>
--                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
--                                    <?php else: ?>
--                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-+                                <?php else : ?>
-+                                    <?php if ($_product->getIsSalable()) : ?>
-+                                        <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-+                                    <?php else : ?>
-+                                        <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-                                     <?php endif; ?>
-                                 <?php endif; ?>
-                             </div>
-diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
-index 86f7b4db3da..68550d70494 100644
---- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
-+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
-@@ -4,10 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/**
-+ * @deprecated
-+ */
- 
--?>
--<?php
- /**
-  * @var $block \Magento\Reports\Block\Product\Viewed
-  */
-@@ -27,17 +27,17 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
-     $description = false;
- }
- ?>
--<?php if ($exist): ?>
-+<?php if ($exist) : ?>
-     <div class="block widget block-viewed-products-images">
-         <div class="block-title">
--            <strong><?= /* @escapeNotVerified */ $title ?></strong>
-+            <strong><?= $block->escapeHtml($title) ?></strong>
-         </div>
-         <div class="block-content">
-             <?php $suffix = $block->getNameInLayout(); ?>
--            <ol id="widget-viewed-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-images">
--                <?php foreach ($items as $_product): ?>
-+            <ol id="widget-viewed-<?= $block->escapeHtmlAttr($suffix) ?>" class="product-items product-items-images">
-+                <?php foreach ($items as $_product) : ?>
-                     <li class="product-item">
--                        <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
-+                        <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" title="<?= $block->escapeHtmlAttr($block->stripTags($_product->getName(), null, true)) ?>">
-                             <?= $block->getImage($_product, $image)->toHtml() ?>
-                         </a>
-                     </li>
-diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml
-index 25cc6c3c921..d2ea09ebdbf 100644
---- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml
-+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml
-@@ -4,27 +4,27 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/**
-+ * @deprecated
-+ */
- 
--?>
--<?php
- /**
-  * @var $block \Magento\Reports\Block\Product\Viewed
-  */
- ?>
--<?php if (($_products = $block->getRecentlyViewedProducts()) && $_products->getSize()): ?>
-+<?php if (($_products = $block->getRecentlyViewedProducts()) && $_products->getSize()) : ?>
- <div class="block widget block-viewed-products-names">
-     <div class="block-title">
--        <strong><?= /* @escapeNotVerified */ __('Recently Viewed') ?></strong>
-+        <strong><?= $block->escapeHtml(__('Recently Viewed')) ?></strong>
-     </div>
-     <div class="block-content">
-         <?php $suffix = $block->getNameInLayout(); ?>
--        <ol id="widget-viewed-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-names">
--        <?php foreach ($_products as $_product): ?>
-+        <ol id="widget-viewed-<?= $block->escapeHtmlAttr($suffix) ?>" class="product-items product-items-names">
-+        <?php foreach ($_products as $_product) : ?>
-             <li class="product-item">
-                 <strong class="product-item-name">
--                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product-item-link">
--                        <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
-+                    <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" class="product-item-link">
-+                        <?= $block->escapeHtml($this->helper(\Magento\Catalog\Helper\Output::class)->productAttribute($_product, $_product->getName(), 'name')) ?>
-                     </a>
-                 </strong>
-             </li>
-diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
-index a1d41ada04a..567c3ebc57f 100644
---- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
-+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
-@@ -4,10 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/**
-+ * @deprecated
-+ */
- 
--?>
--<?php
- /**
-  * @var $block \Magento\Reports\Block\Product\Viewed
-  */
-@@ -30,29 +30,29 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
-     $description = ($mode == 'list') ? true : false;
- }
- ?>
--<?php if ($exist):?>
--    <div class="block widget block-viewed-products-<?= /* @escapeNotVerified */ $mode ?>">
-+<?php if ($exist) : ?>
-+    <div class="block widget block-viewed-products-<?= $block->escapeHtmlAttr($mode) ?>">
-         <div class="block-title">
--            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
-+            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
-         </div>
-         <div class="block-content">
--            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
--            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
--                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
--                    <?php foreach ($items as $_item): ?>
-+            <?= '<!-- ' . $block->escapeHtml($image) . '-->' ?>
-+            <div class="products-<?= $block->escapeHtmlAttr($mode) ?> <?= $block->escapeHtmlAttr($mode) ?>">
-+                <ol class="product-items <?= $block->escapeHtmlAttr($type) ?>">
-+                    <?php foreach ($items as $_item) : ?>
-                         <li class="product-item">
-                             <div class="product-item-info">
--                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
-+                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
-                                     <?= $block->getImage($_item, $image)->toHtml() ?>
-                                 </a>
-                                 <div class="product-item-details">
-                                     <strong class="product-item-name">
--                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
--                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
-+                                        <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
-+                                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-link">
-                                             <?= $block->escapeHtml($_item->getName()) ?>
-                                         </a>
-                                     </strong>
--                                    <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-+                                    <?= /* @noEscape */ $block->getProductPriceHtml(
-                                         $_item,
-                                         \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                         \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-@@ -60,56 +60,56 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
-                                             'price_id_suffix' => '-' . $type
-                                         ]
-                                     ) ?>
--                                    <?php if ($rating): ?>
-+                                    <?php if ($rating) : ?>
-                                         <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
-                                     <?php endif; ?>
--                                    <?php if ($showWishlist || $showCompare || $showCart): ?>
-+                                    <?php if ($showWishlist || $showCompare || $showCart) : ?>
-                                         <div class="product-item-actions">
--                                            <?php if ($showCart): ?>
-+                                            <?php if ($showCart) : ?>
-                                                 <div class="actions-primary">
--                                                    <?php if ($_item->isSaleable()): ?>
--                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-+                                                    <?php if ($_item->isSaleable()) : ?>
-+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)) : ?>
-                                                             <button class="action tocart primary"
--                                                                    data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
--                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                                    data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
-+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                             </button>
--                                                        <?php else: ?>
-+                                                        <?php else : ?>
-                                                             <?php
--                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-+                                                                $postDataHelper = $this->helper(\Magento\Framework\Data\Helper\PostHelper::class);
-                                                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                             ?>
-                                                             <button class="action tocart primary"
--                                                                    data-post='<?= /* @escapeNotVerified */ $postData ?>'
--                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                                    data-post='<?= /* @noEscape */ $postData ?>'
-+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                             </button>
-                                                         <?php endif; ?>
--                                                    <?php else: ?>
--                                                        <?php if ($_item->getIsSalable()): ?>
--                                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
--                                                        <?php else: ?>
--                                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-+                                                    <?php else : ?>
-+                                                        <?php if ($_item->getIsSalable()) : ?>
-+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-+                                                        <?php else : ?>
-+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-                                                         <?php endif; ?>
-                                                     <?php endif; ?>
-                                                 </div>
-                                             <?php endif; ?>
--                                            <?php if ($showWishlist || $showCompare): ?>
-+                                            <?php if ($showWishlist || $showCompare) : ?>
-                                                 <div class="actions-secondary" data-role="add-to-links">
--                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-+                                                    <?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) : ?>
-                                                         <a href="#"
-                                                            class="action towishlist" data-action="add-to-wishlist"
--                                                           data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
--                                                           title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
--                                                            <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
-+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
-+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
-                                                         </a>
-                                                     <?php endif; ?>
--                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
--                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare) : ?>
-+                                                        <?php $compareHelper = $this->helper(\Magento\Catalog\Helper\Product\Compare::class);?>
-                                                         <a href="#" class="action tocompare"
--                                                           data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
--                                                           title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
--                                                            <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
-+                                                           data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
-+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
-                                                         </a>
-                                                     <?php endif; ?>
-                                                 </div>
-diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
-index c9cff81d30a..9a8bb9c3b73 100644
---- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
-+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
-@@ -4,10 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/**
-+ * @deprecated
-+ */
- 
--?>
--<?php
- /**
-  * @var $block \Magento\Reports\Block\Product\Viewed
-  */
-@@ -22,7 +22,7 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
-     $image = 'recently_viewed_products_list_content_widget';
-     $title = __('Recently Viewed');
-     $items = $block->getRecentlyViewedProducts();
--    $_helper = $this->helper('Magento\Catalog\Helper\Output');
-+    $_helper = $this->helper(\Magento\Catalog\Helper\Output::class);
- 
-     $showWishlist = true;
-     $showCompare = true;
-@@ -32,29 +32,29 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
- }
- ?>
- 
--<?php if ($exist):?>
--    <div class="block widget block-viewed-products-<?= /* @escapeNotVerified */ $mode ?>">
-+<?php if ($exist) : ?>
-+    <div class="block widget block-viewed-products-<?= $block->escapeHtmlAttr($mode) ?>">
-         <div class="block-title">
--            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
-+            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
-         </div>
-         <div class="block-content">
--            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
--            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
--                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
--                    <?php foreach ($items as $_item): ?>
-+            <?= '<!-- ' . $block->escapeHtml($image) . '-->' ?>
-+            <div class="products-<?= $block->escapeHtmlAttr($mode) ?> <?= $block->escapeHtmlAttr($mode) ?>">
-+                <ol class="product-items <?= $block->escapeHtmlAttr($type) ?>">
-+                    <?php foreach ($items as $_item) : ?>
-                         <li class="product-item">
-                             <div class="product-item-info">
--                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
-+                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
-                                     <?= $block->getImage($_item, $image)->toHtml() ?>
-                                 </a>
-                                 <div class="product-item-details">
-                                     <strong class="product-item-name">
--                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
--                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
-+                                        <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
-+                                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-link">
-                                             <?= $block->escapeHtml($_item->getName()) ?>
-                                         </a>
-                                     </strong>
--                                    <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-+                                    <?= /* @noEscape */ $block->getProductPriceHtml(
-                                         $_item,
-                                         \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                         \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-@@ -62,69 +62,69 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
-                                             'price_id_suffix' => '-' . $type
-                                         ]
-                                     ) ?>
--                                    <?php if ($rating): ?>
-+                                    <?php if ($rating) : ?>
-                                         <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
-                                     <?php endif; ?>
--                                    <?php if ($showWishlist || $showCompare || $showCart): ?>
-+                                    <?php if ($showWishlist || $showCompare || $showCart) : ?>
-                                         <div class="product-item-actions">
--                                            <?php if ($showCart): ?>
-+                                            <?php if ($showCart) : ?>
-                                                 <div class="actions-primary">
--                                                    <?php if ($_item->isSaleable()): ?>
--                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-+                                                    <?php if ($_item->isSaleable()) : ?>
-+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)) : ?>
-                                                             <button class="action tocart primary"
--                                                                    data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
--                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                                    data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
-+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                             </button>
--                                                        <?php else: ?>
-+                                                        <?php else : ?>
-                                                             <?php
--                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-+                                                                $postDataHelper = $this->helper(\Magento\Framework\Data\Helper\PostHelper::class);
-                                                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()]);
-                                                             ?>
-                                                             <button class="action tocart primary"
--                                                                    data-post='<?= /* @escapeNotVerified */ $postData ?>'
--                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
--                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                                                                    data-post='<?= /* @noEscape */ $postData ?>'
-+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                             </button>
-                                                             <?php endif; ?>
--                                                    <?php else: ?>
--                                                        <?php if ($_item->getIsSalable()): ?>
--                                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
--                                                        <?php else: ?>
--                                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-+                                                    <?php else : ?>
-+                                                        <?php if ($_item->getIsSalable()) : ?>
-+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-+                                                        <?php else : ?>
-+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-                                                         <?php endif; ?>
-                                                     <?php endif; ?>
-                                                 </div>
-                                             <?php endif; ?>
- 
--                                            <?php if ($showWishlist || $showCompare): ?>
-+                                            <?php if ($showWishlist || $showCompare) : ?>
-                                                 <div class="actions-secondary" data-role="add-to-links">
--                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-+                                                    <?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) : ?>
-                                                         <a href="#"
-                                                            class="action towishlist" data-action="add-to-wishlist"
--                                                           data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
--                                                           title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
--                                                            <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
-+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
-+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
-                                                         </a>
-                                                     <?php endif; ?>
--                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
--                                                        <?php  $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare) : ?>
-+                                                        <?php  $compareHelper = $this->helper(\Magento\Catalog\Helper\Product\Compare::class);?>
-                                                         <a href="#" class="action tocompare"
--                                                           data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
--                                                           title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
--                                                            <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
-+                                                           data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
-+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
-                                                         </a>
-                                                     <?php endif; ?>
-                                                 </div>
-                                             <?php endif; ?>
-                                         </div>
-                                     <?php endif; ?>
--                                    <?php if ($description):?>
-+                                    <?php if ($description) : ?>
-                                         <div class="product-item-description">
--                                            <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
--                                            <a title="<?= $block->escapeHtml($_item->getName()) ?>"
--                                               href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
--                                               class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
-+                                            <?= $block->escapeHtml($_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description')) ?>
-+                                            <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
-+                                               href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
-+                                               class="action more"><?= $block->escapeHtml(__('Learn More')) ?></a>
-                                         </div>
-                                     <?php endif; ?>
-                                 </div>
-diff --git a/app/code/Magento/Review/Block/Adminhtml/Add.php b/app/code/Magento/Review/Block/Adminhtml/Add.php
-index 96dd02e65f1..c5600fe0610 100644
---- a/app/code/Magento/Review/Block/Adminhtml/Add.php
-+++ b/app/code/Magento/Review/Block/Adminhtml/Add.php
-@@ -56,7 +56,7 @@ class Add extends \Magento\Backend\Block\Widget\Form\Container
-                     },
-                     loadProductData : function() {
-                         jQuery.ajax({
--                            type: "POST",
-+                            type: "GET",
-                             url: review.productInfoUrl,
-                             data: {
-                                 form_key: FORM_KEY
-diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
-index d6868eae6fc..c85374edb8d 100644
---- a/app/code/Magento/Review/Block/Adminhtml/Edit.php
-+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
-@@ -6,7 +6,7 @@
- namespace Magento\Review\Block\Adminhtml;
- 
- /**
-- * Review edit form
-+ * Review edit form.
-  */
- class Edit extends \Magento\Backend\Block\Widget\Form\Container
- {
-@@ -77,7 +77,13 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
-                 'previous',
-                 [
-                     'label' => __('Previous'),
--                    'onclick' => 'setLocation(\'' . $this->getUrl('review/*/*', ['id' => $prevId]) . '\')'
-+                    'onclick' => 'setLocation(\'' . $this->getUrl(
-+                        'review/*/*',
-+                        [
-+                            'id' => $prevId,
-+                            'ret' => $this->getRequest()->getParam('ret'),
-+                        ]
-+                    ) . '\')'
-                 ],
-                 3,
-                 10
-@@ -93,7 +99,10 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
-                             'button' => [
-                                 'event' => 'save',
-                                 'target' => '#edit_form',
--                                'eventData' => ['action' => ['args' => ['next_item' => $prevId]]],
-+                                'eventData' => ['action' => ['args' => [
-+                                    'next_item' => $prevId,
-+                                    'ret' => $this->getRequest()->getParam('ret'),
-+                                ]]],
-                             ],
-                         ],
-                     ]
-@@ -113,7 +122,10 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
-                             'button' => [
-                                 'event' => 'save',
-                                 'target' => '#edit_form',
--                                'eventData' => ['action' => ['args' => ['next_item' => $nextId]]],
-+                                'eventData' => ['action' => ['args' => [
-+                                    'next_item' => $nextId,
-+                                    'ret' => $this->getRequest()->getParam('ret'),
-+                                ]]],
-                             ],
-                         ],
-                     ]
-@@ -126,7 +138,13 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
-                 'next',
-                 [
-                     'label' => __('Next'),
--                    'onclick' => 'setLocation(\'' . $this->getUrl('review/*/*', ['id' => $nextId]) . '\')'
-+                    'onclick' => 'setLocation(\'' . $this->getUrl(
-+                        'review/*/*',
-+                        [
-+                            'id' => $nextId,
-+                            'ret' => $this->getRequest()->getParam('ret'),
-+                        ]
-+                    ) . '\')'
-                 ],
-                 3,
-                 105
-@@ -159,16 +177,16 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
-         }
- 
-         if ($this->getRequest()->getParam('ret', false) == 'pending') {
--            $this->buttonList->update('back', 'onclick', 'setLocation(\'' . $this->getUrl('catalog/*/pending') . '\')');
-+            $this->buttonList->update('back', 'onclick', 'setLocation(\'' . $this->getUrl('review/*/pending') . '\')');
-             $this->buttonList->update(
-                 'delete',
-                 'onclick',
-                 'deleteConfirm(' . '\'' . __(
-                     'Are you sure you want to do this?'
--                ) . '\' ' . '\'' . $this->getUrl(
-+                ) . '\', ' . '\'' . $this->getUrl(
-                     '*/*/delete',
-                     [$this->_objectId => $this->getRequest()->getParam($this->_objectId), 'ret' => 'pending']
--                ) . '\'' . ')'
-+                ) . '\', {data: {}})'
-             );
-             $this->_coreRegistry->register('ret', 'pending');
-         }
-diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
-index 8a8395de72b..346d5b60aad 100644
---- a/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
-+++ b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
-@@ -4,11 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
-+namespace Magento\Review\Block\Adminhtml\Edit;
-+
- /**
-  * Adminhtml Review Edit Form
-  */
--namespace Magento\Review\Block\Adminhtml\Edit;
--
- class Form extends \Magento\Backend\Block\Widget\Form\Generic
- {
-     /**
-@@ -75,6 +75,17 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-         $review = $this->_coreRegistry->registry('review_data');
-         $product = $this->_productFactory->create()->load($review->getEntityPkValue());
- 
-+        $formActionParams = [
-+            'id' => $this->getRequest()->getParam('id'),
-+            'ret' => $this->_coreRegistry->registry('ret')
-+        ];
-+        if ($this->getRequest()->getParam('productId')) {
-+            $formActionParams['productId'] = $this->getRequest()->getParam('productId');
-+        }
-+        if ($this->getRequest()->getParam('customerId')) {
-+            $formActionParams['customerId'] = $this->getRequest()->getParam('customerId');
-+        }
-+
-         /** @var \Magento\Framework\Data\Form $form */
-         $form = $this->_formFactory->create(
-             [
-@@ -82,10 +93,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-                     'id' => 'edit_form',
-                     'action' => $this->getUrl(
-                         'review/*/save',
--                        [
--                            'id' => $this->getRequest()->getParam('id'),
--                            'ret' => $this->_coreRegistry->registry('ret')
--                        ]
-+                        $formActionParams
-                     ),
-                     'method' => 'post',
-                 ],
-diff --git a/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
-index d3bbdf9a7eb..509e826e6f7 100644
---- a/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
-+++ b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
-@@ -29,7 +29,7 @@ class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
-      * @param \Magento\Catalog\Model\Product\Type $type
-      * @param \Magento\Catalog\Model\Product\Attribute\Source\Status $status
-      * @param \Magento\Catalog\Model\Product\Visibility $visibility
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Store\Model\ResourceModel\Website\CollectionFactory $websitesFactory
-      * @param array $data
-      *
-@@ -44,7 +44,7 @@ class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
-         \Magento\Catalog\Model\Product\Type $type,
-         \Magento\Catalog\Model\Product\Attribute\Source\Status $status,
-         \Magento\Catalog\Model\Product\Visibility $visibility,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Store\Model\ResourceModel\Website\CollectionFactory $websitesFactory,
-         array $data = []
-     ) {
-diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
-index adad931da5a..a02c998f856 100644
---- a/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
-+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
-@@ -121,9 +121,9 @@ class Detailed extends \Magento\Backend\Block\Template
-                 )->setStoreFilter(
-                     $stores
-                 )->setPositionOrder()->load()->addOptionToItems();
--                if (intval($this->getRequest()->getParam('id'))) {
-+                if ((int)$this->getRequest()->getParam('id')) {
-                     $this->_voteCollection = $this->_votesFactory->create()->setReviewFilter(
--                        intval($this->getRequest()->getParam('id'))
-+                        (int)$this->getRequest()->getParam('id')
-                     )->addOptionInfo()->load()->addRatingOptions();
-                 }
-             }
-diff --git a/app/code/Magento/Review/Block/Adminhtml/Rss.php b/app/code/Magento/Review/Block/Adminhtml/Rss.php
-index 7a935b656cd..fd5737d2184 100644
---- a/app/code/Magento/Review/Block/Adminhtml/Rss.php
-+++ b/app/code/Magento/Review/Block/Adminhtml/Rss.php
-@@ -9,6 +9,7 @@ use Magento\Framework\App\Rss\DataProviderInterface;
- 
- /**
-  * Class Rss
-+ *
-  * @package Magento\Catalog\Block\Adminhtml\Rss
-  */
- class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderInterface
-@@ -41,14 +42,13 @@ class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function getRssData()
-     {
--        $newUrl = $this->getUrl('rss/catalog/review', ['_secure' => true, '_nosecret' => true]);
-         $title = __('Pending product review(s)');
- 
--        $data = ['title' => $title, 'description' => $title, 'link' => $newUrl, 'charset' => 'UTF-8'];
-+        $data = ['title' => $title, 'description' => $title, 'link' => '', 'charset' => 'UTF-8'];
- 
-         foreach ($this->rssModel->getProductCollection() as $item) {
-             if ($item->getStoreId()) {
-@@ -56,11 +56,14 @@ class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderIn
-             }
- 
-             $url = $this->getUrl('catalog/product/view', ['id' => $item->getId()]);
--            $reviewUrl = $this->getUrl('review/product/edit/', [
--                'id' => $item->getReviewId(),
--                '_secure' => true,
--                '_nosecret' => true
--            ]);
-+            $reviewUrl = $this->getUrl(
-+                'review/product/edit/',
-+                [
-+                    'id' => $item->getReviewId(),
-+                    '_secure' => true,
-+                    '_nosecret' => true
-+                ]
-+            );
- 
-             $storeName = $this->storeManager->getStore($item->getStoreId())->getName();
-             $description = '<p>' . __('Product: <a href="%1" target="_blank">%2</a> <br/>', $url, $item->getName())
-@@ -80,7 +83,7 @@ class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function getCacheLifetime()
-     {
-@@ -88,7 +91,7 @@ class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function isAllowed()
-     {
-@@ -96,7 +99,7 @@ class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function getFeeds()
-     {
-@@ -104,7 +107,7 @@ class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function isAuthRequired()
-     {
-diff --git a/app/code/Magento/Review/Block/Customer/View.php b/app/code/Magento/Review/Block/Customer/View.php
-index 237b972f165..da5aff1f4d2 100644
---- a/app/code/Magento/Review/Block/Customer/View.php
-+++ b/app/code/Magento/Review/Block/Customer/View.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Review\Block\Customer;
- 
- use Magento\Catalog\Model\Product;
-@@ -160,6 +161,7 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
-     /**
-      * Get rating summary
-      *
-+     * @deprecated
-      * @return array
-      */
-     public function getRatingSummary()
-@@ -201,26 +203,7 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
-     }
- 
-     /**
--     * Get product reviews summary
--     *
--     * @param \Magento\Catalog\Model\Product $product
--     * @param bool $templateType
--     * @param bool $displayIfNoReviews
--     * @return string
--     */
--    public function getReviewsSummaryHtml(
--        \Magento\Catalog\Model\Product $product,
--        $templateType = false,
--        $displayIfNoReviews = false
--    ) {
--        if (!$product->getRatingSummary()) {
--            $this->_reviewFactory->create()->getEntitySummary($product, $this->_storeManager->getStore()->getId());
--        }
--        return parent::getReviewsSummaryHtml($product, $templateType, $displayIfNoReviews);
--    }
--
--    /**
--     * @return string
-+     * @inheritDoc
-      */
-     protected function _toHtml()
-     {
-diff --git a/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php b/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
-deleted file mode 100644
-index 8393f87f8d4..00000000000
---- a/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
-+++ /dev/null
-@@ -1,58 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Review\Block\Product\Compare\ListCompare\Plugin;
--
--class Review
--{
--    /**
--     * Review model
--     *
--     * @var \Magento\Review\Model\ReviewFactory
--     */
--    protected $reviewFactory;
--
--    /**
--     * Store manager
--     *
--     * @var \Magento\Store\Model\StoreManagerInterface
--     */
--    protected $storeManager;
--
--    /**
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Review\Model\ReviewFactory $reviewFactory
--     */
--    public function __construct(
--        \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Review\Model\ReviewFactory $reviewFactory
--    ) {
--        $this->storeManager = $storeManager;
--        $this->reviewFactory = $reviewFactory;
--    }
--
--    /**
--     * Initialize product review
--     *
--     * @param \Magento\Catalog\Block\Product\Compare\ListCompare $subject
--     * @param \Magento\Catalog\Model\Product $product
--     * @param bool $templateType
--     * @param bool $displayIfNoReviews
--     *
--     * @return void
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
--     */
--    public function beforeGetReviewsSummaryHtml(
--        \Magento\Catalog\Block\Product\Compare\ListCompare $subject,
--        \Magento\Catalog\Model\Product $product,
--        $templateType = false,
--        $displayIfNoReviews = false
--    ) {
--        if (!$product->getRatingSummary()) {
--            $this->reviewFactory->create()->getEntitySummary($product, $this->storeManager->getStore()->getId());
--        }
--    }
--}
-diff --git a/app/code/Magento/Review/Block/Product/ReviewRenderer.php b/app/code/Magento/Review/Block/Product/ReviewRenderer.php
-index 3cd15aba304..0fd6327e1f7 100644
---- a/app/code/Magento/Review/Block/Product/ReviewRenderer.php
-+++ b/app/code/Magento/Review/Block/Product/ReviewRenderer.php
-@@ -5,11 +5,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Review\Block\Product;
- 
- use Magento\Catalog\Block\Product\ReviewRendererInterface;
- use Magento\Catalog\Model\Product;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Review\Model\ReviewSummaryFactory;
-+use Magento\Review\Observer\PredispatchReviewObserver;
- 
-+/**
-+ * Class ReviewRenderer
-+ */
- class ReviewRenderer extends \Magento\Framework\View\Element\Template implements ReviewRendererInterface
- {
-     /**
-@@ -29,20 +36,42 @@ class ReviewRenderer extends \Magento\Framework\View\Element\Template implements
-      */
-     protected $_reviewFactory;
- 
-+    /**
-+     * @var ReviewSummaryFactory
-+     */
-+    private $reviewSummaryFactory;
-+
-     /**
-      * @param \Magento\Framework\View\Element\Template\Context $context
-      * @param \Magento\Review\Model\ReviewFactory $reviewFactory
-      * @param array $data
-+     * @param ReviewSummaryFactory $reviewSummaryFactory
-      */
-     public function __construct(
-         \Magento\Framework\View\Element\Template\Context $context,
-         \Magento\Review\Model\ReviewFactory $reviewFactory,
--        array $data = []
-+        array $data = [],
-+        ReviewSummaryFactory $reviewSummaryFactory = null
-     ) {
-         $this->_reviewFactory = $reviewFactory;
-+        $this->reviewSummaryFactory = $reviewSummaryFactory ??
-+            ObjectManager::getInstance()->get(ReviewSummaryFactory::class);
-         parent::__construct($context, $data);
-     }
- 
-+    /**
-+     * Review module availability
-+     *
-+     * @return string
-+     */
-+    public function isReviewEnabled(): string
-+    {
-+        return $this->_scopeConfig->getValue(
-+            PredispatchReviewObserver::XML_PATH_REVIEW_ACTIVE,
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+        );
-+    }
-+
-     /**
-      * Get review summary html
-      *
-@@ -51,17 +80,22 @@ class ReviewRenderer extends \Magento\Framework\View\Element\Template implements
-      * @param bool $displayIfNoReviews
-      *
-      * @return string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getReviewsSummaryHtml(
-         \Magento\Catalog\Model\Product $product,
-         $templateType = self::DEFAULT_VIEW,
-         $displayIfNoReviews = false
-     ) {
--        if (!$product->getRatingSummary()) {
--            $this->_reviewFactory->create()->getEntitySummary($product, $this->_storeManager->getStore()->getId());
-+        if ($product->getRatingSummary() === null) {
-+            $this->reviewSummaryFactory->create()->appendSummaryDataToObject(
-+                $product,
-+                $this->_storeManager->getStore()->getId()
-+            );
-         }
- 
--        if (!$product->getRatingSummary() && !$displayIfNoReviews) {
-+        if (null === $product->getRatingSummary() && !$displayIfNoReviews) {
-             return '';
-         }
-         // pick template among available
-@@ -84,7 +118,7 @@ class ReviewRenderer extends \Magento\Framework\View\Element\Template implements
-      */
-     public function getRatingSummary()
-     {
--        return $this->getProduct()->getRatingSummary()->getRatingSummary();
-+        return $this->getProduct()->getRatingSummary();
-     }
- 
-     /**
-@@ -94,7 +128,7 @@ class ReviewRenderer extends \Magento\Framework\View\Element\Template implements
-      */
-     public function getReviewsCount()
-     {
--        return $this->getProduct()->getRatingSummary()->getReviewsCount();
-+        return $this->getProduct()->getReviewsCount();
-     }
- 
-     /**
-diff --git a/app/code/Magento/Review/Block/Rating/Entity/Detailed.php b/app/code/Magento/Review/Block/Rating/Entity/Detailed.php
-index eee00483ace..d496b3955de 100644
---- a/app/code/Magento/Review/Block/Rating/Entity/Detailed.php
-+++ b/app/code/Magento/Review/Block/Rating/Entity/Detailed.php
-@@ -37,12 +37,14 @@ class Detailed extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Returns block html
-+     *
-      * @return string
-      */
-     protected function _toHtml()
-     {
-         $entityId = $this->_request->getParam('id');
--        if (intval($entityId) <= 0) {
-+        if ((int)$entityId <= 0) {
-             return '';
-         }
- 
-diff --git a/app/code/Magento/Review/Block/View.php b/app/code/Magento/Review/Block/View.php
-index 95b7176b48c..82a5f37f9b6 100644
---- a/app/code/Magento/Review/Block/View.php
-+++ b/app/code/Magento/Review/Block/View.php
-@@ -119,6 +119,7 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
-     /**
-      * Retrieve rating summary for current product
-      *
-+     * @deprecated
-      * @return string
-      */
-     public function getRatingSummary()
-@@ -160,23 +161,4 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
-     {
-         return $this->formatDate($date, \IntlDateFormatter::LONG);
-     }
--
--    /**
--     * Get product reviews summary
--     *
--     * @param \Magento\Catalog\Model\Product $product
--     * @param bool $templateType
--     * @param bool $displayIfNoReviews
--     * @return string
--     */
--    public function getReviewsSummaryHtml(
--        \Magento\Catalog\Model\Product $product,
--        $templateType = false,
--        $displayIfNoReviews = false
--    ) {
--        if (!$product->getRatingSummary()) {
--            $this->_reviewFactory->create()->getEntitySummary($product, $this->_storeManager->getStore()->getId());
--        }
--        return parent::getReviewsSummaryHtml($product, $templateType, $displayIfNoReviews);
--    }
- }
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product.php b/app/code/Magento/Review/Controller/Adminhtml/Product.php
-index 8c4503d8f02..32e30b0906d 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product.php
-@@ -12,10 +12,15 @@ use Magento\Review\Model\ReviewFactory;
- use Magento\Review\Model\RatingFactory;
- 
- /**
-- * Reviews admin controller
-+ * Reviews admin controller.
-  */
- abstract class Product extends Action
- {
-+    /**
-+     * Authorization resource
-+     */
-+    public const ADMIN_RESOURCE = 'Magento_Review::reviews_all';
-+
-     /**
-      * Array of actions which can be processed without secret key validation
-      *
-@@ -61,19 +66,4 @@ abstract class Product extends Action
-         $this->ratingFactory = $ratingFactory;
-         parent::__construct($context);
-     }
--
--    /**
--     * @return bool
--     */
--    protected function _isAllowed()
--    {
--        switch ($this->getRequest()->getActionName()) {
--            case 'pending':
--                return $this->_authorization->isAllowed('Magento_Review::pending');
--                break;
--            default:
--                return $this->_authorization->isAllowed('Magento_Review::reviews_all');
--                break;
--        }
--    }
- }
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
-index 75015d65e1a..ee74a2c569d 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
-@@ -5,12 +5,24 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Review\Controller\Adminhtml\Product as ProductController;
- use Magento\Framework\Controller\ResultFactory;
-+use Magento\Review\Model\Review;
- 
--class Delete extends ProductController
-+/**
-+ * Delete action.
-+ */
-+class Delete extends ProductController implements HttpPostActionInterface
- {
-     /**
-+     * @var Review
-+     */
-+    private $model;
-+
-+    /**
-+     * Execute action.
-+     *
-      * @return \Magento\Backend\Model\View\Result\Redirect
-      */
-     public function execute()
-@@ -19,7 +31,7 @@ class Delete extends ProductController
-         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-         $reviewId = $this->getRequest()->getParam('id', false);
-         try {
--            $this->reviewFactory->create()->setId($reviewId)->aggregate()->delete();
-+            $this->getModel()->aggregate()->delete();
- 
-             $this->messageManager->addSuccess(__('The review has been deleted.'));
-             if ($this->getRequest()->getParam('ret') == 'pending') {
-@@ -36,4 +48,46 @@ class Delete extends ProductController
- 
-         return $resultRedirect->setPath('review/*/edit/', ['id' => $reviewId]);
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _isAllowed()
-+    {
-+        if (parent::_isAllowed()) {
-+            return true;
-+        }
-+
-+        if (!$this->_authorization->isAllowed('Magento_Review::pending')) {
-+            return  false;
-+        }
-+
-+        if ($this->getModel()->getStatusId() != Review::STATUS_PENDING) {
-+            $this->messageManager->addErrorMessage(
-+                __(
-+                    'You don’t have permission to perform this operation.'
-+                    . ' The selected review must be in Pending Status.'
-+                )
-+            );
-+
-+            return false;
-+        }
-+
-+        return true;
-+    }
-+
-+    /**
-+     * Returns requested model.
-+     *
-+     * @return Review
-+     */
-+    private function getModel(): Review
-+    {
-+        if ($this->model === null) {
-+            $this->model = $this->reviewFactory->create()
-+                ->load($this->getRequest()->getParam('id', false));
-+        }
-+
-+        return $this->model;
-+    }
- }
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
-index a39b22ec080..91e9e5becc6 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
-@@ -5,12 +5,24 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Review\Controller\Adminhtml\Product as ProductController;
- use Magento\Framework\Controller\ResultFactory;
-+use Magento\Review\Model\Review;
- 
--class Edit extends ProductController
-+/**
-+ * Edit action.
-+ */
-+class Edit extends ProductController implements HttpGetActionInterface
- {
-     /**
-+     * @var Review
-+     */
-+    private $review;
-+
-+    /**
-+     * Execute action.
-+     *
-      * @return \Magento\Backend\Model\View\Result\Page
-      */
-     public function execute()
-@@ -23,4 +35,46 @@ class Edit extends ProductController
-         $resultPage->addContent($resultPage->getLayout()->createBlock(\Magento\Review\Block\Adminhtml\Edit::class));
-         return $resultPage;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _isAllowed()
-+    {
-+        if (parent::_isAllowed()) {
-+            return true;
-+        }
-+
-+        if (!$this->_authorization->isAllowed('Magento_Review::pending')) {
-+            return  false;
-+        }
-+
-+        if ($this->getModel()->getStatusId() != Review::STATUS_PENDING) {
-+            $this->messageManager->addErrorMessage(
-+                __(
-+                    'You don’t have permission to perform this operation.'
-+                    . ' The selected review must be in Pending Status.'
-+                )
-+            );
-+
-+            return false;
-+        }
-+
-+        return true;
-+    }
-+
-+    /**
-+     * Returns requested model.
-+     *
-+     * @return Review
-+     */
-+    private function getModel(): Review
-+    {
-+        if ($this->review === null) {
-+            $this->review = $this->reviewFactory->create()
-+                ->load($this->getRequest()->getParam('id', false));
-+        }
-+
-+        return $this->review;
-+    }
- }
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php
-index 0dce5b23883..94c80f89f8d 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Review\Controller\Adminhtml\Product as ProductController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Index extends ProductController
-+class Index extends ProductController implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Framework\Controller\ResultInterface
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
-index c6e9cc81d58..db336d0c2f5 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Review\Controller\Adminhtml\Product as ProductController;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\Registry;
-@@ -14,7 +15,10 @@ use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Framework\DataObject;
- use Magento\Framework\Controller\ResultFactory;
- 
--class JsonProductInfo extends ProductController
-+/**
-+ * Represents product info in json
-+ */
-+class JsonProductInfo extends ProductController implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-@@ -40,13 +44,15 @@ class JsonProductInfo extends ProductController
-     }
- 
-     /**
-+     * Execute controller
-+     *
-      * @return \Magento\Framework\Controller\Result\Json
-      */
-     public function execute()
-     {
-         $response = new DataObject();
-         $id = $this->getRequest()->getParam('id');
--        if (intval($id) > 0) {
-+        if ((int)$id > 0) {
-             $product = $this->productRepository->getById($id);
-             $response->setId($id);
-             $response->addData($product->getData());
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
-index c7925400002..95f9ca3aa79 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
-@@ -5,13 +5,54 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Product;
- 
-+use Magento\Backend\App\Action\Context;
-+use Magento\Framework\Registry;
- use Magento\Review\Controller\Adminhtml\Product as ProductController;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Controller\ResultFactory;
-+use Magento\Review\Model\RatingFactory;
-+use Magento\Review\Model\Review;
-+use Magento\Review\Model\ResourceModel\Review\Collection;
-+use Magento\Review\Model\ResourceModel\Review\CollectionFactory;
-+use Magento\Review\Model\ReviewFactory;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- 
--class MassDelete extends ProductController
-+/**
-+ * Mass Delete action.
-+ */
-+class MassDelete extends ProductController implements HttpPostActionInterface
- {
-     /**
-+     * @var Collection
-+     */
-+    private $collection;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $collectionFactory;
-+
-+    /**
-+     * @param Context $context
-+     * @param Registry $coreRegistry
-+     * @param ReviewFactory $reviewFactory
-+     * @param RatingFactory $ratingFactory
-+     * @param CollectionFactory $collectionFactory
-+     */
-+    public function __construct(
-+        Context $context,
-+        Registry $coreRegistry,
-+        ReviewFactory $reviewFactory,
-+        RatingFactory $ratingFactory,
-+        CollectionFactory $collectionFactory
-+    ) {
-+        parent::__construct($context, $coreRegistry, $reviewFactory, $ratingFactory);
-+        $this->collectionFactory = $collectionFactory;
-+    }
-+
-+    /**
-+     * Execute action.
-+     *
-      * @return \Magento\Backend\Model\View\Result\Redirect
-      */
-     public function execute()
-@@ -21,8 +62,7 @@ class MassDelete extends ProductController
-             $this->messageManager->addError(__('Please select review(s).'));
-         } else {
-             try {
--                foreach ($reviewsIds as $reviewId) {
--                    $model = $this->reviewFactory->create()->load($reviewId);
-+                foreach ($this->getCollection() as $model) {
-                     $model->delete();
-                 }
-                 $this->messageManager->addSuccess(
-@@ -39,4 +79,54 @@ class MassDelete extends ProductController
-         $resultRedirect->setPath('review/*/' . $this->getRequest()->getParam('ret', 'index'));
-         return $resultRedirect;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _isAllowed()
-+    {
-+        if (parent::_isAllowed()) {
-+            return true;
-+        }
-+
-+        if (!$this->_authorization->isAllowed('Magento_Review::pending')) {
-+            return false;
-+        }
-+
-+        foreach ($this->getCollection() as $model) {
-+            if ($model->getStatusId() != Review::STATUS_PENDING) {
-+                $this->messageManager->addErrorMessage(
-+                    __(
-+                        'You don’t have permission to perform this operation.'
-+                        . ' Selected reviews must be in Pending Status only.'
-+                    )
-+                );
-+
-+                return false;
-+            }
-+        }
-+
-+        return true;
-+    }
-+
-+    /**
-+     * Returns requested collection.
-+     *
-+     * @return Collection
-+     */
-+    private function getCollection(): Collection
-+    {
-+        if ($this->collection === null) {
-+            $collection = $this->collectionFactory->create();
-+            $collection->addFieldToFilter(
-+                'main_table.' . $collection->getResource()
-+                    ->getIdFieldName(),
-+                $this->getRequest()->getParam('reviews')
-+            );
-+
-+            $this->collection = $collection;
-+        }
-+
-+        return $this->collection;
-+    }
- }
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
-index 2769a35ba9a..9e93fb8fce6 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
-@@ -5,13 +5,54 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Product;
- 
-+use Magento\Backend\App\Action\Context;
-+use Magento\Framework\Registry;
- use Magento\Review\Controller\Adminhtml\Product as ProductController;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Controller\ResultFactory;
-+use Magento\Review\Model\RatingFactory;
-+use Magento\Review\Model\Review;
-+use Magento\Review\Model\ResourceModel\Review\Collection;
-+use Magento\Review\Model\ResourceModel\Review\CollectionFactory;
-+use Magento\Review\Model\ReviewFactory;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- 
--class MassUpdateStatus extends ProductController
-+/**
-+ * Mass Update Status action.
-+ */
-+class MassUpdateStatus extends ProductController implements HttpPostActionInterface
- {
-     /**
-+     * @var Collection
-+     */
-+    private $collection;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $collectionFactory;
-+
-+    /**
-+     * @param Context $context
-+     * @param Registry $coreRegistry
-+     * @param ReviewFactory $reviewFactory
-+     * @param RatingFactory $ratingFactory
-+     * @param CollectionFactory $collectionFactory
-+     */
-+    public function __construct(
-+        Context $context,
-+        Registry $coreRegistry,
-+        ReviewFactory $reviewFactory,
-+        RatingFactory $ratingFactory,
-+        CollectionFactory $collectionFactory
-+    ) {
-+        parent::__construct($context, $coreRegistry, $reviewFactory, $ratingFactory);
-+        $this->collectionFactory = $collectionFactory;
-+    }
-+
-+    /**
-+     * Execute action.
-+     *
-      * @return \Magento\Backend\Model\View\Result\Redirect
-      */
-     public function execute()
-@@ -22,8 +63,7 @@ class MassUpdateStatus extends ProductController
-         } else {
-             try {
-                 $status = $this->getRequest()->getParam('status');
--                foreach ($reviewsIds as $reviewId) {
--                    $model = $this->reviewFactory->create()->load($reviewId);
-+                foreach ($this->getCollection() as $model) {
-                     $model->setStatusId($status)->save()->aggregate();
-                 }
-                 $this->messageManager->addSuccess(
-@@ -43,4 +83,54 @@ class MassUpdateStatus extends ProductController
-         $resultRedirect->setPath('review/*/' . $this->getRequest()->getParam('ret', 'index'));
-         return $resultRedirect;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _isAllowed()
-+    {
-+        if (parent::_isAllowed()) {
-+            return true;
-+        }
-+
-+        if (!$this->_authorization->isAllowed('Magento_Review::pending')) {
-+            return false;
-+        }
-+
-+        foreach ($this->getCollection() as $model) {
-+            if ($model->getStatusId() != Review::STATUS_PENDING) {
-+                $this->messageManager->addErrorMessage(
-+                    __(
-+                        'You don’t have permission to perform this operation. '
-+                        . 'Selected reviews must be in Pending Status only.'
-+                    )
-+                );
-+
-+                return false;
-+            }
-+        }
-+
-+        return true;
-+    }
-+
-+    /**
-+     * Returns requested collection.
-+     *
-+     * @return Collection
-+     */
-+    private function getCollection(): Collection
-+    {
-+        if ($this->collection === null) {
-+            $collection = $this->collectionFactory->create();
-+            $collection->addFieldToFilter(
-+                'main_table.' . $collection->getResource()
-+                    ->getIdFieldName(),
-+                $this->getRequest()->getParam('reviews')
-+            );
-+
-+            $this->collection = $collection;
-+        }
-+
-+        return $this->collection;
-+    }
- }
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php
-index 5ac3a6a0572..2709b5ce64b 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Review\Controller\Adminhtml\Product as ProductController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class NewAction extends ProductController
-+class NewAction extends ProductController implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Page
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php
-index 75eaaaeeef2..385b7e12bf3 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php
-@@ -7,10 +7,17 @@ namespace Magento\Review\Controller\Adminhtml\Product;
- 
- use Magento\Review\Controller\Adminhtml\Product as ProductController;
- use Magento\Framework\Controller\ResultFactory;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- 
--class Pending extends ProductController
-+/**
-+ * Pending reviews grid.
-+ */
-+class Pending extends ProductController implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-+     * Execute action.
-+     *
-      * @return \Magento\Framework\Controller\ResultInterface
-      */
-     public function execute()
-@@ -30,4 +37,13 @@ class Pending extends ProductController
-         $resultPage->addContent($resultPage->getLayout()->createBlock(\Magento\Review\Block\Adminhtml\Main::class));
-         return $resultPage;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _isAllowed()
-+    {
-+        return $this->_authorization->isAllowed('Magento_Review::reviews_all')
-+            || $this->_authorization->isAllowed('Magento_Review::pending');
-+    }
- }
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
-index 1f21a52077b..b42dd3b3063 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
-@@ -5,14 +5,21 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Review\Controller\Adminhtml\Product as ProductController;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Store\Model\Store;
- use Magento\Framework\Exception\LocalizedException;
-+use Magento\Review\Model\Review;
- 
--class Post extends ProductController
-+/**
-+ * Review admin controller for POST request.
-+ */
-+class Post extends ProductController implements HttpPostActionInterface
- {
-     /**
-+     * Create a product review.
-+     *
-      * @return \Magento\Backend\Model\View\Result\Redirect
-      */
-     public function execute()
-@@ -32,7 +39,7 @@ class Post extends ProductController
-             }
-             $review = $this->reviewFactory->create()->setData($data);
-             try {
--                $review->setEntityId(1) // product
-+                $review->setEntityId($review->getEntityIdByCode(Review::ENTITY_PRODUCT_CODE))
-                     ->setEntityPkValue($productId)
-                     ->setStoreId(Store::DEFAULT_STORE_ID)
-                     ->setStatusId($data['status_id'])
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php
-index f1b25c3613d..e4057be14af 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Review\Controller\Adminhtml\Product as ProductController;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\Registry;
-@@ -13,7 +15,7 @@ use Magento\Review\Model\RatingFactory;
- use Magento\Framework\View\LayoutFactory;
- use Magento\Framework\Controller\ResultFactory;
- 
--class ProductGrid extends ProductController
-+class ProductGrid extends ProductController implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\LayoutFactory
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php
-index 5b0ab217e71..1da8e4abbd6 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Review\Controller\Adminhtml\Product as ProductController;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\Registry;
-@@ -13,7 +15,7 @@ use Magento\Review\Model\RatingFactory;
- use Magento\Framework\View\LayoutFactory;
- use Magento\Framework\Controller\ResultFactory;
- 
--class RatingItems extends ProductController
-+class RatingItems extends ProductController implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\LayoutFactory
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php
-index 017fbc95a8b..8925851e334 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php
-@@ -12,8 +12,14 @@ use Magento\Review\Model\ReviewFactory;
- use Magento\Review\Model\RatingFactory;
- use Magento\Framework\View\LayoutFactory;
- use Magento\Framework\Controller\ResultFactory;
-+use Magento\Framework\App\Request\Http;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- 
--class ReviewGrid extends ProductController
-+/**
-+ * Review grid.
-+ */
-+class ReviewGrid extends ProductController implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\LayoutFactory
-@@ -39,6 +45,8 @@ class ReviewGrid extends ProductController
-     }
- 
-     /**
-+     * Execute action.
-+     *
-      * @return \Magento\Framework\Controller\Result\Raw
-      */
-     public function execute()
-@@ -49,4 +57,13 @@ class ReviewGrid extends ProductController
-         $resultRaw->setContents($layout->createBlock(\Magento\Review\Block\Adminhtml\Grid::class)->toHtml());
-         return $resultRaw;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _isAllowed()
-+    {
-+        return $this->_authorization->isAllowed('Magento_Review::reviews_all')
-+            || $this->_authorization->isAllowed('Magento_Review::pending');
-+    }
- }
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
-index 7159b1825dc..5b8ad106987 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
-@@ -5,13 +5,25 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Review\Controller\Adminhtml\Product as ProductController;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Framework\Exception\LocalizedException;
-+use Magento\Review\Model\Review;
- 
--class Save extends ProductController
-+/**
-+ * Save Review action.
-+ */
-+class Save extends ProductController implements HttpPostActionInterface
- {
-     /**
-+     * @var Review
-+     */
-+    private $review;
-+
-+    /**
-+     * Save Review action.
-+     *
-      * @return \Magento\Backend\Model\View\Result\Redirect
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-@@ -20,7 +32,7 @@ class Save extends ProductController
-         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-         if (($data = $this->getRequest()->getPostValue()) && ($reviewId = $this->getRequest()->getParam('id'))) {
--            $review = $this->reviewFactory->create()->load($reviewId);
-+            $review = $this->getModel();
-             if (!$review->getId()) {
-                 $this->messageManager->addError(__('The review was removed by another user or does not exist.'));
-             } else {
-@@ -61,15 +73,72 @@ class Save extends ProductController
- 
-             $nextId = (int)$this->getRequest()->getParam('next_item');
-             if ($nextId) {
--                $resultRedirect->setPath('review/*/edit', ['id' => $nextId]);
-+                $resultRedirect->setPath(
-+                    'review/*/edit',
-+                    [
-+                        'id' => $nextId,
-+                        'ret' => $this->getRequest()
-+                            ->getParam('ret'),
-+                    ]
-+                );
-             } elseif ($this->getRequest()->getParam('ret') == 'pending') {
--                $resultRedirect->setPath('*/*/pending');
-+                $resultRedirect->setPath('review/*/pending');
-             } else {
-                 $resultRedirect->setPath('*/*/');
-             }
-+            $productId = (int)$this->getRequest()->getParam('productId');
-+            if ($productId) {
-+                $resultRedirect->setPath("catalog/product/edit/id/$productId");
-+            }
-+            $customerId = (int)$this->getRequest()->getParam('customerId');
-+            if ($customerId) {
-+                $resultRedirect->setPath("customer/index/edit/id/$customerId");
-+            }
-             return $resultRedirect;
-         }
-         $resultRedirect->setPath('review/*/');
-         return $resultRedirect;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _isAllowed()
-+    {
-+        if (parent::_isAllowed()) {
-+            return true;
-+        }
-+
-+        if (!$this->_authorization->isAllowed('Magento_Review::pending')) {
-+            return  false;
-+        }
-+
-+        if ($this->getModel()->getStatusId() != Review::STATUS_PENDING) {
-+            $this->messageManager->addErrorMessage(
-+                __(
-+                    'You don’t have permission to perform this operation.'
-+                    . ' The selected review must be in Pending Status.'
-+                )
-+            );
-+
-+            return false;
-+        }
-+
-+        return true;
-+    }
-+
-+    /**
-+     * Returns requested model.
-+     *
-+     * @return Review
-+     */
-+    private function getModel(): Review
-+    {
-+        if (!$this->review) {
-+            $this->review = $this->reviewFactory->create()
-+                ->load($this->getRequest()->getParam('id', false));
-+        }
-+
-+        return $this->review;
-+    }
- }
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
-index 5535c3de26e..b25db6e498f 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Rating;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Review\Controller\Adminhtml\Rating as RatingController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Delete extends RatingController
-+class Delete extends RatingController implements HttpPostActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Redirect
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php
-index 1b65966b770..90dac026cfd 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Rating;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Review\Controller\Adminhtml\Rating as RatingController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Edit extends RatingController
-+class Edit extends RatingController implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Page
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php
-index b719a299505..ff9ab4d50ea 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Rating;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Review\Controller\Adminhtml\Rating as RatingController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Index extends RatingController
-+class Index extends RatingController implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Page
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php
-index 18ff73ad31c..92d20aeec3e 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Rating;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Review\Controller\Adminhtml\Rating as RatingController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class NewAction extends RatingController
-+class NewAction extends RatingController implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Forward
-diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
-index 62cca9c824e..5dd464f7eb6 100644
---- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
-+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\Review\Controller\Adminhtml\Rating;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Review\Controller\Adminhtml\Rating as RatingController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Save extends RatingController
-+class Save extends RatingController implements HttpPostActionInterface
- {
-     /**
-      * Save rating
-diff --git a/app/code/Magento/Review/Controller/Product/ListAjax.php b/app/code/Magento/Review/Controller/Product/ListAjax.php
-index 0180e5a7ee0..d923814c7dc 100644
---- a/app/code/Magento/Review/Controller/Product/ListAjax.php
-+++ b/app/code/Magento/Review/Controller/Product/ListAjax.php
-@@ -3,28 +3,31 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Review\Controller\Product;
- 
--use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\App\ResponseInterface;
-+use Magento\Framework\Controller\ResultInterface;
-+use Magento\Framework\View\Result\Layout;
- use Magento\Review\Controller\Product as ProductController;
- use Magento\Framework\Controller\ResultFactory;
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- 
--class ListAjax extends ProductController
-+class ListAjax extends ProductController implements HttpGetActionInterface
- {
-     /**
-      * Show list of product's reviews
-      *
--     * @return \Magento\Framework\View\Result\Layout
-+     * @return ResponseInterface|ResultInterface|Layout
-      */
-     public function execute()
-     {
-         if (!$this->initProduct()) {
--            throw new LocalizedException(__("The product can't be initialized."));
--        } else {
--            /** @var \Magento\Framework\View\Result\Layout $resultLayout */
--            $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
-+            /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
-+            $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
-+            return $resultForward->forward('noroute');
-         }
- 
--        return $resultLayout;
-+        return $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
-     }
- }
-diff --git a/app/code/Magento/Review/Controller/Product/Post.php b/app/code/Magento/Review/Controller/Product/Post.php
-index be18f8fe25b..32838eb6acb 100644
---- a/app/code/Magento/Review/Controller/Product/Post.php
-+++ b/app/code/Magento/Review/Controller/Product/Post.php
-@@ -5,11 +5,12 @@
-  */
- namespace Magento\Review\Controller\Product;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Review\Controller\Product as ProductController;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Review\Model\Review;
- 
--class Post extends ProductController
-+class Post extends ProductController implements HttpPostActionInterface
- {
-     /**
-      * Submit new review action
-diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating.php b/app/code/Magento/Review/Model/ResourceModel/Rating.php
-index 3f54c17f6ff..42c14e16a50 100644
---- a/app/code/Magento/Review/Model/ResourceModel/Rating.php
-+++ b/app/code/Magento/Review/Model/ResourceModel/Rating.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Review\Model\ResourceModel;
- 
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\ObjectManager;
-+
- /**
-  * Rating resource model
-  *
-@@ -12,6 +15,7 @@ namespace Magento\Review\Model\ResourceModel;
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  * @since 100.0.2
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- {
-@@ -25,7 +29,7 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     protected $_storeManager;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-@@ -34,26 +38,34 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      */
-     protected $_logger;
- 
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-     /**
-      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
-      * @param \Psr\Log\LoggerInterface $logger
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Review\Model\ResourceModel\Review\Summary $reviewSummary
-+     * @param Review\Summary $reviewSummary
-      * @param string $connectionName
-+     * @param ScopeConfigInterface|null $scopeConfig
-      */
-     public function __construct(
-         \Magento\Framework\Model\ResourceModel\Db\Context $context,
-         \Psr\Log\LoggerInterface $logger,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
-         \Magento\Review\Model\ResourceModel\Review\Summary $reviewSummary,
--        $connectionName = null
-+        $connectionName = null,
-+        ScopeConfigInterface $scopeConfig = null
-     ) {
-         $this->moduleManager = $moduleManager;
-         $this->_storeManager = $storeManager;
-         $this->_logger = $logger;
-         $this->_reviewSummary = $reviewSummary;
-+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
-         parent::__construct($context, $connectionName);
-     }
- 
-@@ -178,6 +190,8 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Process rating codes
-+     *
-      * @param \Magento\Framework\Model\AbstractModel $object
-      * @return $this
-      */
-@@ -201,6 +215,8 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Process rating stores
-+     *
-      * @param \Magento\Framework\Model\AbstractModel $object
-      * @return $this
-      */
-@@ -224,6 +240,8 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Delete rating data
-+     *
-      * @param int $ratingId
-      * @param string $table
-      * @param array $storeIds
-@@ -247,6 +265,8 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Insert rating data
-+     *
-      * @param string $table
-      * @param array $data
-      * @return void
-@@ -269,6 +289,7 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- 
-     /**
-      * Perform actions after object delete
-+     *
-      * Prepare rating data for reaggregate all data for reviews
-      *
-      * @param \Magento\Framework\Model\AbstractModel $object
-@@ -277,7 +298,12 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
-     {
-         parent::_afterDelete($object);
--        if (!$this->moduleManager->isEnabled('Magento_Review')) {
-+        if (!$this->moduleManager->isEnabled('Magento_Review') &&
-+            !$this->scopeConfig->getValue(
-+                \Magento\Review\Observer\PredispatchReviewObserver::XML_PATH_REVIEW_ACTIVE,
-+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            )
-+        ) {
-             return $this;
-         }
-         $data = $this->_getEntitySummaryData($object);
-@@ -425,9 +451,11 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- 
-         $data = $connection->fetchAll($select, [':review_id' => $object->getReviewId()]);
- 
-+        $currentStore = $this->_storeManager->isSingleStoreMode() ? $this->_storeManager->getStore()->getId() : null;
-+
-         if ($onlyForCurrentStore) {
-             foreach ($data as $row) {
--                if ($row['store_id'] == $this->_storeManager->getStore()->getId()) {
-+                if ($row['store_id'] !== $currentStore) {
-                     $object->addData($row);
-                 }
-             }
-diff --git a/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
-index 83035479690..7175baa92a2 100644
---- a/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
-+++ b/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
-@@ -5,16 +5,17 @@
-  */
- namespace Magento\Review\Model\ResourceModel\Review\Product;
- 
-+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
- use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
- use Magento\Framework\DB\Select;
- use Magento\Framework\EntityManager\MetadataPool;
--use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
- 
- /**
-  * Review Product Collection
-  *
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @since 100.0.2
-  */
- class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-@@ -74,7 +75,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
-@@ -102,7 +103,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-         \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
-@@ -403,12 +404,20 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-     public function getResultingIds()
-     {
-         $idsSelect = clone $this->getSelect();
--        $idsSelect->reset(Select::LIMIT_COUNT);
--        $idsSelect->reset(Select::LIMIT_OFFSET);
--        $idsSelect->reset(Select::COLUMNS);
--        $idsSelect->reset(Select::ORDER);
--        $idsSelect->columns('rt.review_id');
--        return $this->getConnection()->fetchCol($idsSelect);
-+        $data = $this->getConnection()
-+            ->fetchAll(
-+                $idsSelect
-+                    ->reset(Select::LIMIT_COUNT)
-+                    ->reset(Select::LIMIT_OFFSET)
-+                    ->columns('rt.review_id')
-+            );
-+
-+        return array_map(
-+            function ($value) {
-+                return $value['review_id'];
-+            },
-+            $data
-+        );
-     }
- 
-     /**
-@@ -540,6 +549,16 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
-         return $this;
-     }
- 
-+    /**
-+     * Not add store ids to items
-+     *
-+     * @return $this
-+     */
-+    protected function prepareStoreId()
-+    {
-+        return $this;
-+    }
-+
-     /**
-      * Add store data
-      *
-diff --git a/app/code/Magento/Review/Model/ResourceModel/Review/Summary.php b/app/code/Magento/Review/Model/ResourceModel/Review/Summary.php
-index b69065fbaf6..f18bc209493 100644
---- a/app/code/Magento/Review/Model/ResourceModel/Review/Summary.php
-+++ b/app/code/Magento/Review/Model/ResourceModel/Review/Summary.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Review\Model\ResourceModel\Review;
- 
- use Magento\Framework\Model\AbstractModel;
-@@ -73,4 +74,46 @@ class Summary extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-         }
-         return $this;
-     }
-+
-+    /**
-+     * Append review summary fields to product collection
-+     *
-+     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection
-+     * @param string $storeId
-+     * @param string $entityCode
-+     * @return Summary
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function appendSummaryFieldsToCollection(
-+        \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection,
-+        string $storeId,
-+        string $entityCode
-+    ) {
-+        if (!$productCollection->isLoaded()) {
-+            $summaryEntitySubSelect = $this->getConnection()->select();
-+            $summaryEntitySubSelect
-+                ->from(
-+                    ['review_entity' => $this->getTable('review_entity')],
-+                    ['entity_id']
-+                )->where(
-+                    'entity_code = ?',
-+                    $entityCode
-+                );
-+            $joinCond = new \Zend_Db_Expr(
-+                "e.entity_id = review_summary.entity_pk_value AND review_summary.store_id = {$storeId}"
-+                . " AND review_summary.entity_type = ({$summaryEntitySubSelect})"
-+            );
-+            $productCollection->getSelect()
-+                ->joinLeft(
-+                    ['review_summary' => $this->getMainTable()],
-+                    $joinCond,
-+                    [
-+                        'reviews_count' => new \Zend_Db_Expr("IFNULL(review_summary.reviews_count, 0)"),
-+                        'rating_summary' => new \Zend_Db_Expr("IFNULL(review_summary.rating_summary, 0)")
-+                    ]
-+                );
-+        }
-+
-+        return $this;
-+    }
- }
-diff --git a/app/code/Magento/Review/Model/Review.php b/app/code/Magento/Review/Model/Review.php
-index c00af3fc614..0c581f570ef 100644
---- a/app/code/Magento/Review/Model/Review.php
-+++ b/app/code/Magento/Review/Model/Review.php
-@@ -3,8 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Review\Model;
- 
-+use Magento\Framework\DataObject;
- use Magento\Catalog\Model\Product;
- use Magento\Framework\DataObject\IdentityInterface;
- use Magento\Review\Model\ResourceModel\Review\Product\Collection as ProductCollection;
-@@ -99,6 +101,7 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
-     /**
-      * Review model summary
-      *
-+     * @deprecated Summary factory injected as separate property
-      * @var \Magento\Review\Model\Review\Summary
-      */
-     protected $_reviewSummary;
-@@ -213,6 +216,7 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
-     /**
-      * Get entity summary
-      *
-+     * @deprecated
-      * @param Product $product
-      * @param int $storeId
-      * @return void
-@@ -300,10 +304,12 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
-     }
- 
-     /**
--     * Append review summary to product collection
-+     * Append review summary data object to product collection
-      *
-+     * @deprecated
-      * @param ProductCollection $collection
-      * @return $this
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function appendSummary($collection)
-     {
-@@ -312,7 +318,7 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
-             $entityIds[] = $item->getEntityId();
-         }
- 
--        if (sizeof($entityIds) == 0) {
-+        if (count($entityIds) === 0) {
-             return $this;
-         }
- 
-@@ -327,6 +333,9 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
-                     $item->setRatingSummary($summary);
-                 }
-             }
-+            if (!$item->getRatingSummary()) {
-+                $item->setRatingSummary(new DataObject());
-+            }
-         }
- 
-         return $this;
-@@ -352,7 +361,7 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
-     {
-         $store = $this->_storeManager->getStore($store);
-         if ($store) {
--            return in_array($store->getId(), (array) $this->getStores());
-+            return in_array($store->getId(), (array)$this->getStores());
-         }
-         return false;
-     }
-diff --git a/app/code/Magento/Review/Model/ReviewSummary.php b/app/code/Magento/Review/Model/ReviewSummary.php
-new file mode 100644
-index 00000000000..46851339ae6
---- /dev/null
-+++ b/app/code/Magento/Review/Model/ReviewSummary.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Review\Model;
-+
-+use Magento\Framework\Model\AbstractModel;
-+use Magento\Review\Model\ResourceModel\Review\Summary\CollectionFactory as SummaryCollectionFactory;
-+
-+/**
-+ * ReviewSummary model.
-+ */
-+class ReviewSummary
-+{
-+    /**
-+     * @var SummaryCollectionFactory
-+     */
-+    private $summaryCollectionFactory;
-+
-+    /**
-+     * @param SummaryCollectionFactory $sumColFactory
-+     */
-+    public function __construct(
-+        SummaryCollectionFactory $sumColFactory
-+    ) {
-+        $this->summaryCollectionFactory = $sumColFactory;
-+    }
-+
-+    /**
-+     * Append review summary data to product
-+     *
-+     * @param AbstractModel $object
-+     * @param int $storeId
-+     * @param int $entityType
-+     */
-+    public function appendSummaryDataToObject(AbstractModel $object, int $storeId, int $entityType = 1): void
-+    {
-+        $summary = $this->summaryCollectionFactory->create()
-+            ->addEntityFilter($object->getId(), $entityType)
-+            ->addStoreFilter($storeId)
-+            ->getFirstItem();
-+        $object->addData(
-+            [
-+                'reviews_count' => $summary->getData('reviews_count'),
-+                'rating_summary' => $summary->getData('rating_summary')
-+            ]
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/Review/Observer/CatalogBlockProductCollectionBeforeToHtmlObserver.php b/app/code/Magento/Review/Observer/CatalogBlockProductCollectionBeforeToHtmlObserver.php
-deleted file mode 100644
-index 6256194cef5..00000000000
---- a/app/code/Magento/Review/Observer/CatalogBlockProductCollectionBeforeToHtmlObserver.php
-+++ /dev/null
-@@ -1,44 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Review\Observer;
--
--use Magento\Framework\Event\ObserverInterface;
--
--class CatalogBlockProductCollectionBeforeToHtmlObserver implements ObserverInterface
--{
--    /**
--     * Review model
--     *
--     * @var \Magento\Review\Model\ReviewFactory
--     */
--    protected $_reviewFactory;
--
--    /**
--     * @param \Magento\Review\Model\ReviewFactory $reviewFactory
--     */
--    public function __construct(
--        \Magento\Review\Model\ReviewFactory $reviewFactory
--    ) {
--        $this->_reviewFactory = $reviewFactory;
--    }
--
--    /**
--     * Append review summary before rendering html
--     *
--     * @param \Magento\Framework\Event\Observer $observer
--     * @return $this
--     */
--    public function execute(\Magento\Framework\Event\Observer $observer)
--    {
--        $productCollection = $observer->getEvent()->getCollection();
--        if ($productCollection instanceof \Magento\Framework\Data\Collection) {
--            $productCollection->load();
--            $this->_reviewFactory->create()->appendSummary($productCollection);
--        }
--
--        return $this;
--    }
--}
-diff --git a/app/code/Magento/Review/Observer/CatalogProductListCollectionAppendSummaryFieldsObserver.php b/app/code/Magento/Review/Observer/CatalogProductListCollectionAppendSummaryFieldsObserver.php
-new file mode 100644
-index 00000000000..bb69284b5f0
---- /dev/null
-+++ b/app/code/Magento/Review/Observer/CatalogProductListCollectionAppendSummaryFieldsObserver.php
-@@ -0,0 +1,62 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Review\Observer;
-+
-+use Magento\Framework\Event\Observer as EventObserver;
-+use Magento\Framework\Event\ObserverInterface;
-+use Magento\Review\Model\ResourceModel\Review\SummaryFactory;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Append review summary to product list collection.
-+ */
-+class CatalogProductListCollectionAppendSummaryFieldsObserver implements ObserverInterface
-+{
-+    /**
-+     * Review model
-+     *
-+     * @var Summary
-+     */
-+    private $sumResourceFactory;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @param SummaryFactory $sumResourceFactory
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(
-+        SummaryFactory $sumResourceFactory,
-+        StoreManagerInterface $storeManager
-+    ) {
-+        $this->sumResourceFactory = $sumResourceFactory;
-+        $this->storeManager = $storeManager;
-+    }
-+
-+    /**
-+     * Append review summary to collection
-+     *
-+     * @param EventObserver $observer
-+     * @return $this
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function execute(EventObserver $observer)
-+    {
-+        $productCollection = $observer->getEvent()->getCollection();
-+        $this->sumResourceFactory->create()->appendSummaryFieldsToCollection(
-+            $productCollection,
-+            $this->storeManager->getStore()->getId(),
-+            \Magento\Review\Model\Review::ENTITY_PRODUCT_CODE
-+        );
-+
-+        return $this;
-+    }
-+}
-diff --git a/app/code/Magento/Review/Observer/PredispatchReviewObserver.php b/app/code/Magento/Review/Observer/PredispatchReviewObserver.php
-new file mode 100644
-index 00000000000..bdca0f5ecb1
---- /dev/null
-+++ b/app/code/Magento/Review/Observer/PredispatchReviewObserver.php
-@@ -0,0 +1,72 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types = 1);
-+
-+namespace Magento\Review\Observer;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\Event\Observer;
-+use Magento\Framework\Event\ObserverInterface;
-+use Magento\Framework\UrlInterface;
-+use Magento\Review\Block\Product\ReviewRenderer;
-+use Magento\Store\Model\ScopeInterface;
-+
-+/**
-+ * Class PredispatchReviewObserver
-+ */
-+class PredispatchReviewObserver implements ObserverInterface
-+{
-+    /**
-+     * Configuration path to review active setting
-+     */
-+    const XML_PATH_REVIEW_ACTIVE = 'catalog/review/active';
-+
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @var UrlInterface
-+     */
-+    private $url;
-+
-+    /**
-+     * PredispatchReviewObserver constructor.
-+     *
-+     * @param ScopeConfigInterface $scopeConfig
-+     * @param UrlInterface $url
-+     */
-+    public function __construct(
-+        ScopeConfigInterface $scopeConfig,
-+        UrlInterface $url
-+    ) {
-+        $this->scopeConfig = $scopeConfig;
-+        $this->url = $url;
-+    }
-+    /**
-+     * Redirect review routes to 404 when review module is disabled.
-+     *
-+     * @param Observer $observer
-+     */
-+    public function execute(Observer $observer)
-+    {
-+        if (!$this->scopeConfig->getValue(
-+            self::XML_PATH_REVIEW_ACTIVE,
-+            ScopeInterface::SCOPE_STORE
-+        )
-+        ) {
-+            $defaultNoRouteUrl = $this->scopeConfig->getValue(
-+                'web/default/no_route',
-+                ScopeInterface::SCOPE_STORE
-+            );
-+            $redirectUrl = $this->url->getUrl($defaultNoRouteUrl);
-+            $observer->getControllerAction()
-+                ->getResponse()
-+                ->setRedirect($redirectUrl);
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Review/Observer/TagProductCollectionLoadAfterObserver.php b/app/code/Magento/Review/Observer/TagProductCollectionLoadAfterObserver.php
-deleted file mode 100644
-index 52d6f09a085..00000000000
---- a/app/code/Magento/Review/Observer/TagProductCollectionLoadAfterObserver.php
-+++ /dev/null
-@@ -1,41 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Review\Observer;
--
--use Magento\Framework\Event\ObserverInterface;
--
--class TagProductCollectionLoadAfterObserver implements ObserverInterface
--{
--    /**
--     * Review model
--     *
--     * @var \Magento\Review\Model\ReviewFactory
--     */
--    protected $_reviewFactory;
--
--    /**
--     * @param \Magento\Review\Model\ReviewFactory $reviewFactory
--     */
--    public function __construct(
--        \Magento\Review\Model\ReviewFactory $reviewFactory
--    ) {
--        $this->_reviewFactory = $reviewFactory;
--    }
--
--    /**
--     * Add review summary info for tagged product collection
--     *
--     * @param \Magento\Framework\Event\Observer $observer
--     * @return $this
--     */
--    public function execute(\Magento\Framework\Event\Observer $observer)
--    {
--        $collection = $observer->getEvent()->getCollection();
--        $this->_reviewFactory->create()->appendSummary($collection);
--
--        return $this;
--    }
--}
-diff --git a/app/code/Magento/Review/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Review/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..89882707f5e
---- /dev/null
-+++ b/app/code/Magento/Review/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,31 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuUserContentReviews">
-+        <data key="pageTitle">Reviews</data>
-+        <data key="title">Reviews</data>
-+        <data key="dataUiId">magento-review-catalog-reviews-ratings-reviews-all</data>
-+    </entity>
-+    <entity name="AdminMenuReportsReviewsByCustomers">
-+        <data key="pageTitle">Customer Reviews Report</data>
-+        <data key="title">By Customers</data>
-+        <data key="dataUiId">magento-review-report-review-customer</data>
-+    </entity>
-+    <entity name="AdminMenuReportsReviewsByProducts">
-+        <data key="pageTitle">Product Reviews Report</data>
-+        <data key="title">By Products</data>
-+        <data key="dataUiId">magento-review-report-review-product</data>
-+    </entity>
-+    <entity name="AdminMenuAttributesRating">
-+        <data key="pageTitle">Ratings</data>
-+        <data key="title">Rating</data>
-+        <data key="dataUiId">magento-review-catalog-reviews-ratings-ratings</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..fade220d221
---- /dev/null
-+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminMarketingReviewsNavigateMenuTest">
-+        <annotations>
-+            <features value="Review"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin marketing reviews navigate menu test"/>
-+            <description value="Admin should be able to navigate to Marketing > Reviews"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14196"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsViewsPage">
-+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuUserContentReviews.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuUserContentReviews.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..58492424e76
---- /dev/null
-+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsByCustomersNavigateMenuTest">
-+        <annotations>
-+            <features value="Review"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports by customers navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > By Customers"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14197"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsByCustomersPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsReviewsByCustomers.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsReviewsByCustomers.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..e848aa4f220
---- /dev/null
-+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminReportsByProductsNavigateMenuTest">
-+        <annotations>
-+            <features value="Review"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin reports by products navigate menu test"/>
-+            <description value="Admin should be able to navigate to Reports > By Products"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14198"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsByProductsPage">
-+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuReportsReviewsByProducts.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuReportsReviewsByProducts.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..511ed5439dc
---- /dev/null
-+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminStoresRatingNavigateMenuTest">
-+        <annotations>
-+            <features value="Review"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin stores rating navigate menu test"/>
-+            <description value="Admin should be able to navigate to Stores > Rating"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14199"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresRatingPage">
-+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuAttributesRating.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuAttributesRating.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Review/Test/Unit/Block/Adminhtml/RssTest.php b/app/code/Magento/Review/Test/Unit/Block/Adminhtml/RssTest.php
-index 8455f1f7c68..2ffd0ea1181 100644
---- a/app/code/Magento/Review/Test/Unit/Block/Adminhtml/RssTest.php
-+++ b/app/code/Magento/Review/Test/Unit/Block/Adminhtml/RssTest.php
-@@ -8,6 +8,9 @@ namespace Magento\Review\Test\Unit\Block\Adminhtml;
- 
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
- 
-+/**
-+ * Test RSS adminhtml block
-+ */
- class RssTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -35,6 +38,9 @@ class RssTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $urlBuilder;
- 
-+    /**
-+     * @inheritDoc
-+     */
-     protected function setUp()
-     {
-         $this->storeManagerInterface = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-@@ -51,18 +57,22 @@ class RssTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testGetRssData()
-     {
-+        $rssUrl = '';
-         $rssData = [
-             'title' => 'Pending product review(s)',
-             'description' => 'Pending product review(s)',
--            'link' => 'http://rss.magento.com',
-+            'link' => $rssUrl,
-             'charset' => 'UTF-8',
-             'entries' => [
-                     'title' => 'Product: "Product Name" reviewed by: Product Nick',
-                     'link' => 'http://product.magento.com',
-                     'description' => [
--                            'rss_url' => 'http://rss.magento.com',
-+                            'rss_url' => $rssUrl,
-                             'name' => 'Product Name',
-                             'summary' => 'Product Title',
-                             'review' => 'Product Detail',
-@@ -71,8 +81,9 @@ class RssTest extends \PHPUnit\Framework\TestCase
-                         ],
-                 ],
-         ];
--        $rssUrl = 'http://rss.magento.com';
--        $productModel = $this->createPartialMock(\Magento\Catalog\Model\ResourceModel\Product::class, [
-+        $productModel = $this->createPartialMock(
-+            \Magento\Catalog\Model\ResourceModel\Product::class,
-+            [
-                 'getStoreId',
-                 'getId',
-                 'getReviewId',
-@@ -81,7 +92,8 @@ class RssTest extends \PHPUnit\Framework\TestCase
-                 'getTitle',
-                 'getNickname',
-                 'getProductUrl'
--            ]);
-+            ]
-+        );
-         $storeModel = $this->createMock(\Magento\Store\Model\Store::class);
-         $this->storeManagerInterface->expects($this->once())->method('getStore')->will($this->returnValue($storeModel));
-         $storeModel->expects($this->once())->method('getName')
-@@ -118,16 +130,25 @@ class RssTest extends \PHPUnit\Framework\TestCase
-         $this->assertContains($rssData['entries']['description']['store'], $data['entries'][0]['description']);
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testGetCacheLifetime()
-     {
-         $this->assertEquals(0, $this->block->getCacheLifetime());
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testIsAllowed()
-     {
-         $this->assertEquals(true, $this->block->isAllowed());
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testGetFeeds()
-     {
-         $this->assertEquals([], $this->block->getFeeds());
-diff --git a/app/code/Magento/Review/Test/Unit/Controller/Adminhtml/Product/PostTest.php b/app/code/Magento/Review/Test/Unit/Controller/Adminhtml/Product/PostTest.php
-index 7d22524895a..6592ff977a0 100644
---- a/app/code/Magento/Review/Test/Unit/Controller/Adminhtml/Product/PostTest.php
-+++ b/app/code/Magento/Review/Test/Unit/Controller/Adminhtml/Product/PostTest.php
-@@ -6,6 +6,7 @@
- namespace Magento\Review\Test\Unit\Controller\Adminhtml\Product;
- 
- use Magento\Framework\Controller\ResultFactory;
-+use Magento\Review\Model\Review;
- 
- /**
-  * @SuppressWarnings(PHPMD.TooManyFields)
-@@ -109,7 +110,7 @@ class PostTest extends \PHPUnit\Framework\TestCase
-         $this->storeModelMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['__wakeup', 'getId']);
-         $this->reviewMock = $this->createPartialMock(
-             \Magento\Review\Model\Review::class,
--            ['__wakeup', 'create', 'save', 'getId', 'getResource', 'aggregate']
-+            ['__wakeup', 'create', 'save', 'getId', 'getResource', 'aggregate', 'getEntityIdByCode']
-         );
-         $this->reviewFactoryMock = $this->createPartialMock(\Magento\Review\Model\ReviewFactory::class, ['create']);
-         $this->ratingMock = $this->createPartialMock(
-@@ -174,6 +175,10 @@ class PostTest extends \PHPUnit\Framework\TestCase
-         $this->reviewMock->expects($this->once())
-             ->method('aggregate')
-             ->willReturn($this->reviewMock);
-+        $this->reviewMock->expects($this->once())
-+            ->method('getEntityIdByCode')
-+            ->with(Review::ENTITY_PRODUCT_CODE)
-+            ->willReturn(1);
-         $this->ratingMock->expects($this->once())
-             ->method('setRatingId')
-             ->willReturnSelf();
-diff --git a/app/code/Magento/Review/Test/Unit/Model/ReviewSummaryTest.php b/app/code/Magento/Review/Test/Unit/Model/ReviewSummaryTest.php
-new file mode 100644
-index 00000000000..9723ece0c49
---- /dev/null
-+++ b/app/code/Magento/Review/Test/Unit/Model/ReviewSummaryTest.php
-@@ -0,0 +1,94 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Review\Test\Unit\Model;
-+
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use PHPUnit\Framework\MockObject\MockObject;
-+
-+/**
-+ * Test for Magento\Review\Model\ReviewSummary class.
-+ */
-+class ReviewSummaryTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var MockObject
-+     */
-+    private $reviewSummaryCollectionFactoryMock;
-+
-+    /**
-+     * @var \Magento\Review\Model\ReviewSummary | MockObject
-+     */
-+    private $reviewSummary;
-+
-+    /**
-+     * @var ObjectManagerHelper
-+     */
-+    private $objectManagerHelper;
-+
-+    protected function setUp()
-+    {
-+        $this->reviewSummaryCollectionFactoryMock = $this->createPartialMock(
-+            \Magento\Review\Model\ResourceModel\Review\Summary\CollectionFactory::class,
-+            ['create']
-+        );
-+
-+        $this->objectManagerHelper = new ObjectManagerHelper($this);
-+        $this->reviewSummary = $this->objectManagerHelper->getObject(
-+            \Magento\Review\Model\ReviewSummary::class,
-+            [
-+                'sumColFactory' => $this->reviewSummaryCollectionFactoryMock
-+            ]
-+        );
-+    }
-+
-+    public function testAppendSummaryDataToObject()
-+    {
-+        $productId = 6;
-+        $storeId = 4;
-+        $testSummaryData = [
-+            'reviews_count' => 2,
-+            'rating_summary' => 80
-+        ];
-+        $product = $this->createPartialMock(
-+            \Magento\Catalog\Model\Product::class,
-+            ['getId', 'addData', '__wakeup']
-+        );
-+        $product->expects($this->once())->method('getId')->will($this->returnValue($productId));
-+        $product->expects($this->once())->method('addData')
-+            ->with($testSummaryData)
-+            ->will($this->returnSelf());
-+
-+        $summaryData = $this->createPartialMock(
-+            \Magento\Review\Model\Review\Summary::class,
-+            ['getData', '__wakeup']
-+        );
-+        $summaryData->expects($this->atLeastOnce())->method('getData')->will(
-+            $this->returnValueMap(
-+                [
-+                    ['reviews_count', null, $testSummaryData['reviews_count']],
-+                    ['rating_summary', null, $testSummaryData['rating_summary']]
-+                ]
-+            )
-+        );
-+        $summaryCollection = $this->createPartialMock(
-+            \Magento\Review\Model\ResourceModel\Review\Summary\Collection::class,
-+            ['addEntityFilter', 'addStoreFilter', 'getFirstItem', '__wakeup']
-+        );
-+        $summaryCollection->expects($this->once())->method('addEntityFilter')
-+            ->will($this->returnSelf());
-+        $summaryCollection->expects($this->once())->method('addStoreFilter')
-+            ->will($this->returnSelf());
-+        $summaryCollection->expects($this->once())->method('getFirstItem')
-+            ->will($this->returnValue($summaryData));
-+
-+        $this->reviewSummaryCollectionFactoryMock->expects($this->once())->method('create')
-+            ->will($this->returnValue($summaryCollection));
-+
-+        $this->assertNull($this->reviewSummary->appendSummaryDataToObject($product, $storeId));
-+    }
-+}
-diff --git a/app/code/Magento/Review/Test/Unit/Model/ReviewTest.php b/app/code/Magento/Review/Test/Unit/Model/ReviewTest.php
-index 9f57b289fa7..3302ba7e6a0 100644
---- a/app/code/Magento/Review/Test/Unit/Model/ReviewTest.php
-+++ b/app/code/Magento/Review/Test/Unit/Model/ReviewTest.php
-@@ -51,7 +51,7 @@ class ReviewTest extends \PHPUnit\Framework\TestCase
-     /** @var \Magento\Review\Model\ResourceModel\Review|\PHPUnit_Framework_MockObject_MockObject */
-     protected $resource;
- 
--    /** @var int  */
-+    /** @var int */
-     protected $reviewId = 8;
- 
-     protected function setUp()
-@@ -135,6 +135,9 @@ class ReviewTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($this->review, $this->review->aggregate());
-     }
- 
-+    /**
-+     * @deprecated
-+     */
-     public function testGetEntitySummary()
-     {
-         $productId = 6;
-diff --git a/app/code/Magento/Review/Test/Unit/Observer/PredispatchReviewObserverTest.php b/app/code/Magento/Review/Test/Unit/Observer/PredispatchReviewObserverTest.php
-new file mode 100644
-index 00000000000..cb01e55e4f4
---- /dev/null
-+++ b/app/code/Magento/Review/Test/Unit/Observer/PredispatchReviewObserverTest.php
-@@ -0,0 +1,147 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types = 1);
-+
-+namespace Magento\Review\Test\Unit\Observer;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\Response\RedirectInterface;
-+use Magento\Framework\App\ResponseInterface;
-+use Magento\Framework\Event\Observer;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Framework\UrlInterface;
-+use Magento\Review\Observer\PredispatchReviewObserver;
-+use Magento\Store\Model\ScopeInterface;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Test class for \Magento\Review\Observer\PredispatchReviewObserver
-+ */
-+class PredispatchReviewObserverTest extends TestCase
-+{
-+    /**
-+     * @var Observer|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $mockObject;
-+
-+    /**
-+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $configMock;
-+
-+    /**
-+     * @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $urlMock;
-+
-+    /**
-+     * @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $redirectMock;
-+
-+    /**
-+     * @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $responseMock;
-+
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp() : void
-+    {
-+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
-+                                 ->disableOriginalConstructor()
-+                                 ->getMock();
-+        $this->urlMock = $this->getMockBuilder(UrlInterface::class)
-+                              ->disableOriginalConstructor()
-+                              ->getMock();
-+        $this->responseMock = $this->getMockBuilder(ResponseInterface::class)
-+                                   ->disableOriginalConstructor()
-+                                   ->setMethods(['setRedirect'])
-+                                   ->getMockForAbstractClass();
-+        $this->redirectMock = $this->getMockBuilder(RedirectInterface::class)
-+                                   ->getMock();
-+        $this->objectManager = new ObjectManager($this);
-+        $this->mockObject = $this->objectManager->getObject(
-+            PredispatchReviewObserver::class,
-+            [
-+                'scopeConfig' => $this->configMock,
-+                'url' => $this->urlMock
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test with enabled review active config.
-+     */
-+    public function testReviewEnabled() : void
-+    {
-+        $observerMock = $this->getMockBuilder(Observer::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getResponse', 'getData', 'setRedirect'])
-+            ->getMockForAbstractClass();
-+
-+        $this->configMock->method('getValue')
-+            ->with(PredispatchReviewObserver::XML_PATH_REVIEW_ACTIVE, ScopeInterface::SCOPE_STORE)
-+            ->willReturn(true);
-+        $observerMock->expects($this->never())
-+            ->method('getData')
-+            ->with('controller_action')
-+            ->willReturnSelf();
-+
-+        $observerMock->expects($this->never())
-+            ->method('getResponse')
-+            ->willReturnSelf();
-+
-+        $this->assertNull($this->mockObject->execute($observerMock));
-+    }
-+
-+    /**
-+     * Test with disabled review active config.
-+     */
-+    public function testReviewDisabled() : void
-+    {
-+        $observerMock = $this->getMockBuilder(Observer::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getControllerAction', 'getResponse'])
-+            ->getMockForAbstractClass();
-+
-+        $this->configMock->expects($this->at(0))
-+            ->method('getValue')
-+            ->with(PredispatchReviewObserver::XML_PATH_REVIEW_ACTIVE, ScopeInterface::SCOPE_STORE)
-+            ->willReturn(false);
-+
-+        $expectedRedirectUrl = 'https://test.com/index';
-+
-+        $this->configMock->expects($this->at(1))
-+            ->method('getValue')
-+            ->with('web/default/no_route', ScopeInterface::SCOPE_STORE)
-+            ->willReturn($expectedRedirectUrl);
-+
-+        $this->urlMock->expects($this->once())
-+            ->method('getUrl')
-+            ->willReturn($expectedRedirectUrl);
-+
-+        $observerMock->expects($this->once())
-+            ->method('getControllerAction')
-+            ->willReturnSelf();
-+
-+        $observerMock->expects($this->once())
-+            ->method('getResponse')
-+            ->willReturn($this->responseMock);
-+
-+        $this->responseMock->expects($this->once())
-+            ->method('setRedirect')
-+            ->with($expectedRedirectUrl);
-+
-+        $this->assertNull($this->mockObject->execute($observerMock));
-+    }
-+}
-diff --git a/app/code/Magento/Review/Test/Unit/Observer/ProcessProductAfterDeleteEventObserverTest.php b/app/code/Magento/Review/Test/Unit/Observer/ProcessProductAfterDeleteEventObserverTest.php
-new file mode 100644
-index 00000000000..9d3980a99f9
---- /dev/null
-+++ b/app/code/Magento/Review/Test/Unit/Observer/ProcessProductAfterDeleteEventObserverTest.php
-@@ -0,0 +1,121 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Review\Test\Unit\Observer;
-+
-+use Magento\Catalog\Model\Product;
-+use Magento\Framework\Event;
-+use Magento\Framework\Event\Observer;
-+use Magento\Review\Model\ResourceModel\Rating;
-+use Magento\Review\Model\ResourceModel\Review;
-+use Magento\Review\Observer\ProcessProductAfterDeleteEventObserver;
-+use PHPUnit\Framework\TestCase;
-+use PHPUnit_Framework_MockObject_MockObject;
-+
-+/**
-+ * Class ProcessProductAfterDeleteEventObserverTest
-+ */
-+class ProcessProductAfterDeleteEventObserverTest extends TestCase
-+{
-+    /**
-+     * Testable Object
-+     *
-+     * @var ProcessProductAfterDeleteEventObserver
-+     */
-+    private $observer;
-+
-+    /**
-+     * @var Review|PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $resourceReviewMock;
-+
-+    /**
-+     * @var Rating|PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $resourceRatingMock;
-+
-+    /**
-+     * Set up
-+     */
-+    protected function setUp()
-+    {
-+        $this->resourceReviewMock = $this->createMock(Review::class);
-+        $this->resourceRatingMock = $this->createMock(Rating::class);
-+
-+        $this->observer = new ProcessProductAfterDeleteEventObserver(
-+            $this->resourceReviewMock,
-+            $this->resourceRatingMock
-+        );
-+    }
-+
-+    /**
-+     * Test cleanup product reviews after product delete
-+     *
-+     * @return void
-+     */
-+    public function testCleanupProductReviewsWithProduct()
-+    {
-+        $productId = 1;
-+        $observerMock = $this->createMock(Observer::class);
-+        $eventMock = $this->getMockBuilder(Event::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getProduct'])
-+            ->getMock();
-+
-+        $productMock = $this->getMockBuilder(Product::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getId'])
-+            ->getMock();
-+
-+        $productMock->expects(self::exactly(3))
-+            ->method('getId')
-+            ->willReturn($productId);
-+        $eventMock->expects($this->once())
-+            ->method('getProduct')
-+            ->willReturn($productMock);
-+        $observerMock->expects($this->once())
-+            ->method('getEvent')
-+            ->willReturn($eventMock);
-+        $this->resourceReviewMock->expects($this->once())
-+            ->method('deleteReviewsByProductId')
-+            ->willReturnSelf();
-+        $this->resourceRatingMock->expects($this->once())
-+            ->method('deleteAggregatedRatingsByProductId')
-+            ->willReturnSelf();
-+
-+        $this->observer->execute($observerMock);
-+    }
-+
-+    /**
-+     * Test with no event product
-+     *
-+     * @return void
-+     */
-+    public function testCleanupProductReviewsWithoutProduct()
-+    {
-+        $observerMock = $this->createMock(Observer::class);
-+        $eventMock = $this->getMockBuilder(Event::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getProduct'])
-+            ->getMock();
-+
-+        $eventMock->expects($this->once())
-+            ->method('getProduct')
-+            ->willReturn(null);
-+        $observerMock->expects($this->once())
-+            ->method('getEvent')
-+            ->willReturn($eventMock);
-+        $this->resourceReviewMock->expects($this->never())
-+            ->method('deleteReviewsByProductId')
-+            ->willReturnSelf();
-+        $this->resourceRatingMock->expects($this->never())
-+            ->method('deleteAggregatedRatingsByProductId')
-+            ->willReturnSelf();
-+
-+        $this->observer->execute($observerMock);
-+    }
-+}
-diff --git a/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php b/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php
-index f618651930d..e1e5503ad47 100644
---- a/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php
-+++ b/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php
-@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
- use Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier\AbstractModifierTest;
- use Magento\Framework\UrlInterface;
- use Magento\Review\Ui\DataProvider\Product\Form\Modifier\Review;
--use Magento\Framework\Module\Manager as ModuleManager;
-+use \Magento\Framework\Module\Manager as ModuleManager;
- use Magento\Ui\DataProvider\Modifier\ModifierInterface;
- 
- /**
-@@ -39,10 +39,13 @@ class ReviewTest extends AbstractModifierTest
-      */
-     protected function createModel()
-     {
--        $model = $this->objectManager->getObject(Review::class, [
-+        $model = $this->objectManager->getObject(
-+            Review::class,
-+            [
-             'locator' => $this->locatorMock,
-             'urlBuilder' => $this->urlBuilderMock,
--        ]);
-+            ]
-+        );
- 
-         $reviewClass = new \ReflectionClass(Review::class);
-         $moduleManagerProperty = $reviewClass->getProperty('moduleManager');
-diff --git a/app/code/Magento/Review/Ui/DataProvider/Product/Form/Modifier/Review.php b/app/code/Magento/Review/Ui/DataProvider/Product/Form/Modifier/Review.php
-index 727cd973de3..433be1c8609 100644
---- a/app/code/Magento/Review/Ui/DataProvider/Product/Form/Modifier/Review.php
-+++ b/app/code/Magento/Review/Ui/DataProvider/Product/Form/Modifier/Review.php
-@@ -12,7 +12,7 @@ use Magento\Catalog\Model\Locator\LocatorInterface;
- use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
- use Magento\Ui\Component\Form;
- use Magento\Framework\UrlInterface;
--use Magento\Framework\Module\Manager as ModuleManager;
-+use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
- use Magento\Framework\App\ObjectManager;
- 
- /**
-@@ -59,7 +59,7 @@ class Review extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.1.0
-      */
-     public function modifyMeta(array $meta)
-@@ -117,7 +117,7 @@ class Review extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.1.0
-      */
-     public function modifyData(array $data)
-@@ -133,7 +133,6 @@ class Review extends AbstractModifier
-      * Retrieve module manager instance using dependency lookup to keep this class backward compatible.
-      *
-      * @return ModuleManager
--     *
-      * @deprecated 100.2.0
-      */
-     private function getModuleManager()
-diff --git a/app/code/Magento/Review/etc/acl.xml b/app/code/Magento/Review/etc/acl.xml
-index 397cc1cce61..46fdb20dee4 100644
---- a/app/code/Magento/Review/etc/acl.xml
-+++ b/app/code/Magento/Review/etc/acl.xml
-@@ -16,8 +16,8 @@
-                 </resource>
-                 <resource id="Magento_Backend::marketing">
-                     <resource id="Magento_Backend::marketing_user_content">
--                        <resource id="Magento_Review::reviews_all" title="Reviews" translate="title" sortOrder="10"/>
--                        <resource id="Magento_Review::pending" title="Reviews" translate="title" sortOrder="20"/>
-+                        <resource id="Magento_Review::pending" title="Pending Reviews" translate="title" sortOrder="20"/>
-+                        <resource id="Magento_Review::reviews_all" title="All Reviews" translate="title" sortOrder="10"/>
-                     </resource>
-                 </resource>
-             </resource>
-diff --git a/app/code/Magento/Review/etc/adminhtml/menu.xml b/app/code/Magento/Review/etc/adminhtml/menu.xml
-index e3532483f88..73763294719 100644
---- a/app/code/Magento/Review/etc/adminhtml/menu.xml
-+++ b/app/code/Magento/Review/etc/adminhtml/menu.xml
-@@ -8,7 +8,8 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
-     <menu>
-         <add id="Magento_Review::catalog_reviews_ratings_ratings" title="Rating" translate="title" module="Magento_Review" sortOrder="60" parent="Magento_Backend::stores_attributes" action="review/rating/" resource="Magento_Review::ratings"/>
--        <add id="Magento_Review::catalog_reviews_ratings_reviews_all" title="Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="10" action="review/product/index" resource="Magento_Review::reviews_all"/>
-+        <add id="Magento_Review::catalog_reviews_ratings_pending" title="Pending Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="20" action="review/product/pending" resource="Magento_Review::pending"/>
-+        <add id="Magento_Review::catalog_reviews_ratings_reviews_all" title="All Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="10" action="review/product/index" resource="Magento_Review::reviews_all"/>
-         <add id="Magento_Review::report_review" title="Reviews" translate="title" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report" resource="Magento_Reports::review"/>
-         <add id="Magento_Review::report_review_customer" title="By Customers" translate="title" sortOrder="10" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/customer" resource="Magento_Reports::review_customer"/>
-         <add id="Magento_Review::report_review_product" title="By Products" translate="title" sortOrder="20" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/product" resource="Magento_Reports::review_product"/>
-diff --git a/app/code/Magento/Review/etc/adminhtml/system.xml b/app/code/Magento/Review/etc/adminhtml/system.xml
-index c0574e94917..a24ed29dc2c 100644
---- a/app/code/Magento/Review/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Review/etc/adminhtml/system.xml
-@@ -10,7 +10,11 @@
-         <section id="catalog">
-             <group id="review" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
-                 <label>Product Reviews</label>
--                <field id="allow_guest" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                    <label>Enabled</label>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                </field>
-+                <field id="allow_guest" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Allow Guests to Write Reviews</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
-diff --git a/app/code/Magento/Review/etc/config.xml b/app/code/Magento/Review/etc/config.xml
-index 78dc87960f0..9fd9443be67 100644
---- a/app/code/Magento/Review/etc/config.xml
-+++ b/app/code/Magento/Review/etc/config.xml
-@@ -9,6 +9,7 @@
-     <default>
-         <catalog>
-             <review>
-+                <active>1</active>
-                 <allow_guest>1</allow_guest>
-             </review>
-         </catalog>
-diff --git a/app/code/Magento/Review/etc/db_schema.xml b/app/code/Magento/Review/etc/db_schema.xml
-index 1a2ff588180..d1090d41338 100644
---- a/app/code/Magento/Review/etc/db_schema.xml
-+++ b/app/code/Magento/Review/etc/db_schema.xml
-@@ -11,7 +11,7 @@
-         <column xsi:type="smallint" name="entity_id" padding="5" unsigned="true" nullable="false" identity="true"
-                 comment="Review entity id"/>
-         <column xsi:type="varchar" name="entity_code" nullable="false" length="32" comment="Review entity code"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
-     </table>
-@@ -19,7 +19,7 @@
-         <column xsi:type="smallint" name="status_id" padding="5" unsigned="true" nullable="false" identity="true"
-                 comment="Status id"/>
-         <column xsi:type="varchar" name="status_code" nullable="false" length="32" comment="Status code"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="status_id"/>
-         </constraint>
-     </table>
-@@ -34,20 +34,20 @@
-                 default="0" comment="Product id"/>
-         <column xsi:type="smallint" name="status_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Status code"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="review_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="REVIEW_ENTITY_ID_REVIEW_ENTITY_ENTITY_ID" table="review" column="entity_id"
-+        <constraint xsi:type="foreign" referenceId="REVIEW_ENTITY_ID_REVIEW_ENTITY_ENTITY_ID" table="review" column="entity_id"
-                     referenceTable="review_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="REVIEW_STATUS_ID_REVIEW_STATUS_STATUS_ID" table="review" column="status_id"
-+        <constraint xsi:type="foreign" referenceId="REVIEW_STATUS_ID_REVIEW_STATUS_STATUS_ID" table="review" column="status_id"
-                     referenceTable="review_status" referenceColumn="status_id" onDelete="NO ACTION"/>
--        <index name="REVIEW_ENTITY_ID" indexType="btree">
-+        <index referenceId="REVIEW_ENTITY_ID" indexType="btree">
-             <column name="entity_id"/>
-         </index>
--        <index name="REVIEW_STATUS_ID" indexType="btree">
-+        <index referenceId="REVIEW_STATUS_ID" indexType="btree">
-             <column name="status_id"/>
-         </index>
--        <index name="REVIEW_ENTITY_PK_VALUE" indexType="btree">
-+        <index referenceId="REVIEW_ENTITY_PK_VALUE" indexType="btree">
-             <column name="entity_pk_value"/>
-         </index>
-     </table>
-@@ -63,23 +63,23 @@
-         <column xsi:type="varchar" name="nickname" nullable="false" length="128" comment="User nickname"/>
-         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="Customer Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="detail_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="REVIEW_DETAIL_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID" table="review_detail"
-+        <constraint xsi:type="foreign" referenceId="REVIEW_DETAIL_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID" table="review_detail"
-                     column="customer_id" referenceTable="customer_entity" referenceColumn="entity_id"
-                     onDelete="SET NULL"/>
--        <constraint xsi:type="foreign" name="REVIEW_DETAIL_REVIEW_ID_REVIEW_REVIEW_ID" table="review_detail"
-+        <constraint xsi:type="foreign" referenceId="REVIEW_DETAIL_REVIEW_ID_REVIEW_REVIEW_ID" table="review_detail"
-                     column="review_id" referenceTable="review" referenceColumn="review_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="REVIEW_DETAIL_STORE_ID_STORE_STORE_ID" table="review_detail"
-+        <constraint xsi:type="foreign" referenceId="REVIEW_DETAIL_STORE_ID_STORE_STORE_ID" table="review_detail"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
--        <index name="REVIEW_DETAIL_REVIEW_ID" indexType="btree">
-+        <index referenceId="REVIEW_DETAIL_REVIEW_ID" indexType="btree">
-             <column name="review_id"/>
-         </index>
--        <index name="REVIEW_DETAIL_STORE_ID" indexType="btree">
-+        <index referenceId="REVIEW_DETAIL_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="REVIEW_DETAIL_CUSTOMER_ID" indexType="btree">
-+        <index referenceId="REVIEW_DETAIL_CUSTOMER_ID" indexType="btree">
-             <column name="customer_id"/>
-         </index>
-     </table>
-@@ -95,64 +95,64 @@
-         <column xsi:type="smallint" name="rating_summary" padding="6" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Summarized rating"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Store id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+                default="0" comment="Store ID"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="primary_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="REVIEW_ENTITY_SUMMARY_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="REVIEW_ENTITY_SUMMARY_STORE_ID_STORE_STORE_ID"
-                     table="review_entity_summary" column="store_id" referenceTable="store" referenceColumn="store_id"
-                     onDelete="CASCADE"/>
--        <index name="REVIEW_ENTITY_SUMMARY_STORE_ID" indexType="btree">
-+        <index referenceId="REVIEW_ENTITY_SUMMARY_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-     <table name="review_store" resource="default" engine="innodb" comment="Review Store">
-         <column xsi:type="bigint" name="review_id" padding="20" unsigned="true" nullable="false" identity="false"
--                comment="Review Id"/>
-+                comment="Review ID"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
--                comment="Store Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+                comment="Store ID"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="review_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="REVIEW_STORE_REVIEW_ID_REVIEW_REVIEW_ID" table="review_store"
-+        <constraint xsi:type="foreign" referenceId="REVIEW_STORE_REVIEW_ID_REVIEW_REVIEW_ID" table="review_store"
-                     column="review_id" referenceTable="review" referenceColumn="review_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="REVIEW_STORE_STORE_ID_STORE_STORE_ID" table="review_store"
-+        <constraint xsi:type="foreign" referenceId="REVIEW_STORE_STORE_ID_STORE_STORE_ID" table="review_store"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <index name="REVIEW_STORE_STORE_ID" indexType="btree">
-+        <index referenceId="REVIEW_STORE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-     <table name="rating_entity" resource="default" engine="innodb" comment="Rating entities">
-         <column xsi:type="smallint" name="entity_id" padding="5" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="varchar" name="entity_code" nullable="false" length="64" comment="Entity Code"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="RATING_ENTITY_ENTITY_CODE">
-+        <constraint xsi:type="unique" referenceId="RATING_ENTITY_ENTITY_CODE">
-             <column name="entity_code"/>
-         </constraint>
-     </table>
-     <table name="rating" resource="default" engine="innodb" comment="Ratings">
-         <column xsi:type="smallint" name="rating_id" padding="5" unsigned="true" nullable="false" identity="true"
--                comment="Rating Id"/>
-+                comment="Rating ID"/>
-         <column xsi:type="smallint" name="entity_id" padding="5" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="varchar" name="rating_code" nullable="false" length="64" comment="Rating Code"/>
-         <column xsi:type="smallint" name="position" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Rating Position On Storefront"/>
-         <column xsi:type="smallint" name="is_active" padding="6" unsigned="false" nullable="false" identity="false"
-                 default="1" comment="Rating is active."/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rating_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="RATING_ENTITY_ID_RATING_ENTITY_ENTITY_ID" table="rating" column="entity_id"
-+        <constraint xsi:type="foreign" referenceId="RATING_ENTITY_ID_RATING_ENTITY_ENTITY_ID" table="rating" column="entity_id"
-                     referenceTable="rating_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="RATING_RATING_CODE">
-+        <constraint xsi:type="unique" referenceId="RATING_RATING_CODE">
-             <column name="rating_code"/>
-         </constraint>
--        <index name="RATING_ENTITY_ID" indexType="btree">
-+        <index referenceId="RATING_ENTITY_ID" indexType="btree">
-             <column name="entity_id"/>
-         </index>
-     </table>
-@@ -166,12 +166,12 @@
-                 default="0" comment="Rating Option Value"/>
-         <column xsi:type="smallint" name="position" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Ration option position on Storefront"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="option_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="RATING_OPTION_RATING_ID_RATING_RATING_ID" table="rating_option"
-+        <constraint xsi:type="foreign" referenceId="RATING_OPTION_RATING_ID_RATING_RATING_ID" table="rating_option"
-                     column="rating_id" referenceTable="rating" referenceColumn="rating_id" onDelete="CASCADE"/>
--        <index name="RATING_OPTION_RATING_ID" indexType="btree">
-+        <index referenceId="RATING_OPTION_RATING_ID" indexType="btree">
-             <column name="rating_id"/>
-         </index>
-     </table>
-@@ -195,15 +195,15 @@
-                 default="0" comment="Percent amount"/>
-         <column xsi:type="smallint" name="value" padding="6" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Vote option value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="vote_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="RATING_OPTION_VOTE_OPTION_ID_RATING_OPTION_OPTION_ID"
-+        <constraint xsi:type="foreign" referenceId="RATING_OPTION_VOTE_OPTION_ID_RATING_OPTION_OPTION_ID"
-                     table="rating_option_vote" column="option_id" referenceTable="rating_option"
-                     referenceColumn="option_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="RATING_OPTION_VOTE_REVIEW_ID_REVIEW_REVIEW_ID" table="rating_option_vote"
-+        <constraint xsi:type="foreign" referenceId="RATING_OPTION_VOTE_REVIEW_ID_REVIEW_REVIEW_ID" table="rating_option_vote"
-                     column="review_id" referenceTable="review" referenceColumn="review_id" onDelete="CASCADE"/>
--        <index name="RATING_OPTION_VOTE_OPTION_ID" indexType="btree">
-+        <index referenceId="RATING_OPTION_VOTE_OPTION_ID" indexType="btree">
-             <column name="option_id"/>
-         </index>
-     </table>
-@@ -224,19 +224,19 @@
-                 identity="false" default="0" comment="Vote percent approved by admin"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="primary_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="RATING_OPTION_VOTE_AGGREGATED_RATING_ID_RATING_RATING_ID"
-+        <constraint xsi:type="foreign" referenceId="RATING_OPTION_VOTE_AGGREGATED_RATING_ID_RATING_RATING_ID"
-                     table="rating_option_vote_aggregated" column="rating_id" referenceTable="rating"
-                     referenceColumn="rating_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="RATING_OPTION_VOTE_AGGREGATED_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="RATING_OPTION_VOTE_AGGREGATED_STORE_ID_STORE_STORE_ID"
-                     table="rating_option_vote_aggregated" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <index name="RATING_OPTION_VOTE_AGGREGATED_RATING_ID" indexType="btree">
-+        <index referenceId="RATING_OPTION_VOTE_AGGREGATED_RATING_ID" indexType="btree">
-             <column name="rating_id"/>
-         </index>
--        <index name="RATING_OPTION_VOTE_AGGREGATED_STORE_ID" indexType="btree">
-+        <index referenceId="RATING_OPTION_VOTE_AGGREGATED_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -245,15 +245,15 @@
-                 default="0" comment="Rating id"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rating_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="RATING_STORE_STORE_ID_STORE_STORE_ID" table="rating_store"
-+        <constraint xsi:type="foreign" referenceId="RATING_STORE_STORE_ID_STORE_STORE_ID" table="rating_store"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="RATING_STORE_RATING_ID_RATING_RATING_ID" table="rating_store"
-+        <constraint xsi:type="foreign" referenceId="RATING_STORE_RATING_ID_RATING_RATING_ID" table="rating_store"
-                     column="rating_id" referenceTable="rating" referenceColumn="rating_id" onDelete="CASCADE"/>
--        <index name="RATING_STORE_STORE_ID" indexType="btree">
-+        <index referenceId="RATING_STORE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -263,15 +263,15 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store Id"/>
-         <column xsi:type="varchar" name="value" nullable="false" length="255" comment="Rating Label"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rating_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="RATING_TITLE_RATING_ID_RATING_RATING_ID" table="rating_title"
-+        <constraint xsi:type="foreign" referenceId="RATING_TITLE_RATING_ID_RATING_RATING_ID" table="rating_title"
-                     column="rating_id" referenceTable="rating" referenceColumn="rating_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="RATING_TITLE_STORE_ID_STORE_STORE_ID" table="rating_title"
-+        <constraint xsi:type="foreign" referenceId="RATING_TITLE_STORE_ID_STORE_STORE_ID" table="rating_title"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <index name="RATING_TITLE_STORE_ID" indexType="btree">
-+        <index referenceId="RATING_TITLE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Review/etc/frontend/di.xml b/app/code/Magento/Review/etc/frontend/di.xml
-index e6efb36e88d..4ea0f4449cd 100644
---- a/app/code/Magento/Review/etc/frontend/di.xml
-+++ b/app/code/Magento/Review/etc/frontend/di.xml
-@@ -40,7 +40,4 @@
-             </argument>
-         </arguments>
-     </type>
--    <type name="Magento\Catalog\Block\Product\Compare\ListCompare">
--        <plugin name="reviewInitializer" type="Magento\Review\Block\Product\Compare\ListCompare\Plugin\Review" />
--    </type>
- </config>
-diff --git a/app/code/Magento/Review/etc/frontend/events.xml b/app/code/Magento/Review/etc/frontend/events.xml
-index bc94277d697..44cc888fb32 100644
---- a/app/code/Magento/Review/etc/frontend/events.xml
-+++ b/app/code/Magento/Review/etc/frontend/events.xml
-@@ -6,10 +6,10 @@
-  */
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
--    <event name="tag_tag_product_collection_load_after">
--        <observer name="review" instance="Magento\Review\Observer\TagProductCollectionLoadAfterObserver" shared="false" />
--    </event>
-     <event name="catalog_block_product_list_collection">
--        <observer name="review" instance="Magento\Review\Observer\CatalogBlockProductCollectionBeforeToHtmlObserver" shared="false" />
-+        <observer name="review" instance="Magento\Review\Observer\CatalogProductListCollectionAppendSummaryFieldsObserver" shared="false" />
-+    </event>
-+    <event name="controller_action_predispatch_review">
-+        <observer name="catalog_review_enabled" instance="Magento\Review\Observer\PredispatchReviewObserver" />
-     </event>
- </config>
-diff --git a/app/code/Magento/Review/i18n/en_US.csv b/app/code/Magento/Review/i18n/en_US.csv
-index b3ea21dfcae..07b7e8c13bd 100644
---- a/app/code/Magento/Review/i18n/en_US.csv
-+++ b/app/code/Magento/Review/i18n/en_US.csv
-@@ -135,3 +135,5 @@ Inactive,Inactive
- "Please select one of each of the ratings above.","Please select one of each of the ratings above."
- star,star
- stars,stars
-+"You don’t have permission to perform this operation. Selected reviews must be in Pending Status only.","You don’t have permission to perform this operation. Selected reviews must be in Pending Status only."
-+"You don’t have permission to perform this operation. The selected review must be in Pending Status.","You don’t have permission to perform this operation. The selected review must be in Pending Status."
-diff --git a/app/code/Magento/Review/view/adminhtml/layout/rating_block.xml b/app/code/Magento/Review/view/adminhtml/layout/rating_block.xml
-index b439bcb1c27..414cec14c3b 100644
---- a/app/code/Magento/Review/view/adminhtml/layout/rating_block.xml
-+++ b/app/code/Magento/Review/view/adminhtml/layout/rating_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.rating.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">ratingsGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Review\Model\ResourceModel\Rating\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Review\Model\ResourceModel\Rating\Grid\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">rating_code</argument>
-                     <argument name="default_dir" xsi:type="string">ASC</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
-index 013c5d87a88..bf0cab4c621 100644
---- a/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
-+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
-@@ -4,22 +4,20 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Review\Block\Adminhtml\Rating\Detailed $block */
- 
- ?>
--<?php if ($block->getRating() && $block->getRating()->getSize()): ?>
--    <?php foreach ($block->getRating() as $_rating): ?>
-+<?php if ($block->getRating() && $block->getRating()->getSize()) : ?>
-+    <?php foreach ($block->getRating() as $_rating) : ?>
-     <div class="admin__field admin__field-rating">
-         <label class="admin__field-label"><span><?= $block->escapeHtml($_rating->getRatingCode()) ?></span></label>
-         <?php $_iterator = 1; ?>
-         <?php $_options = ($_rating->getRatingOptions()) ? $_rating->getRatingOptions() : $_rating->getOptions() ?>
-         <div class="admin__field-control" data-widget="ratingControl">
--        <?php foreach (array_reverse($_options) as $_option): ?>
--            <input type="radio" name="ratings[<?= $block->escapeHtmlAttr($_rating->getVoteId() ? $_rating->getVoteId() : $_rating->getId()) ?>]" id="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>" value="<?= $block->escapeHtmlAttr($_option->getId()) ?>" <?php if ($block->isSelected($_option, $_rating)): ?>checked="checked"<?php endif; ?> />
-+        <?php foreach (array_reverse($_options) as $_option) : ?>
-+            <input type="radio" name="ratings[<?= $block->escapeHtmlAttr($_rating->getVoteId() ? $_rating->getVoteId() : $_rating->getId()) ?>]" id="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>" value="<?= $block->escapeHtmlAttr($_option->getId()) ?>" <?php if ($block->isSelected($_option, $_rating)) : ?>checked="checked"<?php endif; ?> />
-             <label for="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>">&#9733;</label>
--        <?php $_iterator++ ?>
-+            <?php $_iterator++ ?>
-         <?php endforeach; ?>
-         </div>
-     </div>
-@@ -36,6 +34,6 @@ require([
-     $('[data-widget=ratingControl]').ratingControl();
- });
- </script>
--<?php else: ?>
-+<?php else : ?>
-     <?= $block->escapeHtml(__("Rating isn't Available")) ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
-index 0779d0fcbea..3d49d3c31e3 100644
---- a/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
-+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Review\Block\Adminhtml\Rating\Edit\Tab\Form $block */
- ?>
- <div class="messages">
-diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml
-index 779ee425e26..6e1dae94298 100644
---- a/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml
-+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml
-@@ -4,22 +4,21 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- // @deprecated
- ?>
- <div class="entry-edit-head">
-     <h4 class="icon-head head-edit-form fieldset-legend"><?= $block->escapeHtml(__('Assigned Options')) ?></h4>
- </div>
- <fieldset id="options_form">
--<?php if (!$options): ?>
--    <?php for ($_i = 1; $_i <= 5; $_i++): ?>
-+<?php if (!$options) : ?>
-+    <?php for ($_i = 1; $_i <= 5; $_i++) : ?>
-         <span class="field-row">
-             <label for="option_<?= /* @noEscape */ $_i ?>"><?= $block->escapeHtml(__('Option Title:')) ?></label>
-             <input id="option_<?= /* @noEscape */ $_i ?>" name="option[<?= /* @noEscape */ $_i ?>][code]" value="<?= /* @noEscape */ $_i ?>" class="input-text" type="text" />
-         </span>
-     <?php endfor; ?>
--<?php elseif ($options->getSize() > 0): ?>
--    <?php foreach ($options->getItems() as $_item): ?>
-+<?php elseif ($options->getSize() > 0) : ?>
-+    <?php foreach ($options->getItems() as $_item) : ?>
-         <span class="field-row">
-             <label for="option_<?= $block->escapeHtmlAttr($_item->getId()) ?>"><?= $block->escapeHtml(__('Option Title:')) ?></label>
-             <input id="option_<?= $block->escapeHtmlAttr($_item->getId()) ?>" name="option[<?= $block->escapeHtmlAttr($_item->getId()) ?>][code]" value="<?= $block->escapeHtmlAttr($_item->getCode()) ?>" class="input-text" type="text" />
-diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml
-index e36344997c8..085c445cae1 100644
---- a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml
-+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml
-@@ -4,22 +4,21 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- // @deprecated
- ?>
--<?php if ($block->getRating() && $block->getRating()->getSize()): ?>
-+<?php if ($block->getRating() && $block->getRating()->getSize()) : ?>
-     <div class="ratings-container">
--        <?php foreach ($block->getRating() as $_rating): ?>
--        <?php if ($_rating->getPercent()): ?>
--            <div class="ratings">
--               <?= $block->escapeHtml($_rating->getRatingCode()) ?>
--                <div class="rating-box">
--                    <div class="rating" style="width:<?= /* @noEscape */ ceil($_rating->getPercent()) ?>%;"></div>
-+        <?php foreach ($block->getRating() as $_rating) : ?>
-+            <?php if ($_rating->getPercent()) : ?>
-+                <div class="ratings">
-+                    <?= $block->escapeHtml($_rating->getRatingCode()) ?>
-+                    <div class="rating-box">
-+                        <div class="rating" style="width:<?= /* @noEscape */ ceil($_rating->getPercent()) ?>%;"></div>
-+                    </div>
-                 </div>
--            </div>
--        <?php endif; ?>
-+            <?php endif; ?>
-         <?php endforeach; ?>
-     </div>
--<?php else: ?>
-+<?php else : ?>
-     <?= $block->escapeHtml(__("Rating isn't Available")) ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
-index 56f5186b925..1f27db795f8 100644
---- a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
-+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
-@@ -4,14 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Review\Block\Adminhtml\Rating\Summary $block */
- ?>
--<?php if ($block->getRatingSummary()->getCount()): ?>
-+<?php if ($block->getRatingSummary()->getCount()) : ?>
-     <div class="rating-box">
-         <div class="rating" style="width:<?= /* @noEscape */ ceil($block->getRatingSummary()->getSum() / ($block->getRatingSummary()->getCount())) ?>%;"></div>
-     </div>
--<?php else: ?>
-+<?php else : ?>
-     <?= $block->escapeHtml(__("Rating isn't Available")) ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml b/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml
-index 375e983b267..b50d618601f 100644
---- a/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml
-+++ b/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml
-@@ -4,10 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Review\Block\Adminhtml\Grid\Rss\Link */
- ?>
--<?php if ($block->isRssAllowed() && $block->getLink()): ?>
-+<?php if ($block->isRssAllowed() && $block->getLink()) : ?>
- <a href="<?= $block->escapeUrl($block->getLink()) ?>" class="link-feed"><?= $block->escapeHtml($block->getLabel()) ?></a>
- <?php endif; ?>
-diff --git a/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml
-index d7c5c19d4d8..a6b46f8f25a 100644
---- a/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml
-+++ b/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml
-@@ -9,7 +9,7 @@
-     <update handle="review_product_form_component"/>
-     <body>
-         <referenceContainer name="content">
--            <block class="Magento\Cookie\Block\RequireCookie" name="require-cookie" template="Magento_Cookie::require_cookie.phtml">
-+            <block class="Magento\Cookie\Block\RequireCookie" name="require-cookie" template="Magento_Cookie::require_cookie.phtml" ifconfig="catalog/review/active">
-                 <arguments>
-                     <argument name="triggers" xsi:type="array">
-                         <item name="submitReviewButton" xsi:type="string">.review .action.submit</item>
-@@ -18,8 +18,11 @@
-             </block>
-         </referenceContainer>
-         <referenceBlock name="product.info.details">
--            <block class="Magento\Review\Block\Product\Review" name="reviews.tab" as="reviews" template="Magento_Review::review.phtml" group="detailed_info">
--                <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form">
-+            <block class="Magento\Review\Block\Product\Review" name="reviews.tab" as="reviews" template="Magento_Review::review.phtml" group="detailed_info" ifconfig="catalog/review/active">
-+                <arguments>
-+                    <argument name="sort_order" xsi:type="string">30</argument>
-+                </arguments>
-+                <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form" ifconfig="catalog/review/active">
-                     <container name="product.review.form.fields.before" as="form_fields_before" label="Review Form Fields Before"/>
-                 </block>
-             </block>
-diff --git a/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml b/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml
-index 0a7ddd8b890..8a853cdd2e4 100644
---- a/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml
-+++ b/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml
-@@ -9,7 +9,7 @@
-     <update handle="catalog_product_view"/>
-     <body>
-         <referenceBlock name="reviews.tab">
--            <block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form">
-+            <block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form" ifconfig="catalog/review/active">
-                 <arguments>
-                     <argument name="jsLayout" xsi:type="array">
-                         <item name="components" xsi:type="array">
-diff --git a/app/code/Magento/Review/view/frontend/layout/customer_account.xml b/app/code/Magento/Review/view/frontend/layout/customer_account.xml
-index 54d171cbf13..9f759dba417 100644
---- a/app/code/Magento/Review/view/frontend/layout/customer_account.xml
-+++ b/app/code/Magento/Review/view/frontend/layout/customer_account.xml
-@@ -8,7 +8,7 @@
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceBlock name="customer_account_navigation">
--            <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-product-reviews-link">
-+            <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-product-reviews-link" ifconfig="catalog/review/active">
-                 <arguments>
-                     <argument name="path" xsi:type="string">review/customer</argument>
-                     <argument name="label" xsi:type="string" translate="true">My Product Reviews</argument>
-diff --git a/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml
-index 73174f0570e..2e898a539a9 100644
---- a/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml
-+++ b/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml
-@@ -8,7 +8,7 @@
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceContainer name="content">
--            <block class="Magento\Review\Block\Customer\Recent" name="customer_account_dashboard_info1" template="Magento_Review::customer/recent.phtml" after="customer_account_dashboard_address" cacheable="false"/>
-+            <block class="Magento\Review\Block\Customer\Recent" name="customer_account_dashboard_info1" template="Magento_Review::customer/recent.phtml" after="customer_account_dashboard_address" cacheable="false" ifconfig="catalog/review/active"/>
-         </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml b/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml
-index 2857e859aa0..b5f75629633 100644
---- a/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml
-+++ b/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml
-@@ -9,7 +9,7 @@
-     <update handle="customer_account"/>
-     <body>
-         <referenceContainer name="content">
--            <block class="Magento\Review\Block\Customer\ListCustomer" name="review_customer_list" template="Magento_Review::customer/list.phtml" cacheable="false"/>
-+            <block class="Magento\Review\Block\Customer\ListCustomer" name="review_customer_list" template="Magento_Review::customer/list.phtml" cacheable="false" ifconfig="catalog/review/active"/>
-         </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml b/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml
-index d51c89a1abe..d3adbd7950c 100644
---- a/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml
-+++ b/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml
-@@ -9,7 +9,7 @@
-     <update handle="customer_account"/>
-     <body>
-         <referenceContainer name="content">
--            <block class="Magento\Review\Block\Customer\View" name="customers_review" cacheable="false"/>
-+            <block class="Magento\Review\Block\Customer\View" name="customers_review" cacheable="false" ifconfig="catalog/review/active"/>
-         </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_list.xml b/app/code/Magento/Review/view/frontend/layout/review_product_list.xml
-index c83cfe95d79..8c5c1297cdd 100644
---- a/app/code/Magento/Review/view/frontend/layout/review_product_list.xml
-+++ b/app/code/Magento/Review/view/frontend/layout/review_product_list.xml
-@@ -9,15 +9,15 @@
-     <update handle="catalog_product_view"/>
-     <body>
-         <referenceContainer name="product.info.main">
--            <block class="Magento\Review\Block\Product\View\Other" name="product.info.other" as="other" template="Magento_Review::product/view/other.phtml" before="product.info.addto"/>
-+            <block class="Magento\Review\Block\Product\View\Other" name="product.info.other" as="other" template="Magento_Review::product/view/other.phtml" before="product.info.addto" ifconfig="catalog/review/active"/>
-         </referenceContainer>
-         <referenceContainer name="content">
-             <container name="product.info.details" htmlTag="div" htmlClass="product info detailed" after="product.info.media">
--                <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form">
-+                <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form" ifconfig="catalog/review/active">
-                     <container name="product.review.form.fields.before" as="form_fields_before" label="Review Form Fields Before" htmlTag="div" htmlClass="rewards"/>
-                 </block>
--                <block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="Magento_Review::product/view/list.phtml"/>
--                <block class="Magento\Theme\Block\Html\Pager" name="product_review_list.toolbar"/>
-+                <block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="Magento_Review::product/view/list.phtml" ifconfig="catalog/review/active"/>
-+                <block class="Magento\Theme\Block\Html\Pager" name="product_review_list.toolbar" ifconfig="catalog/review/active"/>
-             </container>
-         </referenceContainer>
-     </body>
-diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml b/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml
-index af8d2dc2f50..36fa71ea512 100644
---- a/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml
-+++ b/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml
-@@ -7,8 +7,8 @@
- -->
- <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
-     <container name="root">
--        <block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="Magento_Review::product/view/list.phtml" />
--        <block class="Magento\Theme\Block\Html\Pager" name="product_review_list.toolbar">
-+        <block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="Magento_Review::product/view/list.phtml" ifconfig="catalog/review/active"/>
-+        <block class="Magento\Theme\Block\Html\Pager" name="product_review_list.toolbar" ifconfig="catalog/review/active">
-             <arguments>
-                 <argument name="show_per_page" xsi:type="boolean">false</argument>
-                 <argument name="show_amounts" xsi:type="boolean">false</argument>
-diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_view.xml b/app/code/Magento/Review/view/frontend/layout/review_product_view.xml
-index b70aec3f00b..3bfc98cad97 100644
---- a/app/code/Magento/Review/view/frontend/layout/review_product_view.xml
-+++ b/app/code/Magento/Review/view/frontend/layout/review_product_view.xml
-@@ -8,7 +8,7 @@
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceContainer name="content">
--            <block class="Magento\Review\Block\View" name="review_view"/>
-+            <block class="Magento\Review\Block\View" name="review_view" ifconfig="catalog/review/active"/>
-         </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml b/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml
-index 0a7ddd8b890..8a853cdd2e4 100644
---- a/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml
-+++ b/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml
-@@ -9,7 +9,7 @@
-     <update handle="catalog_product_view"/>
-     <body>
-         <referenceBlock name="reviews.tab">
--            <block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form">
-+            <block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form" ifconfig="catalog/review/active">
-                 <arguments>
-                     <argument name="jsLayout" xsi:type="array">
-                         <item name="components" xsi:type="array">
-diff --git a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
-index a65ec01d626..11ea987b74c 100644
---- a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
-+++ b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
-@@ -4,11 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Review\Block\Customer\ListCustomer $block */
- ?>
--<?php if ($block->getReviews() && count($block->getReviews())): ?>
-+<?php if ($block->getReviews() && count($block->getReviews())) : ?>
-     <div class="table-wrapper reviews">
-         <table class="data table table-reviews" id="my-reviews-table">
-             <caption class="table-caption"><?= $block->escapeHtml(__('Product Reviews')) ?></caption>
-@@ -22,7 +20,7 @@
-                 </tr>
-             </thead>
-             <tbody>
--                <?php foreach ($block->getReviews() as $review): ?>
-+                <?php foreach ($block->getReviews() as $review) : ?>
-                 <tr>
-                     <td data-th="<?= $block->escapeHtml(__('Created')) ?>" class="col date"><?= $block->escapeHtml($block->dateFormat($review->getReviewCreatedAt())) ?></td>
-                     <td data-th="<?= $block->escapeHtml(__('Product Name')) ?>" class="col item">
-@@ -31,7 +29,7 @@
-                         </strong>
-                     </td>
-                     <td data-th="<?= $block->escapeHtml(__('Rating')) ?>" class="col summary">
--                    <?php if ($review->getSum()): ?>
-+                    <?php if ($review->getSum()) : ?>
-                         <div class="rating-summary">
-                             <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
-                             <div class="rating-result" title="<?= /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) ?>%">
-@@ -41,7 +39,7 @@
-                     <?php endif; ?>
-                     </td>
-                     <td data-th="<?= $block->escapeHtmlAttr(__('Review')) ?>" class="col description">
--                        <?= $this->helper('Magento\Review\Helper\Data')->getDetailHtml($review->getDetail()) ?>
-+                        <?= $this->helper(\Magento\Review\Helper\Data::class)->getDetailHtml($review->getDetail()) ?>
-                     </td>
-                     <td data-th="<?= $block->escapeHtmlAttr(__('Actions')) ?>" class="col actions">
-                         <a href="<?= $block->escapeUrl($block->getReviewUrl($review)) ?>" class="action more">
-@@ -53,12 +51,12 @@
-             </tbody>
-         </table>
-     </div>
--    <?php if ($block->getToolbarHtml()): ?>
-+    <?php if ($block->getToolbarHtml()) : ?>
-         <div class="toolbar products-reviews-toolbar bottom">
-             <?= $block->getToolbarHtml() ?>
-         </div>
-     <?php endif; ?>
--<?php else: ?>
-+<?php else : ?>
-     <div class="message info empty"><span><?= $block->escapeHtml(__('You have submitted no reviews.')) ?></span></div>
- <?php endif; ?>
- <div class="actions-toolbar">
-diff --git a/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml b/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
-index ed58e383257..5cd81a2f17c 100644
---- a/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
-+++ b/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
-@@ -4,11 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Review\Block\Customer\Recent $block */
- ?>
--<?php if ($block->getReviews() && count($block->getReviews())): ?>
-+<?php if ($block->getReviews() && count($block->getReviews())) : ?>
- <div class="block block-reviews-dashboard">
-     <div class="block-title">
-         <strong><?= $block->escapeHtml(__('My Recent Reviews')) ?></strong>
-@@ -16,11 +14,11 @@
-     </div>
-     <div class="block-content">
-         <ol class="items">
--        <?php foreach ($block->getReviews() as $_review): ?>
-+        <?php foreach ($block->getReviews() as $_review) : ?>
-             <li class="item">
-                 <strong class="product-name"><a href="<?= $block->escapeUrl($block->getReviewUrl($_review->getReviewId())) ?>"><?= $block->escapeHtml($_review->getName()) ?></a></strong>
--                <?php if ($_review->getSum()): ?>
--                <?php $rating = $_review->getSum() / $_review->getCount() ?>
-+                <?php if ($_review->getSum()) : ?>
-+                    <?php $rating = $_review->getSum() / $_review->getCount() ?>
-                     <div class="rating-summary">
-                          <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
-                          <div class="rating-result" title="<?= $block->escapeHtmlAttr($rating) ?>%">
-diff --git a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
-index 4903b154d9f..f92282848b1 100644
---- a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
-+++ b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
-@@ -4,13 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Review\Block\Customer\View $block */
- 
- $product = $block->getProductData();
- ?>
--<?php if ($product->getId()): ?>
-+<?php if ($product->getId()) : ?>
- <div class="customer-review view">
-     <div class="product-details">
-         <div class="product-media">
-@@ -21,7 +19,7 @@ $product = $block->getProductData();
-         </div>
-         <div class="product-info">
-             <h2 class="product-name"><?= $block->escapeHtml($product->getName()) ?></h2>
--            <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
-+            <?php if ($block->getRating() && $block->getRating()->getSize()) : ?>
-                 <span class="rating-average-label"><?= $block->escapeHtml(__('Average Customer Rating:')) ?></span>
-                 <?= $block->getReviewsSummaryHtml($product) ?>
-             <?php endif; ?>
-@@ -29,29 +27,29 @@ $product = $block->getProductData();
-     </div>
- 
-     <div class="review-details">
--        <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
-+        <?php if ($block->getRating() && $block->getRating()->getSize()) : ?>
-             <div class="title">
-                 <strong><?= $block->escapeHtml(__('Your Review')) ?></strong>
-             </div>
-             <div class="customer-review-rating">
--                <?php foreach ($block->getRating() as $_rating): ?>
--                <?php if ($_rating->getPercent()): ?>
--                    <?php $rating = ceil($_rating->getPercent()) ?>
--                    <div class="rating-summary item">
--                        <span class="rating-label"><span><?= $block->escapeHtml($_rating->getRatingCode()) ?></span></span>
--                        <div class="rating-result" title="<?= /* @noEscape */ $rating ?>%">
--                            <span style="width:<?= /* @noEscape */ $rating ?>%">
--                                <span><?= /* @noEscape */ $rating ?>%</span>
--                            </span>
-+                <?php foreach ($block->getRating() as $_rating) : ?>
-+                    <?php if ($_rating->getPercent()) : ?>
-+                        <?php $rating = ceil($_rating->getPercent()) ?>
-+                        <div class="rating-summary item">
-+                            <span class="rating-label"><span><?= $block->escapeHtml($_rating->getRatingCode()) ?></span></span>
-+                            <div class="rating-result" title="<?= /* @noEscape */ $rating ?>%">
-+                                <span style="width:<?= /* @noEscape */ $rating ?>%">
-+                                    <span><?= /* @noEscape */ $rating ?>%</span>
-+                                </span>
-+                            </div>
-                         </div>
--                    </div>
--                <?php endif; ?>
-+                    <?php endif; ?>
-                 <?php endforeach; ?>
-             </div>
-         <?php endif; ?>
- 
-         <div class="review-title"><?= $block->escapeHtml($block->getReviewData()->getTitle()) ?></div>
--        <div class="review-content"><?= nl2br($block->escapeHtml($block->getReviewData()->getDetail())) ?></div>
-+        <div class="review-content"><?= /* @noEscape */ nl2br($block->escapeHtml($block->getReviewData()->getDetail())) ?></div>
-         <div class="review-date">
-             <?= $block->escapeHtml(__('Submitted on %1', '<time class="date">' . $block->dateFormat($block->getReviewData()->getCreatedAt()) . '</time>'), ['time']) ?>
-         </div>
-diff --git a/app/code/Magento/Review/view/frontend/templates/detailed.phtml b/app/code/Magento/Review/view/frontend/templates/detailed.phtml
-index df14955a29e..7b3b0e2dd6d 100644
---- a/app/code/Magento/Review/view/frontend/templates/detailed.phtml
-+++ b/app/code/Magento/Review/view/frontend/templates/detailed.phtml
-@@ -4,17 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Review\Block\Rating\Entity\Detailed $block */
- ?>
--<?php if (!empty($collection) && $collection->getSize()): ?>
-+<?php if (!empty($collection) && $collection->getSize()) : ?>
-     <div class="table-wrapper">
-         <table class="data table ratings review summary">
-             <caption class="table-caption"><?= $block->escapeHtml(__('Ratings Review Summary')) ?></caption>
-             <tbody>
--            <?php foreach ($collection as $_rating): ?>
--                <?php if ($_rating->getSummary()): ?>
-+            <?php foreach ($collection as $_rating) : ?>
-+                <?php if ($_rating->getSummary()) : ?>
-                     <tr>
-                         <th class="label" scope="row"><?= $block->escapeHtml(__($_rating->getRatingCode())) ?></th>
-                         <td class="value">
-diff --git a/app/code/Magento/Review/view/frontend/templates/empty.phtml b/app/code/Magento/Review/view/frontend/templates/empty.phtml
-index 4328a135a98..9efdd340814 100644
---- a/app/code/Magento/Review/view/frontend/templates/empty.phtml
-+++ b/app/code/Magento/Review/view/frontend/templates/empty.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Review\Block\Rating\Entity\Detailed $block */
- ?>
- <p class="no-rating"><a href="#review-form"><?= $block->escapeHtml(__('Be the first to review this product')) ?></a></p>
-diff --git a/app/code/Magento/Review/view/frontend/templates/form.phtml b/app/code/Magento/Review/view/frontend/templates/form.phtml
-index 71295d15f86..f1340945043 100644
---- a/app/code/Magento/Review/view/frontend/templates/form.phtml
-+++ b/app/code/Magento/Review/view/frontend/templates/form.phtml
-@@ -4,31 +4,29 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Review\Block\Form $block */
- ?>
- <div class="block review-add">
-     <div class="block-title"><strong><?= $block->escapeHtml(__('Write Your Own Review')) ?></strong></div>
- <div class="block-content">
--<?php if ($block->getAllowWriteReviewFlag()): ?>
-+<?php if ($block->getAllowWriteReviewFlag()) : ?>
- <form action="<?= $block->escapeUrl($block->getAction()) ?>" class="review-form" method="post" id="review-form" data-role="product-review-form" data-bind="scope: 'review-form'">
-     <?= $block->getBlockHtml('formkey') ?>
-     <?= $block->getChildHtml('form_fields_before') ?>
-     <fieldset class="fieldset review-fieldset" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
-         <legend class="legend review-legend"><span><?= $block->escapeHtml(__("You're reviewing:")) ?></span><strong><?= $block->escapeHtml($block->getProductInfo()->getName()) ?></strong></legend><br />
--        <?php if ($block->getRatings() && $block->getRatings()->getSize()): ?>
-+        <?php if ($block->getRatings() && $block->getRatings()->getSize()) : ?>
-         <span id="input-message-box"></span>
-         <fieldset class="field required review-field-ratings">
-             <legend class="label"><span><?= $block->escapeHtml(__('Your Rating')) ?></span></legend><br/>
-             <div class="control">
-                 <div class="nested" id="product-review-table">
--                    <?php foreach ($block->getRatings() as $_rating): ?>
-+                    <?php foreach ($block->getRatings() as $_rating) : ?>
-                         <div class="field choice review-field-rating">
-                             <label class="label" id="<?= $block->escapeHtml($_rating->getRatingCode()) ?>_rating_label"><span><?= $block->escapeHtml($_rating->getRatingCode()) ?></span></label>
-                             <div class="control review-control-vote">
-                             <?php $options = $_rating->getOptions();?>
--                            <?php $iterator = 1; foreach ($options as $_option): ?>
-+                            <?php $iterator = 1; foreach ($options as $_option) : ?>
-                                 <input
-                                     type="radio"
-                                     name="ratings[<?= $block->escapeHtmlAttr($_rating->getId()) ?>]"
-@@ -44,7 +42,7 @@
-                                     id="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>_label">
-                                     <span><?= $block->escapeHtml(__('%1 %2', $iterator, $iterator > 1 ? __('stars') : __('star'))) ?></span>
-                                 </label>
--                            <?php $iterator++; ?>
-+                                <?php $iterator++; ?>
-                             <?php endforeach; ?>
-                             </div>
-                         </div>
-@@ -90,7 +88,7 @@
-     }
- }
- </script>
--<?php else: ?>
-+<?php else : ?>
-     <div class="message info notlogged" id="review-form">
-         <div>
-             <?= $block->escapeHtml(__('Only registered users can write reviews. Please <a href="%1">Sign in</a> or <a href="%2">create an account</a>', $block->getLoginLink(), $block->getRegisterUrl()), ['a']) ?>
-diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
-index da689960dfe..b042b5e92cb 100644
---- a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
-+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
-@@ -4,43 +4,41 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Review\Block\Product\ReviewRenderer $block */
- 
- $url = $block->getReviewsUrl() . '#reviews';
- $urlForm = $block->getReviewsUrl() . '#review-form';
- ?>
--<?php if ($block->getReviewsCount()): ?>
--<?php $rating = $block->getRatingSummary(); ?>
--<div class="product-reviews-summary<?= !$rating ? ' no-rating' : '' ?>" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
--    <?php if ($rating):?>
--    <div class="rating-summary">
--         <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
--         <div class="rating-result" title="<?= $block->escapeHtmlAttr($rating); ?>%">
--             <span style="width:<?= $block->escapeHtmlAttr($rating); ?>%">
--                 <span>
--                     <span itemprop="ratingValue"><?= $block->escapeHtml($rating); ?></span>% of <span itemprop="bestRating">100</span>
-+<?php if ($block->isReviewEnabled() && $block->getReviewsCount()) : ?>
-+    <?php $rating = $block->getRatingSummary(); ?>
-+    <div class="product-reviews-summary<?= !$rating ? ' no-rating' : '' ?>" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
-+        <?php if ($rating) :?>
-+        <div class="rating-summary">
-+             <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
-+             <div class="rating-result" title="<?= $block->escapeHtmlAttr($rating); ?>%">
-+                 <span style="width:<?= $block->escapeHtmlAttr($rating); ?>%">
-+                     <span>
-+                         <span itemprop="ratingValue"><?= $block->escapeHtml($rating); ?></span>% of <span itemprop="bestRating">100</span>
-+                     </span>
-                  </span>
--             </span>
-+             </div>
-          </div>
--     </div>
--    <?php endif;?>
--    <div class="reviews-actions">
--        <a class="action view"
--           href="<?= $block->escapeUrl($url) ?>">
--            <span itemprop="reviewCount"><?= $block->escapeHtml($block->getReviewsCount()) ?></span>&nbsp;
--            <span><?= ($block->getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?></span>
--        </a>
--        <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>"><?= $block->escapeHtml(__('Add Your Review')) ?></a>
-+        <?php endif;?>
-+        <div class="reviews-actions">
-+            <a class="action view"
-+               href="<?= $block->escapeUrl($url) ?>">
-+                <span itemprop="reviewCount"><?= $block->escapeHtml($block->getReviewsCount()) ?></span>&nbsp;
-+                <span><?= ($block->getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?></span>
-+            </a>
-+            <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>"><?= $block->escapeHtml(__('Add Your Review')) ?></a>
-+        </div>
-     </div>
--</div>
--<?php elseif ($block->getDisplayIfEmpty()): ?>
--<div class="product-reviews-summary empty">
--    <div class="reviews-actions">
--        <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
--            <?= $block->escapeHtml(__('Be the first to review this product')) ?>
--        </a>
-+<?php elseif ($block->isReviewEnabled() && $block->getDisplayIfEmpty()) : ?>
-+    <div class="product-reviews-summary empty">
-+        <div class="reviews-actions">
-+            <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
-+                <?= $block->escapeHtml(__('Be the first to review this product')) ?>
-+            </a>
-+        </div>
-     </div>
--</div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
-index c3eb11f03fd..7ea84c952ea 100644
---- a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
-+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
-@@ -4,34 +4,32 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Review\Block\Product\ReviewRenderer $block */
- 
- $url = $block->getReviewsUrl() . '#reviews';
- $urlForm = $block->getReviewsUrl() . '#review-form';
- ?>
--<?php if ($block->getReviewsCount()): ?>
--<?php $rating = $block->getRatingSummary(); ?>
--<div class="product-reviews-summary short<?= !$rating ? ' no-rating' : '' ?>">
--    <?php if ($rating):?>
--    <div class="rating-summary">
--        <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
--        <div class="rating-result" title="<?= $block->escapeHtmlAttr($rating) ?>%">
--            <span style="width:<?= $block->escapeHtmlAttr($rating) ?>%"><span><?= $block->escapeHtml($rating) ?>%</span></span>
-+<?php if ($block->isReviewEnabled() && $block->getReviewsCount()) : ?>
-+    <?php $rating = $block->getRatingSummary(); ?>
-+    <div class="product-reviews-summary short<?= !$rating ? ' no-rating' : '' ?>">
-+        <?php if ($rating) :?>
-+        <div class="rating-summary">
-+            <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
-+            <div class="rating-result" title="<?= $block->escapeHtmlAttr($rating) ?>%">
-+                <span style="width:<?= $block->escapeHtmlAttr($rating) ?>%"><span><?= $block->escapeHtml($rating) ?>%</span></span>
-+            </div>
-+        </div>
-+        <?php endif;?>
-+        <div class="reviews-actions">
-+            <a class="action view" href="<?= $block->escapeUrl($url) ?>"><?= $block->escapeHtml($block->getReviewsCount()) ?>&nbsp;<span><?= ($block->getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?></span></a>
-         </div>
-     </div>
--    <?php endif;?>
--    <div class="reviews-actions">
--        <a class="action view" href="<?= $block->escapeUrl($url) ?>"><?= $block->escapeHtml($block->getReviewsCount()) ?>&nbsp;<span><?= ($block->getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?></span></a>
--    </div>
--</div>
--<?php elseif ($block->getDisplayIfEmpty()): ?>
--<div class="product-reviews-summary short empty">
--    <div class="reviews-actions">
--        <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
--            <?= $block->escapeHtml(__('Be the first to review this product')) ?>
--        </a>
-+<?php elseif ($block->isReviewEnabled() && $block->getDisplayIfEmpty()) : ?>
-+    <div class="product-reviews-summary short empty">
-+        <div class="reviews-actions">
-+            <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
-+                <?= $block->escapeHtml(__('Be the first to review this product')) ?>
-+            </a>
-+        </div>
-     </div>
--</div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml
-index bff1c48508e..cd98ab3c4cc 100644
---- a/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml
-+++ b/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml
-@@ -4,9 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- // @deprecated
- ?>
--<?php if (!empty($count)):?>
-+<?php if (!empty($count)) : ?>
-     <a href="#customer-reviews" class="nobr"><?= $block->escapeHtml(__('%1 Review(s)', $count)) ?></a>
- <?php endif;?>
-diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
-index dc02853e77b..347686d5c2b 100644
---- a/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
-+++ b/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
-@@ -4,14 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var Magento\Review\Block\Product\View\ListView $block */
- 
- $_items = $block->getReviewsCollection()->getItems();
- $format = $block->getDateFormat() ?: \IntlDateFormatter::SHORT;
- ?>
--<?php if (count($_items)):?>
-+<?php if (count($_items)) : ?>
- <div class="block review-list" id="customer-reviews">
-     <div class="block-title">
-         <strong><?= $block->escapeHtml(__('Customer Reviews')) ?></strong>
-@@ -21,17 +19,17 @@ $format = $block->getDateFormat() ?: \IntlDateFormatter::SHORT;
-             <?= $block->getChildHtml('toolbar') ?>
-         </div>
-         <ol class="items review-items">
--        <?php foreach ($_items as $_review):?>
-+        <?php foreach ($_items as $_review) : ?>
-             <li class="item review-item" itemscope itemprop="review" itemtype="http://schema.org/Review">
-                 <div class="review-title" itemprop="name"><?= $block->escapeHtml($_review->getTitle()) ?></div>
--                <?php if (count($_review->getRatingVotes())): ?>
-+                <?php if (count($_review->getRatingVotes())) : ?>
-                     <div class="review-ratings">
--                    <?php foreach ($_review->getRatingVotes() as $_vote): ?>
-+                    <?php foreach ($_review->getRatingVotes() as $_vote) : ?>
-                     <div class="rating-summary item" itemprop="reviewRating" itemscope itemtype="http://schema.org/Rating">
-                         <span class="label rating-label"><span><?= $block->escapeHtml($_vote->getRatingCode()) ?></span></span>
-                         <div class="rating-result" title="<?= $block->escapeHtmlAttr($_vote->getPercent()) ?>%">
--	                        <meta itemprop="worstRating" content = "1"/>
--	                        <meta itemprop="bestRating" content = "100"/>
-+                            <meta itemprop="worstRating" content = "1"/>
-+                            <meta itemprop="bestRating" content = "100"/>
-                             <span style="width:<?= $block->escapeHtmlAttr($_vote->getPercent()) ?>%">
-                                 <span itemprop="ratingValue"><?= $block->escapeHtml($_vote->getPercent()) ?>%</span>
-                             </span>
-@@ -41,7 +39,7 @@ $format = $block->getDateFormat() ?: \IntlDateFormatter::SHORT;
-                     </div>
-                 <?php endif; ?>
-                 <div class="review-content" itemprop="description">
--                    <?= nl2br($block->escapeHtml($_review->getDetail())) ?>
-+                    <?= /* @noEscape */ nl2br($block->escapeHtml($_review->getDetail())) ?>
-                 </div>
-                 <div class="review-details">
-                     <p class="review-author">
-diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml
-index 48d668ca85a..686bd8b117b 100644
---- a/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml
-+++ b/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Review\Block\Product\View\Other $block */
- ?>
- <?php $_product = $block->getProduct(); ?>
-diff --git a/app/code/Magento/Review/view/frontend/templates/redirect.phtml b/app/code/Magento/Review/view/frontend/templates/redirect.phtml
-index 2fdb5e90a9c..aad4d9066cb 100644
---- a/app/code/Magento/Review/view/frontend/templates/redirect.phtml
-+++ b/app/code/Magento/Review/view/frontend/templates/redirect.phtml
-@@ -3,11 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
-+    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-     header("Location:{$block->getProduct()->getProductUrl()}#info-product_reviews");
-+    // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-     exit;
- ?>
-diff --git a/app/code/Magento/Review/view/frontend/templates/view.phtml b/app/code/Magento/Review/view/frontend/templates/view.phtml
-index 205ce5c2057..1c3d1942dd2 100644
---- a/app/code/Magento/Review/view/frontend/templates/view.phtml
-+++ b/app/code/Magento/Review/view/frontend/templates/view.phtml
-@@ -4,11 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Review\Block\View $block */
- ?>
--<?php if ($block->getProductData()->getId()): ?>
-+<?php if ($block->getProductData()->getId()) : ?>
- <div class="product-review">
-     <div class="page-title-wrapper">
-         <h1><?= $block->escapeHtml(__('Review Details')) ?></h1>
-@@ -17,20 +15,20 @@
-         <a href="<?= $block->escapeUrl($block->getProductData()->getProductUrl()) ?>">
-             <?= $block->getImage($block->getProductData(), 'product_base_image', ['class' => 'product-image'])->toHtml() ?>
-         </a>
--        <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
--          <p><?= $block->escapeHtml(__('Average Customer Rating')) ?>:</p>
--          <?= $block->getReviewsSummaryHtml($block->getProductData()) ?>
-+        <?php if ($block->getRating() && $block->getRating()->getSize()) : ?>
-+            <p><?= $block->escapeHtml(__('Average Customer Rating')) ?>:</p>
-+            <?= $block->getReviewsSummaryHtml($block->getProductData()) ?>
-         <?php endif; ?>
-     </div>
-     <div class="details">
-         <h3 class="product-name"><?= $block->escapeHtml($block->getProductData()->getName()) ?></h3>
--        <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
-+        <?php if ($block->getRating() && $block->getRating()->getSize()) : ?>
-             <h4><?= $block->escapeHtml(__('Product Rating:')) ?></h4>
-             <div class="table-wrapper">
-                 <table class="data-table review-summary-table">
-                     <caption class="table-caption"><?= $block->escapeHtml(__('Product Rating')) ?></caption>
--                    <?php foreach ($block->getRating() as $_rating): ?>
--                        <?php if ($_rating->getPercent()): ?>
-+                    <?php foreach ($block->getRating() as $_rating) : ?>
-+                        <?php if ($_rating->getPercent()) : ?>
-                             <tr>
-                                 <td class="label"><?= $block->escapeHtml(__($_rating->getRatingCode())) ?></td>
-                                 <td class="value">
-@@ -44,7 +42,7 @@
-             </div>
-         <?php endif; ?>
-         <p class="date"><?= $block->escapeHtml(__('Product Review (submitted on %1):', $block->dateFormat($block->getReviewData()->getCreatedAt()))) ?></p>
--        <p><?= nl2br($block->escapeHtml($block->getReviewData()->getDetail())) ?></p>
-+        <p><?= /* @noEscape */ nl2br($block->escapeHtml($block->getReviewData()->getDetail())) ?></p>
-     </div>
-     <div class="actions">
-         <div class="secondary">
-diff --git a/app/code/Magento/Review/view/frontend/web/js/process-reviews.js b/app/code/Magento/Review/view/frontend/web/js/process-reviews.js
-index d1c40959e3e..9d1083d662d 100644
---- a/app/code/Magento/Review/view/frontend/web/js/process-reviews.js
-+++ b/app/code/Magento/Review/view/frontend/web/js/process-reviews.js
-@@ -20,7 +20,7 @@ define([
-             showLoader: false,
-             loaderContext: $('.product.data.items')
-         }).done(function (data) {
--            $('#product-review-container').html(data);
-+            $('#product-review-container').html(data).trigger('contentUpdated');
-             $('[data-role="product-review"] .pages a').each(function (index, element) {
-                 $(element).click(function (event) { //eslint-disable-line max-nested-callbacks
-                     processReviews($(element).attr('href'), true);
-@@ -41,7 +41,7 @@ define([
-             requiredReviewTabRole = 'tab';
- 
-         if (reviewTab.attr('role') === requiredReviewTabRole && reviewTab.hasClass('active')) {
--            processReviews(config.productReviewUrl);
-+            processReviews(config.productReviewUrl, location.hash === '#reviews');
-         } else {
-             reviewTab.one('beforeOpen', function () {
-                 processReviews(config.productReviewUrl);
-@@ -50,18 +50,23 @@ define([
- 
-         $(function () {
-             $('.product-info-main .reviews-actions a').click(function (event) {
--                var anchor;
-+                var anchor, addReviewBlock;
- 
-                 event.preventDefault();
-                 anchor = $(this).attr('href').replace(/^.*?(#|$)/, '');
--                $('.product.data.items [data-role="content"]').each(function (index) { //eslint-disable-line
--                    if (this.id == 'reviews') { //eslint-disable-line eqeqeq
--                        $('.product.data.items').tabs('activate', index);
--                        $('html, body').animate({
--                            scrollTop: $('#' + anchor).offset().top - 50
--                        }, 300);
--                    }
--                });
-+                addReviewBlock = $('.block.review-add .block-content #' + anchor);
-+
-+                if (addReviewBlock.length) {
-+                    $('.product.data.items [data-role="content"]').each(function (index) { //eslint-disable-line
-+                        if (this.id == 'reviews') { //eslint-disable-line eqeqeq
-+                            $('.product.data.items').tabs('activate', index);
-+                        }
-+                    });
-+                    $('html, body').animate({
-+                        scrollTop: addReviewBlock.offset().top - 50
-+                    }, 300);
-+                }
-+
-             });
-         });
-     };
-diff --git a/app/code/Magento/ReviewAnalytics/README.md b/app/code/Magento/ReviewAnalytics/README.md
-index b078083dfb7..a8894f99ed0 100644
---- a/app/code/Magento/ReviewAnalytics/README.md
-+++ b/app/code/Magento/ReviewAnalytics/README.md
-@@ -1,3 +1,3 @@
- # Magento_ReviewAnalytics module
- 
--The Magento_ReviewAnalytics module configures data definitions for a data collection related to the Review module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
-+The Magento_ReviewAnalytics module configures data definitions for a data collection related to the Review module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
-diff --git a/app/code/Magento/ReviewAnalytics/composer.json b/app/code/Magento/ReviewAnalytics/composer.json
-index 73f53445158..a82d4328ca1 100644
---- a/app/code/Magento/ReviewAnalytics/composer.json
-+++ b/app/code/Magento/ReviewAnalytics/composer.json
-@@ -4,7 +4,8 @@
-     "require": {
-         "php": "~7.1.3||~7.2.0",
-         "magento/framework": "*",
--        "magento/module-review": "*"
-+        "magento/module-review": "*",
-+        "magento/module-analytics": "*"
-     },
-     "type": "magento2-module",
-     "license": [
-diff --git a/app/code/Magento/Robots/Block/Data.php b/app/code/Magento/Robots/Block/Data.php
-index 0e492eb7373..460225d3ed7 100644
---- a/app/code/Magento/Robots/Block/Data.php
-+++ b/app/code/Magento/Robots/Block/Data.php
-@@ -11,9 +11,11 @@ use Magento\Framework\View\Element\Context;
- use Magento\Robots\Model\Config\Value;
- use Magento\Robots\Model\Robots;
- use Magento\Store\Model\StoreResolver;
-+use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * Robots Block Class.
-+ *
-  * Prepares base content for robots.txt and implements Page Cache functionality.
-  *
-  * @api
-@@ -27,24 +29,29 @@ class Data extends AbstractBlock implements IdentityInterface
-     private $robots;
- 
-     /**
--     * @var StoreResolver
-+     * @var StoreManagerInterface
-      */
--    private $storeResolver;
-+    private $storeManager;
- 
-     /**
-      * @param Context $context
-      * @param Robots $robots
-      * @param StoreResolver $storeResolver
-+     * @param StoreManagerInterface|null $storeManager
-      * @param array $data
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         Context $context,
-         Robots $robots,
-         StoreResolver $storeResolver,
-+        StoreManagerInterface $storeManager = null,
-         array $data = []
-     ) {
-         $this->robots = $robots;
--        $this->storeResolver = $storeResolver;
-+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(StoreManagerInterface::class);
- 
-         parent::__construct($context, $data);
-     }
-@@ -69,7 +76,7 @@ class Data extends AbstractBlock implements IdentityInterface
-     public function getIdentities()
-     {
-         return [
--            Value::CACHE_TAG . '_' . $this->storeResolver->getCurrentStoreId(),
-+            Value::CACHE_TAG . '_' . $this->storeManager->getStore()->getId(),
-         ];
-     }
- }
-diff --git a/app/code/Magento/Robots/Model/Config/Value.php b/app/code/Magento/Robots/Model/Config/Value.php
-index 83c21d6602f..16a5a486e10 100644
---- a/app/code/Magento/Robots/Model/Config/Value.php
-+++ b/app/code/Magento/Robots/Model/Config/Value.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Robots\Model\Config;
- 
- use Magento\Framework\App\Cache\TypeListInterface;
-@@ -14,9 +15,11 @@ use Magento\Framework\Model\Context;
- use Magento\Framework\Model\ResourceModel\AbstractResource;
- use Magento\Framework\Registry;
- use Magento\Store\Model\StoreResolver;
-+use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * Backend model for design/search_engine_robots/custom_instructions configuration value.
-+ *
-  * Required to implement Page Cache functionality.
-  *
-  * @api
-@@ -30,17 +33,16 @@ class Value extends ConfigValue implements IdentityInterface
-     const CACHE_TAG = 'robots';
- 
-     /**
--     * Model cache tag for clear cache in after save and after delete
-+     * @inheritdoc
-      *
--     * @var string
-      * @since 100.2.0
-      */
--    protected $_cacheTag = true;
-+    protected $_cacheTag = [self::CACHE_TAG];
- 
-     /**
--     * @var StoreResolver
-+     * @var StoreManagerInterface
-      */
--    private $storeResolver;
-+    private $storeManager;
- 
-     /**
-      * @param Context $context
-@@ -48,9 +50,12 @@ class Value extends ConfigValue implements IdentityInterface
-      * @param ScopeConfigInterface $config
-      * @param TypeListInterface $cacheTypeList
-      * @param StoreResolver $storeResolver
-+     * @param StoreManagerInterface|null $storeManager
-      * @param AbstractResource|null $resource
-      * @param AbstractDb|null $resourceCollection
-      * @param array $data
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         Context $context,
-@@ -58,11 +63,13 @@ class Value extends ConfigValue implements IdentityInterface
-         ScopeConfigInterface $config,
-         TypeListInterface $cacheTypeList,
-         StoreResolver $storeResolver,
-+        StoreManagerInterface $storeManager = null,
-         AbstractResource $resource = null,
-         AbstractDb $resourceCollection = null,
-         array $data = []
-     ) {
--        $this->storeResolver = $storeResolver;
-+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(StoreManagerInterface::class);
- 
-         parent::__construct(
-             $context,
-@@ -84,7 +91,7 @@ class Value extends ConfigValue implements IdentityInterface
-     public function getIdentities()
-     {
-         return [
--            self::CACHE_TAG . '_' . $this->storeResolver->getCurrentStoreId(),
-+            self::CACHE_TAG . '_' . $this->storeManager->getStore()->getId(),
-         ];
-     }
- }
-diff --git a/app/code/Magento/Robots/Test/Unit/Block/DataTest.php b/app/code/Magento/Robots/Test/Unit/Block/DataTest.php
-index 10d2595832a..95aa97fc8f6 100644
---- a/app/code/Magento/Robots/Test/Unit/Block/DataTest.php
-+++ b/app/code/Magento/Robots/Test/Unit/Block/DataTest.php
-@@ -27,6 +27,11 @@ class DataTest extends \PHPUnit\Framework\TestCase
-      */
-     private $storeResolver;
- 
-+    /**
-+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $storeManager;
-+
-     /**
-      * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -65,10 +70,14 @@ class DataTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-+            ->getMockForAbstractClass();
-+
-         $this->block = new \Magento\Robots\Block\Data(
-             $this->context,
-             $this->robots,
--            $this->storeResolver
-+            $this->storeResolver,
-+            $this->storeManager
-         );
-     }
- 
-@@ -97,8 +106,14 @@ class DataTest extends \PHPUnit\Framework\TestCase
-     {
-         $storeId = 1;
- 
--        $this->storeResolver->expects($this->once())
--            ->method('getCurrentStoreId')
-+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMock();
-+
-+        $this->storeManager->expects($this->once())
-+            ->method('getStore')
-+            ->willReturn($storeMock);
-+
-+        $storeMock->expects($this->once())
-+            ->method('getId')
-             ->willReturn($storeId);
- 
-         $expected = [
-diff --git a/app/code/Magento/Robots/Test/Unit/Model/Config/ValueTest.php b/app/code/Magento/Robots/Test/Unit/Model/Config/ValueTest.php
-index fc0c55ccef1..44e843e7de9 100644
---- a/app/code/Magento/Robots/Test/Unit/Model/Config/ValueTest.php
-+++ b/app/code/Magento/Robots/Test/Unit/Model/Config/ValueTest.php
-@@ -37,6 +37,11 @@ class ValueTest extends \PHPUnit\Framework\TestCase
-      */
-     private $storeResolver;
- 
-+    /**
-+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $storeManager;
-+
-     protected function setUp()
-     {
-         $this->context = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
-@@ -57,12 +62,16 @@ class ValueTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-+            ->getMockForAbstractClass();
-+
-         $this->model = new \Magento\Robots\Model\Config\Value(
-             $this->context,
-             $this->registry,
-             $this->scopeConfig,
-             $this->typeList,
--            $this->storeResolver
-+            $this->storeResolver,
-+            $this->storeManager
-         );
-     }
- 
-@@ -73,8 +82,14 @@ class ValueTest extends \PHPUnit\Framework\TestCase
-     {
-         $storeId = 1;
- 
--        $this->storeResolver->expects($this->once())
--            ->method('getCurrentStoreId')
-+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMockForAbstractClass();
-+
-+        $this->storeManager->expects($this->once())
-+            ->method('getStore')
-+            ->willReturn($storeMock);
-+
-+        $storeMock->expects($this->once())
-+            ->method('getId')
-             ->willReturn($storeId);
- 
-         $expected = [
-diff --git a/app/code/Magento/Robots/view/frontend/templates/robots.phtml b/app/code/Magento/Robots/view/frontend/templates/robots.phtml
-index 644445bf106..e5f14b98d65 100644
---- a/app/code/Magento/Robots/view/frontend/templates/robots.phtml
-+++ b/app/code/Magento/Robots/view/frontend/templates/robots.phtml
-@@ -3,4 +3,4 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--?><?= $layoutContent;
-+?><?= /* @noEscape */ $layoutContent; ?>
-diff --git a/app/code/Magento/Rss/view/frontend/templates/feeds.phtml b/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
-index 22328e9188e..267973f51c7 100644
---- a/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
-+++ b/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Rss\Block\Feeds $block */
- 
- ?>
-@@ -13,15 +11,15 @@
-     <caption class="table-caption"><?= $block->escapeHtml(__('Feed')) ?></caption>
-     <tbody>
-         <th colspan="2" scope="col"><?= $block->escapeHtml(__('Miscellaneous Feeds')) ?></th>
--    <?php foreach ($block->getFeeds() as $feed): ?>
--        <?php if (!isset($feed['group'])): ?>
-+    <?php foreach ($block->getFeeds() as $feed) : ?>
-+        <?php if (!isset($feed['group'])) : ?>
-         <tr>
-             <td class="col feed"><?= $block->escapeHtml($feed['label']) ?></td>
-             <td class="col action">
-                 <a href="<?= $block->escapeUrl($feed['link']) ?>" class="action get"><span><?= $block->escapeHtml(__('Get Feed')) ?></span></a>
-             </td>
-         </tr>
--        <?php else: ?>
-+        <?php else : ?>
-             <th colspan="2" scope="col"><?= $block->escapeHtml($feed['group']) ?></th>
-             <?php foreach ($feed['feeds'] as $item) :?>
-                 <tr>
-diff --git a/app/code/Magento/Rule/Block/Editable.php b/app/code/Magento/Rule/Block/Editable.php
-index 67e4671236e..0ea85dcff36 100644
---- a/app/code/Magento/Rule/Block/Editable.php
-+++ b/app/code/Magento/Rule/Block/Editable.php
-@@ -9,6 +9,8 @@ use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
- use Magento\Framework\View\Element\AbstractBlock;
- 
- /**
-+ * Renderer for Editable sales rules
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -52,15 +54,15 @@ class Editable extends AbstractBlock implements RendererInterface
- 
-         if ($element->getShowAsText()) {
-             $html = ' <input type="hidden" class="hidden" id="' .
--                $element->getHtmlId() .
-+                $this->escapeHtmlAttr($element->getHtmlId()) .
-                 '" name="' .
--                $element->getName() .
-+                $this->escapeHtmlAttr($element->getName()) .
-                 '" value="' .
-                 $element->getValue() .
-                 '" data-form-part="' .
-                 $element->getData('data-form-part') .
-                 '"/> ' .
--                htmlspecialchars(
-+                $this->escapeHtml(
-                     $valueName
-                 ) . '&nbsp;';
-         } else {
-diff --git a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
-index a1987f67e47..6729fe722de 100644
---- a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
-+++ b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
-@@ -62,7 +62,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     protected $_layout;
- 
-     /**
--     * Base name for hidden elements
-+     * Base name for hidden elements.
-+     *
-      * @var string
-      */
-     protected $elementName = 'rule';
-@@ -105,8 +106,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-                 'string' => ['==', '!=', '>=', '>', '<=', '<', '{}', '!{}', '()', '!()'],
-                 'numeric' => ['==', '!=', '>=', '>', '<=', '<', '()', '!()'],
-                 'date' => ['==', '>=', '<='],
--                'select' => ['==', '!='],
--                'boolean' => ['==', '!='],
-+                'select' => ['==', '!=', '<=>'],
-+                'boolean' => ['==', '!=', '<=>'],
-                 'multiselect' => ['{}', '!{}', '()', '!()'],
-                 'grid' => ['()', '!()'],
-             ];
-@@ -116,8 +117,9 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
--     * Default operator options getter
--     * Provides all possible operator options
-+     * Default operator options getter.
-+     *
-+     * Provides all possible operator options.
-      *
-      * @return array
-      */
-@@ -135,12 +137,15 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-                 '!{}' => __('does not contain'),
-                 '()' => __('is one of'),
-                 '!()' => __('is not one of'),
-+                '<=>' => __('is undefined'),
-             ];
-         }
-         return $this->_defaultOperatorOptions;
-     }
- 
-     /**
-+     * Get rule form.
-+     *
-      * @return Form
-      */
-     public function getForm()
-@@ -149,6 +154,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get condition as array.
-+     *
-      * @param array $arrAttributes
-      * @return array
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-@@ -195,6 +202,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get condition as xml.
-+     *
-      * @return string
-      */
-     public function asXml()
-@@ -214,6 +223,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Load condition from array.
-+     *
-      * @param array $arr
-      * @return $this
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-@@ -229,6 +240,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Load condition from xml.
-+     *
-      * @param string|array $xml
-      * @return $this
-      */
-@@ -242,6 +255,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Load attribute options.
-+     *
-      * @return $this
-      */
-     public function loadAttributeOptions()
-@@ -250,6 +265,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get attribute options.
-+     *
-      * @return array
-      */
-     public function getAttributeOptions()
-@@ -258,6 +275,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get attribute select options.
-+     *
-      * @return array
-      */
-     public function getAttributeSelectOptions()
-@@ -270,6 +289,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get attribute name.
-+     *
-      * @return string
-      */
-     public function getAttributeName()
-@@ -278,6 +299,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Load operator options.
-+     *
-      * @return $this
-      */
-     public function loadOperatorOptions()
-@@ -300,6 +323,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get operator select options.
-+     *
-      * @return array
-      */
-     public function getOperatorSelectOptions()
-@@ -316,6 +341,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get operator name.
-+     *
-      * @return array
-      */
-     public function getOperatorName()
-@@ -324,6 +351,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Load value options.
-+     *
-      * @return $this
-      */
-     public function loadValueOptions()
-@@ -333,6 +362,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get value select options.
-+     *
-      * @return array
-      */
-     public function getValueSelectOptions()
-@@ -380,6 +411,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get value.
-+     *
-      * @return mixed
-      */
-     public function getValue()
-@@ -395,6 +428,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get value name.
-+     *
-      * @return array|string
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-@@ -446,6 +481,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get new child name.
-+     *
-      * @return string
-      */
-     public function getNewChildName()
-@@ -454,6 +491,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get this condition as html.
-+     *
-      * @return string
-      */
-     public function asHtml()
-@@ -467,6 +506,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get this condition with subconditions as html.
-+     *
-      * @return string
-      */
-     public function asHtmlRecursive()
-@@ -475,6 +516,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get type element.
-+     *
-      * @return AbstractElement
-      */
-     public function getTypeElement()
-@@ -493,6 +536,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get type element html.
-+     *
-      * @return string
-      */
-     public function getTypeElementHtml()
-@@ -501,6 +546,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get attribute element.
-+     *
-      * @return $this
-      */
-     public function getAttributeElement()
-@@ -528,6 +575,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get attribute element html.
-+     *
-      * @return string
-      */
-     public function getAttributeElementHtml()
-@@ -536,8 +585,9 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
--     * Retrieve Condition Operator element Instance
--     * If the operator value is empty - define first available operator value as default
-+     * Retrieve Condition Operator element Instance.
-+     *
-+     * If the operator value is empty - define first available operator value as default.
-      *
-      * @return \Magento\Framework\Data\Form\Element\Select
-      */
-@@ -568,6 +618,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get operator element html.
-+     *
-      * @return string
-      */
-     public function getOperatorElementHtml()
-@@ -587,6 +639,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get value element renderer.
-+     *
-      * @return \Magento\Rule\Block\Editable
-      */
-     public function getValueElementRenderer()
-@@ -598,6 +652,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get value element.
-+     *
-      * @return $this
-      */
-     public function getValueElement()
-@@ -615,6 +671,9 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-             // date format intentionally hard-coded
-             $elementParams['input_format'] = \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT;
-             $elementParams['date_format'] = \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT;
-+            $elementParams['placeholder'] = \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT;
-+            $elementParams['autocomplete'] = 'off';
-+            $elementParams['readonly'] = 'true';
-         }
-         return $this->getForm()->addField(
-             $this->getPrefix() . '__' . $this->getId() . '__value',
-@@ -626,6 +685,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get value element html.
-+     *
-      * @return string
-      */
-     public function getValueElementHtml()
-@@ -634,6 +695,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get add link html.
-+     *
-      * @return string
-      */
-     public function getAddLinkHtml()
-@@ -643,6 +706,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get remove link html.
-+     *
-      * @return string
-      */
-     public function getRemoveLinkHtml()
-@@ -655,6 +720,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get chooser container html.
-+     *
-      * @return string
-      */
-     public function getChooserContainerHtml()
-@@ -664,6 +731,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get this condition as string.
-+     *
-      * @param string $format
-      * @return string
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-@@ -674,6 +743,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Get this condition with subconditions as string.
-+     *
-      * @param int $level
-      * @return string
-      */
-@@ -816,6 +887,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
-     }
- 
-     /**
-+     * Validate model.
-+     *
-      * @param \Magento\Framework\Model\AbstractModel $model
-      * @return bool
-      */
-diff --git a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
-index 5ab1379b96c..e216e2ae658 100644
---- a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
-+++ b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
-@@ -95,8 +95,8 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
-      * @param \Magento\Catalog\Model\ResourceModel\Product $productResource
-      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection $attrSetCollection
-      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
--     * @param ProductCategoryList|null $categoryList
-      * @param array $data
-+     * @param ProductCategoryList|null $categoryList
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -514,6 +514,10 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
-             ) ? $this->_localeFormat->getNumber(
-                 $arr['is_value_parsed']
-             ) : false;
-+        } elseif (!empty($arr['operator']) && $arr['operator'] == '()') {
-+            if (isset($arr['value'])) {
-+                $arr['value'] = preg_replace('/\s*,\s*/', ',', $arr['value']);
-+            }
-         }
- 
-         return parent::loadArray($arr);
-@@ -695,6 +699,7 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
- 
-     /**
-      * Correct '==' and '!=' operators
-+     *
-      * Categories can't be equal because product is included categories selected by administrator and in their parents
-      *
-      * @return string
-diff --git a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
-index 2894de0f19b..33e1bf97c34 100644
---- a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
-+++ b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
-@@ -32,15 +32,27 @@ class Builder
-         '=='    => ':field = ?',
-         '!='    => ':field <> ?',
-         '>='    => ':field >= ?',
-+        '&gt;=' => ':field >= ?',
-         '>'     => ':field > ?',
-+        '&gt;'  => ':field > ?',
-         '<='    => ':field <= ?',
-+        '&lt;=' => ':field <= ?',
-         '<'     => ':field < ?',
-+        '&lt;'  => ':field < ?',
-         '{}'    => ':field IN (?)',
-         '!{}'   => ':field NOT IN (?)',
-         '()'    => ':field IN (?)',
-         '!()'   => ':field NOT IN (?)',
-     ];
- 
-+    /**
-+     * @var array
-+     */
-+    private $stringConditionOperatorMap = [
-+        '{}' => ':field LIKE ?',
-+        '!{}' => ':field NOT LIKE ?',
-+    ];
-+
-     /**
-      * @var \Magento\Rule\Model\Condition\Sql\ExpressionFactory
-      */
-@@ -128,9 +140,10 @@ class Builder
-      *
-      * @param AbstractCondition $condition
-      * @param string $value
--     * @param bool $isDefaultStoreUsed
-+     * @param bool $isDefaultStoreUsed no longer used because caused an issue about not existing table alias
-      * @return string
-      * @throws \Magento\Framework\Exception\LocalizedException
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     protected function _getMappedSqlCondition(
-         AbstractCondition $condition,
-@@ -151,21 +164,27 @@ class Builder
-         }
- 
-         $defaultValue = 0;
--        // Check if attribute has a table with default value and add it to the query
--        if ($this->canAttributeHaveDefaultValue($condition->getAttribute(), $isDefaultStoreUsed)) {
--            $defaultField = 'at_' . $condition->getAttribute() . '_default.value';
--            $defaultValue = $this->_connection->quoteIdentifier($defaultField);
-+        //operator 'contains {}' is mapped to 'IN()' query that cannot work with substrings
-+        // adding mapping to 'LIKE %%'
-+        if ($condition->getInputType() === 'string'
-+            && in_array($conditionOperator, array_keys($this->stringConditionOperatorMap), true)
-+        ) {
-+            $sql = str_replace(
-+                ':field',
-+                $this->_connection->getIfNullSql($this->_connection->quoteIdentifier($argument), $defaultValue),
-+                $this->stringConditionOperatorMap[$conditionOperator]
-+            );
-+            $bindValue = $condition->getBindArgumentValue();
-+            $expression = $value . $this->_connection->quoteInto($sql, "%$bindValue%");
-+        } else {
-+            $sql = str_replace(
-+                ':field',
-+                $this->_connection->getIfNullSql($this->_connection->quoteIdentifier($argument), $defaultValue),
-+                $this->_conditionOperatorMap[$conditionOperator]
-+            );
-+            $bindValue = $condition->getBindArgumentValue();
-+            $expression = $value . $this->_connection->quoteInto($sql, $bindValue);
-         }
--
--        $sql = str_replace(
--            ':field',
--            $this->_connection->getIfNullSql($this->_connection->quoteIdentifier($argument), $defaultValue),
--            $this->_conditionOperatorMap[$conditionOperator]
--        );
--
--        $bindValue = $condition->getBindArgumentValue();
--        $expression = $value . $this->_connection->quoteInto($sql, $bindValue);
--
-         // values for multiselect attributes can be saved in comma-separated format
-         // below is a solution for matching such conditions with selected values
-         if (is_array($bindValue) && \in_array($conditionOperator, ['()', '{}'], true)) {
-@@ -183,6 +202,8 @@ class Builder
-     }
- 
-     /**
-+     * Get mapped sql combination.
-+     *
-      * @param Combine $combine
-      * @param string $value
-      * @param bool $isDefaultStoreUsed
-@@ -227,45 +248,32 @@ class Builder
-     ): void {
-         $this->_connection = $collection->getResource()->getConnection();
-         $this->_joinTablesToCollection($collection, $combine);
--        $isDefaultStoreUsed = $this->checkIsDefaultStoreUsed($collection);
--        $whereExpression = (string)$this->_getMappedSqlCombination($combine, '', $isDefaultStoreUsed);
-+        $whereExpression = (string)$this->_getMappedSqlCombination($combine);
-         if (!empty($whereExpression)) {
--            // Select ::where method adds braces even on empty expression
--            $collection->getSelect()->where($whereExpression);
--        }
--    }
--
--    /**
--     * Check is default store used.
--     *
--     * @param AbstractCollection $collection
--     * @return bool
--     */
--    private function checkIsDefaultStoreUsed(AbstractCollection $collection): bool
--    {
--        return (int)$collection->getStoreId() === (int)$collection->getDefaultStoreId();
--    }
-+            if (!empty($combine->getConditions())) {
-+                $conditions = '';
-+                $attributeField = '';
-+                foreach ($combine->getConditions() as $condition) {
-+                    if ($condition->getData('attribute') === \Magento\Catalog\Api\Data\ProductInterface::SKU) {
-+                        $conditions = $condition->getData('value');
-+                        $attributeField = $condition->getMappedSqlField();
-+                    }
-+                }
- 
--    /**
--     * Check if attribute can have default value.
--     *
--     * @param string $attributeCode
--     * @param bool $isDefaultStoreUsed
--     * @return bool
--     */
--    private function canAttributeHaveDefaultValue(string $attributeCode, bool $isDefaultStoreUsed): bool
--    {
--        if ($isDefaultStoreUsed) {
--            return false;
--        }
-+                $collection->getSelect()->where($whereExpression);
- 
--        try {
--            $attribute = $this->attributeRepository->get(Product::ENTITY, $attributeCode);
--        } catch (NoSuchEntityException $e) {
--            // It's not exceptional case as we want to check if we have such attribute or not
--            return false;
-+                if (!empty($conditions) && !empty($attributeField)) {
-+                    $conditions = explode(',', $conditions);
-+                    foreach ($conditions as &$condition) {
-+                        $condition = "'" . trim($condition) . "'";
-+                    }
-+                    $conditions = implode(', ', $conditions);
-+                    $collection->getSelect()->order("FIELD($attributeField, $conditions)");
-+                }
-+            } else {
-+                // Select ::where method adds braces even on empty expression
-+                $collection->getSelect()->where($whereExpression);
-+            }
-         }
--
--        return !$attribute->isScopeGlobal();
-     }
- }
-diff --git a/app/code/Magento/Rule/Test/Unit/Model/Condition/Sql/BuilderTest.php b/app/code/Magento/Rule/Test/Unit/Model/Condition/Sql/BuilderTest.php
-index daf7b1462c7..9dcbbd18c4c 100644
---- a/app/code/Magento/Rule/Test/Unit/Model/Condition/Sql/BuilderTest.php
-+++ b/app/code/Magento/Rule/Test/Unit/Model/Condition/Sql/BuilderTest.php
-@@ -61,12 +61,6 @@ class BuilderTest extends \PHPUnit\Framework\TestCase
-         $collection->expects($this->any())
-             ->method('getSelect')
-             ->will($this->returnValue($select));
--        $collection->expects($this->once())
--            ->method('getStoreId')
--            ->willReturn(1);
--        $collection->expects($this->once())
--            ->method('getDefaultStoreId')
--            ->willReturn(1);
- 
-         $resource->expects($this->once())
-             ->method('getConnection')
-@@ -78,4 +72,69 @@ class BuilderTest extends \PHPUnit\Framework\TestCase
- 
-         $this->_builder->attachConditionToCollection($collection, $combine);
-     }
-+
-+    /**
-+     * Test for attach condition to collection with operator in html format
-+     *
-+     * @covers \Magento\Rule\Model\Condition\Sql\Builder::attachConditionToCollection()
-+     * @return void;
-+     */
-+    public function testAttachConditionAsHtmlToCollection()
-+    {
-+        $abstractCondition = $this->getMockForAbstractClass(
-+            \Magento\Rule\Model\Condition\AbstractCondition::class,
-+            [],
-+            '',
-+            false,
-+            false,
-+            true,
-+            ['getOperatorForValidate', 'getMappedSqlField', 'getAttribute', 'getBindArgumentValue']
-+        );
-+
-+        $abstractCondition->expects($this->once())->method('getMappedSqlField')->will($this->returnValue('argument'));
-+        $abstractCondition->expects($this->once())->method('getOperatorForValidate')->will($this->returnValue('&gt;'));
-+        $abstractCondition->expects($this->at(1))->method('getAttribute')->will($this->returnValue('attribute'));
-+        $abstractCondition->expects($this->at(2))->method('getAttribute')->will($this->returnValue('attribute'));
-+        $abstractCondition->expects($this->once())->method('getBindArgumentValue')->will($this->returnValue(10));
-+
-+        $conditions = [$abstractCondition];
-+        $collection = $this->createPartialMock(
-+            \Magento\Eav\Model\Entity\Collection\AbstractCollection::class,
-+            [
-+                'getResource',
-+                'getSelect'
-+            ]
-+        );
-+        $combine = $this->createPartialMock(
-+            \Magento\Rule\Model\Condition\Combine::class,
-+            [
-+                'getConditions',
-+                'getValue',
-+                'getAggregator'
-+            ]
-+        );
-+
-+        $resource = $this->createPartialMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class, ['getConnection']);
-+        $select = $this->createPartialMock(\Magento\Framework\DB\Select::class, ['where']);
-+        $select->expects($this->never())->method('where');
-+
-+        $connection = $this->getMockForAbstractClass(
-+            \Magento\Framework\DB\Adapter\AdapterInterface::class,
-+            ['quoteInto'],
-+            '',
-+            false
-+        );
-+
-+        $connection->expects($this->once())->method('quoteInto')->with(' > ?', 10)->will($this->returnValue(' > 10'));
-+        $collection->expects($this->once())->method('getResource')->will($this->returnValue($resource));
-+        $resource->expects($this->once())->method('getConnection')->will($this->returnValue($connection));
-+        $combine->expects($this->once())->method('getValue')->willReturn('attribute');
-+        $combine->expects($this->once())->method('getAggregator')->willReturn(' AND ');
-+        $combine->expects($this->at(0))->method('getConditions')->will($this->returnValue($conditions));
-+        $combine->expects($this->at(1))->method('getConditions')->will($this->returnValue($conditions));
-+        $combine->expects($this->at(2))->method('getConditions')->will($this->returnValue($conditions));
-+        $combine->expects($this->at(3))->method('getConditions')->will($this->returnValue($conditions));
-+
-+        $this->_builder->attachConditionToCollection($collection, $combine);
-+    }
- }
-diff --git a/app/code/Magento/Rule/view/adminhtml/web/rules.js b/app/code/Magento/Rule/view/adminhtml/web/rules.js
-index b094b981836..95175d272f9 100644
---- a/app/code/Magento/Rule/view/adminhtml/web/rules.js
-+++ b/app/code/Magento/Rule/view/adminhtml/web/rules.js
-@@ -13,6 +13,7 @@ define([
-     'mage/translate',
-     'prototype'
- ], function (jQuery) {
-+    'use strict';
- 
-     var VarienRulesForm = new Class.create();
- 
-@@ -101,6 +102,9 @@ define([
- 
-                     if (!elem.multiple) {
-                         Event.observe(elem, 'change', this.hideParamInputField.bind(this, container));
-+
-+                        this.changeVisibilityForValueRuleParam(elem);
-+
-                     }
-                     Event.observe(elem, 'blur', this.hideParamInputField.bind(this, container));
-                 }
-@@ -122,7 +126,7 @@ define([
-                 var values = this.updateElement.value.split(','),
-  s = '';
- 
--                for (i = 0; i < values.length; i++) {
-+                for (var i = 0; i < values.length; i++) {
-                     s = values[i].strip();
- 
-                     if (s != '') {
-@@ -220,6 +224,8 @@ define([
- 
-             var elem = Element.down(elemContainer, 'input.input-text');
- 
-+            jQuery(elem).trigger('contentUpdated');
-+
-             if (elem) {
-                 elem.focus();
- 
-@@ -249,7 +255,7 @@ define([
-                 if (elem && elem.options) {
-                     var selectedOptions = [];
- 
--                    for (i = 0; i < elem.options.length; i++) {
-+                    for (var i = 0; i < elem.options.length; i++) {
-                         if (elem.options[i].selected) {
-                             selectedOptions.push(elem.options[i].text);
-                         }
-@@ -260,6 +266,8 @@ define([
-                     label.innerHTML = str != '' ? str : '...';
-                 }
- 
-+                this.changeVisibilityForValueRuleParam(elem);
-+
-                 elem = Element.down(container, 'input.input-text');
- 
-                 if (elem) {
-@@ -291,6 +299,23 @@ define([
-             this.shownElement = null;
-         },
- 
-+        changeVisibilityForValueRuleParam: function(elem) {
-+            var parsedElementId = elem.id.split('__');
-+            if (parsedElementId[2] !== 'operator') {
-+                return false;
-+            }
-+
-+            var valueElement = jQuery('#' + parsedElementId[0] + '__' + parsedElementId[1] + '__value');
-+
-+            if(elem.value === '<=>') {
-+                valueElement.closest('.rule-param').hide();
-+            } else {
-+                valueElement.closest('.rule-param').show();
-+            }
-+
-+            return true;
-+        },
-+
-         addRuleNewChild: function (elem) {
-             var parent_id = elem.id.replace(/^.*__(.*)__.*$/, '$1');
-             var children_ul_id = elem.id.replace(/__/g, ':').replace(/[^:]*$/, 'children').replace(/:/g, '__');
-diff --git a/app/code/Magento/Sales/Api/CreditmemoRepositoryInterface.php b/app/code/Magento/Sales/Api/CreditmemoRepositoryInterface.php
-index 354b55eb259..3c61384d8b8 100644
---- a/app/code/Magento/Sales/Api/CreditmemoRepositoryInterface.php
-+++ b/app/code/Magento/Sales/Api/CreditmemoRepositoryInterface.php
-@@ -20,7 +20,7 @@ interface CreditmemoRepositoryInterface
-      * Lists credit memos that match specified search criteria.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#CreditmemoRepositoryInterface to
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#CreditmemoRepositoryInterface to
-      * determine which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
-diff --git a/app/code/Magento/Sales/Api/Data/OrderInterface.php b/app/code/Magento/Sales/Api/Data/OrderInterface.php
-index 3ca936afd40..b45fddc7d73 100644
---- a/app/code/Magento/Sales/Api/Data/OrderInterface.php
-+++ b/app/code/Magento/Sales/Api/Data/OrderInterface.php
-@@ -581,6 +581,8 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface
-     /**
-      * Gets the applied rule IDs for the order.
-      *
-+     * Rules are comma separated if there are more than one.
-+     *
-      * @return string|null Applied rule IDs.
-      */
-     public function getAppliedRuleIds();
-diff --git a/app/code/Magento/Sales/Api/Data/OrderItemInterface.php b/app/code/Magento/Sales/Api/Data/OrderItemInterface.php
-index ae4064c0ab3..2aee648ef7c 100644
---- a/app/code/Magento/Sales/Api/Data/OrderItemInterface.php
-+++ b/app/code/Magento/Sales/Api/Data/OrderItemInterface.php
-@@ -415,6 +415,8 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf
-     /**
-      * Gets the applied rule IDs for the order item.
-      *
-+     * Rules are comma separated if there are more than one.
-+     *
-      * @return string|null Applied rule IDs.
-      */
-     public function getAppliedRuleIds();
-diff --git a/app/code/Magento/Sales/Api/InvoiceRepositoryInterface.php b/app/code/Magento/Sales/Api/InvoiceRepositoryInterface.php
-index 9d4f11ed0f0..161b8405f11 100644
---- a/app/code/Magento/Sales/Api/InvoiceRepositoryInterface.php
-+++ b/app/code/Magento/Sales/Api/InvoiceRepositoryInterface.php
-@@ -18,7 +18,7 @@ interface InvoiceRepositoryInterface
-      * Lists invoices that match specified search criteria.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#InvoiceRepositoryInterface to
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#InvoiceRepositoryInterface to
-      * determine which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
-diff --git a/app/code/Magento/Sales/Api/OrderItemRepositoryInterface.php b/app/code/Magento/Sales/Api/OrderItemRepositoryInterface.php
-index e731f6f0e98..3449d0054b7 100644
---- a/app/code/Magento/Sales/Api/OrderItemRepositoryInterface.php
-+++ b/app/code/Magento/Sales/Api/OrderItemRepositoryInterface.php
-@@ -20,7 +20,7 @@ interface OrderItemRepositoryInterface
-      * Lists order items that match specified search criteria.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#OrderItemRepositoryInterface to
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#OrderItemRepositoryInterface to
-      * determine which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
-diff --git a/app/code/Magento/Sales/Api/OrderRepositoryInterface.php b/app/code/Magento/Sales/Api/OrderRepositoryInterface.php
-index a25f463ac86..0c3b6ab5cb0 100644
---- a/app/code/Magento/Sales/Api/OrderRepositoryInterface.php
-+++ b/app/code/Magento/Sales/Api/OrderRepositoryInterface.php
-@@ -20,7 +20,7 @@ interface OrderRepositoryInterface
-      * Lists orders that match specified search criteria.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#OrderRepositoryInterface to
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#OrderRepositoryInterface to
-      * determine which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
-diff --git a/app/code/Magento/Sales/Api/ShipmentRepositoryInterface.php b/app/code/Magento/Sales/Api/ShipmentRepositoryInterface.php
-index bfdf17440eb..3b3c8221596 100644
---- a/app/code/Magento/Sales/Api/ShipmentRepositoryInterface.php
-+++ b/app/code/Magento/Sales/Api/ShipmentRepositoryInterface.php
-@@ -19,7 +19,7 @@ interface ShipmentRepositoryInterface
-      * Lists shipments that match specified search criteria.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#ShipmentRepositoryInterface to
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#ShipmentRepositoryInterface to
-      * determine which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
-diff --git a/app/code/Magento/Sales/Api/TransactionRepositoryInterface.php b/app/code/Magento/Sales/Api/TransactionRepositoryInterface.php
-index de459662a83..e55b5d60d1f 100644
---- a/app/code/Magento/Sales/Api/TransactionRepositoryInterface.php
-+++ b/app/code/Magento/Sales/Api/TransactionRepositoryInterface.php
-@@ -18,7 +18,7 @@ interface TransactionRepositoryInterface
-      * Lists transactions that match specified search criteria.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#TransactionRepositoryInterface to
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#TransactionRepositoryInterface to
-      * determine which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
-index 6cab109b44d..12e59e63f6f 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
-@@ -113,6 +113,7 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
-             $this->getUrl('sales/*/addressSave', ['address_id' => $this->_getAddress()->getId()])
-         );
-         $this->_form->setUseContainer(true);
-+
-         return $this;
-     }
- 
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
-index 12a8270acff..2b214e42d8b 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
-@@ -164,6 +164,7 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
-     public function getOrderDataJson()
-     {
-         $data = [];
-+        $this->_storeManager->setCurrentStore($this->getStoreId());
-         if ($this->getCustomerId()) {
-             $data['customer_id'] = $this->getCustomerId();
-             $data['addresses'] = [];
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
-index d15c218a60b..6b87c1fe39d 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
-@@ -6,6 +6,7 @@
- namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
- 
- use Magento\Framework\Pricing\PriceCurrencyInterface;
-+use Magento\Customer\Api\Data\AttributeMetadataInterface;
- 
- /**
-  * Sales Order Create Form Abstract Block
-@@ -57,8 +58,7 @@ abstract class AbstractForm extends \Magento\Sales\Block\Adminhtml\Order\Create\
-     }
- 
-     /**
--     * Prepare global layout
--     * Add renderers to \Magento\Framework\Data\Form
-+     * Prepare global layout. Add renderers to \Magento\Framework\Data\Form
-      *
-      * @return $this
-      */
-@@ -152,7 +152,7 @@ abstract class AbstractForm extends \Magento\Sales\Block\Adminhtml\Order\Create\
-     /**
-      * Add rendering EAV attributes to Form element
-      *
--     * @param \Magento\Customer\Api\Data\AttributeMetadataInterface[] $attributes
-+     * @param AttributeMetadataInterface[] $attributes
-      * @param \Magento\Framework\Data\Form\AbstractForm $form
-      * @return $this
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-@@ -176,8 +176,8 @@ abstract class AbstractForm extends \Magento\Sales\Block\Adminhtml\Order\Create\
-                     [
-                         'name' => $attribute->getAttributeCode(),
-                         'label' => __($attribute->getStoreLabel()),
--                        'class' => $attribute->getFrontendClass(),
--                        'required' => $attribute->isRequired()
-+                        'class' => $this->getValidationClasses($attribute),
-+                        'required' => $attribute->isRequired(),
-                     ]
-                 );
-                 if ($inputType == 'multiline') {
-@@ -227,4 +227,58 @@ abstract class AbstractForm extends \Magento\Sales\Block\Adminhtml\Order\Create\
-     {
-         return [];
-     }
-+
-+    /**
-+     * Retrieve frontend classes according validation rules
-+     *
-+     * @param AttributeMetadataInterface $attribute
-+     *
-+     * @return string
-+     */
-+    private function getValidationClasses(AttributeMetadataInterface $attribute) : string
-+    {
-+        $out = [];
-+        $out[] = $attribute->getFrontendClass();
-+
-+        $textClasses = $this->getTextLengthValidateClasses($attribute);
-+        if (!empty($textClasses)) {
-+            $out = array_merge($out, $textClasses);
-+        }
-+
-+        $out = !empty($out) ? implode(' ', array_unique(array_filter($out))) : '';
-+        return $out;
-+    }
-+
-+    /**
-+     * Retrieve validation classes by min_text_length and max_text_length rules
-+     *
-+     * @param AttributeMetadataInterface $attribute
-+     *
-+     * @return array
-+     */
-+    private function getTextLengthValidateClasses(AttributeMetadataInterface $attribute) : array
-+    {
-+        $classes = [];
-+
-+        $validateRules = $attribute->getValidationRules();
-+        if (!empty($validateRules)) {
-+            foreach ($validateRules as $rule) {
-+                switch ($rule->getName()) {
-+                    case 'min_text_length':
-+                        $classes[] = 'minimum-length-' . $rule->getValue();
-+                        break;
-+
-+                    case 'max_text_length':
-+                        $classes[] = 'maximum-length-' . $rule->getValue();
-+                        break;
-+                }
-+            }
-+
-+            if (!empty($classes)) {
-+                $classes[] = 'validate-length';
-+            }
-+        }
-+
-+        return $classes;
-+    }
- }
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
-index 26379a05fe6..03915c04993 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
-@@ -132,15 +132,7 @@ class Account extends AbstractForm
-         $this->_addAttributesToForm($attributes, $fieldset);
- 
-         $this->_form->addFieldNameSuffix('order[account]');
--
--        $formValues = $this->getFormValues();
--        foreach ($attributes as $code => $attribute) {
--            $defaultValue = $attribute->getDefaultValue();
--            if (isset($defaultValue) && !isset($formValues[$code])) {
--                $formValues[$code] = $defaultValue;
--            }
--        }
--        $this->_form->setValues($formValues);
-+        $this->_form->setValues($this->extractValuesFromAttributes($attributes));
- 
-         return $this;
-     }
-@@ -193,4 +185,23 @@ class Account extends AbstractForm
- 
-         return $data;
-     }
-+
-+    /**
-+     * Extract the form values from attributes.
-+     *
-+     * @param array $attributes
-+     * @return array
-+     */
-+    private function extractValuesFromAttributes(array $attributes): array
-+    {
-+        $formValues = $this->getFormValues();
-+        foreach ($attributes as $code => $attribute) {
-+            $defaultValue = $attribute->getDefaultValue();
-+            if (isset($defaultValue) && !isset($formValues[$code])) {
-+                $formValues[$code] = $defaultValue;
-+            }
-+        }
-+
-+        return $formValues;
-+    }
- }
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
-index 5738e8ee333..e4b9dd4c63b 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
-@@ -9,6 +9,8 @@ use Magento\Backend\Model\Session\Quote;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Data\Form\Element\AbstractElement;
- use Magento\Framework\Pricing\PriceCurrencyInterface;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Eav\Model\AttributeDataFactory;
- 
- /**
-  * Order create address form
-@@ -136,6 +138,7 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
-         $this->searchCriteriaBuilder = $criteriaBuilder;
-         $this->filterBuilder = $filterBuilder;
-         $this->addressMapper = $addressMapper;
-+        $this->backendQuoteSession = $sessionQuote;
-         parent::__construct(
-             $context,
-             $sessionQuote,
-@@ -190,17 +193,19 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
-         $emptyAddressForm = $this->_customerFormFactory->create(
-             'customer_address',
-             'adminhtml_customer_address',
--            [\Magento\Customer\Api\Data\AddressInterface::COUNTRY_ID => $defaultCountryId]
-+            [AddressInterface::COUNTRY_ID => $defaultCountryId]
-         );
--        $data = [0 => $emptyAddressForm->outputData(\Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON)];
-+        $data = [0 => $emptyAddressForm->outputData(AttributeDataFactory::OUTPUT_FORMAT_JSON)];
-         foreach ($this->getAddressCollection() as $address) {
-             $addressForm = $this->_customerFormFactory->create(
-                 'customer_address',
-                 'adminhtml_customer_address',
--                $this->addressMapper->toFlatArray($address)
-+                $this->addressMapper->toFlatArray($address),
-+                false,
-+                false
-             );
-             $data[$address->getId()] = $addressForm->outputData(
--                \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON
-+                AttributeDataFactory::OUTPUT_FORMAT_JSON
-             );
-         }
- 
-@@ -217,6 +222,11 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
-      */
-     protected function _prepareForm()
-     {
-+        $storeId = $this->getCreateOrderModel()
-+            ->getSession()
-+            ->getStoreId();
-+        $this->_storeManager->setCurrentStore($storeId);
-+
-         $fieldset = $this->_form->addFieldset('main', ['no_container' => true]);
- 
-         $addressForm = $this->_customerFormFactory->create('customer_address', 'adminhtml_customer_address');
-@@ -292,6 +302,8 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
-     }
- 
-     /**
-+     * Process country options.
-+     *
-      * @param \Magento\Framework\Data\Form\Element\AbstractElement $countryElement
-      * @return void
-      */
-@@ -306,7 +318,8 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
-     }
- 
-     /**
--     * Retrieve Directiry Countries collection
-+     * Retrieve Directory Countries collection
-+     *
-      * @deprecated 100.1.3
-      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
-      */
-@@ -322,6 +335,7 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
- 
-     /**
-      * Retrieve Backend Quote Session
-+     *
-      * @deprecated 100.1.3
-      * @return Quote
-      */
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php
-index f21cc96be92..7cb46fcde2c 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php
-@@ -29,7 +29,7 @@ class Load extends \Magento\Framework\View\Element\Template
-     /**
-      * @param \Magento\Framework\View\Element\Template\Context $context
-      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
--     * @param \Magento\Framework\View\Helper\Js $adminhtmlJs
-+     * @param \Magento\Framework\View\Helper\Js $jsHelper
-      * @param array $data
-      */
-     public function __construct(
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
-index 4bd2227d4bb..9a271f741ed 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
-@@ -5,12 +5,17 @@
-  */
- namespace Magento\Sales\Block\Adminhtml\Order\Create\Search;
- 
-+use Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\DataProvider\ProductCollection
-+    as ProductCollectionDataProvider;
-+use Magento\Framework\App\ObjectManager;
-+
- /**
-  * Adminhtml sales order create search products block
-  *
-  * @api
-  * @author      Magento Core Team <core@magentocommerce.com>
-  * @since 100.0.2
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
- {
-@@ -42,6 +47,11 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-      */
-     protected $_productFactory;
- 
-+    /**
-+     * @var ProductCollectionDataProvider $productCollectionProvider
-+     */
-+    private $productCollectionProvider;
-+
-     /**
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Backend\Helper\Data $backendHelper
-@@ -50,6 +60,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-      * @param \Magento\Backend\Model\Session\Quote $sessionQuote
-      * @param \Magento\Sales\Model\Config $salesConfig
-      * @param array $data
-+     * @param ProductCollectionDataProvider|null $productCollectionProvider
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-@@ -58,12 +69,15 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-         \Magento\Catalog\Model\Config $catalogConfig,
-         \Magento\Backend\Model\Session\Quote $sessionQuote,
-         \Magento\Sales\Model\Config $salesConfig,
--        array $data = []
-+        array $data = [],
-+        ProductCollectionDataProvider $productCollectionProvider = null
-     ) {
-         $this->_productFactory = $productFactory;
-         $this->_catalogConfig = $catalogConfig;
-         $this->_sessionQuote = $sessionQuote;
-         $this->_salesConfig = $salesConfig;
-+        $this->productCollectionProvider = $productCollectionProvider
-+            ?: ObjectManager::getInstance()->get(ProductCollectionDataProvider::class);
-         parent::__construct($context, $backendHelper, $data);
-     }
- 
-@@ -140,20 +154,18 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
-      */
-     protected function _prepareCollection()
-     {
-+
-         $attributes = $this->_catalogConfig->getProductAttributes();
-+        $store = $this->getStore();
-+
-         /* @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
--        $collection = $this->_productFactory->create()->getCollection();
--        $collection->setStore(
--            $this->getStore()
--        )->addAttributeToSelect(
-+        $collection = $this->productCollectionProvider->getCollectionForStore($store);
-+        $collection->addAttributeToSelect(
-             $attributes
--        )->addAttributeToSelect(
--            'sku'
--        )->addStoreFilter()->addAttributeToFilter(
-+        );
-+        $collection->addAttributeToFilter(
-             'type_id',
-             $this->_salesConfig->getAvailableProductTypes()
--        )->addAttributeToSelect(
--            'gift_message_available'
-         );
- 
-         $this->setCollection($collection);
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php
-new file mode 100644
-index 00000000000..733791a2f95
---- /dev/null
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php
-@@ -0,0 +1,55 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\DataProvider;
-+
-+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
-+use Magento\Catalog\Model\ResourceModel\Product\Collection;
-+use Magento\Store\Model\Store;
-+
-+/**
-+ * Prepares product collection for the grid
-+ */
-+class ProductCollection
-+{
-+    /**
-+     * @var ProductCollectionFactory
-+     */
-+    private $collectionFactory;
-+
-+    /**
-+     * @param ProductCollectionFactory $collectionFactory
-+     */
-+    public function __construct(
-+        ProductCollectionFactory $collectionFactory
-+    ) {
-+        $this->collectionFactory = $collectionFactory;
-+    }
-+
-+    /**
-+     * Provide products collection filtered with store
-+     *
-+     * @param Store $store
-+     * @return Collection
-+     */
-+    public function getCollectionForStore(Store $store):Collection
-+    {
-+        /** @var Collection $collection */
-+        $collection = $this->collectionFactory->create();
-+
-+        $collection->setStore($store);
-+        $collection->addAttributeToSelect(
-+            'gift_message_available'
-+        );
-+        $collection->addAttributeToSelect(
-+            'sku'
-+        );
-+        $collection->addStoreFilter();
-+
-+        return $collection;
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
-index 7a8f3effef0..c4e8db28b48 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Block\Adminhtml\Order\Create\Shipping;
- 
- /**
-@@ -81,6 +83,15 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
-      */
-     public function getDontSaveInAddressBook()
-     {
-+        $shippingIsTheSameAsBilling = $this->getIsAsBilling() && $this->getIsShipping();
-+        $params = $this->getRequest()->getParams();
-+        if ($shippingIsTheSameAsBilling && $params) {
-+            $save = $params['order']['billing_address']['save_in_address_book'] ?? false;
-+            return !$save;
-+        }
-+        if ($shippingIsTheSameAsBilling) {
-+            return !$shippingIsTheSameAsBilling;
-+        }
-         return $this->getIsAsBilling();
-     }
- 
-@@ -121,6 +132,7 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
- 
-     /**
-      * Return is address disabled flag
-+     *
-      * Return true is the quote is virtual
-      *
-      * @return bool
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
-index 34d7a3f8ee2..f2200e1c1a1 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
-@@ -3,8 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
- 
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Pricing\Price\FinalPrice;
-+
- /**
-  * Adminhtml sales order create sidebar cart block
-  *
-@@ -58,6 +63,17 @@ class Cart extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractS
-         return $collection;
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getItemPrice(Product $product)
-+    {
-+        $customPrice = $this->getCartItemCustomPrice($product);
-+        $price = $customPrice ?? $product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE)->getValue();
-+
-+        return $this->convertPrice($price);
-+    }
-+
-     /**
-      * Retrieve display item qty availability
-      *
-@@ -111,4 +127,23 @@ class Cart extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractS
- 
-         return parent::_prepareLayout();
-     }
-+
-+    /**
-+     * Returns cart item custom price.
-+     *
-+     * @param Product $product
-+     * @return float|null
-+     */
-+    private function getCartItemCustomPrice(Product $product): ?float
-+    {
-+        $items = $this->getItemCollection();
-+        foreach ($items as $item) {
-+            $productItemId = $this->getProduct($item)->getId();
-+            if ($productItemId === $product->getId() && $item->getCustomPrice()) {
-+                return (float)$item->getCustomPrice();
-+            }
-+        }
-+
-+        return null;
-+    }
- }
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
-index d73371d46da..50d29c19596 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
-@@ -8,6 +8,8 @@ namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create;
- use Magento\Framework\Pricing\PriceCurrencyInterface;
- 
- /**
-+ * Credit memo adjustments block
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -50,7 +52,7 @@ class Adjustments extends \Magento\Backend\Block\Template
-     }
- 
-     /**
--     * Initialize creditmemo agjustment totals
-+     * Initialize creditmemo adjustment totals
-      *
-      * @return $this
-      */
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php
-index d2e42fe388d..ec959fc2863 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php
-@@ -26,7 +26,7 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
-     /**
-      * Retrieve source
-      *
--     * @return \Magento\Sales\Model\Order\Invoice
-+     * @return \Magento\Sales\Model\Order\Creditmemo
-      */
-     public function getSource()
-     {
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
-index fd6e5f403f2..074aa99a5e7 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
-@@ -113,8 +113,8 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
-                 $orderPayment->canRefund() && !$this->getInvoice()->getIsUsedForRefund()
-             ) {
-                 $this->buttonList->add(
--                    'capture',
--                    [ // capture?
-+                    'credit-memo',
-+                    [
-                         'label' => __('Credit Memo'),
-                         'class' => 'credit-memo',
-                         'onclick' => 'setLocation(\'' . $this->getCreditMemoUrl() . '\')'
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
-index 36c49ff5cbf..c4701962b77 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
-@@ -7,6 +7,8 @@
-  */
- namespace Magento\Sales\Block\Adminhtml\Order;
- 
-+use Magento\Sales\Model\ConfigInterface;
-+
- /**
-  * Adminhtml sales order view
-  * @api
-@@ -46,14 +48,14 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
-     /**
-      * @param \Magento\Backend\Block\Widget\Context $context
-      * @param \Magento\Framework\Registry $registry
--     * @param \Magento\Sales\Model\Config $salesConfig
-+     * @param ConfigInterface $salesConfig
-      * @param \Magento\Sales\Helper\Reorder $reorderHelper
-      * @param array $data
-      */
-     public function __construct(
-         \Magento\Backend\Block\Widget\Context $context,
-         \Magento\Framework\Registry $registry,
--        \Magento\Sales\Model\Config $salesConfig,
-+        ConfigInterface $salesConfig,
-         \Magento\Sales\Helper\Reorder $reorderHelper,
-         array $data = []
-     ) {
-@@ -466,6 +468,8 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
-     }
- 
-     /**
-+     * Get edit message
-+     *
-      * @param \Magento\Sales\Model\Order $order
-      * @return \Magento\Framework\Phrase
-      */
-@@ -486,6 +490,8 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
-     }
- 
-     /**
-+     * Get non editable types
-+     *
-      * @param \Magento\Sales\Model\Order $order
-      * @return array
-      */
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
-index 1912655a929..10b80b6f4e5 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
-@@ -88,7 +88,8 @@ class History extends \Magento\Backend\Block\Template
-      */
-     public function canSendCommentEmail()
-     {
--        return $this->_salesData->canSendOrderCommentEmail($this->getOrder()->getStore()->getId());
-+        return $this->_salesData->canSendOrderCommentEmail($this->getOrder()->getStore()->getId())
-+            && $this->_authorization->isAllowed('Magento_Sales::email');
-     }
- 
-     /**
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
-index 04a9f9437ae..d19fc4992f0 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
-@@ -94,6 +94,7 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\Defa
-      * Indicate that block can display container
-      *
-      * @return bool
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     public function canDisplayContainer()
-     {
-@@ -196,7 +197,7 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\Defa
-     /**
-      * Retrieve save url
-      *
--     * @return array
-+     * @return string
-      */
-     public function getSaveUrl()
-     {
-@@ -259,9 +260,11 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\Defa
-     }
- 
-     /**
-+     * Retrieve rendered column html content
-+     *
-      * @param \Magento\Framework\DataObject|Item $item
-      * @param string $column
--     * @param null $field
-+     * @param string $field
-      * @return string
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @since 100.1.0
-@@ -301,6 +304,8 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\Defa
-     }
- 
-     /**
-+     * Get columns data.
-+     *
-      * @return array
-      * @since 100.1.0
-      */
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
-index 64b53d10d4a..0972d743142 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
-@@ -61,6 +61,7 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
- 
-     /**
-      * Compose and get order full history.
-+     *
-      * Consists of the status history comments as well as of invoices, shipments and creditmemos creations
-      *
-      * @TODO This method requires refactoring. Need to create separate model for comment history handling
-@@ -218,7 +219,7 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getTabLabel()
-     {
-@@ -226,7 +227,7 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getTabTitle()
-     {
-@@ -264,7 +265,7 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function canShowTab()
-     {
-@@ -272,7 +273,7 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isHidden()
-     {
-@@ -303,11 +304,7 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
-         $createdAtA = $a['created_at'];
-         $createdAtB = $b['created_at'];
- 
--        /** @var $createdAtA \DateTime */
--        if ($createdAtA->getTimestamp() == $createdAtB->getTimestamp()) {
--            return 0;
--        }
--        return $createdAtA->getTimestamp() < $createdAtB->getTimestamp() ? -1 : 1;
-+        return $createdAtA->getTimestamp() <=> $createdAtB->getTimestamp();
-     }
- 
-     /**
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php
-index e6e5d6ec3df..566ea1214d9 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php
-@@ -41,6 +41,8 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
-     }
- 
-     /**
-+     * Render actions
-+     *
-      * @param \Magento\Framework\DataObject $row
-      * @return string
-      */
-@@ -71,7 +73,8 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
-      */
-     protected function _getEscapedValue($value)
-     {
--        return addcslashes(htmlspecialchars($value), '\\\'');
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+        return addcslashes($this->escapeHtml($value), '\\\'');
-     }
- 
-     /**
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
-index 512539824da..802ed1dc60f 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
-@@ -7,6 +7,7 @@ namespace Magento\Sales\Block\Adminhtml\Rss\Order\Grid;
- 
- /**
-  * Class Link
-+ *
-  * @package Magento\Sales\Block\Adminhtml\Rss\Order\Grid
-  */
- class Link extends \Magento\Framework\View\Element\Template
-@@ -36,6 +37,8 @@ class Link extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get url for link.
-+     *
-      * @return string
-      */
-     public function getLink()
-@@ -44,6 +47,8 @@ class Link extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get translatable label for link.
-+     *
-      * @return \Magento\Framework\Phrase
-      */
-     public function getLabel()
-@@ -62,7 +67,9 @@ class Link extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
--     * @return string
-+     * Get link type param.
-+     *
-+     * @return array
-      */
-     protected function getLinkParams()
-     {
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/ShoppingCartsTab.php b/app/code/Magento/Sales/Block/Adminhtml/ShoppingCartsTab.php
-new file mode 100644
-index 00000000000..12d5d436065
---- /dev/null
-+++ b/app/code/Magento/Sales/Block/Adminhtml/ShoppingCartsTab.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Sales\Block\Adminhtml;
-+
-+use Magento\Backend\Block\Template\Context;
-+use Magento\Customer\Model\CustomerIdProvider;
-+use Magento\Ui\Component\Layout\Tabs\TabWrapper;
-+
-+/**
-+ * Class ShoppingCarts
-+ *
-+ * @package Magento\Sales\Block\Adminhtml
-+ */
-+class ShoppingCartsTab extends TabWrapper
-+{
-+    /**
-+     * @var bool
-+     */
-+    protected $isAjaxLoaded = true;
-+
-+    /**
-+     * @var CustomerIdProvider
-+     */
-+    private $customerIdProvider;
-+
-+    /**
-+     * @param Context $context
-+     * @param CustomerIdProvider $customerIdProvider
-+     * @param array $data
-+     */
-+    public function __construct(Context $context, CustomerIdProvider $customerIdProvider, array $data = [])
-+    {
-+        parent::__construct($context, $data);
-+        $this->customerIdProvider = $customerIdProvider;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function canShowTab()
-+    {
-+        return $this->customerIdProvider->getCustomerId();
-+    }
-+
-+    /**
-+     * Return Tab label
-+     *
-+     * @codeCoverageIgnore
-+     *
-+     * @return \Magento\Framework\Phrase
-+     */
-+    public function getTabLabel()
-+    {
-+        return __('Shopping cart');
-+    }
-+
-+    /**
-+     * Return URL link to Tab content
-+     *
-+     * @return string
-+     */
-+    public function getTabUrl()
-+    {
-+        return $this->getUrl('customer/*/cart', ['_current' => true]);
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Block/Adminhtml/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
-index 83b155293c2..8172a3c0db4 100644
---- a/app/code/Magento/Sales/Block/Adminhtml/Totals.php
-+++ b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
-@@ -5,6 +5,11 @@
-  */
- namespace Magento\Sales\Block\Adminhtml;
- 
-+use Magento\Sales\Model\Order;
-+
-+/**
-+ * Adminhtml sales totals block
-+ */
- class Totals extends \Magento\Sales\Block\Order\Totals
- {
-     /**
-@@ -67,12 +72,16 @@ class Totals extends \Magento\Sales\Block\Order\Totals
-         if (!$this->getSource()->getIsVirtual() && ((double)$this->getSource()->getShippingAmount() ||
-             $this->getSource()->getShippingDescription())
-         ) {
-+            $shippingLabel = __('Shipping & Handling');
-+            if ($this->isFreeShipping($this->getOrder()) && $this->getSource()->getDiscountDescription()) {
-+                $shippingLabel .= sprintf(' (%s)', $this->getSource()->getDiscountDescription());
-+            }
-             $this->_totals['shipping'] = new \Magento\Framework\DataObject(
-                 [
-                     'code' => 'shipping',
-                     'value' => $this->getSource()->getShippingAmount(),
-                     'base_value' => $this->getSource()->getBaseShippingAmount(),
--                    'label' => __('Shipping & Handling'),
-+                    'label' => $shippingLabel,
-                 ]
-             );
-         }
-@@ -109,4 +118,23 @@ class Totals extends \Magento\Sales\Block\Order\Totals
- 
-         return $this;
-     }
-+
-+    /**
-+     * Availability of free shipping in at least one order item
-+     *
-+     * @param Order $order
-+     * @return bool
-+     */
-+    private function isFreeShipping(Order $order): bool
-+    {
-+        $isFreeShipping = false;
-+        foreach ($order->getItems() as $orderItem) {
-+            if ($orderItem->getFreeShipping() == '1') {
-+                $isFreeShipping = true;
-+                break;
-+            }
-+        }
-+
-+        return $isFreeShipping;
-+    }
- }
-diff --git a/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php b/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
-index a5785a19cc6..bc7756816d3 100644
---- a/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
-+++ b/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
-@@ -4,14 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Sales Order Email Invoice items
-- *
-- * @author     Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Sales\Block\Order\Email\Invoice;
- 
- /**
-+ * Sales Order Email Invoice items
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -21,7 +18,7 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
-      * Prepare item before output
-      *
-      * @param \Magento\Framework\View\Element\AbstractBlock $renderer
--     * @return \Magento\Sales\Block\Items\AbstractItems
-+     * @return void
-      */
-     protected function _prepareItem(\Magento\Framework\View\Element\AbstractBlock $renderer)
-     {
-diff --git a/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php b/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
-index 21c83e55a48..a4c9a7b80a0 100644
---- a/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
-+++ b/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
-@@ -4,14 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Sales Order Email Shipment items
-- *
-- * @author     Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Sales\Block\Order\Email\Shipment;
- 
- /**
-+ * Sales Order Email Shipment items
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -21,7 +18,7 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
-      * Prepare item before output
-      *
-      * @param \Magento\Framework\View\Element\AbstractBlock $renderer
--     * @return \Magento\Sales\Block\Items\AbstractItems
-+     * @return void
-      */
-     protected function _prepareItem(\Magento\Framework\View\Element\AbstractBlock $renderer)
-     {
-diff --git a/app/code/Magento/Sales/Block/Order/History.php b/app/code/Magento/Sales/Block/Order/History.php
-index 80925f66fc8..c06a5d8b24c 100644
---- a/app/code/Magento/Sales/Block/Order/History.php
-+++ b/app/code/Magento/Sales/Block/Order/History.php
-@@ -67,7 +67,7 @@ class History extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
--     * @return void
-+     * @inheritDoc
-      */
-     protected function _construct()
-     {
-@@ -76,8 +76,9 @@ class History extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
--     * @return CollectionFactoryInterface
-+     * Provide order collection factory
-      *
-+     * @return CollectionFactoryInterface
-      * @deprecated 100.1.1
-      */
-     private function getOrderCollectionFactory()
-@@ -89,6 +90,8 @@ class History extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get customer orders
-+     *
-      * @return bool|\Magento\Sales\Model\ResourceModel\Order\Collection
-      */
-     public function getOrders()
-@@ -111,7 +114,7 @@ class History extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
--     * @return $this
-+     * @inheritDoc
-      */
-     protected function _prepareLayout()
-     {
-@@ -130,6 +133,8 @@ class History extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get Pager child block output
-+     *
-      * @return string
-      */
-     public function getPagerHtml()
-@@ -138,6 +143,8 @@ class History extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get order view URL
-+     *
-      * @param object $order
-      * @return string
-      */
-@@ -147,15 +154,23 @@ class History extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get order track URL
-+     *
-      * @param object $order
-      * @return string
-+     * @deprecated Action does not exist
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function getTrackUrl($order)
-     {
--        return $this->getUrl('sales/order/track', ['order_id' => $order->getId()]);
-+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
-+        trigger_error('Method is deprecated', E_USER_DEPRECATED);
-+        return '';
-     }
- 
-     /**
-+     * Get reorder URL
-+     *
-      * @param object $order
-      * @return string
-      */
-@@ -165,6 +180,8 @@ class History extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get customer account URL
-+     *
-      * @return string
-      */
-     public function getBackUrl()
-diff --git a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
-index 2b84b8f1444..626dcf2a5a4 100644
---- a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
-+++ b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
-@@ -46,6 +46,8 @@ class Rss extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get link url.
-+     *
-      * @return string
-      */
-     public function getLink()
-@@ -54,6 +56,8 @@ class Rss extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get translatable label for url.
-+     *
-      * @return \Magento\Framework\Phrase
-      */
-     public function getLabel()
-@@ -91,7 +95,10 @@ class Rss extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
--     * @return string
-+     * Get type, secure and query params for link.
-+     *
-+     * @return array
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     protected function getLinkParams()
-     {
-diff --git a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
-index 09464927117..83e66bbbce7 100644
---- a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
-+++ b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
-@@ -48,6 +48,8 @@ class DefaultRenderer extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Set item.
-+     *
-      * @param \Magento\Framework\DataObject $item
-      * @return $this
-      */
-@@ -58,6 +60,8 @@ class DefaultRenderer extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get item.
-+     *
-      * @return array|null
-      */
-     public function getItem()
-@@ -76,6 +80,8 @@ class DefaultRenderer extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get order item.
-+     *
-      * @return array|null
-      */
-     public function getOrderItem()
-@@ -88,6 +94,8 @@ class DefaultRenderer extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get item options.
-+     *
-      * @return array
-      */
-     public function getItemOptions()
-diff --git a/app/code/Magento/Sales/Block/Order/Items.php b/app/code/Magento/Sales/Block/Order/Items.php
-index 028544cd562..d7255a24aea 100644
---- a/app/code/Magento/Sales/Block/Order/Items.php
-+++ b/app/code/Magento/Sales/Block/Order/Items.php
-@@ -5,13 +5,13 @@
-  */
- 
- /**
-- * Sales order view items block
-- *
-  * @author     Magento Core Team <core@magentocommerce.com>
-  */
- namespace Magento\Sales\Block\Order;
- 
- /**
-+ * Sales order view items block.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -71,7 +71,6 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
- 
-         $this->itemCollection = $this->itemCollectionFactory->create();
-         $this->itemCollection->setOrderFilter($this->getOrder());
--        $this->itemCollection->filterByParent(null);
- 
-         /** @var \Magento\Theme\Block\Html\Pager $pagerBlock */
-         $pagerBlock = $this->getChildBlock('sales_order_item_pager');
-@@ -87,8 +86,9 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
-     }
- 
-     /**
--     * Determine if the pager should be displayed for order items list
--     * To be called from templates(after _prepareLayout())
-+     * Determine if the pager should be displayed for order items list.
-+     *
-+     * To be called from templates(after _prepareLayout()).
-      *
-      * @return bool
-      * @since 100.1.7
-@@ -101,7 +101,8 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
- 
-     /**
-      * Get visible items for current page.
--     * To be called from templates(after _prepareLayout())
-+     *
-+     * To be called from templates(after _prepareLayout()).
-      *
-      * @return \Magento\Framework\DataObject[]
-      * @since 100.1.7
-@@ -112,8 +113,9 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
-     }
- 
-     /**
--     * Get pager HTML according to our requirements
--     * To be called from templates(after _prepareLayout())
-+     * Get pager HTML according to our requirements.
-+     *
-+     * To be called from templates(after _prepareLayout()).
-      *
-      * @return string HTML output
-      * @since 100.1.7
-diff --git a/app/code/Magento/Sales/Block/Order/PrintShipment.php b/app/code/Magento/Sales/Block/Order/PrintShipment.php
-index 335b6095d0c..0006a38f0f1 100644
---- a/app/code/Magento/Sales/Block/Order/PrintShipment.php
-+++ b/app/code/Magento/Sales/Block/Order/PrintShipment.php
-@@ -53,6 +53,8 @@ class PrintShipment extends \Magento\Sales\Block\Items\AbstractItems
-     }
- 
-     /**
-+     * Preparing global layout.
-+     *
-      * @return void
-      */
-     protected function _prepareLayout()
-@@ -63,6 +65,8 @@ class PrintShipment extends \Magento\Sales\Block\Items\AbstractItems
-     }
- 
-     /**
-+     * Get payment info child block html.
-+     *
-      * @return string
-      */
-     public function getPaymentInfoHtml()
-@@ -71,6 +75,8 @@ class PrintShipment extends \Magento\Sales\Block\Items\AbstractItems
-     }
- 
-     /**
-+     * Retrieve current order from registry.
-+     *
-      * @return \Magento\Sales\Model\Order|null
-      */
-     public function getOrder()
-@@ -104,6 +110,8 @@ class PrintShipment extends \Magento\Sales\Block\Items\AbstractItems
-     }
- 
-     /**
-+     * Prepare item before output.
-+     *
-      * @param AbstractBlock $renderer
-      * @return $this
-      */
-@@ -116,7 +124,7 @@ class PrintShipment extends \Magento\Sales\Block\Items\AbstractItems
-     /**
-      * Returns string with formatted address
-      *
--     * @param Address $address
-+     * @param \Magento\Sales\Model\Order\Address $address
-      * @return null|string
-      */
-     public function getFormattedAddress(\Magento\Sales\Model\Order\Address $address)
-diff --git a/app/code/Magento/Sales/Block/Order/Recent.php b/app/code/Magento/Sales/Block/Order/Recent.php
-index 7e5be0ebfbb..79119c18513 100644
---- a/app/code/Magento/Sales/Block/Order/Recent.php
-+++ b/app/code/Magento/Sales/Block/Order/Recent.php
-@@ -71,7 +71,7 @@ class Recent extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
--     * @return void
-+     * @inheritDoc
-      */
-     protected function _construct()
-     {
-@@ -105,6 +105,8 @@ class Recent extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get order view URL
-+     *
-      * @param object $order
-      * @return string
-      */
-@@ -114,16 +116,22 @@ class Recent extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get order track URL
-+     *
-      * @param object $order
-      * @return string
-+     * @deprecated Action does not exist
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function getTrackUrl($order)
-     {
--        return $this->getUrl('sales/order/track', ['order_id' => $order->getId()]);
-+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
-+        trigger_error('Method is deprecated', E_USER_DEPRECATED);
-+        return '';
-     }
- 
-     /**
--     * @return string
-+     * @inheritDoc
-      */
-     protected function _toHtml()
-     {
-@@ -134,6 +142,8 @@ class Recent extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get reorder URL
-+     *
-      * @param object $order
-      * @return string
-      */
-diff --git a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
-index b413951d9d4..f989deb0ae7 100644
---- a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
-+++ b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
-@@ -5,12 +5,35 @@
-  */
- namespace Magento\Sales\Block\Status\Grid\Column;
- 
-+use Magento\Framework\App\ObjectManager;
-+use \Magento\Backend\Block\Template\Context;
-+use Magento\Framework\Serialize\Serializer\Json;
-+
- /**
-  * @api
-  * @since 100.0.2
-  */
- class Unassign extends \Magento\Backend\Block\Widget\Grid\Column
- {
-+    /**
-+     * @var Json
-+     */
-+    private $json;
-+
-+    /**
-+     * @inheritDoc
-+     *
-+     * @param Json|null $json
-+     */
-+    public function __construct(
-+        Context $context,
-+        array $data = [],
-+        ?Json $json = null
-+    ) {
-+        parent::__construct($context, $data);
-+        $this->json = $json ?? ObjectManager::getInstance()->get(Json::class);
-+    }
-+
-     /**
-      * Add decorated action to column
-      *
-@@ -36,9 +59,16 @@ class Unassign extends \Magento\Backend\Block\Widget\Grid\Column
-         $cell = '';
-         $state = $row->getState();
-         if (!empty($state)) {
--            $url = $this->getUrl('*/*/unassign', ['status' => $row->getStatus(), 'state' => $row->getState()]);
-+            $url = $this->getUrl('*/*/unassign');
-             $label = __('Unassign');
--            $cell = '<a href="' . $url . '">' . $label . '</a>';
-+            $cell = '<a href="#" data-post="'
-+                .$this->escapeHtmlAttr(
-+                    $this->json->serialize([
-+                        'action' => $url,
-+                        'data' => ['status' => $row->getStatus(), 'state' => $row->getState()]
-+                    ])
-+                )
-+                .'">' . $label . '</a>';
-         }
-         return $cell;
-     }
-diff --git a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
-index dd4d73930cc..65cb537e89f 100644
---- a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
-+++ b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
-@@ -1,15 +1,21 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Sales\Controller\AbstractController;
- 
- use Magento\Framework\App\Action;
- use Magento\Framework\Registry;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- 
--abstract class Reorder extends Action\Action
-+/**
-+ * Abstract class for controllers Reorder(Customer) and Reorder(Guest)
-+ *
-+ * @package Magento\Sales\Controller\AbstractController
-+ */
-+abstract class Reorder extends Action\Action implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Sales\Controller\AbstractController\OrderLoaderInterface
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php
-index b29c1ea3700..165c9e894de 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php
-@@ -5,7 +5,10 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Creditmemo;
- 
--class Index extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Index
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+use Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Index as AbstractIndex;
-+
-+class Index extends AbstractIndex implements HttpGetActionInterface
- {
-     /**
-      * Index page
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php
-index 429a388d939..bc53f752801 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php
-@@ -6,6 +6,8 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Invoice;
- 
--class Index extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Index
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Index implements HttpGetActionInterface
- {
- }
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php
-index 62add99ab59..3b521999432 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php
-@@ -6,6 +6,8 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Invoice;
- 
--class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View implements HttpGetActionInterface
- {
- }
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
-index 07716314ec6..e85083a50d7 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
-@@ -1,16 +1,17 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- namespace Magento\Sales\Controller\Adminhtml\Order;
- 
--use Magento\Backend\App\Action;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Sales\Model\Order\Email\Sender\OrderCommentSender;
- 
--class AddComment extends \Magento\Sales\Controller\Adminhtml\Order
-+/**
-+ * Class AddComment
-+ */
-+class AddComment extends \Magento\Sales\Controller\Adminhtml\Order implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -19,6 +20,11 @@ class AddComment extends \Magento\Sales\Controller\Adminhtml\Order
-      */
-     const ADMIN_RESOURCE = 'Magento_Sales::comment';
- 
-+    /**
-+     * ACL resource needed to send comment email notification
-+     */
-+    const ADMIN_SALES_EMAIL_RESOURCE = 'Magento_Sales::emails';
-+
-     /**
-      * Add order comment action
-      *
-@@ -36,8 +42,12 @@ class AddComment extends \Magento\Sales\Controller\Adminhtml\Order
-                     );
-                 }
- 
--                $notify = isset($data['is_customer_notified']) ? $data['is_customer_notified'] : false;
--                $visible = isset($data['is_visible_on_front']) ? $data['is_visible_on_front'] : false;
-+                $notify = $data['is_customer_notified'] ?? false;
-+                $visible = $data['is_visible_on_front'] ?? false;
-+
-+                if ($notify && !$this->_authorization->isAllowed(self::ADMIN_SALES_EMAIL_RESOURCE)) {
-+                    $notify = false;
-+                }
- 
-                 $history = $order->addStatusHistoryComment($data['comment'], $data['status']);
-                 $history->setIsVisibleOnFront($visible);
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
-index c71de8cb025..5633e16d7d3 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
-@@ -10,6 +10,7 @@ namespace Magento\Sales\Controller\Adminhtml\Order;
- use Magento\Backend\App\Action\Context;
- use Magento\Backend\Model\View\Result\Redirect;
- use Magento\Directory\Model\RegionFactory;
-+use Magento\Sales\Api\OrderAddressRepositoryInterface;
- use Magento\Sales\Api\OrderManagementInterface;
- use Magento\Sales\Api\OrderRepositoryInterface;
- use Magento\Sales\Api\Data\OrderAddressInterface;
-@@ -25,11 +26,14 @@ use Magento\Framework\View\Result\LayoutFactory;
- use Magento\Framework\Controller\Result\RawFactory;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- 
- /**
-+ * Sales address save
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class AddressSave extends Order
-+class AddressSave extends Order implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -43,6 +47,11 @@ class AddressSave extends Order
-      */
-     private $regionFactory;
- 
-+    /**
-+     * @var OrderAddressRepositoryInterface
-+     */
-+    private $orderAddressRepository;
-+
-     /**
-      * @param Context $context
-      * @param Registry $coreRegistry
-@@ -56,6 +65,7 @@ class AddressSave extends Order
-      * @param OrderRepositoryInterface $orderRepository
-      * @param LoggerInterface $logger
-      * @param RegionFactory|null $regionFactory
-+     * @param OrderAddressRepositoryInterface|null $orderAddressRepository
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -71,9 +81,12 @@ class AddressSave extends Order
-         OrderManagementInterface $orderManagement,
-         OrderRepositoryInterface $orderRepository,
-         LoggerInterface $logger,
--        RegionFactory $regionFactory = null
-+        RegionFactory $regionFactory = null,
-+        OrderAddressRepositoryInterface $orderAddressRepository = null
-     ) {
-         $this->regionFactory = $regionFactory ?: ObjectManager::getInstance()->get(RegionFactory::class);
-+        $this->orderAddressRepository = $orderAddressRepository ?: ObjectManager::getInstance()
-+            ->get(OrderAddressRepositoryInterface::class);
-         parent::__construct(
-             $context,
-             $coreRegistry,
-@@ -107,7 +120,7 @@ class AddressSave extends Order
-         if ($data && $address->getId()) {
-             $address->addData($data);
-             try {
--                $address->save();
-+                $this->orderAddressRepository->save($address);
-                 $this->_eventManager->dispatch(
-                     'admin_sales_order_address_update',
-                     [
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
-index 7e41c7417b3..f96d221a7d3 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order;
- 
--class Cancel extends \Magento\Sales\Controller\Adminhtml\Order
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class Cancel extends \Magento\Sales\Controller\Adminhtml\Order implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php
-index 8496c4f28d8..53ebc26d132 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php
-@@ -6,16 +6,20 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Backend\App\Action;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Sales\Api\OrderManagementInterface;
- use Magento\Sales\Api\OrderRepositoryInterface;
- use Psr\Log\LoggerInterface;
-+use Magento\Sales\Controller\Adminhtml\Order as OrderAction;
- 
- /**
-- * Class CommentsHistory
-+ * Comments History tab, needs to be accessible by POST because of tabs mechanism.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class CommentsHistory extends \Magento\Sales\Controller\Adminhtml\Order
-+class CommentsHistory extends OrderAction implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\LayoutFactory
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
-index dcf5e617d05..b8567cee866 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Controller\Adminhtml\Order;
- 
- use Magento\Backend\App\Action;
-@@ -14,6 +16,7 @@ use Magento\Backend\Model\View\Result\ForwardFactory;
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  * @SuppressWarnings(PHPMD.NumberOfChildren)
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-  */
- abstract class Create extends \Magento\Backend\App\Action
- {
-@@ -38,6 +41,7 @@ abstract class Create extends \Magento\Backend\App\Action
-      * @param \Magento\Framework\Escaper $escaper
-      * @param PageFactory $resultPageFactory
-      * @param ForwardFactory $resultForwardFactory
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         Action\Context $context,
-@@ -47,7 +51,6 @@ abstract class Create extends \Magento\Backend\App\Action
-         ForwardFactory $resultForwardFactory
-     ) {
-         parent::__construct($context);
--        $productHelper->setSkipSaleableCheck(true);
-         $this->escaper = $escaper;
-         $this->resultPageFactory = $resultPageFactory;
-         $this->resultForwardFactory = $resultForwardFactory;
-@@ -362,6 +365,8 @@ abstract class Create extends \Magento\Backend\App\Action
-     }
- 
-     /**
-+     * Reload quote
-+     *
-      * @return $this
-      */
-     protected function _reloadQuote()
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
-index ce3a36729de..634ecd50c6f 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
-@@ -5,17 +5,22 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Create;
- 
--class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+/**
-+ * Order create index page controller.
-+ */
-+class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpGetActionInterface
- {
-     /**
-      * Index page
-      *
--     * @return void
-+     * @return \Magento\Backend\Model\View\Result\Page
-      */
-     public function execute()
-     {
-         $this->_initSession();
--
-+        $this->_getOrderCreateModel()->initRuleData();
-         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
-         $resultPage = $this->resultPageFactory->create();
-         $resultPage->setActiveMenu('Magento_Sales::sales_order');
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php
-index bc4eb3cfba4..1e13e282cae 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php
-@@ -5,12 +5,15 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Create;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Backend\Model\View\Result\ForwardFactory;
- use Magento\Framework\View\Result\PageFactory;
- use Magento\Framework\Controller\Result\RawFactory;
-+use Magento\Sales\Controller\Adminhtml\Order\Create as CreateAction;
- 
--class LoadBlock extends \Magento\Sales\Controller\Adminhtml\Order\Create
-+class LoadBlock extends CreateAction implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * @var RawFactory
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
-index 929e23075e0..4348984d040 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
-@@ -6,9 +6,10 @@
- 
- namespace Magento\Sales\Controller\Adminhtml\Order\Create;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Exception\PaymentException;
- 
--class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create
-+class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpPostActionInterface
- {
-     /**
-      * Saving quote and create order
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php
-index 01119c3aa88..24aedf56ec5 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php
-@@ -5,12 +5,13 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Create;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Backend\Model\View\Result\ForwardFactory;
- use Magento\Framework\View\Result\PageFactory;
- use Magento\Framework\Controller\Result\RawFactory;
- 
--class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create
-+class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpGetActionInterface
- {
-     /**
-      * @var RawFactory
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php
-index ee88b3361cc..bc75bc4a578 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php
-@@ -5,9 +5,10 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Create;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Backend\App\Action;
- 
--class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create
-+class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpGetActionInterface
- {
-     /**
-      * Start order create action
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php
-index 03910f2eccc..3ac3abda82c 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php
-@@ -5,9 +5,10 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Backend\App\Action;
- 
--class NewAction extends \Magento\Backend\App\Action
-+class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
-index 2a2445d2b2a..91ae3b7d4e0 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
-@@ -5,11 +5,12 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Sales\Model\Order;
- use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
- 
--class Save extends \Magento\Backend\App\Action
-+class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php
-index 10ba7e425b6..3dc4aa6dcd5 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php
-@@ -5,7 +5,9 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
- 
--class Start extends \Magento\Backend\App\Action
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Start extends \Magento\Backend\App\Action implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php
-index bfd95666e7c..d49fa8b8dc6 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php
-@@ -5,9 +5,10 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Backend\App\Action;
- 
--class UpdateQty extends \Magento\Backend\App\Action
-+class UpdateQty extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php
-index 13a86befec0..d5dc1171923 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php
-@@ -5,7 +5,9 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order;
- 
--class Index extends \Magento\Sales\Controller\Adminhtml\Order
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Sales\Controller\Adminhtml\Order implements HttpGetActionInterface
- {
-     /**
-      * Orders grid
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php
-index 2d7826807a6..ceb231248ef 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php
-@@ -1,18 +1,22 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- 
- namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Framework\Registry;
- use Magento\Framework\View\Result\PageFactory;
-+use Magento\Sales\Api\OrderRepositoryInterface;
- use Magento\Sales\Model\Service\InvoiceService;
- 
--class NewAction extends \Magento\Backend\App\Action
-+/**
-+ * Create new invoice action.
-+ */
-+class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -36,22 +40,32 @@ class NewAction extends \Magento\Backend\App\Action
-      */
-     private $invoiceService;
- 
-+    /**
-+     * @var OrderRepositoryInterface
-+     */
-+    private $orderRepository;
-+
-     /**
-      * @param Action\Context $context
-      * @param Registry $registry
-      * @param PageFactory $resultPageFactory
-      * @param InvoiceService $invoiceService
-+     * @param OrderRepositoryInterface|null $orderRepository
-      */
-     public function __construct(
-         Action\Context $context,
-         Registry $registry,
-         PageFactory $resultPageFactory,
--        InvoiceService $invoiceService
-+        InvoiceService $invoiceService,
-+        OrderRepositoryInterface $orderRepository = null
-     ) {
-+        parent::__construct($context);
-+
-         $this->registry = $registry;
-         $this->resultPageFactory = $resultPageFactory;
--        parent::__construct($context);
-         $this->invoiceService = $invoiceService;
-+        $this->orderRepository = $orderRepository ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(OrderRepositoryInterface::class);
-     }
- 
-     /**
-@@ -77,14 +91,11 @@ class NewAction extends \Magento\Backend\App\Action
-     {
-         $orderId = $this->getRequest()->getParam('order_id');
-         $invoiceData = $this->getRequest()->getParam('invoice', []);
--        $invoiceItems = isset($invoiceData['items']) ? $invoiceData['items'] : [];
-+        $invoiceItems = $invoiceData['items'] ?? [];
- 
-         try {
-             /** @var \Magento\Sales\Model\Order $order */
--            $order = $this->_objectManager->create(\Magento\Sales\Model\Order::class)->load($orderId);
--            if (!$order->getId()) {
--                throw new \Magento\Framework\Exception\LocalizedException(__('The order no longer exists.'));
--            }
-+            $order = $this->orderRepository->get($orderId);
- 
-             if (!$order->canInvoice()) {
-                 throw new \Magento\Framework\Exception\LocalizedException(
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
-index 71338c818c4..67a0dc46916 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
-@@ -7,6 +7,7 @@
- 
- namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Registry;
-@@ -17,9 +18,11 @@ use Magento\Sales\Model\Order\Invoice;
- use Magento\Sales\Model\Service\InvoiceService;
- 
- /**
-+ * Save invoice controller.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Save extends \Magento\Backend\App\Action
-+class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -102,6 +105,7 @@ class Save extends \Magento\Backend\App\Action
- 
-     /**
-      * Save invoice
-+     *
-      * We can save only new invoice. Existing invoices are not editable
-      *
-      * @return \Magento\Framework\Controller\ResultInterface
-@@ -193,12 +197,6 @@ class Save extends \Magento\Backend\App\Action
-             }
-             $transactionSave->save();
- 
--            if (!empty($data['do_shipment'])) {
--                $this->messageManager->addSuccessMessage(__('You created the invoice and shipment.'));
--            } else {
--                $this->messageManager->addSuccessMessage(__('The invoice has been created.'));
--            }
--
-             // send invoice/shipment emails
-             try {
-                 if (!empty($data['send_email'])) {
-@@ -218,6 +216,11 @@ class Save extends \Magento\Backend\App\Action
-                     $this->messageManager->addErrorMessage(__('We can\'t send the shipment right now.'));
-                 }
-             }
-+            if (!empty($data['do_shipment'])) {
-+                $this->messageManager->addSuccessMessage(__('You created the invoice and shipment.'));
-+            } else {
-+                $this->messageManager->addSuccessMessage(__('The invoice has been created.'));
-+            }
-             $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getCommentText(true);
-             return $resultRedirect->setPath('sales/order/view', ['order_id' => $orderId]);
-         } catch (LocalizedException $e) {
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php
-index ca97ee3b334..4648656a325 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
- 
--class Start extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Start extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View implements HttpGetActionInterface
- {
-     /**
-      * Start create invoice action
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
-index 78fb4aff3f2..c94afa3cc80 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
-@@ -7,20 +7,21 @@
- 
- namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Exception\LocalizedException;
--use Magento\Backend\App\Action;
- use Magento\Framework\Controller\Result\JsonFactory;
- use Magento\Framework\View\Result\PageFactory;
- use Magento\Framework\Controller\Result\RawFactory;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\Registry;
- use Magento\Sales\Model\Service\InvoiceService;
-+use Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View as AbstractView;
- 
- /**
-  * Class UpdateQty
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class UpdateQty extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
-+class UpdateQty extends AbstractView implements HttpPostActionInterface
- {
-     /**
-      * @var JsonFactory
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php
-index 78a413d5636..da700aae2f7 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php
-@@ -6,11 +6,12 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\View\Result\PageFactory;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\Registry;
- 
--class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
-+class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View implements HttpGetActionInterface
- {
- 
-     /**
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php
-index 32cf6dbfc7c..deb20a989a2 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php
-@@ -5,13 +5,14 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
- use Magento\Backend\App\Action\Context;
- use Magento\Ui\Component\MassAction\Filter;
- use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
- use Magento\Sales\Api\OrderManagementInterface;
- 
--class MassCancel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
-+class MassCancel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
-index 241255f68e3..5c96fbbe9e2 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
- use Magento\Backend\App\Action\Context;
- use Magento\Ui\Component\MassAction\Filter;
-@@ -14,7 +15,7 @@ use Magento\Sales\Api\OrderManagementInterface;
- /**
-  * Class MassHold
-  */
--class MassHold extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
-+class MassHold extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php
-index 5e8ea9c4ad0..e862710379a 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php
-@@ -5,13 +5,19 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
- use Magento\Backend\App\Action\Context;
- use Magento\Ui\Component\MassAction\Filter;
- use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
- use Magento\Sales\Api\OrderManagementInterface;
- 
--class MassUnhold extends AbstractMassAction
-+/**
-+ * Class MassUnhold, change status for select orders
-+ *
-+ * @package Magento\Sales\Controller\Adminhtml\Order
-+ */
-+class MassUnhold extends AbstractMassAction implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -24,6 +30,8 @@ class MassUnhold extends AbstractMassAction
-     private $orderManagement;
- 
-     /**
-+     * Class constructor
-+     *
-      * @param Context $context
-      * @param Filter $filter
-      * @param CollectionFactory $collectionFactory
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php
-index 982ee53cb0f..211ded865b4 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php
-@@ -6,11 +6,12 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Status;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\Registry;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\View\Result\PageFactory;
- 
--class Assign extends \Magento\Sales\Controller\Adminhtml\Order\Status
-+class Assign extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpGetActionInterface
- {
-     /**
-      * @var PageFactory
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php
-index 3b98d206d5f..28a8e1cb02a 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Status;
- 
--class AssignPost extends \Magento\Sales\Controller\Adminhtml\Order\Status
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class AssignPost extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpPostActionInterface
- {
-     /**
-      * Save status assignment to state
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php
-index 110402ee270..3755dca9da9 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php
-@@ -6,11 +6,12 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Status;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\Registry;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\View\Result\PageFactory;
- 
--class Index extends \Magento\Sales\Controller\Adminhtml\Order\Status
-+class Index extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpGetActionInterface
- {
-     /**
-      * @var PageFactory
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
-index bd0ad771815..4645588a752 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
-@@ -6,25 +6,32 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Status;
- 
--class Save extends \Magento\Sales\Controller\Adminhtml\Order\Status
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+use Magento\Framework\Filter\FilterManager;
-+use Magento\Sales\Model\Order\Status;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Controller\Result\Redirect;
-+use Magento\Sales\Controller\Adminhtml\Order\Status as StatusAction;
-+
-+class Save extends StatusAction implements HttpPostActionInterface
- {
-     /**
-      * Save status form processing
-      *
--     * @return \Magento\Backend\Model\View\Result\Redirect
-+     * @return Redirect
-      */
-     public function execute()
-     {
-         $data = $this->getRequest()->getPostValue();
-         $isNew = $this->getRequest()->getParam('is_new');
--        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-+        /** @var Redirect $resultRedirect */
-         $resultRedirect = $this->resultRedirectFactory->create();
-         if ($data) {
-             $statusCode = $this->getRequest()->getParam('status');
- 
-             //filter tags in labels/status
--            /** @var $filterManager \Magento\Framework\Filter\FilterManager */
--            $filterManager = $this->_objectManager->get(\Magento\Framework\Filter\FilterManager::class);
-+            /** @var $filterManager FilterManager */
-+            $filterManager = $this->_objectManager->get(FilterManager::class);
-             if ($isNew) {
-                 $statusCode = $data['status'] = $filterManager->stripTags($data['status']);
-             }
-@@ -37,7 +44,7 @@ class Save extends \Magento\Sales\Controller\Adminhtml\Order\Status
-                 $label = $filterManager->stripTags($label);
-             }
- 
--            $status = $this->_objectManager->create(\Magento\Sales\Model\Order\Status::class)->load($statusCode);
-+            $status = $this->_objectManager->create(Status::class)->load($statusCode);
-             // check if status exist
-             if ($isNew && $status->getStatus()) {
-                 $this->messageManager
-@@ -52,7 +59,7 @@ class Save extends \Magento\Sales\Controller\Adminhtml\Order\Status
-                 $status->save();
-                 $this->messageManager->addSuccessMessage(__('You saved the order status.'));
-                 return $resultRedirect->setPath('sales/*/');
--            } catch (\Magento\Framework\Exception\LocalizedException $e) {
-+            } catch (LocalizedException $e) {
-                 $this->messageManager->addErrorMessage($e->getMessage());
-             } catch (\Exception $e) {
-                 $this->messageManager->addExceptionMessage(
-@@ -67,11 +74,11 @@ class Save extends \Magento\Sales\Controller\Adminhtml\Order\Status
-     }
- 
-     /**
--     * @param \Magento\Backend\Model\View\Result\Redirect $resultRedirect
-+     * @param Redirect $resultRedirect
-      * @param bool $isNew
--     * @return \Magento\Backend\Model\View\Result\Redirect
-+     * @return Redirect
-      */
--    private function getRedirect(\Magento\Backend\Model\View\Result\Redirect $resultRedirect, $isNew)
-+    private function getRedirect(Redirect $resultRedirect, $isNew)
-     {
-         if ($isNew) {
-             return $resultRedirect->setPath('sales/*/new');
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php
-index 2723d483dd3..16bb275a88e 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Order\Status;
- 
--class Unassign extends \Magento\Sales\Controller\Adminhtml\Order\Status
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+class Unassign extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpPostActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Redirect
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php
-index c7f560c52fb..59d8a68a744 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php
-@@ -6,6 +6,9 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Shipment;
- 
--class Index extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Index
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+use Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Index as AbstractIndex;
-+
-+class Index extends AbstractIndex implements HttpGetActionInterface
- {
- }
-diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php
-index 750781e9919..a7327050064 100644
---- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php
-+++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Sales\Controller\Adminhtml\Transactions;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Backend\Model\View\Result\Page;
- 
--class Index extends \Magento\Sales\Controller\Adminhtml\Transactions
-+class Index extends \Magento\Sales\Controller\Adminhtml\Transactions implements HttpGetActionInterface
- {
-     /**
-      * @return Page
-diff --git a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
-index 0deddd9fb6e..fc4e238d47c 100644
---- a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
-+++ b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
-@@ -4,9 +4,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Sales\Controller\Download;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\App\Action\Context;
- use Magento\Catalog\Model\Product\Type\AbstractType;
-@@ -14,9 +16,10 @@ use Magento\Framework\Controller\Result\ForwardFactory;
- 
- /**
-  * Class DownloadCustomOption
-+ *
-  * @package Magento\Sales\Controller\Download
-  */
--class DownloadCustomOption extends \Magento\Framework\App\Action\Action
-+class DownloadCustomOption extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
- {
-     /**
-      * @var ForwardFactory
-@@ -95,10 +98,11 @@ class DownloadCustomOption extends \Magento\Framework\App\Action\Action
-             /** @var $productOption \Magento\Catalog\Model\Product\Option */
-             $productOption = $this->_objectManager->create(
-                 \Magento\Catalog\Model\Product\Option::class
--            )->load($optionId);
-+            );
-+            $productOption->load($optionId);
-         }
- 
--        if (!$productOption || !$productOption->getId() || $productOption->getType() != 'file') {
-+        if ($productOption->getId() && $productOption->getType() != 'file') {
-             return $resultForward->forward('noroute');
-         }
- 
-@@ -118,10 +122,10 @@ class DownloadCustomOption extends \Magento\Framework\App\Action\Action
-      * Ends execution process
-      *
-      * @return void
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     protected function endExecute()
-     {
-+        // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-         exit(0);
-     }
- }
-diff --git a/app/code/Magento/Sales/Controller/Guest/Form.php b/app/code/Magento/Sales/Controller/Guest/Form.php
-index 8b4467cb538..04bb66f3d5b 100644
---- a/app/code/Magento/Sales/Controller/Guest/Form.php
-+++ b/app/code/Magento/Sales/Controller/Guest/Form.php
-@@ -4,40 +4,72 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Controller\Guest;
- 
--class Form extends \Magento\Framework\App\Action\Action
-+use Magento\Customer\Model\Session as CustomerSession;
-+use Magento\Framework\App\Action\Context;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Controller\Result\Redirect;
-+use Magento\Framework\View\Result\Page;
-+use Magento\Framework\View\Result\PageFactory;
-+use Magento\Sales\Helper\Guest as GuestHelper;
-+
-+/**
-+ * Class Form
-+ */
-+class Form extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
- {
-     /**
--     * @var \Magento\Framework\View\Result\PageFactory
-+     * @var PageFactory
-      */
-     protected $resultPageFactory;
- 
-     /**
--     * @param \Magento\Framework\App\Action\Context $context
--     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-+     * @var CustomerSession|null
-+     */
-+    private $customerSession;
-+
-+    /**
-+     * @var GuestHelper|null
-+     */
-+    private $guestHelper;
-+
-+    /**
-+     * @param Context $context
-+     * @param PageFactory $resultPageFactory
-+     * @param CustomerSession|null $customerSession
-+     * @param GuestHelper|null $guestHelper
-      */
-     public function __construct(
--        \Magento\Framework\App\Action\Context $context,
--        \Magento\Framework\View\Result\PageFactory $resultPageFactory
-+        Context $context,
-+        PageFactory $resultPageFactory,
-+        CustomerSession $customerSession = null,
-+        GuestHelper $guestHelper = null
-     ) {
-         parent::__construct($context);
-         $this->resultPageFactory = $resultPageFactory;
-+        $this->customerSession = $customerSession ?: ObjectManager::getInstance()->get(CustomerSession::class);
-+        $this->guestHelper = $guestHelper ?: ObjectManager::getInstance()->get(GuestHelper::class);
-     }
- 
-     /**
-      * Order view form page
-      *
--     * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
-+     * @return Redirect|Page
-      */
-     public function execute()
-     {
--        if ($this->_objectManager->get(\Magento\Customer\Model\Session::class)->isLoggedIn()) {
-+        if ($this->customerSession->isLoggedIn()) {
-             return $this->resultRedirectFactory->create()->setPath('customer/account/');
-         }
-+
-         $resultPage = $this->resultPageFactory->create();
-         $resultPage->getConfig()->getTitle()->set(__('Orders and Returns'));
--        $this->_objectManager->get(\Magento\Sales\Helper\Guest::class)->getBreadcrumbs($resultPage);
-+        $this->guestHelper->getBreadcrumbs($resultPage);
-+
-         return $resultPage;
-     }
- }
-diff --git a/app/code/Magento/Sales/Controller/Order/Creditmemo.php b/app/code/Magento/Sales/Controller/Order/Creditmemo.php
-index 2a7fd3e9849..74aae3e1f84 100644
---- a/app/code/Magento/Sales/Controller/Order/Creditmemo.php
-+++ b/app/code/Magento/Sales/Controller/Order/Creditmemo.php
-@@ -6,8 +6,10 @@
-  */
- namespace Magento\Sales\Controller\Order;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Sales\Controller\OrderInterface;
-+use Magento\Sales\Controller\AbstractController\Creditmemo as AbstractCreditmemo;
- 
--class Creditmemo extends \Magento\Sales\Controller\AbstractController\Creditmemo implements OrderInterface
-+class Creditmemo extends AbstractCreditmemo implements OrderInterface, HttpGetActionInterface
- {
- }
-diff --git a/app/code/Magento/Sales/Controller/Order/History.php b/app/code/Magento/Sales/Controller/Order/History.php
-index 23e8208d8b1..37de1598458 100644
---- a/app/code/Magento/Sales/Controller/Order/History.php
-+++ b/app/code/Magento/Sales/Controller/Order/History.php
-@@ -6,11 +6,12 @@
-  */
- namespace Magento\Sales\Controller\Order;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Sales\Controller\OrderInterface;
- use Magento\Framework\App\Action\Context;
- use Magento\Framework\View\Result\PageFactory;
- 
--class History extends \Magento\Framework\App\Action\Action implements OrderInterface
-+class History extends \Magento\Framework\App\Action\Action implements OrderInterface, HttpGetActionInterface
- {
-     /**
-      * @var PageFactory
-diff --git a/app/code/Magento/Sales/Controller/Order/View.php b/app/code/Magento/Sales/Controller/Order/View.php
-index d68b9481c86..21a5706a444 100644
---- a/app/code/Magento/Sales/Controller/Order/View.php
-+++ b/app/code/Magento/Sales/Controller/Order/View.php
-@@ -6,8 +6,9 @@
-  */
- namespace Magento\Sales\Controller\Order;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Sales\Controller\OrderInterface;
- 
--class View extends \Magento\Sales\Controller\AbstractController\View implements OrderInterface
-+class View extends \Magento\Sales\Controller\AbstractController\View implements OrderInterface, HttpGetActionInterface
- {
- }
-diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
-index 45a6dd1252b..ab212f77ce9 100644
---- a/app/code/Magento/Sales/Helper/Admin.php
-+++ b/app/code/Magento/Sales/Helper/Admin.php
-@@ -3,8 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Helper;
- 
-+/**
-+ * Sales admin helper.
-+ */
- class Admin extends \Magento\Framework\App\Helper\AbstractHelper
- {
-     /**
-@@ -148,26 +153,19 @@ class Admin extends \Magento\Framework\App\Helper\AbstractHelper
-             $links = [];
-             $i = 1;
-             $data = str_replace('%', '%%', $data);
--            $regexp = "/<a\s[^>]*href\s*?=\s*?([\"\']??)([^\" >]*?)\\1[^>]*>(.*)<\/a>/siU";
-+            $regexp = "#(?J)<a"
-+                ."(?:(?:\s+(?:(?:href\s*=\s*(['\"])(?<link>.*?)\\1\s*)|(?:\S+\s*=\s*(['\"])(.*?)\\3)\s*)*)|>)"
-+                .">?(?:(?:(?<text>.*?)(?:<\/a\s*>?|(?=<\w))|(?<text>.*)))#si";
-             while (preg_match($regexp, $data, $matches)) {
--                //Revert the sprintf escaping
--                $url = str_replace('%%', '%', $matches[2]);
--                $text = str_replace('%%', '%', $matches[3]);
--                //Check for an valid url
--                if ($url) {
--                    $urlScheme = strtolower(parse_url($url, PHP_URL_SCHEME));
--                    if ($urlScheme !== 'http' && $urlScheme !== 'https') {
--                        $url = null;
--                    }
--                }
--                //Use hash tag as fallback
--                if (!$url) {
--                    $url = '#';
-+                $text = '';
-+                if (!empty($matches['text'])) {
-+                    $text = str_replace('%%', '%', $matches['text']);
-                 }
-+                $url = $this->filterUrl($matches['link'] ?? '');
-                 //Recreate a minimalistic secure a tag
-                 $links[] = sprintf(
-                     '<a href="%s">%s</a>',
--                    htmlspecialchars($url, ENT_QUOTES, 'UTF-8', false),
-+                    $this->escaper->escapeHtml($url),
-                     $this->escaper->escapeHtml($text)
-                 );
-                 $data = str_replace($matches[0], '%' . $i . '$s', $data);
-@@ -178,4 +176,30 @@ class Admin extends \Magento\Framework\App\Helper\AbstractHelper
-         }
-         return $this->escaper->escapeHtml($data, $allowedTags);
-     }
-+
-+    /**
-+     * Filter the URL for allowed protocols.
-+     *
-+     * @param string $url
-+     * @return string
-+     */
-+    private function filterUrl(string $url): string
-+    {
-+        if ($url) {
-+            //Revert the sprintf escaping
-+            $url = str_replace('%%', '%', $url);
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+            $urlScheme = parse_url($url, PHP_URL_SCHEME);
-+            $urlScheme = $urlScheme ? strtolower($urlScheme) : '';
-+            if ($urlScheme !== 'http' && $urlScheme !== 'https') {
-+                $url = null;
-+            }
-+        }
-+
-+        if (!$url) {
-+            $url = '#';
-+        }
-+
-+        return $url;
-+    }
- }
-diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
-index b690395ebab..01f1fe850b8 100644
---- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
-+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
-@@ -14,6 +14,7 @@ use Magento\Quote\Model\Quote\Address;
- use Magento\Quote\Model\Quote\Item;
- use Magento\Sales\Api\Data\OrderAddressInterface;
- use Magento\Sales\Model\Order;
-+use Magento\Store\Model\StoreManagerInterface;
- use Psr\Log\LoggerInterface;
- 
- /**
-@@ -22,6 +23,7 @@ use Psr\Log\LoggerInterface;
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @since 100.0.2
-  */
- class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\Model\Cart\CartInterface
-@@ -242,6 +244,11 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-      */
-     private $dataObjectConverter;
- 
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-     /**
-      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-@@ -273,6 +280,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-      * @param array $data
-      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-      * @param ExtensibleDataObjectConverter|null $dataObjectConverter
-+     * @param StoreManagerInterface $storeManager
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -305,7 +313,8 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-         \Magento\Quote\Model\QuoteFactory $quoteFactory,
-         array $data = [],
-         \Magento\Framework\Serialize\Serializer\Json $serializer = null,
--        ExtensibleDataObjectConverter $dataObjectConverter = null
-+        ExtensibleDataObjectConverter $dataObjectConverter = null,
-+        StoreManagerInterface $storeManager = null
-     ) {
-         $this->_objectManager = $objectManager;
-         $this->_eventManager = $eventManager;
-@@ -339,6 +348,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-         parent::__construct($data);
-         $this->dataObjectConverter = $dataObjectConverter ?: ObjectManager::getInstance()
-             ->get(ExtensibleDataObjectConverter::class);
-+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
-     }
- 
-     /**
-@@ -388,6 +398,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-      */
-     public function initRuleData()
-     {
-+        $this->_coreRegistry->unregister('rule_data');
-         $this->_coreRegistry->register(
-             'rule_data',
-             new \Magento\Framework\DataObject(
-@@ -405,7 +416,8 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-     /**
-      * Set collect totals flag for quote
-      *
--     * @param   bool $flag
-+     * @param bool $flag
-+     *
-      * @return $this
-      */
-     public function setRecollect($flag)
-@@ -416,7 +428,8 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
- 
-     /**
-      * Recollect totals for customer cart.
--     * Set recollect totals flag for quote
-+     *
-+     * Set recollect totals flag for quote.
-      *
-      * @return $this
-      */
-@@ -503,6 +516,9 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-         /* Check if we edit guest order */
-         $session->setCustomerId($order->getCustomerId() ?: false);
-         $session->setStoreId($order->getStoreId());
-+        if ($session->getData('reordered')) {
-+            $this->getQuote()->setCustomerGroupId($order->getCustomerGroupId());
-+        }
- 
-         /* Initialize catalog rule data with new session values */
-         $this->initRuleData();
-@@ -572,6 +588,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-         }
- 
-         $quote->getShippingAddress()->unsCachedItemsAll();
-+        $quote->getBillingAddress()->unsCachedItemsAll();
-         $quote->setTotalsCollectedFlag(false);
- 
-         $this->quoteRepository->save($quote);
-@@ -759,7 +776,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-     public function getCustomerGroupId()
-     {
-         $groupId = $this->getQuote()->getCustomerGroupId();
--        if (!$groupId) {
-+        if (!isset($groupId)) {
-             $groupId = $this->getSession()->getCustomerGroupId();
-         }
- 
-@@ -1117,6 +1134,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-             $this->recollectCart();
-             throw $e;
-+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
-         } catch (\Exception $e) {
-             $this->_logger->critical($e);
-         }
-@@ -1333,6 +1351,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
- 
-     /**
-      * Set and validate Quote address
-+     *
-      * All errors added to _errors
-      *
-      * @param \Magento\Quote\Model\Quote\Address $address
-@@ -1536,6 +1555,8 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-      */
-     public function collectShippingRates()
-     {
-+        $store = $this->getQuote()->getStore();
-+        $this->storeManager->setCurrentStore($store);
-         $this->getQuote()->getShippingAddress()->setCollectShippingRates(true);
-         $this->collectRates();
- 
-@@ -1775,7 +1796,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-                 ->setWebsiteId($store->getWebsiteId())
-                 ->setCreatedAt(null);
-             $customer = $this->_validateCustomerData($customer);
--        } else if (!$customer->getId()) {
-+        } elseif (!$customer->getId()) {
-             /** Create new customer */
-             $customerBillingAddressDataObject = $this->getBillingAddress()->exportCustomerAddress();
-             $customer->setSuffix($customerBillingAddressDataObject->getSuffix())
-@@ -1847,6 +1868,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-         } elseif ($addressType == \Magento\Quote\Model\Quote\Address::ADDRESS_TYPE_SHIPPING) {
-             try {
-                 $billingAddressDataObject = $this->accountManagement->getDefaultBillingAddress($customer->getId());
-+                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-             } catch (\Exception $e) {
-                 /** Billing address does not exist. */
-             }
-@@ -1988,6 +2010,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
-             } else {
-                 try {
-                     $method->validate();
-+                    // phpcs:ignore Magento2.Exceptions.ThrowCatch
-                 } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                     $this->_errors[] = $e->getMessage();
-                 }
-diff --git a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
-index 8a7bd0260df..999bb1786cf 100644
---- a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
-+++ b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
-@@ -3,11 +3,19 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Model\CronJob;
- 
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Sales\Api\OrderManagementInterface;
-+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
- use Magento\Store\Model\StoresConfig;
- use Magento\Sales\Model\Order;
- 
-+/**
-+ * Class that provides functionality of cleaning expired quotes by cron
-+ */
- class CleanExpiredOrders
- {
-     /**
-@@ -16,20 +24,28 @@ class CleanExpiredOrders
-     protected $storesConfig;
- 
-     /**
--     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
-+     * @var CollectionFactory
-      */
-     protected $orderCollectionFactory;
- 
-+    /**
-+     * @var OrderManagementInterface
-+     */
-+    private $orderManagement;
-+
-     /**
-      * @param StoresConfig $storesConfig
--     * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $collectionFactory
-+     * @param CollectionFactory $collectionFactory
-+     * @param OrderManagementInterface|null $orderManagement
-      */
-     public function __construct(
-         StoresConfig $storesConfig,
--        \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $collectionFactory
-+        CollectionFactory $collectionFactory,
-+        OrderManagementInterface $orderManagement = null
-     ) {
-         $this->storesConfig = $storesConfig;
-         $this->orderCollectionFactory = $collectionFactory;
-+        $this->orderManagement = $orderManagement ?: ObjectManager::getInstance()->get(OrderManagementInterface::class);
-     }
- 
-     /**
-@@ -48,8 +64,10 @@ class CleanExpiredOrders
-             $orders->getSelect()->where(
-                 new \Zend_Db_Expr('TIME_TO_SEC(TIMEDIFF(CURRENT_TIMESTAMP, `updated_at`)) >= ' . $lifetime * 60)
-             );
--            $orders->walk('cancel');
--            $orders->walk('save');
-+
-+            foreach ($orders->getAllIds() as $entityId) {
-+                $this->orderManagement->cancel((int) $entityId);
-+            }
-         }
-     }
- }
-diff --git a/app/code/Magento/Sales/Model/Download.php b/app/code/Magento/Sales/Model/Download.php
-index 6d3ad849125..a76b72bfa41 100644
---- a/app/code/Magento/Sales/Model/Download.php
-+++ b/app/code/Magento/Sales/Model/Download.php
-@@ -8,6 +8,9 @@ namespace Magento\Sales\Model;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\Exception\LocalizedException;
- 
-+/**
-+ * Class Download. Represents download logic for files
-+ */
- class Download
- {
-     /**
-@@ -36,6 +39,8 @@ class Download
-     protected $rootDirBasePath;
- 
-     /**
-+     * Constructor method
-+     *
-      * @param \Magento\Framework\Filesystem $filesystem
-      * @param \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDatabase
-      * @param \Magento\MediaStorage\Model\File\Storage\DatabaseFactory $storageDatabaseFactory
-@@ -78,11 +83,14 @@ class Download
-         $this->_fileFactory->create(
-             $info['title'],
-             ['value' => $this->_rootDir->getRelativePath($relativePath), 'type' => 'filename'],
--            $this->rootDirBasePath
-+            $this->rootDirBasePath,
-+            $info['type']
-         );
-     }
- 
-     /**
-+     * Method checks, if file can be returned depends on the given filepath
-+     *
-      * @param string $relativePath
-      * @return bool
-      */
-diff --git a/app/code/Magento/Sales/Model/EmailSenderHandler.php b/app/code/Magento/Sales/Model/EmailSenderHandler.php
-index fe8f1685fe5..7c7005bf0da 100644
---- a/app/code/Magento/Sales/Model/EmailSenderHandler.php
-+++ b/app/code/Magento/Sales/Model/EmailSenderHandler.php
-@@ -90,6 +90,9 @@ class EmailSenderHandler
-         if ($this->globalConfig->getValue('sales_email/general/async_sending')) {
-             $this->entityCollection->addFieldToFilter('send_email', ['eq' => 1]);
-             $this->entityCollection->addFieldToFilter('email_sent', ['null' => true]);
-+            $this->entityCollection->setPageSize(
-+                $this->globalConfig->getValue('sales_email/general/sending_limit')
-+            );
- 
-             /** @var \Magento\Store\Api\Data\StoreInterface[] $stores */
-             $stores = $this->getStores(clone $this->entityCollection);
-diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
-index 7372d9715c7..48deddb2fe5 100644
---- a/app/code/Magento/Sales/Model/Order.php
-+++ b/app/code/Magento/Sales/Model/Order.php
-@@ -8,19 +8,24 @@ namespace Magento\Sales\Model;
- use Magento\Directory\Model\Currency;
- use Magento\Framework\Api\AttributeValueFactory;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Locale\ResolverInterface;
- use Magento\Framework\Pricing\PriceCurrencyInterface;
- use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Api\Data\OrderItemInterface;
- use Magento\Sales\Api\Data\OrderStatusHistoryInterface;
- use Magento\Sales\Model\Order\Payment;
-+use Magento\Sales\Model\Order\ProductOption;
- use Magento\Sales\Model\ResourceModel\Order\Address\Collection;
- use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection as CreditmemoCollection;
- use Magento\Sales\Model\ResourceModel\Order\Invoice\Collection as InvoiceCollection;
--use Magento\Sales\Model\ResourceModel\Order\Item\Collection as ImportCollection;
-+use Magento\Sales\Model\ResourceModel\Order\Item\Collection as ItemCollection;
- use Magento\Sales\Model\ResourceModel\Order\Payment\Collection as PaymentCollection;
- use Magento\Sales\Model\ResourceModel\Order\Shipment\Collection as ShipmentCollection;
- use Magento\Sales\Model\ResourceModel\Order\Shipment\Track\Collection as TrackCollection;
- use Magento\Sales\Model\ResourceModel\Order\Status\History\Collection as HistoryCollection;
-+use Magento\Sales\Api\OrderItemRepositoryInterface;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
- 
- /**
-  * Order model
-@@ -279,6 +284,21 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-      */
-     private $localeResolver;
- 
-+    /**
-+     * @var ProductOption
-+     */
-+    private $productOption;
-+
-+    /**
-+     * @var OrderItemRepositoryInterface
-+     */
-+    private $itemRepository;
-+
-+    /**
-+     * @var SearchCriteriaBuilder
-+     */
-+    private $searchCriteriaBuilder;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -308,6 +328,9 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-      * @param array $data
-      * @param ResolverInterface $localeResolver
-+     * @param ProductOption|null $productOption
-+     * @param OrderItemRepositoryInterface $itemRepository
-+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -338,7 +361,10 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-         array $data = [],
--        ResolverInterface $localeResolver = null
-+        ResolverInterface $localeResolver = null,
-+        ProductOption $productOption = null,
-+        OrderItemRepositoryInterface $itemRepository = null,
-+        SearchCriteriaBuilder $searchCriteriaBuilder = null
-     ) {
-         $this->_storeManager = $storeManager;
-         $this->_orderConfig = $orderConfig;
-@@ -361,6 +387,11 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-         $this->salesOrderCollectionFactory = $salesOrderCollectionFactory;
-         $this->priceCurrency = $priceCurrency;
-         $this->localeResolver = $localeResolver ?: ObjectManager::getInstance()->get(ResolverInterface::class);
-+        $this->productOption = $productOption ?: ObjectManager::getInstance()->get(ProductOption::class);
-+        $this->itemRepository = $itemRepository ?: ObjectManager::getInstance()
-+            ->get(OrderItemRepositoryInterface::class);
-+        $this->searchCriteriaBuilder = $searchCriteriaBuilder ?: ObjectManager::getInstance()
-+            ->get(SearchCriteriaBuilder::class);
- 
-         parent::__construct(
-             $context,
-@@ -546,6 +577,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-                 break;
-             }
-         }
-+
-         if ($allInvoiced) {
-             return false;
-         }
-@@ -564,6 +596,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
- 
-     /**
-      * Getter whether the payment can be voided
-+     *
-      * @return bool
-      */
-     public function canVoidPayment()
-@@ -620,11 +653,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-             return $this->getForcedCanCreditmemo();
-         }
- 
--        if ($this->canUnhold() || $this->isPaymentReview()) {
--            return false;
--        }
--
--        if ($this->isCanceled() || $this->getState() === self::STATE_CLOSED) {
-+        if ($this->canUnhold() || $this->isPaymentReview() ||
-+            $this->isCanceled() || $this->getState() === self::STATE_CLOSED) {
-             return false;
-         }
- 
-@@ -634,15 +664,52 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-          * TotalPaid - contains amount, that were not rounded.
-          */
-         $totalRefunded = $this->priceCurrency->round($this->getTotalPaid()) - $this->getTotalRefunded();
--        if (abs($totalRefunded) < .0001) {
--            return false;
-+        if (abs($this->getGrandTotal()) < .0001) {
-+            return $this->canCreditmemoForZeroTotal($totalRefunded);
-         }
-+
-+        return $this->canCreditmemoForZeroTotalRefunded($totalRefunded);
-+    }
-+
-+    /**
-+     * Retrieve credit memo for zero total refunded availability.
-+     *
-+     * @param float $totalRefunded
-+     * @return bool
-+     */
-+    private function canCreditmemoForZeroTotalRefunded($totalRefunded)
-+    {
-+        $isRefundZero = abs($totalRefunded) < .0001;
-         // Case when Adjustment Fee (adjustment_negative) has been used for first creditmemo
--        if (abs($totalRefunded - $this->getAdjustmentNegative()) < .0001) {
-+        $hasAdjustmentFee = abs($totalRefunded - $this->getAdjustmentNegative()) < .0001;
-+        $hasActionFlag = $this->getActionFlag(self::ACTION_FLAG_EDIT) === false;
-+        if ($isRefundZero || $hasAdjustmentFee || $hasActionFlag) {
-             return false;
-         }
- 
--        if ($this->getActionFlag(self::ACTION_FLAG_EDIT) === false) {
-+        return true;
-+    }
-+
-+    /**
-+     * Retrieve credit memo for zero total availability.
-+     *
-+     * @param float $totalRefunded
-+     * @return bool
-+     */
-+    private function canCreditmemoForZeroTotal($totalRefunded)
-+    {
-+        $totalPaid = $this->getTotalPaid();
-+        //check if total paid is less than grandtotal
-+        $checkAmtTotalPaid = $totalPaid <= $this->getGrandTotal();
-+        //case when amount is due for invoice
-+        $hasDueAmount = $this->canInvoice() && ($checkAmtTotalPaid);
-+        //case when paid amount is refunded and order has creditmemo created
-+        $creditmemos = ($this->getCreditmemosCollection() === false) ?
-+             true : (count($this->getCreditmemosCollection()) > 0);
-+        $paidAmtIsRefunded = $this->getTotalRefunded() == $totalPaid && $creditmemos;
-+        if (($hasDueAmount || $paidAmtIsRefunded) ||
-+            (!$checkAmtTotalPaid &&
-+            abs($totalRefunded - $this->getAdjustmentNegative()) < .0001)) {
-             return false;
-         }
-         return true;
-@@ -719,13 +786,25 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-         }
- 
-         foreach ($this->getAllItems() as $item) {
--            if ($item->getQtyToShip() > 0 && !$item->getIsVirtual() && !$item->getLockedDoShip()) {
-+            if ($item->getQtyToShip() > 0 && !$item->getIsVirtual() &&
-+                !$item->getLockedDoShip() && !$this->isRefunded($item)) {
-                 return true;
-             }
-         }
-         return false;
-     }
- 
-+    /**
-+     * Check if item is refunded.
-+     *
-+     * @param OrderItemInterface $item
-+     * @return bool
-+     */
-+    private function isRefunded(OrderItemInterface $item)
-+    {
-+        return $item->getQtyRefunded() == $item->getQtyOrdered();
-+    }
-+
-     /**
-      * Retrieve order edit availability
-      *
-@@ -880,7 +959,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getPayment()
-     {
-@@ -972,7 +1051,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Set order state
-+     * @inheritdoc
-      *
-      * @param string $state
-      * @return $this
-@@ -982,10 +1061,21 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-         return $this->setData(self::STATE, $state);
-     }
- 
-+    /**
-+     * Retrieve frontend label of order status
-+     *
-+     * @return string
-+     */
-+    public function getFrontendStatusLabel()
-+    {
-+        return $this->getConfig()->getStatusFrontendLabel($this->getStatus());
-+    }
-+
-     /**
-      * Retrieve label of order status
-      *
-      * @return string
-+     * @throws LocalizedException
-      */
-     public function getStatusLabel()
-     {
-@@ -1007,8 +1097,9 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Add a comment to order
--     * Different or default status may be specified
-+     * Add a comment to order.
-+     *
-+     * Different or default status may be specified.
-      *
-      * @param string $comment
-      * @param bool|string $status
-@@ -1022,8 +1113,9 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
-     
-     /**
--     * Add a comment to order status history
--     * Different or default status may be specified
-+     * Add a comment to order status history.
-+     *
-+     * Different or default status may be specified.
-      *
-      * @param string $comment
-      * @param bool|string $status
-@@ -1088,13 +1180,15 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Hold order
-+     *
-      * @return $this
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws LocalizedException
-      */
-     public function hold()
-     {
-         if (!$this->canHold()) {
--            throw new \Magento\Framework\Exception\LocalizedException(__('A hold action is not available.'));
-+            throw new LocalizedException(__('A hold action is not available.'));
-         }
-         $this->setHoldBeforeState($this->getState());
-         $this->setHoldBeforeStatus($this->getStatus());
-@@ -1107,12 +1201,12 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-      * Attempt to unhold the order
-      *
-      * @return $this
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws LocalizedException
-      */
-     public function unhold()
-     {
-         if (!$this->canUnhold()) {
--            throw new \Magento\Framework\Exception\LocalizedException(__('You cannot remove the hold.'));
-+            throw new LocalizedException(__('You cannot remove the hold.'));
-         }
- 
-         $this->setState($this->getHoldBeforeState())
-@@ -1156,7 +1250,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-      * @param string $comment
-      * @param bool $graceful
-      * @return $this
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws LocalizedException
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-     public function registerCancellation($comment = '', $graceful = true)
-@@ -1195,7 +1289,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-                 $this->addStatusHistoryComment($comment, false);
-             }
-         } elseif (!$graceful) {
--            throw new \Magento\Framework\Exception\LocalizedException(__('We cannot cancel this order.'));
-+            throw new LocalizedException(__('We cannot cancel this order.'));
-         }
-         return $this;
-     }
-@@ -1217,12 +1311,12 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-      * Retrieve shipping method
-      *
-      * @param bool $asObject return carrier code and shipping method data as object
--     * @return string|\Magento\Framework\DataObject
-+     * @return string|null|\Magento\Framework\DataObject
-      */
-     public function getShippingMethod($asObject = false)
-     {
-         $shippingMethod = parent::getShippingMethod();
--        if (!$asObject) {
-+        if (!$asObject || !$shippingMethod) {
-             return $shippingMethod;
-         } else {
-             list($carrierCode, $method) = explode('_', $shippingMethod, 2);
-@@ -1233,6 +1327,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     /*********************** ADDRESSES ***************************/
- 
-     /**
-+     * Get addresses collection
-+     *
-      * @return Collection
-      */
-     public function getAddressesCollection()
-@@ -1247,6 +1343,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get address by id
-+     *
-      * @param mixed $addressId
-      * @return false
-      */
-@@ -1261,6 +1359,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Add address
-+     *
-      * @param \Magento\Sales\Model\Order\Address $address
-      * @return $this
-      */
-@@ -1275,9 +1375,11 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get items collection
-+     *
-      * @param array $filterByTypes
-      * @param bool $nonChildrenOnly
--     * @return ImportCollection
-+     * @return ItemCollection
-      */
-     public function getItemsCollection($filterByTypes = [], $nonChildrenOnly = false)
-     {
-@@ -1293,6 +1395,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-         if ($this->getId()) {
-             foreach ($collection as $item) {
-                 $item->setOrder($this);
-+                $this->productOption->add($item);
-             }
-         }
-         return $collection;
-@@ -1302,7 +1405,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-      * Get random items collection without related children
-      *
-      * @param int $limit
--     * @return ImportCollection
-+     * @return ItemCollection
-      */
-     public function getParentItemsRandomCollection($limit = 1)
-     {
-@@ -1314,11 +1417,14 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-      *
-      * @param int $limit
-      * @param bool $nonChildrenOnly
--     * @return ImportCollection
-+     * @return ItemCollection
-      */
-     protected function _getItemsRandomCollection($limit, $nonChildrenOnly = false)
-     {
--        $collection = $this->_orderItemCollectionFactory->create()->setOrderFilter($this)->setRandomOrder();
-+        $collection = $this->_orderItemCollectionFactory->create()
-+            ->setOrderFilter($this)
-+            ->setRandomOrder()
-+            ->setPageSize($limit);
- 
-         if ($nonChildrenOnly) {
-             $collection->filterByParent();
-@@ -1332,9 +1438,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-             $products
-         )->setVisibility(
-             $this->_productVisibility->getVisibleInSiteIds()
--        )->addPriceData()->setPageSize(
--            $limit
--        )->load();
-+        )->addPriceData()->load();
- 
-         foreach ($collection as $item) {
-             $product = $productsCollection->getItemById($item->getProductId());
-@@ -1347,6 +1451,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get all items
-+     *
-      * @return \Magento\Sales\Model\Order\Item[]
-      */
-     public function getAllItems()
-@@ -1361,6 +1467,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get all visible items
-+     *
-      * @return array
-      */
-     public function getAllVisibleItems()
-@@ -1392,6 +1500,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get item by quote item id
-+     *
-      * @param mixed $quoteItemId
-      * @return  \Magento\Framework\DataObject|null
-      */
-@@ -1406,6 +1516,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Add item
-+     *
-      * @param \Magento\Sales\Model\Order\Item $item
-      * @return $this
-      */
-@@ -1421,6 +1533,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     /*********************** PAYMENTS ***************************/
- 
-     /**
-+     * Get payments collection
-+     *
-      * @return PaymentCollection
-      */
-     public function getPaymentsCollection()
-@@ -1435,6 +1549,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get all payments
-+     *
-      * @return array
-      */
-     public function getAllPayments()
-@@ -1449,6 +1565,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get payment by id
-+     *
-      * @param mixed $paymentId
-      * @return Payment|false
-      */
-@@ -1463,7 +1581,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPayment(\Magento\Sales\Api\Data\OrderPaymentInterface $payment = null)
-     {
-@@ -1530,6 +1648,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get status history by id
-+     *
-      * @param mixed $statusId
-      * @return string|false
-      */
-@@ -1544,7 +1664,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Set the order status history object and the order object to each other
-+     * @inheritdoc
-+     *
-      * Adds the object to the status history collection, which is automatically saved when the order is saved.
-      * See the entity_id attribute backend model.
-      * Or the history record can be saved standalone after this.
-@@ -1564,6 +1685,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get real order id
-+     *
-      * @return string
-      */
-     public function getRealOrderId()
-@@ -1592,9 +1715,9 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     /**
-      * Get formatted price value including order currency rate to order website currency
-      *
--     * @param   float $price
--     * @param   bool  $addBrackets
--     * @return  string
-+     * @param float $price
-+     * @param bool $addBrackets
-+     * @return string
-      */
-     public function formatPrice($price, $addBrackets = false)
-     {
-@@ -1602,6 +1725,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Format price precision
-+     *
-      * @param float $price
-      * @param int $precision
-      * @param bool $addBrackets
-@@ -1615,8 +1740,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     /**
-      * Retrieve text formatted price value including order rate
-      *
--     * @param   float $price
--     * @return  string
-+     * @param float $price
-+     * @return string
-      */
-     public function formatPriceTxt($price)
-     {
-@@ -1637,6 +1762,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Format base price
-+     *
-      * @param float $price
-      * @return string
-      */
-@@ -1646,6 +1773,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Format Base Price Precision
-+     *
-      * @param float $price
-      * @param int $precision
-      * @return string
-@@ -1656,6 +1785,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Is currency different
-+     *
-      * @return bool
-      */
-     public function isCurrencyDifferent()
-@@ -1688,6 +1819,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get data
-+     *
-      * @param string $key
-      * @param null|string|int $index
-      * @return mixed
-@@ -1723,7 +1856,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Set order invoices collection
-+     * @inheritdoc
-      *
-      * @param InvoiceCollection $invoices
-      * @return $this
-@@ -1828,6 +1961,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get customer name
-+     *
-      * @return string
-      */
-     public function getCustomerName()
-@@ -1855,8 +1990,9 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     /**
-      * Get formatted order created date in store timezone
-      *
--     * @param   string $format date format type (short|medium|long|full)
--     * @return  string
-+     * @param int $format date format type (\IntlDateFormatter::SHORT|\IntlDateFormatter::MEDIUM
-+     * |\IntlDateFormatter::LONG|\IntlDateFormatter::FULL)
-+     * @return string
-      */
-     public function getCreatedAtFormatted($format)
-     {
-@@ -1870,6 +2006,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get email customer note
-+     *
-      * @return string
-      */
-     public function getEmailCustomerNote()
-@@ -1881,6 +2019,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get store group name
-+     *
-      * @return string
-      */
-     public function getStoreGroupName()
-@@ -1893,8 +2033,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Resets all data in object
--     * so after another load it will be complete new object
-+     * Reset all data in object so after another load it will be complete new object.
-      *
-      * @return $this
-      */
-@@ -1918,6 +2057,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get order is not virtual
-+     *
-      * @return bool
-      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-      */
-@@ -1948,7 +2089,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns increment id
-+     * Return increment id
-      *
-      * @codeCoverageIgnore
-      *
-@@ -1960,21 +2101,26 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get Items
-+     *
-      * @return \Magento\Sales\Api\Data\OrderItemInterface[]
-      */
-     public function getItems()
-     {
-         if ($this->getData(OrderInterface::ITEMS) == null) {
-+            $this->searchCriteriaBuilder->addFilter(OrderItemInterface::ORDER_ID, $this->getId());
-+
-+            $searchCriteria = $this->searchCriteriaBuilder->create();
-             $this->setData(
-                 OrderInterface::ITEMS,
--                $this->getItemsCollection()->getItems()
-+                $this->itemRepository->getList($searchCriteria)->getItems()
-             );
-         }
-         return $this->getData(OrderInterface::ITEMS);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @codeCoverageIgnore
-      */
-     public function setItems($items)
-@@ -1983,6 +2129,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get addresses
-+     *
-      * @return \Magento\Sales\Api\Data\OrderAddressInterface[]
-      */
-     public function getAddresses()
-@@ -1997,6 +2145,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
-+     * Get status History
-+     *
-      * @return \Magento\Sales\Api\Data\OrderStatusHistoryInterface[]|null
-      */
-     public function getStatusHistories()
-@@ -2011,7 +2161,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return \Magento\Sales\Api\Data\OrderExtensionInterface|null
-      */
-@@ -2021,7 +2171,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @param \Magento\Sales\Api\Data\OrderExtensionInterface $extensionAttributes
-      * @return $this
-@@ -2034,7 +2184,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     //@codeCoverageIgnoreStart
- 
-     /**
--     * Returns adjustment_negative
-+     * Return adjustment_negative
-      *
-      * @return float|null
-      */
-@@ -2044,7 +2194,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns adjustment_positive
-+     * Return adjustment_positive
-      *
-      * @return float|null
-      */
-@@ -2054,7 +2204,9 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns applied_rule_ids
-+     * Return applied_rule_ids
-+     *
-+     * Rules are comma separated if there are more than one.
-      *
-      * @return string|null
-      */
-@@ -2064,7 +2216,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_adjustment_negative
-+     * Return base_adjustment_negative
-      *
-      * @return float|null
-      */
-@@ -2074,7 +2226,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_adjustment_positive
-+     * Return base_adjustment_positive
-      *
-      * @return float|null
-      */
-@@ -2084,7 +2236,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_currency_code
-+     * Return base_currency_code
-      *
-      * @return string|null
-      */
-@@ -2094,7 +2246,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_discount_amount
-+     * Return base_discount_amount
-      *
-      * @return float|null
-      */
-@@ -2104,7 +2256,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_discount_canceled
-+     * Return base_discount_canceled
-      *
-      * @return float|null
-      */
-@@ -2114,7 +2266,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_discount_invoiced
-+     * Return base_discount_invoiced
-      *
-      * @return float|null
-      */
-@@ -2124,7 +2276,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_discount_refunded
-+     * Return base_discount_refunded
-      *
-      * @return float|null
-      */
-@@ -2134,7 +2286,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_grand_total
-+     * Return base_grand_total
-      *
-      * @return float
-      */
-@@ -2144,7 +2296,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_discount_tax_compensation_amount
-+     * Return base_discount_tax_compensation_amount
-      *
-      * @return float|null
-      */
-@@ -2154,7 +2306,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_discount_tax_compensation_invoiced
-+     * Return base_discount_tax_compensation_invoiced
-      *
-      * @return float|null
-      */
-@@ -2164,7 +2316,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_discount_tax_compensation_refunded
-+     * Return base_discount_tax_compensation_refunded
-      *
-      * @return float|null
-      */
-@@ -2174,7 +2326,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_shipping_amount
-+     * Return base_shipping_amount
-      *
-      * @return float|null
-      */
-@@ -2184,7 +2336,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_shipping_canceled
-+     * Return base_shipping_canceled
-      *
-      * @return float|null
-      */
-@@ -2194,7 +2346,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_shipping_discount_amount
-+     * Return base_shipping_discount_amount
-      *
-      * @return float|null
-      */
-@@ -2204,7 +2356,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_shipping_discount_tax_compensation_amnt
-+     * Return base_shipping_discount_tax_compensation_amnt
-      *
-      * @return float|null
-      */
-@@ -2214,7 +2366,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_shipping_incl_tax
-+     * Return base_shipping_incl_tax
-      *
-      * @return float|null
-      */
-@@ -2224,7 +2376,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_shipping_invoiced
-+     * Return base_shipping_invoiced
-      *
-      * @return float|null
-      */
-@@ -2234,7 +2386,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_shipping_refunded
-+     * Return base_shipping_refunded
-      *
-      * @return float|null
-      */
-@@ -2244,7 +2396,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_shipping_tax_amount
-+     * Return base_shipping_tax_amount
-      *
-      * @return float|null
-      */
-@@ -2254,7 +2406,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_shipping_tax_refunded
-+     * Return base_shipping_tax_refunded
-      *
-      * @return float|null
-      */
-@@ -2264,7 +2416,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_subtotal
-+     * Return base_subtotal
-      *
-      * @return float|null
-      */
-@@ -2274,7 +2426,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_subtotal_canceled
-+     * Return base_subtotal_canceled
-      *
-      * @return float|null
-      */
-@@ -2284,7 +2436,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_subtotal_incl_tax
-+     * Return base_subtotal_incl_tax
-      *
-      * @return float|null
-      */
-@@ -2294,7 +2446,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_subtotal_invoiced
-+     * Return base_subtotal_invoiced
-      *
-      * @return float|null
-      */
-@@ -2304,7 +2456,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_subtotal_refunded
-+     * Return base_subtotal_refunded
-      *
-      * @return float|null
-      */
-@@ -2314,7 +2466,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_tax_amount
-+     * Return base_tax_amount
-      *
-      * @return float|null
-      */
-@@ -2324,7 +2476,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_tax_canceled
-+     * Return base_tax_canceled
-      *
-      * @return float|null
-      */
-@@ -2334,7 +2486,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_tax_invoiced
-+     * Return base_tax_invoiced
-      *
-      * @return float|null
-      */
-@@ -2344,7 +2496,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_tax_refunded
-+     * Return base_tax_refunded
-      *
-      * @return float|null
-      */
-@@ -2354,7 +2506,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_total_canceled
-+     * Return base_total_canceled
-      *
-      * @return float|null
-      */
-@@ -2364,7 +2516,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_total_invoiced
-+     * Return base_total_invoiced
-      *
-      * @return float|null
-      */
-@@ -2374,7 +2526,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_total_invoiced_cost
-+     * Return base_total_invoiced_cost
-      *
-      * @return float|null
-      */
-@@ -2384,7 +2536,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_total_offline_refunded
-+     * Return base_total_offline_refunded
-      *
-      * @return float|null
-      */
-@@ -2394,7 +2546,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_total_online_refunded
-+     * Return base_total_online_refunded
-      *
-      * @return float|null
-      */
-@@ -2404,7 +2556,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_total_paid
-+     * Return base_total_paid
-      *
-      * @return float|null
-      */
-@@ -2414,7 +2566,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_total_qty_ordered
-+     * Return base_total_qty_ordered
-      *
-      * @return float|null
-      */
-@@ -2424,7 +2576,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_total_refunded
-+     * Return base_total_refunded
-      *
-      * @return float|null
-      */
-@@ -2434,7 +2586,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_to_global_rate
-+     * Return base_to_global_rate
-      *
-      * @return float|null
-      */
-@@ -2444,7 +2596,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns base_to_order_rate
-+     * Return base_to_order_rate
-      *
-      * @return float|null
-      */
-@@ -2454,7 +2606,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns billing_address_id
-+     * Return billing_address_id
-      *
-      * @return int|null
-      */
-@@ -2464,7 +2616,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns can_ship_partially
-+     * Return can_ship_partially
-      *
-      * @return int|null
-      */
-@@ -2474,7 +2626,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns can_ship_partially_item
-+     * Return can_ship_partially_item
-      *
-      * @return int|null
-      */
-@@ -2484,7 +2636,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns coupon_code
-+     * Return coupon_code
-      *
-      * @return string|null
-      */
-@@ -2494,7 +2646,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns created_at
-+     * Return created_at
-      *
-      * @return string|null
-      */
-@@ -2504,7 +2656,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCreatedAt($createdAt)
-     {
-@@ -2512,7 +2664,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_dob
-+     * Return customer_dob
-      *
-      * @return string|null
-      */
-@@ -2522,7 +2674,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_email
-+     * Return customer_email
-      *
-      * @return string
-      */
-@@ -2532,7 +2684,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_firstname
-+     * Return customer_firstname
-      *
-      * @return string|null
-      */
-@@ -2542,7 +2694,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_gender
-+     * Return customer_gender
-      *
-      * @return int|null
-      */
-@@ -2552,7 +2704,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_group_id
-+     * Return customer_group_id
-      *
-      * @return int|null
-      */
-@@ -2562,7 +2714,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_id
-+     * Return customer_id
-      *
-      * @return int|null
-      */
-@@ -2572,7 +2724,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_is_guest
-+     * Return customer_is_guest
-      *
-      * @return int|null
-      */
-@@ -2582,7 +2734,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_lastname
-+     * Return customer_lastname
-      *
-      * @return string|null
-      */
-@@ -2592,7 +2744,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_middlename
-+     * Return customer_middlename
-      *
-      * @return string|null
-      */
-@@ -2602,7 +2754,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_note
-+     * Return customer_note
-      *
-      * @return string|null
-      */
-@@ -2612,7 +2764,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_note_notify
-+     * Return customer_note_notify
-      *
-      * @return int|null
-      */
-@@ -2622,7 +2774,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_prefix
-+     * Return customer_prefix
-      *
-      * @return string|null
-      */
-@@ -2632,7 +2784,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_suffix
-+     * Return customer_suffix
-      *
-      * @return string|null
-      */
-@@ -2642,7 +2794,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns customer_taxvat
-+     * Return customer_taxvat
-      *
-      * @return string|null
-      */
-@@ -2652,7 +2804,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns discount_amount
-+     * Return discount_amount
-      *
-      * @return float|null
-      */
-@@ -2662,7 +2814,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns discount_canceled
-+     * Return discount_canceled
-      *
-      * @return float|null
-      */
-@@ -2672,7 +2824,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns discount_description
-+     * Return discount_description
-      *
-      * @return string|null
-      */
-@@ -2682,7 +2834,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns discount_invoiced
-+     * Return discount_invoiced
-      *
-      * @return float|null
-      */
-@@ -2692,7 +2844,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns discount_refunded
-+     * Return discount_refunded
-      *
-      * @return float|null
-      */
-@@ -2702,7 +2854,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns edit_increment
-+     * Return edit_increment
-      *
-      * @return int|null
-      */
-@@ -2712,7 +2864,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns email_sent
-+     * Return email_sent
-      *
-      * @return int|null
-      */
-@@ -2722,7 +2874,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns ext_customer_id
-+     * Return ext_customer_id
-      *
-      * @return string|null
-      */
-@@ -2732,7 +2884,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns ext_order_id
-+     * Return ext_order_id
-      *
-      * @return string|null
-      */
-@@ -2742,7 +2894,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns forced_shipment_with_invoice
-+     * Return forced_shipment_with_invoice
-      *
-      * @return int|null
-      */
-@@ -2752,7 +2904,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns global_currency_code
-+     * Return global_currency_code
-      *
-      * @return string|null
-      */
-@@ -2762,7 +2914,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns grand_total
-+     * Return grand_total
-      *
-      * @return float
-      */
-@@ -2772,7 +2924,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns discount_tax_compensation_amount
-+     * Return discount_tax_compensation_amount
-      *
-      * @return float|null
-      */
-@@ -2782,7 +2934,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns discount_tax_compensation_invoiced
-+     * Return discount_tax_compensation_invoiced
-      *
-      * @return float|null
-      */
-@@ -2792,7 +2944,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns discount_tax_compensation_refunded
-+     * Return discount_tax_compensation_refunded
-      *
-      * @return float|null
-      */
-@@ -2812,7 +2964,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns hold_before_status
-+     * Return hold_before_status
-      *
-      * @return string|null
-      */
-@@ -2822,7 +2974,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns is_virtual
-+     * Return is_virtual
-      *
-      * @return int|null
-      */
-@@ -2832,7 +2984,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns order_currency_code
-+     * Return order_currency_code
-      *
-      * @return string|null
-      */
-@@ -2842,7 +2994,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns original_increment_id
-+     * Return original_increment_id
-      *
-      * @return string|null
-      */
-@@ -2852,7 +3004,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns payment_authorization_amount
-+     * Return payment_authorization_amount
-      *
-      * @return float|null
-      */
-@@ -2862,7 +3014,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns payment_auth_expiration
-+     * Return payment_auth_expiration
-      *
-      * @return int|null
-      */
-@@ -2872,7 +3024,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns protect_code
-+     * Return protect_code
-      *
-      * @return string|null
-      */
-@@ -2882,7 +3034,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns quote_address_id
-+     * Return quote_address_id
-      *
-      * @return int|null
-      */
-@@ -2892,7 +3044,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns quote_id
-+     * Return quote_id
-      *
-      * @return int|null
-      */
-@@ -2902,7 +3054,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns relation_child_id
-+     * Return relation_child_id
-      *
-      * @return string|null
-      */
-@@ -2912,7 +3064,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns relation_child_real_id
-+     * Return relation_child_real_id
-      *
-      * @return string|null
-      */
-@@ -2922,7 +3074,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns relation_parent_id
-+     * Return relation_parent_id
-      *
-      * @return string|null
-      */
-@@ -2932,7 +3084,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns relation_parent_real_id
-+     * Return relation_parent_real_id
-      *
-      * @return string|null
-      */
-@@ -2942,7 +3094,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns remote_ip
-+     * Return remote_ip
-      *
-      * @return string|null
-      */
-@@ -2952,7 +3104,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns shipping_amount
-+     * Return shipping_amount
-      *
-      * @return float|null
-      */
-@@ -2962,7 +3114,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns shipping_canceled
-+     * Return shipping_canceled
-      *
-      * @return float|null
-      */
-@@ -2972,7 +3124,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns shipping_description
-+     * Return shipping_description
-      *
-      * @return string|null
-      */
-@@ -2982,7 +3134,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns shipping_discount_amount
-+     * Return shipping_discount_amount
-      *
-      * @return float|null
-      */
-@@ -2992,7 +3144,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns shipping_discount_tax_compensation_amount
-+     * Return shipping_discount_tax_compensation_amount
-      *
-      * @return float|null
-      */
-@@ -3002,7 +3154,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns shipping_incl_tax
-+     * Return shipping_incl_tax
-      *
-      * @return float|null
-      */
-@@ -3012,7 +3164,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns shipping_invoiced
-+     * Return shipping_invoiced
-      *
-      * @return float|null
-      */
-@@ -3022,7 +3174,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns shipping_refunded
-+     * Return shipping_refunded
-      *
-      * @return float|null
-      */
-@@ -3032,7 +3184,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns shipping_tax_amount
-+     * Return shipping_tax_amount
-      *
-      * @return float|null
-      */
-@@ -3042,7 +3194,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns shipping_tax_refunded
-+     * Return shipping_tax_refunded
-      *
-      * @return float|null
-      */
-@@ -3052,7 +3204,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns state
-+     * Return state
-      *
-      * @return string|null
-      */
-@@ -3062,7 +3214,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns status
-+     * Return status
-      *
-      * @return string|null
-      */
-@@ -3072,7 +3224,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns store_currency_code
-+     * Return store_currency_code
-      *
-      * @return string|null
-      */
-@@ -3082,7 +3234,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns store_id
-+     * Return store_id
-      *
-      * @return int|null
-      */
-@@ -3092,7 +3244,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns store_name
-+     * Return store_name
-      *
-      * @return string|null
-      */
-@@ -3102,7 +3254,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns store_to_base_rate
-+     * Return store_to_base_rate
-      *
-      * @return float|null
-      */
-@@ -3112,7 +3264,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns store_to_order_rate
-+     * Return store_to_order_rate
-      *
-      * @return float|null
-      */
-@@ -3122,7 +3274,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns subtotal
-+     * Return subtotal
-      *
-      * @return float|null
-      */
-@@ -3132,7 +3284,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns subtotal_canceled
-+     * Return subtotal_canceled
-      *
-      * @return float|null
-      */
-@@ -3142,7 +3294,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns subtotal_incl_tax
-+     * Return subtotal_incl_tax
-      *
-      * @return float|null
-      */
-@@ -3152,7 +3304,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns subtotal_invoiced
-+     * Return subtotal_invoiced
-      *
-      * @return float|null
-      */
-@@ -3162,7 +3314,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns subtotal_refunded
-+     * Return subtotal_refunded
-      *
-      * @return float|null
-      */
-@@ -3172,7 +3324,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns tax_amount
-+     * Return tax_amount
-      *
-      * @return float|null
-      */
-@@ -3182,7 +3334,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns tax_canceled
-+     * Return tax_canceled
-      *
-      * @return float|null
-      */
-@@ -3192,7 +3344,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns tax_invoiced
-+     * Return tax_invoiced
-      *
-      * @return float|null
-      */
-@@ -3202,7 +3354,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns tax_refunded
-+     * Return tax_refunded
-      *
-      * @return float|null
-      */
-@@ -3212,7 +3364,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns total_canceled
-+     * Return total_canceled
-      *
-      * @return float|null
-      */
-@@ -3222,7 +3374,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns total_invoiced
-+     * Return total_invoiced
-      *
-      * @return float|null
-      */
-@@ -3232,7 +3384,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns total_item_count
-+     * Return total_item_count
-      *
-      * @return int|null
-      */
-@@ -3242,7 +3394,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns total_offline_refunded
-+     * Return total_offline_refunded
-      *
-      * @return float|null
-      */
-@@ -3252,7 +3404,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns total_online_refunded
-+     * Return total_online_refunded
-      *
-      * @return float|null
-      */
-@@ -3262,7 +3414,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns total_paid
-+     * Return total_paid
-      *
-      * @return float|null
-      */
-@@ -3272,7 +3424,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns total_qty_ordered
-+     * Return total_qty_ordered
-      *
-      * @return float|null
-      */
-@@ -3282,7 +3434,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns total_refunded
-+     * Return total_refunded
-      *
-      * @return float|null
-      */
-@@ -3292,7 +3444,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns updated_at
-+     * Return updated_at
-      *
-      * @return string|null
-      */
-@@ -3302,7 +3454,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns weight
-+     * Return weight
-      *
-      * @return float|null
-      */
-@@ -3312,7 +3464,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * Returns x_forwarded_for
-+     * Return x_forwarded_for
-      *
-      * @return string|null
-      */
-@@ -3322,7 +3474,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStatusHistories(array $statusHistories = null)
-     {
-@@ -3330,7 +3482,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStatus($status)
-     {
-@@ -3338,7 +3490,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCouponCode($code)
-     {
-@@ -3346,7 +3498,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setProtectCode($code)
-     {
-@@ -3354,7 +3506,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingDescription($description)
-     {
-@@ -3362,7 +3514,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setIsVirtual($isVirtual)
-     {
-@@ -3370,7 +3522,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreId($id)
-     {
-@@ -3378,7 +3530,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerId($id)
-     {
-@@ -3386,7 +3538,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountAmount($amount)
-     {
-@@ -3394,7 +3546,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountCanceled($baseDiscountCanceled)
-     {
-@@ -3402,7 +3554,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountInvoiced($baseDiscountInvoiced)
-     {
-@@ -3410,7 +3562,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountRefunded($baseDiscountRefunded)
-     {
-@@ -3418,7 +3570,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseGrandTotal($amount)
-     {
-@@ -3426,7 +3578,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingAmount($amount)
-     {
-@@ -3434,7 +3586,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingCanceled($baseShippingCanceled)
-     {
-@@ -3442,7 +3594,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingInvoiced($baseShippingInvoiced)
-     {
-@@ -3450,7 +3602,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingRefunded($baseShippingRefunded)
-     {
-@@ -3458,7 +3610,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingTaxAmount($amount)
-     {
-@@ -3466,7 +3618,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingTaxRefunded($baseShippingTaxRefunded)
-     {
-@@ -3474,7 +3626,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseSubtotal($amount)
-     {
-@@ -3482,7 +3634,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseSubtotalCanceled($baseSubtotalCanceled)
-     {
-@@ -3490,7 +3642,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseSubtotalInvoiced($baseSubtotalInvoiced)
-     {
-@@ -3498,7 +3650,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseSubtotalRefunded($baseSubtotalRefunded)
-     {
-@@ -3506,7 +3658,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTaxAmount($amount)
-     {
-@@ -3514,7 +3666,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTaxCanceled($baseTaxCanceled)
-     {
-@@ -3522,7 +3674,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTaxInvoiced($baseTaxInvoiced)
-     {
-@@ -3530,7 +3682,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTaxRefunded($baseTaxRefunded)
-     {
-@@ -3538,7 +3690,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseToGlobalRate($rate)
-     {
-@@ -3546,7 +3698,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseToOrderRate($rate)
-     {
-@@ -3554,7 +3706,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTotalCanceled($baseTotalCanceled)
-     {
-@@ -3562,7 +3714,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTotalInvoiced($baseTotalInvoiced)
-     {
-@@ -3570,7 +3722,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTotalInvoicedCost($baseTotalInvoicedCost)
-     {
-@@ -3578,7 +3730,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTotalOfflineRefunded($baseTotalOfflineRefunded)
-     {
-@@ -3586,7 +3738,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTotalOnlineRefunded($baseTotalOnlineRefunded)
-     {
-@@ -3594,7 +3746,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTotalPaid($baseTotalPaid)
-     {
-@@ -3602,7 +3754,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTotalQtyOrdered($baseTotalQtyOrdered)
-     {
-@@ -3610,7 +3762,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTotalRefunded($baseTotalRefunded)
-     {
-@@ -3618,7 +3770,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountAmount($amount)
-     {
-@@ -3626,7 +3778,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountCanceled($discountCanceled)
-     {
-@@ -3634,7 +3786,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountInvoiced($discountInvoiced)
-     {
-@@ -3642,7 +3794,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountRefunded($discountRefunded)
-     {
-@@ -3650,7 +3802,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGrandTotal($amount)
-     {
-@@ -3658,7 +3810,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingAmount($amount)
-     {
-@@ -3666,7 +3818,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingCanceled($shippingCanceled)
-     {
-@@ -3674,7 +3826,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingInvoiced($shippingInvoiced)
-     {
-@@ -3682,7 +3834,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingRefunded($shippingRefunded)
-     {
-@@ -3690,7 +3842,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingTaxAmount($amount)
-     {
-@@ -3698,7 +3850,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingTaxRefunded($shippingTaxRefunded)
-     {
-@@ -3706,7 +3858,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreToBaseRate($rate)
-     {
-@@ -3714,7 +3866,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreToOrderRate($rate)
-     {
-@@ -3722,7 +3874,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSubtotal($amount)
-     {
-@@ -3730,7 +3882,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSubtotalCanceled($subtotalCanceled)
-     {
-@@ -3738,7 +3890,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSubtotalInvoiced($subtotalInvoiced)
-     {
-@@ -3746,7 +3898,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSubtotalRefunded($subtotalRefunded)
-     {
-@@ -3754,7 +3906,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTaxAmount($amount)
-     {
-@@ -3762,7 +3914,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTaxCanceled($taxCanceled)
-     {
-@@ -3770,7 +3922,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTaxInvoiced($taxInvoiced)
-     {
-@@ -3778,7 +3930,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTaxRefunded($taxRefunded)
-     {
-@@ -3786,7 +3938,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTotalCanceled($totalCanceled)
-     {
-@@ -3794,7 +3946,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTotalInvoiced($totalInvoiced)
-     {
-@@ -3802,7 +3954,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTotalOfflineRefunded($totalOfflineRefunded)
-     {
-@@ -3810,7 +3962,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTotalOnlineRefunded($totalOnlineRefunded)
-     {
-@@ -3818,7 +3970,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTotalPaid($totalPaid)
-     {
-@@ -3826,7 +3978,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTotalQtyOrdered($totalQtyOrdered)
-     {
-@@ -3834,7 +3986,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTotalRefunded($totalRefunded)
-     {
-@@ -3842,7 +3994,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCanShipPartially($flag)
-     {
-@@ -3850,7 +4002,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCanShipPartiallyItem($flag)
-     {
-@@ -3858,7 +4010,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerIsGuest($customerIsGuest)
-     {
-@@ -3866,7 +4018,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerNoteNotify($customerNoteNotify)
-     {
-@@ -3874,7 +4026,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBillingAddressId($id)
-     {
-@@ -3882,7 +4034,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerGroupId($id)
-     {
-@@ -3890,7 +4042,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setEditIncrement($editIncrement)
-     {
-@@ -3898,7 +4050,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setEmailSent($emailSent)
-     {
-@@ -3906,7 +4058,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setForcedShipmentWithInvoice($forcedShipmentWithInvoice)
-     {
-@@ -3914,7 +4066,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPaymentAuthExpiration($paymentAuthExpiration)
-     {
-@@ -3922,7 +4074,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setQuoteAddressId($id)
-     {
-@@ -3930,7 +4082,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setQuoteId($id)
-     {
-@@ -3938,7 +4090,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAdjustmentNegative($adjustmentNegative)
-     {
-@@ -3946,7 +4098,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAdjustmentPositive($adjustmentPositive)
-     {
-@@ -3954,7 +4106,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseAdjustmentNegative($baseAdjustmentNegative)
-     {
-@@ -3962,7 +4114,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseAdjustmentPositive($baseAdjustmentPositive)
-     {
-@@ -3970,7 +4122,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingDiscountAmount($amount)
-     {
-@@ -3978,7 +4130,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseSubtotalInclTax($amount)
-     {
-@@ -3986,7 +4138,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTotalDue($baseTotalDue)
-     {
-@@ -3994,7 +4146,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPaymentAuthorizationAmount($amount)
-     {
-@@ -4002,7 +4154,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingDiscountAmount($amount)
-     {
-@@ -4010,7 +4162,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSubtotalInclTax($amount)
-     {
-@@ -4018,7 +4170,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTotalDue($totalDue)
-     {
-@@ -4026,7 +4178,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setWeight($weight)
-     {
-@@ -4034,7 +4186,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerDob($customerDob)
-     {
-@@ -4042,7 +4194,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setIncrementId($id)
-     {
-@@ -4050,7 +4202,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAppliedRuleIds($appliedRuleIds)
-     {
-@@ -4058,7 +4210,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseCurrencyCode($code)
-     {
-@@ -4066,7 +4218,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerEmail($customerEmail)
-     {
-@@ -4074,7 +4226,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerFirstname($customerFirstname)
-     {
-@@ -4082,7 +4234,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerLastname($customerLastname)
-     {
-@@ -4090,7 +4242,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerMiddlename($customerMiddlename)
-     {
-@@ -4098,7 +4250,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerPrefix($customerPrefix)
-     {
-@@ -4106,7 +4258,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerSuffix($customerSuffix)
-     {
-@@ -4114,7 +4266,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerTaxvat($customerTaxvat)
-     {
-@@ -4122,7 +4274,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountDescription($description)
-     {
-@@ -4130,7 +4282,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setExtCustomerId($id)
-     {
-@@ -4138,7 +4290,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setExtOrderId($id)
-     {
-@@ -4146,7 +4298,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGlobalCurrencyCode($code)
-     {
-@@ -4154,7 +4306,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setHoldBeforeState($holdBeforeState)
-     {
-@@ -4162,7 +4314,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setHoldBeforeStatus($holdBeforeStatus)
-     {
-@@ -4170,7 +4322,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setOrderCurrencyCode($code)
-     {
-@@ -4178,7 +4330,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setOriginalIncrementId($id)
-     {
-@@ -4186,7 +4338,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRelationChildId($id)
-     {
-@@ -4194,7 +4346,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRelationChildRealId($realId)
-     {
-@@ -4202,7 +4354,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRelationParentId($id)
-     {
-@@ -4210,7 +4362,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRelationParentRealId($realId)
-     {
-@@ -4218,7 +4370,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRemoteIp($remoteIp)
-     {
-@@ -4226,7 +4378,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreCurrencyCode($code)
-     {
-@@ -4234,7 +4386,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreName($storeName)
-     {
-@@ -4242,7 +4394,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setXForwardedFor($xForwardedFor)
-     {
-@@ -4250,7 +4402,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerNote($customerNote)
-     {
-@@ -4258,7 +4410,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setUpdatedAt($timestamp)
-     {
-@@ -4266,7 +4418,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTotalItemCount($totalItemCount)
-     {
-@@ -4274,7 +4426,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerGender($customerGender)
-     {
-@@ -4282,7 +4434,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountTaxCompensationAmount($amount)
-     {
-@@ -4290,7 +4442,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountTaxCompensationAmount($amount)
-     {
-@@ -4298,7 +4450,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingDiscountTaxCompensationAmount($amount)
-     {
-@@ -4306,7 +4458,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
-     {
-@@ -4314,7 +4466,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoiced)
-     {
-@@ -4322,7 +4474,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensationInvoiced)
-     {
-@@ -4333,7 +4485,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefunded)
-     {
-@@ -4344,7 +4496,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensationRefunded)
-     {
-@@ -4355,7 +4507,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingInclTax($amount)
-     {
-@@ -4363,7 +4515,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingInclTax($amount)
-     {
-diff --git a/app/code/Magento/Sales/Model/Order/Address.php b/app/code/Magento/Sales/Model/Order/Address.php
-index 77d8330a725..fd49af27a99 100644
---- a/app/code/Magento/Sales/Model/Order/Address.php
-+++ b/app/code/Magento/Sales/Model/Order/Address.php
-@@ -173,7 +173,8 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-      * Enforce format of the street field
-      *
-      * @param array|string $key
--     * @param null $value
-+     * @param array|string $value
-+     *
-      * @return \Magento\Framework\DataObject
-      */
-     public function setData($key, $value = null)
-@@ -251,7 +252,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     public function getStreetLine($number)
-     {
-         $lines = $this->getStreet();
--        return isset($lines[$number - 1]) ? $lines[$number - 1] : '';
-+        return $lines[$number - 1] ?? '';
-     }
- 
-     //@codeCoverageIgnoreStart
-@@ -508,7 +509,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setParentId($id)
-     {
-@@ -516,7 +517,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerAddressId($id)
-     {
-@@ -524,7 +525,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRegionId($id)
-     {
-@@ -532,7 +533,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStreet($street)
-     {
-@@ -540,7 +541,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomerId($id)
-     {
-@@ -548,7 +549,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setFax($fax)
-     {
-@@ -556,7 +557,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRegion($region)
-     {
-@@ -564,7 +565,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPostcode($postcode)
-     {
-@@ -572,7 +573,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setLastname($lastname)
-     {
-@@ -580,7 +581,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCity($city)
-     {
-@@ -588,7 +589,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setEmail($email)
-     {
-@@ -596,7 +597,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTelephone($telephone)
-     {
-@@ -604,7 +605,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCountryId($id)
-     {
-@@ -612,7 +613,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setFirstname($firstname)
-     {
-@@ -620,7 +621,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAddressType($addressType)
-     {
-@@ -628,7 +629,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPrefix($prefix)
-     {
-@@ -636,7 +637,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setMiddlename($middlename)
-     {
-@@ -644,7 +645,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSuffix($suffix)
-     {
-@@ -652,7 +653,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCompany($company)
-     {
-@@ -660,7 +661,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setVatId($id)
-     {
-@@ -668,7 +669,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setVatIsValid($vatIsValid)
-     {
-@@ -676,7 +677,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setVatRequestId($id)
-     {
-@@ -684,7 +685,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRegionCode($regionCode)
-     {
-@@ -692,7 +693,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setVatRequestDate($vatRequestDate)
-     {
-@@ -700,7 +701,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setVatRequestSuccess($vatRequestSuccess)
-     {
-@@ -708,7 +709,7 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return \Magento\Sales\Api\Data\OrderAddressExtensionInterface|null
-      */
-@@ -718,9 +719,10 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @param \Magento\Sales\Api\Data\OrderAddressExtensionInterface $extensionAttributes
-+     *
-      * @return $this
-      */
-     public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderAddressExtensionInterface $extensionAttributes)
-@@ -728,5 +730,16 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
-         return $this->_setExtensionAttributes($extensionAttributes);
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-+    public function beforeSave()
-+    {
-+        if ($this->getEmail() === null) {
-+            $this->setEmail($this->getOrder()->getCustomerEmail());
-+        }
-+        return parent::beforeSave();
-+    }
-+
-     //@codeCoverageIgnoreEnd
- }
-diff --git a/app/code/Magento/Sales/Model/Order/Address/Validator.php b/app/code/Magento/Sales/Model/Order/Address/Validator.php
-index 31cb5bb1f60..5d3186781e7 100644
---- a/app/code/Magento/Sales/Model/Order/Address/Validator.php
-+++ b/app/code/Magento/Sales/Model/Order/Address/Validator.php
-@@ -49,8 +49,8 @@ class Validator
- 
-     /**
-      * @param DirectoryHelper $directoryHelper
--     * @param CountryFactory  $countryFactory
--     * @param EavConfig       $eavConfig
-+     * @param CountryFactory $countryFactory
-+     * @param EavConfig $eavConfig
-      */
-     public function __construct(
-         DirectoryHelper $directoryHelper,
-@@ -61,6 +61,17 @@ class Validator
-         $this->countryFactory = $countryFactory;
-         $this->eavConfig = $eavConfig ?: ObjectManager::getInstance()
-             ->get(EavConfig::class);
-+    }
-+
-+    /**
-+     * Validate address.
-+     *
-+     * @param \Magento\Sales\Model\Order\Address $address
-+     * @return array
-+     */
-+    public function validate(Address $address)
-+    {
-+        $warnings = [];
- 
-         if ($this->isTelephoneRequired()) {
-             $this->required['telephone'] = 'Phone Number';
-@@ -73,16 +84,7 @@ class Validator
-         if ($this->isFaxRequired()) {
-             $this->required['fax'] = 'Fax';
-         }
--    }
- 
--    /**
--     *
--     * @param \Magento\Sales\Model\Order\Address $address
--     * @return array
--     */
--    public function validate(Address $address)
--    {
--        $warnings = [];
-         foreach ($this->required as $code => $label) {
-             if (!$address->hasData($code)) {
-                 $warnings[] = sprintf('"%s" is required. Enter and try again.', $label);
-@@ -195,7 +197,10 @@ class Validator
-     }
- 
-     /**
-+     * Check whether telephone is required for address.
-+     *
-      * @return bool
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function isTelephoneRequired()
-     {
-@@ -203,7 +208,10 @@ class Validator
-     }
- 
-     /**
-+     * Check whether company is required for address.
-+     *
-      * @return bool
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function isCompanyRequired()
-     {
-@@ -211,7 +219,10 @@ class Validator
-     }
- 
-     /**
-+     * Check whether telephone is required for address.
-+     *
-      * @return bool
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function isFaxRequired()
-     {
-diff --git a/app/code/Magento/Sales/Model/Order/AddressRepository.php b/app/code/Magento/Sales/Model/Order/AddressRepository.php
-index 2aed6ef1681..deeeb16b771 100644
---- a/app/code/Magento/Sales/Model/Order/AddressRepository.php
-+++ b/app/code/Magento/Sales/Model/Order/AddressRepository.php
-@@ -6,7 +6,11 @@
- 
- namespace Magento\Sales\Model\Order;
- 
-+use Magento\Customer\Model\AttributeMetadataDataProvider;
-+use Magento\Customer\Model\ResourceModel\Form\Attribute\Collection as AttributeCollection;
- use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Sales\Api\Data\OrderAddressInterface;
- use Magento\Sales\Model\ResourceModel\Metadata;
- use Magento\Sales\Api\Data\OrderAddressSearchResultInterfaceFactory as SearchResultFactory;
- use Magento\Framework\Exception\CouldNotDeleteException;
-@@ -41,20 +45,88 @@ class AddressRepository implements \Magento\Sales\Api\OrderAddressRepositoryInte
-      */
-     private $collectionProcessor;
- 
-+    /**
-+     * @var AttributeMetadataDataProvider
-+     */
-+    private $attributeMetadataDataProvider;
-+
-+    /**
-+     * @var AttributeCollection|null
-+     */
-+    private $attributesList = null;
-+
-     /**
-      * AddressRepository constructor.
-      * @param Metadata $metadata
-      * @param SearchResultFactory $searchResultFactory
-      * @param CollectionProcessorInterface|null $collectionProcessor
-+     * @param AttributeMetadataDataProvider $attributeMetadataDataProvider
-      */
-     public function __construct(
-         Metadata $metadata,
-         SearchResultFactory $searchResultFactory,
--        CollectionProcessorInterface $collectionProcessor = null
-+        CollectionProcessorInterface $collectionProcessor = null,
-+        AttributeMetadataDataProvider $attributeMetadataDataProvider = null
-     ) {
-         $this->metadata = $metadata;
-         $this->searchResultFactory = $searchResultFactory;
-         $this->collectionProcessor = $collectionProcessor ?: $this->getCollectionProcessor();
-+        $this->attributeMetadataDataProvider = $attributeMetadataDataProvider ?: ObjectManager::getInstance()
-+            ->get(AttributeMetadataDataProvider::class);
-+    }
-+
-+    /**
-+     * Format multiline and multiselect attributes
-+     *
-+     * @param OrderAddressInterface $orderAddress
-+     *
-+     * @return void
-+     */
-+    private function formatCustomAddressAttributes(OrderAddressInterface $orderAddress)
-+    {
-+        $attributesList = $this->getAttributesList();
-+
-+        foreach ($attributesList as $attribute) {
-+            $attributeCode = $attribute->getAttributeCode();
-+            if (!$orderAddress->hasData($attributeCode)) {
-+                continue;
-+            }
-+            $attributeValue = $orderAddress->getData($attributeCode);
-+            if (is_array($attributeValue)) {
-+                $glue = $attribute->getFrontendInput() === 'multiline' ? PHP_EOL : ',';
-+                $attributeValue = trim(implode($glue, $attributeValue));
-+            }
-+            $orderAddress->setData($attributeCode, $attributeValue);
-+        }
-+    }
-+
-+    /**
-+     * Get list of custom attributes.
-+     *
-+     * @return AttributeCollection|null
-+     */
-+    private function getAttributesList()
-+    {
-+        if (!$this->attributesList) {
-+            $attributesList = $this->attributeMetadataDataProvider->loadAttributesCollection(
-+                'customer_address',
-+                'customer_register_address'
-+            );
-+            $attributesList->addFieldToFilter('is_user_defined', 1);
-+            $attributesList->addFieldToFilter(
-+                'frontend_input',
-+                [
-+                    'in' => [
-+                        'multiline',
-+                        'multiselect',
-+                    ],
-+                ]
-+            );
-+
-+            $this->attributesList = $attributesList;
-+        }
-+
-+        return $this->attributesList;
-     }
- 
-     /**
-@@ -90,7 +162,7 @@ class AddressRepository implements \Magento\Sales\Api\OrderAddressRepositoryInte
-      * Find order addresses by criteria.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
--     * @return \Magento\Sales\Api\Data\OrderAddressInterface[]
-+     * @return \Magento\Sales\Model\ResourceModel\Order\Address\Collection
-      */
-     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
-     {
-@@ -98,7 +170,7 @@ class AddressRepository implements \Magento\Sales\Api\OrderAddressRepositoryInte
-         $searchResult = $this->searchResultFactory->create();
-         $this->collectionProcessor->process($searchCriteria, $searchResult);
-         $searchResult->setSearchCriteria($searchCriteria);
--        
-+
-         return $searchResult;
-     }
- 
-@@ -144,6 +216,7 @@ class AddressRepository implements \Magento\Sales\Api\OrderAddressRepositoryInte
-      */
-     public function save(\Magento\Sales\Api\Data\OrderAddressInterface $entity)
-     {
-+        $this->formatCustomAddressAttributes($entity);
-         try {
-             $this->metadata->getMapper()->save($entity);
-             $this->registry[$entity->getEntityId()] = $entity;
-diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php
-index e00eda647dc..92681f3ecf1 100644
---- a/app/code/Magento/Sales/Model/Order/Config.php
-+++ b/app/code/Magento/Sales/Model/Order/Config.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Sales\Model\Order;
- 
-+use Magento\Framework\Exception\LocalizedException;
-+
- /**
-  * Order configuration model
-  *
-@@ -73,6 +75,8 @@ class Config
-     }
- 
-     /**
-+     * Get collection.
-+     *
-      * @return \Magento\Sales\Model\ResourceModel\Order\Status\Collection
-      */
-     protected function _getCollection()
-@@ -84,8 +88,10 @@ class Config
-     }
- 
-     /**
-+     * Get state.
-+     *
-      * @param string $state
--     * @return Status|null
-+     * @return Status
-      */
-     protected function _getState($state)
-     {
-@@ -101,9 +107,9 @@ class Config
-      * Retrieve default status for state
-      *
-      * @param   string $state
--     * @return  string
-+     * @return  string|null
-      */
--    public function getStateDefaultStatus($state)
-+    public function getStateDefaultStatus($state): ?string
-     {
-         $status = false;
-         $stateNode = $this->_getState($state);
-@@ -115,24 +121,48 @@ class Config
-     }
- 
-     /**
--     * Retrieve status label
-+     * Get status label for a specified area
-      *
--     * @param   string $code
--     * @return  string
-+     * @param string|null $code
-+     * @param string $area
-+     * @return string|null
-      */
--    public function getStatusLabel($code)
-+    private function getStatusLabelForArea(?string $code, string $area): ?string
-     {
--        $area = $this->state->getAreaCode();
-         $code = $this->maskStatusForArea($area, $code);
-         $status = $this->orderStatusFactory->create()->load($code);
- 
--        if ($area == 'adminhtml') {
-+        if ($area === 'adminhtml') {
-             return $status->getLabel();
-         }
- 
-         return $status->getStoreLabel();
-     }
- 
-+    /**
-+     * Retrieve status label for detected area
-+     *
-+     * @param string|null $code
-+     * @return string|null
-+     * @throws LocalizedException
-+     */
-+    public function getStatusLabel($code)
-+    {
-+        $area = $this->state->getAreaCode() ?: \Magento\Framework\App\Area::AREA_FRONTEND;
-+        return $this->getStatusLabelForArea($code, $area);
-+    }
-+
-+    /**
-+     * Retrieve status label for area
-+     *
-+     * @param string|null $code
-+     * @return string|null
-+     */
-+    public function getStatusFrontendLabel(?string $code): ?string
-+    {
-+        return $this->getStatusLabelForArea($code, \Magento\Framework\App\Area::AREA_FRONTEND);
-+    }
-+
-     /**
-      * Mask status for order for specified area
-      *
-@@ -151,7 +181,7 @@ class Config
-     /**
-      * State label getter
-      *
--     * @param   string $state
-+     * @param string $state
-      * @return \Magento\Framework\Phrase|string
-      */
-     public function getStateLabel($state)
-@@ -183,7 +213,7 @@ class Config
-     {
-         $states = [];
-         foreach ($this->_getCollection() as $item) {
--            if ($item->getState()) {
-+            if ($item->getState() && $item->getIsDefault()) {
-                 $states[$item->getState()] = __($item->getData('label'));
-             }
-         }
-@@ -249,8 +279,9 @@ class Config
-     }
- 
-     /**
--     * Get existing order statuses
--     * Visible or invisible on frontend according to passed param
-+     * Get existing order statuses.
-+     *
-+     * Visible or invisible on frontend according to passed param.
-      *
-      * @param bool $visibility
-      * @return array
-diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
-index 7ea7e4af3c3..16a8f7e8f90 100644
---- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
-+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
-@@ -7,25 +7,27 @@
- namespace Magento\Sales\Model\Order;
- 
- use Magento\Framework\Api\AttributeValueFactory;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Pricing\PriceCurrencyInterface;
- use Magento\Sales\Api\Data\CreditmemoInterface;
-+use Magento\Sales\Api\OrderRepositoryInterface;
- use Magento\Sales\Model\AbstractModel;
- use Magento\Sales\Model\EntityInterface;
--use Magento\Sales\Model\Order\InvoiceFactory;
- 
- /**
-  * Order creditmemo model
-  *
-  * @api
-- * @method \Magento\Sales\Model\Order\Invoice setSendEmail(bool $value)
-- * @method \Magento\Sales\Model\Order\Invoice setCustomerNote(string $value)
-+ * @method \Magento\Sales\Model\Order\Creditmemo setSendEmail(bool $value)
-+ * @method \Magento\Sales\Model\Order\Creditmemo setCustomerNote(string $value)
-  * @method string getCustomerNote()
-- * @method \Magento\Sales\Model\Order\Invoice setCustomerNoteNotify(bool $value)
-+ * @method \Magento\Sales\Model\Order\Creditmemo setCustomerNoteNotify(bool $value)
-  * @method bool getCustomerNoteNotify()
-  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.TooManyFields)
-  * @since 100.0.2
-  */
- class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInterface
-@@ -119,6 +121,16 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-      */
-     private $invoiceFactory;
- 
-+    /**
-+     * @var ScopeConfigInterface;
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @var OrderRepositoryInterface
-+     */
-+    private $orderRepository;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -136,6 +148,8 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-      * @param array $data
-      * @param InvoiceFactory $invoiceFactory
-+     * @param ScopeConfigInterface $scopeConfig
-+     * @param OrderRepositoryInterface $orderRepository
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -154,7 +168,9 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-         array $data = [],
--        InvoiceFactory $invoiceFactory = null
-+        InvoiceFactory $invoiceFactory = null,
-+        ScopeConfigInterface $scopeConfig = null,
-+        OrderRepositoryInterface $orderRepository = null
-     ) {
-         $this->_creditmemoConfig = $creditmemoConfig;
-         $this->_orderFactory = $orderFactory;
-@@ -165,6 +181,8 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-         $this->_commentCollectionFactory = $commentCollectionFactory;
-         $this->priceCurrency = $priceCurrency;
-         $this->invoiceFactory = $invoiceFactory ?: ObjectManager::getInstance()->get(InvoiceFactory::class);
-+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
-+        $this->orderRepository = $orderRepository ?? ObjectManager::getInstance()->get(OrderRepositoryInterface::class);
-         parent::__construct(
-             $context,
-             $registry,
-@@ -227,8 +245,11 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     public function getOrder()
-     {
-         if (!$this->_order instanceof \Magento\Sales\Model\Order) {
--            $this->_order = $this->_orderFactory->create()->load($this->getOrderId());
-+            $this->_order = $this->getOrderId() ?
-+                $this->orderRepository->get($this->getOrderId()) :
-+                $this->_orderFactory->create();
-         }
-+
-         return $this->_order->setHistoryEntityName($this->entityType);
-     }
- 
-@@ -263,6 +284,8 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
-+     * Retrieve collection if items.
-+     *
-      * @return mixed
-      */
-     public function getItemsCollection()
-@@ -278,6 +301,8 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
-+     * Retrieve all items.
-+     *
-      * @return \Magento\Sales\Model\Order\Creditmemo\Item[]
-      */
-     public function getAllItems()
-@@ -292,6 +317,8 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
-+     * Retrieve item by id.
-+     *
-      * @param mixed $itemId
-      * @return mixed
-      */
-@@ -322,6 +349,8 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
-+     * Add an item to credit memo.
-+     *
-      * @param \Magento\Sales\Model\Order\Creditmemo\Item $item
-      * @return $this
-      */
-@@ -367,6 +396,8 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
-+     * Check if credit memo can be refunded.
-+     *
-      * @return bool
-      */
-     public function canRefund()
-@@ -429,6 +460,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-      * Retrieve Creditmemo states array
-      *
-      * @return array
-+     * phpcs:disable Magento2.Functions.StaticFunction
-      */
-     public static function getStates()
-     {
-@@ -441,11 +473,12 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-         }
-         return static::$_states;
-     }
-+    // phpcs:enable
- 
-     /**
-      * Retrieve Creditmemo state name by state identifier
-      *
--     * @param   int $stateId
-+     * @param  int $stateId
-      * @return \Magento\Framework\Phrase
-      */
-     public function getStateName($stateId = null)
-@@ -464,6 +497,8 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
-+     * Set shipping amount.
-+     *
-      * @param float $amount
-      * @return $this
-      */
-@@ -473,6 +508,8 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
-+     * Set adjustment positive amount.
-+     *
-      * @param string $amount
-      * @return $this
-      */
-@@ -493,6 +530,8 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
-+     * Set adjustment negative amount.
-+     *
-      * @param string $amount
-      * @return $this
-      */
-@@ -541,6 +580,8 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
-+     * Add comment to credit memo.
-+     *
-      * Adds comment to credit memo with additional possibility to send it to customer via email
-      * and show it in customer account
-      *
-@@ -567,6 +608,8 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
-+     * Retrieve collection of comments.
-+     *
-      * @param bool $reload
-      * @return \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Comment\Collection
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-@@ -606,11 +649,27 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
-+     * Check if grand total is valid.
-+     *
-      * @return bool
-      */
-     public function isValidGrandTotal()
-     {
--        return !($this->getGrandTotal() <= 0 && !$this->getAllowZeroGrandTotal());
-+        return !($this->getGrandTotal() <= 0 && !$this->isAllowZeroGrandTotal());
-+    }
-+
-+    /**
-+     * Return Zero GrandTotal availability.
-+     *
-+     * @return bool
-+     */
-+    private function isAllowZeroGrandTotal()
-+    {
-+        $isAllowed = $this->scopeConfig->getValue(
-+            'sales/zerograndtotal_creditmemo/allow_zero_grandtotal',
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+        );
-+        return $isAllowed;
-     }
- 
-     /**
-@@ -658,7 +717,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setItems($items)
-     {
-@@ -898,7 +957,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCreatedAt($createdAt)
-     {
-@@ -1157,7 +1216,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setComments($comments)
-     {
-@@ -1165,7 +1224,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreId($id)
-     {
-@@ -1173,7 +1232,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingTaxAmount($amount)
-     {
-@@ -1181,7 +1240,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreToOrderRate($rate)
-     {
-@@ -1189,7 +1248,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountAmount($amount)
-     {
-@@ -1197,7 +1256,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseToOrderRate($rate)
-     {
-@@ -1205,7 +1264,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGrandTotal($amount)
-     {
-@@ -1213,7 +1272,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseSubtotalInclTax($amount)
-     {
-@@ -1221,7 +1280,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSubtotalInclTax($amount)
-     {
-@@ -1229,7 +1288,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingAmount($amount)
-     {
-@@ -1237,7 +1296,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreToBaseRate($rate)
-     {
-@@ -1245,7 +1304,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseToGlobalRate($rate)
-     {
-@@ -1253,7 +1312,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseAdjustment($baseAdjustment)
-     {
-@@ -1261,7 +1320,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseSubtotal($amount)
-     {
-@@ -1269,7 +1328,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountAmount($amount)
-     {
-@@ -1277,7 +1336,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSubtotal($amount)
-     {
-@@ -1285,7 +1344,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAdjustment($adjustment)
-     {
-@@ -1293,7 +1352,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseGrandTotal($amount)
-     {
-@@ -1301,7 +1360,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTaxAmount($amount)
-     {
-@@ -1309,7 +1368,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingTaxAmount($amount)
-     {
-@@ -1317,7 +1376,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTaxAmount($amount)
-     {
-@@ -1325,7 +1384,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setOrderId($id)
-     {
-@@ -1333,7 +1392,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setEmailSent($emailSent)
-     {
-@@ -1341,7 +1400,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCreditmemoStatus($creditmemoStatus)
-     {
-@@ -1349,7 +1408,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setState($state)
-     {
-@@ -1357,7 +1416,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingAddressId($id)
-     {
-@@ -1365,7 +1424,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBillingAddressId($id)
-     {
-@@ -1373,7 +1432,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setInvoiceId($id)
-     {
-@@ -1381,7 +1440,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreCurrencyCode($code)
-     {
-@@ -1389,7 +1448,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setOrderCurrencyCode($code)
-     {
-@@ -1397,7 +1456,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseCurrencyCode($code)
-     {
-@@ -1405,7 +1464,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGlobalCurrencyCode($code)
-     {
-@@ -1413,7 +1472,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setIncrementId($id)
-     {
-@@ -1421,7 +1480,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setUpdatedAt($timestamp)
-     {
-@@ -1429,7 +1488,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountTaxCompensationAmount($amount)
-     {
-@@ -1437,7 +1496,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountTaxCompensationAmount($amount)
-     {
-@@ -1445,7 +1504,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingDiscountTaxCompensationAmount($amount)
-     {
-@@ -1453,7 +1512,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
-     {
-@@ -1461,7 +1520,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingInclTax($amount)
-     {
-@@ -1469,7 +1528,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingInclTax($amount)
-     {
-@@ -1477,7 +1536,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountDescription($description)
-     {
-@@ -1485,9 +1544,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
--     *
--     * @return \Magento\Sales\Api\Data\CreditmemoExtensionInterface|null
-+     * @inheritdoc
-      */
-     public function getExtensionAttributes()
-     {
-@@ -1495,10 +1552,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
-     }
- 
-     /**
--     * {@inheritdoc}
--     *
--     * @param \Magento\Sales\Api\Data\CreditmemoExtensionInterface $extensionAttributes
--     * @return $this
-+     * @inheritdoc
-      */
-     public function setExtensionAttributes(\Magento\Sales\Api\Data\CreditmemoExtensionInterface $extensionAttributes)
-     {
-diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
-index 5c3f563a4f0..35244b26613 100644
---- a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
-+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
-@@ -10,6 +10,8 @@ use Magento\Sales\Api\Data\CreditmemoItemInterface;
- use Magento\Sales\Model\AbstractModel;
- 
- /**
-+ * Creditmemo item model.
-+ *
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
-@@ -189,6 +191,8 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
-+     * Calculate qty for creditmemo item.
-+     *
-      * @return int|float
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
-@@ -212,6 +216,8 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
-+     * Cancel creaditmemeo item.
-+     *
-      * @return $this
-      */
-     public function cancel()
-@@ -236,7 +242,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     /**
-      * Invoice item row total calculation
-      *
--     * @return \Magento\Sales\Model\Order\Invoice\Item
-+     * @return $this
-      */
-     public function calcRowTotal()
-     {
-@@ -608,7 +614,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     //@codeCoverageIgnoreStart
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setParentId($id)
-     {
-@@ -616,7 +622,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBasePrice($price)
-     {
-@@ -624,7 +630,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTaxAmount($amount)
-     {
-@@ -632,7 +638,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseRowTotal($amount)
-     {
-@@ -640,7 +646,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountAmount($amount)
-     {
-@@ -648,7 +654,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRowTotal($amount)
-     {
-@@ -656,7 +662,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountAmount($amount)
-     {
-@@ -664,7 +670,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPriceInclTax($amount)
-     {
-@@ -672,7 +678,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTaxAmount($amount)
-     {
-@@ -680,7 +686,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBasePriceInclTax($amount)
-     {
-@@ -688,7 +694,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseCost($baseCost)
-     {
-@@ -696,7 +702,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPrice($price)
-     {
-@@ -704,7 +710,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseRowTotalInclTax($amount)
-     {
-@@ -712,7 +718,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRowTotalInclTax($amount)
-     {
-@@ -720,7 +726,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setProductId($id)
-     {
-@@ -728,7 +734,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setOrderItemId($id)
-     {
-@@ -736,7 +742,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAdditionalData($additionalData)
-     {
-@@ -744,7 +750,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDescription($description)
-     {
-@@ -752,7 +758,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSku($sku)
-     {
-@@ -760,7 +766,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setName($name)
-     {
-@@ -768,7 +774,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountTaxCompensationAmount($amount)
-     {
-@@ -776,7 +782,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountTaxCompensationAmount($amount)
-     {
-@@ -784,7 +790,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setWeeeTaxDisposition($weeeTaxDisposition)
-     {
-@@ -792,7 +798,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setWeeeTaxRowDisposition($weeeTaxRowDisposition)
-     {
-@@ -800,7 +806,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition)
-     {
-@@ -808,7 +814,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition)
-     {
-@@ -816,7 +822,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setWeeeTaxApplied($weeeTaxApplied)
-     {
-@@ -824,7 +830,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseWeeeTaxAppliedAmount($amount)
-     {
-@@ -832,7 +838,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseWeeeTaxAppliedRowAmnt($amnt)
-     {
-@@ -840,7 +846,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setWeeeTaxAppliedAmount($amount)
-     {
-@@ -848,7 +854,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setWeeeTaxAppliedRowAmount($amount)
-     {
-@@ -856,7 +862,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return \Magento\Sales\Api\Data\CreditmemoItemExtensionInterface|null
-      */
-@@ -866,7 +872,7 @@ class Item extends AbstractModel implements CreditmemoItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @param \Magento\Sales\Api\Data\CreditmemoItemExtensionInterface $extensionAttributes
-      * @return $this
-diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Item/Validation/CreationQuantityValidator.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Item/Validation/CreationQuantityValidator.php
-index 0c2adfff80a..93a4e701e03 100644
---- a/app/code/Magento/Sales/Model/Order/Creditmemo/Item/Validation/CreationQuantityValidator.php
-+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Item/Validation/CreationQuantityValidator.php
-@@ -30,6 +30,7 @@ class CreationQuantityValidator implements ValidatorInterface
- 
-     /**
-      * ItemCreationQuantityValidator constructor.
-+     *
-      * @param OrderItemRepositoryInterface $orderItemRepository
-      * @param mixed $context
-      */
-@@ -53,6 +54,10 @@ class CreationQuantityValidator implements ValidatorInterface
-             return [__('The creditmemo contains product item that is not part of the original order.')];
-         }
- 
-+        if ($orderItem->isDummy()) {
-+            return [__('The creditmemo contains incorrect product items.')];
-+        }
-+
-         if (!$this->isQtyAvailable($orderItem, $entity->getQty())) {
-             return [__('The quantity to refund must not be greater than the unrefunded quantity.')];
-         }
-@@ -61,6 +66,8 @@ class CreationQuantityValidator implements ValidatorInterface
-     }
- 
-     /**
-+     * Check the quantity to refund is greater than the unrefunded quantity
-+     *
-      * @param Item $orderItem
-      * @param int $qty
-      * @return bool
-@@ -71,6 +78,8 @@ class CreationQuantityValidator implements ValidatorInterface
-     }
- 
-     /**
-+     * Check to see if Item is part of the order
-+     *
-      * @param OrderItemInterface $orderItem
-      * @return bool
-      */
-diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreation.php b/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreation.php
-index d6da44c5cb5..3fd3eaaa11a 100644
---- a/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreation.php
-+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreation.php
-@@ -28,7 +28,7 @@ class ItemCreation implements CreditmemoItemCreationInterface
-     private $extensionAttributes;
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getOrderItemId()
-     {
-@@ -36,7 +36,7 @@ class ItemCreation implements CreditmemoItemCreationInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setOrderItemId($orderItemId)
-     {
-@@ -45,7 +45,7 @@ class ItemCreation implements CreditmemoItemCreationInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getQty()
-     {
-@@ -53,7 +53,7 @@ class ItemCreation implements CreditmemoItemCreationInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setQty($qty)
-     {
-diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
-index ecd5670a319..93c8ed00f9d 100644
---- a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
-+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
-@@ -89,6 +89,7 @@ class EmailSender extends Sender implements SenderInterface
-      * @param bool $forceSyncMode
-      *
-      * @return bool
-+     * @throws \Exception
-      */
-     public function send(
-         \Magento\Sales\Api\Data\OrderInterface $order,
-@@ -96,9 +97,11 @@ class EmailSender extends Sender implements SenderInterface
-         \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface $comment = null,
-         $forceSyncMode = false
-     ) {
--        $creditmemo->setSendEmail(true);
-+        $creditmemo->setSendEmail($this->identityContainer->isEnabled());
- 
-         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
-+            $this->identityContainer->setStore($order->getStore());
-+
-             $transport = [
-                 'order' => $order,
-                 'creditmemo' => $creditmemo,
-@@ -145,6 +148,7 @@ class EmailSender extends Sender implements SenderInterface
-      * @param \Magento\Sales\Api\Data\OrderInterface $order
-      *
-      * @return string
-+     * @throws \Exception
-      */
-     private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
-     {
-diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php
-index 0cc4143e569..06bfbcf24da 100644
---- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php
-+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php
-@@ -5,11 +5,17 @@
-  */
- namespace Magento\Sales\Model\Order\Creditmemo\Total;
- 
-+/**
-+ * Discount total calculator
-+ */
- class Discount extends AbstractTotal
- {
-     /**
-+     * Collect discount
-+     *
-      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
-      * @return $this
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
-     {
-@@ -26,6 +32,16 @@ class Discount extends AbstractTotal
-          * basing on how much shipping should be refunded.
-          */
-         $baseShippingAmount = $this->getBaseShippingAmount($creditmemo);
-+
-+        /**
-+         * If credit memo's shipping amount is set and Order's shipping amount is 0,
-+         * throw exception with different message
-+         */
-+        if ($baseShippingAmount && $order->getBaseShippingAmount() <= 0) {
-+            throw new \Magento\Framework\Exception\LocalizedException(
-+                __("You can not refund shipping if there is no shipping amount.")
-+            );
-+        }
-         if ($baseShippingAmount) {
-             $baseShippingDiscount = $baseShippingAmount *
-                 $order->getBaseShippingDiscountAmount() /
-diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
-index f00334f496b..f644d0c3a5a 100644
---- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
-+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
-@@ -37,6 +37,8 @@ class Shipping extends AbstractTotal
-     }
- 
-     /**
-+     * Collects credit memo shipping totals.
-+     *
-      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
-      * @return $this
-      * @throws \Magento\Framework\Exception\LocalizedException
-@@ -55,12 +57,10 @@ class Shipping extends AbstractTotal
-         $orderShippingInclTax = $order->getShippingInclTax();
-         $orderBaseShippingInclTax = $order->getBaseShippingInclTax();
-         $allowedTaxAmount = $order->getShippingTaxAmount() - $order->getShippingTaxRefunded();
--        $baseAllowedTaxAmount = $order->getBaseShippingTaxAmount() - $order->getBaseShippingTaxRefunded();
-         $allowedAmountInclTax = $allowedAmount + $allowedTaxAmount;
--        $baseAllowedAmountInclTax = $baseAllowedAmount + $baseAllowedTaxAmount;
--
--        // for the credit memo
--        $shippingAmount = $baseShippingAmount = $shippingInclTax = $baseShippingInclTax = 0;
-+        $baseAllowedAmountInclTax = $orderBaseShippingInclTax
-+            - $order->getBaseShippingRefunded()
-+            - $order->getBaseShippingTaxRefunded();
- 
-         // Check if the desired shipping amount to refund was specified (from invoice or another source).
-         if ($creditmemo->hasBaseShippingAmount()) {
-@@ -128,7 +128,6 @@ class Shipping extends AbstractTotal
- 
-     /**
-      * Get the Tax Config.
--     * In a future release, will become a constructor parameter.
-      *
-      * @return \Magento\Tax\Model\Config
-      *
-diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
-index a842c0470ad..d4c2e7b2d68 100644
---- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
-+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
-@@ -5,9 +5,14 @@
-  */
- namespace Magento\Sales\Model\Order\Creditmemo\Total;
- 
-+/**
-+ * Collects credit memo taxes.
-+ */
- class Tax extends AbstractTotal
- {
-     /**
-+     * Collects credit memo taxes.
-+     *
-      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
-      * @return $this
-      *
-@@ -70,27 +75,20 @@ class Tax extends AbstractTotal
-         }
- 
-         $isPartialShippingRefunded = false;
-+        $baseOrderShippingAmount = (float)$order->getBaseShippingAmount();
-         if ($invoice = $creditmemo->getInvoice()) {
-             //recalculate tax amounts in case if refund shipping value was changed
--            if ($order->getBaseShippingAmount() && $creditmemo->getBaseShippingAmount()) {
--                $taxFactor = $creditmemo->getBaseShippingAmount() / $order->getBaseShippingAmount();
-+            if ($baseOrderShippingAmount && $creditmemo->getBaseShippingAmount() !== null) {
-+                $taxFactor = $creditmemo->getBaseShippingAmount() / $baseOrderShippingAmount;
-                 $shippingTaxAmount = $invoice->getShippingTaxAmount() * $taxFactor;
-                 $baseShippingTaxAmount = $invoice->getBaseShippingTaxAmount() * $taxFactor;
-                 $totalDiscountTaxCompensation += $invoice->getShippingDiscountTaxCompensationAmount() * $taxFactor;
-                 $baseTotalDiscountTaxCompensation +=
-                     $invoice->getBaseShippingDiscountTaxCompensationAmnt() * $taxFactor;
--                $shippingDiscountTaxCompensationAmount =
--                    $invoice->getShippingDiscountTaxCompensationAmount() * $taxFactor;
--                $baseShippingDiscountTaxCompensationAmount =
--                    $invoice->getBaseShippingDiscountTaxCompensationAmnt() * $taxFactor;
-                 $shippingTaxAmount = $creditmemo->roundPrice($shippingTaxAmount);
-                 $baseShippingTaxAmount = $creditmemo->roundPrice($baseShippingTaxAmount, 'base');
-                 $totalDiscountTaxCompensation = $creditmemo->roundPrice($totalDiscountTaxCompensation);
-                 $baseTotalDiscountTaxCompensation = $creditmemo->roundPrice($baseTotalDiscountTaxCompensation, 'base');
--                $shippingDiscountTaxCompensationAmount =
--                    $creditmemo->roundPrice($shippingDiscountTaxCompensationAmount);
--                $baseShippingDiscountTaxCompensationAmount =
--                    $creditmemo->roundPrice($baseShippingDiscountTaxCompensationAmount, 'base');
-                 if ($taxFactor < 1 && $invoice->getShippingTaxAmount() > 0) {
-                     $isPartialShippingRefunded = true;
-                 }
-@@ -99,7 +97,6 @@ class Tax extends AbstractTotal
-             }
-         } else {
-             $orderShippingAmount = $order->getShippingAmount();
--            $baseOrderShippingAmount = $order->getBaseShippingAmount();
- 
-             $baseOrderShippingRefundedAmount = $order->getBaseShippingRefunded();
- 
-diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
-index 65c1788c68d..b86acbab208 100644
---- a/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
-+++ b/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
-@@ -99,11 +99,14 @@ class CreditmemoDocumentFactory
-             ->setCreditmemo($creditmemo)
-             ->setIsCustomerNotified($appendComment);
-         $creditmemo->setComments([$comment]);
-+        $creditmemo->setCustomerNote($comment->getComment());
-+        $creditmemo->setCustomerNoteNotify($appendComment);
-         return $creditmemo;
-     }
- 
-     /**
-      * Create new Creditmemo
-+     *
-      * @param \Magento\Sales\Api\Data\OrderInterface $order
-      * @param \Magento\Sales\Api\Data\CreditmemoItemCreationInterface[] $items
-      * @param \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface|null $comment
-@@ -128,6 +131,8 @@ class CreditmemoDocumentFactory
-     }
- 
-     /**
-+     * Create credit memo from invoice
-+     *
-      * @param \Magento\Sales\Api\Data\InvoiceInterface $invoice
-      * @param \Magento\Sales\Api\Data\CreditmemoItemCreationInterface[] $items
-      * @param \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface|null $comment
-diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
-index e61c2597975..73afd0a06f7 100644
---- a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
-+++ b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
-@@ -200,6 +200,7 @@ class CreditmemoFactory
-     {
-         if (isset($data['shipping_amount'])) {
-             $creditmemo->setBaseShippingAmount((double)$data['shipping_amount']);
-+            $creditmemo->setBaseShippingInclTax((double)$data['shipping_amount']);
-         }
-         if (isset($data['adjustment_positive'])) {
-             $creditmemo->setAdjustmentPositive($data['adjustment_positive']);
-@@ -210,6 +211,8 @@ class CreditmemoFactory
-     }
- 
-     /**
-+     * Calculate product options.
-+     *
-      * @param Item $orderItem
-      * @param int $parentQty
-      * @return int
-diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php b/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
-index 1d82c175491..ce4a0aa5b3e 100644
---- a/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
-+++ b/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
-@@ -7,12 +7,13 @@
- namespace Magento\Sales\Model\Order;
- 
- use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
--use Magento\Sales\Model\ResourceModel\Metadata;
--use Magento\Sales\Api\Data\CreditmemoSearchResultInterfaceFactory as SearchResultFactory;
--use Magento\Framework\Exception\NoSuchEntityException;
--use Magento\Framework\Exception\InputException;
- use Magento\Framework\Exception\CouldNotDeleteException;
- use Magento\Framework\Exception\CouldNotSaveException;
-+use Magento\Framework\Exception\InputException;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Sales\Api\Data\CreditmemoSearchResultInterfaceFactory as SearchResultFactory;
-+use Magento\Sales\Model\ResourceModel\Metadata;
- 
- /**
-  * Repository class for @see \Magento\Sales\Api\Data\CreditmemoInterface
-@@ -139,6 +140,8 @@ class CreditmemoRepository implements \Magento\Sales\Api\CreditmemoRepositoryInt
-         try {
-             $this->metadata->getMapper()->save($entity);
-             $this->registry[$entity->getEntityId()] = $entity;
-+        } catch (LocalizedException $e) {
-+            throw new CouldNotSaveException(__($e->getMessage()), $e);
-         } catch (\Exception $e) {
-             throw new CouldNotSaveException(__("The credit memo couldn't be saved."), $e);
-         }
-diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender.php b/app/code/Magento/Sales/Model/Order/Email/Sender.php
-index 6d4480c4c45..564fd1e2a4b 100644
---- a/app/code/Magento/Sales/Model/Order/Email/Sender.php
-+++ b/app/code/Magento/Sales/Model/Order/Email/Sender.php
-@@ -65,6 +65,8 @@ abstract class Sender
-     }
- 
-     /**
-+     * Send order email if it is enabled in configuration.
-+     *
-      * @param Order $order
-      * @return bool
-      */
-@@ -81,17 +83,21 @@ abstract class Sender
- 
-         try {
-             $sender->send();
--            $sender->sendCopyTo();
-         } catch (\Exception $e) {
-             $this->logger->error($e->getMessage());
--
-             return false;
-         }
--
-+        try {
-+            $sender->sendCopyTo();
-+        } catch (\Exception $e) {
-+            $this->logger->error($e->getMessage());
-+        }
-         return true;
-     }
- 
-     /**
-+     * Populate order email template with customer information.
-+     *
-      * @param Order $order
-      * @return void
-      */
-@@ -113,6 +119,8 @@ abstract class Sender
-     }
- 
-     /**
-+     * Create Sender object using appropriate template and identity.
-+     *
-      * @return Sender
-      */
-     protected function getSender()
-@@ -126,6 +134,8 @@ abstract class Sender
-     }
- 
-     /**
-+     * Get template options.
-+     *
-      * @return array
-      */
-     protected function getTemplateOptions()
-@@ -137,6 +147,8 @@ abstract class Sender
-     }
- 
-     /**
-+     * Render shipping address into html.
-+     *
-      * @param Order $order
-      * @return string|null
-      */
-@@ -148,6 +160,8 @@ abstract class Sender
-     }
- 
-     /**
-+     * Render billing address into html.
-+     *
-      * @param Order $order
-      * @return string|null
-      */
-diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
-index ce72f0fee77..09360d0685c 100644
---- a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
-+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
-@@ -63,6 +63,8 @@ class CreditmemoCommentSender extends NotifySender
-     public function send(Creditmemo $creditmemo, $notify = true, $comment = '')
-     {
-         $order = $creditmemo->getOrder();
-+        $this->identityContainer->setStore($order->getStore());
-+
-         $transport = [
-             'order' => $order,
-             'creditmemo' => $creditmemo,
-diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
-index 80044835831..3cbd0636413 100644
---- a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
-+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
-@@ -57,10 +57,10 @@ class CreditmemoSender extends Sender
-      * @param CreditmemoIdentity $identityContainer
-      * @param Order\Email\SenderBuilderFactory $senderBuilderFactory
-      * @param \Psr\Log\LoggerInterface $logger
-+     * @param Renderer $addressRenderer
-      * @param PaymentHelper $paymentHelper
-      * @param CreditmemoResource $creditmemoResource
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
--     * @param Renderer $addressRenderer
-      * @param ManagerInterface $eventManager
-      */
-     public function __construct(
-@@ -96,13 +96,15 @@ class CreditmemoSender extends Sender
-      * @param Creditmemo $creditmemo
-      * @param bool $forceSyncMode
-      * @return bool
-+     * @throws \Exception
-      */
-     public function send(Creditmemo $creditmemo, $forceSyncMode = false)
-     {
--        $creditmemo->setSendEmail(true);
-+        $creditmemo->setSendEmail($this->identityContainer->isEnabled());
- 
-         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
-             $order = $creditmemo->getOrder();
-+            $this->identityContainer->setStore($order->getStore());
- 
-             $transport = [
-                 'order' => $order,
-@@ -146,6 +148,7 @@ class CreditmemoSender extends Sender
-      *
-      * @param Order $order
-      * @return string
-+     * @throws \Exception
-      */
-     protected function getPaymentHtml(Order $order)
-     {
-diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
-index 62d13eb8ce6..32855f78c15 100644
---- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
-+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
-@@ -63,6 +63,8 @@ class InvoiceCommentSender extends NotifySender
-     public function send(Invoice $invoice, $notify = true, $comment = '')
-     {
-         $order = $invoice->getOrder();
-+        $this->identityContainer->setStore($order->getStore());
-+
-         $transport = [
-             'order' => $order,
-             'invoice' => $invoice,
-diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
-index 994fd79945c..3ac5342de74 100644
---- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
-+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
-@@ -57,10 +57,10 @@ class InvoiceSender extends Sender
-      * @param InvoiceIdentity $identityContainer
-      * @param Order\Email\SenderBuilderFactory $senderBuilderFactory
-      * @param \Psr\Log\LoggerInterface $logger
-+     * @param Renderer $addressRenderer
-      * @param PaymentHelper $paymentHelper
-      * @param InvoiceResource $invoiceResource
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
--     * @param Renderer $addressRenderer
-      * @param ManagerInterface $eventManager
-      */
-     public function __construct(
-@@ -96,13 +96,15 @@ class InvoiceSender extends Sender
-      * @param Invoice $invoice
-      * @param bool $forceSyncMode
-      * @return bool
-+     * @throws \Exception
-      */
-     public function send(Invoice $invoice, $forceSyncMode = false)
-     {
--        $invoice->setSendEmail(true);
-+        $invoice->setSendEmail($this->identityContainer->isEnabled());
- 
-         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
-             $order = $invoice->getOrder();
-+            $this->identityContainer->setStore($order->getStore());
- 
-             $transport = [
-                 'order' => $order,
-@@ -146,6 +148,7 @@ class InvoiceSender extends Sender
-      *
-      * @param Order $order
-      * @return string
-+     * @throws \Exception
-      */
-     protected function getPaymentHtml(Order $order)
-     {
-diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
-index 98cb9304a49..e162e01bd75 100644
---- a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
-+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
-@@ -61,6 +61,8 @@ class OrderCommentSender extends NotifySender
-      */
-     public function send(Order $order, $notify = true, $comment = '')
-     {
-+        $this->identityContainer->setStore($order->getStore());
-+
-         $transport = [
-             'order' => $order,
-             'comment' => $comment,
-diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
-index f06da0de0fd..bfbe1fb4fd7 100644
---- a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
-+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
-@@ -55,10 +55,10 @@ class OrderSender extends Sender
-      * @param OrderIdentity $identityContainer
-      * @param Order\Email\SenderBuilderFactory $senderBuilderFactory
-      * @param \Psr\Log\LoggerInterface $logger
-+     * @param Renderer $addressRenderer
-      * @param PaymentHelper $paymentHelper
-      * @param OrderResource $orderResource
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
--     * @param Renderer $addressRenderer
-      * @param ManagerInterface $eventManager
-      */
-     public function __construct(
-@@ -97,7 +97,7 @@ class OrderSender extends Sender
-      */
-     public function send(Order $order, $forceSyncMode = false)
-     {
--        $order->setSendEmail(true);
-+        $order->setSendEmail($this->identityContainer->isEnabled());
- 
-         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
-             if ($this->checkAndSend($order)) {
-diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
-index 664f8ec9fc7..b0b4907b96e 100644
---- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
-+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
-@@ -63,6 +63,8 @@ class ShipmentCommentSender extends NotifySender
-     public function send(Shipment $shipment, $notify = true, $comment = '')
-     {
-         $order = $shipment->getOrder();
-+        $this->identityContainer->setStore($order->getStore());
-+
-         $transport = [
-             'order' => $order,
-             'shipment' => $shipment,
-diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
-index 6729c746f55..df28dec7012 100644
---- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
-+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
-@@ -57,10 +57,10 @@ class ShipmentSender extends Sender
-      * @param ShipmentIdentity $identityContainer
-      * @param Order\Email\SenderBuilderFactory $senderBuilderFactory
-      * @param \Psr\Log\LoggerInterface $logger
-+     * @param Renderer $addressRenderer
-      * @param PaymentHelper $paymentHelper
-      * @param ShipmentResource $shipmentResource
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
--     * @param Renderer $addressRenderer
-      * @param ManagerInterface $eventManager
-      */
-     public function __construct(
-@@ -96,13 +96,15 @@ class ShipmentSender extends Sender
-      * @param Shipment $shipment
-      * @param bool $forceSyncMode
-      * @return bool
-+     * @throws \Exception
-      */
-     public function send(Shipment $shipment, $forceSyncMode = false)
-     {
--        $shipment->setSendEmail(true);
-+        $shipment->setSendEmail($this->identityContainer->isEnabled());
- 
-         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
-             $order = $shipment->getOrder();
-+            $this->identityContainer->setStore($order->getStore());
- 
-             $transport = [
-                 'order' => $order,
-@@ -146,6 +148,7 @@ class ShipmentSender extends Sender
-      *
-      * @param Order $order
-      * @return string
-+     * @throws \Exception
-      */
-     protected function getPaymentHtml(Order $order)
-     {
-diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
-index 7ec089b8829..ed9e3882224 100644
---- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
-+++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
-@@ -5,12 +5,14 @@
-  */
- namespace Magento\Sales\Model\Order\Email;
- 
--use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Mail\Template\TransportBuilder;
- use Magento\Framework\Mail\Template\TransportBuilderByStore;
- use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
- use Magento\Sales\Model\Order\Email\Container\Template;
- 
-+/**
-+ * Sender Builder
-+ */
- class SenderBuilder
- {
-     /**
-@@ -29,11 +31,8 @@ class SenderBuilder
-     protected $transportBuilder;
- 
-     /**
--     * @var TransportBuilderByStore
--     */
--    private $transportBuilderByStore;
--
--    /**
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     *
-      * @param Template $templateContainer
-      * @param IdentityInterface $identityContainer
-      * @param TransportBuilder $transportBuilder
-@@ -48,9 +47,6 @@ class SenderBuilder
-         $this->templateContainer = $templateContainer;
-         $this->identityContainer = $identityContainer;
-         $this->transportBuilder = $transportBuilder;
--        $this->transportBuilderByStore = $transportBuilderByStore ?: ObjectManager::getInstance()->get(
--            TransportBuilderByStore::class
--        );
-     }
- 
-     /**
-@@ -110,7 +106,7 @@ class SenderBuilder
-         $this->transportBuilder->setTemplateIdentifier($this->templateContainer->getTemplateId());
-         $this->transportBuilder->setTemplateOptions($this->templateContainer->getTemplateOptions());
-         $this->transportBuilder->setTemplateVars($this->templateContainer->getTemplateVars());
--        $this->transportBuilderByStore->setFromByStore(
-+        $this->transportBuilder->setFromByScope(
-             $this->identityContainer->getEmailIdentity(),
-             $this->identityContainer->getStore()->getId()
-         );
-diff --git a/app/code/Magento/Sales/Model/Order/Invoice.php b/app/code/Magento/Sales/Model/Order/Invoice.php
-index 3f2fa1f72f6..14dd0b14ac1 100644
---- a/app/code/Magento/Sales/Model/Order/Invoice.php
-+++ b/app/code/Magento/Sales/Model/Order/Invoice.php
-@@ -11,6 +11,8 @@ use Magento\Sales\Model\AbstractModel;
- use Magento\Sales\Model\EntityInterface;
- 
- /**
-+ * Invoice model.
-+ *
-  * @api
-  * @method \Magento\Sales\Model\Order\Invoice setSendEmail(bool $value)
-  * @method \Magento\Sales\Model\Order\Invoice setCustomerNote(string $value)
-@@ -445,10 +447,6 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-         $order->setBaseDiscountInvoiced($order->getBaseDiscountInvoiced() - $this->getBaseDiscountAmount());
-         $order->setBaseTotalInvoicedCost($order->getBaseTotalInvoicedCost() - $this->getBaseCost());
- 
--        if ($this->getState() == self::STATE_PAID) {
--            $order->setTotalPaid($order->getTotalPaid() - $this->getGrandTotal());
--            $order->setBaseTotalPaid($order->getBaseTotalPaid() - $this->getBaseGrandTotal());
--        }
-         $this->setState(self::STATE_CANCELED);
-         $order->setState(\Magento\Sales\Model\Order::STATE_PROCESSING)
-             ->setStatus($order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_PROCESSING));
-@@ -508,6 +506,8 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
-+     * Get all Invoice Items.
-+     *
-      * @return array
-      */
-     public function getAllItems()
-@@ -522,6 +522,8 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
-+     * Get Invoice Item by id.
-+     *
-      * @param int|string $itemId
-      * @return bool|\Magento\Sales\Model\Order\Invoice\Item
-      */
-@@ -536,8 +538,11 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
-+     * Add Item to Invoice.
-+     *
-      * @param \Magento\Sales\Model\Order\Invoice\Item $item
-      * @return $this
-+     * @throws \Exception
-      */
-     public function addItem(\Magento\Sales\Model\Order\Invoice\Item $item)
-     {
-@@ -682,13 +687,13 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * Adds comment to invoice with additional possibility to send it to customer via email
--     * and show it in customer account
-+     * Add comment with possibility to send it to customer via email and show it in customer account.
-      *
-      * @param string $comment
-      * @param bool $notify
-      * @param bool $visibleOnFront
-      * @return $this
-+     * @throws \Exception
-      */
-     public function addComment($comment, $notify = false, $visibleOnFront = false)
-     {
-@@ -710,6 +715,8 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
-+     * Get Invoice comments.
-+     *
-      * @param bool $reload
-      * @return \Magento\Sales\Model\ResourceModel\Order\Invoice\Comment\Collection
-      */
-@@ -839,7 +846,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setItems($items)
-     {
-@@ -1007,7 +1014,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCreatedAt($createdAt)
-     {
-@@ -1266,7 +1273,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setComments($comments)
-     {
-@@ -1274,7 +1281,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setUpdatedAt($timestamp)
-     {
-@@ -1282,7 +1289,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreId($id)
-     {
-@@ -1290,7 +1297,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseGrandTotal($amount)
-     {
-@@ -1298,7 +1305,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingTaxAmount($amount)
-     {
-@@ -1306,7 +1313,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTaxAmount($amount)
-     {
-@@ -1314,7 +1321,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTaxAmount($amount)
-     {
-@@ -1322,7 +1329,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreToOrderRate($rate)
-     {
-@@ -1330,7 +1337,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingTaxAmount($amount)
-     {
-@@ -1338,7 +1345,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountAmount($amount)
-     {
-@@ -1346,7 +1353,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseToOrderRate($rate)
-     {
-@@ -1354,7 +1361,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGrandTotal($amount)
-     {
-@@ -1362,7 +1369,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingAmount($amount)
-     {
-@@ -1370,7 +1377,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSubtotalInclTax($amount)
-     {
-@@ -1378,7 +1385,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseSubtotalInclTax($amount)
-     {
-@@ -1386,7 +1393,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreToBaseRate($rate)
-     {
-@@ -1394,7 +1401,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingAmount($amount)
-     {
-@@ -1402,7 +1409,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTotalQty($qty)
-     {
-@@ -1410,7 +1417,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseToGlobalRate($rate)
-     {
-@@ -1418,7 +1425,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSubtotal($amount)
-     {
-@@ -1426,7 +1433,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseSubtotal($amount)
-     {
-@@ -1434,7 +1441,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountAmount($amount)
-     {
-@@ -1442,7 +1449,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBillingAddressId($id)
-     {
-@@ -1450,7 +1457,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setIsUsedForRefund($isUsedForRefund)
-     {
-@@ -1458,7 +1465,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setOrderId($id)
-     {
-@@ -1466,7 +1473,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setEmailSent($emailSent)
-     {
-@@ -1474,7 +1481,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCanVoidFlag($canVoidFlag)
-     {
-@@ -1482,7 +1489,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setState($state)
-     {
-@@ -1490,7 +1497,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingAddressId($id)
-     {
-@@ -1498,7 +1505,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreCurrencyCode($code)
-     {
-@@ -1506,7 +1513,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setOrderCurrencyCode($code)
-     {
-@@ -1514,7 +1521,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseCurrencyCode($code)
-     {
-@@ -1522,7 +1529,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGlobalCurrencyCode($code)
-     {
-@@ -1530,7 +1537,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setIncrementId($id)
-     {
-@@ -1538,7 +1545,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountTaxCompensationAmount($amount)
-     {
-@@ -1546,7 +1553,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountTaxCompensationAmount($amount)
-     {
-@@ -1554,7 +1561,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingDiscountTaxCompensationAmount($amount)
-     {
-@@ -1562,7 +1569,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
-     {
-@@ -1570,7 +1577,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingInclTax($amount)
-     {
-@@ -1578,7 +1585,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingInclTax($amount)
-     {
-@@ -1586,7 +1593,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTotalRefunded($amount)
-     {
-@@ -1594,7 +1601,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountDescription($description)
-     {
-@@ -1602,7 +1609,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return \Magento\Sales\Api\Data\InvoiceExtensionInterface|null
-      */
-@@ -1612,7 +1619,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @param \Magento\Sales\Api\Data\InvoiceExtensionInterface $extensionAttributes
-      * @return $this
-diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
-index aa0687bee50..004f36c2770 100644
---- a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
-+++ b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
-@@ -89,6 +89,7 @@ class EmailSender extends Sender implements SenderInterface
-      * @param bool $forceSyncMode
-      *
-      * @return bool
-+     * @throws \Exception
-      */
-     public function send(
-         \Magento\Sales\Api\Data\OrderInterface $order,
-@@ -96,9 +97,11 @@ class EmailSender extends Sender implements SenderInterface
-         \Magento\Sales\Api\Data\InvoiceCommentCreationInterface $comment = null,
-         $forceSyncMode = false
-     ) {
--        $invoice->setSendEmail(true);
-+        $invoice->setSendEmail($this->identityContainer->isEnabled());
- 
-         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
-+            $this->identityContainer->setStore($order->getStore());
-+
-             $transport = [
-                 'order' => $order,
-                 'invoice' => $invoice,
-@@ -145,6 +148,7 @@ class EmailSender extends Sender implements SenderInterface
-      * @param \Magento\Sales\Api\Data\OrderInterface $order
-      *
-      * @return string
-+     * @throws \Exception
-      */
-     private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
-     {
-diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
-index fd5c015d9db..6e12f10f0c6 100644
---- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
-+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Sales\Model\Order\Invoice\Total;
- 
-+/**
-+ * Collects invoice taxes.
-+ */
- class Tax extends AbstractTotal
- {
-     /**
-@@ -69,11 +72,24 @@ class Tax extends AbstractTotal
-             }
-         }
- 
-+        $taxDiscountCompensationAmt = $totalDiscountTaxCompensation;
-+        $baseTaxDiscountCompensationAmt = $baseTotalDiscountTaxCompensation;
-+        $allowedDiscountTaxCompensation = $order->getDiscountTaxCompensationAmount() -
-+            $order->getDiscountTaxCompensationInvoiced();
-+        $allowedBaseDiscountTaxCompensation = $order->getBaseDiscountTaxCompensationAmount() -
-+            $order->getBaseDiscountTaxCompensationInvoiced();
-+
-         if ($this->_canIncludeShipping($invoice)) {
-             $totalTax += $order->getShippingTaxAmount();
-             $baseTotalTax += $order->getBaseShippingTaxAmount();
-             $totalDiscountTaxCompensation += $order->getShippingDiscountTaxCompensationAmount();
-             $baseTotalDiscountTaxCompensation += $order->getBaseShippingDiscountTaxCompensationAmnt();
-+
-+            $allowedDiscountTaxCompensation += $order->getShippingDiscountTaxCompensationAmount() -
-+                $order->getShippingDiscountTaxCompensationInvoiced();
-+            $allowedBaseDiscountTaxCompensation += $order->getBaseShippingDiscountTaxCompensationAmnt() -
-+                $order->getBaseShippingDiscountTaxCompensationInvoiced();
-+
-             $invoice->setShippingTaxAmount($order->getShippingTaxAmount());
-             $invoice->setBaseShippingTaxAmount($order->getBaseShippingTaxAmount());
-             $invoice->setShippingDiscountTaxCompensationAmount($order->getShippingDiscountTaxCompensationAmount());
-@@ -81,14 +97,6 @@ class Tax extends AbstractTotal
-         }
-         $allowedTax = $order->getTaxAmount() - $order->getTaxInvoiced();
-         $allowedBaseTax = $order->getBaseTaxAmount() - $order->getBaseTaxInvoiced();
--        $allowedDiscountTaxCompensation = $order->getDiscountTaxCompensationAmount() +
--            $order->getShippingDiscountTaxCompensationAmount() -
--            $order->getDiscountTaxCompensationInvoiced() -
--            $order->getShippingDiscountTaxCompensationInvoiced();
--        $allowedBaseDiscountTaxCompensation = $order->getBaseDiscountTaxCompensationAmount() +
--            $order->getBaseShippingDiscountTaxCompensationAmnt() -
--            $order->getBaseDiscountTaxCompensationInvoiced() -
--            $order->getBaseShippingDiscountTaxCompensationInvoiced();
- 
-         if ($invoice->isLast()) {
-             $totalTax = $allowedTax;
-@@ -107,8 +115,8 @@ class Tax extends AbstractTotal
- 
-         $invoice->setTaxAmount($totalTax);
-         $invoice->setBaseTaxAmount($baseTotalTax);
--        $invoice->setDiscountTaxCompensationAmount($totalDiscountTaxCompensation);
--        $invoice->setBaseDiscountTaxCompensationAmount($baseTotalDiscountTaxCompensation);
-+        $invoice->setDiscountTaxCompensationAmount($taxDiscountCompensationAmt);
-+        $invoice->setBaseDiscountTaxCompensationAmount($baseTaxDiscountCompensationAmt);
- 
-         $invoice->setGrandTotal($invoice->getGrandTotal() + $totalTax + $totalDiscountTaxCompensation);
-         $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() + $baseTotalTax + $baseTotalDiscountTaxCompensation);
-diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
-index d2f5f5ce566..a0eff45179a 100644
---- a/app/code/Magento/Sales/Model/Order/Item.php
-+++ b/app/code/Magento/Sales/Model/Order/Item.php
-@@ -483,6 +483,7 @@ class Item extends AbstractModel implements OrderItemInterface
- 
-     /**
-      * Get product options array by code.
-+     *
-      * If code is null return all options
-      *
-      * @param string $code
-@@ -540,8 +541,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Return checking of what calculation
--     * type was for this product
-+     * Return checking of what calculation type was for this product
-      *
-      * @return bool
-      */
-@@ -581,8 +581,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Return checking of what shipment
--     * type was for this product
-+     * Return checking of what shipment type was for this product
-      *
-      * @return bool
-      */
-@@ -605,9 +604,9 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * This is Dummy item or not
--     * if $shipment is true then we checking this for shipping situation if not
--     * then we checking this for calculation
-+     * This is Dummy item or not.
-+     *
-+     * If $shipment is true then we checking this for shipping situation if not, we checking this for calculation.
-      *
-      * @param bool $shipment
-      * @return bool
-@@ -652,8 +651,9 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns formatted buy request - object, holding request received from
--     * product view page with keys and options for configured product
-+     * Return formatted buy request.
-+     *
-+     * This object is holding request received from product view page with keys and options for configured product.
-      *
-      * @return \Magento\Framework\DataObject
-      */
-@@ -703,7 +703,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     //@codeCoverageIgnoreStart
- 
-     /**
--     * Returns additional_data
-+     * Return additional_data
-      *
-      * @return string|null
-      */
-@@ -713,7 +713,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns amount_refunded
-+     * Return amount_refunded
-      *
-      * @return float|null
-      */
-@@ -723,7 +723,9 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns applied_rule_ids
-+     * Return applied_rule_ids
-+     *
-+     * Rules are comma separated if there are more than one.
-      *
-      * @return string|null
-      */
-@@ -733,7 +735,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_amount_refunded
-+     * Return base_amount_refunded
-      *
-      * @return float|null
-      */
-@@ -743,7 +745,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_cost
-+     * Return base_cost
-      *
-      * @return float|null
-      */
-@@ -753,7 +755,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_discount_amount
-+     * Return base_discount_amount
-      *
-      * @return float|null
-      */
-@@ -763,7 +765,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_discount_invoiced
-+     * Return base_discount_invoiced
-      *
-      * @return float|null
-      */
-@@ -773,7 +775,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_discount_refunded
-+     * Return base_discount_refunded
-      *
-      * @return float|null
-      */
-@@ -783,7 +785,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_discount_tax_compensation_amount
-+     * Return base_discount_tax_compensation_amount
-      *
-      * @return float|null
-      */
-@@ -793,7 +795,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_discount_tax_compensation_invoiced
-+     * Return base_discount_tax_compensation_invoiced
-      *
-      * @return float|null
-      */
-@@ -803,7 +805,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_discount_tax_compensation_refunded
-+     * Return base_discount_tax_compensation_refunded
-      *
-      * @return float|null
-      */
-@@ -813,7 +815,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_original_price
-+     * Return base_original_price
-      *
-      * @return float|null
-      */
-@@ -823,7 +825,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_price
-+     * Return base_price
-      *
-      * @return float|null
-      */
-@@ -833,7 +835,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_price_incl_tax
-+     * Return base_price_incl_tax
-      *
-      * @return float|null
-      */
-@@ -843,7 +845,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_row_invoiced
-+     * Return base_row_invoiced
-      *
-      * @return float|null
-      */
-@@ -853,7 +855,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_row_total
-+     * Return base_row_total
-      *
-      * @return float|null
-      */
-@@ -863,7 +865,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_row_total_incl_tax
-+     * Return base_row_total_incl_tax
-      *
-      * @return float|null
-      */
-@@ -873,7 +875,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_tax_amount
-+     * Return base_tax_amount
-      *
-      * @return float|null
-      */
-@@ -883,7 +885,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_tax_before_discount
-+     * Return base_tax_before_discount
-      *
-      * @return float|null
-      */
-@@ -893,7 +895,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_tax_invoiced
-+     * Return base_tax_invoiced
-      *
-      * @return float|null
-      */
-@@ -903,7 +905,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_tax_refunded
-+     * Return base_tax_refunded
-      *
-      * @return float|null
-      */
-@@ -913,7 +915,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_weee_tax_applied_amount
-+     * Return base_weee_tax_applied_amount
-      *
-      * @return float|null
-      */
-@@ -923,7 +925,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_weee_tax_applied_row_amnt
-+     * Return base_weee_tax_applied_row_amnt
-      *
-      * @return float|null
-      */
-@@ -933,7 +935,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_weee_tax_disposition
-+     * Return base_weee_tax_disposition
-      *
-      * @return float|null
-      */
-@@ -943,7 +945,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns base_weee_tax_row_disposition
-+     * Return base_weee_tax_row_disposition
-      *
-      * @return float|null
-      */
-@@ -953,7 +955,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns created_at
-+     * Return created_at
-      *
-      * @return string|null
-      */
-@@ -963,7 +965,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCreatedAt($createdAt)
-     {
-@@ -971,7 +973,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns description
-+     * Return description
-      *
-      * @return string|null
-      */
-@@ -981,7 +983,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns discount_amount
-+     * Return discount_amount
-      *
-      * @return float|null
-      */
-@@ -991,7 +993,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns discount_invoiced
-+     * Return discount_invoiced
-      *
-      * @return float|null
-      */
-@@ -1001,7 +1003,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns discount_percent
-+     * Return discount_percent
-      *
-      * @return float|null
-      */
-@@ -1011,7 +1013,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns discount_refunded
-+     * Return discount_refunded
-      *
-      * @return float|null
-      */
-@@ -1021,7 +1023,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns event_id
-+     * Return event_id
-      *
-      * @return int|null
-      */
-@@ -1031,7 +1033,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns ext_order_item_id
-+     * Return ext_order_item_id
-      *
-      * @return string|null
-      */
-@@ -1041,7 +1043,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns free_shipping
-+     * Return free_shipping
-      *
-      * @return int|null
-      */
-@@ -1051,7 +1053,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns gw_base_price
-+     * Return gw_base_price
-      *
-      * @return float|null
-      */
-@@ -1061,7 +1063,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns gw_base_price_invoiced
-+     * Return gw_base_price_invoiced
-      *
-      * @return float|null
-      */
-@@ -1071,7 +1073,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns gw_base_price_refunded
-+     * Return gw_base_price_refunded
-      *
-      * @return float|null
-      */
-@@ -1081,7 +1083,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns gw_base_tax_amount
-+     * Return gw_base_tax_amount
-      *
-      * @return float|null
-      */
-@@ -1091,7 +1093,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns gw_base_tax_amount_invoiced
-+     * Return gw_base_tax_amount_invoiced
-      *
-      * @return float|null
-      */
-@@ -1101,7 +1103,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns gw_base_tax_amount_refunded
-+     * Return gw_base_tax_amount_refunded
-      *
-      * @return float|null
-      */
-@@ -1111,7 +1113,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns gw_id
-+     * Return gw_id
-      *
-      * @return int|null
-      */
-@@ -1121,7 +1123,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns gw_price
-+     * Return gw_price
-      *
-      * @return float|null
-      */
-@@ -1131,7 +1133,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns gw_price_invoiced
-+     * Return gw_price_invoiced
-      *
-      * @return float|null
-      */
-@@ -1141,7 +1143,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns gw_price_refunded
-+     * Return gw_price_refunded
-      *
-      * @return float|null
-      */
-@@ -1151,7 +1153,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns gw_tax_amount
-+     * Return gw_tax_amount
-      *
-      * @return float|null
-      */
-@@ -1161,7 +1163,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns gw_tax_amount_invoiced
-+     * Return gw_tax_amount_invoiced
-      *
-      * @return float|null
-      */
-@@ -1171,7 +1173,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns gw_tax_amount_refunded
-+     * Return gw_tax_amount_refunded
-      *
-      * @return float|null
-      */
-@@ -1181,7 +1183,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns discount_tax_compensation_amount
-+     * Return discount_tax_compensation_amount
-      *
-      * @return float|null
-      */
-@@ -1191,7 +1193,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns discount_tax_compensation_canceled
-+     * Return discount_tax_compensation_canceled
-      *
-      * @return float|null
-      */
-@@ -1201,7 +1203,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns discount_tax_compensation_invoiced
-+     * Return discount_tax_compensation_invoiced
-      *
-      * @return float|null
-      */
-@@ -1211,7 +1213,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns discount_tax_compensation_refunded
-+     * Return discount_tax_compensation_refunded
-      *
-      * @return float|null
-      */
-@@ -1221,7 +1223,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns is_qty_decimal
-+     * Return is_qty_decimal
-      *
-      * @return int|null
-      */
-@@ -1231,7 +1233,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns is_virtual
-+     * Return is_virtual
-      *
-      * @return int|null
-      */
-@@ -1241,7 +1243,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns item_id
-+     * Return item_id
-      *
-      * @return int|null
-      */
-@@ -1251,7 +1253,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns locked_do_invoice
-+     * Return locked_do_invoice
-      *
-      * @return int|null
-      */
-@@ -1261,7 +1263,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns locked_do_ship
-+     * Return locked_do_ship
-      *
-      * @return int|null
-      */
-@@ -1271,7 +1273,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns name
-+     * Return name
-      *
-      * @return string|null
-      */
-@@ -1281,7 +1283,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns no_discount
-+     * Return no_discount
-      *
-      * @return int|null
-      */
-@@ -1291,7 +1293,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns order_id
-+     * Return order_id
-      *
-      * @return int|null
-      */
-@@ -1301,7 +1303,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns parent_item_id
-+     * Return parent_item_id
-      *
-      * @return int|null
-      */
-@@ -1311,7 +1313,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns price
-+     * Return price
-      *
-      * @return float|null
-      */
-@@ -1321,7 +1323,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns price_incl_tax
-+     * Return price_incl_tax
-      *
-      * @return float|null
-      */
-@@ -1331,7 +1333,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns product_id
-+     * Return product_id
-      *
-      * @return int|null
-      */
-@@ -1341,7 +1343,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns product_type
-+     * Return product_type
-      *
-      * @return string|null
-      */
-@@ -1351,7 +1353,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns qty_backordered
-+     * Return qty_backordered
-      *
-      * @return float|null
-      */
-@@ -1361,7 +1363,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns qty_canceled
-+     * Return qty_canceled
-      *
-      * @return float|null
-      */
-@@ -1371,7 +1373,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns qty_invoiced
-+     * Return qty_invoiced
-      *
-      * @return float|null
-      */
-@@ -1381,7 +1383,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns qty_ordered
-+     * Return qty_ordered
-      *
-      * @return float|null
-      */
-@@ -1391,7 +1393,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns qty_refunded
-+     * Return qty_refunded
-      *
-      * @return float|null
-      */
-@@ -1401,7 +1403,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns qty_returned
-+     * Return qty_returned
-      *
-      * @return float|null
-      */
-@@ -1411,7 +1413,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns qty_shipped
-+     * Return qty_shipped
-      *
-      * @return float|null
-      */
-@@ -1421,7 +1423,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns quote_item_id
-+     * Return quote_item_id
-      *
-      * @return int|null
-      */
-@@ -1431,7 +1433,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns row_invoiced
-+     * Return row_invoiced
-      *
-      * @return float|null
-      */
-@@ -1441,7 +1443,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns row_total
-+     * Return row_total
-      *
-      * @return float|null
-      */
-@@ -1451,7 +1453,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns row_total_incl_tax
-+     * Return row_total_incl_tax
-      *
-      * @return float|null
-      */
-@@ -1461,7 +1463,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns row_weight
-+     * Return row_weight
-      *
-      * @return float|null
-      */
-@@ -1471,7 +1473,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns sku
-+     * Return sku
-      *
-      * @return string
-      */
-@@ -1481,7 +1483,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns store_id
-+     * Return store_id
-      *
-      * @return int|null
-      */
-@@ -1491,7 +1493,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns tax_amount
-+     * Return tax_amount
-      *
-      * @return float|null
-      */
-@@ -1501,7 +1503,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns tax_before_discount
-+     * Return tax_before_discount
-      *
-      * @return float|null
-      */
-@@ -1511,7 +1513,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns tax_canceled
-+     * Return tax_canceled
-      *
-      * @return float|null
-      */
-@@ -1521,7 +1523,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns tax_invoiced
-+     * Return tax_invoiced
-      *
-      * @return float|null
-      */
-@@ -1531,7 +1533,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns tax_percent
-+     * Return tax_percent
-      *
-      * @return float|null
-      */
-@@ -1541,7 +1543,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns tax_refunded
-+     * Return tax_refunded
-      *
-      * @return float|null
-      */
-@@ -1551,7 +1553,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns updated_at
-+     * Return updated_at
-      *
-      * @return string|null
-      */
-@@ -1561,7 +1563,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns weee_tax_applied
-+     * Return weee_tax_applied
-      *
-      * @return string|null
-      */
-@@ -1571,7 +1573,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns weee_tax_applied_amount
-+     * Return weee_tax_applied_amount
-      *
-      * @return float|null
-      */
-@@ -1581,7 +1583,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns weee_tax_applied_row_amount
-+     * Return weee_tax_applied_row_amount
-      *
-      * @return float|null
-      */
-@@ -1591,7 +1593,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns weee_tax_disposition
-+     * Return weee_tax_disposition
-      *
-      * @return float|null
-      */
-@@ -1601,7 +1603,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns weee_tax_row_disposition
-+     * Return weee_tax_row_disposition
-      *
-      * @return float|null
-      */
-@@ -1611,7 +1613,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * Returns weight
-+     * Return weight
-      *
-      * @return float|null
-      */
-@@ -1621,7 +1623,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setUpdatedAt($timestamp)
-     {
-@@ -1629,7 +1631,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setItemId($id)
-     {
-@@ -1637,7 +1639,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setOrderId($id)
-     {
-@@ -1645,7 +1647,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setParentItemId($id)
-     {
-@@ -1653,7 +1655,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setQuoteItemId($id)
-     {
-@@ -1661,7 +1663,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setStoreId($id)
-     {
-@@ -1669,7 +1671,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setProductId($id)
-     {
-@@ -1677,7 +1679,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setProductType($productType)
-     {
-@@ -1685,7 +1687,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setWeight($weight)
-     {
-@@ -1693,7 +1695,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setIsVirtual($isVirtual)
-     {
-@@ -1701,7 +1703,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSku($sku)
-     {
-@@ -1709,7 +1711,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setName($name)
-     {
-@@ -1717,7 +1719,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDescription($description)
-     {
-@@ -1725,7 +1727,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAppliedRuleIds($appliedRuleIds)
-     {
-@@ -1733,7 +1735,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAdditionalData($additionalData)
-     {
-@@ -1741,7 +1743,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setIsQtyDecimal($isQtyDecimal)
-     {
-@@ -1749,7 +1751,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setNoDiscount($noDiscount)
-     {
-@@ -1757,7 +1759,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setQtyBackordered($qtyBackordered)
-     {
-@@ -1765,7 +1767,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setQtyCanceled($qtyCanceled)
-     {
-@@ -1773,7 +1775,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setQtyInvoiced($qtyInvoiced)
-     {
-@@ -1781,7 +1783,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setQtyOrdered($qtyOrdered)
-     {
-@@ -1789,7 +1791,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setQtyRefunded($qtyRefunded)
-     {
-@@ -1797,7 +1799,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setQtyShipped($qtyShipped)
-     {
-@@ -1805,7 +1807,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseCost($baseCost)
-     {
-@@ -1813,7 +1815,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPrice($price)
-     {
-@@ -1821,7 +1823,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBasePrice($price)
-     {
-@@ -1829,7 +1831,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setOriginalPrice($price)
-     {
-@@ -1837,7 +1839,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseOriginalPrice($price)
-     {
-@@ -1845,7 +1847,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTaxPercent($taxPercent)
-     {
-@@ -1853,7 +1855,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTaxAmount($amount)
-     {
-@@ -1861,7 +1863,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTaxAmount($amount)
-     {
-@@ -1869,7 +1871,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTaxInvoiced($taxInvoiced)
-     {
-@@ -1877,7 +1879,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTaxInvoiced($baseTaxInvoiced)
-     {
-@@ -1885,7 +1887,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountPercent($discountPercent)
-     {
-@@ -1893,7 +1895,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountAmount($amount)
-     {
-@@ -1901,7 +1903,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountAmount($amount)
-     {
-@@ -1909,7 +1911,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountInvoiced($discountInvoiced)
-     {
-@@ -1917,7 +1919,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountInvoiced($baseDiscountInvoiced)
-     {
-@@ -1925,7 +1927,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAmountRefunded($amountRefunded)
-     {
-@@ -1933,7 +1935,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseAmountRefunded($baseAmountRefunded)
-     {
-@@ -1941,7 +1943,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRowTotal($amount)
-     {
-@@ -1949,7 +1951,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseRowTotal($amount)
-     {
-@@ -1957,7 +1959,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRowInvoiced($rowInvoiced)
-     {
-@@ -1965,7 +1967,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseRowInvoiced($baseRowInvoiced)
-     {
-@@ -1973,7 +1975,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRowWeight($rowWeight)
-     {
-@@ -1981,7 +1983,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTaxBeforeDiscount($baseTaxBeforeDiscount)
-     {
-@@ -1989,7 +1991,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTaxBeforeDiscount($taxBeforeDiscount)
-     {
-@@ -1997,7 +1999,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setExtOrderItemId($id)
-     {
-@@ -2005,7 +2007,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setLockedDoInvoice($flag)
-     {
-@@ -2013,7 +2015,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setLockedDoShip($flag)
-     {
-@@ -2021,7 +2023,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPriceInclTax($amount)
-     {
-@@ -2029,7 +2031,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBasePriceInclTax($amount)
-     {
-@@ -2037,7 +2039,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setRowTotalInclTax($amount)
-     {
-@@ -2045,7 +2047,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseRowTotalInclTax($amount)
-     {
-@@ -2053,7 +2055,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountTaxCompensationAmount($amount)
-     {
-@@ -2061,7 +2063,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountTaxCompensationAmount($amount)
-     {
-@@ -2069,7 +2071,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoiced)
-     {
-@@ -2077,7 +2079,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensationInvoiced)
-     {
-@@ -2088,7 +2090,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefunded)
-     {
-@@ -2096,7 +2098,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensationRefunded)
-     {
-@@ -2107,7 +2109,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTaxCanceled($taxCanceled)
-     {
-@@ -2115,7 +2117,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountTaxCompensationCanceled($discountTaxCompensationCanceled)
-     {
-@@ -2123,7 +2125,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTaxRefunded($taxRefunded)
-     {
-@@ -2131,7 +2133,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseTaxRefunded($baseTaxRefunded)
-     {
-@@ -2139,7 +2141,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDiscountRefunded($discountRefunded)
-     {
-@@ -2147,7 +2149,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseDiscountRefunded($baseDiscountRefunded)
-     {
-@@ -2155,7 +2157,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGwId($id)
-     {
-@@ -2163,7 +2165,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGwBasePrice($price)
-     {
-@@ -2171,7 +2173,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGwPrice($price)
-     {
-@@ -2179,7 +2181,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGwBaseTaxAmount($amount)
-     {
-@@ -2187,7 +2189,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGwTaxAmount($amount)
-     {
-@@ -2195,7 +2197,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGwBasePriceInvoiced($gwBasePriceInvoiced)
-     {
-@@ -2203,7 +2205,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGwPriceInvoiced($gwPriceInvoiced)
-     {
-@@ -2211,7 +2213,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGwBaseTaxAmountInvoiced($gwBaseTaxAmountInvoiced)
-     {
-@@ -2219,7 +2221,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGwTaxAmountInvoiced($gwTaxAmountInvoiced)
-     {
-@@ -2227,7 +2229,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGwBasePriceRefunded($gwBasePriceRefunded)
-     {
-@@ -2235,7 +2237,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGwPriceRefunded($gwPriceRefunded)
-     {
-@@ -2243,7 +2245,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGwBaseTaxAmountRefunded($gwBaseTaxAmountRefunded)
-     {
-@@ -2251,7 +2253,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGwTaxAmountRefunded($gwTaxAmountRefunded)
-     {
-@@ -2259,7 +2261,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setFreeShipping($freeShipping)
-     {
-@@ -2267,7 +2269,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setQtyReturned($qtyReturned)
-     {
-@@ -2275,7 +2277,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setEventId($id)
-     {
-@@ -2283,7 +2285,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseWeeeTaxAppliedAmount($amount)
-     {
-@@ -2291,7 +2293,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseWeeeTaxAppliedRowAmnt($amnt)
-     {
-@@ -2299,7 +2301,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setWeeeTaxAppliedAmount($amount)
-     {
-@@ -2307,7 +2309,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setWeeeTaxAppliedRowAmount($amount)
-     {
-@@ -2315,7 +2317,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setWeeeTaxApplied($weeeTaxApplied)
-     {
-@@ -2323,7 +2325,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setWeeeTaxDisposition($weeeTaxDisposition)
-     {
-@@ -2331,7 +2333,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setWeeeTaxRowDisposition($weeeTaxRowDisposition)
-     {
-@@ -2339,7 +2341,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition)
-     {
-@@ -2347,7 +2349,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition)
-     {
-@@ -2355,7 +2357,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getProductOption()
-     {
-@@ -2363,7 +2365,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setProductOption(\Magento\Catalog\Api\Data\ProductOptionInterface $productOption)
-     {
-@@ -2371,7 +2373,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return \Magento\Sales\Api\Data\OrderItemExtensionInterface|null
-      */
-@@ -2381,7 +2383,7 @@ class Item extends AbstractModel implements OrderItemInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @param \Magento\Sales\Api\Data\OrderItemExtensionInterface $extensionAttributes
-      * @return $this
-diff --git a/app/code/Magento/Sales/Model/Order/ItemRepository.php b/app/code/Magento/Sales/Model/Order/ItemRepository.php
-index 7916eb9db2b..6e029ac4683 100644
---- a/app/code/Magento/Sales/Model/Order/ItemRepository.php
-+++ b/app/code/Magento/Sales/Model/Order/ItemRepository.php
-@@ -6,10 +6,8 @@
- 
- namespace Magento\Sales\Model\Order;
- 
--use Magento\Catalog\Api\Data\ProductOptionExtensionFactory;
--use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
--use Magento\Catalog\Model\ProductOptionFactory;
- use Magento\Catalog\Model\ProductOptionProcessorInterface;
-+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
- use Magento\Framework\Api\SearchCriteriaInterface;
- use Magento\Framework\DataObject;
- use Magento\Framework\DataObject\Factory as DataObjectFactory;
-@@ -18,6 +16,7 @@ use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Sales\Api\Data\OrderItemInterface;
- use Magento\Sales\Api\Data\OrderItemSearchResultInterfaceFactory;
- use Magento\Sales\Api\OrderItemRepositoryInterface;
-+use Magento\Sales\Model\Order\ProductOption;
- use Magento\Sales\Model\ResourceModel\Metadata;
- 
- /**
-@@ -41,16 +40,6 @@ class ItemRepository implements OrderItemRepositoryInterface
-      */
-     protected $searchResultFactory;
- 
--    /**
--     * @var ProductOptionFactory
--     */
--    protected $productOptionFactory;
--
--    /**
--     * @var ProductOptionExtensionFactory
--     */
--    protected $extensionFactory;
--
-     /**
-      * @var ProductOptionProcessorInterface[]
-      */
-@@ -62,40 +51,41 @@ class ItemRepository implements OrderItemRepositoryInterface
-     protected $registry = [];
- 
-     /**
--     * @var \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface
-+     * @var CollectionProcessorInterface
-      */
-     private $collectionProcessor;
- 
-     /**
--     * ItemRepository constructor.
-+     * @var ProductOption
-+     */
-+    private $productOption;
-+
-+    /**
-      * @param DataObjectFactory $objectFactory
-      * @param Metadata $metadata
-      * @param OrderItemSearchResultInterfaceFactory $searchResultFactory
--     * @param ProductOptionFactory $productOptionFactory
--     * @param ProductOptionExtensionFactory $extensionFactory
-+     * @param CollectionProcessorInterface $collectionProcessor
-+     * @param ProductOption $productOption
-      * @param array $processorPool
--     * @param CollectionProcessorInterface|null $collectionProcessor
-      */
-     public function __construct(
-         DataObjectFactory $objectFactory,
-         Metadata $metadata,
-         OrderItemSearchResultInterfaceFactory $searchResultFactory,
--        ProductOptionFactory $productOptionFactory,
--        ProductOptionExtensionFactory $extensionFactory,
--        array $processorPool = [],
--        CollectionProcessorInterface $collectionProcessor = null
-+        CollectionProcessorInterface $collectionProcessor,
-+        ProductOption $productOption,
-+        array $processorPool = []
-     ) {
-         $this->objectFactory = $objectFactory;
-         $this->metadata = $metadata;
-         $this->searchResultFactory = $searchResultFactory;
--        $this->productOptionFactory = $productOptionFactory;
--        $this->extensionFactory = $extensionFactory;
-+        $this->collectionProcessor = $collectionProcessor;
-+        $this->productOption = $productOption;
-         $this->processorPool = $processorPool;
--        $this->collectionProcessor = $collectionProcessor ?: $this->getCollectionProcessor();
-     }
- 
-     /**
--     * load entity
-+     * Loads entity.
-      *
-      * @param int $id
-      * @return OrderItemInterface
-@@ -116,7 +106,7 @@ class ItemRepository implements OrderItemRepositoryInterface
-                 );
-             }
- 
--            $this->addProductOption($orderItem);
-+            $this->productOption->add($orderItem);
-             $this->addParentItem($orderItem);
-             $this->registry[$id] = $orderItem;
-         }
-@@ -137,7 +127,7 @@ class ItemRepository implements OrderItemRepositoryInterface
-         $this->collectionProcessor->process($searchCriteria, $searchResult);
-         /** @var OrderItemInterface $orderItem */
-         foreach ($searchResult->getItems() as $orderItem) {
--            $this->addProductOption($orderItem);
-+            $this->productOption->add($orderItem);
-         }
- 
-         return $searchResult;
-@@ -178,7 +168,9 @@ class ItemRepository implements OrderItemRepositoryInterface
-     {
-         if ($entity->getProductOption()) {
-             $request = $this->getBuyRequest($entity);
--            $entity->setProductOptions(['info_buyRequest' => $request->toArray()]);
-+            $productOptions = $entity->getProductOptions();
-+            $productOptions['info_buyRequest'] = $request->toArray();
-+            $entity->setProductOptions($productOptions);
-         }
- 
-         $this->metadata->getMapper()->save($entity);
-@@ -186,37 +178,6 @@ class ItemRepository implements OrderItemRepositoryInterface
-         return $this->registry[$entity->getEntityId()];
-     }
- 
--    /**
--     * Add product option data
--     *
--     * @param OrderItemInterface $orderItem
--     * @return $this
--     */
--    protected function addProductOption(OrderItemInterface $orderItem)
--    {
--        /** @var DataObject $request */
--        $request = $orderItem->getBuyRequest();
--
--        $productType = $orderItem->getProductType();
--        if (isset($this->processorPool[$productType])
--            && !$orderItem->getParentItemId()) {
--            $data = $this->processorPool[$productType]->convertToProductOption($request);
--            if ($data) {
--                $this->setProductOption($orderItem, $data);
--            }
--        }
--
--        if (isset($this->processorPool['custom_options'])
--            && !$orderItem->getParentItemId()) {
--            $data = $this->processorPool['custom_options']->convertToProductOption($request);
--            if ($data) {
--                $this->setProductOption($orderItem, $data);
--            }
--        }
--
--        return $this;
--    }
--
-     /**
-      * Set parent item.
-      *
-@@ -228,33 +189,15 @@ class ItemRepository implements OrderItemRepositoryInterface
-     {
-         if ($parentId = $orderItem->getParentItemId()) {
-             $orderItem->setParentItem($this->get($parentId));
--        }
--    }
-+        } else {
-+            $orderCollection = $orderItem->getOrder()->getItemsCollection()->filterByParent($orderItem->getItemId());
- 
--    /**
--     * Set product options data
--     *
--     * @param OrderItemInterface $orderItem
--     * @param array $data
--     * @return $this
--     */
--    protected function setProductOption(OrderItemInterface $orderItem, array $data)
--    {
--        $productOption = $orderItem->getProductOption();
--        if (!$productOption) {
--            $productOption = $this->productOptionFactory->create();
--            $orderItem->setProductOption($productOption);
--        }
--
--        $extensionAttributes = $productOption->getExtensionAttributes();
--        if (!$extensionAttributes) {
--            $extensionAttributes = $this->extensionFactory->create();
--            $productOption->setExtensionAttributes($extensionAttributes);
-+            foreach ($orderCollection->getItems() as $item) {
-+                if ($item->getParentItemId() === $orderItem->getItemId()) {
-+                    $item->setParentItem($orderItem);
-+                }
-+            }
-         }
--
--        $extensionAttributes->setData(key($data), current($data));
--
--        return $this;
-     }
- 
-     /**
-@@ -288,20 +231,4 @@ class ItemRepository implements OrderItemRepositoryInterface
- 
-         return $request;
-     }
--
--    /**
--     * Retrieve collection processor
--     *
--     * @deprecated 100.2.0
--     * @return CollectionProcessorInterface
--     */
--    private function getCollectionProcessor()
--    {
--        if (!$this->collectionProcessor) {
--            $this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
--                \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface::class
--            );
--        }
--        return $this->collectionProcessor;
--    }
- }
-diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
-index 97040c0a578..5d1d3f0d040 100644
---- a/app/code/Magento/Sales/Model/Order/Payment.php
-+++ b/app/code/Magento/Sales/Model/Order/Payment.php
-@@ -264,6 +264,7 @@ class Payment extends Info implements OrderPaymentInterface
-     /**
-      * Returns transaction parent
-      *
-+     * @param string $txnId
-      * @return string
-      * @since 100.1.0
-      */
-@@ -299,6 +300,8 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
-+     * Check refund availability.
-+     *
-      * @return bool
-      */
-     public function canRefund()
-@@ -307,6 +310,8 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
-+     * Check partial refund availability for invoice.
-+     *
-      * @return bool
-      */
-     public function canRefundPartialPerInvoice()
-@@ -315,6 +320,8 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
-+     * Check partial capture availability.
-+     *
-      * @return bool
-      */
-     public function canCapturePartial()
-@@ -324,6 +331,7 @@ class Payment extends Info implements OrderPaymentInterface
- 
-     /**
-      * Authorize or authorize and capture payment on gateway, if applicable
-+     *
-      * This method is supposed to be called only when order is placed
-      *
-      * @return $this
-@@ -538,8 +546,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * Create new invoice with maximum qty for invoice for each item
--     * register this invoice and capture
-+     * Create new invoice with maximum qty for invoice for each item register this invoice and capture
-      *
-      * @return Invoice
-      */
-@@ -677,6 +684,7 @@ class Payment extends Info implements OrderPaymentInterface
-                         $gateway->refund($this, $baseAmountToRefund);
- 
-                         $creditmemo->setTransactionId($this->getLastTransId());
-+                        // phpcs:ignore Magento2.Exceptions.ThrowCatch
-                     } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                         if (!$captureTxn) {
-                             throw new \Magento\Framework\Exception\LocalizedException(
-@@ -723,10 +731,14 @@ class Payment extends Info implements OrderPaymentInterface
-         $message = $message = $this->prependMessage($message);
-         $message = $this->_appendTransactionToMessage($transaction, $message);
-         $orderState = $this->getOrderStateResolver()->getStateForOrder($this->getOrder());
-+        $statuses = $this->getOrder()->getConfig()->getStateStatuses($orderState, false);
-+        $status = in_array($this->getOrder()->getStatus(), $statuses, true)
-+            ? $this->getOrder()->getStatus()
-+            : $this->getOrder()->getConfig()->getStateDefaultStatus($orderState);
-         $this->getOrder()
-             ->addStatusHistoryComment(
-                 $message,
--                $this->getOrder()->getConfig()->getStateDefaultStatus($orderState)
-+                $status
-             )->setIsCustomerNotified($creditmemo->getOrder()->getCustomerNoteNotify());
-         $this->_eventManager->dispatch(
-             'sales_order_payment_refund',
-@@ -849,6 +861,7 @@ class Payment extends Info implements OrderPaymentInterface
- 
-     /**
-      * Order cancellation hook for payment method instance
-+     *
-      * Adds void transaction if needed
-      *
-      * @return $this
-@@ -884,6 +897,8 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
-+     * Check fetch transaction info availability
-+     *
-      * @return bool
-      */
-     public function canFetchTransactionInfo()
-@@ -1191,6 +1206,11 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
-+     * Add transaction comments to order.
-+     *
-+     * @param Transaction|null $transaction
-+     * @param string $message
-+     * @return void
-      */
-     public function addTransactionCommentsToOrder($transaction, $message)
-     {
-@@ -1227,6 +1247,7 @@ class Payment extends Info implements OrderPaymentInterface
- 
-     /**
-      * Totals updater utility method
-+     *
-      * Updates self totals by keys in data array('key' => $delta)
-      *
-      * @param array $data
-@@ -1261,6 +1282,7 @@ class Payment extends Info implements OrderPaymentInterface
- 
-     /**
-      * Prepend a "prepared_message" that may be set to the payment instance before, to the specified message
-+     *
-      * Prepends value to the specified string or to the comment of specified order status history item instance
-      *
-      * @param string|\Magento\Sales\Model\Order\Status\History $messagePrependTo
-@@ -1303,6 +1325,7 @@ class Payment extends Info implements OrderPaymentInterface
- 
-     /**
-      * Format price with currency sign
-+     *
-      * @param float $amount
-      * @return string
-      */
-@@ -1313,6 +1336,7 @@ class Payment extends Info implements OrderPaymentInterface
- 
-     /**
-      * Lookup an authorization transaction using parent transaction id, if set
-+     *
-      * @return Transaction|false
-      */
-     public function getAuthorizationTransaction()
-@@ -1384,8 +1408,8 @@ class Payment extends Info implements OrderPaymentInterface
-     /**
-      * Prepare credit memo
-      *
--     * @param $amount
--     * @param $baseGrandTotal
-+     * @param float $amount
-+     * @param float $baseGrandTotal
-      * @param false|Invoice $invoice
-      * @return mixed
-      */
-@@ -1454,6 +1478,8 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
-+     * Get order state resolver instance.
-+     *
-      * @deprecated 100.2.0
-      * @return OrderStateResolverInterface
-      */
-@@ -1992,7 +2018,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setParentId($id)
-     {
-@@ -2000,7 +2026,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingCaptured($baseShippingCaptured)
-     {
-@@ -2008,7 +2034,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingCaptured($shippingCaptured)
-     {
-@@ -2016,7 +2042,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAmountRefunded($amountRefunded)
-     {
-@@ -2024,7 +2050,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseAmountPaid($baseAmountPaid)
-     {
-@@ -2032,7 +2058,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAmountCanceled($amountCanceled)
-     {
-@@ -2040,7 +2066,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseAmountAuthorized($baseAmountAuthorized)
-     {
-@@ -2048,7 +2074,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseAmountPaidOnline($baseAmountPaidOnline)
-     {
-@@ -2056,7 +2082,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseAmountRefundedOnline($baseAmountRefundedOnline)
-     {
-@@ -2064,7 +2090,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingAmount($amount)
-     {
-@@ -2072,7 +2098,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingAmount($amount)
-     {
-@@ -2080,7 +2106,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAmountPaid($amountPaid)
-     {
-@@ -2088,7 +2114,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAmountAuthorized($amountAuthorized)
-     {
-@@ -2096,7 +2122,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseAmountOrdered($baseAmountOrdered)
-     {
-@@ -2104,7 +2130,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseShippingRefunded($baseShippingRefunded)
-     {
-@@ -2112,7 +2138,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setShippingRefunded($shippingRefunded)
-     {
-@@ -2120,7 +2146,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseAmountRefunded($baseAmountRefunded)
-     {
-@@ -2128,7 +2154,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAmountOrdered($amountOrdered)
-     {
-@@ -2136,7 +2162,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBaseAmountCanceled($baseAmountCanceled)
-     {
-@@ -2144,7 +2170,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setQuotePaymentId($id)
-     {
-@@ -2152,7 +2178,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAdditionalData($additionalData)
-     {
-@@ -2160,7 +2186,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcExpMonth($ccExpMonth)
-     {
-@@ -2168,7 +2194,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @deprecated 100.1.0 unused
-      */
-     public function setCcSsStartYear($ccSsStartYear)
-@@ -2177,7 +2203,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setEcheckBankName($echeckBankName)
-     {
-@@ -2185,7 +2211,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setMethod($method)
-     {
-@@ -2193,7 +2219,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcDebugRequestBody($ccDebugRequestBody)
-     {
-@@ -2201,7 +2227,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcSecureVerify($ccSecureVerify)
-     {
-@@ -2209,7 +2235,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setProtectionEligibility($protectionEligibility)
-     {
-@@ -2217,7 +2243,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcApproval($ccApproval)
-     {
-@@ -2225,7 +2251,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcLast4($ccLast4)
-     {
-@@ -2233,7 +2259,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcStatusDescription($description)
-     {
-@@ -2241,7 +2267,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setEcheckType($echeckType)
-     {
-@@ -2249,7 +2275,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcDebugResponseSerialized($ccDebugResponseSerialized)
-     {
-@@ -2257,7 +2283,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @deprecated 100.1.0 unused
-      */
-     public function setCcSsStartMonth($ccSsStartMonth)
-@@ -2266,7 +2292,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setEcheckAccountType($echeckAccountType)
-     {
-@@ -2274,7 +2300,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setLastTransId($id)
-     {
-@@ -2282,7 +2308,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcCidStatus($ccCidStatus)
-     {
-@@ -2290,7 +2316,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcOwner($ccOwner)
-     {
-@@ -2298,7 +2324,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcType($ccType)
-     {
-@@ -2306,7 +2332,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPoNumber($poNumber)
-     {
-@@ -2314,7 +2340,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcExpYear($ccExpYear)
-     {
-@@ -2322,7 +2348,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcStatus($ccStatus)
-     {
-@@ -2330,7 +2356,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setEcheckRoutingNumber($echeckRoutingNumber)
-     {
-@@ -2338,7 +2364,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAccountStatus($accountStatus)
-     {
-@@ -2346,7 +2372,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAnetTransMethod($anetTransMethod)
-     {
-@@ -2354,7 +2380,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcDebugResponseBody($ccDebugResponseBody)
-     {
-@@ -2362,7 +2388,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @deprecated 100.1.0 unused
-      */
-     public function setCcSsIssue($ccSsIssue)
-@@ -2371,7 +2397,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setEcheckAccountName($echeckAccountName)
-     {
-@@ -2379,7 +2405,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcAvsStatus($ccAvsStatus)
-     {
-@@ -2387,7 +2413,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcNumberEnc($ccNumberEnc)
-     {
-@@ -2395,7 +2421,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCcTransId($id)
-     {
-@@ -2403,7 +2429,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setAddressStatus($addressStatus)
-     {
-@@ -2411,7 +2437,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return \Magento\Sales\Api\Data\OrderPaymentExtensionInterface|null
-      */
-@@ -2421,7 +2447,7 @@ class Payment extends Info implements OrderPaymentInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @param \Magento\Sales\Api\Data\OrderPaymentExtensionInterface $extensionAttributes
-      * @return $this
-@@ -2505,6 +2531,7 @@ class Payment extends Info implements OrderPaymentInterface
- 
-     /**
-      * Set payment parent transaction id and current transaction id if it not set
-+     *
-      * @param Transaction $transaction
-      * @return void
-      */
-@@ -2526,6 +2553,7 @@ class Payment extends Info implements OrderPaymentInterface
- 
-     /**
-      * Collects order invoices totals by provided keys.
-+     *
-      * Returns result as {key: amount}.
-      *
-      * @param Order $order
-diff --git a/app/code/Magento/Sales/Model/Order/Payment/Info.php b/app/code/Magento/Sales/Model/Order/Payment/Info.php
-index 063b3eaa71f..fee846fe6a6 100644
---- a/app/code/Magento/Sales/Model/Order/Payment/Info.php
-+++ b/app/code/Magento/Sales/Model/Order/Payment/Info.php
-@@ -11,8 +11,8 @@ use Magento\Payment\Model\Method\Substitution;
- use Magento\Payment\Model\InfoInterface;
- 
- /**
-- *
-  * Payment information model
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -41,7 +41,7 @@ class Info extends AbstractModel implements InfoInterface
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
--     * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory,
-+     * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
-      * @param \Magento\Payment\Helper\Data $paymentData
-      * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
-      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-@@ -181,7 +181,7 @@ class Info extends AbstractModel implements InfoInterface
-         if (null === $key) {
-             return $this->additionalInformation;
-         }
--        return isset($this->additionalInformation[$key]) ? $this->additionalInformation[$key] : null;
-+        return $this->additionalInformation[$key] ?? null;
-     }
- 
-     /**
-@@ -219,8 +219,7 @@ class Info extends AbstractModel implements InfoInterface
-     }
- 
-     /**
--     * Initialize additional information container with data from model
--     * if property empty
-+     * Initialize additional information container with data from model if property empty
-      *
-      * @return void
-      */
-diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
-index 8d8de47ba99..57d6c204dca 100644
---- a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
-+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
-@@ -132,10 +132,12 @@ class Transaction extends AbstractModel implements TransactionInterface
-      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
-      * @param AttributeValueFactory $customAttributeFactory
-      * @param \Magento\Sales\Model\OrderFactory $orderFactory
-+     * @param \Magento\Sales\Api\OrderPaymentRepositoryInterface $orderPaymentRepository
-+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
-      * @param \Magento\Framework\Stdlib\DateTime\DateTimeFactory $dateFactory
-      * @param TransactionFactory $transactionFactory
--     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
--     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
-+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
-      * @param array $data
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -193,8 +195,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-     }
- 
-     /**
--     * Parent transaction ID setter
--     * Can set the transaction id as well
-+     * Parent transaction ID setter Can set the transaction id as well
-      *
-      * @param string $parentTxnId
-      * @param string $txnId
-@@ -229,8 +230,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-     }
- 
-     /**
--     * Parent transaction getter
--     * May attempt to load it.
-+     * Parent transaction getter. May attempt to load it.
-      *
-      * @param bool $shouldLoad
-      * @return bool|\Magento\Sales\Model\Order\Payment\Transaction
-@@ -366,8 +366,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-     }
- 
-     /**
--     * Close a capture transaction
--     * Logic is similar to closeAuthorization(), but for a capture transaction
-+     * Close a capture transaction. Logic is similar to closeAuthorization(), but for a capture transaction
-      *
-      * @param bool $shouldSave
-      * @return bool|\Magento\Sales\Model\Order\Payment\Transaction
-@@ -395,6 +394,7 @@ class Transaction extends AbstractModel implements TransactionInterface
- 
-     /**
-      * Check whether authorization in current hierarchy can be voided completely
-+     *
-      * Basically checks whether the authorization exists and it is not affected by a capture or void
-      *
-      * @return bool
-@@ -472,7 +472,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-             $info = [];
-         }
-         if ($key) {
--            return isset($info[$key]) ? $info[$key] : null;
-+            return $info[$key] ?? null;
-         }
-         return $info;
-     }
-@@ -536,6 +536,7 @@ class Transaction extends AbstractModel implements TransactionInterface
- 
-     /**
-      * Order ID getter
-+     *
-      * Attempts to get ID from set order payment object, if any, or from data by key 'order_id'
-      *
-      * @return int|null
-@@ -559,7 +560,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-     /**
-      * Retrieve order instance
-      *
--     * @return \Magento\Sales\Model\Order
-+     * @return \Magento\Sales\Model\Order\Payment
-      */
-     public function getOrder()
-     {
-@@ -572,6 +573,7 @@ class Transaction extends AbstractModel implements TransactionInterface
- 
-     /**
-      * Set order instance for transaction depends on transaction behavior
-+     *
-      * If $order equals to true, method isn't loading new order instance.
-      *
-      * @param \Magento\Sales\Model\Order|null|boolean $order
-@@ -695,7 +697,6 @@ class Transaction extends AbstractModel implements TransactionInterface
-     /**
-      * Check whether this transaction is voided
-      *
--     * TODO: implement that there should be only one void per authorization
-      * @return bool
-      */
-     protected function _isVoided()
-@@ -805,7 +806,6 @@ class Transaction extends AbstractModel implements TransactionInterface
- 
-     /**
-      * Make sure this object is a valid transaction
--     * TODO for more restriction we can check for data consistency
-      *
-      * @return void
-      * @throws \Magento\Framework\Exception\LocalizedException
-@@ -833,7 +833,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setTransactionId($id)
-     {
-@@ -898,7 +898,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-     public function getHtmlTxnId()
-     {
-         $this->_eventManager->dispatch($this->_eventPrefix . '_html_txn_id', $this->_getEventData());
--        return isset($this->_data['html_txn_id']) ? $this->_data['html_txn_id'] : $this->getTxnId();
-+        return $this->_data['html_txn_id'] ?? $this->getTxnId();
-     }
- 
-     /**
-@@ -942,7 +942,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCreatedAt($createdAt)
-     {
-@@ -950,7 +950,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setParentId($id)
-     {
-@@ -958,7 +958,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setOrderId($id)
-     {
-@@ -966,7 +966,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setPaymentId($id)
-     {
-@@ -974,7 +974,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setIsClosed($isClosed)
-     {
-@@ -982,7 +982,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return \Magento\Sales\Api\Data\TransactionExtensionInterface|null
-      */
-@@ -992,10 +992,7 @@ class Transaction extends AbstractModel implements TransactionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
--     *
--     * @param \Magento\Sales\Api\Data\TransactionExtensionInterface $extensionAttributes
--     * @return $this
-+     * @inheritdoc
-      */
-     public function setExtensionAttributes(\Magento\Sales\Api\Data\TransactionExtensionInterface $extensionAttributes)
-     {
-diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
-index 3caae611d95..a602fe54363 100644
---- a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
-+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
-@@ -13,14 +13,11 @@ use Magento\Framework\Api\SortOrderBuilder;
- use Magento\Framework\Data\Collection;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Sales\Api\Data\TransactionInterface;
--use Magento\Sales\Api\OrderPaymentRepositoryInterface;
--use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Api\Data\TransactionSearchResultInterfaceFactory as SearchResultFactory;
- use Magento\Sales\Api\TransactionRepositoryInterface;
- use Magento\Sales\Model\EntityStorage;
- use Magento\Sales\Model\EntityStorageFactory;
--use Magento\Sales\Model\Order\Payment;
- use Magento\Sales\Model\ResourceModel\Metadata;
--use Magento\Sales\Api\Data\TransactionSearchResultInterfaceFactory as SearchResultFactory;
- use Magento\Sales\Model\ResourceModel\Order\Payment\Transaction as TransactionResource;
- 
- /**
-@@ -95,7 +92,7 @@ class Repository implements TransactionRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function get($id)
-     {
-@@ -117,12 +114,10 @@ class Repository implements TransactionRepositoryInterface
-     /**
-      * @param int $transactionType
-      * @param int $paymentId
--     * @param int $orderId
-      * @return bool|\Magento\Framework\Model\AbstractModel|mixed
-      * @throws \Magento\Framework\Exception\InputException
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    public function getByTransactionType($transactionType, $paymentId, $orderId)
-+    public function getByTransactionType($transactionType, $paymentId)
-     {
-         $identityFieldsForCache = [$transactionType, $paymentId];
-         $cacheStorage = 'txn_type';
-diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
-index 401fdcd2b04..723940a5f67 100644
---- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
-+++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
-@@ -11,6 +11,7 @@ use Magento\Framework\App\Filesystem\DirectoryList;
- /**
-  * Sales Order PDF abstract model
-  *
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -116,6 +117,11 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
-      */
-     protected $addressRenderer;
- 
-+    /**
-+     * @var array $pageSettings
-+     */
-+    private $pageSettings;
-+
-     /**
-      * @param \Magento\Payment\Helper\Data $paymentData
-      * @param \Magento\Framework\Stdlib\StringUtils $string
-@@ -158,8 +164,7 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
-     }
- 
-     /**
--     * Returns the total width in points of the string using the specified font and
--     * size.
-+     * Returns the total width in points of the string using the specified font and size.
-      *
-      * This is not the most efficient way to perform this calculation. I'm
-      * concentrating optimization efforts on the upcoming layout manager class.
-@@ -173,10 +178,12 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
-      */
-     public function widthForStringUsingFontSize($string, $font, $fontSize)
-     {
-+        // phpcs:ignore Generic.PHP.NoSilencedErrors
-         $drawingString = '"libiconv"' == ICONV_IMPL ? iconv(
-             'UTF-8',
-             'UTF-16BE//IGNORE',
-             $string
-+        // phpcs:ignore Generic.PHP.NoSilencedErrors
-         ) : @iconv(
-             'UTF-8',
-             'UTF-16BE',
-@@ -184,7 +191,10 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
-         );
- 
-         $characters = [];
--        for ($i = 0; $i < strlen($drawingString); $i++) {
-+
-+        $drawingStringLength = strlen($drawingString);
-+
-+        for ($i = 0; $i < $drawingStringLength; $i++) {
-             $characters[] = ord($drawingString[$i++]) << 8 | ord($drawingString[$i]);
-         }
-         $glyphs = $font->glyphNumbersForCharacters($characters);
-@@ -225,14 +235,14 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
-         $width = $this->widthForStringUsingFontSize($string, $font, $fontSize);
-         return $x + round(($columnWidth - $width) / 2);
-     }
--
-     /**
-      * Insert logo to pdf page
-      *
--     * @param \Zend_Pdf_Page &$page
--     * @param null $store
-+     * @param \Zend_Pdf_Page $page
-+     * @param string|null $store
-      * @return void
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-+     * @throws \Zend_Pdf_Exception
-      */
-     protected function insertLogo(&$page, $store = null)
-     {
-@@ -284,8 +294,8 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
-     /**
-      * Insert address to pdf page
-      *
--     * @param \Zend_Pdf_Page &$page
--     * @param null $store
-+     * @param \Zend_Pdf_Page $page
-+     * @param string|null $store
-      * @return void
-      */
-     protected function insertAddress(&$page, $store = null)
-@@ -365,9 +375,9 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
-     }
- 
-     /**
--     * Insert order to pdf page
-+     * Insert order to pdf page.
-      *
--     * @param \Zend_Pdf_Page &$page
-+     * @param \Zend_Pdf_Page $page
-      * @param \Magento\Sales\Model\Order $obj
-      * @param bool $putOrderId
-      * @return void
-@@ -512,7 +522,7 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
-             $this->y -= 15;
-             $this->_setFontBold($page, 12);
-             $page->setFillColor(new \Zend_Pdf_Color_GrayScale(0));
--            $page->drawText(__('Payment Method'), 35, $this->y, 'UTF-8');
-+            $page->drawText(__('Payment Method:'), 35, $this->y, 'UTF-8');
-             $page->drawText(__('Shipping Method:'), 285, $this->y, 'UTF-8');
- 
-             $this->y -= 10;
-@@ -641,11 +651,7 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
-             return 0;
-         }
- 
--        if ($a['sort_order'] == $b['sort_order']) {
--            return 0;
--        }
--
--        return $a['sort_order'] > $b['sort_order'] ? 1 : -1;
-+        return $a['sort_order'] <=> $b['sort_order'];
-     }
- 
-     /**
-@@ -969,9 +975,11 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      */
-     public function drawLineBlocks(\Zend_Pdf_Page $page, array $draw, array $pageSettings = [])
-     {
-+        $this->pageSettings = $pageSettings;
-         foreach ($draw as $itemsProp) {
-             if (!isset($itemsProp['lines']) || !is_array($itemsProp['lines'])) {
-                 throw new \Magento\Framework\Exception\LocalizedException(
-@@ -980,7 +988,6 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
-             }
-             $lines = $itemsProp['lines'];
-             $height = isset($itemsProp['height']) ? $itemsProp['height'] : 10;
--
-             if (empty($itemsProp['shift'])) {
-                 $shift = 0;
-                 foreach ($lines as $line) {
-@@ -991,6 +998,7 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
-                             $column['text'] = [$column['text']];
-                         }
-                         $top = 0;
-+                        //
-                         foreach ($column['text'] as $part) {
-                             $top += $lineSpacing;
-                         }
-@@ -1005,69 +1013,99 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
-             if ($this->y - $itemsProp['shift'] < 15) {
-                 $page = $this->newPage($pageSettings);
-             }
-+            $this->correctLines($lines, $page, $height);
-+        }
- 
--            foreach ($lines as $line) {
--                $maxHeight = 0;
--                foreach ($line as $column) {
--                    $fontSize = empty($column['font_size']) ? 10 : $column['font_size'];
--                    if (!empty($column['font_file'])) {
--                        $font = \Zend_Pdf_Font::fontWithPath($column['font_file']);
--                        $page->setFont($font, $fontSize);
--                    } else {
--                        $fontStyle = empty($column['font']) ? 'regular' : $column['font'];
--                        switch ($fontStyle) {
--                            case 'bold':
--                                $font = $this->_setFontBold($page, $fontSize);
--                                break;
--                            case 'italic':
--                                $font = $this->_setFontItalic($page, $fontSize);
--                                break;
--                            default:
--                                $font = $this->_setFontRegular($page, $fontSize);
--                                break;
--                        }
--                    }
--
--                    if (!is_array($column['text'])) {
--                        $column['text'] = [$column['text']];
--                    }
--
--                    $lineSpacing = !empty($column['height']) ? $column['height'] : $height;
--                    $top = 0;
--                    foreach ($column['text'] as $part) {
--                        if ($this->y - $lineSpacing < 15) {
--                            $page = $this->newPage($pageSettings);
--                        }
-+        return $page;
-+    }
- 
--                        $feed = $column['feed'];
--                        $textAlign = empty($column['align']) ? 'left' : $column['align'];
--                        $width = empty($column['width']) ? 0 : $column['width'];
--                        switch ($textAlign) {
--                            case 'right':
--                                if ($width) {
--                                    $feed = $this->getAlignRight($part, $feed, $width, $font, $fontSize);
--                                } else {
--                                    $feed = $feed - $this->widthForStringUsingFontSize($part, $font, $fontSize);
--                                }
--                                break;
--                            case 'center':
--                                if ($width) {
--                                    $feed = $this->getAlignCenter($part, $feed, $width, $font, $fontSize);
--                                }
--                                break;
--                            default:
--                                break;
--                        }
--                        $page->drawText($part, $feed, $this->y - $top, 'UTF-8');
--                        $top += $lineSpacing;
-+    /**
-+     * Correct lines.
-+     *
-+     * @param array $lines
-+     * @param \Zend_Pdf_Page $page
-+     * @param int $height
-+     * @throws \Zend_Pdf_Exception
-+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-+     */
-+    private function correctLines($lines, $page, $height) :void
-+    {
-+        foreach ($lines as $line) {
-+            $maxHeight = 0;
-+            foreach ($line as $column) {
-+                $fontSize = empty($column['font_size']) ? 10 : $column['font_size'];
-+                if (!empty($column['font_file'])) {
-+                    $font = \Zend_Pdf_Font::fontWithPath($column['font_file']);
-+                    $page->setFont($font, $fontSize);
-+                } else {
-+                    $fontStyle = empty($column['font']) ? 'regular' : $column['font'];
-+                    switch ($fontStyle) {
-+                        case 'bold':
-+                            $font = $this->_setFontBold($page, $fontSize);
-+                            break;
-+                        case 'italic':
-+                            $font = $this->_setFontItalic($page, $fontSize);
-+                            break;
-+                        default:
-+                            $font = $this->_setFontRegular($page, $fontSize);
-+                            break;
-                     }
-+                }
- 
--                    $maxHeight = $top > $maxHeight ? $top : $maxHeight;
-+                if (!is_array($column['text'])) {
-+                    $column['text'] = [$column['text']];
-                 }
--                $this->y -= $maxHeight;
-+                $top = $this->correctText($column, $height, $font, $page);
-+
-+                $maxHeight = $top > $maxHeight ? $top : $maxHeight;
-             }
-+            $this->y -= $maxHeight;
-         }
-+    }
- 
--        return $page;
-+    /**
-+     * Correct text.
-+     *
-+     * @param array $column
-+     * @param int $height
-+     * @param \Zend_Pdf_Resource_Font $font
-+     * @param \Zend_Pdf_Page $page
-+     * @throws \Zend_Pdf_Exception
-+     * @return int
-+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-+     */
-+    private function correctText($column, $height, $font, $page) :int
-+    {
-+        $top = 0;
-+        $lineSpacing = !empty($column['height']) ? $column['height'] : $height;
-+        $fontSize = empty($column['font_size']) ? 10 : $column['font_size'];
-+        foreach ($column['text'] as $part) {
-+            if ($this->y - $lineSpacing < 15) {
-+                $page = $this->newPage($this->pageSettings);
-+            }
-+
-+            $feed = $column['feed'];
-+            $textAlign = empty($column['align']) ? 'left' : $column['align'];
-+            $width = empty($column['width']) ? 0 : $column['width'];
-+            switch ($textAlign) {
-+                case 'right':
-+                    if ($width) {
-+                        $feed = $this->getAlignRight($part, $feed, $width, $font, $fontSize);
-+                    } else {
-+                        $feed = $feed - $this->widthForStringUsingFontSize($part, $font, $fontSize);
-+                    }
-+                    break;
-+                case 'center':
-+                    if ($width) {
-+                        $feed = $this->getAlignCenter($part, $feed, $width, $font, $fontSize);
-+                    }
-+                    break;
-+                default:
-+                    break;
-+            }
-+            $page->drawText($part, $feed, $this->y - $top, 'UTF-8');
-+            $top += $lineSpacing;
-+        }
-+        return $top;
-     }
- }
-diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
-index 11908864236..48934e24a37 100644
---- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
-+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Model\Order\Pdf\Items\Creditmemo;
- 
- /**
-@@ -66,11 +68,18 @@ class DefaultCreditmemo extends \Magento\Sales\Model\Order\Pdf\Items\AbstractIte
-         $lines = [];
- 
-         // draw Product name
--        $lines[0] = [['text' => $this->string->split($item->getName(), 35, true, true), 'feed' => 35]];
-+        $lines[0] = [
-+            [
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+                'text' => $this->string->split(html_entity_decode($item->getName()), 35, true, true),
-+                'feed' => 35
-+            ]
-+        ];
- 
-         // draw SKU
-         $lines[0][] = [
--            'text' => $this->string->split($this->getSku($item), 17),
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+            'text' => $this->string->split(html_entity_decode($this->getSku($item)), 17),
-             'feed' => 255,
-             'align' => 'right',
-         ];
-diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
-index 7f5d880915c..23c2c00daad 100644
---- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
-+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Model\Order\Pdf\Items\Invoice;
- 
- /**
-@@ -66,11 +68,18 @@ class DefaultInvoice extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
-         $lines = [];
- 
-         // draw Product name
--        $lines[0] = [['text' => $this->string->split($item->getName(), 35, true, true), 'feed' => 35]];
-+        $lines[0] = [
-+            [
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+                'text' => $this->string->split(html_entity_decode($item->getName()), 35, true, true),
-+                'feed' => 35
-+            ]
-+        ];
- 
-         // draw SKU
-         $lines[0][] = [
--            'text' => $this->string->split($this->getSku($item), 17),
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+            'text' => $this->string->split(html_entity_decode($this->getSku($item)), 17),
-             'feed' => 290,
-             'align' => 'right',
-         ];
-@@ -128,7 +137,7 @@ class DefaultInvoice extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
-                 ];
- 
-                 // Checking whether option value is not null
--                if ($option['value']!= null) {
-+                if ($option['value'] !== null) {
-                     if (isset($option['print_value'])) {
-                         $printValue = $option['print_value'];
-                     } else {
-diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
-index 433a4b7e314..a88b508ba07 100644
---- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
-+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Model\Order\Pdf\Items\Shipment;
- 
- /**
-@@ -65,14 +67,21 @@ class DefaultShipment extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
-         $lines = [];
- 
-         // draw Product name
--        $lines[0] = [['text' => $this->string->split($item->getName(), 60, true, true), 'feed' => 100]];
-+        $lines[0] = [
-+            [
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+                'text' => $this->string->split(html_entity_decode($item->getName()), 60, true, true),
-+                'feed' => 100
-+            ]
-+        ];
- 
-         // draw QTY
-         $lines[0][] = ['text' => $item->getQty() * 1, 'feed' => 35];
- 
-         // draw SKU
-         $lines[0][] = [
--            'text' => $this->string->split($this->getSku($item), 25),
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+            'text' => $this->string->split(html_entity_decode($this->getSku($item)), 25),
-             'feed' => 565,
-             'align' => 'right',
-         ];
-@@ -89,7 +98,7 @@ class DefaultShipment extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
-                 ];
- 
-                 // draw options value
--                if ($option['value']!= null) {
-+                if ($option['value'] !== null) {
-                     $printValue = isset(
-                         $option['print_value']
-                     ) ? $option['print_value'] : $this->filterManager->stripTags(
-diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
-index b171fccdeb0..32a289c0f5f 100644
---- a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
-+++ b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
-@@ -150,11 +150,11 @@ class Shipment extends AbstractPdf
-                 $this->_drawItem($item, $page, $order);
-                 $page = end($pdf->pages);
-             }
-+            if ($shipment->getStoreId()) {
-+                $this->_localeResolver->revert();
-+            }
-         }
-         $this->_afterGetPdf();
--        if ($shipment->getStoreId()) {
--            $this->_localeResolver->revert();
--        }
-         return $pdf;
-     }
- 
-diff --git a/app/code/Magento/Sales/Model/Order/ProductOption.php b/app/code/Magento/Sales/Model/Order/ProductOption.php
-new file mode 100644
-index 00000000000..dc9ec42e27e
---- /dev/null
-+++ b/app/code/Magento/Sales/Model/Order/ProductOption.php
-@@ -0,0 +1,103 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Model\Order;
-+
-+use Magento\Sales\Api\Data\OrderItemInterface;
-+use Magento\Framework\DataObject;
-+use Magento\Catalog\Model\ProductOptionFactory;
-+use Magento\Catalog\Model\ProductOptionProcessorInterface;
-+use Magento\Catalog\Api\Data\ProductOptionExtensionFactory;
-+
-+/**
-+ * Adds product option to the order item according to product options processors pool.
-+ *
-+ * @api
-+ */
-+class ProductOption
-+{
-+    /**
-+     * @var ProductOptionFactory
-+     */
-+    private $productOptionFactory;
-+
-+    /**
-+     * @var ProductOptionExtensionFactory
-+     */
-+    private $extensionFactory;
-+
-+    /**
-+     * @var ProductOptionProcessorInterface[]
-+     */
-+    private $processorPool;
-+
-+    /**
-+     * @param ProductOptionFactory $productOptionFactory
-+     * @param ProductOptionExtensionFactory $extensionFactory
-+     * @param array $processorPool
-+     */
-+    public function __construct(
-+        ProductOptionFactory $productOptionFactory,
-+        ProductOptionExtensionFactory $extensionFactory,
-+        array $processorPool = []
-+    ) {
-+        $this->productOptionFactory = $productOptionFactory;
-+        $this->extensionFactory = $extensionFactory;
-+        $this->processorPool = $processorPool;
-+    }
-+
-+    /**
-+     * Adds product option to the order item.
-+     *
-+     * @param OrderItemInterface $orderItem
-+     */
-+    public function add(OrderItemInterface $orderItem): void
-+    {
-+        /** @var DataObject $request */
-+        $request = $orderItem->getBuyRequest();
-+
-+        $productType = $orderItem->getProductType();
-+        if (isset($this->processorPool[$productType])
-+            && !$orderItem->getParentItemId()) {
-+            $data = $this->processorPool[$productType]->convertToProductOption($request);
-+            if ($data) {
-+                $this->setProductOption($orderItem, $data);
-+            }
-+        }
-+
-+        if (isset($this->processorPool['custom_options'])
-+            && !$orderItem->getParentItemId()) {
-+            $data = $this->processorPool['custom_options']->convertToProductOption($request);
-+            if ($data) {
-+                $this->setProductOption($orderItem, $data);
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Sets product options data.
-+     *
-+     * @param OrderItemInterface $orderItem
-+     * @param array $data
-+     */
-+    private function setProductOption(OrderItemInterface $orderItem, array $data): void
-+    {
-+        $productOption = $orderItem->getProductOption();
-+        if (!$productOption) {
-+            $productOption = $this->productOptionFactory->create();
-+            $orderItem->setProductOption($productOption);
-+        }
-+
-+        $extensionAttributes = $productOption->getExtensionAttributes();
-+        if (!$extensionAttributes) {
-+            $extensionAttributes = $this->extensionFactory->create();
-+            $productOption->setExtensionAttributes($extensionAttributes);
-+        }
-+
-+        $extensionAttributes->setData(key($data), current($data));
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
-index 8be12ec6ad5..ef9c6fc628d 100644
---- a/app/code/Magento/Sales/Model/Order/Shipment.php
-+++ b/app/code/Magento/Sales/Model/Order/Shipment.php
-@@ -277,6 +277,8 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
-     }
- 
-     /**
-+     * Retrieves the collection used to track the shipment's items
-+     *
-      * @return mixed
-      */
-     public function getItemsCollection()
-@@ -295,6 +297,8 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
-     }
- 
-     /**
-+     * Retrieves all non-deleted items from the shipment
-+     *
-      * @return array
-      */
-     public function getAllItems()
-@@ -309,6 +313,8 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
-     }
- 
-     /**
-+     * Retrieves an item from the shipment using its ID
-+     *
-      * @param string|int $itemId
-      * @return bool|\Magento\Sales\Model\Order\Shipment\Item
-      */
-@@ -323,6 +329,8 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
-     }
- 
-     /**
-+     * Adds an item to the shipment
-+     *
-      * @param \Magento\Sales\Model\Order\Shipment\Item $item
-      * @return $this
-      */
-@@ -346,13 +354,22 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
-     public function getTracksCollection()
-     {
-         if ($this->tracksCollection === null) {
--            $this->tracksCollection = $this->_trackCollectionFactory->create()->setShipmentFilter($this->getId());
-+            $this->tracksCollection = $this->_trackCollectionFactory->create();
-+
-+            $id = $this->getId() ?: 0;
-+            $this->tracksCollection->setShipmentFilter($id);
-+
-+            foreach ($this->tracksCollection as $item) {
-+                $item->setShipment($this);
-+            }
-         }
- 
-         return $this->tracksCollection;
-     }
- 
-     /**
-+     * Retrieves all available tracks in the collection that aren't deleted
-+     *
-      * @return array
-      */
-     public function getAllTracks()
-@@ -367,6 +384,8 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
-     }
- 
-     /**
-+     * Retrieves a track using its ID
-+     *
-      * @param string|int $trackId
-      * @return bool|\Magento\Sales\Model\Order\Shipment\Track
-      */
-@@ -381,24 +400,27 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
-     }
- 
-     /**
-+     * Addes a track to the collection and associates the shipment to the track
-+     *
-      * @param \Magento\Sales\Model\Order\Shipment\Track $track
-      * @return $this
-      */
-     public function addTrack(\Magento\Sales\Model\Order\Shipment\Track $track)
-     {
--        $track->setShipment(
--            $this
--        )->setParentId(
--            $this->getId()
--        )->setOrderId(
--            $this->getOrderId()
--        )->setStoreId(
--            $this->getStoreId()
--        );
-+        $track->setShipment($this)
-+            ->setParentId($this->getId())
-+            ->setOrderId($this->getOrderId())
-+            ->setStoreId($this->getStoreId());
-+
-         if (!$track->getId()) {
-             $this->getTracksCollection()->addItem($track);
-         }
- 
-+        $tracks = $this->getTracks();
-+        // as it's a new track entity, the collection doesn't contain it
-+        $tracks[] = $track;
-+        $this->setTracks($tracks);
-+
-         /**
-          * Track saving is implemented in _afterSave()
-          * This enforces \Magento\Framework\Model\AbstractModel::save() not to skip _afterSave()
-@@ -409,8 +431,7 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
-     }
- 
-     /**
--     * Adds comment to shipment with additional possibility to send it to customer via email
--     * and show it in customer account
-+     * Adds comment to shipment with option to send it to customer via email and show it in customer account
-      *
-      * @param \Magento\Sales\Model\Order\Shipment\Comment|string $comment
-      * @param bool $notify
-@@ -569,18 +590,16 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
-     /**
-      * Returns tracks
-      *
--     * @return \Magento\Sales\Api\Data\ShipmentTrackInterface[]
-+     * @return \Magento\Sales\Api\Data\ShipmentTrackInterface[]|null
-      */
-     public function getTracks()
-     {
-+        if (!$this->getId()) {
-+            return $this->getData(ShipmentInterface::TRACKS);
-+        }
-+
-         if ($this->getData(ShipmentInterface::TRACKS) === null) {
--            $collection =  $this->_trackCollectionFactory->create()->setShipmentFilter($this->getId());
--            if ($this->getId()) {
--                foreach ($collection as $item) {
--                    $item->setShipment($this);
--                }
--                $this->setData(ShipmentInterface::TRACKS, $collection->getItems());
--            }
-+            $this->setData(ShipmentInterface::TRACKS, $this->getTracksCollection()->getItems());
-         }
-         return $this->getData(ShipmentInterface::TRACKS);
-     }
-diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
-index 0a393548069..1d4418c5004 100644
---- a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
-+++ b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
-@@ -89,6 +89,7 @@ class EmailSender extends Sender implements SenderInterface
-      * @param bool $forceSyncMode
-      *
-      * @return bool
-+     * @throws \Exception
-      */
-     public function send(
-         \Magento\Sales\Api\Data\OrderInterface $order,
-@@ -96,9 +97,11 @@ class EmailSender extends Sender implements SenderInterface
-         \Magento\Sales\Api\Data\ShipmentCommentCreationInterface $comment = null,
-         $forceSyncMode = false
-     ) {
--        $shipment->setSendEmail(true);
-+        $shipment->setSendEmail($this->identityContainer->isEnabled());
- 
-         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
-+            $this->identityContainer->setStore($order->getStore());
-+
-             $transport = [
-                 'order' => $order,
-                 'shipment' => $shipment,
-@@ -145,6 +148,7 @@ class EmailSender extends Sender implements SenderInterface
-      * @param \Magento\Sales\Api\Data\OrderInterface $order
-      *
-      * @return string
-+     * @throws \Exception
-      */
-     private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
-     {
-diff --git a/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
-index c0a3f84e884..4a3e834a69a 100644
---- a/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
-+++ b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Sales\Model\Order;
- 
-+use Magento\Framework\App\ObjectManager;
- use Magento\Sales\Api\Data\ShipmentInterface;
- use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
- use Magento\Sales\Api\Data\ShipmentPackageCreationInterface;
-@@ -15,6 +16,7 @@ use Magento\Sales\Api\Data\OrderInterface;
- use Magento\Sales\Api\Data\ShipmentCommentCreationInterface;
- use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
- use Magento\Sales\Api\Data\OrderItemInterface;
-+use Magento\Sales\Model\Order\ShipmentDocumentFactory\ExtensionAttributesProcessor;
- 
- /**
-  * Class ShipmentDocumentFactory
-@@ -39,21 +41,30 @@ class ShipmentDocumentFactory
-      */
-     private $hydratorPool;
- 
-+    /**
-+     * @var ExtensionAttributesProcessor
-+     */
-+    private $extensionAttributesProcessor;
-+
-     /**
-      * ShipmentDocumentFactory constructor.
-      *
-      * @param ShipmentFactory $shipmentFactory
-      * @param HydratorPool $hydratorPool
-      * @param TrackFactory $trackFactory
-+     * @param ExtensionAttributesProcessor $extensionAttributesProcessor
-      */
-     public function __construct(
-         ShipmentFactory $shipmentFactory,
-         HydratorPool $hydratorPool,
--        TrackFactory $trackFactory
-+        TrackFactory $trackFactory,
-+        ExtensionAttributesProcessor $extensionAttributesProcessor = null
-     ) {
-         $this->shipmentFactory = $shipmentFactory;
-         $this->trackFactory = $trackFactory;
-         $this->hydratorPool = $hydratorPool;
-+        $this->extensionAttributesProcessor = $extensionAttributesProcessor ?: ObjectManager::getInstance()
-+            ->get(ExtensionAttributesProcessor::class);
-     }
- 
-     /**
-@@ -88,6 +99,10 @@ class ShipmentDocumentFactory
-             $shipmentItems
-         );
- 
-+        if (null !== $arguments) {
-+            $this->extensionAttributesProcessor->execute($shipment, $arguments);
-+        }
-+
-         foreach ($tracks as $track) {
-             $hydrator = $this->hydratorPool->getHydrator(
-                 \Magento\Sales\Api\Data\ShipmentTrackCreationInterface::class
-diff --git a/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory/ExtensionAttributesProcessor.php b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory/ExtensionAttributesProcessor.php
-new file mode 100644
-index 00000000000..c4c38a234da
---- /dev/null
-+++ b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory/ExtensionAttributesProcessor.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Model\Order\ShipmentDocumentFactory;
-+
-+use Magento\Framework\Reflection\ExtensionAttributesProcessor as AttributesProcessor;
-+use Magento\Sales\Api\Data\ShipmentCreationArgumentsExtensionInterface;
-+use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
-+use Magento\Sales\Api\Data\ShipmentExtensionFactory;
-+use Magento\Sales\Api\Data\ShipmentExtensionInterface;
-+use Magento\Sales\Api\Data\ShipmentInterface;
-+
-+/**
-+ * Build and set extension attributes for shipment.
-+ */
-+class ExtensionAttributesProcessor
-+{
-+    /**
-+     * @var ShipmentExtensionFactory
-+     */
-+    private $shipmentExtensionFactory;
-+
-+    /**
-+     * @var ExtensionAttributesProcessor
-+     */
-+    private $extensionAttributesProcessor;
-+
-+    /**
-+     * @param ShipmentExtensionFactory $shipmentExtensionFactory
-+     * @param AttributesProcessor $extensionAttributesProcessor
-+     */
-+    public function __construct(
-+        ShipmentExtensionFactory $shipmentExtensionFactory,
-+        AttributesProcessor $extensionAttributesProcessor
-+    ) {
-+        $this->shipmentExtensionFactory = $shipmentExtensionFactory;
-+        $this->extensionAttributesProcessor = $extensionAttributesProcessor;
-+    }
-+
-+    /**
-+     * @param ShipmentInterface $shipment
-+     * @param ShipmentCreationArgumentsInterface $arguments
-+     * @return void
-+     */
-+    public function execute(
-+        ShipmentInterface $shipment,
-+        ShipmentCreationArgumentsInterface $arguments
-+    ): void {
-+        $shipmentExtensionAttributes = [];
-+        if (null !== $shipment->getExtensionAttributes()) {
-+            $shipmentExtensionAttributes = $this->extensionAttributesProcessor->buildOutputDataArray(
-+                $shipment->getExtensionAttributes(),
-+                ShipmentExtensionInterface::class
-+            );
-+        }
-+        $argumentsExtensionAttributes = [];
-+        if (null !== $arguments->getExtensionAttributes()) {
-+            $argumentsExtensionAttributes = $this->extensionAttributesProcessor->buildOutputDataArray(
-+                $arguments->getExtensionAttributes(),
-+                ShipmentCreationArgumentsExtensionInterface::class
-+            );
-+        }
-+
-+        $mergedExtensionAttributes = $this->shipmentExtensionFactory->create([
-+            'data' => array_merge($shipmentExtensionAttributes, $argumentsExtensionAttributes)
-+        ]);
-+
-+        $shipment->setExtensionAttributes($mergedExtensionAttributes);
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Model/Order/StateResolver.php b/app/code/Magento/Sales/Model/Order/StateResolver.php
-index 6f84c9b48b6..f5575e0388a 100644
---- a/app/code/Magento/Sales/Model/Order/StateResolver.php
-+++ b/app/code/Magento/Sales/Model/Order/StateResolver.php
-@@ -39,7 +39,7 @@ class StateResolver implements OrderStateResolverInterface
-     {
-         /** @var $order Order|OrderInterface */
-         $forceCreditmemo = in_array(self::FORCED_CREDITMEMO, $arguments);
--        if (floatval($order->getTotalRefunded()) || !$order->getTotalRefunded() && $forceCreditmemo) {
-+        if ((float)$order->getTotalRefunded() || !$order->getTotalRefunded() && $forceCreditmemo) {
-             return true;
-         }
-         return false;
-diff --git a/app/code/Magento/Sales/Model/Order/Status.php b/app/code/Magento/Sales/Model/Order/Status.php
-index 28895570542..4b33f4b4d92 100644
---- a/app/code/Magento/Sales/Model/Order/Status.php
-+++ b/app/code/Magento/Sales/Model/Order/Status.php
-@@ -12,6 +12,7 @@ use Magento\Framework\Exception\LocalizedException;
-  * Class Status
-  *
-  * @method string getStatus()
-+ * @method $this setStatus(string $status)
-  * @method string getLabel()
-  */
- class Status extends \Magento\Sales\Model\AbstractModel
-diff --git a/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php b/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php
-index b109b87e61b..7b346a232ab 100644
---- a/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php
-+++ b/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php
-@@ -15,6 +15,8 @@ use Magento\Sales\Model\ValidatorInterface;
- class CanInvoice implements ValidatorInterface
- {
-     /**
-+     * Validate
-+     *
-      * @param OrderInterface $entity
-      * @return array
-      */
-@@ -32,6 +34,8 @@ class CanInvoice implements ValidatorInterface
-     }
- 
-     /**
-+     * Is state ready for invoice
-+     *
-      * @param OrderInterface $order
-      * @return bool
-      */
-@@ -44,12 +48,14 @@ class CanInvoice implements ValidatorInterface
-             $order->getState() === Order::STATE_CLOSED
-         ) {
-             return false;
--        };
-+        }
- 
-         return true;
-     }
- 
-     /**
-+     * Can invoice
-+     *
-      * @param OrderInterface $order
-      * @return bool
-      */
-diff --git a/app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php b/app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php
-new file mode 100644
-index 00000000000..38728d88ff4
---- /dev/null
-+++ b/app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php
-@@ -0,0 +1,63 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Model\Order\Webapi;
-+
-+use Magento\Sales\Api\Data\OrderItemInterface;
-+use Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn;
-+use Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer;
-+
-+/**
-+ * Class for changing row total in response.
-+ */
-+class ChangeOutputArray
-+{
-+    /**
-+     * @var DefaultColumn
-+     */
-+    private $priceRenderer;
-+
-+    /**
-+     * @var DefaultRenderer
-+     */
-+    private $defaultRenderer;
-+
-+    /**
-+     * @param DefaultColumn $priceRenderer
-+     * @param DefaultRenderer $defaultRenderer
-+     */
-+    public function __construct(
-+        DefaultColumn $priceRenderer,
-+        DefaultRenderer $defaultRenderer
-+    ) {
-+        $this->priceRenderer = $priceRenderer;
-+        $this->defaultRenderer = $defaultRenderer;
-+    }
-+
-+    /**
-+     * Changing row total for webapi order item response.
-+     *
-+     * @param OrderItemInterface $dataObject
-+     * @param array $result
-+     * @return array
-+     */
-+    public function execute(
-+        OrderItemInterface $dataObject,
-+        array $result
-+    ): array {
-+        $result[OrderItemInterface::ROW_TOTAL] = $this->priceRenderer->getTotalAmount($dataObject);
-+        $result[OrderItemInterface::BASE_ROW_TOTAL] = $this->priceRenderer->getBaseTotalAmount($dataObject);
-+        $result[OrderItemInterface::ROW_TOTAL_INCL_TAX] = $this->defaultRenderer->getTotalAmount($dataObject);
-+        $result[OrderItemInterface::BASE_ROW_TOTAL_INCL_TAX] = $dataObject->getBaseRowTotal()
-+            + $dataObject->getBaseTaxAmount()
-+            + $dataObject->getBaseDiscountTaxCompensationAmount()
-+            + $dataObject->getBaseWeeeTaxAppliedAmount()
-+            - $dataObject->getBaseDiscountAmount();
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php
-index f5ab45c5eb1..79548cb1907 100644
---- a/app/code/Magento/Sales/Model/OrderRepository.php
-+++ b/app/code/Magento/Sales/Model/OrderRepository.php
-@@ -6,7 +6,9 @@
- 
- namespace Magento\Sales\Model;
- 
-+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
- use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Exception\InputException;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Sales\Api\Data\OrderExtensionFactory;
-@@ -16,7 +18,10 @@ use Magento\Sales\Api\Data\OrderSearchResultInterfaceFactory as SearchResultFact
- use Magento\Sales\Api\Data\ShippingAssignmentInterface;
- use Magento\Sales\Model\Order\ShippingAssignmentBuilder;
- use Magento\Sales\Model\ResourceModel\Metadata;
--use Magento\Framework\App\ObjectManager;
-+use Magento\Tax\Api\OrderTaxManagementInterface;
-+use Magento\Payment\Api\Data\PaymentAdditionalInfoInterface;
-+use Magento\Payment\Api\Data\PaymentAdditionalInfoInterfaceFactory;
-+use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
- 
- /**
-  * Repository class
-@@ -55,6 +60,26 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
-      */
-     protected $registry = [];
- 
-+    /**
-+     * @var OrderTaxManagementInterface
-+     */
-+    private $orderTaxManagement;
-+
-+    /**
-+     * @var PaymentAdditionalInfoFactory
-+     */
-+    private $paymentAdditionalInfoFactory;
-+
-+    /**
-+     * @var JsonSerializer
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @var JoinProcessorInterface
-+     */
-+    private $extensionAttributesJoinProcessor;
-+
-     /**
-      * Constructor
-      *
-@@ -62,12 +87,20 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
-      * @param SearchResultFactory $searchResultFactory
-      * @param CollectionProcessorInterface|null $collectionProcessor
-      * @param \Magento\Sales\Api\Data\OrderExtensionFactory|null $orderExtensionFactory
-+     * @param OrderTaxManagementInterface|null $orderTaxManagement
-+     * @param PaymentAdditionalInfoInterfaceFactory|null $paymentAdditionalInfoFactory
-+     * @param JsonSerializer|null $serializer
-+     * @param JoinProcessorInterface $extensionAttributesJoinProcessor
-      */
-     public function __construct(
-         Metadata $metadata,
-         SearchResultFactory $searchResultFactory,
-         CollectionProcessorInterface $collectionProcessor = null,
--        \Magento\Sales\Api\Data\OrderExtensionFactory $orderExtensionFactory = null
-+        \Magento\Sales\Api\Data\OrderExtensionFactory $orderExtensionFactory = null,
-+        OrderTaxManagementInterface $orderTaxManagement = null,
-+        PaymentAdditionalInfoInterfaceFactory $paymentAdditionalInfoFactory = null,
-+        JsonSerializer $serializer = null,
-+        JoinProcessorInterface $extensionAttributesJoinProcessor = null
-     ) {
-         $this->metadata = $metadata;
-         $this->searchResultFactory = $searchResultFactory;
-@@ -75,10 +108,18 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
-             ->get(\Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface::class);
-         $this->orderExtensionFactory = $orderExtensionFactory ?: ObjectManager::getInstance()
-             ->get(\Magento\Sales\Api\Data\OrderExtensionFactory::class);
-+        $this->orderTaxManagement = $orderTaxManagement ?: ObjectManager::getInstance()
-+            ->get(OrderTaxManagementInterface::class);
-+        $this->paymentAdditionalInfoFactory = $paymentAdditionalInfoFactory ?: ObjectManager::getInstance()
-+            ->get(PaymentAdditionalInfoInterfaceFactory::class);
-+        $this->serializer = $serializer ?: ObjectManager::getInstance()
-+            ->get(JsonSerializer::class);
-+        $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor
-+            ?: ObjectManager::getInstance()->get(JoinProcessorInterface::class);
-     }
- 
-     /**
--     * load entity
-+     * Load entity
-      *
-      * @param int $id
-      * @return \Magento\Sales\Api\Data\OrderInterface
-@@ -98,12 +139,65 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
-                     __("The entity that was requested doesn't exist. Verify the entity and try again.")
-                 );
-             }
-+            $this->setOrderTaxDetails($entity);
-             $this->setShippingAssignments($entity);
-+            $this->setPaymentAdditionalInfo($entity);
-             $this->registry[$id] = $entity;
-         }
-         return $this->registry[$id];
-     }
- 
-+    /**
-+     * Set order tax details to extension attributes.
-+     *
-+     * @param OrderInterface $order
-+     * @return void
-+     */
-+    private function setOrderTaxDetails(OrderInterface $order)
-+    {
-+        $extensionAttributes = $order->getExtensionAttributes();
-+        $orderTaxDetails = $this->orderTaxManagement->getOrderTaxDetails($order->getEntityId());
-+        $appliedTaxes = $orderTaxDetails->getAppliedTaxes();
-+
-+        $extensionAttributes->setAppliedTaxes($appliedTaxes);
-+        if (!empty($appliedTaxes)) {
-+            $extensionAttributes->setConvertingFromQuote(true);
-+        }
-+
-+        $items = $orderTaxDetails->getItems();
-+        $extensionAttributes->setItemAppliedTaxes($items);
-+
-+        $order->setExtensionAttributes($extensionAttributes);
-+    }
-+
-+    /**
-+     * Set additional info to the order.
-+     *
-+     * @param OrderInterface $order
-+     * @return void
-+     */
-+    private function setPaymentAdditionalInfo(OrderInterface $order): void
-+    {
-+        $extensionAttributes = $order->getExtensionAttributes();
-+        $paymentAdditionalInformation = $order->getPayment()->getAdditionalInformation();
-+
-+        $objects = [];
-+        foreach ($paymentAdditionalInformation as $key => $value) {
-+            /** @var PaymentAdditionalInfoInterface $additionalInformationObject */
-+            $additionalInformationObject = $this->paymentAdditionalInfoFactory->create();
-+            $additionalInformationObject->setKey($key);
-+
-+            if (!is_string($value)) {
-+                $value = $this->serializer->serialize($value);
-+            }
-+            $additionalInformationObject->setValue($value);
-+
-+            $objects[] = $additionalInformationObject;
-+        }
-+        $extensionAttributes->setPaymentAdditionalInfo($objects);
-+        $order->setExtensionAttributes($extensionAttributes);
-+    }
-+
-     /**
-      * Find entities by criteria
-      *
-@@ -114,10 +208,13 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
-     {
-         /** @var \Magento\Sales\Api\Data\OrderSearchResultInterface $searchResult */
-         $searchResult = $this->searchResultFactory->create();
-+        $this->extensionAttributesJoinProcessor->process($searchResult);
-         $this->collectionProcessor->process($searchCriteria, $searchResult);
-         $searchResult->setSearchCriteria($searchCriteria);
-         foreach ($searchResult->getItems() as $order) {
-             $this->setShippingAssignments($order);
-+            $this->setOrderTaxDetails($order);
-+            $this->setPaymentAdditionalInfo($order);
-         }
-         return $searchResult;
-     }
-@@ -171,6 +268,8 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
-     }
- 
-     /**
-+     * Set shipping assignments to extension attributes.
-+     *
-      * @param OrderInterface $order
-      * @return void
-      */
-diff --git a/app/code/Magento/Sales/Model/RefundOrder.php b/app/code/Magento/Sales/Model/RefundOrder.php
-index d79f5ecf857..07555cba1b7 100644
---- a/app/code/Magento/Sales/Model/RefundOrder.php
-+++ b/app/code/Magento/Sales/Model/RefundOrder.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Sales\Model;
- 
- use Magento\Framework\App\ResourceConnection;
-@@ -151,10 +152,13 @@ class RefundOrder implements RefundOrderInterface
-             $creditmemo->setState(\Magento\Sales\Model\Order\Creditmemo::STATE_REFUNDED);
-             $order->setCustomerNoteNotify($notify);
-             $order = $this->refundAdapter->refund($creditmemo, $order);
--            $order->setState(
--                $this->orderStateResolver->getStateForOrder($order, [])
--            );
--            $order->setStatus($this->config->getStateDefaultStatus($order->getState()));
-+            $orderState = $this->orderStateResolver->getStateForOrder($order, []);
-+            $order->setState($orderState);
-+            $statuses = $this->config->getStateStatuses($orderState, false);
-+            $status = in_array($order->getStatus(), $statuses, true)
-+                ? $order->getStatus()
-+                : $this->config->getStateDefaultStatus($orderState);
-+            $order->setStatus($status);
- 
-             $order = $this->orderRepository->save($order);
-             $creditmemo = $this->creditmemoRepository->save($creditmemo);
-diff --git a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
-index 87c5b917f69..25c15449a9f 100644
---- a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
-+++ b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
-@@ -103,6 +103,6 @@ abstract class AbstractGrid extends AbstractDb implements GridInterface
- 
-         $row = $this->getConnection()->fetchRow($select);
- 
--        return isset($row['updated_at']) ? $row['updated_at'] : $default;
-+        return $row['updated_at'] ?? $default;
-     }
- }
-diff --git a/app/code/Magento/Sales/Model/ResourceModel/Grid.php b/app/code/Magento/Sales/Model/ResourceModel/Grid.php
-index 42e5d92fb00..432918450a6 100644
---- a/app/code/Magento/Sales/Model/ResourceModel/Grid.php
-+++ b/app/code/Magento/Sales/Model/ResourceModel/Grid.php
-@@ -93,15 +93,20 @@ class Grid extends AbstractGrid
-     {
-         $select = $this->getGridOriginSelect()
-             ->where(($field ?: $this->mainTableName . '.entity_id') . ' = ?', $value);
--        return $this->getConnection()->query(
--            $this->getConnection()
--                ->insertFromSelect(
--                    $select,
--                    $this->getTable($this->gridTableName),
--                    array_keys($this->columns),
--                    AdapterInterface::INSERT_ON_DUPLICATE
--                )
--        );
-+        $sql = $this->getConnection()
-+            ->insertFromSelect(
-+                $select,
-+                $this->getTable($this->gridTableName),
-+                array_keys($this->columns),
-+                AdapterInterface::INSERT_ON_DUPLICATE
-+            );
-+
-+        $this->addCommitCallback(function () use ($sql) {
-+            $this->getConnection()->query($sql);
-+        });
-+
-+        // need for backward compatibility
-+        return $this->getConnection()->query($sql);
-     }
- 
-     /**
-@@ -126,6 +131,8 @@ class Grid extends AbstractGrid
-     }
- 
-     /**
-+     * Get order id field.
-+     *
-      * @return string
-      */
-     public function getOrderIdField()
-diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
-index 5dca2383642..6ad8ebc3bb8 100644
---- a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
-+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
-@@ -48,7 +48,7 @@ class Collection extends AbstractCollection implements OrderSearchResultInterfac
-      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
-      * @param \Magento\Framework\DB\Helper $coreResourceHelper
--     * @param string|null $connection
-+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-      */
-     public function __construct(
-@@ -138,6 +138,7 @@ class Collection extends AbstractCollection implements OrderSearchResultInterfac
- 
-     /**
-      * Join table sales_order_address to select for billing and shipping order addresses.
-+     *
-      * Create correlation map
-      *
-      * @return $this
-diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Grid/Collection.php
-index f6dd8f8527a..82c612c1a78 100644
---- a/app/code/Magento/Sales/Model/ResourceModel/Order/Grid/Collection.php
-+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Grid/Collection.php
-@@ -35,4 +35,19 @@ class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvide
-     ) {
-         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _initSelect()
-+    {
-+        parent::_initSelect();
-+
-+        $tableDescription = $this->getConnection()->describeTable($this->getMainTable());
-+        foreach ($tableDescription as $columnInfo) {
-+            $this->addFilterToMap($columnInfo['COLUMN_NAME'], 'main_table.' . $columnInfo['COLUMN_NAME']);
-+        }
-+
-+        return $this;
-+    }
- }
-diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
-index c7bac874fa3..de15a627583 100644
---- a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
-+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
-@@ -14,7 +14,7 @@ use Magento\Sales\Model\Order;
- class State
- {
-     /**
--     * Check order status before save
-+     * Check order status and adjust the status before save
-      *
-      * @param Order $order
-      * @return $this
-@@ -23,24 +23,24 @@ class State
-      */
-     public function check(Order $order)
-     {
--        if (!$order->isCanceled() && !$order->canUnhold() && !$order->canInvoice() && !$order->canShip()) {
--            if (0 == $order->getBaseGrandTotal() || $order->canCreditmemo()) {
--                if ($order->getState() !== Order::STATE_COMPLETE) {
--                    $order->setState(Order::STATE_COMPLETE)
--                        ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_COMPLETE));
--                }
--            } elseif (floatval($order->getTotalRefunded())
--                || !$order->getTotalRefunded() && $order->hasForcedCanCreditmemo()
--            ) {
--                if ($order->getState() !== Order::STATE_CLOSED) {
--                    $order->setState(Order::STATE_CLOSED)
--                        ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_CLOSED));
--                }
--            }
--        }
--        if ($order->getState() == Order::STATE_NEW && $order->getIsInProcess()) {
-+        $currentState = $order->getState();
-+        if ($currentState == Order::STATE_NEW && $order->getIsInProcess()) {
-             $order->setState(Order::STATE_PROCESSING)
-                 ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING));
-+            $currentState = Order::STATE_PROCESSING;
-+        }
-+
-+        if (!$order->isCanceled() && !$order->canUnhold() && !$order->canInvoice()) {
-+            if (in_array($currentState, [Order::STATE_PROCESSING, Order::STATE_COMPLETE])
-+                && !$order->canCreditmemo()
-+                && !$order->canShip()
-+            ) {
-+                $order->setState(Order::STATE_CLOSED)
-+                    ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_CLOSED));
-+            } elseif ($currentState === Order::STATE_PROCESSING && !$order->canShip()) {
-+                $order->setState(Order::STATE_COMPLETE)
-+                    ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_COMPLETE));
-+            }
-         }
-         return $this;
-     }
-diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Collection.php
-index 521db7f1f3a..fead4f39f4c 100644
---- a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Collection.php
-+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Collection.php
-@@ -33,7 +33,7 @@ class Collection extends AbstractCollection implements OrderPaymentSearchResultI
-      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
--     * @param null $connection
-+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-      */
-     public function __construct(
-diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php
-index f004a1ee37e..8758fc1da92 100644
---- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php
-+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php
-@@ -57,14 +57,16 @@ class Collection extends AbstractCollection implements ShipmentSearchResultInter
-     }
- 
-     /**
--     * Used to emulate after load functionality for each item without loading them
-+     * Unserialize packages in each item
-      *
-      * @return $this
-      */
-     protected function _afterLoad()
-     {
--        $this->walk('afterLoad');
-+        foreach ($this->_items as $item) {
-+            $this->getResource()->unserializeFields($item);
-+        }
- 
--        return $this;
-+        return parent::_afterLoad();
-     }
- }
-diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
-index 9c8671d02c5..5851b2d9361 100644
---- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
-+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
-@@ -62,8 +62,8 @@ class Relation implements RelationInterface
-                 $this->shipmentItemResource->save($item);
-             }
-         }
--        if (null !== $object->getTracksCollection()) {
--            foreach ($object->getTracksCollection() as $track) {
-+        if (null !== $object->getTracks()) {
-+            foreach ($object->getTracks() as $track) {
-                 $track->setParentId($object->getId());
-                 $this->shipmentTrackResource->save($track);
-             }
-diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php
-index 86d86255a0c..9c4c87c2e2e 100644
---- a/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php
-+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php
-@@ -25,7 +25,7 @@ class AbstractCollection extends \Magento\Reports\Model\ResourceModel\Report\Col
-      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-      * @param \Magento\Sales\Model\ResourceModel\Report $resource
--     * @param null $connection
-+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-      */
-     public function __construct(
-         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
-diff --git a/app/code/Magento/Sales/Model/Service/CreditmemoService.php b/app/code/Magento/Sales/Model/Service/CreditmemoService.php
-index e8f2e6e5305..6302a71cab9 100644
---- a/app/code/Magento/Sales/Model/Service/CreditmemoService.php
-+++ b/app/code/Magento/Sales/Model/Service/CreditmemoService.php
-@@ -98,7 +98,7 @@ class CreditmemoService implements \Magento\Sales\Api\CreditmemoManagementInterf
-      * Cancel an existing creditmemo
-      *
-      * @param int $id Credit Memo Id
--     * @return bool
-+     * @return void
-      * @throws \Magento\Framework\Exception\LocalizedException
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-@@ -166,8 +166,8 @@ class CreditmemoService implements \Magento\Sales\Api\CreditmemoManagementInterf
-                 $creditmemo->getOrder(),
-                 !$offlineRequested
-             );
--            $this->getOrderRepository()->save($order);
-             $this->creditmemoRepository->save($creditmemo);
-+            $this->getOrderRepository()->save($order);
-             $connection->commit();
-         } catch (\Exception $e) {
-             $connection->rollBack();
-@@ -178,6 +178,8 @@ class CreditmemoService implements \Magento\Sales\Api\CreditmemoManagementInterf
-     }
- 
-     /**
-+     * Validates if credit memo is available for refund.
-+     *
-      * @param \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo
-      * @return bool
-      * @throws \Magento\Framework\Exception\LocalizedException
-@@ -200,7 +202,7 @@ class CreditmemoService implements \Magento\Sales\Api\CreditmemoManagementInterf
-             throw new \Magento\Framework\Exception\LocalizedException(
-                 __(
-                     'The most money available to refund is %1.',
--                    $creditmemo->getOrder()->formatBasePrice($baseAvailableRefund)
-+                    $creditmemo->getOrder()->getBaseCurrency()->formatTxt($baseAvailableRefund)
-                 )
-             );
-         }
-@@ -208,8 +210,9 @@ class CreditmemoService implements \Magento\Sales\Api\CreditmemoManagementInterf
-     }
- 
-     /**
--     * @return \Magento\Sales\Model\Order\RefundAdapterInterface
-+     * Initializes RefundAdapterInterface dependency.
-      *
-+     * @return \Magento\Sales\Model\Order\RefundAdapterInterface
-      * @deprecated 100.1.3
-      */
-     private function getRefundAdapter()
-@@ -222,8 +225,9 @@ class CreditmemoService implements \Magento\Sales\Api\CreditmemoManagementInterf
-     }
- 
-     /**
--     * @return \Magento\Framework\App\ResourceConnection|mixed
-+     * Initializes ResourceConnection dependency.
-      *
-+     * @return \Magento\Framework\App\ResourceConnection|mixed
-      * @deprecated 100.1.3
-      */
-     private function getResource()
-@@ -236,8 +240,9 @@ class CreditmemoService implements \Magento\Sales\Api\CreditmemoManagementInterf
-     }
- 
-     /**
--     * @return \Magento\Sales\Api\OrderRepositoryInterface
-+     * Initializes OrderRepositoryInterface dependency.
-      *
-+     * @return \Magento\Sales\Api\OrderRepositoryInterface
-      * @deprecated 100.1.3
-      */
-     private function getOrderRepository()
-@@ -250,8 +255,9 @@ class CreditmemoService implements \Magento\Sales\Api\CreditmemoManagementInterf
-     }
- 
-     /**
--     * @return \Magento\Sales\Api\InvoiceRepositoryInterface
-+     * Initializes InvoiceRepositoryInterface dependency.
-      *
-+     * @return \Magento\Sales\Api\InvoiceRepositoryInterface
-      * @deprecated 100.1.3
-      */
-     private function getInvoiceRepository()
-diff --git a/app/code/Magento/Sales/Model/Service/InvoiceService.php b/app/code/Magento/Sales/Model/Service/InvoiceService.php
-index 718f55c3e55..ceef0f05401 100644
---- a/app/code/Magento/Sales/Model/Service/InvoiceService.php
-+++ b/app/code/Magento/Sales/Model/Service/InvoiceService.php
-@@ -3,47 +3,47 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Model\Service;
- 
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
-+use Magento\Sales\Api\Data\InvoiceInterface;
-+use Magento\Sales\Api\Data\InvoiceItemInterface;
-+use Magento\Sales\Api\Data\OrderItemInterface;
- use Magento\Sales\Api\InvoiceManagementInterface;
- use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Invoice;
- 
- /**
-  * Class InvoiceService
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class InvoiceService implements InvoiceManagementInterface
- {
-     /**
--     * Repository
--     *
-      * @var \Magento\Sales\Api\InvoiceRepositoryInterface
-      */
-     protected $repository;
- 
-     /**
--     * Repository
--     *
-      * @var \Magento\Sales\Api\InvoiceCommentRepositoryInterface
-      */
-     protected $commentRepository;
- 
-     /**
--     * Search Criteria Builder
--     *
-      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-      */
-     protected $criteriaBuilder;
- 
-     /**
--     * Filter Builder
--     *
-      * @var \Magento\Framework\Api\FilterBuilder
-      */
-     protected $filterBuilder;
- 
-     /**
--     * Invoice Notifier
--     *
-      * @var \Magento\Sales\Model\Order\InvoiceNotifier
-      */
-     protected $invoiceNotifier;
-@@ -59,8 +59,11 @@ class InvoiceService implements InvoiceManagementInterface
-     protected $orderConverter;
- 
-     /**
--     * Constructor
--     *
-+     * @var JsonSerializer
-+     */
-+    private $serializer;
-+
-+    /**
-      * @param \Magento\Sales\Api\InvoiceRepositoryInterface $repository
-      * @param \Magento\Sales\Api\InvoiceCommentRepositoryInterface $commentRepository
-      * @param \Magento\Framework\Api\SearchCriteriaBuilder $criteriaBuilder
-@@ -68,6 +71,7 @@ class InvoiceService implements InvoiceManagementInterface
-      * @param \Magento\Sales\Model\Order\InvoiceNotifier $notifier
-      * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
-      * @param \Magento\Sales\Model\Convert\Order $orderConverter
-+     * @param JsonSerializer $serializer
-      */
-     public function __construct(
-         \Magento\Sales\Api\InvoiceRepositoryInterface $repository,
-@@ -76,7 +80,8 @@ class InvoiceService implements InvoiceManagementInterface
-         \Magento\Framework\Api\FilterBuilder $filterBuilder,
-         \Magento\Sales\Model\Order\InvoiceNotifier $notifier,
-         \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
--        \Magento\Sales\Model\Convert\Order $orderConverter
-+        \Magento\Sales\Model\Convert\Order $orderConverter,
-+        JsonSerializer $serializer
-     ) {
-         $this->repository = $repository;
-         $this->commentRepository = $commentRepository;
-@@ -85,6 +90,7 @@ class InvoiceService implements InvoiceManagementInterface
-         $this->invoiceNotifier = $notifier;
-         $this->orderRepository = $orderRepository;
-         $this->orderConverter = $orderConverter;
-+        $this->serializer = $serializer;
-     }
- 
-     /**
-@@ -125,37 +131,53 @@ class InvoiceService implements InvoiceManagementInterface
-     }
- 
-     /**
-+     * Creates an invoice based on the order and quantities provided.
-+     *
-+     * Explanation for `if` statements:
-+     * - using qty defined in `$preparedItemsQty` is prioritized
-+     * - if qty is not defined and item is dummy, get ordered qty
-+     * - if qty is not defined, get qty to invoice
-+     * - else qty is 0
-+     *
-      * @param Order $order
--     * @param array $qtys
--     * @return \Magento\Sales\Model\Order\Invoice
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @param array $orderItemsQtyToInvoice
-+     * @return Invoice
-+     * @throws LocalizedException
-+     * @throws \Exception
-      */
--    public function prepareInvoice(Order $order, array $qtys = [])
--    {
--        $invoice = $this->orderConverter->toInvoice($order);
-+    public function prepareInvoice(
-+        Order $order,
-+        array $orderItemsQtyToInvoice = []
-+    ): InvoiceInterface {
-         $totalQty = 0;
--        $qtys = $this->prepareItemsQty($order, $qtys);
-+        $invoice = $this->orderConverter->toInvoice($order);
-+        $preparedItemsQty = $this->prepareItemsQty($order, $orderItemsQtyToInvoice);
-+
-         foreach ($order->getAllItems() as $orderItem) {
--            if (!$this->_canInvoiceItem($orderItem)) {
-+            if (!$this->canInvoiceItem($orderItem, $preparedItemsQty)) {
-                 continue;
-             }
--            $item = $this->orderConverter->itemToInvoiceItem($orderItem);
--            if ($orderItem->isDummy()) {
-+
-+            if (isset($preparedItemsQty[$orderItem->getId()])) {
-+                $qty = $preparedItemsQty[$orderItem->getId()];
-+            } elseif ($orderItem->isDummy()) {
-                 $qty = $orderItem->getQtyOrdered() ? $orderItem->getQtyOrdered() : 1;
--            } elseif (isset($qtys[$orderItem->getId()])) {
--                $qty = (double) $qtys[$orderItem->getId()];
--            } elseif (empty($qtys)) {
-+            } elseif (empty($orderItemsQtyToInvoice)) {
-                 $qty = $orderItem->getQtyToInvoice();
-             } else {
-                 $qty = 0;
-             }
-+
-+            $invoiceItem = $this->orderConverter->itemToInvoiceItem($orderItem);
-+            $this->setInvoiceItemQuantity($invoiceItem, (float) $qty);
-+            $invoice->addItem($invoiceItem);
-             $totalQty += $qty;
--            $this->setInvoiceItemQuantity($item, $qty);
--            $invoice->addItem($item);
-         }
-+
-         $invoice->setTotalQty($totalQty);
-         $invoice->collectTotals();
-         $order->getInvoiceCollection()->addItem($invoice);
-+
-         return $invoice;
-     }
- 
-@@ -163,45 +185,67 @@ class InvoiceService implements InvoiceManagementInterface
-      * Prepare qty to invoice for parent and child products if theirs qty is not specified in initial request.
-      *
-      * @param Order $order
--     * @param array $qtys
-+     * @param array $orderItemsQtyToInvoice
-      * @return array
-      */
--    private function prepareItemsQty(Order $order, array $qtys = [])
--    {
-+    private function prepareItemsQty(
-+        Order $order,
-+        array $orderItemsQtyToInvoice
-+    ): array {
-         foreach ($order->getAllItems() as $orderItem) {
--            if (empty($qtys[$orderItem->getId()])) {
--                continue;
-+            if (isset($orderItemsQtyToInvoice[$orderItem->getId()])) {
-+                if ($orderItem->isDummy() && $orderItem->getHasChildren()) {
-+                    $orderItemsQtyToInvoice = $this->setChildItemsQtyToInvoice($orderItem, $orderItemsQtyToInvoice);
-+                }
-+            } else {
-+                if (isset($orderItemsQtyToInvoice[$orderItem->getParentItemId()])) {
-+                    $orderItemsQtyToInvoice[$orderItem->getId()] =
-+                        $orderItemsQtyToInvoice[$orderItem->getParentItemId()];
-+                }
-             }
--            if ($orderItem->isDummy()) {
--                if ($orderItem->getHasChildren()) {
--                    foreach ($orderItem->getChildrenItems() as $child) {
--                        if (!isset($qtys[$child->getId()])) {
--                            $qtys[$child->getId()] = $child->getQtyToInvoice();
--                        }
--                    }
--                } elseif ($orderItem->getParentItem()) {
--                    $parent = $orderItem->getParentItem();
--                    if (!isset($qtys[$parent->getId()])) {
--                        $qtys[$parent->getId()] = $parent->getQtyToInvoice();
--                    }
-+        }
-+
-+        return $orderItemsQtyToInvoice;
-+    }
-+
-+    /**
-+     * Sets qty to invoice for children order items, if not set.
-+     *
-+     * @param OrderItemInterface $parentOrderItem
-+     * @param array $orderItemsQtyToInvoice
-+     * @return array
-+     */
-+    private function setChildItemsQtyToInvoice(
-+        OrderItemInterface $parentOrderItem,
-+        array $orderItemsQtyToInvoice
-+    ): array {
-+        /** @var OrderItemInterface $childOrderItem */
-+        foreach ($parentOrderItem->getChildrenItems() as $childOrderItem) {
-+            if (!isset($orderItemsQtyToInvoice[$childOrderItem->getItemId()])) {
-+                $productOptions = $childOrderItem->getProductOptions();
-+
-+                if (isset($productOptions['bundle_selection_attributes'])) {
-+                    $bundleSelectionAttributes = $this->serializer
-+                        ->unserialize($productOptions['bundle_selection_attributes']);
-+                    $orderItemsQtyToInvoice[$childOrderItem->getItemId()] =
-+                        $bundleSelectionAttributes['qty'] * $orderItemsQtyToInvoice[$parentOrderItem->getItemId()];
-                 }
-             }
-         }
- 
--        return $qtys;
-+        return $orderItemsQtyToInvoice;
-     }
- 
-     /**
--     * Check if order item can be invoiced. Dummy item can be invoiced or with his children or
--     * with parent item which is included to invoice
-+     * Check if order item can be invoiced.
-      *
--     * @param \Magento\Sales\Api\Data\OrderItemInterface $item
-+     * @param OrderItemInterface $item
-+     * @param array $qtys
-      * @return bool
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
--    protected function _canInvoiceItem(\Magento\Sales\Api\Data\OrderItemInterface $item)
-+    private function canInvoiceItem(OrderItemInterface $item, array $qtys): bool
-     {
--        $qtys = [];
-         if ($item->getLockedDoInvoice()) {
-             return false;
-         }
-@@ -233,14 +277,14 @@ class InvoiceService implements InvoiceManagementInterface
-     }
- 
-     /**
--     * Set quantity to invoice item
-+     * Set quantity to invoice item.
-      *
--     * @param \Magento\Sales\Api\Data\InvoiceItemInterface $item
-+     * @param InvoiceItemInterface $item
-      * @param float $qty
--     * @return $this
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @return InvoiceManagementInterface
-+     * @throws LocalizedException
-      */
--    protected function setInvoiceItemQuantity(\Magento\Sales\Api\Data\InvoiceItemInterface $item, $qty)
-+    private function setInvoiceItemQuantity(InvoiceItemInterface $item, float $qty): InvoiceManagementInterface
-     {
-         $qty = ($item->getOrderItem()->getIsQtyDecimal()) ? (double) $qty : (int) $qty;
-         $qty = $qty > 0 ? $qty : 0;
-@@ -251,7 +295,7 @@ class InvoiceService implements InvoiceManagementInterface
-         $qtyToInvoice = sprintf("%F", $item->getOrderItem()->getQtyToInvoice());
-         $qty = sprintf("%F", $qty);
-         if ($qty > $qtyToInvoice && !$item->getOrderItem()->isDummy()) {
--            throw new \Magento\Framework\Exception\LocalizedException(
-+            throw new LocalizedException(
-                 __('We found an invalid quantity to invoice item "%1".', $item->getName())
-             );
-         }
-diff --git a/app/code/Magento/Sales/Model/Service/OrderService.php b/app/code/Magento/Sales/Model/Service/OrderService.php
-index e4a71f028cc..2e062caca9a 100644
---- a/app/code/Magento/Sales/Model/Service/OrderService.php
-+++ b/app/code/Magento/Sales/Model/Service/OrderService.php
-@@ -7,6 +7,7 @@ namespace Magento\Sales\Model\Service;
- 
- use Magento\Sales\Api\OrderManagementInterface;
- use Magento\Payment\Gateway\Command\CommandException;
-+use Psr\Log\LoggerInterface;
- 
- /**
-  * Class OrderService
-@@ -55,6 +56,11 @@ class OrderService implements OrderManagementInterface
-      */
-     private $paymentFailures;
- 
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-     /**
-      * Constructor
-      *
-@@ -65,7 +71,8 @@ class OrderService implements OrderManagementInterface
-      * @param \Magento\Sales\Model\OrderNotifier $notifier
-      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-      * @param \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender $orderCommentSender
--     * @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures
-+     * @param \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures
-+     * @param LoggerInterface $logger
-      */
-     public function __construct(
-         \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
-@@ -75,7 +82,8 @@ class OrderService implements OrderManagementInterface
-         \Magento\Sales\Model\OrderNotifier $notifier,
-         \Magento\Framework\Event\ManagerInterface $eventManager,
-         \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender $orderCommentSender,
--        \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null
-+        \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures,
-+        LoggerInterface $logger
-     ) {
-         $this->orderRepository = $orderRepository;
-         $this->historyRepository = $historyRepository;
-@@ -84,8 +92,8 @@ class OrderService implements OrderManagementInterface
-         $this->notifier = $notifier;
-         $this->eventManager = $eventManager;
-         $this->orderCommentSender = $orderCommentSender;
--        $this->paymentFailures = $paymentFailures ? : \Magento\Framework\App\ObjectManager::getInstance()
--            ->get(\Magento\Sales\Api\PaymentFailuresInterface::class);
-+        $this->paymentFailures = $paymentFailures;
-+        $this->logger = $logger;
-     }
- 
-     /**
-@@ -189,25 +197,31 @@ class OrderService implements OrderManagementInterface
-     }
- 
-     /**
-+     * Perform place order.
-+     *
-      * @param \Magento\Sales\Api\Data\OrderInterface $order
-      * @return \Magento\Sales\Api\Data\OrderInterface
-      * @throws \Exception
-      */
-     public function place(\Magento\Sales\Api\Data\OrderInterface $order)
-     {
--        // transaction will be here
--        //begin transaction
-         try {
-             $order->place();
--            return $this->orderRepository->save($order);
--            //commit
-+        } catch (CommandException $e) {
-+            $this->paymentFailures->handle((int)$order->getQuoteId(), __($e->getMessage()));
-+            throw $e;
-+        }
-+
-+        try {
-+            $order = $this->orderRepository->save($order);
-         } catch (\Exception $e) {
--            if ($e instanceof CommandException) {
--                $this->paymentFailures->handle((int)$order->getQuoteId(), __($e->getMessage()));
--            }
-+            $this->logger->critical(
-+                'Saving order ' . $order->getIncrementId() . ' failed: ' . $e->getMessage()
-+            );
-             throw $e;
--            //rollback;
-         }
-+
-+        return $order;
-     }
- 
-     /**
-diff --git a/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php b/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php
-index 3a49bbce256..a698276332a 100644
---- a/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php
-+++ b/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php
-@@ -9,6 +9,7 @@ namespace Magento\Sales\Model\Service;
- 
- use Magento\Backend\App\Area\FrontNameResolver;
- use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Mail\Template\TransportBuilder;
- use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
- use Magento\Framework\Translate\Inline\StateInterface;
-@@ -17,11 +18,14 @@ use Magento\Quote\Api\Data\CartInterface as Quote;
- use Magento\Sales\Api\PaymentFailuresInterface;
- use Magento\Store\Model\ScopeInterface;
- use Magento\Store\Model\Store;
-+use Psr\Log\LoggerInterface;
- 
- /**
-  * Service is responsible for handling failed payment transactions.
-  *
-  * It depends on Stores > Configuration > Sales > Checkout > Payment Failed Emails configuration.
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class PaymentFailuresService implements PaymentFailuresInterface
- {
-@@ -52,25 +56,33 @@ class PaymentFailuresService implements PaymentFailuresInterface
-      */
-     private $cartRepository;
- 
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-     /**
-      * @param ScopeConfigInterface $scopeConfig
-      * @param StateInterface $inlineTranslation
-      * @param TransportBuilder $transportBuilder
-      * @param TimezoneInterface $localeDate
-      * @param CartRepositoryInterface $cartRepository
-+     * @param LoggerInterface|null $logger
-      */
-     public function __construct(
-         ScopeConfigInterface $scopeConfig,
-         StateInterface $inlineTranslation,
-         TransportBuilder $transportBuilder,
-         TimezoneInterface $localeDate,
--        CartRepositoryInterface $cartRepository
-+        CartRepositoryInterface $cartRepository,
-+        LoggerInterface $logger = null
-     ) {
-         $this->scopeConfig = $scopeConfig;
-         $this->inlineTranslation = $inlineTranslation;
-         $this->transportBuilder = $transportBuilder;
-         $this->localeDate = $localeDate;
-         $this->cartRepository = $cartRepository;
-+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
-     }
- 
-     /**
-@@ -128,7 +140,11 @@ class PaymentFailuresService implements PaymentFailuresInterface
-                 ->addBcc($bcc)
-                 ->getTransport();
- 
--            $transport->sendMessage();
-+            try {
-+                $transport->sendMessage();
-+            } catch (\Exception $e) {
-+                $this->logger->critical($e->getMessage());
-+            }
-         }
- 
-         $this->inlineTranslation->resume();
-diff --git a/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php b/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php
-index cade86d18e9..5883bde1751 100644
---- a/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php
-+++ b/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php
-@@ -31,7 +31,7 @@ class AssignOrderToCustomerObserver implements ObserverInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function execute(Observer $observer)
-     {
-@@ -44,9 +44,16 @@ class AssignOrderToCustomerObserver implements ObserverInterface
-             $orderId = $delegateData['__sales_assign_order_id'];
-             $order = $this->orderRepository->get($orderId);
-             if (!$order->getCustomerId()) {
--                //if customer ID wasn't already assigned then assigning.
--                $order->setCustomerId($customer->getId());
--                $order->setCustomerIsGuest(0);
-+                //assign customer info to order after customer creation.
-+                $order->setCustomerId($customer->getId())
-+                    ->setCustomerIsGuest(0)
-+                    ->setCustomerEmail($customer->getEmail())
-+                    ->setCustomerFirstname($customer->getFirstname())
-+                    ->setCustomerLastname($customer->getLastname())
-+                    ->setCustomerMiddlename($customer->getMiddlename())
-+                    ->setCustomerPrefix($customer->getPrefix())
-+                    ->setCustomerSuffix($customer->getSuffix())
-+                    ->setCustomerGroupId($customer->getGroupId());
-                 $this->orderRepository->save($order);
-             }
-         }
-diff --git a/app/code/Magento/Sales/Plugin/ShippingLabelConverter.php b/app/code/Magento/Sales/Plugin/ShippingLabelConverter.php
-new file mode 100644
-index 00000000000..bfd426ddad5
---- /dev/null
-+++ b/app/code/Magento/Sales/Plugin/ShippingLabelConverter.php
-@@ -0,0 +1,55 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Plugin;
-+
-+/**
-+ * Plugin to convert shipping label from blob to base64encoded string
-+ */
-+class ShippingLabelConverter
-+{
-+    /**
-+     * Convert shipping label from blob to base64encoded string
-+     *
-+     * @param \Magento\Sales\Api\ShipmentRepositoryInterface $shipmentRepository
-+     * @param \Magento\Sales\Api\Data\ShipmentSearchResultInterface $searchResult
-+     * @return \Magento\Sales\Api\Data\ShipmentSearchResultInterface
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterGetList(
-+        \Magento\Sales\Api\ShipmentRepositoryInterface $shipmentRepository,
-+        \Magento\Sales\Api\Data\ShipmentSearchResultInterface $searchResult
-+    ) {
-+        /** @var \Magento\Sales\Model\Order\Shipment $item */
-+        foreach ($searchResult->getItems() as $item) {
-+            if ($item->getShippingLabel() !== null) {
-+                $item->setShippingLabel(base64_encode($item->getShippingLabel()));
-+            }
-+        }
-+        return $searchResult;
-+    }
-+
-+    /**
-+     * Convert shipping label from blob to base64encoded string
-+     *
-+     * @param \Magento\Sales\Api\ShipmentRepositoryInterface $shipmentRepository
-+     * @param \Magento\Sales\Api\Data\ShipmentInterface $shipment
-+     * @return \Magento\Sales\Api\Data\ShipmentInterface
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterGet(
-+        \Magento\Sales\Api\ShipmentRepositoryInterface $shipmentRepository,
-+        \Magento\Sales\Api\Data\ShipmentInterface $shipment
-+    ) {
-+        if ($shipment->getShippingLabel() !== null) {
-+            $shipment->setShippingLabel(base64_encode($shipment->getShippingLabel()));
-+        }
-+        return $shipment;
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
-index d3e13334bb3..a75690536e7 100644
---- a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
-+++ b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
-@@ -8,26 +8,22 @@ namespace Magento\Sales\Setup\Patch\Data;
- 
- use Magento\Eav\Model\Config;
- use Magento\Framework\App\State;
--use Magento\Quote\Model\QuoteFactory;
--use Magento\Sales\Model\OrderFactory;
--use Magento\Sales\Model\ResourceModel\Order\Address\CollectionFactory as AddressCollectionFactory;
--use Magento\Framework\App\ResourceConnection;
--use Magento\Sales\Setup\SalesSetupFactory;
-+use Magento\Framework\Setup\ModuleDataSetupInterface;
- use Magento\Framework\Setup\Patch\DataPatchInterface;
- use Magento\Framework\Setup\Patch\PatchVersionInterface;
-+use Magento\Sales\Model\Order\Address;
-+use Magento\Sales\Setup\SalesSetupFactory;
- 
-+/**
-+ * Fills quote_address_id in table sales_order_address if it is empty.
-+ */
- class FillQuoteAddressIdInSalesOrderAddress implements DataPatchInterface, PatchVersionInterface
- {
-     /**
--     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
-+     * @var ModuleDataSetupInterface
-      */
-     private $moduleDataSetup;
- 
--    /**
--     * @var SalesSetupFactory
--     */
--    private $salesSetupFactory;
--
-     /**
-      * @var State
-      */
-@@ -39,86 +35,46 @@ class FillQuoteAddressIdInSalesOrderAddress implements DataPatchInterface, Patch
-     private $eavConfig;
- 
-     /**
--     * @var AddressCollectionFactory
--     */
--    private $addressCollectionFactory;
--
--    /**
--     * @var OrderFactory
--     */
--    private $orderFactory;
--
--    /**
--     * @var QuoteFactory
--     */
--    private $quoteFactory;
--
--    /**
--     * PatchInitial constructor.
--     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
-+     * @param ModuleDataSetupInterface $moduleDataSetup
-+     * @param State $state
-+     * @param Config $eavConfig
-      */
-     public function __construct(
--        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
--        SalesSetupFactory $salesSetupFactory,
-+        ModuleDataSetupInterface $moduleDataSetup,
-         State $state,
--        Config $eavConfig,
--        AddressCollectionFactory $addressCollectionFactory,
--        OrderFactory $orderFactory,
--        QuoteFactory $quoteFactory
-+        Config $eavConfig
-     ) {
-         $this->moduleDataSetup = $moduleDataSetup;
--        $this->salesSetupFactory = $salesSetupFactory;
-         $this->state = $state;
-         $this->eavConfig = $eavConfig;
--        $this->addressCollectionFactory = $addressCollectionFactory;
--        $this->orderFactory = $orderFactory;
--        $this->quoteFactory = $quoteFactory;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function apply()
-     {
-         $this->state->emulateAreaCode(
-             \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
--            [$this, 'fillQuoteAddressIdInSalesOrderAddress']
-+            [$this, 'fillQuoteAddressIdInSalesOrderAddress'],
-+            [$this->moduleDataSetup]
-         );
-         $this->eavConfig->clear();
-     }
- 
-     /**
-      * Fill quote_address_id in table sales_order_address if it is empty.
-+     *
-+     * @param ModuleDataSetupInterface $setup
-      */
--    public function fillQuoteAddressIdInSalesOrderAddress()
-+    public function fillQuoteAddressIdInSalesOrderAddress(ModuleDataSetupInterface $setup)
-     {
--        $addressCollection = $this->addressCollectionFactory->create();
--        $addressCollection->addFieldToFilter('quote_address_id', ['null' => true]);
--
--        /** @var \Magento\Sales\Model\Order\Address $orderAddress */
--        foreach ($addressCollection as $orderAddress) {
--            $orderId = $orderAddress->getParentId();
--            $addressType = $orderAddress->getAddressType();
--
--            /** @var \Magento\Sales\Model\Order $order */
--            $order = $this->orderFactory->create()->load($orderId);
--            $quoteId = $order->getQuoteId();
--            $quote = $this->quoteFactory->create()->load($quoteId);
--
--            if ($addressType == \Magento\Sales\Model\Order\Address::TYPE_SHIPPING) {
--                $quoteAddressId = $quote->getShippingAddress()->getId();
--                $orderAddress->setData('quote_address_id', $quoteAddressId);
--            } elseif ($addressType == \Magento\Sales\Model\Order\Address::TYPE_BILLING) {
--                $quoteAddressId = $quote->getBillingAddress()->getId();
--                $orderAddress->setData('quote_address_id', $quoteAddressId);
--            }
--
--            $orderAddress->save();
--        }
-+        $this->fillQuoteAddressIdInSalesOrderAddressByType($setup, Address::TYPE_SHIPPING);
-+        $this->fillQuoteAddressIdInSalesOrderAddressByType($setup, Address::TYPE_BILLING);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getDependencies()
-     {
-@@ -128,7 +84,7 @@ class FillQuoteAddressIdInSalesOrderAddress implements DataPatchInterface, Patch
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getVersion()
-     {
-@@ -136,10 +92,99 @@ class FillQuoteAddressIdInSalesOrderAddress implements DataPatchInterface, Patch
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAliases()
-     {
-         return [];
-     }
-+
-+    /**
-+     * Fill quote_address_id in sales_order_address by type.
-+     *
-+     * @param ModuleDataSetupInterface $setup
-+     * @param string $addressType
-+     * @throws \Zend_Db_Statement_Exception
-+     */
-+    private function fillQuoteAddressIdInSalesOrderAddressByType(ModuleDataSetupInterface $setup, $addressType)
-+    {
-+        $salesConnection = $setup->getConnection('sales');
-+
-+        $orderTable = $setup->getTable('sales_order', 'sales');
-+        $orderAddressTable = $setup->getTable('sales_order_address', 'sales');
-+
-+        $query = $salesConnection
-+            ->select()
-+            ->from(
-+                ['sales_order_address' => $orderAddressTable],
-+                ['entity_id', 'address_type']
-+            )
-+            ->joinInner(
-+                ['sales_order' => $orderTable],
-+                'sales_order_address.parent_id = sales_order.entity_id',
-+                ['quote_id' => 'sales_order.quote_id']
-+            )
-+            ->where('sales_order_address.quote_address_id IS NULL')
-+            ->where('sales_order_address.address_type = ?', $addressType)
-+            ->order('sales_order_address.entity_id');
-+
-+        $batchSize = 5000;
-+        $result = $salesConnection->query($query);
-+        $count = $result->rowCount();
-+        $batches = ceil($count / $batchSize);
-+
-+        for ($batch = $batches; $batch > 0; $batch--) {
-+            $query->limitPage($batch, $batchSize);
-+            $result = $salesConnection->fetchAssoc($query);
-+
-+            $this->fillQuoteAddressIdInSalesOrderAddressProcessBatch($setup, $result, $addressType);
-+        }
-+    }
-+
-+    /**
-+     * Process filling quote_address_id in sales_order_address in batch.
-+     *
-+     * @param ModuleDataSetupInterface $setup
-+     * @param array $orderAddresses
-+     * @param string $addressType
-+     */
-+    private function fillQuoteAddressIdInSalesOrderAddressProcessBatch(
-+        ModuleDataSetupInterface $setup,
-+        array $orderAddresses,
-+        $addressType
-+    ) {
-+        $salesConnection = $setup->getConnection('sales');
-+        $quoteConnection = $setup->getConnection('checkout');
-+
-+        $quoteAddressTable = $setup->getTable('quote_address', 'checkout');
-+        $quoteTable = $setup->getTable('quote', 'checkout');
-+        $salesOrderAddressTable = $setup->getTable('sales_order_address', 'sales');
-+
-+        $query = $quoteConnection
-+            ->select()
-+            ->from(
-+                ['quote_address' => $quoteAddressTable],
-+                ['quote_id', 'address_id']
-+            )
-+            ->joinInner(
-+                ['quote' => $quoteTable],
-+                'quote_address.quote_id = quote.entity_id',
-+                []
-+            )
-+            ->where('quote.entity_id in (?)', array_column($orderAddresses, 'quote_id'))
-+            ->where('address_type = ?', $addressType);
-+
-+        $quoteAddresses = $quoteConnection->fetchAssoc($query);
-+
-+        foreach ($orderAddresses as $orderAddress) {
-+            $bind = [
-+                'quote_address_id' => $quoteAddresses[$orderAddress['quote_id']]['address_id'] ?? null,
-+            ];
-+            $where = [
-+                'entity_id = ?' => $orderAddress['entity_id']
-+            ];
-+
-+            $salesConnection->update($salesOrderAddressTable, $bind, $where);
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminApplyCouponToOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminApplyCouponToOrderActionGroup.xml
-new file mode 100644
-index 00000000000..72ab22f80fa
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminApplyCouponToOrderActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminApplyCouponToOrderActionGroup">
-+        <arguments>
-+            <argument name="couponCode" type="string"/>
-+        </arguments>
-+        <fillField selector="{{AdminOrderFormItemsSection.couponCode}}" userInput="{{couponCode}}" stepKey="fillCouponCode"/>
-+        <click selector="{{AdminOrderFormItemsSection.applyCoupon}}" stepKey="applyCoupon"/>
-+        <waitForPageLoad stepKey="waitForApplyingCoupon"/>
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The coupon code has been accepted." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertProductQtyInGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertProductQtyInGridActionGroup.xml
-new file mode 100644
-index 00000000000..344da8ed5c4
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertProductQtyInGridActionGroup.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAssertProductQtyInGridActionGroup">
-+        <arguments>
-+            <argument name="productSku" type="string"/>
-+            <argument name="expectedQty" type="string"/>
-+        </arguments>
-+        <!-- Assert product Qty decreased after CreditMemo -->
-+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="onProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
-+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openOrderGridFilters"/>
-+        <waitForPageLoad stepKey="waitForFilter"/>
-+        <fillField userInput="{{productSku}}"  selector="{{AdminProductGridFilterSection.skuFilter}}"  stepKey="fillOrderIdFilter"/>
-+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
-+        <see userInput="{{expectedQty}}" stepKey="assertQtyDecreased"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertRefundInRefundsGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertRefundInRefundsGridActionGroup.xml
-new file mode 100644
-index 00000000000..b7de4ddd5ba
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertRefundInRefundsGridActionGroup.xml
-@@ -0,0 +1,37 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAssertRefundInRefundsGridActionGroup">
-+        <arguments>
-+            <argument name="orderId" type="string"/>
-+            <argument name="memoId" type="string"/>
-+            <argument name="refundStatus" type="string"/>
-+            <argument name="refundedTotal" type="string"/>
-+        </arguments>
-+        <!--Assert refund in refunds grid-->
-+        <amOnPage url="{{AdminCreditMemosGridPage.url}}" stepKey="onCreditMemosGrid"/>
-+        <waitForPageLoad stepKey="waitForLoadingPage"/>
-+        <conditionalClick selector="{{AdminCreditMemosGridSection.clearFilters}}" dependentSelector="{{AdminCreditMemosGridSection.clearFilters}}" visible="true" stepKey="clearFilter"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForFilterLoad"/>
-+        <click selector="{{AdminCreditMemosGridSection.buttonFilters}}" stepKey="openFilterSearch"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForFilterFields"/>
-+        <fillField userInput="{{memoId}}" selector="{{AdminCreditMemosGridSection.fieldCreditMemo}}" stepKey="fillSearchByCreditMemoId"/>
-+        <fillField userInput="{{orderId}}" selector="{{AdminCreditMemosGridSection.fieldOrder}}" stepKey="fillSearchByOrderId"/>
-+        <fillField userInput="{{refundedTotal}}" selector="{{AdminCreditMemosGridSection.fieldRefundFrom}}" stepKey="fillRefundedFrom"/>
-+        <fillField userInput="{{refundedTotal}}" selector="{{AdminCreditMemosGridSection.fieldRefundTo}}" stepKey="fillRefundedTo"/>
-+        <click selector="{{AdminCreditMemosGridSection.applyFilter}}" stepKey="clickSearchButton"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForSearchResult"/>
-+        <see userInput="{{memoId}}" selector="{{AdminCreditMemosGridSection.rowCreditMemos}}" stepKey="seeMemoID"/>
-+        <see userInput="{{orderId}}" selector="{{AdminCreditMemosGridSection.rowCreditMemos}}" stepKey="seeOrderID"/>
-+        <see userInput="{{refundStatus}}" selector="{{AdminCreditMemosGridSection.rowCreditMemos}}" stepKey="seeStatus"/>
-+        <see userInput="{{refundedTotal}}" selector="{{AdminCreditMemosGridSection.rowCreditMemos}}" stepKey="refundedPrice"/>
-+    </actionGroup>
-+</actionGroups>
-+
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertRefundOrderStatusInCommentsHistoryActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertRefundOrderStatusInCommentsHistoryActionGroup.xml
-new file mode 100644
-index 00000000000..bb81fbdf5a3
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertRefundOrderStatusInCommentsHistoryActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAssertRefundOrderStatusCommentsHistoryActionGroup">
-+        <arguments>
-+            <argument name="orderStatus" type="string"/>
-+            <argument name="refundMessage" type="string"/>
-+        </arguments>
-+        <!-- Assert refund order status in Comments History -->
-+        <click selector="{{AdminOrderDetailsOrderViewSection.commentsHistory}}" stepKey="clickOnTabCommentsHistory"/>
-+        <waitForPageLoad stepKey="waitForComments"/>
-+        <see userInput="{{orderStatus}}" selector="{{ViewOrderSection.orderStatus}}" stepKey="assertRefundOrderStatusInCommentsHistory"/>
-+        <see userInput="{{refundMessage}}" selector="{{ViewOrderSection.capturedAmountTextUnsubmitted}}" stepKey="assertOrderStatus"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreateInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreateInvoiceActionGroup.xml
-new file mode 100644
-index 00000000000..416d3f488dd
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreateInvoiceActionGroup.xml
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateInvoiceActionGroup">
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
-+        <waitForPageLoad stepKey="waitForInvoicePage"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="submitInvoice"/>
-+        <waitForPageLoad stepKey="waitForLoadPage"/>
-+        <see userInput="The invoice has been created." stepKey="seeMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AdminCreateInvoiceAndShipmentActionGroup" extends="AdminCreateInvoiceActionGroup">
-+        <checkOption selector="{{AdminInvoicePaymentShippingSection.CreateShipment}}" stepKey="checkCreateShipment" after="waitForInvoicePage"/>
-+        <see userInput="You created the invoice and shipment." stepKey="seeMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AdminCreateInvoiceAndCreditMemoActionGroup" extends="AdminCreateInvoiceActionGroup">
-+        <click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="pushButtonCreditMemo" after="seeMessage"/>
-+        <waitForPageLoad stepKey="waitForLoadingCreditMemoPage" after="pushButtonCreditMemo"/>
-+        <scrollTo selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="scrollToBottom" after="waitForLoadingCreditMemoPage"/>
-+        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickSubmitRefund" after="scrollToBottom"/>
-+        <waitForPageLoad stepKey="waitForMainOrderPageLoad" after="clickSubmitRefund"/>
-+        <see userInput="You created the credit memo." stepKey="seeCreditMemoMessage" after="waitForMainOrderPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml
-index 2a9ef0c9483..58c7752626c 100644
---- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Check customer information is correct in credit memo-->
-     <actionGroup name="verifyBasicCreditMemoInformation">
-         <arguments>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
-index f17d3462d06..8e6cae2583f 100644
---- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Check customer information is correct in invoice-->
-     <actionGroup name="verifyBasicInvoiceInformation">
-         <arguments>
-@@ -19,18 +19,15 @@
-         <see selector="{{AdminInvoiceOrderInformationSection.customerName}}" userInput="{{customer.firstname}}" stepKey="seeCustomerName"/>
-         <see selector="{{AdminInvoiceOrderInformationSection.customerEmail}}" userInput="{{customer.email}}" stepKey="seeCustomerEmail"/>
-         <see selector="{{AdminInvoiceOrderInformationSection.customerGroup}}" userInput="{{customerGroup.code}}" stepKey="seeCustomerGroup"/>
--
-         <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.street[0]}}" stepKey="seeBillingAddressStreet"/>
-         <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.city}}" stepKey="seeBillingAddressCity"/>
-         <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.country_id}}" stepKey="seeBillingAddressCountry"/>
-         <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.postcode}}" stepKey="seeBillingAddressPostcode"/>
--
-         <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.street[0]}}" stepKey="seeShippingAddressStreet"/>
-         <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.city}}" stepKey="seeShippingAddressCity"/>
-         <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.country_id}}" stepKey="seeShippingAddressCountry"/>
-         <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.postcode}}" stepKey="seeShippingAddressPostcode"/>
-     </actionGroup>
--
-     <!--Check that product is in invoice items-->
-     <actionGroup name="seeProductInInvoiceItems">
-         <arguments>
-@@ -38,4 +35,57 @@
-         </arguments>
-         <see selector="{{AdminInvoiceItemsSection.skuColumn}}" userInput="{{product.sku}}" stepKey="seeProductSkuInGrid"/>
-     </actionGroup>
-+    <!--Admin Fast Create Invoice-->
-+    <actionGroup name="adminFastCreateInvoice">
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
-+        <waitForPageLoad stepKey="waitForNewInvoicePageLoad"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
-+        <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />
-+        <conditionalClick selector="{{AdminOrderInvoicesTabSection.clearFilters}}" dependentSelector="{{AdminOrderInvoicesTabSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
-+        <click selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="openInvoicePage"/>
-+        <waitForPageLoad stepKey="waitForInvoicePageLoad"/>
-+    </actionGroup>
-+    <actionGroup name="clearInvoicesGridFilters">
-+        <amOnPage url="{{AdminInvoicesPage.url}}" stepKey="goToInvoices"/>
-+        <waitForPageLoad stepKey="waitInvoicesGridToLoad"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFilters" />
-+        <waitForPageLoad stepKey="waitInvoicesGrid"/>
-+    </actionGroup>
-+    <actionGroup name="goToInvoiceIntoOrder">
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
-+        <seeInCurrentUrl url="{{AdminInvoiceNewPage.url}}" stepKey="seeOrderInvoiceUrl"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage"/>
-+    </actionGroup>
-+    <actionGroup name="StartCreateInvoiceFromOrderPage">
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
-+        <seeInCurrentUrl url="{{AdminInvoiceNewPage.url}}" stepKey="seeNewInvoiceUrl"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoicePageTitle"/>
-+    </actionGroup>
-+    <actionGroup name="SubmitInvoice">
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
-+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
-+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" stepKey="seeViewOrderPageInvoice"/>
-+    </actionGroup>
-+    <!--Filter invoices by order id -->
-+    <actionGroup name="filterInvoiceGridByOrderId">
-+        <arguments>
-+            <argument name="orderId" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminInvoicesPage.url}}" stepKey="goToInvoices"/>
-+        <click selector="{{AdminInvoicesGridSection.filter}}" stepKey="clickFilter"/>
-+        <fillField selector="{{AdminInvoicesFiltersSection.orderNum}}" userInput="{{orderId}}" stepKey="fillOrderIdForFilter"/>
-+        <click selector="{{AdminInvoicesFiltersSection.applyFilters}}" stepKey="clickApplyFilters"/>
-+        <waitForPageLoad stepKey="waitForFiltersApply"/>
-+    </actionGroup>
-+
-+    <actionGroup name="FilterInvoiceGridByOrderIdWithCleanFiltersActionGroup" extends="filterInvoiceGridByOrderId">
-+        <arguments>
-+            <argument name="orderId" type="string"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminInvoicesGridSection.clearFilters}}" dependentSelector="{{AdminInvoicesGridSection.clearFilters}}" visible="true" stepKey="clearFilters" after="goToInvoices"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenAndFillCreditMemoRefundActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenAndFillCreditMemoRefundActionGroup.xml
-new file mode 100644
-index 00000000000..befed51945e
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenAndFillCreditMemoRefundActionGroup.xml
-@@ -0,0 +1,38 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenAndFillCreditMemoRefundActionGroup">
-+        <arguments>
-+            <argument name="itemQtyToRefund" type="string" defaultValue="1"/>
-+            <argument name="shippingRefund" type="string" />
-+            <argument name="adjustmentRefund" type="string" defaultValue="0"/>
-+            <argument name="adjustmentFee" type="string" defaultValue="0"/>
-+            <argument name="rowNumber" type="string" defaultValue="1"/>
-+        </arguments>
-+        <!-- Click 'Credit Memo' button -->
-+        <click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreateCreditMemo"/>
-+        <seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeNewCreditMemoPage"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoInPageTitle"/>
-+        <!-- Fill data from dataset: refund -->
-+        <scrollTo selector="{{AdminCreditMemoItemsSection.header}}" stepKey="scrollToItemsToRefund"/>
-+        <fillField selector="{{AdminCreditMemoItemsSection.itemQtyToRefund(rowNumber)}}" userInput="{{itemQtyToRefund}}" stepKey="fillQtyToRefund"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForActivateButton"/>
-+        <click selector="{{AdminCreditMemoItemsSection.updateQty}}" stepKey="clickUpdateButton"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForUpdate"/>
-+        <fillField userInput="{{shippingRefund}}" selector="{{AdminCreditMemoTotalSection.refundShipping}}" stepKey="fillShipping"/>
-+        <fillField userInput="{{adjustmentRefund}}" selector="{{AdminCreditMemoTotalSection.adjustmentRefund}}" stepKey="fillAdjustmentRefund"/>
-+        <fillField userInput="{{adjustmentFee}}" selector="{{AdminCreditMemoTotalSection.adjustmentFee}}" stepKey="fillAdjustmentFee"/>
-+        <checkOption selector="{{AdminCreditMemoTotalSection.emailCopy}}" stepKey="checkSendEmailCopy"/>
-+    </actionGroup>
-+    <!-- Open and fill CreditMemo refund with back to stock -->
-+    <actionGroup name="AdminOpenAndFillCreditMemoRefundAndBackToStockActionGroup" extends="AdminOpenAndFillCreditMemoRefundActionGroup">
-+        <checkOption selector="{{AdminCreditMemoItemsSection.itemReturnToStock(rowNumber)}}" stepKey="backToStock" after="scrollToItemsToRefund"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
-index 7ce10d5e542..bf04d88fcb8 100644
---- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Navigate to create order page (New Order -> Create New Customer)-->
-     <actionGroup name="navigateToNewOrderPageNewCustomer">
-         <arguments>
-@@ -18,7 +18,21 @@
-         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
-         <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
-         <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
--        <click selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" stepKey="selectDefaultStoreView"/>
-+        <conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" visible="true" stepKey="selectStoreViewIfAppears"/>
-+        <waitForPageLoad stepKey="waitForCreateOrderPageLoadAfterStoreSelect" />
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
-+    </actionGroup>
-+
-+    <!--Navigate to create order page (New Order -> Create New Customer)-->
-+    <actionGroup name="navigateToNewOrderPageNewCustomerSingleStore">
-+        <arguments>
-+            <argument name="storeView" defaultValue="_defaultStore"/>
-+        </arguments>
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
-+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
-+        <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
-+        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
-         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
-     </actionGroup>
- 
-@@ -26,20 +40,35 @@
-     <actionGroup name="navigateToNewOrderPageExistingCustomer">
-         <arguments>
-             <argument name="customer"/>
-+            <argument name="storeView" defaultValue="_defaultStore"/>
-         </arguments>
-         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
-         <waitForPageLoad stepKey="waitForIndexPageLoad"/>
-         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
-         <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
-         <waitForPageLoad stepKey="waitForCustomerGridLoad"/>
-+        <!--Clear grid filters-->
-+        <conditionalClick selector="{{AdminOrderCustomersGridSection.resetButton}}" dependentSelector="{{AdminOrderCustomersGridSection.resetButton}}" visible="true" stepKey="clearExistingCustomerFilters"/>
-         <fillField userInput="{{customer.email}}" selector="{{AdminOrderCustomersGridSection.emailInput}}" stepKey="filterEmail"/>
-         <click selector="{{AdminOrderCustomersGridSection.apply}}" stepKey="applyFilter"/>
-         <waitForPageLoad stepKey="waitForFilteredCustomerGridLoad"/>
-         <click selector="{{AdminOrderCustomersGridSection.firstRow}}" stepKey="clickOnCustomer"/>
-         <waitForPageLoad stepKey="waitForCreateOrderPageLoad" />
-+        <!-- Select store view if appears -->
-+        <conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" visible="true" stepKey="selectStoreViewIfAppears"/>
-+        <waitForPageLoad stepKey="waitForCreateOrderPageLoadAfterStoreSelect" />
-         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
-     </actionGroup>
- 
-+    <!--Navigate to New Order Page for existing Customer And Store-->
-+    <actionGroup name="NavigateToNewOrderPageExistingCustomerAndStoreActionGroup" extends="navigateToNewOrderPageExistingCustomer" >
-+        <arguments>
-+            <argument name="storeView" defaultValue="_defaultStore"/>
-+        </arguments>
-+        <click selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" stepKey="selectStoreView" after="waitForCreateOrderPageLoad"/>
-+        <waitForPageLoad stepKey="waitForLoad" after="selectStoreView"/>
-+    </actionGroup>
-+
-     <!--Check the required fields are actually required-->
-     <actionGroup name="checkRequiredFieldsNewOrderForm">
-         <seeElement selector="{{AdminOrderFormAccountSection.requiredGroup}}" stepKey="seeCustomerGroupRequired"/>
-@@ -69,16 +98,26 @@
-     <!--Add a simple product to order-->
-     <actionGroup name="addSimpleProductToOrder">
-         <arguments>
--            <argument name="product" defaultValue="_defaultProduct"/>
-+            <argument name="product" defaultValue="_defaultProduct" type="entity"/>
-+            <argument name="productQty" defaultValue="1" type="string"/>
-         </arguments>
-         <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
-         <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillSkuFilter"/>
-         <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearch"/>
-         <scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/>
-         <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectProduct"/>
--        <fillField selector="{{AdminOrderFormItemsSection.rowQty('1')}}" userInput="1" stepKey="fillProductQty"/>
-+        <fillField selector="{{AdminOrderFormItemsSection.rowQty('1')}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
-         <scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
-         <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
-+        <wait time="5" stepKey="waitForOptionsToLoad"/>
-+    </actionGroup>
-+
-+    <actionGroup name="AddSimpleProductWithQtyToOrderActionGroup" extends="addSimpleProductToOrder">
-+        <arguments>
-+            <argument name="product" defaultValue="_defaultProduct" type="entity"/>
-+            <argument name="productQty" type="string"/>
-+        </arguments>
-+        <fillField selector="{{AdminOrderFormItemsSection.rowQty('1')}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
-     </actionGroup>
- 
-     <!--Add configurable product to order -->
-@@ -102,6 +141,34 @@
-         <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
-     </actionGroup>
- 
-+    <actionGroup name="newAddConfigurableProductToOrder" extends="addConfigurableProductToOrder">
-+        <remove keyForRemoval="waitForConfigurablePopover"/>
-+        <remove keyForRemoval="selectionConfigurableOption"/>
-+        <selectOption selector="{{AdminOrderFormConfigureProductSection.selectOption}}" userInput="{{option.value}}" stepKey="selectOption" after="waitForOptionsToLoad"/>
-+    </actionGroup>
-+
-+    <!--Add configurable product to order -->
-+    <actionGroup name="addConfigurableProductToOrderFromAdmin" extends="addConfigurableProductToOrder">
-+        <waitForElementVisible selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_frontend_label)}}" stepKey="waitForConfigurablePopover"/>
-+        <selectOption selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_frontend_label)}}"
-+                      userInput="{{option.label}}" stepKey="selectionConfigurableOption"/>
-+    </actionGroup>
-+
-+    <actionGroup name="configureOrderedConfigurableProduct">
-+        <arguments>
-+            <argument name="attribute"/>
-+            <argument name="option"/>
-+            <argument name="quantity" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminOrderFormItemsSection.configure}}" stepKey="clickConfigure"/>
-+        <waitForElementVisible selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_frontend_label)}}" stepKey="waitForConfigurablePopover"/>
-+        <wait time="2" stepKey="waitForOptionsToLoad"/>
-+        <selectOption selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_frontend_label)}}"
-+                      userInput="{{option.label}}" stepKey="selectionConfigurableOption"/>
-+        <fillField selector="{{AdminOrderFormConfigureProductSection.quantity}}" userInput="{{quantity}}" stepKey="fillQuantity"/>
-+        <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOkConfigurablePopover"/>
-+    </actionGroup>
-+
-     <!--Add bundle product to order -->
-     <actionGroup name="addBundleProductToOrder">
-         <arguments>
-@@ -121,6 +188,18 @@
-         <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
-     </actionGroup>
- 
-+    <!--Add bundle product to order and check product price in the grid-->
-+    <actionGroup name="addBundleProductToOrderAndCheckPriceInGrid" extends="addBundleProductToOrder">
-+        <arguments>
-+            <argument name="price" type="string"/>
-+        </arguments>
-+        <grabTextFrom selector="{{AdminOrderFormItemsSection.rowPrice('1')}}" stepKey="grabProductPriceFromGrid" after="clickOk"/>
-+        <assertEquals stepKey="assertProductPriceInGrid" message="Bundle product price in grid should be equal {{price}}" after="grabProductPriceFromGrid">
-+            <expectedResult type="string">{{price}}</expectedResult>
-+            <actualResult type="variable">grabProductPriceFromGrid</actualResult>
-+        </assertEquals>
-+    </actionGroup>
-+
-     <!--Add downloadable product to order -->
-     <actionGroup name="addDownloadableProductToOrder">
-         <arguments>
-@@ -188,6 +267,15 @@
-         <selectOption selector="{{AdminOrderFormPaymentSection.flatRateOption}}" userInput="flatrate_flatrate" stepKey="checkFlatRate"/>
-     </actionGroup>
- 
-+    <!--Select free shipping method-->
-+    <actionGroup name="orderSelectFreeShipping">
-+        <click selector="{{AdminOrderFormPaymentSection.header}}" stepKey="unfocus"/>
-+        <waitForPageLoad stepKey="waitForJavascriptToFinish"/>
-+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickShippingMethods"/>
-+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.freeShippingOption}}" stepKey="waitForShippingOptions"/>
-+        <selectOption selector="{{AdminOrderFormPaymentSection.freeShippingOption}}" userInput="freeshipping_freeshipping" stepKey="checkFreeShipping"/>
-+    </actionGroup>
-+
-     <!--Check that customer information is correct in order-->
-     <actionGroup name="verifyBasicOrderInformation">
-         <arguments>
-@@ -209,6 +297,14 @@
-         <see selector="{{AdminOrderAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.postcode}}" stepKey="seeShippingAddressPostcode"/>
-     </actionGroup>
- 
-+    <!--Verify order information-->
-+    <actionGroup name="verifyCreatedOrderInformation">
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage"/>
-+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderPendingStatus" after="seeSuccessMessage"/>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId" after="seeOrderPendingStatus"/>
-+        <assertNotEmpty actual="$getOrderId" stepKey="assertOrderIdIsNotEmpty" after="getOrderId"/>
-+    </actionGroup>
-+
-     <!--Check for product in order items list-->
-     <actionGroup name="seeProductInItemsOrdered">
-         <arguments>
-@@ -217,13 +313,120 @@
-         <see selector="{{AdminOrderItemsOrderedSection.productSkuColumn}}" userInput="{{product.sku}}" stepKey="seeSkuInItemsOrdered"/>
-     </actionGroup>
- 
-+    <actionGroup name="CreateOrderInStoreActionGroup">
-+        <arguments>
-+            <argument name="product"/>
-+            <argument name="customer"/>
-+            <argument name="storeView"/>
-+        </arguments>
-+        <amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
-+        <click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
-+        <waitForPageLoad stepKey="waitForStoresPageOpened"/>
-+        <click stepKey="chooseStore" selector="{{AdminOrderStoreScopeTreeSection.storeForOrder(storeView.name)}}"/>
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <waitForPageLoad stepKey="waitForStoreToAppear"/>
-+        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
-+        <waitForPageLoad stepKey="waitForProductsListForOrder"/>
-+        <click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
-+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
-+        <waitForPageLoad stepKey="waitForProductAddedInOrder"/>
-+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethods"/>
-+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
-+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
-+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
-+    </actionGroup>
-+
-+    <actionGroup name="CreateOrderInStoreChoosingPaymentMethodActionGroup">
-+        <arguments>
-+            <argument name="product"/>
-+            <argument name="customer"/>
-+            <argument name="storeView"/>
-+        </arguments>
-+        <amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
-+        <click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
-+        <waitForPageLoad stepKey="waitForStoresPageOpened"/>
-+        <click stepKey="chooseStore" selector="{{AdminOrderStoreScopeTreeSection.storeForOrder(storeView.name)}}"/>
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
-+        <waitForPageLoad stepKey="waitForProductsListForOrder"/>
-+        <click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
-+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
-+        <waitForPageLoad stepKey="waitForProductAddedInOrder"/>
-+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethods"/>
-+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
-+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
-+        <conditionalClick selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" dependentSelector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" visible="true" stepKey="checkCheckMoneyOption"/>
-+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
-+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
-+    </actionGroup>
-+
-     <!--Cancel order that is in pending status-->
-     <actionGroup name="cancelPendingOrder">
-+        <arguments>
-+            <argument name="orderStatus" type="string" defaultValue="Canceled"/>
-+        </arguments>
-         <click selector="{{AdminOrderDetailsMainActionsSection.cancel}}" stepKey="clickCancelOrder"/>
-         <waitForElement selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForCancelConfirmation"/>
-         <see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to cancel this order?" stepKey="seeConfirmationMessage"/>
-         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmOrderCancel"/>
-         <see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
--        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
-+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{orderStatus}}" stepKey="seeOrderStatusCanceled"/>
-+    </actionGroup>
-+
-+    <!--Select Check Money payment method-->
-+    <actionGroup name="SelectCheckMoneyPaymentMethod">
-+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
-+        <conditionalClick selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" dependentSelector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" visible="true" stepKey="checkCheckMoneyOption"/>
-+    </actionGroup>
-+
-+    <!--Select Bank Transfer payment method-->
-+    <actionGroup name="SelectBankTransferPaymentMethodActionGroup" extends="SelectCheckMoneyPaymentMethod">
-+        <remove keyForRemoval="checkCheckMoneyOption"/>
-+        <conditionalClick selector="{{AdminOrderFormPaymentSection.checkBankTransfer}}" dependentSelector="{{AdminOrderFormPaymentSection.checkBankTransfer}}" visible="true" stepKey="checkBankTransferOption" after="waitForPaymentOptions"/>
-+    </actionGroup>
-+
-+    <!--Select Cash on Delivery payment method-->
-+    <actionGroup name="SelectCashOnDeliveryPaymentMethodActionGroup" extends="SelectCheckMoneyPaymentMethod">
-+        <remove keyForRemoval="checkCheckMoneyOption"/>
-+        <conditionalClick selector="{{AdminOrderFormPaymentSection.checkCashOnDelivery}}" dependentSelector="{{AdminOrderFormPaymentSection.checkCashOnDelivery}}" visible="true" stepKey="checkCashOnDeliveryOption" after="waitForPaymentOptions"/>
-+    </actionGroup>
-+
-+    <!--Select Purchase Order payment method-->
-+    <actionGroup name="SelectPurchaseOrderPaymentMethodActionGroup" extends="SelectCheckMoneyPaymentMethod">
-+        <arguments>
-+            <argument name="purchaseOrderNumber" type="string"/>
-+        </arguments>
-+        <remove keyForRemoval="checkCheckMoneyOption"/>
-+        <conditionalClick selector="{{AdminOrderFormPaymentSection.checkPurchaseOrder}}" dependentSelector="{{AdminOrderFormPaymentSection.checkPurchaseOrder}}" visible="true" stepKey="checkPurchaseOrderOption" after="waitForPaymentOptions"/>
-+        <fillField selector="{{AdminOrderFormPaymentSection.fieldPurchaseOrderNumber}}" userInput="{{purchaseOrderNumber}}" stepKey="fillPurchaseOrderNumber"/>
-+    </actionGroup>
-+
-+    <!-- Create Order -->
-+    <actionGroup name="CreateOrderActionGroup">
-+        <arguments>
-+            <argument name="product"/>
-+            <argument name="customer"/>
-+        </arguments>
-+        <amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
-+        <waitForPageLoad stepKey="waitForNewOrderPageOpened"/>
-+        <click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
-+        <waitForPageLoad stepKey="waitForStoresPageOpened"/>
-+        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
-+        <waitForPageLoad stepKey="waitForProductsListForOrder"/>
-+        <click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
-+        <waitForPageLoad stepKey="waitForClickProduct"/>
-+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
-+        <waitForPageLoad stepKey="waitForProductAddedInOrder"/>
-+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethods"/>
-+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
-+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
-+        <waitForPageLoad stepKey="waitForSubmitOrder"/>
-+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
-     </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionOnGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionOnGridActionGroup.xml
-new file mode 100644
-index 00000000000..a9091deb039
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionOnGridActionGroup.xml
-@@ -0,0 +1,29 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOrderActionOnGridActionGroup">
-+        <arguments>
-+            <argument name="action" type="string"/>
-+            <argument name="orderId" type="string"/>
-+        </arguments>
-+        <checkOption selector="{{AdminOrdersGridSection.selectOrderID(orderId)}}" stepKey="selectOrder"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForCheck"/>
-+        <click selector="{{AdminOrdersGridSection.selectActions}}" stepKey="openActions"/>
-+        <click selector="{{AdminOrdersGridSection.dropdownActionItem(action)}}" stepKey="selectAction"/>
-+        <waitForPageLoad stepKey="waitForResults"/>
-+    </actionGroup>
-+    <actionGroup name="AdminTwoOrderActionOnGridActionGroup" extends="AdminOrderActionOnGridActionGroup">
-+        <arguments>
-+            <argument name="secondOrderId" type="string"/>
-+        </arguments>
-+        <checkOption selector="{{AdminOrdersGridSection.selectOrderID(secondOrderId)}}" stepKey="selectSecondOrder" after="waitForCheck"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForSecondCheck" after="selectSecondOrder"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderFilterByOrderIdAndStatusActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderFilterByOrderIdAndStatusActionGroup.xml
-new file mode 100644
-index 00000000000..352155c190c
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderFilterByOrderIdAndStatusActionGroup.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOrderFilterByOrderIdAndStatusActionGroup">
-+        <arguments>
-+            <argument name="orderId" type="string"/>
-+            <argument name="orderStatus" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
-+        <waitForPageLoad stepKey="waitForLoadingPage"/>
-+        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
-+        <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
-+        <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
-+        <selectOption selector="{{AdminOrdersGridSection.selectStatus}}" userInput="{{orderStatus}}" stepKey="selectOrderStatus"/>
-+        <click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+    </actionGroup>
-+</actionGroups>
-+
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
-index df0f56dbf78..19bf96f50a5 100644
---- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
-@@ -7,18 +7,21 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Filter order grid by order id field-->
-     <actionGroup name="filterOrderGridById">
-         <arguments>
-             <argument name="orderId" type="string"/>
-         </arguments>
-         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
--        <waitForPageLoad stepKey="waitForOrderGridLoad"/>
-+        <waitForPageLoad stepKey="waitForOrdersPage"/>
-         <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
-+        <waitForPageLoad stepKey="waitForClearFilters"/>
-         <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
-+        <waitForPageLoad stepKey="waitForClickFilters"/>
-         <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
-         <click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
-+        <waitForPageLoad stepKey="waitForApplyFilters"/>
-     </actionGroup>
- 
-     <!--Filter order grid by the billing name field-->
-@@ -74,4 +77,9 @@
-         <waitForPageLoad stepKey="waitForPageToLoad"/>
-         <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.enabledFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
-     </actionGroup>
-+
-+    <actionGroup name="OpenOrderById" extends="filterOrderGridById">
-+        <click selector="{{AdminDataGridTableSection.firstRow}}" after="clickOrderApplyFilters" stepKey="openOrderViewPage"/>
-+        <waitForPageLoad after="openOrderViewPage" stepKey="waitForOrderViewPageOpened"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml
-new file mode 100644
-index 00000000000..81085771454
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Fill Order status form and click save -->
-+    <actionGroup name="AdminOrderStatusFormFillAndSave">
-+        <arguments>
-+            <argument name="status" type="string" />
-+            <argument name="label" type="string" />
-+        </arguments>
-+
-+        <fillField stepKey="fillStatusCode" selector="{{AdminOrderStatusFormSection.statusCodeField}}" userInput="{{status}}"/>
-+        <fillField stepKey="fillStatusLabel" selector="{{AdminOrderStatusFormSection.statusLabelField}}" userInput="{{label}}"/>
-+        <click stepKey="clickSaveStatus" selector="{{AdminMainActionsSection.save}}"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectFlatRateShippingMethodActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectFlatRateShippingMethodActionGroup.xml
-new file mode 100644
-index 00000000000..cbf92422fd0
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectFlatRateShippingMethodActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSelectFlatRateShippingMethodActionGroup">
-+        <waitForPageLoad stepKey="waitForOrderPageToLoad"/>
-+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethods"/>
-+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSubmitOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSubmitOrderActionGroup.xml
-new file mode 100644
-index 00000000000..56e81da1e55
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSubmitOrderActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSubmitOrderActionGroup">
-+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
-+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderButtonsAvailableActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderButtonsAvailableActionGroup.xml
-new file mode 100644
-index 00000000000..3cc412ce5f4
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderButtonsAvailableActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertOrderButtonsAvailableActionGroup">
-+        <seeElement selector="{{AdminOrderDetailsMainActionsSection.back}}" stepKey="seeBackBtn"/>
-+        <seeElement selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="seeReorderBtn"/>
-+        <seeElement selector="{{AdminOrderDetailsMainActionsSection.cancel}}" stepKey="seeCancelBtn"/>
-+        <seeElement selector="{{AdminOrderDetailsMainActionsSection.sendEmail}}" stepKey="seeSendEmailBtn"/>
-+        <seeElement selector="{{AdminOrderDetailsMainActionsSection.hold}}" stepKey="seeHoldBtn"/>
-+        <seeElement selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="seeInvoiceBtn"/>
-+        <seeElement selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="seeShipBtn"/>
-+        <seeElement selector="{{AdminOrderDetailsMainActionsSection.edit}}" stepKey="seeEditBtn"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml
-new file mode 100644
-index 00000000000..5f69f529876
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Search order status grid for item with a specific code and validate data -->
-+    <actionGroup name="AssertOrderStatusExistsInGrid">
-+        <arguments>
-+            <argument name="status" type="string" />
-+            <argument name="label" type="string" />
-+        </arguments>
-+
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
-+        <fillField selector="{{AdminOrderStatusGridSection.statusCodeFilterField}}" userInput="{{status}}" stepKey="fillStatusFilter"/>
-+        <click selector="{{AdminSecondaryGridSection.searchButton}}" stepKey="clickSearch"/>
-+        <see selector="{{AdminOrderStatusGridSection.statusCodeDataColumn}}" userInput="{{status}}" stepKey="seeStatusCodeInGrid"/>
-+        <see selector="{{AdminOrderStatusGridSection.statusLabelDataColumn}}" userInput="{{label}}" stepKey="seeStatusLabelInGrid"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml
-new file mode 100644
-index 00000000000..5b4c3115744
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert that order status is not saved with duplication error message -->
-+    <actionGroup name="AssertOrderStatusFormSaveDuplicateError">
-+        <see selector="{{AdminMessagesSection.error}}" userInput="We found another order status with the same order status code." stepKey="seeError"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml
-new file mode 100644
-index 00000000000..d82f4b9dd25
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Assert that order status saved with success message -->
-+    <actionGroup name="AssertOrderStatusFormSaveSuccess">
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the order status." stepKey="seeSuccess"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
-new file mode 100644
-index 00000000000..abc5698cc71
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
-@@ -0,0 +1,39 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="useBraintreeForMasterCard">
-+        <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
-+        <waitForPageLoad stepKey="waitForBraintreeConfigs"/>
-+        <click stepKey="openCardTypes" selector="{{NewOrderSection.openCardTypes}}"/>
-+        <waitForPageLoad stepKey="waitForCardTypes"/>
-+        <click stepKey="chooseCardType" selector="{{NewOrderSection.masterCard}}"/>
-+        <waitForPageLoad stepKey="waitForCardSelected"/>
-+
-+        <switchToIFrame stepKey="switchToCardNumber" selector="{{NewOrderSection.cardFrame}}"/>
-+        <waitForElementVisible selector="{{NewOrderSection.creditCardNumber}}" stepKey="waitForFillCardNumber"/>
-+        <fillField stepKey="fillCardNumber" selector="{{NewOrderSection.creditCardNumber}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
-+        <switchToIFrame stepKey="switchBackFromCard"/>
-+
-+        <switchToIFrame stepKey="switchToExpirationMonth" selector="{{NewOrderSection.monthFrame}}"/>
-+        <waitForElementVisible selector="{{NewOrderSection.expirationMonth}}" stepKey="waitForFillMonth"/>
-+        <fillField stepKey="fillMonth" selector="{{NewOrderSection.expirationMonth}}" userInput="{{PaymentAndShippingInfo.month}}"/>
-+        <switchToIFrame stepKey="switchBackFromMonth"/>
-+
-+        <switchToIFrame stepKey="switchToExpirationYear" selector="{{NewOrderSection.yearFrame}}"/>
-+        <waitForElementVisible selector="{{NewOrderSection.expirationYear}}" stepKey="waitForFillYear"/>
-+        <fillField stepKey="fillYear" selector="{{NewOrderSection.expirationYear}}" userInput="{{PaymentAndShippingInfo.year}}"/>
-+        <switchToIFrame stepKey="switchBackFromYear"/>
-+
-+        <switchToIFrame stepKey="switchToCVV" selector="{{NewOrderSection.cvvFrame}}"/>
-+        <waitForElementVisible selector="{{NewOrderSection.cvv}}" stepKey="waitForFillCVV"/>
-+        <fillField stepKey="fillCVV" selector="{{NewOrderSection.cvv}}" userInput="{{PaymentAndShippingInfo.cvv}}"/>
-+        <switchToIFrame stepKey="switchBackFromCVV"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml
-new file mode 100644
-index 00000000000..e48e7bb3f0b
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml
-@@ -0,0 +1,37 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="CreateOrderToPrintPageActionGroup">
-+        <arguments>
-+            <argument name="Category"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontCategoryPage.url(Category.name)}}" stepKey="onCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
-+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
-+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
-+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-+        <click selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="clickOrderLink"/>
-+        <click selector="{{StorefrontCustomerOrderViewSection.printOrderLink}}" stepKey="clickPrintOrderLink"/>
-+    </actionGroup>
-+    <actionGroup name="CreateOrderToPrintPageWithSelectedPaymentMethodActionGroup" extends="CreateOrderToPrintPageActionGroup">
-+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" after="clickNext" stepKey="waitForPaymentSectionLoaded"/>
-+        <conditionalClick selector="{{CheckoutPaymentSection.checkMoneyOrderPayment}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" before="waitForPlaceOrderButton" stepKey="clickCheckMoneyOrderPayment"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/FilterOrderStatusByLabelAndCodeActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/FilterOrderStatusByLabelAndCodeActionGroup.xml
-new file mode 100644
-index 00000000000..96e562cb95c
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/FilterOrderStatusByLabelAndCodeActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="FilterOrderStatusByLabelAndCodeActionGroup">
-+        <arguments>
-+            <argument name="statusLabel" type="string"/>
-+            <argument name="statusCode" type="string"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminOrderStatusGridSection.resetFilter}}" dependentSelector="{{AdminOrderStatusGridSection.resetFilter}}" visible="true" stepKey="clearOrderStatusFilters" />
-+        <fillField selector="{{AdminOrderStatusGridSection.statusLabel}}" userInput="{{statusLabel}}" stepKey="fillStatusLabel"/>
-+        <fillField selector="{{AdminOrderStatusGridSection.statusCode}}" userInput="{{statusCode}}" stepKey="fillStatusCode"/>
-+        <click selector="{{AdminOrderStatusGridSection.search}}" stepKey="clickSearch"/>
-+        <waitForPageLoad stepKey="waitForSearch"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/FilterShipmentGridByOrderIdActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/FilterShipmentGridByOrderIdActionGroup.xml
-new file mode 100644
-index 00000000000..020ada06276
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/FilterShipmentGridByOrderIdActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="FilterShipmentGridByOrderIdActionGroup">
-+        <arguments>
-+            <argument name="orderId" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminShipmentPage.url}}" stepKey="goToShipments"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearOrderFilters"/>
-+        <click selector="{{AdminShipmentGridSection.filter}}" stepKey="clickFilter"/>
-+        <fillField selector="{{AdminShipmentsFilterSection.orderNum}}" userInput="{{orderId}}" stepKey="fillOrderIdForFilter"/>
-+        <click selector="{{AdminShipmentsFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
-+        <waitForPageLoad stepKey="waitForFiltersApply"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/SelectActionForOrdersActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/SelectActionForOrdersActionGroup.xml
-new file mode 100644
-index 00000000000..073eb03b11b
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/SelectActionForOrdersActionGroup.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="SelectActionForOrdersActionGroup">
-+        <arguments>
-+            <argument name="action" type="string"/>
-+        </arguments>
-+        <checkOption selector="{{AdminOrdersGridSection.checkOrder}}" stepKey="checkOrder"/>
-+        <click selector="{{AdminOrdersGridSection.orderActions}}" stepKey="clickOrderActions"/>
-+        <click selector="{{AdminOrdersGridSection.changeOrderStatus(action)}}" stepKey="changeOrdersAction"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontOrderActionGroupActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontOrderActionGroupActionGroup.xml
-new file mode 100644
-index 00000000000..fcea25f9975
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontOrderActionGroupActionGroup.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Fill order information fields and click continue-->
-+    <actionGroup name="StorefrontSearchGuestOrderActionGroup">
-+        <arguments>
-+            <argument name="orderId" type="string"/>
-+            <argument name="orderLastName" type="string"/>
-+            <argument name="orderEmail" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontOrdersAndReturnsPage.url}}" stepKey="navigateToOrderAndReturnPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <fillField selector="{{StorefrontOrderAndReturnInformationSection.orderId}}" userInput="{{orderId}}" stepKey="fillOrderId"/>
-+        <fillField selector="{{StorefrontOrderAndReturnInformationSection.bilingLastName}}" userInput="{{orderLastName}}" stepKey="fillBillingLastName"/>
-+        <fillField selector="{{StorefrontOrderAndReturnInformationSection.email}}" userInput="{{orderEmail}}" stepKey="fillEmail"/>
-+        <click selector="{{StorefrontOrderAndReturnInformationSection.continueButton}}" stepKey="clickContinue"/>
-+        <waitForPageLoad stepKey="waitForOrderInformationPageLoad"/>
-+        <seeInCurrentUrl url="{{StorefrontOrderInformationPage.url}}" stepKey="seeOrderInformationUrl"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml
-index 800bbfca2f8..920618a70df 100644
---- a/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="ShippingAddressTX" type="shipping_address">
-         <data key="firstname">Joe</data>
-         <data key="lastname">Buyer</data>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Sales/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..4f6faccbb26
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,41 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuSalesCreditMemos">
-+        <data key="pageTitle">Credit Memos</data>
-+        <data key="title">Credit Memos</data>
-+        <data key="dataUiId">magento-sales-sales-creditmemo</data>
-+    </entity>
-+    <entity name="AdminMenuSalesInvoices">
-+        <data key="pageTitle">Invoices</data>
-+        <data key="title">Invoices</data>
-+        <data key="dataUiId">magento-sales-sales-invoice</data>
-+    </entity>
-+    <entity name="AdminMenuSalesOrders">
-+        <data key="pageTitle">Orders</data>
-+        <data key="title">Orders</data>
-+        <data key="dataUiId">magento-sales-sales-order</data>
-+    </entity>
-+    <entity name="AdminMenuSalesShipments">
-+        <data key="pageTitle">Shipments</data>
-+        <data key="title">Shipments</data>
-+        <data key="dataUiId">magento-sales-sales-shipment</data>
-+    </entity>
-+    <entity name="AdminMenuSalesTransactions">
-+        <data key="pageTitle">Transactions</data>
-+        <data key="title">Transactions</data>
-+        <data key="dataUiId">magento-sales-sales-transactions</data>
-+    </entity>
-+    <entity name="AdminMenuStoresSettingsOrderStatus">
-+        <data key="pageTitle">Order Status</data>
-+        <data key="title">Order Status</data>
-+        <data key="dataUiId">magento-sales-system-order-statuses</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Sales/Test/Mftf/Data/ConfigData.xml
-new file mode 100644
-index 00000000000..730bebc047f
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Data/ConfigData.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminEnableDashboardCharts">
-+        <data key="path">admin/dashboard/enable_charts</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="AdminDisableDashboardCharts">
-+        <data key="path">admin/dashboard/enable_charts</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml b/app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml
-index f6855ed09c2..10de6681d1b 100644
---- a/app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="Const" type="constant">
-         <data key="one">1</data>
-         <data key="two">2</data>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Data/OrderActionsData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderActionsData.xml
-new file mode 100644
-index 00000000000..64502f5632f
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Data/OrderActionsData.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="OrderActions" type="orderActions">
-+        <data key="cancel">Cancel</data>
-+        <data key="hold">Hold</data>
-+        <data key="unhold">Unhold</data>
-+        <data key="printInvoices">Print Invoices</data>
-+        <data key="printPackingSlips">Print Packing Slips</data>
-+        <data key="printCreditMemos">Print Credit Memos</data>
-+        <data key="printAll">Print All</data>
-+        <data key="printShippingLabels">Print Shipping Labels</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml
-index 566fb7d4452..28baea57821 100644
---- a/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <!--Data for order created through UI with simple and configurable order-->
-     <entity name="AdminOrderSimpleConfigurableProduct" type="order">
-         <data key="subtotal">246.00</data>
-@@ -23,6 +23,11 @@
-         <data key="from">200</data>
-         <data key="to">400</data>
-     </entity>
-+    <entity name="AdminOrderSimpleProductWithCatalogRule" type="order">
-+        <data key="subtotal">110.70</data>
-+        <data key="shipping">5.00</data>
-+        <data key="grandTotal">115.70</data>
-+    </entity>
- 
-     <entity name="OrderStatus" type="status">
-         <data key="canceled">Canceled</data>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Data/OrderStateData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderStateData.xml
-new file mode 100644
-index 00000000000..9493124fd6e
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Data/OrderStateData.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="OrderState" type="state">
-+        <data key="canceled">Canceled</data>
-+        <data key="closed">Closed</data>
-+        <data key="complete">Complete</data>
-+        <data key="payment_review">Payment Review</data>
-+        <data key="processing">Processing</data>
-+        <data key="holded">On Hold</data>
-+        <data key="new">Pending</data>
-+        <data key="pending_payment">Pending Payment</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusConfigData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusConfigData.xml
-new file mode 100644
-index 00000000000..4bb8256b68b
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusConfigData.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="EnableCheckmoOrderStatusPending">
-+        <data key="path">payment/checkmo/order_status</data>
-+        <data key="scope">payment</data>
-+        <data key="scope_id">1</data>
-+        <data key="label">Pending</data>
-+        <data key="value">pending</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml
-new file mode 100644
-index 00000000000..aecd7fcf1b7
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="defaultOrderStatus">
-+        <data key="status" unique="suffix">order_status</data>
-+        <data key="label" unique="suffix">orderLabel</data>
-+    </entity>
-+    <entity name="duplicatingCodeOrderStatus">
-+        <data key="status">pending</data>
-+        <data key="label" unique="suffix">orderLabel</data>
-+    </entity>
-+    <entity name="duplicatingLabelOrderStatus">
-+        <data key="status" unique="suffix">order_status</data>
-+        <data key="label">Suspected Fraud</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Data/PaymentConfigData.xml b/app/code/Magento/Sales/Test/Mftf/Data/PaymentConfigData.xml
-new file mode 100644
-index 00000000000..c9186c4cb42
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Data/PaymentConfigData.xml
-@@ -0,0 +1,39 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="enabledCheckMoneyOrder" type="config">
-+        <data key="label">payment/checkmo/active</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="enabledBankTransferPaymentOrder" type="config">
-+        <data key="label">payment/banktransfer/active</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="disabledBankTransferPaymentOrder" type="config">
-+        <data key="label">payment/banktransfer/active</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="enabledCashOnDeliveryPayment" type="config">
-+        <data key="label">payment/cashondelivery/active</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="disabledCashOnDeliveryPayment" type="config">
-+        <data key="label">payment/cashondelivery/active</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="enabledPurchaseOrderPayment" type="config">
-+        <data key="label">payment/purchaseorder/active</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="disabledPurchaseOrderPayment" type="config">
-+        <data key="label">payment/purchaseorder/active</data>
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Data/PurchaseOrderNumberData.xml b/app/code/Magento/Sales/Test/Mftf/Data/PurchaseOrderNumberData.xml
-new file mode 100644
-index 00000000000..e3b3582ba83
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Data/PurchaseOrderNumberData.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="PurchaseOrderNumber">
-+        <data key="number" unique="suffix">PONumber</data>
-+    </entity>
-+</entities>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Data/SalesConfigData.xml b/app/code/Magento/Sales/Test/Mftf/Data/SalesConfigData.xml
-new file mode 100644
-index 00000000000..3239e174032
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Data/SalesConfigData.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="EnabledMinimumOrderAmount500" type="sales_minimum_order">
-+        <requiredEntity type="active">EnableMinimumOrderCheck</requiredEntity>
-+        <requiredEntity type="amount">MinimumOrderAmount500</requiredEntity>
-+    </entity>
-+    <entity name="EnableMinimumOrderCheck" type="active">
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="MinimumOrderAmount500" type="amount">
-+        <data key="value">500</data>
-+    </entity>
-+
-+    <entity name="DisabledMinimumOrderAmount" type="sales_minimum_order">
-+        <requiredEntity type="active">DisableMinimumOrderCheck</requiredEntity>
-+    </entity>
-+    <entity name="DisableMinimumOrderCheck" type="active">
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Metadata/sales_config-meta.xml b/app/code/Magento/Sales/Test/Mftf/Metadata/sales_config-meta.xml
-new file mode 100644
-index 00000000000..2bd084b5457
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Metadata/sales_config-meta.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="SetSalesMinimumOrder" dataType="sales_minimum_order" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST">
-+        <object key="groups" dataType="sales_minimum_order">
-+            <object key="minimum_order" dataType="sales_minimum_order">
-+                <object key="fields" dataType="sales_minimum_order">
-+                    <object key="active" dataType="active">
-+                        <field key="value">string</field>
-+                    </object>
-+                    <object key="amount" dataType="amount">
-+                        <field key="value">string</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemoNewPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemoNewPage.xml
-index 5a50c807628..2d020caa0d1 100644
---- a/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemoNewPage.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemoNewPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminCreditMemoNewPage" url="sales/order_creditmemo/new/order_id/" area="admin" module="Magento_Sales">
-         <section name="AdminCreditMemoOrderInformationSection"/>
-         <section name="AdminCreditMemoAddressInformationSection"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemoViewPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemoViewPage.xml
-new file mode 100644
-index 00000000000..61646f8b302
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemoViewPage.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminCreditMemoViewPage" url="sales/order_creditmemo/view/creditmemo_id/{{memoId}}/" area="admin" module="Magento_Sales">
-+        <section name="AdminCreditMemoViewItemsSection"/>
-+        <section name="AdminCreditMemoViewTotalSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemosGridPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemosGridPage.xml
-new file mode 100644
-index 00000000000..10c8dfd9c8b
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemosGridPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminCreditMemosGridPage" url="sales/creditmemo/" area="admin" module="Magento_Sales">
-+        <section name="AdminCreditMemosGridSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceDetailsPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceDetailsPage.xml
-index a60e44247fe..bf48bc67633 100644
---- a/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceDetailsPage.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceDetailsPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminInvoiceDetailsPage" url="sales/invoice/view/invoice_id/" area="admin" module="Magento_Sales">
-         <section name="AdminInvoiceDetailsInformationSection"/>
-     </page>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml
-index e782fe51947..d547c9f1eb0 100644
---- a/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminInvoiceNewPage" url="sales/order_invoice/new/order_id/" area="admin" module="Magento_Sales">
-         <section name="AdminInvoiceMainActionsSection"/>
-         <section name="AdminInvoiceOrderInformationSection"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoicesPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoicesPage.xml
-index 7f7289b2e64..fe574ddabd9 100644
---- a/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoicesPage.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoicesPage.xml
-@@ -7,9 +7,10 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminInvoicesPage" url="sales/invoice/" area="admin" module="Magento_Sales">
-         <section name="AdminInvoicesGridSection"/>
-         <section name="AdminInvoicesFiltersSection"/>
-+        <section name="AdminOrderInvoiceViewSection"/>
-     </page>
- </pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
-index 49520261d85..c8ec12203c6 100644
---- a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminOrderCreatePage" url="sales/order_create/index" area="admin" module="Magento_Sales">
-         <section name="AdminOrderFormActionSection"/>
-         <section name="AdminOrderFormItemsSection"/>
-@@ -17,5 +17,6 @@
-         <section name="AdminOrderFormShippingAddressSection"/>
-         <section name="AdminOrderFormPaymentSection"/>
-         <section name="AdminOrderFormTotalSection"/>
-+        <section name="AdminOrderFormStoreSelectorSection"/>
-     </page>
--</pages>
-\ No newline at end of file
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml
-index 690eade8b0c..c62144b84aa 100644
---- a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminOrderDetailsPage" url="sales/order/view/order_id/" area="admin" module="Magento_Sales">
-         <section name="AdminOrderDetailsMainActionsSection"/>
-         <section name="AdminOrderDetailsOrderViewSection"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderPage.xml
-new file mode 100644
-index 00000000000..6abe265a37b
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderPage.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminOrderPage" url="sales/order/view/order_id/{{var1}}" area="admin" module="Magento_Sales" parameterized="true">
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderProcessDataPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderProcessDataPage.xml
-new file mode 100644
-index 00000000000..2041bf8f3c9
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderProcessDataPage.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminOrderProcessDataPage" url="sales/order_create/processData" area="admin" module="Magento_Sales">
-+        <section name="AdminOrderFormItemsOrderedSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml
-new file mode 100644
-index 00000000000..b158e492307
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminOrderStatusPage" url="sales/order_status" area="admin" module="Magento_Sales">
-+        <section name="AdminOrderStatusFormSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrdersPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrdersPage.xml
-index d4d5e786318..7a9414e3f9a 100644
---- a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrdersPage.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrdersPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminOrdersPage" url="sales/order/" area="admin" module="Magento_Sales">
-         <section name="AdminOrdersGridSection"/>
-     </page>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminShipmentPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminShipmentPage.xml
-new file mode 100644
-index 00000000000..d35a8ab5c45
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminShipmentPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminShipmentPage" url="sales/shipment/" area="admin" module="Magento_Sales">
-+        <section name="AdminShipmentGridSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomerOrdersHistoryPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomerOrdersHistoryPage.xml
-new file mode 100644
-index 00000000000..ccbb95a7f97
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomerOrdersHistoryPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontCustomerOrdersHistoryPage" url="sales/order/history/" module="Magento_Sales" area="storefront">
-+        <section name="StorefrontCustomerOrdersGridSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomerSignOutPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomerSignOutPage.xml
-new file mode 100644
-index 00000000000..4e89e5476c3
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomerSignOutPage.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+    <page name="StorefrontCustomerSignOutPage" url="/customer/account/logout/" area="storefront" module="Magento_Customer"/>
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderSearchPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderSearchPage.xml
-new file mode 100644
-index 00000000000..d2a4f4f0459
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderSearchPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontGuestOrderSearchPage" url="sales/guest/form/" module="Magento_Sales" area="storefront">
-+        <section name="StorefrontGuestOrderSearchSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderViewPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderViewPage.xml
-new file mode 100644
-index 00000000000..69c7fa76129
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderViewPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontGuestOrderViewPage" url="sales/guest/view/" module="Magento_Sales" area="storefront">
-+        <section name="StorefrontGuestOrderViewSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml
-new file mode 100644
-index 00000000000..a9281be1bed
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontOrderInformationPage" url="sales/guest/view" area="storefront" module="Magento_Sales">
-+        <section name="StorefrontOrderInformationMainSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml
-new file mode 100644
-index 00000000000..cd15a27fa8c
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontOrdersAndReturnsPage" url="sales/guest/form" area="storefront" module="Magento_Sales">
-+        <section name="StorefrontOrderAndReturnInformationSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontSalesOrderPrintPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontSalesOrderPrintPage.xml
-new file mode 100644
-index 00000000000..874e6889ec5
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontSalesOrderPrintPage.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+    <page name="StorefrontSalesOrderPrintPage" url="/sales/order/print/order_id/{{var1}}/" parameterized="true"
-+          area="storefront" module="Magento_Sales">
-+        <section name="SalesOrderPrintSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminAssignOrderStatusToStateSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminAssignOrderStatusToStateSection.xml
-new file mode 100644
-index 00000000000..53e5e14497c
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminAssignOrderStatusToStateSection.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminAssignOrderStatusToStateSection">
-+        <element name="orderStatus" type="select" selector="#status"/>
-+        <element name="orderState" type="select" selector="#state"/>
-+        <element name="orderStatusAsDefault" type="checkbox" selector="#is_default"/>
-+        <element name="visibleOnStorefront" type="checkbox" selector="#visible_on_front"/>
-+        <element name="saveStatusAssignment" type="button" selector="#save" timeout="30"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoAddressInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoAddressInformationSection.xml
-index 85e5faca3a4..178cd37e6b8 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoAddressInformationSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoAddressInformationSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCreditMemoAddressInformationSection">
-         <element name="billingAddress" type="text" selector=".order-billing-address address"/>
-         <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
-index 5e3e8fc6e22..13f351c0644 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCreditMemoItemsSection">
-         <element name="header" type="text" selector="#creditmemo_item_container span.title"/>
-         <element name="itemName" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-product .product-title" parameterized="true"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoOrderInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoOrderInformationSection.xml
-index b0be8c6cd65..5b7f8296265 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoOrderInformationSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoOrderInformationSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCreditMemoOrderInformationSection">
-         <element name="orderId" type="text" selector="div.order-information span.title > a" timeout="60"/>
-         <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoPaymentShippingSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoPaymentShippingSection.xml
-index b307a5d1cf4..1bfe28b9f04 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoPaymentShippingSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoPaymentShippingSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCreditMemoPaymentShippingSection">
-         <element name="PaymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
-         <element name="CurrencyInformation" type="text" selector=".order-payment-method .order-payment-currency"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
-index ca5e297b72f..ee8cf05e3d7 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
-@@ -7,17 +7,20 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCreditMemoTotalSection">
-         <element name="subtotalRow" type="text" selector=".order-subtotal-table tbody > tr:nth-of-type({{row}}) td span.price" parameterized="true"/>
-         <element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td//span[contains(@class, 'price')]" parameterized="true"/>
-         <element name="refundShipping" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[shipping_amount]']"/>
--        <element name="adjustmentRefund" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[adjustment_positive]'"/>
-+        <element name="adjustmentRefund" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[adjustment_positive]']"/>
-         <element name="adjustmentFee" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[adjustment_negative]']"/>
-         <element name="grandTotal" type="text" selector=".order-subtotal-table tfoot tr.col-0>td span.price"/>
-         <element name="appendComments" type="checkbox" selector=".order-totals-actions #notify_customer"/>
-         <element name="emailCopy" type="checkbox" selector=".order-totals-actions #send_email"/>
-         <element name="refundStoreCredit" type="checkbox" selector=".order-totals-actions .field-refund-store-credit input[type='checkbox']"/>
-         <element name="submitRefundOffline" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-button']" timeout="30"/>
-+        <element name="creditMemoItem" type="text" selector="#sales_order_view_tabs_order_creditmemos"/>
-+        <element name="viewMemo" type="text" selector="div#sales_order_view_tabs_order_creditmemos_content a.action-menu-item"/>
-+        <element name="refundOffline" type="button"  selector=".order-totals-actions button[data-ui-id='order-items-submit-offline']"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoViewItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoViewItemsSection.xml
-new file mode 100644
-index 00000000000..83c1210d0f9
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoViewItemsSection.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCreditMemoViewItemsSection">
-+        <element name="blockItemsRefunded" type="block" selector="#creditmemo_items_container"/>
-+        <element name="productName" type="text" selector="td.col-product > div.product-title"/>
-+        <element name="productPrice" type="text" selector=".col-price > .price-excl-tax > .price"/>
-+        <element name="productQty" type="text" selector="td.col-qty"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoViewTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoViewTotalSection.xml
-new file mode 100644
-index 00000000000..b59036987b9
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoViewTotalSection.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCreditMemoViewTotalSection">
-+        <element name="subtotal" type="text" selector="//td[contains(text(), 'Subtotal')]/following-sibling::td//span[@class='price']"/>
-+        <element name="adjustmentRefund" type="text" selector="//td[contains(text(), 'Adjustment Refund')]/following-sibling::td//span[@class='price']"/>
-+        <element name="adjustmentFee" type="text" selector="//td[contains(text(), 'Adjustment Fee')]/following-sibling::td//span[@class='price']"/>
-+        <element name="grandTotal" type="text" selector=".order-subtotal-table tfoot tr.col-0>td span.price"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemosGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemosGridSection.xml
-new file mode 100644
-index 00000000000..bf194422def
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemosGridSection.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCreditMemosGridSection">
-+        <element name="searchField" type="input" selector="//input[text() = 'Search by keyword']" />
-+        <element name="buttonSearch" type="button" selector=".data-grid-search-control-wrap > button.action-submit"/>
-+        <element name="clearFilters" type="button" selector="button.action-tertiary.action-clear"/>
-+        <element name="buttonFilters" type="button" selector=".data-grid-filters-action-wrap > button"/>
-+        <element name="fieldCreditMemo" type="input" selector="input[name='increment_id']"/>
-+        <element name="fieldOrder" type="input" selector="input[name='order_increment_id']"/>
-+        <element name="fieldBillToName" type="input" selector="input[name='billing_name']"/>
-+        <element name="fieldRefundFrom" type="input" selector="input[name='base_grand_total[from]']"/>
-+        <element name="fieldRefundTo" type="input" selector="input[name='base_grand_total[to]']"/>
-+        <element name="applyFilter" type="button" selector="button[data-action='grid-filter-apply']"/>
-+        <element name="memoId" type="text" selector="//*[@id='sales_order_view_tabs_order_creditmemos_content']//tbody/tr/td[2]/div"/>
-+        <element name="rowCreditMemos" type="text" selector="div.data-grid-cell-content"/>
-+    </section>
-+</sections>
-+
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceAddressInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceAddressInformationSection.xml
-index 63712f24a5d..14a0d4b8488 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceAddressInformationSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceAddressInformationSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminInvoiceAddressInformationSection">
-         <element name="billingAddress" type="text" selector=".order-billing-address address"/>
-         <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceDetailsInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceDetailsInformationSection.xml
-index 41b36310ebe..39071a9eb58 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceDetailsInformationSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceDetailsInformationSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminInvoiceDetailsInformationSection">
-         <element name="orderStatus" type="text" selector="#order_status"/>
-     </section>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
-index 56c165bada5..92c01cf3807 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminInvoiceItemsSection">
-         <element name="itemName" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .product-title" parameterized="true"/>
-         <element name="itemSku" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .product-sku-block" parameterized="true"/>
-@@ -29,4 +29,4 @@
-         <element name="totalColumn" type="text" selector=".order-invoice-tables .col-total .price"/>
-         <element name="updateQty" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button']"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
-index c1a9718b29b..011500fac3f 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
-@@ -7,8 +7,10 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminInvoiceMainActionsSection">
--        <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary"/>
-+        <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary" timeout="60"/>
-+        <element name="openNewCreditMemoFromInvoice" type="button" selector=".action-default.scalable.credit-memo"/>
-+        <element name="submitNewRefundFromInvoice" type="button" selector=".action-default.scalable.save.submit-button refund primary"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderInformationSection.xml
-index 198a087bffc..f05baf248ed 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderInformationSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderInformationSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminInvoiceOrderInformationSection">
-         <element name="orderId" type="text" selector="div.order-information span.title > a" timeout="30"/>
-         <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
-@@ -16,5 +16,6 @@
-         <element name="customerName" type="text" selector=".order-account-information table tr:first-of-type > td span"/>
-         <element name="customerEmail" type="text" selector=".order-account-information table tr:nth-of-type(2) > td a"/>
-         <element name="customerGroup" type="text" selector=".order-account-information table tr:nth-of-type(3) > td"/>
-+        <element name="invoiceNoteComment" type="text" selector="div.note-list-comment"/>
-     </section>
- </sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
-index 3bb381047bb..fda886a8398 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminInvoicePaymentShippingSection">
-         <element name="PaymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
-         <element name="CurrencyInformation" type="text" selector=".order-payment-method .order-payment-currency"/>
-@@ -15,5 +15,7 @@
-         <element name="ShippingMethod" type="text" selector=".order-shipping-address .shipping-description-title"/>
-         <element name="ShippingPrice" type="text" selector=".order-shipping-address .shipping-description-content .price"/>
-         <element name="CreateShipment" type="checkbox" selector=".order-shipping-address input[name='invoice[do_shipment]']"/>
-+        <element name="getShippingMethodAndRates" type="button" selector="//span[text()='Get shipping methods and rates']" timeout="60"/>
-+        <element name="shippingMethod" type="button" selector="//label[contains(text(), 'Fixed')]" timeout="60"/>
-     </section>
- </sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceTotalSection.xml
-index db5b12f622b..1a78e920d41 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceTotalSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceTotalSection.xml
-@@ -7,10 +7,14 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminInvoiceTotalSection">
-         <element name="subtotalRow" type="text" selector=".order-subtotal-table tbody > tr:nth-of-type({{row}}) td span.price" parameterized="true"/>
-         <element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td/span/span[contains(@class, 'price')]" parameterized="true"/>
-         <element name="grandTotal" type="text" selector=".order-subtotal-table tfoot tr.col-0>td span.price"/>
-+        <element name="invoiceComment" type="textarea" selector="[name='invoice[comment_text]']" timeout="30"/>
-+        <element name="itemQty" type="text" selector="td.col-qty"/>
-+        <element name="itemName" type="text" selector=".col-product .product-title"/>
-+        <element name="itemTotalPrice" type="text" selector=".col-total .price"/>
-     </section>
- </sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesFiltersSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesFiltersSection.xml
-index 5b55dd3cc1a..78b9c853ff6 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesFiltersSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesFiltersSection.xml
-@@ -7,8 +7,9 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminInvoicesFiltersSection">
-         <element name="orderNum" type="input" selector="input[name='order_increment_id']"/>
-+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesGridSection.xml
-index 8d2d8750e50..d4c4a9a0106 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesGridSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesGridSection.xml
-@@ -7,10 +7,11 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminInvoicesGridSection">
-         <element name="spinner" type="button" selector=".spinner"/>
-         <element name="filter" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button"/>
-         <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
-+        <element name="clearFilters" type="button" selector="button.action-clear" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml
-index 2900cb60391..2632d5f2815 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderAddressInformationSection">
-         <element name="billingAddress" type="text" selector=".order-billing-address address"/>
-         <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml
-index 9a784049e08..19f44711795 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderCommentsTabSection">
-         <element name="orderNotesList" type="text" selector="#Order_History .edit-order-comments .note-list"/>
-         <element name="orderComments" type="text" selector="#Order_History .edit-order-comments-block"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml
-index bb0e1618c66..e285f8700a1 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderCreditMemosTabSection">
-         <element name="spinner" type="text" selector="[data-role='spinner'][data-component*='sales_order_view_creditmemo']"/>
-         <element name="gridRow" type="text" selector="#sales_order_view_tabs_order_creditmemos_content .data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCustomersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCustomersGridSection.xml
-index c91a1e2aef6..39318a093dd 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCustomersGridSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCustomersGridSection.xml
-@@ -7,12 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderCustomersGridSection">
-         <element name="spinner" type="button" selector=".spinner"/>
-         <element name="apply" type="button" selector=".action-secondary[title='Search']"/>
-         <element name="resetFilter" type="button" selector=".action-tertiary[title='Reset Filter']"/>
-         <element name="emailInput" type="input" selector="#sales_order_create_customer_grid_filter_email"/>
-         <element name="firstRow" type="button" selector="tr:nth-of-type(1)[data-role='row']"/>
-+        <element name="resetButton" type="button" selector="#sales_order_create_customer_grid [data-action='grid-filter-reset']" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml
-index 39feba46940..7994452156c 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderDetailsInformationSection">
-         <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
-         <element name="orderStatus" type="text" selector=".order-information table.order-information-table #order_status"/>
-@@ -19,5 +19,7 @@
-         <element name="billingAddress" type="text" selector=".order-billing-address"/>
-         <element name="shippingAddress" type="text" selector=".order-shipping-address"/>
-         <element name="itemsOrdered" type="text" selector=".edit-order-table"/>
-+        <element name="paymentInformation" type="text" selector="//div[@class='order-payment-method-title']"/>
-+        <element name="orderId" type="text" selector="|Order # (\d+)|"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInvoicesSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInvoicesSection.xml
-index b6b32184841..bcf8bdcae7c 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInvoicesSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInvoicesSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderDetailsInvoicesSection">
-         <element name="spinner" type="button" selector=".spinner"/>
-         <element name="content" type="text" selector="#sales_order_view_tabs_order_invoices_content"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
-index eac238584b0..45fdfebfa81 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderDetailsMainActionsSection">
-         <element name="back" type="button" selector="#back" timeout="30"/>
-         <element name="cancel" type="button" selector="#order-view-cancel-button" timeout="30"/>
-@@ -15,8 +15,14 @@
-         <element name="creditMemo" type="button" selector="#order_creditmemo" timeout="30"/>
-         <element name="hold" type="button" selector="#order-view-hold-button" timeout="30"/>
-         <element name="invoice" type="button" selector="#order_invoice" timeout="30"/>
-+        <element name="invoiceTab" type="button" selector="#sales_order_view_tabs_order_invoices" timeout="30"/>
-         <element name="ship" type="button" selector="#order_ship" timeout="30"/>
-         <element name="reorder" type="button" selector="#order_reorder" timeout="30"/>
-         <element name="edit" type="button" selector="#order_edit" timeout="30"/>
-+        <element name="modalOk" type="button" selector=".action-accept"/>
-+        <element name="unhold" type="button" selector="#order-view-unhold-button" timeout="30"/>
-+        <element name="invoiceBtn" type="button" selector="//button[@title='Invoice']"/>
-+        <element name="shipBtn" type="button" selector="//button[@title='Ship']"/>
-+        <element name="shipmentsTab" type="button" selector="#sales_order_view_tabs_order_shipments"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMessagesSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMessagesSection.xml
-index 31f78db11f9..1bc37184671 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMessagesSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMessagesSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderDetailsMessagesSection">
-         <element name="successMessage" type="text" selector="div.message-success"/>
-     </section>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsOrderViewSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsOrderViewSection.xml
-index 6623c68099f..7f98256fa73 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsOrderViewSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsOrderViewSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderDetailsOrderViewSection">
-         <element name="information" type="button" selector="#sales_order_view_tabs_order_info"/>
-         <element name="invoices" type="button" selector="#sales_order_view_tabs_order_invoices"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml
-index 3c920bc6ba0..430211e52bf 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml
-@@ -7,11 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderFormAccountSection">
-         <element name="group" type="select" selector="#group_id"/>
-         <element name="email" type="input" selector="#email"/>
-         <element name="requiredGroup" type="text" selector=".admin__field.required[data-ui-id='billing-address-fieldset-element-form-field-group-id']"/>
-         <element name="requiredEmail" type="text" selector=".admin__field.required[data-ui-id='billing-address-fieldset-element-form-field-email']"/>
-+        <element name="defaultGeneral" type="text" selector="//*[contains(text(),'General')]" timeout="15"/>
-+        <element name="emailErrorMessage" type="text" selector="#email-error"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml
-index 09b2012841b..d19137c5ad6 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml
-@@ -7,10 +7,14 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderFormActionSection">
-         <element name="SubmitOrder" type="button" selector="#submit_order_top_button" timeout="30"/>
-         <element name="Cancel" type="button" selector="#reset_order_top_button" timeout="30"/>
-         <element name="CreateNewCustomer" type="button" selector="#order-customer-selector .actions button.primary" timeout="30"/>
-+        <element name="submitOrder" type="button" selector="#submit_order_top_button" timeout="30"/>
-+        <element name="cancel" type="button" selector="#reset_order_top_button" timeout="30"/>
-+        <element name="createNewCustomer" type="button" selector="#order-customer-selector .actions button.primary" timeout="30"/>
-+        <element name="pageHeader" type="text" selector=".page-header.row"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml
-index b0f7eb21d4d..2d1a4d5a4cb 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderFormBillingAddressSection">
-         <element name="NamePrefix" type="input" selector="#order-billing_address_prefix" timeout="30"/>
-         <element name="FirstName" type="input" selector="#order-billing_address_firstname" timeout="30"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBundleProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBundleProductSection.xml
-index a035e47394d..562d17f2e87 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBundleProductSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBundleProductSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderFormBundleProductSection">
-         <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
-         <element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
-index 87948c38e43..a5b514c7c8c 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
-@@ -7,10 +7,12 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderFormConfigureProductSection">
--        <element name="optionSelect" type="select" selector="//div[@class='product-options']/div/div/select[../../label[text() = '{{option}}']]" parameterized="true"/>
-+        <element name="configure" type="button" selector="//a[@product_id='{{productId}}']" parameterized="true"/>
-+        <element name="optionSelect" type="select" selector="//div[contains(@class,'product-options')]//select[//label[text() = '{{option}}']]" parameterized="true"/>
-         <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
-         <element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>
-+        <element name="selectOption" type="select" selector="//form[@id='product_composite_configure_form']//select"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormDownloadableProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormDownloadableProductSection.xml
-index b77b01d54f9..94cb0c57d4e 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormDownloadableProductSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormDownloadableProductSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderFormDownloadableProductSection">
-         <element name="optionSelect" type="select" selector="//div[contains(@class,'link')]/div/div/input[./../label[contains(text(),{{linkTitle}})]]" parameterized="true"/>
-         <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormGroupedProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormGroupedProductSection.xml
-index ceba11f74ae..5a25a1bd880 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormGroupedProductSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormGroupedProductSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderFormGroupedProductSection">
-         <element name="optionQty" type="input" selector="//td[@class='col-sku'][text()='{{productSku}}']/..//input[contains(@class, 'qty')]" parameterized="true"/>
-         <element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
-new file mode 100644
-index 00000000000..a5035df2f37
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminOrderFormItemsOrderedSection">
-+        <element name="addProductsBySku" type="button" selector="//section[@id='order-items']//span[contains(text(),'Add Products By SKU')]"/>
-+        <element name="configureButtonBySku" type="button" selector="//div[@class='sku-configure-button']//span[contains(text(),'Configure')]"/>
-+        <element name="configureProductOk" type="button" selector="//div[@class='page-main-actions']//span[contains(text(),'OK')]"/>
-+        <element name="configureProductQtyField" type="input" selector="//*[@id='super-product-table']/tbody/tr[{{arg}}]/td[5]/input[1]" parameterized="true"/>
-+        <element name="addProductToOrder" type="input" selector="//*[@title='Add Products to Order']"/>
-+        <element name="itemsOrderedSummaryText" type="textarea" selector="//table[@class='data-table admin__table-primary order-tables']/tfoot/tr"/>
-+        <element name="configureSelectAttribute" type="select" selector="select[id*=attribute]"/>
-+        <element name="itemsSKU" type="text" selector="(//div[contains(@class, 'product-sku-block')])[{{productNumber}}]" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
-index 86288ec7d7e..a8b499ca7b0 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderFormItemsSection">
-         <element name="skuNumber" type="input" selector="#sku_{{row}}" parameterized="true"/>
-         <element name="qty" type="input" selector="#sku_qty_{{row}}" parameterized="true"/>
-@@ -26,6 +26,14 @@
-         <element name="row" type="text" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}})" parameterized="true"/>
-         <element name="rowCheck" type="checkbox" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}}) td.col-select [type=checkbox]" parameterized="true"/>
-         <element name="rowQty" type="input" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}}) td.col-qty [name='qty']" parameterized="true"/>
-+        <element name="rowPrice" type="text" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}}) td.price" parameterized="true"/>
-         <element name="addSelected" type="button" selector="#order-search .admin__page-section-title .actions button.action-add" timeout="30"/>
-+        <element name="customPriceCheckbox" type="checkbox" selector="//*[@class='custom-price-block']/input"/>
-+        <element name="customPriceField" type="input" selector="//*[@class='custom-price-block']/following-sibling::input"/>
-+        <element name="updateItemsAndQuantities" type="button" selector="//span[contains(text(),'Update Items and Quantities')]"/>
-+        <element name="creditMemo" type="input" selector="#order_creditmemo"/>
-+        <element name="configure" type="button" selector=".product-configure-block button.action-default.scalable" timeout="30"/>
-+        <element name="couponCode" type="input" selector="#order-coupons input" timeout="30"/>
-+        <element name="applyCoupon" type="button" selector="#order-coupons button"/>
-     </section>
- </sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
-index bb7c89dd39b..b31582552cc 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
-@@ -7,11 +7,25 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderFormPaymentSection">
-         <element name="header" type="text" selector="#order-methods span.title"/>
-         <element name="getShippingMethods" type="text" selector="#order-shipping_method a.action-default" timeout="30"/>
-         <element name="flatRateOption" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
-         <element name="shippingError" type="text" selector="#order[has_shipping]-error"/>
-+        <element name="freeShippingOption" type="radio" selector="#s_method_freeshipping_freeshipping" timeout="30"/>
-+        <element name="linkPaymentOptions" type="button" selector="#order-billing_method_summary>a"/>
-+        <element name="blockPayment" type="text" selector="#order-billing_method"/>
-+        <element name="checkMoneyOption" type="radio" selector="#p_method_checkmo" timeout="30"/>
-+        <element name="checkBankTransfer" type="radio" selector="#p_method_banktransfer" timeout="30"/>
-+        <element name="checkCashOnDelivery" type="radio" selector="#p_method_cashondelivery" timeout="30"/>
-+        <element name="checkPurchaseOrder" type="radio" selector="#p_method_purchaseorder" timeout="30"/>
-+        <element name="fieldPurchaseOrderNumber" type="input" selector="#po_number"/>
-+        <element name="paymentBlock" type="text" selector="#order-billing_method" />
-+        <element name="paymentError" type="text" selector="#payment[method]-error"/>
-+        <element name="bankTransferOption" type="radio" selector="#p_method_banktransfer" timeout="30"/>
-+        <element name="cashOnDeliveryOption" type="radio" selector="#p_method_cashondelivery" timeout="30"/>
-+        <element name="purchaseOrderOption" type="radio" selector="#p_method_purchaseorder" timeout="30"/>
-+        <element name="purchaseOrderNumber" type="input" selector="#po_number"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml
-index 82ecb023198..0f1461b121e 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml
-@@ -7,9 +7,10 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderFormShippingAddressSection">
-         <element name="SameAsBilling" type="checkbox" selector="#order-shipping_same_as_billing"/>
-+        <element name="SelectFromExistingCustomerAddress" type="select" selector="#order-shipping_address_customer_address_id"/>
-         <element name="NamePrefix" type="input" selector="#order-shipping_address_prefix"/>
-         <element name="FirstName" type="input" selector="#order-shipping_address_firstname"/>
-         <element name="MiddleName" type="input" selector="#order-shipping_address_middlename"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormStoreSelectorSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormStoreSelectorSection.xml
-new file mode 100644
-index 00000000000..8602c0d3c60
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormStoreSelectorSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminOrderFormStoreSelectorSection">
-+        <element name="storeSelectorContainer" type="input" selector="#order-store-selector"/>
-+        <element name="defaultStoreViewButton" type="radio" selector="//*[contains(@class,'tree-store-scope')]//label[contains(text(),'Default Store View')]"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormTotalSection.xml
-index e44a97b678f..6f62ce199ec 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormTotalSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormTotalSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderFormTotalSection">
-         <element name="subtotalRow" type="text" selector="#order-totals>table tr.row-totals:nth-of-type({{row}}) span.price" parameterized="true"/>
-         <element name="total" type="text" selector="//tr[contains(@class,'row-totals')]/td[contains(text(), '{{total}}')]/following-sibling::td/span[contains(@class, 'price')]" parameterized="true"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoiceViewSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoiceViewSection.xml
-new file mode 100644
-index 00000000000..0d2c4f366f1
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoiceViewSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminOrderInvoiceViewSection">
-+        <element name="invoiceQty" type="input" selector=".input-text.admin__control-text.qty-input" timeout="30"/>
-+        <element name="updateInvoiceBtn" type="button" selector=".update-button" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml
-index e00ab7e66b9..f63979c4ac5 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml
-@@ -7,10 +7,17 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderInvoicesTabSection">
-         <element name="spinner" type="text" selector="[data-role='spinner'][data-component*='sales_order_view_invoice']"/>
-         <element name="gridRow" type="text" selector="#sales_order_view_tabs_order_invoices_content .data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
-         <element name="viewGridRow" type="button" selector="#sales_order_view_tabs_order_invoices_content .data-grid tbody > tr:nth-of-type({{row}}) a[href*='order_invoice/view']" parameterized="true"/>
-+        <element name="viewInvoice" type="button" selector="//div[@class='admin__data-grid-wrap']//a[@class='action-menu-item']"/>
-+        <element name="clearFilters" type="button" selector="//div[@id='sales_order_view_tabs_order_invoices_content']//button[@data-action='grid-filter-reset']" timeout="30"/>
-+        <element name="filters" type="button" selector="//div[@id='sales_order_view_tabs_order_invoices_content']//button[@data-action='grid-filter-expand']" timeout="30"/>
-+        <element name="applyFilters" type="button" selector="//div[@id='sales_order_view_tabs_order_invoices_content']//button[@data-action='grid-filter-apply']" timeout="30"/>
-+        <element name="invoiceId" type="input" selector="//div[@id='sales_order_view_tabs_order_invoices_content']//input[@name='increment_id']" timeout="30"/>
-+        <element name="amountFrom" type="input" selector="[name='grand_total[from]']" timeout="30"/>
-+        <element name="amountTo" type="input" selector="[name='grand_total[to]']" timeout="30"/>
-     </section>
- </sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
-index 9807d7364c7..a2c82de60a7 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderItemsOrderedSection">
-         <element name="itemProductName" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-product .product-title" parameterized="true"/>
-         <element name="itemProductSku" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-product .product-sku-block" parameterized="true"/>
-@@ -23,7 +23,11 @@
- 
-         <element name="productNameColumn" type="text" selector=".edit-order-table .col-product .product-title"/>
-         <element name="productNameOptions" type="text" selector=".edit-order-table .col-product .item-options"/>
-+        <element name="productName" type="text" selector="#order-items_grid  span[id*=order_item]"/>
-+        <element name="productPrice" type="text" selector=".order-tables  tbody td:nth-child({{row}}) .price" parameterized="true"/>
-+        <element name="productNameOptionsLink" type="text" selector="//table[contains(@class, 'edit-order-table')]//td[contains(@class, 'col-product')]//a[text() = '{{var1}}']" parameterized="true"/>
-         <element name="productSkuColumn" type="text" selector=".edit-order-table .col-product .product-sku-block"/>
-+        <element name="productTotal" type="text" selector="#order-items_grid .col-total"/>
-         <element name="statusColumn" type="text" selector=".edit-order-table .col-status"/>
-         <element name="originalPriceColumn" type="text" selector=".edit-order-table .col-original-price .price"/>
-         <element name="priceColumn" type="text" selector=".edit-order-table .col-price .price"/>
-@@ -34,4 +38,4 @@
-         <element name="discountAmountColumn" type="text" selector=".edit-order-table .col-discont .price"/>
-         <element name="totalColumn" type="text" selector=".edit-order-table .col-total .price"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderPaymentInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderPaymentInformationSection.xml
-index 15b468d1dfa..9299222fd32 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderPaymentInformationSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderPaymentInformationSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderPaymentInformationSection">
-         <element name="paymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
-         <element name="paymentCurrency" type="text" selector=".order-payment-method .order-payment-currency"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShipmentsTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShipmentsTabSection.xml
-index 65dbf01aad2..e471fcfe181 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShipmentsTabSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShipmentsTabSection.xml
-@@ -7,10 +7,16 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderShipmentsTabSection">
-         <element name="spinner" type="text" selector="[data-role='spinner'][data-component*='sales_order_view_shipment']"/>
-         <element name="gridRow" type="text" selector="#sales_order_view_tabs_order_shipments_content .data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
-         <element name="viewGridRow" type="button" selector="#sales_order_view_tabs_order_shipments_content .data-grid tbody > tr:nth-of-type({{row}}) a[href*='order_shipment/view']" parameterized="true"/>
-+        <element name="filters" type="button" selector="//div[@id='sales_order_view_tabs_order_shipments_content']//button[@data-action='grid-filter-expand']" timeout="30"/>
-+        <element name="clearFilters" type="button" selector="//div[@id='sales_order_view_tabs_order_shipments_content']//button[@data-action='grid-filter-reset']" timeout="30"/>
-+        <element name="applyFilters" type="button" selector="//div[@id='sales_order_view_tabs_order_shipments_content']//button[@data-action='grid-filter-apply']" timeout="30"/>
-+        <element name="shipmentId" type="input" selector="//div[@id='sales_order_view_tabs_order_shipments_content']//input[@name='increment_id']" timeout="30"/>
-+        <element name="totalQtyFrom" type="input" selector="[name='total_qty[from]']" timeout="30"/>
-+        <element name="totalQtyTo" type="input" selector="[name='total_qty[to]']" timeout="30"/>
-     </section>
- </sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShippingInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShippingInformationSection.xml
-index f29e8a2a7f9..83e5512ef0d 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShippingInformationSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShippingInformationSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderShippingInformationSection">
-         <element name="shippingMethod" type="text" selector=".order-shipping-method .admin__page-section-item-content"/>
-         <element name="shippingPrice" type="text" selector=".order-shipping-method .admin__page-section-item-content .price"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusFormSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusFormSection.xml
-new file mode 100644
-index 00000000000..1058b2d6f21
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusFormSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminOrderStatusFormSection">
-+        <element name="statusCodeField" type="text" selector="#edit_form [name=status]"/>
-+        <element name="statusLabelField" type="text" selector="#edit_form [name=label]"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml
-new file mode 100644
-index 00000000000..4234d76e21b
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminOrderStatusGridSection">
-+        <element name="statusCodeFilterField" type="input" selector="[data-role=filter-form] [name=status]"/>
-+        <element name="statusCodeDataColumn" type="input" selector="[data-role=row] [data-column=status]"/>
-+        <element name="statusLabelDataColumn" type="input" selector="[data-role=row] [data-column=label]"/>
-+        <element name="assignStatusToStateBtn" type="button" selector="#assign" timeout="30"/>
-+        <element name="statusLabel" type="input" selector="#sales_order_status_grid_filter_label"/>
-+        <element name="statusCode" type="input" selector="#sales_order_status_grid_filter_status"/>
-+        <element name="resetFilter" type="button" selector="//div[contains(concat(' ',normalize-space(@class),' '),' action-reset ')]" timeout="30"/>
-+        <element name="search" type="button" selector="[data-action='grid-filter-apply']" timeout="30"/>
-+        <element name="gridCell" type="text" selector="//tr['{{row}}']//td[count(//div[contains(concat(' ',normalize-space(@class),' '),' admin__data-grid-wrap ')]//tr//th[contains(., '{{cellName}}')]/preceding-sibling::th) +1 ]" parameterized="true" timeout="30"/>
-+        <element name="stateCodeAndTitleDataColumn" type="input" selector="[data-role=row] [data-column=state]"/>
-+        <element name="unassign" type="text" selector="[data-role=row] [data-column=unassign]" timeout="60"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml
-index 8f31dd1b8e9..cbe17499319 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml
-@@ -7,9 +7,10 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderStoreScopeTreeSection">
-         <element name="storeTree" type="text" selector="div.tree-store-scope"/>
-         <element name="storeOption" type="radio" selector="//div[contains(@class, 'tree-store-scope')]//label[contains(text(), '{{name}}')]/preceding-sibling::input" parameterized="true" timeout="30"/>
-+        <element name="storeForOrder" type="radio" selector="//div[contains(@class, 'tree-store-scope')]//label[contains(text(), '{{arg}}')]" parameterized="true" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml
-index 5d60886a96a..9b7356127df 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrderTotalSection">
-         <element name="subTotal" type="text" selector=".order-subtotal-table tbody tr.col-0>td span.price"/>
-         <element name="grandTotal" type="text" selector=".order-subtotal-table tfoot tr.col-0>td span.price"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
-index 49aae467b7e..ace64cdaa10 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminOrdersGridSection">
-         <element name="spinner" type="button" selector=".spinner"/>
-         <element name="gridLoadingMask" type="button" selector=".admin__data-grid-loading-mask"/>
-@@ -16,6 +16,7 @@
-         <element name="submitSearch22" type="button" selector=".//*[@class=&quot;admin__data-grid-filters-wrap&quot;]/parent::*/div[@class=&quot;data-grid-search-control-wrap&quot;]/button"/>
-         <element name="filters" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
-         <element name="idFilter" type="input" selector=".admin__data-grid-filters input[name='increment_id']"/>
-+        <element name="selectStatus" type="select" selector="select[name='status']" timeout="60"/>
-         <element name="billToNameFilter" type="input" selector=".admin__data-grid-filters input[name='billing_name']"/>
-         <element name="enabledFilters" type="block" selector=".admin__data-grid-header .admin__data-grid-filters-current._show"/>
-         <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
-@@ -29,5 +30,14 @@
-         <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
-         <element name="columnsDropdown" type="button" selector="div.admin__data-grid-action-columns button" timeout="30"/>
-         <element name="viewColumnCheckbox" type="checkbox" selector="//div[contains(@class,'admin__data-grid-action-columns')]//div[contains(@class, 'admin__field-option')]//label[text() = '{{column}}']/preceding-sibling::input" parameterized="true"/>
-+        <element name="customerInOrdersSection" type="button" selector="(//td[contains(text(),'{{customer}}')])[1]" parameterized="true" timeout="60"/>
-+        <element name="productForOrder" type="button" selector="//td[contains(text(),'{{var}}')]" parameterized="true" timeout="60"/>
-+        <element name="selectActions" type="button" selector=".action-select-wrap > .action-select" timeout="30"/>
-+        <element name="dropdownActionItem" type="button" selector="(//div[contains(@class, 'action-menu-items')]//span[text()='{{action}}'])[1]" timeout="30" parameterized="true"/>
-+        <element name="checkOrder" type="input" selector="//td[count(//div[@data-role='grid-wrapper'])]//input"/>
-+        <element name="orderActions" type="button" selector="//div[contains(concat(' ',normalize-space(@class),' '),' row-gutter ')]//button[@title='Select Items']" timeout="60"/>
-+        <element name="changeOrderStatus" type="button" selector="//div[contains(concat(' ',normalize-space(@class),' '),' row-gutter ')]//span[text()='{{status}}']" parameterized="true" timeout="30"/>
-+        <element name="viewLink" type="text" selector="//td/div[contains(.,'{{orderID}}')]/../..//a[@class='action-menu-item']" parameterized="true"/>
-+        <element name="selectOrderID" type="checkbox" selector="//td/div[text()='{{orderId}}']/../preceding-sibling::td//input" parameterized="true" timeout="60"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminShipmentsFilterSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminShipmentsFilterSection.xml
-new file mode 100644
-index 00000000000..b912e16cdd6
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminShipmentsFilterSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminShipmentsFilterSection">
-+        <element name="orderNum" type="input" selector="input[name='order_increment_id']"/>
-+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminShipmentsGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminShipmentsGridSection.xml
-new file mode 100644
-index 00000000000..5edee241a49
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminShipmentsGridSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminShipmentGridSection">
-+        <element name="filter" type="button" selector="[data-action='grid-filter-expand']"/>
-+        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/ConfigurationListSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/ConfigurationListSection.xml
-new file mode 100644
-index 00000000000..bce5f95cf78
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/ConfigurationListSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="ConfigurationListSection">
-+        <element name="sales" type="button" selector="//div[contains(@class, 'admin__page-nav-title title _collapsible')]/strong[text()='Sales']"/>
-+        <element name="salesPaymentMethods" type="button" selector="//span[text()='Payment Methods']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/NewOrderSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/NewOrderSection.xml
-new file mode 100644
-index 00000000000..26e00bf4c0a
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/NewOrderSection.xml
-@@ -0,0 +1,36 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="NewOrderSection">
-+        <element name="createNewOrder" type="button" selector="#add"/>
-+        <element name="customer" type="button" selector="//td[contains(text(), 'Abgar')]"/>
-+        <element name="addProducts" type="button" selector="#add_products"/>
-+        <element name="chooseProduct" type="button" selector="//td[contains(text(),'ProductTest')]"/>
-+        <element name="addSelectedProduct" type="button" selector="//button[@title='Add Selected Product(s) to Order']"/>
-+        <element name="openAddresses" type="button" selector="#order-billing_address_customer_address_id"/>
-+        <element name="chooseAddress" type="button" selector="//select[@id='order-billing_address_customer_address_id']//option[contains(text(), 'Abgar')]"/>
-+        <element name="state" type="button" selector="#order-billing_address_region"/>
-+        <element name="openShippingMethods" type="button" selector="//a[@class='action-default']"/>
-+        <element name="shippingMethod" type="button" selector="//label[@class='admin__field-label' and @for='s_method_flatrate_flatrate']"/>
-+        <element name="creditCardBraintree" type="button" selector="#p_method_braintree"/>
-+        <element name="openCardTypes" type="button" selector="#braintree_cc_type"/>
-+        <element name="masterCard" type="button" selector="//option[contains(text(), 'MasterCard')]"/>
-+        <element name="cardFrame" type="iframe" selector="braintree-hosted-field-number"/>
-+        <element name="monthFrame" type="iframe" selector="braintree-hosted-field-expirationMonth"/>
-+        <element name="yearFrame" type="iframe" selector="braintree-hosted-field-expirationYear"/>
-+        <element name="cvvFrame" type="iframe" selector="braintree-hosted-field-cvv"/>
-+        <element name="creditCardNumber" type="input" selector="#credit-card-number"/>
-+        <element name="expirationMonth" type="input" selector="#expiration-month"/>
-+        <element name="expirationYear" type="input" selector="#expiration-year"/>
-+        <element name="cvv" type="input" selector="#cvv"/>
-+        <element name="submitOrder" type="input" selector="#submit_order_top_button"/>
-+        <element name="successMessage" type="input" selector="#messages"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
-index f54fbf4cf4d..a6b856f9f81 100644
---- a/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="OrdersGridSection">
-         <element name="spinner" type="button" selector=".spinner"/>
-         <element name="gridLoadingMask" type="button" selector=".admin__data-grid-loading-mask"/>
-@@ -16,5 +16,19 @@
-         <element name="submitSearch22" type="button" selector=".//*[@class=&quot;admin__data-grid-filters-wrap&quot;]/parent::*/div[@class=&quot;data-grid-search-control-wrap&quot;]/button"/>
-         <element name="firstRow" type="button" selector="//*[@id='container']//tr[@class='data-row']//a[@class='action-menu-item']"/>
-         <element name="createNewOrder" type="button" selector="button[title='Create New Order'"/>
-+
-+        <element name="website" type="radio" selector="//label[contains(text(), '{{arg}}')]" parameterized="true"/>
-+        <element name="addProducts" type="button" selector="#add_products" timeout="60"/>
-+        <element name="selectProduct" type="checkbox" selector="//td[contains(text(), '{{arg}}')]/following-sibling::td[contains(@class, 'col-select col-in_products')]/label/input" parameterized="true"/>
-+        <element name="setQuantity" type="checkbox" selector="//td[contains(text(), '{{arg}}')]/following-sibling::td[contains(@class, 'col-qty')]/input" parameterized="true"/>
-+        <element name="addProductsToOrder" type="button" selector="//span[text()='Add Selected Product(s) to Order']"/>
-+        <element name="customPrice" type="checkbox" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td/div//span[contains(text(),'Custom Price')]" parameterized="true"/>
-+        <element name="customQuantity" type="input" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td[@class='col-qty']/input" parameterized="true"/>
-+        <element name="update" type="button" selector="//span[text()='Update Items and Quantities']"/>
-+        <element name="discount" type="text" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td[@class='col-discount col-price']/span" parameterized="true"/>
-+        <element name="productPrice" type="text" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td[@class='col-price col-row-subtotal']/span" parameterized="true"/>
-+        <element name="removeItems" type="select" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td/select[@class='admin__control-select']" parameterized="true"/>
-+        <element name="applyCoupon" type="input" selector="#coupons:code"/>
-+        <element name="submitOrder" type="button" selector="#submit_order_top_button" timeout="60"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/SalesOrderPrintSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/SalesOrderPrintSection.xml
-new file mode 100644
-index 00000000000..b08a66140fa
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/SalesOrderPrintSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+    <section name="SalesOrderPrintSection">
-+        <element name="isOrderPrintPage" type="block" selector=".preview-area"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontCustomerOrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontCustomerOrdersGridSection.xml
-new file mode 100644
-index 00000000000..415bac7fd05
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontCustomerOrdersGridSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerOrdersGridSection">
-+        <element name="orderView" type="button" selector="//td[text()='{{orderNumber}}']/following-sibling::td[@class='col actions']/a[contains(@class, 'view')]" parameterized="true" />
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderSearchSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderSearchSection.xml
-new file mode 100644
-index 00000000000..5e420ee03bf
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderSearchSection.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontGuestOrderSearchSection">
-+        <element name="orderId" type="input" selector="#oar-order-id"/>
-+        <element name="billingLastName" type="input" selector="#oar-billing-lastname"/>
-+        <element name="findOrderBy" type="select" selector="#quick-search-type-id"/>
-+        <element name="email" type="input" selector="#oar_email"/>
-+        <element name="continue" type="button" selector="//*/span[contains(text(), 'Continue')]"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml
-new file mode 100644
-index 00000000000..11080761b19
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontGuestOrderViewSection">
-+        <element name="orderInformationTab" type="text" selector="//*[@class='nav item current']/strong[contains(text(), 'Order Information')]"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderAndReturnInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderAndReturnInformationSection.xml
-new file mode 100644
-index 00000000000..55396ce4a0f
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderAndReturnInformationSection.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontOrderAndReturnInformationSection">
-+        <element name="orderId" type="input" selector="#oar-order-id"/>
-+        <element name="bilingLastName" type="input" selector="#oar-billing-lastname"/>
-+        <element name="findOrderBy" type="select" selector="#quick-search-type-id"/>
-+        <element name="email" type="input" selector="#oar_email"/>
-+        <element name="bilingZipCode" type="input" selector="//input[@id='oar_zip']"/>
-+        <element name="continueButton" type="button" selector="//button[@title='Continue']"/>
-+        <element name="ordersAndReturnsTitle" type="text" selector="//span[@id='page-title-wrapper']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderInformationMainSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderInformationMainSection.xml
-new file mode 100644
-index 00000000000..3912e5d5877
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderInformationMainSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontOrderInformationMainSection">
-+        <element name="orderTitle" type="text" selector="#page-title-wrapper"/>
-+        <element name="return" type="text" selector="//span[contains(text(), 'Return')]"/>
-+        <element name="emptyMessage" type="text" selector="//div[contains(concat(' ',normalize-space(@class),' '),' message info empty ')]/span"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderInvoicesSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderInvoicesSection.xml
-new file mode 100644
-index 00000000000..cbf9993b6a6
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderInvoicesSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontOrderInvoicesSection">
-+        <element name="invoiceTab" type="button" selector="//a[contains(text(), 'Invoices')]"/>
-+        <element name="grandTotalPrice" type="text" selector="[data-th='Grand Total'] .price"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AddConfigurableProductToOrderFromShoppingCartTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AddConfigurableProductToOrderFromShoppingCartTest.xml
-new file mode 100644
-index 00000000000..6d9f35efc79
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AddConfigurableProductToOrderFromShoppingCartTest.xml
-@@ -0,0 +1,117 @@
-+<?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="AddConfigurableProductToOrderFromShoppingCartTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Add Products to Order from Shopping Cart"/>
-+            <title value="Add configurable product to order from shopping cart test"/>
-+            <description value="Add configurable product to order from shopping cart"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16008"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+            <!-- Create category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create configurable product -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption"/>
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Admin log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <!-- Customer log out -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Delete configurable product data -->
-+            <deleteData createDataKey="createConfigChildProduct" stepKey="deleteConfigChildProduct"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!-- Login as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Add configurable product to the cart  -->
-+        <actionGroup ref="StorefrontAddConfigurableProductToTheCartActionGroup" stepKey="addConfigurableProductToCart">
-+            <argument name="urlKey" value="$$createConfigProduct.custom_attributes[url_key]$$" />
-+            <argument name="productAttribute" value="$$createConfigProductAttribute.default_value$$"/>
-+            <argument name="productOption" value="$$getConfigAttributeOption.value$$"/>
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Login as admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        <!-- Search and open customer -->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
-+            <argument name="email" value="$$createCustomer.email$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+
-+        <!-- Click create order -->
-+        <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
-+
-+        <!-- Check product in customer's activities in shopping cart section -->
-+        <see selector="{{AdminCustomerActivitiesShoppingCartSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInShoppingCartSection"/>
-+        <see selector="{{AdminCustomerActivitiesShoppingCartSection.productPrice}}" userInput="$$createConfigProduct.price$$" stepKey="seeProductPriceInShoppingCartSection"/>
-+
-+        <!-- Click update changes -->
-+        <checkOption selector="{{AdminCustomerActivitiesShoppingCartSection.addToOrder}}" stepKey="checkOptionAddToOrder"/>
-+        <click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickUpdateChangesBtn"/>
-+        <waitForPageLoad stepKey="waitForOrderUpdating"/>
-+
-+        <!-- Assert product in items ordered grid -->
-+        <see selector="{{AdminCustomerCreateNewOrderSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductName"/>
-+        <see selector="{{AdminCustomerCreateNewOrderSection.productPrice}}" userInput="$$createConfigProduct.price$$" stepKey="seeProductPrice"/>
-+        <seeInField selector="{{AdminCustomerCreateNewOrderSection.productQty}}" userInput="{{ApiSimpleSingleQty.quantity}}" stepKey="seeProductQty"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml
-new file mode 100644
-index 00000000000..76be3a10943
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml
-@@ -0,0 +1,80 @@
-+<?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="AddSimpleProductToOrderFromShoppingCartTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Add Products to Order from Shopping Cart"/>
-+            <title value="Add simple product to order from shopping cart test"/>
-+            <description value="Add simple product to order from shopping cart"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16007"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+            <!-- Create product -->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+        </before>
-+        <after>
-+            <!-- Admin log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <!-- Customer log out -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Delete product -->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+        </after>
-+
-+        <!-- Login as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Add product to cart -->
-+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Login as admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        <!-- Search and open customer -->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
-+            <argument name="email" value="$$createCustomer.email$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+
-+        <!-- Click create order -->
-+        <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
-+
-+        <!-- Check product in customer's activities in shopping cart section -->
-+        <see selector="{{AdminCustomerActivitiesShoppingCartSection.productName}}" userInput="$$createProduct.name$$" stepKey="seeProductNameInShoppingCartSection"/>
-+        <see selector="{{AdminCustomerActivitiesShoppingCartSection.productPrice}}" userInput="$$createProduct.price$$" stepKey="seeProductPriceInShoppingCartSection"/>
-+
-+        <!-- Click update changes -->
-+        <checkOption selector="{{AdminCustomerActivitiesShoppingCartSection.addToOrder}}" stepKey="checkOptionAddToOrder"/>
-+        <click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickUpdateChangesBtn"/>
-+        <waitForPageLoad stepKey="waitForOrderUpdating"/>
-+
-+        <!-- Assert product in items ordered grid -->
-+        <see selector="{{AdminCustomerCreateNewOrderSection.productName}}" userInput="$$createProduct.name$$" stepKey="seeProductName"/>
-+        <see selector="{{AdminCustomerCreateNewOrderSection.productPrice}}" userInput="$$createProduct.price$$" stepKey="seeProductPrice"/>
-+        <seeInField selector="{{AdminCustomerCreateNewOrderSection.productQty}}" userInput="{{ApiSimpleSingleQty.quantity}}" stepKey="seeProductQty"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
-new file mode 100644
-index 00000000000..e405173429b
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
-@@ -0,0 +1,86 @@
-+<?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="AdminAvailabilityCreditMemoWithNoPaymentTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="MAGETWO-91547: Unable to create Credit memo for order with no payment required"/>
-+            <title value="Checking availability of 'Credit memo' button for order with no payment required"/>
-+            <description value="*Credit Memo* button should be displayed"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94470"/>
-+            <group value="sales"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <!-- Enable *Free Shipping* -->
-+            <createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Disable *Free Shipping* -->
-+            <createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
-+            <createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
-+                <argument name="customerEmail" value="Simple_US_Customer.email"/>
-+            </actionGroup>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+            <actionGroup ref="logout" stepKey="logOut"/>
-+        </after>
-+
-+        <!--Proceed to Admin panel > SALES > Orders. Created order should be in Processing status-->
-+        <actionGroup ref="navigateToNewOrderPageNewCustomer" stepKey="navigateToNewOrderPage"/>
-+
-+        <!--Check if order can be submitted without the required fields including email address-->
-+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage"/>
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addFirstProductToOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Click *Custom Price* link, enter 0 and click *Update Items and Quantities* button-->
-+        <click selector="{{AdminOrderFormItemsSection.customPriceCheckbox}}" stepKey="clickCustomPriceCheckbox"/>
-+        <waitForElementVisible selector="{{AdminOrderFormItemsSection.customPriceField}}" stepKey="waitForPriceFieldAppears"/>
-+        <fillField selector="{{AdminOrderFormItemsSection.customPriceField}}" userInput="0" stepKey="fillCustomPriceField"/>
-+        <click selector="{{AdminOrderFormItemsSection.updateItemsAndQuantities}}" stepKey="clickUpdateItemsAndQuantitiesButton"/>
-+
-+        <!--Fill customer group and customer email-->
-+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup"/>
-+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail"/>
-+
-+        <!--Fill customer address information-->
-+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress">
-+            <argument name="customer" value="Simple_US_Customer"/>
-+            <argument name="address" value="US_Address_TX"/>
-+        </actionGroup>
-+
-+        <!-- Select Free shipping -->
-+        <actionGroup ref="orderSelectFreeShipping" stepKey="selectFreeShippingOption"/>
-+
-+        <!--Click *Submit Order* button-->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
-+
-+        <!--Click *Invoice* button-->
-+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startCreateInvoice"/>
-+        <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
-+
-+        <!--Verify that *Credit Memo* button is displayed-->
-+        <seeElement selector="{{AdminOrderFormItemsSection.creditMemo}}" stepKey="seeCreditMemo"/>
-+        <click selector="{{AdminOrderFormItemsSection.creditMemo}}" stepKey="clickCreditMemoItem"/>
-+        <waitForPageLoad stepKey="waitForCreditMemoPageLoaded"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoPageTitle"/>
-+        <seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeNewMemoUrlOnPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithBankTransferPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithBankTransferPaymentMethodTest.xml
-new file mode 100644
-index 00000000000..74cf3e9dd6b
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithBankTransferPaymentMethodTest.xml
-@@ -0,0 +1,83 @@
-+<?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="AdminCancelTheCreatedOrderWithBankTransferPaymentMethodTest">
-+        <annotations>
-+            <group value="Sales"/>
-+            <stories value="Cancel Created Order"/>
-+            <title value="Cancel the created order with bank transfer payment method"/>
-+            <description value="Created an order with bank transfer payment method and cancel the order"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16068"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Enable Bank Transfer payment -->
-+            <magentoCLI command="config:set {{EnablePaymentBankTransferConfigData.path}} {{EnablePaymentBankTransferConfigData.value}}" stepKey="enableBankTransferPayment"/>
-+
-+            <!--Set default flat rate shipping method settings-->
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+
-+            <!--Create simple customer-->
-+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
-+
-+            <!-- Create Simple Product -->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct">
-+                <field key="price">10.00</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{DisablePaymentBankTransferConfigData.path}} {{DisablePaymentBankTransferConfigData.value}}" stepKey="disableBankTransferPayment"/>
-+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create new customer order-->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
-+            <argument name="customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Add Simple product to order-->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToTheOrder">
-+            <argument name="product" value="$$simpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Select FlatRate shipping method-->
-+        <actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-+
-+        <!-- Select bank Transfer payment method -->
-+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
-+        <conditionalClick selector="{{AdminOrderFormPaymentSection.bankTransferOption}}" dependentSelector="{{AdminOrderFormPaymentSection.bankTransferOption}}" visible="true" stepKey="checkBankTransferOption"/>
-+
-+        <!-- Submit order -->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
-+
-+        <!-- Verify order information -->
-+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
-+
-+        <!-- Cancel the Order -->
-+        <actionGroup ref="cancelPendingOrder" stepKey="cancelPendingOrder"/>
-+
-+        <!--Log in to Storefront as Customer  -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-+            <argument name="Customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert OrderId and status in frontend order grid -->
-+        <click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
-+        <waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
-+        <seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'Canceled')}}" stepKey="seeOrderStatusInGrid"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest.xml
-new file mode 100644
-index 00000000000..a412adee939
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest.xml
-@@ -0,0 +1,83 @@
-+<?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="AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest">
-+        <annotations>
-+            <group value="Sales"/>
-+            <stories value="Cancel Created Order"/>
-+            <title value="Cancel the created order with cash on delivery payment method"/>
-+            <description value="Create an order with cash on delivery payment method and cancel the order"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16069"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Enable Cash On Delivery payment method -->
-+            <magentoCLI command="config:set {{EnableCashOnDeliveryConfigData.path}} {{EnableCashOnDeliveryConfigData.value}}" stepKey="enableCashOnDeliveryPayment"/>
-+
-+            <!--Set default flat rate shipping method settings-->
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+
-+            <!--Create simple customer-->
-+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
-+
-+            <!-- Create Simple Product -->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct">
-+                <field key="price">10.00</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{DisableCashOnDeliveryConfigData.path}} {{DisableCashOnDeliveryConfigData.value}}" stepKey="disableCashOnDeliveryPayment"/>
-+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create new customer order -->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
-+            <argument name="customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Add Simple product to order -->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToTheOrder">
-+            <argument name="product" value="$$simpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Select FlatRate shipping method -->
-+        <actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-+
-+        <!-- Select Cash On Delivery payment method -->
-+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
-+        <checkOption selector="{{AdminOrderFormPaymentSection.cashOnDeliveryOption}}" stepKey="selectCashOnDeliveryPaymentOption"/>
-+
-+        <!-- Submit order -->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
-+
-+        <!--Verify order information-->
-+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
-+
-+        <!-- Cancel the Order -->
-+        <actionGroup ref="cancelPendingOrder" stepKey="cancelPendingOrder"/>
-+
-+        <!--Log in to Storefront as Customer  -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-+            <argument name="Customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert Order status in frontend grid -->
-+        <click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
-+        <waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
-+        <seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'Canceled')}}" stepKey="seeOrderStatusInGrid"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
-new file mode 100644
-index 00000000000..614946d7f8a
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
-@@ -0,0 +1,215 @@
-+<?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="AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest">
-+        <annotations>
-+            <group value="Sales"/>
-+            <stories value="Cancel Created Order"/>
-+            <title value="Cancel the created order with check/money order payment method"/>
-+            <description value=" Create an order with check/money order payment method and cancel the order"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16066"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!--Set default flat rate shipping method settings-->
-+            <createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
-+
-+            <!--Create simple customer-->
-+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
-+
-+            <!-- Create the category -->
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+
-+            <!-- Create Virtual Product -->
-+            <createData entity="VirtualProduct" stepKey="virtualProduct">
-+                <field key="price">10.00</field>
-+            </createData>
-+
-+            <!-- Create Simple Product -->
-+            <createData entity="ApiSimplePrice10Qty10" stepKey="simpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">10.00</field>
-+            </createData>
-+
-+            <!--Create Bundle product-->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <createData entity="BundleProductPriceViewRange" stepKey="createBundleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="DropDownBundleOption" stepKey="createBundleOption1_1">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <field key="required">True</field>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption1_1"/>
-+                <requiredEntity createDataKey="simpleProduct1"/>
-+            </createData>
-+
-+            <!-- Create configurable product and add it to the category -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Create an attribute with two options to be used in the first child product -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Add the attribute we just created to default attribute set -->
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Get the option of the attribute we created -->
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create a simple product and give it the attribute with option -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+
-+            <!-- Create the configurable product -->
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+
-+            <!-- Add simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="virtualProduct" stepKey="deleteVirtualProduct"/>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigurableProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteProductAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create new customer order-->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
-+            <argument name="customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Add bundle product to order and check product price in grid-->
-+        <actionGroup ref="addBundleProductToOrder" stepKey="addBundleProductToOrder">
-+            <argument name="product" value="$$createBundleProduct$$"/>
-+            <argument name="quantity" value="1"/>
-+        </actionGroup>
-+
-+        <!--Add configurable product to order-->
-+        <actionGroup ref="newAddConfigurableProductToOrder" stepKey="addConfigurableProductToOrder">
-+            <argument name="product" value="$$createConfigProduct$$"/>
-+            <argument name="attribute" value="$$createConfigProductAttribute$$"/>
-+            <argument name="option" value="$$getConfigAttributeOption1$$"/>
-+        </actionGroup>
-+
-+        <!--Add Simple product to order-->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToTheOrder">
-+            <argument name="product" value="$$simpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Add Virtual product to order-->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addVirtualProductToTheOrder">
-+            <argument name="product" value="$$virtualProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Select FlatRate shipping method-->
-+        <actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-+
-+        <!-- Submit order -->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
-+
-+        <!--Verify order information-->
-+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
-+
-+        <!-- Cancel the Order -->
-+        <actionGroup ref="cancelPendingOrder" stepKey="cancelPendingOrder"/>
-+
-+        <!-- Assert Simple Product Quantity in backend after order Canceled -->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterAndSelectTheProduct">
-+            <argument name="productSku" value="$$simpleProduct.sku$$"/>
-+        </actionGroup>
-+        <waitForElementVisible selector="{{AdminProductFormSection.productName}}" stepKey="waitForProductDetailsToLoad"/>
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="$$simpleProduct.name$$" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="10" stepKey="seeProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStockStatus"/>
-+
-+        <!-- Assert Virtual Product Quantity in backend after order canceled-->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterAndSelectTheVirtualProduct">
-+            <argument name="productSku" value="$$virtualProduct.sku$$"/>
-+        </actionGroup>
-+        <waitForElementVisible selector="{{AdminProductFormSection.productName}}" stepKey="waitForProductDetailsToLoad1"/>
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="$$virtualProduct.name$$" stepKey="seeVirtualProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="1000" stepKey="seeVirtualProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="seeVirtualProductStockStatus"/>
-+
-+        <!-- Assert Bundle Product quantity in backend after order canceled-->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterAndSelectTheBundleProduct">
-+            <argument name="productSku" value="$$simpleProduct1.sku$$"/>
-+        </actionGroup>
-+        <waitForElementVisible selector="{{AdminProductFormSection.productName}}" stepKey="waitForProductDetailsToLoad2"/>
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="$$simpleProduct1.name$$" stepKey="seeBundleProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="1000" stepKey="seeBundleProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="seeBundleProductStockStatus"/>
-+
-+        <!-- Assert Configurable Product quantity in backend after order canceled-->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterAndSelectTheConfigProduct">
-+            <argument name="productSku" value="$$createConfigChildProduct1.sku$$"/>
-+        </actionGroup>
-+        <waitForElementVisible selector="{{AdminProductFormSection.productName}}" stepKey="waitForProductDetailsToLoad3"/>
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="$$createConfigChildProduct1.name$$" stepKey="seeConfigProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="1000" stepKey="seeConfigProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="seeConfigProductStockStatus"/>
-+
-+        <!-- Open Order Index Page -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-+        <waitForPageLoad stepKey="waitForPageLoad5"/>
-+
-+        <!-- Filter order using orderId -->
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
-+            <argument name="orderId" value="$orderId"/>
-+        </actionGroup>
-+        <see selector="{{AdminOrdersGridSection.firstRow}}" userInput="$orderId" stepKey="seeOrderIdInGrid"/>
-+        <see selector="{{AdminOrdersGridSection.firstRow}}" userInput="Canceled" stepKey="seeStatusInGrid"/>
-+
-+        <!--Log in to Storefront as Customer  -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-+            <argument name="Customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert Order status in frontend order grid -->
-+        <click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
-+        <waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
-+        <seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'Canceled')}}" stepKey="seeOrderStatusInGrid"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml
-new file mode 100644
-index 00000000000..4300f22c3fb
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml
-@@ -0,0 +1,125 @@
-+<?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="AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest">
-+        <annotations>
-+            <group value="Sales"/>
-+            <stories value="Cancel Created Order"/>
-+            <title value="Cancel the created order with product quantity without stock decrease"/>
-+            <description value="Create an order with product quantity without stock decrease, cancel the order and verify product quantity in backend"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16071"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <magentoCLI command="config:set {{DisableCatalogInventoryConfigData.path}} {{DisableCatalogInventoryConfigData.value}}" stepKey="disableDecreaseInQuantityAfterOrder"/>
-+
-+            <!--Set default flat rate shipping method settings-->
-+            <createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
-+
-+            <!--Create simple customer-->
-+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
-+
-+            <!-- Create the category -->
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+
-+            <!-- Create Simple Product -->
-+            <createData entity="ApiSimplePrice10Qty10" stepKey="simpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">10.00</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{EnableCatalogInventoryConfigData.path}} {{EnableCatalogInventoryConfigData.value}}" stepKey="enableDecreaseInQuantityAfterOrder"/>
-+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create new customer order-->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
-+            <argument name="customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Add Simple product to order-->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToTheOrder">
-+            <argument name="product" value="$$simpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Select FlatRate shipping method-->
-+        <actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-+
-+        <!--Submit order-->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
-+
-+        <!--Verify order information-->
-+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
-+
-+        <!-- Assert Simple Product Quantity in backend after order -->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterAndSelectTheProduct">
-+            <argument name="productSku" value="$$simpleProduct.sku$$"/>
-+        </actionGroup>
-+        <waitForElementVisible selector="{{AdminProductFormSection.productName}}" stepKey="waitForProductDetailsToLoad"/>
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="$$simpleProduct.name$$" stepKey="seeProductName"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="10" stepKey="seeProductQuantity"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStockStatus"/>
-+
-+        <!-- Open Order Index Page -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-+        <waitForPageLoad stepKey="waitForPageLoad5"/>
-+
-+        <!-- Filter Order using orderId -->
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
-+            <argument name="orderId" value="$orderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminOrdersGridSection.rowViewAction('1')}}" stepKey="clickOnViewAction"/>
-+
-+        <!-- Cancel the Order -->
-+        <actionGroup ref="cancelPendingOrder" stepKey="cancelPendingOrder"/>
-+
-+        <!-- Assert Simple Product Quantity in backend after Cancelling the order -->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterAndSelectTheProduct1">
-+            <argument name="productSku" value="$$simpleProduct.sku$$"/>
-+        </actionGroup>
-+        <waitForElementVisible selector="{{AdminProductFormSection.productName}}" stepKey="waitForProductDetailsToLoad1"/>
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="$$simpleProduct.name$$" stepKey="seeProductName1"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="10" stepKey="seeProductQuantityAfterCancelOrder"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStockStatusAfterCancelOrder"/>
-+
-+        <!-- Open Order Index Page -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad6"/>
-+
-+        <!-- Filter Order using orderId -->
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById1">
-+            <argument name="orderId" value="$orderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminOrdersGridSection.rowViewAction('1')}}" stepKey="clickOnViewAction1"/>
-+        <waitForPageLoad stepKey="waitForOrderPageToLoad"/>
-+
-+        <!-- Reorder the product -->
-+        <click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickOnReorderButton"/>
-+        <waitForPageLoad stepKey="waitForReorderFormToLoad"/>
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder1"/>
-+
-+        <!-- Assert Simple Product Quantity in backend after Reorder -->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterAndSelectTheProduct2">
-+            <argument name="productSku" value="$$simpleProduct.sku$$"/>
-+        </actionGroup>
-+        <waitForElementVisible selector="{{AdminProductFormSection.productName}}" stepKey="waitForProductDetailsToLoad2"/>
-+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="$$simpleProduct.name$$" stepKey="seeProductName2"/>
-+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="10" stepKey="seeProductQuantityAfterReorder"/>
-+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStockStatusAfterReorder"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithPurchaseOrderPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithPurchaseOrderPaymentMethodTest.xml
-new file mode 100644
-index 00000000000..d14987dd2e8
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithPurchaseOrderPaymentMethodTest.xml
-@@ -0,0 +1,89 @@
-+<?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="AdminCancelTheCreatedOrderWithPurchaseOrderPaymentMethodTest">
-+        <annotations>
-+            <group value="Sales"/>
-+            <stories value="Cancel Created Order"/>
-+            <title value="Cancel the created order with purchase order payment method"/>
-+            <description value="Create an order using Purchase Order payment method and cancel the order"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16070"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Enable Purchase Order payment method -->
-+            <magentoCLI command="config:set {{EnablePurchaseOrderConfigData.path}} {{EnablePurchaseOrderConfigData.value}}" stepKey="enableCPurchaseOrderPayment"/>
-+
-+            <!--Set default flat rate shipping method settings-->
-+            <createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
-+
-+            <!--Create simple customer-->
-+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
-+
-+            <!-- Create Simple Product -->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{DisablePurchaseOrderConfigData.path}} {{DisablePurchaseOrderConfigData.value}}" stepKey="disablePurchaseOrderPayment"/>
-+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create new customer order-->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
-+            <argument name="customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Add Simple product to order-->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToTheOrder">
-+            <argument name="product" value="$$simpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Select FlatRate shipping method-->
-+        <actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-+
-+        <!-- Select purchase order payment method and enter purchase order number -->
-+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
-+        <checkOption selector="{{AdminOrderFormPaymentSection.purchaseOrderOption}}" stepKey="selectPurchaseOrderPaymentOption"/>
-+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.purchaseOrderNumber}}" stepKey="waitForElementToBeVisible"/>
-+        <fillField selector="{{AdminOrderFormPaymentSection.purchaseOrderNumber}}" userInput="{{PurchaseOrderNumber.number}}" stepKey="fillPurchaseOrderNumber"/>
-+        <click selector="{{AdminOrderFormActionSection.pageHeader}}" stepKey="clickOnHeader"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+
-+        <!--Submit order-->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
-+
-+        <!--Verify order information-->
-+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
-+
-+        <!-- Cancel the Order -->
-+        <actionGroup ref="cancelPendingOrder" stepKey="cancelPendingOrder"/>
-+
-+        <!--Log in to Storefront as Customer  -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-+            <argument name="Customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert Order status in frontend order grid -->
-+        <click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
-+        <waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
-+        <seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'Canceled')}}" stepKey="seeOrderStatusInGrid"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithZeroSubtotalCheckoutTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithZeroSubtotalCheckoutTest.xml
-new file mode 100644
-index 00000000000..f8c5b46dc6f
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithZeroSubtotalCheckoutTest.xml
-@@ -0,0 +1,84 @@
-+<?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="AdminCancelTheCreatedOrderWithZeroSubtotalCheckoutTest">
-+        <annotations>
-+            <group value="Sales"/>
-+            <stories value="Cancel Created Order"/>
-+            <title value="Cancel the created order with zero subtotal checkout"/>
-+            <description value="Create an order with Zero Subtotal checkout and cancel the order"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16067"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Enable Zero Subtotal Checkout -->
-+            <magentoCLI command="config:set {{EnableZeroSubtotalCheckoutConfigData.path}} {{EnableZeroSubtotalCheckoutConfigData.value}}" stepKey="enableZeroSubtotalCheckout"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!--Set Free shipping method settings-->
-+            <createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
-+
-+            <!--Create simple customer-->
-+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
-+
-+            <!-- Create Simple Product -->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct">
-+                <field key="price">10.00</field>
-+            </createData>
-+
-+            <!-- Create a slaes rule with fixed discount -->
-+            <createData entity="SalesRuleNoCouponWithFixedDiscount" stepKey="createSalesRule"/>
-+        </before>
-+        <after>
-+            <!-- Disable Free Shipping -->
-+            <createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
-+            <createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>
-+            <deleteData createDataKey="createSalesRule" stepKey="deleteSalesRule"/>
-+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create new customer order-->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
-+            <argument name="customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Add Simple product to order-->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToTheOrder">
-+            <argument name="product" value="$$simpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Select FlatRate shipping method-->
-+        <actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-+
-+        <!--Submit order-->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
-+
-+        <!--Verify order information-->
-+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
-+
-+        <!-- Cancel the Order -->
-+        <actionGroup ref="cancelPendingOrder" stepKey="cancelPendingOrder"/>
-+
-+        <!--Log in to Storefront as Customer  -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-+            <argument name="Customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert Order status in frontend grid -->
-+        <click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
-+        <waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
-+        <seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'Canceled')}}" stepKey="seeOrderStatusInGrid"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrder.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrder.xml
-new file mode 100644
-index 00000000000..85ef563e10d
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrder.xml
-@@ -0,0 +1,38 @@
-+<?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="AdminChangeCustomerGroupInNewOrder">
-+        <annotations>
-+            <title value="Customer account group cannot be selected while creating a new customer in order"/>
-+            <stories value="MC-15290: Customer account group cannot be selected while creating a new customer in order"/>
-+            <description value="Customer account group cannot be selected while creating a new customer in order"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-15290"/>
-+            <useCaseId value="MC-15289"/>
-+            <group value="sales"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        
-+        <actionGroup ref="navigateToNewOrderPageNewCustomerSingleStore" stepKey="openNewOrder"/>
-+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="Retailer" stepKey="selectCustomerGroup"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <grabValueFrom selector="{{AdminOrderFormAccountSection.group}}" stepKey="grabGroupValue"/>
-+        <assertEquals stepKey="assertValueIsStillSelected">
-+            <actualResult type="variable">$grabGroupValue</actualResult>
-+            <expectedResult type="string">3</expectedResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingDateAfterChangeInterfaceLocaleTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingDateAfterChangeInterfaceLocaleTest.xml
-new file mode 100644
-index 00000000000..add8f7d2ae2
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingDateAfterChangeInterfaceLocaleTest.xml
-@@ -0,0 +1,92 @@
-+<?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="AdminCheckingDateAfterChangeInterfaceLocaleTest">
-+        <annotations>
-+            <features value="Ui"/>
-+            <stories value="Checking the value in a grid column"/>
-+            <title value="Checking date format in orders grid column after changing admin interface locale"/>
-+            <description value="Checking date format in orders grid column after changing admin interface locale"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-17761"/>
-+            <useCaseId value="MC-17269"/>
-+            <group value="backend"/>
-+            <group value="ui"/>
-+            <group value="sales"/>
-+        </annotations>
-+        <before>
-+            <!--Deploy static content with French locale-->
-+            <magentoCLI command="setup:static-content:deploy fr_FR" stepKey="deployStaticContentWithFrenchLocale"/>
-+            <!--Create entities-->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <!--Login to Admin page-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!--Delete entities-->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <!--Set Admin "Interface Locale" to default value-->
-+            <actionGroup ref="SetAdminAccountActionGroup" stepKey="setAdminInterfaceLocaleToDefaultValue">
-+                <argument name="InterfaceLocaleByValue" value="en_US"/>
-+            </actionGroup>
-+            <!--Clear filters-->
-+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
-+            <!--Logout from Admin page-->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create order-->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <grabTextFrom selector="{{AdminOrderDetailsInformationSection.orderId}}" stepKey="grabOrderId"/>
-+
-+        <!--Filter orders grid by ID on Admin page-->
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
-+            <argument name="orderId" value="{$grabOrderId}"/>
-+        </actionGroup>
-+
-+        <!--Get date from "Purchase Date" column-->
-+        <grabTextFrom selector="{{AdminOrdersGridSection.gridCell('1','Purchase Date')}}" stepKey="grabPurchaseDateInDefaultLocale"/>
-+
-+        <!--Get month name in default locale (US)-->
-+        <executeJS function="return (new Date('{$grabPurchaseDateInDefaultLocale}').toLocaleDateString('en-US', {month: 'short'}))" stepKey="getMonthNameInUS"/>
-+
-+        <!--Checking Date with default "Interface Locale"-->
-+        <assertContains stepKey="checkingDateWithDefaultInterfaceLocale">
-+            <expectedResult type="variable">getMonthNameInUS</expectedResult>
-+            <actualResult type="variable">grabPurchaseDateInDefaultLocale</actualResult>
-+        </assertContains>
-+
-+        <!--Set Admin "Interface Locale" to "Français (France) / français (France)"-->
-+        <actionGroup ref="SetAdminAccountActionGroup" stepKey="setAdminInterfaceLocaleToFrance">
-+            <argument name="InterfaceLocaleByValue" value="fr_FR"/>
-+        </actionGroup>
-+
-+        <!--Filter orders grid by ID on Admin page after changing "Interface Locale"-->
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridByIdAfterSetFrenchLocale">
-+            <argument name="orderId" value="{$grabOrderId}"/>
-+        </actionGroup>
-+
-+        <!--Get date from "Purchase Date" column after changing "Interface Locale"-->
-+        <grabTextFrom selector="{{AdminOrdersGridSection.gridCell('1','Purchase Date')}}" stepKey="grabPurchaseDateInFrenchLocale"/>
-+
-+        <!--Get month name in French-->
-+        <executeJS function="return (new Date('{$grabPurchaseDateInDefaultLocale}').toLocaleDateString('fr-FR', {month: 'short'}))" stepKey="getMonthNameInFrench"/>
-+
-+        <!--Checking Date after changing "Interface Locale"-->
-+        <assertContains stepKey="checkingDateAfterChangeInterfaceLocale">
-+            <expectedResult type="variable">getMonthNameInFrench</expectedResult>
-+            <actualResult type="variable">grabPurchaseDateInFrenchLocale</actualResult>
-+        </assertContains>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
-new file mode 100644
-index 00000000000..1ad736ade37
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
-@@ -0,0 +1,92 @@
-+<?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="AdminCorrectnessInvoicedItemInBundleProductTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Product invoice"/>
-+            <title value="Check correctness of invoiced items in a Bundle Product"/>
-+            <description value="Check correctness of invoiced items in a Bundle Product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11059"/>
-+            <useCaseId value="MC-10969"/>
-+            <group value="sales"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!--Create category and simple product-->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!--Create bundle product-->
-+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createBundleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="bundleOption"/>
-+                <requiredEntity createDataKey="createSimpleProduct"/>
-+                <field key="qty">10</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
-+
-+            <actionGroup ref="logout" stepKey="logOut"/>
-+        </after>
-+
-+        <!--Complete Bundle product creation-->
-+        <amOnPage url="{{AdminProductEditPage.url($$createBundleProduct.id$$)}}" stepKey="goToProductEditPage"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!--Go to bundle product page-->
-+        <amOnPage url="{{StorefrontProductPage.url($$createCategory.name$$)}}" stepKey="navigateToBundleProductPage"/>
-+
-+        <!--Place order bundle product with 10 options-->
-+        <actionGroup ref="StorefrontAddCategoryBundleProductToCartActionGroup" stepKey="addBundleProductToCart">
-+            <argument name="product" value="$$createBundleProduct$$"/>
-+            <argument name="quantity" value="10"/>
-+        </actionGroup>
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
-+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping"/>
-+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeOrder">
-+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage" />
-+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
-+        </actionGroup>
-+
-+        <!--Go to order page submit invoice-->
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
-+            <argument name="orderId" value="$grabOrderNumber"/>
-+        </actionGroup>
-+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-+        <waitForPageLoad stepKey="waitForCreatedOrderPageOpened"/>
-+        <actionGroup ref="goToInvoiceIntoOrder" stepKey="goToInvoiceIntoOrderPage"/>
-+        <fillField selector="{{AdminInvoiceItemsSection.qtyToInvoiceColumn}}" userInput="5" stepKey="ChangeQtyToInvoice"/>
-+        <click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="updateQunatity"/>
-+        <waitForPageLoad stepKey="waitPageToBeLoaded"/>
-+        <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
-+
-+        <!--Verify invoiced items qty in ship tab-->
-+        <actionGroup ref="goToShipmentIntoOrder" stepKey="goToShipment"/>
-+        <grabTextFrom selector="{{AdminShipmentItemsSection.itemQtyInvoiced('1')}}" stepKey="grabInvoicedItemQty"/>
-+        <assertEquals expected="5" expectedType="string" actual="$grabInvoicedItemQty" stepKey="assertInvoicedItemsQty"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
-new file mode 100644
-index 00000000000..e498279ee99
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
-@@ -0,0 +1,142 @@
-+<?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="AdminCreateCreditMemoBankTransferPaymentTest">
-+        <annotations>
-+            <stories value="Credit memo entity"/>
-+            <title value="Create Credit Memo with Bank Transfer Payment"/>
-+            <description value="Create Credit Memo with Bank Transfer Payment and assert 0 shipping refund"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-15862"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create Data -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Enable payment method one of "Check/Money Order", "Bank Transfer Payment" and  shipping method one of "Flat Rate" -->
-+            <magentoCLI command="config:set {{enabledCheckMoneyOrder.label}} {{enabledCheckMoneyOrder.value}}" stepKey="enableCheckMoneyOrder"/>
-+            <magentoCLI command="config:set {{enabledBankTransferPaymentOrder.label}} {{enabledBankTransferPaymentOrder.value}}" stepKey="enableBankTransfer"/>
-+            <createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{disabledBankTransferPaymentOrder.label}} {{disabledBankTransferPaymentOrder.value}}" stepKey="disableBankTransfer"/>
-+            <!-- Delete data -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Create Order -->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderPage">
-+            <argument name="customer" value="$createCustomer$"/>
-+        </actionGroup>
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSecondProduct">
-+            <argument name="product" value="$createProduct$"/>
-+        </actionGroup>
-+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerInfo">
-+            <argument name="customer" value="$createCustomer$"/>
-+            <argument name="address" value="US_Address_TX"/>
-+        </actionGroup>
-+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRate"/>
-+        <conditionalClick selector="{{AdminOrderFormPaymentSection.linkPaymentOptions}}" dependentSelector="{{AdminOrderFormPaymentSection.linkPaymentOptions}}" visible="true" stepKey="openMoneyOption"/>
-+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
-+        <checkOption selector="{{AdminOrderFormPaymentSection.checkBankTransfer}}" stepKey="checkBankTransfer"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForDisappear"/>
-+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
-+        <waitForPageLoad stepKey="waitForSubmitOrderPage"/>
-+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
-+
-+        <!-- Create Invoice -->
-+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startInvoice"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
-+
-+        <!-- Go to Sales > Orders > find out placed order and open -->
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="grabOrderId" />
-+        <assertNotEmpty actual="$grabOrderId" stepKey="assertOrderIdIsNotEmpty" after="grabOrderId"/>
-+        <actionGroup ref="OpenOrderById" stepKey="openOrder">
-+            <argument name="orderId" value="{$grabOrderId}"/>
-+        </actionGroup>
-+
-+        <!-- Click 'Credit Memo' button and fill data from dataset: refund -->
-+        <actionGroup ref="AdminOpenAndFillCreditMemoRefundActionGroup" stepKey="fillCreditMemoRefund">
-+            <argument name="itemQtyToRefund" value="1"/>
-+            <argument name="shippingRefund" value="0"/>
-+            <argument name="adjustmentRefund" value="5"/>
-+            <argument name="adjustmentFee" value="10"/>
-+        </actionGroup>
-+
-+        <!-- On order's page click 'Refund offline' button -->
-+        <scrollTo selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="scrollTOButton"/>
-+        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
-+        <waitForPageLoad stepKey="waitForResultPage"/>
-+
-+        <!-- Perform all assertions: assert refund success create message -->
-+        <see selector="{{AdminIndexManagementSection.successMessage}}" userInput="You created the credit memo." stepKey="assertRefundSuccessCreateMessage"/>
-+
-+        <!-- Assert Credit Memo button -->
-+        <dontSeeElement selector="{{AdminOrderFormItemsSection.creditMemo}}" stepKey="assertNoCreditMemoButton"/>
-+
-+        <!--Assert refund in Credit Memo Tab -->
-+        <click selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" stepKey="clickCreditMemoTab"/>
-+        <waitForPageLoad stepKey="waitForTabLoad"/>
-+        <grabTextFrom selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="grabMemoId"/>
-+        <assertNotEmpty actual="$grabMemoId" stepKey="assertMemoIdIsNotEmpty" after="grabMemoId"/>
-+        <click selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="clickView"/>
-+        <waitForPageLoad stepKey="waitForCreditMemo"/>
-+        <scrollTo selector="{{AdminCreditMemoViewTotalSection.subtotal}}" stepKey="scrollToTotal"/>
-+        <see selector="{{AdminCreditMemoViewTotalSection.subtotal}}" userInput="$560.00" stepKey="seeSubtotal"/>
-+        <see selector="{{AdminCreditMemoViewTotalSection.adjustmentRefund}}" userInput="$5.00" stepKey="seeAdjustmentRefund"/>
-+        <see selector="{{AdminCreditMemoViewTotalSection.adjustmentFee}}" userInput="$10.00" stepKey="seeAdjustmentFee"/>
-+        <see selector="{{AdminCreditMemoViewTotalSection.grandTotal}}" userInput="$555.00" stepKey="assertRefundOnCreditMemoTab"/>
-+
-+        <!-- Assert CreditMemo items -->
-+        <scrollTo selector="{{AdminCreditMemoViewItemsSection.blockItemsRefunded}}" stepKey="scrollToRefundedItems"/>
-+        <see userInput="$$createProduct.name$$" selector="{{AdminCreditMemoViewItemsSection.productName}}" stepKey="seeProductName"/>
-+        <see userInput="$$createProduct.price$$" selector="{{AdminCreditMemoViewItemsSection.productPrice}}" stepKey="seePricePerItem"/>
-+        <see userInput="1" selector="{{AdminCreditMemoViewItemsSection.productQty}}" stepKey="seeQty"/>
-+
-+        <!--Assert refund in refunds grid-->
-+        <actionGroup ref="AdminAssertRefundInRefundsGridActionGroup" stepKey="assertRefund">
-+            <argument name="orderId" value="{$grabOrderId}"/>
-+            <argument name="memoId" value="{$grabMemoId}"/>
-+            <argument name="refundStatus" value="Refunded"/>
-+            <argument name="refundedTotal" value="$555.00"/>
-+        </actionGroup>
-+
-+        <!--Login to storefront as previously created customer-->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert refunded Grand Total on frontend -->
-+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="onAccountPage"/>
-+        <waitForPageLoad stepKey="waitForPage"/>
-+        <scrollTo selector="{{StorefrontCustomerResentOrdersSection.blockResentOrders}}" stepKey="scrollToResent"/>
-+        <click selector="{{StorefrontCustomerResentOrdersSection.viewOrder({$grabOrderId})}}" stepKey="clickOnOrder"/>
-+        <waitForPageLoad stepKey="waitForViewOrder"/>
-+        <click selector="{{StorefrontCustomerOrderSection.tabRefund}}" stepKey="clickRefund"/>
-+        <waitForPageLoad stepKey="waitRefundsLoad"/>
-+        <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
-+        <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="555.00" stepKey="seeGrandTotal"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoConfigurableProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoConfigurableProductTest.xml
-new file mode 100644
-index 00000000000..06cffd27933
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoConfigurableProductTest.xml
-@@ -0,0 +1,159 @@
-+<?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="AdminCreateCreditMemoConfigurableProductTest">
-+        <annotations>
-+            <stories value="Credit memo entity"/>
-+            <title value="Create Credit Memo for Offline Payment Methods"/>
-+            <description value="Create CreditMemo return to stock only one unit of configurable product"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-15865"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create Data -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+            <!-- Create the category -->
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+
-+            <!-- Create the configurable product and add it to the category -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">40</field>
-+            </createData>
-+
-+            <!-- Create an attribute with two options to be used in the first child product -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Add the attribute we just created to default attribute set -->
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Get the option of the attribute we created -->
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create a simple product and give it the attribute with option -->
-+            <createData entity="ApiSimpleOneQty10" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <field key="price">40</field>
-+            </createData>
-+            <createData entity="ApiSimpleTwoQty10" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+                <field key="price">40</field>
-+            </createData>
-+
-+            <!-- Create the configurable product -->
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <!-- Add simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+
-+            <!-- Enable payment method one of "Check/Money Order" and  shipping method one of "Flat Rate" -->
-+            <magentoCLI command="config:set {{enabledCheckMoneyOrder.label}} {{enabledCheckMoneyOrder.value}}" stepKey="enableCheckMoneyOrder"/>
-+            <createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
-+        </before>
-+        <after>
-+            <!-- Delete data -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteApiCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Create Order -->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderPage">
-+            <argument name="customer" value="$createCustomer$"/>
-+        </actionGroup>
-+
-+        <!--Add configurable product to order-->
-+        <actionGroup ref="addConfigurableProductToOrderFromAdmin" stepKey="addConfigurableProductToOrder">
-+            <argument name="product" value="$$createConfigProduct$$"/>
-+            <argument name="attribute" value="$$createConfigProductAttribute$$"/>
-+            <argument name="option" value="$$getConfigAttributeOption1$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerInfo">
-+            <argument name="customer" value="$createCustomer$"/>
-+            <argument name="address" value="US_Address_TX"/>
-+        </actionGroup>
-+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRate"/>
-+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
-+        <waitForPageLoad stepKey="waitForSubmitOrderPage"/>
-+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
-+
-+        <!-- Create Invoice -->
-+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startInvoice"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
-+
-+        <!-- Go to Sales > Orders > find out placed order and open -->
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="grabOrderId" />
-+        <assertNotEmpty actual="$grabOrderId" stepKey="assertOrderIdIsNotEmpty" after="grabOrderId"/>
-+        <actionGroup ref="OpenOrderById" stepKey="openOrder">
-+            <argument name="orderId" value="{$grabOrderId}"/>
-+        </actionGroup>
-+
-+        <!-- Click 'Credit Memo' button and fill data from dataset: partial refund -->
-+        <actionGroup ref="AdminOpenAndFillCreditMemoRefundAndBackToStockActionGroup" stepKey="fillCreditMemoRefund">
-+            <argument name="itemQtyToRefund" value="1"/>
-+            <argument name="shippingRefund" value="5"/>
-+        </actionGroup>
-+
-+        <!-- On order's page click 'Refund offline' button -->
-+        <scrollTo selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="scrollTOButton"/>
-+        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
-+        <waitForPageLoad stepKey="waitForResultPage"/>
-+
-+        <!-- Perform all assertions: assert refund success create message -->
-+        <see selector="{{AdminIndexManagementSection.successMessage}}" userInput="You created the credit memo." stepKey="assertRefundSuccessCreateMessage"/>
-+
-+        <!-- Assert product Qty decreased after CreditMemo -->
-+        <actionGroup ref="AdminAssertProductQtyInGridActionGroup" stepKey="assertQtyDecreased">
-+            <argument name="productSku" value="$createConfigChildProduct1.sku$"/>
-+            <argument name="expectedQty" value="10.000"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
-new file mode 100644
-index 00000000000..256be7cde71
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
-@@ -0,0 +1,149 @@
-+<?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="AdminCreateCreditMemoPartialRefundTest">
-+        <annotations>
-+            <stories value="Credit memo entity"/>
-+            <title value="Create Credit Memo for Offline Payment Methods"/>
-+            <description value="Assert items return to stock (partial refund)"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-15861"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create Data -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct_100" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Enable payment method one of "Check/Money Order" and  shipping method one of "Flat Rate" -->
-+            <magentoCLI command="config:set {{enabledCheckMoneyOrder.label}} {{enabledCheckMoneyOrder.value}}" stepKey="enableCheckMoneyOrder"/>
-+            <createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
-+        </before>
-+        <after>
-+            <!-- Delete data -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Create Order -->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderPage">
-+            <argument name="customer" value="$createCustomer$"/>
-+        </actionGroup>
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSecondProduct">
-+            <argument name="product" value="$createProduct$"/>
-+            <argument name="productQty" value="2"/>
-+        </actionGroup>
-+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerInfo">
-+            <argument name="customer" value="$createCustomer$"/>
-+            <argument name="address" value="US_Address_TX"/>
-+        </actionGroup>
-+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRate"/>
-+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
-+        <waitForPageLoad stepKey="waitForSubmitOrderPage"/>
-+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
-+
-+        <!-- Create Invoice -->
-+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startInvoice"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
-+
-+        <!-- Go to Sales > Orders > find out placed order and open -->
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="grabOrderId" />
-+        <assertNotEmpty actual="$grabOrderId" stepKey="assertOrderIdIsNotEmpty" after="grabOrderId"/>
-+        <actionGroup ref="OpenOrderById" stepKey="openOrder">
-+            <argument name="orderId" value="{$grabOrderId}"/>
-+        </actionGroup>
-+
-+        <!-- Click 'Credit Memo' button and fill data from dataset: partial refund -->
-+        <actionGroup ref="AdminOpenAndFillCreditMemoRefundAndBackToStockActionGroup" stepKey="fillCreditMemoRefund">
-+            <argument name="itemQtyToRefund" value="1"/>
-+            <argument name="shippingRefund" value="10"/>
-+        </actionGroup>
-+
-+        <!-- On order's page click 'Refund offline' button -->
-+        <scrollTo selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="scrollTOButton"/>
-+        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
-+        <waitForPageLoad stepKey="waitForResultPage"/>
-+
-+        <!-- Perform all assertions: assert refund success create message -->
-+        <see selector="{{AdminIndexManagementSection.successMessage}}" userInput="You created the credit memo." stepKey="assertRefundSuccessCreateMessage"/>
-+
-+        <!-- Assert Credit Memo button -->
-+        <seeElement selector="{{AdminOrderFormItemsSection.creditMemo}}" stepKey="assertCreditMemoButton"/>
-+
-+        <!--Assert refund in Credit Memo Tab-->
-+        <click selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" stepKey="clickCreditMemoTab"/>
-+        <waitForPageLoad stepKey="waitForTabLoad"/>
-+        <grabTextFrom selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="grabMemoId"/>
-+        <assertNotEmpty actual="$grabMemoId" stepKey="assertMemoIdIsNotEmpty" after="grabMemoId"/>
-+        <click selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="clickView"/>
-+        <waitForPageLoad stepKey="waitForCreditMemo"/>
-+        <scrollTo selector="{{AdminCreditMemoTotalSection.grandTotal}}" stepKey="scrollToTotal"/>
-+        <see selector="{{AdminCreditMemoTotalSection.grandTotal}}" userInput="$110.00" stepKey="assertRefundOnCreditMemoTab"/>
-+
-+        <!-- Assert CreditMemo items -->
-+        <scrollTo selector="{{AdminCreditMemoViewItemsSection.blockItemsRefunded}}" stepKey="scrollToRefundedItems"/>
-+        <see userInput="$$createProduct.name$$" selector="{{AdminCreditMemoViewItemsSection.productName}}" stepKey="seeProductName"/>
-+        <see userInput="$$createProduct.price$$" selector="{{AdminCreditMemoViewItemsSection.productPrice}}" stepKey="seePricePerItem"/>
-+        <see userInput="1" selector="{{AdminCreditMemoViewItemsSection.productQty}}" stepKey="seeQty"/>
-+
-+        <!-- Go to order page -->
-+        <actionGroup ref="OpenOrderById" stepKey="openOrderPage">
-+            <argument name="orderId" value="{$grabOrderId}"/>
-+        </actionGroup>
-+
-+        <!-- Assert refund order status in Comments History -->
-+        <actionGroup ref="AdminAssertRefundOrderStatusCommentsHistoryActionGroup" stepKey="assertOrderStatus">
-+            <argument name="orderStatus" value="Processing"/>
-+            <argument name="refundMessage" value="We refunded $110.00 offline."/>
-+        </actionGroup>
-+
-+        <!--Login to storefront as previously created customer-->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert refunded Grand Total on frontend -->
-+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="onAccountPage"/>
-+        <waitForPageLoad stepKey="waitForPage"/>
-+        <scrollTo selector="{{StorefrontCustomerResentOrdersSection.blockResentOrders}}" stepKey="scrollToResent"/>
-+        <click selector="{{StorefrontCustomerResentOrdersSection.viewOrder({$grabOrderId})}}" stepKey="clickOnOrder"/>
-+        <waitForPageLoad stepKey="waitForViewOrder"/>
-+        <click selector="{{StorefrontCustomerOrderSection.tabRefund}}" stepKey="clickRefund"/>
-+        <waitForPageLoad stepKey="waitRefundsLoad"/>
-+        <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
-+        <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="110.00" stepKey="seeGrandTotal"/>
-+
-+        <!-- Assert product Qty decreased after CreditMemo -->
-+        <actionGroup ref="AdminAssertProductQtyInGridActionGroup" stepKey="assertQtyDecreased">
-+            <argument name="productSku" value="$createProduct.sku$"/>
-+            <argument name="expectedQty" value="776"/>
-+        </actionGroup>
-+
-+        <!--Assert refund in refunds grid-->
-+        <actionGroup ref="AdminAssertRefundInRefundsGridActionGroup" stepKey="assertRefund">
-+            <argument name="orderId" value="{$grabOrderId}"/>
-+            <argument name="memoId" value="{$grabMemoId}"/>
-+            <argument name="refundStatus" value="Refunded"/>
-+            <argument name="refundedTotal" value="$110.00"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
-new file mode 100644
-index 00000000000..d7d2abb5b2e
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
-@@ -0,0 +1,126 @@
-+<?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="AdminCreateCreditMemoWithCashOnDeliveryTest">
-+        <annotations>
-+            <stories value="Credit memo entity"/>
-+            <title value="Create Credit Memo with cash on delivery payment method"/>
-+            <description value="Create Credit Memo with cash on delivery payment and assert 0 shipping refund"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-15863"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create Data -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Enable payment method one of "Check/Money Order", "Cash On Delivery Payment" and  shipping method one of "Flat Rate" -->
-+            <magentoCLI command="config:set {{enabledCheckMoneyOrder.label}} {{enabledCheckMoneyOrder.value}}" stepKey="enableCheckMoneyOrder"/>
-+            <magentoCLI command="config:set {{enabledCashOnDeliveryPayment.label}} {{enabledCashOnDeliveryPayment.value}}" stepKey="enableBankTransfer"/>
-+            <createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{disabledCashOnDeliveryPayment.label}} {{disabledCashOnDeliveryPayment.value}}" stepKey="disableBankTransfer"/>
-+            <!-- Delete data -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create Order -->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderPage">
-+            <argument name="customer" value="$createCustomer$"/>
-+        </actionGroup>
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSecondProduct">
-+            <argument name="product" value="$createProduct$"/>
-+        </actionGroup>
-+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerInfo">
-+            <argument name="customer" value="$createCustomer$"/>
-+            <argument name="address" value="US_Address_TX"/>
-+        </actionGroup>
-+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRate"/>
-+        <conditionalClick selector="{{AdminOrderFormPaymentSection.linkPaymentOptions}}" dependentSelector="{{AdminOrderFormPaymentSection.linkPaymentOptions}}" visible="true" stepKey="openMoneyOption"/>
-+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
-+        <checkOption selector="{{AdminOrderFormPaymentSection.checkCashOnDelivery}}" stepKey="checkCashOnDelivery"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForDisappear"/>
-+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
-+        <waitForPageLoad stepKey="waitForSubmitOrderPage"/>
-+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
-+
-+        <!-- Create Invoice -->
-+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startInvoice"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
-+
-+        <!-- Go to Sales > Orders > find out placed order and open -->
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="grabOrderId" />
-+        <assertNotEmpty actual="$grabOrderId" stepKey="assertOrderIdIsNotEmpty" after="grabOrderId"/>
-+        <actionGroup ref="OpenOrderById" stepKey="openOrder">
-+            <argument name="orderId" value="{$grabOrderId}"/>
-+        </actionGroup>
-+
-+        <!-- Click 'Credit Memo' button and fill data from dataset: refund -->
-+        <actionGroup ref="AdminOpenAndFillCreditMemoRefundActionGroup" stepKey="fillCreditMemoRefund">
-+            <argument name="itemQtyToRefund" value="1"/>
-+            <argument name="shippingRefund" value="0"/>
-+            <argument name="adjustmentRefund" value="5"/>
-+            <argument name="adjustmentFee" value="10"/>
-+        </actionGroup>
-+
-+        <!-- On order's page click 'Refund offline' button -->
-+        <scrollTo selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="scrollTOButton"/>
-+        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
-+        <waitForPageLoad stepKey="waitForResultPage"/>
-+
-+        <!-- Perform all assertions: assert refund success create message -->
-+        <see selector="{{AdminIndexManagementSection.successMessage}}" userInput="You created the credit memo." stepKey="assertRefundSuccessCreateMessage"/>
-+
-+        <!--Assert refund in Credit Memo Tab -->
-+        <click selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" stepKey="clickCreditMemoTab"/>
-+        <waitForPageLoad stepKey="waitForTabLoad"/>
-+        <grabTextFrom selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="grabMemoId"/>
-+        <assertNotEmpty actual="$grabMemoId" stepKey="assertMemoIdIsNotEmpty" after="grabMemoId"/>
-+        <click selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="clickView"/>
-+        <waitForPageLoad stepKey="waitForCreditMemo"/>
-+        <scrollTo selector="{{AdminCreditMemoViewTotalSection.subtotal}}" stepKey="scrollToTotal"/>
-+        <see selector="{{AdminCreditMemoViewTotalSection.subtotal}}" userInput="$560.00" stepKey="seeSubtotal"/>
-+        <see selector="{{AdminCreditMemoViewTotalSection.adjustmentRefund}}" userInput="$5.00" stepKey="seeAdjustmentRefund"/>
-+        <see selector="{{AdminCreditMemoViewTotalSection.adjustmentFee}}" userInput="$10.00" stepKey="seeAdjustmentFee"/>
-+        <see selector="{{AdminCreditMemoViewTotalSection.grandTotal}}" userInput="$555.00" stepKey="assertRefundOnCreditMemoTab"/>
-+
-+        <!--Login to storefront as previously created customer-->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert refunded Grand Total on frontend -->
-+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="onAccountPage"/>
-+        <waitForPageLoad stepKey="waitForPage"/>
-+        <scrollTo selector="{{StorefrontCustomerResentOrdersSection.blockResentOrders}}" stepKey="scrollToResent"/>
-+        <click selector="{{StorefrontCustomerResentOrdersSection.viewOrder({$grabOrderId})}}" stepKey="clickOnOrder"/>
-+        <waitForPageLoad stepKey="waitForViewOrder"/>
-+        <click selector="{{StorefrontCustomerOrderSection.tabRefund}}" stepKey="clickRefund"/>
-+        <waitForPageLoad stepKey="waitRefundsLoad"/>
-+        <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
-+        <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="555.00" stepKey="seeGrandTotal"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
-new file mode 100644
-index 00000000000..95b326a13fa
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
-@@ -0,0 +1,129 @@
-+<?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="AdminCreateCreditMemoWithPurchaseOrderTest">
-+        <annotations>
-+            <stories value="Credit memo entity"/>
-+            <title value="Create Credit Memo with purchase order payment method"/>
-+            <description value="Create Credit Memo with purchase order payment payment and assert 0 shipping refund"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-15864"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create Data -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Enable payment method one of "Check/Money Order", "Check Money Payment" and  shipping method one of "Flat Rate" -->
-+            <magentoCLI command="config:set {{enabledCheckMoneyOrder.label}} {{enabledCheckMoneyOrder.value}}" stepKey="enableCheckMoneyOrder"/>
-+            <magentoCLI command="config:set {{enabledPurchaseOrderPayment.label}} {{enabledPurchaseOrderPayment.value}}" stepKey="enableBankTransfer"/>
-+            <createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{disabledPurchaseOrderPayment.label}} {{disabledPurchaseOrderPayment.value}}" stepKey="disableBankTransfer"/>
-+            <!-- Delete data -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create Order -->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderPage">
-+            <argument name="customer" value="$createCustomer$"/>
-+        </actionGroup>
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSecondProduct">
-+            <argument name="product" value="$createProduct$"/>
-+        </actionGroup>
-+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerInfo">
-+            <argument name="customer" value="$createCustomer$"/>
-+            <argument name="address" value="US_Address_TX"/>
-+        </actionGroup>
-+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRate"/>
-+        <conditionalClick selector="{{AdminOrderFormPaymentSection.linkPaymentOptions}}" dependentSelector="{{AdminOrderFormPaymentSection.linkPaymentOptions}}" visible="true" stepKey="openMoneyOption"/>
-+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
-+        <checkOption selector="{{AdminOrderFormPaymentSection.checkPurchaseOrder}}" stepKey="checkPurchaseOrder"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForField"/>
-+        <fillField selector="{{AdminOrderFormPaymentSection.fieldPurchaseOrderNumber}}" userInput="123456" stepKey="fillPONumber"/>
-+        <click selector="{{AdminOrderFormPaymentSection.blockPayment}}" stepKey="unfocus"/>
-+        <waitForPageLoad stepKey="waitForJavascriptToFinish"/>
-+        <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="submitOrder"/>
-+        <waitForPageLoad stepKey="waitForSubmitOrderPage"/>
-+        <see stepKey="seeSuccessMessageForOrder" selector="{{AdminIndexManagementSection.successMessage}}" userInput="You created the order."/>
-+
-+        <!-- Create Invoice -->
-+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startInvoice"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
-+
-+        <!-- Go to Sales > Orders > find out placed order and open -->
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="grabOrderId" />
-+        <assertNotEmpty actual="$grabOrderId" stepKey="assertOrderIdIsNotEmpty" after="grabOrderId"/>
-+        <actionGroup ref="OpenOrderById" stepKey="openOrder">
-+            <argument name="orderId" value="{$grabOrderId}"/>
-+        </actionGroup>
-+
-+        <!-- Click 'Credit Memo' button and fill data from dataset: refund -->
-+        <actionGroup ref="AdminOpenAndFillCreditMemoRefundActionGroup" stepKey="fillCreditMemoRefund">
-+            <argument name="itemQtyToRefund" value="1"/>
-+            <argument name="shippingRefund" value="0"/>
-+            <argument name="adjustmentRefund" value="5"/>
-+            <argument name="adjustmentFee" value="10"/>
-+        </actionGroup>
-+
-+        <!-- On order's page click 'Refund offline' button -->
-+        <scrollTo selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="scrollTOButton"/>
-+        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
-+        <waitForPageLoad stepKey="waitForResultPage"/>
-+
-+        <!-- Perform all assertions: assert refund success create message -->
-+        <see selector="{{AdminIndexManagementSection.successMessage}}" userInput="You created the credit memo." stepKey="assertRefundSuccessCreateMessage"/>
-+
-+        <!--Assert refund in Credit Memo Tab -->
-+        <click selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" stepKey="clickCreditMemoTab"/>
-+        <waitForPageLoad stepKey="waitForTabLoad"/>
-+        <grabTextFrom selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="grabMemoId"/>
-+        <assertNotEmpty actual="$grabMemoId" stepKey="assertMemoIdIsNotEmpty" after="grabMemoId"/>
-+        <click selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="clickView"/>
-+        <waitForPageLoad stepKey="waitForCreditMemo"/>
-+        <scrollTo selector="{{AdminCreditMemoViewTotalSection.subtotal}}" stepKey="scrollToTotal"/>
-+        <see selector="{{AdminCreditMemoViewTotalSection.subtotal}}" userInput="$560.00" stepKey="seeSubtotal"/>
-+        <see selector="{{AdminCreditMemoViewTotalSection.adjustmentRefund}}" userInput="$5.00" stepKey="seeAdjustmentRefund"/>
-+        <see selector="{{AdminCreditMemoViewTotalSection.adjustmentFee}}" userInput="$10.00" stepKey="seeAdjustmentFee"/>
-+        <see selector="{{AdminCreditMemoViewTotalSection.grandTotal}}" userInput="$555.00" stepKey="assertRefundOnCreditMemoTab"/>
-+
-+        <!--Login to storefront as previously created customer-->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert refunded Grand Total on frontend -->
-+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="onAccountPage"/>
-+        <waitForPageLoad stepKey="waitForPage"/>
-+        <scrollTo selector="{{StorefrontCustomerResentOrdersSection.blockResentOrders}}" stepKey="scrollToResent"/>
-+        <click selector="{{StorefrontCustomerResentOrdersSection.viewOrder({$grabOrderId})}}" stepKey="clickOnOrder"/>
-+        <waitForPageLoad stepKey="waitForViewOrder"/>
-+        <click selector="{{StorefrontCustomerOrderSection.tabRefund}}" stepKey="clickRefund"/>
-+        <waitForPageLoad stepKey="waitRefundsLoad"/>
-+        <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
-+        <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="555.00" stepKey="seeGrandTotal"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
-index 317a325693c..800517236cb 100644
---- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateInvoiceTest">
-         <annotations>
-             <features value="Sales"/>
-@@ -52,6 +52,8 @@
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-         <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-         <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
-         <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
-@@ -61,13 +63,17 @@
- 
-         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
-+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
-         <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
-         <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
- 
-         <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-+        <waitForPageLoad stepKey="waitForOrderPageToLoad"/>
-         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
-+        <waitForPageLoad stepKey="waitForNewInvoicePageToLoad"/>
-         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+        <waitForPageLoad stepKey="waitForInvoiceToBeCreated"/>
-         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
-         <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />
-@@ -78,8 +84,10 @@
-         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
-         <amOnPage url="{{AdminInvoicesPage.url}}" stepKey="goToInvoices"/>
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask6" />
-+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridInitial"/>
-         <click selector="{{AdminInvoicesGridSection.filter}}" stepKey="clickFilters"/>
-         <fillField selector="{{AdminInvoicesFiltersSection.orderNum}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum2"/>
-+        <click selector="{{AdminInvoicesFiltersSection.applyFilters}}" stepKey="clickApplyFilters"/>
-         <click selector="{{AdminInvoicesGridSection.firstRow}}" stepKey="clickInvoice2"/>
-         <see selector="{{AdminInvoiceDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus2"/>
-     </test>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml
-new file mode 100644
-index 00000000000..40a731410a8
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml
-@@ -0,0 +1,39 @@
-+<?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="AdminCreateOrderStatusDuplicatingCodeTest">
-+        <annotations>
-+            <stories value="Create order status"/>
-+            <title value="Create order status with duplicating code"/>
-+            <description value="Receive error when creating order status with the code which is already exist"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MC-15432" />
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to new order status page -->
-+        <amOnPage url="{{AdminOrderStatusPage.url}}" stepKey="goToOrderStatusPage"/>
-+        <click selector="{{AdminMainActionsSection.add}}" stepKey="clickCreateNewStatus"/>
-+
-+        <!-- Fill the form and validate message -->
-+        <actionGroup ref="AdminOrderStatusFormFillAndSave" stepKey="fillFormAndClickSave">
-+            <argument name="status" value="{{duplicatingCodeOrderStatus.status}}"/>
-+            <argument name="label" value="{{duplicatingCodeOrderStatus.label}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertOrderStatusFormSaveDuplicateError" stepKey="seeFormSaveDuplicateError"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
-new file mode 100644
-index 00000000000..d1381bbb1ef
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
-@@ -0,0 +1,45 @@
-+<?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="AdminCreateOrderStatusDuplicatingLabelTest">
-+        <annotations>
-+            <stories value="Create order status"/>
-+            <title value="Create order status with duplicating label"/>
-+            <description value="Create an order status and get success message"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MC-15433" />
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to new order status page -->
-+        <amOnPage url="{{AdminOrderStatusPage.url}}" stepKey="goToOrderStatusPage"/>
-+        <click selector="{{AdminMainActionsSection.add}}" stepKey="clickCreateNewStatus"/>
-+
-+        <!-- Fill the form and validate message -->
-+        <actionGroup ref="AdminOrderStatusFormFillAndSave" stepKey="fillFormAndClickSave">
-+            <argument name="status" value="{{duplicatingLabelOrderStatus.status}}"/>
-+            <argument name="label" value="{{duplicatingLabelOrderStatus.label}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertOrderStatusFormSaveSuccess" stepKey="seeFormSaveSuccess"/>
-+
-+        <!-- Verify the order status grid page shows the order status we just created -->
-+        <actionGroup ref="AssertOrderStatusExistsInGrid" stepKey="searchCreatedOrderStatus">
-+            <argument name="status" value="{{duplicatingLabelOrderStatus.status}}"/>
-+            <argument name="label" value="{{duplicatingLabelOrderStatus.label}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml
-new file mode 100644
-index 00000000000..c2daaac84dd
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml
-@@ -0,0 +1,45 @@
-+<?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="AdminCreateOrderStatusTest">
-+        <annotations>
-+            <stories value="Create custom order status"/>
-+            <title value="Create custom order status"/>
-+            <description value="Tests opening admin order status page, create a new order status with success message"/>
-+            <testCaseId value="MC-15431" />
-+            <severity value="AVERAGE"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to new order status page -->
-+        <amOnPage url="{{AdminOrderStatusPage.url}}" stepKey="goToOrderStatusPage"/>
-+        <click selector="{{AdminMainActionsSection.add}}" stepKey="clickCreateNewStatus"/>
-+
-+        <!-- Fill the form and validate message -->
-+        <actionGroup ref="AdminOrderStatusFormFillAndSave" stepKey="fillFormAndClickSave">
-+            <argument name="status" value="{{defaultOrderStatus.status}}"/>
-+            <argument name="label" value="{{defaultOrderStatus.label}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertOrderStatusFormSaveSuccess" stepKey="seeFormSaveSuccess"/>
-+
-+        <!-- Verify the order status grid page shows the order status we just created -->
-+        <actionGroup ref="AssertOrderStatusExistsInGrid" stepKey="searchCreatedOrderStatus">
-+            <argument name="status" value="{{defaultOrderStatus.status}}"/>
-+            <argument name="label" value="{{defaultOrderStatus.label}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
-new file mode 100644
-index 00000000000..5613334c464
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
-@@ -0,0 +1,118 @@
-+<?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="AdminCreateOrderWithBundleProductTest">
-+        <annotations>
-+            <title value="Create Order in Admin and update bundle product configuration"/>
-+            <stories value="MAGETWO-96488: Wrong price calculation for bundle product on creating order from the admin panel"/>
-+            <description value="Add bundle product with bundle option items with default quantity 2 to order in Admin and check price in product grid"/>
-+            <features value="Sales"/>
-+            <severity value="AVERAGE"/>
-+            <group value="Sales"/>
-+        </annotations>
-+
-+        <before>
-+            <!--Set default flat rate shipping method settings-->
-+            <createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
-+
-+            <!--Create simple customer-->
-+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
-+
-+            <!--Create simple product 1-->
-+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
-+
-+            <!--Create simple product 2-->
-+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-+
-+            <!--Create bundle product with checkbox bundle option-->
-+            <createData entity="ApiBundleProduct" stepKey="product"/>
-+            <createData entity="CheckboxOption" stepKey="checkboxBundleOption">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+
-+            <!--Link simple product 1 to bundle option with default quantity 2-->
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="checkboxBundleOption"/>
-+                <requiredEntity createDataKey="simple1"/>
-+                <field key="qty">2</field>
-+                <field key="is_default">1</field>
-+            </createData>
-+
-+            <!--Link simple product 2 to bundle option with default quantity 2-->
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="checkboxBundleOption"/>
-+                <requiredEntity createDataKey="simple2"/>
-+                <field key="qty">2</field>
-+                <field key="is_default">1</field>
-+            </createData>
-+
-+            <!--Add drop-down bundle option-->
-+            <createData entity="DropDownBundleOption" stepKey="dropDownBundleOption">
-+                <requiredEntity createDataKey="product"/>
-+            </createData>
-+
-+            <!--Link simple product 1 to drop-down bundle option with default quantity 2-->
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink3">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="dropDownBundleOption"/>
-+                <requiredEntity createDataKey="simple1"/>
-+                <field key="qty">2</field>
-+                <field key="is_default">1</field>
-+            </createData>
-+
-+            <!--Link simple product 2 to drop-down bundle option with default quantity 2-->
-+            <createData entity="ApiBundleLink" stepKey="createBundleLink4">
-+                <requiredEntity createDataKey="product"/>
-+                <requiredEntity createDataKey="dropDownBundleOption"/>
-+                <requiredEntity createDataKey="simple2"/>
-+                <field key="qty">2</field>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!--Go to bundle product page and save it to force "in stock" status-->
-+            <actionGroup ref="goToProductPageViaID" stepKey="goToBundleProductPage">
-+                <argument name="productId" value="$product.id$"/>
-+            </actionGroup>
-+            <actionGroup ref="saveProductForm" stepKey="saveBundleProduct"/>
-+        </before>
-+
-+        <!--Create new customer order-->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
-+            <argument name="customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Add bundle product to order and check product price in grid-->
-+        <actionGroup ref="addBundleProductToOrderAndCheckPriceInGrid" stepKey="addBundleProductToOrder">
-+            <argument name="product" value="$$product$$"/>
-+            <argument name="quantity" value="1"/>
-+            <argument name="price" value="$738.00"/>
-+        </actionGroup>
-+
-+        <!--Select FlatRate shipping method-->
-+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="orderSelectFlatRateShippingMethod"/>
-+
-+        <!--Submit order-->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
-+
-+        <!--Verify order information-->
-+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
-+
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <deleteData createDataKey="product" stepKey="delete"/>
-+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
-+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
-+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
-new file mode 100644
-index 00000000000..40b26a6b460
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
-@@ -0,0 +1,84 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * 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="AdminCreateOrderWithMinimumAmountEnabledTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Admin create order"/>
-+            <title value="Admin order is not restricted by 'Minimum Order Amount' configuration."/>
-+            <description value="Admin should be able to create an order regardless of the minimum order amount."/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-92925"/>
-+            <group value="sales"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>
-+            <createData entity="EnabledMinimumOrderAmount500" stepKey="enableMinimumOrderAmount"/>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="ClearCacheActionGroup" stepKey="clearCacheBefore"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <createData entity="DisabledMinimumOrderAmount" stepKey="disableMinimumOrderAmount"/>
-+            <actionGroup ref="ClearCacheActionGroup" stepKey="clearCacheAfter"/>
-+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-+        </after>
-+
-+        <!--Admin creates order-->
-+        <comment userInput="Admin creates order" stepKey="adminCreateOrder"/>
-+        <actionGroup ref="navigateToNewOrderPageNewCustomerSingleStore" stepKey="navigateToNewOrderPage"/>
-+        <conditionalClick selector="{{AdminOrderFormStoreSelectorSection.defaultStoreViewButton}}" dependentSelector="{{AdminOrderFormStoreSelectorSection.storeSelectorContainer}}" visible="true" stepKey="selectFirstStoreViewIfAppears"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappearedAfterStoreSelected"/>
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder">
-+            <argument name="product" value="SimpleProduct"/>
-+        </actionGroup>
-+
-+        <!--Fill customer group information-->
-+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectGroup"/>
-+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillEmail"/>
-+
-+        <!--Fill customer address information-->
-+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress">
-+            <argument name="customer" value="Simple_US_Customer"/>
-+            <argument name="address" value="US_Address_TX"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"/>
-+
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="SelectCheckMoneyPaymentMethod" stepKey="selectCheckMoneyPayment"/>
-+
-+        <!--Verify totals on Order page-->
-+        <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeOrderSubTotal"/>
-+        <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProduct.shipping}}" stepKey="seeOrderShipping"/>
-+        <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeCorrectGrandTotal"/>
-+
-+        <!--Submit Order and verify information-->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
-+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage"/>
-+
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage"/>
-+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderPendingStatus"/>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
-+        <assertNotEmpty actual="$orderId" stepKey="assertOrderIdIsNotEmpty"/>
-+        <actionGroup ref="verifyBasicOrderInformation" stepKey="verifyOrderInformation">
-+            <argument name="customer" value="Simple_US_Customer"/>
-+            <argument name="shippingAddress" value="US_Address_TX"/>
-+            <argument name="billingAddress" value="US_Address_TX"/>
-+        </actionGroup>
-+        <actionGroup ref="seeProductInItemsOrdered" stepKey="seeSimpleProductInItemsOrdered">
-+            <argument name="product" value="SimpleProduct"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
-new file mode 100644
-index 00000000000..5f6ea0937b5
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
-@@ -0,0 +1,63 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * 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="AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Admin create order"/>
-+            <title value="Free Shipping is not available in Admin if Minimum Order Amount does not match Order total"/>
-+            <description value="Admin should not be able place order with Free Shipping method if Minimum Order Amount does not match Order total"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-61001"/>
-+            <group value="sales"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+                <field key="price">100</field>
-+            </createData>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="DisableFlatRateShippingMethodConfig" stepKey="disableFlatRate"/>
-+            <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShippingMethod"/>
-+            <createData entity="setFreeShippingSubtotal" stepKey="setFreeShippingSubtotal"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
-+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShippingMethod"/>
-+            <createData entity="setFreeShippingSubtotalToDefault" stepKey="setFreeShippingSubtotalToDefault"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+            <magentoCLI command="cache:flush" stepKey="flushCache2"/>
-+        </after>
-+        <!--Create new order with existing customer-->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="goToCreateOrderPage">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <!--Add product to order-->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addProductToOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+
-+        <click selector="{{AdminOrderFormPaymentSection.header}}" stepKey="unfocus"/>
-+        <waitForPageLoad stepKey="waitForJavascriptToFinish"/>
-+        <!--Click *Get shipping methods and rates* and see that Free Shipping is absent-->
-+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickGetShippingMehods"/>
-+        <dontSeeElement selector="{{AdminOrderFormPaymentSection.freeShippingOption}}" stepKey="seeAbsentFreeShipping"/>
-+        <!--Submit Order and verify that Order isn't placed-->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
-+
-+        <dontSeeElement selector="{{AdminMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
-+        <seeElement selector="{{AdminMessagesSection.errorMessage}}" stepKey="seeErrorMessage"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminHoldCreatedOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminHoldCreatedOrderTest.xml
-new file mode 100644
-index 00000000000..9e8949c9ba6
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminHoldCreatedOrderTest.xml
-@@ -0,0 +1,96 @@
-+<?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="AdminHoldCreatedOrderTest">
-+        <annotations>
-+            <group value="sales"/>
-+            <stories value="Hold Created Order"/>
-+            <title value="Hold the created order"/>
-+            <description value="Create an order and hold the order"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16160"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!--Set default flat rate shipping method settings-->
-+            <createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
-+
-+            <!--Create simple customer-->
-+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
-+
-+            <!-- Create Simple Products -->
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct">
-+                <field key="price">10.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-+                <field key="price">20.00</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create new customer order-->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
-+            <argument name="customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Add Simple product to order-->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToTheOrder">
-+            <argument name="product" value="$$simpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Add second product to order-->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSecondProductToTheOrder">
-+            <argument name="product" value="$$simpleProduct1$$"/>
-+        </actionGroup>
-+
-+        <!--Select FlatRate shipping method-->
-+        <actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-+
-+        <!-- Submit order -->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
-+
-+        <!-- Verify order information -->
-+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
-+
-+        <!-- Hold the Order -->
-+        <click selector="{{AdminOrderDetailsMainActionsSection.hold}}" stepKey="clickOnHoldButton"/>
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You put the order on hold" stepKey="seeSuccessHoldMessage"/>
-+
-+        <!--Assert Order Status and Unhold button-->
-+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="On Hold" stepKey="seeOrderStatusOnHold"/>
-+        <seeElement selector="{{AdminOrderDetailsMainActionsSection.unhold}}" stepKey="seeUnholdButton"/>
-+
-+        <!--Assert invoice, cancel, reorder, ship, and edit buttons are unavailable-->
-+        <dontSeeElement selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="dontSeeInvoiceButton"/>
-+        <dontSeeElement selector="{{AdminOrderDetailsMainActionsSection.cancel}}" stepKey="dontSeeCancelButton"/>
-+        <dontSeeElement selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="dontSeeReorderButton"/>
-+        <dontSeeElement selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="dontSeeShipButton"/>
-+        <dontSeeElement selector="{{AdminOrderDetailsMainActionsSection.edit}}" stepKey="dontSeeEditButton"/>
-+
-+        <!--Log in to Storefront as Customer  -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-+            <argument name="Customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert OrderId and status in frontend order grid -->
-+        <click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
-+        <waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
-+        <seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'On Hold')}}" stepKey="seeOrderStatusInGrid"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml
-new file mode 100644
-index 00000000000..ec624a80f16
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml
-@@ -0,0 +1,91 @@
-+<?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="AdminMassOrdersCancelCompleteAndClosedTest">
-+        <annotations>
-+            <stories value="Mass Update Orders"/>
-+            <title value="Mass cancel orders in status  Complete, Closed"/>
-+            <description value="Try to cancel orders in status Complete, Closed"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-16183"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create Data -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete data -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create first order -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createFirstOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getFirstOrderId"/>
-+        <assertNotEmpty actual="$getFirstOrderId" stepKey="assertOrderIdIsNotEmpty" after="getFirstOrderId"/>
-+
-+        <!-- Create Shipment for first Order -->
-+        <actionGroup ref="AdminCreateInvoiceAndShipmentActionGroup" stepKey="createShipmentForFirstOrder"/>
-+
-+        <!-- Create second order -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createSecondOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getSecondOrderId"/>
-+        <assertNotEmpty actual="$getSecondOrderId" stepKey="assertSecondOrderIdIsNotEmpty" after="getSecondOrderId"/>
-+
-+        <!-- Create CreditMemo for second Order -->
-+        <actionGroup ref="AdminCreateInvoiceAndCreditMemoActionGroup" stepKey="createCreditMemo"/>
-+
-+        <!-- Navigate to backend: Go to Sales > Orders -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
-+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-+
-+        <!-- Select Mass Action according to dataset: Cancel -->
-+        <actionGroup ref="AdminTwoOrderActionOnGridActionGroup" stepKey="massActionCancel">
-+            <argument name="action" value="Cancel"/>
-+            <argument name="orderId" value="{$getFirstOrderId}"/>
-+            <argument name="secondOrderId" value="{$getSecondOrderId}"/>
-+        </actionGroup>
-+        <see userInput="You cannot cancel the order(s)." stepKey="assertOrderCancelMassActionFailMessage"/>
-+
-+        <!--Assert first order in orders grid -->
-+        <actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeFirstOrder">
-+            <argument name="orderId" value="{$getFirstOrderId}"/>
-+            <argument name="orderStatus" value="Complete"/>
-+        </actionGroup>
-+        <see userInput="{$getFirstOrderId}" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertFirstOrderID"/>
-+        <see userInput="Complete" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertFirstOrderStatus"/>
-+
-+        <!--Assert second order in orders grid -->
-+        <actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeSecondOrder">
-+            <argument name="orderId" value="{$getSecondOrderId}"/>
-+            <argument name="orderStatus" value="Closed"/>
-+        </actionGroup>
-+        <see userInput="{$getSecondOrderId}" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertSecondOrderID"/>
-+        <see userInput="Closed" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertSecondStatus"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml
-new file mode 100644
-index 00000000000..5e524bcf6e0
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml
-@@ -0,0 +1,91 @@
-+<?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="AdminMassOrdersCancelProcessingAndClosedTest">
-+        <annotations>
-+            <stories value="Mass Update Orders"/>
-+            <title value="Mass cancel orders in status  Processing, Closed"/>
-+            <description value="Try to cancel orders in status Processing, Closed"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-16184"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create Data -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete data -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create first order -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createFirstOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getFirstOrderId"/>
-+        <assertNotEmpty actual="$getFirstOrderId" stepKey="assertOrderIdIsNotEmpty" after="getFirstOrderId"/>
-+
-+        <!-- Create Invoice for first Order -->
-+        <actionGroup ref="AdminCreateInvoiceActionGroup" stepKey="createInvoice"/>
-+
-+        <!-- Create second order -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createSecondOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getSecondOrderId"/>
-+        <assertNotEmpty actual="$getSecondOrderId" stepKey="assertSecondOrderIdIsNotEmpty" after="getSecondOrderId"/>
-+
-+        <!-- Create CreditMemo for second Order -->
-+        <actionGroup ref="AdminCreateInvoiceAndCreditMemoActionGroup" stepKey="createCreditMemo"/>
-+
-+        <!-- Navigate to backend: Go to Sales > Orders -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
-+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-+
-+        <!-- Select Mass Action according to dataset: Cancel -->
-+        <actionGroup ref="AdminTwoOrderActionOnGridActionGroup" stepKey="massActionCancel">
-+            <argument name="action" value="Cancel"/>
-+            <argument name="orderId" value="{$getFirstOrderId}"/>
-+            <argument name="secondOrderId" value="{$getSecondOrderId}"/>
-+        </actionGroup>
-+        <see userInput="You cannot cancel the order(s)." stepKey="assertOrderCancelMassActionFailMessage"/>
-+
-+        <!--Assert first order in orders grid -->
-+        <actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeFirstOrder">
-+            <argument name="orderId" value="{$getFirstOrderId}"/>
-+            <argument name="orderStatus" value="Processing"/>
-+        </actionGroup>
-+        <see userInput="{$getFirstOrderId}" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertFirstOrderID"/>
-+        <see userInput="Processing" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertFirstOrderStatus"/>
-+
-+        <!--Assert second order in orders grid -->
-+        <actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeSecondOrder">
-+            <argument name="orderId" value="{$getSecondOrderId}"/>
-+            <argument name="orderStatus" value="Closed"/>
-+        </actionGroup>
-+        <see userInput="{$getSecondOrderId}" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertSecondOrderID"/>
-+        <see userInput="Closed" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertSecondStatus"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml
-new file mode 100644
-index 00000000000..179e1aa35a4
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml
-@@ -0,0 +1,71 @@
-+<?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="AdminMassOrdersHoldOnCompleteTest">
-+        <annotations>
-+            <stories value="Mass Update Orders"/>
-+            <title value="Try to put order in status Complete on Hold"/>
-+            <description value="Try to put order in status Complete on Hold"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-16186"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create Data -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete data -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create order -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createFirstOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
-+        <assertNotEmpty actual="$getOrderId" stepKey="assertOrderIdIsNotEmpty" after="getOrderId"/>
-+
-+        <!-- Create Shipment for Order -->
-+        <actionGroup ref="AdminCreateInvoiceAndShipmentActionGroup" stepKey="createShipment"/>
-+
-+        <!-- Navigate to backend: Go to Sales > Orders -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
-+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-+
-+        <!-- Select Mass Action according to dataset: Hold -->
-+        <actionGroup ref="AdminOrderActionOnGridActionGroup" stepKey="actionHold">
-+            <argument name="action" value="Hold"/>
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <see userInput="No order(s) were put on hold." stepKey="assertOrderOnHoldFailMessage"/>
-+
-+        <!--Assert order in orders grid -->
-+        <actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeFirstOrder">
-+            <argument name="orderId" value="{$getOrderId}"/>
-+            <argument name="orderStatus" value="Complete"/>
-+        </actionGroup>
-+        <see userInput="{$getOrderId}" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertOrderID"/>
-+        <see userInput="Complete" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertOrderStatus"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml
-new file mode 100644
-index 00000000000..ec0ec8ca222
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml
-@@ -0,0 +1,88 @@
-+<?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="AdminMassOrdersHoldOnPendingAndProcessingTest">
-+        <annotations>
-+            <stories value="Mass Update Orders"/>
-+            <title value="Mass put orders in statuses Pending, Processing on Hold"/>
-+            <description value="Put orders in statuses Pending, Processing on Hold"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-16185"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create Data -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete data -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create first order -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createFirstOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getFirstOrderId"/>
-+        <assertNotEmpty actual="$getFirstOrderId" stepKey="assertOrderIdIsNotEmpty" after="getFirstOrderId"/>
-+
-+        <!-- Create second order -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createSecondOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getSecondOrderId"/>
-+        <assertNotEmpty actual="$getSecondOrderId" stepKey="assertSecondOrderIdIsNotEmpty" after="getSecondOrderId"/>
-+
-+        <!-- Create Invoice for second Order -->
-+        <actionGroup ref="AdminCreateInvoiceActionGroup" stepKey="createInvoice"/>
-+
-+        <!-- Navigate to backend: Go to Sales > Orders -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
-+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-+
-+        <!-- Select Mass Action according to dataset: Hold -->
-+        <actionGroup ref="AdminTwoOrderActionOnGridActionGroup" stepKey="massActionHold">
-+            <argument name="action" value="Hold"/>
-+            <argument name="orderId" value="{$getFirstOrderId}"/>
-+            <argument name="secondOrderId" value="{$getSecondOrderId}"/>
-+        </actionGroup>
-+        <see userInput="You have put 2 order(s) on hold." stepKey="assertOrderOnHoldSuccessMessage"/>
-+
-+        <!--Assert first order in orders grid -->
-+        <actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeFirstOrder">
-+            <argument name="orderId" value="{$getFirstOrderId}"/>
-+            <argument name="orderStatus" value="On Hold"/>
-+        </actionGroup>
-+        <see userInput="{$getFirstOrderId}" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertFirstOrderID"/>
-+        <see userInput="On Hold" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertFirstOrderStatus"/>
-+
-+        <!--Assert second order in orders grid -->
-+        <actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeSecondOrder">
-+            <argument name="orderId" value="{$getSecondOrderId}"/>
-+            <argument name="orderStatus" value="On Hold"/>
-+        </actionGroup>
-+        <see userInput="{$getSecondOrderId}" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertSecondOrderID"/>
-+        <see userInput="On Hold" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertSecondStatus"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml
-new file mode 100644
-index 00000000000..6c97c4add63
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml
-@@ -0,0 +1,68 @@
-+<?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="AdminMassOrdersReleasePendingOrderTest">
-+        <annotations>
-+            <stories value="Mass Update Orders"/>
-+            <title value="Try to Release order in status Pending"/>
-+            <description value="Try to Release order in status Pending"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-16188"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create Data -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete data -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create order -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createFirstOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
-+        <assertNotEmpty actual="$getOrderId" stepKey="assertOrderIdIsNotEmpty" after="getOrderId"/>
-+
-+        <!-- Navigate to backend: Go to Sales > Orders -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
-+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-+
-+        <!-- Select Mass Action according to dataset: Unhold -->
-+        <actionGroup ref="AdminOrderActionOnGridActionGroup" stepKey="actionUnhold">
-+            <argument name="action" value="Unhold"/>
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <see userInput="No order(s) were released from on hold status." stepKey="assertOrderReleaseFailMessage"/>
-+
-+        <!--Assert order in orders grid -->
-+        <actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeFirstOrder">
-+            <argument name="orderId" value="{$getOrderId}"/>
-+            <argument name="orderStatus" value="Pending"/>
-+        </actionGroup>
-+        <see userInput="{$getOrderId}" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertOrderID"/>
-+        <see userInput="Pending" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertOrderStatus"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml
-new file mode 100644
-index 00000000000..d7c9664b8bc
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml
-@@ -0,0 +1,67 @@
-+<?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="AdminMassOrdersUpdateCancelPendingOrderTest">
-+        <annotations>
-+            <stories value="Mass Update Orders"/>
-+            <title value="Mass cancel orders in status Pending"/>
-+            <description value="Mass cancel orders in status Pending"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-16182"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <!-- Create Data -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete data -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create order -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
-+        <assertNotEmpty actual="$getOrderId" stepKey="assertOrderIdIsNotEmpty" after="getOrderId"/>
-+
-+        <!-- Navigate to backend: Go to Sales > Orders -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
-+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-+
-+        <!-- Select Mass Action according to dataset: Cancel -->
-+        <actionGroup ref="AdminOrderActionOnGridActionGroup" stepKey="ActionCancel">
-+            <argument name="action" value="Cancel"/>
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <see userInput="We canceled 1 order(s)." stepKey="assertOrderCancelMassActionSuccessMessage"/>
-+
-+        <!--Assert orders in orders grid -->
-+        <actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="filterOrder">
-+            <argument name="orderId" value="{$getOrderId}"/>
-+            <argument name="orderStatus" value="Canceled"/>
-+        </actionGroup>
-+        <see userInput="{$getOrderId}" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertOrderID"/>
-+        <see userInput="Canceled" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertOrderStatus"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml
-new file mode 100644
-index 00000000000..009f86256a9
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml
-@@ -0,0 +1,73 @@
-+<?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="AdminOrdersReleaseInUnholdStatusTest">
-+        <annotations>
-+            <stories value="Mass Update Orders"/>
-+            <title value="Release order in status On Hold"/>
-+            <description value="Release order in status On Hold"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-16187"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create Data -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete data -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create order -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createFirstOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
-+        <assertNotEmpty actual="$getOrderId" stepKey="assertOrderIdIsNotEmpty" after="getOrderId"/>
-+
-+        <!-- Hold Order -->
-+        <click selector="{{AdminOrderDetailsMainActionsSection.hold}}" stepKey="pushButtonHold"/>
-+        <waitForPageLoad stepKey="waitForHold"/>
-+        <see userInput="You put the order on hold." stepKey="seeHoldMessage"/>
-+
-+        <!-- Navigate to backend: Go to Sales > Orders -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
-+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-+
-+        <!-- Select Mass Action according to dataset: Unhold -->
-+        <actionGroup ref="AdminOrderActionOnGridActionGroup" stepKey="actionUnold">
-+            <argument name="action" value="Unhold"/>
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <see userInput="1 order(s) have been released from on hold status." stepKey="assertOrderReleaseSuccessMessage"/>
-+
-+        <!--Assert order in orders grid -->
-+        <actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeFirstOrder">
-+            <argument name="orderId" value="{$getOrderId}"/>
-+            <argument name="orderStatus" value="Pending"/>
-+        </actionGroup>
-+        <see userInput="{$getOrderId}" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertOrderID"/>
-+        <see userInput="Pending" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertOrderStatus"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.xml
-new file mode 100644
-index 00000000000..587b23e857c
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.xml
-@@ -0,0 +1,76 @@
-+<?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="AdminReorderWithCatalogPriceTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Admin create order"/>
-+            <title value="Reorder doesn't show discount price in Order Totals block"/>
-+            <description value="Reorder doesn't show discount price in Order Totals block"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16695"/>
-+            <useCaseId value="MAGETWO-99691"/>
-+            <group value="sales"/>
-+            <group value="catalogRule"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!--Create the catalog price rule -->
-+            <createData entity="CatalogRuleToPercent" stepKey="createCatalogRule"/>
-+            <!--Create product-->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProductApi"/>
-+            <!--Create order via API-->
-+            <createData entity="GuestCart" stepKey="createGuestCart"/>
-+            <createData entity="SimpleCartItem" stepKey="addCartItem">
-+                <requiredEntity createDataKey="createGuestCart"/>
-+                <requiredEntity createDataKey="createSimpleProductApi"/>
-+            </createData>
-+            <createData entity="GuestAddressInformation" stepKey="addGuestOrderAddress">
-+                <requiredEntity createDataKey="createGuestCart"/>
-+            </createData>
-+            <updateData createDataKey="createGuestCart" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformation">
-+                <requiredEntity createDataKey="createGuestCart"/>
-+            </updateData>
-+            <!--END Create order via API-->
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createSimpleProductApi" stepKey="deleteSimpleProductApi"/>
-+            <!-- Delete the rule -->
-+            <actionGroup ref="RemoveCatalogPriceRule" stepKey="deletePriceRule">
-+                <argument name="ruleName" value="{{CatalogRuleToPercent.name}}" />
-+            </actionGroup>
-+            <!--Clear all filters in grid-->
-+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="resetCatalogRuleGridFilters"/>
-+            <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Login as admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <!--Open order by Id-->
-+        <actionGroup ref="OpenOrderById" stepKey="openOrderById">
-+            <argument name="orderId" value="$createGuestCart.return$"/>
-+        </actionGroup>
-+        <!--Reorder-->
-+        <click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
-+        <!--Verify order item row-->
-+        <waitForElementVisible selector="{{AdminOrderItemsOrderedSection.productPrice('2')}}" stepKey="waitOrderItemPriceToBeVisible"/>
-+        <see selector="{{AdminOrderItemsOrderedSection.productPrice('2')}}" userInput="${{AdminOrderSimpleProductWithCatalogRule.subtotal}}" stepKey="seeOrderItemPrice"/>
-+        <!--Verify totals on Order page-->
-+        <scrollTo selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="scrollToOrderGrandTotal"/>
-+        <waitForElementVisible selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" stepKey="waitOrderSubtotalToBeVisible"/>
-+        <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProductWithCatalogRule.subtotal}}" stepKey="seeOrderSubTotal"/>
-+        <waitForElementVisible selector="{{AdminOrderFormTotalSection.total('Shipping')}}" stepKey="waitOrderShippingToBeVisible"/>
-+        <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProductWithCatalogRule.shipping}}" stepKey="seeOrderShipping"/>
-+        <waitForElementVisible selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="waitOrderGrandTotalToBeVisible"/>
-+        <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProductWithCatalogRule.grandTotal}}" stepKey="seeCorrectGrandTotal"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..af7cc1822d2
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSalesCreditMemosNavigateMenuTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin sales credit memos navigate menu test"/>
-+            <description value="Admin should be able to navigate to Sales > Credit Memos"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14140"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesCreditMemosPage">
-+            <argument name="menuUiId" value="{{AdminMenuSales.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSalesCreditMemos.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSalesCreditMemos.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..5a38a66d1f4
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSalesInvoicesNavigateMenuTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin sales invoices navigate menu test"/>
-+            <description value="Admin should be able to navigate to Sales > Invoices"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14138"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesInvoicesPage">
-+            <argument name="menuUiId" value="{{AdminMenuSales.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSalesInvoices.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSalesInvoices.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..8099254923a
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSalesOrdersNavigateMenuTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin sales orders navigate menu test"/>
-+            <description value="Admin should be able to navigate to Sales > Orders"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14137"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesOrderPage">
-+            <argument name="menuUiId" value="{{AdminMenuSales.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSalesOrders.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSalesOrders.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..5717c6c90fc
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSalesShipmentsNavigateMenuTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin sales shipments navigate menu test"/>
-+            <description value="Admin should be able to navigate to Sales > Shipments"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14139"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesShipmentsPage">
-+            <argument name="menuUiId" value="{{AdminMenuSales.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSalesShipments.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSalesShipments.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..68933be92ef
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSalesTransactionsNavigateMenuTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin sales transactions navigate menu test"/>
-+            <description value="Admin should be able to navigate to Sales > Transactions"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14141"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesTransactionsPage">
-+            <argument name="menuUiId" value="{{AdminMenuSales.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSalesTransactions.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSalesTransactions.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSaveInAddressBookCheckboxStateTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSaveInAddressBookCheckboxStateTest.xml
-new file mode 100644
-index 00000000000..650152a191d
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSaveInAddressBookCheckboxStateTest.xml
-@@ -0,0 +1,69 @@
-+<?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="AdminSaveInAddressBookCheckboxStateTest">
-+        <annotations>
-+            <stories value="Create Order"/>
-+            <title value="The state of 'Save in address book' check-box inside 'Shipping Address' section on 'create Order' Admin page"/>
-+            <description value="The state of 'Save in address book' check-box inside 'Shipping Address' section on 'create Order' Admin page"/>
-+            <features value="Sales"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-36337"/>
-+            <useCaseId value="MAGETWO-99320"/>
-+            <group value="sales"/>
-+        </annotations>
-+        <before>
-+            <!-- Create customer, category, product and log in -->
-+            <comment userInput="Create customer, category, product and log in" stepKey="createTestData"/>
-+            <createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-+        </before>
-+        <after>
-+            <!-- Delete created data and log out -->
-+            <comment userInput="Delete created data and log out" stepKey="deleteDataAndLogOut"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logOut"/>
-+        </after>
-+        <!-- Create new order and choose an existing customer -->
-+        <comment userInput="Create new order and choose an existing customer" stepKey="createOrderAndAddCustomer"/>
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderPage">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <!-- Add simple product to order -->
-+        <comment userInput="Add simple product to order" stepKey="addSimpleProdToOrder"/>
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <!-- Just in case uncheck and check 'Same as Billing Address checkbox' -->
-+        <comment userInput="Just in case uncheck and check 'Same as Billing Address checkbox'" stepKey="uncheckAndCheckAgain"/>
-+        <uncheckOption selector="{{AdminOrderFormShippingAddressSection.SameAsBilling}}" stepKey="unCheckSameAsShippingAddressCheckbox"/>
-+        <waitForPageLoad stepKey="waitPageToLoad1"/>
-+        <checkOption selector="{{AdminOrderFormShippingAddressSection.SameAsBilling}}" stepKey="checkSameAsShippingAddressCheckbox"/>
-+        <waitForPageLoad stepKey="waitPageToLoad2"/>
-+        <!-- Check 'Save in address book' checkbox in 'Billing Address' section -->
-+        <comment userInput="Check 'Save in address book' checkbox in Billing Address section" stepKey="checkSaveInAddressBookCheckbox"/>
-+        <checkOption selector="{{AdminOrderFormBillingAddressSection.SaveAddress}}" stepKey="checkSaveBillingAddressCheckbox"/>
-+        <!-- See if 'Save in Address Book' checkbox is selected in 'Shipping Address' section -->
-+        <comment userInput="'Save in Address Book' checkbox is checked in 'Shipping Address' section" stepKey="checkIfCheckboxIsChecked"/>
-+        <seeCheckboxIsChecked selector="{{AdminOrderFormShippingAddressSection.SaveAddress}}"  stepKey="seeCheckBoxIsSelected"/>
-+        <!-- Uncheck 'Save in Address Book' checkbox in 'Billing Address' section -->
-+        <comment userInput="Uncheck 'Save in Address Book' checkbox in 'Billing Address' section" stepKey="uncheckCheckboxInBillingAddressSection"/>
-+        <uncheckOption selector="{{AdminOrderFormBillingAddressSection.SaveAddress}}" stepKey="uncheckSaveBillingAddressCheckbox"/>
-+        <!-- See if 'Save in Address Book' checkbox is deselected in 'Shipping Address' section -->
-+        <comment userInput="See if 'Save in Address Book' checkbox is unchecked in 'Shipping Address' section" stepKey="seeIfCheckboxIsUnchecked"/>
-+        <dontSeeCheckboxIsChecked selector="{{AdminOrderFormShippingAddressSection.SaveAddress}}"  stepKey="seeCheckBoxIsUnchecked"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..d55cde14490
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminStoresOrderStatusNavigateMenuTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin stores order status navigate menu test"/>
-+            <description value="Admin should be able to navigate to Stores > Order Status"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14142"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresOrderStatusPage">
-+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuStoresSettingsOrderStatus.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuStoresSettingsOrderStatus.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml
-new file mode 100644
-index 00000000000..63607e59c41
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml
-@@ -0,0 +1,136 @@
-+<?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="AdminSubmitConfigurableProductOrderTest">
-+        <annotations>
-+            <title value="Create Order in Admin and update product configuration"/>
-+            <stories value="MAGETWO-59632: Create Sales > Order from admin add configurable product and change options click OK does not update Items Ordered List"/>
-+            <description value="Create Order in Admin and update product configuration"/>
-+            <features value="Sales"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MAGETWO-59633"/>
-+            <group value="Sales"/>
-+            <skip>
-+                <issueId value="MAGETWO-96196"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <!--Set default flat rate shipping method settings-->
-+            <createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
-+
-+            <!--Create simple customer-->
-+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
-+
-+            <!-- Create the category -->
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+
-+            <!-- Create the configurable product and add it to the category -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Create an attribute with two options to be used in the first child product -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Add the attribute we just created to default attribute set -->
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Get the option of the attribute we created -->
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+
-+            <!-- Create a simple product and give it the attribute with option -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <!-- Create the configurable product -->
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <!-- Add simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+
-+        <!--Create new customer order-->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
-+            <argument name="customer" value="$$simpleCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Add configurable product to order-->
-+        <actionGroup ref="addConfigurableProductToOrderFromAdmin" stepKey="addConfigurableProductToOrder">
-+            <argument name="product" value="$$createConfigProduct$$"/>
-+            <argument name="attribute" value="$$createConfigProductAttribute$$"/>
-+            <argument name="option" value="$$getConfigAttributeOption1$$"/>
-+        </actionGroup>
-+
-+        <!--Configure ordered configurable product-->
-+        <actionGroup ref="configureOrderedConfigurableProduct" stepKey="configureOrderedConfigurableProduct">
-+            <argument name="attribute" value="$$createConfigProductAttribute$$"/>
-+            <argument name="option" value="$$getConfigAttributeOption2$$"/>
-+            <argument name="quantity" value="2"/>
-+        </actionGroup>
-+
-+        <!--Select FlatRate shipping method-->
-+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="orderSelectFlatRateShippingMethod"/>
-+
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="SelectCheckMoneyPaymentMethod" stepKey="selectCheckMoneyPayment"/>
-+
-+        <!--Submit order-->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
-+
-+        <!--Verify order information-->
-+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
-+
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
-+
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteApiCategory"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml
-new file mode 100644
-index 00000000000..e487c62b967
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml
-@@ -0,0 +1,77 @@
-+<?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="AdminSubmitsOrderPaymentMethodValidationTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="MC-5537: No UI validation for Payment methods when creating an order from admin"/>
-+            <title value="UI validation for Payment methods when creating an order from admin"/>
-+            <description value="Admin should not be able to submit orders without selecting a payment method when there is more than one"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MC-6029"/>
-+            <group value="sales"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI stepKey="allowSpecificValue" command="config:set payment/cashondelivery/active 1" />
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <magentoCLI stepKey="allowSpecificValue" command="config:set payment/cashondelivery/active 0" />
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-+        </after>
-+        <!--Create order via Admin-->
-+        <comment userInput="Admin creates order" stepKey="adminCreateOrderComment"/>
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
-+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
-+        <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
-+        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
-+
-+        <!--Check if order can be submitted without the required fields-->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder" after="seeNewOrderPageTitle">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="checkRequiredFieldsNewOrderForm" stepKey="checkRequiredFieldsNewOrder" after="addSimpleProductToOrder"/>
-+        <see selector="{{AdminOrderFormPaymentSection.paymentError}}" userInput="Please select one of the options." stepKey="seePaymentMethodRequired" after="checkRequiredFieldsNewOrder"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="seePaymentMethodRequired"/>
-+
-+        <!--Fill customer group and customer email-->
-+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup" after="scrollToTopOfOrderFormPage"/>
-+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail" after="selectCustomerGroup"/>
-+
-+        <!--Fill customer address information-->
-+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="fillCustomerEmail">
-+            <argument name="customer" value="Simple_US_Customer"/>
-+            <argument name="address" value="US_Address_TX"/>
-+        </actionGroup>
-+
-+        <!-- Select payment and shipping -->
-+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" stepKey="waitForPaymentOptions"/>
-+        <selectOption selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" userInput="checkmo" stepKey="checkPaymentOption"/>
-+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping" after="fillCustomerAddress"/>
-+
-+        <!--Verify totals on Order page-->
-+        <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeOrderSubTotal" after="selectFlatRateShipping"/>
-+        <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProduct.shipping}}" stepKey="seeOrderShipping" after="seeOrderSubTotal"/>
-+        <scrollTo selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="scrollToOrderGrandTotal"/>
-+        <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeCorrectGrandTotal" after="scrollToOrderGrandTotal"/>
-+
-+        <!--Submit Order and verify information-->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="seeCorrectGrandTotal"/>
-+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage" after="clickSubmitOrder"/>
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage" after="seeViewOrderPage"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
-index 23e4ae676b3..ed536bd3351 100644
---- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
-@@ -6,15 +6,16 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminSubmitsOrderWithAndWithoutEmailTest">
-         <annotations>
-+            <features value="Sales"/>
-+            <stories value="Create orders"/>
-             <title value="Email is required to create an order from Admin Panel"/>
-             <description value="Admin should not be able to submit orders without an email address"/>
-             <severity value="MAJOR"/>
-             <testCaseId value="MAGETWO-92980"/>
-             <group value="sales"/>
--
-         </annotations>
-         <before>
-             <createData entity="_defaultCategory" stepKey="createCategory"/>
-@@ -57,6 +58,9 @@
-         <!-- Select shipping -->
-         <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping" after="fillCustomerAddress"/>
- 
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="SelectCheckMoneyPaymentMethod" stepKey="selectCheckMoneyPayment"/>
-+
-         <!--Verify totals on Order page-->
-         <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeOrderSubTotal" after="selectFlatRateShipping"/>
-         <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProduct.shipping}}" stepKey="seeOrderShipping" after="seeOrderSubTotal"/>
-@@ -68,4 +72,4 @@
-         <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage" after="clickSubmitOrder"/>
-         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage" after="seeViewOrderPage"/>
-         </test>
--    </tests>
-\ No newline at end of file
-+    </tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
-new file mode 100644
-index 00000000000..1490fc1a1a3
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
-@@ -0,0 +1,89 @@
-+<?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="AdminSubmitsOrderWithAndWithoutFieldsValidationTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Create orders"/>
-+            <title value="Fields validation is required to create an order from Admin Panel"/>
-+            <description value="Admin should not be able to submit orders without invalid address fields"/>
-+            <severity value="AVERAGE"/>
-+            <group value="sales"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-+        </after>
-+        <!--Create order via Admin-->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <comment userInput="Admin creates order" stepKey="adminCreateOrderComment"/>
-+        <!--<actionGroup ref="navigateToNewOrderPageNewCustomer" stepKey="navigateToNewOrderPage"/>-->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
-+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
-+        <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
-+        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
-+
-+        <!--Check if order can be submitted without the required fields including email address-->
-+        <actionGroup ref="checkRequiredFieldsNewOrderForm" stepKey="checkRequiredFieldsNewOrder" after="seeNewOrderPageTitle"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="checkRequiredFieldsNewOrder"/>
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder" after="scrollToTopOfOrderFormPage">
-+            <argument name="product" value="_defaultProduct"/>
-+        </actionGroup>
-+
-+        <!--Fill customer group and customer email-->
-+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup" after="addSimpleProductToOrder"/>
-+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail" after="selectCustomerGroup"/>
-+
-+        <!--Fill wrong customer address information-->
-+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillWrongCustomerAddress" after="fillCustomerEmail">
-+            <argument name="customer" value="Simple_US_Customer_Incorrect_Name"/>
-+            <argument name="address" value="US_Address_TX"/>
-+        </actionGroup>
-+        <!-- Select shipping -->
-+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"
-+                     after="fillWrongCustomerAddress"/>
-+
-+        <!--Verify totals on Order page-->
-+        <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeOrderSubTotal" after="selectFlatRateShipping"/>
-+        <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProduct.shipping}}" stepKey="seeOrderShipping" after="seeOrderSubTotal"/>
-+        <scrollTo selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="scrollToOrderGrandTotal"/>
-+        <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeCorrectGrandTotal" after="scrollToOrderGrandTotal"/>
-+
-+        <!--Submit Order and verify information-->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrderWrong"
-+               after="seeCorrectGrandTotal"/>
-+        <see selector="{{AdminOrderFormBillingAddressSection.firstNameError}}"
-+             userInput="Please enter less or equal than 255 symbols." stepKey="firstNameError"
-+             after="clickSubmitOrderWrong"/>
-+
-+        <!--Fill correct customer address information-->
-+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="firstNameError">
-+            <argument name="customer" value="Simple_US_Customer"/>
-+            <argument name="address" value="US_Address_TX"/>
-+        </actionGroup>
-+
-+        <!-- Select shipping -->
-+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickShipping" after="fillCustomerAddress"/>
-+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="selectShipping" after="clickShipping"/>
-+
-+        <!--Submit Order and verify information-->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="selectShipping"/>
-+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage" after="clickSubmitOrder"/>
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage" after="seeViewOrderPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminUnassignCustomOrderStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminUnassignCustomOrderStatusTest.xml
-new file mode 100644
-index 00000000000..5f7a7c76066
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminUnassignCustomOrderStatusTest.xml
-@@ -0,0 +1,70 @@
-+<?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="AdminUnassignCustomOrderStatusTest">
-+        <annotations>
-+            <stories value="UnassignCustomOrderStatus"/>
-+            <title value="Admin Unassign Custom Order Status Test"/>
-+            <description value="Test log in to Sales and Unassign Custom Order Status Test"/>
-+            <testCaseId value="MC-16060"/>
-+            <severity value="CRITICAL"/>
-+            <group value="Sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Go to new order status page-->
-+        <amOnPage url="{{AdminOrderStatusPage.url}}" stepKey="goToOrderStatusPage"/>
-+        <click selector="{{AdminMainActionsSection.add}}" stepKey="clickCreateNewStatus"/>
-+
-+        <!--Fill the form and validate save success message-->
-+        <actionGroup ref="AdminOrderStatusFormFillAndSave" stepKey="fillFormAndClickSave">
-+            <argument name="status" value="{{defaultOrderStatus.status}}"/>
-+            <argument name="label" value="{{defaultOrderStatus.label}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertOrderStatusFormSaveSuccess" stepKey="seeFormSaveSuccess"/>
-+
-+        <!--Open the created order status in grid page and change the order state to Pending and verify save message-->
-+        <actionGroup ref="AssertOrderStatusExistsInGrid" stepKey="searchCreatedOrderStatus">
-+            <argument name="status" value="{{defaultOrderStatus.status}}"/>
-+            <argument name="label" value="{{defaultOrderStatus.label}}"/>
-+        </actionGroup>
-+        <click selector="{{AdminOrderStatusGridSection.assignStatusToStateBtn}}" stepKey="clickAssignStatusToStateButton"/>
-+        <waitForPageLoad stepKey="waitForAssignOrderStatusToStateLoad"/>
-+        <selectOption selector="{{AdminAssignOrderStatusToStateSection.orderStatus}}" userInput="{{defaultOrderStatus.label}}" stepKey="selectOrderStatus"/>
-+        <waitForPageLoad stepKey="waitForOrderStatusLoad"/>
-+        <selectOption selector="{{AdminAssignOrderStatusToStateSection.orderState}}" userInput="Pending" stepKey="selectPendingInOrderState"/>
-+        <click selector="{{AdminAssignOrderStatusToStateSection.saveStatusAssignment}}" stepKey="clickSaveStatusAssignmentButton"/>
-+
-+        <!--Verify the order status grid page shows the updated order status-->
-+        <actionGroup ref="AssertOrderStatusExistsInGrid" stepKey="searchUpdatedOrderStatus">
-+            <argument name="status" value="{{defaultOrderStatus.status}}"/>
-+            <argument name="label" value="{{defaultOrderStatus.label}}"/>
-+        </actionGroup>
-+
-+        <!--Click unassign and verify AssertOrderStatusSuccessUnassignMessage-->
-+        <click selector="{{AdminOrderStatusGridSection.unassign}}" stepKey="clickUnassign"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You have unassigned the order status." stepKey="seeAssertOrderStatusSuccessUnassignMessage"/>
-+
-+        <!--Verify the order status grid page shows the updated order status and verify AssertOrderStatusInGrid-->
-+        <actionGroup ref="AssertOrderStatusExistsInGrid" stepKey="seeAssertOrderStatusInGrid">
-+            <argument name="status" value="{{defaultOrderStatus.status}}"/>
-+            <argument name="label" value="{{defaultOrderStatus.label}}"/>
-+        </actionGroup>
-+
-+        <!--Verify the order status grid page shows the updated order status and verify AssertOrderStatusNotAssigned-->
-+        <dontSee selector="{{AdminOrderStatusGridSection.stateCodeAndTitleDataColumn}}" stepKey="seeEmptyStateCodeAndTitleValue"/>
-+        <dontSee selector="{{AdminOrderStatusGridSection.unassign}}" stepKey="seeAssertOrderStatusNotAssigned"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml
-new file mode 100644
-index 00000000000..c292afe65cd
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml
-@@ -0,0 +1,134 @@
-+<?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="AssignCustomOrderStatusNotVisibleOnStorefrontTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Assign Custom Order Status"/>
-+            <title value="Assign custom order status not visible on storefront test"/>
-+            <description value="Assign custom order status not visible on storefront"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16053"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+            <!-- Create product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Disable created order status -->
-+            <magentoCLI command="config:set {{EnableCheckmoOrderStatusPending.path}} {{EnableCheckmoOrderStatusPending.value}}" stepKey="rollbackNewOrderStatus"/>
-+
-+            <!-- Logout customer -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+
-+            <!-- Delete product -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create order status -->
-+        <amOnPage url="{{AdminOrderStatusPage.url}}" stepKey="goToOrderStatusPage"/>
-+        <waitForPageLoad stepKey="waitForOrderStatusPageLoad"/>
-+        <click selector="{{AdminMainActionsSection.add}}" stepKey="clickCreateNewStatus"/>
-+
-+        <!-- Fill form and validate message -->
-+        <actionGroup ref="AdminOrderStatusFormFillAndSave" stepKey="fillFormAndClickSave">
-+            <argument name="status" value="{{defaultOrderStatus.status}}"/>
-+            <argument name="label" value="{{defaultOrderStatus.label}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertOrderStatusFormSaveSuccess" stepKey="seeFormSaveSuccess"/>
-+
-+        <!-- Assign status to state -->
-+        <click selector="{{AdminOrderStatusGridSection.assignStatusToStateBtn}}" stepKey="clickAssignStatusBtn"/>
-+        <selectOption selector="{{AdminAssignOrderStatusToStateSection.orderStatus}}" userInput="{{defaultOrderStatus.status}}" stepKey="selectOrderStatus"/>
-+        <selectOption selector="{{AdminAssignOrderStatusToStateSection.orderState}}" userInput="{{OrderState.new}}" stepKey="selectOrderState"/>
-+        <checkOption selector="{{AdminAssignOrderStatusToStateSection.orderStatusAsDefault}}" stepKey="orderStatusAsDefault"/>
-+        <uncheckOption selector="{{AdminAssignOrderStatusToStateSection.visibleOnStorefront}}" stepKey="visibleOnStorefront"/>
-+        <click selector="{{AdminAssignOrderStatusToStateSection.saveStatusAssignment}}" stepKey="clickSaveStatus"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You assigned the order status." stepKey="seeSuccess"/>
-+
-+        <!-- Prepare data for constraints -->
-+        <magentoCLI command="config:set {{EnableCheckmoOrderStatusPending.path}} {{defaultOrderStatus.label}}" stepKey="enableNewOrderStatus"/>
-+
-+        <!-- Assert order status in grid -->
-+        <actionGroup ref="FilterOrderStatusByLabelAndCodeActionGroup" stepKey="filterOrderStatusGrid">
-+            <argument name="statusLabel" value="{{defaultOrderStatus.label}}"/>
-+            <argument name="statusCode" value="{{defaultOrderStatus.status}}"/>
-+        </actionGroup>
-+        <see selector="{{AdminOrderStatusGridSection.gridCell('1', 'State Code and Title')}}" userInput="new[{{defaultOrderStatus.label}}]" stepKey="seeOrderStatusInOrderGrid"/>
-+
-+        <!-- Create order and grab order id -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createNewOrder">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
-+
-+        <!-- Assert order status is correct -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersPage"/>
-+        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrdersGridById">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickCreatedOrderInGrid"/>
-+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{defaultOrderStatus.label}}" stepKey="seeOrderStatus"/>
-+
-+        <!-- Login as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForCustomerLogin"/>
-+
-+        <!-- Open My Orders -->
-+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="goToCustomerDashboardPage"/>
-+        <waitForPageLoad stepKey="waitForCustomerDashboardPageLoad"/>
-+        <actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToMyOrdersPage">
-+            <argument name="menu" value="My Orders"/>
-+        </actionGroup>
-+
-+        <!-- Assert order not visible on My Orders -->
-+        <see selector="{{StorefrontOrderInformationMainSection.emptyMessage}}" userInput="You have placed no orders." stepKey="seeEmptyMessage"/>
-+
-+        <!-- Cancel order -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToAdminOrdersPage"/>
-+        <waitForPageLoad stepKey="waitForAdminOrdersPageLoad"/>
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrdersGridByOrderId">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <checkOption selector="{{AdminOrdersGridSection.checkOrder}}" stepKey="selectOrder"/>
-+        <actionGroup ref="SelectActionForOrdersActionGroup" stepKey="selectCancelOrderAction">
-+            <argument name="action" value="{{OrderActions.cancel}}"/>
-+        </actionGroup>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="We canceled 1 order(s)." stepKey="seeSuccessMessage"/>
-+
-+        <!-- Unassign order status -->
-+        <amOnPage url="{{AdminOrderStatusPage.url}}" stepKey="goToOrderStatus"/>
-+        <waitForPageLoad stepKey="waitForStatusPageLoad"/>
-+        <actionGroup ref="FilterOrderStatusByLabelAndCodeActionGroup" stepKey="filterStatusGrid">
-+            <argument name="statusLabel" value="{{defaultOrderStatus.label}}"/>
-+            <argument name="statusCode" value="{{defaultOrderStatus.status}}"/>
-+        </actionGroup>
-+        <click selector="{{AdminOrderStatusGridSection.unassign}}" stepKey="unassignOrderStatus"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You have unassigned the order status." stepKey="seeMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusVisibleOnStorefrontTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusVisibleOnStorefrontTest.xml
-new file mode 100644
-index 00000000000..d81baf7755e
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusVisibleOnStorefrontTest.xml
-@@ -0,0 +1,30 @@
-+<?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="AssignCustomOrderStatusVisibleOnStorefrontTest" extends="AssignCustomOrderStatusNotVisibleOnStorefrontTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Assign Custom Order Status"/>
-+            <title value="Assign custom order status visible on storefront test"/>
-+            <description value="Assign custom order status visible on storefront"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16054"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <remove keyForRemoval="seeEmptyMessage"/>
-+
-+        <!-- Assign status to state part -->
-+        <checkOption selector="{{AdminAssignOrderStatusToStateSection.visibleOnStorefront}}" stepKey="visibleOnStorefront"/>
-+
-+        <!-- Assert order in orders grid on frontend -->
-+        <see selector="{{StorefrontCustomerOrderSection.status}}" userInput="{{defaultOrderStatus.label}}" stepKey="seeOrderStatusOnStorefront" after="goToMyOrdersPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CheckXSSVulnerabilityDuringOrderCreationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CheckXSSVulnerabilityDuringOrderCreationTest.xml
-new file mode 100644
-index 00000000000..a728b57a743
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/CheckXSSVulnerabilityDuringOrderCreationTest.xml
-@@ -0,0 +1,62 @@
-+<?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="CheckXSSVulnerabilityDuringOrderCreationTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Create order"/>
-+            <title value="Check XSS vulnerability during order creation test"/>
-+            <description value="Order should not be created with XSS vulnerability in email address"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-11438"/>
-+            <group value="sales"/>
-+        </annotations>
-+        <before>
-+            <!-- Create product -->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+        </before>
-+        <after>
-+            <!-- Delete product -->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Add product to the shopping cart -->
-+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
-+            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="productCount" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Try to create order on Storefront with provided email  -->
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+        <actionGroup ref="StorefrontFillEmailFieldOnCheckoutActionGroup" stepKey="fillIncorrectEmailStorefront">
-+            <argument name="email" value="{{Simple_US_Customer_Incorrect_Email.email}}"/>
-+        </actionGroup>
-+
-+        <!-- Order can not be created -->
-+        <actionGroup ref="AssertStorefrontEmailValidationMessageOnCheckoutActionGroup" stepKey="assertErrorMessageStorefront"/>
-+
-+        <!-- Login as admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        <!-- Try to create order in admin with provided email -->
-+        <actionGroup ref="navigateToNewOrderPageNewCustomerSingleStore" stepKey="navigateToNewOrderPage"/>
-+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer_Incorrect_Email.email}}" stepKey="fillEmailAddressAdminPanel"/>
-+        <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="clickSubmitOrder"/>
-+
-+        <!-- Order can not be created -->
-+        <actionGroup ref="AssertAdminEmailValidationMessageOnCheckoutActionGroup" stepKey="assertErrorMessageAdminPanel"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
-new file mode 100644
-index 00000000000..45953b7b584
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
-@@ -0,0 +1,149 @@
-+<?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="CreateInvoiceAndCheckInvoiceOrderTest">
-+        <annotations>
-+            <stories value="Create Invoice for Offline Payment Methods"/>
-+            <title value="Create invoice and check invoice order test"/>
-+            <description value="Create invoice for offline payment methods and check invoice order on admin dashboard"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-15868"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+            <!-- Create simple product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
-+                <field key="price">100</field>
-+            </createData>
-+
-+            <!-- Enable payment method -->
-+            <magentoCLI command="config:set {{BankTransferEnableConfigData.path}} {{BankTransferEnableConfigData.value}}" stepKey="enableBankTransfer"/>
-+        </before>
-+        <after>
-+            <!-- Disable payment method -->
-+            <magentoCLI command="config:set {{BankTransferDisabledConfigData.path}} {{BankTransferDisabledConfigData.value}}" stepKey="enableBankTransfer"/>
-+
-+            <!-- Logout customer -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Delete product -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create order -->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="goToCreateOrderPage">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Add product to order -->
-+        <actionGroup ref="AddSimpleProductWithQtyToOrderActionGroup" stepKey="addProductToOrder">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="productQty" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Select bank transfer payment method -->
-+        <actionGroup ref="SelectBankTransferPaymentMethodActionGroup" stepKey="selectPaymentMethod"/>
-+
-+        <!-- Select shipping method -->
-+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethods"/>
-+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
-+
-+        <!-- Submit order -->
-+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
-+
-+        <!-- Grab order id -->
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
-+
-+        <!-- Open created order -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersPage"/>
-+        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrdersGridById">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickCreatedOrderInGrid"/>
-+
-+        <!-- Go to invoice tab and fill data -->
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
-+        <fillField selector="{{AdminOrderInvoiceViewSection.invoiceQty}}" userInput="1" stepKey="fillInvoiceQuantity"/>
-+        <click selector="{{AdminOrderInvoiceViewSection.updateInvoiceBtn}}" stepKey="clickUpdateQtyInvoiceBtn"/>
-+        <fillField selector="{{AdminInvoiceTotalSection.invoiceComment}}" userInput="comment" stepKey="writeComment"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+
-+        <!-- Assert invoice with shipment success message -->
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
-+
-+        <!-- Assert invoice in invoices grid -->
-+        <actionGroup ref="FilterInvoiceGridByOrderIdWithCleanFiltersActionGroup" stepKey="filterInvoiceGridByOrderId">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminInvoicesGridSection.firstRow}}" stepKey="opeCreatedInvoice"/>
-+        <waitForPageLoad stepKey="waitForInvoiceDetailsPageToLoad"/>
-+        <grabFromCurrentUrl regex="~/invoice_id/(\d+)/~" stepKey="grabInvoiceId"/>
-+
-+        <!-- Assert invoice in invoices tab -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-+        <waitForPageLoad stepKey="waitForOrdersLoad"/>
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridByIdForAssertingInvoiceBtn">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderInGrid"/>
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoiceTab}}" stepKey="clickInvoicesTabOrdersPage"/>
-+        <conditionalClick selector="{{AdminOrderInvoicesTabSection.clearFilters}}" dependentSelector="{{AdminOrderInvoicesTabSection.clearFilters}}" visible="true" stepKey="clearInvoiceFilters"/>
-+        <click selector="{{AdminOrderInvoicesTabSection.filters}}" stepKey="openOrderInvoicesGridFilters"/>
-+        <fillField selector="{{AdminOrderInvoicesTabSection.invoiceId}}" userInput="$grabInvoiceId" stepKey="fillInvoiceIdFilter"/>
-+        <fillField selector="{{AdminOrderInvoicesTabSection.amountFrom}}" userInput="110.00" stepKey="fillAmountFromFilter"/>
-+        <fillField selector="{{AdminOrderInvoicesTabSection.amountTo}}" userInput="110.00" stepKey="fillAmountToFilter"/>
-+        <click selector="{{AdminOrderInvoicesTabSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
-+        <dontSeeElement selector="{{AdminDataGridTableSection.dataGridEmpty}}" stepKey="assertThatInvoiceGridNotEmpty"/>
-+
-+        <!-- Assert invoice items -->
-+        <actionGroup ref="FilterInvoiceGridByOrderIdWithCleanFiltersActionGroup" stepKey="filterInvoiceByOrderId">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminInvoicesGridSection.firstRow}}" stepKey="openInvoice"/>
-+        <waitForPageLoad stepKey="waitForInvoicePageToLoad"/>
-+        <see selector="{{AdminInvoiceTotalSection.itemName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProductNameInInvoiceItems"/>
-+        <see selector="{{AdminInvoiceTotalSection.itemQty}}" userInput="1" stepKey="seeProductQtyInInvoiceItems"/>
-+        <see selector="{{AdminInvoiceTotalSection.itemTotalPrice}}" userInput="$$createSimpleProduct.price$$" stepKey="seeProductTotalPriceInInvoiceItems"/>
-+
-+        <!-- Login as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForCustomerLogin"/>
-+
-+        <!-- Open My Account > My Orders -->
-+        <amOnPage stepKey="goToMyAccountPage" url="{{StorefrontCustomerDashboardPage.url}}"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToSidebarMenu">
-+            <argument name="menu" value="My Orders"/>
-+        </actionGroup>
-+
-+        <!-- Assert invoiced amount on frontend -->
-+        <click selector="{{StorefrontCustomerOrderSection.viewOrder}}" stepKey="clickViewOrder"/>
-+        <click selector="{{StorefrontOrderInvoicesSection.invoiceTab}}" stepKey="clickInvoiceTabOnStorefront"/>
-+        <see selector="{{StorefrontOrderInvoicesSection.grandTotalPrice}}" userInput="$110.00" stepKey="seePrice"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
-new file mode 100644
-index 00000000000..ef194028a43
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
-@@ -0,0 +1,115 @@
-+<?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="CreateInvoiceWithCashOnDeliveryPaymentMethodTest">
-+        <annotations>
-+            <stories value="Create Invoice for Offline Payment Methods"/>
-+            <title value="Create invoice with cash on delivery payment method test"/>
-+            <description value="Create invoice with cash on delivery payment method"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-15869"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+            <!-- Create simple product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
-+                <field key="price">100</field>
-+            </createData>
-+
-+            <!-- Enable payment method -->
-+            <magentoCLI command="config:set {{CashOnDeliveryEnableConfigData.path}} {{CashOnDeliveryEnableConfigData.value}}" stepKey="enablePaymentMethod"/>
-+        </before>
-+        <after>
-+            <!-- Disable payment method -->
-+            <magentoCLI command="config:set {{CashOnDeliveryDisabledConfigData.path}} {{CashOnDeliveryDisabledConfigData.value}}" stepKey="disablePaymentMethod"/>
-+
-+            <!-- Logout customer -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Delete product -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create order -->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="goToCreateOrderPage">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Add product to order -->
-+        <actionGroup ref="AddSimpleProductWithQtyToOrderActionGroup" stepKey="addProductToOrder">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="productQty" value="2"/>
-+        </actionGroup>
-+
-+        <!-- Select shipping method -->
-+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethods"/>
-+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
-+
-+        <!-- Select cash on delivery payment method -->
-+        <actionGroup ref="SelectCashOnDeliveryPaymentMethodActionGroup" stepKey="selectPaymentMethod"/>
-+
-+        <!-- Submit order -->
-+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
-+
-+        <!-- Grab order id -->
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
-+
-+        <!-- Open created order -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersPage"/>
-+        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrdersGridById">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickCreatedOrderInGrid"/>
-+
-+        <!-- Go to invoice tab and fill data -->
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
-+        <fillField selector="{{AdminOrderInvoiceViewSection.invoiceQty}}" userInput="1" stepKey="fillInvoiceQuantity"/>
-+        <click selector="{{AdminOrderInvoiceViewSection.updateInvoiceBtn}}" stepKey="clickUpdateQtyInvoiceBtn"/>
-+        <fillField selector="{{AdminInvoiceTotalSection.invoiceComment}}" userInput="comment" stepKey="writeComment"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+
-+        <!-- Assert invoice with shipment success message -->
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
-+
-+        <!-- Login as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForCustomerLogin"/>
-+
-+        <!-- Open My Account > My Orders -->
-+        <amOnPage stepKey="goToMyAccountPage" url="{{StorefrontCustomerDashboardPage.url}}"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToSidebarMenu">
-+            <argument name="menu" value="My Orders"/>
-+        </actionGroup>
-+
-+        <!-- Assert invoiced amount on frontend -->
-+        <click selector="{{StorefrontCustomerOrderSection.viewOrder}}" stepKey="clickViewOrder"/>
-+        <click selector="{{StorefrontOrderInvoicesSection.invoiceTab}}" stepKey="clickInvoiceTabOnStorefront"/>
-+        <see selector="{{StorefrontOrderInvoicesSection.grandTotalPrice}}" userInput="$110.00" stepKey="seePrice"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithPurchaseOrderPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithPurchaseOrderPaymentMethodTest.xml
-new file mode 100644
-index 00000000000..1c393b6ffb5
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithPurchaseOrderPaymentMethodTest.xml
-@@ -0,0 +1,38 @@
-+<?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="CreateInvoiceWithPurchaseOrderPaymentMethodTest" extends="CreateInvoiceWithCashOnDeliveryPaymentMethodTest">
-+        <annotations>
-+            <stories value="Create Invoice for Offline Payment Methods"/>
-+            <title value="Create invoice with purchase order payment method test"/>
-+            <description value="Create invoice with purchase order payment method"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-15870"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Enable payment method -->
-+            <magentoCLI command="config:set {{PurchaseOrderEnableConfigData.path}} {{PurchaseOrderEnableConfigData.value}}" stepKey="enablePaymentMethod"/>
-+        </before>
-+        <after>
-+            <!-- Disable payment method -->
-+            <magentoCLI command="config:set {{PurchaseOrderDisabledConfigData.path}} {{PurchaseOrderDisabledConfigData.value}}" stepKey="disablePaymentMethod"/>
-+        </after>
-+
-+        <!-- Select purchase order payment method -->
-+        <actionGroup ref="SelectPurchaseOrderPaymentMethodActionGroup" stepKey="selectPaymentMethod">
-+            <argument name="purchaseOrderNumber" value="12345"/>
-+        </actionGroup>
-+
-+        <click selector="{{AdminOrderFormPaymentSection.header}}" stepKey="unfocus" after="selectPaymentMethod"/>
-+        <waitForPageLoad stepKey="waitForJavascriptToFinish" after="unfocus"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
-new file mode 100644
-index 00000000000..30ca1f51755
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
-@@ -0,0 +1,178 @@
-+<?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="CreateInvoiceWithShipmentAndCheckInvoicedOrderTest">
-+        <annotations>
-+            <stories value="Create Invoice for Offline Payment Methods"/>
-+            <title value="Create invoice with shipment and check invoiced order test"/>
-+            <description value="Create invoice with shipment for offline payment methods and check invoiced order on admin dashboard"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-15867"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+            <!-- Create simple product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
-+
-+            <!-- Enable charts -->
-+            <magentoCLI command="config:set {{AdminEnableDashboardCharts.path}} {{AdminEnableDashboardCharts.value}}" stepKey="enableDashboardCharts"/>
-+        </before>
-+        <after>
-+            <!-- Disable charts -->
-+            <magentoCLI command="config:set {{AdminDisableDashboardCharts.path}} {{AdminDisableDashboardCharts.value}}" stepKey="disableDashboardCharts"/>
-+
-+            <!-- Logout customer -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Delete product -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create order-->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="goToCreateOrderPage">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Add product to order -->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addProductToOrder">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Select shipping method -->
-+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethods"/>
-+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
-+
-+        <!-- Submit order -->
-+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
-+
-+        <!-- Grab order id -->
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
-+
-+        <!-- Open created order -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersPage"/>
-+        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrdersGridById">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickCreatedOrderInGrid"/>
-+
-+        <!-- Go to invoice tab and fill data -->
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
-+        <click selector="{{AdminInvoicePaymentShippingSection.CreateShipment}}" stepKey="createShipment"/>
-+        <fillField selector="{{AdminInvoiceTotalSection.invoiceComment}}" userInput="comment" stepKey="writeComment"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+
-+        <!-- Assert invoice with shipment success message -->
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the invoice and shipment." stepKey="seeSuccessMessage"/>
-+
-+        <!-- Assert order graph image is visible on admin dashboard -->
-+        <amOnPage url="{{AdminDashboardPage.url}}" stepKey="amOnDashboardPage"/>
-+        <waitForPageLoad stepKey="waitForDashboardPageLoad"/>
-+        <actionGroup ref="AssertOrderGraphImageOnDashboardActionGroup" stepKey="seeOrderGraphImage"/>
-+
-+        <!-- Assert invoice in invoices grid -->
-+        <actionGroup ref="FilterInvoiceGridByOrderIdWithCleanFiltersActionGroup" stepKey="filterInvoiceGridByOrderId">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminInvoicesGridSection.firstRow}}" stepKey="opeCreatedInvoice"/>
-+        <waitForPageLoad stepKey="waitForInvoiceDetailsPageToLoad"/>
-+        <grabFromCurrentUrl regex="~/invoice_id/(\d+)/~" stepKey="grabInvoiceId"/>
-+
-+        <!-- Assert no invoice button -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-+        <waitForPageLoad stepKey="waitForOrdersLoad"/>
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridByIdForAssertingInvoiceBtn">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderInGrid"/>
-+        <dontSeeElement selector="{{AdminOrderDetailsMainActionsSection.invoiceBtn}}" stepKey="dontSeeInvoiceBtn"/>
-+
-+        <!-- Assert invoice in invoices tab  -->
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoiceTab}}" stepKey="clickInvoicesTabOrdersPage"/>
-+        <conditionalClick selector="{{AdminOrderInvoicesTabSection.clearFilters}}" dependentSelector="{{AdminOrderInvoicesTabSection.clearFilters}}" visible="true" stepKey="clearInvoiceFilters"/>
-+        <click selector="{{AdminOrderInvoicesTabSection.filters}}" stepKey="openOrderInvoicesGridFilters"/>
-+        <fillField selector="{{AdminOrderInvoicesTabSection.invoiceId}}" userInput="$grabInvoiceId" stepKey="fillInvoiceIdFilter"/>
-+        <fillField selector="{{AdminOrderInvoicesTabSection.amountFrom}}" userInput="128.00" stepKey="fillAmountFromFilter"/>
-+        <fillField selector="{{AdminOrderInvoicesTabSection.amountTo}}" userInput="128.00" stepKey="fillAmountToFilter"/>
-+        <click selector="{{AdminOrderInvoicesTabSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
-+        <dontSeeElement selector="{{AdminDataGridTableSection.dataGridEmpty}}" stepKey="assertThatInvoiceGridNotEmpty"/>
-+
-+        <!-- Login as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForCustomerLogin"/>
-+
-+        <!-- Open My Account > My Orders -->
-+        <amOnPage stepKey="goToMyAccountPage" url="{{StorefrontCustomerDashboardPage.url}}"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToSidebarMenu">
-+            <argument name="menu" value="My Orders"/>
-+        </actionGroup>
-+
-+        <!-- Assert invoiced amount on frontend -->
-+        <click selector="{{StorefrontCustomerOrderSection.viewOrder}}" stepKey="clickViewOrder"/>
-+        <click selector="{{StorefrontOrderInvoicesSection.invoiceTab}}" stepKey="clickInvoiceTabOnStorefront"/>
-+        <see selector="{{StorefrontOrderInvoicesSection.grandTotalPrice}}" userInput="128.00" stepKey="seePrice"/>
-+
-+        <!-- Assert shipment in grid -->
-+        <actionGroup ref="FilterShipmentGridByOrderIdActionGroup" stepKey="filterShipmentGridByOrderId">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminShipmentGridSection.firstRow}}" stepKey="openCreatedShipment"/>
-+        <waitForPageLoad stepKey="waitForShipmentDetailsPageToLoad"/>
-+        <grabFromCurrentUrl regex="~/shipment_id/(\d+)/~" stepKey="grabShipmentId"/>
-+
-+        <!-- Assert no ship button -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToAdminOrdersPage"/>
-+        <waitForPageLoad stepKey="waitForOrdersPageToLoad"/>
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridByIdForAssertingShipBtn">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="selectOrderInGrid"/>
-+        <dontSeeElement selector="{{AdminOrderDetailsMainActionsSection.shipBtn}}" stepKey="dontSeeShipBtn"/>
-+
-+        <!-- Assert shipment in shipments tab -->
-+        <click selector="{{AdminOrderDetailsMainActionsSection.shipmentsTab}}" stepKey="clickShipmentsTab"/>
-+        <waitForPageLoad stepKey="waitOrderShipTabToLoad"/>
-+        <conditionalClick selector="{{AdminOrderShipmentsTabSection.clearFilters}}" dependentSelector="{{AdminOrderShipmentsTabSection.clearFilters}}" visible="true" stepKey="clearShipmentsFilters"/>
-+        <click selector="{{AdminOrderShipmentsTabSection.filters}}" stepKey="openOrderShipmentsGridFilters"/>
-+        <fillField selector="{{AdminOrderShipmentsTabSection.shipmentId}}" userInput="$grabShipmentId" stepKey="fillShipmentsIdFilter"/>
-+        <fillField selector="{{AdminOrderShipmentsTabSection.totalQtyFrom}}" userInput="1.0000" stepKey="fillTotalQtyFromFilter"/>
-+        <fillField selector="{{AdminOrderShipmentsTabSection.totalQtyTo}}" userInput="1.0000" stepKey="fillTotalQtyToFilter"/>
-+        <click selector="{{AdminOrderShipmentsTabSection.applyFilters}}" stepKey="clickApplyFilters"/>
-+        <dontSeeElement selector="{{AdminDataGridTableSection.dataGridEmpty}}" stepKey="assertThatShipmentGridNotEmpty"/>
-+
-+        <!-- Assert invoice items -->
-+        <actionGroup ref="FilterInvoiceGridByOrderIdWithCleanFiltersActionGroup" stepKey="filterInvoiceByOrderId">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminInvoicesGridSection.firstRow}}" stepKey="openInvoice"/>
-+        <waitForPageLoad stepKey="waitForInvoicePageToLoad"/>
-+        <see selector="{{AdminInvoiceTotalSection.itemName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProductNameInInvoiceItems"/>
-+        <see selector="{{AdminInvoiceTotalSection.itemQty}}" userInput="1" stepKey="seeProductQtyInInvoiceItems"/>
-+        <see selector="{{AdminInvoiceTotalSection.itemTotalPrice}}" userInput="$$createSimpleProduct.price$$" stepKey="seeProductTotalPriceInInvoiceItems"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
-new file mode 100644
-index 00000000000..4b8e5d88cdf
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
-@@ -0,0 +1,122 @@
-+<?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="CreateInvoiceWithZeroSubtotalCheckoutTest">
-+        <annotations>
-+            <stories value="Create Invoice for Offline Payment Methods"/>
-+            <title value="Create invoice with zero subtotal checkout test"/>
-+            <description value="Create invoice with with zero subtotal checkout"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-15871"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+            <!-- Create simple product -->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
-+                <field key="price">10</field>
-+            </createData>
-+
-+            <!-- Create sales rule with coupon -->
-+            <createData entity="SalesRuleSpecificCouponWithFixedDiscount" stepKey="createCartPriceRule"/>
-+            <createData entity="SimpleSalesRuleCoupon" stepKey="createCouponForCartPriceRule">
-+                <requiredEntity createDataKey="createCartPriceRule"/>
-+            </createData>
-+
-+            <!-- Enable free shipping method -->
-+            <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShippingMethod"/>
-+            <createData entity="setFreeShippingSubtotal" stepKey="setFreeShippingSubtotal"/>
-+        </before>
-+        <after>
-+            <!-- Disable free shipping method -->
-+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShippingMethod"/>
-+            <createData entity="setFreeShippingSubtotalToDefault" stepKey="setFreeShippingSubtotalToDefault"/>
-+
-+            <!-- Logout customer -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
-+
-+            <!-- Delete sales rule -->
-+            <deleteData createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Delete product -->
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create order -->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="goToCreateOrderPage">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Add product to order -->
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addProductToOrder">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Apply coupon to the order -->
-+        <actionGroup ref="AdminApplyCouponToOrderActionGroup" stepKey="applyCoupon">
-+            <argument name="couponCode" value="$$createCouponForCartPriceRule.code$$"/>
-+        </actionGroup>
-+
-+        <!-- Select Free shipping -->
-+        <actionGroup ref="orderSelectFreeShipping" stepKey="selectFreeShippingOption"/>
-+
-+        <!-- Submit order -->
-+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
-+
-+        <!-- Grab order id -->
-+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
-+
-+        <!-- Open created order -->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersPage"/>
-+        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrdersGridById">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickCreatedOrderInGrid"/>
-+
-+        <!-- Go to invoice tab and fill data -->
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
-+        <fillField selector="{{AdminInvoiceTotalSection.invoiceComment}}" userInput="comment" stepKey="writeComment"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+
-+        <!-- Assert invoice with shipment success message -->
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
-+
-+        <!-- Login as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForCustomerLogin"/>
-+
-+        <!-- Open My Account > My Orders -->
-+        <amOnPage stepKey="goToMyAccountPage" url="{{StorefrontCustomerDashboardPage.url}}"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToSidebarMenu">
-+            <argument name="menu" value="My Orders"/>
-+        </actionGroup>
-+
-+        <!-- Assert invoiced amount on frontend -->
-+        <click selector="{{StorefrontCustomerOrderSection.viewOrder}}" stepKey="clickViewOrder"/>
-+        <click selector="{{StorefrontOrderInvoicesSection.invoiceTab}}" stepKey="clickInvoiceTabOnStorefront"/>
-+        <see selector="{{StorefrontOrderInvoicesSection.grandTotalPrice}}" userInput="$0.00" stepKey="seePrice"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
-index 4cb72972b4c..93f4233af90 100644
---- a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
-@@ -7,10 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="CreditMemoTotalAfterShippingDiscountTest">
-         <annotations>
--            <features value="Credit memo"/>
-+            <features value="Sales"/>
-+            <stories value="Credit memos"/>
-             <title value="Verify credit memo grand total after shipping discount is applied via Cart Price Rule"/>
-             <description value="Verify credit memo grand total after shipping discount is applied via Cart Price Rule"/>
-             <severity value="MAJOR"/>
-@@ -44,6 +45,8 @@
-         <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{ApiSalesRule.name}}" stepKey="fillRuleName"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsite"/>
-         <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="chooseNotLoggedInCustomerGroup"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
- 
-         <!-- Open the Actions Tab in the Rules Edit page -->
-         <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
-@@ -82,6 +85,10 @@
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-         <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-         <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
-+
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment3"/>
-+
-         <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
-@@ -97,7 +104,9 @@
- 
-         <!-- Create invoice -->
-         <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-+        <waitForPageLoad stepKey="waitForOrderPageToLoad"/>
-         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
-+        <waitForPageLoad stepKey="waitForNewInvoicePageToLoad"/>
-         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
- 
-         <!-- Verify Invoice Totals including subTotal Shipping  Discount and GrandTotal -->
-@@ -117,6 +126,7 @@
- 
-         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage1"/>
-+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderProcessing"/>
- 
-         <!--Create Credit Memo-->
-         <comment userInput="Admin creates credit memo" stepKey="createCreditMemoComment"/>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-index 4dc3c7a6ae7..0fdd8d8c35b 100644
---- a/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CAdminTest">
-         <before>
-             <!--Create order via API-->
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveConfigurableProductsInComparedOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveConfigurableProductsInComparedOnOrderPageTest.xml
-new file mode 100644
-index 00000000000..980d5cc82b9
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveConfigurableProductsInComparedOnOrderPageTest.xml
-@@ -0,0 +1,163 @@
-+<?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="MoveConfigurableProductsInComparedOnOrderPageTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Add Products to Order from Products in Comparison List Section"/>
-+            <title value="Move configurable products in compared on order page test"/>
-+            <description value="Move configurable products in compared on order page test"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16104"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer_CA" stepKey="createCustomer"/>
-+
-+            <!-- Create category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create first configurable product -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createFirstConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createFirstConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createFirstConfigProductAttributeOption">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createFirstConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getFirstConfigAttributeOption">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+            </getData>
-+            <createData entity="ApiSimpleOne" stepKey="createFirstConfigChildProduct">
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getFirstConfigAttributeOption"/>
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createFirstConfigProductOption">
-+                <requiredEntity createDataKey="createFirstConfigProduct"/>
-+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getFirstConfigAttributeOption"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createFirstConfigProductAddChild">
-+                <requiredEntity createDataKey="createFirstConfigProduct"/>
-+                <requiredEntity createDataKey="createFirstConfigChildProduct"/>
-+            </createData>
-+
-+            <!-- Create second configurable product -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createSecondConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createSecondConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createSecondConfigProductAttributeOption">
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createSecondConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getSecondConfigAttributeOption">
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+            </getData>
-+            <createData entity="ApiSimpleOne" stepKey="createSecondConfigChildProduct">
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getSecondConfigAttributeOption"/>
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createSecondConfigProductOption">
-+                <requiredEntity createDataKey="createSecondConfigProduct"/>
-+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getSecondConfigAttributeOption"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createSecondConfigProductAddChild">
-+                <requiredEntity createDataKey="createSecondConfigProduct"/>
-+                <requiredEntity createDataKey="createSecondConfigChildProduct"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Admin logout -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <!-- Logout customer -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
-+
-+            <!-- Delete configurable products data -->
-+            <deleteData createDataKey="createFirstConfigChildProduct" stepKey="deleteFirstConfigChildProduct"/>
-+            <deleteData createDataKey="createFirstConfigProduct" stepKey="deleteFirstConfigProduct"/>
-+            <deleteData createDataKey="createFirstConfigProductAttribute" stepKey="deleteFirstConfigProductAttribute"/>
-+            <deleteData createDataKey="createSecondConfigChildProduct" stepKey="deleteSecondConfigChildProduct"/>
-+            <deleteData createDataKey="createSecondConfigProduct" stepKey="deleteSecondConfigProduct"/>
-+            <deleteData createDataKey="createSecondConfigProductAttribute" stepKey="deleteSecondConfigProductAttribute"/>
-+
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!-- Login as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$" />
-+        </actionGroup>
-+
-+        <!-- Add first product to compare list -->
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openFirstProductPage">
-+            <argument name="productUrl" value="$$createFirstConfigProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton"/>
-+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addFirstProductToCompare">
-+            <argument name="productVar" value="$$createFirstConfigProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Add second product to compare list -->
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openSecondProductPage">
-+            <argument name="productUrl" value="$$createSecondConfigProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductBtn"/>
-+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addSecondProductToCompare">
-+            <argument name="productVar" value="$$createSecondConfigProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Login as admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        <!-- Open Customers -> All Customers -->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Click 'Create Order' -->
-+        <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
-+
-+        <!-- Add configure to first product -->
-+        <click selector="{{AdminCustomerActivitiesComparisonListSection.addToOrderConfigure($$createFirstConfigProduct.name$$)}}" stepKey="configureFirstProduct"/>
-+        <selectOption selector="{{AdminCustomerActivitiesConfigureSection.addAttribute}}" userInput="$$getFirstConfigAttributeOption.value$$" stepKey="selectOptionForFirstProduct"/>
-+        <click selector="{{AdminCustomerActivitiesConfigureSection.okButton}}" stepKey="clickOkBtnForFirstProduct"/>
-+        <waitForPageLoad stepKey="waitForConfigureForFirstProductLoad"/>
-+
-+        <!-- Add configure to second product -->
-+        <click selector="{{AdminCustomerActivitiesComparisonListSection.addToOrderConfigure($$createSecondConfigProduct.name$$)}}" stepKey="configureSecondProduct"/>
-+        <selectOption selector="{{AdminCustomerActivitiesConfigureSection.addAttribute}}" userInput="$$getSecondConfigAttributeOption.value$$" stepKey="selectOptionForSecond"/>
-+        <click selector="{{AdminCustomerActivitiesConfigureSection.okButton}}" stepKey="clickOkBtnForSecondProduct"/>
-+        <waitForPageLoad stepKey="waitForConfigureForSecondProductLoad"/>
-+
-+        <!-- Click 'Update Changes' -->
-+        <click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickUpdateChangesBtn"/>
-+
-+        <!-- Assert products in items ordered grid -->
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Product')}}" userInput="$$createFirstConfigProduct.name$$" stepKey="seeFirstProductName"/>
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Price')}}" userInput="$123.00" stepKey="seeFirstProductPrice"/>
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('2', 'Product')}}" userInput="$$createSecondConfigProduct.name$$" stepKey="seeSecondProductName"/>
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('2', 'Price')}}" userInput="$123.00" stepKey="seeSecondProductPrice"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml
-new file mode 100644
-index 00000000000..3cc14392c61
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml
-@@ -0,0 +1,112 @@
-+<?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="MoveLastOrderedConfigurableProductOnOrderPageTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Add Products to Order from Last Ordered Products Section"/>
-+            <title value="Move last ordered configurable product on order page test"/>
-+            <description value="Move last ordered configurable product on order page"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16155"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
-+
-+            <!-- Create category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create configurable product -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption"/>
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Delete created data -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createConfigChildProduct" stepKey="deleteConfigChildProduct"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!-- Create order -->
-+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="goToCreateOrderPage">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Add configurable product to order -->
-+        <actionGroup ref="addConfigurableProductToOrderFromAdmin" stepKey="addConfigurableProductToOrder">
-+            <argument name="product" value="$$createConfigProduct$$"/>
-+            <argument name="attribute" value="$$createConfigProductAttribute$$"/>
-+            <argument name="option" value="$$getConfigAttributeOption$$"/>
-+        </actionGroup>
-+
-+        <!-- Select shipping method -->
-+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethods"/>
-+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
-+        <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
-+
-+        <!-- Submit order -->
-+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
-+
-+        <!-- Search and open customer -->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
-+            <argument name="email" value="$$createCustomer.email$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+
-+        <!-- Click create order -->
-+        <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
-+
-+        <!-- Select product in Last Ordered Items section -->
-+        <click selector="{{AdminCustomerActivitiesLastOrderedSection.addProductToOrder($$createConfigProduct.name$$)}}" stepKey="addProductToOrder"/>
-+
-+        <!-- Click Update Changes -->
-+        <click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickUpdateChangesBtn"/>
-+
-+        <!-- Assert product in items ordered grid -->
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Product')}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductName"/>
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Price')}}" userInput="$123.00" stepKey="seeProductPrice"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml
-new file mode 100644
-index 00000000000..f13a934276e
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml
-@@ -0,0 +1,65 @@
-+<?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="MoveLastOrderedSimpleProductOnOrderPageTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Add Products to Order from Last Ordered Products Section"/>
-+            <title value="Move last ordered simple product on order page test"/>
-+            <description value="Move last ordered simple product on order page"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16154"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
-+
-+            <!-- Create product -->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+        </before>
-+        <after>
-+            <!-- Delete created data -->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logOut"/>
-+        </after>
-+
-+        <!-- Create order -->
-+        <actionGroup ref="CreateOrderActionGroup" stepKey="createOrder">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Search and open customer -->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
-+            <argument name="email" value="$$createCustomer.email$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+
-+        <!-- Click create order -->
-+        <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
-+
-+        <!-- Select product in Last Ordered Items section -->
-+        <click selector="{{AdminCustomerActivitiesLastOrderedSection.addProductToOrder($$createProduct.name$$)}}" stepKey="addProductToOrder"/>
-+
-+        <!-- Click Update Changes -->
-+        <click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickUpdateChangesBtn"/>
-+
-+        <!-- Assert product in items ordered grid -->
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Product')}}" userInput="$$createProduct.name$$" stepKey="seeProductName"/>
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Price')}}" userInput="$$createProduct.price$$" stepKey="seeProductPrice"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
-new file mode 100644
-index 00000000000..9e794ce079b
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
-@@ -0,0 +1,110 @@
-+<?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="MoveRecentlyViewedBundleFixedProductOnOrderPageTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Add Products to Order from Recently Viewed Products Section"/>
-+            <title value="Move recently viewed bundle fixed product on order page test"/>
-+            <description value="Move recently viewed bundle fixed product on order page"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16164"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
-+
-+            <!-- Create category -->
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+
-+            <!-- Create simple products -->
-+            <createData entity="SimpleProduct2" stepKey="createFirstProduct">
-+                <field key="price">755.00</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="createSecondProduct">
-+                <field key="price">756.00</field>
-+            </createData>
-+
-+            <!-- Create Bundle product -->
-+            <createData entity="BundleProductPriceViewRange" stepKey="createBundleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="DropDownBundleOption" stepKey="createBundleOption">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkFirstOptionToProduct">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption"/>
-+                <requiredEntity createDataKey="createFirstProduct"/>
-+            </createData>
-+            <createData entity="ApiBundleLink" stepKey="linkSecondOptionToProduct">
-+                <requiredEntity createDataKey="createBundleProduct"/>
-+                <requiredEntity createDataKey="createBundleOption"/>
-+                <requiredEntity createDataKey="createSecondProduct"/>
-+            </createData>
-+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-+        </before>
-+        <after>
-+            <!-- Admin logout -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <!-- Customer logout -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Delete created product data -->
-+            <deleteData createDataKey="createBundleProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
-+            <deleteData createDataKey="createSecondProduct" stepKey="deleteSecondProduct"/>
-+
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!-- Login as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Go to created product page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createBundleProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+
-+        <!-- Search and open customer -->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
-+            <argument name="email" value="$$createCustomer.email$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
-+        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
-+
-+        <!-- Click create order -->
-+        <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
-+
-+        <!-- Add configure to bundle product -->
-+        <click selector="{{AdminCustomerActivitiesRecentlyViewedSection.addToOrderConfigure($$createBundleProduct.name$$)}}" stepKey="configureProduct"/>
-+        <click selector="{{AdminCustomerActivitiesConfigureSection.dropdownProductSelection($$createFirstProduct.name$$)}}" stepKey="selectProductOption"/>
-+        <click selector="{{AdminCustomerActivitiesConfigureSection.okButton}}" stepKey="clickOkBtn"/>
-+        <waitForPageLoad stepKey="waitForAddingConfigure"/>
-+
-+        <!-- Click 'Update Changes' -->
-+        <click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickUpdateChangesBtn"/>
-+
-+        <!-- Assert products in items ordered grid -->
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Product')}}" userInput="$$createBundleProduct.name$$" stepKey="seeProductName"/>
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Price')}}" userInput="$755.00" stepKey="seeProductPrice"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml
-new file mode 100644
-index 00000000000..35dc49d2b8a
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml
-@@ -0,0 +1,113 @@
-+<?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="MoveRecentlyViewedConfigurableProductOnOrderPageTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Add Products to Order from Recently Viewed Products Section"/>
-+            <title value="Move recently viewed configurable product on order page test"/>
-+            <description value="Move recently viewed configurable product on order page"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16163"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
-+
-+            <!-- Create category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+
-+            <!-- Create configurable product -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct">
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption"/>
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Admin logout -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <!-- Customer logout -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Delete created data -->
-+            <deleteData createDataKey="createConfigChildProduct" stepKey="deleteConfigChildProduct"/>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+
-+            <!-- Delete category -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+        </after>
-+
-+        <!-- Login as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Go to created product page -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption.value$$" stepKey="selectOption"/>
-+
-+        <!-- Search and open customer -->
-+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
-+            <argument name="email" value="$$createCustomer.email$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
-+        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
-+
-+        <!-- Click create order -->
-+        <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
-+
-+        <!-- Add configure to product -->
-+        <click selector="{{AdminCustomerActivitiesRecentlyViewedSection.addToOrderConfigure($$createConfigProduct.name$$)}}" stepKey="configureProduct"/>
-+        <selectOption selector="{{AdminCustomerActivitiesConfigureSection.addAttribute}}" userInput="$$getConfigAttributeOption.value$$" stepKey="selectProductOption"/>
-+        <click selector="{{AdminCustomerActivitiesConfigureSection.okButton}}" stepKey="clickOkBtn"/>
-+        <waitForPageLoad stepKey="waitForProductConfigureLoad"/>
-+
-+        <!-- Click 'Update Changes' -->
-+        <click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickUpdateChangesBtn"/>
-+
-+        <!-- Assert products in items ordered grid -->
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Product')}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductName"/>
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Price')}}" userInput="$123.00" stepKey="seeProductPrice"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml
-new file mode 100644
-index 00000000000..3c01878b59e
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml
-@@ -0,0 +1,96 @@
-+<?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="MoveSimpleProductsInComparedOnOrderPageTest">
-+        <annotations>
-+            <features value="Sales"/>
-+            <stories value="Add Products to Order from Products in Comparison List Section"/>
-+            <title value="Move simple products in compared on order page test"/>
-+            <description value="Move simple products in compared on order page test"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16103"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer_CA" stepKey="createCustomer"/>
-+
-+            <!-- Create simple products -->
-+            <createData entity="SimpleProduct2" stepKey="createFirstSimpleProduct">
-+                <field key="price">560</field>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="createSecondSimpleProduct">
-+                <field key="price">560</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <!-- Admin logout -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+
-+            <!-- Logout customer -->
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
-+
-+            <!-- Delete created entities -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
-+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
-+        </after>
-+
-+        <!-- Login as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$" />
-+        </actionGroup>
-+
-+        <!-- Add first product to compare list -->
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openFirstProductPage">
-+            <argument name="productUrl" value="$$createFirstSimpleProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton"/>
-+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addFirstProductToCompare">
-+            <argument name="productVar" value="$$createFirstSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Add second product to compare list -->
-+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openSecondProductPage">
-+            <argument name="productUrl" value="$$createSecondSimpleProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareButton"/>
-+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addSecondProductToCompare">
-+            <argument name="productVar" value="$$createSecondSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!-- Login as admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        <!-- Open Customers -> All Customers -->
-+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-+        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
-+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
-+            <argument name="customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Click 'Create Order' -->
-+        <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
-+
-+        <!-- Select products in comparison list section -->
-+        <click selector="{{AdminCustomerActivitiesComparisonListSection.addProductToOrder($$createFirstSimpleProduct.name$$)}}" stepKey="addFirstProductToOrder"/>
-+        <click selector="{{AdminCustomerActivitiesComparisonListSection.addProductToOrder($$createSecondSimpleProduct.name$$)}}" stepKey="addSecondProductToOrder"/>
-+
-+        <!-- Click 'Update Changes' -->
-+        <click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickUpdateChangesBtn"/>
-+
-+        <!-- Assert products in items ordered grid -->
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Product')}}" userInput="$$createFirstSimpleProduct.name$$" stepKey="seeFirstProductName"/>
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Price')}}" userInput="$$createFirstSimpleProduct.price$$" stepKey="seeFirstProductPrice"/>
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('2', 'Product')}}" userInput="$$createSecondSimpleProduct.name$$" stepKey="seeSecondProductName"/>
-+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('2', 'Price')}}" userInput="$$createSecondSimpleProduct.price$$" stepKey="seeSecondProductPrice"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml
-new file mode 100644
-index 00000000000..b8772f24a2a
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml
-@@ -0,0 +1,222 @@
-+<?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="StorefrontOrderPagerDisplayedTest">
-+        <annotations>
-+            <stories value="Storefront order pager"/>
-+            <title value="Pager is displayed for 21 order items"/>
-+            <description value="Pager is displayed for 21 order items"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16167"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <!-- 21 products created and category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createProduct01">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createProduct02">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createProduct03">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createProduct04">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createProduct05">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createProduct06">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createProduct07">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createProduct08">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createProduct09">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createProduct10">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createProduct11">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createProduct12">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct13">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct14">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct15">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct16">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct17">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct18">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct19">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct20">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createProduct21">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Customer is created -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+        </before>
-+        <after>
-+            <!-- Delete category and products -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct01" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="createProduct02" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="createProduct03" stepKey="deleteProduct3"/>
-+            <deleteData createDataKey="createProduct04" stepKey="deleteProduct4"/>
-+            <deleteData createDataKey="createProduct05" stepKey="deleteProduct5"/>
-+            <deleteData createDataKey="createProduct06" stepKey="deleteProduct6"/>
-+            <deleteData createDataKey="createProduct07" stepKey="deleteProduct7"/>
-+            <deleteData createDataKey="createProduct08" stepKey="deleteProduct8"/>
-+            <deleteData createDataKey="createProduct09" stepKey="deleteProduct9"/>
-+            <deleteData createDataKey="createProduct10" stepKey="deleteProduct10"/>
-+            <deleteData createDataKey="createProduct11" stepKey="deleteProduct11"/>
-+            <deleteData createDataKey="createProduct12" stepKey="deleteProduct12"/>
-+            <deleteData createDataKey="createProduct13" stepKey="deleteProduct13"/>
-+            <deleteData createDataKey="createProduct14" stepKey="deleteProduct14"/>
-+            <deleteData createDataKey="createProduct15" stepKey="deleteProduct15"/>
-+            <deleteData createDataKey="createProduct16" stepKey="deleteProduct16"/>
-+            <deleteData createDataKey="createProduct17" stepKey="deleteProduct17"/>
-+            <deleteData createDataKey="createProduct18" stepKey="deleteProduct18"/>
-+            <deleteData createDataKey="createProduct19" stepKey="deleteProduct19"/>
-+            <deleteData createDataKey="createProduct20" stepKey="deleteProduct20"/>
-+            <deleteData createDataKey="createProduct21" stepKey="deleteProduct21"/>
-+
-+            <!-- Delete Customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Login to Storefront as Customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$" />
-+        </actionGroup>
-+
-+        <!-- Customer placed the order with 20 products -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <scrollTo selector="{{StorefrontCategoryMainSection.perPage}}" stepKey="scrollToLimiter"/>
-+        <selectOption userInput="30" selector="{{StorefrontCategoryMainSection.perPage}}" stepKey="selectLimitOnPage"/>
-+        <waitForPageLoad stepKey="waitForLoadProducts"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct1">
-+            <argument name="productName" value="$$createProduct01.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct2">
-+            <argument name="productName" value="$$createProduct02.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct3">
-+            <argument name="productName" value="$$createProduct03.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct4">
-+            <argument name="productName" value="$$createProduct04.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct5">
-+            <argument name="productName" value="$$createProduct05.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct6">
-+            <argument name="productName" value="$$createProduct06.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct7">
-+            <argument name="productName" value="$$createProduct07.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct8">
-+            <argument name="productName" value="$$createProduct08.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct9">
-+            <argument name="productName" value="$$createProduct09.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct10">
-+            <argument name="productName" value="$$createProduct10.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct11">
-+            <argument name="productName" value="$$createProduct11.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct12">
-+            <argument name="productName" value="$$createProduct12.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct13">
-+            <argument name="productName" value="$$createProduct13.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct14">
-+            <argument name="productName" value="$$createProduct14.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct15">
-+            <argument name="productName" value="$$createProduct15.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct16">
-+            <argument name="productName" value="$$createProduct16.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct17">
-+            <argument name="productName" value="$$createProduct17.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct18">
-+            <argument name="productName" value="$$createProduct18.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct19">
-+            <argument name="productName" value="$$createProduct19.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct20">
-+            <argument name="productName" value="$$createProduct20.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct21">
-+            <argument name="productName" value="$$createProduct21.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Place Order -->
-+        <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="onCheckout"/>
-+        <see userInput="21" selector="{{CheckoutOrderSummarySection.itemsQtyInCart}}" stepKey="see21Products"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNextButton"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForCheckoutLoad"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="placeOrder"/>
-+        <waitForPageLoad stepKey="waitForSuccess"/>
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
-+
-+        <!-- Go to My Account > My Orders page -->
-+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="onMyAccount"/>
-+        <waitForPageLoad stepKey="waitForAccountPage"/>
-+        <click selector="{{StorefrontCustomerSidebarSection.sidebarTab('My Orders')}}" stepKey="clickOnMyOrders"/>
-+        <waitForPageLoad stepKey="waitForOrdersLoad"/>
-+
-+        <!-- Click 'View Order' link on order from preconditions -->
-+        <click selector="{{StorefrontCustomerOrdersGridSection.orderView({$grabOrderNumber})}}" stepKey="clickOrderView"/>
-+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
-+
-+        <!-- Assert: Pager is displayed for 21 order items -->
-+        <seeElement selector="{{StorefrontCustomerOrderViewSection.pager}}" stepKey="assertPagerIsDisplayed"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerIsAbsentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerIsAbsentTest.xml
-new file mode 100644
-index 00000000000..9909fca44fe
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerIsAbsentTest.xml
-@@ -0,0 +1,215 @@
-+<?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="StorefrontOrderPagerIsAbsentTest">
-+        <annotations>
-+            <stories value="Storefront order pager"/>
-+            <title value="Pager is absent for 20 order items"/>
-+            <description value="Pager is disabled for orders with less than 20 items"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16166"/>
-+            <group value="sales"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <!-- 20 products created and category -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createProduct01">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createProduct02">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createProduct03">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createProduct04">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createProduct05">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createProduct06">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createProduct07">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createProduct08">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="_defaultProduct" stepKey="createProduct09">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createProduct10">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createProduct11">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="SimpleProduct" stepKey="createProduct12">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct13">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct14">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct15">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct16">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct17">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct18">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct19">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="ApiSimpleProduct" stepKey="createProduct20">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <!-- Customer is created -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+
-+        </before>
-+        <after>
-+            <!-- Delete category and products -->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct01" stepKey="deleteProduct1"/>
-+            <deleteData createDataKey="createProduct02" stepKey="deleteProduct2"/>
-+            <deleteData createDataKey="createProduct03" stepKey="deleteProduct3"/>
-+            <deleteData createDataKey="createProduct04" stepKey="deleteProduct4"/>
-+            <deleteData createDataKey="createProduct05" stepKey="deleteProduct5"/>
-+            <deleteData createDataKey="createProduct06" stepKey="deleteProduct6"/>
-+            <deleteData createDataKey="createProduct07" stepKey="deleteProduct7"/>
-+            <deleteData createDataKey="createProduct08" stepKey="deleteProduct8"/>
-+            <deleteData createDataKey="createProduct09" stepKey="deleteProduct9"/>
-+            <deleteData createDataKey="createProduct10" stepKey="deleteProduct10"/>
-+            <deleteData createDataKey="createProduct11" stepKey="deleteProduct11"/>
-+            <deleteData createDataKey="createProduct12" stepKey="deleteProduct12"/>
-+            <deleteData createDataKey="createProduct13" stepKey="deleteProduct13"/>
-+            <deleteData createDataKey="createProduct14" stepKey="deleteProduct14"/>
-+            <deleteData createDataKey="createProduct15" stepKey="deleteProduct15"/>
-+            <deleteData createDataKey="createProduct16" stepKey="deleteProduct16"/>
-+            <deleteData createDataKey="createProduct17" stepKey="deleteProduct17"/>
-+            <deleteData createDataKey="createProduct18" stepKey="deleteProduct18"/>
-+            <deleteData createDataKey="createProduct19" stepKey="deleteProduct19"/>
-+            <deleteData createDataKey="createProduct20" stepKey="deleteProduct20"/>
-+
-+            <!-- Delete Customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Login to Storefront as Customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$" />
-+        </actionGroup>
-+
-+        <!-- Customer placed the order with 20 products -->
-+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <scrollTo selector="{{StorefrontCategoryMainSection.perPage}}" stepKey="scrollToLimiter"/>
-+        <selectOption userInput="30" selector="{{StorefrontCategoryMainSection.perPage}}" stepKey="selectLimitOnPage"/>
-+        <waitForPageLoad stepKey="waitForLoadProducts"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct1">
-+            <argument name="productName" value="$$createProduct01.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct2">
-+            <argument name="productName" value="$$createProduct02.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct3">
-+            <argument name="productName" value="$$createProduct03.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct4">
-+            <argument name="productName" value="$$createProduct04.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct5">
-+            <argument name="productName" value="$$createProduct05.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct6">
-+            <argument name="productName" value="$$createProduct06.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct7">
-+            <argument name="productName" value="$$createProduct07.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct8">
-+            <argument name="productName" value="$$createProduct08.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct9">
-+            <argument name="productName" value="$$createProduct09.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct10">
-+            <argument name="productName" value="$$createProduct10.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct11">
-+            <argument name="productName" value="$$createProduct11.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct12">
-+            <argument name="productName" value="$$createProduct12.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct13">
-+            <argument name="productName" value="$$createProduct13.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct14">
-+            <argument name="productName" value="$$createProduct14.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct15">
-+            <argument name="productName" value="$$createProduct15.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct16">
-+            <argument name="productName" value="$$createProduct16.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct17">
-+            <argument name="productName" value="$$createProduct17.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct18">
-+            <argument name="productName" value="$$createProduct18.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct19">
-+            <argument name="productName" value="$$createProduct19.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct20">
-+            <argument name="productName" value="$$createProduct20.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Place Order -->
-+        <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="onCheckout"/>
-+        <see userInput="20" selector="{{CheckoutOrderSummarySection.itemsQtyInCart}}" stepKey="see20Products"/>
-+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNextButton"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForCheckoutLoad"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="placeOrder"/>
-+        <waitForPageLoad stepKey="waitForSuccess"/>
-+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
-+
-+        <!-- Go to My Account > My Orders page -->
-+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="onMyAccount"/>
-+        <waitForPageLoad stepKey="waitForAccountPage"/>
-+        <click selector="{{StorefrontCustomerSidebarSection.sidebarTab('My Orders')}}" stepKey="clickOnMyOrders"/>
-+        <waitForPageLoad stepKey="waitForOrdersLoad"/>
-+
-+        <!-- Click 'View Order' link on order from preconditions -->
-+        <click selector="{{StorefrontCustomerOrdersGridSection.orderView({$grabOrderNumber})}}" stepKey="clickOrderView"/>
-+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
-+
-+        <!-- Assert: Order items pager hidden on frontend -->
-+        <dontSeeElement selector="{{StorefrontCustomerOrderViewSection.pager}}" stepKey="assertPagerIsAbsent"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistory.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistory.xml
-new file mode 100644
-index 00000000000..ad3a411d924
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistory.xml
-@@ -0,0 +1,79 @@
-+<?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="StorefrontRedirectToOrderHistory">
-+        <annotations>
-+            <features value="Redirection Rules"/>
-+            <stories value="Create Invoice"/>
-+            <title value="Create Invoice"/>
-+            <description
-+                    value="Check while order printing URL with an id of not relevant order redirects to order history"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-92854"/>
-+            <group value="sales"/>
-+        </annotations>
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer2"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCustomer2" stepKey="deleteCustomer2"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+        </after>
-+
-+        <!--Log in to Storefront as Customer 1 -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!--Create an order at Storefront as Customer 1 -->
-+        <actionGroup ref="CreateOrderToPrintPageWithSelectedPaymentMethodActionGroup" stepKey="createOrderToPrint">
-+            <argument name="Category" value="$$createCategory$$"/>
-+        </actionGroup>
-+
-+        <!--Go to 'print order' page by grabbed order id-->
-+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderIdFromURL"/>
-+        <switchToNextTab stepKey="switchToPrintPage"/>
-+        <waitForElement selector="{{SalesOrderPrintSection.isOrderPrintPage}}" stepKey="checkPrintPage"/>
-+        <openNewTab stepKey="openNewTab"/>
-+        <switchToNextTab stepKey="switchForward"/>
-+        <amOnPage url="{{StorefrontSalesOrderPrintPage.url({$grabOrderIdFromURL})}}" stepKey="duplicatePrintPage"/>
-+
-+        <!--Log out as customer 1-->
-+        <switchToNextTab stepKey="switchForward2"/>
-+        <openNewTab stepKey="openNewTab2"/>
-+        <amOnPage url="{{StorefrontCustomerSignOutPage.url}}" stepKey="signOut"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitSignOutPage"/>
-+
-+        <!--Log in to Storefront as Customer 2 -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp2">
-+            <argument name="Customer" value="$$createCustomer2$$"/>
-+        </actionGroup>
-+
-+        <!--Create an order at Storefront as Customer 2 -->
-+        <actionGroup ref="CreateOrderToPrintPageWithSelectedPaymentMethodActionGroup" stepKey="createOrderToPrint2">
-+            <argument name="Category" value="$$createCategory$$"/>
-+        </actionGroup>
-+
-+        <!--Try to load 'print order' page with not relevant order id to be redirected to 'order history' page-->
-+        <switchToNextTab stepKey="switchToPrintPage2"/>
-+        <waitForElement selector="{{SalesOrderPrintSection.isOrderPrintPage}}" stepKey="checkPrintPage2"/>
-+        <openNewTab stepKey="openNewTab3"/>
-+        <switchToNextTab stepKey="switchForward4"/>
-+        <amOnPage url="{{StorefrontSalesOrderPrintPage.url({$grabOrderIdFromURL})}}" stepKey="duplicatePrintPage2"/>
-+        <seeElement selector="{{StorefrontCustomerOrderSection.isMyOrdersSection}}" stepKey="waitOrderHistoryPage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php
-new file mode 100644
-index 00000000000..94148cc5153
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php
-@@ -0,0 +1,144 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Test\Unit\Block\Adminhtml\Order\Address;
-+
-+use Magento\Customer\Model\Metadata\Form as CustomerForm;
-+use Magento\Customer\Model\Metadata\FormFactory as CustomerFormFactory;
-+use Magento\Directory\Model\ResourceModel\Country\Collection;
-+use Magento\Framework\Data\Form as DataForm;
-+use Magento\Framework\Data\Form\Element\Fieldset;
-+use Magento\Framework\Data\Form\Element\Select;
-+use Magento\Framework\Data\FormFactory;
-+use Magento\Framework\Registry;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Sales\Block\Adminhtml\Order\Address\Form;
-+use Magento\Sales\Model\AdminOrder\Create;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Address;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+use Magento\Backend\Model\Session\Quote as QuoteSession;
-+
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class FormTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var Form
-+     */
-+    private $addressBlock;
-+
-+    /**
-+     * @var MockObject
-+     */
-+    private $formFactory;
-+
-+    /**
-+     * @var MockObject
-+     */
-+    private $customerFormFactory;
-+
-+    /**
-+     * @var MockObject
-+     */
-+    private $coreRegistry;
-+
-+    /**
-+     * @var MockObject
-+     */
-+    private $countriesCollection;
-+
-+    /**
-+     * @var QuoteSession|MockObject
-+     */
-+    private $sessionQuote;
-+
-+    /**
-+     * @var Create|MockObject
-+     */
-+    private $orderCreate;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = new ObjectManager($this);
-+
-+        $this->formFactory = $this->createMock(FormFactory::class);
-+        $this->customerFormFactory = $this->createMock(CustomerFormFactory::class);
-+        $this->coreRegistry = $this->createMock(Registry::class);
-+        $this->countriesCollection = $this->createMock(
-+            Collection::class
-+        );
-+        $this->sessionQuote = $this->getMockBuilder(QuoteSession::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getStoreId', 'getStore'])
-+            ->getMock();
-+
-+        $this->orderCreate = $this->getMockBuilder(Create::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->orderCreate->method('getSession')
-+            ->willReturn($this->sessionQuote);
-+
-+        $this->addressBlock = $objectManager->getObject(
-+            Form::class,
-+            [
-+                '_formFactory' => $this->formFactory,
-+                '_customerFormFactory' => $this->customerFormFactory,
-+                '_coreRegistry' => $this->coreRegistry,
-+                'countriesCollection' => $this->countriesCollection,
-+                'sessionQuote' => $this->sessionQuote,
-+                '_orderCreate' => $this->orderCreate
-+            ]
-+        );
-+    }
-+
-+    public function testGetForm()
-+    {
-+        $storeId = 5;
-+        $form = $this->createMock(DataForm::class);
-+        $fieldset = $this->createMock(Fieldset::class);
-+        $addressForm = $this->createMock(CustomerForm::class);
-+        $address = $this->createMock(Address::class);
-+        $select = $this->createMock(Select::class);
-+        $order = $this->createMock(Order::class);
-+
-+        $this->formFactory->method('create')
-+            ->willReturn($form);
-+        $form->method('addFieldset')
-+            ->willReturn($fieldset);
-+        $this->customerFormFactory->method('create')
-+            ->willReturn($addressForm);
-+        $addressForm->method('getAttributes')
-+            ->willReturn([]);
-+        $this->coreRegistry->method('registry')
-+            ->willReturn($address);
-+        $form->method('getElement')
-+            ->willReturnOnConsecutiveCalls(
-+                $select,
-+                $select,
-+                $select,
-+                $select,
-+                $select,
-+                $select,
-+                $select,
-+                null
-+            );
-+
-+        $address->method('getOrder')
-+            ->willReturn($order);
-+        $order->method('getStoreId')
-+            ->willReturn($storeId);
-+        $this->sessionQuote->method('getStoreId')
-+            ->willReturn($storeId);
-+        $this->countriesCollection->method('loadByStore')
-+            ->with($storeId)
-+            ->willReturn($this->countriesCollection);
-+
-+        $this->addressBlock->getForm();
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Form/AddressTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Form/AddressTest.php
-new file mode 100644
-index 00000000000..5b6d6ded156
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Form/AddressTest.php
-@@ -0,0 +1,263 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Test\Unit\Block\Adminhtml\Order\Create\Form;
-+
-+use Magento\Backend\Model\Session\Quote as QuoteSession;
-+use Magento\Store\Model\Store;
-+use Magento\Directory\Helper\Data as DirectoryHelper;
-+use Magento\Eav\Model\AttributeDataFactory;
-+use Magento\Sales\Block\Adminhtml\Order\Create\Form\Address;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Api\Data\AddressSearchResultsInterface;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Customer\Model\Metadata\Form;
-+use Magento\Customer\Model\Metadata\FormFactory;
-+use Magento\Customer\Model\Address\Mapper;
-+use Magento\Framework\Api\FilterBuilder;
-+use Magento\Framework\Api\Filter;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Api\SearchCriteria;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use PHPUnit\Framework\TestCase;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class AddressTest extends TestCase
-+{
-+    /**
-+     * @var QuoteSession|MockObject
-+     */
-+    private $quoteSession;
-+
-+    /**
-+     * @var Store|MockObject
-+     */
-+    private $store;
-+
-+    /**
-+     * @var DirectoryHelper|MockObject
-+     */
-+    private $directoryHelper;
-+
-+    /**
-+     * @var int
-+     */
-+    private $defaultCountryId;
-+
-+    /**
-+     * @var int
-+     */
-+    private $customerId;
-+
-+    /**
-+     * @var int
-+     */
-+    private $addressId;
-+
-+    /**
-+     * @var FormFactory|MockObject
-+     */
-+    private $formFactory;
-+
-+    /**
-+     * @var FilterBuilder|MockObject
-+     */
-+    private $filterBuilder;
-+
-+    /**
-+     * @var SearchCriteriaBuilder|MockObject
-+     */
-+    private $criteriaBuilder;
-+
-+    /**
-+     * @var AddressInterface|MockObject
-+     */
-+    private $addressItem;
-+
-+    /**
-+     * @var AddressRepositoryInterface|MockObject
-+     */
-+    private $addressService;
-+
-+    /**
-+     * @var Mapper|MockObject
-+     */
-+    private $addressMapper;
-+
-+    /**
-+     * @var Address
-+     */
-+    private $address;
-+
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = new ObjectManager($this);
-+
-+        $this->defaultCountryId = 1;
-+        $this->customerId = 10;
-+        $this->addressId = 100;
-+
-+        $this->quoteSession = $this->getMockBuilder(QuoteSession::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getStore', 'getCustomerId'])
-+            ->getMock();
-+        $this->store = $this->getMockBuilder(Store::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->quoteSession->expects($this->any())
-+            ->method('getStore')
-+            ->willReturn($this->store);
-+        $this->quoteSession->expects($this->any())
-+            ->method('getCustomerId')
-+            ->willReturn($this->customerId);
-+        $this->directoryHelper = $this->getMockBuilder(DirectoryHelper::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getDefaultCountry'])
-+            ->getMock();
-+        $this->directoryHelper->expects($this->any())
-+            ->method('getDefaultCountry')
-+            ->willReturn($this->defaultCountryId);
-+        $this->formFactory = $this->getMockBuilder(FormFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $this->filterBuilder = $this->getMockBuilder(FilterBuilder::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setField', 'setValue', 'setConditionType', 'create'])
-+            ->getMock();
-+        $this->criteriaBuilder = $this->getMockBuilder(SearchCriteriaBuilder::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create', 'addFilters'])
-+            ->getMock();
-+        $this->addressService = $this->getMockBuilder(AddressRepositoryInterface::class)
-+            ->setMethods(['getList'])
-+            ->getMockForAbstractClass();
-+        $this->addressItem = $this->getMockBuilder(AddressInterface::class)
-+            ->setMethods(['getId'])
-+            ->getMockForAbstractClass();
-+        $this->addressItem->expects($this->any())
-+            ->method('getId')
-+            ->willReturn($this->addressId);
-+        $this->addressMapper = $this->getMockBuilder(Mapper::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['toFlatArray'])
-+            ->getMock();
-+
-+        $this->address = $this->objectManager->getObject(
-+            Address::class,
-+            [
-+                'directoryHelper' => $this->directoryHelper,
-+                'sessionQuote' => $this->quoteSession,
-+                'customerFormFactory' => $this->formFactory,
-+                'filterBuilder' => $this->filterBuilder,
-+                'criteriaBuilder' => $this->criteriaBuilder,
-+                'addressService' => $this->addressService,
-+                'addressMapper' => $this->addressMapper
-+            ]
-+        );
-+    }
-+
-+    public function testGetAddressCollectionJson()
-+    {
-+        /** @var Form|MockObject $emptyForm */
-+        $emptyForm = $this->getMockBuilder(Form::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['outputData'])
-+            ->getMock();
-+        $emptyForm->expects($this->once())
-+            ->method('outputData')
-+            ->with(AttributeDataFactory::OUTPUT_FORMAT_JSON)
-+            ->willReturn('emptyFormData');
-+
-+        /** @var Filter|MockObject $filter */
-+        $filter = $this->getMockBuilder(Filter::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->filterBuilder->expects($this->once())
-+            ->method('setField')
-+            ->with('parent_id')
-+            ->willReturnSelf();
-+        $this->filterBuilder->expects($this->once())
-+            ->method('setValue')
-+            ->with($this->customerId)
-+            ->willReturnSelf();
-+        $this->filterBuilder->expects($this->once())
-+            ->method('setConditionType')
-+            ->with('eq')
-+            ->willReturnSelf();
-+        $this->filterBuilder->expects($this->once())
-+            ->method('create')
-+            ->willReturn($filter);
-+
-+        /** @var SearchCriteria|MockObject $searchCriteria */
-+        $searchCriteria = $this->getMockBuilder(SearchCriteria::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->criteriaBuilder->expects($this->once())
-+            ->method('create')
-+            ->willReturn($searchCriteria);
-+        $this->criteriaBuilder->expects($this->once())
-+            ->method('addFilters')
-+            ->with([$filter]);
-+
-+        /** @var AddressSearchResultsInterface|MockObject $result */
-+        $result = $this->getMockBuilder(AddressSearchResultsInterface::class)
-+            ->setMethods(['getList'])
-+            ->getMockForAbstractClass();
-+        $result->expects($this->once())
-+            ->method('getItems')
-+            ->willReturn([$this->addressItem]);
-+        $this->addressService->expects($this->once())
-+            ->method('getList')
-+            ->with($searchCriteria)
-+            ->willReturn($result);
-+
-+        /** @var Form|MockObject $emptyForm */
-+        $addressForm = $this->getMockBuilder(Form::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['outputData'])
-+            ->getMock();
-+        $addressForm->expects($this->once())
-+            ->method('outputData')
-+            ->with(AttributeDataFactory::OUTPUT_FORMAT_JSON)
-+            ->willReturn('addressFormData');
-+        $this->addressMapper->expects($this->once())
-+            ->method('toFlatArray')
-+            ->with($this->addressItem)
-+            ->willReturn([]);
-+
-+        $this->directoryHelper->expects($this->once())
-+            ->method('getDefaultCountry')
-+            ->with($this->store)
-+            ->willReturn($this->defaultCountryId);
-+        $this->formFactory->expects($this->at(0))
-+            ->method('create')
-+            ->with(
-+                'customer_address',
-+                'adminhtml_customer_address',
-+                [AddressInterface::COUNTRY_ID => $this->defaultCountryId]
-+            )
-+            ->willReturn($emptyForm);
-+        $this->formFactory->expects($this->at(1))
-+            ->method('create')
-+            ->with('customer_address', 'adminhtml_customer_address', [], false, false)
-+            ->willReturn($addressForm);
-+
-+        $this->address->getAddressCollectionJson();
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/FormTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/FormTest.php
-index 4cbd30b1392..037e8fd1eaa 100644
---- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/FormTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/FormTest.php
-@@ -23,6 +23,7 @@ use Magento\Quote\Model\Quote\Payment;
- use Magento\Sales\Block\Adminhtml\Order\Create\Form;
- use Magento\Sales\Model\AdminOrder\Create;
- use Magento\Store\Model\Store;
-+use Magento\Store\Model\StoreManagerInterface;
- use PHPUnit\Framework\TestCase;
- use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
-@@ -51,6 +52,11 @@ class FormTest extends TestCase
-      */
-     private $block;
- 
-+    /**
-+     * @var StoreManagerInterface|MockObject
-+     */
-+    private $storeManager;
-+
-     /**
-      * @inheritdoc
-      */
-@@ -60,6 +66,10 @@ class FormTest extends TestCase
-         $context = $this->getMockBuilder(Context::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $this->storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
-+        $context->method('getStoreManager')
-+            ->willReturn($this->storeManager);
-+
-         $this->quoteSession = $this->getMockBuilder(QuoteSession::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['getCustomerId', 'getQuoteId', 'getStoreId', 'getStore', 'getQuote'])
-@@ -119,6 +129,8 @@ class FormTest extends TestCase
-             'quote_id' => $quoteId
-         ];
- 
-+        $this->storeManager->method('setCurrentStore')
-+            ->with($storeId);
-         $this->quoteSession->method('getCustomerId')
-             ->willReturn($customerId);
-         $this->quoteSession->method('getStoreId')
-diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/AddCommentTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/AddCommentTest.php
-new file mode 100644
-index 00000000000..3a4157df5c7
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/AddCommentTest.php
-@@ -0,0 +1,176 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order;
-+
-+class AddCommentTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Sales\Controller\Adminhtml\Order\AddComment
-+     */
-+    private $addCommentController;
-+
-+    /**
-+     * @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $contextMock;
-+
-+    /**
-+     * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $orderMock;
-+
-+    /**
-+     * @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $resultRedirectFactoryMock;
-+
-+    /**
-+     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $resultRedirectMock;
-+
-+    /**
-+     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $requestMock;
-+
-+    /**
-+     * @var \Magento\Sales\Api\OrderRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $orderRepositoryMock;
-+
-+    /**
-+     * @var \Magento\Framework\AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $authorizationMock;
-+
-+    /**
-+     * @var \Magento\Sales\Model\Order\Status\History|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $statusHistoryCommentMock;
-+
-+    /**
-+     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $objectManagerMock;
-+
-+    /**
-+     * Test setup
-+     */
-+    protected function setUp()
-+    {
-+        $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
-+        $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
-+        $this->orderRepositoryMock = $this->createMock(\Magento\Sales\Api\OrderRepositoryInterface::class);
-+        $this->orderMock = $this->createMock(\Magento\Sales\Model\Order::class);
-+        $this->resultRedirectFactoryMock = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
-+        $this->resultRedirectMock = $this->createMock(\Magento\Backend\Model\View\Result\Redirect::class);
-+        $this->authorizationMock = $this->createMock(\Magento\Framework\AuthorizationInterface::class);
-+        $this->statusHistoryCommentMock = $this->createMock(\Magento\Sales\Model\Order\Status\History::class);
-+        $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-+
-+        $this->contextMock->expects($this->once())->method('getRequest')->willReturn($this->requestMock);
-+
-+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $this->addCommentController = $objectManagerHelper->getObject(
-+            \Magento\Sales\Controller\Adminhtml\Order\AddComment::class,
-+            [
-+                'context' => $this->contextMock,
-+                'orderRepository' => $this->orderRepositoryMock,
-+                '_authorization' => $this->authorizationMock,
-+                '_objectManager' => $this->objectManagerMock
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @param array $historyData
-+     * @param bool $userHasResource
-+     * @param bool $expectedNotify
-+     *
-+     * @dataProvider executeWillNotifyCustomerDataProvider
-+     */
-+    public function testExecuteWillNotifyCustomer(array $historyData, bool $userHasResource, bool $expectedNotify)
-+    {
-+        $orderId = 30;
-+        $this->requestMock->expects($this->once())->method('getParam')->with('order_id')->willReturn($orderId);
-+        $this->orderRepositoryMock->expects($this->once())
-+            ->method('get')
-+            ->willReturn($this->orderMock);
-+        $this->requestMock->expects($this->once())->method('getPost')->with('history')->willReturn($historyData);
-+        $this->authorizationMock->expects($this->any())->method('isAllowed')->willReturn($userHasResource);
-+        $this->orderMock->expects($this->once())
-+            ->method('addStatusHistoryComment')
-+            ->willReturn($this->statusHistoryCommentMock);
-+        $this->statusHistoryCommentMock->expects($this->once())->method('setIsCustomerNotified')->with($expectedNotify);
-+        $this->objectManagerMock->expects($this->once())->method('create')->willReturn(
-+            $this->createMock(\Magento\Sales\Model\Order\Email\Sender\OrderCommentSender::class)
-+        );
-+
-+        $this->addCommentController->execute();
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function executeWillNotifyCustomerDataProvider()
-+    {
-+        return [
-+            'User Has Access - Notify True' => [
-+                'postData' => [
-+                    'comment' => 'Great Product!',
-+                    'is_customer_notified' => true,
-+                    'status' => 'Processing'
-+                ],
-+                'userHasResource' => true,
-+                'expectedNotify' => true
-+            ],
-+            'User Has Access - Notify False' => [
-+                'postData' => [
-+                    'comment' => 'Great Product!',
-+                    'is_customer_notified' => false,
-+                    'status' => 'Processing'
-+                ],
-+                'userHasResource' => true,
-+                'expectedNotify' => false
-+            ],
-+            'User Has Access - Notify Unset' => [
-+                'postData' => [
-+                    'comment' => 'Great Product!',
-+                    'status' => 'Processing'
-+                ],
-+                'userHasResource' => true,
-+                'expectedNotify' => false
-+            ],
-+            'User No Access - Notify True' => [
-+                'postData' => [
-+                    'comment' => 'Great Product!',
-+                    'is_customer_notified' => true,
-+                    'status' => 'Processing'
-+                ],
-+                'userHasResource' => false,
-+                'expectedNotify' => false
-+            ],
-+            'User No Access - Notify False' => [
-+                'postData' => [
-+                    'comment' => 'Great Product!',
-+                    'is_customer_notified' => false,
-+                    'status' => 'Processing'
-+                ],
-+                'userHasResource' => false,
-+                'expectedNotify' => false
-+            ],
-+            'User No Access - Notify Unset' => [
-+                'postData' => [
-+                    'comment' => 'Great Product!',
-+                    'status' => 'Processing'
-+                ],
-+                'userHasResource' => false,
-+                'expectedNotify' => false
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
-index 0112d09eb73..c3ff8a2acaf 100644
---- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
-@@ -203,10 +203,9 @@ class SaveTest extends \PHPUnit\Framework\TestCase
- 
-         $creditmemoMock = $this->createPartialMock(
-             \Magento\Sales\Model\Order\Creditmemo::class,
--            ['load', 'getGrandTotal', 'getAllowZeroGrandTotal', '__wakeup']
-+            ['load', 'isValidGrandTotal', '__wakeup']
-         );
--        $creditmemoMock->expects($this->once())->method('getGrandTotal')->will($this->returnValue('0'));
--        $creditmemoMock->expects($this->once())->method('getAllowZeroGrandTotal')->will($this->returnValue(false));
-+        $creditmemoMock->expects($this->once())->method('isValidGrandTotal')->will($this->returnValue(false));
-         $this->memoLoaderMock->expects(
-             $this->once()
-         )->method(
-diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php
-index 05c99c9f9ef..87e27fdb220 100644
---- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php
-@@ -6,12 +6,14 @@
- namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Invoice;
- 
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Sales\Api\OrderRepositoryInterface;
- 
- /**
-  * Class NewActionTest
-  * @package Magento\Sales\Controller\Adminhtml\Order\Invoice
-  * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.TooManyFields)
-  */
- class NewActionTest extends \PHPUnit\Framework\TestCase
- {
-@@ -90,6 +92,11 @@ class NewActionTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $invoiceServiceMock;
- 
-+    /**
-+     * @var OrderRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $orderRepositoryMock;
-+
-     protected function setUp()
-     {
-         $objectManager = new ObjectManager($this);
-@@ -215,12 +222,15 @@ class NewActionTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        $this->orderRepositoryMock = $this->createMock(OrderRepositoryInterface::class);
-+
-         $this->controller = $objectManager->getObject(
-             \Magento\Sales\Controller\Adminhtml\Order\Invoice\NewAction::class,
-             [
-                 'context' => $contextMock,
-                 'resultPageFactory' => $this->resultPageFactoryMock,
--                'invoiceService' => $this->invoiceServiceMock
-+                'invoiceService' => $this->invoiceServiceMock,
-+                'orderRepository' => $this->orderRepositoryMock
-             ]
-         );
-     }
-@@ -250,19 +260,17 @@ class NewActionTest extends \PHPUnit\Framework\TestCase
- 
-         $orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['load', 'getId', 'canInvoice'])
-+            ->setMethods(['load', 'canInvoice'])
-             ->getMock();
--        $orderMock->expects($this->once())
--            ->method('load')
--            ->with($orderId)
--            ->willReturnSelf();
--        $orderMock->expects($this->once())
--            ->method('getId')
--            ->willReturn($orderId);
-         $orderMock->expects($this->once())
-             ->method('canInvoice')
-             ->willReturn(true);
- 
-+        $this->orderRepositoryMock->expects($this->once())
-+            ->method('get')
-+            ->with($orderId)
-+            ->willReturn($orderMock);
-+
-         $this->invoiceServiceMock->expects($this->once())
-             ->method('prepareInvoice')
-             ->with($orderMock, [])
-@@ -285,11 +293,7 @@ class NewActionTest extends \PHPUnit\Framework\TestCase
-             ->with(true)
-             ->will($this->returnValue($commentText));
- 
--        $this->objectManagerMock->expects($this->at(0))
--            ->method('create')
--            ->with(\Magento\Sales\Model\Order::class)
--            ->willReturn($orderMock);
--        $this->objectManagerMock->expects($this->at(1))
-+        $this->objectManagerMock->expects($this->once())
-             ->method('get')
-             ->with(\Magento\Backend\Model\Session::class)
-             ->will($this->returnValue($this->sessionMock));
-@@ -318,19 +322,12 @@ class NewActionTest extends \PHPUnit\Framework\TestCase
- 
-         $orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['load', 'getId', 'canInvoice'])
-+            ->setMethods(['canInvoice'])
-             ->getMock();
--        $orderMock->expects($this->once())
--            ->method('load')
--            ->with($orderId)
--            ->willReturnSelf();
--        $orderMock->expects($this->once())
--            ->method('getId')
--            ->willReturn(null);
- 
--        $this->objectManagerMock->expects($this->at(0))
--            ->method('create')
--            ->with(\Magento\Sales\Model\Order::class)
-+        $this->orderRepositoryMock->expects($this->once())
-+            ->method('get')
-+            ->with($orderId)
-             ->willReturn($orderMock);
- 
-         $resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
-diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php
-deleted file mode 100644
-index 38449c56866..00000000000
---- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php
-+++ /dev/null
-@@ -1,294 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order;
--
--use Magento\Framework\App\Action\Context;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--
--/**
-- * Class MassCancelTest
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class MassCancelTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Sales\Controller\Adminhtml\Order\MassCancel
--     */
--    protected $massAction;
--
--    /**
--     * @var Context|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $contextMock;
--
--    /**
--     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $resultRedirectMock;
--
--    /**
--     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $requestMock;
--
--    /**
--     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $responseMock;
--
--    /**
--     * @var \Magento\Framework\Message\Manager|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $messageManagerMock;
--
--    /**
--     * @var \Magento\Framework\ObjectManager\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $objectManagerMock;
--
--    /**
--     * @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $sessionMock;
--
--    /**
--     * @var \Magento\Framework\App\ActionFlag|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $actionFlagMock;
--
--    /**
--     * @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $helperMock;
--
--    /**
--     * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $orderMock;
--
--    /**
--     * @var \Magento\Sales\Model\ResourceModel\Order\Collection|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $orderCollectionMock;
--
--    /**
--     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $orderCollectionFactoryMock;
--
--    /**
--     * @var \Magento\Ui\Component\MassAction\Filter|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $filterMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $orderManagementMock;
--
--    /**
--     * Test setup
--     */
--    protected function setUp()
--    {
--        $objectManagerHelper = new ObjectManagerHelper($this);
--        $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
--        $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\Manager::class);
--        $this->responseMock = $this->createMock(\Magento\Framework\App\ResponseInterface::class);
--        $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
--        $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManager\ObjectManager::class);
--
--        $resultRedirectFactory = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
--
--        $this->orderCollectionMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Collection::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $resourceCollection = \Magento\Sales\Model\ResourceModel\Order\CollectionFactory::class;
--        $this->orderCollectionFactoryMock = $this->getMockBuilder($resourceCollection)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--
--        $this->sessionMock = $this->createPartialMock(\Magento\Backend\Model\Session::class, ['setIsUrlNotice']);
--        $this->actionFlagMock = $this->createPartialMock(\Magento\Framework\App\ActionFlag::class, ['get', 'set']);
--        $this->helperMock = $this->createPartialMock(\Magento\Backend\Helper\Data::class, ['getUrl']);
--        $this->resultRedirectMock = $this->createMock(\Magento\Backend\Model\View\Result\Redirect::class);
--        $resultRedirectFactory->expects($this->any())->method('create')->willReturn($this->resultRedirectMock);
--
--        $redirectMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $resultFactoryMock->expects($this->any())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT)
--            ->willReturn($redirectMock);
--
--        $this->contextMock->expects($this->once())->method('getMessageManager')->willReturn($this->messageManagerMock);
--        $this->contextMock->expects($this->once())->method('getRequest')->willReturn($this->requestMock);
--        $this->contextMock->expects($this->once())->method('getResponse')->willReturn($this->responseMock);
--        $this->contextMock->expects($this->once())->method('getObjectManager')->willReturn($this->objectManagerMock);
--        $this->contextMock->expects($this->once())->method('getSession')->willReturn($this->sessionMock);
--        $this->contextMock->expects($this->once())->method('getActionFlag')->willReturn($this->actionFlagMock);
--        $this->contextMock->expects($this->once())->method('getHelper')->willReturn($this->helperMock);
--        $this->contextMock->expects($this->once())
--            ->method('getResultRedirectFactory')
--            ->willReturn($resultRedirectFactory);
--        $this->contextMock->expects($this->any())
--            ->method('getResultFactory')
--            ->willReturn($resultFactoryMock);
--        $this->filterMock = $this->createMock(\Magento\Ui\Component\MassAction\Filter::class);
--        $this->filterMock->expects($this->once())
--            ->method('getCollection')
--            ->with($this->orderCollectionMock)
--            ->willReturn($this->orderCollectionMock);
--        $this->orderCollectionFactoryMock->expects($this->once())
--            ->method('create')
--            ->willReturn($this->orderCollectionMock);
--        $this->orderManagementMock = $this->createMock(\Magento\Sales\Api\OrderManagementInterface::class);
--
--        $this->massAction = $objectManagerHelper->getObject(
--            \Magento\Sales\Controller\Adminhtml\Order\MassCancel::class,
--            [
--                'context' => $this->contextMock,
--                'filter' => $this->filterMock,
--                'collectionFactory' => $this->orderCollectionFactoryMock,
--                'orderManagement' => $this->orderManagementMock
--            ]
--        );
--    }
--
--    /**
--     * Test for selected orders
--     * Two orders, only $order1 can be canceled
--     */
--    public function testExecuteCanCancelOneOrder()
--    {
--        $order1id = 100;
--        $order2id = 200;
--
--        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $order2 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $orders = [$order1, $order2];
--        $countOrders = count($orders);
--
--        $this->orderCollectionMock->expects($this->any())
--            ->method('getItems')
--            ->willReturn($orders);
--
--        $order1->expects($this->once())
--            ->method('getEntityId')
--            ->willReturn($order1id);
--
--        $order2->expects($this->once())
--            ->method('getEntityId')
--            ->willReturn($order2id);
--
--        $this->orderCollectionMock->expects($this->once())
--            ->method('count')
--            ->willReturn($countOrders);
--
--        $this->orderManagementMock->expects($this->at(0))->method('cancel')->with($order1id)->willReturn(true);
--        $this->orderManagementMock->expects($this->at(1))->method('cancel')->with($order2id)->willReturn(false);
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addErrorMessage')
--            ->with('1 order(s) cannot be canceled.');
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addSuccessMessage')
--            ->with('We canceled 1 order(s).');
--
--        $this->resultRedirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('sales/*/')
--            ->willReturnSelf();
--
--        $this->massAction->execute();
--    }
--
--    /**
--     * Test for excluded orders
--     * Two orders could't be canceled
--     */
--    public function testExcludedCannotCancelOrders()
--    {
--        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $order2 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $orders = [$order1, $order2];
--        $countOrders = count($orders);
--
--        $order1->expects($this->once())
--            ->method('getEntityId')
--            ->willReturn(100);
--
--        $order2->expects($this->once())
--            ->method('getEntityId')
--            ->willReturn(200);
--
--        $this->orderCollectionMock->expects($this->any())
--            ->method('getItems')
--            ->willReturn([$order1, $order2]);
--
--        $this->orderCollectionMock->expects($this->once())
--            ->method('count')
--            ->willReturn($countOrders);
--
--        $this->orderManagementMock->expects($this->atLeastOnce())->method('cancel')->willReturn(false);
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addErrorMessage')
--            ->with('You cannot cancel the order(s).');
--
--        $this->resultRedirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('sales/*/')
--            ->willReturnSelf();
--
--        $this->massAction->execute();
--    }
--
--    /**
--     * Order throws exception while canceling
--     */
--    public function testException()
--    {
--        $exception = new \Exception('Can not cancel');
--
--        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->orderCollectionMock->expects($this->any())
--            ->method('getItems')
--            ->willReturn([$order1]);
--
--        $order1->expects($this->once())
--            ->method('getEntityId')
--            ->willReturn(100);
--
--        $this->orderManagementMock->expects($this->atLeastOnce())->method('cancel')->willThrowException($exception);
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addErrorMessage')
--            ->with('Can not cancel');
--
--        $this->massAction->execute();
--    }
--}
-diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php
-deleted file mode 100644
-index bfd1d1e825f..00000000000
---- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php
-+++ /dev/null
-@@ -1,262 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order;
--
--use Magento\Framework\App\Action\Context;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--
--/**
-- * Class MassHoldTest
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class MassHoldTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Sales\Controller\Adminhtml\Order\MassHold
--     */
--    protected $massAction;
--
--    /**
--     * @var Context|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $contextMock;
--
--    /**
--     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $resultRedirectMock;
--
--    /**
--     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $requestMock;
--
--    /**
--     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $responseMock;
--
--    /**
--     * @var \Magento\Framework\Message\Manager|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $messageManagerMock;
--
--    /**
--     * @var \Magento\Framework\ObjectManager\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $objectManagerMock;
--
--    /**
--     * @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $sessionMock;
--
--    /**
--     * @var \Magento\Framework\App\ActionFlag|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $actionFlagMock;
--
--    /**
--     * @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $helperMock;
--
--    /**
--     * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $orderMock;
--
--    /**
--     * @var \Magento\Sales\Model\ResourceModel\Order\Collection|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $orderCollectionMock;
--
--    /**
--     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $orderCollectionFactoryMock;
--
--    /**
--     * @var \Magento\Ui\Component\MassAction\Filter|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $filterMock;
--
--    /**
--     * @var \Magento\Sales\Api\OrderManagementInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $orderManagementMock;
--
--    /**
--     * Test setup
--     */
--    protected function setUp()
--    {
--        $objectManagerHelper = new ObjectManagerHelper($this);
--        $this->orderManagementMock = $this->getMockBuilder(\Magento\Sales\Api\OrderManagementInterface::class)
--            ->getMockForAbstractClass();
--        $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
--        $resultRedirectFactory = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
--        $this->responseMock = $this->createMock(\Magento\Framework\App\ResponseInterface::class);
--        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
--            ->disableOriginalConstructor()->getMock();
--        $this->objectManagerMock = $this->createPartialMock(
--            \Magento\Framework\ObjectManager\ObjectManager::class,
--            ['create']
--        );
--        $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\Manager::class);
--        $this->orderCollectionMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Collection::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $orderCollection = \Magento\Sales\Model\ResourceModel\Order\CollectionFactory::class;
--        $this->orderCollectionFactoryMock = $this->getMockBuilder($orderCollection)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--        $redirectMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $resultFactoryMock->expects($this->any())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT)
--            ->willReturn($redirectMock);
--
--        $this->sessionMock = $this->createPartialMock(\Magento\Backend\Model\Session::class, ['setIsUrlNotice']);
--        $this->actionFlagMock = $this->createPartialMock(\Magento\Framework\App\ActionFlag::class, ['get', 'set']);
--        $this->helperMock = $this->createPartialMock(\Magento\Backend\Helper\Data::class, ['getUrl']);
--        $this->resultRedirectMock = $this->createMock(\Magento\Backend\Model\View\Result\Redirect::class);
--        $resultRedirectFactory->expects($this->any())->method('create')->willReturn($this->resultRedirectMock);
--
--        $this->contextMock->expects($this->once())->method('getMessageManager')->willReturn($this->messageManagerMock);
--        $this->contextMock->expects($this->once())->method('getRequest')->willReturn($this->requestMock);
--        $this->contextMock->expects($this->once())->method('getResponse')->willReturn($this->responseMock);
--        $this->contextMock->expects($this->once())->method('getObjectManager')->willReturn($this->objectManagerMock);
--        $this->contextMock->expects($this->once())->method('getSession')->willReturn($this->sessionMock);
--        $this->contextMock->expects($this->once())->method('getActionFlag')->willReturn($this->actionFlagMock);
--        $this->contextMock->expects($this->once())->method('getHelper')->willReturn($this->helperMock);
--        $this->contextMock
--            ->expects($this->once())
--            ->method('getResultRedirectFactory')
--            ->willReturn($resultRedirectFactory);
--        $this->contextMock->expects($this->any())
--            ->method('getResultFactory')
--            ->willReturn($resultFactoryMock);
--
--        $this->filterMock = $this->createMock(\Magento\Ui\Component\MassAction\Filter::class);
--        $this->filterMock->expects($this->once())
--            ->method('getCollection')
--            ->with($this->orderCollectionMock)
--            ->willReturn($this->orderCollectionMock);
--        $this->orderCollectionFactoryMock->expects($this->once())
--            ->method('create')
--            ->willReturn($this->orderCollectionMock);
--
--        $this->massAction = $objectManagerHelper->getObject(
--            \Magento\Sales\Controller\Adminhtml\Order\MassHold::class,
--            [
--                'context' => $this->contextMock,
--                'filter' => $this->filterMock,
--                'collectionFactory' => $this->orderCollectionFactoryMock,
--                'orderManagement' => $this->orderManagementMock
--            ]
--        );
--    }
--
--    /**
--     * @throws \Magento\Framework\Exception\LocalizedException
--     */
--    public function testExecuteOneOrderPutOnHold()
--    {
--        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $order2 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $orders = [$order1, $order2];
--        $countOrders = count($orders);
--
--        $this->orderCollectionMock->expects($this->any())
--            ->method('getItems')
--            ->willReturn($orders);
--
--        $order1->expects($this->once())
--            ->method('canHold')
--            ->willReturn(true);
--        $this->orderManagementMock->expects($this->once())
--            ->method('hold');
--        $this->orderCollectionMock->expects($this->once())
--            ->method('count')
--            ->willReturn($countOrders);
--
--        $order2->expects($this->once())
--            ->method('canHold')
--            ->willReturn(false);
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addErrorMessage')
--            ->with('1 order(s) were not put on hold.');
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addSuccessMessage')
--            ->with('You have put 1 order(s) on hold.');
--
--        $this->resultRedirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('sales/*/')
--            ->willReturnSelf();
--
--        $this->massAction->execute();
--    }
--
--    /**
--     * @throws \Magento\Framework\Exception\LocalizedException
--     */
--    public function testExecuteNoOrdersPutOnHold()
--    {
--        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $order2 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $orders = [$order1, $order2];
--        $countOrders = count($orders);
--
--        $this->orderCollectionMock->expects($this->any())
--            ->method('getItems')
--            ->willReturn($orders);
--
--        $order1->expects($this->once())
--            ->method('canHold')
--            ->willReturn(false);
--
--        $this->orderCollectionMock->expects($this->once())
--            ->method('count')
--            ->willReturn($countOrders);
--
--        $order2->expects($this->once())
--            ->method('canHold')
--            ->willReturn(false);
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addErrorMessage')
--            ->with('No order(s) were put on hold.');
--
--        $this->resultRedirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('sales/*/')
--            ->willReturnSelf();
--
--        $this->massAction->execute();
--    }
--}
-diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php
-deleted file mode 100644
-index 56473ec948f..00000000000
---- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php
-+++ /dev/null
-@@ -1,261 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order;
--
--use Magento\Framework\App\Action\Context;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--
--/**
-- * Class MassHoldTest
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class MassUnholdTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Sales\Controller\Adminhtml\Order\MassUnhold
--     */
--    protected $massAction;
--
--    /**
--     * @var Context|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $contextMock;
--
--    /**
--     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $resultRedirectMock;
--
--    /**
--     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $requestMock;
--
--    /**
--     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $responseMock;
--
--    /**
--     * @var \Magento\Framework\Message\Manager|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $messageManagerMock;
--
--    /**
--     * @var \Magento\Framework\ObjectManager\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $objectManagerMock;
--
--    /**
--     * @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $sessionMock;
--
--    /**
--     * @var \Magento\Framework\App\ActionFlag|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $actionFlagMock;
--
--    /**
--     * @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $helperMock;
--
--    /**
--     * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $orderMock;
--
--    /**
--     * @var \Magento\Sales\Model\ResourceModel\Order\Collection|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $orderCollectionMock;
--
--    /**
--     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $orderCollectionFactoryMock;
--
--    /**
--     * @var \Magento\Ui\Component\MassAction\Filter|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $filterMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $orderManagementMock;
--
--    /**
--     * Test setup
--     */
--    protected function setUp()
--    {
--        $objectManagerHelper = new ObjectManagerHelper($this);
--        $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
--        $resultRedirectFactory = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
--        $this->responseMock = $this->createMock(\Magento\Framework\App\ResponseInterface::class);
--        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
--            ->disableOriginalConstructor()->getMock();
--        $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManager\ObjectManager::class);
--        $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\Manager::class);
--
--        $this->orderCollectionMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Collection::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $orderCollection = \Magento\Sales\Model\ResourceModel\Order\CollectionFactory::class;
--        $this->orderCollectionFactoryMock = $this->getMockBuilder($orderCollection)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--        $this->sessionMock = $this->createPartialMock(\Magento\Backend\Model\Session::class, ['setIsUrlNotice']);
--        $this->actionFlagMock = $this->createPartialMock(\Magento\Framework\App\ActionFlag::class, ['get', 'set']);
--        $this->helperMock = $this->createPartialMock(\Magento\Backend\Helper\Data::class, ['getUrl']);
--        $this->resultRedirectMock = $this->createMock(\Magento\Backend\Model\View\Result\Redirect::class);
--        $resultRedirectFactory->expects($this->any())->method('create')->willReturn($this->resultRedirectMock);
--
--        $redirectMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $resultFactoryMock->expects($this->any())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT)
--            ->willReturn($redirectMock);
--
--        $this->contextMock->expects($this->once())->method('getMessageManager')->willReturn($this->messageManagerMock);
--        $this->contextMock->expects($this->once())->method('getRequest')->willReturn($this->requestMock);
--        $this->contextMock->expects($this->once())->method('getResponse')->willReturn($this->responseMock);
--        $this->contextMock->expects($this->once())->method('getObjectManager')->willReturn($this->objectManagerMock);
--        $this->contextMock->expects($this->once())->method('getSession')->willReturn($this->sessionMock);
--        $this->contextMock->expects($this->once())->method('getActionFlag')->willReturn($this->actionFlagMock);
--        $this->contextMock->expects($this->once())->method('getHelper')->willReturn($this->helperMock);
--        $this->contextMock
--            ->expects($this->once())
--            ->method('getResultRedirectFactory')
--            ->willReturn($resultRedirectFactory);
--        $this->contextMock->expects($this->any())
--            ->method('getResultFactory')
--            ->willReturn($resultFactoryMock);
--
--        $this->filterMock = $this->createMock(\Magento\Ui\Component\MassAction\Filter::class);
--        $this->filterMock->expects($this->once())
--            ->method('getCollection')
--            ->with($this->orderCollectionMock)
--            ->willReturn($this->orderCollectionMock);
--        $this->orderCollectionFactoryMock->expects($this->once())
--            ->method('create')
--            ->willReturn($this->orderCollectionMock);
--
--        $this->orderManagementMock = $this->createMock(\Magento\Sales\Api\OrderManagementInterface::class);
--
--        $this->massAction = $objectManagerHelper->getObject(
--            \Magento\Sales\Controller\Adminhtml\Order\MassUnhold::class,
--            [
--                'context' => $this->contextMock,
--                'filter' => $this->filterMock,
--                'collectionFactory' => $this->orderCollectionFactoryMock,
--                'orderManagement' => $this->orderManagementMock
--            ]
--        );
--    }
--
--    /**
--     * @throws \Magento\Framework\Exception\LocalizedException
--     */
--    public function testExecuteOneOrdersReleasedFromHold()
--    {
--        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $order2 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $orders = [$order1, $order2];
--
--        $this->orderCollectionMock->expects($this->any())
--            ->method('getItems')
--            ->willReturn($orders);
--
--        $order1->expects($this->once())
--            ->method('canUnhold')
--            ->willReturn(true);
--        $order1->expects($this->once())
--            ->method('getEntityId');
--
--        $this->orderCollectionMock->expects($this->once())
--            ->method('count')
--            ->willReturn(count($orders));
--
--        $order2->expects($this->once())
--            ->method('canUnhold')
--            ->willReturn(false);
--
--        $this->orderManagementMock->expects($this->atLeastOnce())->method('unHold')->willReturn(true);
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addErrorMessage')
--            ->with('1 order(s) were not released from on hold status.');
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addSuccessMessage')
--            ->with('1 order(s) have been released from on hold status.');
--
--        $this->resultRedirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('sales/*/')
--            ->willReturnSelf();
--
--        $this->massAction->execute();
--    }
--
--    /**
--     * @throws \Magento\Framework\Exception\LocalizedException
--     */
--    public function testExecuteNoReleasedOrderFromHold()
--    {
--        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $order2 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $orders = [$order1, $order2];
--
--        $this->orderCollectionMock->expects($this->any())
--            ->method('getItems')
--            ->willReturn($orders);
--
--        $order1->expects($this->once())
--            ->method('canUnhold')
--            ->willReturn(false);
--
--        $this->orderCollectionMock->expects($this->once())
--            ->method('count')
--            ->willReturn(count($orders));
--
--        $order2->expects($this->once())
--            ->method('canUnhold')
--            ->willReturn(false);
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addErrorMessage')
--            ->with('No order(s) were released from on hold status.');
--
--        $this->resultRedirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('sales/*/')
--            ->willReturnSelf();
--
--        $this->massAction->execute();
--    }
--}
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
-index 91da34c2b8b..c642cdeb2d9 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
-@@ -26,6 +26,10 @@ use Magento\Quote\Model\Quote\Item\Updater;
- use Magento\Sales\Model\AdminOrder\Create;
- use Magento\Sales\Model\AdminOrder\Product;
- use Magento\Quote\Model\QuoteFactory;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Item as OrderItem;
-+use Magento\Sales\Model\ResourceModel\Order\Item\Collection as ItemCollection;
-+use Magento\Store\Api\Data\StoreInterface;
- use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
- /**
-@@ -86,6 +90,14 @@ class CreateTest extends \PHPUnit\Framework\TestCase
-      */
-     private $dataObjectHelper;
- 
-+    /**
-+     * @var Order|MockObject
-+     */
-+    private $orderMock;
-+
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->formFactory = $this->createPartialMock(FormFactory::class, ['create']);
-@@ -101,9 +113,29 @@ class CreateTest extends \PHPUnit\Framework\TestCase
- 
-         $this->sessionQuote = $this->getMockBuilder(\Magento\Backend\Model\Session\Quote::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['getQuote', 'getStoreId', 'getCustomerId'])
-+            ->setMethods(
-+                [
-+                    'getQuote',
-+                    'getStoreId',
-+                    'getCustomerId',
-+                    'setData',
-+                    'setCurrencyId',
-+                    'setCustomerId',
-+                    'setStoreId',
-+                    'setCustomerGroupId',
-+                    'getData',
-+                    'getStore',
-+                    'getUseOldShippingMethod',
-+                ]
-+            )
-             ->getMock();
- 
-+        $storeMock = $this->getMockBuilder(StoreInterface::class)
-+            ->setMethods(['getId'])
-+            ->getMockForAbstractClass();
-+        $this->sessionQuote->method('getStore')
-+            ->willReturn($storeMock);
-+
-         $this->customerMapper = $this->getMockBuilder(Mapper::class)
-             ->setMethods(['toFlatArray'])
-             ->disableOriginalConstructor()
-@@ -114,6 +146,24 @@ class CreateTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        $this->orderMock = $this->getMockBuilder(Order::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(
-+                [
-+                    'getEntityId',
-+                    'getId',
-+                    'setReordered',
-+                    'getReordered',
-+                    'getOrderCurrencyCode',
-+                    'getCustomerGroupId',
-+                    'getItemsCollection',
-+                    'getShippingAddress',
-+                    'getBillingAddress',
-+                    'getCouponCode',
-+                ]
-+            )
-+            ->getMock();
-+
-         $objectManagerHelper = new ObjectManagerHelper($this);
-         $this->adminOrderCreate = $objectManagerHelper->getObject(
-             Create::class,
-@@ -312,4 +362,85 @@ class CreateTest extends \PHPUnit\Framework\TestCase
- 
-         $this->assertEquals($cartResult, $this->adminOrderCreate->getCustomerCart());
-     }
-+
-+    public function testInitFromOrder()
-+    {
-+        $this->sessionQuote->method('getData')
-+            ->with('reordered')
-+            ->willReturn(true);
-+
-+        $address = $this->createPartialMock(
-+            Address::class,
-+            [
-+                'setSameAsBilling',
-+                'setCustomerAddressId',
-+                'getSameAsBilling',
-+            ]
-+        );
-+        $address->method('getSameAsBilling')
-+            ->willReturn(true);
-+        $address->method('setCustomerAddressId')
-+            ->willReturnSelf();
-+
-+        $quote = $this->getMockBuilder(Quote::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(
-+                [
-+                    'setCustomerGroupId',
-+                    'getBillingAddress',
-+                    'getShippingAddress',
-+                    'isVirtual',
-+                    'collectTotals',
-+                ]
-+            )
-+            ->getMock();
-+
-+        $quote->method('getBillingAddress')
-+            ->willReturn($address);
-+        $quote->method('getShippingAddress')
-+            ->willReturn($address);
-+
-+        $this->sessionQuote
-+            ->method('getQuote')
-+            ->willReturn($quote);
-+
-+        $orderItem = $this->createPartialMock(
-+            OrderItem::class,
-+            [
-+                'getParentItem',
-+                'getQtyOrdered',
-+                'getQtyShipped',
-+                'getQtyInvoiced',
-+            ]
-+        );
-+        $orderItem->method('getQtyOrdered')
-+            ->willReturn(2);
-+        $orderItem->method('getParentItem')
-+            ->willReturn(false);
-+
-+        $iterator = new \ArrayIterator([$orderItem]);
-+
-+        $itemCollectionMock = $this->getMockBuilder(ItemCollection::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getIterator'])
-+            ->getMock();
-+        $itemCollectionMock->method('getIterator')
-+            ->willReturn($iterator);
-+
-+        $this->orderMock->method('getItemsCollection')
-+            ->willReturn($itemCollectionMock);
-+        $this->orderMock->method('getReordered')
-+            ->willReturn(false);
-+        $this->orderMock->method('getShippingAddress')
-+            ->willReturn($address);
-+        $this->orderMock->method('getBillingAddress')
-+            ->willReturn($address);
-+        $this->orderMock->method('getCouponCode')
-+            ->willReturn(true);
-+
-+        $quote->expects($this->once())
-+            ->method('setCustomerGroupId');
-+
-+        $this->adminOrderCreate->initFromOrder($this->orderMock);
-+    }
- }
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php b/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php
-index 269ce829e64..6844b908ea9 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php
-@@ -26,6 +26,11 @@ class CleanExpiredOrdersTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $orderCollectionMock;
- 
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $orderManagementMock;
-+
-     /**
-      * @var ObjectManager
-      */
-@@ -44,10 +49,12 @@ class CleanExpiredOrdersTest extends \PHPUnit\Framework\TestCase
-             ['create']
-         );
-         $this->orderCollectionMock = $this->createMock(\Magento\Sales\Model\ResourceModel\Order\Collection::class);
-+        $this->orderManagementMock = $this->createMock(\Magento\Sales\Api\OrderManagementInterface::class);
- 
-         $this->model = new CleanExpiredOrders(
-             $this->storesConfigMock,
--            $this->collectionFactoryMock
-+            $this->collectionFactoryMock,
-+            $this->orderManagementMock
-         );
-     }
- 
-@@ -64,8 +71,11 @@ class CleanExpiredOrdersTest extends \PHPUnit\Framework\TestCase
-         $this->collectionFactoryMock->expects($this->exactly(2))
-             ->method('create')
-             ->willReturn($this->orderCollectionMock);
-+        $this->orderCollectionMock->expects($this->exactly(2))
-+            ->method('getAllIds')
-+            ->willReturn([1, 2]);
-         $this->orderCollectionMock->expects($this->exactly(4))->method('addFieldToFilter');
--        $this->orderCollectionMock->expects($this->exactly(4))->method('walk');
-+        $this->orderManagementMock->expects($this->exactly(4))->method('cancel');
- 
-         $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
-         $selectMock->expects($this->exactly(2))->method('where')->willReturnSelf();
-@@ -92,14 +102,18 @@ class CleanExpiredOrdersTest extends \PHPUnit\Framework\TestCase
-         $this->collectionFactoryMock->expects($this->once())
-             ->method('create')
-             ->willReturn($this->orderCollectionMock);
-+        $this->orderCollectionMock->expects($this->once())
-+            ->method('getAllIds')
-+            ->willReturn([1]);
-         $this->orderCollectionMock->expects($this->exactly(2))->method('addFieldToFilter');
-+        $this->orderManagementMock->expects($this->once())->method('cancel');
- 
-         $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
-         $selectMock->expects($this->once())->method('where')->willReturnSelf();
-         $this->orderCollectionMock->expects($this->once())->method('getSelect')->willReturn($selectMock);
- 
--        $this->orderCollectionMock->expects($this->once())
--            ->method('walk')
-+        $this->orderManagementMock->expects($this->once())
-+            ->method('cancel')
-             ->willThrowException(new \Exception($exceptionMessage));
- 
-         $this->model->execute();
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/DownloadTest.php b/app/code/Magento/Sales/Test/Unit/Model/DownloadTest.php
-deleted file mode 100644
-index dd430f8a033..00000000000
---- a/app/code/Magento/Sales/Test/Unit/Model/DownloadTest.php
-+++ /dev/null
-@@ -1,262 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sales\Test\Unit\Model;
--
--use Magento\Framework\App\Filesystem\DirectoryList;
--
--class DownloadTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Sales\Model\Download
--     */
--    protected $model;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $filesystemMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $storageMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $storageFactoryMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $httpFileFactoryMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $writeDirectoryMock;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $driverMock;
--
--    protected function setUp()
--    {
--        $this->writeDirectoryMock = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\Write::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->filesystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->filesystemMock->expects($this->any())
--            ->method('getDirectoryWrite')
--            ->with(DirectoryList::MEDIA)
--            ->will($this->returnValue($this->writeDirectoryMock));
--
--        $this->driverMock = $this->getMockForAbstractClass(\Magento\Framework\Filesystem\DriverInterface::class);
--        $this->storageMock = $this->getMockBuilder(\Magento\MediaStorage\Helper\File\Storage\Database::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->storageFactoryMock = $this->getMockBuilder(
--            \Magento\MediaStorage\Model\File\Storage\DatabaseFactory::class
--        )->disableOriginalConstructor()
--            ->setMethods(['create', 'checkDbUsage'])
--            ->getMock();
--        $this->httpFileFactoryMock = $this->getMockBuilder(\Magento\Framework\App\Response\Http\FileFactory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--        $this->model = new \Magento\Sales\Model\Download(
--            $this->filesystemMock,
--            $this->storageMock,
--            $this->storageFactoryMock,
--            $this->httpFileFactoryMock
--        );
--    }
--
--    public function testInstanceOf()
--    {
--        $model = new \Magento\Sales\Model\Download(
--            $this->filesystemMock,
--            $this->storageMock,
--            $this->storageFactoryMock,
--            $this->httpFileFactoryMock
--        );
--        $this->assertInstanceOf(\Magento\Sales\Model\Download::class, $model);
--    }
--
--    /**
--     * @param $realPatchCheck
--     * @param $isFile
--     * @param $isReadable
--     * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @dataProvider dataProviderForTestDownloadFileException
--     */
--    public function testDownloadFileException($realPatchCheck, $isFile, $isReadable)
--    {
--        $info = ['order_path' => 'test/path', 'quote_path' => 'test/path2', 'title' => 'test title'];
--
--        $this->writeDirectoryMock->expects($this->any())
--            ->method('getAbsolutePath')
--            ->will($this->returnArgument(0));
--        $this->writeDirectoryMock->expects($this->any())
--            ->method('getDriver')
--            ->willReturn($this->driverMock);
--        $this->driverMock->expects($this->any())->method('getRealPath')->willReturn($realPatchCheck);
--        $this->writeDirectoryMock->expects($this->any())
--            ->method('isFile')
--            ->will($this->returnValue($isFile));
--        $this->writeDirectoryMock->expects($this->any())
--            ->method('isReadable')
--            ->will($this->returnValue($isReadable));
--
--        $this->storageFactoryMock->expects($this->any())
--            ->method('checkDbUsage')
--            ->will($this->returnValue(false));
--        $this->httpFileFactoryMock->expects($this->never())->method('create');
--
--        $this->model->downloadFile($info);
--    }
--
--    /**
--     * @return array
--     */
--    public function dataProviderForTestDownloadFileException()
--    {
--        return [
--            [1, true, false],
--            [1, false, true],
--            [false, true, true],
--        ];
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\LocalizedException
--     */
--    public function testDownloadFileNoStorage()
--    {
--        $info = ['order_path' => 'test/path', 'quote_path' => 'test/path2', 'title' => 'test title'];
--        $isFile = true;
--        $isReadable = false;
--
--        $this->writeDirectoryMock->expects($this->any())
--            ->method('getAbsolutePath')
--            ->will($this->returnArgument(0));
--        $this->writeDirectoryMock->expects($this->any())
--            ->method('getDriver')
--            ->willReturn($this->driverMock);
--        $this->driverMock->expects($this->any())->method('getRealPath')->willReturn(true);
--
--        $this->writeDirectoryMock->expects($this->any())
--            ->method('isFile')
--            ->will($this->returnValue($isFile));
--        $this->writeDirectoryMock->expects($this->any())
--            ->method('isReadable')
--            ->will($this->returnValue($isReadable));
--
--        $this->storageMock->expects($this->any())
--            ->method('checkDbUsage')
--            ->will($this->returnValue(true));
--
--        $storageDatabaseMock = $this->getMockBuilder(\Magento\MediaStorage\Model\File\Storage\Database::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $storageDatabaseMock->expects($this->at(0))
--            ->method('loadByFilename')
--            ->with($this->equalTo($info['order_path']))
--            ->will($this->returnSelf());
--        $storageDatabaseMock->expects($this->at(2))
--            ->method('loadByFilename')
--            ->with($this->equalTo($info['quote_path']))
--            ->will($this->returnSelf());
--
--        $storageDatabaseMock->expects($this->any())
--            ->method('getId')
--            ->will($this->returnValue(false));
--
--        $this->storageFactoryMock->expects($this->any())
--            ->method('create')
--            ->will($this->returnValue($storageDatabaseMock));
--        $this->httpFileFactoryMock->expects($this->never())->method('create');
--
--        $this->model->downloadFile($info);
--    }
--
--    public function testDownloadFile()
--    {
--        $info = ['order_path' => 'test/path', 'quote_path' => 'test/path2', 'title' => 'test title'];
--        $isFile = true;
--        $isReadable = false;
--
--        $writeMock = $this->getMockBuilder(\Magento\Framework\Filesystem\File\Write::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $writeMock->expects($this->any())
--            ->method('lock');
--        $writeMock->expects($this->any())
--            ->method('write');
--        $writeMock->expects($this->any())
--            ->method('unlock');
--        $writeMock->expects($this->any())
--            ->method('close');
--
--        $this->writeDirectoryMock->expects($this->any())
--            ->method('getAbsolutePath')
--            ->will($this->returnArgument(0));
--        $this->writeDirectoryMock->expects($this->any())
--            ->method('getDriver')
--            ->willReturn($this->driverMock);
--        $this->driverMock->expects($this->any())->method('getRealPath')->willReturn(true);
--
--        $this->writeDirectoryMock->expects($this->any())
--            ->method('isFile')
--            ->will($this->returnValue($isFile));
--        $this->writeDirectoryMock->expects($this->any())
--            ->method('isReadable')
--            ->will($this->returnValue($isReadable));
--        $this->writeDirectoryMock->expects($this->any())
--            ->method('openFile')
--            ->will($this->returnValue($writeMock));
--        $this->writeDirectoryMock->expects($this->once())
--            ->method('getRelativePath')
--            ->with($info['order_path'])
--            ->will($this->returnArgument(0));
--
--        $this->storageMock->expects($this->any())
--            ->method('checkDbUsage')
--            ->will($this->returnValue(true));
--
--        $storageDatabaseMock = $this->getMockBuilder(\Magento\MediaStorage\Model\File\Storage\Database::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['loadByFilename', 'getId', '__wakeup'])
--            ->getMock();
--        $storageDatabaseMock->expects($this->any())
--            ->method('loadByFilename')
--            ->will($this->returnSelf());
--
--        $storageDatabaseMock->expects($this->any())
--            ->method('getId')
--            ->will($this->returnValue(true));
--
--        $this->storageFactoryMock->expects($this->any())
--            ->method('create')
--            ->will($this->returnValue($storageDatabaseMock));
--
--        $this->httpFileFactoryMock->expects($this->once())
--            ->method('create')
--            ->with(
--                $info['title'],
--                ['value' => $info['order_path'], 'type' => 'filename'],
--                DirectoryList::MEDIA,
--                'application/octet-stream',
--                null
--            );
--
--        $result = $this->model->downloadFile($info);
--        $this->assertNull($result);
--    }
--}
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/EmailSenderHandlerTest.php b/app/code/Magento/Sales/Test/Unit/Model/EmailSenderHandlerTest.php
-index 56ec763a31c..e26b6e52b8d 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/EmailSenderHandlerTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/EmailSenderHandlerTest.php
-@@ -118,7 +118,7 @@ class EmailSenderHandlerTest extends \PHPUnit\Framework\TestCase
-         $path = 'sales_email/general/async_sending';
- 
-         $this->globalConfig
--            ->expects($this->once())
-+            ->expects($this->at(0))
-             ->method('getValue')
-             ->with($path)
-             ->willReturn($configValue);
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php
-index 33f1c2f8923..1e66d438747 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php
-@@ -3,128 +3,181 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Sales\Test\Unit\Model\Order;
- 
-+use Magento\Customer\Model\AttributeMetadataDataProvider;
-+use Magento\Eav\Model\Entity\Attribute;
- use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Sales\Model\Order\Address as OrderAddress;
-+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-+use Magento\Sales\Model\Order\AddressRepository;
-+use Magento\Sales\Model\ResourceModel\Order\Address\Collection as OrderAddressCollection;
-+use Magento\Customer\Model\ResourceModel\Form\Attribute\Collection as FormAttributeCollection;
-+use Magento\Framework\Api\SearchCriteria;
-+use Magento\Sales\Api\Data\OrderAddressSearchResultInterfaceFactory;
-+use Magento\Sales\Model\ResourceModel\Metadata;
-+use Magento\Sales\Model\Order\AddressRepository as OrderAddressRepository;
-+use PHPUnit\Framework\TestCase;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Exception\InputException;
- 
- /**
-  * Unit test for order address repository class.
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-+class AddressRepositoryTest extends TestCase
- {
-     /**
-      * Subject of testing.
-      *
--     * @var \Magento\Sales\Model\Order\AddressRepository
-+     * @var OrderAddressRepository
-      */
-     protected $subject;
- 
-     /**
-      * Sales resource metadata.
-      *
--     * @var \Magento\Sales\Model\ResourceModel\Metadata|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Metadata|MockObject
-      */
-     protected $metadata;
- 
-     /**
--     * @var \Magento\Sales\Api\Data\OrderAddressSearchResultInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-+     * @var OrderAddressSearchResultInterfaceFactory|MockObject
-      */
-     protected $searchResultFactory;
- 
-     /**
--     * @var CollectionProcessorInterface |\PHPUnit_Framework_MockObject_MockObject
-+     * @var CollectionProcessorInterface|MockObject
-      */
-     private $collectionProcessorMock;
- 
-+    /**
-+     * @var Attribute[]
-+     */
-+    private $attributesList;
-+
-+    /**
-+     * @var AttributeMetadataDataProvider
-+     */
-+    private $attributeMetadataDataProvider;
-+
-+    /**
-+     * @var OrderAddress|MockObject
-+     */
-+    private $orderAddress;
-+
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
--        $objectManager = new ObjectManager($this);
-+        $this->objectManager = new ObjectManager($this);
- 
-+        $this->orderAddress = $this->createPartialMock(OrderAddress::class, ['getEntityId', 'load']);
-         $this->metadata = $this->createPartialMock(
--            \Magento\Sales\Model\ResourceModel\Metadata::class,
-+            Metadata::class,
-             ['getNewInstance', 'getMapper']
-         );
- 
-+        $this->attributeMetadataDataProvider = $this->getMockBuilder(AttributeMetadataDataProvider::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['loadAttributesCollection'])
-+            ->getMock();
-+        $collectionAttribute = $this->getMockBuilder(FormAttributeCollection::class)
-+            ->setMethods(['addFieldToFilter', 'getIterator'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $collectionAttribute->method('getIterator')
-+            ->willReturn(new \ArrayIterator([]));
-+        $this->attributeMetadataDataProvider->method('loadAttributesCollection')->willReturn($collectionAttribute);
-+
-         $this->searchResultFactory = $this->createPartialMock(
--            \Magento\Sales\Api\Data\OrderAddressSearchResultInterfaceFactory::class,
-+            OrderAddressSearchResultInterfaceFactory::class,
-             ['create']
-         );
- 
-         $this->collectionProcessorMock = $this->getMockBuilder(CollectionProcessorInterface::class)
-             ->getMock();
- 
--        $this->subject = $objectManager->getObject(
--            \Magento\Sales\Model\Order\AddressRepository::class,
-+        $this->subject = $this->objectManager->getObject(
-+            OrderAddressRepository::class,
-             [
-                 'metadata' => $this->metadata,
-                 'searchResultFactory' => $this->searchResultFactory,
-                 'collectionProcessor' => $this->collectionProcessorMock,
-+                'attributeMetadataDataProvider' => $this->attributeMetadataDataProvider
-             ]
-         );
-     }
- 
-     /**
-+     * Test for get order address
-+     *
-      * @param int|null $id
-      * @param int|null $entityId
-+     *
-+     * @return void
-      * @dataProvider getDataProvider
-      */
--    public function testGet($id, $entityId)
-+    public function testGet(?int $id, ?int $entityId): void
-     {
-         if (!$id) {
--            $this->expectException(
--                \Magento\Framework\Exception\InputException::class
--            );
--
-+            $this->expectException(InputException::class);
-             $this->subject->get($id);
-         } else {
--            $address = $this->createPartialMock(\Magento\Sales\Model\Order\Address::class, ['load', 'getEntityId']);
--            $address->expects($this->once())
-+
-+            $this->orderAddress->expects($this->once())
-                 ->method('load')
-                 ->with($id)
--                ->willReturn($address);
--            $address->expects($this->once())
-+                ->willReturn($this->orderAddress);
-+            $this->orderAddress->expects($this->once())
-                 ->method('getEntityId')
-                 ->willReturn($entityId);
- 
-             $this->metadata->expects($this->once())
-                 ->method('getNewInstance')
--                ->willReturn($address);
-+                ->willReturn($this->orderAddress);
- 
-             if (!$entityId) {
--                $this->expectException(
--                    \Magento\Framework\Exception\NoSuchEntityException::class
--                );
--
-+                $this->expectException(NoSuchEntityException::class);
-                 $this->subject->get($id);
-             } else {
--                $this->assertEquals($address, $this->subject->get($id));
-+                $this->assertEquals($this->orderAddress, $this->subject->get($id));
- 
--                $address->expects($this->never())
-+                $this->orderAddress->expects($this->never())
-                     ->method('load')
-                     ->with($id)
--                    ->willReturn($address);
--                $address->expects($this->never())
-+                    ->willReturn($this->orderAddress);
-+                $this->orderAddress->expects($this->never())
-                     ->method('getEntityId')
-                     ->willReturn($entityId);
- 
-                 $this->metadata->expects($this->never())
-                     ->method('getNewInstance')
--                    ->willReturn($address);
-+                    ->willReturn($this->orderAddress);
- 
-                 // Retrieve Address from registry.
--                $this->assertEquals($address, $this->subject->get($id));
-+                $this->assertEquals($this->orderAddress, $this->subject->get($id));
-             }
-         }
-     }
- 
-     /**
-+     * Data for testGet
-+     *
-      * @return array
-      */
--    public function getDataProvider()
-+    public function getDataProvider(): array
-     {
-         return [
-             [null, null],
-@@ -133,10 +186,15 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
--    public function testGetList()
-+    /**
-+     * Test for get list order address
-+     *
-+     * @return void
-+     */
-+    public function testGetList(): void
-     {
--        $searchCriteria = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
--        $collection = $this->createMock(\Magento\Sales\Model\ResourceModel\Order\Address\Collection::class);
-+        $searchCriteria = $this->createMock(SearchCriteria::class);
-+        $collection = $this->createMock(OrderAddressCollection::class);
- 
-         $this->collectionProcessorMock->expects($this->once())
-             ->method('process')
-@@ -148,15 +206,19 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($collection, $this->subject->getList($searchCriteria));
-     }
- 
--    public function testDelete()
-+    /**
-+     * Test for delete order address
-+     *
-+     * @return void
-+     */
-+    public function testDelete(): void
-     {
--        $address = $this->createPartialMock(\Magento\Sales\Model\Order\Address::class, ['getEntityId']);
--        $address->expects($this->once())
-+        $this->orderAddress->expects($this->once())
-             ->method('getEntityId')
-             ->willReturn(1);
- 
-         $mapper = $this->getMockForAbstractClass(
--            \Magento\Framework\Model\ResourceModel\Db\AbstractDb::class,
-+            AbstractDb::class,
-             [],
-             '',
-             false,
-@@ -166,27 +228,29 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-         );
-         $mapper->expects($this->once())
-             ->method('delete')
--            ->with($address);
-+            ->with($this->orderAddress);
- 
-         $this->metadata->expects($this->any())
-             ->method('getMapper')
-             ->willReturn($mapper);
- 
--        $this->assertTrue($this->subject->delete($address));
-+        $this->assertTrue($this->subject->delete($this->orderAddress));
-     }
- 
-     /**
-+     * Test for delete order address with exception
-+     *
-+     * @return void
-      * @expectedException \Magento\Framework\Exception\CouldNotDeleteException
-      * @expectedExceptionMessage The order address couldn't be deleted.
-      */
--    public function testDeleteWithException()
-+    public function testDeleteWithException(): void
-     {
--        $address = $this->createPartialMock(\Magento\Sales\Model\Order\Address::class, ['getEntityId']);
--        $address->expects($this->never())
-+        $this->orderAddress->expects($this->never())
-             ->method('getEntityId');
- 
-         $mapper = $this->getMockForAbstractClass(
--            \Magento\Framework\Model\ResourceModel\Db\AbstractDb::class,
-+            AbstractDb::class,
-             [],
-             '',
-             false,
-@@ -202,18 +266,22 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-             ->method('getMapper')
-             ->willReturn($mapper);
- 
--        $this->subject->delete($address);
-+        $this->subject->delete($this->orderAddress);
-     }
- 
--    public function testSave()
-+    /**
-+     * Test for save order address
-+     *
-+     * @return void
-+     */
-+    public function testSave(): void
-     {
--        $address = $this->createPartialMock(\Magento\Sales\Model\Order\Address::class, ['getEntityId']);
--        $address->expects($this->any())
-+        $this->orderAddress->expects($this->any())
-             ->method('getEntityId')
-             ->willReturn(1);
- 
-         $mapper = $this->getMockForAbstractClass(
--            \Magento\Framework\Model\ResourceModel\Db\AbstractDb::class,
-+            AbstractDb::class,
-             [],
-             '',
-             false,
-@@ -223,27 +291,29 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-         );
-         $mapper->expects($this->once())
-             ->method('save')
--            ->with($address);
-+            ->with($this->orderAddress);
- 
-         $this->metadata->expects($this->any())
-             ->method('getMapper')
-             ->willReturn($mapper);
- 
--        $this->assertEquals($address, $this->subject->save($address));
-+        $this->assertEquals($this->orderAddress, $this->subject->save($this->orderAddress));
-     }
- 
-     /**
-+     * Test for save order address with exception
-+     *
-+     * @return void
-      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-      * @expectedExceptionMessage The order address couldn't be saved.
-      */
--    public function testSaveWithException()
-+    public function testSaveWithException(): void
-     {
--        $address = $this->createPartialMock(\Magento\Sales\Model\Order\Address::class, ['getEntityId']);
--        $address->expects($this->never())
-+        $this->orderAddress->expects($this->never())
-             ->method('getEntityId');
- 
-         $mapper = $this->getMockForAbstractClass(
--            \Magento\Framework\Model\ResourceModel\Db\AbstractDb::class,
-+            AbstractDb::class,
-             [],
-             '',
-             false,
-@@ -259,17 +329,117 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-             ->method('getMapper')
-             ->willReturn($mapper);
- 
--        $this->assertEquals($address, $this->subject->save($address));
-+        $this->assertEquals($this->orderAddress, $this->subject->save($this->orderAddress));
-     }
- 
--    public function testCreate()
-+    /**
-+     * Tets for create order address
-+     *
-+     * @return void
-+     */
-+    public function testCreate(): void
-     {
--        $address = $this->createPartialMock(\Magento\Sales\Model\Order\Address::class, ['getEntityId']);
--
-         $this->metadata->expects($this->once())
-             ->method('getNewInstance')
--            ->willReturn($address);
-+            ->willReturn($this->orderAddress);
-+
-+        $this->assertEquals($this->orderAddress, $this->subject->create());
-+    }
-+
-+    /**
-+     * Test for save sales address with multi-attribute.
-+     *
-+     * @param string $attributeType
-+     * @param string $attributeCode
-+     * @param array $attributeValue
-+     * @param string $expected
-+     *
-+     * @return void
-+     * @dataProvider dataMultiAttribute
-+     */
-+    public function testSaveWithMultiAttribute(
-+        string $attributeType,
-+        string $attributeCode,
-+        array $attributeValue,
-+        string $expected
-+    ): void {
-+        $orderAddress = $this->getMockBuilder(OrderAddress::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getEntityId', 'hasData', 'getData', 'setData'])
-+            ->getMock();
-+
-+        $orderAddress->expects($this->any())
-+            ->method('getEntityId')
-+            ->willReturn(1);
-+
-+        $mapper = $this->getMockForAbstractClass(
-+            AbstractDb::class,
-+            [],
-+            '',
-+            false,
-+            true,
-+            true,
-+            ['save']
-+        );
-+        $mapper->method('save')
-+            ->with($orderAddress);
-+        $this->metadata->method('getMapper')
-+            ->willReturn($mapper);
-+
-+        $attributeModel = $this->getMockBuilder(Attribute::class)
-+            ->setMethods(['getFrontendInput', 'getAttributeCode'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $attributeModel->method('getFrontendInput')->willReturn($attributeType);
-+        $attributeModel->method('getAttributeCode')->willReturn($attributeCode);
-+        $this->attributesList = [$attributeModel];
-+
-+        $this->subject = $this->objectManager->getObject(
-+            AddressRepository::class,
-+            [
-+                'metadata' => $this->metadata,
-+                'searchResultFactory' => $this->searchResultFactory,
-+                'collectionProcessor' => $this->collectionProcessorMock,
-+                'attributeMetadataDataProvider' => $this->attributeMetadataDataProvider,
-+                'attributesList' => $this->attributesList,
-+            ]
-+        );
-+
-+        $orderAddress->method('hasData')->with($attributeCode)->willReturn(true);
-+        $orderAddress->method('getData')->with($attributeCode)->willReturn($attributeValue);
-+        $orderAddress->expects($this->once())->method('setData')->with($attributeCode, $expected);
-+
-+        $this->assertEquals($orderAddress, $this->subject->save($orderAddress));
-+    }
-+
-+    /**
-+     * Data for testSaveWithMultiAttribute
-+     *
-+     * @return array
-+     */
-+    public function dataMultiAttribute(): array
-+    {
-+        $data = [
-+            'multiselect' => [
-+                'multiselect',
-+                'attr_multiselect',
-+                [
-+                    'opt1',
-+                    'opt2',
-+                ],
-+                'opt1,opt2',
-+            ],
-+            'multiline' => [
-+                'multiline',
-+                'attr_multiline',
-+                [
-+                    'line1',
-+                    'line2',
-+                ],
-+                'line1'.PHP_EOL.'line2',
-+            ],
-+        ];
- 
--        $this->assertEquals($address, $this->subject->create());
-+        return $data;
-     }
- }
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
-index 9fd2a8b0d92..467476c9bb4 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
-@@ -1,5 +1,4 @@
- <?php
--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-@@ -249,7 +248,7 @@ class EmailSenderTest extends \PHPUnit\Framework\TestCase
- 
-         $this->creditmemoMock->expects($this->once())
-             ->method('setSendEmail')
--            ->with(true);
-+            ->with($emailSendingResult);
- 
-         if (!$configValue || $forceSyncMode) {
-             $transport = [
-@@ -279,7 +278,7 @@ class EmailSenderTest extends \PHPUnit\Framework\TestCase
-                 ->method('setTemplateVars')
-                 ->with($transport->getData());
- 
--            $this->identityContainerMock->expects($this->once())
-+            $this->identityContainerMock->expects($this->exactly(2))
-                 ->method('isEnabled')
-                 ->willReturn($emailSendingResult);
- 
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/DiscountTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/DiscountTest.php
-index 18efef38b20..8a45aa8c795 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/DiscountTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/DiscountTest.php
-@@ -74,7 +74,7 @@ class DiscountTest extends \PHPUnit\Framework\TestCase
-         $this->orderMock->expects($this->once())
-             ->method('getBaseShippingDiscountAmount')
-             ->willReturn(1);
--        $this->orderMock->expects($this->exactly(2))
-+        $this->orderMock->expects($this->exactly(3))
-             ->method('getBaseShippingAmount')
-             ->willReturn(1);
-         $this->orderMock->expects($this->once())
-@@ -150,7 +150,7 @@ class DiscountTest extends \PHPUnit\Framework\TestCase
-         $this->orderMock->expects($this->once())
-             ->method('getBaseShippingDiscountAmount')
-             ->willReturn(1);
--        $this->orderMock->expects($this->exactly(2))
-+        $this->orderMock->expects($this->exactly(3))
-             ->method('getBaseShippingAmount')
-             ->willReturn(1);
-         $this->orderMock->expects($this->once())
-@@ -269,4 +269,30 @@ class DiscountTest extends \PHPUnit\Framework\TestCase
-             );
-         $this->assertEquals($this->total, $this->total->collect($this->creditmemoMock));
-     }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage You can not refund shipping if there is no shipping amount.
-+     */
-+    public function testCollectNonZeroShipping()
-+    {
-+        $this->creditmemoMock->expects($this->once())
-+            ->method('setDiscountAmount')
-+            ->willReturnSelf();
-+        $this->creditmemoMock->expects($this->once())
-+            ->method('setBaseDiscountAmount')
-+            ->willReturnSelf();
-+        $this->creditmemoMock->expects($this->once())
-+            ->method('getOrder')
-+            ->willReturn($this->orderMock);
-+        $this->creditmemoMock->expects($this->once())
-+            ->method('getBaseShippingAmount')
-+            ->willReturn('10.0000');
-+        $this->orderMock->expects($this->never())
-+            ->method('getBaseShippingDiscountAmount');
-+        $this->orderMock->expects($this->once())
-+            ->method('getBaseShippingAmount')
-+            ->willReturn('0.0000');
-+        $this->assertEquals($this->total, $this->total->collect($this->creditmemoMock));
-+    }
- }
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php
-index 4bca669f089..565d51ff515 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php
-@@ -447,10 +447,10 @@ class TaxTest extends \PHPUnit\Framework\TestCase
-                     ],
-                 ],
-                 'creditmemo_data' => [
--                    'grand_total' => 64.95,
--                    'base_grand_total' => 64.95,
--                    'tax_amount' => 4.95,
--                    'base_tax_amount' => 4.95,
-+                    'grand_total' => 64.94,
-+                    'base_grand_total' => 64.94,
-+                    'tax_amount' => 4.94,
-+                    'base_tax_amount' => 4.94,
-                 ],
-             ],
-         ];
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoDocumentFactoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoDocumentFactoryTest.php
-index cb65b70b827..dc183069427 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoDocumentFactoryTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoDocumentFactoryTest.php
-@@ -12,7 +12,6 @@ use Magento\Sales\Model\Order\CreditmemoDocumentFactory;
- use Magento\Sales\Api\Data\CreditmemoCommentInterface;
- use Magento\Sales\Model\Order;
- use Magento\Sales\Model\Order\Invoice;
--use Magento\Sales\Api\Data\CreditmemoInterface;
- use Magento\Sales\Api\Data\CreditmemoItemCreationInterface;
- use Magento\Sales\Api\Data\CreditmemoCommentCreationInterface;
- use Magento\Framework\EntityManager\HydratorPool;
-@@ -82,7 +81,7 @@ class CreditmemoDocumentFactoryTest extends \PHPUnit\Framework\TestCase
-     private $commentCreationArgumentsMock;
- 
-     /**
--     * @var CreditmemoInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Order\Creditmemo|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $creditmemoMock;
- 
-@@ -121,7 +120,7 @@ class CreditmemoDocumentFactoryTest extends \PHPUnit\Framework\TestCase
-         $this->creditmemoItemCreationMock = $this->getMockBuilder(CreditmemoItemCreationInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->creditmemoMock = $this->getMockBuilder(CreditmemoInterface::class)
-+        $this->creditmemoMock = $this->getMockBuilder(Order\Creditmemo::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->hydratorMock = $this->getMockBuilder(HydratorInterface::class)
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php
-index b872a4ef9fb..07300968ae0 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php
-@@ -6,10 +6,12 @@
- 
- namespace Magento\Sales\Test\Unit\Model\Order;
- 
-+use Magento\Sales\Api\OrderRepositoryInterface;
- use Magento\Sales\Model\ResourceModel\OrderFactory;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
- use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Item\CollectionFactory;
- use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Item\Collection as ItemCollection;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
- 
- /**
-  * Class CreditmemoTest
-@@ -19,15 +21,20 @@ use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Item\Collection as ItemCo
- class CreditmemoTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var OrderFactory |\PHPUnit_Framework_MockObject_MockObject
-+     * @var OrderRepositoryInterface |\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $orderFactory;
-+    protected $orderRepository;
- 
-     /**
-      * @var \Magento\Sales\Model\Order\Creditmemo
-      */
-     protected $creditmemo;
- 
-+    /**
-+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $scopeConfigMock;
-+
-     /**
-      * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -35,7 +42,8 @@ class CreditmemoTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
--        $this->orderFactory = $this->createPartialMock(\Magento\Sales\Model\OrderFactory::class, ['create']);
-+        $this->orderRepository = $this->createMock(OrderRepositoryInterface::class);
-+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
- 
-         $objectManagerHelper = new ObjectManagerHelper($this);
-         $this->cmItemCollectionFactoryMock = $this->getMockBuilder(
-@@ -54,7 +62,6 @@ class CreditmemoTest extends \PHPUnit\Framework\TestCase
-             'creditmemoConfig' => $this->createMock(
-                 \Magento\Sales\Model\Order\Creditmemo\Config::class
-             ),
--            'orderFactory' => $this->orderFactory,
-             'cmItemCollectionFactory' => $this->cmItemCollectionFactoryMock,
-             'calculatorFactory' => $this->createMock(\Magento\Framework\Math\CalculatorFactory::class),
-             'storeManager' => $this->createMock(\Magento\Store\Model\StoreManagerInterface::class),
-@@ -62,6 +69,8 @@ class CreditmemoTest extends \PHPUnit\Framework\TestCase
-             'commentCollectionFactory' => $this->createMock(
-                 \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Comment\CollectionFactory::class
-             ),
-+            'scopeConfig' => $this->scopeConfigMock,
-+            'orderRepository' => $this->orderRepository,
-         ];
-         $this->creditmemo = $objectManagerHelper->getObject(
-             \Magento\Sales\Model\Order\Creditmemo::class,
-@@ -83,14 +92,10 @@ class CreditmemoTest extends \PHPUnit\Framework\TestCase
-             ->method('setHistoryEntityName')
-             ->with($entityName)
-             ->will($this->returnSelf());
--        $order->expects($this->atLeastOnce())
--            ->method('load')
-+        $this->orderRepository->expects($this->atLeastOnce())
-+            ->method('get')
-             ->with($orderId)
--            ->will($this->returnValue($order));
--
--        $this->orderFactory->expects($this->atLeastOnce())
--            ->method('create')
--            ->will($this->returnValue($order));
-+            ->willReturn($order);
- 
-         $this->assertEquals($order, $this->creditmemo->getOrder());
-     }
-@@ -109,7 +114,6 @@ class CreditmemoTest extends \PHPUnit\Framework\TestCase
-     public function testIsValidGrandTotalGrandTotal()
-     {
-         $this->creditmemo->setGrandTotal(0);
--        $this->creditmemo->getAllowZeroGrandTotal(true);
-         $this->assertFalse($this->creditmemo->isValidGrandTotal());
-     }
- 
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
-index 31bf8466892..1f074d7262f 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
-@@ -7,6 +7,9 @@ namespace Magento\Sales\Test\Unit\Model\Order\Email\Sender;
- 
- use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
- 
-+/**
-+ * Test for Magento\Sales\Model\Order\Email\Sender\CreditmemoSender class.
-+ */
- class CreditmemoSenderTest extends AbstractSenderTest
- {
-     /**
-@@ -90,7 +93,7 @@ class CreditmemoSenderTest extends AbstractSenderTest
- 
-         $this->creditmemoMock->expects($this->once())
-             ->method('setSendEmail')
--            ->with(true);
-+            ->with($emailSendingResult);
- 
-         $this->globalConfig->expects($this->once())
-             ->method('getValue')
-@@ -130,7 +133,7 @@ class CreditmemoSenderTest extends AbstractSenderTest
-                     ]
-                 );
- 
--            $this->identityContainerMock->expects($this->once())
-+            $this->identityContainerMock->expects($this->exactly(2))
-                 ->method('isEnabled')
-                 ->willReturn($emailSendingResult);
- 
-@@ -197,6 +200,8 @@ class CreditmemoSenderTest extends AbstractSenderTest
-      * @param bool $isVirtualOrder
-      * @param int $formatCallCount
-      * @param string|null $expectedShippingAddress
-+     *
-+     * @return void
-      * @dataProvider sendVirtualOrderDataProvider
-      */
-     public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expectedShippingAddress)
-@@ -207,7 +212,7 @@ class CreditmemoSenderTest extends AbstractSenderTest
- 
-         $this->creditmemoMock->expects($this->once())
-             ->method('setSendEmail')
--            ->with(true);
-+            ->with(false);
- 
-         $this->globalConfig->expects($this->once())
-             ->method('getValue')
-@@ -242,7 +247,7 @@ class CreditmemoSenderTest extends AbstractSenderTest
-                 ]
-             );
- 
--        $this->identityContainerMock->expects($this->once())
-+        $this->identityContainerMock->expects($this->exactly(2))
-             ->method('isEnabled')
-             ->willReturn(false);
- 
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
-index 9c54c716e42..d1aa5af53da 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
-@@ -7,6 +7,9 @@ namespace Magento\Sales\Test\Unit\Model\Order\Email\Sender;
- 
- use Magento\Sales\Model\Order\Email\Sender\InvoiceSender;
- 
-+/**
-+ * Test for Magento\Sales\Model\Order\Email\Sender\InvoiceSender class.
-+ */
- class InvoiceSenderTest extends AbstractSenderTest
- {
-     /**
-@@ -90,7 +93,7 @@ class InvoiceSenderTest extends AbstractSenderTest
- 
-         $this->invoiceMock->expects($this->once())
-             ->method('setSendEmail')
--            ->with(true);
-+            ->with($emailSendingResult);
- 
-         $this->globalConfig->expects($this->once())
-             ->method('getValue')
-@@ -136,7 +139,7 @@ class InvoiceSenderTest extends AbstractSenderTest
-                     ]
-                 );
- 
--            $this->identityContainerMock->expects($this->once())
-+            $this->identityContainerMock->expects($this->exactly(2))
-                 ->method('isEnabled')
-                 ->willReturn($emailSendingResult);
- 
-@@ -212,7 +215,7 @@ class InvoiceSenderTest extends AbstractSenderTest
- 
-         $this->invoiceMock->expects($this->once())
-             ->method('setSendEmail')
--            ->with(true);
-+            ->with(false);
- 
-         $this->globalConfig->expects($this->once())
-             ->method('getValue')
-@@ -247,7 +250,7 @@ class InvoiceSenderTest extends AbstractSenderTest
-                 ]
-             );
- 
--        $this->identityContainerMock->expects($this->once())
-+        $this->identityContainerMock->expects($this->exactly(2))
-             ->method('isEnabled')
-             ->willReturn(false);
- 
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
-index 46c44c03b15..88053ea684c 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
-@@ -64,7 +64,7 @@ class OrderSenderTest extends AbstractSenderTest
- 
-         $this->orderMock->expects($this->once())
-             ->method('setSendEmail')
--            ->with(true);
-+            ->with($emailSendingResult);
- 
-         $this->globalConfig->expects($this->once())
-             ->method('getValue')
-@@ -72,7 +72,7 @@ class OrderSenderTest extends AbstractSenderTest
-             ->willReturn($configValue);
- 
-         if (!$configValue || $forceSyncMode) {
--            $this->identityContainerMock->expects($this->once())
-+            $this->identityContainerMock->expects($this->exactly(2))
-                 ->method('isEnabled')
-                 ->willReturn($emailSendingResult);
- 
-@@ -118,7 +118,7 @@ class OrderSenderTest extends AbstractSenderTest
- 
-                     $this->orderMock->expects($this->once())
-                         ->method('setEmailSent')
--                        ->with(true);
-+                        ->with($emailSendingResult);
- 
-                     $this->orderResourceMock->expects($this->once())
-                         ->method('saveAttribute')
-@@ -210,7 +210,7 @@ class OrderSenderTest extends AbstractSenderTest
-             ->with('sales_email/general/async_sending')
-             ->willReturn(false);
- 
--        $this->identityContainerMock->expects($this->once())
-+        $this->identityContainerMock->expects($this->exactly(2))
-             ->method('isEnabled')
-             ->willReturn(true);
- 
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
-index b1b18af63b5..2d7b42bccae 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
-@@ -7,6 +7,9 @@ namespace Magento\Sales\Test\Unit\Model\Order\Email\Sender;
- 
- use Magento\Sales\Model\Order\Email\Sender\ShipmentSender;
- 
-+/**
-+ * Test for Magento\Sales\Model\Order\Email\Sender\ShipmentSender class.
-+ */
- class ShipmentSenderTest extends AbstractSenderTest
- {
-     /**
-@@ -90,7 +93,7 @@ class ShipmentSenderTest extends AbstractSenderTest
- 
-         $this->shipmentMock->expects($this->once())
-             ->method('setSendEmail')
--            ->with(true);
-+            ->with($emailSendingResult);
- 
-         $this->globalConfig->expects($this->once())
-             ->method('getValue')
-@@ -136,7 +139,7 @@ class ShipmentSenderTest extends AbstractSenderTest
-                     ]
-                 );
- 
--            $this->identityContainerMock->expects($this->once())
-+            $this->identityContainerMock->expects($this->exactly(2))
-                 ->method('isEnabled')
-                 ->willReturn($emailSendingResult);
- 
-@@ -212,7 +215,7 @@ class ShipmentSenderTest extends AbstractSenderTest
- 
-         $this->shipmentMock->expects($this->once())
-             ->method('setSendEmail')
--            ->with(true);
-+            ->with(false);
- 
-         $this->globalConfig->expects($this->once())
-             ->method('getValue')
-@@ -247,7 +250,7 @@ class ShipmentSenderTest extends AbstractSenderTest
-                 ]
-             );
- 
--        $this->identityContainerMock->expects($this->once())
-+        $this->identityContainerMock->expects($this->exactly(2))
-             ->method('isEnabled')
-             ->willReturn(false);
-         $this->shipmentResourceMock->expects($this->once())
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
-index 38209bb22ae..24cd54e3a46 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
-@@ -6,7 +6,6 @@
- 
- namespace Magento\Sales\Test\Unit\Model\Order\Email;
- 
--use Magento\Framework\Mail\Template\TransportBuilderByStore;
- use Magento\Sales\Model\Order\Email\SenderBuilder;
- 
- class SenderBuilderTest extends \PHPUnit\Framework\TestCase
-@@ -36,11 +35,6 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
-      */
-     private $storeMock;
- 
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $transportBuilderByStore;
--
-     protected function setUp()
-     {
-         $templateId = 'test_template_id';
-@@ -82,11 +76,10 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
-                 'setTemplateIdentifier',
-                 'setTemplateOptions',
-                 'setTemplateVars',
-+                'setFromByScope',
-             ]
-         );
- 
--        $this->transportBuilderByStore = $this->createMock(TransportBuilderByStore::class);
--
-         $this->templateContainerMock->expects($this->once())
-             ->method('getTemplateId')
-             ->will($this->returnValue($templateId));
-@@ -109,9 +102,9 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
-         $this->identityContainerMock->expects($this->once())
-             ->method('getEmailIdentity')
-             ->will($this->returnValue($emailIdentity));
--        $this->transportBuilderByStore->expects($this->once())
--            ->method('setFromByStore')
--            ->with($this->equalTo($emailIdentity));
-+        $this->transportBuilder->expects($this->once())
-+            ->method('setFromByScope')
-+            ->with($this->equalTo($emailIdentity), 1);
- 
-         $this->identityContainerMock->expects($this->once())
-             ->method('getEmailCopyTo')
-@@ -120,8 +113,7 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
-         $this->senderBuilder = new SenderBuilder(
-             $this->templateContainerMock,
-             $this->identityContainerMock,
--            $this->transportBuilder,
--            $this->transportBuilderByStore
-+            $this->transportBuilder
-         );
-     }
- 
-@@ -129,6 +121,8 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
-     {
-         $customerName = 'test_name';
-         $customerEmail = 'test_email';
-+        $identity = 'email_identity_test';
-+
-         $transportMock = $this->createMock(
-             \Magento\Sales\Test\Unit\Model\Order\Email\Stub\TransportInterfaceMock::class
-         );
-@@ -151,6 +145,9 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
-         $this->storeMock->expects($this->once())
-             ->method('getId')
-             ->willReturn(1);
-+        $this->transportBuilder->expects($this->once())
-+            ->method('setFromByScope')
-+            ->with($identity, 1);
-         $this->transportBuilder->expects($this->once())
-             ->method('addTo')
-             ->with($this->equalTo($customerEmail), $this->equalTo($customerName));
-@@ -164,6 +161,7 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
- 
-     public function testSendCopyTo()
-     {
-+        $identity = 'email_identity_test';
-         $transportMock = $this->createMock(
-             \Magento\Sales\Test\Unit\Model\Order\Email\Stub\TransportInterfaceMock::class
-         );
-@@ -177,6 +175,9 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
-         $this->transportBuilder->expects($this->once())
-             ->method('addTo')
-             ->with($this->equalTo('example@mail.com'));
-+        $this->transportBuilder->expects($this->once())
-+            ->method('setFromByScope')
-+            ->with($identity, 1);
-         $this->identityContainerMock->expects($this->once())
-             ->method('getStore')
-             ->willReturn($this->storeMock);
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
-index 8a4e2920ba2..dcf689cf7d5 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
-@@ -247,7 +247,7 @@ class EmailSenderTest extends \PHPUnit\Framework\TestCase
- 
-         $this->invoiceMock->expects($this->once())
-             ->method('setSendEmail')
--            ->with(true);
-+            ->with($emailSendingResult);
- 
-         if (!$configValue || $forceSyncMode) {
-             $transport = [
-@@ -277,7 +277,7 @@ class EmailSenderTest extends \PHPUnit\Framework\TestCase
-                 ->method('setTemplateVars')
-                 ->with($transport->getData());
- 
--            $this->identityContainerMock->expects($this->once())
-+            $this->identityContainerMock->expects($this->exactly(2))
-                 ->method('isEnabled')
-                 ->willReturn($emailSendingResult);
- 
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemRepositoryTest.php
-deleted file mode 100644
-index 8be2c3c8612..00000000000
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemRepositoryTest.php
-+++ /dev/null
-@@ -1,366 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Sales\Test\Unit\Model\Order;
--
--use Magento\Sales\Model\Order\ItemRepository;
--
--/**
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class ItemRepositoryTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Framework\DataObject\Factory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $objectFactory;
--
--    /**
--     * @var \Magento\Sales\Model\ResourceModel\Metadata|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $metadata;
--
--    /**
--     * @var \Magento\Sales\Api\Data\OrderItemSearchResultInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $searchResultFactory;
--
--    /**
--     * @var \Magento\Catalog\Model\ProductOptionProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $productOptionProcessorMock;
--
--    /**
--     * @var \Magento\Catalog\Model\ProductOptionFactory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $productOptionFactory;
--
--    /**
--     * @var \Magento\Catalog\Api\Data\ProductOptionExtensionFactory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $extensionFactory;
--
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $collectionProcessor;
--
--    /**
--     * @var array
--     */
--    protected $productOptionData = [];
--
--    protected function setUp()
--    {
--        $this->objectFactory = $this->getMockBuilder(\Magento\Framework\DataObject\Factory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--
--        $this->metadata = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Metadata::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->searchResultFactory = $this->getMockBuilder(
--            \Magento\Sales\Api\Data\OrderItemSearchResultInterfaceFactory::class
--        )
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--
--        $this->productOptionFactory = $this->getMockBuilder(\Magento\Catalog\Model\ProductOptionFactory::class)
--            ->setMethods([
--                'create',
--            ])
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->collectionProcessor = $this->createMock(
--            \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface::class
--        );
--
--        $this->extensionFactory = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductOptionExtensionFactory::class)
--            ->setMethods([
--                'create',
--            ])
--            ->disableOriginalConstructor()
--            ->getMock();
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\InputException
--     * @expectedExceptionMessage An ID is needed. Set the ID and try again.
--     */
--    public function testGetWithNoId()
--    {
--        $model = new ItemRepository(
--            $this->objectFactory,
--            $this->metadata,
--            $this->searchResultFactory,
--            $this->productOptionFactory,
--            $this->extensionFactory,
--            [],
--            $this->collectionProcessor
--        );
--
--        $model->get(null);
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
--     * @expectedExceptionMessage The entity that was requested doesn't exist. Verify the entity and try again.
--     */
--    public function testGetEmptyEntity()
--    {
--        $orderItemId = 1;
--
--        $orderItemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $orderItemMock->expects($this->once())
--            ->method('load')
--            ->with($orderItemId)
--            ->willReturn($orderItemMock);
--        $orderItemMock->expects($this->once())
--            ->method('getItemId')
--            ->willReturn(null);
--
--        $this->metadata->expects($this->once())
--            ->method('getNewInstance')
--            ->willReturn($orderItemMock);
--
--        $model = new ItemRepository(
--            $this->objectFactory,
--            $this->metadata,
--            $this->searchResultFactory,
--            $this->productOptionFactory,
--            $this->extensionFactory,
--            [],
--            $this->collectionProcessor
--        );
--
--        $model->get($orderItemId);
--    }
--
--    public function testGet()
--    {
--        $orderItemId = 1;
--        $productType = 'configurable';
--
--        $this->productOptionData = ['option1' => 'value1'];
--
--        $this->getProductOptionExtensionMock();
--        $productOption = $this->getProductOptionMock();
--        $orderItemMock = $this->getOrderMock($productType, $productOption);
--
--        $orderItemMock->expects($this->once())
--            ->method('load')
--            ->with($orderItemId)
--            ->willReturn($orderItemMock);
--        $orderItemMock->expects($this->once())
--            ->method('getItemId')
--            ->willReturn($orderItemId);
--
--        $this->metadata->expects($this->once())
--            ->method('getNewInstance')
--            ->willReturn($orderItemMock);
--
--        $model = $this->getModel($orderItemMock, $productType);
--        $this->assertSame($orderItemMock, $model->get($orderItemId));
--
--        // Assert already registered
--        $this->assertSame($orderItemMock, $model->get($orderItemId));
--    }
--
--    public function testGetList()
--    {
--        $productType = 'configurable';
--        $this->productOptionData = ['option1' => 'value1'];
--        $searchCriteriaMock = $this->getMockBuilder(\Magento\Framework\Api\SearchCriteria::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->getProductOptionExtensionMock();
--        $productOption = $this->getProductOptionMock();
--        $orderItemMock = $this->getOrderMock($productType, $productOption);
--
--        $searchResultMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Item\Collection::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $searchResultMock->expects($this->once())
--            ->method('getItems')
--            ->willReturn([$orderItemMock]);
--
--        $this->searchResultFactory->expects($this->once())
--            ->method('create')
--            ->willReturn($searchResultMock);
--
--        $model = $this->getModel($orderItemMock, $productType);
--        $this->assertSame($searchResultMock, $model->getList($searchCriteriaMock));
--    }
--
--    public function testDeleteById()
--    {
--        $orderItemId = 1;
--        $productType = 'configurable';
--
--        $requestMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $orderItemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $orderItemMock->expects($this->once())
--            ->method('load')
--            ->with($orderItemId)
--            ->willReturn($orderItemMock);
--        $orderItemMock->expects($this->once())
--            ->method('getItemId')
--            ->willReturn($orderItemId);
--        $orderItemMock->expects($this->once())
--            ->method('getProductType')
--            ->willReturn($productType);
--        $orderItemMock->expects($this->once())
--            ->method('getBuyRequest')
--            ->willReturn($requestMock);
--
--        $orderItemResourceMock = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $orderItemResourceMock->expects($this->once())
--            ->method('delete')
--            ->with($orderItemMock)
--            ->willReturnSelf();
--
--        $this->metadata->expects($this->once())
--            ->method('getNewInstance')
--            ->willReturn($orderItemMock);
--        $this->metadata->expects($this->exactly(1))
--            ->method('getMapper')
--            ->willReturn($orderItemResourceMock);
--
--        $model = $this->getModel($orderItemMock, $productType);
--        $this->assertTrue($model->deleteById($orderItemId));
--    }
--
--    /**
--     * @param \PHPUnit_Framework_MockObject_MockObject $orderItemMock
--     * @param string $productType
--     * @param array $data
--     * @return ItemRepository
--     */
--    protected function getModel(
--        \PHPUnit_Framework_MockObject_MockObject $orderItemMock,
--        $productType,
--        array $data = []
--    ) {
--        $requestMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $requestUpdateMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $requestUpdateMock->expects($this->any())
--            ->method('getData')
--            ->willReturn($data);
--
--        $this->productOptionProcessorMock = $this->getMockBuilder(
--            \Magento\Catalog\Model\ProductOptionProcessorInterface::class
--        )
--            ->getMockForAbstractClass();
--        $this->productOptionProcessorMock->expects($this->any())
--            ->method('convertToProductOption')
--            ->with($requestMock)
--            ->willReturn($this->productOptionData);
--        $this->productOptionProcessorMock->expects($this->any())
--            ->method('convertToBuyRequest')
--            ->with($orderItemMock)
--            ->willReturn($requestUpdateMock);
--
--        $model = new ItemRepository(
--            $this->objectFactory,
--            $this->metadata,
--            $this->searchResultFactory,
--            $this->productOptionFactory,
--            $this->extensionFactory,
--            [
--                $productType => $this->productOptionProcessorMock,
--                'custom_options' => $this->productOptionProcessorMock
--            ],
--            $this->collectionProcessor
--        );
--        return $model;
--    }
--
--    /**
--     * @param string $productType
--     * @param \PHPUnit_Framework_MockObject_MockObject $productOption
--     * @return \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected function getOrderMock($productType, $productOption)
--    {
--        $requestMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $orderItemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $orderItemMock->expects($this->once())
--            ->method('getProductType')
--            ->willReturn($productType);
--        $orderItemMock->expects($this->once())
--            ->method('getBuyRequest')
--            ->willReturn($requestMock);
--        $orderItemMock->expects($this->any())
--            ->method('getProductOption')
--            ->willReturn(null);
--        $orderItemMock->expects($this->any())
--            ->method('setProductOption')
--            ->with($productOption)
--            ->willReturnSelf();
--
--        return $orderItemMock;
--    }
--
--    /**
--     * @return \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected function getProductOptionMock()
--    {
--        $productOption = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductOptionInterface::class)
--            ->getMockForAbstractClass();
--        $productOption->expects($this->any())
--            ->method('getExtensionAttributes')
--            ->willReturn(null);
--
--        $this->productOptionFactory->expects($this->any())
--            ->method('create')
--            ->willReturn($productOption);
--
--        return $productOption;
--    }
--
--    protected function getProductOptionExtensionMock()
--    {
--        $productOptionExtension = $this->getMockBuilder(
--            \Magento\Catalog\Api\Data\ProductOptionExtensionInterface::class
--        )
--            ->setMethods([
--                'setData',
--            ])
--            ->getMockForAbstractClass();
--        $productOptionExtension->expects($this->any())
--            ->method('setData')
--            ->with(key($this->productOptionData), current($this->productOptionData))
--            ->willReturnSelf();
--
--        $this->extensionFactory->expects($this->any())
--            ->method('create')
--            ->willReturn($productOptionExtension);
--    }
--}
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php
-index 95966b13809..e9bda299008 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php
-@@ -122,14 +122,20 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testCreate()
-+    /**
-+     * @return void
-+     */
-+    public function testCreate(): void
-     {
-         $expected = "expect";
-         $this->metaData->expects($this->once())->method('getNewInstance')->willReturn($expected);
-         $this->assertEquals($expected, $this->repository->create());
-     }
- 
--    public function testSave()
-+    /**
-+     * @return void
-+     */
-+    public function testSave(): void
-     {
-         $transactionId = 12;
-         $transaction = $this->mockTransaction($transactionId);
-@@ -142,7 +148,10 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($transaction, $this->repository->save($transaction));
-     }
- 
--    public function testDelete()
-+    /**
-+     * @return void
-+     */
-+    public function testDelete(): void
-     {
-         $transactionId = 12;
-         $transaction = $this->mockTransaction($transactionId);
-@@ -152,7 +161,10 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertTrue($this->repository->delete($transaction));
-     }
- 
--    public function testGet()
-+    /**
-+     * @return void
-+     */
-+    public function testGet(): void
-     {
-         $transactionId = 12;
-         $transaction = $this->mockTransaction($transactionId);
-@@ -165,22 +177,24 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * @return void
-      * @expectedException \Magento\Framework\Exception\InputException
-      * @throws \Magento\Framework\Exception\InputException
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
--    public function testGetException()
-+    public function testGetException(): void
-     {
-         $transactionId = null;
-         $this->repository->get($transactionId);
-     }
- 
-     /**
-+     * @return void
-      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-      * @throws \Magento\Framework\Exception\InputException
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
--    public function testGetNoSuchEntity()
-+    public function testGetNoSuchEntity(): void
-     {
-         $transactionId = null;
-         $transactionIdFromArgument = 12;
-@@ -193,7 +207,10 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($transaction, $this->repository->get(12));
-     }
- 
--    public function testGetExistInStorage()
-+    /**
-+     * @return void
-+     */
-+    public function testGetExistInStorage(): void
-     {
-         $transactionId = 12;
-         $transaction = "transaction";
-@@ -206,7 +223,10 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($transaction, $this->repository->get($transactionId));
-     }
- 
--    public function testGetList()
-+    /**
-+     * @return void
-+     */
-+    public function testGetList(): void
-     {
-         $this->initListMock();
-         $this->collectionProcessor->expects($this->once())
-@@ -215,7 +235,10 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($this->collection, $this->repository->getList($this->searchCriteria));
-     }
- 
--    public function testGetByTransactionId()
-+    /**
-+     * @return void
-+     */
-+    public function testGetByTransactionId(): void
-     {
-         $transactionId = "100-refund";
-         $paymentId = 1;
-@@ -241,7 +264,10 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($transaction, $this->repository->getByTransactionId($transactionId, $paymentId, $orderId));
-     }
- 
--    public function testGetByTransactionIdNotFound()
-+    /**
-+     * @return void
-+     */
-+    public function testGetByTransactionIdNotFound(): void
-     {
-         $transactionId = "100-refund";
-         $paymentId = 1;
-@@ -267,7 +293,10 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testGetByTransactionIdFromStorage()
-+    /**
-+     * @return void
-+     */
-+    public function testGetByTransactionIdFromStorage(): void
-     {
-         $transactionId = "100-refund";
-         $paymentId = 1;
-@@ -284,11 +313,13 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testGetByTransactionType()
-+    /**
-+     * @return void
-+     */
-+    public function testGetByTransactionType(): void
-     {
-         $transactionType = Transaction::TYPE_AUTH;
-         $paymentId = 1;
--        $orderId = 3;
-         $cacheStorage = 'txn_type';
-         $identityFieldsForCache = [$transactionType, $paymentId];
-         $this->entityStorage->expects($this->once())
-@@ -341,15 +372,17 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-             ->with($transaction, $identityFieldsForCache, $cacheStorage);
-         $this->assertEquals(
-             $transaction,
--            $this->repository->getByTransactionType($transactionType, $paymentId, $orderId)
-+            $this->repository->getByTransactionType($transactionType, $paymentId)
-         );
-     }
- 
--    public function testGetByTransactionTypeFromCache()
-+    /**
-+     * @return void
-+     */
-+    public function testGetByTransactionTypeFromCache(): void
-     {
-         $transactionType = Transaction::TYPE_AUTH;
-         $paymentId = 1;
--        $orderId = 3;
-         $cacheStorage = 'txn_type';
-         $transaction = "transaction";
-         $identityFieldsForCache = [$transactionType, $paymentId];
-@@ -358,7 +391,7 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-             ->willReturn($transaction);
-         $this->assertEquals(
-             $transaction,
--            $this->repository->getByTransactionType($transactionType, $paymentId, $orderId)
-+            $this->repository->getByTransactionType($transactionType, $paymentId)
-         );
-     }
- 
-@@ -379,7 +412,7 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @return void
-      */
--    protected function initListMock()
-+    protected function initListMock(): void
-     {
-         $this->searchResultFactory->method('create')->willReturn($this->collection);
-         $this->collection->expects($this->once())->method('addPaymentInformation')->with(['method']);
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
-index 30b584b8c4e..9d0f10a30e6 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Sales\Test\Unit\Model\Order;
- 
- use Magento\Framework\Model\Context;
-@@ -1526,7 +1527,7 @@ class PaymentTest extends \PHPUnit\Framework\TestCase
-         $this->orderStateResolver->expects($this->once())->method('getStateForOrder')
-             ->with($this->order)
-             ->willReturn(Order::STATE_CLOSED);
--        $this->mockGetDefaultStatus(Order::STATE_CLOSED, $status);
-+        $this->mockGetDefaultStatus(Order::STATE_CLOSED, $status, ['first, second']);
-         $this->assertOrderUpdated(Order::STATE_PROCESSING, $status, $message);
- 
-         static::assertSame($this->payment, $this->payment->refund($this->creditMemoMock));
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Plugin/ShippingLabelConverterTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Plugin/ShippingLabelConverterTest.php
-new file mode 100644
-index 00000000000..24253aa0fd3
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Plugin/ShippingLabelConverterTest.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Test\Unit\Model\Order\Shipment\Plugin;
-+
-+/**
-+ * Unit test for plugin to convert shipping label from blob to base64encoded string
-+ */
-+class ShippingLabelConverterTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Sales\Plugin\ShippingLabelConverter
-+     */
-+    private $model;
-+
-+    /**
-+     * @var \Magento\Sales\Api\Data\ShipmentInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $shipmentMock;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->model = new \Magento\Sales\Plugin\ShippingLabelConverter();
-+
-+        $shippingLabel = 'shipping_label_test';
-+        $shippingLabelEncoded = base64_encode('shipping_label_test');
-+        $this->shipmentMock = $this->getMockBuilder(\Magento\Sales\Api\Data\ShipmentInterface::class)
-+            ->disableOriginalConstructor()->getMock();
-+        $this->shipmentMock->expects($this->exactly(2))->method('getShippingLabel')->willReturn($shippingLabel);
-+        $this->shipmentMock->expects($this->once())
-+            ->method('setShippingLabel')
-+            ->with($shippingLabelEncoded)
-+            ->willReturnSelf();
-+    }
-+
-+    /**
-+     * @covers \Magento\Sales\Plugin\ShippingLabelConverter::afterGet()
-+     */
-+    public function testAfterGet()
-+    {
-+        $this->model->afterGet(
-+            $this->getMockBuilder(\Magento\Sales\Api\ShipmentRepositoryInterface::class)
-+                ->disableOriginalConstructor()->getMock(),
-+            $this->shipmentMock
-+        );
-+    }
-+
-+    /**
-+     * @covers \Magento\Sales\Plugin\ShippingLabelConverter::afterGetList()
-+     */
-+    public function testAfterGetList()
-+    {
-+        $searchResultMock = $this->getMockBuilder(\Magento\Sales\Api\Data\ShipmentSearchResultInterface::class)
-+            ->disableOriginalConstructor()->getMock();
-+        $searchResultMock->expects($this->once())->method('getItems')->willReturn([$this->shipmentMock]);
-+
-+        $this->model->afterGetList(
-+            $this->getMockBuilder(\Magento\Sales\Api\ShipmentRepositoryInterface::class)
-+                ->disableOriginalConstructor()->getMock(),
-+            $searchResultMock
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
-index 94347e8b32d..391e99ba6f8 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
-@@ -249,7 +249,7 @@ class EmailSenderTest extends \PHPUnit\Framework\TestCase
- 
-         $this->shipmentMock->expects($this->once())
-             ->method('setSendEmail')
--            ->with(true);
-+            ->with($emailSendingResult);
- 
-         if (!$configValue || $forceSyncMode) {
-             $transport = [
-@@ -279,7 +279,7 @@ class EmailSenderTest extends \PHPUnit\Framework\TestCase
-                 ->method('setTemplateVars')
-                 ->with($transport->getData());
- 
--            $this->identityContainerMock->expects($this->once())
-+            $this->identityContainerMock->expects($this->exactly(2))
-                 ->method('isEnabled')
-                 ->willReturn($emailSendingResult);
- 
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php
-index bf9b3a67f96..f17d18c3be1 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php
-@@ -16,6 +16,7 @@ use Magento\Sales\Api\Data\ShipmentInterface;
- use Magento\Sales\Model\Order\Shipment\TrackFactory;
- use Magento\Sales\Model\Order\Shipment\Track;
- use Magento\Framework\EntityManager\HydratorInterface;
-+use Magento\Sales\Model\Order\ShipmentDocumentFactory\ExtensionAttributesProcessor;
- 
- /**
-  * Class ShipmentDocumentFactoryTest
-@@ -68,6 +69,11 @@ class ShipmentDocumentFactoryTest extends \PHPUnit\Framework\TestCase
-      */
-     private $hydratorMock;
- 
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject|ExtensionAttributesProcessor
-+     */
-+    private $extensionAttributeProcessorMock;
-+
-     /**
-      * @var \PHPUnit_Framework_MockObject_MockObject|Track
-      */
-@@ -113,10 +119,15 @@ class ShipmentDocumentFactoryTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
- 
-+        $this->extensionAttributeProcessorMock = $this->getMockBuilder(ExtensionAttributesProcessor::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-         $this->shipmentDocumentFactory = new ShipmentDocumentFactory(
-             $this->shipmentFactoryMock,
-             $this->hydratorPoolMock,
--            $this->trackFactoryMock
-+            $this->trackFactoryMock,
-+            $this->extensionAttributeProcessorMock
-         );
-     }
- 
-@@ -129,6 +140,7 @@ class ShipmentDocumentFactoryTest extends \PHPUnit\Framework\TestCase
-         $packages = [];
-         $items = [1 => 10];
- 
-+        $this->extensionAttributeProcessorMock->expects($this->never())->method('execute');
-         $this->itemMock->expects($this->once())->method('getOrderItemId')->willReturn(1);
-         $this->itemMock->expects($this->once())->method('getQty')->willReturn(10);
-         $this->itemMock->expects($this->once())
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
-index 3df667094f2..7f0c0639d21 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
-@@ -9,6 +9,8 @@ use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Sales\Api\Data\OrderInterface;
- use Magento\Sales\Api\Data\OrderSearchResultInterfaceFactory as SearchResultFactory;
- use Magento\Sales\Model\ResourceModel\Metadata;
-+use Magento\Tax\Api\OrderTaxManagementInterface;
-+use Magento\Payment\Api\Data\PaymentAdditionalInfoInterfaceFactory;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -40,8 +42,20 @@ class OrderRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     private $collectionProcessor;
- 
-+    /**
-+     * @var OrderTaxManagementInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $orderTaxManagementMock;
-+
-+    /**
-+     * @var PaymentAdditionalInfoInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $paymentAdditionalInfoFactory;
-+
-     /**
-      * Setup the test
-+     *
-+     * @return void
-      */
-     protected function setUp()
-     {
-@@ -58,34 +72,67 @@ class OrderRepositoryTest extends \PHPUnit\Framework\TestCase
-         $orderExtensionFactoryMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderExtensionFactory::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $this->orderTaxManagementMock = $this->getMockBuilder(OrderTaxManagementInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+        $this->paymentAdditionalInfoFactory = $this->getMockBuilder(PaymentAdditionalInfoInterfaceFactory::class)
-+            ->disableOriginalConstructor()->setMethods(['create'])->getMockForAbstractClass();
-         $this->orderRepository = $this->objectManager->getObject(
-             \Magento\Sales\Model\OrderRepository::class,
-             [
-                 'metadata' => $this->metadata,
-                 'searchResultFactory' => $this->searchResultFactory,
-                 'collectionProcessor' => $this->collectionProcessor,
--                'orderExtensionFactory' => $orderExtensionFactoryMock
-+                'orderExtensionFactory' => $orderExtensionFactoryMock,
-+                'orderTaxManagement' => $this->orderTaxManagementMock,
-+                'paymentAdditionalInfoFactory' => $this->paymentAdditionalInfoFactory
-             ]
-         );
-     }
- 
-+    /**
-+     * Test for method getList.
-+     *
-+     * @return void
-+     */
-     public function testGetList()
-     {
-         $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
-         $collectionMock = $this->createMock(\Magento\Sales\Model\ResourceModel\Order\Collection::class);
--        $itemsMock = $this->getMockBuilder(OrderInterface::class)->disableOriginalConstructor()->getMock();
-+        $itemsMock = $this->getMockBuilder(OrderInterface::class)->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+        $orderTaxDetailsMock = $this->getMockBuilder(\Magento\Tax\Api\Data\OrderTaxDetailsInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getAppliedTaxes', 'getItems'])->getMockForAbstractClass();
-+        $paymentMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderPaymentInterface::class)
-+            ->disableOriginalConstructor()->getMockForAbstractClass();
-+        $paymentAdditionalInfo = $this->getMockBuilder(\Magento\Payment\Api\Data\PaymentAdditionalInfoInterface::class)
-+            ->disableOriginalConstructor()->setMethods(['setKey', 'setValue'])->getMockForAbstractClass();
- 
-         $extensionAttributes = $this->createPartialMock(
-             \Magento\Sales\Api\Data\OrderExtension::class,
--            ['getShippingAssignments']
-+            [
-+                'getShippingAssignments', 'setShippingAssignments', 'setConvertingFromQuote',
-+                'setAppliedTaxes', 'setItemAppliedTaxes', 'setPaymentAdditionalInfo'
-+            ]
-         );
-         $shippingAssignmentBuilder = $this->createMock(
-             \Magento\Sales\Model\Order\ShippingAssignmentBuilder::class
-         );
-+        $itemsMock->expects($this->atLeastOnce())->method('getEntityId')->willReturn(1);
-         $this->collectionProcessor->expects($this->once())
-             ->method('process')
-             ->with($searchCriteriaMock, $collectionMock);
--        $itemsMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttributes);
-+        $itemsMock->expects($this->atLeastOnce())->method('getExtensionAttributes')->willReturn($extensionAttributes);
-+        $itemsMock->expects($this->atleastOnce())->method('getPayment')->willReturn($paymentMock);
-+        $paymentMock->expects($this->atLeastOnce())->method('getAdditionalInformation')
-+            ->willReturn(['method' => 'checkmo']);
-+        $this->paymentAdditionalInfoFactory->expects($this->atLeastOnce())->method('create')
-+            ->willReturn($paymentAdditionalInfo);
-+        $paymentAdditionalInfo->expects($this->atLeastOnce())->method('setKey')->willReturnSelf();
-+        $paymentAdditionalInfo->expects($this->atLeastOnce())->method('setValue')->willReturnSelf();
-+        $this->orderTaxManagementMock->expects($this->atLeastOnce())->method('getOrderTaxDetails')
-+            ->willReturn($orderTaxDetailsMock);
-         $extensionAttributes->expects($this->any())
-             ->method('getShippingAssignments')
-             ->willReturn($shippingAssignmentBuilder);
-@@ -96,6 +143,11 @@ class OrderRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($collectionMock, $this->orderRepository->getList($searchCriteriaMock));
-     }
- 
-+    /**
-+     * Test for method save.
-+     *
-+     * @return void
-+     */
-     public function testSave()
-     {
-         $mapperMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order::class)
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
-index 7f636334687..705d2face23 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
-@@ -11,12 +11,19 @@ use Magento\Framework\Locale\ResolverInterface;
- use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
- use Magento\Sales\Api\Data\OrderInterface;
- use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\ResourceModel\Order\Item\Collection;
- use Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory as HistoryCollectionFactory;
-+use Magento\Sales\Api\OrderItemRepositoryInterface;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Api\SearchCriteria;
-+use Magento\Sales\Api\Data\OrderItemSearchResultInterface;
- 
- /**
-  * Test class for \Magento\Sales\Model\Order
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
-+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
-  */
- class OrderTest extends \PHPUnit\Framework\TestCase
- {
-@@ -85,6 +92,16 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-      */
-     private $timezone;
- 
-+    /**
-+     * @var OrderItemRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $itemRepository;
-+
-+    /**
-+     * @var SearchCriteriaBuilder|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $searchCriteriaBuilder;
-+
-     protected function setUp()
-     {
-         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-@@ -114,7 +131,7 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-                 'getParentItemId',
-                 'getQuoteItemId',
-                 'getLockedDoInvoice',
--                'getProductId'
-+                'getProductId',
-             ]);
-         $this->salesOrderCollectionMock = $this->getMockBuilder(
-             \Magento\Sales\Model\ResourceModel\Order\Collection::class
-@@ -142,6 +159,15 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-         $this->eventManager = $this->createMock(\Magento\Framework\Event\Manager::class);
-         $context = $this->createPartialMock(\Magento\Framework\Model\Context::class, ['getEventDispatcher']);
-         $context->expects($this->any())->method('getEventDispatcher')->willReturn($this->eventManager);
-+
-+        $this->itemRepository = $this->getMockBuilder(OrderItemRepositoryInterface::class)
-+            ->setMethods(['getList'])
-+            ->disableOriginalConstructor()->getMockForAbstractClass();
-+
-+        $this->searchCriteriaBuilder = $this->getMockBuilder(SearchCriteriaBuilder::class)
-+            ->setMethods(['addFilter', 'create'])
-+            ->disableOriginalConstructor()->getMockForAbstractClass();
-+
-         $this->order = $helper->getObject(
-             \Magento\Sales\Model\Order::class,
-             [
-@@ -155,37 +181,80 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-                 'productListFactory' => $this->productCollectionFactoryMock,
-                 'localeResolver' => $this->localeResolver,
-                 'timezone' => $this->timezone,
-+                'itemRepository' => $this->itemRepository,
-+                'searchCriteriaBuilder' => $this->searchCriteriaBuilder
-             ]
-         );
-     }
- 
--    public function testGetItemById()
-+    /**
-+     * Test testGetItems method.
-+     */
-+    public function testGetItems()
-     {
--        $realOrderItemId = 1;
--        $fakeOrderItemId = 2;
-+        $orderItems = [$this->item];
- 
--        $orderItem = $this->createMock(\Magento\Sales\Model\Order\Item::class);
-+        $this->searchCriteriaBuilder->expects($this->once())->method('addFilter')->willReturnSelf();
-+
-+        $searchCriteria = $this->getMockBuilder(SearchCriteria::class)
-+            ->disableOriginalConstructor()->getMockForAbstractClass();
-+        $this->searchCriteriaBuilder->expects($this->once())->method('create')->willReturn($searchCriteria);
-+
-+        $itemsCollection = $this->getMockBuilder(OrderItemSearchResultInterface::class)
-+            ->setMethods(['getItems'])
-+            ->disableOriginalConstructor()->getMockForAbstractClass();
-+        $itemsCollection->expects($this->once())->method('getItems')->willReturn($orderItems);
-+        $this->itemRepository->expects($this->once())->method('getList')->willReturn($itemsCollection);
-+
-+        $this->assertEquals($orderItems, $this->order->getItems());
-+    }
- 
-+    /**
-+     * Prepare order item mock.
-+     *
-+     * @param int $orderId
-+     * @return void
-+     */
-+    private function prepareOrderItem(int $orderId = 0)
-+    {
-         $this->order->setData(
-             \Magento\Sales\Api\Data\OrderInterface::ITEMS,
-             [
--                $realOrderItemId => $orderItem
-+                $orderId => $this->item
-             ]
-         );
-+    }
- 
--        $this->assertEquals($orderItem, $this->order->getItemById($realOrderItemId));
-+    /**
-+     * Test GetItemById method.
-+     *
-+     * @return void
-+     */
-+    public function testGetItemById()
-+    {
-+        $realOrderItemId = 1;
-+        $fakeOrderItemId = 2;
-+
-+        $this->prepareOrderItem($realOrderItemId);
-+
-+        $this->assertEquals($this->item, $this->order->getItemById($realOrderItemId));
-         $this->assertEquals(null, $this->order->getItemById($fakeOrderItemId));
-     }
- 
-     /**
-+     * Test GetItemByQuoteItemId method.
-+     *
-      * @param int|null $gettingQuoteItemId
-      * @param int|null $quoteItemId
-      * @param string|null $result
-      *
-      * @dataProvider dataProviderGetItemByQuoteItemId
-+     * @return void
-      */
-     public function testGetItemByQuoteItemId($gettingQuoteItemId, $quoteItemId, $result)
-     {
-+        $this->prepareOrderItem();
-+
-         $this->item->expects($this->any())
-             ->method('getQuoteItemId')
-             ->willReturn($gettingQuoteItemId);
-@@ -210,14 +279,19 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test getAllVisibleItems method.
-+     *
-      * @param bool $isDeleted
-      * @param int|null $parentItemId
-      * @param array $result
-      *
-      * @dataProvider dataProviderGetAllVisibleItems
-+     * @return void
-      */
-     public function testGetAllVisibleItems($isDeleted, $parentItemId, array $result)
-     {
-+        $this->prepareOrderItem();
-+
-         $this->item->expects($this->once())
-             ->method('isDeleted')
-             ->willReturn($isDeleted);
-@@ -261,8 +335,15 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-         $this->assertFalse($this->order->canCancel());
-     }
- 
-+    /**
-+     * Test CanInvoice method.
-+     *
-+     * @return void
-+     */
-     public function testCanInvoice()
-     {
-+        $this->prepareOrderItem();
-+
-         $this->item->expects($this->any())
-             ->method('getQtyToInvoice')
-             ->willReturn(42);
-@@ -302,8 +383,15 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-         $this->assertFalse($this->order->canInvoice());
-     }
- 
-+    /**
-+     * Test CanNotInvoice method when invoice is locked.
-+     *
-+     * @return void
-+     */
-     public function testCanNotInvoiceWhenLockedInvoice()
-     {
-+        $this->prepareOrderItem();
-+
-         $this->item->expects($this->any())
-             ->method('getQtyToInvoice')
-             ->willReturn(42);
-@@ -313,8 +401,15 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-         $this->assertFalse($this->order->canInvoice());
-     }
- 
-+    /**
-+     * Test CanNotInvoice method when didn't have qty to invoice.
-+     *
-+     * @return void
-+     */
-     public function testCanNotInvoiceWhenDidNotHaveQtyToInvoice()
-     {
-+        $this->prepareOrderItem();
-+
-         $this->item->expects($this->any())
-             ->method('getQtyToInvoice')
-             ->willReturn(0);
-@@ -327,6 +422,7 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-     public function testCanCreditMemo()
-     {
-         $totalPaid = 10;
-+        $this->prepareOrderItem();
-         $this->order->setTotalPaid($totalPaid);
-         $this->priceCurrency->expects($this->once())->method('round')->with($totalPaid)->willReturnArgument(0);
-         $this->assertTrue($this->order->canCreditmemo());
-@@ -335,6 +431,7 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-     public function testCanNotCreditMemoWithTotalNull()
-     {
-         $totalPaid = 0;
-+        $this->prepareOrderItem();
-         $this->order->setTotalPaid($totalPaid);
-         $this->priceCurrency->expects($this->once())->method('round')->with($totalPaid)->willReturnArgument(0);
-         $this->assertFalse($this->order->canCreditmemo());
-@@ -346,6 +443,7 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-         $adjustmentNegative = 10;
-         $totalRefunded = 90;
- 
-+        $this->prepareOrderItem();
-         $this->order->setTotalPaid($totalPaid);
-         $this->order->setTotalRefunded($totalRefunded);
-         $this->order->setAdjustmentNegative($adjustmentNegative);
-@@ -360,6 +458,7 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-         $adjustmentNegative = 9;
-         $totalRefunded = 90;
- 
-+        $this->prepareOrderItem();
-         $this->order->setTotalPaid($totalPaid);
-         $this->order->setTotalRefunded($totalRefunded);
-         $this->order->setAdjustmentNegative($adjustmentNegative);
-@@ -584,8 +683,15 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-         $this->assertFalse($this->order->canCancel());
-     }
- 
-+    /**
-+     * Test CanCancelAllInvoiced method.
-+     *
-+     * @return void
-+     */
-     public function testCanCancelAllInvoiced()
-     {
-+        $this->prepareOrderItem();
-+
-         $paymentMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Payment::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['isDeleted', 'canReviewPayment', 'canFetchTransactionInfo', '__wakeUp'])
-@@ -645,11 +751,16 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test CanCancelActionFlag method.
-+     *
-      * @param bool $cancelActionFlag
-      * @dataProvider dataProviderActionFlag
-+     * @return void
-      */
-     public function testCanCancelActionFlag($cancelActionFlag)
-     {
-+        $this->prepareOrderItem();
-+
-         $paymentMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Payment::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['isDeleted', 'canReviewPayment', 'canFetchTransactionInfo', '__wakeUp'])
-@@ -1082,9 +1193,6 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-         $this->order->getCreatedAtFormatted(\IntlDateFormatter::SHORT);
-     }
- 
--    /**
--     * @return array
--     */
-     public function notInvoicingStatesProvider()
-     {
-         return [
-@@ -1094,9 +1202,6 @@ class OrderTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
--    /**
--     * @return array
--     */
-     public function canNotCreditMemoStatesProvider()
-     {
-         return [
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/RefundOrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/RefundOrderTest.php
-index c95b56d81d6..1ffeaa053cc 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/RefundOrderTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/RefundOrderTest.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Sales\Test\Unit\Model;
- 
- use Magento\Framework\App\ResourceConnection;
-@@ -245,9 +246,9 @@ class RefundOrderTest extends \PHPUnit\Framework\TestCase
-             ->method('setState')
-             ->with(Order::STATE_CLOSED)
-             ->willReturnSelf();
--        $this->orderMock->expects($this->once())
--            ->method('getState')
--            ->willReturn(Order::STATE_CLOSED);
-+        $this->configMock->expects($this->once())
-+            ->method('getStateStatuses')
-+            ->willReturn(['first, second']);
-         $this->configMock->expects($this->once())
-             ->method('getStateDefaultStatus')
-             ->with(Order::STATE_CLOSED)
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
-index e120d613e32..99a411c43c2 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
-@@ -24,7 +24,9 @@ class StateTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
--        $this->orderMock = $this->createPartialMock(\Magento\Sales\Model\Order::class, [
-+        $this->orderMock = $this->createPartialMock(
-+            \Magento\Sales\Model\Order::class,
-+            [
-                 '__wakeup',
-                 'getId',
-                 'hasCustomerNoteNotify',
-@@ -35,13 +37,12 @@ class StateTest extends \PHPUnit\Framework\TestCase
-                 'canShip',
-                 'getBaseGrandTotal',
-                 'canCreditmemo',
--                'getState',
--                'setState',
-                 'getTotalRefunded',
-                 'hasForcedCanCreditmemo',
-                 'getIsInProcess',
-                 'getConfig',
--            ]);
-+            ]
-+        );
-         $this->orderMock->expects($this->any())
-             ->method('getConfig')
-             ->willReturnSelf();
-@@ -53,127 +54,88 @@ class StateTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * test check order - order without id
--     */
--    public function testCheckOrderEmpty()
--    {
--        $this->orderMock->expects($this->once())
--            ->method('getBaseGrandTotal')
--            ->willReturn(100);
--        $this->orderMock->expects($this->never())
--            ->method('setState');
--
--        $this->state->check($this->orderMock);
--    }
--
--    /**
--     * test check order - set state complete
-+     * @param bool $isCanceled
-+     * @param bool $canUnhold
-+     * @param bool $canInvoice
-+     * @param bool $canShip
-+     * @param int $callCanSkipNum
-+     * @param bool $canCreditmemo
-+     * @param int $callCanCreditmemoNum
-+     * @param string $currentState
-+     * @param string $expectedState
-+     * @param int $callSetStateNum
-+     * @dataProvider stateCheckDataProvider
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
--    public function testCheckSetStateComplete()
--    {
-+    public function testCheck(
-+        bool $canCreditmemo,
-+        int $callCanCreditmemoNum,
-+        bool $canShip,
-+        int $callCanSkipNum,
-+        string $currentState,
-+        string $expectedState = '',
-+        bool $isInProcess = false,
-+        int $callGetIsInProcessNum = 0,
-+        bool $isCanceled = false,
-+        bool $canUnhold = false,
-+        bool $canInvoice = false
-+    ) {
-+        $this->orderMock->setState($currentState);
-         $this->orderMock->expects($this->any())
--            ->method('getId')
--            ->will($this->returnValue(1));
--        $this->orderMock->expects($this->once())
-             ->method('isCanceled')
--            ->will($this->returnValue(false));
--        $this->orderMock->expects($this->once())
--            ->method('canUnhold')
--            ->will($this->returnValue(false));
--        $this->orderMock->expects($this->once())
--            ->method('canInvoice')
--            ->will($this->returnValue(false));
--        $this->orderMock->expects($this->once())
--            ->method('canShip')
--            ->will($this->returnValue(false));
--        $this->orderMock->expects($this->once())
--            ->method('getBaseGrandTotal')
--            ->will($this->returnValue(100));
--        $this->orderMock->expects($this->once())
--            ->method('canCreditmemo')
--            ->will($this->returnValue(true));
--        $this->orderMock->expects($this->exactly(2))
--            ->method('getState')
--            ->will($this->returnValue(Order::STATE_PROCESSING));
--        $this->orderMock->expects($this->once())
--            ->method('setState')
--            ->with(Order::STATE_COMPLETE)
--            ->will($this->returnSelf());
--        $this->assertEquals($this->state, $this->state->check($this->orderMock));
--    }
--
--    /**
--     * test check order - set state closed
--     */
--    public function testCheckSetStateClosed()
--    {
-+            ->willReturn($isCanceled);
-         $this->orderMock->expects($this->any())
--            ->method('getId')
--            ->will($this->returnValue(1));
--        $this->orderMock->expects($this->once())
--            ->method('isCanceled')
--            ->will($this->returnValue(false));
--        $this->orderMock->expects($this->once())
-             ->method('canUnhold')
--            ->will($this->returnValue(false));
--        $this->orderMock->expects($this->once())
-+            ->willReturn($canUnhold);
-+        $this->orderMock->expects($this->any())
-             ->method('canInvoice')
--            ->will($this->returnValue(false));
--        $this->orderMock->expects($this->once())
-+            ->willReturn($canInvoice);
-+        $this->orderMock->expects($this->exactly($callCanSkipNum))
-             ->method('canShip')
--            ->will($this->returnValue(false));
--        $this->orderMock->expects($this->once())
--            ->method('getBaseGrandTotal')
--            ->will($this->returnValue(100));
--        $this->orderMock->expects($this->once())
-+            ->willReturn($canShip);
-+        $this->orderMock->expects($this->exactly($callCanCreditmemoNum))
-             ->method('canCreditmemo')
--            ->will($this->returnValue(false));
--        $this->orderMock->expects($this->exactly(2))
--            ->method('getTotalRefunded')
--            ->will($this->returnValue(null));
--        $this->orderMock->expects($this->once())
--            ->method('hasForcedCanCreditmemo')
--            ->will($this->returnValue(true));
--        $this->orderMock->expects($this->exactly(2))
--            ->method('getState')
--            ->will($this->returnValue(Order::STATE_PROCESSING));
--        $this->orderMock->expects($this->once())
--            ->method('setState')
--            ->with(Order::STATE_CLOSED)
--            ->will($this->returnSelf());
--        $this->assertEquals($this->state, $this->state->check($this->orderMock));
-+            ->willReturn($canCreditmemo);
-+        $this->orderMock->expects($this->exactly($callGetIsInProcessNum))
-+            ->method('getIsInProcess')
-+            ->willReturn($isInProcess);
-+        $this->state->check($this->orderMock);
-+        $this->assertEquals($expectedState, $this->orderMock->getState());
-     }
- 
--    /**
--     * test check order - set state processing
--     */
--    public function testCheckSetStateProcessing()
-+    public function stateCheckDataProvider()
-     {
--        $this->orderMock->expects($this->any())
--            ->method('getId')
--            ->will($this->returnValue(1));
--        $this->orderMock->expects($this->once())
--            ->method('isCanceled')
--            ->will($this->returnValue(false));
--        $this->orderMock->expects($this->once())
--            ->method('canUnhold')
--            ->will($this->returnValue(false));
--        $this->orderMock->expects($this->once())
--            ->method('canInvoice')
--            ->will($this->returnValue(false));
--        $this->orderMock->expects($this->once())
--            ->method('canShip')
--            ->will($this->returnValue(true));
--        $this->orderMock->expects($this->once())
--            ->method('getState')
--            ->will($this->returnValue(Order::STATE_NEW));
--        $this->orderMock->expects($this->once())
--            ->method('getIsInProcess')
--            ->will($this->returnValue(true));
--        $this->orderMock->expects($this->once())
--            ->method('setState')
--            ->with(Order::STATE_PROCESSING)
--            ->will($this->returnSelf());
--        $this->assertEquals($this->state, $this->state->check($this->orderMock));
-+        return [
-+            'processing - !canCreditmemo!canShip -> closed' =>
-+                [false, 1, false, 1, Order::STATE_PROCESSING, Order::STATE_CLOSED],
-+            'complete - !canCreditmemo,!canShip -> closed' =>
-+                [false, 1, false, 1, Order::STATE_COMPLETE, Order::STATE_CLOSED],
-+            'processing - !canCreditmemo,canShip -> processing' =>
-+                [false, 1, true, 2, Order::STATE_PROCESSING, Order::STATE_PROCESSING],
-+            'complete - !canCreditmemo,canShip -> complete' =>
-+                [false, 1, true, 1, Order::STATE_COMPLETE, Order::STATE_COMPLETE],
-+            'processing - canCreditmemo,!canShip -> complete' =>
-+                [true, 1, false, 1, Order::STATE_PROCESSING, Order::STATE_COMPLETE],
-+            'complete - canCreditmemo,!canShip -> complete' =>
-+                [true, 1, false, 0, Order::STATE_COMPLETE, Order::STATE_COMPLETE],
-+            'processing - canCreditmemo, canShip -> processing' =>
-+                [true, 1, true, 1, Order::STATE_PROCESSING, Order::STATE_PROCESSING],
-+            'complete - canCreditmemo, canShip -> complete' =>
-+                [true, 1, true, 0, Order::STATE_COMPLETE, Order::STATE_COMPLETE],
-+            'new - canCreditmemo, canShip, IsInProcess -> processing' =>
-+                [true, 1, true, 1, Order::STATE_NEW, Order::STATE_PROCESSING, true, 1],
-+            'new - canCreditmemo, !canShip, IsInProcess -> processing' =>
-+                [true, 1, false, 1, Order::STATE_NEW, Order::STATE_COMPLETE, true, 1],
-+            'new - canCreditmemo, canShip, !IsInProcess -> new' =>
-+                [true, 0, true, 0, Order::STATE_NEW, Order::STATE_NEW, false, 1],
-+            'hold - canUnhold -> hold' =>
-+                [true, 0, true, 0, Order::STATE_HOLDED, Order::STATE_HOLDED, false, 0, false, true],
-+            'payment_review - canUnhold -> payment_review' =>
-+                [true, 0, true, 0, Order::STATE_PAYMENT_REVIEW, Order::STATE_PAYMENT_REVIEW, false, 0, false, true],
-+            'pending_payment - canUnhold -> pending_payment' =>
-+                [true, 0, true, 0, Order::STATE_PENDING_PAYMENT, Order::STATE_PENDING_PAYMENT, false, 0, false, true],
-+            'cancelled - isCanceled -> cancelled' =>
-+                [true, 0, true, 0, Order::STATE_HOLDED, Order::STATE_HOLDED, false, 0, true],
-+        ];
-     }
- }
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php
-index a7a615fb0f5..530306d77d3 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php
-@@ -3,145 +3,125 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Sales\Test\Unit\Model\ResourceModel\Order\Shipment;
- 
-+use Magento\Sales\Model\Order\Shipment;
-+use Magento\Sales\Model\Order\Shipment\Comment as CommentEntity;
-+use Magento\Sales\Model\Order\Shipment\Item as ItemEntity;
-+use Magento\Sales\Model\Order\Shipment\Track as TrackEntity;
-+use Magento\Sales\Model\ResourceModel\Order\Shipment\Comment;
-+use Magento\Sales\Model\ResourceModel\Order\Shipment\Item;
-+use Magento\Sales\Model\ResourceModel\Order\Shipment\Relation;
-+use Magento\Sales\Model\ResourceModel\Order\Shipment\Track;
-+use PHPUnit\Framework\MockObject\MockObject;
-+
- /**
-  * Class RelationTest
-  */
- class RelationTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Relation
-+     * @var Relation
-      */
--    protected $relationProcessor;
-+    private $relationProcessor;
- 
-     /**
--     * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Item|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Item|MockObject
-      */
--    protected $itemResourceMock;
-+    private $itemResource;
- 
-     /**
--     * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Track|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Track|MockObject
-      */
--    protected $trackResourceMock;
-+    private $trackResource;
- 
-     /**
--     * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Comment|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Comment|MockObject
-      */
--    protected $commentResourceMock;
-+    private $commentResource;
- 
-     /**
--     * @var \Magento\Sales\Model\Order\Shipment\Comment|\PHPUnit_Framework_MockObject_MockObject
-+     * @var CommentEntity|MockObject
-      */
--    protected $commentMock;
-+    private $comment;
- 
-     /**
--     * @var \Magento\Sales\Model\Order\Shipment\Track|\PHPUnit_Framework_MockObject_MockObject
-+     * @var TrackEntity|MockObject
-      */
--    protected $trackMock;
-+    private $track;
- 
-     /**
--     * @var \Magento\Sales\Model\Order\Shipment|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Shipment|MockObject
-      */
--    protected $shipmentMock;
-+    private $shipment;
- 
-     /**
--     * @var \Magento\Sales\Model\Order\Shipment\Item|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ItemEntity|MockObject
-      */
--    protected $itemMock;
-+    private $item;
- 
--    protected function setUp()
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-     {
--        $this->itemResourceMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Shipment\Item::class)
-+        $this->itemResource = $this->getMockBuilder(Item::class)
-             ->disableOriginalConstructor()
--            ->setMethods(
--                [
--                    'save'
--                ]
--            )
-             ->getMock();
--        $this->commentResourceMock = $this->getMockBuilder(
--            \Magento\Sales\Model\ResourceModel\Order\Shipment\Comment::class
--        )
-+        $this->commentResource = $this->getMockBuilder(Comment::class)
-             ->disableOriginalConstructor()
--            ->setMethods(
--                [
--                    'save'
--                ]
--            )
-             ->getMock();
--        $this->trackResourceMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Shipment\Track::class)
-+        $this->trackResource = $this->getMockBuilder(Track::class)
-             ->disableOriginalConstructor()
--            ->setMethods(
--                [
--                    'save'
--                ]
--            )
-             ->getMock();
--        $this->shipmentMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment::class)
-+        $this->shipment = $this->getMockBuilder(Shipment::class)
-             ->disableOriginalConstructor()
--            ->setMethods(
--                [
--                    'getId',
--                    'getItems',
--                    'getTracks',
--                    'getComments',
--                    'getTracksCollection',
--                ]
--            )
-             ->getMock();
--        $this->itemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
-+        $this->item = $this->getMockBuilder(ItemEntity::class)
-             ->disableOriginalConstructor()
--            ->setMethods(
--                [
--                    'setParentId'
--                ]
--            )
-             ->getMock();
--        $this->trackMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment\Track::class)
-+        $this->track = $this->getMockBuilder(TrackEntity::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->commentMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment::class)
-+        $this->comment = $this->getMockBuilder(Shipment::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->relationProcessor = new \Magento\Sales\Model\ResourceModel\Order\Shipment\Relation(
--            $this->itemResourceMock,
--            $this->trackResourceMock,
--            $this->commentResourceMock
-+        $this->relationProcessor = new Relation(
-+            $this->itemResource,
-+            $this->trackResource,
-+            $this->commentResource
-         );
-     }
- 
--    public function testProcessRelations()
-+    /**
-+     * Checks saving shipment relations.
-+     *
-+     * @throws \Exception
-+     */
-+    public function testProcessRelations(): void
-     {
--        $this->shipmentMock->expects($this->exactly(3))
--            ->method('getId')
-+        $this->shipment->method('getId')
-             ->willReturn('shipment-id-value');
--        $this->shipmentMock->expects($this->exactly(2))
--            ->method('getItems')
--            ->willReturn([$this->itemMock]);
--        $this->shipmentMock->expects($this->exactly(2))
--            ->method('getComments')
--            ->willReturn([$this->commentMock]);
--        $this->shipmentMock->expects($this->exactly(2))
--            ->method('getTracksCollection')
--            ->willReturn([$this->trackMock]);
--        $this->itemMock->expects($this->once())
--            ->method('setParentId')
-+        $this->shipment->method('getItems')
-+            ->willReturn([$this->item]);
-+        $this->shipment->method('getComments')
-+            ->willReturn([$this->comment]);
-+        $this->shipment->method('getTracks')
-+            ->willReturn([$this->track]);
-+        $this->item->method('setParentId')
-             ->with('shipment-id-value')
-             ->willReturnSelf();
--        $this->itemResourceMock->expects($this->once())
--            ->method('save')
--            ->with($this->itemMock)
-+        $this->itemResource->method('save')
-+            ->with($this->item)
-             ->willReturnSelf();
--        $this->commentResourceMock->expects($this->once())
--            ->method('save')
--            ->with($this->commentMock)
-+        $this->commentResource->method('save')
-+            ->with($this->comment)
-             ->willReturnSelf();
--        $this->trackResourceMock->expects($this->once())
--            ->method('save')
--            ->with($this->trackMock)
-+        $this->trackResource->method('save')
-+            ->with($this->track)
-             ->willReturnSelf();
--        $this->relationProcessor->processRelation($this->shipmentMock);
-+        $this->relationProcessor->processRelation($this->shipment);
-     }
- }
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php b/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php
-index 2e668f0b0d6..be5b0bf7a4a 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php
-@@ -3,10 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Test\Unit\Model\Service;
- 
- use Magento\Sales\Model\Order;
- 
-+use Magento\Sales\Api\Data\CreditmemoInterface;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+
- /**
-  * Class CreditmemoServiceTest
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -14,34 +19,34 @@ use Magento\Sales\Model\Order;
- class CreditmemoServiceTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\Sales\Api\CreditmemoRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Sales\Api\CreditmemoRepositoryInterface|MockObject
-      */
-     protected $creditmemoRepositoryMock;
- 
-     /**
--     * @var \Magento\Sales\Api\CreditmemoCommentRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Sales\Api\CreditmemoCommentRepositoryInterface|MockObject
-      */
-     protected $creditmemoCommentRepositoryMock;
- 
-     /**
--     * @var \Magento\Framework\Api\SearchCriteriaBuilder|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Api\SearchCriteriaBuilder|MockObject
-      */
-     protected $searchCriteriaBuilderMock;
- 
-     /**
--     * @var \Magento\Framework\Api\FilterBuilder|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Api\FilterBuilder|MockObject
-      */
-     protected $filterBuilderMock;
- 
-     /**
--     * @var \Magento\Sales\Model\Order\CreditmemoNotifier|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Sales\Model\Order\CreditmemoNotifier|MockObject
-      */
-     protected $creditmemoNotifierMock;
- 
-     /**
--     * @var \Magento\Framework\Pricing\PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Pricing\PriceCurrencyInterface|MockObject
-      */
--    private $priceCurrencyMock;
-+    private $priceCurrency;
- 
-     /**
-      * @var \Magento\Sales\Model\Service\CreditmemoService
-@@ -79,7 +84,7 @@ class CreditmemoServiceTest extends \PHPUnit\Framework\TestCase
-             ['setField', 'setValue', 'setConditionType', 'create']
-         );
-         $this->creditmemoNotifierMock = $this->createMock(\Magento\Sales\Model\Order\CreditmemoNotifier::class);
--        $this->priceCurrencyMock = $this->getMockBuilder(\Magento\Framework\Pricing\PriceCurrencyInterface::class)
-+        $this->priceCurrency = $this->getMockBuilder(\Magento\Framework\Pricing\PriceCurrencyInterface::class)
-             ->getMockForAbstractClass();
-         $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- 
-@@ -91,7 +96,7 @@ class CreditmemoServiceTest extends \PHPUnit\Framework\TestCase
-                 'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
-                 'filterBuilder' => $this->filterBuilderMock,
-                 'creditmemoNotifier' => $this->creditmemoNotifierMock,
--                'priceCurrency' => $this->priceCurrencyMock,
-+                'priceCurrency' => $this->priceCurrency,
-             ]
-         );
-     }
-@@ -187,7 +192,7 @@ class CreditmemoServiceTest extends \PHPUnit\Framework\TestCase
-         $orderMock->expects($this->once())->method('getBaseTotalPaid')->willReturn(10);
-         $creditMemoMock->expects($this->once())->method('getBaseGrandTotal')->willReturn(10);
- 
--        $this->priceCurrencyMock->expects($this->any())
-+        $this->priceCurrency->expects($this->any())
-             ->method('round')
-             ->willReturnArgument(0);
- 
-@@ -259,7 +264,7 @@ class CreditmemoServiceTest extends \PHPUnit\Framework\TestCase
-         $orderMock->expects($this->once())->method('getBaseTotalPaid')->willReturn(10);
-         $creditMemoMock->expects($this->once())->method('getBaseGrandTotal')->willReturn(10);
- 
--        $this->priceCurrencyMock->expects($this->any())
-+        $this->priceCurrency->expects($this->any())
-             ->method('round')
-             ->willReturnArgument(0);
- 
-@@ -324,27 +329,37 @@ class CreditmemoServiceTest extends \PHPUnit\Framework\TestCase
-         $baseGrandTotal = 10;
-         $baseTotalRefunded = 9;
-         $baseTotalPaid = 10;
--        $creditMemoMock = $this->getMockBuilder(\Magento\Sales\Api\Data\CreditmemoInterface::class)
--            ->setMethods(['getId', 'getOrder', 'formatBasePrice'])
-+        /** @var CreditmemoInterface|MockObject $creditMemo */
-+        $creditMemo = $this->getMockBuilder(CreditmemoInterface::class)
-+            ->setMethods(['getId', 'getOrder'])
-             ->getMockForAbstractClass();
--        $creditMemoMock->expects($this->once())->method('getId')->willReturn(null);
--        $orderMock = $this->getMockBuilder(Order::class)->disableOriginalConstructor()->getMock();
--        $creditMemoMock->expects($this->atLeastOnce())->method('getOrder')->willReturn($orderMock);
--        $creditMemoMock->expects($this->once())->method('getBaseGrandTotal')->willReturn($baseGrandTotal);
--        $orderMock->expects($this->atLeastOnce())->method('getBaseTotalRefunded')->willReturn($baseTotalRefunded);
--        $this->priceCurrencyMock->expects($this->exactly(2))->method('round')->withConsecutive(
--            [$baseTotalRefunded + $baseGrandTotal],
--            [$baseTotalPaid]
--        )->willReturnOnConsecutiveCalls(
--            $baseTotalRefunded + $baseGrandTotal,
--            $baseTotalPaid
--        );
--        $orderMock->expects($this->atLeastOnce())->method('getBaseTotalPaid')->willReturn($baseTotalPaid);
-+        $creditMemo->method('getId')
-+            ->willReturn(null);
-+        /** @var Order|MockObject $order */
-+        $order = $this->getMockBuilder(Order::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $creditMemo->method('getOrder')
-+            ->willReturn($order);
-+        $creditMemo->method('getBaseGrandTotal')
-+            ->willReturn($baseGrandTotal);
-+        $order->method('getBaseTotalRefunded')
-+            ->willReturn($baseTotalRefunded);
-+        $this->priceCurrency->method('round')
-+            ->withConsecutive([$baseTotalRefunded + $baseGrandTotal], [$baseTotalPaid])
-+            ->willReturnOnConsecutiveCalls($baseTotalRefunded + $baseGrandTotal, $baseTotalPaid);
-+        $order->method('getBaseTotalPaid')
-+            ->willReturn($baseTotalPaid);
-         $baseAvailableRefund = $baseTotalPaid - $baseTotalRefunded;
--        $orderMock->expects($this->once())->method('formatBasePrice')->with(
--            $baseAvailableRefund
--        )->willReturn($baseAvailableRefund);
--        $this->creditmemoService->refund($creditMemoMock, true);
-+        $baseCurrency = $this->createMock(\Magento\Directory\Model\Currency::class);
-+        $baseCurrency->expects($this->once())
-+            ->method('formatTxt')
-+            ->with($baseAvailableRefund)
-+            ->willReturn($baseAvailableRefund);
-+        $order->expects($this->once())
-+            ->method('getBaseCurrency')
-+            ->willReturn($baseCurrency);
-+        $this->creditmemoService->refund($creditMemo, true);
-     }
- 
-     /**
-@@ -359,4 +374,56 @@ class CreditmemoServiceTest extends \PHPUnit\Framework\TestCase
-         $creditMemoMock->expects($this->once())->method('getId')->willReturn(444);
-         $this->creditmemoService->refund($creditMemoMock, true);
-     }
-+
-+    /**
-+     * @expectedExceptionMessage The most money available to refund is $1.00.
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function testMultiCurrencyRefundExpectsMoneyAvailableToReturn()
-+    {
-+        $baseGrandTotal = 10.00;
-+        $baseTotalRefunded = 9.00;
-+        $baseTotalPaid = 10;
-+        $grandTotal = 8.81;
-+        $totalRefunded = 7.929;
-+        $totalPaid = 8.81;
-+
-+        /** @var CreditmemoInterface|MockObject $creditMemo */
-+        $creditMemo = $this->getMockBuilder(CreditmemoInterface::class)
-+            ->setMethods(['getId', 'getOrder'])
-+            ->getMockForAbstractClass();
-+        $creditMemo->method('getId')
-+            ->willReturn(null);
-+        /** @var Order|MockObject $order */
-+        $order = $this->getMockBuilder(Order::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $creditMemo->method('getOrder')
-+            ->willReturn($order);
-+        $creditMemo->method('getBaseGrandTotal')
-+            ->willReturn($baseGrandTotal);
-+        $creditMemo->method('getGrandTotal')
-+            ->willReturn($grandTotal);
-+        $order->method('getBaseTotalRefunded')
-+            ->willReturn($baseTotalRefunded);
-+        $order->method('getTotalRefunded')
-+            ->willReturn($totalRefunded);
-+        $this->priceCurrency->method('round')
-+            ->withConsecutive([$baseTotalRefunded + $baseGrandTotal], [$baseTotalPaid])
-+            ->willReturnOnConsecutiveCalls($baseTotalRefunded + $baseGrandTotal, $baseTotalPaid);
-+        $order->method('getBaseTotalPaid')
-+            ->willReturn($baseTotalPaid);
-+        $order->method('getTotalPaid')
-+            ->willReturn($totalPaid);
-+        $baseAvailableRefund = $baseTotalPaid - $baseTotalRefunded;
-+        $baseCurrency = $this->createMock(\Magento\Directory\Model\Currency::class);
-+        $baseCurrency->expects($this->once())
-+            ->method('formatTxt')
-+            ->with($baseAvailableRefund)
-+            ->willReturn(sprintf('$%.2f', $baseAvailableRefund));
-+        $order->expects($this->once())
-+            ->method('getBaseCurrency')
-+            ->willReturn($baseCurrency);
-+        $this->creditmemoService->refund($creditMemo, true);
-+    }
- }
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/Service/OrderServiceTest.php b/app/code/Magento/Sales/Test/Unit/Model/Service/OrderServiceTest.php
-index 067f83d1e5b..72fe7380ce8 100644
---- a/app/code/Magento/Sales/Test/Unit/Model/Service/OrderServiceTest.php
-+++ b/app/code/Magento/Sales/Test/Unit/Model/Service/OrderServiceTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Sales\Test\Unit\Model\Service;
- 
-+use Magento\Sales\Api\PaymentFailuresInterface;
-+use Psr\Log\LoggerInterface;
-+
- /**
-  * Class OrderUnHoldTest
-  *
-@@ -140,6 +143,12 @@ class OrderServiceTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        /** @var PaymentFailuresInterface|\PHPUnit_Framework_MockObject_MockObject  $paymentFailures */
-+        $paymentFailures = $this->createMock(PaymentFailuresInterface::class);
-+
-+        /** @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject $logger */
-+        $logger = $this->createMock(LoggerInterface::class);
-+
-         $this->orderService = new \Magento\Sales\Model\Service\OrderService(
-             $this->orderRepositoryMock,
-             $this->orderStatusHistoryRepositoryMock,
-@@ -147,7 +156,9 @@ class OrderServiceTest extends \PHPUnit\Framework\TestCase
-             $this->filterBuilderMock,
-             $this->orderNotifierMock,
-             $this->eventManagerMock,
--            $this->orderCommentSender
-+            $this->orderCommentSender,
-+            $paymentFailures,
-+            $logger
-         );
-     }
- 
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultMergerTest.php b/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultMergerTest.php
-new file mode 100644
-index 00000000000..4236890a2a3
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultMergerTest.php
-@@ -0,0 +1,87 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Test\Unit\Model;
-+
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Sales\Model\ValidatorResultInterface;
-+use Magento\Sales\Model\ValidatorResultInterfaceFactory;
-+use Magento\Sales\Model\ValidatorResultMerger;
-+
-+/**
-+ * @covers \Magento\Sales\Model\ValidatorResultMerger
-+ */
-+class ValidatorResultMergerTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Testable Object
-+     *
-+     * @var ValidatorResultMerger
-+     */
-+    private $validatorResultMerger;
-+
-+    /**
-+     * Object Manager
-+     *
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var ValidatorResultInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $validatorResultFactoryMock;
-+
-+    /**
-+     * Set Up
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->validatorResultFactoryMock = $this->getMockBuilder(ValidatorResultInterfaceFactory::class)
-+        ->setMethods(['create'])->disableOriginalConstructor()->getMock();
-+        $this->objectManager = new ObjectManager($this);
-+        $this->validatorResultMerger = $this->objectManager->getObject(
-+            ValidatorResultMerger::class,
-+            [
-+                'validatorResultInterfaceFactory' => $this->validatorResultFactoryMock,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test merge method
-+     *
-+     * @return void
-+     */
-+    public function testMerge()
-+    {
-+        $validatorResultMock = $this->createMock(ValidatorResultInterface::class);
-+        $orderValidationResultMock = $this->createMock(ValidatorResultInterface::class);
-+        $creditmemoValidationResultMock = $this->createMock(ValidatorResultInterface::class);
-+        $itemsValidationMessages = [['test04', 'test05'], ['test06']];
-+        $this->validatorResultFactoryMock->expects($this->once())->method('create')
-+            ->willReturn($validatorResultMock);
-+        $orderValidationResultMock->expects($this->once())->method('getMessages')->willReturn(['test01', 'test02']);
-+        $creditmemoValidationResultMock->expects($this->once())->method('getMessages')->willReturn(['test03']);
-+
-+        $validatorResultMock->expects($this->at(0))->method('addMessage')->with('test01');
-+        $validatorResultMock->expects($this->at(1))->method('addMessage')->with('test02');
-+        $validatorResultMock->expects($this->at(2))->method('addMessage')->with('test03');
-+        $validatorResultMock->expects($this->at(3))->method('addMessage')->with('test04');
-+        $validatorResultMock->expects($this->at(4))->method('addMessage')->with('test05');
-+        $validatorResultMock->expects($this->at(5))->method('addMessage')->with('test06');
-+        $expected = $validatorResultMock;
-+        $actual = $this->validatorResultMerger->merge(
-+            $orderValidationResultMock,
-+            $creditmemoValidationResultMock,
-+            ...$itemsValidationMessages
-+        );
-+        $this->assertEquals($expected, $actual);
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultTest.php b/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultTest.php
-new file mode 100644
-index 00000000000..f4ab2d4f48e
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultTest.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Test\Unit\Model;
-+
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Sales\Model\ValidatorResult;
-+
-+/**
-+ * @covers \Magento\Sales\Model\ValidatorResult
-+ */
-+class ValidatorResultTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Testable Object
-+     *
-+     * @var ValidatorResult
-+     */
-+    private $validatorResult;
-+
-+    /**
-+     * Object Manager
-+     *
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * Set Up
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = new ObjectManager($this);
-+        $this->validatorResult = $this->objectManager->getObject(ValidatorResult::class);
-+    }
-+
-+    /**
-+     * Test addMessage method
-+     *
-+     * @return void
-+     */
-+    public function testAddMessages()
-+    {
-+        $messageFirst = 'Sample message 01.';
-+        $messageSecond = 'Sample messages 02.';
-+        $messageThird = 'Sample messages 03.';
-+        $expected = [$messageFirst, $messageSecond, $messageThird];
-+        $this->validatorResult->addMessage($messageFirst);
-+        $this->validatorResult->addMessage($messageSecond);
-+        $this->validatorResult->addMessage($messageThird);
-+        $actual = $this->validatorResult->getMessages();
-+        $this->assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test hasMessages method
-+     *
-+     * @return void
-+     */
-+    public function testHasMessages()
-+    {
-+        $this->assertFalse($this->validatorResult->hasMessages());
-+        $messageFirst = 'Sample message 01.';
-+        $messageSecond = 'Sample messages 02.';
-+        $this->validatorResult->addMessage($messageFirst);
-+        $this->validatorResult->addMessage($messageSecond);
-+        $this->assertTrue($this->validatorResult->hasMessages());
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Test/Unit/Model/ValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/ValidatorTest.php
-new file mode 100644
-index 00000000000..a334cf0e609
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Unit/Model/ValidatorTest.php
-@@ -0,0 +1,132 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Test\Unit\Model;
-+
-+use Magento\Framework\DataObject;
-+use Magento\Framework\Exception\ConfigurationMismatchException;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Model\Validator;
-+use Magento\Sales\Model\ValidatorInterface;
-+use Magento\Sales\Model\ValidatorResultInterface;
-+use Magento\Sales\Model\ValidatorResultInterfaceFactory;
-+
-+/**
-+ * @covers \Magento\Sales\Model\Validator
-+ */
-+class ValidatorTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Testable Object
-+     *
-+     * @var Validator
-+     */
-+    private $validator;
-+
-+    /**
-+     * Object Manager
-+     *
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $objectManagerMock;
-+
-+    /**
-+     * @var ValidatorResultInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $validatorResultFactoryMock;
-+
-+    /**
-+     * @var ValidatorResultInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $validatorResultMock;
-+
-+    /**
-+     * @var ValidatorInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $validatorMock;
-+
-+    /**
-+     * @var OrderInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $entityMock;
-+
-+    /**
-+     * Set Up
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
-+        $this->entityMock = $this->createMock(OrderInterface::class);
-+        $this->validatorMock = $this->createMock(ValidatorInterface::class);
-+        $this->validatorResultFactoryMock = $this->getMockBuilder(ValidatorResultInterfaceFactory::class)
-+            ->setMethods(['create'])->disableOriginalConstructor()->getMock();
-+        $this->validatorResultMock = $this->createMock(ValidatorResultInterface::class);
-+        $this->validatorResultFactoryMock->expects($this->any())->method('create')
-+            ->willReturn($this->validatorResultMock);
-+        $this->objectManager = new ObjectManager($this);
-+        $this->validator = $this->objectManager->getObject(
-+            Validator::class,
-+            [
-+                'objectManager' => $this->objectManagerMock,
-+                'validatorResult' => $this->validatorResultFactoryMock,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Test validate method
-+     *
-+     * @return void
-+     *
-+     * @throws ConfigurationMismatchException
-+     */
-+    public function testValidate()
-+    {
-+        $validatorName = 'test';
-+        $validators = [$validatorName];
-+        $context = new DataObject();
-+        $validatorArguments = ['context' => $context];
-+        $message = __('Sample message.');
-+        $messages = [$message];
-+
-+        $this->objectManagerMock->expects($this->once())->method('create')
-+            ->with($validatorName, $validatorArguments)->willReturn($this->validatorMock);
-+        $this->validatorMock->expects($this->once())->method('validate')->with($this->entityMock)
-+            ->willReturn($messages);
-+        $this->validatorResultMock->expects($this->once())->method('addMessage')->with($message);
-+
-+        $expected = $this->validatorResultMock;
-+        $actual = $this->validator->validate($this->entityMock, $validators, $context);
-+        $this->assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Test validate method
-+     *
-+     * @return void
-+     *
-+     * @throws ConfigurationMismatchException
-+     */
-+    public function testValidateWithException()
-+    {
-+        $validatorName = 'test';
-+        $validators = [$validatorName];
-+        $this->objectManagerMock->expects($this->once())->method('create')->willReturn(null);
-+        $this->validatorResultMock->expects($this->never())->method('addMessage');
-+        $this->expectException(ConfigurationMismatchException::class);
-+        $this->validator->validate($this->entityMock, $validators);
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php b/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php
-new file mode 100644
-index 00000000000..e919b45667f
---- /dev/null
-+++ b/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php
-@@ -0,0 +1,102 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Test\Unit\Observer;
-+
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Framework\Event;
-+use Magento\Framework\Event\Observer;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Observer\AssignOrderToCustomerObserver;
-+use PHPUnit\Framework\TestCase;
-+use PHPUnit_Framework_MockObject_MockObject;
-+
-+/**
-+ * Class AssignOrderToCustomerObserverTest
-+ */
-+class AssignOrderToCustomerObserverTest extends TestCase
-+{
-+    /** @var AssignOrderToCustomerObserver */
-+    protected $sut;
-+
-+    /** @var OrderRepositoryInterface|PHPUnit_Framework_MockObject_MockObject */
-+    protected $orderRepositoryMock;
-+
-+    /**
-+     * Set Up
-+     */
-+    protected function setUp()
-+    {
-+        $this->orderRepositoryMock = $this->getMockBuilder(OrderRepositoryInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->sut = new AssignOrderToCustomerObserver($this->orderRepositoryMock);
-+    }
-+
-+    /**
-+     * Test assigning order to customer after issuing guest order
-+     *
-+     * @dataProvider getCustomerIds
-+     * @param null|int $customerId
-+     * @return void
-+     */
-+    public function testAssignOrderToCustomerAfterGuestOrder($customerId)
-+    {
-+        $orderId = 1;
-+        /** @var Observer|PHPUnit_Framework_MockObject_MockObject $observerMock */
-+        $observerMock = $this->createMock(Observer::class);
-+        /** @var Event|PHPUnit_Framework_MockObject_MockObject $eventMock */
-+        $eventMock = $this->getMockBuilder(Event::class)->disableOriginalConstructor()
-+            ->setMethods(['getData'])
-+            ->getMock();
-+        /** @var CustomerInterface|PHPUnit_Framework_MockObject_MockObject $customerMock */
-+        $customerMock = $this->createMock(CustomerInterface::class);
-+        /** @var OrderInterface|PHPUnit_Framework_MockObject_MockObject $orderMock */
-+        $orderMock = $this->getMockBuilder(OrderInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+        $observerMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
-+        $eventMock->expects($this->any())->method('getData')
-+            ->willReturnMap([
-+                ['delegate_data', null, ['__sales_assign_order_id' => $orderId]],
-+                ['customer_data_object', null, $customerMock]
-+            ]);
-+        $orderMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
-+        $this->orderRepositoryMock->expects($this->once())->method('get')->with($orderId)
-+            ->willReturn($orderMock);
-+
-+        $orderMock->expects($this->once())->method('setCustomerId')->willReturn($orderMock);
-+        $orderMock->expects($this->once())->method('setCustomerIsGuest')->willReturn($orderMock);
-+        $orderMock->expects($this->once())->method('setCustomerEmail')->willReturn($orderMock);
-+        $orderMock->expects($this->once())->method('setCustomerFirstname')->willReturn($orderMock);
-+        $orderMock->expects($this->once())->method('setCustomerLastname')->willReturn($orderMock);
-+        $orderMock->expects($this->once())->method('setCustomerMiddlename')->willReturn($orderMock);
-+        $orderMock->expects($this->once())->method('setCustomerPrefix')->willReturn($orderMock);
-+        $orderMock->expects($this->once())->method('setCustomerSuffix')->willReturn($orderMock);
-+        $orderMock->expects($this->once())->method('setCustomerGroupId')->willReturn($orderMock);
-+
-+        if (!$customerId) {
-+            $this->orderRepositoryMock->expects($this->once())->method('save')->with($orderMock);
-+            $this->sut->execute($observerMock);
-+            return ;
-+        }
-+
-+        $this->orderRepositoryMock->expects($this->never())->method('save')->with($orderMock);
-+        $this->sut->execute($observerMock);
-+    }
-+
-+    /**
-+     * Customer id assigned to order
-+     *
-+     * @return array
-+     */
-+    public function getCustomerIds()
-+    {
-+        return [[null, 1]];
-+    }
-+}
-diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php
-index 2fd792fb4ae..48b8740d86f 100644
---- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php
-+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php
-@@ -44,7 +44,7 @@ class Status extends Column
-      * Prepare Data Source
-      *
-      * @param array $dataSource
--     * @return void
-+     * @return array
-      */
-     public function prepareDataSource(array $dataSource)
-     {
-diff --git a/app/code/Magento/Sales/ViewModel/Customer/AddressFormatter.php b/app/code/Magento/Sales/ViewModel/Customer/AddressFormatter.php
-new file mode 100644
-index 00000000000..333ab4066ac
---- /dev/null
-+++ b/app/code/Magento/Sales/ViewModel/Customer/AddressFormatter.php
-@@ -0,0 +1,132 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\ViewModel\Customer;
-+
-+use Magento\Framework\View\Element\Block\ArgumentInterface;
-+
-+/**
-+ * Customer address formatter
-+ */
-+class AddressFormatter implements ArgumentInterface
-+{
-+    /**
-+     * Customer form factory
-+     *
-+     * @var \Magento\Customer\Model\Metadata\FormFactory
-+     */
-+    private $customerFormFactory;
-+
-+    /**
-+     * Address format helper
-+     *
-+     * @var \Magento\Customer\Helper\Address
-+     */
-+    private $addressFormatHelper;
-+
-+    /**
-+     * Directory helper
-+     *
-+     * @var \Magento\Directory\Helper\Data
-+     */
-+    private $directoryHelper;
-+
-+    /**
-+     * Session quote
-+     *
-+     * @var \Magento\Backend\Model\Session\Quote
-+     */
-+    private $session;
-+
-+    /**
-+     * Json encoder
-+     *
-+     * @var \Magento\Framework\Serialize\Serializer\Json
-+     */
-+    private $jsonEncoder;
-+
-+    /**
-+     * Customer address
-+     *
-+     * @param \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory
-+     * @param \Magento\Customer\Helper\Address $addressFormatHelper
-+     * @param \Magento\Directory\Helper\Data $directoryHelper
-+     * @param \Magento\Backend\Model\Session\Quote $session
-+     * @param \Magento\Framework\Serialize\Serializer\Json $jsonEncoder
-+     */
-+    public function __construct(
-+        \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory,
-+        \Magento\Customer\Helper\Address $addressFormatHelper,
-+        \Magento\Directory\Helper\Data $directoryHelper,
-+        \Magento\Backend\Model\Session\Quote $session,
-+        \Magento\Framework\Serialize\Serializer\Json $jsonEncoder
-+    ) {
-+        $this->customerFormFactory = $customerFormFactory;
-+        $this->addressFormatHelper = $addressFormatHelper;
-+        $this->directoryHelper = $directoryHelper;
-+        $this->session = $session;
-+        $this->jsonEncoder = $jsonEncoder;
-+    }
-+
-+    /**
-+     * Return customer address array as JSON
-+     *
-+     * @param array $addressArray
-+     *
-+     * @return string
-+     */
-+    public function getAddressesJson(array $addressArray): string
-+    {
-+        $data = $this->getEmptyAddressForm();
-+        foreach ($addressArray as $addressId => $address) {
-+            $addressForm = $this->customerFormFactory->create(
-+                'customer_address',
-+                'adminhtml_customer_address',
-+                $address
-+            );
-+            $data[$addressId] = $addressForm->outputData(
-+                \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON
-+            );
-+        }
-+
-+        return $this->jsonEncoder->serialize($data);
-+    }
-+
-+    /**
-+     * Represent customer address in 'online' format.
-+     *
-+     * @param array $address
-+     * @return string
-+     */
-+    public function getAddressAsString(array $address): string
-+    {
-+        $formatTypeRenderer = $this->addressFormatHelper->getFormatTypeRenderer('oneline');
-+        $result = '';
-+        if ($formatTypeRenderer) {
-+            $result = $formatTypeRenderer->renderArray($address);
-+        }
-+
-+        return $result;
-+    }
-+
-+    /**
-+     * Return empty address address form
-+     *
-+     * @return array
-+     */
-+    private function getEmptyAddressForm(): array
-+    {
-+        $defaultCountryId = $this->directoryHelper->getDefaultCountry($this->session->getStore());
-+        $emptyAddressForm = $this->customerFormFactory->create(
-+            'customer_address',
-+            'adminhtml_customer_address',
-+            [\Magento\Customer\Api\Data\AddressInterface::COUNTRY_ID => $defaultCountryId]
-+        );
-+
-+        return [0 => $emptyAddressForm->outputData(\Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON)];
-+    }
-+}
-diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml
-index 9d6d11d56c8..e437918b683 100644
---- a/app/code/Magento/Sales/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Sales/etc/adminhtml/system.xml
-@@ -27,18 +27,23 @@
-                 <label>Checkout Totals Sort Order</label>
-                 <field id="discount" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Discount</label>
-+                    <validate>required-number validate-number</validate>
-                 </field>
-                 <field id="grand_total" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Grand Total</label>
-+                    <validate>required-number validate-number</validate>
-                 </field>
-                 <field id="shipping" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Shipping</label>
-+                    <validate>required-number validate-number</validate>
-                 </field>
-                 <field id="subtotal" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Subtotal</label>
-+                    <validate>required-number validate-number</validate>
-                 </field>
-                 <field id="tax" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Tax</label>
-+                    <validate>required-number validate-number</validate>
-                 </field>
-             </group>
-             <group id="reorder" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-@@ -48,6 +53,13 @@
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
-             </group>
-+            <group id="zerograndtotal_creditmemo" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <label>Allow Zero GrandTotal</label>
-+                <field id="allow_zero_grandtotal" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                    <label>Allow Zero GrandTotal for Creditmemo</label>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                </field>
-+            </group>
-             <group id="identity" translate="label" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Invoice and Packing Slip Design</label>
-                 <field id="logo" translate="label comment" type="image" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
-@@ -82,6 +94,11 @@
-                     <label>Minimum Amount</label>
-                     <comment>Subtotal after discount</comment>
-                 </field>
-+                <field id="include_discount_amount" translate="label" sortOrder="12" type="select" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                    <label>Include Discount Amount</label>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <comment>Choosing yes will be used subtotal after discount, otherwise only subtotal will be used</comment>
-+                </field>
-                 <field id="tax_including" translate="label" sortOrder="15" type="select" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Include Tax to Amount</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-@@ -132,6 +149,14 @@
-                     <source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
-                     <backend_model>Magento\Sales\Model\Config\Backend\Email\AsyncSending</backend_model>
-                 </field>
-+                <field id="sending_limit" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                    <label>Limit per cron run</label>
-+                    <comment>Limit how many entities (orders/shipments/etc) will be processed during one cron run.</comment>
-+                    <validate>required-number validate-number validate-greater-than-zero</validate>
-+                    <depends>
-+                        <field id="async_sending">1</field>
-+                    </depends>
-+                </field>
-             </group>
-             <group id="order" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Order</label>
-@@ -393,7 +418,7 @@
-             </group>
-         </section>
-         <section id="rss">
--            <group id="order" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
-+            <group id="order" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
-                 <label>Order</label>
-                 <field id="status" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                     <label>Customer Order Status Notification</label>
-@@ -402,7 +427,7 @@
-             </group>
-         </section>
-         <section id="dev">
--            <group id="grid" type="text" sortOrder="131" showInDefault="1" showInWebsite="0" showInStore="0">
-+            <group id="grid" translate="label" type="text" sortOrder="131" showInDefault="1" showInWebsite="0" showInStore="0">
-                 <label>Grid Settings</label>
-                 <field id="async_indexing" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Asynchronous indexing</label>
-diff --git a/app/code/Magento/Sales/etc/config.xml b/app/code/Magento/Sales/etc/config.xml
-index da240841613..2480da4ad21 100644
---- a/app/code/Magento/Sales/etc/config.xml
-+++ b/app/code/Magento/Sales/etc/config.xml
-@@ -18,7 +18,11 @@
-             <reorder>
-                 <allow>1</allow>
-             </reorder>
-+            <zerograndtotal_creditmemo>
-+                <allow_zero_grandtotal>1</allow_zero_grandtotal>
-+            </zerograndtotal_creditmemo>
-             <minimum_order>
-+                <include_discount_amount>1</include_discount_amount>
-                 <tax_including>1</tax_including>
-             </minimum_order>
-             <orders>
-@@ -29,6 +33,7 @@
-         <sales_email>
-             <general>
-                 <async_sending>0</async_sending>
-+                <sending_limit>50</sending_limit>
-             </general>
-             <order>
-                 <enabled>1</enabled>
-diff --git a/app/code/Magento/Sales/etc/db_schema.xml b/app/code/Magento/Sales/etc/db_schema.xml
-index 4b716e76109..82e6d5d10b5 100644
---- a/app/code/Magento/Sales/etc/db_schema.xml
-+++ b/app/code/Magento/Sales/etc/db_schema.xml
-@@ -22,119 +22,119 @@
-                 comment="Store Id"/>
-         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="Customer Id"/>
--        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Discount Amount"/>
--        <column xsi:type="decimal" name="base_discount_canceled" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_discount_canceled" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Discount Canceled"/>
--        <column xsi:type="decimal" name="base_discount_invoiced" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_discount_invoiced" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Discount Invoiced"/>
--        <column xsi:type="decimal" name="base_discount_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_discount_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Discount Refunded"/>
--        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Grand Total"/>
--        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Amount"/>
--        <column xsi:type="decimal" name="base_shipping_canceled" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_canceled" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Canceled"/>
--        <column xsi:type="decimal" name="base_shipping_invoiced" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_invoiced" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Invoiced"/>
--        <column xsi:type="decimal" name="base_shipping_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Refunded"/>
--        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Tax Amount"/>
--        <column xsi:type="decimal" name="base_shipping_tax_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_tax_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Tax Refunded"/>
--        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Subtotal"/>
--        <column xsi:type="decimal" name="base_subtotal_canceled" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_subtotal_canceled" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Subtotal Canceled"/>
--        <column xsi:type="decimal" name="base_subtotal_invoiced" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_subtotal_invoiced" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Subtotal Invoiced"/>
--        <column xsi:type="decimal" name="base_subtotal_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_subtotal_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Subtotal Refunded"/>
--        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Tax Amount"/>
--        <column xsi:type="decimal" name="base_tax_canceled" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tax_canceled" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Tax Canceled"/>
--        <column xsi:type="decimal" name="base_tax_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tax_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Tax Invoiced"/>
--        <column xsi:type="decimal" name="base_tax_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tax_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Tax Refunded"/>
--        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base To Global Rate"/>
--        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base To Order Rate"/>
--        <column xsi:type="decimal" name="base_total_canceled" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_total_canceled" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Total Canceled"/>
--        <column xsi:type="decimal" name="base_total_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_total_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Total Invoiced"/>
--        <column xsi:type="decimal" name="base_total_invoiced_cost" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_total_invoiced_cost" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Total Invoiced Cost"/>
--        <column xsi:type="decimal" name="base_total_offline_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_total_offline_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Total Offline Refunded"/>
--        <column xsi:type="decimal" name="base_total_online_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_total_online_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Total Online Refunded"/>
--        <column xsi:type="decimal" name="base_total_paid" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_total_paid" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Total Paid"/>
-         <column xsi:type="decimal" name="base_total_qty_ordered" scale="4" precision="12" unsigned="false"
-                 nullable="true" comment="Base Total Qty Ordered"/>
--        <column xsi:type="decimal" name="base_total_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_total_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Total Refunded"/>
--        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Discount Amount"/>
--        <column xsi:type="decimal" name="discount_canceled" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="discount_canceled" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Discount Canceled"/>
--        <column xsi:type="decimal" name="discount_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="discount_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Discount Invoiced"/>
--        <column xsi:type="decimal" name="discount_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="discount_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Discount Refunded"/>
--        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Grand Total"/>
--        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Amount"/>
--        <column xsi:type="decimal" name="shipping_canceled" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_canceled" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Canceled"/>
--        <column xsi:type="decimal" name="shipping_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Invoiced"/>
--        <column xsi:type="decimal" name="shipping_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Refunded"/>
--        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Tax Amount"/>
--        <column xsi:type="decimal" name="shipping_tax_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="shipping_tax_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Shipping Tax Refunded"/>
-         <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="12" unsigned="false" nullable="true"
-                 comment="Store To Base Rate"/>
-         <column xsi:type="decimal" name="store_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
-                 comment="Store To Order Rate"/>
--        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal"/>
--        <column xsi:type="decimal" name="subtotal_canceled" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal_canceled" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal Canceled"/>
--        <column xsi:type="decimal" name="subtotal_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal Invoiced"/>
--        <column xsi:type="decimal" name="subtotal_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal Refunded"/>
--        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Tax Amount"/>
--        <column xsi:type="decimal" name="tax_canceled" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tax_canceled" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Tax Canceled"/>
--        <column xsi:type="decimal" name="tax_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tax_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Tax Invoiced"/>
--        <column xsi:type="decimal" name="tax_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tax_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Tax Refunded"/>
--        <column xsi:type="decimal" name="total_canceled" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="total_canceled" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Total Canceled"/>
--        <column xsi:type="decimal" name="total_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="total_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Total Invoiced"/>
--        <column xsi:type="decimal" name="total_offline_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_offline_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Total Offline Refunded"/>
--        <column xsi:type="decimal" name="total_online_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_online_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Total Online Refunded"/>
--        <column xsi:type="decimal" name="total_paid" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="total_paid" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Total Paid"/>
-         <column xsi:type="decimal" name="total_qty_ordered" scale="4" precision="12" unsigned="false" nullable="true"
-                 comment="Total Qty Ordered"/>
--        <column xsi:type="decimal" name="total_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="total_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Total Refunded"/>
-         <column xsi:type="smallint" name="can_ship_partially" padding="5" unsigned="true" nullable="true"
-                 identity="false" comment="Can Ship Partially"/>
-@@ -163,27 +163,27 @@
-                 comment="Quote Id"/>
-         <column xsi:type="int" name="shipping_address_id" padding="11" unsigned="false" nullable="true" identity="false"
-                 comment="Shipping Address Id"/>
--        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Adjustment Negative"/>
--        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Adjustment Positive"/>
--        <column xsi:type="decimal" name="base_adjustment_negative" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_adjustment_negative" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Adjustment Negative"/>
--        <column xsi:type="decimal" name="base_adjustment_positive" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_adjustment_positive" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Adjustment Positive"/>
--        <column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Discount Amount"/>
--        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Subtotal Incl Tax"/>
--        <column xsi:type="decimal" name="base_total_due" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_total_due" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Total Due"/>
--        <column xsi:type="decimal" name="payment_authorization_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="payment_authorization_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Payment Authorization Amount"/>
--        <column xsi:type="decimal" name="shipping_discount_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="shipping_discount_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Shipping Discount Amount"/>
--        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal Incl Tax"/>
--        <column xsi:type="decimal" name="total_due" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="total_due" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Total Due"/>
-         <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="true"
-                 comment="Weight"/>
-@@ -219,7 +219,7 @@
-         <column xsi:type="varchar" name="remote_ip" nullable="true" length="45" comment="Remote Ip"/>
-         <column xsi:type="varchar" name="shipping_method" nullable="true" length="120"/>
-         <column xsi:type="varchar" name="store_currency_code" nullable="true" length="3" comment="Store Currency Code"/>
--        <column xsi:type="varchar" name="store_name" nullable="true" length="32" comment="Store Name"/>
-+        <column xsi:type="varchar" name="store_name" nullable="true" length="255" comment="Store Name"/>
-         <column xsi:type="varchar" name="x_forwarded_for" nullable="true" length="32" comment="X Forwarded For"/>
-         <column xsi:type="text" name="customer_note" nullable="true" comment="Customer Note"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-@@ -230,68 +230,68 @@
-                 identity="false" default="0" comment="Total Item Count"/>
-         <column xsi:type="int" name="customer_gender" padding="11" unsigned="false" nullable="true" identity="false"
-                 comment="Customer Gender"/>
--        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="12"
-+        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Shipping Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Shipping Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="discount_tax_compensation_invoiced" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="discount_tax_compensation_invoiced" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Discount Tax Compensation Invoiced"/>
--        <column xsi:type="decimal" name="base_discount_tax_compensation_invoiced" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_discount_tax_compensation_invoiced" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Invoiced"/>
--        <column xsi:type="decimal" name="discount_tax_compensation_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="discount_tax_compensation_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Discount Tax Compensation Refunded"/>
--        <column xsi:type="decimal" name="base_discount_tax_compensation_refunded" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_discount_tax_compensation_refunded" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Refunded"/>
--        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Incl Tax"/>
--        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Incl Tax"/>
-         <column xsi:type="varchar" name="coupon_rule_name" nullable="true" length="255"
-                 comment="Coupon Sales Rule Name"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_ORDER_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID" table="sales_order"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID" table="sales_order"
-                     column="customer_id" referenceTable="customer_entity" referenceColumn="entity_id"
-                     onDelete="SET NULL"/>
--        <constraint xsi:type="foreign" name="SALES_ORDER_STORE_ID_STORE_STORE_ID" table="sales_order" column="store_id"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_STORE_ID_STORE_STORE_ID" table="sales_order" column="store_id"
-                     referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="SALES_ORDER_INCREMENT_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_ORDER_INCREMENT_ID_STORE_ID">
-             <column name="increment_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="SALES_ORDER_STATUS" indexType="btree">
-+        <index referenceId="SALES_ORDER_STATUS" indexType="btree">
-             <column name="status"/>
-         </index>
--        <index name="SALES_ORDER_STATE" indexType="btree">
-+        <index referenceId="SALES_ORDER_STATE" indexType="btree">
-             <column name="state"/>
-         </index>
--        <index name="SALES_ORDER_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALES_ORDER_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_ORDER_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
--        <index name="SALES_ORDER_CUSTOMER_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_CUSTOMER_ID" indexType="btree">
-             <column name="customer_id"/>
-         </index>
--        <index name="SALES_ORDER_EXT_ORDER_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_EXT_ORDER_ID" indexType="btree">
-             <column name="ext_order_id"/>
-         </index>
--        <index name="SALES_ORDER_QUOTE_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_QUOTE_ID" indexType="btree">
-             <column name="quote_id"/>
-         </index>
--        <index name="SALES_ORDER_UPDATED_AT" indexType="btree">
-+        <index referenceId="SALES_ORDER_UPDATED_AT" indexType="btree">
-             <column name="updated_at"/>
-         </index>
--        <index name="SALES_ORDER_SEND_EMAIL" indexType="btree">
-+        <index referenceId="SALES_ORDER_SEND_EMAIL" indexType="btree">
-             <column name="send_email"/>
-         </index>
--        <index name="SALES_ORDER_EMAIL_SENT" indexType="btree">
-+        <index referenceId="SALES_ORDER_EMAIL_SENT" indexType="btree">
-             <column name="email_sent"/>
-         </index>
-     </table>
-@@ -304,13 +304,13 @@
-         <column xsi:type="varchar" name="store_name" nullable="true" length="255" comment="Store Name"/>
-         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="Customer Id"/>
--        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Grand Total"/>
--        <column xsi:type="decimal" name="base_total_paid" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_total_paid" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Total Paid"/>
--        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Grand Total"/>
--        <column xsi:type="decimal" name="total_paid" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="total_paid" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Total Paid"/>
-         <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
-         <column xsi:type="varchar" name="base_currency_code" nullable="true" length="3" comment="Base Currency Code"/>
-@@ -326,55 +326,55 @@
-                 comment="Shipping Method Name"/>
-         <column xsi:type="varchar" name="customer_email" nullable="true" length="255" comment="Customer Email"/>
-         <column xsi:type="varchar" name="customer_group" nullable="true" length="255" comment="Customer Group"/>
--        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal"/>
--        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Shipping and handling amount"/>
-         <column xsi:type="varchar" name="customer_name" nullable="true" length="255" comment="Customer Name"/>
-         <column xsi:type="varchar" name="payment_method" nullable="true" length="255" comment="Payment Method"/>
--        <column xsi:type="decimal" name="total_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="total_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Total Refunded"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="SALES_ORDER_GRID_INCREMENT_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_ORDER_GRID_INCREMENT_ID_STORE_ID">
-             <column name="increment_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="SALES_ORDER_GRID_STATUS" indexType="btree">
-+        <index referenceId="SALES_ORDER_GRID_STATUS" indexType="btree">
-             <column name="status"/>
-         </index>
--        <index name="SALES_ORDER_GRID_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_GRID_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALES_ORDER_GRID_BASE_GRAND_TOTAL" indexType="btree">
-+        <index referenceId="SALES_ORDER_GRID_BASE_GRAND_TOTAL" indexType="btree">
-             <column name="base_grand_total"/>
-         </index>
--        <index name="SALES_ORDER_GRID_BASE_TOTAL_PAID" indexType="btree">
-+        <index referenceId="SALES_ORDER_GRID_BASE_TOTAL_PAID" indexType="btree">
-             <column name="base_total_paid"/>
-         </index>
--        <index name="SALES_ORDER_GRID_GRAND_TOTAL" indexType="btree">
-+        <index referenceId="SALES_ORDER_GRID_GRAND_TOTAL" indexType="btree">
-             <column name="grand_total"/>
-         </index>
--        <index name="SALES_ORDER_GRID_TOTAL_PAID" indexType="btree">
-+        <index referenceId="SALES_ORDER_GRID_TOTAL_PAID" indexType="btree">
-             <column name="total_paid"/>
-         </index>
--        <index name="SALES_ORDER_GRID_SHIPPING_NAME" indexType="btree">
-+        <index referenceId="SALES_ORDER_GRID_SHIPPING_NAME" indexType="btree">
-             <column name="shipping_name"/>
-         </index>
--        <index name="SALES_ORDER_GRID_BILLING_NAME" indexType="btree">
-+        <index referenceId="SALES_ORDER_GRID_BILLING_NAME" indexType="btree">
-             <column name="billing_name"/>
-         </index>
--        <index name="SALES_ORDER_GRID_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_ORDER_GRID_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
--        <index name="SALES_ORDER_GRID_CUSTOMER_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_GRID_CUSTOMER_ID" indexType="btree">
-             <column name="customer_id"/>
-         </index>
--        <index name="SALES_ORDER_GRID_UPDATED_AT" indexType="btree">
-+        <index referenceId="SALES_ORDER_GRID_UPDATED_AT" indexType="btree">
-             <column name="updated_at"/>
-         </index>
--        <index name="FTI_65B9E9925EC58F0C7C2E2F6379C233E7" indexType="fulltext">
-+        <index referenceId="FTI_65B9E9925EC58F0C7C2E2F6379C233E7" indexType="fulltext">
-             <column name="increment_id"/>
-             <column name="billing_name"/>
-             <column name="shipping_name"/>
-@@ -419,13 +419,13 @@
-         <column xsi:type="text" name="vat_request_date" nullable="true" comment="Vat Request Date"/>
-         <column xsi:type="smallint" name="vat_request_success" padding="6" unsigned="false" nullable="true"
-                 identity="false" comment="Vat Request Success"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_ORDER_ADDRESS_PARENT_ID_SALES_ORDER_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_ADDRESS_PARENT_ID_SALES_ORDER_ENTITY_ID"
-                     table="sales_order_address" column="parent_id" referenceTable="sales_order"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="SALES_ORDER_ADDRESS_PARENT_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_ADDRESS_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
-     </table>
-@@ -444,16 +444,16 @@
-                 comment="Created At"/>
-         <column xsi:type="varchar" name="entity_name" nullable="true" length="32"
-                 comment="Shows what entity history is bind to."/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_ORDER_STATUS_HISTORY_PARENT_ID_SALES_ORDER_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_STATUS_HISTORY_PARENT_ID_SALES_ORDER_ENTITY_ID"
-                     table="sales_order_status_history" column="parent_id" referenceTable="sales_order"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="SALES_ORDER_STATUS_HISTORY_PARENT_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_STATUS_HISTORY_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
--        <index name="SALES_ORDER_STATUS_HISTORY_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_ORDER_STATUS_HISTORY_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
-     </table>
-@@ -513,90 +513,90 @@
-                 comment="Base Original Price"/>
-         <column xsi:type="decimal" name="tax_percent" scale="4" precision="12" unsigned="false" nullable="true"
-                 default="0" comment="Tax Percent"/>
--        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Tax Amount"/>
--        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Base Tax Amount"/>
--        <column xsi:type="decimal" name="tax_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tax_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Tax Invoiced"/>
--        <column xsi:type="decimal" name="base_tax_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tax_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Base Tax Invoiced"/>
-         <column xsi:type="decimal" name="discount_percent" scale="4" precision="12" unsigned="false" nullable="true"
-                 default="0" comment="Discount Percent"/>
--        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Discount Amount"/>
--        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" default="0" comment="Base Discount Amount"/>
--        <column xsi:type="decimal" name="discount_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="discount_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Discount Invoiced"/>
--        <column xsi:type="decimal" name="base_discount_invoiced" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_discount_invoiced" scale="4" precision="20" unsigned="false"
-                 nullable="true" default="0" comment="Base Discount Invoiced"/>
--        <column xsi:type="decimal" name="amount_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="amount_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 default="0" comment="Amount Refunded"/>
--        <column xsi:type="decimal" name="base_amount_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_amount_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" default="0" comment="Base Amount Refunded"/>
--        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="row_total" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Row Total"/>
--        <column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="base_row_total" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Base Row Total"/>
--        <column xsi:type="decimal" name="row_invoiced" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="row_invoiced" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Row Invoiced"/>
--        <column xsi:type="decimal" name="base_row_invoiced" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="base_row_invoiced" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Base Row Invoiced"/>
-         <column xsi:type="decimal" name="row_weight" scale="4" precision="12" unsigned="false" nullable="true"
-                 default="0" comment="Row Weight"/>
--        <column xsi:type="decimal" name="base_tax_before_discount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_tax_before_discount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Tax Before Discount"/>
--        <column xsi:type="decimal" name="tax_before_discount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tax_before_discount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Tax Before Discount"/>
-         <column xsi:type="varchar" name="ext_order_item_id" nullable="true" length="255" comment="Ext Order Item Id"/>
-         <column xsi:type="smallint" name="locked_do_invoice" padding="5" unsigned="true" nullable="true"
-                 identity="false" comment="Locked Do Invoice"/>
-         <column xsi:type="smallint" name="locked_do_ship" padding="5" unsigned="true" nullable="true" identity="false"
-                 comment="Locked Do Ship"/>
--        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Price Incl Tax"/>
--        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Price Incl Tax"/>
--        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Row Total Incl Tax"/>
--        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Row Total Incl Tax"/>
--        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="discount_tax_compensation_invoiced" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="discount_tax_compensation_invoiced" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Discount Tax Compensation Invoiced"/>
--        <column xsi:type="decimal" name="base_discount_tax_compensation_invoiced" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_discount_tax_compensation_invoiced" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Invoiced"/>
--        <column xsi:type="decimal" name="discount_tax_compensation_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="discount_tax_compensation_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Discount Tax Compensation Refunded"/>
--        <column xsi:type="decimal" name="base_discount_tax_compensation_refunded" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_discount_tax_compensation_refunded" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Refunded"/>
-         <column xsi:type="decimal" name="tax_canceled" scale="4" precision="12" unsigned="false" nullable="true"
-                 comment="Tax Canceled"/>
--        <column xsi:type="decimal" name="discount_tax_compensation_canceled" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="discount_tax_compensation_canceled" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Discount Tax Compensation Canceled"/>
--        <column xsi:type="decimal" name="tax_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tax_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Tax Refunded"/>
--        <column xsi:type="decimal" name="base_tax_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tax_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Tax Refunded"/>
--        <column xsi:type="decimal" name="discount_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="discount_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Discount Refunded"/>
--        <column xsi:type="decimal" name="base_discount_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_discount_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Discount Refunded"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="item_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_ORDER_ITEM_ORDER_ID_SALES_ORDER_ENTITY_ID" table="sales_order_item"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_ITEM_ORDER_ID_SALES_ORDER_ENTITY_ID" table="sales_order_item"
-                     column="order_id" referenceTable="sales_order" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALES_ORDER_ITEM_STORE_ID_STORE_STORE_ID" table="sales_order_item"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_ITEM_STORE_ID_STORE_STORE_ID" table="sales_order_item"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
--        <index name="SALES_ORDER_ITEM_ORDER_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_ITEM_ORDER_ID" indexType="btree">
-             <column name="order_id"/>
-         </index>
--        <index name="SALES_ORDER_ITEM_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_ITEM_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -605,41 +605,41 @@
-                 comment="Entity Id"/>
-         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Parent Id"/>
--        <column xsi:type="decimal" name="base_shipping_captured" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_captured" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Captured"/>
--        <column xsi:type="decimal" name="shipping_captured" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_captured" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Captured"/>
--        <column xsi:type="decimal" name="amount_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="amount_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Amount Refunded"/>
--        <column xsi:type="decimal" name="base_amount_paid" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_amount_paid" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Amount Paid"/>
--        <column xsi:type="decimal" name="amount_canceled" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="amount_canceled" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Amount Canceled"/>
--        <column xsi:type="decimal" name="base_amount_authorized" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_amount_authorized" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Amount Authorized"/>
--        <column xsi:type="decimal" name="base_amount_paid_online" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_amount_paid_online" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Amount Paid Online"/>
--        <column xsi:type="decimal" name="base_amount_refunded_online" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_amount_refunded_online" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Amount Refunded Online"/>
--        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Amount"/>
--        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Amount"/>
--        <column xsi:type="decimal" name="amount_paid" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="amount_paid" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Amount Paid"/>
--        <column xsi:type="decimal" name="amount_authorized" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="amount_authorized" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Amount Authorized"/>
--        <column xsi:type="decimal" name="base_amount_ordered" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_amount_ordered" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Amount Ordered"/>
--        <column xsi:type="decimal" name="base_shipping_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Refunded"/>
--        <column xsi:type="decimal" name="shipping_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Refunded"/>
--        <column xsi:type="decimal" name="base_amount_refunded" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_amount_refunded" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Amount Refunded"/>
--        <column xsi:type="decimal" name="amount_ordered" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="amount_ordered" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Amount Ordered"/>
--        <column xsi:type="decimal" name="base_amount_canceled" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_amount_canceled" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Amount Canceled"/>
-         <column xsi:type="int" name="quote_payment_id" padding="11" unsigned="false" nullable="true" identity="false"
-                 comment="Quote Payment Id"/>
-@@ -663,7 +663,7 @@
-         <column xsi:type="varchar" name="cc_ss_start_month" nullable="true" length="128" comment="Cc Ss Start Month"/>
-         <column xsi:type="varchar" name="echeck_account_type" nullable="true" length="255"
-                 comment="Echeck Account Type"/>
--        <column xsi:type="varchar" name="last_trans_id" nullable="true" length="32" comment="Last Trans Id"/>
-+        <column xsi:type="varchar" name="last_trans_id" nullable="true" length="255" comment="Last Trans Id"/>
-         <column xsi:type="varchar" name="cc_cid_status" nullable="true" length="32" comment="Cc Cid Status"/>
-         <column xsi:type="varchar" name="cc_owner" nullable="true" length="128" comment="Cc Owner"/>
-         <column xsi:type="varchar" name="cc_type" nullable="true" length="32" comment="Cc Type"/>
-@@ -684,13 +684,13 @@
-         <column xsi:type="varchar" name="cc_trans_id" nullable="true" length="32" comment="Cc Trans Id"/>
-         <column xsi:type="varchar" name="address_status" nullable="true" length="32" comment="Address Status"/>
-         <column xsi:type="text" name="additional_information" nullable="true" comment="Additional Information"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_ORDER_PAYMENT_PARENT_ID_SALES_ORDER_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_PAYMENT_PARENT_ID_SALES_ORDER_ENTITY_ID"
-                     table="sales_order_payment" column="parent_id" referenceTable="sales_order"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="SALES_ORDER_PAYMENT_PARENT_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_PAYMENT_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
-     </table>
-@@ -727,36 +727,36 @@
-         <column xsi:type="text" name="customer_note" nullable="true" comment="Customer Note"/>
-         <column xsi:type="smallint" name="customer_note_notify" padding="5" unsigned="true" nullable="true"
-                 identity="false" comment="Customer Note Notify"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_SHIPMENT_ORDER_ID_SALES_ORDER_ENTITY_ID" table="sales_shipment"
-+        <constraint xsi:type="foreign" referenceId="SALES_SHIPMENT_ORDER_ID_SALES_ORDER_ENTITY_ID" table="sales_shipment"
-                     column="order_id" referenceTable="sales_order" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALES_SHIPMENT_STORE_ID_STORE_STORE_ID" table="sales_shipment"
-+        <constraint xsi:type="foreign" referenceId="SALES_SHIPMENT_STORE_ID_STORE_STORE_ID" table="sales_shipment"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="SALES_SHIPMENT_INCREMENT_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_SHIPMENT_INCREMENT_ID_STORE_ID">
-             <column name="increment_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="SALES_SHIPMENT_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALES_SHIPMENT_TOTAL_QTY" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_TOTAL_QTY" indexType="btree">
-             <column name="total_qty"/>
-         </index>
--        <index name="SALES_SHIPMENT_ORDER_ID" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_ORDER_ID" indexType="btree">
-             <column name="order_id"/>
-         </index>
--        <index name="SALES_SHIPMENT_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
--        <index name="SALES_SHIPMENT_UPDATED_AT" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_UPDATED_AT" indexType="btree">
-             <column name="updated_at"/>
-         </index>
--        <index name="SALES_SHIPMENT_SEND_EMAIL" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_SEND_EMAIL" indexType="btree">
-             <column name="send_email"/>
-         </index>
--        <index name="SALES_SHIPMENT_EMAIL_SENT" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_EMAIL_SENT" indexType="btree">
-             <column name="email_sent"/>
-         </index>
-     </table>
-@@ -769,7 +769,7 @@
-         <column xsi:type="varchar" name="order_increment_id" nullable="false" length="32" comment="Order Increment Id"/>
-         <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Order Id"/>
--        <column xsi:type="timestamp" name="order_created_at" on_update="true" nullable="true"
-+        <column xsi:type="timestamp" name="order_created_at" on_update="true" nullable="false"
-                 default="CURRENT_TIMESTAMP" comment="Order Increment Id"/>
-         <column xsi:type="varchar" name="customer_name" nullable="false" length="128" comment="Customer Name"/>
-         <column xsi:type="decimal" name="total_qty" scale="4" precision="12" unsigned="false" nullable="true"
-@@ -788,44 +788,44 @@
-                 comment="Shipping Method Name"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true" comment="Created At"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Updated At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="SALES_SHIPMENT_GRID_INCREMENT_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_SHIPMENT_GRID_INCREMENT_ID_STORE_ID">
-             <column name="increment_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="SALES_SHIPMENT_GRID_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_GRID_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALES_SHIPMENT_GRID_TOTAL_QTY" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_GRID_TOTAL_QTY" indexType="btree">
-             <column name="total_qty"/>
-         </index>
--        <index name="SALES_SHIPMENT_GRID_ORDER_INCREMENT_ID" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_GRID_ORDER_INCREMENT_ID" indexType="btree">
-             <column name="order_increment_id"/>
-         </index>
--        <index name="SALES_SHIPMENT_GRID_SHIPMENT_STATUS" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_GRID_SHIPMENT_STATUS" indexType="btree">
-             <column name="shipment_status"/>
-         </index>
--        <index name="SALES_SHIPMENT_GRID_ORDER_STATUS" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_GRID_ORDER_STATUS" indexType="btree">
-             <column name="order_status"/>
-         </index>
--        <index name="SALES_SHIPMENT_GRID_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_GRID_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
--        <index name="SALES_SHIPMENT_GRID_UPDATED_AT" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_GRID_UPDATED_AT" indexType="btree">
-             <column name="updated_at"/>
-         </index>
--        <index name="SALES_SHIPMENT_GRID_ORDER_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_GRID_ORDER_CREATED_AT" indexType="btree">
-             <column name="order_created_at"/>
-         </index>
--        <index name="SALES_SHIPMENT_GRID_SHIPPING_NAME" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_GRID_SHIPPING_NAME" indexType="btree">
-             <column name="shipping_name"/>
-         </index>
--        <index name="SALES_SHIPMENT_GRID_BILLING_NAME" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_GRID_BILLING_NAME" indexType="btree">
-             <column name="billing_name"/>
-         </index>
--        <index name="FTI_086B40C8955F167B8EA76653437879B4" indexType="fulltext">
-+        <index referenceId="FTI_086B40C8955F167B8EA76653437879B4" indexType="fulltext">
-             <column name="increment_id"/>
-             <column name="order_increment_id"/>
-             <column name="shipping_name"/>
-@@ -840,9 +840,9 @@
-                 comment="Entity Id"/>
-         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Parent Id"/>
--        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="row_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Row Total"/>
--        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="price" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Price"/>
-         <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="true"
-                 comment="Weight"/>
-@@ -855,13 +855,13 @@
-         <column xsi:type="text" name="description" nullable="true" comment="Description"/>
-         <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
-         <column xsi:type="varchar" name="sku" nullable="true" length="255" comment="Sku"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_SHIPMENT_ITEM_PARENT_ID_SALES_SHIPMENT_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_SHIPMENT_ITEM_PARENT_ID_SALES_SHIPMENT_ENTITY_ID"
-                     table="sales_shipment_item" column="parent_id" referenceTable="sales_shipment"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="SALES_SHIPMENT_ITEM_PARENT_ID" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_ITEM_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
-     </table>
-@@ -883,19 +883,19 @@
-                 comment="Created At"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_SHIPMENT_TRACK_PARENT_ID_SALES_SHIPMENT_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_SHIPMENT_TRACK_PARENT_ID_SALES_SHIPMENT_ENTITY_ID"
-                     table="sales_shipment_track" column="parent_id" referenceTable="sales_shipment"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="SALES_SHIPMENT_TRACK_PARENT_ID" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_TRACK_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
--        <index name="SALES_SHIPMENT_TRACK_ORDER_ID" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_TRACK_ORDER_ID" indexType="btree">
-             <column name="order_id"/>
-         </index>
--        <index name="SALES_SHIPMENT_TRACK_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_TRACK_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
-     </table>
-@@ -911,16 +911,16 @@
-         <column xsi:type="text" name="comment" nullable="true" comment="Comment"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Created At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_SHIPMENT_COMMENT_PARENT_ID_SALES_SHIPMENT_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_SHIPMENT_COMMENT_PARENT_ID_SALES_SHIPMENT_ENTITY_ID"
-                     table="sales_shipment_comment" column="parent_id" referenceTable="sales_shipment"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="SALES_SHIPMENT_COMMENT_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_COMMENT_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
--        <index name="SALES_SHIPMENT_COMMENT_PARENT_ID" indexType="btree">
-+        <index referenceId="SALES_SHIPMENT_COMMENT_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
-     </table>
-@@ -929,43 +929,43 @@
-                 comment="Entity Id"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-                 comment="Store Id"/>
--        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Grand Total"/>
--        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Tax Amount"/>
--        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Tax Amount"/>
--        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Tax Amount"/>
--        <column xsi:type="decimal" name="store_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="store_to_order_rate" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Store To Order Rate"/>
--        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Tax Amount"/>
--        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Discount Amount"/>
--        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base To Order Rate"/>
--        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Grand Total"/>
--        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Amount"/>
--        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal Incl Tax"/>
--        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Subtotal Incl Tax"/>
--        <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Store To Base Rate"/>
--        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Amount"/>
-         <column xsi:type="decimal" name="total_qty" scale="4" precision="12" unsigned="false" nullable="true"
-                 comment="Total Qty"/>
--        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base To Global Rate"/>
--        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal"/>
--        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Subtotal"/>
--        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Discount Amount"/>
-         <column xsi:type="int" name="billing_address_id" padding="11" unsigned="false" nullable="true" identity="false"
-                 comment="Billing Address Id"/>
-@@ -994,58 +994,58 @@
-                 comment="Created At"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
--        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="12"
-+        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Shipping Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Shipping Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Incl Tax"/>
--        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Incl Tax"/>
--        <column xsi:type="decimal" name="base_total_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_total_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Total Refunded"/>
-         <column xsi:type="varchar" name="discount_description" nullable="true" length="255"
-                 comment="Discount Description"/>
-         <column xsi:type="text" name="customer_note" nullable="true" comment="Customer Note"/>
-         <column xsi:type="smallint" name="customer_note_notify" padding="5" unsigned="true" nullable="true"
-                 identity="false" comment="Customer Note Notify"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_INVOICE_ORDER_ID_SALES_ORDER_ENTITY_ID" table="sales_invoice"
-+        <constraint xsi:type="foreign" referenceId="SALES_INVOICE_ORDER_ID_SALES_ORDER_ENTITY_ID" table="sales_invoice"
-                     column="order_id" referenceTable="sales_order" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALES_INVOICE_STORE_ID_STORE_STORE_ID" table="sales_invoice"
-+        <constraint xsi:type="foreign" referenceId="SALES_INVOICE_STORE_ID_STORE_STORE_ID" table="sales_invoice"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="SALES_INVOICE_INCREMENT_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_INVOICE_INCREMENT_ID_STORE_ID">
-             <column name="increment_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="SALES_INVOICE_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_INVOICE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALES_INVOICE_GRAND_TOTAL" indexType="btree">
-+        <index referenceId="SALES_INVOICE_GRAND_TOTAL" indexType="btree">
-             <column name="grand_total"/>
-         </index>
--        <index name="SALES_INVOICE_ORDER_ID" indexType="btree">
-+        <index referenceId="SALES_INVOICE_ORDER_ID" indexType="btree">
-             <column name="order_id"/>
-         </index>
--        <index name="SALES_INVOICE_STATE" indexType="btree">
-+        <index referenceId="SALES_INVOICE_STATE" indexType="btree">
-             <column name="state"/>
-         </index>
--        <index name="SALES_INVOICE_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_INVOICE_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
--        <index name="SALES_INVOICE_UPDATED_AT" indexType="btree">
-+        <index referenceId="SALES_INVOICE_UPDATED_AT" indexType="btree">
-             <column name="updated_at"/>
-         </index>
--        <index name="SALES_INVOICE_SEND_EMAIL" indexType="btree">
-+        <index referenceId="SALES_INVOICE_SEND_EMAIL" indexType="btree">
-             <column name="send_email"/>
-         </index>
--        <index name="SALES_INVOICE_EMAIL_SENT" indexType="btree">
-+        <index referenceId="SALES_INVOICE_EMAIL_SENT" indexType="btree">
-             <column name="email_sent"/>
-         </index>
-     </table>
-@@ -1077,51 +1077,51 @@
-         <column xsi:type="varchar" name="shipping_address" nullable="true" length="255" comment="Shipping Address"/>
-         <column xsi:type="varchar" name="shipping_information" nullable="true" length="255"
-                 comment="Shipping Method Name"/>
--        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal"/>
--        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Shipping and handling amount"/>
--        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Grand Total"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true" comment="Created At"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Updated At"/>
--        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Grand Total"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="SALES_INVOICE_GRID_INCREMENT_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_INVOICE_GRID_INCREMENT_ID_STORE_ID">
-             <column name="increment_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="SALES_INVOICE_GRID_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_INVOICE_GRID_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALES_INVOICE_GRID_GRAND_TOTAL" indexType="btree">
-+        <index referenceId="SALES_INVOICE_GRID_GRAND_TOTAL" indexType="btree">
-             <column name="grand_total"/>
-         </index>
--        <index name="SALES_INVOICE_GRID_ORDER_ID" indexType="btree">
-+        <index referenceId="SALES_INVOICE_GRID_ORDER_ID" indexType="btree">
-             <column name="order_id"/>
-         </index>
--        <index name="SALES_INVOICE_GRID_STATE" indexType="btree">
-+        <index referenceId="SALES_INVOICE_GRID_STATE" indexType="btree">
-             <column name="state"/>
-         </index>
--        <index name="SALES_INVOICE_GRID_ORDER_INCREMENT_ID" indexType="btree">
-+        <index referenceId="SALES_INVOICE_GRID_ORDER_INCREMENT_ID" indexType="btree">
-             <column name="order_increment_id"/>
-         </index>
--        <index name="SALES_INVOICE_GRID_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_INVOICE_GRID_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
--        <index name="SALES_INVOICE_GRID_UPDATED_AT" indexType="btree">
-+        <index referenceId="SALES_INVOICE_GRID_UPDATED_AT" indexType="btree">
-             <column name="updated_at"/>
-         </index>
--        <index name="SALES_INVOICE_GRID_ORDER_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_INVOICE_GRID_ORDER_CREATED_AT" indexType="btree">
-             <column name="order_created_at"/>
-         </index>
--        <index name="SALES_INVOICE_GRID_BILLING_NAME" indexType="btree">
-+        <index referenceId="SALES_INVOICE_GRID_BILLING_NAME" indexType="btree">
-             <column name="billing_name"/>
-         </index>
--        <index name="FTI_95D9C924DD6A8734EB8B5D01D60F90DE" indexType="fulltext">
-+        <index referenceId="FTI_95D9C924DD6A8734EB8B5D01D60F90DE" indexType="fulltext">
-             <column name="increment_id"/>
-             <column name="order_increment_id"/>
-             <column name="billing_name"/>
-@@ -1130,7 +1130,7 @@
-             <column name="customer_name"/>
-             <column name="customer_email"/>
-         </index>
--        <index name="SALES_INVOICE_GRID_BASE_GRAND_TOTAL" indexType="btree">
-+        <index referenceId="SALES_INVOICE_GRID_BASE_GRAND_TOTAL" indexType="btree">
-             <column name="base_grand_total"/>
-         </index>
-     </table>
-@@ -1143,11 +1143,11 @@
-                 comment="Base Price"/>
-         <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-                 comment="Tax Amount"/>
--        <column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_row_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Row Total"/>
-         <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
-                 comment="Discount Amount"/>
--        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="row_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Row Total"/>
-         <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
-                 nullable="true" comment="Base Discount Amount"/>
-@@ -1180,13 +1180,13 @@
-                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
-         <column xsi:type="text" name="tax_ratio" nullable="true"
-                 comment="Ratio of tax invoiced over tax of the order item"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_INVOICE_ITEM_PARENT_ID_SALES_INVOICE_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_INVOICE_ITEM_PARENT_ID_SALES_INVOICE_ENTITY_ID"
-                     table="sales_invoice_item" column="parent_id" referenceTable="sales_invoice"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="SALES_INVOICE_ITEM_PARENT_ID" indexType="btree">
-+        <index referenceId="SALES_INVOICE_ITEM_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
-     </table>
-@@ -1202,16 +1202,16 @@
-         <column xsi:type="text" name="comment" nullable="true" comment="Comment"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Created At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_INVOICE_COMMENT_PARENT_ID_SALES_INVOICE_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_INVOICE_COMMENT_PARENT_ID_SALES_INVOICE_ENTITY_ID"
-                     table="sales_invoice_comment" column="parent_id" referenceTable="sales_invoice"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="SALES_INVOICE_COMMENT_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_INVOICE_COMMENT_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
--        <index name="SALES_INVOICE_COMMENT_PARENT_ID" indexType="btree">
-+        <index referenceId="SALES_INVOICE_COMMENT_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
-     </table>
-@@ -1220,53 +1220,53 @@
-                 comment="Entity Id"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-                 comment="Store Id"/>
--        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Adjustment Positive"/>
--        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Tax Amount"/>
--        <column xsi:type="decimal" name="store_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="store_to_order_rate" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Store To Order Rate"/>
--        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Discount Amount"/>
--        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base To Order Rate"/>
--        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Grand Total"/>
--        <column xsi:type="decimal" name="base_adjustment_negative" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_adjustment_negative" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Adjustment Negative"/>
--        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Subtotal Incl Tax"/>
--        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Amount"/>
--        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal Incl Tax"/>
--        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Adjustment Negative"/>
--        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Amount"/>
--        <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Store To Base Rate"/>
--        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base To Global Rate"/>
--        <column xsi:type="decimal" name="base_adjustment" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_adjustment" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Adjustment"/>
--        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Subtotal"/>
--        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Discount Amount"/>
--        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal"/>
--        <column xsi:type="decimal" name="adjustment" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="adjustment" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Adjustment"/>
--        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Grand Total"/>
--        <column xsi:type="decimal" name="base_adjustment_positive" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_adjustment_positive" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Adjustment Positive"/>
--        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Tax Amount"/>
--        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Tax Amount"/>
--        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Tax Amount"/>
-         <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Order Id"/>
-@@ -1295,56 +1295,56 @@
-                 comment="Created At"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated At"/>
--        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="12"
-+        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Shipping Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="12"
-+        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="20"
-                 unsigned="false" nullable="true" comment="Base Shipping Discount Tax Compensation Amount"/>
--        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Shipping Incl Tax"/>
--        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Base Shipping Incl Tax"/>
-         <column xsi:type="varchar" name="discount_description" nullable="true" length="255"
-                 comment="Discount Description"/>
-         <column xsi:type="text" name="customer_note" nullable="true" comment="Customer Note"/>
-         <column xsi:type="smallint" name="customer_note_notify" padding="5" unsigned="true" nullable="true"
-                 identity="false" comment="Customer Note Notify"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_CREDITMEMO_ORDER_ID_SALES_ORDER_ENTITY_ID" table="sales_creditmemo"
-+        <constraint xsi:type="foreign" referenceId="SALES_CREDITMEMO_ORDER_ID_SALES_ORDER_ENTITY_ID" table="sales_creditmemo"
-                     column="order_id" referenceTable="sales_order" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALES_CREDITMEMO_STORE_ID_STORE_STORE_ID" table="sales_creditmemo"
-+        <constraint xsi:type="foreign" referenceId="SALES_CREDITMEMO_STORE_ID_STORE_STORE_ID" table="sales_creditmemo"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="SALES_CREDITMEMO_INCREMENT_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_CREDITMEMO_INCREMENT_ID_STORE_ID">
-             <column name="increment_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="SALES_CREDITMEMO_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALES_CREDITMEMO_ORDER_ID" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_ORDER_ID" indexType="btree">
-             <column name="order_id"/>
-         </index>
--        <index name="SALES_CREDITMEMO_CREDITMEMO_STATUS" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_CREDITMEMO_STATUS" indexType="btree">
-             <column name="creditmemo_status"/>
-         </index>
--        <index name="SALES_CREDITMEMO_STATE" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_STATE" indexType="btree">
-             <column name="state"/>
-         </index>
--        <index name="SALES_CREDITMEMO_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
--        <index name="SALES_CREDITMEMO_UPDATED_AT" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_UPDATED_AT" indexType="btree">
-             <column name="updated_at"/>
-         </index>
--        <index name="SALES_CREDITMEMO_SEND_EMAIL" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_SEND_EMAIL" indexType="btree">
-             <column name="send_email"/>
-         </index>
--        <index name="SALES_CREDITMEMO_EMAIL_SENT" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_EMAIL_SENT" indexType="btree">
-             <column name="email_sent"/>
-         </index>
-     </table>
-@@ -1362,7 +1362,7 @@
-         <column xsi:type="varchar" name="billing_name" nullable="true" length="255" comment="Billing Name"/>
-         <column xsi:type="int" name="state" padding="11" unsigned="false" nullable="true" identity="false"
-                 comment="Status"/>
--        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Grand Total"/>
-         <column xsi:type="varchar" name="order_status" nullable="true" length="32" comment="Order Status"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-@@ -1376,57 +1376,57 @@
-         <column xsi:type="varchar" name="payment_method" nullable="true" length="32" comment="Payment Method"/>
-         <column xsi:type="varchar" name="shipping_information" nullable="true" length="255"
-                 comment="Shipping Method Name"/>
--        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Subtotal"/>
--        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Shipping and handling amount"/>
--        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Adjustment Positive"/>
--        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Adjustment Negative"/>
--        <column xsi:type="decimal" name="order_base_grand_total" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="order_base_grand_total" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Order Grand Total"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="SALES_CREDITMEMO_GRID_INCREMENT_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_CREDITMEMO_GRID_INCREMENT_ID_STORE_ID">
-             <column name="increment_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="SALES_CREDITMEMO_GRID_ORDER_INCREMENT_ID" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_GRID_ORDER_INCREMENT_ID" indexType="btree">
-             <column name="order_increment_id"/>
-         </index>
--        <index name="SALES_CREDITMEMO_GRID_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_GRID_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
--        <index name="SALES_CREDITMEMO_GRID_UPDATED_AT" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_GRID_UPDATED_AT" indexType="btree">
-             <column name="updated_at"/>
-         </index>
--        <index name="SALES_CREDITMEMO_GRID_ORDER_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_GRID_ORDER_CREATED_AT" indexType="btree">
-             <column name="order_created_at"/>
-         </index>
--        <index name="SALES_CREDITMEMO_GRID_STATE" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_GRID_STATE" indexType="btree">
-             <column name="state"/>
-         </index>
--        <index name="SALES_CREDITMEMO_GRID_BILLING_NAME" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_GRID_BILLING_NAME" indexType="btree">
-             <column name="billing_name"/>
-         </index>
--        <index name="SALES_CREDITMEMO_GRID_ORDER_STATUS" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_GRID_ORDER_STATUS" indexType="btree">
-             <column name="order_status"/>
-         </index>
--        <index name="SALES_CREDITMEMO_GRID_BASE_GRAND_TOTAL" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_GRID_BASE_GRAND_TOTAL" indexType="btree">
-             <column name="base_grand_total"/>
-         </index>
--        <index name="SALES_CREDITMEMO_GRID_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_GRID_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALES_CREDITMEMO_GRID_ORDER_BASE_GRAND_TOTAL" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_GRID_ORDER_BASE_GRAND_TOTAL" indexType="btree">
-             <column name="order_base_grand_total"/>
-         </index>
--        <index name="SALES_CREDITMEMO_GRID_ORDER_ID" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_GRID_ORDER_ID" indexType="btree">
-             <column name="order_id"/>
-         </index>
--        <index name="FTI_32B7BA885941A8254EE84AE650ABDC86" indexType="fulltext">
-+        <index referenceId="FTI_32B7BA885941A8254EE84AE650ABDC86" indexType="fulltext">
-             <column name="increment_id"/>
-             <column name="order_increment_id"/>
-             <column name="billing_name"/>
-@@ -1482,13 +1482,13 @@
-                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
-         <column xsi:type="text" name="tax_ratio" nullable="true"
-                 comment="Ratio of tax in the creditmemo item over tax of the order item"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_CREDITMEMO_ITEM_PARENT_ID_SALES_CREDITMEMO_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_CREDITMEMO_ITEM_PARENT_ID_SALES_CREDITMEMO_ENTITY_ID"
-                     table="sales_creditmemo_item" column="parent_id" referenceTable="sales_creditmemo"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="SALES_CREDITMEMO_ITEM_PARENT_ID" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_ITEM_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
-     </table>
-@@ -1504,16 +1504,16 @@
-         <column xsi:type="text" name="comment" nullable="true" comment="Comment"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Created At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_CREDITMEMO_COMMENT_PARENT_ID_SALES_CREDITMEMO_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_CREDITMEMO_COMMENT_PARENT_ID_SALES_CREDITMEMO_ENTITY_ID"
-                     table="sales_creditmemo_comment" column="parent_id" referenceTable="sales_creditmemo"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="SALES_CREDITMEMO_COMMENT_CREATED_AT" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_COMMENT_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
--        <index name="SALES_CREDITMEMO_COMMENT_PARENT_ID" indexType="btree">
-+        <index referenceId="SALES_CREDITMEMO_COMMENT_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
-     </table>
-@@ -1533,18 +1533,18 @@
-                 comment="Invoiced Captured"/>
-         <column xsi:type="decimal" name="invoiced_not_captured" scale="4" precision="12" unsigned="false"
-                 nullable="true" comment="Invoiced Not Captured"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_INVOICED_AGGREGATED_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_INVOICED_AGGREGATED_STORE_ID_STORE_STORE_ID"
-                     table="sales_invoiced_aggregated" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="SALES_INVOICED_AGGREGATED_PERIOD_STORE_ID_ORDER_STATUS">
-+        <constraint xsi:type="unique" referenceId="SALES_INVOICED_AGGREGATED_PERIOD_STORE_ID_ORDER_STATUS">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="order_status"/>
-         </constraint>
--        <index name="SALES_INVOICED_AGGREGATED_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_INVOICED_AGGREGATED_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -1565,18 +1565,18 @@
-                 comment="Invoiced Captured"/>
-         <column xsi:type="decimal" name="invoiced_not_captured" scale="4" precision="12" unsigned="false"
-                 nullable="true" comment="Invoiced Not Captured"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_INVOICED_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_INVOICED_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID"
-                     table="sales_invoiced_aggregated_order" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="SALES_INVOICED_AGGREGATED_ORDER_PERIOD_STORE_ID_ORDER_STATUS">
-+        <constraint xsi:type="unique" referenceId="SALES_INVOICED_AGGREGATED_ORDER_PERIOD_STORE_ID_ORDER_STATUS">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="order_status"/>
-         </constraint>
--        <index name="SALES_INVOICED_AGGREGATED_ORDER_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_INVOICED_AGGREGATED_ORDER_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -1593,44 +1593,44 @@
-                 default="0" comment="Total Qty Ordered"/>
-         <column xsi:type="decimal" name="total_qty_invoiced" scale="4" precision="12" unsigned="false" nullable="false"
-                 default="0" comment="Total Qty Invoiced"/>
--        <column xsi:type="decimal" name="total_income_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_income_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Income Amount"/>
--        <column xsi:type="decimal" name="total_revenue_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_revenue_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Revenue Amount"/>
--        <column xsi:type="decimal" name="total_profit_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_profit_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Profit Amount"/>
--        <column xsi:type="decimal" name="total_invoiced_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_invoiced_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Invoiced Amount"/>
--        <column xsi:type="decimal" name="total_canceled_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_canceled_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Canceled Amount"/>
--        <column xsi:type="decimal" name="total_paid_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="total_paid_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Total Paid Amount"/>
--        <column xsi:type="decimal" name="total_refunded_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_refunded_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Refunded Amount"/>
--        <column xsi:type="decimal" name="total_tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="total_tax_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Total Tax Amount"/>
--        <column xsi:type="decimal" name="total_tax_amount_actual" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_tax_amount_actual" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Tax Amount Actual"/>
--        <column xsi:type="decimal" name="total_shipping_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_shipping_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Shipping Amount"/>
--        <column xsi:type="decimal" name="total_shipping_amount_actual" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_shipping_amount_actual" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Shipping Amount Actual"/>
--        <column xsi:type="decimal" name="total_discount_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_discount_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Discount Amount"/>
--        <column xsi:type="decimal" name="total_discount_amount_actual" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_discount_amount_actual" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Discount Amount Actual"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_ORDER_AGGREGATED_CREATED_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_AGGREGATED_CREATED_STORE_ID_STORE_STORE_ID"
-                     table="sales_order_aggregated_created" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="SALES_ORDER_AGGREGATED_CREATED_PERIOD_STORE_ID_ORDER_STATUS">
-+        <constraint xsi:type="unique" referenceId="SALES_ORDER_AGGREGATED_CREATED_PERIOD_STORE_ID_ORDER_STATUS">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="order_status"/>
-         </constraint>
--        <index name="SALES_ORDER_AGGREGATED_CREATED_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_AGGREGATED_CREATED_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -1647,44 +1647,44 @@
-                 default="0" comment="Total Qty Ordered"/>
-         <column xsi:type="decimal" name="total_qty_invoiced" scale="4" precision="12" unsigned="false" nullable="false"
-                 default="0" comment="Total Qty Invoiced"/>
--        <column xsi:type="decimal" name="total_income_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_income_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Income Amount"/>
--        <column xsi:type="decimal" name="total_revenue_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_revenue_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Revenue Amount"/>
--        <column xsi:type="decimal" name="total_profit_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_profit_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Profit Amount"/>
--        <column xsi:type="decimal" name="total_invoiced_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_invoiced_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Invoiced Amount"/>
--        <column xsi:type="decimal" name="total_canceled_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_canceled_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Canceled Amount"/>
--        <column xsi:type="decimal" name="total_paid_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="total_paid_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Total Paid Amount"/>
--        <column xsi:type="decimal" name="total_refunded_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_refunded_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Refunded Amount"/>
--        <column xsi:type="decimal" name="total_tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="total_tax_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Total Tax Amount"/>
--        <column xsi:type="decimal" name="total_tax_amount_actual" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_tax_amount_actual" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Tax Amount Actual"/>
--        <column xsi:type="decimal" name="total_shipping_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_shipping_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Shipping Amount"/>
--        <column xsi:type="decimal" name="total_shipping_amount_actual" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_shipping_amount_actual" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Shipping Amount Actual"/>
--        <column xsi:type="decimal" name="total_discount_amount" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_discount_amount" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Discount Amount"/>
--        <column xsi:type="decimal" name="total_discount_amount_actual" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_discount_amount_actual" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Discount Amount Actual"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_ORDER_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID"
-                     table="sales_order_aggregated_updated" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="SALES_ORDER_AGGREGATED_UPDATED_PERIOD_STORE_ID_ORDER_STATUS">
-+        <constraint xsi:type="unique" referenceId="SALES_ORDER_AGGREGATED_UPDATED_PERIOD_STORE_ID_ORDER_STATUS">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="order_status"/>
-         </constraint>
--        <index name="SALES_ORDER_AGGREGATED_UPDATED_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_AGGREGATED_UPDATED_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -1705,27 +1705,27 @@
-         <column xsi:type="blob" name="additional_information" nullable="true" comment="Additional Information"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Created At"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="transaction_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_PAYMENT_TRANSACTION_ORDER_ID_SALES_ORDER_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_PAYMENT_TRANSACTION_ORDER_ID_SALES_ORDER_ENTITY_ID"
-                     table="sales_payment_transaction" column="order_id" referenceTable="sales_order"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="FK_B99FF1A06402D725EBDB0F3A7ECD47A2" table="sales_payment_transaction"
-+        <constraint xsi:type="foreign" referenceId="FK_B99FF1A06402D725EBDB0F3A7ECD47A2" table="sales_payment_transaction"
-                     column="parent_id" referenceTable="sales_payment_transaction" referenceColumn="transaction_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALES_PAYMENT_TRANSACTION_PAYMENT_ID_SALES_ORDER_PAYMENT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_PAYMENT_TRANSACTION_PAYMENT_ID_SALES_ORDER_PAYMENT_ENTT_ID"
-                     table="sales_payment_transaction" column="payment_id" referenceTable="sales_order_payment"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="SALES_PAYMENT_TRANSACTION_ORDER_ID_PAYMENT_ID_TXN_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_PAYMENT_TRANSACTION_ORDER_ID_PAYMENT_ID_TXN_ID">
-             <column name="order_id"/>
-             <column name="payment_id"/>
-             <column name="txn_id"/>
-         </constraint>
--        <index name="SALES_PAYMENT_TRANSACTION_PARENT_ID" indexType="btree">
-+        <index referenceId="SALES_PAYMENT_TRANSACTION_PARENT_ID" indexType="btree">
-             <column name="parent_id"/>
-         </index>
--        <index name="SALES_PAYMENT_TRANSACTION_PAYMENT_ID" indexType="btree">
-+        <index referenceId="SALES_PAYMENT_TRANSACTION_PAYMENT_ID" indexType="btree">
-             <column name="payment_id"/>
-         </index>
-     </table>
-@@ -1737,24 +1737,24 @@
-         <column xsi:type="varchar" name="order_status" nullable="false" length="50" comment="Order Status"/>
-         <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Orders Count"/>
--        <column xsi:type="decimal" name="refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Refunded"/>
--        <column xsi:type="decimal" name="online_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="online_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Online Refunded"/>
--        <column xsi:type="decimal" name="offline_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="offline_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Offline Refunded"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_REFUNDED_AGGREGATED_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_REFUNDED_AGGREGATED_STORE_ID_STORE_STORE_ID"
-                     table="sales_refunded_aggregated" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="SALES_REFUNDED_AGGREGATED_PERIOD_STORE_ID_ORDER_STATUS">
-+        <constraint xsi:type="unique" referenceId="SALES_REFUNDED_AGGREGATED_PERIOD_STORE_ID_ORDER_STATUS">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="order_status"/>
-         </constraint>
--        <index name="SALES_REFUNDED_AGGREGATED_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_REFUNDED_AGGREGATED_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -1767,24 +1767,24 @@
-         <column xsi:type="varchar" name="order_status" nullable="true" length="50" comment="Order Status"/>
-         <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Orders Count"/>
--        <column xsi:type="decimal" name="refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Refunded"/>
--        <column xsi:type="decimal" name="online_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="online_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Online Refunded"/>
--        <column xsi:type="decimal" name="offline_refunded" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="offline_refunded" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Offline Refunded"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_REFUNDED_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_REFUNDED_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID"
-                     table="sales_refunded_aggregated_order" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="SALES_REFUNDED_AGGREGATED_ORDER_PERIOD_STORE_ID_ORDER_STATUS">
-+        <constraint xsi:type="unique" referenceId="SALES_REFUNDED_AGGREGATED_ORDER_PERIOD_STORE_ID_ORDER_STATUS">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="order_status"/>
-         </constraint>
--        <index name="SALES_REFUNDED_AGGREGATED_ORDER_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_REFUNDED_AGGREGATED_ORDER_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -1798,23 +1798,23 @@
-                 comment="Shipping Description"/>
-         <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Orders Count"/>
--        <column xsi:type="decimal" name="total_shipping" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="total_shipping" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Total Shipping"/>
--        <column xsi:type="decimal" name="total_shipping_actual" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_shipping_actual" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Total Shipping Actual"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_SHIPPING_AGGREGATED_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_SHIPPING_AGGREGATED_STORE_ID_STORE_STORE_ID"
-                     table="sales_shipping_aggregated" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="SALES_SHPP_AGGRED_PERIOD_STORE_ID_ORDER_STS_SHPP_DESCRIPTION">
-+        <constraint xsi:type="unique" referenceId="SALES_SHPP_AGGRED_PERIOD_STORE_ID_ORDER_STS_SHPP_DESCRIPTION">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="order_status"/>
-             <column name="shipping_description"/>
-         </constraint>
--        <index name="SALES_SHIPPING_AGGREGATED_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_SHIPPING_AGGREGATED_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -1829,23 +1829,23 @@
-                 comment="Shipping Description"/>
-         <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Orders Count"/>
--        <column xsi:type="decimal" name="total_shipping" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="total_shipping" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Total Shipping"/>
--        <column xsi:type="decimal" name="total_shipping_actual" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_shipping_actual" scale="4" precision="20" unsigned="false"
-                 nullable="true" comment="Total Shipping Actual"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_SHIPPING_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_SHIPPING_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID"
-                     table="sales_shipping_aggregated_order" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="UNQ_C05FAE47282EEA68654D0924E946761F">
-+        <constraint xsi:type="unique" referenceId="UNQ_C05FAE47282EEA68654D0924E946761F">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="order_status"/>
-             <column name="shipping_description"/>
-         </constraint>
--        <index name="SALES_SHIPPING_AGGREGATED_ORDER_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_SHIPPING_AGGREGATED_ORDER_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -1864,21 +1864,21 @@
-                 default="0" comment="Qty Ordered"/>
-         <column xsi:type="smallint" name="rating_pos" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Rating Pos"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_BESTSELLERS_AGGREGATED_DAILY_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_BESTSELLERS_AGGREGATED_DAILY_STORE_ID_STORE_STORE_ID"
-                     table="sales_bestsellers_aggregated_daily" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="SALES_BESTSELLERS_AGGREGATED_DAILY_PERIOD_STORE_ID_PRODUCT_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_BESTSELLERS_AGGREGATED_DAILY_PERIOD_STORE_ID_PRODUCT_ID">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <index name="SALES_BESTSELLERS_AGGREGATED_DAILY_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_BESTSELLERS_AGGREGATED_DAILY_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALES_BESTSELLERS_AGGREGATED_DAILY_PRODUCT_ID" indexType="btree">
-+        <index referenceId="SALES_BESTSELLERS_AGGREGATED_DAILY_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-@@ -1897,21 +1897,21 @@
-                 default="0" comment="Qty Ordered"/>
-         <column xsi:type="smallint" name="rating_pos" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Rating Pos"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_BESTSELLERS_AGGREGATED_MONTHLY_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_BESTSELLERS_AGGREGATED_MONTHLY_STORE_ID_STORE_STORE_ID"
-                     table="sales_bestsellers_aggregated_monthly" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="SALES_BESTSELLERS_AGGREGATED_MONTHLY_PERIOD_STORE_ID_PRODUCT_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_BESTSELLERS_AGGREGATED_MONTHLY_PERIOD_STORE_ID_PRODUCT_ID">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <index name="SALES_BESTSELLERS_AGGREGATED_MONTHLY_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_BESTSELLERS_AGGREGATED_MONTHLY_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALES_BESTSELLERS_AGGREGATED_MONTHLY_PRODUCT_ID" indexType="btree">
-+        <index referenceId="SALES_BESTSELLERS_AGGREGATED_MONTHLY_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-@@ -1930,21 +1930,21 @@
-                 default="0" comment="Qty Ordered"/>
-         <column xsi:type="smallint" name="rating_pos" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Rating Pos"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_BESTSELLERS_AGGREGATED_YEARLY_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_BESTSELLERS_AGGREGATED_YEARLY_STORE_ID_STORE_STORE_ID"
-                     table="sales_bestsellers_aggregated_yearly" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="SALES_BESTSELLERS_AGGREGATED_YEARLY_PERIOD_STORE_ID_PRODUCT_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_BESTSELLERS_AGGREGATED_YEARLY_PERIOD_STORE_ID_PRODUCT_ID">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="product_id"/>
-         </constraint>
--        <index name="SALES_BESTSELLERS_AGGREGATED_YEARLY_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_BESTSELLERS_AGGREGATED_YEARLY_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALES_BESTSELLERS_AGGREGATED_YEARLY_PRODUCT_ID" indexType="btree">
-+        <index referenceId="SALES_BESTSELLERS_AGGREGATED_YEARLY_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
-     </table>
-@@ -1957,22 +1957,22 @@
-         <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
-         <column xsi:type="decimal" name="percent" scale="4" precision="12" unsigned="false" nullable="true"
-                 comment="Percent"/>
--        <column xsi:type="decimal" name="amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Amount"/>
-         <column xsi:type="int" name="priority" padding="11" unsigned="false" nullable="false" identity="false"
-                 comment="Priority"/>
-         <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="false" identity="false"
-                 comment="Position"/>
--        <column xsi:type="decimal" name="base_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Amount"/>
-         <column xsi:type="smallint" name="process" padding="6" unsigned="false" nullable="false" identity="false"
-                 comment="Process"/>
--        <column xsi:type="decimal" name="base_real_amount" scale="4" precision="12" unsigned="false" nullable="true"
-+        <column xsi:type="decimal" name="base_real_amount" scale="4" precision="20" unsigned="false" nullable="true"
-                 comment="Base Real Amount"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="tax_id"/>
-         </constraint>
--        <index name="SALES_ORDER_TAX_ORDER_ID_PRIORITY_POSITION" indexType="btree">
-+        <index referenceId="SALES_ORDER_TAX_ORDER_ID_PRIORITY_POSITION" indexType="btree">
-             <column name="order_id"/>
-             <column name="priority"/>
-             <column name="position"/>
-@@ -1987,42 +1987,42 @@
-                 comment="Item Id"/>
-         <column xsi:type="decimal" name="tax_percent" scale="4" precision="12" unsigned="false" nullable="false"
-                 comment="Real Tax Percent For Item"/>
--        <column xsi:type="decimal" name="amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 comment="Tax amount for the item and tax rate"/>
--        <column xsi:type="decimal" name="base_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="base_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 comment="Base tax amount for the item and tax rate"/>
--        <column xsi:type="decimal" name="real_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="real_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 comment="Real tax amount for the item and tax rate"/>
--        <column xsi:type="decimal" name="real_base_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="real_base_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 comment="Real base tax amount for the item and tax rate"/>
-         <column xsi:type="int" name="associated_item_id" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="Id of the associated item"/>
-         <column xsi:type="varchar" name="taxable_item_type" nullable="false" length="32"
-                 comment="Type of the taxable item"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="tax_item_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_ORDER_TAX_ITEM_ASSOCIATED_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_TAX_ITEM_ASSOCIATED_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID"
-                     table="sales_order_tax_item" column="associated_item_id" referenceTable="sales_order_item"
-                     referenceColumn="item_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALES_ORDER_TAX_ITEM_TAX_ID_SALES_ORDER_TAX_TAX_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_TAX_ITEM_TAX_ID_SALES_ORDER_TAX_TAX_ID"
-                     table="sales_order_tax_item" column="tax_id" referenceTable="sales_order_tax"
-                     referenceColumn="tax_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALES_ORDER_TAX_ITEM_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_TAX_ITEM_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID"
-                     table="sales_order_tax_item" column="item_id" referenceTable="sales_order_item"
-                     referenceColumn="item_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="SALES_ORDER_TAX_ITEM_TAX_ID_ITEM_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_ORDER_TAX_ITEM_TAX_ID_ITEM_ID">
-             <column name="tax_id"/>
-             <column name="item_id"/>
-         </constraint>
--        <index name="SALES_ORDER_TAX_ITEM_ITEM_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_TAX_ITEM_ITEM_ID" indexType="btree">
-             <column name="item_id"/>
-         </index>
-     </table>
-     <table name="sales_order_status" resource="sales" engine="innodb" comment="Sales Order Status Table">
-         <column xsi:type="varchar" name="status" nullable="false" length="32" comment="Status"/>
-         <column xsi:type="varchar" name="label" nullable="false" length="128" comment="Label"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="status"/>
-         </constraint>
-     </table>
-@@ -2033,11 +2033,11 @@
-                 default="0" comment="Is Default"/>
-         <column xsi:type="smallint" name="visible_on_front" padding="5" unsigned="true" nullable="false"
-                 identity="false" default="0" comment="Visible on front"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="status"/>
-             <column name="state"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_ORDER_STATUS_STATE_STATUS_SALES_ORDER_STATUS_STATUS"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_STATUS_STATE_STATUS_SALES_ORDER_STATUS_STATUS"
-                     table="sales_order_status_state" column="status" referenceTable="sales_order_status"
-                     referenceColumn="status" onDelete="CASCADE"/>
-     </table>
-@@ -2046,17 +2046,17 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Store Id"/>
-         <column xsi:type="varchar" name="label" nullable="false" length="128" comment="Label"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="status"/>
-             <column name="store_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_ORDER_STATUS_LABEL_STATUS_SALES_ORDER_STATUS_STATUS"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_STATUS_LABEL_STATUS_SALES_ORDER_STATUS_STATUS"
-                     table="sales_order_status_label" column="status" referenceTable="sales_order_status"
-                     referenceColumn="status" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALES_ORDER_STATUS_LABEL_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_STATUS_LABEL_STORE_ID_STORE_STORE_ID"
-                     table="sales_order_status_label" column="store_id" referenceTable="store" referenceColumn="store_id"
-                     onDelete="CASCADE"/>
--        <index name="SALES_ORDER_STATUS_LABEL_STORE_ID" indexType="btree">
-+        <index referenceId="SALES_ORDER_STATUS_LABEL_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
-index ed9e5240576..f6618c9884d 100644
---- a/app/code/Magento/Sales/etc/di.xml
-+++ b/app/code/Magento/Sales/etc/di.xml
-@@ -116,6 +116,7 @@
-     <preference for="Magento\Sales\Api\RefundOrderInterface" type="Magento\Sales\Model\RefundOrder"/>
-     <preference for="Magento\Sales\Api\RefundInvoiceInterface" type="Magento\Sales\Model\RefundInvoice"/>
-     <preference for="Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProviderInterface" type="Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider" />
-+    <preference for="Magento\Sales\Model\ConfigInterface" type="Magento\Sales\Model\Config" />
-     <type name="Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider">
-         <arguments>
-             <argument name="providers" xsi:type="array">
-@@ -354,43 +355,43 @@
- 
-     <virtualType name="SalesOrderSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
-         <arguments>
--            <argument name="emailSenderHandler" xsi:type="object">SalesOrderSendEmails</argument>
-+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderSendEmails</argument>
-         </arguments>
-     </virtualType>
-     <virtualType name="SalesOrderInvoiceSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
-         <arguments>
--            <argument name="emailSenderHandler" xsi:type="object">SalesOrderInvoiceSendEmails</argument>
-+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderInvoiceSendEmails</argument>
-         </arguments>
-     </virtualType>
-     <virtualType name="SalesOrderShipmentSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
-         <arguments>
--            <argument name="emailSenderHandler" xsi:type="object">SalesOrderShipmentSendEmails</argument>
-+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderShipmentSendEmails</argument>
-         </arguments>
-     </virtualType>
-     <virtualType name="SalesOrderCreditmemoSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
-         <arguments>
--            <argument name="emailSenderHandler" xsi:type="object">SalesOrderCreditmemoSendEmails</argument>
-+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderCreditmemoSendEmails</argument>
-         </arguments>
-     </virtualType>
- 
-     <virtualType name="SalesOrderSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
-         <arguments>
--            <argument name="emailSenderHandler" xsi:type="object">SalesOrderSendEmails</argument>
-+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderSendEmails</argument>
-         </arguments>
-     </virtualType>
-     <virtualType name="SalesInvoiceSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
-         <arguments>
--            <argument name="emailSenderHandler" xsi:type="object">SalesOrderInvoiceSendEmails</argument>
-+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderInvoiceSendEmails</argument>
-         </arguments>
-     </virtualType>
-     <virtualType name="SalesShipmentSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
-         <arguments>
--            <argument name="emailSenderHandler" xsi:type="object">SalesOrderShipmentSendEmails</argument>
-+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderShipmentSendEmails</argument>
-         </arguments>
-     </virtualType>
-     <virtualType name="SalesCreditmemoSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
-         <arguments>
--            <argument name="emailSenderHandler" xsi:type="object">SalesOrderCreditmemoSendEmails</argument>
-+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderCreditmemoSendEmails</argument>
-         </arguments>
-     </virtualType>
-     <type name="Magento\SalesSequence\Model\EntityPool">
-@@ -745,6 +746,10 @@
-     <virtualType name="ShippingAddressAggregator" type="Magento\Framework\DB\Sql\ConcatExpression">
-         <arguments>
-             <argument name="columns" xsi:type="array">
-+                <item name="company" xsi:type="array">
-+                    <item name="tableAlias" xsi:type="string">sales_shipping_address</item>
-+                    <item name="columnName" xsi:type="string">company</item>
-+                </item>
-                 <item name="street" xsi:type="array">
-                     <item name="tableAlias" xsi:type="string">sales_shipping_address</item>
-                     <item name="columnName" xsi:type="string">street</item>
-@@ -768,6 +773,10 @@
-     <virtualType name="BillingAddressAggregator" type="Magento\Framework\DB\Sql\ConcatExpression">
-         <arguments>
-             <argument name="columns" xsi:type="array">
-+                <item name="company" xsi:type="array">
-+                    <item name="tableAlias" xsi:type="string">sales_billing_address</item>
-+                    <item name="columnName" xsi:type="string">company</item>
-+                </item>
-                 <item name="street" xsi:type="array">
-                     <item name="tableAlias" xsi:type="string">sales_billing_address</item>
-                     <item name="columnName" xsi:type="string">street</item>
-@@ -1007,4 +1016,9 @@
-     <preference
-             for="Magento\Sales\Api\OrderCustomerDelegateInterface"
-             type="Magento\Sales\Model\Order\OrderCustomerDelegate" />
-+    <type name="Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityChecker">
-+        <arguments>
-+            <argument name="productAvailabilityChecks" xsi:type="array" />
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Sales/etc/extension_attributes.xml b/app/code/Magento/Sales/etc/extension_attributes.xml
-index 7280a1a0715..222f61cdc73 100644
---- a/app/code/Magento/Sales/etc/extension_attributes.xml
-+++ b/app/code/Magento/Sales/etc/extension_attributes.xml
-@@ -10,4 +10,7 @@
-     <extension_attributes for="Magento\Sales\Api\Data\OrderInterface">
-         <attribute code="shipping_assignments" type="Magento\Sales\Api\Data\ShippingAssignmentInterface[]" />
-     </extension_attributes>
-+    <extension_attributes for="Magento\Sales\Api\Data\OrderInterface">
-+        <attribute code="payment_additional_info" type="Magento\Payment\Api\Data\PaymentAdditionalInfoInterface[]" />
-+    </extension_attributes>
- </config>
-diff --git a/app/code/Magento/Sales/etc/webapi.xml b/app/code/Magento/Sales/etc/webapi.xml
-index cee245e3483..492dff80570 100644
---- a/app/code/Magento/Sales/etc/webapi.xml
-+++ b/app/code/Magento/Sales/etc/webapi.xml
-@@ -10,271 +10,271 @@
-     <route url="/V1/orders/:id" method="GET">
-         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="get"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::actions_view" />
-         </resources>
-     </route>
-     <route url="/V1/orders" method="GET">
-         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="getList"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::actions_view" />
-         </resources>
-     </route>
-     <route url="/V1/orders/:id/statuses" method="GET">
-         <service class="Magento\Sales\Api\OrderManagementInterface" method="getStatus"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::actions_view" />
-         </resources>
-     </route>
-     <route url="/V1/orders/:id/cancel" method="POST">
-         <service class="Magento\Sales\Api\OrderManagementInterface" method="cancel"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::cancel" />
-         </resources>
-     </route>
-     <route url="/V1/orders/:id/emails" method="POST">
-         <service class="Magento\Sales\Api\OrderManagementInterface" method="notify"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::emails" />
-         </resources>
-     </route>
-     <route url="/V1/orders/:id/hold" method="POST">
-         <service class="Magento\Sales\Api\OrderManagementInterface" method="hold"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::hold" />
-         </resources>
-     </route>
-     <route url="/V1/orders/:id/unhold" method="POST">
-         <service class="Magento\Sales\Api\OrderManagementInterface" method="unHold"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::unhold" />
-         </resources>
-     </route>
-     <route url="/V1/orders/:id/comments" method="POST">
-         <service class="Magento\Sales\Api\OrderManagementInterface" method="addComment"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::comment" />
-         </resources>
-     </route>
-     <route url="/V1/orders/:id/comments" method="GET">
-         <service class="Magento\Sales\Api\OrderManagementInterface" method="getCommentsList"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::actions_view" />
-         </resources>
-     </route>
-     <route url="/V1/orders/create" method="PUT">
-         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="save"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::create" />
-         </resources>
-     </route>
-     <route url="/V1/orders/:parent_id" method="PUT">
-         <service class="Magento\Sales\Api\OrderAddressRepositoryInterface" method="save"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::create" />
-         </resources>
-     </route>
-     <route url="/V1/orders/items/:id" method="GET">
-         <service class="Magento\Sales\Api\OrderItemRepositoryInterface" method="get"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::actions_view" />
-         </resources>
-     </route>
-     <route url="/V1/orders/items" method="GET">
-         <service class="Magento\Sales\Api\OrderItemRepositoryInterface" method="getList"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::actions_view" />
-         </resources>
-     </route>
-     <route url="/V1/invoices/:id" method="GET">
-         <service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="get"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_invoice" />
-         </resources>
-     </route>
-     <route url="/V1/invoices" method="GET">
-         <service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="getList"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_invoice" />
-         </resources>
-     </route>
-     <route url="/V1/invoices/:id/comments" method="GET">
-         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="getCommentsList"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_invoice" />
-         </resources>
-     </route>
-     <route url="/V1/invoices/:id/emails" method="POST">
-         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="notify"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_invoice" />
-         </resources>
-     </route>
-     <route url="/V1/invoices/:id/void" method="POST">
-         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="setVoid"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_invoice" />
-         </resources>
-     </route>
-     <route url="/V1/invoices/:id/capture" method="POST">
-         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="setCapture"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_invoice" />
-         </resources>
-     </route>
-     <route url="/V1/invoices/comments" method="POST">
-         <service class="Magento\Sales\Api\InvoiceCommentRepositoryInterface" method="save"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_invoice" />
-         </resources>
-     </route>
-     <route url="/V1/invoices/" method="POST">
-         <service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="save"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_invoice" />
-         </resources>
-     </route>
-     <route url="/V1/invoice/:invoiceId/refund" method="POST">
-         <service class="Magento\Sales\Api\RefundInvoiceInterface" method="execute"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_invoice" />
-         </resources>
-     </route>
-     <route url="/V1/creditmemo/:id/comments" method="GET">
-         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="getCommentsList"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_creditmemo" />
-         </resources>
-     </route>
-     <route url="/V1/creditmemos" method="GET">
-         <service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="getList"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_creditmemo" />
-         </resources>
-     </route>
-     <route url="/V1/creditmemo/:id" method="GET">
-         <service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="get"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_creditmemo" />
-         </resources>
-     </route>
-     <route url="/V1/creditmemo/:id" method="PUT">
-         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="cancel"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_creditmemo" />
-         </resources>
-     </route>
-     <route url="/V1/creditmemo/:id/emails" method="POST">
-         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="notify"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_creditmemo" />
-         </resources>
-     </route>
-     <route url="/V1/creditmemo/refund" method="POST">
-         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="refund"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_creditmemo" />
-         </resources>
-     </route>
-     <route url="/V1/creditmemo/:id/comments" method="POST">
-         <service class="Magento\Sales\Api\CreditmemoCommentRepositoryInterface" method="save"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_creditmemo" />
-         </resources>
-     </route>
-     <route url="/V1/creditmemo" method="POST">
-         <service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="save"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::sales_creditmemo" />
-         </resources>
-     </route>
-     <route url="/V1/order/:orderId/refund" method="POST">
-         <service class="Magento\Sales\Api\RefundOrderInterface" method="execute"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::creditmemo" />
-         </resources>
-     </route>
-     <route url="/V1/shipment/:id" method="GET">
-         <service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="get"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::shipment" />
-         </resources>
-     </route>
-     <route url="/V1/shipments" method="GET">
-         <service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="getList"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::shipment" />
-         </resources>
-     </route>
-     <route url="/V1/shipment/:id/comments" method="GET">
-         <service class="Magento\Sales\Api\ShipmentManagementInterface" method="getCommentsList"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::shipment" />
-         </resources>
-     </route>
-     <route url="/V1/shipment/:id/comments" method="POST">
-         <service class="Magento\Sales\Api\ShipmentCommentRepositoryInterface" method="save"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::shipment" />
-         </resources>
-     </route>
-     <route url="/V1/shipment/:id/emails" method="POST">
-         <service class="Magento\Sales\Api\ShipmentManagementInterface" method="notify"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::shipment" />
-         </resources>
-     </route>
-     <route url="/V1/shipment/track" method="POST">
-         <service class="Magento\Sales\Api\ShipmentTrackRepositoryInterface" method="save"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::shipment" />
-         </resources>
-     </route>
-     <route url="/V1/shipment/track/:id" method="DELETE">
-         <service class="Magento\Sales\Api\ShipmentTrackRepositoryInterface" method="deleteById"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::shipment" />
-         </resources>
-     </route>
-     <route url="/V1/shipment/" method="POST">
-         <service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="save"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::shipment" />
-         </resources>
-     </route>
-     <route url="/V1/shipment/:id/label" method="GET">
-         <service class="Magento\Sales\Api\ShipmentManagementInterface" method="getLabel"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::shipment" />
-         </resources>
-     </route>
-     <route url="/V1/order/:orderId/ship" method="POST">
-         <service class="Magento\Sales\Api\ShipOrderInterface" method="execute"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::ship" />
-         </resources>
-     </route>
-     <route url="/V1/orders/" method="POST">
-         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="save"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::create" />
-         </resources>
-     </route>
-     <route url="/V1/transactions/:id" method="GET">
-         <service class="Magento\Sales\Api\TransactionRepositoryInterface" method="get"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::transactions_fetch" />
-         </resources>
-     </route>
-     <route url="/V1/transactions" method="GET">
-         <service class="Magento\Sales\Api\TransactionRepositoryInterface" method="getList"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::transactions_fetch" />
-         </resources>
-     </route>
-     <route url="/V1/order/:orderId/invoice" method="POST">
-         <service class="Magento\Sales\Api\InvoiceOrderInterface" method="execute"/>
-         <resources>
--            <resource ref="Magento_Sales::sales" />
-+            <resource ref="Magento_Sales::invoice" />
-         </resources>
-     </route>
- </routes>
-diff --git a/app/code/Magento/Sales/etc/webapi_rest/di.xml b/app/code/Magento/Sales/etc/webapi_rest/di.xml
-index 0cfd36e2191..5d7838297a7 100644
---- a/app/code/Magento/Sales/etc/webapi_rest/di.xml
-+++ b/app/code/Magento/Sales/etc/webapi_rest/di.xml
-@@ -6,10 +6,17 @@
-  */
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
--    <type name="Magento\Quote\Model\QuoteRepository">
--        <plugin name="authorization" type="Magento\Quote\Model\QuoteRepository\Plugin\Authorization" />
--    </type>
-     <type name="Magento\Sales\Model\ResourceModel\Order">
-         <plugin name="authorization" type="Magento\Sales\Model\ResourceModel\Order\Plugin\Authorization" />
-     </type>
-+    <type name="Magento\Sales\Api\ShipmentRepositoryInterface">
-+        <plugin name="convert_blob_to_string" type="Magento\Sales\Plugin\ShippingLabelConverter" />
-+    </type>
-+    <type name="Magento\Framework\Reflection\DataObjectProcessor">
-+        <arguments>
-+            <argument name="processors" xsi:type="array">
-+                <item name="Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
-+            </argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Sales/etc/webapi_soap/di.xml b/app/code/Magento/Sales/etc/webapi_soap/di.xml
-index 0cfd36e2191..5d7838297a7 100644
---- a/app/code/Magento/Sales/etc/webapi_soap/di.xml
-+++ b/app/code/Magento/Sales/etc/webapi_soap/di.xml
-@@ -6,10 +6,17 @@
-  */
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
--    <type name="Magento\Quote\Model\QuoteRepository">
--        <plugin name="authorization" type="Magento\Quote\Model\QuoteRepository\Plugin\Authorization" />
--    </type>
-     <type name="Magento\Sales\Model\ResourceModel\Order">
-         <plugin name="authorization" type="Magento\Sales\Model\ResourceModel\Order\Plugin\Authorization" />
-     </type>
-+    <type name="Magento\Sales\Api\ShipmentRepositoryInterface">
-+        <plugin name="convert_blob_to_string" type="Magento\Sales\Plugin\ShippingLabelConverter" />
-+    </type>
-+    <type name="Magento\Framework\Reflection\DataObjectProcessor">
-+        <arguments>
-+            <argument name="processors" xsi:type="array">
-+                <item name="Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
-+            </argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
-index a32f3cacce7..c5657f3a309 100644
---- a/app/code/Magento/Sales/i18n/en_US.csv
-+++ b/app/code/Magento/Sales/i18n/en_US.csv
-@@ -686,17 +686,9 @@ General,General
- "Allow Reorder","Allow Reorder"
- "Invoice and Packing Slip Design","Invoice and Packing Slip Design"
- "Logo for PDF Print-outs (200x50)","Logo for PDF Print-outs (200x50)"
--"
--                        Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
--                    ","
--                        Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
--                    "
-+"Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.","Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image."
- "Logo for HTML Print View","Logo for HTML Print View"
--"
--                        Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
--                    ","
--                        Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
--                    "
-+"Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)","Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)"
- Address,Address
- "Minimum Order Amount","Minimum Order Amount"
- Enable,Enable
-@@ -803,3 +795,5 @@ Created,Created
- "PDF Shipments","PDF Shipments"
- "PDF Creditmemos","PDF Creditmemos"
- Refunds,Refunds
-+"Allow Zero GrandTotal for Creditmemo","Allow Zero GrandTotal for Creditmemo"
-+"Allow Zero GrandTotal","Allow Zero GrandTotal"
-diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
-index c321bee460e..fe2cb7e01b7 100644
---- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
-@@ -13,7 +13,7 @@
-                     <argument name="id" xsi:type="string">sales_order_create_customer_grid</argument>
-                     <argument name="use_ajax" xsi:type="string">1</argument>
-                     <argument name="default_sort" xsi:type="string">entity_id</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Sales\Model\ResourceModel\Order\Customer\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Sales\Model\ResourceModel\Order\Customer\Collection</argument>
-                     <argument name="pager_visibility" xsi:type="string">1</argument>
-                     <argument name="grid_url" xsi:type="url" path="*/*/loadBlock">
-                         <param name="block">customer_grid</param>
-@@ -80,13 +80,13 @@
-                             <argument name="align" xsi:type="string">center</argument>
-                         </arguments>
-                     </block>
--                </block>
--                <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.grid.columnSet.website_name" as="website_name">
--                    <arguments>
--                        <argument name="header" xsi:type="string" translate="true">Website</argument>
--                        <argument name="index" xsi:type="string">website_name</argument>
--                        <argument name="align" xsi:type="string">center</argument>
--                    </arguments>
-+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.grid.columnSet.website_name" as="website_name">
-+                        <arguments>
-+                            <argument name="header" xsi:type="string" translate="true">Website</argument>
-+                            <argument name="index" xsi:type="string">website_name</argument>
-+                            <argument name="align" xsi:type="string">center</argument>
-+                        </arguments>
-+                    </block>
-                 </block>
-             </block>
-         </referenceBlock>
-diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
-index eb0a7685e5e..3832476ff69 100644
---- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
-@@ -45,8 +45,18 @@
-                             <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pviewed" template="Magento_Sales::order/create/sidebar/items.phtml" name="pviewed"/>
-                         </block>
-                         <block class="Magento\Sales\Block\Adminhtml\Order\Create\Form\Account" template="Magento_Sales::order/create/form/account.phtml" name="form_account"/>
--                        <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address"/>
--                        <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address"/>
-+                        <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address">
-+                            <arguments>
-+                                <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
-+                                <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
-+                            </arguments>
-+                        </block>
-+                        <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address">
-+                            <arguments>
-+                                <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
-+                                <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
-+                            </arguments>
-+                        </block>
-                         <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method" template="Magento_Sales::order/create/abstract.phtml" name="shipping_method">
-                             <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form" template="Magento_Sales::order/create/shipping/method/form.phtml" name="order_create_shipping_form" as="form"/>
-                         </block>
-diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
-index 6f0cbdb0cd4..c52f81d5cb5 100644
---- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
-@@ -8,7 +8,12 @@
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceContainer name="content">
--            <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address"/>
-+            <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address">
-+                <arguments>
-+                    <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
-+                    <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
-+                </arguments>
-+            </block>
-         </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
-index 70b5bfc2982..54348ce961c 100644
---- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
-@@ -20,8 +20,18 @@
-                     <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pviewed" template="Magento_Sales::order/create/sidebar/items.phtml" name="pviewed"/>
-                 </block>
-                 <block class="Magento\Sales\Block\Adminhtml\Order\Create\Form\Account" template="Magento_Sales::order/create/form/account.phtml" name="form_account"/>
--                <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address"/>
--                <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address"/>
-+                <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address">
-+                    <arguments>
-+                        <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
-+                        <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
-+                    </arguments>
-+                </block>
-+                <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address">
-+                    <arguments>
-+                        <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
-+                        <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
-+                    </arguments>
-+                </block>
-                 <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method" template="Magento_Sales::order/create/abstract.phtml" name="shipping_method">
-                     <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form" template="Magento_Sales::order/create/shipping/method/form.phtml" name="order.create.shipping.method.form" as="form"/>
-                 </block>
-diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml
-index 56f6786397d..559f56dcb84 100644
---- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml
-@@ -8,7 +8,12 @@
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceContainer name="content">
--            <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address"/>
-+            <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address">
-+                <arguments>
-+                    <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
-+                    <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
-+                </arguments>
-+            </block>
-         </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_grid_block.xml
-index 7f14ff3728a..318416a777f 100644
---- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_grid_block.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_grid_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="sales.order_creditmemo.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">order_creditmemos</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Sales\Model\ResourceModel\Order\Creditmemo\Order\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Sales\Model\ResourceModel\Order\Creditmemo\Order\Grid\Collection</argument>
-                     <argument name="use_ajax" xsi:type="boolean">true</argument>
-                     <argument name="default_sort" xsi:type="string">created_at</argument>
-                     <argument name="default_dir" xsi:type="string">DESC</argument>
-diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_grid_block.xml
-index 941696f0ce8..d69ed426771 100644
---- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_grid_block.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_grid_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="sales.order_invoice.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">order_invoices</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Sales\Model\ResourceModel\Order\Invoice\Orders\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Sales\Model\ResourceModel\Order\Invoice\Orders\Grid\Collection</argument>
-                     <argument name="use_ajax" xsi:type="boolean">true</argument>
-                     <argument name="default_sort" xsi:type="string">created_at</argument>
-                     <argument name="default_dir" xsi:type="string">DESC</argument>
-diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_grid_block.xml
-index 0180efd29d2..21b5d3b06c1 100644
---- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_grid_block.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_grid_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="sales.order_shipment.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">order_shipments</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Sales\Model\ResourceModel\Order\Shipment\Order\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Sales\Model\ResourceModel\Order\Shipment\Order\Grid\Collection</argument>
-                     <argument name="use_ajax" xsi:type="boolean">true</argument>
-                     <argument name="default_sort" xsi:type="string">created_at</argument>
-                     <argument name="default_dir" xsi:type="string">DESC</argument>
-diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
-index 87d7644a4b0..6854d3bb7bc 100644
---- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
-@@ -12,7 +12,7 @@
-                 <block class="Magento\Backend\Block\Widget\Grid" name="sales_order_status.grid" as="grid">
-                     <arguments>
-                         <argument name="id" xsi:type="string">sales_order_status_grid</argument>
--                        <argument name="dataSource" xsi:type="object">Magento\Sales\Model\ResourceModel\Status\Collection</argument>
-+                        <argument name="dataSource" xsi:type="object" shared="false">Magento\Sales\Model\ResourceModel\Status\Collection</argument>
-                         <argument name="default_sort" xsi:type="string">state</argument>
-                         <argument name="default_dir" xsi:type="string">desc</argument>
-                         <argument name="pager_visibility" xsi:type="string">1</argument>
-diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions_grid_block.xml
-index c2f55328572..adb722f6d0f 100644
---- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions_grid_block.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions_grid_block.xml
-@@ -13,7 +13,7 @@
-         <referenceBlock name="sales.transactions.grid">
-             <arguments>
-                 <argument name="id" xsi:type="string">order_transactions</argument>
--                <argument name="dataSource" xsi:type="object">
-+                <argument name="dataSource" xsi:type="object" shared="false">
-                     <updater>Magento\Sales\Model\Grid\CollectionUpdater</updater>
-                 </argument>
-                 <argument name="use_ajax" xsi:type="boolean">true</argument>
-diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_transaction_child_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_transaction_child_block.xml
-index aa8672a68bc..5bdad85ebc1 100644
---- a/app/code/Magento/Sales/view/adminhtml/layout/sales_transaction_child_block.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_transaction_child_block.xml
-@@ -11,7 +11,7 @@
-         <referenceBlock name="sales.transactions.grid">
-             <arguments>
-                 <argument name="id" xsi:type="string">transactionChildGrid</argument>
--                <argument name="dataSource" xsi:type="object">
-+                <argument name="dataSource" xsi:type="object" shared="false">
-                     <updater>Magento\Sales\Model\Grid\Child\CollectionUpdater</updater>
-                 </argument>
-                 <argument name="use_ajax" xsi:type="string">false</argument>
-diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid_block.xml
-index 9f3b7f23ba2..37b319b9435 100644
---- a/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid_block.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="sales.transactions.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">sales_transactions_grid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Sales\Model\ResourceModel\Transaction\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Sales\Model\ResourceModel\Transaction\Grid\Collection</argument>
-                     <argument name="use_ajax" xsi:type="string">true</argument>
-                     <argument name="default_sort" xsi:type="string">created_at</argument>
-                     <argument name="default_dir" xsi:type="string">DESC</argument>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
-index 30037a918a1..6797083afcc 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
-@@ -4,42 +4,40 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
--/**
-- * @see \Magento\Sales\Block\Adminhtml\Items\Column\Name
-- */
-+/* @var $block \Magento\Sales\Block\Adminhtml\Items\Column\Name */
- ?>
--
--<?php if ($_item = $block->getItem()): ?>
--    <div id="order_item_<?= /* @escapeNotVerified */ $_item->getId() ?>_title"
-+<?php if ($_item = $block->getItem()) : ?>
-+    <div id="order_item_<?= (int) $_item->getId() ?>_title"
-          class="product-title">
-         <?= $block->escapeHtml($_item->getName()) ?>
-     </div>
--
-     <div class="product-sku-block">
--        <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?>
-+        <span><?= $block->escapeHtml(__('SKU'))?>:</span> <?= /* @noEscape */ implode('<br />', $this->helper(\Magento\Catalog\Helper\Data::class)->splitSku($block->escapeHtml($block->getSku()))) ?>
-     </div>
- 
--    <?php if ($block->getOrderOptions()): ?>
-+    <?php if ($block->getOrderOptions()) : ?>
-         <dl class="item-options">
--            <?php foreach ($block->getOrderOptions() as $_option): ?>
--                <dt><?= /* @escapeNotVerified */ $_option['label'] ?>:</dt>
-+            <?php foreach ($block->getOrderOptions() as $_option) : ?>
-+                <dt><?= $block->escapeHtml($_option['label']) ?>:</dt>
-                 <dd>
--                    <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
--                        <?= /* @escapeNotVerified */ $block->getCustomizedOptionValue($_option) ?>
--                    <?php else: ?>
-+                    <?php if (isset($_option['custom_view']) && $_option['custom_view']) : ?>
-+                        <?= /* @noEscape */ $block->getCustomizedOptionValue($_option) ?>
-+                    <?php else : ?>
-                         <?php $_option = $block->getFormattedOption($_option['value']); ?>
--                        <?= $block->escapeHtml($_option['value']) ?><?php if (isset($_option['remainder']) && $_option['remainder']): ?><span id="<?= /* @escapeNotVerified */ $_dots = 'dots' . uniqid() ?>"> ...</span><span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_option['remainder'] ?></span>
-+                        <?php $dots = 'dots' . uniqid(); ?>
-+                        <?= $block->escapeHtml($_option['value']) ?><?php if (isset($_option['remainder']) && $_option['remainder']) : ?> <span id="<?= /* @noEscape */ $dots; ?>"> ...</span>
-+                            <?php $id = 'id' . uniqid(); ?>
-+                            <span id="<?= /* @noEscape */ $id; ?>"><?= $block->escapeHtml($_option['remainder']) ?></span>
-                             <script>
-                                 require(['prototype'], function() {
--                                    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
--                                    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
--                                    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_dots ?>').hide();});
--                                    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
--                                    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_dots ?>').show();});
-+                                    $('<?= /* @noEscape */ $id; ?>').hide();
-+                                    $('<?= /* @noEscape */ $id; ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $id; ?>').show();});
-+                                    $('<?= /* @noEscape */ $id; ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $dots; ?>').hide();});
-+                                    $('<?= /* @noEscape */ $id; ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $id; ?>').hide();});
-+                                    $('<?= /* @noEscape */ $id; ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $dots; ?>').show();});
-                                 });
-                             </script>
-                         <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
-index faa49dca3a8..645cdb9aac6 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
-@@ -3,44 +3,41 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($_item = $block->getItem()): ?>
--<table class="qty-table">
--    <tr>
--        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
--        <td><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></td>
--    </tr>
--
--    <?php if ((float) $_item->getQtyInvoiced()): ?>
-+<?php if ($item = $block->getItem()) : ?>
-+    <table class="qty-table">
-         <tr>
--            <th><?= /* @escapeNotVerified */ __('Invoiced') ?></th>
--            <td><?= /* @escapeNotVerified */ $_item->getQtyInvoiced()*1 ?></td>
-+            <th><?= $block->escapeHtml(__('Ordered')); ?></th>
-+            <td><?= (int) $item->getQtyOrdered() ?></td>
-         </tr>
--    <?php endif; ?>
- 
--    <?php if ((float) $_item->getQtyShipped()): ?>
--        <tr>
--            <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
--            <td><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></td>
--        </tr>
--    <?php endif; ?>
-+        <?php if ((float)$item->getQtyInvoiced()) : ?>
-+            <tr>
-+                <th><?= $block->escapeHtml(__('Invoiced')); ?></th>
-+                <td><?= (int) $item->getQtyInvoiced() ?></td>
-+            </tr>
-+        <?php endif; ?>
- 
--    <?php if ((float) $_item->getQtyRefunded()): ?>
--        <tr>
--            <th><?= /* @escapeNotVerified */ __('Refunded') ?></th>
--            <td><?= /* @escapeNotVerified */ $_item->getQtyRefunded()*1 ?></td>
--        </tr>
--    <?php endif; ?>
-+        <?php if ((float)$item->getQtyShipped()) : ?>
-+            <tr>
-+                <th><?= $block->escapeHtml(__('Shipped')); ?></th>
-+                <td><?= (int) $item->getQtyShipped() ?></td>
-+            </tr>
-+        <?php endif; ?>
- 
--    <?php if ((float) $_item->getQtyCanceled()): ?>
--        <tr>
--            <th><?= /* @escapeNotVerified */ __('Canceled') ?></th>
--            <td><?= /* @escapeNotVerified */ $_item->getQtyCanceled()*1 ?></td>
--        </tr>
--    <?php endif; ?>
-+        <?php if ((float)$item->getQtyRefunded()) : ?>
-+            <tr>
-+                <th><?= $block->escapeHtml(__('Refunded')); ?></th>
-+                <td><?= (int) $item->getQtyRefunded() ?></td>
-+            </tr>
-+        <?php endif; ?>
-+
-+        <?php if ((float)$item->getQtyCanceled()) : ?>
-+            <tr>
-+                <th><?= $block->escapeHtml(__('Canceled')); ?></th>
-+                <td><?= (int) $item->getQtyCanceled() ?></td>
-+            </tr>
-+        <?php endif; ?>
- 
--</table>
-+    </table>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml
-index 54e95876d76..fba82ce89be 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml
-@@ -3,16 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn $block */
--
- $_item = $block->getItem();
- ?>
--
- <div class="price-excl-tax">
--    <?= /* @escapeNotVerified */ $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
-+    <?= /* @noEscape */ $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
- </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml
-index 46a0a0926f4..74574e5e870 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml
-@@ -3,14 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn $block */
--
- $_item = $block->getItem();
- ?>
--
--<?= /* @escapeNotVerified */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
-+<?= /* @noEscape */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml
-index 444310c8088..9146fe67132 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml
-@@ -3,15 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn $block */
--
- $_item = $block->getItem();
- ?>
- <div class="price-excl-tax">
--<?= /* @escapeNotVerified */ $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
-+<?= /* @noEscape */ $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
- </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml
-index 09f6ee5d6a4..0c5b276bf38 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml
-@@ -4,21 +4,19 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
--
--<?= /* @escapeNotVerified */ $block->getItem()->getName() ?>
--<div><strong><?= /* @escapeNotVerified */ __('SKU') ?>:</strong> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getItem()->getSku()))) ?></div>
--<?php if ($block->getOrderOptions()): ?>
-+<?= $block->escapeHtml($block->getItem()->getName()) ?>
-+<div><strong><?= $block->escapeHtml(__('SKU')) ?>:</strong> <?= /* @noEscape */ implode('<br />', $this->helper(\Magento\Catalog\Helper\Data::class)->splitSku($block->escapeHtml($block->getItem()->getSku()))) ?></div>
-+<?php if ($block->getOrderOptions()) : ?>
-     <ul class="item-options">
--    <?php foreach ($block->getOrderOptions() as $option): ?>
--        <li><strong><?= /* @escapeNotVerified */ $option['label'] ?>:</strong><br />
--        <?php if (is_array($option['value'])): ?>
--        <?php foreach ($option['value'] as $item): ?>
--            <?= $block->getValueHtml($item) ?><br />
--            <?php endforeach; ?>
--        <?php else: ?>
-+    <?php foreach ($block->getOrderOptions() as $option) : ?>
-+        <li><strong><?= $block->escapeHtml($option['label']) ?>:</strong><br />
-+        <?php if (is_array($option['value'])) : ?>
-+            <?php foreach ($option['value'] as $item) : ?>
-+                <?= $block->getValueHtml($item) ?><br />
-+                <?php endforeach; ?>
-+            <?php else : ?>
-             <?= $block->escapeHtml($option['value']) ?>
-         <?php endif; ?>
-         </li>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
-index ff79e2f89cd..a7f3b3c1cc8 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
-@@ -3,19 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div class="message message-notice">
-     <div class="message-inner">
--        <div class="message-content"><?= /* @escapeNotVerified */ __('Changing address information will not recalculate shipping, tax or other order amount.') ?></div>
-+        <div class="message-content"><?= $block->escapeHtml(__('Changing address information will not recalculate shipping, tax or other order amount.')) ?></div>
-     </div>
- </div>
- 
- <fieldset class="fieldset admin__fieldset-wrapper">
-     <legend class="legend admin__legend">
--        <span><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
-+        <span><?= $block->escapeHtml($block->getHeaderText()) ?></span>
-     </legend>
-     <br>
-     <div class="form-inline" data-mage-init='{"Magento_Sales/order/edit/address/form":{}}'>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
-index f01e1c274a1..05e753c78f4 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
-@@ -3,16 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($_entity = $block->getEntity()): ?>
-+<?php if ($_entity = $block->getEntity()) : ?>
- <div id="comments_block" class="edit-order-comments">
-     <div class="order-history-block">
-         <div class="admin__field field-row">
-             <label class="admin__field-label"
--                   for="history_comment"><?= /* @escapeNotVerified */ __('Comment Text') ?></label>
-+                   for="history_comment"><?= $block->escapeHtml(__('Comment Text')) ?></label>
-             <div class="admin__field-control">
-                 <textarea name="comment[comment]"
-                           class="admin__control-textarea"
-@@ -23,7 +20,7 @@
-         </div>
-         <div class="admin__field">
-             <div class="order-history-comments-options">
--                <?php if ($block->canSendCommentEmail()): ?>
-+                <?php if ($block->canSendCommentEmail()) : ?>
-                     <div class="admin__field admin__field-option">
-                         <input name="comment[is_customer_notified]"
-                                type="checkbox"
-@@ -31,7 +28,7 @@
-                                id="history_notify"
-                                value="1" />
-                         <label class="admin__field-label"
--                               for="history_notify"><?= /* @escapeNotVerified */ __('Notify Customer by Email') ?></label>
-+                               for="history_notify"><?= $block->escapeHtml(__('Notify Customer by Email')) ?></label>
-                     </div>
-                 <?php endif; ?>
-                 <div class="admin__field admin__field-option">
-@@ -41,7 +38,7 @@
-                            class="admin__control-checkbox"
-                            value="1" />
-                     <label class="admin__field-label"
--                           for="history_visible"> <?= /* @escapeNotVerified */ __('Visible on Storefront') ?></label>
-+                           for="history_visible"> <?= $block->escapeHtml(__('Visible on Storefront')) ?></label>
-                 </div>
-             </div>
-             <div class="order-history-comments-actions">
-@@ -51,16 +48,16 @@
-     </div>
- 
-     <ul class="note-list">
--        <?php foreach ($_entity->getCommentsCollection(true) as $_comment): ?>
-+        <?php foreach ($_entity->getCommentsCollection(true) as $_comment) : ?>
-             <li>
-                 <span class="note-list-date"><?= /* @noEscape */ $block->formatDate($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
-                 <span class="note-list-time"><?= /* @noEscape */ $block->formatTime($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
-                 <span class="note-list-customer">
--                    <?= /* @escapeNotVerified */ __('Customer') ?>
--                    <?php if ($_comment->getIsCustomerNotified()): ?>
--                        <span class="note-list-customer-notified"><?= /* @escapeNotVerified */ __('Notified') ?></span>
--                    <?php else: ?>
--                        <span class="note-list-customer-not-notified"><?= /* @escapeNotVerified */ __('Not Notified') ?></span>
-+                    <?= $block->escapeHtml(__('Customer')) ?>
-+                    <?php if ($_comment->getIsCustomerNotified()) : ?>
-+                        <span class="note-list-customer-notified"><?= $block->escapeHtml(__('Notified')) ?></span>
-+                    <?php else : ?>
-+                        <span class="note-list-customer-not-notified"><?= $block->escapeHtml(__('Not Notified')) ?></span>
-                     <?php endif; ?>
-                 </span>
-                 <div class="note-list-comment"><?= $block->escapeHtml($_comment->getComment(), ['b', 'br', 'strong', 'i', 'u', 'a']) ?></div>
-@@ -70,15 +67,12 @@
- </div>
- <script>
- require(['prototype'], function(){
--
--submitComment = function() {
--    submitAndReloadArea($('comments_block').parentNode, '<?= /* @escapeNotVerified */ $block->getSubmitUrl() ?>')
--}
--
--if ($('submit_comment_button')) {
--    $('submit_comment_button').observe('click', submitComment);
--}
--
-+    submitComment = function() {
-+        submitAndReloadArea($('comments_block').parentNode, '<?= $block->escapeUrl($block->getSubmitUrl()) ?>')
-+    };
-+    if ($('submit_comment_button')) {
-+        $('submit_comment_button').observe('click', submitComment);
-+    }
- });
- </script>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
-index 13433846d6a..6083a37efea 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
-@@ -3,14 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <div class="admin__page-section-title">
--    <span class="title"><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
--    <?php if($block->getButtonsHtml()): ?>
-+    <span class="title"><?= $block->escapeHtml($block->getHeaderText()) ?></span>
-+    <?php if ($block->getButtonsHtml()) : ?>
-         <div class="actions"><?= $block->getButtonsHtml() ?></div>
-     <?php endif; ?>
- </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
-index c69d453fb81..e29c1d2db01 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
-@@ -3,11 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- ?>
- <?php if ($block->hasMethods()) : ?>
- <div id="order-billing_method_form">
--    <dl class="admin__payment-methods">
-+    <dl class="admin__payment-methods control">
-     <?php
-         $_methods = $block->getMethods();
-         $_methodsCount = count($_methods);
-@@ -20,32 +19,32 @@
-         ?>
-         <dt class="admin__field-option">
-         <?php if ($_methodsCount > 1) : ?>
--            <input id="p_method_<?= $block->escapeHtml($_code); ?>"
--                   value="<?= $block->escapeHtml($_code); ?>"
-+            <input id="p_method_<?= $block->escapeHtmlAttr($_code); ?>"
-+                   value="<?= $block->escapeHtmlAttr($_code); ?>"
-                    type="radio" name="payment[method]"
--                   title="<?= $block->escapeHtml($_method->getTitle()); ?>"
--                   onclick="payment.switchMethod('<?= $block->escapeHtml($_code); ?>')"
-+                   title="<?= $block->escapeHtmlAttr($_method->getTitle()); ?>"
-+                   onclick="payment.switchMethod('<?= $block->escapeJs($_code); ?>')"
-                     <?php if ($currentSelectedMethod == $_code) : ?>
-                     checked="checked"
-                     <?php endif; ?>
--                    <?php $className = ($_counter == $_methodsCount) ? ' validate-one-required-by-name' : ''; ?>
--                   class="admin__control-radio<?= $block->escapeHtml($className); ?>"/>
-+                   data-validate="{'validate-one-required-by-name':true}"
-+                   class="admin__control-radio"/>
-         <?php else :?>
-             <span class="no-display">
--                <input id="p_method_<?= $block->escapeHtml($_code); ?>"
--                       value="<?= $block->escapeHtml($_code); ?>"
-+                <input id="p_method_<?= $block->escapeHtmlAttr($_code); ?>"
-+                       value="<?= $block->escapeHtmlAttr($_code); ?>"
-                        type="radio"
-                        name="payment[method]" class="admin__control-radio"
-                        checked="checked"/>
-             </span>
-         <?php endif;?>
- 
--            <label class="admin__field-label" for="p_method_<?= $block->escapeHtml($_code); ?>">
-+            <label class="admin__field-label" for="p_method_<?= $block->escapeHtmlAttr($_code); ?>">
-                 <?= $block->escapeHtml($_method->getTitle()) ?>
-             </label>
-         </dt>
-         <dd class="admin__payment-method-wrapper">
--            <?= /* @noEscape */ $block->getChildHtml('payment.method.' . $_code) ?>
-+            <?= $block->getChildHtml('payment.method.' . $_code) ?>
-         </dd>
-     <?php endforeach; ?>
-     </dl>
-@@ -57,9 +56,9 @@
-         ], function(mage) {
-             mage.apply();
-         <?php if ($_methodsCount !== 1) : ?>
--            order.setPaymentMethod('<?= $block->escapeHtml($currentSelectedMethod); ?>');
-+            order.setPaymentMethod('<?= $block->escapeJs($currentSelectedMethod); ?>');
-         <?php else : ?>
--            payment.switchMethod('<?= $block->escapeHtml($currentSelectedMethod); ?>');
-+            payment.switchMethod('<?= $block->escapeJs($currentSelectedMethod); ?>');
-         <?php endif; ?>
-         });
-     </script>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
-index 2cf09583bd9..dfa6b5e6fff 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
-@@ -4,18 +4,16 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Comment $block */
-+?>
- 
-- ?>
--
--<?php /* <h4 class="icon-head fieldset-legend <?= $block->getHeaderCssClass() ?>"><?= $block->getHeaderText() ?></h4> */ ?>
- <div class="admin__field field-comment">
--    <label for="order-comment" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Order Comments') ?></span></label>
-+    <label for="order-comment" class="admin__field-label"><span><?= $block->escapeHtml(__('Order Comments')) ?></span></label>
-     <div class="admin__field-control">
-         <textarea
-             id="order-comment"
-             name="order[comment][customer_note]"
--            class="admin__control-textarea"><?= /* @escapeNotVerified */ $block->getCommentNote() ?></textarea>
-+            class="admin__control-textarea"><?= $block->escapeHtml($block->getCommentNote()) ?></textarea>
-     </div>
- </div>
- <script>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
-index d499df585e5..6612b60e998 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
-@@ -3,35 +3,28 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
--/**
-- * \Magento\Sales\Block\Adminhtml\Order\Create\Coupons
-- *
-- */
-+/* @var \Magento\Sales\Block\Adminhtml\Order\Create\Coupons $block */
- ?>
--
- <div class="admin__field field-apply-coupon-code">
--    <label class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Apply Coupon Code') ?></span></label>
-+    <label class="admin__field-label"><span><?= $block->escapeHtml(__('Apply Coupon Code')) ?></span></label>
-     <div class="admin__field-control">
-+        <?php if (!$block->getCouponCode()) : ?>
-         <input type="text" class="admin__control-text" id="coupons:code" value="" name="coupon_code" />
--        <?= $block->getButtonHtml(__('Apply'), 'order.applyCoupon($F(\'coupons:code\'))') ?>
--        <?php if ($block->getCouponCode()): ?>
-+            <?= $block->getButtonHtml(__('Apply'), 'order.applyCoupon($F(\'coupons:code\'))') ?>
-+        <?php endif; ?>
-+        <?php if ($block->getCouponCode()) : ?>
-         <p class="added-coupon-code">
-             <span><?= $block->escapeHtml($block->getCouponCode()) ?></span>
--            <a href="#" onclick="order.applyCoupon(''); return false;" title="<?= /* @escapeNotVerified */ __('Remove Coupon Code') ?>"
--               class="action-remove"><span><?= /* @escapeNotVerified */ __('Remove') ?></span></a>
-+            <a href="#" onclick="order.applyCoupon(''); return false;" title="<?= $block->escapeHtmlAttr(__('Remove Coupon Code')) ?>"
-+               class="action-remove"><span><?= $block->escapeHtml(__('Remove')) ?></span></a>
-         </p>
-         <?php endif; ?>
-         <script>
--            require(["Magento_Sales/order/create/form"], function(){
--
--                order.overlay('shipping-method-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
--                order.overlay('address-shipping-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
--
-+            require(["Magento_Sales/order/create/form"], function() {
-+                order.overlay('shipping-method-overlay', <?php if ($block->getQuote()->isVirtual()) : ?>false<?php else : ?>true<?php endif; ?>);
-+                order.overlay('address-shipping-overlay', <?php if ($block->getQuote()->isVirtual()) : ?>false<?php else : ?>true<?php endif; ?>);
-             });
-         </script>
-     </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
-index fdbaae23473..f5edf094937 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
-@@ -4,16 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Data $block */
- ?>
- <div class="page-create-order">
-     <script>
-     require(["Magento_Sales/order/create/form"], function(){
--        order.setCurrencySymbol('<?= /* @escapeNotVerified */ $block->getCurrencySymbol($block->getCurrentCurrencyCode()) ?>')
-+        order.setCurrencySymbol('<?= $block->escapeJs($block->getCurrencySymbol($block->getCurrentCurrencyCode())) ?>')
-     });
- </script>
--    <div class="order-details<?php if ($block->getCustomerId()): ?> order-details-existing-customer<?php endif; ?>">
-+    <div class="order-details<?php if ($block->getCustomerId()) : ?> order-details-existing-customer<?php endif; ?>">
- 
-         <div id="order-additional_area" style="display: none" class="admin__page-section order-additional-area">
-             <?= $block->getChildHtml('additional_area') ?>
-@@ -35,7 +34,7 @@
- 
-         <section id="order-addresses" class="admin__page-section order-addresses">
-             <div class="admin__page-section-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Address Information') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Address Information')) ?></span>
-             </div>
-             <div class="admin__page-section-content">
-                 <div id="order-billing_address" class="admin__page-section-item order-billing-address">
-@@ -49,7 +48,7 @@
- 
-         <section id="order-methods" class="admin__page-section order-methods">
-             <div class="admin__page-section-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Information') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Information')) ?></span>
-             </div>
-             <div class="admin__page-section-content">
-                 <div id="order-billing_method" class="admin__page-section-item order-billing-method">
-@@ -61,7 +60,7 @@
-             </div>
-         </section>
- 
--        <?php if ($block->getChildBlock('card_validation')): ?>
-+        <?php if ($block->getChildBlock('card_validation')) : ?>
-         <section id="order-card_validation" class="admin__page-section order-card-validation">
-             <?= $block->getChildHtml('card_validation') ?>
-         </section>
-@@ -71,11 +70,11 @@
- 
-         <section class="admin__page-section order-summary">
-             <div class="admin__page-section-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Order Total')) ?></span>
-             </div>
-             <div class="admin__page-section-content">
-                 <fieldset class="admin__fieldset order-history" id="order-comment">
--                    <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Order History') ?></span></legend>
-+                    <legend class="admin__legend"><span><?= $block->escapeHtml(__('Order History')) ?></span></legend>
-                     <br>
-                     <?= $block->getChildHtml('comment') ?>
-                 </fieldset>
-@@ -86,19 +85,19 @@
-         </section>
-     </div>
- 
--    <?php if ($block->getCustomerId()): ?>
-+    <?php if ($block->getCustomerId()) : ?>
-         <div class="order-sidebar">
-             <div class="store-switcher order-currency">
-                 <label class="admin__field-label" for="currency_switcher">
--                    <?= /* @escapeNotVerified */ __('Order Currency:') ?>
-+                    <?= $block->escapeHtml(__('Order Currency:')) ?>
-                 </label>
-                 <select id="currency_switcher"
-                         class="admin__control-select"
-                         name="order[currency]"
-                         onchange="order.setCurrencyId(this.value); order.setCurrencySymbol(this.options[this.selectedIndex].getAttribute('symbol'));">
--                    <?php foreach ($block->getAvailableCurrencies() as $_code): ?>
--                        <option value="<?= /* @escapeNotVerified */ $_code ?>"<?php if ($_code == $block->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?> symbol="<?= /* @escapeNotVerified */ $block->getCurrencySymbol($_code) ?>">
--                            <?= /* @escapeNotVerified */ $block->getCurrencyName($_code) ?>
-+                    <?php foreach ($block->getAvailableCurrencies() as $_code) : ?>
-+                        <option value="<?= $block->escapeHtmlAttr($_code) ?>"<?php if ($_code == $block->getCurrentCurrencyCode()) : ?> selected="selected"<?php endif; ?> symbol="<?= $block->escapeHtmlAttr($block->getCurrencySymbol($_code)) ?>">
-+                            <?= $block->escapeHtml($block->getCurrencyName($_code)) ?>
-                         </option>
-                     <?php endforeach; ?>
-                 </select>
-@@ -108,5 +107,4 @@
-             </div>
-         </div>
-     <?php endif; ?>
--
- </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
-index f46e1f74ca8..c38acb9b79e 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
-@@ -4,22 +4,20 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Form $block */
- ?>
--<form id="edit_form" data-order-config='<?= $block->escapeHtml($block->getOrderDataJson()) ?>' data-load-base-url="<?= /* @escapeNotVerified */ $block->getLoadBlockUrl() ?>" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" enctype="multipart/form-data">
-+<form id="edit_form" data-order-config='<?= $block->escapeHtml($block->getOrderDataJson()) ?>' data-load-base-url="<?= $block->escapeUrl($block->getLoadBlockUrl()) ?>" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" enctype="multipart/form-data">
-     <?= $block->getBlockHtml('formkey') ?>
-     <div id="order-message">
-         <?= $block->getChildHtml('message') ?>
-     </div>
--    <div id="order-customer-selector" class="fieldset-wrapper order-customer-selector" style="display:<?= /* @escapeNotVerified */ $block->getCustomerSelectorDisplay() ?>">
-+    <div id="order-customer-selector" class="fieldset-wrapper order-customer-selector" style="display:<?= /* @noEscape */ $block->getCustomerSelectorDisplay() ?>">
-         <?= $block->getChildHtml('customer.grid.container') ?>
-     </div>
--    <div id="order-store-selector" class="fieldset-wrapper" style="display:<?= /* @escapeNotVerified */ $block->getStoreSelectorDisplay() ?>">
-+    <div id="order-store-selector" class="fieldset-wrapper" style="display:<?= /* @noEscape */ $block->getStoreSelectorDisplay() ?>">
-         <?= $block->getChildHtml('store') ?>
-     </div>
--    <div id="order-data" style="display:<?= /* @escapeNotVerified */ $block->getDataSelectorDisplay() ?>">
-+    <div id="order-data" style="display:<?= /* @noEscape */ $block->getDataSelectorDisplay() ?>">
-         <?= $block->getChildHtml('data') ?>
-     </div>
- </form>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
-index 0d2ee1f24d5..85ca9c8159b 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
-@@ -3,18 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+/** @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Form\Account */
- ?>
- 
--<div class="admin__page-section-title <?= /* @escapeNotVerified */ $block->getHeaderCssClass() ?>">
--    <span class="title"><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
-+<div class="admin__page-section-title <?= $block->escapeHtmlAttr($block->getHeaderCssClass()) ?>">
-+    <span class="title"><?= $block->escapeHtml($block->getHeaderText()) ?></span>
-     <div class="actions"></div>
- </div>
--<div id="customer_account_fieds" class="admin__page-section-content">
-+<div id="customer_account_fields" class="admin__page-section-content">
-     <?= $block->getForm()->getHtml() ?>
- </div>
- 
- <script>
-     require(["prototype", "Magento_Sales/order/create/form"], function(){
--        order.accountFieldsBind($('customer_account_fieds'));
-+        order.accountFieldsBind($('customer_account_fields'));
-     });
- </script>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
-index 686e311292a..5ce001474f5 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
-@@ -4,99 +4,106 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address $block */
-+
-+/**
-+ * @var \Magento\Customer\Model\ResourceModel\Address\Collection $addressCollection
-+ */
-+$addressCollection = $block->getData('customerAddressCollection');
-+
-+$addressArray = [];
-+if ($block->getCustomerId()) :
-+    $addressArray = $addressCollection->setCustomerFilter([$block->getCustomerId()])->toArray();
-+endif;
-+
-+/**
-+ * @var \Magento\Sales\ViewModel\Customer\AddressFormatter $customerAddressFormatter
-+ */
-+$customerAddressFormatter = $block->getData('customerAddressFormatter');
- 
- /**
-  * @var \Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address|\Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address $block
-  */
--if ($block->getIsShipping()):
-+if ($block->getIsShipping()) :
-     $_fieldsContainerId = 'order-shipping_address_fields';
-     $_addressChoiceContainerId = 'order-shipping_address_choice';
-     ?>
-     <script>
-     require(["Magento_Sales/order/create/form"], function(){
--
--        order.shippingAddressContainer = '<?= /* @escapeNotVerified */ $_fieldsContainerId ?>';
--        order.setAddresses(<?= /* @escapeNotVerified */ $block->getAddressCollectionJson() ?>);
--
-+        order.shippingAddressContainer = '<?= $block->escapeJs($_fieldsContainerId) ?>';
-+        order.setAddresses(<?= /* @noEscape  */ $block->getAddressCollectionJson() ?>);
-     });
-     </script>
-     <?php
--else:
-+else :
-     $_fieldsContainerId = 'order-billing_address_fields';
-     $_addressChoiceContainerId = 'order-billing_address_choice';
-     ?>
-     <script>
-         require(["Magento_Sales/order/create/form"], function(){
--            order.billingAddressContainer = '<?= /* @escapeNotVerified */ $_fieldsContainerId ?>';
-+            order.billingAddressContainer = '<?= $block->escapeJs($_fieldsContainerId) ?>';
-         });
-     </script>
-     <?php
- endif; ?>
- 
- <fieldset class="admin__fieldset">
--    <legend class="admin__legend <?= /* @escapeNotVerified */ $block->getHeaderCssClass() ?>">
--        <span><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
-+    <legend class="admin__legend <?= $block->escapeHtmlAttr($block->getHeaderCssClass()) ?>">
-+        <span><?= $block->escapeHtml($block->getHeaderText()) ?></span>
-     </legend><br>
- 
--    <fieldset id="<?= /* @escapeNotVerified */ $_addressChoiceContainerId ?>" class="admin__fieldset order-choose-address">
--    <?php if ($block->getIsShipping()): ?>
-+    <fieldset id="<?= $block->escapeHtmlAttr($_addressChoiceContainerId) ?>" class="admin__fieldset order-choose-address">
-+    <?php if ($block->getIsShipping()) : ?>
-         <div class="admin__field admin__field-option admin__field-shipping-same-as-billing">
-             <input type="checkbox" id="order-shipping_same_as_billing" name="shipping_same_as_billing"
-                    onclick="order.setShippingAsBilling(this.checked)" class="admin__control-checkbox"
--                   <?php if ($block->getIsAsBilling()): ?>checked<?php endif; ?> />
-+                   <?php if ($block->getIsAsBilling()) : ?>checked<?php endif; ?> />
-             <label for="order-shipping_same_as_billing" class="admin__field-label">
--                <?= /* @escapeNotVerified */ __('Same As Billing Address') ?>
-+                <?= $block->escapeHtml(__('Same As Billing Address')) ?>
-             </label>
-         </div>
-     <?php endif; ?>
-         <div class="admin__field admin__field-select-from-existing-address">
--            <label class="admin__field-label"><?= /* @escapeNotVerified */ __('Select from existing customer addresses:') ?></label>
-+            <label class="admin__field-label"><?= $block->escapeHtml(__('Select from existing customer addresses:')) ?></label>
-             <?php $_id = $block->getForm()->getHtmlIdPrefix() . 'customer_address_id' ?>
-             <div class="admin__field-control">
--                <select id="<?= /* @escapeNotVerified */ $_id ?>"
--                        name="<?= $block->getForm()->getHtmlNamePrefix() ?>[customer_address_id]"
--                        onchange="order.selectAddress(this, '<?= /* @escapeNotVerified */ $_fieldsContainerId ?>')"
-+                <select id="<?= $block->escapeHtmlAttr($_id) ?>"
-+                        name="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlNamePrefix()) ?>[customer_address_id]"
-+                        onchange="order.selectAddress(this, '<?= $block->escapeJs($_fieldsContainerId) ?>')"
-                         class="admin__control-select">
--                    <option value=""><?= /* @escapeNotVerified */ __('Add New Address') ?></option>
--                    <?php foreach ($block->getAddressCollection() as $_address): ?>
--                        <?php //if($block->getAddressAsString($_address)!=$block->getAddressAsString($block->getAddress())): ?>
-+                    <option value=""><?= $block->escapeHtml(__('Add New Address')) ?></option>
-+                    <?php foreach ($addressArray as $addressId => $address) : ?>
-                         <option
--                            value="<?= /* @escapeNotVerified */ $_address->getId() ?>"<?php if ($_address->getId() == $block->getAddressId()): ?> selected="selected"<?php endif; ?>>
--                            <?= /* @escapeNotVerified */ $block->getAddressAsString($_address) ?>
-+                            value="<?= $block->escapeHtmlAttr($addressId) ?>"<?php if ($addressId == $block->getAddressId()) : ?> selected="selected"<?php endif; ?>>
-+                            <?= $block->escapeHtml($customerAddressFormatter->getAddressAsString($address)) ?>
-                         </option>
--                        <?php //endif; ?>
-                     <?php endforeach; ?>
-                 </select>
-             </div>
-         </div>
-     </fieldset>
- 
--    <div class="order-address admin__fieldset" id="<?= /* @escapeNotVerified */ $_fieldsContainerId ?>">
-+    <div class="order-address admin__fieldset" id="<?= $block->escapeHtmlAttr($_fieldsContainerId) ?>">
-         <?= $block->getForm()->toHtml() ?>
- 
-         <div class="admin__field admin__field-option order-save-in-address-book">
--            <input name="<?= $block->getForm()->getHtmlNamePrefix() ?>[save_in_address_book]" type="checkbox"
--                   id="<?= $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book"
--                   value="1"
--                   <?php if (!$block->getDontSaveInAddressBook() && $block->getAddress()->getSaveInAddressBook()): ?> checked="checked"<?php endif; ?>
--                   class="admin__control-checkbox"/>
--            <label for="<?= $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book"
--                   class="admin__field-label"><?= /* @escapeNotVerified */ __('Save in address book') ?></label>
-+            <input name="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlNamePrefix()) ?>[save_in_address_book]" type="checkbox" id="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlIdPrefix()) ?>save_in_address_book" value="1"<?php if (!$block->getDontSaveInAddressBook()) : ?> checked="checked"<?php endif; ?> class="admin__control-checkbox"/>
-+            <label for="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlIdPrefix()) ?>save_in_address_book"
-+                   class="admin__field-label"><?= $block->escapeHtml(__('Save in address book')) ?></label>
-         </div>
-     </div>
-     <?php $hideElement = 'address-' . ($block->getIsShipping() ? 'shipping' : 'billing') . '-overlay'; ?>
--    <div style="display: none;" id="<?= /* @escapeNotVerified */ $hideElement ?>" class="order-methods-overlay">
--        <span><?= /* @escapeNotVerified */ __('You don\'t need to select a shipping address.') ?></span>
-+    <div style="display: none;" id="<?= /* @noEscape */ $hideElement ?>" class="order-methods-overlay">
-+        <span><?= $block->escapeHtml(__('You don\'t need to select a shipping address.')) ?></span>
-     </div>
- 
-     <script>
-         require(["Magento_Sales/order/create/form"], function(){
--                order.bindAddressFields('<?= /* @escapeNotVerified */ $_fieldsContainerId ?>');
--                order.bindAddressFields('<?= /* @escapeNotVerified */ $_addressChoiceContainerId ?>');
--                <?php if ($block->getIsShipping() && $block->getIsAsBilling()): ?>
--                order.disableShippingAddress(true);
--                <?php endif; ?>
-+            order.bindAddressFields('<?= $block->escapeJs($_fieldsContainerId) ?>');
-+            order.bindAddressFields('<?= $block->escapeJs($_addressChoiceContainerId) ?>');
-+            <?php if ($block->getIsShipping() && $block->getIsAsBilling()) : ?>
-+            order.disableShippingAddress(true);
-+            <?php endif; ?>
-         });
-     </script>
- </fieldset>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
-index 14d020c4763..d27782fd20b 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
-@@ -4,25 +4,25 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
-+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage $block */
- ?>
--<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())): ?>
--<?php $_items = $block->getItems(); ?>
--<div id="order-giftmessage" class="giftmessage-order-create">
--    <fieldset class="admin__fieldset">
--        <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Gift Message for the Entire Order') ?></span></legend>
--        <br>
--        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())): ?>
--            <p><?= /* @escapeNotVerified */ __('Leave this box blank if you don\'t want to leave a gift message for the entire order.') ?></p>
--            <?= $block->getFormHtml($block->getQuote(), 'main') ?>
--        <?php endif; ?>
--    </fieldset>
--<script>
--require(['Magento_Sales/order/create/form'], function(){
--
--    order.giftmessageFieldsBind('order-giftmessage');
--});
--</script>
--</div>
-+<?php if ($this->helper(\Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())) : ?>
-+    <?php $_items = $block->getItems(); ?>
-+    <div id="order-giftmessage" class="giftmessage-order-create">
-+        <fieldset class="admin__fieldset">
-+            <legend class="admin__legend"><span><?= $block->escapeHtml(__('Gift Message for the Entire Order')) ?></span></legend>
-+            <br>
-+            <?php if ($this->helper(\Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())) : ?>
-+                <p><?= $block->escapeHtml(__('Leave this box blank if you don\'t want to leave a gift message for the entire order.')) ?></p>
-+                <?= $block->getFormHtml($block->getQuote(), 'main') ?>
-+            <?php endif; ?>
-+        </fieldset>
-+        <script>
-+        require(['Magento_Sales/order/create/form'], function(){
-+            order.giftmessageFieldsBind('order-giftmessage');
-+        });
-+        </script>
-+    </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
-index de7af269538..4c31e34d386 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
-@@ -4,12 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Items $block */
- ?>
--
- <div class="admin__page-section-title">
--    <strong class="title"><?= /* @escapeNotVerified */ $block->getHeaderText() ?></strong>
-+    <strong class="title"><?= $block->escapeHtml($block->getHeaderText()) ?></strong>
-     <div class="actions">
-         <?= $block->getButtonsHtml() ?>
-     </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
-index 02cf697b0e7..cd7d215b36a 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
- /**
-@@ -14,32 +13,32 @@
- ?>
- 
- <?php $_items = $block->getItems() ?>
--<?php if (empty($_items)): ?>
-+<?php if (empty($_items)) : ?>
-     <div id="order-items_grid">
-         <div class="admin__table-wrapper">
-             <table class="data-table admin__table-primary order-tables">
-                 <thead>
-                     <tr class="headings">
--                        <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
--                        <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
--                        <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
--                        <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
--                        <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount') ?></span></th>
--                        <th class="col-row-total"><span><?= /* @escapeNotVerified */ __('Row Subtotal') ?></span></th>
--                        <th class="col-action"><span><?= /* @escapeNotVerified */ __('Action') ?></span></th>
-+                        <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
-+                        <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
-+                        <th class="col-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
-+                        <th class="col-subtotal"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
-+                        <th class="col-discount"><span><?= $block->escapeHtml(__('Discount')) ?></span></th>
-+                        <th class="col-row-total"><span><?= $block->escapeHtml(__('Row Subtotal')) ?></span></th>
-+                        <th class="col-action"><span><?= $block->escapeHtml(__('Action')) ?></span></th>
-                     </tr>
-                 </thead>
-                 <tbody>
-                     <tr class="even">
--                        <td class="empty-text" colspan="100"><?= /* @escapeNotVerified */ __('No ordered items') ?></td>
-+                        <td class="empty-text" colspan="100"><?= $block->escapeHtml(__('No ordered items')) ?></td>
-                     </tr>
-                 </tbody>
-             </table>
-         </div>
-     </div>
--<?php else: ?>
-+<?php else : ?>
-     <div class="admin__table-wrapper" id="order-items_grid">
--    <?php if (count($_items)>10): ?>
-+    <?php if (count($_items) > 10) : ?>
-         <div class="actions update actions-update">
-             <?= $block->getButtonHtml(__('Update Items and Quantities'), 'order.itemsUpdate()', 'action-secondary') ?>
-         </div>
-@@ -47,37 +46,34 @@
-         <table class="data-table admin__table-primary order-tables">
-             <thead>
-                 <tr class="headings">
--                    <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
--                    <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
--                    <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
--                    <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
--                    <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount') ?></span></th>
--                    <th class="col-row-total"><span><?= /* @escapeNotVerified */ __('Row Subtotal') ?></span></th>
--                    <th class="col-action"><span><?= /* @escapeNotVerified */ __('Action') ?></span></th>
-+                    <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
-+                    <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
-+                    <th class="col-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
-+                    <th class="col-subtotal"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
-+                    <th class="col-discount"><span><?= $block->escapeHtml(__('Discount')) ?></span></th>
-+                    <th class="col-row-total"><span><?= $block->escapeHtml(__('Row Subtotal')) ?></span></th>
-+                    <th class="col-action"><span><?= $block->escapeHtml(__('Action')) ?></span></th>
-                 </tr>
-             </thead>
-             <tfoot>
-                 <tr>
--                    <td class="col-total"><?= /* @escapeNotVerified */ __('Total %1 product(s)', count($_items)) ?></td>
--                    <td colspan="2" class="col-subtotal"><?= /* @escapeNotVerified */ __('Subtotal:') ?></td>
--                    <td class="col-price"><strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getSubtotal()) ?></strong></td>
--                    <td class="col-price"><strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getDiscountAmount()) ?></strong></td>
--                    <td class="col-price"><strong>
--                    <?php
--                        /* @escapeNotVerified */ echo $block->formatPrice($block->getSubtotalWithDiscount());
--                    ?></strong></td>
-+                    <td class="col-total"><?= $block->escapeHtml(__('Total %1 product(s)', count($_items))) ?></td>
-+                    <td colspan="2" class="col-subtotal"><?= $block->escapeHtml(__('Subtotal:')) ?></td>
-+                    <td class="col-price"><strong><?= /* @noEscape */ $block->formatPrice($block->getSubtotal()) ?></strong></td>
-+                    <td class="col-price"><strong><?= /* @noEscape */ $block->formatPrice($block->getDiscountAmount()) ?></strong></td>
-+                    <td class="col-price"><strong><?= /* @noEscape */ $block->formatPrice($block->getSubtotalWithDiscount()); ?></strong></td>
-                     <td colspan="2">&nbsp;</td>
-                 </tr>
-             </tfoot>
-                 <?php $i = 0 ?>
--                <?php foreach ($_items as $_item):$i++ ?>
--                <tbody class="<?= /* @escapeNotVerified */ ($i%2) ? 'even' : 'odd' ?>">
-+                <?php foreach ($_items as $_item) : $i++ ?>
-+                <tbody class="<?= /* @noEscape */ ($i%2) ? 'even' : 'odd' ?>">
-                     <tr>
-                         <td class="col-product">
--                            <span id="order_item_<?= /* @escapeNotVerified */ $_item->getId() ?>_title"><?= $block->escapeHtml($_item->getName()) ?></span>
-+                            <span id="order_item_<?= (int) $_item->getId() ?>_title"><?= $block->escapeHtml($_item->getName()) ?></span>
-                             <div class="product-sku-block">
--                                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
--                                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
-+                                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-+                                <?= /* @noEscape */ implode('<br />', $this->helper(\Magento\Catalog\Helper\Data::class)->splitSku($block->escapeHtml($_item->getSku()))) ?>
-                             </div>
-                             <div class="product-configure-block">
-                                 <?= $block->getConfigureButtonHtml($_item) ?>
-@@ -88,56 +84,56 @@
-                             <?= $block->getItemUnitPriceHtml($_item) ?>
- 
-                             <?php $_isCustomPrice = $block->usedCustomPriceForItem($_item) ?>
--                            <?php if ($_tier = $block->getTierHtml($_item)): ?>
--                            <div id="item_tier_block_<?= /* @escapeNotVerified */ $_item->getId() ?>"<?php if ($_isCustomPrice): ?> style="display:none"<?php endif; ?>>
--                                <a href="#" onclick="$('item_tier_<?= /* @escapeNotVerified */ $_item->getId() ?>').toggle();return false;"><?= /* @escapeNotVerified */ __('Tier Pricing') ?></a>
--                                <div style="display:none" id="item_tier_<?= /* @escapeNotVerified */ $_item->getId() ?>"><?= /* @escapeNotVerified */ $_tier ?></div>
-+                            <?php if ($_tier = $block->getTierHtml($_item)) : ?>
-+                            <div id="item_tier_block_<?= (int) $_item->getId() ?>"<?php if ($_isCustomPrice) : ?> style="display:none"<?php endif; ?>>
-+                                <a href="#" onclick="$('item_tier_<?= (int) $_item->getId() ?>').toggle();return false;"><?= $block->escapeHtml(__('Tier Pricing')) ?></a>
-+                                <div style="display:none" id="item_tier_<?= (int) $_item->getId() ?>"><?= /* @noEscape */ $_tier ?></div>
-                             </div>
-                             <?php endif; ?>
--                            <?php if ($block->canApplyCustomPrice($_item)): ?>
-+                            <?php if ($block->canApplyCustomPrice($_item)) : ?>
-                                 <div class="custom-price-block">
-                                     <input type="checkbox"
-                                            class="admin__control-checkbox"
--                                           id="item_use_custom_price_<?= /* @escapeNotVerified */ $_item->getId() ?>"
--                                           <?php if ($_isCustomPrice): ?> checked="checked"<?php endif; ?>
--                                           onclick="order.toggleCustomPrice(this, 'item_custom_price_<?= /* @escapeNotVerified */ $_item->getId() ?>', 'item_tier_block_<?= /* @escapeNotVerified */ $_item->getId() ?>');"/>
-+                                           id="item_use_custom_price_<?= (int) $_item->getId() ?>"
-+                                           <?php if ($_isCustomPrice) : ?> checked="checked"<?php endif; ?>
-+                                           onclick="order.toggleCustomPrice(this, 'item_custom_price_<?= (int) $_item->getId() ?>', 'item_tier_block_<?= (int) $_item->getId() ?>');"/>
-                                     <label
-                                         class="normal admin__field-label"
--                                        for="item_use_custom_price_<?= /* @escapeNotVerified */ $_item->getId() ?>">
--                                        <span><?= /* @escapeNotVerified */ __('Custom Price') ?>*</span></label>
-+                                        for="item_use_custom_price_<?= (int) $_item->getId() ?>">
-+                                        <span><?= $block->escapeHtml(__('Custom Price')) ?>*</span></label>
-                                 </div>
-                             <?php endif; ?>
--                            <input id="item_custom_price_<?= /* @escapeNotVerified */ $_item->getId() ?>"
--                                   name="item[<?= /* @escapeNotVerified */ $_item->getId() ?>][custom_price]"
--                                   value="<?= /* @escapeNotVerified */ sprintf("%.2f", $block->getOriginalEditablePrice($_item)) ?>"
--                                   <?php if (!$_isCustomPrice): ?>
--                                   style="display:none"
--                                   disabled="disabled"
--                                   <?php endif; ?>
--                                   class="input-text item-price admin__control-text"/>
-+                            <input id="item_custom_price_<?= (int) $_item->getId() ?>"
-+                                name="item[<?= (int) $_item->getId() ?>][custom_price]"
-+                                value="<?= /* @noEscape */ sprintf("%.2f", $block->getOriginalEditablePrice($_item)) ?>"
-+                                <?php if (!$_isCustomPrice) : ?>
-+                                style="display:none"
-+                                disabled="disabled"
-+                                <?php endif; ?>
-+                                class="input-text item-price admin__control-text"/>
-                         </td>
-                         <td class="col-qty">
--                            <input name="item[<?= /* @escapeNotVerified */ $_item->getId() ?>][qty]"
-+                            <input name="item[<?= (int) $_item->getId() ?>][qty]"
-                                    class="input-text item-qty admin__control-text"
--                                   value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>"
-+                                   value="<?= (int) $_item->getQty() ?>"
-                                    maxlength="12" />
-                         </td>
-                         <td class="col-subtotal col-price">
-                             <?= $block->getItemRowTotalHtml($_item) ?>
-                         </td>
-                         <td class="col-discount col-price">
--                            <?= /* @escapeNotVerified */ $block->formatPrice(-$_item->getTotalDiscountAmount()) ?>
-+                            <?= /* @noEscape */ $block->formatPrice(-$_item->getTotalDiscountAmount()) ?>
-                             <div class="discount-price-block">
--                                <input id="item_use_discount_<?= /* @escapeNotVerified */ $_item->getId() ?>"
-+                                <input id="item_use_discount_<?= (int) $_item->getId() ?>"
-                                        class="admin__control-checkbox"
--                                       name="item[<?= /* @escapeNotVerified */ $_item->getId() ?>][use_discount]"
--                                       <?php if (!$_item->getNoDiscount()): ?>checked="checked"<?php endif; ?>
-+                                       name="item[<?= (int) $_item->getId() ?>][use_discount]"
-+                                       <?php if (!$_item->getNoDiscount()) : ?>checked="checked"<?php endif; ?>
-                                        value="1"
-                                        type="checkbox" />
-                                 <label
--                                    for="item_use_discount_<?= /* @escapeNotVerified */ $_item->getId() ?>"
-+                                    for="item_use_discount_<?= (int) $_item->getId() ?>"
-                                     class="normal admin__field-label">
--                                    <span><?= /* @escapeNotVerified */ __('Apply') ?></span></label>
-+                                    <span><?= $block->escapeHtml(__('Apply')) ?></span></label>
-                             </div>
- 
-                         </td>
-@@ -145,19 +141,19 @@
-                             <?= $block->getItemRowTotalWithDiscountHtml($_item) ?>
-                         </td>
-                         <td class="col-actions last">
--                            <select class="admin__control-select" name="item[<?= /* @escapeNotVerified */ $_item->getId() ?>][action]">
--                                <option value=""><?= /* @escapeNotVerified */ __('Please select') ?></option>
--                                <option value="remove"><?= /* @escapeNotVerified */ __('Remove') ?></option>
--                                <?php if ($block->getCustomerId() && $block->getMoveToCustomerStorage()): ?>
--                                    <option value="cart"><?= /* @escapeNotVerified */ __('Move to Shopping Cart') ?></option>
--                                    <?php if ($block->isMoveToWishlistAllowed($_item)): ?>
-+                            <select class="admin__control-select" name="item[<?= (int) $_item->getId() ?>][action]">
-+                                <option value=""><?= $block->escapeHtml(__('Please select')) ?></option>
-+                                <option value="remove"><?= $block->escapeHtml(__('Remove')) ?></option>
-+                                <?php if ($block->getCustomerId() && $block->getMoveToCustomerStorage()) : ?>
-+                                    <option value="cart"><?= $block->escapeHtml(__('Move to Shopping Cart')) ?></option>
-+                                    <?php if ($block->isMoveToWishlistAllowed($_item)) : ?>
-                                         <?php $wishlists = $block->getCustomerWishlists();?>
--                                        <?php if (count($wishlists) <= 1):?>
--                                            <option value="wishlist"><?= /* @escapeNotVerified */ __('Move to Wish List') ?></option>
--                                        <?php else: ?>
--                                            <optgroup label="<?= /* @escapeNotVerified */ __('Move to Wish List') ?>">
--                                                <?php foreach ($wishlists as $wishlist):?>
--                                                    <option value="wishlist_<?= /* @escapeNotVerified */ $wishlist->getId() ?>"><?= $block->escapeHtml($wishlist->getName()) ?></option>
-+                                        <?php if (count($wishlists) <= 1) : ?>
-+                                            <option value="wishlist"><?= $block->escapeHtml(__('Move to Wish List')) ?></option>
-+                                        <?php else : ?>
-+                                            <optgroup label="<?= $block->escapeHtml(__('Move to Wish List')) ?>">
-+                                                <?php foreach ($wishlists as $wishlist) :?>
-+                                                    <option value="wishlist_<?= (int) $wishlist->getId() ?>"><?= $block->escapeHtml($wishlist->getName()) ?></option>
-                                                 <?php endforeach;?>
-                                             </optgroup>
-                                         <?php endif; ?>
-@@ -168,22 +164,21 @@
-                     </tr>
- 
-                     <?php $hasMessageError = false; ?>
--                    <?php foreach ($_item->getMessage(false) as $messageError):?>
--                        <?php if (!empty($messageError)) {
-+                    <?php foreach ($_item->getMessage(false) as $messageError) : ?>
-+                        <?php if (!empty($messageError)) :
-                             $hasMessageError = true;
--                        }
--                        ?>
-+                        endif; ?>
-                     <?php endforeach; ?>
- 
--                    <?php if ($hasMessageError):?>
-+                    <?php if ($hasMessageError) : ?>
-                         <tr class="row-messages-error">
-                             <td colspan="100"> <!-- ToDo UI: remove the 100 -->
--                                <?php foreach ($_item->getMessage(false) as $message):
-+                                <?php foreach ($_item->getMessage(false) as $message) :
-                                     if (empty($message)) {
-                                         continue;
-                                     }
-                                     ?>
--                                    <div class="message <?php if ($_item->getHasError()): ?>message-error<?php else: ?>message-notice<?php endif; ?>">
-+                                    <div class="message <?php if ($_item->getHasError()) : ?>message-error<?php else : ?>message-notice<?php endif; ?>">
-                                         <?= $block->escapeHtml($message) ?>
-                                     </div>
-                                 <?php endforeach; ?>
-@@ -195,7 +190,7 @@
-                 </tbody>
-                 <?php endforeach; ?>
-         </table>
--        <p><small><?= /* @escapeNotVerified */ $block->getInclExclTaxMessage() ?></small></p>
-+        <p><small><?= $block->escapeHtml($block->getInclExclTaxMessage()) ?></small></p>
-     </div>
- 
-     <div class="order-discounts">
-@@ -210,43 +205,42 @@
-             order.itemsOnchangeBind()
-         });
-     </script>
-+    <?php if ($block->isGiftMessagesAvailable()) : ?>
-+        <script>
-+        require([
-+            "prototype",
-+            "Magento_Sales/order/giftoptions_tooltip"
-+        ], function(){
- 
--<?php if ($block->isGiftMessagesAvailable()) : ?>
--<script>
--require([
--    "prototype",
--    "Magento_Sales/order/giftoptions_tooltip"
--], function(){
--
--//<![CDATA[
--    /**
--     * Retrieve gift options tooltip content
--     */
--    function getGiftOptionsTooltipContent(itemId) {
--        var contentLines = [];
--        var headerLine = null;
--        var contentLine = null;
--
--        $$('#gift_options_data_' + itemId + ' .gift-options-tooltip-content').each(function (element) {
--            if (element.down(0)) {
--                headerLine = element.down(0).innerHTML;
--                contentLine = element.down(0).next().innerHTML;
--                if (contentLine.length > 30) {
--                    contentLine = contentLine.slice(0,30) + '...';
--                }
--                contentLines.push(headerLine + ' ' + contentLine);
-+        //<![CDATA[
-+            /**
-+             * Retrieve gift options tooltip content
-+             */
-+            function getGiftOptionsTooltipContent(itemId) {
-+                var contentLines = [];
-+                var headerLine = null;
-+                var contentLine = null;
-+
-+                $$('#gift_options_data_' + itemId + ' .gift-options-tooltip-content').each(function (element) {
-+                    if (element.down(0)) {
-+                        headerLine = element.down(0).innerHTML;
-+                        contentLine = element.down(0).next().innerHTML;
-+                        if (contentLine.length > 30) {
-+                            contentLine = contentLine.slice(0,30) + '...';
-+                        }
-+                        contentLines.push(headerLine + ' ' + contentLine);
-+                    }
-+                });
-+                return contentLines.join('<br/>');
-             }
--        });
--        return contentLines.join('<br/>');
--    }
- 
--    giftOptionsTooltip.setTooltipContentLoaderFunction(getGiftOptionsTooltipContent);
-+            giftOptionsTooltip.setTooltipContentLoaderFunction(getGiftOptionsTooltipContent);
- 
--    window.getGiftOptionsTooltipContent = getGiftOptionsTooltipContent;
-+            window.getGiftOptionsTooltipContent = getGiftOptionsTooltipContent;
- 
--//]]>
-+        //]]>
- 
--});
--</script>
--<?php endif; ?>
-+        });
-+        </script>
-+    <?php endif; ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml
-index 2e1f058e171..6a0715a0565 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml
-@@ -3,16 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid $block */
--
- $_item = $block->getItem();
- ?>
--
- <div class="price-excl-tax">
--    <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotal()) ?>
-+    <?= /* @noEscape */ $block->formatPrice($_item->getRowTotal()) ?>
- </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml
-index aafd3afd278..7fdf39ed2bc 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml
-@@ -3,15 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid $block */
--
- $_item = $block->getItem();
- ?>
--
- <?php $_rowTotalWithoutDiscount = $_item->getRowTotal() - $_item->getTotalDiscountAmount(); ?>
--<?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
-+<?= /* @noEscape */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml
-index 0ecefcf5273..b5871518cf5 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml
-@@ -3,15 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid $block */
--
- $_item = $block->getItem();
- ?>
- <div class="price-excl-tax">
--<?= /* @escapeNotVerified */ $block->formatPrice($_item->getCalculationPrice()) ?>
-+<?= /* @noEscape */ $block->formatPrice($_item->getCalculationPrice()) ?>
- </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
-index 374684d351b..eb39f71265c 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
-- ?>
-+?>
- <script>
- require([
-     "prototype",
-@@ -13,16 +11,14 @@ require([
-     "Magento_Catalog/catalog/product/composite/configure",
-     "domReady!"
- ], function(){
--
-     order.sidebarHide();
-     if (window.productConfigure) {
-         productConfigure.addListType('product_to_add', {
--            urlFetch: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/configureProductToAdd') ?>'
-+            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/configureProductToAdd'))) ?>'
-         });
-         productConfigure.addListType('quote_items', {
--            urlFetch: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/configureQuoteItems') ?>'
-+            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/configureQuoteItems'))) ?>'
-         });
-     }
--
- });
- </script>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
-index 973758a6694..1dcf57d8795 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<input type="checkbox" name="newsletter:subscribe"> <label for="newsletter:subscribe" style="width: 90%; float: none;"><?= /* @escapeNotVerified */ __('Subscribe to Newsletter') ?></label><br/>
-+<input type="checkbox" name="newsletter:subscribe"> <label for="newsletter:subscribe" style="width: 90%; float: none;"><?= $block->escapeHtml(__('Subscribe to Newsletter')) ?></label><br/>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
-index 9e0394f6430..baaf4c078f2 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
-@@ -4,46 +4,45 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php /** @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form */ ?>
- <?php $_shippingRateGroups = $block->getShippingRates(); ?>
--<?php if ($_shippingRateGroups): ?>
-+<?php if ($_shippingRateGroups) : ?>
-     <div id="order-shipping-method-choose" class="control" style="display:none">
-         <dl class="admin__order-shipment-methods">
--        <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
-+        <?php foreach ($_shippingRateGroups as $code => $_rates) : ?>
-             <dt class="admin__order-shipment-methods-title"><?= $block->escapeHtml($block->getCarrierName($code)) ?></dt>
-             <dd class="admin__order-shipment-methods-options">
-                 <ul class="admin__order-shipment-methods-options-list">
--                <?php foreach ($_rates as $_rate): ?>
-+                <?php foreach ($_rates as $_rate) : ?>
-                     <?php $_radioProperty = 'name="order[shipping_method]" type="radio" onclick="order.setShippingMethod(this.value)"' ?>
-                     <?php $_code = $_rate->getCode() ?>
-                     <li class="admin__field-option">
--                       <?php if ($_rate->getErrorMessage()): ?>
--                           <div class="messages">
-+                        <?php if ($_rate->getErrorMessage()) : ?>
-+                            <div class="messages">
-                                <div class="message message-error error">
-                                    <div><?= $block->escapeHtml($_rate->getErrorMessage()) ?></div>
-                                </div>
--                           </div>
--                       <?php else: ?>
-+                            </div>
-+                        <?php else : ?>
-                             <?php $_checked = $block->isMethodActive($_code) ? 'checked="checked"' : '' ?>
--                            <input <?= /* @escapeNotVerified */ $_radioProperty ?> value="<?= /* @escapeNotVerified */ $_code ?>"
--                                                                 id="s_method_<?= /* @escapeNotVerified */ $_code ?>" <?= /* @escapeNotVerified */ $_checked ?>
-+                            <input <?= /* @noEscape */ $_radioProperty ?> value="<?= $block->escapeHtmlAttr($_code) ?>"
-+                                                                 id="s_method_<?= $block->escapeHtmlAttr($_code) ?>" <?= /* @noEscape */ $_checked ?>
-                                                                  class="admin__control-radio required-entry"/>
--                            <label class="admin__field-label" for="s_method_<?= /* @escapeNotVerified */ $_code ?>">
-+                            <label class="admin__field-label" for="s_method_<?= $block->escapeHtmlAttr($_code) ?>">
-                                 <?= $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
-                                 <strong>
--                                    <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
-+                                    <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()); ?>
-                                     <?php $_incl = $block->getShippingPrice($_rate->getPrice(), true); ?>
- 
--                                    <?= /* @escapeNotVerified */ $_excl ?>
--                                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
--                                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
-+                                    <?= /* @noEscape */ $_excl ?>
-+                                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
-+                                        (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
-                                     <?php endif; ?>
-                                 </strong>
-                             </label>
--                       <?php endif ?>
-+                        <?php endif; ?>
-                     </li>
-                 <?php endforeach; ?>
-                 </ul>
-@@ -51,7 +50,7 @@
-         <?php endforeach; ?>
-         </dl>
-     </div>
--    <?php if ($_rate = $block->getActiveMethodRate()): ?>
-+    <?php if ($_rate = $block->getActiveMethodRate()) : ?>
-         <div id="order-shipping-method-info" class="order-shipping-method-info">
-             <dl class="admin__order-shipment-methods">
-                 <dt class="admin__order-shipment-methods-title">
-@@ -60,12 +59,12 @@
-                 <dd class="admin__order-shipment-methods-options">
-                     <?= $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
-                     <strong>
--                        <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
-+                        <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()); ?>
-                         <?php $_incl = $block->getShippingPrice($_rate->getPrice(), true); ?>
- 
--                        <?= /* @escapeNotVerified */ $_excl ?>
--                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
--                            (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
-+                        <?= /* @noEscape */ $_excl ?>
-+                        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
-+                            (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
-                         <?php endif; ?>
-                     </strong>
-                 </dd>
-@@ -73,39 +72,35 @@
-             <a href="#"
-                onclick="$('order-shipping-method-info').hide();$('order-shipping-method-choose').show();return false"
-                class="action-default">
--                <span><?= /* @escapeNotVerified */ __('Click to change shipping method') ?></span>
-+                <span><?= $block->escapeHtml(__('Click to change shipping method')) ?></span>
-             </a>
-         </div>
--    <?php else: ?>
-+    <?php else : ?>
-         <script>
- require(['prototype'], function(){
-     $('order-shipping-method-choose').show();
- });
- </script>
-     <?php endif; ?>
--<?php elseif ($block->getIsRateRequest()): ?>
-+<?php elseif ($block->getIsRateRequest()) : ?>
-     <div class="order-shipping-method-summary">
--        <strong class="order-shipping-method-not-available"><?= /* @escapeNotVerified */ __('Sorry, no quotes are available for this order.') ?></strong>
-+        <strong class="order-shipping-method-not-available"><?= $block->escapeHtml(__('Sorry, no quotes are available for this order.')) ?></strong>
-     </div>
--<?php else: ?>
-+<?php else : ?>
-     <div id="order-shipping-method-summary" class="order-shipping-method-summary">
-         <a href="#" onclick="order.loadShippingRates();return false" class="action-default">
--            <span><?= /* @escapeNotVerified */ __('Get shipping methods and rates') ?></span>
-+            <span><?= $block->escapeHtml(__('Get shipping methods and rates')) ?></span>
-         </a>
-         <input type="hidden" name="order[has_shipping]" value="" class="required-entry" />
-     </div>
- <?php endif; ?>
- <div style="display: none;" id="shipping-method-overlay" class="order-methods-overlay">
--    <span><?= /* @escapeNotVerified */ __('You don\'t need to select a shipping method.') ?></span>
-+    <span><?= $block->escapeHtml(__('You don\'t need to select a shipping method.')) ?></span>
- </div>
- <script>
-     require(["Magento_Sales/order/create/form"], function(){
--
--        order.overlay('shipping-method-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
--        order.overlay('address-shipping-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
--
--        <?php if ($block->getQuote()->isVirtual()): ?>
--            order.isOnlyVirtualProduct = true;
--        <?php endif; ?>
-+        order.overlay('shipping-method-overlay', <?php if ($block->getQuote()->isVirtual()) : ?>false<?php else : ?>true<?php endif; ?>);
-+        order.overlay('address-shipping-overlay', <?php if ($block->getQuote()->isVirtual()) : ?>false<?php else : ?>true<?php endif; ?>);
-+        order.isOnlyVirtualProduct = <?= /* @noEscape */ $block->getQuote()->isVirtual() ? 'true' : 'false'; ?>;
-     });
- </script>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
-index 48823de3f4d..d4dea4eb85a 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
-@@ -4,18 +4,16 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--/** @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar */
-+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar $block */
- ?>
- <div class="customer-current-activity-inner">
--    <h4 class="customer-activity-title"><?= /* @escapeNotVerified */ __('Customer\'s Activities') ?></h4>
-+    <h4 class="customer-activity-title"><?= $block->escapeHtml(__('Customer\'s Activities')) ?></h4>
-     <div class="create-order-sidebar-container">
-     <?= $block->getChildHtml('top_button') ?>
--    <?php foreach ($block->getLayout()->getChildBlocks($block->getNameInLayout()) as $_alias => $_child): ?>
--        <?php if ($_alias != 'top_button' && $_alias != 'bottom_button'): ?>
--            <?php if ($block->canDisplay($_child)): ?>
--                <div class="order-sidebar-block" id="order-sidebar_<?= /* @escapeNotVerified */ $_alias ?>">
-+    <?php foreach ($block->getLayout()->getChildBlocks($block->getNameInLayout()) as $_alias => $_child) : ?>
-+        <?php if ($_alias != 'top_button' && $_alias != 'bottom_button') : ?>
-+            <?php if ($block->canDisplay($_child)) : ?>
-+                <div class="order-sidebar-block" id="order-sidebar_<?= $block->escapeHtmlAttr($_alias) ?>">
-                     <?= $block->getChildHtml($_alias) ?>
-                 </div>
-             <?php endif; ?>
-@@ -32,12 +30,12 @@ require([
- 
-     function addSidebarCompositeListType() {
-         productConfigure.addListType('sidebar', {
--            urlFetch: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/configureProductToAdd') ?>',
--            urlConfirm: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/addConfigured') ?>'
-+            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/configureProductToAdd'))) ?>',
-+            urlConfirm: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/addConfigured'))) ?>'
-         });
-         productConfigure.addListType('sidebar_wishlist', {
--            urlFetch: '<?= /* @escapeNotVerified */ $block->getUrl('customer/wishlist_product_composite_wishlist/configure') ?>',
--            urlConfirm: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/addConfigured') ?>'
-+            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/wishlist_product_composite_wishlist/configure'))) ?>',
-+            urlConfirm: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/addConfigured'))) ?>'
-         });
-     }
- 
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
-index 2dbf717f734..5e26e2fa230 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
-@@ -3,44 +3,41 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar */ ?>
--<div class="create-order-sidebar-block" id="sidebar_data_<?= /* @escapeNotVerified */ $block->getDataId() ?>">
-+<div class="create-order-sidebar-block" id="sidebar_data_<?= $block->escapeHtmlAttr($block->getDataId()) ?>">
-     <div class="head sidebar-title-block">
-         <a href="#" class="action-refresh"
-            title="<?= $block->escapeHtml(__('Refresh')) ?>"
--           onclick="order.loadArea('sidebar_<?= /* @escapeNotVerified */ $block->getDataId() ?>', 'sidebar_data_<?= /* @escapeNotVerified */ $block->getDataId() ?>');return false;">
--            <span><?= /* @escapeNotVerified */ __('Refresh') ?></span>
-+           onclick="order.loadArea('sidebar_<?= $block->escapeJs($block->getDataId()) ?>', 'sidebar_data_<?= $block->escapeJs($block->getDataId()) ?>');return false;">
-+            <span><?= $block->escapeHtml(__('Refresh')) ?></span>
-         </a>
-         <h5 class="create-order-sidebar-label">
--            <?= /* @escapeNotVerified */ $block->getHeaderText() ?>
--            <span class="normal">(<?= /* @escapeNotVerified */ $block->getItemCount() ?>)</span>
-+            <?= $block->escapeHtml($block->getHeaderText()) ?>
-+            <span class="normal">(<?= $block->escapeHtml($block->getItemCount()) ?>)</span>
-         </h5>
-     </div>
-     <div class="content">
-         <div class="auto-scroll">
--        <?php if ($block->getItemCount()): ?>
-+        <?php if ($block->getItemCount()) : ?>
-         <table class="admin__table-primary">
-             <thead>
-                 <tr>
--                    <th class="col-item"><?= /* @escapeNotVerified */ __('Item') ?></th>
-+                    <th class="col-item"><?= $block->escapeHtml(__('Item')) ?></th>
- 
--                    <?php if ($block->canDisplayItemQty()): ?>
--                        <th class="col-qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
-+                    <?php if ($block->canDisplayItemQty()) : ?>
-+                        <th class="col-qty"><?= $block->escapeHtml(__('Qty')) ?></th>
-                     <?php endif; ?>
- 
--                    <?php if ($block->canDisplayPrice()): ?>
--                        <th class="col-price"><?= /* @escapeNotVerified */ __('Price') ?></th>
-+                    <?php if ($block->canDisplayPrice()) : ?>
-+                        <th class="col-price"><?= $block->escapeHtml(__('Price')) ?></th>
-                     <?php endif; ?>
- 
--                    <?php if ($block->canRemoveItems()): ?>
-+                    <?php if ($block->canRemoveItems()) : ?>
-                         <th class="col-remove">
-                             <span title="<?= $block->escapeHtml(__('Remove')) ?>"
-                                   class="icon icon-remove">
--                                <span><?= /* @escapeNotVerified */ __('Remove') ?></span>
-+                                <span><?= $block->escapeHtml(__('Remove')) ?></span>
-                             </span>
-                         </th>
-                     <?php endif; ?>
-@@ -48,40 +45,40 @@
-                     <th class="col-add">
-                         <span title="<?= $block->escapeHtml(__('Add To Order')) ?>"
-                               class="icon icon-add">
--                            <span><?= /* @escapeNotVerified */ __('Add To Order') ?></span>
-+                            <span><?= $block->escapeHtml(__('Add To Order')) ?></span>
-                         </span>
-                     </th>
-                 </tr>
-             </thead>
- 
-             <tbody>
--                <?php foreach ($block->getItems() as $_item): ?>
-+                <?php foreach ($block->getItems() as $_item) : ?>
-                     <tr>
-                         <td class="col-item"><?= $block->escapeHtml($_item->getName()) ?></td>
- 
--                        <?php if ($block->canDisplayItemQty()): ?>
-+                        <?php if ($block->canDisplayItemQty()) : ?>
-                             <td class="col-qty">
--                                <?= /* @escapeNotVerified */ $block->getItemQty($_item) ?>
-+                                <?= (int) $block->getItemQty($_item) ?>
-                             </td>
-                         <?php endif; ?>
- 
--                        <?php if ($block->canDisplayPrice()): ?>
-+                        <?php if ($block->canDisplayPrice()) : ?>
-                             <td class="col-price">
-                                 <?= /* @noEscape */ $block->getItemPrice($block->getProduct($_item)) ?>
-                             </td>
-                         <?php endif; ?>
- 
--                        <?php if ($block->canRemoveItems()): ?>
-+                        <?php if ($block->canRemoveItems()) : ?>
-                             <td class="col-remove">
-                                 <div class="admin__field-option">
--                                    <input id="sidebar-remove-<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>-<?= /* @escapeNotVerified */ $block->getItemId($_item) ?>"
-+                                    <input id="sidebar-remove-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>-<?= (int) $block->getItemId($_item) ?>"
-                                            type="checkbox"
-                                            class="admin__control-checkbox"
--                                           name="sidebar[remove][<?= /* @escapeNotVerified */ $block->getItemId($_item) ?>]"
--                                           value="<?= /* @escapeNotVerified */ $block->getDataId() ?>"
-+                                           name="sidebar[remove][<?= (int) $block->getItemId($_item) ?>]"
-+                                           value="<?= $block->escapeHtmlAttr($block->getDataId()) ?>"
-                                            title="<?= $block->escapeHtml(__('Remove')) ?>" />
-                                     <label class="admin__field-label"
--                                           for="sidebar-remove-<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>-<?= /* @escapeNotVerified */ $block->getItemId($_item) ?>">
-+                                           for="sidebar-remove-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>-<?= (int) $block->getItemId($_item) ?>">
-                                     </label>
-                                 </div>
-                             </td>
-@@ -89,29 +86,29 @@
- 
-                         <td class="col-add">
-                             <div class="admin__field-option">
--                                <?php if ($block->isConfigurationRequired($_item->getTypeId()) && $block->getDataId() == 'wishlist'): ?>
-+                                <?php if ($block->isConfigurationRequired($_item->getTypeId()) && $block->getDataId() == 'wishlist') : ?>
-                                     <a href="#"
-                                        class="icon icon-configure"
-                                        title="<?= $block->escapeHtml(__('Configure and Add to Order')) ?>"
--                                       onclick="order.sidebarConfigureProduct('<?= 'sidebar_wishlist' ?>', <?= /* @escapeNotVerified */ $block->getProductId($_item) ?>, <?= /* @escapeNotVerified */ $block->getItemId($_item) ?>); return false;">
--                                        <span><?= /* @escapeNotVerified */ __('Configure and Add to Order') ?></span>
-+                                       onclick="order.sidebarConfigureProduct('sidebar_wishlist', <?= (int) $block->getProductId($_item) ?>, <?= (int) $block->getItemId($_item) ?>); return false;">
-+                                        <span><?= $block->escapeHtml(__('Configure and Add to Order')) ?></span>
-                                     </a>
--                                <?php elseif ($block->isConfigurationRequired($_item->getTypeId())): ?>
-+                                <?php elseif ($block->isConfigurationRequired($_item->getTypeId())) : ?>
-                                     <a href="#"
-                                        class="icon icon-configure"
-                                        title="<?= $block->escapeHtml(__('Configure and Add to Order')) ?>"
--                                       onclick="order.sidebarConfigureProduct('<?= 'sidebar' ?>', <?= /* @escapeNotVerified */ $block->getProductId($_item) ?>); return false;">
--                                        <span><?= /* @escapeNotVerified */ __('Configure and Add to Order') ?></span>
-+                                       onclick="order.sidebarConfigureProduct('sidebar', <?= (int) $block->getProductId($_item) ?>); return false;">
-+                                        <span><?= $block->escapeHtml(__('Configure and Add to Order')) ?></span>
-                                     </a>
--                                <?php else: ?>
--                                    <input id="sidebar-<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>-<?= /* @escapeNotVerified */ $block->getIdentifierId($_item) ?>"
-+                                <?php else : ?>
-+                                    <input id="sidebar-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>-<?= (int) $block->getIdentifierId($_item) ?>"
-                                            type="checkbox"
-                                            class="admin__control-checkbox"
--                                           name="sidebar[<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>][<?= /* @escapeNotVerified */ $block->getIdentifierId($_item) ?>]"
--                                           value="<?= /* @escapeNotVerified */ $block->canDisplayItemQty() ? $_item->getQty()*1 : 1 ?>"
-+                                           name="sidebar[<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>][<?= (int) $block->getIdentifierId($_item) ?>]"
-+                                           value="<?= $block->canDisplayItemQty() ? (int) $_item->getQty() : 1 ?>"
-                                            title="<?= $block->escapeHtml(__('Add To Order')) ?>"/>
-                                     <label class="admin__field-label"
--                                           for="sidebar-<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>-<?= /* @escapeNotVerified */ $block->getIdentifierId($_item) ?>">
-+                                           for="sidebar-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>-<?= (int) $block->getIdentifierId($_item) ?>">
-                                     </label>
-                                 <?php endif; ?>
-                             </div>
-@@ -120,11 +117,11 @@
-                 <?php endforeach; ?>
-             </tbody>
-         </table>
--        <?php else: ?>
--            <span class="no-items"><?= /* @escapeNotVerified */ __('No items') ?></span>
-+        <?php else : ?>
-+            <span class="no-items"><?= $block->escapeHtml(__('No items')) ?></span>
-         <?php endif ?>
-         </div>
--        <?php if ($block->getItemCount() && $block->canRemoveItems()): ?>
-+        <?php if ($block->getItemCount() && $block->canRemoveItems()) : ?>
-             <?= $block->getChildHtml('empty_customer_cart_button') ?>
-         <?php endif; ?>
-     </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
-index 1de681bdb20..407bd0272e9 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
-@@ -3,20 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Store\Select */ ?>
- <div class="store-scope form-inline">
-     <div class="admin__fieldset tree-store-scope">
-         <?php $showHelpHint = 0; ?>
--        <?php foreach ($block->getWebsiteCollection() as $_website): ?>
-+        <?php foreach ($block->getWebsiteCollection() as $_website) : ?>
-             <?php $showWebsite = false; ?>
--            <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
-+            <?php foreach ($block->getGroupCollection($_website) as $_group) : ?>
-                 <?php $showGroup = false; ?>
--                <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
--                    <?php if ($showWebsite == false): ?>
-+                <?php foreach ($block->getStoreCollection($_group) as $_store) : ?>
-+                    <?php if ($showWebsite == false) : ?>
-                         <?php $showWebsite = true; ?>
-                         <div class="admin__field field-website_label">
-                             <label class="admin__field-label" for="">
-@@ -24,7 +21,7 @@
-                             </label>
-                             <div class="admin__field-control">
-                                 <div class="admin__field admin__field-option">
--                                    <?php if ($showHelpHint == 0):
-+                                    <?php if ($showHelpHint == 0) :
-                                         echo $block->getHintHtml();
-                                         $showHelpHint = 1;
-                                     endif; ?>
-@@ -33,7 +30,7 @@
-                         </div>
-                     <?php endif; ?>
- 
--                    <?php if ($showGroup == false): ?>
-+                    <?php if ($showGroup == false) : ?>
-                         <?php $showGroup = true; ?>
-                         <div class="admin__field field-group_label">
-                             <label class="admin__field-label" for=""><span><?= $block->escapeHtml($_group->getName()) ?></span></label>
-@@ -46,8 +43,8 @@
-                         <div class="admin__field-control">
-                             <div class="nested">
-                                 <div class="admin__field admin__field-option">
--                                    <input type="radio" id="store_<?= /* @escapeNotVerified */ $_store->getId() ?>" class="admin__control-radio" onclick="order.setStoreId('<?= /* @escapeNotVerified */ $_store->getId() ?>')"/>
--                                    <label class="admin__field-label" for="store_<?= /* @escapeNotVerified */ $_store->getId() ?>">
-+                                    <input type="radio" id="store_<?= (int) $_store->getId() ?>" class="admin__control-radio" onclick="order.setStoreId('<?= (int) $_store->getId() ?>')"/>
-+                                    <label class="admin__field-label" for="store_<?= (int) $_store->getId() ?>">
-                                         <?= $block->escapeHtml($_store->getName()) ?>
-                                     </label>
-                                 </div>
-@@ -55,7 +52,7 @@
-                         </div>
-                     </div>
-                 <?php endforeach; ?>
--                <?php if ($showGroup): ?>
-+                <?php if ($showGroup) : ?>
-                 <?php endif; ?>
-             <?php endforeach; ?>
-         <?php endforeach; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
-index 02433edf823..9a901d99ae8 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
-@@ -4,31 +4,30 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Totals $block */
- ?>
--<legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Order Totals') ?></span></legend>
-+<legend class="admin__legend"><span><?= $block->escapeHtml(__('Order Totals')) ?></span></legend>
- <br>
- 
- <table class="admin__table-secondary data-table">
-     <tbody>
--        <?= /* @escapeNotVerified */ $block->renderTotals() ?>
--        <?= /* @escapeNotVerified */ $block->renderTotals('footer') ?>
-+        <?= /* @noEscape */ $block->renderTotals() ?>
-+        <?= /* @noEscape */ $block->renderTotals('footer') ?>
-     </tbody>
- </table>
- 
- <div class="order-totals-actions">
-     <div class="admin__field admin__field-option field-append-comments">
-         <input type="checkbox" id="notify_customer" name="order[comment][customer_note_notify]"
--               value="1"<?php if ($block->getNoteNotify()): ?> checked="checked"<?php endif; ?>
-+               value="1"<?php if ($block->getNoteNotify()) : ?> checked="checked"<?php endif; ?>
-                class="admin__control-checkbox"/>
--        <label for="notify_customer" class="admin__field-label"><?= /* @escapeNotVerified */ __('Append Comments') ?></label>
-+        <label for="notify_customer" class="admin__field-label"><?= $block->escapeHtml(__('Append Comments')) ?></label>
-     </div>
--    <?php if ($block->canSendNewOrderConfirmationEmail()): ?>
-+    <?php if ($block->canSendNewOrderConfirmationEmail()) : ?>
-     <div class="admin__field admin__field-option field-email-order-confirmation">
-         <input type="checkbox" id="send_confirmation" name="order[send_confirmation]" value="1" checked="checked"
-                class="admin__control-checkbox"/>
--        <label for="send_confirmation" class="admin__field-label"><?= /* @escapeNotVerified */ __('Email Order Confirmation') ?></label>
-+        <label for="send_confirmation" class="admin__field-label"><?= $block->escapeHtml(__('Email Order Confirmation')) ?></label>
-     </div>
-     <?php endif; ?>
-     <div class="actions">
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
-index 9ab8a655253..4a55eb60992 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
-@@ -3,19 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<tr class="<?= /* @escapeNotVerified */ $block->getTotal()->getCode() ?> row-totals">
--    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
--        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
-+<tr class="<?= $block->escapeHtmlAttr($block->getTotal()->getCode()) ?> row-totals">
-+    <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) : ?><strong><?php endif; ?>
-             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
--        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
-+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) : ?></strong><?php endif; ?>
-     </td>
--    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-amount">
--        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
--            <?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?>
--        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-amount">
-+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) : ?><strong><?php endif; ?>
-+            <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?>
-+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) : ?></strong><?php endif; ?>
-     </td>
- </tr>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
-index 7486edd7327..4c4f94b5b3b 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
-@@ -4,38 +4,36 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\Tax\Block\Checkout\Grandtotal
-  * @see \Magento\Tax\Block\Checkout\Grandtotal
-  */
- ?>
--<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0):?>
--<tr class="row-totals">
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
--        <strong><?= /* @escapeNotVerified */ __('Grand Total Excl. Tax') ?></strong>
--    </td>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
--        <strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getTotalExclTax()) ?></strong>
--    </td>
--</tr>
--<?= /* @escapeNotVerified */ $block->renderTotals('taxes', $block->getColspan()) ?>
--<tr class="row-totals">
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
--        <strong><?= /* @escapeNotVerified */ __('Grand Total Incl. Tax') ?></strong>
--    </td>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
--        <strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?></strong>
--    </td>
--</tr>
--<?php else:?>
--<tr class="row-totals">
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
--        <strong><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></strong>
--    </td>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
--        <strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?></strong>
--    </td>
--</tr>
-+<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0) : ?>
-+    <tr class="row-totals">
-+        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-+            <strong><?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?></strong>
-+        </td>
-+        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
-+            <strong><?= /* @noEscape */ $block->formatPrice($block->getTotalExclTax()) ?></strong>
-+        </td>
-+    </tr>
-+    <?= /* @noEscape */ $block->renderTotals('taxes', $block->getColspan()) ?>
-+    <tr class="row-totals">
-+        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-+            <strong><?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?></strong>
-+        </td>
-+        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
-+            <strong><?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?></strong>
-+        </td>
-+    </tr>
-+    <?php else : ?>
-+    <tr class="row-totals">
-+        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-+            <strong><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></strong>
-+        </td>
-+        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
-+            <strong><?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?></strong>
-+        </td>
-+    </tr>
- <?php endif;?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
-index 2235a428e1e..db204a46f1f 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
-@@ -4,46 +4,44 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\Tax\Block\Checkout\Shipping
-  * @see \Magento\Tax\Block\Checkout\Shipping
-  */
- ?>
--<?php if ($block->displayBoth()):?>
-+<?php if ($block->displayBoth()) :?>
- <tr class="row-totals">
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
--        <?= /* @escapeNotVerified */ $block->getExcludeTaxLabel() ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-+        <?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>
-     </td>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
--        <?= /* @escapeNotVerified */ $block->formatPrice($block->getShippingExcludeTax()) ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
-+        <?= /* @noEscape */ $block->formatPrice($block->getShippingExcludeTax()) ?>
-     </td>
- </tr>
- <tr class="row-totals">
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
--        <?= /* @escapeNotVerified */ $block->getIncludeTaxLabel() ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-+        <?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>
-     </td>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
--        <?= /* @escapeNotVerified */ $block->formatPrice($block->getShippingIncludeTax()) ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
-+        <?= /* @noEscape */ $block->formatPrice($block->getShippingIncludeTax()) ?>
-     </td>
- </tr>
- <?php elseif ($block->displayIncludeTax()) : ?>
- <tr>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
--        <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-+        <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-     </td>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
--        <?= /* @escapeNotVerified */ $block->formatPrice($block->getShippingIncludeTax()) ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
-+        <?= /* @noEscape */ $block->formatPrice($block->getShippingIncludeTax()) ?>
-     </td>
- </tr>
--<?php else:?>
-+<?php else : ?>
- <tr class="row-totals">
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-         <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-     </td>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
--        <?= /* @escapeNotVerified */ $block->formatPrice($block->getShippingExcludeTax()) ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
-+        <?= /* @noEscape */ $block->formatPrice($block->getShippingExcludeTax()) ?>
-     </td>
- </tr>
- <?php endif;?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
-index 380a7dc6fcb..a63458491ba 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
-@@ -4,37 +4,35 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Subtotal
-  * @see \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Subtotal
-  */
- ?>
--<?php if ($block->displayBoth()):?>
-+<?php if ($block->displayBoth()) : ?>
- <tr class="row-totals">
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
--        <?= /* @escapeNotVerified */ __('Subtotal (Excl. Tax)') ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-+        <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
-     </td>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
--        <?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValueExclTax()) ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
-+        <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValueExclTax()) ?>
-     </td>
- </tr>
- <tr class="row-totals">
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
--        <?= /* @escapeNotVerified */ __('Subtotal (Incl. Tax)') ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-+        <?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
-     </td>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
--        <?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValueInclTax()) ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
-+        <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValueInclTax()) ?>
-     </td>
- </tr>
- <?php else : ?>
- <tr class="row-totals">
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
--        <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-+        <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-     </td>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
--        <?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?>
-+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
-+        <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?>
-     </td>
- </tr>
- <?php endif;?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
-index 92139896273..042b2f5113c 100755
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
-@@ -4,56 +4,59 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
-+// phpcs:disable Squiz.PHP.GlobalKeyword.NotAllowed
-+
-+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Tax $block */
- 
- $taxAmount = $block->getTotal()->getValue();
- ?>
--<?php if (($taxAmount == 0 && $this->helper('Magento\Tax\Helper\Data')->displayZeroTax()) || ($taxAmount > 0)): ?>
--<?php global $taxIter; $taxIter++; ?>
--<?php $class = "{$block->getTotal()->getCode()} " . ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() ? 'summary-total' : ''); ?>
--<tr<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
--    onclick="expandDetails(this, '.summary-details-<?= /* @escapeNotVerified */ $taxIter ?>')"
--<?php endif; ?>
--    class="<?= /* @escapeNotVerified */ $class ?> row-totals">
--    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
--        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
--            <div class="summary-collapse"><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></div>
--        <?php else: ?>
--            <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
--        <?php endif;?>
--    </td>
--    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-amount"><?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?></td>
--</tr>
--<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
-+<?php if (($taxAmount == 0 && $this->helper(\Magento\Tax\Helper\Data::class)->displayZeroTax()) || ($taxAmount > 0)) :
-+    global $taxIter;
-+    $taxIter++;
-+    ?>
-+    <?php $class = $block->escapeHtmlAttr("{$block->getTotal()->getCode()} " . ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() ? 'summary-total' : '')); ?>
-+    <tr<?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
-+        onclick="expandDetails(this, '.summary-details-<?= $block->escapeJs($taxIter) ?>')"
-+    <?php endif; ?>
-+        class="<?= /* @noEscape */ $class ?> row-totals">
-+        <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-+            <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
-+                <div class="summary-collapse"><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></div>
-+            <?php else : ?>
-+                <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-+            <?php endif;?>
-+        </td>
-+        <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-amount">
-+            <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?>
-+        </td>
-+    </tr>
-+    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
-         <?php $isTop = 1; ?>
--        <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
--                <?php if (isset($info['hidden']) && $info['hidden']) {
--                    continue;
--                } ?>
--                <?php $percent = $info['percent']; ?>
--                <?php $amount = $info['amount']; ?>
--                <?php $rates = $info['rates']; ?>
--                <?php $isFirst = 1; ?>
-+        <?php foreach ($block->getTotal()->getFullInfo() as $info) : ?>
-+            <?php if (isset($info['hidden']) && $info['hidden']) :
-+                continue;
-+            endif; ?>
-+            <?php $percent = $info['percent']; ?>
-+            <?php $amount = $info['amount']; ?>
-+            <?php $rates = $info['rates']; ?>
- 
--                <?php foreach ($rates as $rate): ?>
--                <tr class="summary-details-<?= /* @escapeNotVerified */ $taxIter ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
--                    <td class="admin__total-mark" style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
-+            <?php foreach ($rates as $rate) : ?>
-+                <tr class="summary-details-<?= $block->escapeHtmlAttr($taxIter) ?> summary-details<?= ($isTop ? ' summary-details-first' : '') ?>" style="display:none;">
-+                    <td class="admin__total-mark" style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" colspan="<?= (int) $block->getColspan() ?>">
-                         <?= $block->escapeHtml($rate['title']) ?>
--                        <?php if (!is_null($rate['percent'])): ?>
--                            (<?= (float)$rate['percent'] ?>%)
-+                        <?php if ($rate['percent'] !== null) : ?>
-+                            (<?= (float) $rate['percent'] ?>%)
-                         <?php endif; ?>
-                         <br />
-                     </td>
--                    <?php if ($isFirst): ?>
--                        <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-amount" rowspan="<?= count($rates) ?>">
--                            <?= /* @escapeNotVerified */ $block->formatPrice($amount) ?>
--                        </td>
--                    <?php endif; ?>
-+                    <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-amount">
-+                        <?= /* @noEscape */ $block->formatPrice(($amount*(float)$rate['percent'])/$percent) ?>
-+                    </td>
-                 </tr>
--                <?php $isFirst = 0; ?>
-                 <?php $isTop = 0; ?>
--                <?php endforeach; ?>
-+            <?php endforeach; ?>
-         <?php endforeach; ?>
--<?php endif;?>
-+    <?php endif;?>
- <?php endif;?>
- 
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
-index 2f32483e11a..050098078b3 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
-@@ -4,10 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
-+/* @var \Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Form $block */
- ?>
--<form id="edit_form" method="post" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
-+<form id="edit_form" method="post" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
-     <?= $block->getBlockHtml('formkey') ?>
-     <?php  $_order = $block->getCreditmemo()->getOrder() ?>
- 
-@@ -15,23 +16,23 @@
- 
-     <section class="admin__page-section">
-         <div class="admin__page-section-title">
--            <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
-+            <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
-         </div>
-         <div class="admin__page-section-content">
--        <?php if (!$_order->getIsVirtual()): ?>
-+        <?php if (!$_order->getIsVirtual()) : ?>
-         <div class="admin__page-section-item order-payment-method">
--        <?php else: ?>
-+        <?php else : ?>
-         <div class="admin__page-section-item order-payment-method order-payment-method-virtual">
-         <?php endif; ?>
- 
-             <?php /* Billing Address */ ?>
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
-             </div>
-             <div class="admin__page-section-item-content">
-                 <div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
-                 <div class="order-payment-currency">
--                    <?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
-+                    <?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?>
-                 </div>
-                 <div class="order-payment-additional">
-                     <?= $block->getChildHtml('order_payment_additional') ?>
-@@ -39,27 +40,27 @@
-             </div>
-         </div>
- 
--        <?php if (!$_order->getIsVirtual()): ?>
-+        <?php if (!$_order->getIsVirtual()) : ?>
-         <div class="admin__page-section-item order-shipping-address">
-             <?php /* Shipping Address */ ?>
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Shipping Information')) ?></span>
-             </div>
-             <div class="admin__page-section-item-content shipping-description-wrapper">
-                 <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
-                 <div class="shipping-description-content">
--                    <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
-+                    <?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
- 
--                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax($block->getSource()->getStoreId())): ?>
-+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesPriceInclTax($block->getSource()->getStoreId())) : ?>
-                         <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
--                    <?php else: ?>
-+                    <?php else : ?>
-                         <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-                     <?php endif; ?>
-                     <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
- 
--                    <?= /* @escapeNotVerified */ $_excl ?>
--                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($block->getSource()->getStoreId()) && $_incl != $_excl): ?>
--                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
-+                    <?= /* @noEscape */ $_excl ?>
-+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices($block->getSource()->getStoreId()) && $_incl != $_excl) : ?>
-+                        (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
-                     <?php endif; ?>
-                 </div>
-             </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
-index fcf4ccad706..31d3b281532 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
-@@ -4,14 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/* @var \Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items $block */
- ?>
- <?php $_items = $block->getCreditmemo()->getAllItems() ?>
- 
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Items to Refund') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Items to Refund')) ?></span>
-     </div>
- 
-     <?php if (count($_items)) : ?>
-@@ -19,20 +18,20 @@
-         <table class="data-table admin__table-primary order-creditmemo-tables">
-             <thead>
-                 <tr class="headings">
--                    <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
--                    <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
--                    <th class="col-ordered-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
-+                    <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
-+                    <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
-+                    <th class="col-ordered-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
-                     <?php if ($block->canReturnToStock()) : ?>
--                    <th class="col-return-to-stock"><span><?= /* @escapeNotVerified */ __('Return to Stock') ?></span></th>
-+                    <th class="col-return-to-stock"><span><?= $block->escapeHtml(__('Return to Stock')) ?></span></th>
-                     <?php endif; ?>
--                    <th class="col-refund"><span><?= /* @escapeNotVerified */ __('Qty to Refund') ?></span></th>
--                    <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
--                    <th class="col-tax-amount"><span><?= /* @escapeNotVerified */ __('Tax Amount') ?></span></th>
--                    <th class="col-discont"><span><?= /* @escapeNotVerified */ __('Discount Amount') ?></span></th>
--                    <th class="col-total last"><span><?= /* @escapeNotVerified */ __('Row Total') ?></span></th>
-+                    <th class="col-refund"><span><?= $block->escapeHtml(__('Qty to Refund')) ?></span></th>
-+                    <th class="col-subtotal"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
-+                    <th class="col-tax-amount"><span><?= $block->escapeHtml(__('Tax Amount')) ?></span></th>
-+                    <th class="col-discont"><span><?= $block->escapeHtml(__('Discount Amount')) ?></span></th>
-+                    <th class="col-total last"><span><?= $block->escapeHtml(__('Row Total')) ?></span></th>
-                 </tr>
-             </thead>
--            <?php if ($block->canEditQty()): ?>
-+            <?php if ($block->canEditQty()) : ?>
-             <tfoot>
-                 <tr>
-                     <td colspan="3">&nbsp;</td>
-@@ -43,13 +42,13 @@
-                 </tr>
-             </tfoot>
-             <?php endif; ?>
--            <?php $i = 0; foreach ($_items as $_item): ?>
--                <?php if ($_item->getOrderItem()->getParentItem()) {
--                continue;
--            } else {
--                $i++;
--            } ?>
--                <tbody class="<?= /* @escapeNotVerified */ $i%2 ? 'even' : 'odd' ?>">
-+            <?php $i = 0; foreach ($_items as $_item) : ?>
-+                <?php if ($_item->getOrderItem()->getParentItem()) :
-+                    continue;
-+                else :
-+                    $i++;
-+                endif; ?>
-+                <tbody class="<?= /* @noEscape */ $i%2 ? 'even' : 'odd' ?>">
-                     <?= $block->getItemHtml($_item) ?>
-                     <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
-                 </tbody>
-@@ -58,47 +57,47 @@
-     </div>
-     <?php else : ?>
-     <div class="no-items">
--        <?= /* @escapeNotVerified */ __('No Items To Refund') ?>
-+        <?= $block->escapeHtml(__('No Items To Refund')) ?>
-     </div>
-     <?php endif; ?>
- </section>
- 
- <?php $orderTotalBar = $block->getChildHtml('order_totalbar'); ?>
- 
--<?php if (!empty($orderTotalBar)): ?>
-+<?php if (!empty($orderTotalBar)) : ?>
- <section class="fieldset-wrapper">
--    <?= /* @escapeNotVerified */ $orderTotalBar ?>
-+    <?= /* @noEscape */ $orderTotalBar ?>
- </section>
- <?php endif; ?>
- 
- <section class="admin__page-section">
-     <input type="hidden" name="creditmemo[do_offline]" id="creditmemo_do_offline" value="0" />
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Order Total')) ?></span>
-     </div>
-     <div class="admin__page-section-content">
-         <div class="admin__page-section-item order-comments-history">
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Credit Memo Comments') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Credit Memo Comments')) ?></span>
-             </div>
-             <div id="history_form" class="admin__fieldset-wrapper-content">
-                 <div class="admin__field">
-                     <label class="normal admin__field-label"
-                            for="creditmemo_comment_text">
--                        <span><?= /* @escapeNotVerified */ __('Comment Text') ?></span></label>
-+                        <span><?= $block->escapeHtml(__('Comment Text')) ?></span></label>
-                     <div class="admin__field-control">
-                         <textarea id="creditmemo_comment_text"
-                                   class="admin__control-textarea"
-                                   name="creditmemo[comment_text]"
-                                   rows="3"
--                                  cols="5"><?= /* @escapeNotVerified */ $block->getCreditmemo()->getCommentText() ?></textarea>
-+                                  cols="5"><?= $block->escapeHtml($block->getCreditmemo()->getCommentText()) ?></textarea>
-                     </div>
-                 </div>
-             </div>
-         </div>
-         <div class="admin__page-section-item order-totals creditmemo-totals">
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Refund Totals') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Refund Totals')) ?></span>
-             </div>
-             <?= $block->getChildHtml('creditmemo_totals') ?>
-             <div class="order-totals-actions">
-@@ -109,10 +108,10 @@
-                            value="1"
-                            type="checkbox" />
-                     <label for="notify_customer" class="admin__field-label">
--                        <span><?= /* @escapeNotVerified */ __('Append Comments') ?></span>
-+                        <span><?= $block->escapeHtml(__('Append Comments')) ?></span>
-                     </label>
-                 </div>
--                <?php if ($block->canSendCreditmemoEmail()):?>
-+                <?php if ($block->canSendCreditmemoEmail()) :?>
-                 <div class="field choice admin__field admin__field-option field-email-copy">
-                     <input id="send_email"
-                            class="admin__control-checkbox"
-@@ -120,7 +119,7 @@
-                            value="1"
-                            type="checkbox" />
-                     <label for="send_email" class="admin__field-label">
--                        <span><?= /* @escapeNotVerified */ __('Email Copy of Credit Memo') ?></span>
-+                        <span><?= $block->escapeHtml(__('Email Copy of Credit Memo')) ?></span>
-                     </label>
-                 </div>
-                 <?php endif; ?>
-@@ -136,67 +135,76 @@
- </section>
- 
- <script>
--require(['jquery', 'prototype'], function(jQuery){
-+require(['jquery'], function(jQuery){
- 
- //<![CDATA[
--var submitButtons = $$('.submit-button');
--var updateButtons = $$('.update-button');
--var fields = $$('.qty-input');
-+var submitButtons = jQuery('.submit-button');
-+var updateButtons = jQuery('.update-button');
-+var fields = jQuery('.qty-input');
- 
--updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
-+function enableButtons(buttons) {
-+    buttons.removeClass('disabled').prop('disabled', false);
-+}
- 
--for(var i=0;i<fields.length;i++){
--    fields[i].observe('change', checkButtonsRelation)
--    fields[i].baseValue = fields[i].value;
-+function disableButtons(buttons) {
-+    buttons.addClass('disabled').prop('disabled', true);
- }
- 
-+disableButtons(updateButtons);
-+
-+fields.on('change', checkButtonsRelation);
-+fields.each(function (i, elem) {
-+    elem.baseValue = elem.value;
-+});
-+
- function checkButtonsRelation() {
-     var hasChanges = false;
--    fields.each(function (elem) {
-+    fields.each(function (i, elem) {
-         if (elem.baseValue != elem.value) {
-             hasChanges = true;
-         }
-     }.bind(this));
-     if (hasChanges) {
--        submitButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
--        updateButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
-+        disableButtons(submitButtons);
-+        enableButtons(updateButtons);
-     }
-     else {
--        submitButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
--        updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
-+        enableButtons(submitButtons);
-+        disableButtons(updateButtons);
-     }
- }
- 
- submitCreditMemo = function() {
--    if ($('creditmemo_do_offline')) $('creditmemo_do_offline').value=0;
-+    var creditMemoOffline = jQuery('#creditmemo_do_offline');
-+    if (creditMemoOffline.length) {
-+        creditMemoOffline.prop('value', 0);
-+    }
-     // Temporary solution will be replaced after refactoring order functionality
-     jQuery('#edit_form').triggerHandler('save');
--}
-+};
- 
- submitCreditMemoOffline = function() {
--    if ($('creditmemo_do_offline')) $('creditmemo_do_offline').value=1;
-+    var creditMemoOffline = jQuery('#creditmemo_do_offline');
-+    if (creditMemoOffline.length) {
-+        creditMemoOffline.prop('value', 1);
-+    }
-     // Temporary solution will be replaced after refactoring order functionality
-     jQuery('#edit_form').triggerHandler('save');
--}
--
--var sendEmailCheckbox = $('send_email');
-+};
- 
--if (sendEmailCheckbox) {
--    var notifyCustomerCheckbox = $('notify_customer');
--    var creditmemoCommentText = $('creditmemo_comment_text');
--    Event.observe(sendEmailCheckbox, 'change', bindSendEmail);
-+var sendEmailCheckbox = jQuery('#send_email');
-+if (sendEmailCheckbox.length) {
-+    var notifyCustomerCheckbox = jQuery('#notify_customer');
-+    sendEmailCheckbox.on('change', bindSendEmail);
-     bindSendEmail();
- }
- 
--function bindSendEmail()
--{
--    if (sendEmailCheckbox.checked == true) {
--        notifyCustomerCheckbox.disabled = false;
--        //creditmemoCommentText.disabled = false;
-+function bindSendEmail() {
-+    if (sendEmailCheckbox.prop('checked') == true) {
-+        notifyCustomerCheckbox.prop('disabled', false);
-     }
-     else {
--        notifyCustomerCheckbox.disabled = true;
--        //creditmemoCommentText.disabled = true;
-+        notifyCustomerCheckbox.prop('disabled', true);
-     }
- }
- 
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
-index b27a07c4bf8..65c28578b68 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
- <?php $_item = $block->getItem() ?>
-@@ -21,8 +18,8 @@
-         <?php if ($block->canReturnItemToStock($_item)) : ?>
-             <input type="checkbox"
-                    class="admin__control-checkbox"
--                   name="creditmemo[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>][back_to_stock]"
--                   value="1"<?php if ($_item->getBackToStock()):?> checked<?php endif;?>/>
-+                   name="creditmemo[items][<?= (int) $_item->getOrderItemId() ?>][back_to_stock]"
-+                   value="1"<?php if ($_item->getBackToStock()) : ?> checked<?php endif; ?>/>
-             <label class="admin__field-label"></label>
-         <?php endif; ?>
-         </td>
-@@ -31,17 +28,17 @@
-     <?php if ($block->canEditQty()) : ?>
-         <input type="text"
-                class="input-text admin__control-text qty-input"
--               name="creditmemo[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>][qty]"
--               value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>"/>
-+               name="creditmemo[items][<?= (int) $_item->getOrderItemId() ?>][qty]"
-+               value="<?= (int) $_item->getQty() ?>"/>
-     <?php else : ?>
--        <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
-+        <?= (int) $_item->getQty() ?>
-     <?php endif; ?>
-     </td>
-     <td class="col-subtotal">
-         <?= $block->getColumnHtml($_item, 'subtotal') ?>
-     </td>
--    <td class="col-tax-amount"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?></td>
--    <td class="col-discont"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
-+    <td class="col-tax-amount"><?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?></td>
-+    <td class="col-discont"><?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?></td>
-     <td class="col-total last">
-         <?= $block->getColumnHtml($_item, 'total') ?>
-     </td>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
-index fd77387a1eb..f46b8c11cc2 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
-@@ -3,38 +3,35 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_source  = $block->getSource() ?>
--<?php if ($_source): ?>
-+<?php if ($_source) : ?>
-     <tr>
--        <td class="label"><?= /* @escapeNotVerified */ $block->getShippingLabel() ?><div id="shipping_amount_adv"></div></td>
-+        <td class="label"><?= $block->escapeHtml($block->getShippingLabel()) ?><div id="shipping_amount_adv"></div></td>
-         <td>
-             <input type="text"
-                    name="creditmemo[shipping_amount]"
--                   value="<?= /* @escapeNotVerified */ $block->getShippingAmount() ?>"
-+                   value="<?= $block->escapeHtmlAttr($block->getShippingAmount()) ?>"
-                    class="input-text admin__control-text not-negative-amount"
-                    id="shipping_amount" />
-         </td>
-     </tr>
-     <tr>
--        <td class="label"><?= /* @escapeNotVerified */ __('Adjustment Refund') ?><div id="adjustment_positive_adv"></div></td>
-+        <td class="label"><?= $block->escapeHtml(__('Adjustment Refund')) ?><div id="adjustment_positive_adv"></div></td>
-         <td>
-             <input type="text"
-                    name="creditmemo[adjustment_positive]"
--                   value="<?= /* @escapeNotVerified */ $_source->getBaseAdjustmentPositive()*1 ?>"
-+                   value="<?= $block->escapeHtmlAttr($_source->getBaseAdjustmentPositive()) ?>"
-                    class="input-text admin__control-text not-negative-amount"
-                    id="adjustment_positive" />
-         </td>
-     </tr>
-     <tr>
--        <td class="label"><?= /* @escapeNotVerified */ __('Adjustment Fee') ?><div id="adjustment_negative_adv"></div></td>
-+        <td class="label"><?= $block->escapeHtml(__('Adjustment Fee')) ?><div id="adjustment_negative_adv"></div></td>
-         <td>
-             <input type="text"
-                    name="creditmemo[adjustment_negative]"
--                   value="<?= /* @escapeNotVerified */ $_source->getBaseAdjustmentNegative()*1 ?>"
-+                   value="<?= $block->escapeHtmlAttr($_source->getBaseAdjustmentNegative()) ?>"
-                    class="input-text admin__control-text not-negative-amount"
-                    id="adjustment_negative"/>
-             <script>
-@@ -42,7 +39,7 @@
- 
-                 //<![CDATA[
-                 Validation.addAllThese([
--                    ['not-negative-amount', '<?= /* @escapeNotVerified */ __('Please enter a positive number in this field.') ?>', function(v) {
-+                    ['not-negative-amount', '<?= $block->escapeJs(__('Please enter a positive number in this field.')) ?>', function(v) {
-                         if(v.length)
-                             return /^\s*\d+([,.]\d+)*\s*%?\s*$/.test(v);
-                         else
-@@ -69,6 +66,9 @@
-                             enableElements('submit-button');
-                         }
-                     });
-+                    $(id).observe('change', function (event) {
-+                        enableElements('submit-button');
-+                    });
-                 }
-                 //]]>
- 
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
-index 7f5c54a3236..7e3dc7ea0be 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
-@@ -4,54 +4,55 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
-+/* @var \Magento\Sales\Block\Adminhtml\Order\Creditmemo\View\Form $block */
- ?>
- <?php  $_order = $block->getCreditmemo()->getOrder() ?>
- <?= $block->getChildHtml('order_info') ?>
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
-     </div>
-     <div class="admin__page-section-content">
- 
--        <?php if (!$_order->getIsVirtual()): ?>
-+        <?php if (!$_order->getIsVirtual()) : ?>
-         <div class="admin__page-section-item order-payment-method">
--        <?php else: ?>
-+        <?php else : ?>
-         <div class="admin__page-section-item order-payment-method order-payment-method-virtual">
-         <?php endif; ?>
-             <?php /* Billing Address */?>
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
-             </div>
-             <div class="admin__page-section-item-content">
-                 <div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
--                <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
-+                <div class="order-payment-currency"><?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?></div>
-                 <div class="order-payment-additional"><?= $block->getChildHtml('order_payment_additional') ?></div>
-             </div>
-         </div>
- 
--        <?php if (!$_order->getIsVirtual()): ?>
-+        <?php if (!$_order->getIsVirtual()) : ?>
-         <div class="admin__page-section-item order-shipping-address">
-             <?php /* Shipping Address */ ?>
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Shipping Information')) ?></span>
-             </div>
-             <div class="shipping-description-wrapper admin__page-section-item-content">
-                 <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
-                 <div class="shipping-description-content">
--                    <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
-+                    <?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
- 
--                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
-+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
-                         <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
--                    <?php else: ?>
-+                    <?php else : ?>
-                         <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-                     <?php endif; ?>
-                     <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
- 
--                    <?= /* @escapeNotVerified */ $_excl ?>
--                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
--                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
-+                    <?= /* @noEscape */ $_excl ?>
-+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
-+                        (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
-                     <?php endif; ?>
-                 </div>
-             </div>
-@@ -61,33 +62,33 @@
- </section>
- <?php $_items = $block->getCreditmemo()->getAllItems() ?>
- 
--<?php if (count($_items)): ?>
-+<?php if (count($_items)) : ?>
- <div id="creditmemo_items_container">
-     <?= $block->getChildHtml('creditmemo_items') ?>
- </div>
--<?php else: ?>
-+<?php else : ?>
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Items Refunded') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Items Refunded')) ?></span>
-     </div>
--    <div class="no-items admin__page-section-content"><?= /* @escapeNotVerified */ __('No Items') ?></div>
-+    <div class="no-items admin__page-section-content"><?= $block->escapeHtml(__('No Items')) ?></div>
- </section>
- <?php endif; ?>
- 
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Memo Total') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Memo Total')) ?></span>
-     </div>
-     <div class="admin__page-section-content">
-         <div class="admin__page-section-item order-comments-history">
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Credit Memo History') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Credit Memo History')) ?></span>
-             </div>
-             <div class="admin__page-section-item-content"><?= $block->getChildHtml('order_comments') ?></div>
-         </div>
-         <div class="admin__page-section-item order-totals" id="history_form">
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Credit Memo Totals') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Credit Memo Totals')) ?></span>
-             </div>
-             <div class="admin__page-section-content"><?= $block->getChildHtml('creditmemo_totals') ?></div>
-         </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
-index d77f2fbde22..14711979828 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
-@@ -4,35 +4,34 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/* @var \Magento\Sales\Block\Adminhtml\Order\Creditmemo\View\Items $block */
- ?>
- <?php $_items = $block->getCreditmemo()->getAllItems() ?>
- <div class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Items Refunded') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Items Refunded')) ?></span>
-     </div>
-     <div class="admin__page-section-content">
-         <div class="admin__table-wrapper">
-             <table class="data-table admin__table-primary order-creditmemo-tables">
-                 <thead>
-                     <tr class="headings">
--                        <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
--                        <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
--                        <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
--                        <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
--                        <th class="col-tax"><span><?= /* @escapeNotVerified */ __('Tax Amount') ?></span></th>
--                        <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount Amount') ?></span></th>
--                        <th class="col-total last"><span><?= /* @escapeNotVerified */ __('Row Total') ?></span></th>
-+                        <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
-+                        <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
-+                        <th class="col-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
-+                        <th class="col-subtotal"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
-+                        <th class="col-tax"><span><?= $block->escapeHtml(__('Tax Amount')) ?></span></th>
-+                        <th class="col-discount"><span><?= $block->escapeHtml(__('Discount Amount')) ?></span></th>
-+                        <th class="col-total last"><span><?= $block->escapeHtml(__('Row Total')) ?></span></th>
-                     </tr>
-                 </thead>
--                <?php $i = 0; foreach ($_items as $_item): ?>
--                    <?php if ($_item->getOrderItem()->getParentItem()) {
-+                <?php $i = 0; foreach ($_items as $_item) : ?>
-+                    <?php if ($_item->getOrderItem()->getParentItem()) :
-                         continue;
--                    } else {
-+                    else :
-                         $i++;
--                    } ?>
--                    <tbody class="<?= /* @escapeNotVerified */ $i%2 ? 'even' : 'odd' ?>">
-+                    endif; ?>
-+                    <tbody class="<?= /* @noEscape */ $i%2 ? 'even' : 'odd' ?>">
-                         <?= $block->getItemHtml($_item) ?>
-                         <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
-                     </tbody>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
-index d39d41fe9c3..80ad5302392 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
- <?php $_item = $block->getItem() ?>
-@@ -16,12 +13,12 @@
-     <td class="col-price">
-         <?= $block->getColumnHtml($_item, 'price') ?>
-     </td>
--    <td class="col-qty"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
-+    <td class="col-qty"><?= (int) $_item->getQty() ?></td>
-     <td class="col-subtotal">
-         <?= $block->getColumnHtml($_item, 'subtotal') ?>
-     </td>
--    <td class="col-tax"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?></td>
--    <td class="col-discount"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
-+    <td class="col-tax"><?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?></td>
-+    <td class="col-discount"><?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?></td>
-     <td class="col-total last">
-         <?= $block->getColumnHtml($_item, 'total') ?>
-     </td>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
-index 2372087de5d..961baf54996 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
-@@ -4,18 +4,22 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /*
- store view name = $_order->getStore()->getName()
- web site name = $_order->getStore()->getWebsite()->getName()
- store name = $_order->getStore()->getGroup()->getName()
- */
-+
-+/* @var \Magento\Sales\Block\Adminhtml\Order\Details $block */
- ?>
--<?php $_order = $block->getOrder() ?>
-+<?php
-+/* @var \Magento\Sales\Model\Order $_order */
-+$_order = $block->getOrder() ?>
- <div>
--<?= __('Customer Name: %1', $block->escapeHtml($_order->getCustomerFirstname() ? $_order->getCustomerName() : $_order->getBillingAddress()->getName())) ?><br />
--<?= __('Purchased From: %1', $block->escapeHtml($_order->getStore()->getGroup()->getName())) ?><br />
-+<?= $block->escapeHtml(__('Customer Name: %1', $_order->getCustomerFirstname() ? $_order->getCustomerName() : $_order->getBillingAddress()->getName())) ?><br />
-+<?= $block->escapeHtml(__('Purchased From: %1', $_order->getStore()->getGroup()->getName())) ?><br />
- </div>
- <table cellpadding="0" border="0" width="100%" style="border:1px solid #bebcb7; background:#f8f7f5;">
-     <thead>
-@@ -27,58 +31,58 @@ store name = $_order->getStore()->getGroup()->getName()
-     </thead>
- 
-     <tbody>
--<?php $i = 0; foreach ($_order->getAllItems() as $_item): $i++ ?>
-+<?php $i = 0; foreach ($_order->getAllItems() as $_item) : $i++ ?>
-         <tr <?= $i%2 ? 'bgcolor="#eeeded"' : '' ?>>
-             <td align="left" valign="top" style="padding:3px 9px"><strong><?= $block->escapeHtml($_item->getName()) ?></strong>
--            <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
--            <br /><strong><?= /* @escapeNotVerified */ __('Gift Message') ?></strong>
--            <br /><?= /* @escapeNotVerified */ __('From:') ?> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
--            <br /><?= /* @escapeNotVerified */ __('To:') ?> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
--            <br /><?= /* @escapeNotVerified */ __('Message:') ?><br /> <?= $block->escapeHtml($_giftMessage->getMessage()) ?>
-+            <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessage($_item->getGiftMessageId())) : ?>
-+            <br /><strong><?= $block->escapeHtml(__('Gift Message')) ?></strong>
-+            <br /><?= $block->escapeHtml(__('From:')) ?> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-+            <br /><?= $block->escapeHtml(__('To:')) ?> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-+            <br /><?= $block->escapeHtml(__('Message:')) ?><br /> <?= $block->escapeHtml($_giftMessage->getMessage()) ?>
-             <?php endif; ?>
-             </td>
--            <td align="center" valign="top" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></td>
--            <td align="right" valign="top" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice($_item->getRowTotal()) ?></td>
-+            <td align="center" valign="top" style="padding:3px 9px"><?= (int) $_item->getQtyOrdered() ?></td>
-+            <td align="right" valign="top" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice($_item->getRowTotal()) ?></td>
-         </tr>
--<?php endforeach ?>
-+<?php endforeach; ?>
-     </tbody>
- 
-     <tfoot>
--    <?php if ($_order->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_order->getGiftMessageId())): ?>
-+    <?php if ($_order->getGiftMessageId() && $_giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessage($_order->getGiftMessageId())) : ?>
-         <tr>
-             <td colspan="3" align="left" style="padding:3px 9px">
--            <strong><?= /* @escapeNotVerified */ __('Gift Message') ?></strong>
--            <br /><?= /* @escapeNotVerified */ __('From:') ?> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
--            <br /><?= /* @escapeNotVerified */ __('To:') ?> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
--            <br /><?= /* @escapeNotVerified */ __('Message:') ?><br /> <?= $block->escapeHtml($_giftMessage->getMessage()) ?>
-+            <strong><?= $block->escapeHtml(__('Gift Message')) ?></strong>
-+            <br /><?= $block->escapeHtml(__('From:')) ?> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-+            <br /><?= $block->escapeHtml(__('To:')) ?> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-+            <br /><?= $block->escapeHtml(__('Message:')) ?><br /> <?= $block->escapeHtml($_giftMessage->getMessage()) ?>
-             </td>
-         </tr>
--     <?php endif; ?>
-+    <?php endif; ?>
-         <tr>
--            <td colspan="2" align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ __('Subtotal') ?></td>
--            <td align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getSubtotal()) ?></td>
-+            <td colspan="2" align="right" style="padding:3px 9px"><?= $block->escapeHtml(__('Subtotal')) ?></td>
-+            <td align="right" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice($_order->getSubtotal()) ?></td>
-         </tr>
--        <?php if ($_order->getDiscountAmount() > 0): ?>
-+        <?php if ($_order->getDiscountAmount() > 0) : ?>
-             <tr>
--                <td colspan="2" align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ (($_order->getCouponCode()) ? __('Discount (%1)', $_order->getCouponCode()) : __('Discount')) ?></td>
--                <td align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice(0.00 - $_order->getDiscountAmount()) ?></td>
-+                <td colspan="2" align="right" style="padding:3px 9px"><?= $block->escapeHtml((($_order->getCouponCode()) ? __('Discount (%1)', $_order->getCouponCode()) : __('Discount'))) ?></td>
-+                <td align="right" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice(0.00 - $_order->getDiscountAmount()) ?></td>
-             </tr>
-         <?php endif; ?>
-         <?php if ($_order->getShippingAmount() || $_order->getShippingDescription()) : ?>
-             <tr>
--                <td colspan="2" align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ __('Shipping &amp; Handling') ?></td>
--                <td align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getShippingAmount()) ?></td>
-+                <td colspan="2" align="right" style="padding:3px 9px"><?= $block->escapeHtml(__('Shipping &amp; Handling')) ?></td>
-+                <td align="right" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice($_order->getShippingAmount()) ?></td>
-             </tr>
-         <?php endif; ?>
--        <?php if ($_order->getTaxAmount() > 0): ?>
-+        <?php if ($_order->getTaxAmount() > 0) : ?>
-             <tr>
--                <td colspan="2" align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ __('Tax') ?></td>
--                <td align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getTaxAmount()) ?></td>
-+                <td colspan="2" align="right" style="padding:3px 9px"><?= $block->escapeHtml(__('Tax')) ?></td>
-+                <td align="right" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice($_order->getTaxAmount()) ?></td>
-             </tr>
-         <?php endif; ?>
-         <tr bgcolor="#DEE5E8">
--            <td colspan="2" align="right" style="padding:3px 9px"><strong><big><?= /* @escapeNotVerified */ __('Grand Total') ?></big></strong></td>
--            <td align="right" style="padding:6px 9px"><strong><big><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getGrandTotal()) ?></big></strong></td>
-+            <td colspan="2" align="right" style="padding:3px 9px"><strong><big><?= $block->escapeHtml(__('Grand Total')) ?></big></strong></td>
-+            <td align="right" style="padding:6px 9px"><strong><big><?= /* @noEscape */ $_order->formatPrice($_order->getGrandTotal()) ?></big></strong></td>
-         </tr>
-     </tfoot>
- </table>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
-index acce4571be0..1010eb339e2 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
-@@ -3,13 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($block->getChildHtml()): ?>
-+<?php if ($block->getChildHtml()) : ?>
- <section class="admin__page-section order-gift-options">
--    <div class="admin__page-section-title"><strong class="title"><?= /* @escapeNotVerified */ __('Gift Options') ?></strong></div>
-+    <div class="admin__page-section-title"><strong class="title"><?= $block->escapeHtml(__('Gift Options')) ?></strong></div>
-     <?= $block->getChildHtml() ?>
- </section>
--<?php endif ?>
-+<?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
-index cabbb8df857..da9f0d273af 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
-@@ -4,68 +4,69 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
-+/* @var \Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Form $block */
- ?>
--<form id="edit_form" class="order-invoice-edit" method="post" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
-+<form id="edit_form" class="order-invoice-edit" method="post" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
-     <?= $block->getBlockHtml('formkey') ?>
-     <?php $_order = $block->getInvoice()->getOrder() ?>
-     <?= $block->getChildHtml('order_info') ?>
- 
-     <section class="admin__page-section">
-         <div class="admin__page-section-title">
--            <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
-+            <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
-         </div>
-         <div class="admin__page-section-content">
--            <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?>">
-+            <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()) : ?> order-payment-method-virtual<?php endif; ?>">
-                 <div class="admin__page-section-item-title">
--                    <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
-+                    <span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
-                 </div>
-                 <div class="admin__page-section-item-content">
-                     <div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
--                    <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
-+                    <div class="order-payment-currency"><?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?></div>
-                     <div class="order-payment-additional"><?= $block->getChildHtml('order_payment_additional') ?></div>
-                 </div>
-             </div>
--            <?php if (!$_order->getIsVirtual()): ?>
--            <div class="admin__page-section-item order-shipping-address">
--                <?php /*Shipping Address */ ?>
--                <div class="admin__page-section-item-title">
--                    <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
--                </div>
--                <div class="admin__page-section-item-content">
--                    <div class="shipping-description-wrapper">
--                        <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
--                        <div class="shipping-description-content">
--                            <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
-+            <?php if (!$_order->getIsVirtual()) : ?>
-+                <div class="admin__page-section-item order-shipping-address">
-+                    <?php /*Shipping Address */ ?>
-+                    <div class="admin__page-section-item-title">
-+                        <span class="title"><?= $block->escapeHtml(__('Shipping Information')) ?></span>
-+                    </div>
-+                    <div class="admin__page-section-item-content">
-+                        <div class="shipping-description-wrapper">
-+                            <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
-+                            <div class="shipping-description-content">
-+                                <?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
- 
--                            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
--                                <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
--                            <?php else: ?>
--                                <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
--                            <?php endif; ?>
--                            <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
-+                                <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
-+                                    <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
-+                                <?php else : ?>
-+                                    <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-+                                <?php endif; ?>
-+                                <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
- 
--                            <?= /* @escapeNotVerified */ $_excl ?>
--                            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
--                                (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
--                            <?php endif; ?>
-+                                <?= /* @noEscape */ $_excl ?>
-+                                <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
-+                                    (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
-+                                <?php endif; ?>
-+                            </div>
-                         </div>
--                    </div>
--                    <?php if ($block->canCreateShipment() && $block->canShipPartiallyItem()): ?>
--                    <div class="admin__field admin__field-option">
--                        <input type="checkbox" name="invoice[do_shipment]" id="invoice_do_shipment" value="1"
--                               class="admin__control-checkbox" <?= $block->hasInvoiceShipmentTypeMismatch() ? ' disabled="disabled"' : '' ?> />
--                        <label for="invoice_do_shipment"
--                               class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Create Shipment') ?></span></label>
--                    </div>
--                    <?php if ($block->hasInvoiceShipmentTypeMismatch()): ?>
--                        <small><?= /* @escapeNotVerified */ __('Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.') ?></small>
-+                        <?php if ($block->canCreateShipment() && $block->canShipPartiallyItem()) : ?>
-+                            <div class="admin__field admin__field-option">
-+                                <input type="checkbox" name="invoice[do_shipment]" id="invoice_do_shipment" value="1"
-+                                       class="admin__control-checkbox" <?= $block->hasInvoiceShipmentTypeMismatch() ? ' disabled="disabled"' : '' ?> />
-+                                <label for="invoice_do_shipment"
-+                                       class="admin__field-label"><span><?= $block->escapeHtml(__('Create Shipment')) ?></span></label>
-+                            </div>
-+                            <?php if ($block->hasInvoiceShipmentTypeMismatch()) : ?>
-+                                <small><?= $block->escapeHtml(__('Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.')) ?></small>
-+                            <?php endif; ?>
-                         <?php endif; ?>
--                    <?php endif; ?>
--                    <div id="tracking" style="display:none;"><?= $block->getChildHtml('tracking', false) ?></div>
-+                        <div id="tracking" style="display:none;"><?= $block->getChildHtml('tracking', false) ?></div>
-+                    </div>
-                 </div>
--            </div>
-             <?php endif; ?>
-         </div>
-     </section>
-@@ -90,7 +91,7 @@ require(['prototype'], function(){
-     }
- 
-     /*forced creating of shipment*/
--    var forcedShipmentCreate = <?= /* @escapeNotVerified */ $block->getForcedShipmentCreate() ?>;
-+    var forcedShipmentCreate = <?= (int) $block->getForcedShipmentCreate() ?>;
-     var shipmentElement = $('invoice_do_shipment');
-     if (forcedShipmentCreate && shipmentElement) {
-         shipmentElement.checked = true;
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
-index fa5ea056801..9837a6b3c20 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
-@@ -3,48 +3,44 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
-         <?php $_itemsGridLabel = $block->getForcedShipmentCreate() ? 'Items to Invoice and Ship' : 'Items to Invoice'; ?>
--        <span class="title"><?= /* @escapeNotVerified */ __('%1', $_itemsGridLabel) ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('%1', $_itemsGridLabel)) ?></span>
-     </div>
-     <div class="admin__page-section-content grid">
-         <div class="admin__table-wrapper">
-             <table class="data-table admin__table-primary order-invoice-tables">
-                 <thead>
-                     <tr class="headings">
--                        <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
--                        <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
--                        <th class="col-ordered-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
--                        <th class="col-qty-invoice"><span><?= /* @escapeNotVerified */ __('Qty to Invoice') ?></span></th>
--                        <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
--                        <th class="col-tax"><span><?= /* @escapeNotVerified */ __('Tax Amount') ?></span></th>
--                        <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount Amount') ?></span></th>
--                        <th class="col-total last"><span><?= /* @escapeNotVerified */ __('Row Total') ?></span></th>
-+                        <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
-+                        <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
-+                        <th class="col-ordered-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
-+                        <th class="col-qty-invoice"><span><?= $block->escapeHtml(__('Qty to Invoice')) ?></span></th>
-+                        <th class="col-subtotal"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
-+                        <th class="col-tax"><span><?= $block->escapeHtml(__('Tax Amount')) ?></span></th>
-+                        <th class="col-discount"><span><?= $block->escapeHtml(__('Discount Amount')) ?></span></th>
-+                        <th class="col-total last"><span><?= $block->escapeHtml(__('Row Total')) ?></span></th>
-                     </tr>
-                 </thead>
--                <?php if ($block->canEditQty()): ?>
--                <tfoot>
--                    <tr>
--                        <td colspan="2">&nbsp;</td>
--                        <td colspan="3"><?= $block->getUpdateButtonHtml() ?></td>
--                        <td colspan="3">&nbsp;</td>
--                    </tr>
--                </tfoot>
-+                <?php if ($block->canEditQty()) : ?>
-+                    <tfoot>
-+                        <tr>
-+                            <td colspan="3">&nbsp;</td>
-+                            <td><?= $block->getUpdateButtonHtml() ?></td>
-+                            <td colspan="4">&nbsp;</td>
-+                        </tr>
-+                    </tfoot>
-                 <?php endif; ?>
-                 <?php $_items = $block->getInvoice()->getAllItems() ?>
--                <?php $_i = 0; foreach ($_items as $_item): ?>
--                <?php if ($_item->getOrderItem()->getParentItem()) {
--                    continue;
--                } else {
--                    $_i++;
--                } ?>
--                    <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'even' : 'odd' ?>">
-+                <?php $_i = 0; foreach ($_items as $_item) : ?>
-+                    <?php if ($_item->getOrderItem()->getParentItem()) :
-+                        continue;
-+                    else :
-+                        $_i++;
-+                    endif; ?>
-+                    <tbody class="<?= /* @noEscape */ $_i%2 ? 'even' : 'odd' ?>">
-                         <?= $block->getItemHtml($_item) ?>
-                         <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
-                     </tbody>
-@@ -56,29 +52,29 @@
- 
- <?php $orderTotalBar = $block->getChildHtml('order_totalbar'); ?>
- 
--<?php if (!empty($orderTotalBar)): ?>
-+<?php if (!empty($orderTotalBar)) : ?>
- <section class="admin__page-section">
--    <?= /* @escapeNotVerified */ $orderTotalBar ?>
-+    <?= /* @noEscape */ $orderTotalBar ?>
- </section>
- <?php endif; ?>
- 
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Order Total')) ?></span>
-     </div>
-     <div class="admin__page-section-content">
-         <div class="admin__page-section-item order-comments-history">
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Invoice History') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Invoice History')) ?></span>
-             </div>
-             <div id="history_form" class="admin__page-section-item-content order-history-form">
-                 <div class="admin__field">
-                     <label for="invoice_comment_text" class="admin__field-label">
--                        <span><?= /* @escapeNotVerified */ __('Invoice Comments') ?></span>
-+                        <span><?= $block->escapeHtml(__('Invoice Comments')) ?></span>
-                     </label>
-                     <div class="admin__field-control">
-                         <textarea id="invoice_comment_text" name="invoice[comment_text]" class="admin__control-textarea"
--                                  rows="3" cols="5"><?= /* @escapeNotVerified */ $block->getInvoice()->getCommentText() ?></textarea>
-+                                  rows="3" cols="5"><?= $block->escapeHtml($block->getInvoice()->getCommentText()) ?></textarea>
-                     </div>
-                 </div>
-             </div>
-@@ -86,41 +82,41 @@
- 
-         <div id="invoice_totals" class="admin__page-section-item order-totals">
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Invoice Totals') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Invoice Totals')) ?></span>
-             </div>
-             <div class="admin__page-section-item-content order-totals-actions">
-                 <?= $block->getChildHtml('invoice_totals') ?>
--                <?php if ($block->isCaptureAllowed()): ?>
--                <?php if ($block->canCapture()):?>
--                    <div class="admin__field">
--                        <?php
--                        /*
--                        <label for="invoice_do_capture" class="normal"><?= __('Capture Amount') ?></label>
--                        <input type="checkbox" name="invoice[do_capture]" id="invoice_do_capture" value="1" checked/>
--                        */
--                        ?>
--                      <label for="invoice_do_capture" class="admin__field-label"><?= /* @escapeNotVerified */ __('Amount') ?></label>
--                      <select class="admin__control-select" name="invoice[capture_case]">
--                          <option value="online"><?= /* @escapeNotVerified */ __('Capture Online') ?></option>
--                          <option value="offline"><?= /* @escapeNotVerified */ __('Capture Offline') ?></option>
--                          <option value="not_capture"><?= /* @escapeNotVerified */ __('Not Capture') ?></option>
--                      </select>
--                    </div>
--                <?php elseif ($block->isGatewayUsed()):?>
--                    <input type="hidden" name="invoice[capture_case]" value="offline"/>
--                    <div><?= /* @escapeNotVerified */ __('The invoice will be created offline without the payment gateway.') ?></div>
--                <?php endif?>
-+                <?php if ($block->isCaptureAllowed()) : ?>
-+                    <?php if ($block->canCapture()) : ?>
-+                        <div class="admin__field">
-+                            <?php
-+                            /*
-+                            <label for="invoice_do_capture" class="normal"><?= __('Capture Amount') ?></label>
-+                            <input type="checkbox" name="invoice[do_capture]" id="invoice_do_capture" value="1" checked/>
-+                            */
-+                            ?>
-+                          <label for="invoice_do_capture" class="admin__field-label"><?= $block->escapeHtml(__('Amount')) ?></label>
-+                          <select class="admin__control-select" name="invoice[capture_case]">
-+                              <option value="online"><?= $block->escapeHtml(__('Capture Online')) ?></option>
-+                              <option value="offline"><?= $block->escapeHtml(__('Capture Offline')) ?></option>
-+                              <option value="not_capture"><?= $block->escapeHtml(__('Not Capture')) ?></option>
-+                          </select>
-+                        </div>
-+                    <?php elseif ($block->isGatewayUsed()) :?>
-+                        <input type="hidden" name="invoice[capture_case]" value="offline"/>
-+                        <div><?= $block->escapeHtml(__('The invoice will be created offline without the payment gateway.')) ?></div>
-+                    <?php endif; ?>
-                 <?php endif; ?>
-                 <div class="admin__field admin__field-option field-append">
-                     <input id="notify_customer" name="invoice[comment_customer_notify]" value="1" type="checkbox"
-                            class="admin__control-checkbox" />
--                    <label class="admin__field-label" for="notify_customer"><?= /* @escapeNotVerified */ __('Append Comments') ?></label>
-+                    <label class="admin__field-label" for="notify_customer"><?= $block->escapeHtml(__('Append Comments')) ?></label>
-                 </div>
--                <?php if ($block->canSendInvoiceEmail()): ?>
-+                <?php if ($block->canSendInvoiceEmail()) : ?>
-                 <div class="admin__field admin__field-option field-email">
-                     <input id="send_email" name="invoice[send_email]" value="1" type="checkbox"
-                            class="admin__control-checkbox" />
--                    <label class="admin__field-label" for="send_email"><?= /* @escapeNotVerified */ __('Email Copy of Invoice') ?></label>
-+                    <label class="admin__field-label" for="send_email"><?= $block->escapeHtml(__('Email Copy of Invoice')) ?></label>
-                 </div>
-                 <?php endif; ?>
-                 <?= $block->getChildHtml('submit_before') ?>
-@@ -134,56 +130,61 @@
- </section>
- 
- <script>
--require(['jquery', 'prototype'], function(jQuery){
-+require(['jquery'], function(jQuery){
- 
- //<![CDATA[
--var submitButtons = $$('.submit-button');
--var updateButtons = $$('.update-button');
-+var submitButtons = jQuery('.submit-button');
-+var updateButtons = jQuery('.update-button');
- var enableSubmitButtons = <?= (int) !$block->getDisableSubmitButton() ?>;
--var fields = $$('.qty-input');
-+var fields = jQuery('.qty-input');
- 
--updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
-+function enableButtons(buttons) {
-+    buttons.removeClass('disabled').prop('disabled', false);
-+}
- 
--for(var i=0;i<fields.length;i++){
--    jQuery(fields[i]).on('keyup', checkButtonsRelation);
--    fields[i].baseValue = fields[i].value;
-+function disableButtons(buttons) {
-+    buttons.addClass('disabled').prop('disabled', true);
- }
- 
-+disableButtons(updateButtons);
-+
-+fields.on('keyup', checkButtonsRelation);
-+fields.each(function (i, elem) {
-+    elem.baseValue = elem.value;
-+});
-+
- function checkButtonsRelation() {
-     var hasChanges = false;
--    fields.each(function (elem) {
-+    fields.each(function (i, elem) {
-         if (elem.baseValue != elem.value) {
-             hasChanges = true;
-         }
-     }.bind(this));
-     if (hasChanges) {
--        submitButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
--        updateButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
-+        disableButtons(submitButtons);
-+        enableButtons(updateButtons);
-     }
-     else {
-         if (enableSubmitButtons) {
--            submitButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
-+            enableButtons(submitButtons);
-         }
--        updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
-+        disableButtons(updateButtons);
-     }
- }
- 
--var sendEmailCheckbox = $('send_email');
--if (sendEmailCheckbox) {
--    var notifyCustomerCheckbox = $('notify_customer');
--    var invoiceCommentText = $('invoice_comment_text');
--    Event.observe(sendEmailCheckbox, 'change', bindSendEmail);
-+var sendEmailCheckbox = jQuery('#send_email');
-+if (sendEmailCheckbox.length) {
-+    var notifyCustomerCheckbox = jQuery('#notify_customer');
-+    sendEmailCheckbox.on('change', bindSendEmail);
-     bindSendEmail();
- }
- function bindSendEmail()
- {
--    if (sendEmailCheckbox.checked == true) {
--        notifyCustomerCheckbox.disabled = false;
--        //invoiceCommentText.disabled = false;
-+    if (sendEmailCheckbox.prop('checked') == true) {
-+        notifyCustomerCheckbox.prop('disabled', false);
-     }
-     else {
--        notifyCustomerCheckbox.disabled = true;
--        //invoiceCommentText.disabled = true;
-+        notifyCustomerCheckbox.prop('disabled', true);
-     }
- }
- 
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
-index 5bfb5f130ce..98ae143e30c 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
- <?php $_item = $block->getItem() ?>
-@@ -18,17 +15,17 @@
-     <td class="col-qty-invoice">
-     <?php if ($block->canEditQty()) : ?>
-         <input type="text" class="input-text admin__control-text qty-input"
--               name="invoice[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]"
--               value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>"/>
-+               name="invoice[items][<?= (int) $_item->getOrderItemId() ?>]"
-+               value="<?= (int) $_item->getQty() ?>"/>
-     <?php else : ?>
--        <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
-+        <?= (int) $_item->getQty() ?>
-     <?php endif; ?>
-     </td>
-     <td class="col-subtotal">
-         <?= $block->getColumnHtml($_item, 'subtotal') ?>
-     </td>
--    <td class="col-tax"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?></td>
--    <td class="col-discount"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
-+    <td class="col-tax"><?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?></td>
-+    <td class="col-discount"><?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?></td>
-     <td class="col-total last">
-         <?= $block->getColumnHtml($_item, 'total') ?>
-     </td>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
-index e86a87f0898..784d3f892f2 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
-@@ -4,8 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
-+/* @var \Magento\Sales\Block\Adminhtml\Order\Invoice\View\Form $block */
- ?>
- <?php $_invoice = $block->getInvoice() ?>
- <?php $_order = $_invoice->getOrder() ?>
-@@ -13,46 +14,46 @@
- 
- <section class="admin__page-section order-view-billing-shipping">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
-     </div>
-     <div class="admin__page-section-content">
--        <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?> admin__fieldset-wrapper">
-+        <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()) : ?> order-payment-method-virtual<?php endif; ?> admin__fieldset-wrapper">
-             <?php /*Billing Address */ ?>
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
-             </div>
-             <div class="admin__page-section-item-content">
-                 <div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
-                 <div class="order-payment-currency">
--                    <?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
-+                    <?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?>
-                 </div>
-                 <div class="order-payment-additional"><?= $block->getChildHtml('order_payment_additional') ?></div>
-             </div>
-         </div>
- 
--        <?php if (!$_order->getIsVirtual()): ?>
-+        <?php if (!$_order->getIsVirtual()) : ?>
-             <div class="admin__page-section-item order-shipping-address">
-                 <?php /*Shipping Address */ ?>
-                 <div class="admin__page-section-item-title">
--                    <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
-+                    <span class="title"><?= $block->escapeHtml(__('Shipping Information')) ?></span>
-                 </div>
-                 <div class="admin__page-section-item-content shipping-description-wrapper">
-                     <div class="shipping-description-title">
-                         <?= $block->escapeHtml($_order->getShippingDescription()) ?>
-                     </div>
-                     <div class="shipping-description-content">
--                        <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
-+                        <?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
- 
--                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
-+                        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
-                             <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
--                        <?php else: ?>
-+                        <?php else : ?>
-                             <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-                         <?php endif; ?>
-                         <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
- 
--                        <?= /* @escapeNotVerified */ $_excl ?>
--                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
--                            (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
-+                        <?= /* @noEscape */ $_excl ?>
-+                        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
-+                            (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
-                         <?php endif; ?>
-                         <div><?= $block->getChildHtml('shipment_tracking') ?></div>
-                     </div>
-@@ -65,7 +66,7 @@
- 
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Items Invoiced') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Items Invoiced')) ?></span>
-     </div>
- 
-     <div id="invoice_item_container" class="admin__page-section-content">
-@@ -75,12 +76,12 @@
- 
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Order Total')) ?></span>
-     </div>
-     <div class="admin__page-section-content">
-         <div class="admin__page-section-item order-comments-history">
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Invoice History') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Invoice History')) ?></span>
-             </div>
-             <div class="admin__page-section-item-content">
-                 <?= $block->getChildHtml('order_comments') ?>
-@@ -89,7 +90,7 @@
- 
-         <div id="history_form" class="admin__page-section-item order-totals">
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Invoice Totals') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Invoice Totals')) ?></span>
-             </div>
-             <?= $block->getChildHtml('invoice_totals') ?>
-         </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
-index 63f33dbb74b..6dbfd19e9a2 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
-@@ -4,30 +4,29 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/* @var \Magento\Sales\Block\Adminhtml\Order\Invoice\View\Items $block */
- ?>
- <div class="admin__table-wrapper">
-     <table class="data-table admin__table-primary order-invoice-tables">
-         <thead>
-             <tr class="headings">
--                <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
--                <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
--                <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
--                <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
--                <th class="col-tax"><span><?= /* @escapeNotVerified */ __('Tax Amount') ?></span></th>
--                <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount Amount') ?></span></th>
--                <th class="col-total last"><span><?= /* @escapeNotVerified */ __('Row Total') ?></span></th>
-+                <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
-+                <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
-+                <th class="col-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
-+                <th class="col-subtotal"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
-+                <th class="col-tax"><span><?= $block->escapeHtml(__('Tax Amount')) ?></span></th>
-+                <th class="col-discount"><span><?= $block->escapeHtml(__('Discount Amount')) ?></span></th>
-+                <th class="col-total last"><span><?= $block->escapeHtml(__('Row Total')) ?></span></th>
-             </tr>
-         </thead>
-         <?php $_items = $block->getInvoice()->getAllItems() ?>
--        <?php $i = 0; foreach ($_items as $_item): ?>
--            <?php if ($_item->getOrderItem()->getParentItem()) {
--            continue;
--        } else {
--            $i++;
--        } ?>
--            <tbody class="<?= /* @escapeNotVerified */ $i%2 ? 'even' : 'odd' ?>">
-+        <?php $i = 0; foreach ($_items as $_item) : ?>
-+            <?php if ($_item->getOrderItem()->getParentItem()) :
-+                continue;
-+            else :
-+                $i++;
-+            endif; ?>
-+            <tbody class="<?= /* @noEscape */ $i%2 ? 'even' : 'odd' ?>">
-                 <?= $block->getItemHtml($_item) ?>
-                 <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
-             </tbody>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
-index af9e5b3bb70..59301931c73 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
- <?php $_item = $block->getItem() ?>
-@@ -16,12 +13,12 @@
-     <td class="col-price">
-         <?= $block->getColumnHtml($_item, 'price') ?>
-     </td>
--    <td class="col-qty"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
-+    <td class="col-qty"><?= (int) $_item->getQty() ?></td>
-     <td class="col-subtotal">
-         <?= $block->getColumnHtml($_item, 'subtotal') ?>
-     </td>
--    <td class="col-tax"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?></td>
--    <td class="col-discount"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
-+    <td class="col-tax"><?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?></td>
-+    <td class="col-discount"><?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?></td>
-     <td class="col-total last">
-         <?= $block->getColumnHtml($_item, 'total') ?>
-     </td>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
-index 14025eb2dd5..b3a0e6a71df 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
-@@ -5,15 +5,15 @@
-  */
- 
- // @deprecated
--// @codingStandardsIgnoreFile
--
- $totals = $block->getTotals();
- ?>
--<?php if ($totals && count($totals) > 0): ?>
-+<?php if ($totals && count($totals) > 0) : ?>
- <table class="items-to-invoice">
-     <tr>
--    <?php foreach ($totals as $total): ?>
--        <td <?php if ($total['grand']): ?>class="grand-total"<?php endif; ?>>
-+    <?php foreach ($totals as $total) : ?>
-+        <td <?php if ($total['grand']) :
-+            ?>class="grand-total"<?php
-+            endif; ?>>
-             <?= $block->escapeHtml($total['label']) ?><br />
-             <?= $block->escapeHtml($total['value']) ?>
-         </td>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
-index 27b82505a11..1f495b9c4a5 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
-@@ -4,59 +4,58 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/* @var \Magento\Sales\Block\Adminhtml\Order\Totals $block */
- ?>
- <table class="data-table admin__table-secondary order-subtotal-table">
--    <?php $_totals = $block->getTotals('footer')?>
-+    <?php $_totals = $block->getTotals('footer') ?>
- 
--    <?php if ($_totals):?>
-+    <?php if ($_totals) : ?>
-         <tfoot>
--            <?php foreach ($block->getTotals('footer') as $_code => $_total): ?>
--                <?php if ($_total->getBlockName()): ?>
-+            <?php foreach ($block->getTotals('footer') as $_code => $_total) : ?>
-+                <?php if ($_total->getBlockName()) : ?>
-                     <?= $block->getChildHtml($_total->getBlockName(), false) ?>
--                <?php else:?>
--                <tr class="col-<?= /* @escapeNotVerified */ $_code ?>">
--                    <td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?> class="label">
-+                <?php else : ?>
-+                <tr class="col-<?= $block->escapeHtmlAttr($_code) ?>">
-+                    <td <?= /* @noEscape */ $block->getLabelProperties() ?> class="label">
-                         <strong><?= $block->escapeHtml($_total->getLabel()) ?></strong>
-                     </td>
--                    <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?>>
--                        <strong><?= /* @escapeNotVerified */ $block->formatValue($_total) ?></strong>
-+                    <td <?= /* @noEscape */ $block->getValueProperties() ?>>
-+                        <strong><?= /* @noEscape */ $block->formatValue($_total) ?></strong>
-                     </td>
-                 </tr>
--                <?php endif?>
--            <?php endforeach?>
-+                <?php endif; ?>
-+            <?php endforeach; ?>
-         </tfoot>
--    <?php endif?>
-+    <?php endif; ?>
- 
-     <?php $_totals = $block->getTotals('')?>
--    <?php if ($_totals):?>
-+    <?php if ($_totals) : ?>
-         <tbody>
--            <?php foreach ($_totals as $_code => $_total): ?>
--                <?php if ($_total->getBlockName()): ?>
-+            <?php foreach ($_totals as $_code => $_total) : ?>
-+                <?php if ($_total->getBlockName()) : ?>
-                     <?= $block->getChildHtml($_total->getBlockName(), false) ?>
--                <?php else:?>
--                    <tr class="col-<?= /* @escapeNotVerified */ $_code ?>">
--                        <td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?> class="label">
--                            <?php if ($_total->getStrong()):?>
-+                <?php else : ?>
-+                    <tr class="col-<?= $block->escapeHtmlAttr($_code) ?>">
-+                        <td <?= /* @noEscape */ $block->getLabelProperties() ?> class="label">
-+                            <?php if ($_total->getStrong()) : ?>
-                             <strong><?= $block->escapeHtml($_total->getLabel()) ?></strong>
--                            <?php else:?>
-+                            <?php else : ?>
-                             <?= $block->escapeHtml($_total->getLabel()) ?>
-                             <?php endif?>
-                         </td>
- 
--                        <?php if ($_total->getStrong()):?>
--                            <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?>>
--                                <strong><?= /* @escapeNotVerified */ $block->formatValue($_total) ?></strong>
-+                        <?php if ($_total->getStrong()) : ?>
-+                            <td <?= /* @noEscape */ $block->getValueProperties() ?>>
-+                                <strong><?= /* @noEscape */ $block->formatValue($_total) ?></strong>
-                             </td>
--                        <?php else:?>
--                            <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?>>
--                                <span><?= /* @escapeNotVerified */ $block->formatValue($_total) ?></span>
-+                        <?php else : ?>
-+                            <td <?= /* @noEscape */ $block->getValueProperties() ?>>
-+                                <span><?= /* @noEscape */ $block->formatValue($_total) ?></span>
-                             </td>
--                        <?php endif?>
-+                        <?php endif; ?>
-                     </tr>
--                <?php endif?>
--            <?php endforeach?>
-+                <?php endif; ?>
-+            <?php endforeach; ?>
-         </tbody>
--    <?php endif?>
-+    <?php endif; ?>
- </table>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml
-index db2567a5f3d..9ff3a91eab7 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml
-@@ -3,23 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_source  = $block->getSource() ?>
- <?php $_order   = $block->getOrder() ?>
- <?php $block->setPriceDataObject($_source) ?>
- 
--<?php if ((float) $_source->getDiscountAmount()): ?>
-+<?php if ((float) $_source->getDiscountAmount()) : ?>
-     <tr>
-         <td class="label">
--            <?php if ($_order->getCouponCode()): ?>
--                <?= /* @escapeNotVerified */ __('Discount (%1)', $_order->getCouponCode()) ?>
--            <?php else: ?>
--                <?= /* @escapeNotVerified */ __('Discount') ?>
-+            <?php if ($_order->getCouponCode()) : ?>
-+                <?= $block->escapeHtml(__('Discount (%1)', $_order->getCouponCode())) ?>
-+            <?php else : ?>
-+                <?= $block->escapeHtml(__('Discount')) ?>
-             <?php endif; ?>
-         </td>
--        <td><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
-+        <td><?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?></td>
-     </tr>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
-index 81402e37288..87d7c85c2d9 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
-@@ -3,13 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($block->getCanDisplayTotalDue()): ?>
-+<?php if ($block->getCanDisplayTotalDue()) : ?>
- <tr>
--    <td class="label"><big><strong><?= /* @escapeNotVerified */ __('Total Due') ?></strong></big></td>
--    <td class="emph"><big><?= /* @escapeNotVerified */ $block->displayPriceAttribute('total_due', true) ?></big></td>
-+    <td class="label"><big><strong><?= $block->escapeHtml(__('Total Due')) ?></strong></big></td>
-+    <td class="emph"><big><?= /* @noEscape */ $block->displayPriceAttribute('total_due', true) ?></big></td>
- </tr>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
-index 519aa660fbf..dc76799251c 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_source  = $block->getSource() ?>
- <?php $block->setPriceDataObject($_source) ?>
-@@ -13,12 +10,12 @@
- <tr>
-     <td class="label">
-         <strong><big>
--        <?php if ($block->getGrandTotalTitle()): ?>
--            <?= /* @escapeNotVerified */ $block->getGrandTotalTitle() ?>
--        <?php else: ?>
--            <?= /* @escapeNotVerified */ __('Grand Total') ?>
-+        <?php if ($block->getGrandTotalTitle()) : ?>
-+            <?= $block->escapeHtml($block->getGrandTotalTitle()) ?>
-+        <?php else : ?>
-+            <?= $block->escapeHtml(__('Grand Total')) ?>
-         <?php endif; ?>
-         </big></strong>
-     </td>
--    <td class="emph"><big><?= /* @escapeNotVerified */ $block->displayPriceAttribute('grand_total', true) ?></big></td>
-+    <td class="emph"><big><?= /* @noEscape */ $block->displayPriceAttribute('grand_total', true) ?></big></td>
- </tr>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml
-index 6c44e6ec632..f3590654181 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml
-@@ -3,16 +3,25 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php $_source  = $block->getSource() ?>
-+<?php $_source = $block->getSource() ?>
- <?php $block->setPriceDataObject($_source) ?>
- 
--<?php if ((float) $_source->getDataUsingMethod($block->getSourceField())): ?>
-+<?php if ((float) $_source->getDataUsingMethod($block->getSourceField())) : ?>
-     <tr>
--        <td class="label"><?php if ($block->getStrong()) : ?><strong><?php endif; ?><?= /* @escapeNotVerified */ __($block->getLabel()) ?><?php if ($block->getStrong()) : ?></strong><?php endif; ?></td>
--        <td <?= $block->getHtmlClass() ? ('class="' . $block->getHtmlClass() . '"') : '' ?>><?php if ($block->getStrong()) : ?><strong><?php endif; ?><?= /* @escapeNotVerified */ $block->displayPriceAttribute($block->getSourceField()) ?><?php if ($block->getStrong()) : ?></strong><?php endif; ?></td>
-+        <td class="label">
-+            <?php if ($block->getStrong()) : ?>
-+                <strong>
-+            <?php endif; ?>
-+            <?= $block->escapeHtml(__($block->getLabel())) ?>
-+            <?php if ($block->getStrong()) : ?>
-+                </strong>
-+            <?php endif; ?>
-+        </td>
-+        <td <?= $block->getHtmlClass() ? ('class="' . $block->escapeHtmlAttr($block->getHtmlClass()) . '"') : '' ?>>
-+            <?php if ($block->getStrong()) : ?><strong><?php endif; ?>
-+            <?= /* @noEscape */ $block->displayPriceAttribute($block->getSourceField()) ?>
-+            <?php if ($block->getStrong()) : ?></strong><?php endif; ?>
-+        </td>
-     </tr>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml
-index 8befc7cc0cc..9ede6e21e78 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml
-@@ -3,14 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($block->getCanDisplayTotalPaid()): ?>
-+<?php if ($block->getCanDisplayTotalPaid()) : ?>
- <tr>
--    <td class="label"><strong><?= /* @escapeNotVerified */ __('Total Paid') ?></strong></td>
--    <td class="emph"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('total_paid', true) ?>
-+    <td class="label"><strong><?= $block->escapeHtml(__('Total Paid')) ?></strong></td>
-+    <td class="emph"><?= /* @noEscape */ $block->displayPriceAttribute('total_paid', true) ?>
-     </td>
- </tr>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml
-index e579578f711..1e7087c7222 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml
-@@ -3,13 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($block->getCanDisplayTotalRefunded()): ?>
-+<?php if ($block->getCanDisplayTotalRefunded()) : ?>
- <tr>
--    <td class="label"><strong><?= /* @escapeNotVerified */ __('Total Refunded') ?></strong></td>
--    <td class="emph"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('total_refunded', true) ?></td>
-+    <td class="label"><strong><?= $block->escapeHtml(__('Total Refunded')) ?></strong></td>
-+    <td class="emph"><?= /* @noEscape */ $block->displayPriceAttribute('total_refunded', true) ?></td>
- </tr>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml
-index 47304bf7f4a..4250dc1d047 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml
-@@ -3,16 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_source  = $block->getSource() ?>
- <?php $block->setPriceDataObject($_source) ?>
- 
--<?php if ((float) $_source->getShippingAmount() || $_source->getShippingDescription()): ?>
-+<?php if ((float) $_source->getShippingAmount() || $_source->getShippingDescription()) : ?>
-     <tr>
--        <td class="label"><?= /* @escapeNotVerified */ __('Shipping &amp; Handling') ?></td>
--        <td><?= /* @escapeNotVerified */ $block->displayPriceAttribute('shipping_amount') ?></td>
-+        <td class="label"><?= $block->escapeHtml(__('Shipping &amp; Handling')) ?></td>
-+        <td><?= /* @noEscape */ $block->displayPriceAttribute('shipping_amount') ?></td>
-     </tr>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
-index 28459702746..a68fb09fd20 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
-@@ -4,42 +4,41 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Sales\Block\Adminhtml\Order\Totals\Tax */
--?>
--<?php
-+
- /** @var $_source \Magento\Sales\Model\Order\Invoice */
- $_source    = $block->getSource();
- $_order     = $block->getOrder();
- $_fullInfo  = $block->getFullTaxInfo();
- ?>
- 
--<?php if ($block->displayFullSummary() && $_fullInfo): ?>
-+<?php if ($block->displayFullSummary() && $_fullInfo) : ?>
- <tr class="summary-total" onclick="expandDetails(this, '.summary-details')">
--<?php else: ?>
-+<?php else : ?>
- <tr>
-     <?php endif; ?>
-     <td class="label">
-         <div class="summary-collapse" tabindex="0">
--            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
--                <?= /* @escapeNotVerified */ __('Total Tax') ?>
--            <?php else: ?>
--                <?= /* @escapeNotVerified */ __('Tax') ?>
-+            <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
-+                <?= $block->escapeHtml(__('Total Tax')) ?>
-+            <?php else : ?>
-+                <?= $block->escapeHtml(__('Tax')) ?>
-             <?php endif;?>
-         </div>
-     </td>
-     <td>
--        <?= /* @escapeNotVerified */ $block->displayAmount($_source->getTaxAmount(), $_source->getBaseTaxAmount()) ?>
-+        <?= /* @noEscape */ $block->displayAmount($_source->getTaxAmount(), $_source->getBaseTaxAmount()) ?>
-     </td>
- </tr>
--<?php if ($block->displayFullSummary()): ?>
-+<?php if ($block->displayFullSummary()) : ?>
-     <?php $isTop = 1; ?>
--    <?php if (isset($_fullInfo[0]['rates'])): ?>
--        <?php foreach ($_fullInfo as $info): ?>
--            <?php if (isset($info['hidden']) && $info['hidden']) {
-+    <?php if (isset($_fullInfo[0]['rates'])) : ?>
-+        <?php foreach ($_fullInfo as $info) : ?>
-+            <?php if (isset($info['hidden']) && $info['hidden']) :
-                 continue;
--            } ?>
-+            endif; ?>
-             <?php
-             $percent    = $info['percent'];
-             $amount     = $info['amount'];
-@@ -48,39 +47,38 @@ $_fullInfo  = $block->getFullTaxInfo();
-             $isFirst    = 1;
-             ?>
- 
--            <?php foreach ($rates as $rate): ?>
--            <tr class="summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
--                <?php if (!is_null($rate['percent'])): ?>
--                    <td class="admin__total-mark"><?= /* @escapeNotVerified */ $rate['title'] ?> (<?= (float)$rate['percent'] ?>%)<br /></td>
--                <?php else: ?>
--                    <td class="admin__total-mark"><?= /* @escapeNotVerified */ $rate['title'] ?><br /></td>
--                <?php endif; ?>
--                <?php if ($isFirst): ?>
--                    <td rowspan="<?= count($rates) ?>"><?= /* @escapeNotVerified */ $block->displayAmount($amount, $baseAmount) ?></td>
--                <?php endif; ?>
--            </tr>
--            <?php
-+            <?php foreach ($rates as $rate) : ?>
-+                <tr class="summary-details<?= ($isTop ? ' summary-details-first' : '') ?>" style="display:none;">
-+                    <?php if ($rate['percent'] !== null) : ?>
-+                        <td class="admin__total-mark"><?= $block->escapeHtml($rate['title']) ?> (<?= (float)$rate['percent'] ?>%)<br /></td>
-+                    <?php else : ?>
-+                        <td class="admin__total-mark"><?= $block->escapeHtml($rate['title']) ?><br /></td>
-+                    <?php endif; ?>
-+                    <?php if ($isFirst) : ?>
-+                        <td rowspan="<?= count($rates) ?>"><?= /* @noEscape */ $block->displayAmount($amount, $baseAmount) ?></td>
-+                    <?php endif; ?>
-+                </tr>
-+                <?php
-                 $isFirst = 0;
-                 $isTop = 0;
-                 ?>
-             <?php endforeach; ?>
-         <?php endforeach; ?>
--    <?php else: ?>
--        <?php foreach ($_fullInfo as $info): ?>
-+    <?php else : ?>
-+        <?php foreach ($_fullInfo as $info) : ?>
-             <?php
-             $percent    = $info['percent'];
-             $amount     = $info['tax_amount'];
-             $baseAmount = $info['base_tax_amount'];
-             $isFirst    = 1;
-             ?>
--
--            <tr class="summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
--                <?php if (!is_null($info['percent'])): ?>
-+            <tr class="summary-details<?= ($isTop ? ' summary-details-first' : '') ?>" style="display:none;">
-+                <?php if ($info['percent'] !== null) : ?>
-                     <td class="admin__total-mark"><?= $block->escapeHtml($info['title']) ?> (<?= (float)$info['percent'] ?>%)<br /></td>
--                <?php else: ?>
-+                <?php else : ?>
-                     <td class="admin__total-mark"><?= $block->escapeHtml($info['title']) ?><br /></td>
-                 <?php endif; ?>
--                    <td><?= /* @escapeNotVerified */ $block->displayAmount($amount, $baseAmount) ?></td>
-+                    <td><?= /* @noEscape */ $block->displayAmount($amount, $baseAmount) ?></td>
-             </tr>
-             <?php
-             $isFirst = 0;
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
-index 393af3e40d6..bf80f5df00b 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
-@@ -4,61 +4,60 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block \Magento\Sales\Block\Adminhtml\Order\View\Giftmessage */
- ?>
--<?php if ($block->canDisplayGiftmessage()): ?>
--<?php $_required = $block->getMessage()->getMessage() != ''?>
--<div id="<?= $block->getHtmlId() ?>" class="admin__page-section-content giftmessage-whole-order-container">
--    <form class="entry-edit form-inline" id="<?= /* @escapeNotVerified */ $block->getFieldId('form') ?>" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
--        <fieldset class="admin__fieldset">
--            <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Gift Message for the Entire Order') ?></span></legend>
--            <br/>
--
--            <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('type') ?>"
--                   name="<?= /* @escapeNotVerified */ $block->getFieldName('type') ?>"
--                   value="order"/>
--
--            <div class="admin__field field-from-name<?= $_required ? ' required' : '' ?>">
--                <label class="admin__field-label"
--                       for="<?= /* @escapeNotVerified */ $block->getFieldId('sender') ?>"><span><?= /* @escapeNotVerified */ __('From Name') ?></span></label>
--
--                <div class="admin__field-control">
--                    <input class="admin__control-text <?= $_required ? 'required-entry' : '' ?>" type="text"
--                           id="<?= /* @escapeNotVerified */ $block->getFieldId('sender') ?>"
--                           name="<?= /* @escapeNotVerified */ $block->getFieldName('sender') ?>"
--                           value="<?= $block->escapeHtml($block->getMessage()->getSender()) ?>"/>
-+<?php if ($block->canDisplayGiftmessage()) : ?>
-+    <?php $_required = $block->getMessage()->getMessage() != '' ?>
-+    <div id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>" class="admin__page-section-content giftmessage-whole-order-container">
-+        <form class="entry-edit form-inline" id="<?= $block->escapeHtmlAttr($block->getFieldId('form')) ?>" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
-+            <fieldset class="admin__fieldset">
-+                <legend class="admin__legend"><span><?= $block->escapeHtml(__('Gift Message for the Entire Order')) ?></span></legend>
-+                <br/>
-+
-+                <input type="hidden" id="<?= $block->escapeHtmlAttr($block->getFieldId('type')) ?>"
-+                       name="<?= $block->escapeHtmlAttr($block->getFieldName('type')) ?>"
-+                       value="order"/>
-+
-+                <div class="admin__field field-from-name<?= $_required ? ' required' : '' ?>">
-+                    <label class="admin__field-label"
-+                           for="<?= $block->escapeHtmlAttr($block->getFieldId('sender')) ?>"><span><?= $block->escapeHtml(__('From Name')) ?></span></label>
-+
-+                    <div class="admin__field-control">
-+                        <input class="admin__control-text <?= $_required ? 'required-entry' : '' ?>" type="text"
-+                               id="<?= $block->escapeHtmlAttr($block->getFieldId('sender')) ?>"
-+                               name="<?= $block->escapeHtmlAttr($block->getFieldName('sender')) ?>"
-+                               value="<?= $block->escapeHtml($block->getMessage()->getSender()) ?>"/>
-+                    </div>
-                 </div>
--            </div>
- 
--            <div class="admin__field field-to-name<?= $_required ? ' required' : '' ?>">
--                <label class="admin__field-label"
--                       for="<?= /* @escapeNotVerified */ $block->getFieldId('recipient') ?>"><span><?= /* @escapeNotVerified */ __('To Name') ?></span></label>
-+                <div class="admin__field field-to-name<?= $_required ? ' required' : '' ?>">
-+                    <label class="admin__field-label"
-+                           for="<?= $block->escapeHtmlAttr($block->getFieldId('recipient')) ?>"><span><?= $block->escapeHtml(__('To Name')) ?></span></label>
- 
--                <div class="admin__field-control">
--                    <input class="admin__control-text <?= $_required ? 'required-entry' : '' ?>" type="text"
--                           id="<?= /* @escapeNotVerified */ $block->getFieldId('recipient') ?>"
--                           name="<?= /* @escapeNotVerified */ $block->getFieldName('recipient') ?>"
--                           value="<?= $block->escapeHtml($block->getMessage()->getRecipient()) ?>"/>
-+                    <div class="admin__field-control">
-+                        <input class="admin__control-text <?= $_required ? 'required-entry' : '' ?>" type="text"
-+                               id="<?= $block->escapeHtmlAttr($block->getFieldId('recipient')) ?>"
-+                               name="<?= $block->escapeHtmlAttr($block->getFieldName('recipient')) ?>"
-+                               value="<?= $block->escapeHtml($block->getMessage()->getRecipient()) ?>"/>
-+                    </div>
-                 </div>
--            </div>
- 
--            <div class="admin__field field-gift-message">
--                <label class="admin__field-label"
--                       for="<?= /* @escapeNotVerified */ $block->getFieldId('message') ?>"><span><?= /* @escapeNotVerified */ __('Gift Message') ?></span></label>
--                <div class="admin__field-control">
--                    <textarea id="<?= /* @escapeNotVerified */ $block->getFieldId('message') ?>"
--                              name="<?= /* @escapeNotVerified */ $block->getFieldName('message') ?>"
--                              class="admin__control-textarea"
--                              rows="2"
--                              cols="15"><?= $block->escapeHtml($block->getMessage()->getMessage()) ?></textarea>
-+                <div class="admin__field field-gift-message">
-+                    <label class="admin__field-label"
-+                           for="<?= $block->escapeHtmlAttr($block->getFieldId('message')) ?>"><span><?= $block->escapeHtml(__('Gift Message')) ?></span></label>
-+                    <div class="admin__field-control">
-+                        <textarea id="<?= $block->escapeHtmlAttr($block->getFieldId('message')) ?>"
-+                                  name="<?= $block->escapeHtmlAttr($block->getFieldName('message')) ?>"
-+                                  class="admin__control-textarea"
-+                                  rows="2"
-+                                  cols="15"><?= $block->escapeHtml($block->getMessage()->getMessage()) ?></textarea>
-+                    </div>
-                 </div>
--            </div>
- 
--            <div class="actions">
--                <?= $block->getSaveButtonHtml() ?>
--            </div>
--        </fieldset>
--    </form>
--</div>
-+                <div class="actions">
-+                    <?= $block->getSaveButtonHtml() ?>
-+                </div>
-+            </fieldset>
-+        </form>
-+    </div>
- <?php endif ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
-index 6ac6e13a873..16643a29a7f 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
-@@ -4,19 +4,18 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /** @var \Magento\Sales\Block\Adminhtml\Order\View\History $block */
- ?>
- <div id="order_history_block" class="edit-order-comments">
--    <?php if ($block->canAddComment()):?>
-+    <?php if ($block->canAddComment()) : ?>
-         <div class="order-history-block" id="history_form">
- 
-             <div class="admin__field">
--                <label for="history_status" class="admin__field-label"><?= /* @noEscape */ __('Status') ?></label>
-+                <label for="history_status" class="admin__field-label"><?= $block->escapeHtml(__('Status')) ?></label>
-                 <div class="admin__field-control">
-                     <select name="history[status]" id="history_status" class="admin__control-select">
--                        <?php foreach ($block->getStatuses() as $_code => $_label): ?>
--                            <option value="<?= $block->escapeHtml($_code) ?>"<?php if ($_code == $block->getOrder()->getStatus()): ?> selected="selected"<?php endif; ?>><?= $block->escapeHtml($_label) ?></option>
-+                        <?php foreach ($block->getStatuses() as $_code => $_label) : ?>
-+                            <option value="<?= $block->escapeHtmlAttr($_code) ?>"<?php if ($_code == $block->getOrder()->getStatus()) : ?> selected="selected"<?php endif; ?>><?= $block->escapeHtml($_label) ?></option>
-                         <?php endforeach; ?>
-                     </select>
-                 </div>
-@@ -24,7 +23,7 @@
- 
-             <div class="admin__field">
-                 <label for="history_comment" class="admin__field-label">
--                    <?= /* @noEscape */ __('Comment') ?>
-+                    <?= $block->escapeHtml(__('Comment')) ?>
-                 </label>
-                 <div class="admin__field-control">
-                     <textarea name="history[comment]"
-@@ -38,14 +37,14 @@
-             <div class="admin__field">
-                 <div class="order-history-comments-options">
-                     <div class="admin__field admin__field-option">
--                        <?php if ($block->canSendCommentEmail()): ?>
-+                        <?php if ($block->canSendCommentEmail()) : ?>
-                             <input name="history[is_customer_notified]"
-                                    type="checkbox"
-                                    id="history_notify"
-                                    class="admin__control-checkbox"
-                                    value="1" />
-                             <label class="admin__field-label" for="history_notify">
--                                <?= /* @noEscape */ __('Notify Customer by Email') ?>
-+                                <?= $block->escapeHtml(__('Notify Customer by Email')) ?>
-                             </label>
-                         <?php endif; ?>
-                     </div>
-@@ -57,7 +56,7 @@
-                                class="admin__control-checkbox"
-                                value="1" />
-                         <label class="admin__field-label" for="history_visible">
--                            <?= /* @noEscape */ __('Visible on Storefront') ?>
-+                            <?= $block->escapeHtml(__('Visible on Storefront')) ?>
-                         </label>
-                     </div>
-                 </div>
-@@ -70,32 +69,30 @@
-     <?php endif;?>
- 
-     <ul class="note-list">
--    <?php foreach ($block->getOrder()->getStatusHistoryCollection(true) as $_item): ?>
-+    <?php foreach ($block->getOrder()->getStatusHistoryCollection(true) as $_item) : ?>
-         <li class="note-list-item">
-             <span class="note-list-date"><?= /* @noEscape */ $block->formatDate($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
-             <span class="note-list-time"><?= /* @noEscape */ $block->formatTime($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
-             <span class="note-list-status"><?= $block->escapeHtml($_item->getStatusLabel()) ?></span>
-             <span class="note-list-customer">
--                <?= /* @noEscape */ __('Customer') ?>
--                <?php if ($block->isCustomerNotificationNotApplicable($_item)): ?>
--                    <span class="note-list-customer-notapplicable"><?= /* @noEscape */ __('Notification Not Applicable') ?></span>
--                <?php elseif ($_item->getIsCustomerNotified()): ?>
--                    <span class="note-list-customer-notified"><?= /* @noEscape */ __('Notified') ?></span>
--                <?php else: ?>
--                    <span class="note-list-customer-not-notified"><?= /* @noEscape */ __('Not Notified') ?></span>
-+                <?= $block->escapeHtml(__('Customer')) ?>
-+                <?php if ($block->isCustomerNotificationNotApplicable($_item)) : ?>
-+                    <span class="note-list-customer-notapplicable"><?= $block->escapeHtml(__('Notification Not Applicable')) ?></span>
-+                <?php elseif ($_item->getIsCustomerNotified()) : ?>
-+                    <span class="note-list-customer-notified"><?= $block->escapeHtml(__('Notified')) ?></span>
-+                <?php else : ?>
-+                    <span class="note-list-customer-not-notified"><?= $block->escapeHtml(__('Not Notified')) ?></span>
-                 <?php endif; ?>
-             </span>
--            <?php if ($_item->getComment()): ?>
-+            <?php if ($_item->getComment()) : ?>
-                 <div class="note-list-comment"><?= $block->escapeHtml($_item->getComment(), ['b', 'br', 'strong', 'i', 'u', 'a']) ?></div>
-             <?php endif; ?>
-         </li>
-     <?php endforeach; ?>
-     </ul>
-     <script>
--require(['prototype'], function(){
--
--        if($('order_status'))$('order_status').update('<?= $block->escapeJs($block->escapeHtml($block->getOrder()->getStatusLabel())) ?>');
--
--});
--</script>
-+        require(['prototype'], function(){
-+            if($('order_status'))$('order_status').update('<?= $block->escapeJs($block->escapeHtml($block->getOrder()->getStatusLabel())) ?>');
-+        });
-+    </script>
- </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
-index 5384a00dc89..508ac7c252d 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
-@@ -7,9 +7,6 @@
- /**
-  * @var \Magento\Sales\Block\Adminhtml\Order\View\Info $block
-  */
--
--// @codingStandardsIgnoreFile
--
- $order = $block->getOrder();
- 
- $orderAdminDate = $block->formatDate(
-@@ -38,10 +35,10 @@ $customerUrl = $block->getCustomerViewUrl();
-             <?php $confirmationEmailStatusMessage = $order->getEmailSent() ? __('The order confirmation email was sent') : __('The order confirmation email is not sent'); ?>
-             <div class="admin__page-section-item-title">
-                 <span class="title">
--                    <?php if ($block->getNoUseOrderLink()): ?>
-+                    <?php if ($block->getNoUseOrderLink()) : ?>
-                         <?= $block->escapeHtml(__('Order # %1', $order->getRealOrderId())) ?> (<span><?= $block->escapeHtml($confirmationEmailStatusMessage) ?></span>)
--                    <?php else: ?>
--                        <a href="<?= $block->escapeHtml($block->getViewUrl($order->getId())) ?>"><?= $block->escapeHtml(__('Order # %1', $order->getRealOrderId())) ?></a>
-+                    <?php else : ?>
-+                        <a href="<?= $block->escapeUrl($block->getViewUrl($order->getId())) ?>"><?= $block->escapeHtml(__('Order # %1', $order->getRealOrderId())) ?></a>
-                         <span>(<?= $block->escapeHtml($confirmationEmailStatusMessage) ?>)</span>
-                     <?php endif; ?>
-                 </span>
-@@ -52,7 +49,7 @@ $customerUrl = $block->getCustomerViewUrl();
-                     <th><?= $block->escapeHtml(__('Order Date')) ?></th>
-                     <td><?= $block->escapeHtml($orderAdminDate) ?></td>
-                 </tr>
--                <?php if ($orderAdminDate != $orderStoreDate):?>
-+                <?php if ($orderAdminDate != $orderStoreDate) : ?>
-                     <tr>
-                         <th><?= $block->escapeHtml(__('Order Date (%1)', $block->getTimezoneForStore($order->getStore()))) ?></th>
-                         <td><?= $block->escapeHtml($orderStoreDate) ?></td>
-@@ -63,48 +60,48 @@ $customerUrl = $block->getCustomerViewUrl();
-                     <td><span id="order_status"><?= $block->escapeHtml($order->getStatusLabel()) ?></span></td>
-                 </tr>
-                 <?= $block->getChildHtml() ?>
--                <?php if ($block->isSingleStoreMode() == false):?>
-+                <?php if ($block->isSingleStoreMode() == false) : ?>
-                     <tr>
-                         <th><?= $block->escapeHtml(__('Purchased From')) ?></th>
-                         <td><?= $block->escapeHtml($block->getOrderStoreName(), ['br']) ?></td>
-                     </tr>
-                 <?php endif; ?>
--                <?php if ($order->getRelationChildId()): ?>
-+                <?php if ($order->getRelationChildId()) : ?>
-                     <tr>
-                         <th><?= $block->escapeHtml(__('Link to the New Order')) ?></th>
-                         <td>
--                            <a href="<?= $block->escapeHtml($block->getViewUrl($order->getRelationChildId())) ?>">
-+                            <a href="<?= $block->escapeUrl($block->getViewUrl($order->getRelationChildId())) ?>">
-                                 <?= $block->escapeHtml($order->getRelationChildRealId()) ?>
-                             </a>
-                         </td>
-                     </tr>
-                 <?php endif; ?>
--                <?php if ($order->getRelationParentId()): ?>
-+                <?php if ($order->getRelationParentId()) : ?>
-                     <tr>
-                         <th><?= $block->escapeHtml(__('Link to the Previous Order')) ?></th>
-                         <td>
--                            <a href="<?= $block->escapeHtml($block->getViewUrl($order->getRelationParentId())) ?>">
-+                            <a href="<?= $block->escapeUrl($block->getViewUrl($order->getRelationParentId())) ?>">
-                                 <?= $block->escapeHtml($order->getRelationParentRealId()) ?>
-                             </a>
-                         </td>
-                     </tr>
-                 <?php endif; ?>
--                <?php if ($order->getRemoteIp() && $block->shouldDisplayCustomerIp()): ?>
-+                <?php if ($order->getRemoteIp() && $block->shouldDisplayCustomerIp()) : ?>
-                     <tr>
-                         <th><?= $block->escapeHtml(__('Placed from IP')) ?></th>
--                        <td><?= $block->escapeHtml($order->getRemoteIp()); echo $order->getXForwardedFor() ? ' (' . $block->escapeHtml($order->getXForwardedFor()) . ')' : ''; ?></td>
-+                        <td><?= $block->escapeHtml($order->getRemoteIp()); ?><?= $order->getXForwardedFor() ? ' (' . $block->escapeHtml($order->getXForwardedFor()) . ')' : ''; ?></td>
-                     </tr>
-                 <?php endif; ?>
--                <?php if ($order->getGlobalCurrencyCode() != $order->getBaseCurrencyCode()): ?>
-+                <?php if ($order->getGlobalCurrencyCode() != $order->getBaseCurrencyCode()) : ?>
-                     <tr>
-                         <th><?= $block->escapeHtml(__('%1 / %2 rate:', $order->getGlobalCurrencyCode(), $order->getBaseCurrencyCode())) ?></th>
-                         <td><?= $block->escapeHtml($order->getBaseToGlobalRate()) ?></td>
-                     </tr>
-                 <?php endif; ?>
--                <?php if ($order->getBaseCurrencyCode() != $order->getOrderCurrencyCode()): ?>
-+                <?php if ($order->getBaseCurrencyCode() != $order->getOrderCurrencyCode()) : ?>
-                     <tr>
-                         <th><?= $block->escapeHtml(__('%1 / %2 rate:', $order->getOrderCurrencyCode(), $order->getBaseCurrencyCode())) ?></th>
--                        <th><?= $block->escapeHtml($order->getBaseToOrderRate()) ?></th>
-+                        <td><?= $block->escapeHtml($order->getBaseToOrderRate()) ?></td>
-                     </tr>
-                 <?php endif; ?>
-             </table>
-@@ -128,18 +125,18 @@ $customerUrl = $block->getCustomerViewUrl();
-                     <tr>
-                         <th><?= $block->escapeHtml(__('Customer Name')) ?></th>
-                         <td>
--                            <?php if ($customerUrl): ?>
-+                            <?php if ($customerUrl) : ?>
-                                 <a href="<?= $block->escapeUrl($customerUrl) ?>" target="_blank">
-                                     <span><?= $block->escapeHtml($order->getCustomerName()) ?></span>
-                                 </a>
--                            <?php else: ?>
-+                            <?php else : ?>
-                                 <?= $block->escapeHtml($order->getCustomerName()) ?>
-                             <?php endif; ?>
-                         </td>
-                     </tr>
-                     <tr>
-                         <th><?= $block->escapeHtml(__('Email')) ?></th>
--                        <td><a href="mailto:<?php echo $block->escapeHtml($order->getCustomerEmail()) ?>"><?php echo $block->escapeHtml($order->getCustomerEmail()) ?></a></td>
-+                        <td><a href="mailto:<?= $block->escapeHtmlAttr($order->getCustomerEmail()) ?>"><?= $block->escapeHtml($order->getCustomerEmail()) ?></a></td>
-                     </tr>
-                     <?php if ($groupName = $block->getCustomerGroupName()) : ?>
-                         <tr>
-@@ -147,7 +144,7 @@ $customerUrl = $block->getCustomerViewUrl();
-                             <td><?= $block->escapeHtml($groupName) ?></td>
-                         </tr>
-                     <?php endif; ?>
--                    <?php foreach ($block->getCustomerAccountData() as $data):?>
-+                    <?php foreach ($block->getCustomerAccountData() as $data) : ?>
-                         <tr>
-                             <th><?= $block->escapeHtml($data['label']) ?></th>
-                             <td><?= $block->escapeHtml($data['value'], ['br']) ?></td>
-@@ -173,7 +170,7 @@ $customerUrl = $block->getCustomerViewUrl();
-             </div>
-             <address class="admin__page-section-item-content"><?= /* @noEscape */ $block->getFormattedAddress($order->getBillingAddress()); ?></address>
-         </div>
--        <?php if (!$block->getOrder()->getIsVirtual()): ?>
-+        <?php if (!$block->getOrder()->getIsVirtual()) : ?>
-             <div class="admin__page-section-item order-shipping-address">
-                 <?php /* Shipping Address */ ?>
-                 <div class="admin__page-section-item-title">
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
-index dc62bce78ea..734ad24b02f 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
-@@ -4,9 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--?>
--<?php
- /**
-  * @var \Magento\Sales\Block\Adminhtml\Order\View\Items $block
-  */
-@@ -18,19 +15,19 @@ $_order = $block->getOrder() ?>
-                 <?php $i = 0;
-                 $columns = $block->getColumns();
-                 $lastItemNumber = count($columns) ?>
--                <?php foreach ($columns as $columnName => $columnTitle):?>
-+                <?php foreach ($columns as $columnName => $columnTitle) : ?>
-                     <?php $i++; ?>
--                    <th class="col-<?= /* @noEscape */ $columnName ?><?= /* @noEscape */ ($i === $lastItemNumber ? ' last' : '') ?>"><span><?= /* @noEscape */ $columnTitle ?></span></th>
-+                    <th class="col-<?= $block->escapeHtmlAttr($columnName) ?><?= /* @noEscape */ ($i === $lastItemNumber ? ' last' : '') ?>"><span><?= $block->escapeHtml($columnTitle) ?></span></th>
-                 <?php endforeach; ?>
-             </tr>
-         </thead>
-         <?php $_items = $block->getItemsCollection();?>
--        <?php $i = 0; foreach ($_items as $_item):?>
--            <?php if ($_item->getParentItem()) {
-+        <?php $i = 0; foreach ($_items as $_item) : ?>
-+            <?php if ($_item->getParentItem()) :
-                 continue;
--            } else {
-+            else :
-                 $i++;
--            }?>
-+            endif; ?>
-             <tbody class="<?= /* @noEscape */ $i%2 ? 'even' : 'odd' ?>">
-                 <?= $block->getItemHtml($_item) ?>
-                 <?= $block->getItemExtraInfoHtml($_item) ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
-index 387aab3d961..c54e23d141e 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var \Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer $block */ ?>
- <?php $_item = $block->getItem() ?>
-@@ -14,8 +11,10 @@
-     <?php $i = 0;
-     $columns = $block->getColumns();
-     $lastItemNumber = count($columns) ?>
--    <?php foreach ($columns as $columnName => $columnClass):?>
-+    <?php foreach ($columns as $columnName => $columnClass) : ?>
-         <?php $i++; ?>
--        <td class="<?= /* @noEscape */ $columnClass ?><?= /* @noEscape */ ($i === $lastItemNumber ? ' last' : '') ?>"><?= /* @escapeNotVerified */ $block->getColumnHtml($_item, $columnName) ?></td>
-+        <td class="<?= /* @noEscape */ $columnClass ?><?= /* @noEscape */ ($i === $lastItemNumber ? ' last' : '') ?>">
-+            <?= $block->getColumnHtml($_item, $columnName) ?>
-+        </td>
-     <?php endforeach; ?>
- </tr>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
-index 87feaa857ef..0a93d25a7a0 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
-@@ -4,25 +4,24 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var \Magento\Sales\Block\Adminhtml\Order\View\Tab\History $block */
- ?>
- <section class="admin__page-section edit-order-comments">
-     <ul class="note-list">
--    <?php foreach ($block->getFullHistory() as $_item): ?>
-+    <?php foreach ($block->getFullHistory() as $_item) : ?>
-         <li class="note-list-item">
--            <span class="note-list-date"><?= /* @escapeNotVerified */ $block->getItemCreatedAt($_item) ?></span>
--            <span class="note-list-time"><?= /* @escapeNotVerified */ $block->getItemCreatedAt($_item, 'time') ?></span>
--            <span class="note-list-status"><?= /* @escapeNotVerified */ $block->getItemTitle($_item) ?></span>
--            <?php if ($block->isItemNotified($_item, false)): ?>
-+            <span class="note-list-date"><?= /* @noEscape */ $block->getItemCreatedAt($_item) ?></span>
-+            <span class="note-list-time"><?= /* @noEscape */ $block->getItemCreatedAt($_item, 'time') ?></span>
-+            <span class="note-list-status"><?= /* @noEscape */ $block->getItemTitle($_item) ?></span>
-+            <?php if ($block->isItemNotified($_item, false)) : ?>
-                 <span class="note-list-customer">
--                    <?= /* @escapeNotVerified */ __('Customer') ?>
--                    <?php if ($block->isCustomerNotificationNotApplicable($_item)): ?>
--                        <span class="note-list-customer-notapplicable"><?= /* @escapeNotVerified */ __('Notification Not Applicable') ?></span>
--                    <?php elseif ($block->isItemNotified($_item)): ?>
--                        <span class="note-list-customer-notified"><?= /* @escapeNotVerified */ __('Notified') ?></span>
--                    <?php else: ?>
--                        <span class="note-list-customer-not-notified"><?= /* @escapeNotVerified */ __('Not Notified') ?></span>
-+                    <?= $block->escapeHtml(__('Customer')) ?>
-+                    <?php if ($block->isCustomerNotificationNotApplicable($_item)) : ?>
-+                        <span class="note-list-customer-notapplicable"><?= $block->escapeHtml(__('Notification Not Applicable')) ?></span>
-+                    <?php elseif ($block->isItemNotified($_item)) : ?>
-+                        <span class="note-list-customer-notified"><?= $block->escapeHtml(__('Notified')) ?></span>
-+                    <?php else : ?>
-+                        <span class="note-list-customer-not-notified"><?= $block->escapeHtml(__('Not Notified')) ?></span>
-                     <?php endif; ?>
-                 </span>
-             <?php endif; ?>
-@@ -31,18 +30,18 @@
-     </ul>
-     <div class="edit-order-comments-block">
-         <div class="edit-order-comments-block-title">
--            <?= /* @escapeNotVerified */ __('Notes for this Order') ?>
-+            <?= $block->escapeHtml(__('Notes for this Order')) ?>
-         </div>
--        <?php foreach ($block->getFullHistory() as $_item): ?>
--            <?php if ($_comment = $block->getItemComment($_item)): ?>
-+        <?php foreach ($block->getFullHistory() as $_item) : ?>
-+            <?php if ($_comment = $block->getItemComment($_item)) : ?>
-                 <div class="comments-block-item">
-                     <div class="comments-block-item-comment">
--                        <?= /* @escapeNotVerified */ $_comment ?>
-+                        <?= /* @noEscape */ $_comment ?>
-                     </div>
-                     <span class="comments-block-item-date-time">
--                        <?= /* @escapeNotVerified */ __('Comment added') ?>
--                        <?= /* @escapeNotVerified */ $block->getItemCreatedAt($_item) ?>
--                        <?= /* @escapeNotVerified */ $block->getItemCreatedAt($_item, 'time') ?>
-+                        <?= $block->escapeHtml(__('Comment added')) ?>
-+                        <?= /* @noEscape */ $block->getItemCreatedAt($_item) ?>
-+                        <?= /* @noEscape */ $block->getItemCreatedAt($_item, 'time') ?>
-                     </span>
-                 </div>
-             <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
-index 434ca127832..390adb7d5cf 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
-@@ -4,10 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block \Magento\Sales\Block\Adminhtml\Order\View\Tab\Info */
- ?>
--<?php /** @var $block \Magento\Sales\Block\Adminhtml\Order\View\Tab\Info */ ?>
- <?php $_order = $block->getOrder() ?>
- 
- <div id="order-messages">
-@@ -15,21 +13,21 @@
- </div>
- 
- <?= $block->getChildHtml('order_info') ?>
--<input type="hidden" name="order_id" value="<?= /* @escapeNotVerified */ $_order->getId() ?>"/>
-+<input type="hidden" name="order_id" value="<?= (int) $_order->getId() ?>"/>
- 
- <section class="admin__page-section order-view-billing-shipping">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
-     </div>
-     <div class="admin__page-section-content">
--        <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?>">
-+        <div class="admin__page-section-item order-payment-method<?= ($_order->getIsVirtual() ? ' order-payment-method-virtual' : '') ?>">
-             <?php /* Payment Method */ ?>
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
-             </div>
-             <div class="admin__page-section-item-content">
-                 <div class="order-payment-method-title"><?= $block->getPaymentHtml() ?></div>
--                <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
-+                <div class="order-payment-currency"><?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?></div>
-                 <div class="order-payment-additional">
-                     <?= $block->getChildHtml('order_payment_additional') ?>
-                     <?= $block->getChildHtml('payment_additional_info') ?>
-@@ -46,26 +44,26 @@
- 
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Items Ordered') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Items Ordered')) ?></span>
-     </div>
-     <?= $block->getItemsHtml() ?>
- </section>
- 
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Order Total')) ?></span>
-     </div>
-     <div class="admin__page-section-content">
-         <div class="admin__page-section-item order-comments-history">
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Notes for this Order') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Notes for this Order')) ?></span>
-             </div>
-             <?= $block->getChildHtml('order_history') ?>
-         </div>
- 
-         <div class="admin__page-section-item order-totals">
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Order Totals') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Order Totals')) ?></span>
-             </div>
-             <?= $block->getChildHtml('order_totals') ?>
-         </div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml b/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml
-index 1194e72e27c..5902a9f25cc 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml
-@@ -1,12 +1,7 @@
- <?php
- /**
-- * @category    design
-- * @package     default_default
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml b/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
-index 872f70d1d69..231eb274290 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
-@@ -4,10 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Sales\Block\Adminhtml\Rss\Order\Grid\Link */
- ?>
--<?php if ($block->isRssAllowed() && $block->getLink()): ?>
--<a href="<?= /* @escapeNotVerified */ $block->getLink() ?>" class="link-feed"><?= /* @escapeNotVerified */ $block->getLabel() ?></a>
-+<?php if ($block->isRssAllowed() && $block->getLink()) : ?>
-+<a href="<?= $block->escapeUrl($block->getLink()) ?>" class="link-feed"><?= $block->escapeHtml($block->getLabel()) ?></a>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
-index c46ff775f6f..01b7548be15 100644
---- a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
-+++ b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
-@@ -4,35 +4,34 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/* @var \Magento\Sales\Block\Adminhtml\Transactions\Detail $block */
- ?>
- <div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getButtonsHtml() ?></div>
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Transaction Data') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Transaction Data')) ?></span>
-     </div>
-     <div id="log_details_fieldset" class="admin__page-section-content log-details">
-         <table class="log-info data-table admin__table-secondary">
-             <tbody>
-             <tr>
--                <th><?= /* @escapeNotVerified */ __('Transaction ID') ?></th>
-+                <th><?= $block->escapeHtml(__('Transaction ID')) ?></th>
-                 <td><?= $block->getTxnIdHtml() ?></td>
-             </tr>
-             <tr>
--                <th><?= /* @escapeNotVerified */ __('Parent Transaction ID') ?></th>
-+                <th><?= $block->escapeHtml(__('Parent Transaction ID')) ?></th>
-                 <td>
--                    <?php if ($block->getParentTxnIdHtml()): ?>
-+                    <?php if ($block->getParentTxnIdHtml()) : ?>
-                     <a href="<?= $block->getParentTxnIdUrlHtml() ?>">
-                         <?= $block->getParentTxnIdHtml() ?>
-                     </a>
-                     <?php else : ?>
--                    <?= /* @escapeNotVerified */ __('N/A') ?>
-+                    <?= $block->escapeHtml(__('N/A')) ?>
-                     <?php endif; ?>
-                 </td>
-             </tr>
-             <tr>
--                <th><?= /* @escapeNotVerified */ __('Order ID') ?></th>
-+                <th><?= $block->escapeHtml(__('Order ID')) ?></th>
-                 <td>
-                     <a href="<?= $block->getOrderIdUrlHtml() ?>">
-                         <?= $block->getOrderIncrementIdHtml() ?>
-@@ -40,15 +39,15 @@
-                 </td>
-             </tr>
-             <tr>
--                <th><?= /* @escapeNotVerified */ __('Transaction Type') ?></th>
-+                <th><?= $block->escapeHtml(__('Transaction Type')) ?></th>
-                 <td><?= $block->getTxnTypeHtml() ?></td>
-             </tr>
-             <tr>
--                <th><?= /* @escapeNotVerified */ __('Is Closed') ?></th>
-+                <th><?= $block->escapeHtml(__('Is Closed')) ?></th>
-                 <td><?= $block->getIsClosedHtml() ?></td>
-             </tr>
-             <tr>
--                <th><?= /* @escapeNotVerified */ __('Created At') ?></th>
-+                <th><?= $block->escapeHtml(__('Created At')) ?></th>
-                 <td><?= $block->getCreatedAtHtml() ?></td>
-             </tr>
-             </tbody>
-@@ -58,7 +57,7 @@
- 
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Child Transactions') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Child Transactions')) ?></span>
-     </div>
-     <div class="admin__page-section-content log-details-grid">
-         <?= $block->getChildHtml('child_grid') ?>
-@@ -67,7 +66,7 @@
- 
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Transaction Details') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Transaction Details')) ?></span>
-     </div>
-     <div class="admin__page-section-content log-details-grid">
-         <?= $block->getChildHtml('detail_grid') ?>
-diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml
-index f36a7d2821f..e0b7dae8fdb 100644
---- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml
-@@ -92,7 +92,7 @@
-         <column name="order_increment_id">
-             <settings>
-                 <filter>text</filter>
--                <label translate="true">Order</label>
-+                <label translate="true">Order #</label>
-             </settings>
-         </column>
-         <column name="order_created_at" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date">
-diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml
-index fe67f4d5e2d..e1f047b372c 100644
---- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml
-@@ -17,6 +17,7 @@
-                 <url path="sales/order_create/start"/>
-                 <class>primary</class>
-                 <label translate="true">Create New Order</label>
-+                <aclResource>Magento_Sales::create</aclResource>
-             </button>
-         </buttons>
-         <spinner>sales_order_columns</spinner>
-diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_shipment_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_shipment_grid.xml
-index e0495e62d5c..9e02c31a206 100644
---- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_shipment_grid.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_shipment_grid.xml
-@@ -100,7 +100,7 @@
-         <column name="order_increment_id">
-             <settings>
-                 <filter>text</filter>
--                <label translate="true">Order</label>
-+                <label translate="true">Order #</label>
-             </settings>
-         </column>
-         <column name="order_created_at" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date">
-diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml
-index 10b7b1c028c..cf536c27a0a 100644
---- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml
-@@ -105,7 +105,7 @@
-         <column name="order_increment_id">
-             <settings>
-                 <filter>text</filter>
--                <label translate="true">Order</label>
-+                <label translate="true">Order #</label>
-             </settings>
-         </column>
-         <column name="order_created_at" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date">
-diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml
-index 6db77a79b8c..5f8ebde2906 100644
---- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml
-+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml
-@@ -106,7 +106,7 @@
-         <column name="order_increment_id">
-             <settings>
-                 <filter>textRange</filter>
--                <label translate="true">Order</label>
-+                <label translate="true">Order #</label>
-             </settings>
-         </column>
-         <column name="order_created_at" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date">
-diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
-index fbf5f5c1023..5f20325eb68 100644
---- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
-+++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
-@@ -4,14 +4,17 @@
-  */
- 
- define([
--    "jquery",
-+    'jquery',
-     'Magento_Ui/js/modal/confirm',
-     'Magento_Ui/js/modal/alert',
--    "mage/translate",
--    "prototype",
--    "Magento_Catalog/catalog/product/composite/configure",
-+    'mage/template',
-+    'text!Magento_Sales/templates/order/create/shipping/reload.html',
-+    'text!Magento_Sales/templates/order/create/payment/reload.html',
-+    'mage/translate',
-+    'prototype',
-+    'Magento_Catalog/catalog/product/composite/configure',
-     'Magento_Ui/js/lib/view/utils/async'
--], function(jQuery, confirm, alert){
-+], function (jQuery, confirm, alert, template, shippingTemplate, paymentTemplate) {
- 
-     window.AdminOrder = new Class.create();
- 
-@@ -29,7 +32,7 @@ define([
-             this.gridProducts   = $H({});
-             this.gridProductsGift = $H({});
-             this.billingAddressContainer = '';
--            this.shippingAddressContainer= '';
-+            this.shippingAddressContainer = '';
-             this.isShippingMethodReseted = data.shipping_method_reseted ? data.shipping_method_reseted : false;
-             this.overlayData = $H({});
-             this.giftMessageDataChanged = false;
-@@ -39,6 +42,20 @@ define([
-             this.isOnlyVirtualProduct = false;
-             this.excludedPaymentMethods = [];
-             this.summarizePrice = true;
-+            this.selectAddressEvent = false;
-+            this.shippingTemplate = template(shippingTemplate, {
-+                data: {
-+                    title: jQuery.mage.__('Shipping Method'),
-+                    linkText: jQuery.mage.__('Get shipping methods and rates')
-+                }
-+            });
-+            this.paymentTemplate = template(paymentTemplate, {
-+                data: {
-+                    title: jQuery.mage.__('Payment Method'),
-+                    linkText: jQuery.mage.__('Get available payment methods')
-+                }
-+            });
-+
-             jQuery.async('#order-items', (function(){
-                 this.dataArea = new OrderFormArea('data', $(this.getAreaId('data')), this);
-                 this.itemsArea = Object.extend(new OrderFormArea('items', $(this.getAreaId('items')), this), {
-@@ -47,7 +64,7 @@ define([
-                         if (typeof controlButtonArea != 'undefined') {
-                             var buttons = controlButtonArea.childElements();
-                             for (var i = 0; i < buttons.length; i++) {
--                                if (buttons[i].innerHTML.include(button.label)) {
-+                                if (buttons[i].innerHTML.include(button.getLabel())) {
-                                     return;
-                                 }
-                             }
-@@ -153,50 +170,74 @@ define([
-         },
- 
-         selectAddress : function(el, container){
-+
-             id = el.value;
-             if (id.length == 0) {
-                 id = '0';
-             }
--            if(this.addresses[id]){
--                this.fillAddressFields(container, this.addresses[id]);
- 
--            }
--            else{
-+            this.selectAddressEvent = true;
-+            if (this.addresses[id]) {
-+                this.fillAddressFields(container, this.addresses[id]);
-+            } else {
-                 this.fillAddressFields(container, {});
-             }
-+            this.selectAddressEvent = false;
- 
-             var data = this.serializeData(container);
-             data[el.name] = id;
--            if(this.isShippingField(container) && !this.isShippingMethodReseted){
-+
-+            this.resetPaymentMethod();
-+            if (this.isShippingField(container) && !this.isShippingMethodReseted) {
-                 this.resetShippingMethod(data);
--            }
--            else{
-+            } else{
-                 this.saveData(data);
-             }
-+
-         },
- 
--        isShippingField : function(fieldId){
--            if(this.shippingAsBilling){
-+        /**
-+         * Checks if the field belongs to the shipping address.
-+         *
-+         * @param {String} fieldId
-+         * @return {Boolean}
-+         */
-+        isShippingField: function (fieldId) {
-+            if (this.shippingAsBilling) {
-                 return fieldId.include('billing');
-             }
-+
-             return fieldId.include('shipping');
-         },
- 
--        isBillingField : function(fieldId){
-+        /**
-+         * Checks if the field belongs to the billing address.
-+         *
-+         * @param {String} fieldId
-+         * @return {Boolean}
-+         */
-+        isBillingField: function (fieldId) {
-             return fieldId.include('billing');
-         },
- 
--        bindAddressFields : function(container) {
--            var fields = $(container).select('input', 'select', 'textarea');
--            for(var i=0;i<fields.length;i++){
--                Event.observe(fields[i], 'change', this.changeAddressField.bind(this));
-+        /**
-+         * Binds events on container form fields.
-+         *
-+         * @param {String} container
-+         */
-+        bindAddressFields: function (container) {
-+            var fields = $(container).select('input', 'select', 'textarea'),
-+                i;
-+
-+            for (i = 0; i < fields.length; i++) {
-+                jQuery(fields[i]).change(this.changeAddressField.bind(this));
-             }
-         },
- 
-         /**
-          * Triggers on each form's element changes.
-          *
--         * @param {Object} event
-+         * @param {Event} event
-          */
-         changeAddressField: function (event) {
-             var field = Event.element(event),
-@@ -204,7 +245,8 @@ define([
-                 matchRes = field.name.match(re),
-                 type,
-                 name,
--                data;
-+                data,
-+                resetShipping = false;
- 
-             if (!matchRes) {
-                 return;
-@@ -220,20 +262,35 @@ define([
-             }
-             data = data.toObject();
- 
--            if (type === 'billing' && this.shippingAsBilling || type === 'shipping' && !this.shippingAsBilling) {
-+            if (type === 'billing' && this.shippingAsBilling) {
-+                this.syncAddressField(this.shippingAddressContainer, field.name, field);
-+                resetShipping = true;
-+            }
-+
-+            if (type === 'shipping' && !this.shippingAsBilling) {
-+                resetShipping = true;
-+            }
-+
-+            if (resetShipping) {
-                 data['reset_shipping'] = true;
-             }
- 
-             data['order[' + type + '_address][customer_address_id]'] = null;
--            data['shipping_as_billing'] = jQuery('[name="shipping_same_as_billing"]').is(':checked') ? 1 : 0;
-+            data['shipping_as_billing'] = +this.shippingAsBilling;
- 
-             if (name === 'customer_address_id') {
-                 data['order[' + type + '_address][customer_address_id]'] =
-                     $('order-' + type + '_address_customer_address_id').value;
-             }
- 
-+            if (name === 'country_id' && this.selectAddressEvent === false) {
-+                $('order-' + type + '_address_customer_address_id').value = '';
-+            }
-+
-+            this.resetPaymentMethod();
-+
-             if (data['reset_shipping']) {
--                this.resetShippingMethod(data);
-+                this.resetShippingMethod();
-             } else {
-                 this.saveData(data);
- 
-@@ -243,7 +300,32 @@ define([
-             }
-         },
- 
--        fillAddressFields : function(container, data){
-+        /**
-+         * Set address container form field value.
-+         *
-+         * @param {String} container - container ID
-+         * @param {String} fieldName - form field name
-+         * @param {*} fieldValue - form field value
-+         */
-+        syncAddressField: function (container, fieldName, fieldValue) {
-+            var syncName;
-+
-+            if (this.isBillingField(fieldName)) {
-+                syncName = fieldName.replace('billing', 'shipping');
-+            }
-+
-+            $(container).select('[name="' + syncName + '"]').each(function (element) {
-+                if (~['input', 'textarea', 'select'].indexOf(element.tagName.toLowerCase())) {
-+                    if (element.type === "checkbox") {
-+                        element.checked = fieldValue.checked;
-+                    } else {
-+                        element.value = fieldValue.value;
-+                    }
-+                }
-+            });
-+        },
-+
-+        fillAddressFields: function(container, data){
-             var regionIdElem = false;
-             var regionIdElemValue = false;
- 
-@@ -284,10 +366,15 @@ define([
-                     fields[i].setValue(data[name] ? data[name] : '');
-                 }
- 
--                if (fields[i].changeUpdater) fields[i].changeUpdater();
-+                if (fields[i].changeUpdater) {
-+                    fields[i].changeUpdater();
-+                }
-+
-                 if (name == 'region' && data['region_id'] && !data['region']){
-                     fields[i].value = data['region_id'];
-                 }
-+
-+                jQuery(fields[i]).trigger('change');
-             }
-         },
- 
-@@ -318,46 +405,83 @@ define([
-             }
-         },
- 
--        setShippingAsBilling : function(flag){
--            var data;
--            var areasToLoad = ['billing_method', 'shipping_address', 'totals', 'giftmessage'];
-+        /**
-+         * Equals shipping and billing addresses.
-+         *
-+         * @param {Boolean} flag
-+         */
-+        setShippingAsBilling: function (flag) {
-+            var data,
-+                areasToLoad = ['billing_method', 'shipping_address', 'shipping_method', 'totals', 'giftmessage'];
-+
-             this.disableShippingAddress(flag);
--            if(flag){
--                data = this.serializeData(this.billingAddressContainer);
--            } else {
--                data = this.serializeData(this.shippingAddressContainer);
--            }
--            areasToLoad.push('shipping_method');
-+            data = this.serializeData(flag ? this.billingAddressContainer : this.shippingAddressContainer);
-             data = data.toObject();
-             data['shipping_as_billing'] = flag ? 1 : 0;
-             data['reset_shipping'] = 1;
-             this.loadArea(areasToLoad, true, data);
-         },
- 
--        resetShippingMethod : function(data){
--            var areasToLoad = ['billing_method', 'shipping_address', 'totals', 'giftmessage', 'items'];
--            if(!this.isOnlyVirtualProduct) {
--                areasToLoad.push('shipping_method');
--                areasToLoad.push('shipping_address');
-+        /**
-+         * Replace shipping method area.
-+         */
-+        resetShippingMethod: function () {
-+            if (!this.isOnlyVirtualProduct) {
-+                $(this.getAreaId('shipping_method')).update(this.shippingTemplate);
-             }
-+        },
- 
--            data['reset_shipping'] = 1;
--            this.isShippingMethodReseted = true;
--            this.loadArea(areasToLoad, true, data);
-+        /**
-+         * Replace payment method area.
-+         */
-+        resetPaymentMethod: function () {
-+            $(this.getAreaId('billing_method')).update(this.paymentTemplate);
-         },
- 
--        loadShippingRates : function(){
-+        /**
-+         * Loads shipping options according to address data.
-+         *
-+         * @return {Boolean}
-+         */
-+        loadShippingRates: function () {
-+            var addressContainer = this.shippingAsBilling ?
-+                    'billingAddressContainer' :
-+                    'shippingAddressContainer',
-+                data = this.serializeData(this[addressContainer]).toObject();
-+
-+            data['collect_shipping_rates'] = 1;
-             this.isShippingMethodReseted = false;
--            this.loadArea(['shipping_method', 'totals'], true, {collect_shipping_rates: 1});
-+            this.loadArea(['shipping_method', 'totals'], true, data);
-+
-+            return false;
-         },
- 
--        setShippingMethod : function(method){
-+        setShippingMethod: function(method) {
-             var data = {};
-+
-             data['order[shipping_method]'] = method;
--            this.loadArea(['shipping_method', 'totals', 'billing_method'], true, data);
-+            this.loadArea([
-+                'shipping_method',
-+                'totals',
-+                'billing_method'
-+            ], true, data);
-+        },
-+
-+        /**
-+         * Updates available payment
-+         * methods list according to order data.
-+         *
-+         * @return boolean
-+         */
-+        loadPaymentMethods: function() {
-+            var data = this.serializeData(this.billingAddressContainer).toObject();
-+
-+            this.loadArea(['billing_method','totals'], true, data);
-+
-+            return false;
-         },
- 
--        switchPaymentMethod : function(method){
-+        switchPaymentMethod: function(method){
-             jQuery('#edit_form')
-                 .off('submitOrder')
-                 .on('submitOrder', function(){
-@@ -449,6 +573,9 @@ define([
-         applyCoupon : function(code){
-             this.loadArea(['items', 'shipping_method', 'totals', 'billing_method'], true, {'order[coupon][code]':code, reset_shipping: 0});
-             this.orderItemChanged = false;
-+            jQuery('html, body').animate({
-+                scrollTop: 0
-+            });
-         },
- 
-         addProduct : function(id){
-@@ -619,7 +746,7 @@ define([
-                     }
-                     else if (((elms[i].type == 'checkbox' || elms[i].type == 'radio') && elms[i].checked)
-                         || ((elms[i].type == 'file' || elms[i].type == 'text' || elms[i].type == 'textarea' || elms[i].type == 'hidden')
--                        && Form.Element.getValue(elms[i]))
-+                            && Form.Element.getValue(elms[i]))
-                     ) {
-                         if (this._isSummarizePrice(elms[i])) {
-                             productPrice += getPrice(elms[i]);
-@@ -907,6 +1034,7 @@ define([
-                     qtyElement.value = confirmedCurrentQty.value;
-                 }
-                 this.productConfigureAddFields['item['+itemId+'][configured]'] = 1;
-+                this.itemsUpdate();
- 
-             }.bind(this));
-             productConfigure.setShowWindowCallback(listType, function() {
-@@ -1131,12 +1259,18 @@ define([
-          */
-         isPaymentValidationAvailable : function(){
-             return ((typeof this.paymentMethod) == 'undefined'
--            || this.excludedPaymentMethods.indexOf(this.paymentMethod) == -1);
-+                || this.excludedPaymentMethods.indexOf(this.paymentMethod) == -1);
-         },
- 
--        serializeData : function(container){
--            var fields = $(container).select('input', 'select', 'textarea');
--            var data = Form.serializeElements(fields, true);
-+        /**
-+         * Serializes container form elements data.
-+         *
-+         * @param {String} container
-+         * @return {Object}
-+         */
-+        serializeData: function (container) {
-+            var fields = $(container).select('input', 'select', 'textarea'),
-+                data = Form.serializeElements(fields, true);
- 
-             return $H(data);
-         },
-@@ -1156,8 +1290,12 @@ define([
- 
-         submit : function()
-         {
--            jQuery('#edit_form').trigger('processStart');
--            jQuery('#edit_form').trigger('submitOrder');
-+            var $editForm = jQuery('#edit_form');
-+
-+            if ($editForm.valid()) {
-+                $editForm.trigger('processStart');
-+                $editForm.trigger('submitOrder');
-+            }
-         },
- 
-         _realSubmit: function () {
-@@ -1417,8 +1555,10 @@ define([
-             node.update('<span>' + this._label + '</span>');
-             content[position] = node;
-             Element.insert(element, content);
-+        },
-+
-+        getLabel: function(){
-+            return this._label;
-         }
-     };
--
- });
--
-diff --git a/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/payment/reload.html b/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/payment/reload.html
-new file mode 100644
-index 00000000000..c503f3c678a
---- /dev/null
-+++ b/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/payment/reload.html
-@@ -0,0 +1,18 @@
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+
-+<div class="admin__page-section-title">
-+    <span class="title"><%- data.title %></span>
-+</div>
-+<div id="order-billing_method_summary"
-+     class="order-billing-method-summary">
-+    <a href="#"
-+       onclick="return order.loadPaymentMethods();"
-+       class="action-default">
-+        <span><%- data.linkText %></span>
-+    </a>
-+</div>
-diff --git a/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/shipping/reload.html b/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/shipping/reload.html
-new file mode 100644
-index 00000000000..6b191ee81a4
---- /dev/null
-+++ b/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/shipping/reload.html
-@@ -0,0 +1,19 @@
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+
-+<div class="admin__page-section-title">
-+    <span class="title"><%- data.title %></span>
-+</div>
-+<div id="order-shipping-method-summary"
-+     class="order-shipping-method-summary">
-+    <a href="#"
-+       onclick="return order.loadShippingRates();"
-+       class="action-default">
-+        <span><%- data.linkText %></span>
-+    </a>
-+    <input type="hidden" name="order[has_shipping]" value="" class="required-entry" />
-+</div>
-diff --git a/app/code/Magento/Sales/view/base/ui_component/customer_form.xml b/app/code/Magento/Sales/view/base/ui_component/customer_form.xml
-index 2c6dda05c80..788403f1557 100644
---- a/app/code/Magento/Sales/view/base/ui_component/customer_form.xml
-+++ b/app/code/Magento/Sales/view/base/ui_component/customer_form.xml
-@@ -9,4 +9,7 @@
-     <htmlContent name="orders_content">
-         <block acl="Magento_Sales::actions_view" class="Magento\Sales\Block\Adminhtml\CustomerOrdersTab" name="orders" />
-     </htmlContent>
-+    <htmlContent name="cart_content">
-+        <block acl="Magento_Cart::manage" class="Magento\Sales\Block\Adminhtml\ShoppingCartsTab" name="cart"/>
-+    </htmlContent>
- </form>
-diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html
-index 3a4aab19e9e..a6a10fb49e3 100644
---- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html
-+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html
-@@ -11,7 +11,7 @@
- "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
- "var order.getCustomerName()":"Customer Name",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status"
-+"var order.getFrontendStatusLabel()":"Order Status"
- } @-->
- {{template config_path="design/email/header_template"}}
- 
-@@ -24,7 +24,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-             </p>
-             <p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
-diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
-index bc7c079d7f2..b7411d80d2b 100644
---- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
-+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
-@@ -10,7 +10,7 @@
- "var creditmemo.increment_id":"Credit Memo Id",
- "var billing.getName()":"Guest Customer Name",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status"
-+"var order.getFrontendStatusLabel()":"Order Status"
- } @-->
- {{template config_path="design/email/header_template"}}
- 
-@@ -23,7 +23,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-             </p>
-             <p>
-diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_update.html b/app/code/Magento/Sales/view/frontend/email/invoice_update.html
-index cafdd65ff52..4043e59f9d7 100644
---- a/app/code/Magento/Sales/view/frontend/email/invoice_update.html
-+++ b/app/code/Magento/Sales/view/frontend/email/invoice_update.html
-@@ -11,7 +11,7 @@
- "var comment":"Invoice Comment",
- "var invoice.increment_id":"Invoice Id",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status"
-+"var order.getFrontendStatusLabel()":"Order Status"
- } @-->
- {{template config_path="design/email/header_template"}}
- 
-@@ -24,7 +24,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-             </p>
-             <p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
-diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
-index fafb533301e..40cdec7fb4c 100644
---- a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
-+++ b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
-@@ -10,7 +10,7 @@
- "var comment":"Invoice Comment",
- "var invoice.increment_id":"Invoice Id",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status"
-+"var order.getFrontendStatusLabel()":"Order Status"
- } @-->
- {{template config_path="design/email/header_template"}}
- 
-@@ -23,7 +23,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-             </p>
-             <p>
-diff --git a/app/code/Magento/Sales/view/frontend/email/order_update.html b/app/code/Magento/Sales/view/frontend/email/order_update.html
-index a709a9ed8a7..a8f0068b70e 100644
---- a/app/code/Magento/Sales/view/frontend/email/order_update.html
-+++ b/app/code/Magento/Sales/view/frontend/email/order_update.html
-@@ -10,7 +10,7 @@
- "var order.getCustomerName()":"Customer Name",
- "var comment":"Order Comment",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status"
-+"var order.getFrontendStatusLabel()":"Order Status"
- } @-->
- {{template config_path="design/email/header_template"}}
- 
-@@ -23,7 +23,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-             </p>
-             <p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
-diff --git a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
-index 5a39b01810c..749fa3b60ad 100644
---- a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
-+++ b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
-@@ -9,7 +9,7 @@
- "var billing.getName()":"Guest Customer Name",
- "var comment":"Order Comment",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status"
-+"var order.getFrontendStatusLabel()":"Order Status"
- } @-->
- {{template config_path="design/email/header_template"}}
- 
-@@ -22,7 +22,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-             </p>
-             <p>
-diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new.html b/app/code/Magento/Sales/view/frontend/email/shipment_new.html
-index 8af49f322c6..84f5acb29ea 100644
---- a/app/code/Magento/Sales/view/frontend/email/shipment_new.html
-+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new.html
-@@ -53,7 +53,7 @@
-                 </tr>
-             </table>
-             {{/depend}}
--            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
-+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
-             <table class="order-details">
-                 <tr>
-                     <td class="address-details">
-diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
-index df1677f56a5..bb181126724 100644
---- a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
-+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
-@@ -51,7 +51,7 @@
-                 </tr>
-             </table>
-             {{/depend}}
--            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
-+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
-             <table class="order-details">
-                 <tr>
-                     <td class="address-details">
-diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_update.html b/app/code/Magento/Sales/view/frontend/email/shipment_update.html
-index 6d9efc37004..9d1c9328754 100644
---- a/app/code/Magento/Sales/view/frontend/email/shipment_update.html
-+++ b/app/code/Magento/Sales/view/frontend/email/shipment_update.html
-@@ -10,7 +10,7 @@
- "var order.getCustomerName()":"Customer Name",
- "var comment":"Order Comment",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status",
-+"var order.getFrontendStatusLabel()":"Order Status",
- "var shipment.increment_id":"Shipment Id"
- } @-->
- {{template config_path="design/email/header_template"}}
-@@ -24,7 +24,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-             </p>
-             <p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
-diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
-index 4896a00b7bc..0d2dccd3377 100644
---- a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
-+++ b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
-@@ -9,7 +9,7 @@
- "var billing.getName()":"Guest Customer Name",
- "var comment":"Order Comment",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status",
-+"var order.getFrontendStatusLabel()":"Order Status",
- "var shipment.increment_id":"Shipment Id"
- } @-->
- {{template config_path="design/email/header_template"}}
-@@ -23,7 +23,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-             </p>
-             <p>
-diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
-new file mode 100644
-index 00000000000..91414663951
---- /dev/null
-+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <update handle="sales_email_order_shipment_renderers"/>
-+    <body>
-+        <block class="Magento\Framework\View\Element\Template" name="sales.order.email.shipment.track" template="Magento_Sales::email/shipment/track.phtml"/>
-+    </body>
-+</page>
-\ No newline at end of file
-diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml
-index 0e2689e3e21..99af16ce629 100644
---- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml
-+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml
-@@ -12,11 +12,20 @@
-     <body>
-         <attribute name="class" value="sales-guest-view"/>
-         <referenceContainer name="page.main.title">
--            <block class="Magento\Sales\Block\Order\PrintShipment" name="order.status" template="Magento_Sales::order/order_status.phtml" />
--            <block class="Magento\Sales\Block\Order\PrintShipment" name="order.date" template="Magento_Sales::order/order_date.phtml" />
-+            <block class="Magento\Sales\Block\Order\PrintShipment"
-+                   name="order.status"
-+                   template="Magento_Sales::order/order_status.phtml"
-+                   cacheable="false" />
-+            <block class="Magento\Sales\Block\Order\PrintShipment"
-+                   name="order.date"
-+                   template="Magento_Sales::order/order_date.phtml"
-+                   cacheable="false" />
-         </referenceContainer>
-         <referenceContainer name="content">
--            <block class="Magento\Sales\Block\Order\PrintShipment" name="sales.order.print" template="Magento_Sales::order/view.phtml">
-+            <block class="Magento\Sales\Block\Order\PrintShipment"
-+                   name="sales.order.print"
-+                   template="Magento_Sales::order/view.phtml"
-+                   cacheable="false">
-                 <block class="Magento\Sales\Block\Order\PrintShipment" name="order_items" template="Magento_Sales::order/items.phtml">
-                     <block class="Magento\Framework\View\Element\RendererList" name="sales.order.print.renderers" as="renderer.list" />
-                     <block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="Magento_Sales::order/totals.phtml">
-diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
-index 50ffe979651..4410a6fc4a9 100644
---- a/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
-+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
-@@ -12,12 +12,21 @@
-     <body>
-         <attribute name="class" value="account"/>
-         <referenceContainer name="page.main.title">
--            <block class="Magento\Sales\Block\Order\PrintShipment" name="order.status" template="Magento_Sales::order/order_status.phtml" />
--            <block class="Magento\Sales\Block\Order\PrintShipment" name="order.date" template="Magento_Sales::order/order_date.phtml" />
-+            <block class="Magento\Sales\Block\Order\PrintShipment"
-+                   name="order.status"
-+                   template="Magento_Sales::order/order_status.phtml"
-+                   cacheable="false" />
-+            <block class="Magento\Sales\Block\Order\PrintShipment"
-+                   name="order.date"
-+                   template="Magento_Sales::order/order_date.phtml"
-+                   cacheable="false" />
-         </referenceContainer>
-         <referenceContainer name="content">
--            <block class="Magento\Sales\Block\Order\PrintShipment" name="sales.order.print" template="Magento_Sales::order/view.phtml">
--                <block class="Magento\Sales\Block\Order\PrintShipment" name="order_items" template="Magento_Sales::order/items.phtml">
-+            <block class="Magento\Sales\Block\Order\PrintShipment"
-+                   name="sales.order.print"
-+                   template="Magento_Sales::order/view.phtml"
-+                   cacheable="false">
-+                <block class="Magento\Sales\Block\Order\Items" name="order_items" template="Magento_Sales::order/items.phtml">
-                     <block class="Magento\Framework\View\Element\RendererList" name="sales.order.print.renderers" as="renderer.list" />
-                     <block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="Magento_Sales::order/totals.phtml">
-                         <arguments>
-diff --git a/app/code/Magento/Sales/view/frontend/requirejs-config.js b/app/code/Magento/Sales/view/frontend/requirejs-config.js
-index 04778765f3c..4d323684aff 100644
---- a/app/code/Magento/Sales/view/frontend/requirejs-config.js
-+++ b/app/code/Magento/Sales/view/frontend/requirejs-config.js
-@@ -6,8 +6,10 @@
- var config = {
-     map: {
-         '*': {
--            giftMessage:    'Magento_Sales/gift-message',
--            ordersReturns:  'Magento_Sales/orders-returns'
-+            giftMessage:    'Magento_Sales/js/gift-message',
-+            ordersReturns:  'Magento_Sales/js/orders-returns',
-+            'Magento_Sales/gift-message':    'Magento_Sales/js/gift-message',
-+            'Magento_Sales/orders-returns':  'Magento_Sales/js/orders-returns'
-         }
-     }
- };
-diff --git a/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
-index 8cef5d57664..90c3ddeee5a 100644
---- a/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
-@@ -4,28 +4,26 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_creditmemo = $block->getCreditmemo() ?>
- <?php $_order      = $block->getOrder() ?>
--<?php if ($_creditmemo && $_order): ?>
-+<?php if ($_creditmemo && $_order) : ?>
-     <table class="email-items">
-         <thead>
-             <tr>
-                 <th class="item-info">
--                    <?= /* @escapeNotVerified */  __('Items') ?>
-+                    <?= $block->escapeHtml(__('Items')) ?>
-                 </th>
-                 <th class="item-qty">
--                    <?= /* @escapeNotVerified */  __('Qty') ?>
-+                    <?= $block->escapeHtml(__('Qty')) ?>
-                 </th>
-                 <th class="item-subtotal">
--                    <?= /* @escapeNotVerified */  __('Subtotal') ?>
-+                    <?= $block->escapeHtml(__('Subtotal')) ?>
-                 </th>
-             </tr>
-         </thead>
--        <?php foreach ($_creditmemo->getAllItems() as $_item): ?>
--            <?php if (!$_item->getOrderItem()->getParentItem())  : ?>
-+        <?php foreach ($_creditmemo->getAllItems() as $_item) : ?>
-+            <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-                 <tbody>
-                     <?= $block->getItemHtml($_item) ?>
-                 </tbody>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
-index 4c377dea47d..e2efd650295 100644
---- a/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
-@@ -4,27 +4,25 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_invoice = $block->getInvoice() ?>
- <?php $_order   = $block->getOrder() ?>
--<?php if ($_invoice && $_order): ?>
-+<?php if ($_invoice && $_order) : ?>
-     <table class="email-items">
-         <thead>
-             <tr>
-                 <th class="item-info">
--                    <?= /* @escapeNotVerified */  __('Items') ?>
-+                    <?= $block->escapeHtml(__('Items')) ?>
-                 </th>
-                 <th class="item-qty">
--                    <?= /* @escapeNotVerified */  __('Qty') ?>
-+                    <?= $block->escapeHtml(__('Qty')) ?>
-                 </th>
-                 <th class="item-subtotal">
--                    <?= /* @escapeNotVerified */  __('Subtotal') ?>
-+                    <?= $block->escapeHtml(__('Subtotal')) ?>
-                 </th>
-             </tr>
-         </thead>
--        <?php foreach ($_invoice->getAllItems() as $_item): ?>
-+        <?php foreach ($_invoice->getAllItems() as $_item) : ?>
-             <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-                 <tbody>
-                     <?= $block->getItemHtml($_item) ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
-index 37469582865..1bba8166762 100644
---- a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
-@@ -4,27 +4,28 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
-+/** @var $block \Magento\Sales\Block\Order\Email\Items */
- ?>
- <?php $_order = $block->getOrder() ?>
--<?php if ($_order): ?>
-+<?php if ($_order) : ?>
-     <?php $_items = $_order->getAllItems(); ?>
-     <table class="email-items">
-         <thead>
-             <tr>
-                 <th class="item-info">
--                    <?= /* @escapeNotVerified */  __('Items') ?>
-+                    <?= $block->escapeHtml(__('Items')) ?>
-                 </th>
-                 <th class="item-qty">
--                    <?= /* @escapeNotVerified */  __('Qty') ?>
-+                    <?= $block->escapeHtml(__('Qty')) ?>
-                 </th>
-                 <th class="item-price">
--                    <?= /* @escapeNotVerified */  __('Price') ?>
-+                    <?= $block->escapeHtml(__('Price')) ?>
-                 </th>
-             </tr>
-         </thead>
--        <?php foreach ($_items as $_item): ?>
-+        <?php foreach ($_items as $_item) : ?>
-             <?php if (!$_item->getParentItem()) : ?>
-                 <tbody>
-                     <?= $block->getItemHtml($_item) ?>
-@@ -35,17 +36,21 @@
-             <?= $block->getChildHtml('order_totals') ?>
-         </tfoot>
-     </table>
--    <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order', $_order, $_order->getStore()) && $_order->getGiftMessageId()): ?>
--        <?php $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_order->getGiftMessageId()); ?>
--        <?php if ($_giftMessage): ?>
-+    <?php if ($this->helper(\Magento\GiftMessage\Helper\Message::class)
-+            ->isMessagesAllowed('order', $_order, $_order->getStore())
-+        && $_order->getGiftMessageId()
-+    ) : ?>
-+        <?php $_giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)
-+            ->getGiftMessage($_order->getGiftMessageId()); ?>
-+        <?php if ($_giftMessage) : ?>
-             <br />
-             <table class="message-gift">
-                 <tr>
-                     <td>
--                        <h3><?= /* @escapeNotVerified */  __('Gift Message for this Order') ?></h3>
--                        <strong><?= /* @escapeNotVerified */  __('From:') ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
--                        <br /><strong><?= /* @escapeNotVerified */  __('To:') ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
--                        <br /><strong><?= /* @escapeNotVerified */  __('Message:') ?></strong>
-+                        <h3><?= $block->escapeHtml(__('Gift Message for this Order')) ?></h3>
-+                        <strong><?= $block->escapeHtml(__('From:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-+                        <br /><strong><?= $block->escapeHtml(__('To:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-+                        <br /><strong><?= $block->escapeHtml(__('Message:')) ?></strong>
-                         <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
-                     </td>
-                 </tr>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
-index 1fca65932b0..1066a8dc9b1 100644
---- a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
-@@ -4,21 +4,19 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_item = $block->getItem() ?>
- <?php $_order = $block->getItem()->getOrder(); ?>
- <tr>
--    <td class="item-info<?php if ($block->getItemOptions()): ?> has-extra<?php endif; ?>">
-+    <td class="item-info<?= ($block->getItemOptions() ? ' has-extra' : '') ?>">
-         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
--        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
--        <?php if ($block->getItemOptions()): ?>
-+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-+        <?php if ($block->getItemOptions()) : ?>
-             <dl>
--                <?php foreach ($block->getItemOptions() as $option): ?>
--                    <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
-+                <?php foreach ($block->getItemOptions() as $option) : ?>
-+                    <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
-                     <dd>
--                        <?= /* @escapeNotVerified */  nl2br($option['value']) ?>
-+                        <?= /* @noEscape */  nl2br($block->escapeHtml($option['value'])) ?>
-                     </dd>
-                 <?php endforeach; ?>
-             </dl>
-@@ -29,8 +27,8 @@
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
-     </td>
--    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
-+    <td class="item-qty"><?= (int) $_item->getQty() ?></td>
-     <td class="item-price">
--        <?= /* @escapeNotVerified */  $block->getItemPrice($_item->getOrderItem()) ?>
-+        <?= /* @noEscape */  $block->getItemPrice($_item) ?>
-     </td>
- </tr>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
-index 1fca65932b0..e0a25ce5206 100644
---- a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
-@@ -3,34 +3,31 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_item = $block->getItem() ?>
- <?php $_order = $block->getItem()->getOrder(); ?>
- <tr>
--    <td class="item-info<?php if ($block->getItemOptions()): ?> has-extra<?php endif; ?>">
-+    <td class="item-info<?= ($block->getItemOptions() ? ' has-extra' : '') ?>">
-         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
--        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
--        <?php if ($block->getItemOptions()): ?>
-+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-+        <?php if ($block->getItemOptions()) : ?>
-             <dl>
--                <?php foreach ($block->getItemOptions() as $option): ?>
--                    <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
-+                <?php foreach ($block->getItemOptions() as $option) : ?>
-+                    <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
-                     <dd>
--                        <?= /* @escapeNotVerified */  nl2br($option['value']) ?>
-+                        <?= /* @noEscape */  nl2br($block->escapeHtml($option['value'])) ?>
-                     </dd>
-                 <?php endforeach; ?>
-             </dl>
-         <?php endif; ?>
-         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
--        <?php if ($addInfoBlock) :?>
-+        <?php if ($addInfoBlock) : ?>
-             <?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
-     </td>
--    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
-+    <td class="item-qty"><?= (int) $_item->getQty() ?></td>
-     <td class="item-price">
--        <?= /* @escapeNotVerified */  $block->getItemPrice($_item->getOrderItem()) ?>
-+        <?= /* @noEscape */ $block->getItemPrice($_item->getOrderItem()) ?>
-     </td>
- </tr>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
-index 2974e4cd7ad..a39442136e2 100644
---- a/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Sales\Block\Order\Email\Items\DefaultItems */
- 
-@@ -13,15 +13,15 @@ $_item = $block->getItem();
- $_order = $_item->getOrder();
- ?>
- <tr>
--    <td class="item-info<?php if ($block->getItemOptions()): ?> has-extra<?php endif; ?>">
-+    <td class="item-info<?= ($block->getItemOptions() ? ' has-extra' : '') ?>">
-         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
--        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
--        <?php if ($block->getItemOptions()): ?>
-+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-+        <?php if ($block->getItemOptions()) : ?>
-             <dl class="item-options">
--            <?php foreach ($block->getItemOptions() as $option): ?>
--                <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
-+            <?php foreach ($block->getItemOptions() as $option) : ?>
-+                <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
-                 <dd>
--                    <?= /* @escapeNotVerified */  nl2br($option['value']) ?>
-+                    <?= /* @noEscape */  nl2br($block->escapeHtml($option['value'])) ?>
-                 </dd>
-             <?php endforeach; ?>
-             </dl>
-@@ -32,21 +32,24 @@ $_order = $_item->getOrder();
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
-     </td>
--    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQtyOrdered() * 1 ?></td>
-+    <td class="item-qty"><?= (int) $_item->getQtyOrdered() ?></td>
-     <td class="item-price">
--        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
-+        <?= /* @noEscape */ $block->getItemPrice($_item) ?>
-     </td>
- </tr>
--<?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
--<tr>
-+<?php if ($_item->getGiftMessageId()
-+    && $_giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)
-+        ->getGiftMessage($_item->getGiftMessageId())
-+) : ?>
-+    <tr>
-     <td colspan="3" class="item-extra">
-         <table class="message-gift">
-             <tr>
-                 <td>
--                    <h3><?= /* @escapeNotVerified */  __('Gift Message') ?></h3>
--                    <strong><?= /* @escapeNotVerified */  __('From:') ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
--                    <br /><strong><?= /* @escapeNotVerified */  __('To:') ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
--                    <br /><strong><?= /* @escapeNotVerified */  __('Message:') ?></strong>
-+                    <h3><?= $block->escapeHtml(__('Gift Message')) ?></h3>
-+                    <strong><?= $block->escapeHtml(__('From:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-+                    <br /><strong><?= $block->escapeHtml(__('To:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-+                    <br /><strong><?= $block->escapeHtml(__('Message:')) ?></strong>
-                     <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
-                 </td>
-             </tr>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml
-index 106aeb16c28..a2148a4f8fc 100644
---- a/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var \Magento\Sales\Block\Order\Email\Items\DefaultItems $block */
-@@ -16,4 +13,4 @@ $_item = $block->getItem();
- $_order = $_item->getOrder();
- ?>
- 
--<?= /* @escapeNotVerified */  $_order->formatPrice($_item->getRowTotal()) ?>
-+<?= /* @noEscape */ $_order->formatPrice($_item->getRowTotal()) ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
-index f41a09f5da0..3cab6ae1ed9 100644
---- a/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
-@@ -4,29 +4,27 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $_item \Magento\Sales\Model\Order\Item */
- $_item = $block->getItem() ?>
- <tr>
--    <td class="item-info<?php if ($block->getItemOptions()): ?> has-extra<?php endif; ?>">
-+    <td class="item-info<?= ($block->getItemOptions() ? ' has-extra' : '') ?>">
-         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
--        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
--        <?php if ($block->getItemOptions()): ?>
-+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-+        <?php if ($block->getItemOptions()) : ?>
-             <dl class="item-options">
--                <?php foreach ($block->getItemOptions() as $option): ?>
--                    <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
-+                <?php foreach ($block->getItemOptions() as $option) : ?>
-+                    <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
-                     <dd>
--                        <?= /* @escapeNotVerified */  nl2br($option['value']) ?>
-+                        <?= /* @noEscape */  nl2br($option['value']) ?>
-                     </dd>
-                 <?php endforeach; ?>
-             </dl>
-         <?php endif; ?>
-         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
--        <?php if ($addInfoBlock) :?>
-+        <?php if ($addInfoBlock) : ?>
-             <?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
-     </td>
--    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
-+    <td class="item-qty"><?= (int) $_item->getQty() ?></td>
- </tr>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
-index 022511ae3cf..956705fb7b5 100644
---- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
-@@ -4,24 +4,22 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_shipment = $block->getShipment() ?>
- <?php $_order    = $block->getOrder() ?>
--<?php if ($_shipment && $_order): ?>
-+<?php if ($_shipment && $_order) : ?>
-     <table class="email-items">
-         <thead>
-             <tr>
-                 <th class="item-info">
--                    <?= /* @escapeNotVerified */  __('Items') ?>
-+                    <?= $block->escapeHtml(__('Items')) ?>
-                 </th>
-                 <th class="item-qty">
--                    <?= /* @escapeNotVerified */  __('Qty') ?>
-+                    <?= $block->escapeHtml(__('Qty')) ?>
-                 </th>
-             </tr>
-         </thead>
--        <?php foreach ($_shipment->getAllItems() as $_item): ?>
-+        <?php foreach ($_shipment->getAllItems() as $_item) : ?>
-             <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-                 <tbody>
-                     <?= $block->getItemHtml($_item) ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
-index 9f7146ab084..7b3769b2971 100644
---- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
-@@ -4,27 +4,30 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_shipment = $block->getShipment() ?>
--<?php $_order = $block->getOrder() ?>
--<?php if ($_shipment && $_order && $_shipment->getAllTracks()): ?>
--<br />
--<table class="shipment-track">
--    <thead>
--        <tr>
--            <th><?= /* @escapeNotVerified */  __('Shipped By') ?></th>
--            <th><?= /* @escapeNotVerified */  __('Tracking Number') ?></th>
--        </tr>
--    </thead>
--    <tbody>
--    <?php foreach ($_shipment->getAllTracks() as $_item): ?>
--        <tr>
--            <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
--            <td><?= $block->escapeHtml($_item->getNumber()) ?></td>
--        </tr>
--    <?php endforeach ?>
--    </tbody>
--</table>
-+<?php
-+/* @var \Magento\Sales\Model\Order $_order */
-+$_order = $block->getOrder() ?>
-+<?php if ($_shipment && $_order) : ?>
-+    <?php $trackCollection = $_order->getTracksCollection($_shipment->getId()) ?>
-+    <?php if ($trackCollection) : ?>
-+        <br />
-+        <table class="shipment-track">
-+            <thead>
-+            <tr>
-+                <th><?= $block->escapeHtml(__('Shipped By')) ?></th>
-+                <th><?= $block->escapeHtml(__('Tracking Number')) ?></th>
-+            </tr>
-+            </thead>
-+            <tbody>
-+            <?php foreach ($trackCollection as $_item) : ?>
-+                <tr>
-+                    <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
-+                    <td><?= $block->escapeHtml($_item->getNumber()) ?></td>
-+                </tr>
-+            <?php endforeach ?>
-+            </tbody>
-+        </table>
-+    <?php endif; ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
-index 3ebca4d08b3..a8dd694f13e 100644
---- a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
-@@ -4,17 +4,18 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- ?>
--<form class="form form-orders-search" id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{}, "validation":{}}' action="<?= /* @escapeNotVerified */ $block->getActionUrl() ?>"
-+<form class="form form-orders-search"
-+      id="oar-widget-orders-and-returns-form"
-+      data-mage-init='{"ordersReturns":{}, "validation":{}}'
-+      action="<?= $block->escapeUrl($block->getActionUrl()) ?>"
-       method="post" name="guest_post">
-     <fieldset class="fieldset">
--        <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Order Information') ?></span></legend>
-+        <legend class="legend"><span><?= $block->escapeHtml(__('Order Information')) ?></span></legend>
-         <br>
- 
-         <div class="field id required">
--            <label class="label" for="oar-order-id"><span><?= /* @escapeNotVerified */ __('Order ID') ?></span></label>
-+            <label class="label" for="oar-order-id"><span><?= $block->escapeHtml(__('Order ID')) ?></span></label>
- 
-             <div class="control">
-                 <input type="text" class="input-text" id="oar-order-id" name="oar_order_id"
-@@ -22,7 +23,7 @@
-             </div>
-         </div>
-         <div class="field lastname required">
--            <label class="label" for="oar-billing-lastname"><span><?= /* @escapeNotVerified */ __('Billing Last Name') ?></span></label>
-+            <label class="label" for="oar-billing-lastname"><span><?= $block->escapeHtml(__('Billing Last Name')) ?></span></label>
- 
-             <div class="control">
-                 <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname"
-@@ -30,17 +31,17 @@
-             </div>
-         </div>
-         <div class="field find required">
--            <label class="label" for="quick-search-type-id"><span><?= /* @escapeNotVerified */ __('Find Order By') ?></span></label>
-+            <label class="label" for="quick-search-type-id"><span><?= $block->escapeHtml(__('Find Order By')) ?></span></label>
- 
-             <div class="control">
-                 <select name="oar_type" id="quick-search-type-id" class="select">
--                    <option value="email"><?= /* @escapeNotVerified */ __('Email') ?></option>
--                    <option value="zip"><?= /* @escapeNotVerified */ __('ZIP Code') ?></option>
-+                    <option value="email"><?= $block->escapeHtml(__('Email')) ?></option>
-+                    <option value="zip"><?= $block->escapeHtml(__('ZIP Code')) ?></option>
-                 </select>
-             </div>
-         </div>
-         <div id="oar-email" class="field email required">
--            <label class="label" for="oar_email"><span><?= /* @escapeNotVerified */ __('Email') ?></span></label>
-+            <label class="label" for="oar_email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
- 
-             <div class="control">
-                 <input type="email" class="input-text" id="oar_email" name="oar_email"
-@@ -48,7 +49,7 @@
-             </div>
-         </div>
-         <div id="oar-zip" class="field zip required">
--            <label class="label" for="oar_zip"><span><?= /* @escapeNotVerified */ __('Billing ZIP Code') ?></span></label>
-+            <label class="label" for="oar_zip"><span><?= $block->escapeHtml(__('Billing ZIP Code')) ?></span></label>
- 
-             <div class="control">
-                 <input type="text" class="input-text" id="oar_zip" name="oar_zip" data-validate="{required:true}"/>
-@@ -57,8 +58,8 @@
-     </fieldset>
-     <div class="actions-toolbar">
-         <div class="primary">
--            <button type="submit" title="<?= /* @escapeNotVerified */ __('Continue') ?>" class="action submit primary">
--                <span><?= /* @escapeNotVerified */ __('Continue') ?></span>
-+            <button type="submit" title="<?= $block->escapeHtml(__('Continue')) ?>" class="action submit primary">
-+                <span><?= $block->escapeHtml(__('Continue')) ?></span>
-             </button>
-         </div>
-     </div>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml b/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml
-index bcf740307af..73350c5b0c4 100644
---- a/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml
-@@ -4,13 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer $block */
- $_item = $block->getItem();
- ?>
- <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-     <span class="cart-price">
--        <?= /* @escapeNotVerified */ $block->getOrder()->formatPrice($block->getItem()->getRowTotal()) ?>
-+        <?= /* @noEscape */ $block->getOrder()->formatPrice($block->getItem()->getRowTotal()) ?>
-     </span>
- </span>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml b/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml
-index dfb476ee381..493f30fba59 100644
---- a/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml
-@@ -4,10 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer $block */
- $_item = $block->getItem();
- ?>
--<?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
--<?= /* @escapeNotVerified */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
-+<?php
-+/** @var \Magento\Sales\Model\Order $_order */
-+$_order = $block->getItem()->getOrderItem()->getOrder() ?>
-+<?= /* @noEscape */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml b/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml
-index 7a484fed719..1b2f15133da 100644
---- a/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml
-@@ -4,13 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer $block */
- $_item = $block->getItem();
- ?>
- <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-     <span class="cart-price">
--        <?= /* @escapeNotVerified */ $block->getOrder()->formatPrice($block->getItem()->getPrice()) ?>
-+        <?= /* @noEscape */ $block->getOrder()->formatPrice($block->getItem()->getPrice()) ?>
-     </span>
- </span>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/js/components.phtml b/app/code/Magento/Sales/view/frontend/templates/js/components.phtml
-index bad5acc209b..5902a9f25cc 100644
---- a/app/code/Magento/Sales/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/js/components.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml b/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
-index 589b8572399..448ced1d35f 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /**
-@@ -13,12 +10,15 @@
-  * @see \Magento\Sales\Block\Order\Comments
-  */
- ?>
--<?php if ($block->hasComments()):?>
-+<?php if ($block->hasComments()) : ?>
-     <div class="order additional details comments">
--        <h3 class="subtitle"><?= /* @escapeNotVerified */ $block->getTitle() ?></h3>
-+        <h3 class="subtitle"><?= $block->escapeHtml($block->getTitle()) ?></h3>
-         <dl class="order comments">
--            <?php foreach ($block->getComments() as $_commentItem): ?>
--                <dt class="comment date"><?= /* @escapeNotVerified */ $block->formatDate($_commentItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?></dt>
-+            <?php foreach ($block->getComments() as $_commentItem) : ?>
-+                <dt class="comment date">
-+                    <?= /* @noEscape */
-+                    $block->formatDate($_commentItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?>
-+                </dt>
-                 <dd class="comment text"><?= $block->escapeHtml($_commentItem->getComment()) ?></dd>
-             <?php endforeach; ?>
-         </dl>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
-index a6a9b64d2c7..3d8853bbe03 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
-@@ -3,13 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+/* @var $block \Magento\Sales\Block\Order\Creditmemo */
- ?>
- <div class="order-details-items creditmemo">
-     <?= $block->getChildHtml('creditmemo_items') ?>
-     <div class="actions-toolbar">
-         <div class="secondary">
--            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back">
--                <span><?= /* @escapeNotVerified */ $block->getBackTitle() ?></span>
-+            <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
-+                <span><?= $block->escapeHtml($block->getBackTitle()) ?></span>
-             </a>
-         </div>
-     </div>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
-index dc2cf2433ac..019baeea54e 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
-@@ -3,54 +3,51 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_order = $block->getOrder() ?>
- <div class="actions-toolbar">
--    <a href="<?= /* @escapeNotVerified */ $block->getPrintAllCreditmemosUrl($_order) ?>"
-+    <a href="<?= $block->escapeUrl($block->getPrintAllCreditmemosUrl($_order)) ?>"
-        onclick="this.target='_blank'"
-        class="action print">
--        <span><?= /* @escapeNotVerified */ __('Print All Refunds') ?></span>
--    </a>
--</div>
--<?php foreach ($_order->getCreditmemosCollection() as $_creditmemo): ?>
--<div class="order-title">
--    <strong><?= /* @escapeNotVerified */ __('Refund #') ?><?= /* @escapeNotVerified */ $_creditmemo->getIncrementId() ?> </strong>
--    <a href="<?= /* @escapeNotVerified */ $block->getPrintCreditmemoUrl($_creditmemo) ?>"
--       onclick="this.target='_blank'"
--       class="action print">
--        <span><?= /* @escapeNotVerified */ __('Print Refund') ?></span>
-+        <span><?= $block->escapeHtml(__('Print All Refunds')) ?></span>
-     </a>
- </div>
-+<?php foreach ($_order->getCreditmemosCollection() as $_creditmemo) : ?>
-+    <div class="order-title">
-+        <strong><?= $block->escapeHtml(__('Refund #')) ?><?= $block->escapeHtml($_creditmemo->getIncrementId()) ?> </strong>
-+        <a href="<?= $block->escapeUrl($block->getPrintCreditmemoUrl($_creditmemo)) ?>"
-+           onclick="this.target='_blank'"
-+           class="action print">
-+            <span><?= $block->escapeHtml(__('Print Refund')) ?></span>
-+        </a>
-+    </div>
- 
--<div class="table-wrapper order-items-creditmemo">
--    <table class="data table table-order-items creditmemo" id="my-refund-table-<?= /* @escapeNotVerified */ $_creditmemo->getId() ?>">
--        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Refunded') ?></caption>
--        <thead>
--            <tr>
--                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
--                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
--                <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
--                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
--                <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
--                <th class="col discount"><?= /* @escapeNotVerified */ __('Discount Amount') ?></th>
--                <th class="col total"><?= /* @escapeNotVerified */ __('Row Total') ?></th>
--            </tr>
--        </thead>
--        <?php $_items = $_creditmemo->getAllItems(); ?>
--        <?php foreach ($_items as $_item): ?>
--            <?php if (!$_item->getOrderItem()->getParentItem()): ?>
--                <tbody>
--                    <?= $block->getItemHtml($_item) ?>
--                </tbody>
--            <?php endif; ?>
--        <?php endforeach; ?>
--        <tfoot>
--            <?= $block->getTotalsHtml($_creditmemo) ?>
--        </tfoot>
--    </table>
--</div>
--<?= $block->getCommentsHtml($_creditmemo) ?>
-+    <div class="table-wrapper order-items-creditmemo">
-+        <table class="data table table-order-items creditmemo" id="my-refund-table-<?= (int) $_creditmemo->getId() ?>">
-+            <caption class="table-caption"><?= $block->escapeHtml(__('Items Refunded')) ?></caption>
-+            <thead>
-+                <tr>
-+                    <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
-+                    <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-+                    <th class="col price"><?= $block->escapeHtml(__('Price')) ?></th>
-+                    <th class="col qty"><?= $block->escapeHtml(__('Qty')) ?></th>
-+                    <th class="col subtotal"><?= $block->escapeHtml(__('Subtotal')) ?></th>
-+                    <th class="col discount"><?= $block->escapeHtml(__('Discount Amount')) ?></th>
-+                    <th class="col total"><?= $block->escapeHtml(__('Row Total')) ?></th>
-+                </tr>
-+            </thead>
-+            <?php $_items = $_creditmemo->getAllItems(); ?>
-+            <?php foreach ($_items as $_item) : ?>
-+                <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-+                    <tbody>
-+                        <?= $block->getItemHtml($_item) ?>
-+                    </tbody>
-+                <?php endif; ?>
-+            <?php endforeach; ?>
-+            <tfoot>
-+                <?= $block->getTotalsHtml($_creditmemo) ?>
-+            </tfoot>
-+        </table>
-+    </div>
-+    <?= $block->getCommentsHtml($_creditmemo) ?>
- <?php endforeach; ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
-index 2dbef1f4859..27e7715c2dc 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
-@@ -3,45 +3,44 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var  $block \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */ ?>
- <?php $_item = $block->getItem() ?>
- <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
--<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
--    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
-+<tr id="order-item-row-<?= (int) $_item->getId() ?>">
-+    <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
-         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
--        <?php if ($_options = $block->getItemOptions()): ?>
--        <dl class="item-options">
--        <?php foreach ($_options as $_option) : ?>
--            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--            <?php if (!$block->getPrintStatus()): ?>
--                <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
--                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
--                    <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
--                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
--                    <div class="tooltip content">
--                        <dl class="item options">
--                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                            <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
--                        </dl>
--                    </div>
--                    <?php endif; ?>
--                </dd>
--            <?php else: ?>
--                <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
--            <?php endif; ?>
--        <?php endforeach; ?>
--        </dl>
-+        <?php if ($_options = $block->getItemOptions()) : ?>
-+            <dl class="item-options">
-+            <?php foreach ($_options as $_option) : ?>
-+                <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-+                <?php if (!$block->getPrintStatus()) : ?>
-+                    <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-+                    <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
-+                        <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
-+                        <?php if (isset($_formatedOptionValue['full_view'])) : ?>
-+                        <div class="tooltip content">
-+                            <dl class="item options">
-+                                <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-+                                <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
-+                            </dl>
-+                        </div>
-+                        <?php endif; ?>
-+                    </dd>
-+                <?php else : ?>
-+                    <dd>
-+                        <?= $block->escapeHtml($_option['print_value'] ?? $_option['value']) ?>
-+                    </dd>
-+                <?php endif; ?>
-+            <?php endforeach; ?>
-+            </dl>
-         <?php endif; ?>
- 
-         <?php /* downloadable */ ?>
--        <?php if ($links = $block->getLinks()): ?>
-+        <?php if ($links = $block->getLinks()) : ?>
-             <dl class="item options">
--                <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
--                <?php foreach ($links->getPurchasedItems() as $link): ?>
-+                <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
-+                <?php foreach ($links->getPurchasedItems() as $link) : ?>
-                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
-                 <?php endforeach; ?>
-             </dl>
-@@ -49,20 +48,20 @@
-         <?php /* EOF downloadable */ ?>
- 
-         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
--        <?php if ($addInfoBlock) :?>
-+        <?php if ($addInfoBlock) : ?>
-             <?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
-     </td>
--    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
-+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
-     <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-         <?= $block->getItemPriceHtml() ?>
-     </td>
--    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
-+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= (int) $_item->getQty() ?></td>
-     <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
-         <?= $block->getItemRowTotalHtml() ?>
-     </td>
--    <td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>"><?= /* @escapeNotVerified */ $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
-+    <td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>"><?= /* @noEscape */ $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
-     <td class="col total" data-th="<?= $block->escapeHtml(__('Row Total')) ?>">
-         <?= $block->getItemRowTotalAfterDiscountHtml() ?>
-     </td>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
-index 1c02a5c31ea..ef56ad69dcb 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
-@@ -4,49 +4,50 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
-+/** @var \Magento\Sales\Block\Order\History $block */
- ?>
- <?php $_orders = $block->getOrders(); ?>
- <?= $block->getChildHtml('info') ?>
--<?php if ($_orders && count($_orders)): ?>
-+<?php if ($_orders && count($_orders)) : ?>
-     <div class="table-wrapper orders-history">
-         <table class="data table table-order-items history" id="my-orders-table">
--            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Orders') ?></caption>
-+            <caption class="table-caption"><?= $block->escapeHtml(__('Orders')) ?></caption>
-             <thead>
-                 <tr>
--                    <th scope="col" class="col id"><?= /* @escapeNotVerified */ __('Order #') ?></th>
--                    <th scope="col" class="col date"><?= /* @escapeNotVerified */ __('Date') ?></th>
--                    <?= /* @noEscape */ $block->getChildHtml('extra.column.header') ?>
--                    <th scope="col" class="col shipping"><?= /* @escapeNotVerified */ __('Ship To') ?></th>
--                    <th scope="col" class="col total"><?= /* @escapeNotVerified */ __('Order Total') ?></th>
--                    <th scope="col" class="col status"><?= /* @escapeNotVerified */ __('Status') ?></th>
--                    <th scope="col" class="col actions"><?= /* @escapeNotVerified */ __('Action') ?></th>
-+                    <th scope="col" class="col id"><?= $block->escapeHtml(__('Order #')) ?></th>
-+                    <th scope="col" class="col date"><?= $block->escapeHtml(__('Date')) ?></th>
-+                    <?= $block->getChildHtml('extra.column.header') ?>
-+                    <th scope="col" class="col shipping"><?= $block->escapeHtml(__('Ship To')) ?></th>
-+                    <th scope="col" class="col total"><?= $block->escapeHtml(__('Order Total')) ?></th>
-+                    <th scope="col" class="col status"><?= $block->escapeHtml(__('Status')) ?></th>
-+                    <th scope="col" class="col actions"><?= $block->escapeHtml(__('Action')) ?></th>
-                 </tr>
-             </thead>
-             <tbody>
--                <?php foreach ($_orders as $_order): ?>
-+                <?php foreach ($_orders as $_order) : ?>
-                     <tr>
--                        <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id"><?= /* @escapeNotVerified */ $_order->getRealOrderId() ?></td>
--                        <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= /* @escapeNotVerified */ $block->formatDate($_order->getCreatedAt()) ?></td>
-+                        <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id"><?= $block->escapeHtml($_order->getRealOrderId()) ?></td>
-+                        <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= /* @noEscape */ $block->formatDate($_order->getCreatedAt()) ?></td>
-                         <?php $extra = $block->getChildBlock('extra.container'); ?>
--                        <?php if ($extra): ?>
-+                        <?php if ($extra) : ?>
-                             <?php $extra->setOrder($_order); ?>
--                            <?= /* @noEscape */ $extra->getChildHtml() ?>
-+                            <?= $extra->getChildHtml() ?>
-                         <?php endif; ?>
-                         <td data-th="<?= $block->escapeHtml(__('Ship To')) ?>" class="col shipping"><?= $_order->getShippingAddress() ? $block->escapeHtml($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
--                        <td data-th="<?= $block->escapeHtml(__('Order Total')) ?>" class="col total"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getGrandTotal()) ?></td>
--                        <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status"><?= /* @escapeNotVerified */ $_order->getStatusLabel() ?></td>
-+                        <td data-th="<?= $block->escapeHtml(__('Order Total')) ?>" class="col total"><?= /* @noEscape */ $_order->formatPrice($_order->getGrandTotal()) ?></td>
-+                        <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status"><?= $block->escapeHtml($_order->getStatusLabel()) ?></td>
-                         <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
--                            <a href="<?= /* @escapeNotVerified */ $block->getViewUrl($_order) ?>" class="action view">
--                                <span><?= /* @escapeNotVerified */ __('View Order') ?></span>
-+                            <a href="<?= $block->escapeUrl($block->getViewUrl($_order)) ?>" class="action view">
-+                                <span><?= $block->escapeHtml(__('View Order')) ?></span>
-                             </a>
--                            <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
--                                <a href="#" data-post='<?php /* @escapeNotVerified */ echo
-+                            <?php if ($this->helper(\Magento\Sales\Helper\Reorder::class)->canReorder($_order->getEntityId())) : ?>
-+                                <a href="#" data-post='<?= /* @noEscape */
-                                 $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
-                                     ->getPostData($block->getReorderUrl($_order))
-                                 ?>' class="action order">
--                                    <span><?= /* @escapeNotVerified */ __('Reorder') ?></span>
-+                                    <span><?= $block->escapeHtml(__('Reorder')) ?></span>
-                                 </a>
-                             <?php endif ?>
-                         </td>
-@@ -55,9 +56,9 @@
-             </tbody>
-         </table>
-     </div>
--    <?php if ($block->getPagerHtml()): ?>
-+    <?php if ($block->getPagerHtml()) : ?>
-         <div class="order-products-toolbar toolbar bottom"><?= $block->getPagerHtml() ?></div>
-     <?php endif ?>
--<?php else: ?>
--    <div class="message info empty"><span><?= /* @escapeNotVerified */ __('You have placed no orders.') ?></span></div>
-+<?php else : ?>
-+    <div class="message info empty"><span><?= $block->escapeHtml(__('You have placed no orders.')) ?></span></div>
- <?php endif ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
-index 2a31814d9a0..1bf05f4fed7 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
-@@ -3,50 +3,47 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Sales\Block\Order\Info */ ?>
- <?php $_order = $block->getOrder() ?>
- <div class="block block-order-details-view">
-     <div class="block-title">
--        <strong><?= /* @escapeNotVerified */ __('Order Information') ?></strong>
-+        <strong><?= $block->escapeHtml(__('Order Information')) ?></strong>
-     </div>
-     <div class="block-content">
--    <?php if (!$_order->getIsVirtual()): ?>
--        <div class="box box-order-shipping-address">
--            <strong class="box-title"><span><?= /* @escapeNotVerified */ __('Shipping Address') ?></span></strong>
--            <div class="box-content">
--                <address><?= /* @escapeNotVerified */ $block->getFormattedAddress($_order->getShippingAddress()) ?></address>
-+        <?php if (!$_order->getIsVirtual()) : ?>
-+            <div class="box box-order-shipping-address">
-+                <strong class="box-title"><span><?= $block->escapeHtml(__('Shipping Address')) ?></span></strong>
-+                <div class="box-content">
-+                    <address><?= /* @noEscape */ $block->getFormattedAddress($_order->getShippingAddress()) ?></address>
-+                </div>
-             </div>
--        </div>
- 
--        <div class="box box-order-shipping-method">
--            <strong class="box-title">
--                <span><?= /* @escapeNotVerified */ __('Shipping Method') ?></span>
--            </strong>
--            <div class="box-content">
--            <?php if ($_order->getShippingDescription()): ?>
--                <?= $block->escapeHtml($_order->getShippingDescription()) ?>
--            <?php else: ?>
--                <?= /* @escapeNotVerified */ __('No shipping information available') ?>
--            <?php endif; ?>
-+            <div class="box box-order-shipping-method">
-+                <strong class="box-title">
-+                    <span><?= $block->escapeHtml(__('Shipping Method')) ?></span>
-+                </strong>
-+                <div class="box-content">
-+                <?php if ($_order->getShippingDescription()) : ?>
-+                    <?= $block->escapeHtml($_order->getShippingDescription()) ?>
-+                <?php else : ?>
-+                    <?= $block->escapeHtml(__('No shipping information available')) ?>
-+                <?php endif; ?>
-+                </div>
-             </div>
--        </div>
--    <?php endif; ?>
-+        <?php endif; ?>
- 
-         <div class="box box-order-billing-address">
-             <strong class="box-title">
--                <span><?= /* @escapeNotVerified */ __('Billing Address') ?></span>
-+                <span><?= $block->escapeHtml(__('Billing Address')) ?></span>
-             </strong>
-             <div class="box-content">
--                <address><?= /* @escapeNotVerified */ $block->getFormattedAddress($_order->getBillingAddress()) ?></address>
-+                <address><?= /* @noEscape */ $block->getFormattedAddress($_order->getBillingAddress()) ?></address>
-             </div>
-         </div>
-         <div class="box box-order-billing-method">
-             <strong class="box-title">
--                <span><?= /* @escapeNotVerified */ __('Payment Method') ?></span>
-+                <span><?= $block->escapeHtml(__('Payment Method')) ?></span>
-             </strong>
-             <div class="box-content">
-                 <?= $block->getPaymentInfoHtml() ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
-index fa3f63b61cd..6b87d3c2233 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
-@@ -4,23 +4,22 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <div class="actions">
--    <?php  $_order = $block->getOrder() ?>
--    <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
--        <a href="#" data-post='<?php /* @escapeNotVerified */ echo
--        $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
-+    <?php $_order = $block->getOrder() ?>
-+    <?php if ($this->helper(\Magento\Sales\Helper\Reorder::class)->canReorder($_order->getEntityId())) : ?>
-+        <a href="#" data-post='<?=
-+        /* @noEscape */ $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
-             ->getPostData($block->getReorderUrl($_order))
-         ?>' class="action order">
--            <span><?= /* @escapeNotVerified */ __('Reorder') ?></span>
-+            <span><?= $block->escapeHtml(__('Reorder')) ?></span>
-         </a>
-     <?php endif ?>
-     <a class="action print"
--       href="<?= /* @escapeNotVerified */ $block->getPrintUrl($_order) ?>"
-+       href="<?= $block->escapeUrl($block->getPrintUrl($_order)) ?>"
-        onclick="this.target='_blank';">
--        <span><?= /* @escapeNotVerified */ __('Print Order') ?></span>
-+        <span><?= $block->escapeHtml(__('Print Order')) ?></span>
-     </a>
-     <?= $block->getChildHtml() ?>
- </div>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
-index 3ea1bf6452c..e29d1aa1f84 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
-@@ -4,12 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Sales\Block\Order\Info\Buttons\Rss */
- ?>
--<?php if ($block->isRssAllowed() && $block->getLink()): ?>
--<a href="<?= /* @escapeNotVerified */ $block->getLink() ?>" class="action rss">
--    <span><?= /* @escapeNotVerified */ $block->getLabel() ?></span>
--</a>
-+<?php if ($block->isRssAllowed() && $block->getLink()) : ?>
-+    <a href="<?= $block->escapeHtmlAttr($block->getLink()) ?>" class="action rss">
-+        <span><?= $block->escapeHtml($block->getLabel()) ?></span>
-+    </a>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
-index 699067dc961..017331ad72b 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
-@@ -3,13 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+/* @var $block \Magento\Sales\Block\Order\Invoice */
- ?>
- <div class="order-details-items invoice">
-     <?= $block->getChildHtml('invoice_items') ?>
-     <div class="actions-toolbar">
-         <div class="secondary">
--            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back">
--                <span><?= /* @escapeNotVerified */ $block->getBackTitle() ?></span>
-+            <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
-+                <span><?= $block->escapeHtml($block->getBackTitle()) ?></span>
-             </a>
-         </div>
-     </div>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
-index 0f3236ec25b..419060bfba7 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
-@@ -3,51 +3,48 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_order = $block->getOrder() ?>
- <div class="actions-toolbar">
--    <a href="<?= /* @escapeNotVerified */ $block->getPrintAllInvoicesUrl($_order) ?>"
-+    <a href="<?= $block->escapeUrl($block->getPrintAllInvoicesUrl($_order)) ?>"
-        target="_blank"
-        class="action print">
--        <span><?= /* @escapeNotVerified */ __('Print All Invoices') ?></span>
-+        <span><?= $block->escapeHtml(__('Print All Invoices')) ?></span>
-     </a>
- </div>
--<?php foreach ($_order->getInvoiceCollection() as $_invoice): ?>
--<div class="order-title">
--    <strong><?= /* @escapeNotVerified */ __('Invoice #') ?><?= /* @escapeNotVerified */ $_invoice->getIncrementId() ?></strong>
--    <a href="<?= /* @escapeNotVerified */ $block->getPrintInvoiceUrl($_invoice) ?>"
--       onclick="this.target='_blank'"
--       class="action print">
--        <span><?= /* @escapeNotVerified */ __('Print Invoice') ?></span>
--    </a>
--</div>
--<div class="table-wrapper table-order-items invoice">
--    <table class="data table table-order-items invoice" id="my-invoice-table-<?= /* @escapeNotVerified */ $_invoice->getId() ?>">
--        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Invoiced') ?></caption>
--        <thead>
--            <tr>
--                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
--                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
--                <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
--                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty Invoiced') ?></th>
--                <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
--            </tr>
--        </thead>
--        <?php $_items = $_invoice->getAllItems(); ?>
--        <?php foreach ($_items as $_item): ?>
--            <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
--                <tbody>
--                    <?= $block->getItemHtml($_item) ?>
--                </tbody>
--            <?php endif; ?>
--        <?php endforeach; ?>
--        <tfoot>
--            <?= $block->getInvoiceTotalsHtml($_invoice) ?>
--        </tfoot>
--    </table>
--</div>
--<?= $block->getInvoiceCommentsHtml($_invoice) ?>
-+<?php foreach ($_order->getInvoiceCollection() as $_invoice) : ?>
-+    <div class="order-title">
-+        <strong><?= $block->escapeHtml(__('Invoice #')) ?><?= $block->escapeHtml($_invoice->getIncrementId()) ?></strong>
-+        <a href="<?= $block->escapeUrl($block->getPrintInvoiceUrl($_invoice)) ?>"
-+           onclick="this.target='_blank'"
-+           class="action print">
-+            <span><?= $block->escapeHtml(__('Print Invoice')) ?></span>
-+        </a>
-+    </div>
-+    <div class="table-wrapper table-order-items invoice">
-+        <table class="data table table-order-items invoice" id="my-invoice-table-<?= (int) $_invoice->getId() ?>">
-+            <caption class="table-caption"><?= $block->escapeHtml(__('Items Invoiced')) ?></caption>
-+            <thead>
-+                <tr>
-+                    <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
-+                    <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-+                    <th class="col price"><?= $block->escapeHtml(__('Price')) ?></th>
-+                    <th class="col qty"><?= $block->escapeHtml(__('Qty Invoiced')) ?></th>
-+                    <th class="col subtotal"><?= $block->escapeHtml(__('Subtotal')) ?></th>
-+                </tr>
-+            </thead>
-+            <?php $_items = $_invoice->getAllItems(); ?>
-+            <?php foreach ($_items as $_item) : ?>
-+                <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-+                    <tbody>
-+                        <?= $block->getItemHtml($_item) ?>
-+                    </tbody>
-+                <?php endif; ?>
-+            <?php endforeach; ?>
-+            <tfoot>
-+                <?= $block->getInvoiceTotalsHtml($_invoice) ?>
-+            </tfoot>
-+        </table>
-+    </div>
-+    <?= $block->getInvoiceCommentsHtml($_invoice) ?>
- <?php endforeach; ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
-index c17c46d5f94..ece72e9119d 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
-@@ -3,38 +3,35 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var  $block \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */ ?>
- <?php $_item = $block->getItem() ?>
- <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
--<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
-+<tr id="order-item-row-<?= (int) $_item->getId() ?>">
-     <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
-         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
--        <?php if ($_options = $block->getItemOptions()): ?>
--        <dl class="item-options">
--        <?php foreach ($_options as $_option) : ?>
--            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--            <?php if (!$block->getPrintStatus()): ?>
--                <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
--                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
--                    <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
--                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
--                    <div class="tooltip content">
--                        <dl class="item options">
--                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                            <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
--                        </dl>
--                    </div>
--                    <?php endif; ?>
--                </dd>
--            <?php else: ?>
--                <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
--            <?php endif; ?>
--        <?php endforeach; ?>
--        </dl>
-+        <?php if ($_options = $block->getItemOptions()) : ?>
-+            <dl class="item-options">
-+            <?php foreach ($_options as $_option) : ?>
-+                <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-+                <?php if (!$block->getPrintStatus()) : ?>
-+                    <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-+                    <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
-+                        <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
-+                        <?php if (isset($_formatedOptionValue['full_view'])) : ?>
-+                            <div class="tooltip content">
-+                                <dl class="item options">
-+                                    <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-+                                    <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
-+                                </dl>
-+                            </div>
-+                        <?php endif; ?>
-+                    </dd>
-+                <?php else : ?>
-+                    <dd><?= $block->escapeHtml($_option['print_value'] ?? $_option['value']) ?></dd>
-+                <?php endif; ?>
-+            <?php endforeach; ?>
-+            </dl>
-         <?php endif; ?>
-         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
-         <?php if ($addInfoBlock) :?>
-@@ -42,12 +39,12 @@
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
-     </td>
--    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
-+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
-     <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-         <?= $block->getItemPriceHtml() ?>
-     </td>
-     <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Invoiced')) ?>">
--        <span class="qty summary"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></span>
-+        <span class="qty summary"><?= (int) $_item->getQty() ?></span>
-     </td>
-     <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
-         <?= $block->getItemRowTotalHtml() ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
-index e43d32760fe..98a1f1ebb75 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
-@@ -4,15 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var \Magento\Sales\Block\Order\Items $block */
- ?>
- <div class="table-wrapper order-items">
--    <table class="data table table-order-items" id="my-orders-table" summary="<?= /* @escapeNotVerified */ __('Items Ordered') ?>">
--        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Ordered') ?></caption>
-+    <table class="data table table-order-items" id="my-orders-table" summary="<?= $block->escapeHtml(__('Items Ordered')) ?>">
-+        <caption class="table-caption"><?= $block->escapeHtml(__('Items Ordered')) ?></caption>
-         <thead>
--            <?php if($block->isPagerDisplayed()): ?>
-+            <?php if ($block->isPagerDisplayed()) : ?>
-                 <tr>
-                     <td colspan="5" data-block="order-items-pager-top" class="order-pager-wrapper order-pager-wrapper-top">
-                         <?= $block->getPagerHtml() ?>
-@@ -20,52 +20,55 @@
-                 </tr>
-             <?php endif ?>
-             <tr>
--                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
--                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
--                <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
--                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
--                <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
-+                <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
-+                <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-+                <th class="col price"><?= $block->escapeHtml(__('Price')) ?></th>
-+                <th class="col qty"><?= $block->escapeHtml(__('Qty')) ?></th>
-+                <th class="col subtotal"><?= $block->escapeHtml(__('Subtotal')) ?></th>
-             </tr>
-         </thead>
-         <?php $items = $block->getItems(); ?>
-         <?php $giftMessage = ''?>
--        <?php foreach ($items as $item): ?>
--            <?php if ($item->getParentItem()) continue; ?>
--            <tbody>
-+        <tbody>
-+        <?php foreach ($items as $item) :
-+            if ($item->getParentItem()) :
-+                continue;
-+            endif;
-+            ?>
-                 <?= $block->getItemHtml($item) ?>
--                <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $item) && $item->getGiftMessageId()): ?>
--                    <?php $giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($item); ?>
-+                <?php if ($this->helper(\Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $item) && $item->getGiftMessageId()) : ?>
-+                    <?php $giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessageForEntity($item); ?>
-                     <tr>
-                         <td class="col options" colspan="5">
-                             <a href="#"
--                               id="order-item-gift-message-link-<?= /* @escapeNotVerified */ $item->getId() ?>"
-+                               id="order-item-gift-message-link-<?= (int) $item->getId() ?>"
-                                class="action show"
--                               aria-controls="order-item-gift-message-<?= /* @escapeNotVerified */ $item->getId() ?>"
--                               data-item-id="<?= /* @escapeNotVerified */ $item->getId() ?>">
--                                <?= /* @escapeNotVerified */ __('Gift Message') ?>
-+                               aria-controls="order-item-gift-message-<?= (int) $item->getId() ?>"
-+                               data-item-id="<?= (int) $item->getId() ?>">
-+                                <?= $block->escapeHtml(__('Gift Message')) ?>
-                             </a>
--                            <?php $giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($item); ?>
--                            <div class="order-gift-message" id="order-item-gift-message-<?= /* @escapeNotVerified */ $item->getId() ?>" role="region" aria-expanded="false" tabindex="-1">
-+                            <?php $giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessageForEntity($item); ?>
-+                            <div class="order-gift-message" id="order-item-gift-message-<?= (int) $item->getId() ?>" role="region" aria-expanded="false" tabindex="-1">
-                                 <a href="#"
--                                   title="<?= /* @escapeNotVerified */ __('Close') ?>"
--                                   aria-controls="order-item-gift-message-<?= /* @escapeNotVerified */ $item->getId() ?>"
--                                   data-item-id="<?= /* @escapeNotVerified */ $item->getId() ?>"
-+                                   title="<?= $block->escapeHtml(__('Close')) ?>"
-+                                   aria-controls="order-item-gift-message-<?= (int) $item->getId() ?>"
-+                                   data-item-id="<?= (int) $item->getId() ?>"
-                                    class="action close">
--                                    <?= /* @escapeNotVerified */ __('Close') ?>
-+                                    <?= $block->escapeHtml(__('Close')) ?>
-                                 </a>
-                                 <dl class="item-options">
--                                    <dt class="item-sender"><strong class="label"><?= /* @escapeNotVerified */ __('From') ?></strong><?= $block->escapeHtml($giftMessage->getSender()) ?></dt>
--                                    <dt class="item-recipient"><strong class="label"><?= /* @escapeNotVerified */ __('To') ?></strong><?= $block->escapeHtml($giftMessage->getRecipient()) ?></dt>
--                                    <dd class="item-message"><?= /* @escapeNotVerified */ $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($item) ?></dd>
-+                                    <dt class="item-sender"><strong class="label"><?= $block->escapeHtml(__('From')) ?></strong><?= $block->escapeHtml($giftMessage->getSender()) ?></dt>
-+                                    <dt class="item-recipient"><strong class="label"><?= $block->escapeHtml(__('To')) ?></strong><?= $block->escapeHtml($giftMessage->getRecipient()) ?></dt>
-+                                    <dd class="item-message"><?= /* @noEscape */ $this->helper(\Magento\GiftMessage\Helper\Message::class)->getEscapedGiftMessage($item) ?></dd>
-                                 </dl>
-                             </div>
-                         </td>
-                     </tr>
-                 <?php endif ?>
--            </tbody>
-         <?php endforeach; ?>
-+        </tbody>
-         <tfoot>
--            <?php if($block->isPagerDisplayed()): ?>
-+            <?php if ($block->isPagerDisplayed()) : ?>
-                 <tr>
-                     <td colspan="5" data-block="order-items-pager-bottom" class="order-pager-wrapper order-pager-wrapper-bottom">
-                         <?= $block->getPagerHtml() ?>
-@@ -76,7 +79,7 @@
-         </tfoot>
-     </table>
- </div>
--<?php if ($giftMessage): ?>
-+<?php if ($giftMessage) : ?>
- <script type="text/x-magento-init">
-     {
-         "a.action.show, a.action.close": {
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
-index 227866b8e1c..aec0ec6b4fe 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
-@@ -4,69 +4,67 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var  $block \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */
- $_item = $block->getItem();
- ?>
--<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
-+<tr id="order-item-row-<?= (int) $_item->getId() ?>">
-     <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
-         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
--        <?php if ($_options = $block->getItemOptions()): ?>
--        <dl class="item-options">
--        <?php foreach ($_options as $_option) : ?>
--            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--            <?php if (!$block->getPrintStatus()): ?>
--                <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
--                <dd>
--                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
--                        <?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
--                    <?php else: ?>
--                        <?=$block->escapeHtml($_formatedOptionValue['value']) ?>
--                    <?php endif; ?>
--                </dd>
--            <?php else: ?>
--                <dd>
--                    <?= nl2br($block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value']))) ?>
--                </dd>
--            <?php endif; ?>
--        <?php endforeach; ?>
--        </dl>
-+        <?php if ($_options = $block->getItemOptions()) : ?>
-+            <dl class="item-options">
-+            <?php foreach ($_options as $_option) : ?>
-+                <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-+                <?php if (!$block->getPrintStatus()) : ?>
-+                    <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-+                    <dd>
-+                        <?php if (isset($_formatedOptionValue['full_view'])) : ?>
-+                            <?= $block->escapeHtml($_formatedOptionValue['full_view'], ['a']) ?>
-+                        <?php else : ?>
-+                            <?=$block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
-+                        <?php endif; ?>
-+                    </dd>
-+                <?php else : ?>
-+                    <dd>
-+                        <?= /* @noEscape */ nl2br($block->escapeHtml($_option['print_value'] ?? $_option['value'])) ?>
-+                    </dd>
-+                <?php endif; ?>
-+            <?php endforeach; ?>
-+            </dl>
-         <?php endif; ?>
-         <?php $addtInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
--        <?php if ($addtInfoBlock) :?>
-+        <?php if ($addtInfoBlock) : ?>
-             <?= $addtInfoBlock->setItem($_item)->toHtml() ?>
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
-     </td>
--    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
-+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
-     <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-         <?= $block->getItemPriceHtml() ?>
-     </td>
-     <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
-         <ul class="items-qty">
--        <?php if ($block->getItem()->getQtyOrdered() > 0): ?>
-+        <?php if ($block->getItem()->getQtyOrdered() > 0) : ?>
-             <li class="item">
--                <span class="title"><?= /* @escapeNotVerified */ __('Ordered') ?></span>
--                <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyOrdered()*1 ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Ordered')) ?></span>
-+                <span class="content"><?= (int) $block->getItem()->getQtyOrdered() ?></span>
-             </li>
-         <?php endif; ?>
--        <?php if ($block->getItem()->getQtyShipped() > 0): ?>
-+        <?php if ($block->getItem()->getQtyShipped() > 0) : ?>
-             <li class="item">
--                <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
--                <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyShipped()*1 ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Shipped')) ?></span>
-+                <span class="content"><?= (int) $block->getItem()->getQtyShipped() ?></span>
-             </li>
-         <?php endif; ?>
--        <?php if ($block->getItem()->getQtyCanceled() > 0): ?>
-+        <?php if ($block->getItem()->getQtyCanceled() > 0) : ?>
-             <li class="item">
--                <span class="title"><?= /* @escapeNotVerified */ __('Canceled') ?></span>
--                <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyCanceled()*1 ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Canceled')) ?></span>
-+                <span class="content"><?= (int) $block->getItem()->getQtyCanceled() ?></span>
-             </li>
-         <?php endif; ?>
--        <?php if ($block->getItem()->getQtyRefunded() > 0): ?>
-+        <?php if ($block->getItem()->getQtyRefunded() > 0) : ?>
-             <li class="item">
--                <span class="title"><?= /* @escapeNotVerified */ __('Refunded') ?></span>
--                <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyRefunded()*1 ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Refunded')) ?></span>
-+                <span class="content"><?= (int) $block->getItem()->getQtyRefunded() ?></span>
-             </li>
-         <?php endif; ?>
-         </ul>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
-index 8a8e7b1194c..6f2d8d87ade 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
-@@ -3,24 +3,23 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var  $block \Magento\Sales\Block\Order\View*/?>
- 
- <?php $_history = $block->getOrder()->getVisibleStatusHistory() ?>
--<?php if (count($_history)): ?>
-+<?php if (!empty($_history)) : ?>
-     <div class="block block-order-details-comments">
--        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('About Your Order') ?></strong></div>
-+        <div class="block-title"><strong><?= $block->escapeHtml(__('About Your Order')) ?></strong></div>
-         <div class="block-content">
-             <dl class="order-comments">
--                <?php foreach ($_history as $_historyItem): ?>
--                    <dt class="comment-date"><?= /* @escapeNotVerified */ $block->formatDate($_historyItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?></dt>
-+                <?php foreach ($_history as $_historyItem) : ?>
-+                    <dt class="comment-date">
-+                        <?= /* @noEscape */
-+                        $block->formatDate($_historyItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?>
-+                    </dt>
-                     <dd class="comment-content"><?= $block->escapeHtml($_historyItem->getComment()) ?></dd>
-                 <?php endforeach; ?>
-             </dl>
--
-         </div>
-     </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
-index bcd7cc6e026..80a0ea02499 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
-@@ -3,11 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--
- <div class="order-date">
--    <?= /* @escapeNotVerified */ __('<span class="label">Order Date:</span> %1', '<date>' . $block->formatDate($block->getOrder()->getCreatedAt(), \IntlDateFormatter::LONG) . '</date>') ?>
-+    <?= $block->escapeHtml(__('<span class="label">Order Date:</span> %1', '<date>' . $block->formatDate($block->getOrder()->getCreatedAt(), \IntlDateFormatter::LONG) . '</date>'), ['span', 'date']) ?>
- </div>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml
-index c77014d1bf8..7a3ff4398d9 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml
-@@ -6,4 +6,4 @@
- ?>
- <?php /** @var $block \Magento\Sales\Block\Order\Info */ ?>
- 
--<span class="order-status"><?= /* @escapeNotVerified */ $block->getOrder()->getStatusLabel() ?></span>
-+<span class="order-status"><?= $block->escapeHtml($block->getOrder()->getStatusLabel()) ?></span>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
-index 567dfc20f2d..05c6048ee15 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
-@@ -3,39 +3,36 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_order = $block->getOrder() ?>
- <?php $_creditmemo = $block->getCreditmemo() ?>
--<?php if ($_creditmemo): ?>
-+<?php if ($_creditmemo) : ?>
-     <?php $_creditmemos = [$_creditmemo]; ?>
--<?php else: ?>
-+<?php else : ?>
-     <?php $_creditmemos = $_order->getCreditmemosCollection() ?>
- <?php endif; ?>
--<?php foreach ($_creditmemos as $_creditmemo): ?>
-+<?php foreach ($_creditmemos as $_creditmemo) : ?>
- <div class="order-details-items creditmemo">
-     <div class="order-title">
--        <strong><?= /* @escapeNotVerified */ __('Refund #%1', $_creditmemo->getIncrementId()) ?></strong>
-+        <strong><?= $block->escapeHtml(__('Refund #%1', $_creditmemo->getIncrementId())) ?></strong>
-     </div>
-     <div class="table-wrapper order-items-creditmemo">
--        <table class="data table table-order-items creditmemo" id="my-refund-table-<?= /* @escapeNotVerified */ $_creditmemo->getId() ?>">
--            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Refunded') ?></caption>
-+        <table class="data table table-order-items creditmemo" id="my-refund-table-<?= (int) $_creditmemo->getId() ?>">
-+            <caption class="table-caption"><?= $block->escapeHtml(__('Items Refunded')) ?></caption>
-             <thead>
-                 <tr>
--                    <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
--                    <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
--                    <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
--                    <th class="col qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
--                    <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
--                    <th class="col discount"><?= /* @escapeNotVerified */ __('Discount Amount') ?></th>
--                    <th class="col rowtotal"><?= /* @escapeNotVerified */ __('Row Total') ?></th>
-+                    <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
-+                    <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-+                    <th class="col price"><?= $block->escapeHtml(__('Price')) ?></th>
-+                    <th class="col qty"><?= $block->escapeHtml(__('Qty')) ?></th>
-+                    <th class="col subtotal"><?= $block->escapeHtml(__('Subtotal')) ?></th>
-+                    <th class="col discount"><?= $block->escapeHtml(__('Discount Amount')) ?></th>
-+                    <th class="col rowtotal"><?= $block->escapeHtml(__('Row Total')) ?></th>
-                 </tr>
-             </thead>
-             <?php $_items = $_creditmemo->getAllItems(); ?>
--            <?php foreach ($_items as $_item): ?>
--                <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-+            <?php foreach ($_items as $_item) : ?>
-+                <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-                     <tbody>
-                         <?= $block->getItemHtml($_item) ?>
-                     </tbody>
-@@ -48,22 +45,22 @@
-     </div>
-     <div class="block block-order-details-view">
-         <div class="block-title">
--            <strong><?= /* @escapeNotVerified */ __('Order Information') ?></strong>
-+            <strong><?= $block->escapeHtml(__('Order Information')) ?></strong>
-         </div>
-         <div class="block-content">
--        <?php if (!$_order->getIsVirtual()): ?>
-+        <?php if (!$_order->getIsVirtual()) : ?>
-             <div class="box box-order-shipping-address">
-                 <div class="box-title">
--                    <strong><?= /* @escapeNotVerified */ __('Shipping Address') ?></strong>
-+                    <strong><?= $block->escapeHtml(__('Shipping Address')) ?></strong>
-                 </div>
-                 <div class="box-content">
-                     <?php $_shipping = $_creditmemo->getShippingAddress() ?>
--                    <address><?= /* @escapeNotVerified */ $block->formatAddress($_shipping, 'html') ?></address>
-+                    <address><?= /* @noEscape */ $block->formatAddress($_shipping, 'html') ?></address>
-                 </div>
-             </div>
-             <div class="box box-order-shipping-method">
-                 <div class="box-title">
--                    <strong><?= /* @escapeNotVerified */ __('Shipping Method') ?></strong>
-+                    <strong><?= $block->escapeHtml(__('Shipping Method')) ?></strong>
-                 </div>
-                 <div class="box-content">
-                     <?= $block->escapeHtml($_order->getShippingDescription()) ?>
-@@ -72,16 +69,16 @@
-         <?php endif; ?>
-             <div class="box box-order-billing-address">
-                 <div class="box-title">
--                    <strong><?= /* @escapeNotVerified */ __('Billing Address') ?></strong>
-+                    <strong><?= $block->escapeHtml(__('Billing Address')) ?></strong>
-                 </div>
-                 <div class="box-content">
-                     <?php $_billing = $_creditmemo->getbillingAddress() ?>
--                    <address><?= /* @escapeNotVerified */ $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
-+                    <address><?= /* @noEscape */ $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
-                 </div>
-             </div>
-             <div class="box box-order-billing-method">
-                 <div class="box-title">
--                    <strong><?= /* @escapeNotVerified */ __('Payment Method') ?></strong>
-+                    <strong><?= $block->escapeHtml(__('Payment Method')) ?></strong>
-                 </div>
-                 <div class="box-content">
-                     <?= $block->getPaymentInfoHtml() ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
-index 6fe6da9e752..3c0196d5932 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
-@@ -3,37 +3,34 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_order = $block->getOrder() ?>
- <?php $_invoice = $block->getInvoice() ?>
--<?php if ($_invoice): ?>
--<?php $_invoices = [$_invoice]; ?>
--<?php else: ?>
--<?php $_invoices = $_order->getInvoiceCollection() ?>
-+<?php if ($_invoice) : ?>
-+    <?php $_invoices = [$_invoice]; ?>
-+<?php else : ?>
-+    <?php $_invoices = $_order->getInvoiceCollection() ?>
- <?php endif; ?>
--<?php foreach ($_invoices as $_invoice): ?>
-+<?php foreach ($_invoices as $_invoice) : ?>
- <div class="order-details-items invoice">
-     <div class="order-title">
--        <strong><?= /* @escapeNotVerified */ __('Invoice #') ?><?= /* @escapeNotVerified */ $_invoice->getIncrementId() ?></strong>
-+        <strong><?= $block->escapeHtml(__('Invoice #')) ?><?= (int) $_invoice->getIncrementId() ?></strong>
-     </div>
-     <div class="table-wrapper table-order-items invoice">
--        <table class="data table table-order-items invoice" id="my-invoice-table-<?= /* @escapeNotVerified */ $_invoice->getId() ?>">
--            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Invoiced') ?></caption>
-+        <table class="data table table-order-items invoice" id="my-invoice-table-<?= (int) $_invoice->getId() ?>">
-+            <caption class="table-caption"><?= $block->escapeHtml(__('Items Invoiced')) ?></caption>
-             <thead>
-             <tr>
--                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
--                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
--                <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
--                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty Invoiced') ?></th>
--                <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
-+                <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
-+                <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-+                <th class="col price"><?= $block->escapeHtml(__('Price')) ?></th>
-+                <th class="col qty"><?= $block->escapeHtml(__('Qty Invoiced')) ?></th>
-+                <th class="col subtotal"><?= $block->escapeHtml(__('Subtotal')) ?></th>
-             </tr>
-             </thead>
-             <?php $_items = $_invoice->getItemsCollection(); ?>
--            <?php foreach ($_items as $_item): ?>
--                <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-+            <?php foreach ($_items as $_item) : ?>
-+                <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-                     <tbody>
-                         <?= $block->getItemHtml($_item) ?>
-                     </tbody>
-@@ -46,46 +43,46 @@
-     </div>
-     <div class="block block-order-details-view">
-         <div class="block-title">
--            <strong><?= /* @escapeNotVerified */ __('Order Information') ?></strong>
-+            <strong><?= $block->escapeHtml(__('Order Information')) ?></strong>
-         </div>
-         <div class="block-content">
--        <?php if (!$_order->getIsVirtual()): ?>
-+        <?php if (!$_order->getIsVirtual()) : ?>
-             <div class="box box-order-shipping-address">
-                 <div class="box-title">
--                    <strong><?= /* @escapeNotVerified */ __('Shipping Address') ?></strong>
-+                    <strong><?= $block->escapeHtml(__('Shipping Address')) ?></strong>
-                 </div>
-                 <div class="box-content">
-                     <?php $_shipping = $_invoice->getShippingAddress() ?>
--                    <address><?= /* @escapeNotVerified */ $block->formatAddress($_shipping, 'html') ?></address>
-+                    <address><?= /* @noEscape */ $block->formatAddress($_shipping, 'html') ?></address>
-                 </div>
-             </div>
- 
-             <div class="box box-order-shipping-method">
-                 <div class="box-title">
--                    <strong><?= /* @escapeNotVerified */ __('Shipping Method') ?></strong>
-+                    <strong><?= $block->escapeHtml(__('Shipping Method')) ?></strong>
-                 </div>
-                 <div class="box-content">
--                    <?php if ($_order->getShippingDescription()): ?>
-+                    <?php if ($_order->getShippingDescription()) : ?>
-                         <?= $block->escapeHtml($_order->getShippingDescription()) ?>
--                    <?php else: ?>
--                        <?= /* @escapeNotVerified */ __('No shipping information available') ?>
-+                    <?php else : ?>
-+                        <?= $block->escapeHtml(__('No shipping information available')) ?>
-                     <?php endif; ?>
-                 </div>
-             </div>
-         <?php endif; ?>
-             <div class="box box-order-billing-address">
-                 <div class="box-title">
--                    <strong><?= /* @escapeNotVerified */ __('Billing Address') ?></strong>
-+                    <strong><?= $block->escapeHtml(__('Billing Address')) ?></strong>
-                 </div>
-                 <div class="box-content">
-                     <?php $_billing = $_invoice->getbillingAddress() ?>
--                    <address><?= /* @escapeNotVerified */ $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
-+                    <address><?= /* @noEscape */ $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
-                 </div>
-             </div>
- 
-             <div class="box box-order-billing-method">
-                 <div class="box-title">
--                    <strong><?= /* @escapeNotVerified */ __('Payment Method') ?></strong>
-+                    <strong><?= $block->escapeHtml(__('Payment Method')) ?></strong>
-                 </div>
-                 <div class="box-content">
-                     <?= $block->getPaymentInfoHtml() ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
-index d1110d1a8d3..3f12ca1f7b2 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
-@@ -3,86 +3,83 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /* @var $block \Magento\Sales\Block\Order\PrintOrder\Shipment */ ?>
- <?php $order = $block->getOrder(); ?>
--<?php if (!$block->getObjectData($order, 'is_virtual')): ?>
--<?php foreach ($block->getShipmentsCollection() as $shipment): ?>
--    <div class="order-details-items shipments">
--        <div class="order-title">
--            <strong><?= /* @escapeNotVerified */ __('Shipment #%1', $block->getObjectData($shipment, 'increment_id')) ?></strong>
--        </div>
--        <div class="table-wrapper order-items-shipment">
--            <table class="data table table-order-items shipment" id="my-shipment-table-<?= /* @escapeNotVerified */ $block->getObjectData($shipment, 'id') ?>">
--                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Invoiced') ?></caption>
--                <thead>
--                <tr>
--                    <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
--                    <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
--                    <th class="col price"><?= /* @escapeNotVerified */ __('Qty Shipped') ?></th>
--                </tr>
--                </thead>
--                <?php foreach ($block->getShipmentItems($shipment) as $item): ?>
--                <tbody>
--                    <?= $block->getItemHtml($item) ?>
--                </tbody>
--                <?php endforeach; ?>
--            </table>
--        </div>
--        <div class="block block-order-details-view">
--            <div class="block-title">
--                <strong><?= /* @escapeNotVerified */ __('Order Information') ?></strong>
-+<?php if (!$block->getObjectData($order, 'is_virtual')) : ?>
-+    <?php foreach ($block->getShipmentsCollection() as $shipment) : ?>
-+        <div class="order-details-items shipments">
-+            <div class="order-title">
-+                <strong><?= $block->escapeHtml(__('Shipment #%1', $block->getObjectData($shipment, 'increment_id'))) ?></strong>
-             </div>
--            <div class="block-content">
--                <div class="box box-order-shipping-address">
--                    <div class="box-title">
--                        <strong><?= /* @escapeNotVerified */ __('Shipping Address') ?></strong>
--                    </div>
--                    <div class="box-content">
--                        <address><?= $block->getShipmentAddressFormattedHtml($shipment) ?></address>
--                    </div>
-+            <div class="table-wrapper order-items-shipment">
-+                <table class="data table table-order-items shipment" id="my-shipment-table-<?= (int) $block->getObjectData($shipment, 'id') ?>">
-+                    <caption class="table-caption"><?= $block->escapeHtml(__('Items Invoiced')) ?></caption>
-+                    <thead>
-+                    <tr>
-+                        <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
-+                        <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-+                        <th class="col price"><?= $block->escapeHtml(__('Qty Shipped')) ?></th>
-+                    </tr>
-+                    </thead>
-+                    <?php foreach ($block->getShipmentItems($shipment) as $item) : ?>
-+                        <tbody>
-+                            <?= $block->getItemHtml($item) ?>
-+                        </tbody>
-+                    <?php endforeach; ?>
-+                </table>
-+            </div>
-+            <div class="block block-order-details-view">
-+                <div class="block-title">
-+                    <strong><?= $block->escapeHtml(__('Order Information')) ?></strong>
-                 </div>
--
--                <div class="box box-order-shipping-method">
--                    <div class="box-title">
--                        <strong><?= /* @escapeNotVerified */ __('Shipping Method') ?></strong>
-+                <div class="block-content">
-+                    <div class="box box-order-shipping-address">
-+                        <div class="box-title">
-+                            <strong><?= $block->escapeHtml(__('Shipping Address')) ?></strong>
-+                        </div>
-+                        <div class="box-content">
-+                            <address><?= $block->getShipmentAddressFormattedHtml($shipment) ?></address>
-+                        </div>
-                     </div>
--                    <div class="box-content">
--                    <?= $block->escapeHtml($block->getObjectData($order, 'shipping_description')) ?>
--                    <?php $tracks = $block->getShipmentTracks($shipment);
--                    if ($tracks): ?>
--                        <dl class="order-tracking">
--                        <?php foreach ($tracks as $track): ?>
--                            <dt class="tracking-title"><?= $block->escapeHtml($block->getObjectData($track, 'title')) ?></dt>
--                            <dd class="tracking-content"><?= $block->escapeHtml($block->getObjectData($track, 'number')) ?></dd>
-+
-+                    <div class="box box-order-shipping-method">
-+                        <div class="box-title">
-+                            <strong><?= $block->escapeHtml(__('Shipping Method')) ?></strong>
-+                        </div>
-+                        <div class="box-content">
-+                        <?= $block->escapeHtml($block->getObjectData($order, 'shipping_description')) ?>
-+                        <?php $tracks = $block->getShipmentTracks($shipment);
-+                        if ($tracks) : ?>
-+                            <dl class="order-tracking">
-+                            <?php foreach ($tracks as $track) : ?>
-+                                <dt class="tracking-title"><?= $block->escapeHtml($block->getObjectData($track, 'title')) ?></dt>
-+                                <dd class="tracking-content"><?= $block->escapeHtml($block->getObjectData($track, 'number')) ?></dd>
-                             <?php endforeach; ?>
--                        </dl>
--                    <?php endif; ?>
-+                            </dl>
-+                        <?php endif; ?>
-+                        </div>
-                     </div>
--                </div>
- 
--                <div class="box box-order-billing-method">
--                    <div class="box-title">
--                        <strong><?= /* @escapeNotVerified */ __('Billing Address') ?></strong>
-+                    <div class="box box-order-billing-method">
-+                        <div class="box-title">
-+                            <strong><?= $block->escapeHtml(__('Billing Address')) ?></strong>
-+                        </div>
-+                        <div class="box-content">
-+                            <address><?= $block->getBillingAddressFormattedHtml($order) ?></address>
-+                        </div>
-                     </div>
--                    <div class="box-content">
--                        <address><?= $block->getBillingAddressFormattedHtml($order) ?></address>
--                    </div>
--                </div>
- 
--                <div class="box box-order-billing-method">
--                    <div class="box-title">
--                        <strong><?= /* @escapeNotVerified */ __('Payment Method') ?></strong>
--                    </div>
--                    <div class="box-content">
--                        <?= $block->getPaymentInfoHtml() ?>
-+                    <div class="box box-order-billing-method">
-+                        <div class="box-title">
-+                            <strong><?= $block->escapeHtml(__('Payment Method')) ?></strong>
-+                        </div>
-+                        <div class="box-content">
-+                            <?= $block->getPaymentInfoHtml() ?>
-+                        </div>
-                     </div>
-                 </div>
-             </div>
-         </div>
--    </div>
-     <?php endforeach; ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
-index bb354e920c5..0702724e79e 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
-@@ -4,8 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
-+/** @var $block \Magento\Sales\Block\Order\Recent */
- ?>
- <div class="block block-dashboard-orders">
- <?php
-@@ -13,47 +14,49 @@
-     $count = count($_orders);
- ?>
-     <div class="block-title order">
--        <strong><?= /* @escapeNotVerified */ __('Recent Orders') ?></strong>
--        <?php if ($count > 0): ?>
--            <a class="action view" href="<?= /* @escapeNotVerified */ $block->getUrl('sales/order/history') ?>">
--                <span><?= /* @escapeNotVerified */ __('View All') ?></span>
-+        <strong><?= $block->escapeHtml(__('Recent Orders')) ?></strong>
-+        <?php if ($count > 0) : ?>
-+            <a class="action view" href="<?= $block->escapeUrl($block->getUrl('sales/order/history')) ?>">
-+                <span><?= $block->escapeHtml(__('View All')) ?></span>
-             </a>
-         <?php endif; ?>
-     </div>
-     <div class="block-content">
-     <?= $block->getChildHtml() ?>
--    <?php if ($count > 0): ?>
-+    <?php if ($count > 0) : ?>
-         <div class="table-wrapper orders-recent">
-             <table class="data table table-order-items recent" id="my-orders-table">
--                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Recent Orders') ?></caption>
-+                <caption class="table-caption"><?= $block->escapeHtml(__('Recent Orders')) ?></caption>
-                 <thead>
-                     <tr>
--                        <th scope="col" class="col id"><?= /* @escapeNotVerified */ __('Order #') ?></th>
--                        <th scope="col" class="col date"><?= /* @escapeNotVerified */ __('Date') ?></th>
--                        <th scope="col" class="col shipping"><?= /* @escapeNotVerified */ __('Ship To') ?></th>
--                        <th scope="col" class="col total"><?= /* @escapeNotVerified */ __('Order Total') ?></th>
--                        <th scope="col" class="col status"><?= /* @escapeNotVerified */ __('Status') ?></th>
--                        <th scope="col" class="col actions"><?= /* @escapeNotVerified */ __('Action') ?></th>
-+                        <th scope="col" class="col id"><?= $block->escapeHtml(__('Order #')) ?></th>
-+                        <th scope="col" class="col date"><?= $block->escapeHtml(__('Date')) ?></th>
-+                        <th scope="col" class="col shipping"><?= $block->escapeHtml(__('Ship To')) ?></th>
-+                        <th scope="col" class="col total"><?= $block->escapeHtml(__('Order Total')) ?></th>
-+                        <th scope="col" class="col status"><?= $block->escapeHtml(__('Status')) ?></th>
-+                        <th scope="col" class="col actions"><?= $block->escapeHtml(__('Action')) ?></th>
-                     </tr>
-                 </thead>
-                 <tbody>
--                    <?php foreach ($_orders as $_order): ?>
-+                    <?php foreach ($_orders as $_order) : ?>
-                         <tr>
--                            <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id"><?= /* @escapeNotVerified */ $_order->getRealOrderId() ?></td>
--                            <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= /* @escapeNotVerified */ $block->formatDate($_order->getCreatedAt()) ?></td>
--                            <td data-th="<?= $block->escapeHtml(__('Ship To')) ?>" class="col shipping"><?= $_order->getShippingAddress() ? $block->escapeHtml($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
--                            <td data-th="<?= $block->escapeHtml(__('Order Total')) ?>" class="col total"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getGrandTotal()) ?></td>
--                            <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status"><?= /* @escapeNotVerified */ $_order->getStatusLabel() ?></td>
-+                            <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id"><?= $block->escapeHtml($_order->getRealOrderId()) ?></td>
-+                            <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= $block->escapeHtml($block->formatDate($_order->getCreatedAt())) ?></td>
-+                            <td data-th="<?= $block->escapeHtml(__('Ship To')) ?>" class="col shipping"><?= $_order->getShippingAddress() ? $block->escapeHtml($_order->getShippingAddress()->getName()) : "&nbsp;" ?></td>
-+                            <td data-th="<?= $block->escapeHtml(__('Order Total')) ?>" class="col total"><?= /* @noEscape */ $_order->formatPrice($_order->getGrandTotal()) ?></td>
-+                            <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status"><?= $block->escapeHtml($_order->getStatusLabel()) ?></td>
-                             <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
--                                <a href="<?= /* @escapeNotVerified */ $block->getViewUrl($_order) ?>" class="action view">
--                                    <span><?= /* @escapeNotVerified */ __('View Order') ?></span>
-+                                <a href="<?= $block->escapeUrl($block->getViewUrl($_order)) ?>" class="action view">
-+                                    <span><?= $block->escapeHtml(__('View Order')) ?></span>
-                                 </a>
--                                <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
--                                    <a href="#" data-post='<?php /* @escapeNotVerified */ echo
-+                                <?php if ($this->helper(\Magento\Sales\Helper\Reorder::class)
-+                                    ->canReorder($_order->getEntityId())
-+                                ) : ?>
-+                                    <a href="#" data-post='<?= /* @noEscape */
-                                     $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
-                                         ->getPostData($block->getReorderUrl($_order))
-                                     ?>' class="action order">
--                                        <span><?= /* @escapeNotVerified */ __('Reorder') ?></span>
-+                                        <span><?= $block->escapeHtml(__('Reorder')) ?></span>
-                                     </a>
-                                 <?php endif ?>
-                             </td>
-@@ -62,8 +65,8 @@
-                 </tbody>
-             </table>
-         </div>
--    <?php else: ?>
--        <div class="message info empty"><span><?= /* @escapeNotVerified */ __('You have placed no orders.') ?></span></div>
-+    <?php else : ?>
-+        <div class="message info empty"><span><?= $block->escapeHtml(__('You have placed no orders.')) ?></span></div>
-     <?php endif; ?>
-     </div>
- </div>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
-index 3f916b7a8da..57aeffb26f8 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
-@@ -3,44 +3,41 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_item = $block->getItem() ?>
- <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
--<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
-+<tr id="order-item-row-<?= (int) $_item->getId() ?>">
-     <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
-         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
--        <?php if ($_options = $block->getItemOptions()): ?>
--        <dl class="item options">
--        <?php foreach ($_options as $_option) : ?>
--            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--            <?php if (!$block->getPrintStatus()): ?>
--                <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
--                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
--                    <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
--                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
--                    <div class="tooltip content">
--                        <dl class="item options">
--                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
--                            <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
--                        </dl>
--                    </div>
--                    <?php endif; ?>
--                </dd>
--            <?php else: ?>
--                <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
--            <?php endif; ?>
--        <?php endforeach; ?>
--        </dl>
-+        <?php if ($_options = $block->getItemOptions()) : ?>
-+            <dl class="item options">
-+            <?php foreach ($_options as $_option) : ?>
-+                <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-+                <?php if (!$block->getPrintStatus()) : ?>
-+                    <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-+                    <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
-+                        <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
-+                        <?php if (isset($_formatedOptionValue['full_view'])) : ?>
-+                        <div class="tooltip content">
-+                            <dl class="item options">
-+                                <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-+                                <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
-+                            </dl>
-+                        </div>
-+                        <?php endif; ?>
-+                    </dd>
-+                <?php else : ?>
-+                    <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
-+                <?php endif; ?>
-+            <?php endforeach; ?>
-+            </dl>
-         <?php endif; ?>
-         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
--        <?php if ($addInfoBlock) :?>
-+        <?php if ($addInfoBlock) : ?>
-             <?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
-         <?php endif; ?>
-         <?= $block->escapeHtml($_item->getDescription()) ?>
-     </td>
--    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
--    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Shipped')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
-+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
-+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Shipped')) ?>"><?= (int) $_item->getQty() ?></td>
- </tr>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml b/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
-index 8f0e884a229..7a88f14eb07 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
-@@ -4,32 +4,30 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\Sales\Block\Order\Totals
-  * @see \Magento\Sales\Block\Order\Totals
-  */
- ?>
--<?php foreach ($block->getTotals() as $_code => $_total): ?>
--    <?php if ($_total->getBlockName()): ?>
-+<?php foreach ($block->getTotals() as $_code => $_total) : ?>
-+    <?php if ($_total->getBlockName()) : ?>
-         <?= $block->getChildHtml($_total->getBlockName(), false) ?>
--    <?php else:?>
--    <tr class="<?= /* @escapeNotVerified */ $_code ?>">
--        <th <?= /* @escapeNotVerified */ $block->getLabelProperties() ?> scope="row">
--            <?php if ($_total->getStrong()):?>
--            <strong><?= $block->escapeHtml($_total->getLabel()) ?></strong>
--            <?php else:?>
--            <?= $block->escapeHtml($_total->getLabel()) ?>
--            <?php endif?>
-+    <?php else :?>
-+    <tr class="<?= $block->escapeHtmlAttr($_code) ?>">
-+        <th <?= /* @noEscape */ $block->getLabelProperties() ?> scope="row">
-+            <?php if ($_total->getStrong()) : ?>
-+                <strong><?= $block->escapeHtml($_total->getLabel()) ?></strong>
-+            <?php else : ?>
-+                <?= $block->escapeHtml($_total->getLabel()) ?>
-+            <?php endif ?>
-         </th>
--        <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtml($_total->getLabel()) ?>">
--            <?php if ($_total->getStrong()):?>
--            <strong><?= /* @escapeNotVerified */ $block->formatValue($_total) ?></strong>
--            <?php else:?>
--            <?= /* @escapeNotVerified */ $block->formatValue($_total) ?>
-+        <td <?= /* @noEscape */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtmlAttr($_total->getLabel()) ?>">
-+            <?php if ($_total->getStrong()) : ?>
-+                <strong><?= /* @noEscape */ $block->formatValue($_total) ?></strong>
-+            <?php else : ?>
-+                <?= /* @noEscape */ $block->formatValue($_total) ?>
-             <?php endif?>
-         </td>
-     </tr>
--    <?php endif?>
-+    <?php endif; ?>
- <?php endforeach?>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/order/view.phtml b/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
-index 1cb85337637..273554667ff 100644
---- a/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
-@@ -4,31 +4,37 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php /** @var  $block \Magento\Sales\Block\Order\View*/?>
- <div class="order-details-items ordered">
-     <?php $_order = $block->getOrder() ?>
- 
-     <div class="order-title">
--        <strong><?= /* @escapeNotVerified */ __('Items Ordered') ?></strong>
--        <?php if ($_order->getTracksCollection()->count()) : ?>
-+        <strong><?= $block->escapeHtml(__('Items Ordered')) ?></strong>
-+        <?php if (!empty($_order->getTracksCollection()->getItems())) : ?>
-             <?= $block->getChildHtml('tracking-info-link') ?>
-         <?php endif; ?>
-     </div>
- 
-     <?= $block->getChildHtml('order_items') ?>
- 
--    <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order', $_order) && $_order->getGiftMessageId()): ?>
-+    <?php if ($this->helper(\Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order', $_order)
-+        && $_order->getGiftMessageId()
-+    ) : ?>
-     <div class="block block-order-details-gift-message">
--        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('Gift Message for This Order') ?></strong></div>
--        <?php $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($_order); ?>
-+        <div class="block-title"><strong><?= $block->escapeHtml(__('Gift Message for This Order')) ?></strong></div>
-+        <?php
-+        $_giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessageForEntity($_order);
-+        ?>
-         <div class="block-content">
-             <dl class="item-options">
--                <dt class="item-sender"><strong class="label"><?= /* @escapeNotVerified */ __('From') ?></strong><?= $block->escapeHtml($_giftMessage->getSender()) ?></dt>
--                <dt class="item-recipient"><strong class="label"><?= /* @escapeNotVerified */ __('To') ?></strong><?= $block->escapeHtml($_giftMessage->getRecipient()) ?></dt>
--                <dd class="item-message"><?= /* @escapeNotVerified */ $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_order) ?></dd>
-+                <dt class="item-sender"><strong class="label"><?= $block->escapeHtml(__('From')) ?></strong><?= $block->escapeHtml($_giftMessage->getSender()) ?></dt>
-+                <dt class="item-recipient"><strong class="label"><?= $block->escapeHtml(__('To')) ?></strong><?= $block->escapeHtml($_giftMessage->getRecipient()) ?></dt>
-+                <dd class="item-message">
-+                    <?= /* @noEscape */
-+                    $this->helper(\Magento\GiftMessage\Helper\Message::class)->getEscapedGiftMessage($_order) ?>
-+                </dd>
-             </dl>
-         </div>
-     </div>
-@@ -36,8 +42,8 @@
- 
-     <div class="actions-toolbar">
-         <div class="secondary">
--            <a class="action back" href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>">
--                <span><?= /* @escapeNotVerified */ $block->getBackTitle() ?></span>
-+            <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>">
-+                <span><?= $block->escapeHtml($block->getBackTitle()) ?></span>
-             </a>
-         </div>
-     </div>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
-index 5ecf1ebe893..ba1204fac8e 100644
---- a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * Last ordered items sidebar
-  *
-@@ -15,25 +13,29 @@
- <div class="block block-reorder" data-bind="scope: 'lastOrderedItems'">
-     <div class="block-title no-display"
-          data-bind="css: {'no-display': !lastOrderedItems().items || lastOrderedItems().items.length === 0}">
--        <strong id="block-reorder-heading" role="heading" aria-level="2"><?= /* @escapeNotVerified */ __('Recently Ordered') ?></strong>
-+        <strong id="block-reorder-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Recently Ordered')) ?></strong>
-     </div>
-     <div class="block-content no-display"
-          data-bind="css: {'no-display': !lastOrderedItems().items || lastOrderedItems().items.length === 0}"
-          aria-labelledby="block-reorder-heading">
-         <form method="post" class="form reorder"
--              action="<?= /* @escapeNotVerified */ $block->getFormActionUrl() ?>" id="reorder-validate-detail">
--            <strong class="subtitle"><?= /* @escapeNotVerified */ __('Last Ordered Items') ?></strong>
-+              action="<?= $block->escapeUrl($block->getFormActionUrl()) ?>" id="reorder-validate-detail">
-+            <strong class="subtitle"><?= $block->escapeHtml(__('Last Ordered Items')) ?></strong>
-             <ol id="cart-sidebar-reorder" class="product-items product-items-names"
-                 data-bind="foreach: lastOrderedItems().items">
-                 <li class="product-item">
--                    <div class="field item choice no-display" data-bind="css: {'no-display': !is_saleable}">
-+                    <div class="field item choice">
-                         <label class="label" data-bind="attr: {'for': 'reorder-item-' + id}">
--                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                         </label>
-                         <div class="control">
-                             <input type="checkbox" name="order_items[]"
--                                   data-bind="attr: {id: 'reorder-item-' + id, value: id}"
--                                   title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>"
-+                                   data-bind="attr: {
-+                                        id: 'reorder-item-' + id,
-+                                        value: id,
-+                                        title: is_saleable ? '<?= $block->escapeHtml(__('Add to Cart')) ?>' : '<?= $block->escapeHtml(__('Product is not salable.')) ?>'
-+                                   },
-+                                   disable: !is_saleable"
-                                    class="checkbox" data-validate='{"validate-one-checkbox-required-by-name": true}'/>
-                         </div>
-                     </div>
-@@ -46,15 +48,15 @@
-             </ol>
-             <div id="cart-sidebar-reorder-advice-container"></div>
-             <div class="actions-toolbar">
--                <div class="primary no-display"
--                     data-bind="css: {'no-display': !lastOrderedItems().isShowAddToCart}">
--                    <button type="submit" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>" class="action tocart primary">
--                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-+                <div class="primary"
-+                     data-bind="visible: isShowAddToCart">
-+                    <button type="submit" title="<?= $block->escapeHtml(__('Add to Cart')) ?>" class="action tocart primary">
-+                        <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                     </button>
-                 </div>
-                 <div class="secondary">
--                    <a class="action view" href="<?= /* @escapeNotVerified */ $block->getUrl('customer/account') ?>">
--                        <span><?= /* @escapeNotVerified */ __('View All') ?></span>
-+                    <a class="action view" href="<?= $block->escapeUrl($block->getUrl('customer/account')) ?>#my-orders-table">
-+                        <span><?= $block->escapeHtml(__('View All')) ?></span>
-                     </a>
-                 </div>
-             </div>
-diff --git a/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
-index ac428283dfc..25926688c6f 100644
---- a/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
-+++ b/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
-@@ -4,31 +4,29 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Sales\Block\Widget\Guest\Form */
- ?>
--<?php if ($block->isEnable()): ?>
-+<?php if ($block->isEnable()) : ?>
-     <div class="widget block block-orders-returns">
-         <div class="block-title">
--            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ __('Orders and Returns') ?></strong>
-+            <strong role="heading" aria-level="2"><?= $block->escapeHtml(__('Orders and Returns')) ?></strong>
-         </div>
-         <div class="block-content">
--            <form id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{},"validation":{}}' action="<?= /* @escapeNotVerified */ $block->getActionUrl() ?>" method="post"
-+            <form id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{},"validation":{}}' action="<?= $block->escapeUrl($block->getActionUrl()) ?>" method="post"
-                   class="form form-orders-search" name="guest_post">
-                 <fieldset class="fieldset">
-                     <div class="field find required">
--                        <label class="label"><span><?= /* @escapeNotVerified */ __('Find Order By') ?></span></label>
-+                        <label class="label"><span><?= $block->escapeHtml(__('Find Order By')) ?></span></label>
- 
-                         <div class="control">
-                             <select name="oar_type" id="quick-search-type-id" class="select" title="">
--                                <option value="email"><?= /* @escapeNotVerified */ __('Email') ?></option>
--                                <option value="zip"><?= /* @escapeNotVerified */ __('ZIP Code') ?></option>
-+                                <option value="email"><?= $block->escapeHtml(__('Email')) ?></option>
-+                                <option value="zip"><?= $block->escapeHtml(__('ZIP Code')) ?></option>
-                             </select>
-                         </div>
-                     </div>
-                     <div class="field id required">
--                        <label for="oar-order-id" class="label"><span><?= /* @escapeNotVerified */ __('Order ID') ?></span></label>
-+                        <label for="oar-order-id" class="label"><span><?= $block->escapeHtml(__('Order ID')) ?></span></label>
- 
-                         <div class="control">
-                             <input type="text" class="input-text" id="oar-order-id" name="oar_order_id" autocomplete="off"
-@@ -37,7 +35,7 @@
-                     </div>
-                     <div class="field lastname required">
-                         <label for="oar-billing-lastname"
--                               class="label"><span><?= /* @escapeNotVerified */ __('Billing Last Name') ?></span></label>
-+                               class="label"><span><?= $block->escapeHtml(__('Billing Last Name')) ?></span></label>
- 
-                         <div class="control">
-                             <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname"
-@@ -45,7 +43,7 @@
-                         </div>
-                     </div>
-                     <div id="oar-email" class="field email required">
--                        <label for="oar_email" class="label"><span><?= /* @escapeNotVerified */ __('Email') ?></span></label>
-+                        <label for="oar_email" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
- 
-                         <div class="control">
-                             <input type="email" class="input-text" id="oar_email" name="oar_email" autocomplete="off"
-@@ -53,7 +51,7 @@
-                         </div>
-                     </div>
-                     <div id="oar-zip" style="display: none;" class="field zip required">
--                        <label for="oar_zip" class="label"><span><?= /* @escapeNotVerified */ __('Billing ZIP Code') ?></span></label>
-+                        <label for="oar_zip" class="label"><span><?= $block->escapeHtml(__('Billing ZIP Code')) ?></span></label>
- 
-                         <div class="control">
-                             <input type="text" class="input-text" id="oar_zip" name="oar_zip"
-@@ -64,7 +62,7 @@
-                 <div class="actions-toolbar">
-                     <div class="primary">
-                         <button type="submit" title="<?= $block->escapeHtml(__('Search')) ?>" class="action search">
--                            <span><?= /* @escapeNotVerified */ __('Search') ?></span>
-+                            <span><?= $block->escapeHtml(__('Search')) ?></span>
-                         </button>
-                     </div>
-                 </div>
-diff --git a/app/code/Magento/Sales/view/frontend/web/gift-message.js b/app/code/Magento/Sales/view/frontend/web/js/gift-message.js
-similarity index 100%
-rename from app/code/Magento/Sales/view/frontend/web/gift-message.js
-rename to app/code/Magento/Sales/view/frontend/web/js/gift-message.js
-diff --git a/app/code/Magento/Sales/view/frontend/web/orders-returns.js b/app/code/Magento/Sales/view/frontend/web/js/orders-returns.js
-similarity index 100%
-rename from app/code/Magento/Sales/view/frontend/web/orders-returns.js
-rename to app/code/Magento/Sales/view/frontend/web/js/orders-returns.js
-diff --git a/app/code/Magento/Sales/view/frontend/web/js/view/last-ordered-items.js b/app/code/Magento/Sales/view/frontend/web/js/view/last-ordered-items.js
-index f393cc3fcd3..17e61a77d98 100644
---- a/app/code/Magento/Sales/view/frontend/web/js/view/last-ordered-items.js
-+++ b/app/code/Magento/Sales/view/frontend/web/js/view/last-ordered-items.js
-@@ -5,27 +5,43 @@
- 
- define([
-     'uiComponent',
--    'Magento_Customer/js/customer-data'
--], function (Component, customerData) {
-+    'Magento_Customer/js/customer-data',
-+    'underscore'
-+], function (Component, customerData, _) {
-     'use strict';
- 
-     return Component.extend({
-+        defaults: {
-+            isShowAddToCart: false
-+        },
-+
-         /** @inheritdoc */
-         initialize: function () {
--            var isShowAddToCart = false,
--                item;
--
-             this._super();
-             this.lastOrderedItems = customerData.get('last-ordered-items');
-+            this.lastOrderedItems.subscribe(this.checkSalableItems.bind(this));
-+            this.checkSalableItems();
-+
-+            return this;
-+        },
-+
-+        /** @inheritdoc */
-+        initObservable: function () {
-+            this._super()
-+                .observe('isShowAddToCart');
-+
-+            return this;
-+        },
- 
--            for (item in this.lastOrderedItems.items) {
--                if (item['is_saleable']) {
--                    isShowAddToCart = true;
--                    break;
--                }
--            }
-+        /**
-+         * Check if items is_saleable and change add to cart button visibility.
-+         */
-+        checkSalableItems: function () {
-+            var isShowAddToCart = _.some(this.lastOrderedItems().items, {
-+                'is_saleable': true
-+            });
- 
--            this.lastOrderedItems.isShowAddToCart = isShowAddToCart;
-+            this.isShowAddToCart(isShowAddToCart);
-         }
-     });
- });
-diff --git a/app/code/Magento/SalesAnalytics/README.md b/app/code/Magento/SalesAnalytics/README.md
-index 70f456c97d4..0b1f804b278 100644
---- a/app/code/Magento/SalesAnalytics/README.md
-+++ b/app/code/Magento/SalesAnalytics/README.md
-@@ -1,3 +1,3 @@
- # Magento_SalesAnalytics module
- 
--The Magento_SalesAnalytics module configures data definitions for a data collection related to the Sales module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
-+The Magento_SalesAnalytics module configures data definitions for a data collection related to the Sales module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
-diff --git a/app/code/Magento/SalesAnalytics/composer.json b/app/code/Magento/SalesAnalytics/composer.json
-index 64424c8f5bc..b77dcd7e71c 100644
---- a/app/code/Magento/SalesAnalytics/composer.json
-+++ b/app/code/Magento/SalesAnalytics/composer.json
-@@ -4,7 +4,8 @@
-     "require": {
-         "php": "~7.1.3||~7.2.0",
-         "magento/framework": "*",
--        "magento/module-sales": "*"
-+        "magento/module-sales": "*",
-+        "magento/module-analytics": "*"
-     },
-     "type": "magento2-module",
-     "license": [
-diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
-new file mode 100644
-index 00000000000..4fd06e88878
---- /dev/null
-+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
-@@ -0,0 +1,66 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\SalesGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
-+
-+/**
-+ * Orders data reslover
-+ */
-+class Orders implements ResolverInterface
-+{
-+    /**
-+     * @var CollectionFactoryInterface
-+     */
-+    private $collectionFactory;
-+
-+    /**
-+     * @param CollectionFactoryInterface $collectionFactory
-+     */
-+    public function __construct(
-+        CollectionFactoryInterface $collectionFactory
-+    ) {
-+        $this->collectionFactory = $collectionFactory;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        /** @var ContextInterface $context */
-+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-+        }
-+
-+        $items = [];
-+        $orders = $this->collectionFactory->create($context->getUserId());
-+
-+        /** @var \Magento\Sales\Model\Order $order */
-+        foreach ($orders as $order) {
-+            $items[] = [
-+                'id' => $order->getId(),
-+                'increment_id' => $order->getIncrementId(),
-+                'created_at' => $order->getCreatedAt(),
-+                'grand_total' => $order->getGrandTotal(),
-+                'status' => $order->getStatus(),
-+            ];
-+        }
-+        return ['items' => $items];
-+    }
-+}
-diff --git a/app/code/Magento/SalesGraphQl/README.md b/app/code/Magento/SalesGraphQl/README.md
-new file mode 100644
-index 00000000000..d5717821b16
---- /dev/null
-+++ b/app/code/Magento/SalesGraphQl/README.md
-@@ -0,0 +1,4 @@
-+# SalesGraphQl
-+
-+**SalesGraphQl** provides type and resolver information for the GraphQl module
-+to generate sales orders information.
-diff --git a/app/code/Magento/SalesGraphQl/composer.json b/app/code/Magento/SalesGraphQl/composer.json
-new file mode 100644
-index 00000000000..feb6e07f159
---- /dev/null
-+++ b/app/code/Magento/SalesGraphQl/composer.json
-@@ -0,0 +1,23 @@
-+{
-+    "name": "magento/module-sales-graph-ql",
-+    "description": "N/A",
-+    "type": "magento2-module",
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-sales": "*",
-+        "magento/module-graph-ql": "*"
-+    },
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\SalesGraphQl\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/SalesGraphQl/etc/module.xml b/app/code/Magento/SalesGraphQl/etc/module.xml
-new file mode 100644
-index 00000000000..70a55db67a5
---- /dev/null
-+++ b/app/code/Magento/SalesGraphQl/etc/module.xml
-@@ -0,0 +1,10 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_SalesGraphQl"/>
-+</config>
-diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
-new file mode 100644
-index 00000000000..06146f805c6
---- /dev/null
-+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
-@@ -0,0 +1,18 @@
-+# Copyright © Magento, Inc. All rights reserved.
-+# See COPYING.txt for license details.
-+
-+type Query {
-+    customerOrders: CustomerOrders @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\Orders") @doc(description: "List of customer orders") @cache(cacheable: false)
-+}
-+
-+type CustomerOrder @doc(description: "Order mapping fields") {
-+    id: Int
-+    increment_id: String
-+    created_at: String
-+    grand_total: Float
-+    status: String
-+}
-+
-+type CustomerOrders {
-+    items: [CustomerOrder] @doc(description: "Array of orders")
-+}
-diff --git a/app/code/Magento/SalesGraphQl/registration.php b/app/code/Magento/SalesGraphQl/registration.php
-new file mode 100644
-index 00000000000..afb4091bfa3
---- /dev/null
-+++ b/app/code/Magento/SalesGraphQl/registration.php
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_SalesGraphQl', __DIR__);
-diff --git a/app/code/Magento/SalesRule/Api/CouponRepositoryInterface.php b/app/code/Magento/SalesRule/Api/CouponRepositoryInterface.php
-index d4cce37fd15..1a631886f1a 100644
---- a/app/code/Magento/SalesRule/Api/CouponRepositoryInterface.php
-+++ b/app/code/Magento/SalesRule/Api/CouponRepositoryInterface.php
-@@ -38,7 +38,7 @@ interface CouponRepositoryInterface
-      * Retrieve a coupon using the specified search criteria.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#CouponRepositoryInterface to
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#CouponRepositoryInterface to
-      * determine which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-diff --git a/app/code/Magento/SalesRule/Api/Data/CouponInterface.php b/app/code/Magento/SalesRule/Api/Data/CouponInterface.php
-index 327b3ffa7b7..bd44ea829fe 100644
---- a/app/code/Magento/SalesRule/Api/Data/CouponInterface.php
-+++ b/app/code/Magento/SalesRule/Api/Data/CouponInterface.php
-@@ -99,6 +99,8 @@ interface CouponInterface extends \Magento\Framework\Api\ExtensibleDataInterface
-     public function getTimesUsed();
- 
-     /**
-+     * Set time used.
-+     *
-      * @param int $timesUsed
-      * @return $this
-      */
-@@ -108,6 +110,7 @@ interface CouponInterface extends \Magento\Framework\Api\ExtensibleDataInterface
-      * Get expiration date
-      *
-      * @return string|null
-+     * @deprecated Coupon expiration must follow sales rule expiration date.
-      */
-     public function getExpirationDate();
- 
-@@ -116,6 +119,7 @@ interface CouponInterface extends \Magento\Framework\Api\ExtensibleDataInterface
-      *
-      * @param string $expirationDate
-      * @return $this
-+     * @deprecated Coupon expiration must follow sales rule expiration date.
-      */
-     public function setExpirationDate($expirationDate);
- 
-@@ -158,6 +162,8 @@ interface CouponInterface extends \Magento\Framework\Api\ExtensibleDataInterface
-     public function getType();
- 
-     /**
-+     * Set type of coupon.
-+     *
-      * @param int $type
-      * @return $this
-      */
-diff --git a/app/code/Magento/SalesRule/Api/RuleRepositoryInterface.php b/app/code/Magento/SalesRule/Api/RuleRepositoryInterface.php
-index d0d275de63a..963edf5483e 100644
---- a/app/code/Magento/SalesRule/Api/RuleRepositoryInterface.php
-+++ b/app/code/Magento/SalesRule/Api/RuleRepositoryInterface.php
-@@ -38,7 +38,7 @@ interface RuleRepositoryInterface
-      * Retrieve sales rules that match te specified criteria.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#RuleRepositoryInterface to
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#RuleRepositoryInterface to
-      * determine which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php
-index 0cb286056d8..bee7573c1fe 100644
---- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php
-+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php
-@@ -26,7 +26,7 @@ class DeleteButton extends GenericButton implements ButtonProviderInterface
-                 'class' => 'delete',
-                 'on_click' => 'deleteConfirm(\'' . __(
-                     'Are you sure you want to delete this?'
--                ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\')',
-+                ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\', {data: {}})',
-                 'sort_order' => 20,
-             ];
-         }
-diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
-index b4be904223a..901866d52f7 100644
---- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
-+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
-@@ -3,8 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\SalesRule\Block\Adminhtml\Promo\Widget;
- 
-+/**
-+ * Widget that allows to select a sales rule.
-+ */
- class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
- {
-     /**
-@@ -87,7 +91,7 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
-         if ($element->getValue()) {
-             $rule = $this->ruleFactory->create()->load((int)$element->getValue());
-             if ($rule->getId()) {
--                $chooser->setLabel($rule->getName());
-+                $chooser->setLabel($this->escapeHtml($rule->getName()));
-             }
-         }
- 
-diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
-index 28993e15949..45b717fb9bd 100644
---- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
-+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
- 
--class Delete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+class Delete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpPostActionInterface
- {
-     /**
-      * Delete promo quote action
-diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php
-index 717c71fde48..3255ee0f2b7 100644
---- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php
-+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
- 
--class Edit extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Edit extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\View\Result\PageFactory
-diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
-index 12d34b8320d..cfafe110df2 100644
---- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
-+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
-@@ -1,21 +1,37 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
- 
--use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\SalesRule\Model\CouponGenerator;
-+use Magento\Framework\MessageQueue\PublisherInterface;
-+use Magento\SalesRule\Api\Data\CouponGenerationSpecInterfaceFactory;
- 
--class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
-+/**
-+ * Generate promo quote
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpPostActionInterface
- {
-     /**
-      * @var CouponGenerator
-      */
-     private $couponGenerator;
- 
-+    /**
-+     * @var PublisherInterface
-+     */
-+    private $messagePublisher;
-+
-+    /**
-+     * @var CouponGenerationSpecInterfaceFactory
-+     */
-+    private $generationSpecFactory;
-+
-     /**
-      * Generate constructor.
-      * @param \Magento\Backend\App\Action\Context $context
-@@ -23,17 +39,27 @@ class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
-      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
-      * @param CouponGenerator|null $couponGenerator
-+     * @param PublisherInterface|null $publisher
-+     * @param CouponGenerationSpecInterfaceFactory|null $generationSpecFactory
-      */
-     public function __construct(
-         \Magento\Backend\App\Action\Context $context,
-         \Magento\Framework\Registry $coreRegistry,
-         \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
-         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
--        CouponGenerator $couponGenerator = null
-+        CouponGenerator $couponGenerator = null,
-+        PublisherInterface $publisher = null,
-+        CouponGenerationSpecInterfaceFactory $generationSpecFactory = null
-     ) {
-         parent::__construct($context, $coreRegistry, $fileFactory, $dateFilter);
-         $this->couponGenerator = $couponGenerator ?:
-             $this->_objectManager->get(CouponGenerator::class);
-+        $this->messagePublisher = $publisher ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(PublisherInterface::class);
-+        $this->generationSpecFactory = $generationSpecFactory ?:
-+            \Magento\Framework\App\ObjectManager::getInstance()->get(
-+                CouponGenerationSpecInterfaceFactory::class
-+            );
-     }
- 
-     /**
-@@ -62,9 +88,14 @@ class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
-                     $data = $inputFilter->getUnescaped();
-                 }
- 
--                $couponCodes = $this->couponGenerator->generateCodes($data);
--                $generated = count($couponCodes);
--                $this->messageManager->addSuccessMessage(__('%1 coupon(s) have been generated.', $generated));
-+                $data['quantity'] = isset($data['qty']) ? $data['qty'] : null;
-+
-+                $couponSpec = $this->generationSpecFactory->create(['data' => $data]);
-+
-+                $this->messagePublisher->publish('sales_rule.codegenerator', $couponSpec);
-+                $this->messageManager->addSuccessMessage(
-+                    __('Message is added to queue, wait to get your coupons soon')
-+                );
-                 $this->_view->getLayout()->initMessages();
-                 $result['messages'] = $this->_view->getLayout()->getMessagesBlock()->getGroupedHtml();
-             } catch (\Magento\Framework\Exception\InputException $inputException) {
-diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php
-index 0c11ee3785a..4f3c712049e 100644
---- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php
-+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
- 
--class Index extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpGetActionInterface
- {
-     /**
-      * Index action
-diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php
-index ecf39605a87..5adef0552bc 100644
---- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php
-+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
- 
--class NewAction extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class NewAction extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpGetActionInterface
- {
-     /**
-      * New promo quote action
-diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
-index a0238890d98..50545fd8648 100644
---- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
-+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
-@@ -1,12 +1,16 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
- 
--class NewConditionHtml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+/**
-+ * Controller class NewConditionHtml. Returns condition html
-+ */
-+class NewConditionHtml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpPostActionInterface
- {
-     /**
-      * New condition html action
-diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
-index a5b71130e70..7d55d18b770 100644
---- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
-+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
-@@ -6,8 +6,52 @@
-  */
- namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
- 
--class Save extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\App\Request\DataPersistorInterface;
-+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-+
-+/**
-+ * SalesRule save controller
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class Save extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpPostActionInterface
- {
-+    /**
-+     * @var TimezoneInterface
-+     */
-+    private $timezone;
-+    
-+    /**
-+     * @var DataPersistorInterface
-+     */
-+    private $dataPersistor;
-+
-+    /**
-+     * @param \Magento\Backend\App\Action\Context $context
-+     * @param \Magento\Framework\Registry $coreRegistry
-+     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-+     * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
-+     * @param TimezoneInterface $timezone
-+     * @param DataPersistorInterface $dataPersistor
-+     */
-+    public function __construct(
-+        \Magento\Backend\App\Action\Context $context,
-+        \Magento\Framework\Registry $coreRegistry,
-+        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
-+        \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
-+        TimezoneInterface $timezone = null,
-+        DataPersistorInterface $dataPersistor = null
-+    ) {
-+        parent::__construct($context, $coreRegistry, $fileFactory, $dateFilter);
-+        $this->timezone =  $timezone ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
-+            TimezoneInterface::class
-+        );
-+        $this->dataPersistor = $dataPersistor ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
-+            DataPersistorInterface::class
-+        );
-+    }
-+
-     /**
-      * Promo quote save action
-      *
-@@ -26,6 +70,9 @@ class Save extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
-                     ['request' => $this->getRequest()]
-                 );
-                 $data = $this->getRequest()->getPostValue();
-+                if (empty($data['from_date'])) {
-+                    $data['from_date'] = $this->timezone->formatDate();
-+                }
- 
-                 $filterValues = ['from_date' => $this->_dateFilter];
-                 if ($this->getRequest()->getParam('to_date')) {
-@@ -37,12 +84,8 @@ class Save extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
-                     $data
-                 );
-                 $data = $inputFilter->getUnescaped();
--                $id = $this->getRequest()->getParam('rule_id');
--                if ($id) {
--                    $model->load($id);
--                    if ($id != $model->getId()) {
--                        throw new \Magento\Framework\Exception\LocalizedException(__('The wrong rule is specified.'));
--                    }
-+                if (!$this->checkRuleExists($model)) {
-+                    throw new \Magento\Framework\Exception\LocalizedException(__('The wrong rule is specified.'));
-                 }
- 
-                 $session = $this->_objectManager->get(\Magento\Backend\Model\Session::class);
-@@ -53,6 +96,7 @@ class Save extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
-                         $this->messageManager->addErrorMessage($errorMessage);
-                     }
-                     $session->setPageData($data);
-+                    $this->dataPersistor->set('sale_rule', $data);
-                     $this->_redirect('sales_rule/*/edit', ['id' => $model->getId()]);
-                     return;
-                 }
-@@ -111,4 +155,22 @@ class Save extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
-         }
-         $this->_redirect('sales_rule/*/');
-     }
-+
-+    /**
-+     * Check if Cart Price Rule with provided id exists.
-+     *
-+     * @param \Magento\SalesRule\Model\Rule $model
-+     * @return bool
-+     */
-+    private function checkRuleExists(\Magento\SalesRule\Model\Rule $model): bool
-+    {
-+        $id = $this->getRequest()->getParam('rule_id');
-+        if ($id) {
-+            $model->load($id);
-+            if ($model->getId() != $id) {
-+                return false;
-+            }
-+        }
-+        return true;
-+    }
- }
-diff --git a/app/code/Magento/SalesRule/Model/Coupon.php b/app/code/Magento/SalesRule/Model/Coupon.php
-index ee1eaff0830..a8c77c6ceee 100644
---- a/app/code/Magento/SalesRule/Model/Coupon.php
-+++ b/app/code/Magento/SalesRule/Model/Coupon.php
-@@ -20,6 +20,9 @@ class Coupon extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     const KEY_USAGE_LIMIT = 'usage_limit';
-     const KEY_USAGE_PER_CUSTOMER = 'usage_per_customer';
-     const KEY_TIMES_USED = 'times_used';
-+    /**
-+     * @deprecated Coupon expiration must follow sales rule expiration date.
-+     */
-     const KEY_EXPIRATION_DATE = 'expiration_date';
-     const KEY_IS_PRIMARY = 'is_primary';
-     const KEY_CREATED_AT = 'created_at';
-@@ -39,10 +42,10 @@ class Coupon extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     /**
-      * Set rule instance
-      *
--     * @param \Magento\SalesRule\Model\Rule $rule
-+     * @param Rule $rule
-      * @return $this
-      */
--    public function setRule(\Magento\SalesRule\Model\Rule $rule)
-+    public function setRule(Rule $rule)
-     {
-         $this->setRuleId($rule->getId());
-         return $this;
-@@ -51,7 +54,7 @@ class Coupon extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     /**
-      * Load primary coupon for specified rule
-      *
--     * @param \Magento\SalesRule\Model\Rule|int $rule
-+     * @param Rule|int $rule
-      * @return $this
-      */
-     public function loadPrimaryByRule($rule)
-@@ -190,6 +193,8 @@ class Coupon extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Set Times Used
-+     *
-      * @param int $timesUsed
-      * @return $this
-      */
-@@ -202,6 +207,7 @@ class Coupon extends \Magento\Framework\Model\AbstractExtensibleModel implements
-      * Get expiration date
-      *
-      * @return string|null
-+     * @deprecated Coupon expiration must follow sales rule expiration date.
-      */
-     public function getExpirationDate()
-     {
-@@ -213,6 +219,7 @@ class Coupon extends \Magento\Framework\Model\AbstractExtensibleModel implements
-      *
-      * @param string $expirationDate
-      * @return $this
-+     * @deprecated Coupon expiration must follow sales rule expiration date.
-      */
-     public function setExpirationDate($expirationDate)
-     {
-@@ -273,6 +280,8 @@ class Coupon extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Set type
-+     *
-      * @param int $type
-      * @return $this
-      */
-diff --git a/app/code/Magento/SalesRule/Model/Coupon/Consumer.php b/app/code/Magento/SalesRule/Model/Coupon/Consumer.php
-new file mode 100644
-index 00000000000..2354c72a3e2
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Model/Coupon/Consumer.php
-@@ -0,0 +1,85 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\SalesRule\Model\Coupon;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Filesystem;
-+use Magento\SalesRule\Api\CouponManagementInterface;
-+use Magento\SalesRule\Api\Data\CouponGenerationSpecInterface;
-+use Magento\Framework\Notification\NotifierInterface;
-+
-+/**
-+ * Consumer for export coupons generation.
-+ */
-+class Consumer
-+{
-+    /**
-+     * @var NotifierInterface
-+     */
-+    private $notifier;
-+
-+    /**
-+     * @var \Psr\Log\LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var CouponManagementInterface
-+     */
-+    private $couponManager;
-+
-+    /**
-+     * @var Filesystem
-+     */
-+    private $filesystem;
-+
-+    /**
-+     * Consumer constructor.
-+     * @param \Psr\Log\LoggerInterface $logger
-+     * @param CouponManagementInterface $couponManager
-+     * @param Filesystem $filesystem
-+     * @param NotifierInterface $notifier
-+     */
-+    public function __construct(
-+        \Psr\Log\LoggerInterface $logger,
-+        CouponManagementInterface $couponManager,
-+        Filesystem $filesystem,
-+        NotifierInterface $notifier
-+    ) {
-+        $this->logger = $logger;
-+        $this->couponManager = $couponManager;
-+        $this->filesystem = $filesystem;
-+        $this->notifier = $notifier;
-+    }
-+
-+    /**
-+     * Consumer logic.
-+     *
-+     * @param CouponGenerationSpecInterface $exportInfo
-+     * @return void
-+     */
-+    public function process(CouponGenerationSpecInterface $exportInfo)
-+    {
-+        try {
-+            $this->couponManager->generate($exportInfo);
-+
-+            $this->notifier->addMajor(
-+                __('Your coupons are ready'),
-+                __('You can check your coupons at sales rule page')
-+            );
-+        } catch (LocalizedException $exception) {
-+            $this->notifier->addCritical(
-+                __('Error during coupons generator process occurred'),
-+                __('Error during coupons generator process occurred. Please check logs for detail')
-+            );
-+            $this->logger->critical(
-+                'Something went wrong while coupons generator process. ' . $exception->getMessage()
-+            );
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php
-index 453a022d313..b9cac227be1 100644
---- a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php
-+++ b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php
-@@ -168,16 +168,10 @@ class Massgenerator extends \Magento\Framework\Model\AbstractModel implements
-                 ++$attempt;
-             } while ($this->getResource()->exists($code));
- 
--            $expirationDate = $this->getToDate();
--            if ($expirationDate instanceof \DateTimeInterface) {
--                $expirationDate = $expirationDate->format('Y-m-d H:i:s');
--            }
--
-             $coupon->setId(null)
-                 ->setRuleId($this->getRuleId())
-                 ->setUsageLimit($this->getUsesPerCoupon())
-                 ->setUsagePerCustomer($this->getUsagePerCustomer())
--                ->setExpirationDate($expirationDate)
-                 ->setCreatedAt($nowTimestamp)
-                 ->setType(\Magento\SalesRule\Helper\Coupon::COUPON_TYPE_SPECIFIC_AUTOGENERATED)
-                 ->setCode($code)
-diff --git a/app/code/Magento/SalesRule/Model/Coupon/UpdateCouponUsages.php b/app/code/Magento/SalesRule/Model/Coupon/UpdateCouponUsages.php
-new file mode 100644
-index 00000000000..c4f7652e1a3
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Model/Coupon/UpdateCouponUsages.php
-@@ -0,0 +1,153 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\SalesRule\Model\Coupon;
-+
-+use Magento\Sales\Model\Order;
-+use Magento\SalesRule\Model\Coupon;
-+use Magento\SalesRule\Model\ResourceModel\Coupon\Usage;
-+use Magento\SalesRule\Model\Rule\CustomerFactory;
-+use Magento\SalesRule\Model\RuleFactory;
-+
-+/**
-+ * Updates the coupon usages.
-+ */
-+class UpdateCouponUsages
-+{
-+    /**
-+     * @var RuleFactory
-+     */
-+    private $ruleFactory;
-+
-+    /**
-+     * @var RuleFactory
-+     */
-+    private $ruleCustomerFactory;
-+
-+    /**
-+     * @var Coupon
-+     */
-+    private $coupon;
-+
-+    /**
-+     * @var Usage
-+     */
-+    private $couponUsage;
-+
-+    /**
-+     * @param RuleFactory $ruleFactory
-+     * @param CustomerFactory $ruleCustomerFactory
-+     * @param Coupon $coupon
-+     * @param Usage $couponUsage
-+     */
-+    public function __construct(
-+        RuleFactory $ruleFactory,
-+        CustomerFactory $ruleCustomerFactory,
-+        Coupon $coupon,
-+        Usage $couponUsage
-+    ) {
-+        $this->ruleFactory = $ruleFactory;
-+        $this->ruleCustomerFactory = $ruleCustomerFactory;
-+        $this->coupon = $coupon;
-+        $this->couponUsage = $couponUsage;
-+    }
-+
-+    /**
-+     * Executes the current command.
-+     *
-+     * @param Order $subject
-+     * @param bool $increment
-+     * @return Order
-+     */
-+    public function execute(Order $subject, bool $increment): Order
-+    {
-+        if (!$subject || !$subject->getAppliedRuleIds()) {
-+            return $subject;
-+        }
-+        // lookup rule ids
-+        $ruleIds = explode(',', $subject->getAppliedRuleIds());
-+        $ruleIds = array_unique($ruleIds);
-+        $customerId = (int)$subject->getCustomerId();
-+        // use each rule (and apply to customer, if applicable)
-+        foreach ($ruleIds as $ruleId) {
-+            if (!$ruleId) {
-+                continue;
-+            }
-+            $this->updateRuleUsages($increment, (int)$ruleId, $customerId);
-+        }
-+        $this->updateCouponUsages($subject, $increment, $customerId);
-+
-+        return $subject;
-+    }
-+
-+    /**
-+     * Update the number of rule usages.
-+     *
-+     * @param bool $increment
-+     * @param int $ruleId
-+     * @param int $customerId
-+     */
-+    private function updateRuleUsages(bool $increment, int $ruleId, int $customerId)
-+    {
-+        /** @var \Magento\SalesRule\Model\Rule $rule */
-+        $rule = $this->ruleFactory->create();
-+        $rule->load($ruleId);
-+        if ($rule->getId()) {
-+            $rule->loadCouponCode();
-+            if ($increment || $rule->getTimesUsed() > 0) {
-+                $rule->setTimesUsed($rule->getTimesUsed() + ($increment ? 1 : -1));
-+                $rule->save();
-+            }
-+            if ($customerId) {
-+                $this->updateCustomerRuleUsages($increment, $ruleId, $customerId);
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Update the number of rule usages per customer.
-+     *
-+     * @param bool $increment
-+     * @param int $ruleId
-+     * @param int $customerId
-+     */
-+    private function updateCustomerRuleUsages(bool $increment, int $ruleId, int $customerId): void
-+    {
-+        /** @var \Magento\SalesRule\Model\Rule\Customer $ruleCustomer */
-+        $ruleCustomer = $this->ruleCustomerFactory->create();
-+        $ruleCustomer->loadByCustomerRule($customerId, $ruleId);
-+        if ($ruleCustomer->getId()) {
-+            if ($increment || $ruleCustomer->getTimesUsed() > 0) {
-+                $ruleCustomer->setTimesUsed($ruleCustomer->getTimesUsed() + ($increment ? 1 : -1));
-+            }
-+        } elseif ($increment) {
-+            $ruleCustomer->setCustomerId($customerId)->setRuleId($ruleId)->setTimesUsed(1);
-+        }
-+        $ruleCustomer->save();
-+    }
-+
-+    /**
-+     * Update the number of coupon usages.
-+     *
-+     * @param Order $subject
-+     * @param bool $increment
-+     * @param int $customerId
-+     */
-+    private function updateCouponUsages(Order $subject, bool $increment, int $customerId): void
-+    {
-+        $this->coupon->load($subject->getCouponCode(), 'code');
-+        if ($this->coupon->getId()) {
-+            if ($increment || $this->coupon->getTimesUsed() > 0) {
-+                $this->coupon->setTimesUsed($this->coupon->getTimesUsed() + ($increment ? 1 : -1));
-+                $this->coupon->save();
-+            }
-+            if ($customerId) {
-+                $this->couponUsage->updateCustomerCouponTimesUsed($customerId, $this->coupon->getId(), $increment);
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/SalesRule/Model/CouponRepository.php b/app/code/Magento/SalesRule/Model/CouponRepository.php
-index 99d6727a8be..4c557832fa8 100644
---- a/app/code/Magento/SalesRule/Model/CouponRepository.php
-+++ b/app/code/Magento/SalesRule/Model/CouponRepository.php
-@@ -8,7 +8,6 @@ namespace Magento\SalesRule\Model;
- 
- use Magento\Framework\Api\Search\FilterGroup;
- use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
--use Magento\Framework\Api\SortOrder;
- use Magento\SalesRule\Model\ResourceModel\Coupon\Collection;
- 
- /**
-@@ -119,7 +118,6 @@ class CouponRepository implements \Magento\SalesRule\Api\CouponRepositoryInterfa
-                     __('Specified rule does not allow auto generated coupons')
-                 );
-             }
--            $coupon->setExpirationDate($rule->getToDate());
-             $coupon->setUsageLimit($rule->getUsesPerCoupon());
-             $coupon->setUsagePerCustomer($rule->getUsesPerCustomer());
-         } catch (\Exception $e) {
-@@ -197,13 +195,13 @@ class CouponRepository implements \Magento\SalesRule\Api\CouponRepositoryInterfa
-     /**
-      * Helper function that adds a FilterGroup to the collection.
-      *
--     * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
-+     * @param FilterGroup $filterGroup
-      * @param Collection $collection
-      * @deprecated 100.2.0
-      * @return void
-      */
-     protected function addFilterGroupToCollection(
--        \Magento\Framework\Api\Search\FilterGroup $filterGroup,
-+        FilterGroup $filterGroup,
-         Collection $collection
-     ) {
-         $fields = [];
-diff --git a/app/code/Magento/SalesRule/Model/Data/Rule.php b/app/code/Magento/SalesRule/Model/Data/Rule.php
-index 72465b28503..58520831c01 100644
---- a/app/code/Magento/SalesRule/Model/Data/Rule.php
-+++ b/app/code/Magento/SalesRule/Model/Data/Rule.php
-@@ -16,8 +16,7 @@ use Magento\SalesRule\Api\Data\RuleInterface;
-  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
-  * @codeCoverageIgnore
-  */
--class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements
--    \Magento\SalesRule\Api\Data\RuleInterface
-+class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements RuleInterface
- {
-     const KEY_RULE_ID = 'rule_id';
-     const KEY_NAME = 'name';
-@@ -271,6 +270,8 @@ class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements
-     }
- 
-     /**
-+     * Set Is Advanced
-+     *
-      * @param bool $isAdvanced
-      * @return $this
-      */
-@@ -374,6 +375,8 @@ class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements
-     }
- 
-     /**
-+     * Set Sort Order
-+     *
-      * @param int $sortOrder
-      * @return $this
-      */
-@@ -617,7 +620,7 @@ class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @return \Magento\SalesRule\Api\Data\RuleExtensionInterface|null
-      */
-@@ -627,7 +630,7 @@ class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @param \Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes
-      * @return $this
-diff --git a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
-index 9705808c88a..b9d461037a2 100644
---- a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
-+++ b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\SalesRule\Model\Plugin;
- 
--use Magento\Store\Model\StoreManagerInterface;
--use Magento\Customer\Model\Session;
- use Magento\SalesRule\Model\ResourceModel\Rule as RuleResource;
- 
-+/**
-+ * Quote Config Product Attributes Class
-+ */
- class QuoteConfigProductAttributes
- {
-     /**
-diff --git a/app/code/Magento/SalesRule/Model/Quote/Address/Total/ShippingDiscount.php b/app/code/Magento/SalesRule/Model/Quote/Address/Total/ShippingDiscount.php
-new file mode 100644
-index 00000000000..53adcd268f8
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Model/Quote/Address/Total/ShippingDiscount.php
-@@ -0,0 +1,101 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\SalesRule\Model\Quote\Address\Total;
-+
-+use Magento\Quote\Api\Data\ShippingAssignmentInterface as ShippingAssignment;
-+use Magento\Quote\Model\Quote;
-+use Magento\Quote\Model\Quote\Address\Total;
-+use Magento\SalesRule\Model\Quote\Discount as DiscountCollector;
-+use Magento\SalesRule\Model\Validator;
-+
-+/**
-+ * Total collector for shipping discounts.
-+ */
-+class ShippingDiscount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
-+{
-+    /**
-+     * @var Validator
-+     */
-+    private $calculator;
-+
-+    /**
-+     * @param Validator $calculator
-+     */
-+    public function __construct(Validator $calculator)
-+    {
-+        $this->calculator = $calculator;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * @param Quote $quote
-+     * @param ShippingAssignment $shippingAssignment
-+     * @param Total $total
-+     * @return ShippingDiscount
-+     */
-+    public function collect(Quote $quote, ShippingAssignment $shippingAssignment, Total $total): self
-+    {
-+        parent::collect($quote, $shippingAssignment, $total);
-+
-+        $address = $shippingAssignment->getShipping()->getAddress();
-+        $this->calculator->reset($address);
-+
-+        $items = $shippingAssignment->getItems();
-+        if (!count($items)) {
-+            return $this;
-+        }
-+
-+        $address->setShippingDiscountAmount(0);
-+        $address->setBaseShippingDiscountAmount(0);
-+        if ($address->getShippingAmount()) {
-+            $this->calculator->processShippingAmount($address);
-+            $total->addTotalAmount(DiscountCollector::COLLECTOR_TYPE_CODE, -$address->getShippingDiscountAmount());
-+            $total->addBaseTotalAmount(
-+                DiscountCollector::COLLECTOR_TYPE_CODE,
-+                -$address->getBaseShippingDiscountAmount()
-+            );
-+            $total->setShippingDiscountAmount($address->getShippingDiscountAmount());
-+            $total->setBaseShippingDiscountAmount($address->getBaseShippingDiscountAmount());
-+
-+            $this->calculator->prepareDescription($address);
-+            $total->setDiscountDescription($address->getDiscountDescription());
-+            $total->setSubtotalWithDiscount($total->getSubtotal() + $total->getDiscountAmount());
-+            $total->setBaseSubtotalWithDiscount($total->getBaseSubtotal() + $total->getBaseDiscountAmount());
-+
-+            $address->setDiscountAmount($total->getDiscountAmount());
-+            $address->setBaseDiscountAmount($total->getBaseDiscountAmount());
-+        }
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * @param \Magento\Quote\Model\Quote $quote
-+     * @param \Magento\Quote\Model\Quote\Address\Total $total
-+     * @return array
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function fetch(Quote $quote, Total $total): array
-+    {
-+        $result = [];
-+        $amount = $total->getDiscountAmount();
-+
-+        if ($amount != 0) {
-+            $description = (string)$total->getDiscountDescription() ?: '';
-+            $result = [
-+                'code' => DiscountCollector::COLLECTOR_TYPE_CODE,
-+                'title' => strlen($description) ? __('Discount (%1)', $description) : __('Discount'),
-+                'value' => $amount
-+            ];
-+        }
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
-index 693a61b272f..315ce874513 100644
---- a/app/code/Magento/SalesRule/Model/Quote/Discount.php
-+++ b/app/code/Magento/SalesRule/Model/Quote/Discount.php
-@@ -5,8 +5,13 @@
-  */
- namespace Magento\SalesRule\Model\Quote;
- 
-+/**
-+ * Discount totals calculation model.
-+ */
- class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
- {
-+    const COLLECTOR_TYPE_CODE = 'discount';
-+
-     /**
-      * Discount calculation object
-      *
-@@ -43,7 +48,7 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
-         \Magento\SalesRule\Model\Validator $validator,
-         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     ) {
--        $this->setCode('discount');
-+        $this->setCode(self::COLLECTOR_TYPE_CODE);
-         $this->eventManager = $eventManager;
-         $this->calculator = $validator;
-         $this->storeManager = $storeManager;
-@@ -124,21 +129,14 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
-             }
-         }
- 
--        /** Process shipping amount discount */
--        $address->setShippingDiscountAmount(0);
--        $address->setBaseShippingDiscountAmount(0);
--        if ($address->getShippingAmount()) {
--            $this->calculator->processShippingAmount($address);
--            $total->addTotalAmount($this->getCode(), -$address->getShippingDiscountAmount());
--            $total->addBaseTotalAmount($this->getCode(), -$address->getBaseShippingDiscountAmount());
--            $total->setShippingDiscountAmount($address->getShippingDiscountAmount());
--            $total->setBaseShippingDiscountAmount($address->getBaseShippingDiscountAmount());
--        }
--
-         $this->calculator->prepareDescription($address);
-         $total->setDiscountDescription($address->getDiscountDescription());
-         $total->setSubtotalWithDiscount($total->getSubtotal() + $total->getDiscountAmount());
-         $total->setBaseSubtotalWithDiscount($total->getBaseSubtotal() + $total->getBaseDiscountAmount());
-+
-+        $address->setDiscountAmount($total->getDiscountAmount());
-+        $address->setBaseDiscountAmount($total->getBaseDiscountAmount());
-+
-         return $this;
-     }
- 
-diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php
-index 3907261cad1..42498448cd1 100644
---- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php
-+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php
-@@ -34,14 +34,6 @@ class Coupon extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implem
-      */
-     public function _beforeSave(AbstractModel $object)
-     {
--        if (!$object->getExpirationDate()) {
--            $object->setExpirationDate(null);
--        } elseif ($object->getExpirationDate() instanceof \DateTimeInterface) {
--            $object->setExpirationDate(
--                $object->getExpirationDate()->format('Y-m-d H:i:s')
--            );
--        }
--
-         // maintain single primary coupon per rule
-         $object->setIsPrimary($object->getIsPrimary() ? 1 : null);
- 
-@@ -51,10 +43,10 @@ class Coupon extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implem
-     /**
-      * Load primary coupon (is_primary = 1) for specified rule
-      *
--     *
-      * @param \Magento\SalesRule\Model\Coupon $object
-      * @param \Magento\SalesRule\Model\Rule|int $rule
-      * @return bool
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function loadPrimaryByRule(\Magento\SalesRule\Model\Coupon $object, $rule)
-     {
-@@ -126,13 +118,6 @@ class Coupon extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implem
-             $updateArray['usage_per_customer'] = $rule->getUsesPerCustomer();
-         }
- 
--        $ruleNewDate = new \DateTime($rule->getToDate());
--        $ruleOldDate = new \DateTime($rule->getOrigData('to_date'));
--
--        if ($ruleNewDate != $ruleOldDate) {
--            $updateArray['expiration_date'] = $rule->getToDate();
--        }
--
-         if (!empty($updateArray)) {
-             $this->getConnection()->update(
-                 $this->getTable('salesrule_coupon'),
-diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php
-index 6407f04611a..39a2f8855e2 100644
---- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php
-+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php
-@@ -27,9 +27,10 @@ class Usage extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      *
-      * @param int $customerId
-      * @param mixed $couponId
-+     * @param bool $increment
-      * @return void
-      */
--    public function updateCustomerCouponTimesUsed($customerId, $couponId)
-+    public function updateCustomerCouponTimesUsed($customerId, $couponId, $increment = true): void
-     {
-         $connection = $this->getConnection();
-         $select = $connection->select();
-@@ -44,13 +45,13 @@ class Usage extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- 
-         $timesUsed = $connection->fetchOne($select, [':coupon_id' => $couponId, ':customer_id' => $customerId]);
- 
--        if ($timesUsed > 0) {
-+        if ($timesUsed !== false) {
-             $this->getConnection()->update(
-                 $this->getMainTable(),
--                ['times_used' => $timesUsed + 1],
-+                ['times_used' => $timesUsed + ($increment ? 1 : -1)],
-                 ['coupon_id = ?' => $couponId, 'customer_id = ?' => $customerId]
-             );
--        } else {
-+        } elseif ($increment) {
-             $this->getConnection()->insert(
-                 $this->getMainTable(),
-                 ['coupon_id' => $couponId, 'customer_id' => $customerId, 'times_used' => 1]
-@@ -73,11 +74,11 @@ class Usage extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-             $select = $connection->select()->from(
-                 $this->getMainTable()
-             )->where(
--                'customer_id =:customet_id'
-+                'customer_id =:customer_id'
-             )->where(
-                 'coupon_id = :coupon_id'
-             );
--            $data = $connection->fetchRow($select, [':coupon_id' => $couponId, ':customet_id' => $customerId]);
-+            $data = $connection->fetchRow($select, [':coupon_id' => $couponId, ':customer_id' => $customerId]);
-             if ($data) {
-                 $object->setData($data);
-             }
-diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php b/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
-index 193a9491081..22d8b844653 100644
---- a/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
-+++ b/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
-@@ -5,7 +5,6 @@
-  */
- namespace Magento\SalesRule\Model\ResourceModel;
- 
--use Magento\SalesRule\Model\ResourceModel\Rule;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\EntityManager\Operation\AttributeInterface;
- 
-@@ -37,11 +36,14 @@ class ReadHandler implements AttributeInterface
-     }
- 
-     /**
-+     * Read handler
-+     *
-      * @param string $entityType
-      * @param array $entityData
-      * @param array $arguments
-      * @return array
-      * @throws \Exception
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function execute($entityType, $entityData, $arguments = [])
-     {
-diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
-index 59f24fa8b6e..2150db4238f 100644
---- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
-+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
-@@ -9,6 +9,9 @@ namespace Magento\SalesRule\Model\ResourceModel\Rule;
- use Magento\Framework\DB\Select;
- use Magento\Framework\Serialize\Serializer\Json;
- use Magento\Quote\Model\Quote\Address;
-+use Magento\SalesRule\Api\Data\CouponInterface;
-+use Magento\SalesRule\Model\Coupon;
-+use Magento\SalesRule\Model\Rule;
- 
- /**
-  * Sales Rules resource collection model.
-@@ -80,6 +83,8 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
-     }
- 
-     /**
-+     * Map data for associated entities
-+     *
-      * @param string $entityType
-      * @param string $objectField
-      * @throws \Magento\Framework\Exception\LocalizedException
-@@ -105,15 +110,20 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
- 
-         $associatedEntities = $this->getConnection()->fetchAll($select);
- 
--        array_map(function ($associatedEntity) use ($entityInfo, $ruleIdField, $objectField) {
--            $item = $this->getItemByColumnValue($ruleIdField, $associatedEntity[$ruleIdField]);
--            $itemAssociatedValue = $item->getData($objectField) === null ? [] : $item->getData($objectField);
--            $itemAssociatedValue[] = $associatedEntity[$entityInfo['entity_id_field']];
--            $item->setData($objectField, $itemAssociatedValue);
--        }, $associatedEntities);
-+        array_map(
-+            function ($associatedEntity) use ($entityInfo, $ruleIdField, $objectField) {
-+                $item = $this->getItemByColumnValue($ruleIdField, $associatedEntity[$ruleIdField]);
-+                $itemAssociatedValue = $item->getData($objectField) ?? [];
-+                $itemAssociatedValue[] = $associatedEntity[$entityInfo['entity_id_field']];
-+                $item->setData($objectField, $itemAssociatedValue);
-+            },
-+            $associatedEntities
-+        );
-     }
- 
-     /**
-+     *  Add website ids and customer group ids to rules data
-+     *
-      * @return $this
-      * @throws \Exception
-      * @since 100.1.0
-@@ -137,6 +147,7 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
-      * @param string $couponCode
-      * @param string|null $now
-      * @param Address $address allow extensions to further filter out rules based on quote address
-+     * @throws \Zend_Db_Select_Exception
-      * @use $this->addWebsiteGroupDateFilter()
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      * @return $this
-@@ -149,77 +160,24 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
-         Address $address = null
-     ) {
-         if (!$this->getFlag('validation_filter')) {
--            /* We need to overwrite joinLeft if coupon is applied */
--            $this->getSelect()->reset();
--            parent::_initSelect();
-+            $this->prepareSelect($websiteId, $customerGroupId, $now);
- 
--            $this->addWebsiteGroupDateFilter($websiteId, $customerGroupId, $now);
--            $select = $this->getSelect();
-+            $noCouponRules = $this->getNoCouponCodeSelect();
- 
--            $connection = $this->getConnection();
--            if (strlen($couponCode)) {
--                $select->joinLeft(
--                    ['rule_coupons' => $this->getTable('salesrule_coupon')],
--                    $connection->quoteInto(
--                        'main_table.rule_id = rule_coupons.rule_id AND main_table.coupon_type != ?',
--                        \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
--                    ),
--                    ['code']
--                );
--
--                $noCouponWhereCondition = $connection->quoteInto(
--                    'main_table.coupon_type = ? ',
--                    \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
--                );
--
--                $autoGeneratedCouponCondition = [
--                    $connection->quoteInto(
--                        "main_table.coupon_type = ?",
--                        \Magento\SalesRule\Model\Rule::COUPON_TYPE_AUTO
--                    ),
--                    $connection->quoteInto(
--                        "rule_coupons.type = ?",
--                        \Magento\SalesRule\Api\Data\CouponInterface::TYPE_GENERATED
--                    ),
--                ];
--
--                $orWhereConditions = [
--                    "(" . implode($autoGeneratedCouponCondition, " AND ") . ")",
--                    $connection->quoteInto(
--                        '(main_table.coupon_type = ? AND main_table.use_auto_generation = 1 AND rule_coupons.type = 1)',
--                        \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC
--                    ),
--                    $connection->quoteInto(
--                        '(main_table.coupon_type = ? AND main_table.use_auto_generation = 0 AND rule_coupons.type = 0)',
--                        \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC
--                    ),
--                ];
--
--                $andWhereConditions = [
--                    $connection->quoteInto(
--                        'rule_coupons.code = ?',
--                        $couponCode
--                    ),
--                    $connection->quoteInto(
--                        '(rule_coupons.expiration_date IS NULL OR rule_coupons.expiration_date >= ?)',
--                        $this->_date->date()->format('Y-m-d')
--                    ),
--                ];
--
--                $orWhereCondition = implode(' OR ', $orWhereConditions);
--                $andWhereCondition = implode(' AND ', $andWhereConditions);
--
--                $select->where(
--                    $noCouponWhereCondition . ' OR ((' . $orWhereCondition . ') AND ' . $andWhereCondition . ')',
--                    null,
--                    Select::TYPE_CONDITION
--                );
-+            if ($couponCode) {
-+                $couponRules = $this->getCouponCodeSelect($couponCode);
-+
-+                $allAllowedRules = $this->getConnection()->select();
-+                $allAllowedRules->union([$noCouponRules, $couponRules], Select::SQL_UNION_ALL);
-+
-+                $wrapper = $this->getConnection()->select();
-+                $wrapper->from($allAllowedRules);
-+
-+                $this->_select = $wrapper;
-             } else {
--                $this->addFieldToFilter(
--                    'main_table.coupon_type',
--                    \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
--                );
-+                $this->_select = $noCouponRules;
-             }
-+
-             $this->setOrder('sort_order', self::SORT_ORDER_ASC);
-             $this->setFlag('validation_filter', true);
-         }
-@@ -227,6 +185,96 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
-         return $this;
-     }
- 
-+    /**
-+     * Recreate the default select object for specific needs of salesrule evaluation with coupon codes.
-+     *
-+     * @param int $websiteId
-+     * @param int $customerGroupId
-+     * @param string $now
-+     */
-+    private function prepareSelect($websiteId, $customerGroupId, $now)
-+    {
-+        $this->getSelect()->reset();
-+        parent::_initSelect();
-+
-+        $this->addWebsiteGroupDateFilter($websiteId, $customerGroupId, $now);
-+    }
-+
-+    /**
-+     * Return select object to determine all active rules not needing a coupon code.
-+     *
-+     * @return Select
-+     */
-+    private function getNoCouponCodeSelect()
-+    {
-+        $noCouponSelect = clone $this->getSelect();
-+
-+        $noCouponSelect->where(
-+            'main_table.coupon_type = ?',
-+            Rule::COUPON_TYPE_NO_COUPON
-+        );
-+
-+        $noCouponSelect->columns([Coupon::KEY_CODE => new \Zend_Db_Expr('NULL')]);
-+
-+        return $noCouponSelect;
-+    }
-+
-+    /**
-+     * Determine all active rules that are valid for the given coupon code.
-+     *
-+     * @param string $couponCode
-+     * @return Select
-+     */
-+    private function getCouponCodeSelect($couponCode)
-+    {
-+        $couponSelect = clone $this->getSelect();
-+
-+        $this->joinCouponTable($couponCode, $couponSelect);
-+
-+        $isAutogenerated =
-+            $this->getConnection()->quoteInto('main_table.coupon_type = ?', Rule::COUPON_TYPE_AUTO)
-+            . ' AND ' .
-+            $this->getConnection()->quoteInto('rule_coupons.type = ?', CouponInterface::TYPE_GENERATED);
-+
-+        $isValidSpecific =
-+            $this->getConnection()->quoteInto('(main_table.coupon_type = ?)', Rule::COUPON_TYPE_SPECIFIC)
-+            . ' AND (' .
-+            '(main_table.use_auto_generation = 1 AND rule_coupons.type = 1)'
-+            . ' OR ' .
-+            '(main_table.use_auto_generation = 0 AND rule_coupons.type = 0)'
-+            . ')';
-+
-+        $couponSelect->where(
-+            "$isAutogenerated OR $isValidSpecific",
-+            null,
-+            Select::TYPE_CONDITION
-+        );
-+
-+        return $couponSelect;
-+    }
-+
-+    /**
-+     * Join coupong table to select.
-+     *
-+     * @param string $couponCode
-+     * @param Select $couponSelect
-+     */
-+    private function joinCouponTable($couponCode, Select $couponSelect)
-+    {
-+        $couponJoinCondition =
-+            'main_table.rule_id = rule_coupons.rule_id'
-+            . ' AND ' .
-+            $this->getConnection()->quoteInto('main_table.coupon_type <> ?', Rule::COUPON_TYPE_NO_COUPON)
-+            . ' AND ' .
-+            $this->getConnection()->quoteInto('rule_coupons.code = ?', $couponCode);
-+
-+        $couponSelect->joinInner(
-+            ['rule_coupons' => $this->getTable('salesrule_coupon')],
-+            $couponJoinCondition,
-+            [Coupon::KEY_CODE]
-+        );
-+    }
-+
-     /**
-      * Filter collection by website(s), customer group(s) and date.
-      * Filter collection to only active rules.
-@@ -366,6 +414,8 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
-     }
- 
-     /**
-+     * Getter for _associatedEntitiesMap property
-+     *
-      * @return array
-      * @deprecated 100.1.0
-      */
-@@ -380,6 +430,8 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
-     }
- 
-     /**
-+     * Getter for dateApplier property
-+     *
-      * @return DateApplier
-      * @deprecated 100.1.0
-      */
-diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php b/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
-index 685de1b581f..d4ef15f1801 100644
---- a/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
-+++ b/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
-@@ -5,7 +5,6 @@
-  */
- namespace Magento\SalesRule\Model\ResourceModel;
- 
--use Magento\SalesRule\Model\ResourceModel\Rule;
- use Magento\Framework\EntityManager\MetadataPool;
- use Magento\Framework\EntityManager\Operation\AttributeInterface;
- 
-@@ -37,11 +36,14 @@ class SaveHandler implements AttributeInterface
-     }
- 
-     /**
-+     * Save handler
-+     *
-      * @param string $entityType
-      * @param array $entityData
-      * @param array $arguments
-      * @return array
-      * @throws \Exception
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function execute($entityType, $entityData, $arguments = [])
-     {
-diff --git a/app/code/Magento/SalesRule/Model/Rule.php b/app/code/Magento/SalesRule/Model/Rule.php
-index 59efdf5eb3f..4d4bd2aa8b3 100644
---- a/app/code/Magento/SalesRule/Model/Rule.php
-+++ b/app/code/Magento/SalesRule/Model/Rule.php
-@@ -296,8 +296,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel
-                 $this->getUsesPerCoupon() ? $this->getUsesPerCoupon() : null
-             )->setUsagePerCustomer(
-                 $this->getUsesPerCustomer() ? $this->getUsesPerCustomer() : null
--            )->setExpirationDate(
--                $this->getToDate()
-             )->save();
-         } else {
-             $this->getPrimaryCoupon()->delete();
-@@ -308,8 +306,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
-     }
- 
-     /**
--     * Initialize rule model data from array.
--     * Set store labels if applicable.
-+     * Initialize rule model data from array. Set store labels if applicable.
-      *
-      * @param array $data
-      * @return $this
-@@ -499,8 +496,8 @@ class Rule extends \Magento\Rule\Model\AbstractModel
-             $this->getUsesPerCoupon() ? $this->getUsesPerCoupon() : null
-         )->setUsagePerCustomer(
-             $this->getUsesPerCustomer() ? $this->getUsesPerCustomer() : null
--        )->setExpirationDate(
--            $this->getToDate()
-+        )->setType(
-+            \Magento\SalesRule\Api\Data\CouponInterface::TYPE_GENERATED
-         );
- 
-         $couponCode = self::getCouponCodeGenerator()->generateCode();
-@@ -539,6 +536,8 @@ class Rule extends \Magento\Rule\Model\AbstractModel
-     }
- 
-     /**
-+     * Get from date.
-+     *
-      * @return string
-      * @since 100.1.0
-      */
-@@ -548,6 +547,8 @@ class Rule extends \Magento\Rule\Model\AbstractModel
-     }
- 
-     /**
-+     * Get to date.
-+     *
-      * @return string
-      * @since 100.1.0
-      */
-@@ -610,6 +611,8 @@ class Rule extends \Magento\Rule\Model\AbstractModel
-     }
- 
-     /**
-+     * Get conditions field set id.
-+     *
-      * @param string $formName
-      * @return string
-      * @since 100.1.0
-@@ -620,6 +623,8 @@ class Rule extends \Magento\Rule\Model\AbstractModel
-     }
- 
-     /**
-+     * Get actions field set id.
-+     *
-      * @param string $formName
-      * @return string
-      * @since 100.1.0
-diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
-index 3cd776fe99f..2ae1c1c7ac6 100644
---- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
-+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
-@@ -5,7 +5,6 @@
-  */
- namespace Magento\SalesRule\Model\Rule\Action\Discount;
- 
--use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Pricing\PriceCurrencyInterface;
- use Magento\SalesRule\Model\DeltaPriceRound;
- use Magento\SalesRule\Model\Validator;
-@@ -50,6 +49,8 @@ class CartFixed extends AbstractDiscount
-     }
- 
-     /**
-+     * Fixed discount for cart calculation
-+     *
-      * @param \Magento\SalesRule\Model\Rule $rule
-      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
-      * @param float $qty
-diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
-index fd5953697c7..cf6301cb31a 100644
---- a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
-+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\SalesRule\Model\Rule\Condition;
- 
-+/**
-+ * Address rule condition data model.
-+ */
- class Address extends \Magento\Rule\Model\Condition\AbstractCondition
- {
-     /**
-@@ -58,9 +61,11 @@ class Address extends \Magento\Rule\Model\Condition\AbstractCondition
-     public function loadAttributeOptions()
-     {
-         $attributes = [
-+            'base_subtotal_with_discount' => __('Subtotal (Excl. Tax)'),
-             'base_subtotal' => __('Subtotal'),
-             'total_qty' => __('Total Items Quantity'),
-             'weight' => __('Total Weight'),
-+            'payment_method' => __('Payment Method'),
-             'shipping_method' => __('Shipping Method'),
-             'postcode' => __('Shipping Postcode'),
-             'region' => __('Shipping Region'),
-diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
-index d2e7cabe473..ff83bb1ee91 100644
---- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
-+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
-@@ -25,13 +25,145 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
-         $attributes['quote_item_qty'] = __('Quantity in cart');
-         $attributes['quote_item_price'] = __('Price in cart');
-         $attributes['quote_item_row_total'] = __('Row total in cart');
-+
-+        $attributes['parent::category_ids'] = __('Category (Parent only)');
-+        $attributes['children::category_ids'] = __('Category (Children Only)');
-+    }
-+
-+    /**
-+     * Retrieve attribute
-+     *
-+     * @return string
-+     */
-+    public function getAttribute(): string
-+    {
-+        $attribute = $this->getData('attribute');
-+        if (strpos($attribute, '::') !== false) {
-+            list(, $attribute) = explode('::', $attribute);
-+        }
-+
-+        return $attribute;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getAttributeName()
-+    {
-+        $attribute = $this->getAttribute();
-+        if ($this->getAttributeScope()) {
-+            $attribute = $this->getAttributeScope() . '::' . $attribute;
-+        }
-+
-+        return $this->getAttributeOption($attribute);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function loadAttributeOptions()
-+    {
-+        $productAttributes = $this->_productResource->loadAllAttributes()->getAttributesByCode();
-+
-+        $attributes = [];
-+        foreach ($productAttributes as $attribute) {
-+            /* @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-+            if (!$attribute->isAllowedForRuleCondition()
-+                || !$attribute->getDataUsingMethod($this->_isUsedForRuleProperty)
-+            ) {
-+                continue;
-+            }
-+            $frontLabel = $attribute->getFrontendLabel();
-+            $attributes[$attribute->getAttributeCode()] = $frontLabel;
-+            $attributes['parent::' . $attribute->getAttributeCode()] = $frontLabel . __('(Parent Only)');
-+            $attributes['children::' . $attribute->getAttributeCode()] = $frontLabel . __('(Children Only)');
-+        }
-+
-+        $this->_addSpecialAttributes($attributes);
-+
-+        asort($attributes);
-+        $this->setAttributeOption($attributes);
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getAttributeElementHtml()
-+    {
-+        $html = parent::getAttributeElementHtml() .
-+                $this->getAttributeScopeElement()->getHtml();
-+
-+        return $html;
-+    }
-+
-+    /**
-+     * Retrieve form element for scope element
-+     *
-+     * @return \Magento\Framework\Data\Form\Element\AbstractElement
-+     */
-+    private function getAttributeScopeElement(): \Magento\Framework\Data\Form\Element\AbstractElement
-+    {
-+        return $this->getForm()->addField(
-+            $this->getPrefix() . '__' . $this->getId() . '__attribute_scope',
-+            'hidden',
-+            [
-+                'name' => $this->elementName . '[' . $this->getPrefix() . '][' . $this->getId() . '][attribute_scope]',
-+                'value' => $this->getAttributeScope(),
-+                'no_span' => true,
-+                'class' => 'hidden',
-+                'data-form-part' => $this->getFormName(),
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Set attribute value
-+     *
-+     * @param string $value
-+     * @return void
-+     */
-+    public function setAttribute(string $value)
-+    {
-+        if (strpos($value, '::') !== false) {
-+            list($scope, $attribute) = explode('::', $value);
-+            $this->setData('attribute_scope', $scope);
-+            $this->setData('attribute', $attribute);
-+        } else {
-+            $this->setData('attribute', $value);
-+        }
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function loadArray($arr)
-+    {
-+        parent::loadArray($arr);
-+        $this->setAttributeScope($arr['attribute_scope'] ?? null);
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function asArray(array $arrAttributes = [])
-+    {
-+        $out = parent::asArray($arrAttributes);
-+        $out['attribute_scope'] = $this->getAttributeScope();
-+
-+        return $out;
-     }
- 
-     /**
-      * Validate Product Rule Condition
-      *
-      * @param \Magento\Framework\Model\AbstractModel $model
-+     *
-      * @return bool
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function validate(\Magento\Framework\Model\AbstractModel $model)
-     {
-@@ -89,6 +221,8 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
-     }
- 
-     /**
-+     * Get locale-based formatted price.
-+     *
-      * @param string $value
-      * @return float|null
-      */
-diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php
-index b5ac02e67b1..1649dea80ef 100644
---- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php
-+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php
-@@ -8,6 +8,7 @@ namespace Magento\SalesRule\Model\Rule\Condition\Product;
- use Magento\Catalog\Model\ResourceModel\Product\Collection;
- 
- /**
-+ * Combine conditions for product.
-  * @api
-  * @since 100.0.2
-  */
-@@ -85,4 +86,73 @@ class Combine extends \Magento\Rule\Model\Condition\Combine
-         }
-         return $this;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _isValid($entity)
-+    {
-+        if (!$this->getConditions()) {
-+            return true;
-+        }
-+
-+        $all = $this->getAggregator() === 'all';
-+        $true = (bool)$this->getValue();
-+
-+        foreach ($this->getConditions() as $cond) {
-+            if ($entity instanceof \Magento\Framework\Model\AbstractModel) {
-+                $validated = $this->validateEntity($cond, $entity);
-+            } else {
-+                $validated = $cond->validateByEntityId($entity);
-+            }
-+            if ($all && $validated !== $true) {
-+                return false;
-+            } elseif (!$all && $validated === $true) {
-+                return true;
-+            }
-+        }
-+        return $all ? true : false;
-+    }
-+
-+    /**
-+     * Validate entity.
-+     *
-+     * @param object $cond
-+     * @param \Magento\Framework\Model\AbstractModel $entity
-+     * @return bool
-+     */
-+    private function validateEntity($cond, \Magento\Framework\Model\AbstractModel $entity)
-+    {
-+        $true = (bool)$this->getValue();
-+        $validated = !$true;
-+        foreach ($this->retrieveValidateEntities($cond->getAttributeScope(), $entity) as $validateEntity) {
-+            $validated = $cond->validate($validateEntity);
-+            if ($validated === $true) {
-+                break;
-+            }
-+        }
-+
-+        return $validated;
-+    }
-+
-+    /**
-+     * Retrieve entities for validation by attribute scope
-+     *
-+     * @param string $attributeScope
-+     * @param \Magento\Framework\Model\AbstractModel $entity
-+     * @return \Magento\Framework\Model\AbstractModel[]
-+     */
-+    private function retrieveValidateEntities($attributeScope, \Magento\Framework\Model\AbstractModel $entity)
-+    {
-+        if ($attributeScope === 'parent') {
-+            $validateEntities = [$entity];
-+        } elseif ($attributeScope === 'children') {
-+            $validateEntities = $entity->getChildren() ?: [$entity];
-+        } else {
-+            $validateEntities = $entity->getChildren() ?: [];
-+            $validateEntities[] = $entity;
-+        }
-+
-+        return $validateEntities;
-+    }
- }
-diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
-index 1e8fbf43ec3..5b02d3c0809 100644
---- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
-+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\SalesRule\Model\Rule\Condition\Product;
- 
-+/**
-+ * Subselect conditions for product.
-+ */
- class Subselect extends \Magento\SalesRule\Model\Rule\Condition\Product\Combine
- {
-     /**
-@@ -161,7 +164,9 @@ class Subselect extends \Magento\SalesRule\Model\Rule\Condition\Product\Combine
-                 }
-             }
-             if ($hasValidChild || parent::validate($item)) {
--                $total += (($hasValidChild && $useChildrenTotal) ? $childrenAttrTotal : $item->getData($attr));
-+                $total += ($hasValidChild && $useChildrenTotal)
-+                    ? $childrenAttrTotal * $item->getQty()
-+                    : $item->getData($attr);
-             }
-         }
-         return $this->validateAttribute($total);
-diff --git a/app/code/Magento/SalesRule/Model/Rule/DataProvider.php b/app/code/Magento/SalesRule/Model/Rule/DataProvider.php
-index 91682577637..25f0ef91eae 100644
---- a/app/code/Magento/SalesRule/Model/Rule/DataProvider.php
-+++ b/app/code/Magento/SalesRule/Model/Rule/DataProvider.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\SalesRule\Model\Rule;
- 
-+use Magento\Framework\App\Request\DataPersistorInterface;
- use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
- use Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory;
- use Magento\SalesRule\Model\Rule;
-@@ -36,6 +37,11 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-      */
-     protected $metadataValueProvider;
- 
-+    /**
-+     * @var DataPersistorInterface
-+     */
-+    private $dataPersistor;
-+
-     /**
-      * Initialize dependencies.
-      *
-@@ -47,6 +53,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-      * @param Metadata\ValueProvider $metadataValueProvider
-      * @param array $meta
-      * @param array $data
-+     * @param DataPersistorInterface $dataPersistor
-      */
-     public function __construct(
-         $name,
-@@ -56,12 +63,16 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-         \Magento\Framework\Registry $registry,
-         \Magento\SalesRule\Model\Rule\Metadata\ValueProvider $metadataValueProvider,
-         array $meta = [],
--        array $data = []
-+        array $data = [],
-+        DataPersistorInterface $dataPersistor = null
-     ) {
-         $this->collection = $collectionFactory->create();
-         $this->coreRegistry = $registry;
-         $this->metadataValueProvider = $metadataValueProvider;
-         $meta = array_replace_recursive($this->getMetadataValues(), $meta);
-+        $this->dataPersistor = $dataPersistor ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
-+            DataPersistorInterface::class
-+        );
-         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
-     }
- 
-@@ -77,7 +88,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getData()
-     {
-@@ -93,6 +104,13 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
- 
-             $this->loadedData[$rule->getId()] = $rule->getData();
-         }
-+        $data = $this->dataPersistor->get('sale_rule');
-+        if (!empty($data)) {
-+            $rule = $this->collection->getNewEmptyItem();
-+            $rule->setData($data);
-+            $this->loadedData[$rule->getId()] = $rule->getData();
-+            $this->dataPersistor->clear('sale_rule');
-+        }
- 
-         return $this->loadedData;
-     }
-diff --git a/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php b/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php
-index b57daac1f0d..fdd6c2b169a 100644
---- a/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php
-+++ b/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php
-@@ -5,7 +5,6 @@
-  */
- namespace Magento\SalesRule\Model\Rule\Metadata;
- 
--use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
- use Magento\SalesRule\Model\Rule;
- use Magento\Store\Model\System\Store;
- use Magento\Customer\Api\GroupRepositoryInterface;
-diff --git a/app/code/Magento/SalesRule/Model/RuleRepository.php b/app/code/Magento/SalesRule/Model/RuleRepository.php
-index a2279db85aa..2cff0d64dba 100644
---- a/app/code/Magento/SalesRule/Model/RuleRepository.php
-+++ b/app/code/Magento/SalesRule/Model/RuleRepository.php
-@@ -8,7 +8,6 @@ namespace Magento\SalesRule\Model;
- use Magento\Framework\Api\Search\FilterGroup;
- use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
- use Magento\Framework\Api\SearchCriteriaInterface;
--use Magento\Framework\Api\SortOrder;
- use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
- 
- /**
-@@ -107,7 +106,7 @@ class RuleRepository implements \Magento\SalesRule\Api\RuleRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function save(\Magento\SalesRule\Api\Data\RuleInterface $rule)
-     {
-@@ -119,7 +118,7 @@ class RuleRepository implements \Magento\SalesRule\Api\RuleRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getById($id)
-     {
-@@ -136,7 +135,7 @@ class RuleRepository implements \Magento\SalesRule\Api\RuleRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getList(SearchCriteriaInterface $searchCriteria)
-     {
-@@ -183,13 +182,13 @@ class RuleRepository implements \Magento\SalesRule\Api\RuleRepositoryInterface
-     /**
-      * Helper function that adds a FilterGroup to the collection.
-      *
--     * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
-+     * @param FilterGroup $filterGroup
-      * @param Collection $collection
-      * @deprecated 100.2.0
-      * @return void
-      */
-     protected function addFilterGroupToCollection(
--        \Magento\Framework\Api\Search\FilterGroup $filterGroup,
-+        FilterGroup $filterGroup,
-         Collection $collection
-     ) {
-         $fields = [];
-diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
-index 5c0f97ae0b0..ea0221d8f07 100644
---- a/app/code/Magento/SalesRule/Model/Validator.php
-+++ b/app/code/Magento/SalesRule/Model/Validator.php
-@@ -182,6 +182,8 @@ class Validator extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Address id getter.
-+     *
-      * @param Address $address
-      * @return string
-      */
-@@ -327,21 +329,7 @@ class Validator extends \Magento\Framework\Model\AbstractModel
-                     $baseDiscountAmount = $rule->getDiscountAmount();
-                     break;
-                 case \Magento\SalesRule\Model\Rule::CART_FIXED_ACTION:
--                    $cartRules = $address->getCartFixedRules();
--                    if (!isset($cartRules[$rule->getId()])) {
--                        $cartRules[$rule->getId()] = $rule->getDiscountAmount();
--                    }
--                    if ($cartRules[$rule->getId()] > 0) {
--                        $quoteAmount = $this->priceCurrency->convert($cartRules[$rule->getId()], $quote->getStore());
--                        $discountAmount = min($shippingAmount - $address->getShippingDiscountAmount(), $quoteAmount);
--                        $baseDiscountAmount = min(
--                            $baseShippingAmount - $address->getBaseShippingDiscountAmount(),
--                            $cartRules[$rule->getId()]
--                        );
--                        $cartRules[$rule->getId()] -= $baseDiscountAmount;
--                    }
--
--                    $address->setCartFixedRules($cartRules);
-+                    // Shouldn't be proceed according to MAGETWO-96403
-                     break;
-             }
- 
-@@ -519,6 +507,8 @@ class Validator extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Rule total items getter.
-+     *
-      * @param int $key
-      * @return array
-      * @throws \Magento\Framework\Exception\LocalizedException
-@@ -533,6 +523,8 @@ class Validator extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Decrease rule items count.
-+     *
-      * @param int $key
-      * @return $this
-      */
-diff --git a/app/code/Magento/SalesRule/Observer/SalesOrderAfterPlaceObserver.php b/app/code/Magento/SalesRule/Observer/SalesOrderAfterPlaceObserver.php
-deleted file mode 100644
-index a49802d4c30..00000000000
---- a/app/code/Magento/SalesRule/Observer/SalesOrderAfterPlaceObserver.php
-+++ /dev/null
-@@ -1,110 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\SalesRule\Observer;
--
--use Magento\Framework\Event\Observer as EventObserver;
--use Magento\Framework\Event\ObserverInterface;
--
--class SalesOrderAfterPlaceObserver implements ObserverInterface
--{
--    /**
--     * @var \Magento\SalesRule\Model\RuleFactory
--     */
--    protected $_ruleFactory;
--
--    /**
--     * @var \Magento\SalesRule\Model\RuleFactory
--     */
--    protected $_ruleCustomerFactory;
--
--    /**
--     * @var \Magento\SalesRule\Model\Coupon
--     */
--    protected $_coupon;
--
--    /**
--     * @var \Magento\SalesRule\Model\ResourceModel\Coupon\Usage
--     */
--    protected $_couponUsage;
--
--    /**
--     * @param \Magento\SalesRule\Model\RuleFactory $ruleFactory
--     * @param \Magento\SalesRule\Model\Rule\CustomerFactory $ruleCustomerFactory
--     * @param \Magento\SalesRule\Model\Coupon $coupon
--     * @param \Magento\SalesRule\Model\ResourceModel\Coupon\Usage $couponUsage
--     */
--    public function __construct(
--        \Magento\SalesRule\Model\RuleFactory $ruleFactory,
--        \Magento\SalesRule\Model\Rule\CustomerFactory $ruleCustomerFactory,
--        \Magento\SalesRule\Model\Coupon $coupon,
--        \Magento\SalesRule\Model\ResourceModel\Coupon\Usage $couponUsage
--    ) {
--        $this->_ruleFactory = $ruleFactory;
--        $this->_ruleCustomerFactory = $ruleCustomerFactory;
--        $this->_coupon = $coupon;
--        $this->_couponUsage = $couponUsage;
--    }
--
--    /**
--     * @param EventObserver $observer
--     * @return $this
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     */
--    public function execute(EventObserver $observer)
--    {
--        $order = $observer->getEvent()->getOrder();
--
--        if (!$order || !$order->getAppliedRuleIds()) {
--            return $this;
--        }
--
--        // lookup rule ids
--        $ruleIds = explode(',', $order->getAppliedRuleIds());
--        $ruleIds = array_unique($ruleIds);
--
--        $ruleCustomer = null;
--        $customerId = $order->getCustomerId();
--
--        // use each rule (and apply to customer, if applicable)
--        foreach ($ruleIds as $ruleId) {
--            if (!$ruleId) {
--                continue;
--            }
--            /** @var \Magento\SalesRule\Model\Rule $rule */
--            $rule = $this->_ruleFactory->create();
--            $rule->load($ruleId);
--            if ($rule->getId()) {
--                $rule->loadCouponCode();
--                $rule->setTimesUsed($rule->getTimesUsed() + 1);
--                $rule->save();
--
--                if ($customerId) {
--                    /** @var \Magento\SalesRule\Model\Rule\Customer $ruleCustomer */
--                    $ruleCustomer = $this->_ruleCustomerFactory->create();
--                    $ruleCustomer->loadByCustomerRule($customerId, $ruleId);
--
--                    if ($ruleCustomer->getId()) {
--                        $ruleCustomer->setTimesUsed($ruleCustomer->getTimesUsed() + 1);
--                    } else {
--                        $ruleCustomer->setCustomerId($customerId)->setRuleId($ruleId)->setTimesUsed(1);
--                    }
--                    $ruleCustomer->save();
--                }
--            }
--        }
--
--        $this->_coupon->load($order->getCouponCode(), 'code');
--        if ($this->_coupon->getId()) {
--            $this->_coupon->setTimesUsed($this->_coupon->getTimesUsed() + 1);
--            $this->_coupon->save();
--            if ($customerId) {
--                $this->_couponUsage->updateCustomerCouponTimesUsed($customerId, $this->_coupon->getId());
--            }
--        }
--
--        return $this;
--    }
--}
-diff --git a/app/code/Magento/SalesRule/Plugin/CouponUsagesDecrement.php b/app/code/Magento/SalesRule/Plugin/CouponUsagesDecrement.php
-new file mode 100644
-index 00000000000..5f28632a54c
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Plugin/CouponUsagesDecrement.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\SalesRule\Plugin;
-+
-+use Magento\Sales\Model\Order;
-+use Magento\SalesRule\Model\Coupon\UpdateCouponUsages;
-+
-+/**
-+ * Decrements number of coupon usages after cancelling order.
-+ */
-+class CouponUsagesDecrement
-+{
-+    /**
-+     * @var UpdateCouponUsages
-+     */
-+    private $updateCouponUsages;
-+
-+    /**
-+     * @param UpdateCouponUsages $updateCouponUsages
-+     */
-+    public function __construct(
-+        UpdateCouponUsages $updateCouponUsages
-+    ) {
-+        $this->updateCouponUsages = $updateCouponUsages;
-+    }
-+
-+    /**
-+     * Decrements number of coupon usages after cancelling order.
-+     *
-+     * @param Order $subject
-+     * @param callable $proceed
-+     * @return Order
-+     */
-+    public function aroundCancel(Order $subject, callable $proceed): Order
-+    {
-+        $canCancel = $subject->canCancel();
-+        $returnValue = $proceed();
-+        if ($canCancel) {
-+            $returnValue = $this->updateCouponUsages->execute($returnValue, false);
-+        }
-+
-+        return $returnValue;
-+    }
-+}
-diff --git a/app/code/Magento/SalesRule/Plugin/CouponUsagesIncrement.php b/app/code/Magento/SalesRule/Plugin/CouponUsagesIncrement.php
-new file mode 100644
-index 00000000000..473a368afb2
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Plugin/CouponUsagesIncrement.php
-@@ -0,0 +1,46 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\SalesRule\Plugin;
-+
-+use Magento\Sales\Model\Order;
-+use Magento\SalesRule\Model\Coupon\UpdateCouponUsages;
-+
-+/**
-+ * Increments number of coupon usages after placing order.
-+ */
-+class CouponUsagesIncrement
-+{
-+    /**
-+     * @var UpdateCouponUsages
-+     */
-+    private $updateCouponUsages;
-+
-+    /**
-+     * @param UpdateCouponUsages $updateCouponUsages
-+     */
-+    public function __construct(
-+        UpdateCouponUsages $updateCouponUsages
-+    ) {
-+        $this->updateCouponUsages = $updateCouponUsages;
-+    }
-+
-+    /**
-+     * Increments number of coupon usages after placing order.
-+     *
-+     * @param Order $subject
-+     * @param Order $result
-+     * @return Order
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterPlace(Order $subject, Order $result): Order
-+    {
-+        $this->updateCouponUsages->execute($subject, true);
-+
-+        return $subject;
-+    }
-+}
-diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
-index 8a8c51e9d34..e863f2af335 100644
---- a/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
-+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
-@@ -6,12 +6,12 @@
- 
- namespace Magento\SalesRule\Setup\Patch\Data;
- 
--use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\Setup\Patch\DataPatchInterface;
- use Magento\Framework\Setup\Patch\PatchVersionInterface;
- 
- /**
-  * Class ConvertSerializedDataToJson
-+ *
-  * @package Magento\SalesRule\Setup\Patch
-  */
- class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInterface
-@@ -59,7 +59,7 @@ class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getDependencies()
-     {
-@@ -69,7 +69,7 @@ class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getVersion()
-     {
-@@ -77,7 +77,7 @@ class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInt
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAliases()
-     {
-diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php b/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
-index 625d5769fdd..22cf4fe6b10 100644
---- a/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
-+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
-@@ -6,13 +6,13 @@
- 
- namespace Magento\SalesRule\Setup\Patch\Data;
- 
--use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\App\State;
- use Magento\Framework\Setup\Patch\DataPatchInterface;
- use Magento\Framework\Setup\Patch\PatchVersionInterface;
- 
- /**
-  * Class FillSalesRuleProductAttributeTable
-+ *
-  * @package Magento\SalesRule\Setup\Patch
-  */
- class FillSalesRuleProductAttributeTable implements DataPatchInterface, PatchVersionInterface
-@@ -65,7 +65,7 @@ class FillSalesRuleProductAttributeTable implements DataPatchInterface, PatchVer
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function apply()
-     {
-@@ -102,7 +102,7 @@ class FillSalesRuleProductAttributeTable implements DataPatchInterface, PatchVer
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getDependencies()
-     {
-@@ -112,7 +112,7 @@ class FillSalesRuleProductAttributeTable implements DataPatchInterface, PatchVer
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getVersion()
-     {
-@@ -120,7 +120,7 @@ class FillSalesRuleProductAttributeTable implements DataPatchInterface, PatchVer
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAliases()
-     {
-diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php b/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
-index 2387f5f1ed7..cad83b6f5d1 100644
---- a/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
-+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
-@@ -7,33 +7,33 @@
- namespace Magento\SalesRule\Setup\Patch\Data;
- 
- use Magento\Framework\Setup\ModuleDataSetupInterface;
--use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\Setup\Patch\DataPatchInterface;
- use Magento\Framework\Setup\Patch\PatchVersionInterface;
- 
- /**
-  * Class PrepareRuleModelSerializedData
-+ *
-  * @package Magento\SalesRule\Setup\Patch
-  */
- class PrepareRuleModelSerializedData implements DataPatchInterface, PatchVersionInterface
- {
-     /**
--     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
-+     * @var ModuleDataSetupInterface
-      */
-     private $moduleDataSetup;
- 
-     /**
-      * PatchInitial constructor.
--     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
-+     * @param ModuleDataSetupInterface $moduleDataSetup
-      */
-     public function __construct(
--        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
-+        ModuleDataSetupInterface $moduleDataSetup
-     ) {
-         $this->moduleDataSetup = $moduleDataSetup;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function apply()
-     {
-@@ -59,7 +59,7 @@ class PrepareRuleModelSerializedData implements DataPatchInterface, PatchVersion
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getDependencies()
-     {
-@@ -67,7 +67,7 @@ class PrepareRuleModelSerializedData implements DataPatchInterface, PatchVersion
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getVersion()
-     {
-@@ -75,7 +75,7 @@ class PrepareRuleModelSerializedData implements DataPatchInterface, PatchVersion
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAliases()
-     {
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminAssertCustomerGroupOnCartPriceRuleFormActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminAssertCustomerGroupOnCartPriceRuleFormActionGroup.xml
-new file mode 100644
-index 00000000000..083e220d0e9
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminAssertCustomerGroupOnCartPriceRuleFormActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAssertCustomerGroupOnCartPriceRuleForm">
-+        <arguments>
-+            <argument name="customerGroupName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{PriceRuleNewPage.url}}" stepKey="amOnCartPriceRuleCreateCreatePage"/>
-+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.customerGroups}}" stepKey="waitForElementVisible"/>
-+        <see selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="{{customerGroupName}}" stepKey="assertCustomerGroupPresentOnCartPriceRuleForm"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
-index 997b3b4b9ff..210259f474e 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
-@@ -6,9 +6,59 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="selectNotLoggedInCustomerGroup">
-         <!-- This actionGroup was created to be merged from B2B because B2B has a very different form control here -->
-         <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
-     </actionGroup>
-+
-+    <actionGroup name="selectRetailerCustomerGroup">
-+        <!-- This actionGroup was created to be merged from B2B. Retailer Customer Group -->
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="Retailer" stepKey="selectRetailerCustomerGroup"/>
-+    </actionGroup>
-+
-+    <!--Set Subtotal condition for Customer Segment-->
-+    <actionGroup name="SetCartAttributeConditionForCartPriceRuleActionGroup">
-+        <arguments>
-+            <argument name="attributeName" type="string"/>
-+            <argument name="operatorType" defaultValue="is" type="string"/>
-+            <argument name="value" type="string"/>
-+        </arguments>
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="scrollToActionTab"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.conditionsHeaderOpen}}"
-+                          visible="false" stepKey="openActionTab"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.conditions}}" stepKey="applyRuleForConditions"/>
-+        <waitForPageLoad stepKey="waitForDropDownOpened"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.childAttribute}}" userInput="{{attributeName}}" stepKey="selectAttribute"/>
-+        <waitForPageLoad stepKey="waitForOperatorOpened"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.condition('is')}}" stepKey="clickToChooseOption"/>
-+        <selectOption userInput="{{operatorType}}" selector="{{AdminCartPriceRulesFormSection.conditionsOperator}}" stepKey="setOperatorType"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.condition('...')}}" stepKey="clickToChooseOption1"/>
-+        <fillField userInput="{{value}}" selector="{{AdminCartPriceRulesFormSection.conditionsValue}}" stepKey="fillActionValue"/>
-+        <click selector="{{AdminMainActionsSection.saveAndContinue}}" stepKey="clickSaveButton"/>
-+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+
-+    <actionGroup name="SetConditionForActionsInCartPriceRuleActionGroup">
-+        <arguments>
-+            <argument name="actionsAggregator" type="string" defaultValue="ANY"/>
-+            <argument name="actionsValue" type="string" defaultValue="FALSE"/>
-+            <argument name="childAttribute" type="string" defaultValue="Category"/>
-+            <argument name="actionValue" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickOnActionTab"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.condition('ALL')}}" stepKey="clickToChooseOption"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.actionsAggregator}}" userInput="{{actionsAggregator}}" stepKey="selectCondition"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.condition('TRUE')}}" stepKey="clickToChooseOption2"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.actionsValue}}" userInput="{{actionsValue}}" stepKey="selectCondition2"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.conditions}}" stepKey="selectActionConditions"/>
-+        <waitForPageLoad stepKey="waitForDropDownOpened"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.childAttribute}}" userInput="{{childAttribute}}" stepKey="selectAttribute"/>
-+        <waitForPageLoad stepKey="waitForOperatorOpened"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.condition('...')}}" stepKey="clickToChooseOption3"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.actionValue}}" userInput="{{actionValue}}" stepKey="fillActionValue"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.applyAction}}" stepKey="applyAction"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveButton"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
-new file mode 100644
-index 00000000000..9b74b3d1676
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
-@@ -0,0 +1,102 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateCartPriceRuleActionGroup">
-+        <arguments>
-+            <argument name="ruleName"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-+        <waitForPageLoad stepKey="waitForPriceList"/>
-+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{ruleName.name}}" stepKey="fillRuleName"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{ruleName.websites}}" stepKey="selectWebsites"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" parameterArray="[{{ruleName.customerGroups}}]" stepKey="selectCustomerGroup"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="{{ruleName.apply}}" stepKey="selectActionType"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="{{ruleName.discountAmount}}" stepKey="fillDiscountAmount"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
-+        <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+
-+    <actionGroup name="AdminCreateCartPriceRuleAndStayOnEditActionGroup" extends="AdminCreateCartPriceRuleActionGroup" >
-+        <click selector="{{AdminCartPriceRulesFormSection.saveAndContinue}}" stepKey="clickSaveButton"/>
-+    </actionGroup>
-+
-+    <actionGroup name="AdminCreateCartPriceRuleWithCouponCode" extends="AdminCreateCartPriceRuleActionGroup">
-+        <arguments>
-+            <argument name="couponCode"  defaultValue="_defaultCoupon.code"/>
-+        </arguments>
-+        <remove keyForRemoval="selectActionType"/>
-+        <remove keyForRemoval="fillDiscountAmount"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType" after="fillRuleName"/>
-+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.couponCode}}" stepKey="waitForElementVisible" after="selectCouponType"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="{{couponCode}}" stepKey="fillCouponCode" after="waitForElementVisible"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.userPerCoupon}}" userInput="99" stepKey="fillUserPerCoupon" after="fillCouponCode"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionTypeToFixed" after="clickToExpandActions"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="1" stepKey="fillDiscountAmount" after="selectActionTypeToFixed"/>
-+    </actionGroup>
-+
-+    <!--Delete Cart price Rule for Retailer customer-->
-+    <actionGroup name="AdminDeleteCartPriceRuleForRetailerActionGroup">
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="goToCartPriceRules"/>
-+        <waitForPageLoad stepKey="waitForCartPriceRules"/>
-+        <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{SimpleSalesRule.name}}" stepKey="filterByName"/>
-+        <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
-+        <click selector="{{AdminCartPriceRulesSection.rowByIndex('1')}}" stepKey="goToEditRulePage"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.delete}}" stepKey="clickDeleteButton"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.modalAcceptButton}}" stepKey="confirmDelete"/>
-+    </actionGroup>
-+
-+    <actionGroup name="AdminCreateCartPriceRuleWithConditions" extends="AdminCreateCartPriceRuleActionGroup">
-+        <arguments>
-+            <argument name="condition1" type="string" defaultValue="Products subselection" />
-+            <argument name="condition2" type="string" defaultValue="Category" />
-+            <argument name="ruleToChange1" type="string" defaultValue="is" />
-+            <argument name="rule1" type="string" defaultValue="equals or greater than" />
-+            <argument name="ruleToChange2" type="string" defaultValue="..." />
-+            <argument name="rule2" type="string" defaultValue="2" />
-+            <argument name="categoryName" type="string" defaultValue="_defaultCategory.name" />
-+        </arguments>
-+        <remove keyForRemoval="fillDiscountAmount" />
-+        <!--Go to Conditions section-->
-+        <click selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="openConditionsSection" after="selectActionType" />
-+        <click selector="{{AdminCartPriceRulesFormSection.addCondition('1')}}" stepKey="addFirstCondition" after="openConditionsSection" />
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.ruleCondition('1')}}" userInput="{{condition1}}" stepKey="selectRule" after="addFirstCondition" />
-+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange1)}}" stepKey="waitForFirstRuleElement" after="selectRule" />
-+        <click selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange1)}}" stepKey="clickToChangeRule" after="waitForFirstRuleElement" />
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.ruleParameterSelect('1--1')}}" userInput="{{rule1}}" stepKey="selectRule1" after="clickToChangeRule" />
-+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="waitForSecondRuleElement" after="selectRule1" />
-+        <click selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="clickToChangeRule1" after="waitForSecondRuleElement" />
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleParameterInput('1--1')}}" userInput="{{rule2}}" stepKey="fillRule" after="clickToChangeRule1" />
-+        <click selector="{{AdminCartPriceRulesFormSection.addCondition('1--1')}}" stepKey="addSecondCondition" after="fillRule" />
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.ruleCondition('1--1')}}" userInput="{{condition2}}" stepKey="selectSecondCondition" after="addSecondCondition" />
-+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="waitForThirdRuleElement" after="selectSecondCondition" />
-+        <click selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="addThirdCondition" after="waitForThirdRuleElement" />
-+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.openChooser('1--1--1')}}" stepKey="waitForForthRuleElement" after="addThirdCondition" />
-+        <click selector="{{AdminCartPriceRulesFormSection.openChooser('1--1--1')}}" stepKey="openChooser" after="waitForForthRuleElement" />
-+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.categoryCheckbox(categoryName)}}" stepKey="waitForCategoryVisible" after="openChooser" />
-+        <checkOption selector="{{AdminCartPriceRulesFormSection.categoryCheckbox(categoryName)}}" stepKey="checkCategoryName" after="waitForCategoryVisible" />
-+    </actionGroup>
-+
-+    <actionGroup name="CreateCartPriceRuleSecondWebsiteActionGroup">
-+        <arguments>
-+            <argument name="ruleName"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-+        <waitForPageLoad stepKey="waitForPriceList"/>
-+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{ruleName.name}}" stepKey="fillRuleName"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Second Website" stepKey="selectWebsites"/>
-+
-+    </actionGroup>
-+
-+    <actionGroup name="AdminInactiveCartPriceRuleActionGroup" extends="AdminCreateCartPriceRuleActionGroup">
-+        <click selector="{{AdminCartPriceRulesFormSection.active}}" stepKey="clickActiveToDisable" after="fillRuleName"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionsSectionActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionsSectionActionGroup.xml
-new file mode 100644
-index 00000000000..42608bf3609
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionsSectionActionGroup.xml
-@@ -0,0 +1,32 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateCartPriceRuleActionsSectionDiscountFieldsActionGroup">
-+        <arguments>
-+            <argument name="rule" type="entity"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.actionsHeader}}" visible="true" stepKey="clickToExpandActions"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="{{rule.simple_action}}" stepKey="selectActionType"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="{{rule.discount_amount}}" stepKey="fillDiscountAmount"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.maximumQtyDiscount}}" userInput="{{rule.maximumQtyDiscount}}" stepKey="fillMaximumQtyDiscount"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.discountStep}}" userInput="{{rule.discount_step}}" stepKey="fillDiscountStep"/>
-+    </actionGroup>
-+    <actionGroup name="AdminCreateCartPriceRuleActionsSectionShippingAmountActionGroup">
-+        <click selector="{{AdminCartPriceRulesFormSection.applyToShippingAmount}}" stepKey="clickApplyToShipping"/>
-+    </actionGroup>
-+    <actionGroup name="AdminCreateCartPriceRuleActionsSectionSubsequentRulesActionGroup">
-+        <click selector="{{AdminCartPriceRulesFormSection.discardSubsequentRules}}" stepKey="clickApplyToShipping"/>
-+    </actionGroup>
-+    <actionGroup name="AdminCreateCartPriceRuleActionsSectionFreeShippingActionGroup">
-+        <arguments>
-+            <argument name="freeShippingOption" type="string"/>
-+        </arguments>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.freeShipping}}" userInput="{{freeShippingOption}}" stepKey="selectForMatchingItemsOnly"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleLabelsSectionActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleLabelsSectionActionGroup.xml
-new file mode 100644
-index 00000000000..e9d5f07701b
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleLabelsSectionActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateCartPriceRuleLabelsSectionActionGroup">
-+        <arguments>
-+            <argument name="rule" type="entity"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.labelsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.labelsHeader}}" visible="true" stepKey="clickToExpandLabels"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.defaultRuleLabelAllStoreViews}}" userInput="{{rule.defaultRuleLabelAllStoreViews}}" stepKey="fillDefaultRuleLabelAllStoreViews"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.defaultStoreView}}" userInput="{{rule.defaultStoreView}}" stepKey="fillDefaultStoreView"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleRuleInfoSectionActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleRuleInfoSectionActionGroup.xml
-new file mode 100644
-index 00000000000..27b9634cbe2
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleRuleInfoSectionActionGroup.xml
-@@ -0,0 +1,31 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateCartPriceRuleRuleInfoSectionActionGroup">
-+        <arguments>
-+            <argument name="ruleName" type="entity"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-+        <waitForPageLoad stepKey="waitForPriceList"/>
-+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{ruleName.name}}" stepKey="fillRuleName"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{ruleName.description}}" stepKey="fillDescription"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{ruleName.websites}}" stepKey="selectWebsites"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" parameterArray="[{{ruleName.customerGroups}}]" stepKey="selectCustomerGroup"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="{{ruleName.coupon_type}}" stepKey="selectCouponType"/>
-+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.couponCode}}" stepKey="waitForElementVisible"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="{{ruleName.coupon_code}}" stepKey="fillCouponCode"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.userPerCoupon}}" userInput="{{ruleName.uses_per_coupon}}" stepKey="fillUsesPerCoupon"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.userPerCustomer}}" userInput="{{ruleName.uses_per_customer}}" stepKey="fillUsesPerCustomer"/>
-+        <generateDate date="+1 minute" format="m/d/Y" stepKey="startDateTime"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$startDateTime}" stepKey="fillStartDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.priority}}" userInput="{{ruleName.sort_order}}" stepKey="fillPriority"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.publicInRSSFeed}}" dependentSelector="{{AdminCartPriceRulesFormSection.publicInRSSFeed}}" visible="false" stepKey="clickOnlyIfRSSIsDisabled"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminDeleteCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminDeleteCartPriceRuleActionGroup.xml
-new file mode 100644
-index 00000000000..8c624f214d6
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminDeleteCartPriceRuleActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminDeleteCartPriceRuleActionGroup">
-+        <arguments>
-+            <argument name="ruleName" type="entity"/>
-+        </arguments>
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="goToCartPriceRules"/>
-+        <waitForPageLoad stepKey="waitForCartPriceRules"/>
-+        <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{ruleName.name}}" stepKey="filterByName"/>
-+        <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
-+        <click selector="{{AdminCartPriceRulesSection.rowByIndex('1')}}" stepKey="goToEditRulePage"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.delete}}" stepKey="clickDeleteButton"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.modalAcceptButton}}" stepKey="confirmDelete"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminFilterCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminFilterCartPriceRuleActionGroup.xml
-new file mode 100644
-index 00000000000..7a3a20e6032
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminFilterCartPriceRuleActionGroup.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Search grid with keyword search-->
-+    <actionGroup name="AdminFilterCartPriceRuleActionGroup">
-+        <arguments>
-+            <argument name="ruleName"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-+        <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{ruleName}}" stepKey="filterByName"/>
-+        <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
-+        <click selector="{{AdminCartPriceRulesSection.rowByIndex('1')}}" stepKey="goToEditRulePage"/>
-+    </actionGroup>
-+    <actionGroup name="AdminCartPriceRuleNotInGridActionGroup" extends="AdminFilterCartPriceRuleActionGroup">
-+        <remove keyForRemoval="goToEditRulePage"/>
-+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
-+        <see selector="{{AdminCartPriceRulesSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeAssertCartPriceRuleIsNotPresentedInGrid"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminOpenNewCartPriceRuleFormPageActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminOpenNewCartPriceRuleFormPageActionGroup.xml
-new file mode 100644
-index 00000000000..8cb958c9d93
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminOpenNewCartPriceRuleFormPageActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenNewCartPriceRuleFormPageActionGroup">
-+        <amOnPage url="{{PriceRuleNewPage.url}}" stepKey="openNewCartPriceRulePage" />
-+        <waitForPageLoad stepKey="waitForPageLoad" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminSalesRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminSalesRuleActionGroup.xml
-index 4026c3d65cf..800621ac70f 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminSalesRuleActionGroup.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminSalesRuleActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="DeleteCartPriceRuleByName">
-         <arguments>
-             <argument name="ruleName" type="string"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml
-index e8c520f1f98..60ee9fb1fa1 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml
-@@ -6,23 +6,21 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="ApplyCartRuleOnStorefrontActionGroup">
-         <arguments>
--            <argument name="Product" defaultValue="_defaultProduct"/>
--            <argument name="Coupon" defaultValue="SimpleSalesRuleCoupon"/>
-+            <argument name="product"/>
-+            <argument name="couponCode" type="string"/>
-         </arguments>
--        <amOnPage url="{{Product.name}}.html" stepKey="navigateToProductPage"/>
--        <waitForPageLoad stepKey="waitForPageLoad1"/>
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart" />
--        <waitForText userInput="You added {{Product.name}} to your shopping cart." stepKey="waitForAddedBtn"/>
--        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart"/>
--        <waitForPageLoad stepKey="waitForPageLoad2"/>
--        <click selector="{{DiscountSection.DiscountTab}}" stepKey="scrollToDiscountTab" />
--        <fillField selector="{{DiscountSection.CouponInput}}" userInput="{{Coupon.code}}" stepKey="fillCouponCode" />
-+        <waitForPageLoad stepKey="waitForAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+        <waitForText userInput="You added {{product.name}} to your shopping cart." stepKey="waitForText"/>
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckoutPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <click selector="{{DiscountSection.DiscountTab}}" stepKey="clickToDiscountTab" />
-+        <fillField selector="{{DiscountSection.CouponInput}}" userInput="{{couponCode}}" stepKey="fillCouponCode"/>
-         <click selector="{{DiscountSection.ApplyCodeBtn}}" stepKey="applyCode"/>
--        <waitForPageLoad stepKey="waitForPageLoad3"/>
--        <waitForText userInput="You used coupon code" stepKey="waitForText"/>
--        <see userInput="You used coupon code" stepKey="assertText"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-     </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertCartPriceRuleSuccessSaveMessageActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertCartPriceRuleSuccessSaveMessageActionGroup.xml
-new file mode 100644
-index 00000000000..dbfef4c0066
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertCartPriceRuleSuccessSaveMessageActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCartPriceRuleSuccessSaveMessageActionGroup">
-+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
-+        <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="You saved the rule." stepKey="seeAssertSuccessSaveMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertCustomerGroupNotOnCartPriceRuleFormActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertCustomerGroupNotOnCartPriceRuleFormActionGroup.xml
-new file mode 100644
-index 00000000000..98a094aea77
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertCustomerGroupNotOnCartPriceRuleFormActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertCustomerGroupNotOnCartPriceRuleFormActionGroup">
-+        <arguments>
-+            <argument name="customerGroup" type="entity" />
-+        </arguments>
-+        <grabMultiple selector="{{AdminCartPriceRulesFormSection.customerGroupsOptions}}" stepKey="customerGroups" />
-+        <assertNotContains stepKey="assertCustomerGroupNotInOptions">
-+            <actualResult type="variable">customerGroups</actualResult>
-+            <expectedResult type="string">{{customerGroup.code}}</expectedResult>
-+        </assertNotContains>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml
-new file mode 100644
-index 00000000000..f99e39411ac
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontMiniCartItemsActionGroup">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+            <argument name="productPrice" type="string"/>
-+            <argument name="cartSubtotal" type="string"/>
-+            <argument name="qty" type="string"/>
-+        </arguments>
-+        <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productName}}"  stepKey="seeProductNameInMiniCart"/>
-+        <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productPrice}}" stepKey="seeProductPriceInMiniCart"/>
-+        <seeElement selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="seeCheckOutButtonInMiniCart"/>
-+        <seeElement selector="{{StorefrontMinicartSection.productQuantity(productName, qty)}}" stepKey="seeProductQuantity1"/>
-+        <seeElement selector="{{StorefrontMinicartSection.productImage}}" stepKey="seeProductImage"/>
-+        <see selector="{{StorefrontMinicartSection.productSubTotal}}" userInput="{{cartSubtotal}}" stepKey="seeSubTotal"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontAddToTheCartActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontAddToTheCartActionGroup.xml
-new file mode 100644
-index 00000000000..10f4dd562bf
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontAddToTheCartActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontAddToTheCartActionGroup">
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <scrollTo selector="{{StorefrontProductActionSection.addToCart}}" stepKey="scrollToAddToCartButton"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontApplyDiscountCodeActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontApplyDiscountCodeActionGroup.xml
-new file mode 100644
-index 00000000000..063409e9fc7
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontApplyDiscountCodeActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Apply discount code during checkout -->
-+    <actionGroup name="StorefrontApplyDiscountCodeActionGroup">
-+        <arguments>
-+            <argument name="discountCode" type="string"/>
-+        </arguments>
-+        <click selector="{{DiscountSection.DiscountTab}}" stepKey="clickToAddDiscount"/>
-+        <fillField selector="{{DiscountSection.DiscountInput}}" userInput="{{discountCode}}" stepKey="fillFieldDiscountCode"/>
-+        <click selector="{{DiscountSection.ApplyCodeBtn}}" stepKey="clickToApplyDiscount"/>
-+        <waitForPageLoad stepKey="waitForDiscountToBeAdded"/>
-+        <see selector="{{DiscountSection.DiscountVerificationMsg}}" userInput="Your coupon was successfully applied" stepKey="assertDiscountApplyMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml
-new file mode 100644
-index 00000000000..498695dee93
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontClickOnMiniCartActionGroup">
-+        <scrollToTopOfPage stepKey="scrollToTheTopOfThePage"/>
-+        <waitForElementVisible selector="{{StorefrontMinicartSection.showCart}}" stepKey="waitForElementToBeVisible"/>
-+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
-index 5d1cc877aa7..3963fb13ca9 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Apply Sales Rule Coupon to the cart -->
-     <actionGroup name="StorefrontApplyCouponActionGroup">
-         <arguments>
-@@ -18,6 +18,7 @@
-         <waitForElementVisible selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" stepKey="waitForCouponField" />
-         <fillField userInput="{{coupon.code}}" selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" stepKey="fillCouponField"/>
-         <click selector="{{StorefrontSalesRuleCartCouponSection.applyButton}}" stepKey="clickApplyButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-     </actionGroup>
- 
-     <!-- Cancel Sales Rule Coupon applied to the cart -->
-@@ -31,12 +32,12 @@
-     <!-- Check applied discount in cart summary -->
-     <actionGroup name="StorefrontCheckCouponAppliedActionGroup">
-         <arguments>
--            <argument name="rule"/>
--            <argument name="discount"/>
-+            <argument name="rule" />
-+            <argument name="discount" type="string" />
-         </arguments>
--        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountTotal}}" stepKey="waitForDiscountTotal" />
--        <see userInput="{{rule.store_labels[1][store_label]}}" selector="{{CheckoutCartSummarySection.discountLabel}}" stepKey="assertDiscountLabel" />
--        <see userInput="-${{discount}}" selector="{{CheckoutCartSummarySection.discountTotal}}" stepKey="assertDiscountTotal" />
-+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountTotal}}" stepKey="waitForDiscountTotal"/>
-+        <see userInput="{{rule.store_labels[1][store_label]}}" selector="{{CheckoutCartSummarySection.discountLabel}}" stepKey="assertDiscountLabel"/>
-+        <see userInput="-${{discount}}" selector="{{CheckoutCartSummarySection.discountTotal}}" stepKey="assertDiscountTotal"/>
-     </actionGroup>
- 
-     <actionGroup name="VerifyDiscountAmount">
-@@ -50,9 +51,10 @@
-         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="{{quantity}}" stepKey="fillQuantity"/>
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-         <waitForPageLoad stepKey="waitForAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
-         <waitForPageLoad stepKey="waitForCartPage"/>
-         <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
-         <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="{{expectedDiscount}}" stepKey="seeDiscountTotal"/>
-     </actionGroup>
--</actionGroups>
-\ No newline at end of file
-+</actionGroups>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..5a42980df1b
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuMarketingPromotionsCartPriceRules">
-+        <data key="pageTitle">Cart Price Rules</data>
-+        <data key="title">Cart Price Rules</data>
-+        <data key="dataUiId">magento-salesrule-promo-quote</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/QuoteData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/QuoteData.xml
-index 7e929266b89..4cd5513080f 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Data/QuoteData.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/QuoteData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
-     <entity name="E2EB2CQuoteWith10PercentDiscount" type="Quote">
-         <data key="subtotal">480.00</data>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml
-index 917b4ca179b..bab82fa2046 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="ApiSalesRuleCoupon" type="SalesRuleCoupon">
-         <data key="code" unique="suffix">salesCoupon</data>
-         <data key="times_used">0</data>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml
-new file mode 100644
-index 00000000000..cc695b347c4
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="SalesRuleAddressConditions" type="SalesRuleConditionAttribute">
-+        <data key="subtotal">Magento\SalesRule\Model\Rule\Condition\Address|base_subtotal</data>
-+        <data key="totalItemsQty">Magento\SalesRule\Model\Rule\Condition\Address|total_qty</data>
-+        <data key="totalWeight">Magento\SalesRule\Model\Rule\Condition\Address|weight</data>
-+        <data key="shippingMethod">Magento\SalesRule\Model\Rule\Condition\Address|shipping_method</data>
-+        <data key="shippingPostCode">Magento\SalesRule\Model\Rule\Condition\Address|postcode</data>
-+        <data key="shippingRegion">Magento\SalesRule\Model\Rule\Condition\Address|region</data>
-+        <data key="shippingState">Magento\SalesRule\Model\Rule\Condition\Address|region_id</data>
-+        <data key="shippingCountry">Magento\SalesRule\Model\Rule\Condition\Address|country_id</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml
-index 6cca73dff57..3dd87d94d01 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml
-@@ -6,10 +6,11 @@
-   */
- -->
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="SimpleSalesRuleCoupon" type="SalesRuleCoupon">
-         <var key="rule_id" entityKey="rule_id" entityType="SalesRule"/>
-         <data key="code" unique="suffix">Code</data>
-         <data key="is_primary">1</data>
-+        <data key="times_used">0</data>
-     </entity>
- </entities>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
-index efd21405a7c..f022e4e645c 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="ApiSalesRule" type="SalesRule">
-         <data key="name" unique="suffix">salesRule</data>
-         <data key="description">Sales Rule Descritpion</data>
-@@ -39,6 +39,35 @@
-         <requiredEntity type="SalesRuleLabel">SalesRuleLabelStore1</requiredEntity>
-     </entity>
- 
-+    <entity name="ApiCartRule" type="SalesRule">
-+        <data key="name" unique="suffix">salesRule</data>
-+        <data key="description">Sales Rule Descritpion</data>
-+        <array key="website_ids">
-+            <item>1</item>
-+        </array>
-+        <array key="customer_group_ids">
-+            <item>0</item>
-+            <item>1</item>
-+            <item>3</item>
-+        </array>
-+        <data key="uses_per_customer">0</data>
-+        <data key="is_active">true</data>
-+        <data key="stop_rules_processing">true</data>
-+        <data key="is_advanced">true</data>
-+        <data key="sort_order">0</data>
-+        <data key="simple_action">by_percent</data>
-+        <data key="discount_amount">50</data>
-+        <data key="discount_qty">0</data>
-+        <data key="discount_step">0</data>
-+        <data key="apply_to_shipping">false</data>
-+        <data key="times_used">0</data>
-+        <data key="is_rss">true</data>
-+        <data key="coupon_type">NO_COUPON</data>
-+        <data key="use_auto_generation">false</data>
-+        <data key="uses_per_coupon">0</data>
-+        <data key="simple_free_shipping">0</data>
-+    </entity>
-+
-     <entity name="SimpleSalesRule" type="SalesRule">
-         <data key="name" unique="suffix">SimpleSalesRule</data>
-         <data key="is_active">true</data>
-@@ -53,4 +82,322 @@
-             <item>1</item>
-         </array>
-     </entity>
-+    <entity name="TestSalesRule" type="SalesRule">
-+        <data key="name" unique="suffix">TestSalesRule</data>
-+        <data key="websites">Main Website</data>
-+        <data key="customerGroups">'NOT LOGGED IN', 'General', 'Wholesale', 'Retailer'</data>
-+        <data key="apply">Percent of product price discount</data>
-+        <data key="discountAmount">50</data>
-+    </entity>
-+    <entity name="CatPriceRule" type="SalesRule">
-+        <data key="name" unique="suffix">CartPriceRule</data>
-+        <data key="websites">Main Website</data>
-+        <data key="customerGroups">'NOT LOGGED IN', 'General', 'Wholesale', 'Retailer'</data>
-+        <data key="coupon_type">Specific Coupon</data>
-+        <data key="coupon_code" unique="suffix">CouponCode</data>
-+        <data key="apply">Percent of product price discount</data>
-+        <data key="discountAmount">10</data>
-+    </entity>
-+
-+    <entity name="SalesRuleSpecificCoupon" type="SalesRule">
-+        <data key="name" unique="suffix">SimpleSalesRule</data>
-+        <data key="description">Sales Rule Description</data>
-+        <array key="website_ids">
-+            <item>1</item>
-+        </array>
-+        <array key="customer_group_ids">
-+            <item>0</item>
-+            <item>1</item>
-+            <item>3</item>
-+        </array>
-+        <data key="uses_per_customer">1</data>
-+        <data key="is_active">true</data>
-+        <data key="stop_rules_processing">false</data>
-+        <data key="is_advanced">true</data>
-+        <data key="sort_order">2</data>
-+        <data key="simple_action">by_percent</data>
-+        <data key="discount_amount">10</data>
-+        <data key="discount_qty">1</data>
-+        <data key="discount_step">0</data>
-+        <data key="apply_to_shipping">false</data>
-+        <data key="times_used">1</data>
-+        <data key="is_rss">false</data>
-+        <data key="coupon_type">SPECIFIC_COUPON</data>
-+        <data key="use_auto_generation">true</data>
-+        <data key="uses_per_coupon">2</data>
-+        <data key="simple_free_shipping">1</data>
-+    </entity>
-+
-+    <entity name="SalesRuleSpecificCouponWithFixedDiscount" type="SalesRule">
-+        <data key="name" unique="suffix">SimpleSalesRule</data>
-+        <data key="description">Sales Rule Description</data>
-+        <array key="website_ids">
-+            <item>1</item>
-+        </array>
-+        <array key="customer_group_ids">
-+            <item>1</item>
-+        </array>
-+        <data key="uses_per_customer">10</data>
-+        <data key="is_active">true</data>
-+        <data key="stop_rules_processing">false</data>
-+        <data key="is_advanced">true</data>
-+        <data key="sort_order">1</data>
-+        <data key="simple_action">cart_fixed</data>
-+        <data key="discount_amount">10</data>
-+        <data key="discount_qty">10</data>
-+        <data key="discount_step">0</data>
-+        <data key="apply_to_shipping">false</data>
-+        <data key="times_used">0</data>
-+        <data key="is_rss">false</data>
-+        <data key="coupon_type">SPECIFIC_COUPON</data>
-+        <data key="use_auto_generation">false</data>
-+        <data key="uses_per_coupon">10</data>
-+        <data key="simple_free_shipping">1</data>
-+    </entity>
-+
-+    <entity name="PriceRuleWithCondition" type="SalesRule">
-+        <data key="name" unique="suffix">SalesRule</data>
-+        <data key="websites">Main Website</data>
-+        <data key="customerGroups">'NOT LOGGED IN', 'General', 'Wholesale', 'Retailer'</data>
-+        <data key="apply">Fixed amount discount for whole cart</data>
-+        <data key="discountAmount">50</data>
-+    </entity>
-+
-+    <entity name="SalesRuleSpecificCouponWithPercentDiscount" type="SalesRule">
-+        <data key="name" unique="suffix">SimpleSalesRule</data>
-+        <data key="description">Sales Rule Description</data>
-+        <array key="website_ids">
-+            <item>1</item>
-+        </array>
-+        <array key="customer_group_ids">
-+            <item>1</item>
-+        </array>
-+        <data key="uses_per_customer">10</data>
-+        <data key="is_active">true</data>
-+        <data key="stop_rules_processing">false</data>
-+        <data key="is_advanced">true</data>
-+        <data key="sort_order">1</data>
-+        <data key="simple_action">by_percent</data>
-+        <data key="discount_amount">10</data>
-+        <data key="discount_qty">10</data>
-+        <data key="discount_step">0</data>
-+        <data key="apply_to_shipping">false</data>
-+        <data key="times_used">0</data>
-+        <data key="is_rss">false</data>
-+        <data key="coupon_type">SPECIFIC_COUPON</data>
-+        <data key="use_auto_generation">false</data>
-+        <data key="uses_per_coupon">10</data>
-+        <data key="simple_free_shipping">1</data>
-+    </entity>
-+
-+    <entity name="ActiveSalesRuleForNotLoggedIn" type="SalesRule">
-+        <data key="name" unique="suffix">SimpleSalesRule</data>
-+        <data key="description">Sales Rule Description</data>
-+        <array key="website_ids">
-+            <item>1</item>
-+        </array>
-+        <array key="customer_group_ids">
-+            <item>0</item>
-+        </array>
-+        <data key="uses_per_customer">0</data>
-+        <data key="is_active">true</data>
-+        <data key="stop_rules_processing">true</data>
-+        <data key="is_advanced">true</data>
-+        <data key="sort_order">0</data>
-+        <data key="simple_action">by_percent</data>
-+        <data key="discount_amount">50</data>
-+        <data key="discount_qty">0</data>
-+        <data key="discount_step">0</data>
-+        <data key="apply_to_shipping">false</data>
-+        <data key="times_used">0</data>
-+        <data key="is_rss">false</data>
-+        <data key="coupon_type">SPECIFIC_COUPON</data>
-+        <data key="use_auto_generation">false</data>
-+        <data key="uses_per_coupon">0</data>
-+        <data key="simple_free_shipping">0</data>
-+        <requiredEntity type="SalesRuleLabel">SalesRuleLabelDefault</requiredEntity>
-+        <requiredEntity type="SalesRuleLabel">SalesRuleLabelStore1</requiredEntity>
-+    </entity>
-+
-+    <entity name="ActiveSalesRuleForAllGroups" type="SalesRule">
-+        <data key="name" unique="suffix">SimpleSalesRule</data>
-+        <data key="description">Sales Rule Description</data>
-+        <array key="website_ids">
-+            <item>1</item>
-+        </array>
-+        <array key="customer_group_ids">
-+            <item>0</item>
-+            <item>1</item>
-+            <item>2</item>
-+            <item>3</item>
-+        </array>
-+        <data key="uses_per_customer">0</data>
-+        <data key="is_active">true</data>
-+        <data key="stop_rules_processing">true</data>
-+        <data key="is_advanced">true</data>
-+        <data key="sort_order">0</data>
-+        <data key="simple_action">by_percent</data>
-+        <data key="discount_amount">50</data>
-+        <data key="discount_qty">0</data>
-+        <data key="discount_step">0</data>
-+        <data key="apply_to_shipping">false</data>
-+        <data key="times_used">0</data>
-+        <data key="is_rss">false</data>
-+        <data key="coupon_type">SPECIFIC_COUPON</data>
-+        <data key="use_auto_generation">false</data>
-+        <data key="uses_per_coupon">0</data>
-+        <data key="simple_free_shipping">0</data>
-+        <requiredEntity type="SalesRuleLabel">SalesRuleLabelDefault</requiredEntity>
-+        <requiredEntity type="SalesRuleLabel">SalesRuleLabelStore1</requiredEntity>
-+    </entity>
-+
-+    <entity name="SalesRuleNoCouponWithFixedDiscount" extends="ApiCartRule">
-+        <data key="simple_action">by_fixed</data>
-+    </entity>
-+    <entity name="ActiveSalesRuleWithPercentPriceDiscountCoupon">
-+        <data key="name" unique="suffix">Cart Price Rule with Specific Coupon</data>
-+        <data key="description">Description for Cart Price Rule</data>
-+        <data key="is_active">Yes</data>
-+        <data key="websites">Main Website</data>
-+        <data key="customerGroups">'NOT LOGGED IN'</data>
-+        <data key="coupon_type">Specific Coupon</data>
-+        <data key="coupon_code" unique="suffix">123-abc-ABC-987</data>
-+        <data key="apply">Percent of product price discount</data>
-+        <data key="discountAmount">50</data>
-+        <data key="defaultRuleLabelAllStoreViews">Cart Price Rule with Specific Coupon</data>
-+        <data key="defaultStoreView">Cart Price Rule with Specific Coupon</data>
-+    </entity>
-+    <entity name="ActiveSalesRuleWithComplexConditions">
-+        <data key="name" unique="suffix">Cart Price Rule with complex conditions</data>
-+        <data key="description">Cart Price Rule with complex conditions</data>
-+        <data key="is_active">Yes</data>
-+        <data key="websites">Main Website</data>
-+        <data key="customerGroups">'NOT LOGGED IN', 'General', 'Wholesale', 'Retailer'</data>
-+        <data key="coupon_type">Specific Coupon</data>
-+        <data key="coupon_code" unique="suffix">123-abc-ABC-987</data>
-+        <data key="uses_per_coupon">13</data>
-+        <data key="uses_per_customer">63</data>
-+        <data key="sort_order">1</data>
-+        <data key="is_rss">Yes</data>
-+        <data key="subtotal">300</data>
-+        <data key="shippingCountry">US</data>
-+        <data key="shippingPostcode">123456789a</data>
-+        <data key="simple_action">Percent of product price discount</data>
-+        <data key="discount_amount">50</data>
-+        <data key="maximumQtyDiscount">0</data>
-+        <data key="discount_step">0</data>
-+        <data key="apply_to_shipping">Yes</data>
-+        <data key="stop_rules_processing">Yes</data>
-+        <data key="simple_free_shipping">For matching items only</data>
-+        <data key="defaultRuleLabelAllStoreViews">Cart Price Rule with complex conditions</data>
-+        <data key="defaultStoreView">Cart Price Rule with complex conditions</data>
-+    </entity>
-+    <entity name="InactiveSalesRule">
-+        <data key="name" unique="suffix">Inactive Cart Price Rule</data>
-+        <data key="description">Inactive Cart Price Rule</data>
-+        <data key="is_active">0</data>
-+        <data key="websites">Main Website</data>
-+        <data key="customerGroups">'NOT LOGGED IN'</data>
-+        <data key="coupon_type">No Coupon</data>
-+        <data key="apply">Percent of product price discount</data>
-+        <data key="discountAmount">50</data>
-+    </entity>
-+    <entity name="CartPriceRuleConditionAndFreeShippingApplied">
-+        <data key="name" unique="suffix">Cart Price Rule For RuleCondition And FreeShipping</data>
-+        <data key="description">Description for Cart Price Rule</data>
-+        <data key="is_active">Yes</data>
-+        <data key="websites">Main Website</data>
-+        <data key="customerGroups">NOT LOGGED IN</data>
-+        <data key="coupon_type">No Coupon</data>
-+        <data key="simple_action">Percent of product price discount</data>
-+        <data key="discount_amount">50</data>
-+        <data key="maximumQtyDiscount">0</data>
-+        <data key="discount_step">0</data>
-+        <data key="apply_to_shipping">0</data>
-+        <data key="simple_free_shipping">For matching items only</data>
-+        <data key="defaultRuleLabelAllStoreViews">Free Shipping in conditions</data>
-+        <data key="defaultStoreView">Free Shipping in conditions</data>
-+    </entity>
-+    <entity name="CartPriceRuleConditionAppliedForSubtotal">
-+        <data key="name" unique="suffix">Cart Price Rule For Rule Condition</data>
-+        <data key="description">Description for Cart Price Rule</data>
-+        <data key="is_active">Yes</data>
-+        <data key="websites">Main Website</data>
-+        <data key="customerGroups">NOT LOGGED IN</data>
-+        <data key="coupon_type">No Coupon</data>
-+        <data key="subtotal">560</data>
-+        <data key="simple_action">Percent of product price discount</data>
-+        <data key="discount_amount">50</data>
-+        <data key="maximumQtyDiscount">0</data>
-+        <data key="discount_step">0</data>
-+        <data key="apply_to_shipping">0</data>
-+        <data key="simple_free_shipping">No</data>
-+        <data key="defaultRuleLabelAllStoreViews">Free Shipping in Rule conditions</data>
-+        <data key="defaultStoreView">Free Shipping in Rule conditions</data>
-+    </entity>
-+    <entity name="CartPriceRuleConditionNotApplied">
-+        <data key="name" unique="suffix">Cart Price Rule Condition Not Applied</data>
-+        <data key="description">Description for Cart Price Rule</data>
-+        <data key="is_active">Yes</data>
-+        <data key="websites">Main Website</data>
-+        <data key="customerGroups">NOT LOGGED IN</data>
-+        <data key="coupon_type">No Coupon</data>
-+        <data key="totalItemQuantity">3</data>
-+        <data key="simple_action">Percent of product price discount</data>
-+        <data key="discount_amount">50</data>
-+        <data key="maximumQtyDiscount">0</data>
-+        <data key="discount_step">0</data>
-+        <data key="apply_to_shipping">0</data>
-+        <data key="simple_free_shipping">No</data>
-+        <data key="defaultRuleLabelAllStoreViews">Total Items Quantity-Not Applied test</data>
-+        <data key="defaultStoreView">Total Items Quantity-Not Applied test</data>
-+    </entity>
-+    <entity name="CartPriceRuleConditionAppliedForWeight">
-+        <data key="name" unique="suffix">Cart Price Rule With Weight Condition Applied</data>
-+        <data key="description">Description for Cart Price Rule</data>
-+        <data key="is_active">Yes</data>
-+        <data key="websites">Main Website</data>
-+        <data key="customerGroups">NOT LOGGED IN</data>
-+        <data key="coupon_type">No Coupon</data>
-+        <data key="totalWeight">200</data>
-+        <data key="simple_action">Percent of product price discount</data>
-+        <data key="discount_amount">50</data>
-+        <data key="maximumQtyDiscount">0</data>
-+        <data key="discount_step">0</data>
-+        <data key="apply_to_shipping">0</data>
-+        <data key="simple_free_shipping">No</data>
-+        <data key="defaultRuleLabelAllStoreViews">Total Weight is 200</data>
-+        <data key="defaultStoreView">Total Weight is 200</data>
-+    </entity>
-+    <entity name="CartPriceRuleConditionAppliedForCategory">
-+        <data key="name" unique="suffix">Cart Price Rule With Category Condition Applied</data>
-+        <data key="description">Description for Cart Price Rule</data>
-+        <data key="is_active">Yes</data>
-+        <data key="websites">Main Website</data>
-+        <data key="customerGroups">NOT LOGGED IN</data>
-+        <data key="coupon_type">No Coupon</data>
-+        <data key="simple_action">Percent of product price discount</data>
-+        <data key="discount_amount">50</data>
-+        <data key="maximumQtyDiscount">0</data>
-+        <data key="discount_step">0</data>
-+        <data key="apply_to_shipping">0</data>
-+        <data key="simple_free_shipping">No</data>
-+        <data key="defaultRuleLabelAllStoreViews">Product attribute combination - Category</data>
-+        <data key="defaultStoreView">Product attribute combination - Category</data>
-+    </entity>
-+    <entity name="RetailerCartPriceRule" type="SalesRule">
-+        <data key="name" unique="suffix">Cart Price Rule</data>
-+        <data key="websites">Main Website</data>
-+        <data key="customerGroups">'Retailer'</data>
-+        <data key="apply">Percent of product price discount</data>
-+        <data key="discountAmount">50</data>
-+    </entity>
-+    <entity name="SegmentCartPriceRule" type="SalesRule">
-+        <data key="name" unique="suffix">Cart Price Rule</data>
-+        <data key="websites">Main Website</data>
-+        <data key="customerGroups">'General'</data>
-+        <data key="apply">Percent of product price discount</data>
-+        <data key="discountAmount">50</data>
-+    </entity>
- </entities>
-+
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleLabelData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleLabelData.xml
-index f1916e81e0e..90fe36fd7bd 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleLabelData.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleLabelData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="SalesRuleLabelDefault" type="SalesRuleLabel">
-         <data key="store_id">0</data>
-         <data key="store_label" unique="suffix">Sales Rule (Default) </data>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleProductConditionsData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleProductConditionsData.xml
-new file mode 100644
-index 00000000000..8af7ac0fdd9
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleProductConditionsData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="SalesRuleProductConditions" type="SalesRuleConditionAttribute">
-+        <data key="priceInCart" >Magento\SalesRule\Model\Rule\Condition\Product|quote_item_price</data>
-+        <data key="quantityInCart">Magento\SalesRule\Model\Rule\Condition\Product|quote_item_qty</data>
-+        <data key="rowTotalInCart">Magento\SalesRule\Model\Rule\Condition\Product|quote_item_row_total</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-condition-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-condition-meta.xml
-index bf4809a7d3f..bd50be31e01 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-condition-meta.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-condition-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateSalesRuleCondition" dataType="SalesRuleCondition" type="create">
-         <field key="condition_type" required="true">string</field>
-         <array key="conditions" required="true">
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-coupon-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-coupon-meta.xml
-index 03b87a96e6c..a2025add0b6 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-coupon-meta.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-coupon-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateSalesRuleCoupon" dataType="SalesRuleCoupon" type="create" auth="adminOauth" url="/V1/coupons" method="POST">
-         <contentType>application/json</contentType>
-         <object key="coupon" dataType="SalesRuleCoupon">
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-label-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-label-meta.xml
-index 676cb7026c2..c462824a47f 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-label-meta.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-label-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateSalesRuleLabel" dataType="SalesRuleLabel" type="create">
-         <field key="store_id" required="true">integer</field>
-         <field key="store_label" required="true">string</field>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml
-index 6e6a203a4e6..3b3f7f39a65 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateSalesRule" dataType="SalesRule" type="create" auth="adminOauth" url="/V1/salesRules" method="POST">
-         <contentType>application/json</contentType>
-         <object key="rule" dataType="SalesRule">
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml
-new file mode 100644
-index 00000000000..faed9d42bcd
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminCartPriceRuleEditPage" area="admin" url="sales_rule/promo_quote/edit/id/{{salesRuleId}}" module="Magento_SalesRule" parameterized="true">
-+        <section name="AdminCartPriceRulesFormSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesPage.xml b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesPage.xml
-index 2c260540ae7..78e10904411 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesPage.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesPage.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminCartPriceRulesPage" url="sales_rule/promo_quote/" area="admin" module="SalesRule">
-         <section name="AdminCartPriceRulesSection"/>
-         <section name="AdminCartPriceRulesFormSection"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Page/PriceRuleNewPage.xml b/app/code/Magento/SalesRule/Test/Mftf/Page/PriceRuleNewPage.xml
-index 4bedeb88eff..94967fedf8f 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Page/PriceRuleNewPage.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Page/PriceRuleNewPage.xml
-@@ -4,7 +4,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+<pages xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-     <page name="PriceRuleNewPage" url="sales_rule/promo_quote/new/" area="admin" module="Magento_SalesRule">
-         <section name="PriceRuleConditionsSection"/>
-     </page>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
-index f31ff1a4568..2f6c3e0af4d 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCartPriceRulesFormSection">
-         <element name="save" type="button" selector="#save" timeout="30"/>
-         <element name="saveAndContinue" type="button" selector="#save_and_continue" timeout="30"/>
-@@ -16,19 +16,78 @@
-         <!-- Rule Information (the main form on the page) -->
-         <element name="ruleInformationHeader" type="button" selector="div[data-index='rule_information']" timeout="30"/>
-         <element name="ruleName" type="input" selector="input[name='name']"/>
-+        <element name="description" type="textarea" selector="//div[@class='admin__field-control']/textarea[@name='description']"/>
-+        <element name="active" type="checkbox" selector="//div[@class='admin__actions-switch']/input[@name='is_active']/../label"/>
-         <element name="websites" type="multiselect" selector="select[name='website_ids']"/>
-         <element name="customerGroups" type="multiselect" selector="select[name='customer_group_ids']"/>
-+        <element name="customerGroupsOptions" type="multiselect" selector="select[name='customer_group_ids'] option"/>
-         <element name="coupon" type="select" selector="select[name='coupon_type']"/>
-         <element name="couponCode" type="input" selector="input[name='coupon_code']"/>
-         <element name="useAutoGeneration" type="checkbox" selector="input[name='use_auto_generation']"/>
-+        <element name="fromDate" type="input" selector="input[name='from_date']"/>
-+        <element name="toDate" type="input" selector="input[name='to_date']"/>
-+        <element name="userPerCoupon" type="input" selector="//input[@name='uses_per_coupon']"/>
-+        <element name="userPerCustomer" type="input" selector="//input[@name='uses_per_customer']"/>
-+        <element name="priority" type="input" selector="//*[@name='sort_order']"/>
-+        <element name="publicInRSSFeed" type="checkbox" selector="//div[@class='admin__actions-switch']/input[@name='is_rss']/../label"/>
-+
-+        <!-- Conditions sub-form -->
-+        <element name="conditionsHeader" type="button" selector="div[data-index='conditions']" timeout="30"/>
-+        <element name="conditionsHeaderOpen" type="button" selector="div[data-index='conditions'] div[data-state-collapsible='open']" timeout="30"/>
-+        <element name="conditionsValue" type="input" selector=".rule-param-edit input"/>
-+        <element name="conditionsOperator" type="select" selector=".rule-param-edit select"/>
-+        <element name="addCondition" type="button" selector="//*[@id='conditions__{{arg}}__children']//span" parameterized="true"/>
-+        <element name="ruleCondition" type="select" selector="rule[conditions][{{arg}}][new_child]" parameterized="true"/>
-+        <element name="ruleParameter" type="text" selector="//span[@class='rule-param']/a[contains(text(), '{{arg}}')]" parameterized="true"/>
-+        <element name="ruleParameterSelect" type="select" selector="rule[conditions][{{arg}}][operator]" parameterized="true"/>
-+        <element name="ruleParameterInput" type="input" selector="rule[conditions][{{arg}}][value]" parameterized="true"/>
-+        <element name="openChooser" type="button" selector="//label[@for='conditions__{{arg}}__value']" parameterized="true"/>
-+        <element name="categoryCheckbox" type="checkbox" selector="//span[contains(text(), '{{arg}}')]/parent::a/preceding-sibling::input[@type='checkbox']" parameterized="true"/>
-+        <element name="newCondition" type="button" selector=".rule-param.rule-param-new-child" timeout="30"/>
-+        <element name="conditionSelect" type="select" selector="select[name='rule[conditions][1][new_child]']"/>
-+        <element name="targetEllipsis" type="input" selector="//ul[contains(@id, 'conditions')]//a[.='...']"/>
-+        <element name="ruleFieldByIndex" type="input" selector="[id='conditions__{{index}}__value']" parameterized="true"/>
-+        <element name="addNewCondition" type="button" selector="//ul[@id = 'conditions__{{nestedIndex}}__children']/li/span[contains(@class, 'rule-param-new-child')]" parameterized="true" timeout="30"/>
-+        <element name="conditionSelectDropdown" type="select" selector="select[name='rule[conditions][{{nestedIndex}}][new_child]']" parameterized="true"/>
-+        <element name="selectCountryDropdown" type="select" selector="(//*[contains(@value,'country_id')]/..//select)[last()]"/>
-+
-+        <!--Conditions checker -->
-+        <element name="openList" type="button" selector="a.rule-chooser-trigger>img.v-middle.rule-chooser-trigger"/>
-+        <element name="searchSegmentName" type="input" selector="//div[@class='rule-chooser']//input[@name='grid_segment_name']"/>
-+        <element name="searchButton" type="button" selector="div.admin__filter-actions>button.action-default.scalable.action-secondary" timeout="10" />
-+        <element name="selectAll" type="checkbox" selector="//*[@class='rule-chooser']//input[contains(@class, 'admin__control-checkbox')]" timeout="10"/>
-+        <element name="resetSearchFilter" type="button" selector="//div[@class='admin__filter-actions']//button[@title='Reset Filter']"/>
-+        <element name="setSegment" type="button" selector="//*[@class='rule-tree-wrapper']//a[@class='rule-param-apply']"/>
- 
-         <!-- Actions sub-form -->
-+        <element name="actionsTab" type="text" selector="//div[@data-index='actions']//span[contains(.,'Actions')][1]"/>
-         <element name="actionsHeader" type="button" selector="div[data-index='actions']" timeout="30"/>
-+        <element name="actionsHeaderOpen" type="button" selector="div[data-index='actions'] div[data-state-collapsible='open']" timeout="30"/>
-         <element name="apply" type="select" selector="select[name='simple_action']"/>
-+        <element name="conditions" type="button" selector=".rule-param.rule-param-new-child > a"/>
-+        <element name="childAttribute" type="select" selector="//select[contains(@name, 'new_child')]"/>
-+        <element name="condition" type="text" selector="//span[@class='rule-param']/a[text()='{{arg}}']" parameterized="true"/>
-+        <element name="actionsAggregator" type="select" selector="#actions__1__aggregator"/>
-+        <element name="actionsValue" type="select" selector="#actions__1__value"/>
-+        <element name="operator" type="select" selector="//select[contains(@name, '[operator]')]"/>
-+        <element name="option" type="select" selector="//ul[@class='rule-param-children']//select[contains(@name, '[value]')]"/>
-+        <element name="actionValue" type="input" selector=".rule-param-edit input"/>
-+        <element name="applyAction" type="text" selector=".rule-param-apply" timeout="30"/>
-+        <element name="actionOperator" type="select" selector=".rule-param-edit select"/>
-         <element name="applyDiscountToShipping" type="checkbox" selector="input[name='apply_to_shipping']"/>
-         <element name="applyDiscountToShippingLabel" type="checkbox" selector="input[name='apply_to_shipping']+label"/>
-         <element name="discountAmount" type="input" selector="input[name='discount_amount']"/>
-+        <element name="maximumQtyDiscount" type="input" selector="input[name='discount_qty']"/>
-         <element name="discountStep" type="input" selector="input[name='discount_step']"/>
-+        <element name="applyToShippingAmount" type="checkbox" selector="//div[@class='admin__actions-switch']/input[@name='apply_to_shipping']/../label"/>
-+        <element name="discardSubsequentRules" type="checkbox" selector="//div[@class='admin__actions-switch']/input[@name='stop_rules_processing']/../label"/>
-+        <element name="addRewardPoints" type="input" selector="input[name='extension_attributes[reward_points_delta]']"/>
-+        <element name="freeShipping" type="select" selector="//select[@name='simple_free_shipping']"/>
-+
-+        <!-- Labels sub-form -->
-+        <element name="labelsHeader" type="button" selector="div[data-index='labels']" timeout="30"/>
-+        <element name="defaultRuleLabelAllStoreViews" type="input" selector="input[name='store_labels[0]']"/>
-+        <element name="defaultStoreView" type="input" selector="input[name='store_labels[1]']"/>
- 
-         <!-- Manage Coupon Codes sub-form -->
-         <element name="manageCouponCodesHeader" type="button" selector="div[data-index='manage_coupon_codes']" timeout="30"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
-index 5fe5fc1e346..60bf3d63e7e 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminCartPriceRulesSection">
-         <element name="addNewRuleButton" type="button" selector="#add" timeout="30"/>
-         <element name="messages" type="text" selector=".messages"/>
-@@ -15,5 +15,9 @@
-         <element name="nameColumns" type="text" selector="td[data-column='name']"/>
-         <element name="rowContainingText" type="text" selector="//*[@id='promo_quote_grid_table']/tbody/tr[td//text()[contains(., '{{var1}}')]]" parameterized="true" timeout="30"/>
-         <element name="rowByIndex" type="text" selector="tr[data-role='row']:nth-of-type({{var1}})" parameterized="true" timeout="30"/>
-+        <element name="rulesRow" type="text" selector="//tr[@data-role='row']"/>
-+        <element name="pageCurrent" type="text" selector="//label[@for='promo_quote_grid_page-current']"/>
-+        <element name="totalCount" type="text" selector="span[data-ui-id*='grid-total-count']"/>
-+        <element name="emptyText" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/CartPriceRulesSubmenuSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/CartPriceRulesSubmenuSection.xml
-new file mode 100644
-index 00000000000..eb4098d71dc
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/CartPriceRulesSubmenuSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="CartPriceRulesSubmenuSection">
-+        <element name="cartPriceRules" type="button" selector="//li[@data-ui-id='menu-magento-catalogrule-promo']//li[@data-ui-id='menu-magento-salesrule-promo-quote']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/CheckoutCartSummarySection.xml
-index 5327d53032d..a5fb96afcc9 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Section/CheckoutCartSummarySection.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/CheckoutCartSummarySection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CheckoutCartSummarySection">
-         <element name="discountLabel" type="text" selector="//*[@id='cart-totals']//tr[.//th//span[contains(@class, 'discount coupon')]]"/>
-         <element name="discountTotal" type="text" selector="//*[@id='cart-totals']//tr[.//th//span[contains(@class, 'discount coupon')]]//td//span//span[@class='price']"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
-index cc9ab672452..45dce325f3c 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
-@@ -6,10 +6,14 @@
-   */
- -->
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="DiscountSection">
--        <element name="DiscountTab" type="button" selector="//strong[text()='Apply Discount Code']"/>
-+        <element name="DiscountTab" type="button" selector="//*[text()='Apply Discount Code']"/>
-         <element name="CouponInput" type="input" selector="#coupon_code"/>
-+        <element name="DiscountInput" type="input" selector="#discount-code"/>
-         <element name="ApplyCodeBtn" type="button" selector="//span[text()='Apply Discount']"/>
-+        <element name="CancelCoupon" type="button" selector="//button[@value='Cancel Coupon']"/>
-+        <element name="DiscountVerificationMsg" type="button" selector=".message-success div"/>
-+        <element name="CancelCouponBtn" type="button" selector="#discount-form .action-cancel"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml
-index 1b05ec838dc..9a74ced2a2c 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml
-@@ -4,7 +4,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+<sections xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-     <section name="PriceRuleConditionsSection">
-         <element name="conditionsTab" type="text" selector="//div[@data-index='conditions']//span[contains(.,'Conditions')][1]"/>
-         <element name="createNewRule" type="text" selector="span.rule-param.rule-param-new-child"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontSalesRuleCartCouponSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontSalesRuleCartCouponSection.xml
-index 39d85ae5fa6..a51aa0b7a7e 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontSalesRuleCartCouponSection.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontSalesRuleCartCouponSection.xml
-@@ -7,12 +7,12 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontSalesRuleCartCouponSection">
--        <element name="couponHeader" type="button" selector="//*[@id='block-discount-heading']"/>
--        <element name="couponField" type="text" selector="//*[@id='coupon_code']"/>
--        <element name="discountBlockActive" type="text" selector="//*[@class='block discount active']" />
--        <element name="applyButton" type="text" selector="//*[@id='discount-coupon-form']//button[contains(@class, 'apply')]"/>
--        <element name="cancelButton" type="text" selector="//*[@id='discount-coupon-form']//button[contains(@class, 'cancel')]"/>
-+        <element name="couponHeader" type="button" selector="#block-discount-heading"/>
-+        <element name="couponField" type="text" selector="#coupon_code"/>
-+        <element name="discountBlockActive" type="text" selector=".block.discount.active" />
-+        <element name="applyButton" type="text" selector="#discount-coupon-form button[class*='apply']" timeout="30"/>
-+        <element name="cancelButton" type="text" selector="#discount-coupon-form button[class*='cancel']" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
-new file mode 100644
-index 00000000000..dc5b624c4ea
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
-@@ -0,0 +1,129 @@
-+<?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="AdminCartRulesAppliedForProductInCartTest">
-+        <annotations>
-+            <features value="SalesRule"/>
-+            <stories value="The cart rule cannot effect the cart"/>
-+            <title value="Check that cart rules applied for product in cart"/>
-+            <description value="Check that cart rules applied for product in cart"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-96722"/>
-+            <useCaseId value="MAGETWO-96410"/>
-+            <group value="SalesRule"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <!--Create category and product-->
-+            <createData entity="_defaultCategory" stepKey="defaultCategory"/>
-+            <createData entity="SimpleProduct2" stepKey="simpleProduct">
-+                <field key="price">200</field>
-+                <field key="quantity">500</field>
-+            </createData>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+
-+        <after>
-+            <!--Delete created data-->
-+            <deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
-+
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteBundleProduct">
-+                <argument name="sku" value="{{BundleProduct.sku}}"/>
-+            </actionGroup>
-+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilters"/>
-+
-+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
-+                <argument name="ruleName" value="{{PriceRuleWithCondition.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilters1"/>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Start creating a bundle product-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-+        <waitForPageLoad stepKey="waitForProductList"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillNameAndSku">
-+            <argument name="product" value="BundleProduct"/>
-+        </actionGroup>
-+        <pressKey selector="{{AdminProductFormSection.productSku}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="enter"/>
-+
-+        <!--Off dynamic price and set value-->
-+        <scrollToTopOfPage stepKey="scrollToTopOfThePageToSeePriceTypeElement"/>
-+        <click  selector="{{AdminProductFormBundleSection.dynamicPrice}}" stepKey="offDynamicPrice"/>
-+        <fillField selector="{{AdminProductFormBundleSection.priceField}}" userInput="0" stepKey="setProductPrice"/>
-+
-+        <!-- Add category to product -->
-+        <click selector="{{AdminProductFormBundleSection.categoriesDropDown}}" stepKey="dropDownCategories"/>
-+        <fillField selector="{{AdminProductFormBundleSection.searchForCategory}}" userInput="$$defaultCategory.name$$" stepKey="searchForCategory"/>
-+        <waitForElementVisible selector="{{AdminProductFormBundleSection.selectCategory}}" stepKey="waitForElementLoaded"/>
-+        <click selector="{{AdminProductFormBundleSection.selectCategory}}" stepKey="selectCategory"/>
-+        <click selector="{{AdminProductFormBundleSection.categoriesLabel}}" stepKey="clickOnCategoriesLabelToCloseOptions"/>
-+
-+        <!-- Add option, a "Radio Buttons" type option, with one product and set fixed price 200-->
-+        <actionGroup ref="addBundleOptionWithOneProduct" stepKey="addBundleOptionWithOneProduct">
-+            <argument name="x" value="0"/>
-+            <argument name="n" value="1"/>
-+            <argument name="prodOneSku" value="$$simpleProduct.sku$$"/>
-+            <argument name="prodTwoSku" value=""/>
-+            <argument name="optionTitle" value="Option One"/>
-+            <argument name="inputType" value="radio"/>
-+        </actionGroup>
-+        <selectOption selector="{{AdminProductFormBundleSection.bundlePriceType}}" userInput="Fixed" stepKey="selectPriceType"/>
-+        <fillField selector="{{AdminProductFormBundleSection.bundlePriceValue}}" userInput="200" stepKey="fillPriceValue"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+
-+        <!--Create cart price rule-->
-+        <actionGroup ref="AdminCreateCartPriceRuleWithConditions" stepKey="createRule">
-+            <argument name="ruleName" value="PriceRuleWithCondition"/>
-+            <argument name="condition1" value="Products subselection"/>
-+            <argument name="condition2" value="Category"/>
-+            <argument name="ruleToChange1" value="is"/>
-+            <argument name="rule1" value="equals or greater than"/>
-+            <argument name="ruleToChange2" value="..."/>
-+            <argument name="rule2" value="2"/>
-+            <argument name="categoryName" value="{{_defaultCategory.name}}"/>
-+        </actionGroup>
-+
-+        <!--Go to Storefront and add product to cart and checkout from cart-->
-+        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
-+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="2" stepKey="setQuantity"/>
-+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="AddProductToCard">
-+            <argument name="productName" value="$$simpleProduct.name$$"/>
-+        </actionGroup>
-+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping"/>
-+
-+        <!--Check totals-->
-+        <grabTextFrom selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="grabSubtotal"/>
-+        <grabTextFrom selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" stepKey="grabShippingTotal"/>
-+        <grabTextFrom selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="grabTotal"/>
-+        <assertEquals stepKey="assertSubtotal">
-+            <expectedResult type="string">$400.00</expectedResult>
-+            <actualResult type="variable">$grabSubtotal</actualResult>
-+        </assertEquals>
-+        <assertEquals stepKey="assertShippingTotal">
-+            <expectedResult type="string">$10.00</expectedResult>
-+            <actualResult type="variable">$grabShippingTotal</actualResult>
-+        </assertEquals>
-+        <assertEquals stepKey="assertTotal">
-+            <expectedResult type="string">$410.00</expectedResult>
-+            <actualResult type="variable">$grabTotal</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml
-index d21034bc924..92d221de9e1 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateBuyXGetYFreeTest">
-         <annotations>
-             <features value="SalesRule"/>
-@@ -40,6 +40,8 @@
-         <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
-         <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Buy X get Y free (discount amount is Y)" stepKey="selectActionType"/>
-         <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="1" stepKey="fillDiscountAmount"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleAndVerifyRuleConditionAndFreeShippingIsAppliedTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleAndVerifyRuleConditionAndFreeShippingIsAppliedTest.xml
-new file mode 100644
-index 00000000000..7798ccb7269
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleAndVerifyRuleConditionAndFreeShippingIsAppliedTest.xml
-@@ -0,0 +1,116 @@
-+<?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="AdminCreateCartPriceRuleAndVerifyRuleConditionAndFreeShippingIsAppliedTest">
-+        <annotations>
-+            <stories value="Create Sales Rule"/>
-+            <title value="Create Cart Price Rule And Verify Rule Condition And Free Shipping Is Applied"/>
-+            <description value="Test log in to Cart Price Rules and Create Cart Price Rule And Verify Rule Condition And Free Shipping Is Applied"/>
-+            <testCaseId value="MC-15604"/>
-+            <severity value="CRITICAL"/>
-+            <group value="SalesRule"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteProduct" createDataKey="initialSimpleProduct"/>
-+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCreatedCartPriceRule">
-+                <argument name="ruleName" value="{{CartPriceRuleConditionAndFreeShippingApplied.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create cart price rule as per data and verify AssertCartPriceRuleSuccessSaveMessage-->
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-+        <waitForPageLoad stepKey="waitForPriceList"/>
-+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.name}}" stepKey="fillRuleName"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.description}}" stepKey="fillDescription"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.websites}}" stepKey="selectWebsites"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" parameterArray="[{{CartPriceRuleConditionAndFreeShippingApplied.customerGroups}}]" stepKey="selectCustomerGroup"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.coupon_type}}" stepKey="selectCouponType"/>
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="scrollToActionsHeader"/>
-+        <actionGroup ref="AdminCreateCartPriceRuleActionsSectionDiscountFieldsActionGroup" stepKey="createActiveCartPriceRuleActionsSection">
-+            <argument name="rule" value="CartPriceRuleConditionAndFreeShippingApplied"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateCartPriceRuleActionsSectionFreeShippingActionGroup" stepKey="createActiveCartPriceRuleFreeShippingActionsSection">
-+            <argument name="freeShippingOption" value="{{CartPriceRuleConditionAndFreeShippingApplied.simple_free_shipping}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateCartPriceRuleLabelsSectionActionGroup" stepKey="createActiveCartPriceRuleLabelsSection">
-+            <argument name="rule" value="CartPriceRuleConditionAndFreeShippingApplied"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertCartPriceRuleSuccessSaveMessageActionGroup" stepKey="seeAssertCartPriceRuleSuccessSaveMessage"/>
-+
-+        <!--Search created cart price rule in grid-->
-+        <actionGroup ref="AdminFilterCartPriceRuleActionGroup" stepKey="searchCreatedCartPriceRuleInGrid">
-+            <argument name="ruleName" value="CartPriceRuleConditionAndFreeShippingApplied.name"/>
-+        </actionGroup>
-+
-+        <!--Go to cart price rule form page and verify AssertCartPriceRuleForm-->
-+        <waitForPageLoad stepKey="waitForAdminCartPriceRuleEditPageLoad"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.name}}" stepKey="seeRuleName"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.description}}" stepKey="seeDescription"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.websites}}" stepKey="seeWebsites"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.customerGroups}}" stepKey="seeCustomerGroup"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.coupon_type}}" stepKey="seeCouponType"/>
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickActionsHeader"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.actionsHeader}}" visible="true" stepKey="clickExpandActions"/>
-+        <see selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.simple_action}}" stepKey="seeActionApplyType"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.discount_amount}}" stepKey="seeDiscountAmount"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.freeShipping}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.simple_free_shipping}}" stepKey="seeFreeShipping"/>
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.labelsHeader}}" stepKey="clickLabelsHeader"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.labelsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.labelsHeader}}" visible="true" stepKey="clickToExpandLabels"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.defaultRuleLabelAllStoreViews}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.defaultRuleLabelAllStoreViews}}" stepKey="seeDefaultRuleLabelAllStoreViews"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.defaultStoreView}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.defaultStoreView}}" stepKey="seeDefaultStoreView"/>
-+
-+        <!--Go to storefront page and verify created product-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPageAndVerifyProduct">
-+            <argument name="product" value="$$initialSimpleProduct$$"/>
-+        </actionGroup>
-+        <!--Click on Add To Cart button-->
-+        <actionGroup ref="StorefrontAddToTheCartActionGroup" stepKey="clickOnAddToCartButton"/>
-+        <!--Click on mini cart-->
-+        <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
-+
-+        <!--Open mini cart and verify Shopping cart subtotal equals to grand total-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="verifyCartSubtotalEqualsGrandTotal">
-+            <argument name="productName" value="$$initialSimpleProduct.name$$"/>
-+            <argument name="productPrice" value="$560.00"/>
-+            <argument name="cartSubtotal" value="$560.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!--Click on view and edit cart link-->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <waitForPageLoad stepKey="waitForViewAndEditCartToOpen"/>
-+        <conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" visible="true" stepKey="clickEstimateShippingAndTaxToOpen"/>
-+        <waitForPageLoad stepKey="waitForEstimateShippingAndTaxToOpen"/>
-+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country_id}}" stepKey="selectUnitedStatesCountry"/>
-+        <waitForPageLoad stepKey="waitToSelectCountry"/>
-+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="selectCaliforniaRegion"/>
-+        <waitForPageLoad stepKey="waitToSelectState"/>
-+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{US_Address_CA.postcode}}" stepKey="inputPostCode"/>
-+        <!--After selecting country, province and postcode, verify AssertCartPriceRuleConditionIsApplied and AssertCartPriceRuleFreeShippingIsApplied-->
-+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssert">
-+            <argument name="subtotal" value="$560.00"/>
-+            <argument name="shipping" value="$0.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="$280.00"/>
-+        </actionGroup>
-+        <see selector="{{CheckoutCartSummarySection.shipping}}" userInput="$0.00" stepKey="seeAssertFreeShippingConditionApplied"/>
-+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$280.00" stepKey="seeAssertDiscountAmountAppliedForMatchingItemsConditionIsTrue"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleAndVerifyRuleConditionIsNotAppliedTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleAndVerifyRuleConditionIsNotAppliedTest.xml
-new file mode 100644
-index 00000000000..a7886222ff0
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleAndVerifyRuleConditionIsNotAppliedTest.xml
-@@ -0,0 +1,120 @@
-+<?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="AdminCreateCartPriceRuleAndVerifyRuleConditionIsNotAppliedTest">
-+        <annotations>
-+            <stories value="Create Sales Rule"/>
-+            <title value="Create Cart Price Rule And Verify Rule Condition Is Not Applied"/>
-+            <description value="Test log in to Cart Price Rules and Create Cart Price Rule And Verify Rule Condition Is Not Applied"/>
-+            <testCaseId value="MC-15606"/>
-+            <severity value="CRITICAL"/>
-+            <group value="SalesRule"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
-+            <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteProduct" createDataKey="initialSimpleProduct"/>
-+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCreatedCartPriceRule">
-+                <argument name="ruleName" value="{{CartPriceRuleConditionNotApplied.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logoutAsAdmin"/>
-+        </after>
-+
-+        <!--Create cart price rule as per data and verify AssertCartPriceRuleSuccessSaveMessage-->
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-+        <waitForPageLoad stepKey="waitForPriceList"/>
-+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CartPriceRuleConditionNotApplied.name}}" stepKey="fillRuleName"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{CartPriceRuleConditionNotApplied.description}}" stepKey="fillDescription"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{CartPriceRuleConditionNotApplied.websites}}" stepKey="selectWebsites"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" parameterArray="[{{CartPriceRuleConditionNotApplied.customerGroups}}]" stepKey="selectCustomerGroup"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="{{CartPriceRuleConditionNotApplied.coupon_type}}" stepKey="selectCouponType"/>
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="scrollToConditionsHeader"/>
-+
-+        <!-- Fill condition 1: Total Items Quantity -->
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" visible="true" stepKey="expandConditions"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.newCondition}}" stepKey="clickNewCondition"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.conditionSelect}}" userInput="Total Items Quantity" stepKey="selectCondition"/>
-+        <waitForPageLoad stepKey="waitForConditionLoad"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.targetEllipsis}}" stepKey="clickEllipsis"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleFieldByIndex('1--1')}}" userInput="{{CartPriceRuleConditionNotApplied.totalItemQuantity}}" stepKey="fillTotalItemQuantity"/>
-+        <actionGroup ref="AdminCreateCartPriceRuleActionsSectionDiscountFieldsActionGroup" stepKey="createActiveCartPriceRuleActionsSection">
-+            <argument name="rule" value="CartPriceRuleConditionNotApplied"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateCartPriceRuleActionsSectionFreeShippingActionGroup" stepKey="createActiveCartPriceRuleFreeShippingActionsSection">
-+            <argument name="freeShippingOption" value="{{CartPriceRuleConditionNotApplied.simple_free_shipping}}"/>
-+        </actionGroup>
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.labelsHeader}}" stepKey="scrollToLabelsHeader"/>
-+        <actionGroup ref="AdminCreateCartPriceRuleLabelsSectionActionGroup" stepKey="createActiveCartPriceRuleLabelsSection">
-+            <argument name="rule" value="CartPriceRuleConditionNotApplied"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertCartPriceRuleSuccessSaveMessageActionGroup" stepKey="seeAssertCartPriceRuleSuccessSaveMessage"/>
-+
-+        <!--Search created cart price rule in grid-->
-+        <actionGroup ref="AdminFilterCartPriceRuleActionGroup" stepKey="searchCreatedCartPriceRuleInGrid">
-+            <argument name="ruleName" value="CartPriceRuleConditionNotApplied.name"/>
-+        </actionGroup>
-+
-+        <!--Go to cart price rule form page and verify AssertCartPriceRuleForm-->
-+        <waitForPageLoad stepKey="waitForAdminCartPriceRuleEditPageLoad"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CartPriceRuleConditionNotApplied.name}}" stepKey="seeRuleName"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{CartPriceRuleConditionNotApplied.description}}" stepKey="seeDescription"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{CartPriceRuleConditionNotApplied.websites}}" stepKey="seeWebsites"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="{{CartPriceRuleConditionNotApplied.customerGroups}}" stepKey="seeCustomerGroup"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="{{CartPriceRuleConditionNotApplied.coupon_type}}" stepKey="seeCouponType"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" visible="true" stepKey="clickToExpandConditions"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.ruleFieldByIndex('1--1')}}" userInput="{{CartPriceRuleConditionNotApplied.totalItemQuantity}}" stepKey="seeTotalItemQuantity"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.actionsHeader}}" visible="true" stepKey="clickExpandActions"/>
-+        <see selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="{{CartPriceRuleConditionNotApplied.simple_action}}" stepKey="seeActionApplyType"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="{{CartPriceRuleConditionNotApplied.discount_amount}}" stepKey="seeDiscountAmount"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.freeShipping}}" userInput="{{CartPriceRuleConditionNotApplied.simple_free_shipping}}" stepKey="seeFreeShipping"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.labelsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.labelsHeader}}" visible="true" stepKey="clickToExpandLabels"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.defaultRuleLabelAllStoreViews}}" userInput="{{CartPriceRuleConditionNotApplied.defaultRuleLabelAllStoreViews}}" stepKey="seeDefaultRuleLabelAllStoreViews"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.defaultStoreView}}" userInput="{{CartPriceRuleConditionNotApplied.defaultStoreView}}" stepKey="seeDefaultStoreView"/>
-+
-+        <!--Go to storefront page and verify created product-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPageAndVerifyProduct">
-+            <argument name="product" value="$$initialSimpleProduct$$"/>
-+        </actionGroup>
-+        <fillField selector="{{StorefrontProductInfoMainSection.qty}}" userInput="2" stepKey="fillProductQuantity"/>
-+        <!--Click on Add To Cart button-->
-+        <actionGroup ref="StorefrontAddToTheCartActionGroup" stepKey="clickOnAddToCartButton"/>
-+        <!--Click on mini cart-->
-+        <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
-+
-+        <!--Open mini cart and verify Shopping cart subtotal equals to grand total-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="verifyCartSubtotalEqualsGrandTotal">
-+            <argument name="productName" value="$$initialSimpleProduct.name$$"/>
-+            <argument name="productPrice" value="$560.00"/>
-+            <argument name="cartSubtotal" value="$1,120.00" />
-+            <argument name="qty" value="2"/>
-+        </actionGroup>
-+
-+        <!--Click on view and edit cart link-->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <waitForPageLoad stepKey="waitForViewAndEditCartToOpen"/>
-+        <!--Verify AssertCartPriceRuleConditionIsNotApplied(Shopping cart subtotal equals to grand total - price rule has not been applied)-->
-+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssert">
-+            <argument name="subtotal" value="$1,120.00"/>
-+            <argument name="shipping" value="$10.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="$1,130.00"/>
-+        </actionGroup>
-+        <dontSee selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeAssertDiscountAmountForRuleConditionNotApplied"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml
-new file mode 100644
-index 00000000000..f5b285f2f02
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml
-@@ -0,0 +1,105 @@
-+<?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="AdminCreateCartPriceRuleEmptyFromDateTest">
-+        <annotations>
-+            <features value="SalesRule"/>
-+            <stories value="Create cart price rule"/>
-+            <title value="Admin should be able to create a cart price rule with no starting date"/>
-+            <description value="Admin should be able to create a cart price rule without specifying the from_date and it should be set with the current date"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MC-5299"/>
-+            <group value="SalesRule"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="_defaultCategory" stepKey="category"/>
-+            <createData entity="SimpleProduct" stepKey="product">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+
-+        <after>
-+            <!-- Delete the cart price rule we made during the test -->
-+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
-+                <argument name="ruleName" value="{{_defaultCoupon.code}}"/>
-+            </actionGroup>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="product" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Set timezone-->
-+        <!--Set timezone so we need compare with the same timezone used in "generateDate" action-->
-+        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfig"/>
-+        <waitForPageLoad stepKey="waitForConfigPage"/>
-+        <wait stepKey="wait" time="10"/>
-+        <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSection"/>
-+        <grabValueFrom selector="{{LocaleOptionsSection.timezone}}" stepKey="originalTimezone"/>
-+        <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="America/Los_Angeles" stepKey="setTimezone"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfig"/>
-+
-+        <!-- Create a cart price rule based on a coupon code  -->
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-+        <waitForPageLoad stepKey="waitForPriceList"/>
-+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
-+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectCustomerGroup"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="{{_defaultCoupon.code}}" stepKey="fillCouponCode"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="5" stepKey="fillDiscountAmount"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
-+
-+        <!-- Verify initial successful save -->
-+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
-+        <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{_defaultCoupon.code}}" stepKey="filterByName"/>
-+        <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
-+        <see selector="{{AdminCartPriceRulesSection.nameColumns}}" userInput="{{_defaultCoupon.code}}" stepKey="seeRuleInResults"/>
-+
-+        <!-- Verify further on the Rule's edit page -->
-+        <click selector="{{AdminCartPriceRulesSection.rowContainingText(_defaultCoupon.code)}}" stepKey="goToEditRule"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="seeRuleName"/>
-+        <seeOptionIsSelected selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="seeWebsites"/>
-+        <seeOptionIsSelected selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="seeCouponType"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="{{_defaultCoupon.code}}" stepKey="seeCouponCode"/>
-+        <generateDate date="now" format="m/j/Y" timezone="America/Los_Angeles" stepKey="today"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="$today" stepKey="seeCorrectFromDate"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.toDate}}" userInput="" stepKey="seeEmptyToDate"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions2"/>
-+        <seeOptionIsSelected selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="seeActionType"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="5" stepKey="seeDiscountAmount"/>
-+
-+        <!-- Spot check the storefront -->
-+        <amOnPage url="$$product.custom_attributes[url_key]$$.html" stepKey="goToProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-+        <waitForPageLoad stepKey="waitForAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
-+        <waitForPageLoad stepKey="waitForCartPage"/>
-+        <actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="applyCoupon">
-+            <argument name="coupon" value="_defaultCoupon"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
-+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
-+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$5.00" stepKey="seeDiscountTotal"/>
-+
-+        <!--Reset timezone-->
-+        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfigReset"/>
-+        <waitForPageLoad stepKey="waitForConfigPageReset"/>
-+        <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSectionReset"/>
-+        <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="$originalTimezone" stepKey="resetTimezone"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigReset"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml
-index a33a4b819b5..712475186d5 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateCartPriceRuleForCouponCodeTest">
-         <annotations>
-             <features value="SalesRule"/>
-@@ -30,7 +30,7 @@
-                 <argument name="ruleName" value="{{_defaultCoupon.code}}"/>
-             </actionGroup>
-             <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
--            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-         </after>
- 
-         <!-- Create a cart price rule based on a coupon code  -->
-@@ -42,6 +42,8 @@
-         <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
-         <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="{{_defaultCoupon.code}}" stepKey="fillCouponCode"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
-         <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/>
-         <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="5" stepKey="fillDiscountAmount"/>
-@@ -75,6 +77,7 @@
-         <waitForPageLoad stepKey="waitForProductPageLoad"/>
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-         <waitForPageLoad stepKey="waitForAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
-         <waitForPageLoad stepKey="waitForCartPage"/>
-         <actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="applyCoupon">
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
-index cf8879514f5..03dffe9f448 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateCartPriceRuleForGeneratedCouponTest">
-         <annotations>
-             <features value="SalesRule"/>
-@@ -42,6 +42,8 @@
-         <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
-         <checkOption selector="{{AdminCartPriceRulesFormSection.useAutoGeneration}}" stepKey="tickAutoGeneration"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
-         <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/>
-         <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="0.99" stepKey="fillDiscountAmount"/>
-@@ -51,7 +53,14 @@
-         <click selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" stepKey="expandCouponSection"/>
-         <fillField selector="{{AdminCartPriceRulesFormSection.couponQty}}" userInput="10" stepKey="fillCouponQty"/>
-         <click selector="{{AdminCartPriceRulesFormSection.generateCouponsButton}}" stepKey="clickGenerate"/>
--        <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="10 coupon(s) have been generated." stepKey="seeGenerationSuccess"/>
-+        <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="Message is added to queue, wait to get your coupons soon" stepKey="seeGenerationSuccess"/>
-+
-+        <!-- Run cron twice -->
-+        <magentoCLI command="cron:run" stepKey="runCron1"/>
-+        <magentoCLI command="cron:run" stepKey="runCron2"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitFormToReload1"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" stepKey="expandCouponSection2"/>
- 
-         <!-- Grab a coupon code and hold on to it for later -->
-         <grabTextFrom selector="{{AdminCartPriceRulesFormSection.generatedCouponByIndex('1')}}" stepKey="grabCouponCode"/>
-@@ -67,13 +76,13 @@
-         <waitForPageLoad stepKey="waitForProductPageLoad"/>
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-         <waitForPageLoad stepKey="waitForAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
-         <waitForPageLoad stepKey="waitForCartPage"/>
-         <conditionalClick selector="{{StorefrontSalesRuleCartCouponSection.couponHeader}}" dependentSelector="{{StorefrontSalesRuleCartCouponSection.discountBlockActive}}" visible="false" stepKey="clickCouponHeader"/>
-         <waitForElementVisible selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" stepKey="waitForCouponField" />
-         <fillField selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" userInput="{$grabCouponCode}" stepKey="fillCouponField"/>
-         <click selector="{{StorefrontSalesRuleCartCouponSection.applyButton}}" stepKey="clickApplyButton"/>
--        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
-         <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
-         <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$0.99" stepKey="seeDiscountTotal"/>
-     </test>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForMatchingSubtotalAndVerifyRuleConditionIsAppliedTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForMatchingSubtotalAndVerifyRuleConditionIsAppliedTest.xml
-new file mode 100644
-index 00000000000..2b2834726f6
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForMatchingSubtotalAndVerifyRuleConditionIsAppliedTest.xml
-@@ -0,0 +1,125 @@
-+<?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="AdminCreateCartPriceRuleForMatchingSubtotalAndVerifyRuleConditionIsAppliedTest">
-+        <annotations>
-+            <stories value="Create Sales Rule"/>
-+            <title value="Create Cart Price Rule For Matching Subtotal And Verify Rule Condition Is Applied"/>
-+            <description value="Test log in to Cart Price Rules and Create Cart Price Rule For Matching Subtotal And Verify Rule Condition Is Applied"/>
-+            <testCaseId value="MC-15605"/>
-+            <severity value="CRITICAL"/>
-+            <group value="SalesRule"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteProduct" createDataKey="initialSimpleProduct"/>
-+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCreatedCartPriceRule">
-+                <argument name="ruleName" value="{{CartPriceRuleConditionAppliedForSubtotal.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create cart price rule as per data and verify AssertCartPriceRuleSuccessSaveMessage-->
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-+        <waitForPageLoad stepKey="waitForPriceList"/>
-+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.name}}" stepKey="fillRuleName"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.description}}" stepKey="fillDescription"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.websites}}" stepKey="selectWebsites"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" parameterArray="[{{CartPriceRuleConditionAppliedForSubtotal.customerGroups}}]" stepKey="selectCustomerGroup"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.coupon_type}}" stepKey="selectCouponType"/>
-+
-+        <!-- Expand the conditions section -->
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="scrollToConditionsHeader"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" visible="true" stepKey="clickToExpandConditions"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.newCondition}}" stepKey="clickNewCondition"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.conditionSelect}}" userInput="Subtotal" stepKey="selectCondition1"/>
-+        <waitForPageLoad stepKey="waitForConditionLoad"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.targetEllipsis}}" stepKey="clickEllipsis"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleFieldByIndex('1--1')}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.subtotal}}" stepKey="fillSubtotalParameter"/>
-+        <actionGroup ref="AdminCreateCartPriceRuleActionsSectionDiscountFieldsActionGroup" stepKey="createActiveCartPriceRuleActionsSection">
-+            <argument name="rule" value="CartPriceRuleConditionAppliedForSubtotal"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateCartPriceRuleActionsSectionFreeShippingActionGroup" stepKey="createActiveCartPriceRuleFreeShippingActionsSection">
-+            <argument name="freeShippingOption" value="{{CartPriceRuleConditionAppliedForSubtotal.simple_free_shipping}}"/>
-+        </actionGroup>
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.labelsHeader}}" stepKey="scrollToLabelsHeader"/>
-+        <actionGroup ref="AdminCreateCartPriceRuleLabelsSectionActionGroup" stepKey="createActiveCartPriceRuleLabelsSection">
-+            <argument name="rule" value="CartPriceRuleConditionAppliedForSubtotal"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertCartPriceRuleSuccessSaveMessageActionGroup" stepKey="seeAssertCartPriceRuleSuccessSaveMessage"/>
-+
-+        <!--Search created cart price rule in grid-->
-+        <actionGroup ref="AdminFilterCartPriceRuleActionGroup" stepKey="searchCreatedCartPriceRuleInGrid">
-+            <argument name="ruleName" value="CartPriceRuleConditionAppliedForSubtotal.name"/>
-+        </actionGroup>
-+
-+        <!--Go to cart price rule form page and verify AssertCartPriceRuleForm-->
-+        <waitForPageLoad stepKey="waitForAdminCartPriceRuleEditPageLoad"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.name}}" stepKey="seeRuleName"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.description}}" stepKey="seeDescription"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.websites}}" stepKey="seeWebsites"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.customerGroups}}" stepKey="seeCustomerGroup"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.coupon_type}}" stepKey="seeCouponType"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" visible="true" stepKey="clickToExpandConditions2"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.ruleFieldByIndex('1--1')}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.subtotal}}" stepKey="seeSubtotalParameter"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.actionsHeader}}" visible="true" stepKey="clickExpandActions"/>
-+        <see selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.simple_action}}" stepKey="seeActionApplyType"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.discount_amount}}" stepKey="seeDiscountAmount"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.freeShipping}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.simple_free_shipping}}" stepKey="seeFreeShipping"/>
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.labelsHeader}}" stepKey="scrollToTheLabelsHeader"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.labelsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.labelsHeader}}" visible="true" stepKey="clickToExpandLabels"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.defaultRuleLabelAllStoreViews}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.defaultRuleLabelAllStoreViews}}" stepKey="seeDefaultRuleLabelAllStoreViews"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.defaultStoreView}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.defaultStoreView}}" stepKey="seeDefaultStoreView"/>
-+
-+        <!--Go to storefront page and verify created product-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPageAndVerifyProduct">
-+            <argument name="product" value="$$initialSimpleProduct$$"/>
-+        </actionGroup>
-+        <!--Click on Add To Cart button-->
-+        <actionGroup ref="StorefrontAddToTheCartActionGroup" stepKey="clickOnAddToCartButton"/>
-+        <!--Click on mini cart-->
-+        <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
-+
-+        <!--Open mini cart and verify Shopping cart subtotal equals to grand total-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="verifyCartSubtotalEqualsGrandTotal">
-+            <argument name="productName" value="$$initialSimpleProduct.name$$"/>
-+            <argument name="productPrice" value="$560.00"/>
-+            <argument name="cartSubtotal" value="$560.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!--Click on view and edit cart link-->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <waitForPageLoad stepKey="waitForViewAndEditCartToOpen"/>
-+        <conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" visible="true" stepKey="clickEstimateShippingAndTaxToOpen"/>
-+        <waitForPageLoad stepKey="waitForEstimateShippingAndTaxToOpen"/>
-+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country_id}}" stepKey="selectUnitedStatesCountry"/>
-+        <waitForPageLoad stepKey="waitToSelectCountry"/>
-+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="selectCaliforniaRegion"/>
-+        <waitForPageLoad stepKey="waitToSelectState"/>
-+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{US_Address_CA.postcode}}" stepKey="inputPostCode"/>
-+        <!--After selecting country, province and postcode, verify AssertCartPriceRuleConditionIsApplied if Subtotal condition is True-->
-+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssert">
-+            <argument name="subtotal" value="$560.00"/>
-+            <argument name="shipping" value="$5.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="$285.00"/>
-+        </actionGroup>
-+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$280.00" stepKey="seeAssertDiscountAmountAppliedForSubtotalConditionIsTrue"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleWithMatchingCategoryAndVerifyRuleConditionIsAppliedTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleWithMatchingCategoryAndVerifyRuleConditionIsAppliedTest.xml
-new file mode 100644
-index 00000000000..c2d8388eb83
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleWithMatchingCategoryAndVerifyRuleConditionIsAppliedTest.xml
-@@ -0,0 +1,127 @@
-+<?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="AdminCreateCartPriceRuleWithMatchingCategoryAndVerifyRuleConditionIsAppliedTest">
-+        <annotations>
-+            <stories value="Create Sales Rule"/>
-+            <title value="Create Cart Price Rule With Matching Category And Verify Rule Condition Is Applied"/>
-+            <description value="Test log in to Cart Price Rules and Create Cart Price Rule With Matching Category And Verify Rule Condition Is Applied"/>
-+            <testCaseId value="MC-15608"/>
-+            <severity value="CRITICAL"/>
-+            <group value="SalesRule"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
-+                <argument name="category" value="$$createCategory$$"/>
-+                <argument name="simpleProduct" value="_defaultProduct"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deletePreReqCategory"/>
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteSimpleProduct">
-+                <argument name="product" value="_defaultProduct"/>
-+            </actionGroup>
-+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCreatedCartPriceRule">
-+                <argument name="ruleName" value="{{CartPriceRuleConditionAppliedForCategory.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create cart price rule as per data and verify AssertCartPriceRuleSuccessSaveMessage-->
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-+        <waitForPageLoad stepKey="waitForPriceList"/>
-+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CartPriceRuleConditionAppliedForCategory.name}}" stepKey="fillRuleName"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{CartPriceRuleConditionAppliedForCategory.description}}" stepKey="fillDescription"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{CartPriceRuleConditionAppliedForCategory.websites}}" stepKey="selectWebsites"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" parameterArray="[{{CartPriceRuleConditionAppliedForCategory.customerGroups}}]" stepKey="selectCustomerGroup"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="{{CartPriceRuleConditionAppliedForCategory.coupon_type}}" stepKey="selectCouponType"/>
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="scrollToConditionsHeader"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" visible="true" stepKey="clickToExpandConditions"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.addNewCondition('1')}}" stepKey="clickOnAddNewCondition"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.conditionSelectDropdown('1')}}" userInput="Product attribute combination" stepKey="selectProductAttributeCombination"/>
-+        <waitForPageLoad stepKey="waitForConditionLoad"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.addNewCondition('1--1')}}" stepKey="clickOnTheAddNewCondition"/>
-+        <waitForPageLoad stepKey="waitForToggleLoad"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.conditionSelectDropdown('1--1')}}" userInput="Category" stepKey="selectCategory"/>
-+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.targetEllipsis}}" stepKey="waitForEllipsis"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.targetEllipsis}}" stepKey="clickOnEllipsis"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleFieldByIndex('1--1--1')}}" userInput="$$createCategory.id$$" stepKey="fillTotalItemQuantity"/>
-+        <actionGroup ref="AdminCreateCartPriceRuleActionsSectionDiscountFieldsActionGroup" stepKey="createActiveCartPriceRuleActionsSection">
-+            <argument name="rule" value="CartPriceRuleConditionAppliedForCategory"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateCartPriceRuleActionsSectionFreeShippingActionGroup" stepKey="createActiveCartPriceRuleFreeShippingActionsSection">
-+            <argument name="freeShippingOption" value="{{CartPriceRuleConditionAppliedForCategory.simple_free_shipping}}"/>
-+        </actionGroup>
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.labelsHeader}}" stepKey="scrollToLabelsHeader"/>
-+        <actionGroup ref="AdminCreateCartPriceRuleLabelsSectionActionGroup" stepKey="createActiveCartPriceRuleLabelsSection">
-+            <argument name="rule" value="CartPriceRuleConditionAppliedForCategory"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertCartPriceRuleSuccessSaveMessageActionGroup" stepKey="seeAssertCartPriceRuleSuccessSaveMessage"/>
-+
-+        <!--Search created cart price rule in grid-->
-+        <actionGroup ref="AdminFilterCartPriceRuleActionGroup" stepKey="searchCreatedCartPriceRuleInGrid">
-+            <argument name="ruleName" value="CartPriceRuleConditionAppliedForCategory.name"/>
-+        </actionGroup>
-+
-+        <!--Go to cart price rule form page and verify AssertCartPriceRuleForm-->
-+        <waitForPageLoad stepKey="waitForAdminCartPriceRuleEditPageLoad"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CartPriceRuleConditionAppliedForCategory.name}}" stepKey="seeRuleName"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{CartPriceRuleConditionAppliedForCategory.description}}" stepKey="seeDescription"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{CartPriceRuleConditionAppliedForCategory.websites}}" stepKey="seeWebsites"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="{{CartPriceRuleConditionAppliedForCategory.customerGroups}}" stepKey="seeCustomerGroup"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="{{CartPriceRuleConditionAppliedForCategory.coupon_type}}" stepKey="seeCouponType"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" visible="true" stepKey="clickToExpandConditionHeader"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.ruleFieldByIndex('1--1--1')}}" userInput="$$createCategory.id$$" stepKey="seeCategoryParameter"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.actionsHeader}}" visible="true" stepKey="clickExpandActions"/>
-+        <see selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="{{CartPriceRuleConditionAppliedForCategory.simple_action}}" stepKey="seeActionApplyType"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="{{CartPriceRuleConditionAppliedForCategory.discount_amount}}" stepKey="seeDiscountAmount"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.freeShipping}}" userInput="{{CartPriceRuleConditionAppliedForCategory.simple_free_shipping}}" stepKey="seeFreeShipping"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.labelsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.labelsHeader}}" visible="true" stepKey="clickToExpandLabels"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.defaultRuleLabelAllStoreViews}}" userInput="{{CartPriceRuleConditionAppliedForCategory.defaultRuleLabelAllStoreViews}}" stepKey="seeDefaultRuleLabelAllStoreViews"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.defaultStoreView}}" userInput="{{CartPriceRuleConditionAppliedForCategory.defaultStoreView}}" stepKey="seeDefaultStoreView"/>
-+
-+        <!--Go to storefront page and verify created product-->
-+        <amOnPage url="{{StorefrontProductPage.url(_defaultProduct.urlKey)}}" stepKey="onCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="openProductPageAndVerifyProduct">
-+            <argument name="productName" value="_defaultProduct.name"/>
-+        </actionGroup>
-+
-+        <!--Click on mini cart-->
-+        <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
-+
-+        <!--Open mini cart and verify Shopping cart subtotal equals to grand total-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="verifyCartSubtotalEqualsGrandTotal">
-+            <argument name="productName" value="{{_defaultProduct.name}}"/>
-+            <argument name="productPrice" value="$123.00"/>
-+            <argument name="cartSubtotal" value="$123.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!--Click on view and edit cart link-->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <waitForPageLoad stepKey="waitForViewAndEditToOpen"/>
-+        <!--Verify AssertCartPriceRuleConditionIsApplied if condition category id is matching-->
-+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssert">
-+            <argument name="subtotal" value="$123.00"/>
-+            <argument name="shipping" value="$5.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="$66.50"/>
-+        </actionGroup>
-+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$61.50" stepKey="seeAssertDiscountAmountAppliedForMatchingCategory"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleWithMatchingTotalWeightAndVerifyRuleConditionIsAppliedTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleWithMatchingTotalWeightAndVerifyRuleConditionIsAppliedTest.xml
-new file mode 100644
-index 00000000000..d48491fdd9f
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleWithMatchingTotalWeightAndVerifyRuleConditionIsAppliedTest.xml
-@@ -0,0 +1,115 @@
-+<?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="AdminCreateCartPriceRuleWithMatchingTotalWeightAndVerifyRuleConditionIsAppliedTest">
-+        <annotations>
-+            <stories value="Create Sales Rule"/>
-+            <title value="Create Cart Price Rule With Matching Total Weight And Verify Rule Condition Is Applied"/>
-+            <description value="Test log in to Cart Price Rules and Create Cart Price Rule With Matching Total Weight And Verify Rule Condition Is Applied"/>
-+            <testCaseId value="MC-15609"/>
-+            <severity value="CRITICAL"/>
-+            <group value="SalesRule"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="defaultSimpleProductWeight200" stepKey="initialSimpleProduct"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteProduct" createDataKey="initialSimpleProduct"/>
-+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCreatedCartPriceRule">
-+                <argument name="ruleName" value="{{CartPriceRuleConditionAppliedForWeight.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create cart price rule as per data and verify AssertCartPriceRuleSuccessSaveMessage-->
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-+        <waitForPageLoad stepKey="waitForPriceList"/>
-+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CartPriceRuleConditionAppliedForWeight.name}}" stepKey="fillRuleName"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{CartPriceRuleConditionAppliedForWeight.description}}" stepKey="fillDescription"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{CartPriceRuleConditionAppliedForWeight.websites}}" stepKey="selectWebsites"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" parameterArray="[{{CartPriceRuleConditionAppliedForWeight.customerGroups}}]" stepKey="selectCustomerGroup"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="{{CartPriceRuleConditionAppliedForWeight.coupon_type}}" stepKey="selectCouponType"/>
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="scrollToConditionsHeader"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" visible="true" stepKey="clickToExpandConditions"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.newCondition}}" stepKey="clickOnNewCondition"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.conditionSelect}}" userInput="Total Weight" stepKey="selectTotalWeight"/>
-+        <waitForPageLoad stepKey="waitForThirdConditionLoad"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.targetEllipsis}}" stepKey="clickOnEllipsis"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleFieldByIndex('1--1')}}" userInput="{{CartPriceRuleConditionAppliedForWeight.totalWeight}}" stepKey="fillTotalItemQuantity"/>
-+        <actionGroup ref="AdminCreateCartPriceRuleActionsSectionDiscountFieldsActionGroup" stepKey="createActiveCartPriceRuleActionsSection">
-+            <argument name="rule" value="CartPriceRuleConditionAppliedForWeight"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminCreateCartPriceRuleActionsSectionFreeShippingActionGroup" stepKey="createActiveCartPriceRuleFreeShippingActionsSection">
-+            <argument name="freeShippingOption" value="{{CartPriceRuleConditionAppliedForWeight.simple_free_shipping}}"/>
-+        </actionGroup>
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.labelsHeader}}" stepKey="scrollToLabelsHeader"/>
-+        <actionGroup ref="AdminCreateCartPriceRuleLabelsSectionActionGroup" stepKey="createActiveCartPriceRuleLabelsSection">
-+            <argument name="rule" value="CartPriceRuleConditionAppliedForWeight"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertCartPriceRuleSuccessSaveMessageActionGroup" stepKey="seeAssertCartPriceRuleSuccessSaveMessage"/>
-+
-+        <!--Search created cart price rule in grid-->
-+        <actionGroup ref="AdminFilterCartPriceRuleActionGroup" stepKey="searchCreatedCartPriceRuleInGrid">
-+            <argument name="ruleName" value="CartPriceRuleConditionAppliedForWeight.name"/>
-+        </actionGroup>
-+
-+        <!--Go to cart price rule form page and verify AssertCartPriceRuleForm-->
-+        <waitForPageLoad stepKey="waitForAdminCartPriceRuleEditPageLoad"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CartPriceRuleConditionAppliedForWeight.name}}" stepKey="seeRuleName"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{CartPriceRuleConditionAppliedForWeight.description}}" stepKey="seeDescription"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{CartPriceRuleConditionAppliedForWeight.websites}}" stepKey="seeWebsites"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="{{CartPriceRuleConditionAppliedForWeight.customerGroups}}" stepKey="seeCustomerGroup"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="{{CartPriceRuleConditionAppliedForWeight.coupon_type}}" stepKey="seeCouponType"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" visible="true" stepKey="clickToExpandConditionHeader"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.ruleFieldByIndex('1--1')}}" userInput="{{CartPriceRuleConditionAppliedForWeight.totalWeight}}" stepKey="seeTotalWeightParameter"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.actionsHeader}}" visible="true" stepKey="clickExpandActions"/>
-+        <see selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="{{CartPriceRuleConditionAppliedForWeight.simple_action}}" stepKey="seeActionApplyType"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="{{CartPriceRuleConditionAppliedForWeight.discount_amount}}" stepKey="seeDiscountAmount"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.freeShipping}}" userInput="{{CartPriceRuleConditionAppliedForWeight.simple_free_shipping}}" stepKey="seeFreeShipping"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.labelsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.labelsHeader}}" visible="true" stepKey="clickToExpandLabels"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.defaultRuleLabelAllStoreViews}}" userInput="{{CartPriceRuleConditionAppliedForWeight.defaultRuleLabelAllStoreViews}}" stepKey="seeDefaultRuleLabelAllStoreViews"/>
-+        <seeInField selector="{{AdminCartPriceRulesFormSection.defaultStoreView}}" userInput="{{CartPriceRuleConditionAppliedForWeight.defaultStoreView}}" stepKey="seeDefaultStoreView"/>
-+
-+        <!--Go to storefront page and verify created product-->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPageAndVerifyProduct">
-+            <argument name="product" value="$$initialSimpleProduct$$"/>
-+        </actionGroup>
-+        <!--Click on Add To Cart button-->
-+        <actionGroup ref="StorefrontAddToTheCartActionGroup" stepKey="clickOnAddToCartButton"/>
-+        <!--Click on mini cart-->
-+        <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
-+
-+        <!--Open mini cart and verify Shopping cart subtotal equals to grand total-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="verifyCartSubtotalEqualsGrandTotal">
-+            <argument name="productName" value="$$initialSimpleProduct.name$$"/>
-+            <argument name="productPrice" value="$560.00"/>
-+            <argument name="cartSubtotal" value="$560.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+
-+        <!--Click on view and edit cart link-->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-+        <waitForPageLoad stepKey="waitForViewAndEditCartToOpen"/>
-+        <!--Verify AssertCartPriceRuleConditionIsApplied if condition Total Weight equals 200 is true-->
-+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssert">
-+            <argument name="subtotal" value="$560.00"/>
-+            <argument name="shipping" value="$5.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="$285.00"/>
-+        </actionGroup>
-+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$280.00" stepKey="seeAssertDiscountAmountAppliedForWeightConditionIsTrue"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountDiscountTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountDiscountTest.xml
-index adf8b391a68..08a08275ee0 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountDiscountTest.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountDiscountTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateFixedAmountDiscountTest">
-         <annotations>
-             <features value="SalesRule"/>
-@@ -40,6 +40,8 @@
-         <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
-         <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount" stepKey="selectActionType"/>
-         <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="10" stepKey="fillDiscountAmount"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml
-index c482d258283..a39530f7607 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateFixedAmountWholeCartDiscountTest">
-         <annotations>
-             <features value="SalesRule"/>
-@@ -40,6 +40,8 @@
-         <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
-         <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/>
-         <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="19.99" stepKey="fillDiscountAmount"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreatePercentOfProductPriceTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreatePercentOfProductPriceTest.xml
-index 2de7952cd12..1f7d849ac02 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreatePercentOfProductPriceTest.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreatePercentOfProductPriceTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreatePercentOfProductPriceTest">
-         <annotations>
-             <features value="SalesRule"/>
-@@ -40,6 +40,8 @@
-         <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
-         <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Percent of product price discount" stepKey="selectActionType"/>
-         <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="50" stepKey="fillDiscountAmount"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteActiveSalesRuleWithComplexConditionsAndVerifyDeleteMessageTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteActiveSalesRuleWithComplexConditionsAndVerifyDeleteMessageTest.xml
-new file mode 100644
-index 00000000000..d106c086a60
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteActiveSalesRuleWithComplexConditionsAndVerifyDeleteMessageTest.xml
-@@ -0,0 +1,79 @@
-+<?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="AdminDeleteActiveSalesRuleWithComplexConditionsAndVerifyDeleteMessageTest">
-+        <annotations>
-+            <stories value="Delete Sales Rule"/>
-+            <title value="Delete Active Sales Rule With Complex Conditions And Verify Delete Message"/>
-+            <description value="Test log in to Cart Price Rule and Delete Active Sales Rule With Complex Conditions Test"/>
-+            <testCaseId value="MC-15450"/>
-+            <severity value="CRITICAL"/>
-+            <group value="salesRule"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17175"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create active cart price rule-->
-+            <actionGroup ref="AdminCreateCartPriceRuleRuleInfoSectionActionGroup" stepKey="createActiveCartPriceRuleRuleInfoSection">
-+                <argument name="ruleName" value="ActiveSalesRuleWithComplexConditions"/>
-+            </actionGroup>
-+            <!-- Expand the conditions section -->
-+            <conditionalClick selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" visible="true" stepKey="clickToExpandConditions"/>
-+            <!-- Fill condition 1: Subtotal -->
-+            <click selector="{{AdminCartPriceRulesFormSection.newCondition}}" stepKey="clickNewCondition1"/>
-+            <selectOption selector="{{AdminCartPriceRulesFormSection.conditionSelect}}" userInput="Subtotal" stepKey="selectCondition1"/>
-+            <waitForPageLoad stepKey="waitForConditionLoad1"/>
-+            <click selector="{{AdminCartPriceRulesFormSection.targetEllipsis}}" stepKey="clickEllipsis1"/>
-+            <fillField selector="{{AdminCartPriceRulesFormSection.ruleFieldByIndex('1--1')}}" userInput="{{ActiveSalesRuleWithComplexConditions.subtotal}}" stepKey="fillSubtotalParameter1"/>
-+            <!-- Fill condition 2: Country -->
-+            <click selector="{{AdminCartPriceRulesFormSection.newCondition}}" stepKey="clickNewCondition2"/>
-+            <selectOption selector="{{AdminCartPriceRulesFormSection.conditionSelect}}" userInput="Shipping Country" stepKey="selectCondition2"/>
-+            <waitForPageLoad stepKey="waitForConditionLoad2"/>
-+            <click selector="{{AdminCartPriceRulesFormSection.targetEllipsis}}" stepKey="clickEllipsis2"/>
-+            <selectOption selector="{{AdminCartPriceRulesFormSection.selectCountryDropdown}}" userInput="{{ActiveSalesRuleWithComplexConditions.shippingCountry}}" stepKey="fillShippingCountryParameter2"/>
-+            <!-- Fill condition 3: Shipping Postcode-->
-+            <click selector="{{AdminCartPriceRulesFormSection.newCondition}}" stepKey="clickNewCondition3"/>
-+            <selectOption selector="{{AdminCartPriceRulesFormSection.conditionSelect}}" userInput="Shipping Postcode" stepKey="selectCondition3"/>
-+            <waitForPageLoad stepKey="waitForConditionLoad3"/>
-+            <click selector="{{AdminCartPriceRulesFormSection.targetEllipsis}}" stepKey="clickEllipsis3"/>
-+            <fillField selector="{{AdminCartPriceRulesFormSection.ruleFieldByIndex('1--3')}}" userInput="{{ActiveSalesRuleWithComplexConditions.shippingPostcode}}" stepKey="fillShippingPostcodeParameter"/>
-+            <!--Fill values for Action Section-->
-+            <actionGroup ref="AdminCreateCartPriceRuleActionsSectionDiscountFieldsActionGroup" stepKey="createActiveCartPriceRuleActionsSection">
-+                <argument name="rule" value="ActiveSalesRuleWithComplexConditions"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateCartPriceRuleActionsSectionShippingAmountActionGroup" stepKey="createActiveCartPriceRuleShippingAmountActionsSection"/>
-+            <actionGroup ref="AdminCreateCartPriceRuleActionsSectionSubsequentRulesActionGroup" stepKey="createActiveCartPriceRuleDiscardSubsequentRulesActionsSection"/>
-+            <actionGroup ref="AdminCreateCartPriceRuleActionsSectionFreeShippingActionGroup" stepKey="createActiveCartPriceRuleFreeShippingActionsSection">
-+                <argument name="freeShippingOption" value="{{ActiveSalesRuleWithComplexConditions.simple_free_shipping}}"/>
-+            </actionGroup>
-+            <!--Fill values for Labels Section-->
-+            <actionGroup ref="AdminCreateCartPriceRuleLabelsSectionActionGroup" stepKey="createActiveCartPriceRuleLabelsSection">
-+                <argument name="rule" value="ActiveSalesRuleWithComplexConditions"/>
-+            </actionGroup>
-+            <actionGroup ref="AssertCartPriceRuleSuccessSaveMessageActionGroup" stepKey="assertVerifyCartPriceRuleSuccessSaveMessage"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Delete active cart price rule-->
-+        <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteActiveCartPriceRule">
-+            <argument name="ruleName" value="{{ActiveSalesRuleWithComplexConditions.name}}"/>
-+        </actionGroup>
-+
-+        <!--Go to grid and verify AssertCartPriceRuleIsNotPresentedInGrid-->
-+        <actionGroup ref="AdminCartPriceRuleNotInGridActionGroup" stepKey="searchAndVerifyActiveCartPriceRuleNotInGrid">
-+            <argument name="ruleName" value="ActiveSalesRuleWithComplexConditions.name"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteActiveSalesRuleWithPercentPriceAndVerifyDeleteMessageTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteActiveSalesRuleWithPercentPriceAndVerifyDeleteMessageTest.xml
-new file mode 100644
-index 00000000000..41e4221a2c3
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteActiveSalesRuleWithPercentPriceAndVerifyDeleteMessageTest.xml
-@@ -0,0 +1,44 @@
-+<?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="AdminDeleteActiveSalesRuleWithPercentPriceAndVerifyDeleteMessageTest">
-+        <annotations>
-+            <stories value="Delete Sales Rule"/>
-+            <title value="Delete Active Sales Rule With Percent Price And Verify Delete Message"/>
-+            <description value="Test log in to Cart Price Rule and Delete Active Sales Rule Test"/>
-+            <testCaseId value="MC-15449"/>
-+            <severity value="CRITICAL"/>
-+            <group value="salesRule"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create active cart price rule-->
-+            <actionGroup ref="AdminCreateCartPriceRuleWithCouponCode" stepKey="createActiveCartPriceRule">
-+                <argument name="ruleName" value="ActiveSalesRuleWithPercentPriceDiscountCoupon"/>
-+                <argument name="couponCode" value="ActiveSalesRuleWithPercentPriceDiscountCoupon.coupon_code"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Delete active cart price rule-->
-+        <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteActiveCartPriceRule">
-+            <argument name="ruleName" value="{{ActiveSalesRuleWithPercentPriceDiscountCoupon.name}}"/>
-+        </actionGroup>
-+
-+        <!--Go to grid and verify AssertCartPriceRuleIsNotPresentedInGrid-->
-+        <actionGroup ref="AdminCartPriceRuleNotInGridActionGroup" stepKey="searchAndVerifyActiveCartPriceRuleNotInGrid">
-+            <argument name="ruleName" value="ActiveSalesRuleWithPercentPriceDiscountCoupon.name"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteInactiveSalesRuleAndVerifyDeleteMessageTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteInactiveSalesRuleAndVerifyDeleteMessageTest.xml
-new file mode 100644
-index 00000000000..1570bfbdb7a
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteInactiveSalesRuleAndVerifyDeleteMessageTest.xml
-@@ -0,0 +1,65 @@
-+<?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="AdminDeleteInactiveSalesRuleAndVerifyDeleteMessageTest">
-+        <annotations>
-+            <stories value="Delete Sales Rule"/>
-+            <title value="Delete Inactive Sales Rule And Verify Delete Message"/>
-+            <description value="Test log in to Cart Price Rule and Delete Inactive Sales Rule Test"/>
-+            <testCaseId value="MC-15451"/>
-+            <severity value="CRITICAL"/>
-+            <group value="salesRule"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct"/>
-+            <!--Create inactive cart price rule-->
-+            <actionGroup ref="AdminInactiveCartPriceRuleActionGroup" stepKey="createInactiveCartPriceRule">
-+                <argument name="ruleName" value="InactiveSalesRule"/>
-+                <argument name="custGrp" value="NOT LOGGED IN"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="initialSimpleProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Delete inactive cart price rule-->
-+        <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteInactiveCartPriceRule">
-+            <argument name="ruleName" value="{{InactiveSalesRule.name}}"/>
-+        </actionGroup>
-+
-+        <!--Go to grid and verify AssertCartPriceRuleIsNotPresentedInGrid-->
-+        <actionGroup ref="AdminCartPriceRuleNotInGridActionGroup" stepKey="searchAndVerifyInactiveCartPriceRuleNotInGrid">
-+            <argument name="ruleName" value="InactiveSalesRule.name"/>
-+        </actionGroup>
-+
-+        <!--Verify customer don't see updated virtual product link on category page -->
-+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="openProductPageAndVerifyProduct">
-+            <argument name="product" value="$$initialSimpleProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Click on Add To Cart button-->
-+        <actionGroup ref="StorefrontAddToTheCartActionGroup" stepKey="clickOnAddToCartButton"/>
-+
-+        <!--Click on mini cart-->
-+        <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
-+
-+        <!--Open mini cart and verify Shopping cart subtotal equals to grand total - price rule has not been applied.-->
-+        <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="verifyCartSubtotalEqualsGrandTotal">
-+            <argument name="productName" value="$$initialSimpleProduct.name$$"/>
-+            <argument name="productPrice" value="$560.00"/>
-+            <argument name="cartSubtotal" value="$560.00" />
-+            <argument name="qty" value="1"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminMarketingCartPriceRulesNavigateMenuTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminMarketingCartPriceRulesNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..f281b0abf87
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminMarketingCartPriceRulesNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminMarketingCartPriceRulesNavigateMenuTest">
-+        <annotations>
-+            <features value="SalesRule"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin marketing cart price rules navigate menu test"/>
-+            <description value="Admin should be able to navigate to Marketing > Cart Price Rules"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14143"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingCartPriceRulesPage">
-+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuMarketingPromotionsCartPriceRules.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuMarketingPromotionsCartPriceRules.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
-new file mode 100644
-index 00000000000..1eba06126ff
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
-@@ -0,0 +1,152 @@
-+<?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="CartPriceRuleForConfigurableProductTest">
-+        <annotations>
-+            <features value="SalesRule"/>
-+            <stories value="MAGETWO-94407 - Cart Price Rule for configurable products"/>
-+            <title value="Checking Cart Price Rule for configurable products"/>
-+            <description value="Checking Cart Price Rule for configurable products"/>
-+            <severity value="BLOCKER"/>
-+            <testCaseId value="MAGETWO-94471"/>
-+            <group value="SalesRule"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Create the category -->
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <!-- Create the configurable product and add it to the category -->
-+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <!-- Create an attribute with two options to be used in the first child product -->
-+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-+                 <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-+                  <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Add the attribute we just created to default attribute set -->
-+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-+                  <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </createData>
-+
-+            <!-- Get the option of the attribute we created -->
-+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-+                 <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-+                 <requiredEntity createDataKey="createConfigProductAttribute"/>
-+            </getData>
-+            <!-- Create a simple product and give it the attribute with option -->
-+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-+                 <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+            </createData>
-+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-+                 <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <!-- Create the configurable product -->
-+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigProductAttribute"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-+            </createData>
-+
-+            <!-- Add simple product to the configurable product -->
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct1"/>
-+            </createData>
-+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-+                <requiredEntity createDataKey="createConfigProduct"/>
-+                <requiredEntity createDataKey="createConfigChildProduct2"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+
-+        <after>
-+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="DeleteCartPriceRuleByName">
-+                <argument name="ruleName" value="{{SimpleSalesRule.name}}"/>
-+            </actionGroup>
-+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteApiCategory"/>
-+	    <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        
-+        <!-- Create the rule -->
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-+        <waitForPageLoad stepKey="waitForRulesPage"/>
-+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
-+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="ABCD" stepKey="fillCouponCOde"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="50" stepKey="fillDiscountAmount"/>
-+        <scrollTo selector="{{AdminCartPriceRulesFormSection.conditions}}" stepKey="ScrollToApplyRuleForConditions"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.conditions}}" stepKey="ApplyRuleForConditions"/>
-+        <waitForPageLoad stepKey="waitForDropDownOpened"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.childAttribute}}" userInput="$$createConfigProductAttribute.attribute[frontend_labels][0][label]$$" stepKey="selectAttribute"/>
-+        <waitForPageLoad stepKey="waitForOperatorOpened"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.condition('is')}}" stepKey="clickToChooseCondition"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.operator}}" userInput="is not" stepKey="selectOperator"/>
-+        <waitForPageLoad stepKey="waitForOperatorOpened1"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.condition('...')}}" stepKey="clickToChooseOption"/>
-+        <waitForPageLoad stepKey="waitForConditionOpened2"/>
-+        <selectOption selector="{{AdminCartPriceRulesFormSection.option}}" userInput="option1" stepKey="selectOption"/>
-+        <waitForPageLoad stepKey="waitForPageLoaded"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
-+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
-+
-+        <!-- Add the first product to the cart -->
-+        <amOnPage url="$$createConfigChildProduct1.sku$$.html" stepKey="goToProductPage1"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad1"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart1"/>
-+        <waitForPageLoad stepKey="waitForAddToCart1"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-+        <!-- Add the second product to the cart -->
-+        <amOnPage url="$$createConfigChildProduct2.sku$$.html" stepKey="goToProductPage2"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
-+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/>
-+        <waitForPageLoad stepKey="waitForAddToCart2"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage2"/>
-+
-+        <!--View and edit cart-->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="clickViewAndEditCartFromMiniCart"/>
-+        <click selector="{{DiscountSection.DiscountTab}}" stepKey="scrollToDiscountTab" />
-+        <fillField selector="{{DiscountSection.CouponInput}}" userInput="ABCD" stepKey="fillCouponCode" />
-+        <click selector="{{DiscountSection.ApplyCodeBtn}}" stepKey="applyCode"/>
-+        <waitForPageLoad stepKey="waitForPageLoad3"/>
-+        <see userInput="You used coupon code" stepKey="assertText"/>
-+        <!--Verify values-->
-+        <grabTextFrom selector="{{StorefrontMinicartSection.itemDiscount}}" stepKey="getDiscount"/>
-+        <grabTextFrom selector="{{StorefrontMinicartSection.subtotal}}" stepKey="getSubtotal"/>
-+        <assertEquals stepKey="checkDescount">
-+            <expectedResult type="string">-$117.00</expectedResult>
-+            <actualResult type="variable">$getDiscount</actualResult>
-+        </assertEquals>
-+        <assertEquals stepKey="checkSubtotal">
-+            <expectedResult type="string">$357.00</expectedResult>
-+            <actualResult type="variable">$getSubtotal</actualResult>
-+        </assertEquals>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/DeleteCustomerGroupTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/DeleteCustomerGroupTest.xml
-new file mode 100644
-index 00000000000..77ee270b3bc
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/DeleteCustomerGroupTest.xml
-@@ -0,0 +1,17 @@
-+<?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="DeleteCustomerGroupTest">
-+        <actionGroup ref="AdminOpenNewCartPriceRuleFormPageActionGroup" stepKey="openNewCartPriceRuleForm" />
-+        <actionGroup ref="AssertCustomerGroupNotOnCartPriceRuleFormActionGroup" stepKey="assertCustomerGroupNotOnCartPriceRuleForm">
-+            <argument name="customerGroup" value="$$customerGroup$$" />
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-index 05ea5a32574..d9c578e9be3 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
-@@ -7,8 +7,13 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CGuestUserTest">
-+        <annotations>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-         <before>
-             <createData entity="ApiSalesRule" stepKey="createSalesRule"/>
-             <createData entity="ApiSalesRuleCoupon" stepKey="createSalesRuleCoupon">
-@@ -29,30 +34,21 @@
- 
-         <actionGroup ref="StorefrontCheckCouponAppliedActionGroup" stepKey="couponCheckAppliedDiscount" after="couponApplyCoupon">
-             <argument name="rule" value="$$createSalesRule$$"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="discount" value="E2EB2CQuoteWith10PercentDiscount.discount"/>
-+            <argument name="discount" value="48.00"/>
-         </actionGroup>
-         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="couponCheckCartWithDiscount" after="couponCheckAppliedDiscount">
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="subtotal" value="E2EB2CQuoteWith10PercentDiscount.subtotal"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shipping" value="E2EB2CQuoteWith10PercentDiscount.shipping"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shippingMethod" value="E2EB2CQuoteWith10PercentDiscount.shippingMethod"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="total" value="E2EB2CQuoteWith10PercentDiscount.total"/>
-+            <argument name="subtotal" value="480.00"/>
-+            <argument name="shipping" value="15.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="447.00"/>
-         </actionGroup>
- 
-         <actionGroup ref="StorefrontCancelCouponActionGroup" stepKey="couponCancelCoupon" after="couponCheckCartWithDiscount"/>
-         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCartAfterCancelCoupon" after="couponCancelCoupon">
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shipping" value="E2EB2CQuote.shipping"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="total" value="E2EB2CQuote.total"/>
-+            <argument name="subtotal" value="480.00"/>
-+            <argument name="shipping" value="15.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="495.00"/>
-         </actionGroup>
-         <comment userInput="End of using coupon code" stepKey="endOfUsingCouponCode" after="cartAssertCartAfterCancelCoupon" />
-     </test>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-index c0ef70dbd04..f816e93d4bc 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-@@ -7,8 +7,13 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CLoggedInUserTest">
-+        <annotations>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-         <before>
-             <createData entity="ApiSalesRule" stepKey="createSalesRule"/>
-             <createData entity="ApiSalesRuleCoupon" stepKey="createSalesRuleCoupon">
-@@ -29,30 +34,21 @@
- 
-         <actionGroup ref="StorefrontCheckCouponAppliedActionGroup" stepKey="couponCheckAppliedDiscount" after="couponApplyCoupon">
-             <argument name="rule" value="$$createSalesRule$$"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="discount" value="E2EB2CQuoteWith10PercentDiscount.discount"/>
-+            <argument name="discount" value="48.00"/>
-         </actionGroup>
-         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="couponCheckCartWithDiscount" after="couponCheckAppliedDiscount">
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="subtotal" value="E2EB2CQuoteWith10PercentDiscount.subtotal"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shipping" value="E2EB2CQuoteWith10PercentDiscount.shipping"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shippingMethod" value="E2EB2CQuoteWith10PercentDiscount.shippingMethod"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="total" value="E2EB2CQuoteWith10PercentDiscount.total"/>
-+            <argument name="subtotal" value="480.00"/>
-+            <argument name="shipping" value="15.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="447.00"/>
-         </actionGroup>
- 
-         <actionGroup ref="StorefrontCancelCouponActionGroup" stepKey="couponCancelCoupon" after="couponCheckCartWithDiscount"/>
-         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCartAfterCancelCoupon" after="couponCancelCoupon">
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shipping" value="E2EB2CQuote.shipping"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
--            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
--            <argument name="total" value="E2EB2CQuote.total"/>
-+            <argument name="subtotal" value="480.00"/>
-+            <argument name="shipping" value="15.00"/>
-+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
-+            <argument name="total" value="495.00"/>
-         </actionGroup>
-         <comment userInput="End of using coupon code" stepKey="endOfUsingCouponCode" after="cartAssertCartAfterCancelCoupon"/>
-     </test>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/PriceRuleCategoryNestingTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/PriceRuleCategoryNestingTest.xml
-index a46fc19a51c..091e09e32f1 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/PriceRuleCategoryNestingTest.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/PriceRuleCategoryNestingTest.xml
-@@ -4,13 +4,16 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<tests xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+<tests xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-     <test name="PriceRuleCategoryNestingTest">
-         <annotations>
-+            <features value="SalesRule"/>
-+            <stories value="Create categories"/>
-+            <title value="Category nesting level must be the same as were created in categories."/>
-             <description value="Category nesting level must be the same as were created in categories."/>
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-91101"/>
--            <group value="sale_rules"/>
-+            <group value="SalesRule"/>
-         </annotations>
-         <before>
-             <createData entity="_defaultCategory" stepKey="subcategory1"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml
-new file mode 100644
-index 00000000000..84537fb69ed
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml
-@@ -0,0 +1,174 @@
-+<?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="StorefrontAutoGeneratedCouponCodeTest">
-+        <annotations>
-+            <features value="SalesRule"/>
-+            <stories value="Create cart price rule"/>
-+            <title value="[Cart Price Rule] Auto generated coupon code considers 'Uses per Coupon' and 'Uses per Customer' options"/>
-+            <description
-+                    value="[Cart Price Rule] Auto generated coupon code considers 'Uses per Coupon' and 'Uses per Customer' options"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MAGETWO-59323"/>
-+            <group value="salesRule"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+            <!-- Create simple product-->
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
-+            <!-- Create a cart price rule -->
-+            <createData entity="SalesRuleSpecificCoupon" stepKey="createSalesRule"/>
-+        </before>
-+
-+        <after>
-+            <!-- Delete the cart price rule we made during the test -->
-+            <deleteData createDataKey="createSalesRule" stepKey="deleteSalesRule"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Login as Admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+        <!-- Search Cart Price Rule and go to edit Cart Price Rule -->
-+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="$$createSalesRule.name$$"
-+                   stepKey="fillFieldFilterByName"/>
-+        <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <see selector="{{AdminCartPriceRulesSection.nameColumns}}" userInput="$$createSalesRule.name$$"
-+             stepKey="seeRuleName"/>
-+        <click selector="{{AdminCartPriceRulesSection.rowContainingText($$createSalesRule.name$$)}}"
-+               stepKey="goToEditRule"/>
-+
-+        <!-- Step 3-4. Navigate to Manage Coupon Codes section to generate 1 coupon code -->
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}"
-+                          dependentSelector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" visible="true"
-+                          stepKey="clickManageCouponCodes"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.couponQty}}" userInput="1" stepKey="fillFieldCouponQty"/>
-+        <click selector="{{AdminCartPriceRulesFormSection.generateCouponsButton}}" stepKey="clickGenerateCoupon"/>
-+        <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="Message is added to queue, wait to get your coupons soon"
-+             stepKey="seeSuccessMessage"/>
-+
-+        <!-- Run cron twice -->
-+        <magentoCLI command="cron:run" stepKey="runCron1"/>
-+        <magentoCLI command="cron:run" stepKey="runCron2"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <waitForPageLoad stepKey="waitFormToReload1"/>
-+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}"
-+                          dependentSelector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" visible="true"
-+                          stepKey="clickManageCouponCodes2"/>
-+
-+        <!-- Grab a coupon code and hold on to it for later -->
-+        <grabTextFrom selector="{{AdminCartPriceRulesFormSection.generatedCouponByIndex('1')}}"
-+                      stepKey="couponCode"/>
-+
-+        <!-- Step: 5. Login to storefront as previously created customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Step: 6-7. Open the Product Page, add the product to Cart, go to Shopping Cart and Apply the same coupon code -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="openProductPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartPriceRule">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="couponCode" value="{$couponCode}"/>
-+        </actionGroup>
-+        <waitForText userInput='You used coupon code "{$couponCode}"' stepKey="waitForText"/>
-+        <see selector="{{StorefrontMessagesSection.success}}" userInput='You used coupon code "{$couponCode}"'
-+             stepKey="seeSuccessMessage1"/>
-+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" time="30"
-+                               stepKey="waitForElementDiscountVisible"/>
-+
-+        <!-- Step 8. Go to Checkout and Click Place Order button -->
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
-+        <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}"
-+               stepKey="selectFlatShippingMethod"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-+        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage"/>
-+
-+        <!-- Step: 9-10. Open the Product Page, add the product to Cart, go to Shopping Cart and Apply the same coupon code -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="openProductPage1"/>
-+        <waitForPageLoad stepKey="waitForPageLoad3"/>
-+        <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartPriceRule1">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="couponCode" value="{$couponCode}"/>
-+        </actionGroup>
-+        <waitForText userInput='The coupon code "{$couponCode}" is not valid.' stepKey="waitForText1"/>
-+        <see selector="{{StorefrontMessagesSection.error}}" userInput='The coupon code "{$couponCode}" is not valid.'
-+             stepKey="seeErrorMessages"/>
-+        <waitForElementNotVisible selector="{{CheckoutCartSummarySection.discountAmount}}" time="30"
-+                                  stepKey="waitForElementNotDiscountVisible"/>
-+
-+        <!-- Step 11. Log out from storefront -->
-+        <actionGroup ref="StorefrontSignOutActionGroup" stepKey="storefrontSignOut"/>
-+
-+        <!-- Step: 12-13. Open the Product Page, add the product to Cart, go to Shopping Cart and Apply the same coupon code -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="openProductPage2"/>
-+        <waitForPageLoad stepKey="waitForPageLoad4"/>
-+        <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartPriceRule2">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="couponCode" value="{$couponCode}"/>
-+        </actionGroup>
-+        <waitForText userInput='You used coupon code "{$couponCode}"' stepKey="waitForText2"/>
-+        <see selector="{{StorefrontMessagesSection.success}}" userInput='You used coupon code "{$couponCode}"'
-+             stepKey="seeSuccessMessage2"/>
-+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" time="30"
-+                               stepKey="waitForElementDiscountVisible1"/>
-+
-+        <!-- Step 14. Go to Checkout and Click Place Order button -->
-+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout1"/>
-+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
-+            <argument name="customerVar" value="CustomerEntityOne"/>
-+            <argument name="customerAddressVar" value="CustomerAddressSimple"/>
-+        </actionGroup>
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
-+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
-+        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage1"/>
-+
-+        <!-- Step; 15-16. Open the Product Page, add the product to Cart, go to Shopping Cart and Apply the same coupon code -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="openProductPage3"/>
-+        <waitForPageLoad stepKey="waitForPageLoad5"/>
-+        <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartPriceRule3">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="couponCode" value="{$couponCode}"/>
-+        </actionGroup>
-+        <waitForText userInput='The coupon code "{$couponCode}" is not valid.' stepKey="waitForText3"/>
-+        <see selector="{{StorefrontMessagesSection.error}}" userInput='The coupon code "{$couponCode}" is not valid.'
-+             stepKey="seeErrorMessages1"/>
-+        <waitForElementNotVisible selector="{{CheckoutCartSummarySection.discountAmount}}" time="30"
-+                                  stepKey="waitForElementNotDiscountVisible1"/>
-+
-+        <!-- Step: 17. Reset Cookie -->
-+        <resetCookie userInput="PHPSESSID" stepKey="resetCookie"/>
-+
-+        <!-- Step: 18-19. Open the Product Page, add the product to Cart, go to Shopping Cart and Apply the same coupon code -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="openProductPage4"/>
-+        <waitForPageLoad stepKey="waitForPageLoad6"/>
-+        <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartPriceRule4">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+            <argument name="couponCode" value="{$couponCode}"/>
-+        </actionGroup>
-+        <waitForText userInput='The coupon code "{$couponCode}" is not valid.' stepKey="waitForText4"/>
-+        <see selector="{{StorefrontMessagesSection.error}}" userInput='The coupon code "{$couponCode}" is not valid.'
-+             stepKey="seeErrorMessages2"/>
-+        <waitForElementNotVisible selector="{{CheckoutCartSummarySection.discountAmount}}" time="30"
-+                                  stepKey="waitForElementNotDiscountVisible2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml
-index 508b16721b2..ffd50e43a23 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontCartPriceRuleCountry">
-         <annotations>
-             <features value="SalesRule"/>
-@@ -43,6 +43,8 @@
-         <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
-         <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
-         <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/>
-         <!-- Scroll down to fix some flaky behavior... -->
-         <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/>
-@@ -66,15 +68,17 @@
-         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-         <waitForPageLoad stepKey="waitForAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
- 
-         <!-- Should not see the discount yet because we have not set country -->
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
-         <waitForPageLoad stepKey="waitForCartPage"/>
-+        <click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="openEstimateShippingSection"/>
-+        <checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectFlatRateShipping"/>
-         <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/>
-         <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/>
- 
-         <!-- See discount if we use valid country -->
--        <click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="expandShipping"/>
-         <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="Brazil" stepKey="fillCountry"/>
-         <waitForPageLoad stepKey="waitForCountry1"/>
-         <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml
-index e025d8b2a3b..765f10e44d8 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontCartPriceRulePostcode">
-         <annotations>
-             <features value="SalesRule"/>
-@@ -43,6 +43,8 @@
-         <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
-         <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
-         <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/>
-         <!-- Scroll down to fix some flaky behavior... -->
-         <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/>
-@@ -70,15 +72,17 @@
-         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-         <waitForPageLoad stepKey="waitForAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
- 
-         <!-- Should not see the discount yet because we have not filled in postcode -->
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
-         <waitForPageLoad stepKey="waitForCartPage"/>
-+        <click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="openEstimateShippingSection"/>
-+        <checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectFlatRateShipping"/>
-         <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/>
-         <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/>
- 
-         <!-- See discount if we use valid postcode -->
--        <click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="expandShipping"/>
-         <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="78613" stepKey="fillPostcode"/>
-         <waitForPageLoad stepKey="waitForPostcode1"/>
-         <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantity.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantity.xml
-index 3e54620d249..cde5e351e1b 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantity.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantity.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontCartPriceRuleQuantity">
-         <annotations>
-             <features value="SalesRule"/>
-@@ -43,6 +43,8 @@
-         <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
-         <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
-         <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/>
-         <!-- Scroll down to fix some flaky behavior... -->
-         <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/>
-@@ -66,6 +68,7 @@
-         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-         <waitForPageLoad stepKey="waitForAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
- 
-         <!-- Should not see the discount yet because we have only 1 item in our cart -->
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
-@@ -79,6 +82,7 @@
-         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity2"/>
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/>
-         <waitForPageLoad stepKey="waitForAddToCart2"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage2"/>
- 
-         <!-- Now we should see the discount because we have more than 1 item -->
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage2"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml
-index 98c4b1144b4..d6806e2a296 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontCartPriceRuleState">
-         <annotations>
-             <features value="SalesRule"/>
-@@ -43,6 +43,8 @@
-         <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
-         <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
-         <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/>
-         <!-- Scroll down to fix some flaky behavior... -->
-         <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/>
-@@ -66,15 +68,17 @@
-         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-         <waitForPageLoad stepKey="waitForAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
- 
-         <!-- Should not see the discount yet because we have not filled in postcode -->
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
-         <waitForPageLoad stepKey="waitForCartPage"/>
-+        <click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="expandShipping"/>
-+        <checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectFlatRateShipping"/>
-         <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/>
-         <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/>
- 
-         <!-- See discount if we use valid postcode -->
--        <click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="expandShipping"/>
-         <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Indiana" stepKey="fillState"/>
-         <waitForPageLoad stepKey="waitForPostcode1"/>
-         <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotal.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotal.xml
-index 93c64903a33..8ff747607ea 100644
---- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotal.xml
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotal.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontCartPriceRuleSubtotal">
-         <annotations>
-             <features value="SalesRule"/>
-@@ -43,6 +43,8 @@
-         <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
-         <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
-         <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
-+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
-+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
-         <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/>
-         <!-- Scroll down to fix some flaky behavior... -->
-         <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/>
-@@ -65,6 +67,7 @@
-         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-         <waitForPageLoad stepKey="waitForAddToCart"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
- 
-         <!-- Should not see the discount yet because we have not exceeded $200 -->
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
-@@ -78,6 +81,7 @@
-         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity2"/>
-         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/>
-         <waitForPageLoad stepKey="waitForAddToCart2"/>
-+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage2"/>
- 
-         <!-- Now we should see the discount because we exceeded $200 -->
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage2"/>
-diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml
-new file mode 100644
-index 00000000000..d8c5b42dbaa
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml
-@@ -0,0 +1,116 @@
-+<?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="StorefrontCategoryRulesShouldApplyToComplexProductsTest">
-+        <annotations>
-+            <features value="CatalogRule"/>
-+            <stories value="Create cart price rule"/>
-+            <title value="Category rules should apply to complex products"/>
-+            <description value="Sales rules filtering on category should apply to all products, including complex products."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-70192"/>
-+            <group value="catalogRule"/>
-+        </annotations>
-+        <before>
-+            <!-- Create two Categories: CAT1 and CAT2 -->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory2"/>
-+            <!--Create config1 and config2-->
-+            <actionGroup ref="AdminCreateApiConfigurableProductWithHiddenChildActionGroup" stepKey="createConfigurableProduct1">
-+                <argument name="productName" value="config1"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminCreateApiConfigurableProductWithHiddenChildActionGroup" stepKey="createConfigurableProduct2">
-+                <argument name="productName" value="config2"/>
-+            </actionGroup>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--  Assign config1 and the associated  child products to CAT1 -->
-+            <actionGroup ref="AdminAssignProductToCategory" stepKey="assignConfigurableProduct1ToCategory">
-+                <argument name="productId" value="$$createConfigProductCreateConfigurableProduct1.id$$"/>
-+                <argument name="categoryName" value="$$createCategory.name$$"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminAssignProductToCategory" stepKey="assignConfig1ChildProduct1ToCategory">
-+                <argument name="productId" value="$$createConfigChildProduct1CreateConfigurableProduct1.id$$"/>
-+                <argument name="categoryName" value="$$createCategory.name$$"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminAssignProductToCategory" stepKey="assignConfig1ChildProduct2ToCategory">
-+                <argument name="productId" value="$$createConfigChildProduct2CreateConfigurableProduct1.id$$"/>
-+                <argument name="categoryName" value="$$createCategory.name$$"/>
-+            </actionGroup>
-+            <!--  Assign config12 and the associated  child products to CAT2 -->
-+            <actionGroup ref="AdminAssignProductToCategory" stepKey="assignConfigurableProduct2ToCategory2">
-+                <argument name="productId" value="$$createConfigProductCreateConfigurableProduct2.id$$"/>
-+                <argument name="categoryName" value="$$createCategory2.name$$"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminAssignProductToCategory" stepKey="assignConfig2ChildProduct1ToCategory2">
-+                <argument name="productId" value="$$createConfigChildProduct1CreateConfigurableProduct2.id$$"/>
-+                <argument name="categoryName" value="$$createCategory2.name$$"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminAssignProductToCategory" stepKey="assignConfig2ChildProduct2ToCategory2">
-+                <argument name="productId" value="$$createConfigChildProduct2CreateConfigurableProduct2.id$$"/>
-+                <argument name="categoryName" value="$$createCategory2.name$$"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <!--Delete configurable product 1-->
-+            <deleteData createDataKey="createConfigProductCreateConfigurableProduct1" stepKey="deleteConfigProduct1"/>
-+            <deleteData createDataKey="createCategory"  stepKey="deleteCategory1"/>
-+            <deleteData createDataKey="createConfigChildProduct1CreateConfigurableProduct1" stepKey="deleteConfigChildProduct1"/>
-+            <deleteData createDataKey="createConfigChildProduct2CreateConfigurableProduct1" stepKey="deleteConfigChildProduct2"/>
-+            <deleteData createDataKey="createConfigProductAttributeCreateConfigurableProduct1" stepKey="deleteConfigProductAttribute1"/>
-+            <!--Delete configurable product 2-->
-+            <deleteData createDataKey="createConfigProductCreateConfigurableProduct2" stepKey="deleteConfigProduct2"/>
-+            <deleteData createDataKey="createCategory2"  stepKey="deleteCategory2"/>
-+            <deleteData createDataKey="createConfigChildProduct1CreateConfigurableProduct2" stepKey="deleteConfigChildProduct3"/>
-+            <deleteData createDataKey="createConfigChildProduct2CreateConfigurableProduct2" stepKey="deleteConfigChildProduct4"/>
-+            <deleteData createDataKey="createConfigProductAttributeCreateConfigurableProduct2" stepKey="deleteConfigProductAttribute2"/>
-+            <!--Delete Cart Price Rule -->
-+            <deleteData  createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- 1: Create a cart price rule applying to CAT1 with discount -->
-+        <createData entity="SalesRuleNoCouponWithFixedDiscount" stepKey="createCartPriceRule"/>
-+        <amOnPage url="{{AdminCartPriceRuleEditPage.url($$createCartPriceRule.rule_id$$)}}" stepKey="goToCartPriceRuleEditPage"/>
-+        <actionGroup ref="SetConditionForActionsInCartPriceRuleActionGroup" stepKey="setConditionForActionsInCartPriceRuleActionGroup">
-+            <argument name="actionValue" value="$$createCategory.id$$"/>
-+        </actionGroup>
-+        <!-- 2: Go to frontend and add an item from both CAT1 and CAT2 to your cart -->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontend"/>
-+        <!-- 3: Open configurable product 1 and add all his child products to cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProductCreateConfigurableProduct1.custom_attributes[url_key]$$)}}" stepKey="amOnConfigurableProductPage"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect('$$createConfigProductAttributeCreateConfigurableProduct1.attribute[frontend_labels][0][label]$$')}}"  userInput="$$createConfigProductAttributeOption1CreateConfigurableProduct1.option[store_labels][0][label]$$" stepKey="selectOption"/>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddConfigurableProductToCart">
-+            <argument name="product" value="$$createConfigProductCreateConfigurableProduct1$$"/>
-+            <argument name="productCount" value="1"/>
-+        </actionGroup>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect('$$createConfigProductAttributeCreateConfigurableProduct1.attribute[frontend_labels][0][label]$$')}}"  userInput="$$createConfigProductAttributeOption2CreateConfigurableProduct1.option[store_labels][0][label]$$" stepKey="selectOption2"/>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddConfigurableProductToCart2">
-+            <argument name="product" value="$$createConfigProductCreateConfigurableProduct1$$"/>
-+            <argument name="productCount" value="2"/>
-+        </actionGroup>
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToCart"/>
-+        <!-- Discount amount is not applied -->
-+        <dontSee selector="{{CheckoutCartSummarySection.discountLabel}}" stepKey="discountIsNotApply"/>
-+        <!-- 3: Open configurable product 2 and add all his child products to cart -->
-+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProductCreateConfigurableProduct2.custom_attributes[url_key]$$)}}" stepKey="amOnConfigurableProductPage2"/>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect('$$createConfigProductAttributeCreateConfigurableProduct2.attribute[frontend_labels][0][label]$$')}}"  userInput="$$createConfigProductAttributeOption1CreateConfigurableProduct2.option[store_labels][0][label]$$" stepKey="selectOption3"/>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddConfigurableProductToCart3">
-+            <argument name="product" value="$$createConfigProductCreateConfigurableProduct2$$"/>
-+            <argument name="productCount" value="3"/>
-+        </actionGroup>
-+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect('$$createConfigProductAttributeCreateConfigurableProduct2.attribute[frontend_labels][0][label]$$')}}"  userInput="$$createConfigProductAttributeOption2CreateConfigurableProduct2.option[store_labels][0][label]$$" stepKey="selectOption4"/>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddConfigurableProductToCart4">
-+            <argument name="product" value="$$createConfigProductCreateConfigurableProduct2$$"/>
-+            <argument name="productCount" value="4"/>
-+        </actionGroup>
-+        <!-- Discount  amount is applied -->
-+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToCart2"/>
-+        <see selector="{{CheckoutCartSummarySection.discountTotal}}" userInput="-$100.00" stepKey="discountIsApply"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
-index fb01476ed6b..ae59a1f90b8 100644
---- a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
-+++ b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
-@@ -5,7 +5,6 @@
-  */
- namespace Magento\SalesRule\Test\Unit\Block\Adminhtml\Promo\Quote\Edit;
- 
--use Magento\SalesRule\Model\RegistryConstants;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- 
- class DeleteButtonTest extends \PHPUnit\Framework\TestCase
-@@ -25,13 +24,16 @@ class DeleteButtonTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $registryMock;
- 
-+    /**
-+     * @inheritDoc
-+     */
-     protected function setUp()
-     {
-         $this->urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class);
-         $this->registryMock = $this->createMock(\Magento\Framework\Registry::class);
-         $contextMock = $this->createMock(\Magento\Backend\Block\Widget\Context::class);
- 
--        $contextMock->expects($this->once())->method('getUrlBuilder')->willReturn($this->urlBuilderMock);
-+        $contextMock->expects($this->any())->method('getUrlBuilder')->willReturn($this->urlBuilderMock);
- 
-         $this->model = (new ObjectManager($this))->getObject(
-             \Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\DeleteButton::class,
-@@ -42,33 +44,9 @@ class DeleteButtonTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testGetButtonData()
--    {
--        $ruleId = 42;
--        $deleteUrl = 'http://magento.com/rule/delete/' . $ruleId;
--        $ruleMock = new \Magento\Framework\DataObject(['id' => $ruleId]);
--
--        $this->registryMock->expects($this->once())
--            ->method('registry')
--            ->with(RegistryConstants::CURRENT_SALES_RULE)
--            ->willReturn($ruleMock);
--        $this->urlBuilderMock->expects($this->once())
--            ->method('getUrl')
--            ->with('*/*/delete', ['id' => $ruleId])
--            ->willReturn($deleteUrl);
--
--        $data = [
--            'label' => __('Delete'),
--            'class' => 'delete',
--            'on_click' => 'deleteConfirm(\'' . __(
--                'Are you sure you want to delete this?'
--            ) . '\', \'' . $deleteUrl . '\')',
--            'sort_order' => 20,
--        ];
--
--        $this->assertEquals($data, $this->model->getButtonData());
--    }
--
-+    /**
-+     * Test empty response without a present rule.
-+     */
-     public function testGetButtonDataWithoutRule()
-     {
-         $this->assertEquals([], $this->model->getButtonData());
-diff --git a/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php b/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php
-index 2ef77d72a8a..66970f28598 100644
---- a/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php
-+++ b/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php
-@@ -8,6 +8,7 @@ namespace Magento\SalesRule\Test\Unit\Controller\Adminhtml\Promo\Quote;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
- use Magento\SalesRule\Model\CouponGenerator;
-+use Magento\SalesRule\Api\Data\CouponGenerationSpecInterfaceFactory;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -50,6 +51,9 @@ class GenerateTest extends \PHPUnit\Framework\TestCase
-     /** @var  CouponGenerator | \PHPUnit_Framework_MockObject_MockObject */
-     private $couponGenerator;
- 
-+    /** @var  CouponGenerationSpecInterfaceFactory | \PHPUnit_Framework_MockObject_MockObject */
-+    private $couponGenerationSpec;
-+
-     /**
-      * Test setup
-      */
-@@ -98,6 +102,9 @@ class GenerateTest extends \PHPUnit\Framework\TestCase
-         $this->couponGenerator = $this->getMockBuilder(CouponGenerator::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $this->couponGenerationSpec = $this->getMockBuilder(CouponGenerationSpecInterfaceFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
- 
-         $this->objectManagerHelper = new ObjectManagerHelper($this);
-         $this->model = $this->objectManagerHelper->getObject(
-@@ -107,7 +114,8 @@ class GenerateTest extends \PHPUnit\Framework\TestCase
-                 'coreRegistry' => $this->registryMock,
-                 'fileFactory' => $this->fileFactoryMock,
-                 'dateFilter' => $this->dateMock,
--                'couponGenerator' => $this->couponGenerator
-+                'couponGenerator' => $this->couponGenerator,
-+                'generationSpecFactory' => $this->couponGenerationSpec
-             ]
-         );
-     }
-@@ -144,9 +152,10 @@ class GenerateTest extends \PHPUnit\Framework\TestCase
-         $this->requestMock->expects($this->once())
-             ->method('getParams')
-             ->willReturn($requestData);
--        $this->couponGenerator->expects($this->once())
--            ->method('generateCodes')
--            ->with($requestData)
-+        $requestData['quantity'] = isset($requestData['qty']) ? $requestData['qty'] : null;
-+        $this->couponGenerationSpec->expects($this->once())
-+            ->method('create')
-+            ->with(['data' => $requestData])
-             ->willReturn(['some_data', 'some_data_2']);
-         $this->messageManager->expects($this->once())
-             ->method('addSuccessMessage');
-diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Coupon/MassgeneratorTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Coupon/MassgeneratorTest.php
-index 8408636ae26..f29fa6bb9de 100644
---- a/app/code/Magento/SalesRule/Test/Unit/Model/Coupon/MassgeneratorTest.php
-+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Coupon/MassgeneratorTest.php
-@@ -23,7 +23,7 @@ class MassgeneratorTest extends \PHPUnit\Framework\TestCase
-     protected function setUp()
-     {
-         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--        $this->charset = str_split(md5((string)time()));
-+        $this->charset = str_split(sha1((string)time()));
-     }
- 
-     /**
-@@ -103,24 +103,25 @@ class MassgeneratorTest extends \PHPUnit\Framework\TestCase
-         $dateMock = $this->createPartialMock(\Magento\Framework\Stdlib\DateTime\DateTime::class, ['gmtTimestamp']);
-         $dateTimeMock = $this->createPartialMock(\Magento\Framework\Stdlib\DateTime::class, ['formatDate']);
-         $couponFactoryMock = $this->createPartialMock(\Magento\SalesRule\Model\CouponFactory::class, ['create']);
--        $couponMock = $this->createPartialMock(\Magento\SalesRule\Model\Coupon::class, [
-+        $couponMock = $this->createPartialMock(
-+            \Magento\SalesRule\Model\Coupon::class,
-+            [
-                 '__wakeup',
-                 'setId',
-                 'setRuleId',
-                 'setUsageLimit',
-                 'setUsagePerCustomer',
--                'setExpirationDate',
-                 'setCreatedAt',
-                 'setType',
-                 'setCode',
-                 'save'
--            ]);
-+            ]
-+        );
- 
-         $couponMock->expects($this->any())->method('setId')->will($this->returnSelf());
-         $couponMock->expects($this->any())->method('setRuleId')->will($this->returnSelf());
-         $couponMock->expects($this->any())->method('setUsageLimit')->will($this->returnSelf());
-         $couponMock->expects($this->any())->method('setUsagePerCustomer')->will($this->returnSelf());
--        $couponMock->expects($this->any())->method('setExpirationDate')->will($this->returnSelf());
-         $couponMock->expects($this->any())->method('setCreatedAt')->will($this->returnSelf());
-         $couponMock->expects($this->any())->method('setType')->will($this->returnSelf());
-         $couponMock->expects($this->any())->method('setCode')->will($this->returnSelf());
-diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/CouponGeneratorTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/CouponGeneratorTest.php
-new file mode 100644
-index 00000000000..24ea8f2ab5e
---- /dev/null
-+++ b/app/code/Magento/SalesRule/Test/Unit/Model/CouponGeneratorTest.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\SalesRule\Test\Unit\Model;
-+
-+use Magento\SalesRule\Api\Data\CouponGenerationSpecInterface;
-+use Magento\SalesRule\Api\Data\CouponGenerationSpecInterfaceFactory;
-+use Magento\SalesRule\Model\CouponGenerator;
-+use Magento\SalesRule\Model\Service\CouponManagementService;
-+
-+/**
-+ * @covers \Magento\SalesRule\Model\CouponGenerator
-+ */
-+class CouponGeneratorTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Testable Object
-+     *
-+     * @var CouponGenerator
-+     */
-+    private $couponGenerator;
-+
-+    /**
-+     * @var CouponManagementService|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $couponManagementServiceMock;
-+
-+    /**
-+     * @var CouponGenerationSpecInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $generationSpecFactoryMock;
-+
-+    /**
-+     * @var CouponGenerationSpecInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $generationSpecMock;
-+
-+    /**
-+     * Set Up
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->generationSpecFactoryMock = $this->getMockBuilder(CouponGenerationSpecInterfaceFactory::class)
-+            ->disableOriginalConstructor()->setMethods(['create'])->getMock();
-+        $this->couponManagementServiceMock = $this->createMock(CouponManagementService::class);
-+        $this->generationSpecMock = $this->createMock(CouponGenerationSpecInterface::class);
-+        $this->couponGenerator = new CouponGenerator(
-+            $this->couponManagementServiceMock,
-+            $this->generationSpecFactoryMock
-+        );
-+    }
-+
-+    /**
-+     * Test beforeSave method
-+     *
-+     * @return void
-+     */
-+    public function testBeforeSave()
-+    {
-+        $expected = ['test'];
-+        $this->generationSpecFactoryMock->expects($this->once())->method('create')
-+            ->willReturn($this->generationSpecMock);
-+        $this->couponManagementServiceMock->expects($this->once())->method('generate')
-+            ->with($this->generationSpecMock)->willReturn($expected);
-+        $actual = $this->couponGenerator->generateCodes([]);
-+        self::assertEquals($expected, $actual);
-+    }
-+}
-diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
-index 0d6c09b7f61..f7522746b21 100644
---- a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
-+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
-@@ -16,7 +16,7 @@ use Magento\SalesRule\Api\Data\RuleInterface;
- class ReadHandlerTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\SalesRule\Model\ResourceModel\ReadHandler
-+     * @var ReadHandler
-      */
-     protected $model;
- 
-@@ -49,7 +49,7 @@ class ReadHandlerTest extends \PHPUnit\Framework\TestCase
-         $this->metadataPool = $this->createMock($className);
- 
-         $this->model = $this->objectManager->getObject(
--            \Magento\SalesRule\Model\ResourceModel\ReadHandler::class,
-+            ReadHandler::class,
-             [
-                 'ruleResource' => $this->ruleResource,
-                 'metadataPool' => $this->metadataPool,
-diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php
-index 528db1ea0b8..65f345cb78d 100644
---- a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php
-+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php
-@@ -13,7 +13,7 @@ use Magento\SalesRule\Model\ResourceModel\Rule\DateApplier;
- class DateApplierTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\SalesRule\Model\ResourceModel\Rule\DateApplier|\PHPUnit_Framework_MockObject_MockObject
-+     * @var DateApplier|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $model;
- 
-@@ -29,10 +29,7 @@ class DateApplierTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- 
--        $this->model = $this->objectManager->getObject(
--            \Magento\SalesRule\Model\ResourceModel\Rule\DateApplier::class,
--            []
--        );
-+        $this->model = $this->objectManager->getObject(DateApplier::class, []);
-     }
- 
-     /**
-diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php
-index 51c7b9ede5a..8ca6b20db3b 100644
---- a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php
-+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php
-@@ -298,8 +298,8 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-             ->method('getProduct')
-             ->willReturn($product);
- 
--        $this->model->setAttribute('quote_item_price')
--            ->setOperator($operator);
-+        $this->model->setAttribute('quote_item_price');
-+        $this->model->setData('operator', $operator);
- 
-         $this->assertEquals($isValid, $this->model->setValue($conditionValue)->validate($item));
-     }
-diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
-index 42448565791..e86068946ca 100644
---- a/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
-+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
-@@ -5,6 +5,13 @@
-  */
- namespace Magento\SalesRule\Test\Unit\Model;
- 
-+use Magento\Framework\Pricing\PriceCurrencyInterface;
-+use Magento\Quote\Model\Quote;
-+use Magento\SalesRule\Model\Rule;
-+use Magento\SalesRule\Model\Validator;
-+use Magento\Store\Model\Store;
-+use PHPUnit\Framework\MockObject\MockObject;
-+
- /**
-  * Class ValidatorTest
-  * @@SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -17,50 +24,55 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-     protected $helper;
- 
-     /**
--     * @var \Magento\SalesRule\Model\Validator
-+     * @var Validator
-      */
-     protected $model;
- 
-     /**
--     * @var \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Quote\Model\Quote\Item|MockObject
-      */
-     protected $item;
- 
-     /**
--     * @var \Magento\Quote\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Quote\Model\Quote\Address|MockObject
-      */
-     protected $addressMock;
- 
-     /**
--     * @var \Magento\SalesRule\Model\RulesApplier|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\SalesRule\Model\RulesApplier|MockObject
-      */
-     protected $rulesApplier;
- 
-     /**
--     * @var \Magento\SalesRule\Model\Validator\Pool|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\SalesRule\Model\Validator\Pool|MockObject
-      */
-     protected $validators;
- 
-     /**
--     * @var \Magento\SalesRule\Model\Utility|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\SalesRule\Model\Utility|MockObject
-      */
-     protected $utility;
- 
-     /**
--     * @var \Magento\SalesRule\Model\ResourceModel\Rule\Collection|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\SalesRule\Model\ResourceModel\Rule\Collection|MockObject
-      */
-     protected $ruleCollection;
- 
-     /**
--     * @var \Magento\Catalog\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Catalog\Helper\Data|MockObject
-      */
-     protected $catalogData;
- 
-     /**
--     * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Message\ManagerInterface|MockObject
-      */
-     protected $messageManager;
- 
-+    /**
-+     * @var PriceCurrencyInterface|MockObject
-+     */
-+    private $priceCurrency;
-+
-     protected function setUp()
-     {
-         $this->helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-@@ -74,6 +86,7 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(
-                 [
-                     'getShippingAmountForDiscount',
-+                    'getBaseShippingAmountForDiscount',
-                     'getQuote',
-                     'getCustomAttributesCodes',
-                     'setCartFixedRules'
-@@ -81,7 +94,7 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-             )
-             ->getMock();
- 
--        /** @var \Magento\Quote\Model\Quote\Item\AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
-+        /** @var \Magento\Quote\Model\Quote\Item\AbstractItem|MockObject $item */
-         $this->item = $this->createPartialMock(
-             \Magento\Quote\Model\Quote\Item::class,
-             ['__wakeup', 'getAddress', 'getParentItemId']
-@@ -100,10 +113,13 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
-         $ruleCollectionFactoryMock = $this->prepareRuleCollectionMock($this->ruleCollection);
-+        $this->priceCurrency = $this->getMockBuilder(PriceCurrencyInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
- 
--        /** @var \Magento\SalesRule\Model\Validator|\PHPUnit_Framework_MockObject_MockObject $validator */
-+        /** @var Validator|MockObject $validator */
-         $this->model = $this->helper->getObject(
--            \Magento\SalesRule\Model\Validator::class,
-+            Validator::class,
-             [
-                 'context' => $context,
-                 'registry' => $registry,
-@@ -112,7 +128,8 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-                 'utility' => $this->utility,
-                 'rulesApplier' => $this->rulesApplier,
-                 'validators' => $this->validators,
--                'messageManager' => $this->messageManager
-+                'messageManager' => $this->messageManager,
-+                'priceCurrency' => $this->priceCurrency
-             ]
-         );
-         $this->model->setWebsiteId(1);
-@@ -131,7 +148,7 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @return \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject
-+     * @return \Magento\Quote\Model\Quote\Item|MockObject
-      */
-     protected function getQuoteItemMock()
-     {
-@@ -145,8 +162,8 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-         $itemSimple = $this->createPartialMock(\Magento\Quote\Model\Quote\Item::class, ['getAddress', '__wakeup']);
-         $itemSimple->expects($this->any())->method('getAddress')->will($this->returnValue($this->addressMock));
- 
--        /** @var $quote \Magento\Quote\Model\Quote */
--        $quote = $this->createPartialMock(\Magento\Quote\Model\Quote::class, ['getStoreId', '__wakeup']);
-+        /** @var $quote Quote */
-+        $quote = $this->createPartialMock(Quote::class, ['getStoreId', '__wakeup']);
-         $quote->expects($this->any())->method('getStoreId')->will($this->returnValue(1));
- 
-         $itemData = include $fixturePath . 'quote_item_downloadable.php';
-@@ -168,7 +185,7 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-             $this->model->getCouponCode()
-         );
-         $item = $this->getQuoteItemMock();
--        $rule = $this->createMock(\Magento\SalesRule\Model\Rule::class);
-+        $rule = $this->createMock(Rule::class);
-         $actionsCollection = $this->createPartialMock(\Magento\Rule\Model\Action\Collection::class, ['validate']);
-         $actionsCollection->expects($this->any())
-             ->method('validate')
-@@ -278,7 +295,7 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-     public function testInit()
-     {
-         $this->assertInstanceOf(
--            \Magento\SalesRule\Model\Validator::class,
-+            Validator::class,
-             $this->model->init(
-                 $this->model->getWebsiteId(),
-                 $this->model->getCustomerGroupId(),
-@@ -314,7 +331,7 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-     public function testInitTotalsCanApplyDiscount()
-     {
-         $rule = $this->createPartialMock(
--            \Magento\SalesRule\Model\Rule::class,
-+            Rule::class,
-             ['getSimpleAction', 'getActions', 'getId']
-         );
-         $item1 = $this->getMockForAbstractClass(
-@@ -337,7 +354,7 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
- 
-         $rule->expects($this->any())
-             ->method('getSimpleAction')
--            ->willReturn(\Magento\SalesRule\Model\Rule::CART_FIXED_ACTION);
-+            ->willReturn(Rule::CART_FIXED_ACTION);
-         $iterator = new \ArrayIterator([$rule]);
-         $this->ruleCollection->expects($this->once())->method('getIterator')->willReturn($iterator);
-         $validator = $this->getMockBuilder(\Magento\Framework\Validator\AbstractValidator::class)
-@@ -392,7 +409,7 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @param $ruleCollection
--     * @return \PHPUnit_Framework_MockObject_MockObject
-+     * @return MockObject
-      */
-     protected function prepareRuleCollectionMock($ruleCollection)
-     {
-@@ -427,14 +444,14 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-             $this->model->getCouponCode()
-         );
-         $this->assertInstanceOf(
--            \Magento\SalesRule\Model\Validator::class,
-+            Validator::class,
-             $this->model->processShippingAmount($this->setupAddressMock())
-         );
-     }
- 
-     public function testProcessShippingAmountProcessDisabled()
-     {
--        $ruleMock = $this->getMockBuilder(\Magento\SalesRule\Model\Rule::class)
-+        $ruleMock = $this->getMockBuilder(Rule::class)
-             ->disableOriginalConstructor()
-             ->setMethods([])
-             ->getMock();
-@@ -448,51 +465,54 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-             $this->model->getCouponCode()
-         );
-         $this->assertInstanceOf(
--            \Magento\SalesRule\Model\Validator::class,
-+            Validator::class,
-             $this->model->processShippingAmount($this->setupAddressMock())
-         );
-     }
- 
-     /**
-+     * Tests shipping amounts according to rule simple action.
-+     *
-      * @param string $action
-+     * @param int $ruleDiscount
-+     * @param int $shippingDiscount
-      * @dataProvider dataProviderActions
-      */
--    public function testProcessShippingAmountActions($action)
-+    public function testProcessShippingAmountActions($action, $ruleDiscount, $shippingDiscount): void
-     {
--        $discountAmount = 50;
-+        $shippingAmount = 5;
- 
--        $ruleMock = $this->getMockBuilder(\Magento\SalesRule\Model\Rule::class)
-+        $ruleMock = $this->getMockBuilder(Rule::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['getApplyToShipping', 'getSimpleAction', 'getDiscountAmount'])
-             ->getMock();
--        $ruleMock->expects($this->any())
--            ->method('getApplyToShipping')
-+        $ruleMock->method('getApplyToShipping')
-             ->willReturn(true);
--        $ruleMock->expects($this->any())
--            ->method('getDiscountAmount')
--            ->willReturn($discountAmount);
--        $ruleMock->expects($this->any())
--            ->method('getSimpleAction')
-+        $ruleMock->method('getDiscountAmount')
-+            ->willReturn($ruleDiscount);
-+        $ruleMock->method('getSimpleAction')
-             ->willReturn($action);
- 
-         $iterator = new \ArrayIterator([$ruleMock]);
--        $this->ruleCollection->expects($this->any())
--            ->method('getIterator')
-+        $this->ruleCollection->method('getIterator')
-             ->willReturn($iterator);
- 
--        $this->utility->expects($this->any())
--            ->method('canProcessRule')
-+        $this->utility->method('canProcessRule')
-             ->willReturn(true);
- 
-+        $this->priceCurrency->method('convert')
-+            ->willReturn($ruleDiscount);
-+
-         $this->model->init(
-             $this->model->getWebsiteId(),
-             $this->model->getCustomerGroupId(),
-             $this->model->getCouponCode()
-         );
--        $this->assertInstanceOf(
--            \Magento\SalesRule\Model\Validator::class,
--            $this->model->processShippingAmount($this->setupAddressMock(5))
--        );
-+
-+        $addressMock = $this->setupAddressMock($shippingAmount);
-+
-+        self::assertInstanceOf(Validator::class, $this->model->processShippingAmount($addressMock));
-+        self::assertEquals($shippingDiscount, $addressMock->getShippingDiscountAmount());
-     }
- 
-     /**
-@@ -501,44 +521,48 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-     public static function dataProviderActions()
-     {
-         return [
--            [\Magento\SalesRule\Model\Rule::TO_PERCENT_ACTION],
--            [\Magento\SalesRule\Model\Rule::BY_PERCENT_ACTION],
--            [\Magento\SalesRule\Model\Rule::TO_FIXED_ACTION],
--            [\Magento\SalesRule\Model\Rule::BY_FIXED_ACTION],
--            [\Magento\SalesRule\Model\Rule::CART_FIXED_ACTION],
-+            [Rule::TO_PERCENT_ACTION, 50, 2.5],
-+            [Rule::BY_PERCENT_ACTION, 50, 2.5],
-+            [Rule::TO_FIXED_ACTION, 5, 0],
-+            [Rule::BY_FIXED_ACTION, 5, 5],
-+            [Rule::CART_FIXED_ACTION, 5, 0],
-         ];
-     }
- 
-     /**
-      * @param null|int $shippingAmount
--     * @return \PHPUnit_Framework_MockObject_MockObject
-+     * @return MockObject
-      */
-     protected function setupAddressMock($shippingAmount = null)
-     {
--        $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-+        $storeMock = $this->getMockBuilder(Store::class)
-             ->disableOriginalConstructor()
-             ->setMethods([])
-             ->getMock();
--        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
-+
-+        $quoteMock = $this->getMockBuilder(Quote::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['setAppliedRuleIds', 'getStore'])
-             ->getMock();
--        $quoteMock->expects($this->any())
--            ->method('getStore')
-+
-+        $quoteMock->method('getStore')
-             ->willReturn($storeMock);
--        $quoteMock->expects($this->any())
--            ->method('setAppliedRuleIds')
-+
-+        $quoteMock->method('setAppliedRuleIds')
-             ->willReturnSelf();
- 
--        $this->addressMock->expects($this->any())
--            ->method('getShippingAmountForDiscount')
-+        $this->addressMock->method('getShippingAmountForDiscount')
-             ->willReturn($shippingAmount);
--        $this->addressMock->expects($this->any())
--            ->method('getQuote')
-+
-+        $this->addressMock->method('getBaseShippingAmountForDiscount')
-+            ->willReturn($shippingAmount);
-+
-+        $this->addressMock->method('getQuote')
-             ->willReturn($quoteMock);
--        $this->addressMock->expects($this->any())
--            ->method('getCustomAttributesCodes')
-+
-+        $this->addressMock->method('getCustomAttributesCodes')
-             ->willReturn([]);
-+
-         return $this->addressMock;
-     }
- 
-@@ -546,7 +570,7 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->utility->expects($this->once())
-             ->method('resetRoundingDeltas');
--        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
-+        $quoteMock = $this->getMockBuilder(Quote::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-         $addressMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address::class)
-@@ -560,6 +584,6 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-             $this->model->getCustomerGroupId(),
-             $this->model->getCouponCode()
-         );
--        $this->assertInstanceOf(\Magento\SalesRule\Model\Validator::class, $this->model->reset($addressMock));
-+        $this->assertInstanceOf(Validator::class, $this->model->reset($addressMock));
-     }
- }
-diff --git a/app/code/Magento/SalesRule/Test/Unit/Observer/SalesOrderAfterPlaceObserverTest.php b/app/code/Magento/SalesRule/Test/Unit/Observer/SalesOrderAfterPlaceObserverTest.php
-deleted file mode 100644
-index 32bf2201665..00000000000
---- a/app/code/Magento/SalesRule/Test/Unit/Observer/SalesOrderAfterPlaceObserverTest.php
-+++ /dev/null
-@@ -1,183 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\SalesRule\Test\Unit\Observer;
--
--class SalesOrderAfterPlaceObserverTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\SalesRule\Observer\SalesOrderAfterPlaceObserver|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $model;
--
--    /**
--     * @var \Magento\SalesRule\Model\Coupon|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $couponMock;
--
--    /**
--     * @var \Magento\SalesRule\Model\RuleFactory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $ruleFactory;
--
--    /**
--     * @var
--     */
--    protected $ruleCustomerFactory;
--
--    /**
--     * @var \Magento\SalesRule\Model\ResourceModel\Coupon\Usage|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $couponUsage;
--
--    protected function setUp()
--    {
--        $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--        $this->initMocks();
--
--        $this->model = $helper->getObject(
--            \Magento\SalesRule\Observer\SalesOrderAfterPlaceObserver::class,
--            [
--                'ruleFactory' => $this->ruleFactory,
--                'ruleCustomerFactory' => $this->ruleCustomerFactory,
--                'coupon' => $this->couponMock,
--                'couponUsage' => $this->couponUsage,
--            ]
--        );
--    }
--
--    protected function initMocks()
--    {
--        $this->couponMock = $this->createPartialMock(\Magento\SalesRule\Model\Coupon::class, [
--                '__wakeup',
--                'save',
--                'load',
--                'getId',
--                'setTimesUsed',
--                'getTimesUsed',
--                'getRuleId',
--                'loadByCode',
--                'updateCustomerCouponTimesUsed'
--            ]);
--        $this->ruleFactory = $this->createPartialMock(\Magento\SalesRule\Model\RuleFactory::class, ['create']);
--        $this->ruleCustomerFactory = $this->createPartialMock(
--            \Magento\SalesRule\Model\Rule\CustomerFactory::class,
--            ['create']
--        );
--        $this->couponUsage = $this->createMock(\Magento\SalesRule\Model\ResourceModel\Coupon\Usage::class);
--    }
--
--    /**
--     * @param \\PHPUnit_Framework_MockObject_MockObject $observer
--     * @return \PHPUnit_Framework_MockObject_MockObject $order
--     */
--    protected function initOrderFromEvent($observer)
--    {
--        $event = $this->createPartialMock(\Magento\Framework\Event::class, ['getOrder']);
--        $order = $this->createPartialMock(
--            \Magento\Sales\Model\Order::class,
--            ['getAppliedRuleIds', 'getCustomerId', 'getDiscountAmount', 'getCouponCode', '__wakeup']
--        );
--
--        $observer->expects($this->any())
--            ->method('getEvent')
--            ->will($this->returnValue($event));
--        $event->expects($this->any())
--            ->method('getOrder')
--            ->will($this->returnValue($order));
--
--        return $order;
--    }
--
--    public function testSalesOrderAfterPlaceWithoutOrder()
--    {
--        $observer = $this->createMock(\Magento\Framework\Event\Observer::class);
--        $this->initOrderFromEvent($observer);
--
--        $this->assertEquals($this->model, $this->model->execute($observer));
--    }
--
--    public function testSalesOrderAfterPlaceWithoutRuleId()
--    {
--        $observer = $this->createMock(\Magento\Framework\Event\Observer::class);
--        $order = $this->initOrderFromEvent($observer);
--        $ruleIds = null;
--        $order->expects($this->once())
--            ->method('getAppliedRuleIds')
--            ->will($this->returnValue($ruleIds));
--
--        $this->ruleFactory->expects($this->never())
--            ->method('create');
--        $this->assertEquals($this->model, $this->model->execute($observer));
--    }
--
--    /**
--     * @param int|bool $ruleCustomerId
--     * @dataProvider salesOrderAfterPlaceDataProvider
--     */
--    public function testSalesOrderAfterPlace($ruleCustomerId)
--    {
--        $observer = $this->createMock(\Magento\Framework\Event\Observer::class);
--        $rule = $this->createMock(\Magento\SalesRule\Model\Rule::class);
--        $ruleCustomer = $this->createPartialMock(\Magento\SalesRule\Model\Rule\Customer::class, [
--                'setCustomerId',
--                'loadByCustomerRule',
--                'getId',
--                'setTimesUsed',
--                'setRuleId',
--                'save',
--                '__wakeup'
--            ]);
--        $order = $this->initOrderFromEvent($observer);
--        $ruleId = 1;
--        $couponId = 1;
--        $customerId = 1;
--
--        $order->expects($this->exactly(2))
--            ->method('getAppliedRuleIds')
--            ->will($this->returnValue($ruleId));
--        $order->expects($this->once())
--            ->method('getCustomerId')
--            ->will($this->returnValue($customerId));
--        $this->ruleFactory->expects($this->once())
--            ->method('create')
--            ->will($this->returnValue($rule));
--        $rule->expects($this->once())
--            ->method('getId')
--            ->will($this->returnValue($ruleId));
--        $this->ruleCustomerFactory->expects($this->once())
--            ->method('create')
--            ->will($this->returnValue($ruleCustomer));
--        $ruleCustomer->expects($this->once())
--            ->method('getId')
--            ->will($this->returnValue($ruleCustomerId));
--        $ruleCustomer->expects($this->any())
--            ->method('setCustomerId')
--            ->will($this->returnSelf());
--        $ruleCustomer->expects($this->any())
--            ->method('setRuleId')
--            ->will($this->returnSelf());
--        $this->couponMock->expects($this->any())
--            ->method('getId')
--            ->will($this->returnValue($couponId));
--
--        $this->couponUsage->expects($this->once())
--            ->method('updateCustomerCouponTimesUsed')
--            ->with($customerId, $couponId);
--
--        $this->assertEquals($this->model, $this->model->execute($observer));
--    }
--
--    /**
--     * @return array
--     */
--    public function salesOrderAfterPlaceDataProvider()
--    {
--        return [
--            'With customer rule id' => [1],
--            'Without customer rule id' => [null]
--        ];
--    }
--}
-diff --git a/app/code/Magento/SalesRule/etc/communication.xml b/app/code/Magento/SalesRule/etc/communication.xml
-new file mode 100644
-index 00000000000..4c905fa83e2
---- /dev/null
-+++ b/app/code/Magento/SalesRule/etc/communication.xml
-@@ -0,0 +1,12 @@
-+<?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:Communication/etc/communication.xsd">
-+    <topic name="sales_rule.codegenerator" request="Magento\SalesRule\Api\Data\CouponGenerationSpecInterface">
-+        <handler name="codegeneratorProcessor" type="Magento\SalesRule\Model\Coupon\Consumer" method="process" />
-+    </topic>
-+</config>
-diff --git a/app/code/Magento/SalesRule/etc/db_schema.xml b/app/code/Magento/SalesRule/etc/db_schema.xml
-index 3d882ee2eae..5a4877bbf82 100644
---- a/app/code/Magento/SalesRule/etc/db_schema.xml
-+++ b/app/code/Magento/SalesRule/etc/db_schema.xml
-@@ -9,7 +9,7 @@
-         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-     <table name="salesrule" resource="default" engine="innodb" comment="Salesrule">
-         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
-         <column xsi:type="text" name="description" nullable="true" comment="Description"/>
-         <column xsi:type="date" name="from_date" comment="From"/>
-@@ -46,10 +46,10 @@
-                 identity="false" default="0" comment="Use Auto Generation"/>
-         <column xsi:type="int" name="uses_per_coupon" padding="11" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="User Per Coupon"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_id"/>
-         </constraint>
--        <index name="SALESRULE_IS_ACTIVE_SORT_ORDER_TO_DATE_FROM_DATE" indexType="btree">
-+        <index referenceId="SALESRULE_IS_ACTIVE_SORT_ORDER_TO_DATE_FROM_DATE" indexType="btree">
-             <column name="is_active"/>
-             <column name="sort_order"/>
-             <column name="to_date"/>
-@@ -60,7 +60,7 @@
-         <column xsi:type="int" name="coupon_id" padding="10" unsigned="true" nullable="false" identity="true"
-                 comment="Coupon Id"/>
-         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
--                comment="Rule Id"/>
-+                comment="Rule ID"/>
-         <column xsi:type="varchar" name="code" nullable="true" length="255" comment="Code"/>
-         <column xsi:type="int" name="usage_limit" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="Usage Limit"/>
-@@ -68,7 +68,7 @@
-                 comment="Usage Per Customer"/>
-         <column xsi:type="int" name="times_used" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Times Used"/>
--        <column xsi:type="timestamp" name="expiration_date" on_update="false" nullable="true"
-+        <column xsi:type="datetime" name="expiration_date" on_update="false" nullable="true"
-                 comment="Expiration Date"/>
-         <column xsi:type="smallint" name="is_primary" padding="5" unsigned="true" nullable="true" identity="false"
-                 comment="Is Primary"/>
-@@ -76,19 +76,19 @@
-                 comment="Coupon Code Creation Date"/>
-         <column xsi:type="smallint" name="type" padding="6" unsigned="false" nullable="true" identity="false"
-                 default="0" comment="Coupon Code Type"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="coupon_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALESRULE_COUPON_RULE_ID_SALESRULE_RULE_ID" table="salesrule_coupon"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_COUPON_RULE_ID_SALESRULE_RULE_ID" table="salesrule_coupon"
-                     column="rule_id" referenceTable="salesrule" referenceColumn="rule_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="SALESRULE_COUPON_CODE">
-+        <constraint xsi:type="unique" referenceId="SALESRULE_COUPON_CODE">
-             <column name="code"/>
-         </constraint>
--        <constraint xsi:type="unique" name="SALESRULE_COUPON_RULE_ID_IS_PRIMARY">
-+        <constraint xsi:type="unique" referenceId="SALESRULE_COUPON_RULE_ID_IS_PRIMARY">
-             <column name="rule_id"/>
-             <column name="is_primary"/>
-         </constraint>
--        <index name="SALESRULE_COUPON_RULE_ID" indexType="btree">
-+        <index referenceId="SALESRULE_COUPON_RULE_ID" indexType="btree">
-             <column name="rule_id"/>
-         </index>
-     </table>
-@@ -99,17 +99,17 @@
-                 comment="Customer Id"/>
-         <column xsi:type="int" name="times_used" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Times Used"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="coupon_id"/>
-             <column name="customer_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALESRULE_COUPON_USAGE_COUPON_ID_SALESRULE_COUPON_COUPON_ID"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_COUPON_USAGE_COUPON_ID_SALESRULE_COUPON_COUPON_ID"
-                     table="salesrule_coupon_usage" column="coupon_id" referenceTable="salesrule_coupon"
-                     referenceColumn="coupon_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALESRULE_COUPON_USAGE_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_COUPON_USAGE_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="salesrule_coupon_usage" column="customer_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <index name="SALESRULE_COUPON_USAGE_CUSTOMER_ID" indexType="btree">
-+        <index referenceId="SALESRULE_COUPON_USAGE_CUSTOMER_ID" indexType="btree">
-             <column name="customer_id"/>
-         </index>
-     </table>
-@@ -117,24 +117,24 @@
-         <column xsi:type="int" name="rule_customer_id" padding="10" unsigned="true" nullable="false" identity="true"
-                 comment="Rule Customer Id"/>
-         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
--                comment="Rule Id"/>
-+                comment="Rule ID"/>
-         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Customer Id"/>
-         <column xsi:type="smallint" name="times_used" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Times Used"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_customer_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALESRULE_CUSTOMER_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_CUSTOMER_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="salesrule_customer" column="customer_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALESRULE_CUSTOMER_RULE_ID_SALESRULE_RULE_ID" table="salesrule_customer"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_CUSTOMER_RULE_ID_SALESRULE_RULE_ID" table="salesrule_customer"
-                     column="rule_id" referenceTable="salesrule" referenceColumn="rule_id" onDelete="CASCADE"/>
--        <index name="SALESRULE_CUSTOMER_RULE_ID_CUSTOMER_ID" indexType="btree">
-+        <index referenceId="SALESRULE_CUSTOMER_RULE_ID_CUSTOMER_ID" indexType="btree">
-             <column name="rule_id"/>
-             <column name="customer_id"/>
-         </index>
--        <index name="SALESRULE_CUSTOMER_CUSTOMER_ID_RULE_ID" indexType="btree">
-+        <index referenceId="SALESRULE_CUSTOMER_CUSTOMER_ID_RULE_ID" indexType="btree">
-             <column name="customer_id"/>
-             <column name="rule_id"/>
-         </index>
-@@ -143,62 +143,63 @@
-         <column xsi:type="int" name="label_id" padding="10" unsigned="true" nullable="false" identity="true"
-                 comment="Label Id"/>
-         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
--                comment="Rule Id"/>
-+                comment="Rule ID"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Store Id"/>
-         <column xsi:type="varchar" name="label" nullable="true" length="255" comment="Label"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="label_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALESRULE_LABEL_RULE_ID_SALESRULE_RULE_ID" table="salesrule_label"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_LABEL_RULE_ID_SALESRULE_RULE_ID" table="salesrule_label"
-                     column="rule_id" referenceTable="salesrule" referenceColumn="rule_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALESRULE_LABEL_STORE_ID_STORE_STORE_ID" table="salesrule_label"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_LABEL_STORE_ID_STORE_STORE_ID" table="salesrule_label"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="SALESRULE_LABEL_RULE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="SALESRULE_LABEL_RULE_ID_STORE_ID">
-             <column name="rule_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="SALESRULE_LABEL_STORE_ID" indexType="btree">
-+        <index referenceId="SALESRULE_LABEL_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-     <table name="salesrule_product_attribute" resource="default" engine="innodb" comment="Salesrule Product Attribute">
--        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"/>
-+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
-+                comment="Rule ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website Id"/>
-         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Customer Group Id"/>
-         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Attribute Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_id"/>
-             <column name="website_id"/>
-             <column name="customer_group_id"/>
-             <column name="attribute_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALESRULE_PRD_ATTR_ATTR_ID_EAV_ATTR_ATTR_ID"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_PRD_ATTR_ATTR_ID_EAV_ATTR_ATTR_ID"
-                     table="salesrule_product_attribute" column="attribute_id" referenceTable="eav_attribute"
-                     referenceColumn="attribute_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALESRULE_PRD_ATTR_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_PRD_ATTR_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
-                     table="salesrule_product_attribute" column="customer_group_id" referenceTable="customer_group"
-                     referenceColumn="customer_group_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALESRULE_PRODUCT_ATTRIBUTE_RULE_ID_SALESRULE_RULE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_PRODUCT_ATTRIBUTE_RULE_ID_SALESRULE_RULE_ID"
-                     table="salesrule_product_attribute" column="rule_id" referenceTable="salesrule"
-                     referenceColumn="rule_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALESRULE_PRODUCT_ATTRIBUTE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_PRODUCT_ATTRIBUTE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-                     table="salesrule_product_attribute" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <index name="SALESRULE_PRODUCT_ATTRIBUTE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="SALESRULE_PRODUCT_ATTRIBUTE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="SALESRULE_PRODUCT_ATTRIBUTE_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="SALESRULE_PRODUCT_ATTRIBUTE_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
--        <index name="SALESRULE_PRODUCT_ATTRIBUTE_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="SALESRULE_PRODUCT_ATTRIBUTE_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
-     </table>
--    <table name="salesrule_coupon_aggregated" resource="default" engine="innodb" comment="Coupon Aggregated">
-+    <table name="salesrule_coupon_aggregated" resource="sales" engine="innodb" comment="Coupon Aggregated">
-         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
-         <column xsi:type="date" name="period" nullable="false" comment="Period"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-@@ -207,39 +208,39 @@
-         <column xsi:type="varchar" name="coupon_code" nullable="true" length="50" comment="Coupon Code"/>
-         <column xsi:type="int" name="coupon_uses" padding="11" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Coupon Uses"/>
--        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Subtotal Amount"/>
-         <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
-                 default="0" comment="Discount Amount"/>
--        <column xsi:type="decimal" name="total_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="total_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Total Amount"/>
--        <column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Subtotal Amount Actual"/>
-         <column xsi:type="decimal" name="discount_amount_actual" scale="4" precision="12" unsigned="false"
-                 nullable="false" default="0" comment="Discount Amount Actual"/>
--        <column xsi:type="decimal" name="total_amount_actual" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_amount_actual" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Amount Actual"/>
-         <column xsi:type="varchar" name="rule_name" nullable="true" length="255" comment="Rule Name"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALESRULE_COUPON_AGGREGATED_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_COUPON_AGGREGATED_STORE_ID_STORE_STORE_ID"
-                     table="salesrule_coupon_aggregated" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="SALESRULE_COUPON_AGGRED_PERIOD_STORE_ID_ORDER_STS_COUPON_CODE">
-+        <constraint xsi:type="unique" referenceId="SALESRULE_COUPON_AGGRED_PERIOD_STORE_ID_ORDER_STS_COUPON_CODE">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="order_status"/>
-             <column name="coupon_code"/>
-         </constraint>
--        <index name="SALESRULE_COUPON_AGGREGATED_STORE_ID" indexType="btree">
-+        <index referenceId="SALESRULE_COUPON_AGGREGATED_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALESRULE_COUPON_AGGREGATED_RULE_NAME" indexType="btree">
-+        <index referenceId="SALESRULE_COUPON_AGGREGATED_RULE_NAME" indexType="btree">
-             <column name="rule_name"/>
-         </index>
-     </table>
--    <table name="salesrule_coupon_aggregated_updated" resource="default" engine="innodb"
-+    <table name="salesrule_coupon_aggregated_updated" resource="sales" engine="innodb"
-            comment="Salesrule Coupon Aggregated Updated">
-         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
-         <column xsi:type="date" name="period" nullable="false" comment="Period"/>
-@@ -249,35 +250,35 @@
-         <column xsi:type="varchar" name="coupon_code" nullable="true" length="50" comment="Coupon Code"/>
-         <column xsi:type="int" name="coupon_uses" padding="11" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Coupon Uses"/>
--        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Subtotal Amount"/>
-         <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
-                 default="0" comment="Discount Amount"/>
--        <column xsi:type="decimal" name="total_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="total_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Total Amount"/>
--        <column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Subtotal Amount Actual"/>
-         <column xsi:type="decimal" name="discount_amount_actual" scale="4" precision="12" unsigned="false"
-                 nullable="false" default="0" comment="Discount Amount Actual"/>
--        <column xsi:type="decimal" name="total_amount_actual" scale="4" precision="12" unsigned="false"
-+        <column xsi:type="decimal" name="total_amount_actual" scale="4" precision="20" unsigned="false"
-                 nullable="false" default="0" comment="Total Amount Actual"/>
-         <column xsi:type="varchar" name="rule_name" nullable="true" length="255" comment="Rule Name"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALESRULE_COUPON_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_COUPON_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID"
-                     table="salesrule_coupon_aggregated_updated" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="UNQ_7196FA120A4F0F84E1B66605E87E213E">
-+        <constraint xsi:type="unique" referenceId="UNQ_7196FA120A4F0F84E1B66605E87E213E">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="order_status"/>
-             <column name="coupon_code"/>
-         </constraint>
--        <index name="SALESRULE_COUPON_AGGREGATED_UPDATED_STORE_ID" indexType="btree">
-+        <index referenceId="SALESRULE_COUPON_AGGREGATED_UPDATED_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALESRULE_COUPON_AGGREGATED_UPDATED_RULE_NAME" indexType="btree">
-+        <index referenceId="SALESRULE_COUPON_AGGREGATED_UPDATED_RULE_NAME" indexType="btree">
-             <column name="rule_name"/>
-         </index>
-     </table>
-@@ -291,65 +292,67 @@
-         <column xsi:type="varchar" name="coupon_code" nullable="true" length="50" comment="Coupon Code"/>
-         <column xsi:type="int" name="coupon_uses" padding="11" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Coupon Uses"/>
--        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Subtotal Amount"/>
-         <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
-                 default="0" comment="Discount Amount"/>
--        <column xsi:type="decimal" name="total_amount" scale="4" precision="12" unsigned="false" nullable="false"
-+        <column xsi:type="decimal" name="total_amount" scale="4" precision="20" unsigned="false" nullable="false"
-                 default="0" comment="Total Amount"/>
-         <column xsi:type="varchar" name="rule_name" nullable="true" length="255" comment="Rule Name"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALESRULE_COUPON_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_COUPON_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID"
-                     table="salesrule_coupon_aggregated_order" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="UNQ_1094D1FBBCBB11704A29DEF3ACC37D2B">
-+        <constraint xsi:type="unique" referenceId="UNQ_1094D1FBBCBB11704A29DEF3ACC37D2B">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="order_status"/>
-             <column name="coupon_code"/>
-         </constraint>
--        <index name="SALESRULE_COUPON_AGGREGATED_ORDER_STORE_ID" indexType="btree">
-+        <index referenceId="SALESRULE_COUPON_AGGREGATED_ORDER_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SALESRULE_COUPON_AGGREGATED_ORDER_RULE_NAME" indexType="btree">
-+        <index referenceId="SALESRULE_COUPON_AGGREGATED_ORDER_RULE_NAME" indexType="btree">
-             <column name="rule_name"/>
-         </index>
-     </table>
-     <table name="salesrule_website" resource="default" engine="innodb" comment="Sales Rules To Websites Relations">
--        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"/>
-+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
-+                comment="Rule ID"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Website Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_id"/>
-             <column name="website_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALESRULE_WEBSITE_RULE_ID_SALESRULE_RULE_ID" table="salesrule_website"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_WEBSITE_RULE_ID_SALESRULE_RULE_ID" table="salesrule_website"
-                     column="rule_id" referenceTable="salesrule" referenceColumn="rule_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALESRULE_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-                     table="salesrule_website" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <index name="SALESRULE_WEBSITE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="SALESRULE_WEBSITE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-     <table name="salesrule_customer_group" resource="default" engine="innodb"
-            comment="Sales Rules To Customer Groups Relations">
--        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"/>
-+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
-+                comment="Rule ID"/>
-         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Customer Group Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="rule_id"/>
-             <column name="customer_group_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALESRULE_CUSTOMER_GROUP_RULE_ID_SALESRULE_RULE_ID"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_CUSTOMER_GROUP_RULE_ID_SALESRULE_RULE_ID"
-                     table="salesrule_customer_group" column="rule_id" referenceTable="salesrule"
-                     referenceColumn="rule_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SALESRULE_CSTR_GROUP_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
-+        <constraint xsi:type="foreign" referenceId="SALESRULE_CSTR_GROUP_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
-                     table="salesrule_customer_group" column="customer_group_id" referenceTable="customer_group"
-                     referenceColumn="customer_group_id" onDelete="CASCADE"/>
--        <index name="SALESRULE_CUSTOMER_GROUP_CUSTOMER_GROUP_ID" indexType="btree">
-+        <index referenceId="SALESRULE_CUSTOMER_GROUP_CUSTOMER_GROUP_ID" indexType="btree">
-             <column name="customer_group_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/SalesRule/etc/di.xml b/app/code/Magento/SalesRule/etc/di.xml
-index a8c350457a5..863467ed3d3 100644
---- a/app/code/Magento/SalesRule/etc/di.xml
-+++ b/app/code/Magento/SalesRule/etc/di.xml
-@@ -179,7 +179,11 @@
-         </arguments>
-     </type>
- 
--    <type name="\Magento\Quote\Model\Cart\CartTotalRepository">
-+    <type name="Magento\Quote\Model\Cart\CartTotalRepository">
-         <plugin name="coupon_label_plugin" type="Magento\SalesRule\Plugin\CartTotalRepository" />
-     </type>
-+    <type name="Magento\Sales\Model\Order">
-+        <plugin name="coupon_uses_increment_plugin" type="Magento\SalesRule\Plugin\CouponUsagesIncrement" sortOrder="20"/>
-+        <plugin name="coupon_uses_decrement_plugin" type="Magento\SalesRule\Plugin\CouponUsagesDecrement" />
-+    </type>
- </config>
-diff --git a/app/code/Magento/SalesRule/etc/events.xml b/app/code/Magento/SalesRule/etc/events.xml
-index 43babc40a2a..8261860bbb7 100644
---- a/app/code/Magento/SalesRule/etc/events.xml
-+++ b/app/code/Magento/SalesRule/etc/events.xml
-@@ -6,9 +6,6 @@
-  */
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
--    <event name="sales_order_place_after">
--        <observer name="salesrule" instance="Magento\SalesRule\Observer\SalesOrderAfterPlaceObserver" />
--    </event>
-     <event name="sales_model_service_quote_submit_before">
-         <observer name="salesrule" instance="Magento\SalesRule\Observer\AddSalesRuleNameToOrderObserver" />
-     </event>
-diff --git a/app/code/Magento/SalesRule/etc/queue.xml b/app/code/Magento/SalesRule/etc/queue.xml
-new file mode 100644
-index 00000000000..8217a0b9f6c
---- /dev/null
-+++ b/app/code/Magento/SalesRule/etc/queue.xml
-@@ -0,0 +1,12 @@
-+<?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-message-queue:etc/queue.xsd">
-+    <broker topic="sales_rule.codegenerator" exchange="magento-db" type="db">
-+        <queue name="codegenerator" consumer="codegeneratorProcessor" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\SalesRule\Model\Coupon\Consumer::process"/>
-+    </broker>
-+</config>
-diff --git a/app/code/Magento/SalesRule/etc/queue_consumer.xml b/app/code/Magento/SalesRule/etc/queue_consumer.xml
-new file mode 100644
-index 00000000000..9eb585f48e8
---- /dev/null
-+++ b/app/code/Magento/SalesRule/etc/queue_consumer.xml
-@@ -0,0 +1,10 @@
-+<?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-message-queue:etc/consumer.xsd">
-+    <consumer name="codegeneratorProcessor" queue="codegenerator" connection="db" maxMessages="5000" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\SalesRule\Model\Coupon\Consumer::process" />
-+</config>
-diff --git a/app/code/Magento/SalesRule/etc/queue_publisher.xml b/app/code/Magento/SalesRule/etc/queue_publisher.xml
-new file mode 100644
-index 00000000000..0863fba2307
---- /dev/null
-+++ b/app/code/Magento/SalesRule/etc/queue_publisher.xml
-@@ -0,0 +1,12 @@
-+<?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-message-queue:etc/publisher.xsd">
-+    <publisher topic="sales_rule.codegenerator">
-+        <connection name="db" exchange="magento-db" />
-+    </publisher>
-+</config>
-diff --git a/app/code/Magento/SalesRule/etc/queue_topology.xml b/app/code/Magento/SalesRule/etc/queue_topology.xml
-new file mode 100644
-index 00000000000..fd6a9bf3672
---- /dev/null
-+++ b/app/code/Magento/SalesRule/etc/queue_topology.xml
-@@ -0,0 +1,12 @@
-+<?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-message-queue:etc/topology.xsd">
-+    <exchange name="magento-db" type="topic" connection="db">
-+        <binding id="codegeneratorBinding" topic="sales_rule.codegenerator" destinationType="queue" destination="codegenerator"/>
-+    </exchange>
-+</config>
-diff --git a/app/code/Magento/SalesRule/etc/sales.xml b/app/code/Magento/SalesRule/etc/sales.xml
-index 3ab197d40b0..d2db6642248 100644
---- a/app/code/Magento/SalesRule/etc/sales.xml
-+++ b/app/code/Magento/SalesRule/etc/sales.xml
-@@ -8,7 +8,8 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Sales:etc/sales.xsd">
-     <section name="quote">
-         <group name="totals">
--            <item name="discount" instance="Magento\SalesRule\Model\Quote\Discount" sort_order="400"/>
-+            <item name="discount" instance="Magento\SalesRule\Model\Quote\Discount" sort_order="300"/>
-+            <item name="shipping_discount" instance="Magento\SalesRule\Model\Quote\Address\Total\ShippingDiscount" sort_order="400"/>
-         </group>
-     </section>
- </config>
-diff --git a/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_index.xml b/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_index.xml
-index 21ce8bfc3ea..7796f280efc 100644
---- a/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_index.xml
-+++ b/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_index.xml
-@@ -12,7 +12,7 @@
-                 <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.promo.quote.grid" as="grid">
-                     <arguments>
-                         <argument name="id" xsi:type="string">promo_quote_grid</argument>
--                        <argument name="dataSource" xsi:type="object">Magento\SalesRule\Model\ResourceModel\Rule\Quote\Collection</argument>
-+                        <argument name="dataSource" xsi:type="object" shared="false">Magento\SalesRule\Model\ResourceModel\Rule\Quote\Collection</argument>
-                         <argument name="default_sort" xsi:type="string">sort_order</argument>
-                         <argument name="default_dir" xsi:type="string">ASC</argument>
-                         <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-diff --git a/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml b/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml
-index 9b579f47759..639e1200623 100644
---- a/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml
-+++ b/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml
-@@ -128,7 +128,7 @@
-                 </validation>
-                 <dataType>number</dataType>
-                 <tooltip>
--                    <link>http://docs.magento.com/m2/ce/user_guide/configuration/scope.html</link>
-+                    <link>https://docs.magento.com/m2/ce/user_guide/configuration/scope.html</link>
-                     <description>What is this?</description>
-                 </tooltip>
-                 <label translate="true">Websites</label>
-@@ -452,7 +452,7 @@
-                 <dataScope>discount_step</dataScope>
-             </settings>
-         </field>
--        <field name="apply_to_shipping" component="Magento_Ui/js/form/element/single-checkbox-toggle-notice" formElement="checkbox">
-+        <field name="apply_to_shipping" component="Magento_SalesRule/js/form/element/apply_to_shipping" formElement="checkbox">
-             <argument name="data" xsi:type="array">
-                 <item name="config" xsi:type="array">
-                     <item name="source" xsi:type="string">sales_rule</item>
-diff --git a/app/code/Magento/SalesRule/view/adminhtml/web/js/form/element/apply_to_shipping.js b/app/code/Magento/SalesRule/view/adminhtml/web/js/form/element/apply_to_shipping.js
-new file mode 100644
-index 00000000000..dfb3f909345
---- /dev/null
-+++ b/app/code/Magento/SalesRule/view/adminhtml/web/js/form/element/apply_to_shipping.js
-@@ -0,0 +1,37 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'Magento_Ui/js/form/element/single-checkbox-toggle-notice'
-+], function (Checkbox) {
-+    'use strict';
-+
-+    return Checkbox.extend({
-+        defaults: {
-+            imports: {
-+                toggleDisabled: '${ $.parentName }.simple_action:value'
-+            }
-+        },
-+
-+        /**
-+         * Toggle element disabled state according to simple action value.
-+         *
-+         * @param {String} action
-+         */
-+        toggleDisabled: function (action) {
-+            switch (action) {
-+                case 'cart_fixed':
-+                    this.disabled(true);
-+                    break;
-+                default:
-+                    this.disabled(false);
-+            }
-+
-+            if (this.disabled()) {
-+                this.checked(false);
-+            }
-+        }
-+    });
-+});
-diff --git a/app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml
-index a5d0be503ba..9e86671500c 100644
---- a/app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml
-+++ b/app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml
-@@ -13,14 +13,10 @@
-                     <item name="components" xsi:type="array">
-                         <item name="block-totals" xsi:type="array">
-                             <item name="children" xsi:type="array">
--                                <item name="before_grandtotal" xsi:type="array">
--                                    <item name="children" xsi:type="array">
--                                        <item name="discount" xsi:type="array">
--                                            <item name="component" xsi:type="string">Magento_SalesRule/js/view/cart/totals/discount</item>
--                                            <item name="config" xsi:type="array">
--                                                <item name="title" xsi:type="string" translate="true">Discount</item>
--                                            </item>
--                                        </item>
-+                                <item name="discount" xsi:type="array">
-+                                    <item name="component" xsi:type="string">Magento_SalesRule/js/view/cart/totals/discount</item>
-+                                    <item name="config" xsi:type="array">
-+                                        <item name="title" xsi:type="string" translate="true">Discount</item>
-                                     </item>
-                                 </item>
-                             </item>
-diff --git a/app/code/Magento/SalesSequence/Model/Manager.php b/app/code/Magento/SalesSequence/Model/Manager.php
-index d18a872bf3b..95b26ba425c 100644
---- a/app/code/Magento/SalesSequence/Model/Manager.php
-+++ b/app/code/Magento/SalesSequence/Model/Manager.php
-@@ -41,7 +41,9 @@ class Manager
-      *
-      * @param string $entityType
-      * @param int $storeId
-+     *
-      * @return \Magento\Framework\DB\Sequence\SequenceInterface
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getSequence($entityType, $storeId)
-     {
-diff --git a/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php b/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
-index be566b6119b..7a4aabea856 100644
---- a/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
-+++ b/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
-@@ -96,7 +96,9 @@ class Meta extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      * Using for load sequence profile and setting it into metadata
-      *
-      * @param \Magento\Framework\Model\AbstractModel $object
--     * @return $this
-+     *
-+     * @return $this|\Magento\Framework\Model\ResourceModel\Db\AbstractDb
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
-     {
-@@ -137,7 +139,12 @@ class Meta extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
--     * @inheritdoc
-+     * Perform actions after object save
-+     *
-+     * @param \Magento\Framework\Model\AbstractModel $object
-+     *
-+     * @return $this|\Magento\Framework\Model\ResourceModel\Db\AbstractDb
-+     * @throws \Magento\Framework\Exception\AlreadyExistsException
-      */
-     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
-     {
-diff --git a/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php b/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
-index 368bdf6c26f..4f1788b0ca3 100644
---- a/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
-+++ b/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
-@@ -5,7 +5,6 @@
-  */
- namespace Magento\SalesSequence\Model\ResourceModel;
- 
--use Magento\SalesSequence\Model\Meta as ModelMeta;
- use Magento\Framework\Model\ResourceModel\Db\Context as DatabaseContext;
- use Magento\SalesSequence\Model\ProfileFactory;
- 
-diff --git a/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php b/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
-index cc828e7d36a..cf56c96fb17 100644
---- a/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
-+++ b/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
-@@ -49,8 +49,12 @@ class SequenceCreatorObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Observer triggered during adding new store
-+     *
-      * @param EventObserver $observer
--     * @return $this
-+     *
-+     * @return $this|void
-+     * @throws \Magento\Framework\Exception\AlreadyExistsException
-      */
-     public function execute(EventObserver $observer)
-     {
-diff --git a/app/code/Magento/SalesSequence/Setup/SequenceCreator.php b/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
-index b0cbf545957..14df80224e2 100644
---- a/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
-+++ b/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
-@@ -49,6 +49,8 @@ class SequenceCreator
- 
-     /**
-      * Creates sales sequences.
-+     *
-+     * @throws \Magento\Framework\Exception\AlreadyExistsException
-      */
-     public function create()
-     {
-diff --git a/app/code/Magento/SalesSequence/etc/db_schema.xml b/app/code/Magento/SalesSequence/etc/db_schema.xml
-index 530a9a33b0c..7ad48badf7b 100644
---- a/app/code/Magento/SalesSequence/etc/db_schema.xml
-+++ b/app/code/Magento/SalesSequence/etc/db_schema.xml
-@@ -23,13 +23,13 @@
-         <column xsi:type="int" name="warning_value" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="WarningValue for sequence"/>
-         <column xsi:type="boolean" name="is_active" nullable="false" default="false" comment="isActive flag"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="profile_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SALES_SEQUENCE_PROFILE_META_ID_SALES_SEQUENCE_META_META_ID"
-+        <constraint xsi:type="foreign" referenceId="SALES_SEQUENCE_PROFILE_META_ID_SALES_SEQUENCE_META_META_ID"
-                     table="sales_sequence_profile" column="meta_id" referenceTable="sales_sequence_meta"
-                     referenceColumn="meta_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="SALES_SEQUENCE_PROFILE_META_ID_PREFIX_SUFFIX">
-+        <constraint xsi:type="unique" referenceId="SALES_SEQUENCE_PROFILE_META_ID_PREFIX_SUFFIX">
-             <column name="meta_id"/>
-             <column name="prefix"/>
-             <column name="suffix"/>
-@@ -41,11 +41,11 @@
-         <column xsi:type="varchar" name="entity_type" nullable="false" length="32" comment="Prefix"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Store Id"/>
--        <column xsi:type="varchar" name="sequence_table" nullable="false" length="32" comment="table for sequence"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <column xsi:type="varchar" name="sequence_table" nullable="false" length="64" comment="table for sequence"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="meta_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="SALES_SEQUENCE_META_ENTITY_TYPE_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="SALES_SEQUENCE_META_ENTITY_TYPE_STORE_ID">
-             <column name="entity_type"/>
-             <column name="store_id"/>
-         </constraint>
-diff --git a/app/code/Magento/SampleData/README.md b/app/code/Magento/SampleData/README.md
-index 5abcbaab148..1077038fc07 100644
---- a/app/code/Magento/SampleData/README.md
-+++ b/app/code/Magento/SampleData/README.md
-@@ -69,4 +69,4 @@ If you have deleted certain entities provided by sample data and want to restore
- The deleted sample data entities will be restored. Those entities, which were changed, will preserve these changes and will not be restored to the default view.
- 
- ## Documentation
--You can find the more detailed description of sample data manipulation procedures at [http://devdocs.magento.com/guides/v2.0/install-gde/install/cli/install-cli-sample-data.html](http://devdocs.magento.com/guides/v2.0/install-gde/install/cli/install-cli-sample-data.html)
-+You can find the more detailed description of sample data manipulation procedures at [https://devdocs.magento.com/guides/v2.0/install-gde/install/cli/install-cli-sample-data.html](https://devdocs.magento.com/guides/v2.0/install-gde/install/cli/install-cli-sample-data.html)
-diff --git a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
-index 5ead8437f94..ad8d247b2a6 100644
---- a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
-+++ b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
-@@ -24,7 +24,7 @@ class Last extends \Magento\Backend\Block\Dashboard\Grid
-     protected $_queriesFactory;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $_moduleManager;
- 
-@@ -36,14 +36,14 @@ class Last extends \Magento\Backend\Block\Dashboard\Grid
-     /**
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Backend\Helper\Data $backendHelper
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory
-      * @param array $data
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-         \Magento\Backend\Helper\Data $backendHelper,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory,
-         array $data = []
-     ) {
-@@ -53,6 +53,8 @@ class Last extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
-+     * Construct.
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -62,6 +64,8 @@ class Last extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
-+     * Prepare collection.
-+     *
-      * @return $this
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
-@@ -86,6 +90,8 @@ class Last extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
-+     * Prepare columns.
-+     *
-      * @return $this
-      * @throws \Exception
-      */
-diff --git a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
-index 120e3121648..63893f78867 100644
---- a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
-+++ b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
-@@ -24,7 +24,7 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid
-     protected $_queriesFactory;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $_moduleManager;
- 
-@@ -36,14 +36,14 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid
-     /**
-      * @param \Magento\Backend\Block\Template\Context $context
-      * @param \Magento\Backend\Helper\Data $backendHelper
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory
-      * @param array $data
-      */
-     public function __construct(
-         \Magento\Backend\Block\Template\Context $context,
-         \Magento\Backend\Helper\Data $backendHelper,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory,
-         array $data = []
-     ) {
-@@ -53,6 +53,8 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
-+     * Construct.
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -62,7 +64,7 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _prepareCollection()
-     {
-@@ -86,7 +88,7 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _prepareColumns()
-     {
-@@ -119,7 +121,7 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getRowUrl($row)
-     {
-diff --git a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
-index f2770f77cc5..c32ca04d39b 100644
---- a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
-+++ b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
-@@ -6,15 +6,17 @@
- 
- namespace Magento\Search\Controller\Adminhtml\Synonyms;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
- /**
-- * Mass-Delete Controller
-+ * Mass-Delete Controller.
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class MassDelete extends \Magento\Backend\App\Action
-+class MassDelete extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
--     * Authorization level of a basic admin session
-+     * Authorization level of a basic admin session.
-      *
-      * @see _isAllowed()
-      */
-@@ -56,7 +58,7 @@ class MassDelete extends \Magento\Backend\App\Action
-     }
- 
-     /**
--     * Execute action
-+     * Execute action.
-      *
-      * @return \Magento\Backend\Model\View\Result\Redirect
-      * @throws \Magento\Framework\Exception\LocalizedException|\Exception
-diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
-index c7adf32da0f..ce3dfcc601f 100644
---- a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
-+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\Search\Controller\Adminhtml\Term;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Search\Controller\Adminhtml\Term as TermController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Delete extends TermController
-+class Delete extends TermController implements HttpPostActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Redirect
-diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
-index 3ee0ea24037..cd1ef7553c7 100644
---- a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
-+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
-@@ -5,12 +5,13 @@
-  */
- namespace Magento\Search\Controller\Adminhtml\Term;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Search\Controller\Adminhtml\Term as TermController;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\Registry;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Edit extends TermController
-+class Edit extends TermController implements HttpGetActionInterface
- {
-     /**
-      * Core registry
-diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php
-index f7d0b865907..c097cc08489 100644
---- a/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php
-+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php
-@@ -5,9 +5,10 @@
-  */
- namespace Magento\Search\Controller\Adminhtml\Term;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Search\Controller\Adminhtml\Term as TermController;
- 
--class Index extends TermController
-+class Index extends TermController implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Page
-diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
-index f6874078f2f..84e475b7275 100644
---- a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
-+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\Search\Controller\Adminhtml\Term;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Search\Controller\Adminhtml\Term as TermController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class MassDelete extends TermController
-+class MassDelete extends TermController implements HttpPostActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Redirect
-diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php
-index 8565c03724c..49805400713 100644
---- a/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php
-+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\Search\Controller\Adminhtml\Term;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Search\Controller\Adminhtml\Term as TermController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class NewAction extends TermController
-+class NewAction extends TermController implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Forward
-diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php
-index fb4964717e5..b0ce066f127 100644
---- a/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php
-+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php
-@@ -5,10 +5,11 @@
-  */
- namespace Magento\Search\Controller\Adminhtml\Term;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Reports\Controller\Adminhtml\Index as ReportsIndexController;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Report extends ReportsIndexController
-+class Report extends ReportsIndexController implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
-index cd9b1347ed1..39ae07f0d35 100644
---- a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
-+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
-@@ -5,13 +5,14 @@
-  */
- namespace Magento\Search\Controller\Adminhtml\Term;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Search\Model\QueryFactory;
- use Magento\Search\Controller\Adminhtml\Term as TermController;
- use Magento\Framework\Exception\LocalizedException;
- 
--class Save extends TermController
-+class Save extends TermController implements HttpPostActionInterface
- {
-     /**
-      * @var QueryFactory
-diff --git a/app/code/Magento/Search/Controller/Ajax/Suggest.php b/app/code/Magento/Search/Controller/Ajax/Suggest.php
-index 307f4df1632..6eab0949145 100644
---- a/app/code/Magento/Search/Controller/Ajax/Suggest.php
-+++ b/app/code/Magento/Search/Controller/Ajax/Suggest.php
-@@ -5,12 +5,13 @@
-  */
- namespace Magento\Search\Controller\Ajax;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\App\Action\Action;
- use Magento\Framework\App\Action\Context;
- use Magento\Search\Model\AutocompleteInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Suggest extends Action
-+class Suggest extends Action implements HttpGetActionInterface
- {
-     /**
-      * @var  \Magento\Search\Model\AutocompleteInterface
-diff --git a/app/code/Magento/Search/Model/EngineResolver.php b/app/code/Magento/Search/Model/EngineResolver.php
-index 720df0e0fda..9e4ebf54363 100644
---- a/app/code/Magento/Search/Model/EngineResolver.php
-+++ b/app/code/Magento/Search/Model/EngineResolver.php
-@@ -10,6 +10,8 @@ use Magento\Framework\Search\EngineResolverInterface;
- use Psr\Log\LoggerInterface;
- 
- /**
-+ * Search engine resolver model.
-+ *
-  * @api
-  * @since 100.1.0
-  */
-@@ -61,6 +63,7 @@ class EngineResolver implements EngineResolverInterface
-     /**
-      * @param ScopeConfigInterface $scopeConfig
-      * @param array $engines
-+     * @param LoggerInterface $logger
-      * @param string $path
-      * @param string $scopeType
-      * @param string $scopeCode
-diff --git a/app/code/Magento/Search/Model/Query.php b/app/code/Magento/Search/Model/Query.php
-index 365e03b3648..d8c92a4801e 100644
---- a/app/code/Magento/Search/Model/Query.php
-+++ b/app/code/Magento/Search/Model/Query.php
-@@ -5,7 +5,6 @@
-  */
- namespace Magento\Search\Model;
- 
--use Magento\Framework\App\ResourceConnection;
- use Magento\Search\Model\ResourceModel\Query\Collection as QueryCollection;
- use Magento\Search\Model\ResourceModel\Query\CollectionFactory as QueryCollectionFactory;
- use Magento\Search\Model\SearchCollectionInterface as Collection;
-@@ -296,8 +295,7 @@ class Query extends AbstractModel implements QueryInterface
-     }
- 
-     /**
--     * @return string
--     * @codeCoverageIgnore
-+     * @inheritdoc
-      */
-     public function getQueryText()
-     {
-@@ -305,6 +303,8 @@ class Query extends AbstractModel implements QueryInterface
-     }
- 
-     /**
-+     * Check if query maximum length exceeded.
-+     *
-      * @return bool
-      * @codeCoverageIgnore
-      */
-@@ -314,6 +314,8 @@ class Query extends AbstractModel implements QueryInterface
-     }
- 
-     /**
-+     * Check if minimum query length reached.
-+     *
-      * @return bool
-      * @codeCoverageIgnore
-      * @since 100.1.0
-diff --git a/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php b/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
-index 46e794a1954..1ac1547eb8d 100644
---- a/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
-+++ b/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
-@@ -87,7 +87,7 @@ class SynonymReader extends AbstractDb
-     {
-         $matchQuery = $this->fullTextSelect->getMatchQuery(
-             ['synonyms' => 'synonyms'],
--            $phrase,
-+            $this->escapePhrase($phrase),
-             Fulltext::FULLTEXT_MODE_BOOLEAN
-         );
-         $query = $this->getConnection()->select()->from(
-@@ -97,6 +97,18 @@ class SynonymReader extends AbstractDb
-         return $this->getConnection()->fetchAll($query);
-     }
- 
-+    /**
-+     * Cut trailing plus or minus sign, and @ symbol, using of which causes InnoDB to report a syntax error.
-+     *
-+     * @see https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html
-+     * @param string $phrase
-+     * @return string
-+     */
-+    private function escapePhrase(string $phrase): string
-+    {
-+        return preg_replace('/@+|[@+-]+$|[<>]/', '', $phrase);
-+    }
-+
-     /**
-      * A private helper function to retrieve matching synonym groups per scope
-      *
-diff --git a/app/code/Magento/Search/Model/Search/PageSizeProvider.php b/app/code/Magento/Search/Model/Search/PageSizeProvider.php
-new file mode 100644
-index 00000000000..5572bac6add
---- /dev/null
-+++ b/app/code/Magento/Search/Model/Search/PageSizeProvider.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Search\Model\Search;
-+
-+/**
-+ * Returns max  page size by search engine name
-+ * @api
-+ */
-+class PageSizeProvider
-+{
-+    /**
-+     * @var \Magento\Search\Model\EngineResolver
-+     */
-+    private $engineResolver;
-+
-+    /**
-+     * @var array
-+     */
-+    private $pageSizeBySearchEngine;
-+
-+    /**
-+     * @param \Magento\Search\Model\EngineResolver $engineResolver
-+     * @param array $pageSizeBySearchEngine
-+     */
-+    public function __construct(
-+        \Magento\Search\Model\EngineResolver $engineResolver,
-+        array $pageSizeBySearchEngine = []
-+    ) {
-+        $this->engineResolver = $engineResolver;
-+        $this->pageSizeBySearchEngine = $pageSizeBySearchEngine;
-+    }
-+
-+    /**
-+     * Returns max_page_size depends on engine
-+     *
-+     * @return integer
-+     */
-+    public function getMaxPageSize() : int
-+    {
-+        $searchEngine = $this->engineResolver->getCurrentSearchEngine();
-+
-+        $pageSize = PHP_INT_MAX;
-+        if (isset($this->pageSizeBySearchEngine[$searchEngine])) {
-+            $pageSize = $this->pageSizeBySearchEngine[$searchEngine];
-+        }
-+
-+        return (int)$pageSize;
-+    }
-+}
-diff --git a/app/code/Magento/Search/Model/SearchEngine/MenuBuilder.php b/app/code/Magento/Search/Model/SearchEngine/MenuBuilder.php
-deleted file mode 100644
-index 800fd0b02ed..00000000000
---- a/app/code/Magento/Search/Model/SearchEngine/MenuBuilder.php
-+++ /dev/null
-@@ -1,70 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Search\Model\SearchEngine;
--
--use Magento\Backend\Model\Menu;
--use Magento\Backend\Model\Menu\Builder;
--use Magento\Framework\Search\EngineResolverInterface;
--use Magento\Framework\Search\SearchEngine\ConfigInterface;
--
--/**
-- * A plugin for Magento\Backend\Model\Menu\Builder class. Implements "after" for "getResult()".
-- *
-- * The purpose of this plugin is to go through the menu tree and remove "Search Terms" menu item if the
-- * selected search engine does not support "synonyms" feature.
-- */
--class MenuBuilder
--{
--    /**
--     * A constant to refer to "Search Synonyms" menu item id from etc/adminhtml/menu.xml
--     */
--    const SEARCH_SYNONYMS_MENU_ITEM_ID = 'Magento_Search::search_synonyms';
--
--    /**
--     * @var ConfigInterface $searchFeatureConfig
--     */
--    protected $searchFeatureConfig;
--
--    /**
--     * @var EngineResolverInterface $engineResolver
--     */
--    protected $engineResolver;
--
--    /**
--     * MenuBuilder constructor.
--     *
--     * @param ConfigInterface $searchFeatureConfig
--     * @param EngineResolverInterface $engineResolver
--     */
--    public function __construct(
--        ConfigInterface $searchFeatureConfig,
--        EngineResolverInterface $engineResolver
--    ) {
--        $this->searchFeatureConfig = $searchFeatureConfig;
--        $this->engineResolver = $engineResolver;
--    }
--
--    /**
--     * Removes 'Search Synonyms' from the menu if 'synonyms' is not supported
--     *
--     * @param Builder $subject
--     * @param Menu $menu
--     * @return Menu
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
--     */
--    public function afterGetResult(Builder $subject, Menu $menu)
--    {
--        $searchEngine = $this->engineResolver->getCurrentSearchEngine();
--        if (!$this->searchFeatureConfig
--            ->isFeatureSupported(ConfigInterface::SEARCH_ENGINE_FEATURE_SYNONYMS, $searchEngine)
--        ) {
--            // "Search Synonyms" feature is not supported by the current configured search engine.
--            // Menu will be updated to remove it from the list
--            $menu->remove(self::SEARCH_SYNONYMS_MENU_ITEM_ID);
--        }
--        return $menu;
--    }
--}
-diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminEditSearchTermActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminEditSearchTermActionGroup.xml
-new file mode 100644
-index 00000000000..de330bb24a2
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminEditSearchTermActionGroup.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminFillAllSearchTermFieldsActionGroup">
-+        <arguments>
-+            <argument name="searchTerm" type="entity"/>
-+        </arguments>
-+
-+        <fillField selector="{{AdminCatalogSearchTermNewSection.searchQuery}}" userInput="{{searchTerm.query_text}}" stepKey="fillSearchQuery1"/>
-+        <selectOption selector="{{AdminCatalogSearchTermNewSection.store}}" userInput="{{searchTerm.store_id}}" stepKey="selectStore1"/>
-+        <fillField selector="{{AdminCatalogSearchTermNewSection.numberOfResults}}" userInput="{{searchTerm.number_of_results}}" stepKey="fillNumberOfResults1"/>
-+        <fillField selector="{{AdminCatalogSearchTermNewSection.numberOfUses}}" userInput="{{searchTerm.number_of_uses}}" stepKey="fillNumberOfUses1"/>
-+        <selectOption selector="{{AdminCatalogSearchTermNewSection.displayInSuggestedTerm}}" userInput="{{searchTerm.display_in_suggested_term}}" stepKey="selectDisplayInSuggestedTerms1"/>
-+
-+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="clickOnSaveButton1"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml
-new file mode 100644
-index 00000000000..e0b3d4b850b
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Filter by search query and select -->
-+    <actionGroup name="searchTermFilterBySearchQuery">
-+        <arguments>
-+            <argument name="searchQuery" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminCatalogSearchTermIndexSection.resetFilterButton}}" stepKey="clickOnResetButton"/>
-+        <waitForPageLoad stepKey="waitForResetFilter"/>
-+        <fillField selector="{{AdminCatalogSearchTermIndexSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
-+        <click selector="{{AdminCatalogSearchTermIndexSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForSearchResultLoad"/>
-+        <checkOption selector="{{AdminCatalogSearchTermIndexSection.searchTermRowCheckboxBySearchQuery(searchQuery)}}" stepKey="checkCheckBox"/>
-+    </actionGroup>
-+
-+    <!-- Delete search term -->
-+    <actionGroup name="deleteSearchTerm">
-+        <selectOption selector="{{AdminCatalogSearchTermIndexSection.massActions}}" userInput="delete" stepKey="selectDeleteOption"/>
-+        <click selector="{{AdminCatalogSearchTermIndexSection.submit}}" stepKey="clickSubmitButton"/>
-+        <click selector="{{AdminCatalogSearchTermIndexSection.okButton}}" stepKey="clickOkButton"/>
-+        <waitForElementVisible selector="{{AdminCatalogSearchTermMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/StoreFrontSelectDropDownSearchSuggestionActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/StoreFrontSelectDropDownSearchSuggestionActionGroup.xml
-new file mode 100644
-index 00000000000..7084965297c
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/StoreFrontSelectDropDownSearchSuggestionActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StoreFrontSelectDropDownSearchSuggestionActionGroup">
-+        <arguments>
-+            <argument name="searchQuery" type="string"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" stepKey="waitForQuickSearchToBeVisible"/>
-+        <fillField  selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{searchQuery}}" stepKey="fillSearchInput"/>
-+        <waitForElementVisible selector="{{StorefrontQuickSearchSection.searchDropDownSuggestion}}" stepKey="WaitForSearchDropDownSuggestion"/>
-+        <see selector="{{StorefrontQuickSearchSection.searchDropDownSuggestion}}" userInput="{{searchQuery}}" stepKey="seeDropDownSuggestion"/>
-+        <click selector="{{StorefrontQuickSearchSection.searchDropDownName(searchQuery)}}" stepKey="clickOnSearchSuggestion"/>
-+        <waitForPageLoad stepKey="waitForSelectedProductToLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml b/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml
-new file mode 100644
-index 00000000000..8263ff99631
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="SearchTerm" type="searchTerm">
-+        <data key="query_text" unique="suffix">Query text</data>
-+        <data key="store_id">1</data>
-+        <data key="redirect" unique="suffix">http://example.com/</data>
-+        <data key="display_in_terms">0</data>
-+    </entity>
-+    <entity name="UpdatedSearchTermData1" type="searchTerm">
-+        <data key="query_text" unique="suffix">UpdatedSearchTerm</data>
-+        <data key="store_id">Default Store View</data>
-+        <data key="number_of_results">1</data>
-+        <data key="number_of_uses">20</data>
-+        <data key="redirect_url">http://example.com</data>
-+        <data key="display_in_suggested_term">No</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Search/Test/Mftf/Metadata/search_term-meta.xml b/app/code/Magento/Search/Test/Mftf/Metadata/search_term-meta.xml
-new file mode 100644
-index 00000000000..0bd2dc9be48
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Mftf/Metadata/search_term-meta.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CreateSearchTerm" dataType="searchTerm" type="create" auth="adminFormKey" url="/search/term/save/" method="POST">
-+        <field key="query_text">string</field>
-+        <field key="store_id">integer</field>
-+        <field key="redirect">string</field>
-+        <field key="display_in_terms">integer</field>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Search/Test/Mftf/Section/AdminGlobalSearchSection.xml b/app/code/Magento/Search/Test/Mftf/Section/AdminGlobalSearchSection.xml
-new file mode 100644
-index 00000000000..0ba61283548
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Mftf/Section/AdminGlobalSearchSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminGlobalSearchSection">
-+        <element name="globalSearch" type="button" selector=".search-global-label"/>
-+        <element name="globalSearchActive" type="block" selector=".search-global-field._active"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
-new file mode 100644
-index 00000000000..fcd588984c4
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontQuickSearchResultsSection">
-+        <element name="searchTextBox" type="text" selector="#search"/>
-+        <element name="searchTextBoxButton" type="button" selector="button[class='action search']" timeout="30"/>
-+        <element name="allResults" type="block" selector=".column.main"/>
-+        <element name="productLink" type="select" selector="a[class='product-item-link']" timeout="30"/>
-+        <element name="productByIndex" type="button" selector=".product-items li:nth-child({{var}}) .product-item-info" parameterized="true"/>
-+        <element name="productByName" type="button" selector="//div[contains(@class, 'product-item-info') and .//*[contains(., '{{var}}')]]" parameterized="true"/>
-+        <element name="addToCartBtn" type="button" selector="//button[contains(@class, 'tocart')]"/>
-+        <element name="messageSection" type="text" selector="div .message"/>
-+        <element name="productSpecialPrice" type="text" selector="//a[contains(text(), '{{productName}}')]/ancestor::div//span[contains(@data-price-type, 'finalPrice')]/span[contains(@class, 'price')]" parameterized="true"/>
-+        <element name="asLowAsLabel" type="text" selector=".minimal-price-link > span"/>
-+        <element name="textArea" type="text" selector="li[class='item']"/>
-+        <element name="regularPrice" type="text" selector="//span[@class='price-wrapper ']/span[@class='price']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml
-index 543725fc5fa..34379fd6d2e 100644
---- a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml
-+++ b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml
-@@ -7,9 +7,12 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontQuickSearchSection">
-         <element name="searchPhrase" type="input" selector="#search"/>
-         <element name="searchButton" type="button" selector="button.action.search" timeout="30"/>
-+        <element name="searchMiniForm" type="input" selector="#search_mini_form"/>
-+        <element name="searchDropDownSuggestion" type="text" selector="//div[@id='search_autocomplete']/ul/li/span"/>
-+        <element name="searchDropDownName" type="text" selector="//div[@id='search_autocomplete']//span[contains(., '{{searchQuery}}')]" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Search/Test/Mftf/Test/AdminGlobalSearchOnProductPageTest.xml b/app/code/Magento/Search/Test/Mftf/Test/AdminGlobalSearchOnProductPageTest.xml
-new file mode 100644
-index 00000000000..45a5f53c3e4
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Mftf/Test/AdminGlobalSearchOnProductPageTest.xml
-@@ -0,0 +1,65 @@
-+<?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="AdminGlobalSearchOnProductPageTest">
-+        <annotations>
-+            <features value="Search"/>
-+            <stories value="Backend global search"/>
-+            <title value="Admin global search on product page test"/>
-+            <description value="Admin search displays settings and content items"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-6421"/>
-+            <group value="Search"/>
-+        </annotations>
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete product -->
-+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
-+                <argument name="sku" value="{{SimpleProduct.sku}}"/>
-+            </actionGroup>
-+
-+            <!-- Delete category -->
-+            <actionGroup ref="DeleteCategory" stepKey="deleteCreatedNewRootCategory">
-+                <argument name="categoryEntity" value="_defaultCategory"/>
-+            </actionGroup>
-+
-+            <!-- Logout -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create Simple Product -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
-+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
-+            <argument name="product" value="SimpleProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="SimpleProduct"/>
-+        </actionGroup>
-+
-+        <!-- Create new category for product -->
-+        <actionGroup ref="FillNewProductCategory" stepKey="FillNewProductCategory">
-+            <argument name="categoryName" value="{{_defaultCategory.name}}"/>
-+        </actionGroup>
-+
-+        <!-- Save product form -->
-+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
-+
-+        <!-- Click on the magnifying glass to start searching -->
-+        <click selector="{{AdminGlobalSearchSection.globalSearch}}" stepKey="clickSearchBtn"/>
-+        <waitForElementVisible selector="{{AdminGlobalSearchSection.globalSearchActive}}" stepKey="waitForSearchInputVisible"/>
-+
-+        <!-- The search input is expanded and active -->
-+        <seeElement selector="{{AdminGlobalSearchSection.globalSearchActive}}" stepKey="seeActiveSearch"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml b/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml
-new file mode 100644
-index 00000000000..67ccb51bf40
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml
-@@ -0,0 +1,83 @@
-+<?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="AdminMassDeleteSearchTermEntityTest">
-+        <annotations>
-+            <features value="CatalogSearch"/>
-+            <stories value="Delete search term"/>
-+            <title value="Admin mass delete search term entity test"/>
-+            <description value="Admin should be able to Mass Delete Search Term Entity Test"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14767"/>
-+            <group value="searchFrontend"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create three search term -->
-+            <createData entity="SearchTerm" stepKey="createFirstSearchTerm"/>
-+            <createData entity="SearchTerm" stepKey="createSecondSearchTerm"/>
-+            <createData entity="SearchTerm" stepKey="createThirdSearchTerm"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to the catalog search term page -->
-+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
-+
-+        <!-- Select all created below search terms -->
-+        <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByFirstSearchQuery">
-+            <argument name="searchQuery" value="$$createFirstSearchTerm.query_text$$"/>
-+        </actionGroup>
-+        <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterBySecondSearchQuery">
-+            <argument name="searchQuery" value="$$createSecondSearchTerm.query_text$$"/>
-+        </actionGroup>
-+        <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByThirdSearchQuery">
-+            <argument name="searchQuery" value="$$createThirdSearchTerm.query_text$$"/>
-+        </actionGroup>
-+
-+        <!-- Delete created below search terms -->
-+        <actionGroup ref="deleteSearchTerm" stepKey="deleteSearchTerms"/>
-+
-+        <!-- Assert search terms are absent on the search term page -->
-+        <actionGroup ref="AssertSearchTermNotInGrid" stepKey="assertFirstSearchTermNotInGrid">
-+            <argument name="searchQuery" value="$$createFirstSearchTerm.query_text$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertSearchTermNotInGrid" stepKey="assertSecondSearchTermNotInGrid">
-+            <argument name="searchQuery" value="$$createSecondSearchTerm.query_text$$"/>
-+        </actionGroup>
-+        <actionGroup ref="AssertSearchTermNotInGrid" stepKey="assertThirdSearchTermNotInGrid">
-+            <argument name="searchQuery" value="$$createThirdSearchTerm.query_text$$"/>
-+        </actionGroup>
-+
-+        <!-- Go to storefront page -->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
-+
-+        <!-- Verify search term deletion on storefront -->
-+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="quickSearchForFirstSearchTerm">
-+            <argument name="phrase" value="$$createFirstSearchTerm.query_text$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForFirstSearchTerm"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="quickSearchForSecondSearchTerm">
-+            <argument name="phrase" value="$$createSecondSearchTerm.query_text$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForSecondSearchTerm"/>
-+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="quickSearchForThirdSearchTerm">
-+            <argument name="phrase" value="$$createThirdSearchTerm.query_text$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForThirdSearchTerm"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml
-new file mode 100644
-index 00000000000..63a861b697a
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml
-@@ -0,0 +1,80 @@
-+<?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="StorefrontVerifySearchSuggestionByProductDescriptionTest">
-+        <annotations>
-+            <stories value="Search Term"/>
-+            <title value="Create search query using product description and verify search suggestions"/>
-+            <description value="Storefront search by product description, generate search query and verify dropdown product search suggestions"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14765"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17012"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create product with description -->
-+            <createData entity="SimpleProductWithDescription" stepKey="simpleProduct"/>
-+        </before>
-+        <after>
-+             <!--Delete create product -->
-+            <deleteData createDataKey="simpleProduct"  stepKey="deleteProduct"/>
-+
-+             <!--Go to the catalog search term page -->
-+            <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-+            <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
-+
-+            <!--Filter the search term -->
-+            <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByThirdSearchQuery">
-+                <argument name="searchQuery" value="{{ApiProductDescription.value}}"/>
-+            </actionGroup>
-+
-+            <!-- Delete created below search terms -->
-+            <actionGroup ref="deleteSearchTerm" stepKey="deleteSearchTerms"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to storefront home page -->
-+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage"/>
-+
-+         <!--Storefront quick search by  product name -->
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName">
-+            <argument name="phrase" value="{{ApiProductDescription.value}}"/>
-+        </actionGroup>
-+
-+        <!--Verify search suggestions and select the suggestion from dropdown options -->
-+        <actionGroup ref="StoreFrontSelectDropDownSearchSuggestionActionGroup" stepKey="seeDropDownSearchSuggestion">
-+            <argument name="searchQuery" value="{{ApiProductDescription.value}}"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product storefront main page -->
-+        <actionGroup ref="StorefrontAssertProductNameOnProductMainPageActionGroup" stepKey="seeProductName">
-+            <argument name="productName" value="$$simpleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!--Go to the catalog search term page -->
-+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
-+
-+        <!--Filter the search term -->
-+        <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByThirdSearchQuery">
-+            <argument name="searchQuery" value="{{ApiProductDescription.value}}"/>
-+        </actionGroup>
-+
-+        <!--Assert Search Term in grid -->
-+        <see stepKey="seeSearchTermInGrid" selector="{{AdminCatalogSearchTermIndexSection.gridRow}}" userInput="{{ApiProductDescription.value}}" />
-+        <see selector="{{AdminCatalogSearchTermIndexSection.numberOfSearchTermResults}}"  userInput="1"  stepKey="seeNumberOfSearchTermResultInGrid"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml
-new file mode 100644
-index 00000000000..119faef9f2f
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml
-@@ -0,0 +1,63 @@
-+<?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="StorefrontVerifySearchSuggestionByProductNameTest">
-+        <annotations>
-+            <stories value="Search Term"/>
-+            <title value="Create search query using product name and verify search suggestions"/>
-+            <description value="Storefront search by product name and verify dropdown product search suggestions"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14763"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!--Create Simple Product -->
-+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
-+        </before>
-+        <after>
-+            <!-- Delete create product -->
-+            <deleteData createDataKey="simpleProduct"  stepKey="deleteProduct"/>
-+
-+            <!-- Go to the catalog search term page -->
-+            <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-+            <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
-+
-+            <!--Filter the search term -->
-+            <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByThirdSearchQuery">
-+                <argument name="searchQuery" value="$$simpleProduct.name$$"/>
-+            </actionGroup>
-+            <!-- Delete created below search terms -->
-+            <actionGroup ref="deleteSearchTerm" stepKey="deleteSearchTerms"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to storefront home page -->
-+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage"/>
-+
-+         <!--Storefront quick search by  product name -->
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName">
-+            <argument name="phrase" value="$$simpleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!--Verify search suggestions and select the suggestion from dropdown options -->
-+        <actionGroup ref="StoreFrontSelectDropDownSearchSuggestionActionGroup" stepKey="seeDropDownSearchSuggestion">
-+            <argument name="searchQuery" value="$$simpleProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product storefront main page -->
-+        <actionGroup ref="StorefrontAssertProductNameOnProductMainPageActionGroup" stepKey="seeProductName">
-+            <argument name="productName" value="$$simpleProduct.name$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml
-new file mode 100644
-index 00000000000..ca48fb8565c
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml
-@@ -0,0 +1,65 @@
-+<?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="StorefrontVerifySearchSuggestionByProductShortDescriptionTest">
-+        <annotations>
-+            <stories value="Search Term"/>
-+            <title value="Create search query using product short description and verify search suggestions"/>
-+            <description value="Storefront search by product short description, generate search query and verify dropdown product search suggestions"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14766"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Create product with short description -->
-+            <createData entity="ApiProductWithDescription" stepKey="product"/>
-+        </before>
-+        <after>
-+
-+             <!--Delete create product -->
-+            <deleteData createDataKey="product"  stepKey="deleteProduct"/>
-+
-+             <!--Go to the catalog search term page -->
-+            <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-+            <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
-+
-+            <!--Filter the search term -->
-+            <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByThirdSearchQuery">
-+                <argument name="searchQuery" value="{{ApiProductShortDescription.value}}"/>
-+            </actionGroup>
-+
-+            <!-- Delete created below search terms -->
-+            <actionGroup ref="deleteSearchTerm" stepKey="deleteSearchTerms"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to storefront home page -->
-+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage"/>
-+
-+         <!--Storefront quick search by  product name -->
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName">
-+            <argument name="phrase" value="{{ApiProductShortDescription.value}}"/>
-+        </actionGroup>
-+
-+        <!--Verify search suggestions and select the suggestion from dropdown options -->
-+        <actionGroup ref="StoreFrontSelectDropDownSearchSuggestionActionGroup" stepKey="seeDropDownSearchSuggestion">
-+            <argument name="searchQuery" value="{{ApiProductShortDescription.value}}"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product storefront main page -->
-+        <actionGroup ref="StorefrontAssertProductNameOnProductMainPageActionGroup" stepKey="seeProductName">
-+            <argument name="productName" value="$$product.name$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml
-new file mode 100644
-index 00000000000..6033ea8dee2
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml
-@@ -0,0 +1,65 @@
-+<?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="StorefrontVerifySearchSuggestionByProductSkuTest">
-+        <annotations>
-+            <stories value="Search Term"/>
-+            <title value="Create search query using product sku and verify search suggestions"/>
-+            <description value="Storefront search by product sku, generate search query and verify dropdown product search suggestions"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14764"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!--Create Simple Product -->
-+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
-+        </before>
-+        <after>
-+
-+            <!-- Delete create product -->
-+            <deleteData createDataKey="simpleProduct"  stepKey="deleteProduct"/>
-+
-+            <!-- Go to the catalog search term page -->
-+            <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-+            <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
-+
-+            <!--Filter the search term -->
-+            <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByThirdSearchQuery">
-+                <argument name="searchQuery" value="$$simpleProduct.sku$$"/>
-+            </actionGroup>
-+
-+            <!-- Delete created below search terms -->
-+            <actionGroup ref="deleteSearchTerm" stepKey="deleteSearchTerms"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to storefront home page -->
-+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage"/>
-+
-+         <!--Storefront quick search by  product name -->
-+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName">
-+            <argument name="phrase" value="$$simpleProduct.sku$$"/>
-+        </actionGroup>
-+
-+        <!--Verify search suggestions and select the suggestion from dropdown options -->
-+        <actionGroup ref="StoreFrontSelectDropDownSearchSuggestionActionGroup" stepKey="seeDropDownSearchSuggestion">
-+            <argument name="searchQuery" value="$$simpleProduct.sku$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert Product storefront main page -->
-+        <actionGroup ref="StorefrontAssertProductNameOnProductMainPageActionGroup" stepKey="seeProductName">
-+            <argument name="productName" value="$$simpleProduct.name$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Search/Test/Unit/Model/PopularSearchTermsTest.php b/app/code/Magento/Search/Test/Unit/Model/PopularSearchTermsTest.php
-new file mode 100644
-index 00000000000..849a0c067d4
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Unit/Model/PopularSearchTermsTest.php
-@@ -0,0 +1,95 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Search\Test\Unit\Model;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Search\Model\PopularSearchTerms;
-+use Magento\Search\Model\ResourceModel\Query\Collection;
-+use Magento\Store\Model\ScopeInterface;
-+
-+/**
-+ * @covers \Magento\Search\Model\PopularSearchTerms
-+ */
-+class PopularSearchTermsTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Testable Object
-+     *
-+     * @var PopularSearchTerms
-+     */
-+    private $popularSearchTerms;
-+
-+    /**
-+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $scopeConfigMock;
-+
-+    /**
-+     * @var Collection|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $queryCollectionMock;
-+
-+    /**
-+     * Set Up
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
-+        $this->queryCollectionMock = $this->createMock(Collection::class);
-+        $this->popularSearchTerms = new PopularSearchTerms($this->scopeConfigMock, $this->queryCollectionMock);
-+    }
-+
-+    /**
-+     * Test isCacheableDataProvider method
-+     *
-+     * @dataProvider isCacheableDataProvider
-+     *
-+     * @param string $term
-+     * @param array $terms
-+     * @param $expected $terms
-+     *
-+     * @return void
-+     */
-+    public function testIsCacheable($term, $terms, $expected)
-+    {
-+        $storeId = 7;
-+        $pageSize = 25;
-+
-+        $this->scopeConfigMock->expects($this->once())->method('getValue')
-+            ->with(
-+                PopularSearchTerms::XML_PATH_MAX_COUNT_CACHEABLE_SEARCH_TERMS,
-+                ScopeInterface::SCOPE_STORE,
-+                $storeId
-+            )->willReturn($pageSize);
-+        $this->queryCollectionMock->expects($this->once())->method('setPopularQueryFilter')->with($storeId)
-+            ->willReturnSelf();
-+        $this->queryCollectionMock->expects($this->once())->method('setPageSize')->with($pageSize)
-+            ->willReturnSelf();
-+        $this->queryCollectionMock->expects($this->once())->method('load')->willReturnSelf();
-+        $this->queryCollectionMock->expects($this->once())->method('getColumnValues')->with('query_text')
-+            ->willReturn($terms);
-+
-+        $actual = $this->popularSearchTerms->isCacheable($term, $storeId);
-+        self::assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isCacheableDataProvider()
-+    {
-+        return [
-+            ['test01', [], false],
-+            ['test02', ['test01', 'test02'], true],
-+            ['test03', ['test01', 'test02'], false],
-+            ['test04', ['test04'], true],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php b/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php
-new file mode 100644
-index 00000000000..982d00bd9f6
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php
-@@ -0,0 +1,61 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Search\Test\Unit\Model\Search;
-+
-+use Magento\Search\Model\Search\PageSizeProvider;
-+
-+class PageSizeProviderTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var PageSizeProvider
-+     */
-+    private $model;
-+
-+    /**
-+     * @var \Magento\Search\Model\EngineResolver|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $pageSizeBySearchEngineMock;
-+
-+    public function setUp()
-+    {
-+        $this->pageSizeBySearchEngineMock = $this->getMockBuilder(\Magento\Search\Model\EngineResolver::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->model = new PageSizeProvider(
-+
-+            $this->pageSizeBySearchEngineMock,
-+            ['search' => 10,
-+                'catalogSearch3' => 11
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @param string $searchEngine
-+     * @param int $size
-+     * @dataProvider getPageSizeDataProvider
-+     */
-+    public function testGetPageSize($searchEngine, $size)
-+    {
-+        $this->pageSizeBySearchEngineMock
-+            ->expects($this->once())
-+            ->method('getCurrentSearchEngine')
-+            ->willReturn($searchEngine);
-+        $this->assertEquals($size, $this->model->getMaxPageSize());
-+    }
-+
-+    public function getPageSizeDataProvider()
-+    {
-+        return [
-+            ['search', 10],
-+            ['catalogSearch3', 11],
-+            ['newSearch', PHP_INT_MAX]
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Search/Test/Unit/Model/SearchEngine/MenuBuilderTest.php b/app/code/Magento/Search/Test/Unit/Model/SearchEngine/MenuBuilderTest.php
-deleted file mode 100644
-index c8c521c200e..00000000000
---- a/app/code/Magento/Search/Test/Unit/Model/SearchEngine/MenuBuilderTest.php
-+++ /dev/null
-@@ -1,61 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Search\Test\Unit\Model\SearchEngine;
--
--use Magento\Framework\Search\EngineResolverInterface;
--use Magento\Framework\Search\SearchEngine\ConfigInterface;
--
--/**
-- * Class MenuBuilderTest. A unit test class to test functionality of
-- * Magento\Search\Model\SearchEngine\MenuBuilder class
-- */
--class MenuBuilderTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $searchFeatureConfig;
--
--    /**
--     * @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $engineResolver;
--
--    protected function setUp()
--    {
--        $this->searchFeatureConfig = $this->createMock(\Magento\Search\Model\SearchEngine\Config::class);
--        $this->engineResolver = $this->createMock(EngineResolverInterface::class);
--    }
--
--    public function testAfterGetResult()
--    {
--        $this->engineResolver->expects($this->once())->method('getCurrentSearchEngine')->willReturn('mysql');
--        $this->searchFeatureConfig
--            ->expects($this->once())
--            ->method('isFeatureSupported')
--            ->with('synonyms', 'mysql')
--            ->willReturn(false);
--        /** @var \Magento\Backend\Model\Menu $menu */
--        $menu = $this->createMock(\Magento\Backend\Model\Menu::class);
--        $menu->expects($this->once())->method('remove')->willReturn(true);
--
--        /** @var \Magento\Backend\Model\Menu\Builder $menuBuilder */
--        $menuBuilder = $this->createMock(\Magento\Backend\Model\Menu\Builder::class);
--        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--        /** @var \Magento\Search\Model\SearchEngine\MenuBuilder $searchMenuBuilder */
--        $searchMenuBuilder = $objectManager->getObject(
--            \Magento\Search\Model\SearchEngine\MenuBuilder::class,
--            [
--                'searchFeatureConfig' => $this->searchFeatureConfig,
--                'engineResolver' => $this->engineResolver
--            ]
--        );
--        $this->assertInstanceOf(
--            \Magento\Backend\Model\Menu::class,
--            $searchMenuBuilder->afterGetResult($menuBuilder, $menu)
--        );
--    }
--}
-diff --git a/app/code/Magento/Search/Test/Unit/Model/SynonymAnalyzerTest.php b/app/code/Magento/Search/Test/Unit/Model/SynonymAnalyzerTest.php
-new file mode 100644
-index 00000000000..c452ab506a1
---- /dev/null
-+++ b/app/code/Magento/Search/Test/Unit/Model/SynonymAnalyzerTest.php
-@@ -0,0 +1,88 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Search\Test\Unit\Model;
-+
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+
-+/**
-+ * Class SynonymAnalyzerTest
-+ */
-+class SynonymAnalyzerTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Search\Model\SynonymAnalyzer
-+     */
-+    private $synonymAnalyzer;
-+
-+    /**
-+     * @var \Magento\Search\Model\SynonymReader |\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $synReaderModel;
-+
-+    /**
-+     * Test set up
-+     */
-+    protected function setUp()
-+    {
-+        $helper = new ObjectManager($this);
-+
-+        $this->synReaderModel = $this->getMockBuilder(\Magento\Search\Model\SynonymReader::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->synonymAnalyzer = $helper->getObject(
-+            \Magento\Search\Model\SynonymAnalyzer::class,
-+            [
-+                'synReader' => $this->synReaderModel,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @test
-+     */
-+    public function testGetSynonymsForPhrase()
-+    {
-+        $phrase = 'Elizabeth is the british queen';
-+        $expected = [
-+            0 => [ 0 => "Elizabeth" ],
-+            1 => [ 0 => "is" ],
-+            2 => [ 0 => "the" ],
-+            3 => [ 0 => "british", 1 => "english" ],
-+            4 => [ 0 => "queen", 1 => "monarch" ],
-+        ];
-+        $this->synReaderModel->expects($this->once())
-+            ->method('loadByPhrase')
-+            ->with($phrase)
-+            ->willReturnSelf()
-+        ;
-+        $this->synReaderModel->expects($this->once())
-+            ->method('getData')
-+            ->willReturn([
-+                ['synonyms' => 'british,english'],
-+                ['synonyms' => 'queen,monarch'],
-+            ])
-+        ;
-+
-+        $actual = $this->synonymAnalyzer->getSynonymsForPhrase($phrase);
-+        $this->assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * @test
-+     *
-+     * Empty phrase scenario
-+     */
-+    public function testGetSynonymsForPhraseEmptyPhrase()
-+    {
-+        $phrase = '';
-+        $expected = [];
-+        $actual = $this->synonymAnalyzer->getSynonymsForPhrase($phrase);
-+        $this->assertEquals($expected, $actual);
-+    }
-+}
-diff --git a/app/code/Magento/Search/Test/Unit/Model/SynonymGroupRepositoryTest.php b/app/code/Magento/Search/Test/Unit/Model/SynonymGroupRepositoryTest.php
-index f62c07b149c..4532479c482 100644
---- a/app/code/Magento/Search/Test/Unit/Model/SynonymGroupRepositoryTest.php
-+++ b/app/code/Magento/Search/Test/Unit/Model/SynonymGroupRepositoryTest.php
-@@ -53,7 +53,7 @@ class SynonymGroupRepositoryTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Magento\Search\Model\Synonym\MergeConflictException
--     * @expecteExceptionMessage (c,d,e)
-+     * @expectedExceptionMessage Merge conflict with existing synonym group(s): (a,b,c)
-      */
-     public function testSaveCreateMergeConflict()
-     {
-@@ -138,7 +138,7 @@ class SynonymGroupRepositoryTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Magento\Search\Model\Synonym\MergeConflictException
--     * @expecteExceptionMessage (d,h,i)
-+     * @expectedExceptionMessage (d,h,i)
-      */
-     public function testSaveUpdateMergeConflict()
-     {
-diff --git a/app/code/Magento/Search/etc/db_schema.xml b/app/code/Magento/Search/etc/db_schema.xml
-index 9b2dfb493db..754af7d246d 100644
---- a/app/code/Magento/Search/etc/db_schema.xml
-+++ b/app/code/Magento/Search/etc/db_schema.xml
-@@ -26,24 +26,24 @@
-                 default="0" comment="Processed status"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
-                 comment="Updated at"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="query_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SEARCH_QUERY_STORE_ID_STORE_STORE_ID" table="search_query"
-+        <constraint xsi:type="foreign" referenceId="SEARCH_QUERY_STORE_ID_STORE_STORE_ID" table="search_query"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="SEARCH_QUERY_QUERY_TEXT_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="SEARCH_QUERY_QUERY_TEXT_STORE_ID">
-             <column name="query_text"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="SEARCH_QUERY_QUERY_TEXT_STORE_ID_POPULARITY" indexType="btree">
-+        <index referenceId="SEARCH_QUERY_QUERY_TEXT_STORE_ID_POPULARITY" indexType="btree">
-             <column name="query_text"/>
-             <column name="store_id"/>
-             <column name="popularity"/>
-         </index>
--        <index name="SEARCH_QUERY_STORE_ID" indexType="btree">
-+        <index referenceId="SEARCH_QUERY_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SEARCH_QUERY_IS_PROCESSED" indexType="btree">
-+        <index referenceId="SEARCH_QUERY_IS_PROCESSED" indexType="btree">
-             <column name="is_processed"/>
-         </index>
-     </table>
-@@ -55,21 +55,21 @@
-                 default="0" comment="Store Id - identifies the store view these synonyms belong to"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Website Id - identifies the website id these synonyms belong to"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="group_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SEARCH_SYNONYMS_STORE_ID_STORE_STORE_ID" table="search_synonyms"
-+        <constraint xsi:type="foreign" referenceId="SEARCH_SYNONYMS_STORE_ID_STORE_STORE_ID" table="search_synonyms"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="SEARCH_SYNONYMS_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-+        <constraint xsi:type="foreign" referenceId="SEARCH_SYNONYMS_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
-                     table="search_synonyms" column="website_id" referenceTable="store_website"
-                     referenceColumn="website_id" onDelete="CASCADE"/>
--        <index name="SEARCH_SYNONYMS_SYNONYMS" indexType="fulltext">
-+        <index referenceId="SEARCH_SYNONYMS_SYNONYMS" indexType="fulltext">
-             <column name="synonyms"/>
-         </index>
--        <index name="SEARCH_SYNONYMS_STORE_ID" indexType="btree">
-+        <index referenceId="SEARCH_SYNONYMS_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
--        <index name="SEARCH_SYNONYMS_WEBSITE_ID" indexType="btree">
-+        <index referenceId="SEARCH_SYNONYMS_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Search/etc/di.xml b/app/code/Magento/Search/etc/di.xml
-index 0897dcfb190..4aa211d23f0 100755
---- a/app/code/Magento/Search/etc/di.xml
-+++ b/app/code/Magento/Search/etc/di.xml
-@@ -86,7 +86,4 @@
-             <argument name="dataStorage" xsi:type="object">Magento\Search\Model\SearchEngine\Config\Data</argument>
-         </arguments>
-     </type>
--    <type name="Magento\Backend\Model\Menu\Builder">
--        <plugin name="SearchTermMenuBuilder" type="Magento\Search\Model\SearchEngine\MenuBuilder" />
--    </type>
- </config>
-diff --git a/app/code/Magento/Search/i18n/de_DE.csv b/app/code/Magento/Search/i18n/de_DE.csv
-deleted file mode 100644
-index 8b4b04aa3b9..00000000000
---- a/app/code/Magento/Search/i18n/de_DE.csv
-+++ /dev/null
-@@ -1 +0,0 @@
--"Search Engine","Search Engine"
-diff --git a/app/code/Magento/Search/i18n/es_ES.csv b/app/code/Magento/Search/i18n/es_ES.csv
-deleted file mode 100644
-index 8b4b04aa3b9..00000000000
---- a/app/code/Magento/Search/i18n/es_ES.csv
-+++ /dev/null
-@@ -1 +0,0 @@
--"Search Engine","Search Engine"
-diff --git a/app/code/Magento/Search/i18n/fr_FR.csv b/app/code/Magento/Search/i18n/fr_FR.csv
-deleted file mode 100644
-index 8b4b04aa3b9..00000000000
---- a/app/code/Magento/Search/i18n/fr_FR.csv
-+++ /dev/null
-@@ -1 +0,0 @@
--"Search Engine","Search Engine"
-diff --git a/app/code/Magento/Search/i18n/nl_NL.csv b/app/code/Magento/Search/i18n/nl_NL.csv
-deleted file mode 100644
-index 8b4b04aa3b9..00000000000
---- a/app/code/Magento/Search/i18n/nl_NL.csv
-+++ /dev/null
-@@ -1 +0,0 @@
--"Search Engine","Search Engine"
-diff --git a/app/code/Magento/Search/i18n/pt_BR.csv b/app/code/Magento/Search/i18n/pt_BR.csv
-deleted file mode 100644
-index c10566a7c98..00000000000
---- a/app/code/Magento/Search/i18n/pt_BR.csv
-+++ /dev/null
-@@ -1 +0,0 @@
--"Search Engine","Mecanismo de Busca"
-diff --git a/app/code/Magento/Search/i18n/zh_Hans_CN.csv b/app/code/Magento/Search/i18n/zh_Hans_CN.csv
-deleted file mode 100644
-index 8b4b04aa3b9..00000000000
---- a/app/code/Magento/Search/i18n/zh_Hans_CN.csv
-+++ /dev/null
-@@ -1 +0,0 @@
--"Search Engine","Search Engine"
-diff --git a/app/code/Magento/Search/view/adminhtml/layout/search_term_block.xml b/app/code/Magento/Search/view/adminhtml/layout/search_term_block.xml
-index cc2e1509e44..9dc60bde113 100644
---- a/app/code/Magento/Search/view/adminhtml/layout/search_term_block.xml
-+++ b/app/code/Magento/Search/view/adminhtml/layout/search_term_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.report.search.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">searchReportGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Search\Model\ResourceModel\Query\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Search\Model\ResourceModel\Query\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">query_id</argument>
-                     <argument name="default_dir" xsi:type="string">DESC</argument>
-                 </arguments>
-diff --git a/app/code/Magento/Search/view/adminhtml/layout/search_term_grid_block.xml b/app/code/Magento/Search/view/adminhtml/layout/search_term_grid_block.xml
-index 7330ac1f927..38c6fa52455 100644
---- a/app/code/Magento/Search/view/adminhtml/layout/search_term_grid_block.xml
-+++ b/app/code/Magento/Search/view/adminhtml/layout/search_term_grid_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.catalog.search.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">search_term_grid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Search\Model\ResourceModel\Query\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Search\Model\ResourceModel\Query\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">name</argument>
-                     <argument name="default_dir" xsi:type="string">ASC</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-diff --git a/app/code/Magento/Search/view/adminhtml/layout/search_term_report_block.xml b/app/code/Magento/Search/view/adminhtml/layout/search_term_report_block.xml
-index b6b1455cf27..f4c5d1ab85a 100644
---- a/app/code/Magento/Search/view/adminhtml/layout/search_term_report_block.xml
-+++ b/app/code/Magento/Search/view/adminhtml/layout/search_term_report_block.xml
-@@ -12,7 +12,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.report.search.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">searchReportGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Search\Model\ResourceModel\Query\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Search\Model\ResourceModel\Query\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">query_id</argument>
-                     <argument name="default_dir" xsi:type="string">DESC</argument>
-                 </arguments>
-diff --git a/app/code/Magento/Search/view/adminhtml/ui_component/search_synonyms_form.xml b/app/code/Magento/Search/view/adminhtml/ui_component/search_synonyms_form.xml
-index 9194bd5f741..09e5149004f 100644
---- a/app/code/Magento/Search/view/adminhtml/ui_component/search_synonyms_form.xml
-+++ b/app/code/Magento/Search/view/adminhtml/ui_component/search_synonyms_form.xml
-@@ -72,7 +72,7 @@
-                 </validation>
-                 <dataType>int</dataType>
-                 <tooltip>
--                    <link>http://docs.magento.com/m2/ce/user_guide/stores/websites-stores-views.html</link>
-+                    <link>https://docs.magento.com/m2/ce/user_guide/stores/websites-stores-views.html</link>
-                     <description translate="true">You can adjust the scope of this synonym group by selecting an option from the list.</description>
-                 </tooltip>
-                 <label translate="true">Scope</label>
-diff --git a/app/code/Magento/Search/view/frontend/requirejs-config.js b/app/code/Magento/Search/view/frontend/requirejs-config.js
-index c38cba4315e..d945944daa1 100644
---- a/app/code/Magento/Search/view/frontend/requirejs-config.js
-+++ b/app/code/Magento/Search/view/frontend/requirejs-config.js
-@@ -6,7 +6,8 @@
- var config = {
-     map: {
-         '*': {
--            quickSearch: 'Magento_Search/form-mini'
-+            quickSearch: 'Magento_Search/js/form-mini',
-+            'Magento_Search/form-mini': 'Magento_Search/js/form-mini'
-         }
-     }
- };
-diff --git a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
-index 2ea87be13d5..766dd4d992b 100644
---- a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
-+++ b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php
- /** @var $block \Magento\Framework\View\Element\Template */
-@@ -12,39 +12,42 @@
- $helper = $this->helper(\Magento\Search\Helper\Data::class);
- ?>
- <div class="block block-search">
--    <div class="block block-title"><strong><?= /* @escapeNotVerified */ __('Search') ?></strong></div>
-+    <div class="block block-title"><strong><?= $block->escapeHtml(__('Search')) ?></strong></div>
-     <div class="block block-content">
--        <form class="form minisearch" id="search_mini_form" action="<?= /* @escapeNotVerified */ $helper->getResultUrl() ?>" method="get">
-+        <form class="form minisearch" id="search_mini_form" action="<?= $block->escapeUrl($helper->getResultUrl()) ?>" method="get">
-             <div class="field search">
-                 <label class="label" for="search" data-role="minisearch-label">
--                    <span><?= /* @escapeNotVerified */ __('Search') ?></span>
-+                    <span><?= $block->escapeHtml(__('Search')) ?></span>
-                 </label>
-                 <div class="control">
-                     <input id="search"
-                            data-mage-init='{"quickSearch":{
-                                 "formSelector":"#search_mini_form",
--                                "url":"<?= /* @escapeNotVerified */ $helper->getSuggestUrl()?>",
-+                                "url":"<?= $block->escapeUrl($helper->getSuggestUrl())?>",
-                                 "destinationSelector":"#search_autocomplete"}
-                            }'
-                            type="text"
--                           name="<?= /* @escapeNotVerified */ $helper->getQueryParamName() ?>"
--                           value="<?= /* @escapeNotVerified */ $helper->getEscapedQueryText() ?>"
--                           placeholder="<?= /* @escapeNotVerified */ __('Search entire store here...') ?>"
-+                           name="<?= $block->escapeHtmlAttr($helper->getQueryParamName()) ?>"
-+                           value="<?= $block->escapeHtmlAttr($helper->getEscapedQueryText()) ?>"
-+                           placeholder="<?= $block->escapeHtmlAttr(__('Search entire store here...')) ?>"
-                            class="input-text"
--                           maxlength="<?= /* @escapeNotVerified */ $helper->getMaxQueryLength() ?>"
-+                           maxlength="<?= $block->escapeHtmlAttr($helper->getMaxQueryLength()) ?>"
-                            role="combobox"
-                            aria-haspopup="false"
-                            aria-autocomplete="both"
--                           autocomplete="off"/>
-+                           autocomplete="off"
-+                           aria-expanded="false"/>
-                     <div id="search_autocomplete" class="search-autocomplete"></div>
-                     <?= $block->getChildHtml() ?>
-                 </div>
-             </div>
-             <div class="actions">
-                 <button type="submit"
--                        title="<?= $block->escapeHtml(__('Search')) ?>"
--                        class="action search">
--                    <span><?= /* @escapeNotVerified */ __('Search') ?></span>
-+                    title="<?= $block->escapeHtml(__('Search')) ?>"
-+                    class="action search"
-+                    aria-label="Search"
-+                >
-+                    <span><?= $block->escapeHtml(__('Search')) ?></span>
-                 </button>
-             </div>
-         </form>
-diff --git a/app/code/Magento/Search/view/frontend/templates/term.phtml b/app/code/Magento/Search/view/frontend/templates/term.phtml
-index 1ffcc493147..b06ebcfe669 100644
---- a/app/code/Magento/Search/view/frontend/templates/term.phtml
-+++ b/app/code/Magento/Search/view/frontend/templates/term.phtml
-@@ -3,23 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if (sizeof($block->getTerms()) > 0): ?>
-+<?php if (count($block->getTerms()) > 0) : ?>
-     <ul class="search-terms">
--        <?php foreach ($block->getTerms() as $_term): ?>
-+        <?php foreach ($block->getTerms() as $_term) : ?>
-             <li class="item">
--                <a href="<?= /* @escapeNotVerified */ $block->getSearchUrl($_term) ?>"
--                   style="font-size:<?= /* @escapeNotVerified */ $_term->getRatio()*70+75 ?>%;">
-+                <a href="<?= $block->escapeUrl($block->getSearchUrl($_term)) ?>"
-+                   style="font-size:<?= /* @noEscape */ $_term->getRatio()*70+75 ?>%;">
-                     <?= $block->escapeHtml($_term->getQueryText()) ?>
-                 </a>
-             </li>
-         <?php endforeach; ?>
-     </ul>
--<?php else: ?>
-+<?php else : ?>
-     <div class="message notice">
--        <div><?= /* @escapeNotVerified */ __('There are no search terms available.') ?></div>
-+        <div><?= $block->escapeHtml(__('There are no search terms available.')) ?></div>
-     </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/form-mini.js
-deleted file mode 100644
-index 27a15017cb3..00000000000
---- a/app/code/Magento/Search/view/frontend/web/form-mini.js
-+++ /dev/null
-@@ -1,351 +0,0 @@
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--/**
-- * @api
-- */
--define([
--    'jquery',
--    'underscore',
--    'mage/template',
--    'matchMedia',
--    'jquery/ui',
--    'mage/translate'
--], function ($, _, mageTemplate, mediaCheck) {
--    'use strict';
--
--    /**
--     * Check whether the incoming string is not empty or if doesn't consist of spaces.
--     *
--     * @param {String} value - Value to check.
--     * @returns {Boolean}
--     */
--    function isEmpty(value) {
--        return value.length === 0 || value == null || /^\s+$/.test(value);
--    }
--
--    $.widget('mage.quickSearch', {
--        options: {
--            autocomplete: 'off',
--            minSearchLength: 2,
--            responseFieldElements: 'ul li',
--            selectClass: 'selected',
--            template:
--                '<li class="<%- data.row_class %>" id="qs-option-<%- data.index %>" role="option">' +
--                    '<span class="qs-option-name">' +
--                       ' <%- data.title %>' +
--                    '</span>' +
--                    '<span aria-hidden="true" class="amount">' +
--                        '<%- data.num_results %>' +
--                    '</span>' +
--                '</li>',
--            submitBtn: 'button[type="submit"]',
--            searchLabel: '[data-role=minisearch-label]',
--            isExpandable: null
--        },
--
--        /** @inheritdoc */
--        _create: function () {
--            this.responseList = {
--                indexList: null,
--                selected: null
--            };
--            this.autoComplete = $(this.options.destinationSelector);
--            this.searchForm = $(this.options.formSelector);
--            this.submitBtn = this.searchForm.find(this.options.submitBtn)[0];
--            this.searchLabel = this.searchForm.find(this.options.searchLabel);
--            this.isExpandable = this.options.isExpandable;
--
--            _.bindAll(this, '_onKeyDown', '_onPropertyChange', '_onSubmit');
--
--            this.submitBtn.disabled = true;
--
--            this.element.attr('autocomplete', this.options.autocomplete);
--
--            mediaCheck({
--                media: '(max-width: 768px)',
--                entry: function () {
--                    this.isExpandable = true;
--                }.bind(this),
--                exit: function () {
--                    this.isExpandable = false;
--                    this.element.removeAttr('aria-expanded');
--                }.bind(this)
--            });
--
--            this.searchLabel.on('click', function (e) {
--                // allow input to lose its' focus when clicking on label
--                if (this.isExpandable && this.isActive()) {
--                    e.preventDefault();
--                }
--            }.bind(this));
--
--            this.element.on('blur', $.proxy(function () {
--                if (!this.searchLabel.hasClass('active')) {
--                    return;
--                }
--
--                setTimeout($.proxy(function () {
--                    if (this.autoComplete.is(':hidden')) {
--                        this.setActiveState(false);
--                    } else {
--                        this.element.trigger('focus');
--                    }
--                    this.autoComplete.hide();
--                    this._updateAriaHasPopup(false);
--                }, this), 250);
--            }, this));
--
--            if (this.element.get(0) === document.activeElement) {
--                this.setActiveState(true);
--            }
--
--            this.element.on('focus', this.setActiveState.bind(this, true));
--            this.element.on('keydown', this._onKeyDown);
--            this.element.on('input propertychange', this._onPropertyChange);
--
--            this.searchForm.on('submit', $.proxy(function (e) {
--                this._onSubmit(e);
--                this._updateAriaHasPopup(false);
--            }, this));
--        },
--
--        /**
--         * Checks if search field is active.
--         *
--         * @returns {Boolean}
--         */
--        isActive: function () {
--            return this.searchLabel.hasClass('active');
--        },
--
--        /**
--         * Sets state of the search field to provided value.
--         *
--         * @param {Boolean} isActive
--         */
--        setActiveState: function (isActive) {
--            this.searchForm.toggleClass('active', isActive);
--            this.searchLabel.toggleClass('active', isActive);
--
--            if (this.isExpandable) {
--                this.element.attr('aria-expanded', isActive);
--            }
--        },
--
--        /**
--         * @private
--         * @return {Element} The first element in the suggestion list.
--         */
--        _getFirstVisibleElement: function () {
--            return this.responseList.indexList ? this.responseList.indexList.first() : false;
--        },
--
--        /**
--         * @private
--         * @return {Element} The last element in the suggestion list.
--         */
--        _getLastElement: function () {
--            return this.responseList.indexList ? this.responseList.indexList.last() : false;
--        },
--
--        /**
--         * @private
--         * @param {Boolean} show - Set attribute aria-haspopup to "true/false" for element.
--         */
--        _updateAriaHasPopup: function (show) {
--            if (show) {
--                this.element.attr('aria-haspopup', 'true');
--            } else {
--                this.element.attr('aria-haspopup', 'false');
--            }
--        },
--
--        /**
--         * Clears the item selected from the suggestion list and resets the suggestion list.
--         * @private
--         * @param {Boolean} all - Controls whether to clear the suggestion list.
--         */
--        _resetResponseList: function (all) {
--            this.responseList.selected = null;
--
--            if (all === true) {
--                this.responseList.indexList = null;
--            }
--        },
--
--        /**
--         * Executes when the search box is submitted. Sets the search input field to the
--         * value of the selected item.
--         * @private
--         * @param {Event} e - The submit event
--         */
--        _onSubmit: function (e) {
--            var value = this.element.val();
--
--            if (isEmpty(value)) {
--                e.preventDefault();
--            }
--
--            if (this.responseList.selected) {
--                this.element.val(this.responseList.selected.find('.qs-option-name').text());
--            }
--        },
--
--        /**
--         * Executes when keys are pressed in the search input field. Performs specific actions
--         * depending on which keys are pressed.
--         * @private
--         * @param {Event} e - The key down event
--         * @return {Boolean} Default return type for any unhandled keys
--         */
--        _onKeyDown: function (e) {
--            var keyCode = e.keyCode || e.which;
--
--            switch (keyCode) {
--                case $.ui.keyCode.HOME:
--                    if (this._getFirstVisibleElement()) {
--                        this._getFirstVisibleElement().addClass(this.options.selectClass);
--                        this.responseList.selected = this._getFirstVisibleElement();
--                    }
--                    break;
--
--                case $.ui.keyCode.END:
--                    if (this._getLastElement()) {
--                        this._getLastElement().addClass(this.options.selectClass);
--                        this.responseList.selected = this._getLastElement();
--                    }
--                    break;
--
--                case $.ui.keyCode.ESCAPE:
--                    this._resetResponseList(true);
--                    this.autoComplete.hide();
--                    break;
--
--                case $.ui.keyCode.ENTER:
--                    this.searchForm.trigger('submit');
--                    e.preventDefault();
--                    break;
--
--                case $.ui.keyCode.DOWN:
--                    if (this.responseList.indexList) {
--                        if (!this.responseList.selected) {  //eslint-disable-line max-depth
--                            this._getFirstVisibleElement().addClass(this.options.selectClass);
--                            this.responseList.selected = this._getFirstVisibleElement();
--                        } else if (!this._getLastElement().hasClass(this.options.selectClass)) {
--                            this.responseList.selected = this.responseList.selected
--                                .removeClass(this.options.selectClass).next().addClass(this.options.selectClass);
--                        } else {
--                            this.responseList.selected.removeClass(this.options.selectClass);
--                            this._getFirstVisibleElement().addClass(this.options.selectClass);
--                            this.responseList.selected = this._getFirstVisibleElement();
--                        }
--                        this.element.val(this.responseList.selected.find('.qs-option-name').text());
--                        this.element.attr('aria-activedescendant', this.responseList.selected.attr('id'));
--                    }
--                    break;
--
--                case $.ui.keyCode.UP:
--                    if (this.responseList.indexList !== null) {
--                        if (!this._getFirstVisibleElement().hasClass(this.options.selectClass)) {
--                            this.responseList.selected = this.responseList.selected
--                                .removeClass(this.options.selectClass).prev().addClass(this.options.selectClass);
--
--                        } else {
--                            this.responseList.selected.removeClass(this.options.selectClass);
--                            this._getLastElement().addClass(this.options.selectClass);
--                            this.responseList.selected = this._getLastElement();
--                        }
--                        this.element.val(this.responseList.selected.find('.qs-option-name').text());
--                        this.element.attr('aria-activedescendant', this.responseList.selected.attr('id'));
--                    }
--                    break;
--                default:
--                    return true;
--            }
--        },
--
--        /**
--         * Executes when the value of the search input field changes. Executes a GET request
--         * to populate a suggestion list based on entered text. Handles click (select), hover,
--         * and mouseout events on the populated suggestion list dropdown.
--         * @private
--         */
--        _onPropertyChange: function () {
--            var searchField = this.element,
--                clonePosition = {
--                    position: 'absolute',
--                    // Removed to fix display issues
--                    // left: searchField.offset().left,
--                    // top: searchField.offset().top + searchField.outerHeight(),
--                    width: searchField.outerWidth()
--                },
--                source = this.options.template,
--                template = mageTemplate(source),
--                dropdown = $('<ul role="listbox"></ul>'),
--                value = this.element.val();
--
--            this.submitBtn.disabled = isEmpty(value);
--
--            if (value.length >= parseInt(this.options.minSearchLength, 10)) {
--                $.getJSON(this.options.url, {
--                    q: value
--                }, $.proxy(function (data) {
--                    if (data.length) {
--                        $.each(data, function (index, element) {
--                            var html;
--
--                            element.index = index;
--                            html = template({
--                                data: element
--                            });
--                            dropdown.append(html);
--                        });
--
--                        this.responseList.indexList = this.autoComplete.html(dropdown)
--                            .css(clonePosition)
--                            .show()
--                            .find(this.options.responseFieldElements + ':visible');
--
--                        this._resetResponseList(false);
--                        this.element.removeAttr('aria-activedescendant');
--
--                        if (this.responseList.indexList.length) {
--                            this._updateAriaHasPopup(true);
--                        } else {
--                            this._updateAriaHasPopup(false);
--                        }
--
--                        this.responseList.indexList
--                            .on('click', function (e) {
--                                this.responseList.selected = $(e.currentTarget);
--                                this.searchForm.trigger('submit');
--                            }.bind(this))
--                            .on('mouseenter mouseleave', function (e) {
--                                this.responseList.indexList.removeClass(this.options.selectClass);
--                                $(e.target).addClass(this.options.selectClass);
--                                this.responseList.selected = $(e.target);
--                                this.element.attr('aria-activedescendant', $(e.target).attr('id'));
--                            }.bind(this))
--                            .on('mouseout', function (e) {
--                                if (!this._getLastElement() &&
--                                    this._getLastElement().hasClass(this.options.selectClass)) {
--                                    $(e.target).removeClass(this.options.selectClass);
--                                    this._resetResponseList(false);
--                                }
--                            }.bind(this));
--                    }
--                }, this));
--            } else {
--                this._resetResponseList(true);
--                this.autoComplete.hide();
--                this._updateAriaHasPopup(false);
--                this.element.removeAttr('aria-activedescendant');
--            }
--        }
--    });
--
--    return $.mage.quickSearch;
--});
-diff --git a/app/code/Magento/Search/view/frontend/web/js/form-mini.js b/app/code/Magento/Search/view/frontend/web/js/form-mini.js
-new file mode 100644
-index 00000000000..3f3e64738d4
---- /dev/null
-+++ b/app/code/Magento/Search/view/frontend/web/js/form-mini.js
-@@ -0,0 +1,363 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/**
-+ * @api
-+ */
-+define([
-+    'jquery',
-+    'underscore',
-+    'mage/template',
-+    'matchMedia',
-+    'jquery/ui',
-+    'mage/translate'
-+], function ($, _, mageTemplate, mediaCheck) {
-+    'use strict';
-+
-+    /**
-+     * Check whether the incoming string is not empty or if doesn't consist of spaces.
-+     *
-+     * @param {String} value - Value to check.
-+     * @returns {Boolean}
-+     */
-+    function isEmpty(value) {
-+        return value.length === 0 || value == null || /^\s+$/.test(value);
-+    }
-+
-+    $.widget('mage.quickSearch', {
-+        options: {
-+            autocomplete: 'off',
-+            minSearchLength: 2,
-+            responseFieldElements: 'ul li',
-+            selectClass: 'selected',
-+            template:
-+                '<li class="<%- data.row_class %>" id="qs-option-<%- data.index %>" role="option">' +
-+                    '<span class="qs-option-name">' +
-+                       ' <%- data.title %>' +
-+                    '</span>' +
-+                    '<span aria-hidden="true" class="amount">' +
-+                        '<%- data.num_results %>' +
-+                    '</span>' +
-+                '</li>',
-+            submitBtn: 'button[type="submit"]',
-+            searchLabel: '[data-role=minisearch-label]',
-+            isExpandable: null,
-+            suggestionDelay: 300
-+        },
-+
-+        /** @inheritdoc */
-+        _create: function () {
-+            this.responseList = {
-+                indexList: null,
-+                selected: null
-+            };
-+            this.autoComplete = $(this.options.destinationSelector);
-+            this.searchForm = $(this.options.formSelector);
-+            this.submitBtn = this.searchForm.find(this.options.submitBtn)[0];
-+            this.searchLabel = this.searchForm.find(this.options.searchLabel);
-+            this.isExpandable = this.options.isExpandable;
-+
-+            _.bindAll(this, '_onKeyDown', '_onPropertyChange', '_onSubmit');
-+
-+            this.submitBtn.disabled = true;
-+
-+            this.element.attr('autocomplete', this.options.autocomplete);
-+
-+            mediaCheck({
-+                media: '(max-width: 768px)',
-+                entry: function () {
-+                    this.isExpandable = true;
-+                }.bind(this),
-+                exit: function () {
-+                    this.isExpandable = true;
-+                }.bind(this)
-+            });
-+
-+            this.searchLabel.on('click', function (e) {
-+                // allow input to lose its' focus when clicking on label
-+                if (this.isExpandable && this.isActive()) {
-+                    e.preventDefault();
-+                }
-+            }.bind(this));
-+
-+            this.element.on('blur', $.proxy(function () {
-+                if (!this.searchLabel.hasClass('active')) {
-+                    return;
-+                }
-+
-+                setTimeout($.proxy(function () {
-+                    if (this.autoComplete.is(':hidden')) {
-+                        this.setActiveState(false);
-+                    } else {
-+                        this.element.trigger('focus');
-+                    }
-+                    this.autoComplete.hide();
-+                    this._updateAriaHasPopup(false);
-+                }, this), 250);
-+            }, this));
-+
-+            if (this.element.get(0) === document.activeElement) {
-+                this.setActiveState(true);
-+            }
-+
-+            this.element.on('focus', this.setActiveState.bind(this, true));
-+            this.element.on('keydown', this._onKeyDown);
-+            // Prevent spamming the server with requests by waiting till the user has stopped typing for period of time
-+            this.element.on('input propertychange', _.debounce(this._onPropertyChange, this.options.suggestionDelay));
-+
-+            this.searchForm.on('submit', $.proxy(function (e) {
-+                this._onSubmit(e);
-+                this._updateAriaHasPopup(false);
-+            }, this));
-+        },
-+
-+        /**
-+         * Checks if search field is active.
-+         *
-+         * @returns {Boolean}
-+         */
-+        isActive: function () {
-+            return this.searchLabel.hasClass('active');
-+        },
-+
-+        /**
-+         * Sets state of the search field to provided value.
-+         *
-+         * @param {Boolean} isActive
-+         */
-+        setActiveState: function (isActive) {
-+            var searchValue;
-+
-+            this.searchForm.toggleClass('active', isActive);
-+            this.searchLabel.toggleClass('active', isActive);
-+
-+            if (this.isExpandable) {
-+                this.element.attr('aria-expanded', isActive);
-+                searchValue = this.element.val();
-+                this.element.val('');
-+                this.element.val(searchValue);
-+            }
-+        },
-+
-+        /**
-+         * @private
-+         * @return {Element} The first element in the suggestion list.
-+         */
-+        _getFirstVisibleElement: function () {
-+            return this.responseList.indexList ? this.responseList.indexList.first() : false;
-+        },
-+
-+        /**
-+         * @private
-+         * @return {Element} The last element in the suggestion list.
-+         */
-+        _getLastElement: function () {
-+            return this.responseList.indexList ? this.responseList.indexList.last() : false;
-+        },
-+
-+        /**
-+         * @private
-+         * @param {Boolean} show - Set attribute aria-haspopup to "true/false" for element.
-+         */
-+        _updateAriaHasPopup: function (show) {
-+            if (show) {
-+                this.element.attr('aria-haspopup', 'true');
-+            } else {
-+                this.element.attr('aria-haspopup', 'false');
-+            }
-+        },
-+
-+        /**
-+         * Clears the item selected from the suggestion list and resets the suggestion list.
-+         * @private
-+         * @param {Boolean} all - Controls whether to clear the suggestion list.
-+         */
-+        _resetResponseList: function (all) {
-+            this.responseList.selected = null;
-+
-+            if (all === true) {
-+                this.responseList.indexList = null;
-+            }
-+        },
-+
-+        /**
-+         * Executes when the search box is submitted. Sets the search input field to the
-+         * value of the selected item.
-+         * @private
-+         * @param {Event} e - The submit event
-+         */
-+        _onSubmit: function (e) {
-+            var value = this.element.val();
-+
-+            if (isEmpty(value)) {
-+                e.preventDefault();
-+            }
-+
-+            if (this.responseList.selected) {
-+                this.element.val(this.responseList.selected.find('.qs-option-name').text());
-+            }
-+        },
-+
-+        /**
-+         * Executes when keys are pressed in the search input field. Performs specific actions
-+         * depending on which keys are pressed.
-+         * @private
-+         * @param {Event} e - The key down event
-+         * @return {Boolean} Default return type for any unhandled keys
-+         */
-+        _onKeyDown: function (e) {
-+            var keyCode = e.keyCode || e.which;
-+
-+            switch (keyCode) {
-+                case $.ui.keyCode.HOME:
-+                    if (this._getFirstVisibleElement()) {
-+                        this._getFirstVisibleElement().addClass(this.options.selectClass);
-+                        this.responseList.selected = this._getFirstVisibleElement();
-+                    }
-+                    break;
-+
-+                case $.ui.keyCode.END:
-+                    if (this._getLastElement()) {
-+                        this._getLastElement().addClass(this.options.selectClass);
-+                        this.responseList.selected = this._getLastElement();
-+                    }
-+                    break;
-+
-+                case $.ui.keyCode.ESCAPE:
-+                    this._resetResponseList(true);
-+                    this.autoComplete.hide();
-+                    break;
-+
-+                case $.ui.keyCode.ENTER:
-+                    this.searchForm.trigger('submit');
-+                    e.preventDefault();
-+                    break;
-+
-+                case $.ui.keyCode.DOWN:
-+                    if (this.responseList.indexList) {
-+                        if (!this.responseList.selected) {  //eslint-disable-line max-depth
-+                            this._getFirstVisibleElement().addClass(this.options.selectClass);
-+                            this.responseList.selected = this._getFirstVisibleElement();
-+                        } else if (!this._getLastElement().hasClass(this.options.selectClass)) {
-+                            this.responseList.selected = this.responseList.selected
-+                                .removeClass(this.options.selectClass).next().addClass(this.options.selectClass);
-+                        } else {
-+                            this.responseList.selected.removeClass(this.options.selectClass);
-+                            this._getFirstVisibleElement().addClass(this.options.selectClass);
-+                            this.responseList.selected = this._getFirstVisibleElement();
-+                        }
-+                        this.element.val(this.responseList.selected.find('.qs-option-name').text());
-+                        this.element.attr('aria-activedescendant', this.responseList.selected.attr('id'));
-+                    }
-+                    break;
-+
-+                case $.ui.keyCode.UP:
-+                    if (this.responseList.indexList !== null) {
-+                        if (!this._getFirstVisibleElement().hasClass(this.options.selectClass)) {
-+                            this.responseList.selected = this.responseList.selected
-+                                .removeClass(this.options.selectClass).prev().addClass(this.options.selectClass);
-+
-+                        } else {
-+                            this.responseList.selected.removeClass(this.options.selectClass);
-+                            this._getLastElement().addClass(this.options.selectClass);
-+                            this.responseList.selected = this._getLastElement();
-+                        }
-+                        this.element.val(this.responseList.selected.find('.qs-option-name').text());
-+                        this.element.attr('aria-activedescendant', this.responseList.selected.attr('id'));
-+                    }
-+                    break;
-+                default:
-+                    return true;
-+            }
-+        },
-+
-+        /**
-+         * Executes when the value of the search input field changes. Executes a GET request
-+         * to populate a suggestion list based on entered text. Handles click (select), hover,
-+         * and mouseout events on the populated suggestion list dropdown.
-+         * @private
-+         */
-+        _onPropertyChange: function () {
-+            var searchField = this.element,
-+                clonePosition = {
-+                    position: 'absolute',
-+                    // Removed to fix display issues
-+                    // left: searchField.offset().left,
-+                    // top: searchField.offset().top + searchField.outerHeight(),
-+                    width: searchField.outerWidth()
-+                },
-+                source = this.options.template,
-+                template = mageTemplate(source),
-+                dropdown = $('<ul role="listbox"></ul>'),
-+                value = this.element.val();
-+
-+            this.submitBtn.disabled = isEmpty(value);
-+
-+            if (value.length >= parseInt(this.options.minSearchLength, 10)) {
-+                $.getJSON(this.options.url, {
-+                    q: value
-+                }, $.proxy(function (data) {
-+                    if (data.length) {
-+                        $.each(data, function (index, element) {
-+                            var html;
-+
-+                            element.index = index;
-+                            html = template({
-+                                data: element
-+                            });
-+                            dropdown.append(html);
-+                        });
-+
-+                        this._resetResponseList(true);
-+
-+                        this.responseList.indexList = this.autoComplete.html(dropdown)
-+                            .css(clonePosition)
-+                            .show()
-+                            .find(this.options.responseFieldElements + ':visible');
-+
-+                        this.element.removeAttr('aria-activedescendant');
-+
-+                        if (this.responseList.indexList.length) {
-+                            this._updateAriaHasPopup(true);
-+                        } else {
-+                            this._updateAriaHasPopup(false);
-+                        }
-+
-+                        this.responseList.indexList
-+                            .on('click', function (e) {
-+                                this.responseList.selected = $(e.currentTarget);
-+                                this.searchForm.trigger('submit');
-+                            }.bind(this))
-+                            .on('mouseenter mouseleave', function (e) {
-+                                this.responseList.indexList.removeClass(this.options.selectClass);
-+                                $(e.target).addClass(this.options.selectClass);
-+                                this.responseList.selected = $(e.target);
-+                                this.element.attr('aria-activedescendant', $(e.target).attr('id'));
-+                            }.bind(this))
-+                            .on('mouseout', function (e) {
-+                                if (!this._getLastElement() &&
-+                                    this._getLastElement().hasClass(this.options.selectClass)) {
-+                                    $(e.target).removeClass(this.options.selectClass);
-+                                    this._resetResponseList(false);
-+                                }
-+                            }.bind(this));
-+                    } else {
-+                        this._resetResponseList(true);
-+                        this.autoComplete.hide();
-+                        this._updateAriaHasPopup(false);
-+                        this.element.removeAttr('aria-activedescendant');
-+                    }
-+                }, this));
-+            } else {
-+                this._resetResponseList(true);
-+                this.autoComplete.hide();
-+                this._updateAriaHasPopup(false);
-+                this.element.removeAttr('aria-activedescendant');
-+            }
-+        }
-+    });
-+
-+    return $.mage.quickSearch;
-+});
-diff --git a/app/code/Magento/Security/Model/SecurityChecker/Quantity.php b/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
-index 9d86b55158b..5d72ba261f3 100644
---- a/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
-+++ b/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
-@@ -48,13 +48,13 @@ class Quantity implements SecurityCheckerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function check($securityEventType, $accountReference = null, $longIp = null)
-     {
-         $isEnabled = $this->securityConfig->getPasswordResetProtectionType() != ResetMethod::OPTION_NONE;
-         $allowedAttemptsNumber = $this->securityConfig->getMaxNumberPasswordResetRequests();
--        if ($isEnabled and $allowedAttemptsNumber) {
-+        if ($isEnabled && $allowedAttemptsNumber) {
-             $collection = $this->prepareCollection($securityEventType, $accountReference, $longIp);
-             if ($collection->count() >= $allowedAttemptsNumber) {
-                 throw new SecurityViolationException(
-diff --git a/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml b/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml
-new file mode 100644
-index 00000000000..c7fb05a3b73
---- /dev/null
-+++ b/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml
-@@ -0,0 +1,96 @@
-+<?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="AdminLockAdminUserWhenCreatingNewRoleTest">
-+        <annotations>
-+            <features value="Security"/>
-+            <stories value="Runs Lock admin user when creating new admin role test."/>
-+            <title value="Lock admin user when creating new admin role"/>
-+            <description value="Runs Lock admin user when creating new admin role test."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14384" />
-+            <group value="security"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Log in to Admin Panel -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Unlock Admin user -->
-+            <magentoCLI command="admin:user:unlock {{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="unlockAdminUser"/>
-+        </after>
-+        <!-- Perform add new role 6 specified number of times. -->
-+        <actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="openCreateRolePage"/>
-+
-+        <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillFieldFirstAttempt">
-+            <argument name="role" value="roleAdministrator" />
-+            <argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
-+        </actionGroup>
-+        <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveRoleFirstAttempt"/>
-+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="checkFirstSaveRoleError">
-+            <argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
-+            <argument name="messageType" value="error" />
-+        </actionGroup>
-+        
-+        <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillFieldSecondAttempt">
-+            <argument name="role" value="roleAdministrator" />
-+            <argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
-+        </actionGroup>
-+        <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveRoleSecondAttempt"/>
-+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="checkSecondSaveRoleError">
-+            <argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
-+            <argument name="messageType" value="error" />
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillFieldThirdAttempt">
-+            <argument name="role" value="roleAdministrator" />
-+            <argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
-+        </actionGroup>
-+        <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveRoleThirdAttempt"/>
-+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="checkThirdSaveRoleError">
-+            <argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
-+            <argument name="messageType" value="error" />
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillFieldFourthAttempt">
-+            <argument name="role" value="roleAdministrator" />
-+            <argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
-+        </actionGroup>
-+        <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveRoleFourthAttempt"/>
-+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="checkFourthSaveRoleError">
-+            <argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
-+            <argument name="messageType" value="error" />
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillFieldFifthAttempt">
-+            <argument name="role" value="roleAdministrator" />
-+            <argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
-+        </actionGroup>
-+        <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveRoleFifthAttempt"/>
-+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="checkFifthSaveRoleError">
-+            <argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
-+            <argument name="messageType" value="error" />
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillFieldSixthAttempt">
-+            <argument name="role" value="roleAdministrator" />
-+            <argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
-+        </actionGroup>
-+        <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveRoleSixthAttempt"/>
-+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="checkFifthError">
-+            <argument name="message" value="Your account is temporarily disabled. Please try again later."/>
-+        </actionGroup>
-+
-+        <!-- Try to login as admin and check error message -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsLockedAdmin"/>
-+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="checkLoginMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Security/Test/Mftf/Test/AdminUserLockWhenCreatingNewUserTest.xml b/app/code/Magento/Security/Test/Mftf/Test/AdminUserLockWhenCreatingNewUserTest.xml
-new file mode 100644
-index 00000000000..4ceffd67631
---- /dev/null
-+++ b/app/code/Magento/Security/Test/Mftf/Test/AdminUserLockWhenCreatingNewUserTest.xml
-@@ -0,0 +1,79 @@
-+<?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="AdminUserLockWhenCreatingNewUserTest">
-+        <annotations>
-+            <features value="Security"/>
-+            <stories value="Runs Lock admin user when creating new user test."/>
-+            <title value="Lock admin user when creating new user"/>
-+            <description value="Runs Lock admin user when creating new user test."/>
-+            <testCaseId value="MC-14383" />
-+            <severity value="CRITICAL"/>
-+            <group value="security"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Log in to Admin Panel -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Unlock Admin user -->
-+            <magentoCLI command="admin:user:unlock {{DefaultAdminUser.username}}" stepKey="unlockAdminUser"/>
-+        </after>
-+
-+        <!-- Open Admin New User Page -->
-+        <actionGroup ref="AdminOpenNewUserPageActionGroup" stepKey="openNewUserPage" />
-+
-+        <!-- Perform add new admin user 6 specified number of times.
-+        "The password entered for the current user is invalid. Verify the password and try again." appears after each attempt.-->
-+        <actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="failedSaveUserFirstAttempt">
-+            <argument name="user" value="NewAdminUserWrongCurrentPassword" />
-+        </actionGroup>
-+        <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="clickSaveFirstAttempt" />
-+        <actionGroup ref="AssertAdminUserSaveMessageActionGroup" stepKey="seeInvalidPasswordError">
-+            <argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
-+            <argument name="messageType" value="error" />
-+        </actionGroup>
-+
-+        <actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="failedSaveUserSecondAttempt">
-+            <argument name="user" value="NewAdminUserWrongCurrentPassword" />
-+        </actionGroup>
-+        <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="clickSaveSecondAttempt" />
-+
-+        <actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="failedSaveUserThirdAttempt">
-+            <argument name="user" value="NewAdminUserWrongCurrentPassword" />
-+        </actionGroup>
-+        <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="clickSaveThirdAttempt" />
-+
-+        <actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="failedSaveUserFourthAttempt">
-+            <argument name="user" value="NewAdminUserWrongCurrentPassword" />
-+        </actionGroup>
-+        <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="clickSaveFourthAttempt" />
-+
-+        <actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="failedSaveUserFifthAttempt">
-+            <argument name="user" value="NewAdminUserWrongCurrentPassword" />
-+        </actionGroup>
-+        <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="clickSaveFifthAttempt" />
-+
-+        <actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="failedSaveUserSixthAttempt">
-+            <argument name="user" value="NewAdminUserWrongCurrentPassword" />
-+        </actionGroup>
-+        <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="clickSaveSixthAttempt" />
-+
-+        <!-- Check Error that account has been locked -->
-+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeLockUserErrorMessage">
-+            <argument name="message" value="Your account is temporarily disabled. Please try again later." />
-+        </actionGroup>
-+
-+        <!-- Try to login as admin and check error -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsLockedAdmin"/>
-+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeLoginUserErrorMessage" />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Security/Test/Mftf/Test/StorefrontCheckNecessaryLogicToActionClassForCookieMessagesTest.xml b/app/code/Magento/Security/Test/Mftf/Test/StorefrontCheckNecessaryLogicToActionClassForCookieMessagesTest.xml
-new file mode 100644
-index 00000000000..1ffd970bc14
---- /dev/null
-+++ b/app/code/Magento/Security/Test/Mftf/Test/StorefrontCheckNecessaryLogicToActionClassForCookieMessagesTest.xml
-@@ -0,0 +1,61 @@
-+<?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="StorefrontCheckNecessaryLogicToActionClassForCookieMessagesTest">
-+        <annotations>
-+            <features value="Security"/>
-+            <stories value="Check necessary logic to action class for cookie messages"/>
-+            <title value="Storefront check necessary logic to action class for cookie messages test"/>
-+            <description value="Check necessary logic to action class for cookie messages"/>
-+            <testCaseId value="MC-6141" />
-+            <severity value="CRITICAL"/>
-+            <group value="security"/>
-+            <group value="customer"/>
-+        </annotations>
-+        <before>
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+        </after>
-+
-+        <!-- Login to application -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Open 'My Account' page and click 'Edit; link -->
-+        <actionGroup ref="StorefrontOpenMyAccountPageActionGroup" stepKey="goToMyAccountPage"/>
-+        <click selector="{{StorefrontCustomerDashboardAccountInformationSection.editLink}}" stepKey="clickEditContactInformation"/>
-+
-+        <!-- Mark as checked 'Change email' check-box. Assert 2 labels under 'Change Email' block -->
-+        <checkOption selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox"/>
-+        <seeElement selector="{{StorefrontCustomerAccountInformationSection.email}}" stepKey="seeEmailField"/>
-+        <seeElement selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" stepKey="seeCurrentPasswordField"/>
-+
-+        <!-- Change email attribute 'type' from email to text and type script after email address. Click 'Save' button -->
-+        <executeJS function="document.querySelector('{{StorefrontCustomerAccountInformationSection.emailField}}').setAttribute('type', 'text');" stepKey="changeAttributeFromEmailToText"/>
-+        <fillField selector="{{StorefrontCustomerAccountInformationSection.email}}" userInput="$$createCustomer.email$$&lt;script&gt;alert('Hello')&lt;/script&gt;" stepKey="fillEmailWithScript"/>
-+        <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="clickSave"/>
-+
-+        <!-- Assert error messages for email and password fields -->
-+        <dontSee selector="{{StorefrontCustomerAccountInformationSection.emailErrorMessage}}" userInput="Please enter a valid email address." stepKey="dontSeeEmailErrorMessage"/>
-+        <see selector="{{StorefrontCustomerAccountInformationSection.currentPasswordErrorMessage}}" userInput="This is a required field." stepKey="seeErrorPasswordMessage"/>
-+
-+        <!-- Fill password and click 'Save' button -->
-+        <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="$$createCustomer.password$$" stepKey="fillCurrentPassword"/>
-+        <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="saveChanges"/>
-+
-+        <!-- Throw validation error message (server side validation) with escaped customer input -->
-+        <see selector="{{StorefrontCustomerAccountMainSection.alertMessage}}" userInput="&quot;Email&quot; is not a valid hostname. 'example.com&lt;script&gt;alert('Hello')&lt;/script&gt;' looks like a DNS hostname but we cannot match it against the hostname schema for TLD 'com&lt;script&gt;alert('Hello')&lt;/script&gt;'. 'example.com&lt;script&gt;alert('Hello')&lt;/script&gt;' does not look like a valid local network name." stepKey="seeValidationErrorMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Security/Test/Unit/Model/SecurityCookieTest.php b/app/code/Magento/Security/Test/Unit/Model/SecurityCookieTest.php
-index b310bf63bc9..3a1855b3a22 100644
---- a/app/code/Magento/Security/Test/Unit/Model/SecurityCookieTest.php
-+++ b/app/code/Magento/Security/Test/Unit/Model/SecurityCookieTest.php
-@@ -87,7 +87,7 @@ class SecurityCookieTest extends \PHPUnit\Framework\TestCase
-             )
-             ->willReturn($cookie);
- 
--        $this->assertEquals(intval($cookie), $this->model->getLogoutReasonCookie());
-+        $this->assertEquals((int)$cookie, $this->model->getLogoutReasonCookie());
-     }
- 
-     /**
-@@ -114,7 +114,7 @@ class SecurityCookieTest extends \PHPUnit\Framework\TestCase
-             ->method('setPublicCookie')
-             ->with(
-                 SecurityCookie::LOGOUT_REASON_CODE_COOKIE_NAME,
--                intval($status),
-+                (int)$status,
-                 $this->cookieMetadataMock
-             )
-             ->willReturnSelf();
-diff --git a/app/code/Magento/Security/etc/db_schema.xml b/app/code/Magento/Security/etc/db_schema.xml
-index f14e6de79e8..ce7143582ce 100644
---- a/app/code/Magento/Security/etc/db_schema.xml
-+++ b/app/code/Magento/Security/etc/db_schema.xml
-@@ -21,15 +21,15 @@
-                 comment="Update Time"/>
-         <column xsi:type="varchar" name="ip" nullable="false" length="15" onCreate="migrateDataFrom(ip)"
-                 comment="Remote user IP"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="ADMIN_USER_SESSION_USER_ID_ADMIN_USER_USER_ID" table="admin_user_session"
-+        <constraint xsi:type="foreign" referenceId="ADMIN_USER_SESSION_USER_ID_ADMIN_USER_USER_ID" table="admin_user_session"
-                     column="user_id" referenceTable="admin_user" referenceColumn="user_id" onDelete="CASCADE"/>
--        <index name="ADMIN_USER_SESSION_SESSION_ID" indexType="btree">
-+        <index referenceId="ADMIN_USER_SESSION_SESSION_ID" indexType="btree">
-             <column name="session_id"/>
-         </index>
--        <index name="ADMIN_USER_SESSION_USER_ID" indexType="btree">
-+        <index referenceId="ADMIN_USER_SESSION_USER_ID" indexType="btree">
-             <column name="user_id"/>
-         </index>
-     </table>
-@@ -45,13 +45,13 @@
-                 comment="Timestamp when the event occurs"/>
-         <column xsi:type="varchar" name="ip" nullable="false" length="15" onCreate="migrateDataFrom(ip)"
-                 comment="Remote user IP"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <index name="PASSWORD_RESET_REQUEST_EVENT_ACCOUNT_REFERENCE" indexType="btree">
-+        <index referenceId="PASSWORD_RESET_REQUEST_EVENT_ACCOUNT_REFERENCE" indexType="btree">
-             <column name="account_reference"/>
-         </index>
--        <index name="PASSWORD_RESET_REQUEST_EVENT_CREATED_AT" indexType="btree">
-+        <index referenceId="PASSWORD_RESET_REQUEST_EVENT_CREATED_AT" indexType="btree">
-             <column name="created_at"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml b/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml
-index 88a3ff433a0..a4c70be6b46 100644
---- a/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml
-+++ b/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml
-@@ -7,7 +7,6 @@
- /**
-  * Account activity template
-  *
-- * @codingStandardsIgnoreFile
-  * @var $block \Magento\Security\Block\Adminhtml\Session\Activity
-  */
- 
-@@ -39,21 +38,18 @@ $sessionInfoCollection = $block->getSessionInfoCollection();
-             </thead>
-             <tbody>
-             <?php
--            foreach ($sessionInfoCollection as $item): ?>
-+            foreach ($sessionInfoCollection as $item) : ?>
-                 <tr>
-                     <td><?= $block->escapeHtml($item->getFormattedIp()) ?></td>
-                     <td><?= $block->escapeHtml($block->formatDateTime($item->getCreatedAt())) ?></td>
-                 </tr>
--            <?php
--            endforeach;
--            ?>
-+            <?php endforeach; ?>
-             </tbody>
-         </table>
- 
-         <div class="button-container">
-             <button type="button"
--                <?php
--                if ($block->areMultipleSessionsActive()): ?>
-+                <?php if ($block->areMultipleSessionsActive()) : ?>
-                     data-mage-init='{"confirmRedirect":{
-                         "message": "<?=
-                             $block->escapeJs(__('Are you sure that you want to log out all other sessions?'))
-@@ -62,8 +58,7 @@ $sessionInfoCollection = $block->getSessionInfoCollection();
-                             $block->escapeJs($block->escapeUrl($block->getUrl('security/session/logoutAll')))
-                         ?>"
-                     }}'
--                <?php
--                else: ?>disabled<?php
-+                <?php else : ?>disabled<?php
-                 endif ?>
-                 title="<?= $block->escapeHtmlAttr(__('Log out all other sessions')) ?>">
-                 <?= $block->escapeHtml(__('Log out all other sessions')) ?>
-diff --git a/app/code/Magento/SendFriend/Block/Send.php b/app/code/Magento/SendFriend/Block/Send.php
-index 43e95ebe43d..1c4b5503613 100644
---- a/app/code/Magento/SendFriend/Block/Send.php
-+++ b/app/code/Magento/SendFriend/Block/Send.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\SendFriend\Block;
- 
-+use Magento\Captcha\Block\Captcha;
- use Magento\Customer\Model\Context;
- 
- /**
-@@ -170,6 +171,7 @@ class Send extends \Magento\Framework\View\Element\Template
-     /**
-      * Retrieve Current Product Id
-      *
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      * @return int
-      */
-     public function getProductId()
-@@ -180,6 +182,7 @@ class Send extends \Magento\Framework\View\Element\Template
-     /**
-      * Retrieve current category id for product
-      *
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      * @return int
-      */
-     public function getCategoryId()
-@@ -222,4 +225,24 @@ class Send extends \Magento\Framework\View\Element\Template
-     {
-         return !$this->sendfriend->isExceedLimit();
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _prepareLayout()
-+    {
-+        if (!$this->getChildBlock('captcha')) {
-+            $this->addChild(
-+                'captcha',
-+                Captcha::class,
-+                [
-+                    'cacheable' => false,
-+                    'after' => '-',
-+                    'form_id' => 'product_sendtofriend_form',
-+                    'image_width' => 230,
-+                    'image_height' => 230
-+                ]
-+            );
-+        }
-+    }
- }
-diff --git a/app/code/Magento/SendFriend/Controller/Product.php b/app/code/Magento/SendFriend/Controller/Product.php
-index 732bcef8b95..a184d7d8bff 100644
---- a/app/code/Magento/SendFriend/Controller/Product.php
-+++ b/app/code/Magento/SendFriend/Controller/Product.php
-@@ -61,6 +61,7 @@ abstract class Product extends \Magento\Framework\App\Action\Action
- 
-     /**
-      * Check if module is enabled
-+     *
-      * If allow only for customer - redirect to login page
-      *
-      * @param RequestInterface $request
-@@ -102,7 +103,7 @@ abstract class Product extends \Magento\Framework\App\Action\Action
-         }
-         try {
-             $product = $this->productRepository->getById($productId);
--            if (!$product->isVisibleInCatalog()) {
-+            if (!$product->isVisibleInSiteVisibility() || !$product->isVisibleInCatalog()) {
-                 return false;
-             }
-         } catch (NoSuchEntityException $noEntityException) {
-diff --git a/app/code/Magento/SendFriend/Controller/Product/Send.php b/app/code/Magento/SendFriend/Controller/Product/Send.php
-index 8b0ae8dcf43..d9fef595ce2 100644
---- a/app/code/Magento/SendFriend/Controller/Product/Send.php
-+++ b/app/code/Magento/SendFriend/Controller/Product/Send.php
-@@ -5,9 +5,13 @@
-  */
- namespace Magento\SendFriend\Controller\Product;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Send extends \Magento\SendFriend\Controller\Product
-+/**
-+ * Controller class. Represents rendering and request flow
-+ */
-+class Send extends \Magento\SendFriend\Controller\Product implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Catalog\Model\Session
-diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
-index 4b1f724cb83..696c2358993 100644
---- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
-+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
-@@ -6,10 +6,18 @@
- 
- namespace Magento\SendFriend\Controller\Product;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Controller\ResultFactory;
-+use Magento\SendFriend\Model\CaptchaValidator;
- 
--class Sendmail extends \Magento\SendFriend\Controller\Product
-+/**
-+ * Class Sendmail. Represents request flow logic of 'sendmail' feature
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class Sendmail extends \Magento\SendFriend\Controller\Product implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Catalog\Api\CategoryRepositoryInterface
-@@ -22,6 +30,13 @@ class Sendmail extends \Magento\SendFriend\Controller\Product
-     protected $catalogSession;
- 
-     /**
-+     * @var CaptchaValidator
-+     */
-+    private $captchaValidator;
-+
-+    /**
-+     * Sendmail class construct
-+     *
-      * @param \Magento\Framework\App\Action\Context $context
-      * @param \Magento\Framework\Registry $coreRegistry
-      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
-@@ -29,6 +44,7 @@ class Sendmail extends \Magento\SendFriend\Controller\Product
-      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
-      * @param \Magento\Catalog\Model\Session $catalogSession
-+     * @param CaptchaValidator|null $captchaValidator
-      */
-     public function __construct(
-         \Magento\Framework\App\Action\Context $context,
-@@ -37,11 +53,13 @@ class Sendmail extends \Magento\SendFriend\Controller\Product
-         \Magento\SendFriend\Model\SendFriend $sendFriend,
-         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
-         \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
--        \Magento\Catalog\Model\Session $catalogSession
-+        \Magento\Catalog\Model\Session $catalogSession,
-+        CaptchaValidator $captchaValidator = null
-     ) {
-         parent::__construct($context, $coreRegistry, $formKeyValidator, $sendFriend, $productRepository);
-         $this->categoryRepository = $categoryRepository;
-         $this->catalogSession = $catalogSession;
-+        $this->captchaValidator = $captchaValidator ?: ObjectManager::getInstance()->create(CaptchaValidator::class);
-     }
- 
-     /**
-@@ -49,17 +67,13 @@ class Sendmail extends \Magento\SendFriend\Controller\Product
-      *
-      * @return \Magento\Framework\Controller\ResultInterface
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-+     * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-     public function execute()
-     {
-         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
-         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
- 
--        if (!$this->_formKeyValidator->validate($this->getRequest())) {
--            $resultRedirect->setPath('sendfriend/product/send', ['_current' => true]);
--            return $resultRedirect;
--        }
--
-         $product = $this->_initProduct();
-         $data = $this->getRequest()->getPostValue();
- 
-@@ -89,6 +103,9 @@ class Sendmail extends \Magento\SendFriend\Controller\Product
- 
-         try {
-             $validate = $this->sendFriend->validate();
-+
-+            $this->captchaValidator->validateSending($this->getRequest());
-+
-             if ($validate === true) {
-                 $this->sendFriend->send();
-                 $this->messageManager->addSuccess(__('The link to a friend was sent.'));
-diff --git a/app/code/Magento/SendFriend/Model/CaptchaValidator.php b/app/code/Magento/SendFriend/Model/CaptchaValidator.php
-new file mode 100644
-index 00000000000..11fbbdf72f6
---- /dev/null
-+++ b/app/code/Magento/SendFriend/Model/CaptchaValidator.php
-@@ -0,0 +1,123 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\SendFriend\Model;
-+
-+use Magento\Framework\App\RequestInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Captcha\Helper\Data;
-+use Magento\Captcha\Model\DefaultModel;
-+use Magento\Captcha\Observer\CaptchaStringResolver;
-+use Magento\Authorization\Model\UserContextInterface;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+
-+/**
-+ * Class CaptchaValidator. Performs captcha validation
-+ */
-+class CaptchaValidator
-+{
-+    /**
-+     * @var Data
-+     */
-+    private $captchaHelper;
-+
-+    /**
-+     * @var CaptchaStringResolver
-+     */
-+    private $captchaStringResolver;
-+
-+    /**
-+     * @var UserContextInterface
-+     */
-+    private $currentUser;
-+
-+    /**
-+     * @var CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * CaptchaValidator constructor.
-+     *
-+     * @param Data $captchaHelper
-+     * @param CaptchaStringResolver $captchaStringResolver
-+     * @param UserContextInterface $currentUser
-+     * @param CustomerRepositoryInterface $customerRepository
-+     */
-+    public function __construct(
-+        Data $captchaHelper,
-+        CaptchaStringResolver $captchaStringResolver,
-+        UserContextInterface $currentUser,
-+        CustomerRepositoryInterface $customerRepository
-+    ) {
-+        $this->captchaHelper = $captchaHelper;
-+        $this->captchaStringResolver = $captchaStringResolver;
-+        $this->currentUser = $currentUser;
-+        $this->customerRepository = $customerRepository;
-+    }
-+
-+    /**
-+     * Entry point for captcha validation
-+     *
-+     * @param RequestInterface $request
-+     * @throws LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    public function validateSending(RequestInterface $request): void
-+    {
-+        $this->validateCaptcha($request);
-+    }
-+
-+    /**
-+     * Validates captcha and triggers log attempt
-+     *
-+     * @param RequestInterface $request
-+     * @throws LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    private function validateCaptcha(RequestInterface $request): void
-+    {
-+        $captchaTargetFormName = 'product_sendtofriend_form';
-+        /** @var DefaultModel $captchaModel */
-+        $captchaModel = $this->captchaHelper->getCaptcha($captchaTargetFormName);
-+
-+        if ($captchaModel->isRequired()) {
-+            $word = $this->captchaStringResolver->resolve(
-+                $request,
-+                $captchaTargetFormName
-+            );
-+
-+            $isCorrectCaptcha = $captchaModel->isCorrect($word);
-+
-+            if (!$isCorrectCaptcha) {
-+                $this->logCaptchaAttempt($captchaModel);
-+                throw new LocalizedException(__('Incorrect CAPTCHA'));
-+            }
-+        }
-+
-+        $this->logCaptchaAttempt($captchaModel);
-+    }
-+
-+    /**
-+     * Log captcha attempts
-+     *
-+     * @param DefaultModel $captchaModel
-+     * @throws LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    private function logCaptchaAttempt(DefaultModel $captchaModel): void
-+    {
-+        $email = '';
-+
-+        if ($this->currentUser->getUserType() == UserContextInterface::USER_TYPE_CUSTOMER) {
-+            $email = $this->customerRepository->getById($this->currentUser->getUserId())->getEmail();
-+        }
-+
-+        $captchaModel->logAttempt($email);
-+    }
-+}
-diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
-index c69d6342b48..164b95a6ca8 100644
---- a/app/code/Magento/SendFriend/Model/SendFriend.php
-+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
-@@ -16,6 +16,7 @@ use Magento\Framework\Exception\LocalizedException as CoreException;
-  * @method \Magento\SendFriend\Model\SendFriend setTime(int $value)
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  *
-  * @api
-@@ -162,6 +163,8 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
-     }
- 
-     /**
-+     * Sends email to recipients
-+     *
-      * @return $this
-      * @throws CoreException
-      */
-@@ -175,7 +178,7 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
- 
-         $this->inlineTranslation->suspend();
- 
--        $message = nl2br(htmlspecialchars($this->getSender()->getMessage()));
-+        $message = nl2br($this->_escaper->escapeHtml($this->getSender()->getMessage()));
-         $sender = [
-             'name' => $this->_escaper->escapeHtml($this->getSender()->getName()),
-             'email' => $this->_escaper->escapeHtml($this->getSender()->getEmail()),
-@@ -236,7 +239,7 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
-         }
- 
-         $email = $this->getSender()->getEmail();
--        if (empty($email) or !\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
-+        if (empty($email) || !\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
-             $errors[] = __('Invalid Sender Email');
-         }
- 
-@@ -281,13 +284,13 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
-         // validate array
-         if (!is_array(
-             $recipients
--        ) or !isset(
-+        ) || !isset(
-             $recipients['email']
--        ) or !isset(
-+        ) || !isset(
-             $recipients['name']
--        ) or !is_array(
-+        ) || !is_array(
-             $recipients['email']
--        ) or !is_array(
-+        ) || !is_array(
-             $recipients['name']
-         )
-         ) {
-@@ -487,7 +490,7 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
-             $oldTimes = explode(',', $oldTimes);
-             foreach ($oldTimes as $oldTime) {
-                 $periodTime = $time - $this->_sendfriendData->getPeriod();
--                if (is_numeric($oldTime) and $oldTime >= $periodTime) {
-+                if (is_numeric($oldTime) && $oldTime >= $periodTime) {
-                     $newTimes[] = $oldTime;
-                 }
-             }
-diff --git a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php b/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php
-deleted file mode 100644
-index 9d48133c1d5..00000000000
---- a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php
-+++ /dev/null
-@@ -1,423 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\SendFriend\Test\Unit\Controller\Product;
--
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--
--/**
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class SendTest extends \PHPUnit\Framework\TestCase
--{
--    /** @var \Magento\SendFriend\Controller\Product\Send */
--    protected $model;
--
--    /** @var ObjectManagerHelper */
--    protected $objectManagerHelper;
--
--    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $requestMock;
--
--    /** @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject */
--    protected $registryMock;
--
--    /** @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject */
--    protected $validatorMock;
--
--    /** @var \Magento\SendFriend\Model\SendFriend|\PHPUnit_Framework_MockObject_MockObject */
--    protected $sendFriendMock;
--
--    /** @var \Magento\Catalog\Api\ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $productRepositoryMock;
--
--    /** @var \Magento\Catalog\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
--    protected $catalogSessionMock;
--
--    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $messageManagerMock;
--
--    /** @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject */
--    protected $resultFactoryMock;
--
--    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $eventManagerMock;
--
--    protected function setUp()
--    {
--        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
--            ->getMockForAbstractClass();
--        $this->registryMock = $this->getMockBuilder(\Magento\Framework\Registry::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->validatorMock = $this->getMockBuilder(\Magento\Framework\Data\Form\FormKey\Validator::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->sendFriendMock = $this->getMockBuilder(\Magento\SendFriend\Model\SendFriend::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->productRepositoryMock = $this->getMockBuilder(\Magento\Catalog\Api\ProductRepositoryInterface::class)
--            ->getMockForAbstractClass();
--        $this->catalogSessionMock = $this->getMockBuilder(\Magento\Catalog\Model\Session::class)
--            ->setMethods(['getSendfriendFormData', 'setSendfriendFormData'])
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
--            ->getMock();
--        $this->resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->eventManagerMock = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
--            ->getMock();
--
--        $this->objectManagerHelper = new ObjectManagerHelper($this);
--        $this->model = $this->objectManagerHelper->getObject(
--            \Magento\SendFriend\Controller\Product\Send::class,
--            [
--                'request' => $this->requestMock,
--                'coreRegistry' => $this->registryMock,
--                'formKeyValidator' => $this->validatorMock,
--                'sendFriend' => $this->sendFriendMock,
--                'productRepository' => $this->productRepositoryMock,
--                'catalogSession' => $this->catalogSessionMock,
--                'messageManager' => $this->messageManagerMock,
--                'resultFactory' => $this->resultFactoryMock,
--                'eventManager' => $this->eventManagerMock,
--            ]
--        );
--    }
--
--    /**
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function testExecute()
--    {
--        $productId = 11;
--        $formData = ['some' => 'data'];
--
--        $this->requestMock->expects($this->once())
--            ->method('getParam')
--            ->with('id', null)
--            ->willReturn($productId);
--
--        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
--        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
--            ->setMethods(['isVisibleInCatalog'])
--            ->getMockForAbstractClass();
--
--        $this->productRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($productId, false, null, false)
--            ->willReturn($productMock);
--
--        $productMock->expects($this->once())
--            ->method('isVisibleInCatalog')
--            ->willReturn(true);
--
--        $this->registryMock->expects($this->once())
--            ->method('register')
--            ->with('product', $productMock, false);
--
--        $this->sendFriendMock->expects($this->once())
--            ->method('getMaxSendsToFriend')
--            ->willReturn(11);
--        $this->sendFriendMock->expects($this->once())
--            ->method('isExceedLimit')
--            ->willReturn(false);
--
--        $this->messageManagerMock->expects($this->never())
--            ->method('addNotice');
--
--        /** @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject $pageMock */
--        $pageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->once())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_PAGE, [])
--            ->willReturn($pageMock);
--
--        $this->eventManagerMock->expects($this->once())
--            ->method('dispatch')
--            ->with('sendfriend_product', ['product' => $productMock]);
--
--        $this->catalogSessionMock->expects($this->once())
--            ->method('getSendfriendFormData')
--            ->willReturn($formData);
--        $this->catalogSessionMock->expects($this->once())
--            ->method('setSendfriendFormData')
--            ->with(true);
--
--        /** @var \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject $layoutMock */
--        $layoutMock = $this->getMockBuilder(\Magento\Framework\View\Layout::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $pageMock->expects($this->once())
--            ->method('getLayout')
--            ->willReturn($layoutMock);
--
--        /** @var \Magento\SendFriend\Block\Send|\PHPUnit_Framework_MockObject_MockObject $blockMock */
--        $blockMock = $this->getMockBuilder(\Magento\SendFriend\Block\Send::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $layoutMock->expects($this->once())
--            ->method('getBlock')
--            ->with('sendfriend.send')
--            ->willReturn($blockMock);
--
--        $blockMock->expects($this->once())
--            ->method('setFormData')
--            ->with($formData)
--            ->willReturnSelf();
--
--        $this->assertEquals($pageMock, $this->model->execute());
--    }
--
--    /**
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function testExecuteWithoutBlock()
--    {
--        $productId = 11;
--        $formData = ['some' => 'data'];
--
--        $this->requestMock->expects($this->once())
--            ->method('getParam')
--            ->with('id', null)
--            ->willReturn($productId);
--
--        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
--        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
--            ->setMethods(['isVisibleInCatalog'])
--            ->getMockForAbstractClass();
--
--        $this->productRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($productId, false, null, false)
--            ->willReturn($productMock);
--
--        $productMock->expects($this->once())
--            ->method('isVisibleInCatalog')
--            ->willReturn(true);
--
--        $this->registryMock->expects($this->once())
--            ->method('register')
--            ->with('product', $productMock, false);
--
--        $this->sendFriendMock->expects($this->once())
--            ->method('getMaxSendsToFriend')
--            ->willReturn(11);
--        $this->sendFriendMock->expects($this->once())
--            ->method('isExceedLimit')
--            ->willReturn(false);
--
--        $this->messageManagerMock->expects($this->never())
--            ->method('addNotice');
--
--        /** @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject $pageMock */
--        $pageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->once())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_PAGE, [])
--            ->willReturn($pageMock);
--
--        $this->eventManagerMock->expects($this->once())
--            ->method('dispatch')
--            ->with('sendfriend_product', ['product' => $productMock]);
--
--        $this->catalogSessionMock->expects($this->once())
--            ->method('getSendfriendFormData')
--            ->willReturn($formData);
--        $this->catalogSessionMock->expects($this->once())
--            ->method('setSendfriendFormData')
--            ->with(true);
--
--        /** @var \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject $layoutMock */
--        $layoutMock = $this->getMockBuilder(\Magento\Framework\View\Layout::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $pageMock->expects($this->once())
--            ->method('getLayout')
--            ->willReturn($layoutMock);
--
--        $layoutMock->expects($this->once())
--            ->method('getBlock')
--            ->with('sendfriend.send')
--            ->willReturn(false);
--
--        $this->assertEquals($pageMock, $this->model->execute());
--    }
--
--    public function testExecuteWithNoticeAndNoData()
--    {
--        $productId = 11;
--        $formData = null;
--
--        $this->requestMock->expects($this->once())
--            ->method('getParam')
--            ->with('id', null)
--            ->willReturn($productId);
--
--        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
--        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
--            ->setMethods(['isVisibleInCatalog'])
--            ->getMockForAbstractClass();
--
--        $this->productRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($productId, false, null, false)
--            ->willReturn($productMock);
--
--        $productMock->expects($this->once())
--            ->method('isVisibleInCatalog')
--            ->willReturn(true);
--
--        $this->registryMock->expects($this->once())
--            ->method('register')
--            ->with('product', $productMock, false);
--
--        $this->sendFriendMock->expects($this->exactly(2))
--            ->method('getMaxSendsToFriend')
--            ->willReturn(11);
--        $this->sendFriendMock->expects($this->once())
--            ->method('isExceedLimit')
--            ->willReturn(true);
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addNotice')
--            ->with(__('You can\'t send messages more than %1 times an hour.', 11))
--            ->willReturnSelf();
--
--        /** @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject $pageMock */
--        $pageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->once())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_PAGE, [])
--            ->willReturn($pageMock);
--
--        $this->eventManagerMock->expects($this->once())
--            ->method('dispatch')
--            ->with('sendfriend_product', ['product' => $productMock]);
--
--        $this->catalogSessionMock->expects($this->once())
--            ->method('getSendfriendFormData')
--            ->willReturn($formData);
--        $this->catalogSessionMock->expects($this->never())
--            ->method('setSendfriendFormData');
--
--        $pageMock->expects($this->never())
--            ->method('getLayout');
--
--        $this->assertEquals($pageMock, $this->model->execute());
--    }
--
--    public function testExecuteWithoutParam()
--    {
--        $this->requestMock->expects($this->once())
--            ->method('getParam')
--            ->with('id', null)
--            ->willReturn(null);
--
--        /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
--        $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->once())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_FORWARD, [])
--            ->willReturn($forwardMock);
--
--        $forwardMock->expects($this->once())
--            ->method('forward')
--            ->with('noroute')
--            ->willReturnSelf();
--
--        $this->assertEquals($forwardMock, $this->model->execute());
--    }
--
--    public function testExecuteWithoutProduct()
--    {
--        $productId = 11;
--
--        $this->requestMock->expects($this->once())
--            ->method('getParam')
--            ->with('id', null)
--            ->willReturn($productId);
--
--        $this->productRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($productId, false, null, false)
--            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Product Exception.')));
--
--        /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
--        $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->once())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_FORWARD, [])
--            ->willReturn($forwardMock);
--
--        $forwardMock->expects($this->once())
--            ->method('forward')
--            ->with('noroute')
--            ->willReturnSelf();
--
--        $this->assertEquals($forwardMock, $this->model->execute());
--    }
--
--    public function testExecuteWithNonVisibleProduct()
--    {
--        $productId = 11;
--
--        $this->requestMock->expects($this->once())
--            ->method('getParam')
--            ->with('id', null)
--            ->willReturn($productId);
--
--        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
--        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
--            ->setMethods(['isVisibleInCatalog'])
--            ->getMockForAbstractClass();
--
--        $this->productRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($productId, false, null, false)
--            ->willReturn($productMock);
--
--        $productMock->expects($this->once())
--            ->method('isVisibleInCatalog')
--            ->willReturn(false);
--
--        /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
--        $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->once())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_FORWARD, [])
--            ->willReturn($forwardMock);
--
--        $forwardMock->expects($this->once())
--            ->method('forward')
--            ->with('noroute')
--            ->willReturnSelf();
--
--        $this->assertEquals($forwardMock, $this->model->execute());
--    }
--}
-diff --git a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php b/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php
-deleted file mode 100644
-index c7881f366f5..00000000000
---- a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php
-+++ /dev/null
-@@ -1,906 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\SendFriend\Test\Unit\Controller\Product;
--
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--
--/**
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class SendmailTest extends \PHPUnit\Framework\TestCase
--{
--    /** @var \Magento\SendFriend\Controller\Product\Sendmail */
--    protected $model;
--
--    /** @var ObjectManagerHelper */
--    protected $objectManagerHelper;
--
--    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $requestMock;
--
--    /** @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject */
--    protected $registryMock;
--
--    /** @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject */
--    protected $validatorMock;
--
--    /** @var \Magento\SendFriend\Model\SendFriend|\PHPUnit_Framework_MockObject_MockObject */
--    protected $sendFriendMock;
--
--    /** @var \Magento\Catalog\Api\ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $productRepositoryMock;
--
--    /** @var \Magento\Catalog\Api\CategoryRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $categoryRepositoryMock;
--
--    /** @var \Magento\Catalog\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
--    protected $catalogSessionMock;
--
--    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $messageManagerMock;
--
--    /** @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject */
--    protected $resultFactoryMock;
--
--    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $eventManagerMock;
--
--    /** @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $redirectMock;
--
--    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $urlBuilderMock;
--
--    protected function setUp()
--    {
--        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
--            ->setMethods(['getPost', 'getPostValue', 'getParam'])
--            ->getMockForAbstractClass();
--        $this->registryMock = $this->getMockBuilder(\Magento\Framework\Registry::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->validatorMock = $this->getMockBuilder(\Magento\Framework\Data\Form\FormKey\Validator::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->sendFriendMock = $this->getMockBuilder(\Magento\SendFriend\Model\SendFriend::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->productRepositoryMock = $this->getMockBuilder(\Magento\Catalog\Api\ProductRepositoryInterface::class)
--            ->getMockForAbstractClass();
--        $this->categoryRepositoryMock = $this->getMockBuilder(\Magento\Catalog\Api\CategoryRepositoryInterface::class)
--            ->getMockForAbstractClass();
--        $this->catalogSessionMock = $this->getMockBuilder(\Magento\Catalog\Model\Session::class)
--            ->setMethods(['getSendfriendFormData', 'setSendfriendFormData'])
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
--            ->getMock();
--        $this->resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->eventManagerMock = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
--            ->getMock();
--        $this->redirectMock = $this->getMockBuilder(\Magento\Framework\App\Response\RedirectInterface::class)
--            ->getMock();
--        $this->urlBuilderMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
--            ->getMock();
--
--        $this->objectManagerHelper = new ObjectManagerHelper($this);
--        $this->model = $this->objectManagerHelper->getObject(
--            \Magento\SendFriend\Controller\Product\Sendmail::class,
--            [
--                'request' => $this->requestMock,
--                'coreRegistry' => $this->registryMock,
--                'formKeyValidator' => $this->validatorMock,
--                'sendFriend' => $this->sendFriendMock,
--                'productRepository' => $this->productRepositoryMock,
--                'categoryRepository' => $this->categoryRepositoryMock,
--                'catalogSession' => $this->catalogSessionMock,
--                'messageManager' => $this->messageManagerMock,
--                'resultFactory' => $this->resultFactoryMock,
--                'eventManager' => $this->eventManagerMock,
--                'redirect' => $this->redirectMock,
--                'url' => $this->urlBuilderMock,
--            ]
--        );
--    }
--
--    /**
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function testExecute()
--    {
--        $productId = 11;
--        $categoryId = 5;
--        $sender = 'sender';
--        $recipients = 'recipients';
--        $formData = [
--            'sender' => $sender,
--            'recipients' => $recipients,
--        ];
--        $productUrl = 'product_url';
--
--        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->once())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
--            ->willReturn($redirectMock);
--
--        $this->validatorMock->expects($this->once())
--            ->method('validate')
--            ->with($this->requestMock)
--            ->willReturn(true);
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getParam')
--            ->willReturnMap(
--                [
--                    ['id', null, $productId],
--                    ['cat_id', null, $categoryId],
--                ]
--            );
--
--        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
--        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
--            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
--            ->getMockForAbstractClass();
--
--        $this->productRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($productId, false, null, false)
--            ->willReturn($productMock);
--
--        $productMock->expects($this->once())
--            ->method('isVisibleInCatalog')
--            ->willReturn(true);
--
--        /** @var \Magento\Catalog\Api\Data\CategoryInterface|\PHPUnit_Framework_MockObject_MockObject $categoryMock */
--        $categoryMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\CategoryInterface::class)
--            ->getMockForAbstractClass();
--
--        $this->categoryRepositoryMock->expects($this->once())
--            ->method('get')
--            ->with($categoryId, null)
--            ->willReturn($categoryMock);
--
--        $productMock->expects($this->once())
--            ->method('setCategory')
--            ->with($categoryMock);
--
--        $this->registryMock->expects($this->exactly(2))
--            ->method('register')
--            ->willReturnMap(
--                [
--                    ['product', $productMock, false, null],
--                    ['current_category', $categoryMock, false, null],
--                ]
--            );
--
--        $this->requestMock->expects($this->once())
--            ->method('getPostValue')
--            ->willReturn($formData);
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getPost')
--            ->willReturnMap(
--                [
--                    ['sender', $sender],
--                    ['recipients', $recipients],
--                ]
--            );
--
--        $this->sendFriendMock->expects($this->once())
--            ->method('setSender')
--            ->with($sender)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('setRecipients')
--            ->with($recipients)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('setProduct')
--            ->with($productMock)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('validate')
--            ->willReturn(true);
--        $this->sendFriendMock->expects($this->once())
--            ->method('send')
--            ->willReturnSelf();
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addSuccess')
--            ->with(__('The link to a friend was sent.'))
--            ->willReturnSelf();
--
--        $productMock->expects($this->once())
--            ->method('getProductUrl')
--            ->willReturn($productUrl);
--
--        $this->redirectMock->expects($this->once())
--            ->method('success')
--            ->with($productUrl)
--            ->willReturnArgument(0);
--
--        $redirectMock->expects($this->once())
--            ->method('setUrl')
--            ->with($productUrl)
--            ->willReturnSelf();
--
--        $this->assertEquals($redirectMock, $this->model->execute());
--    }
--
--    /**
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function testExecuteWithoutValidationAndCategory()
--    {
--        $productId = 11;
--        $categoryId = 5;
--        $sender = 'sender';
--        $recipients = 'recipients';
--        $formData = [
--            'sender' => $sender,
--            'recipients' => $recipients,
--        ];
--        $redirectUrl = 'redirect_url';
--
--        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->once())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
--            ->willReturn($redirectMock);
--
--        $this->validatorMock->expects($this->once())
--            ->method('validate')
--            ->with($this->requestMock)
--            ->willReturn(true);
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getParam')
--            ->willReturnMap(
--                [
--                    ['id', null, $productId],
--                    ['cat_id', null, $categoryId],
--                ]
--            );
--
--        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
--        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
--            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
--            ->getMockForAbstractClass();
--
--        $this->productRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($productId, false, null, false)
--            ->willReturn($productMock);
--
--        $productMock->expects($this->once())
--            ->method('isVisibleInCatalog')
--            ->willReturn(true);
--
--        $this->categoryRepositoryMock->expects($this->once())
--            ->method('get')
--            ->with($categoryId, null)
--            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Category Exception.')));
--
--        $productMock->expects($this->never())
--            ->method('setCategory');
--
--        $this->registryMock->expects($this->once())
--            ->method('register')
--            ->willReturnMap(
--                [
--                    ['product', $productMock, false, null],
--                ]
--            );
--
--        $this->requestMock->expects($this->once())
--            ->method('getPostValue')
--            ->willReturn($formData);
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getPost')
--            ->willReturnMap(
--                [
--                    ['sender', $sender],
--                    ['recipients', $recipients],
--                ]
--            );
--
--        $this->sendFriendMock->expects($this->once())
--            ->method('setSender')
--            ->with($sender)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('setRecipients')
--            ->with($recipients)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('setProduct')
--            ->with($productMock)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('validate')
--            ->willReturn(['Some error']);
--        $this->sendFriendMock->expects($this->never())
--            ->method('send');
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addError')
--            ->with(__('Some error'))
--            ->willReturnSelf();
--
--        $this->catalogSessionMock->expects($this->once())
--            ->method('setSendfriendFormData')
--            ->with($formData);
--
--        $this->urlBuilderMock->expects($this->once())
--            ->method('getUrl')
--            ->with('sendfriend/product/send', ['_current' => true])
--            ->willReturn($redirectUrl);
--
--        $this->redirectMock->expects($this->once())
--            ->method('error')
--            ->with($redirectUrl)
--            ->willReturnArgument(0);
--
--        $redirectMock->expects($this->once())
--            ->method('setUrl')
--            ->with($redirectUrl)
--            ->willReturnSelf();
--
--        $this->assertEquals($redirectMock, $this->model->execute());
--    }
--
--    /**
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function testExecuteWithoutValidationAndCategoryWithProblems()
--    {
--        $productId = 11;
--        $categoryId = 5;
--        $sender = 'sender';
--        $recipients = 'recipients';
--        $formData = [
--            'sender' => $sender,
--            'recipients' => $recipients,
--        ];
--        $redirectUrl = 'redirect_url';
--
--        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->once())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
--            ->willReturn($redirectMock);
--
--        $this->validatorMock->expects($this->once())
--            ->method('validate')
--            ->with($this->requestMock)
--            ->willReturn(true);
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getParam')
--            ->willReturnMap(
--                [
--                    ['id', null, $productId],
--                    ['cat_id', null, $categoryId],
--                ]
--            );
--
--        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
--        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
--            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
--            ->getMockForAbstractClass();
--
--        $this->productRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($productId, false, null, false)
--            ->willReturn($productMock);
--
--        $productMock->expects($this->once())
--            ->method('isVisibleInCatalog')
--            ->willReturn(true);
--
--        $this->categoryRepositoryMock->expects($this->once())
--            ->method('get')
--            ->with($categoryId, null)
--            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Category Exception.')));
--
--        $productMock->expects($this->never())
--            ->method('setCategory');
--
--        $this->registryMock->expects($this->once())
--            ->method('register')
--            ->willReturnMap(
--                [
--                    ['product', $productMock, false, null],
--                ]
--            );
--
--        $this->requestMock->expects($this->once())
--            ->method('getPostValue')
--            ->willReturn($formData);
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getPost')
--            ->willReturnMap(
--                [
--                    ['sender', $sender],
--                    ['recipients', $recipients],
--                ]
--            );
--
--        $this->sendFriendMock->expects($this->once())
--            ->method('setSender')
--            ->with($sender)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('setRecipients')
--            ->with($recipients)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('setProduct')
--            ->with($productMock)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('validate')
--            ->willReturn('Some error');
--        $this->sendFriendMock->expects($this->never())
--            ->method('send');
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addError')
--            ->with(__('We found some problems with the data.'))
--            ->willReturnSelf();
--
--        $this->catalogSessionMock->expects($this->once())
--            ->method('setSendfriendFormData')
--            ->with($formData);
--
--        $this->urlBuilderMock->expects($this->once())
--            ->method('getUrl')
--            ->with('sendfriend/product/send', ['_current' => true])
--            ->willReturn($redirectUrl);
--
--        $this->redirectMock->expects($this->once())
--            ->method('error')
--            ->with($redirectUrl)
--            ->willReturnArgument(0);
--
--        $redirectMock->expects($this->once())
--            ->method('setUrl')
--            ->with($redirectUrl)
--            ->willReturnSelf();
--
--        $this->assertEquals($redirectMock, $this->model->execute());
--    }
--
--    /**
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function testExecuteWithLocalizedException()
--    {
--        $productId = 11;
--        $categoryId = 5;
--        $sender = 'sender';
--        $recipients = 'recipients';
--        $formData = [
--            'sender' => $sender,
--            'recipients' => $recipients,
--        ];
--        $redirectUrl = 'redirect_url';
--
--        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->once())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
--            ->willReturn($redirectMock);
--
--        $this->validatorMock->expects($this->once())
--            ->method('validate')
--            ->with($this->requestMock)
--            ->willReturn(true);
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getParam')
--            ->willReturnMap(
--                [
--                    ['id', null, $productId],
--                    ['cat_id', null, $categoryId],
--                ]
--            );
--
--        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
--        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
--            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
--            ->getMockForAbstractClass();
--
--        $this->productRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($productId, false, null, false)
--            ->willReturn($productMock);
--
--        $productMock->expects($this->once())
--            ->method('isVisibleInCatalog')
--            ->willReturn(true);
--
--        $this->categoryRepositoryMock->expects($this->once())
--            ->method('get')
--            ->with($categoryId, null)
--            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Category Exception.')));
--
--        $productMock->expects($this->never())
--            ->method('setCategory');
--
--        $this->registryMock->expects($this->once())
--            ->method('register')
--            ->willReturnMap(
--                [
--                    ['product', $productMock, false, null],
--                ]
--            );
--
--        $this->requestMock->expects($this->once())
--            ->method('getPostValue')
--            ->willReturn($formData);
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getPost')
--            ->willReturnMap(
--                [
--                    ['sender', $sender],
--                    ['recipients', $recipients],
--                ]
--            );
--
--        $this->sendFriendMock->expects($this->once())
--            ->method('setSender')
--            ->with($sender)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('setRecipients')
--            ->with($recipients)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('setProduct')
--            ->with($productMock)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('validate')
--            ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('Localized Exception.')));
--        $this->sendFriendMock->expects($this->never())
--            ->method('send');
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addError')
--            ->with(__('Localized Exception.'))
--            ->willReturnSelf();
--
--        $this->catalogSessionMock->expects($this->once())
--            ->method('setSendfriendFormData')
--            ->with($formData);
--
--        $this->urlBuilderMock->expects($this->once())
--            ->method('getUrl')
--            ->with('sendfriend/product/send', ['_current' => true])
--            ->willReturn($redirectUrl);
--
--        $this->redirectMock->expects($this->once())
--            ->method('error')
--            ->with($redirectUrl)
--            ->willReturnArgument(0);
--
--        $redirectMock->expects($this->once())
--            ->method('setUrl')
--            ->with($redirectUrl)
--            ->willReturnSelf();
--
--        $this->assertEquals($redirectMock, $this->model->execute());
--    }
--
--    /**
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function testExecuteWithException()
--    {
--        $productId = 11;
--        $categoryId = 5;
--        $sender = 'sender';
--        $recipients = 'recipients';
--        $formData = [
--            'sender' => $sender,
--            'recipients' => $recipients,
--        ];
--        $redirectUrl = 'redirect_url';
--
--        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->once())
--            ->method('create')
--            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
--            ->willReturn($redirectMock);
--
--        $this->validatorMock->expects($this->once())
--            ->method('validate')
--            ->with($this->requestMock)
--            ->willReturn(true);
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getParam')
--            ->willReturnMap(
--                [
--                    ['id', null, $productId],
--                    ['cat_id', null, $categoryId],
--                ]
--            );
--
--        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
--        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
--            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
--            ->getMockForAbstractClass();
--
--        $this->productRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($productId, false, null, false)
--            ->willReturn($productMock);
--
--        $productMock->expects($this->once())
--            ->method('isVisibleInCatalog')
--            ->willReturn(true);
--
--        $this->categoryRepositoryMock->expects($this->once())
--            ->method('get')
--            ->with($categoryId, null)
--            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Category Exception.')));
--
--        $productMock->expects($this->never())
--            ->method('setCategory');
--
--        $this->registryMock->expects($this->once())
--            ->method('register')
--            ->willReturnMap(
--                [
--                    ['product', $productMock, false, null],
--                ]
--            );
--
--        $this->requestMock->expects($this->once())
--            ->method('getPostValue')
--            ->willReturn($formData);
--
--        $this->requestMock->expects($this->exactly(2))
--            ->method('getPost')
--            ->willReturnMap(
--                [
--                    ['sender', $sender],
--                    ['recipients', $recipients],
--                ]
--            );
--
--        $this->sendFriendMock->expects($this->once())
--            ->method('setSender')
--            ->with($sender)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('setRecipients')
--            ->with($recipients)
--            ->willReturnSelf();
--        $this->sendFriendMock->expects($this->once())
--            ->method('setProduct')
--            ->with($productMock)
--            ->willReturnSelf();
--        $exception = new \Exception(__('Exception.'));
--        $this->sendFriendMock->expects($this->once())
--            ->method('validate')
--            ->willThrowException($exception);
--        $this->sendFriendMock->expects($this->never())
--            ->method('send');
--
--        $this->messageManagerMock->expects($this->once())
--            ->method('addException')
--            ->with($exception, __('Some emails were not sent.'))
--            ->willReturnSelf();
--
--        $this->catalogSessionMock->expects($this->once())
--            ->method('setSendfriendFormData')
--            ->with($formData);
--
--        $this->urlBuilderMock->expects($this->once())
--            ->method('getUrl')
--            ->with('sendfriend/product/send', ['_current' => true])
--            ->willReturn($redirectUrl);
--
--        $this->redirectMock->expects($this->once())
--            ->method('error')
--            ->with($redirectUrl)
--            ->willReturnArgument(0);
--
--        $redirectMock->expects($this->once())
--            ->method('setUrl')
--            ->with($redirectUrl)
--            ->willReturnSelf();
--
--        $this->assertEquals($redirectMock, $this->model->execute());
--    }
--
--    /**
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function testExecuteWithoutProduct()
--    {
--        $sender = 'sender';
--        $recipients = 'recipients';
--        $formData = [
--            'sender' => $sender,
--            'recipients' => $recipients,
--        ];
--
--        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
--        $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->exactly(2))
--            ->method('create')
--            ->willReturnMap(
--                [
--                    [\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [], $redirectMock],
--                    [\Magento\Framework\Controller\ResultFactory::TYPE_FORWARD, [], $forwardMock],
--                ]
--            );
--
--        $this->validatorMock->expects($this->once())
--            ->method('validate')
--            ->with($this->requestMock)
--            ->willReturn(true);
--
--        $this->requestMock->expects($this->once())
--            ->method('getParam')
--            ->willReturnMap(
--                [
--                    ['id', null, null],
--                ]
--            );
--
--        $this->requestMock->expects($this->once())
--            ->method('getPostValue')
--            ->willReturn($formData);
--
--        $forwardMock->expects($this->once())
--            ->method('forward')
--            ->with('noroute')
--            ->willReturnSelf();
--
--        $this->assertEquals($forwardMock, $this->model->execute());
--    }
--
--    /**
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function testExecuteWithoutData()
--    {
--        $productId = 11;
--        $formData = '';
--
--        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
--        $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->exactly(2))
--            ->method('create')
--            ->willReturnMap(
--                [
--                    [\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [], $redirectMock],
--                    [\Magento\Framework\Controller\ResultFactory::TYPE_FORWARD, [], $forwardMock],
--                ]
--            );
--
--        $this->validatorMock->expects($this->once())
--            ->method('validate')
--            ->with($this->requestMock)
--            ->willReturn(true);
--
--        $this->requestMock->expects($this->once())
--            ->method('getParam')
--            ->willReturnMap(
--                [
--                    ['id', null, $productId],
--                ]
--            );
--
--        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
--        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
--            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
--            ->getMockForAbstractClass();
--
--        $this->productRepositoryMock->expects($this->once())
--            ->method('getById')
--            ->with($productId, false, null, false)
--            ->willReturn($productMock);
--
--        $productMock->expects($this->once())
--            ->method('isVisibleInCatalog')
--            ->willReturn(true);
--
--        $this->registryMock->expects($this->once())
--            ->method('register')
--            ->willReturnMap(
--                [
--                    ['product', $productMock, false, null],
--                ]
--            );
--
--        $this->requestMock->expects($this->once())
--            ->method('getPostValue')
--            ->willReturn($formData);
--
--        $forwardMock->expects($this->once())
--            ->method('forward')
--            ->with('noroute')
--            ->willReturnSelf();
--
--        $this->assertEquals($forwardMock, $this->model->execute());
--    }
--
--    public function testExecuteWithoutFormKey()
--    {
--        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
--        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock->expects($this->once())
--            ->method('create')
--            ->willReturnMap(
--                [
--                    [\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [], $redirectMock],
--                ]
--            );
--
--        $this->validatorMock->expects($this->once())
--            ->method('validate')
--            ->with($this->requestMock)
--            ->willReturn(false);
--
--        $redirectMock->expects($this->once())
--            ->method('setPath')
--            ->with('sendfriend/product/send', ['_current' => true])
--            ->willReturnSelf();
--
--        $this->assertEquals($redirectMock, $this->model->execute());
--    }
--}
-diff --git a/app/code/Magento/SendFriend/composer.json b/app/code/Magento/SendFriend/composer.json
-index 30aecf13c35..932093004cf 100644
---- a/app/code/Magento/SendFriend/composer.json
-+++ b/app/code/Magento/SendFriend/composer.json
-@@ -9,7 +9,9 @@
-         "magento/framework": "*",
-         "magento/module-catalog": "*",
-         "magento/module-customer": "*",
--        "magento/module-store": "*"
-+        "magento/module-store": "*",
-+        "magento/module-captcha": "*",
-+        "magento/module-authorization": "*"
-     },
-     "type": "magento2-module",
-     "license": [
-diff --git a/app/code/Magento/SendFriend/etc/config.xml b/app/code/Magento/SendFriend/etc/config.xml
-index 9fa005dcd2f..d65e5a4a073 100644
---- a/app/code/Magento/SendFriend/etc/config.xml
-+++ b/app/code/Magento/SendFriend/etc/config.xml
-@@ -17,5 +17,21 @@
-                 <check_by>0</check_by>
-             </email>
-         </sendfriend>
-+        <captcha translate="label">
-+            <frontend>
-+                <areas>
-+                    <product_sendtofriend_form>
-+                        <label>Send To Friend Form</label>
-+                    </product_sendtofriend_form>
-+                </areas>
-+            </frontend>
-+        </captcha>
-+        <customer>
-+            <captcha>
-+                <shown_to_logged_in_user>
-+                    <product_sendtofriend_form>1</product_sendtofriend_form>
-+                </shown_to_logged_in_user>
-+            </captcha>
-+        </customer>
-     </default>
- </config>
-diff --git a/app/code/Magento/SendFriend/etc/db_schema.xml b/app/code/Magento/SendFriend/etc/db_schema.xml
-index 7537f67cf55..b9551749dfc 100644
---- a/app/code/Magento/SendFriend/etc/db_schema.xml
-+++ b/app/code/Magento/SendFriend/etc/db_schema.xml
-@@ -16,13 +16,13 @@
-                 comment="Log time"/>
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Website ID"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="log_id"/>
-         </constraint>
--        <index name="SENDFRIEND_LOG_IP" indexType="btree">
-+        <index referenceId="SENDFRIEND_LOG_IP" indexType="btree">
-             <column name="ip"/>
-         </index>
--        <index name="SENDFRIEND_LOG_TIME" indexType="btree">
-+        <index referenceId="SENDFRIEND_LOG_TIME" indexType="btree">
-             <column name="time"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/SendFriend/etc/module.xml b/app/code/Magento/SendFriend/etc/module.xml
-index 01c267b3c4f..7876ef88618 100644
---- a/app/code/Magento/SendFriend/etc/module.xml
-+++ b/app/code/Magento/SendFriend/etc/module.xml
-@@ -10,6 +10,7 @@
-     <module name="Magento_SendFriend" >
-         <sequence>
-             <module name="Magento_Catalog"/>
-+            <module name="Magento_Captcha"/>
-         </sequence>
-     </module>
- </config>
-diff --git a/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml b/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml
-index 8065b7e2361..4d6f3d8c628 100644
---- a/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml
-+++ b/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml
-@@ -13,7 +13,7 @@
-             </action>
-         </referenceBlock>
-         <referenceContainer name="content">
--            <block class="Magento\SendFriend\Block\Send" name="sendfriend.send" template="Magento_SendFriend::send.phtml">
-+            <block class="Magento\SendFriend\Block\Send" name="sendfriend.send" cacheable="false" template="Magento_SendFriend::send.phtml">
-                 <container name="form.additional.info" as="form_additional_info"/>
-             </block>
-         </referenceContainer>
-diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
-index 3342530f01e..eb9318271c1 100644
---- a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
-+++ b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * Send to friend form
-  */
-@@ -17,13 +15,13 @@
-         <div class="secondary">
-             <button type="button" id="btn-remove<%- data._index_ %>" class="action remove"
-                title="<?= $block->escapeHtmlAttr(__('Remove Recipent')) ?>">
--               <span><?= $block->escapeJs($block->escapeHtml(__('Remove'))) ?></span>
-+               <span><?= $block->escapeHtml(__('Remove')) ?></span>
-             </button>
-         </div>
-     </div>
-     <fieldset class="fieldset">
-         <div class="field name required">
--            <label for="recipients-name<%- data._index_ %>" class="label"><span><?= $block->escapeJs($block->escapeHtml(__('Name'))) ?></span></label>
-+            <label for="recipients-name<%- data._index_ %>" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
-             <div class="control">
-                 <input name="recipients[name][<%- data._index_ %>]" type="text" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" class="input-text"
-                        id="recipients-name<%- data._index_ %>" data-validate="{required:true}"/>
-@@ -31,7 +29,7 @@
-         </div>
- 
-         <div class="field email required">
--            <label for="recipients-email<%- data._index_ %>" class="label"><span><?= $block->escapeJs($block->escapeHtml(__('Email'))) ?></span></label>
-+            <label for="recipients-email<%- data._index_ %>" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
-             <div class="control">
-                 <input name="recipients[email][<%- data._index_ %>]" title="<?= $block->escapeHtmlAttr(__('Email')) ?>"
-                        id="recipients-email<%- data._index_ %>" type="email" class="input-text"
-@@ -93,14 +91,14 @@
-         <legend class="legend"><span><?= $block->escapeHtml(__('Invitee')) ?></span></legend>
-         <br />
-         <div id="recipients-options"></div>
--        <?php if ($block->getMaxRecipients()): ?>
-+        <?php if ($block->getMaxRecipients()) : ?>
-             <div id="max-recipient-message" style="display: none;" class="message notice limit" role="alert">
-                 <span><?= $block->escapeHtml(__('Maximum %1 email addresses allowed.', $block->getMaxRecipients())) ?></span>
-             </div>
-         <?php endif; ?>
-         <div class="actions-toolbar">
-             <div class="secondary">
--            <?php if (1 < $block->getMaxRecipients()): ?>
-+            <?php if (1 < $block->getMaxRecipients()) : ?>
-                 <button type="button" id="add-recipient-button" class="action add">
-                     <span><?= $block->escapeHtml(__('Add Invitee')) ?></span></button>
-             <?php endif; ?>
-@@ -108,10 +106,11 @@
-         </div>
-         <?= $block->getChildHtml('form_additional_info') ?>
-     </fieldset>
-+    <?= $block->getChildHtml('captcha'); ?>
-     <div class="actions-toolbar">
-         <div class="primary">
-             <button type="submit"
--                    class="action submit primary"<?php if (!$block->canSend()): ?> disabled="disabled"<?php endif ?>>
-+                    class="action submit primary"<?php if (!$block->canSend()) : ?> disabled="disabled"<?php endif ?>>
-                 <span><?= $block->escapeHtml(__('Send Email')) ?></span></button>
-         </div>
-         <div class="secondary">
-@@ -123,7 +122,7 @@
- <script type="text/x-magento-init">
-     {
-         "a[role='back']": {
--            "Magento_SendFriend/back-event": {}
-+            "Magento_SendFriend/js/back-event": {}
-         }
-     }
- </script>
-diff --git a/app/code/Magento/SendFriend/view/frontend/web/back-event.js b/app/code/Magento/SendFriend/view/frontend/web/js/back-event.js
-similarity index 100%
-rename from app/code/Magento/SendFriend/view/frontend/web/back-event.js
-rename to app/code/Magento/SendFriend/view/frontend/web/js/back-event.js
-diff --git a/app/code/Magento/SendFriend/view/frontend/web/requirejs-config.js b/app/code/Magento/SendFriend/view/frontend/web/requirejs-config.js
-new file mode 100644
-index 00000000000..8e85666c236
---- /dev/null
-+++ b/app/code/Magento/SendFriend/view/frontend/web/requirejs-config.js
-@@ -0,0 +1,11 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+var config = {
-+    map: {
-+        '*': {
-+            'Magento_SendFriend/back-event': 'Magento_SendFriend/js/back-event'
-+        }
-+    }
-+};
-diff --git a/app/code/Magento/SendFriendGraphQl/Model/Provider/GetVisibleProduct.php b/app/code/Magento/SendFriendGraphQl/Model/Provider/GetVisibleProduct.php
-new file mode 100644
-index 00000000000..64a17a868c3
---- /dev/null
-+++ b/app/code/Magento/SendFriendGraphQl/Model/Provider/GetVisibleProduct.php
-@@ -0,0 +1,65 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\SendFriendGraphQl\Model\Provider;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+
-+/**
-+ * Returns product if it is visible in catalog.
-+ */
-+class GetVisibleProduct
-+{
-+    /** @var ProductRepositoryInterface */
-+    private $productRepository;
-+
-+    /** @var Visibility */
-+    private $visibility;
-+
-+    /**
-+     * @param ProductRepositoryInterface $productRepository
-+     * @param Visibility $visibility
-+     */
-+    public function __construct(
-+        ProductRepositoryInterface $productRepository,
-+        Visibility $visibility
-+    ) {
-+        $this->productRepository = $productRepository;
-+        $this->visibility = $visibility;
-+    }
-+
-+    /**
-+     * Get product
-+     *
-+     * @param int $productId
-+     * @return ProductInterface
-+     * @throws GraphQlNoSuchEntityException
-+     */
-+    public function execute(int $productId): ProductInterface
-+    {
-+        try {
-+            $product = $this->productRepository->getById($productId);
-+
-+            if (!in_array(
-+                (int) $product->getVisibility(),
-+                $this->visibility->getVisibleInSiteIds(),
-+                true
-+            )) {
-+                throw new GraphQlNoSuchEntityException(
-+                    __("The product that was requested doesn't exist. Verify the product and try again.")
-+                );
-+            }
-+        } catch (NoSuchEntityException $e) {
-+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-+        }
-+        return $product;
-+    }
-+}
-diff --git a/app/code/Magento/SendFriendGraphQl/Model/Resolver/SendEmailToFriend.php b/app/code/Magento/SendFriendGraphQl/Model/Resolver/SendEmailToFriend.php
-new file mode 100644
-index 00000000000..0a4fe1e3e56
---- /dev/null
-+++ b/app/code/Magento/SendFriendGraphQl/Model/Resolver/SendEmailToFriend.php
-@@ -0,0 +1,125 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\SendFriendGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+use Magento\SendFriend\Helper\Data as SendFriendHelper;
-+use Magento\SendFriendGraphQl\Model\SendFriend\SendEmail;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class SendEmailToFriend implements ResolverInterface
-+{
-+    /**
-+     * @var SendFriendHelper
-+     */
-+    private $sendFriendHelper;
-+
-+    /**
-+     * @var SendEmail
-+     */
-+    private $sendEmail;
-+
-+    /**
-+     * @param SendEmail $sendEmail
-+     * @param SendFriendHelper $sendFriendHelper
-+     */
-+    public function __construct(
-+        SendEmail $sendEmail,
-+        SendFriendHelper $sendFriendHelper
-+    ) {
-+        $this->sendEmail = $sendEmail;
-+        $this->sendFriendHelper = $sendFriendHelper;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-+    {
-+        /** @var ContextInterface $context */
-+        if (!$this->sendFriendHelper->isAllowForGuest()
-+            && false === $context->getExtensionAttributes()->getIsCustomer()
-+        ) {
-+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-+        }
-+
-+        $senderData = $this->extractSenderData($args);
-+        $recipientsData = $this->extractRecipientsData($args);
-+
-+        $this->sendEmail->execute(
-+            $args['input']['product_id'],
-+            $senderData,
-+            $recipientsData
-+        );
-+        return array_merge($senderData, $recipientsData);
-+    }
-+
-+    /**
-+     * Extract recipients data
-+     *
-+     * @param array $args
-+     * @return array
-+     * @throws GraphQlInputException
-+     */
-+    private function extractRecipientsData(array $args): array
-+    {
-+        $recipients = [];
-+        foreach ($args['input']['recipients'] as $recipient) {
-+            if (empty($recipient['name'])) {
-+                throw new GraphQlInputException(__('Please provide Name for all of recipients.'));
-+            }
-+
-+            if (empty($recipient['email'])) {
-+                throw new GraphQlInputException(__('Please provide Email for all of recipients.'));
-+            }
-+
-+            $recipients[] = [
-+                'name' => $recipient['name'],
-+                'email' => $recipient['email'],
-+            ];
-+        }
-+        return ['recipients' => $recipients];
-+    }
-+
-+    /**
-+     * Extract sender data
-+     *
-+     * @param array $args
-+     * @return array
-+     * @throws GraphQlInputException
-+     */
-+    private function extractSenderData(array $args): array
-+    {
-+        if (empty($args['input']['sender']['name'])) {
-+            throw new GraphQlInputException(__('Please provide Name of sender.'));
-+        }
-+
-+        if (empty($args['input']['sender']['email'])) {
-+            throw new GraphQlInputException(__('Please provide Email of sender.'));
-+        }
-+
-+        if (empty($args['input']['sender']['message'])) {
-+            throw new GraphQlInputException(__('Please provide Message.'));
-+        }
-+
-+        return [
-+            'sender' => [
-+                'name' => $args['input']['sender']['name'],
-+                'email' => $args['input']['sender']['email'],
-+                'message' => $args['input']['sender']['message'],
-+            ],
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/SendFriendGraphQl/Model/SendFriend/SendEmail.php b/app/code/Magento/SendFriendGraphQl/Model/SendFriend/SendEmail.php
-new file mode 100644
-index 00000000000..70df366fa17
---- /dev/null
-+++ b/app/code/Magento/SendFriendGraphQl/Model/SendFriend/SendEmail.php
-@@ -0,0 +1,130 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\SendFriendGraphQl\Model\SendFriend;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\DataObjectFactory;
-+use Magento\Framework\Event\ManagerInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\SendFriend\Model\SendFriend;
-+use Magento\SendFriend\Model\SendFriendFactory;
-+use Magento\SendFriendGraphQl\Model\Provider\GetVisibleProduct;
-+
-+/**
-+ * Send Product Email to Friend(s)
-+ */
-+class SendEmail
-+{
-+    /**
-+     * @var DataObjectFactory
-+     */
-+    private $dataObjectFactory;
-+
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @var SendFriendFactory
-+     */
-+    private $sendFriendFactory;
-+
-+    /**
-+     * @var ManagerInterface
-+     */
-+    private $eventManager;
-+
-+    /**
-+     * @var GetVisibleProduct
-+     */
-+    private $visibleProductProvider;
-+
-+    /**
-+     * SendEmail constructor.
-+     * @param DataObjectFactory $dataObjectFactory
-+     * @param ProductRepositoryInterface $productRepository
-+     * @param SendFriendFactory $sendFriendFactory
-+     * @param ManagerInterface $eventManager
-+     * @param GetVisibleProduct $visibleProductProvider
-+     */
-+    public function __construct(
-+        DataObjectFactory $dataObjectFactory,
-+        ProductRepositoryInterface $productRepository,
-+        SendFriendFactory $sendFriendFactory,
-+        ManagerInterface $eventManager,
-+        GetVisibleProduct $visibleProductProvider
-+    ) {
-+        $this->dataObjectFactory = $dataObjectFactory;
-+        $this->productRepository = $productRepository;
-+        $this->sendFriendFactory = $sendFriendFactory;
-+        $this->eventManager = $eventManager;
-+        $this->visibleProductProvider = $visibleProductProvider;
-+    }
-+
-+    /**
-+     * Send product email to friend(s)
-+     *
-+     * @param int $productId
-+     * @param array $senderData
-+     * @param array $recipientsData
-+     * @throws GraphQlInputException
-+     * @throws GraphQlNoSuchEntityException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function execute(int $productId, array $senderData, array $recipientsData): void
-+    {
-+        /** @var SendFriend $sendFriend */
-+        $sendFriend = $this->sendFriendFactory->create();
-+
-+        if ($sendFriend->getMaxSendsToFriend() && $sendFriend->isExceedLimit()) {
-+            throw new GraphQlInputException(
-+                __('You can\'t send messages more than %1 times an hour.', $sendFriend->getMaxSendsToFriend())
-+            );
-+        }
-+
-+        $product = $this->visibleProductProvider->execute($productId);
-+
-+        $this->eventManager->dispatch('sendfriend_product', ['product' => $product]);
-+
-+        $sendFriend->setProduct($product);
-+        $sendFriend->setSender($senderData);
-+        $sendFriend->setRecipients($recipientsData);
-+
-+        $this->validateSendFriendModel($sendFriend, $senderData, $recipientsData);
-+
-+        $sendFriend->send();
-+    }
-+
-+    /**
-+     * Validate send friend model
-+     *
-+     * @param SendFriend $sendFriend
-+     * @param array $senderData
-+     * @param array $recipientsData
-+     * @return void
-+     * @throws GraphQlInputException
-+     */
-+    private function validateSendFriendModel(SendFriend $sendFriend, array $senderData, array $recipientsData): void
-+    {
-+        $sender = $this->dataObjectFactory->create()->setData($senderData['sender']);
-+        $sendFriend->setData('_sender', $sender);
-+
-+        $emails = array_column($recipientsData['recipients'], 'email');
-+        $recipients = $this->dataObjectFactory->create()->setData('emails', $emails);
-+        $sendFriend->setData('_recipients', $recipients);
-+
-+        $validationResult = $sendFriend->validate();
-+        if ($validationResult !== true) {
-+            throw new GraphQlInputException(__(implode($validationResult)));
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/SendFriendGraphQl/README.md b/app/code/Magento/SendFriendGraphQl/README.md
-new file mode 100644
-index 00000000000..d8051922dda
---- /dev/null
-+++ b/app/code/Magento/SendFriendGraphQl/README.md
-@@ -0,0 +1,3 @@
-+# SendFriendGraphQl
-+
-+**SendFriendGraphQl** provides support of GraphQL for SendFriend functionality.
-diff --git a/app/code/Magento/SendFriendGraphQl/composer.json b/app/code/Magento/SendFriendGraphQl/composer.json
-new file mode 100644
-index 00000000000..091c6848791
---- /dev/null
-+++ b/app/code/Magento/SendFriendGraphQl/composer.json
-@@ -0,0 +1,24 @@
-+{
-+    "name": "magento/module-send-friend-graph-ql",
-+    "description": "N/A",
-+    "type": "magento2-module",
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-catalog": "*",
-+        "magento/module-send-friend": "*",
-+        "magento/module-graph-ql": "*"
-+    },
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\SendFriendGraphQl\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/SendFriendGraphQl/etc/module.xml b/app/code/Magento/SendFriendGraphQl/etc/module.xml
-new file mode 100644
-index 00000000000..3df33266cac
---- /dev/null
-+++ b/app/code/Magento/SendFriendGraphQl/etc/module.xml
-@@ -0,0 +1,11 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_SendFriendGraphQl"/>
-+</config>
-diff --git a/app/code/Magento/SendFriendGraphQl/etc/schema.graphqls b/app/code/Magento/SendFriendGraphQl/etc/schema.graphqls
-new file mode 100644
-index 00000000000..1234b65a7b9
---- /dev/null
-+++ b/app/code/Magento/SendFriendGraphQl/etc/schema.graphqls
-@@ -0,0 +1,39 @@
-+# Copyright © Magento, Inc. All rights reserved.
-+# See COPYING.txt for license details.
-+
-+type Mutation {
-+    sendEmailToFriend (input: SendEmailToFriendInput): SendEmailToFriendOutput @resolver(class: "\\Magento\\SendFriendGraphQl\\Model\\Resolver\\SendEmailToFriend") @doc(description:"Recommends Product by Sending Single/Multiple Email")
-+}
-+
-+input SendEmailToFriendInput {
-+    product_id: Int!
-+    sender: SendEmailToFriendSenderInput!
-+    recipients: [SendEmailToFriendRecipientInput!]!
-+}
-+
-+input SendEmailToFriendSenderInput {
-+    name: String!
-+    email: String!
-+    message: String!
-+}
-+
-+input SendEmailToFriendRecipientInput {
-+    name: String!
-+    email: String!
-+}
-+
-+type SendEmailToFriendOutput {
-+    sender: SendEmailToFriendSender
-+    recipients: [SendEmailToFriendRecipient]
-+}
-+
-+type SendEmailToFriendSender {
-+    name: String!
-+    email: String!
-+    message: String!
-+}
-+
-+type SendEmailToFriendRecipient {
-+    name: String!
-+    email: String!
-+}
-diff --git a/app/code/Magento/SendFriendGraphQl/registration.php b/app/code/Magento/SendFriendGraphQl/registration.php
-new file mode 100644
-index 00000000000..13ec47b16ab
---- /dev/null
-+++ b/app/code/Magento/SendFriendGraphQl/registration.php
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_SendFriendGraphQl', __DIR__);
-diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
-index b4ff445c63f..e5e419328ee 100644
---- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
-+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
-@@ -74,6 +74,7 @@ class Packaging extends \Magento\Backend\Block\Template
-      * Configuration for popup window for packaging
-      *
-      * @return string
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     public function getConfigDataJson()
-     {
-@@ -86,7 +87,7 @@ class Packaging extends \Magento\Backend\Block\Template
-         $itemsName = [];
-         $itemsWeight = [];
-         $itemsProductId = [];
--
-+        $itemsOrderItemId = [];
-         if ($shipmentId) {
-             $urlParams['shipment_id'] = $shipmentId;
-             $createLabelUrl = $this->getUrl('adminhtml/order_shipment/createLabel', $urlParams);
-diff --git a/app/code/Magento/Shipping/Block/DataProviders/Tracking/DeliveryDateTitle.php b/app/code/Magento/Shipping/Block/DataProviders/Tracking/DeliveryDateTitle.php
-new file mode 100644
-index 00000000000..ec1ee277a5a
---- /dev/null
-+++ b/app/code/Magento/Shipping/Block/DataProviders/Tracking/DeliveryDateTitle.php
-@@ -0,0 +1,27 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Shipping\Block\DataProviders\Tracking;
-+
-+use Magento\Framework\View\Element\Block\ArgumentInterface;
-+use Magento\Shipping\Model\Tracking\Result\Status;
-+
-+/**
-+ * Extension point to provide ability to change tracking details titles
-+ */
-+class DeliveryDateTitle implements ArgumentInterface
-+{
-+    /**
-+     * Returns Title in case if carrier defined
-+     *
-+     * @param Status $trackingStatus
-+     * @return \Magento\Framework\Phrase|string
-+     */
-+    public function getTitle(Status $trackingStatus)
-+    {
-+        return $trackingStatus->getCarrier() ? __('Delivered on:') : '';
-+    }
-+}
-diff --git a/app/code/Magento/Shipping/Block/Tracking/Popup.php b/app/code/Magento/Shipping/Block/Tracking/Popup.php
-index ac6575c363c..1eb679bd8cc 100644
---- a/app/code/Magento/Shipping/Block/Tracking/Popup.php
-+++ b/app/code/Magento/Shipping/Block/Tracking/Popup.php
-@@ -9,6 +9,8 @@ namespace Magento\Shipping\Block\Tracking;
- use Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface;
- 
- /**
-+ * Tracking popup
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -105,13 +107,15 @@ class Popup extends \Magento\Framework\View\Element\Template
-      */
-     public function getContactUsEnabled()
-     {
--        return (bool)$this->_scopeConfig->getValue(
--            'contacts/contacts/enabled',
-+        return $this->_scopeConfig->isSetFlag(
-+            'contact/contact/enabled',
-             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-         );
-     }
- 
-     /**
-+     * Get support email
-+     *
-      * @return string
-      */
-     public function getStoreSupportEmail()
-@@ -123,6 +127,8 @@ class Popup extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get contact us url
-+     *
-      * @return string
-      */
-     public function getContactUs()
-diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
-index fa83db490e3..c417a202321 100644
---- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
-+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
-@@ -1,14 +1,27 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
- 
- use Magento\Backend\App\Action;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Controller\ResultFactory;
-+use Magento\Framework\Controller\ResultInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Sales\Api\Data\ShipmentTrackInterfaceFactory;
-+use Magento\Sales\Api\ShipmentRepositoryInterface;
-+use Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader;
- 
--class AddTrack extends \Magento\Backend\App\Action
-+/**
-+ * Add new tracking number to shipment controller.
-+ */
-+class AddTrack extends Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -18,27 +31,54 @@ class AddTrack extends \Magento\Backend\App\Action
-     const ADMIN_RESOURCE = 'Magento_Sales::shipment';
- 
-     /**
--     * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
-+     * @var ShipmentLoader
-      */
-     protected $shipmentLoader;
- 
-+    /**
-+     * @var ShipmentRepositoryInterface
-+     */
-+    private $shipmentRepository;
-+
-+    /**
-+     * @var ShipmentTrackInterfaceFactory
-+     */
-+    private $trackFactory;
-+
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $serializer;
-+
-     /**
-      * @param Action\Context $context
--     * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
-+     * @param ShipmentLoader $shipmentLoader
-+     * @param ShipmentRepositoryInterface|null $shipmentRepository
-+     * @param ShipmentTrackInterfaceFactory|null $trackFactory
-+     * @param SerializerInterface|null $serializer
-      */
-     public function __construct(
-         Action\Context $context,
--        \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
-+        ShipmentLoader $shipmentLoader,
-+        ShipmentRepositoryInterface $shipmentRepository = null,
-+        ShipmentTrackInterfaceFactory $trackFactory = null,
-+        SerializerInterface $serializer = null
-     ) {
--        $this->shipmentLoader = $shipmentLoader;
-         parent::__construct($context);
-+
-+        $this->shipmentLoader = $shipmentLoader;
-+        $this->shipmentRepository = $shipmentRepository ?: ObjectManager::getInstance()
-+            ->get(ShipmentRepositoryInterface::class);
-+        $this->trackFactory = $trackFactory ?: ObjectManager::getInstance()
-+            ->get(ShipmentTrackInterfaceFactory::class);
-+        $this->serializer = $serializer ?: ObjectManager::getInstance()
-+            ->get(SerializerInterface::class);
-     }
- 
-     /**
--     * Add new tracking number action
-+     * Add new tracking number action.
-      *
--     * @return void
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @return ResultInterface
-      */
-     public function execute()
-     {
-@@ -46,28 +86,29 @@ class AddTrack extends \Magento\Backend\App\Action
-             $carrier = $this->getRequest()->getPost('carrier');
-             $number = $this->getRequest()->getPost('number');
-             $title = $this->getRequest()->getPost('title');
-+
-             if (empty($carrier)) {
--                throw new \Magento\Framework\Exception\LocalizedException(__('Please specify a carrier.'));
-+                throw new LocalizedException(__('Please specify a carrier.'));
-             }
-             if (empty($number)) {
--                throw new \Magento\Framework\Exception\LocalizedException(__('Please enter a tracking number.'));
-+                throw new LocalizedException(__('Please enter a tracking number.'));
-             }
-+
-             $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id'));
-             $this->shipmentLoader->setShipmentId($this->getRequest()->getParam('shipment_id'));
-             $this->shipmentLoader->setShipment($this->getRequest()->getParam('shipment'));
-             $this->shipmentLoader->setTracking($this->getRequest()->getParam('tracking'));
-             $shipment = $this->shipmentLoader->load();
-             if ($shipment) {
--                $track = $this->_objectManager->create(
--                    \Magento\Sales\Model\Order\Shipment\Track::class
--                )->setNumber(
-+                $track = $this->trackFactory->create()->setNumber(
-                     $number
-                 )->setCarrierCode(
-                     $carrier
-                 )->setTitle(
-                     $title
-                 );
--                $shipment->addTrack($track)->save();
-+                $shipment->addTrack($track);
-+                $this->shipmentRepository->save($shipment);
- 
-                 $this->_view->loadLayout();
-                 $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Shipments'));
-@@ -78,16 +119,18 @@ class AddTrack extends \Magento\Backend\App\Action
-                     'message' => __('We can\'t initialize shipment for adding tracking number.'),
-                 ];
-             }
--        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-+        } catch (LocalizedException $e) {
-             $response = ['error' => true, 'message' => $e->getMessage()];
-         } catch (\Exception $e) {
-             $response = ['error' => true, 'message' => __('Cannot add tracking number.')];
-         }
--        if (is_array($response)) {
--            $response = $this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($response);
--            $this->getResponse()->representJson($response);
--        } else {
--            $this->getResponse()->setBody($response);
-+
-+        if (\is_array($response)) {
-+            $response = $this->serializer->serialize($response);
-+
-+            return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setJsonData($response);
-         }
-+
-+        return $this->resultFactory->create(ResultFactory::TYPE_RAW)->setContents($response);
-     }
- }
-diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php
-index be0555fbcda..7231bc8b9c6 100644
---- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php
-+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php
-@@ -6,10 +6,11 @@
-  */
- namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Backend\App\Action;
- use Magento\Framework\App\ObjectManager;
- 
--class NewAction extends \Magento\Backend\App\Action
-+class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
-index 4804efcc76e..100ba029bea 100644
---- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
-+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
-@@ -1,19 +1,20 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
- 
--use Magento\Backend\App\Action;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\Controller\ResultFactory;
- use Magento\Sales\Model\Order\Shipment\Validation\QuantityValidator;
- 
- /**
-  * Class Save
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Save extends \Magento\Backend\App\Action
-+class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-@@ -47,17 +48,22 @@ class Save extends \Magento\Backend\App\Action
-      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
-      * @param \Magento\Shipping\Model\Shipping\LabelGenerator $labelGenerator
-      * @param \Magento\Sales\Model\Order\Email\Sender\ShipmentSender $shipmentSender
-+     * @param \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface|null $shipmentValidator
-      */
-     public function __construct(
-         \Magento\Backend\App\Action\Context $context,
-         \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader,
-         \Magento\Shipping\Model\Shipping\LabelGenerator $labelGenerator,
--        \Magento\Sales\Model\Order\Email\Sender\ShipmentSender $shipmentSender
-+        \Magento\Sales\Model\Order\Email\Sender\ShipmentSender $shipmentSender,
-+        \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface $shipmentValidator = null
-     ) {
-+        parent::__construct($context);
-+
-         $this->shipmentLoader = $shipmentLoader;
-         $this->labelGenerator = $labelGenerator;
-         $this->shipmentSender = $shipmentSender;
--        parent::__construct($context);
-+        $this->shipmentValidator = $shipmentValidator ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(\Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface::class);
-     }
- 
-     /**
-@@ -83,9 +89,10 @@ class Save extends \Magento\Backend\App\Action
- 
-     /**
-      * Save shipment
-+     *
-      * We can save only new shipment. Existing shipments are not editable
-      *
--     * @return void
-+     * @return \Magento\Framework\Controller\ResultInterface
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-@@ -97,7 +104,7 @@ class Save extends \Magento\Backend\App\Action
-         $formKeyIsValid = $this->_formKeyValidator->validate($this->getRequest());
-         $isPost = $this->getRequest()->isPost();
-         if (!$formKeyIsValid || !$isPost) {
--            $this->messageManager->addError(__('We can\'t save the shipment right now.'));
-+            $this->messageManager->addErrorMessage(__('We can\'t save the shipment right now.'));
-             return $resultRedirect->setPath('sales/order/index');
-         }
- 
-@@ -117,8 +124,7 @@ class Save extends \Magento\Backend\App\Action
-             $this->shipmentLoader->setTracking($this->getRequest()->getParam('tracking'));
-             $shipment = $this->shipmentLoader->load();
-             if (!$shipment) {
--                $this->_forward('noroute');
--                return;
-+                return $this->resultFactory->create(ResultFactory::TYPE_FORWARD)->forward('noroute');
-             }
- 
-             if (!empty($data['comment_text'])) {
-@@ -131,15 +137,13 @@ class Save extends \Magento\Backend\App\Action
-                 $shipment->setCustomerNote($data['comment_text']);
-                 $shipment->setCustomerNoteNotify(isset($data['comment_customer_notify']));
-             }
--            $validationResult = $this->getShipmentValidator()
--                ->validate($shipment, [QuantityValidator::class]);
-+            $validationResult = $this->shipmentValidator->validate($shipment, [QuantityValidator::class]);
- 
-             if ($validationResult->hasMessages()) {
--                $this->messageManager->addError(
-+                $this->messageManager->addErrorMessage(
-                     __("Shipment Document Validation Error(s):\n" . implode("\n", $validationResult->getMessages()))
-                 );
--                $this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
--                return;
-+                return $resultRedirect->setPath('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
-             }
-             $shipment->register();
- 
-@@ -159,7 +163,7 @@ class Save extends \Magento\Backend\App\Action
-             $shipmentCreatedMessage = __('The shipment has been created.');
-             $labelCreatedMessage = __('You created the shipping label.');
- 
--            $this->messageManager->addSuccess(
-+            $this->messageManager->addSuccessMessage(
-                 $isNeedCreateLabel ? $shipmentCreatedMessage . ' ' . $labelCreatedMessage : $shipmentCreatedMessage
-             );
-             $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getCommentText(true);
-@@ -168,8 +172,8 @@ class Save extends \Magento\Backend\App\Action
-                 $responseAjax->setError(true);
-                 $responseAjax->setMessage($e->getMessage());
-             } else {
--                $this->messageManager->addError($e->getMessage());
--                $this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
-+                $this->messageManager->addErrorMessage($e->getMessage());
-+                return $resultRedirect->setPath('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
-             }
-         } catch (\Exception $e) {
-             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-@@ -177,29 +181,14 @@ class Save extends \Magento\Backend\App\Action
-                 $responseAjax->setError(true);
-                 $responseAjax->setMessage(__('An error occurred while creating shipping label.'));
-             } else {
--                $this->messageManager->addError(__('Cannot save shipment.'));
--                $this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
-+                $this->messageManager->addErrorMessage(__('Cannot save shipment.'));
-+                return $resultRedirect->setPath('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
-             }
-         }
-         if ($isNeedCreateLabel) {
--            $this->getResponse()->representJson($responseAjax->toJson());
--        } else {
--            $this->_redirect('sales/order/view', ['order_id' => $shipment->getOrderId()]);
--        }
--    }
--
--    /**
--     * @return \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface
--     * @deprecated 100.1.1
--     */
--    private function getShipmentValidator()
--    {
--        if ($this->shipmentValidator === null) {
--            $this->shipmentValidator = $this->_objectManager->get(
--                \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface::class
--            );
-+            return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setJsonData($responseAjax->toJson());
-         }
- 
--        return $this->shipmentValidator;
-+        return $resultRedirect->setPath('sales/order/view', ['order_id' => $shipment->getOrderId()]);
-     }
- }
-diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php
-index ac15c0accd1..8a874ddc795 100644
---- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php
-+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
- 
--class Start extends \Magento\Backend\App\Action
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Start extends \Magento\Backend\App\Action implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
-index f9030ee7563..76555ce8a6d 100644
---- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
-+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
-@@ -160,7 +160,8 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
-     }
- 
-     /**
--     * Do request to shipment
-+     * Do request to shipment.
-+     *
-      * Implementation must be in overridden method
-      *
-      * @param Request $request
-@@ -173,7 +174,8 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
-     }
- 
-     /**
--     * Do return of shipment
-+     * Do return of shipment.
-+     *
-      * Implementation must be in overridden method
-      *
-      * @param Request $request
-@@ -275,6 +277,8 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
-     }
- 
-     /**
-+     * Validate request for available ship countries.
-+     *
-      * @param \Magento\Framework\DataObject $request
-      * @return $this|bool|false|\Magento\Framework\Model\AbstractModel
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-@@ -400,6 +404,8 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
-     }
- 
-     /**
-+     * Allows free shipping when all product items have free shipping.
-+     *
-      * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
-      * @return void
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-@@ -531,10 +537,10 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
-     }
- 
-     /**
--     * Sets the number of boxes for shipping
-+     * Gets the average weight of each box available for shipping
-      *
--     * @param int $weight in some measure
--     * @return int
-+     * @param float $weight in some measure
-+     * @return float
-      */
-     public function getTotalNumOfBoxes($weight)
-     {
-@@ -545,7 +551,7 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
-         $maxPackageWeight = $this->getConfigData('max_package_weight');
-         if ($weight > $maxPackageWeight && $maxPackageWeight != 0) {
-             $this->_numBoxes = ceil($weight / $maxPackageWeight);
--            $weight = $weight / $this->_numBoxes;
-+            $weight = (float)$weight / $this->_numBoxes;
-         }
- 
-         return $weight;
-@@ -671,7 +677,8 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
-     }
- 
-     /**
--     * Recursive replace sensitive xml nodes values by specified mask
-+     * Recursive replace sensitive xml nodes values by specified mask.
-+     *
-      * @param \SimpleXMLElement $xml
-      * @return void
-      */
-diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
-index be2588dc487..27047ae46bf 100644
---- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
-+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
-@@ -184,11 +184,11 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
-     /**
-      * Return code of carrier
-      *
--     * @return string
-+     * @return string|null
-      */
-     public function getCarrierCode()
-     {
--        return isset($this->_code) ? $this->_code : null;
-+        return $this->_code ?? null;
-     }
- 
-     /**
-@@ -216,6 +216,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
- 
-     /**
-      * Check if carrier has shipping tracking option available
-+     *
-      * All \Magento\Usa carriers have shipping tracking option available
-      *
-      * @return boolean
-@@ -399,8 +400,8 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
- 
-     /**
-      * Checks whether some request to rates have already been done, so we have cache for it
--     * Used to reduce number of same requests done to carrier service during one session
-      *
-+     * Used to reduce number of same requests done to carrier service during one session
-      * Returns cached response or null
-      *
-      * @param string|array $requestParams
-@@ -410,7 +411,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
-     {
-         $key = $this->_getQuotesCacheKey($requestParams);
- 
--        return isset(self::$_quotesCache[$key]) ? self::$_quotesCache[$key] : null;
-+        return self::$_quotesCache[$key] ?? null;
-     }
- 
-     /**
-@@ -443,8 +444,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
-     }
- 
-     /**
--     * Prepare shipment request.
--     * Validate and correct request information
-+     * Prepare shipment request. Validate and correct request information
-      *
-      * @param \Magento\Framework\DataObject $request
-      * @return void
-@@ -558,8 +558,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
-     }
- 
-     /**
--     * For multi package shipments. Delete requested shipments if the current shipment
--     * request is failed
-+     * For multi package shipments. Delete requested shipments if the current shipment. Request is failed
-      *
-      * @param array $data
-      * @return bool
-@@ -625,6 +624,8 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
-     }
- 
-     /**
-+     * Set Raw Request
-+     *
-      * @param \Magento\Framework\DataObject|null $request
-      * @return $this
-      * @api
-@@ -680,6 +681,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
- 
-     /**
-      * Checks if shipping method can collect rates
-+     *
-      * @return bool
-      */
-     public function canCollectRates()
-@@ -689,6 +691,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
- 
-     /**
-      * Debug errors if showmethod is unset
-+     *
-      * @param Error $errors
-      *
-      * @return void
-diff --git a/app/code/Magento/Shipping/Model/Rate/CarrierResult.php b/app/code/Magento/Shipping/Model/Rate/CarrierResult.php
-new file mode 100644
-index 00000000000..a95adb3e574
---- /dev/null
-+++ b/app/code/Magento/Shipping/Model/Rate/CarrierResult.php
-@@ -0,0 +1,127 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Shipping\Model\Rate;
-+
-+/**
-+ * Processed rates received from a carrier.
-+ */
-+class CarrierResult extends Result
-+{
-+    /**
-+     * @var Result[][]
-+     */
-+    private $results = [];
-+
-+    /**
-+     * Append result received from a carrier.
-+     *
-+     * @param Result $result
-+     * @param bool $appendFailed Append result's errors as well.
-+     * @return void
-+     */
-+    public function appendResult(Result $result, bool $appendFailed): void
-+    {
-+        $this->results[] = ['result' => $result, 'appendFailed' => $appendFailed];
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function getAllRates()
-+    {
-+        $needsSorting = false;
-+        //Appending previously received results.
-+        while ($resultData = array_shift($this->results)) {
-+            if ($resultData['result']->getError()) {
-+                if ($resultData['appendFailed']) {
-+                    $this->append($resultData['result']);
-+                    $needsSorting = true;
-+                }
-+            } else {
-+                $this->append($resultData['result']);
-+                $needsSorting = true;
-+            }
-+        }
-+        if ($needsSorting) {
-+            parent::sortRatesByPrice();
-+        }
-+
-+        return parent::getAllRates();
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function getError()
-+    {
-+        $this->getAllRates();
-+
-+        return parent::getError();
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function getRateById($id)
-+    {
-+        $this->getAllRates();
-+
-+        return parent::getRateById($id);
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function getCheapestRate()
-+    {
-+        $this->getAllRates();
-+
-+        return parent::getCheapestRate();
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function getRatesByCarrier($carrier)
-+    {
-+        $this->getAllRates();
-+
-+        return parent::getRatesByCarrier($carrier);
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function asArray()
-+    {
-+        $this->getAllRates();
-+
-+        return parent::asArray();
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function sortRatesByPrice()
-+    {
-+        $this->getAllRates();
-+
-+        return parent::sortRatesByPrice();
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function updateRatePrice($packageCount)
-+    {
-+        $this->getAllRates();
-+
-+        return parent::updateRatePrice($packageCount);
-+    }
-+}
-diff --git a/app/code/Magento/Shipping/Model/Rate/PackageResult.php b/app/code/Magento/Shipping/Model/Rate/PackageResult.php
-new file mode 100644
-index 00000000000..4fd4ce63a7e
---- /dev/null
-+++ b/app/code/Magento/Shipping/Model/Rate/PackageResult.php
-@@ -0,0 +1,156 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Shipping\Model\Rate;
-+
-+use Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Carriers rates for different packages.
-+ */
-+class PackageResult extends Result
-+{
-+    /**
-+     * @var array
-+     */
-+    private $packageResults = [];
-+
-+    /**
-+     * @var ErrorFactory
-+     */
-+    private $errorFactory;
-+
-+    /**
-+     * @param StoreManagerInterface $storeManager
-+     * @param ErrorFactory $errorFactory
-+     */
-+    public function __construct(
-+        StoreManagerInterface $storeManager,
-+        ErrorFactory $errorFactory
-+    ) {
-+        parent::__construct($storeManager);
-+        $this->errorFactory = $errorFactory;
-+    }
-+
-+    /**
-+     * Add result for a number of packages.
-+     *
-+     * @param Result $result
-+     * @param int $numberOfPackages
-+     * @return void
-+     */
-+    public function appendPackageResult(Result $result, int $numberOfPackages): void
-+    {
-+        $this->packageResults[] = ['packages' => $numberOfPackages, 'result' => $result];
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function getAllRates()
-+    {
-+        //Process results for packages
-+        while ($resultData = array_shift($this->packageResults)) {
-+            /** @var Result $result */
-+            $result = $resultData['result'];
-+            $result->updateRatePrice($resultData['packages']);
-+
-+            foreach ($result->getAllRates() as $currentRate) {
-+                foreach ($this->_rates as $rate) {
-+                    if ($rate->getMethod() === $currentRate->getMethod()) {
-+                        if ($rate === $currentRate) {
-+                            throw new \InvalidArgumentException('Same object received from carrier.');
-+                        }
-+                        $rate->setPrice($rate->getPrice() + $currentRate->getPrice());
-+                        continue 2;
-+                    }
-+                }
-+                //Rate does not exist
-+                $this->append($currentRate);
-+            }
-+        }
-+
-+        return parent::getAllRates();
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function getError()
-+    {
-+        if (!$this->_rates && !$this->packageResults) {
-+            $this->setError(true);
-+            $this->_rates[] = $this->errorFactory->create();
-+        } else {
-+            $this->getAllRates();
-+        }
-+
-+        return parent::getError();
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function getRateById($id)
-+    {
-+        $this->getAllRates();
-+
-+        return parent::getRateById($id);
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function getCheapestRate()
-+    {
-+        $this->getAllRates();
-+
-+        return parent::getCheapestRate();
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function getRatesByCarrier($carrier)
-+    {
-+        $this->getAllRates();
-+
-+        return parent::getRatesByCarrier($carrier);
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function asArray()
-+    {
-+        $this->getAllRates();
-+
-+        return parent::asArray();
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function sortRatesByPrice()
-+    {
-+        $this->getAllRates();
-+
-+        return parent::sortRatesByPrice();
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function updateRatePrice($packageCount)
-+    {
-+        $this->getAllRates();
-+
-+        return parent::updateRatePrice($packageCount);
-+    }
-+}
-diff --git a/app/code/Magento/Shipping/Model/Rate/Result.php b/app/code/Magento/Shipping/Model/Rate/Result.php
-index a294b66398c..c4ba502b346 100644
---- a/app/code/Magento/Shipping/Model/Rate/Result.php
-+++ b/app/code/Magento/Shipping/Model/Rate/Result.php
-@@ -7,6 +7,7 @@ namespace Magento\Shipping\Model\Rate;
- 
- /**
-  * Class Result
-+ *
-  * Container for Rates
-  *
-  * @api
-@@ -17,7 +18,7 @@ class Result
-     /**
-      * Shipping method rates
-      *
--     * @var array
-+     * @var \Magento\Quote\Model\Quote\Address\RateResult\AbstractResult[]
-      */
-     protected $_rates = [];
- 
-diff --git a/app/code/Magento/Shipping/Model/Shipping.php b/app/code/Magento/Shipping/Model/Shipping.php
-index 57e055e83a5..eccdd720e11 100644
---- a/app/code/Magento/Shipping/Model/Shipping.php
-+++ b/app/code/Magento/Shipping/Model/Shipping.php
-@@ -7,10 +7,20 @@ namespace Magento\Shipping\Model;
- 
- use Magento\Framework\App\ObjectManager;
- use Magento\Quote\Model\Quote\Address\RateCollectorInterface;
-+use Magento\Quote\Model\Quote\Address\RateRequest;
- use Magento\Quote\Model\Quote\Address\RateRequestFactory;
-+use Magento\Quote\Model\Quote\Address\RateResult\Error;
- use Magento\Sales\Model\Order\Shipment;
-+use Magento\Shipping\Model\Carrier\AbstractCarrier;
-+use Magento\Shipping\Model\Rate\CarrierResult;
-+use Magento\Shipping\Model\Rate\CarrierResultFactory;
-+use Magento\Shipping\Model\Rate\PackageResult;
-+use Magento\Shipping\Model\Rate\PackageResultFactory;
-+use Magento\Shipping\Model\Rate\Result;
- 
- /**
-+ * @inheritDoc
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Shipping implements RateCollectorInterface
-@@ -59,7 +69,7 @@ class Shipping implements RateCollectorInterface
-     protected $_carrierFactory;
- 
-     /**
--     * @var \Magento\Shipping\Model\Rate\ResultFactory
-+     * @var CarrierResultFactory
-      */
-     protected $_rateResultFactory;
- 
-@@ -88,17 +98,24 @@ class Shipping implements RateCollectorInterface
-      */
-     private $rateRequestFactory;
- 
-+    /**
-+     * @var PackageResultFactory
-+     */
-+    private $packageResultFactory;
-+
-     /**
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Shipping\Model\Config $shippingConfig
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
--     * @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
-+     * @param \Magento\Shipping\Model\Rate\CarrierResultFactory $rateResultFactory
-      * @param \Magento\Shipping\Model\Shipment\RequestFactory $shipmentRequestFactory
-      * @param \Magento\Directory\Model\RegionFactory $regionFactory
-      * @param \Magento\Framework\Math\Division $mathDivision
-      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
-      * @param RateRequestFactory $rateRequestFactory
-+     * @param PackageResultFactory|null $packageResultFactory
-+     * @param CarrierResultFactory|null $carrierResultFactory
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -112,24 +129,29 @@ class Shipping implements RateCollectorInterface
-         \Magento\Directory\Model\RegionFactory $regionFactory,
-         \Magento\Framework\Math\Division $mathDivision,
-         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
--        RateRequestFactory $rateRequestFactory = null
-+        RateRequestFactory $rateRequestFactory = null,
-+        ?PackageResultFactory $packageResultFactory = null,
-+        ?CarrierResultFactory $carrierResultFactory = null
-     ) {
-         $this->_scopeConfig = $scopeConfig;
-         $this->_shippingConfig = $shippingConfig;
-         $this->_storeManager = $storeManager;
-         $this->_carrierFactory = $carrierFactory;
-+        $rateResultFactory = $carrierResultFactory ?? ObjectManager::getInstance()->get(CarrierResultFactory::class);
-         $this->_rateResultFactory = $rateResultFactory;
-         $this->_shipmentRequestFactory = $shipmentRequestFactory;
-         $this->_regionFactory = $regionFactory;
-         $this->mathDivision = $mathDivision;
-         $this->stockRegistry = $stockRegistry;
-         $this->rateRequestFactory = $rateRequestFactory ?: ObjectManager::getInstance()->get(RateRequestFactory::class);
-+        $this->packageResultFactory = $packageResultFactory
-+            ?? ObjectManager::getInstance()->get(PackageResultFactory::class);
-     }
- 
-     /**
-      * Get shipping rate result model
-      *
--     * @return \Magento\Shipping\Model\Rate\Result
-+     * @return \Magento\Shipping\Model\Rate\Result|CarrierResult
-      */
-     public function getResult()
-     {
-@@ -241,87 +263,92 @@ class Shipping implements RateCollectorInterface
-     }
- 
-     /**
--     * Collect rates of given carrier
-+     * Prepare carrier to find rates.
-      *
-      * @param string $carrierCode
--     * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
--     * @return $this
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * @param RateRequest $request
-+     * @return AbstractCarrier
-+     * @throws \RuntimeException
-      */
--    public function collectCarrierRates($carrierCode, $request)
-+    private function prepareCarrier(string $carrierCode, RateRequest $request): AbstractCarrier
-     {
--        /* @var $carrier \Magento\Shipping\Model\Carrier\AbstractCarrier */
-+        /* @var AbstractCarrier $carrier */
-         $carrier = $this->_carrierFactory->createIfActive($carrierCode, $request->getStoreId());
-         if (!$carrier) {
--            return $this;
-+            throw new \RuntimeException('Failed to initialize carrier');
-         }
-         $carrier->setActiveFlag($this->_availabilityConfigField);
-         $result = $carrier->checkAvailableShipCountries($request);
--        if (false !== $result && !$result instanceof \Magento\Quote\Model\Quote\Address\RateResult\Error) {
-+        if (false !== $result && !$result instanceof Error) {
-             $result = $carrier->processAdditionalValidation($request);
-         }
--        /*
--         * Result will be false if the admin set not to show the shipping module
--         * if the delivery country is not within specific countries
--         */
--        if (false !== $result) {
--            if (!$result instanceof \Magento\Quote\Model\Quote\Address\RateResult\Error) {
--                if ($carrier->getConfigData('shipment_requesttype')) {
--                    $packages = $this->composePackagesForCarrier($carrier, $request);
--                    if (!empty($packages)) {
--                        $sumResults = [];
--                        foreach ($packages as $weight => $packageCount) {
--                            $request->setPackageWeight($weight);
--                            $result = $carrier->collectRates($request);
--                            if (!$result) {
--                                return $this;
--                            } else {
--                                $result->updateRatePrice($packageCount);
--                            }
--                            $sumResults[] = $result;
--                        }
--                        if (!empty($sumResults) && count($sumResults) > 1) {
--                            $result = [];
--                            foreach ($sumResults as $res) {
--                                if (empty($result)) {
--                                    $result = $res;
--                                    continue;
--                                }
--                                foreach ($res->getAllRates() as $method) {
--                                    foreach ($result->getAllRates() as $resultMethod) {
--                                        if ($method->getMethod() == $resultMethod->getMethod()) {
--                                            $resultMethod->setPrice($method->getPrice() + $resultMethod->getPrice());
--                                            continue;
--                                        }
--                                    }
--                                }
--                            }
--                        }
-+        if (!$result) {
-+            /*
-+             * Result will be false if the admin set not to show the shipping module
-+             * if the delivery country is not within specific countries
-+             */
-+            throw new \RuntimeException('Cannot collect rates for given request');
-+        } elseif ($result instanceof Error) {
-+            $this->getResult()->append($result);
-+            throw new \RuntimeException('Error occurred while preparing a carrier');
-+        }
-+
-+        return $carrier;
-+    }
-+
-+    /**
-+     * Collect rates of given carrier
-+     *
-+     * @param string $carrierCode
-+     * @param RateRequest $request
-+     * @return $this
-+     */
-+    public function collectCarrierRates($carrierCode, $request)
-+    {
-+        try {
-+            $carrier = $this->prepareCarrier($carrierCode, $request);
-+        } catch (\RuntimeException $exception) {
-+            return $this;
-+        }
-+
-+        /** @var Result|\Magento\Quote\Model\Quote\Address\RateResult\Error|null $result */
-+        $result = null;
-+        if ($carrier->getConfigData('shipment_requesttype')) {
-+            $packages = $this->composePackagesForCarrier($carrier, $request);
-+            if (!empty($packages)) {
-+                //Multiple shipments
-+                /** @var PackageResult $result */
-+                $result = $this->packageResultFactory->create();
-+                foreach ($packages as $weight => $packageCount) {
-+                    $request->setPackageWeight($weight);
-+                    $packageResult = $carrier->collectRates($request);
-+                    if (!$packageResult) {
-+                        return $this;
-                     } else {
--                        $result = $carrier->collectRates($request);
-+                        $result->appendPackageResult($packageResult, $packageCount);
-                     }
--                } else {
--                    $result = $carrier->collectRates($request);
--                }
--                if (!$result) {
--                    return $this;
-                 }
-             }
--            if ($carrier->getConfigData('showmethod') == 0 && $result->getError()) {
--                return $this;
--            }
--            // sort rates by price
--            if (method_exists($result, 'sortRatesByPrice') && is_callable([$result, 'sortRatesByPrice'])) {
--                $result->sortRatesByPrice();
--            }
-+        }
-+        if (!$result) {
-+            //One shipment for all items.
-+            $result = $carrier->collectRates($request);
-+        }
-+
-+        if (!$result) {
-+            return $this;
-+        } elseif ($result instanceof Result) {
-+            $this->getResult()->appendResult($result, $carrier->getConfigData('showmethod') != 0);
-+        } else {
-             $this->getResult()->append($result);
-         }
-+
-         return $this;
-     }
- 
-     /**
-      * Compose Packages For Carrier.
-+     *
-      * Divides order into items and items into parts if it's necessary
-      *
-      * @param \Magento\Shipping\Model\Carrier\AbstractCarrier $carrier
-@@ -364,30 +391,25 @@ class Shipping implements RateCollectorInterface
-                 && $item->getProductType() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE
-             ) {
-                 $productId = $item->getProduct()->getId();
--
-+                $itemWeightWhole = $itemWeight * $item->getQty();
-                 $stockItem = $this->stockRegistry->getStockItem($productId, $item->getStore()->getWebsiteId());
-                 if ($stockItem->getIsDecimalDivided()) {
-                     if ($stockItem->getEnableQtyIncrements() && $stockItem->getQtyIncrements()) {
--                        $itemWeight = $itemWeight * $stockItem->getQtyIncrements();
--                        $qty = round($item->getWeight() / $itemWeight * $qty);
-+                        $itemWeightWhole = $itemWeight * $stockItem->getQtyIncrements();
-+                        $qty = round($item->getWeight() / $itemWeightWhole * $qty);
-                         $changeQty = false;
--                    } else {
--                        $itemWeight = $itemWeight * $item->getQty();
--                        if ($itemWeight > $maxWeight) {
--                            $qtyItem = floor($itemWeight / $maxWeight);
--                            $decimalItems[] = ['weight' => $maxWeight, 'qty' => $qtyItem];
--                            $weightItem = $this->mathDivision->getExactDivision($itemWeight, $maxWeight);
--                            if ($weightItem) {
--                                $decimalItems[] = ['weight' => $weightItem, 'qty' => 1];
--                            }
--                            $checkWeight = false;
--                        } else {
--                            $itemWeight = $itemWeight * $item->getQty();
-+                    } elseif ($itemWeightWhole > $maxWeight) {
-+                        $itemWeightWhole = $itemWeight;
-+                        $qtyItem = floor($itemWeight / $maxWeight);
-+                        $decimalItems[] = ['weight' => $maxWeight, 'qty' => $qtyItem];
-+                        $weightItem = $this->mathDivision->getExactDivision($itemWeight, $maxWeight);
-+                        if ($weightItem) {
-+                            $decimalItems[] = ['weight' => $weightItem, 'qty' => 1];
-                         }
-+                        $checkWeight = false;
-                     }
--                } else {
--                    $itemWeight = $itemWeight * $item->getQty();
-                 }
-+                $itemWeight = $itemWeightWhole;
-             }
- 
-             if ($checkWeight && $maxWeight && $itemWeight > $maxWeight) {
-@@ -420,6 +442,7 @@ class Shipping implements RateCollectorInterface
- 
-     /**
-      * Make pieces
-+     *
-      * Compose packages list based on given items, so that each package is as heavy as possible
-      *
-      * @param array $items
-diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminChangeFlatRateShippingMethodStatusActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminChangeFlatRateShippingMethodStatusActionGroup.xml
-new file mode 100644
-index 00000000000..977ee065a8f
---- /dev/null
-+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminChangeFlatRateShippingMethodStatusActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminChangeFlatRateShippingMethodStatusActionGroup">
-+        <arguments>
-+            <argument name="status" type="string" defaultValue="1"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminShippingMethodFlatRateSection.carriersFlatRateTab}}" dependentSelector="{{AdminShippingMethodFlatRateSection.carriersFlatRateActive}}" visible="false" stepKey="expandTab"/>
-+        <selectOption selector="{{AdminShippingMethodFlatRateSection.carriersFlatRateActive}}" userInput="{{status}}" stepKey="changeFlatRateMethodStatus"/>
-+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfigs"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminChangeTableRatesShippingMethodStatusActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminChangeTableRatesShippingMethodStatusActionGroup.xml
-new file mode 100644
-index 00000000000..e506ca3a766
---- /dev/null
-+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminChangeTableRatesShippingMethodStatusActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!-- Enable/Disable Table Rates shipping method -->
-+    <actionGroup name="AdminChangeTableRatesShippingMethodStatusActionGroup">
-+        <arguments>
-+            <argument name="status" type="string" defaultValue="1"/>
-+        </arguments>
-+        <conditionalClick selector="{{AdminShippingMethodTableRatesSection.carriersTableRateTab}}" dependentSelector="{{AdminShippingMethodTableRatesSection.carriersTableRateActive}}" visible="false" stepKey="expandTab"/>
-+        <uncheckOption selector="{{AdminShippingMethodTableRatesSection.enabledUseSystemValue}}" stepKey="uncheckUseSystemValue"/>
-+        <selectOption selector="{{AdminShippingMethodTableRatesSection.carriersTableRateActive}}" userInput="{{status}}" stepKey="changeTableRatesMethodStatus"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminOpenShippingMethodsConfigPageActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminOpenShippingMethodsConfigPageActionGroup.xml
-new file mode 100644
-index 00000000000..a1fefcf13af
---- /dev/null
-+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminOpenShippingMethodsConfigPageActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenShippingMethodsConfigPageActionGroup">
-+        <amOnPage url="{{AdminShippingMethodsConfigPage.url}}" stepKey="navigateToAdminShippingMethodsPage"/>
-+        <waitForPageLoad stepKey="waitForAdminShippingMethodsPageToLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml
-index 80db1fe9469..3d70a742b13 100644
---- a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml
-+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
- 
-     <actionGroup name="verifyBasicShipmentInformation">
-         <arguments>
-@@ -35,4 +35,16 @@
-         </arguments>
-         <see selector="{{AdminShipmentItemsSection.skuColumn}}" userInput="{{product.sku}}" stepKey="seeProductSkuInGrid"/>
-     </actionGroup>
-+
-+    <actionGroup name="goToShipmentIntoOrder">
-+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
-+        <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Shipment" stepKey="seePageNameNewInvoicePage"/>
-+    </actionGroup>
-+
-+    <actionGroup name="submitShipmentIntoOrder">
-+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
-+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPageShipping"/>
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The shipment has been created." stepKey="seeShipmentCreateSuccess"/>
-+    </actionGroup>
- </actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontNoQuotesMessageActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontNoQuotesMessageActionGroup.xml
-new file mode 100644
-index 00000000000..060e8a4f2e2
---- /dev/null
-+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontNoQuotesMessageActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStoreFrontNoQuotesMessageActionGroup">
-+        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.noQuotesMsg}}" stepKey="waitForNoQuotesMsgVisible"/>
-+        <see selector="{{CheckoutShippingMethodsSection.noQuotesMsg}}" userInput="Sorry, no quotes are available for this order at this time" stepKey="assertNoQuotesMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontShippingMethodAvailableActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontShippingMethodAvailableActionGroup.xml
-new file mode 100644
-index 00000000000..9892bc7cbc9
---- /dev/null
-+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontShippingMethodAvailableActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStoreFrontShippingMethodAvailableActionGroup">
-+        <arguments>
-+            <argument name="shippingMethodName" type="string" defaultValue="Flat Rate"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName(shippingMethodName)}}" stepKey="waitForShippingMethodLoad"/>
-+        <seeElement selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName(shippingMethodName)}}" stepKey="seeShippingMethod"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontShippingMethodUnavailableActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontShippingMethodUnavailableActionGroup.xml
-new file mode 100644
-index 00000000000..d425a6d93a1
---- /dev/null
-+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontShippingMethodUnavailableActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStoreFrontShippingMethodUnavailableActionGroup">
-+        <arguments>
-+            <argument name="shippingMethodName" type="string" defaultValue="Free Shipping"/>
-+        </arguments>
-+        <waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName(shippingMethodName)}}" stepKey="waitForShippingMethodNotVisible"/>
-+        <dontSeeElement selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName(shippingMethodName)}}" stepKey="dontSeeShippingMethod"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Data/FlatRateShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/FlatRateShippingMethodData.xml
-index 120517bffde..6d877dac5cb 100644
---- a/app/code/Magento/Shipping/Test/Mftf/Data/FlatRateShippingMethodData.xml
-+++ b/app/code/Magento/Shipping/Test/Mftf/Data/FlatRateShippingMethodData.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <!-- Enable Flat Rate Shipping method config -->
-     <entity name="FlatRateShippingMethodConfig" type="flat_rate_shipping_method">
-         <requiredEntity type="active">flatRateActiveEnable</requiredEntity>
-@@ -13,6 +13,13 @@
-     <entity name="flatRateActiveEnable" type="active">
-         <data key="value">1</data>
-     </entity>
-+    <!-- Disable Flat Rate Shipping method config -->
-+    <entity name="DisableFlatRateShippingMethodConfig" type="flat_rate_shipping_method">
-+        <requiredEntity type="active">flatRateActiveDisable</requiredEntity>
-+    </entity>
-+    <entity name="flatRateActiveDisable" type="active">
-+        <data key="value">0</data>
-+    </entity>
-     <!-- Flat Rate Shipping method default setup -->
-     <entity name="FlatRateShippingMethodDefault" type="flat_rate_shipping_method">
-         <requiredEntity type="active">flatRateActiveDefault</requiredEntity>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
-index fba1970dba2..d700aa622c1 100644
---- a/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
-+++ b/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <!-- Enable Free Shipping method -->
-     <entity name="FreeShippinMethodConfig" type="free_shipping_method">
-         <requiredEntity type="active">freeActiveEnable</requiredEntity>
-@@ -13,6 +13,13 @@
-     <entity name="freeActiveEnable" type="active">
-         <data key="value">1</data>
-     </entity>
-+    <!-- Disable Free Shipping method -->
-+    <entity name="FreeShippingMethodDisableConfig" type="free_shipping_method">
-+        <requiredEntity type="active">freeActiveDisable</requiredEntity>
-+    </entity>
-+    <entity name="freeActiveDisable" type="active">
-+        <data key="value">0</data>
-+    </entity>
-     <!-- Free Shipping method default setup -->
-     <entity name="FreeShippinMethodDefault" type="free_shipping_method">
-         <requiredEntity type="active">freeActiveDefault</requiredEntity>
-@@ -52,4 +59,18 @@
-     <entity name="freeSortOrderDefault" type="sort_order">
-         <data key="value" />
-     </entity>
-+    <!--Set Free Shipping Subtotal to 101-->
-+    <entity name="setFreeShippingSubtotal" type="free_shipping_method">
-+        <requiredEntity type="free_shipping_subtotal">freeShippingSubtotal</requiredEntity>
-+    </entity>
-+    <entity name="freeShippingSubtotal" type="free_shipping_subtotal">
-+        <data key="value">101</data>
-+    </entity>
-+    <!--Set to default Free Shipping Subtotal-->
-+    <entity name="setFreeShippingSubtotalToDefault" type="free_shipping_method">
-+        <requiredEntity type="free_shipping_subtotal">freeShippingSubtotalDefault</requiredEntity>
-+    </entity>
-+    <entity name="freeShippingSubtotalDefault" type="free_shipping_subtotal">
-+        <data key="value">0</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Data/ShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/ShippingMethodData.xml
-index 3e8613ec2e4..1151e55c437 100644
---- a/app/code/Magento/Shipping/Test/Mftf/Data/ShippingMethodData.xml
-+++ b/app/code/Magento/Shipping/Test/Mftf/Data/ShippingMethodData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="DefaultFlatRateMethod" type="shipping">
-         <data key="enabled">Yes</data>
-         <data key="title">Flat Rate</data>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Data/TableRatesShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/TableRatesShippingMethodData.xml
-new file mode 100644
-index 00000000000..47ef68cc9d7
---- /dev/null
-+++ b/app/code/Magento/Shipping/Test/Mftf/Data/TableRatesShippingMethodData.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <!-- Prices from file "table_rate_30895.csv" -->
-+    <entity name="TableRatesWeightVSDestination" type="shipping_method">
-+        <data key="condition">Weight vs. Destination</data>
-+        <data key="priceCA">5.00</data>
-+        <data key="price">10.00</data>
-+        <data key="title">Best Way</data>
-+        <data key="methodName">Table Rate</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Metadata/shipping_methods-meta.xml b/app/code/Magento/Shipping/Test/Mftf/Metadata/shipping_methods-meta.xml
-index 8b6a2aab745..5781b886386 100644
---- a/app/code/Magento/Shipping/Test/Mftf/Metadata/shipping_methods-meta.xml
-+++ b/app/code/Magento/Shipping/Test/Mftf/Metadata/shipping_methods-meta.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="FlatRateShippingMethodSetup" dataType="flat_rate_shipping_method" type="create" auth="adminFormKey" url="/admin/system_config/save/section/carriers/" method="POST">
-         <object key="groups" dataType="flat_rate_shipping_method">
-             <object key="flatrate" dataType="flat_rate_shipping_method">
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
-index e6b3f1100dd..597abb5694e 100644
---- a/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
-+++ b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminShipmentNewPage" url="order_shipment/new/order_id/" area="admin" module="Shipping">
-         <section name="AdminShipmentMainActionsSection"/>
-         <section name="AdminShipmentOrderInformationSection"/>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
-index ea4dde8190b..10878310c26 100644
---- a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
-+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
-@@ -7,11 +7,12 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <section name="AdminShipmentAddressInformationSection">
-         <element name="billingAddress" type="text" selector=".order-billing-address address"/>
-         <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
-         <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
-         <element name="shippingAddressEdit" type="button" selector=".order-shipping-address .actions a"/>
-+        <element name="goToShippingInformation" type="button" selector="//button[@title='Go to Shipping Information']"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
-index 30f508beb57..0345c3f2949 100644
---- a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
-+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminShipmentItemsSection">
-         <element name="itemName" type="text" selector=".order-shipment-table tbody:nth-of-type({{var1}}) .col-product .product-title" parameterized="true"/>
-         <element name="itemSku" type="text" selector=".order-shipment-table tbody:nth-of-type({{var1}}) .col-product .product-sku-block" parameterized="true"/>
-@@ -15,5 +15,6 @@
-         <element name="itemQtyToShip" type="input" selector=".order-shipment-table tbody:nth-of-type({{var1}}) .col-qty input.qty-item" parameterized="true"/>
-         <element name="nameColumn" type="text" selector=".order-shipment-table .col-product .product-title"/>
-         <element name="skuColumn" type="text" selector=".order-shipment-table .col-product .product-sku-block"/>
-+        <element name="itemQtyInvoiced" type="text" selector="(//*[@class='col-ordered-qty']//th[contains(text(), 'Invoiced')]/following-sibling::td)[{{var}}]" parameterized="true"/>
-     </section>
--</sections>
-\ No newline at end of file
-+</sections>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml
-index 506a7a496d8..828d006478e 100644
---- a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml
-+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml
-@@ -7,8 +7,8 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminShipmentMainActionsSection">
--        <element name="submitShipment" type="button" selector="button.action-default.save.submit-button"/>
-+        <element name="submitShipment" type="button" selector="button.action-default.save.submit-button" timeout="60"/>
-     </section>
- </sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentOrderInformationSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentOrderInformationSection.xml
-index 56f5a322153..ca2b867bc1f 100644
---- a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentOrderInformationSection.xml
-+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentOrderInformationSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminShipmentOrderInformationSection">
-         <element name="orderId" type="text" selector="div.order-information span.title > a" timeout="30"/>
-         <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml
-index e6004e8c594..48c7106c2d6 100644
---- a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml
-+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminShipmentPaymentShippingSection">
-         <element name="PaymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
-         <element name="CurrencyInformation" type="text" selector=".order-payment-method .order-payment-currency"/>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTotalSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTotalSection.xml
-index 2a4150b19a4..f2f39d77d8d 100644
---- a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTotalSection.xml
-+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTotalSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminShipmentTotalSection">
-         <element name="CommentText" type="textarea" selector="#shipment_comment_text"/>
-         <element name="AppendComments" type="checkbox" selector=".order-totals input#notify_customer"/>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodFlatRateSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodFlatRateSection.xml
-new file mode 100644
-index 00000000000..a7ed0ab498b
---- /dev/null
-+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodFlatRateSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminShippingMethodFlatRateSection">
-+        <element name="carriersFlatRateTab" type="button" selector="#carriers_flatrate-head"/>
-+        <element name="carriersFlatRateActive" type="select" selector="#carriers_flatrate_active"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodTableRatesSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodTableRatesSection.xml
-new file mode 100644
-index 00000000000..3c570201c99
---- /dev/null
-+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodTableRatesSection.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminShippingMethodTableRatesSection">
-+        <element name="carriersTableRateTab" type="button" selector="#carriers_tablerate-head"/>
-+        <element name="enabledUseSystemValue" type="checkbox" selector="#carriers_tablerate_active_inherit"/>
-+        <element name="carriersTableRateActive" type="select" selector="#carriers_tablerate_active"/>
-+        <element name="condition" type="select" selector="#carriers_tablerate_condition_name"/>
-+        <element name="importFile" type="input" selector="#carriers_tablerate_import"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-index e14fed443ac..a0edf4e13a8 100644
---- a/app/code/Magento/Shipping/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-+++ b/app/code/Magento/Shipping/Test/Mftf/Test/EndToEndB2CAdminTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CAdminTest">
-         <!--Ship Order-->
-         <comment userInput="Admin creates shipment" stepKey="adminCreatesShipmentComment" before="clickShipAction"/>
-diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/TableRatesShippingMethodForDifferentStatesTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/TableRatesShippingMethodForDifferentStatesTest.xml
-new file mode 100644
-index 00000000000..5721af7fdb7
---- /dev/null
-+++ b/app/code/Magento/Shipping/Test/Mftf/Test/TableRatesShippingMethodForDifferentStatesTest.xml
-@@ -0,0 +1,114 @@
-+<?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="TableRatesShippingMethodForDifferentStatesTest">
-+        <annotations>
-+            <features value="Shipping"/>
-+            <stories value="Table Rates"/>
-+            <title value="Table rates shipping method for different states test"/>
-+            <description value="Checkout with Table Rates for different states of the USA"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-13581"/>
-+            <group value="shipping"/>
-+        </annotations>
-+        <before>
-+            <!-- Create product -->
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+
-+            <!-- Create customer -->
-+            <createData entity="Simple_US_Customer_CA" stepKey="createCustomer"/>
-+
-+            <!-- Login as admin -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!-- Delete product -->
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+
-+            <!-- Delete customer -->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+
-+            <!-- Log out -->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Go to Stores > Configuration > Sales > Shipping Methods -->
-+        <actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
-+
-+        <!-- Switch to Website scope -->
-+        <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreView">
-+            <argument name="website" value="_defaultWebsite"/>
-+        </actionGroup>
-+
-+        <!-- Enable Table Rate method and save config -->
-+        <actionGroup ref="AdminChangeTableRatesShippingMethodStatusActionGroup" stepKey="enableTableRatesShippingMethod"/>
-+        <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig"/>
-+
-+        <!-- Make sure you have Condition Weight vs. Destination -->
-+        <see selector="{{AdminShippingMethodTableRatesSection.condition}}" userInput="{{TableRatesWeightVSDestination.condition}}" stepKey="seeDefaultCondition"/>
-+
-+        <!-- Import file and save config -->
-+        <attachFile selector="{{AdminShippingMethodTableRatesSection.importFile}}" userInput="table_rate_30895.csv" stepKey="attachFileForImport"/>
-+        <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigs"/>
-+
-+        <!-- Login as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+
-+        <!-- Add product to the shopping cart -->
-+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
-+            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
-+            <argument name="product" value="$$createProduct$$"/>
-+            <argument name="productCount" value="1"/>
-+        </actionGroup>
-+
-+        <!-- Open the shopping cart page -->
-+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openShoppingCart"/>
-+
-+        <!-- Expand Estimate Shipping and Tax section in Summary -->
-+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingAndTax"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-+
-+        <!-- See available Table Rate option -->
-+        <actionGroup ref="StorefrontAssertShippingMethodPresentInCartActionGroup" stepKey="assertShippingMethodLabel">
-+            <argument name="shippingMethod" value="{{TableRatesWeightVSDestination.title}}"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAssertShippingMethodOptionPresentInCartActionGroup" stepKey="assertShippingMethodOption">
-+            <argument name="methodName" value="{{TableRatesWeightVSDestination.methodName}}"/>
-+            <argument name="price" value="{{TableRatesWeightVSDestination.priceCA}}"/>
-+        </actionGroup>
-+
-+        <!-- Change State to New York -->
-+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_NY.state}}" stepKey="selectAnotherState"/>
-+        <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
-+
-+        <!-- See available Table Rate option for another state -->
-+        <actionGroup ref="StorefrontAssertShippingMethodPresentInCartActionGroup" stepKey="assertShippingMethodLabelForAnotherState">
-+            <argument name="shippingMethod" value="{{TableRatesWeightVSDestination.title}}"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontAssertShippingMethodOptionPresentInCartActionGroup" stepKey="assertShippingMethodOptionForAnotherState">
-+            <argument name="methodName" value="{{TableRatesWeightVSDestination.methodName}}"/>
-+            <argument name="price" value="{{TableRatesWeightVSDestination.price}}"/>
-+        </actionGroup>
-+
-+        <!-- Rollback config -->
-+        <actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodSystemConfigPage"/>
-+        <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreViewToMainWebsite">
-+            <argument name="website" value="_defaultWebsite"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminChangeTableRatesShippingMethodStatusActionGroup" stepKey="disableTableRatesShippingMethod">
-+            <argument name="status" value="0"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveSystemConfig"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
-index cf3bf68e104..1c9cdb1fa7d 100644
---- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
-+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
-@@ -6,127 +6,162 @@
- 
- namespace Magento\Shipping\Test\Unit\Controller\Adminhtml\Order\Shipment;
- 
--use Magento\Backend\App\Action;
-+use Magento\Backend\App\Action\Context;
-+use Magento\Framework\App\Request\Http;
-+use Magento\Framework\App\ResponseInterface;
-+use Magento\Framework\App\ViewInterface;
-+use Magento\Framework\Controller\ResultFactory;
-+use Magento\Framework\Controller\ResultInterface;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Framework\View\Element\BlockInterface;
-+use Magento\Framework\View\LayoutInterface;
-+use Magento\Framework\View\Page\Config;
-+use Magento\Framework\View\Page\Title;
-+use Magento\Framework\View\Result\Page;
-+use Magento\Sales\Api\Data\ShipmentTrackInterfaceFactory;
-+use Magento\Sales\Model\Order\Shipment;
-+use Magento\Sales\Model\Order\Shipment\Track;
-+use Magento\Shipping\Controller\Adminhtml\Order\Shipment\AddTrack;
-+use Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader;
- 
- /**
-- * Class AddTrackTest
-+ * Class AddTrackTest covers AddTrack controller.
-  *
-- * @package Magento\Shipping\Controller\Adminhtml\Order\Shipment
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class AddTrackTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ShipmentLoader|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $shipmentLoader;
-+    private $shipmentLoader;
- 
-     /**
--     * @var \Magento\Shipping\Controller\Adminhtml\Order\Shipment\AddTrack
-+     * @var AddTrack
-      */
--    protected $controller;
-+    private $controller;
- 
-     /**
--     * @var Action\Context|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $context;
-+    private $context;
- 
-     /**
--     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Http|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $request;
-+    private $request;
- 
-     /**
--     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $response;
-+    private $response;
- 
-     /**
--     * @var \Magento\Framework\ObjectManager\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var  ViewInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $objectManager;
-+    private $view;
- 
-     /**
--     * @var  \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Page|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $view;
-+    private $resultPageMock;
- 
-     /**
--     * @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $resultPageMock;
-+    private $pageConfigMock;
- 
-     /**
--     * @var \Magento\Framework\View\Page\Config|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Title|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $pageConfigMock;
-+    private $pageTitleMock;
- 
-     /**
--     * @var \Magento\Framework\View\Page\Title|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ShipmentTrackInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $pageTitleMock;
-+    private $trackFactory;
- 
-+    /**
-+     * @var ResultInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $rawResult;
-+
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $objectManagerHelper = new ObjectManagerHelper($this);
-         $this->shipmentLoader = $this->getMockBuilder(
--            \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader::class
-+            ShipmentLoader::class
-         )
-             ->disableOriginalConstructor()
-             ->setMethods(['setShipmentId', 'setOrderId', 'setShipment', 'setTracking', 'load'])
-             ->getMock();
-         $this->context = $this->createPartialMock(
--            \Magento\Backend\App\Action\Context::class,
-+            Context::class,
-             [
-                 'getRequest',
-                 'getResponse',
-                 'getRedirect',
-                 'getObjectManager',
-                 'getTitle',
--                'getView'
-+                'getView',
-+                'getResultFactory'
-             ]
-         );
-         $this->response = $this->createPartialMock(
--            \Magento\Framework\App\ResponseInterface::class,
-+            ResponseInterface::class,
-             ['setRedirect', 'sendResponse', 'setBody']
-         );
--        $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-+        $this->request = $this->getMockBuilder(Http::class)
-             ->disableOriginalConstructor()->getMock();
--        $this->objectManager = $this->createPartialMock(
--            \Magento\Framework\ObjectManager\ObjectManager::class,
--            ['create', 'get']
--        );
--        $this->view = $this->createMock(\Magento\Framework\App\ViewInterface::class);
--        $this->resultPageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
-+        $this->view = $this->createMock(ViewInterface::class);
-+        $this->resultPageMock = $this->getMockBuilder(Page::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->pageConfigMock = $this->getMockBuilder(\Magento\Framework\View\Page\Config::class)
-+        $this->pageConfigMock = $this->getMockBuilder(Config::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->pageTitleMock = $this->getMockBuilder(\Magento\Framework\View\Page\Title::class)
-+        $this->pageTitleMock = $this->getMockBuilder(Title::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $this->trackFactory = $this->getMockBuilder(ShipmentTrackInterfaceFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMockForAbstractClass();
-+        $this->rawResult = $this->getMockBuilder(ResultInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setContents'])
-+            ->getMockForAbstractClass();
-+        $resultFactory = $this->getMockBuilder(ResultFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMockForAbstractClass();
-         $this->context->expects($this->once())
-             ->method('getRequest')
-             ->will($this->returnValue($this->request));
-         $this->context->expects($this->once())
-             ->method('getResponse')
-             ->will($this->returnValue($this->response));
--        $this->context->expects($this->once())
--            ->method('getObjectManager')
--            ->will($this->returnValue($this->objectManager));
-         $this->context->expects($this->once())
-             ->method('getView')
-             ->will($this->returnValue($this->view));
-+        $resultFactory->expects($this->once())
-+            ->method('create')
-+            ->willReturn($this->rawResult);
-+        $this->context->expects($this->once())
-+            ->method('getResultFactory')
-+            ->willReturn($resultFactory);
-         $this->controller = $objectManagerHelper->getObject(
--            \Magento\Shipping\Controller\Adminhtml\Order\Shipment\AddTrack::class,
-+            AddTrack::class,
-             [
-                 'context' => $this->context,
-                 'shipmentLoader' => $this->shipmentLoader,
-                 'request' => $this->request,
-                 'response' => $this->response,
--                'view' => $this->view
-+                'view' => $this->view,
-+                'trackFactory' => $this->trackFactory,
-             ]
-         );
-     }
-@@ -144,7 +179,7 @@ class AddTrackTest extends \PHPUnit\Framework\TestCase
-         $tracking = [];
-         $shipmentData = ['items' => [], 'send_email' => ''];
-         $shipment = $this->createPartialMock(
--            \Magento\Sales\Model\Order\Shipment::class,
-+            Shipment::class,
-             ['addTrack', '__wakeup', 'save']
-         );
-         $this->request->expects($this->any())
-@@ -152,8 +187,10 @@ class AddTrackTest extends \PHPUnit\Framework\TestCase
-             ->will(
-                 $this->returnValueMap(
-                     [
--                        ['order_id', null, $orderId], ['shipment_id', null, $shipmentId],
--                        ['shipment', null, $shipmentData], ['tracking', null, $tracking],
-+                        ['order_id', null, $orderId],
-+                        ['shipment_id', null, $shipmentId],
-+                        ['shipment', null, $shipmentData],
-+                        ['tracking', null, $tracking],
-                     ]
-                 )
-             );
-@@ -183,14 +220,13 @@ class AddTrackTest extends \PHPUnit\Framework\TestCase
-         $this->shipmentLoader->expects($this->once())
-             ->method('load')
-             ->will($this->returnValue($shipment));
--        $track = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment\Track::class)
-+        $track = $this->getMockBuilder(Track::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['__wakeup', 'setNumber', 'setCarrierCode', 'setTitle'])
-             ->getMock();
--        $this->objectManager->expects($this->atLeastOnce())
-+        $this->trackFactory->expects($this->once())
-             ->method('create')
--            ->with(\Magento\Sales\Model\Order\Shipment\Track::class)
--            ->will($this->returnValue($track));
-+            ->willReturn($track);
-         $track->expects($this->once())
-             ->method('setNumber')
-             ->with($number)
-@@ -206,8 +242,8 @@ class AddTrackTest extends \PHPUnit\Framework\TestCase
-         $this->view->expects($this->once())
-             ->method('loadLayout')
-             ->will($this->returnSelf());
--        $layout = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
--        $menuBlock = $this->createPartialMock(\Magento\Framework\View\Element\BlockInterface::class, ['toHtml']);
-+        $layout = $this->createMock(LayoutInterface::class);
-+        $menuBlock = $this->createPartialMock(BlockInterface::class, ['toHtml']);
-         $html = 'html string';
-         $this->view->expects($this->once())
-             ->method('getLayout')
-@@ -235,9 +271,10 @@ class AddTrackTest extends \PHPUnit\Framework\TestCase
-         $this->pageConfigMock->expects($this->any())
-             ->method('getTitle')
-             ->willReturn($this->pageTitleMock);
--        $this->response->expects($this->once())
--            ->method('setBody')
--            ->with($html);
--        $this->assertNull($this->controller->execute());
-+        $this->rawResult->expects($this->once())
-+            ->method('setContents')
-+            ->with($html)
-+            ->willReturnSelf();
-+        $this->assertInstanceOf(ResultInterface::class, $this->controller->execute());
-     }
- }
-diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
-index f841728416f..c253900501d 100644
---- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
-+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
-@@ -142,7 +142,7 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-         );
-         $this->messageManager = $this->createPartialMock(
-             \Magento\Framework\Message\Manager::class,
--            ['addSuccess', 'addError']
-+            ['addSuccessMessage', 'addErrorMessage']
-         );
-         $this->session = $this->createPartialMock(
-             \Magento\Backend\Model\Session::class,
-@@ -236,7 +236,7 @@ class SaveTest extends \PHPUnit\Framework\TestCase
- 
-         if (!$formKeyIsValid || !$isPost) {
-             $this->messageManager->expects($this->once())
--                ->method('addError');
-+                ->method('addErrorMessage');
- 
-             $this->resultRedirect->expects($this->once())
-                 ->method('setPath')
-@@ -325,12 +325,11 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-                 ->method('get')
-                 ->with(\Magento\Backend\Model\Session::class)
-                 ->will($this->returnValue($this->session));
--            $path = 'sales/order/view';
-             $arguments = ['order_id' => $orderId];
-             $shipment->expects($this->once())
-                 ->method('getOrderId')
-                 ->will($this->returnValue($orderId));
--            $this->prepareRedirect($path, $arguments);
-+            $this->prepareRedirect($arguments);
- 
-             $this->shipmentValidatorMock->expects($this->once())
-                 ->method('validate')
-@@ -360,10 +359,9 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @param string $path
-      * @param array $arguments
-      */
--    protected function prepareRedirect($path, array $arguments = [])
-+    protected function prepareRedirect(array $arguments = [])
-     {
-         $this->actionFlag->expects($this->any())
-             ->method('get')
-@@ -372,14 +370,8 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-         $this->session->expects($this->any())
-             ->method('setIsUrlNotice')
-             ->with(true);
--
--        $url = $path . '/' . (!empty($arguments) ? $arguments['order_id'] : '');
--        $this->helper->expects($this->atLeastOnce())
--            ->method('getUrl')
--            ->with($path, $arguments)
--            ->will($this->returnValue($url));
--        $this->response->expects($this->atLeastOnce())
--            ->method('setRedirect')
--            ->with($url);
-+        $this->resultRedirect->expects($this->once())
-+            ->method('setPath')
-+            ->with('sales/order/view', $arguments);
-     }
- }
-diff --git a/app/code/Magento/Shipping/Test/Unit/Model/Rate/CarrierResultTest.php b/app/code/Magento/Shipping/Test/Unit/Model/Rate/CarrierResultTest.php
-new file mode 100644
-index 00000000000..389bffea5e4
---- /dev/null
-+++ b/app/code/Magento/Shipping/Test/Unit/Model/Rate/CarrierResultTest.php
-@@ -0,0 +1,108 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Shipping\Test\Unit\Model\Rate;
-+
-+use Magento\Quote\Model\Quote\Address\RateResult\Error;
-+use Magento\Quote\Model\Quote\Address\RateResult\Method;
-+use Magento\Shipping\Model\Rate\CarrierResult;
-+use Magento\Shipping\Model\Rate\Result;
-+use Magento\Store\Model\StoreManagerInterface;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Testing carrier result.
-+ *
-+ * Unit test is suitable since CarrierResult only uses DTOs and contains all the logic it needs itself.
-+ */
-+class CarrierResultTest extends TestCase
-+{
-+    /**
-+     * @var CarrierResult|MockObject
-+     */
-+    private $result;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-+    {
-+        /** @var MockObject|StoreManagerInterface $storeManager */
-+        $storeManager = $this->getMockBuilder(StoreManagerInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->result = new CarrierResult($storeManager);
-+    }
-+
-+    /**
-+     * Test composing all the rates.
-+     */
-+    public function testComposing(): void
-+    {
-+
-+        $rate1 = $this->getMockBuilder(Method::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getMethod', 'getPrice', 'setPrice'])
-+            ->getMock();
-+        $price1 = 3;
-+        $rate1->method('getMethod')->willReturn('method');
-+        $rate1->method('getPrice')->willReturnReference($price1);
-+        $rate1->method('setPrice')
-+            ->willReturnCallback(
-+                function ($price) use (&$price1) {
-+                    $price1 = $price;
-+                }
-+            );
-+        /** @var Result|MockObject $result1 */
-+        $result1 = $this->getMockBuilder(Result::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $result1->method('getAllRates')->willReturn([$rate1]);
-+        $result1->method('getError')->willReturn(false);
-+
-+        $rate2 = $this->getMockBuilder(Method::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getMethod', 'getPrice', 'setPrice'])
-+            ->getMock();
-+        $price2 = 4;
-+        $rate2->method('getMethod')->willReturn('method');
-+        $rate2->method('getPrice')->willReturnReference($price2);
-+        $rate2->method('setPrice')
-+            ->willReturnCallback(
-+                function ($price) use (&$price2) {
-+                    $price2 = $price;
-+                }
-+            );
-+        /** @var Result|MockObject $result2 */
-+        $result2 = $this->getMockBuilder(Result::class)->disableOriginalConstructor()->getMock();
-+        $result2->method('getAllRates')->willReturn([$rate2]);
-+        $result2->method('getError')->willReturn(false);
-+
-+        $rate3 = $this->getMockBuilder(Error::class)->disableOriginalConstructor()->getMock();
-+        /** @var Result|MockObject $result3 */
-+        $result3 = $this->getMockBuilder(Result::class)->disableOriginalConstructor()->getMock();
-+        $result3->method('getAllRates')->willReturn([$rate3]);
-+        $result3->method('getError')->willReturn(true);
-+
-+        $rate4 = $this->getMockBuilder(Error::class)->disableOriginalConstructor()->getMock();
-+        /** @var Result|MockObject $result4 */
-+        $result4 = $this->getMockBuilder(Result::class)->disableOriginalConstructor()->getMock();
-+        $result4->method('getAllRates')->willReturn([$rate4]);
-+        $result4->method('getError')->willReturn(true);
-+
-+        //Composing
-+        $this->result->appendResult($result1, false);
-+        $this->result->appendResult($result2, false);
-+        $this->result->appendResult($result3, false);
-+        $this->result->appendResult($result4, true);
-+        $rates = $this->result->getAllRates();
-+        $this->assertCount(3, $rates);
-+        $this->assertTrue($this->result->getError());
-+    }
-+}
-diff --git a/app/code/Magento/Shipping/Test/Unit/Model/Rate/PackageResultTest.php b/app/code/Magento/Shipping/Test/Unit/Model/Rate/PackageResultTest.php
-new file mode 100644
-index 00000000000..34164ced9b0
---- /dev/null
-+++ b/app/code/Magento/Shipping/Test/Unit/Model/Rate/PackageResultTest.php
-@@ -0,0 +1,166 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Shipping\Test\Unit\Model\Rate;
-+
-+use Magento\Quote\Model\Quote\Address\RateResult\Error;
-+use Magento\Quote\Model\Quote\Address\RateResult\Method;
-+use Magento\Shipping\Model\Rate\PackageResult;
-+use Magento\Shipping\Model\Rate\Result;
-+use Magento\Store\Model\StoreManagerInterface;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory;
-+
-+/**
-+ * Testing packages aware rates result.
-+ *
-+ * Unit test is suitable since CarrierResult only uses DTOs and contains all the logic it needs itself.
-+ */
-+class PackageResultTest extends TestCase
-+{
-+    /**
-+     * @var StoreManagerInterface|MockObject
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var ErrorFactory|MockObject
-+     */
-+    private $errorFactory;
-+
-+    /**
-+     * @var PackageResult
-+     */
-+    private $result;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->errorFactory = $this->getMockBuilder(ErrorFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $errorMock = $this->getMockBuilder(Error::class)->disableOriginalConstructor()->getMock();
-+        $errorMock->method('getErrorMessage')->willReturn('error message');
-+        $this->errorFactory->method('create')->willReturn($errorMock);
-+
-+        $this->result = new PackageResult($this->storeManager, $this->errorFactory);
-+    }
-+
-+    /**
-+     * Test accumulating all the rates.
-+     */
-+    public function testNoRates(): void
-+    {
-+        $this->assertTrue($this->result->getError());
-+        $this->assertCount(1, $rates = $this->result->getAllRates());
-+        $this->assertInstanceOf(Error::class, $rates[0]);
-+        $this->assertEquals('error message', $rates[0]->getErrorMessage());
-+    }
-+
-+    /**
-+     * Test composing received rates.
-+     */
-+    public function testComposing(): void
-+    {
-+        $rate1 = $this->getMockBuilder(Method::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getMethod', 'getPrice', 'setPrice'])
-+            ->getMock();
-+        $price1 = 3;
-+        $rate1->method('getMethod')->willReturn('method');
-+        $rate1->method('getPrice')->willReturnReference($price1);
-+        $rate1->method('setPrice')
-+            ->willReturnCallback(
-+                function ($price) use (&$price1) {
-+                    $price1 = $price;
-+                }
-+            );
-+        /** @var Result|MockObject $result1 */
-+        $result1 = $this->getMockBuilder(Result::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $result1->method('getAllRates')->willReturn([$rate1]);
-+        $result1->expects($this->once())
-+            ->method('updateRatePrice')
-+            ->with(2)
-+            ->willReturnCallback(
-+                function () use (&$price1) {
-+                    $price1 = $price1 * 2;
-+                }
-+            );
-+
-+        $rate2 = $this->getMockBuilder(Method::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getMethod', 'getPrice', 'setPrice'])
-+            ->getMock();
-+        $price2 = 4;
-+        $rate2->method('getMethod')->willReturn('method');
-+        $rate2->method('getPrice')->willReturnReference($price2);
-+        $rate2->method('setPrice')
-+            ->willReturnCallback(
-+                function ($price) use (&$price2) {
-+                    $price2 = $price;
-+                }
-+            );
-+        /** @var Result|MockObject $result2 */
-+        $result2 = $this->getMockBuilder(Result::class)->disableOriginalConstructor()->getMock();
-+        $result2->method('getAllRates')->willReturn([$rate2]);
-+        $result2->expects($this->once())
-+            ->method('updateRatePrice')
-+            ->with(3)
-+            ->willReturnCallback(
-+                function () use (&$price2) {
-+                    $price2 = $price2 * 3;
-+                }
-+            );
-+
-+        $this->result->appendPackageResult($result1, 2);
-+        $this->result->appendPackageResult($result2, 3);
-+        $rates = $this->result->getAllRates();
-+        $this->assertCount(1, $rates);
-+        $this->assertEquals(18, $rates[0]->getPrice());
-+    }
-+
-+    /**
-+     * Case when the same results are given more than once.
-+     *
-+     * @expectedException \InvalidArgumentException
-+     * @expectedExceptionMessage Same object received from carrier.
-+     */
-+    public function testAppendSameReference(): void
-+    {
-+        $rate1 = $this->getMockBuilder(Method::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getMethod', 'getPrice', 'setPrice'])
-+            ->getMock();
-+        $price1 = 3;
-+        $rate1->method('getMethod')->willReturn('method');
-+        $rate1->method('getPrice')->willReturnReference($price1);
-+        $rate1->method('setPrice')
-+            ->willReturnCallback(
-+                function ($price) use (&$price1) {
-+                    $price1 = $price;
-+                }
-+            );
-+        /** @var Result|MockObject $result1 */
-+        $result1 = $this->getMockBuilder(Result::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $result1->method('getAllRates')->willReturn([$rate1]);
-+
-+        $this->result->appendPackageResult($result1, 1);
-+        $this->result->appendPackageResult($result1, 2);
-+        $this->result->getAllRates();
-+    }
-+}
-diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
-index be4069ccdc1..d539a44f58a 100644
---- a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
-+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
-@@ -3,48 +3,50 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
- ?>
--<form id="edit_form" method="post" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
-+<form id="edit_form" method="post" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
-     <?= $block->getBlockHtml('formkey') ?>
-     <?php  $_order = $block->getShipment()->getOrder() ?>
-     <?= $block->getChildHtml('order_info') ?>
-     <div class="admin__page-section">
-         <div class="admin__page-section-title">
--            <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
-+            <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
-         </div>
-         <div class="admin__page-section-content">
-             <div class="admin__page-section-item order-payment-method">
-                 <?php /* Billing Address */ ?>
-                 <div class="admin__page-section-item-title">
--                    <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
-+                    <span class="title"><?=$block->escapeHtml(__('Payment Information')) ?></span>
-                 </div>
-                 <div class="admin__page-section-item-content">
-                     <div><?= $block->getPaymentHtml() ?></div>
--                    <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
-+                    <div class="order-payment-currency"><?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?></div>
-                 </div>
-             </div>
-             <div class="admin__page-section-item order-shipping-address">
-                 <?php /* Shipping Address */ ?>
-                 <div class="admin__page-section-item-title">
--                    <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
-+                    <span class="title"><?= $block->escapeHtml(__('Shipping Information')) ?></span>
-                 </div>
-                 <div class="admin__page-section-item-content shipping-description-wrapper">
--                    <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
-+                    <div class="shipping-description-title">
-+                        <?= $block->escapeHtml($_order->getShippingDescription()) ?>
-+                    </div>
-                     <div class="shipping-description-content">
--                        <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
-+                        <?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
- 
--                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
-+                        <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
-                             <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
--                        <?php else: ?>
-+                        <?php else : ?>
-                             <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-                         <?php endif; ?>
-                         <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
--                        <?= /* @escapeNotVerified */ $_excl ?>
--                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
--                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
-+                        <?= /** @noEscape */ $_excl ?>
-+                        <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices()
-+                            && $_incl != $_excl) : ?>
-+                        (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /** @noEscape */ $_incl ?>)
-                         <?php endif; ?>
-                     </div>
-                 </div>
-diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
-index 35e36aa5584..ddb5dde5dfa 100644
---- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
-+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
-@@ -3,32 +3,35 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+//phpcs:disable Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
-+//phpcs:disable Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore
- ?>
- 
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Items to Ship') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Items to Ship')) ?></span>
-     </div>
-     <div class="admin__table-wrapper">
-         <table class="data-table admin__table-primary order-shipment-table">
-             <thead>
-                 <tr class="headings">
--                    <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
--                    <th class="col-ordered-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
--                    <th class="col-qty<?php if ($block->isShipmentRegular()): ?> last<?php endif; ?>">
--                        <span><?= /* @escapeNotVerified */ __('Qty to Ship') ?></span>
-+                    <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
-+                    <th class="col-ordered-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
-+                    <th class="col-qty<?php if ($block->isShipmentRegular()) : ?> last<?php endif; ?>">
-+                        <span><?= $block->escapeHtml(__('Qty to Ship')) ?></span>
-                     </th>
--                    <?php if (!$block->canShipPartiallyItem()): ?>
--                    <th class="col-ship last"><span><?= /* @escapeNotVerified */ __('Ship') ?></span></th>
-+                    <?php if (!$block->canShipPartiallyItem()) : ?>
-+                    <th class="col-ship last"><span><?= $block->escapeHtml(__('Ship')) ?></span></th>
-                     <?php endif; ?>
-                 </tr>
-             </thead>
-             <?php $_items = $block->getShipment()->getAllItems() ?>
--            <?php $_i = 0; foreach ($_items as $_item): if ($_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
--                <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'odd' : 'even' ?>">
-+            <?php $_i = 0; foreach ($_items as $_item) :
-+                if ($_item->getOrderItem()->getParentItem()) :
-+                    continue;
-+                endif;
-+                $_i++ ?>
-+                <tbody class="<?= $_i%2 ? 'odd' : 'even' ?>">
-                     <?= $block->getItemHtml($_item) ?>
-                     <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
-                 </tbody>
-@@ -39,24 +42,24 @@
- 
- <section class="admin__page-section">
-     <div class="admin__page-section-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Shipment Total') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Shipment Total')) ?></span>
-     </div>
-     <div class="admin__page-section-content order-comments-history">
-         <div class="admin__page-section-item">
-             <div class="admin__page-section-item-title">
--                <span class="title"><?= /* @escapeNotVerified */ __('Shipment Comments') ?></span>
-+                <span class="title"><?= $block->escapeHtml(__('Shipment Comments')) ?></span>
-             </div>
-             <div class="admin__page-section-item-content">
-                 <div id="order-history_form" class="admin__field">
-                     <label class="admin__field-label"
-                            for="shipment_comment_text">
--                        <span><?= /* @escapeNotVerified */ __('Comment Text') ?></span></label>
-+                        <span><?= $block->escapeHtml(__('Comment Text')) ?></span></label>
-                     <div class="admin__field-control">
-                         <textarea id="shipment_comment_text"
-                                   class="admin__control-textarea"
-                                   name="shipment[comment_text]"
-                                   rows="3"
--                                  cols="5"><?= /* @escapeNotVerified */ $block->getShipment()->getCommentText() ?></textarea>
-+                                  cols="5"><?= $block->escapeHtml($block->getShipment()->getCommentText()) ?></textarea>
-                     </div>
-                 </div>
-             </div>
-@@ -64,10 +67,10 @@
-     </div>
-     <div class="admin__page-section-item order-totals order-totals-actions">
-         <div class="admin__page-section-item-title">
--            <span class="title"><?= /* @escapeNotVerified */ __('Shipment Options') ?></span>
-+            <span class="title"><?= $block->escapeHtml(__('Shipment Options')) ?></span>
-         </div>
-         <div class="admin__page-section-item-content">
--            <?php if ($block->canCreateShippingLabel()): ?>
-+            <?php if ($block->canCreateShippingLabel()) : ?>
-                 <div class="field choice admin__field admin__field-option field-create">
-                     <input id="create_shipping_label"
-                            class="admin__control-checkbox"
-@@ -77,7 +80,7 @@
-                            onclick="toggleCreateLabelCheckbox();"/>
-                     <label class="admin__field-label"
-                            for="create_shipping_label">
--                        <span><?= /* @escapeNotVerified */ __('Create Shipping Label') ?></span></label>
-+                        <span><?= $block->escapeHtml(__('Create Shipping Label')) ?></span></label>
-                 </div>
-             <?php endif ?>
- 
-@@ -89,10 +92,10 @@
-                        type="checkbox"/>
-                 <label class="admin__field-label"
-                        for="notify_customer">
--                    <span><?= /* @escapeNotVerified */ __('Append Comments') ?></span></label>
-+                    <span><?=$block->escapeHtml(__('Append Comments')) ?></span></label>
-             </div>
- 
--            <?php if ($block->canSendShipmentEmail()): ?>
-+            <?php if ($block->canSendShipmentEmail()) : ?>
-                 <div class="field choice admin__field admin__field-option field-email">
-                     <input id="send_email"
-                            class="admin__control-checkbox"
-@@ -101,7 +104,7 @@
-                            type="checkbox"/>
-                     <label class="admin__field-label"
-                            for="send_email">
--                        <span><?= /* @escapeNotVerified */ __('Email Copy of Shipment') ?></span></label>
-+                        <span><?= $block->escapeHtml(__('Email Copy of Shipment')) ?></span></label>
-                 </div>
-             <?php endif; ?>
-             <?= $block->getChildHtml('submit_before') ?>
-@@ -147,7 +150,7 @@ window.toggleCreateLabelCheckbox = function() {
- window.submitShipment = function(btn) {
-     if (!validQtyItems()) {
-         alert({
--            content: '<?= /* @escapeNotVerified */ __('Invalid value(s) for Qty to Ship') ?>'
-+            content: '<?= $block->escapeJs($block->escapeHtml(__('Invalid value(s) for Qty to Ship'))) ?>'
-         });
-         return;
-     }
-diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
-index b5d2aafe18e..caea091eacb 100644
---- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
-+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
-@@ -3,28 +3,29 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+//phpcs:disable Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
-+//phpcs:disable Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore
- ?>
- <?php $_item = $block->getItem() ?>
- <tr>
-     <td class="col-product"><?= $block->getColumnHtml($_item, 'name') ?></td>
-     <td class="col-ordered-qty"><?= $block->getColumnHtml($_item, 'qty') ?></td>
--    <td class="col-qty <?php if ($block->isShipmentRegular()): ?>last<?php endif; ?>">
--        <?php if ($block->canShipPartiallyItem()): ?>
-+    <td class="col-qty <?php if ($block->isShipmentRegular()) : ?>last<?php endif; ?>">
-+        <?php if ($block->canShipPartiallyItem()) : ?>
-             <input type="text"
-                    class="input-text admin__control-text qty-item"
--                   name="shipment[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]"
--                   value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" />
--        <?php else: ?>
--            <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
-+                   name="shipment[items][<?= (int) $_item->getOrderItemId() ?>]"
-+                   value="<?= /* @noEscape */ $_item->getQty()*1 ?>" />
-+        <?php else : ?>
-+            <?= /* @noEscape */ $_item->getQty()*1 ?>
-         <?php endif; ?>
-     </td>
--    <?php if (!$block->canShipPartiallyItem()): ?>
-+    <?php if (!$block->canShipPartiallyItem()) : ?>
-     <td class="col-ship last">
--        <input type="hidden" name="shipment[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]" value="0" />
--        <input type="checkbox" name="shipment[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]" value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" checked />
-+        <input type="hidden" name="shipment[items][<?= (int) $_item->getOrderItemId() ?>]" value="0" />
-+        <input type="checkbox"
-+               name="shipment[items][<?= (int) $_item->getOrderItemId() ?>]"
-+               value="<?= /* @noEscape */ $_item->getQty()*1 ?>" checked />
-     </td>
-     <?php endif; ?>
- </tr>
-diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
-index 1a9d44c19db..22d546f4fb4 100644
---- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
-+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
-@@ -3,9 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+//phpcs:disable Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
-+//phpcs:disable Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore
-+//phpcs:disable Squiz.Operators.IncrementDecrementUsage.NotAllowed
-+//phpcs:disable Squiz.PHP.NonExecutableCode.Unreachable
- ?>
- <div class="grid">
-     <?php $randomId = rand(); ?>
-@@ -19,29 +20,31 @@
-                                    id="select-items-<?= /* @noEscape */ $randomId ?>"
-                                    onchange="packaging.checkAllItems(this);"
-                                    class="checkbox admin__control-checkbox"
--                                   title="<?= /* @escapeNotVerified */ __('Select All') ?>">
-+                                   title="<?= $block->escapeHtmlAttr(__('Select All')) ?>">
-                             <label for="select-items-<?= /* @noEscape */ $randomId ?>"></label>
-                         </label>
-                     </th>
--                    <th class="data-grid-th"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
--                    <th class="data-grid-th"><?= /* @escapeNotVerified */ __('Weight') ?></th>
-+                    <th class="data-grid-th"><?= $block->escapeHtml(__('Product Name')) ?></th>
-+                    <th class="data-grid-th"><?= $block->escapeHtml(__('Weight')) ?></th>
-                     <th class="data-grid-th" <?= $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
--                        <?= /* @escapeNotVerified */ __('Customs Value') ?>
-+                        <?= $block->escapeHtml(__('Customs Value')) ?>
-                     </th>
--                    <th class="data-grid-th"><?= /* @escapeNotVerified */ __('Qty Ordered') ?></th>
--                    <th class="data-grid-th"><?= /* @escapeNotVerified */ __('Qty') ?></th>
-+                    <th class="data-grid-th"><?= $block->escapeHtml(__('Qty Ordered')) ?></th>
-+                    <th class="data-grid-th"><?= $block->escapeHtml(__('Qty')) ?></th>
-                 </tr>
-             </thead>
-             <tbody>
-             <?php $i=0; ?>
--            <?php foreach ($block->getCollection() as $item): ?>
-+            <?php foreach ($block->getCollection() as $item) : ?>
-                 <?php
-                     $_order = $block->getShipment()->getOrder();
-                     $_orderItem = $_order->getItemById($item->getOrderItemId());
-                 ?>
-                 <?php if ($item->getIsVirtual()
--                    || ($_orderItem->isShipSeparately() && !($_orderItem->getParentItemId() || $_orderItem->getParentItem()))
--                    || (!$_orderItem->isShipSeparately() && ($_orderItem->getParentItemId() || $_orderItem->getParentItem()))): ?>
-+                    || ($_orderItem->isShipSeparately()
-+                        && !($_orderItem->getParentItemId() || $_orderItem->getParentItem()))
-+                    || (!$_orderItem->isShipSeparately()
-+                        && ($_orderItem->getParentItemId() || $_orderItem->getParentItem()))) : ?>
-                     <?php continue; ?>
-                 <?php endif; ?>
-                 <tr class="data-grid-controls-row data-row <?= ($i++ % 2 != 0) ? '_odd-row' : '' ?>">
-@@ -51,16 +54,16 @@
-                             <input type="checkbox"
-                                    name=""
-                                    id="select-item-<?= /* @noEscape */ $randomId . '-' . $id ?>"
--                                   value="<?= /* @escapeNotVerified */ $id ?>"
-+                                   value="<?= (int) $id ?>"
-                                    class="checkbox admin__control-checkbox">
-                             <label for="select-item-<?= /* @noEscape */ $randomId . '-' . $id ?>"></label>
-                         </label>
-                     </td>
-                     <td>
--                        <?= /* @escapeNotVerified */ $item->getName() ?>
-+                        <?= $block->escapeHtml($item->getName()) ?>
-                     </td>
-                     <td data-role="item-weight">
--                        <?= /* @escapeNotVerified */ $item->getWeight() ?>
-+                        <?= $block->escapeHtml($item->getWeight()) ?>
-                     </td>
-                     <?php
-                     if ($block->displayCustomsValue()) {
-@@ -72,25 +75,32 @@
-                     }
- 
-                     ?>
--                    <td <?= /* @escapeNotVerified */ $customsValueDisplay ?>>
-+                    <td <?= /* @noEscape */ $customsValueDisplay ?>>
-                         <input type="text"
-                                name="customs_value"
--                               class="input-text admin__control-text <?= /* @escapeNotVerified */ $customsValueValidation ?>"
--                               value="<?= /* @escapeNotVerified */ $block->formatPrice($item->getPrice()) ?>"
-+                               class="input-text admin__control-text <?= /* @noEscape */ $customsValueValidation ?>"
-+                               value="<?= $block->escapeHtmlAttr($block->formatPrice($item->getPrice())) ?>"
-                                size="10"
-                                onblur="packaging.recalcContainerWeightAndCustomsValue(this);">
-                     </td>
-                     <td>
--                        <?= /* @escapeNotVerified */ $item->getOrderItem()->getQtyOrdered()*1 ?>
-+                        <?= /* @noEscape */ $item->getOrderItem()->getQtyOrdered()*1 ?>
-                     </td>
-                     <td>
--                        <input type="hidden" name="price" value="<?= /* @escapeNotVerified */ $item->getPrice() ?>">
-+                        <input type="hidden" name="price" value="<?= $block->escapeHtml($item->getPrice()) ?>">
-                         <input type="text"
-                                name="qty"
--                               value="<?= /* @escapeNotVerified */ $item->getQty()*1 ?>"
--                               class="input-text admin__control-text qty<?php if ($item->getOrderItem()->getIsQtyDecimal()): ?> qty-decimal<?php endif ?>">&nbsp;
--                        <button type="button" class="action-delete" data-action="package-delete-item" onclick="packaging.deleteItem(this);" style="display:none;">
--                            <span><?= /* @escapeNotVerified */ __('Delete') ?></span>
-+                               value="<?= /* @noEscape */ $item->getQty()*1 ?>"
-+                               class="input-text admin__control-text qty
-+                            <?php if ($item->getOrderItem()->getIsQtyDecimal()) : ?>
-+                               qty-decimal
-+                            <?php endif ?>">&nbsp;
-+                        <button type="button"
-+                                class="action-delete"
-+                                data-action="package-delete-item"
-+                                onclick="packaging.deleteItem(this);"
-+                                style="display:none;">
-+                            <span><?= $block->escapeHtml(__('Delete')) ?></span>
-                         </button>
-                     </td>
-                 </tr>
-diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
-index 1d9cf5688be..8d47f533449 100644
---- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
-+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
-@@ -3,18 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
-+//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- 
- <div id="packed_window">
--<?php foreach ($block->getPackages() as $packageId => $package): ?>
-+<?php foreach ($block->getPackages() as $packageId => $package) : ?>
-     <?php $package = new \Magento\Framework\DataObject($package) ?>
-     <?php $params = new \Magento\Framework\DataObject($package->getParams()) ?>
-     <section class="admin__page-section">
-         <div class="admin__page-section-title">
--            <span class="title"><?= /* @escapeNotVerified */ __('Package') . ' ' . $packageId ?></span>
-+            <span class="title"><?= $block->escapeHtml(__('Package') . ' ' . $packageId) ?></span>
-         </div>
-         <div class="admin__page-section-content">
-             <div class="row row-gutter">
-@@ -22,22 +21,24 @@
-                     <table class="admin__table-secondary">
-                         <tbody>
-                             <tr>
--                                <th><?= /* @escapeNotVerified */ __('Type') ?></th>
--                                <td><?= /* @escapeNotVerified */ $block->getContainerTypeByCode($params->getContainer()) ?></td>
-+                                <th><?= $block->escapeHtml(__('Type')) ?></th>
-+                                <td>
-+                                    <?= $block->escapeHtml($block->getContainerTypeByCode($params->getContainer())) ?>
-+                                </td>
-                             </tr>
-                             <tr>
--                            <?php if ($block->displayCustomsValue()): ?>
--                                <th><?= /* @escapeNotVerified */ __('Customs Value') ?></th>
--                                <td><?= /* @escapeNotVerified */ $block->displayCustomsPrice($params->getCustomsValue()) ?></td>
--                            <?php else: ?>
--                                <th><?= /* @escapeNotVerified */ __('Total Weight') ?></th>
--                                <td><?= /* @escapeNotVerified */ $params->getWeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureWeightName($params->getWeightUnits()) ?></td>
-+                            <?php if ($block->displayCustomsValue()) : ?>
-+                                <th><?= $block->escapeHtml(__('Customs Value')) ?></th>
-+                                <td><?= $block->escapeHtml($block->displayCustomsPrice($params->getCustomsValue())) ?></td>
-+                            <?php else : ?>
-+                                <th><?= $block->escapeHtml(__('Total Weight')) ?></th>
-+                                <td><?= $block->escapeHtml($params->getWeight() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureWeightName($params->getWeightUnits())) ?></td>
-                             <?php endif; ?>
-                             </tr>
--                        <?php if ($params->getSize()): ?>
-+                        <?php if ($params->getSize()) : ?>
-                             <tr>
--                                <th><?= /* @escapeNotVerified */ __('Size') ?></th>
--                                <td><?= /* @escapeNotVerified */ ucfirst(strtolower($params->getSize())) ?></td>
-+                                <th><?= $block->escapeHtml(__('Size')) ?></th>
-+                                <td><?= $block->escapeHtml(ucfirst(strtolower($params->getSize()))) ?></td>
-                             </tr>
-                         <?php endif; ?>
-                         </tbody>
-@@ -47,31 +48,31 @@
-                     <table class="admin__table-secondary">
-                         <tbody>
-                             <tr>
--                                <th><?= /* @escapeNotVerified */ __('Length') ?></th>
-+                                <th><?= $block->escapeHtml(__('Length')) ?></th>
-                                 <td>
--                                <?php if ($params->getLength() != null): ?>
--                                    <?= /* @escapeNotVerified */ $params->getLength() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
--                                <?php else: ?>
-+                                <?php if ($params->getLength() != null) : ?>
-+                                    <?= $block->escapeHtml($params->getLength() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureDimensionName($params->getDimensionUnits())) ?>
-+                                <?php else : ?>
-                                     --
-                                 <?php endif; ?>
-                                 </td>
-                             </tr>
-                             <tr>
--                                <th><?= /* @escapeNotVerified */ __('Width') ?></th>
-+                                <th><?= $block->escapeHtml(__('Width')) ?></th>
-                                 <td>
--                                <?php if ($params->getWidth() != null): ?>
--                                    <?= /* @escapeNotVerified */ $params->getWidth() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
--                                <?php else: ?>
-+                                <?php if ($params->getWidth() != null) : ?>
-+                                    <?= $block->escapeHtml($params->getWidth() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureDimensionName($params->getDimensionUnits())) ?>
-+                                <?php else : ?>
-                                     --
-                                 <?php endif; ?>
-                                 </td>
-                             </tr>
-                             <tr>
--                                <th><?= /* @escapeNotVerified */ __('Height') ?></th>
-+                                <th><?= $block->escapeHtml(__('Height')) ?></th>
-                                 <td>
--                                <?php if ($params->getHeight() != null): ?>
--                                    <?= /* @escapeNotVerified */ $params->getHeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
--                                <?php else: ?>
-+                                <?php if ($params->getHeight() != null) : ?>
-+                                    <?= $block->escapeHtml($params->getHeight() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureDimensionName($params->getDimensionUnits())) ?>
-+                                <?php else : ?>
-                                     --
-                                 <?php endif; ?>
-                                 </td>
-@@ -82,26 +83,26 @@
-                 <div class="col-m-4">
-                     <table class="admin__table-secondary">
-                         <tbody>
--                        <?php if ($params->getDeliveryConfirmation() != null): ?>
-+                        <?php if ($params->getDeliveryConfirmation() != null) : ?>
-                             <tr>
--                                <th><?= /* @escapeNotVerified */ __('Signature Confirmation') ?></th>
--                                <td><?= /* @escapeNotVerified */ $block->getDeliveryConfirmationTypeByCode($params->getDeliveryConfirmation()) ?></td>
-+                                <th><?= $block->escapeHtml(__('Signature Confirmation')) ?></th>
-+                                <td><?= $block->escapeHtml($block->getDeliveryConfirmationTypeByCode($params->getDeliveryConfirmation())) ?></td>
-                             </tr>
-                         <?php endif; ?>
--                        <?php if ($params->getContentType() != null): ?>
-+                        <?php if ($params->getContentType() != null) : ?>
-                             <tr>
--                                <th><?= /* @escapeNotVerified */ __('Contents') ?></th>
--                                <?php if ($params->getContentType() == 'OTHER'): ?>
-+                                <th><?= $block->escapeHtml(__('Contents')) ?></th>
-+                                <?php if ($params->getContentType() == 'OTHER') : ?>
-                                     <td><?= $block->escapeHtml($params->getContentTypeOther()) ?></td>
--                                <?php else: ?>
--                                    <td><?= /* @escapeNotVerified */ $block->getContentTypeByCode($params->getContentType()) ?></td>
-+                                <?php else : ?>
-+                                    <td><?= $block->escapeHtml($block->getContentTypeByCode($params->getContentType())) ?></td>
-                                 <?php endif; ?>
-                             </tr>
-                         <?php endif; ?>
--                        <?php if ($params->getGirth()): ?>
-+                        <?php if ($params->getGirth()) : ?>
-                             <tr>
--                                <th><?= /* @escapeNotVerified */ __('Girth') ?></th>
--                                <td><?= /* @escapeNotVerified */ $params->getGirth() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getGirthDimensionUnits()) ?></td>
-+                                <th><?= $block->escapeHtml(__('Girth')) ?></th>
-+                                <td><?= $block->escapeHtml($params->getGirth() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureDimensionName($params->getGirthDimensionUnits())) ?></td>
-                             </tr>
-                         <?php endif; ?>
-                         </tbody>
-@@ -110,19 +111,19 @@
-             </div>
-         </div>
-         <div class="admin__page-section-item-title">
--            <span class="title"><?= /* @escapeNotVerified */ __('Items in the Package') ?></span>
-+            <span class="title"><?= $block->escapeHtml(__('Items in the Package')) ?></span>
-         </div>
-         <div class="admin__table-wrapper">
-             <table class="data-table admin__table-primary">
-                 <thead>
-                 <tr class="headings">
--                    <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
--                    <th class="col-weight"><span><?= /* @escapeNotVerified */ __('Weight') ?></span></th>
--                    <?php if ($block->displayCustomsValue()): ?>
--                        <th class="col-custom"><span><?= /* @escapeNotVerified */ __('Customs Value') ?></span></th>
-+                    <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
-+                    <th class="col-weight"><span><?= $block->escapeHtml(__('Weight')) ?></span></th>
-+                    <?php if ($block->displayCustomsValue()) : ?>
-+                        <th class="col-custom"><span><?= $block->escapeHtml(__('Customs Value')) ?></span></th>
-                     <?php endif; ?>
--                    <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty Ordered') ?></span></th>
--                    <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
-+                    <th class="col-qty"><span><?= $block->escapeHtml(__('Qty Ordered')) ?></span></th>
-+                    <th class="col-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
-                 </tr>
-                 </thead>
-                 <tbody id="">
-@@ -130,19 +131,21 @@
-                     <?php $item = new \Magento\Framework\DataObject($item) ?>
-                     <tr title="#" id="">
-                         <td class="col-product">
--                            <?= /* @escapeNotVerified */ $item->getName() ?>
-+                            <?= $block->escapeHtml($item->getName()) ?>
-                         </td>
-                         <td class="col-weight">
--                            <?= /* @escapeNotVerified */ $item->getWeight() ?>
-+                            <?= $block->escapeHtml($item->getWeight()) ?>
-                         </td>
--                        <?php if ($block->displayCustomsValue()): ?>
--                            <td class="col-custom"><?= /* @escapeNotVerified */ $block->displayCustomsPrice($item->getCustomsValue()) ?></td>
-+                        <?php if ($block->displayCustomsValue()) : ?>
-+                            <td class="col-custom">
-+                                <?= $block->escapeHtml($block->displayCustomsPrice($item->getCustomsValue())) ?>
-+                            </td>
-                         <?php endif; ?>
-                         <td class="col-qty">
--                            <?= /* @escapeNotVerified */ $block->getQtyOrderedItem($item->getOrderItemId()) ?>
-+                            <?= $block->escapeHtml($block->getQtyOrderedItem($item->getOrderItemId())) ?>
-                         </td>
-                         <td class="col-qty">
--                            <?= /* @escapeNotVerified */ $item->getQty()*1 ?>
-+                            <?= /* @noEscape */ $item->getQty()*1 ?>
-                         </td>
-                     </tr>
-                 <?php endforeach; ?>
-@@ -163,8 +166,8 @@
-         "#packed_window": {
-             "Magento_Shipping/js/packages":{
-                 "type":"slide",
--                "title":"<?= /* @escapeNotVerified */  __('Packages') ?>",
--                "url": "<?= /* @escapeNotVerified */ $block->getPrintButton() ?>"
-+                "title":"<?= $block->escapeHtml(__('Packages')) ?>",
-+                "url": "<?= $block->escapeUrl($block->getPrintButton()) ?>"
-             }
-         }
-     }
-diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
-index a1f2d274183..cd25cb919ad 100644
---- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
-+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
-@@ -3,9 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+//phpcs:disable PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
-+//phpcs:disable Magento2.Security.IncludeFile.FoundIncludeFile
- ?>
- <?php /** @var $block \Magento\Shipping\Block\Adminhtml\Order\Packaging */ ?>
- <?php
-@@ -21,21 +20,21 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
-         "Magento_Ui/js/modal/modal"
-     ], function(jQuery){
- 
--        window.packaging = new Packaging(<?= /* @escapeNotVerified */ $block->getConfigDataJson() ?>);
-+        window.packaging = new Packaging(<?= /* @noEscape */ $block->getConfigDataJson() ?>);
-         packaging.changeContainerType($$('select[name=package_container]')[0]);
-         packaging.checkSizeAndGirthParameter(
-             $$('select[name=package_container]')[0],
--            <?= /* @escapeNotVerified */ $girthEnabled ?>
-+            <?= /* @noEscape */ $girthEnabled ?>
-         );
-         packaging.setConfirmPackagingCallback(function(){
-             packaging.setParamsCreateLabelRequest($('edit_form').serialize(true));
-             packaging.sendCreateLabelRequest();
-         });
-         packaging.setLabelCreatedCallback(function(response){
--            setLocation("<?php /* @escapeNotVerified */ echo $block->getUrl(
-+            setLocation("<?php $block->escapeJs($block->escapeUrl($block->getUrl(
-                 'sales/order/view',
-                 ['order_id' => $block->getShipment()->getOrderId()]
--            ); ?>");
-+            ))); ?>");
-         });
-         packaging.setCancelCallback(function() {
-             if ($('create_shipping_label')) {
-@@ -52,23 +51,23 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
-         });
-         jQuery('#packaging_window').modal({
-             type: 'slide',
--            title: '<?= /* @escapeNotVerified */ __('Create Packages') ?>',
-+            title: '<?= $block->escapeJs($block->escapeHtml(__('Create Packages'))) ?>',
-             buttons: [{
--                text: '<?= /* @escapeNotVerified */ __('Cancel') ?>',
-+                text: '<?= $block->escapeJs($block->escapeHtml(__('Cancel'))) ?>',
-                 'class': 'action-secondary',
-                 click: function () {
-                     packaging.cancelPackaging();
-                     this.closeModal();
-                     }
-                 }, {
--                text: '<?= /* @escapeNotVerified */ __('Save') ?>',
-+                text: '<?= $block->escapeJs($block->escapeHtml(__('Save'))) ?>',
-                 'attr': {'disabled':'disabled', 'data-action':'save-packages'},
-                 'class': 'action-primary _disabled',
-                 click: function () {
-                     packaging.confirmPackaging();
-                     }
-                 }, {
--                    text: '<?= /* @escapeNotVerified */ __('Add Package') ?>',
-+                    text: '<?= $block->escapeJs($block->escapeHtml(__('Add Package'))) ?>',
-                     'attr': {'data-action':'add-packages'},
-                     'class': 'action-secondary',
-                     click: function () {
-diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
-index c32b63bddab..f91741f439d 100644
---- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
-+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
- ?>
- <?php /** @var $block \Magento\Shipping\Block\Adminhtml\Order\Packaging */ ?>
- <div id="packaging_window">
-@@ -13,14 +11,20 @@
-     <section class="admin__page-section" id="package_template" style="display:none;">
-         <div class="admin__page-section-title">
-             <span class="title">
--                <?= /* @escapeNotVerified */ __('Package') ?> <span data-role="package-number"></span>
-+                <?= $block->escapeHtml(__('Package')) ?> <span data-role="package-number"></span>
-             </span>
-             <div class="actions _primary">
--                <button type="button" class="action-secondary" data-action="package-save-items" onclick="packaging.packItems(this);">
--                    <span><?= /* @escapeNotVerified */ __('Add Selected Product(s) to Package') ?></span>
-+                <button type="button"
-+                        class="action-secondary"
-+                        data-action="package-save-items"
-+                        onclick="packaging.packItems(this);">
-+                    <span><?= $block->escapeHtml(__('Add Selected Product(s) to Package')) ?></span>
-                 </button>
--                <button type="button" class="action-secondary" data-action="package-add-items" onclick="packaging.getItemsForPack(this);">
--                    <span><?= /* @escapeNotVerified */ __('Add Products to Package') ?></span>
-+                <button type="button"
-+                        class="action-secondary"
-+                        data-action="package-add-items"
-+                        onclick="packaging.getItemsForPack(this);">
-+                    <span><?= $block->escapeHtml(__('Add Products to Package')) ?></span>
-                 </button>
-             </div>
-         </div>
-@@ -28,23 +32,23 @@
-             <table class="data-table admin__control-table">
-                 <thead>
-                     <tr>
--                        <th class="col-type"><?= /* @escapeNotVerified */ __('Type') ?></th>
--                        <?php if ($girthEnabled == 1): ?>
--                        <th class="col-size"><?= /* @escapeNotVerified */ __('Size') ?></th>
--                        <th class="col-girth"><?= /* @escapeNotVerified */ __('Girth') ?></th>
-+                        <th class="col-type"><?= $block->escapeHtml(__('Type')) ?></th>
-+                        <?php if ($girthEnabled == 1) : ?>
-+                        <th class="col-size"><?= $block->escapeHtml(__('Size')) ?></th>
-+                        <th class="col-girth"><?= $block->escapeHtml(__('Girth')) ?></th>
-                         <th>&nbsp;</th>
-                         <?php endif; ?>
-                         <th class="col-custom" <?= $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
--                            <?= /* @escapeNotVerified */ __('Customs Value') ?>
-+                            <?= $block->escapeHtml(__('Customs Value')) ?>
-                         </th>
--                        <th class="col-total-weight"><?= /* @escapeNotVerified */ __('Total Weight') ?></th>
--                        <th class="col-length"><?= /* @escapeNotVerified */ __('Length') ?></th>
--                        <th class="col-width"><?= /* @escapeNotVerified */ __('Width') ?></th>
--                        <th class="col-height"><?= /* @escapeNotVerified */ __('Height') ?></th>
-+                        <th class="col-total-weight"><?= $block->escapeHtml(__('Total Weight')) ?></th>
-+                        <th class="col-length"><?= $block->escapeHtml(__('Length')) ?></th>
-+                        <th class="col-width"><?= $block->escapeHtml(__('Width')) ?></th>
-+                        <th class="col-height"><?= $block->escapeHtml(__('Height')) ?></th>
-                         <th>&nbsp;</th>
--                        <?php if ($block->getDeliveryConfirmationTypes()): ?>
--                        <th class="col-signature"><?= /* @escapeNotVerified */ __('Signature Confirmation') ?></th>
--                            <?php endif; ?>
-+                        <?php if ($block->getDeliveryConfirmationTypes()) : ?>
-+                        <th class="col-signature"><?= $block->escapeHtml(__('Signature Confirmation')) ?></th>
-+                        <?php endif; ?>
-                         <th class="col-actions">&nbsp;</th>
-                     </tr>
-                 </thead>
-@@ -53,29 +57,29 @@
-                         <td class="col-type">
-                             <?php $containers = $block->getContainers(); ?>
-                             <select name="package_container"
--                                    onchange="packaging.changeContainerType(this);packaging.checkSizeAndGirthParameter(this, <?= /* @escapeNotVerified */ $girthEnabled ?>);"
--                                    <?php if (empty($containers)):?>
--                                        title="<?= /* @escapeNotVerified */ __('USPS domestic shipments don\'t use package types.') ?>"
-+                                    onchange="packaging.changeContainerType(this);packaging.checkSizeAndGirthParameter(this, <?= $block->escapeJs($girthEnabled) ?>);"
-+                                    <?php if (empty($containers)) : ?>
-+                                        title="<?= $block->escapeHtmlAttr(__('USPS domestic shipments don\'t use package types.')) ?>"
-                                         disabled=""
-                                         class="admin__control-select disabled"
--                                    <?php else: ?>
-+                                    <?php else : ?>
-                                         class="admin__control-select"
-                                     <?php endif; ?>>
--                                <?php foreach ($block->getContainers() as $key => $value): ?>
--                                    <option value="<?= /* @escapeNotVerified */ $key ?>" >
--                                        <?= /* @escapeNotVerified */ $value ?>
-+                                <?php foreach ($containers as $key => $value) : ?>
-+                                    <option value="<?= $block->escapeHtmlAttr($key) ?>" >
-+                                        <?= $block->escapeHtml($value) ?>
-                                     </option>
-                                 <?php endforeach; ?>
-                             </select>
-                         </td>
--                        <?php if ($girthEnabled == 1 && !empty($sizeSource)): ?>
-+                        <?php if ($girthEnabled == 1 && !empty($sizeSource)) : ?>
-                         <td>
-                             <select name="package_size"
-                                     class="admin__control-select"
--                                    onchange="packaging.checkSizeAndGirthParameter(this, <?= /* @escapeNotVerified */ $girthEnabled ?>);">
--                                <?php foreach ($sizeSource as $key => $value): ?>
--                                <option value="<?= /* @escapeNotVerified */ $sizeSource[$key]['value'] ?>">
--                                    <?= /* @escapeNotVerified */ $sizeSource[$key]['label'] ?>
-+                                    onchange="packaging.checkSizeAndGirthParameter(this, <?= $block->escapeJs($girthEnabled) ?>);">
-+                                <?php foreach ($sizeSource as $key => $value) : ?>
-+                                <option value="<?= $block->escapeHtmlAttr($sizeSource[$key]['value']) ?>">
-+                                    <?= $block->escapeHtml($sizeSource[$key]['label']) ?>
-                                 </option>
-                                 <?php endforeach; ?>
-                             </select>
-@@ -89,11 +93,11 @@
-                             <select name="container_girth_dimension_units"
-                                     class="options-units-dimensions measures admin__control-select"
-                                     onchange="packaging.changeMeasures(this);">
--                                <option value="<?= /* @escapeNotVerified */ Zend_Measure_Length::INCH ?>" selected="selected" ><?= /* @escapeNotVerified */ __('in') ?></option>
--                                <option value="<?= /* @escapeNotVerified */ Zend_Measure_Length::CENTIMETER ?>" ><?= /* @escapeNotVerified */ __('cm') ?></option>
-+                                <option value="<?= /* @noEscape */ Zend_Measure_Length::INCH ?>" selected="selected" ><?= $block->escapeHtml(__('in')) ?></option>
-+                                <option value="<?= /* @noEscape */ Zend_Measure_Length::CENTIMETER ?>" ><?= $block->escapeHtml(__('cm')) ?></option>
-                             </select>
-                         </td>
--                            <?php endif; ?>
-+                        <?php endif; ?>
-                         <?php
-                         if ($block->displayCustomsValue()) {
-                             $customsValueDisplay = '';
-@@ -103,13 +107,15 @@
-                             $customsValueValidation = '';
-                         }
-                         ?>
--                        <td class="col-custom" <?= /* @escapeNotVerified */ $customsValueDisplay ?>>
-+                        <td class="col-custom" <?= /* @noEscape */ $customsValueDisplay ?>>
-                             <div class="admin__control-addon">
-                                 <input type="text"
--                                       class="customs-value input-text admin__control-text <?= /* @escapeNotVerified */ $customsValueValidation ?>"
-+                                       class="customs-value input-text admin__control-text <?= /* @noEscape */ $customsValueValidation ?>"
-                                        name="package_customs_value" />
-                                 <span class="admin__addon-suffix">
--                                    <span class="customs-value-currency"><?= /* @escapeNotVerified */ $block->getCustomValueCurrencyCode() ?></span>
-+                                    <span class="customs-value-currency">
-+                                        <?= $block->escapeHtml($block->getCustomValueCurrencyCode()) ?>
-+                                    </span>
-                                 </span>
-                             </div>
-                         </td>
-@@ -121,8 +127,8 @@
-                                     <select name="container_weight_units"
-                                             class="options-units-weight measures admin__control-select"
-                                             onchange="packaging.changeMeasures(this);">
--                                        <option value="<?= /* @escapeNotVerified */ Zend_Measure_Weight::POUND ?>" selected="selected"  ><?= /* @escapeNotVerified */ __('lb') ?></option>
--                                        <option value="<?= /* @escapeNotVerified */ Zend_Measure_Weight::KILOGRAM ?>" ><?= /* @escapeNotVerified */ __('kg') ?></option>
-+                                        <option value="<?= /* @noEscape */ Zend_Measure_Weight::POUND ?>" selected="selected"  ><?= $block->escapeHtml(__('lb')) ?></option>
-+                                        <option value="<?= /* @noEscape */ Zend_Measure_Weight::KILOGRAM ?>" ><?= $block->escapeHtml(__('kg')) ?></option>
-                                     </select>
-                                 <span class="admin__addon-prefix"></span>
-                             </div>
-@@ -146,35 +152,37 @@
-                             <select name="container_dimension_units"
-                                     class="options-units-dimensions measures admin__control-select"
-                                     onchange="packaging.changeMeasures(this);">
--                                <option value="<?= /* @escapeNotVerified */ Zend_Measure_Length::INCH ?>" selected="selected" ><?= /* @escapeNotVerified */ __('in') ?></option>
--                                <option value="<?= /* @escapeNotVerified */ Zend_Measure_Length::CENTIMETER ?>" ><?= /* @escapeNotVerified */ __('cm') ?></option>
-+                                <option value="<?= /* @noEscape */ Zend_Measure_Length::INCH ?>" selected="selected" ><?= $block->escapeHtml(__('in')) ?></option>
-+                                <option value="<?= /* @noEscape */ Zend_Measure_Length::CENTIMETER ?>" ><?= $block->escapeHtml(__('cm')) ?></option>
-                             </select>
-                         </td>
--                        <?php if ($block->getDeliveryConfirmationTypes()): ?>
-+                        <?php if ($block->getDeliveryConfirmationTypes()) : ?>
-                         <td>
-                             <select name="delivery_confirmation_types" class="admin__control-select">
--                                <?php foreach ($block->getDeliveryConfirmationTypes() as $key => $value): ?>
--                                <option value="<?= /* @escapeNotVerified */ $key ?>" >
--                                    <?= /* @escapeNotVerified */ $value ?>
-+                                <?php foreach ($block->getDeliveryConfirmationTypes() as $key => $value) : ?>
-+                                <option value="<?= $block->escapeHtmlAttr($key) ?>" >
-+                                    <?= $block->escapeHtml($value) ?>
-                                 </option>
-                                 <?php endforeach; ?>
-                             </select>
-                         </td>
--                            <?php endif; ?>
-+                        <?php endif; ?>
-                         <td class="col-actions">
--                            <button type="button" class="action-delete DeletePackageBtn" onclick="packaging.deletePackage(this);">
--                                <span><?= /* @escapeNotVerified */ __('Delete Package') ?></span>
-+                            <button type="button"
-+                                    class="action-delete DeletePackageBtn"
-+                                    onclick="packaging.deletePackage(this);">
-+                                <span><?= $block->escapeHtml(__('Delete Package')) ?></span>
-                             </button>
-                         </td>
-                     </tr>
-                 </tbody>
-             </table>
--            <?php if ($block->getContentTypes()): ?>
-+            <?php if ($block->getContentTypes()) : ?>
-                 <table class="data-table admin__control-table" cellspacing="0">
-                     <thead>
-                         <tr>
--                            <th><?= /* @escapeNotVerified */ __('Contents') ?></th>
--                            <th><?= /* @escapeNotVerified */ __('Explanation') ?></th>
-+                            <th><?= $block->escapeHtml(__('Contents')) ?></th>
-+                            <th><?= $block->escapeHtml(__('Explanation')) ?></th>
-                         </tr>
-                     </thead>
-                     <tbody>
-@@ -183,9 +191,9 @@
-                             <select name="content_type"
-                                     class="admin__control-select"
-                                     onchange="packaging.changeContentTypes(this);">
--                                <?php foreach ($block->getContentTypes() as $key => $value): ?>
--                                    <option value="<?= /* @escapeNotVerified */ $key ?>" >
--                                        <?= /* @escapeNotVerified */ $value ?>
-+                                <?php foreach ($block->getContentTypes() as $key => $value) : ?>
-+                                    <option value="<?= $block->escapeHtmlAttr($key) ?>" >
-+                                        <?= $block->escapeHtml($value) ?>
-                                     </option>
-                                 <?php endforeach; ?>
-                             </select>
-diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
-index 02cdca120fd..d65fa819eae 100644
---- a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
-+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block Magento\Shipping\Block\Adminhtml\Order\Tracking */?>
- <script>
-@@ -68,8 +65,8 @@ require(['prototype'], function(){
-                     id="trackingC<%- data.index %>"
-                     class="select admin__control-select carrier"
-                     disabled="disabled">
--                <?php foreach ($block->getCarriers() as $_code => $_name): ?>
--                    <option value="<?= /* @escapeNotVerified */ $_code ?>"><?= $block->escapeHtml($_name) ?></option>
-+                <?php foreach ($block->getCarriers() as $_code => $_name) : ?>
-+                    <option value="<?= $block->escapeHtmlAttr($_code) ?>"><?= $block->escapeHtml($_name) ?></option>
-                 <?php endforeach; ?>
-             </select>
-         </td>
-@@ -94,7 +91,7 @@ require(['prototype'], function(){
-                 type="button"
-                 class="action-default action-delete"
-                 onclick="trackingControl.deleteRow(event);return false">
--                <span><?= /* @escapeNotVerified */ __('Delete') ?></span>
-+                <span><?= $block->escapeHtml(__('Delete')) ?></span>
-             </button>
-         </td>
-     </tr>
-@@ -104,10 +101,10 @@ require(['prototype'], function(){
-     <table class="data-table admin__control-table" id="tracking_numbers_table">
-         <thead>
-         <tr class="headings">
--            <th class="col-carrier"><?= /* @escapeNotVerified */ __('Carrier') ?></th>
--            <th class="col-title"><?= /* @escapeNotVerified */ __('Title') ?></th>
--            <th class="col-number"><?= /* @escapeNotVerified */ __('Number') ?></th>
--            <th class="col-delete"><?= /* @escapeNotVerified */ __('Action') ?></th>
-+            <th class="col-carrier"><?= $block->escapeHtml(__('Carrier')) ?></th>
-+            <th class="col-title"><?= $block->escapeHtml(__('Title')) ?></th>
-+            <th class="col-number"><?= $block->escapeHtml(__('Number')) ?></th>
-+            <th class="col-delete"><?= $block->escapeHtml(__('Action')) ?></th>
-         </tr>
-         </thead>
-         <tfoot>
-diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
-index 0587d5eabe6..67587f19774 100644
---- a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
-+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
-@@ -3,19 +3,19 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+//phpcs:disable Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
-+//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
- ?>
- <?php /** @var $block Magento\Shipping\Block\Adminhtml\Order\Tracking\View */ ?>
- <div class="admin__control-table-wrapper">
-     <table class="data-table admin__control-table" id="shipment_tracking_info">
-         <thead>
-             <tr class="headings">
--                <th class="col-carrier"><?= /* @escapeNotVerified */ __('Carrier') ?></th>
--                <th class="col-title"><?= /* @escapeNotVerified */ __('Title') ?></th>
--                <th class="col-number"><?= /* @escapeNotVerified */ __('Number') ?></th>
--                <th class="col-delete last"><?= /* @escapeNotVerified */ __('Action') ?></th>
-+                <th class="col-carrier"><?= $block->escapeHtml(__('Carrier')) ?></th>
-+                <th class="col-title"><?= $block->escapeHtml(__('Title')) ?></th>
-+                <th class="col-number"><?= $block->escapeHtml(__('Number')) ?></th>
-+                <th class="col-delete last"><?= $block->escapeHtml(__('Action')) ?></th>
-             </tr>
-         </thead>
-         <tfoot>
-@@ -24,8 +24,8 @@
-                     <select name="carrier"
-                             class="select admin__control-select"
-                             onchange="selectCarrier(this)">
--                        <?php foreach ($block->getCarriers() as $_code => $_name): ?>
--                        <option value="<?= /* @escapeNotVerified */ $_code ?>"><?= $block->escapeHtml($_name) ?></option>
-+                        <?php foreach ($block->getCarriers() as $_code => $_name) : ?>
-+                        <option value="<?= $block->escapeHtmlAttr($_code) ?>"><?= $block->escapeHtml($_name) ?></option>
-                         <?php endforeach; ?>
-                     </select>
-                 </td>
-@@ -46,21 +46,23 @@
-                 <td class="col-delete last"><?= $block->getSaveButtonHtml() ?></td>
-             </tr>
-         </tfoot>
--    <?php if ($_tracks = $block->getShipment()->getAllTracks()): ?>
-+    <?php if ($_tracks = $block->getShipment()->getAllTracks()) : ?>
-         <tbody>
--        <?php $i = 0; foreach ($_tracks as $_track):$i++ ?>
--            <tr class="<?= /* @escapeNotVerified */ ($i%2 == 0) ? 'even' : 'odd' ?>">
--                <td class="col-carrier"><?= $block->escapeHtml($block->getCarrierTitle($_track->getCarrierCode())) ?></td>
-+        <?php $i = 0; foreach ($_tracks as $_track) :$i++ ?>
-+            <tr class="<?= /* @noEscape */ ($i%2 == 0) ? 'even' : 'odd' ?>">
-+                <td class="col-carrier">
-+                    <?= $block->escapeHtml($block->getCarrierTitle($_track->getCarrierCode())) ?>
-+                </td>
-                 <td class="col-title"><?= $block->escapeHtml($_track->getTitle()) ?></td>
-                 <td class="col-number">
--                    <?php if ($_track->isCustom()): ?>
--                    <?= $block->escapeHtml($_track->getNumber()) ?>
--                    <?php else: ?>
--                    <a href="#" onclick="popWin('<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_track) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')"><?= $block->escapeHtml($_track->getNumber()) ?></a>
--                    <div id="shipment_tracking_info_response_<?= /* @escapeNotVerified */ $_track->getId() ?>"></div>
-+                    <?php if ($_track->isCustom()) : ?>
-+                        <?= $block->escapeHtml($_track->getNumber()) ?>
-+                    <?php else : ?>
-+                    <a href="#" onclick="popWin('<?= $block->escapeJs($block->escapeUrl($this->helper(Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($_track))) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')"><?= $block->escapeHtml($_track->getNumber()) ?></a>
-+                    <div id="shipment_tracking_info_response_<?= (int) $_track->getId() ?>"></div>
-                     <?php endif; ?>
-                 </td>
--                <td class="col-delete last"><button class="action-delete" type="button" onclick="deleteTrackingNumber('<?= /* @escapeNotVerified */ $block->getRemoveUrl($_track) ?>'); return false;"><span><?= /* @escapeNotVerified */ __('Delete') ?></span></button></td>
-+                <td class="col-delete last"><button class="action-delete" type="button" onclick="deleteTrackingNumber('<?= $block->escapeJs($block->escapeUrl($block->getRemoveUrl($_track))) ?>'); return false;"><span><?= $block->escapeHtml(__('Delete')) ?></span></button></td>
-             </tr>
-         <?php endforeach; ?>
-         </tbody>
-@@ -78,7 +80,7 @@ function selectCarrier(elem) {
- }
- 
- function deleteTrackingNumber(url) {
--    if (confirm('<?= /* @escapeNotVerified */ __('Are you sure?') ?>')) {
-+    if (confirm('<?= $block->escapeJs($block->escapeHtml(__('Are you sure?'))) ?>')) {
-         submitAndReloadArea($('shipment_tracking_info').parentNode, url)
-     }
- }
-diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
-index b7281f16cd3..720b3498355 100644
---- a/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
-+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
-@@ -3,39 +3,40 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- ?>
- <?php /** @var $block \Magento\Shipping\Block\Adminhtml\View */ ?>
- <?php $order = $block->getOrder() ?>
--<?php if ($order->getIsVirtual()) : return '';endif; ?>
-+<?php if ($order->getIsVirtual()) :
-+    return '';
-+endif; ?>
- 
- <?php /* Shipping Method */ ?>
- <div class="admin__page-section-item order-shipping-method">
-     <div class="admin__page-section-item-title">
--        <span class="title"><?= /* @escapeNotVerified */ __('Shipping &amp; Handling Information') ?></span>
-+        <span class="title"><?= $block->escapeHtml(__('Shipping &amp; Handling Information')) ?></span>
-     </div>
-     <div class="admin__page-section-item-content">
-         <?php  if ($order->getTracksCollection()->count()) : ?>
--            <p><a href="#" id="linkId" onclick="popWin('<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($order) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?= /* @escapeNotVerified */ __('Track Order') ?>"><?= /* @escapeNotVerified */ __('Track Order') ?></a></p>
-+            <p><a href="#" id="linkId" onclick="popWin('<?= $block->escapeJs($block->escapeUrl($this->helper(Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($order))) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?= $block->escapeHtmlAttr(__('Track Order')) ?>"><?= $block->escapeHtml(__('Track Order')) ?></a></p>
-         <?php endif; ?>
--        <?php if ($order->getShippingDescription()): ?>
-+        <?php if ($order->getShippingDescription()) : ?>
-             <strong><?= $block->escapeHtml($order->getShippingDescription()) ?></strong>
- 
--            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
-+            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
-                 <?php $_excl = $block->displayShippingPriceInclTax($order); ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-             <?php endif; ?>
-             <?php $_incl = $block->displayShippingPriceInclTax($order); ?>
- 
--            <?= /* @escapeNotVerified */ $_excl ?>
--            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
--                (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
-+            <?= /** @noEscape */ $_excl ?>
-+            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices()
-+                && $_incl != $_excl) : ?>
-+                (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /** @noEscape */ $_incl ?>)
-             <?php endif; ?>
--        <?php else: ?>
--            <?= /* @escapeNotVerified */ __('No shipping information available') ?>
-+        <?php else : ?>
-+            <?= $block->escapeHtml(__('No shipping information available')) ?>
-         <?php endif; ?>
-     </div>
- </div>
-diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
-index 32805ec0a34..f1055621510 100644
---- a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
-+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
-@@ -3,11 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Shipping\Block\Adminhtml\View\Form $block
-  */
-+//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
- $order = $block->getShipment()->getOrder();
- ?>
- <?= $block->getChildHtml('order_info'); ?>
-@@ -34,7 +34,7 @@ $order = $block->getShipment()->getOrder();
-             </div>
-             <div class="admin__page-section-item-content">
-                 <div class="shipping-description-wrapper">
--                    <?php if ($block->getShipment()->getTracksCollection()->count()): ?>
-+                    <?php if ($block->getShipment()->getTracksCollection()->count()) : ?>
-                         <p>
-                             <a href="#" id="linkId" onclick="popWin('<?= $block->escapeUrl($this->helper(\Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($block->getShipment())); ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')"
-                                title="<?= $block->escapeHtml(__('Track this shipment')); ?>">
-@@ -48,27 +48,27 @@ $order = $block->getShipment()->getOrder();
- 
-                     <?= $block->escapeHtml(__('Total Shipping Charges')); ?>:
- 
--                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()): ?>
-+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
-                         <?php $excl = $block->displayShippingPriceInclTax($order); ?>
--                    <?php else: ?>
-+                    <?php else : ?>
-                         <?php $excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-                     <?php endif; ?>
-                     <?php $incl = $block->displayShippingPriceInclTax($order); ?>
- 
-                     <?= /* @noEscape */ $excl; ?>
--                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $incl != $excl): ?>
-+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $incl != $excl) : ?>
-                         (<?= $block->escapeHtml(__('Incl. Tax')); ?> <?= /* @noEscape */ $incl; ?>)
-                     <?php endif; ?>
-                 </div>
- 
-                 <p>
--                    <?php if ($block->canCreateShippingLabel()): ?>
-+                    <?php if ($block->canCreateShippingLabel()) : ?>
-                         <?= /* @noEscape */ $block->getCreateLabelButton(); ?>
-                     <?php endif ?>
--                    <?php if ($block->getShipment()->getShippingLabel()): ?>
-+                    <?php if ($block->getShipment()->getShippingLabel()) : ?>
-                         <?= /* @noEscape */ $block->getPrintLabelButton(); ?>
-                     <?php endif ?>
--                    <?php if ($block->getShipment()->getPackages()): ?>
-+                    <?php if ($block->getShipment()->getPackages()) : ?>
-                         <?= /* @noEscape */ $block->getShowPackagesButton(); ?>
-                     <?php endif ?>
-                 </p>
-@@ -85,10 +85,7 @@ $order = $block->getShipment()->getOrder();
-                                 window.packaging.sendCreateLabelRequest();
-                             });
-                             window.packaging.setLabelCreatedCallback(function () {
--                                setLocation("<?php echo $block->escapeUrl($block->getUrl(
--                                    'adminhtml/order_shipment/view',
--                                    ['shipment_id' => $block->getShipment()->getId()])
--                                ); ?>");
-+                                setLocation("<?php $block->escapeUrl($block->getUrl('adminhtml/order_shipment/view', ['shipment_id' => $block->getShipment()->getId()])); ?>");
-                             });
-                         };
- 
-diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
-index 8dddfaedda4..fa9fe7a8422 100644
---- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
-+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
-@@ -3,24 +3,27 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div class="admin__table-wrapper">
-     <table class="data-table admin__table-primary order-shipment-table">
-         <thead>
-             <tr class="headings">
--                <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
--                <th class="col-qty last"><span><?= /* @escapeNotVerified */ __('Qty Shipped') ?></span></th>
-+                <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
-+                <th class="col-qty last"><span><?= $block->escapeHtml(__('Qty Shipped')) ?></span></th>
-             </tr>
-         </thead>
-         <?php $_items = $block->getShipment()->getAllItems() ?>
--        <?php $_i = 0; foreach ($_items as $_item): if ($_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
--            <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'odd' : 'even' ?>">
--                <?= $block->getItemHtml($_item) ?>
--                <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
--            </tbody>
-+        <?php $_i = 0; foreach ($_items as $_item) :
-+            if (!empty($_item->getOrderItem())) :
-+                if ($_item->getOrderItem()->getParentItem()) :
-+                    continue;
-+                endif;
-+                $_i++ ?>
-+                <tbody class="<?= /* @noEscape */ $_i%2 ? 'odd' : 'even' ?>">
-+                    <?= $block->getItemHtml($_item) ?>
-+                    <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
-+                </tbody>
-+            <?php endif; ?>
-         <?php endforeach; ?>
-     </table>
- </div>
-diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml
-index c035295f77d..3a41eabd20c 100644
---- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml
-+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml
-@@ -3,12 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php $_item = $block->getItem() ?>
- <tr class="border">
-     <td class="col-product"><?= $block->getColumnHtml($_item, 'name') ?></td>
--    <td class="col-qty last"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
-+    <td class="col-qty last"><?= /* @noEscape */ $_item->getQty()*1 ?></td>
- </tr>
-diff --git a/app/code/Magento/Shipping/view/adminhtml/web/js/packages.js b/app/code/Magento/Shipping/view/adminhtml/web/js/packages.js
-new file mode 100644
-index 00000000000..f46ad4192d1
---- /dev/null
-+++ b/app/code/Magento/Shipping/view/adminhtml/web/js/packages.js
-@@ -0,0 +1,39 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'jquery',
-+    'Magento_Ui/js/modal/modal',
-+    'mage/translate'
-+], function ($, modal, $t) {
-+    'use strict';
-+
-+    return function (config, element) {
-+        config.buttons = [
-+            {
-+                text: $t('Print'),
-+                'class': 'action action-primary',
-+
-+                /**
-+                 * Click handler
-+                 */
-+                click: function () {
-+                    window.location.href = this.options.url;
-+                }
-+            }, {
-+                text: $t('Cancel'),
-+                'class': 'action action-secondary',
-+
-+                /**
-+                 * Click handler
-+                 */
-+                click: function () {
-+                    this.closeModal();
-+                }
-+            }
-+        ];
-+        modal(config, element);
-+    };
-+});
-diff --git a/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml b/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml
-index 1f5b0ae4630..67d03da2599 100644
---- a/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml
-+++ b/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml
-@@ -8,7 +8,11 @@
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="empty" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceContainer name="content">
--            <block class="Magento\Shipping\Block\Tracking\Popup" name="shipping.tracking.popup" template="Magento_Shipping::tracking/popup.phtml" cacheable="false" />
-+            <block class="Magento\Shipping\Block\Tracking\Popup" name="shipping.tracking.popup" template="Magento_Shipping::tracking/popup.phtml" cacheable="false">
-+                <arguments>
-+                    <argument name="delivery_date_title" xsi:type="object">Magento\Shipping\Block\DataProviders\Tracking\DeliveryDateTitle</argument>
-+                </arguments>
-+            </block>
-         </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/Shipping/view/frontend/templates/items.phtml b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
-index ebc6163a7bd..f0f1423ed47 100644
---- a/app/code/Magento/Shipping/view/frontend/templates/items.phtml
-+++ b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
-@@ -3,9 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+//phpcs:disable Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
-+//phpcs:disable Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore
-+//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
- ?>
- <?php /** @var  $block \Magento\Shipping\Block\Items */ ?>
- <?php  $_order = $block->getOrder() ?>
-@@ -13,67 +14,71 @@
-     <?php if ($_order->getTracksCollection()->count()) : ?>
-         <?= $block->getChildHtml('track-all-link') ?>
-     <?php endif; ?>
--    <a href="<?= /* @escapeNotVerified */ $block->getPrintAllShipmentsUrl($_order) ?>"
-+    <a href="<?= $block->escapeUrl($block->getPrintAllShipmentsUrl($_order)) ?>"
-        onclick="this.target='_blank'"
-        class="action print">
--        <span><?= /* @escapeNotVerified */ __('Print All Shipments') ?></span>
-+        <span><?= $block->escapeHtml(__('Print All Shipments')) ?></span>
-     </a>
- </div>
--<?php foreach ($_order->getShipmentsCollection() as $_shipment): ?>
--<div class="order-title">
--    <strong><?= /* @escapeNotVerified */ __('Shipment #') ?><?= /* @escapeNotVerified */ $_shipment->getIncrementId() ?></strong>
--    <a href="<?= /* @escapeNotVerified */ $block->getPrintShipmentUrl($_shipment) ?>"
--       onclick="this.target='_blank'"
--       class="action print">
--        <span><?= /* @escapeNotVerified */ __('Print Shipment') ?></span>
--    </a>
--    <a href="#"
--       data-mage-init='{"popupWindow": {"windowURL":"<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_shipment) ?>","windowName":"trackshipment","width":800,"height":600,"top":0,"left":0,"resizable":1,"scrollbars":1}}'
--       title="<?= /* @escapeNotVerified */ __('Track this shipment') ?>"
--       class="action track">
--        <span><?= /* @escapeNotVerified */ __('Track this shipment') ?></span>
--    </a>
--</div>
--<?php $tracks = $_shipment->getTracksCollection(); ?>
--<?php  if ($tracks->count()): ?>
--    <dl class="order-tracking" id="my-tracking-table-<?= /* @escapeNotVerified */ $_shipment->getId() ?>">
--        <dt class="tracking-title">
--            <?= /* @escapeNotVerified */ __('Tracking Number(s):') ?>
--        </dt>
--        <dd class="tracking-content">
--            <?php
--            $i = 1;
--            $_size = $tracks->count();
--            foreach ($tracks as $track): ?>
--                <?php if ($track->isCustom()): ?><?= $block->escapeHtml($track->getNumber()) ?><?php else: ?><a
--                    href="#"
--                    data-mage-init='{"popupWindow": {"windowURL":"<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($track) ?>","windowName":"trackorder","width":800,"height":600,"left":0,"top":0,"resizable":1,"scrollbars":1}}'
--                    class="action track"><span><?= $block->escapeHtml($track->getNumber()) ?></span>
--                    </a><?php endif; ?><?php if ($i != $_size): ?>, <?php endif; ?>
--                <?php $i++;
--            endforeach; ?>
--        </dd>
--    </dl>
--<?php  endif; ?>
--<div class="table-wrapper order-items-shipment">
--    <table class="data table table-order-items shipment" id="my-shipment-table-<?= /* @escapeNotVerified */ $_shipment->getId() ?>">
--        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Shipped') ?></caption>
--        <thead>
--            <tr>
--                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
--                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
--                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty Shipped') ?></th>
--            </tr>
--        </thead>
--        <?php $_items = $_shipment->getAllItems(); ?>
--        <?php foreach ($_items as $_item): ?>
--            <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
--                <tbody>
--                    <?= $block->getItemHtml($_item) ?>
--                </tbody>
--            <?php endif; ?>
--        <?php endforeach; ?>
--    </table>
--</div>
--<?= $block->getCommentsHtml($_shipment) ?>
-+<?php foreach ($_order->getShipmentsCollection() as $_shipment) : ?>
-+    <div class="order-title">
-+        <strong><?= $block->escapeHtml(__('Shipment #')) ?><?= $block->escapeHtml($_shipment->getIncrementId()) ?></strong>
-+        <a href="<?= $block->escapeUrl($block->getPrintShipmentUrl($_shipment)) ?>"
-+           onclick="this.target='_blank'"
-+           class="action print">
-+            <span><?= $block->escapeHtml(__('Print Shipment')) ?></span>
-+        </a>
-+        <a href="#"
-+           data-mage-init='{"popupWindow": {"windowURL":"<?= $block->escapeUrl($this->helper(Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($_shipment)) ?>","windowName":"trackshipment","width":800,"height":600,"top":0,"left":0,"resizable":1,"scrollbars":1}}'
-+           title="<?= $block->escapeHtml(__('Track this shipment')) ?>"
-+           class="action track">
-+            <span><?= $block->escapeHtml(__('Track this shipment')) ?></span>
-+        </a>
-+    </div>
-+    <?php $tracks = $_shipment->getTracksCollection(); ?>
-+    <?php  if ($tracks->count()) : ?>
-+        <dl class="order-tracking" id="my-tracking-table-<?= (int) $_shipment->getId() ?>">
-+            <dt class="tracking-title">
-+                <?= $block->escapeHtml(__('Tracking Number(s):')) ?>
-+            </dt>
-+            <dd class="tracking-content">
-+                <?php
-+                $i = 1;
-+                $_size = $tracks->count();
-+                foreach ($tracks as $track) : ?>
-+                    <?php if ($track->isCustom()) : ?>
-+                        <?= $block->escapeHtml($track->getNumber()) ?>
-+                    <?php else : ?>
-+                        <a href="#"
-+                            data-mage-init='{"popupWindow": {"windowURL":"<?= $block->escapeUrl($this->helper(Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($track)) ?>","windowName":"trackorder","width":800,"height":600,"left":0,"top":0,"resizable":1,"scrollbars":1}}'
-+                            class="action track"><span><?= $block->escapeHtml($track->getNumber()) ?></span>
-+                            </a>
-+                    <?php endif; ?>
-+                    <?php if ($i != $_size) : ?>, <?php endif; ?>
-+                    <?php $i++;
-+                endforeach; ?>
-+            </dd>
-+        </dl>
-+    <?php  endif; ?>
-+    <div class="table-wrapper order-items-shipment">
-+        <table class="data table table-order-items shipment" id="my-shipment-table-<?= (int) $_shipment->getId() ?>">
-+            <caption class="table-caption"><?= $block->escapeHtml(__('Items Shipped')) ?></caption>
-+            <thead>
-+                <tr>
-+                    <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
-+                    <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-+                    <th class="col qty"><?= $block->escapeHtml(__('Qty Shipped')) ?></th>
-+                </tr>
-+            </thead>
-+            <?php $_items = $_shipment->getAllItems(); ?>
-+            <?php foreach ($_items as $_item) : ?>
-+                <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-+                    <tbody>
-+                        <?= $block->getItemHtml($_item) ?>
-+                    </tbody>
-+                <?php endif; ?>
-+            <?php endforeach; ?>
-+        </table>
-+    </div>
-+    <?= $block->getCommentsHtml($_shipment) ?>
- <?php endforeach; ?>
-diff --git a/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml b/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
-index 512c06626d7..da251da3d35 100644
---- a/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
-+++ b/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
-@@ -8,8 +8,8 @@
-     <?= $block->getChildHtml('shipment_items') ?>
-     <div class="actions-toolbar">
-         <div class="secondary">
--            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back">
--                <span><?= /* @escapeNotVerified */ $block->getBackTitle() ?></span>
-+            <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
-+                <span><?= $block->escapeHtml($block->getBackTitle()) ?></span>
-             </a>
-         </div>
-     </div>
-diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
-index 9253b47f82f..7dca84565e6 100644
---- a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
-+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
-@@ -4,9 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Framework\View\Element\Template */
-+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
- 
- $parentBlock = $block->getParentBlock();
- $track = $block->getData('track');
-@@ -24,18 +23,18 @@ $number = is_object($track) ? $track->getTracking() : $track['number'];
- <table class="data table order tracking" id="tracking-table-popup-<?= $block->escapeHtml($number) ?>">
-     <caption class="table-caption"><?= $block->escapeHtml(__('Order tracking')) ?></caption>
-     <tbody>
--    <?php if (is_object($track)): ?>
-+    <?php if (is_object($track)) : ?>
-         <tr>
-             <th class="col label" scope="row"><?= $block->escapeHtml(__('Tracking Number:')) ?></th>
-             <td class="col value"><?= $block->escapeHtml($number) ?></td>
-         </tr>
--        <?php if ($track->getCarrierTitle()): ?>
-+        <?php if ($track->getCarrierTitle()) : ?>
-             <tr>
-                 <th class="col label" scope="row"><?= $block->escapeHtml(__('Carrier:')) ?></th>
-                 <td class="col value"><?= $block->escapeHtml($track->getCarrierTitle()) ?></td>
-             </tr>
-         <?php endif; ?>
--        <?php if ($track->getErrorMessage()): ?>
-+        <?php if ($track->getErrorMessage()) : ?>
-             <tr>
-                 <th class="col label" scope="row"><?= $block->escapeHtml(__('Error:')) ?></th>
-                 <td class="col error">
-@@ -51,12 +50,12 @@ $number = is_object($track) ? $track->getTracking() : $track['number'];
-                     <a href="mailto:<?= /* @noEscape */ $email ?>"><?= /* @noEscape */ $email ?></a>
-                 </td>
-             </tr>
--        <?php elseif ($track->getTrackSummary()): ?>
-+        <?php elseif ($track->getTrackSummary()) : ?>
-             <tr>
-                 <th class="col label" scope="row"><?= $block->escapeHtml(__('Info:')) ?></th>
-                 <td class="col value"><?= $block->escapeHtml($track->getTrackSummary()) ?></td>
-             </tr>
--        <?php elseif ($track->getUrl()): ?>
-+        <?php elseif ($track->getUrl()) : ?>
-             <tr>
-                 <th class="col label" scope="row"><?= $block->escapeHtml(__('Track:')) ?></th>
-                 <td class="col value">
-@@ -65,9 +64,9 @@ $number = is_object($track) ? $track->getTracking() : $track['number'];
-                     </a>
-                 </td>
-             </tr>
--        <?php else: ?>
--            <?php foreach ($fields as $title => $property): ?>
--                <?php if (!empty($track->$property())): ?>
-+        <?php else : ?>
-+            <?php foreach ($fields as $title => $property) : ?>
-+                <?php if (!empty($track->$property())) : ?>
-                     <tr>
-                         <th class="col label" scope="row"><?= /* @noEscape */ $block->escapeHtml(__($title . ':')) ?></th>
-                         <td class="col value"><?= $block->escapeHtml($track->$property()) ?></td>
-@@ -75,16 +74,16 @@ $number = is_object($track) ? $track->getTracking() : $track['number'];
-                 <?php endif;?>
-             <?php endforeach; ?>
- 
--            <?php if ($track->getDeliverydate()): ?>
-+            <?php if ($track->getDeliverydate()) : ?>
-                 <tr>
--                    <th class="col label" scope="row"><?= $block->escapeHtml(__('Delivered on:')) ?></th>
-+                    <th class="col label" scope="row"><?= $block->escapeHtml($parentBlock->getDeliveryDateTitle()->getTitle($track)) ?></th>
-                     <td class="col value">
-                         <?= /* @noEscape */ $parentBlock->formatDeliveryDateTime($track->getDeliverydate(), $track->getDeliverytime()) ?>
-                     </td>
-                 </tr>
-             <?php endif; ?>
-         <?php endif; ?>
--    <?php elseif (isset($track['title']) && isset($track['number']) && $track['number']): ?>
-+    <?php elseif (isset($track['title']) && isset($track['number']) && $track['number']) : ?>
-         <?php /* if the tracking is custom value */ ?>
-         <tr>
-             <th class="col label" scope="row">
-diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
-index 188e24ee115..24658649d0a 100644
---- a/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
-+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
-@@ -3,13 +3,19 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Shipping\Block\Tracking\Link */ ?>
- <?php $order = $block->getOrder() ?>
--<a href="#" class="action track" title="<?= /* @escapeNotVerified */ $block->getLabel() ?>"
--   data-mage-init='{"popupWindow": {"windowURL":"<?= /* @escapeNotVerified */ $block->getWindowUrl($order) ?>","windowName":"trackorder","width":800,"height":600,"left":0,"top":0,"resizable":1,"scrollbars":1}}'>
--    <span><?= /* @escapeNotVerified */ $block->getLabel() ?></span>
-+<a href="#" class="action track" title="<?= $block->escapeHtmlAttr($block->getLabel()) ?>"
-+   data-mage-init='{"popupWindow": {
-+        "windowURL":"<?= $block->escapeUrl($block->getWindowUrl($order)) ?>",
-+        "windowName":"trackorder",
-+        "width":800,
-+        "height":600,
-+        "left":0,
-+        "top":0,
-+        "resizable":1,
-+        "scrollbars":1
-+    }}'>
-+    <span><?= $block->escapeHtml($block->getLabel()) ?></span>
- </a>
-diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
-index eb888595c7f..ee8a834044a 100644
---- a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
-+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
-@@ -6,20 +6,19 @@
- 
- use Magento\Framework\View\Element\Template;
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Shipping\Block\Tracking\Popup */
-+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
- 
- $results = $block->getTrackingInfo();
- ?>
- <div class="page tracking">
--    <?php if (!empty($results)): ?>
--        <?php foreach ($results as $shipId => $result): ?>
--            <?php if ($shipId): ?>
-+    <?php if (!empty($results)) : ?>
-+        <?php foreach ($results as $shipId => $result) : ?>
-+            <?php if ($shipId) : ?>
-                 <div class="order subtitle caption"><?= /* @noEscape */ $block->escapeHtml(__('Shipment #')) . $shipId ?></div>
-             <?php endif; ?>
--            <?php if (!empty($result)): ?>
--                <?php foreach ($result as $counter => $track): ?>
-+            <?php if (!empty($result)) : ?>
-+                <?php foreach ($result as $counter => $track) : ?>
-                     <div class="table-wrapper">
-                         <?php
-                             $shipmentBlockIdentifier = $shipId . '.' . $counter;
-@@ -27,12 +26,11 @@ $results = $block->getTrackingInfo();
-                                 'track' => $track,
-                                 'template' => 'Magento_Shipping::tracking/details.phtml',
-                                 'storeSupportEmail' => $block->getStoreSupportEmail()
--                            ]
--                        );
-+                            ]);
-                         ?>
-                         <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.details.' . $shipmentBlockIdentifier) ?>
-                     </div>
--                    <?php if (is_object($track) && !empty($track->getProgressdetail())): ?>
-+                    <?php if (is_object($track) && !empty($track->getProgressdetail())) : ?>
-                         <?php
-                             $block->addChild('shipping.tracking.progress.' . $shipmentBlockIdentifier, Template::class, [
-                                 'track' => $track,
-@@ -42,13 +40,13 @@ $results = $block->getTrackingInfo();
-                         <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.progress.' . $shipmentBlockIdentifier) ?>
-                     <?php endif; ?>
-                 <?php endforeach; ?>
--            <?php else: ?>
-+            <?php else : ?>
-                 <div class="message info empty">
-                     <div><?= $block->escapeHtml(__('There is no tracking available for this shipment.')) ?></div>
-                 </div>
-             <?php endif; ?>
-         <?php endforeach; ?>
--    <?php else: ?>
-+    <?php else : ?>
-         <div class="message info empty">
-             <div><?= $block->escapeHtml(__('There is no tracking available.')) ?></div>
-         </div>
-diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
-index 237eba09ff8..e15c3936752 100644
---- a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
-+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
-@@ -1,10 +1,8 @@
- <?php
- /**
--* Copyright © Magento, Inc. All rights reserved.
--* See COPYING.txt for license details.
--*/
--
--// @codingStandardsIgnoreFile
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
- 
- /** @var $block \Magento\Framework\View\Element\Template */
- $parentBlock = $block->getParentBlock();
-@@ -22,9 +20,13 @@ $track = $block->getData('track');
-         </tr>
-         </thead>
-         <tbody>
--        <?php foreach ($track->getProgressdetail() as $detail): ?>
--            <?php $detailDate = (!empty($detail['deliverydate']) ? $parentBlock->formatDeliveryDate($detail['deliverydate'] . ' ' . $detail['deliverytime']) : ''); ?>
--            <?php $detailTime = (!empty($detail['deliverytime']) ? $parentBlock->formatDeliveryTime($detail['deliverytime'], $detail['deliverydate']) : ''); ?>
-+        <?php foreach ($track->getProgressdetail() as $detail) : ?>
-+            <?php $detailDate = (!empty($detail['deliverydate']) ?
-+                $parentBlock->formatDeliveryDate($detail['deliverydate'] . ' ' . $detail['deliverytime']) :
-+                ''); ?>
-+            <?php $detailTime = (!empty($detail['deliverytime']) ?
-+                $parentBlock->formatDeliveryTime($detail['deliverytime'], $detail['deliverydate']) :
-+                ''); ?>
-             <tr>
-                 <td data-th="<?= $block->escapeHtml(__('Location')) ?>" class="col location">
-                     <?= (!empty($detail['deliverylocation']) ? $block->escapeHtml($detail['deliverylocation']) : '') ?>
-diff --git a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingService.php b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingService.php
-index 870705db941..168ab67f8cf 100644
---- a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingService.php
-+++ b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingService.php
-@@ -5,8 +5,8 @@
-  */
- namespace Magento\Signifyd\Model\CaseServices;
- 
-+use Magento\Framework\Api\SimpleDataObjectConverter;
- use Magento\Framework\Exception\LocalizedException;
--use Magento\Framework\Exception\NotFoundException;
- use Magento\Signifyd\Api\CaseRepositoryInterface;
- use Magento\Signifyd\Api\Data\CaseInterface;
- use Magento\Signifyd\Model\CommentsHistoryUpdater;
-@@ -73,7 +73,6 @@ class UpdatingService implements UpdatingServiceInterface
-      * @param CaseInterface $case
-      * @param array $data
-      * @return void
--     * @throws NotFoundException
-      * @throws LocalizedException
-      */
-     public function update(CaseInterface $case, array $data)
-@@ -111,7 +110,7 @@ class UpdatingService implements UpdatingServiceInterface
-             'orderId'
-         ];
-         foreach ($data as $key => $value) {
--            $methodName = 'set' . ucfirst($key);
-+            $methodName = 'set' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($key);
-             if (!in_array($key, $notResolvedKeys) && method_exists($case, $methodName)) {
-                 call_user_func([$case, $methodName], $value);
-             }
-diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php
-index f95968d4a1b..482f243f6f0 100644
---- a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php
-+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php
-@@ -41,6 +41,6 @@ class AddressBuilder
-     {
-         $lines = is_array($street) ? $street : [];
- 
--        return isset($lines[$number - 1]) ? $lines[$number - 1] : '';
-+        return $lines[$number - 1] ?? '';
-     }
- }
-diff --git a/app/code/Magento/Signifyd/Observer/PlaceOrder.php b/app/code/Magento/Signifyd/Observer/PlaceOrder.php
-index 8415bc006b8..7c451a129cc 100644
---- a/app/code/Magento/Signifyd/Observer/PlaceOrder.php
-+++ b/app/code/Magento/Signifyd/Observer/PlaceOrder.php
-@@ -10,6 +10,7 @@ use Magento\Framework\Event\Observer;
- use Magento\Framework\Event\ObserverInterface;
- use Magento\Framework\Exception\AlreadyExistsException;
- use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Model\Order;
- use Magento\Signifyd\Api\CaseCreationServiceInterface;
- use Magento\Signifyd\Model\Config;
- use Psr\Log\LoggerInterface;
-@@ -80,7 +81,9 @@ class PlaceOrder implements ObserverInterface
-     private function createCaseForOrder($order)
-     {
-         $orderId = $order->getEntityId();
--        if (null === $orderId || $order->getPayment()->getMethodInstance()->isOffline()) {
-+        if (null === $orderId
-+            || $order->getPayment()->getMethodInstance()->isOffline()
-+            || $order->getState() === Order::STATE_PENDING_PAYMENT) {
-             return;
-         }
- 
-diff --git a/app/code/Magento/Signifyd/README.md b/app/code/Magento/Signifyd/README.md
-index 9479972cb21..753ace3128d 100644
---- a/app/code/Magento/Signifyd/README.md
-+++ b/app/code/Magento/Signifyd/README.md
-@@ -47,7 +47,7 @@ The following interfaces (marked with the `@api` annotation) provide methods tha
- 
- - might be used by `Magento\Signifyd\Api\CaseRepositoryInterface` to retrieve a list of case entities by specific conditions
- 
--For information about a public API in Magento 2, see [Public interfaces & APIs](http://devdocs.magento.com/guides/v2.1/extension-dev-guide/api-concepts.html).
-+For information about a public API in Magento 2, see [Public interfaces & APIs](https://devdocs.magento.com/guides/v2.1/extension-dev-guide/api-concepts.html).
- 
- ## Additional information
- 
-@@ -67,12 +67,12 @@ The Debug Mode may be enabled in the module configuration. This logs the communi
- 
- The Magento_Signifyd module does not introduce backward incompatible changes.
- 
--You can track [backward incompatible changes in patch releases](http://devdocs.magento.com/guides/v2.0/release-notes/changes/ee_changes.html).
-+You can track [backward incompatible changes in patch releases](https://devdocs.magento.com/guides/v2.0/release-notes/changes/ee_changes.html).
- 
- ### Processing supplementary payment information
- 
- To improve the accuracy of Signifyd's transaction estimation, you may perform these operations (links lead to the Magento Developer Documentation Portal):
- 
--- [Provide custom AVS/CVV mapping](http://devdocs.magento.com/guides/v2.2/payments-integrations/signifyd/signifyd.html#provide-avscvv-response-codes)
-+- [Provide custom AVS/CVV mapping](https://devdocs.magento.com/guides/v2.2/payments-integrations/signifyd/signifyd.html#provide-avscvv-response-codes)
- 
--- [Retrieve payment method for a placed order](http://devdocs.magento.com/guides/v2.2/payments-integrations/signifyd/signifyd.html#retrieve-payment-method-for-a-placed-order)
-+- [Retrieve payment method for a placed order](https://devdocs.magento.com/guides/v2.2/payments-integrations/signifyd/signifyd.html#retrieve-payment-method-for-a-placed-order)
-diff --git a/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php b/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php
-index 1a8cfdc7032..8b98be338b9 100644
---- a/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php
-+++ b/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php
-@@ -140,7 +140,7 @@ class HandlerTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * Successfull case
-+     * Successful case
-      */
-     public function testExecuteSuccessfully()
-     {
-diff --git a/app/code/Magento/Signifyd/Test/Unit/Observer/PlaceOrderTest.php b/app/code/Magento/Signifyd/Test/Unit/Observer/PlaceOrderTest.php
-index 4e7edddf7b9..d63831b1d4a 100644
---- a/app/code/Magento/Signifyd/Test/Unit/Observer/PlaceOrderTest.php
-+++ b/app/code/Magento/Signifyd/Test/Unit/Observer/PlaceOrderTest.php
-@@ -10,6 +10,7 @@ use Magento\Framework\Event\Observer;
- use Magento\Framework\Exception\AlreadyExistsException;
- use Magento\Payment\Model\MethodInterface;
- use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Model\Order;
- use Magento\Sales\Model\Order\Payment;
- use Magento\Signifyd\Api\CaseCreationServiceInterface;
- use Magento\Signifyd\Model\Config;
-@@ -193,6 +194,23 @@ class PlaceOrderTest extends \PHPUnit\Framework\TestCase
-         $this->placeOrder->execute($this->observer);
-     }
- 
-+    public function testExecuteWithOrderPendingPayment()
-+    {
-+        $orderId = 1;
-+        $storeId = 2;
-+
-+        $this->withActiveSignifydIntegration(true, $storeId);
-+        $this->withOrderEntity($orderId, $storeId);
-+        $this->orderEntity->method('getState')
-+            ->willReturn(Order::STATE_PENDING_PAYMENT);
-+        $this->withAvailablePaymentMethod(true);
-+
-+        $this->creationService->expects(self::never())
-+            ->method('createForOrder');
-+
-+        $this->placeOrder->execute($this->observer);
-+    }
-+
-     /**
-      * Specifies order entity mock execution.
-      *
-diff --git a/app/code/Magento/Signifyd/etc/adminhtml/system.xml b/app/code/Magento/Signifyd/etc/adminhtml/system.xml
-index 71f5916ca53..2dd75d2d91e 100644
---- a/app/code/Magento/Signifyd/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Signifyd/etc/adminhtml/system.xml
-@@ -11,7 +11,7 @@
-             <label>Fraud Protection</label>
-             <tab>sales</tab>
-             <resource>Magento_Sales::fraud_protection</resource>
--            <group id="signifyd" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
-+            <group id="signifyd" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
-                 <fieldset_css>signifyd-logo-header</fieldset_css>
-                 <group id="about" translate="label comment" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
-                     <frontend_model>Magento\Signifyd\Block\Adminhtml\System\Config\Fieldset\Info</frontend_model>
-@@ -52,7 +52,7 @@
-                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                         <config_path>fraud_protection/signifyd/debug</config_path>
-                     </field>
--                    <field id="webhook_url" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
-+                    <field id="webhook_url" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
-                         <label>Webhook URL</label>
-                         <comment><![CDATA[Your webhook URL will be used to <a href="https://app.signifyd.com/settings/notifications" target="_blank">configure</a> a guarantee completed webhook in Signifyd. Webhooks are used to sync Signifyd`s guarantee decisions back to Magento.]]></comment>
-                         <attribute type="handler_url">signifyd/webhooks/handler</attribute>
-diff --git a/app/code/Magento/Signifyd/etc/db_schema.xml b/app/code/Magento/Signifyd/etc/db_schema.xml
-index 6a31eacbb45..8d47321c38b 100644
---- a/app/code/Magento/Signifyd/etc/db_schema.xml
-+++ b/app/code/Magento/Signifyd/etc/db_schema.xml
-@@ -24,19 +24,20 @@
-         <column xsi:type="varchar" name="review_disposition" nullable="true" length="32" comment="Review_disposition"/>
-         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true" comment="Created_at"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Updated_at"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SIGNIFYD_CASE_ORDER_ID_SALES_ORDER_ENTITY_ID" table="signifyd_case"
-+        <constraint xsi:type="foreign" referenceId="SIGNIFYD_CASE_ORDER_ID_SALES_ORDER_ENTITY_ID" table="signifyd_case"
-                     column="order_id" referenceTable="sales_order" referenceColumn="entity_id" onDelete="SET NULL"/>
--        <constraint xsi:type="unique" name="SIGNIFYD_CASE_ORDER_ID">
-+        <constraint xsi:type="unique" referenceId="SIGNIFYD_CASE_ORDER_ID">
-             <column name="order_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="SIGNIFYD_CASE_CASE_ID">
-+        <constraint xsi:type="unique" referenceId="SIGNIFYD_CASE_CASE_ID">
-             <column name="case_id"/>
-         </constraint>
-     </table>
-     <table name="sales_order_grid" resource="sales" comment="Sales Flat Order Grid">
--        <column xsi:type="varchar" name="signifyd_guarantee_status" nullable="true" length="32"/>
-+        <column xsi:type="varchar" name="signifyd_guarantee_status" nullable="true" length="32"
-+                comment="Signifyd Guarantee Disposition Status"/>
-     </table>
- </schema>
-diff --git a/app/code/Magento/Signifyd/etc/di.xml b/app/code/Magento/Signifyd/etc/di.xml
-index fd78fff27f6..c586019ca3d 100644
---- a/app/code/Magento/Signifyd/etc/di.xml
-+++ b/app/code/Magento/Signifyd/etc/di.xml
-@@ -68,6 +68,9 @@
-             <argument name="converter" xsi:type="object">Magento\Signifyd\Model\PaymentMethodMapper\XmlToArrayConfigConverter</argument>
-             <argument name="schemaLocator" xsi:type="object">PaymentMapperSchemaLocator</argument>
-             <argument name="fileName" xsi:type="string">signifyd_payment_mapping.xml</argument>
-+            <argument name="idAttributes" xsi:type="array">
-+                <item name="/config/payment_method_list/payment_method" xsi:type="string">name</item>
-+            </argument>
-         </arguments>
-     </virtualType>
-     <virtualType name="PaymentMethodConfigData" type="Magento\Framework\Config\Data">
-diff --git a/app/code/Magento/Signifyd/etc/events.xml b/app/code/Magento/Signifyd/etc/events.xml
-index a89b56ddf13..d44665f9fb9 100644
---- a/app/code/Magento/Signifyd/etc/events.xml
-+++ b/app/code/Magento/Signifyd/etc/events.xml
-@@ -9,7 +9,10 @@
-     <event name="checkout_submit_all_after">
-         <observer name="signifyd_place_order_observer" instance="Magento\Signifyd\Observer\PlaceOrder" />
-     </event>
--    <event name="paypal_express_place_order_success">
--        <observer name="signifyd_place_order_paypal_express_observer" instance="Magento\Signifyd\Observer\PlaceOrder"/>
-+    <event name="paypal_checkout_success">
-+        <observer name="signifyd_place_order_checkout_success_observer" instance="Magento\Signifyd\Observer\PlaceOrder" />
-+    </event>
-+    <event name="checkout_onepage_controller_success_action">
-+        <observer name="signifyd_place_order_checkout_success_observer" instance="Magento\Signifyd\Observer\PlaceOrder" />
-     </event>
- </config>
-diff --git a/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xml b/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xml
-index 096a9681671..9ff952d0492 100644
---- a/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xml
-+++ b/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xml
-@@ -6,7 +6,7 @@
-  */
-  /**
-   * Custom payment method might adds a block in payment_method_list e.g.
--  *      <payment_method>
-+  *      <payment_method name="custom_payment_method">
-   *         <magento_code>custom_payment_method</magento_code>
-   *         <signifyd_code>PAYMENT_CARD</signifyd_code>
-   *     </payment_method>
-@@ -18,63 +18,63 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Signifyd:etc/signifyd_payment_mapping.xsd">
-     <payment_method_list>
--        <payment_method>
-+        <payment_method name="braintree">
-             <magento_code>braintree</magento_code>
-             <signifyd_code>PAYMENT_CARD</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="braintree_paypal">
-             <magento_code>braintree_paypal</magento_code>
-             <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="paypal_express">
-             <magento_code>paypal_express</magento_code>
-             <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="paypal_express_bml">
-             <magento_code>paypal_express_bml</magento_code>
-             <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="payflow_express">
-             <magento_code>payflow_express</magento_code>
-             <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="payflow_express_bml">
-             <magento_code>payflow_express_bml</magento_code>
-             <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="payflowpro">
-             <magento_code>payflowpro</magento_code>
-             <signifyd_code>PAYMENT_CARD</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="payflow_link">
-             <magento_code>payflow_link</magento_code>
-             <signifyd_code>PAYMENT_CARD</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="payflow_advanced">
-             <magento_code>payflow_advanced</magento_code>
-             <signifyd_code>PAYMENT_CARD</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="hosted_pro">
-             <magento_code>hosted_pro</magento_code>
-             <signifyd_code>PAYMENT_CARD</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="authorizenet_directpost">
-             <magento_code>authorizenet_directpost</magento_code>
-             <signifyd_code>PAYMENT_CARD</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="worldpay">
-             <magento_code>worldpay</magento_code>
-             <signifyd_code>PAYMENT_CARD</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="eway">
-             <magento_code>eway</magento_code>
-             <signifyd_code>PAYMENT_CARD</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="cybersource">
-             <magento_code>cybersource</magento_code>
-             <signifyd_code>PAYMENT_CARD</signifyd_code>
-         </payment_method>
--        <payment_method>
-+        <payment_method name="free">
-             <magento_code>free</magento_code>
-             <signifyd_code>FREE</signifyd_code>
-         </payment_method>
-diff --git a/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xsd b/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xsd
-index f48805c328e..bb3b3036d0c 100644
---- a/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xsd
-+++ b/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xsd
-@@ -23,5 +23,12 @@
-             <xs:element minOccurs="1" name="magento_code"/>
-             <xs:element minOccurs="1" name="signifyd_code"/>
-         </xs:sequence>
-+        <xs:attribute name="name" type="xs:string" use="optional">
-+            <xs:annotation>
-+                <xs:documentation>
-+                    Element's unique identifier.
-+                </xs:documentation>
-+            </xs:annotation>
-+        </xs:attribute>
-     </xs:complexType>
- </xs:schema>
-diff --git a/app/code/Magento/Signifyd/view/adminhtml/templates/case_info.phtml b/app/code/Magento/Signifyd/view/adminhtml/templates/case_info.phtml
-index a42b7f93b5b..07f1b2c2e4a 100644
---- a/app/code/Magento/Signifyd/view/adminhtml/templates/case_info.phtml
-+++ b/app/code/Magento/Signifyd/view/adminhtml/templates/case_info.phtml
-@@ -3,15 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <?php /** @var $block Magento\Signifyd\Block\Adminhtml\CaseInfo */ ?>
- <?php
--
--    if ($block->isEmptyCase()) {
--        return '';
--    }
-+if ($block->isEmptyCase()) {
-+    return '';
-+}
- ?>
- <section class="admin__page-section order-case-info">
-     <div class="admin__page-section-title">
-diff --git a/app/code/Magento/Signifyd/view/frontend/templates/fingerprint.phtml b/app/code/Magento/Signifyd/view/frontend/templates/fingerprint.phtml
-index 356bab9c62d..657043b895f 100644
---- a/app/code/Magento/Signifyd/view/frontend/templates/fingerprint.phtml
-+++ b/app/code/Magento/Signifyd/view/frontend/templates/fingerprint.phtml
-@@ -4,11 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block Magento\Signifyd\Block\Fingerprint */
- ?>
--<?php if ($block->isModuleActive()): ?>
-+<?php if ($block->isModuleActive()) : ?>
-     <script
-         async
-         id="sig-api"
-diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php
-index 5e90cf6e12f..91b6a844689 100644
---- a/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php
-+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php
-@@ -48,6 +48,8 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-     }
- 
-     /**
-+     * Configure form for sitemap.
-+     *
-      * @return $this
-      */
-     protected function _prepareForm()
-@@ -73,7 +75,8 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-                 'name' => 'sitemap_filename',
-                 'required' => true,
-                 'note' => __('example: sitemap.xml'),
--                'value' => $model->getSitemapFilename()
-+                'value' => $model->getSitemapFilename(),
-+                'class' => 'validate-length maximum-length-32'
-             ]
-         );
- 
-diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
-index ffc2bf5f6d1..b4e54104bdf 100644
---- a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
-+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
-@@ -3,17 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--/**
-- * Sitemap grid link column renderer
-- *
-- */
- namespace Magento\Sitemap\Block\Adminhtml\Grid\Renderer;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
- use Magento\Framework\App\ObjectManager;
- 
-+/**
-+ * Sitemap grid link column renderer
-+ */
- class Link extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
- {
-     /**
-@@ -62,6 +60,7 @@ class Link extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
-     {
-         /** @var $sitemap \Magento\Sitemap\Model\Sitemap */
-         $sitemap = $this->_sitemapFactory->create();
-+        $sitemap->setStoreId($row->getStoreId());
-         $url = $this->escapeHtml($sitemap->getSitemapUrl($row->getSitemapPath(), $row->getSitemapFilename()));
- 
-         $fileName = preg_replace('/^\//', '', $row->getSitemapPath() . $row->getSitemapFilename());
-diff --git a/app/code/Magento/Sitemap/Block/Robots.php b/app/code/Magento/Sitemap/Block/Robots.php
-index 410bc02da36..ac99b2ab1cd 100644
---- a/app/code/Magento/Sitemap/Block/Robots.php
-+++ b/app/code/Magento/Sitemap/Block/Robots.php
-@@ -22,11 +22,6 @@ use Magento\Store\Model\StoreResolver;
-  */
- class Robots extends AbstractBlock implements IdentityInterface
- {
--    /**
--     * @var StoreResolver
--     */
--    private $storeResolver;
--
-     /**
-      * @var CollectionFactory
-      */
-@@ -49,6 +44,8 @@ class Robots extends AbstractBlock implements IdentityInterface
-      * @param SitemapHelper $sitemapHelper
-      * @param StoreManagerInterface $storeManager
-      * @param array $data
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         Context $context,
-@@ -58,7 +55,6 @@ class Robots extends AbstractBlock implements IdentityInterface
-         StoreManagerInterface $storeManager,
-         array $data = []
-     ) {
--        $this->storeResolver = $storeResolver;
-         $this->sitemapCollectionFactory = $sitemapCollectionFactory;
-         $this->sitemapHelper = $sitemapHelper;
-         $this->storeManager = $storeManager;
-@@ -78,8 +74,7 @@ class Robots extends AbstractBlock implements IdentityInterface
-      */
-     protected function _toHtml()
-     {
--        $defaultStoreId = $this->storeResolver->getCurrentStoreId();
--        $defaultStore = $this->storeManager->getStore($defaultStoreId);
-+        $defaultStore = $this->storeManager->getDefaultStoreView();
- 
-         /** @var \Magento\Store\Model\Website $website */
-         $website = $this->storeManager->getWebsite($defaultStore->getWebsiteId());
-@@ -138,7 +133,7 @@ class Robots extends AbstractBlock implements IdentityInterface
-     public function getIdentities()
-     {
-         return [
--            Value::CACHE_TAG . '_' . $this->storeResolver->getCurrentStoreId(),
-+            Value::CACHE_TAG . '_' . $this->storeManager->getDefaultStoreView()->getId(),
-         ];
-     }
- }
-diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
-index 29d50ea8408..1c807cbfc19 100644
---- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
-+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
-@@ -5,10 +5,14 @@
-  */
- namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\App\ObjectManager;
- 
--class Delete extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
-+/**
-+ * Controller class Delete. Represents adminhtml request flow for a sitemap deletion
-+ */
-+class Delete extends \Magento\Sitemap\Controller\Adminhtml\Sitemap implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Framework\Filesystem
-diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
-index 111353550b9..14771e7f03a 100644
---- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
-+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
-@@ -1,12 +1,17 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
- 
--class Edit extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+
-+/**
-+ * Controller class Edit. Responsible for rendering of a sitemap edit page
-+ */
-+class Edit extends \Magento\Sitemap\Controller\Adminhtml\Sitemap implements HttpGetActionInterface
- {
-     /**
-      * Core registry
-diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
-index 9592ab6f57c..8eeeb5bf6bc 100644
---- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
-+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
-@@ -1,16 +1,21 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
- 
- use Magento\Backend\App\Action;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Sitemap\Controller\Adminhtml\Sitemap;
- use Magento\Store\Model\App\Emulation;
- use Magento\Framework\App\ObjectManager;
- 
--class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
-+/**
-+ * Generate sitemap file
-+ */
-+class Generate extends Sitemap implements HttpGetActionInterface
- {
-     /** @var \Magento\Store\Model\App\Emulation $appEmulation */
-     private $appEmulation;
-@@ -44,14 +49,7 @@ class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
-         // if sitemap record exists
-         if ($sitemap->getId()) {
-             try {
--                //We need to emulate to get the correct frontend URL for the product images
--                $this->appEmulation->startEnvironmentEmulation(
--                    $sitemap->getStoreId(),
--                    \Magento\Framework\App\Area::AREA_FRONTEND,
--                    true
--                );
-                 $sitemap->generateXml();
--
-                 $this->messageManager->addSuccessMessage(
-                     __('The sitemap "%1" has been generated.', $sitemap->getSitemapFilename())
-                 );
-@@ -59,8 +57,6 @@ class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
-                 $this->messageManager->addErrorMessage($e->getMessage());
-             } catch (\Exception $e) {
-                 $this->messageManager->addExceptionMessage($e, __('We can\'t generate the sitemap right now.'));
--            } finally {
--                $this->appEmulation->stopEnvironmentEmulation();
-             }
-         } else {
-             $this->messageManager->addErrorMessage(__('We can\'t find a sitemap to generate.'));
-diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php
-index 5f2cc805de0..e6823c6070a 100644
---- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php
-+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Backend\App\Action;
- 
--class Index extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
-+class Index extends \Magento\Sitemap\Controller\Adminhtml\Sitemap implements HttpGetActionInterface
- {
-     /**
-      * Index action
-diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
-index 1e0d1cb248f..5230de04297 100644
---- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
-+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
-@@ -5,12 +5,74 @@
-  */
- namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
- 
--use Magento\Backend\App\Action;
-+use Magento\Backend\App\Action\Context;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\Controller;
-+use Magento\Framework\Validator\StringLength;
-+use Magento\MediaStorage\Model\File\Validator\AvailablePath;
-+use Magento\Sitemap\Model\SitemapFactory;
- 
--class Save extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
-+/**
-+ * Save sitemap controller.
-+ */
-+class Save extends \Magento\Sitemap\Controller\Adminhtml\Sitemap implements HttpPostActionInterface
- {
-+    /**
-+     * Maximum length of sitemap filename
-+     */
-+    const MAX_FILENAME_LENGTH = 32;
-+
-+    /**
-+     * @var StringLength
-+     */
-+    private $stringValidator;
-+
-+    /**
-+     * @var AvailablePath
-+     */
-+    private $pathValidator;
-+
-+    /**
-+     * @var \Magento\Sitemap\Helper\Data
-+     */
-+    private $sitemapHelper;
-+
-+    /**
-+     * @var \Magento\Framework\Filesystem
-+     */
-+    private $filesystem;
-+
-+    /**
-+     * @var SitemapFactory
-+     */
-+    private $sitemapFactory;
-+
-+    /**
-+     * Save constructor.
-+     * @param Context $context
-+     * @param StringLength $stringValidator
-+     * @param AvailablePath $pathValidator
-+     * @param \Magento\Sitemap\Helper\Data $sitemapHelper
-+     * @param \Magento\Framework\Filesystem $filesystem
-+     * @param SitemapFactory $sitemapFactory
-+     */
-+    public function __construct(
-+        Context $context,
-+        StringLength $stringValidator = null,
-+        AvailablePath $pathValidator = null,
-+        \Magento\Sitemap\Helper\Data $sitemapHelper = null,
-+        \Magento\Framework\Filesystem $filesystem = null,
-+        SitemapFactory $sitemapFactory = null
-+    ) {
-+        parent::__construct($context);
-+        $this->stringValidator = $stringValidator ?: $this->_objectManager->get(StringLength::class);
-+        $this->pathValidator = $pathValidator ?: $this->_objectManager->get(AvailablePath::class);
-+        $this->sitemapHelper = $sitemapHelper ?: $this->_objectManager->get(\Magento\Sitemap\Helper\Data::class);
-+        $this->filesystem = $filesystem ?: $this->_objectManager->get(\Magento\Framework\Filesystem::class);
-+        $this->sitemapFactory = $sitemapFactory ?: $this->_objectManager->get(SitemapFactory::class);
-+    }
-+
-     /**
-      * Validate path for generation
-      *
-@@ -23,17 +85,25 @@ class Save extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
-         if (!empty($data['sitemap_filename']) && !empty($data['sitemap_path'])) {
-             $data['sitemap_path'] = '/' . ltrim($data['sitemap_path'], '/');
-             $path = rtrim($data['sitemap_path'], '\\/') . '/' . $data['sitemap_filename'];
--            /** @var $validator \Magento\MediaStorage\Model\File\Validator\AvailablePath */
--            $validator = $this->_objectManager->create(\Magento\MediaStorage\Model\File\Validator\AvailablePath::class);
--            /** @var $helper \Magento\Sitemap\Helper\Data */
--            $helper = $this->_objectManager->get(\Magento\Sitemap\Helper\Data::class);
--            $validator->setPaths($helper->getValidPaths());
--            if (!$validator->isValid($path)) {
--                foreach ($validator->getMessages() as $message) {
-+            $this->pathValidator->setPaths($this->sitemapHelper->getValidPaths());
-+            if (!$this->pathValidator->isValid($path)) {
-+                foreach ($this->pathValidator->getMessages() as $message) {
-+                    $this->messageManager->addErrorMessage($message);
-+                }
-+                // save data in session
-+                $this->_session->setFormData($data);
-+                // redirect to edit form
-+                return false;
-+            }
-+
-+            $filename = rtrim($data['sitemap_filename']);
-+            $this->stringValidator->setMax(self::MAX_FILENAME_LENGTH);
-+            if (!$this->stringValidator->isValid($filename)) {
-+                foreach ($this->stringValidator->getMessages() as $message) {
-                     $this->messageManager->addErrorMessage($message);
-                 }
-                 // save data in session
--                $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setFormData($data);
-+                $this->_session->setFormData($data);
-                 // redirect to edit form
-                 return false;
-             }
-@@ -49,9 +119,8 @@ class Save extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
-      */
-     protected function clearSiteMap(\Magento\Sitemap\Model\Sitemap $model)
-     {
--        /** @var \Magento\Framework\Filesystem\Directory\Write $directory */
--        $directory = $this->_objectManager->get(\Magento\Framework\Filesystem::class)
--            ->getDirectoryWrite(DirectoryList::ROOT);
-+        /** @var \Magento\Framework\Filesystem $directory */
-+        $directory = $this->filesystem->getDirectoryWrite(DirectoryList::ROOT);
- 
-         if ($this->getRequest()->getParam('sitemap_id')) {
-             $model->load($this->getRequest()->getParam('sitemap_id'));
-@@ -74,7 +143,7 @@ class Save extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
-     {
-         // init model and set data
-         /** @var \Magento\Sitemap\Model\Sitemap $model */
--        $model = $this->_objectManager->create(\Magento\Sitemap\Model\Sitemap::class);
-+        $model = $this->sitemapFactory->create();
-         $this->clearSiteMap($model);
-         $model->setData($data);
- 
-@@ -85,13 +154,13 @@ class Save extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
-             // display success message
-             $this->messageManager->addSuccessMessage(__('You saved the sitemap.'));
-             // clear previously saved data from session
--            $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setFormData(false);
-+            $this->_session->setFormData(false);
-             return $model->getId();
-         } catch (\Exception $e) {
-             // display error message
-             $this->messageManager->addErrorMessage($e->getMessage());
-             // save data in session
--            $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setFormData($data);
-+            $this->_session->setFormData($data);
-         }
-         return false;
-     }
-diff --git a/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php b/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php
-index d69b8e6d448..7a6d28259bf 100644
---- a/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php
-+++ b/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php
-@@ -15,9 +15,11 @@ use Magento\Framework\Model\ResourceModel\AbstractResource;
- use Magento\Framework\Registry;
- use Magento\Robots\Model\Config\Value as RobotsValue;
- use Magento\Store\Model\StoreResolver;
-+use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * Backend model for sitemap/search_engines/submission_robots configuration value.
-+ *
-  * Required to implement Page Cache functionality.
-  */
- class Robots extends Value implements IdentityInterface
-@@ -30,9 +32,9 @@ class Robots extends Value implements IdentityInterface
-     protected $_cacheTag = true;
- 
-     /**
--     * @var StoreResolver
-+     * @var StoreManagerInterface
-      */
--    private $storeResolver;
-+    private $storeManager;
- 
-     /**
-      * @param Context $context
-@@ -40,9 +42,12 @@ class Robots extends Value implements IdentityInterface
-      * @param ScopeConfigInterface $config
-      * @param TypeListInterface $cacheTypeList
-      * @param StoreResolver $storeResolver
-+     * @param StoreManagerInterface|null $storeManager
-      * @param AbstractResource|null $resource
-      * @param AbstractDb|null $resourceCollection
-      * @param array $data
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         Context $context,
-@@ -50,11 +55,13 @@ class Robots extends Value implements IdentityInterface
-         ScopeConfigInterface $config,
-         TypeListInterface $cacheTypeList,
-         StoreResolver $storeResolver,
-+        StoreManagerInterface $storeManager = null,
-         AbstractResource $resource = null,
-         AbstractDb $resourceCollection = null,
-         array $data = []
-     ) {
--        $this->storeResolver = $storeResolver;
-+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(StoreManagerInterface::class);
- 
-         parent::__construct(
-             $context,
-@@ -75,7 +82,7 @@ class Robots extends Value implements IdentityInterface
-     public function getIdentities()
-     {
-         return [
--            RobotsValue::CACHE_TAG . '_' . $this->storeResolver->getCurrentStoreId(),
-+            RobotsValue::CACHE_TAG . '_' . $this->storeManager->getStore()->getId(),
-         ];
-     }
- }
-diff --git a/app/code/Magento/Sitemap/Model/EmailNotification.php b/app/code/Magento/Sitemap/Model/EmailNotification.php
-new file mode 100644
-index 00000000000..27c042870a1
---- /dev/null
-+++ b/app/code/Magento/Sitemap/Model/EmailNotification.php
-@@ -0,0 +1,105 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types = 1);
-+
-+namespace Magento\Sitemap\Model;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\Translate\Inline\StateInterface;
-+use Magento\Framework\Mail\Template\TransportBuilder;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Backend\App\Area\FrontNameResolver;
-+use Magento\Sitemap\Model\Observer as Observer;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ *  Sends emails for the scheduled generation of the sitemap file
-+ */
-+class EmailNotification
-+{
-+    /**
-+     * @var \Magento\Framework\Translate\Inline\StateInterface
-+     */
-+    private $inlineTranslation;
-+
-+    /**
-+     * Core store config
-+     *
-+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @var \Magento\Framework\Mail\Template\TransportBuilder
-+     */
-+    private $transportBuilder;
-+
-+    /**
-+     * @var \Psr\Log\LoggerInterface $logger
-+     */
-+    private $logger;
-+
-+    /**
-+     * EmailNotification constructor.
-+     * @param StateInterface $inlineTranslation
-+     * @param TransportBuilder $transportBuilder
-+     * @param ScopeConfigInterface $scopeConfig
-+     * @param LoggerInterface $logger
-+     */
-+    public function __construct(
-+        StateInterface $inlineTranslation,
-+        TransportBuilder $transportBuilder,
-+        ScopeConfigInterface $scopeConfig,
-+        LoggerInterface $logger
-+    ) {
-+        $this->inlineTranslation = $inlineTranslation;
-+        $this->scopeConfig = $scopeConfig;
-+        $this->transportBuilder = $transportBuilder;
-+        $this->logger = $logger;
-+    }
-+
-+    /**
-+     * Send's error email if sitemap generated with errors.
-+     *
-+     * @param array| $errors
-+     */
-+    public function sendErrors($errors)
-+    {
-+        $this->inlineTranslation->suspend();
-+        try {
-+            $this->transportBuilder->setTemplateIdentifier(
-+                $this->scopeConfig->getValue(
-+                    Observer::XML_PATH_ERROR_TEMPLATE,
-+                    ScopeInterface::SCOPE_STORE
-+                )
-+            )->setTemplateOptions(
-+                [
-+                    'area' => FrontNameResolver::AREA_CODE,
-+                    'store' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
-+                ]
-+            )->setTemplateVars(
-+                ['warnings' => join("\n", $errors)]
-+            )->setFrom(
-+                $this->scopeConfig->getValue(
-+                    Observer::XML_PATH_ERROR_IDENTITY,
-+                    ScopeInterface::SCOPE_STORE
-+                )
-+            )->addTo(
-+                $this->scopeConfig->getValue(
-+                    Observer::XML_PATH_ERROR_RECIPIENT,
-+                    ScopeInterface::SCOPE_STORE
-+                )
-+            );
-+
-+            $transport = $this->transportBuilder->getTransport();
-+            $transport->sendMessage();
-+        } catch (\Exception $e) {
-+            $this->logger->error('Sitemap sendErrors: '.$e->getMessage());
-+        } finally {
-+            $this->inlineTranslation->resume();
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
-index a536ec998b8..ce74d738c4b 100644
---- a/app/code/Magento/Sitemap/Model/Observer.php
-+++ b/app/code/Magento/Sitemap/Model/Observer.php
-@@ -5,6 +5,11 @@
-  */
- namespace Magento\Sitemap\Model;
- 
-+use Magento\Sitemap\Model\EmailNotification as SitemapEmail;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory;
-+use Magento\Store\Model\ScopeInterface;
-+
- /**
-  * Sitemap module observer
-  *
-@@ -44,47 +49,32 @@ class Observer
-      *
-      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-      */
--    protected $_scopeConfig;
-+    private $scopeConfig;
- 
-     /**
-      * @var \Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory
-      */
--    protected $_collectionFactory;
--
--    /**
--     * @var \Magento\Framework\Mail\Template\TransportBuilder
--     */
--    protected $_transportBuilder;
--
--    /**
--     * @var \Magento\Store\Model\StoreManagerInterface
--     */
--    protected $_storeManager;
-+    private $collectionFactory;
- 
-     /**
--     * @var \Magento\Framework\Translate\Inline\StateInterface
-+     * @var $emailNotification
-      */
--    protected $inlineTranslation;
-+    private $emailNotification;
- 
-     /**
--     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
--     * @param \Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory $collectionFactory
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
--     * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
-+     * Observer constructor.
-+     * @param ScopeConfigInterface $scopeConfig
-+     * @param CollectionFactory $collectionFactory
-+     * @param EmailNotification $emailNotification
-      */
-     public function __construct(
--        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
--        \Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory $collectionFactory,
--        \Magento\Store\Model\StoreManagerInterface $storeManager,
--        \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
--        \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
-+        ScopeConfigInterface $scopeConfig,
-+        CollectionFactory $collectionFactory,
-+        SitemapEmail $emailNotification
-     ) {
--        $this->_scopeConfig = $scopeConfig;
--        $this->_collectionFactory = $collectionFactory;
--        $this->_storeManager = $storeManager;
--        $this->_transportBuilder = $transportBuilder;
--        $this->inlineTranslation = $inlineTranslation;
-+        $this->scopeConfig = $scopeConfig;
-+        $this->collectionFactory = $collectionFactory;
-+        $this->emailNotification = $emailNotification;
-     }
- 
-     /**
-@@ -97,17 +87,20 @@ class Observer
-     public function scheduledGenerateSitemaps()
-     {
-         $errors = [];
--
-+        $recipient = $this->scopeConfig->getValue(
-+            Observer::XML_PATH_ERROR_RECIPIENT,
-+            ScopeInterface::SCOPE_STORE
-+        );
-         // check if scheduled generation enabled
--        if (!$this->_scopeConfig->isSetFlag(
-+        if (!$this->scopeConfig->isSetFlag(
-             self::XML_PATH_GENERATION_ENABLED,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         )
-         ) {
-             return;
-         }
- 
--        $collection = $this->_collectionFactory->create();
-+        $collection = $this->collectionFactory->create();
-         /* @var $collection \Magento\Sitemap\Model\ResourceModel\Sitemap\Collection */
-         foreach ($collection as $sitemap) {
-             /* @var $sitemap \Magento\Sitemap\Model\Sitemap */
-@@ -117,41 +110,8 @@ class Observer
-                 $errors[] = $e->getMessage();
-             }
-         }
--
--        if ($errors && $this->_scopeConfig->getValue(
--            self::XML_PATH_ERROR_RECIPIENT,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--        )
--        ) {
--            $this->inlineTranslation->suspend();
--
--            $this->_transportBuilder->setTemplateIdentifier(
--                $this->_scopeConfig->getValue(
--                    self::XML_PATH_ERROR_TEMPLATE,
--                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--                )
--            )->setTemplateOptions(
--                [
--                    'area' => \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
--                    'store' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
--                ]
--            )->setTemplateVars(
--                ['warnings' => join("\n", $errors)]
--            )->setFrom(
--                $this->_scopeConfig->getValue(
--                    self::XML_PATH_ERROR_IDENTITY,
--                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--                )
--            )->addTo(
--                $this->_scopeConfig->getValue(
--                    self::XML_PATH_ERROR_RECIPIENT,
--                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--                )
--            );
--            $transport = $this->_transportBuilder->getTransport();
--            $transport->sendMessage();
--
--            $this->inlineTranslation->resume();
-+        if ($errors && $recipient) {
-+            $this->emailNotification->sendErrors($errors);
-         }
-     }
- }
-diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
-index 11a59cfa59f..23a1c0fd09b 100644
---- a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
-+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
-@@ -5,12 +5,12 @@
-  */
- namespace Magento\Sitemap\Model\ResourceModel\Catalog;
- 
-+use Magento\Catalog\Helper\Product as HelperProduct;
- use Magento\Catalog\Model\Product\Image\UrlBuilder;
- use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
--use Magento\Store\Model\Store;
- use Magento\Framework\App\ObjectManager;
- use Magento\Store\Model\ScopeInterface;
--use Magento\Catalog\Helper\Product as HelperProduct;
-+use Magento\Store\Model\Store;
- 
- /**
-  * Sitemap resource product collection model
-@@ -105,6 +105,8 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     private $scopeConfig;
- 
-     /**
-+     * Product constructor.
-+     *
-      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
-      * @param \Magento\Sitemap\Helper\Data $sitemapData
-      * @param \Magento\Catalog\Model\ResourceModel\Product $productResource
-@@ -157,6 +159,8 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
-+     * Construct
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -171,7 +175,9 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      * @param string $attributeCode
-      * @param mixed $value
-      * @param string $type
-+     *
-      * @return \Magento\Framework\DB\Select|bool
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function _addFilter($storeId, $attributeCode, $value, $type = '=')
-     {
-@@ -188,7 +194,6 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-                 break;
-             default:
-                 return false;
--                break;
-         }
- 
-         $attribute = $this->_getAttribute($attributeCode);
-@@ -217,7 +222,9 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      * @param int $storeId
-      * @param string $attributeCode
-      * @param string $column Add attribute value to given column
-+     *
-      * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function _joinAttribute($storeId, $attributeCode, $column = null)
-     {
-@@ -250,9 +257,11 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- 
-         // Add attribute value to result set if needed
-         if (isset($column)) {
--            $this->_select->columns([
--               $column => $columnValue
--            ]);
-+            $this->_select->columns(
-+                [
-+                    $column => $columnValue
-+                ]
-+            );
-         }
-     }
- 
-@@ -260,7 +269,9 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      * Get attribute data by attribute code
-      *
-      * @param string $attributeCode
-+     *
-      * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function _getAttribute($attributeCode)
-     {
-@@ -272,7 +283,7 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-                 'attribute_id' => $attribute->getId(),
-                 'table' => $attribute->getBackend()->getTable(),
-                 'is_global' => $attribute->getIsGlobal() ==
--                \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
-+                    \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
-                 'backend_type' => $attribute->getBackendType(),
-             ];
-         }
-@@ -283,7 +294,11 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      * Get category collection array
-      *
-      * @param null|string|bool|int|Store $storeId
-+     *
-      * @return array|bool
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     * @throws \Zend_Db_Statement_Exception
-      */
-     public function getCollection($storeId)
-     {
-@@ -296,9 +311,9 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-         }
- 
-         $connection = $this->getConnection();
--        $urlsConfigCondition = '';
--        if ($this->isCategoryProductURLsConfig($storeId)) {
--            $urlsConfigCondition = 'NOT ';
-+        $urlRewriteMetaDataCondition = '';
-+        if (!$this->isCategoryProductURLsConfig($storeId)) {
-+            $urlRewriteMetaDataCondition = ' AND url_rewrite.metadata IS NULL';
-         }
- 
-         $this->_select = $connection->select()->from(
-@@ -310,8 +325,8 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-             []
-         )->joinLeft(
-             ['url_rewrite' => $this->getTable('url_rewrite')],
--            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1 AND url_rewrite.metadata IS '
--            . $urlsConfigCondition . 'NULL'
-+            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1'
-+            . $urlRewriteMetaDataCondition
-             . $connection->quoteInto(' AND url_rewrite.store_id = ?', $store->getId())
-             . $connection->quoteInto(' AND url_rewrite.entity_type = ?', ProductUrlRewriteGenerator::ENTITY_TYPE),
-             ['url' => 'request_path']
-@@ -348,7 +363,9 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      *
-      * @param array $productRow
-      * @param int $storeId
-+     *
-      * @return \Magento\Framework\DataObject
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function _prepareProduct(array $productRow, $storeId)
-     {
-@@ -373,6 +390,7 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      */
-     protected function _loadProductImages($product, $storeId)
-     {
-+        $this->_storeManager->setCurrentStore($storeId);
-         /** @var $helper \Magento\Sitemap\Helper\Data */
-         $helper = $this->_sitemapData;
-         $imageIncludePolicy = $helper->getProductImageIncludePolicy($storeId);
-@@ -476,13 +494,13 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     /**
-      * Return Use Categories Path for Product URLs config value
-      *
--     * @param $storeId
-+     * @param null|string $storeId
-      *
-      * @return bool
-      */
-     private function isCategoryProductURLsConfig($storeId)
-     {
--        return (bool)$this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             HelperProduct::XML_PATH_PRODUCT_URL_USE_CATEGORY,
-             ScopeInterface::SCOPE_STORE,
-             $storeId
-diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
-index d58ff732c81..d0beac8697f 100644
---- a/app/code/Magento/Sitemap/Model/Sitemap.php
-+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Sitemap\Model;
- 
- use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
-@@ -15,6 +16,8 @@ use Magento\Sitemap\Model\ItemProvider\ItemProviderInterface;
- use Magento\Sitemap\Model\ResourceModel\Sitemap as SitemapResource;
- 
- /**
-+ * Sitemap model.
-+ *
-  * @method string getSitemapType()
-  * @method \Magento\Sitemap\Model\Sitemap setSitemapType(string $value)
-  * @method string getSitemapFilename()
-@@ -154,12 +157,11 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
-     protected $dateTime;
- 
-     /**
--     * Model cache tag for clear cache in after save and after delete
-+     * @inheritdoc
-      *
--     * @var string
-      * @since 100.2.0
-      */
--    protected $_cacheTag = true;
-+    protected $_cacheTag = [Value::CACHE_TAG];
- 
-     /**
-      * Item resolver
-@@ -306,29 +308,35 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
-         $helper = $this->_sitemapData;
-         $storeId = $this->getStoreId();
- 
--        $this->addSitemapItem(new DataObject(
--            [
--                'changefreq' => $helper->getCategoryChangefreq($storeId),
--                'priority' => $helper->getCategoryPriority($storeId),
--                'collection' => $this->_categoryFactory->create()->getCollection($storeId),
--            ]
--        ));
--
--        $this->addSitemapItem(new DataObject(
--            [
--                'changefreq' => $helper->getProductChangefreq($storeId),
--                'priority' => $helper->getProductPriority($storeId),
--                'collection' => $this->_productFactory->create()->getCollection($storeId),
--            ]
--        ));
--
--        $this->addSitemapItem(new DataObject(
--            [
--                'changefreq' => $helper->getPageChangefreq($storeId),
--                'priority' => $helper->getPagePriority($storeId),
--                'collection' => $this->_cmsFactory->create()->getCollection($storeId),
--            ]
--        ));
-+        $this->addSitemapItem(
-+            new DataObject(
-+                [
-+                    'changefreq' => $helper->getCategoryChangefreq($storeId),
-+                    'priority' => $helper->getCategoryPriority($storeId),
-+                    'collection' => $this->_categoryFactory->create()->getCollection($storeId),
-+                ]
-+            )
-+        );
-+
-+        $this->addSitemapItem(
-+            new DataObject(
-+                [
-+                    'changefreq' => $helper->getProductChangefreq($storeId),
-+                    'priority' => $helper->getProductPriority($storeId),
-+                    'collection' => $this->_productFactory->create()->getCollection($storeId),
-+                ]
-+            )
-+        );
-+
-+        $this->addSitemapItem(
-+            new DataObject(
-+                [
-+                    'changefreq' => $helper->getPageChangefreq($storeId),
-+                    'priority' => $helper->getPagePriority($storeId),
-+                    'collection' => $this->_cmsFactory->create()->getCollection($storeId),
-+                ]
-+            )
-+        );
-     }
- 
-     /**
-@@ -537,7 +545,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
-     protected function _getSitemapRow($url, $lastmod = null, $changefreq = null, $priority = null, $images = null)
-     {
-         $url = $this->_getUrl($url);
--        $row = '<loc>' . htmlspecialchars($url) . '</loc>';
-+        $row = '<loc>' . $this->_escaper->escapeUrl($url) . '</loc>';
-         if ($lastmod) {
-             $row .= '<lastmod>' . $this->_getFormattedLastmodDate($lastmod) . '</lastmod>';
-         }
-@@ -551,17 +559,17 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
-             // Add Images to sitemap
-             foreach ($images->getCollection() as $image) {
-                 $row .= '<image:image>';
--                $row .= '<image:loc>' . htmlspecialchars($image->getUrl()) . '</image:loc>';
--                $row .= '<image:title>' . htmlspecialchars($images->getTitle()) . '</image:title>';
-+                $row .= '<image:loc>' . $this->_escaper->escapeUrl($image->getUrl()) . '</image:loc>';
-+                $row .= '<image:title>' . $this->_escaper->escapeHtml($images->getTitle()) . '</image:title>';
-                 if ($image->getCaption()) {
--                    $row .= '<image:caption>' . htmlspecialchars($image->getCaption()) . '</image:caption>';
-+                    $row .= '<image:caption>' . $this->_escaper->escapeHtml($image->getCaption()) . '</image:caption>';
-                 }
-                 $row .= '</image:image>';
-             }
-             // Add PageMap image for Google web search
-             $row .= '<PageMap xmlns="http://www.google.com/schemas/sitemap-pagemap/1.0"><DataObject type="thumbnail">';
--            $row .= '<Attribute name="name" value="' . htmlspecialchars($images->getTitle()) . '"/>';
--            $row .= '<Attribute name="src" value="' . htmlspecialchars($images->getThumbnail()) . '"/>';
-+            $row .= '<Attribute name="name" value="' . $this->_escaper->escapeHtml($images->getTitle()) . '"/>';
-+            $row .= '<Attribute name="src" value="' . $this->_escaper->escapeUrl($images->getThumbnail()) . '"/>';
-             $row .= '</DataObject></PageMap>';
-         }
- 
-@@ -578,7 +586,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
-     protected function _getSitemapIndexRow($sitemapFilename, $lastmod = null)
-     {
-         $url = $this->getSitemapUrl($this->getSitemapPath(), $sitemapFilename);
--        $row = '<loc>' . htmlspecialchars($url) . '</loc>';
-+        $row = '<loc>' . $this->_escaper->escapeUrl($url) . '</loc>';
-         if ($lastmod) {
-             $row .= '<lastmod>' . $this->_getFormattedLastmodDate($lastmod) . '</lastmod>';
-         }
-@@ -720,6 +728,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
-      */
-     protected function _getDocumentRoot()
-     {
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         return realpath($this->_request->getServer('DOCUMENT_ROOT'));
-     }
- 
-@@ -730,6 +739,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
-      */
-     protected function _getStoreBaseDomain()
-     {
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         $storeParsedUrl = parse_url($this->_getStoreBaseUrl());
-         $url = $storeParsedUrl['scheme'] . '://' . $storeParsedUrl['host'];
- 
-@@ -830,13 +840,15 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
- 
-         foreach ($this->_sitemapItems as $data) {
-             foreach ($data->getCollection() as $item) {
--                $items[] = $this->sitemapItemFactory->create([
--                    'url' => $item->getUrl(),
--                    'updatedAt' => $item->getUpdatedAt(),
--                    'images' => $item->getImages(),
--                    'priority' => $data->getPriority(),
--                    'changeFrequency' => $data->getChangeFrequency(),
--                ]);
-+                $items[] = $this->sitemapItemFactory->create(
-+                    [
-+                        'url' => $item->getUrl(),
-+                        'updatedAt' => $item->getUpdatedAt(),
-+                        'images' => $item->getImages(),
-+                        'priority' => $data->getPriority(),
-+                        'changeFrequency' => $data->getChangeFrequency(),
-+                    ]
-+                );
-             }
-         }
- 
-diff --git a/app/code/Magento/Sitemap/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Sitemap/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..c8fd6a751cb
---- /dev/null
-+++ b/app/code/Magento/Sitemap/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuSEOAndSearchSiteMap">
-+        <data key="pageTitle">Site Map</data>
-+        <data key="title">Site Map</data>
-+        <data key="dataUiId">magento-sitemap-catalog-sitemap</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapNavigateMenuTest.xml b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..54543fab864
---- /dev/null
-+++ b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminMarketingSiteMapNavigateMenuTest">
-+        <annotations>
-+            <features value="Sitemap"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin marketing site map navigate menu test"/>
-+            <description value="Admin should be able to navigate to Marketing > Site Map"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14204"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingSiteMapPage">
-+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSEOAndSearchSiteMap.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSEOAndSearchSiteMap.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php b/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php
-index 6fcd247ab1f..b7cfd2028b7 100644
---- a/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php
-+++ b/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Sitemap\Test\Unit\Block;
- 
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
-@@ -77,6 +79,7 @@ class RobotsTest extends \PHPUnit\Framework\TestCase
-         $this->sitemapCollectionFactory = $this->getMockBuilder(
-             \Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory::class
-         )
-+            ->setMethods(['create'])
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-@@ -109,12 +112,17 @@ class RobotsTest extends \PHPUnit\Framework\TestCase
-         $this->initEventManagerMock($expected);
-         $this->scopeConfigMock->expects($this->once())->method('getValue')->willReturn(false);
- 
--        $this->storeResolver->expects($this->once())
--            ->method('getCurrentStoreId')
--            ->willReturn($defaultStoreId);
--
-         $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-             ->getMockForAbstractClass();
-+
-+        $storeMock->expects($this->once())
-+            ->method('getWebsiteId')
-+            ->willReturn($defaultWebsiteId);
-+
-+        $this->storeManager->expects($this->once())
-+            ->method('getDefaultStoreView')
-+            ->willReturn($storeMock);
-+
-         $storeMock->expects($this->any())
-             ->method('getWebsiteId')
-             ->willReturn($defaultWebsiteId);
-@@ -126,10 +134,6 @@ class RobotsTest extends \PHPUnit\Framework\TestCase
-             ->method('getStoreIds')
-             ->willReturn([$defaultStoreId]);
- 
--        $this->storeManager->expects($this->once())
--            ->method('getStore')
--            ->with($defaultStoreId)
--            ->willReturn($storeMock);
-         $this->storeManager->expects($this->once())
-             ->method('getWebsite')
-             ->with($defaultWebsiteId)
-@@ -165,12 +169,13 @@ class RobotsTest extends \PHPUnit\Framework\TestCase
-         $this->initEventManagerMock($expected);
-         $this->scopeConfigMock->expects($this->once())->method('getValue')->willReturn(false);
- 
--        $this->storeResolver->expects($this->once())
--            ->method('getCurrentStoreId')
--            ->willReturn($defaultStoreId);
--
-         $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-             ->getMockForAbstractClass();
-+
-+        $this->storeManager->expects($this->once())
-+            ->method('getDefaultStoreView')
-+            ->willReturn($storeMock);
-+
-         $storeMock->expects($this->any())
-             ->method('getWebsiteId')
-             ->willReturn($defaultWebsiteId);
-@@ -182,10 +187,6 @@ class RobotsTest extends \PHPUnit\Framework\TestCase
-             ->method('getStoreIds')
-             ->willReturn([$defaultStoreId, $secondStoreId]);
- 
--        $this->storeManager->expects($this->once())
--            ->method('getStore')
--            ->with($defaultStoreId)
--            ->willReturn($storeMock);
-         $this->storeManager->expects($this->once())
-             ->method('getWebsite')
-             ->with($defaultWebsiteId)
-@@ -228,8 +229,14 @@ class RobotsTest extends \PHPUnit\Framework\TestCase
-     {
-         $storeId = 1;
- 
--        $this->storeResolver->expects($this->once())
--            ->method('getCurrentStoreId')
-+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMockForAbstractClass();
-+
-+        $this->storeManager->expects($this->once())
-+            ->method('getDefaultStoreView')
-+            ->willReturn($storeMock);
-+
-+        $storeMock->expects($this->once())
-+            ->method('getId')
-             ->willReturn($storeId);
- 
-         $expected = [
-diff --git a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php
-index f77954101df..00f51b7e6c2 100644
---- a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php
-+++ b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php
-@@ -7,51 +7,83 @@ namespace Magento\Sitemap\Test\Unit\Controller\Adminhtml\Sitemap;
- 
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
- use Magento\Framework\Controller\ResultFactory;
-+use Magento\Sitemap\Controller\Adminhtml\Sitemap\Save;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class SaveTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-      * @var \Magento\Sitemap\Controller\Adminhtml\Sitemap\Save
-      */
--    protected $saveController;
-+    private $saveController;
- 
-     /**
-      * @var \Magento\Backend\App\Action\Context
-      */
--    protected $context;
--
--    /**
--     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
--     */
--    protected $objectManagerHelper;
-+    private $contextMock;
- 
-     /**
-      * @var \Magento\Framework\HTTP\PhpEnvironment\Request|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $requestMock;
-+    private $requestMock;
- 
-     /**
-      * @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $resultFactoryMock;
-+    private $resultFactoryMock;
- 
-     /**
-      * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $resultRedirectMock;
-+    private $resultRedirectMock;
- 
-     /**
-      * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $objectManagerMock;
-+    private $objectManagerMock;
- 
-     /**
-      * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $messageManagerMock;
-+    private $messageManagerMock;
-+
-+    /**
-+     * @var \Magento\Framework\Validator\StringLength|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $lengthValidator;
-+
-+    /**
-+     * @var \Magento\MediaStorage\Model\File\Validator\AvailablePath|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $pathValidator;
-+
-+    /**
-+     * @var \Magento\Sitemap\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $helper;
-+
-+    /**
-+     * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $fileSystem;
-+
-+    /**
-+     * @var \Magento\Sitemap\Model\SitemapFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $siteMapFactory;
-+
-+    /**
-+     * @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $session;
- 
-     protected function setUp()
-     {
-+        $this->contextMock = $this->getMockBuilder(\Magento\Backend\App\Action\Context::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['getPostValue'])
-@@ -66,27 +98,48 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             ->getMock();
-         $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
-             ->getMock();
--
-+        $this->helper = $this->getMockBuilder(\Magento\Sitemap\Helper\Data::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-         $this->resultFactoryMock->expects($this->once())
-             ->method('create')
-             ->with(ResultFactory::TYPE_REDIRECT)
-             ->willReturn($this->resultRedirectMock);
-+        $this->session = $this->getMockBuilder(\Magento\Backend\Model\Session::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setFormData'])
-+            ->getMock();
- 
--        $this->objectManagerHelper = new ObjectManagerHelper($this);
--        $this->context = $this->objectManagerHelper->getObject(
--            \Magento\Backend\App\Action\Context::class,
--            [
--                'resultFactory' => $this->resultFactoryMock,
--                'request' => $this->requestMock,
--                'messageManager' => $this->messageManagerMock,
--                'objectManager' => $this->objectManagerMock
--            ]
--        );
--        $this->saveController = $this->objectManagerHelper->getObject(
--            \Magento\Sitemap\Controller\Adminhtml\Sitemap\Save::class,
--            [
--                'context' => $this->context
--            ]
-+        $this->contextMock->expects($this->once())
-+            ->method('getMessageManager')
-+            ->willReturn($this->messageManagerMock);
-+        $this->contextMock->expects($this->once())
-+            ->method('getRequest')
-+            ->willReturn($this->requestMock);
-+        $this->contextMock->expects($this->once())
-+            ->method('getResultFactory')
-+            ->willReturn($this->resultFactoryMock);
-+        $this->contextMock->expects($this->once())
-+            ->method('getSession')
-+            ->willReturn($this->session);
-+
-+        $this->lengthValidator = $this->getMockBuilder(\Magento\Framework\Validator\StringLength::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->pathValidator =
-+            $this->getMockBuilder(\Magento\MediaStorage\Model\File\Validator\AvailablePath::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->fileSystem = $this->createMock(\Magento\Framework\Filesystem::class);
-+        $this->siteMapFactory = $this->createMock(\Magento\Sitemap\Model\SitemapFactory::class);
-+
-+        $this->saveController = new Save(
-+            $this->contextMock,
-+            $this->lengthValidator,
-+            $this->pathValidator,
-+            $this->helper,
-+            $this->fileSystem,
-+            $this->siteMapFactory
-         );
-     }
- 
-@@ -105,11 +158,8 @@ class SaveTest extends \PHPUnit\Framework\TestCase
- 
-     public function testTryToSaveInvalidDataShouldFailWithErrors()
-     {
--        $validatorClass = \Magento\MediaStorage\Model\File\Validator\AvailablePath::class;
--        $helperClass = \Magento\Sitemap\Helper\Data::class;
-         $validPaths = [];
-         $messages = ['message1', 'message2'];
--        $sessionClass = \Magento\Backend\Model\Session::class;
-         $data = ['sitemap_filename' => 'sitemap_filename', 'sitemap_path' => '/sitemap_path'];
-         $siteMapId = 1;
- 
-@@ -121,37 +171,83 @@ class SaveTest extends \PHPUnit\Framework\TestCase
-             ->with('sitemap_id')
-             ->willReturn($siteMapId);
- 
--        $validator = $this->createMock($validatorClass);
--        $validator->expects($this->once())
-+        $this->pathValidator->expects($this->once())
-             ->method('setPaths')
-             ->with($validPaths)
-             ->willReturnSelf();
--        $validator->expects($this->once())
-+        $this->pathValidator->expects($this->once())
-             ->method('isValid')
-             ->with('/sitemap_path/sitemap_filename')
-             ->willReturn(false);
--        $validator->expects($this->once())
-+        $this->pathValidator->expects($this->once())
-             ->method('getMessages')
-             ->willReturn($messages);
- 
--        $helper = $this->createMock($helperClass);
--        $helper->expects($this->once())
-+        $this->helper->expects($this->once())
-             ->method('getValidPaths')
-             ->willReturn($validPaths);
- 
--        $session = $this->createPartialMock($sessionClass, ['setFormData']);
--        $session->expects($this->once())
-+        $this->session->expects($this->once())
-             ->method('setFormData')
-             ->with($data)
-             ->willReturnSelf();
- 
--        $this->objectManagerMock->expects($this->once())
--            ->method('create')
--            ->with($validatorClass)
--            ->willReturn($validator);
--        $this->objectManagerMock->expects($this->any())
--            ->method('get')
--            ->willReturnMap([[$helperClass, $helper], [$sessionClass, $session]]);
-+        $this->messageManagerMock->expects($this->at(0))
-+            ->method('addErrorMessage')
-+            ->withConsecutive(
-+                [$messages[0]],
-+                [$messages[1]]
-+            )
-+            ->willReturnSelf();
-+
-+        $this->resultRedirectMock->expects($this->once())
-+            ->method('setPath')
-+            ->with('adminhtml/*/edit', ['sitemap_id' => $siteMapId])
-+            ->willReturnSelf();
-+
-+        $this->assertSame($this->resultRedirectMock, $this->saveController->execute());
-+    }
-+
-+    public function testTryToSaveInvalidFileNameShouldFailWithErrors()
-+    {
-+        $validPaths = [];
-+        $messages = ['message1', 'message2'];
-+        $data = ['sitemap_filename' => 'sitemap_filename', 'sitemap_path' => '/sitemap_path'];
-+        $siteMapId = 1;
-+
-+        $this->requestMock->expects($this->once())
-+            ->method('getPostValue')
-+            ->willReturn($data);
-+        $this->requestMock->expects($this->once())
-+            ->method('getParam')
-+            ->with('sitemap_id')
-+            ->willReturn($siteMapId);
-+
-+        $this->lengthValidator->expects($this->once())
-+            ->method('isValid')
-+            ->with('sitemap_filename')
-+            ->willReturn(false);
-+        $this->lengthValidator->expects($this->once())
-+            ->method('getMessages')
-+            ->willReturn($messages);
-+
-+        $this->pathValidator->expects($this->once())
-+            ->method('setPaths')
-+            ->with($validPaths)
-+            ->willReturnSelf();
-+        $this->pathValidator->expects($this->once())
-+            ->method('isValid')
-+            ->with('/sitemap_path/sitemap_filename')
-+            ->willReturn(true);
-+
-+        $this->helper->expects($this->once())
-+            ->method('getValidPaths')
-+            ->willReturn($validPaths);
-+
-+        $this->session->expects($this->once())
-+            ->method('setFormData')
-+            ->with($data)
-+            ->willReturnSelf();
- 
-         $this->messageManagerMock->expects($this->at(0))
-             ->method('addErrorMessage')
-diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/Config/Backend/RobotsTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/Config/Backend/RobotsTest.php
-index f3c2f90de28..cbf353d0a93 100644
---- a/app/code/Magento/Sitemap/Test/Unit/Model/Config/Backend/RobotsTest.php
-+++ b/app/code/Magento/Sitemap/Test/Unit/Model/Config/Backend/RobotsTest.php
-@@ -37,6 +37,11 @@ class RobotsTest extends \PHPUnit\Framework\TestCase
-      */
-     private $storeResolver;
- 
-+    /**
-+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $storeManager;
-+
-     protected function setUp()
-     {
-         $this->context = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
-@@ -57,12 +62,16 @@ class RobotsTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-+            ->getMockForAbstractClass();
-+
-         $this->model = new \Magento\Sitemap\Model\Config\Backend\Robots(
-             $this->context,
-             $this->registry,
-             $this->scopeConfig,
-             $this->typeList,
--            $this->storeResolver
-+            $this->storeResolver,
-+            $this->storeManager
-         );
-     }
- 
-@@ -73,8 +82,14 @@ class RobotsTest extends \PHPUnit\Framework\TestCase
-     {
-         $storeId = 1;
- 
--        $this->storeResolver->expects($this->once())
--            ->method('getCurrentStoreId')
-+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMock();
-+
-+        $this->storeManager->expects($this->once())
-+            ->method('getStore')
-+            ->willReturn($storeMock);
-+
-+        $storeMock->expects($this->once())
-+            ->method('getId')
-             ->willReturn($storeId);
- 
-         $expected = [
-diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/EmailNotificationTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/EmailNotificationTest.php
-new file mode 100644
-index 00000000000..eafb47c086b
---- /dev/null
-+++ b/app/code/Magento/Sitemap/Test/Unit/Model/EmailNotificationTest.php
-@@ -0,0 +1,134 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types = 1);
-+
-+namespace Magento\Sitemap\Test\Unit\Model;
-+
-+use Magento\Backend\App\Area\FrontNameResolver;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\Mail\Template\TransportBuilder;
-+use Magento\Framework\Mail\TransportInterface;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Framework\Translate\Inline\StateInterface;
-+use Magento\Sitemap\Model\EmailNotification;
-+use Magento\Sitemap\Model\Observer;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Store\Model\Store;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Test for Magento\Sitemap\Model\EmailNotification
-+ */
-+class EmailNotificationTest extends TestCase
-+{
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var EmailNotification
-+     */
-+    private $model;
-+
-+    /**
-+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $scopeConfigMock;
-+
-+    /**
-+     * @var TransportBuilder|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $transportBuilderMock;
-+
-+    /**
-+     * @var StateInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $inlineTranslationMock;
-+
-+    /**
-+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $objectManagerMock;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
-+            ->getMock();
-+        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
-+            ->getMock();
-+        $this->transportBuilderMock = $this->getMockBuilder(TransportBuilder::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->inlineTranslationMock = $this->getMockBuilder(StateInterface::class)
-+            ->getMock();
-+
-+        $this->objectManager = new ObjectManager($this);
-+        $this->model = $this->objectManager->getObject(
-+            EmailNotification::class,
-+            [
-+                'inlineTranslation' => $this->inlineTranslationMock,
-+                'scopeConfig' => $this->scopeConfigMock,
-+                'transportBuilder' => $this->transportBuilderMock,
-+            ]
-+        );
-+    }
-+
-+    public function testSendErrors()
-+    {
-+        $exception = 'Sitemap Exception';
-+        $transport = $this->createMock(TransportInterface::class);
-+
-+        $this->scopeConfigMock->expects($this->at(0))
-+            ->method('getValue')
-+            ->with(
-+                Observer::XML_PATH_ERROR_TEMPLATE,
-+                ScopeInterface::SCOPE_STORE
-+            )
-+            ->willReturn('error-recipient@example.com');
-+
-+        $this->inlineTranslationMock->expects($this->once())
-+            ->method('suspend');
-+
-+        $this->transportBuilderMock->expects($this->once())
-+            ->method('setTemplateIdentifier')
-+            ->will($this->returnSelf());
-+
-+        $this->transportBuilderMock->expects($this->once())
-+            ->method('setTemplateOptions')
-+            ->with([
-+                'area' => FrontNameResolver::AREA_CODE,
-+                'store' => Store::DEFAULT_STORE_ID,
-+            ])
-+            ->will($this->returnSelf());
-+
-+        $this->transportBuilderMock->expects($this->once())
-+            ->method('setTemplateVars')
-+            ->with(['warnings' => $exception])
-+            ->will($this->returnSelf());
-+
-+        $this->transportBuilderMock->expects($this->once())
-+            ->method('setFrom')
-+            ->will($this->returnSelf());
-+
-+        $this->transportBuilderMock->expects($this->once())
-+            ->method('addTo')
-+            ->will($this->returnSelf());
-+
-+        $this->transportBuilderMock->expects($this->once())
-+            ->method('getTransport')
-+            ->willReturn($transport);
-+
-+        $transport->expects($this->once())
-+            ->method('sendMessage');
-+
-+        $this->inlineTranslationMock->expects($this->once())
-+            ->method('resume');
-+
-+        $this->model->sendErrors(['Sitemap Exception']);
-+    }
-+}
-diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
-index ac88f23ff9d..09f5418bbd7 100644
---- a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
-+++ b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
-@@ -5,10 +5,14 @@
-  */
- namespace Magento\Sitemap\Test\Unit\Model;
- 
-+use Magento\Framework\App\Area;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Sitemap\Model\EmailNotification;
-+use Magento\Store\Model\App\Emulation;
- 
- /**
-  * Class ObserverTest
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class ObserverTest extends \PHPUnit\Framework\TestCase
-@@ -33,21 +37,6 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-      */
-     private $collectionFactoryMock;
- 
--    /**
--     * @var \Magento\Framework\Mail\Template\TransportBuilder|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $transportBuilderMock;
--
--    /**
--     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $storeManagerMock;
--
--    /**
--     * @var \Magento\Framework\Translate\Inline\StateInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $inlineTranslationMock;
--
-     /**
-      * @var \Magento\Sitemap\Model\ResourceModel\Sitemap\Collection|\PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -63,6 +52,16 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-      */
-     private $objectManagerMock;
- 
-+    /**
-+     * @var Emulation|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $appEmulationMock;
-+
-+    /**
-+     * @var EmailNotification|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $emailNotificationMock;
-+
-     protected function setUp()
-     {
-         $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
-@@ -74,28 +73,28 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-         )->disableOriginalConstructor()
-             ->setMethods(['create'])
-             ->getMock();
--        $this->transportBuilderMock = $this->getMockBuilder(\Magento\Framework\Mail\Template\TransportBuilder::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
--            ->getMock();
--        $this->inlineTranslationMock = $this->getMockBuilder(\Magento\Framework\Translate\Inline\StateInterface::class)
--            ->getMock();
-         $this->sitemapCollectionMock = $this->createPartialMock(
-             \Magento\Sitemap\Model\ResourceModel\Sitemap\Collection::class,
-             ['getIterator']
-         );
--        $this->sitemapMock = $this->createPartialMock(\Magento\Sitemap\Model\Sitemap::class, ['generateXml']);
--
-+        $this->sitemapMock = $this->createPartialMock(
-+            \Magento\Sitemap\Model\Sitemap::class,
-+            [
-+                'generateXml',
-+                'getStoreId',
-+            ]
-+        );
-+        $this->appEmulationMock = $this->createMock(Emulation::class);
-+        $this->emailNotificationMock = $this->createMock(EmailNotification::class);
-         $this->objectManager = new ObjectManager($this);
-+
-         $this->observer = $this->objectManager->getObject(
-             \Magento\Sitemap\Model\Observer::class,
-             [
-                 'scopeConfig' => $this->scopeConfigMock,
-                 'collectionFactory' => $this->collectionFactoryMock,
--                'storeManager' => $this->storeManagerMock,
--                'transportBuilder' => $this->transportBuilderMock,
--                'inlineTranslation' => $this->inlineTranslationMock
-+                'appEmulation' => $this->appEmulationMock,
-+                'emailNotification' => $this->emailNotificationMock
-             ]
-         );
-     }
-@@ -103,7 +102,7 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-     public function testScheduledGenerateSitemapsSendsExceptionEmail()
-     {
-         $exception = 'Sitemap Exception';
--        $transport = $this->createMock(\Magento\Framework\Mail\TransportInterface::class);
-+        $storeId = 1;
- 
-         $this->scopeConfigMock->expects($this->once())->method('isSetFlag')->willReturn(true);
- 
-@@ -115,11 +114,15 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-             ->method('getIterator')
-             ->willReturn(new \ArrayIterator([$this->sitemapMock]));
- 
-+        $this->sitemapMock->expects($this->at(0))
-+            ->method('getStoreId')
-+            ->willReturn($storeId);
-+
-         $this->sitemapMock->expects($this->once())
-             ->method('generateXml')
-             ->willThrowException(new \Exception($exception));
- 
--        $this->scopeConfigMock->expects($this->at(1))
-+        $this->scopeConfigMock->expects($this->at(0))
-             ->method('getValue')
-             ->with(
-                 \Magento\Sitemap\Model\Observer::XML_PATH_ERROR_RECIPIENT,
-@@ -127,44 +130,6 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-             )
-             ->willReturn('error-recipient@example.com');
- 
--        $this->inlineTranslationMock->expects($this->once())
--            ->method('suspend');
--
--        $this->transportBuilderMock->expects($this->once())
--            ->method('setTemplateIdentifier')
--            ->will($this->returnSelf());
--
--        $this->transportBuilderMock->expects($this->once())
--            ->method('setTemplateOptions')
--            ->with([
--                'area' => \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
--                'store' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
--            ])
--            ->will($this->returnSelf());
--
--        $this->transportBuilderMock->expects($this->once())
--            ->method('setTemplateVars')
--            ->with(['warnings' => $exception])
--            ->will($this->returnSelf());
--
--        $this->transportBuilderMock->expects($this->once())
--            ->method('setFrom')
--            ->will($this->returnSelf());
--
--        $this->transportBuilderMock->expects($this->once())
--            ->method('addTo')
--            ->will($this->returnSelf());
--
--        $this->transportBuilderMock->expects($this->once())
--            ->method('getTransport')
--            ->willReturn($transport);
--
--        $transport->expects($this->once())
--            ->method('sendMessage');
--
--        $this->inlineTranslationMock->expects($this->once())
--            ->method('resume');
--
-         $this->observer->scheduledGenerateSitemaps();
-     }
- }
-diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
-index f805d447155..86d57815e02 100644
---- a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
-+++ b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
-@@ -162,7 +162,7 @@ class SitemapTest extends \PHPUnit\Framework\TestCase
-      * Check not exists sitemap path validation
-      *
-      * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @expectedExceptionMessage Please create the specified folder "" before saving the sitemap.
-+     * @expectedExceptionMessage Please create the specified folder "/" before saving the sitemap.
-      */
-     public function testPathNotExists()
-     {
-@@ -429,10 +429,12 @@ class SitemapTest extends \PHPUnit\Framework\TestCase
-         if (count($expectedFile) == 1) {
-             $this->directoryMock->expects($this->once())
-                 ->method('renameFile')
--                ->willReturnCallback(function ($from, $to) {
--                    \PHPUnit\Framework\Assert::assertEquals('/sitemap-1-1.xml', $from);
--                    \PHPUnit\Framework\Assert::assertEquals('/sitemap.xml', $to);
--                });
-+                ->willReturnCallback(
-+                    function ($from, $to) {
-+                        \PHPUnit\Framework\Assert::assertEquals('/sitemap-1-1.xml', $from);
-+                        \PHPUnit\Framework\Assert::assertEquals('/sitemap.xml', $to);
-+                    }
-+                );
-         }
- 
-         // Check robots txt
-@@ -524,32 +526,36 @@ class SitemapTest extends \PHPUnit\Framework\TestCase
- 
-         $this->itemProviderMock->expects($this->any())
-             ->method('getItems')
--            ->willReturn([
--                new SitemapItem('category.html', '1.0', 'daily', '2012-12-21 00:00:00'),
--                new SitemapItem('/category/sub-category.html', '1.0', 'daily', '2012-12-21 00:00:00'),
--                new SitemapItem('product.html', '0.5', 'monthly', '0000-00-00 00:00:00'),
--                new SitemapItem(
--                    'product2.html',
--                    '0.5',
--                    'monthly',
--                    '2012-12-21 00:00:00',
--                    new DataObject([
--                        'collection' => [
--                            new DataObject(
--                                [
--                                    'url' => $storeBaseMediaUrl . 'i/m/image1.png',
--                                    'caption' => 'caption & > title < "'
--                                ]
--                            ),
--                            new DataObject(
--                                ['url' => $storeBaseMediaUrl . 'i/m/image_no_caption.png', 'caption' => null]
--                            ),
--                        ],
--                        'thumbnail' => $storeBaseMediaUrl . 't/h/thumbnail.jpg',
--                        'title' => 'Product & > title < "',
--                    ])
--                )
--            ]);
-+            ->willReturn(
-+                [
-+                    new SitemapItem('category.html', '1.0', 'daily', '2012-12-21 00:00:00'),
-+                    new SitemapItem('/category/sub-category.html', '1.0', 'daily', '2012-12-21 00:00:00'),
-+                    new SitemapItem('product.html', '0.5', 'monthly', '0000-00-00 00:00:00'),
-+                    new SitemapItem(
-+                        'product2.html',
-+                        '0.5',
-+                        'monthly',
-+                        '2012-12-21 00:00:00',
-+                        new DataObject(
-+                            [
-+                                'collection' => [
-+                                    new DataObject(
-+                                        [
-+                                            'url' => $storeBaseMediaUrl . 'i/m/image1.png',
-+                                            'caption' => 'caption & > title < "'
-+                                        ]
-+                                    ),
-+                                    new DataObject(
-+                                        ['url' => $storeBaseMediaUrl . 'i/m/image_no_caption.png', 'caption' => null]
-+                                    ),
-+                                ],
-+                                'thumbnail' => $storeBaseMediaUrl . 't/h/thumbnail.jpg',
-+                                'title' => 'Product & > title < "',
-+                            ]
-+                        )
-+                    )
-+                ]
-+            );
- 
-         /** @var $model Sitemap */
-         $model = $this->getMockBuilder(Sitemap::class)
-@@ -598,6 +604,9 @@ class SitemapTest extends \PHPUnit\Framework\TestCase
-             ->getMockForAbstractClass();
- 
-         $objectManager = new ObjectManager($this);
-+        $escaper = $objectManager->getObject(
-+            \Magento\Framework\Escaper::class
-+        );
-         $constructArguments = $objectManager->getConstructArguments(
-             Sitemap::class,
-             [
-@@ -609,6 +618,7 @@ class SitemapTest extends \PHPUnit\Framework\TestCase
-                 'filesystem' => $this->filesystemMock,
-                 'itemProvider' => $this->itemProviderMock,
-                 'configReader' => $this->configReaderMock,
-+                'escaper' => $escaper
-             ]
-         );
-         $constructArguments['resource'] = null;
-diff --git a/app/code/Magento/Sitemap/etc/db_schema.xml b/app/code/Magento/Sitemap/etc/db_schema.xml
-index 82a9b8ef514..b3c028b626b 100644
---- a/app/code/Magento/Sitemap/etc/db_schema.xml
-+++ b/app/code/Magento/Sitemap/etc/db_schema.xml
-@@ -16,12 +16,12 @@
-         <column xsi:type="timestamp" name="sitemap_time" on_update="false" nullable="true" comment="Sitemap Time"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="sitemap_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="SITEMAP_STORE_ID_STORE_STORE_ID" table="sitemap" column="store_id"
-+        <constraint xsi:type="foreign" referenceId="SITEMAP_STORE_ID_STORE_STORE_ID" table="sitemap" column="store_id"
-                     referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <index name="SITEMAP_STORE_ID" indexType="btree">
-+        <index referenceId="SITEMAP_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml
-index cdaa6575d55..632768e4a5f 100644
---- a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml
-+++ b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.sitemap.container.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">sitemapGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Sitemap\Model\ResourceModel\Sitemap\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Sitemap\Model\ResourceModel\Sitemap\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">sitemap_id</argument>
-                 </arguments>
-                 <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="adminhtml.sitemap.container.grid.columnSet" as="grid.columnSet">
-diff --git a/app/code/Magento/Store/Api/StoreResolverInterface.php b/app/code/Magento/Store/Api/StoreResolverInterface.php
-index 7eb28729ec2..7c32e321fa6 100644
---- a/app/code/Magento/Store/Api/StoreResolverInterface.php
-+++ b/app/code/Magento/Store/Api/StoreResolverInterface.php
-@@ -8,8 +8,8 @@ namespace Magento\Store\Api;
- /**
-  * Store resolver interface
-  *
-- * @api
-- * @since 100.0.2
-+ * @deprecated
-+ * @see \Magento\Store\Model\StoreManagerInterface
-  */
- interface StoreResolverInterface
- {
-diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php
-index 6ec6cf01bc7..0d34179d3c6 100644
---- a/app/code/Magento/Store/App/Action/Plugin/Context.php
-+++ b/app/code/Magento/Store/App/Action/Plugin/Context.php
-@@ -9,10 +9,8 @@ namespace Magento\Store\App\Action\Plugin;
- use Magento\Framework\App\Http\Context as HttpContext;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Exception\NotFoundException;
--use Magento\Framework\Phrase;
- use Magento\Store\Api\Data\StoreInterface;
- use Magento\Store\Api\StoreCookieManagerInterface;
--use Magento\Store\Api\StoreResolverInterface;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\Framework\App\Action\AbstractAction;
- use Magento\Framework\App\RequestInterface;
-@@ -80,7 +78,7 @@ class Context
- 
-         /** @var string|array|null $storeCode */
-         $storeCode = $request->getParam(
--            StoreResolverInterface::PARAM_NAME,
-+            \Magento\Store\Model\StoreManagerInterface::PARAM_NAME,
-             $this->storeCookieManager->getStoreCodeFromCookie()
-         );
-         if (is_array($storeCode)) {
-@@ -106,7 +104,7 @@ class Context
-     /**
-      * Take action in case of invalid store requested.
-      *
--     * @param \Throwable|null  $previousException
-+     * @param \Throwable|null $previousException
-      * @return void
-      * @throws NotFoundException
-      */
-diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
-index 3fa78dc94aa..fad0d07c3a0 100644
---- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php
-+++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
-@@ -3,56 +3,75 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--namespace Magento\Store\App\Request;
-+declare(strict_types=1);
- 
--use Magento\Framework\Exception\NoSuchEntityException;
--use Magento\Store\Model\Store;
-+namespace Magento\Store\App\Request;
- 
-+/**
-+ * Processes the path and looks for the store in the url and removes it and modifies the path accordingly.
-+ */
- class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface
- {
-     /**
--     * @var \Magento\Store\Model\StoreManagerInterface
-+     * @var StorePathInfoValidator
-      */
--    private $storeManager;
-+    private $storePathInfoValidator;
- 
-     /**
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-+     * @var \Magento\Framework\App\Config\ReinitableConfigInterface
-      */
--    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
--    {
--        $this->storeManager = $storeManager;
-+    private $config;
-+
-+    /**
-+     * @param \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator
-+     * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
-+     */
-+    public function __construct(
-+        \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator,
-+        \Magento\Framework\App\Config\ReinitableConfigInterface $config
-+    ) {
-+        $this->storePathInfoValidator = $storePathInfoValidator;
-+        $this->config = $config;
-     }
- 
-     /**
--     * Process path info
-+     * Process path info and remove store from pathInfo.
-+     *
-+     * This method also sets request to no route if store is not valid and store is present in url config is enabled
-      *
-      * @param \Magento\Framework\App\RequestInterface $request
-      * @param string $pathInfo
-      * @return string
-      */
--    public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo)
-+    public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo) : string
-     {
--        $pathParts = explode('/', ltrim($pathInfo, '/'), 2);
--        $storeCode = $pathParts[0];
--
--        try {
--            /** @var \Magento\Store\Api\Data\StoreInterface $store */
--            $store = $this->storeManager->getStore($storeCode);
--        } catch (NoSuchEntityException $e) {
--            return $pathInfo;
--        }
--
--        if ($store->isUseStoreInUrl()) {
--            if (!$request->isDirectAccessFrontendName($storeCode) && $storeCode != Store::ADMIN_CODE) {
--                $this->storeManager->setCurrentStore($store->getCode());
--                $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
--                return $pathInfo;
--            } elseif (!empty($storeCode)) {
--                $request->setActionName('noroute');
--                return $pathInfo;
-+        //can store code be used in url
-+        if ((bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL)) {
-+            $storeCode = $this->storePathInfoValidator->getValidStoreCode($request, $pathInfo);
-+            if (!empty($storeCode)) {
-+                if (!$request->isDirectAccessFrontendName($storeCode)) {
-+                    $pathInfo = $this->trimStoreCodeFromPathInfo($pathInfo, $storeCode);
-+                } else {
-+                    //no route in case we're trying to access a store that has the same code as a direct access
-+                    $request->setActionName(\Magento\Framework\App\Router\Base::NO_ROUTE);
-+                }
-             }
--            return $pathInfo;
-         }
-         return $pathInfo;
-     }
-+
-+    /**
-+     * Trim store code from path info string if exists
-+     *
-+     * @param string $pathInfo
-+     * @param string $storeCode
-+     * @return string
-+     */
-+    private function trimStoreCodeFromPathInfo(string $pathInfo, string $storeCode) : ?string
-+    {
-+        if (substr($pathInfo, 0, strlen('/' . $storeCode)) == '/'. $storeCode) {
-+            $pathInfo = substr($pathInfo, strlen($storeCode)+1);
-+        }
-+        return empty($pathInfo) ? '/' : $pathInfo;
-+    }
- }
-diff --git a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php
-new file mode 100644
-index 00000000000..0b66ba75860
---- /dev/null
-+++ b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php
-@@ -0,0 +1,102 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Store\App\Request;
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Store\Model\Store;
-+
-+/**
-+ * Gets the store from the path if valid
-+ */
-+class StorePathInfoValidator
-+{
-+    /**
-+     * Store Config
-+     *
-+     * @var \Magento\Framework\App\Config\ReinitableConfigInterface
-+     */
-+    private $config;
-+
-+    /**
-+     * @var \Magento\Store\Api\StoreRepositoryInterface
-+     */
-+    private $storeRepository;
-+
-+    /**
-+     * @var \Magento\Framework\App\Request\PathInfo
-+     */
-+    private $pathInfo;
-+
-+    /**
-+     * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
-+     * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository
-+     * @param \Magento\Framework\App\Request\PathInfo $pathInfo
-+     */
-+    public function __construct(
-+        \Magento\Framework\App\Config\ReinitableConfigInterface $config,
-+        \Magento\Store\Api\StoreRepositoryInterface $storeRepository,
-+        \Magento\Framework\App\Request\PathInfo $pathInfo
-+    ) {
-+        $this->config = $config;
-+        $this->storeRepository = $storeRepository;
-+        $this->pathInfo = $pathInfo;
-+    }
-+
-+    /**
-+     * Get store code from path info validate if config value. If path info is empty the try to calculate from request.
-+     *
-+     * @param \Magento\Framework\App\Request\Http $request
-+     * @param string $pathInfo
-+     * @return string|null
-+     */
-+    public function getValidStoreCode(
-+        \Magento\Framework\App\Request\Http $request,
-+        string $pathInfo = ''
-+    ) : ?string {
-+        if (empty($pathInfo)) {
-+            $pathInfo = $this->pathInfo->getPathInfo(
-+                $request->getRequestUri(),
-+                $request->getBaseUrl()
-+            );
-+        }
-+        $storeCode = $this->getStoreCode($pathInfo);
-+        if (!empty($storeCode)
-+            && $storeCode != Store::ADMIN_CODE
-+            && (bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL)
-+        ) {
-+            try {
-+                $this->storeRepository->getActiveStoreByCode($storeCode);
-+
-+                if ((bool)$this->config->getValue(
-+                    \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
-+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-+                    $storeCode
-+                )) {
-+                    return $storeCode;
-+                }
-+            } catch (NoSuchEntityException $e) {
-+                //return null;
-+            } catch (\Magento\Store\Model\StoreIsInactiveException $e) {
-+                //return null;
-+            }
-+        }
-+        return null;
-+    }
-+
-+    /**
-+     * Get store code from path info string
-+     *
-+     * @param string $pathInfo
-+     * @return string
-+     */
-+    private function getStoreCode(string $pathInfo) : string
-+    {
-+        $pathParts = explode('/', ltrim($pathInfo, '/'), 2);
-+        return current($pathParts);
-+    }
-+}
-diff --git a/app/code/Magento/Store/App/Response/Redirect.php b/app/code/Magento/Store/App/Response/Redirect.php
-index 534c6be41c9..3ad6a86db69 100644
---- a/app/code/Magento/Store/App/Response/Redirect.php
-+++ b/app/code/Magento/Store/App/Response/Redirect.php
-@@ -7,8 +7,9 @@
-  */
- namespace Magento\Store\App\Response;
- 
--use Magento\Store\Api\StoreResolverInterface;
--
-+/**
-+ * Class Redirect computes redirect urls responses.
-+ */
- class Redirect implements \Magento\Framework\App\Response\RedirectInterface
- {
-     /**
-@@ -76,6 +77,8 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
-     }
- 
-     /**
-+     * Get the referrer url.
-+     *
-      * @return string
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-@@ -164,10 +167,7 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
-     }
- 
-     /**
--     * {@inheritdoc}
--     *
--     * @param array $arguments
--     * @return array
-+     * @inheritdoc
-      */
-     public function updatePathParams(array $arguments)
-     {
-@@ -248,10 +248,10 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
-         $store = $this->_storeManager->getStore();
- 
-         if ($store
--            && !empty($refererQuery[StoreResolverInterface::PARAM_NAME])
--            && ($refererQuery[StoreResolverInterface::PARAM_NAME] !== $store->getCode())
-+            && !empty($refererQuery[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME])
-+            && ($refererQuery[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME] !== $store->getCode())
-         ) {
--            $refererQuery[StoreResolverInterface::PARAM_NAME] = $store->getCode();
-+            $refererQuery[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME] = $store->getCode();
-         }
- 
-         return $refererQuery;
-diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php
-index 58a7ba3c1c2..f15349f1106 100644
---- a/app/code/Magento/Store/Block/Switcher.php
-+++ b/app/code/Magento/Store/Block/Switcher.php
-@@ -10,7 +10,6 @@
- namespace Magento\Store\Block;
- 
- use Magento\Directory\Helper\Data;
--use Magento\Store\Api\StoreResolverInterface;
- use Magento\Store\Model\Group;
- use Magento\Store\Model\Store;
- use Magento\Framework\App\ActionInterface;
-@@ -18,6 +17,8 @@ use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Url\Helper\Data as UrlHelper;
- 
- /**
-+ * Switcher block
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -39,8 +40,6 @@ class Switcher extends \Magento\Framework\View\Element\Template
-     private $urlHelper;
- 
-     /**
--     * Constructs
--     *
-      * @param \Magento\Framework\View\Element\Template\Context $context
-      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
-      * @param array $data
-@@ -58,6 +57,8 @@ class Switcher extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get current website Id.
-+     *
-      * @return int|null|string
-      */
-     public function getCurrentWebsiteId()
-@@ -66,6 +67,8 @@ class Switcher extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get current group Id.
-+     *
-      * @return int|null|string
-      */
-     public function getCurrentGroupId()
-@@ -74,6 +77,8 @@ class Switcher extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get current Store Id.
-+     *
-      * @return int
-      */
-     public function getCurrentStoreId()
-@@ -82,6 +87,8 @@ class Switcher extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get raw groups.
-+     *
-      * @return array
-      */
-     public function getRawGroups()
-@@ -99,6 +106,8 @@ class Switcher extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get raw stores.
-+     *
-      * @return array
-      */
-     public function getRawStores()
-@@ -170,6 +179,8 @@ class Switcher extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get stores.
-+     *
-      * @return \Magento\Store\Model\Store[]
-      */
-     public function getStores()
-@@ -189,6 +200,8 @@ class Switcher extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get current store code.
-+     *
-      * @return string
-      */
-     public function getCurrentStoreCode()
-@@ -197,6 +210,8 @@ class Switcher extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Is store in url.
-+     *
-      * @return bool
-      */
-     public function isStoreInUrl()
-@@ -208,7 +223,7 @@ class Switcher extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
--     * Get store code
-+     * Get store code.
-      *
-      * @return string
-      */
-@@ -218,7 +233,7 @@ class Switcher extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
--     * Get store name
-+     * Get store name.
-      *
-      * @return null|string
-      */
-@@ -228,7 +243,7 @@ class Switcher extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
--     * Returns target store post data
-+     * Returns target store post data.
-      *
-      * @param Store $store
-      * @param array $data
-@@ -237,7 +252,7 @@ class Switcher extends \Magento\Framework\View\Element\Template
-      */
-     public function getTargetStorePostData(Store $store, $data = [])
-     {
--        $data[\Magento\Store\Api\StoreResolverInterface::PARAM_NAME] = $store->getCode();
-+        $data[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME] = $store->getCode();
-         $data['___from_store'] = $this->_storeManager->getStore()->getCode();
- 
-         $urlOnTargetStore = $store->getCurrentUrl(false);
-diff --git a/app/code/Magento/Store/Controller/Store/SwitchAction.php b/app/code/Magento/Store/Controller/Store/SwitchAction.php
-index df946b45d60..d8ac1b308d7 100644
---- a/app/code/Magento/Store/Controller/Store/SwitchAction.php
-+++ b/app/code/Magento/Store/Controller/Store/SwitchAction.php
-@@ -4,6 +4,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Store\Controller\Store;
- 
-@@ -15,16 +16,18 @@ use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Store\Api\StoreCookieManagerInterface;
- use Magento\Store\Api\StoreRepositoryInterface;
- use Magento\Store\Model\StoreIsInactiveException;
--use Magento\Store\Model\StoreResolver;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\Store\Model\StoreSwitcher;
- use Magento\Store\Model\StoreSwitcherInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- 
- /**
-  * Handles store switching url and makes redirect.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class SwitchAction extends Action
-+class SwitchAction extends Action implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var StoreCookieManagerInterface
-@@ -81,16 +84,20 @@ class SwitchAction extends Action
-     }
- 
-     /**
-+     * Execute action
-+     *
-      * @return void
-      * @throws StoreSwitcher\CannotSwitchStoreException
-      */
-     public function execute()
-     {
-         $targetStoreCode = $this->_request->getParam(
--            StoreResolver::PARAM_NAME,
-+            \Magento\Store\Model\StoreManagerInterface::PARAM_NAME
-+        );
-+        $fromStoreCode = $this->_request->getParam(
-+            '___from_store',
-             $this->storeCookieManager->getStoreCodeFromCookie()
-         );
--        $fromStoreCode = $this->_request->getParam('___from_store');
- 
-         $requestedUrlToRedirect = $this->_redirect->getRedirectUrl();
-         $redirectUrl = $requestedUrlToRedirect;
-diff --git a/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php b/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php
-index cfa13e65ea4..4d4021f5528 100644
---- a/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php
-+++ b/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php
-@@ -6,8 +6,8 @@
- namespace Magento\Store\Model\Argument\Interpreter;
- 
- use Magento\Framework\Data\Argument\InterpreterInterface;
--use Magento\Store\Api\StoreResolverInterface;
- use Magento\Store\Model\StoreRepository;
-+use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * Interpreter that builds Service URL by input path and optional parameters
-@@ -25,9 +25,9 @@ class ServiceUrl implements InterpreterInterface
-     private $service;
- 
-     /**
--     * @var StoreResolverInterface
-+     * @var StoreManagerInterface
-      */
--    private $storeResolver;
-+    private $storeManager;
- 
-     /**
-      * @var string
-@@ -41,21 +41,21 @@ class ServiceUrl implements InterpreterInterface
- 
-     /**
-      * @param \Magento\Framework\Url $url
--     * @param StoreResolverInterface $storeResolver
-+     * @param StoreManagerInterface $storeManager
-      * @param StoreRepository $storeRepository
-      * @param string $service
-      * @param string $version
-      */
-     public function __construct(
-         \Magento\Framework\Url $url,
--        StoreResolverInterface $storeResolver,
-+        StoreManagerInterface $storeManager,
-         StoreRepository $storeRepository,
-         $service = "rest",
-         $version = "V1"
-     ) {
-         $this->url = $url;
-         $this->service = $service;
--        $this->storeResolver = $storeResolver;
-+        $this->storeManager = $storeManager;
-         $this->version = $version;
-         $this->storeRepository = $storeRepository;
-     }
-@@ -67,14 +67,16 @@ class ServiceUrl implements InterpreterInterface
-      */
-     private function getServiceUrl()
-     {
--        $store = $this->storeRepository->getById($this->storeResolver->getCurrentStoreId());
-+        $store = $this->storeRepository->getById($this->storeManager->getStore()->getId());
-         return $this->url->getUrl(
-             $this->service . "/" . $store->getCode() . "/" . $this->version
-         );
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Compute and return effective value of an argument
-+     *
-+     * @param array $data
-      * @return string
-      * @throws \InvalidArgumentException
-      */
-diff --git a/app/code/Magento/Store/Model/BaseUrlChecker.php b/app/code/Magento/Store/Model/BaseUrlChecker.php
-index b65a76e8806..dbdcd9ff17b 100644
---- a/app/code/Magento/Store/Model/BaseUrlChecker.php
-+++ b/app/code/Magento/Store/Model/BaseUrlChecker.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Store\Model;
- 
-+use Magento\Store\Model\ScopeInterface;
-+
- /**
-  * Verifies that the requested URL matches to base URL of store.
-  */
-@@ -16,6 +18,8 @@ class BaseUrlChecker
-     private $scopeConfig;
- 
-     /**
-+     * BaseUrlChecker constructor.
-+     *
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      */
-     public function __construct(
-@@ -47,9 +51,9 @@ class BaseUrlChecker
-      */
-     public function isEnabled()
-     {
--        return (bool) $this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             'web/url/redirect_to_base',
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         );
-     }
- 
-@@ -62,13 +66,13 @@ class BaseUrlChecker
-     {
-         $baseUrl = $this->scopeConfig->getValue(
-             'web/unsecure/base_url',
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         );
-         $baseUrlParts = explode('://', $baseUrl);
-         $baseUrlProtocol = array_shift($baseUrlParts);
--        $isSecure = (bool) $this->scopeConfig->getValue(
-+        $isSecure = $this->scopeConfig->isSetFlag(
-             'web/secure/use_in_frontend',
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         );
- 
-         return $isSecure && $baseUrlProtocol == 'https';
-diff --git a/app/code/Magento/Store/Model/Config/Importer/Processor/Create.php b/app/code/Magento/Store/Model/Config/Importer/Processor/Create.php
-index 513ba048029..1fb9f1c224d 100644
---- a/app/code/Magento/Store/Model/Config/Importer/Processor/Create.php
-+++ b/app/code/Magento/Store/Model/Config/Importer/Processor/Create.php
-@@ -17,8 +17,6 @@ use Magento\Store\Model\WebsiteFactory;
- 
- /**
-  * The processor for creating of new entities.
-- *
-- * {@inheritdoc}
-  */
- class Create implements ProcessorInterface
- {
-@@ -85,7 +83,9 @@ class Create implements ProcessorInterface
-     /**
-      * Creates entities in application according to the data set.
-      *
--     * {@inheritdoc}
-+     * @param array $data The data to be processed
-+     * @return void
-+     * @throws RuntimeException If processor was unable to finish execution
-      */
-     public function run(array $data)
-     {
-@@ -177,8 +177,11 @@ class Create implements ProcessorInterface
-             );
- 
-             $group = $this->groupFactory->create();
-+            if (!isset($groupData['root_category_id'])) {
-+                $groupData['root_category_id'] = 0;
-+            }
-+            
-             $group->setData($groupData);
--            $group->setRootCategoryId(0);
- 
-             $group->getResource()->save($group);
-             $group->getResource()->addCommitCallback(function () use ($data, $group, $website) {
-@@ -227,8 +230,7 @@ class Create implements ProcessorInterface
-     }
- 
-     /**
--     * Searches through given websites and compares with current websites.
--     * Returns found website.
-+     * Searches through given websites and compares with current websites and returns found website.
-      *
-      * @param array $data The data to be searched in
-      * @param string $websiteId The website id
-@@ -250,8 +252,7 @@ class Create implements ProcessorInterface
-     }
- 
-     /**
--     * Searches through given groups and compares with current websites.
--     * Returns found group.
-+     * Searches through given groups and compares with current websites and returns found group.
-      *
-      * @param array $data The data to be searched in
-      * @param string $groupId The group id
-@@ -273,8 +274,7 @@ class Create implements ProcessorInterface
-     }
- 
-     /**
--     * Searches through given stores and compares with current stores.
--     * Returns found store.
-+     * Searches through given stores and compares with current stores and returns found store.
-      *
-      * @param array $data The data to be searched in
-      * @param string $storeId The store id
-diff --git a/app/code/Magento/Store/Model/Group.php b/app/code/Magento/Store/Model/Group.php
-index ccc3c654914..4cd7bc93d33 100644
---- a/app/code/Magento/Store/Model/Group.php
-+++ b/app/code/Magento/Store/Model/Group.php
-@@ -100,18 +100,24 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-      */
-     private $eventManager;
- 
-+    /**
-+     * @var \Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface
-+     */
-+    private $pillPut;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
-      * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
-      * @param \Magento\Config\Model\ResourceModel\Config\Data $configDataResource
--     * @param \Magento\Store\Model\Store $store
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
--     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-+     * @param ResourceModel\Store\CollectionFactory $storeListFactory
-+     * @param StoreManagerInterface $storeManager
-+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
-+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
-      * @param array $data
-      * @param \Magento\Framework\Event\ManagerInterface|null $eventManager
-+     * @param \Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface|null $pillPut
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -125,13 +131,16 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-         array $data = [],
--        \Magento\Framework\Event\ManagerInterface $eventManager = null
-+        \Magento\Framework\Event\ManagerInterface $eventManager = null,
-+        \Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface $pillPut = null
-     ) {
-         $this->_configDataResource = $configDataResource;
-         $this->_storeListFactory = $storeListFactory;
-         $this->_storeManager = $storeManager;
-         $this->eventManager = $eventManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-             ->get(\Magento\Framework\Event\ManagerInterface::class);
-+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(\Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface::class);
-         parent::__construct(
-             $context,
-             $registry,
-@@ -244,6 +253,8 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Get stores count
-+     *
-      * @return int
-      */
-     public function getStoresCount()
-@@ -349,6 +360,8 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Get default store id
-+     *
-      * @return mixed
-      */
-     public function getDefaultStoreId()
-@@ -365,6 +378,8 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Get root category id
-+     *
-      * @return mixed
-      */
-     public function getRootCategoryId()
-@@ -381,6 +396,8 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Get website id
-+     *
-      * @return mixed
-      */
-     public function getWebsiteId()
-@@ -397,7 +414,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * @return $this
-+     * @inheritdoc
-      */
-     public function beforeDelete()
-     {
-@@ -445,6 +462,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-             $this->_storeManager->reinitStores();
-             $this->eventManager->dispatch($this->_eventPrefix . '_save', ['group' => $group]);
-         });
-+        $this->pillPut->put();
-         return parent::afterSave();
-     }
- 
-@@ -473,7 +491,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getName()
-     {
-@@ -507,7 +525,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getExtensionAttributes()
-     {
-@@ -515,7 +533,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setExtensionAttributes(
-         \Magento\Store\Api\Data\GroupExtensionInterface $extensionAttributes
-@@ -524,7 +542,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.1.0
-      */
-     public function getScopeType()
-@@ -533,7 +551,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.1.0
-      */
-     public function getScopeTypeName()
-diff --git a/app/code/Magento/Store/Model/HeaderProvider/Hsts.php b/app/code/Magento/Store/Model/HeaderProvider/Hsts.php
-index 623fbed57e6..b22775e0987 100644
---- a/app/code/Magento/Store/Model/HeaderProvider/Hsts.php
-+++ b/app/code/Magento/Store/Model/HeaderProvider/Hsts.php
-@@ -33,6 +33,8 @@ class Hsts extends \Magento\Framework\App\Response\HeaderProvider\AbstractHeader
-     protected $scopeConfig;
- 
-     /**
-+     * Hsts constructor.
-+     *
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      */
-     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
-@@ -41,11 +43,11 @@ class Hsts extends \Magento\Framework\App\Response\HeaderProvider\AbstractHeader
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function canApply()
-     {
--        return (bool)$this->scopeConfig->isSetFlag(Store::XML_PATH_SECURE_IN_FRONTEND)
-+        return $this->scopeConfig->isSetFlag(Store::XML_PATH_SECURE_IN_FRONTEND)
-             && $this->scopeConfig->isSetFlag(Store::XML_PATH_SECURE_IN_ADMINHTML)
-             && $this->scopeConfig->isSetFlag(Store::XML_PATH_ENABLE_HSTS);
-     }
-diff --git a/app/code/Magento/Store/Model/HeaderProvider/UpgradeInsecure.php b/app/code/Magento/Store/Model/HeaderProvider/UpgradeInsecure.php
-index a0bd015c150..0ef8726e07f 100644
---- a/app/code/Magento/Store/Model/HeaderProvider/UpgradeInsecure.php
-+++ b/app/code/Magento/Store/Model/HeaderProvider/UpgradeInsecure.php
-@@ -33,6 +33,8 @@ class UpgradeInsecure extends \Magento\Framework\App\Response\HeaderProvider\Abs
-     protected $scopeConfig;
- 
-     /**
-+     * UpgradeInsecure constructor.
-+     *
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      */
-     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
-@@ -41,11 +43,11 @@ class UpgradeInsecure extends \Magento\Framework\App\Response\HeaderProvider\Abs
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function canApply()
-     {
--        return (bool)$this->scopeConfig->isSetFlag(Store::XML_PATH_SECURE_IN_FRONTEND)
-+        return $this->scopeConfig->isSetFlag(Store::XML_PATH_SECURE_IN_FRONTEND)
-             && $this->scopeConfig->isSetFlag(Store::XML_PATH_SECURE_IN_ADMINHTML)
-             && $this->scopeConfig->isSetFlag(Store::XML_PATH_ENABLE_UPGRADE_INSECURE);
-     }
-diff --git a/app/code/Magento/Store/Model/Plugin/StoreCookie.php b/app/code/Magento/Store/Model/Plugin/StoreCookie.php
-index 9fca86ab717..7aa2c91652e 100644
---- a/app/code/Magento/Store/Model/Plugin/StoreCookie.php
-+++ b/app/code/Magento/Store/Model/Plugin/StoreCookie.php
-@@ -12,8 +12,6 @@ use Magento\Store\Api\StoreRepositoryInterface;
- use Magento\Store\Model\StoreIsInactiveException;
- use Magento\Framework\Exception\NoSuchEntityException;
- use \InvalidArgumentException;
--use Magento\Store\Api\StoreResolverInterface;
--use Magento\Framework\App\ObjectManager;
- 
- /**
-  * Class StoreCookie
-@@ -35,27 +33,19 @@ class StoreCookie
-      */
-     protected $storeRepository;
- 
--    /**
--     * @var StoreResolverInterface
--     */
--    private $storeResolver;
--
-     /**
-      * @param StoreManagerInterface $storeManager
-      * @param StoreCookieManagerInterface $storeCookieManager
-      * @param StoreRepositoryInterface $storeRepository
--     * @param StoreResolverInterface $storeResolver
-      */
-     public function __construct(
-         StoreManagerInterface $storeManager,
-         StoreCookieManagerInterface $storeCookieManager,
--        StoreRepositoryInterface $storeRepository,
--        StoreResolverInterface $storeResolver = null
-+        StoreRepositoryInterface $storeRepository
-     ) {
-         $this->storeManager = $storeManager;
-         $this->storeCookieManager = $storeCookieManager;
-         $this->storeRepository = $storeRepository;
--        $this->storeResolver = $storeResolver ?: ObjectManager::getInstance()->get(StoreResolverInterface::class);
-     }
- 
-     /**
-diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
-index af259572574..f62762986cb 100644
---- a/app/code/Magento/Store/Model/Store.php
-+++ b/app/code/Magento/Store/Model/Store.php
-@@ -33,6 +33,7 @@ use Zend\Uri\UriFactory;
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @since 100.0.2
-  */
- class Store extends AbstractExtensibleModel implements
-@@ -325,6 +326,11 @@ class Store extends AbstractExtensibleModel implements
-      */
-     private $eventManager;
- 
-+    /**
-+     * @var \Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface
-+     */
-+    private $pillPut;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -351,6 +357,7 @@ class Store extends AbstractExtensibleModel implements
-      * @param bool $isCustomEntryPoint
-      * @param array $data optional generic object data
-      * @param \Magento\Framework\Event\ManagerInterface|null $eventManager
-+     * @param \Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface|null $pillPut
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -379,7 +386,8 @@ class Store extends AbstractExtensibleModel implements
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-         $isCustomEntryPoint = false,
-         array $data = [],
--        \Magento\Framework\Event\ManagerInterface $eventManager = null
-+        \Magento\Framework\Event\ManagerInterface $eventManager = null,
-+        \Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface $pillPut = null
-     ) {
-         $this->_coreFileStorageDatabase = $coreFileStorageDatabase;
-         $this->_config = $config;
-@@ -400,6 +408,8 @@ class Store extends AbstractExtensibleModel implements
-         $this->websiteRepository = $websiteRepository;
-         $this->eventManager = $eventManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-             ->get(\Magento\Framework\Event\ManagerInterface::class);
-+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(\Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface::class);
-         parent::__construct(
-             $context,
-             $registry,
-@@ -412,10 +422,15 @@ class Store extends AbstractExtensibleModel implements
-     }
- 
-     /**
--     * @return string[]
-+     * @inheritdoc
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $properties = parent::__sleep();
-         $properties = array_diff($properties, ['_coreFileStorageDatabase', '_config']);
-         return $properties;
-@@ -425,9 +440,14 @@ class Store extends AbstractExtensibleModel implements
-      * Init not serializable fields
-      *
-      * @return void
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
-         $this->_coreFileStorageDatabase = ObjectManager::getInstance()
-             ->get(\Magento\MediaStorage\Helper\File\Storage\Database::class);
-@@ -464,6 +484,7 @@ class Store extends AbstractExtensibleModel implements
-      * Validation rules for store
-      *
-      * @return \Zend_Validate_Interface|null
-+     * @throws \Zend_Validate_Exception
-      */
-     protected function _getValidationRulesBeforeSave()
-     {
-@@ -489,9 +510,11 @@ class Store extends AbstractExtensibleModel implements
-     /**
-      * Loading store data
-      *
--     * @param   mixed $key
--     * @param   string $field
--     * @return  $this
-+     * @param mixed $key
-+     * @param string $field
-+     *
-+     * @return $this
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function load($key, $field = null)
-     {
-@@ -566,6 +589,7 @@ class Store extends AbstractExtensibleModel implements
-      * Retrieve store website
-      *
-      * @return Website|bool
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getWebsite()
-     {
-@@ -578,9 +602,11 @@ class Store extends AbstractExtensibleModel implements
-     /**
-      * Retrieve url using store configuration specific
-      *
--     * @param   string $route
--     * @param   array $params
--     * @return  string
-+     * @param string $route
-+     * @param array $params
-+     *
-+     * @return string
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getUrl($route = '', $params = [])
-     {
-@@ -700,7 +726,8 @@ class Store extends AbstractExtensibleModel implements
-             if ($this->_isCustomEntryPoint()) {
-                 $indexFileName = 'index.php';
-             } else {
--                $indexFileName = basename($_SERVER['SCRIPT_FILENAME']);
-+                $scriptFilename = $this->_request->getServer('SCRIPT_FILENAME');
-+                $indexFileName = basename($scriptFilename);
-             }
-             $url .= $indexFileName . '/';
-         }
-@@ -786,7 +813,7 @@ class Store extends AbstractExtensibleModel implements
-     }
- 
-     /**
--     * @return bool
-+     * @inheritdoc
-      */
-     public function isUrlSecure()
-     {
-@@ -880,8 +907,10 @@ class Store extends AbstractExtensibleModel implements
-     /**
-      * Set current store currency code
-      *
--     * @param   string $code
--     * @return  string
-+     * @param string $code
-+     *
-+     * @return string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function setCurrentCurrencyCode($code)
-     {
-@@ -889,7 +918,10 @@ class Store extends AbstractExtensibleModel implements
-         if (in_array($code, $this->getAvailableCurrencyCodes())) {
-             $this->_getSession()->setCurrencyCode($code);
- 
--            $defaultCode = $this->_storeManager->getWebsite()->getDefaultStore()->getDefaultCurrency()->getCode();
-+            $defaultCode = ($this->_storeManager->getStore() !== null)
-+                ? $this->_storeManager->getStore()->getDefaultCurrency()->getCode()
-+                : $this->_storeManager->getWebsite()->getDefaultStore()->getDefaultCurrency()->getCode();
-+            
-             $this->_httpContext->setValue(Context::CONTEXT_CURRENCY, $code, $defaultCode);
-         }
-         return $this;
-@@ -902,23 +934,17 @@ class Store extends AbstractExtensibleModel implements
-      */
-     public function getCurrentCurrencyCode()
-     {
-+        $availableCurrencyCodes = \array_values($this->getAvailableCurrencyCodes(true));
-         // try to get currently set code among allowed
--        $code = $this->_httpContext->getValue(Context::CONTEXT_CURRENCY);
--        $code = $code === null ? $this->_getSession()->getCurrencyCode() : $code;
--        if (empty($code)) {
-+        $code = $this->_httpContext->getValue(Context::CONTEXT_CURRENCY) ?? $this->_getSession()->getCurrencyCode();
-+        if (empty($code) || !\in_array($code, $availableCurrencyCodes)) {
-             $code = $this->getDefaultCurrencyCode();
--        }
--        if (in_array($code, $this->getAvailableCurrencyCodes(true))) {
--            return $code;
-+            if (!\in_array($code, $availableCurrencyCodes) && !empty($availableCurrencyCodes)) {
-+                $code = $availableCurrencyCodes[0];
-+            }
-         }
- 
--        // take first one of allowed codes
--        $codes = array_values($this->getAvailableCurrencyCodes(true));
--        if (empty($codes)) {
--            // return default code, if no codes specified at all
--            return $this->getDefaultCurrencyCode();
--        }
--        return array_shift($codes);
-+        return $code;
-     }
- 
-     /**
-@@ -972,6 +998,7 @@ class Store extends AbstractExtensibleModel implements
-      * Retrieve store current currency
-      *
-      * @return Currency
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getCurrentCurrency()
-     {
-@@ -994,6 +1021,7 @@ class Store extends AbstractExtensibleModel implements
-      * Retrieve current currency rate
-      *
-      * @return float
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getCurrentCurrencyRate()
-     {
-@@ -1004,6 +1032,7 @@ class Store extends AbstractExtensibleModel implements
-      * Retrieve root category identifier
-      *
-      * @return int
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getRootCategoryId()
-     {
-@@ -1029,6 +1058,7 @@ class Store extends AbstractExtensibleModel implements
-      * Retrieve group model
-      *
-      * @return Group|bool
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getGroup()
-     {
-@@ -1067,6 +1097,7 @@ class Store extends AbstractExtensibleModel implements
-         $this->getResource()->addCommitCallback(function () use ($event, $store) {
-             $this->eventManager->dispatch($event, ['store' => $store]);
-         });
-+        $this->pillPut->put();
-         return parent::afterSave();
-     }
- 
-@@ -1136,6 +1167,7 @@ class Store extends AbstractExtensibleModel implements
-      * Check if store can be deleted
-      *
-      * @return boolean
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function isCanDelete()
-     {
-@@ -1151,6 +1183,7 @@ class Store extends AbstractExtensibleModel implements
-      *
-      * @return boolean
-      * @since 100.1.0
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function isDefault()
-     {
-@@ -1164,9 +1197,11 @@ class Store extends AbstractExtensibleModel implements
-      * Retrieve current url for store
-      *
-      * @param bool $fromStore
-+     *
-      * @return string
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getCurrentUrl($fromStore = true)
-     {
-@@ -1242,6 +1277,7 @@ class Store extends AbstractExtensibleModel implements
-      * Protect delete from non admin area
-      *
-      * @return $this
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function beforeDelete()
-     {
-@@ -1253,6 +1289,7 @@ class Store extends AbstractExtensibleModel implements
-      * Rewrite in order to clear configuration cache
-      *
-      * @return $this
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function afterDelete()
-     {
-@@ -1312,6 +1349,7 @@ class Store extends AbstractExtensibleModel implements
-      * Retrieve store group name
-      *
-      * @return string
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function getFrontendName()
-     {
-@@ -1344,17 +1382,18 @@ class Store extends AbstractExtensibleModel implements
-     }
- 
-     /**
-+     * Return Store Path
-+     *
-      * @return string
-      */
-     public function getStorePath()
-     {
-         $parsedUrl = parse_url($this->getBaseUrl());
--        return isset($parsedUrl['path']) ? $parsedUrl['path'] : '/';
-+        return $parsedUrl['path'] ?? '/';
-     }
- 
-     /**
--     * {@inheritdoc}
--     * @since 100.1.0
-+     * @inheritdoc
-      */
-     public function getScopeType()
-     {
-@@ -1362,8 +1401,7 @@ class Store extends AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
--     * @since 100.1.0
-+     * @inheritdoc
-      */
-     public function getScopeTypeName()
-     {
-@@ -1371,7 +1409,7 @@ class Store extends AbstractExtensibleModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getExtensionAttributes()
-     {
-@@ -1379,8 +1417,7 @@ class Store extends AbstractExtensibleModel implements
-     }
- 
-     /**
--     * @param \Magento\Store\Api\Data\StoreExtensionInterface $extensionAttributes
--     * @return $this
-+     * @inheritdoc
-      */
-     public function setExtensionAttributes(
-         \Magento\Store\Api\Data\StoreExtensionInterface $extensionAttributes
-diff --git a/app/code/Magento/Store/Model/StoreManager.php b/app/code/Magento/Store/Model/StoreManager.php
-index 445824baadf..c3137150c80 100644
---- a/app/code/Magento/Store/Model/StoreManager.php
-+++ b/app/code/Magento/Store/Model/StoreManager.php
-@@ -6,6 +6,7 @@
- namespace Magento\Store\Model;
- 
- use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Store\Api\StoreResolverInterface;
- use Magento\Store\Model\ResourceModel\StoreWebsiteRelation;
- 
-@@ -68,7 +69,7 @@ class StoreManager implements
-     /**
-      * Default store code
-      *
--     * @var string
-+     * @var string|int|\Magento\Store\Api\Data\StoreInterface
-      */
-     protected $currentStoreId = null;
- 
-@@ -87,6 +88,8 @@ class StoreManager implements
-     protected $isSingleStoreAllowed;
- 
-     /**
-+     * StoreManager constructor.
-+     *
-      * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository
-      * @param \Magento\Store\Api\GroupRepositoryInterface $groupRepository
-      * @param \Magento\Store\Api\WebsiteRepositoryInterface $websiteRepository
-@@ -114,7 +117,7 @@ class StoreManager implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCurrentStore($store)
-     {
-@@ -122,7 +125,7 @@ class StoreManager implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setIsSingleStoreModeAllowed($value)
-     {
-@@ -130,7 +133,7 @@ class StoreManager implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function hasSingleStore()
-     {
-@@ -139,7 +142,7 @@ class StoreManager implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isSingleStoreMode()
-     {
-@@ -147,7 +150,7 @@ class StoreManager implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getStore($storeId = null)
-     {
-@@ -171,7 +174,7 @@ class StoreManager implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getStores($withDefault = false, $codeKey = false)
-     {
-@@ -190,7 +193,7 @@ class StoreManager implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getWebsite($websiteId = null)
-     {
-@@ -210,7 +213,7 @@ class StoreManager implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getWebsites($withDefault = false, $codeKey = false)
-     {
-@@ -229,7 +232,7 @@ class StoreManager implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function reinitStores()
-     {
-@@ -242,7 +245,7 @@ class StoreManager implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDefaultStoreView()
-     {
-@@ -252,7 +255,7 @@ class StoreManager implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getGroup($groupId = null)
-     {
-@@ -267,7 +270,7 @@ class StoreManager implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getGroups($withDefault = false)
-     {
-@@ -291,13 +294,15 @@ class StoreManager implements
-      */
-     protected function isSingleStoreModeEnabled()
-     {
--        return (bool)$this->scopeConfig->getValue(
-+        return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_SINGLE_STORE_MODE_ENABLED,
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+            ScopeInterface::SCOPE_STORE
-         );
-     }
- 
-     /**
-+     * Get Store Website Relation
-+     *
-      * @deprecated 100.2.0
-      * @return StoreWebsiteRelation
-      */
-diff --git a/app/code/Magento/Store/Model/StoreManagerInterface.php b/app/code/Magento/Store/Model/StoreManagerInterface.php
-index 220155c47f6..6f9aed16b39 100644
---- a/app/code/Magento/Store/Model/StoreManagerInterface.php
-+++ b/app/code/Magento/Store/Model/StoreManagerInterface.php
-@@ -21,6 +21,11 @@ interface StoreManagerInterface
-      */
-     const CONTEXT_STORE = 'store';
- 
-+    /**
-+     * The store GET Param name
-+     */
-+    const PARAM_NAME = '___store';
-+
-     /**
-      * Allow or disallow single store mode
-      *
-@@ -112,7 +117,7 @@ interface StoreManagerInterface
-     /**
-      * Set current default store
-      *
--     * @param string $store
-+     * @param string|int|\Magento\Store\Api\Data\StoreInterface $store
-      * @return void
-      */
-     public function setCurrentStore($store);
-diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php
-index 3f449f10c6d..aafdd151389 100644
---- a/app/code/Magento/Store/Model/StoreResolver.php
-+++ b/app/code/Magento/Store/Model/StoreResolver.php
-@@ -3,10 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--namespace Magento\Store\Model;
-+declare(strict_types=1);
- 
--use Magento\Framework\Serialize\SerializerInterface;
-+namespace Magento\Store\Model;
- 
-+/**
-+ * Class used to resolve store from url path or get parameters or cookie.
-+ */
- class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
- {
-     /**
-@@ -25,12 +28,12 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
-     protected $storeCookieManager;
- 
-     /**
--     * @var \Magento\Framework\Cache\FrontendInterface
-+     * @deprecated
-      */
-     protected $cache;
- 
-     /**
--     * @var \Magento\Store\Model\StoreResolver\ReaderList
-+     * @deprecated
-      */
-     protected $readerList;
- 
-@@ -45,56 +48,70 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
-     protected $scopeCode;
- 
-     /**
--     * @var \Magento\Framework\App\RequestInterface
-+     * @var \Magento\Framework\App\Request\Http
-      */
-     protected $request;
- 
-     /**
--     * @var \Magento\Framework\Serialize\SerializerInterface
-+     * @var StoresData
-+     */
-+    private $storesData;
-+
-+    /**
-+     * @var \Magento\Store\App\Request\StorePathInfoValidator
-      */
--    private $serializer;
-+    private $storePathInfoValidator;
- 
-     /**
-      * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository
-      * @param \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager
--     * @param \Magento\Framework\App\RequestInterface $request
--     * @param \Magento\Framework\Cache\FrontendInterface $cache
--     * @param \Magento\Store\Model\StoreResolver\ReaderList $readerList
--     * @param string $runMode
--     * @param null $scopeCode
-+     * @param \Magento\Framework\App\Request\Http $request
-+     * @param \Magento\Store\Model\StoresData $storesData
-+     * @param \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator
-+     * @param string|null $runMode
-+     * @param string|null $scopeCode
-      */
-     public function __construct(
-         \Magento\Store\Api\StoreRepositoryInterface $storeRepository,
-         \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager,
--        \Magento\Framework\App\RequestInterface $request,
--        \Magento\Framework\Cache\FrontendInterface $cache,
--        \Magento\Store\Model\StoreResolver\ReaderList $readerList,
-+        \Magento\Framework\App\Request\Http $request,
-+        \Magento\Store\Model\StoresData $storesData,
-+        \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator,
-         $runMode = ScopeInterface::SCOPE_STORE,
-         $scopeCode = null
-     ) {
-         $this->storeRepository = $storeRepository;
-         $this->storeCookieManager = $storeCookieManager;
-         $this->request = $request;
--        $this->cache = $cache;
--        $this->readerList = $readerList;
-+        $this->storePathInfoValidator = $storePathInfoValidator;
-+        $this->storesData = $storesData;
-         $this->runMode = $scopeCode ? $runMode : ScopeInterface::SCOPE_WEBSITE;
-         $this->scopeCode = $scopeCode;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCurrentStoreId()
-     {
-         list($stores, $defaultStoreId) = $this->getStoresData();
- 
--        $storeCode = $this->request->getParam(self::PARAM_NAME, $this->storeCookieManager->getStoreCodeFromCookie());
-+        $storeCode = $this->storePathInfoValidator->getValidStoreCode($this->request);
-+
-+        if (!$storeCode) {
-+            $storeCode = $this->request->getParam(
-+                \Magento\Store\Model\StoreManagerInterface::PARAM_NAME,
-+                $this->storeCookieManager->getStoreCodeFromCookie()
-+            );
-+        }
-+
-         if (is_array($storeCode)) {
-             if (!isset($storeCode['_data']['code'])) {
-                 throw new \InvalidArgumentException(__('Invalid store parameter.'));
-             }
-             $storeCode = $storeCode['_data']['code'];
-         }
-+
-         if ($storeCode) {
-             try {
-                 $store = $this->getRequestedStoreByCode($storeCode);
-@@ -116,28 +133,21 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
-      *
-      * @return array
-      */
--    protected function getStoresData()
-+    protected function getStoresData() : array
-     {
--        $cacheKey = 'resolved_stores_' . md5($this->runMode . $this->scopeCode);
--        $cacheData = $this->cache->load($cacheKey);
--        if ($cacheData) {
--            $storesData = $this->getSerializer()->unserialize($cacheData);
--        } else {
--            $storesData = $this->readStoresData();
--            $this->cache->save($this->getSerializer()->serialize($storesData), $cacheKey, [self::CACHE_TAG]);
--        }
--        return $storesData;
-+        return $this->storesData->getStoresData($this->runMode, $this->scopeCode);
-     }
- 
-     /**
-      * Read stores data. First element is allowed store ids, second is default store id
-      *
-      * @return array
-+     * @deprecated
-+     * @see \Magento\Store\Model\StoreResolver::getStoresData
-      */
--    protected function readStoresData()
-+    protected function readStoresData() : array
-     {
--        $reader = $this->readerList->getReader($this->runMode);
--        return [$reader->getAllowedStoreIds($this->scopeCode), $reader->getDefaultStoreId($this->scopeCode)];
-+        return $this->getStoresData();
-     }
- 
-     /**
-@@ -147,7 +157,7 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
-      * @return \Magento\Store\Api\Data\StoreInterface
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
--    protected function getRequestedStoreByCode($storeCode)
-+    protected function getRequestedStoreByCode($storeCode) : \Magento\Store\Api\Data\StoreInterface
-     {
-         try {
-             $store = $this->storeRepository->getActiveStoreByCode($storeCode);
-@@ -165,7 +175,7 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
-      * @return \Magento\Store\Api\Data\StoreInterface
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
--    protected function getDefaultStoreById($id)
-+    protected function getDefaultStoreById($id) : \Magento\Store\Api\Data\StoreInterface
-     {
-         try {
-             $store = $this->storeRepository->getActiveStoreById($id);
-@@ -175,19 +185,4 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
- 
-         return $store;
-     }
--
--    /**
--     * Get serializer
--     *
--     * @return \Magento\Framework\Serialize\SerializerInterface
--     * @deprecated 100.2.0
--     */
--    private function getSerializer()
--    {
--        if ($this->serializer === null) {
--            $this->serializer = \Magento\Framework\App\ObjectManager::getInstance()
--                ->get(SerializerInterface::class);
--        }
--        return $this->serializer;
--    }
- }
-diff --git a/app/code/Magento/Store/Model/StoreResolver/Website.php b/app/code/Magento/Store/Model/StoreResolver/Website.php
-index 29f85716fea..e314538099c 100644
---- a/app/code/Magento/Store/Model/StoreResolver/Website.php
-+++ b/app/code/Magento/Store/Model/StoreResolver/Website.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Store\Model\StoreResolver;
- 
-+/**
-+ * Reader implementation for website.
-+ */
- class Website implements ReaderInterface
- {
-     /**
-@@ -38,22 +41,25 @@ class Website implements ReaderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAllowedStoreIds($scopeCode)
-     {
-         $stores = [];
-         $website = $scopeCode ? $this->websiteRepository->get($scopeCode) : $this->websiteRepository->getDefault();
-         foreach ($this->storeRepository->getList() as $store) {
--            if ($store->isActive() && $store->getWebsiteId() == $website->getId()) {
--                $stores[] = $store->getId();
-+            if ($store->getIsActive()) {
-+                if (($scopeCode && $store->getWebsiteId() == $website->getId()) || (!$scopeCode)) {
-+                    $stores[$store->getId()] = $store->getId();
-+                }
-             }
-         }
-+        sort($stores);
-         return $stores;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDefaultStoreId($scopeCode)
-     {
-diff --git a/app/code/Magento/Store/Model/StoresData.php b/app/code/Magento/Store/Model/StoresData.php
-new file mode 100644
-index 00000000000..b3d00bc97cd
---- /dev/null
-+++ b/app/code/Magento/Store/Model/StoresData.php
-@@ -0,0 +1,77 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Store\Model;
-+
-+/**
-+ * Class that computes and stores into cache the active store ids.
-+ */
-+class StoresData
-+{
-+    /**
-+     * Cache tag
-+     */
-+    const CACHE_TAG = 'store_relations';
-+
-+    /**
-+     * @var \Magento\Framework\Cache\FrontendInterface
-+     */
-+    private $cache;
-+
-+    /**
-+     * @var \Magento\Store\Model\StoreResolver\ReaderList
-+     */
-+    private $readerList;
-+
-+    /**
-+     * @var \Magento\Framework\Serialize\SerializerInterface
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @param \Magento\Framework\Cache\FrontendInterface $cache
-+     * @param \Magento\Store\Model\StoreResolver\ReaderList $readerList
-+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
-+     */
-+    public function __construct(
-+        \Magento\Framework\Cache\FrontendInterface $cache,
-+        \Magento\Store\Model\StoreResolver\ReaderList $readerList,
-+        \Magento\Framework\Serialize\SerializerInterface $serializer
-+    ) {
-+        $this->cache = $cache;
-+        $this->readerList = $readerList;
-+        $this->serializer = $serializer;
-+    }
-+
-+    /**
-+     * Get stores data
-+     *
-+     * @param string $runMode
-+     * @param string|null $scopeCode
-+     * @return array
-+     */
-+    public function getStoresData(string $runMode, string $scopeCode = null) : array
-+    {
-+        $cacheKey = 'resolved_stores_' . md5($runMode . $scopeCode);
-+        $cacheData = $this->cache->load($cacheKey);
-+        if ($cacheData) {
-+            $storesData = $this->serializer->unserialize($cacheData);
-+        } else {
-+            $reader = $this->readerList->getReader($runMode);
-+            $storesData = [$reader->getAllowedStoreIds($scopeCode), $reader->getDefaultStoreId($scopeCode)];
-+            $this->cache->save(
-+                $this->serializer->serialize($storesData),
-+                $cacheKey,
-+                [
-+                    self::CACHE_TAG,
-+                    \Magento\Store\Model\Store::CACHE_TAG
-+                ]
-+            );
-+        }
-+        return $storesData;
-+    }
-+}
-diff --git a/app/code/Magento/Store/Model/Website.php b/app/code/Magento/Store/Model/Website.php
-index c9a7d0013fe..42c89bbe421 100644
---- a/app/code/Magento/Store/Model/Website.php
-+++ b/app/code/Magento/Store/Model/Website.php
-@@ -159,6 +159,11 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
-      */
-     protected $_currencyFactory;
- 
-+    /**
-+     * @var \Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface
-+     */
-+    private $pillPut;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -174,6 +179,7 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
-      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-      * @param array $data
-+     * @param \Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface|null $pillPut
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -190,7 +196,8 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
-         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
--        array $data = []
-+        array $data = [],
-+        \Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface $pillPut = null
-     ) {
-         parent::__construct(
-             $context,
-@@ -208,10 +215,12 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
-         $this->_websiteFactory = $websiteFactory;
-         $this->_storeManager = $storeManager;
-         $this->_currencyFactory = $currencyFactory;
-+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(\Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface::class);
-     }
- 
-     /**
--     * init model
-+     * Init model
-      *
-      * @return void
-      */
-@@ -495,6 +504,8 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
-     }
- 
-     /**
-+     * Get default group id
-+     *
-      * @return mixed
-      */
-     public function getDefaultGroupId()
-@@ -511,6 +522,8 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
-     }
- 
-     /**
-+     * Get code
-+     *
-      * @return mixed
-      */
-     public function getCode()
-@@ -543,7 +556,7 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
-     }
- 
-     /**
--     * @return $this
-+     * @inheritdoc
-      */
-     public function beforeDelete()
-     {
-@@ -581,7 +594,7 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
-         if ($this->isObjectNew()) {
-             $this->_storeManager->reinitStores();
-         }
--
-+        $this->pillPut->put();
-         return parent::afterSave();
-     }
- 
-@@ -635,8 +648,7 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
-     }
- 
-     /**
--     * Retrieve default stores select object
--     * Select fields website_id, store_id
-+     * Retrieve default stores select object, select fields website_id, store_id
-      *
-      * @param bool $withDefault include/exclude default admin website
-      * @return \Magento\Framework\DB\Select
-@@ -671,7 +683,7 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.1.0
-      */
-     public function getScopeType()
-@@ -680,7 +692,7 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.1.0
-      */
-     public function getScopeTypeName()
-@@ -689,7 +701,7 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getExtensionAttributes()
-     {
-@@ -697,7 +709,7 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setExtensionAttributes(
-         \Magento\Store\Api\Data\WebsiteExtensionInterface $extensionAttributes
-diff --git a/app/code/Magento/Store/Model/WebsiteRepository.php b/app/code/Magento/Store/Model/WebsiteRepository.php
-index b58936c32f5..e01bc8191b3 100644
---- a/app/code/Magento/Store/Model/WebsiteRepository.php
-+++ b/app/code/Magento/Store/Model/WebsiteRepository.php
-@@ -6,10 +6,10 @@
- 
- namespace Magento\Store\Model;
- 
-+use Magento\Framework\App\Config;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Store\Model\ResourceModel\Website\CollectionFactory;
--use Magento\Framework\App\Config;
- 
- /**
-  * Information Expert in store websites handling
-@@ -64,7 +64,7 @@ class WebsiteRepository implements \Magento\Store\Api\WebsiteRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function get($code)
-     {
-@@ -78,7 +78,14 @@ class WebsiteRepository implements \Magento\Store\Api\WebsiteRepositoryInterface
-         ]);
- 
-         if ($website->getId() === null) {
--            throw new NoSuchEntityException();
-+            throw new NoSuchEntityException(
-+                __(
-+                    sprintf(
-+                        "The website with code %s that was requested wasn't found. Verify the website and try again.",
-+                        $code
-+                    )
-+                )
-+            );
-         }
-         $this->entities[$code] = $website;
-         $this->entitiesById[$website->getId()] = $website;
-@@ -86,7 +93,7 @@ class WebsiteRepository implements \Magento\Store\Api\WebsiteRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getById($id)
-     {
-@@ -100,7 +107,14 @@ class WebsiteRepository implements \Magento\Store\Api\WebsiteRepositoryInterface
-         ]);
- 
-         if ($website->getId() === null) {
--            throw new NoSuchEntityException();
-+            throw new NoSuchEntityException(
-+                __(
-+                    sprintf(
-+                        "The website with id %s that was requested wasn't found. Verify the website and try again.",
-+                        $id
-+                    )
-+                )
-+            );
-         }
-         $this->entities[$website->getCode()] = $website;
-         $this->entitiesById[$id] = $website;
-@@ -108,7 +122,7 @@ class WebsiteRepository implements \Magento\Store\Api\WebsiteRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getList()
-     {
-@@ -127,7 +141,7 @@ class WebsiteRepository implements \Magento\Store\Api\WebsiteRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDefault()
-     {
-@@ -150,7 +164,7 @@ class WebsiteRepository implements \Magento\Store\Api\WebsiteRepositoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function clean()
-     {
-@@ -176,6 +190,7 @@ class WebsiteRepository implements \Magento\Store\Api\WebsiteRepositoryInterface
- 
-     /**
-      * Initialize default website.
-+     *
-      * @return void
-      */
-     private function initDefaultWebsite()
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
-index e67e21e4c1e..870b92d17e6 100644
---- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- <!-- Admin creates new Store group -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AdminCreateNewStoreGroupActionGroup">
-         <arguments>
-             <argument name="website" type="string"/>
-@@ -25,4 +25,47 @@
-         <waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGridReload"/>
-         <see userInput="You saved the store." stepKey="seeSavedMessage" />
-     </actionGroup>
-+    <actionGroup name="CreateCustomStore">
-+        <arguments>
-+            <argument name="website" type="string"/>
-+            <argument name="store" type="string"/>
-+            <argument name="rootCategory" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
-+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
-+        <selectOption userInput="{{website}}" selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" stepKey="selectMainWebsite"/>
-+        <fillField userInput="{{store}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
-+        <fillField userInput="{{store}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
-+        <selectOption userInput="{{rootCategory}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
-+        <click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
-+        <waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGridReload"/>
-+        <see userInput="You saved the store." stepKey="seeSavedMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AssertStoreGroupInGrid">
-+        <arguments>
-+            <argument name="storeGroupName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
-+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-+        <fillField userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
-+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
-+        <see selector="{{AdminStoresGridSection.nthRow('1')}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupInGridMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AssertStoreGroupForm">
-+        <arguments>
-+            <argument name="website" type="string"/>
-+            <argument name="storeGroupName" type="string"/>
-+            <argument name="storeGroupCode" type="string"/>
-+            <argument name="rootCategory" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
-+        <waitForPageLoad stepKey="waitTillAdminSystemStoreGroupPage"/>
-+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website}}" stepKey="seeAssertWebsite"/>
-+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupName"/>
-+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{storeGroupCode}}" stepKey="seeAssertStoreGroupCode"/>
-+        <seeInField selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="{{rootCategory}}" stepKey="seeAssertRootCategory"/>
-+    </actionGroup>
- </actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
-deleted file mode 100644
-index 0819a74ea89..00000000000
---- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
-+++ /dev/null
-@@ -1,26 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
--    <actionGroup name="AdminCreateStoreGroupActionGroup">
--        <arguments>
--            <argument name="Website" defaultValue="_defaultWebsite"/>
--        </arguments>
--        <amOnPage url="{{AdminSystemStoreGroupPage.url}}" stepKey="navigateToNewStoreGroup"/>
--        <waitForPageLoad stepKey="waitForStoreGroupPageLoad" />
--
--        <comment userInput="Creating Store Group" stepKey="storeGroupCreationComment" />
--        <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{Website.name}}" stepKey="selectWebsite" />
--        <fillField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="{{CustomStoreGroupCustomWebsite.name}}" stepKey="enterStoreGroupName" />
--        <fillField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{CustomStoreGroupCustomWebsite.code}}" stepKey="enterStoreGroupCode" />
--        <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category"  stepKey="setRootCategory" />
--        <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
--        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
--        <see userInput="You saved the store." stepKey="seeSavedMessage" />
--    </actionGroup>
--</actionGroups>
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
-index b35b36bc667..fda92810a13 100644
---- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
-@@ -7,7 +7,8 @@
- -->
- <!-- Test XML Example -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+
-     <actionGroup name="AdminCreateStoreViewActionGroup">
-         <arguments>
-             <argument name="StoreGroup" defaultValue="_defaultStoreGroup"/>
-@@ -15,6 +16,7 @@
-         </arguments>
-         <amOnPage url="{{AdminSystemStoreViewPage.url}}" stepKey="navigateToNewStoreView"/>
-         <waitForPageLoad stepKey="waitForPageLoad1" />
-+        <comment userInput="Creating Store View" stepKey="storeViewCreationComment" />
-         <!--Create Store View-->
-         <selectOption selector="{{AdminNewStoreSection.storeGrpDropdown}}" userInput="{{StoreGroup.name}}" stepKey="selectStore" />
-         <fillField selector="{{AdminNewStoreSection.storeNameTextField}}" userInput="{{customStore.name}}" stepKey="enterStoreViewName" />
-@@ -22,9 +24,45 @@
-         <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="Enabled" stepKey="setStatus" />
-         <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreView" />
-         <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
--        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
--        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
--        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReolad"/>
-+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarningAboutTakingALongTimeToComplete" />
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmModal" />
-+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForPageReload"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the store view." stepKey="seeSavedMessage" />
-+    </actionGroup>
-+
-+    <actionGroup name="AdminCreateStoreViewWithoutCheckActionGroup" extends="AdminCreateStoreViewActionGroup">
-+        <remove keyForRemoval="waitForPageReload"/>
-+        <remove keyForRemoval="seeSavedMessage"/>
-+    </actionGroup>
-+
-+    <!--Save the Store view-->
-+    <actionGroup name="AdminCreateStoreViewActionSaveGroup">
-+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
-+        <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload2"/>
-         <see userInput="You saved the store view." stepKey="seeSavedMessage" />
-     </actionGroup>
-+
-+    <actionGroup name="navigateToAdminContentManagementPage">
-+        <amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+    </actionGroup>
-+    <actionGroup name="saveStoreConfiguration">
-+        <comment userInput="saveStoreConfiguration" stepKey="comment"/>
-+        <waitForElementVisible selector="{{StoreConfigSection.Save}}" stepKey="waitForSaveButton"/>
-+        <click selector="{{StoreConfigSection.Save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+    </actionGroup>
-+    <actionGroup name="saveStoreConfigurationAndValidateFieldError">
-+        <arguments>
-+            <argument name="inputFieldError" type="string"/>
-+            <argument name="errorMessageSelector" type="string"/>
-+            <argument name="errorMessage" type="string"/>
-+        </arguments>
-+        <comment userInput="saveStoreConfigurationAndValidateFieldError" stepKey="comment"/>
-+        <waitForElementVisible selector="{{StoreConfigSection.Save}}" stepKey="waitForSaveButton"/>
-+        <click selector="{{StoreConfigSection.Save}}" stepKey="clickSaveButton"/>
-+        <waitForElement selector="{{inputFieldError}}" stepKey="waitForErrorField"/>
-+        <waitForElementVisible selector="{{errorMessageSelector}}" stepKey="waitForErrorMessage"/>
-+        <see selector="{{errorMessageSelector}}" userInput="{{errorMessage}}" stepKey="seeErrorMessage"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
-index 709cfe8ec9c..ca614ec2413 100644
---- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- <!-- Admin creates new custom website -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AdminCreateWebsiteActionGroup">
-         <arguments>
-             <argument name="newWebsiteName" type="string"/>
-@@ -22,4 +22,44 @@
-         <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
-         <see userInput="You saved the website." stepKey="seeSavedMessage" />
-     </actionGroup>
-+
-+    <!--Get Website_id-->
-+    <actionGroup name="AdminGetWebsiteIdActionGroup">
-+        <arguments>
-+            <argument name="website"/>
-+        </arguments>
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnTheStorePage"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
-+        <fillField selector="{{AdminStoresGridSection.websiteFilterTextField}}" userInput="{{website.name}}" stepKey="fillSearchWebsiteField"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters" />
-+        <see selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" userInput="{{website.name}}" stepKey="verifyThatCorrectWebsiteFound"/>
-+        <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
-+        <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabFromCurrentUrl"/>
-+    </actionGroup>
-+
-+    <actionGroup name="AssertWebsiteInGrid">
-+        <arguments>
-+            <argument name="websiteName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
-+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-+        <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillWebsiteField"/>
-+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
-+        <seeElement selector="{{AdminStoresGridSection.websiteName(websiteName)}}" stepKey="seeAssertWebsiteInGrid"/>
-+    </actionGroup>
-+
-+    <actionGroup name="AssertWebsiteForm">
-+        <arguments>
-+            <argument name="websiteName" type="string"/>
-+            <argument name="websiteCode" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminStoresGridSection.websiteName(websiteName)}}" stepKey="clickWebsiteFirstRowInGrid"/>
-+        <waitForPageLoad stepKey="waitTillWebsiteFormPageIsOpened"/>
-+        <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabWebsiteIdFromCurrentUrl"/>
-+        <seeInCurrentUrl url="/system_store/editWebsite/website_id/{$grabWebsiteIdFromCurrentUrl}" stepKey="seeWebsiteId"/>
-+        <seeInField selector="{{AdminNewWebsiteSection.name}}" userInput="{{websiteName}}" stepKey="seeAssertWebsiteName"/>
-+        <seeInField selector="{{AdminNewWebsiteSection.code}}" userInput="{{websiteCode}}" stepKey="seeAssertWebsiteCode"/>
-+    </actionGroup>
- </actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
-index 1267ebf8f44..cf2cabdcc23 100644
---- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- <!-- Test XML Example -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AdminDeleteStoreViewActionGroup">
-         <arguments>
-             <argument name="customStore" defaultValue="customStore"/>
-@@ -23,7 +23,38 @@
-         <click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreViewAgain"/>
-         <waitForElementVisible selector="{{AdminConfirmationModalSection.title}}" stepKey="waitingForWarningModal"/>
-         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreDelete"/>
--        <wait time="10" stepKey="extraWait"/>
-+        <waitForPageLoad stepKey="waitForSuccessMessage"/>
-         <see userInput="You deleted the store view." stepKey="seeDeleteMessage"/>
-     </actionGroup>
--</actionGroups>
-+    <actionGroup name="DeleteCustomStoreViewBackupEnabledYesActionGroup">
-+        <arguments>
-+            <argument name="storeViewName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-+        <fillField userInput="{{storeViewName}}" selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="fillSearchStoreViewField"/>
-+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickEditExistingStoreViewRow"/>
-+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
-+        <click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreViewButtonOnEditStorePage"/>
-+        <selectOption userInput="Yes" selector="{{AdminStoreBackupOptionsSection.createBackupSelect}}" stepKey="setCreateDbBackupToYes"/>
-+        <click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreViewButtonOnDeleteStorePage"/>
-+        <waitForElementVisible selector="{{AdminConfirmationModalSection.title}}" stepKey="waitingForWarningModal"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreViewDelete"/>
-+        <waitForPageLoad stepKey="waitForSuccessMessage"/>
-+        <see selector="{{AdminStoresGridSection.successMessage}}" userInput="The database was backed up." stepKey="seeAssertDatabaseBackedUpMessage"/>
-+        <see selector="{{AdminStoresGridSection.successMessage}}" userInput="You deleted the store view." stepKey="seeAssertSuccessDeleteStoreViewMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AssertStoreViewNotInGrid">
-+        <arguments>
-+            <argument name="storeViewName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
-+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-+        <fillField userInput="{{storeViewName}}" selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="fillSearchStoreViewField"/>
-+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
-+        <see selector="{{AdminStoresGridSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeAssertStoreViewNotInGridMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
-index 0512a1f6fbc..1721e318540 100644
---- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AdminDeleteWebsiteActionGroup">
-         <arguments>
-             <argument name="websiteName" type="string"/>
-@@ -19,9 +19,11 @@
-         <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
-         <waitForPageLoad stepKey="waitForStoreToLoad"/>
-         <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditWebsitePage"/>
-+        <waitForPageLoad stepKey="waitForDeleteStoreGroupSectionLoad" time="30"/>
-         <selectOption userInput="No" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
-         <click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteWebsiteButton"/>
-         <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
-         <see userInput="You deleted the website." stepKey="seeSavedMessage"/>
-+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter2"/>
-     </actionGroup>
--</actionGroups>
-\ No newline at end of file
-+</actionGroups>
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminFilterStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminFilterStoreViewActionGroup.xml
-new file mode 100644
-index 00000000000..e4cb26ea6ff
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminFilterStoreViewActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminFilterStoreViewActionGroup">
-+        <arguments>
-+            <argument name="StoreGroup" defaultValue="_defaultStoreGroup"/>
-+            <argument name="customStore" defaultValue="customStore.name"/>
-+        </arguments>
-+        <click selector="{{AdminProductFiltersSection.filter}}" stepKey="ClickOnFilter"/>
-+        <click selector="{{AdminProductFiltersSection.storeViewDropDown}}" stepKey="ClickOnStoreViewDropDown"/>
-+        <click selector="{{AdminProductFiltersSection.storeViewOption(customStore)}}" stepKey="ClickOnStoreViewOption"/>
-+        <click selector="{{AdminProductFiltersSection.applyFilters}}" stepKey="ClickOnApplyFilters"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
-new file mode 100644
-index 00000000000..1a7f24ed2aa
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
-@@ -0,0 +1,47 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminStoreGroupCreateActionGroup">
-+        <arguments>
-+            <argument name="Website" defaultValue="_defaultWebsite"/>
-+            <argument name="storeGroup"/>
-+        </arguments>
-+        <amOnPage url="{{AdminSystemStoreGroupPage.url}}" stepKey="navigateToNewStoreGroup"/>
-+        <waitForPageLoad stepKey="waitForStoreGroupPageLoad" />
-+
-+        <comment userInput="Creating Store Group" stepKey="storeGroupCreationComment" />
-+        <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{Website.name}}" stepKey="selectWebsite" />
-+        <fillField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="{{storeGroup.name}}" stepKey="enterStoreGroupName" />
-+        <fillField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{storeGroup.code}}" stepKey="enterStoreGroupCode" />
-+        <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category"  stepKey="setRootCategory" />
-+        <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
-+        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
-+        <see userInput="You saved the store." stepKey="seeSavedMessage" />
-+    </actionGroup>
-+
-+    <actionGroup name="AdminAddCustomWebSiteToStoreGroup">
-+        <arguments>
-+            <argument name="storeGroup" defaultValue="customStoreGroup"/>
-+            <argument name="website" defaultValue="customWebsite"/>
-+        </arguments>
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-+        <fillField userInput="{{storeGroup.name}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
-+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <see userInput="{{storeGroup.name}}" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="verifyThatCorrectStoreGroupFound"/>
-+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
-+        <waitForPageLoad stepKey="waitForStoreGroupPageLoad" />
-+        <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website.name}}" stepKey="selectWebsite" />
-+        <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category" stepKey="chooseRootCategory" />
-+        <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
-+        <conditionalClick selector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" dependentSelector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" visible="true" stepKey="clickAcceptNewStoreGroupCreationButton"/>
-+        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
-+        <see userInput="You saved the store." stepKey="seeSavedMessage" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
-index bd004f1fc7d..47236376f02 100644
---- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- <!-- Test XML Example -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AdminSwitchStoreViewActionGroup">
-         <arguments>
-             <argument name="storeView" defaultValue="customStore.name"/>
-@@ -18,6 +18,11 @@
-         <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitingForInformationModal"/>
-         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreSwitch"/>
-         <waitForPageLoad stepKey="waitForStoreViewSwitched"/>
-+        <scrollToTopOfPage stepKey="scrollToStoreSwitcher"/>
-         <see userInput="{{storeView}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
-     </actionGroup>
-+    <actionGroup name="AdminSwitchToAllStoreViewActionGroup" extends="AdminSwitchStoreViewActionGroup">
-+        <click selector="{{AdminMainActionsSection.allStoreViews}}" stepKey="clickStoreViewByName" after="waitForStoreViewsAreVisible"/>
-+        <see selector="{{AdminMainActionsSection.storeSwitcher}}" userInput="All Store Views" stepKey="seeNewStoreViewName" after="waitForStoreViewSwitched"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml
-new file mode 100644
-index 00000000000..0960dfb47c3
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSwitchWebsiteActionGroup">
-+        <arguments>
-+            <argument name="website"/>
-+        </arguments>
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <click selector="{{AdminMainActionsSection.storeViewDropdown}}" stepKey="clickWebsiteSwitchDropdown"/>
-+        <waitForElementVisible selector="{{AdminMainActionsSection.websiteByName('Main Website')}}" stepKey="waitForWebsiteAreVisible"/>
-+        <click selector="{{AdminMainActionsSection.websiteByName(website.name)}}" stepKey="clickWebsiteByName"/>
-+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitingForInformationModal"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreSwitch"/>
-+        <see userInput="{{website.name}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewWebsiteName"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreConfigurationBackendActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreConfigurationBackendActionGroup.xml
-new file mode 100644
-index 00000000000..e86a7d1b0c3
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreConfigurationBackendActionGroup.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStoreConfigurationBackendActionGroup">
-+        <arguments>
-+            <!-- defaultValue is blank so that it can be used in cases where there is only one store view -->
-+            <argument name="website" type="string" defaultValue=""/>
-+            <argument name="customStore" type="string" defaultValue=""/>
-+            <argument name="storeView1" type="string" defaultValue=""/>
-+            <argument name="storeView2" type="string" defaultValue=""/>
-+        </arguments>
-+        <amOnPage url="{{AdminConfigPage.url}}" stepKey="goToConfigStoreConfigurationPage"/>
-+        <waitForPageLoad stepKey="waitForSystemStoreConfigurationPageLoad"/>
-+        <click selector="{{AdminConfigSection.defaultConfigButton}}" stepKey="clickDefaultConfigButton"/>
-+        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{website}}" stepKey="seeAssertWebsiteInDefaultConfigDropdown"/>
-+        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{customStore}}" stepKey="seeAssertSecondStoreInDefaultConfigDropdown"/>
-+        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{storeView1}}" stepKey="seeAssertFirstStoreViewInDefaultConfigDropdown"/>
-+        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{storeView2}}" stepKey="seeAssertSecondStoreViewInDefaultConfigDropdown"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreFrontendActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreFrontendActionGroup.xml
-new file mode 100644
-index 00000000000..e635d715a58
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreFrontendActionGroup.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStoreFrontendActionGroup">
-+        <arguments>
-+            <argument name="customStore" type="string"/>
-+            <!-- defaultValue is blank so that it can be used in cases where there is only one store view -->
-+            <argument name="storeView1" type="string" defaultValue=""/>
-+            <argument name="storeView2" type="string" defaultValue=""/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontHomePageLoad"/>
-+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="clickSwitchStoreButton"/>
-+        <waitForElementVisible selector="{{StorefrontFooterSection.storeLink(customStore)}}" stepKey="waitForStoreLinkToVosible"/>
-+        <click selector="{{StorefrontFooterSection.storeLink(customStore)}}"  stepKey="clickStoreLinkCustomStore"/>
-+        <waitForPageLoad stepKey="waitForCustomStoreToLoad"/>
-+        <see selector="{{StorefrontHeaderSection.storeViewName}}" userInput="{{storeView1}}" stepKey="seeAssertFirstStoreViewOnStorefront"/>
-+        <click selector="{{StorefrontHeaderSection.storeViewName}}" stepKey="clickStoreViewName"/>
-+        <see selector="{{StorefrontHeaderSection.storeViewDropdown}}" userInput="{{storeView2}}" stepKey="seeAssertSecondStoreViewOnStorefront"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupFormActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupFormActionGroup.xml
-new file mode 100644
-index 00000000000..a8b8b7bb6d0
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupFormActionGroup.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Admin creates new Store group -->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStoreGroupFormActionGroup">
-+        <arguments>
-+            <argument name="website" type="string"/>
-+            <argument name="storeGroupName" type="string"/>
-+            <argument name="storeGroupCode" type="string"/>
-+            <argument name="rootCategory" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
-+        <waitForPageLoad stepKey="waitTillAdminSystemStoreGroupPage"/>
-+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website}}" stepKey="seeAssertWebsite"/>
-+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupName"/>
-+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{storeGroupCode}}" stepKey="seeAssertStoreGroupCode"/>
-+        <seeInField selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="{{rootCategory}}" stepKey="seeAssertRootCategory"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupInGridActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupInGridActionGroup.xml
-new file mode 100644
-index 00000000000..fb36cbd0d18
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupInGridActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Admin creates new Store group -->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStoreGroupInGridActionGroup">
-+        <arguments>
-+            <argument name="storeGroupName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
-+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-+        <fillField userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
-+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
-+        <see selector="{{AdminStoresGridSection.firstRow}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupInGridMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewFormActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewFormActionGroup.xml
-new file mode 100644
-index 00000000000..92ebbc39501
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewFormActionGroup.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStoreViewFormActionGroup">
-+        <arguments>
-+            <argument name="storeDropdown" type="string"/>
-+            <argument name="storeViewName" type="string"/>
-+            <argument name="storeViewCode" type="string"/>
-+            <argument name="status" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewFirstRowInGrid"/>
-+        <waitForPageLoad stepKey="waitForAdminSystemStoreViewPageLoad"/>
-+        <seeInField selector="{{AdminNewStoreSection.storeGrpDropdown}}" userInput="{{storeDropdown}}" stepKey="seeAssertStore"/>
-+        <seeInField selector="{{AdminNewStoreSection.storeNameTextField}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewName"/>
-+        <seeInField selector="{{AdminNewStoreSection.storeCodeTextField}}" userInput="{{storeViewCode}}" stepKey="seeAssertStoreViewCode"/>
-+        <seeInField selector="{{AdminNewStoreSection.statusDropdown}}" userInput="{{status}}" stepKey="seeAssertStatus"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml
-new file mode 100644
-index 00000000000..fad8eec9990
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStoreViewInGridActionGroup">
-+        <arguments>
-+            <argument name="storeViewName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
-+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-+        <fillField userInput="{{storeViewName}}" selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="fillSearchStoreViewField"/>
-+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
-+        <see selector="{{AdminStoresGridSection.firstRow}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewInGridMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStorefrontStoreCodeInUrlActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStorefrontStoreCodeInUrlActionGroup.xml
-new file mode 100644
-index 00000000000..3daa1c25a17
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStorefrontStoreCodeInUrlActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontStoreCodeInUrlActionGroup">
-+        <arguments>
-+            <argument name="storeCode" type="string" defaultValue="{{_defaultStore.code}}" />
-+        </arguments>
-+        <seeInCurrentUrl url="{{StorefrontHomePage.url}}{{storeCode}}" stepKey="seeStoreCodeInURL"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStorefrontStoreNotVisibleInFooterActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStorefrontStoreNotVisibleInFooterActionGroup.xml
-new file mode 100644
-index 00000000000..2c2e07728b6
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStorefrontStoreNotVisibleInFooterActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontStoreNotVisibleInFooterActionGroup">
-+        <arguments>
-+            <argument name="store" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontHomePageLoad"/>
-+        <dontSee selector="{{StorefrontFooterSection.storeLink(store)}}" stepKey="AssertStoreNotOnStorefront"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStorefrontStoreVisibleInFooterActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStorefrontStoreVisibleInFooterActionGroup.xml
-new file mode 100644
-index 00000000000..5c63373f59f
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStorefrontStoreVisibleInFooterActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontStoreVisibleInFooterActionGroup">
-+        <arguments>
-+            <argument name="customStore" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontHomePageLoad"/>
-+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="clickSwitchStoreButton"/>
-+        <waitForElementVisible selector="{{StorefrontFooterSection.storeLink(customStore)}}" stepKey="waitForStoreLinkToVosible"/>
-+        <seeElement selector="{{StorefrontFooterSection.storeLink(customStore)}}" stepKey="seeAssertStoreOnStorefront"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStorefrontStoreVisibleInHeaderActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStorefrontStoreVisibleInHeaderActionGroup.xml
-new file mode 100644
-index 00000000000..03745ff8323
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStorefrontStoreVisibleInHeaderActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontStoreVisibleInHeaderActionGroup">
-+        <arguments>
-+            <argument name="store" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontHomePageLoad"/>
-+        <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="selectStoreSwitcher"/>
-+        <waitForPageLoad stepKey="waitForFirstStoreView"/>
-+        <see selector="{{StorefrontHeaderSection.storeViewDropdown}}" userInput="{{store}}" stepKey="seeAssertStoreViewOnStorefront"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/ChangeStoreInStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/ChangeStoreInStoreViewActionGroup.xml
-new file mode 100644
-index 00000000000..15784235d59
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/ChangeStoreInStoreViewActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="ChangeStoreInStoreViewActionGroup">
-+        <arguments>
-+            <argument name="storeDropdown" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewFirstRowInGrid"/>
-+        <waitForPageLoad stepKey="waitForAdminSystemStoreViewPageLoad"/>
-+        <selectOption selector="{{AdminNewStoreSection.storeGrpDropdown}}" userInput="{{storeDropdown}}" stepKey="selectStoreGrpDropdown"/>
-+        <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveButton"/>
-+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal"/>
-+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarningAboutTakingALongTimeToComplete"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmModal"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml
-index 1e23a85a789..86d3963bc42 100644
---- a/app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml
-@@ -5,8 +5,9 @@
-   * See COPYING.txt for license details.
-   */
- -->
-+
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="CreateCustomStoreViewActionGroup">
-         <arguments>
-             <argument name="storeGroupName" defaultValue="customStoreGroup.name"/>
-@@ -18,7 +19,24 @@
-         <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
-         <selectOption userInput="{{customStore.is_active}}" selector="{{AdminNewStoreSection.statusDropdown}}" stepKey="selectStoreViewStatus"/>
-         <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreViewButton"/>
-+        <waitForPageLoad stepKey="waitForPageLoad2"/>
-+        <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="clickAcceptNewStoreViewCreationButton"/>
-+    </actionGroup>
-+    <actionGroup name="CreateStoreView">
-+        <arguments>
-+            <argument name="storeView" defaultValue="customStore"/>
-+            <argument name="storeGroupName" defaultValue="_defaultStoreGroup.name"/>
-+            <argument name="storeViewStatus" defaultValue="_defaultStore.is_active"/>
-+        </arguments>
-+        <amOnPage  url="{{AdminSystemStoreViewPage.url}}" stepKey="amOnAdminSystemStoreViewPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <selectOption userInput="{{storeGroupName}}" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
-+        <fillField userInput="{{storeView.name}}" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
-+        <fillField userInput="{{storeView.code}}" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
-+        <selectOption userInput="{{storeViewStatus}}" selector="{{AdminNewStoreSection.statusDropdown}}" stepKey="selectStoreViewStatus"/>
-+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreViewButton"/>
-         <waitForElementVisible selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" stepKey="waitForAcceptNewStoreViewCreationButton" />
-         <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="clickAcceptNewStoreViewCreationButton"/>
-+        <see userInput="You saved the store view." stepKey="seeSavedMessage"/>
-     </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
-index 0cac9bbd995..8a1d830661a 100644
---- a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="DeleteCustomStoreActionGroup">
-         <arguments>
-             <argument name="storeGroupName" defaultValue="customStoreGroup.name"/>
-@@ -23,4 +23,33 @@
-         <selectOption userInput="No" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
-         <click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteStoreGroupButtonOnDeleteStorePage"/>
-     </actionGroup>
--</actionGroups>
-+    <actionGroup name="DeleteCustomStoreBackupEnabledYesActionGroup">
-+        <arguments>
-+            <argument name="storeGroupName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-+        <fillField userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
-+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <see userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="verifyThatCorrectStoreGroupFound"/>
-+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
-+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
-+        <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteStoreGroupButtonOnEditStorePage"/>
-+        <selectOption userInput="Yes" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
-+        <click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteStoreGroupButtonOnDeleteStorePage"/>
-+        <see selector="{{AdminStoresGridSection.successMessage}}" userInput="The database was backed up." stepKey="seeAssertDatabaseBackedUpMessage"/>
-+        <see selector="{{AdminStoresGridSection.successMessage}}" userInput="You deleted the store." stepKey="seeAssertSuccessDeleteStoreGroupMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AssertStoreNotInGrid">
-+        <arguments>
-+            <argument name="storeGroupName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
-+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-+        <fillField userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
-+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
-+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
-+        <see selector="{{AdminStoresGridSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeAssertStoreGroupNotInGridMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
-index 0f8673eb2f4..da3ce02a80f 100644
---- a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
-@@ -6,22 +6,21 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="DeleteCustomWebsiteActionGroup">
-         <arguments>
-             <argument name="websiteName" defaultValue="customWebsite.name"/>
-         </arguments>
-         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnTheStorePage"/>
-         <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
--        <waitForPageLoad stepKey="waitForPageLoadAfterResetButtonClicked" time="10"/>
-         <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
-         <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton" />
--        <waitForPageLoad stepKey="waitForPageLoadAfterSearch" time="10"/>
-         <see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
-         <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
--
-+        <waitForPageLoad stepKey="waitForPageLoadAfterWebsiteSelected" time="30"/>
-         <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditStorePage"/>
-         <selectOption userInput="No" selector="{{AdminStoresDeleteWebsiteSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
-         <click selector="{{AdminStoresDeleteWebsiteSection.deleteButton}}" stepKey="clickDeleteButtonOnDeleteWebsitePage"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the website." stepKey="checkSuccessMessage"/>
-     </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/EditCustomStoreGroupAcceptWarningMessageActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/EditCustomStoreGroupAcceptWarningMessageActionGroup.xml
-new file mode 100644
-index 00000000000..8889795c8ac
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/EditCustomStoreGroupAcceptWarningMessageActionGroup.xml
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Admin creates new Store group -->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="EditCustomStoreGroupAcceptWarningMessageActionGroup" extends="CreateCustomStore">
-+        <arguments>
-+            <argument name="website" type="string"/>
-+            <argument name="store" type="string"/>
-+            <argument name="rootCategory" type="string"/>
-+        </arguments>
-+        <remove keyForRemoval="selectCreateStore"/>
-+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickFirstRow" before="selectMainWebsite"/>
-+        <waitForPageLoad stepKey="waitForWarningMessageToAppear" before="seeAssertAlertWarningMessage" />
-+        <click selector="{{AdminStoreGroupActionsSection.okButton}}" stepKey="seeAssertAlertWarningMessage" before="waitForStoreGridReload"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/StoreFrontProductValidationActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/StoreFrontProductValidationActionGroup.xml
-new file mode 100644
-index 00000000000..f11394c643a
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/StoreFrontProductValidationActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StoreFrontProductValidationActionGroup">
-+        <arguments>
-+            <argument name="product" type="entity"/>
-+        </arguments>
-+        <amOnPage url="{{StorefrontProductPage.url(product.urlKey)}}" stepKey="seeProductPage"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{product.name}}" stepKey="seeProductInStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{product.sku}}" stepKey="seeCorrectSku"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{product.price}}" stepKey="seeCorrectPrice"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/StoreViewDisabledErrorSaveMessageActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/StoreViewDisabledErrorSaveMessageActionGroup.xml
-new file mode 100644
-index 00000000000..1cf48e9c825
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/StoreViewDisabledErrorSaveMessageActionGroup.xml
-@@ -0,0 +1,29 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StoreViewDisabledErrorSaveMessageActionGroup">
-+        <arguments>
-+            <argument name="storeGroupName" type="string"/>
-+            <argument name="storeView" type="string"/>
-+            <argument name="storeViewStatus" type="string"/>
-+        </arguments>
-+        <amOnPage  url="{{AdminSystemStoreViewPage.url}}" stepKey="amOnAdminSystemStoreViewPage"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-+        <selectOption userInput="{{storeGroupName}}" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
-+        <fillField userInput="{{storeView}}" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
-+        <fillField userInput="{{storeView}}" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
-+        <selectOption userInput="{{storeViewStatus}}" selector="{{AdminNewStoreSection.statusDropdown}}" stepKey="selectStoreViewStatus"/>
-+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreViewButton"/>
-+        <waitForElementVisible selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" stepKey="waitForAcceptNewStoreViewCreationButton"/>
-+        <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="clickAcceptNewStoreViewCreationButton"/>
-+        <waitForElementVisible selector="{{AdminStoresMainActionsSection.errorMessage}}" stepKey="waitForErrorMessage"/>
-+        <see selector="{{AdminStoresMainActionsSection.errorMessage}}" userInput="The default store cannot be disabled" stepKey="AssertStoreDisabledErrorSaveMessage"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
-index d14de9af9c1..d30fc1e5a2a 100644
---- a/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
-+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
-@@ -7,14 +7,19 @@
- -->
- <!-- Test XML Example -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="StorefrontSwitchStoreViewActionGroup">
-         <arguments>
-             <argument name="storeView" defaultValue="customStore"/>
-         </arguments>
-         <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher"/>
-         <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown"/>
--        <click selector="{{StorefrontHeaderSection.storeViewOption(storeView.name)}}" stepKey="clickSelectStoreView"/>
-+        <click selector="{{StorefrontHeaderSection.storeViewOption(storeView.code)}}" stepKey="clickSelectStoreView"/>
-         <waitForPageLoad stepKey="waitForPageLoad"/>
-     </actionGroup>
-+
-+    <actionGroup name="StorefrontSwitchDefaultStoreViewActionGroup" extends="StorefrontSwitchStoreViewActionGroup">
-+        <remove keyForRemoval="clickSelectStoreView"/>
-+        <click selector="{{StorefrontHeaderSection.storeViewOption('default')}}" stepKey="clickSelectDefaultStoreView" after="waitForStoreViewDropdown"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Store/Test/Mftf/Data/ProductWebsiteLinkData.xml b/app/code/Magento/Store/Test/Mftf/Data/ProductWebsiteLinkData.xml
-new file mode 100644
-index 00000000000..8e84b84c8aa
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Data/ProductWebsiteLinkData.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="ProductAssignToWebsite" type="product_website_link">
-+        <var key="sku" entityKey="sku" entityType="product"/>
-+    </entity>
-+</entities>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreConfigData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreConfigData.xml
-new file mode 100644
-index 00000000000..9f4de2ffb57
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreConfigData.xml
-@@ -0,0 +1,39 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="StorefrontDisableAddStoreCodeToUrls">
-+        <!-- Magento default value -->
-+        <data key="path">web/url/use_store</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="StorefrontEnableAddStoreCodeToUrls">
-+        <data key="path">web/url/use_store</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="MinifyJavaScriptFilesDisableConfigData">
-+        <!-- Default value -->
-+        <data key="path">dev/js/minify_files</data>
-+        <data key="scope">admin</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">No</data>
-+        <data key="value">0</data>
-+    </entity>
-+    <entity name="MinifyJavaScriptFilesEnableConfigData">
-+        <data key="path">dev/js/minify_files</data>
-+        <data key="scope">admin</data>
-+        <data key="scope_id">0</data>
-+        <data key="label">Yes</data>
-+        <data key="value">1</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
-index 9c3330ba741..1a1847bf383 100644
---- a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="_defaultStore" type="store">
-         <data key="name">Default Store View</data>
-         <data key="code">default</data>
-@@ -22,8 +22,8 @@
-         <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
-     </entity>
-     <entity name="customStoreEN" type="store">
--        <data key="name">EN</data>
--        <data key="code">en</data>
-+        <data key="name" unique="suffix">EN</data>
-+        <data key="code" unique="suffix">en</data>
-         <data key="is_active">1</data>
-         <data key="store_id">null</data>
-         <data key="store_action">add</data>
-@@ -31,22 +31,167 @@
-         <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
-     </entity>
-     <entity name="customStoreFR" type="store">
--        <data key="name">FR</data>
--        <data key="code">fr</data>
-+        <data key="name" unique="suffix">FR</data>
-+        <data key="code" unique="suffix">fr</data>
-         <data key="is_active">1</data>
-         <data key="store_id">null</data>
-         <data key="store_action">add</data>
-         <data key="store_type">group</data>
-         <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
-     </entity>
-+    <entity name="customStoreENNotUnique" type="store">
-+        <data key="name">EN</data>
-+        <data key="code">en</data>
-+        <data key="is_active">1</data>
-+        <data key="store_id">null</data>
-+        <data key="store_action">add</data>
-+        <data key="store_type">store</data>
-+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
-+    </entity>
-+    <entity name="customStoreNLNotUnique" type="store">
-+        <data key="name">NL</data>
-+        <data key="code">nl</data>
-+        <data key="is_active">1</data>
-+        <data key="store_id">null</data>
-+        <data key="store_action">add</data>
-+        <data key="store_type">store</data>
-+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
-+    </entity>
-     <entity name="staticStore" type="store">
-         <!--data key="group_id">customStoreGroup.id</data-->
--        <data key="name" >Second Store View</data>
--        <data key="code" >store123</data>
-+        <data key="name">Second Store View</data>
-+        <data key="code">store123</data>
-         <data key="is_active">1</data>
-         <data key="store_id">null</data>
-         <data key="store_action">add</data>
-         <data key="store_type">store</data>
-         <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
-     </entity>
--</entities>
-+    <entity name="staticSecondStore" extends="staticStore">
-+        <data key="name">Store View</data>
-+        <data key="code">store2</data>
-+    </entity>
-+    <entity name="NewStoreData" type="store">
-+        <data key="name" unique="suffix">Store</data>
-+        <data key="code" unique="suffix">StoreCode</data>
-+    </entity>
-+    <entity name="NewWebSiteData" type="webSite">
-+        <data key="name" unique="suffix">WebSite</data>
-+        <data key="code" unique="suffix">WebSiteCode</data>
-+    </entity>
-+    <entity name="NewStoreViewData">
-+        <data key="name" unique="suffix">StoreView</data>
-+        <data key="code" unique="suffix">StoreViewCode</data>
-+    </entity>
-+
-+    <!-- For creation 10 Store Views-->
-+    <entity name="storeViewData" type="store">
-+        <data key="group_id">1</data>
-+        <data key="name" unique="suffix">storeView</data>
-+        <data key="code" unique="suffix">storeView</data>
-+        <data key="is_active">1</data>
-+        <data key="store_id">null</data>
-+        <data key="store_type">store</data>
-+        <data key="store_action">add</data>
-+    </entity>
-+    <entity name="storeViewData1" type="store">
-+        <data key="group_id">1</data>
-+        <data key="name" unique="suffix">storeView</data>
-+        <data key="code" unique="suffix">storeView</data>
-+        <data key="is_active">1</data>
-+        <data key="store_id">null</data>
-+        <data key="store_type">store</data>
-+        <data key="store_action">add</data>
-+    </entity>
-+    <entity name="storeViewData2" type="store">
-+        <data key="group_id">1</data>
-+        <data key="name" unique="suffix">storeView</data>
-+        <data key="code" unique="suffix">storeView</data>
-+        <data key="is_active">1</data>
-+        <data key="store_id">null</data>
-+        <data key="store_type">store</data>
-+        <data key="store_action">add</data>
-+    </entity>
-+    <entity name="storeViewData3" type="store">
-+        <data key="group_id">1</data>
-+        <data key="name" unique="suffix">storeView</data>
-+        <data key="code" unique="suffix">storeView</data>
-+        <data key="is_active">1</data>
-+        <data key="store_id">null</data>
-+        <data key="store_type">store</data>
-+        <data key="store_action">add</data>
-+    </entity>
-+    <entity name="storeViewData4" type="store">
-+        <data key="group_id">1</data>
-+        <data key="name" unique="suffix">storeView</data>
-+        <data key="code" unique="suffix">storeView</data>
-+        <data key="is_active">1</data>
-+        <data key="store_id">null</data>
-+        <data key="store_type">store</data>
-+        <data key="store_action">add</data>
-+    </entity>
-+    <entity name="storeViewData5" type="store">
-+        <data key="group_id">1</data>
-+        <data key="name" unique="suffix">storeView</data>
-+        <data key="code" unique="suffix">storeView</data>
-+        <data key="is_active">1</data>
-+        <data key="store_id">null</data>
-+        <data key="store_type">store</data>
-+        <data key="store_action">add</data>
-+    </entity>
-+    <entity name="storeViewData6" type="store">
-+        <data key="group_id">1</data>
-+        <data key="name" unique="suffix">storeView</data>
-+        <data key="code" unique="suffix">storeView</data>
-+        <data key="is_active">1</data>
-+        <data key="store_id">null</data>
-+        <data key="store_type">store</data>
-+        <data key="store_action">add</data>
-+    </entity>
-+    <entity name="storeViewData7" type="store">
-+        <data key="group_id">1</data>
-+        <data key="name" unique="suffix">storeView</data>
-+        <data key="code" unique="suffix">storeView</data>
-+        <data key="is_active">1</data>
-+        <data key="store_id">null</data>
-+        <data key="store_type">store</data>
-+        <data key="store_action">add</data>
-+    </entity>
-+    <entity name="SecondStoreUnique" type="store">
-+        <data key="name" unique="suffix">Second Store View </data>
-+        <data key="code" unique="suffix">second_store_view_</data>
-+        <data key="is_active">1</data>
-+        <data key="store_id">null</data>
-+        <data key="store_action">add</data>
-+        <data key="store_type">store</data>
-+        <requiredEntity type="storeGroup">SecondStoreGroup</requiredEntity>
-+    </entity>
-+    <entity name="storeViewDataDisabled" type="store">
-+        <data key="group_id">1</data>
-+        <data key="name" unique="suffix">storeView</data>
-+        <data key="code" unique="suffix">storeView</data>
-+        <data key="is_active">0</data>
-+        <data key="store_id">null</data>
-+        <data key="store_type">store</data>
-+        <data key="store_action">add</data>
-+    </entity>
-+    <entity name="storeViewGermany" type="store">
-+        <data key="group_id">1</data>
-+        <data key="name" unique="suffix">DE_</data>
-+        <data key="code" unique="suffix">de_</data>
-+        <data key="is_active">1</data>
-+        <data key="store_id">null</data>
-+        <data key="store_type">store</data>
-+        <data key="store_action">add</data>
-+    </entity>
-+
-+    <!-- Store views from file "prepared-for-sample-data.csv"-->
-+    <entity name="secondStoreView" type="store">
-+        <data key="name">second_storeview</data>
-+        <data key="code">second_storeview</data>
-+    </entity>
-+    <entity name="thirdStoreView" type="store">
-+        <data key="name">third_store_view</data>
-+        <data key="code">third_store_view</data>
-+    </entity>
-+</entities>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
-index 8c293bc22f2..7cbd686dea0 100644
---- a/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="_defaultStoreGroup" type="group">
-         <data key="name">Main Website Store</data>
-         <data key="code">main_website_store</data>
-@@ -21,10 +21,43 @@
-         <data key="store_action">add</data>
-         <data key="store_type">group</data>
-     </entity>
-+    <entity name="SecondStoreGroup" type="group">
-+        <data key="group_id">null</data>
-+        <data key="name">Second Store</data>
-+        <data key="code">second_store</data>
-+        <var key="root_category_id" entityKey="id" entityType="category"/>
-+        <data key="store_action">add</data>
-+        <data key="store_type">group</data>
-+    </entity>
-+    <entity name="SecondStoreGroupUnique" type="group">
-+        <data key="group_id">null</data>
-+        <data key="name" unique="suffix">Second Store </data>
-+        <data key="code" unique="suffix">second_store_</data>
-+        <var key="root_category_id" entityKey="id" entityType="category"/>
-+        <data key="store_action">add</data>
-+        <data key="store_type">group</data>
-+    </entity>
-     <entity name="staticStoreGroup" type="group">
-         <data key="name">NewStore</data>
--        <data key="code">Base12</data>
-+        <data key="code" unique="suffix">Base12</data>
-         <data key="root_category_id">2</data>
-         <data key="website_id">1</data>
-     </entity>
-+    <entity name="finnishStoreGroup" type="group">
-+        <data key="name">Finnish</data>
-+        <data key="code">fin</data>
-+        <data key="root_category_id">2</data>
-+        <data key="website_id">1</data>
-+    </entity>
-+    <entity name="swedishStoreGroup" type="group">
-+        <data key="name">Swedish</data>
-+        <data key="code">swd</data>
-+        <data key="root_category_id">2</data>
-+        <data key="website_id">1</data>
-+    </entity>
-+
-+    <entity name="staticFirstStoreGroup" extends="staticStoreGroup">
-+        <data key="name">NewStore</data>
-+        <data key="code">Base1</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Store/Test/Mftf/Data/StorePaymentMethodsData.xml b/app/code/Magento/Store/Test/Mftf/Data/StorePaymentMethodsData.xml
-new file mode 100644
-index 00000000000..912399142fa
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Data/StorePaymentMethodsData.xml
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="PaymentMethodsSettingConfig" type="zero_subtotal_checkout_config_state">
-+        <requiredEntity type="active">active</requiredEntity>
-+        <requiredEntity type="order_status">orderStatus</requiredEntity>
-+    </entity>
-+    <entity name="active" type="active">
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="orderStatus" type="order_status">
-+        <data key="value">processing</data>
-+    </entity>
-+
-+    <entity name="DisablePaymentMethodsSettingConfig" type="use_system_value_config_state">
-+        <requiredEntity type="zeroSubEnable">zeroSubEnable</requiredEntity>
-+        <requiredEntity type="zeroSubOrderStatus">zeroSubOrderStatus</requiredEntity>
-+    </entity>
-+    <entity name="zeroSubEnable" type="zeroSubEnable">
-+        <data key="value">1</data>
-+    </entity>
-+    <entity name="zeroSubOrderStatus" type="zeroSubOrderStatus">
-+        <data key="value">1</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreShippingMethodsData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreShippingMethodsData.xml
-new file mode 100644
-index 00000000000..bc9746c132d
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreShippingMethodsData.xml
-@@ -0,0 +1,44 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="FreeShippingMethodsSettingConfig" type="free_shipping_config_state">
-+        <requiredEntity type="active">active</requiredEntity>
-+    </entity>
-+    <entity name="active" type="active">
-+        <data key="value">1</data>
-+    </entity>
-+
-+    <!-- default configuration used to restore Magento config -->
-+    <entity name="DefaultShippingMethodsConfig" type="free_shipping_config_state">
-+        <requiredEntity type="active">DefaultFreeShipping</requiredEntity>
-+    </entity>
-+    <entity name="DefaultFreeShipping" type="active">
-+        <data key="value">0</data>
-+    </entity>
-+
-+    <entity name="DisableFreeShippingConfig" type="disable_free_shipping_config_state">
-+        <requiredEntity type="disableFreeShipping">disableFreeShipping</requiredEntity>
-+    </entity>
-+    <entity name="disableFreeShipping" type="disableFreeShipping">
-+        <data key="value">1</data>
-+    </entity>
-+
-+    <entity name="MinimumOrderAmount90" type="minimum_order_amount">
-+        <requiredEntity type="free_shipping_subtotal">Price</requiredEntity>
-+    </entity>
-+    <entity name="Price" type="free_shipping_subtotal">
-+        <data key="value">90</data>
-+    </entity>
-+
-+    <entity name="DefaultMinimumOrderAmount" type="minimum_order_amount">
-+        <requiredEntity type="free_shipping_subtotal">DefaultPrice</requiredEntity>
-+    </entity>
-+    <entity name="DefaultPrice" type="free_shipping_subtotal">
-+        <data key="value">0</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml b/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
-index e8528fba1ae..ae605256a28 100644
---- a/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="_defaultWebsite" type="website">
-         <data key="name">Main Website</data>
-         <data key="code">base</data>
-@@ -19,4 +19,12 @@
-         <data key="store_type">website</data>
-         <data key="website_id">null</data>
-     </entity>
--</entities>
-+    <entity name="secondCustomWebsite" extends="customWebsite">
-+        <data key="name" unique="suffix">Custom Website</data>
-+        <data key="code" unique="suffix">custom_website</data>
-+    </entity>
-+    <entity name="updateCustomWebsite" extends="customWebsite">
-+        <data key="name" unique="suffix">website_upd</data>
-+        <data key="code" unique="suffix">code_upd</data>
-+    </entity>
-+</entities>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Metadata/product_website_link-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/product_website_link-meta.xml
-new file mode 100644
-index 00000000000..ca0725f86c2
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Metadata/product_website_link-meta.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="ProductWebsiteLink" dataType="product_website_link" type="create" auth="adminOauth" url="/V1/products/{sku}/websites" method="POST">
-+        <contentType>application/json</contentType>
-+        <object dataType="product_website_link" key="productWebsiteLink">
-+            <field key="sku">string</field>
-+            <field key="websiteId">integer</field>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Store/Test/Mftf/Metadata/store-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/store-meta.xml
-index e0263b2c888..a1cfc69ecd7 100644
---- a/app/code/Magento/Store/Test/Mftf/Metadata/store-meta.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Metadata/store-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateStore" dataType="store" type="create"
-                auth="adminFormKey" url="/admin/system_store/save" method="POST" successRegex="/messages-message-success/" returnRegex="" >
-         <object dataType="store" key="store">
-diff --git a/app/code/Magento/Store/Test/Mftf/Metadata/store_group-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/store_group-meta.xml
-index bc117756a54..a8d8ff7b683 100644
---- a/app/code/Magento/Store/Test/Mftf/Metadata/store_group-meta.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Metadata/store_group-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateStoreGroup" dataType="group" type="create"
-                auth="adminFormKey" url="/admin/system_store/save" method="POST" successRegex="/messages-message-success/" returnRegex="" >
-         <contentType>application/x-www-form-urlencoded</contentType>
-diff --git a/app/code/Magento/Store/Test/Mftf/Metadata/store_payment_methods-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/store_payment_methods-meta.xml
-new file mode 100644
-index 00000000000..cbad7265cbb
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Metadata/store_payment_methods-meta.xml
-@@ -0,0 +1,46 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+    <operation name="EnableZeroSubtotalCheckoutConfigState" dataType="zero_subtotal_checkout_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
-+        <object key="groups" dataType="zero_subtotal_checkout_config_state">
-+            <object key="free" dataType="zero_subtotal_checkout_config_state">
-+                <object key="fields" dataType="zero_subtotal_checkout_config_state">
-+                    <object key="active" dataType="active">
-+                        <field key="value">string</field>
-+                    </object>
-+                    <object key="order_status" dataType="order_status">
-+                        <field key="value">string</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+
-+    <operation name="DisablePaymentMethodsSettingConfig" dataType="use_system_value_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
-+        <object key="groups" dataType="use_system_value_config_state">
-+            <object key="free" dataType="use_system_value_config_state">
-+                <object key="fields" dataType="use_system_value_config_state">
-+                    <object key="active" dataType="use_system_value_config_state">
-+                        <object key="inherit" dataType="zeroSubEnable">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                    <object key="order_status" dataType="use_system_value_config_state">
-+                        <object key="inherit" dataType="zeroSubOrderStatus">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+
-+</operations>
-+
-diff --git a/app/code/Magento/Store/Test/Mftf/Metadata/store_shipping_methods-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/store_shipping_methods-meta.xml
-new file mode 100644
-index 00000000000..6f88bca7602
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Metadata/store_shipping_methods-meta.xml
-@@ -0,0 +1,49 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+    <operation name="EnableFreeShippingConfigState" dataType="free_shipping_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/carriers/" method="POST">
-+        <object key="groups" dataType="free_shipping_config_state">
-+            <object key="freeshipping" dataType="free_shipping_config_state">
-+                <object key="fields" dataType="free_shipping_config_state">
-+                    <object key="active" dataType="active">
-+                        <field key="value">string</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+
-+    <operation name="DisableFreeShippingConfigState" dataType="disable_free_shipping_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/carriers/" method="POST">
-+        <object key="groups" dataType="disable_free_shipping_config_state">
-+            <object key="freeshipping" dataType="disable_free_shipping_config_state">
-+                <object key="fields" dataType="disable_free_shipping_config_state">
-+                    <object key="active" dataType="disable_free_shipping_config_state">
-+                        <object key="inherit" dataType="disableFreeShipping">
-+                            <field key="value">integer</field>
-+                        </object>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+
-+    <operation name="MinimumOrderAmount" dataType="minimum_order_amount" type="create" auth="adminFormKey" url="/admin/system_config/save/section/carriers/" method="POST">
-+        <object key="groups" dataType="minimum_order_amount">
-+            <object key="freeshipping" dataType="minimum_order_amount">
-+                <object key="fields" dataType="minimum_order_amount">
-+                    <object key="free_shipping_subtotal" dataType="free_shipping_subtotal">
-+                        <field key="value">string</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-+
-diff --git a/app/code/Magento/Store/Test/Mftf/Metadata/website-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/website-meta.xml
-index 4e314396ab0..bad274501f7 100644
---- a/app/code/Magento/Store/Test/Mftf/Metadata/website-meta.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Metadata/website-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateWebsite" dataType="website" type="create"
-                auth="adminFormKey" url="/admin/system_store/save" method="POST" successRegex="/messages-message-success/" returnRegex="">
-         <object dataType="website" key="website">
-diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreDeletePage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreDeletePage.xml
-index 3ec22d31351..79472f1cc28 100644
---- a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreDeletePage.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreDeletePage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminSystemStoreDeletePage" url="system_store/deleteStore" module="Magento_Store" area="admin">
-         <section name="AdminStoreBackupOptionsSection"/>
-     </page>
-diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreEditPage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreEditPage.xml
-index fe2bfcab39a..6b020a1bffd 100644
---- a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreEditPage.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreEditPage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminSystemStoreEditPage" url="system_store/editStore" module="Magento_Store" area="admin">
-         <section name="AdminNewStoreViewMainActionsSection"/>
-         <section name="AdminNewStoreSection"/>
-diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupEditPage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupEditPage.xml
-index 634ee6d651a..386869a8fa1 100644
---- a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupEditPage.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupEditPage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminSystemStoreGroupEditPage" url="admin/system_store/editGroup" area="admin" module="Magento_Store">
-         <section name="AdminStoreGroupActionsSection"/>
-     </page>
-diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupPage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupPage.xml
-index 3c73d019aa5..8d48f3fd804 100644
---- a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupPage.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupPage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminSystemStoreGroupPage" url="admin/system_store/newGroup" module="Magento_Store" area="admin">
-         <section name="AdminNewStoreGroupSection"/>
-     </page>
-diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStorePage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStorePage.xml
-index 9eed4f6557a..c309c47035b 100644
---- a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStorePage.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStorePage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminSystemStorePage" url="/admin/system_store/" area="admin" module="Magento_Store">
-         <section name="AdminStoresMainActionsSection"/>
-         <section name="AdminStoresGridSection"/>
-diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreViewPage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreViewPage.xml
-index 15ed31c19f9..4a7de70fb3c 100644
---- a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreViewPage.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreViewPage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminSystemStoreViewPage" url="admin/system_store/newStore" module="Magento_Store" area="admin">
-         <section name="AdminNewStoreViewMainActionsSection"/>
-         <section name="AdminNewStoreSection"/>
-diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreWebsitePage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreWebsitePage.xml
-index 6f99e4340a0..9296d2667b9 100644
---- a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreWebsitePage.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreWebsitePage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminSystemStoreWebsitePage" url="admin/system_store/newWebsite" module="Magento_Store" area="admin">
-         <section name="AdminNewWebsiteSection"/>
-     </page>
-diff --git a/app/code/Magento/Store/Test/Mftf/Page/StorefrontStoreHomePage.xml b/app/code/Magento/Store/Test/Mftf/Page/StorefrontStoreHomePage.xml
-new file mode 100644
-index 00000000000..0e6b578882f
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Page/StorefrontStoreHomePage.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontStoreHomePage" url="/{{store_view}}/" area="storefront" module="Magento_Store" parameterized="true">
-+        <section name="StorefrontHeaderSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
-index 0927a1ffc95..14160835af3 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
-@@ -7,10 +7,12 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminMainActionsSection">
-         <element name="storeSwitcher" type="text" selector=".store-switcher"/>
-         <element name="storeViewDropdown" type="button" selector="#store-change-button"/>
--        <element name="storeViewByName" type="button" selector="//*[@class='store-switcher-store-view  ']/a[contains(text(), '{{storeViewName}}')]" timeout="30" parameterized="true"/>
-+        <element name="storeViewByName" type="button" selector="//*[contains(@class,'store-switcher-store-view')]/*[contains(text(), '{{storeViewName}}')]" timeout="30" parameterized="true"/>
-+        <element name="websiteByName" type="button" selector="//*[@class='store-switcher-website  ']/a[contains(text(), '{{websiteName}}')]" timeout="30" parameterized="true"/>
-+        <element name="allStoreViews" type="button" selector=".store-switcher .store-switcher-all" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupActionsSection.xml
-index f026c7765b6..66e1407f17b 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupActionsSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupActionsSection.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminNewStoreGroupActionsSection">
-         <element name="backButton" type="button" selector="#back" timeout="30"/>
-         <element name="delete" type="button" selector="#delete" timeout="30"/>
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
-index 106a0f4de5e..fb98c669837 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
-@@ -5,11 +5,12 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminNewStoreGroupSection">
-         <element name="storeGrpWebsiteDropdown" type="select" selector="#group_website_id"/>
-         <element name="storeGrpNameTextField" type="input" selector="#group_name"/>
-         <element name="storeGrpCodeTextField" type="input" selector="#group_code"/>
-         <element name="storeRootCategoryDropdown" type="select" selector="#group_root_category_id"/>
-+        <element name="acceptNewStoreGroupCreation" type="button" selector=".action-primary.action-accept" />
-     </section>
- </sections>
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreSection.xml
-index cec7a1f4f81..5a7d9bba7eb 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreSection.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminNewStoreSection">
-         <element name="storeNameTextField" type="input" selector="#store_name"/>
-         <element name="storeCodeTextField" type="input" selector="#store_code"/>
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
-index a3b5d1e6163..0e3a74fccf9 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
-@@ -5,11 +5,12 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminNewStoreViewActionsSection">
-         <element name="backButton" type="button" selector="#back" timeout="30"/>
-         <element name="delete" type="button" selector="#delete" timeout="30"/>
-         <element name="resetButton" type="button" selector="#reset" timeout="30"/>
-         <element name="saveButton" type="button" selector="#save" timeout="60"/>
-+        <element name="loadingMask" type="text" selector=".loading-mask"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml
-index 703abea8cfd..89c0ad15e7d 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminNewWebsiteActionsSection">
-         <element name="saveWebsite" type="button" selector="#save" timeout="60"/>
-     </section>
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteSection.xml
-index 21dee5f6b6e..ea67cf71ccd 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminNewWebsiteSection">
-         <element name="name" type="input" selector="#website_name"/>
-         <element name="code" type="input" selector="#website_code"/>
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoreBackupOptionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreBackupOptionsSection.xml
-index 58248b19437..82ec219f541 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoreBackupOptionsSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreBackupOptionsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminStoreBackupOptionsSection">
-         <element name="createBackupSelect" type="select" selector="select#store_create_backup"/>
-     </section>
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
-index 6dc766c0c02..9ad0f40cc4d 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
-@@ -5,8 +5,9 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminStoreGroupActionsSection">
-         <element name="saveButton" type="button" selector="#save" timeout="60" />
-+        <element name="okButton" type="button" selector="//footer[@class='modal-footer']//button[@class='action-primary action-accept']/span" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteStoreGroupSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteStoreGroupSection.xml
-index ba3d9660b44..8ac48dae364 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteStoreGroupSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteStoreGroupSection.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminStoresDeleteStoreGroupSection">
-         <element name="createDbBackup" type="select" selector="#store_create_backup"/>
-         <element name="deleteStoreGroupButton" type="button" selector="#delete" timeout="30"/>
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
-index 50c536dcfe8..1bdf7f0c22c 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
-@@ -5,9 +5,9 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminStoresDeleteWebsiteSection">
-         <element name="createDbBackup" type="select" selector="#store_create_backup"/>
--        <element name="deleteButton" type="button" selector="#delete" timeout="30"/>
-+        <element name="deleteButton" type="button" selector="#delete" timeout="120"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
-index 7630f316d80..e8333bd3075 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminStoresGridControlsSection">
-         <element name="createStoreView" type="button" selector="#add_store"/>
-         <element name="createStore" type="button" selector="#add_group"/>
-@@ -14,12 +14,17 @@
-     <section name="AdminStoresGridSection">
-         <element name="storeGrpFilterTextField" type="input" selector="#storeGrid_filter_group_title"/>
-         <element name="websiteFilterTextField" type="input" selector="#storeGrid_filter_website_title"/>
--        <element name="storeFilterTextField" type="input" selector="#storeGrid_filter_store_title"/>
-+        <element name="storeFilterTextField" type="input" selector="#storeGrid_filter_store_title" timeout="90"/>
-         <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]" timeout="30"/>
--        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"  timeout="30"/>
-         <element name="websiteNameInFirstRow" type="text" selector=".col-website_title>a"/>
-         <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
-         <element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
-         <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
-+        <element name="nthRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[{{rownum}}]" parameterized="true"/>
-+        <element name="successMessage" type="text" selector="//div[@class='message message-success success']/div"/>
-+        <element name="emptyText" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
-+        <element name="websiteName" type="text" selector="//td[@class='a-left col-website_title  ']/a[contains(.,'{{websiteName}}')]" parameterized="true"/>
-+        <element name="gridCell" type="text" selector="//table[@class='data-grid']//tr[{{row}}]//td[count(//table[@class='data-grid']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
-      </section>
- </sections>
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml
-index d86a68d0f7b..35f4507a80f 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml
-@@ -5,13 +5,14 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminStoresMainActionsSection">
-         <element name="createStoreViewButton" type="button" selector="#add_store" timeout="30"/>
-         <element name="createStoreButton" type="button" selector="#add_group" timeout="30"/>
-         <element name="createWebsiteButton" type="button" selector="#add" timeout="30"/>
--        <element name="saveButton" type="button" selector="#save" timeout="30"/>
-+        <element name="saveButton" type="button" selector="#save" timeout="90"/>
-         <element name="backButton" type="button" selector="#back" timeout="30"/>
-         <element name="deleteButton" type="button" selector="#delete" timeout="30"/>
-+        <element name="errorMessage" type="text" selector="//div[@class='message message-error error']/div"/>
-     </section>
--</sections>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
-index 4bb62a5a7f6..416808e58e6 100644
---- a/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
-@@ -6,10 +6,13 @@
-   */
- -->
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontHeaderSection">
-         <element name="storeViewSwitcher" type="button" selector="#switcher-language-trigger"/>
--        <element name="storeViewDropdown" type="button" selector="ul.switcher-dropdown"/>
-+        <element name="storeViewDropdown" type="button" selector=".active ul.switcher-dropdown"/>
-         <element name="storeViewOption" type="button" selector="li.view-{{var1}}>a" parameterized="true"/>
-+        <element name="storeView" type="button" selector="//div[@class='actions dropdown options switcher-options active']//ul//li//a[contains(text(),'{{var}}')]" parameterized="true"/>
-+        <element name="storeViewList" type="button" selector="//li[contains(.,'{{storeViewName}}')]//a" parameterized="true"/>
-+        <element name="storeViewName" type="text" selector="//*[@id='switcher-language-trigger']//span"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateCustomStoreViewStatusDisabledVerifyErrorSaveMessageTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateCustomStoreViewStatusDisabledVerifyErrorSaveMessageTest.xml
-new file mode 100644
-index 00000000000..94e723c9afa
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateCustomStoreViewStatusDisabledVerifyErrorSaveMessageTest.xml
-@@ -0,0 +1,47 @@
-+<?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="AdminCreateCustomStoreViewStatusDisabledVerifyErrorSaveMessageTest">
-+            <annotations>
-+                <stories value="Create Store View"/>
-+                <title value="Create Custom Store View Status Disabled and Verify Error Save Message"/>
-+                <description value="Test log in to Stores and Create Custom Store View Status Enabled and Verify Error Save Message Test"/>
-+                <testCaseId value="MC-14309"/>
-+                <severity value="CRITICAL"/>
-+                <group value="store"/>
-+                <group value="mtf_migrated"/>
-+            </annotations>
-+            <before>
-+                <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+                <!--Create website-->
-+                <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
-+                    <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
-+                    <argument name="websiteCode" value="{{customWebsite.code}}"/>
-+                </actionGroup>
-+                <!-- Create store -->
-+                <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createStore">
-+                    <argument name="website" value="{{customWebsite.name}}"/>
-+                    <argument name="storeGroupName" value="{{customStore.name}}"/>
-+                    <argument name="storeGroupCode" value="{{customStore.code}}"/>
-+                </actionGroup>
-+            </before>
-+            <after>
-+                <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-+                    <argument name="websiteName" value="{{customWebsite.name}}"/>
-+                </actionGroup>
-+                <actionGroup ref="logout" stepKey="logout"/>
-+            </after>
-+
-+            <!--Create store view selecting store created, choose disabled status and verify AssertStoreDisabledErrorSaveMessage-->
-+            <actionGroup ref="StoreViewDisabledErrorSaveMessageActionGroup" stepKey="createStoreViewAssertStoreDisabledErrorSaveMessage">
-+                <argument name="storeGroupName" value="{{customStore.name}}"/>
-+                <argument name="storeView" value="storeViewDataDisabled"/>
-+                <argument name="storeViewStatus" value="{{storeViewDataDisabled.is_active}}"/>
-+            </actionGroup>
-+        </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateCustomStoreViewStatusEnabledVerifyAbsenceOfDeleteButtonTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateCustomStoreViewStatusEnabledVerifyAbsenceOfDeleteButtonTest.xml
-new file mode 100644
-index 00000000000..7cd44d4d0ae
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateCustomStoreViewStatusEnabledVerifyAbsenceOfDeleteButtonTest.xml
-@@ -0,0 +1,59 @@
-+<?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="AdminCreateCustomStoreViewStatusEnabledVerifyAbsenceOfDeleteButtonTest">
-+            <annotations>
-+                <stories value="Create Store View"/>
-+                <title value="Create Custom Store View Status Enabled and Verify Absence Of Delete Button"/>
-+                <description value="Test log in to Stores and Create Custom Store View Status Enabled and Verify Absence Of Delete Button Test"/>
-+                <testCaseId value="MC-14308"/>
-+                <severity value="CRITICAL"/>
-+                <group value="store"/>
-+                <group value="mtf_migrated"/>
-+            </annotations>
-+            <before>
-+                <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+                <!-- Create store -->
-+                <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createFirstStore">
-+                    <argument name="website" value="{{_defaultWebsite.name}}"/>
-+                    <argument name="storeGroupName" value="{{customStore.name}}"/>
-+                    <argument name="storeGroupCode" value="{{customStore.code}}"/>
-+                </actionGroup>
-+            </before>
-+            <after>
-+                <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteStore">
-+                    <argument name="storeGroupName" value="customStore.name"/>
-+                </actionGroup>
-+                <actionGroup ref="logout" stepKey="logout"/>
-+            </after>
-+
-+            <!--Create custom store view-->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
-+                <argument name="StoreGroup" value="customStore"/>
-+                <argument name="customStore" value="storeViewData"/>
-+            </actionGroup>
-+
-+            <!--Save the above store view and verify AssertStoreViewSuccessSaveMessage-->
-+            <actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="verifyAssertStoreViewSuccessSaveMessage"/>
-+
-+            <!--Search store view(from above step) in grid-->
-+            <actionGroup ref="AssertStoreViewInGridActionGroup" stepKey="searchStoreViewInGrid">
-+                <argument name="storeViewName" value="{{storeViewData.name}}"/>
-+            </actionGroup>
-+
-+            <!--Go to store view form page and verify AssertStoreForm-->
-+            <actionGroup ref="AssertStoreViewFormActionGroup" stepKey="verifyStoreViewForm">
-+                <argument name="storeDropdown" value="{{customStore.name}}"/>
-+                <argument name="storeViewName" value="{{storeViewData.name}}"/>
-+                <argument name="storeViewCode" value="{{storeViewData.code}}"/>
-+                <argument name="status" value="Enabled"/>
-+            </actionGroup>
-+            <!--Go to store view form page and verify AssertStoreNoDeleteButton-->
-+            <dontSee selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="AssertStoreNoDeleteButton"/>
-+        </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateCustomStoreViewStatusEnabledVerifyBackendAndFrontendTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateCustomStoreViewStatusEnabledVerifyBackendAndFrontendTest.xml
-new file mode 100644
-index 00000000000..18485abadc0
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateCustomStoreViewStatusEnabledVerifyBackendAndFrontendTest.xml
-@@ -0,0 +1,69 @@
-+<?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="AdminCreateCustomStoreViewStatusEnabledVerifyBackendAndFrontendTest">
-+            <annotations>
-+                <stories value="Create Store View"/>
-+                <title value="Create Custom Store View Status Enabled and Verify Backend and Frontend"/>
-+                <description value="Test log in to Stores and Create Custom Store View Status Enabled and Verify Backend and Frontend Test"/>
-+                <testCaseId value="MC-14306"/>
-+                <severity value="CRITICAL"/>
-+                <group value="store"/>
-+                <group value="mtf_migrated"/>
-+            </annotations>
-+            <before>
-+                <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+                <!-- Create store -->
-+                <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createStore">
-+                    <argument name="website" value="{{_defaultWebsite.name}}"/>
-+                    <argument name="storeGroupName" value="{{customStore.name}}"/>
-+                    <argument name="storeGroupCode" value="{{customStore.code}}"/>
-+                </actionGroup>
-+            </before>
-+            <after>
-+                <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteStore">
-+                    <argument name="storeGroupName" value="customStore.name"/>
-+                </actionGroup>
-+                <actionGroup ref="logout" stepKey="logout"/>
-+            </after>
-+
-+            <!--Create custom store view-->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
-+                <argument name="StoreGroup" value="customStore"/>
-+                <argument name="customStore" value="storeViewData"/>
-+            </actionGroup>
-+
-+            <!--Save the above store view and verify AssertStoreViewSuccessSaveMessage-->
-+            <actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="verifyAssertStoreViewSuccessSaveMessage"/>
-+
-+            <!--Search store view(from above step) in grid and verify AssertStoreInGrid-->
-+            <actionGroup ref="AssertStoreViewInGridActionGroup" stepKey="searchStoreViewInGrid">
-+                <argument name="storeViewName" value="{{storeViewData.name}}"/>
-+            </actionGroup>
-+
-+            <!--Go to store view form page and verify AssertStoreForm-->
-+            <actionGroup ref="AssertStoreViewFormActionGroup" stepKey="verifyStoreViewForm">
-+                <argument name="storeDropdown" value="{{customStore.name}}"/>
-+                <argument name="storeViewName" value="{{storeViewData.name}}"/>
-+                <argument name="storeViewCode" value="{{storeViewData.code}}"/>
-+                <argument name="status" value="Enabled"/>
-+            </actionGroup>
-+
-+            <!--Go to store configuration page and verify AssertStoreBackend-->
-+            <actionGroup ref="AssertStoreConfigurationBackendActionGroup" stepKey="verifyValuesOnStoreBackend">
-+                <argument name="website" value="{{_defaultWebsite.name}}"/>
-+                <argument name="customStore" value="{{customStore.name}}"/>
-+                <argument name="storeView1" value="{{storeViewData.name}}"/>
-+            </actionGroup>
-+
-+            <!--Go to storefront and verify AssertStoreFrontend-->
-+            <actionGroup ref="AssertStorefrontStoreVisibleInFooterActionGroup" stepKey="verifyValuesOnStoreFrontend">
-+                <argument name="customStore" value="{{customStore.name}}"/>
-+            </actionGroup>
-+        </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateNewLocalizedStoreViewStatusEnabledTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateNewLocalizedStoreViewStatusEnabledTest.xml
-new file mode 100644
-index 00000000000..8e9fe1e71ce
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateNewLocalizedStoreViewStatusEnabledTest.xml
-@@ -0,0 +1,43 @@
-+<?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="AdminCreateNewLocalizedStoreViewStatusEnabledTest">
-+            <annotations>
-+                <stories value="Create Store View"/>
-+                <title value="Create New Localized Store View Status Enabled and Verify Save Message"/>
-+                <description value="Test log in to Stores and Create New Localized Store View Status Enabled Test"/>
-+                <testCaseId value="MC-14307"/>
-+                <severity value="CRITICAL"/>
-+                <group value="store"/>
-+                <group value="mtf_migrated"/>
-+            </annotations>
-+            <before>
-+                <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            </before>
-+            <after>
-+                <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
-+                    <argument name="customStore" value="storeViewGermany"/>
-+                </actionGroup>
-+                <actionGroup ref="logout" stepKey="logout"/>
-+            </after>
-+
-+            <!--Create new localized store view-->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
-+                <argument name="StoreGroup" value="_defaultStoreGroup"/>
-+                <argument name="customStore" value="storeViewGermany"/>
-+            </actionGroup>
-+
-+            <!--Save the above store view and verify AssertStoreViewSuccessSaveMessage-->
-+            <actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="verifyAssertStoreViewSuccessSaveMessage"/>
-+
-+            <!--Search store view(from above step) in grid and verify AssertStoreInGrid-->
-+            <actionGroup ref="AssertStoreViewInGridActionGroup" stepKey="searchStoreViewInGrid">
-+                <argument name="storeViewName" value="{{storeViewGermany.name}}"/>
-+            </actionGroup>
-+        </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml
-index e3345c1f2f0..25e93f8f6ff 100644
---- a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <!-- Test XML Example -->
--<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateStoreGroupTest">
-         <annotations>
-             <features value="Store"/>
-@@ -14,6 +14,7 @@
-             <title value="Admin should be able to create a store group"/>
-             <description value="Admin should be able to create a store group"/>
-             <group value="store"/>
-+            <severity value="AVERAGE"/>
-         </annotations>
-         <before>
-             <createData stepKey="b1" entity="customStoreGroup"/>
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndDefaultCategoryTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndDefaultCategoryTest.xml
-new file mode 100644
-index 00000000000..8e8f31eaca8
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndDefaultCategoryTest.xml
-@@ -0,0 +1,58 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <test name="AdminCreateStoreGroupWithCustomWebsiteAndDefaultCategoryTest">
-+        <annotations>
-+            <stories value="Create Store Group"/>
-+            <title value="Create Store Group with Custom Website and Default Category"/>
-+            <description value="Test log in to Stores and Create Store Group with Custom Website and Default Category Test"/>
-+            <testCaseId value="MC-14300"/>
-+            <severity value="CRITICAL"/>
-+            <group value="store"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create website-->
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
-+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
-+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-+                <argument name="websiteName" value="{{customWebsite.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create custom store group with custom website and default category and verify AssertStoreGroupSuccessSaveMessage-->
-+        <actionGroup ref="CreateCustomStore" stepKey="createCustomStoreGroup">
-+            <argument name="website" value="{{customWebsite.name}}"/>
-+            <argument name="store" value="{{customStoreGroup.name}}"/>
-+            <argument name="rootCategory" value="Default Category"/>
-+        </actionGroup>
-+
-+        <!--Search created store group(from above step) in grid and verify AssertStoreGroupInGrid message-->
-+        <actionGroup ref="AssertStoreGroupInGrid" stepKey="seeCreatedStoreGroupInGrid">
-+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
-+        </actionGroup>
-+
-+        <!--Go to store group form page and verify AssertStoreGroupForm-->
-+        <actionGroup ref="AssertStoreGroupForm" stepKey="seeCreatedStoreGroupForm">
-+            <argument name="website" value="{{customWebsite.name}}"/>
-+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
-+            <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
-+            <argument name="rootCategory" value="Default Category"/>
-+        </actionGroup>
-+        <!--Also verify absence of delete button on store group form page(AssertStoreGroupNoDeleteButton)-->
-+        <dontSee selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="AssertStoreGroupNoDeleteButton"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndRootCategoryTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndRootCategoryTest.xml
-new file mode 100644
-index 00000000000..18f9822145d
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndRootCategoryTest.xml
-@@ -0,0 +1,64 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <test name="AdminCreateStoreGroupWithCustomWebsiteAndRootCategoryTest">
-+        <annotations>
-+            <stories value="Create Store Group"/>
-+            <title value="Create Store Group with Custom Website and Root Category"/>
-+            <description value="Test log in to Stores and Create Store Group with Custom Website and Root Category Test"/>
-+            <testCaseId value="MC-14299"/>
-+            <severity value="CRITICAL"/>
-+            <group value="store"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create root category-->
-+            <createData entity="NewRootCategory" stepKey="rootCategory"/>
-+            <createData entity="SimpleRootSubCategory" stepKey="category">
-+                <requiredEntity createDataKey="rootCategory"/>
-+            </createData>
-+            <!--Create website-->
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
-+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
-+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <!--Delete website-->
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-+                <argument name="websiteName" value="{{customWebsite.name}}"/>
-+            </actionGroup>
-+            <!--Delete root category-->
-+            <deleteData stepKey="deleteRootCategory" createDataKey="rootCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create custom store group with custom website and root category and verify AssertStoreGroupSuccessSaveMessage-->
-+        <actionGroup ref="CreateCustomStore" stepKey="createCustomStoreGroup">
-+            <argument name="website" value="{{customWebsite.name}}"/>
-+            <argument name="store" value="{{customStoreGroup.name}}"/>
-+            <argument name="rootCategory" value="$$rootCategory.name$$"/>
-+        </actionGroup>
-+
-+        <!--Search created store group(from above step) in grid and verify AssertStoreGroupInGrid-->
-+        <actionGroup ref="AssertStoreGroupInGrid" stepKey="seeCreatedStoreGroupInGrid">
-+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
-+        </actionGroup>
-+
-+        <!--Go to store group form page and verify AssertStoreGroupForm and AssertStoreGroupOnStoreViewForm-->
-+        <actionGroup ref="AssertStoreGroupForm" stepKey="seeCreatedStoreGroupInForm">
-+            <argument name="website" value="{{customWebsite.name}}"/>
-+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
-+            <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
-+            <argument name="rootCategory" value="$$rootCategory.name$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithDefaultWebsiteAndDefaultCategoryTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithDefaultWebsiteAndDefaultCategoryTest.xml
-new file mode 100644
-index 00000000000..ddc5d061c1d
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithDefaultWebsiteAndDefaultCategoryTest.xml
-@@ -0,0 +1,51 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <test name="AdminCreateStoreGroupWithDefaultWebsiteAndDefaultCategoryTest">
-+        <annotations>
-+            <stories value="Create Store Group"/>
-+            <title value="Create Store Group with Default Website and Default Category"/>
-+            <description value="Test log in to Stores and Create Store Group with Default Website and Default Category Test"/>
-+            <testCaseId value="MC-14298"/>
-+            <severity value="CRITICAL"/>
-+            <group value="store"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteStoreGroup">
-+                <argument name="storeGroupName" value="SecondStoreGroupUnique.name"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create custom store group with default website and default category and verify AssertStoreGroupSuccessSaveMessage-->
-+        <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewCustomStoreGroup">
-+            <argument name="website" value="{{_defaultWebsite.name}}"/>
-+            <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
-+            <argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
-+        </actionGroup>
-+
-+        <!--Search created store group(from above step) in grid and verify AssertStoreGroupInGrid-->
-+        <actionGroup ref="AssertStoreGroupInGrid" stepKey="seeCreatedStoreGroupInGrid">
-+            <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
-+        </actionGroup>
-+
-+        <!--Go to store group form page and verify AssertStoreGroupForm and AssertStoreGroupOnStoreViewForm-->
-+        <actionGroup ref="AssertStoreGroupForm" stepKey="seeCreatedStoreGroupForm">
-+            <argument name="website" value="{{_defaultWebsite.name}}"/>
-+            <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
-+            <argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
-+            <argument name="rootCategory" value="Default Category"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewStatusDisabledVerifyBackendAndFrontendTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewStatusDisabledVerifyBackendAndFrontendTest.xml
-new file mode 100644
-index 00000000000..6ccab965b77
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewStatusDisabledVerifyBackendAndFrontendTest.xml
-@@ -0,0 +1,49 @@
-+<?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="AdminCreateStoreViewStatusDisabledVerifyBackendAndFrontendTest">
-+            <annotations>
-+                <stories value="Create Store View"/>
-+                <title value="Create Store View Status Disabled and Verify Backend and Frontend"/>
-+                <description value="Test log in to Stores and Create Store View Status Disabled Test"/>
-+                <testCaseId value="MC-14305"/>
-+                <severity value="CRITICAL"/>
-+                <group value="store"/>
-+                <group value="mtf_migrated"/>
-+            </annotations>
-+            <before>
-+                <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            </before>
-+            <after>
-+                <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
-+                    <argument name="customStore" value="storeViewDataDisabled"/>
-+                </actionGroup>
-+                <actionGroup ref="logout" stepKey="logout"/>
-+            </after>
-+
-+            <!--Create store view-->
-+            <actionGroup ref="CreateStoreView" stepKey="createStoreView">
-+                <argument name="storeView" value="storeViewDataDisabled"/>
-+                <argument name="storeGroupName" value="_defaultStoreGroup.name"/>
-+                <argument name="storeViewStatus" value="storeViewDataDisabled.is_active"/>
-+            </actionGroup>
-+
-+            <!--Save the above store view and verify AssertStoreViewSuccessSaveMessage-->
-+            <actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="verifyAssertStoreViewSuccessSaveMessage"/>
-+
-+            <!--Go to store configuration page and verify AssertStoreBackend-->
-+            <actionGroup ref="AssertStoreConfigurationBackendActionGroup" stepKey="verifyValuesOnStoreBackend">
-+                <argument name="storeView1" value="{{storeViewDataDisabled.name}}"/>
-+            </actionGroup>
-+
-+            <!--Go to storefront and verify AssertStoreNotOnFrontend-->
-+            <actionGroup ref="AssertStorefrontStoreNotVisibleInFooterActionGroup" stepKey="verifyValuesNotOnStorefront">
-+                <argument name="store" value="{{storeViewDataDisabled.name}"/>
-+            </actionGroup>
-+        </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewStatusEnabledVerifyBackendAndFrontendTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewStatusEnabledVerifyBackendAndFrontendTest.xml
-new file mode 100644
-index 00000000000..c2f12bd2673
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewStatusEnabledVerifyBackendAndFrontendTest.xml
-@@ -0,0 +1,48 @@
-+<?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="AdminCreateStoreViewStatusEnabledVerifyBackendAndFrontendTest">
-+            <annotations>
-+                <stories value="Create Store View"/>
-+                <title value="Create Store View Status Enabled and Verify Backend and Frontend"/>
-+                <description value="Test log in to Stores and Create Store View Status Enabled Test"/>
-+                <testCaseId value="MC-14304"/>
-+                <severity value="CRITICAL"/>
-+                <group value="store"/>
-+                <group value="mtf_migrated"/>
-+            </annotations>
-+            <before>
-+                <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            </before>
-+            <after>
-+                <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
-+                    <argument name="customStore" value="storeViewData"/>
-+                </actionGroup>
-+                <actionGroup ref="logout" stepKey="logout"/>
-+            </after>
-+
-+            <!--Create store view-->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
-+                <argument name="StoreGroup" value="_defaultStoreGroup"/>
-+                <argument name="customStore" value="storeViewData"/>
-+            </actionGroup>
-+
-+            <!--Save the above store view and verify AssertStoreViewSuccessSaveMessage-->
-+            <actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="verifyAssertStoreViewSuccessSaveMessage"/>
-+
-+            <!--Go to store configuration page and verify AssertStoreBackend-->
-+            <actionGroup ref="AssertStoreConfigurationBackendActionGroup" stepKey="verifyValuesOnStoreBackend">
-+                <argument name="storeView1" value="{{storeViewData.name}}"/>
-+            </actionGroup>
-+
-+            <!--Go to storefront and verify AssertStoreFrontend-->
-+            <actionGroup ref="AssertStorefrontStoreVisibleInHeaderActionGroup" stepKey="verifyValuesOnStoreFrontend">
-+                <argument name="store" value="{{storeViewData.name}}"/>
-+            </actionGroup>
-+        </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
-index d38d4dc992a..e20eb70ae6f 100644
---- a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
-@@ -6,23 +6,41 @@
-   */
- -->
- <!-- Test XML Example -->
--<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-         <test name="AdminCreateStoreViewTest">
-             <annotations>
-                 <features value="Store"/>
-                 <stories value="Create a store view in admin"/>
--                <title value="Admin should be able to create a store view"/>
--                <description value="Admin should be able to create a store view"/>
-+                <title value="Admin shouldn't be able to create a Store View with the same code"/>
-+                <description value="Admin shouldn't be able to create a Store View with the same code"/>
-                 <group value="storeView"/>
-+                <severity value="AVERAGE"/>
-+                <useCaseId value="MAGETWO-95111"/>
-+                <testCaseId value="MC-15422"/>
-             </annotations>
-+
-             <before>
--                <actionGroup ref="LoginActionGroup" stepKey="login"/>
-+                <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
-+                <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
-             </before>
--            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
--            <!--Confirm new store view on Store Grid-->
--            <fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilter"/>
--            <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch" />
--            <waitForPageLoad stepKey="waitForPageLoad"/>
--            <see selector="{{AdminStoresGridSection.storeNameInFirstRow}}" userInput="{{customStore.name}}" stepKey="seeNewStoreView" />
-+
-+            <after>
-+                <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
-+                    <argument name="customStore" value="customStore"/>
-+                </actionGroup>
-+                <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-+                <actionGroup ref="logout" stepKey="logout"/>
-+            </after>
-+
-+            <!--Filter grid and see created store view-->
-+            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
-+            <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-+            <fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilterField"/>
-+            <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch"/>
-+            <see selector="{{AdminStoresGridSection.gridCell('1', 'Store View')}}" userInput="{{customStore.name}}" stepKey="seeNewStoreView"/>
-+            <!--Try to create store view with the same code-->
-+            <actionGroup ref="AdminCreateStoreViewWithoutCheckActionGroup" stepKey="createSameStoreView"/>
-+            <dontSeeElement selector="{{AdminMessagesSection.success}}" stepKey="dontSeeSuccessMessage"/>
-+            <see selector="{{AdminMessagesSection.error}}" userInput="Store with the same code already exists." stepKey="seeErrorMessage"/>
-         </test>
- </tests>
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml
-new file mode 100644
-index 00000000000..1608d0b7b5a
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml
-@@ -0,0 +1,48 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <test name="AdminCreateWebsiteTest">
-+        <annotations>
-+            <stories value="Create Website"/>
-+            <title value="Create Website and Verify Store Form"/>
-+            <description value="Test log in to Stores and Create Website Test"/>
-+            <testCaseId value="MC-14302"/>
-+            <severity value="CRITICAL"/>
-+            <group value="store"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-+                <argument name="websiteName" value="{{customWebsite.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Create website and AssertWebsiteSuccessSaveMessage-->
-+        <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
-+            <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
-+            <argument name="websiteCode" value="{{customWebsite.code}}"/>
-+        </actionGroup>
-+
-+        <!--Search created website in grid and verify AssertWebsiteInGrid-->
-+        <actionGroup ref="AssertWebsiteInGrid" stepKey="seeWebsiteInGrid">
-+            <argument name="websiteName" value="{{customWebsite.name}}"/>
-+        </actionGroup>
-+
-+        <!--Verify website name and websitecode on website form (AssertWebsiteForm and AssertWebsiteOnStoreForm)-->
-+        <actionGroup ref="AssertWebsiteForm" stepKey="seeWebsiteForm">
-+            <argument name="websiteName" value="{{customWebsite.name}}"/>
-+            <argument name="websiteCode" value="{{customWebsite.code}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreGroupTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreGroupTest.xml
-new file mode 100644
-index 00000000000..652537f7864
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreGroupTest.xml
-@@ -0,0 +1,55 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <test name="AdminDeleteStoreGroupTest">
-+        <annotations>
-+            <stories value="Delete Store Group"/>
-+            <title value="Delete store group and save backup"/>
-+            <description value="Test log in to Stores and Delete Store Group Test"/>
-+            <testCaseId value="MC-14297"/>
-+            <severity value="CRITICAL"/>
-+            <group value="store"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set system/backup/functionality_enabled 1" stepKey="setEnableBackupToYes"/>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create custom store group-->
-+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewCustomStoreGroup">
-+                <argument name="website" value="{{_defaultWebsite.name}}"/>
-+                <argument name="storeGroupName" value="{{customStore.name}}"/>
-+                <argument name="storeGroupCode" value="{{customStore.code}}"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set system/backup/functionality_enabled 0" stepKey="setEnableBackupToNo"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Delete custom store group and verify AssertStoreGroupSuccessDeleteAndBackupMessages-->
-+        <actionGroup ref="DeleteCustomStoreBackupEnabledYesActionGroup" stepKey="deleteCustomStoreGroup">
-+            <argument name="storeGroupName" value="{{customStore.name}}"/>
-+        </actionGroup>
-+
-+        <!--Verify deleted Store group is not present in grid and verify AssertStoreGroupNotInGrid message-->
-+        <actionGroup ref="AssertStoreNotInGrid" stepKey="verifyDeletedStoreGroupNotInGrid">
-+            <argument name="storeGroupName" value="{{customStore.name}}"/>
-+        </actionGroup>
-+
-+        <!--Go to backup index page and verify AssertBackupInGrid-->
-+        <amOnPage url="{{BackupIndexPage.url}}" stepKey="goToBackupIndexPage"/>
-+        <waitForPageLoad stepKey="waitForBackupIndexPageLoad"/>
-+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{WebSetupWizardBackup.name}}" stepKey="seeBackupInGrid"/>
-+        <!--Delete database backup-->
-+        <actionGroup ref="deleteBackup" stepKey="deleteDatabaseBackup">
-+            <argument name="backup" value="WebSetupWizardBackup"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreViewTest.xml
-new file mode 100644
-index 00000000000..fc1dcb5ee1a
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreViewTest.xml
-@@ -0,0 +1,58 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <test name="AdminDeleteStoreViewTest">
-+        <annotations>
-+            <stories value="Delete Store View"/>
-+            <title value="Delete Store View and Save Backup"/>
-+            <description value="Test log in to Stores and Delete Store View"/>
-+            <testCaseId value="MC-14303"/>
-+            <severity value="CRITICAL"/>
-+            <group value="store"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set system/backup/functionality_enabled 1" stepKey="setEnableBackupToYes"/>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create custom store view-->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
-+                <argument name="StoreGroup" value="_defaultStoreGroup"/>
-+                <argument name="customStore" value="storeViewData"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set system/backup/functionality_enabled 0" stepKey="setEnableBackupToNo"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Delete custom store view and verify AssertStoreSuccessDeleteMessage And BackupMessage-->
-+        <actionGroup ref="DeleteCustomStoreViewBackupEnabledYesActionGroup" stepKey="deleteCustomStoreView">
-+            <argument name="storeViewName" value="{{storeViewData.name}}"/>
-+        </actionGroup>
-+
-+        <!--Verify deleted store view not present in grid and verify AssertStoreNotInGrid Message-->
-+        <actionGroup ref="AssertStoreViewNotInGrid" stepKey="verifyDeletedStoreViewNotInGrid">
-+            <argument name="storeViewName" value="{{storeViewData.name}}"/>
-+        </actionGroup>
-+
-+        <!--Go to backup index page and verify AssertBackupInGrid-->
-+        <amOnPage url="{{BackupIndexPage.url}}" stepKey="goToBackupIndexPage"/>
-+        <waitForPageLoad stepKey="waitForBackupIndexPageLoad"/>
-+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{WebSetupWizardBackup.name}}" stepKey="seeBackupInGrid"/>
-+        <!--Delete database backup-->
-+        <actionGroup ref="deleteBackup" stepKey="deleteDatabaseBackup">
-+            <argument name="backup" value="WebSetupWizardBackup"/>
-+        </actionGroup>
-+
-+        <!--Go to storefront and verify AssertStoreNotOnFrontend-->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontHomePageLoad"/>
-+        <dontSee selector="{{StorefrontHeaderSection.storeViewList(storeViewData.name)}}" stepKey="dontSeeAssertStoreViewNameOnStorefront"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminMoveStoreToOtherGroupSameWebsiteTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminMoveStoreToOtherGroupSameWebsiteTest.xml
-new file mode 100644
-index 00000000000..b86b99936db
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminMoveStoreToOtherGroupSameWebsiteTest.xml
-@@ -0,0 +1,95 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <test name="AdminMoveStoreToOtherGroupSameWebsiteTest">
-+        <annotations>
-+            <stories value="Move Store"/>
-+            <title value="Move Store To Other Group Same Website and Verify Backend and Frontend"/>
-+            <description value="Test log in to Stores and Move Store To Other Group Same Website Test"/>
-+            <testCaseId value="MC-14294"/>
-+            <severity value="CRITICAL"/>
-+            <group value="store"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!-- Create first store -->
-+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createFirstStore">
-+                <argument name="website" value="{{_defaultWebsite.name}}"/>
-+                <argument name="storeGroupName" value="{{customStore.name}}"/>
-+                <argument name="storeGroupCode" value="{{customStore.code}}"/>
-+            </actionGroup>
-+            <!-- Create first store view -->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createFirstStoreView">
-+                <argument name="StoreGroup" value="customStore"/>
-+                <argument name="customStore" value="storeViewData1"/>
-+            </actionGroup>
-+            <!-- Create second store -->
-+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStore">
-+                <argument name="website" value="{{_defaultWebsite.name}}"/>
-+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
-+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
-+            </actionGroup>
-+            <!-- Create second store view -->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
-+                <argument name="StoreGroup" value="customStoreGroup"/>
-+                <argument name="customStore" value="storeViewData2"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteFirstStore">
-+                <argument name="storeGroupName" value="customStore.name"/>
-+            </actionGroup>
-+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteSecondStore">
-+                <argument name="storeGroupName" value="customStoreGroup.name"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Search created second store view in grid-->
-+        <actionGroup ref="AssertStoreViewInGridActionGroup" stepKey="searchCreatedStoreViewInGrid">
-+            <argument name="storeViewName" value="{{storeViewData2.name}}"/>
-+        </actionGroup>
-+        <!--Move created store view to other store keeping website same-->
-+        <actionGroup ref="ChangeStoreInStoreViewActionGroup" stepKey="moveStoreView">
-+            <argument name="storeDropdown" value="{{customStore.name}}"/>
-+        </actionGroup>
-+        <!--Save the above store view and verify AssertStoreViewSuccessSaveMessage-->
-+        <actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="verifyAssertStoreViewSuccessSaveMessage"/>
-+
-+        <!--Search moved store view(from above step) in grid and verify AssertStoreInGrid-->
-+        <actionGroup ref="AssertStoreViewInGridActionGroup" stepKey="searchMovedStoreViewInGrid">
-+            <argument name="storeViewName" value="{{storeViewData2.name}}"/>
-+        </actionGroup>
-+
-+        <!--Go to store view form page and verify AssertStoreForm-->
-+        <actionGroup ref="AssertStoreViewFormActionGroup" stepKey="verifyStoreViewForm">
-+            <argument name="storeDropdown" value="{{customStore.name}}"/>
-+            <argument name="storeViewName" value="{{storeViewData2.name}}"/>
-+            <argument name="storeViewCode" value="{{storeViewData2.code}}"/>
-+            <argument name="status" value="Enabled"/>
-+        </actionGroup>
-+
-+        <!--Go to store configuration page and verify AssertStoreBackend-->
-+        <actionGroup ref="AssertStoreConfigurationBackendActionGroup" stepKey="verifyValuesOnStoreBackend">
-+            <argument name="website" value="{{_defaultWebsite.name}}"/>
-+            <argument name="customStore" value="{{customStore.name}}"/>
-+            <argument name="storeView1" value="{{storeViewData1.name}}"/>
-+            <argument name="storeView2" value="{{storeViewData2.name}}"/>
-+        </actionGroup>
-+
-+        <!--Go to storefront and verify AssertStoreFrontend-->
-+        <actionGroup ref="AssertStoreFrontendActionGroup" stepKey="verifyValuesOnStoreFrontend">
-+            <argument name="customStore" value="{{customStore.name}}"/>
-+            <argument name="storeView1" value="{{storeViewData1.name}}"/>
-+            <argument name="storeView2" value="{{storeViewData2.name}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
-new file mode 100644
-index 00000000000..9c84388d86f
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
-@@ -0,0 +1,76 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <test name="AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest">
-+        <annotations>
-+            <stories value="Update Store Group"/>
-+            <title value="Update Store Group, Accept Alert and Verify Store View Form"/>
-+            <description value="Test log in to Stores and Update Store Group Test"/>
-+            <testCaseId value="MC-14296"/>
-+            <severity value="CRITICAL"/>
-+            <group value="store"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create root category-->
-+            <createData entity="NewRootCategory" stepKey="rootCategory"/>
-+            <createData entity="SimpleRootSubCategory" stepKey="category">
-+                <requiredEntity createDataKey="rootCategory"/>
-+            </createData>
-+            <!--Create website-->
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
-+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
-+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
-+            </actionGroup>
-+            <!--Create custom store group-->
-+            <actionGroup ref="CreateCustomStore" stepKey="createCustomStoreGroup">
-+                <argument name="website" value="{{_defaultWebsite.name}}"/>
-+                <argument name="store" value="{{staticStoreGroup.name}}"/>
-+                <argument name="rootCategory" value="Default Category"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <!--Delete website-->
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-+                <argument name="websiteName" value="{{customWebsite.name}}"/>
-+            </actionGroup>
-+            <!--Delete root category-->
-+            <deleteData stepKey="deleteRootCategory" createDataKey="rootCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open created Store group in grid-->
-+        <actionGroup ref="AssertStoreGroupInGridActionGroup" stepKey="openCreatedStoreGroupInGrid">
-+            <argument name="storeGroupName" value="{{staticStoreGroup.name}}"/>
-+        </actionGroup>
-+        <click selector="{{AdminStoresGridSection.firstRow}}" stepKey="clickFirstRow"/>
-+        <waitForPageLoad stepKey="AdminSystemStoreGroupPageToOpen"/>
-+        <!--Update created Store group as per requirement and accept alert message-->
-+        <actionGroup ref="EditCustomStoreGroupAcceptWarningMessageActionGroup" stepKey="updateCustomStoreGroup">
-+            <argument name="website" value="{{customWebsite.name}}"/>
-+            <argument name="store" value="{{customStoreGroup.name}}"/>
-+            <argument name="rootCategory" value="$$rootCategory.name$$"/>
-+        </actionGroup>
-+
-+        <!--Search updated store group(from above step) in grid and verify AssertStoreGroupInGrid-->
-+        <actionGroup ref="AssertStoreGroupInGridActionGroup" stepKey="seeUpdatedStoreGroupInGrid">
-+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
-+        </actionGroup>
-+
-+        <!--Verify updated website name and updated websitecode on website form (AssertStoreGroupForm and AssertStoreGroupOnStoreViewForm)-->
-+        <actionGroup ref="AssertStoreGroupFormActionGroup" stepKey="seeUpdatedStoreGroupForm">
-+            <argument name="website" value="{{customWebsite.name}}"/>
-+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
-+            <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
-+            <argument name="rootCategory" value="$$rootCategory.name$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml
-new file mode 100644
-index 00000000000..3d85a349014
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml
-@@ -0,0 +1,66 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <test name="AdminUpdateStoreGroupAndVerifyStoreViewFormTest">
-+        <annotations>
-+            <stories value="Update Store Group"/>
-+            <title value="Update Store Group and Verify Store View Form"/>
-+            <description value="Test log in to Stores and Update Store Group Test"/>
-+            <testCaseId value="MC-14295"/>
-+            <severity value="CRITICAL"/>
-+            <group value="store"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create custom store group-->
-+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewCustomStoreGroup">
-+                <argument name="website" value="{{_defaultWebsite.name}}"/>
-+                <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
-+                <argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteStoreGroup">
-+                <argument name="storeGroupName" value="customStoreGroup.name"/>
-+            </actionGroup>
-+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteUpdatedStoreGroup">
-+                <argument name="storeGroupName" value="SecondStoreGroupUnique.name"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open created Store group in grid-->
-+        <actionGroup ref="AssertStoreGroupInGridActionGroup" stepKey="openCreatedStoreGroupInGrid">
-+            <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
-+        </actionGroup>
-+        <click selector="{{AdminStoresGridSection.firstRow}}" stepKey="clickFirstRow"/>
-+        <waitForPageLoad stepKey="AdminSystemStoreGroupPageToOpen"/>
-+        <!--Update created Store group as per requirement-->
-+        <actionGroup ref="CreateCustomStore" stepKey="createNewCustomStoreGroup">
-+            <argument name="website" value="{{_defaultWebsite.name}}"/>
-+            <argument name="store" value="{{customStoreGroup.name}}"/>
-+            <argument name="rootCategory" value="Default Category"/>
-+        </actionGroup>
-+
-+        <!--Search updated store group(from above step) in grid and verify AssertStoreGroupInGrid-->
-+        <actionGroup ref="AssertStoreGroupInGridActionGroup" stepKey="seeUpdatedStoreGroupInGrid">
-+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
-+        </actionGroup>
-+
-+        <!--Verify updated website name and updated websitecode on website form (AssertStoreGroupForm and AssertStoreGroupOnStoreViewForm)-->
-+        <actionGroup ref="AssertStoreGroupFormActionGroup" stepKey="seeUpdatedStoreGroupForm">
-+            <argument name="website" value="{{_defaultWebsite.name}}"/>
-+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
-+            <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
-+            <argument name="rootCategory" value="Default Category"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreViewTest.xml
-new file mode 100644
-index 00000000000..054ee789fbd
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreViewTest.xml
-@@ -0,0 +1,81 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+        <test name="AdminUpdateStoreViewTest">
-+            <annotations>
-+                <stories value="Update Store View"/>
-+                <title value="Update Store View and Verify Backend and Frontend"/>
-+                <description value="Test log in to Stores and Update Store View Test"/>
-+                <testCaseId value="MC-14316"/>
-+                <severity value="CRITICAL"/>
-+                <group value="store"/>
-+                <group value="mtf_migrated"/>
-+            </annotations>
-+            <before>
-+                <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+                <!--Create custom store view-->
-+                <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
-+                    <argument name="StoreGroup" value="_defaultStoreGroup"/>
-+                    <argument name="customStore" value="storeViewData"/>
-+                </actionGroup>
-+            </before>
-+            <after>
-+                <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
-+                    <argument name="customStore" value="storeViewData"/>
-+                </actionGroup>
-+                <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteUpdatedStoreView">
-+                    <argument name="customStore" value="SecondStoreUnique"/>
-+                </actionGroup>
-+                <actionGroup ref="logout" stepKey="logout"/>
-+            </after>
-+
-+            <!--Search created store view in grid-->
-+            <actionGroup ref="AssertStoreViewInGridActionGroup" stepKey="searchCreatedStoreViewInGrid">
-+                <argument name="storeViewName" value="{{storeViewData.name}}"/>
-+            </actionGroup>
-+            <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewFirstRowInGrid"/>
-+            <waitForPageLoad stepKey="waitForAdminSystemStoreViewPageLoad"/>
-+            <!--Update created store view as per requirements-->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="updateStoreView">
-+                <argument name="StoreGroup" value="_defaultStoreGroup"/>
-+                <argument name="customStore" value="SecondStoreUnique"/>
-+            </actionGroup>
-+            <!--Save the updated Store view and verify AssertStoreViewSuccessSaveMessage-->
-+            <actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="verifyAssertStoreViewSuccessSaveMessage">
-+            </actionGroup>
-+
-+            <!--Search updated store view in grid and verify AssertStoreViewInGridMessage-->
-+            <actionGroup ref="AssertStoreViewInGridActionGroup" stepKey="verifyUpdatedStoreViewInGrid">
-+                <argument name="storeViewName" value="{{SecondStoreUnique.name}}"/>
-+            </actionGroup>
-+
-+            <!--Go to store view form page and verify AssertStoreForm-->
-+            <actionGroup ref="AssertStoreViewFormActionGroup" stepKey="verifyStoreViewForm">
-+                <argument name="storeDropdown" value="{{_defaultStoreGroup.name}}"/>
-+                <argument name="storeViewName" value="{{SecondStoreUnique.name}}"/>
-+                <argument name="storeViewCode" value="{{SecondStoreUnique.code}}"/>
-+                <argument name="status" value="Enabled"/>
-+            </actionGroup>
-+
-+            <!--Go to store configuration page and verify AssertStoreBackend-->
-+            <amOnPage url="{{AdminConfigPage.url}}" stepKey="goToConfigStoreConfigurationPage"/>
-+            <waitForPageLoad stepKey="waitForSystemStoreConfigurationPageLoad" />
-+            <click selector="{{AdminConfigSection.defaultConfigButton}}" stepKey="clickDefaultConfigButton"/>
-+            <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{storeViewData.name}}" stepKey="seeAssertStoreViewInDefaultConfigDropdown"/>
-+            <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{SecondStoreUnique.name}}" stepKey="seeAssertUpdateStoreViewInDefaultConfigDropdown"/>
-+
-+            <!--Go to storefront and verify AssertStoreFrontend-->
-+            <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
-+            <waitForPageLoad stepKey="waitForStorefrontHomePageLoad"/>
-+            <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="selectStoreSwitcher"/>
-+            <waitForPageLoad stepKey="waitForFirstStoreView"/>
-+            <see selector="{{StorefrontHeaderSection.storeViewDropdown}}" userInput="{{storeViewData.name}}" stepKey="seeAssertStoreViewOnStorefront"/>
-+            <see selector="{{StorefrontHeaderSection.storeViewDropdown}}" userInput="{{SecondStoreUnique.name}}" stepKey="seeAssertUpdatedStoreViewOnStorefront"/>
-+        </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateWebsiteTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateWebsiteTest.xml
-new file mode 100644
-index 00000000000..6b666126569
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateWebsiteTest.xml
-@@ -0,0 +1,59 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <test name="AdminUpdateWebsiteTest">
-+        <annotations>
-+            <stories value="Update Website"/>
-+            <title value="Update Website and Verify Store Form"/>
-+            <description value="Test log in to Stores and Update Website Test"/>
-+            <testCaseId value="MC-14301"/>
-+            <severity value="CRITICAL"/>
-+            <group value="store"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <!--Create website-->
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
-+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
-+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-+                <argument name="websiteName" value="{{updateCustomWebsite.name}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Search created custom website in grid-->
-+        <actionGroup ref="AssertWebsiteInGrid" stepKey="seeWebsiteInGrid">
-+            <argument name="websiteName" value="{{customWebsite.name}}"/>
-+        </actionGroup>
-+        <click selector="{{AdminStoresGridSection.websiteName(customWebsite.name)}}" stepKey="clickWebsiteFirstRowInGrid"/>
-+        <waitForPageLoad stepKey="waitForWebsiteFormPageToOpen"/>
-+        <!--Update website name and website code as per data created and verify AssertWebsiteSuccessSaveMessage-->
-+        <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
-+            <argument name="newWebsiteName" value="{{updateCustomWebsite.name}}"/>
-+            <argument name="websiteCode" value="{{updateCustomWebsite.code}}"/>
-+        </actionGroup>
-+
-+        <!--Search updated custom website(from above step) in grid and verify AssertWebsiteInGrid-->
-+        <actionGroup ref="AssertWebsiteInGrid" stepKey="seeUpdatedWebsiteInGrid">
-+            <argument name="websiteName" value="{{updateCustomWebsite.name}}"/>
-+        </actionGroup>
-+
-+        <!--Verify updated website name and updated websitecode on website form (AssertWebsiteForm and AssertWebsiteOnStoreForm)-->
-+        <actionGroup ref="AssertWebsiteForm" stepKey="seeUpdatedWebsiteForm">
-+            <argument name="websiteName" value="{{updateCustomWebsite.name}}"/>
-+            <argument name="websiteCode" value="{{updateCustomWebsite.code}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Store/Test/Mftf/Test/StorefrontAddStoreCodeInUrlTest.xml b/app/code/Magento/Store/Test/Mftf/Test/StorefrontAddStoreCodeInUrlTest.xml
-new file mode 100644
-index 00000000000..eaebc7fdaf7
---- /dev/null
-+++ b/app/code/Magento/Store/Test/Mftf/Test/StorefrontAddStoreCodeInUrlTest.xml
-@@ -0,0 +1,32 @@
-+<?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="StorefrontAddStoreCodeInUrlTest">
-+        <annotations>
-+            <features value="Backend"/>
-+            <stories value="Admin Panel URL with Store Code"/>
-+            <title value="Store code should be added to storefront URL if the corresponding configuration is enabled"/>
-+            <description value="Store code should be added to storefront URL if the corresponding configuration is enabled"/>
-+            <testCaseId value="MC-15944"/>
-+            <severity value="CRITICAL"/>
-+            <group value="store"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <magentoCLI command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlEnable"/>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlDisable"/>
-+        </after>
-+
-+        <actionGroup ref="StorefrontClickOnHeaderLogoActionGroup" stepKey="clickOnStorefrontHeaderLogo"/>
-+        <actionGroup ref="AssertStorefrontStoreCodeInUrlActionGroup" stepKey="seeStoreCodeInUrl"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php
-index 4a9b7d798c3..5d0f11b8a98 100644
---- a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php
-+++ b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php
-@@ -12,45 +12,83 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @var \Magento\Store\App\Request\PathInfoProcessor
-      */
--    protected $_model;
-+    private $model;
- 
-     /**
-      * @var \PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $_storeManagerMock;
-+    private $requestMock;
- 
-     /**
-      * @var \PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $_requestMock;
-+    private $validatorConfigMock;
-+
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $processorConfigMock;
-+
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $pathInfoMock;
-+
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $storeRepositoryMock;
-+
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $storePathInfoValidator;
- 
-     /**
-      * @var string
-      */
--    protected $_pathInfo = '/storeCode/node_one/';
-+    protected $pathInfo = '/storeCode/node_one/';
- 
-     protected function setUp()
-     {
--        $this->_requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-+            ->disableOriginalConstructor()->getMock();
-+
-+        $this->validatorConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-+
-+        $this->processorConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-+
-+        $this->storeRepositoryMock = $this->createMock(\Magento\Store\Api\StoreRepositoryInterface::class);
-+
-+        $this->pathInfoMock = $this->getMockBuilder(\Magento\Framework\App\Request\PathInfo ::class)
-             ->disableOriginalConstructor()->getMock();
--        $this->_storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManager::class);
--        $this->_model = new \Magento\Store\App\Request\PathInfoProcessor($this->_storeManagerMock);
-+
-+        $this->storePathInfoValidator = new \Magento\Store\App\Request\StorePathInfoValidator(
-+            $this->validatorConfigMock,
-+            $this->storeRepositoryMock,
-+            $this->pathInfoMock
-+        );
-+
-+        $this->model = new \Magento\Store\App\Request\PathInfoProcessor(
-+            $this->storePathInfoValidator,
-+            $this->validatorConfigMock
-+        );
-     }
- 
-     public function testProcessIfStoreExistsAndIsNotDirectAccessToFrontName()
-     {
-+        $this->validatorConfigMock->expects($this->any())->method('getValue')->willReturn(true);
-+
-         $store = $this->createMock(\Magento\Store\Model\Store::class);
--        $this->_storeManagerMock->expects(
--            $this->once()
-+        $this->storeRepositoryMock->expects(
-+            $this->atLeastOnce()
-         )->method(
--            'getStore'
-+            'getActiveStoreByCode'
-         )->with(
-             'storeCode'
-         )->willReturn($store);
--        $store->expects($this->once())->method('getCode')->will($this->returnValue('storeCode'));
--        $store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true));
--        $this->_requestMock->expects(
--            $this->once()
-+        $this->requestMock->expects(
-+            $this->atLeastOnce()
-         )->method(
-             'isDirectAccessFrontendName'
-         )->with(
-@@ -58,67 +96,69 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase
-         )->will(
-             $this->returnValue(false)
-         );
--        $this->_storeManagerMock->expects($this->once())->method('setCurrentStore')->with('storeCode');
--        $this->assertEquals('/node_one/', $this->_model->process($this->_requestMock, $this->_pathInfo));
-+        $this->assertEquals('/node_one/', $this->model->process($this->requestMock, $this->pathInfo));
-     }
- 
-     public function testProcessIfStoreExistsAndDirectAccessToFrontName()
-     {
--        $store = $this->createMock(\Magento\Store\Model\Store::class);
--        $this->_storeManagerMock->expects(
--            $this->once()
-+        $this->validatorConfigMock->expects($this->atLeastOnce())->method('getValue')->willReturn(true);
-+
-+        $this->storeRepositoryMock->expects(
-+            $this->any()
-         )->method(
--            'getStore'
--        )->with(
--            'storeCode'
--        )->willReturn($store);
--        $store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true));
--        $this->_requestMock->expects(
--            $this->once()
-+            'getActiveStoreByCode'
-+        );
-+        $this->requestMock->expects(
-+            $this->atLeastOnce()
-         )->method(
-             'isDirectAccessFrontendName'
-         )->with(
-             'storeCode'
--        )->will(
--            $this->returnValue(true)
--        );
--        $this->_requestMock->expects($this->once())->method('setActionName')->with('noroute');
--        $this->assertEquals($this->_pathInfo, $this->_model->process($this->_requestMock, $this->_pathInfo));
-+        )->willReturn(true);
-+        $this->requestMock->expects($this->once())->method('setActionName')->with('noroute');
-+        $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo));
-     }
- 
-     public function testProcessIfStoreIsEmpty()
-     {
-+        $this->validatorConfigMock->expects($this->any())->method('getValue')->willReturn(true);
-+
-         $path = '/0/node_one/';
--        $store = $this->createMock(\Magento\Store\Model\Store::class);
--        $this->_storeManagerMock->expects(
--            $this->once()
-+        $this->storeRepositoryMock->expects(
-+            $this->never()
-         )->method(
--            'getStore'
--        )->with(
--            '0'
--        )->willReturn($store);
--        $store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true));
--        $this->_requestMock->expects(
--            $this->once()
-+            'getActiveStoreByCode'
-+        );
-+        $this->requestMock->expects(
-+            $this->never()
-         )->method(
-             'isDirectAccessFrontendName'
--        )->with(
--            '0'
--        )->will(
--            $this->returnValue(true)
-         );
--        $this->_requestMock->expects($this->never())->method('setActionName');
--        $this->assertEquals($path, $this->_model->process($this->_requestMock, $path));
-+        $this->requestMock->expects($this->never())->method('setActionName');
-+        $this->assertEquals($path, $this->model->process($this->requestMock, $path));
-     }
- 
-     public function testProcessIfStoreCodeIsNotExist()
-     {
--        $store = $this->createMock(\Magento\Store\Model\Store::class);
--        $this->_storeManagerMock->expects($this->once())->method('getStore')->with('storeCode')
-+        $this->validatorConfigMock->expects($this->atLeastOnce())->method('getValue')->willReturn(true);
-+
-+        $this->storeRepositoryMock->expects($this->once())->method('getActiveStoreByCode')->with('storeCode')
-             ->willThrowException(new NoSuchEntityException());
--        $store->expects($this->never())->method('isUseStoreInUrl');
--        $this->_requestMock->expects($this->never())->method('isDirectAccessFrontendName');
-+        $this->requestMock->expects($this->never())->method('isDirectAccessFrontendName');
-+
-+        $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo));
-+    }
-+
-+    public function testProcessIfStoreUrlNotEnabled()
-+    {
-+        $this->validatorConfigMock->expects($this->at(0))->method('getValue')->willReturn(true);
-+
-+        $this->validatorConfigMock->expects($this->at(1))->method('getValue')->willReturn(true);
-+
-+        $this->validatorConfigMock->expects($this->at(2))->method('getValue')->willReturn(false);
-+
-+        $this->storeRepositoryMock->expects($this->once())->method('getActiveStoreByCode')->willReturn(1);
- 
--        $this->assertEquals($this->_pathInfo, $this->_model->process($this->_requestMock, $this->_pathInfo));
-+        $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo));
-     }
- }
-diff --git a/app/code/Magento/Store/Test/Unit/Model/BaseUrlCheckerTest.php b/app/code/Magento/Store/Test/Unit/Model/BaseUrlCheckerTest.php
-index 0eea86da61b..78a627c195f 100644
---- a/app/code/Magento/Store/Test/Unit/Model/BaseUrlCheckerTest.php
-+++ b/app/code/Magento/Store/Test/Unit/Model/BaseUrlCheckerTest.php
-@@ -78,9 +78,9 @@ class BaseUrlCheckerTest extends \PHPUnit\Framework\TestCase
-     public function testIsEnabled()
-     {
-         $this->scopeConfig->expects($this->once())
--            ->method('getValue')
-+            ->method('isSetFlag')
-             ->with('web/url/redirect_to_base', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
--            ->willReturn(1);
-+            ->willReturn(!!1);
-         $this->assertTrue($this->baseUrlChecker->isEnabled());
-     }
- 
-@@ -89,15 +89,16 @@ class BaseUrlCheckerTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testIsFrontendSecure()
-     {
--        $this->scopeConfig->expects($this->exactly(2))
-+        $this->scopeConfig->expects($this->once())
-             ->method('getValue')
--            ->withConsecutive(
--                ['web/unsecure/base_url', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
--                ['web/secure/use_in_frontend', \Magento\Store\Model\ScopeInterface::SCOPE_STORE]
--            )->will($this->onConsecutiveCalls(
--                $this->returnValue('https://localhost'),
--                1
--            ));
-+            ->with('web/unsecure/base_url', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
-+            ->willReturn('https://localhost');
-+
-+        $this->scopeConfig->expects($this->once())
-+            ->method('isSetFlag')
-+            ->with('web/secure/use_in_frontend', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
-+            ->willReturn(!!1);
-+
-         $this->assertTrue($this->baseUrlChecker->isFrontendSecure());
-     }
- }
-diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/CreateTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/CreateTest.php
-index 2c2b0b00aec..0fbf7bb7f04 100644
---- a/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/CreateTest.php
-+++ b/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/CreateTest.php
-@@ -196,14 +196,30 @@ class CreateTest extends \PHPUnit\Framework\TestCase
-                 'root_category_id' => '1',
-                 'default_store_id' => '1',
-                 'code' => 'default',
-+            ],
-+            2 => [
-+                'group_id' => '1',
-+                'website_id' => '1',
-+                'name' => 'Default1',
-+                'default_store_id' => '1',
-+                'code' => 'default1',
-             ]
-         ];
--        $this->trimmedGroup = [
--            'name' => 'Default',
--            'root_category_id' => '1',
--            'code' => 'default',
--            'default_store_id' => '1',
--        ];
-+        $this->trimmedGroup =
-+            [
-+                0 => [
-+                    'name' => 'Default',
-+                    'root_category_id' => '1',
-+                    'code' => 'default',
-+                    'default_store_id' => '1',
-+                ],
-+                1 => [
-+                    'name' => 'Default1',
-+                    'root_category_id' => '0',
-+                    'code' => 'default1',
-+                    'default_store_id' => '1'
-+                ]
-+            ];
-         $this->stores = [
-             'default' => [
-                 'store_id' => '1',
-@@ -280,34 +296,34 @@ class CreateTest extends \PHPUnit\Framework\TestCase
-                 [ScopeInterface::SCOPE_GROUPS, $this->groups, $this->groups],
-             ]);
- 
--        $this->websiteMock->expects($this->once())
-+        $this->websiteMock->expects($this->exactly(2))
-             ->method('getResource')
-             ->willReturn($this->abstractDbMock);
- 
--        $this->groupMock->expects($this->once())
-+        $this->groupMock->expects($this->exactly(2))
-             ->method('setData')
--            ->with($this->trimmedGroup)
--            ->willReturnSelf();
--        $this->groupMock->expects($this->exactly(3))
-+            ->withConsecutive(
-+                [$this->equalTo($this->trimmedGroup[0])],
-+                [$this->equalTo($this->trimmedGroup[1])]
-+            )->willReturnSelf();
-+
-+        $this->groupMock->expects($this->exactly(6))
-             ->method('getResource')
-             ->willReturn($this->abstractDbMock);
--        $this->groupMock->expects($this->once())
--            ->method('setRootCategoryId')
--            ->with(0);
--        $this->groupMock->expects($this->once())
-+        $this->groupMock->expects($this->exactly(2))
-             ->method('getDefaultStoreId')
-             ->willReturn($defaultStoreId);
--        $this->groupMock->expects($this->once())
-+        $this->groupMock->expects($this->exactly(2))
-             ->method('setDefaultStoreId')
-             ->with($storeId);
--        $this->groupMock->expects($this->once())
-+        $this->groupMock->expects($this->exactly(2))
-             ->method('setWebsite')
-             ->with($this->websiteMock);
- 
--        $this->storeMock->expects($this->once())
-+        $this->storeMock->expects($this->exactly(2))
-             ->method('getResource')
-             ->willReturn($this->abstractDbMock);
--        $this->storeMock->expects($this->once())
-+        $this->storeMock->expects($this->exactly(2))
-             ->method('getStoreId')
-             ->willReturn($storeId);
- 
-@@ -315,11 +331,11 @@ class CreateTest extends \PHPUnit\Framework\TestCase
-             ->method('load')
-             ->withConsecutive([$this->websiteMock, 'base', 'code'], [$this->storeMock, 'default', 'code'])
-             ->willReturnSelf();
--        $this->abstractDbMock->expects($this->exactly(2))
-+        $this->abstractDbMock->expects($this->exactly(4))
-             ->method('save')
-             ->with($this->groupMock)
-             ->willReturnSelf();
--        $this->abstractDbMock->expects($this->once())
-+        $this->abstractDbMock->expects($this->exactly(2))
-             ->method('addCommitCallback')
-             ->willReturnCallback(function ($function) {
-                 return $function();
-diff --git a/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php b/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php
-index 0454c0096a6..9f4be98ab55 100644
---- a/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php
-+++ b/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php
-@@ -54,11 +54,6 @@ class StoreCookieTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $storeRepositoryMock;
- 
--    /**
--     * @var \Magento\Store\Api\StoreResolverInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $storeResolverMock;
--
-     /**
-      * Set up
-      */
-@@ -94,18 +89,12 @@ class StoreCookieTest extends \PHPUnit\Framework\TestCase
-             ->setMethods([])
-             ->getMock();
- 
--        $this->storeResolverMock = $this->getMockBuilder(\Magento\Store\Api\StoreResolverInterface::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--
-         $this->plugin = (new ObjectManager($this))->getObject(
-             \Magento\Store\Model\Plugin\StoreCookie::class,
-             [
-                 'storeManager' => $this->storeManagerMock,
-                 'storeCookieManager' => $this->storeCookieManagerMock,
--                'storeRepository' => $this->storeRepositoryMock,
--                'storeResolver' => $this->storeResolverMock
-+                'storeRepository' => $this->storeRepositoryMock
-             ]
-         );
-     }
-diff --git a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
-index f98cf5d892e..a83ca833a15 100644
---- a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
-+++ b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
-@@ -3,11 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- namespace Magento\Store\Test\Unit\Model;
- 
- use Magento\Framework\App\Config\ReinitableConfigInterface;
- use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\Session\SessionManagerInterface;
- use Magento\Store\Model\ScopeInterface;
- use Magento\Store\Model\Store;
- 
-@@ -38,6 +38,16 @@ class StoreTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $filesystemMock;
- 
-+    /**
-+     * @var ReinitableConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $configMock;
-+
-+    /**
-+     * @var SessionManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $sessionMock;
-+
-     /**
-      * @var \Magento\Framework\Url\ModifierInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -61,12 +71,22 @@ class StoreTest extends \PHPUnit\Framework\TestCase
-             'isSecure',
-             'getServer',
-         ]);
-+
-         $this->filesystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $this->configMock = $this->getMockBuilder(ReinitableConfigInterface::class)
-+            ->getMock();
-+        $this->sessionMock = $this->getMockBuilder(SessionManagerInterface::class)
-+            ->setMethods(['getCurrencyCode'])
-+            ->getMockForAbstractClass();
-         $this->store = $this->objectManagerHelper->getObject(
-             \Magento\Store\Model\Store::class,
--            ['filesystem' => $this->filesystemMock]
-+            [
-+                'filesystem' => $this->filesystemMock,
-+                'config' => $this->configMock,
-+                'session' => $this->sessionMock,
-+            ]
-         );
- 
-         $this->urlModifierMock = $this->createMock(\Magento\Framework\Url\ModifierInterface::class);
-@@ -140,7 +160,7 @@ class StoreTest extends \PHPUnit\Framework\TestCase
-         /** @var \Magento\Store\Model\Store $model */
-         $model = $this->objectManagerHelper->getObject(
-             \Magento\Store\Model\Store::class,
--            ['websiteRepository' => $websiteRepository,]
-+            ['websiteRepository' => $websiteRepository]
-         );
-         $model->setWebsiteId($websiteId);
- 
-@@ -161,7 +181,7 @@ class StoreTest extends \PHPUnit\Framework\TestCase
-         /** @var \Magento\Store\Model\Store $model */
-         $model = $this->objectManagerHelper->getObject(
-             \Magento\Store\Model\Store::class,
--            ['websiteRepository' => $websiteRepository,]
-+            ['websiteRepository' => $websiteRepository]
-         );
-         $model->setWebsiteId(null);
- 
-@@ -187,7 +207,7 @@ class StoreTest extends \PHPUnit\Framework\TestCase
-         /** @var \Magento\Store\Model\Store $model */
-         $model = $this->objectManagerHelper->getObject(
-             \Magento\Store\Model\Store::class,
--            ['groupRepository' => $groupRepository,]
-+            ['groupRepository' => $groupRepository]
-         );
-         $model->setGroupId($groupId);
- 
-@@ -208,7 +228,7 @@ class StoreTest extends \PHPUnit\Framework\TestCase
-         /** @var \Magento\Store\Model\Store $model */
-         $model = $this->objectManagerHelper->getObject(
-             \Magento\Store\Model\Store::class,
--            ['groupRepository' => $groupRepository,]
-+            ['groupRepository' => $groupRepository]
-         );
-         $model->setGroupId(null);
- 
-@@ -357,30 +377,31 @@ class StoreTest extends \PHPUnit\Framework\TestCase
-         $configMock = $this->getMockForAbstractClass(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-         $configMock->expects($this->atLeastOnce())
-             ->method('getValue')
--            ->will($this->returnCallback(
--                function ($path, $scope, $scopeCode) use ($expectedPath) {
--                    return $expectedPath == $path ? 'http://domain.com/' . $path . '/' : null;
--                }
--            ));
-+            ->willReturnCallback(function ($path, $scope, $scopeCode) use ($expectedPath) {
-+                return $expectedPath == $path ? 'http://domain.com/' . $path . '/' : null;
-+            });
-+        $this->requestMock->expects($this->once())
-+            ->method('getServer')
-+            ->with('SCRIPT_FILENAME')
-+            ->willReturn('test_script.php');
-+
-         /** @var \Magento\Store\Model\Store $model */
-         $model = $this->objectManagerHelper->getObject(
-             \Magento\Store\Model\Store::class,
-             [
-                 'config' => $configMock,
-                 'isCustomEntryPoint' => false,
-+                'request' => $this->requestMock
-             ]
-         );
-         $model->setCode('scopeCode');
- 
-         $this->setUrlModifier($model);
- 
--        $server = $_SERVER;
--        $_SERVER['SCRIPT_FILENAME'] = 'test_script.php';
-         $this->assertEquals(
-             $expectedBaseUrl,
-             $model->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_LINK, false)
-         );
--        $_SERVER = $server;
-     }
- 
-     /**
-@@ -572,7 +593,7 @@ class StoreTest extends \PHPUnit\Framework\TestCase
-         /** @var \Magento\Store\Model\Store $model */
-         $model = $this->objectManagerHelper->getObject(
-             \Magento\Store\Model\Store::class,
--            ['config' => $configMock, 'currencyInstalled' => $currencyPath,]
-+            ['config' => $configMock, 'currencyInstalled' => $currencyPath]
-         );
- 
-         $this->assertEquals($expectedResult, $model->getAllowedCurrencies());
-@@ -694,6 +715,80 @@ class StoreTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals('Store View', $this->store->getScopeTypeName());
-     }
- 
-+    /**
-+     * @param array $availableCodes
-+     * @param string $currencyCode
-+     * @param string $defaultCode
-+     * @param string $expectedCode
-+     * @return void
-+     * @dataProvider currencyCodeDataProvider
-+     */
-+    public function testGetCurrentCurrencyCode(
-+        array $availableCodes,
-+        string $currencyCode,
-+        string $defaultCode,
-+        string $expectedCode
-+    ): void {
-+        $this->store->setData('available_currency_codes', $availableCodes);
-+        $this->sessionMock->method('getCurrencyCode')
-+            ->willReturn($currencyCode);
-+        $this->configMock->method('getValue')
-+            ->with(\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT)
-+            ->willReturn($defaultCode);
-+
-+        $code = $this->store->getCurrentCurrencyCode();
-+        $this->assertEquals($expectedCode, $code);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function currencyCodeDataProvider(): array
-+    {
-+        return [
-+            [
-+                [
-+                    'USD',
-+                ],
-+                'USD',
-+                'USD',
-+                'USD',
-+            ],
-+            [
-+                [
-+                    'USD',
-+                    'EUR',
-+                ],
-+                'EUR',
-+                'USD',
-+                'EUR',
-+            ],
-+            [
-+                [
-+                    'EUR',
-+                    'USD',
-+                ],
-+                'GBP',
-+                'USD',
-+                'USD',
-+            ],
-+            [
-+                [
-+                    'USD',
-+                ],
-+                'GBP',
-+                'EUR',
-+                'USD',
-+            ],
-+            [
-+                [],
-+                'GBP',
-+                'EUR',
-+                'EUR',
-+            ],
-+        ];
-+    }
-+
-     /**
-      * @param \Magento\Store\Model\Store $model
-      */
-diff --git a/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php b/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php
-index f31acd40a2e..9b83714166b 100644
---- a/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php
-+++ b/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php
-@@ -80,7 +80,7 @@ class RouteParamsResolverTest extends \PHPUnit\Framework\TestCase
-         $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
-         $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
- 
--        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam');
-+        $this->queryParamsResolverMock->expects($this->any())->method('setQueryParam');
- 
-         $this->model->beforeSetRouteParams(
-             $routeParamsResolverMock,
-@@ -113,7 +113,7 @@ class RouteParamsResolverTest extends \PHPUnit\Framework\TestCase
-         $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
-         $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
- 
--        $this->queryParamsResolverMock->expects($this->once())->method('setQueryParam')->with('___store', $storeCode);
-+        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam')->with('___store', $storeCode);
- 
-         $this->model->beforeSetRouteParams(
-             $routeParamsResolverMock,
-@@ -178,7 +178,7 @@ class RouteParamsResolverTest extends \PHPUnit\Framework\TestCase
-         $routeParamsResolverMock->expects($this->never())->method('setScope');
-         $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn(false);
- 
--        $this->queryParamsResolverMock->expects($this->once())->method('setQueryParam')->with('___store', $storeCode);
-+        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam')->with('___store', $storeCode);
- 
-         $this->model->beforeSetRouteParams(
-             $routeParamsResolverMock,
-diff --git a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
-index 468352af78c..9c9d1e6023a 100644
---- a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
-+++ b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
-@@ -78,7 +78,7 @@ class RouteParamsResolver
-                 $storeCode
-             );
- 
--            if ($useStoreInUrl && !$this->storeManager->hasSingleStore()) {
-+            if (!$useStoreInUrl && !$this->storeManager->hasSingleStore()) {
-                 $this->queryParamsResolver->setQueryParam('___store', $storeCode);
-             }
-         }
-diff --git a/app/code/Magento/Store/ViewModel/SwitcherUrlProvider.php b/app/code/Magento/Store/ViewModel/SwitcherUrlProvider.php
-new file mode 100644
-index 00000000000..b0d08f06407
---- /dev/null
-+++ b/app/code/Magento/Store/ViewModel/SwitcherUrlProvider.php
-@@ -0,0 +1,72 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Store\ViewModel;
-+
-+use Magento\Framework\App\ActionInterface;
-+use Magento\Framework\Url\EncoderInterface;
-+use Magento\Framework\UrlInterface;
-+use Magento\Store\Model\Store;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Provides target store redirect url.
-+ */
-+class SwitcherUrlProvider implements \Magento\Framework\View\Element\Block\ArgumentInterface
-+{
-+    /**
-+     * @var EncoderInterface
-+     */
-+    private $encoder;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var UrlInterface
-+     */
-+    private $urlBuilder;
-+
-+    /**
-+     * @param EncoderInterface $encoder
-+     * @param StoreManagerInterface $storeManager
-+     * @param UrlInterface $urlBuilder
-+     */
-+    public function __construct(
-+        EncoderInterface $encoder,
-+        StoreManagerInterface $storeManager,
-+        UrlInterface $urlBuilder
-+    ) {
-+        $this->encoder = $encoder;
-+        $this->storeManager = $storeManager;
-+        $this->urlBuilder = $urlBuilder;
-+    }
-+
-+    /**
-+     * Returns target store redirect url.
-+     *
-+     * @param Store $store
-+     * @return string
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    public function getTargetStoreRedirectUrl(Store $store): string
-+    {
-+        return $this->urlBuilder->getUrl(
-+            'stores/store/redirect',
-+            [
-+                '___store' => $store->getCode(),
-+                '___from_store' => $this->storeManager->getStore()->getCode(),
-+                ActionInterface::PARAM_NAME_URL_ENCODED => $this->encoder->encode(
-+                    $store->getCurrentUrl(false)
-+                ),
-+            ]
-+        );
-+    }
-+}
-diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
-index ebaa32b95f4..6f05d65e732 100644
---- a/app/code/Magento/Store/composer.json
-+++ b/app/code/Magento/Store/composer.json
-@@ -11,7 +11,8 @@
-         "magento/module-config": "*",
-         "magento/module-directory": "*",
-         "magento/module-media-storage": "*",
--        "magento/module-ui": "*"
-+        "magento/module-ui": "*",
-+        "magento/module-backend": "*"
-     },
-     "suggest": {
-         "magento/module-deploy": "*"
-diff --git a/app/code/Magento/Store/etc/config.xml b/app/code/Magento/Store/etc/config.xml
-index d69fcad7aac..b9e7ac1c6ac 100644
---- a/app/code/Magento/Store/etc/config.xml
-+++ b/app/code/Magento/Store/etc/config.xml
-@@ -130,6 +130,8 @@
-                     <html>html</html>
-                     <phtml>phtml</phtml>
-                     <shtml>shtml</shtml>
-+                    <phpt>phpt</phpt>
-+                    <pht>pht</pht>
-                 </protected_extensions>
-                 <public_files_valid_paths>
-                     <protected>
-diff --git a/app/code/Magento/Store/etc/db_schema.xml b/app/code/Magento/Store/etc/db_schema.xml
-index 3c2bc3e3c11..6eea94b8dee 100644
---- a/app/code/Magento/Store/etc/db_schema.xml
-+++ b/app/code/Magento/Store/etc/db_schema.xml
-@@ -18,16 +18,16 @@
-                 identity="false" default="0" comment="Default Group Id"/>
-         <column xsi:type="smallint" name="is_default" padding="5" unsigned="true" nullable="true" identity="false"
-                 default="0" comment="Defines Is Website Default"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="website_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="STORE_WEBSITE_CODE">
-+        <constraint xsi:type="unique" referenceId="STORE_WEBSITE_CODE">
-             <column name="code"/>
-         </constraint>
--        <index name="STORE_WEBSITE_SORT_ORDER" indexType="btree">
-+        <index referenceId="STORE_WEBSITE_SORT_ORDER" indexType="btree">
-             <column name="sort_order"/>
-         </index>
--        <index name="STORE_WEBSITE_DEFAULT_GROUP_ID" indexType="btree">
-+        <index referenceId="STORE_WEBSITE_DEFAULT_GROUP_ID" indexType="btree">
-             <column name="default_group_id"/>
-         </index>
-     </table>
-@@ -42,18 +42,18 @@
-         <column xsi:type="smallint" name="default_store_id" padding="5" unsigned="true" nullable="false"
-                 identity="false" default="0" comment="Default Store Id"/>
-         <column xsi:type="varchar" name="code" nullable="true" length="32" comment="Store group unique code"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="group_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="STORE_GROUP_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID" table="store_group"
-+        <constraint xsi:type="foreign" referenceId="STORE_GROUP_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID" table="store_group"
-                     column="website_id" referenceTable="store_website" referenceColumn="website_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="STORE_GROUP_CODE">
-+        <constraint xsi:type="unique" referenceId="STORE_GROUP_CODE">
-             <column name="code"/>
-         </constraint>
--        <index name="STORE_GROUP_WEBSITE_ID" indexType="btree">
-+        <index referenceId="STORE_GROUP_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="STORE_GROUP_DEFAULT_STORE_ID" indexType="btree">
-+        <index referenceId="STORE_GROUP_DEFAULT_STORE_ID" indexType="btree">
-             <column name="default_store_id"/>
-         </index>
-     </table>
-@@ -70,24 +70,24 @@
-                 default="0" comment="Store Sort Order"/>
-         <column xsi:type="smallint" name="is_active" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Store Activity"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="store_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="STORE_GROUP_ID_STORE_GROUP_GROUP_ID" table="store" column="group_id"
-+        <constraint xsi:type="foreign" referenceId="STORE_GROUP_ID_STORE_GROUP_GROUP_ID" table="store" column="group_id"
-                     referenceTable="store_group" referenceColumn="group_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="STORE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID" table="store"
-+        <constraint xsi:type="foreign" referenceId="STORE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID" table="store"
-                     column="website_id" referenceTable="store_website" referenceColumn="website_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="STORE_CODE">
-+        <constraint xsi:type="unique" referenceId="STORE_CODE">
-             <column name="code"/>
-         </constraint>
--        <index name="STORE_WEBSITE_ID" indexType="btree">
-+        <index referenceId="STORE_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="STORE_IS_ACTIVE_SORT_ORDER" indexType="btree">
-+        <index referenceId="STORE_IS_ACTIVE_SORT_ORDER" indexType="btree">
-             <column name="is_active"/>
-             <column name="sort_order"/>
-         </index>
--        <index name="STORE_GROUP_ID" indexType="btree">
-+        <index referenceId="STORE_GROUP_ID" indexType="btree">
-             <column name="group_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
-index 5f088558b41..defe0694d01 100644
---- a/app/code/Magento/Store/etc/di.xml
-+++ b/app/code/Magento/Store/etc/di.xml
-@@ -65,7 +65,7 @@
-     <preference for="Magento\Framework\App\Router\PathConfigInterface" type="Magento\Store\Model\PathConfig" />
-     <type name="Magento\Framework\App\Action\AbstractAction">
-         <plugin name="storeCheck" type="Magento\Store\App\Action\Plugin\StoreCheck" sortOrder="10"/>
--        <plugin name="designLoader" type="Magento\Framework\App\Action\Plugin\Design" sortOrder="30"/>
-+        <plugin name="designLoader" type="Magento\Framework\App\Action\Plugin\Design" />
-     </type>
-     <type name="Magento\Framework\Url\SecurityInfo">
-         <plugin name="storeUrlSecurityInfo" type="Magento\Store\Url\Plugin\SecurityInfo"/>
-@@ -102,11 +102,15 @@
-     </type>
-     <type name="Magento\Store\Model\StoreResolver">
-         <arguments>
--            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
-             <argument name="runMode" xsi:type="init_parameter">Magento\Store\Model\StoreManager::PARAM_RUN_TYPE</argument>
-             <argument name="scopeCode" xsi:type="init_parameter">Magento\Store\Model\StoreManager::PARAM_RUN_CODE</argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Store\Model\StoresData">
-+        <arguments>
-+            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
-+        </arguments>
-+    </type>
-     <type name="Magento\Store\App\FrontController\Plugin\DefaultStore">
-         <arguments>
-             <argument name="runMode" xsi:type="init_parameter">Magento\Store\Model\StoreManager::PARAM_RUN_TYPE</argument>
-@@ -232,6 +236,7 @@
-     <type name="Magento\Framework\App\ScopeResolverPool">
-         <arguments>
-             <argument name="scopeResolvers" xsi:type="array">
-+                <item name="default" xsi:type="object">Magento\Framework\App\ScopeResolver</item>
-                 <item name="store" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
-                 <item name="stores" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
-                 <item name="group" xsi:type="object">Magento\Store\Model\Resolver\Group</item>
-diff --git a/app/code/Magento/Store/etc/frontend/di.xml b/app/code/Magento/Store/etc/frontend/di.xml
-index c39d5df8639..917aedad3d9 100644
---- a/app/code/Magento/Store/etc/frontend/di.xml
-+++ b/app/code/Magento/Store/etc/frontend/di.xml
-@@ -9,7 +9,7 @@
-     <type name="Magento\Framework\App\FrontController">
-         <plugin name="requestPreprocessor" type="Magento\Store\App\FrontController\Plugin\RequestPreprocessor" sortOrder="50"/>
-     </type>
--    <type name="Magento\Framework\App\Action\Action">
-+    <type name="Magento\Framework\App\Action\AbstractAction">
-         <plugin name="contextPlugin" type="Magento\Store\App\Action\Plugin\Context" sortOrder="10"/>
-     </type>
-     <type name="Magento\Framework\App\RouterList" shared="true">
-diff --git a/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml b/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml
-index 5ceb4b3f856..9c48469e9d5 100644
---- a/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml
-+++ b/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml
-@@ -4,15 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- // @deprecated
- ?>
--<?php if (count($block->getStores())>1): ?>
-+<?php if (count($block->getStores())>1) : ?>
- <div class="form-language">
-     <label for="select-language"><?= $block->escapeHtml(__('Your Language:')) ?></label>
-     <select id="select-language" title="<?= $block->escapeHtmlAttr(__('Your Language')) ?>" onchange="window.location.href=this.value" class="flags">
--    <?php foreach ($block->getStores() as $_lang): ?>
-+    <?php foreach ($block->getStores() as $_lang) : ?>
-         <?php $_selected = ($_lang->getId() == $block->getCurrentStoreId()) ? ' selected="selected"' : '' ?>
-         <option value="<?= $block->escapeUrl($_lang->getCurrentUrl()) ?>" style="background-image:url('<?= $block->escapeUrl($block->getViewFileUrl('images/flags/flag_' . $_lang->getCode() . '.gif')) ?>');"<?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($_lang->getName()) ?></option>
-     <?php endforeach; ?>
-diff --git a/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml b/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
-index 80152dbb9a0..87a2c40fdda 100644
---- a/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
-+++ b/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
-@@ -4,36 +4,34 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Store\Block\Switcher $block */
- ?>
--<?php if (count($block->getStores())>1): ?>
--<?php $id = $block->getIdModifier() ? '-' . $block->getIdModifier() : '' ?>
--<div class="switcher language switcher-language" data-ui-id="language-switcher" id="switcher-language<?= $block->escapeHtmlAttr($id) ?>">
--    <strong class="label switcher-label"><span><?= $block->escapeHtml(__('Language')) ?></span></strong>
--    <div class="actions dropdown options switcher-options">
--        <div class="action toggle switcher-trigger"
--             id="switcher-language-trigger<?= $block->escapeHtmlAttr($id) ?>"
--             data-mage-init='{"dropdown":{}}'
--             data-toggle="dropdown"
--             data-trigger-keypress-button="true">
--            <strong class="view-<?= $block->escapeHtml($block->getCurrentStoreCode()) ?>">
--                <span><?= $block->escapeHtml($block->getStoreName()) ?></span>
--            </strong>
-+<?php if (count($block->getStores())>1) : ?>
-+    <?php $id = $block->getIdModifier() ? '-' . $block->getIdModifier() : '' ?>
-+    <div class="switcher language switcher-language" data-ui-id="language-switcher" id="switcher-language<?= $block->escapeHtmlAttr($id) ?>">
-+        <strong class="label switcher-label"><span><?= $block->escapeHtml(__('Language')) ?></span></strong>
-+        <div class="actions dropdown options switcher-options">
-+            <div class="action toggle switcher-trigger"
-+                 id="switcher-language-trigger<?= $block->escapeHtmlAttr($id) ?>"
-+                 data-mage-init='{"dropdown":{}}'
-+                 data-toggle="dropdown"
-+                 data-trigger-keypress-button="true">
-+                <strong class="view-<?= $block->escapeHtml($block->getCurrentStoreCode()) ?>">
-+                    <span><?= $block->escapeHtml($block->getStoreName()) ?></span>
-+                </strong>
-+            </div>
-+            <ul class="dropdown switcher-dropdown"
-+                data-target="dropdown">
-+                <?php foreach ($block->getStores() as $_lang) : ?>
-+                    <?php if ($_lang->getId() != $block->getCurrentStoreId()) : ?>
-+                        <li class="view-<?= $block->escapeHtml($_lang->getCode()) ?> switcher-option">
-+                            <a href="<?= $block->escapeUrl($block->getViewModel()->getTargetStoreRedirectUrl($_lang)) ?>">
-+                                <?= $block->escapeHtml($_lang->getName()) ?>
-+                            </a>
-+                        </li>
-+                    <?php endif; ?>
-+                <?php endforeach; ?>
-+            </ul>
-         </div>
--        <ul class="dropdown switcher-dropdown"
--            data-target="dropdown">
--            <?php foreach ($block->getStores() as $_lang): ?>
--                <?php if ($_lang->getId() != $block->getCurrentStoreId()): ?>
--                    <li class="view-<?= $block->escapeHtml($_lang->getCode()) ?> switcher-option">
--                        <a href="#" data-post='<?= /* @noEscape */ $block->getTargetStorePostData($_lang) ?>'>
--                            <?= $block->escapeHtml($_lang->getName()) ?>
--                        </a>
--                    </li>
--                <?php endif; ?>
--            <?php endforeach; ?>
--        </ul>
-     </div>
--</div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml b/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml
-index fb3f316bc16..e0c49401a6c 100644
---- a/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml
-+++ b/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml
-@@ -4,38 +4,36 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Store\Block\Switcher $block */
- ?>
--<?php if (count($block->getGroups())>1): ?>
-+<?php if (count($block->getGroups())>1) : ?>
- <div class="switcher store switcher-store" id="switcher-store">
-     <strong class="label switcher-label"><span><?= $block->escapeHtml(__('Select Store')) ?></span></strong>
-     <div class="actions dropdown options switcher-options">
--        <?php foreach ($block->getGroups() as $_group): ?>
--        <?php if ($_group->getId() == $block->getCurrentGroupId()): ?>
--            <div class="action toggle switcher-trigger"
--                 role="button"
--                 tabindex="0"
--                 data-mage-init='{"dropdown":{}}'
--                 data-toggle="dropdown"
--                 data-trigger-keypress-button="true"
--                 id="switcher-store-trigger">
--                <strong>
--                    <span><?= $block->escapeHtml($_group->getName()) ?></span>
--                </strong>
--            </div>
--        <?php endif; ?>
-+        <?php foreach ($block->getGroups() as $_group) : ?>
-+            <?php if ($_group->getId() == $block->getCurrentGroupId()) : ?>
-+                <div class="action toggle switcher-trigger"
-+                     role="button"
-+                     tabindex="0"
-+                     data-mage-init='{"dropdown":{}}'
-+                     data-toggle="dropdown"
-+                     data-trigger-keypress-button="true"
-+                     id="switcher-store-trigger">
-+                    <strong>
-+                        <span><?= $block->escapeHtml($_group->getName()) ?></span>
-+                    </strong>
-+                </div>
-+            <?php endif; ?>
-         <?php endforeach; ?>
-         <ul class="dropdown switcher-dropdown" data-target="dropdown">
--            <?php foreach ($block->getGroups() as $_group): ?>
--            <?php if (!($_group->getId() == $block->getCurrentGroupId())): ?>
--                <li class="switcher-option">
--                    <a href="#" data-post='<?= /* @noEscape */ $block->getTargetStorePostData($_group->getDefaultStore()) ?>'>
--                        <?= $block->escapeHtml($_group->getName()) ?>
--                    </a>
--                </li>
--            <?php endif; ?>
-+            <?php foreach ($block->getGroups() as $_group) : ?>
-+                <?php if (!($_group->getId() == $block->getCurrentGroupId())) : ?>
-+                    <li class="switcher-option">
-+                        <a href="#" data-post='<?= /* @noEscape */ $block->getTargetStorePostData($_group->getDefaultStore()) ?>'>
-+                            <?= $block->escapeHtml($_group->getName()) ?>
-+                        </a>
-+                    </li>
-+                <?php endif; ?>
-             <?php endforeach; ?>
-         </ul>
-     </div>
-diff --git a/app/code/Magento/StoreGraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php b/app/code/Magento/StoreGraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
-new file mode 100644
-index 00000000000..7999a96917c
---- /dev/null
-+++ b/app/code/Magento/StoreGraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
-@@ -0,0 +1,98 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\StoreGraphQl\Controller\HttpHeaderProcessor;
-+
-+use Magento\GraphQl\Controller\HttpHeaderProcessorInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Framework\App\Http\Context as HttpContext;
-+use Magento\Store\Api\StoreCookieManagerInterface;
-+
-+/**
-+ * Process the "Store" header entry
-+ */
-+class StoreProcessor implements HttpHeaderProcessorInterface
-+{
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var HttpContext
-+     */
-+    private $httpContext;
-+
-+    /**
-+     * @var StoreCookieManagerInterface
-+     */
-+    private $storeCookieManager;
-+
-+    /**
-+     * @param StoreManagerInterface $storeManager
-+     * @param HttpContext $httpContext
-+     * @param StoreCookieManagerInterface $storeCookieManager
-+     */
-+    public function __construct(
-+        StoreManagerInterface $storeManager,
-+        HttpContext $httpContext,
-+        StoreCookieManagerInterface $storeCookieManager
-+    ) {
-+        $this->storeManager = $storeManager;
-+        $this->httpContext = $httpContext;
-+        $this->storeCookieManager = $storeCookieManager;
-+    }
-+
-+    /**
-+     * Handle the value of the store and set the scope
-+     *
-+     * @see \Magento\Store\App\Action\Plugin\Context::beforeDispatch
-+     *
-+     * @param string $headerValue
-+     * @return void
-+     */
-+    public function processHeaderValue(string $headerValue) : void
-+    {
-+        if (!empty($headerValue)) {
-+            $storeCode = ltrim(rtrim($headerValue));
-+            $this->storeManager->setCurrentStore($storeCode);
-+            $this->updateContext($storeCode);
-+        } elseif (!$this->isAlreadySet()) {
-+            $storeCode = $this->storeCookieManager->getStoreCodeFromCookie()
-+                ?: $this->storeManager->getDefaultStoreView()->getCode();
-+            $this->storeManager->setCurrentStore($storeCode);
-+            $this->updateContext($storeCode);
-+        }
-+    }
-+
-+    /**
-+     * Update context accordingly to the store code found.
-+     *
-+     * @param string $storeCode
-+     * @return void
-+     */
-+    private function updateContext(string $storeCode) : void
-+    {
-+        $this->httpContext->setValue(
-+            StoreManagerInterface::CONTEXT_STORE,
-+            $storeCode,
-+            $this->storeManager->getDefaultStoreView()->getCode()
-+        );
-+    }
-+
-+    /**
-+     * Check if there is a need to find the current store.
-+     *
-+     * @return bool
-+     */
-+    private function isAlreadySet(): bool
-+    {
-+        $storeKey = StoreManagerInterface::CONTEXT_STORE;
-+
-+        return $this->httpContext->getValue($storeKey) !== null;
-+    }
-+}
-diff --git a/app/code/Magento/StoreGraphQl/Controller/HttpRequestValidator/StoreValidator.php b/app/code/Magento/StoreGraphQl/Controller/HttpRequestValidator/StoreValidator.php
-new file mode 100644
-index 00000000000..144905d7281
---- /dev/null
-+++ b/app/code/Magento/StoreGraphQl/Controller/HttpRequestValidator/StoreValidator.php
-@@ -0,0 +1,57 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\StoreGraphQl\Controller\HttpRequestValidator;
-+
-+use Magento\Framework\App\HttpRequestInterface;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\GraphQl\Controller\HttpRequestValidatorInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+/**
-+ * Validate the "Store" header entry
-+ */
-+class StoreValidator implements HttpRequestValidatorInterface
-+{
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(
-+        StoreManagerInterface $storeManager
-+    ) {
-+        $this->storeManager = $storeManager;
-+    }
-+
-+    /**
-+     * Validate the header 'Store' value.
-+     *
-+     * @param HttpRequestInterface $request
-+     * @return void
-+     * @throws GraphQlInputException
-+     */
-+    public function validate(HttpRequestInterface $request): void
-+    {
-+        $headerValue = $request->getHeader('Store');
-+        if (!empty($headerValue)) {
-+            $storeCode = ltrim(rtrim($headerValue));
-+            $stores = $this->storeManager->getStores(false, true);
-+            if (!isset($stores[$storeCode])) {
-+                if (strtolower($storeCode) !== 'default') {
-+                    $this->storeManager->setCurrentStore(null);
-+                    throw new GraphQlInputException(
-+                        __("Requested store is not found")
-+                    );
-+                }
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
-index 0252d7898be..8c2d6c36591 100644
---- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
-+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
-@@ -7,10 +7,10 @@ declare(strict_types=1);
- 
- namespace Magento\StoreGraphQl\Model\Resolver\Store;
- 
--use Magento\Store\Api\Data\StoreConfigInterface;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Store\Api\StoreConfigManagerInterface;
--use Magento\Store\Api\StoreRepositoryInterface;
--use Magento\Store\Api\StoreResolverInterface;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-  * StoreConfig field data provider, used for GraphQL request processing.
-@@ -23,53 +23,62 @@ class StoreConfigDataProvider
-     private $storeConfigManager;
- 
-     /**
--     * @var StoreResolverInterface
-+     * @var StoreManagerInterface
-      */
--    private $storeResolver;
-+    private $storeManager;
- 
-     /**
--     * @var StoreRepositoryInterface
-+     * @var ScopeConfigInterface
-      */
--    private $storeRepository;
-+    private $scopeConfig;
-+
-+    /**
-+     * @var array
-+     */
-+    private $extendedConfigData;
- 
-     /**
-      * @param StoreConfigManagerInterface $storeConfigManager
--     * @param StoreResolverInterface $storeResolver
--     * @param StoreRepositoryInterface $storeRepository
-+     * @param StoreManagerInterface $storeManager
-+     * @param ScopeConfigInterface $scopeConfig
-+     * @param array $extendedConfigData
-      */
-     public function __construct(
-         StoreConfigManagerInterface $storeConfigManager,
--        StoreResolverInterface $storeResolver,
--        StoreRepositoryInterface $storeRepository
-+        StoreManagerInterface $storeManager,
-+        ScopeConfigInterface $scopeConfig,
-+        array $extendedConfigData = []
-     ) {
-         $this->storeConfigManager = $storeConfigManager;
--        $this->storeResolver = $storeResolver;
--        $this->storeRepository = $storeRepository;
-+        $this->storeManager = $storeManager;
-+        $this->scopeConfig = $scopeConfig;
-+        $this->extendedConfigData = $extendedConfigData;
-     }
- 
-     /**
--     * Get store config for current store
-+     * Get store config data
-      *
-      * @return array
-      */
--    public function getStoreConfig() : array
-+    public function getStoreConfigData(): array
-     {
--        $storeId = $this->storeResolver->getCurrentStoreId();
--        $store = $this->storeRepository->getById($storeId);
--        $storeConfig = current($this->storeConfigManager->getStoreConfigs([$store->getCode()]));
--
--        return $this->hidrateStoreConfig($storeConfig);
-+        $storeConfigData = array_merge(
-+            $this->getBaseConfigData(),
-+            $this->getExtendedConfigData()
-+        );
-+        return $storeConfigData;
-     }
- 
-     /**
--     * Transform StoreConfig object to in array format
-+     * Get base config data
-      *
--     * @param StoreConfigInterface $storeConfig
-      * @return array
-      */
--    private function hidrateStoreConfig($storeConfig): array
-+    private function getBaseConfigData() : array
-     {
--        /** @var StoreConfigInterface $storeConfig */
-+        $store = $this->storeManager->getStore();
-+        $storeConfig = current($this->storeConfigManager->getStoreConfigs([$store->getCode()]));
-+
-         $storeConfigData = [
-             'id' => $storeConfig->getId(),
-             'code' => $storeConfig->getCode(),
-@@ -88,7 +97,25 @@ class StoreConfigDataProvider
-             'secure_base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
-             'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl()
-         ];
--
-         return $storeConfigData;
-     }
-+
-+    /**
-+     * Get extended config data
-+     *
-+     * @return array
-+     */
-+    private function getExtendedConfigData()
-+    {
-+        $store = $this->storeManager->getStore();
-+        $extendedConfigData = [];
-+        foreach ($this->extendedConfigData as $key => $path) {
-+            $extendedConfigData[$key] = $this->scopeConfig->getValue(
-+                $path,
-+                ScopeInterface::SCOPE_STORE,
-+                $store->getId()
-+            );
-+        }
-+        return $extendedConfigData;
-+    }
- }
-diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/StoreConfigResolver.php b/app/code/Magento/StoreGraphQl/Model/Resolver/StoreConfigResolver.php
-index 8e5bf0120b8..9c426172de8 100644
---- a/app/code/Magento/StoreGraphQl/Model/Resolver/StoreConfigResolver.php
-+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/StoreConfigResolver.php
-@@ -8,8 +8,6 @@ declare(strict_types=1);
- namespace Magento\StoreGraphQl\Model\Resolver;
- 
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider;
-@@ -24,25 +22,17 @@ class StoreConfigResolver implements ResolverInterface
-      */
-     private $storeConfigDataProvider;
- 
--    /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
-     /**
-      * @param StoreConfigDataProvider $storeConfigsDataProvider
--     * @param ValueFactory $valueFactory
-      */
-     public function __construct(
--        StoreConfigDataProvider $storeConfigsDataProvider,
--        ValueFactory $valueFactory
-+        StoreConfigDataProvider $storeConfigsDataProvider
-     ) {
--        $this->valueFactory = $valueFactory;
-         $this->storeConfigDataProvider = $storeConfigsDataProvider;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -50,14 +40,7 @@ class StoreConfigResolver implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ) : Value {
--
--        $storeConfigData = $this->storeConfigDataProvider->getStoreConfig();
--
--        $result = function () use ($storeConfigData) {
--            return !empty($storeConfigData) ? $storeConfigData : [];
--        };
--
--        return $this->valueFactory->create($result);
-+    ) {
-+        return $this->storeConfigDataProvider->getStoreConfigData();
-     }
- }
-diff --git a/app/code/Magento/StoreGraphQl/composer.json b/app/code/Magento/StoreGraphQl/composer.json
-index d03d759babd..aa36a489134 100644
---- a/app/code/Magento/StoreGraphQl/composer.json
-+++ b/app/code/Magento/StoreGraphQl/composer.json
-@@ -5,11 +5,8 @@
-     "require": {
-         "php": "~7.1.3||~7.2.0",
-         "magento/framework": "*",
--        "magento/module-store": "*"
--    },
--    "suggest": {
--        "magento/module-graph-ql": "*",
--        "magento/module-catalog-graph-ql": "*"
-+        "magento/module-store": "*",
-+        "magento/module-graph-ql": "*"
-     },
-     "license": [
-         "OSL-3.0",
-diff --git a/app/code/Magento/StoreGraphQl/etc/graphql/di.xml b/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
-new file mode 100644
-index 00000000000..c2191164287
---- /dev/null
-+++ b/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\GraphQl\Controller\HttpRequestProcessor">
-+        <arguments>
-+            <argument name="graphQlHeaders" xsi:type="array">
-+                <item name="Store" xsi:type="object">Magento\StoreGraphQl\Controller\HttpHeaderProcessor\StoreProcessor</item>
-+            </argument>
-+            <argument name="requestValidators" xsi:type="array">
-+                <item name="storeValidator" xsi:type="object">Magento\StoreGraphQl\Controller\HttpRequestValidator\StoreValidator</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/StoreGraphQl/etc/module.xml b/app/code/Magento/StoreGraphQl/etc/module.xml
-index f53379ac3bb..bbec6a85a1a 100644
---- a/app/code/Magento/StoreGraphQl/etc/module.xml
-+++ b/app/code/Magento/StoreGraphQl/etc/module.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-     <module name="Magento_StoreGraphQl">
-         <sequence>
-+            <module name="Magento_Store"/>
-             <module name="Magento_GraphQl"/>
-         </sequence>
-     </module>
-diff --git a/app/code/Magento/StoreGraphQl/etc/schema.graphqls b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
-index af79d0e3e28..376635e5c8f 100644
---- a/app/code/Magento/StoreGraphQl/etc/schema.graphqls
-+++ b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
-@@ -1,15 +1,15 @@
- # Copyright © Magento, Inc. All rights reserved.
- # See COPYING.txt for license details.
- type Query {
--    storeConfig : StoreConfig @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\StoreConfigResolver") @doc(description: "The store config query")
-+    storeConfig : StoreConfig @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\StoreConfigResolver") @doc(description: "The store config query") @cache(cacheable: false)
- }
- 
- type Website @doc(description: "The type contains information about a website") {
-     id : Int @doc(description: "The ID number assigned to the website")
--    name : String @doc(description: "The website name. Websites use this name to identify it easyer.")
-+    name : String @doc(description: "The website name. Websites use this name to identify it easier.")
-     code : String @doc(description: "A code assigned to the website to identify it")
-     sort_order : Int @doc(description: "The attribute to use for sorting websites")
--    default_group_id : String @doc(description: "The default group id that the website has")
-+    default_group_id : String @doc(description: "The default group ID that the website has")
-     is_default : Boolean @doc(description: "Specifies if this is the default website")
- }
- 
-diff --git a/app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml b/app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml
-index f14df1c70a7..5a592b9b7c9 100644
---- a/app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml
-+++ b/app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml
-@@ -15,8 +15,8 @@
-         <link src='Magento_Swagger::swagger-ui/js/lang/translator.js' type='text/javascript' defer="defer"/>
-         <link src='Magento_Swagger::swagger-ui/js/lang/ru.js' type='text/javascript' defer="defer"/>
-         <link src='Magento_Swagger::swagger-ui/js/lang/en.js' type='text/javascript' defer="defer"/>
--        <link src='Magento_Swagger::swagger-ui/js/swagger-ui-bundle.js' type='text/javascript' defer="defer"/>
--        <link src='Magento_Swagger::swagger-ui/js/swagger-ui-standalone-preset.js' type='text/javascript' defer="defer"/>
-+        <link src='Magento_Swagger::swagger-ui/js/swagger-ui-bundle.min.js' type='text/javascript' defer="defer"/>
-+        <link src='Magento_Swagger::swagger-ui/js/swagger-ui-standalone-preset.min.js' type='text/javascript' defer="defer"/>
-         <link src='Magento_Swagger::swagger-ui/js/magento-swagger.js' type='text/javascript' defer="defer"/>
- 
-         <!--Remove require-js assets-->
-diff --git a/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml b/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
-index b20da687345..520fed29e9e 100644
---- a/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
-+++ b/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
-@@ -12,9 +12,8 @@
-  * Modified by Magento, Modifications Copyright © Magento, Inc. All rights reserved.
-  */
- 
--/** @var \Magento\Swagger\Block\Index $block
-- *
-- * @codingStandardsIgnoreFile
-+/**
-+ * @var \Magento\Swagger\Block\Index $block
-  */
- 
- $schemaUrl = $block->getSchemaUrl();
-@@ -58,7 +57,7 @@ $schemaUrl = $block->getSchemaUrl();
-     <div class="swagger-ui-wrap">
-         <a id="logo" href="http://swagger.io">swagger</a>
-         <form id='api_selector'>
--            <input id="input_baseUrl" type="hidden" value="<?= /* @escapeNotVerified */ $schemaUrl ?>"/>
-+            <input id="input_baseUrl" type="hidden" value="<?= $block->escapeUrl($schemaUrl) ?>"/>
-             <div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>
-             <div class='input'><a id="explore" href="#" data-sw-translate>apply</a></div>
-         </form>
-diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-bundle.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-bundle.js
-deleted file mode 100644
-index 6d9e786f707..00000000000
---- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-bundle.js
-+++ /dev/null
-@@ -1,99 +0,0 @@
--!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.SwaggerUIBundle=t():e.SwaggerUIBundle=t()}(this,function(){return function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,t),i.l=!0,i.exports}var n={};return t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="/dist",t(t.s=1213)}([function(e,t,n){"use strict";e.exports=n(92)},function(e,t,n){e.exports=n(996)()},function(e,t,n){"use strict";t.__esModule=!0,t.default=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}},function(e,t,n){"use strict";t.__esModule=!0;var r=n(331),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),(0,i.default)(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}()},function(e,t,n){e.exports={default:n(592),__esModule:!0}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}t.__esModule=!0;var i=n(565),o=r(i),a=n(330),s=r(a),u=n(48),l=r(u);t.default=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+(void 0===t?"undefined":(0,l.default)(t)));e.prototype=(0,s.default)(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(o.default?(0,o.default)(e,t):e.__proto__=t)}},function(e,t,n){"use strict";t.__esModule=!0;var r=n(48),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!==(void 0===t?"undefined":(0,i.default)(t))&&"function"!=typeof t?e:t}},function(e,t,n){!function(t,n){e.exports=n()}(0,function(){"use strict";function e(e,t){t&&(e.prototype=Object.create(t.prototype)),e.prototype.constructor=e}function t(e){return o(e)?e:O(e)}function n(e){return a(e)?e:M(e)}function r(e){return s(e)?e:T(e)}function i(e){return o(e)&&!u(e)?e:P(e)}function o(e){return!(!e||!e[ln])}function a(e){return!(!e||!e[cn])}function s(e){return!(!e||!e[pn])}function u(e){return a(e)||s(e)}function l(e){return!(!e||!e[fn])}function c(e){return e.value=!1,e}function p(e){e&&(e.value=!0)}function f(){}function h(e,t){t=t||0;for(var n=Math.max(0,e.length-t),r=new Array(n),i=0;i<n;i++)r[i]=e[i+t];return r}function d(e){return void 0===e.size&&(e.size=e.__iterate(v)),e.size}function m(e,t){if("number"!=typeof t){var n=t>>>0;if(""+n!==t||4294967295===n)return NaN;t=n}return t<0?d(e)+t:t}function v(){return!0}function g(e,t,n){return(0===e||void 0!==n&&e<=-n)&&(void 0===t||void 0!==n&&t>=n)}function y(e,t){return b(e,t,0)}function _(e,t){return b(e,t,t)}function b(e,t,n){return void 0===e?n:e<0?Math.max(0,t+e):void 0===t?e:Math.min(t,e)}function x(e){this.next=e}function w(e,t,n,r){var i=0===e?t:1===e?n:[t,n];return r?r.value=i:r={value:i,done:!1},r}function k(){return{value:void 0,done:!0}}function E(e){return!!A(e)}function S(e){return e&&"function"==typeof e.next}function C(e){var t=A(e);return t&&t.call(e)}function A(e){var t=e&&(wn&&e[wn]||e[kn]);if("function"==typeof t)return t}function D(e){return e&&"number"==typeof e.length}function O(e){return null===e||void 0===e?B():o(e)?e.toSeq():z(e)}function M(e){return null===e||void 0===e?B().toKeyedSeq():o(e)?a(e)?e.toSeq():e.fromEntrySeq():L(e)}function T(e){return null===e||void 0===e?B():o(e)?a(e)?e.entrySeq():e.toIndexedSeq():q(e)}function P(e){return(null===e||void 0===e?B():o(e)?a(e)?e.entrySeq():e:q(e)).toSetSeq()}function I(e){this._array=e,this.size=e.length}function R(e){var t=Object.keys(e);this._object=e,this._keys=t,this.size=t.length}function j(e){this._iterable=e,this.size=e.length||e.size}function F(e){this._iterator=e,this._iteratorCache=[]}function N(e){return!(!e||!e[Sn])}function B(){return Cn||(Cn=new I([]))}function L(e){var t=Array.isArray(e)?new I(e).fromEntrySeq():S(e)?new F(e).fromEntrySeq():E(e)?new j(e).fromEntrySeq():"object"==typeof e?new R(e):void 0;if(!t)throw new TypeError("Expected Array or iterable object of [k, v] entries, or keyed object: "+e);return t}function q(e){var t=U(e);if(!t)throw new TypeError("Expected Array or iterable object of values: "+e);return t}function z(e){var t=U(e)||"object"==typeof e&&new R(e);if(!t)throw new TypeError("Expected Array or iterable object of values, or keyed object: "+e);return t}function U(e){return D(e)?new I(e):S(e)?new F(e):E(e)?new j(e):void 0}function W(e,t,n,r){var i=e._cache;if(i){for(var o=i.length-1,a=0;a<=o;a++){var s=i[n?o-a:a];if(!1===t(s[1],r?s[0]:a,e))return a+1}return a}return e.__iterateUncached(t,n)}function V(e,t,n,r){var i=e._cache;if(i){var o=i.length-1,a=0;return new x(function(){var e=i[n?o-a:a];return a++>o?k():w(t,r?e[0]:a-1,e[1])})}return e.__iteratorUncached(t,n)}function H(e,t){return t?G(t,e,"",{"":e}):J(e)}function G(e,t,n,r){return Array.isArray(t)?e.call(r,n,T(t).map(function(n,r){return G(e,n,r,t)})):K(t)?e.call(r,n,M(t).map(function(n,r){return G(e,n,r,t)})):t}function J(e){return Array.isArray(e)?T(e).map(J).toList():K(e)?M(e).map(J).toMap():e}function K(e){return e&&(e.constructor===Object||void 0===e.constructor)}function X(e,t){if(e===t||e!==e&&t!==t)return!0;if(!e||!t)return!1;if("function"==typeof e.valueOf&&"function"==typeof t.valueOf){if(e=e.valueOf(),t=t.valueOf(),e===t||e!==e&&t!==t)return!0;if(!e||!t)return!1}return!("function"!=typeof e.equals||"function"!=typeof t.equals||!e.equals(t))}function Y(e,t){if(e===t)return!0;if(!o(t)||void 0!==e.size&&void 0!==t.size&&e.size!==t.size||void 0!==e.__hash&&void 0!==t.__hash&&e.__hash!==t.__hash||a(e)!==a(t)||s(e)!==s(t)||l(e)!==l(t))return!1;if(0===e.size&&0===t.size)return!0;var n=!u(e);if(l(e)){var r=e.entries();return t.every(function(e,t){var i=r.next().value;return i&&X(i[1],e)&&(n||X(i[0],t))})&&r.next().done}var i=!1;if(void 0===e.size)if(void 0===t.size)"function"==typeof e.cacheResult&&e.cacheResult();else{i=!0;var c=e;e=t,t=c}var p=!0,f=t.__iterate(function(t,r){if(n?!e.has(t):i?!X(t,e.get(r,vn)):!X(e.get(r,vn),t))return p=!1,!1});return p&&e.size===f}function $(e,t){if(!(this instanceof $))return new $(e,t);if(this._value=e,this.size=void 0===t?1/0:Math.max(0,t),0===this.size){if(An)return An;An=this}}function Z(e,t){if(!e)throw new Error(t)}function Q(e,t,n){if(!(this instanceof Q))return new Q(e,t,n);if(Z(0!==n,"Cannot step a Range by 0"),e=e||0,void 0===t&&(t=1/0),n=void 0===n?1:Math.abs(n),t<e&&(n=-n),this._start=e,this._end=t,this._step=n,this.size=Math.max(0,Math.ceil((t-e)/n-1)+1),0===this.size){if(Dn)return Dn;Dn=this}}function ee(){throw TypeError("Abstract")}function te(){}function ne(){}function re(){}function ie(e){return e>>>1&1073741824|3221225471&e}function oe(e){if(!1===e||null===e||void 0===e)return 0;if("function"==typeof e.valueOf&&(!1===(e=e.valueOf())||null===e||void 0===e))return 0;if(!0===e)return 1;var t=typeof e;if("number"===t){if(e!==e||e===1/0)return 0;var n=0|e;for(n!==e&&(n^=4294967295*e);e>4294967295;)e/=4294967295,n^=e;return ie(n)}if("string"===t)return e.length>Fn?ae(e):se(e);if("function"==typeof e.hashCode)return e.hashCode();if("object"===t)return ue(e);if("function"==typeof e.toString)return se(e.toString());throw new Error("Value type "+t+" cannot be hashed.")}function ae(e){var t=Ln[e];return void 0===t&&(t=se(e),Bn===Nn&&(Bn=0,Ln={}),Bn++,Ln[e]=t),t}function se(e){for(var t=0,n=0;n<e.length;n++)t=31*t+e.charCodeAt(n)|0;return ie(t)}function ue(e){var t;if(In&&void 0!==(t=On.get(e)))return t;if(void 0!==(t=e[jn]))return t;if(!Pn){if(void 0!==(t=e.propertyIsEnumerable&&e.propertyIsEnumerable[jn]))return t;if(void 0!==(t=le(e)))return t}if(t=++Rn,1073741824&Rn&&(Rn=0),In)On.set(e,t);else{if(void 0!==Tn&&!1===Tn(e))throw new Error("Non-extensible objects are not allowed as keys.");if(Pn)Object.defineProperty(e,jn,{enumerable:!1,configurable:!1,writable:!1,value:t});else if(void 0!==e.propertyIsEnumerable&&e.propertyIsEnumerable===e.constructor.prototype.propertyIsEnumerable)e.propertyIsEnumerable=function(){return this.constructor.prototype.propertyIsEnumerable.apply(this,arguments)},e.propertyIsEnumerable[jn]=t;else{if(void 0===e.nodeType)throw new Error("Unable to set a non-enumerable property on object.");e[jn]=t}}return t}function le(e){if(e&&e.nodeType>0)switch(e.nodeType){case 1:return e.uniqueID;case 9:return e.documentElement&&e.documentElement.uniqueID}}function ce(e){Z(e!==1/0,"Cannot perform this action with an infinite size.")}function pe(e){return null===e||void 0===e?we():fe(e)&&!l(e)?e:we().withMutations(function(t){var r=n(e);ce(r.size),r.forEach(function(e,n){return t.set(n,e)})})}function fe(e){return!(!e||!e[qn])}function he(e,t){this.ownerID=e,this.entries=t}function de(e,t,n){this.ownerID=e,this.bitmap=t,this.nodes=n}function me(e,t,n){this.ownerID=e,this.count=t,this.nodes=n}function ve(e,t,n){this.ownerID=e,this.keyHash=t,this.entries=n}function ge(e,t,n){this.ownerID=e,this.keyHash=t,this.entry=n}function ye(e,t,n){this._type=t,this._reverse=n,this._stack=e._root&&be(e._root)}function _e(e,t){return w(e,t[0],t[1])}function be(e,t){return{node:e,index:0,__prev:t}}function xe(e,t,n,r){var i=Object.create(zn);return i.size=e,i._root=t,i.__ownerID=n,i.__hash=r,i.__altered=!1,i}function we(){return Un||(Un=xe(0))}function ke(e,t,n){var r,i;if(e._root){var o=c(gn),a=c(yn);if(r=Ee(e._root,e.__ownerID,0,void 0,t,n,o,a),!a.value)return e;i=e.size+(o.value?n===vn?-1:1:0)}else{if(n===vn)return e;i=1,r=new he(e.__ownerID,[[t,n]])}return e.__ownerID?(e.size=i,e._root=r,e.__hash=void 0,e.__altered=!0,e):r?xe(i,r):we()}function Ee(e,t,n,r,i,o,a,s){return e?e.update(t,n,r,i,o,a,s):o===vn?e:(p(s),p(a),new ge(t,r,[i,o]))}function Se(e){return e.constructor===ge||e.constructor===ve}function Ce(e,t,n,r,i){if(e.keyHash===r)return new ve(t,r,[e.entry,i]);var o,a=(0===n?e.keyHash:e.keyHash>>>n)&mn,s=(0===n?r:r>>>n)&mn;return new de(t,1<<a|1<<s,a===s?[Ce(e,t,n+hn,r,i)]:(o=new ge(t,r,i),a<s?[e,o]:[o,e]))}function Ae(e,t,n,r){e||(e=new f);for(var i=new ge(e,oe(n),[n,r]),o=0;o<t.length;o++){var a=t[o];i=i.update(e,0,void 0,a[0],a[1])}return i}function De(e,t,n,r){for(var i=0,o=0,a=new Array(n),s=0,u=1,l=t.length;s<l;s++,u<<=1){var c=t[s];void 0!==c&&s!==r&&(i|=u,a[o++]=c)}return new de(e,i,a)}function Oe(e,t,n,r,i){for(var o=0,a=new Array(dn),s=0;0!==n;s++,n>>>=1)a[s]=1&n?t[o++]:void 0;return a[r]=i,new me(e,o+1,a)}function Me(e,t,r){for(var i=[],a=0;a<r.length;a++){var s=r[a],u=n(s);o(s)||(u=u.map(function(e){return H(e)})),i.push(u)}return Ie(e,t,i)}function Te(e,t,n){return e&&e.mergeDeep&&o(t)?e.mergeDeep(t):X(e,t)?e:t}function Pe(e){return function(t,n,r){if(t&&t.mergeDeepWith&&o(n))return t.mergeDeepWith(e,n);var i=e(t,n,r);return X(t,i)?t:i}}function Ie(e,t,n){return n=n.filter(function(e){return 0!==e.size}),0===n.length?e:0!==e.size||e.__ownerID||1!==n.length?e.withMutations(function(e){for(var r=t?function(n,r){e.update(r,vn,function(e){return e===vn?n:t(e,n,r)})}:function(t,n){e.set(n,t)},i=0;i<n.length;i++)n[i].forEach(r)}):e.constructor(n[0])}function Re(e,t,n,r){var i=e===vn,o=t.next();if(o.done){var a=i?n:e,s=r(a);return s===a?e:s}Z(i||e&&e.set,"invalid keyPath");var u=o.value,l=i?vn:e.get(u,vn),c=Re(l,t,n,r);return c===l?e:c===vn?e.remove(u):(i?we():e).set(u,c)}function je(e){return e-=e>>1&1431655765,e=(858993459&e)+(e>>2&858993459),e=e+(e>>4)&252645135,e+=e>>8,127&(e+=e>>16)}function Fe(e,t,n,r){var i=r?e:h(e);return i[t]=n,i}function Ne(e,t,n,r){var i=e.length+1;if(r&&t+1===i)return e[t]=n,e;for(var o=new Array(i),a=0,s=0;s<i;s++)s===t?(o[s]=n,a=-1):o[s]=e[s+a];return o}function Be(e,t,n){var r=e.length-1;if(n&&t===r)return e.pop(),e;for(var i=new Array(r),o=0,a=0;a<r;a++)a===t&&(o=1),i[a]=e[a+o];return i}function Le(e){var t=Ve();if(null===e||void 0===e)return t;if(qe(e))return e;var n=r(e),i=n.size;return 0===i?t:(ce(i),i>0&&i<dn?We(0,i,hn,null,new ze(n.toArray())):t.withMutations(function(e){e.setSize(i),n.forEach(function(t,n){return e.set(n,t)})}))}function qe(e){return!(!e||!e[Gn])}function ze(e,t){this.array=e,this.ownerID=t}function Ue(e,t){function n(e,t,n){return 0===t?r(e,n):i(e,t,n)}function r(e,n){var r=n===s?u&&u.array:e&&e.array,i=n>o?0:o-n,l=a-n;return l>dn&&(l=dn),function(){if(i===l)return Xn;var e=t?--l:i++;return r&&r[e]}}function i(e,r,i){var s,u=e&&e.array,l=i>o?0:o-i>>r,c=1+(a-i>>r);return c>dn&&(c=dn),function(){for(;;){if(s){var e=s();if(e!==Xn)return e;s=null}if(l===c)return Xn;var o=t?--c:l++;s=n(u&&u[o],r-hn,i+(o<<r))}}}var o=e._origin,a=e._capacity,s=$e(a),u=e._tail;return n(e._root,e._level,0)}function We(e,t,n,r,i,o,a){var s=Object.create(Jn);return s.size=t-e,s._origin=e,s._capacity=t,s._level=n,s._root=r,s._tail=i,s.__ownerID=o,s.__hash=a,s.__altered=!1,s}function Ve(){return Kn||(Kn=We(0,0,hn))}function He(e,t,n){if((t=m(e,t))!==t)return e;if(t>=e.size||t<0)return e.withMutations(function(e){t<0?Xe(e,t).set(0,n):Xe(e,0,t+1).set(t,n)});t+=e._origin;var r=e._tail,i=e._root,o=c(yn);return t>=$e(e._capacity)?r=Ge(r,e.__ownerID,0,t,n,o):i=Ge(i,e.__ownerID,e._level,t,n,o),o.value?e.__ownerID?(e._root=i,e._tail=r,e.__hash=void 0,e.__altered=!0,e):We(e._origin,e._capacity,e._level,i,r):e}function Ge(e,t,n,r,i,o){var a=r>>>n&mn,s=e&&a<e.array.length;if(!s&&void 0===i)return e;var u;if(n>0){var l=e&&e.array[a],c=Ge(l,t,n-hn,r,i,o);return c===l?e:(u=Je(e,t),u.array[a]=c,u)}return s&&e.array[a]===i?e:(p(o),u=Je(e,t),void 0===i&&a===u.array.length-1?u.array.pop():u.array[a]=i,u)}function Je(e,t){return t&&e&&t===e.ownerID?e:new ze(e?e.array.slice():[],t)}function Ke(e,t){if(t>=$e(e._capacity))return e._tail;if(t<1<<e._level+hn){for(var n=e._root,r=e._level;n&&r>0;)n=n.array[t>>>r&mn],r-=hn;return n}}function Xe(e,t,n){void 0!==t&&(t|=0),void 0!==n&&(n|=0);var r=e.__ownerID||new f,i=e._origin,o=e._capacity,a=i+t,s=void 0===n?o:n<0?o+n:i+n;if(a===i&&s===o)return e;if(a>=s)return e.clear();for(var u=e._level,l=e._root,c=0;a+c<0;)l=new ze(l&&l.array.length?[void 0,l]:[],r),u+=hn,c+=1<<u;c&&(a+=c,i+=c,s+=c,o+=c);for(var p=$e(o),h=$e(s);h>=1<<u+hn;)l=new ze(l&&l.array.length?[l]:[],r),u+=hn;var d=e._tail,m=h<p?Ke(e,s-1):h>p?new ze([],r):d;if(d&&h>p&&a<o&&d.array.length){l=Je(l,r);for(var v=l,g=u;g>hn;g-=hn){var y=p>>>g&mn;v=v.array[y]=Je(v.array[y],r)}v.array[p>>>hn&mn]=d}if(s<o&&(m=m&&m.removeAfter(r,0,s)),a>=h)a-=h,s-=h,u=hn,l=null,m=m&&m.removeBefore(r,0,a);else if(a>i||h<p){for(c=0;l;){var _=a>>>u&mn;if(_!==h>>>u&mn)break;_&&(c+=(1<<u)*_),u-=hn,l=l.array[_]}l&&a>i&&(l=l.removeBefore(r,u,a-c)),l&&h<p&&(l=l.removeAfter(r,u,h-c)),c&&(a-=c,s-=c)}return e.__ownerID?(e.size=s-a,e._origin=a,e._capacity=s,e._level=u,e._root=l,e._tail=m,e.__hash=void 0,e.__altered=!0,e):We(a,s,u,l,m)}function Ye(e,t,n){for(var i=[],a=0,s=0;s<n.length;s++){var u=n[s],l=r(u);l.size>a&&(a=l.size),o(u)||(l=l.map(function(e){return H(e)})),i.push(l)}return a>e.size&&(e=e.setSize(a)),Ie(e,t,i)}function $e(e){return e<dn?0:e-1>>>hn<<hn}function Ze(e){return null===e||void 0===e?tt():Qe(e)?e:tt().withMutations(function(t){var r=n(e);ce(r.size),r.forEach(function(e,n){return t.set(n,e)})})}function Qe(e){return fe(e)&&l(e)}function et(e,t,n,r){var i=Object.create(Ze.prototype);return i.size=e?e.size:0,i._map=e,i._list=t,i.__ownerID=n,i.__hash=r,i}function tt(){return Yn||(Yn=et(we(),Ve()))}function nt(e,t,n){var r,i,o=e._map,a=e._list,s=o.get(t),u=void 0!==s;if(n===vn){if(!u)return e;a.size>=dn&&a.size>=2*o.size?(i=a.filter(function(e,t){return void 0!==e&&s!==t}),r=i.toKeyedSeq().map(function(e){return e[0]}).flip().toMap(),e.__ownerID&&(r.__ownerID=i.__ownerID=e.__ownerID)):(r=o.remove(t),i=s===a.size-1?a.pop():a.set(s,void 0))}else if(u){if(n===a.get(s)[1])return e;r=o,i=a.set(s,[t,n])}else r=o.set(t,a.size),i=a.set(a.size,[t,n]);return e.__ownerID?(e.size=r.size,e._map=r,e._list=i,e.__hash=void 0,e):et(r,i)}function rt(e,t){this._iter=e,this._useKeys=t,this.size=e.size}function it(e){this._iter=e,this.size=e.size}function ot(e){this._iter=e,this.size=e.size}function at(e){this._iter=e,this.size=e.size}function st(e){var t=Dt(e);return t._iter=e,t.size=e.size,t.flip=function(){return e},t.reverse=function(){var t=e.reverse.apply(this);return t.flip=function(){return e.reverse()},t},t.has=function(t){return e.includes(t)},t.includes=function(t){return e.has(t)},t.cacheResult=Ot,t.__iterateUncached=function(t,n){var r=this;return e.__iterate(function(e,n){return!1!==t(n,e,r)},n)},t.__iteratorUncached=function(t,n){if(t===xn){var r=e.__iterator(t,n);return new x(function(){var e=r.next();if(!e.done){var t=e.value[0];e.value[0]=e.value[1],e.value[1]=t}return e})}return e.__iterator(t===bn?_n:bn,n)},t}function ut(e,t,n){var r=Dt(e);return r.size=e.size,r.has=function(t){return e.has(t)},r.get=function(r,i){var o=e.get(r,vn);return o===vn?i:t.call(n,o,r,e)},r.__iterateUncached=function(r,i){var o=this;return e.__iterate(function(e,i,a){return!1!==r(t.call(n,e,i,a),i,o)},i)},r.__iteratorUncached=function(r,i){var o=e.__iterator(xn,i);return new x(function(){var i=o.next();if(i.done)return i;var a=i.value,s=a[0];return w(r,s,t.call(n,a[1],s,e),i)})},r}function lt(e,t){var n=Dt(e);return n._iter=e,n.size=e.size,n.reverse=function(){return e},e.flip&&(n.flip=function(){var t=st(e);return t.reverse=function(){return e.flip()},t}),n.get=function(n,r){return e.get(t?n:-1-n,r)},n.has=function(n){return e.has(t?n:-1-n)},n.includes=function(t){return e.includes(t)},n.cacheResult=Ot,n.__iterate=function(t,n){var r=this;return e.__iterate(function(e,n){return t(e,n,r)},!n)},n.__iterator=function(t,n){return e.__iterator(t,!n)},n}function ct(e,t,n,r){var i=Dt(e);return r&&(i.has=function(r){var i=e.get(r,vn);return i!==vn&&!!t.call(n,i,r,e)},i.get=function(r,i){var o=e.get(r,vn);return o!==vn&&t.call(n,o,r,e)?o:i}),i.__iterateUncached=function(i,o){var a=this,s=0;return e.__iterate(function(e,o,u){if(t.call(n,e,o,u))return s++,i(e,r?o:s-1,a)},o),s},i.__iteratorUncached=function(i,o){var a=e.__iterator(xn,o),s=0;return new x(function(){for(;;){var o=a.next();if(o.done)return o;var u=o.value,l=u[0],c=u[1];if(t.call(n,c,l,e))return w(i,r?l:s++,c,o)}})},i}function pt(e,t,n){var r=pe().asMutable();return e.__iterate(function(i,o){r.update(t.call(n,i,o,e),0,function(e){return e+1})}),r.asImmutable()}function ft(e,t,n){var r=a(e),i=(l(e)?Ze():pe()).asMutable();e.__iterate(function(o,a){i.update(t.call(n,o,a,e),function(e){return e=e||[],e.push(r?[a,o]:o),e})});var o=At(e);return i.map(function(t){return Et(e,o(t))})}function ht(e,t,n,r){var i=e.size;if(void 0!==t&&(t|=0),void 0!==n&&(n===1/0?n=i:n|=0),g(t,n,i))return e;var o=y(t,i),a=_(n,i);if(o!==o||a!==a)return ht(e.toSeq().cacheResult(),t,n,r);var s,u=a-o;u===u&&(s=u<0?0:u);var l=Dt(e);return l.size=0===s?s:e.size&&s||void 0,!r&&N(e)&&s>=0&&(l.get=function(t,n){return t=m(this,t),t>=0&&t<s?e.get(t+o,n):n}),l.__iterateUncached=function(t,n){var i=this;if(0===s)return 0;if(n)return this.cacheResult().__iterate(t,n);var a=0,u=!0,l=0;return e.__iterate(function(e,n){if(!u||!(u=a++<o))return l++,!1!==t(e,r?n:l-1,i)&&l!==s}),l},l.__iteratorUncached=function(t,n){if(0!==s&&n)return this.cacheResult().__iterator(t,n);var i=0!==s&&e.__iterator(t,n),a=0,u=0;return new x(function(){for(;a++<o;)i.next();if(++u>s)return k();var e=i.next();return r||t===bn?e:t===_n?w(t,u-1,void 0,e):w(t,u-1,e.value[1],e)})},l}function dt(e,t,n){var r=Dt(e);return r.__iterateUncached=function(r,i){var o=this;if(i)return this.cacheResult().__iterate(r,i);var a=0;return e.__iterate(function(e,i,s){return t.call(n,e,i,s)&&++a&&r(e,i,o)}),a},r.__iteratorUncached=function(r,i){var o=this;if(i)return this.cacheResult().__iterator(r,i);var a=e.__iterator(xn,i),s=!0;return new x(function(){if(!s)return k();var e=a.next();if(e.done)return e;var i=e.value,u=i[0],l=i[1];return t.call(n,l,u,o)?r===xn?e:w(r,u,l,e):(s=!1,k())})},r}function mt(e,t,n,r){var i=Dt(e);return i.__iterateUncached=function(i,o){var a=this;if(o)return this.cacheResult().__iterate(i,o);var s=!0,u=0;return e.__iterate(function(e,o,l){if(!s||!(s=t.call(n,e,o,l)))return u++,i(e,r?o:u-1,a)}),u},i.__iteratorUncached=function(i,o){var a=this;if(o)return this.cacheResult().__iterator(i,o);var s=e.__iterator(xn,o),u=!0,l=0;return new x(function(){var e,o,c;do{if(e=s.next(),e.done)return r||i===bn?e:i===_n?w(i,l++,void 0,e):w(i,l++,e.value[1],e);var p=e.value;o=p[0],c=p[1],u&&(u=t.call(n,c,o,a))}while(u);return i===xn?e:w(i,o,c,e)})},i}function vt(e,t){var r=a(e),i=[e].concat(t).map(function(e){return o(e)?r&&(e=n(e)):e=r?L(e):q(Array.isArray(e)?e:[e]),e}).filter(function(e){return 0!==e.size});if(0===i.length)return e;if(1===i.length){var u=i[0];if(u===e||r&&a(u)||s(e)&&s(u))return u}var l=new I(i);return r?l=l.toKeyedSeq():s(e)||(l=l.toSetSeq()),l=l.flatten(!0),l.size=i.reduce(function(e,t){if(void 0!==e){var n=t.size;if(void 0!==n)return e+n}},0),l}function gt(e,t,n){var r=Dt(e);return r.__iterateUncached=function(r,i){function a(e,l){var c=this;e.__iterate(function(e,i){return(!t||l<t)&&o(e)?a(e,l+1):!1===r(e,n?i:s++,c)&&(u=!0),!u},i)}var s=0,u=!1;return a(e,0),s},r.__iteratorUncached=function(r,i){var a=e.__iterator(r,i),s=[],u=0;return new x(function(){for(;a;){var e=a.next();if(!1===e.done){var l=e.value;if(r===xn&&(l=l[1]),t&&!(s.length<t)||!o(l))return n?e:w(r,u++,l,e);s.push(a),a=l.__iterator(r,i)}else a=s.pop()}return k()})},r}function yt(e,t,n){var r=At(e);return e.toSeq().map(function(i,o){return r(t.call(n,i,o,e))}).flatten(!0)}function _t(e,t){var n=Dt(e);return n.size=e.size&&2*e.size-1,n.__iterateUncached=function(n,r){var i=this,o=0;return e.__iterate(function(e,r){return(!o||!1!==n(t,o++,i))&&!1!==n(e,o++,i)},r),o},n.__iteratorUncached=function(n,r){var i,o=e.__iterator(bn,r),a=0;return new x(function(){return(!i||a%2)&&(i=o.next(),i.done)?i:a%2?w(n,a++,t):w(n,a++,i.value,i)})},n}function bt(e,t,n){t||(t=Mt);var r=a(e),i=0,o=e.toSeq().map(function(t,r){return[r,t,i++,n?n(t,r,e):t]}).toArray();return o.sort(function(e,n){return t(e[3],n[3])||e[2]-n[2]}).forEach(r?function(e,t){o[t].length=2}:function(e,t){o[t]=e[1]}),r?M(o):s(e)?T(o):P(o)}function xt(e,t,n){if(t||(t=Mt),n){var r=e.toSeq().map(function(t,r){return[t,n(t,r,e)]}).reduce(function(e,n){return wt(t,e[1],n[1])?n:e});return r&&r[0]}return e.reduce(function(e,n){return wt(t,e,n)?n:e})}function wt(e,t,n){var r=e(n,t);return 0===r&&n!==t&&(void 0===n||null===n||n!==n)||r>0}function kt(e,n,r){var i=Dt(e);return i.size=new I(r).map(function(e){return e.size}).min(),i.__iterate=function(e,t){for(var n,r=this.__iterator(bn,t),i=0;!(n=r.next()).done&&!1!==e(n.value,i++,this););return i},i.__iteratorUncached=function(e,i){var o=r.map(function(e){return e=t(e),C(i?e.reverse():e)}),a=0,s=!1;return new x(function(){var t;return s||(t=o.map(function(e){return e.next()}),s=t.some(function(e){return e.done})),s?k():w(e,a++,n.apply(null,t.map(function(e){return e.value})))})},i}function Et(e,t){return N(e)?t:e.constructor(t)}function St(e){if(e!==Object(e))throw new TypeError("Expected [K, V] tuple: "+e)}function Ct(e){return ce(e.size),d(e)}function At(e){return a(e)?n:s(e)?r:i}function Dt(e){return Object.create((a(e)?M:s(e)?T:P).prototype)}function Ot(){return this._iter.cacheResult?(this._iter.cacheResult(),this.size=this._iter.size,this):O.prototype.cacheResult.call(this)}function Mt(e,t){return e>t?1:e<t?-1:0}function Tt(e){var n=C(e);if(!n){if(!D(e))throw new TypeError("Expected iterable or array-like: "+e);n=C(t(e))}return n}function Pt(e,t){var n,r=function(o){if(o instanceof r)return o;if(!(this instanceof r))return new r(o);if(!n){n=!0;var a=Object.keys(e);jt(i,a),i.size=a.length,i._name=t,i._keys=a,i._defaultValues=e}this._map=pe(o)},i=r.prototype=Object.create($n);return i.constructor=r,r}function It(e,t,n){var r=Object.create(Object.getPrototypeOf(e));return r._map=t,r.__ownerID=n,r}function Rt(e){return e._name||e.constructor.name||"Record"}function jt(e,t){try{t.forEach(Ft.bind(void 0,e))}catch(e){}}function Ft(e,t){Object.defineProperty(e,t,{get:function(){return this.get(t)},set:function(e){Z(this.__ownerID,"Cannot set on an immutable record."),this.set(t,e)}})}function Nt(e){return null===e||void 0===e?zt():Bt(e)&&!l(e)?e:zt().withMutations(function(t){var n=i(e);ce(n.size),n.forEach(function(e){return t.add(e)})})}function Bt(e){return!(!e||!e[Zn])}function Lt(e,t){return e.__ownerID?(e.size=t.size,e._map=t,e):t===e._map?e:0===t.size?e.__empty():e.__make(t)}function qt(e,t){var n=Object.create(Qn);return n.size=e?e.size:0,n._map=e,n.__ownerID=t,n}function zt(){return er||(er=qt(we()))}function Ut(e){return null===e||void 0===e?Ht():Wt(e)?e:Ht().withMutations(function(t){var n=i(e);ce(n.size),n.forEach(function(e){return t.add(e)})})}function Wt(e){return Bt(e)&&l(e)}function Vt(e,t){var n=Object.create(tr);return n.size=e?e.size:0,n._map=e,n.__ownerID=t,n}function Ht(){return nr||(nr=Vt(tt()))}function Gt(e){return null===e||void 0===e?Xt():Jt(e)?e:Xt().unshiftAll(e)}function Jt(e){return!(!e||!e[rr])}function Kt(e,t,n,r){var i=Object.create(ir);return i.size=e,i._head=t,i.__ownerID=n,i.__hash=r,i.__altered=!1,i}function Xt(){return or||(or=Kt(0))}function Yt(e,t){var n=function(n){e.prototype[n]=t[n]};return Object.keys(t).forEach(n),Object.getOwnPropertySymbols&&Object.getOwnPropertySymbols(t).forEach(n),e}function $t(e,t){return t}function Zt(e,t){return[t,e]}function Qt(e){return function(){return!e.apply(this,arguments)}}function en(e){return function(){return-e.apply(this,arguments)}}function tn(e){return"string"==typeof e?JSON.stringify(e):String(e)}function nn(){return h(arguments)}function rn(e,t){return e<t?1:e>t?-1:0}function on(e){if(e.size===1/0)return 0;var t=l(e),n=a(e),r=t?1:0;return an(e.__iterate(n?t?function(e,t){r=31*r+sn(oe(e),oe(t))|0}:function(e,t){r=r+sn(oe(e),oe(t))|0}:t?function(e){r=31*r+oe(e)|0}:function(e){r=r+oe(e)|0}),r)}function an(e,t){return t=Mn(t,3432918353),t=Mn(t<<15|t>>>-15,461845907),t=Mn(t<<13|t>>>-13,5),t=(t+3864292196|0)^e,t=Mn(t^t>>>16,2246822507),t=Mn(t^t>>>13,3266489909),t=ie(t^t>>>16)}function sn(e,t){return e^t+2654435769+(e<<6)+(e>>2)|0}var un=Array.prototype.slice;e(n,t),e(r,t),e(i,t),t.isIterable=o,t.isKeyed=a,t.isIndexed=s,t.isAssociative=u,t.isOrdered=l,t.Keyed=n,t.Indexed=r,t.Set=i;var ln="@@__IMMUTABLE_ITERABLE__@@",cn="@@__IMMUTABLE_KEYED__@@",pn="@@__IMMUTABLE_INDEXED__@@",fn="@@__IMMUTABLE_ORDERED__@@",hn=5,dn=1<<hn,mn=dn-1,vn={},gn={value:!1},yn={value:!1},_n=0,bn=1,xn=2,wn="function"==typeof Symbol&&Symbol.iterator,kn="@@iterator",En=wn||kn;x.prototype.toString=function(){return"[Iterator]"},x.KEYS=_n,x.VALUES=bn,x.ENTRIES=xn,x.prototype.inspect=x.prototype.toSource=function(){return this.toString()},x.prototype[En]=function(){return this},e(O,t),O.of=function(){return O(arguments)},O.prototype.toSeq=function(){return this},O.prototype.toString=function(){return this.__toString("Seq {","}")},O.prototype.cacheResult=function(){return!this._cache&&this.__iterateUncached&&(this._cache=this.entrySeq().toArray(),this.size=this._cache.length),this},O.prototype.__iterate=function(e,t){return W(this,e,t,!0)},O.prototype.__iterator=function(e,t){return V(this,e,t,!0)},e(M,O),M.prototype.toKeyedSeq=function(){return this},e(T,O),T.of=function(){return T(arguments)},T.prototype.toIndexedSeq=function(){return this},T.prototype.toString=function(){return this.__toString("Seq [","]")},T.prototype.__iterate=function(e,t){return W(this,e,t,!1)},T.prototype.__iterator=function(e,t){return V(this,e,t,!1)},e(P,O),P.of=function(){return P(arguments)},P.prototype.toSetSeq=function(){return this},O.isSeq=N,O.Keyed=M,O.Set=P,O.Indexed=T;var Sn="@@__IMMUTABLE_SEQ__@@";O.prototype[Sn]=!0,e(I,T),I.prototype.get=function(e,t){return this.has(e)?this._array[m(this,e)]:t},I.prototype.__iterate=function(e,t){for(var n=this._array,r=n.length-1,i=0;i<=r;i++)if(!1===e(n[t?r-i:i],i,this))return i+1;return i},I.prototype.__iterator=function(e,t){var n=this._array,r=n.length-1,i=0;return new x(function(){return i>r?k():w(e,i,n[t?r-i++:i++])})},e(R,M),R.prototype.get=function(e,t){return void 0===t||this.has(e)?this._object[e]:t},R.prototype.has=function(e){return this._object.hasOwnProperty(e)},R.prototype.__iterate=function(e,t){for(var n=this._object,r=this._keys,i=r.length-1,o=0;o<=i;o++){var a=r[t?i-o:o];if(!1===e(n[a],a,this))return o+1}return o},R.prototype.__iterator=function(e,t){var n=this._object,r=this._keys,i=r.length-1,o=0;return new x(function(){var a=r[t?i-o:o];return o++>i?k():w(e,a,n[a])})},R.prototype[fn]=!0,e(j,T),j.prototype.__iterateUncached=function(e,t){if(t)return this.cacheResult().__iterate(e,t);var n=this._iterable,r=C(n),i=0;if(S(r))for(var o;!(o=r.next()).done&&!1!==e(o.value,i++,this););return i},j.prototype.__iteratorUncached=function(e,t){if(t)return this.cacheResult().__iterator(e,t);var n=this._iterable,r=C(n);if(!S(r))return new x(k);var i=0;return new x(function(){var t=r.next();return t.done?t:w(e,i++,t.value)})},e(F,T),F.prototype.__iterateUncached=function(e,t){if(t)return this.cacheResult().__iterate(e,t);for(var n=this._iterator,r=this._iteratorCache,i=0;i<r.length;)if(!1===e(r[i],i++,this))return i;for(var o;!(o=n.next()).done;){var a=o.value;if(r[i]=a,!1===e(a,i++,this))break}return i},F.prototype.__iteratorUncached=function(e,t){if(t)return this.cacheResult().__iterator(e,t);var n=this._iterator,r=this._iteratorCache,i=0;return new x(function(){if(i>=r.length){var t=n.next();if(t.done)return t;r[i]=t.value}return w(e,i,r[i++])})};var Cn;e($,T),$.prototype.toString=function(){return 0===this.size?"Repeat []":"Repeat [ "+this._value+" "+this.size+" times ]"},$.prototype.get=function(e,t){return this.has(e)?this._value:t},$.prototype.includes=function(e){return X(this._value,e)},$.prototype.slice=function(e,t){var n=this.size;return g(e,t,n)?this:new $(this._value,_(t,n)-y(e,n))},$.prototype.reverse=function(){return this},$.prototype.indexOf=function(e){return X(this._value,e)?0:-1},$.prototype.lastIndexOf=function(e){return X(this._value,e)?this.size:-1},$.prototype.__iterate=function(e,t){for(var n=0;n<this.size;n++)if(!1===e(this._value,n,this))return n+1;return n},$.prototype.__iterator=function(e,t){var n=this,r=0;return new x(function(){return r<n.size?w(e,r++,n._value):k()})},$.prototype.equals=function(e){return e instanceof $?X(this._value,e._value):Y(e)};var An;e(Q,T),Q.prototype.toString=function(){return 0===this.size?"Range []":"Range [ "+this._start+"..."+this._end+(1!==this._step?" by "+this._step:"")+" ]"},Q.prototype.get=function(e,t){return this.has(e)?this._start+m(this,e)*this._step:t},Q.prototype.includes=function(e){var t=(e-this._start)/this._step;return t>=0&&t<this.size&&t===Math.floor(t)},Q.prototype.slice=function(e,t){return g(e,t,this.size)?this:(e=y(e,this.size),t=_(t,this.size),t<=e?new Q(0,0):new Q(this.get(e,this._end),this.get(t,this._end),this._step))},Q.prototype.indexOf=function(e){var t=e-this._start;if(t%this._step==0){var n=t/this._step;if(n>=0&&n<this.size)return n}return-1},Q.prototype.lastIndexOf=function(e){return this.indexOf(e)},Q.prototype.__iterate=function(e,t){for(var n=this.size-1,r=this._step,i=t?this._start+n*r:this._start,o=0;o<=n;o++){if(!1===e(i,o,this))return o+1;i+=t?-r:r}return o},Q.prototype.__iterator=function(e,t){var n=this.size-1,r=this._step,i=t?this._start+n*r:this._start,o=0;return new x(function(){var a=i;return i+=t?-r:r,o>n?k():w(e,o++,a)})},Q.prototype.equals=function(e){return e instanceof Q?this._start===e._start&&this._end===e._end&&this._step===e._step:Y(this,e)};var Dn;e(ee,t),e(te,ee),e(ne,ee),e(re,ee),ee.Keyed=te,ee.Indexed=ne,ee.Set=re;var On,Mn="function"==typeof Math.imul&&-2===Math.imul(4294967295,2)?Math.imul:function(e,t){e|=0,t|=0;var n=65535&e,r=65535&t;return n*r+((e>>>16)*r+n*(t>>>16)<<16>>>0)|0},Tn=Object.isExtensible,Pn=function(){try{return Object.defineProperty({},"@",{}),!0}catch(e){return!1}}(),In="function"==typeof WeakMap;In&&(On=new WeakMap);var Rn=0,jn="__immutablehash__";"function"==typeof Symbol&&(jn=Symbol(jn));var Fn=16,Nn=255,Bn=0,Ln={};e(pe,te),pe.of=function(){var e=un.call(arguments,0);return we().withMutations(function(t){for(var n=0;n<e.length;n+=2){if(n+1>=e.length)throw new Error("Missing value for key: "+e[n]);t.set(e[n],e[n+1])}})},pe.prototype.toString=function(){return this.__toString("Map {","}")},pe.prototype.get=function(e,t){return this._root?this._root.get(0,void 0,e,t):t},pe.prototype.set=function(e,t){return ke(this,e,t)},pe.prototype.setIn=function(e,t){return this.updateIn(e,vn,function(){return t})},pe.prototype.remove=function(e){return ke(this,e,vn)},pe.prototype.deleteIn=function(e){return this.updateIn(e,function(){return vn})},pe.prototype.update=function(e,t,n){return 1===arguments.length?e(this):this.updateIn([e],t,n)},pe.prototype.updateIn=function(e,t,n){n||(n=t,t=void 0);var r=Re(this,Tt(e),t,n);return r===vn?void 0:r},pe.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._root=null,this.__hash=void 0,this.__altered=!0,this):we()},pe.prototype.merge=function(){return Me(this,void 0,arguments)},pe.prototype.mergeWith=function(e){return Me(this,e,un.call(arguments,1))},pe.prototype.mergeIn=function(e){var t=un.call(arguments,1);return this.updateIn(e,we(),function(e){return"function"==typeof e.merge?e.merge.apply(e,t):t[t.length-1]})},pe.prototype.mergeDeep=function(){return Me(this,Te,arguments)},pe.prototype.mergeDeepWith=function(e){var t=un.call(arguments,1);return Me(this,Pe(e),t)},pe.prototype.mergeDeepIn=function(e){var t=un.call(arguments,1);return this.updateIn(e,we(),function(e){return"function"==typeof e.mergeDeep?e.mergeDeep.apply(e,t):t[t.length-1]})},pe.prototype.sort=function(e){return Ze(bt(this,e))},pe.prototype.sortBy=function(e,t){return Ze(bt(this,t,e))},pe.prototype.withMutations=function(e){var t=this.asMutable();return e(t),t.wasAltered()?t.__ensureOwner(this.__ownerID):this},pe.prototype.asMutable=function(){return this.__ownerID?this:this.__ensureOwner(new f)},pe.prototype.asImmutable=function(){return this.__ensureOwner()},pe.prototype.wasAltered=function(){return this.__altered},pe.prototype.__iterator=function(e,t){return new ye(this,e,t)},pe.prototype.__iterate=function(e,t){var n=this,r=0;return this._root&&this._root.iterate(function(t){return r++,e(t[1],t[0],n)},t),r},pe.prototype.__ensureOwner=function(e){return e===this.__ownerID?this:e?xe(this.size,this._root,e,this.__hash):(this.__ownerID=e,this.__altered=!1,this)},pe.isMap=fe;var qn="@@__IMMUTABLE_MAP__@@",zn=pe.prototype;zn[qn]=!0,zn.delete=zn.remove,zn.removeIn=zn.deleteIn,he.prototype.get=function(e,t,n,r){for(var i=this.entries,o=0,a=i.length;o<a;o++)if(X(n,i[o][0]))return i[o][1];return r},he.prototype.update=function(e,t,n,r,i,o,a){for(var s=i===vn,u=this.entries,l=0,c=u.length;l<c&&!X(r,u[l][0]);l++);var f=l<c;if(f?u[l][1]===i:s)return this;if(p(a),(s||!f)&&p(o),!s||1!==u.length){if(!f&&!s&&u.length>=Wn)return Ae(e,u,r,i);var d=e&&e===this.ownerID,m=d?u:h(u);return f?s?l===c-1?m.pop():m[l]=m.pop():m[l]=[r,i]:m.push([r,i]),d?(this.entries=m,this):new he(e,m)}},de.prototype.get=function(e,t,n,r){void 0===t&&(t=oe(n));var i=1<<((0===e?t:t>>>e)&mn),o=this.bitmap;return 0==(o&i)?r:this.nodes[je(o&i-1)].get(e+hn,t,n,r)},de.prototype.update=function(e,t,n,r,i,o,a){void 0===n&&(n=oe(r));var s=(0===t?n:n>>>t)&mn,u=1<<s,l=this.bitmap,c=0!=(l&u);if(!c&&i===vn)return this;var p=je(l&u-1),f=this.nodes,h=c?f[p]:void 0,d=Ee(h,e,t+hn,n,r,i,o,a);if(d===h)return this;if(!c&&d&&f.length>=Vn)return Oe(e,f,l,s,d);if(c&&!d&&2===f.length&&Se(f[1^p]))return f[1^p];if(c&&d&&1===f.length&&Se(d))return d;var m=e&&e===this.ownerID,v=c?d?l:l^u:l|u,g=c?d?Fe(f,p,d,m):Be(f,p,m):Ne(f,p,d,m);return m?(this.bitmap=v,this.nodes=g,this):new de(e,v,g)},me.prototype.get=function(e,t,n,r){void 0===t&&(t=oe(n));var i=(0===e?t:t>>>e)&mn,o=this.nodes[i];return o?o.get(e+hn,t,n,r):r},me.prototype.update=function(e,t,n,r,i,o,a){void 0===n&&(n=oe(r));var s=(0===t?n:n>>>t)&mn,u=i===vn,l=this.nodes,c=l[s];if(u&&!c)return this;var p=Ee(c,e,t+hn,n,r,i,o,a);if(p===c)return this;var f=this.count;if(c){if(!p&&--f<Hn)return De(e,l,f,s)}else f++;var h=e&&e===this.ownerID,d=Fe(l,s,p,h);return h?(this.count=f,this.nodes=d,this):new me(e,f,d)},ve.prototype.get=function(e,t,n,r){for(var i=this.entries,o=0,a=i.length;o<a;o++)if(X(n,i[o][0]))return i[o][1];return r},ve.prototype.update=function(e,t,n,r,i,o,a){void 0===n&&(n=oe(r));var s=i===vn;if(n!==this.keyHash)return s?this:(p(a),p(o),Ce(this,e,t,n,[r,i]));for(var u=this.entries,l=0,c=u.length;l<c&&!X(r,u[l][0]);l++);var f=l<c;if(f?u[l][1]===i:s)return this;if(p(a),(s||!f)&&p(o),s&&2===c)return new ge(e,this.keyHash,u[1^l]);var d=e&&e===this.ownerID,m=d?u:h(u);return f?s?l===c-1?m.pop():m[l]=m.pop():m[l]=[r,i]:m.push([r,i]),d?(this.entries=m,this):new ve(e,this.keyHash,m)},ge.prototype.get=function(e,t,n,r){return X(n,this.entry[0])?this.entry[1]:r},ge.prototype.update=function(e,t,n,r,i,o,a){var s=i===vn,u=X(r,this.entry[0]);return(u?i===this.entry[1]:s)?this:(p(a),s?void p(o):u?e&&e===this.ownerID?(this.entry[1]=i,this):new ge(e,this.keyHash,[r,i]):(p(o),Ce(this,e,t,oe(r),[r,i])))},he.prototype.iterate=ve.prototype.iterate=function(e,t){for(var n=this.entries,r=0,i=n.length-1;r<=i;r++)if(!1===e(n[t?i-r:r]))return!1},de.prototype.iterate=me.prototype.iterate=function(e,t){for(var n=this.nodes,r=0,i=n.length-1;r<=i;r++){var o=n[t?i-r:r];if(o&&!1===o.iterate(e,t))return!1}},ge.prototype.iterate=function(e,t){return e(this.entry)},e(ye,x),ye.prototype.next=function(){for(var e=this._type,t=this._stack;t;){var n,r=t.node,i=t.index++;if(r.entry){if(0===i)return _e(e,r.entry)}else if(r.entries){if(n=r.entries.length-1,i<=n)return _e(e,r.entries[this._reverse?n-i:i])}else if(n=r.nodes.length-1,i<=n){var o=r.nodes[this._reverse?n-i:i];if(o){if(o.entry)return _e(e,o.entry);t=this._stack=be(o,t)}continue}t=this._stack=this._stack.__prev}return k()};var Un,Wn=dn/4,Vn=dn/2,Hn=dn/4;e(Le,ne),Le.of=function(){return this(arguments)},Le.prototype.toString=function(){return this.__toString("List [","]")},Le.prototype.get=function(e,t){if((e=m(this,e))>=0&&e<this.size){e+=this._origin;var n=Ke(this,e);return n&&n.array[e&mn]}return t},Le.prototype.set=function(e,t){return He(this,e,t)},Le.prototype.remove=function(e){return this.has(e)?0===e?this.shift():e===this.size-1?this.pop():this.splice(e,1):this},Le.prototype.insert=function(e,t){return this.splice(e,0,t)},Le.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=this._origin=this._capacity=0,this._level=hn,this._root=this._tail=null,this.__hash=void 0,this.__altered=!0,this):Ve()},Le.prototype.push=function(){var e=arguments,t=this.size;return this.withMutations(function(n){Xe(n,0,t+e.length);for(var r=0;r<e.length;r++)n.set(t+r,e[r])})},Le.prototype.pop=function(){return Xe(this,0,-1)},Le.prototype.unshift=function(){var e=arguments;return this.withMutations(function(t){Xe(t,-e.length);for(var n=0;n<e.length;n++)t.set(n,e[n])})},Le.prototype.shift=function(){return Xe(this,1)},Le.prototype.merge=function(){return Ye(this,void 0,arguments)},Le.prototype.mergeWith=function(e){return Ye(this,e,un.call(arguments,1))},Le.prototype.mergeDeep=function(){return Ye(this,Te,arguments)},Le.prototype.mergeDeepWith=function(e){var t=un.call(arguments,1);return Ye(this,Pe(e),t)},Le.prototype.setSize=function(e){return Xe(this,0,e)},Le.prototype.slice=function(e,t){var n=this.size;return g(e,t,n)?this:Xe(this,y(e,n),_(t,n))},Le.prototype.__iterator=function(e,t){var n=0,r=Ue(this,t);return new x(function(){var t=r();return t===Xn?k():w(e,n++,t)})},Le.prototype.__iterate=function(e,t){for(var n,r=0,i=Ue(this,t);(n=i())!==Xn&&!1!==e(n,r++,this););return r},Le.prototype.__ensureOwner=function(e){return e===this.__ownerID?this:e?We(this._origin,this._capacity,this._level,this._root,this._tail,e,this.__hash):(this.__ownerID=e,this)},Le.isList=qe;var Gn="@@__IMMUTABLE_LIST__@@",Jn=Le.prototype;Jn[Gn]=!0,Jn.delete=Jn.remove,Jn.setIn=zn.setIn,Jn.deleteIn=Jn.removeIn=zn.removeIn,Jn.update=zn.update,Jn.updateIn=zn.updateIn,Jn.mergeIn=zn.mergeIn,Jn.mergeDeepIn=zn.mergeDeepIn,Jn.withMutations=zn.withMutations,Jn.asMutable=zn.asMutable,Jn.asImmutable=zn.asImmutable,Jn.wasAltered=zn.wasAltered,ze.prototype.removeBefore=function(e,t,n){if(n===t?1<<t:0===this.array.length)return this;var r=n>>>t&mn;if(r>=this.array.length)return new ze([],e);var i,o=0===r;if(t>0){var a=this.array[r];if((i=a&&a.removeBefore(e,t-hn,n))===a&&o)return this}if(o&&!i)return this;var s=Je(this,e);if(!o)for(var u=0;u<r;u++)s.array[u]=void 0;return i&&(s.array[r]=i),s},ze.prototype.removeAfter=function(e,t,n){if(n===(t?1<<t:0)||0===this.array.length)return this;var r=n-1>>>t&mn;if(r>=this.array.length)return this;var i;if(t>0){var o=this.array[r];if((i=o&&o.removeAfter(e,t-hn,n))===o&&r===this.array.length-1)return this}var a=Je(this,e);return a.array.splice(r+1),i&&(a.array[r]=i),a};var Kn,Xn={};e(Ze,pe),Ze.of=function(){return this(arguments)},Ze.prototype.toString=function(){return this.__toString("OrderedMap {","}")},Ze.prototype.get=function(e,t){var n=this._map.get(e);return void 0!==n?this._list.get(n)[1]:t},Ze.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._map.clear(),this._list.clear(),this):tt()},Ze.prototype.set=function(e,t){return nt(this,e,t)},Ze.prototype.remove=function(e){return nt(this,e,vn)},Ze.prototype.wasAltered=function(){return this._map.wasAltered()||this._list.wasAltered()},Ze.prototype.__iterate=function(e,t){var n=this;return this._list.__iterate(function(t){return t&&e(t[1],t[0],n)},t)},Ze.prototype.__iterator=function(e,t){return this._list.fromEntrySeq().__iterator(e,t)},Ze.prototype.__ensureOwner=function(e){if(e===this.__ownerID)return this;var t=this._map.__ensureOwner(e),n=this._list.__ensureOwner(e);return e?et(t,n,e,this.__hash):(this.__ownerID=e,this._map=t,this._list=n,this)},Ze.isOrderedMap=Qe,Ze.prototype[fn]=!0,Ze.prototype.delete=Ze.prototype.remove;var Yn;e(rt,M),rt.prototype.get=function(e,t){return this._iter.get(e,t)},rt.prototype.has=function(e){return this._iter.has(e)},rt.prototype.valueSeq=function(){return this._iter.valueSeq()},rt.prototype.reverse=function(){var e=this,t=lt(this,!0);return this._useKeys||(t.valueSeq=function(){return e._iter.toSeq().reverse()}),t},rt.prototype.map=function(e,t){var n=this,r=ut(this,e,t);return this._useKeys||(r.valueSeq=function(){return n._iter.toSeq().map(e,t)}),r},rt.prototype.__iterate=function(e,t){var n,r=this;return this._iter.__iterate(this._useKeys?function(t,n){return e(t,n,r)}:(n=t?Ct(this):0,function(i){return e(i,t?--n:n++,r)}),t)},rt.prototype.__iterator=function(e,t){if(this._useKeys)return this._iter.__iterator(e,t);var n=this._iter.__iterator(bn,t),r=t?Ct(this):0;return new x(function(){var i=n.next();return i.done?i:w(e,t?--r:r++,i.value,i)})},rt.prototype[fn]=!0,e(it,T),it.prototype.includes=function(e){return this._iter.includes(e)},it.prototype.__iterate=function(e,t){var n=this,r=0;return this._iter.__iterate(function(t){return e(t,r++,n)},t)},it.prototype.__iterator=function(e,t){var n=this._iter.__iterator(bn,t),r=0;return new x(function(){var t=n.next();return t.done?t:w(e,r++,t.value,t)})},e(ot,P),ot.prototype.has=function(e){return this._iter.includes(e)},ot.prototype.__iterate=function(e,t){var n=this;return this._iter.__iterate(function(t){return e(t,t,n)},t)},ot.prototype.__iterator=function(e,t){var n=this._iter.__iterator(bn,t);return new x(function(){var t=n.next();return t.done?t:w(e,t.value,t.value,t)})},e(at,M),at.prototype.entrySeq=function(){return this._iter.toSeq()},at.prototype.__iterate=function(e,t){var n=this;return this._iter.__iterate(function(t){if(t){St(t);var r=o(t);return e(r?t.get(1):t[1],r?t.get(0):t[0],n)}},t)},at.prototype.__iterator=function(e,t){var n=this._iter.__iterator(bn,t);return new x(function(){for(;;){var t=n.next();if(t.done)return t;var r=t.value;if(r){St(r);var i=o(r);return w(e,i?r.get(0):r[0],i?r.get(1):r[1],t)}}})},it.prototype.cacheResult=rt.prototype.cacheResult=ot.prototype.cacheResult=at.prototype.cacheResult=Ot,e(Pt,te),Pt.prototype.toString=function(){return this.__toString(Rt(this)+" {","}")},Pt.prototype.has=function(e){return this._defaultValues.hasOwnProperty(e)},Pt.prototype.get=function(e,t){if(!this.has(e))return t;var n=this._defaultValues[e];return this._map?this._map.get(e,n):n},Pt.prototype.clear=function(){if(this.__ownerID)return this._map&&this._map.clear(),this;var e=this.constructor;return e._empty||(e._empty=It(this,we()))},Pt.prototype.set=function(e,t){if(!this.has(e))throw new Error('Cannot set unknown key "'+e+'" on '+Rt(this));if(this._map&&!this._map.has(e)){if(t===this._defaultValues[e])return this}var n=this._map&&this._map.set(e,t);return this.__ownerID||n===this._map?this:It(this,n)},Pt.prototype.remove=function(e){if(!this.has(e))return this;var t=this._map&&this._map.remove(e);return this.__ownerID||t===this._map?this:It(this,t)},Pt.prototype.wasAltered=function(){return this._map.wasAltered()},Pt.prototype.__iterator=function(e,t){var r=this;return n(this._defaultValues).map(function(e,t){return r.get(t)}).__iterator(e,t)},Pt.prototype.__iterate=function(e,t){var r=this;return n(this._defaultValues).map(function(e,t){return r.get(t)}).__iterate(e,t)},Pt.prototype.__ensureOwner=function(e){if(e===this.__ownerID)return this;var t=this._map&&this._map.__ensureOwner(e);return e?It(this,t,e):(this.__ownerID=e,this._map=t,this)};var $n=Pt.prototype;$n.delete=$n.remove,$n.deleteIn=$n.removeIn=zn.removeIn,$n.merge=zn.merge,$n.mergeWith=zn.mergeWith,$n.mergeIn=zn.mergeIn,$n.mergeDeep=zn.mergeDeep,$n.mergeDeepWith=zn.mergeDeepWith,$n.mergeDeepIn=zn.mergeDeepIn,$n.setIn=zn.setIn,$n.update=zn.update,$n.updateIn=zn.updateIn,$n.withMutations=zn.withMutations,$n.asMutable=zn.asMutable,$n.asImmutable=zn.asImmutable,e(Nt,re),Nt.of=function(){return this(arguments)},Nt.fromKeys=function(e){return this(n(e).keySeq())},Nt.prototype.toString=function(){return this.__toString("Set {","}")},Nt.prototype.has=function(e){return this._map.has(e)},Nt.prototype.add=function(e){return Lt(this,this._map.set(e,!0))},Nt.prototype.remove=function(e){return Lt(this,this._map.remove(e))},Nt.prototype.clear=function(){return Lt(this,this._map.clear())},Nt.prototype.union=function(){var e=un.call(arguments,0);return e=e.filter(function(e){return 0!==e.size}),0===e.length?this:0!==this.size||this.__ownerID||1!==e.length?this.withMutations(function(t){for(var n=0;n<e.length;n++)i(e[n]).forEach(function(e){return t.add(e)})}):this.constructor(e[0])},Nt.prototype.intersect=function(){var e=un.call(arguments,0);if(0===e.length)return this;e=e.map(function(e){return i(e)});var t=this;return this.withMutations(function(n){t.forEach(function(t){e.every(function(e){return e.includes(t)})||n.remove(t)})})},Nt.prototype.subtract=function(){var e=un.call(arguments,0);if(0===e.length)return this;e=e.map(function(e){return i(e)});var t=this;return this.withMutations(function(n){t.forEach(function(t){e.some(function(e){return e.includes(t)})&&n.remove(t)})})},Nt.prototype.merge=function(){return this.union.apply(this,arguments)},Nt.prototype.mergeWith=function(e){var t=un.call(arguments,1);return this.union.apply(this,t)},Nt.prototype.sort=function(e){return Ut(bt(this,e))},Nt.prototype.sortBy=function(e,t){return Ut(bt(this,t,e))},Nt.prototype.wasAltered=function(){return this._map.wasAltered()},Nt.prototype.__iterate=function(e,t){var n=this;return this._map.__iterate(function(t,r){return e(r,r,n)},t)},Nt.prototype.__iterator=function(e,t){return this._map.map(function(e,t){return t}).__iterator(e,t)},Nt.prototype.__ensureOwner=function(e){if(e===this.__ownerID)return this;var t=this._map.__ensureOwner(e);return e?this.__make(t,e):(this.__ownerID=e,this._map=t,this)},Nt.isSet=Bt;var Zn="@@__IMMUTABLE_SET__@@",Qn=Nt.prototype;Qn[Zn]=!0,Qn.delete=Qn.remove,Qn.mergeDeep=Qn.merge,Qn.mergeDeepWith=Qn.mergeWith,Qn.withMutations=zn.withMutations,Qn.asMutable=zn.asMutable,Qn.asImmutable=zn.asImmutable,Qn.__empty=zt,Qn.__make=qt;var er;e(Ut,Nt),Ut.of=function(){return this(arguments)},Ut.fromKeys=function(e){return this(n(e).keySeq())},Ut.prototype.toString=function(){return this.__toString("OrderedSet {","}")},Ut.isOrderedSet=Wt;var tr=Ut.prototype;tr[fn]=!0,tr.__empty=Ht,tr.__make=Vt;var nr;e(Gt,ne),Gt.of=function(){return this(arguments)},Gt.prototype.toString=function(){return this.__toString("Stack [","]")},Gt.prototype.get=function(e,t){var n=this._head;for(e=m(this,e);n&&e--;)n=n.next;return n?n.value:t},Gt.prototype.peek=function(){return this._head&&this._head.value},Gt.prototype.push=function(){if(0===arguments.length)return this;for(var e=this.size+arguments.length,t=this._head,n=arguments.length-1;n>=0;n--)t={value:arguments[n],next:t};return this.__ownerID?(this.size=e,this._head=t,this.__hash=void 0,this.__altered=!0,this):Kt(e,t)},Gt.prototype.pushAll=function(e){if(e=r(e),0===e.size)return this;ce(e.size);var t=this.size,n=this._head;return e.reverse().forEach(function(e){t++,n={value:e,next:n}}),this.__ownerID?(this.size=t,this._head=n,this.__hash=void 0,this.__altered=!0,this):Kt(t,n)},Gt.prototype.pop=function(){return this.slice(1)},Gt.prototype.unshift=function(){return this.push.apply(this,arguments)},Gt.prototype.unshiftAll=function(e){return this.pushAll(e)},Gt.prototype.shift=function(){return this.pop.apply(this,arguments)},Gt.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._head=void 0,this.__hash=void 0,this.__altered=!0,this):Xt()},Gt.prototype.slice=function(e,t){if(g(e,t,this.size))return this;var n=y(e,this.size);if(_(t,this.size)!==this.size)return ne.prototype.slice.call(this,e,t);for(var r=this.size-n,i=this._head;n--;)i=i.next;return this.__ownerID?(this.size=r,this._head=i,this.__hash=void 0,this.__altered=!0,this):Kt(r,i)},Gt.prototype.__ensureOwner=function(e){return e===this.__ownerID?this:e?Kt(this.size,this._head,e,this.__hash):(this.__ownerID=e,this.__altered=!1,this)},Gt.prototype.__iterate=function(e,t){if(t)return this.reverse().__iterate(e);for(var n=0,r=this._head;r&&!1!==e(r.value,n++,this);)r=r.next;return n},Gt.prototype.__iterator=function(e,t){if(t)return this.reverse().__iterator(e);var n=0,r=this._head;return new x(function(){if(r){var t=r.value;return r=r.next,w(e,n++,t)}return k()})},Gt.isStack=Jt;var rr="@@__IMMUTABLE_STACK__@@",ir=Gt.prototype;ir[rr]=!0,ir.withMutations=zn.withMutations,ir.asMutable=zn.asMutable,ir.asImmutable=zn.asImmutable,ir.wasAltered=zn.wasAltered;var or;t.Iterator=x,Yt(t,{toArray:function(){ce(this.size);var e=new Array(this.size||0);return this.valueSeq().__iterate(function(t,n){e[n]=t}),e},toIndexedSeq:function(){return new it(this)},toJS:function(){return this.toSeq().map(function(e){return e&&"function"==typeof e.toJS?e.toJS():e}).__toJS()},toJSON:function(){return this.toSeq().map(function(e){return e&&"function"==typeof e.toJSON?e.toJSON():e}).__toJS()},toKeyedSeq:function(){return new rt(this,!0)},toMap:function(){return pe(this.toKeyedSeq())},toObject:function(){ce(this.size);var e={};return this.__iterate(function(t,n){e[n]=t}),e},toOrderedMap:function(){return Ze(this.toKeyedSeq())},toOrderedSet:function(){return Ut(a(this)?this.valueSeq():this)},toSet:function(){return Nt(a(this)?this.valueSeq():this)},toSetSeq:function(){return new ot(this)},toSeq:function(){return s(this)?this.toIndexedSeq():a(this)?this.toKeyedSeq():this.toSetSeq()},toStack:function(){return Gt(a(this)?this.valueSeq():this)},toList:function(){return Le(a(this)?this.valueSeq():this)},toString:function(){return"[Iterable]"},__toString:function(e,t){return 0===this.size?e+t:e+" "+this.toSeq().map(this.__toStringMapper).join(", ")+" "+t},concat:function(){return Et(this,vt(this,un.call(arguments,0)))},includes:function(e){return this.some(function(t){return X(t,e)})},entries:function(){return this.__iterator(xn)},every:function(e,t){ce(this.size);var n=!0;return this.__iterate(function(r,i,o){if(!e.call(t,r,i,o))return n=!1,!1}),n},filter:function(e,t){return Et(this,ct(this,e,t,!0))},find:function(e,t,n){var r=this.findEntry(e,t);return r?r[1]:n},forEach:function(e,t){return ce(this.size),this.__iterate(t?e.bind(t):e)},join:function(e){ce(this.size),e=void 0!==e?""+e:",";var t="",n=!0;return this.__iterate(function(r){n?n=!1:t+=e,t+=null!==r&&void 0!==r?r.toString():""}),t},keys:function(){return this.__iterator(_n)},map:function(e,t){return Et(this,ut(this,e,t))},reduce:function(e,t,n){ce(this.size);var r,i;return arguments.length<2?i=!0:r=t,this.__iterate(function(t,o,a){i?(i=!1,r=t):r=e.call(n,r,t,o,a)}),r},reduceRight:function(e,t,n){var r=this.toKeyedSeq().reverse();return r.reduce.apply(r,arguments)},reverse:function(){return Et(this,lt(this,!0))},slice:function(e,t){return Et(this,ht(this,e,t,!0))},some:function(e,t){return!this.every(Qt(e),t)},sort:function(e){return Et(this,bt(this,e))},values:function(){return this.__iterator(bn)},butLast:function(){return this.slice(0,-1)},isEmpty:function(){return void 0!==this.size?0===this.size:!this.some(function(){return!0})},count:function(e,t){return d(e?this.toSeq().filter(e,t):this)},countBy:function(e,t){return pt(this,e,t)},equals:function(e){return Y(this,e)},entrySeq:function(){var e=this;if(e._cache)return new I(e._cache);var t=e.toSeq().map(Zt).toIndexedSeq();return t.fromEntrySeq=function(){return e.toSeq()},t},filterNot:function(e,t){return this.filter(Qt(e),t)},findEntry:function(e,t,n){var r=n;return this.__iterate(function(n,i,o){if(e.call(t,n,i,o))return r=[i,n],!1}),r},findKey:function(e,t){var n=this.findEntry(e,t);return n&&n[0]},findLast:function(e,t,n){return this.toKeyedSeq().reverse().find(e,t,n)},findLastEntry:function(e,t,n){return this.toKeyedSeq().reverse().findEntry(e,t,n)},findLastKey:function(e,t){return this.toKeyedSeq().reverse().findKey(e,t)},first:function(){return this.find(v)},flatMap:function(e,t){return Et(this,yt(this,e,t))},flatten:function(e){return Et(this,gt(this,e,!0))},fromEntrySeq:function(){return new at(this)},get:function(e,t){return this.find(function(t,n){return X(n,e)},void 0,t)},getIn:function(e,t){for(var n,r=this,i=Tt(e);!(n=i.next()).done;){var o=n.value;if((r=r&&r.get?r.get(o,vn):vn)===vn)return t}return r},groupBy:function(e,t){return ft(this,e,t)},has:function(e){return this.get(e,vn)!==vn},hasIn:function(e){return this.getIn(e,vn)!==vn},isSubset:function(e){return e="function"==typeof e.includes?e:t(e),this.every(function(t){return e.includes(t)})},isSuperset:function(e){return e="function"==typeof e.isSubset?e:t(e),e.isSubset(this)},keyOf:function(e){return this.findKey(function(t){return X(t,e)})},keySeq:function(){return this.toSeq().map($t).toIndexedSeq()},last:function(){return this.toSeq().reverse().first()},lastKeyOf:function(e){return this.toKeyedSeq().reverse().keyOf(e)},max:function(e){return xt(this,e)},maxBy:function(e,t){return xt(this,t,e)},min:function(e){return xt(this,e?en(e):rn)},minBy:function(e,t){return xt(this,t?en(t):rn,e)},rest:function(){return this.slice(1)},skip:function(e){return this.slice(Math.max(0,e))},skipLast:function(e){return Et(this,this.toSeq().reverse().skip(e).reverse())},skipWhile:function(e,t){return Et(this,mt(this,e,t,!0))},skipUntil:function(e,t){return this.skipWhile(Qt(e),t)},sortBy:function(e,t){return Et(this,bt(this,t,e))},take:function(e){return this.slice(0,Math.max(0,e))},takeLast:function(e){return Et(this,this.toSeq().reverse().take(e).reverse())},takeWhile:function(e,t){return Et(this,dt(this,e,t))},takeUntil:function(e,t){return this.takeWhile(Qt(e),t)},valueSeq:function(){return this.toIndexedSeq()},hashCode:function(){return this.__hash||(this.__hash=on(this))}});var ar=t.prototype;ar[ln]=!0,ar[En]=ar.values,ar.__toJS=ar.toArray,ar.__toStringMapper=tn,ar.inspect=ar.toSource=function(){return this.toString()},ar.chain=ar.flatMap,ar.contains=ar.includes,Yt(n,{flip:function(){return Et(this,st(this))},mapEntries:function(e,t){var n=this,r=0;return Et(this,this.toSeq().map(function(i,o){return e.call(t,[o,i],r++,n)}).fromEntrySeq())},mapKeys:function(e,t){var n=this;return Et(this,this.toSeq().flip().map(function(r,i){return e.call(t,r,i,n)}).flip())}});var sr=n.prototype;return sr[cn]=!0,sr[En]=ar.entries,sr.__toJS=ar.toObject,sr.__toStringMapper=function(e,t){return JSON.stringify(t)+": "+tn(e)},Yt(r,{toKeyedSeq:function(){return new rt(this,!1)},filter:function(e,t){return Et(this,ct(this,e,t,!1))},findIndex:function(e,t){var n=this.findEntry(e,t);return n?n[0]:-1},indexOf:function(e){var t=this.keyOf(e);return void 0===t?-1:t},lastIndexOf:function(e){var t=this.lastKeyOf(e);return void 0===t?-1:t},reverse:function(){return Et(this,lt(this,!1))},slice:function(e,t){return Et(this,ht(this,e,t,!1))},splice:function(e,t){var n=arguments.length;if(t=Math.max(0|t,0),0===n||2===n&&!t)return this;e=y(e,e<0?this.count():this.size);var r=this.slice(0,e);return Et(this,1===n?r:r.concat(h(arguments,2),this.slice(e+t)))},findLastIndex:function(e,t){var n=this.findLastEntry(e,t);return n?n[0]:-1},first:function(){return this.get(0)},flatten:function(e){return Et(this,gt(this,e,!1))},get:function(e,t){return e=m(this,e),e<0||this.size===1/0||void 0!==this.size&&e>this.size?t:this.find(function(t,n){return n===e},void 0,t)},has:function(e){return(e=m(this,e))>=0&&(void 0!==this.size?this.size===1/0||e<this.size:-1!==this.indexOf(e))},interpose:function(e){return Et(this,_t(this,e))},interleave:function(){var e=[this].concat(h(arguments)),t=kt(this.toSeq(),T.of,e),n=t.flatten(!0);return t.size&&(n.size=t.size*e.length),Et(this,n)},keySeq:function(){return Q(0,this.size)},last:function(){return this.get(-1)},skipWhile:function(e,t){return Et(this,mt(this,e,t,!1))},zip:function(){return Et(this,kt(this,nn,[this].concat(h(arguments))))},zipWith:function(e){var t=h(arguments);return t[0]=this,Et(this,kt(this,e,t))}}),r.prototype[pn]=!0,r.prototype[fn]=!0,Yt(i,{get:function(e,t){return this.has(e)?e:t},includes:function(e){return this.has(e)},keySeq:function(){return this.valueSeq()}}),i.prototype.has=ar.includes,i.prototype.contains=i.prototype.includes,Yt(M,n.prototype),Yt(T,r.prototype),Yt(P,i.prototype),Yt(te,n.prototype),Yt(ne,r.prototype),Yt(re,i.prototype),{Iterable:t,Seq:O,Collection:ee,Map:pe,OrderedMap:Ze,List:Le,Stack:Gt,Set:Nt,OrderedSet:Ut,Record:Pt,Range:Q,Repeat:$,is:X,fromJS:H}})},function(e,t,n){"use strict";function r(e,t,n,r,o,a,s,u){if(i(t),!e){var l;if(void 0===t)l=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var c=[n,r,o,a,s,u],p=0;l=new Error(t.replace(/%s/g,function(){return c[p++]})),l.name="Invariant Violation"}throw l.framesToPop=1,l}}var i=function(e){};e.exports=r},function(e,t,n){"use strict";(function(e){function r(e){return e&&e.__esModule?e:{default:e}}function i(e){try{var t=JSON.parse(e);if(t&&"object"===(void 0===t?"undefined":(0,N.default)(t)))return t}catch(e){}return!1}function o(e){return p(e)?oe(e)?e.toObject():e:{}}function a(e){return e?e.toArray?e.toArray():l(e):[]}function s(e){return oe(e)?e:e instanceof te.default.File?e:p(e)?Array.isArray(e)?L.default.Seq(e).map(s).toList():L.default.OrderedMap(e).map(s):e}function u(e,t){var n={};return(0,j.default)(e).filter(function(t){return"function"==typeof e[t]}).forEach(function(r){return n[r]=e[r].bind(null,t)}),n}function l(e){return Array.isArray(e)?e:[e]}function c(e){return"function"==typeof e}function p(e){return!!e&&"object"===(void 0===e?"undefined":(0,N.default)(e))}function f(e){return"function"==typeof e}function h(e){return Array.isArray(e)}function d(e,t){return(0,j.default)(e).reduce(function(n,r){return n[r]=t(e[r],r),n},{})}function m(e,t){return(0,j.default)(e).reduce(function(n,r){var i=t(e[r],r);return i&&"object"===(void 0===i?"undefined":(0,N.default)(i))&&(0,I.default)(n,i),n},{})}function v(e){return function(t){t.dispatch,t.getState;return function(t){return function(n){return"function"==typeof n?n(e()):t(n)}}}}function g(e){var t=e.keySeq();return t.contains(ie)?ie:t.filter(function(e){return"2"===(e+"")[0]}).sort().first()}function y(e,t){if(!L.default.Iterable.isIterable(e))return L.default.List();var n=e.getIn(Array.isArray(t)?t:[t]);return L.default.List.isList(n)?n:L.default.List()}function _(e){var t=document;if(!e)return"";if(e.textContent.length>5e3)return e.textContent;return function(e){for(var n,r,i,o,a,s=e.textContent,u=0,l=s[0],c=1,p=e.innerHTML="",f=0;r=n,n=f<7&&"\\"==n?1:c;){if(c=l,l=s[++u],o=p.length>1,!c||f>8&&"\n"==c||[/\S/.test(c),1,1,!/[$\w]/.test(c),("/"==n||"\n"==n)&&o,'"'==n&&o,"'"==n&&o,s[u-4]+r+n=="--\x3e",r+n=="*/"][f])for(p&&(e.appendChild(a=t.createElement("span")).setAttribute("style",["color: #555; font-weight: bold;","","","color: #555;",""][f?f<3?2:f>6?4:f>3?3:+/^(a(bstract|lias|nd|rguments|rray|s(m|sert)?|uto)|b(ase|egin|ool(ean)?|reak|yte)|c(ase|atch|har|hecked|lass|lone|ompl|onst|ontinue)|de(bugger|cimal|clare|f(ault|er)?|init|l(egate|ete)?)|do|double|e(cho|ls?if|lse(if)?|nd|nsure|num|vent|x(cept|ec|p(licit|ort)|te(nds|nsion|rn)))|f(allthrough|alse|inal(ly)?|ixed|loat|or(each)?|riend|rom|unc(tion)?)|global|goto|guard|i(f|mp(lements|licit|ort)|n(it|clude(_once)?|line|out|stanceof|t(erface|ernal)?)?|s)|l(ambda|et|ock|ong)|m(icrolight|odule|utable)|NaN|n(amespace|ative|ext|ew|il|ot|ull)|o(bject|perator|r|ut|verride)|p(ackage|arams|rivate|rotected|rotocol|ublic)|r(aise|e(adonly|do|f|gister|peat|quire(_once)?|scue|strict|try|turn))|s(byte|ealed|elf|hort|igned|izeof|tatic|tring|truct|ubscript|uper|ynchronized|witch)|t(emplate|hen|his|hrows?|ransient|rue|ry|ype(alias|def|id|name|of))|u(n(checked|def(ined)?|ion|less|signed|til)|se|sing)|v(ar|irtual|oid|olatile)|w(char_t|hen|here|hile|ith)|xor|yield)$/.test(p):0]),a.appendChild(t.createTextNode(p))),i=f&&f<7?f:i,p="",f=11;![1,/[\/{}[(\-+*=<>:;|\\.,?!&@~]/.test(c),/[\])]/.test(c),/[$\w]/.test(c),"/"==c&&i<2&&"<"!=n,'"'==c,"'"==c,c+l+s[u+1]+s[u+2]=="\x3c!--",c+l=="/*",c+l=="//","#"==c][--f];);p+=c}}(e)}function b(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"key",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:L.default.Map();if(!L.default.Map.isMap(e)||!e.size)return L.default.List();if(Array.isArray(t)||(t=[t]),t.length<1)return e.merge(n);var r=L.default.List(),i=t[0],o=!0,a=!1,s=void 0;try{for(var u,l=(0,T.default)(e.entries());!(o=(u=l.next()).done);o=!0){var c=u.value,p=(0,O.default)(c,2),f=p[0],h=p[1],d=b(h,t.slice(1),n.set(i,f));r=L.default.List.isList(d)?r.concat(d):r.push(d)}}catch(e){a=!0,s=e}finally{try{!o&&l.return&&l.return()}finally{if(a)throw s}}return r}function x(e){var t=/filename="([^;]*);?"/i.exec(e);return null===t&&(t=/filename=([^;]*);?/i.exec(e)),null!==t&&t.length>1?t[1]:null}function w(e){return(0,V.default)((0,U.default)(e))}function k(e){return w(e.replace(/\.[^.\/]*$/,""))}function E(e){return"string"!=typeof e||""===e?"":(0,q.sanitizeUrl)(e)}function S(e){if(!L.default.OrderedMap.isOrderedMap(e))return null;if(!e.size)return null;var t=e.find(function(e,t){return t.startsWith("2")&&(0,j.default)(e.get("content")||{}).length>0}),n=e.get("default")||L.default.OrderedMap(),r=(n.get("content")||L.default.OrderedMap()).keySeq().toJS(),i=r.length?n:null;return t||i}Object.defineProperty(t,"__esModule",{value:!0}),t.getExtensions=t.escapeDeepLinkPath=t.createDeepLinkPath=t.shallowEqualKeys=t.buildFormData=t.sorters=t.btoa=t.parseSearch=t.getSampleSchema=t.validateParam=t.validatePattern=t.validateMinLength=t.validateMaxLength=t.validateGuid=t.validateDateTime=t.validateString=t.validateBoolean=t.validateFile=t.validateInteger=t.validateNumber=t.validateMinimum=t.validateMaximum=t.propChecker=t.memoize=t.isImmutable=void 0;var C=n(35),A=r(C),D=n(18),O=r(D),M=n(95),T=r(M),P=n(30),I=r(P),R=n(47),j=r(R),F=n(48),N=r(F);t.isJSONObject=i,t.objectify=o,t.arrayify=a,t.fromJSOrdered=s,t.bindToState=u,t.normalizeArray=l,t.isFn=c,t.isObject=p,t.isFunc=f,t.isArray=h,t.objMap=d,t.objReduce=m,t.systemThunkMiddleware=v,t.defaultStatusCode=g,t.getList=y,t.highlight=_,t.mapToList=b,t.extractFileNameFromContentDispositionHeader=x,t.pascalCase=w,t.pascalCaseFilename=k,t.sanitizeUrl=E,t.getAcceptControllingResponse=S;var B=n(7),L=r(B),q=n(506),z=n(940),U=r(z),W=n(428),V=r(W),H=n(425),G=r(H),J=n(223),K=r(J),X=n(955),Y=r(X),$=n(120),Z=r($),Q=n(172),ee=n(46),te=r(ee),ne=n(697),re=r(ne),ie="default",oe=t.isImmutable=function(e){return L.default.Iterable.isIterable(e)},ae=(t.memoize=G.default,t.propChecker=function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:[];return(0,j.default)(e).length!==(0,j.default)(t).length||((0,Y.default)(e,function(e,n){if(r.includes(n))return!1;var i=t[n];return L.default.Iterable.isIterable(e)?!L.default.is(e,i):("object"!==(void 0===e?"undefined":(0,N.default)(e))||"object"!==(void 0===i?"undefined":(0,N.default)(i)))&&e!==i})||n.some(function(n){return!(0,Z.default)(e[n],t[n])}))},t.validateMaximum=function(e,t){if(e>t)return"Value must be less than Maximum"}),se=t.validateMinimum=function(e,t){if(e<t)return"Value must be greater than Minimum"},ue=t.validateNumber=function(e){if(!/^-?\d+(\.?\d+)?$/.test(e))return"Value must be a number"},le=t.validateInteger=function(e){if(!/^-?\d+$/.test(e))return"Value must be an integer"},ce=t.validateFile=function(e){if(e&&!(e instanceof te.default.File))return"Value must be a file"},pe=t.validateBoolean=function(e){if("true"!==e&&"false"!==e&&!0!==e&&!1!==e)return"Value must be a boolean"},fe=t.validateString=function(e){if(e&&"string"!=typeof e)return"Value must be a string"},he=t.validateDateTime=function(e){if(isNaN(Date.parse(e)))return"Value must be a DateTime"},de=t.validateGuid=function(e){if(e=e.toString().toLowerCase(),!/^[{(]?[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}[)}]?$/.test(e))return"Value must be a Guid"},me=t.validateMaxLength=function(e,t){if(e.length>t)return"Value must be less than MaxLength"},ve=t.validateMinLength=function(e,t){if(e.length<t)return"Value must be greater than MinLength"},ge=t.validatePattern=function(e,t){if(!new RegExp(t).test(e))return"Value must follow pattern "+t},ye=(t.validateParam=function(e,t){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],r=[],i=t&&"body"===e.get("in")?e.get("value_xml"):e.get("value"),o=e.get("required"),a=n?e.get("schema"):e;if(!a)return r;var s=a.get("maximum"),u=a.get("minimum"),l=a.get("type"),c=a.get("format"),p=a.get("maxLength"),f=a.get("minLength"),h=a.get("pattern");if(l&&(o||i)){var d="string"===l&&i,m="array"===l&&Array.isArray(i)&&i.length,v="array"===l&&L.default.List.isList(i)&&i.count(),g="file"===l&&i instanceof te.default.File,y="boolean"===l&&(i||!1===i),_="number"===l&&(i||0===i),b="integer"===l&&(i||0===i);if(o&&!(d||m||v||g||y||_||b))return r.push("Required field is not provided"),r;if(h){var x=ge(i,h);x&&r.push(x)}if(p||0===p){var w=me(i,p);w&&r.push(w)}if(f){var k=ve(i,f);k&&r.push(k)}if(s||0===s){var E=ae(i,s);E&&r.push(E)}if(u||0===u){var S=se(i,u);S&&r.push(S)}if("string"===l){var C=void 0;if(!(C="date-time"===c?he(i):"uuid"===c?de(i):fe(i)))return r;r.push(C)}else if("boolean"===l){var A=pe(i);if(!A)return r;r.push(A)}else if("number"===l){var D=ue(i);if(!D)return r;r.push(D)}else if("integer"===l){var O=le(i);if(!O)return r;r.push(O)}else if("array"===l){var M=void 0;if(!i.count())return r;M=a.getIn(["items","type"]),i.forEach(function(e,t){var n=void 0;"number"===M?n=ue(e):"integer"===M?n=le(e):"string"===M&&(n=fe(e)),n&&r.push({index:t,error:n})})}else if("file"===l){var T=ce(i);if(!T)return r;r.push(T)}}return r},t.getSampleSchema=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};if(/xml/.test(t)){if(!e.xml||!e.xml.name){if(e.xml=e.xml||{},!e.$$ref)return e.type||e.items||e.properties||e.additionalProperties?'<?xml version="1.0" encoding="UTF-8"?>\n\x3c!-- XML example cannot be generated --\x3e':null;var r=e.$$ref.match(/\S*\/(\S+)$/);e.xml.name=r[1]}return(0,Q.memoizedCreateXMLExample)(e,n)}return(0,A.default)((0,Q.memoizedSampleFromSchema)(e,n),null,2)},t.parseSearch=function(){var e={},t=te.default.location.search;if(!t)return{};if(""!=t){var n=t.substr(1).split("&");for(var r in n)n.hasOwnProperty(r)&&(r=n[r].split("="),e[decodeURIComponent(r[0])]=decodeURIComponent(r[1]))}return e},t.btoa=function(t){var n=void 0;return n=t instanceof e?t:new e(t.toString(),"utf-8"),n.toString("base64")},t.sorters={operationsSorter:{alpha:function(e,t){return e.get("path").localeCompare(t.get("path"))},method:function(e,t){return e.get("method").localeCompare(t.get("method"))}},tagsSorter:{alpha:function(e,t){return e.localeCompare(t)}}},t.buildFormData=function(e){var t=[];for(var n in e){var r=e[n];void 0!==r&&""!==r&&t.push([n,"=",encodeURIComponent(r).replace(/%20/g,"+")].join(""))}return t.join("&")},t.shallowEqualKeys=function(e,t,n){return!!(0,K.default)(n,function(n){return(0,Z.default)(e[n],t[n])})},t.createDeepLinkPath=function(e){return"string"==typeof e||e instanceof String?e.trim().replace(/\s/g,"_"):""});t.escapeDeepLinkPath=function(e){return(0,re.default)(ye(e))},t.getExtensions=function(e){return e.filter(function(e,t){return/^x-/.test(t)})}}).call(t,n(40).Buffer)},function(e,t,n){"use strict";var r=n(32),i=r;e.exports=i},function(e,t,n){"use strict";function r(e){for(var t=arguments.length-1,n="Minified React error #"+e+"; visit http://facebook.github.io/react/docs/error-decoder.html?invariant="+e,r=0;r<t;r++)n+="&args[]="+encodeURIComponent(arguments[r+1]);n+=" for the full message or use the non-minified dev environment for full errors and additional helpful warnings.";var i=new Error(n);throw i.name="Invariant Violation",i.framesToPop=1,i}e.exports=r},function(e,t,n){"use strict";function r(e){var t=typeof e;return Array.isArray(e)?"array":e instanceof RegExp?"object":e instanceof b.Iterable?"Immutable."+e.toSource().split(" ")[0]:t}function i(e){function t(t,n,r,i,o,a){for(var s=arguments.length,u=Array(s>6?s-6:0),l=6;l<s;l++)u[l-6]=arguments[l];if(a=a||r,i=i||x,null!=n[r])return e.apply(void 0,[n,r,i,o,a].concat(u));var c=o;return t?new Error("Required "+c+" `"+a+"` was not specified in `"+i+"`."):void 0}var n=t.bind(null,!1);return n.isRequired=t.bind(null,!0),n}function o(e,t){function n(n,i,o,a,s){var u=n[i];if(!t(u)){var l=r(u);return new Error("Invalid "+a+" `"+s+"` of type `"+l+"` supplied to `"+o+"`, expected `"+e+"`.")}return null}return i(n)}function a(e,t,n){function o(i,o,a,s,u){for(var l=arguments.length,c=Array(l>5?l-5:0),p=5;p<l;p++)c[p-5]=arguments[p];var f=i[o];if(!n(f)){var h=s,d=r(f);return new Error("Invalid "+h+" `"+u+"` of type `"+d+"` supplied to `"+a+"`, expected an Immutable.js "+t+".")}if("function"!=typeof e)return new Error("Invalid typeChecker supplied to `"+a+"` for propType `"+u+"`, expected a function.");for(var m=f.toArray(),v=0,g=m.length;v<g;v++){var y=e.apply(void 0,[m,v,a,s,u+"["+v+"]"].concat(c));if(y instanceof Error)return y}}return i(o)}function s(e){function t(t,n,r,i,o){for(var a=arguments.length,s=Array(a>5?a-5:0),u=5;u<a;u++)s[u-5]=arguments[u];var l=t[n];if("function"!=typeof e)return new Error("Invalid keysTypeChecker (optional second argument) supplied to `"+r+"` for propType `"+o+"`, expected a function.");for(var c=l.keySeq().toArray(),p=0,f=c.length;p<f;p++){var h=e.apply(void 0,[c,p,r,i,o+" -> key("+c[p]+")"].concat(s));if(h instanceof Error)return h}}return i(t)}function u(e){return a(e,"List",b.List.isList)}function l(e,t,n,r){function o(){for(var i=arguments.length,o=Array(i),u=0;u<i;u++)o[u]=arguments[u];return a(e,n,r).apply(void 0,o)||t&&s(t).apply(void 0,o)}return i(o)}function c(e,t){return l(e,t,"Map",b.Map.isMap)}function p(e,t){return l(e,t,"OrderedMap",b.OrderedMap.isOrderedMap)}function f(e){return a(e,"Set",b.Set.isSet)}function h(e){return a(e,"OrderedSet",b.OrderedSet.isOrderedSet)}function d(e){return a(e,"Stack",b.Stack.isStack)}function m(e){return a(e,"Iterable",b.Iterable.isIterable)}function v(e){function t(t,n,i,o,a){for(var s=arguments.length,u=Array(s>5?s-5:0),l=5;l<s;l++)u[l-5]=arguments[l];var c=t[n];if(!(c instanceof b.Record)){var p=r(c),f=o;return new Error("Invalid "+f+" `"+a+"` of type `"+p+"` supplied to `"+i+"`, expected an Immutable.js Record.")}for(var h in e){var d=e[h];if(d){var m=c.toObject(),v=d.apply(void 0,[m,h,i,o,a+"."+h].concat(u));if(v)return v}}}return i(t)}function g(e){function t(t,i,a,s,u){for(var l=arguments.length,c=Array(l>5?l-5:0),p=5;p<l;p++)c[p-5]=arguments[p];var f=t[i];if(!o(f)){var h=r(f),d=s;return new Error("Invalid "+d+" `"+u+"` of type `"+h+"` supplied to `"+a+"`, expected an Immutable.js "+n+".")}var m=f.toObject();for(var v in e){var g=e[v];if(g){var y=g.apply(void 0,[m,v,a,s,u+"."+v].concat(c));if(y)return y}}}var n=void 0===arguments[1]?"Iterable":arguments[1],o=void 0===arguments[2]?b.Iterable.isIterable:arguments[2];return i(t)}function y(e){return g(e)}function _(e){return g(e,"Map",b.Map.isMap)}var b=n(7),x="<<anonymous>>",w={listOf:u,mapOf:c,orderedMapOf:p,setOf:f,orderedSetOf:h,stackOf:d,iterableOf:m,recordOf:v,shape:y,contains:y,mapContains:_,list:o("List",b.List.isList),map:o("Map",b.Map.isMap),orderedMap:o("OrderedMap",b.OrderedMap.isOrderedMap),set:o("Set",b.Set.isSet),orderedSet:o("OrderedSet",b.OrderedSet.isOrderedSet),stack:o("Stack",b.Stack.isStack),seq:o("Seq",b.Seq.isSeq),record:o("Record",function(e){return e instanceof b.Record}),iterable:o("Iterable",b.Iterable.isIterable)};e.exports=w},function(e,t,n){"use strict";function r(e){if(null===e||void 0===e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}/*
--object-assign
--(c) Sindre Sorhus
--@license MIT
--*/
--var i=Object.getOwnPropertySymbols,o=Object.prototype.hasOwnProperty,a=Object.prototype.propertyIsEnumerable;e.exports=function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map(function(e){return t[e]}).join(""))return!1;var r={};return"abcdefghijklmnopqrst".split("").forEach(function(e){r[e]=e}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},r)).join("")}catch(e){return!1}}()?Object.assign:function(e,t){for(var n,s,u=r(e),l=1;l<arguments.length;l++){n=Object(arguments[l]);for(var c in n)o.call(n,c)&&(u[c]=n[c]);if(i){s=i(n);for(var p=0;p<s.length;p++)a.call(n,s[p])&&(u[s[p]]=n[s[p]])}}return u}},function(e,t,n){"use strict";function r(e,t){return 1===e.nodeType&&e.getAttribute(d)===String(t)||8===e.nodeType&&e.nodeValue===" react-text: "+t+" "||8===e.nodeType&&e.nodeValue===" react-empty: "+t+" "}function i(e){for(var t;t=e._renderedComponent;)e=t;return e}function o(e,t){var n=i(e);n._hostNode=t,t[v]=n}function a(e){var t=e._hostNode;t&&(delete t[v],e._hostNode=null)}function s(e,t){if(!(e._flags&m.hasCachedChildNodes)){var n=e._renderedChildren,a=t.firstChild;e:for(var s in n)if(n.hasOwnProperty(s)){var u=n[s],l=i(u)._domID;if(0!==l){for(;null!==a;a=a.nextSibling)if(r(a,l)){o(u,a);continue e}p("32",l)}}e._flags|=m.hasCachedChildNodes}}function u(e){if(e[v])return e[v];for(var t=[];!e[v];){if(t.push(e),!e.parentNode)return null;e=e.parentNode}for(var n,r;e&&(r=e[v]);e=t.pop())n=r,t.length&&s(r,e);return n}function l(e){var t=u(e);return null!=t&&t._hostNode===e?t:null}function c(e){if(void 0===e._hostNode&&p("33"),e._hostNode)return e._hostNode;for(var t=[];!e._hostNode;)t.push(e),e._hostParent||p("34"),e=e._hostParent;for(;t.length;e=t.pop())s(e,e._hostNode);return e._hostNode}var p=n(11),f=n(89),h=n(453),d=(n(8),f.ID_ATTRIBUTE_NAME),m=h,v="__reactInternalInstance$"+Math.random().toString(36).slice(2),g={getClosestInstanceFromNode:u,getInstanceFromNode:l,getNodeFromInstance:c,precacheChildNodes:s,precacheNode:o,uncacheNode:a};e.exports=g},function(e,t){var n=e.exports={version:"2.5.3"};"number"==typeof __e&&(__e=n)},function(e,t,n){"use strict";function r(e){var t={};return null!==e&&Object.keys(e).forEach(function(n){e[n].forEach(function(e){t[String(e)]=n})}),t}function i(e,t){if(t=t||{},Object.keys(t).forEach(function(t){if(-1===a.indexOf(t))throw new o('Unknown option "'+t+'" is met in definition of "'+e+'" YAML type.')}),this.tag=e,this.kind=t.kind||null,this.resolve=t.resolve||function(){return!0},this.construct=t.construct||function(e){return e},this.instanceOf=t.instanceOf||null,this.predicate=t.predicate||null,this.represent=t.represent||null,this.defaultStyle=t.defaultStyle||null,this.styleAliases=r(t.styleAliases||null),-1===s.indexOf(this.kind))throw new o('Unknown kind "'+this.kind+'" is specified for "'+e+'" YAML type.')}var o=n(117),a=["kind","resolve","construct","instanceOf","predicate","represent","defaultStyle","styleAliases"],s=["scalar","sequence","mapping"];e.exports=i},function(e,t){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(e){"object"==typeof window&&(n=window)}e.exports=n},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}t.__esModule=!0;var i=n(564),o=r(i),a=n(95),s=r(a);t.default=function(){function e(e,t){var n=[],r=!0,i=!1,o=void 0;try{for(var a,u=(0,s.default)(e);!(r=(a=u.next()).done)&&(n.push(a.value),!t||n.length!==t);r=!0);}catch(e){i=!0,o=e}finally{try{!r&&u.return&&u.return()}finally{if(i)throw o}}return n}return function(t,n){if(Array.isArray(t))return t;if((0,o.default)(Object(t)))return e(t,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}()},function(e,t,n){var r=n(361)("wks"),i=n(202),o=n(31).Symbol,a="function"==typeof o;(e.exports=function(e){return r[e]||(r[e]=a&&o[e]||(a?o:i)("Symbol."+e))}).store=r},function(e,t){var n=Array.isArray;e.exports=n},function(e,t,n){"use strict";t.__esModule=!0;var r=n(30),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=i.default||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}},function(e,t,n){var r=n(188)("wks"),i=n(134),o=n(24).Symbol,a="function"==typeof o;(e.exports=function(e){return r[e]||(r[e]=a&&o[e]||(a?o:i)("Symbol."+e))}).store=r},function(e,t,n){var r=n(24),i=n(15),o=n(53),a=n(56),s=function(e,t,n){var u,l,c,p=e&s.F,f=e&s.G,h=e&s.S,d=e&s.P,m=e&s.B,v=e&s.W,g=f?i:i[t]||(i[t]={}),y=g.prototype,_=f?r:h?r[t]:(r[t]||{}).prototype;f&&(n=t);for(u in n)(l=!p&&_&&void 0!==_[u])&&u in g||(c=l?_[u]:n[u],g[u]=f&&"function"!=typeof _[u]?n[u]:m&&l?o(c,r):v&&_[u]==c?function(e){var t=function(t,n,r){if(this instanceof e){switch(arguments.length){case 0:return new e;case 1:return new e(t);case 2:return new e(t,n)}return new e(t,n,r)}return e.apply(this,arguments)};return t.prototype=e.prototype,t}(c):d&&"function"==typeof c?o(Function.call,c):c,d&&((g.virtual||(g.virtual={}))[u]=c,e&s.R&&y&&!y[u]&&a(y,u,c)))};s.F=1,s.G=2,s.S=4,s.P=8,s.B=16,s.W=32,s.U=64,s.R=128,e.exports=s},function(e,t){var n=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(e,t,n){"use strict";var r=!("undefined"==typeof window||!window.document||!window.document.createElement),i={canUseDOM:r,canUseWorkers:"undefined"!=typeof Worker,canUseEventListeners:r&&!(!window.addEventListener&&!window.attachEvent),canUseViewport:r&&!!window.screen,isInWorker:!r};e.exports=i},function(e,t,n){"use strict";function r(e){return Object.prototype.toString.call(e)}function i(e){return"[object String]"===r(e)}function o(e,t){return!!e&&d.call(e,t)}function a(e){return[].slice.call(arguments,1).forEach(function(t){if(t){if("object"!=typeof t)throw new TypeError(t+"must be object");Object.keys(t).forEach(function(n){e[n]=t[n]})}}),e}function s(e){return e.indexOf("\\")<0?e:e.replace(m,"$1")}function u(e){return!(e>=55296&&e<=57343)&&(!(e>=64976&&e<=65007)&&(65535!=(65535&e)&&65534!=(65535&e)&&(!(e>=0&&e<=8)&&(11!==e&&(!(e>=14&&e<=31)&&(!(e>=127&&e<=159)&&!(e>1114111)))))))}function l(e){if(e>65535){e-=65536;var t=55296+(e>>10),n=56320+(1023&e);return String.fromCharCode(t,n)}return String.fromCharCode(e)}function c(e,t){var n=0;return o(y,t)?y[t]:35===t.charCodeAt(0)&&g.test(t)&&(n="x"===t[1].toLowerCase()?parseInt(t.slice(2),16):parseInt(t.slice(1),10),u(n))?l(n):e}function p(e){return e.indexOf("&")<0?e:e.replace(v,c)}function f(e){return x[e]}function h(e){return _.test(e)?e.replace(b,f):e}var d=Object.prototype.hasOwnProperty,m=/\\([\\!"#$%&'()*+,.\/:;<=>?@[\]^_`{|}~-])/g,v=/&([a-z#][a-z0-9]{1,31});/gi,g=/^#((?:x[a-f0-9]{1,8}|[0-9]{1,8}))/i,y=n(488),_=/[&<>"]/,b=/[&<>"]/g,x={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;"};t.assign=a,t.isString=i,t.has=o,t.unescapeMd=s,t.isValidEntityCode=u,t.fromCodePoint=l,t.replaceEntities=p,t.escapeHtml=h},function(e,t){e.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},function(e,t,n){var r=n(31),i=n(63),o=n(64),a=n(78),s=n(136),u=function(e,t,n){var l,c,p,f,h=e&u.F,d=e&u.G,m=e&u.S,v=e&u.P,g=e&u.B,y=d?r:m?r[t]||(r[t]={}):(r[t]||{}).prototype,_=d?i:i[t]||(i[t]={}),b=_.prototype||(_.prototype={});d&&(n=t);for(l in n)c=!h&&y&&void 0!==y[l],p=(c?y:n)[l],f=g&&c?s(p,r):v&&"function"==typeof p?s(Function.call,p):p,y&&a(y,l,p,e&u.U),_[l]!=p&&o(_,l,f),v&&b[l]!=p&&(b[l]=p)};r.core=i,u.F=1,u.G=2,u.S=4,u.P=8,u.B=16,u.W=32,u.U=64,u.R=128,e.exports=u},function(e,t,n){var r=n(28),i=n(107),o=n(57),a=/"/g,s=function(e,t,n,r){var i=String(o(e)),s="<"+t;return""!==n&&(s+=" "+n+'="'+String(r).replace(a,"&quot;")+'"'),s+">"+i+"</"+t+">"};e.exports=function(e,t){var n={};n[e]=t(s),r(r.P+r.F*i(function(){var t=""[e]('"');return t!==t.toLowerCase()||t.split('"').length>3}),"String",n)}},function(e,t,n){e.exports={default:n(589),__esModule:!0}},function(e,t){var n=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(e,t,n){"use strict";function r(e){return function(){return e}}var i=function(){};i.thatReturns=r,i.thatReturnsFalse=r(!1),i.thatReturnsTrue=r(!0),i.thatReturnsNull=r(null),i.thatReturnsThis=function(){return this},i.thatReturnsArgument=function(e){return e},e.exports=i},function(e,t){function n(){throw new Error("setTimeout has not been defined")}function r(){throw new Error("clearTimeout has not been defined")}function i(e){if(c===setTimeout)return setTimeout(e,0);if((c===n||!c)&&setTimeout)return c=setTimeout,setTimeout(e,0);try{return c(e,0)}catch(t){try{return c.call(null,e,0)}catch(t){return c.call(this,e,0)}}}function o(e){if(p===clearTimeout)return clearTimeout(e);if((p===r||!p)&&clearTimeout)return p=clearTimeout,clearTimeout(e);try{return p(e)}catch(t){try{return p.call(null,e)}catch(t){return p.call(this,e)}}}function a(){m&&h&&(m=!1,h.length?d=h.concat(d):v=-1,d.length&&s())}function s(){if(!m){var e=i(a);m=!0;for(var t=d.length;t;){for(h=d,d=[];++v<t;)h&&h[v].run();v=-1,t=d.length}h=null,m=!1,o(e)}}function u(e,t){this.fun=e,this.array=t}function l(){}var c,p,f=e.exports={};!function(){try{c="function"==typeof setTimeout?setTimeout:n}catch(e){c=n}try{p="function"==typeof clearTimeout?clearTimeout:r}catch(e){p=r}}();var h,d=[],m=!1,v=-1;f.nextTick=function(e){var t=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];d.push(new u(e,t)),1!==d.length||m||i(s)},u.prototype.run=function(){this.fun.apply(null,this.array)},f.title="browser",f.browser=!0,f.env={},f.argv=[],f.version="",f.versions={},f.on=l,f.addListener=l,f.once=l,f.off=l,f.removeListener=l,f.removeAllListeners=l,f.emit=l,f.prependListener=l,f.prependOnceListener=l,f.listeners=function(e){return[]},f.binding=function(e){throw new Error("process.binding is not supported")},f.cwd=function(){return"/"},f.chdir=function(e){throw new Error("process.chdir is not supported")},f.umask=function(){return 0}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.get("openapi");return!!t&&t.startsWith("3")}function o(e){var t=e.get("swagger");return!!t&&t.startsWith("2")}function a(e){return function(t,n){return function(r){if(n&&n.specSelectors&&n.specSelectors.specJson){return i(n.specSelectors.specJson())?c.default.createElement(e,(0,u.default)({},r,n,{Ori:t})):c.default.createElement(t,r)}return console.warn("OAS3 wrapper: couldn't get spec"),null}}}Object.defineProperty(t,"__esModule",{value:!0});var s=n(21),u=r(s);t.isOAS3=i,t.isSwagger2=o,t.OAS3ComponentWrapFactory=a;var l=n(0),c=r(l)},function(e,t,n){e.exports={default:n(588),__esModule:!0}},function(e,t,n){"use strict";t.__esModule=!0;var r=n(331),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=function(e,t,n){return t in e?(0,i.default)(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}},function(e,t,n){var r=n(27);e.exports=function(e){if(!r(e))throw TypeError(e+" is not an object!");return e}},function(e,t){function n(e){var t=typeof e;return null!=e&&("object"==t||"function"==t)}e.exports=n},function(e,t,n){"use strict";var r=null;e.exports={debugTool:r}},function(e,t,n){"use strict";(function(e){function r(){return o.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function i(e,t){if(r()<t)throw new RangeError("Invalid typed array length");return o.TYPED_ARRAY_SUPPORT?(e=new Uint8Array(t),e.__proto__=o.prototype):(null===e&&(e=new o(t)),e.length=t),e}function o(e,t,n){if(!(o.TYPED_ARRAY_SUPPORT||this instanceof o))return new o(e,t,n);if("number"==typeof e){if("string"==typeof t)throw new Error("If encoding is specified then the first argument must be a string");return l(this,e)}return a(this,e,t,n)}function a(e,t,n,r){if("number"==typeof t)throw new TypeError('"value" argument must not be a number');return"undefined"!=typeof ArrayBuffer&&t instanceof ArrayBuffer?f(e,t,n,r):"string"==typeof t?c(e,t,n):h(e,t)}function s(e){if("number"!=typeof e)throw new TypeError('"size" argument must be a number');if(e<0)throw new RangeError('"size" argument must not be negative')}function u(e,t,n,r){return s(t),t<=0?i(e,t):void 0!==n?"string"==typeof r?i(e,t).fill(n,r):i(e,t).fill(n):i(e,t)}function l(e,t){if(s(t),e=i(e,t<0?0:0|d(t)),!o.TYPED_ARRAY_SUPPORT)for(var n=0;n<t;++n)e[n]=0;return e}function c(e,t,n){if("string"==typeof n&&""!==n||(n="utf8"),!o.isEncoding(n))throw new TypeError('"encoding" must be a valid string encoding');var r=0|v(t,n);e=i(e,r);var a=e.write(t,n);return a!==r&&(e=e.slice(0,a)),e}function p(e,t){var n=t.length<0?0:0|d(t.length);e=i(e,n);for(var r=0;r<n;r+=1)e[r]=255&t[r];return e}function f(e,t,n,r){if(t.byteLength,n<0||t.byteLength<n)throw new RangeError("'offset' is out of bounds");if(t.byteLength<n+(r||0))throw new RangeError("'length' is out of bounds");return t=void 0===n&&void 0===r?new Uint8Array(t):void 0===r?new Uint8Array(t,n):new Uint8Array(t,n,r),o.TYPED_ARRAY_SUPPORT?(e=t,e.__proto__=o.prototype):e=p(e,t),e}function h(e,t){if(o.isBuffer(t)){var n=0|d(t.length);return e=i(e,n),0===e.length?e:(t.copy(e,0,0,n),e)}if(t){if("undefined"!=typeof ArrayBuffer&&t.buffer instanceof ArrayBuffer||"length"in t)return"number"!=typeof t.length||X(t.length)?i(e,0):p(e,t);if("Buffer"===t.type&&Z(t.data))return p(e,t.data)}throw new TypeError("First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.")}function d(e){if(e>=r())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+r().toString(16)+" bytes");return 0|e}function m(e){return+e!=e&&(e=0),o.alloc(+e)}function v(e,t){if(o.isBuffer(e))return e.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(e)||e instanceof ArrayBuffer))return e.byteLength;"string"!=typeof e&&(e=""+e);var n=e.length;if(0===n)return 0;for(var r=!1;;)switch(t){case"ascii":case"latin1":case"binary":return n;case"utf8":case"utf-8":case void 0:return V(e).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*n;case"hex":return n>>>1;case"base64":return J(e).length;default:if(r)return V(e).length;t=(""+t).toLowerCase(),r=!0}}function g(e,t,n){var r=!1;if((void 0===t||t<0)&&(t=0),t>this.length)return"";if((void 0===n||n>this.length)&&(n=this.length),n<=0)return"";if(n>>>=0,t>>>=0,n<=t)return"";for(e||(e="utf8");;)switch(e){case"hex":return P(this,t,n);case"utf8":case"utf-8":return D(this,t,n);case"ascii":return M(this,t,n);case"latin1":case"binary":return T(this,t,n);case"base64":return A(this,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return I(this,t,n);default:if(r)throw new TypeError("Unknown encoding: "+e);e=(e+"").toLowerCase(),r=!0}}function y(e,t,n){var r=e[t];e[t]=e[n],e[n]=r}function _(e,t,n,r,i){if(0===e.length)return-1;if("string"==typeof n?(r=n,n=0):n>2147483647?n=2147483647:n<-2147483648&&(n=-2147483648),n=+n,isNaN(n)&&(n=i?0:e.length-1),n<0&&(n=e.length+n),n>=e.length){if(i)return-1;n=e.length-1}else if(n<0){if(!i)return-1;n=0}if("string"==typeof t&&(t=o.from(t,r)),o.isBuffer(t))return 0===t.length?-1:b(e,t,n,r,i);if("number"==typeof t)return t&=255,o.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?i?Uint8Array.prototype.indexOf.call(e,t,n):Uint8Array.prototype.lastIndexOf.call(e,t,n):b(e,[t],n,r,i);throw new TypeError("val must be string, number or Buffer")}function b(e,t,n,r,i){function o(e,t){return 1===a?e[t]:e.readUInt16BE(t*a)}var a=1,s=e.length,u=t.length;if(void 0!==r&&("ucs2"===(r=String(r).toLowerCase())||"ucs-2"===r||"utf16le"===r||"utf-16le"===r)){if(e.length<2||t.length<2)return-1;a=2,s/=2,u/=2,n/=2}var l;if(i){var c=-1;for(l=n;l<s;l++)if(o(e,l)===o(t,-1===c?0:l-c)){if(-1===c&&(c=l),l-c+1===u)return c*a}else-1!==c&&(l-=l-c),c=-1}else for(n+u>s&&(n=s-u),l=n;l>=0;l--){for(var p=!0,f=0;f<u;f++)if(o(e,l+f)!==o(t,f)){p=!1;break}if(p)return l}return-1}function x(e,t,n,r){n=Number(n)||0;var i=e.length-n;r?(r=Number(r))>i&&(r=i):r=i;var o=t.length;if(o%2!=0)throw new TypeError("Invalid hex string");r>o/2&&(r=o/2);for(var a=0;a<r;++a){var s=parseInt(t.substr(2*a,2),16);if(isNaN(s))return a;e[n+a]=s}return a}function w(e,t,n,r){return K(V(t,e.length-n),e,n,r)}function k(e,t,n,r){return K(H(t),e,n,r)}function E(e,t,n,r){return k(e,t,n,r)}function S(e,t,n,r){return K(J(t),e,n,r)}function C(e,t,n,r){return K(G(t,e.length-n),e,n,r)}function A(e,t,n){return 0===t&&n===e.length?Y.fromByteArray(e):Y.fromByteArray(e.slice(t,n))}function D(e,t,n){n=Math.min(e.length,n);for(var r=[],i=t;i<n;){var o=e[i],a=null,s=o>239?4:o>223?3:o>191?2:1;if(i+s<=n){var u,l,c,p;switch(s){case 1:o<128&&(a=o);break;case 2:u=e[i+1],128==(192&u)&&(p=(31&o)<<6|63&u)>127&&(a=p);break;case 3:u=e[i+1],l=e[i+2],128==(192&u)&&128==(192&l)&&(p=(15&o)<<12|(63&u)<<6|63&l)>2047&&(p<55296||p>57343)&&(a=p);break;case 4:u=e[i+1],l=e[i+2],c=e[i+3],128==(192&u)&&128==(192&l)&&128==(192&c)&&(p=(15&o)<<18|(63&u)<<12|(63&l)<<6|63&c)>65535&&p<1114112&&(a=p)}}null===a?(a=65533,s=1):a>65535&&(a-=65536,r.push(a>>>10&1023|55296),a=56320|1023&a),r.push(a),i+=s}return O(r)}function O(e){var t=e.length;if(t<=Q)return String.fromCharCode.apply(String,e);for(var n="",r=0;r<t;)n+=String.fromCharCode.apply(String,e.slice(r,r+=Q));return n}function M(e,t,n){var r="";n=Math.min(e.length,n);for(var i=t;i<n;++i)r+=String.fromCharCode(127&e[i]);return r}function T(e,t,n){var r="";n=Math.min(e.length,n);for(var i=t;i<n;++i)r+=String.fromCharCode(e[i]);return r}function P(e,t,n){var r=e.length;(!t||t<0)&&(t=0),(!n||n<0||n>r)&&(n=r);for(var i="",o=t;o<n;++o)i+=W(e[o]);return i}function I(e,t,n){for(var r=e.slice(t,n),i="",o=0;o<r.length;o+=2)i+=String.fromCharCode(r[o]+256*r[o+1]);return i}function R(e,t,n){if(e%1!=0||e<0)throw new RangeError("offset is not uint");if(e+t>n)throw new RangeError("Trying to access beyond buffer length")}function j(e,t,n,r,i,a){if(!o.isBuffer(e))throw new TypeError('"buffer" argument must be a Buffer instance');if(t>i||t<a)throw new RangeError('"value" argument is out of bounds');if(n+r>e.length)throw new RangeError("Index out of range")}function F(e,t,n,r){t<0&&(t=65535+t+1);for(var i=0,o=Math.min(e.length-n,2);i<o;++i)e[n+i]=(t&255<<8*(r?i:1-i))>>>8*(r?i:1-i)}function N(e,t,n,r){t<0&&(t=4294967295+t+1);for(var i=0,o=Math.min(e.length-n,4);i<o;++i)e[n+i]=t>>>8*(r?i:3-i)&255}function B(e,t,n,r,i,o){if(n+r>e.length)throw new RangeError("Index out of range");if(n<0)throw new RangeError("Index out of range")}function L(e,t,n,r,i){return i||B(e,t,n,4,3.4028234663852886e38,-3.4028234663852886e38),$.write(e,t,n,r,23,4),n+4}function q(e,t,n,r,i){return i||B(e,t,n,8,1.7976931348623157e308,-1.7976931348623157e308),$.write(e,t,n,r,52,8),n+8}function z(e){if(e=U(e).replace(ee,""),e.length<2)return"";for(;e.length%4!=0;)e+="=";return e}function U(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}function W(e){return e<16?"0"+e.toString(16):e.toString(16)}function V(e,t){t=t||1/0;for(var n,r=e.length,i=null,o=[],a=0;a<r;++a){if((n=e.charCodeAt(a))>55295&&n<57344){if(!i){if(n>56319){(t-=3)>-1&&o.push(239,191,189);continue}if(a+1===r){(t-=3)>-1&&o.push(239,191,189);continue}i=n;continue}if(n<56320){(t-=3)>-1&&o.push(239,191,189),i=n;continue}n=65536+(i-55296<<10|n-56320)}else i&&(t-=3)>-1&&o.push(239,191,189);if(i=null,n<128){if((t-=1)<0)break;o.push(n)}else if(n<2048){if((t-=2)<0)break;o.push(n>>6|192,63&n|128)}else if(n<65536){if((t-=3)<0)break;o.push(n>>12|224,n>>6&63|128,63&n|128)}else{if(!(n<1114112))throw new Error("Invalid code point");if((t-=4)<0)break;o.push(n>>18|240,n>>12&63|128,n>>6&63|128,63&n|128)}}return o}function H(e){for(var t=[],n=0;n<e.length;++n)t.push(255&e.charCodeAt(n));return t}function G(e,t){for(var n,r,i,o=[],a=0;a<e.length&&!((t-=2)<0);++a)n=e.charCodeAt(a),r=n>>8,i=n%256,o.push(i),o.push(r);return o}function J(e){return Y.toByteArray(z(e))}function K(e,t,n,r){for(var i=0;i<r&&!(i+n>=t.length||i>=e.length);++i)t[i+n]=e[i];return i}function X(e){return e!==e}/*!
-- * The buffer module from node.js, for the browser.
-- *
-- * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
-- * @license  MIT
-- */
--var Y=n(570),$=n(764),Z=n(387);t.Buffer=o,t.SlowBuffer=m,t.INSPECT_MAX_BYTES=50,o.TYPED_ARRAY_SUPPORT=void 0!==e.TYPED_ARRAY_SUPPORT?e.TYPED_ARRAY_SUPPORT:function(){try{var e=new Uint8Array(1);return e.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}},42===e.foo()&&"function"==typeof e.subarray&&0===e.subarray(1,1).byteLength}catch(e){return!1}}(),t.kMaxLength=r(),o.poolSize=8192,o._augment=function(e){return e.__proto__=o.prototype,e},o.from=function(e,t,n){return a(null,e,t,n)},o.TYPED_ARRAY_SUPPORT&&(o.prototype.__proto__=Uint8Array.prototype,o.__proto__=Uint8Array,"undefined"!=typeof Symbol&&Symbol.species&&o[Symbol.species]===o&&Object.defineProperty(o,Symbol.species,{value:null,configurable:!0})),o.alloc=function(e,t,n){return u(null,e,t,n)},o.allocUnsafe=function(e){return l(null,e)},o.allocUnsafeSlow=function(e){return l(null,e)},o.isBuffer=function(e){return!(null==e||!e._isBuffer)},o.compare=function(e,t){if(!o.isBuffer(e)||!o.isBuffer(t))throw new TypeError("Arguments must be Buffers");if(e===t)return 0;for(var n=e.length,r=t.length,i=0,a=Math.min(n,r);i<a;++i)if(e[i]!==t[i]){n=e[i],r=t[i];break}return n<r?-1:r<n?1:0},o.isEncoding=function(e){switch(String(e).toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"latin1":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return!0;default:return!1}},o.concat=function(e,t){if(!Z(e))throw new TypeError('"list" argument must be an Array of Buffers');if(0===e.length)return o.alloc(0);var n;if(void 0===t)for(t=0,n=0;n<e.length;++n)t+=e[n].length;var r=o.allocUnsafe(t),i=0;for(n=0;n<e.length;++n){var a=e[n];if(!o.isBuffer(a))throw new TypeError('"list" argument must be an Array of Buffers');a.copy(r,i),i+=a.length}return r},o.byteLength=v,o.prototype._isBuffer=!0,o.prototype.swap16=function(){var e=this.length;if(e%2!=0)throw new RangeError("Buffer size must be a multiple of 16-bits");for(var t=0;t<e;t+=2)y(this,t,t+1);return this},o.prototype.swap32=function(){var e=this.length;if(e%4!=0)throw new RangeError("Buffer size must be a multiple of 32-bits");for(var t=0;t<e;t+=4)y(this,t,t+3),y(this,t+1,t+2);return this},o.prototype.swap64=function(){var e=this.length;if(e%8!=0)throw new RangeError("Buffer size must be a multiple of 64-bits");for(var t=0;t<e;t+=8)y(this,t,t+7),y(this,t+1,t+6),y(this,t+2,t+5),y(this,t+3,t+4);return this},o.prototype.toString=function(){var e=0|this.length;return 0===e?"":0===arguments.length?D(this,0,e):g.apply(this,arguments)},o.prototype.equals=function(e){if(!o.isBuffer(e))throw new TypeError("Argument must be a Buffer");return this===e||0===o.compare(this,e)},o.prototype.inspect=function(){var e="",n=t.INSPECT_MAX_BYTES;return this.length>0&&(e=this.toString("hex",0,n).match(/.{2}/g).join(" "),this.length>n&&(e+=" ... ")),"<Buffer "+e+">"},o.prototype.compare=function(e,t,n,r,i){if(!o.isBuffer(e))throw new TypeError("Argument must be a Buffer");if(void 0===t&&(t=0),void 0===n&&(n=e?e.length:0),void 0===r&&(r=0),void 0===i&&(i=this.length),t<0||n>e.length||r<0||i>this.length)throw new RangeError("out of range index");if(r>=i&&t>=n)return 0;if(r>=i)return-1;if(t>=n)return 1;if(t>>>=0,n>>>=0,r>>>=0,i>>>=0,this===e)return 0;for(var a=i-r,s=n-t,u=Math.min(a,s),l=this.slice(r,i),c=e.slice(t,n),p=0;p<u;++p)if(l[p]!==c[p]){a=l[p],s=c[p];break}return a<s?-1:s<a?1:0},o.prototype.includes=function(e,t,n){return-1!==this.indexOf(e,t,n)},o.prototype.indexOf=function(e,t,n){return _(this,e,t,n,!0)},o.prototype.lastIndexOf=function(e,t,n){return _(this,e,t,n,!1)},o.prototype.write=function(e,t,n,r){if(void 0===t)r="utf8",n=this.length,t=0;else if(void 0===n&&"string"==typeof t)r=t,n=this.length,t=0;else{if(!isFinite(t))throw new Error("Buffer.write(string, encoding, offset[, length]) is no longer supported");t|=0,isFinite(n)?(n|=0,void 0===r&&(r="utf8")):(r=n,n=void 0)}var i=this.length-t;if((void 0===n||n>i)&&(n=i),e.length>0&&(n<0||t<0)||t>this.length)throw new RangeError("Attempt to write outside buffer bounds");r||(r="utf8");for(var o=!1;;)switch(r){case"hex":return x(this,e,t,n);case"utf8":case"utf-8":return w(this,e,t,n);case"ascii":return k(this,e,t,n);case"latin1":case"binary":return E(this,e,t,n);case"base64":return S(this,e,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return C(this,e,t,n);default:if(o)throw new TypeError("Unknown encoding: "+r);r=(""+r).toLowerCase(),o=!0}},o.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var Q=4096;o.prototype.slice=function(e,t){var n=this.length;e=~~e,t=void 0===t?n:~~t,e<0?(e+=n)<0&&(e=0):e>n&&(e=n),t<0?(t+=n)<0&&(t=0):t>n&&(t=n),t<e&&(t=e);var r;if(o.TYPED_ARRAY_SUPPORT)r=this.subarray(e,t),r.__proto__=o.prototype;else{var i=t-e;r=new o(i,void 0);for(var a=0;a<i;++a)r[a]=this[a+e]}return r},o.prototype.readUIntLE=function(e,t,n){e|=0,t|=0,n||R(e,t,this.length);for(var r=this[e],i=1,o=0;++o<t&&(i*=256);)r+=this[e+o]*i;return r},o.prototype.readUIntBE=function(e,t,n){e|=0,t|=0,n||R(e,t,this.length);for(var r=this[e+--t],i=1;t>0&&(i*=256);)r+=this[e+--t]*i;return r},o.prototype.readUInt8=function(e,t){return t||R(e,1,this.length),this[e]},o.prototype.readUInt16LE=function(e,t){return t||R(e,2,this.length),this[e]|this[e+1]<<8},o.prototype.readUInt16BE=function(e,t){return t||R(e,2,this.length),this[e]<<8|this[e+1]},o.prototype.readUInt32LE=function(e,t){return t||R(e,4,this.length),(this[e]|this[e+1]<<8|this[e+2]<<16)+16777216*this[e+3]},o.prototype.readUInt32BE=function(e,t){return t||R(e,4,this.length),16777216*this[e]+(this[e+1]<<16|this[e+2]<<8|this[e+3])},o.prototype.readIntLE=function(e,t,n){e|=0,t|=0,n||R(e,t,this.length);for(var r=this[e],i=1,o=0;++o<t&&(i*=256);)r+=this[e+o]*i;return i*=128,r>=i&&(r-=Math.pow(2,8*t)),r},o.prototype.readIntBE=function(e,t,n){e|=0,t|=0,n||R(e,t,this.length);for(var r=t,i=1,o=this[e+--r];r>0&&(i*=256);)o+=this[e+--r]*i;return i*=128,o>=i&&(o-=Math.pow(2,8*t)),o},o.prototype.readInt8=function(e,t){return t||R(e,1,this.length),128&this[e]?-1*(255-this[e]+1):this[e]},o.prototype.readInt16LE=function(e,t){t||R(e,2,this.length);var n=this[e]|this[e+1]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt16BE=function(e,t){t||R(e,2,this.length);var n=this[e+1]|this[e]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt32LE=function(e,t){return t||R(e,4,this.length),this[e]|this[e+1]<<8|this[e+2]<<16|this[e+3]<<24},o.prototype.readInt32BE=function(e,t){return t||R(e,4,this.length),this[e]<<24|this[e+1]<<16|this[e+2]<<8|this[e+3]},o.prototype.readFloatLE=function(e,t){return t||R(e,4,this.length),$.read(this,e,!0,23,4)},o.prototype.readFloatBE=function(e,t){return t||R(e,4,this.length),$.read(this,e,!1,23,4)},o.prototype.readDoubleLE=function(e,t){return t||R(e,8,this.length),$.read(this,e,!0,52,8)},o.prototype.readDoubleBE=function(e,t){return t||R(e,8,this.length),$.read(this,e,!1,52,8)},o.prototype.writeUIntLE=function(e,t,n,r){if(e=+e,t|=0,n|=0,!r){j(this,e,t,n,Math.pow(2,8*n)-1,0)}var i=1,o=0;for(this[t]=255&e;++o<n&&(i*=256);)this[t+o]=e/i&255;return t+n},o.prototype.writeUIntBE=function(e,t,n,r){if(e=+e,t|=0,n|=0,!r){j(this,e,t,n,Math.pow(2,8*n)-1,0)}var i=n-1,o=1;for(this[t+i]=255&e;--i>=0&&(o*=256);)this[t+i]=e/o&255;return t+n},o.prototype.writeUInt8=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,1,255,0),o.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),this[t]=255&e,t+1},o.prototype.writeUInt16LE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):F(this,e,t,!0),t+2},o.prototype.writeUInt16BE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):F(this,e,t,!1),t+2},o.prototype.writeUInt32LE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[t+3]=e>>>24,this[t+2]=e>>>16,this[t+1]=e>>>8,this[t]=255&e):N(this,e,t,!0),t+4},o.prototype.writeUInt32BE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):N(this,e,t,!1),t+4},o.prototype.writeIntLE=function(e,t,n,r){if(e=+e,t|=0,!r){var i=Math.pow(2,8*n-1);j(this,e,t,n,i-1,-i)}var o=0,a=1,s=0;for(this[t]=255&e;++o<n&&(a*=256);)e<0&&0===s&&0!==this[t+o-1]&&(s=1),this[t+o]=(e/a>>0)-s&255;return t+n},o.prototype.writeIntBE=function(e,t,n,r){if(e=+e,t|=0,!r){var i=Math.pow(2,8*n-1);j(this,e,t,n,i-1,-i)}var o=n-1,a=1,s=0;for(this[t+o]=255&e;--o>=0&&(a*=256);)e<0&&0===s&&0!==this[t+o+1]&&(s=1),this[t+o]=(e/a>>0)-s&255;return t+n},o.prototype.writeInt8=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,1,127,-128),o.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),e<0&&(e=255+e+1),this[t]=255&e,t+1},o.prototype.writeInt16LE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):F(this,e,t,!0),t+2},o.prototype.writeInt16BE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):F(this,e,t,!1),t+2},o.prototype.writeInt32LE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,4,2147483647,-2147483648),o.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8,this[t+2]=e>>>16,this[t+3]=e>>>24):N(this,e,t,!0),t+4},o.prototype.writeInt32BE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,4,2147483647,-2147483648),e<0&&(e=4294967295+e+1),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):N(this,e,t,!1),t+4},o.prototype.writeFloatLE=function(e,t,n){return L(this,e,t,!0,n)},o.prototype.writeFloatBE=function(e,t,n){return L(this,e,t,!1,n)},o.prototype.writeDoubleLE=function(e,t,n){return q(this,e,t,!0,n)},o.prototype.writeDoubleBE=function(e,t,n){return q(this,e,t,!1,n)},o.prototype.copy=function(e,t,n,r){if(n||(n=0),r||0===r||(r=this.length),t>=e.length&&(t=e.length),t||(t=0),r>0&&r<n&&(r=n),r===n)return 0;if(0===e.length||0===this.length)return 0;if(t<0)throw new RangeError("targetStart out of bounds");if(n<0||n>=this.length)throw new RangeError("sourceStart out of bounds");if(r<0)throw new RangeError("sourceEnd out of bounds");r>this.length&&(r=this.length),e.length-t<r-n&&(r=e.length-t+n);var i,a=r-n;if(this===e&&n<t&&t<r)for(i=a-1;i>=0;--i)e[i+t]=this[i+n];else if(a<1e3||!o.TYPED_ARRAY_SUPPORT)for(i=0;i<a;++i)e[i+t]=this[i+n];else Uint8Array.prototype.set.call(e,this.subarray(n,n+a),t);return a},o.prototype.fill=function(e,t,n,r){if("string"==typeof e){if("string"==typeof t?(r=t,t=0,n=this.length):"string"==typeof n&&(r=n,n=this.length),1===e.length){var i=e.charCodeAt(0);i<256&&(e=i)}if(void 0!==r&&"string"!=typeof r)throw new TypeError("encoding must be a string");if("string"==typeof r&&!o.isEncoding(r))throw new TypeError("Unknown encoding: "+r)}else"number"==typeof e&&(e&=255);if(t<0||this.length<t||this.length<n)throw new RangeError("Out of range index");if(n<=t)return this;t>>>=0,n=void 0===n?this.length:n>>>0,e||(e=0);var a;if("number"==typeof e)for(a=t;a<n;++a)this[a]=e;else{var s=o.isBuffer(e)?e:V(new o(e,r).toString()),u=s.length;for(a=0;a<n-t;++a)this[a+t]=s[a%u]}return this};var ee=/[^+\/0-9A-Za-z-_]/g}).call(t,n(17))},function(e,t,n){var r=n(37),i=n(335),o=n(190),a=Object.defineProperty;t.f=n(49)?Object.defineProperty:function(e,t,n){if(r(e),t=o(t,!0),r(n),i)try{return a(e,t,n)}catch(e){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(e[t]=n.value),e}},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},function(e,t,n){var r=n(406),i="object"==typeof self&&self&&self.Object===Object&&self,o=r||i||Function("return this")();e.exports=o},function(e,t,n){"use strict";function r(){D.ReactReconcileTransaction&&w||c("123")}function i(){this.reinitializeTransaction(),this.dirtyComponentsLength=null,this.callbackQueue=f.getPooled(),this.reconcileTransaction=D.ReactReconcileTransaction.getPooled(!0)}function o(e,t,n,i,o,a){return r(),w.batchedUpdates(e,t,n,i,o,a)}function a(e,t){return e._mountOrder-t._mountOrder}function s(e){var t=e.dirtyComponentsLength;t!==y.length&&c("124",t,y.length),y.sort(a),_++;for(var n=0;n<t;n++){var r=y[n],i=r._pendingCallbacks;r._pendingCallbacks=null;var o;if(d.logTopLevelRenders){var s=r;r._currentElement.type.isReactTopLevelWrapper&&(s=r._renderedComponent),o="React update: "+s.getName(),console.time(o)}if(m.performUpdateIfNecessary(r,e.reconcileTransaction,_),o&&console.timeEnd(o),i)for(var u=0;u<i.length;u++)e.callbackQueue.enqueue(i[u],r.getPublicInstance())}}function u(e){if(r(),!w.isBatchingUpdates)return void w.batchedUpdates(u,e);y.push(e),null==e._updateBatchNumber&&(e._updateBatchNumber=_+1)}function l(e,t){g(w.isBatchingUpdates,"ReactUpdates.asap: Can't enqueue an asap callback in a context whereupdates are not being batched."),b.enqueue(e,t),x=!0}var c=n(11),p=n(13),f=n(451),h=n(70),d=n(456),m=n(90),v=n(161),g=n(8),y=[],_=0,b=f.getPooled(),x=!1,w=null,k={initialize:function(){this.dirtyComponentsLength=y.length},close:function(){this.dirtyComponentsLength!==y.length?(y.splice(0,this.dirtyComponentsLength),C()):y.length=0}},E={initialize:function(){this.callbackQueue.reset()},close:function(){this.callbackQueue.notifyAll()}},S=[k,E];p(i.prototype,v,{getTransactionWrappers:function(){return S},destructor:function(){this.dirtyComponentsLength=null,f.release(this.callbackQueue),this.callbackQueue=null,D.ReactReconcileTransaction.release(this.reconcileTransaction),this.reconcileTransaction=null},perform:function(e,t,n){return v.perform.call(this,this.reconcileTransaction.perform,this.reconcileTransaction,e,t,n)}}),h.addPoolingTo(i);var C=function(){for(;y.length||x;){if(y.length){var e=i.getPooled();e.perform(s,null,e),i.release(e)}if(x){x=!1;var t=b;b=f.getPooled(),t.notifyAll(),f.release(t)}}},A={injectReconcileTransaction:function(e){e||c("126"),D.ReactReconcileTransaction=e},injectBatchingStrategy:function(e){e||c("127"),"function"!=typeof e.batchedUpdates&&c("128"),"boolean"!=typeof e.isBatchingUpdates&&c("129"),w=e}},D={ReactReconcileTransaction:null,batchedUpdates:o,enqueueUpdate:u,flushBatchedUpdates:C,injection:A,asap:l};e.exports=D},function(e,t){(function(){var e=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1},t=function(e,t){function r(){this.constructor=e}for(var i in t)n.call(t,i)&&(e[i]=t[i]);return r.prototype=t.prototype,e.prototype=new r,e.__super__=t.prototype,e},n={}.hasOwnProperty;this.Mark=function(){function t(e,t,n,r){this.line=e,this.column=t,this.buffer=n,this.pointer=r}return t.prototype.get_snippet=function(t,n){var r,i,o,a,s,u,l;if(null==t&&(t=4),null==n&&(n=75),null==this.buffer)return null;for(r="\0\r\n…\u2028\u2029",o="",u=this.pointer;u>0&&(a=this.buffer[u-1],e.call(r,a)<0);)if(u--,this.pointer-u>n/2-1){o=" ... ",u+=5;break}for(l="",i=this.pointer;i<this.buffer.length&&(s=this.buffer[i],e.call(r,s)<0);)if(++i-this.pointer>n/2-1){l=" ... ",i-=5;break}return""+new Array(t).join(" ")+o+this.buffer.slice(u,i)+l+"\n"+new Array(t+this.pointer-u+o.length).join(" ")+"^"},t.prototype.toString=function(){var e,t;return e=this.get_snippet(),t="  on line "+(this.line+1)+", column "+(this.column+1),e?t:t+":\n"+e},t}(),this.YAMLError=function(e){function n(e){this.message=e,n.__super__.constructor.call(this),this.stack=this.toString()+"\n"+(new Error).stack.split("\n").slice(1).join("\n")}return t(n,e),n.prototype.toString=function(){return this.message},n}(Error),this.MarkedYAMLError=function(e){function n(e,t,r,i,o){this.context=e,this.context_mark=t,this.problem=r,this.problem_mark=i,this.note=o,n.__super__.constructor.call(this)}return t(n,e),n.prototype.toString=function(){var e;return e=[],null!=this.context&&e.push(this.context),null==this.context_mark||null!=this.problem&&null!=this.problem_mark&&this.context_mark.line===this.problem_mark.line&&this.context_mark.column===this.problem_mark.column||e.push(this.context_mark.toString()),null!=this.problem&&e.push(this.problem),null!=this.problem_mark&&e.push(this.problem_mark.toString()),null!=this.note&&e.push(this.note),e.join("\n")},n}(this.YAMLError)}).call(this)},function(e,t,n){"use strict";var r=n(95),i=function(e){return e&&e.__esModule?e:{default:e}}(r);e.exports=function(){var e={location:{},history:{},open:function(){},close:function(){},File:function(){}};if("undefined"==typeof window)return e;try{e=window;var t=["File","Blob","FormData"],n=!0,r=!1,o=void 0;try{for(var a,s=(0,i.default)(t);!(n=(a=s.next()).done);n=!0){var u=a.value;u in window&&(e[u]=window[u])}}catch(e){r=!0,o=e}finally{try{!n&&s.return&&s.return()}finally{if(r)throw o}}}catch(e){console.error(e)}return e}()},function(e,t,n){e.exports={default:n(593),__esModule:!0}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}t.__esModule=!0;var i=n(567),o=r(i),a=n(566),s=r(a),u="function"==typeof s.default&&"symbol"==typeof o.default?function(e){return typeof e}:function(e){return e&&"function"==typeof s.default&&e.constructor===s.default&&e!==s.default.prototype?"symbol":typeof e};t.default="function"==typeof s.default&&"symbol"===u(o.default)?function(e){return void 0===e?"undefined":u(e)}:function(e){return e&&"function"==typeof s.default&&e.constructor===s.default&&e!==s.default.prototype?"symbol":void 0===e?"undefined":u(e)}},function(e,t,n){e.exports=!n(54)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(e,t,n){"use strict";function r(e,t,n){return n?[e,t]:e}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){this.dispatchConfig=e,this._targetInst=t,this.nativeEvent=n;var i=this.constructor.Interface;for(var o in i)if(i.hasOwnProperty(o)){var s=i[o];s?this[o]=s(n):"target"===o?this.target=r:this[o]=n[o]}var u=null!=n.defaultPrevented?n.defaultPrevented:!1===n.returnValue;return this.isDefaultPrevented=u?a.thatReturnsTrue:a.thatReturnsFalse,this.isPropagationStopped=a.thatReturnsFalse,this}var i=n(13),o=n(70),a=n(32),s=(n(10),["dispatchConfig","_targetInst","nativeEvent","isDefaultPrevented","isPropagationStopped","_dispatchListeners","_dispatchInstances"]),u={type:null,target:null,currentTarget:a.thatReturnsNull,eventPhase:null,bubbles:null,cancelable:null,timeStamp:function(e){return e.timeStamp||Date.now()},defaultPrevented:null,isTrusted:null};i(r.prototype,{preventDefault:function(){this.defaultPrevented=!0;var e=this.nativeEvent;e&&(e.preventDefault?e.preventDefault():"unknown"!=typeof e.returnValue&&(e.returnValue=!1),this.isDefaultPrevented=a.thatReturnsTrue)},stopPropagation:function(){var e=this.nativeEvent;e&&(e.stopPropagation?e.stopPropagation():"unknown"!=typeof e.cancelBubble&&(e.cancelBubble=!0),this.isPropagationStopped=a.thatReturnsTrue)},persist:function(){this.isPersistent=a.thatReturnsTrue},isPersistent:a.thatReturnsFalse,destructor:function(){var e=this.constructor.Interface;for(var t in e)this[t]=null;for(var n=0;n<s.length;n++)this[s[n]]=null}}),r.Interface=u,r.augmentClass=function(e,t){var n=this,r=function(){};r.prototype=n.prototype;var a=new r;i(a,e.prototype),e.prototype=a,e.prototype.constructor=e,e.Interface=i({},n.Interface,t),e.augmentClass=n.augmentClass,o.addPoolingTo(e,o.fourArgumentPooler)},o.addPoolingTo(r,o.fourArgumentPooler),e.exports=r},function(e,t,n){"use strict";var r={current:null};e.exports=r},function(e,t,n){var r=n(98);e.exports=function(e,t,n){if(r(e),void 0===t)return e;switch(n){case 1:return function(n){return e.call(t,n)};case 2:return function(n,r){return e.call(t,n,r)};case 3:return function(n,r,i){return e.call(t,n,r,i)}}return function(){return e.apply(t,arguments)}}},function(e,t){e.exports=function(e){try{return!!e()}catch(e){return!0}}},function(e,t){var n={}.hasOwnProperty;e.exports=function(e,t){return n.call(e,t)}},function(e,t,n){var r=n(41),i=n(101);e.exports=n(49)?function(e,t,n){return r.f(e,t,i(1,n))}:function(e,t,n){return e[t]=n,e}},function(e,t){e.exports=function(e){if(void 0==e)throw TypeError("Can't call method on  "+e);return e}},function(e,t,n){"use strict";e.exports=function(e){if("function"!=typeof e)throw new TypeError(e+" is not a function");return e}},function(e,t,n){function r(e){return a(e)?i(e):o(e)}var i=n(393),o=n(856),a=n(86);e.exports=r},function(e,t,n){"use strict";function r(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t<e.length;t++)n[t]=e[t];return n}return Array.from(e)}function i(e,t){return e===t}function o(e){var t=arguments.length<=1||void 0===arguments[1]?i:arguments[1],n=null,r=null;return function(){for(var i=arguments.length,o=Array(i),a=0;a<i;a++)o[a]=arguments[a];return null!==n&&n.length===o.length&&o.every(function(e,r){return t(e,n[r])})?r:(r=e.apply(void 0,o),n=o,r)}}function a(e){var t=Array.isArray(e[0])?e[0]:e;if(!t.every(function(e){return"function"==typeof e})){var n=t.map(function(e){return typeof e}).join(", ");throw new Error("Selector creators expect all input-selectors to be functions, instead received the following types: ["+n+"]")}return t}function s(e){for(var t=arguments.length,n=Array(t>1?t-1:0),i=1;i<t;i++)n[i-1]=arguments[i];return function(){for(var t=arguments.length,i=Array(t),o=0;o<t;o++)i[o]=arguments[o];var s=0,u=i.pop(),l=a(i),c=e.apply(void 0,[function(){return s++,u.apply(void 0,arguments)}].concat(n)),p=function(e,t){for(var n=arguments.length,i=Array(n>2?n-2:0),o=2;o<n;o++)i[o-2]=arguments[o];var a=l.map(function(n){return n.apply(void 0,[e,t].concat(i))});return c.apply(void 0,r(a))};return p.resultFunc=u,p.recomputations=function(){return s},p.resetRecomputations=function(){return s=0},p}}function u(){return s(o).apply(void 0,arguments)}function l(e){var t=arguments.length<=1||void 0===arguments[1]?u:arguments[1];if("object"!=typeof e)throw new Error("createStructuredSelector expects first argument to be an object where each property is a selector, instead received a "+typeof e);var n=Object.keys(e);return t(n.map(function(t){return e[t]}),function(){for(var e=arguments.length,t=Array(e),r=0;r<e;r++)t[r]=arguments[r];return t.reduce(function(e,t,r){return e[n[r]]=t,e},{})})}t.__esModule=!0,t.defaultMemoize=o,t.createSelectorCreator=s,t.createSelector=u,t.createStructuredSelector=l},function(e,t,n){(function(e){(function(){var t,r,i,o=[].slice,a={}.hasOwnProperty;this.StringStream=function(){function e(){this.string=""}return e.prototype.write=function(e){return this.string+=e},e}(),this.clone=function(e){return function(t){return e.extend({},t)}}(this),this.extend=function(){var e,t,n,r,i,a,s;for(e=arguments[0],a=2<=arguments.length?o.call(arguments,1):[],t=0,r=a.length;t<r;t++){i=a[t];for(n in i)s=i[n],e[n]=s}return e},this.is_empty=function(e){var t;if(Array.isArray(e)||"string"==typeof e)return 0===e.length;for(t in e)if(a.call(e,t))return!1;return!0},this.inspect=null!=(t=null!=(r=null!=(i=n(1194))?i.inspect:void 0)?r:e.inspect)?t:function(e){return""+e},this.pad_left=function(e,t,n){return e=String(e),e.length>=n?e:e.length+1===n?""+t+e:""+new Array(n-e.length+1).join(t)+e},this.to_hex=function(e){return"string"==typeof e&&(e=e.charCodeAt(0)),e.toString(16)}}).call(this)}).call(t,n(17))},function(e,t,n){var r=n(77);e.exports=function(e){if(!r(e))throw TypeError(e+" is not an object!");return e}},function(e,t){var n=e.exports={version:"2.5.3"};"number"==typeof __e&&(__e=n)},function(e,t,n){var r=n(138),i=n(360);e.exports=n(106)?function(e,t,n){return r.f(e,t,i(1,n))}:function(e,t,n){return e[t]=n,e}},function(e,t,n){"use strict";var r=n(725),i=Math.max;e.exports=function(e){return i(0,r(e))}},function(e,t,n){function r(e){return null==e?void 0===e?u:s:(e=Object(e),l&&l in e?o(e):a(e))}var i=n(82),o=n(896),a=n(925),s="[object Null]",u="[object Undefined]",l=i?i.toStringTag:void 0;e.exports=r},function(e,t,n){function r(e,t){var n=o(e,t);return i(n)?n:void 0}var i=n(854),o=n(897);e.exports=r},function(e,t){function n(e){return null!=e&&"object"==typeof e}e.exports=n},function(e,t,n){"use strict"},function(e,t,n){"use strict";var r=n(11),i=(n(8),function(e){var t=this;if(t.instancePool.length){var n=t.instancePool.pop();return t.call(n,e),n}return new t(e)}),o=function(e,t){var n=this;if(n.instancePool.length){var r=n.instancePool.pop();return n.call(r,e,t),r}return new n(e,t)},a=function(e,t,n){var r=this;if(r.instancePool.length){var i=r.instancePool.pop();return r.call(i,e,t,n),i}return new r(e,t,n)},s=function(e,t,n,r){var i=this;if(i.instancePool.length){var o=i.instancePool.pop();return i.call(o,e,t,n,r),o}return new i(e,t,n,r)},u=function(e){var t=this;e instanceof t||r("25"),e.destructor(),t.instancePool.length<t.poolSize&&t.instancePool.push(e)},l=i,c=function(e,t){var n=e;return n.instancePool=[],n.getPooled=t||l,n.poolSize||(n.poolSize=10),n.release=u,n},p={addPoolingTo:c,oneArgumentPooler:i,twoArgumentPooler:o,threeArgumentPooler:a,fourArgumentPooler:s};e.exports=p},function(e,t,n){"use strict";function r(e){if(!(this instanceof r))return new r(e);l.call(this,e),c.call(this,e),e&&!1===e.readable&&(this.readable=!1),e&&!1===e.writable&&(this.writable=!1),this.allowHalfOpen=!0,e&&!1===e.allowHalfOpen&&(this.allowHalfOpen=!1),this.once("end",i)}function i(){this.allowHalfOpen||this._writableState.ended||a(o,this)}function o(e){e.end()}var a=n(158),s=Object.keys||function(e){var t=[];for(var n in e)t.push(n);return t};e.exports=r;var u=n(111);u.inherits=n(42);var l=n(479),c=n(261);u.inherits(r,l);for(var p=s(c.prototype),f=0;f<p.length;f++){var h=p[f];r.prototype[h]||(r.prototype[h]=c.prototype[h])}Object.defineProperty(r.prototype,"destroyed",{get:function(){return void 0!==this._readableState&&void 0!==this._writableState&&(this._readableState.destroyed&&this._writableState.destroyed)},set:function(e){void 0!==this._readableState&&void 0!==this._writableState&&(this._readableState.destroyed=e,this._writableState.destroyed=e)}}),r.prototype._destroy=function(e,t){this.push(null),this.end(),a(t,e)}},function(e,t){e.exports=function(e){return e.webpackPolyfill||(e.deprecate=function(){},e.paths=[],e.children||(e.children=[]),Object.defineProperty(e,"loaded",{enumerable:!0,get:function(){return e.l}}),Object.defineProperty(e,"id",{enumerable:!0,get:function(){return e.i}}),e.webpackPolyfill=1),e}},function(e,t,n){"use strict";var r=n(430),i=n(429),o=n(114).decodeHTML,a="&(?:#x[a-f0-9]{1,8}|#[0-9]{1,8}|[a-z][a-z0-9]{1,31});",s="<[A-Za-z][A-Za-z0-9-]*(?:\\s+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:\\s*=\\s*(?:[^\"'=<>`\\x00-\\x20]+|'[^']*'|\"[^\"]*\"))?)*\\s*/?>",u="</[A-Za-z][A-Za-z0-9-]*\\s*[>]",l=new RegExp("^(?:<[A-Za-z][A-Za-z0-9-]*(?:\\s+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:\\s*=\\s*(?:[^\"'=<>`\\x00-\\x20]+|'[^']*'|\"[^\"]*\"))?)*\\s*/?>|</[A-Za-z][A-Za-z0-9-]*\\s*[>]|\x3c!----\x3e|\x3c!--(?:-?[^>-])(?:-?[^-])*--\x3e|[<][?].*?[?][>]|<![A-Z]+\\s+[^>]*>|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>)","i"),c=/[\\&]/,p="[!\"#$%&'()*+,./:;<=>?@[\\\\\\]^_`{|}~-]",f=new RegExp("\\\\"+p+"|"+a,"gi"),h=new RegExp('[&<>"]',"g"),d=new RegExp(a+'|[&<>"]',"gi"),m=function(e){return 92===e.charCodeAt(0)?e.charAt(1):o(e)},v=function(e){return c.test(e)?e.replace(f,m):e},g=function(e){try{return r(i(e))}catch(t){return e}},y=function(e){switch(e){case"&":return"&amp;";case"<":return"&lt;";case">":return"&gt;";case'"':return"&quot;";default:return e}},_=function(e,t){return h.test(e)?t?e.replace(d,y):e.replace(h,y):e};e.exports={unescapeString:v,normalizeURI:g,escapeXml:_,reHtmlTag:l,OPENTAG:s,CLOSETAG:u,ENTITY:a,ESCAPABLE:p}},function(e,t){e.exports={}},function(e,t,n){var r=n(181),i=n(178);e.exports=function(e){return r(i(e))}},function(e,t,n){var r=n(178);e.exports=function(e){return Object(r(e))}},function(e,t){e.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},function(e,t,n){var r=n(31),i=n(64),o=n(108),a=n(202)("src"),s=Function.toString,u=(""+s).split("toString");n(63).inspectSource=function(e){return s.call(e)},(e.exports=function(e,t,n,s){var l="function"==typeof n;l&&(o(n,"name")||i(n,"name",t)),e[t]!==n&&(l&&(o(n,a)||i(n,a,e[t]?""+e[t]:u.join(String(t)))),e===r?e[t]=n:s?e[t]?e[t]=n:i(e,t,n):(delete e[t],i(e,t,n)))})(Function.prototype,"toString",function(){return"function"==typeof this&&this[a]||s.call(this)})},function(e,t,n){"use strict";var r=n(372)();e.exports=function(e){return e!==r&&null!==e}},function(e,t,n){"use strict";function r(e){return void 0===e||null===e}function i(e){return"object"==typeof e&&null!==e}function o(e){return Array.isArray(e)?e:r(e)?[]:[e]}function a(e,t){var n,r,i,o;if(t)for(o=Object.keys(t),n=0,r=o.length;n<r;n+=1)i=o[n],e[i]=t[i];return e}function s(e,t){var n,r="";for(n=0;n<t;n+=1)r+=e;return r}function u(e){return 0===e&&Number.NEGATIVE_INFINITY===1/e}e.exports.isNothing=r,e.exports.isObject=i,e.exports.toArray=o,e.exports.repeat=s,e.exports.isNegativeZero=u,e.exports.extend=a},function(e,t,n){"use strict";function r(e,t,n){var i=[];return e.include.forEach(function(e){n=r(e,t,n)}),e[t].forEach(function(e){n.forEach(function(t,n){t.tag===e.tag&&t.kind===e.kind&&i.push(n)}),n.push(e)}),n.filter(function(e,t){return-1===i.indexOf(t)})}function i(){function e(e){r[e.kind][e.tag]=r.fallback[e.tag]=e}var t,n,r={scalar:{},sequence:{},mapping:{},fallback:{}};for(t=0,n=arguments.length;t<n;t+=1)arguments[t].forEach(e);return r}function o(e){this.include=e.include||[],this.implicit=e.implicit||[],this.explicit=e.explicit||[],this.implicit.forEach(function(e){if(e.loadKind&&"scalar"!==e.loadKind)throw new s("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.")}),this.compiledImplicit=r(this,"implicit",[]),this.compiledExplicit=r(this,"explicit",[]),this.compiledTypeMap=i(this.compiledImplicit,this.compiledExplicit)}var a=n(80),s=n(117),u=n(16);o.DEFAULT=null,o.create=function(){var e,t;switch(arguments.length){case 1:e=o.DEFAULT,t=arguments[0];break;case 2:e=arguments[0],t=arguments[1];break;default:throw new s("Wrong number of arguments for Schema.create function")}if(e=a.toArray(e),t=a.toArray(t),!e.every(function(e){return e instanceof o}))throw new s("Specified list of super schemas (or a single Schema object) contains a non-Schema object.");if(!t.every(function(e){return e instanceof u}))throw new s("Specified list of YAML types (or a single Type object) contains a non-Type object.");return new o({include:e,explicit:t})},e.exports=o},function(e,t,n){var r=n(43),i=r.Symbol;e.exports=i},function(e,t,n){function r(e,t){return i(e)?e:o(e,t)?[e]:a(s(e))}var i=n(20),o=n(221),a=n(936),s=n(87);e.exports=r},function(e,t,n){function r(e,t,n,r){var a=!n;n||(n={});for(var s=-1,u=t.length;++s<u;){var l=t[s],c=r?r(n[l],e[l],l,n,e):void 0;void 0===c&&(c=e[l]),a?o(n,l,c):i(n,l,c)}return n}var i=n(148),o=n(396);e.exports=r},function(e,t,n){function r(e){if("string"==typeof e||i(e))return e;var t=e+"";return"0"==t&&1/e==-o?"-0":t}var i=n(155),o=1/0;e.exports=r},function(e,t,n){function r(e){return null!=e&&o(e.length)&&!i(e)}var i=n(420),o=n(228);e.exports=r},function(e,t,n){function r(e){return null==e?"":i(e)}var i=n(401);e.exports=r},function(e,t,n){"use strict";function r(e){if(d){var t=e.node,n=e.children;if(n.length)for(var r=0;r<n.length;r++)m(t,n[r],null);else null!=e.html?p(t,e.html):null!=e.text&&h(t,e.text)}}function i(e,t){e.parentNode.replaceChild(t.node,e),r(t)}function o(e,t){d?e.children.push(t):e.node.appendChild(t.node)}function a(e,t){d?e.html=t:p(e.node,t)}function s(e,t){d?e.text=t:h(e.node,t)}function u(){return this.node.nodeName}function l(e){return{node:e,children:[],html:null,text:null,toString:u}}var c=n(241),p=n(163),f=n(249),h=n(469),d="undefined"!=typeof document&&"number"==typeof document.documentMode||"undefined"!=typeof navigator&&"string"==typeof navigator.userAgent&&/\bEdge\/\d/.test(navigator.userAgent),m=f(function(e,t,n){11===t.node.nodeType||1===t.node.nodeType&&"object"===t.node.nodeName.toLowerCase()&&(null==t.node.namespaceURI||t.node.namespaceURI===c.html)?(r(t),e.insertBefore(t.node,n)):(e.insertBefore(t.node,n),r(t))});l.insertTreeBefore=m,l.replaceChildWithTree=i,l.queueChild=o,l.queueHTML=a,l.queueText=s,e.exports=l},function(e,t,n){"use strict";function r(e,t){return(e&t)===t}var i=n(11),o=(n(8),{MUST_USE_PROPERTY:1,HAS_BOOLEAN_VALUE:4,HAS_NUMERIC_VALUE:8,HAS_POSITIVE_NUMERIC_VALUE:24,HAS_OVERLOADED_BOOLEAN_VALUE:32,injectDOMPropertyConfig:function(e){var t=o,n=e.Properties||{},a=e.DOMAttributeNamespaces||{},u=e.DOMAttributeNames||{},l=e.DOMPropertyNames||{},c=e.DOMMutationMethods||{};e.isCustomAttribute&&s._isCustomAttributeFunctions.push(e.isCustomAttribute);for(var p in n){s.properties.hasOwnProperty(p)&&i("48",p);var f=p.toLowerCase(),h=n[p],d={attributeName:f,attributeNamespace:null,propertyName:p,mutationMethod:null,mustUseProperty:r(h,t.MUST_USE_PROPERTY),hasBooleanValue:r(h,t.HAS_BOOLEAN_VALUE),hasNumericValue:r(h,t.HAS_NUMERIC_VALUE),hasPositiveNumericValue:r(h,t.HAS_POSITIVE_NUMERIC_VALUE),hasOverloadedBooleanValue:r(h,t.HAS_OVERLOADED_BOOLEAN_VALUE)};if(d.hasBooleanValue+d.hasNumericValue+d.hasOverloadedBooleanValue<=1||i("50",p),u.hasOwnProperty(p)){var m=u[p];d.attributeName=m}a.hasOwnProperty(p)&&(d.attributeNamespace=a[p]),l.hasOwnProperty(p)&&(d.propertyName=l[p]),c.hasOwnProperty(p)&&(d.mutationMethod=c[p]),s.properties[p]=d}}}),a=":A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",s={ID_ATTRIBUTE_NAME:"data-reactid",ROOT_ATTRIBUTE_NAME:"data-reactroot",ATTRIBUTE_NAME_START_CHAR:a,ATTRIBUTE_NAME_CHAR:a+"\\-.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040",properties:{},getPossibleStandardName:null,_isCustomAttributeFunctions:[],isCustomAttribute:function(e){for(var t=0;t<s._isCustomAttributeFunctions.length;t++){if((0,s._isCustomAttributeFunctions[t])(e))return!0}return!1},injection:o};e.exports=s},function(e,t,n){"use strict";function r(){i.attachRefs(this,this._currentElement)}var i=n(1045),o=(n(39),n(10),{mountComponent:function(e,t,n,i,o,a){var s=e.mountComponent(t,n,i,o,a);return e._currentElement&&null!=e._currentElement.ref&&t.getReactMountReady().enqueue(r,e),s},getHostNode:function(e){return e.getHostNode()},unmountComponent:function(e,t){i.detachRefs(e,e._currentElement),e.unmountComponent(t)},receiveComponent:function(e,t,n,o){var a=e._currentElement;if(t!==a||o!==e._context){var s=i.shouldUpdateRefs(a,t);s&&i.detachRefs(e,a),e.receiveComponent(t,n,o),s&&e._currentElement&&null!=e._currentElement.ref&&n.getReactMountReady().enqueue(r,e)}},performUpdateIfNecessary:function(e,t,n){e._updateBatchNumber===n&&e.performUpdateIfNecessary(t)}});e.exports=o},function(e,t,n){"use strict";var r=n(430),i=n(429),o=n(114).decodeHTML,a="&(?:#x[a-f0-9]{1,8}|#[0-9]{1,8}|[a-z][a-z0-9]{1,31});",s="<[A-Za-z][A-Za-z0-9-]*(?:\\s+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:\\s*=\\s*(?:[^\"'=<>`\\x00-\\x20]+|'[^']*'|\"[^\"]*\"))?)*\\s*/?>",u="</[A-Za-z][A-Za-z0-9-]*\\s*[>]",l=new RegExp("^(?:<[A-Za-z][A-Za-z0-9-]*(?:\\s+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:\\s*=\\s*(?:[^\"'=<>`\\x00-\\x20]+|'[^']*'|\"[^\"]*\"))?)*\\s*/?>|</[A-Za-z][A-Za-z0-9-]*\\s*[>]|\x3c!----\x3e|\x3c!--(?:-?[^>-])(?:-?[^-])*--\x3e|[<][?].*?[?][>]|<![A-Z]+\\s+[^>]*>|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>)","i"),c=/[\\&]/,p="[!\"#$%&'()*+,./:;<=>?@[\\\\\\]^_`{|}~-]",f=new RegExp("\\\\"+p+"|"+a,"gi"),h=new RegExp('[&<>"]',"g"),d=new RegExp(a+'|[&<>"]',"gi"),m=function(e){return 92===e.charCodeAt(0)?e.charAt(1):o(e)},v=function(e){return c.test(e)?e.replace(f,m):e},g=function(e){try{return r(i(e))}catch(t){return e}},y=function(e){switch(e){case"&":return"&amp;";case"<":return"&lt;";case">":return"&gt;";case'"':return"&quot;";default:return e}},_=function(e,t){return h.test(e)?t?e.replace(d,y):e.replace(h,y):e};e.exports={unescapeString:v,normalizeURI:g,escapeXml:_,reHtmlTag:l,OPENTAG:s,CLOSETAG:u,ENTITY:a,ESCAPABLE:p}},function(e,t,n){"use strict";var r=n(13),i=n(474),o=n(1100),a=n(1101),s=n(93),u=n(1102),l=n(1103),c=n(1104),p=n(1108),f=s.createElement,h=s.createFactory,d=s.cloneElement,m=r,v=function(e){return e},g={Children:{map:o.map,forEach:o.forEach,count:o.count,toArray:o.toArray,only:p},Component:i.Component,PureComponent:i.PureComponent,createElement:f,cloneElement:d,isValidElement:s.isValidElement,PropTypes:u,createClass:c,createFactory:h,createMixin:v,DOM:a,version:l,__spread:m};e.exports=g},function(e,t,n){"use strict";function r(e){return void 0!==e.ref}function i(e){return void 0!==e.key}var o=n(13),a=n(52),s=(n(10),n(478),Object.prototype.hasOwnProperty),u=n(476),l={key:!0,ref:!0,__self:!0,__source:!0},c=function(e,t,n,r,i,o,a){var s={$$typeof:u,type:e,key:t,ref:n,props:a,_owner:o};return s};c.createElement=function(e,t,n){var o,u={},p=null,f=null;if(null!=t){r(t)&&(f=t.ref),i(t)&&(p=""+t.key),void 0===t.__self?null:t.__self,void 0===t.__source?null:t.__source;for(o in t)s.call(t,o)&&!l.hasOwnProperty(o)&&(u[o]=t[o])}var h=arguments.length-2;if(1===h)u.children=n;else if(h>1){for(var d=Array(h),m=0;m<h;m++)d[m]=arguments[m+2];u.children=d}if(e&&e.defaultProps){var v=e.defaultProps;for(o in v)void 0===u[o]&&(u[o]=v[o])}return c(e,p,f,0,0,a.current,u)},c.createFactory=function(e){var t=c.createElement.bind(null,e);return t.type=e,t},c.cloneAndReplaceKey=function(e,t){return c(e.type,t,e.ref,e._self,e._source,e._owner,e.props)},c.cloneElement=function(e,t,n){var u,p=o({},e.props),f=e.key,h=e.ref,d=(e._self,e._source,e._owner);if(null!=t){r(t)&&(h=t.ref,d=a.current),i(t)&&(f=""+t.key);var m;e.type&&e.type.defaultProps&&(m=e.type.defaultProps);for(u in t)s.call(t,u)&&!l.hasOwnProperty(u)&&(void 0===t[u]&&void 0!==m?p[u]=m[u]:p[u]=t[u])}var v=arguments.length-2;if(1===v)p.children=n;else if(v>1){for(var g=Array(v),y=0;y<v;y++)g[y]=arguments[y+2];p.children=g}return c(e.type,f,h,0,0,d,p)},c.isValidElement=function(e){return"object"==typeof e&&null!==e&&e.$$typeof===u},e.exports=c},function(e,t){(function(){var e,t=function(e,t){function r(){this.constructor=e}for(var i in t)n.call(t,i)&&(e[i]=t[i]);return r.prototype=t.prototype,e.prototype=new r,e.__super__=t.prototype,e},n={}.hasOwnProperty;e=0,this.Node=function(){function t(t,n,r,i){this.tag=t,this.value=n,this.start_mark=r,this.end_mark=i,this.unique_id="node_"+e++}return t}(),this.ScalarNode=function(e){function n(e,t,r,i,o){this.tag=e,this.value=t,this.start_mark=r,this.end_mark=i,this.style=o,n.__super__.constructor.apply(this,arguments)}return t(n,e),n.prototype.id="scalar",n}(this.Node),this.CollectionNode=function(e){function n(e,t,r,i,o){this.tag=e,this.value=t,this.start_mark=r,this.end_mark=i,this.flow_style=o,n.__super__.constructor.apply(this,arguments)}return t(n,e),n}(this.Node),this.SequenceNode=function(e){function n(){return n.__super__.constructor.apply(this,arguments)}return t(n,e),n.prototype.id="sequence",n}(this.CollectionNode),this.MappingNode=function(e){function n(){return n.__super__.constructor.apply(this,arguments)}return t(n,e),n.prototype.id="mapping",n}(this.CollectionNode)}).call(this)},function(e,t,n){e.exports={default:n(586),__esModule:!0}},function(e,t,n){"use strict";t.__esModule=!0,t.default=function(e,t){var n={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n}},function(e,t,n){"use strict";t.__esModule=!0;var r=n(563),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=function(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t<e.length;t++)n[t]=e[t];return n}return(0,i.default)(e)}},function(e,t){e.exports=function(e){if("function"!=typeof e)throw TypeError(e+" is not a function!");return e}},function(e,t){var n={}.toString;e.exports=function(e){return n.call(e).slice(8,-1)}},function(e,t,n){var r=n(345),i=n(180);e.exports=Object.keys||function(e){return r(e,i)}},function(e,t){e.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},function(e,t,n){var r=n(41).f,i=n(55),o=n(22)("toStringTag");e.exports=function(e,t,n){e&&!i(e=n?e:e.prototype,o)&&r(e,o,{configurable:!0,value:t})}},function(e,t,n){"use strict";var r=n(617)(!0);n(339)(String,"String",function(e){this._t=String(e),this._i=0},function(){var e,t=this._t,n=this._i;return n>=t.length?{value:void 0,done:!0}:(e=r(t,n),this._i+=e.length,{value:e,done:!1})})},function(e,t,n){n(622);for(var r=n(24),i=n(56),o=n(74),a=n(22)("toStringTag"),s="CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,TextTrackList,TouchList".split(","),u=0;u<s.length;u++){var l=s[u],c=r[l],p=c&&c.prototype;p&&!p[a]&&i(p,a,l),o[l]=o.Array}},function(e,t){var n={}.toString;e.exports=function(e){return n.call(e).slice(8,-1)}},function(e,t,n){e.exports=!n(107)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(e,t){e.exports=function(e){try{return!!e()}catch(e){return!0}}},function(e,t){var n={}.hasOwnProperty;e.exports=function(e,t){return n.call(e,t)}},function(e,t){e.exports={}},function(e,t,n){var r=n(139),i=Math.min;e.exports=function(e){return e>0?i(r(e),9007199254740991):0}},function(e,t,n){(function(e){function n(e){return Array.isArray?Array.isArray(e):"[object Array]"===v(e)}function r(e){return"boolean"==typeof e}function i(e){return null===e}function o(e){return null==e}function a(e){return"number"==typeof e}function s(e){return"string"==typeof e}function u(e){return"symbol"==typeof e}function l(e){return void 0===e}function c(e){return"[object RegExp]"===v(e)}function p(e){return"object"==typeof e&&null!==e}function f(e){return"[object Date]"===v(e)}function h(e){return"[object Error]"===v(e)||e instanceof Error}function d(e){return"function"==typeof e}function m(e){return null===e||"boolean"==typeof e||"number"==typeof e||"string"==typeof e||"symbol"==typeof e||void 0===e}function v(e){return Object.prototype.toString.call(e)}t.isArray=n,t.isBoolean=r,t.isNull=i,t.isNullOrUndefined=o,t.isNumber=a,t.isString=s,t.isSymbol=u,t.isUndefined=l,t.isRegExp=c,t.isObject=p,t.isDate=f,t.isError=h,t.isFunction=d,t.isPrimitive=m,t.isBuffer=e.isBuffer}).call(t,n(40).Buffer)},function(e,t,n){"use strict";function r(e){return"string"==typeof e&&i.test(e)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=/-webkit-|-moz-|-ms-/;e.exports=t.default},function(e,t){e.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",Doctype:"doctype",isTag:function(e){return"tag"===e.type||"script"===e.type||"style"===e.type}}},function(e,t,n){var r=n(711),i=n(710);t.decode=function(e,t){return(!t||t<=0?i.XML:i.HTML)(e)},t.decodeStrict=function(e,t){return(!t||t<=0?i.XML:i.HTMLStrict)(e)},t.encode=function(e,t){return(!t||t<=0?r.XML:r.HTML)(e)},t.encodeXML=r.XML,t.encodeHTML4=t.encodeHTML5=t.encodeHTML=r.HTML,t.decodeXML=t.decodeXMLStrict=i.XML,t.decodeHTML4=t.decodeHTML5=t.decodeHTML=i.HTML,t.decodeHTML4Strict=t.decodeHTML5Strict=t.decodeHTMLStrict=i.HTMLStrict,t.escape=r.escape},function(e,t,n){"use strict";var r=n(79);e.exports=function(e){if(!r(e))throw new TypeError("Cannot use null or undefined");return e}},function(e,t,n){function r(t,n){return delete e.exports[t],e.exports[t]=n,n}var i=n(380),o=n(700);e.exports={Parser:i,Tokenizer:n(381),ElementType:n(113),DomHandler:o,get FeedHandler(){return r("FeedHandler",n(760))},get Stream(){return r("Stream",n(762))},get WritableStream(){return r("WritableStream",n(382))},get ProxyHandler(){return r("ProxyHandler",n(761))},get DomUtils(){return r("DomUtils",n(702))},get CollectingHandler(){return r("CollectingHandler",n(759))},DefaultHandler:o,get RssHandler(){return r("RssHandler",this.FeedHandler)},parseDOM:function(e,t){var n=new o(t);return new i(n,t).end(e),n.dom},parseFeed:function(t,n){var r=new e.exports.FeedHandler(n);return new i(r,n).end(t),r.dom},createDomStream:function(e,t,n){var r=new o(e,t,n);return new i(r,t)},EVENTS:{attribute:2,cdatastart:0,cdataend:0,text:1,processinginstruction:2,comment:1,commentend:0,closetag:1,opentag:2,opentagname:1,error:1,end:0}}},function(e,t,n){"use strict";function r(e,t){Error.call(this),this.name="YAMLException",this.reason=e,this.mark=t,this.message=(this.reason||"(unknown reason)")+(this.mark?" "+this.mark.toString():""),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=(new Error).stack||""}r.prototype=Object.create(Error.prototype),r.prototype.constructor=r,r.prototype.toString=function(e){var t=this.name+": ";return t+=this.reason||"(unknown reason)",!e&&this.mark&&(t+=" "+this.mark.toString()),t},e.exports=r},function(e,t,n){"use strict";var r=n(81);e.exports=new r({include:[n(388)],implicit:[n(814),n(807)],explicit:[n(799),n(809),n(810),n(812)]})},function(e,t,n){function r(e){return"function"==typeof e?e:null==e?a:"object"==typeof e?s(e)?o(e[0],e[1]):i(e):u(e)}var i=n(858),o=n(859),a=n(225),s=n(20),u=n(952);e.exports=r},function(e,t){function n(e,t){return e===t||e!==e&&t!==t}e.exports=n},function(e,t){function n(e,t,n){if(t in e)return e[t];if(3===arguments.length)return n;throw new Error('"'+t+'" is a required argument.')}function r(e){var t=e.match(y);return t?{scheme:t[1],auth:t[2],host:t[3],port:t[4],path:t[5]}:null}function i(e){var t="";return e.scheme&&(t+=e.scheme+":"),t+="//",e.auth&&(t+=e.auth+"@"),e.host&&(t+=e.host),e.port&&(t+=":"+e.port),e.path&&(t+=e.path),t}function o(e){var n=e,o=r(e);if(o){if(!o.path)return e;n=o.path}for(var a,s=t.isAbsolute(n),u=n.split(/\/+/),l=0,c=u.length-1;c>=0;c--)a=u[c],"."===a?u.splice(c,1):".."===a?l++:l>0&&(""===a?(u.splice(c+1,l),l=0):(u.splice(c,2),l--));return n=u.join("/"),""===n&&(n=s?"/":"."),o?(o.path=n,i(o)):n}function a(e,t){""===e&&(e="."),""===t&&(t=".");var n=r(t),a=r(e);if(a&&(e=a.path||"/"),n&&!n.scheme)return a&&(n.scheme=a.scheme),i(n);if(n||t.match(_))return t;if(a&&!a.host&&!a.path)return a.host=t,i(a);var s="/"===t.charAt(0)?t:o(e.replace(/\/+$/,"")+"/"+t);return a?(a.path=s,i(a)):s}function s(e,t){""===e&&(e="."),e=e.replace(/\/$/,"");for(var n=0;0!==t.indexOf(e+"/");){var r=e.lastIndexOf("/");if(r<0)return t;if(e=e.slice(0,r),e.match(/^([^\/]+:\/)?\/*$/))return t;++n}return Array(n+1).join("../")+t.substr(e.length+1)}function u(e){return e}function l(e){return p(e)?"$"+e:e}function c(e){return p(e)?e.slice(1):e}function p(e){if(!e)return!1;var t=e.length;if(t<9)return!1;if(95!==e.charCodeAt(t-1)||95!==e.charCodeAt(t-2)||111!==e.charCodeAt(t-3)||116!==e.charCodeAt(t-4)||111!==e.charCodeAt(t-5)||114!==e.charCodeAt(t-6)||112!==e.charCodeAt(t-7)||95!==e.charCodeAt(t-8)||95!==e.charCodeAt(t-9))return!1;for(var n=t-10;n>=0;n--)if(36!==e.charCodeAt(n))return!1;return!0}function f(e,t,n){var r=d(e.source,t.source);return 0!==r?r:0!==(r=e.originalLine-t.originalLine)?r:0!==(r=e.originalColumn-t.originalColumn)||n?r:0!==(r=e.generatedColumn-t.generatedColumn)?r:(r=e.generatedLine-t.generatedLine,0!==r?r:d(e.name,t.name))}function h(e,t,n){var r=e.generatedLine-t.generatedLine;return 0!==r?r:0!==(r=e.generatedColumn-t.generatedColumn)||n?r:0!==(r=d(e.source,t.source))?r:0!==(r=e.originalLine-t.originalLine)?r:(r=e.originalColumn-t.originalColumn,0!==r?r:d(e.name,t.name))}function d(e,t){return e===t?0:null===e?1:null===t?-1:e>t?1:-1}function m(e,t){var n=e.generatedLine-t.generatedLine;return 0!==n?n:0!==(n=e.generatedColumn-t.generatedColumn)?n:0!==(n=d(e.source,t.source))?n:0!==(n=e.originalLine-t.originalLine)?n:(n=e.originalColumn-t.originalColumn,0!==n?n:d(e.name,t.name))}function v(e){return JSON.parse(e.replace(/^\)]}'[^\n]*\n/,""))}function g(e,t,n){if(t=t||"",e&&("/"!==e[e.length-1]&&"/"!==t[0]&&(e+="/"),t=e+t),n){var s=r(n);if(!s)throw new Error("sourceMapURL could not be parsed");if(s.path){var u=s.path.lastIndexOf("/");u>=0&&(s.path=s.path.substring(0,u+1))}t=a(i(s),t)}return o(t)}t.getArg=n;var y=/^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.-]*)(?::(\d+))?(.*)$/,_=/^data:.+\,.+$/;t.urlParse=r,t.urlGenerate=i,t.normalize=o,t.join=a,t.isAbsolute=function(e){return"/"===e.charAt(0)||y.test(e)},t.relative=s;var b=function(){return!("__proto__"in Object.create(null))}();t.toSetString=b?u:l,t.fromSetString=b?u:c,t.compareByOriginalPositions=f,t.compareByGeneratedPositionsDeflated=h,t.compareByGeneratedPositionsInflated=m,t.parseSourceMapInput=v,t.computeSourceURL=g},function(e,t,n){"use strict";function r(e){return"button"===e||"input"===e||"select"===e||"textarea"===e}function i(e,t,n){switch(e){case"onClick":case"onClickCapture":case"onDoubleClick":case"onDoubleClickCapture":case"onMouseDown":case"onMouseDownCapture":case"onMouseMove":case"onMouseMoveCapture":case"onMouseUp":case"onMouseUpCapture":return!(!n.disabled||!r(t));default:return!1}}var o=n(11),a=n(242),s=n(243),u=n(247),l=n(462),c=n(463),p=(n(8),{}),f=null,h=function(e,t){e&&(s.executeDispatchesInOrder(e,t),e.isPersistent()||e.constructor.release(e))},d=function(e){return h(e,!0)},m=function(e){return h(e,!1)},v=function(e){return"."+e._rootNodeID},g={injection:{injectEventPluginOrder:a.injectEventPluginOrder,injectEventPluginsByName:a.injectEventPluginsByName},putListener:function(e,t,n){"function"!=typeof n&&o("94",t,typeof n);var r=v(e);(p[t]||(p[t]={}))[r]=n;var i=a.registrationNameModules[t];i&&i.didPutListener&&i.didPutListener(e,t,n)},getListener:function(e,t){var n=p[t];if(i(t,e._currentElement.type,e._currentElement.props))return null;var r=v(e);return n&&n[r]},deleteListener:function(e,t){var n=a.registrationNameModules[t];n&&n.willDeleteListener&&n.willDeleteListener(e,t);var r=p[t];if(r){delete r[v(e)]}},deleteAllListeners:function(e){var t=v(e);for(var n in p)if(p.hasOwnProperty(n)&&p[n][t]){var r=a.registrationNameModules[n];r&&r.willDeleteListener&&r.willDeleteListener(e,n),delete p[n][t]}},extractEvents:function(e,t,n,r){for(var i,o=a.plugins,s=0;s<o.length;s++){var u=o[s];if(u){var c=u.extractEvents(e,t,n,r);c&&(i=l(i,c))}}return i},enqueueEvents:function(e){e&&(f=l(f,e))},processEventQueue:function(e){var t=f;f=null,e?c(t,d):c(t,m),f&&o("95"),u.rethrowCaughtError()},__purge:function(){p={}},__getListenerBank:function(){return p}};e.exports=g},function(e,t,n){"use strict";function r(e,t,n){var r=t.dispatchConfig.phasedRegistrationNames[n];return g(e,r)}function i(e,t,n){var i=r(e,n,t);i&&(n._dispatchListeners=m(n._dispatchListeners,i),n._dispatchInstances=m(n._dispatchInstances,e))}function o(e){e&&e.dispatchConfig.phasedRegistrationNames&&d.traverseTwoPhase(e._targetInst,i,e)}function a(e){if(e&&e.dispatchConfig.phasedRegistrationNames){var t=e._targetInst,n=t?d.getParentInstance(t):null;d.traverseTwoPhase(n,i,e)}}function s(e,t,n){if(n&&n.dispatchConfig.registrationName){var r=n.dispatchConfig.registrationName,i=g(e,r);i&&(n._dispatchListeners=m(n._dispatchListeners,i),n._dispatchInstances=m(n._dispatchInstances,e))}}function u(e){e&&e.dispatchConfig.registrationName&&s(e._targetInst,null,e)}function l(e){v(e,o)}function c(e){v(e,a)}function p(e,t,n,r){d.traverseEnterLeave(n,r,s,e,t)}function f(e){v(e,u)}var h=n(122),d=n(243),m=n(462),v=n(463),g=(n(10),h.getListener),y={accumulateTwoPhaseDispatches:l,accumulateTwoPhaseDispatchesSkipTarget:c,accumulateDirectDispatches:f,accumulateEnterLeaveDispatches:p};e.exports=y},function(e,t,n){"use strict";var r={remove:function(e){e._reactInternalInstance=void 0},get:function(e){return e._reactInternalInstance},has:function(e){return void 0!==e._reactInternalInstance},set:function(e,t){e._reactInternalInstance=t}};e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o=n(252),a={view:function(e){if(e.view)return e.view;var t=o(e);if(t.window===t)return t;var n=t.ownerDocument;return n?n.defaultView||n.parentWindow:window},detail:function(e){return e.detail||0}};i.augmentClass(r,a),e.exports=r},function(e,t,n){"use strict";function r(e){for(var t=arguments.length-1,n="Minified React error #"+e+"; visit http://facebook.github.io/react/docs/error-decoder.html?invariant="+e,r=0;r<t;r++)n+="&args[]="+encodeURIComponent(arguments[r+1]);n+=" for the full message or use the non-minified dev environment for full errors and additional helpful warnings.";var i=new Error(n);throw i.name="Invariant Violation",i.framesToPop=1,i}e.exports=r},function(e,t){(function(){var e=function(e,n){function r(){this.constructor=e}for(var i in n)t.call(n,i)&&(e[i]=n[i]);return r.prototype=n.prototype,e.prototype=new r,e.__super__=n.prototype,e},t={}.hasOwnProperty;this.Event=function(){function e(e,t){this.start_mark=e,this.end_mark=t}return e}(),this.NodeEvent=function(t){function n(e,t,n){this.anchor=e,this.start_mark=t,this.end_mark=n}return e(n,t),n}(this.Event),this.CollectionStartEvent=function(t){function n(e,t,n,r,i,o){this.anchor=e,this.tag=t,this.implicit=n,this.start_mark=r,this.end_mark=i,this.flow_style=o}return e(n,t),n}(this.NodeEvent),this.CollectionEndEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.Event),this.StreamStartEvent=function(t){function n(e,t,n){this.start_mark=e,this.end_mark=t,this.encoding=n}return e(n,t),n}(this.Event),this.StreamEndEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.Event),this.DocumentStartEvent=function(t){function n(e,t,n,r,i){this.start_mark=e,this.end_mark=t,this.explicit=n,this.version=r,this.tags=i}return e(n,t),n}(this.Event),this.DocumentEndEvent=function(t){function n(e,t,n){this.start_mark=e,this.end_mark=t,this.explicit=n}return e(n,t),n}(this.Event),this.AliasEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.NodeEvent),this.ScalarEvent=function(t){function n(e,t,n,r,i,o,a){this.anchor=e,this.tag=t,this.implicit=n,this.value=r,this.start_mark=i,this.end_mark=o,this.style=a}return e(n,t),n}(this.NodeEvent),this.SequenceStartEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.CollectionStartEvent),this.SequenceEndEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.CollectionEndEvent),this.MappingStartEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.CollectionStartEvent),this.MappingEndEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.CollectionEndEvent)}).call(this)},function(e,t,n){"use strict";function r(e){return{type:p,payload:(0,c.default)(e)}}function i(e){return{type:f,payload:e}}function o(e){return{type:h,payload:e}}function a(e){return{type:d,payload:e}}function s(e){return{type:m,payload:e}}function u(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return{type:v,payload:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.CLEAR=t.NEW_AUTH_ERR=t.NEW_SPEC_ERR_BATCH=t.NEW_SPEC_ERR=t.NEW_THROWN_ERR_BATCH=t.NEW_THROWN_ERR=void 0,t.newThrownErr=r,t.newThrownErrBatch=i,t.newSpecErr=o,t.newSpecErrBatch=a,t.newAuthErr=s,t.clear=u;var l=n(264),c=function(e){return e&&e.__esModule?e:{default:e}}(l),p=t.NEW_THROWN_ERR="err_new_thrown_err",f=t.NEW_THROWN_ERR_BATCH="err_new_thrown_err_batch",h=t.NEW_SPEC_ERR="err_new_spec_err",d=t.NEW_SPEC_ERR_BATCH="err_new_spec_err_batch",m=t.NEW_AUTH_ERR="err_new_auth_err",v=t.CLEAR="err_clear"},function(e,t,n){var r=n(53),i=n(338),o=n(336),a=n(37),s=n(133),u=n(193),l={},c={},t=e.exports=function(e,t,n,p,f){var h,d,m,v,g=f?function(){return e}:u(e),y=r(n,p,t?2:1),_=0;if("function"!=typeof g)throw TypeError(e+" is not iterable!");if(o(g)){for(h=s(e.length);h>_;_++)if((v=t?y(a(d=e[_])[0],d[1]):y(e[_]))===l||v===c)return v}else for(m=g.call(e);!(d=m.next()).done;)if((v=i(m,y,d.value,t))===l||v===c)return v};t.BREAK=l,t.RETURN=c},function(e,t){e.exports=!0},function(e,t,n){var r=n(134)("meta"),i=n(27),o=n(55),a=n(41).f,s=0,u=Object.isExtensible||function(){return!0},l=!n(54)(function(){return u(Object.preventExtensions({}))}),c=function(e){a(e,r,{value:{i:"O"+ ++s,w:{}}})},p=function(e,t){if(!i(e))return"symbol"==typeof e?e:("string"==typeof e?"S":"P")+e;if(!o(e,r)){if(!u(e))return"F";if(!t)return"E";c(e)}return e[r].i},f=function(e,t){if(!o(e,r)){if(!u(e))return!0;if(!t)return!1;c(e)}return e[r].w},h=function(e){return l&&d.NEED&&u(e)&&!o(e,r)&&c(e),e},d=e.exports={KEY:r,NEED:!1,fastKey:p,getWeak:f,onFreeze:h}},function(e,t){t.f={}.propertyIsEnumerable},function(e,t,n){var r=n(189),i=Math.min;e.exports=function(e){return e>0?i(r(e),9007199254740991):0}},function(e,t){var n=0,r=Math.random();e.exports=function(e){return"Symbol(".concat(void 0===e?"":e,")_",(++n+r).toString(36))}},function(e,t){e.exports=function(e){if("function"!=typeof e)throw TypeError(e+" is not a function!");return e}},function(e,t,n){var r=n(135);e.exports=function(e,t,n){if(r(e),void 0===t)return e;switch(n){case 1:return function(n){return e.call(t,n)};case 2:return function(n,r){return e.call(t,n,r)};case 3:return function(n,r,i){return e.call(t,n,r,i)}}return function(){return e.apply(t,arguments)}}},function(e,t,n){"use strict";var r=n(64),i=n(78),o=n(107),a=n(57),s=n(19);e.exports=function(e,t,n){var u=s(e),l=n(a,u,""[e]),c=l[0],p=l[1];o(function(){var t={};return t[u]=function(){return 7},7!=""[e](t)})&&(i(String.prototype,e,c),r(RegExp.prototype,u,2==t?function(e,t){return p.call(e,this,t)}:function(e){return p.call(e,this)}))}},function(e,t,n){var r=n(62),i=n(642),o=n(661),a=Object.defineProperty;t.f=n(106)?Object.defineProperty:function(e,t,n){if(r(e),t=o(t,!0),r(n),i)try{return a(e,t,n)}catch(e){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(e[t]=n.value),e}},function(e,t){var n=Math.ceil,r=Math.floor;e.exports=function(e){return isNaN(e=+e)?0:(e>0?r:n)(e)}},function(e,t,n){var r=n(644),i=n(57);e.exports=function(e){return r(i(e))}},function(e,t,n){"use strict";var r,i=n(373),o=n(376),a=n(729),s=n(734);r=e.exports=function(e,t){var n,r,a,u,l;return arguments.length<2||"string"!=typeof e?(u=t,t=e,e=null):u=arguments[2],null==e?(n=a=!0,r=!1):(n=s.call(e,"c"),r=s.call(e,"e"),a=s.call(e,"w")),l={value:t,configurable:n,enumerable:r,writable:a},u?i(o(u),l):l},r.gs=function(e,t,n){var r,u,l,c;return"string"!=typeof e?(l=n,n=t,t=e,e=null):l=arguments[3],null==t?t=void 0:a(t)?null==n?n=void 0:a(n)||(l=n,n=void 0):(l=t,t=n=void 0),null==e?(r=!0,u=!1):(r=s.call(e,"c"),u=s.call(e,"e")),c={get:t,set:n,configurable:r,enumerable:u},l?i(o(l),c):c}},function(e,t,n){"use strict";e.exports=n(726)("forEach")},function(e,t){function n(){this._events=this._events||{},this._maxListeners=this._maxListeners||void 0}function r(e){return"function"==typeof e}function i(e){return"number"==typeof e}function o(e){return"object"==typeof e&&null!==e}function a(e){return void 0===e}e.exports=n,n.EventEmitter=n,n.prototype._events=void 0,n.prototype._maxListeners=void 0,n.defaultMaxListeners=10,n.prototype.setMaxListeners=function(e){if(!i(e)||e<0||isNaN(e))throw TypeError("n must be a positive number");return this._maxListeners=e,this},n.prototype.emit=function(e){var t,n,i,s,u,l;if(this._events||(this._events={}),"error"===e&&(!this._events.error||o(this._events.error)&&!this._events.error.length)){if((t=arguments[1])instanceof Error)throw t;var c=new Error('Uncaught, unspecified "error" event. ('+t+")");throw c.context=t,c}if(n=this._events[e],a(n))return!1;if(r(n))switch(arguments.length){case 1:n.call(this);break;case 2:n.call(this,arguments[1]);break;case 3:n.call(this,arguments[1],arguments[2]);break;default:s=Array.prototype.slice.call(arguments,1),n.apply(this,s)}else if(o(n))for(s=Array.prototype.slice.call(arguments,1),l=n.slice(),i=l.length,u=0;u<i;u++)l[u].apply(this,s);return!0},n.prototype.addListener=function(e,t){var i;if(!r(t))throw TypeError("listener must be a function");return this._events||(this._events={}),this._events.newListener&&this.emit("newListener",e,r(t.listener)?t.listener:t),this._events[e]?o(this._events[e])?this._events[e].push(t):this._events[e]=[this._events[e],t]:this._events[e]=t,o(this._events[e])&&!this._events[e].warned&&(i=a(this._maxListeners)?n.defaultMaxListeners:this._maxListeners)&&i>0&&this._events[e].length>i&&(this._events[e].warned=!0,console.error("(node) warning: possible EventEmitter memory leak detected. %d listeners added. Use emitter.setMaxListeners() to increase limit.",this._events[e].length),"function"==typeof console.trace&&console.trace()),this},n.prototype.on=n.prototype.addListener,n.prototype.once=function(e,t){function n(){this.removeListener(e,n),i||(i=!0,t.apply(this,arguments))}if(!r(t))throw TypeError("listener must be a function");var i=!1;return n.listener=t,this.on(e,n),this},n.prototype.removeListener=function(e,t){var n,i,a,s;if(!r(t))throw TypeError("listener must be a function");if(!this._events||!this._events[e])return this;if(n=this._events[e],a=n.length,i=-1,n===t||r(n.listener)&&n.listener===t)delete this._events[e],this._events.removeListener&&this.emit("removeListener",e,t);else if(o(n)){for(s=a;s-- >0;)if(n[s]===t||n[s].listener&&n[s].listener===t){i=s;break}if(i<0)return this;1===n.length?(n.length=0,delete this._events[e]):n.splice(i,1),this._events.removeListener&&this.emit("removeListener",e,t)}return this},n.prototype.removeAllListeners=function(e){var t,n;if(!this._events)return this;if(!this._events.removeListener)return 0===arguments.length?this._events={}:this._events[e]&&delete this._events[e],this;if(0===arguments.length){for(t in this._events)"removeListener"!==t&&this.removeAllListeners(t);return this.removeAllListeners("removeListener"),this._events={},this}if(n=this._events[e],r(n))this.removeListener(e,n);else if(n)for(;n.length;)this.removeListener(e,n[n.length-1]);return delete this._events[e],this},n.prototype.listeners=function(e){return this._events&&this._events[e]?r(this._events[e])?[this._events[e]]:this._events[e].slice():[]},n.prototype.listenerCount=function(e){if(this._events){var t=this._events[e];if(r(t))return 1;if(t)return t.length}return 0},n.listenerCount=function(e,t){return e.listenerCount(t)}},function(e,t,n){"use strict";var r={};e.exports=r},function(e,t,n){"use strict";var r=n(81);e.exports=r.DEFAULT=new r({include:[n(118)],explicit:[n(805),n(804),n(803)]})},function(e,t,n){function r(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}var i=n(911),o=n(912),a=n(913),s=n(914),u=n(915);r.prototype.clear=i,r.prototype.delete=o,r.prototype.get=a,r.prototype.has=s,r.prototype.set=u,e.exports=r},function(e,t){function n(e,t,n,r){var i=-1,o=null==e?0:e.length;for(r&&o&&(n=e[++i]);++i<o;)n=t(n,e[i],i,e);return n}e.exports=n},function(e,t,n){function r(e,t,n){var r=e[t];s.call(e,t)&&o(r,n)&&(void 0!==n||t in e)||i(e,t,n)}var i=n(396),o=n(120),a=Object.prototype,s=a.hasOwnProperty;e.exports=r},function(e,t,n){function r(e,t){for(var n=e.length;n--;)if(i(e[n][0],t))return n;return-1}var i=n(120);e.exports=r},function(e,t,n){function r(e,t){t=i(t,e);for(var n=0,r=t.length;null!=e&&n<r;)e=e[o(t[n++])];return n&&n==r?e:void 0}var i=n(83),o=n(85);e.exports=r},function(e,t,n){function r(e,t){var n=e.__data__;return i(t)?n["string"==typeof t?"string":"hash"]:n.map}var i=n(909);e.exports=r},function(e,t){function n(e,t){return!!(t=null==t?r:t)&&("number"==typeof e||i.test(e))&&e>-1&&e%1==0&&e<t}var r=9007199254740991,i=/^(?:0|[1-9]\d*)$/;e.exports=n},function(e,t){function n(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||r)}var r=Object.prototype;e.exports=n},function(e,t,n){var r=n(67),i=r(Object,"create");e.exports=i},function(e,t,n){function r(e){return"symbol"==typeof e||o(e)&&i(e)==a}var i=n(66),o=n(68),a="[object Symbol]";e.exports=r},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=n(233),s=function(e){return e&&e.__esModule?e:{default:e}}(a),u=function(e){function t(n){r(this,t);var o=i(this,e.call(this,n));return o.type="atrule",o}return o(t,e),t.prototype.append=function(){var t;this.nodes||(this.nodes=[]);for(var n=arguments.length,r=Array(n),i=0;i<n;i++)r[i]=arguments[i];return(t=e.prototype.append).call.apply(t,[this].concat(r))},t.prototype.prepend=function(){var t;this.nodes||(this.nodes=[]);for(var n=arguments.length,r=Array(n),i=0;i<n;i++)r[i]=arguments[i];return(t=e.prototype.prepend).call.apply(t,[this].concat(r))},t}(s.default);t.default=u,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(233),l=r(u),c=n(435),p=r(c),f=function(e){function t(n){i(this,t);var r=o(this,e.call(this,n));return r.type="rule",r.nodes||(r.nodes=[]),r}return a(t,e),s(t,[{key:"selectors",get:function(){return p.default.comma(this.selector)},set:function(e){var t=this.selector?this.selector.match(/,\s*/):null,n=t?t[0]:","+this.raw("between","beforeOpen");this.selector=e.join(n)}}]),t}(l.default);t.default=f,e.exports=t.default},function(e,t,n){"use strict";(function(t){function n(e,n,r,i){if("function"!=typeof e)throw new TypeError('"callback" argument must be a function');var o,a,s=arguments.length;switch(s){case 0:case 1:return t.nextTick(e);case 2:return t.nextTick(function(){e.call(null,n)});case 3:return t.nextTick(function(){e.call(null,n,r)});case 4:return t.nextTick(function(){e.call(null,n,r,i)});default:for(o=new Array(s-1),a=0;a<o.length;)o[a++]=arguments[a];return t.nextTick(function(){e.apply(null,o)})}}!t.version||0===t.version.indexOf("v0.")||0===t.version.indexOf("v1.")&&0!==t.version.indexOf("v1.8.")?e.exports=n:e.exports=t.nextTick}).call(t,n(33))},function(e,t,n){"use strict";function r(e){return Object.prototype.hasOwnProperty.call(e,m)||(e[m]=h++,p[e[m]]={}),p[e[m]]}var i,o=n(13),a=n(242),s=n(1037),u=n(461),l=n(1069),c=n(253),p={},f=!1,h=0,d={topAbort:"abort",topAnimationEnd:l("animationend")||"animationend",topAnimationIteration:l("animationiteration")||"animationiteration",topAnimationStart:l("animationstart")||"animationstart",topBlur:"blur",topCanPlay:"canplay",topCanPlayThrough:"canplaythrough",topChange:"change",topClick:"click",topCompositionEnd:"compositionend",topCompositionStart:"compositionstart",topCompositionUpdate:"compositionupdate",topContextMenu:"contextmenu",topCopy:"copy",topCut:"cut",topDoubleClick:"dblclick",topDrag:"drag",topDragEnd:"dragend",topDragEnter:"dragenter",topDragExit:"dragexit",topDragLeave:"dragleave",topDragOver:"dragover",topDragStart:"dragstart",topDrop:"drop",topDurationChange:"durationchange",topEmptied:"emptied",topEncrypted:"encrypted",topEnded:"ended",topError:"error",topFocus:"focus",topInput:"input",topKeyDown:"keydown",topKeyPress:"keypress",topKeyUp:"keyup",topLoadedData:"loadeddata",topLoadedMetadata:"loadedmetadata",topLoadStart:"loadstart",topMouseDown:"mousedown",topMouseMove:"mousemove",topMouseOut:"mouseout",topMouseOver:"mouseover",topMouseUp:"mouseup",topPaste:"paste",topPause:"pause",topPlay:"play",topPlaying:"playing",topProgress:"progress",topRateChange:"ratechange",topScroll:"scroll",topSeeked:"seeked",topSeeking:"seeking",topSelectionChange:"selectionchange",topStalled:"stalled",topSuspend:"suspend",topTextInput:"textInput",topTimeUpdate:"timeupdate",topTouchCancel:"touchcancel",topTouchEnd:"touchend",topTouchMove:"touchmove",topTouchStart:"touchstart",topTransitionEnd:l("transitionend")||"transitionend",topVolumeChange:"volumechange",topWaiting:"waiting",topWheel:"wheel"},m="_reactListenersID"+String(Math.random()).slice(2),v=o({},s,{ReactEventListener:null,injection:{injectReactEventListener:function(e){e.setHandleTopLevel(v.handleTopLevel),v.ReactEventListener=e}},setEnabled:function(e){v.ReactEventListener&&v.ReactEventListener.setEnabled(e)},isEnabled:function(){return!(!v.ReactEventListener||!v.ReactEventListener.isEnabled())},listenTo:function(e,t){for(var n=t,i=r(n),o=a.registrationNameDependencies[e],s=0;s<o.length;s++){var u=o[s];i.hasOwnProperty(u)&&i[u]||("topWheel"===u?c("wheel")?v.ReactEventListener.trapBubbledEvent("topWheel","wheel",n):c("mousewheel")?v.ReactEventListener.trapBubbledEvent("topWheel","mousewheel",n):v.ReactEventListener.trapBubbledEvent("topWheel","DOMMouseScroll",n):"topScroll"===u?c("scroll",!0)?v.ReactEventListener.trapCapturedEvent("topScroll","scroll",n):v.ReactEventListener.trapBubbledEvent("topScroll","scroll",v.ReactEventListener.WINDOW_HANDLE):"topFocus"===u||"topBlur"===u?(c("focus",!0)?(v.ReactEventListener.trapCapturedEvent("topFocus","focus",n),v.ReactEventListener.trapCapturedEvent("topBlur","blur",n)):c("focusin")&&(v.ReactEventListener.trapBubbledEvent("topFocus","focusin",n),v.ReactEventListener.trapBubbledEvent("topBlur","focusout",n)),i.topBlur=!0,i.topFocus=!0):d.hasOwnProperty(u)&&v.ReactEventListener.trapBubbledEvent(u,d[u],n),i[u]=!0)}},trapBubbledEvent:function(e,t,n){return v.ReactEventListener.trapBubbledEvent(e,t,n)},trapCapturedEvent:function(e,t,n){return v.ReactEventListener.trapCapturedEvent(e,t,n)},supportsEventPageXY:function(){if(!document.createEvent)return!1;var e=document.createEvent("MouseEvent");return null!=e&&"pageX"in e},ensureScrollValueMonitoring:function(){if(void 0===i&&(i=v.supportsEventPageXY()),!i&&!f){var e=u.refreshScrollValues;v.ReactEventListener.monitorScrollValue(e),f=!0}}});e.exports=v},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(125),o=n(461),a=n(251),s={screenX:null,screenY:null,clientX:null,clientY:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,getModifierState:a,button:function(e){var t=e.button;return"which"in e?t:2===t?2:4===t?1:0},buttons:null,relatedTarget:function(e){return e.relatedTarget||(e.fromElement===e.srcElement?e.toElement:e.fromElement)},pageX:function(e){return"pageX"in e?e.pageX:e.clientX+o.currentScrollLeft},pageY:function(e){return"pageY"in e?e.pageY:e.clientY+o.currentScrollTop}};i.augmentClass(r,s),e.exports=r},function(e,t,n){"use strict";var r=n(11),i=(n(8),{}),o={reinitializeTransaction:function(){this.transactionWrappers=this.getTransactionWrappers(),this.wrapperInitData?this.wrapperInitData.length=0:this.wrapperInitData=[],this._isInTransaction=!1},_isInTransaction:!1,getTransactionWrappers:null,isInTransaction:function(){return!!this._isInTransaction},perform:function(e,t,n,i,o,a,s,u){this.isInTransaction()&&r("27");var l,c;try{this._isInTransaction=!0,l=!0,this.initializeAll(0),c=e.call(t,n,i,o,a,s,u),l=!1}finally{try{if(l)try{this.closeAll(0)}catch(e){}else this.closeAll(0)}finally{this._isInTransaction=!1}}return c},initializeAll:function(e){for(var t=this.transactionWrappers,n=e;n<t.length;n++){var r=t[n];try{this.wrapperInitData[n]=i,this.wrapperInitData[n]=r.initialize?r.initialize.call(this):null}finally{if(this.wrapperInitData[n]===i)try{this.initializeAll(n+1)}catch(e){}}}},closeAll:function(e){this.isInTransaction()||r("28");for(var t=this.transactionWrappers,n=e;n<t.length;n++){var o,a=t[n],s=this.wrapperInitData[n];try{o=!0,s!==i&&a.close&&a.close.call(this,s),o=!1}finally{if(o)try{this.closeAll(n+1)}catch(e){}}}this.wrapperInitData.length=0}};e.exports=o},function(e,t,n){"use strict";function r(e){var t=""+e,n=o.exec(t);if(!n)return t;var r,i="",a=0,s=0;for(a=n.index;a<t.length;a++){switch(t.charCodeAt(a)){case 34:r="&quot;";break;case 38:r="&amp;";break;case 39:r="&#x27;";break;case 60:r="&lt;";break;case 62:r="&gt;";break;default:continue}s!==a&&(i+=t.substring(s,a)),s=a+1,i+=r}return s!==a?i+t.substring(s,a):i}function i(e){return"boolean"==typeof e||"number"==typeof e?""+e:r(e)}var o=/["'&<>]/;e.exports=i},function(e,t,n){"use strict";var r,i=n(25),o=n(241),a=/^[ \r\n\t\f]/,s=/<(!--|link|noscript|meta|script|style)[ \r\n\t\f\/>]/,u=n(249),l=u(function(e,t){if(e.namespaceURI!==o.svg||"innerHTML"in e)e.innerHTML=t;else{r=r||document.createElement("div"),r.innerHTML="<svg>"+t+"</svg>";for(var n=r.firstChild;n.firstChild;)e.appendChild(n.firstChild)}});if(i.canUseDOM){var c=document.createElement("div");c.innerHTML=" ",""===c.innerHTML&&(l=function(e,t){if(e.parentNode&&e.parentNode.replaceChild(e,e),a.test(t)||"<"===t[0]&&s.test(t)){e.innerHTML=String.fromCharCode(65279)+t;var n=e.firstChild;1===n.data.length?e.removeChild(n):n.deleteData(0,1)}else e.innerHTML=t}),c=null}e.exports=l},function(e,t,n){"use strict";function r(e){var t={};for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]="number"==typeof e[n]?e[n]:e[n].val);return t}t.__esModule=!0,t.default=r,e.exports=t.default},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o=-1,a=e.posMax,s=e.pos,u=e.isInLabel;if(e.isInLabel)return-1;if(e.labelUnmatchedScopes)return e.labelUnmatchedScopes--,-1;for(e.pos=t+1,e.isInLabel=!0,n=1;e.pos<a;){if(91===(i=e.src.charCodeAt(e.pos)))n++;else if(93===i&&0===--n){r=!0;break}e.parser.skipToken(e)}return r?(o=e.pos,e.labelUnmatchedScopes=0):e.labelUnmatchedScopes=n-1,e.pos=s,e.isInLabel=u,o}},function(e,t,n){"use strict";function r(){this.__rules__=[],this.__cache__=null}r.prototype.__find__=function(e){for(var t=this.__rules__.length,n=-1;t--;)if(this.__rules__[++n].name===e)return n;return-1},r.prototype.__compile__=function(){var e=this,t=[""];e.__rules__.forEach(function(e){e.enabled&&e.alt.forEach(function(e){t.indexOf(e)<0&&t.push(e)})}),e.__cache__={},t.forEach(function(t){e.__cache__[t]=[],e.__rules__.forEach(function(n){n.enabled&&(t&&n.alt.indexOf(t)<0||e.__cache__[t].push(n.fn))})})},r.prototype.at=function(e,t,n){var r=this.__find__(e),i=n||{};if(-1===r)throw new Error("Parser rule not found: "+e);this.__rules__[r].fn=t,this.__rules__[r].alt=i.alt||[],this.__cache__=null},r.prototype.before=function(e,t,n,r){var i=this.__find__(e),o=r||{};if(-1===i)throw new Error("Parser rule not found: "+e);this.__rules__.splice(i,0,{name:t,enabled:!0,fn:n,alt:o.alt||[]}),this.__cache__=null},r.prototype.after=function(e,t,n,r){var i=this.__find__(e),o=r||{};if(-1===i)throw new Error("Parser rule not found: "+e);this.__rules__.splice(i+1,0,{name:t,enabled:!0,fn:n,alt:o.alt||[]}),this.__cache__=null},r.prototype.push=function(e,t,n){var r=n||{};this.__rules__.push({name:e,enabled:!0,fn:t,alt:r.alt||[]}),this.__cache__=null},r.prototype.enable=function(e,t){e=Array.isArray(e)?e:[e],t&&this.__rules__.forEach(function(e){e.enabled=!1}),e.forEach(function(e){var t=this.__find__(e);if(t<0)throw new Error("Rules manager: invalid rule name "+e);this.__rules__[t].enabled=!0},this),this.__cache__=null},r.prototype.disable=function(e){e=Array.isArray(e)?e:[e],e.forEach(function(e){var t=this.__find__(e);if(t<0)throw new Error("Rules manager: invalid rule name "+e);this.__rules__[t].enabled=!1},this),this.__cache__=null},r.prototype.getRules=function(e){return null===this.__cache__&&this.__compile__(),this.__cache__[e]||[]},e.exports=r},function(e,t,n){function r(e,t){for(var n in e)t[n]=e[n]}function i(e,t,n){return a(e,t,n)}var o=n(40),a=o.Buffer;a.from&&a.alloc&&a.allocUnsafe&&a.allocUnsafeSlow?e.exports=o:(r(o,t),t.Buffer=i),r(a,i),i.from=function(e,t,n){if("number"==typeof e)throw new TypeError("Argument must not be a number");return a(e,t,n)},i.alloc=function(e,t,n){if("number"!=typeof e)throw new TypeError("Argument must be a number");var r=a(e);return void 0!==t?"string"==typeof n?r.fill(t,n):r.fill(t):r.fill(0),r},i.allocUnsafe=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return a(e)},i.allocUnsafeSlow=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return o.SlowBuffer(e)}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){return{type:v,payload:e}}function o(e){return{type:g,payload:e}}function a(e){return{type:y,payload:e}}function s(e){return{type:_,payload:e}}function u(e){return{type:b,payload:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.authorizeRequest=t.authorizeAccessCodeWithBasicAuthentication=t.authorizeAccessCodeWithFormParams=t.authorizeApplication=t.authorizePassword=t.preAuthorizeImplicit=t.CONFIGURE_AUTH=t.VALIDATE=t.AUTHORIZE_OAUTH2=t.PRE_AUTHORIZE_OAUTH2=t.LOGOUT=t.AUTHORIZE=t.SHOW_AUTH_POPUP=void 0;var l=n(30),c=r(l),p=n(35),f=r(p);t.showDefinitions=i,t.authorize=o,t.logout=a,t.authorizeOauth2=s,t.configureAuth=u;var h=n(46),d=r(h),m=n(9),v=t.SHOW_AUTH_POPUP="show_popup",g=t.AUTHORIZE="authorize",y=t.LOGOUT="logout",_=(t.PRE_AUTHORIZE_OAUTH2="pre_authorize_oauth2",t.AUTHORIZE_OAUTH2="authorize_oauth2"),b=(t.VALIDATE="validate",t.CONFIGURE_AUTH="configure_auth");t.preAuthorizeImplicit=function(e){return function(t){var n=t.authActions,r=t.errActions,i=e.auth,o=e.token,a=e.isValid,s=i.schema,u=i.name,l=s.get("flow");if(delete d.default.swaggerUIRedirectOauth2,"accessCode"===l||a||r.newAuthErr({authId:u,source:"auth",level:"warning",message:"Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"}),o.error)return void r.newAuthErr({authId:u,source:"auth",level:"error",message:(0,f.default)(o)});n.authorizeOauth2({auth:i,token:o})}},t.authorizePassword=function(e){return function(t){var n=t.authActions,r=e.schema,i=e.name,o=e.username,a=e.password,s=e.passwordType,u=e.clientId,l=e.clientSecret,p={grant_type:"password",scope:e.scopes.join(" ")},f={},h={};return"basic"===s?h.Authorization="Basic "+(0,m.btoa)(o+":"+a):((0,c.default)(p,{username:o},{password:a}),"query"===s?(u&&(f.client_id=u),l&&(f.client_secret=l)):h.Authorization="Basic "+(0,m.btoa)(u+":"+l)),n.authorizeRequest({body:(0,m.buildFormData)(p),url:r.get("tokenUrl"),name:i,headers:h,query:f,auth:e})}},t.authorizeApplication=function(e){return function(t){var n=t.authActions,r=e.schema,i=e.scopes,o=e.name,a=e.clientId,s=e.clientSecret,u={Authorization:"Basic "+(0,m.btoa)(a+":"+s)},l={grant_type:"client_credentials",scope:i.join(" ")};return n.authorizeRequest({body:(0,m.buildFormData)(l),name:o,url:r.get("tokenUrl"),auth:e,headers:u})}},t.authorizeAccessCodeWithFormParams=function(e){var t=e.auth,n=e.redirectUrl;return function(e){var r=e.authActions,i=t.schema,o=t.name,a=t.clientId,s=t.clientSecret,u={grant_type:"authorization_code",code:t.code,client_id:a,client_secret:s,redirect_uri:n};return r.authorizeRequest({body:(0,m.buildFormData)(u),name:o,url:i.get("tokenUrl"),auth:t})}},t.authorizeAccessCodeWithBasicAuthentication=function(e){var t=e.auth,n=e.redirectUrl;return function(e){var r=e.authActions,i=t.schema,o=t.name,a=t.clientId,s=t.clientSecret,u={Authorization:"Basic "+(0,m.btoa)(a+":"+s)},l={grant_type:"authorization_code",code:t.code,client_id:a,redirect_uri:n};return r.authorizeRequest({body:(0,m.buildFormData)(l),name:o,url:i.get("tokenUrl"),auth:t,headers:u})}},t.authorizeRequest=function(e){return function(t){var n=t.fn,r=t.getConfigs,i=t.authActions,o=t.errActions,a=t.authSelectors,s=e.body,u=e.query,l=void 0===u?{}:u,p=e.headers,h=void 0===p?{}:p,d=e.name,m=e.url,v=e.auth,g=a.getConfigs()||{},y=g.additionalQueryStringParams,_=m;for(var b in y)m+="&"+b+"="+encodeURIComponent(y[b]);var x=(0,c.default)({Accept:"application/json, text/plain, */*","Content-Type":"application/x-www-form-urlencoded"},h);n.fetch({url:_,method:"post",headers:x,query:l,body:s,requestInterceptor:r().requestInterceptor,responseInterceptor:r().responseInterceptor}).then(function(e){var t=JSON.parse(e.data),n=t&&(t.error||""),r=t&&(t.parseError||"");return e.ok?n||r?void o.newAuthErr({authId:d,level:"error",source:"auth",message:(0,f.default)(t)}):void i.authorizeOauth2({auth:v,token:t}):void o.newAuthErr({authId:d,level:"error",source:"auth",message:e.statusText})}).catch(function(e){var t=new Error(e);o.newAuthErr({authId:d,level:"error",source:"auth",message:t.message})})}}},function(e,t,n){"use strict";function r(e,t){return{type:s,payload:(0,a.default)({},e,t)}}function i(e){return{type:u,payload:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.TOGGLE_CONFIGS=t.UPDATE_CONFIGS=void 0;var o=n(36),a=function(e){return e&&e.__esModule?e:{default:e}}(o);t.update=r,t.toggle=i;var s=t.UPDATE_CONFIGS="configs_update",u=t.TOGGLE_CONFIGS="configs_toggle"},function(e,t,n){"use strict";function r(e){return{type:u,payload:e}}function i(e){return{type:l,payload:e}}function o(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];return e=(0,s.normalizeArray)(e),{type:p,payload:{thing:e,shown:t}}}function a(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return e=(0,s.normalizeArray)(e),{type:c,payload:{thing:e,mode:t}}}Object.defineProperty(t,"__esModule",{value:!0}),t.SHOW=t.UPDATE_MODE=t.UPDATE_FILTER=t.UPDATE_LAYOUT=void 0,t.updateLayout=r,t.updateFilter=i,t.show=o,t.changeMode=a;var s=n(9),u=t.UPDATE_LAYOUT="layout_update_layout",l=t.UPDATE_FILTER="layout_update_filter",c=t.UPDATE_MODE="layout_update_mode",p=t.SHOW="layout_show"},function(e,t,n){"use strict";function r(e,t){return{type:u,payload:{selectedServerUrl:e,namespace:t}}}function i(e){var t=e.value,n=e.pathMethod;return{type:l,payload:{value:t,pathMethod:n}}}function o(e){var t=e.value,n=e.pathMethod;return{type:c,payload:{value:t,pathMethod:n}}}function a(e){var t=e.value,n=e.path,r=e.method;return{type:p,payload:{value:t,path:n,method:r}}}function s(e){var t=e.server,n=e.namespace,r=e.key,i=e.val;return{type:f,payload:{server:t,namespace:n,key:r,val:i}}}Object.defineProperty(t,"__esModule",{value:!0}),t.setSelectedServer=r,t.setRequestBodyValue=i,t.setRequestContentType=o,t.setResponseContentType=a,t.setServerVariableValue=s;var u=t.UPDATE_SELECTED_SERVER="oas3_set_servers",l=t.UPDATE_REQUEST_BODY_VALUE="oas3_set_request_body_value",c=t.UPDATE_REQUEST_CONTENT_TYPE="oas3_set_request_content_type",p=t.UPDATE_RESPONSE_CONTENT_TYPE="oas3_set_response_content_type",f=t.UPDATE_SERVER_VARIABLE_VALUE="oas3_set_server_variable_value"},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){var n=h(e,t);if(n)return(0,s.default)(n,{declaration:!0,indent:"\t"})}Object.defineProperty(t,"__esModule",{value:!0}),t.memoizedSampleFromSchema=t.memoizedCreateXMLExample=t.sampleXmlFromSchema=t.inferSchema=t.sampleFromSchema=void 0,t.createXMLExample=i;var o=n(9),a=n(1198),s=r(a),u=n(968),l=r(u),c={string:function(){return"string"},string_email:function(){return"user@example.com"},"string_date-time":function(){return(new Date).toISOString()},number:function(){return 0},number_float:function(){return 0},integer:function(){return 0},boolean:function(e){return"boolean"!=typeof e.default||e.default}},p=function(e){e=(0,o.objectify)(e);var t=e,n=t.type,r=t.format,i=c[n+"_"+r]||c[n];return(0,o.isFunc)(i)?i(e):"Unknown Type: "+e.type},f=t.sampleFromSchema=function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=(0,o.objectify)(t),i=r.type,a=r.example,s=r.properties,u=r.additionalProperties,l=r.items,c=n.includeReadOnly,f=n.includeWriteOnly;if(void 0!==a)return a;if(!i)if(s)i="object";else{if(!l)return;i="array"}if("object"===i){var h=(0,o.objectify)(s),d={};for(var m in h)h[m].readOnly&&!c||h[m].writeOnly&&!f||(d[m]=e(h[m],n));if(!0===u)d.additionalProp1={};else if(u)for(var v=(0,o.objectify)(u),g=e(v,n),y=1;y<4;y++)d["additionalProp"+y]=g;return d}return"array"===i?[e(l,n)]:t.enum?t.default?t.default:(0,o.normalizeArray)(t.enum)[0]:"file"!==i?p(t):void 0},h=(t.inferSchema=function(e){return e.schema&&(e=e.schema),e.properties&&(e.type="object"),e},t.sampleXmlFromSchema=function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=(0,o.objectify)(t),i=r.type,a=r.properties,s=r.additionalProperties,u=r.items,l=r.example,c=n.includeReadOnly,f=n.includeWriteOnly,h=r.default,d={},m={},v=t.xml,g=v.name,y=v.prefix,_=v.namespace,b=r.enum,x=void 0,w=void 0;if(!i)if(a||s)i="object";else{if(!u)return;i="array"}if(g=g||"notagname",x=(y?y+":":"")+g,_){m[y?"xmlns:"+y:"xmlns"]=_}if("array"===i&&u){if(u.xml=u.xml||v||{},u.xml.name=u.xml.name||v.name,v.wrapped)return d[x]=[],Array.isArray(l)?l.forEach(function(t){u.example=t,d[x].push(e(u,n))}):Array.isArray(h)?h.forEach(function(t){u.default=t,d[x].push(e(u,n))}):d[x]=[e(u,n)],m&&d[x].push({_attr:m}),d;var k=[];return Array.isArray(l)?(l.forEach(function(t){u.example=t,k.push(e(u,n))}),k):Array.isArray(h)?(h.forEach(function(t){u.default=t,k.push(e(u,n))}),k):e(u,n)}if("object"===i){var E=(0,o.objectify)(a);d[x]=[],l=l||{};for(var S in E)if(E.hasOwnProperty(S)&&(!E[S].readOnly||c)&&(!E[S].writeOnly||f))if(E[S].xml=E[S].xml||{},E[S].xml.attribute){var C=Array.isArray(E[S].enum)&&E[S].enum[0],A=E[S].example,D=E[S].default;m[E[S].xml.name||S]=void 0!==A&&A||void 0!==l[S]&&l[S]||void 0!==D&&D||C||p(E[S])}else{E[S].xml.name=E[S].xml.name||S,E[S].example=void 0!==E[S].example?E[S].example:l[S];var O=e(E[S]);Array.isArray(O)?d[x]=d[x].concat(O):d[x].push(O)}return!0===s?d[x].push({additionalProp:"Anything can be here"}):s&&d[x].push({additionalProp:p(s)}),m&&d[x].push({_attr:m}),d}return w=void 0!==l?l:void 0!==h?h:Array.isArray(b)?b[0]:p(t),d[x]=m?[{_attr:m},w]:w,d});t.memoizedCreateXMLExample=(0,l.default)(i),t.memoizedSampleFromSchema=(0,l.default)(f)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=X(e).replace(/\t/g,"  ");if("string"==typeof e)return{type:R,payload:t}}function o(e){return{type:J,payload:e}}function a(e){return{type:j,payload:e}}function s(e){return{type:F,payload:e}}function u(e,t,n,r,i){return{type:N,payload:{path:e,value:r,paramName:t,paramIn:n,isXml:i}}}function l(e){return{type:H,payload:{pathMethod:e}}}function c(e,t){return{type:G,payload:{path:e,value:t,key:"consumes_value"}}}function p(e,t){return{type:G,payload:{path:e,value:t,key:"produces_value"}}}function f(e,t){return{type:W,payload:{path:e,method:t}}}function h(e,t){return{type:V,payload:{path:e,method:t}}}function d(e,t,n){return{type:K,payload:{scheme:e,path:t,method:n}}}Object.defineProperty(t,"__esModule",{value:!0}),t.execute=t.executeRequest=t.logRequest=t.setMutatedRequest=t.setRequest=t.setResponse=t.validateParams=t.resolveSpec=t.parseToJson=t.SET_SCHEME=t.UPDATE_RESOLVED=t.UPDATE_OPERATION_META_VALUE=t.CLEAR_VALIDATE_PARAMS=t.CLEAR_REQUEST=t.CLEAR_RESPONSE=t.LOG_REQUEST=t.SET_MUTATED_REQUEST=t.SET_REQUEST=t.SET_RESPONSE=t.VALIDATE_PARAMS=t.UPDATE_PARAM=t.UPDATE_JSON=t.UPDATE_URL=t.UPDATE_SPEC=void 0;var m=n(21),v=r(m),g=n(96),y=r(g),_=n(30),b=r(_),x=n(47),w=r(x),k=n(48),E=r(k);t.updateSpec=i,t.updateResolved=o,t.updateUrl=a,t.updateJsonSpec=s,t.changeParam=u,t.clearValidateParams=l,t.changeConsumesValue=c,t.changeProducesValue=p,t.clearResponse=f,t.clearRequest=h,t.setScheme=d;var S=n(211),C=r(S),A=n(1187),D=r(A),O=n(264),M=r(O),T=n(422),P=r(T),I=n(9),R=t.UPDATE_SPEC="spec_update_spec",j=t.UPDATE_URL="spec_update_url",F=t.UPDATE_JSON="spec_update_json",N=t.UPDATE_PARAM="spec_update_param",B=t.VALIDATE_PARAMS="spec_validate_param",L=t.SET_RESPONSE="spec_set_response",q=t.SET_REQUEST="spec_set_request",z=t.SET_MUTATED_REQUEST="spec_set_mutated_request",U=t.LOG_REQUEST="spec_log_request",W=t.CLEAR_RESPONSE="spec_clear_response",V=t.CLEAR_REQUEST="spec_clear_request",H=t.CLEAR_VALIDATE_PARAMS="spec_clear_validate_param",G=t.UPDATE_OPERATION_META_VALUE="spec_update_operation_meta_value",J=t.UPDATE_RESOLVED="spec_update_resolved",K=t.SET_SCHEME="set_scheme",X=function(e){return(0,P.default)(e)?e:""},Y=(t.parseToJson=function(e){return function(t){var n=t.specActions,r=t.specSelectors,i=t.errActions,o=r.specStr,a=null;try{e=e||o(),i.clear({source:"parser"}),a=C.default.safeLoad(e)}catch(e){return console.error(e),i.newSpecErr({source:"parser",level:"error",message:e.reason,line:e.mark&&e.mark.line?e.mark.line+1:void 0})}return a&&"object"===(void 0===a?"undefined":(0,E.default)(a))?n.updateJsonSpec(a):{}}},t.resolveSpec=function(e,t){return function(n){var r=n.specActions,i=n.specSelectors,o=n.errActions,a=n.fn,s=a.fetch,u=a.resolve,l=a.AST,c=n.getConfigs,p=c(),f=p.modelPropertyMacro,h=p.parameterMacro,d=p.requestInterceptor,m=p.responseInterceptor;void 0===e&&(e=i.specJson()),void 0===t&&(t=i.url());var v=l.getLineNumberForPath,g=i.specStr();return u({fetch:s,spec:e,baseDoc:t,modelPropertyMacro:f,parameterMacro:h,requestInterceptor:d,responseInterceptor:m}).then(function(e){var t=e.spec,n=e.errors;if(o.clear({type:"thrown"}),Array.isArray(n)&&n.length>0){var i=n.map(function(e){return console.error(e),e.line=e.fullPath?v(g,e.fullPath):null,e.path=e.fullPath?e.fullPath.join("."):null,e.level="error",e.type="thrown",e.source="resolver",Object.defineProperty(e,"message",{enumerable:!0,value:e.message}),e});o.newThrownErrBatch(i)}return r.updateResolved(t)})}},t.validateParams=function(e,t){return{type:B,payload:{pathMethod:e,isOAS3:t}}},t.setResponse=function(e,t,n){return{payload:{path:e,method:t,res:n},type:L}},t.setRequest=function(e,t,n){return{payload:{path:e,method:t,req:n},type:q}},t.setMutatedRequest=function(e,t,n){return{payload:{path:e,method:t,req:n},type:z}},t.logRequest=function(e){return{payload:e,type:U}},t.executeRequest=function(e){return function(t){var n=t.fn,r=t.specActions,i=t.specSelectors,o=t.getConfigs,a=t.oas3Selectors,s=e.pathName,u=e.method,l=e.operation,c=o(),p=c.requestInterceptor,f=c.responseInterceptor,h=l.toJS();if(e.contextUrl=(0,D.default)(i.url()).toString(),h&&h.operationId?e.operationId=h.operationId:h&&s&&u&&(e.operationId=n.opId(h,s,u)),i.isOAS3()){var d=s+":"+u;e.server=a.selectedServer(d)||a.selectedServer();var m=a.serverVariables({server:e.server,namespace:d}).toJS(),v=a.serverVariables({server:e.server}).toJS();e.serverVariables=(0,w.default)(m).length?m:v,e.requestContentType=a.requestContentType(s,u),e.responseContentType=a.responseContentType(s,u)||"*/*";var g=a.requestBodyValue(s,u);(0,I.isJSONObject)(g)?e.requestBody=JSON.parse(g):e.requestBody=g}var y=(0,b.default)({},e);y=n.buildRequest(y),r.setRequest(e.pathName,e.method,y);var _=function(t){var n=p.apply(this,[t]),i=(0,b.default)({},n);return r.setMutatedRequest(e.pathName,e.method,i),n};e.requestInterceptor=_,e.responseInterceptor=f;var x=Date.now();return n.execute(e).then(function(t){t.duration=Date.now()-x,r.setResponse(e.pathName,e.method,t)}).catch(function(t){return r.setResponse(e.pathName,e.method,{error:!0,err:(0,M.default)(t)})})}},function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=e.path,n=e.method,r=(0,y.default)(e,["path","method"]);return function(e){var i=e.fn.fetch,o=e.specSelectors,a=e.specActions,s=o.spec().toJS(),u=o.operationScheme(t,n),l=o.contentTypeValues([t,n]).toJS(),c=l.requestContentType,p=l.responseContentType,f=/xml/i.test(c),h=o.parameterValues([t,n],f).toJS();return a.executeRequest((0,v.default)({fetch:i,spec:s,pathName:t,method:n,parameters:h,requestContentType:c,scheme:u,responseContentType:p},r))}});t.execute=Y},function(e,t,n){"use strict";function r(e){switch(e._type){case"document":case"block_quote":case"list":case"item":case"paragraph":case"heading":case"emph":case"strong":case"link":case"image":case"custom_inline":case"custom_block":return!0;default:return!1}}var i=function(e,t){this.current=e,this.entering=!0===t},o=function(){var e=this.current,t=this.entering;if(null===e)return null;var n=r(e);return t&&n?e._firstChild?(this.current=e._firstChild,this.entering=!0):this.entering=!1:e===this.root?this.current=null:null===e._next?(this.current=e._parent,this.entering=!1):(this.current=e._next,this.entering=!0),{entering:t,node:e}},a=function(e){return{current:e,root:e,entering:!0,next:o,resumeAt:i}},s=function(e,t){this._type=e,this._parent=null,this._firstChild=null,this._lastChild=null,this._prev=null,this._next=null,this._sourcepos=t,this._lastLineBlank=!1,this._open=!0,this._string_content=null,this._literal=null,this._listData={},this._info=null,this._destination=null,this._title=null,this._isFenced=!1,this._fenceChar=null,this._fenceLength=0,this._fenceOffset=null,this._level=null,this._onEnter=null,this._onExit=null},u=s.prototype;Object.defineProperty(u,"isContainer",{get:function(){return r(this)}}),Object.defineProperty(u,"type",{get:function(){return this._type}}),Object.defineProperty(u,"firstChild",{get:function(){return this._firstChild}}),Object.defineProperty(u,"lastChild",{get:function(){return this._lastChild}}),Object.defineProperty(u,"next",{get:function(){return this._next}}),Object.defineProperty(u,"prev",{get:function(){return this._prev}}),Object.defineProperty(u,"parent",{get:function(){return this._parent}}),Object.defineProperty(u,"sourcepos",{get:function(){return this._sourcepos}}),Object.defineProperty(u,"literal",{get:function(){return this._literal},set:function(e){this._literal=e}}),Object.defineProperty(u,"destination",{get:function(){return this._destination},set:function(e){this._destination=e}}),Object.defineProperty(u,"title",{get:function(){return this._title},set:function(e){this._title=e}}),Object.defineProperty(u,"info",{get:function(){return this._info},set:function(e){this._info=e}}),Object.defineProperty(u,"level",{get:function(){return this._level},set:function(e){this._level=e}}),Object.defineProperty(u,"listType",{get:function(){return this._listData.type},set:function(e){this._listData.type=e}}),Object.defineProperty(u,"listTight",{get:function(){return this._listData.tight},set:function(e){this._listData.tight=e}}),Object.defineProperty(u,"listStart",{get:function(){return this._listData.start},set:function(e){this._listData.start=e}}),Object.defineProperty(u,"listDelimiter",{get:function(){return this._listData.delimiter},set:function(e){this._listData.delimiter=e}}),Object.defineProperty(u,"onEnter",{get:function(){return this._onEnter},set:function(e){this._onEnter=e}}),Object.defineProperty(u,"onExit",{get:function(){return this._onExit},set:function(e){this._onExit=e}}),s.prototype.appendChild=function(e){e.unlink(),e._parent=this,this._lastChild?(this._lastChild._next=e,e._prev=this._lastChild,this._lastChild=e):(this._firstChild=e,this._lastChild=e)},s.prototype.prependChild=function(e){e.unlink(),e._parent=this,this._firstChild?(this._firstChild._prev=e,e._next=this._firstChild,this._firstChild=e):(this._firstChild=e,this._lastChild=e)},s.prototype.unlink=function(){this._prev?this._prev._next=this._next:this._parent&&(this._parent._firstChild=this._next),this._next?this._next._prev=this._prev:this._parent&&(this._parent._lastChild=this._prev),this._parent=null,this._next=null,this._prev=null},s.prototype.insertAfter=function(e){e.unlink(),e._next=this._next,e._next&&(e._next._prev=e),e._prev=this,this._next=e,e._parent=this._parent,e._next||(e._parent._lastChild=e)},s.prototype.insertBefore=function(e){e.unlink(),e._prev=this._prev,e._prev&&(e._prev._next=e),e._next=this,this._prev=e,e._parent=this._parent,e._prev||(e._parent._firstChild=e)},s.prototype.walker=function(){return new a(this)},e.exports=s},function(e,t){e.exports=function(e,t,n,r){if(!(e instanceof t)||void 0!==r&&r in e)throw TypeError(n+": incorrect invocation!");return e}},function(e,t,n){var r=n(53),i=n(181),o=n(76),a=n(133),s=n(602);e.exports=function(e,t){var n=1==e,u=2==e,l=3==e,c=4==e,p=6==e,f=5==e||p,h=t||s;return function(t,s,d){for(var m,v,g=o(t),y=i(g),_=r(s,d,3),b=a(y.length),x=0,w=n?h(t,b):u?h(t,0):void 0;b>x;x++)if((f||x in y)&&(m=y[x],v=_(m,x,g),e))if(n)w[x]=v;else if(v)switch(e){case 3:return!0;case 5:return m;case 6:return x;case 2:w.push(m)}else if(c)return!1;return p?-1:l||c?c:w}}},function(e,t,n){var r=n(99),i=n(22)("toStringTag"),o="Arguments"==r(function(){return arguments}()),a=function(e,t){try{return e[t]}catch(e){}};e.exports=function(e){var t,n,s;return void 0===e?"Undefined":null===e?"Null":"string"==typeof(n=a(t=Object(e),i))?n:o?r(t):"Object"==(s=r(t))&&"function"==typeof t.callee?"Arguments":s}},function(e,t){e.exports=function(e){if(void 0==e)throw TypeError("Can't call method on  "+e);return e}},function(e,t,n){var r=n(27),i=n(24).document,o=r(i)&&r(i.createElement);e.exports=function(e){return o?i.createElement(e):{}}},function(e,t){e.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(e,t,n){var r=n(99);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(e){return"String"==r(e)?e.split(""):Object(e)}},function(e,t,n){"use strict";function r(e){var t,n;this.promise=new e(function(e,r){if(void 0!==t||void 0!==n)throw TypeError("Bad Promise constructor");t=e,n=r}),this.resolve=i(t),this.reject=i(n)}var i=n(98);e.exports.f=function(e){return new r(e)}},function(e,t,n){var r=n(37),i=n(611),o=n(180),a=n(187)("IE_PROTO"),s=function(){},u=function(){var e,t=n(179)("iframe"),r=o.length;for(t.style.display="none",n(334).appendChild(t),t.src="javascript:",e=t.contentWindow.document,e.open(),e.write("<script>document.F=Object<\/script>"),e.close(),u=e.F;r--;)delete u.prototype[o[r]];return u()};e.exports=Object.create||function(e,t){var n;return null!==e?(s.prototype=r(e),n=new s,s.prototype=null,n[a]=e):n=u(),void 0===t?n:i(n,t)}},function(e,t){t.f=Object.getOwnPropertySymbols},function(e,t,n){var r=n(56);e.exports=function(e,t,n){for(var i in t)n&&e[i]?e[i]=t[i]:r(e,i,t[i]);return e}},function(e,t,n){e.exports=n(56)},function(e,t,n){var r=n(188)("keys"),i=n(134);e.exports=function(e){return r[e]||(r[e]=i(e))}},function(e,t,n){var r=n(24),i=r["__core-js_shared__"]||(r["__core-js_shared__"]={});e.exports=function(e){return i[e]||(i[e]={})}},function(e,t){var n=Math.ceil,r=Math.floor;e.exports=function(e){return isNaN(e=+e)?0:(e>0?r:n)(e)}},function(e,t,n){var r=n(27);e.exports=function(e,t){if(!r(e))return e;var n,i;if(t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i;if("function"==typeof(n=e.valueOf)&&!r(i=n.call(e)))return i;if(!t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i;throw TypeError("Can't convert object to primitive value")}},function(e,t,n){var r=n(24),i=n(15),o=n(130),a=n(192),s=n(41).f;e.exports=function(e){var t=i.Symbol||(i.Symbol=o?{}:r.Symbol||{});"_"==e.charAt(0)||e in t||s(t,e,{value:a.f(e)})}},function(e,t,n){t.f=n(22)},function(e,t,n){var r=n(177),i=n(22)("iterator"),o=n(74);e.exports=n(15).getIteratorMethod=function(e){if(void 0!=e)return e[i]||e["@@iterator"]||o[r(e)]}},function(e,t){},function(e,t,n){var r=n(105),i=n(19)("toStringTag"),o="Arguments"==r(function(){return arguments}()),a=function(e,t){try{return e[t]}catch(e){}};e.exports=function(e){var t,n,s;return void 0===e?"Undefined":null===e?"Null":"string"==typeof(n=a(t=Object(e),i))?n:o?r(t):"Object"==(s=r(t))&&"function"==typeof t.callee?"Arguments":s}},function(e,t,n){var r=n(77),i=n(31).document,o=r(i)&&r(i.createElement);e.exports=function(e){return o?i.createElement(e):{}}},function(e,t,n){var r=n(19)("match");e.exports=function(e){var t=/./;try{"/./"[e](t)}catch(n){try{return t[r]=!1,!"/./"[e](t)}catch(e){}}return!0}},function(e,t,n){"use strict";function r(e){var t,n;this.promise=new e(function(e,r){if(void 0!==t||void 0!==n)throw TypeError("Bad Promise constructor");t=e,n=r}),this.resolve=i(t),this.reject=i(n)}var i=n(135);e.exports.f=function(e){return new r(e)}},function(e,t,n){var r=n(138).f,i=n(108),o=n(19)("toStringTag");e.exports=function(e,t,n){e&&!i(e=n?e:e.prototype,o)&&r(e,o,{configurable:!0,value:t})}},function(e,t,n){var r=n(361)("keys"),i=n(202);e.exports=function(e){return r[e]||(r[e]=i(e))}},function(e,t,n){var r=n(354),i=n(57);e.exports=function(e,t,n){if(r(t))throw TypeError("String#"+n+" doesn't accept regex!");return String(i(e))}},function(e,t){var n=0,r=Math.random();e.exports=function(e){return"Symbol(".concat(void 0===e?"":e,")_",(++n+r).toString(36))}},function(e,t,n){"use strict";(function(t){/*!
-- * @description Recursive object extending
-- * @author Viacheslav Lotsmanov <lotsmanov89@gmail.com>
-- * @license MIT
-- *
-- * The MIT License (MIT)
-- *
-- * Copyright (c) 2013-2015 Viacheslav Lotsmanov
-- *
-- * Permission is hereby granted, free of charge, to any person obtaining a copy of
-- * this software and associated documentation files (the "Software"), to deal in
-- * the Software without restriction, including without limitation the rights to
-- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-- * the Software, and to permit persons to whom the Software is furnished to do so,
-- * subject to the following conditions:
-- *
-- * The above copyright notice and this permission notice shall be included in all
-- * copies or substantial portions of the Software.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-- */
--function n(e){return e instanceof t||e instanceof Date||e instanceof RegExp}function r(e){if(e instanceof t){var n=new t(e.length);return e.copy(n),n}if(e instanceof Date)return new Date(e.getTime());if(e instanceof RegExp)return new RegExp(e);throw new Error("Unexpected situation")}function i(e){var t=[];return e.forEach(function(e,a){"object"==typeof e&&null!==e?Array.isArray(e)?t[a]=i(e):n(e)?t[a]=r(e):t[a]=o({},e):t[a]=e}),t}var o=e.exports=function(){if(arguments.length<1||"object"!=typeof arguments[0])return!1;if(arguments.length<2)return arguments[0];var e,t,a=arguments[0],s=Array.prototype.slice.call(arguments,1);return s.forEach(function(s){"object"!=typeof s||Array.isArray(s)||Object.keys(s).forEach(function(u){return t=a[u],e=s[u],e===a?void 0:"object"!=typeof e||null===e?void(a[u]=e):Array.isArray(e)?void(a[u]=i(e)):n(e)?void(a[u]=r(e)):"object"!=typeof t||null===t||Array.isArray(t)?void(a[u]=o({},e)):void(a[u]=o(t,e))})}),a}}).call(t,n(40).Buffer)},function(e,t){e.exports={Aacute:"Á",aacute:"á",Abreve:"Ă",abreve:"ă",ac:"∾",acd:"∿",acE:"∾̳",Acirc:"Â",acirc:"â",acute:"´",Acy:"А",acy:"а",AElig:"Æ",aelig:"æ",af:"⁡",Afr:"𝔄",afr:"𝔞",Agrave:"À",agrave:"à",alefsym:"ℵ",aleph:"ℵ",Alpha:"Α",alpha:"α",Amacr:"Ā",amacr:"ā",amalg:"⨿",amp:"&",AMP:"&",andand:"⩕",And:"⩓",and:"∧",andd:"⩜",andslope:"⩘",andv:"⩚",ang:"∠",ange:"⦤",angle:"∠",angmsdaa:"⦨",angmsdab:"⦩",angmsdac:"⦪",angmsdad:"⦫",angmsdae:"⦬",angmsdaf:"⦭",angmsdag:"⦮",angmsdah:"⦯",angmsd:"∡",angrt:"∟",angrtvb:"⊾",angrtvbd:"⦝",angsph:"∢",angst:"Å",angzarr:"⍼",Aogon:"Ą",aogon:"ą",Aopf:"𝔸",aopf:"𝕒",apacir:"⩯",ap:"≈",apE:"⩰",ape:"≊",apid:"≋",apos:"'",ApplyFunction:"⁡",approx:"≈",approxeq:"≊",Aring:"Å",aring:"å",Ascr:"𝒜",ascr:"𝒶",Assign:"≔",ast:"*",asymp:"≈",asympeq:"≍",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",awconint:"∳",awint:"⨑",backcong:"≌",backepsilon:"϶",backprime:"‵",backsim:"∽",backsimeq:"⋍",Backslash:"∖",Barv:"⫧",barvee:"⊽",barwed:"⌅",Barwed:"⌆",barwedge:"⌅",bbrk:"⎵",bbrktbrk:"⎶",bcong:"≌",Bcy:"Б",bcy:"б",bdquo:"„",becaus:"∵",because:"∵",Because:"∵",bemptyv:"⦰",bepsi:"϶",bernou:"ℬ",Bernoullis:"ℬ",Beta:"Β",beta:"β",beth:"ℶ",between:"≬",Bfr:"𝔅",bfr:"𝔟",bigcap:"⋂",bigcirc:"◯",bigcup:"⋃",bigodot:"⨀",bigoplus:"⨁",bigotimes:"⨂",bigsqcup:"⨆",bigstar:"★",bigtriangledown:"▽",bigtriangleup:"△",biguplus:"⨄",bigvee:"⋁",bigwedge:"⋀",bkarow:"⤍",blacklozenge:"⧫",blacksquare:"▪",blacktriangle:"▴",blacktriangledown:"▾",blacktriangleleft:"◂",blacktriangleright:"▸",blank:"␣",blk12:"▒",blk14:"░",blk34:"▓",block:"█",bne:"=⃥",bnequiv:"≡⃥",bNot:"⫭",bnot:"⌐",Bopf:"𝔹",bopf:"𝕓",bot:"⊥",bottom:"⊥",bowtie:"⋈",boxbox:"⧉",boxdl:"┐",boxdL:"╕",boxDl:"╖",boxDL:"╗",boxdr:"┌",boxdR:"╒",boxDr:"╓",boxDR:"╔",boxh:"─",boxH:"═",boxhd:"┬",boxHd:"╤",boxhD:"╥",boxHD:"╦",boxhu:"┴",boxHu:"╧",boxhU:"╨",boxHU:"╩",boxminus:"⊟",boxplus:"⊞",boxtimes:"⊠",boxul:"┘",boxuL:"╛",boxUl:"╜",boxUL:"╝",boxur:"└",boxuR:"╘",boxUr:"╙",boxUR:"╚",boxv:"│",boxV:"║",boxvh:"┼",boxvH:"╪",boxVh:"╫",boxVH:"╬",boxvl:"┤",boxvL:"╡",boxVl:"╢",boxVL:"╣",boxvr:"├",boxvR:"╞",boxVr:"╟",boxVR:"╠",bprime:"‵",breve:"˘",Breve:"˘",brvbar:"¦",bscr:"𝒷",Bscr:"ℬ",bsemi:"⁏",bsim:"∽",bsime:"⋍",bsolb:"⧅",bsol:"\\",bsolhsub:"⟈",bull:"•",bullet:"•",bump:"≎",bumpE:"⪮",bumpe:"≏",Bumpeq:"≎",bumpeq:"≏",Cacute:"Ć",cacute:"ć",capand:"⩄",capbrcup:"⩉",capcap:"⩋",cap:"∩",Cap:"⋒",capcup:"⩇",capdot:"⩀",CapitalDifferentialD:"ⅅ",caps:"∩︀",caret:"⁁",caron:"ˇ",Cayleys:"ℭ",ccaps:"⩍",Ccaron:"Č",ccaron:"č",Ccedil:"Ç",ccedil:"ç",Ccirc:"Ĉ",ccirc:"ĉ",Cconint:"∰",ccups:"⩌",ccupssm:"⩐",Cdot:"Ċ",cdot:"ċ",cedil:"¸",Cedilla:"¸",cemptyv:"⦲",cent:"¢",centerdot:"·",CenterDot:"·",cfr:"𝔠",Cfr:"ℭ",CHcy:"Ч",chcy:"ч",check:"✓",checkmark:"✓",Chi:"Χ",chi:"χ",circ:"ˆ",circeq:"≗",circlearrowleft:"↺",circlearrowright:"↻",circledast:"⊛",circledcirc:"⊚",circleddash:"⊝",CircleDot:"⊙",circledR:"®",circledS:"Ⓢ",CircleMinus:"⊖",CirclePlus:"⊕",CircleTimes:"⊗",cir:"○",cirE:"⧃",cire:"≗",cirfnint:"⨐",cirmid:"⫯",cirscir:"⧂",ClockwiseContourIntegral:"∲",CloseCurlyDoubleQuote:"”",CloseCurlyQuote:"’",clubs:"♣",clubsuit:"♣",colon:":",Colon:"∷",Colone:"⩴",colone:"≔",coloneq:"≔",comma:",",commat:"@",comp:"∁",compfn:"∘",complement:"∁",complexes:"ℂ",cong:"≅",congdot:"⩭",Congruent:"≡",conint:"∮",Conint:"∯",ContourIntegral:"∮",copf:"𝕔",Copf:"ℂ",coprod:"∐",Coproduct:"∐",copy:"©",COPY:"©",copysr:"℗",CounterClockwiseContourIntegral:"∳",crarr:"↵",cross:"✗",Cross:"⨯",Cscr:"𝒞",cscr:"𝒸",csub:"⫏",csube:"⫑",csup:"⫐",csupe:"⫒",ctdot:"⋯",cudarrl:"⤸",cudarrr:"⤵",cuepr:"⋞",cuesc:"⋟",cularr:"↶",cularrp:"⤽",cupbrcap:"⩈",cupcap:"⩆",CupCap:"≍",cup:"∪",Cup:"⋓",cupcup:"⩊",cupdot:"⊍",cupor:"⩅",cups:"∪︀",curarr:"↷",curarrm:"⤼",curlyeqprec:"⋞",curlyeqsucc:"⋟",curlyvee:"⋎",curlywedge:"⋏",curren:"¤",curvearrowleft:"↶",curvearrowright:"↷",cuvee:"⋎",cuwed:"⋏",cwconint:"∲",cwint:"∱",cylcty:"⌭",dagger:"†",Dagger:"‡",daleth:"ℸ",darr:"↓",Darr:"↡",dArr:"⇓",dash:"‐",Dashv:"⫤",dashv:"⊣",dbkarow:"⤏",dblac:"˝",Dcaron:"Ď",dcaron:"ď",Dcy:"Д",dcy:"д",ddagger:"‡",ddarr:"⇊",DD:"ⅅ",dd:"ⅆ",DDotrahd:"⤑",ddotseq:"⩷",deg:"°",Del:"∇",Delta:"Δ",delta:"δ",demptyv:"⦱",dfisht:"⥿",Dfr:"𝔇",dfr:"𝔡",dHar:"⥥",dharl:"⇃",dharr:"⇂",DiacriticalAcute:"´",DiacriticalDot:"˙",DiacriticalDoubleAcute:"˝",DiacriticalGrave:"`",DiacriticalTilde:"˜",diam:"⋄",diamond:"⋄",Diamond:"⋄",diamondsuit:"♦",diams:"♦",die:"¨",DifferentialD:"ⅆ",digamma:"ϝ",disin:"⋲",div:"÷",divide:"÷",divideontimes:"⋇",divonx:"⋇",DJcy:"Ђ",djcy:"ђ",dlcorn:"⌞",dlcrop:"⌍",dollar:"$",Dopf:"𝔻",dopf:"𝕕",Dot:"¨",dot:"˙",DotDot:"⃜",doteq:"≐",doteqdot:"≑",DotEqual:"≐",dotminus:"∸",dotplus:"∔",dotsquare:"⊡",doublebarwedge:"⌆",DoubleContourIntegral:"∯",DoubleDot:"¨",DoubleDownArrow:"⇓",DoubleLeftArrow:"⇐",DoubleLeftRightArrow:"⇔",DoubleLeftTee:"⫤",DoubleLongLeftArrow:"⟸",DoubleLongLeftRightArrow:"⟺",DoubleLongRightArrow:"⟹",DoubleRightArrow:"⇒",DoubleRightTee:"⊨",DoubleUpArrow:"⇑",DoubleUpDownArrow:"⇕",DoubleVerticalBar:"∥",DownArrowBar:"⤓",downarrow:"↓",DownArrow:"↓",Downarrow:"⇓",DownArrowUpArrow:"⇵",DownBreve:"̑",downdownarrows:"⇊",downharpoonleft:"⇃",downharpoonright:"⇂",DownLeftRightVector:"⥐",DownLeftTeeVector:"⥞",DownLeftVectorBar:"⥖",DownLeftVector:"↽",DownRightTeeVector:"⥟",DownRightVectorBar:"⥗",DownRightVector:"⇁",DownTeeArrow:"↧",DownTee:"⊤",drbkarow:"⤐",drcorn:"⌟",drcrop:"⌌",Dscr:"𝒟",dscr:"𝒹",DScy:"Ѕ",dscy:"ѕ",dsol:"⧶",Dstrok:"Đ",dstrok:"đ",dtdot:"⋱",dtri:"▿",dtrif:"▾",duarr:"⇵",duhar:"⥯",dwangle:"⦦",DZcy:"Џ",dzcy:"џ",dzigrarr:"⟿",Eacute:"É",eacute:"é",easter:"⩮",Ecaron:"Ě",ecaron:"ě",Ecirc:"Ê",ecirc:"ê",ecir:"≖",ecolon:"≕",Ecy:"Э",ecy:"э",eDDot:"⩷",Edot:"Ė",edot:"ė",eDot:"≑",ee:"ⅇ",efDot:"≒",Efr:"𝔈",efr:"𝔢",eg:"⪚",Egrave:"È",egrave:"è",egs:"⪖",egsdot:"⪘",el:"⪙",Element:"∈",elinters:"⏧",ell:"ℓ",els:"⪕",elsdot:"⪗",Emacr:"Ē",emacr:"ē",empty:"∅",emptyset:"∅",EmptySmallSquare:"◻",emptyv:"∅",EmptyVerySmallSquare:"▫",emsp13:" ",emsp14:" ",emsp:" ",ENG:"Ŋ",eng:"ŋ",ensp:" ",Eogon:"Ę",eogon:"ę",Eopf:"𝔼",eopf:"𝕖",epar:"⋕",eparsl:"⧣",eplus:"⩱",epsi:"ε",Epsilon:"Ε",epsilon:"ε",epsiv:"ϵ",eqcirc:"≖",eqcolon:"≕",eqsim:"≂",eqslantgtr:"⪖",eqslantless:"⪕",Equal:"⩵",equals:"=",EqualTilde:"≂",equest:"≟",Equilibrium:"⇌",equiv:"≡",equivDD:"⩸",eqvparsl:"⧥",erarr:"⥱",erDot:"≓",escr:"ℯ",Escr:"ℰ",esdot:"≐",Esim:"⩳",esim:"≂",Eta:"Η",eta:"η",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",euro:"€",excl:"!",exist:"∃",Exists:"∃",expectation:"ℰ",exponentiale:"ⅇ",ExponentialE:"ⅇ",fallingdotseq:"≒",Fcy:"Ф",fcy:"ф",female:"♀",ffilig:"ffi",fflig:"ff",ffllig:"ffl",Ffr:"𝔉",ffr:"𝔣",filig:"fi",FilledSmallSquare:"◼",FilledVerySmallSquare:"▪",fjlig:"fj",flat:"♭",fllig:"fl",fltns:"▱",fnof:"ƒ",Fopf:"𝔽",fopf:"𝕗",forall:"∀",ForAll:"∀",fork:"⋔",forkv:"⫙",Fouriertrf:"ℱ",fpartint:"⨍",frac12:"½",frac13:"⅓",frac14:"¼",frac15:"⅕",frac16:"⅙",frac18:"⅛",frac23:"⅔",frac25:"⅖",frac34:"¾",frac35:"⅗",frac38:"⅜",frac45:"⅘",frac56:"⅚",frac58:"⅝",frac78:"⅞",frasl:"⁄",frown:"⌢",fscr:"𝒻",Fscr:"ℱ",gacute:"ǵ",Gamma:"Γ",gamma:"γ",Gammad:"Ϝ",gammad:"ϝ",gap:"⪆",Gbreve:"Ğ",gbreve:"ğ",Gcedil:"Ģ",Gcirc:"Ĝ",gcirc:"ĝ",Gcy:"Г",gcy:"г",Gdot:"Ġ",gdot:"ġ",ge:"≥",gE:"≧",gEl:"⪌",gel:"⋛",geq:"≥",geqq:"≧",geqslant:"⩾",gescc:"⪩",ges:"⩾",gesdot:"⪀",gesdoto:"⪂",gesdotol:"⪄",gesl:"⋛︀",gesles:"⪔",Gfr:"𝔊",gfr:"𝔤",gg:"≫",Gg:"⋙",ggg:"⋙",gimel:"ℷ",GJcy:"Ѓ",gjcy:"ѓ",gla:"⪥",gl:"≷",glE:"⪒",glj:"⪤",gnap:"⪊",gnapprox:"⪊",gne:"⪈",gnE:"≩",gneq:"⪈",gneqq:"≩",gnsim:"⋧",Gopf:"𝔾",gopf:"𝕘",grave:"`",GreaterEqual:"≥",GreaterEqualLess:"⋛",GreaterFullEqual:"≧",GreaterGreater:"⪢",GreaterLess:"≷",GreaterSlantEqual:"⩾",GreaterTilde:"≳",Gscr:"𝒢",gscr:"ℊ",gsim:"≳",gsime:"⪎",gsiml:"⪐",gtcc:"⪧",gtcir:"⩺",gt:">",GT:">",Gt:"≫",gtdot:"⋗",gtlPar:"⦕",gtquest:"⩼",gtrapprox:"⪆",gtrarr:"⥸",gtrdot:"⋗",gtreqless:"⋛",gtreqqless:"⪌",gtrless:"≷",gtrsim:"≳",gvertneqq:"≩︀",gvnE:"≩︀",Hacek:"ˇ",hairsp:" ",half:"½",hamilt:"ℋ",HARDcy:"Ъ",hardcy:"ъ",harrcir:"⥈",harr:"↔",hArr:"⇔",harrw:"↭",Hat:"^",hbar:"ℏ",Hcirc:"Ĥ",hcirc:"ĥ",hearts:"♥",heartsuit:"♥",hellip:"…",hercon:"⊹",hfr:"𝔥",Hfr:"ℌ",HilbertSpace:"ℋ",hksearow:"⤥",hkswarow:"⤦",hoarr:"⇿",homtht:"∻",hookleftarrow:"↩",hookrightarrow:"↪",hopf:"𝕙",Hopf:"ℍ",horbar:"―",HorizontalLine:"─",hscr:"𝒽",Hscr:"ℋ",hslash:"ℏ",Hstrok:"Ħ",hstrok:"ħ",HumpDownHump:"≎",HumpEqual:"≏",hybull:"⁃",hyphen:"‐",Iacute:"Í",iacute:"í",ic:"⁣",Icirc:"Î",icirc:"î",Icy:"И",icy:"и",Idot:"İ",IEcy:"Е",iecy:"е",iexcl:"¡",iff:"⇔",ifr:"𝔦",Ifr:"ℑ",Igrave:"Ì",igrave:"ì",ii:"ⅈ",iiiint:"⨌",iiint:"∭",iinfin:"⧜",iiota:"℩",IJlig:"IJ",ijlig:"ij",Imacr:"Ī",imacr:"ī",image:"ℑ",ImaginaryI:"ⅈ",imagline:"ℐ",imagpart:"ℑ",imath:"ı",Im:"ℑ",imof:"⊷",imped:"Ƶ",Implies:"⇒",incare:"℅",in:"∈",infin:"∞",infintie:"⧝",inodot:"ı",intcal:"⊺",int:"∫",Int:"∬",integers:"ℤ",Integral:"∫",intercal:"⊺",Intersection:"⋂",intlarhk:"⨗",intprod:"⨼",InvisibleComma:"⁣",InvisibleTimes:"⁢",IOcy:"Ё",iocy:"ё",Iogon:"Į",iogon:"į",Iopf:"𝕀",iopf:"𝕚",Iota:"Ι",iota:"ι",iprod:"⨼",iquest:"¿",iscr:"𝒾",Iscr:"ℐ",isin:"∈",isindot:"⋵",isinE:"⋹",isins:"⋴",isinsv:"⋳",isinv:"∈",it:"⁢",Itilde:"Ĩ",itilde:"ĩ",Iukcy:"І",iukcy:"і",Iuml:"Ï",iuml:"ï",Jcirc:"Ĵ",jcirc:"ĵ",Jcy:"Й",jcy:"й",Jfr:"𝔍",jfr:"𝔧",jmath:"ȷ",Jopf:"𝕁",jopf:"𝕛",Jscr:"𝒥",jscr:"𝒿",Jsercy:"Ј",jsercy:"ј",Jukcy:"Є",jukcy:"є",Kappa:"Κ",kappa:"κ",kappav:"ϰ",Kcedil:"Ķ",kcedil:"ķ",Kcy:"К",kcy:"к",Kfr:"𝔎",kfr:"𝔨",kgreen:"ĸ",KHcy:"Х",khcy:"х",KJcy:"Ќ",kjcy:"ќ",Kopf:"𝕂",kopf:"𝕜",Kscr:"𝒦",kscr:"𝓀",lAarr:"⇚",Lacute:"Ĺ",lacute:"ĺ",laemptyv:"⦴",lagran:"ℒ",Lambda:"Λ",lambda:"λ",lang:"⟨",Lang:"⟪",langd:"⦑",langle:"⟨",lap:"⪅",Laplacetrf:"ℒ",laquo:"«",larrb:"⇤",larrbfs:"⤟",larr:"←",Larr:"↞",lArr:"⇐",larrfs:"⤝",larrhk:"↩",larrlp:"↫",larrpl:"⤹",larrsim:"⥳",larrtl:"↢",latail:"⤙",lAtail:"⤛",lat:"⪫",late:"⪭",lates:"⪭︀",lbarr:"⤌",lBarr:"⤎",lbbrk:"❲",lbrace:"{",lbrack:"[",lbrke:"⦋",lbrksld:"⦏",lbrkslu:"⦍",Lcaron:"Ľ",lcaron:"ľ",Lcedil:"Ļ",lcedil:"ļ",lceil:"⌈",lcub:"{",Lcy:"Л",lcy:"л",ldca:"⤶",ldquo:"“",ldquor:"„",ldrdhar:"⥧",ldrushar:"⥋",ldsh:"↲",le:"≤",lE:"≦",LeftAngleBracket:"⟨",LeftArrowBar:"⇤",leftarrow:"←",LeftArrow:"←",Leftarrow:"⇐",LeftArrowRightArrow:"⇆",leftarrowtail:"↢",LeftCeiling:"⌈",LeftDoubleBracket:"⟦",LeftDownTeeVector:"⥡",LeftDownVectorBar:"⥙",LeftDownVector:"⇃",LeftFloor:"⌊",leftharpoondown:"↽",leftharpoonup:"↼",leftleftarrows:"⇇",leftrightarrow:"↔",LeftRightArrow:"↔",Leftrightarrow:"⇔",leftrightarrows:"⇆",leftrightharpoons:"⇋",leftrightsquigarrow:"↭",LeftRightVector:"⥎",LeftTeeArrow:"↤",LeftTee:"⊣",LeftTeeVector:"⥚",leftthreetimes:"⋋",LeftTriangleBar:"⧏",LeftTriangle:"⊲",LeftTriangleEqual:"⊴",LeftUpDownVector:"⥑",LeftUpTeeVector:"⥠",LeftUpVectorBar:"⥘",LeftUpVector:"↿",LeftVectorBar:"⥒",LeftVector:"↼",lEg:"⪋",leg:"⋚",leq:"≤",leqq:"≦",leqslant:"⩽",lescc:"⪨",les:"⩽",lesdot:"⩿",lesdoto:"⪁",lesdotor:"⪃",lesg:"⋚︀",lesges:"⪓",lessapprox:"⪅",lessdot:"⋖",lesseqgtr:"⋚",lesseqqgtr:"⪋",LessEqualGreater:"⋚",LessFullEqual:"≦",LessGreater:"≶",lessgtr:"≶",LessLess:"⪡",lesssim:"≲",LessSlantEqual:"⩽",LessTilde:"≲",lfisht:"⥼",lfloor:"⌊",Lfr:"𝔏",lfr:"𝔩",lg:"≶",lgE:"⪑",lHar:"⥢",lhard:"↽",lharu:"↼",lharul:"⥪",lhblk:"▄",LJcy:"Љ",ljcy:"љ",llarr:"⇇",ll:"≪",Ll:"⋘",llcorner:"⌞",Lleftarrow:"⇚",llhard:"⥫",lltri:"◺",Lmidot:"Ŀ",lmidot:"ŀ",lmoustache:"⎰",lmoust:"⎰",lnap:"⪉",lnapprox:"⪉",lne:"⪇",lnE:"≨",lneq:"⪇",lneqq:"≨",lnsim:"⋦",loang:"⟬",loarr:"⇽",lobrk:"⟦",longleftarrow:"⟵",LongLeftArrow:"⟵",Longleftarrow:"⟸",longleftrightarrow:"⟷",LongLeftRightArrow:"⟷",Longleftrightarrow:"⟺",longmapsto:"⟼",longrightarrow:"⟶",LongRightArrow:"⟶",Longrightarrow:"⟹",looparrowleft:"↫",looparrowright:"↬",lopar:"⦅",Lopf:"𝕃",lopf:"𝕝",loplus:"⨭",lotimes:"⨴",lowast:"∗",lowbar:"_",LowerLeftArrow:"↙",LowerRightArrow:"↘",loz:"◊",lozenge:"◊",lozf:"⧫",lpar:"(",lparlt:"⦓",lrarr:"⇆",lrcorner:"⌟",lrhar:"⇋",lrhard:"⥭",lrm:"‎",lrtri:"⊿",lsaquo:"‹",lscr:"𝓁",Lscr:"ℒ",lsh:"↰",Lsh:"↰",lsim:"≲",lsime:"⪍",lsimg:"⪏",lsqb:"[",lsquo:"‘",lsquor:"‚",Lstrok:"Ł",lstrok:"ł",ltcc:"⪦",ltcir:"⩹",lt:"<",LT:"<",Lt:"≪",ltdot:"⋖",lthree:"⋋",ltimes:"⋉",ltlarr:"⥶",ltquest:"⩻",ltri:"◃",ltrie:"⊴",ltrif:"◂",ltrPar:"⦖",lurdshar:"⥊",luruhar:"⥦",lvertneqq:"≨︀",lvnE:"≨︀",macr:"¯",male:"♂",malt:"✠",maltese:"✠",Map:"⤅",map:"↦",mapsto:"↦",mapstodown:"↧",mapstoleft:"↤",mapstoup:"↥",marker:"▮",mcomma:"⨩",Mcy:"М",mcy:"м",mdash:"—",mDDot:"∺",measuredangle:"∡",MediumSpace:" ",Mellintrf:"ℳ",Mfr:"𝔐",mfr:"𝔪",mho:"℧",micro:"µ",midast:"*",midcir:"⫰",mid:"∣",middot:"·",minusb:"⊟",minus:"−",minusd:"∸",minusdu:"⨪",MinusPlus:"∓",mlcp:"⫛",mldr:"…",mnplus:"∓",models:"⊧",Mopf:"𝕄",mopf:"𝕞",mp:"∓",mscr:"𝓂",Mscr:"ℳ",mstpos:"∾",Mu:"Μ",mu:"μ",multimap:"⊸",mumap:"⊸",nabla:"∇",Nacute:"Ń",nacute:"ń",nang:"∠⃒",nap:"≉",napE:"⩰̸",napid:"≋̸",napos:"ʼn",napprox:"≉",natural:"♮",naturals:"ℕ",natur:"♮",nbsp:" ",nbump:"≎̸",nbumpe:"≏̸",ncap:"⩃",Ncaron:"Ň",ncaron:"ň",Ncedil:"Ņ",ncedil:"ņ",ncong:"≇",ncongdot:"⩭̸",ncup:"⩂",Ncy:"Н",ncy:"н",ndash:"–",nearhk:"⤤",nearr:"↗",neArr:"⇗",nearrow:"↗",ne:"≠",nedot:"≐̸",NegativeMediumSpace:"​",NegativeThickSpace:"​",NegativeThinSpace:"​",NegativeVeryThinSpace:"​",nequiv:"≢",nesear:"⤨",nesim:"≂̸",NestedGreaterGreater:"≫",NestedLessLess:"≪",NewLine:"\n",nexist:"∄",nexists:"∄",Nfr:"𝔑",nfr:"𝔫",ngE:"≧̸",nge:"≱",ngeq:"≱",ngeqq:"≧̸",ngeqslant:"⩾̸",nges:"⩾̸",nGg:"⋙̸",ngsim:"≵",nGt:"≫⃒",ngt:"≯",ngtr:"≯",nGtv:"≫̸",nharr:"↮",nhArr:"⇎",nhpar:"⫲",ni:"∋",nis:"⋼",nisd:"⋺",niv:"∋",NJcy:"Њ",njcy:"њ",nlarr:"↚",nlArr:"⇍",nldr:"‥",nlE:"≦̸",nle:"≰",nleftarrow:"↚",nLeftarrow:"⇍",nleftrightarrow:"↮",nLeftrightarrow:"⇎",nleq:"≰",nleqq:"≦̸",nleqslant:"⩽̸",nles:"⩽̸",nless:"≮",nLl:"⋘̸",nlsim:"≴",nLt:"≪⃒",nlt:"≮",nltri:"⋪",nltrie:"⋬",nLtv:"≪̸",nmid:"∤",NoBreak:"⁠",NonBreakingSpace:" ",nopf:"𝕟",Nopf:"ℕ",Not:"⫬",not:"¬",NotCongruent:"≢",NotCupCap:"≭",NotDoubleVerticalBar:"∦",NotElement:"∉",NotEqual:"≠",NotEqualTilde:"≂̸",NotExists:"∄",NotGreater:"≯",NotGreaterEqual:"≱",NotGreaterFullEqual:"≧̸",NotGreaterGreater:"≫̸",NotGreaterLess:"≹",NotGreaterSlantEqual:"⩾̸",NotGreaterTilde:"≵",NotHumpDownHump:"≎̸",NotHumpEqual:"≏̸",notin:"∉",notindot:"⋵̸",notinE:"⋹̸",notinva:"∉",notinvb:"⋷",notinvc:"⋶",NotLeftTriangleBar:"⧏̸",NotLeftTriangle:"⋪",NotLeftTriangleEqual:"⋬",NotLess:"≮",NotLessEqual:"≰",NotLessGreater:"≸",NotLessLess:"≪̸",NotLessSlantEqual:"⩽̸",NotLessTilde:"≴",NotNestedGreaterGreater:"⪢̸",NotNestedLessLess:"⪡̸",notni:"∌",notniva:"∌",notnivb:"⋾",notnivc:"⋽",NotPrecedes:"⊀",NotPrecedesEqual:"⪯̸",NotPrecedesSlantEqual:"⋠",NotReverseElement:"∌",NotRightTriangleBar:"⧐̸",NotRightTriangle:"⋫",NotRightTriangleEqual:"⋭",NotSquareSubset:"⊏̸",NotSquareSubsetEqual:"⋢",NotSquareSuperset:"⊐̸",NotSquareSupersetEqual:"⋣",NotSubset:"⊂⃒",NotSubsetEqual:"⊈",NotSucceeds:"⊁",NotSucceedsEqual:"⪰̸",NotSucceedsSlantEqual:"⋡",NotSucceedsTilde:"≿̸",NotSuperset:"⊃⃒",NotSupersetEqual:"⊉",NotTilde:"≁",NotTildeEqual:"≄",NotTildeFullEqual:"≇",NotTildeTilde:"≉",NotVerticalBar:"∤",nparallel:"∦",npar:"∦",nparsl:"⫽⃥",npart:"∂̸",npolint:"⨔",npr:"⊀",nprcue:"⋠",nprec:"⊀",npreceq:"⪯̸",npre:"⪯̸",nrarrc:"⤳̸",nrarr:"↛",nrArr:"⇏",nrarrw:"↝̸",nrightarrow:"↛",nRightarrow:"⇏",nrtri:"⋫",nrtrie:"⋭",nsc:"⊁",nsccue:"⋡",nsce:"⪰̸",Nscr:"𝒩",nscr:"𝓃",nshortmid:"∤",nshortparallel:"∦",nsim:"≁",nsime:"≄",nsimeq:"≄",nsmid:"∤",nspar:"∦",nsqsube:"⋢",nsqsupe:"⋣",nsub:"⊄",nsubE:"⫅̸",nsube:"⊈",nsubset:"⊂⃒",nsubseteq:"⊈",nsubseteqq:"⫅̸",nsucc:"⊁",nsucceq:"⪰̸",nsup:"⊅",nsupE:"⫆̸",nsupe:"⊉",nsupset:"⊃⃒",nsupseteq:"⊉",nsupseteqq:"⫆̸",ntgl:"≹",Ntilde:"Ñ",ntilde:"ñ",ntlg:"≸",ntriangleleft:"⋪",ntrianglelefteq:"⋬",ntriangleright:"⋫",ntrianglerighteq:"⋭",Nu:"Ν",nu:"ν",num:"#",numero:"№",numsp:" ",nvap:"≍⃒",nvdash:"⊬",nvDash:"⊭",nVdash:"⊮",nVDash:"⊯",nvge:"≥⃒",nvgt:">⃒",nvHarr:"⤄",nvinfin:"⧞",nvlArr:"⤂",nvle:"≤⃒",nvlt:"<⃒",nvltrie:"⊴⃒",nvrArr:"⤃",nvrtrie:"⊵⃒",nvsim:"∼⃒",nwarhk:"⤣",nwarr:"↖",nwArr:"⇖",nwarrow:"↖",nwnear:"⤧",Oacute:"Ó",oacute:"ó",oast:"⊛",Ocirc:"Ô",ocirc:"ô",ocir:"⊚",Ocy:"О",ocy:"о",odash:"⊝",Odblac:"Ő",odblac:"ő",odiv:"⨸",odot:"⊙",odsold:"⦼",OElig:"Œ",oelig:"œ",ofcir:"⦿",Ofr:"𝔒",ofr:"𝔬",ogon:"˛",Ograve:"Ò",ograve:"ò",ogt:"⧁",ohbar:"⦵",ohm:"Ω",oint:"∮",olarr:"↺",olcir:"⦾",olcross:"⦻",oline:"‾",olt:"⧀",Omacr:"Ō",omacr:"ō",Omega:"Ω",omega:"ω",Omicron:"Ο",omicron:"ο",omid:"⦶",ominus:"⊖",Oopf:"𝕆",oopf:"𝕠",opar:"⦷",OpenCurlyDoubleQuote:"“",OpenCurlyQuote:"‘",operp:"⦹",oplus:"⊕",orarr:"↻",Or:"⩔",or:"∨",ord:"⩝",order:"ℴ",orderof:"ℴ",ordf:"ª",ordm:"º",origof:"⊶",oror:"⩖",orslope:"⩗",orv:"⩛",oS:"Ⓢ",Oscr:"𝒪",oscr:"ℴ",Oslash:"Ø",oslash:"ø",osol:"⊘",Otilde:"Õ",otilde:"õ",otimesas:"⨶",Otimes:"⨷",otimes:"⊗",Ouml:"Ö",ouml:"ö",ovbar:"⌽",OverBar:"‾",OverBrace:"⏞",OverBracket:"⎴",OverParenthesis:"⏜",para:"¶",parallel:"∥",par:"∥",parsim:"⫳",parsl:"⫽",part:"∂",PartialD:"∂",Pcy:"П",pcy:"п",percnt:"%",period:".",permil:"‰",perp:"⊥",pertenk:"‱",Pfr:"𝔓",pfr:"𝔭",Phi:"Φ",phi:"φ",phiv:"ϕ",phmmat:"ℳ",phone:"☎",Pi:"Π",pi:"π",pitchfork:"⋔",piv:"ϖ",planck:"ℏ",planckh:"ℎ",plankv:"ℏ",plusacir:"⨣",plusb:"⊞",pluscir:"⨢",plus:"+",plusdo:"∔",plusdu:"⨥",pluse:"⩲",PlusMinus:"±",plusmn:"±",plussim:"⨦",plustwo:"⨧",pm:"±",Poincareplane:"ℌ",pointint:"⨕",popf:"𝕡",Popf:"ℙ",pound:"£",prap:"⪷",Pr:"⪻",pr:"≺",prcue:"≼",precapprox:"⪷",prec:"≺",preccurlyeq:"≼",Precedes:"≺",PrecedesEqual:"⪯",PrecedesSlantEqual:"≼",PrecedesTilde:"≾",preceq:"⪯",precnapprox:"⪹",precneqq:"⪵",precnsim:"⋨",pre:"⪯",prE:"⪳",precsim:"≾",prime:"′",Prime:"″",primes:"ℙ",prnap:"⪹",prnE:"⪵",prnsim:"⋨",prod:"∏",Product:"∏",profalar:"⌮",profline:"⌒",profsurf:"⌓",prop:"∝",Proportional:"∝",Proportion:"∷",propto:"∝",prsim:"≾",prurel:"⊰",Pscr:"𝒫",pscr:"𝓅",Psi:"Ψ",psi:"ψ",puncsp:" ",Qfr:"𝔔",qfr:"𝔮",qint:"⨌",qopf:"𝕢",Qopf:"ℚ",qprime:"⁗",Qscr:"𝒬",qscr:"𝓆",quaternions:"ℍ",quatint:"⨖",quest:"?",questeq:"≟",quot:'"',QUOT:'"',rAarr:"⇛",race:"∽̱",Racute:"Ŕ",racute:"ŕ",radic:"√",raemptyv:"⦳",rang:"⟩",Rang:"⟫",rangd:"⦒",range:"⦥",rangle:"⟩",raquo:"»",rarrap:"⥵",rarrb:"⇥",rarrbfs:"⤠",rarrc:"⤳",rarr:"→",Rarr:"↠",rArr:"⇒",rarrfs:"⤞",rarrhk:"↪",rarrlp:"↬",rarrpl:"⥅",rarrsim:"⥴",Rarrtl:"⤖",rarrtl:"↣",rarrw:"↝",ratail:"⤚",rAtail:"⤜",ratio:"∶",rationals:"ℚ",rbarr:"⤍",rBarr:"⤏",RBarr:"⤐",rbbrk:"❳",rbrace:"}",rbrack:"]",rbrke:"⦌",rbrksld:"⦎",rbrkslu:"⦐",Rcaron:"Ř",rcaron:"ř",Rcedil:"Ŗ",rcedil:"ŗ",rceil:"⌉",rcub:"}",Rcy:"Р",rcy:"р",rdca:"⤷",rdldhar:"⥩",rdquo:"”",rdquor:"”",rdsh:"↳",real:"ℜ",realine:"ℛ",realpart:"ℜ",reals:"ℝ",Re:"ℜ",rect:"▭",reg:"®",REG:"®",ReverseElement:"∋",ReverseEquilibrium:"⇋",ReverseUpEquilibrium:"⥯",rfisht:"⥽",rfloor:"⌋",rfr:"𝔯",Rfr:"ℜ",rHar:"⥤",rhard:"⇁",rharu:"⇀",rharul:"⥬",Rho:"Ρ",rho:"ρ",rhov:"ϱ",RightAngleBracket:"⟩",RightArrowBar:"⇥",rightarrow:"→",RightArrow:"→",Rightarrow:"⇒",RightArrowLeftArrow:"⇄",rightarrowtail:"↣",RightCeiling:"⌉",RightDoubleBracket:"⟧",RightDownTeeVector:"⥝",RightDownVectorBar:"⥕",RightDownVector:"⇂",RightFloor:"⌋",rightharpoondown:"⇁",rightharpoonup:"⇀",rightleftarrows:"⇄",rightleftharpoons:"⇌",rightrightarrows:"⇉",rightsquigarrow:"↝",RightTeeArrow:"↦",RightTee:"⊢",RightTeeVector:"⥛",rightthreetimes:"⋌",RightTriangleBar:"⧐",RightTriangle:"⊳",RightTriangleEqual:"⊵",RightUpDownVector:"⥏",RightUpTeeVector:"⥜",RightUpVectorBar:"⥔",RightUpVector:"↾",RightVectorBar:"⥓",RightVector:"⇀",ring:"˚",risingdotseq:"≓",rlarr:"⇄",rlhar:"⇌",rlm:"‏",rmoustache:"⎱",rmoust:"⎱",rnmid:"⫮",roang:"⟭",roarr:"⇾",robrk:"⟧",ropar:"⦆",ropf:"𝕣",Ropf:"ℝ",roplus:"⨮",rotimes:"⨵",RoundImplies:"⥰",rpar:")",rpargt:"⦔",rppolint:"⨒",rrarr:"⇉",Rrightarrow:"⇛",rsaquo:"›",rscr:"𝓇",Rscr:"ℛ",rsh:"↱",Rsh:"↱",rsqb:"]",rsquo:"’",rsquor:"’",rthree:"⋌",rtimes:"⋊",rtri:"▹",rtrie:"⊵",rtrif:"▸",rtriltri:"⧎",RuleDelayed:"⧴",ruluhar:"⥨",rx:"℞",Sacute:"Ś",sacute:"ś",sbquo:"‚",scap:"⪸",Scaron:"Š",scaron:"š",Sc:"⪼",sc:"≻",sccue:"≽",sce:"⪰",scE:"⪴",Scedil:"Ş",scedil:"ş",Scirc:"Ŝ",scirc:"ŝ",scnap:"⪺",scnE:"⪶",scnsim:"⋩",scpolint:"⨓",scsim:"≿",Scy:"С",scy:"с",sdotb:"⊡",sdot:"⋅",sdote:"⩦",searhk:"⤥",searr:"↘",seArr:"⇘",searrow:"↘",sect:"§",semi:";",seswar:"⤩",setminus:"∖",setmn:"∖",sext:"✶",Sfr:"𝔖",sfr:"𝔰",sfrown:"⌢",sharp:"♯",SHCHcy:"Щ",shchcy:"щ",SHcy:"Ш",shcy:"ш",ShortDownArrow:"↓",ShortLeftArrow:"←",shortmid:"∣",shortparallel:"∥",ShortRightArrow:"→",ShortUpArrow:"↑",shy:"­",Sigma:"Σ",sigma:"σ",sigmaf:"ς",sigmav:"ς",sim:"∼",simdot:"⩪",sime:"≃",simeq:"≃",simg:"⪞",simgE:"⪠",siml:"⪝",simlE:"⪟",simne:"≆",simplus:"⨤",simrarr:"⥲",slarr:"←",SmallCircle:"∘",smallsetminus:"∖",smashp:"⨳",smeparsl:"⧤",smid:"∣",smile:"⌣",smt:"⪪",smte:"⪬",smtes:"⪬︀",SOFTcy:"Ь",softcy:"ь",solbar:"⌿",solb:"⧄",sol:"/",Sopf:"𝕊",sopf:"𝕤",spades:"♠",spadesuit:"♠",spar:"∥",sqcap:"⊓",sqcaps:"⊓︀",sqcup:"⊔",sqcups:"⊔︀",Sqrt:"√",sqsub:"⊏",sqsube:"⊑",sqsubset:"⊏",sqsubseteq:"⊑",sqsup:"⊐",sqsupe:"⊒",sqsupset:"⊐",sqsupseteq:"⊒",square:"□",Square:"□",SquareIntersection:"⊓",SquareSubset:"⊏",SquareSubsetEqual:"⊑",SquareSuperset:"⊐",SquareSupersetEqual:"⊒",SquareUnion:"⊔",squarf:"▪",squ:"□",squf:"▪",srarr:"→",Sscr:"𝒮",sscr:"𝓈",ssetmn:"∖",ssmile:"⌣",sstarf:"⋆",Star:"⋆",star:"☆",starf:"★",straightepsilon:"ϵ",straightphi:"ϕ",strns:"¯",sub:"⊂",Sub:"⋐",subdot:"⪽",subE:"⫅",sube:"⊆",subedot:"⫃",submult:"⫁",subnE:"⫋",subne:"⊊",subplus:"⪿",subrarr:"⥹",subset:"⊂",Subset:"⋐",subseteq:"⊆",subseteqq:"⫅",SubsetEqual:"⊆",subsetneq:"⊊",subsetneqq:"⫋",subsim:"⫇",subsub:"⫕",subsup:"⫓",succapprox:"⪸",succ:"≻",succcurlyeq:"≽",Succeeds:"≻",SucceedsEqual:"⪰",SucceedsSlantEqual:"≽",SucceedsTilde:"≿",succeq:"⪰",succnapprox:"⪺",succneqq:"⪶",succnsim:"⋩",succsim:"≿",SuchThat:"∋",sum:"∑",Sum:"∑",sung:"♪",sup1:"¹",sup2:"²",sup3:"³",sup:"⊃",Sup:"⋑",supdot:"⪾",supdsub:"⫘",supE:"⫆",supe:"⊇",supedot:"⫄",Superset:"⊃",SupersetEqual:"⊇",suphsol:"⟉",suphsub:"⫗",suplarr:"⥻",supmult:"⫂",supnE:"⫌",supne:"⊋",supplus:"⫀",supset:"⊃",Supset:"⋑",supseteq:"⊇",supseteqq:"⫆",supsetneq:"⊋",supsetneqq:"⫌",supsim:"⫈",supsub:"⫔",supsup:"⫖",swarhk:"⤦",swarr:"↙",swArr:"⇙",swarrow:"↙",swnwar:"⤪",szlig:"ß",Tab:"\t",target:"⌖",Tau:"Τ",tau:"τ",tbrk:"⎴",Tcaron:"Ť",tcaron:"ť",Tcedil:"Ţ",tcedil:"ţ",Tcy:"Т",tcy:"т",tdot:"⃛",telrec:"⌕",Tfr:"𝔗",tfr:"𝔱",there4:"∴",therefore:"∴",Therefore:"∴",Theta:"Θ",theta:"θ",thetasym:"ϑ",thetav:"ϑ",thickapprox:"≈",thicksim:"∼",ThickSpace:"  ",ThinSpace:" ",thinsp:" ",thkap:"≈",thksim:"∼",THORN:"Þ",thorn:"þ",tilde:"˜",Tilde:"∼",TildeEqual:"≃",TildeFullEqual:"≅",TildeTilde:"≈",timesbar:"⨱",timesb:"⊠",times:"×",timesd:"⨰",tint:"∭",toea:"⤨",topbot:"⌶",topcir:"⫱",top:"⊤",Topf:"𝕋",topf:"𝕥",topfork:"⫚",tosa:"⤩",tprime:"‴",trade:"™",TRADE:"™",triangle:"▵",triangledown:"▿",triangleleft:"◃",trianglelefteq:"⊴",triangleq:"≜",triangleright:"▹",trianglerighteq:"⊵",tridot:"◬",trie:"≜",triminus:"⨺",TripleDot:"⃛",triplus:"⨹",trisb:"⧍",tritime:"⨻",trpezium:"⏢",Tscr:"𝒯",tscr:"𝓉",TScy:"Ц",tscy:"ц",TSHcy:"Ћ",tshcy:"ћ",Tstrok:"Ŧ",tstrok:"ŧ",twixt:"≬",twoheadleftarrow:"↞",twoheadrightarrow:"↠",Uacute:"Ú",uacute:"ú",uarr:"↑",Uarr:"↟",uArr:"⇑",Uarrocir:"⥉",Ubrcy:"Ў",ubrcy:"ў",Ubreve:"Ŭ",ubreve:"ŭ",Ucirc:"Û",ucirc:"û",Ucy:"У",ucy:"у",udarr:"⇅",Udblac:"Ű",udblac:"ű",udhar:"⥮",ufisht:"⥾",Ufr:"𝔘",ufr:"𝔲",Ugrave:"Ù",ugrave:"ù",uHar:"⥣",uharl:"↿",uharr:"↾",uhblk:"▀",ulcorn:"⌜",ulcorner:"⌜",ulcrop:"⌏",ultri:"◸",Umacr:"Ū",umacr:"ū",uml:"¨",UnderBar:"_",UnderBrace:"⏟",UnderBracket:"⎵",UnderParenthesis:"⏝",Union:"⋃",UnionPlus:"⊎",Uogon:"Ų",uogon:"ų",Uopf:"𝕌",uopf:"𝕦",UpArrowBar:"⤒",uparrow:"↑",UpArrow:"↑",Uparrow:"⇑",UpArrowDownArrow:"⇅",updownarrow:"↕",UpDownArrow:"↕",Updownarrow:"⇕",UpEquilibrium:"⥮",upharpoonleft:"↿",upharpoonright:"↾",uplus:"⊎",UpperLeftArrow:"↖",UpperRightArrow:"↗",upsi:"υ",Upsi:"ϒ",upsih:"ϒ",Upsilon:"Υ",upsilon:"υ",UpTeeArrow:"↥",UpTee:"⊥",upuparrows:"⇈",urcorn:"⌝",urcorner:"⌝",urcrop:"⌎",Uring:"Ů",uring:"ů",urtri:"◹",Uscr:"𝒰",uscr:"𝓊",utdot:"⋰",Utilde:"Ũ",utilde:"ũ",utri:"▵",utrif:"▴",uuarr:"⇈",Uuml:"Ü",uuml:"ü",uwangle:"⦧",vangrt:"⦜",varepsilon:"ϵ",varkappa:"ϰ",varnothing:"∅",varphi:"ϕ",varpi:"ϖ",varpropto:"∝",varr:"↕",vArr:"⇕",varrho:"ϱ",varsigma:"ς",varsubsetneq:"⊊︀",varsubsetneqq:"⫋︀",varsupsetneq:"⊋︀",varsupsetneqq:"⫌︀",vartheta:"ϑ",vartriangleleft:"⊲",vartriangleright:"⊳",vBar:"⫨",Vbar:"⫫",vBarv:"⫩",Vcy:"В",vcy:"в",vdash:"⊢",vDash:"⊨",Vdash:"⊩",VDash:"⊫",Vdashl:"⫦",veebar:"⊻",vee:"∨",Vee:"⋁",veeeq:"≚",vellip:"⋮",verbar:"|",Verbar:"‖",vert:"|",Vert:"‖",VerticalBar:"∣",VerticalLine:"|",VerticalSeparator:"❘",VerticalTilde:"≀",VeryThinSpace:" ",Vfr:"𝔙",vfr:"𝔳",vltri:"⊲",vnsub:"⊂⃒",vnsup:"⊃⃒",Vopf:"𝕍",vopf:"𝕧",vprop:"∝",vrtri:"⊳",Vscr:"𝒱",vscr:"𝓋",vsubnE:"⫋︀",vsubne:"⊊︀",vsupnE:"⫌︀",vsupne:"⊋︀",Vvdash:"⊪",vzigzag:"⦚",Wcirc:"Ŵ",wcirc:"ŵ",wedbar:"⩟",wedge:"∧",Wedge:"⋀",wedgeq:"≙",weierp:"℘",Wfr:"𝔚",wfr:"𝔴",Wopf:"𝕎",wopf:"𝕨",wp:"℘",wr:"≀",wreath:"≀",Wscr:"𝒲",wscr:"𝓌",xcap:"⋂",xcirc:"◯",xcup:"⋃",xdtri:"▽",Xfr:"𝔛",xfr:"𝔵",xharr:"⟷",xhArr:"⟺",Xi:"Ξ",xi:"ξ",xlarr:"⟵",xlArr:"⟸",xmap:"⟼",xnis:"⋻",xodot:"⨀",Xopf:"𝕏",xopf:"𝕩",xoplus:"⨁",xotime:"⨂",xrarr:"⟶",xrArr:"⟹",Xscr:"𝒳",xscr:"𝓍",xsqcup:"⨆",xuplus:"⨄",xutri:"△",xvee:"⋁",xwedge:"⋀",Yacute:"Ý",yacute:"ý",YAcy:"Я",yacy:"я",Ycirc:"Ŷ",ycirc:"ŷ",Ycy:"Ы",ycy:"ы",yen:"¥",Yfr:"𝔜",yfr:"𝔶",YIcy:"Ї",yicy:"ї",Yopf:"𝕐",yopf:"𝕪",Yscr:"𝒴",yscr:"𝓎",YUcy:"Ю",yucy:"ю",yuml:"ÿ",Yuml:"Ÿ",Zacute:"Ź",zacute:"ź",Zcaron:"Ž",zcaron:"ž",Zcy:"З",zcy:"з",Zdot:"Ż",zdot:"ż",zeetrf:"ℨ",ZeroWidthSpace:"​",Zeta:"Ζ",zeta:"ζ",zfr:"𝔷",Zfr:"ℨ",ZHcy:"Ж",zhcy:"ж",zigrarr:"⇝",zopf:"𝕫",Zopf:"ℤ",Zscr:"𝒵",zscr:"𝓏",zwj:"‍",zwnj:"‌"}},function(e,t){e.exports={amp:"&",apos:"'",gt:">",lt:"<",quot:'"'}},function(e,t,n){"use strict";var r=n(722),i=n(65),o=n(115),a=Array.prototype.indexOf,s=Object.prototype.hasOwnProperty,u=Math.abs,l=Math.floor;e.exports=function(e){var t,n,c,p;if(!r(e))return a.apply(this,arguments);for(n=i(o(this).length),c=arguments[1],c=isNaN(c)?0:c>=0?l(c):i(this.length)-l(u(c)),t=c;t<n;++t)if(s.call(this,t)&&(p=this[t],r(p)))return t;return-1}},function(e,t,n){"use strict";e.exports=n(713)()?Array.from:n(714)},function(e,t,n){"use strict";function r(e,t){return e===t?0!==e||0!==t||1/e==1/t:e!==e&&t!==t}function i(e,t){if(r(e,t))return!0;if("object"!=typeof e||null===e||"object"!=typeof t||null===t)return!1;var n=Object.keys(e),i=Object.keys(t);if(n.length!==i.length)return!1;for(var a=0;a<n.length;a++)if(!o.call(t,n[a])||!r(e[n[a]],t[n[a]]))return!1;return!0}var o=Object.prototype.hasOwnProperty;e.exports=i},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(765),o=r(i),a=n(768),s=r(a),u=n(767),l=r(u),c=n(769),p=r(c),f=n(770),h=r(f),d=n(771),m=r(d),v=n(772),g=r(v),y=n(773),_=r(y),b=n(774),x=r(b),w=n(775),k=r(w),E=n(776),S=r(E),C=n(778),A=r(C),D=n(766),O=r(D),M=[l.default,s.default,p.default,m.default,g.default,_.default,x.default,k.default,S.default,h.default],T=(0,o.default)({prefixMap:O.default.prefixMap,plugins:M},A.default);t.default=T,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e.charAt(0).toUpperCase()+e.slice(1)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";var r=n(795);e.exports=r},function(e,t,n){"use strict";var r=n(81);e.exports=new r({explicit:[n(813),n(811),n(806)]})},function(e,t,n){var r=n(67),i=n(43),o=r(i,"Map");e.exports=o},function(e,t,n){function r(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}var i=n(916),o=n(917),a=n(918),s=n(919),u=n(920);r.prototype.clear=i,r.prototype.delete=o,r.prototype.get=a,r.prototype.has=s,r.prototype.set=u,e.exports=r},function(e,t,n){function r(e){var t=this.__data__=new i(e);this.size=t.size}var i=n(146),o=n(930),a=n(931),s=n(932),u=n(933),l=n(934);r.prototype.clear=o,r.prototype.delete=a,r.prototype.get=s,r.prototype.has=u,r.prototype.set=l,e.exports=r},function(e,t){function n(e,t){for(var n=-1,r=t.length,i=e.length;++n<r;)e[i+n]=t[n];return e}e.exports=n},function(e,t,n){var r=n(849),i=n(887),o=i(r);e.exports=o},function(e,t,n){function r(e){var t=new e.constructor(e.byteLength);return new i(t).set(new i(e)),t}var i=n(392);e.exports=r},function(e,t,n){var r=n(222),i=r(Object.getPrototypeOf,Object);e.exports=i},function(e,t,n){var r=n(222),i=n(426),o=Object.getOwnPropertySymbols,a=o?r(o,Object):i;e.exports=a},function(e,t,n){function r(e,t){if(i(e))return!1;var n=typeof e;return!("number"!=n&&"symbol"!=n&&"boolean"!=n&&null!=e&&!o(e))||(s.test(e)||!a.test(e)||null!=t&&e in Object(t))}var i=n(20),o=n(155),a=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,s=/^\w*$/;e.exports=r},function(e,t){function n(e,t){return function(n){return e(t(n))}}e.exports=n},function(e,t,n){var r=n(890),i=n(945),o=r(i);e.exports=o},function(e,t,n){function r(e,t,n){var r=null==e?void 0:i(e,t);return void 0===r?n:r}var i=n(150);e.exports=r},function(e,t){function n(e){return e}e.exports=n},function(e,t,n){var r=n(851),i=n(68),o=Object.prototype,a=o.hasOwnProperty,s=o.propertyIsEnumerable,u=r(function(){return arguments}())?r:function(e){return i(e)&&a.call(e,"callee")&&!s.call(e,"callee")};e.exports=u},function(e,t,n){(function(e){var r=n(43),i=n(957),o="object"==typeof t&&t&&!t.nodeType&&t,a=o&&"object"==typeof e&&e&&!e.nodeType&&e,s=a&&a.exports===o,u=s?r.Buffer:void 0,l=u?u.isBuffer:void 0,c=l||i;e.exports=c}).call(t,n(72)(e))},function(e,t){function n(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=r}var r=9007199254740991;e.exports=n},function(e,t,n){"use strict";(function(t,n){var r,i;r=function(e){if("function"!=typeof e)throw new TypeError(e+" is not a function");return e},i=function(e){var t,n,i=document.createTextNode(""),o=0;return new e(function(){var e;if(t)n&&(t=n.concat(t));else{if(!n)return;t=n}if(n=t,t=null,"function"==typeof n)return e=n,n=null,void e();for(i.data=o=++o%2;n;)e=n.shift(),n.length||(n=null),e()}).observe(i,{characterData:!0}),function(e){if(r(e),t)return void("function"==typeof t?t=[t,e]:t.push(e));t=e,i.data=o=++o%2}},e.exports=function(){if("object"==typeof t&&t&&"function"==typeof t.nextTick)return t.nextTick;if("object"==typeof document&&document){if("function"==typeof MutationObserver)return i(MutationObserver);if("function"==typeof WebKitMutationObserver)return i(WebKitMutationObserver)}return"function"==typeof n?function(e){n(r(e))}:"function"==typeof setTimeout||"object"==typeof setTimeout?function(e){setTimeout(r(e),0)}:null}()}).call(t,n(33),n(496).setImmediate)},function(e,t,n){(function(e){function n(e,t){for(var n=0,r=e.length-1;r>=0;r--){var i=e[r];"."===i?e.splice(r,1):".."===i?(e.splice(r,1),n++):n&&(e.splice(r,1),n--)}if(t)for(;n--;n)e.unshift("..");return e}function r(e,t){if(e.filter)return e.filter(t);for(var n=[],r=0;r<e.length;r++)t(e[r],r,e)&&n.push(e[r]);return n}var i=/^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/,o=function(e){return i.exec(e).slice(1)};t.resolve=function(){for(var t="",i=!1,o=arguments.length-1;o>=-1&&!i;o--){var a=o>=0?arguments[o]:e.cwd();if("string"!=typeof a)throw new TypeError("Arguments to path.resolve must be strings");a&&(t=a+"/"+t,i="/"===a.charAt(0))}return t=n(r(t.split("/"),function(e){return!!e}),!i).join("/"),(i?"/":"")+t||"."},t.normalize=function(e){var i=t.isAbsolute(e),o="/"===a(e,-1);return e=n(r(e.split("/"),function(e){return!!e}),!i).join("/"),e||i||(e="."),e&&o&&(e+="/"),(i?"/":"")+e},t.isAbsolute=function(e){return"/"===e.charAt(0)},t.join=function(){var e=Array.prototype.slice.call(arguments,0);return t.normalize(r(e,function(e,t){if("string"!=typeof e)throw new TypeError("Arguments to path.join must be strings");return e}).join("/"))},t.relative=function(e,n){function r(e){for(var t=0;t<e.length&&""===e[t];t++);for(var n=e.length-1;n>=0&&""===e[n];n--);return t>n?[]:e.slice(t,n-t+1)}e=t.resolve(e).substr(1),n=t.resolve(n).substr(1);for(var i=r(e.split("/")),o=r(n.split("/")),a=Math.min(i.length,o.length),s=a,u=0;u<a;u++)if(i[u]!==o[u]){s=u;break}for(var l=[],u=s;u<i.length;u++)l.push("..");return l=l.concat(o.slice(s)),l.join("/")},t.sep="/",t.delimiter=":",t.dirname=function(e){var t=o(e),n=t[0],r=t[1];return n||r?(r&&(r=r.substr(0,r.length-1)),n+r):"."},t.basename=function(e,t){var n=o(e)[2];return t&&n.substr(-1*t.length)===t&&(n=n.substr(0,n.length-t.length)),n},t.extname=function(e){return o(e)[3]};var a="b"==="ab".substr(-1)?function(e,t,n){return e.substr(t,n)}:function(e,t,n){return t<0&&(t=e.length+t),e.substr(t,n)}}).call(t,n(33))},function(e,t,n){(function(t){(function(){var n,r,i;"undefined"!=typeof performance&&null!==performance&&performance.now?e.exports=function(){return performance.now()}:void 0!==t&&null!==t&&t.hrtime?(e.exports=function(){return(n()-i)/1e6},r=t.hrtime,n=function(){var e;return e=r(),1e9*e[0]+e[1]},i=n()):Date.now?(e.exports=function(){return Date.now()-i},i=Date.now()):(e.exports=function(){return(new Date).getTime()-i},i=(new Date).getTime())}).call(this)}).call(t,n(33))},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=n(235),s=function(e){return e&&e.__esModule?e:{default:e}}(a),u=function(e){function t(n){r(this,t);var o=i(this,e.call(this,n));return o.type="comment",o}return o(t,e),t}(s.default);t.default=u,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function s(e){return e.map(function(e){return e.nodes&&(e.nodes=s(e.nodes)),delete e.source,e})}t.__esModule=!0;var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),l=n(234),c=r(l),p=n(232),f=r(p),h=n(235),d=r(h),m=function(e){function t(){return i(this,t),o(this,e.apply(this,arguments))}return a(t,e),t.prototype.push=function(e){return e.parent=this,this.nodes.push(e),this},t.prototype.each=function(e){this.lastEach||(this.lastEach=0),this.indexes||(this.indexes={}),this.lastEach+=1;var t=this.lastEach;if(this.indexes[t]=0,this.nodes){for(var n=void 0,r=void 0;this.indexes[t]<this.nodes.length&&(n=this.indexes[t],!1!==(r=e(this.nodes[n],n)));)this.indexes[t]+=1;return delete this.indexes[t],r}},t.prototype.walk=function(e){return this.each(function(t,n){var r=e(t,n);return!1!==r&&t.walk&&(r=t.walk(e)),r})},t.prototype.walkDecls=function(e,t){return t?e instanceof RegExp?this.walk(function(n,r){if("decl"===n.type&&e.test(n.prop))return t(n,r)}):this.walk(function(n,r){if("decl"===n.type&&n.prop===e)return t(n,r)}):(t=e,this.walk(function(e,n){if("decl"===e.type)return t(e,n)}))},t.prototype.walkRules=function(e,t){return t?e instanceof RegExp?this.walk(function(n,r){if("rule"===n.type&&e.test(n.selector))return t(n,r)}):this.walk(function(n,r){if("rule"===n.type&&n.selector===e)return t(n,r)}):(t=e,this.walk(function(e,n){if("rule"===e.type)return t(e,n)}))},t.prototype.walkAtRules=function(e,t){return t?e instanceof RegExp?this.walk(function(n,r){if("atrule"===n.type&&e.test(n.name))return t(n,r)}):this.walk(function(n,r){if("atrule"===n.type&&n.name===e)return t(n,r)}):(t=e,this.walk(function(e,n){if("atrule"===e.type)return t(e,n)}))},t.prototype.walkComments=function(e){return this.walk(function(t,n){if("comment"===t.type)return e(t,n)})},t.prototype.append=function(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];for(var r=t,i=Array.isArray(r),o=0,r=i?r:r[Symbol.iterator]();;){var a;if(i){if(o>=r.length)break;a=r[o++]}else{if(o=r.next(),o.done)break;a=o.value}for(var s=a,u=this.normalize(s,this.last),l=u,c=Array.isArray(l),p=0,l=c?l:l[Symbol.iterator]();;){var f;if(c){if(p>=l.length)break;f=l[p++]}else{if(p=l.next(),p.done)break;f=p.value}var h=f;this.nodes.push(h)}}return this},t.prototype.prepend=function(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];t=t.reverse();for(var r=t,i=Array.isArray(r),o=0,r=i?r:r[Symbol.iterator]();;){var a;if(i){if(o>=r.length)break;a=r[o++]}else{if(o=r.next(),o.done)break;a=o.value}for(var s=a,u=this.normalize(s,this.first,"prepend").reverse(),l=u,c=Array.isArray(l),p=0,l=c?l:l[Symbol.iterator]();;){var f;if(c){if(p>=l.length)break;f=l[p++]}else{if(p=l.next(),p.done)break;f=p.value}var h=f;this.nodes.unshift(h)}for(var d in this.indexes)this.indexes[d]=this.indexes[d]+u.length}return this},t.prototype.cleanRaws=function(t){if(e.prototype.cleanRaws.call(this,t),this.nodes)for(var n=this.nodes,r=Array.isArray(n),i=0,n=r?n:n[Symbol.iterator]();;){var o;if(r){if(i>=n.length)break;o=n[i++]}else{if(i=n.next(),i.done)break;o=i.value}var a=o;a.cleanRaws(t)}},t.prototype.insertBefore=function(e,t){e=this.index(e);for(var n=0===e&&"prepend",r=this.normalize(t,this.nodes[e],n).reverse(),i=r,o=Array.isArray(i),a=0,i=o?i:i[Symbol.iterator]();;){var s;if(o){if(a>=i.length)break;s=i[a++]}else{if(a=i.next(),a.done)break;s=a.value}var u=s;this.nodes.splice(e,0,u)}var l=void 0;for(var c in this.indexes)l=this.indexes[c],e<=l&&(this.indexes[c]=l+r.length);return this},t.prototype.insertAfter=function(e,t){e=this.index(e);for(var n=this.normalize(t,this.nodes[e]).reverse(),r=n,i=Array.isArray(r),o=0,r=i?r:r[Symbol.iterator]();;){var a;if(i){if(o>=r.length)break;a=r[o++]}else{if(o=r.next(),o.done)break;a=o.value}var s=a;this.nodes.splice(e+1,0,s)}var u=void 0;for(var l in this.indexes)u=this.indexes[l],e<u&&(this.indexes[l]=u+n.length);return this},t.prototype.removeChild=function(e){e=this.index(e),this.nodes[e].parent=void 0,this.nodes.splice(e,1);var t=void 0;for(var n in this.indexes)(t=this.indexes[n])>=e&&(this.indexes[n]=t-1);return this},t.prototype.removeAll=function(){for(var e=this.nodes,t=Array.isArray(e),n=0,e=t?e:e[Symbol.iterator]();;){var r;if(t){if(n>=e.length)break;r=e[n++]}else{if(n=e.next(),n.done)break;r=n.value}r.parent=void 0}return this.nodes=[],this},t.prototype.replaceValues=function(e,t,n){return n||(n=t,t={}),this.walkDecls(function(r){t.props&&-1===t.props.indexOf(r.prop)||t.fast&&-1===r.value.indexOf(t.fast)||(r.value=r.value.replace(e,n))}),this},t.prototype.every=function(e){return this.nodes.every(e)},t.prototype.some=function(e){return this.nodes.some(e)},t.prototype.index=function(e){return"number"==typeof e?e:this.nodes.indexOf(e)},t.prototype.normalize=function(e,t){var r=this;if("string"==typeof e){e=s(n(236)(e).nodes)}else if(Array.isArray(e)){e=e.slice(0);for(var i=e,o=Array.isArray(i),a=0,i=o?i:i[Symbol.iterator]();;){var u;if(o){if(a>=i.length)break;u=i[a++]}else{if(a=i.next(),a.done)break;u=a.value}var l=u;l.parent&&l.parent.removeChild(l,"ignore")}}else if("root"===e.type){e=e.nodes.slice(0);for(var p=e,h=Array.isArray(p),d=0,p=h?p:p[Symbol.iterator]();;){var m;if(h){if(d>=p.length)break;m=p[d++]}else{if(d=p.next(),d.done)break;m=d.value}var v=m;v.parent&&v.parent.removeChild(v,"ignore")}}else if(e.type)e=[e];else if(e.prop){if(void 0===e.value)throw new Error("Value field is missed in node creation");"string"!=typeof e.value&&(e.value=String(e.value)),e=[new c.default(e)]}else if(e.selector){var g=n(157);e=[new g(e)]}else if(e.name){var y=n(156);e=[new y(e)]}else{if(!e.text)throw new Error("Unknown node type in node creation");e=[new f.default(e)]}return e.map(function(e){return"function"!=typeof e.before&&(e=r.rebuild(e)),e.parent&&e.parent.removeChild(e),void 0===e.raws.before&&t&&void 0!==t.raws.before&&(e.raws.before=t.raws.before.replace(/[^\s]/g,"")),e.parent=r,e})},t.prototype.rebuild=function(e,t){var r=this,i=void 0;if("root"===e.type){var o=n(237);i=new o}else if("atrule"===e.type){var a=n(156);i=new a}else if("rule"===e.type){var s=n(157);i=new s}else"decl"===e.type?i=new c.default:"comment"===e.type&&(i=new f.default);for(var u in e)"nodes"===u?i.nodes=e.nodes.map(function(e){return r.rebuild(e,i)}):"parent"===u&&t?i.parent=t:e.hasOwnProperty(u)&&(i[u]=e[u]);return i},u(t,[{key:"first",get:function(){if(this.nodes)return this.nodes[0]}},{key:"last",get:function(){if(this.nodes)return this.nodes[this.nodes.length-1]}}]),t}(d.default);t.default=m,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=n(235),s=function(e){return e&&e.__esModule?e:{default:e}}(a),u=function(e){function t(n){r(this,t);var o=i(this,e.call(this,n));return o.type="decl",o}return o(t,e),t}(s.default);t.default=u,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a=n(432),s=r(a),u=n(437),l=r(u),c=n(238),p=r(c),f=n(987),h=r(f),d=function e(t,n){var r=new t.constructor;for(var i in t)if(t.hasOwnProperty(i)){var a=t[i],s=void 0===a?"undefined":o(a);"parent"===i&&"object"===s?n&&(r[i]=n):"source"===i?r[i]=a:a instanceof Array?r[i]=a.map(function(t){return e(t,r)}):("object"===s&&null!==a&&(a=e(a)),r[i]=a)}return r},m=function(){function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};if(i(this,e),this.raws={},"object"!==(void 0===t?"undefined":o(t))&&void 0!==t)throw new Error("PostCSS nodes constructor accepts object, not "+JSON.stringify(t));for(var n in t)this[n]=t[n]}return e.prototype.error=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(this.source){var n=this.positionBy(t);return this.source.input.error(e,n.line,n.column,t)}return new s.default(e)},e.prototype.warn=function(e,t,n){var r={node:this};for(var i in n)r[i]=n[i];return e.warn(t,r)},e.prototype.remove=function(){return this.parent&&this.parent.removeChild(this),this.parent=void 0,this},e.prototype.toString=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:p.default;e.stringify&&(e=e.stringify);var t="";return e(this,function(e){t+=e}),t},e.prototype.clone=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=d(this);for(var n in e)t[n]=e[n];return t},e.prototype.cloneBefore=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=this.clone(e);return this.parent.insertBefore(this,t),t},e.prototype.cloneAfter=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=this.clone(e);return this.parent.insertAfter(this,t),t},e.prototype.replaceWith=function(){if(this.parent){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];for(var r=t,i=Array.isArray(r),o=0,r=i?r:r[Symbol.iterator]();;){var a;if(i){if(o>=r.length)break;a=r[o++]}else{if(o=r.next(),o.done)break;a=o.value}var s=a;this.parent.insertBefore(this,s)}this.remove()}return this},e.prototype.moveTo=function(e){return(0,h.default)("Node#moveTo was deprecated. Use Container#append."),this.cleanRaws(this.root()===e.root()),this.remove(),e.append(this),this},e.prototype.moveBefore=function(e){return(0,h.default)("Node#moveBefore was deprecated. Use Node#before."),this.cleanRaws(this.root()===e.root()),this.remove(),e.parent.insertBefore(e,this),this},e.prototype.moveAfter=function(e){return(0,h.default)("Node#moveAfter was deprecated. Use Node#after."),this.cleanRaws(this.root()===e.root()),this.remove(),e.parent.insertAfter(e,this),this},e.prototype.next=function(){var e=this.parent.index(this);return this.parent.nodes[e+1]},e.prototype.prev=function(){var e=this.parent.index(this);return this.parent.nodes[e-1]},e.prototype.before=function(e){return this.parent.insertBefore(this,e),this},e.prototype.after=function(e){return this.parent.insertAfter(this,e),this},e.prototype.toJSON=function(){var e={};for(var t in this)if(this.hasOwnProperty(t)&&"parent"!==t){var n=this[t];n instanceof Array?e[t]=n.map(function(e){return"object"===(void 0===e?"undefined":o(e))&&e.toJSON?e.toJSON():e}):"object"===(void 0===n?"undefined":o(n))&&n.toJSON?e[t]=n.toJSON():e[t]=n}return e},e.prototype.raw=function(e,t){return(new l.default).raw(this,e,t)},e.prototype.root=function(){for(var e=this;e.parent;)e=e.parent;return e},e.prototype.cleanRaws=function(e){delete this.raws.before,delete this.raws.after,e||delete this.raws.between},e.prototype.positionInside=function(e){for(var t=this.toString(),n=this.source.start.column,r=this.source.start.line,i=0;i<e;i++)"\n"===t[i]?(n=1,r+=1):n+=1;return{line:r,column:n}},e.prototype.positionBy=function(e){var t=this.source.start;if(e.index)t=this.positionInside(e.index);else if(e.word){var n=this.toString().indexOf(e.word);-1!==n&&(t=this.positionInside(n))}return t},e}();t.default=m,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(t&&t.safe)throw new Error('Option safe was removed. Use parser: require("postcss-safe-parser")');var n=new u.default(e,t),r=new a.default(n);try{r.parse()}catch(e){throw"CssSyntaxError"===e.name&&t&&t.from&&(/\.scss$/i.test(t.from)?e.message+="\nYou tried to parse SCSS with the standard CSS parser; try again with the postcss-scss parser":/\.sass/i.test(t.from)?e.message+="\nYou tried to parse Sass with the standard CSS parser; try again with the postcss-sass parser":/\.less$/i.test(t.from)&&(e.message+="\nYou tried to parse Less with the standard CSS parser; try again with the postcss-less parser")),e}return r.root}t.__esModule=!0,t.default=i;var o=n(981),a=r(o),s=n(433),u=r(s);e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=n(233),s=function(e){return e&&e.__esModule?e:{default:e}}(a),u=function(e){function t(n){r(this,t);var o=i(this,e.call(this,n));return o.type="root",o.nodes||(o.nodes=[]),o}return o(t,e),t.prototype.removeChild=function(t,n){var r=this.index(t);return!n&&0===r&&this.nodes.length>1&&(this.nodes[1].raws.before=this.nodes[r].raws.before),e.prototype.removeChild.call(this,t)},t.prototype.normalize=function(t,n,r){var i=e.prototype.normalize.call(this,t);if(n)if("prepend"===r)this.nodes.length>1?n.raws.before=this.nodes[1].raws.before:delete n.raws.before;else if(this.first!==n)for(var o=i,a=Array.isArray(o),s=0,o=a?o:o[Symbol.iterator]();;){var u;if(a){if(s>=o.length)break;u=o[s++]}else{if(s=o.next(),s.done)break;u=s.value}var l=u;l.raws.before=n.raws.before}return i},t.prototype.toResult=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return new(n(434))(new(n(436)),this,e).stringify()},t}(s.default);t.default=u,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){new o.default(t).stringify(e)}t.__esModule=!0,t.default=r;var i=n(437),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){(function(t){for(var r=n(1006),i="undefined"==typeof window?t:window,o=["moz","webkit"],a="AnimationFrame",s=i["request"+a],u=i["cancel"+a]||i["cancelRequest"+a],l=0;!s&&l<o.length;l++)s=i[o[l]+"Request"+a],u=i[o[l]+"Cancel"+a]||i[o[l]+"CancelRequest"+a];if(!s||!u){var c=0,p=0,f=[];s=function(e){if(0===f.length){var t=r(),n=Math.max(0,1e3/60-(t-c));c=n+t,setTimeout(function(){var e=f.slice(0);f.length=0;for(var t=0;t<e.length;t++)if(!e[t].cancelled)try{e[t].callback(c)}catch(e){setTimeout(function(){throw e},0)}},Math.round(n))}return f.push({handle:++p,callback:e,cancelled:!1}),p},u=function(e){for(var t=0;t<f.length;t++)f[t].handle===e&&(f[t].cancelled=!0)}}e.exports=function(e){return s.call(i,e)},e.exports.cancel=function(){u.apply(i,arguments)},e.exports.polyfill=function(e){e||(e=i),e.requestAnimationFrame=s,e.cancelAnimationFrame=u}}).call(t,n(17))},function(e,t,n){"use strict";function r(e,t){return Array.isArray(t)&&(t=t[1]),t?t.nextSibling:e.firstChild}function i(e,t,n){c.insertTreeBefore(e,t,n)}function o(e,t,n){Array.isArray(t)?s(e,t[0],t[1],n):m(e,t,n)}function a(e,t){if(Array.isArray(t)){var n=t[1];t=t[0],u(e,t,n),e.removeChild(n)}e.removeChild(t)}function s(e,t,n,r){for(var i=t;;){var o=i.nextSibling;if(m(e,i,r),i===n)break;i=o}}function u(e,t,n){for(;;){var r=t.nextSibling;if(r===n)break;e.removeChild(r)}}function l(e,t,n){var r=e.parentNode,i=e.nextSibling;i===t?n&&m(r,document.createTextNode(n),i):n?(d(i,n),u(r,i,t)):u(r,e,t)}var c=n(88),p=n(1014),f=(n(14),n(39),n(249)),h=n(163),d=n(469),m=f(function(e,t,n){e.insertBefore(t,n)}),v=p.dangerouslyReplaceNodeWithMarkup,g={dangerouslyReplaceNodeWithMarkup:v,replaceDelimitedText:l,processUpdates:function(e,t){for(var n=0;n<t.length;n++){var s=t[n];switch(s.type){case"INSERT_MARKUP":i(e,s.content,r(e,s.afterNode));break;case"MOVE_EXISTING":o(e,s.fromNode,r(e,s.afterNode));break;case"SET_MARKUP":h(e,s.content);break;case"TEXT_CONTENT":d(e,s.content);break;case"REMOVE_NODE":a(e,s.fromNode)}}}};e.exports=g},function(e,t,n){"use strict";var r={html:"http://www.w3.org/1999/xhtml",mathml:"http://www.w3.org/1998/Math/MathML",svg:"http://www.w3.org/2000/svg"};e.exports=r},function(e,t,n){"use strict";function r(){if(s)for(var e in u){var t=u[e],n=s.indexOf(e);if(n>-1||a("96",e),!l.plugins[n]){t.extractEvents||a("97",e),l.plugins[n]=t;var r=t.eventTypes;for(var o in r)i(r[o],t,o)||a("98",o,e)}}}function i(e,t,n){l.eventNameDispatchConfigs.hasOwnProperty(n)&&a("99",n),l.eventNameDispatchConfigs[n]=e;var r=e.phasedRegistrationNames;if(r){for(var i in r)if(r.hasOwnProperty(i)){var s=r[i];o(s,t,n)}return!0}return!!e.registrationName&&(o(e.registrationName,t,n),!0)}function o(e,t,n){l.registrationNameModules[e]&&a("100",e),l.registrationNameModules[e]=t,l.registrationNameDependencies[e]=t.eventTypes[n].dependencies}var a=n(11),s=(n(8),null),u={},l={plugins:[],eventNameDispatchConfigs:{},registrationNameModules:{},registrationNameDependencies:{},possibleRegistrationNames:null,injectEventPluginOrder:function(e){s&&a("101"),s=Array.prototype.slice.call(e),r()},injectEventPluginsByName:function(e){var t=!1;for(var n in e)if(e.hasOwnProperty(n)){var i=e[n];u.hasOwnProperty(n)&&u[n]===i||(u[n]&&a("102",n),u[n]=i,t=!0)}t&&r()},getPluginModuleForEvent:function(e){var t=e.dispatchConfig;if(t.registrationName)return l.registrationNameModules[t.registrationName]||null;if(void 0!==t.phasedRegistrationNames){var n=t.phasedRegistrationNames;for(var r in n)if(n.hasOwnProperty(r)){var i=l.registrationNameModules[n[r]];if(i)return i}}return null},_resetEventPlugins:function(){s=null;for(var e in u)u.hasOwnProperty(e)&&delete u[e];l.plugins.length=0;var t=l.eventNameDispatchConfigs;for(var n in t)t.hasOwnProperty(n)&&delete t[n];var r=l.registrationNameModules;for(var i in r)r.hasOwnProperty(i)&&delete r[i]}};e.exports=l},function(e,t,n){"use strict";function r(e){return"topMouseUp"===e||"topTouchEnd"===e||"topTouchCancel"===e}function i(e){return"topMouseMove"===e||"topTouchMove"===e}function o(e){return"topMouseDown"===e||"topTouchStart"===e}function a(e,t,n,r){var i=e.type||"unknown-event";e.currentTarget=g.getNodeFromInstance(r),t?m.invokeGuardedCallbackWithCatch(i,n,e):m.invokeGuardedCallback(i,n,e),e.currentTarget=null}function s(e,t){var n=e._dispatchListeners,r=e._dispatchInstances;if(Array.isArray(n))for(var i=0;i<n.length&&!e.isPropagationStopped();i++)a(e,t,n[i],r[i]);else n&&a(e,t,n,r);e._dispatchListeners=null,e._dispatchInstances=null}function u(e){var t=e._dispatchListeners,n=e._dispatchInstances;if(Array.isArray(t)){for(var r=0;r<t.length&&!e.isPropagationStopped();r++)if(t[r](e,n[r]))return n[r]}else if(t&&t(e,n))return n;return null}function l(e){var t=u(e);return e._dispatchInstances=null,e._dispatchListeners=null,t}function c(e){var t=e._dispatchListeners,n=e._dispatchInstances;Array.isArray(t)&&d("103"),e.currentTarget=t?g.getNodeFromInstance(n):null;var r=t?t(e):null;return e.currentTarget=null,e._dispatchListeners=null,e._dispatchInstances=null,r}function p(e){return!!e._dispatchListeners}var f,h,d=n(11),m=n(247),v=(n(8),n(10),{injectComponentTree:function(e){f=e},injectTreeTraversal:function(e){h=e}}),g={isEndish:r,isMoveish:i,isStartish:o,executeDirectDispatch:c,executeDispatchesInOrder:s,executeDispatchesInOrderStopAtTrue:l,hasDispatches:p,getInstanceFromNode:function(e){return f.getInstanceFromNode(e)},getNodeFromInstance:function(e){return f.getNodeFromInstance(e)},isAncestor:function(e,t){return h.isAncestor(e,t)},getLowestCommonAncestor:function(e,t){return h.getLowestCommonAncestor(e,t)},getParentInstance:function(e){return h.getParentInstance(e)},traverseTwoPhase:function(e,t,n){return h.traverseTwoPhase(e,t,n)},traverseEnterLeave:function(e,t,n,r,i){return h.traverseEnterLeave(e,t,n,r,i)},injection:v};e.exports=g},function(e,t,n){"use strict";function r(e){var t={"=":"=0",":":"=2"};return"$"+(""+e).replace(/[=:]/g,function(e){return t[e]})}function i(e){var t=/(=0|=2)/g,n={"=0":"=","=2":":"};return(""+("."===e[0]&&"$"===e[1]?e.substring(2):e.substring(1))).replace(t,function(e){return n[e]})}var o={escape:r,unescape:i};e.exports=o},function(e,t,n){"use strict";function r(e){null!=e.checkedLink&&null!=e.valueLink&&s("87")}function i(e){r(e),(null!=e.value||null!=e.onChange)&&s("88")}function o(e){r(e),(null!=e.checked||null!=e.onChange)&&s("89")}function a(e){if(e){var t=e.getName();if(t)return" Check the render method of `"+t+"`."}return""}var s=n(11),u=n(1043),l=n(443),c=n(92),p=l(c.isValidElement),f=(n(8),n(10),{button:!0,checkbox:!0,image:!0,hidden:!0,radio:!0,reset:!0,submit:!0}),h={value:function(e,t,n){return!e[t]||f[e.type]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `value` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultValue`. Otherwise, set either `onChange` or `readOnly`.")},checked:function(e,t,n){return!e[t]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `checked` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultChecked`. Otherwise, set either `onChange` or `readOnly`.")},onChange:p.func},d={},m={checkPropTypes:function(e,t,n){for(var r in h){if(h.hasOwnProperty(r))var i=h[r](t,r,e,"prop",null,u);if(i instanceof Error&&!(i.message in d)){d[i.message]=!0;a(n)}}},getValue:function(e){return e.valueLink?(i(e),e.valueLink.value):e.value},getChecked:function(e){return e.checkedLink?(o(e),e.checkedLink.value):e.checked},executeOnChange:function(e,t){return e.valueLink?(i(e),e.valueLink.requestChange(t.target.value)):e.checkedLink?(o(e),e.checkedLink.requestChange(t.target.checked)):e.onChange?e.onChange.call(void 0,t):void 0}};e.exports=m},function(e,t,n){"use strict";var r=n(11),i=(n(8),!1),o={replaceNodeWithMarkup:null,processChildrenUpdates:null,injection:{injectEnvironment:function(e){i&&r("104"),o.replaceNodeWithMarkup=e.replaceNodeWithMarkup,o.processChildrenUpdates=e.processChildrenUpdates,i=!0}}};e.exports=o},function(e,t,n){"use strict";function r(e,t,n){try{t(n)}catch(e){null===i&&(i=e)}}var i=null,o={invokeGuardedCallback:r,invokeGuardedCallbackWithCatch:r,rethrowCaughtError:function(){if(i){var e=i;throw i=null,e}}};e.exports=o},function(e,t,n){"use strict";function r(e){u.enqueueUpdate(e)}function i(e){var t=typeof e;if("object"!==t)return t;var n=e.constructor&&e.constructor.name||t,r=Object.keys(e);return r.length>0&&r.length<20?n+" (keys: "+r.join(", ")+")":n}function o(e,t){var n=s.get(e);if(!n){return null}return n}var a=n(11),s=(n(52),n(124)),u=(n(39),n(44)),l=(n(8),n(10),{isMounted:function(e){var t=s.get(e);return!!t&&!!t._renderedComponent},enqueueCallback:function(e,t,n){l.validateCallback(t,n);var i=o(e);if(!i)return null;i._pendingCallbacks?i._pendingCallbacks.push(t):i._pendingCallbacks=[t],r(i)},enqueueCallbackInternal:function(e,t){e._pendingCallbacks?e._pendingCallbacks.push(t):e._pendingCallbacks=[t],r(e)},enqueueForceUpdate:function(e){var t=o(e,"forceUpdate");t&&(t._pendingForceUpdate=!0,r(t))},enqueueReplaceState:function(e,t,n){var i=o(e,"replaceState");i&&(i._pendingStateQueue=[t],i._pendingReplaceState=!0,void 0!==n&&null!==n&&(l.validateCallback(n,"replaceState"),i._pendingCallbacks?i._pendingCallbacks.push(n):i._pendingCallbacks=[n]),r(i))},enqueueSetState:function(e,t){var n=o(e,"setState");if(n){(n._pendingStateQueue||(n._pendingStateQueue=[])).push(t),r(n)}},enqueueElementInternal:function(e,t,n){e._pendingElement=t,e._context=n,r(e)},validateCallback:function(e,t){e&&"function"!=typeof e&&a("122",t,i(e))}});e.exports=l},function(e,t,n){"use strict";var r=function(e){return"undefined"!=typeof MSApp&&MSApp.execUnsafeLocalFunction?function(t,n,r,i){MSApp.execUnsafeLocalFunction(function(){return e(t,n,r,i)})}:e};e.exports=r},function(e,t,n){"use strict";function r(e){var t,n=e.keyCode;return"charCode"in e?0===(t=e.charCode)&&13===n&&(t=13):t=n,t>=32||13===t?t:0}e.exports=r},function(e,t,n){"use strict";function r(e){var t=this,n=t.nativeEvent;if(n.getModifierState)return n.getModifierState(e);var r=o[e];return!!r&&!!n[r]}function i(e){return r}var o={Alt:"altKey",Control:"ctrlKey",Meta:"metaKey",Shift:"shiftKey"};e.exports=i},function(e,t,n){"use strict";function r(e){var t=e.target||e.srcElement||window;return t.correspondingUseElement&&(t=t.correspondingUseElement),3===t.nodeType?t.parentNode:t}e.exports=r},function(e,t,n){"use strict";/**
-- * Checks if an event is supported in the current execution environment.
-- *
-- * NOTE: This will not work correctly for non-generic events such as `change`,
-- * `reset`, `load`, `error`, and `select`.
-- *
-- * Borrows from Modernizr.
-- *
-- * @param {string} eventNameSuffix Event name, e.g. "click".
-- * @param {?boolean} capture Check if the capture phase is supported.
-- * @return {boolean} True if the event is supported.
-- * @internal
-- * @license Modernizr 3.0.0pre (Custom Build) | MIT
-- */
--function r(e,t){if(!o.canUseDOM||t&&!("addEventListener"in document))return!1;var n="on"+e,r=n in document;if(!r){var a=document.createElement("div");a.setAttribute(n,"return;"),r="function"==typeof a[n]}return!r&&i&&"wheel"===e&&(r=document.implementation.hasFeature("Events.wheel","3.0")),r}var i,o=n(25);o.canUseDOM&&(i=document.implementation&&document.implementation.hasFeature&&!0!==document.implementation.hasFeature("","")),e.exports=r},function(e,t,n){"use strict";function r(e,t){var n=null===e||!1===e,r=null===t||!1===t;if(n||r)return n===r;var i=typeof e,o=typeof t;return"string"===i||"number"===i?"string"===o||"number"===o:"object"===o&&e.type===t.type&&e.key===t.key}e.exports=r},function(e,t,n){"use strict";var r=(n(13),n(32)),i=(n(10),r);e.exports=i},function(e,t,n){"use strict";function r(e){switch(e._type){case"Document":case"BlockQuote":case"List":case"Item":case"Paragraph":case"Heading":case"Emph":case"Strong":case"Link":case"Image":case"CustomInline":case"CustomBlock":return!0;default:return!1}}var i=function(e,t){this.current=e,this.entering=!0===t},o=function(){var e=this.current,t=this.entering;if(null===e)return null;var n=r(e);return t&&n?e._firstChild?(this.current=e._firstChild,this.entering=!0):this.entering=!1:e===this.root?this.current=null:null===e._next?(this.current=e._parent,this.entering=!1):(this.current=e._next,this.entering=!0),{entering:t,node:e}},a=function(e){return{current:e,root:e,entering:!0,next:o,resumeAt:i}},s=function(e,t){this._type=e,this._parent=null,this._firstChild=null,this._lastChild=null,this._prev=null,this._next=null,this._sourcepos=t,this._lastLineBlank=!1,this._open=!0,this._string_content=null,this._literal=null,this._listData={},this._info=null,this._destination=null,this._title=null,this._isFenced=!1,this._fenceChar=null,this._fenceLength=0,this._fenceOffset=null,this._level=null,this._onEnter=null,this._onExit=null},u=s.prototype;Object.defineProperty(u,"isContainer",{get:function(){return r(this)}}),Object.defineProperty(u,"type",{get:function(){return this._type}}),Object.defineProperty(u,"firstChild",{get:function(){return this._firstChild}}),Object.defineProperty(u,"lastChild",{get:function(){return this._lastChild}}),Object.defineProperty(u,"next",{get:function(){return this._next}}),Object.defineProperty(u,"prev",{get:function(){return this._prev}}),Object.defineProperty(u,"parent",{get:function(){return this._parent}}),Object.defineProperty(u,"sourcepos",{get:function(){return this._sourcepos}}),Object.defineProperty(u,"literal",{get:function(){return this._literal},set:function(e){this._literal=e}}),Object.defineProperty(u,"destination",{get:function(){return this._destination},set:function(e){this._destination=e}}),Object.defineProperty(u,"title",{get:function(){return this._title},set:function(e){this._title=e}}),Object.defineProperty(u,"info",{get:function(){return this._info},set:function(e){this._info=e}}),Object.defineProperty(u,"level",{get:function(){return this._level},set:function(e){this._level=e}}),Object.defineProperty(u,"listType",{get:function(){return this._listData.type},set:function(e){this._listData.type=e}}),Object.defineProperty(u,"listTight",{get:function(){return this._listData.tight},set:function(e){this._listData.tight=e}}),Object.defineProperty(u,"listStart",{get:function(){return this._listData.start},set:function(e){this._listData.start=e}}),Object.defineProperty(u,"listDelimiter",{get:function(){return this._listData.delimiter},set:function(e){this._listData.delimiter=e}}),Object.defineProperty(u,"onEnter",{get:function(){return this._onEnter},set:function(e){this._onEnter=e}}),Object.defineProperty(u,"onExit",{get:function(){return this._onExit},set:function(e){this._onExit=e}}),s.prototype.appendChild=function(e){e.unlink(),e._parent=this,this._lastChild?(this._lastChild._next=e,e._prev=this._lastChild,this._lastChild=e):(this._firstChild=e,this._lastChild=e)},s.prototype.prependChild=function(e){e.unlink(),e._parent=this,this._firstChild?(this._firstChild._prev=e,e._next=this._firstChild,this._firstChild=e):(this._firstChild=e,this._lastChild=e)},s.prototype.unlink=function(){this._prev?this._prev._next=this._next:this._parent&&(this._parent._firstChild=this._next),this._next?this._next._prev=this._prev:this._parent&&(this._parent._lastChild=this._prev),this._parent=null,this._next=null,this._prev=null},s.prototype.insertAfter=function(e){e.unlink(),e._next=this._next,e._next&&(e._next._prev=e),e._prev=this,this._next=e,e._parent=this._parent,e._next||(e._parent._lastChild=e)},s.prototype.insertBefore=function(e){e.unlink(),e._prev=this._prev,e._prev&&(e._prev._next=e),e._next=this,this._prev=e,e._parent=this._parent,e._prev||(e._parent._firstChild=e)},s.prototype.walker=function(){return new a(this)},e.exports=s},function(e,t,n){"use strict";function r(e){var t={};for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=0);return t}t.__esModule=!0,t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){for(var r in t)if(Object.prototype.hasOwnProperty.call(t,r)){if(0!==n[r])return!1;var i="number"==typeof t[r]?t[r]:t[r].val;if(e[r]!==i)return!1}return!0}t.__esModule=!0,t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r,o,a,s){var u=-o*(t-r),l=-a*n,c=u+l,p=n+c*e,f=t+p*e;return Math.abs(p)<s&&Math.abs(f-r)<s?(i[0]=r,i[1]=0,i):(i[0]=f,i[1]=p,i)}t.__esModule=!0,t.default=r;var i=[0,0];e.exports=t.default},function(e,t,n){var r=n(1097),i=n(1);e.exports=function(e,t,n){var i=e[t];if(i){var o=[];if(Object.keys(i).forEach(function(e){-1===r.indexOf(e)&&o.push(e)}),o.length)throw new Error("Prop "+t+" passed to "+n+". Has invalid keys "+o.join(", "))}},e.exports.isRequired=function(t,n,r){if(!t[n])throw new Error("Prop "+n+" passed to "+r+" is required");return e.exports(t,n,r)},e.exports.supportingArrays=i.oneOfType([i.arrayOf(e.exports),e.exports])},function(e,t,n){"use strict";(function(t,r,i){function o(e){var t=this;this.next=null,this.entry=null,this.finish=function(){A(t,e)}}function a(e){return R.from(e)}function s(e){return R.isBuffer(e)||e instanceof j}function u(){}function l(e,t){O=O||n(71),e=e||{},this.objectMode=!!e.objectMode,t instanceof O&&(this.objectMode=this.objectMode||!!e.writableObjectMode);var r=e.highWaterMark,i=this.objectMode?16:16384;this.highWaterMark=r||0===r?r:i,this.highWaterMark=Math.floor(this.highWaterMark),this.finalCalled=!1,this.needDrain=!1,this.ending=!1,this.ended=!1,this.finished=!1,this.destroyed=!1;var a=!1===e.decodeStrings;this.decodeStrings=!a,this.defaultEncoding=e.defaultEncoding||"utf8",this.length=0,this.writing=!1,this.corked=0,this.sync=!0,this.bufferProcessing=!1,this.onwrite=function(e){y(t,e)},this.writecb=null,this.writelen=0,this.bufferedRequest=null,this.lastBufferedRequest=null,this.pendingcb=0,this.prefinished=!1,this.errorEmitted=!1,this.bufferedRequestCount=0,this.corkedRequestsFree=new o(this)}function c(e){if(O=O||n(71),!(N.call(c,this)||this instanceof O))return new c(e);this._writableState=new l(e,this),this.writable=!0,e&&("function"==typeof e.write&&(this._write=e.write),"function"==typeof e.writev&&(this._writev=e.writev),"function"==typeof e.destroy&&(this._destroy=e.destroy),"function"==typeof e.final&&(this._final=e.final)),I.call(this)}function p(e,t){var n=new Error("write after end");e.emit("error",n),D(t,n)}function f(e,t,n,r){var i=!0,o=!1;return null===n?o=new TypeError("May not write null values to stream"):"string"==typeof n||void 0===n||t.objectMode||(o=new TypeError("Invalid non-string/buffer chunk")),o&&(e.emit("error",o),D(r,o),i=!1),i}function h(e,t,n){return e.objectMode||!1===e.decodeStrings||"string"!=typeof t||(t=R.from(t,n)),t}function d(e,t,n,r,i,o){if(!n){var a=h(t,r,i);r!==a&&(n=!0,i="buffer",r=a)}var s=t.objectMode?1:r.length;t.length+=s;var u=t.length<t.highWaterMark;if(u||(t.needDrain=!0),t.writing||t.corked){var l=t.lastBufferedRequest;t.lastBufferedRequest={chunk:r,encoding:i,isBuf:n,callback:o,next:null},l?l.next=t.lastBufferedRequest:t.bufferedRequest=t.lastBufferedRequest,t.bufferedRequestCount+=1}else m(e,t,!1,s,r,i,o);return u}function m(e,t,n,r,i,o,a){t.writelen=r,t.writecb=a,t.writing=!0,t.sync=!0,n?e._writev(i,t.onwrite):e._write(i,o,t.onwrite),t.sync=!1}function v(e,t,n,r,i){--t.pendingcb,n?(D(i,r),D(S,e,t),e._writableState.errorEmitted=!0,e.emit("error",r)):(i(r),e._writableState.errorEmitted=!0,e.emit("error",r),S(e,t))}function g(e){e.writing=!1,e.writecb=null,e.length-=e.writelen,e.writelen=0}function y(e,t){var n=e._writableState,r=n.sync,i=n.writecb;if(g(n),t)v(e,n,r,t,i);else{var o=w(n);o||n.corked||n.bufferProcessing||!n.bufferedRequest||x(e,n),r?M(_,e,n,o,i):_(e,n,o,i)}}function _(e,t,n,r){n||b(e,t),t.pendingcb--,r(),S(e,t)}function b(e,t){0===t.length&&t.needDrain&&(t.needDrain=!1,e.emit("drain"))}function x(e,t){t.bufferProcessing=!0;var n=t.bufferedRequest;if(e._writev&&n&&n.next){var r=t.bufferedRequestCount,i=new Array(r),a=t.corkedRequestsFree;a.entry=n;for(var s=0,u=!0;n;)i[s]=n,n.isBuf||(u=!1),n=n.next,s+=1;i.allBuffers=u,m(e,t,!0,t.length,i,"",a.finish),t.pendingcb++,t.lastBufferedRequest=null,a.next?(t.corkedRequestsFree=a.next,a.next=null):t.corkedRequestsFree=new o(t)}else{for(;n;){var l=n.chunk,c=n.encoding,p=n.callback;if(m(e,t,!1,t.objectMode?1:l.length,l,c,p),n=n.next,t.writing)break}null===n&&(t.lastBufferedRequest=null)}t.bufferedRequestCount=0,t.bufferedRequest=n,t.bufferProcessing=!1}function w(e){return e.ending&&0===e.length&&null===e.bufferedRequest&&!e.finished&&!e.writing}function k(e,t){e._final(function(n){t.pendingcb--,n&&e.emit("error",n),t.prefinished=!0,e.emit("prefinish"),S(e,t)})}function E(e,t){t.prefinished||t.finalCalled||("function"==typeof e._final?(t.pendingcb++,t.finalCalled=!0,D(k,e,t)):(t.prefinished=!0,e.emit("prefinish")))}function S(e,t){var n=w(t);return n&&(E(e,t),0===t.pendingcb&&(t.finished=!0,e.emit("finish"))),n}function C(e,t,n){t.ending=!0,S(e,t),n&&(t.finished?D(n):e.once("finish",n)),t.ended=!0,e.writable=!1}function A(e,t,n){var r=e.entry;for(e.entry=null;r;){var i=r.callback;t.pendingcb--,i(n),r=r.next}t.corkedRequestsFree?t.corkedRequestsFree.next=e:t.corkedRequestsFree=e}var D=n(158);e.exports=c;var O,M=!t.browser&&["v0.10","v0.9."].indexOf(t.version.slice(0,5))>-1?r:D;c.WritableState=l;var T=n(111);T.inherits=n(42);var P={deprecate:n(1191)},I=n(482),R=n(167).Buffer,j=i.Uint8Array||function(){},F=n(481);T.inherits(c,I),l.prototype.getBuffer=function(){for(var e=this.bufferedRequest,t=[];e;)t.push(e),e=e.next;return t},function(){try{Object.defineProperty(l.prototype,"buffer",{get:P.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer instead.","DEP0003")})}catch(e){}}();var N;"function"==typeof Symbol&&Symbol.hasInstance&&"function"==typeof Function.prototype[Symbol.hasInstance]?(N=Function.prototype[Symbol.hasInstance],Object.defineProperty(c,Symbol.hasInstance,{value:function(e){return!!N.call(this,e)||e&&e._writableState instanceof l}})):N=function(e){return e instanceof this},c.prototype.pipe=function(){this.emit("error",new Error("Cannot pipe, not readable"))},c.prototype.write=function(e,t,n){var r=this._writableState,i=!1,o=s(e)&&!r.objectMode;return o&&!R.isBuffer(e)&&(e=a(e)),"function"==typeof t&&(n=t,t=null),o?t="buffer":t||(t=r.defaultEncoding),"function"!=typeof n&&(n=u),r.ended?p(this,n):(o||f(this,r,e,n))&&(r.pendingcb++,i=d(this,r,o,e,t,n)),i},c.prototype.cork=function(){this._writableState.corked++},c.prototype.uncork=function(){var e=this._writableState;e.corked&&(e.corked--,e.writing||e.corked||e.finished||e.bufferProcessing||!e.bufferedRequest||x(this,e))},c.prototype.setDefaultEncoding=function(e){if("string"==typeof e&&(e=e.toLowerCase()),!(["hex","utf8","utf-8","ascii","binary","base64","ucs2","ucs-2","utf16le","utf-16le","raw"].indexOf((e+"").toLowerCase())>-1))throw new TypeError("Unknown encoding: "+e);return this._writableState.defaultEncoding=e,this},c.prototype._write=function(e,t,n){n(new Error("_write() is not implemented"))},c.prototype._writev=null,c.prototype.end=function(e,t,n){var r=this._writableState;"function"==typeof e?(n=e,e=null,t=null):"function"==typeof t&&(n=t,t=null),null!==e&&void 0!==e&&this.write(e,t),r.corked&&(r.corked=1,this.uncork()),r.ending||r.finished||C(this,r,n)},Object.defineProperty(c.prototype,"destroyed",{get:function(){return void 0!==this._writableState&&this._writableState.destroyed},set:function(e){this._writableState&&(this._writableState.destroyed=e)}}),c.prototype.destroy=F.destroy,c.prototype._undestroy=F.undestroy,c.prototype._destroy=function(e,t){this.end(),t(e)}}).call(t,n(33),n(496).setImmediate,n(17))},function(e,t,n){t=e.exports=n(479),t.Stream=t,t.Readable=t,t.Writable=n(261),t.Duplex=n(71),t.Transform=n(480),t.PassThrough=n(1111)},function(e,t,n){"use strict";function r(e,t,n,r,i){this.src=e,this.env=r,this.options=n,this.parser=t,this.tokens=i,this.pos=0,this.posMax=this.src.length,this.level=0,this.pending="",this.pendingLevel=0,this.cache=[],this.isInLabel=!1,this.linkLevel=0,this.linkContent="",this.labelUnmatchedScopes=0}r.prototype.pushPending=function(){this.tokens.push({type:"text",content:this.pending,level:this.pendingLevel}),this.pending=""},r.prototype.push=function(e){this.pending&&this.pushPending(),this.tokens.push(e),this.pendingLevel=this.level},r.prototype.cacheSet=function(e,t){for(var n=this.cache.length;n<=e;n++)this.cache.push(0);this.cache[e]=t},r.prototype.cacheGet=function(e){return e<this.cache.length?this.cache[e]:0},e.exports=r},function(e,t,n){"use strict";function r(e,t){var n;return n=Array.isArray(e)?[]:{},t.push(e),Object.keys(e).forEach(function(i){var o=e[i];if("function"!=typeof o)return o&&"object"==typeof o?-1===t.indexOf(e[i])?void(n[i]=r(e[i],t.slice(0))):void(n[i]="[Circular]"):void(n[i]=o)}),n}e.exports=function(e){if("object"==typeof e){var t=r(e,[]);return"string"==typeof e.name&&(t.name=e.name),"string"==typeof e.message&&(t.message=e.message),"string"==typeof e.stack&&(t.stack=e.stack),t}return"function"==typeof e?"[Function: "+(e.name||"anonymous")+"]":e}},function(e,t,n){"use strict";function r(e){if(!e)return"utf8";for(var t;;)switch(e){case"utf8":case"utf-8":return"utf8";case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return"utf16le";case"latin1":case"binary":return"latin1";case"base64":case"ascii":case"hex":return e;default:if(t)return;e=(""+e).toLowerCase(),t=!0}}function i(e){var t=r(e);if("string"!=typeof t&&(y.isEncoding===_||!_(e)))throw new Error("Unknown encoding: "+e);return t||e}function o(e){this.encoding=i(e);var t;switch(this.encoding){case"utf16le":this.text=f,this.end=h,t=4;break;case"utf8":this.fillLast=l,t=4;break;case"base64":this.text=d,this.end=m,t=3;break;default:return this.write=v,void(this.end=g)}this.lastNeed=0,this.lastTotal=0,this.lastChar=y.allocUnsafe(t)}function a(e){return e<=127?0:e>>5==6?2:e>>4==14?3:e>>3==30?4:-1}function s(e,t,n){var r=t.length-1;if(r<n)return 0;var i=a(t[r]);return i>=0?(i>0&&(e.lastNeed=i-1),i):--r<n?0:(i=a(t[r]))>=0?(i>0&&(e.lastNeed=i-2),i):--r<n?0:(i=a(t[r]),i>=0?(i>0&&(2===i?i=0:e.lastNeed=i-3),i):0)}function u(e,t,n){if(128!=(192&t[0]))return e.lastNeed=0,"�".repeat(n);if(e.lastNeed>1&&t.length>1){if(128!=(192&t[1]))return e.lastNeed=1,"�".repeat(n+1);if(e.lastNeed>2&&t.length>2&&128!=(192&t[2]))return e.lastNeed=2,"�".repeat(n+2)}}function l(e){var t=this.lastTotal-this.lastNeed,n=u(this,e,t);return void 0!==n?n:this.lastNeed<=e.length?(e.copy(this.lastChar,t,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal)):(e.copy(this.lastChar,t,0,e.length),void(this.lastNeed-=e.length))}function c(e,t){var n=s(this,e,t);if(!this.lastNeed)return e.toString("utf8",t);this.lastTotal=n;var r=e.length-(n-this.lastNeed);return e.copy(this.lastChar,0,r),e.toString("utf8",t,r)}function p(e){var t=e&&e.length?this.write(e):"";return this.lastNeed?t+"�".repeat(this.lastTotal-this.lastNeed):t}function f(e,t){if((e.length-t)%2==0){var n=e.toString("utf16le",t);if(n){var r=n.charCodeAt(n.length-1);if(r>=55296&&r<=56319)return this.lastNeed=2,this.lastTotal=4,this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1],n.slice(0,-1)}return n}return this.lastNeed=1,this.lastTotal=2,this.lastChar[0]=e[e.length-1],e.toString("utf16le",t,e.length-1)}function h(e){var t=e&&e.length?this.write(e):"";if(this.lastNeed){var n=this.lastTotal-this.lastNeed;return t+this.lastChar.toString("utf16le",0,n)}return t}function d(e,t){var n=(e.length-t)%3;return 0===n?e.toString("base64",t):(this.lastNeed=3-n,this.lastTotal=3,1===n?this.lastChar[0]=e[e.length-1]:(this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1]),e.toString("base64",t,e.length-n))}function m(e){var t=e&&e.length?this.write(e):"";return this.lastNeed?t+this.lastChar.toString("base64",0,3-this.lastNeed):t}function v(e){return e.toString(this.encoding)}function g(e){return e&&e.length?this.write(e):""}var y=n(167).Buffer,_=y.isEncoding||function(e){switch((e=""+e)&&e.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}};t.StringDecoder=o,o.prototype.write=function(e){if(0===e.length)return"";var t,n;if(this.lastNeed){if(void 0===(t=this.fillLast(e)))return"";n=this.lastNeed,this.lastNeed=0}else n=0;return n<e.length?t?t+this.text(e,n):this.text(e,n):t||""},o.prototype.end=p,o.prototype.text=c,o.prototype.fillLast=function(e){if(this.lastNeed<=e.length)return e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,e.length),this.lastNeed-=e.length}},function(e,t,n){(function(){var e,t,r,i=function(e,t){function n(){this.constructor=e}for(var r in t)o.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},o={}.hasOwnProperty,a=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};t=n(94),r=n(61),e=n(45).YAMLError,this.ResolverError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return i(t,e),t}(e),this.BaseResolver=function(){function e(){this.resolver_exact_paths=[],this.resolver_prefix_paths=[]}var n,i,o;return i="tag:yaml.org,2002:str",o="tag:yaml.org,2002:seq",n="tag:yaml.org,2002:map",e.prototype.yaml_implicit_resolvers={},e.prototype.yaml_path_resolvers={},e.add_implicit_resolver=function(e,t,n){var i,o,a,s,u;for(null==n&&(n=[null]),this.prototype.hasOwnProperty("yaml_implicit_resolvers")||(this.prototype.yaml_implicit_resolvers=r.extend({},this.prototype.yaml_implicit_resolvers)),u=[],a=0,s=n.length;a<s;a++)o=n[a],u.push((null!=(i=this.prototype.yaml_implicit_resolvers)[o]?i[o]:i[o]=[]).push([e,t]));return u},e.prototype.descend_resolver=function(e,t){var n,i,o,a,s,u,l,c,p,f,h,d,m;if(!r.is_empty(this.yaml_path_resolvers)){if(i={},p=[],e)for(n=this.resolver_prefix_paths.length,f=this.resolver_prefix_paths.slice(-1)[0],o=0,u=f.length;o<u;o++)h=f[o],c=h[0],s=h[1],this.check_resolver_prefix(n,c,s,e,t)&&(c.length>n?p.push([c,s]):i[s]=this.yaml_path_resolvers[c][s]);else for(d=this.yaml_path_resolvers,a=0,l=d.length;a<l;a++)m=d[a],c=m[0],s=m[1],c?p.push([c,s]):i[s]=this.yaml_path_resolvers[c][s];return this.resolver_exact_paths.push(i),this.resolver_prefix_paths.push(p)}},e.prototype.ascend_resolver=function(){if(!r.is_empty(this.yaml_path_resolvers))return this.resolver_exact_paths.pop(),this.resolver_prefix_paths.pop()},e.prototype.check_resolver_prefix=function(e,n,r,i,o){var a,s,u;if(u=n[e-1],s=u[0],a=u[1],"string"==typeof s){if(i.tag!==s)return}else if(null!==s&&!(i instanceof s))return;if((!0!==a||null===o)&&(!1!==a&&null!==a||null!==o)){if("string"==typeof a){if(!(o instanceof t.ScalarNode)&&a===o.value)return}else if("number"==typeof a&&a!==o)return;return!0}},e.prototype.resolve=function(e,r,s){var u,l,c,p,f,h,d,m,v,g,y,_;if(e===t.ScalarNode&&s[0]){for(y=""===r?null!=(h=this.yaml_implicit_resolvers[""])?h:[]:null!=(d=this.yaml_implicit_resolvers[r[0]])?d:[],y=y.concat(null!=(m=this.yaml_implicit_resolvers[null])?m:[]),c=0,f=y.length;c<f;c++)if(v=y[c],_=v[0],g=v[1],r.match(g))return _;s=s[1]}u=!0;for(p in this.yaml_path_resolvers)null=={}[p]&&(u=!1);if(!u){if(l=this.resolver_exact_paths.slice(-1)[0],a.call(l,e)>=0)return l[e];if(a.call(l,null)>=0)return l[null]}return e===t.ScalarNode?i:e===t.SequenceNode?o:e===t.MappingNode?n:void 0},e}(),this.Resolver=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return i(t,e),t}(this.BaseResolver),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:bool",/^(?:yes|Yes|YES|true|True|TRUE|on|On|ON|no|No|NO|false|False|FALSE|off|Off|OFF)$/,"yYnNtTfFoO"),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:float",/^(?:[-+]?(?:[0-9][0-9_]*)\.[0-9_]*(?:[eE][-+][0-9]+)?|\.[0-9_]+(?:[eE][-+][0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\.[0-9_]*|[-+]?\.(?:inf|Inf|INF)|\.(?:nan|NaN|NAN))$/,"-+0123456789."),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:int",/^(?:[-+]?0b[01_]+|[-+]?0[0-7_]+|[-+]?(?:0|[1-9][0-9_]*)|[-+]?0x[0-9a-fA-F_]+|[-+]?0o[0-7_]+|[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+)$/,"-+0123456789"),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:merge",/^(?:<<)$/,"<"),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:null",/^(?:~|null|Null|NULL|)$/,["~","n","N",""]),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:timestamp",/^(?:[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]|[0-9][0-9][0-9][0-9]-[0-9][0-9]?-[0-9][0-9]?(?:[Tt]|[\x20\t]+)[0-9][0-9]?:[0-9][0-9]:[0-9][0-9](?:\.[0-9]*)?(?:[\x20\t]*(?:Z|[-+][0-9][0-9]?(?::[0-9][0-9])?))?)$/,"0123456789"),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:value",/^(?:=)$/,"="),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:yaml",/^(?:!|&|\*)$/,"!&*")}).call(this)},function(e,t){(function(){var e=function(e,n){function r(){this.constructor=e}for(var i in n)t.call(n,i)&&(e[i]=n[i]);return r.prototype=n.prototype,e.prototype=new r,e.__super__=n.prototype,e},t={}.hasOwnProperty;this.Token=function(){function e(e,t){this.start_mark=e,this.end_mark=t}return e}(),this.DirectiveToken=function(t){function n(e,t,n,r){this.name=e,this.value=t,this.start_mark=n,this.end_mark=r}return e(n,t),n.prototype.id="<directive>",n}(this.Token),this.DocumentStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<document start>",n}(this.Token),this.DocumentEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<document end>",n}(this.Token),this.StreamStartToken=function(t){function n(e,t,n){this.start_mark=e,this.end_mark=t,this.encoding=n}return e(n,t),n.prototype.id="<stream start>",n}(this.Token),this.StreamEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<stream end>",n}(this.Token),this.BlockSequenceStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<block sequence start>",n}(this.Token),this.BlockMappingStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<block mapping end>",n}(this.Token),this.BlockEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<block end>",n}(this.Token),this.FlowSequenceStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="[",n}(this.Token),this.FlowMappingStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="{",n}(this.Token),this.FlowSequenceEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="]",n}(this.Token),this.FlowMappingEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="}",n}(this.Token),this.KeyToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="?",n}(this.Token),this.ValueToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id=":",n}(this.Token),this.BlockEntryToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="-",n}(this.Token),this.FlowEntryToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id=",",n}(this.Token),this.AliasToken=function(t){function n(e,t,n){this.value=e,this.start_mark=t,this.end_mark=n}return e(n,t),n.prototype.id="<alias>",n}(this.Token),this.AnchorToken=function(t){function n(e,t,n){this.value=e,this.start_mark=t,this.end_mark=n}return e(n,t),n.prototype.id="<anchor>",n}(this.Token),this.TagToken=function(t){function n(e,t,n){this.value=e,this.start_mark=t,this.end_mark=n}return e(n,t),n.prototype.id="<tag>",n}(this.Token),this.ScalarToken=function(t){function n(e,t,n,r,i){this.value=e,this.plain=t,this.start_mark=n,this.end_mark=r,this.style=i}return e(n,t),n.prototype.id="<scalar>",n}(this.Token)}).call(this)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];return t.filter(function(e){return!!e}).join(" ").trim()}Object.defineProperty(t,"__esModule",{value:!0}),t.Collapse=t.Link=t.Select=t.Input=t.TextArea=t.Button=t.Row=t.Col=t.Container=void 0;var o=n(21),a=r(o),s=n(96),u=r(s),l=n(4),c=r(l),p=n(2),f=r(p),h=n(3),d=r(h),m=n(6),v=r(m),g=n(5),y=r(g),_=n(0),b=r(_),x=n(1),w=r(x),k=n(448);(t.Container=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){var e=this.props,t=e.fullscreen,n=e.full,r=(0,u.default)(e,["fullscreen","full"]);if(t)return b.default.createElement("section",r);var o="swagger-container"+(n?"-full":"");return b.default.createElement("section",(0,a.default)({},r,{className:i(r.className,o)}))}}]),t}(b.default.Component)).propTypes={fullscreen:w.default.bool,full:w.default.bool,className:w.default.string};var E={mobile:"",tablet:"-tablet",desktop:"-desktop",large:"-hd"};(t.Col=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){var e=this.props,t=e.hide,n=e.keepContents,r=(e.mobile,e.tablet,e.desktop,e.large,(0,u.default)(e,["hide","keepContents","mobile","tablet","desktop","large"]));if(t&&!n)return b.default.createElement("span",null);var o=[];for(var s in E)if(E.hasOwnProperty(s)){var l=E[s];if(s in this.props){var c=this.props[s];if(c<1){o.push("none"+l);continue}o.push("block"+l),o.push("col-"+c+l)}}var p=i.apply(void 0,[r.className].concat(o));return b.default.createElement("section",(0,a.default)({},r,{style:{display:t?"none":null},className:p}))}}]),t}(b.default.Component)).propTypes={hide:w.default.bool,keepContents:w.default.bool,mobile:w.default.number,tablet:w.default.number,desktop:w.default.number,large:w.default.number,className:w.default.string},(t.Row=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){return b.default.createElement("div",(0,a.default)({},this.props,{className:i(this.props.className,"wrapper")}))}}]),t}(b.default.Component)).propTypes={className:w.default.string};var S=t.Button=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){return b.default.createElement("button",(0,a.default)({},this.props,{className:i(this.props.className,"button")}))}}]),t}(b.default.Component);S.propTypes={className:w.default.string},S.defaultProps={className:""};var C=(t.TextArea=function(e){return b.default.createElement("textarea",e)},t.Input=function(e){return b.default.createElement("input",e)},t.Select=function(e){function t(e,n){(0,f.default)(this,t);var r=(0,v.default)(this,(t.__proto__||(0,c.default)(t)).call(this,e,n));A.call(r);var i=void 0;return i=e.value?e.value:e.multiple?[""]:"",r.state={value:i},r}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){var e=this.props,t=e.allowedValues,n=e.multiple,r=e.allowEmptyValue,i=this.state.value.toJS?this.state.value.toJS():this.state.value;return b.default.createElement("select",{className:this.props.className,multiple:n,value:i,onChange:this.onChange},r?b.default.createElement("option",{value:""},"--"):null,t.map(function(e,t){return b.default.createElement("option",{key:t,value:String(e)},String(e))}))}}]),t}(b.default.Component));C.propTypes={allowedValues:w.default.array,value:w.default.any,onChange:w.default.func,multiple:w.default.bool,allowEmptyValue:w.default.bool,className:w.default.string},C.defaultProps={multiple:!1,allowEmptyValue:!0};var A=function(){var e=this;this.onChange=function(t){var n=e.props,r=n.onChange,i=n.multiple,o=[].slice.call(t.target.options),a=void 0;a=i?o.filter(function(e){return e.selected}).map(function(e){return e.value}):t.target.value,e.setState({value:a}),r&&r(a)}};(t.Link=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){return b.default.createElement("a",(0,a.default)({},this.props,{className:i(this.props.className,"link")}))}}]),t}(b.default.Component)).propTypes={className:w.default.string};var D=function(e){var t=e.children;return b.default.createElement("div",{style:{height:"auto",border:"none",margin:0,padding:0}}," ",t," ")};D.propTypes={children:w.default.node};var O=t.Collapse=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"renderNotAnimated",value:function(){return this.props.isOpened?b.default.createElement(D,null,this.props.children):b.default.createElement("noscript",null)}},{key:"render",value:function(){var e=this.props,t=e.animated,n=e.isOpened,r=e.children;return t?(r=n?r:null,b.default.createElement(k.Collapse,{isOpened:n},b.default.createElement(D,null,r))):this.renderNotAnimated()}}]),t}(b.default.Component);O.propTypes={isOpened:w.default.bool,children:w.default.node.isRequired,animated:w.default.bool},O.defaultProps={isOpened:!1,animated:!1}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1072),_=r(y),b=n(12),x=r(b),w=n(1),k=r(w),E=function(e){function t(){var e,n,r,i;(0,l.default)(this,t);for(var o=arguments.length,a=Array(o),u=0;u<o;u++)a[u]=arguments[u];return n=r=(0,h.default)(this,(e=t.__proto__||(0,s.default)(t)).call.apply(e,[this].concat(a))),r.getModelName=function(e){return-1!==e.indexOf("#/definitions/")?e.replace(/^.*#\/definitions\//,""):-1!==e.indexOf("#/components/schemas/")?e.replace("#/components/schemas/",""):void 0},r.getRefSchema=function(e){return r.props.specSelectors.findDefinition(e)},i=n,(0,h.default)(r,i)}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.getConfigs,r=e.specSelectors,i=e.schema,a=e.required,s=e.name,u=e.isRef,l=e.specPath,c=t("ObjectModel"),p=t("ArrayModel"),f=t("PrimitiveModel"),h="object",d=i&&i.get("$$ref");!s&&d&&(s=this.getModelName(d)),!i&&d&&(i=this.getRefSchema(s));var m=r.isOAS3()&&i.get("deprecated");switch(u=void 0!==u?u:!!d,h=i&&i.get("type")||h){case"object":return g.default.createElement(c,(0,o.default)({className:"object"},this.props,{specPath:l,getConfigs:n,schema:i,name:s,deprecated:m,isRef:u}));case"array":return g.default.createElement(p,(0,o.default)({className:"array"},this.props,{getConfigs:n,schema:i,name:s,deprecated:m,required:a}));case"string":case"number":case"integer":case"boolean":default:return g.default.createElement(f,(0,o.default)({},this.props,{getComponent:t,getConfigs:n,schema:i,name:s,deprecated:m,required:a}))}}}]),t}(_.default);E.propTypes={schema:x.default.orderedMap.isRequired,getComponent:k.default.func.isRequired,getConfigs:k.default.func.isRequired,specSelectors:k.default.object.isRequired,name:k.default.string,isRef:k.default.bool,required:k.default.bool,expandDepth:k.default.number,depth:k.default.number,specPath:x.default.list.isRequired},t.default=E},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.source,n=new h.default({html:!0,typographer:!0,breaks:!0,linkify:!0,linkTarget:"_blank"}).render(t),r=o(n);return t&&n&&r?l.default.createElement("div",{className:"markdown",dangerouslySetInnerHTML:{__html:r}}):null}function o(e){return(0,m.default)(e,v)}Object.defineProperty(t,"__esModule",{value:!0});var a=n(21),s=r(a);t.sanitizer=o;var u=n(0),l=r(u),c=n(1),p=r(c),f=n(1126),h=r(f),d=n(1179),m=r(d);i.propTypes={source:p.default.string.isRequired},t.default=i;var v={allowedTags:m.default.defaults.allowedTags.concat(["h1","h2","img","span"]),allowedAttributes:(0,s.default)({},m.default.defaults.allowedAttributes,{img:m.default.defaults.allowedAttributes.img.concat(["title"]),td:["colspan"],"*":["class"]}),textFilter:function(e){return e.replace(/&quot;/g,'"')}}},function(e,t,n){"use strict";var r=n(9),i=n(1208);i.keys().forEach(function(t){if("./index.js"!==t){var n=i(t);e.exports[(0,r.pascalCaseFilename)(t)]=n.default?n.default:n}})},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){function n(e,t,i){if(!e)return i&&i.start_mark?i.start_mark.line:0;if(t.length&&e.tag===b)for(r=0;r<e.value.length;r++){var o=e.value[r],a=o[0],s=o[1];if(a.value===t[0])return n(s,t.slice(1),e);if(a.value===t[0].replace(/\[.*/,"")){var u=parseInt(t[0].match(/\[(.*)\]/)[1]);if(1===s.value.length&&0!==u&&u)var l=(0,g.default)(s.value[0],{value:u.toString()});else var l=s.value[u];return n(l,t.slice(1),s.value)}}if(t.length&&e.tag===x){var c=e.value[t[0]];if(c&&c.tag)return n(c,t.slice(1),e.value)}return e.tag!==b||Array.isArray(i)?e.start_mark.line+1:e.start_mark.line}if("string"!=typeof e)throw new TypeError("yaml should be a string");if(!(0,m.default)(t))throw new TypeError("path should be an array of strings");var r=0;return n(_(e),t)}function o(e,t){function n(e,o){if(e.tag===b)for(i=0;i<e.value.length;i++){var a=e.value[i],s=a[0],u=a[1];if(s.value===t[0])return t.shift(),n(u,s)}if(e.tag===x){var l=e.value[t[0]];if(l&&l.tag)return t.shift(),n(l,o)}if(t.length)return r;var c={start:{line:e.start_mark.line,column:e.start_mark.column,pointer:e.start_mark.pointer},end:{line:e.end_mark.line,column:e.end_mark.column,pointer:e.end_mark.pointer}};return o&&(c.key_start={line:o.start_mark.line,column:o.start_mark.column,pointer:o.start_mark.pointer},c.key_end={line:o.end_mark.line,column:o.end_mark.column,pointer:o.end_mark.pointer}),c}if("string"!=typeof e)throw new TypeError("yaml should be a string");if(!(0,m.default)(t))throw new TypeError("path should be an array of strings");var r={start:{line:-1,column:-1},end:{line:-1,column:-1}},i=0;return n(_(e))}function a(e,t){function n(e){function r(e){return e.start_mark.line===e.end_mark.line?t.line===e.start_mark.line&&e.start_mark.column<=t.column&&e.end_mark.column>=t.column:t.line===e.start_mark.line?t.column>=e.start_mark.column:t.line===e.end_mark.line?t.column<=e.end_mark.column:e.start_mark.line<t.line&&e.end_mark.line>t.line}var o=0;if(!e||-1===[b,x].indexOf(e.tag))return i;if(e.tag===b)for(o=0;o<e.value.length;o++){var a=e.value[o],s=a[0],u=a[1];if(r(s))return i;if(r(u))return i.push(s.value),n(u)}if(e.tag===x)for(o=0;o<e.value.length;o++){var l=e.value[o];if(r(l))return i.push(o.toString()),n(l)}return i}if("string"!=typeof e)throw new TypeError("yaml should be a string");if("object"!==(void 0===t?"undefined":(0,p.default)(t))||"number"!=typeof t.line||"number"!=typeof t.column)throw new TypeError("position should be an object with line and column properties");try{var r=_(e)}catch(n){return console.error("Error composing AST",n),console.error("Problem area:\n",e.split("\n").slice(t.line-5,t.line+5).join("\n")),null}var i=[];return n(r)}function s(e){return function(){for(var t=arguments.length,n=Array(t),r=0;r<t;r++)n[r]=arguments[r];return new l.default(function(t){return t(e.apply(void 0,n))})}}Object.defineProperty(t,"__esModule",{value:!0}),t.getLineNumberForPathAsync=t.positionRangeForPathAsync=t.pathForPositionAsync=void 0;var u=n(332),l=r(u),c=n(48),p=r(c);t.getLineNumberForPath=i,t.positionRangeForPath=o,t.pathForPosition=a;var f=n(1206),h=r(f),d=n(20),m=r(d),v=n(223),g=r(v),y=n(9),_=(0,y.memoize)(h.default.compose),b="tag:yaml.org,2002:map",x="tag:yaml.org,2002:seq";t.pathForPositionAsync=s(a),t.positionRangeForPathAsync=s(o),t.getLineNumberForPathAsync=s(i)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{fn:{AST:i},components:{JumpToPath:a.default}}};var r=n(272),i=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(r),o=n(274),a=function(e){return e&&e.__esModule?e:{default:e}}(o)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){return null}}]),t}(m.default.Component);t.default=v},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{afterLoad:function(e){this.rootInjects=this.rootInjects||{},this.rootInjects.initOAuth=e.authActions.configureAuth},statePlugins:{auth:{reducers:o.default,actions:s,selectors:l},spec:{wrapActions:p}}}};var i=n(276),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(168),s=r(a),u=n(277),l=r(u),c=n(278),p=r(c)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i,o=n(36),a=r(o),s=n(30),u=r(s),l=n(18),c=r(l),p=n(7),f=n(9),h=n(168);t.default=(i={},(0,a.default)(i,h.SHOW_AUTH_POPUP,function(e,t){var n=t.payload;return e.set("showDefinitions",n)}),(0,a.default)(i,h.AUTHORIZE,function(e,t){var n=t.payload,r=(0,p.fromJS)(n),i=e.get("authorized")||(0,p.Map)();return r.entrySeq().forEach(function(e){var t=(0,c.default)(e,2),n=t[0],r=t[1],o=r.getIn(["schema","type"]);if("apiKey"===o||"http"===o)i=i.set(n,r);else if("basic"===o){var a=r.getIn(["value","username"]),s=r.getIn(["value","password"]);i=i.setIn([n,"value"],{username:a,header:"Basic "+(0,f.btoa)(a+":"+s)}),i=i.setIn([n,"schema"],r.get("schema"))}}),e.set("authorized",i)}),(0,a.default)(i,h.AUTHORIZE_OAUTH2,function(e,t){var n=t.payload,r=n.auth,i=n.token,o=void 0;return r.token=(0,u.default)({},i),o=(0,p.fromJS)(r),e.setIn(["authorized",o.get("name")],o)}),(0,a.default)(i,h.LOGOUT,function(e,t){var n=t.payload,r=e.get("authorized").withMutations(function(e){n.forEach(function(t){e.delete(t)})});return e.set("authorized",r)}),(0,a.default)(i,h.CONFIGURE_AUTH,function(e,t){var n=t.payload;return e.set("configs",n)}),i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.getConfigs=t.isAuthorized=t.authorized=t.definitionsForRequirements=t.getDefinitionsByNames=t.definitionsToAuthorize=t.shownDefinitions=void 0;var i=n(47),o=r(i),a=n(18),s=r(a),u=n(60),l=n(7),c=function(e){return e};t.shownDefinitions=(0,u.createSelector)(c,function(e){return e.get("showDefinitions")}),t.definitionsToAuthorize=(0,u.createSelector)(c,function(){return function(e){var t=e.specSelectors,n=t.securityDefinitions()||(0,l.Map)({}),r=(0,l.List)();return n.entrySeq().forEach(function(e){var t=(0,s.default)(e,2),n=t[0],i=t[1],o=(0,l.Map)();o=o.set(n,i),r=r.push(o)}),r}}),t.getDefinitionsByNames=function(e,t){return function(e){var n=e.specSelectors;console.warn("WARNING: getDefinitionsByNames is deprecated and will be removed in the next major version.");var r=n.securityDefinitions(),i=(0,l.List)();return t.valueSeq().forEach(function(e){var t=(0,l.Map)();e.entrySeq().forEach(function(e){var n=(0,s.default)(e,2),i=n[0],o=n[1],a=r.get(i),u=void 0;"oauth2"===a.get("type")&&o.size&&(u=a.get("scopes"),u.keySeq().forEach(function(e){o.contains(e)||(u=u.delete(e))}),a=a.set("allowedScopes",u)),t=t.set(i,a)}),i=i.push(t)}),i}},t.definitionsForRequirements=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:(0,l.List)();return function(e){return(e.authSelectors.definitionsToAuthorize()||(0,l.List)()).filter(function(e){return t.some(function(t){return t.get(e.keySeq().first())})})}},t.authorized=(0,u.createSelector)(c,function(e){return e.get("authorized")||(0,l.Map)()}),t.isAuthorized=function(e,t){return function(e){var n=e.authSelectors,r=n.authorized();return l.List.isList(t)?!!t.toJS().filter(function(e){return-1===(0,o.default)(e).map(function(e){return!!r.get(e)}).indexOf(!1)}).length:null}},t.getConfigs=(0,u.createSelector)(c,function(e){return e.get("configs")})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.execute=void 0;var r=n(21),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.execute=function(e,t){var n=t.authSelectors,r=t.specSelectors;return function(t){var o=t.path,a=t.method,s=t.operation,u=t.extras,l={authorized:n.authorized()&&n.authorized().toJS(),definitions:r.securityDefinitions()&&r.securityDefinitions().toJS(),specSecurity:r.security()&&r.security().toJS()};return e((0,i.default)({path:o,method:a,operation:s,securities:l},u))}}},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}function i(e){return e&&e.__esModule?e:{default:e}}function o(){return{statePlugins:{spec:{actions:g,selectors:y},configs:{reducers:m.default,actions:p,selectors:h}}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=o;var a=n(211),s=i(a),u=n(1007),l=i(u),c=n(169),p=r(c),f=n(281),h=r(f),d=n(280),m=i(d),v=function(e,t){try{return s.default.safeLoad(e)}catch(e){return t&&t.errActions.newThrownErr(new Error(e)),{}}},g={downloadConfig:function(e){return function(t){return(0,t.fn.fetch)(e)}},getConfigByUrl:function(e,t){return function(n){function r(n){n instanceof Error||n.status>=400?(i.updateLoadingStatus("failedConfig"),i.updateLoadingStatus("failedConfig"),i.updateUrl(""),console.error(n.statusText+" "+e),t(null)):t(v(n.text))}var i=n.specActions;if(e)return i.downloadConfig(e).then(r,r)}}},y={getLocalConfig:function(){return v(l.default)}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,i=n(36),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(7),s=n(169);t.default=(r={},(0,o.default)(r,s.UPDATE_CONFIGS,function(e,t){return e.merge((0,a.fromJS)(t.payload))}),(0,o.default)(r,s.TOGGLE_CONFIGS,function(e,t){var n=t.payload,r=e.get(n);return e.set(n,!r)}),r)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.get=function(e,t){return e.getIn(Array.isArray(t)?t:[t])}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.setHash=function(e){return e?history.pushState(null,null,"#"+e):window.location.hash=""}},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{statePlugins:{spec:{wrapActions:o},layout:{wrapActions:s}}}};var i=n(285),o=r(i),a=n(284),s=r(a)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.show=void 0;var r=n(18),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(282),a=n(9);t.show=function(e,t){var n=t.getConfigs;return function(){for(var t=arguments.length,r=Array(t),s=0;s<t;s++)r[s]=arguments[s];e.apply(void 0,r);var u=n().deepLinking;if(u&&"false"!==u)try{var l=r[0],c=r[1],p=(0,i.default)(l,1),f=p[0];if("operations-tag"===f||"operations"===f){if(!c)return(0,o.setHash)("/");if("operations"===f){var h=(0,i.default)(l,3),d=h[1],m=h[2];(0,o.setHash)("/"+(0,a.createDeepLinkPath)(d)+"/"+(0,a.createDeepLinkPath)(m))}if("operations-tag"===f){var v=(0,i.default)(l,2),g=v[1];(0,o.setHash)("/"+(0,a.createDeepLinkPath)(g))}}}catch(e){console.error(e)}}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.updateResolved=void 0;var i=n(18),o=r(i),a=n(1207),s=r(a),u=n(9),l=!1;t.updateResolved=function(e,t){var n=t.layoutActions,r=t.getConfigs;return function(){e.apply(void 0,arguments);var t=r().deepLinking;if(t&&"false"!==t){if(window.location.hash&&!l){var i=window.location.hash.slice(1);"!"===i[0]&&(i=i.slice(1)),"/"===i[0]&&(i=i.slice(1));var a=i.split("/"),c=(0,o.default)(a,2),p=c[0],f=c[1],h=document.querySelector(".swagger-ui"),d=s.default.createScroller(h),m=void 0;p&&f?(n.show(["operations-tag",p],!0),n.show(["operations",p,f],!0),m=document.getElementById("operations-"+(0,u.escapeDeepLinkPath)(p)+"-"+(0,u.escapeDeepLinkPath)(f))):p&&(n.show(["operations-tag",p],!0),m=document.getElementById("operations-tag-"+(0,u.escapeDeepLinkPath)(p))),m&&(d.to(m),setTimeout(function(){0===s.default.getY()&&s.default.to(m)},50))}l=!0}}}},function(e,t,n){"use strict";function r(e){var t=e.fn;return{statePlugins:{spec:{actions:{download:function(e){return function(n){function r(t){if(t instanceof Error||t.status>=400)return a.updateLoadingStatus("failed"),i.newThrownErr(new Error((t.message||t.statusText)+" "+e));a.updateLoadingStatus("success"),a.updateSpec(t.text),a.updateUrl(e)}var i=n.errActions,o=n.specSelectors,a=n.specActions,s=n.getConfigs,u=t.fetch,l=s();e=e||o.url(),a.updateLoadingStatus("loading"),u({url:e,loadSpec:!0,requestInterceptor:l.requestInterceptor||function(e){return e},responseInterceptor:l.responseInterceptor||function(e){return e},credentials:"same-origin",headers:{Accept:"application/json,*/*"}}).then(r,r)}},updateLoadingStatus:function(e){var t=[null,"loading","failed","success","failedConfig"];return-1===t.indexOf(e)&&console.error("Error: "+e+" is not one of "+(0,o.default)(t)),{type:"spec_update_loading_status",payload:e}}},reducers:{spec_update_loading_status:function(e,t){return"string"==typeof t.payload?e.set("loadingStatus",t.payload):e}},selectors:{loadingStatus:(0,a.createSelector)(function(e){return e||(0,s.Map)()},function(e){return e.get("loadingStatus")||null})}}}}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(35),o=function(e){return e&&e.__esModule?e:{default:e}}(i);t.default=r;var a=n(60),s=n(7)},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}function i(e,t){var n={jsSpec:t.specSelectors.specJson().toJS()};return(0,a.default)(h,function(e,t){try{return t.transform(e,n).filter(function(e){return!!e})}catch(t){return console.error("Transformer error:",t),e}},e).filter(function(e){return!!e}).map(function(e){return!e.get("line")&&e.get("path"),e})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(953),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s=n(288),u=r(s),l=n(289),c=r(l),p=n(290),f=r(p),h=[u,c,f]},function(e,t,n){"use strict";function r(e){return e.map(function(e){var t=e.get("message").indexOf("is not of a type(s)");if(t>-1){var n=e.get("message").slice(t+"is not of a type(s)".length).split(",");return e.set("message",e.get("message").slice(0,t)+i(n))}return e})}function i(e){return e.reduce(function(e,t,n,r){return n===r.length-1&&r.length>1?e+"or "+t:r[n+1]&&r.length>2?e+t+", ":r[n+1]?e+t+" ":e+t},"should be a")}Object.defineProperty(t,"__esModule",{value:!0}),t.transform=r},function(e,t,n){"use strict";function r(e,t){t.jsSpec;return e}Object.defineProperty(t,"__esModule",{value:!0}),t.transform=r;var i=n(224);(function(e){e&&e.__esModule})(i),n(7)},function(e,t,n){"use strict";function r(e){return e.map(function(e){return e.set("message",i(e.get("message"),"instance."))})}function i(e,t){return e.replace(new RegExp(t,"g"),"")}Object.defineProperty(t,"__esModule",{value:!0}),t.transform=r},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){return{statePlugins:{err:{reducers:(0,o.default)(e),actions:s,selectors:l}}}};var i=n(292),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(128),s=r(a),u=n(293),l=r(u)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(36),o=r(i),a=n(30),s=r(a);t.default=function(e){var t;return t={},(0,o.default)(t,u.NEW_THROWN_ERR,function(t,n){var r=n.payload,i=(0,s.default)(m,r,{type:"thrown"});return t.update("errors",function(e){return(e||(0,p.List)()).push((0,p.fromJS)(i))}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.NEW_THROWN_ERR_BATCH,function(t,n){var r=n.payload;return r=r.map(function(e){return(0,p.fromJS)((0,s.default)(m,e,{type:"thrown"}))}),t.update("errors",function(e){return(e||(0,p.List)()).concat((0,p.fromJS)(r))}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.NEW_SPEC_ERR,function(t,n){var r=n.payload,i=(0,p.fromJS)(r);return i=i.set("type","spec"),t.update("errors",function(e){return(e||(0,p.List)()).push((0,p.fromJS)(i)).sortBy(function(e){return e.get("line")})}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.NEW_SPEC_ERR_BATCH,function(t,n){var r=n.payload;return r=r.map(function(e){return(0,p.fromJS)((0,s.default)(m,e,{type:"spec"}))}),t.update("errors",function(e){return(e||(0,p.List)()).concat((0,p.fromJS)(r))}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.NEW_AUTH_ERR,function(t,n){var r=n.payload,i=(0,p.fromJS)((0,s.default)({},r));return i=i.set("type","auth"),t.update("errors",function(e){return(e||(0,p.List)()).push((0,p.fromJS)(i))}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.CLEAR,function(e,t){var n=t.payload;if(n){var r=f.default.fromJS((0,c.default)((e.get("errors")||(0,p.List)()).toJS(),n));return e.merge({errors:r})}}),t};var u=n(128),l=n(954),c=r(l),p=n(7),f=r(p),h=n(287),d=r(h),m={line:0,level:"error",message:"Unknown error"}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.lastError=t.allErrors=void 0;var r=n(7),i=n(60),o=function(e){return e},a=t.allErrors=(0,i.createSelector)(o,function(e){return e.get("errors",(0,r.List)())});t.lastError=(0,i.createSelector)(a,function(e){return e.last()})},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{statePlugins:{layout:{reducers:o.default,actions:s,selectors:l}}}};var i=n(295),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(170),s=r(a),u=n(296),l=r(u)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,i=n(36),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(7),s=n(170);t.default=(r={},(0,o.default)(r,s.UPDATE_LAYOUT,function(e,t){return e.set("layout",t.payload)}),(0,o.default)(r,s.UPDATE_FILTER,function(e,t){return e.set("filter",t.payload)}),(0,o.default)(r,s.SHOW,function(e,t){var n=t.payload.shown,r=(0,a.fromJS)(t.payload.thing);return e.update("shown",(0,a.fromJS)({}),function(e){return e.set(r,n)})}),(0,o.default)(r,s.UPDATE_MODE,function(e,t){var n=t.payload.thing,r=t.payload.mode;return e.setIn(["modes"].concat(n),(r||"")+"")}),r)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.showSummary=t.whatMode=t.isShown=t.currentFilter=t.current=void 0;var r=n(97),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(60),a=n(9),s=n(7),u=function(e){return e},l=(t.current=function(e){return e.get("layout")},t.currentFilter=function(e){return e.get("filter")},t.isShown=function(e,t,n){return t=(0,a.normalizeArray)(t),e.get("shown",(0,s.fromJS)({})).get((0,s.fromJS)(t),n)});t.whatMode=function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"";return t=(0,a.normalizeArray)(t),e.getIn(["modes"].concat((0,i.default)(t)),n)},t.showSummary=(0,o.createSelector)(u,function(e){return!l(e,"editor")})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){function t(e){for(var t,n=arguments.length,r=Array(n>1?n-1:0),o=1;o<n;o++)r[o-1]=arguments[o];i(e)>=a&&(t=console)[e].apply(t,r)}var n=e.configs,r={debug:0,info:1,log:2,warn:3,error:4},i=function(e){return r[e]||-1},o=n.logLevel,a=i(o);return t.warn=t.bind(null,"warn"),t.error=t.bind(null,"error"),t.info=t.bind(null,"info"),t.debug=t.bind(null,"debug"),{rootInjects:{log:t}}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.definitionsToAuthorize=void 0;var i=n(36),o=r(i),a=n(18),s=r(a),u=n(60),l=n(7),c=n(34),p=function(e){return e};t.definitionsToAuthorize=function(e){return function(t,n){return function(r){for(var i=arguments.length,o=Array(i>1?i-1:0),a=1;a<i;a++)o[a-1]=arguments[a];var s=n.getSystem().specSelectors.specJson();return(0,c.isOAS3)(s)?e.apply(void 0,[n].concat(o)):t.apply(void 0,o)}}}((0,u.createSelector)(p,function(e){return e.specSelectors.securityDefinitions()},function(e,t){var n=(0,l.List)();return t.entrySeq().forEach(function(e){var t=(0,s.default)(e,2),r=t[0],i=t[1],a=i.get("type");"oauth2"===a&&i.get("flows").entrySeq().forEach(function(e){var t=(0,s.default)(e,2),a=t[0],u=t[1],c=(0,l.fromJS)({flow:a,authorizationUrl:u.get("authorizationUrl"),tokenUrl:u.get("tokenUrl"),scopes:u.get("scopes"),type:i.get("type")});n=n.push(new l.Map((0,o.default)({},r,c.filter(function(e){return void 0!==e}))))}),"http"!==a&&"apiKey"!==a||(n=n.push(new l.Map((0,o.default)({},r,i))))}),n}))},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(0),s=r(a),u=n(1),l=r(u),c=n(12),p=r(c),f=n(7),h=function(e){var t=e.callbacks,n=e.getComponent,r=n("OperationContainer",!0);if(!t)return s.default.createElement("span",null,"No callbacks");var i=t.map(function(t,n){return s.default.createElement("div",{key:n},s.default.createElement("h2",null,n),t.map(function(t,n){return s.default.createElement("div",{key:n},t.map(function(t,i){var a=(0,f.fromJS)({operation:t});return s.default.createElement(r,(0,o.default)({},e,{op:a,key:i,tag:"",method:i,path:n,allowTryItOut:!1}))}))}))});return s.default.createElement("div",null,i)};h.propTypes={getComponent:l.default.func.isRequired,callbacks:p.default.iterable.isRequired},t.default=h},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));_.call(r);var i=r.props,a=i.name,u=i.schema,l=r.getValue();return r.state={name:a,schema:u,value:l},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"getValue",value:function(){var e=this.props,t=e.name,n=e.authorized;return n&&n.getIn([t,"value"])}},{key:"render",value:function(){var e=this.props,t=e.schema,n=e.getComponent,r=e.errSelectors,i=e.name,o=n("Input"),a=n("Row"),s=n("Col"),u=n("authError"),l=n("Markdown"),c=n("JumpToPath",!0),p=t.get("scheme"),f=this.getValue(),h=r.allErrors().filter(function(e){return e.get("authId")===i});if("basic"===p){var d=f?f.get("username"):null;return m.default.createElement("div",null,m.default.createElement("h4",null,m.default.createElement("code",null,i||t.get("name")),"  (http, Basic)",m.default.createElement(c,{path:["securityDefinitions",i]})),d&&m.default.createElement("h6",null,"Authorized"),m.default.createElement(a,null,m.default.createElement(l,{source:t.get("description")})),m.default.createElement(a,null,m.default.createElement("label",null,"Username:"),d?m.default.createElement("code",null," ",d," "):m.default.createElement(s,null,m.default.createElement(o,{type:"text",required:"required",name:"username",onChange:this.onChange}))),m.default.createElement(a,null,m.default.createElement("label",null,"Password:"),d?m.default.createElement("code",null," ****** "):m.default.createElement(s,null,m.default.createElement(o,{required:"required",autoComplete:"new-password",name:"password",type:"password",onChange:this.onChange}))),h.valueSeq().map(function(e,t){return m.default.createElement(u,{error:e,key:t})}))}return"bearer"===p?m.default.createElement("div",null,m.default.createElement("h4",null,m.default.createElement("code",null,i||t.get("name")),"  (http, Bearer)",m.default.createElement(c,{path:["securityDefinitions",i]})),f&&m.default.createElement("h6",null,"Authorized"),m.default.createElement(a,null,m.default.createElement(l,{source:t.get("description")})),m.default.createElement(a,null,m.default.createElement("label",null,"Value:"),f?m.default.createElement("code",null," ****** "):m.default.createElement(s,null,m.default.createElement(o,{type:"text",onChange:this.onChange}))),h.valueSeq().map(function(e,t){return m.default.createElement(u,{error:e,key:t})})):m.default.createElement("div",null,m.default.createElement("em",null,m.default.createElement("b",null,i)," HTTP authentication: unsupported or missing scheme"))}}]),t}(m.default.Component);y.propTypes={authorized:g.default.object,getComponent:g.default.func.isRequired,errSelectors:g.default.object.isRequired,schema:g.default.object.isRequired,name:g.default.string.isRequired,onChange:g.default.func};var _=function(){var e=this;this.onChange=function(t){var n=e.props.onChange,r=t.target,i=r.value,o=r.name,a=e.state.value||{};o?a[o]=i:a=i,e.setState({value:a},function(){return n(e.state)})}};t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(299),o=r(i),a=n(305),s=r(a),u=n(302),l=r(u),c=n(306),p=r(c),f=n(304),h=r(f),d=n(300),m=r(d),v=n(303),g=r(v);t.default={Callbacks:o.default,HttpAuth:m.default,RequestBody:s.default,Servers:p.default,RequestBodyEditor:h.default,OperationServers:g.default,operationLink:l.default}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){return"string"!=typeof t?"":t.split("\n").map(function(t,n){return n>0?Array(e+1).join(" ")+t:t}).join("\n")}Object.defineProperty(t,"__esModule",{value:!0});var o=n(35),a=r(o),s=n(4),u=r(s),l=n(2),c=r(l),p=n(3),f=r(p),h=n(6),d=r(h),m=n(5),v=r(m),g=n(0),y=r(g),_=n(1),b=r(_),x=n(12),w=r(x),k=function(e){function t(){return(0,c.default)(this,t),(0,d.default)(this,(t.__proto__||(0,u.default)(t)).apply(this,arguments))}return(0,v.default)(t,e),(0,f.default)(t,[{key:"render",value:function(){var e=this.props,t=e.link,n=e.name,r=e.getComponent,o=r("Markdown"),s=t.get("operationId")||t.get("operationRef"),u=t.get("parameters")&&t.get("parameters").toJS(),l=t.get("description");return y.default.createElement("div",{style:{marginBottom:"1.5em"}},y.default.createElement("div",{style:{marginBottom:".5em"}},y.default.createElement("b",null,y.default.createElement("code",null,n)),l?y.default.createElement(o,{source:l}):null),y.default.createElement("pre",null,"Operation `",s,"`",y.default.createElement("br",null),y.default.createElement("br",null),"Parameters ",i(0,(0,a.default)(u,null,2))||"{}",y.default.createElement("br",null)))}}]),t}(g.Component);k.propTypes={getComponent:b.default.func.isRequired,link:w.default.orderedMap.isRequired,name:b.default.String},t.default=k},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(12),x=r(b),w=function(e){function t(){var e,n,r,i;(0,l.default)(this,t);for(var a=arguments.length,u=Array(a),c=0;c<a;c++)u[c]=arguments[c];return n=r=(0,h.default)(this,(e=t.__proto__||(0,s.default)(t)).call.apply(e,[this].concat(u))),r.setSelectedServer=function(e){var t=r.props,n=t.path,i=t.method;return r.forceUpdate(),r.props.setSelectedServer(e,n+":"+i)},r.setServerVariableValue=function(e){var t=r.props,n=t.path,i=t.method;return r.forceUpdate(),r.props.setServerVariableValue((0,o.default)({},e,{namespace:n+":"+i}))},r.getSelectedServer=function(){var e=r.props,t=e.path,n=e.method;return r.props.getSelectedServer(t+":"+n)},r.getServerVariable=function(e,t){var n=r.props,i=n.path,o=n.method;return r.props.getServerVariable({namespace:i+":"+o,server:e},t)},r.getEffectiveServerValue=function(e){var t=r.props,n=t.path,i=t.method;return r.props.getEffectiveServerValue({server:e,namespace:n+":"+i})},i=n,(0,h.default)(r,i)}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.operationServers,n=e.pathServers,r=e.getComponent;if(!t&&!n)return null;var i=r("Servers"),o=t||n,a=t?"operation":"path";return g.default.createElement("div",{className:"opblock-section operation-servers"},g.default.createElement("div",{className:"opblock-section-header"},g.default.createElement("div",{className:"tab-header"},g.default.createElement("h4",{className:"opblock-title"},"Servers"))),g.default.createElement("div",{className:"opblock-description-wrapper"},g.default.createElement("h4",{className:"message"},"These ",a,"-level options override the global server options."),g.default.createElement(i,{servers:o,currentServer:this.getSelectedServer(),setSelectedServer:this.setSelectedServer,setServerVariableValue:this.setServerVariableValue,getServerVariable:this.getServerVariable,getEffectiveServerValue:this.getEffectiveServerValue})))}}]),t}(g.default.Component);w.propTypes={path:_.default.string.isRequired,method:_.default.string.isRequired,operationServers:x.default.list,pathServers:x.default.list,setSelectedServer:_.default.func.isRequired,setServerVariableValue:_.default.func.isRequired,getSelectedServer:_.default.func.isRequired,getServerVariable:_.default.func.isRequired,getEffectiveServerValue:_.default.func.isRequired,getComponent:_.default.func.isRequired},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(7),_=n(9),b=Function.prototype,x=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));return r.setValueToSample=function(e){r.onChange(r.sample(e))},r.sample=function(e){var t=r.props,n=t.requestBody,i=t.mediaType,o=n.getIn(["content",e||i,"schema"]).toJS();return(0,_.getSampleSchema)(o,e||i,{includeWriteOnly:!0})},r.onChange=function(e){r.setState({value:e}),r.props.onChange(e)},r.handleOnChange=function(e){var t=r.props.mediaType,n=/json/i.test(t),i=n?e.target.value.trim():e.target.value;r.onChange(i)},r.toggleIsEditBox=function(){return r.setState(function(e){return{isEditBox:!e.isEditBox}})},r.state={isEditBox:!1,value:""},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){this.setValueToSample.call(this)}},{key:"componentWillReceiveProps",value:function(e){this.props.mediaType!==e.mediaType&&this.setValueToSample(e.mediaType),!this.props.isExecute&&e.isExecute&&this.setState({isEditBox:!0})}},{key:"componentDidUpdate",value:function(e){this.props.requestBody!==e.requestBody&&this.setValueToSample(this.props.mediaType)}},{key:"render",value:function(){var e=this.props,t=e.isExecute,n=e.getComponent,r=n("Button"),i=n("TextArea"),o=n("highlightCode"),a=this.state,s=a.value,u=a.isEditBox;return m.default.createElement("div",{className:"body-param"},u&&t?m.default.createElement(i,{className:"body-param__text",value:s,onChange:this.handleOnChange}):s&&m.default.createElement(o,{className:"body-param__example",value:s}),m.default.createElement("div",{className:"body-param-options"},t?m.default.createElement("div",{className:"body-param-edit"},m.default.createElement(r,{className:u?"btn cancel body-param__example-edit":"btn edit body-param__example-edit",onClick:this.toggleIsEditBox},u?"Cancel":"Edit")):null))}}]),t}(d.PureComponent);x.propTypes={requestBody:g.default.object.isRequired,mediaType:g.default.string.isRequired,onChange:g.default.func,getComponent:g.default.func.isRequired,isExecute:g.default.bool,specSelectors:g.default.object.isRequired},x.defaultProps={mediaType:"application/json",requestBody:(0,y.fromJS)({}),onChange:b},t.default=x},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(0),o=r(i),a=n(1),s=r(a),u=n(12),l=r(u),c=n(7),p=function(e){var t=e.requestBody,n=e.getComponent,r=e.getConfigs,i=e.specSelectors,a=e.contentType,s=e.isExecute,u=e.specPath,l=e.onChange,p=n("Markdown"),f=n("modelExample"),h=n("RequestBodyEditor"),d=t&&t.get("description")||null,m=t&&t.get("content")||new c.OrderedMap;a=a||m.keySeq().first();var v=m.get(a);return v?o.default.createElement("div",null,d&&o.default.createElement(p,{source:d}),o.default.createElement(f,{getComponent:n,getConfigs:r,specSelectors:i,expandDepth:1,isExecute:s,schema:v.get("schema"),specPath:u.push("content",a),example:o.default.createElement(h,{requestBody:t,onChange:l,mediaType:a,getComponent:n,isExecute:s,specSelectors:i})})):null};p.propTypes={requestBody:l.default.orderedMap.isRequired,getComponent:s.default.func.isRequired,getConfigs:s.default.func.isRequired,specSelectors:s.default.object.isRequired,contentType:s.default.string,isExecute:s.default.bool.isRequired,onChange:s.default.func.isRequired,specPath:s.default.array.isRequired},t.default=p},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(7),g=n(1),y=r(g),_=n(12),b=r(_),x=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onServerChange=function(e){r.setServer(e.target.value)},r.onServerVariableValueChange=function(e){var t=r.props,n=t.setServerVariableValue,i=t.currentServer,o=e.target.getAttribute("data-variable"),a=e.target.value;"function"==typeof n&&n({server:i,key:o,val:a})},r.setServer=function(e){(0,r.props.setSelectedServer)(e)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){var e=this.props,t=e.servers;e.currentServer||this.setServer(t.first().get("url"))}},{key:"componentWillReceiveProps",value:function(e){var t=this.props,n=t.servers,r=t.setServerVariableValue,i=t.getServerVariable;if(this.props.currentServer!==e.currentServer){var o=n.find(function(t){return t.get("url")===e.currentServer});if(!o)return this.setServer(n.first().get("url"));(o.get("variables")||(0,v.OrderedMap)()).map(function(t,n){i(e.currentServer,n)||r({server:e.currentServer,key:n,val:t.get("default")||""})})}}},{key:"render",value:function(){var e=this,t=this.props,n=t.servers,r=t.currentServer,i=t.getServerVariable,o=t.getEffectiveServerValue,a=n.find(function(e){return e.get("url")===r})||(0,v.OrderedMap)(),s=a.get("variables")||(0,v.OrderedMap)(),u=0!==s.size;return m.default.createElement("div",{className:"servers"},m.default.createElement("label",{htmlFor:"servers"},m.default.createElement("select",{onChange:this.onServerChange},n.valueSeq().map(function(e){return m.default.createElement("option",{value:e.get("url"),key:e.get("url")},e.get("url"))}).toArray())),u?m.default.createElement("div",null,m.default.createElement("div",{className:"computed-url"},"Computed URL:",m.default.createElement("code",null,o(r))),m.default.createElement("h4",null,"Server variables"),m.default.createElement("table",null,m.default.createElement("tbody",null,s.map(function(t,n){return m.default.createElement("tr",{key:n},m.default.createElement("td",null,n),m.default.createElement("td",null,t.get("enum")?m.default.createElement("select",{"data-variable":n,onChange:e.onServerVariableValueChange},t.get("enum").map(function(e){return m.default.createElement("option",{selected:e===i(r,n),key:e,value:e},e)})):m.default.createElement("input",{type:"text",value:i(r,n)||"",onChange:e.onServerVariableValueChange,"data-variable":n})))})))):null)}}]),t}(m.default.Component);x.propTypes={servers:b.default.list.isRequired,currentServer:y.default.string.isRequired,setSelectedServer:y.default.func.isRequired,setServerVariableValue:y.default.func.isRequired,getServerVariable:y.default.func.isRequired,getEffectiveServerValue:y.default.func.isRequired},t.default=x},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{components:f.default,wrapComponents:d.default,statePlugins:{spec:{wrapSelectors:a,selectors:c},auth:{wrapSelectors:u},oas3:{actions:v,reducers:b.default,selectors:y}}}};var o=n(311),a=i(o),s=n(298),u=i(s),l=n(310),c=i(l),p=n(301),f=r(p),h=n(313),d=r(h),m=n(171),v=i(m),g=n(309),y=i(g),_=n(308),b=r(_)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i,o=n(36),a=r(o),s=n(18),u=r(s),l=n(171);t.default=(i={},(0,a.default)(i,l.UPDATE_SELECTED_SERVER,function(e,t){var n=t.payload,r=n.selectedServerUrl,i=n.namespace,o=i?[i,"selectedServer"]:["selectedServer"];return e.setIn(o,r)}),(0,a.default)(i,l.UPDATE_REQUEST_BODY_VALUE,function(e,t){var n=t.payload,r=n.value,i=n.pathMethod,o=(0,u.default)(i,2),a=o[0],s=o[1];return e.setIn(["requestData",a,s,"bodyValue"],r)}),(0,a.default)(i,l.UPDATE_REQUEST_CONTENT_TYPE,function(e,t){var n=t.payload,r=n.value,i=n.pathMethod,o=(0,u.default)(i,2),a=o[0],s=o[1];return e.setIn(["requestData",a,s,"requestContentType"],r)}),(0,a.default)(i,l.UPDATE_RESPONSE_CONTENT_TYPE,function(e,t){var n=t.payload,r=n.value,i=n.path,o=n.method;return e.setIn(["requestData",i,o,"responseContentType"],r)}),(0,a.default)(i,l.UPDATE_SERVER_VARIABLE_VALUE,function(e,t){var n=t.payload,r=n.server,i=n.namespace,o=n.key,a=n.val,s=i?[i,"serverVariableValues",r,o]:["serverVariableValues",r,o];return e.setIn(s,a)}),i)},function(e,t,n){"use strict";function r(e){return function(){for(var t=arguments.length,n=Array(t),r=0;r<t;r++)n[r]=arguments[r];return function(t){var r=t.getSystem().specSelectors.specJson();return(0,o.isOAS3)(r)?e.apply(void 0,n):null}}}Object.defineProperty(t,"__esModule",{value:!0}),t.serverEffectiveValue=t.serverVariables=t.serverVariableValue=t.responseContentType=t.requestContentType=t.requestBodyValue=t.selectedServer=void 0;var i=n(7),o=n(34);t.selectedServer=r(function(e,t){var n=t?[t,"selectedServer"]:["selectedServer"];return e.getIn(n)||""}),t.requestBodyValue=r(function(e,t,n){return e.getIn(["requestData",t,n,"bodyValue"])||null}),t.requestContentType=r(function(e,t,n){return e.getIn(["requestData",t,n,"requestContentType"])||null}),t.responseContentType=r(function(e,t,n){return e.getIn(["requestData",t,n,"responseContentType"])||null}),t.serverVariableValue=r(function(e,t,n){var r=void 0;if("string"!=typeof t){var i=t.server,o=t.namespace;r=o?[o,"serverVariableValues",i,n]:["serverVariableValues",i,n]}else{r=["serverVariableValues",t,n]}return e.getIn(r)||null}),t.serverVariables=r(function(e,t){var n=void 0;if("string"!=typeof t){var r=t.server,o=t.namespace;n=o?[o,"serverVariableValues",r]:["serverVariableValues",r]}else{n=["serverVariableValues",t]}return e.getIn(n)||(0,i.OrderedMap)()}),t.serverEffectiveValue=r(function(e,t){var n,r;if("string"!=typeof t){var o=t.server,a=t.namespace;r=o,n=a?e.getIn([a,"serverVariableValues",r]):e.getIn(["serverVariableValues",r])}else r=t,n=e.getIn(["serverVariableValues",r]);n=n||(0,i.OrderedMap)();var s=r;return n.map(function(e,t){s=s.replace(new RegExp("{"+t+"}","g"),e)}),s})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.isSwagger2=t.servers=void 0;var r=n(60),i=n(7),o=n(34),a=function(e){return e||(0,i.Map)()},s=(0,r.createSelector)(a,function(e){return e.get("json",(0,i.Map)())}),u=(0,r.createSelector)(a,function(e){return e.get("resolved",(0,i.Map)())}),l=function(e){var t=u(e);return t.count()<1&&(t=s(e)),t};t.servers=function(e){return function(){return function(t){for(var n=arguments.length,r=Array(n>1?n-1:0),i=1;i<n;i++)r[i-1]=arguments[i];var a=t.getSystem().specSelectors.specJson();return(0,o.isOAS3)(a)?e.apply(void 0,r):null}}}((0,r.createSelector)(l,function(e){return e.getIn(["servers"])||(0,i.Map)()})),t.isSwagger2=function(e,t){return function(){var e=t.getSystem().specSelectors.specJson();return(0,o.isSwagger2)(e)}}},function(e,t,n){"use strict";function r(e){return function(t,n){return function(){var r=n.getSystem().specSelectors.specJson();return(0,a.isOAS3)(r)?e.apply(void 0,arguments):t.apply(void 0,arguments)}}}Object.defineProperty(t,"__esModule",{value:!0}),t.isSwagger2=t.isOAS3=t.servers=t.schemes=t.produces=t.consumes=t.basePath=t.host=t.securityDefinitions=t.hasHost=t.definitions=void 0;var i=n(60),o=n(7),a=n(34),s=function(e){return e||(0,o.Map)()},u=(0,i.createSelector)(function(){return null}),l=r(u),c=(0,i.createSelector)(s,function(e){return e.get("json",(0,o.Map)())}),p=(0,i.createSelector)(s,function(e){return e.get("resolved",(0,o.Map)())}),f=function(e){var t=p(e);return t.count()<1&&(t=c(e)),t};t.definitions=r((0,i.createSelector)(f,function(e){return e.getIn(["components","schemas"])||(0,o.Map)()})),t.hasHost=r(function(e){return f(e).hasIn(["servers",0])}),t.securityDefinitions=r((0,i.createSelector)(f,function(e){return e.getIn(["components","securitySchemes"])||null})),t.host=l,t.basePath=l,t.consumes=l,t.produces=l,t.schemes=l,t.servers=r((0,i.createSelector)(f,function(e){return e.getIn(["servers"])||(0,o.Map)()})),t.isOAS3=function(e,t){return function(){var e=t.getSystem().specSelectors.specJson();return(0,a.isOAS3)(o.Map.isMap(e)?e:(0,o.Map)())}},t.isSwagger2=function(e,t){return function(){var e=t.getSystem().specSelectors.specJson();return(0,a.isSwagger2)(o.Map.isMap(e)?e:(0,o.Map)())}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(96),o=r(i),a=n(0),s=r(a),u=n(34);t.default=(0,u.OAS3ComponentWrapFactory)(function(e){var t=e.Ori,n=(0,o.default)(e,["Ori"]),r=n.schema,i=n.getComponent,a=n.errSelectors,u=n.authorized,l=n.onAuthChange,c=n.name,p=i("HttpAuth");return"http"===r.get("type")?s.default.createElement(p,{key:c,schema:r,name:c,errSelectors:a,authorized:u,getComponent:i,onChange:l}):s.default.createElement(t,n)})},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(314),o=r(i),a=n(312),s=r(a),u=n(317),l=r(u),c=n(318),p=r(c),f=n(316),h=r(f),d=n(315),m=r(d);t.default={Markdown:o.default,AuthItem:s.default,parameters:l.default,VersionStamp:p.default,model:m.default,onlineValidatorBadge:h.default}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.Markdown=void 0;var i=n(0),o=r(i),a=n(1),s=r(a),u=n(1080),l=r(u),c=n(577),p=n(34),f=n(270),h=t.Markdown=function(e){var t=e.source;if(t){var n=new c.Parser,r=new c.HtmlRenderer,i=r.render(n.parse(t||"")),a=(0,f.sanitizer)(i);return t&&i&&a?o.default.createElement(l.default,{source:a,className:"renderedMarkdown"}):null}return null};h.propTypes={source:s.default.string},t.default=(0,p.OAS3ComponentWrapFactory)(h)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(34),x=n(269),w=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getConfigs,n=e.schema,r=["model-box"],i=!0===n.get("deprecated"),a=null;return i&&(r.push("deprecated"),a=g.default.createElement("span",{className:"model-deprecated-warning"},"Deprecated:")),g.default.createElement("div",{className:r.join(" ")},a,g.default.createElement(x.Model,(0,o.default)({},this.props,{getConfigs:t,depth:1,expandDepth:this.props.expandDepth||0})))}}]),t}(v.Component);w.propTypes={schema:_.default.object.isRequired,name:_.default.string,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired,specSelectors:_.default.object.isRequired,expandDepth:_.default.number},t.default=(0,b.OAS3ComponentWrapFactory)(w)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(34);t.default=(0,r.OAS3ComponentWrapFactory)(function(){return null})},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(97),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(7),x=r(b),w=n(12),k=r(w),E=n(34),S=function(e,t){return e.valueSeq().filter(x.default.Map.isMap).map(t)},C=function(e){function t(e){(0,l.default)(this,t);var n=(0,h.default)(this,(t.__proto__||(0,s.default)(t)).call(this,e));return n.onChange=function(e,t,r){var i=n.props;(0,i.specActions.changeParam)(i.onChangeKey,e.get("name"),e.get("in"),t,r)},n.onChangeConsumesWrapper=function(e){var t=n.props;(0,t.specActions.changeConsumesValue)(t.onChangeKey,e)},n.toggleTab=function(e){return"parameters"===e?n.setState({parametersVisible:!0,callbackVisible:!1}):"callbacks"===e?n.setState({callbackVisible:!0,parametersVisible:!1}):void 0},n.state={callbackVisible:!1,parametersVisible:!0},n}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this,t=this.props,n=t.onTryoutClick,r=t.onCancelClick,i=t.parameters,a=t.allowTryItOut,s=t.tryItOutEnabled,u=t.fn,l=t.getComponent,c=t.getConfigs,p=t.specSelectors,f=t.oas3Actions,h=t.oas3Selectors,d=t.pathMethod,m=t.specPath,v=t.operation,y=l("parameterRow"),_=l("TryItOutButton"),x=l("contentType"),w=l("Callbacks",!0),k=l("RequestBody",!0),E=s&&a,C=p.isOAS3,A=v.get("requestBody"),D=m.slice(0,-1).push("requestBody");return g.default.createElement("div",{className:"opblock-section"},g.default.createElement("div",{className:"opblock-section-header"},g.default.createElement("div",{className:"tab-header"},g.default.createElement("div",{onClick:function(){return e.toggleTab("parameters")},className:"tab-item "+(this.state.parametersVisible&&"active")},g.default.createElement("h4",{className:"opblock-title"},g.default.createElement("span",null,"Parameters"))),v.get("callbacks")?g.default.createElement("div",{onClick:function(){return e.toggleTab("callbacks")},className:"tab-item "+(this.state.callbackVisible&&"active")},g.default.createElement("h4",{className:"opblock-title"},g.default.createElement("span",null,"Callbacks"))):null),a?g.default.createElement(_,{enabled:s,onCancelClick:r,onTryoutClick:n}):null),this.state.parametersVisible?g.default.createElement("div",{className:"parameters-container"},i.count()?g.default.createElement("div",{className:"table-container"},g.default.createElement("table",{className:"parameters"},g.default.createElement("thead",null,g.default.createElement("tr",null,g.default.createElement("th",{className:"col col_header parameters-col_name"},"Name"),g.default.createElement("th",{className:"col col_header parameters-col_description"},"Description"))),g.default.createElement("tbody",null,S(i,function(t,n){return g.default.createElement(y,{fn:u,getComponent:l,specPath:m.push(n),getConfigs:c,param:t,key:t.get("name"),onChange:e.onChange,onChangeConsumes:e.onChangeConsumesWrapper,specSelectors:p,pathMethod:d,isExecute:E})}).toArray()))):g.default.createElement("div",{className:"opblock-description-wrapper"},g.default.createElement("p",null,"No parameters"))):"",this.state.callbackVisible?g.default.createElement("div",{className:"callbacks-container opblock-description-wrapper"},g.default.createElement(w,{callbacks:(0,b.Map)(v.get("callbacks"))})):"",C()&&A&&this.state.parametersVisible&&g.default.createElement("div",{className:"opblock-section"},g.default.createElement("div",{className:"opblock-section-header"},g.default.createElement("h4",{className:"opblock-title parameter__name "+(A.get("required")&&"required")},"Request body"),g.default.createElement("label",null,g.default.createElement(x,{value:h.requestContentType.apply(h,(0,o.default)(d)),contentTypes:A.get("content").keySeq(),onChange:function(e){f.setRequestContentType({value:e,pathMethod:d})},className:"body-param-content-type"}))),g.default.createElement("div",{className:"opblock-description-wrapper"},g.default.createElement(k,{specPath:D,requestBody:A,isExecute:E,onChange:function(e){f.setRequestBodyValue({value:e,pathMethod:d})},contentType:h.requestContentType.apply(h,(0,o.default)(d))}))))}}]),t}(v.Component);C.propTypes={parameters:k.default.list.isRequired,specActions:_.default.object.isRequired,operation:_.default.object.isRequired,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired,specSelectors:_.default.object.isRequired,oas3Actions:_.default.object.isRequired,oas3Selectors:_.default.object.isRequired,fn:_.default.object.isRequired,tryItOutEnabled:_.default.bool,allowTryItOut:_.default.bool,specPath:k.default.list.isRequired,onTryoutClick:_.default.func,onCancelClick:_.default.func,onChangeKey:_.default.array,pathMethod:_.default.array.isRequired},C.defaultProps={onTryoutClick:Function.prototype,onCancelClick:Function.prototype,tryItOutEnabled:!1,allowTryItOut:!0,onChangeKey:[]},t.default=(0,E.OAS3ComponentWrapFactory)(C)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(0),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(34);t.default=(0,o.OAS3ComponentWrapFactory)(function(e){var t=e.Ori;return i.default.createElement("span",null,i.default.createElement(t,e),i.default.createElement("small",{style:{backgroundColor:"#89bf04"}},i.default.createElement("pre",{className:"version"},"OAS3")))})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{fn:i}};var r=n(172),i=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(r)},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{statePlugins:{spec:{wrapActions:p,reducers:o.default,actions:s,selectors:l}}}};var i=n(321),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(173),s=r(a),u=n(322),l=r(u),c=n(323),p=r(c)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i,o=n(36),a=r(o),s=n(30),u=r(s),l=n(97),c=r(l),p=n(7),f=n(9),h=n(46),d=r(h),m=n(173);t.default=(i={},(0,a.default)(i,m.UPDATE_SPEC,function(e,t){return"string"==typeof t.payload?e.set("spec",t.payload):e}),(0,a.default)(i,m.UPDATE_URL,function(e,t){return e.set("url",t.payload+"")}),(0,a.default)(i,m.UPDATE_JSON,function(e,t){return e.set("json",(0,f.fromJSOrdered)(t.payload))}),(0,a.default)(i,m.UPDATE_RESOLVED,function(e,t){return e.setIn(["resolved"],(0,f.fromJSOrdered)(t.payload))}),(0,a.default)(i,m.UPDATE_PARAM,function(e,t){var n=t.payload,r=n.path,i=n.paramName,o=n.paramIn,a=n.value,s=n.isXml;return e.updateIn(["resolved","paths"].concat((0,c.default)(r),["parameters"]),(0,p.fromJS)([]),function(e){var t=e.findIndex(function(e){return e.get("name")===i&&e.get("in")===o});return a instanceof d.default.File||(a=(0,f.fromJSOrdered)(a)),e.setIn([t,s?"value_xml":"value"],a)})}),(0,a.default)(i,m.VALIDATE_PARAMS,function(e,t){var n=t.payload,r=n.pathMethod,i=n.isOAS3,o=e.getIn(["meta","paths"].concat((0,c.default)(r)),(0,p.fromJS)({})),a=/xml/i.test(o.get("consumes_value"));return e.updateIn(["resolved","paths"].concat((0,c.default)(r),["parameters"]),(0,p.fromJS)([]),function(e){return e.withMutations(function(e){for(var t=0,n=e.count();t<n;t++){var r=(0,f.validateParam)(e.get(t),a,i);e.setIn([t,"errors"],(0,p.fromJS)(r))}})})}),(0,a.default)(i,m.CLEAR_VALIDATE_PARAMS,function(e,t){var n=t.payload.pathMethod;return e.updateIn(["resolved","paths"].concat((0,c.default)(n),["parameters"]),(0,p.fromJS)([]),function(e){return e.withMutations(function(e){for(var t=0,n=e.count();t<n;t++)e.setIn([t,"errors"],(0,p.fromJS)([]))})})}),(0,a.default)(i,m.SET_RESPONSE,function(e,t){var n=t.payload,r=n.res,i=n.path,o=n.method,a=void 0;a=r.error?(0,u.default)({error:!0,name:r.err.name,message:r.err.message,statusCode:r.err.statusCode},r.err.response):r,a.headers=a.headers||{};var s=e.setIn(["responses",i,o],(0,f.fromJSOrdered)(a));return d.default.Blob&&r.data instanceof d.default.Blob&&(s=s.setIn(["responses",i,o,"text"],r.data)),s}),(0,a.default)(i,m.SET_REQUEST,function(e,t){var n=t.payload,r=n.req,i=n.path,o=n.method;return e.setIn(["requests",i,o],(0,f.fromJSOrdered)(r))}),(0,a.default)(i,m.SET_MUTATED_REQUEST,function(e,t){var n=t.payload,r=n.req,i=n.path,o=n.method;return e.setIn(["mutatedRequests",i,o],(0,f.fromJSOrdered)(r))}),(0,a.default)(i,m.UPDATE_OPERATION_META_VALUE,function(e,t){var n=t.payload,r=n.path,i=n.value,o=n.key,a=["resolved","paths"].concat((0,c.default)(r)),s=["meta","paths"].concat((0,c.default)(r));return e.getIn(a)?e.setIn([].concat((0,c.default)(s),[o]),(0,p.fromJS)(i)):e}),(0,a.default)(i,m.CLEAR_RESPONSE,function(e,t){var n=t.payload,r=n.path,i=n.method;return e.deleteIn(["responses",r,i])}),(0,a.default)(i,m.CLEAR_REQUEST,function(e,t){var n=t.payload,r=n.path,i=n.method;return e.deleteIn(["requests",r,i])}),(0,a.default)(i,m.SET_SCHEME,function(e,t){var n=t.payload,r=n.scheme,i=n.path,o=n.method;return i&&o?e.setIn(["scheme",i,o],r):i||o?void 0:e.setIn(["scheme","_defaultScheme"],r)}),i)},function(e,t,n){"use strict";function r(e,t,n,r){return t=t||[],_(e).getIn(["paths"].concat((0,f.default)(t),["parameters"]),(0,m.fromJS)([])).find(function(e){return m.Map.isMap(e)&&e.get("name")===n&&e.get("in")===r})||(0,m.Map)()}function i(e,t,n){return t=t||[],_(e).getIn(["paths"].concat((0,f.default)(t),["parameters"]),(0,m.fromJS)([])).reduce(function(e,t){var r=n&&"body"===t.get("in")?t.get("value_xml"):t.get("value");return e.set(t.get("in")+"."+t.get("name"),r)},(0,m.fromJS)({}))}function o(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(m.List.isList(e))return e.some(function(e){return m.Map.isMap(e)&&e.get("in")===t})}function a(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(m.List.isList(e))return e.some(function(e){return m.Map.isMap(e)&&e.get("type")===t})}function s(e,t){t=t||[];var n=_(e).getIn(["paths"].concat((0,f.default)(t)),(0,m.fromJS)({})),r=e.getIn(["meta","paths"].concat((0,f.default)(t)),(0,m.fromJS)({})),i=l(e,t),o=n.get("parameters")||new m.List,s=r.get("consumes_value")?r.get("consumes_value"):a(o,"file")?"multipart/form-data":a(o,"formData")?"application/x-www-form-urlencoded":void 0;return(0,m.fromJS)({requestContentType:s,responseContentType:i})}function u(e,t){return t=t||[],_(e).getIn(["paths"].concat((0,f.default)(t),["consumes"]),(0,m.fromJS)({}))}function l(e,t){t=t||[];var n=_(e).getIn(["paths"].concat((0,f.default)(t)),null);if(null!==n){var r=e.getIn(["meta","paths"].concat((0,f.default)(t),["produces_value"]),null),i=n.getIn(["produces",0],null);return r||i||"application/json"}}function c(e){return m.Map.isMap(e)?e:new m.Map}Object.defineProperty(t,"__esModule",{value:!0}),t.validateBeforeExecute=t.canExecuteScheme=t.operationScheme=t.hasHost=t.allowTryItOutFor=t.mutatedRequestFor=t.requestFor=t.responseFor=t.mutatedRequests=t.requests=t.responses=t.taggedOperations=t.operationsWithTags=t.tagDetails=t.tags=t.operationsWithRootInherited=t.schemes=t.host=t.basePath=t.definitions=t.findDefinition=t.securityDefinitions=t.security=t.produces=t.consumes=t.operations=t.paths=t.semver=t.version=t.externalDocs=t.info=t.isOAS3=t.spec=t.specResolved=t.specJson=t.specSource=t.specStr=t.url=t.lastError=void 0;var p=n(97),f=function(e){return e&&e.__esModule?e:{default:e}}(p);t.getParameter=r,t.parameterValues=i,t.parametersIncludeIn=o,t.parametersIncludeType=a,t.contentTypeValues=s,t.operationConsumes=u,t.currentProducesFor=l;var h=n(60),d=n(9),m=n(7),v=["get","put","post","delete","options","head","patch","trace"],g=function(e){return e||(0,m.Map)()},y=(t.lastError=(0,h.createSelector)(g,function(e){return e.get("lastError")}),t.url=(0,h.createSelector)(g,function(e){return e.get("url")}),t.specStr=(0,h.createSelector)(g,function(e){return e.get("spec")||""}),t.specSource=(0,h.createSelector)(g,function(e){return e.get("specSource")||"not-editor"}),t.specJson=(0,h.createSelector)(g,function(e){return e.get("json",(0,m.Map)())}),t.specResolved=(0,h.createSelector)(g,function(e){return e.get("resolved",(0,m.Map)())})),_=t.spec=function(e){return y(e)},b=(t.isOAS3=(0,h.createSelector)(_,function(){return!1}),t.info=(0,h.createSelector)(_,function(e){return c(e&&e.get("info"))})),x=(t.externalDocs=(0,h.createSelector)(_,function(e){return c(e&&e.get("externalDocs"))}),t.version=(0,h.createSelector)(b,function(e){return e&&e.get("version")})),w=(t.semver=(0,h.createSelector)(x,function(e){return/v?([0-9]*)\.([0-9]*)\.([0-9]*)/i.exec(e).slice(1)}),t.paths=(0,h.createSelector)(_,function(e){return e.get("paths")})),k=t.operations=(0,h.createSelector)(w,function(e){if(!e||e.size<1)return(0,m.List)();var t=(0,m.List)();return e&&e.forEach?(e.forEach(function(e,n){if(!e||!e.forEach)return{};e.forEach(function(e,r){v.indexOf(r)<0||(t=t.push((0,m.fromJS)({path:n,method:r,operation:e,id:r+"-"+n})))})}),t):(0,m.List)()}),E=t.consumes=(0,h.createSelector)(_,function(e){return(0,m.Set)(e.get("consumes"))}),S=t.produces=(0,h.createSelector)(_,function(e){return(0,m.Set)(e.get("produces"))}),C=(t.security=(0,h.createSelector)(_,function(e){return e.get("security",(0,m.List)())}),t.securityDefinitions=(0,h.createSelector)(_,function(e){return e.get("securityDefinitions")}),t.findDefinition=function(e,t){return y(e).getIn(["definitions",t],null)},t.definitions=(0,h.createSelector)(_,function(e){return e.get("definitions")||(0,m.Map)()}),t.basePath=(0,h.createSelector)(_,function(e){return e.get("basePath")}),t.host=(0,h.createSelector)(_,function(e){return e.get("host")}),t.schemes=(0,h.createSelector)(_,function(e){return e.get("schemes",(0,m.Map)())}),t.operationsWithRootInherited=(0,h.createSelector)(k,E,S,function(e,t,n){return e.map(function(e){return e.update("operation",function(e){if(e){if(!m.Map.isMap(e))return;return e.withMutations(function(e){return e.get("consumes")||e.update("consumes",function(e){return(0,m.Set)(e).merge(t)}),e.get("produces")||e.update("produces",function(e){return(0,m.Set)(e).merge(n)}),e})}return(0,m.Map)()})})})),A=t.tags=(0,h.createSelector)(_,function(e){return e.get("tags",(0,m.List)())}),D=t.tagDetails=function(e,t){return(A(e)||(0,m.List)()).filter(m.Map.isMap).find(function(e){return e.get("name")===t},(0,m.Map)())},O=t.operationsWithTags=(0,h.createSelector)(C,A,function(e,t){return e.reduce(function(e,t){var n=(0,m.Set)(t.getIn(["operation","tags"]));return n.count()<1?e.update("default",(0,m.List)(),function(e){return e.push(t)}):n.reduce(function(e,n){return e.update(n,(0,m.List)(),function(e){return e.push(t)})},e)},t.reduce(function(e,t){return e.set(t.get("name"),(0,m.List)())},(0,m.OrderedMap)()))}),M=(t.taggedOperations=function(e){return function(t){var n=t.getConfigs,r=n(),i=r.tagsSorter,o=r.operationsSorter;return O(e).sortBy(function(e,t){return t},function(e,t){var n="function"==typeof i?i:d.sorters.tagsSorter[i];return n?n(e,t):null}).map(function(t,n){var r="function"==typeof o?o:d.sorters.operationsSorter[o],i=r?t.sort(r):t;return(0,m.Map)({tagDetails:D(e,n),operations:i})})}},t.responses=(0,h.createSelector)(g,function(e){return e.get("responses",(0,m.Map)())})),T=t.requests=(0,h.createSelector)(g,function(e){return e.get("requests",(0,m.Map)())}),P=t.mutatedRequests=(0,h.createSelector)(g,function(e){return e.get("mutatedRequests",(0,m.Map)())}),I=(t.responseFor=function(e,t,n){return M(e).getIn([t,n],null)},t.requestFor=function(e,t,n){return T(e).getIn([t,n],null)},t.mutatedRequestFor=function(e,t,n){return P(e).getIn([t,n],null)},t.allowTryItOutFor=function(){return!0},t.hasHost=(0,h.createSelector)(_,function(e){var t=e.get("host");return"string"==typeof t&&t.length>0&&"/"!==t[0]}),t.operationScheme=function(e,t,n){var r=e.get("url"),i=r.match(/^([a-z][a-z0-9+\-.]*):/),o=Array.isArray(i)?i[1]:null;return e.getIn(["scheme",t,n])||e.getIn(["scheme","_defaultScheme"])||o||""});t.canExecuteScheme=function(e,t,n){return["http","https"].indexOf(I(e,t,n))>-1},t.validateBeforeExecute=function(e,t){t=t||[];var n=_(e).getIn(["paths"].concat((0,f.default)(t),["parameters"]),(0,m.fromJS)([])),r=!0;return n.forEach(function(e){var t=e.get("errors");t&&t.count()&&(r=!1)}),r}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.updateSpec=function(e,t){var n=t.specActions;return function(){e.apply(void 0,arguments),n.parseToJson.apply(n,arguments)}},t.updateJsonSpec=function(e,t){var n=t.specActions;return function(){e.apply(void 0,arguments),n.resolveSpec.apply(n,arguments)}},t.executeRequest=function(e,t){var n=t.specActions;return function(t){return n.logRequest(t),e(t)}},t.validateParams=function(e,t){var n=t.specSelectors;return function(t){return e(t,n.isOAS3())}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(1093),_=r(y),b=["split-pane-mode"],x="left",w="right",k="both",E=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.initializeComponent=function(e){r.splitPane=e},r.onDragFinished=function(){var e=r.props,t=e.threshold,n=e.layoutActions,i=r.splitPane.state,o=i.position,a=i.draggedSize;r.draggedSize=a;var s=o<=t,u=a<=t;n.changeMode(b,s?w:u?x:k)},r.sizeFromMode=function(e,t){return e===x?(r.draggedSize=null,"0px"):e===w?(r.draggedSize=null,"100%"):r.draggedSize||t},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.children,n=e.layoutSelectors,r=n.whatMode(b),i=r===w?m.default.createElement("noscript",null):t[0],o=r===x?m.default.createElement("noscript",null):t[1],a=this.sizeFromMode(r,"50%");return m.default.createElement(_.default,{disabledClass:"",ref:this.initializeComponent,split:"vertical",defaultSize:"50%",primary:"second",minSize:0,size:a,onDragFinished:this.onDragFinished,allowResize:r!==x&&r!==w,resizerStyle:{flex:"0 0 auto",position:"relative"}},i,o)}}]),t}(m.default.Component);E.propTypes={threshold:g.default.number,children:g.default.array,layoutSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired},E.defaultProps={threshold:100,children:[]},t.default=E},function(e,t,n){"use strict";function r(){return{components:{SplitPaneMode:o.default}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(324),o=function(e){return e&&e.__esModule?e:{default:e}}(i)},function(e,t,n){"use strict";var r=n(495),i=function(e){return e&&e.__esModule?e:{default:e}}(r);e.exports=function(e){var t=e.configs;return{fn:{fetch:i.default.makeHttp(t.preFetch,t.postFetch),buildRequest:i.default.buildRequest,execute:i.default.execute,resolve:i.default.resolve,serializeRes:i.default.serializeRes,opId:i.default.helpers.opId}}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{fn:{shallowEqualKeys:r.shallowEqualKeys}}};var r=n(9)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){var t=e.getComponents,n=e.getStore,r=e.getSystem,a=i.getComponent,s=i.render,u=i.makeMappedContainer,l=(0,o.memoize)(a.bind(null,r,n,t));return{rootInjects:{getComponent:l,makeMappedContainer:(0,o.memoize)(u.bind(null,r,n,l,t)),render:s.bind(null,r,n,a,t)}}};var r=n(329),i=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(r),o=n(9)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.getComponent=t.render=t.makeMappedContainer=void 0;var i=n(48),o=r(i),a=n(47),s=r(a),u=n(30),l=r(u),c=n(21),p=r(c),f=n(4),h=r(f),d=n(2),m=r(d),v=n(3),g=r(v),y=n(6),_=r(y),b=n(5),x=r(b),w=n(0),k=r(w),E=n(449),S=r(E),C=n(1090),A=n(950),D=r(A),O=function(e,t){return function(n){function r(){return(0,m.default)(this,r),(0,_.default)(this,(r.__proto__||(0,h.default)(r)).apply(this,arguments))}return(0,x.default)(r,n),(0,g.default)(r,[{key:"render",value:function(){return k.default.createElement(t,(0,p.default)({},e(),this.props,this.context))}}]),r}(w.Component)},M=function(e,t){return function(n){function r(){return(0,m.default)(this,r),(0,_.default)(this,(r.__proto__||(0,h.default)(r)).apply(this,arguments))}return(0,x.default)(r,n),(0,g.default)(r,[{key:"render",value:function(){return k.default.createElement(C.Provider,{store:e},k.default.createElement(t,(0,p.default)({},this.props,this.context)))}}]),r}(w.Component)},T=function(e,t,n){var r=function(n,r){var i=(0,l.default)({},r,e());return(t.prototype.mapStateToProps||function(e){return{state:e}})(n,i)},i=O(e,t),o=(0,C.connect)(r)(i);return n?M(n,o):o},P=function(e,t,n,r){for(var i in t){var o=t[i];"function"==typeof o&&o(n[i],r[i],e())}},I=(t.makeMappedContainer=function(e,t,n,r,i,o){return function(t){function r(t,n){(0,m.default)(this,r);var i=(0,_.default)(this,(r.__proto__||(0,h.default)(r)).call(this,t,n));return P(e,o,t,{}),i}return(0,x.default)(r,t),(0,g.default)(r,[{key:"componentWillReceiveProps",value:function(t){P(e,o,t,this.props)}},{key:"render",value:function(){var e=(0,D.default)(this.props,o?(0,s.default)(o):[]),t=n(i,"root");return k.default.createElement(t,e)}}]),r}(w.Component)},t.render=function(e,t,n,r,i){var o=n(e,t,r,"App","root");S.default.render(k.default.createElement(o,null),i)},function(e){return function(t){function n(){return(0,m.default)(this,n),(0,_.default)(this,(n.__proto__||(0,h.default)(n)).apply(this,arguments))}return(0,x.default)(n,t),(0,g.default)(n,[{key:"render",value:function(){return e(this.props)}}]),n}(w.Component)}),R=function(e){var t=e.name;return k.default.createElement("div",{style:{padding:"1em",color:"#aaa"}},"😱 ",k.default.createElement("i",null,"Could not render ","t"===t?"this component":t,", see the console."))},j=function(e){var t=function(e){return!(e.prototype&&e.prototype.isReactComponent)}(e)?I(e):e,n=t.prototype.render;return t.prototype.render=function(){try{for(var e=arguments.length,r=Array(e),i=0;i<e;i++)r[i]=arguments[i];return n.apply(this,r)}catch(e){return console.error(e),k.default.createElement(R,{error:e,name:t.name})}},t};t.getComponent=function(e,t,n,r,i){if("string"!=typeof r)throw new TypeError("Need a string, to fetch a component. Was given a "+(void 0===r?"undefined":(0,o.default)(r)));var a=n(r);return a?i?"root"===i?T(e,a,t()):T(e,j(a)):j(a):(e().log.warn("Could not find component",r),null)}},function(e,t,n){e.exports={default:n(590),__esModule:!0}},function(e,t,n){e.exports={default:n(591),__esModule:!0}},function(e,t,n){e.exports={default:n(595),__esModule:!0}},function(e,t,n){"use strict";function r(){}function i(e){var t,n,r=e.walker();for(this.buffer="",this.lastOut="\n";t=r.next();)n=t.node.type,this[n]&&this[n](t.node,t.entering);return this.buffer}function o(e){this.buffer+=e,this.lastOut=e}function a(){"\n"!==this.lastOut&&this.lit("\n")}function s(e){this.lit(e)}function u(e){return e}r.prototype.render=i,r.prototype.out=s,r.prototype.lit=o,r.prototype.cr=a,r.prototype.esc=u,e.exports=r},function(e,t,n){var r=n(24).document;e.exports=r&&r.documentElement},function(e,t,n){e.exports=!n(49)&&!n(54)(function(){return 7!=Object.defineProperty(n(179)("div"),"a",{get:function(){return 7}}).a})},function(e,t,n){var r=n(74),i=n(22)("iterator"),o=Array.prototype;e.exports=function(e){return void 0!==e&&(r.Array===e||o[i]===e)}},function(e,t,n){var r=n(99);e.exports=Array.isArray||function(e){return"Array"==r(e)}},function(e,t,n){var r=n(37);e.exports=function(e,t,n,i){try{return i?t(r(n)[0],n[1]):t(n)}catch(t){var o=e.return;throw void 0!==o&&r(o.call(e)),t}}},function(e,t,n){"use strict";var r=n(130),i=n(23),o=n(186),a=n(56),s=n(55),u=n(74),l=n(608),c=n(102),p=n(344),f=n(22)("iterator"),h=!([].keys&&"next"in[].keys()),d=function(){return this};e.exports=function(e,t,n,m,v,g,y){l(n,t,m);var _,b,x,w=function(e){if(!h&&e in C)return C[e];switch(e){case"keys":case"values":return function(){return new n(this,e)}}return function(){return new n(this,e)}},k=t+" Iterator",E="values"==v,S=!1,C=e.prototype,A=C[f]||C["@@iterator"]||v&&C[v],D=!h&&A||w(v),O=v?E?w("entries"):D:void 0,M="Array"==t?C.entries||A:A;if(M&&(x=p(M.call(new e)))!==Object.prototype&&x.next&&(c(x,k,!0),r||s(x,f)||a(x,f,d)),E&&A&&"values"!==A.name&&(S=!0,D=function(){return A.call(this)}),r&&!y||!h&&!S&&C[f]||a(C,f,D),u[t]=D,u[k]=d,v)if(_={values:E?D:w("values"),keys:g?D:w("keys"),entries:O},y)for(b in _)b in C||o(C,b,_[b]);else i(i.P+i.F*(h||S),t,_);return _}},function(e,t,n){var r=n(22)("iterator"),i=!1;try{var o=[7][r]();o.return=function(){i=!0},Array.from(o,function(){throw 2})}catch(e){}e.exports=function(e,t){if(!t&&!i)return!1;var n=!1;try{var o=[7],a=o[r]();a.next=function(){return{done:n=!0}},o[r]=function(){return a},e(o)}catch(e){}return n}},function(e,t,n){"use strict";var r=n(100),i=n(184),o=n(132),a=n(76),s=n(181),u=Object.assign;e.exports=!u||n(54)(function(){var e={},t={},n=Symbol(),r="abcdefghijklmnopqrst";return e[n]=7,r.split("").forEach(function(e){t[e]=e}),7!=u({},e)[n]||Object.keys(u({},t)).join("")!=r})?function(e,t){for(var n=a(e),u=arguments.length,l=1,c=i.f,p=o.f;u>l;)for(var f,h=s(arguments[l++]),d=c?r(h).concat(c(h)):r(h),m=d.length,v=0;m>v;)p.call(h,f=d[v++])&&(n[f]=h[f]);return n}:u},function(e,t,n){var r=n(132),i=n(101),o=n(75),a=n(190),s=n(55),u=n(335),l=Object.getOwnPropertyDescriptor;t.f=n(49)?l:function(e,t){if(e=o(e),t=a(t,!0),u)try{return l(e,t)}catch(e){}if(s(e,t))return i(!r.f.call(e,t),e[t])}},function(e,t,n){var r=n(345),i=n(180).concat("length","prototype");t.f=Object.getOwnPropertyNames||function(e){return r(e,i)}},function(e,t,n){var r=n(55),i=n(76),o=n(187)("IE_PROTO"),a=Object.prototype;e.exports=Object.getPrototypeOf||function(e){return e=i(e),r(e,o)?e[o]:"function"==typeof e.constructor&&e instanceof e.constructor?e.constructor.prototype:e instanceof Object?a:null}},function(e,t,n){var r=n(55),i=n(75),o=n(600)(!1),a=n(187)("IE_PROTO");e.exports=function(e,t){var n,s=i(e),u=0,l=[];for(n in s)n!=a&&r(s,n)&&l.push(n);for(;t.length>u;)r(s,n=t[u++])&&(~o(l,n)||l.push(n));return l}},function(e,t,n){var r=n(23),i=n(15),o=n(54);e.exports=function(e,t){var n=(i.Object||{})[e]||Object[e],a={};a[e]=t(n),r(r.S+r.F*o(function(){n(1)}),"Object",a)}},function(e,t){e.exports=function(e){try{return{e:!1,v:e()}}catch(e){return{e:!0,v:e}}}},function(e,t,n){var r=n(37),i=n(27),o=n(182);e.exports=function(e,t){if(r(e),i(t)&&t.constructor===e)return t;var n=o.f(e);return(0,n.resolve)(t),n.promise}},function(e,t,n){var r=n(37),i=n(98),o=n(22)("species");e.exports=function(e,t){var n,a=r(e).constructor;return void 0===a||void 0==(n=r(a)[o])?t:i(n)}},function(e,t,n){var r,i,o,a=n(53),s=n(607),u=n(334),l=n(179),c=n(24),p=c.process,f=c.setImmediate,h=c.clearImmediate,d=c.MessageChannel,m=c.Dispatch,v=0,g={},y=function(){var e=+this;if(g.hasOwnProperty(e)){var t=g[e];delete g[e],t()}},_=function(e){y.call(e.data)};f&&h||(f=function(e){for(var t=[],n=1;arguments.length>n;)t.push(arguments[n++]);return g[++v]=function(){s("function"==typeof e?e:Function(e),t)},r(v),v},h=function(e){delete g[e]},"process"==n(99)(p)?r=function(e){p.nextTick(a(y,e,1))}:m&&m.now?r=function(e){m.now(a(y,e,1))}:d?(i=new d,o=i.port2,i.port1.onmessage=_,r=a(o.postMessage,o,1)):c.addEventListener&&"function"==typeof postMessage&&!c.importScripts?(r=function(e){c.postMessage(e+"","*")},c.addEventListener("message",_,!1)):r="onreadystatechange"in l("script")?function(e){u.appendChild(l("script")).onreadystatechange=function(){u.removeChild(this),y.call(e)}}:function(e){setTimeout(a(y,e,1),0)}),e.exports={set:f,clear:h}},function(e,t,n){var r=n(27);e.exports=function(e,t){if(!r(e)||e._t!==t)throw TypeError("Incompatible receiver, "+t+" required!");return e}},function(e,t){e.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(e,t,n){var r=n(31).document;e.exports=r&&r.documentElement},function(e,t,n){var r=n(77),i=n(105),o=n(19)("match");e.exports=function(e){var t;return r(e)&&(void 0!==(t=e[o])?!!t:"RegExp"==i(e))}},function(e,t,n){"use strict";var r=n(356),i=n(28),o=n(78),a=n(64),s=n(108),u=n(109),l=n(647),c=n(199),p=n(653),f=n(19)("iterator"),h=!([].keys&&"next"in[].keys()),d=function(){return this};e.exports=function(e,t,n,m,v,g,y){l(n,t,m);var _,b,x,w=function(e){if(!h&&e in C)return C[e];switch(e){case"keys":case"values":return function(){return new n(this,e)}}return function(){return new n(this,e)}},k=t+" Iterator",E="values"==v,S=!1,C=e.prototype,A=C[f]||C["@@iterator"]||v&&C[v],D=!h&&A||w(v),O=v?E?w("entries"):D:void 0,M="Array"==t?C.entries||A:A;if(M&&(x=p(M.call(new e)))!==Object.prototype&&x.next&&(c(x,k,!0),r||s(x,f)||a(x,f,d)),E&&A&&"values"!==A.name&&(S=!0,D=function(){return A.call(this)}),r&&!y||!h&&!S&&C[f]||a(C,f,D),u[t]=D,u[k]=d,v)if(_={values:E?D:w("values"),keys:g?D:w("keys"),entries:O},y)for(b in _)b in C||o(C,b,_[b]);else i(i.P+i.F*(h||S),t,_);return _}},function(e,t){e.exports=!1},function(e,t,n){var r=n(654),i=n(352);e.exports=Object.keys||function(e){return r(e,i)}},function(e,t){e.exports=function(e){try{return{e:!1,v:e()}}catch(e){return{e:!0,v:e}}}},function(e,t,n){var r=n(62),i=n(77),o=n(198);e.exports=function(e,t){if(r(e),i(t)&&t.constructor===e)return t;var n=o.f(e);return(0,n.resolve)(t),n.promise}},function(e,t){e.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},function(e,t,n){var r=n(31),i=r["__core-js_shared__"]||(r["__core-js_shared__"]={});e.exports=function(e){return i[e]||(i[e]={})}},function(e,t,n){var r=n(62),i=n(135),o=n(19)("species");e.exports=function(e,t){var n,a=r(e).constructor;return void 0===a||void 0==(n=r(a)[o])?t:i(n)}},function(e,t,n){var r=n(139),i=n(57);e.exports=function(e){return function(t,n){var o,a,s=String(i(t)),u=r(n),l=s.length;return u<0||u>=l?e?"":void 0:(o=s.charCodeAt(u),o<55296||o>56319||u+1===l||(a=s.charCodeAt(u+1))<56320||a>57343?e?s.charAt(u):o:e?s.slice(u,u+2):a-56320+(o-55296<<10)+65536)}}},function(e,t,n){var r,i,o,a=n(136),s=n(643),u=n(353),l=n(196),c=n(31),p=c.process,f=c.setImmediate,h=c.clearImmediate,d=c.MessageChannel,m=c.Dispatch,v=0,g={},y=function(){var e=+this;if(g.hasOwnProperty(e)){var t=g[e];delete g[e],t()}},_=function(e){y.call(e.data)};f&&h||(f=function(e){for(var t=[],n=1;arguments.length>n;)t.push(arguments[n++]);return g[++v]=function(){s("function"==typeof e?e:Function(e),t)},r(v),v},h=function(e){delete g[e]},"process"==n(105)(p)?r=function(e){p.nextTick(a(y,e,1))}:m&&m.now?r=function(e){m.now(a(y,e,1))}:d?(i=new d,o=i.port2,i.port1.onmessage=_,r=a(o.postMessage,o,1)):c.addEventListener&&"function"==typeof postMessage&&!c.importScripts?(r=function(e){c.postMessage(e+"","*")},c.addEventListener("message",_,!1)):r="onreadystatechange"in l("script")?function(e){u.appendChild(l("script")).onreadystatechange=function(){u.removeChild(this),y.call(e)}}:function(e){setTimeout(a(y,e,1),0)}),e.exports={set:f,clear:h}},function(e,t,n){var r=n(139),i=Math.max,o=Math.min;e.exports=function(e,t){return e=r(e),e<0?i(e+t,0):o(e,t)}},function(e,t,n){"use strict";var r=n(363)(!0);n(355)(String,"String",function(e){this._t=String(e),this._i=0},function(){var e,t=this._t,n=this._i;return n>=t.length?{value:void 0,done:!0}:(e=r(t,n),this._i+=e.length,{value:e,done:!1})})},function(e,t,n){"use strict";function r(e){return(0,o.default)(e)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(763),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t){var n=e.exports={get firstChild(){var e=this.children;return e&&e[0]||null},get lastChild(){var e=this.children;return e&&e[e.length-1]||null},get nodeType(){return i[this.type]||i.element}},r={tagName:"name",childNodes:"children",parentNode:"parent",previousSibling:"prev",nextSibling:"next",nodeValue:"data"},i={element:1,text:3,cdata:4,comment:8};Object.keys(r).forEach(function(e){var t=r[e];Object.defineProperty(n,e,{get:function(){return this[t]||null},set:function(e){return this[t]=e,e}})})},function(e,t,n){function r(e){if(e>=55296&&e<=57343||e>1114111)return"�";e in i&&(e=i[e]);var t="";return e>65535&&(e-=65536,t+=String.fromCharCode(e>>>10&1023|55296),e=56320|1023&e),t+=String.fromCharCode(e)}var i=n(712);e.exports=r},function(e,t){e.exports={Aacute:"Á",aacute:"á",Acirc:"Â",acirc:"â",acute:"´",AElig:"Æ",aelig:"æ",Agrave:"À",agrave:"à",amp:"&",AMP:"&",Aring:"Å",aring:"å",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",brvbar:"¦",Ccedil:"Ç",ccedil:"ç",cedil:"¸",cent:"¢",copy:"©",COPY:"©",curren:"¤",deg:"°",divide:"÷",Eacute:"É",eacute:"é",Ecirc:"Ê",ecirc:"ê",Egrave:"È",egrave:"è",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",frac12:"½",frac14:"¼",frac34:"¾",gt:">",GT:">",Iacute:"Í",iacute:"í",Icirc:"Î",icirc:"î",iexcl:"¡",Igrave:"Ì",igrave:"ì",iquest:"¿",Iuml:"Ï",iuml:"ï",laquo:"«",lt:"<",LT:"<",macr:"¯",micro:"µ",middot:"·",nbsp:" ",not:"¬",Ntilde:"Ñ",ntilde:"ñ",Oacute:"Ó",oacute:"ó",Ocirc:"Ô",ocirc:"ô",Ograve:"Ò",ograve:"ò",ordf:"ª",ordm:"º",Oslash:"Ø",oslash:"ø",Otilde:"Õ",otilde:"õ",Ouml:"Ö",ouml:"ö",para:"¶",plusmn:"±",pound:"£",quot:'"',QUOT:'"',raquo:"»",reg:"®",REG:"®",sect:"§",shy:"­",sup1:"¹",sup2:"²",sup3:"³",szlig:"ß",THORN:"Þ",thorn:"þ",times:"×",Uacute:"Ú",uacute:"ú",Ucirc:"Û",ucirc:"û",Ugrave:"Ù",ugrave:"ù",uml:"¨",Uuml:"Ü",uuml:"ü",Yacute:"Ý",yacute:"ý",yen:"¥",yuml:"ÿ"}},function(e,t,n){"use strict";var r,i,o,a,s=n(65),u=function(e,t){return t};try{Object.defineProperty(u,"length",{configurable:!0,writable:!1,enumerable:!1,value:1})}catch(e){}1===u.length?(r={configurable:!0,writable:!1,enumerable:!1},i=Object.defineProperty,e.exports=function(e,t){return t=s(t),e.length===t?e:(r.value=t,i(e,"length",r))}):(a=n(375),o=function(){var e=[];return function(t){var n,r=0;if(e[t])return e[t];for(n=[];t--;)n.push("a"+(++r).toString(36));return new Function("fn","return function ("+n.join(", ")+") { return fn.apply(this, arguments); };")}}(),e.exports=function(e,t){var n;if(t=s(t),e.length===t)return e;n=o(t)(e);try{a(n,e)}catch(e){}return n})},function(e,t,n){"use strict";e.exports=function(){}},function(e,t,n){"use strict";e.exports=n(727)()?Object.assign:n(728)},function(e,t,n){"use strict";var r=n(58),i=n(142),o=Function.prototype.call;e.exports=function(e,t){var n={},a=arguments[2];return r(t),i(e,function(e,r,i,s){n[r]=o.call(t,a,e,r,i,s)}),n}},function(e,t,n){"use strict";var r=n(115),i=Object.defineProperty,o=Object.getOwnPropertyDescriptor,a=Object.getOwnPropertyNames,s=Object.getOwnPropertySymbols;e.exports=function(e,t){var n,u=Object(r(t));if(e=Object(r(e)),a(u).forEach(function(r){try{i(e,r,o(t,r))}catch(e){n=e}}),"function"==typeof s&&s(u).forEach(function(r){try{i(e,r,o(t,r))}catch(e){n=e}}),void 0!==n)throw n;return e}},function(e,t,n){"use strict";var r=n(79),i=Array.prototype.forEach,o=Object.create,a=function(e,t){var n;for(n in e)t[n]=e[n]};e.exports=function(e){var t=o(null);return i.call(arguments,function(e){r(e)&&a(Object(e),t)}),t}},function(e,t,n){"use strict";var r=n(32),i={listen:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!1),{remove:function(){e.removeEventListener(t,n,!1)}}):e.attachEvent?(e.attachEvent("on"+t,n),{remove:function(){e.detachEvent("on"+t,n)}}):void 0},capture:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!0),{remove:function(){e.removeEventListener(t,n,!0)}}):{remove:r}},registerDefault:function(){}};e.exports=i},function(e,t,n){"use strict";function r(e){try{e.focus()}catch(e){}}e.exports=r},function(e,t,n){"use strict";function r(e){if(void 0===(e=e||("undefined"!=typeof document?document:void 0)))return null;try{return e.activeElement||e.body}catch(t){return e.body}}e.exports=r},function(e,t,n){function r(e,t){this._options=t||{},this._cbs=e||{},this._tagname="",this._attribname="",this._attribvalue="",this._attribs=null,this._stack=[],this.startIndex=0,this.endIndex=null,this._lowerCaseTagNames="lowerCaseTags"in this._options?!!this._options.lowerCaseTags:!this._options.xmlMode,this._lowerCaseAttributeNames="lowerCaseAttributeNames"in this._options?!!this._options.lowerCaseAttributeNames:!this._options.xmlMode,this._options.Tokenizer&&(i=this._options.Tokenizer),this._tokenizer=new i(this._options,this),this._cbs.onparserinit&&this._cbs.onparserinit(this)}var i=n(381),o={input:!0,option:!0,optgroup:!0,select:!0,button:!0,datalist:!0,textarea:!0},a={tr:{tr:!0,th:!0,td:!0},th:{th:!0},td:{thead:!0,th:!0,td:!0},body:{head:!0,link:!0,script:!0},li:{li:!0},p:{p:!0},h1:{p:!0},h2:{p:!0},h3:{p:!0},h4:{p:!0},h5:{p:!0},h6:{p:!0},select:o,input:o,output:o,button:o,datalist:o,textarea:o,option:{option:!0},optgroup:{optgroup:!0}},s={__proto__:null,area:!0,base:!0,basefont:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,isindex:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,path:!0,circle:!0,ellipse:!0,line:!0,rect:!0,use:!0,stop:!0,polyline:!0,polygon:!0},u=/\s|\//;n(42)(r,n(143).EventEmitter),r.prototype._updatePosition=function(e){null===this.endIndex?this._tokenizer._sectionStart<=e?this.startIndex=0:this.startIndex=this._tokenizer._sectionStart-e:this.startIndex=this.endIndex+1,this.endIndex=this._tokenizer.getAbsoluteIndex()},r.prototype.ontext=function(e){this._updatePosition(1),this.endIndex--,this._cbs.ontext&&this._cbs.ontext(e)},r.prototype.onopentagname=function(e){if(this._lowerCaseTagNames&&(e=e.toLowerCase()),this._tagname=e,!this._options.xmlMode&&e in a)for(var t;(t=this._stack[this._stack.length-1])in a[e];this.onclosetag(t));!this._options.xmlMode&&e in s||this._stack.push(e),this._cbs.onopentagname&&this._cbs.onopentagname(e),this._cbs.onopentag&&(this._attribs={})},r.prototype.onopentagend=function(){this._updatePosition(1),this._attribs&&(this._cbs.onopentag&&this._cbs.onopentag(this._tagname,this._attribs),this._attribs=null),!this._options.xmlMode&&this._cbs.onclosetag&&this._tagname in s&&this._cbs.onclosetag(this._tagname),this._tagname=""},r.prototype.onclosetag=function(e){if(this._updatePosition(1),this._lowerCaseTagNames&&(e=e.toLowerCase()),!this._stack.length||e in s&&!this._options.xmlMode)this._options.xmlMode||"br"!==e&&"p"!==e||(this.onopentagname(e),this._closeCurrentTag());else{var t=this._stack.lastIndexOf(e);if(-1!==t)if(this._cbs.onclosetag)for(t=this._stack.length-t;t--;)this._cbs.onclosetag(this._stack.pop());else this._stack.length=t;else"p"!==e||this._options.xmlMode||(this.onopentagname(e),this._closeCurrentTag())}},r.prototype.onselfclosingtag=function(){this._options.xmlMode||this._options.recognizeSelfClosing?this._closeCurrentTag():this.onopentagend()},r.prototype._closeCurrentTag=function(){var e=this._tagname;this.onopentagend(),this._stack[this._stack.length-1]===e&&(this._cbs.onclosetag&&this._cbs.onclosetag(e),this._stack.pop())},r.prototype.onattribname=function(e){this._lowerCaseAttributeNames&&(e=e.toLowerCase()),this._attribname=e},r.prototype.onattribdata=function(e){this._attribvalue+=e},r.prototype.onattribend=function(){this._cbs.onattribute&&this._cbs.onattribute(this._attribname,this._attribvalue),this._attribs&&!Object.prototype.hasOwnProperty.call(this._attribs,this._attribname)&&(this._attribs[this._attribname]=this._attribvalue),this._attribname="",this._attribvalue=""},r.prototype._getInstructionName=function(e){var t=e.search(u),n=t<0?e:e.substr(0,t);return this._lowerCaseTagNames&&(n=n.toLowerCase()),n},r.prototype.ondeclaration=function(e){if(this._cbs.onprocessinginstruction){var t=this._getInstructionName(e);this._cbs.onprocessinginstruction("!"+t,"!"+e)}},r.prototype.onprocessinginstruction=function(e){if(this._cbs.onprocessinginstruction){var t=this._getInstructionName(e);this._cbs.onprocessinginstruction("?"+t,"?"+e)}},r.prototype.oncomment=function(e){this._updatePosition(4),this._cbs.oncomment&&this._cbs.oncomment(e),this._cbs.oncommentend&&this._cbs.oncommentend()},r.prototype.oncdata=function(e){this._updatePosition(1),this._options.xmlMode||this._options.recognizeCDATA?(this._cbs.oncdatastart&&this._cbs.oncdatastart(),this._cbs.ontext&&this._cbs.ontext(e),this._cbs.oncdataend&&this._cbs.oncdataend()):this.oncomment("[CDATA["+e+"]]")},r.prototype.onerror=function(e){this._cbs.onerror&&this._cbs.onerror(e)},r.prototype.onend=function(){if(this._cbs.onclosetag)for(var e=this._stack.length;e>0;this._cbs.onclosetag(this._stack[--e]));this._cbs.onend&&this._cbs.onend()},r.prototype.reset=function(){this._cbs.onreset&&this._cbs.onreset(),this._tokenizer.reset(),this._tagname="",this._attribname="",this._attribs=null,this._stack=[],this._cbs.onparserinit&&this._cbs.onparserinit(this)},r.prototype.parseComplete=function(e){this.reset(),this.end(e)},r.prototype.write=function(e){this._tokenizer.write(e)},r.prototype.end=function(e){this._tokenizer.end(e)},r.prototype.pause=function(){this._tokenizer.pause()},r.prototype.resume=function(){this._tokenizer.resume()},r.prototype.parseChunk=r.prototype.write,r.prototype.done=r.prototype.end,e.exports=r},function(e,t,n){function r(e){return" "===e||"\n"===e||"\t"===e||"\f"===e||"\r"===e}function i(e,t,n){var r=e.toLowerCase();return e===r?function(e){e===r?this._state=t:(this._state=n,this._index--)}:function(i){i===r||i===e?this._state=t:(this._state=n,this._index--)}}function o(e,t){var n=e.toLowerCase();return function(r){r===n||r===e?this._state=t:(this._state=d,this._index--)}}function a(e,t){this._state=f,this._buffer="",this._sectionStart=0,this._index=0,this._bufferOffset=0,this._baseState=f,this._special=de,this._cbs=t,this._running=!0,this._ended=!1,this._xmlMode=!(!e||!e.xmlMode),this._decodeEntities=!(!e||!e.decodeEntities)}e.exports=a;var s=n(369),u=n(204),l=n(370),c=n(205),p=0,f=p++,h=p++,d=p++,m=p++,v=p++,g=p++,y=p++,_=p++,b=p++,x=p++,w=p++,k=p++,E=p++,S=p++,C=p++,A=p++,D=p++,O=p++,M=p++,T=p++,P=p++,I=p++,R=p++,j=p++,F=p++,N=p++,B=p++,L=p++,q=p++,z=p++,U=p++,W=p++,V=p++,H=p++,G=p++,J=p++,K=p++,X=p++,Y=p++,$=p++,Z=p++,Q=p++,ee=p++,te=p++,ne=p++,re=p++,ie=p++,oe=p++,ae=p++,se=p++,ue=p++,le=p++,ce=p++,pe=p++,fe=p++,he=0,de=he++,me=he++,ve=he++;a.prototype._stateText=function(e){"<"===e?(this._index>this._sectionStart&&this._cbs.ontext(this._getSection()),this._state=h,this._sectionStart=this._index):this._decodeEntities&&this._special===de&&"&"===e&&(this._index>this._sectionStart&&this._cbs.ontext(this._getSection()),this._baseState=f,this._state=ue,this._sectionStart=this._index)},a.prototype._stateBeforeTagName=function(e){"/"===e?this._state=v:"<"===e?(this._cbs.ontext(this._getSection()),this._sectionStart=this._index):">"===e||this._special!==de||r(e)?this._state=f:"!"===e?(this._state=C,this._sectionStart=this._index+1):"?"===e?(this._state=D,this._sectionStart=this._index+1):(this._state=this._xmlMode||"s"!==e&&"S"!==e?d:U,this._sectionStart=this._index)},a.prototype._stateInTagName=function(e){("/"===e||">"===e||r(e))&&(this._emitToken("onopentagname"),this._state=_,this._index--)},a.prototype._stateBeforeCloseingTagName=function(e){r(e)||(">"===e?this._state=f:this._special!==de?"s"===e||"S"===e?this._state=W:(this._state=f,this._index--):(this._state=g,this._sectionStart=this._index))},a.prototype._stateInCloseingTagName=function(e){(">"===e||r(e))&&(this._emitToken("onclosetag"),this._state=y,this._index--)},a.prototype._stateAfterCloseingTagName=function(e){">"===e&&(this._state=f,this._sectionStart=this._index+1)},a.prototype._stateBeforeAttributeName=function(e){">"===e?(this._cbs.onopentagend(),this._state=f,this._sectionStart=this._index+1):"/"===e?this._state=m:r(e)||(this._state=b,this._sectionStart=this._index)},a.prototype._stateInSelfClosingTag=function(e){">"===e?(this._cbs.onselfclosingtag(),this._state=f,this._sectionStart=this._index+1):r(e)||(this._state=_,this._index--)},a.prototype._stateInAttributeName=function(e){("="===e||"/"===e||">"===e||r(e))&&(this._cbs.onattribname(this._getSection()),this._sectionStart=-1,this._state=x,this._index--)},a.prototype._stateAfterAttributeName=function(e){"="===e?this._state=w:"/"===e||">"===e?(this._cbs.onattribend(),this._state=_,this._index--):r(e)||(this._cbs.onattribend(),this._state=b,this._sectionStart=this._index)},a.prototype._stateBeforeAttributeValue=function(e){'"'===e?(this._state=k,this._sectionStart=this._index+1):"'"===e?(this._state=E,this._sectionStart=this._index+1):r(e)||(this._state=S,this._sectionStart=this._index,this._index--)},a.prototype._stateInAttributeValueDoubleQuotes=function(e){'"'===e?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=_):this._decodeEntities&&"&"===e&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ue,this._sectionStart=this._index)},a.prototype._stateInAttributeValueSingleQuotes=function(e){"'"===e?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=_):this._decodeEntities&&"&"===e&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ue,this._sectionStart=this._index)},a.prototype._stateInAttributeValueNoQuotes=function(e){r(e)||">"===e?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=_,this._index--):this._decodeEntities&&"&"===e&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ue,this._sectionStart=this._index)},a.prototype._stateBeforeDeclaration=function(e){this._state="["===e?I:"-"===e?O:A},a.prototype._stateInDeclaration=function(e){">"===e&&(this._cbs.ondeclaration(this._getSection()),this._state=f,this._sectionStart=this._index+1)},a.prototype._stateInProcessingInstruction=function(e){">"===e&&(this._cbs.onprocessinginstruction(this._getSection()),this._state=f,this._sectionStart=this._index+1)},a.prototype._stateBeforeComment=function(e){"-"===e?(this._state=M,this._sectionStart=this._index+1):this._state=A},a.prototype._stateInComment=function(e){"-"===e&&(this._state=T)},a.prototype._stateAfterComment1=function(e){this._state="-"===e?P:M},a.prototype._stateAfterComment2=function(e){">"===e?(this._cbs.oncomment(this._buffer.substring(this._sectionStart,this._index-2)),this._state=f,this._sectionStart=this._index+1):"-"!==e&&(this._state=M)},a.prototype._stateBeforeCdata1=i("C",R,A),a.prototype._stateBeforeCdata2=i("D",j,A),a.prototype._stateBeforeCdata3=i("A",F,A),a.prototype._stateBeforeCdata4=i("T",N,A),a.prototype._stateBeforeCdata5=i("A",B,A),a.prototype._stateBeforeCdata6=function(e){"["===e?(this._state=L,this._sectionStart=this._index+1):(this._state=A,this._index--)},a.prototype._stateInCdata=function(e){"]"===e&&(this._state=q)},a.prototype._stateAfterCdata1=function(e,t){return function(n){n===e&&(this._state=t)}}("]",z),a.prototype._stateAfterCdata2=function(e){">"===e?(this._cbs.oncdata(this._buffer.substring(this._sectionStart,this._index-2)),this._state=f,this._sectionStart=this._index+1):"]"!==e&&(this._state=L)},a.prototype._stateBeforeSpecial=function(e){"c"===e||"C"===e?this._state=V:"t"===e||"T"===e?this._state=ee:(this._state=d,this._index--)},a.prototype._stateBeforeSpecialEnd=function(e){this._special!==me||"c"!==e&&"C"!==e?this._special!==ve||"t"!==e&&"T"!==e?this._state=f:this._state=ie:this._state=X},a.prototype._stateBeforeScript1=o("R",H),a.prototype._stateBeforeScript2=o("I",G),a.prototype._stateBeforeScript3=o("P",J),a.prototype._stateBeforeScript4=o("T",K),a.prototype._stateBeforeScript5=function(e){("/"===e||">"===e||r(e))&&(this._special=me),this._state=d,this._index--},a.prototype._stateAfterScript1=i("R",Y,f),a.prototype._stateAfterScript2=i("I",$,f),a.prototype._stateAfterScript3=i("P",Z,f),a.prototype._stateAfterScript4=i("T",Q,f),a.prototype._stateAfterScript5=function(e){">"===e||r(e)?(this._special=de,this._state=g,this._sectionStart=this._index-6,this._index--):this._state=f},a.prototype._stateBeforeStyle1=o("Y",te),a.prototype._stateBeforeStyle2=o("L",ne),a.prototype._stateBeforeStyle3=o("E",re),a.prototype._stateBeforeStyle4=function(e){("/"===e||">"===e||r(e))&&(this._special=ve),this._state=d,this._index--},a.prototype._stateAfterStyle1=i("Y",oe,f),a.prototype._stateAfterStyle2=i("L",ae,f),a.prototype._stateAfterStyle3=i("E",se,f),a.prototype._stateAfterStyle4=function(e){">"===e||r(e)?(this._special=de,this._state=g,this._sectionStart=this._index-5,this._index--):this._state=f},a.prototype._stateBeforeEntity=i("#",le,ce),a.prototype._stateBeforeNumericEntity=i("X",fe,pe),a.prototype._parseNamedEntityStrict=function(){if(this._sectionStart+1<this._index){var e=this._buffer.substring(this._sectionStart+1,this._index),t=this._xmlMode?c:u;t.hasOwnProperty(e)&&(this._emitPartial(t[e]),this._sectionStart=this._index+1)}},a.prototype._parseLegacyEntity=function(){var e=this._sectionStart+1,t=this._index-e;for(t>6&&(t=6);t>=2;){var n=this._buffer.substr(e,t);if(l.hasOwnProperty(n))return this._emitPartial(l[n]),void(this._sectionStart+=t+1);t--}},a.prototype._stateInNamedEntity=function(e){";"===e?(this._parseNamedEntityStrict(),this._sectionStart+1<this._index&&!this._xmlMode&&this._parseLegacyEntity(),this._state=this._baseState):(e<"a"||e>"z")&&(e<"A"||e>"Z")&&(e<"0"||e>"9")&&(this._xmlMode||this._sectionStart+1===this._index||(this._baseState!==f?"="!==e&&this._parseNamedEntityStrict():this._parseLegacyEntity()),this._state=this._baseState,this._index--)},a.prototype._decodeNumericEntity=function(e,t){var n=this._sectionStart+e;if(n!==this._index){var r=this._buffer.substring(n,this._index),i=parseInt(r,t);this._emitPartial(s(i)),this._sectionStart=this._index}else this._sectionStart--;this._state=this._baseState},a.prototype._stateInNumericEntity=function(e){";"===e?(this._decodeNumericEntity(2,10),this._sectionStart++):(e<"0"||e>"9")&&(this._xmlMode?this._state=this._baseState:this._decodeNumericEntity(2,10),this._index--)},a.prototype._stateInHexEntity=function(e){";"===e?(this._decodeNumericEntity(3,16),this._sectionStart++):(e<"a"||e>"f")&&(e<"A"||e>"F")&&(e<"0"||e>"9")&&(this._xmlMode?this._state=this._baseState:this._decodeNumericEntity(3,16),this._index--)},a.prototype._cleanup=function(){this._sectionStart<0?(this._buffer="",this._bufferOffset+=this._index,this._index=0):this._running&&(this._state===f?(this._sectionStart!==this._index&&this._cbs.ontext(this._buffer.substr(this._sectionStart)),this._buffer="",this._bufferOffset+=this._index,this._index=0):this._sectionStart===this._index?(this._buffer="",this._bufferOffset+=this._index,this._index=0):(this._buffer=this._buffer.substr(this._sectionStart),this._index-=this._sectionStart,this._bufferOffset+=this._sectionStart),this._sectionStart=0)},a.prototype.write=function(e){this._ended&&this._cbs.onerror(Error(".write() after done!")),this._buffer+=e,this._parse()},a.prototype._parse=function(){for(;this._index<this._buffer.length&&this._running;){var e=this._buffer.charAt(this._index);this._state===f?this._stateText(e):this._state===h?this._stateBeforeTagName(e):this._state===d?this._stateInTagName(e):this._state===v?this._stateBeforeCloseingTagName(e):this._state===g?this._stateInCloseingTagName(e):this._state===y?this._stateAfterCloseingTagName(e):this._state===m?this._stateInSelfClosingTag(e):this._state===_?this._stateBeforeAttributeName(e):this._state===b?this._stateInAttributeName(e):this._state===x?this._stateAfterAttributeName(e):this._state===w?this._stateBeforeAttributeValue(e):this._state===k?this._stateInAttributeValueDoubleQuotes(e):this._state===E?this._stateInAttributeValueSingleQuotes(e):this._state===S?this._stateInAttributeValueNoQuotes(e):this._state===C?this._stateBeforeDeclaration(e):this._state===A?this._stateInDeclaration(e):this._state===D?this._stateInProcessingInstruction(e):this._state===O?this._stateBeforeComment(e):this._state===M?this._stateInComment(e):this._state===T?this._stateAfterComment1(e):this._state===P?this._stateAfterComment2(e):this._state===I?this._stateBeforeCdata1(e):this._state===R?this._stateBeforeCdata2(e):this._state===j?this._stateBeforeCdata3(e):this._state===F?this._stateBeforeCdata4(e):this._state===N?this._stateBeforeCdata5(e):this._state===B?this._stateBeforeCdata6(e):this._state===L?this._stateInCdata(e):this._state===q?this._stateAfterCdata1(e):this._state===z?this._stateAfterCdata2(e):this._state===U?this._stateBeforeSpecial(e):this._state===W?this._stateBeforeSpecialEnd(e):this._state===V?this._stateBeforeScript1(e):this._state===H?this._stateBeforeScript2(e):this._state===G?this._stateBeforeScript3(e):this._state===J?this._stateBeforeScript4(e):this._state===K?this._stateBeforeScript5(e):this._state===X?this._stateAfterScript1(e):this._state===Y?this._stateAfterScript2(e):this._state===$?this._stateAfterScript3(e):this._state===Z?this._stateAfterScript4(e):this._state===Q?this._stateAfterScript5(e):this._state===ee?this._stateBeforeStyle1(e):this._state===te?this._stateBeforeStyle2(e):this._state===ne?this._stateBeforeStyle3(e):this._state===re?this._stateBeforeStyle4(e):this._state===ie?this._stateAfterStyle1(e):this._state===oe?this._stateAfterStyle2(e):this._state===ae?this._stateAfterStyle3(e):this._state===se?this._stateAfterStyle4(e):this._state===ue?this._stateBeforeEntity(e):this._state===le?this._stateBeforeNumericEntity(e):this._state===ce?this._stateInNamedEntity(e):this._state===pe?this._stateInNumericEntity(e):this._state===fe?this._stateInHexEntity(e):this._cbs.onerror(Error("unknown _state"),this._state),this._index++}this._cleanup()},a.prototype.pause=function(){this._running=!1},a.prototype.resume=function(){this._running=!0,this._index<this._buffer.length&&this._parse(),this._ended&&this._finish()},a.prototype.end=function(e){this._ended&&this._cbs.onerror(Error(".end() after done!")),e&&this.write(e),this._ended=!0,this._running&&this._finish()},a.prototype._finish=function(){this._sectionStart<this._index&&this._handleTrailingData(),this._cbs.onend()},a.prototype._handleTrailingData=function(){var e=this._buffer.substr(this._sectionStart);this._state===L||this._state===q||this._state===z?this._cbs.oncdata(e):this._state===M||this._state===T||this._state===P?this._cbs.oncomment(e):this._state!==ce||this._xmlMode?this._state!==pe||this._xmlMode?this._state!==fe||this._xmlMode?this._state!==d&&this._state!==_&&this._state!==w&&this._state!==x&&this._state!==b&&this._state!==E&&this._state!==k&&this._state!==S&&this._state!==g&&this._cbs.ontext(e):(this._decodeNumericEntity(3,16),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData())):(this._decodeNumericEntity(2,10),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData())):(this._parseLegacyEntity(),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData()))},a.prototype.reset=function(){a.call(this,{xmlMode:this._xmlMode,decodeEntities:this._decodeEntities},this._cbs)},a.prototype.getAbsoluteIndex=function(){return this._bufferOffset+this._index},a.prototype._getSection=function(){return this._buffer.substring(this._sectionStart,this._index)},a.prototype._emitToken=function(e){this._cbs[e](this._getSection()),this._sectionStart=-1},a.prototype._emitPartial=function(e){this._baseState!==f?this._cbs.onattribdata(e):this._cbs.ontext(e)}},function(e,t,n){function r(e,t){var n=this._parser=new i(e,t),r=this._decoder=new a;o.call(this,{decodeStrings:!1}),this.once("finish",function(){n.end(r.end())})}e.exports=r;var i=n(380),o=n(493).Writable||n(1209).Writable,a=n(265).StringDecoder,s=n(40).Buffer;n(42)(r,o),o.prototype._write=function(e,t,n){e instanceof s&&(e=this._decoder.write(e)),this._parser.write(e),n()}},function(e,t,n){"use strict";function r(e,t){-1===e.indexOf(t)&&e.push(t)}function i(e,t){if(Array.isArray(t))for(var n=0,i=t.length;n<i;++n)r(e,t[n]);else r(e,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e instanceof Object&&!Array.isArray(e)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r,i){for(var o=0,a=e.length;o<a;++o){var s=e[o](t,n,r,i);if(s)return s}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t){function n(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof e.then}e.exports=n},function(e,t){var n={}.toString;e.exports=Array.isArray||function(e){return"[object Array]"==n.call(e)}},function(e,t,n){"use strict";var r=n(81);e.exports=new r({include:[n(389)]})},function(e,t,n){"use strict";var r=n(81);e.exports=new r({include:[n(212)],implicit:[n(808),n(800),n(802),n(801)]})},function(e,t,n){"use strict";var r=n(821),i=r.a.Symbol;t.a=i},function(e,t,n){"use strict";function r(e){if(!n.i(a.a)(e)||n.i(i.a)(e)!=s)return!1;var t=n.i(o.a)(e);if(null===t)return!0;var r=p.call(t,"constructor")&&t.constructor;return"function"==typeof r&&r instanceof r&&c.call(r)==f}var i=n(815),o=n(817),a=n(822),s="[object Object]",u=Function.prototype,l=Object.prototype,c=u.toString,p=l.hasOwnProperty,f=c.call(Object);t.a=r},function(e,t,n){var r=n(43),i=r.Uint8Array;e.exports=i},function(e,t,n){function r(e,t){var n=a(e),r=!n&&o(e),c=!n&&!r&&s(e),f=!n&&!r&&!c&&l(e),h=n||r||c||f,d=h?i(e.length,String):[],m=d.length;for(var v in e)!t&&!p.call(e,v)||h&&("length"==v||c&&("offset"==v||"parent"==v)||f&&("buffer"==v||"byteLength"==v||"byteOffset"==v)||u(v,m))||d.push(v);return d}var i=n(870),o=n(226),a=n(20),s=n(227),u=n(152),l=n(423),c=Object.prototype,p=c.hasOwnProperty;e.exports=r},function(e,t){function n(e,t){for(var n=-1,r=null==e?0:e.length,i=Array(r);++n<r;)i[n]=t(e[n],n,e);return i}e.exports=n},function(e,t){function n(e,t){for(var n=-1,r=null==e?0:e.length;++n<r;)if(t(e[n],n,e))return!0;return!1}e.exports=n},function(e,t,n){function r(e,t,n){"__proto__"==t&&i?i(e,t,{configurable:!0,enumerable:!0,value:n,writable:!0}):e[t]=n}var i=n(403);e.exports=r},function(e,t,n){function r(e,t,n,T,P,I){var R,j=t&k,F=t&E,N=t&S;if(n&&(R=P?n(e,T,P,I):n(e)),void 0!==R)return R;if(!x(e))return e;var B=_(e);if(B){if(R=v(e),!j)return c(e,R)}else{var L=m(e),q=L==A||L==D;if(b(e))return l(e,j);if(L==O||L==C||q&&!P){if(R=F||q?{}:y(e),!j)return F?f(e,u(R,e)):p(e,s(R,e))}else{if(!M[L])return P?e:{};R=g(e,L,r,j)}}I||(I=new i);var z=I.get(e);if(z)return z;I.set(e,R);var U=N?F?d:h:F?keysIn:w,W=B?void 0:U(e);return o(W||e,function(i,o){W&&(o=i,i=e[o]),a(R,o,r(i,t,n,o,e,I))}),R}var i=n(215),o=n(837),a=n(148),s=n(841),u=n(842),l=n(875),c=n(882),p=n(883),f=n(884),h=n(894),d=n(407),m=n(409),v=n(905),g=n(906),y=n(907),_=n(20),b=n(227),x=n(38),w=n(59),k=1,E=2,S=4,C="[object Arguments]",A="[object Function]",D="[object GeneratorFunction]",O="[object Object]",M={};M[C]=M["[object Array]"]=M["[object ArrayBuffer]"]=M["[object DataView]"]=M["[object Boolean]"]=M["[object Date]"]=M["[object Float32Array]"]=M["[object Float64Array]"]=M["[object Int8Array]"]=M["[object Int16Array]"]=M["[object Int32Array]"]=M["[object Map]"]=M["[object Number]"]=M[O]=M["[object RegExp]"]=M["[object Set]"]=M["[object String]"]=M["[object Symbol]"]=M["[object Uint8Array]"]=M["[object Uint8ClampedArray]"]=M["[object Uint16Array]"]=M["[object Uint32Array]"]=!0,M["[object Error]"]=M[A]=M["[object WeakMap]"]=!1,e.exports=r},function(e,t,n){function r(e,t,n){var r=t(e);return o(e)?r:i(r,n(e))}var i=n(216),o=n(20);e.exports=r},function(e,t,n){function r(e,t,n,s,u){return e===t||(null==e||null==t||!o(e)&&!a(t)?e!==e&&t!==t:i(e,t,n,s,r,u))}var i=n(852),o=n(38),a=n(68);e.exports=r},function(e,t){function n(e,t,n){var r=-1,i=e.length;t<0&&(t=-t>i?0:i+t),n=n>i?i:n,n<0&&(n+=i),i=t>n?0:n-t>>>0,t>>>=0;for(var o=Array(i);++r<i;)o[r]=e[r+t];return o}e.exports=n},function(e,t,n){function r(e){if("string"==typeof e)return e;if(a(e))return o(e,r)+"";if(s(e))return c?c.call(e):"";var t=e+"";return"0"==t&&1/e==-u?"-0":t}var i=n(82),o=n(394),a=n(20),s=n(155),u=1/0,l=i?i.prototype:void 0,c=l?l.toString:void 0;e.exports=r},function(e,t,n){function r(e){return function(t){return i(a(o(t).replace(s,"")),e,"")}}var i=n(147),o=n(944),a=n(960),s=RegExp("['’]","g");e.exports=r},function(e,t,n){var r=n(67),i=function(){try{var e=r(Object,"defineProperty");return e({},"",{}),e}catch(e){}}();e.exports=i},function(e,t,n){function r(e,t,n,r,l,c){var p=n&s,f=e.length,h=t.length;if(f!=h&&!(p&&h>f))return!1;var d=c.get(e);if(d&&c.get(t))return d==t;var m=-1,v=!0,g=n&u?new i:void 0;for(c.set(e,t),c.set(t,e);++m<f;){var y=e[m],_=t[m];if(r)var b=p?r(_,y,m,t,e,c):r(y,_,m,e,t,c);if(void 0!==b){if(b)continue;v=!1;break}if(g){if(!o(t,function(e,t){if(!a(g,t)&&(y===e||l(y,e,n,r,c)))return g.push(t)})){v=!1;break}}else if(y!==_&&!l(y,_,n,r,c)){v=!1;break}}return c.delete(e),c.delete(t),v}var i=n(832),o=n(395),a=n(873),s=1,u=2;e.exports=r},function(e,t,n){function r(e){return a(o(e,void 0,i),e+"")}var i=n(946),o=n(415),a=n(417);e.exports=r},function(e,t,n){(function(t){var n="object"==typeof t&&t&&t.Object===Object&&t;e.exports=n}).call(t,n(17))},function(e,t,n){function r(e){return i(e,a,o)}var i=n(398),o=n(408),a=n(424);e.exports=r},function(e,t,n){var r=n(216),i=n(219),o=n(220),a=n(426),s=Object.getOwnPropertySymbols,u=s?function(e){for(var t=[];e;)r(t,o(e)),e=i(e);return t}:a;e.exports=u},function(e,t,n){var r=n(828),i=n(213),o=n(830),a=n(831),s=n(833),u=n(66),l=n(418),c=l(r),p=l(i),f=l(o),h=l(a),d=l(s),m=u;(r&&"[object DataView]"!=m(new r(new ArrayBuffer(1)))||i&&"[object Map]"!=m(new i)||o&&"[object Promise]"!=m(o.resolve())||a&&"[object Set]"!=m(new a)||s&&"[object WeakMap]"!=m(new s))&&(m=function(e){var t=u(e),n="[object Object]"==t?e.constructor:void 0,r=n?l(n):"";if(r)switch(r){case c:return"[object DataView]";case p:return"[object Map]";case f:return"[object Promise]";case h:return"[object Set]";case d:return"[object WeakMap]"}return t}),e.exports=m},function(e,t){function n(e){return r.test(e)}var r=RegExp("[\\u200d\\ud800-\\udfff\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff\\ufe0e\\ufe0f]");e.exports=n},function(e,t,n){function r(e,t,n){if(!s(n))return!1;var r=typeof t;return!!("number"==r?o(n)&&a(t,n.length):"string"==r&&t in n)&&i(n[t],e)}var i=n(120),o=n(86),a=n(152),s=n(38);e.exports=r},function(e,t,n){function r(e){return e===e&&!i(e)}var i=n(38);e.exports=r},function(e,t){function n(e){var t=-1,n=Array(e.size);return e.forEach(function(e,r){n[++t]=[r,e]}),n}e.exports=n},function(e,t){function n(e,t){return function(n){return null!=n&&(n[e]===t&&(void 0!==t||e in Object(n)))}}e.exports=n},function(e,t,n){function r(e,t,n){return t=o(void 0===t?e.length-1:t,0),function(){for(var r=arguments,a=-1,s=o(r.length-t,0),u=Array(s);++a<s;)u[a]=r[t+a];a=-1;for(var l=Array(t+1);++a<t;)l[a]=r[a];return l[t]=n(u),i(e,this,l)}}var i=n(836),o=Math.max;e.exports=r},function(e,t){function n(e){var t=-1,n=Array(e.size);return e.forEach(function(e){n[++t]=e}),n}e.exports=n},function(e,t,n){var r=n(868),i=n(929),o=i(r);e.exports=o},function(e,t){function n(e){if(null!=e){try{return i.call(e)}catch(e){}try{return e+""}catch(e){}}return""}var r=Function.prototype,i=r.toString;e.exports=n},function(e,t,n){function r(e,t){return null!=e&&o(e,t,i)}var i=n(850),o=n(898);e.exports=r},function(e,t,n){function r(e){if(!o(e))return!1;var t=i(e);return t==s||t==u||t==a||t==l}var i=n(66),o=n(38),a="[object AsyncFunction]",s="[object Function]",u="[object GeneratorFunction]",l="[object Proxy]";e.exports=r},function(e,t,n){function r(e){if(!a(e)||i(e)!=s)return!1;var t=o(e);if(null===t)return!0;var n=p.call(t,"constructor")&&t.constructor;return"function"==typeof n&&n instanceof n&&c.call(n)==f}var i=n(66),o=n(219),a=n(68),s="[object Object]",u=Function.prototype,l=Object.prototype,c=u.toString,p=l.hasOwnProperty,f=c.call(Object);e.exports=r},function(e,t,n){function r(e){return"string"==typeof e||!o(e)&&a(e)&&i(e)==s}var i=n(66),o=n(20),a=n(68),s="[object String]";e.exports=r},function(e,t,n){var r=n(855),i=n(871),o=n(924),a=o&&o.isTypedArray,s=a?i(a):r;e.exports=s},function(e,t,n){function r(e){return a(e)?i(e,!0):o(e)}var i=n(393),o=n(857),a=n(86);e.exports=r},function(e,t,n){function r(e,t){if("function"!=typeof e||null!=t&&"function"!=typeof t)throw new TypeError(o);var n=function(){var r=arguments,i=t?t.apply(this,r):r[0],o=n.cache;if(o.has(i))return o.get(i);var a=e.apply(this,r);return n.cache=o.set(i,a)||o,a};return n.cache=new(r.Cache||i),n}var i=n(214),o="Expected a function";r.Cache=i,e.exports=r},function(e,t){function n(){return[]}e.exports=n},function(e,t,n){function r(e){var t=i(e),n=t%1;return t===t?n?t-n:t:0}var i=n(958);e.exports=r},function(e,t,n){var r=n(889),i=r("toUpperCase");e.exports=i},function(e,t,n){"use strict";function r(e){var t,n,r=o[e];if(r)return r;for(r=o[e]=[],t=0;t<128;t++)n=String.fromCharCode(t),r.push(n);for(t=0;t<e.length;t++)n=e.charCodeAt(t),r[n]="%"+("0"+n.toString(16).toUpperCase()).slice(-2);return r}function i(e,t){var n;return"string"!=typeof t&&(t=i.defaultChars),n=r(t),e.replace(/(%[a-f0-9]{2})+/gi,function(e){var t,r,i,o,a,s,u,l="";for(t=0,r=e.length;t<r;t+=3)i=parseInt(e.slice(t+1,t+3),16),i<128?l+=n[i]:192==(224&i)&&t+3<r&&128==(192&(o=parseInt(e.slice(t+4,t+6),16)))?(u=i<<6&1984|63&o,l+=u<128?"��":String.fromCharCode(u),t+=3):224==(240&i)&&t+6<r&&(o=parseInt(e.slice(t+4,t+6),16),a=parseInt(e.slice(t+7,t+9),16),128==(192&o)&&128==(192&a))?(u=i<<12&61440|o<<6&4032|63&a,l+=u<2048||u>=55296&&u<=57343?"���":String.fromCharCode(u),t+=6):240==(248&i)&&t+9<r&&(o=parseInt(e.slice(t+4,t+6),16),a=parseInt(e.slice(t+7,t+9),16),s=parseInt(e.slice(t+10,t+12),16),128==(192&o)&&128==(192&a)&&128==(192&s))?(u=i<<18&1835008|o<<12&258048|a<<6&4032|63&s,u<65536||u>1114111?l+="����":(u-=65536,l+=String.fromCharCode(55296+(u>>10),56320+(1023&u))),t+=9):l+="�";return l})}var o={};i.defaultChars=";/?:@&=+$,#",i.componentChars="",e.exports=i},function(e,t,n){"use strict";function r(e){var t,n,r=o[e];if(r)return r;for(r=o[e]=[],t=0;t<128;t++)n=String.fromCharCode(t),/^[0-9a-z]$/i.test(n)?r.push(n):r.push("%"+("0"+t.toString(16).toUpperCase()).slice(-2));for(t=0;t<e.length;t++)r[e.charCodeAt(t)]=e[t];return r}function i(e,t,n){var o,a,s,u,l,c="";for("string"!=typeof t&&(n=t,t=i.defaultChars),void 0===n&&(n=!0),l=r(t),o=0,a=e.length;o<a;o++)if(s=e.charCodeAt(o),n&&37===s&&o+2<a&&/^[0-9a-f]{2}$/i.test(e.slice(o+1,o+3)))c+=e.slice(o,o+3),o+=2;else if(s<128)c+=l[s];else if(s>=55296&&s<=57343){if(s>=55296&&s<=56319&&o+1<a&&(u=e.charCodeAt(o+1))>=56320&&u<=57343){c+=encodeURIComponent(e[o]+e[o+1]),o++;continue}c+="%EF%BF%BD"}else c+=encodeURIComponent(e[o]);return c}var o={};i.defaultChars=";/?:@&=+$,-_.!~*'()#",i.componentChars="-_.!~*'()",e.exports=i},function(e,t,n){"use strict";var r=n(65);e.exports=function(e,t,n){var i;return isNaN(e)?(i=t,i>=0?n&&i?i-1:i:1):!1!==e&&r(e)}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var o=n(1211),a=r(o),s=n(503),u=r(s),l=n(985),c=r(l),p=function(){function e(t,n,r,o,a,s){i(this,e),this.name="CssSyntaxError",this.reason=t,a&&(this.file=a),o&&(this.source=o),s&&(this.plugin=s),void 0!==n&&void 0!==r&&(this.line=n,this.column=r),this.setMessage(),Error.captureStackTrace&&Error.captureStackTrace(this,e)}return e.prototype.setMessage=function(){this.message=this.plugin?this.plugin+": ":"",this.message+=this.file?this.file:"<css input>",void 0!==this.line&&(this.message+=":"+this.line+":"+this.column),this.message+=": "+this.reason},e.prototype.showSourceCode=function(e){function t(t){return e&&u.default.red?u.default.red.bold(t):t}function n(t){return e&&u.default.gray?u.default.gray(t):t}var r=this;if(!this.source)return"";var i=this.source;void 0===e&&(e=a.default),e&&(i=(0,c.default)(i));var o=i.split(/\r?\n/),s=Math.max(this.line-3,0),l=Math.min(this.line+2,o.length),p=String(l).length;return o.slice(s,l).map(function(e,i){var o=s+1+i,a=" "+(" "+o).slice(-p)+" | ";if(o===r.line){var u=n(a.replace(/\d/g," "))+e.slice(0,r.column-1).replace(/[^\t]/g," ");return t(">")+n(a)+e+"\n "+u+t("^")}return" "+n(a)+e}).join("\n")},e.prototype.toString=function(){var e=this.showSourceCode();return e&&(e="\n\n"+e+"\n"),this.name+": "+this.message+e},e}();t.default=p,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(432),s=r(a),u=n(983),l=r(u),c=n(230),p=r(c),f=0,h=function(){function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};i(this,e),this.css=t.toString(),"\ufeff"!==this.css[0]&&"￾"!==this.css[0]||(this.css=this.css.slice(1)),n.from&&(/^\w+:\/\//.test(n.from)?this.file=n.from:this.file=p.default.resolve(n.from));var r=new l.default(this.css,n);if(r.text){this.map=r;var o=r.consumer().file;!this.file&&o&&(this.file=this.mapResolve(o))}this.file||(f+=1,this.id="<input css "+f+">"),this.map&&(this.map.file=this.from)}return e.prototype.error=function(e,t,n){var r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},i=void 0,o=this.origin(t,n);return i=o?new s.default(e,o.line,o.column,o.source,o.file,r.plugin):new s.default(e,t,n,this.css,this.file,r.plugin),i.input={line:t,column:n,source:this.css},this.file&&(i.input.file=this.file),i},e.prototype.origin=function(e,t){if(!this.map)return!1;var n=this.map.consumer(),r=n.originalPositionFor({line:e,column:t});if(!r.source)return!1;var i={file:this.mapResolve(r.source),line:r.line,column:r.column},o=n.sourceContentFor(r.source);return o&&(i.source=o),i},e.prototype.mapResolve=function(e){return/^\w+:\/\//.test(e)?e:p.default.resolve(this.map.consumer().sourceRoot||".",e)},o(e,[{key:"from",get:function(){return this.file||this.id}}]),e}();t.default=h,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e){return"object"===(void 0===e?"undefined":s(e))&&"function"==typeof e.then}t.__esModule=!0;var a=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},u=n(980),l=r(u),c=n(238),p=r(c),f=n(984),h=r(f),d=n(236),m=r(d),v=function(){function e(t,n,r){i(this,e),this.stringified=!1,this.processed=!1;var o=void 0;if("object"===(void 0===n?"undefined":s(n))&&"root"===n.type)o=n;else if(n instanceof e||n instanceof h.default)o=n.root,n.map&&(void 0===r.map&&(r.map={}),r.map.inline||(r.map.inline=!1),r.map.prev=n.map);else{var a=m.default;r.syntax&&(a=r.syntax.parse),r.parser&&(a=r.parser),a.parse&&(a=a.parse);try{o=a(n,r)}catch(e){this.error=e}}this.result=new h.default(t,o,r)}return e.prototype.warnings=function(){return this.sync().warnings()},e.prototype.toString=function(){return this.css},e.prototype.then=function(e,t){return this.async().then(e,t)},e.prototype.catch=function(e){return this.async().catch(e)},e.prototype.handleError=function(e,t){try{if(this.error=e,"CssSyntaxError"!==e.name||e.plugin){if(t.postcssVersion){var n=t.postcssPlugin,r=t.postcssVersion,i=this.result.processor.version,o=r.split("."),a=i.split(".");(o[0]!==a[0]||parseInt(o[1])>parseInt(a[1]))&&console.error("Unknown error from PostCSS plugin. Your current PostCSS version is "+i+", but "+n+" uses "+r+". Perhaps this is the source of the error below.")}}else e.plugin=t.postcssPlugin,e.setMessage()}catch(e){console&&console.error&&console.error(e)}},e.prototype.asyncTick=function(e,t){var n=this;if(this.plugin>=this.processor.plugins.length)return this.processed=!0,e();try{var r=this.processor.plugins[this.plugin],i=this.run(r);this.plugin+=1,o(i)?i.then(function(){n.asyncTick(e,t)}).catch(function(e){n.handleError(e,r),n.processed=!0,t(e)}):this.asyncTick(e,t)}catch(e){this.processed=!0,t(e)}},e.prototype.async=function(){var e=this;return this.processed?new Promise(function(t,n){e.error?n(e.error):t(e.stringify())}):this.processing?this.processing:(this.processing=new Promise(function(t,n){if(e.error)return n(e.error);e.plugin=0,e.asyncTick(t,n)}).then(function(){return e.processed=!0,e.stringify()}),this.processing)},e.prototype.sync=function(){if(this.processed)return this.result;if(this.processed=!0,this.processing)throw new Error("Use process(css).then(cb) to work with async plugins");if(this.error)throw this.error;for(var e=this.result.processor.plugins,t=Array.isArray(e),n=0,e=t?e:e[Symbol.iterator]();;){var r;if(t){if(n>=e.length)break;r=e[n++]}else{if(n=e.next(),n.done)break;r=n.value}var i=r;if(o(this.run(i)))throw new Error("Use process(css).then(cb) to work with async plugins")}return this.result},e.prototype.run=function(e){this.result.lastPlugin=e;try{return e(this.result.root,this.result)}catch(t){throw this.handleError(t,e),t}},e.prototype.stringify=function(){if(this.stringified)return this.result;this.stringified=!0,this.sync();var e=this.result.opts,t=p.default;e.syntax&&(t=e.syntax.stringify),e.stringifier&&(t=e.stringifier),t.stringify&&(t=t.stringify);var n=new l.default(t,this.result.root,this.result.opts),r=n.generate();return this.result.css=r[0],this.result.map=r[1],this.result},a(e,[{key:"processor",get:function(){return this.result.processor}},{key:"opts",get:function(){return this.result.opts}},{key:"css",get:function(){return this.stringify().css}},{key:"content",get:function(){return this.stringify().content}},{key:"map",get:function(){return this.stringify().map}},{key:"root",get:function(){return this.sync().root}},{key:"messages",get:function(){return this.sync().messages}}]),e}();t.default=v,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var r={split:function(e,t,n){for(var r=[],i="",o=!1,a=0,s=!1,u=!1,l=0;l<e.length;l++){var c=e[l];s?u?u=!1:"\\"===c?u=!0:c===s&&(s=!1):'"'===c||"'"===c?s=c:"("===c?a+=1:")"===c?a>0&&(a-=1):0===a&&-1!==t.indexOf(c)&&(o=!0),o?(""!==i&&r.push(i.trim()),i="",o=!1):i+=c}return(n||""!==i)&&r.push(i.trim()),r},space:function(e){var t=[" ","\n","\t"];return r.split(e,t)},comma:function(e){return r.split(e,[","],!0)}};t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o=n(434),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s=function(){function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[];r(this,e),this.version="6.0.14",this.plugins=this.normalize(t)}return e.prototype.use=function(e){return this.plugins=this.plugins.concat(this.normalize([e])),this},e.prototype.process=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return new a.default(this,e,t)},e.prototype.normalize=function(e){for(var t=[],n=e,r=Array.isArray(n),o=0,n=r?n:n[Symbol.iterator]();;){var a;if(r){if(o>=n.length)break;a=n[o++]}else{if(o=n.next(),o.done)break;a=o.value}var s=a;if(s.postcss&&(s=s.postcss),"object"===(void 0===s?"undefined":i(s))&&Array.isArray(s.plugins))t=t.concat(s.plugins);else{if("function"!=typeof s)throw"object"===(void 0===s?"undefined":i(s))&&(s.parse||s.stringify)?new Error("PostCSS syntaxes cannot be used as plugins. Instead, please use one of the syntax/parser/stringifier options as outlined in your PostCSS runner documentation."):new Error(s+" is not a PostCSS plugin");t.push(s)}}return t},e}();t.default=s,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e){return e[0].toUpperCase()+e.slice(1)}t.__esModule=!0;var o={colon:": ",indent:"    ",beforeDecl:"\n",beforeRule:"\n",beforeOpen:" ",beforeClose:"\n",beforeComment:"\n",after:"\n",emptyBody:"",commentLeft:" ",commentRight:" "},a=function(){function e(t){r(this,e),this.builder=t}return e.prototype.stringify=function(e,t){this[e.type](e,t)},e.prototype.root=function(e){this.body(e),e.raws.after&&this.builder(e.raws.after)},e.prototype.comment=function(e){var t=this.raw(e,"left","commentLeft"),n=this.raw(e,"right","commentRight");this.builder("/*"+t+e.text+n+"*/",e)},e.prototype.decl=function(e,t){var n=this.raw(e,"between","colon"),r=e.prop+n+this.rawValue(e,"value");e.important&&(r+=e.raws.important||" !important"),t&&(r+=";"),this.builder(r,e)},e.prototype.rule=function(e){this.block(e,this.rawValue(e,"selector")),e.raws.ownSemicolon&&this.builder(e.raws.ownSemicolon,e,"end")},e.prototype.atrule=function(e,t){var n="@"+e.name,r=e.params?this.rawValue(e,"params"):"";if(void 0!==e.raws.afterName?n+=e.raws.afterName:r&&(n+=" "),e.nodes)this.block(e,n+r);else{var i=(e.raws.between||"")+(t?";":"");this.builder(n+r+i,e)}},e.prototype.body=function(e){for(var t=e.nodes.length-1;t>0&&"comment"===e.nodes[t].type;)t-=1;for(var n=this.raw(e,"semicolon"),r=0;r<e.nodes.length;r++){var i=e.nodes[r],o=this.raw(i,"before");o&&this.builder(o),this.stringify(i,t!==r||n)}},e.prototype.block=function(e,t){var n=this.raw(e,"between","beforeOpen");this.builder(t+n+"{",e,"start");var r=void 0;e.nodes&&e.nodes.length?(this.body(e),r=this.raw(e,"after")):r=this.raw(e,"after","emptyBody"),r&&this.builder(r),this.builder("}",e,"end")},e.prototype.raw=function(e,t,n){var r=void 0;if(n||(n=t),t&&void 0!==(r=e.raws[t]))return r;var a=e.parent;if("before"===n&&(!a||"root"===a.type&&a.first===e))return"";if(!a)return o[n];var s=e.root();if(s.rawCache||(s.rawCache={}),void 0!==s.rawCache[n])return s.rawCache[n];if("before"===n||"after"===n)return this.beforeAfter(e,n);var u="raw"+i(n);return this[u]?r=this[u](s,e):s.walk(function(e){if(void 0!==(r=e.raws[t]))return!1}),void 0===r&&(r=o[n]),s.rawCache[n]=r,r},e.prototype.rawSemicolon=function(e){var t=void 0;return e.walk(function(e){if(e.nodes&&e.nodes.length&&"decl"===e.last.type&&void 0!==(t=e.raws.semicolon))return!1}),t},e.prototype.rawEmptyBody=function(e){var t=void 0;return e.walk(function(e){if(e.nodes&&0===e.nodes.length&&void 0!==(t=e.raws.after))return!1}),t},e.prototype.rawIndent=function(e){if(e.raws.indent)return e.raws.indent;var t=void 0;return e.walk(function(n){var r=n.parent;if(r&&r!==e&&r.parent&&r.parent===e&&void 0!==n.raws.before){var i=n.raws.before.split("\n");return t=i[i.length-1],t=t.replace(/[^\s]/g,""),!1}}),t},e.prototype.rawBeforeComment=function(e,t){var n=void 0;return e.walkComments(function(e){if(void 0!==e.raws.before)return n=e.raws.before,-1!==n.indexOf("\n")&&(n=n.replace(/[^\n]+$/,"")),!1}),void 0===n?n=this.raw(t,null,"beforeDecl"):n&&(n=n.replace(/[^\s]/g,"")),n},e.prototype.rawBeforeDecl=function(e,t){var n=void 0;return e.walkDecls(function(e){if(void 0!==e.raws.before)return n=e.raws.before,-1!==n.indexOf("\n")&&(n=n.replace(/[^\n]+$/,"")),!1}),void 0===n?n=this.raw(t,null,"beforeRule"):n&&(n=n.replace(/[^\s]/g,"")),n},e.prototype.rawBeforeRule=function(e){var t=void 0;return e.walk(function(n){if(n.nodes&&(n.parent!==e||e.first!==n)&&void 0!==n.raws.before)return t=n.raws.before,-1!==t.indexOf("\n")&&(t=t.replace(/[^\n]+$/,"")),!1}),t&&(t=t.replace(/[^\s]/g,"")),t},e.prototype.rawBeforeClose=function(e){var t=void 0;return e.walk(function(e){if(e.nodes&&e.nodes.length>0&&void 0!==e.raws.after)return t=e.raws.after,-1!==t.indexOf("\n")&&(t=t.replace(/[^\n]+$/,"")),!1}),t&&(t=t.replace(/[^\s]/g,"")),t},e.prototype.rawBeforeOpen=function(e){var t=void 0;return e.walk(function(e){if("decl"!==e.type&&void 0!==(t=e.raws.between))return!1}),t},e.prototype.rawColon=function(e){var t=void 0;return e.walkDecls(function(e){if(void 0!==e.raws.between)return t=e.raws.between.replace(/[^\s:]/g,""),!1}),t},e.prototype.beforeAfter=function(e,t){var n=void 0;n="decl"===e.type?this.raw(e,null,"beforeDecl"):"comment"===e.type?this.raw(e,null,"beforeComment"):"before"===t?this.raw(e,null,"beforeRule"):this.raw(e,null,"beforeClose");for(var r=e.parent,i=0;r&&"root"!==r.type;)i+=1,r=r.parent;if(-1!==n.indexOf("\n")){var o=this.raw(e,null,"indent");if(o.length)for(var a=0;a<i;a++)n+=o}return n},e.prototype.rawValue=function(e,t){var n=e[t],r=e.raws[t];return r&&r.value===n?r.raw:n},e}();t.default=a,e.exports=t.default},function(e,t,n){"use strict";function r(e){function t(t){throw e.error("Unclosed "+t,J,K-G)}function n(){return 0===Y.length&&K>=H}function r(){if(Y.length)return Y.pop();if(!(K>=H)){switch(T=O.charCodeAt(K),(T===u||T===c||T===f&&O.charCodeAt(K+1)!==u)&&(G=K,J+=1),T){case u:case l:case p:case f:case c:P=K;do{P+=1,(T=O.charCodeAt(P))===u&&(G=P,J+=1)}while(T===l||T===u||T===p||T===f||T===c);V=["space",O.slice(K,P)],K=P-1;break;case h:V=["[","[",J,K-G];break;case d:V=["]","]",J,K-G];break;case g:V=["{","{",J,K-G];break;case y:V=["}","}",J,K-G];break;case x:V=[":",":",J,K-G];break;case _:V=[";",";",J,K-G];break;case m:if(U=X.length?X.pop()[1]:"",W=O.charCodeAt(K+1),"url"===U&&W!==i&&W!==o&&W!==l&&W!==u&&W!==p&&W!==c&&W!==f){P=K;do{if(q=!1,-1===(P=O.indexOf(")",P+1))){if(M){P=K;break}t("bracket")}for(z=P;O.charCodeAt(z-1)===a;)z-=1,q=!q}while(q);V=["brackets",O.slice(K,P+1),J,K-G,J,P-G],K=P}else P=O.indexOf(")",K+1),F=O.slice(K,P+1),-1===P||S.test(F)?V=["(","(",J,K-G]:(V=["brackets",F,J,K-G,J,P-G],K=P);break;case v:V=[")",")",J,K-G];break;case i:case o:I=T===i?"'":'"',P=K;do{if(q=!1,-1===(P=O.indexOf(I,P+1))){if(M){P=K+1;break}t("string")}for(z=P;O.charCodeAt(z-1)===a;)z-=1,q=!q}while(q);F=O.slice(K,P+1),R=F.split("\n"),j=R.length-1,j>0?(B=J+j,L=P-R[j].length):(B=J,L=G),V=["string",O.slice(K,P+1),J,K-G,B,P-L],G=L,J=B,K=P;break;case w:k.lastIndex=K+1,k.test(O),P=0===k.lastIndex?O.length-1:k.lastIndex-2,V=["at-word",O.slice(K,P+1),J,K-G,J,P-G],K=P;break;case a:for(P=K,N=!0;O.charCodeAt(P+1)===a;)P+=1,N=!N;if(T=O.charCodeAt(P+1),N&&T!==s&&T!==l&&T!==u&&T!==p&&T!==f&&T!==c&&(P+=1,C.test(O.charAt(P)))){for(;C.test(O.charAt(P+1));)P+=1;O.charCodeAt(P+1)===l&&(P+=1)}V=["word",O.slice(K,P+1),J,K-G,J,P-G],K=P;break;default:T===s&&O.charCodeAt(K+1)===b?(P=O.indexOf("*/",K+2)+1,0===P&&(M?P=O.length:t("comment")),F=O.slice(K,P+1),R=F.split("\n"),j=R.length-1,j>0?(B=J+j,L=P-R[j].length):(B=J,L=G),V=["comment",F,J,K-G,B,P-L],G=L,J=B,K=P):(E.lastIndex=K+1,E.test(O),P=0===E.lastIndex?O.length-1:E.lastIndex-2,V=["word",O.slice(K,P+1),J,K-G,J,P-G],X.push(V),K=P)}return K++,V}}function A(e){Y.push(e)}var D=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},O=e.css.valueOf(),M=D.ignoreErrors,T=void 0,P=void 0,I=void 0,R=void 0,j=void 0,F=void 0,N=void 0,B=void 0,L=void 0,q=void 0,z=void 0,U=void 0,W=void 0,V=void 0,H=O.length,G=-1,J=1,K=0,X=[],Y=[];return{back:A,nextToken:r,endOfFile:n}}t.__esModule=!0,t.default=r;var i=39,o=34,a=92,s=47,u=10,l=32,c=12,p=9,f=13,h=91,d=93,m=40,v=41,g=123,y=125,_=59,b=42,x=58,w=64,k=/[ \n\t\r\f\{\(\)'"\\;\/\[\]#]/g,E=/[ \n\t\r\f\(\)\{\}:;@!'"\\\]\[#]|\/(?=\*)/g,S=/.[\\\/\("'\n]/,C=/[a-f0-9]/i;e.exports=t.default},function(e,t,n){function r(){this._array=[],this._set=a?new Map:Object.create(null)}var i=n(121),o=Object.prototype.hasOwnProperty,a="undefined"!=typeof Map;r.fromArray=function(e,t){for(var n=new r,i=0,o=e.length;i<o;i++)n.add(e[i],t);return n},r.prototype.size=function(){return a?this._set.size:Object.getOwnPropertyNames(this._set).length},r.prototype.add=function(e,t){var n=a?e:i.toSetString(e),r=a?this.has(e):o.call(this._set,n),s=this._array.length;r&&!t||this._array.push(e),r||(a?this._set.set(e,s):this._set[n]=s)},r.prototype.has=function(e){if(a)return this._set.has(e);var t=i.toSetString(e);return o.call(this._set,t)},r.prototype.indexOf=function(e){if(a){var t=this._set.get(e);if(t>=0)return t}else{var n=i.toSetString(e);if(o.call(this._set,n))return this._set[n]}throw new Error('"'+e+'" is not in the set.')},r.prototype.at=function(e){if(e>=0&&e<this._array.length)return this._array[e];throw new Error("No element indexed by "+e)},r.prototype.toArray=function(){return this._array.slice()},t.ArraySet=r},function(e,t,n){function r(e){return e<0?1+(-e<<1):0+(e<<1)}function i(e){var t=1==(1&e),n=e>>1;return t?-n:n}var o=n(989);t.encode=function(e){var t,n="",i=r(e);do{t=31&i,i>>>=5,i>0&&(t|=32),n+=o.encode(t)}while(i>0);return n},t.decode=function(e,t,n){var r,a,s=e.length,u=0,l=0;do{if(t>=s)throw new Error("Expected more digits in base 64 VLQ value.");if(-1===(a=o.decode(e.charCodeAt(t++))))throw new Error("Invalid base64 digit: "+e.charAt(t-1));r=!!(32&a),a&=31,u+=a<<l,l+=5}while(r);n.value=i(u),n.rest=t}},function(e,t,n){function r(e){e||(e={}),this._file=o.getArg(e,"file",null),this._sourceRoot=o.getArg(e,"sourceRoot",null),this._skipValidation=o.getArg(e,"skipValidation",!1),this._sources=new a,this._names=new a,this._mappings=new s,this._sourcesContents=null}var i=n(440),o=n(121),a=n(439).ArraySet,s=n(991).MappingList;r.prototype._version=3,r.fromSourceMap=function(e){var t=e.sourceRoot,n=new r({file:e.file,sourceRoot:t});return e.eachMapping(function(e){var r={generated:{line:e.generatedLine,column:e.generatedColumn}};null!=e.source&&(r.source=e.source,null!=t&&(r.source=o.relative(t,r.source)),r.original={line:e.originalLine,column:e.originalColumn},null!=e.name&&(r.name=e.name)),n.addMapping(r)}),e.sources.forEach(function(r){var i=r;null!==t&&(i=o.relative(t,r)),n._sources.has(i)||n._sources.add(i);var a=e.sourceContentFor(r);null!=a&&n.setSourceContent(r,a)}),n},r.prototype.addMapping=function(e){var t=o.getArg(e,"generated"),n=o.getArg(e,"original",null),r=o.getArg(e,"source",null),i=o.getArg(e,"name",null);this._skipValidation||this._validateMapping(t,n,r,i),null!=r&&(r=String(r),this._sources.has(r)||this._sources.add(r)),null!=i&&(i=String(i),this._names.has(i)||this._names.add(i)),this._mappings.add({generatedLine:t.line,generatedColumn:t.column,originalLine:null!=n&&n.line,originalColumn:null!=n&&n.column,source:r,name:i})},r.prototype.setSourceContent=function(e,t){var n=e;null!=this._sourceRoot&&(n=o.relative(this._sourceRoot,n)),null!=t?(this._sourcesContents||(this._sourcesContents=Object.create(null)),this._sourcesContents[o.toSetString(n)]=t):this._sourcesContents&&(delete this._sourcesContents[o.toSetString(n)],0===Object.keys(this._sourcesContents).length&&(this._sourcesContents=null))},r.prototype.applySourceMap=function(e,t,n){var r=t;if(null==t){if(null==e.file)throw new Error('SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, or the source map\'s "file" property. Both were omitted.');r=e.file}var i=this._sourceRoot;null!=i&&(r=o.relative(i,r));var s=new a,u=new a;this._mappings.unsortedForEach(function(t){if(t.source===r&&null!=t.originalLine){var a=e.originalPositionFor({line:t.originalLine,column:t.originalColumn});null!=a.source&&(t.source=a.source,null!=n&&(t.source=o.join(n,t.source)),null!=i&&(t.source=o.relative(i,t.source)),t.originalLine=a.line,t.originalColumn=a.column,null!=a.name&&(t.name=a.name))}var l=t.source;null==l||s.has(l)||s.add(l);var c=t.name;null==c||u.has(c)||u.add(c)},this),this._sources=s,this._names=u,e.sources.forEach(function(t){var r=e.sourceContentFor(t);null!=r&&(null!=n&&(t=o.join(n,t)),null!=i&&(t=o.relative(i,t)),this.setSourceContent(t,r))},this)},r.prototype._validateMapping=function(e,t,n,r){if(t&&"number"!=typeof t.line&&"number"!=typeof t.column)throw new Error("original.line and original.column are not numbers -- you probably meant to omit the original mapping entirely and only map the generated position. If so, pass null for the original mapping instead of an object with empty or null values.");if((!(e&&"line"in e&&"column"in e&&e.line>0&&e.column>=0)||t||n||r)&&!(e&&"line"in e&&"column"in e&&t&&"line"in t&&"column"in t&&e.line>0&&e.column>=0&&t.line>0&&t.column>=0&&n))throw new Error("Invalid mapping: "+JSON.stringify({generated:e,source:n,original:t,name:r}))},r.prototype._serializeMappings=function(){for(var e,t,n,r,a=0,s=1,u=0,l=0,c=0,p=0,f="",h=this._mappings.toArray(),d=0,m=h.length;d<m;d++){if(t=h[d],e="",t.generatedLine!==s)for(a=0;t.generatedLine!==s;)e+=";",s++;else if(d>0){if(!o.compareByGeneratedPositionsInflated(t,h[d-1]))continue;e+=","}e+=i.encode(t.generatedColumn-a),a=t.generatedColumn,null!=t.source&&(r=this._sources.indexOf(t.source),e+=i.encode(r-p),p=r,e+=i.encode(t.originalLine-1-l),l=t.originalLine-1,e+=i.encode(t.originalColumn-u),u=t.originalColumn,null!=t.name&&(n=this._names.indexOf(t.name),e+=i.encode(n-c),c=n)),f+=e}return f},r.prototype._generateSourcesContent=function(e,t){return e.map(function(e){if(!this._sourcesContents)return null;null!=t&&(e=o.relative(t,e));var n=o.toSetString(e);return Object.prototype.hasOwnProperty.call(this._sourcesContents,n)?this._sourcesContents[n]:null},this)},r.prototype.toJSON=function(){var e={version:this._version,sources:this._sources.toArray(),names:this._names.toArray(),mappings:this._serializeMappings()};return null!=this._file&&(e.file=this._file),null!=this._sourceRoot&&(e.sourceRoot=this._sourceRoot),this._sourcesContents&&(e.sourcesContent=this._generateSourcesContent(e.sources,e.sourceRoot)),e},r.prototype.toString=function(){return JSON.stringify(this.toJSON())},t.SourceMapGenerator=r},function(e,t,n){t.SourceMapGenerator=n(441).SourceMapGenerator,t.SourceMapConsumer=n(993).SourceMapConsumer,t.SourceNode=n(994).SourceNode},function(e,t,n){"use strict";var r=n(997);e.exports=function(e){return r(e,!1)}},function(e,t,n){"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},function(e,t,n){"use strict";var r=String.prototype.replace,i=/%20/g;e.exports={default:"RFC3986",formatters:{RFC1738:function(e){return r.call(e,i,"+")},RFC3986:function(e){return e}},RFC1738:"RFC1738",RFC3986:"RFC3986"}},function(e,t,n){"use strict";var r=Object.prototype.hasOwnProperty,i=function(){for(var e=[],t=0;t<256;++t)e.push("%"+((t<16?"0":"")+t.toString(16)).toUpperCase());return e}(),o=function(e){for(var t;e.length;){var n=e.pop();if(t=n.obj[n.prop],Array.isArray(t)){for(var r=[],i=0;i<t.length;++i)void 0!==t[i]&&r.push(t[i]);n.obj[n.prop]=r}}return t};t.arrayToObject=function(e,t){for(var n=t&&t.plainObjects?Object.create(null):{},r=0;r<e.length;++r)void 0!==e[r]&&(n[r]=e[r]);return n},t.merge=function(e,n,i){if(!n)return e;if("object"!=typeof n){if(Array.isArray(e))e.push(n);else{if("object"!=typeof e)return[e,n];(i.plainObjects||i.allowPrototypes||!r.call(Object.prototype,n))&&(e[n]=!0)}return e}if("object"!=typeof e)return[e].concat(n);var o=e;return Array.isArray(e)&&!Array.isArray(n)&&(o=t.arrayToObject(e,i)),Array.isArray(e)&&Array.isArray(n)?(n.forEach(function(n,o){r.call(e,o)?e[o]&&"object"==typeof e[o]?e[o]=t.merge(e[o],n,i):e.push(n):e[o]=n}),e):Object.keys(n).reduce(function(e,o){var a=n[o];return r.call(e,o)?e[o]=t.merge(e[o],a,i):e[o]=a,e},o)},t.assign=function(e,t){return Object.keys(t).reduce(function(e,n){return e[n]=t[n],e},e)},t.decode=function(e){try{return decodeURIComponent(e.replace(/\+/g," "))}catch(t){return e}},t.encode=function(e){if(0===e.length)return e;for(var t="string"==typeof e?e:String(e),n="",r=0;r<t.length;++r){var o=t.charCodeAt(r);45===o||46===o||95===o||126===o||o>=48&&o<=57||o>=65&&o<=90||o>=97&&o<=122?n+=t.charAt(r):o<128?n+=i[o]:o<2048?n+=i[192|o>>6]+i[128|63&o]:o<55296||o>=57344?n+=i[224|o>>12]+i[128|o>>6&63]+i[128|63&o]:(r+=1,o=65536+((1023&o)<<10|1023&t.charCodeAt(r)),n+=i[240|o>>18]+i[128|o>>12&63]+i[128|o>>6&63]+i[128|63&o])}return n},t.compact=function(e){for(var t=[{obj:{o:e},prop:"o"}],n=[],r=0;r<t.length;++r)for(var i=t[r],a=i.obj[i.prop],s=Object.keys(a),u=0;u<s.length;++u){var l=s[u],c=a[l];"object"==typeof c&&null!==c&&-1===n.indexOf(c)&&(t.push({obj:a,prop:l}),n.push(c))}return o(t)},t.isRegExp=function(e){return"[object RegExp]"===Object.prototype.toString.call(e)},t.isBuffer=function(e){return null!==e&&void 0!==e&&!!(e.constructor&&e.constructor.isBuffer&&e.constructor.isBuffer(e))}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){var n={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0}),t.Collapse=void 0;var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},l=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),c=n(0),p=r(c),f=n(1),h=r(f),d=n(1085),m="IDLING",v=function(){return null},g={collapse:"ReactCollapse--collapse",content:"ReactCollapse--content"},y=t.Collapse=function(e){function t(e){o(this,t);var n=a(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e));return _.call(n),n.state={currentState:m,from:0,to:0},n}return s(t,e),l(t,[{key:"componentDidMount",value:function(){var e=this.props,t=e.isOpened,n=e.forceInitialAnimation,r=e.onRest;if(t){var i=this.getTo();if(n){var o=this.wrapper.clientHeight;this.setState({currentState:"RESIZING",from:o,to:i})}else this.setState({currentState:m,from:i,to:i})}r()}},{key:"componentWillReceiveProps",value:function(e){e.hasNestedCollapse?e.isOpened!==this.props.isOpened&&this.setState({currentState:"WAITING"}):this.state.currentState===m&&(e.isOpened||this.props.isOpened)&&this.setState({currentState:"WAITING"})}},{key:"componentDidUpdate",value:function(e,t){var n=this.props,r=n.isOpened,i=n.onRest,o=n.onMeasure;if(this.state.currentState===m)return void i();t.to!==this.state.to&&o({height:this.state.to,width:this.content.clientWidth});var a=this.wrapper.clientHeight,s=r?this.getTo():0;if(a!==s)return void this.setState({currentState:"RESIZING",from:a,to:s});"RESTING"!==this.state.currentState&&"WAITING"!==this.state.currentState||this.setState({currentState:m,from:a,to:s})}},{key:"componentWillUnmount",value:function(){cancelAnimationFrame(this.raf)}},{key:"render",value:function(){return p.default.createElement(d.Motion,u({},this.getMotionProps(),{onRest:this.onRest,children:this.renderContent}))}}]),t}(p.default.PureComponent);y.propTypes={isOpened:h.default.bool.isRequired,springConfig:h.default.objectOf(h.default.number),forceInitialAnimation:h.default.bool,hasNestedCollapse:h.default.bool,fixedHeight:h.default.number,theme:h.default.objectOf(h.default.string),style:h.default.object,onRender:h.default.func,onRest:h.default.func,onMeasure:h.default.func,children:h.default.node.isRequired},y.defaultProps={forceInitialAnimation:!1,hasNestedCollapse:!1,fixedHeight:-1,style:{},theme:g,onRender:v,onRest:v,onMeasure:v};var _=function(){var e=this;this.onContentRef=function(t){e.content=t},this.onWrapperRef=function(t){e.wrapper=t},this.onRest=function(){e.raf=requestAnimationFrame(e.setResting)},this.setResting=function(){e.setState({currentState:"RESTING"})},this.getTo=function(){var t=e.props.fixedHeight;return t>-1?t:e.content.clientHeight},this.getWrapperStyle=function(t){if(e.state.currentState===m&&e.state.to){var n=e.props.fixedHeight;return n>-1?{overflow:"hidden",height:n}:{height:"auto"}}return"WAITING"!==e.state.currentState||e.state.to?{overflow:"hidden",height:Math.max(0,t)}:{overflow:"hidden",height:0}},this.getMotionProps=function(){var t=e.props.springConfig;return e.state.currentState===m?{defaultStyle:{height:e.state.to},style:{height:e.state.to}}:{defaultStyle:{height:e.state.from},style:{height:(0,d.spring)(e.state.to,u({precision:1},t))}}},this.renderContent=function(t){var n=t.height,r=e.props,o=(r.isOpened,r.springConfig,r.forceInitialAnimation,r.hasNestedCollapse,r.fixedHeight,r.theme),a=r.style,s=r.onRender,l=(r.onRest,r.onMeasure,r.children),c=i(r,["isOpened","springConfig","forceInitialAnimation","hasNestedCollapse","fixedHeight","theme","style","onRender","onRest","onMeasure","children"]),f=e.state;return s({current:n,from:f.from,to:f.to}),p.default.createElement("div",u({ref:e.onWrapperRef,className:o.collapse,style:u({},e.getWrapperStyle(Math.max(0,n)),a)},c),p.default.createElement("div",{ref:e.onContentRef,className:o.content},l))}}},function(e,t,n){"use strict";var r=n(447),i=r.Collapse,o=n(1008),a=o.UnmountClosed;a.Collapse=i,a.UnmountClosed=a,e.exports=a},function(e,t,n){"use strict";e.exports=n(1022)},function(e,t,n){"use strict";function r(e,t){return e+t.charAt(0).toUpperCase()+t.substring(1)}var i={animationIterationCount:!0,borderImageOutset:!0,borderImageSlice:!0,borderImageWidth:!0,boxFlex:!0,boxFlexGroup:!0,boxOrdinalGroup:!0,columnCount:!0,columns:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,flexOrder:!0,gridRow:!0,gridRowEnd:!0,gridRowSpan:!0,gridRowStart:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnSpan:!0,gridColumnStart:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,tabSize:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeDasharray:!0,strokeDashoffset:!0,strokeMiterlimit:!0,strokeOpacity:!0,strokeWidth:!0},o=["Webkit","ms","Moz","O"];Object.keys(i).forEach(function(e){o.forEach(function(t){i[r(t,e)]=i[e]})});var a={background:{backgroundAttachment:!0,backgroundColor:!0,backgroundImage:!0,backgroundPositionX:!0,backgroundPositionY:!0,backgroundRepeat:!0},backgroundPosition:{backgroundPositionX:!0,backgroundPositionY:!0},border:{borderWidth:!0,borderStyle:!0,borderColor:!0},borderBottom:{borderBottomWidth:!0,borderBottomStyle:!0,borderBottomColor:!0},borderLeft:{borderLeftWidth:!0,borderLeftStyle:!0,borderLeftColor:!0},borderRight:{borderRightWidth:!0,borderRightStyle:!0,borderRightColor:!0},borderTop:{borderTopWidth:!0,borderTopStyle:!0,borderTopColor:!0},font:{fontStyle:!0,fontVariant:!0,fontWeight:!0,fontSize:!0,lineHeight:!0,fontFamily:!0},outline:{outlineWidth:!0,outlineStyle:!0,outlineColor:!0}},s={isUnitlessNumber:i,shorthandPropertyExpansions:a};e.exports=s},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var i=n(11),o=n(70),a=(n(8),function(){function e(t){r(this,e),this._callbacks=null,this._contexts=null,this._arg=t}return e.prototype.enqueue=function(e,t){this._callbacks=this._callbacks||[],this._callbacks.push(e),this._contexts=this._contexts||[],this._contexts.push(t)},e.prototype.notifyAll=function(){var e=this._callbacks,t=this._contexts,n=this._arg;if(e&&t){e.length!==t.length&&i("24"),this._callbacks=null,this._contexts=null;for(var r=0;r<e.length;r++)e[r].call(t[r],n);e.length=0,t.length=0}},e.prototype.checkpoint=function(){return this._callbacks?this._callbacks.length:0},e.prototype.rollback=function(e){this._callbacks&&this._contexts&&(this._callbacks.length=e,this._contexts.length=e)},e.prototype.reset=function(){this._callbacks=null,this._contexts=null},e.prototype.destructor=function(){this.reset()},e}());e.exports=o.addPoolingTo(a)},function(e,t,n){"use strict";function r(e){return!!l.hasOwnProperty(e)||!u.hasOwnProperty(e)&&(s.test(e)?(l[e]=!0,!0):(u[e]=!0,!1))}function i(e,t){return null==t||e.hasBooleanValue&&!t||e.hasNumericValue&&isNaN(t)||e.hasPositiveNumericValue&&t<1||e.hasOverloadedBooleanValue&&!1===t}var o=n(89),a=(n(14),n(39),n(1070)),s=(n(10),new RegExp("^["+o.ATTRIBUTE_NAME_START_CHAR+"]["+o.ATTRIBUTE_NAME_CHAR+"]*$")),u={},l={},c={createMarkupForID:function(e){return o.ID_ATTRIBUTE_NAME+"="+a(e)},setAttributeForID:function(e,t){e.setAttribute(o.ID_ATTRIBUTE_NAME,t)},createMarkupForRoot:function(){return o.ROOT_ATTRIBUTE_NAME+'=""'},setAttributeForRoot:function(e){e.setAttribute(o.ROOT_ATTRIBUTE_NAME,"")},createMarkupForProperty:function(e,t){var n=o.properties.hasOwnProperty(e)?o.properties[e]:null;if(n){if(i(n,t))return"";var r=n.attributeName;return n.hasBooleanValue||n.hasOverloadedBooleanValue&&!0===t?r+'=""':r+"="+a(t)}return o.isCustomAttribute(e)?null==t?"":e+"="+a(t):null},createMarkupForCustomAttribute:function(e,t){return r(e)&&null!=t?e+"="+a(t):""},setValueForProperty:function(e,t,n){var r=o.properties.hasOwnProperty(t)?o.properties[t]:null;if(r){var a=r.mutationMethod;if(a)a(e,n);else{if(i(r,n))return void this.deleteValueForProperty(e,t);if(r.mustUseProperty)e[r.propertyName]=n;else{var s=r.attributeName,u=r.attributeNamespace;u?e.setAttributeNS(u,s,""+n):r.hasBooleanValue||r.hasOverloadedBooleanValue&&!0===n?e.setAttribute(s,""):e.setAttribute(s,""+n)}}}else if(o.isCustomAttribute(t))return void c.setValueForAttribute(e,t,n)},setValueForAttribute:function(e,t,n){if(r(t)){null==n?e.removeAttribute(t):e.setAttribute(t,""+n)}},deleteValueForAttribute:function(e,t){e.removeAttribute(t)},deleteValueForProperty:function(e,t){var n=o.properties.hasOwnProperty(t)?o.properties[t]:null;if(n){var r=n.mutationMethod;if(r)r(e,void 0);else if(n.mustUseProperty){var i=n.propertyName;n.hasBooleanValue?e[i]=!1:e[i]=""}else e.removeAttribute(n.attributeName)}else o.isCustomAttribute(t)&&e.removeAttribute(t)}};e.exports=c},function(e,t,n){"use strict";var r={hasCachedChildNodes:1};e.exports=r},function(e,t,n){"use strict";function r(){if(this._rootNodeID&&this._wrapperState.pendingUpdate){this._wrapperState.pendingUpdate=!1;var e=this._currentElement.props,t=s.getValue(e);null!=t&&i(this,Boolean(e.multiple),t)}}function i(e,t,n){var r,i,o=u.getNodeFromInstance(e).options;if(t){for(r={},i=0;i<n.length;i++)r[""+n[i]]=!0;for(i=0;i<o.length;i++){var a=r.hasOwnProperty(o[i].value);o[i].selected!==a&&(o[i].selected=a)}}else{for(r=""+n,i=0;i<o.length;i++)if(o[i].value===r)return void(o[i].selected=!0);o.length&&(o[0].selected=!0)}}function o(e){var t=this._currentElement.props,n=s.executeOnChange(t,e);return this._rootNodeID&&(this._wrapperState.pendingUpdate=!0),l.asap(r,this),n}var a=n(13),s=n(245),u=n(14),l=n(44),c=(n(10),!1),p={getHostProps:function(e,t){return a({},t,{onChange:e._wrapperState.onChange,value:void 0})},mountWrapper:function(e,t){var n=s.getValue(t);e._wrapperState={pendingUpdate:!1,initialValue:null!=n?n:t.defaultValue,listeners:null,onChange:o.bind(e),wasMultiple:Boolean(t.multiple)},void 0===t.value||void 0===t.defaultValue||c||(c=!0)},getSelectValueContext:function(e){return e._wrapperState.initialValue},postUpdateWrapper:function(e){var t=e._currentElement.props;e._wrapperState.initialValue=void 0;var n=e._wrapperState.wasMultiple;e._wrapperState.wasMultiple=Boolean(t.multiple);var r=s.getValue(t);null!=r?(e._wrapperState.pendingUpdate=!1,i(e,Boolean(t.multiple),r)):n!==Boolean(t.multiple)&&(null!=t.defaultValue?i(e,Boolean(t.multiple),t.defaultValue):i(e,Boolean(t.multiple),t.multiple?[]:""))}};e.exports=p},function(e,t,n){"use strict";var r,i={injectEmptyComponentFactory:function(e){r=e}},o={create:function(e){return r(e)}};o.injection=i,e.exports=o},function(e,t,n){"use strict";var r={logTopLevelRenders:!1};e.exports=r},function(e,t,n){"use strict";function r(e){return s||a("111",e.type),new s(e)}function i(e){return new u(e)}function o(e){return e instanceof u}var a=n(11),s=(n(8),null),u=null,l={injectGenericComponentClass:function(e){s=e},injectTextComponentClass:function(e){u=e}},c={createInternalComponent:r,createInstanceForText:i,isTextComponent:o,injection:l};e.exports=c},function(e,t,n){"use strict";function r(e){return o(document.documentElement,e)}var i=n(1030),o=n(748),a=n(378),s=n(379),u={hasSelectionCapabilities:function(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&("input"===t&&"text"===e.type||"textarea"===t||"true"===e.contentEditable)},getSelectionInformation:function(){var e=s();return{focusedElem:e,selectionRange:u.hasSelectionCapabilities(e)?u.getSelection(e):null}},restoreSelection:function(e){var t=s(),n=e.focusedElem,i=e.selectionRange;t!==n&&r(n)&&(u.hasSelectionCapabilities(n)&&u.setSelection(n,i),a(n))},getSelection:function(e){var t;if("selectionStart"in e)t={start:e.selectionStart,end:e.selectionEnd};else if(document.selection&&e.nodeName&&"input"===e.nodeName.toLowerCase()){var n=document.selection.createRange();n.parentElement()===e&&(t={start:-n.moveStart("character",-e.value.length),end:-n.moveEnd("character",-e.value.length)})}else t=i.getOffsets(e);return t||{start:0,end:0}},setSelection:function(e,t){var n=t.start,r=t.end;if(void 0===r&&(r=n),"selectionStart"in e)e.selectionStart=n,e.selectionEnd=Math.min(r,e.value.length);else if(document.selection&&e.nodeName&&"input"===e.nodeName.toLowerCase()){var o=e.createTextRange();o.collapse(!0),o.moveStart("character",n),o.moveEnd("character",r-n),o.select()}else i.setOffsets(e,t)}};e.exports=u},function(e,t,n){"use strict";function r(e,t){for(var n=Math.min(e.length,t.length),r=0;r<n;r++)if(e.charAt(r)!==t.charAt(r))return r;return e.length===t.length?-1:n}function i(e){return e?e.nodeType===R?e.documentElement:e.firstChild:null}function o(e){return e.getAttribute&&e.getAttribute(T)||""}function a(e,t,n,r,i){var o;if(x.logTopLevelRenders){var a=e._currentElement.props.child,s=a.type;o="React mount: "+("string"==typeof s?s:s.displayName||s.name),console.time(o)}var u=E.mountComponent(e,n,null,_(e,t),i,0);o&&console.timeEnd(o),e._renderedComponent._topLevelWrapper=e,L._mountImageIntoNode(u,t,e,r,n)}function s(e,t,n,r){var i=C.ReactReconcileTransaction.getPooled(!n&&b.useCreateElement);i.perform(a,null,e,t,i,n,r),C.ReactReconcileTransaction.release(i)}function u(e,t,n){for(E.unmountComponent(e,n),t.nodeType===R&&(t=t.documentElement);t.lastChild;)t.removeChild(t.lastChild)}function l(e){var t=i(e);if(t){var n=y.getInstanceFromNode(t);return!(!n||!n._hostParent)}}function c(e){return!(!e||e.nodeType!==I&&e.nodeType!==R&&e.nodeType!==j)}function p(e){var t=i(e),n=t&&y.getInstanceFromNode(t);return n&&!n._hostParent?n:null}function f(e){var t=p(e);return t?t._hostContainerInfo._topLevelWrapper:null}var h=n(11),d=n(88),m=n(89),v=n(92),g=n(159),y=(n(52),n(14)),_=n(1024),b=n(1026),x=n(456),w=n(124),k=(n(39),n(1040)),E=n(90),S=n(248),C=n(44),A=n(144),D=n(467),O=(n(8),n(163)),M=n(254),T=(n(10),m.ID_ATTRIBUTE_NAME),P=m.ROOT_ATTRIBUTE_NAME,I=1,R=9,j=11,F={},N=1,B=function(){this.rootID=N++};B.prototype.isReactComponent={},B.prototype.render=function(){return this.props.child},B.isReactTopLevelWrapper=!0;var L={TopLevelWrapper:B,_instancesByReactRootID:F,scrollMonitor:function(e,t){t()},_updateRootComponent:function(e,t,n,r,i){return L.scrollMonitor(r,function(){S.enqueueElementInternal(e,t,n),i&&S.enqueueCallbackInternal(e,i)}),e},_renderNewRootComponent:function(e,t,n,r){c(t)||h("37"),g.ensureScrollValueMonitoring();var i=D(e,!1);C.batchedUpdates(s,i,t,n,r);var o=i._instance.rootID;return F[o]=i,i},renderSubtreeIntoContainer:function(e,t,n,r){return null!=e&&w.has(e)||h("38"),L._renderSubtreeIntoContainer(e,t,n,r)},_renderSubtreeIntoContainer:function(e,t,n,r){S.validateCallback(r,"ReactDOM.render"),v.isValidElement(t)||h("39","string"==typeof t?" Instead of passing a string like 'div', pass React.createElement('div') or <div />.":"function"==typeof t?" Instead of passing a class like Foo, pass React.createElement(Foo) or <Foo />.":null!=t&&void 0!==t.props?" This may be caused by unintentionally loading two independent copies of React.":"");var a,s=v.createElement(B,{child:t});if(e){var u=w.get(e);a=u._processChildContext(u._context)}else a=A;var c=f(n);if(c){var p=c._currentElement,d=p.props.child;if(M(d,t)){var m=c._renderedComponent.getPublicInstance(),g=r&&function(){r.call(m)};return L._updateRootComponent(c,s,a,n,g),m}L.unmountComponentAtNode(n)}var y=i(n),_=y&&!!o(y),b=l(n),x=_&&!c&&!b,k=L._renderNewRootComponent(s,n,x,a)._renderedComponent.getPublicInstance();return r&&r.call(k),k},render:function(e,t,n){return L._renderSubtreeIntoContainer(null,e,t,n)},unmountComponentAtNode:function(e){c(e)||h("40");var t=f(e);if(!t){l(e),1===e.nodeType&&e.hasAttribute(P);return!1}return delete F[t._instance.rootID],C.batchedUpdates(u,t,e,!1),!0},_mountImageIntoNode:function(e,t,n,o,a){if(c(t)||h("41"),o){var s=i(t);if(k.canReuseMarkup(e,s))return void y.precacheNode(n,s);var u=s.getAttribute(k.CHECKSUM_ATTR_NAME);s.removeAttribute(k.CHECKSUM_ATTR_NAME);var l=s.outerHTML;s.setAttribute(k.CHECKSUM_ATTR_NAME,u);var p=e,f=r(p,l),m=" (client) "+p.substring(f-20,f+20)+"\n (server) "+l.substring(f-20,f+20);t.nodeType===R&&h("42",m)}if(t.nodeType===R&&h("43"),a.useCreateElement){for(;t.lastChild;)t.removeChild(t.lastChild);d.insertTreeBefore(t,e,null)}else O(t,e),y.precacheNode(n,t.firstChild)}};e.exports=L},function(e,t,n){"use strict";var r=n(11),i=n(92),o=(n(8),{HOST:0,COMPOSITE:1,EMPTY:2,getType:function(e){return null===e||!1===e?o.EMPTY:i.isValidElement(e)?"function"==typeof e.type?o.COMPOSITE:o.HOST:void r("26",e)}});e.exports=o},function(e,t,n){"use strict";var r={currentScrollLeft:0,currentScrollTop:0,refreshScrollValues:function(e){r.currentScrollLeft=e.x,r.currentScrollTop=e.y}};e.exports=r},function(e,t,n){"use strict";function r(e,t){return null==t&&i("30"),null==e?t:Array.isArray(e)?Array.isArray(t)?(e.push.apply(e,t),e):(e.push(t),e):Array.isArray(t)?[e].concat(t):[e,t]}var i=n(11);n(8);e.exports=r},function(e,t,n){"use strict";function r(e,t,n){Array.isArray(e)?e.forEach(t,n):e&&t.call(n,e)}e.exports=r},function(e,t,n){"use strict";function r(e){for(var t;(t=e._renderedNodeType)===i.COMPOSITE;)e=e._renderedComponent;return t===i.HOST?e._renderedComponent:t===i.EMPTY?null:void 0}var i=n(460);e.exports=r},function(e,t,n){"use strict";function r(){return!o&&i.canUseDOM&&(o="textContent"in document.documentElement?"textContent":"innerText"),o}var i=n(25),o=null;e.exports=r},function(e,t,n){"use strict";function r(e){var t=e.type,n=e.nodeName;return n&&"input"===n.toLowerCase()&&("checkbox"===t||"radio"===t)}function i(e){return e._wrapperState.valueTracker}function o(e,t){e._wrapperState.valueTracker=t}function a(e){e._wrapperState.valueTracker=null}function s(e){var t;return e&&(t=r(e)?""+e.checked:e.value),t}var u=n(14),l={_getTrackerFromNode:function(e){return i(u.getInstanceFromNode(e))},track:function(e){if(!i(e)){var t=u.getNodeFromInstance(e),n=r(t)?"checked":"value",s=Object.getOwnPropertyDescriptor(t.constructor.prototype,n),l=""+t[n];t.hasOwnProperty(n)||"function"!=typeof s.get||"function"!=typeof s.set||(Object.defineProperty(t,n,{enumerable:s.enumerable,configurable:!0,get:function(){return s.get.call(this)},set:function(e){l=""+e,s.set.call(this,e)}}),o(e,{getValue:function(){return l},setValue:function(e){l=""+e},stopTracking:function(){a(e),delete t[n]}}))}},updateValueIfChanged:function(e){if(!e)return!1;var t=i(e);if(!t)return l.track(e),!0;var n=t.getValue(),r=s(u.getNodeFromInstance(e));return r!==n&&(t.setValue(r),!0)},stopTracking:function(e){var t=i(e);t&&t.stopTracking()}};e.exports=l},function(e,t,n){"use strict";function r(e){if(e){var t=e.getName();if(t)return" Check the render method of `"+t+"`."}return""}function i(e){return"function"==typeof e&&void 0!==e.prototype&&"function"==typeof e.prototype.mountComponent&&"function"==typeof e.prototype.receiveComponent}function o(e,t){var n;if(null===e||!1===e)n=l.create(o);else if("object"==typeof e){var s=e,u=s.type;if("function"!=typeof u&&"string"!=typeof u){var f="";f+=r(s._owner),a("130",null==u?u:typeof u,f)}"string"==typeof s.type?n=c.createInternalComponent(s):i(s.type)?(n=new s.type(s),n.getHostNode||(n.getHostNode=n.getNativeNode)):n=new p(s)}else"string"==typeof e||"number"==typeof e?n=c.createInstanceForText(e):a("131",typeof e);return n._mountIndex=0,n._mountImage=null,n}var a=n(11),s=n(13),u=n(1021),l=n(455),c=n(457),p=(n(1106),n(8),n(10),function(e){this.construct(e)});s(p.prototype,u,{_instantiateReactComponent:o}),e.exports=o},function(e,t,n){"use strict";function r(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return"input"===t?!!i[e.type]:"textarea"===t}var i={color:!0,date:!0,datetime:!0,"datetime-local":!0,email:!0,month:!0,number:!0,password:!0,range:!0,search:!0,tel:!0,text:!0,time:!0,url:!0,week:!0};e.exports=r},function(e,t,n){"use strict";var r=n(25),i=n(162),o=n(163),a=function(e,t){if(t){var n=e.firstChild;if(n&&n===e.lastChild&&3===n.nodeType)return void(n.nodeValue=t)}e.textContent=t};r.canUseDOM&&("textContent"in document.documentElement||(a=function(e,t){if(3===e.nodeType)return void(e.nodeValue=t);o(e,i(t))})),e.exports=a},function(e,t,n){"use strict";function r(e,t){return e&&"object"==typeof e&&null!=e.key?l.escape(e.key):t.toString(36)}function i(e,t,n,o){var f=typeof e;if("undefined"!==f&&"boolean"!==f||(e=null),null===e||"string"===f||"number"===f||"object"===f&&e.$$typeof===s)return n(o,e,""===t?c+r(e,0):t),1;var h,d,m=0,v=""===t?c:t+p;if(Array.isArray(e))for(var g=0;g<e.length;g++)h=e[g],d=v+r(h,g),m+=i(h,d,n,o);else{var y=u(e);if(y){var _,b=y.call(e);if(y!==e.entries)for(var x=0;!(_=b.next()).done;)h=_.value,d=v+r(h,x++),m+=i(h,d,n,o);else for(;!(_=b.next()).done;){var w=_.value;w&&(h=w[1],d=v+l.escape(w[0])+p+r(h,0),m+=i(h,d,n,o))}}else if("object"===f){var k="",E=String(e);a("31","[object Object]"===E?"object with keys {"+Object.keys(e).join(", ")+"}":E,k)}}return m}function o(e,t,n){return null==e?0:i(e,"",t,n)}var a=n(11),s=(n(52),n(1036)),u=n(1067),l=(n(8),n(244)),c=(n(10),"."),p=":";e.exports=o},function(e,t,n){"use strict";t.__esModule=!0,t.default={noWobble:{stiffness:170,damping:26},gentle:{stiffness:120,damping:14},wobbly:{stiffness:180,damping:12},stiff:{stiffness:210,damping:20}},e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var r=n(1),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=i.default.shape({subscribe:i.default.func.isRequired,dispatch:i.default.func.isRequired,getState:i.default.func.isRequired})},function(e,t,n){"use strict";function r(e){"undefined"!=typeof console&&"function"==typeof console.error&&console.error(e);try{throw new Error(e)}catch(e){}}t.__esModule=!0,t.default=r},function(e,t,n){"use strict";function r(e,t,n){this.props=e,this.context=t,this.refs=l,this.updater=n||u}function i(e,t,n){this.props=e,this.context=t,this.refs=l,this.updater=n||u}function o(){}var a=n(126),s=n(13),u=n(477),l=(n(478),n(144));n(8),n(1107);r.prototype.isReactComponent={},r.prototype.setState=function(e,t){"object"!=typeof e&&"function"!=typeof e&&null!=e&&a("85"),this.updater.enqueueSetState(this,e),t&&this.updater.enqueueCallback(this,t,"setState")},r.prototype.forceUpdate=function(e){this.updater.enqueueForceUpdate(this),e&&this.updater.enqueueCallback(this,e,"forceUpdate")};o.prototype=r.prototype,i.prototype=new o,i.prototype.constructor=i,s(i.prototype,r.prototype),i.prototype.isPureReactComponent=!0,e.exports={Component:r,PureComponent:i}},function(e,t,n){"use strict";function r(e){var t=Function.prototype.toString,n=Object.prototype.hasOwnProperty,r=RegExp("^"+t.call(n).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");try{var i=t.call(e);return r.test(i)}catch(e){return!1}}function i(e){var t=l(e);if(t){var n=t.childIDs;c(e),n.forEach(i)}}function o(e,t,n){return"\n    in "+(e||"Unknown")+(t?" (at "+t.fileName.replace(/^.*[\\\/]/,"")+":"+t.lineNumber+")":n?" (created by "+n+")":"")}function a(e){return null==e?"#empty":"string"==typeof e||"number"==typeof e?"#text":"string"==typeof e.type?e.type:e.type.displayName||e.type.name||"Unknown"}function s(e){var t,n=S.getDisplayName(e),r=S.getElement(e),i=S.getOwnerID(e);return i&&(t=S.getDisplayName(i)),o(n,r&&r._source,t)}var u,l,c,p,f,h,d,m=n(126),v=n(52),g=(n(8),n(10),"function"==typeof Array.from&&"function"==typeof Map&&r(Map)&&null!=Map.prototype&&"function"==typeof Map.prototype.keys&&r(Map.prototype.keys)&&"function"==typeof Set&&r(Set)&&null!=Set.prototype&&"function"==typeof Set.prototype.keys&&r(Set.prototype.keys));if(g){var y=new Map,_=new Set;u=function(e,t){y.set(e,t)},l=function(e){return y.get(e)},c=function(e){y.delete(e)},p=function(){return Array.from(y.keys())},f=function(e){_.add(e)},h=function(e){_.delete(e)},d=function(){return Array.from(_.keys())}}else{var b={},x={},w=function(e){return"."+e},k=function(e){return parseInt(e.substr(1),10)};u=function(e,t){var n=w(e);b[n]=t},l=function(e){var t=w(e);return b[t]},c=function(e){var t=w(e);delete b[t]},p=function(){return Object.keys(b).map(k)},f=function(e){var t=w(e);x[t]=!0},h=function(e){var t=w(e);delete x[t]},d=function(){return Object.keys(x).map(k)}}var E=[],S={onSetChildren:function(e,t){var n=l(e);n||m("144"),n.childIDs=t;for(var r=0;r<t.length;r++){var i=t[r],o=l(i);o||m("140"),null==o.childIDs&&"object"==typeof o.element&&null!=o.element&&m("141"),o.isMounted||m("71"),null==o.parentID&&(o.parentID=e),o.parentID!==e&&m("142",i,o.parentID,e)}},onBeforeMountComponent:function(e,t,n){u(e,{element:t,parentID:n,text:null,childIDs:[],isMounted:!1,updateCount:0})},onBeforeUpdateComponent:function(e,t){var n=l(e);n&&n.isMounted&&(n.element=t)},onMountComponent:function(e){var t=l(e);t||m("144"),t.isMounted=!0,0===t.parentID&&f(e)},onUpdateComponent:function(e){var t=l(e);t&&t.isMounted&&t.updateCount++},onUnmountComponent:function(e){var t=l(e);if(t){t.isMounted=!1;0===t.parentID&&h(e)}E.push(e)},purgeUnmountedComponents:function(){if(!S._preventPurging){for(var e=0;e<E.length;e++){i(E[e])}E.length=0}},isMounted:function(e){var t=l(e);return!!t&&t.isMounted},getCurrentStackAddendum:function(e){var t="";if(e){var n=a(e),r=e._owner;t+=o(n,e._source,r&&r.getName())}var i=v.current,s=i&&i._debugID;return t+=S.getStackAddendumByID(s)},getStackAddendumByID:function(e){for(var t="";e;)t+=s(e),e=S.getParentID(e);return t},getChildIDs:function(e){var t=l(e);return t?t.childIDs:[]},getDisplayName:function(e){var t=S.getElement(e);return t?a(t):null},getElement:function(e){var t=l(e);return t?t.element:null},getOwnerID:function(e){var t=S.getElement(e);return t&&t._owner?t._owner._debugID:null},getParentID:function(e){var t=l(e);return t?t.parentID:null},getSource:function(e){var t=l(e),n=t?t.element:null;return null!=n?n._source:null},getText:function(e){var t=S.getElement(e);return"string"==typeof t?t:"number"==typeof t?""+t:null},getUpdateCount:function(e){var t=l(e);return t?t.updateCount:0},getRootIDs:d,getRegisteredIDs:p,pushNonStandardWarningStack:function(e,t){if("function"==typeof console.reactStack){var n=[],r=v.current,i=r&&r._debugID;try{for(e&&n.push({name:i?S.getDisplayName(i):null,fileName:t?t.fileName:null,lineNumber:t?t.lineNumber:null});i;){var o=S.getElement(i),a=S.getParentID(i),s=S.getOwnerID(i),u=s?S.getDisplayName(s):null,l=o&&o._source;n.push({name:u,fileName:l?l.fileName:null,lineNumber:l?l.lineNumber:null}),i=a}}catch(e){}console.reactStack(n)}},popNonStandardWarningStack:function(){"function"==typeof console.reactStackEnd&&console.reactStackEnd()}};e.exports=S},function(e,t,n){"use strict";var r="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103;e.exports=r},function(e,t,n){"use strict";var r=(n(10),{isMounted:function(e){return!1},enqueueCallback:function(e,t){},enqueueForceUpdate:function(e){},enqueueReplaceState:function(e,t){},enqueueSetState:function(e,t){}});e.exports=r},function(e,t,n){"use strict";var r=!1;e.exports=r},function(e,t,n){"use strict";(function(t,r){function i(e){return N.from(e)}function o(e){return N.isBuffer(e)||e instanceof B}function a(e,t,n){if("function"==typeof e.prependListener)return e.prependListener(t,n);e._events&&e._events[t]?R(e._events[t])?e._events[t].unshift(n):e._events[t]=[n,e._events[t]]:e.on(t,n)}function s(e,t){I=I||n(71),e=e||{},this.objectMode=!!e.objectMode,t instanceof I&&(this.objectMode=this.objectMode||!!e.readableObjectMode);var r=e.highWaterMark,i=this.objectMode?16:16384;this.highWaterMark=r||0===r?r:i,this.highWaterMark=Math.floor(this.highWaterMark),this.buffer=new W,this.length=0,this.pipes=null,this.pipesCount=0,this.flowing=null,this.ended=!1,this.endEmitted=!1,this.reading=!1,this.sync=!0,this.needReadable=!1,this.emittedReadable=!1,this.readableListening=!1,this.resumeScheduled=!1,this.destroyed=!1,this.defaultEncoding=e.defaultEncoding||"utf8",this.awaitDrain=0,this.readingMore=!1,this.decoder=null,this.encoding=null,e.encoding&&(U||(U=n(265).StringDecoder),this.decoder=new U(e.encoding),this.encoding=e.encoding)}function u(e){if(I=I||n(71),!(this instanceof u))return new u(e);this._readableState=new s(e,this),this.readable=!0,e&&("function"==typeof e.read&&(this._read=e.read),"function"==typeof e.destroy&&(this._destroy=e.destroy)),F.call(this)}function l(e,t,n,r,o){var a=e._readableState;if(null===t)a.reading=!1,m(e,a);else{var s;o||(s=p(a,t)),s?e.emit("error",s):a.objectMode||t&&t.length>0?("string"==typeof t||a.objectMode||Object.getPrototypeOf(t)===N.prototype||(t=i(t)),r?a.endEmitted?e.emit("error",new Error("stream.unshift() after end event")):c(e,a,t,!0):a.ended?e.emit("error",new Error("stream.push() after EOF")):(a.reading=!1,a.decoder&&!n?(t=a.decoder.write(t),a.objectMode||0!==t.length?c(e,a,t,!1):y(e,a)):c(e,a,t,!1))):r||(a.reading=!1)}return f(a)}function c(e,t,n,r){t.flowing&&0===t.length&&!t.sync?(e.emit("data",n),e.read(0)):(t.length+=t.objectMode?1:n.length,r?t.buffer.unshift(n):t.buffer.push(n),t.needReadable&&v(e)),y(e,t)}function p(e,t){var n;return o(t)||"string"==typeof t||void 0===t||e.objectMode||(n=new TypeError("Invalid non-string/buffer chunk")),n}function f(e){return!e.ended&&(e.needReadable||e.length<e.highWaterMark||0===e.length)}function h(e){return e>=G?e=G:(e--,e|=e>>>1,e|=e>>>2,e|=e>>>4,e|=e>>>8,e|=e>>>16,e++),e}function d(e,t){return e<=0||0===t.length&&t.ended?0:t.objectMode?1:e!==e?t.flowing&&t.length?t.buffer.head.data.length:t.length:(e>t.highWaterMark&&(t.highWaterMark=h(e)),e<=t.length?e:t.ended?t.length:(t.needReadable=!0,0))}function m(e,t){if(!t.ended){if(t.decoder){var n=t.decoder.end();n&&n.length&&(t.buffer.push(n),t.length+=t.objectMode?1:n.length)}t.ended=!0,v(e)}}function v(e){var t=e._readableState;t.needReadable=!1,t.emittedReadable||(z("emitReadable",t.flowing),t.emittedReadable=!0,t.sync?P(g,e):g(e))}function g(e){z("emit readable"),e.emit("readable"),E(e)}function y(e,t){t.readingMore||(t.readingMore=!0,P(_,e,t))}function _(e,t){for(var n=t.length;!t.reading&&!t.flowing&&!t.ended&&t.length<t.highWaterMark&&(z("maybeReadMore read 0"),e.read(0),n!==t.length);)n=t.length;t.readingMore=!1}function b(e){return function(){var t=e._readableState;z("pipeOnDrain",t.awaitDrain),t.awaitDrain&&t.awaitDrain--,0===t.awaitDrain&&j(e,"data")&&(t.flowing=!0,E(e))}}function x(e){z("readable nexttick read 0"),e.read(0)}function w(e,t){t.resumeScheduled||(t.resumeScheduled=!0,P(k,e,t))}function k(e,t){t.reading||(z("resume read 0"),e.read(0)),t.resumeScheduled=!1,t.awaitDrain=0,e.emit("resume"),E(e),t.flowing&&!t.reading&&e.read(0)}function E(e){var t=e._readableState;for(z("flow",t.flowing);t.flowing&&null!==e.read(););}function S(e,t){if(0===t.length)return null;var n;return t.objectMode?n=t.buffer.shift():!e||e>=t.length?(n=t.decoder?t.buffer.join(""):1===t.buffer.length?t.buffer.head.data:t.buffer.concat(t.length),t.buffer.clear()):n=C(e,t.buffer,t.decoder),n}function C(e,t,n){var r;return e<t.head.data.length?(r=t.head.data.slice(0,e),t.head.data=t.head.data.slice(e)):r=e===t.head.data.length?t.shift():n?A(e,t):D(e,t),r}function A(e,t){var n=t.head,r=1,i=n.data;for(e-=i.length;n=n.next;){var o=n.data,a=e>o.length?o.length:e;if(a===o.length?i+=o:i+=o.slice(0,e),0===(e-=a)){a===o.length?(++r,n.next?t.head=n.next:t.head=t.tail=null):(t.head=n,n.data=o.slice(a));break}++r}return t.length-=r,i}function D(e,t){var n=N.allocUnsafe(e),r=t.head,i=1;for(r.data.copy(n),e-=r.data.length;r=r.next;){var o=r.data,a=e>o.length?o.length:e;if(o.copy(n,n.length-e,0,a),0===(e-=a)){a===o.length?(++i,r.next?t.head=r.next:t.head=t.tail=null):(t.head=r,r.data=o.slice(a));break}++i}return t.length-=i,n}function O(e){var t=e._readableState;if(t.length>0)throw new Error('"endReadable()" called on non-empty stream');t.endEmitted||(t.ended=!0,P(M,t,e))}function M(e,t){e.endEmitted||0!==e.length||(e.endEmitted=!0,t.readable=!1,t.emit("end"))}function T(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1}var P=n(158);e.exports=u;var I,R=n(387);u.ReadableState=s;var j=(n(143).EventEmitter,function(e,t){return e.listeners(t).length}),F=n(482),N=n(167).Buffer,B=t.Uint8Array||function(){},L=n(111);L.inherits=n(42);var q=n(1212),z=void 0;z=q&&q.debuglog?q.debuglog("stream"):function(){};var U,W=n(1112),V=n(481);L.inherits(u,F);var H=["error","close","destroy","pause","resume"];Object.defineProperty(u.prototype,"destroyed",{get:function(){return void 0!==this._readableState&&this._readableState.destroyed},set:function(e){this._readableState&&(this._readableState.destroyed=e)}}),u.prototype.destroy=V.destroy,u.prototype._undestroy=V.undestroy,u.prototype._destroy=function(e,t){this.push(null),t(e)},u.prototype.push=function(e,t){var n,r=this._readableState;return r.objectMode?n=!0:"string"==typeof e&&(t=t||r.defaultEncoding,t!==r.encoding&&(e=N.from(e,t),t=""),n=!0),l(this,e,t,!1,n)},u.prototype.unshift=function(e){return l(this,e,null,!0,!1)},u.prototype.isPaused=function(){return!1===this._readableState.flowing},u.prototype.setEncoding=function(e){return U||(U=n(265).StringDecoder),this._readableState.decoder=new U(e),this._readableState.encoding=e,this};var G=8388608;u.prototype.read=function(e){z("read",e),e=parseInt(e,10);var t=this._readableState,n=e;if(0!==e&&(t.emittedReadable=!1),0===e&&t.needReadable&&(t.length>=t.highWaterMark||t.ended))return z("read: emitReadable",t.length,t.ended),0===t.length&&t.ended?O(this):v(this),null;if(0===(e=d(e,t))&&t.ended)return 0===t.length&&O(this),null;var r=t.needReadable;z("need readable",r),(0===t.length||t.length-e<t.highWaterMark)&&(r=!0,z("length less than watermark",r)),t.ended||t.reading?(r=!1,z("reading or ended",r)):r&&(z("do read"),t.reading=!0,t.sync=!0,0===t.length&&(t.needReadable=!0),this._read(t.highWaterMark),t.sync=!1,t.reading||(e=d(n,t)));var i;return i=e>0?S(e,t):null,null===i?(t.needReadable=!0,e=0):t.length-=e,0===t.length&&(t.ended||(t.needReadable=!0),n!==e&&t.ended&&O(this)),null!==i&&this.emit("data",i),i},u.prototype._read=function(e){this.emit("error",new Error("_read() is not implemented"))},u.prototype.pipe=function(e,t){function n(e,t){z("onunpipe"),e===f&&t&&!1===t.hasUnpiped&&(t.hasUnpiped=!0,o())}function i(){z("onend"),e.end()}function o(){z("cleanup"),e.removeListener("close",l),e.removeListener("finish",c),e.removeListener("drain",v),e.removeListener("error",u),e.removeListener("unpipe",n),f.removeListener("end",i),f.removeListener("end",p),f.removeListener("data",s),g=!0,!h.awaitDrain||e._writableState&&!e._writableState.needDrain||v()}function s(t){z("ondata"),y=!1,!1!==e.write(t)||y||((1===h.pipesCount&&h.pipes===e||h.pipesCount>1&&-1!==T(h.pipes,e))&&!g&&(z("false write response, pause",f._readableState.awaitDrain),f._readableState.awaitDrain++,y=!0),f.pause())}function u(t){z("onerror",t),p(),e.removeListener("error",u),0===j(e,"error")&&e.emit("error",t)}function l(){e.removeListener("finish",c),p()}function c(){z("onfinish"),e.removeListener("close",l),p()}function p(){z("unpipe"),f.unpipe(e)}var f=this,h=this._readableState;switch(h.pipesCount){case 0:h.pipes=e;break;case 1:h.pipes=[h.pipes,e];break;default:h.pipes.push(e)}h.pipesCount+=1,z("pipe count=%d opts=%j",h.pipesCount,t);var d=(!t||!1!==t.end)&&e!==r.stdout&&e!==r.stderr,m=d?i:p;h.endEmitted?P(m):f.once("end",m),e.on("unpipe",n);var v=b(f);e.on("drain",v);var g=!1,y=!1;return f.on("data",s),a(e,"error",u),e.once("close",l),e.once("finish",c),e.emit("pipe",f),h.flowing||(z("pipe resume"),f.resume()),e},u.prototype.unpipe=function(e){var t=this._readableState,n={hasUnpiped:!1};if(0===t.pipesCount)return this;if(1===t.pipesCount)return e&&e!==t.pipes?this:(e||(e=t.pipes),t.pipes=null,t.pipesCount=0,t.flowing=!1,e&&e.emit("unpipe",this,n),this);if(!e){var r=t.pipes,i=t.pipesCount;t.pipes=null,t.pipesCount=0,t.flowing=!1;for(var o=0;o<i;o++)r[o].emit("unpipe",this,n);return this}var a=T(t.pipes,e);return-1===a?this:(t.pipes.splice(a,1),t.pipesCount-=1,1===t.pipesCount&&(t.pipes=t.pipes[0]),e.emit("unpipe",this,n),this)},u.prototype.on=function(e,t){var n=F.prototype.on.call(this,e,t);if("data"===e)!1!==this._readableState.flowing&&this.resume();else if("readable"===e){var r=this._readableState;r.endEmitted||r.readableListening||(r.readableListening=r.needReadable=!0,r.emittedReadable=!1,r.reading?r.length&&v(this):P(x,this))}return n},u.prototype.addListener=u.prototype.on,u.prototype.resume=function(){var e=this._readableState;return e.flowing||(z("resume"),e.flowing=!0,w(this,e)),this},u.prototype.pause=function(){return z("call pause flowing=%j",this._readableState.flowing),!1!==this._readableState.flowing&&(z("pause"),this._readableState.flowing=!1,this.emit("pause")),this},u.prototype.wrap=function(e){var t=this._readableState,n=!1,r=this;e.on("end",function(){if(z("wrapped end"),t.decoder&&!t.ended){var e=t.decoder.end();e&&e.length&&r.push(e)}r.push(null)}),e.on("data",function(i){if(z("wrapped data"),t.decoder&&(i=t.decoder.write(i)),(!t.objectMode||null!==i&&void 0!==i)&&(t.objectMode||i&&i.length)){r.push(i)||(n=!0,e.pause())}});for(var i in e)void 0===this[i]&&"function"==typeof e[i]&&(this[i]=function(t){return function(){return e[t].apply(e,arguments)}}(i));for(var o=0;o<H.length;o++)e.on(H[o],r.emit.bind(r,H[o]));return r._read=function(t){z("wrapped _read",t),n&&(n=!1,e.resume())},r},u._fromList=S}).call(t,n(17),n(33))},function(e,t,n){"use strict";function r(e){this.afterTransform=function(t,n){return i(e,t,n)},this.needTransform=!1,this.transforming=!1,this.writecb=null,this.writechunk=null,this.writeencoding=null}function i(e,t,n){var r=e._transformState;r.transforming=!1;var i=r.writecb;if(!i)return e.emit("error",new Error("write callback called multiple times"));r.writechunk=null,r.writecb=null,null!==n&&void 0!==n&&e.push(n),i(t);var o=e._readableState;o.reading=!1,(o.needReadable||o.length<o.highWaterMark)&&e._read(o.highWaterMark)}function o(e){if(!(this instanceof o))return new o(e);s.call(this,e),this._transformState=new r(this);var t=this;this._readableState.needReadable=!0,this._readableState.sync=!1,e&&("function"==typeof e.transform&&(this._transform=e.transform),"function"==typeof e.flush&&(this._flush=e.flush)),this.once("prefinish",function(){"function"==typeof this._flush?this._flush(function(e,n){a(t,e,n)}):a(t)})}function a(e,t,n){if(t)return e.emit("error",t);null!==n&&void 0!==n&&e.push(n);var r=e._writableState,i=e._transformState;if(r.length)throw new Error("Calling transform done when ws.length != 0");if(i.transforming)throw new Error("Calling transform done when still transforming");return e.push(null)}e.exports=o;var s=n(71),u=n(111);u.inherits=n(42),u.inherits(o,s),o.prototype.push=function(e,t){return this._transformState.needTransform=!1,s.prototype.push.call(this,e,t)},o.prototype._transform=function(e,t,n){throw new Error("_transform() is not implemented")},o.prototype._write=function(e,t,n){var r=this._transformState;if(r.writecb=n,r.writechunk=e,r.writeencoding=t,!r.transforming){var i=this._readableState;(r.needTransform||i.needReadable||i.length<i.highWaterMark)&&this._read(i.highWaterMark)}},o.prototype._read=function(e){var t=this._transformState;null!==t.writechunk&&t.writecb&&!t.transforming?(t.transforming=!0,this._transform(t.writechunk,t.writeencoding,t.afterTransform)):t.needTransform=!0},o.prototype._destroy=function(e,t){var n=this;s.prototype._destroy.call(this,e,function(e){t(e),n.emit("close")})}},function(e,t,n){"use strict";function r(e,t){var n=this,r=this._readableState&&this._readableState.destroyed,i=this._writableState&&this._writableState.destroyed;if(r||i)return void(t?t(e):!e||this._writableState&&this._writableState.errorEmitted||a(o,this,e));this._readableState&&(this._readableState.destroyed=!0),this._writableState&&(this._writableState.destroyed=!0),this._destroy(e||null,function(e){!t&&e?(a(o,n,e),n._writableState&&(n._writableState.errorEmitted=!0)):t&&t(e)})}function i(){this._readableState&&(this._readableState.destroyed=!1,this._readableState.reading=!1,this._readableState.ended=!1,this._readableState.endEmitted=!1),this._writableState&&(this._writableState.destroyed=!1,this._writableState.ended=!1,this._writableState.ending=!1,this._writableState.finished=!1,this._writableState.errorEmitted=!1)}function o(e,t){e.emit("error",t)}var a=n(158);e.exports={destroy:r,undestroy:i}},function(e,t,n){e.exports=n(143).EventEmitter},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){return e&&"@@redux/INIT"===e.type?"initialState argument passed to createStore":"previous state received by the reducer"},e.exports=t.default},function(e,t,n){"use strict";function r(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];return 0===t.length?function(e){return e}:1===t.length?t[0]:t.reduce(function(e,t){return function(){return e(t.apply(void 0,arguments))}})}t.a=r},function(e,t,n){"use strict";function r(e,t,o){function u(){y===g&&(y=g.slice())}function l(){return v}function c(e){if("function"!=typeof e)throw new Error("Expected listener to be a function.");var t=!0;return u(),y.push(e),function(){if(t){t=!1,u();var n=y.indexOf(e);y.splice(n,1)}}}function p(e){if(!n.i(i.a)(e))throw new Error("Actions must be plain objects. Use custom middleware for async actions.");if(void 0===e.type)throw new Error('Actions may not have an undefined "type" property. Have you misspelled a constant?');if(_)throw new Error("Reducers may not dispatch actions.");try{_=!0,v=m(v,e)}finally{_=!1}for(var t=g=y,r=0;r<t.length;r++){(0,t[r])()}return e}function f(e){if("function"!=typeof e)throw new Error("Expected the nextReducer to be a function.");m=e,p({type:s.INIT})}function h(){var e,t=c;return e={subscribe:function(e){function n(){e.next&&e.next(l())}if("object"!=typeof e)throw new TypeError("Expected the observer to be an object.");return n(),{unsubscribe:t(n)}}},e[a.a]=function(){return this},e}var d;if("function"==typeof t&&void 0===o&&(o=t,t=void 0),void 0!==o){if("function"!=typeof o)throw new Error("Expected the enhancer to be a function.");return o(r)(e,t)}if("function"!=typeof e)throw new Error("Expected the reducer to be a function.");var m=e,v=t,g=[],y=g,_=!1;return p({type:s.INIT}),d={dispatch:p,subscribe:c,getState:l,replaceReducer:f},d[a.a]=h,d}n.d(t,"b",function(){return s}),t.a=r;var i=n(391),o=n(1182),a=n.n(o),s={INIT:"@@redux/INIT"}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(485),i=n(1123),o=n(1122),a=n(1121),s=n(484);n(487);n.d(t,"createStore",function(){return r.a}),n.d(t,"combineReducers",function(){return i.a}),n.d(t,"bindActionCreators",function(){return o.a}),n.d(t,"applyMiddleware",function(){return a.a}),n.d(t,"compose",function(){return s.a})},function(e,t,n){"use strict"},function(e,t,n){"use strict";e.exports={Aacute:"Á",aacute:"á",Abreve:"Ă",abreve:"ă",ac:"∾",acd:"∿",acE:"∾̳",Acirc:"Â",acirc:"â",acute:"´",Acy:"А",acy:"а",AElig:"Æ",aelig:"æ",af:"⁡",Afr:"𝔄",afr:"𝔞",Agrave:"À",agrave:"à",alefsym:"ℵ",aleph:"ℵ",Alpha:"Α",alpha:"α",Amacr:"Ā",amacr:"ā",amalg:"⨿",AMP:"&",amp:"&",And:"⩓",and:"∧",andand:"⩕",andd:"⩜",andslope:"⩘",andv:"⩚",ang:"∠",ange:"⦤",angle:"∠",angmsd:"∡",angmsdaa:"⦨",angmsdab:"⦩",angmsdac:"⦪",angmsdad:"⦫",angmsdae:"⦬",angmsdaf:"⦭",angmsdag:"⦮",angmsdah:"⦯",angrt:"∟",angrtvb:"⊾",angrtvbd:"⦝",angsph:"∢",angst:"Å",angzarr:"⍼",Aogon:"Ą",aogon:"ą",Aopf:"𝔸",aopf:"𝕒",ap:"≈",apacir:"⩯",apE:"⩰",ape:"≊",apid:"≋",apos:"'",ApplyFunction:"⁡",approx:"≈",approxeq:"≊",Aring:"Å",aring:"å",Ascr:"𝒜",ascr:"𝒶",Assign:"≔",ast:"*",asymp:"≈",asympeq:"≍",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",awconint:"∳",awint:"⨑",backcong:"≌",backepsilon:"϶",backprime:"‵",backsim:"∽",backsimeq:"⋍",Backslash:"∖",Barv:"⫧",barvee:"⊽",Barwed:"⌆",barwed:"⌅",barwedge:"⌅",bbrk:"⎵",bbrktbrk:"⎶",bcong:"≌",Bcy:"Б",bcy:"б",bdquo:"„",becaus:"∵",Because:"∵",because:"∵",bemptyv:"⦰",bepsi:"϶",bernou:"ℬ",Bernoullis:"ℬ",Beta:"Β",beta:"β",beth:"ℶ",between:"≬",Bfr:"𝔅",bfr:"𝔟",bigcap:"⋂",bigcirc:"◯",bigcup:"⋃",bigodot:"⨀",bigoplus:"⨁",bigotimes:"⨂",bigsqcup:"⨆",bigstar:"★",bigtriangledown:"▽",bigtriangleup:"△",biguplus:"⨄",bigvee:"⋁",bigwedge:"⋀",bkarow:"⤍",blacklozenge:"⧫",blacksquare:"▪",blacktriangle:"▴",blacktriangledown:"▾",blacktriangleleft:"◂",blacktriangleright:"▸",blank:"␣",blk12:"▒",blk14:"░",blk34:"▓",block:"█",bne:"=⃥",bnequiv:"≡⃥",bNot:"⫭",bnot:"⌐",Bopf:"𝔹",bopf:"𝕓",bot:"⊥",bottom:"⊥",bowtie:"⋈",boxbox:"⧉",boxDL:"╗",boxDl:"╖",boxdL:"╕",boxdl:"┐",boxDR:"╔",boxDr:"╓",boxdR:"╒",boxdr:"┌",boxH:"═",boxh:"─",boxHD:"╦",boxHd:"╤",boxhD:"╥",boxhd:"┬",boxHU:"╩",boxHu:"╧",boxhU:"╨",boxhu:"┴",boxminus:"⊟",boxplus:"⊞",boxtimes:"⊠",boxUL:"╝",boxUl:"╜",boxuL:"╛",boxul:"┘",boxUR:"╚",boxUr:"╙",boxuR:"╘",boxur:"└",boxV:"║",boxv:"│",boxVH:"╬",boxVh:"╫",boxvH:"╪",boxvh:"┼",boxVL:"╣",boxVl:"╢",boxvL:"╡",boxvl:"┤",boxVR:"╠",boxVr:"╟",boxvR:"╞",boxvr:"├",bprime:"‵",Breve:"˘",breve:"˘",brvbar:"¦",Bscr:"ℬ",bscr:"𝒷",bsemi:"⁏",bsim:"∽",bsime:"⋍",bsol:"\\",bsolb:"⧅",bsolhsub:"⟈",bull:"•",bullet:"•",bump:"≎",bumpE:"⪮",bumpe:"≏",Bumpeq:"≎",bumpeq:"≏",Cacute:"Ć",cacute:"ć",Cap:"⋒",cap:"∩",capand:"⩄",capbrcup:"⩉",capcap:"⩋",capcup:"⩇",capdot:"⩀",CapitalDifferentialD:"ⅅ",caps:"∩︀",caret:"⁁",caron:"ˇ",Cayleys:"ℭ",ccaps:"⩍",Ccaron:"Č",ccaron:"č",Ccedil:"Ç",ccedil:"ç",Ccirc:"Ĉ",ccirc:"ĉ",Cconint:"∰",ccups:"⩌",ccupssm:"⩐",Cdot:"Ċ",cdot:"ċ",cedil:"¸",Cedilla:"¸",cemptyv:"⦲",cent:"¢",CenterDot:"·",centerdot:"·",Cfr:"ℭ",cfr:"𝔠",CHcy:"Ч",chcy:"ч",check:"✓",checkmark:"✓",Chi:"Χ",chi:"χ",cir:"○",circ:"ˆ",circeq:"≗",circlearrowleft:"↺",circlearrowright:"↻",circledast:"⊛",circledcirc:"⊚",circleddash:"⊝",CircleDot:"⊙",circledR:"®",circledS:"Ⓢ",CircleMinus:"⊖",CirclePlus:"⊕",CircleTimes:"⊗",cirE:"⧃",cire:"≗",cirfnint:"⨐",cirmid:"⫯",cirscir:"⧂",ClockwiseContourIntegral:"∲",CloseCurlyDoubleQuote:"”",CloseCurlyQuote:"’",clubs:"♣",clubsuit:"♣",Colon:"∷",colon:":",Colone:"⩴",colone:"≔",coloneq:"≔",comma:",",commat:"@",comp:"∁",compfn:"∘",complement:"∁",complexes:"ℂ",cong:"≅",congdot:"⩭",Congruent:"≡",Conint:"∯",conint:"∮",ContourIntegral:"∮",Copf:"ℂ",copf:"𝕔",coprod:"∐",Coproduct:"∐",COPY:"©",copy:"©",copysr:"℗",CounterClockwiseContourIntegral:"∳",crarr:"↵",Cross:"⨯",cross:"✗",Cscr:"𝒞",cscr:"𝒸",csub:"⫏",csube:"⫑",csup:"⫐",csupe:"⫒",ctdot:"⋯",cudarrl:"⤸",cudarrr:"⤵",cuepr:"⋞",cuesc:"⋟",cularr:"↶",cularrp:"⤽",Cup:"⋓",cup:"∪",cupbrcap:"⩈",CupCap:"≍",cupcap:"⩆",cupcup:"⩊",cupdot:"⊍",cupor:"⩅",cups:"∪︀",curarr:"↷",curarrm:"⤼",curlyeqprec:"⋞",curlyeqsucc:"⋟",curlyvee:"⋎",curlywedge:"⋏",curren:"¤",curvearrowleft:"↶",curvearrowright:"↷",cuvee:"⋎",cuwed:"⋏",cwconint:"∲",cwint:"∱",cylcty:"⌭",Dagger:"‡",dagger:"†",daleth:"ℸ",Darr:"↡",dArr:"⇓",darr:"↓",dash:"‐",Dashv:"⫤",dashv:"⊣",dbkarow:"⤏",dblac:"˝",Dcaron:"Ď",dcaron:"ď",Dcy:"Д",dcy:"д",DD:"ⅅ",dd:"ⅆ",ddagger:"‡",ddarr:"⇊",DDotrahd:"⤑",ddotseq:"⩷",deg:"°",Del:"∇",Delta:"Δ",delta:"δ",demptyv:"⦱",dfisht:"⥿",Dfr:"𝔇",dfr:"𝔡",dHar:"⥥",dharl:"⇃",dharr:"⇂",DiacriticalAcute:"´",DiacriticalDot:"˙",DiacriticalDoubleAcute:"˝",DiacriticalGrave:"`",DiacriticalTilde:"˜",diam:"⋄",Diamond:"⋄",diamond:"⋄",diamondsuit:"♦",diams:"♦",die:"¨",DifferentialD:"ⅆ",digamma:"ϝ",disin:"⋲",div:"÷",divide:"÷",divideontimes:"⋇",divonx:"⋇",DJcy:"Ђ",djcy:"ђ",dlcorn:"⌞",dlcrop:"⌍",dollar:"$",Dopf:"𝔻",dopf:"𝕕",Dot:"¨",dot:"˙",DotDot:"⃜",doteq:"≐",doteqdot:"≑",DotEqual:"≐",dotminus:"∸",dotplus:"∔",dotsquare:"⊡",doublebarwedge:"⌆",DoubleContourIntegral:"∯",DoubleDot:"¨",DoubleDownArrow:"⇓",DoubleLeftArrow:"⇐",DoubleLeftRightArrow:"⇔",DoubleLeftTee:"⫤",DoubleLongLeftArrow:"⟸",DoubleLongLeftRightArrow:"⟺",DoubleLongRightArrow:"⟹",DoubleRightArrow:"⇒",DoubleRightTee:"⊨",DoubleUpArrow:"⇑",DoubleUpDownArrow:"⇕",DoubleVerticalBar:"∥",DownArrow:"↓",Downarrow:"⇓",downarrow:"↓",DownArrowBar:"⤓",DownArrowUpArrow:"⇵",DownBreve:"̑",downdownarrows:"⇊",downharpoonleft:"⇃",downharpoonright:"⇂",DownLeftRightVector:"⥐",DownLeftTeeVector:"⥞",DownLeftVector:"↽",DownLeftVectorBar:"⥖",DownRightTeeVector:"⥟",DownRightVector:"⇁",DownRightVectorBar:"⥗",DownTee:"⊤",DownTeeArrow:"↧",drbkarow:"⤐",drcorn:"⌟",drcrop:"⌌",Dscr:"𝒟",dscr:"𝒹",DScy:"Ѕ",dscy:"ѕ",dsol:"⧶",Dstrok:"Đ",dstrok:"đ",dtdot:"⋱",dtri:"▿",dtrif:"▾",duarr:"⇵",duhar:"⥯",dwangle:"⦦",DZcy:"Џ",dzcy:"џ",dzigrarr:"⟿",Eacute:"É",eacute:"é",easter:"⩮",Ecaron:"Ě",ecaron:"ě",ecir:"≖",Ecirc:"Ê",ecirc:"ê",ecolon:"≕",Ecy:"Э",ecy:"э",eDDot:"⩷",Edot:"Ė",eDot:"≑",edot:"ė",ee:"ⅇ",efDot:"≒",Efr:"𝔈",efr:"𝔢",eg:"⪚",Egrave:"È",egrave:"è",egs:"⪖",egsdot:"⪘",el:"⪙",Element:"∈",elinters:"⏧",ell:"ℓ",els:"⪕",elsdot:"⪗",Emacr:"Ē",emacr:"ē",empty:"∅",emptyset:"∅",EmptySmallSquare:"◻",emptyv:"∅",EmptyVerySmallSquare:"▫",emsp:" ",emsp13:" ",emsp14:" ",ENG:"Ŋ",eng:"ŋ",ensp:" ",Eogon:"Ę",eogon:"ę",Eopf:"𝔼",eopf:"𝕖",epar:"⋕",eparsl:"⧣",eplus:"⩱",epsi:"ε",Epsilon:"Ε",epsilon:"ε",epsiv:"ϵ",eqcirc:"≖",eqcolon:"≕",eqsim:"≂",eqslantgtr:"⪖",eqslantless:"⪕",Equal:"⩵",equals:"=",EqualTilde:"≂",equest:"≟",Equilibrium:"⇌",equiv:"≡",equivDD:"⩸",eqvparsl:"⧥",erarr:"⥱",erDot:"≓",Escr:"ℰ",escr:"ℯ",esdot:"≐",Esim:"⩳",esim:"≂",Eta:"Η",eta:"η",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",euro:"€",excl:"!",exist:"∃",Exists:"∃",expectation:"ℰ",ExponentialE:"ⅇ",exponentiale:"ⅇ",fallingdotseq:"≒",Fcy:"Ф",fcy:"ф",female:"♀",ffilig:"ffi",fflig:"ff",ffllig:"ffl",Ffr:"𝔉",ffr:"𝔣",filig:"fi",FilledSmallSquare:"◼",FilledVerySmallSquare:"▪",fjlig:"fj",flat:"♭",fllig:"fl",fltns:"▱",fnof:"ƒ",Fopf:"𝔽",fopf:"𝕗",ForAll:"∀",forall:"∀",fork:"⋔",forkv:"⫙",Fouriertrf:"ℱ",fpartint:"⨍",frac12:"½",frac13:"⅓",frac14:"¼",frac15:"⅕",frac16:"⅙",frac18:"⅛",frac23:"⅔",frac25:"⅖",frac34:"¾",frac35:"⅗",frac38:"⅜",frac45:"⅘",frac56:"⅚",frac58:"⅝",frac78:"⅞",frasl:"⁄",frown:"⌢",Fscr:"ℱ",fscr:"𝒻",gacute:"ǵ",Gamma:"Γ",gamma:"γ",Gammad:"Ϝ",gammad:"ϝ",gap:"⪆",Gbreve:"Ğ",gbreve:"ğ",Gcedil:"Ģ",Gcirc:"Ĝ",gcirc:"ĝ",Gcy:"Г",gcy:"г",Gdot:"Ġ",gdot:"ġ",gE:"≧",ge:"≥",gEl:"⪌",gel:"⋛",geq:"≥",geqq:"≧",geqslant:"⩾",ges:"⩾",gescc:"⪩",gesdot:"⪀",gesdoto:"⪂",gesdotol:"⪄",gesl:"⋛︀",gesles:"⪔",Gfr:"𝔊",gfr:"𝔤",Gg:"⋙",gg:"≫",ggg:"⋙",gimel:"ℷ",GJcy:"Ѓ",gjcy:"ѓ",gl:"≷",gla:"⪥",glE:"⪒",glj:"⪤",gnap:"⪊",gnapprox:"⪊",gnE:"≩",gne:"⪈",gneq:"⪈",gneqq:"≩",gnsim:"⋧",Gopf:"𝔾",gopf:"𝕘",grave:"`",GreaterEqual:"≥",GreaterEqualLess:"⋛",GreaterFullEqual:"≧",GreaterGreater:"⪢",GreaterLess:"≷",GreaterSlantEqual:"⩾",GreaterTilde:"≳",Gscr:"𝒢",gscr:"ℊ",gsim:"≳",gsime:"⪎",gsiml:"⪐",GT:">",Gt:"≫",gt:">",gtcc:"⪧",gtcir:"⩺",gtdot:"⋗",gtlPar:"⦕",gtquest:"⩼",gtrapprox:"⪆",gtrarr:"⥸",gtrdot:"⋗",gtreqless:"⋛",gtreqqless:"⪌",gtrless:"≷",gtrsim:"≳",gvertneqq:"≩︀",gvnE:"≩︀",Hacek:"ˇ",hairsp:" ",half:"½",hamilt:"ℋ",HARDcy:"Ъ",hardcy:"ъ",hArr:"⇔",harr:"↔",harrcir:"⥈",harrw:"↭",Hat:"^",hbar:"ℏ",Hcirc:"Ĥ",hcirc:"ĥ",hearts:"♥",heartsuit:"♥",hellip:"…",hercon:"⊹",Hfr:"ℌ",hfr:"𝔥",HilbertSpace:"ℋ",hksearow:"⤥",hkswarow:"⤦",hoarr:"⇿",homtht:"∻",hookleftarrow:"↩",hookrightarrow:"↪",Hopf:"ℍ",hopf:"𝕙",horbar:"―",HorizontalLine:"─",Hscr:"ℋ",hscr:"𝒽",hslash:"ℏ",Hstrok:"Ħ",hstrok:"ħ",HumpDownHump:"≎",HumpEqual:"≏",hybull:"⁃",hyphen:"‐",Iacute:"Í",iacute:"í",ic:"⁣",Icirc:"Î",icirc:"î",Icy:"И",icy:"и",Idot:"İ",IEcy:"Е",iecy:"е",iexcl:"¡",iff:"⇔",Ifr:"ℑ",ifr:"𝔦",Igrave:"Ì",igrave:"ì",ii:"ⅈ",iiiint:"⨌",iiint:"∭",iinfin:"⧜",iiota:"℩",IJlig:"IJ",ijlig:"ij",Im:"ℑ",Imacr:"Ī",imacr:"ī",image:"ℑ",ImaginaryI:"ⅈ",imagline:"ℐ",imagpart:"ℑ",imath:"ı",imof:"⊷",imped:"Ƶ",Implies:"⇒",in:"∈",incare:"℅",infin:"∞",infintie:"⧝",inodot:"ı",Int:"∬",int:"∫",intcal:"⊺",integers:"ℤ",Integral:"∫",intercal:"⊺",Intersection:"⋂",intlarhk:"⨗",intprod:"⨼",InvisibleComma:"⁣",InvisibleTimes:"⁢",IOcy:"Ё",iocy:"ё",Iogon:"Į",iogon:"į",Iopf:"𝕀",iopf:"𝕚",Iota:"Ι",iota:"ι",iprod:"⨼",iquest:"¿",Iscr:"ℐ",iscr:"𝒾",isin:"∈",isindot:"⋵",isinE:"⋹",isins:"⋴",isinsv:"⋳",isinv:"∈",it:"⁢",Itilde:"Ĩ",itilde:"ĩ",Iukcy:"І",iukcy:"і",Iuml:"Ï",iuml:"ï",Jcirc:"Ĵ",jcirc:"ĵ",Jcy:"Й",jcy:"й",Jfr:"𝔍",jfr:"𝔧",jmath:"ȷ",Jopf:"𝕁",jopf:"𝕛",Jscr:"𝒥",jscr:"𝒿",Jsercy:"Ј",jsercy:"ј",Jukcy:"Є",jukcy:"є",Kappa:"Κ",kappa:"κ",kappav:"ϰ",Kcedil:"Ķ",kcedil:"ķ",Kcy:"К",kcy:"к",Kfr:"𝔎",kfr:"𝔨",kgreen:"ĸ",KHcy:"Х",khcy:"х",KJcy:"Ќ",kjcy:"ќ",Kopf:"𝕂",kopf:"𝕜",Kscr:"𝒦",kscr:"𝓀",lAarr:"⇚",Lacute:"Ĺ",lacute:"ĺ",laemptyv:"⦴",lagran:"ℒ",Lambda:"Λ",lambda:"λ",Lang:"⟪",lang:"⟨",langd:"⦑",langle:"⟨",lap:"⪅",Laplacetrf:"ℒ",laquo:"«",Larr:"↞",lArr:"⇐",larr:"←",larrb:"⇤",larrbfs:"⤟",larrfs:"⤝",larrhk:"↩",larrlp:"↫",larrpl:"⤹",larrsim:"⥳",larrtl:"↢",lat:"⪫",lAtail:"⤛",latail:"⤙",late:"⪭",lates:"⪭︀",lBarr:"⤎",lbarr:"⤌",lbbrk:"❲",lbrace:"{",lbrack:"[",lbrke:"⦋",lbrksld:"⦏",lbrkslu:"⦍",Lcaron:"Ľ",lcaron:"ľ",Lcedil:"Ļ",lcedil:"ļ",lceil:"⌈",lcub:"{",Lcy:"Л",lcy:"л",ldca:"⤶",ldquo:"“",ldquor:"„",ldrdhar:"⥧",ldrushar:"⥋",ldsh:"↲",lE:"≦",le:"≤",LeftAngleBracket:"⟨",LeftArrow:"←",Leftarrow:"⇐",leftarrow:"←",LeftArrowBar:"⇤",LeftArrowRightArrow:"⇆",leftarrowtail:"↢",LeftCeiling:"⌈",LeftDoubleBracket:"⟦",LeftDownTeeVector:"⥡",LeftDownVector:"⇃",LeftDownVectorBar:"⥙",LeftFloor:"⌊",leftharpoondown:"↽",leftharpoonup:"↼",leftleftarrows:"⇇",LeftRightArrow:"↔",Leftrightarrow:"⇔",leftrightarrow:"↔",leftrightarrows:"⇆",leftrightharpoons:"⇋",leftrightsquigarrow:"↭",LeftRightVector:"⥎",LeftTee:"⊣",LeftTeeArrow:"↤",LeftTeeVector:"⥚",leftthreetimes:"⋋",LeftTriangle:"⊲",LeftTriangleBar:"⧏",LeftTriangleEqual:"⊴",LeftUpDownVector:"⥑",LeftUpTeeVector:"⥠",LeftUpVector:"↿",LeftUpVectorBar:"⥘",LeftVector:"↼",LeftVectorBar:"⥒",lEg:"⪋",leg:"⋚",leq:"≤",leqq:"≦",leqslant:"⩽",les:"⩽",lescc:"⪨",lesdot:"⩿",lesdoto:"⪁",lesdotor:"⪃",lesg:"⋚︀",lesges:"⪓",lessapprox:"⪅",lessdot:"⋖",lesseqgtr:"⋚",lesseqqgtr:"⪋",LessEqualGreater:"⋚",LessFullEqual:"≦",LessGreater:"≶",lessgtr:"≶",LessLess:"⪡",lesssim:"≲",LessSlantEqual:"⩽",LessTilde:"≲",lfisht:"⥼",lfloor:"⌊",Lfr:"𝔏",lfr:"𝔩",lg:"≶",lgE:"⪑",lHar:"⥢",lhard:"↽",lharu:"↼",lharul:"⥪",lhblk:"▄",LJcy:"Љ",ljcy:"љ",Ll:"⋘",ll:"≪",llarr:"⇇",llcorner:"⌞",Lleftarrow:"⇚",llhard:"⥫",lltri:"◺",Lmidot:"Ŀ",lmidot:"ŀ",lmoust:"⎰",lmoustache:"⎰",lnap:"⪉",lnapprox:"⪉",lnE:"≨",lne:"⪇",lneq:"⪇",lneqq:"≨",lnsim:"⋦",loang:"⟬",loarr:"⇽",lobrk:"⟦",LongLeftArrow:"⟵",Longleftarrow:"⟸",longleftarrow:"⟵",LongLeftRightArrow:"⟷",Longleftrightarrow:"⟺",longleftrightarrow:"⟷",longmapsto:"⟼",LongRightArrow:"⟶",Longrightarrow:"⟹",longrightarrow:"⟶",looparrowleft:"↫",looparrowright:"↬",lopar:"⦅",Lopf:"𝕃",lopf:"𝕝",loplus:"⨭",lotimes:"⨴",lowast:"∗",lowbar:"_",LowerLeftArrow:"↙",LowerRightArrow:"↘",loz:"◊",lozenge:"◊",lozf:"⧫",lpar:"(",lparlt:"⦓",lrarr:"⇆",lrcorner:"⌟",lrhar:"⇋",lrhard:"⥭",lrm:"‎",lrtri:"⊿",lsaquo:"‹",Lscr:"ℒ",lscr:"𝓁",Lsh:"↰",lsh:"↰",lsim:"≲",lsime:"⪍",lsimg:"⪏",lsqb:"[",lsquo:"‘",lsquor:"‚",Lstrok:"Ł",lstrok:"ł",LT:"<",Lt:"≪",lt:"<",ltcc:"⪦",ltcir:"⩹",ltdot:"⋖",lthree:"⋋",ltimes:"⋉",ltlarr:"⥶",ltquest:"⩻",ltri:"◃",ltrie:"⊴",ltrif:"◂",ltrPar:"⦖",lurdshar:"⥊",luruhar:"⥦",lvertneqq:"≨︀",lvnE:"≨︀",macr:"¯",male:"♂",malt:"✠",maltese:"✠",Map:"⤅",map:"↦",mapsto:"↦",mapstodown:"↧",mapstoleft:"↤",mapstoup:"↥",marker:"▮",mcomma:"⨩",Mcy:"М",mcy:"м",mdash:"—",mDDot:"∺",measuredangle:"∡",MediumSpace:" ",Mellintrf:"ℳ",Mfr:"𝔐",mfr:"𝔪",mho:"℧",micro:"µ",mid:"∣",midast:"*",midcir:"⫰",middot:"·",minus:"−",minusb:"⊟",minusd:"∸",minusdu:"⨪",MinusPlus:"∓",mlcp:"⫛",mldr:"…",mnplus:"∓",models:"⊧",Mopf:"𝕄",mopf:"𝕞",mp:"∓",Mscr:"ℳ",mscr:"𝓂",mstpos:"∾",Mu:"Μ",mu:"μ",multimap:"⊸",mumap:"⊸",nabla:"∇",Nacute:"Ń",nacute:"ń",nang:"∠⃒",nap:"≉",napE:"⩰̸",napid:"≋̸",napos:"ʼn",napprox:"≉",natur:"♮",natural:"♮",naturals:"ℕ",nbsp:" ",nbump:"≎̸",nbumpe:"≏̸",ncap:"⩃",Ncaron:"Ň",ncaron:"ň",Ncedil:"Ņ",ncedil:"ņ",ncong:"≇",ncongdot:"⩭̸",ncup:"⩂",Ncy:"Н",ncy:"н",ndash:"–",ne:"≠",nearhk:"⤤",neArr:"⇗",nearr:"↗",nearrow:"↗",nedot:"≐̸",NegativeMediumSpace:"​",NegativeThickSpace:"​",NegativeThinSpace:"​",NegativeVeryThinSpace:"​",nequiv:"≢",nesear:"⤨",nesim:"≂̸",NestedGreaterGreater:"≫",NestedLessLess:"≪",NewLine:"\n",nexist:"∄",nexists:"∄",Nfr:"𝔑",nfr:"𝔫",ngE:"≧̸",nge:"≱",ngeq:"≱",ngeqq:"≧̸",ngeqslant:"⩾̸",nges:"⩾̸",nGg:"⋙̸",ngsim:"≵",nGt:"≫⃒",ngt:"≯",ngtr:"≯",nGtv:"≫̸",nhArr:"⇎",nharr:"↮",nhpar:"⫲",ni:"∋",nis:"⋼",nisd:"⋺",niv:"∋",NJcy:"Њ",njcy:"њ",nlArr:"⇍",nlarr:"↚",nldr:"‥",nlE:"≦̸",nle:"≰",nLeftarrow:"⇍",nleftarrow:"↚",nLeftrightarrow:"⇎",nleftrightarrow:"↮",nleq:"≰",nleqq:"≦̸",nleqslant:"⩽̸",nles:"⩽̸",nless:"≮",nLl:"⋘̸",nlsim:"≴",nLt:"≪⃒",nlt:"≮",nltri:"⋪",nltrie:"⋬",nLtv:"≪̸",nmid:"∤",NoBreak:"⁠",NonBreakingSpace:" ",Nopf:"ℕ",nopf:"𝕟",Not:"⫬",not:"¬",NotCongruent:"≢",NotCupCap:"≭",NotDoubleVerticalBar:"∦",NotElement:"∉",NotEqual:"≠",NotEqualTilde:"≂̸",NotExists:"∄",NotGreater:"≯",NotGreaterEqual:"≱",NotGreaterFullEqual:"≧̸",NotGreaterGreater:"≫̸",NotGreaterLess:"≹",NotGreaterSlantEqual:"⩾̸",NotGreaterTilde:"≵",NotHumpDownHump:"≎̸",NotHumpEqual:"≏̸",notin:"∉",notindot:"⋵̸",notinE:"⋹̸",notinva:"∉",notinvb:"⋷",notinvc:"⋶",NotLeftTriangle:"⋪",NotLeftTriangleBar:"⧏̸",NotLeftTriangleEqual:"⋬",NotLess:"≮",NotLessEqual:"≰",NotLessGreater:"≸",NotLessLess:"≪̸",NotLessSlantEqual:"⩽̸",NotLessTilde:"≴",NotNestedGreaterGreater:"⪢̸",NotNestedLessLess:"⪡̸",notni:"∌",notniva:"∌",notnivb:"⋾",notnivc:"⋽",NotPrecedes:"⊀",NotPrecedesEqual:"⪯̸",NotPrecedesSlantEqual:"⋠",NotReverseElement:"∌",NotRightTriangle:"⋫",NotRightTriangleBar:"⧐̸",NotRightTriangleEqual:"⋭",NotSquareSubset:"⊏̸",NotSquareSubsetEqual:"⋢",NotSquareSuperset:"⊐̸",NotSquareSupersetEqual:"⋣",NotSubset:"⊂⃒",NotSubsetEqual:"⊈",NotSucceeds:"⊁",NotSucceedsEqual:"⪰̸",NotSucceedsSlantEqual:"⋡",NotSucceedsTilde:"≿̸",NotSuperset:"⊃⃒",NotSupersetEqual:"⊉",NotTilde:"≁",NotTildeEqual:"≄",NotTildeFullEqual:"≇",NotTildeTilde:"≉",NotVerticalBar:"∤",npar:"∦",nparallel:"∦",nparsl:"⫽⃥",npart:"∂̸",npolint:"⨔",npr:"⊀",nprcue:"⋠",npre:"⪯̸",nprec:"⊀",npreceq:"⪯̸",nrArr:"⇏",nrarr:"↛",nrarrc:"⤳̸",nrarrw:"↝̸",nRightarrow:"⇏",nrightarrow:"↛",nrtri:"⋫",nrtrie:"⋭",nsc:"⊁",nsccue:"⋡",nsce:"⪰̸",Nscr:"𝒩",nscr:"𝓃",nshortmid:"∤",nshortparallel:"∦",nsim:"≁",nsime:"≄",nsimeq:"≄",nsmid:"∤",nspar:"∦",nsqsube:"⋢",nsqsupe:"⋣",nsub:"⊄",nsubE:"⫅̸",nsube:"⊈",nsubset:"⊂⃒",nsubseteq:"⊈",nsubseteqq:"⫅̸",nsucc:"⊁",nsucceq:"⪰̸",nsup:"⊅",nsupE:"⫆̸",nsupe:"⊉",nsupset:"⊃⃒",nsupseteq:"⊉",nsupseteqq:"⫆̸",ntgl:"≹",Ntilde:"Ñ",ntilde:"ñ",ntlg:"≸",ntriangleleft:"⋪",ntrianglelefteq:"⋬",ntriangleright:"⋫",ntrianglerighteq:"⋭",Nu:"Ν",nu:"ν",num:"#",numero:"№",numsp:" ",nvap:"≍⃒",nVDash:"⊯",nVdash:"⊮",nvDash:"⊭",nvdash:"⊬",nvge:"≥⃒",nvgt:">⃒",nvHarr:"⤄",nvinfin:"⧞",nvlArr:"⤂",nvle:"≤⃒",nvlt:"<⃒",nvltrie:"⊴⃒",nvrArr:"⤃",nvrtrie:"⊵⃒",nvsim:"∼⃒",nwarhk:"⤣",nwArr:"⇖",nwarr:"↖",nwarrow:"↖",nwnear:"⤧",Oacute:"Ó",oacute:"ó",oast:"⊛",ocir:"⊚",Ocirc:"Ô",ocirc:"ô",Ocy:"О",ocy:"о",odash:"⊝",Odblac:"Ő",odblac:"ő",odiv:"⨸",odot:"⊙",odsold:"⦼",OElig:"Œ",oelig:"œ",ofcir:"⦿",Ofr:"𝔒",ofr:"𝔬",ogon:"˛",Ograve:"Ò",ograve:"ò",ogt:"⧁",ohbar:"⦵",ohm:"Ω",oint:"∮",olarr:"↺",olcir:"⦾",olcross:"⦻",oline:"‾",olt:"⧀",Omacr:"Ō",omacr:"ō",Omega:"Ω",omega:"ω",Omicron:"Ο",omicron:"ο",omid:"⦶",ominus:"⊖",Oopf:"𝕆",oopf:"𝕠",opar:"⦷",OpenCurlyDoubleQuote:"“",OpenCurlyQuote:"‘",operp:"⦹",oplus:"⊕",Or:"⩔",or:"∨",orarr:"↻",ord:"⩝",order:"ℴ",orderof:"ℴ",ordf:"ª",ordm:"º",origof:"⊶",oror:"⩖",orslope:"⩗",orv:"⩛",oS:"Ⓢ",Oscr:"𝒪",oscr:"ℴ",Oslash:"Ø",oslash:"ø",osol:"⊘",Otilde:"Õ",otilde:"õ",Otimes:"⨷",otimes:"⊗",otimesas:"⨶",Ouml:"Ö",ouml:"ö",ovbar:"⌽",OverBar:"‾",OverBrace:"⏞",OverBracket:"⎴",OverParenthesis:"⏜",par:"∥",para:"¶",parallel:"∥",parsim:"⫳",parsl:"⫽",part:"∂",PartialD:"∂",Pcy:"П",pcy:"п",percnt:"%",period:".",permil:"‰",perp:"⊥",pertenk:"‱",Pfr:"𝔓",pfr:"𝔭",Phi:"Φ",phi:"φ",phiv:"ϕ",phmmat:"ℳ",phone:"☎",Pi:"Π",pi:"π",pitchfork:"⋔",piv:"ϖ",planck:"ℏ",planckh:"ℎ",plankv:"ℏ",plus:"+",plusacir:"⨣",plusb:"⊞",pluscir:"⨢",plusdo:"∔",plusdu:"⨥",pluse:"⩲",PlusMinus:"±",plusmn:"±",plussim:"⨦",plustwo:"⨧",pm:"±",Poincareplane:"ℌ",pointint:"⨕",Popf:"ℙ",popf:"𝕡",pound:"£",Pr:"⪻",pr:"≺",prap:"⪷",prcue:"≼",prE:"⪳",pre:"⪯",prec:"≺",precapprox:"⪷",preccurlyeq:"≼",Precedes:"≺",PrecedesEqual:"⪯",PrecedesSlantEqual:"≼",PrecedesTilde:"≾",preceq:"⪯",precnapprox:"⪹",precneqq:"⪵",precnsim:"⋨",precsim:"≾",Prime:"″",prime:"′",primes:"ℙ",prnap:"⪹",prnE:"⪵",prnsim:"⋨",prod:"∏",Product:"∏",profalar:"⌮",profline:"⌒",profsurf:"⌓",prop:"∝",Proportion:"∷",Proportional:"∝",propto:"∝",prsim:"≾",prurel:"⊰",Pscr:"𝒫",pscr:"𝓅",Psi:"Ψ",psi:"ψ",puncsp:" ",Qfr:"𝔔",qfr:"𝔮",qint:"⨌",Qopf:"ℚ",qopf:"𝕢",qprime:"⁗",Qscr:"𝒬",qscr:"𝓆",quaternions:"ℍ",quatint:"⨖",quest:"?",questeq:"≟",QUOT:'"',quot:'"',rAarr:"⇛",race:"∽̱",Racute:"Ŕ",racute:"ŕ",radic:"√",raemptyv:"⦳",Rang:"⟫",rang:"⟩",rangd:"⦒",range:"⦥",rangle:"⟩",raquo:"»",Rarr:"↠",rArr:"⇒",rarr:"→",rarrap:"⥵",rarrb:"⇥",rarrbfs:"⤠",rarrc:"⤳",rarrfs:"⤞",rarrhk:"↪",rarrlp:"↬",rarrpl:"⥅",rarrsim:"⥴",Rarrtl:"⤖",rarrtl:"↣",rarrw:"↝",rAtail:"⤜",ratail:"⤚",ratio:"∶",rationals:"ℚ",RBarr:"⤐",rBarr:"⤏",rbarr:"⤍",rbbrk:"❳",rbrace:"}",rbrack:"]",rbrke:"⦌",rbrksld:"⦎",rbrkslu:"⦐",Rcaron:"Ř",rcaron:"ř",Rcedil:"Ŗ",rcedil:"ŗ",rceil:"⌉",rcub:"}",Rcy:"Р",rcy:"р",rdca:"⤷",rdldhar:"⥩",rdquo:"”",rdquor:"”",rdsh:"↳",Re:"ℜ",real:"ℜ",realine:"ℛ",realpart:"ℜ",reals:"ℝ",rect:"▭",REG:"®",reg:"®",ReverseElement:"∋",ReverseEquilibrium:"⇋",ReverseUpEquilibrium:"⥯",rfisht:"⥽",rfloor:"⌋",Rfr:"ℜ",rfr:"𝔯",rHar:"⥤",rhard:"⇁",rharu:"⇀",rharul:"⥬",Rho:"Ρ",rho:"ρ",rhov:"ϱ",RightAngleBracket:"⟩",RightArrow:"→",Rightarrow:"⇒",rightarrow:"→",RightArrowBar:"⇥",RightArrowLeftArrow:"⇄",rightarrowtail:"↣",RightCeiling:"⌉",RightDoubleBracket:"⟧",RightDownTeeVector:"⥝",RightDownVector:"⇂",RightDownVectorBar:"⥕",RightFloor:"⌋",rightharpoondown:"⇁",rightharpoonup:"⇀",rightleftarrows:"⇄",rightleftharpoons:"⇌",rightrightarrows:"⇉",rightsquigarrow:"↝",RightTee:"⊢",RightTeeArrow:"↦",RightTeeVector:"⥛",rightthreetimes:"⋌",RightTriangle:"⊳",RightTriangleBar:"⧐",RightTriangleEqual:"⊵",RightUpDownVector:"⥏",RightUpTeeVector:"⥜",RightUpVector:"↾",RightUpVectorBar:"⥔",RightVector:"⇀",RightVectorBar:"⥓",ring:"˚",risingdotseq:"≓",rlarr:"⇄",rlhar:"⇌",rlm:"‏",rmoust:"⎱",rmoustache:"⎱",rnmid:"⫮",roang:"⟭",roarr:"⇾",robrk:"⟧",ropar:"⦆",Ropf:"ℝ",ropf:"𝕣",roplus:"⨮",rotimes:"⨵",RoundImplies:"⥰",rpar:")",rpargt:"⦔",rppolint:"⨒",rrarr:"⇉",Rrightarrow:"⇛",rsaquo:"›",Rscr:"ℛ",rscr:"𝓇",Rsh:"↱",rsh:"↱",rsqb:"]",rsquo:"’",rsquor:"’",rthree:"⋌",rtimes:"⋊",rtri:"▹",rtrie:"⊵",rtrif:"▸",rtriltri:"⧎",RuleDelayed:"⧴",ruluhar:"⥨",rx:"℞",Sacute:"Ś",sacute:"ś",sbquo:"‚",Sc:"⪼",sc:"≻",scap:"⪸",Scaron:"Š",scaron:"š",sccue:"≽",scE:"⪴",sce:"⪰",Scedil:"Ş",scedil:"ş",Scirc:"Ŝ",scirc:"ŝ",scnap:"⪺",scnE:"⪶",scnsim:"⋩",scpolint:"⨓",scsim:"≿",Scy:"С",scy:"с",sdot:"⋅",sdotb:"⊡",sdote:"⩦",searhk:"⤥",seArr:"⇘",searr:"↘",searrow:"↘",sect:"§",semi:";",seswar:"⤩",setminus:"∖",setmn:"∖",sext:"✶",Sfr:"𝔖",sfr:"𝔰",sfrown:"⌢",sharp:"♯",SHCHcy:"Щ",shchcy:"щ",SHcy:"Ш",shcy:"ш",ShortDownArrow:"↓",ShortLeftArrow:"←",shortmid:"∣",shortparallel:"∥",ShortRightArrow:"→",ShortUpArrow:"↑",shy:"­",Sigma:"Σ",sigma:"σ",sigmaf:"ς",sigmav:"ς",sim:"∼",simdot:"⩪",sime:"≃",simeq:"≃",simg:"⪞",simgE:"⪠",siml:"⪝",simlE:"⪟",simne:"≆",simplus:"⨤",simrarr:"⥲",slarr:"←",SmallCircle:"∘",smallsetminus:"∖",smashp:"⨳",smeparsl:"⧤",smid:"∣",smile:"⌣",smt:"⪪",smte:"⪬",smtes:"⪬︀",SOFTcy:"Ь",softcy:"ь",sol:"/",solb:"⧄",solbar:"⌿",Sopf:"𝕊",sopf:"𝕤",spades:"♠",spadesuit:"♠",spar:"∥",sqcap:"⊓",sqcaps:"⊓︀",sqcup:"⊔",sqcups:"⊔︀",Sqrt:"√",sqsub:"⊏",sqsube:"⊑",sqsubset:"⊏",sqsubseteq:"⊑",sqsup:"⊐",sqsupe:"⊒",sqsupset:"⊐",sqsupseteq:"⊒",squ:"□",Square:"□",square:"□",SquareIntersection:"⊓",SquareSubset:"⊏",SquareSubsetEqual:"⊑",SquareSuperset:"⊐",SquareSupersetEqual:"⊒",SquareUnion:"⊔",squarf:"▪",squf:"▪",srarr:"→",Sscr:"𝒮",sscr:"𝓈",ssetmn:"∖",ssmile:"⌣",sstarf:"⋆",Star:"⋆",star:"☆",starf:"★",straightepsilon:"ϵ",straightphi:"ϕ",strns:"¯",Sub:"⋐",sub:"⊂",subdot:"⪽",subE:"⫅",sube:"⊆",subedot:"⫃",submult:"⫁",subnE:"⫋",subne:"⊊",subplus:"⪿",subrarr:"⥹",Subset:"⋐",subset:"⊂",subseteq:"⊆",subseteqq:"⫅",SubsetEqual:"⊆",subsetneq:"⊊",subsetneqq:"⫋",subsim:"⫇",subsub:"⫕",subsup:"⫓",succ:"≻",succapprox:"⪸",succcurlyeq:"≽",Succeeds:"≻",SucceedsEqual:"⪰",SucceedsSlantEqual:"≽",SucceedsTilde:"≿",succeq:"⪰",succnapprox:"⪺",succneqq:"⪶",succnsim:"⋩",succsim:"≿",SuchThat:"∋",Sum:"∑",sum:"∑",sung:"♪",Sup:"⋑",sup:"⊃",sup1:"¹",sup2:"²",sup3:"³",supdot:"⪾",supdsub:"⫘",supE:"⫆",supe:"⊇",supedot:"⫄",Superset:"⊃",SupersetEqual:"⊇",suphsol:"⟉",suphsub:"⫗",suplarr:"⥻",supmult:"⫂",supnE:"⫌",supne:"⊋",supplus:"⫀",Supset:"⋑",supset:"⊃",supseteq:"⊇",supseteqq:"⫆",supsetneq:"⊋",supsetneqq:"⫌",supsim:"⫈",supsub:"⫔",supsup:"⫖",swarhk:"⤦",swArr:"⇙",swarr:"↙",swarrow:"↙",swnwar:"⤪",szlig:"ß",Tab:"\t",target:"⌖",Tau:"Τ",tau:"τ",tbrk:"⎴",Tcaron:"Ť",tcaron:"ť",Tcedil:"Ţ",tcedil:"ţ",Tcy:"Т",tcy:"т",tdot:"⃛",telrec:"⌕",Tfr:"𝔗",tfr:"𝔱",there4:"∴",Therefore:"∴",therefore:"∴",Theta:"Θ",theta:"θ",thetasym:"ϑ",thetav:"ϑ",thickapprox:"≈",thicksim:"∼",ThickSpace:"  ",thinsp:" ",ThinSpace:" ",thkap:"≈",thksim:"∼",THORN:"Þ",thorn:"þ",Tilde:"∼",tilde:"˜",TildeEqual:"≃",TildeFullEqual:"≅",TildeTilde:"≈",times:"×",timesb:"⊠",timesbar:"⨱",timesd:"⨰",tint:"∭",toea:"⤨",top:"⊤",topbot:"⌶",topcir:"⫱",Topf:"𝕋",topf:"𝕥",topfork:"⫚",tosa:"⤩",tprime:"‴",TRADE:"™",trade:"™",triangle:"▵",triangledown:"▿",triangleleft:"◃",trianglelefteq:"⊴",triangleq:"≜",triangleright:"▹",trianglerighteq:"⊵",tridot:"◬",trie:"≜",triminus:"⨺",TripleDot:"⃛",triplus:"⨹",trisb:"⧍",tritime:"⨻",trpezium:"⏢",Tscr:"𝒯",tscr:"𝓉",TScy:"Ц",tscy:"ц",TSHcy:"Ћ",tshcy:"ћ",Tstrok:"Ŧ",tstrok:"ŧ",twixt:"≬",twoheadleftarrow:"↞",twoheadrightarrow:"↠",Uacute:"Ú",uacute:"ú",Uarr:"↟",uArr:"⇑",uarr:"↑",Uarrocir:"⥉",Ubrcy:"Ў",ubrcy:"ў",Ubreve:"Ŭ",ubreve:"ŭ",Ucirc:"Û",ucirc:"û",Ucy:"У",ucy:"у",udarr:"⇅",Udblac:"Ű",udblac:"ű",udhar:"⥮",ufisht:"⥾",Ufr:"𝔘",ufr:"𝔲",Ugrave:"Ù",ugrave:"ù",uHar:"⥣",uharl:"↿",uharr:"↾",uhblk:"▀",ulcorn:"⌜",ulcorner:"⌜",ulcrop:"⌏",ultri:"◸",Umacr:"Ū",umacr:"ū",uml:"¨",UnderBar:"_",UnderBrace:"⏟",UnderBracket:"⎵",UnderParenthesis:"⏝",Union:"⋃",UnionPlus:"⊎",Uogon:"Ų",uogon:"ų",Uopf:"𝕌",uopf:"𝕦",UpArrow:"↑",Uparrow:"⇑",uparrow:"↑",UpArrowBar:"⤒",UpArrowDownArrow:"⇅",UpDownArrow:"↕",Updownarrow:"⇕",updownarrow:"↕",UpEquilibrium:"⥮",upharpoonleft:"↿",upharpoonright:"↾",uplus:"⊎",UpperLeftArrow:"↖",UpperRightArrow:"↗",Upsi:"ϒ",upsi:"υ",upsih:"ϒ",Upsilon:"Υ",upsilon:"υ",UpTee:"⊥",UpTeeArrow:"↥",upuparrows:"⇈",urcorn:"⌝",urcorner:"⌝",urcrop:"⌎",Uring:"Ů",uring:"ů",urtri:"◹",Uscr:"𝒰",uscr:"𝓊",utdot:"⋰",Utilde:"Ũ",utilde:"ũ",utri:"▵",utrif:"▴",uuarr:"⇈",Uuml:"Ü",uuml:"ü",uwangle:"⦧",vangrt:"⦜",varepsilon:"ϵ",varkappa:"ϰ",varnothing:"∅",varphi:"ϕ",varpi:"ϖ",varpropto:"∝",vArr:"⇕",varr:"↕",varrho:"ϱ",varsigma:"ς",varsubsetneq:"⊊︀",varsubsetneqq:"⫋︀",varsupsetneq:"⊋︀",varsupsetneqq:"⫌︀",vartheta:"ϑ",vartriangleleft:"⊲",vartriangleright:"⊳",Vbar:"⫫",vBar:"⫨",vBarv:"⫩",Vcy:"В",vcy:"в",VDash:"⊫",Vdash:"⊩",vDash:"⊨",vdash:"⊢",Vdashl:"⫦",Vee:"⋁",vee:"∨",veebar:"⊻",veeeq:"≚",vellip:"⋮",Verbar:"‖",verbar:"|",Vert:"‖",vert:"|",VerticalBar:"∣",VerticalLine:"|",VerticalSeparator:"❘",VerticalTilde:"≀",VeryThinSpace:" ",Vfr:"𝔙",vfr:"𝔳",vltri:"⊲",vnsub:"⊂⃒",vnsup:"⊃⃒",Vopf:"𝕍",vopf:"𝕧",vprop:"∝",vrtri:"⊳",Vscr:"𝒱",vscr:"𝓋",vsubnE:"⫋︀",vsubne:"⊊︀",vsupnE:"⫌︀",vsupne:"⊋︀",Vvdash:"⊪",vzigzag:"⦚",Wcirc:"Ŵ",wcirc:"ŵ",wedbar:"⩟",Wedge:"⋀",wedge:"∧",wedgeq:"≙",weierp:"℘",Wfr:"𝔚",wfr:"𝔴",Wopf:"𝕎",wopf:"𝕨",wp:"℘",wr:"≀",wreath:"≀",Wscr:"𝒲",wscr:"𝓌",xcap:"⋂",xcirc:"◯",xcup:"⋃",xdtri:"▽",Xfr:"𝔛",xfr:"𝔵",xhArr:"⟺",xharr:"⟷",Xi:"Ξ",xi:"ξ",xlArr:"⟸",xlarr:"⟵",xmap:"⟼",xnis:"⋻",xodot:"⨀",Xopf:"𝕏",xopf:"𝕩",xoplus:"⨁",xotime:"⨂",xrArr:"⟹",xrarr:"⟶",Xscr:"𝒳",xscr:"𝓍",xsqcup:"⨆",xuplus:"⨄",xutri:"△",xvee:"⋁",xwedge:"⋀",Yacute:"Ý",yacute:"ý",YAcy:"Я",yacy:"я",Ycirc:"Ŷ",ycirc:"ŷ",Ycy:"Ы",ycy:"ы",yen:"¥",Yfr:"𝔜",yfr:"𝔶",YIcy:"Ї",yicy:"ї",Yopf:"𝕐",yopf:"𝕪",Yscr:"𝒴",yscr:"𝓎",YUcy:"Ю",yucy:"ю",Yuml:"Ÿ",yuml:"ÿ",Zacute:"Ź",zacute:"ź",Zcaron:"Ž",zcaron:"ž",Zcy:"З",zcy:"з",Zdot:"Ż",zdot:"ż",zeetrf:"ℨ",ZeroWidthSpace:"​",Zeta:"Ζ",zeta:"ζ",Zfr:"ℨ",zfr:"𝔷",ZHcy:"Ж",zhcy:"ж",zigrarr:"⇝",Zopf:"ℤ",zopf:"𝕫",Zscr:"𝒵",zscr:"𝓏",zwj:"‍",zwnj:"‌"}},function(e,t,n){"use strict";var r=n(26).replaceEntities;e.exports=function(e){var t=r(e);try{t=decodeURI(t)}catch(e){}return encodeURI(t)}},function(e,t,n){"use strict";e.exports=function(e){return e.trim().replace(/\s+/g," ").toUpperCase()}},function(e,t,n){"use strict";var r=n(489),i=n(26).unescapeMd;e.exports=function(e,t){var n,o,a,s=t,u=e.posMax;if(60===e.src.charCodeAt(t)){for(t++;t<u;){if(10===(n=e.src.charCodeAt(t)))return!1;if(62===n)return a=r(i(e.src.slice(s+1,t))),!!e.parser.validateLink(a)&&(e.pos=t+1,e.linkContent=a,!0);92===n&&t+1<u?t+=2:t++}return!1}for(o=0;t<u&&32!==(n=e.src.charCodeAt(t))&&!(n>8&&n<14);)if(92===n&&t+1<u)t+=2;else{if(40===n&&++o>1)break;if(41===n&&--o<0)break;t++}return s!==t&&(a=i(e.src.slice(s,t)),!!e.parser.validateLink(a)&&(e.linkContent=a,e.pos=t,!0))}},function(e,t,n){"use strict";var r=n(26).unescapeMd;e.exports=function(e,t){var n,i=t,o=e.posMax,a=e.src.charCodeAt(t);if(34!==a&&39!==a&&40!==a)return!1;for(t++,40===a&&(a=41);t<o;){if((n=e.src.charCodeAt(t))===a)return e.pos=t+1,e.linkContent=r(e.src.slice(i+1,t)),!0;92===n&&t+1<o?t+=2:t++}return!1}},function(e,t,n){function r(){i.call(this)}e.exports=r;var i=n(143).EventEmitter;n(42)(r,i),r.Readable=n(262),r.Writable=n(1115),r.Duplex=n(1110),r.Transform=n(1114),r.PassThrough=n(1113),r.Stream=r,r.prototype.pipe=function(e,t){function n(t){e.writable&&!1===e.write(t)&&l.pause&&l.pause()}function r(){l.readable&&l.resume&&l.resume()}function o(){c||(c=!0,e.end())}function a(){c||(c=!0,"function"==typeof e.destroy&&e.destroy())}function s(e){if(u(),0===i.listenerCount(this,"error"))throw e}function u(){l.removeListener("data",n),e.removeListener("drain",r),l.removeListener("end",o),l.removeListener("close",a),l.removeListener("error",s),e.removeListener("error",s),l.removeListener("end",u),l.removeListener("close",u),e.removeListener("close",u)}var l=this;l.on("data",n),e.on("drain",r),e._isStdio||t&&!1===t.end||(l.on("end",o),l.on("close",a));var c=!1;return l.on("error",s),e.on("error",s),l.on("end",u),l.on("close",u),e.on("close",u),e.emit("pipe",l),e}},function(e,t){/*! http://mths.be/repeat v0.2.0 by @mathias */
--String.prototype.repeat||function(){"use strict";var e=function(){try{var e={},t=Object.defineProperty,n=t(e,e,e)&&t}catch(e){}return n}(),t=function(e){if(null==this)throw TypeError();var t=String(this),n=e?Number(e):0;if(n!=n&&(n=0),n<0||n==1/0)throw RangeError();for(var r="";n;)n%2==1&&(r+=t),n>1&&(t+=t),n>>=1;return r};e?e(String.prototype,"repeat",{value:t,configurable:!0,writable:!0}):String.prototype.repeat=t}()},function(e,t,n){e.exports=function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,t),i.l=!0,i.exports}var n={};return t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=58)}([function(e,t){e.exports=n(47)},function(e,t){e.exports=n(30)},function(e,t){e.exports=n(48)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.openapi;return!!t&&(0,b.default)(t,"3")}function o(e){var t=e.swagger;return!!t&&(0,b.default)(t,"2")}function a(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"";return e&&"object"===(void 0===e?"undefined":(0,v.default)(e))?(e.operationId||"").replace(/\s/g,"").length?w(e.operationId):s(t,n):null}function s(e,t){return""+x(t)+w(e)}function u(e,t){return x(t)+"-"+e}function l(e,t){return e&&e.paths?c(e,function(e){var n=e.pathName,r=e.method,i=e.operation;if(!i||"object"!==(void 0===i?"undefined":(0,v.default)(i)))return!1;var o=i.operationId;return[a(i,n,r),u(n,r),o].some(function(e){return e&&e===t})}):null}function c(e,t){return p(e,t,!0)||null}function p(e,t,n){if(!e||"object"!==(void 0===e?"undefined":(0,v.default)(e))||!e.paths||"object"!==(0,v.default)(e.paths))return null;var r=e.paths;for(var i in r)for(var o in r[i])if("PARAMETERS"!==o.toUpperCase()){var a=r[i][o];if(a&&"object"===(void 0===a?"undefined":(0,v.default)(a))){var s={spec:e,pathName:i,method:o.toUpperCase(),operation:a},u=t(s);if(n&&u)return s}}}function f(e){var t=e.spec,n=t.paths,r={};if(!n)return e;for(var i in n){var o=n[i];if((0,y.default)(o)){var s=o.parameters;for(var u in o)!function(e){var n=o[e];if(!(0,y.default)(n))return"continue";var u=a(n,i,e);if(u){r[u]?r[u].push(n):r[u]=[n];var l=r[u];if(l.length>1)l.forEach(function(e,t){e.__originalOperationId=e.__originalOperationId||e.operationId,e.operationId=""+u+(t+1)});else if(void 0!==n.operationId){var c=l[0];c.__originalOperationId=c.__originalOperationId||n.operationId,c.operationId=u}}if("parameters"!==e){var p=[],f={};for(var h in t)"produces"!==h&&"consumes"!==h&&"security"!==h||(f[h]=t[h],p.push(f));if(s&&(f.parameters=s,p.push(f)),p.length){var m=!0,v=!1,g=void 0;try{for(var _,b=(0,d.default)(p);!(m=(_=b.next()).done);m=!0){var x=_.value;for(var w in x)if(n[w]){if("parameters"===w){var k=!0,E=!1,S=void 0;try{for(var C,A=(0,d.default)(x[w]);!(k=(C=A.next()).done);k=!0)!function(){var e=C.value;n[w].some(function(t){return t.name===e.name})||n[w].push(e)}()}catch(e){E=!0,S=e}finally{try{!k&&A.return&&A.return()}finally{if(E)throw S}}}}else n[w]=x[w]}}catch(e){v=!0,g=e}finally{try{!m&&b.return&&b.return()}finally{if(v)throw g}}}}}(u)}}return e}Object.defineProperty(t,"__esModule",{value:!0});var h=n(13),d=r(h),m=n(2),v=r(m);t.isOAS3=i,t.isSwagger2=o,t.opId=a,t.idFromPathMethod=s,t.legacyIdFromPathMethod=u,t.getOperationRaw=l,t.findOperation=c,t.eachOperation=p,t.normalizeSwagger=f;var g=n(51),y=r(g),_=n(19),b=r(_),x=function(e){return String.prototype.toLowerCase.call(e)},w=function(e){return e.replace(/[^\w]/gi,"_")}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return"object"===(void 0===e?"undefined":(0,b.default)(e))&&(t=e,e=t.url),t.headers=t.headers||{},A.mergeInQueryOrForm(t),t.requestInterceptor&&(t=t.requestInterceptor(t)||t),/multipart\/form-data/i.test(t.headers["content-type"]||t.headers["Content-Type"])&&(delete t.headers["content-type"],delete t.headers["Content-Type"]),(t.userFetch||fetch)(t.url,t).then(function(n){var r=A.serializeRes(n,e,t).then(function(e){return t.responseInterceptor&&(e=t.responseInterceptor(e)||e),e});if(!n.ok){var i=new Error(n.statusText);return i.statusCode=i.status=n.status,r.then(function(e){throw i.response=e,i},function(e){throw i.responseError=e,i})}return r})}function o(e,t){return"application/json"===t?JSON.parse(e):E.default.safeLoad(e)}function a(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=n.loadSpec,i=void 0!==r&&r,a={ok:e.ok,url:e.url||t,status:e.status,statusText:e.statusText,headers:s(e.headers)},u=a.headers["content-type"],l=i||D(u);return(l?e.text:e.blob||e.buffer).call(e).then(function(e){if(a.text=e,a.data=e,l)try{var t=o(e,u);a.body=t,a.obj=t}catch(e){a.parseError=e}return a})}function s(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t={};return"function"==typeof e.forEach?(e.forEach(function(e,n){void 0!==t[n]?(t[n]=Array.isArray(t[n])?t[n]:[t[n]],t[n].push(e)):t[n]=e}),t):t}function u(e){return"undefined"!=typeof File?e instanceof File:null!==e&&"object"===(void 0===e?"undefined":(0,b.default)(e))&&"function"==typeof e.pipe}function l(e,t){var n=e.collectionFormat,r=e.allowEmptyValue,i="object"===(void 0===e?"undefined":(0,b.default)(e))?e.value:e,o={csv:",",ssv:"%20",tsv:"%09",pipes:"|"};if(void 0===i&&r)return"";if(u(i)||"boolean"==typeof i)return i;var a=encodeURIComponent;return t&&(a=(0,C.default)(i)?function(e){return e}:function(e){return(0,y.default)(e)}),"object"!==(void 0===i?"undefined":(0,b.default)(i))||Array.isArray(i)?Array.isArray(i)?Array.isArray(i)&&!n?i.map(a).join(","):"multi"===n?i.map(a):i.map(a).join(o[n]):a(i):""}function c(e){var t=(0,v.default)(e).reduce(function(t,n){var r=e[n],i=!!r.skipEncoding,o=i?n:encodeURIComponent(n),a=function(e){return e&&"object"===(void 0===e?"undefined":(0,b.default)(e))}(r)&&!Array.isArray(r);return t[o]=l(a?r:{value:r},i),t},{});return w.default.stringify(t,{encode:!1,indices:!1})||""}function p(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=e.url,r=void 0===t?"":t,i=e.query,o=e.form;if(o){var a=(0,v.default)(o).some(function(e){return u(o[e].value)}),s=e.headers["content-type"]||e.headers["Content-Type"];if(a||/multipart\/form-data/i.test(s)){var p=n(46);e.body=new p,(0,v.default)(o).forEach(function(t){e.body.append(t,l(o[t],!0))})}else e.body=c(o);delete e.form}if(i){var f=r.split("?"),h=(0,d.default)(f,2),m=h[0],g=h[1],y="";if(g){var _=w.default.parse(g);(0,v.default)(i).forEach(function(e){return delete _[e]}),y=w.default.stringify(_,{encode:!0})}var b=function(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];var r=t.filter(function(e){return e}).join("&");return r?"?"+r:""}(y,c(i));e.url=m+b,delete e.query}return e}function f(e,t,n){return n=n||function(e){return e},t=t||function(e){return e},function(r){return"string"==typeof r&&(r={url:r}),A.mergeInQueryOrForm(r),r=t(r),n(e(r))}}Object.defineProperty(t,"__esModule",{value:!0}),t.shouldDownloadAsText=t.self=void 0;var h=n(38),d=r(h),m=n(0),v=r(m),g=n(6),y=r(g),_=n(2),b=r(_);t.default=i,t.serializeRes=a,t.serializeHeaders=s,t.encodeFormOrQuery=c,t.mergeInQueryOrForm=p,t.makeHttp=f,n(42);var x=n(55),w=r(x),k=n(47),E=r(k),S=n(53),C=r(S),A=t.self={serializeRes:a,mergeInQueryOrForm:p},D=t.shouldDownloadAsText=function(){return/(json|xml|yaml|text)\b/.test(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"")}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t,n){if(n=n||{},t=(0,z.default)({},t,{path:t.path&&o(t.path)}),"merge"===t.op){var r=I(e,t.path);(0,z.default)(r,t.value),W.default.applyPatch(e,[s(t.path,r)])}else if("mergeDeep"===t.op){var i=I(e,t.path),a=(0,z.default)({},i);(0,J.default)(i,t.value);for(var u in t.value)if(Object.prototype.hasOwnProperty.call(t.value,u)){var l=t.value[u];if(Array.isArray(l)){var c=a[u]||[];i[u]=c.concat(l)}}}else if("add"===t.op&&""===t.path&&k(t.value)){var p=(0,L.default)(t.value).reduce(function(e,n){return e.push({op:"add",path:"/"+o(n),value:t.value[n]}),e},[]);W.default.applyPatch(e,p)}else if("replace"===t.op&&""===t.path){var f=t.value;n.allowMetaPatches&&t.meta&&M(t)&&(Array.isArray(t.value)||k(t.value))&&(f=(0,z.default)({},f,t.meta)),e=f}else if(W.default.applyPatch(e,[t]),n.allowMetaPatches&&t.meta&&M(t)&&(Array.isArray(t.value)||k(t.value))){var h=I(e,t.path),d=(0,z.default)({},h,t.meta);W.default.applyPatch(e,[s(t.path,d)])}return e}function o(e){return Array.isArray(e)?e.length<1?"":"/"+e.map(function(e){return(e+"").replace(/~/g,"~0").replace(/\//g,"~1")}).join("/"):e}function a(e,t){return{op:"add",path:e,value:t}}function s(e,t,n){return{op:"replace",path:e,value:t,meta:n}}function u(e,t){return{op:"remove",path:e}}function l(e,t){return{type:"mutation",op:"merge",path:e,value:t}}function c(e,t){return{type:"mutation",op:"mergeDeep",path:e,value:t}}function p(e,t){return{type:"context",path:e,value:t}}function f(e,t){try{return d(e,v,t)}catch(e){return e}}function h(e,t){try{return d(e,m,t)}catch(e){return e}}function d(e,t,n){return w(x(e.filter(M).map(function(e){return t(e.value,n,e.path)})||[]))}function m(e,t,n){return n=n||[],Array.isArray(e)?e.map(function(e,r){return m(e,t,n.concat(r))}):k(e)?(0,L.default)(e).map(function(r){return m(e[r],t,n.concat(r))}):t(e,n[n.length-1],n)}function v(e,t,n){n=n||[];var r=[];if(n.length>0){var i=t(e,n[n.length-1],n);i&&(r=r.concat(i))}if(Array.isArray(e)){var o=e.map(function(e,r){return v(e,t,n.concat(r))});o&&(r=r.concat(o))}else if(k(e)){var a=(0,L.default)(e).map(function(r){return v(e[r],t,n.concat(r))});a&&(r=r.concat(a))}return r=x(r)}function g(e,t){if(!Array.isArray(t))return!1;for(var n=0,r=t.length;n<r;n++)if(t[n]!==e[n])return!1;return!0}function y(e,t){return t.reduce(function(e,t){return void 0!==t&&e?e[t]:e},e)}function _(e){return w(x(b(e)))}function b(e){return Array.isArray(e)?e:[e]}function x(e){var t;return(t=[]).concat.apply(t,(0,N.default)(e.map(function(e){return Array.isArray(e)?x(e):e})))}function w(e){return e.filter(function(e){return void 0!==e})}function k(e){return e&&"object"===(void 0===e?"undefined":(0,j.default)(e))}function E(e){return k(e)&&S(e.then)}function S(e){return e&&"function"==typeof e}function C(e){return e instanceof Error}function A(e){if(P(e)){var t=e.op;return"add"===t||"remove"===t||"replace"===t}return!1}function D(e){return H.default.isGeneratorFunction(e)}function O(e){return A(e)||P(e)&&"mutation"===e.type}function M(e){return O(e)&&("add"===e.op||"replace"===e.op||"merge"===e.op||"mergeDeep"===e.op)}function T(e){return P(e)&&"context"===e.type}function P(e){return e&&"object"===(void 0===e?"undefined":(0,j.default)(e))}function I(e,t){try{return W.default.getValueByPointer(e,t)}catch(e){return console.error(e),{}}}Object.defineProperty(t,"__esModule",{value:!0});var R=n(2),j=r(R),F=n(39),N=r(F),B=n(0),L=r(B),q=n(1),z=r(q),U=n(45),W=r(U),V=n(17),H=r(V),G=n(43),J=r(G);t.default={add:a,replace:s,remove:u,merge:l,mergeDeep:c,context:p,getIn:y,applyPatch:i,parentPathMatch:g,flatten:x,fullyNormalizeArray:_,normalizeArray:b,isPromise:E,forEachNew:f,forEachNewPrimitive:h,isJsonPatch:A,isContextPatch:T,isPatch:P,isMutation:O,isAdditiveMutation:M,isGenerator:D,isFunction:S,isObject:k,isError:C}},function(e,t){e.exports=n(35)},function(e,t){e.exports=n(21)},function(e,t){e.exports=n(939)},function(e,t){e.exports=n(572)},function(e,t){e.exports=n(497)},function(e,t,n){"use strict";function r(e){var t=e[e.length-1],n=e.join("/");return i.indexOf(t)>-1||o.indexOf(n)>-1}Object.defineProperty(t,"__esModule",{value:!0}),t.isFreelyNamed=r;var i=["properties"],o=["definitions","parameters","responses","securityDefinitions","components/schemas","components/responses","components/parameters","components/securitySchemes"]},function(e,t,n){"use strict";function r(e,t){function n(){Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=(new Error).stack;for(var e=arguments.length,n=Array(e),r=0;r<e;r++)n[r]=arguments[r];this.message=n[0],t&&t.apply(this,n)}return n.prototype=new Error,n.prototype.name=e,n.prototype.constructor=n,n}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r},function(e,t){e.exports=n(95)},function(e,t){e.exports=n(332)},function(e,t){e.exports=n(2)},function(e,t){e.exports=n(3)},function(e,t){e.exports=n(569)},function(e,t){e.exports=n(224)},function(e,t){e.exports=n(956)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=this,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if("string"==typeof e?n.url=e:n=e,!(this instanceof i))return new i(n);(0,l.default)(this,n);var r=this.resolve().then(function(){return t.disableInterfaces||(0,l.default)(t,i.makeApisTagOperation(t)),t});return r.client=this,r}var o=n(7),a=r(o),s=n(48),u=(r(s),n(8)),l=r(u),c=n(19),p=r(c),f=n(10),h=r(f),d=n(4),m=r(d),v=n(28),g=r(v),y=n(27),_=n(21),b=n(3);i.http=m.default,i.makeHttp=d.makeHttp.bind(null,i.http),i.resolve=g.default,i.execute=_.execute,i.serializeRes=d.serializeRes,i.serializeHeaders=d.serializeHeaders,i.clearCache=v.clearCache,i.parameterBuilders=_.PARAMETER_BUILDERS,i.makeApisTagOperation=y.makeApisTagOperation,i.buildRequest=_.buildRequest,i.helpers={opId:b.opId},e.exports=i,i.prototype={http:m.default,execute:function(e){return this.applyDefaults(),i.execute((0,a.default)({spec:this.spec,http:this.http,securities:{authorized:this.authorizations}},e))},resolve:function(){var e=this;return i.resolve({spec:this.spec,url:this.url,allowMetaPatches:this.allowMetaPatches,requestInterceptor:this.requestInterceptor||null,responseInterceptor:this.responseInterceptor||null}).then(function(t){return e.originalSpec=e.spec,e.spec=t.spec,e.errors=t.errors,e})}},i.prototype.applyDefaults=function(){var e=this.spec,t=this.url;if(t&&(0,p.default)(t,"http")){var n=h.default.parse(t);e.host||(e.host=n.host),e.schemes||(e.schemes=[n.protocol.replace(":","")]),e.basePath||(e.basePath="/")}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.http,n=e.fetch,r=e.spec,i=e.operationId,o=e.pathName,a=e.method,s=e.parameters,u=e.securities,l=(0,v.default)(e,["http","fetch","spec","operationId","pathName","method","parameters","securities"]),c=t||n||R.default;o&&a&&!i&&(i=(0,H.legacyIdFromPathMethod)(o,a));var p=Y.buildRequest((0,d.default)({spec:r,operationId:i,parameters:s,securities:u,http:c},l));return p.body&&((0,S.default)(p.body)||(0,A.default)(p.body))&&(p.body=(0,f.default)(p.body)),c(p)}function o(e){var t=e.spec,n=e.operationId,r=(e.securities,e.requestContentType,e.responseContentType),i=e.scheme,o=e.requestInterceptor,s=e.responseInterceptor,u=e.contextUrl,l=e.userFetch,c=(e.requestBody,e.server),p=e.serverVariables,f=e.http,h=e.parameters,m=e.parameterBuilders,v=(0,H.isOAS3)(t);m||(m=v?q.default:B.default);var g=f&&f.withCredentials?"include":"same-origin",_={url:"",credentials:g,headers:{},cookies:{}};o&&(_.requestInterceptor=o),s&&(_.responseInterceptor=s),l&&(_.userFetch=l);var b=(0,H.getOperationRaw)(t,n);if(!b)throw new J("Operation "+n+" not found");var x=b.operation,w=void 0===x?{}:x,k=b.method,E=b.pathName;if(_.url+=a({spec:t,scheme:i,contextUrl:u,server:c,serverVariables:p,pathName:E,method:k}),!n)return delete _.cookies,_;_.url+=E,_.method=(""+k).toUpperCase(),h=h||{};var S=t.paths[E]||{};r&&(_.headers.accept=r);var C=X([].concat(G(w.parameters)).concat(G(S.parameters)));C.forEach(function(e){var n=m[e.in],r=void 0;if("body"===e.in&&e.schema&&e.schema.properties&&(r=h),r=e&&e.name&&h[e.name],void 0===r?r=e&&e.name&&h[e.in+"."+e.name]:K(e.name,C).length>1&&console.warn("Parameter '"+e.name+"' is ambiguous because the defined spec has more than one parameter with the name: '"+e.name+"' and the passed-in parameter values did not define an 'in' value."),void 0!==e.default&&void 0===r&&(r=e.default),void 0===r&&e.required&&!e.allowEmptyValue)throw new Error("Required parameter "+e.name+" is not provided");n&&n({req:_,parameter:e,value:r,operation:w,spec:t})});var A=(0,d.default)({},e,{operation:w});if(_=v?(0,U.default)(A,_):(0,V.default)(A,_),_.cookies&&(0,y.default)(_.cookies).length){var D=(0,y.default)(_.cookies).reduce(function(e,t){var n=_.cookies[t];return e+(e?"&":"")+P.default.serialize(t,n)},"");_.headers.Cookie=D}return _.cookies&&delete _.cookies,(0,I.mergeInQueryOrForm)(_),_}function a(e){return(0,H.isOAS3)(e.spec)?s(e):c(e)}function s(e){var t=e.spec,n=e.pathName,r=e.method,i=e.server,o=e.contextUrl,a=e.serverVariables,s=void 0===a?{}:a,c=(0,k.default)(t,["paths",n,(r||"").toLowerCase(),"servers"])||(0,k.default)(t,["paths",n,"servers"])||(0,k.default)(t,["servers"]),p="",f=null;if(i&&c){var h=c.map(function(e){return e.url});h.indexOf(i)>-1&&(p=i,f=c[h.indexOf(i)])}return!p&&c&&(p=c[0].url,f=c[0]),p.indexOf("{")>-1&&l(p).forEach(function(e){if(f.variables&&f.variables[e]){var t=f.variables[e],n=s[e]||t.default,r=new RegExp("{"+e+"}","g");p=p.replace(r,n)}}),u(p,o)}function u(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",n=M.default.parse(e),r=M.default.parse(t),i=$(n.protocol)||$(r.protocol)||"",o=n.host||r.host,a=n.pathname||"",s=void 0;return s=i&&o?i+"://"+(o+a):a,"/"===s[s.length-1]?s.slice(0,-1):s}function l(e){for(var t=[],n=/{([^}]+)}/g,r=void 0;r=n.exec(e);)t.push(r[1]);return t}function c(e){var t=e.spec,n=e.scheme,r=e.contextUrl,i=void 0===r?"":r,o=M.default.parse(i),a=Array.isArray(t.schemes)?t.schemes[0]:null,s=n||a||$(o.protocol)||"http",u=t.host||o.host||"",l=t.basePath||"",c=void 0;return c=s&&u?s+"://"+(u+l):l,"/"===c[c.length-1]?c.slice(0,-1):c}Object.defineProperty(t,"__esModule",{value:!0}),t.self=void 0;var p=n(6),f=r(p),h=n(7),d=r(h),m=n(37),v=r(m),g=n(0),y=r(g),_=n(1),b=r(_);t.execute=i,t.buildRequest=o,t.baseUrl=a;var x=n(8),w=(r(x),n(18)),k=r(w),E=n(52),S=r(E),C=n(50),A=r(C),D=n(9),O=(r(D),n(10)),M=r(O),T=n(40),P=r(T),I=n(4),R=r(I),j=n(12),F=r(j),N=n(26),B=r(N),L=n(23),q=r(L),z=n(22),U=r(z),W=n(25),V=r(W),H=n(3),G=function(e){return Array.isArray(e)?e:[]},J=(0,F.default)("OperationNotFoundError",function(e,t,n){this.originalError=n,(0,b.default)(this,t||{})}),K=function(e,t){return t.filter(function(t){return t.name===e})},X=function(e){var t={};e.forEach(function(e){t[e.in]||(t[e.in]={}),t[e.in][e.name]=e});var n=[];return(0,y.default)(t).forEach(function(e){(0,y.default)(t[e]).forEach(function(r){n.push(t[e][r])})}),n},Y=t.self={buildRequest:o},$=function(e){return e?e.replace(/\W/g,""):null}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.request,n=e.securities,r=void 0===n?{}:n,i=e.operation,o=void 0===i?{}:i,a=e.spec,s=(0,f.default)({},t),u=r.authorized,l=void 0===u?{}:u,p=o.security||a.security||[],h=l&&!!(0,c.default)(l).length,m=(0,d.default)(a,["components","securitySchemes"])||{};return s.headers=s.headers||{},s.query=s.query||{},(0,c.default)(r).length&&h&&p&&(!Array.isArray(o.security)||o.security.length)?(p.forEach(function(e,t){for(var n in e){var r=l[n],i=m[n];if(r){var o=r.value||r,a=i.type;if(r)if("apiKey"===a)"query"===i.in&&(s.query[i.name]=o),"header"===i.in&&(s.headers[i.name]=o),"cookie"===i.in&&(s.cookies[i.name]=o);else if("http"===a){if("basic"===i.scheme){var u=o.username,c=o.password,p=(0,v.default)(u+":"+c);s.headers.Authorization="Basic "+p}"bearer"===i.scheme&&(s.headers.Authorization="Bearer "+o)}else if("oauth2"===a){var f=r.token||{},h=f.access_token,d=f.token_type;d&&"bearer"!==d.toLowerCase()||(d="Bearer"),s.headers.Authorization=d+" "+h}}}}),s):t}Object.defineProperty(t,"__esModule",{value:!0});var o=n(6),a=r(o),s=n(2),u=r(s),l=n(0),c=r(l);t.default=function(e,t){var n=e.operation,r=e.requestBody,o=e.securities,s=e.spec,l=e.requestContentType;t=i({request:t,securities:o,operation:n,spec:s});var p=n.requestBody||{},f=(0,c.default)(p.content||{});if(r){var h=l&&f.indexOf(l)>-1;if(l&&h)t.headers["Content-Type"]=l;else if(!l){var d=f[0];d&&(t.headers["Content-Type"]=d,l=d)}}return r&&(l?f.indexOf(l)>-1&&("application/x-www-form-urlencoded"===l?"object"===(void 0===r?"undefined":(0,u.default)(r))?(t.form={},(0,c.default)(r).forEach(function(e){var n=r[e],i=void 0;i="object"===(void 0===n?"undefined":(0,u.default)(n))?Array.isArray(n)?n.toString():(0,a.default)(n):n,t.form[e]={value:i}})):t.form=r:t.body=r):t.body=r),t},t.applySecurities=i;var p=n(8),f=r(p),h=n(18),d=r(h),m=n(9),v=r(m)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.req,n=e.value,r=e.parameter,i=r.name,o=r.style,a=r.explode,s=(0,h.default)({key:r.name,value:n,style:o||"simple",explode:a||!1,escape:!1});t.url=t.url.replace("{"+i+"}",s)}function o(e){var t=e.req,n=e.value,r=e.parameter;if(t.query=t.query||{},!1===n&&(n="false"),0===n&&(n="0"),n){var i=void 0===n?"undefined":(0,p.default)(n);if("deepObject"===r.style)(0,l.default)(n).forEach(function(e){var i=n[e];t.query[r.name+"["+e+"]"]={value:(0,h.default)({key:e,value:i,style:"deepObject",escape:r.allowReserved?"unsafe":"reserved"}),skipEncoding:!0}});else if("object"!==i||Array.isArray(n)||"form"!==r.style&&r.style||!r.explode&&void 0!==r.explode)t.query[r.name]={value:(0,h.default)({key:r.name,value:n,style:r.style||"form",explode:void 0===r.explode||r.explode,escape:r.allowReserved?"unsafe":"reserved"}),skipEncoding:!0};else{var o=(0,l.default)(n);o.forEach(function(e){var i=n[e];t.query[e]={value:(0,h.default)({key:e,value:i,style:r.style||"form",escape:r.allowReserved?"unsafe":"reserved"}),skipEncoding:!0}})}}else if(r.allowEmptyValue){var a=r.name;t.query[a]=t.query[a]||{},t.query[a].allowEmptyValue=!0}}function a(e){var t=e.req,n=e.parameter,r=e.value;t.headers=t.headers||{},d.indexOf(n.name.toLowerCase())>-1||void 0!==r&&(t.headers[n.name]=(0,h.default)({key:n.name,value:r,style:n.style||"simple",explode:void 0!==n.explode&&n.explode,escape:!1}))}function s(e){var t=e.req,n=e.parameter,r=e.value;t.headers=t.headers||{};var i=void 0===r?"undefined":(0,p.default)(r);if("undefined"!==i){var o="object"===i&&!Array.isArray(r)&&n.explode?"":n.name+"=";t.headers.Cookie=o+(0,h.default)({key:n.name,value:r,escape:!1,style:n.style||"form",explode:void 0!==n.explode&&n.explode})}}Object.defineProperty(t,"__esModule",{value:!0});var u=n(0),l=r(u),c=n(2),p=r(c),f=n(24),h=r(f);t.default={path:i,query:o,header:a,cookie:s};var d=["accept","authorization","content-type"]},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.escape,r=arguments[2];return"number"==typeof e&&(e=e.toString()),"string"==typeof e&&e.length&&n?r?JSON.parse(e):(0,m.stringToCharArray)(e).map(function(e){return g(e)?e:v(e)&&"unsafe"===n?e:((0,d.default)(e)||[]).map(function(e){return e.toString(16).toUpperCase()}).map(function(e){return"%"+e}).join("")}).join(""):e}function o(e){var t=e.key,n=e.value,r=e.style,o=e.explode,a=e.escape,s=function(e){return i(e,{escape:a})};if("simple"===r)return n.map(function(e){return s(e)}).join(",");if("label"===r)return"."+n.map(function(e){return s(e)}).join(".");if("matrix"===r)return n.map(function(e){return s(e)}).reduce(function(e,n){return!e||o?(e||"")+";"+t+"="+n:e+","+n},"");if("form"===r){var u=o?"&"+t+"=":",";return n.map(function(e){return s(e)}).join(u)}if("spaceDelimited"===r){var l=o?t+"=":"";return n.map(function(e){return s(e)}).join(" "+l)}if("pipeDelimited"===r){var c=o?t+"=":"";return n.map(function(e){return s(e)}).join("|"+c)}}function a(e){var t=e.key,n=e.value,r=e.style,o=e.explode,a=e.escape,s=function(e){return i(e,{escape:a})},u=(0,l.default)(n);return"simple"===r?u.reduce(function(e,t){var r=s(n[t]),i=o?"=":",";return(e?e+",":"")+t+i+r},""):"label"===r?u.reduce(function(e,t){var r=s(n[t]),i=o?"=":".";return(e?e+".":".")+t+i+r},""):"matrix"===r&&o?u.reduce(function(e,t){var r=s(n[t]);return(e?e+";":";")+t+"="+r},""):"matrix"===r?u.reduce(function(e,r){var i=s(n[r]);return(e?e+",":";"+t+"=")+r+","+i},""):"form"===r?u.reduce(function(e,t){var r=s(n[t]);return(e?e+(o?"&":","):"")+t+(o?"=":",")+r},""):void 0}function s(e){var t=e.key,n=e.value,r=e.style,o=e.escape,a=function(e){return i(e,{escape:o})};return"simple"===r?a(n):"label"===r?"."+a(n):"matrix"===r?";"+t+"="+a(n):"form"===r?a(n):"deepObject"===r?a(n):void 0}Object.defineProperty(t,"__esModule",{value:!0});var u=n(0),l=r(u),c=n(2),p=r(c);t.encodeDisallowedCharacters=i,t.default=function(e){var t=e.value;return Array.isArray(t)?o(e):"object"===(void 0===t?"undefined":(0,p.default)(t))?a(e):s(e)};var f=n(44),h=(r(f),n(56)),d=r(h),m=n(57),v=function(e){return":/?#[]@!$&'()*+,;=".indexOf(e)>-1},g=function(e){return/^[a-z0-9\-._~]+$/i.test(e)}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.request,n=e.securities,r=void 0===n?{}:n,i=e.operation,o=void 0===i?{}:i,s=e.spec,l=(0,c.default)({},t),p=r.authorized,f=void 0===p?{}:p,h=r.specSecurity,d=void 0===h?[]:h,m=o.security||d,v=f&&!!(0,a.default)(f).length,g=s.securityDefinitions;return l.headers=l.headers||{},l.query=l.query||{},(0,a.default)(r).length&&v&&m&&(!Array.isArray(o.security)||o.security.length)?(m.forEach(function(e,t){for(var n in e){var r=f[n];if(r){var i=r.token,o=r.value||r,a=g[n],s=a.type,c=i&&i.access_token,p=i&&i.token_type;if(r)if("apiKey"===s){var h="query"===a.in?"query":"headers";l[h]=l[h]||{},l[h][a.name]=o}else"basic"===s?o.header?l.headers.authorization=o.header:(o.base64=(0,u.default)(o.username+":"+o.password),l.headers.authorization="Basic "+o.base64):"oauth2"===s&&c&&(p=p&&"bearer"!==p.toLowerCase()?p:"Bearer",l.headers.authorization=p+" "+c)}}}),l):t}Object.defineProperty(t,"__esModule",{value:!0});var o=n(0),a=r(o);t.default=function(e,t){var n=e.spec,r=e.operation,o=e.securities,a=e.requestContentType;return t=i({request:t,securities:o,operation:r,spec:n}),(t.body||t.form)&&(a?t.headers["Content-Type"]=a:Array.isArray(r.consumes)?t.headers["Content-Type"]=r.consumes[0]:Array.isArray(n.consumes)?t.headers["Content-Type"]=n.consumes[0]:r.parameters&&r.parameters.filter(function(e){return"file"===e.type}).length?t.headers["Content-Type"]="multipart/form-data":r.parameters&&r.parameters.filter(function(e){return"formData"===e.in}).length&&(t.headers["Content-Type"]="application/x-www-form-urlencoded")),t},t.applySecurities=i;var s=n(9),u=r(s),l=n(8),c=r(l);r(n(4))},function(e,t,n){"use strict";function r(e){var t=e.req,n=e.value;t.body=n}function i(e){var t=e.req,n=e.value,r=e.parameter;t.form=t.form||{},(n||r.allowEmptyValue)&&(t.form[r.name]={value:n,allowEmptyValue:r.allowEmptyValue,collectionFormat:r.collectionFormat})}function o(e){var t=e.req,n=e.parameter,r=e.value;t.headers=t.headers||{},void 0!==r&&(t.headers[n.name]=r)}function a(e){var t=e.req,n=e.value,r=e.parameter;t.url=t.url.replace("{"+r.name+"}",encodeURIComponent(n))}function s(e){var t=e.req,n=e.value,r=e.parameter;if(t.query=t.query||{},!1===n&&"boolean"===r.type&&(n="false"),0===n&&["number","integer"].indexOf(r.type)>-1&&(n="0"),n)t.query[r.name]={collectionFormat:r.collectionFormat,value:n};else if(r.allowEmptyValue){var i=r.name;t.query[i]=t.query[i]||{},t.query[i].allowEmptyValue=!0}}Object.defineProperty(t,"__esModule",{value:!0}),t.default={body:r,header:o,query:s,path:a,formData:i}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return function(t){var n=t.pathName,r=t.method,i=t.operationId;return function(t){var o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return e.execute((0,l.default)({spec:e.spec},(0,p.default)(e,"requestInterceptor","responseInterceptor","userFetch"),{pathName:n,method:r,parameters:t,operationId:i},o))}}}function o(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=m.makeExecute(e),n=m.mapTagOperations({spec:e.spec,cb:t}),r={};for(var i in n){r[i]={operations:{}};for(var o in n[i])r[i].operations[o]={execute:n[i][o]}}return{apis:r}}function a(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=m.makeExecute(e);return{apis:m.mapTagOperations({spec:e.spec,cb:t})}}function s(e){var t=e.spec,n=e.cb,r=void 0===n?h:n,i=e.defaultTag,o=void 0===i?"default":i,a={},s={};return(0,f.eachOperation)(t,function(e){var n=e.pathName,i=e.method,u=e.operation;(u.tags?d(u.tags):[o]).forEach(function(e){if("string"==typeof e){var o=s[e]=s[e]||{},l=(0,f.opId)(u,n,i),c=r({spec:t,pathName:n,method:i,operation:u,operationId:l});if(a[l])a[l]++,o[""+l+a[l]]=c;else if(void 0!==o[l]){var p=a[l]||1;a[l]=p+1,o[""+l+a[l]]=c;var h=o[l];delete o[l],o[""+l+p]=h}else o[l]=c}})}),s}Object.defineProperty(t,"__esModule",{value:!0}),t.self=void 0;var u=n(7),l=r(u);t.makeExecute=i,t.makeApisTagOperationsOperationExecute=o,t.makeApisTagOperation=a,t.mapTagOperations=s;var c=n(54),p=r(c),f=n(3),h=function(){return null},d=function(e){return Array.isArray(e)?e:[e]},m=t.self={mapTagOperations:s,makeExecute:i}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.requestInterceptor,r=t.responseInterceptor,i=e.withCredentials?"include":"same-origin";return function(t){return e({url:t,loadSpec:!0,requestInterceptor:n,responseInterceptor:r,headers:{Accept:"application/json"},credentials:i}).then(function(e){return e.body})}}function o(){l.plugins.refs.clearCache()}function a(e){function t(e){y&&(l.plugins.refs.docCache[y]=e),l.plugins.refs.fetchJSON=i(g,{requestInterceptor:m,responseInterceptor:v});var t=[l.plugins.refs];return"function"==typeof d&&t.push(l.plugins.parameters),"function"==typeof h&&t.push(l.plugins.properties),"strict"!==a&&t.push(l.plugins.allOf),(0,c.default)({spec:e,context:{baseDoc:y},plugins:t,allowMetaPatches:f,parameterMacro:d,modelPropertyMacro:h}).then(p.normalizeSwagger)}var n=e.fetch,r=e.spec,o=e.url,a=e.mode,s=e.allowMetaPatches,f=void 0===s||s,h=e.modelPropertyMacro,d=e.parameterMacro,m=e.requestInterceptor,v=e.responseInterceptor,g=e.http,y=e.baseDoc;return y=y||o,g=n||g||u.default,r?t(r):i(g,{requestInterceptor:m,responseInterceptor:v})(y).then(t)}Object.defineProperty(t,"__esModule",{value:!0}),t.makeFetchJSON=i,t.clearCache=o,t.default=a;var s=n(4),u=r(s),l=n(29),c=r(l),p=n(3)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){return new N(e).dispatch()}Object.defineProperty(t,"__esModule",{value:!0}),t.plugins=t.SpecMap=void 0;var o=n(6),a=r(o),s=n(14),u=r(s),l=n(17),c=r(l),p=n(0),f=r(p),h=n(13),d=r(h),m=n(35),v=r(m),g=n(1),y=r(g),_=n(15),b=r(_),x=n(16),w=r(x);t.default=i;var k=n(49),E=r(k),S=n(5),C=r(S),A=n(34),D=r(A),O=n(30),M=r(O),T=n(32),P=r(T),I=n(33),R=r(I),j=n(31),F=r(j),N=function(){function e(t){(0,b.default)(this,e),(0,y.default)(this,{spec:"",debugLevel:"info",plugins:[],pluginHistory:{},errors:[],mutations:[],promisedPatches:[],state:{},patches:[],context:{},contextTree:new F.default,showDebug:!1,allPatches:[],pluginProp:"specMap",libMethods:(0,y.default)((0,v.default)(this),C.default),allowMetaPatches:!1},t),this.get=this._get.bind(this),this.getContext=this._getContext.bind(this),this.hasRun=this._hasRun.bind(this),this.wrappedPlugins=this.plugins.map(this.wrapPlugin.bind(this)).filter(C.default.isFunction),this.patches.push(C.default.add([],this.spec)),this.patches.push(C.default.context([],this.context)),this.updatePatches(this.patches)}return(0,w.default)(e,[{key:"debug",value:function(e){if(this.debugLevel===e){for(var t,n=arguments.length,r=Array(n>1?n-1:0),i=1;i<n;i++)r[i-1]=arguments[i];(t=console).log.apply(t,r)}}},{key:"verbose",value:function(e){if("verbose"===this.debugLevel){for(var t,n=arguments.length,r=Array(n>1?n-1:0),i=1;i<n;i++)r[i-1]=arguments[i];(t=console).log.apply(t,["["+e+"]   "].concat(r))}}},{key:"wrapPlugin",value:function(e,t){var n=null,r=void 0;return e[this.pluginProp]?(n=e,r=e[this.pluginProp]):C.default.isFunction(e)?r=e:C.default.isObject(e)&&(r=function(e){return c.default.mark(function t(n,r){var i,o,a,s,u,l,p,h,m;return c.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:m=function t(n,a,s){var u,l,p,h,m,v,g,y,_,b,x,w,k,E,S;return c.default.wrap(function(i){for(;;)switch(i.prev=i.next){case 0:if(C.default.isObject(n)){i.next=6;break}if(e.key!==a[a.length-1]){i.next=4;break}return i.next=4,e.plugin(n,e.key,a,r);case 4:i.next=46;break;case 6:u=a.length-1,l=a[u],p=a.indexOf("properties"),h="properties"===l&&u===p,m=r.allowMetaPatches&&o[n.$$ref],v=!0,g=!1,y=void 0,i.prev=14,_=(0,d.default)((0,f.default)(n));case 16:if(v=(b=_.next()).done){i.next=32;break}if(x=b.value,w=n[x],k=a.concat(x),E=C.default.isObject(w),S=n.$$ref,m){i.next=26;break}if(!E){i.next=26;break}return r.allowMetaPatches&&S&&(o[S]=!0),i.delegateYield(t(w,k,s),"t0",26);case 26:if(h||x!==e.key){i.next=29;break}return i.next=29,e.plugin(w,x,k,r,s);case 29:v=!0,i.next=16;break;case 32:i.next=38;break;case 34:i.prev=34,i.t1=i.catch(14),g=!0,y=i.t1;case 38:i.prev=38,i.prev=39,!v&&_.return&&_.return();case 41:if(i.prev=41,!g){i.next=44;break}throw y;case 44:return i.finish(41);case 45:return i.finish(38);case 46:case"end":return i.stop()}},i,this,[[14,34,38,46],[39,,41,45]])},i=c.default.mark(m),o={},a=!0,s=!1,u=void 0,t.prev=6,l=(0,d.default)(n.filter(C.default.isAdditiveMutation));case 8:if(a=(p=l.next()).done){t.next=14;break}return h=p.value,t.delegateYield(m(h.value,h.path,h),"t0",11);case 11:a=!0,t.next=8;break;case 14:t.next=20;break;case 16:t.prev=16,t.t1=t.catch(6),s=!0,u=t.t1;case 20:t.prev=20,t.prev=21,!a&&l.return&&l.return();case 23:if(t.prev=23,!s){t.next=26;break}throw u;case 26:return t.finish(23);case 27:return t.finish(20);case 28:case"end":return t.stop()}},t,this,[[6,16,20,28],[21,,23,27]])})}(e)),(0,y.default)(r.bind(n),{pluginName:e.name||t,isGenerator:C.default.isGenerator(r)})}},{key:"nextPlugin",value:function(){var e=this;return(0,E.default)(this.wrappedPlugins,function(t){return e.getMutationsForPlugin(t).length>0})}},{key:"nextPromisedPatch",value:function(){if(this.promisedPatches.length>0)return u.default.race(this.promisedPatches.map(function(e){return e.value}))}},{key:"getPluginHistory",value:function(e){var t=this.getPluginName(e);return this.pluginHistory[t]||[]}},{key:"getPluginRunCount",value:function(e){return this.getPluginHistory(e).length}},{key:"getPluginHistoryTip",value:function(e){var t=this.getPluginHistory(e);return t&&t[t.length-1]||{}}},{key:"getPluginMutationIndex",value:function(e){var t=this.getPluginHistoryTip(e).mutationIndex;return"number"!=typeof t?-1:t}},{key:"getPluginName",value:function(e){return e.pluginName}},{key:"updatePluginHistory",value:function(e,t){var n=this.getPluginName(e);(this.pluginHistory[n]=this.pluginHistory[n]||[]).push(t)}},{key:"updatePatches",value:function(e,t){var n=this;C.default.normalizeArray(e).forEach(function(e){if(e instanceof Error)return void n.errors.push(e);try{if(!C.default.isObject(e))return void n.debug("updatePatches","Got a non-object patch",e);if(n.showDebug&&n.allPatches.push(e),C.default.isPromise(e.value))return n.promisedPatches.push(e),void n.promisedPatchThen(e);if(C.default.isContextPatch(e))return void n.setContext(e.path,e.value);if(C.default.isMutation(e))return void n.updateMutations(e)}catch(e){n.errors.push(e)}})}},{key:"updateMutations",value:function(e){var t=C.default.applyPatch(this.state,e,{allowMetaPatches:this.allowMetaPatches});t&&(this.mutations.push(e),this.state=t)}},{key:"removePromisedPatch",value:function(e){var t=this.promisedPatches.indexOf(e);if(t<0)return void this.debug("Tried to remove a promisedPatch that isn't there!");this.promisedPatches.splice(t,1)}},{key:"promisedPatchThen",value:function(e){var t=this;return e.value=e.value.then(function(n){var r=(0,y.default)({},e,{value:n});t.removePromisedPatch(e),t.updatePatches(r)}).catch(function(n){t.removePromisedPatch(e),t.updatePatches(n)})}},{key:"getMutations",value:function(e,t){return e=e||0,"number"!=typeof t&&(t=this.mutations.length),this.mutations.slice(e,t)}},{key:"getCurrentMutations",value:function(){return this.getMutationsForPlugin(this.getCurrentPlugin())}},{key:"getMutationsForPlugin",value:function(e){var t=this.getPluginMutationIndex(e);return this.getMutations(t+1)}},{key:"getCurrentPlugin",value:function(){return this.currentPlugin}},{key:"getPatchesOfType",value:function(e,t){return e.filter(t)}},{key:"getLib",value:function(){return this.libMethods}},{key:"_get",value:function(e){return C.default.getIn(this.state,e)}},{key:"_getContext",value:function(e){return this.contextTree.get(e)}},{key:"setContext",value:function(e,t){return this.contextTree.set(e,t)}},{key:"_hasRun",value:function(e){return this.getPluginRunCount(this.getCurrentPlugin())>(e||0)}},{key:"_clone",value:function(e){return JSON.parse((0,a.default)(e))}},{key:"dispatch",value:function(){function e(e){e&&(e=C.default.fullyNormalizeArray(e),n.updatePatches(e,r))}var t=this,n=this,r=this.nextPlugin();if(!r){var i=this.nextPromisedPatch();if(i)return i.then(function(){return t.dispatch()}).catch(function(){return t.dispatch()});var o={spec:this.state,errors:this.errors};return this.showDebug&&(o.patches=this.allPatches),u.default.resolve(o)}if(n.pluginCount=n.pluginCount||{},n.pluginCount[r]=(n.pluginCount[r]||0)+1,n.pluginCount[r]>100)return u.default.resolve({spec:n.state,errors:n.errors.concat(new Error("We've reached a hard limit of 100 plugin runs"))});if(r!==this.currentPlugin&&this.promisedPatches.length){var a=this.promisedPatches.map(function(e){return e.value});return u.default.all(a.map(function(e){return e.then(Function,Function)})).then(function(){return t.dispatch()})}return function(){n.currentPlugin=r;var t=n.getCurrentMutations(),i=n.mutations.length-1;try{if(r.isGenerator){var o=!0,a=!1,s=void 0;try{for(var u,l=(0,d.default)(r(t,n.getLib()));!(o=(u=l.next()).done);o=!0)e(u.value)}catch(e){a=!0,s=e}finally{try{!o&&l.return&&l.return()}finally{if(a)throw s}}}else e(r(t,n.getLib()))}catch(t){e([(0,y.default)((0,v.default)(t),{plugin:r})])}finally{n.updatePluginHistory(r,{mutationIndex:i})}return n.dispatch()}()}}]),e}(),B={refs:D.default,allOf:M.default,parameters:P.default,properties:R.default};t.SpecMap=N,t.plugins=B},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(1),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(11);t.default={key:"allOf",plugin:function(e,t,n,r,a){if(!a.meta||!a.meta.$$ref){var s=n.slice(0,-1);if(!(0,o.isFreelyNamed)(s)){if(!Array.isArray(e)){var u=new TypeError("allOf must be an array");return u.fullPath=n,u}var l=!1,c=a.value;s.forEach(function(e){c=c[e]}),c=(0,i.default)({},c),delete c.allOf;var p=[r.replace(s,{})].concat(e.map(function(e,t){if(!r.isObject(e)){if(l)return null;l=!0;var i=new TypeError("Elements in allOf must be objects");return i.fullPath=n,i}return r.mergeDeep(s,e)}));return p.push(r.mergeDeep(s,c)),c.$$ref||p.push(r.remove([].concat(s,"$$ref"))),p}}}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){return o({children:{}},e,t)}function o(e,t,n){return e.value=t||{},e.protoValue=n?(0,l.default)({},n.protoValue,e.value):e.value,(0,s.default)(e.children).forEach(function(t){var n=e.children[t];e.children[t]=o(n,n.value,e)}),e}Object.defineProperty(t,"__esModule",{value:!0});var a=n(0),s=r(a),u=n(7),l=r(u),c=n(15),p=r(c),f=n(16),h=r(f),d=function(){function e(t){(0,p.default)(this,e),this.root=i(t||{})}return(0,h.default)(e,[{key:"set",value:function(e,t){var n=this.getParent(e,!0);if(!n)return void o(this.root,t,null);var r=e[e.length-1],a=n.children;if(a[r])return void o(a[r],t,n);a[r]=i(t,n)}},{key:"get",value:function(e){if(e=e||[],e.length<1)return this.root.value;for(var t=this.root,n=void 0,r=void 0,i=0;i<e.length&&(r=e[i],n=t.children,n[r]);i++)t=n[r];return t&&t.protoValue}},{key:"getParent",value:function(e,t){return!e||e.length<1?null:e.length<2?this.root:e.slice(0,-1).reduce(function(e,n){if(!e)return e;var r=e.children;return!r[n]&&t&&(r[n]=i(null,e)),r[n]},this.root)}}]),e}();t.default=d},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(1),o=r(i),a=n(5),s=r(a);t.default={key:"parameters",plugin:function(e,t,n,r,i){if(Array.isArray(e)&&e.length){var a=(0,o.default)([],e),u=n.slice(0,-1),l=(0,o.default)({},s.default.getIn(r.spec,u));return e.forEach(function(e,t){try{a[t].default=r.parameterMacro(l,e)}catch(e){var i=new Error(e);return i.fullPath=n,i}}),s.default.replace(n,a)}return s.default.replace(n,e)}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(1),o=r(i),a=n(5),s=r(a);t.default={key:"properties",plugin:function(e,t,n,r){var i=(0,o.default)({},e);for(var a in e)try{i[a].default=r.modelPropertyMacro(i[a])}catch(e){var u=new Error(e);return u.fullPath=n,u}return s.default.replace(n,i)}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!N.test(e)){if(!t)throw new B("Tried to resolve a relative URL, without having a basePath. path: '"+e+"' basePath: '"+t+"'");return T.default.resolve(t,e)}return e}function o(e,t){return new B("Could not resolve reference because of: "+e.message,t,e)}function a(e){return(e+"").split("#")}function s(e,t){var n=L[e];if(n&&!I.default.isPromise(n))try{var r=p(t,n);return(0,D.default)(E.default.resolve(r),{__value:r})}catch(e){return E.default.reject(e)}return l(e).then(function(e){return p(t,e)})}function u(e){void 0!==e?delete L[e]:(0,w.default)(L).forEach(function(e){delete L[e]})}function l(e){var t=L[e];return t?I.default.isPromise(t)?t:E.default.resolve(t):(L[e]=U.fetchJSON(e).then(function(t){return L[e]=t,t}),L[e])}function c(e){return(0,O.fetch)(e,{headers:{Accept:"application/json, application/yaml"},loadSpec:!0}).then(function(e){return e.json()})}function p(e,t){var n=f(e);if(n.length<1)return t;var r=I.default.getIn(t,n);if(void 0===r)throw new B("Could not resolve pointer: "+e+" does not exist in document",{pointer:e});return r}function f(e){if("string"!=typeof e)throw new TypeError("Expected a string, got a "+(void 0===e?"undefined":(0,b.default)(e)));return"/"===e[0]&&(e=e.substr(1)),""===e?[]:e.split("/").map(h)}function h(e){return"string"!=typeof e?e:e.replace(/~1/g,"/").replace(/~0/g,"~")}function d(e){return e.replace(/~/g,"~0").replace(/\//g,"~1")}function m(e){return 0===e.length?"":"/"+e.map(d).join("/")}function v(e,t){if(W(t))return!0;var n=e.charAt(t.length);return 0===e.indexOf(t)&&(!n||"/"===n||"#"===n)}function g(e,t,n,r){var i=q.get(r);i||(i={},q.set(r,i));var o=m(n),a=(t||"<specmap-base>")+"#"+e;if(t==r.contextTree.get([]).baseDoc&&v(o,e))return!0;var s="";if(n.some(function(e){return s=s+"/"+d(e),i[s]&&i[s].some(function(e){return v(e,a)||v(a,e)})}))return!0;i[o]=(i[o]||[]).concat(a)}function y(e,t){function n(e){return I.default.isObject(e)&&(r.indexOf(e)>=0||(0,w.default)(e).some(function(t){return n(e[t])}))}var r=[e];return t.path.reduce(function(e,t){return r.push(e[t]),e[t]},e),n(t.value)}Object.defineProperty(t,"__esModule",{value:!0});var _=n(2),b=r(_),x=n(0),w=r(x),k=n(14),E=r(k),S=n(36),C=r(S),A=n(1),D=r(A),O=n(41),M=n(10),T=r(M),P=n(5),I=r(P),R=n(12),j=r(R),F=n(11),N=new RegExp("^([a-z]+://|//)","i"),B=(0,j.default)("JSONRefError",function(e,t,n){this.originalError=n,(0,D.default)(this,t||{})}),L={},q=new C.default,z={key:"$ref",plugin:function(e,t,n,r){var u=n.slice(0,-1);if(!(0,F.isFreelyNamed)(u)){var l=r.getContext(n).baseDoc;if("string"!=typeof e)return new B("$ref: must be a string (JSON-Ref)",{$ref:e,baseDoc:l,fullPath:n});var c=a(e),p=c[0],h=c[1]||"",d=void 0;try{d=l||p?i(p,l):null}catch(t){return o(t,{pointer:h,$ref:e,basePath:d,fullPath:n})}var m=void 0,v=void 0;if(!g(h,d,u,r)){if(null==d?(v=f(h),void 0===(m=r.get(v))&&(m=new B("Could not resolve reference: "+e,{pointer:h,$ref:e,baseDoc:l,fullPath:n}))):(m=s(d,h),m=null!=m.__value?m.__value:m.catch(function(t){throw o(t,{pointer:h,$ref:e,baseDoc:l,fullPath:n})})),m instanceof Error)return[I.default.remove(n),m];var _=I.default.replace(u,m,{$$ref:e});return d&&d!==l?[_,I.default.context(u,{baseDoc:d})]:y(r.state,_)?void 0:_}}}},U=(0,D.default)(z,{docCache:L,absoluteify:i,clearCache:u,JSONRefError:B,wrapError:o,getDoc:l,split:a,extractFromDoc:s,fetchJSON:c,extract:p,jsonPointerToArray:f,unescapeJsonPointerToken:h});t.default=U;var W=function(e){return!e||"/"===e||"#"===e}},function(e,t){e.exports=n(330)},function(e,t){e.exports=n(568)},function(e,t){e.exports=n(96)},function(e,t){e.exports=n(18)},function(e,t){e.exports=n(97)},function(e,t){e.exports=n(582)},function(e,t){e.exports=n(696)},function(e,t){e.exports=n(695)},function(e,t){e.exports=n(203)},function(e,t){e.exports=n(709)},function(e,t){e.exports=n(745)},function(e,t){e.exports=n(794)},function(e,t){e.exports=n(211)},function(e,t){e.exports=n(942)},function(e,t){e.exports=n(223)},function(e,t){e.exports=n(20)},function(e,t){e.exports=n(38)},function(e,t){e.exports=n(421)},function(e,t){e.exports=n(422)},function(e,t){e.exports=n(951)},function(e,t){e.exports=n(999)},function(e,t){e.exports=n(1189)},function(e,t){e.exports=n(1190)},function(e,t,n){e.exports=n(20)}])},function(e,t,n){function r(e,t){this._id=e,this._clearFn=t}var i=Function.prototype.apply;t.setTimeout=function(){return new r(i.call(setTimeout,window,arguments),clearTimeout)},t.setInterval=function(){return new r(i.call(setInterval,window,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},r.prototype.unref=r.prototype.ref=function(){},r.prototype.close=function(){this._clearFn.call(window,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n(1180),t.setImmediate=setImmediate,t.clearImmediate=clearImmediate},function(e,t,n){"use strict";function r(){this.protocol=null,this.slashes=null,this.auth=null,this.host=null,this.port=null,this.hostname=null,this.hash=null,this.search=null,this.query=null,this.pathname=null,this.path=null,this.href=null}function i(e,t,n){if(e&&l.isObject(e)&&e instanceof r)return e;var i=new r;return i.parse(e,t,n),i}function o(e){return l.isString(e)&&(e=i(e)),e instanceof r?e.format():r.prototype.format.call(e)}function a(e,t){return i(e,!1,!0).resolve(t)}function s(e,t){return e?i(e,!1,!0).resolveObject(t):t}var u=n(998),l=n(1188);t.parse=i,t.resolve=a,t.resolveObject=s,t.format=o,t.Url=r;var c=/^([a-z0-9.+-]+:)/i,p=/:[0-9]*$/,f=/^(\/\/?(?!\/)[^\?\s]*)(\?[^\s]*)?$/,h=["<",">",'"',"`"," ","\r","\n","\t"],d=["{","}","|","\\","^","`"].concat(h),m=["'"].concat(d),v=["%","/","?",";","#"].concat(m),g=["/","?","#"],y=/^[+a-z0-9A-Z_-]{0,63}$/,_=/^([+a-z0-9A-Z_-]{0,63})(.*)$/,b={javascript:!0,"javascript:":!0},x={javascript:!0,"javascript:":!0},w={http:!0,https:!0,ftp:!0,gopher:!0,file:!0,"http:":!0,"https:":!0,"ftp:":!0,"gopher:":!0,"file:":!0},k=n(1004);r.prototype.parse=function(e,t,n){if(!l.isString(e))throw new TypeError("Parameter 'url' must be a string, not "+typeof e);var r=e.indexOf("?"),i=-1!==r&&r<e.indexOf("#")?"?":"#",o=e.split(i),a=/\\/g;o[0]=o[0].replace(a,"/"),e=o.join(i);var s=e;if(s=s.trim(),!n&&1===e.split("#").length){var p=f.exec(s);if(p)return this.path=s,this.href=s,this.pathname=p[1],p[2]?(this.search=p[2],this.query=t?k.parse(this.search.substr(1)):this.search.substr(1)):t&&(this.search="",this.query={}),this}var h=c.exec(s);if(h){h=h[0];var d=h.toLowerCase();this.protocol=d,s=s.substr(h.length)}if(n||h||s.match(/^\/\/[^@\/]+@[^@\/]+/)){var E="//"===s.substr(0,2);!E||h&&x[h]||(s=s.substr(2),this.slashes=!0)}if(!x[h]&&(E||h&&!w[h])){for(var S=-1,C=0;C<g.length;C++){var A=s.indexOf(g[C]);-1!==A&&(-1===S||A<S)&&(S=A)}var D,O;O=-1===S?s.lastIndexOf("@"):s.lastIndexOf("@",S),-1!==O&&(D=s.slice(0,O),s=s.slice(O+1),this.auth=decodeURIComponent(D)),S=-1;for(var C=0;C<v.length;C++){var A=s.indexOf(v[C]);-1!==A&&(-1===S||A<S)&&(S=A)}-1===S&&(S=s.length),this.host=s.slice(0,S),s=s.slice(S),this.parseHost(),this.hostname=this.hostname||"";var M="["===this.hostname[0]&&"]"===this.hostname[this.hostname.length-1];if(!M)for(var T=this.hostname.split(/\./),C=0,P=T.length;C<P;C++){var I=T[C];if(I&&!I.match(y)){for(var R="",j=0,F=I.length;j<F;j++)I.charCodeAt(j)>127?R+="x":R+=I[j];if(!R.match(y)){var N=T.slice(0,C),B=T.slice(C+1),L=I.match(_);L&&(N.push(L[1]),B.unshift(L[2])),B.length&&(s="/"+B.join(".")+s),this.hostname=N.join(".");break}}}this.hostname.length>255?this.hostname="":this.hostname=this.hostname.toLowerCase(),M||(this.hostname=u.toASCII(this.hostname));var q=this.port?":"+this.port:"",z=this.hostname||"";this.host=z+q,this.href+=this.host,M&&(this.hostname=this.hostname.substr(1,this.hostname.length-2),"/"!==s[0]&&(s="/"+s))}if(!b[d])for(var C=0,P=m.length;C<P;C++){var U=m[C];if(-1!==s.indexOf(U)){var W=encodeURIComponent(U);W===U&&(W=escape(U)),s=s.split(U).join(W)}}var V=s.indexOf("#");-1!==V&&(this.hash=s.substr(V),s=s.slice(0,V));var H=s.indexOf("?");if(-1!==H?(this.search=s.substr(H),this.query=s.substr(H+1),t&&(this.query=k.parse(this.query)),s=s.slice(0,H)):t&&(this.search="",this.query={}),s&&(this.pathname=s),w[d]&&this.hostname&&!this.pathname&&(this.pathname="/"),this.pathname||this.search){var q=this.pathname||"",G=this.search||"";this.path=q+G}return this.href=this.format(),this},r.prototype.format=function(){var e=this.auth||"";e&&(e=encodeURIComponent(e),e=e.replace(/%3A/i,":"),e+="@");var t=this.protocol||"",n=this.pathname||"",r=this.hash||"",i=!1,o="";this.host?i=e+this.host:this.hostname&&(i=e+(-1===this.hostname.indexOf(":")?this.hostname:"["+this.hostname+"]"),this.port&&(i+=":"+this.port)),this.query&&l.isObject(this.query)&&Object.keys(this.query).length&&(o=k.stringify(this.query));var a=this.search||o&&"?"+o||"";return t&&":"!==t.substr(-1)&&(t+=":"),this.slashes||(!t||w[t])&&!1!==i?(i="//"+(i||""),n&&"/"!==n.charAt(0)&&(n="/"+n)):i||(i=""),r&&"#"!==r.charAt(0)&&(r="#"+r),a&&"?"!==a.charAt(0)&&(a="?"+a),n=n.replace(/[?#]/g,function(e){return encodeURIComponent(e)}),a=a.replace("#","%23"),t+i+n+a+r},r.prototype.resolve=function(e){return this.resolveObject(i(e,!1,!0)).format()},r.prototype.resolveObject=function(e){if(l.isString(e)){var t=new r;t.parse(e,!1,!0),e=t}for(var n=new r,i=Object.keys(this),o=0;o<i.length;o++){var a=i[o];n[a]=this[a]}if(n.hash=e.hash,""===e.href)return n.href=n.format(),n;if(e.slashes&&!e.protocol){for(var s=Object.keys(e),u=0;u<s.length;u++){var c=s[u];"protocol"!==c&&(n[c]=e[c])}return w[n.protocol]&&n.hostname&&!n.pathname&&(n.path=n.pathname="/"),n.href=n.format(),n}if(e.protocol&&e.protocol!==n.protocol){if(!w[e.protocol]){for(var p=Object.keys(e),f=0;f<p.length;f++){var h=p[f];n[h]=e[h]}return n.href=n.format(),n}if(n.protocol=e.protocol,e.host||x[e.protocol])n.pathname=e.pathname;else{for(var d=(e.pathname||"").split("/");d.length&&!(e.host=d.shift()););e.host||(e.host=""),e.hostname||(e.hostname=""),""!==d[0]&&d.unshift(""),d.length<2&&d.unshift(""),n.pathname=d.join("/")}if(n.search=e.search,n.query=e.query,n.host=e.host||"",n.auth=e.auth,n.hostname=e.hostname||e.host,n.port=e.port,n.pathname||n.search){var m=n.pathname||"",v=n.search||"";n.path=m+v}return n.slashes=n.slashes||e.slashes,n.href=n.format(),n}var g=n.pathname&&"/"===n.pathname.charAt(0),y=e.host||e.pathname&&"/"===e.pathname.charAt(0),_=y||g||n.host&&e.pathname,b=_,k=n.pathname&&n.pathname.split("/")||[],d=e.pathname&&e.pathname.split("/")||[],E=n.protocol&&!w[n.protocol];if(E&&(n.hostname="",n.port=null,n.host&&(""===k[0]?k[0]=n.host:k.unshift(n.host)),n.host="",e.protocol&&(e.hostname=null,e.port=null,e.host&&(""===d[0]?d[0]=e.host:d.unshift(e.host)),e.host=null),_=_&&(""===d[0]||""===k[0])),y)n.host=e.host||""===e.host?e.host:n.host,n.hostname=e.hostname||""===e.hostname?e.hostname:n.hostname,n.search=e.search,n.query=e.query,k=d;else if(d.length)k||(k=[]),k.pop(),k=k.concat(d),n.search=e.search,n.query=e.query;else if(!l.isNullOrUndefined(e.search)){if(E){n.hostname=n.host=k.shift();var S=!!(n.host&&n.host.indexOf("@")>0)&&n.host.split("@");S&&(n.auth=S.shift(),n.host=n.hostname=S.shift())}return n.search=e.search,n.query=e.query,l.isNull(n.pathname)&&l.isNull(n.search)||(n.path=(n.pathname?n.pathname:"")+(n.search?n.search:"")),n.href=n.format(),n}if(!k.length)return n.pathname=null,n.search?n.path="/"+n.search:n.path=null,n.href=n.format(),n;for(var C=k.slice(-1)[0],A=(n.host||e.host||k.length>1)&&("."===C||".."===C)||""===C,D=0,O=k.length;O>=0;O--)C=k[O],"."===C?k.splice(O,1):".."===C?(k.splice(O,1),D++):D&&(k.splice(O,1),D--);if(!_&&!b)for(;D--;D)k.unshift("..");!_||""===k[0]||k[0]&&"/"===k[0].charAt(0)||k.unshift(""),A&&"/"!==k.join("/").substr(-1)&&k.push("");var M=""===k[0]||k[0]&&"/"===k[0].charAt(0);if(E){n.hostname=n.host=M?"":k.length?k.shift():"";var S=!!(n.host&&n.host.indexOf("@")>0)&&n.host.split("@");S&&(n.auth=S.shift(),n.host=n.hostname=S.shift())}return _=_||n.host&&k.length,_&&!M&&k.unshift(""),k.length?n.pathname=k.join("/"):(n.pathname=null,n.path=null),l.isNull(n.pathname)&&l.isNull(n.search)||(n.path=(n.pathname?n.pathname:"")+(n.search?n.search:"")),n.auth=e.auth||n.auth,n.slashes=n.slashes||e.slashes,n.href=n.format(),n},r.prototype.parseHost=function(){var e=this.host,t=p.exec(e);t&&(t=t[0],":"!==t&&(this.port=t.substr(1)),e=e.substr(0,e.length-t.length)),e&&(this.hostname=e)}},function(e,t,n){(function(){var e,r,i,o=function(e,t){function n(){this.constructor=e}for(var r in t)a.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},a={}.hasOwnProperty;r=n(127),e=n(45).MarkedYAMLError,i=n(94),this.ComposerError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return o(t,e),t}(e),this.Composer=function(){function e(){this.anchors={}}return e.prototype.check_node=function(){return this.check_event(r.StreamStartEvent)&&this.get_event(),!this.check_event(r.StreamEndEvent)},e.prototype.get_node=function(){if(!this.check_event(r.StreamEndEvent))return this.compose_document()},e.prototype.get_single_node=function(){var e,n;if(this.get_event(),e=null,this.check_event(r.StreamEndEvent)||(e=this.compose_document()),!this.check_event(r.StreamEndEvent))throw n=this.get_event(),new t.ComposerError("expected a single document in the stream",e.start_mark,"but found another document",n.start_mark);return this.get_event(),e},e.prototype.compose_document=function(){var e;return this.get_event(),e=this.compose_node(),this.get_event(),this.anchors={},e},e.prototype.compose_node=function(e,n){var i,o,a;if(this.check_event(r.AliasEvent)){if(o=this.get_event(),!((i=o.anchor)in this.anchors))throw new t.ComposerError(null,null,"found undefined alias "+i,o.start_mark);return this.anchors[i]}if(o=this.peek_event(),null!==(i=o.anchor)&&i in this.anchors)throw new t.ComposerError("found duplicate anchor "+i+"; first occurence",this.anchors[i].start_mark,"second occurrence",o.start_mark);return this.descend_resolver(e,n),this.check_event(r.ScalarEvent)?a=this.compose_scalar_node(i):this.check_event(r.SequenceStartEvent)?a=this.compose_sequence_node(i):this.check_event(r.MappingStartEvent)&&(a=this.compose_mapping_node(i)),this.ascend_resolver(),a},e.prototype.compose_scalar_node=function(e){var t,n,r;return t=this.get_event(),r=t.tag,null!==r&&"!"!==r||(r=this.resolve(i.ScalarNode,t.value,t.implicit)),n=new i.ScalarNode(r,t.value,t.start_mark,t.end_mark,t.style),null!==e&&(this.anchors[e]=n),n},e.prototype.compose_sequence_node=function(e){var t,n,o,a,s;for(a=this.get_event(),s=a.tag,null!==s&&"!"!==s||(s=this.resolve(i.SequenceNode,null,a.implicit)),o=new i.SequenceNode(s,[],a.start_mark,null,a.flow_style),null!==e&&(this.anchors[e]=o),n=0;!this.check_event(r.SequenceEndEvent);)o.value.push(this.compose_node(o,n)),n++;return t=this.get_event(),o.end_mark=t.end_mark,o},e.prototype.compose_mapping_node=function(e){var t,n,o,a,s,u;for(s=this.get_event(),u=s.tag,null!==u&&"!"!==u||(u=this.resolve(i.MappingNode,null,s.implicit)),a=new i.MappingNode(u,[],s.start_mark,null,s.flow_style),null!==e&&(this.anchors[e]=a);!this.check_event(r.MappingEndEvent);)n=this.compose_node(a),o=this.compose_node(a,n),a.value.push([n,o]);return t=this.get_event(),a.end_mark=t.end_mark,a},e}()}).call(this)},function(e,t,n){(function(e){(function(){var r,i,o,a=function(e,t){function n(){this.constructor=e}for(var r in t)s.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},s={}.hasOwnProperty,u=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};r=n(45).MarkedYAMLError,i=n(94),o=n(61),this.ConstructorError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return a(t,e),t}(r),this.BaseConstructor=function(){function e(){this.constructed_objects={},this.constructing_nodes=[],this.deferred_constructors=[]}return e.prototype.yaml_constructors={},e.prototype.yaml_multi_constructors={},e.add_constructor=function(e,t){return this.prototype.hasOwnProperty("yaml_constructors")||(this.prototype.yaml_constructors=o.extend({},this.prototype.yaml_constructors)),this.prototype.yaml_constructors[e]=t},e.add_multi_constructor=function(e,t){return this.prototype.hasOwnProperty("yaml_multi_constructors")||(this.prototype.yaml_multi_constructors=o.extend({},this.prototype.yaml_multi_constructors)),this.prototype.yaml_multi_constructors[e]=t},e.prototype.check_data=function(){return this.check_node()},e.prototype.get_data=function(){if(this.check_node())return this.construct_document(this.get_node())},e.prototype.get_single_data=function(){var e;return e=this.get_single_node(),null!=e?this.construct_document(e):null},e.prototype.construct_document=function(e){var t;for(t=this.construct_object(e);!o.is_empty(this.deferred_constructors);)this.deferred_constructors.pop()();return t},e.prototype.defer=function(e){return this.deferred_constructors.push(e)},e.prototype.construct_object=function(e){var n,r,o,a,s;if(e.unique_id in this.constructed_objects)return this.constructed_objects[e.unique_id];if(o=e.unique_id,u.call(this.constructing_nodes,o)>=0)throw new t.ConstructorError(null,null,"found unconstructable recursive node",e.start_mark);if(this.constructing_nodes.push(e.unique_id),n=null,s=null,e.tag in this.yaml_constructors)n=this.yaml_constructors[e.tag];else{for(a in this.yaml_multi_constructors)if(e.tag.indexOf(0===a)){s=e.tag.slice(a.length),n=this.yaml_multi_constructors[a];break}null==n&&(null in this.yaml_multi_constructors?(s=e.tag,n=this.yaml_multi_constructors[null]):null in this.yaml_constructors?n=this.yaml_constructors[null]:e instanceof i.ScalarNode?n=this.construct_scalar:e instanceof i.SequenceNode?n=this.construct_sequence:e instanceof i.MappingNode&&(n=this.construct_mapping))}return r=n.call(this,null!=s?s:e,e),this.constructed_objects[e.unique_id]=r,this.constructing_nodes.pop(),r},e.prototype.construct_scalar=function(e){if(!(e instanceof i.ScalarNode))throw new t.ConstructorError(null,null,"expected a scalar node but found "+e.id,e.start_mark);return e.value},e.prototype.construct_sequence=function(e){var n,r,o,a,s;if(!(e instanceof i.SequenceNode))throw new t.ConstructorError(null,null,"expected a sequence node but found "+e.id,e.start_mark);for(a=e.value,s=[],r=0,o=a.length;r<o;r++)n=a[r],s.push(this.construct_object(n));return s},e.prototype.construct_mapping=function(e){var n,r,o,a,s,u,l,c,p;if(!(e instanceof i.MappingNode))throw new ConstructorError(null,null,"expected a mapping node but found "+e.id,e.start_mark);for(s={},u=e.value,n=0,a=u.length;n<a;n++){if(l=u[n],o=l[0],p=l[1],"object"==typeof(r=this.construct_object(o)))throw new t.ConstructorError("while constructing a mapping",e.start_mark,"found unhashable key",o.start_mark);c=this.construct_object(p),s[r]=c}return s},e.prototype.construct_pairs=function(e){var n,r,o,a,s,u,l,c,p;if(!(e instanceof i.MappingNode))throw new t.ConstructorError(null,null,"expected a mapping node but found "+e.id,e.start_mark);for(s=[],u=e.value,n=0,a=u.length;n<a;n++)l=u[n],o=l[0],p=l[1],r=this.construct_object(o),c=this.construct_object(p),s.push([r,c]);return s},e}(),this.Constructor=function(n){function r(){return r.__super__.constructor.apply(this,arguments)}var o,s,l;return a(r,n),o={on:!0,off:!1,true:!0,false:!1,yes:!0,no:!1},l=/^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:(?:[Tt]|[\x20\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\.([0-9]*))?(?:[\x20\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?)?$/,s={year:1,month:2,day:3,hour:4,minute:5,second:6,fraction:7,tz:8,tz_sign:9,tz_hour:10,tz_minute:11},r.prototype.construct_scalar=function(e){var t,n,o,a,s,u;if(e instanceof i.MappingNode)for(a=e.value,t=0,o=a.length;t<o;t++)if(s=a[t],n=s[0],u=s[1],"tag:yaml.org,2002:value"===n.tag)return this.construct_scalar(u);return r.__super__.construct_scalar.call(this,e)},r.prototype.flatten_mapping=function(e){var n,r,o,a,s,u,l,c,p,f,h,d,m;for(l=[],r=0;r<e.value.length;)if(c=e.value[r],a=c[0],m=c[1],"tag:yaml.org,2002:merge"===a.tag)if(e.value.splice(r,1),m instanceof i.MappingNode)this.flatten_mapping(m),l=l.concat(m.value);else{if(!(m instanceof i.SequenceNode))throw new t.ConstructorError("while constructing a mapping",e.start_mark,"expected a mapping or list of mappings for merging but found "+m.id,m.start_mark);for(f=[],p=m.value,n=0,s=p.length;n<s;n++){if(!((h=p[n])instanceof i.MappingNode))throw new t.ConstructorError("while constructing a mapping",e.start_mark,"expected a mapping for merging, but found "+h.id,h.start_mark);this.flatten_mapping(h),f.push(h.value)}for(f.reverse(),o=0,u=f.length;o<u;o++)d=f[o],l=l.concat(d)}else"tag:yaml.org,2002:value"===a.tag?(a.tag="tag:yaml.org,2002:str",r++):r++;if(l.length)return e.value=l.concat(e.value)},r.prototype.construct_mapping=function(e){return e instanceof i.MappingNode&&this.flatten_mapping(e),r.__super__.construct_mapping.call(this,e)},r.prototype.construct_yaml_null=function(e){return this.construct_scalar(e),null},r.prototype.construct_yaml_bool=function(e){var t;return t=this.construct_scalar(e),o[t.toLowerCase()]},r.prototype.construct_yaml_int=function(e){var t,n,r,i,o,a,s,l,c;if(c=this.construct_scalar(e),c=c.replace(/_/g,""),l="-"===c[0]?-1:1,s=c[0],u.call("+-",s)>=0&&(c=c.slice(1)),"0"===c)return 0;if(0===c.indexOf("0b"))return l*parseInt(c.slice(2),2);if(0===c.indexOf("0x"))return l*parseInt(c.slice(2),16);if(0===c.indexOf("0o"))return l*parseInt(c.slice(2),8);if("0"===c[0])return l*parseInt(c,8);if(u.call(c,":")>=0){for(r=function(){var e,t,n,r;for(n=c.split(/:/g),r=[],e=0,t=n.length;e<t;e++)a=n[e],r.push(parseInt(a));return r}(),r.reverse(),t=1,c=0,i=0,o=r.length;i<o;i++)n=r[i],c+=n*t,t*=60;return l*c}return l*parseInt(c)},r.prototype.construct_yaml_float=function(e){var t,n,r,i,o,a,s,l,c;if(c=this.construct_scalar(e),c=c.replace(/_/g,"").toLowerCase(),l="-"===c[0]?-1:1,s=c[0],u.call("+-",s)>=0&&(c=c.slice(1)),".inf"===c)return Infinity*l;if(".nan"===c)return NaN;if(u.call(c,":")>=0){for(r=function(){var e,t,n,r;for(n=c.split(/:/g),r=[],e=0,t=n.length;e<t;e++)a=n[e],r.push(parseFloat(a));return r}(),r.reverse(),t=1,c=0,i=0,o=r.length;i<o;i++)n=r[i],c+=n*t,t*=60;return l*c}return l*parseFloat(c)},r.prototype.construct_yaml_binary=function(n){var r,i;i=this.construct_scalar(n);try{return"undefined"!=typeof window&&null!==window?atob(i):new e(i,"base64").toString("ascii")}catch(e){throw r=e,new t.ConstructorError(null,null,"failed to decode base64 data: "+r,n.start_mark)}},r.prototype.construct_yaml_timestamp=function(e){var t,n,r,i,o,a,u,c,p,f,h,d,m,v,g;this.construct_scalar(e),a=e.value.match(l),v={};for(o in s)i=s[o],v[o]=a[i];if(g=parseInt(v.year),p=parseInt(v.month)-1,t=parseInt(v.day),!v.hour)return new Date(Date.UTC(g,p,t));if(r=parseInt(v.hour),c=parseInt(v.minute),f=parseInt(v.second),u=0,v.fraction){for(n=v.fraction.slice(0,6);n.length<6;)n+="0";n=parseInt(n),u=Math.round(n/1e3)}return v.tz_sign&&(m="-"===v.tz_sign?1:-1,(h=parseInt(v.tz_hour))&&(r+=m*h),(d=parseInt(v.tz_minute))&&(c+=m*d)),new Date(Date.UTC(g,p,t,r,c,f,u))},r.prototype.construct_yaml_pair_list=function(e,n){var r;if(r=[],!(n instanceof i.SequenceNode))throw new t.ConstructorError("while constructing "+e,n.start_mark,"expected a sequence but found "+n.id,n.start_mark);return this.defer(function(o){return function(){var a,s,u,l,c,p,f,h,d,m;for(c=n.value,f=[],a=0,l=c.length;a<l;a++){if(!((h=c[a])instanceof i.MappingNode))throw new t.ConstructorError("while constructing "+e,n.start_mark,"expected a mapping of length 1 but found "+h.id,h.start_mark);if(1!==h.value.length)throw new t.ConstructorError("while constructing "+e,n.start_mark,"expected a mapping of length 1 but found "+h.id,h.start_mark);p=h.value[0],u=p[0],m=p[1],s=o.construct_object(u),d=o.construct_object(m),f.push(r.push([s,d]))}return f}}(this)),r},r.prototype.construct_yaml_omap=function(e){return this.construct_yaml_pair_list("an ordered map",e)},r.prototype.construct_yaml_pairs=function(e){return this.construct_yaml_pair_list("pairs",e)},r.prototype.construct_yaml_set=function(e){var t;return t=[],this.defer(function(n){return function(){var r,i;i=[];for(r in n.construct_mapping(e))i.push(t.push(r));return i}}(this)),t},r.prototype.construct_yaml_str=function(e){return this.construct_scalar(e)},r.prototype.construct_yaml_seq=function(e){var t;return t=[],this.defer(function(n){return function(){var r,i,o,a,s;for(a=n.construct_sequence(e),s=[],r=0,o=a.length;r<o;r++)i=a[r],s.push(t.push(i));return s}}(this)),t},r.prototype.construct_yaml_map=function(e){var t;return t={},this.defer(function(n){return function(){var r,i,o,a;i=n.construct_mapping(e),o=[];for(r in i)a=i[r],o.push(t[r]=a);return o}}(this)),t},r.prototype.construct_yaml_object=function(e,t){var n;return n=new t,this.defer(function(t){return function(){var r,i,o,a;i=t.construct_mapping(e,!0),o=[];for(r in i)a=i[r],o.push(n[r]=a);return o}}(this)),n},r.prototype.construct_undefined=function(e){throw new t.ConstructorError(null,null,"could not determine a constructor for the tag "+e.tag,e.start_mark)},r}(this.BaseConstructor),this.Constructor.add_constructor("tag:yaml.org,2002:null",this.Constructor.prototype.construct_yaml_null),this.Constructor.add_constructor("tag:yaml.org,2002:bool",this.Constructor.prototype.construct_yaml_bool),this.Constructor.add_constructor("tag:yaml.org,2002:int",this.Constructor.prototype.construct_yaml_int),this.Constructor.add_constructor("tag:yaml.org,2002:float",this.Constructor.prototype.construct_yaml_float),this.Constructor.add_constructor("tag:yaml.org,2002:binary",this.Constructor.prototype.construct_yaml_binary),this.Constructor.add_constructor("tag:yaml.org,2002:timestamp",this.Constructor.prototype.construct_yaml_timestamp),this.Constructor.add_constructor("tag:yaml.org,2002:omap",this.Constructor.prototype.construct_yaml_omap),this.Constructor.add_constructor("tag:yaml.org,2002:pairs",this.Constructor.prototype.construct_yaml_pairs),this.Constructor.add_constructor("tag:yaml.org,2002:set",this.Constructor.prototype.construct_yaml_set),this.Constructor.add_constructor("tag:yaml.org,2002:str",this.Constructor.prototype.construct_yaml_str),this.Constructor.add_constructor("tag:yaml.org,2002:seq",this.Constructor.prototype.construct_yaml_seq),this.Constructor.add_constructor("tag:yaml.org,2002:map",this.Constructor.prototype.construct_yaml_map),this.Constructor.add_constructor(null,this.Constructor.prototype.construct_undefined)}).call(this)}).call(t,n(40).Buffer)},function(e,t,n){(function(){var e,r,i,o=function(e,t){function n(){this.constructor=e}for(var r in t)a.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},a={}.hasOwnProperty,s=[].slice;r=n(127),e=n(45).MarkedYAMLError,i=n(267),this.ParserError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return o(t,e),t}(e),this.Parser=function(){function e(){this.current_event=null,this.yaml_version=null,this.tag_handles={},this.states=[],this.marks=[],this.state="parse_stream_start"}var n;return n={"!":"!","!!":"tag:yaml.org,2002:"},e.prototype.dispose=function(){return this.states=[],this.state=null},e.prototype.check_event=function(){var e,t,n,r;if(t=1<=arguments.length?s.call(arguments,0):[],null===this.current_event&&null!=this.state&&(this.current_event=this[this.state]()),null!==this.current_event){if(0===t.length)return!0;for(n=0,r=t.length;n<r;n++)if(e=t[n],this.current_event instanceof e)return!0}return!1},e.prototype.peek_event=function(){return null===this.current_event&&null!=this.state&&(this.current_event=this[this.state]()),this.current_event},e.prototype.get_event=function(){var e;return null===this.current_event&&null!=this.state&&(this.current_event=this[this.state]()),e=this.current_event,this.current_event=null,e},e.prototype.parse_stream_start=function(){var e,t;return t=this.get_token(),e=new r.StreamStartEvent(t.start_mark,t.end_mark),this.state="parse_implicit_document_start",e},e.prototype.parse_implicit_document_start=function(){var e,t,o,a;return this.check_token(i.DirectiveToken,i.DocumentStartToken,i.StreamEndToken)?this.parse_document_start():(this.tag_handles=n,a=this.peek_token(),o=e=a.start_mark,t=new r.DocumentStartEvent(o,e,!1),this.states.push("parse_document_end"),this.state="parse_block_node",t)},e.prototype.parse_document_start=function(){for(var e,n,o,a,s,u,l;this.check_token(i.DocumentEndToken);)this.get_token();if(this.check_token(i.StreamEndToken)){if(u=this.get_token(),n=new r.StreamEndEvent(u.start_mark,u.end_mark),0!==this.states.length)throw new Error("assertion error, states should be empty");if(0!==this.marks.length)throw new Error("assertion error, marks should be empty");this.state=null}else{if(a=this.peek_token().start_mark,o=this.process_directives(),l=o[0],s=o[1],!this.check_token(i.DocumentStartToken))throw new t.ParserError("expected '<document start>', but found "+this.peek_token().id,this.peek_token().start_mark);u=this.get_token(),e=u.end_mark,n=new r.DocumentStartEvent(a,e,!0,l,s),this.states.push("parse_document_end"),this.state="parse_document_content"}return n},e.prototype.parse_document_end=function(){var e,t,n,o,a;return a=this.peek_token(),o=e=a.start_mark,n=!1,this.check_token(i.DocumentEndToken)&&(a=this.get_token(),e=a.end_mark,n=!0),t=new r.DocumentEndEvent(o,e,n),this.state="parse_document_start",t},e.prototype.parse_document_content=function(){var e;return this.check_token(i.DirectiveToken,i.DocumentStartToken,i.DocumentEndToken,i.StreamEndToken)?(e=this.process_empty_scalar(this.peek_token().start_mark),this.state=this.states.pop(),e):this.parse_block_node()},e.prototype.process_directives=function(){var e,r,o,s,u,l,c,p,f;for(this.yaml_version=null,this.tag_handles={};this.check_token(i.DirectiveToken);)if(p=this.get_token(),"YAML"===p.name){if(null!==this.yaml_version)throw new t.ParserError(null,null,"found duplicate YAML directive",p.start_mark);if(s=p.value,r=s[0],s[1],1!==r)throw new t.ParserError(null,null,"found incompatible YAML document (version 1.* is required)",p.start_mark);this.yaml_version=p.value}else if("TAG"===p.name){if(u=p.value,e=u[0],o=u[1],e in this.tag_handles)throw new t.ParserError(null,null,"duplicate tag handle "+e,p.start_mark);this.tag_handles[e]=o}c=null,l=this.tag_handles;for(e in l)a.call(l,e)&&(o=l[e],null==c&&(c={}),c[e]=o);f=[this.yaml_version,c];for(e in n)a.call(n,e)&&((o=n[e])in this.tag_handles||(this.tag_handles[e]=o));return f},e.prototype.parse_block_node=function(){return this.parse_node(!0)},e.prototype.parse_flow_node=function(){return this.parse_node()},e.prototype.parse_block_node_or_indentless_sequence=function(){return this.parse_node(!0,!0)},e.prototype.parse_node=function(e,n){var o,a,s,u,l,c,p,f,h,d,m;if(null==e&&(e=!1),null==n&&(n=!1),this.check_token(i.AliasToken))m=this.get_token(),s=new r.AliasEvent(m.value,m.start_mark,m.end_mark),this.state=this.states.pop();else{if(o=null,h=null,p=a=d=null,this.check_token(i.AnchorToken)?(m=this.get_token(),p=m.start_mark,a=m.end_mark,o=m.value,this.check_token(i.TagToken)&&(m=this.get_token(),d=m.start_mark,a=m.end_mark,h=m.value)):this.check_token(i.TagToken)&&(m=this.get_token(),p=d=m.start_mark,a=m.end_mark,h=m.value,this.check_token(i.AnchorToken)&&(m=this.get_token(),a=m.end_mark,o=m.value)),null!==h)if(u=h[0],f=h[1],null!==u){if(!(u in this.tag_handles))throw new t.ParserError("while parsing a node",p,"found undefined tag handle "+u,d);h=this.tag_handles[u]+f}else h=f;if(null===p&&(p=a=this.peek_token().start_mark),s=null,l=null===h||"!"===h,n&&this.check_token(i.BlockEntryToken))a=this.peek_token().end_mark,s=new r.SequenceStartEvent(o,h,l,p,a),this.state="parse_indentless_sequence_entry";else if(this.check_token(i.ScalarToken))m=this.get_token(),a=m.end_mark,l=m.plain&&null===h||"!"===h?[!0,!1]:null===h?[!1,!0]:[!1,!1],s=new r.ScalarEvent(o,h,l,m.value,p,a,m.style),this.state=this.states.pop();else if(this.check_token(i.FlowSequenceStartToken))a=this.peek_token().end_mark,s=new r.SequenceStartEvent(o,h,l,p,a,!0),this.state="parse_flow_sequence_first_entry";else if(this.check_token(i.FlowMappingStartToken))a=this.peek_token().end_mark,s=new r.MappingStartEvent(o,h,l,p,a,!0),this.state="parse_flow_mapping_first_key";else if(e&&this.check_token(i.BlockSequenceStartToken))a=this.peek_token().end_mark,s=new r.SequenceStartEvent(o,h,l,p,a,!1),this.state="parse_block_sequence_first_entry";else if(e&&this.check_token(i.BlockMappingStartToken))a=this.peek_token().end_mark,s=new r.MappingStartEvent(o,h,l,p,a,!1),this.state="parse_block_mapping_first_key";else{if(null===o&&null===h)throw c=e?"block":"flow",m=this.peek_token(),new t.ParserError("while parsing a "+c+" node",p,"expected the node content, but found "+m.id,m.start_mark);s=new r.ScalarEvent(o,h,[l,!1],"",p,a),this.state=this.states.pop()}}return s},e.prototype.parse_block_sequence_first_entry=function(){var e;return e=this.get_token(),this.marks.push(e.start_mark),this.parse_block_sequence_entry()},e.prototype.parse_block_sequence_entry=function(){var e,n;if(this.check_token(i.BlockEntryToken))return n=this.get_token(),this.check_token(i.BlockEntryToken,i.BlockEndToken)?(this.state="parse_block_sequence_entry",this.process_empty_scalar(n.end_mark)):(this.states.push("parse_block_sequence_entry"),this.parse_block_node());if(!this.check_token(i.BlockEndToken))throw n=this.peek_token(),new t.ParserError("while parsing a block collection",this.marks.slice(-1)[0],"expected <block end>, but found "+n.id,n.start_mark);return n=this.get_token(),e=new r.SequenceEndEvent(n.start_mark,n.end_mark),this.state=this.states.pop(),this.marks.pop(),e},e.prototype.parse_indentless_sequence_entry=function(){var e,t;return this.check_token(i.BlockEntryToken)?(t=this.get_token(),this.check_token(i.BlockEntryToken,i.KeyToken,i.ValueToken,i.BlockEndToken)?(this.state="parse_indentless_sequence_entry",this.process_empty_scalar(t.end_mark)):(this.states.push("parse_indentless_sequence_entry"),this.parse_block_node())):(t=this.peek_token(),e=new r.SequenceEndEvent(t.start_mark,t.start_mark),this.state=this.states.pop(),e)},e.prototype.parse_block_mapping_first_key=function(){var e;return e=this.get_token(),this.marks.push(e.start_mark),this.parse_block_mapping_key()},e.prototype.parse_block_mapping_key=function(){var e,n;if(this.check_token(i.KeyToken))return n=this.get_token(),this.check_token(i.KeyToken,i.ValueToken,i.BlockEndToken)?(this.state="parse_block_mapping_value",this.process_empty_scalar(n.end_mark)):(this.states.push("parse_block_mapping_value"),this.parse_block_node_or_indentless_sequence());if(!this.check_token(i.BlockEndToken))throw n=this.peek_token(),new t.ParserError("while parsing a block mapping",this.marks.slice(-1)[0],"expected <block end>, but found "+n.id,n.start_mark);return n=this.get_token(),e=new r.MappingEndEvent(n.start_mark,n.end_mark),this.state=this.states.pop(),this.marks.pop(),e},e.prototype.parse_block_mapping_value=function(){var e;return this.check_token(i.ValueToken)?(e=this.get_token(),this.check_token(i.KeyToken,i.ValueToken,i.BlockEndToken)?(this.state="parse_block_mapping_key",this.process_empty_scalar(e.end_mark)):(this.states.push("parse_block_mapping_key"),this.parse_block_node_or_indentless_sequence())):(this.state="parse_block_mapping_key",e=this.peek_token(),this.process_empty_scalar(e.start_mark))},e.prototype.parse_flow_sequence_first_entry=function(){var e;return e=this.get_token(),this.marks.push(e.start_mark),this.parse_flow_sequence_entry(!0)},e.prototype.parse_flow_sequence_entry=function(e){var n,o;if(null==e&&(e=!1),!this.check_token(i.FlowSequenceEndToken)){if(!e){if(!this.check_token(i.FlowEntryToken))throw o=this.peek_token(),new t.ParserError("while parsing a flow sequence",this.marks.slice(-1)[0],"expected ',' or ']', but got "+o.id,o.start_mark);this.get_token()}if(this.check_token(i.KeyToken))return o=this.peek_token(),n=new r.MappingStartEvent(null,null,!0,o.start_mark,o.end_mark,!0),this.state="parse_flow_sequence_entry_mapping_key",n;if(!this.check_token(i.FlowSequenceEndToken))return this.states.push("parse_flow_sequence_entry"),this.parse_flow_node()}return o=this.get_token(),n=new r.SequenceEndEvent(o.start_mark,o.end_mark),this.state=this.states.pop(),this.marks.pop(),n},e.prototype.parse_flow_sequence_entry_mapping_key=function(){var e;return e=this.get_token(),this.check_token(i.ValueToken,i.FlowEntryToken,i.FlowSequenceEndToken)?(this.state="parse_flow_sequence_entry_mapping_value",this.process_empty_scalar(e.end_mark)):(this.states.push("parse_flow_sequence_entry_mapping_value"),this.parse_flow_node())},e.prototype.parse_flow_sequence_entry_mapping_value=function(){var e;return this.check_token(i.ValueToken)?(e=this.get_token(),this.check_token(i.FlowEntryToken,i.FlowSequenceEndToken)?(this.state="parse_flow_sequence_entry_mapping_end",this.process_empty_scalar(e.end_mark)):(this.states.push("parse_flow_sequence_entry_mapping_end"),this.parse_flow_node())):(this.state="parse_flow_sequence_entry_mapping_end",e=this.peek_token(),this.process_empty_scalar(e.start_mark))},e.prototype.parse_flow_sequence_entry_mapping_end=function(){var e;return this.state="parse_flow_sequence_entry",e=this.peek_token(),new r.MappingEndEvent(e.start_mark,e.start_mark)},e.prototype.parse_flow_mapping_first_key=function(){var e;return e=this.get_token(),this.marks.push(e.start_mark),this.parse_flow_mapping_key(!0)},e.prototype.parse_flow_mapping_key=function(e){var n,o;if(null==e&&(e=!1),!this.check_token(i.FlowMappingEndToken)){if(!e){if(!this.check_token(i.FlowEntryToken))throw o=this.peek_token(),new t.ParserError("while parsing a flow mapping",this.marks.slice(-1)[0],"expected ',' or '}', but got "+o.id,o.start_mark);this.get_token()}if(this.check_token(i.KeyToken))return o=this.get_token(),this.check_token(i.ValueToken,i.FlowEntryToken,i.FlowMappingEndToken)?(this.state="parse_flow_mapping_value",this.process_empty_scalar(o.end_mark)):(this.states.push("parse_flow_mapping_value"),this.parse_flow_node());if(!this.check_token(i.FlowMappingEndToken))return this.states.push("parse_flow_mapping_empty_value"),this.parse_flow_node()}return o=this.get_token(),n=new r.MappingEndEvent(o.start_mark,o.end_mark),this.state=this.states.pop(),this.marks.pop(),n},e.prototype.parse_flow_mapping_value=function(){var e;return this.check_token(i.ValueToken)?(e=this.get_token(),this.check_token(i.FlowEntryToken,i.FlowMappingEndToken)?(this.state="parse_flow_mapping_key",this.process_empty_scalar(e.end_mark)):(this.states.push("parse_flow_mapping_key"),this.parse_flow_node())):(this.state="parse_flow_mapping_key",e=this.peek_token(),this.process_empty_scalar(e.start_mark))},e.prototype.parse_flow_mapping_empty_value=function(){return this.state="parse_flow_mapping_key",this.process_empty_scalar(this.peek_token().start_mark)},e.prototype.process_empty_scalar=function(e){return new r.ScalarEvent(null,null,[!0,!1],"",e,e)},e}()}).call(this)},function(e,t,n){(function(){var e,r,i,o=function(e,t){function n(){this.constructor=e}for(var r in t)a.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},a={}.hasOwnProperty,s=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};i=n(45),e=i.Mark,r=i.YAMLError,this.ReaderError=function(e){function t(e,n,r){this.position=e,this.character=n,this.reason=r,t.__super__.constructor.call(this)}return o(t,e),t.prototype.toString=function(){return"unacceptable character #"+this.character.charCodeAt(0).toString(16)+": "+this.reason+"\n  position "+this.position},t}(r),this.Reader=function(){function n(e){this.string=e,this.line=0,this.column=0,this.index=0,this.check_printable(),this.string+="\0"}var r;return r=/[^\x09\x0A\x0D\x20-\x7E\x85\xA0-\uFFFD]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,n.prototype.peek=function(e){return null==e&&(e=0),this.string[this.index+e]},n.prototype.prefix=function(e){return null==e&&(e=1),this.string.slice(this.index,this.index+e)},n.prototype.forward=function(e){var t,n;for(null==e&&(e=1),n=[];e;)t=this.string[this.index],this.index++,s.call("\n…₂\u2029",t)>=0||"\r"===t&&"\n"!==this.string[this.index]?(this.line++,this.column=0):this.column++,n.push(e--);return n},n.prototype.get_mark=function(){return new e(this.line,this.column,this.string,this.index)},n.prototype.check_printable=function(){var e,n,i;if(n=r.exec(this.string))throw e=n[0],i=this.string.length-this.index+n.index,new t.ReaderError(i,e,"special characters are not allowed")},n}()}).call(this)},function(e,t,n){(function(){var e,r,i,o,a=function(e,t){function n(){this.constructor=e}for(var r in t)s.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},s={}.hasOwnProperty,u=[].slice,l=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};e=n(45).MarkedYAMLError,i=n(267),o=n(61),this.ScannerError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return a(t,e),t}(e),r=function(){function e(e,t,n,r,i,o){this.token_number=e,this.required=t,this.index=n,this.line=r,this.column=i,this.mark=o}return e}(),this.Scanner=function(){function e(){this.done=!1,this.flow_level=0,this.tokens=[],this.fetch_stream_start(),this.tokens_taken=0,this.indent=-1,this.indents=[],this.allow_simple_key=!0,this.possible_simple_keys={}}var n,a,c,p,f;return n="\r\n…\u2028\u2029",c="\t ",a="0123456789",f={0:"\0",a:"",b:"\b",t:"\t","\t":"\t",n:"\n",v:"\v",f:"\f",r:"\r",e:""," ":" ",'"':'"',"\\":"\\",N:"…",_:" ",L:"\u2028",P:"\u2029"},p={x:2,u:4,U:8},e.prototype.check_token=function(){var e,t,n,r;for(t=1<=arguments.length?u.call(arguments,0):[];this.need_more_tokens();)this.fetch_more_tokens();if(0!==this.tokens.length){if(0===t.length)return!0;for(n=0,r=t.length;n<r;n++)if(e=t[n],this.tokens[0]instanceof e)return!0}return!1},e.prototype.peek_token=function(){for(;this.need_more_tokens();)this.fetch_more_tokens();if(0!==this.tokens.length)return this.tokens[0]},e.prototype.get_token=function(){for(;this.need_more_tokens();)this.fetch_more_tokens();if(0!==this.tokens.length)return this.tokens_taken++,this.tokens.shift()},e.prototype.need_more_tokens=function(){return!this.done&&(0===this.tokens.length||(this.stale_possible_simple_keys(),this.next_possible_simple_key()===this.tokens_taken))},e.prototype.fetch_more_tokens=function(){var e;if(this.scan_to_next_token(),this.stale_possible_simple_keys(),this.unwind_indent(this.column),"\0"===(e=this.peek()))return this.fetch_stream_end();if("%"===e&&this.check_directive())return this.fetch_directive();if("-"===e&&this.check_document_start())return this.fetch_document_start();if("."===e&&this.check_document_end())return this.fetch_document_end();if("["===e)return this.fetch_flow_sequence_start();if("{"===e)return this.fetch_flow_mapping_start();if("]"===e)return this.fetch_flow_sequence_end();if("}"===e)return this.fetch_flow_mapping_end();if(","===e)return this.fetch_flow_entry();if("-"===e&&this.check_block_entry())return this.fetch_block_entry();if("?"===e&&this.check_key())return this.fetch_key();if(":"===e&&this.check_value())return this.fetch_value();if("*"===e)return this.fetch_alias();if("&"===e)return this.fetch_anchor();if("!"===e)return this.fetch_tag();if("|"===e&&0===this.flow_level)return this.fetch_literal();if(">"===e&&0===this.flow_level)return this.fetch_folded();if("'"===e)return this.fetch_single();if('"'===e)return this.fetch_double();if(this.check_plain())return this.fetch_plain();throw new t.ScannerError("while scanning for the next token",null,"found character "+e+" that cannot start any token",this.get_mark())},e.prototype.next_possible_simple_key=function(){var e,t,n,r;n=null,r=this.possible_simple_keys;for(t in r)s.call(r,t)&&(e=r[t],(null===n||e.token_number<n)&&(n=e.token_number));return n},e.prototype.stale_possible_simple_keys=function(){var e,n,r,i;r=this.possible_simple_keys,i=[];for(n in r)if(s.call(r,n)&&(e=r[n],!(e.line===this.line&&this.index-e.index<=1024))){if(e.required)throw new t.ScannerError("while scanning a simple key",e.mark,"could not find expected ':'",this.get_mark());i.push(delete this.possible_simple_keys[n])}return i},e.prototype.save_possible_simple_key=function(){var e,t;if((e=0===this.flow_level&&this.indent===this.column)&&!this.allow_simple_key)throw new Error("logic failure");if(this.allow_simple_key)return this.remove_possible_simple_key(),t=this.tokens_taken+this.tokens.length,this.possible_simple_keys[this.flow_level]=new r(t,e,this.index,this.line,this.column,this.get_mark())},e.prototype.remove_possible_simple_key=function(){var e;if(e=this.possible_simple_keys[this.flow_level]){if(e.required)throw new t.ScannerError("while scanning a simple key",e.mark,"could not find expected ':'",this.get_mark());return delete this.possible_simple_keys[this.flow_level]}},e.prototype.unwind_indent=function(e){var t,n;if(0===this.flow_level){for(n=[];this.indent>e;)t=this.get_mark(),this.indent=this.indents.pop(),n.push(this.tokens.push(new i.BlockEndToken(t,t)));return n}},e.prototype.add_indent=function(e){return e>this.indent&&(this.indents.push(this.indent),this.indent=e,!0)},e.prototype.fetch_stream_start=function(){var e;return e=this.get_mark(),this.tokens.push(new i.StreamStartToken(e,e,this.encoding))},e.prototype.fetch_stream_end=function(){var e;return this.unwind_indent(-1),this.remove_possible_simple_key(),this.allow_possible_simple_key=!1,this.possible_simple_keys={},e=this.get_mark(),this.tokens.push(new i.StreamEndToken(e,e)),this.done=!0},e.prototype.fetch_directive=function(){return this.unwind_indent(-1),this.remove_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_directive())},e.prototype.fetch_document_start=function(){return this.fetch_document_indicator(i.DocumentStartToken)},e.prototype.fetch_document_end=function(){return this.fetch_document_indicator(i.DocumentEndToken)},e.prototype.fetch_document_indicator=function(e){var t;return this.unwind_indent(-1),this.remove_possible_simple_key(),this.allow_simple_key=!1,t=this.get_mark(),this.forward(3),this.tokens.push(new e(t,this.get_mark()))},e.prototype.fetch_flow_sequence_start=function(){return this.fetch_flow_collection_start(i.FlowSequenceStartToken)},e.prototype.fetch_flow_mapping_start=function(){return this.fetch_flow_collection_start(i.FlowMappingStartToken)},e.prototype.fetch_flow_collection_start=function(e){var t;return this.save_possible_simple_key(),this.flow_level++,this.allow_simple_key=!0,t=this.get_mark(),this.forward(),this.tokens.push(new e(t,this.get_mark()))},e.prototype.fetch_flow_sequence_end=function(){return this.fetch_flow_collection_end(i.FlowSequenceEndToken)},e.prototype.fetch_flow_mapping_end=function(){return this.fetch_flow_collection_end(i.FlowMappingEndToken)},e.prototype.fetch_flow_collection_end=function(e){var t;return this.remove_possible_simple_key(),this.flow_level--,this.allow_simple_key=!1,t=this.get_mark(),this.forward(),this.tokens.push(new e(t,this.get_mark()))},e.prototype.fetch_flow_entry=function(){var e;return this.allow_simple_key=!0,this.remove_possible_simple_key(),e=this.get_mark(),this.forward(),this.tokens.push(new i.FlowEntryToken(e,this.get_mark()))},e.prototype.fetch_block_entry=function(){var e,n;if(0===this.flow_level){if(!this.allow_simple_key)throw new t.ScannerError(null,null,"sequence entries are not allowed here",this.get_mark());this.add_indent(this.column)&&(e=this.get_mark(),this.tokens.push(new i.BlockSequenceStartToken(e,e)))}return this.allow_simple_key=!0,this.remove_possible_simple_key(),n=this.get_mark(),this.forward(),this.tokens.push(new i.BlockEntryToken(n,this.get_mark()))},e.prototype.fetch_key=function(){var e,n;if(0===this.flow_level){if(!this.allow_simple_key)throw new t.ScannerError(null,null,"mapping keys are not allowed here",this.get_mark());this.add_indent(this.column)&&(e=this.get_mark(),this.tokens.push(new i.BlockMappingStartToken(e,e)))}return this.allow_simple_key=!this.flow_level,this.remove_possible_simple_key(),n=this.get_mark(),this.forward(),this.tokens.push(new i.KeyToken(n,this.get_mark()))},e.prototype.fetch_value=function(){var e,n,r;if(e=this.possible_simple_keys[this.flow_level])delete this.possible_simple_keys[this.flow_level],this.tokens.splice(e.token_number-this.tokens_taken,0,new i.KeyToken(e.mark,e.mark)),0===this.flow_level&&this.add_indent(e.column)&&this.tokens.splice(e.token_number-this.tokens_taken,0,new i.BlockMappingStartToken(e.mark,e.mark)),this.allow_simple_key=!1;else{if(0===this.flow_level){if(!this.allow_simple_key)throw new t.ScannerError(null,null,"mapping values are not allowed here",this.get_mark());this.add_indent(this.column)&&(n=this.get_mark(),this.tokens.push(new i.BlockMappingStartToken(n,n)))}this.allow_simple_key=!this.flow_level,this.remove_possible_simple_key()}return r=this.get_mark(),this.forward(),this.tokens.push(new i.ValueToken(r,this.get_mark()))},e.prototype.fetch_alias=function(){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_anchor(i.AliasToken))},e.prototype.fetch_anchor=function(){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_anchor(i.AnchorToken))},e.prototype.fetch_tag=function(){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_tag())},e.prototype.fetch_literal=function(){return this.fetch_block_scalar("|")},e.prototype.fetch_folded=function(){return this.fetch_block_scalar(">")},e.prototype.fetch_block_scalar=function(e){return this.allow_simple_key=!0,this.remove_possible_simple_key(),this.tokens.push(this.scan_block_scalar(e))},e.prototype.fetch_single=function(){return this.fetch_flow_scalar("'")},e.prototype.fetch_double=function(){return this.fetch_flow_scalar('"')},e.prototype.fetch_flow_scalar=function(e){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_flow_scalar(e))},e.prototype.fetch_plain=function(){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_plain())},e.prototype.check_directive=function(){return 0===this.column},e.prototype.check_document_start=function(){var e;return 0===this.column&&"---"===this.prefix(3)&&(e=this.peek(3),l.call(n+c+"\0",e)>=0)},e.prototype.check_document_end=function(){var e;return 0===this.column&&"..."===this.prefix(3)&&(e=this.peek(3),l.call(n+c+"\0",e)>=0)},e.prototype.check_block_entry=function(){var e;return e=this.peek(1),l.call(n+c+"\0",e)>=0},e.prototype.check_key=function(){var e;return 0!==this.flow_level||(e=this.peek(1),l.call(n+c+"\0",e)>=0)},e.prototype.check_value=function(){var e;return 0!==this.flow_level||(e=this.peek(1),l.call(n+c+"\0",e)>=0)},e.prototype.check_plain=function(){var e,t;return e=this.peek(),l.call(n+c+"\0-?:,[]{}#&*!|>'\"%@`",e)<0||(t=this.peek(1),l.call(n+c+"\0",t)<0&&("-"===e||0===this.flow_level&&l.call("?:",e)>=0))},e.prototype.scan_to_next_token=function(){var e,t,r;for(0===this.index&&"\ufeff"===this.peek()&&this.forward(),e=!1,r=[];!e;){for(;" "===this.peek();)this.forward();if("#"===this.peek())for(;t=this.peek(),l.call(n+"\0",t)<0;)this.forward();this.scan_line_break()?0===this.flow_level?r.push(this.allow_simple_key=!0):r.push(void 0):r.push(e=!0)}return r},e.prototype.scan_directive=function(){var e,t,r,o,a;if(o=this.get_mark(),this.forward(),t=this.scan_directive_name(o),a=null,"YAML"===t)a=this.scan_yaml_directive_value(o),e=this.get_mark();else if("TAG"===t)a=this.scan_tag_directive_value(o),e=this.get_mark();else for(e=this.get_mark();r=this.peek(),l.call(n+"\0",r)<0;)this.forward();return this.scan_directive_ignored_line(o),new i.DirectiveToken(t,a,o,e)},e.prototype.scan_directive_name=function(e){var r,i,o;for(i=0,r=this.peek(i);"0"<=r&&r<="9"||"A"<=r&&r<="Z"||"a"<=r&&r<="z"||l.call("-_",r)>=0;)i++,r=this.peek(i);if(0===i)throw new t.ScannerError("while scanning a directive",e,"expected alphanumeric or numeric character but found "+r,this.get_mark());if(o=this.prefix(i),this.forward(i),r=this.peek(),l.call(n+"\0 ",r)<0)throw new t.ScannerError("while scanning a directive",e,"expected alphanumeric or numeric character but found "+r,this.get_mark());return o},e.prototype.scan_yaml_directive_value=function(e){for(var r,i,o;" "===this.peek();)this.forward();if(r=this.scan_yaml_directive_number(e),"."!==this.peek())throw new t.ScannerError("while scanning a directive",e,"expected a digit or '.' but found "+this.peek(),this.get_mark());if(this.forward(),i=this.scan_yaml_directive_number(e),o=this.peek(),l.call(n+"\0 ",o)<0)throw new t.ScannerError("while scanning a directive",e,"expected a digit or ' ' but found "+this.peek(),this.get_mark());return[r,i]},e.prototype.scan_yaml_directive_number=function(e){var n,r,i,o;if(!("0"<=(n=this.peek())&&n<="9"))throw new t.ScannerError("while scanning a directive",e,"expected a digit but found "+n,this.get_mark());for(r=0;"0"<=(i=this.peek(r))&&i<="9";)r++;return o=parseInt(this.prefix(r)),this.forward(r),o},e.prototype.scan_tag_directive_value=function(e){for(var t,n;" "===this.peek();)this.forward();for(t=this.scan_tag_directive_handle(e);" "===this.peek();)this.forward();return n=this.scan_tag_directive_prefix(e),[t,n]},e.prototype.scan_tag_directive_handle=function(e){var n,r;if(r=this.scan_tag_handle("directive",e)," "!==(n=this.peek()))throw new t.ScannerError("while scanning a directive",e,"expected ' ' but found "+n,this.get_mark());return r},e.prototype.scan_tag_directive_prefix=function(e){var r,i;if(i=this.scan_tag_uri("directive",e),r=this.peek(),l.call(n+"\0 ",r)<0)throw new t.ScannerError("while scanning a directive",e,"expected ' ' but found "+r,this.get_mark());return i},e.prototype.scan_directive_ignored_line=function(e){for(var r,i;" "===this.peek();)this.forward();if("#"===this.peek())for(;i=this.peek(),l.call(n+"\0",i)<0;)this.forward();if(r=this.peek(),l.call(n+"\0",r)<0)throw new t.ScannerError("while scanning a directive",e,"expected a comment or a line break but found "+r,this.get_mark());return this.scan_line_break()},e.prototype.scan_anchor=function(e){var r,i,o,a,s,u;for(s=this.get_mark(),i=this.peek(),a="*"===i?"alias":"anchor",this.forward(),o=0,r=this.peek(o);"0"<=r&&r<="9"||"A"<=r&&r<="Z"||"a"<=r&&r<="z"||l.call("-_",r)>=0;)o++,r=this.peek(o);if(0===o)throw new t.ScannerError("while scanning an "+a,s,"expected alphabetic or numeric character but found '"+r+"'",this.get_mark());if(u=this.prefix(o),this.forward(o),r=this.peek(),l.call(n+c+"\0?:,]}%@`",r)<0)throw new t.ScannerError("while scanning an "+a,s,"expected alphabetic or numeric character but found '"+r+"'",this.get_mark());return new e(u,s,this.get_mark())},e.prototype.scan_tag=function(){var e,r,o,a,s,u;if(a=this.get_mark(),"<"===(e=this.peek(1))){if(r=null,this.forward(2),s=this.scan_tag_uri("tag",a),">"!==this.peek())throw new t.ScannerError("while parsing a tag",a,"expected '>' but found "+this.peek(),this.get_mark());this.forward()}else if(l.call(n+c+"\0",e)>=0)r=null,s="!",this.forward();else{for(o=1,u=!1;l.call(n+"\0 ",e)<0;){if("!"===e){u=!0;break}o++,e=this.peek(o)}u?r=this.scan_tag_handle("tag",a):(r="!",this.forward()),s=this.scan_tag_uri("tag",a)}if(e=this.peek(),l.call(n+"\0 ",e)<0)throw new t.ScannerError("while scanning a tag",a,"expected ' ' but found "+e,this.get_mark());return new i.TagToken([r,s],a,this.get_mark())},e.prototype.scan_block_scalar=function(e){var t,r,a,s,u,c,p,f,h,d,m,v,g,y,_,b,x,w,k,E;for(u=">"===e,a=[],E=this.get_mark(),this.forward(),g=this.scan_block_scalar_indicators(E),r=g[0],c=g[1],this.scan_block_scalar_ignored_line(E),v=this.indent+1,v<1&&(v=1),null==c?(y=this.scan_block_scalar_indentation(),t=y[0],m=y[1],s=y[2],p=Math.max(v,m)):(p=v+c-1,_=this.scan_block_scalar_breaks(p),t=_[0],s=_[1]),d="";this.column===p&&"\0"!==this.peek();){for(a=a.concat(t),b=this.peek(),f=l.call(" \t",b)<0,h=0;x=this.peek(h),l.call(n+"\0",x)<0;)h++;if(a.push(this.prefix(h)),this.forward(h),d=this.scan_line_break(),w=this.scan_block_scalar_breaks(p),t=w[0],s=w[1],this.column!==p||"\0"===this.peek())break;u&&"\n"===d&&f&&(k=this.peek(),l.call(" \t",k)<0)?o.is_empty(t)&&a.push(" "):a.push(d)}return!1!==r&&a.push(d),!0===r&&(a=a.concat(t)),new i.ScalarToken(a.join(""),!1,E,s,e)},e.prototype.scan_block_scalar_indicators=function(e){var r,i,o;if(i=null,o=null,r=this.peek(),l.call("+-",r)>=0){if(i="+"===r,this.forward(),r=this.peek(),l.call(a,r)>=0){if(0===(o=parseInt(r)))throw new t.ScannerError("while scanning a block scalar",e,"expected indentation indicator in the range 1-9 but found 0",this.get_mark());this.forward()}}else if(l.call(a,r)>=0){if(0===(o=parseInt(r)))throw new t.ScannerError("while scanning a block scalar",e,"expected indentation indicator in the range 1-9 but found 0",this.get_mark());this.forward(),r=this.peek(),l.call("+-",r)>=0&&(i="+"===r,this.forward())}if(r=this.peek(),l.call(n+"\0 ",r)<0)throw new t.ScannerError("while scanning a block scalar",e,"expected chomping or indentation indicators, but found "+r,this.get_mark());return[i,o]},e.prototype.scan_block_scalar_ignored_line=function(e){for(var r,i;" "===this.peek();)this.forward();if("#"===this.peek())for(;i=this.peek(),l.call(n+"\0",i)<0;)this.forward();if(r=this.peek(),l.call(n+"\0",r)<0)throw new t.ScannerError("while scanning a block scalar",e,"expected a comment or a line break but found "+r,this.get_mark());return this.scan_line_break()},e.prototype.scan_block_scalar_indentation=function(){var e,t,r,i;for(e=[],r=0,t=this.get_mark();i=this.peek(),l.call(n+" ",i)>=0;)" "!==this.peek()?(e.push(this.scan_line_break()),t=this.get_mark()):(this.forward(),this.column>r&&(r=this.column));return[e,r,t]},e.prototype.scan_block_scalar_breaks=function(e){var t,r,i;for(t=[],r=this.get_mark();this.column<e&&" "===this.peek();)this.forward();for(;i=this.peek(),l.call(n,i)>=0;)for(t.push(this.scan_line_break()),r=this.get_mark();this.column<e&&" "===this.peek();)this.forward();return[t,r]},e.prototype.scan_flow_scalar=function(e){var t,n,r,o;for(n='"'===e,t=[],o=this.get_mark(),r=this.peek(),this.forward(),t=t.concat(this.scan_flow_scalar_non_spaces(n,o));this.peek()!==r;)t=t.concat(this.scan_flow_scalar_spaces(n,o)),t=t.concat(this.scan_flow_scalar_non_spaces(n,o));return this.forward(),new i.ScalarToken(t.join(""),!1,o,this.get_mark(),e)},e.prototype.scan_flow_scalar_non_spaces=function(e,r){var i,o,s,u,h,d,m,v,g;for(o=[];;){for(d=0;m=this.peek(d),l.call(n+c+"'\"\\\0",m)<0;)d++;if(0!==d&&(o.push(this.prefix(d)),this.forward(d)),i=this.peek(),e||"'"!==i||"'"!==this.peek(1))if(e&&"'"===i||!e&&l.call('"\\',i)>=0)o.push(i),this.forward();else{if(!e||"\\"!==i)return o;if(this.forward(),(i=this.peek())in f)o.push(f[i]),this.forward();else if(i in p){for(d=p[i],this.forward(),h=u=0,v=d;0<=v?u<v:u>v;h=0<=v?++u:--u)if(g=this.peek(h),l.call(a+"ABCDEFabcdef",g)<0)throw new t.ScannerError("while scanning a double-quoted scalar",r,"expected escape sequence of "+d+" hexadecimal numbers, but found "+this.peek(h),this.get_mark());s=parseInt(this.prefix(d),16),o.push(String.fromCharCode(s)),this.forward(d)}else{if(!(l.call(n,i)>=0))throw new t.ScannerError("while scanning a double-quoted scalar",r,"found unknown escape character "+i,this.get_mark());this.scan_line_break(),o=o.concat(this.scan_flow_scalar_breaks(e,r))}}else o.push("'"),this.forward(2)}},e.prototype.scan_flow_scalar_spaces=function(e,r){var i,o,a,s,u,p,f;for(a=[],s=0;p=this.peek(s),l.call(c,p)>=0;)s++;if(f=this.prefix(s),this.forward(s),"\0"===(o=this.peek()))throw new t.ScannerError("while scanning a quoted scalar",r,"found unexpected end of stream",this.get_mark());return l.call(n,o)>=0?(u=this.scan_line_break(),i=this.scan_flow_scalar_breaks(e,r),"\n"!==u?a.push(u):0===i.length&&a.push(" "),a=a.concat(i)):a.push(f),a},e.prototype.scan_flow_scalar_breaks=function(e,r){var i,o,a,s,u;for(i=[];;){if("---"===(o=this.prefix(3))||"..."===o&&(a=this.peek(3),l.call(n+c+"\0",a)>=0))throw new t.ScannerError("while scanning a quoted scalar",r,"found unexpected document separator",this.get_mark());for(;s=this.peek(),l.call(c,s)>=0;)this.forward();if(u=this.peek(),!(l.call(n,u)>=0))return i;i.push(this.scan_line_break())}},e.prototype.scan_plain=function(){var e,r,o,a,s,u,p,f,h;for(r=[],h=o=this.get_mark(),a=this.indent+1,f=[];;){if(s=0,"#"===this.peek())break;for(;;){if(e=this.peek(s),l.call(n+c+"\0",e)>=0||0===this.flow_level&&":"===e&&(u=this.peek(s+1),l.call(n+c+"\0",u)>=0)||0!==this.flow_level&&l.call(",:?[]{}",e)>=0)break;s++}if(0!==this.flow_level&&":"===e&&(p=this.peek(s+1),l.call(n+c+"\0,[]{}",p)<0))throw this.forward(s),new t.ScannerError("while scanning a plain scalar",h,"found unexpected ':'",this.get_mark(),"Please check http://pyyaml.org/wiki/YAMLColonInFlowContext");if(0===s)break;if(this.allow_simple_key=!1,r=r.concat(f),r.push(this.prefix(s)),this.forward(s),o=this.get_mark(),null==(f=this.scan_plain_spaces(a,h))||0===f.length||"#"===this.peek()||0===this.flow_level&&this.column<a)break}return new i.ScalarToken(r.join(""),!0,h,o)},e.prototype.scan_plain_spaces=function(e,t){var r,i,o,a,s,u,p,f,h,d,m;for(o=[],a=0;p=this.peek(a),l.call(" ",p)>=0;)a++;if(m=this.prefix(a),this.forward(a),i=this.peek(),l.call(n,i)>=0){if(s=this.scan_line_break(),this.allow_simple_key=!0,"---"===(u=this.prefix(3))||"..."===u&&(f=this.peek(3),l.call(n+c+"\0",f)>=0))return;for(r=[];d=this.peek(),l.call(n+" ",d)>=0;)if(" "===this.peek())this.forward();else if(r.push(this.scan_line_break()),"---"===(u=this.prefix(3))||"..."===u&&(h=this.peek(3),l.call(n+c+"\0",h)>=0))return;"\n"!==s?o.push(s):0===r.length&&o.push(" "),o=o.concat(r)}else m&&o.push(m);return o},e.prototype.scan_tag_handle=function(e,n){var r,i,o;if("!"!==(r=this.peek()))throw new t.ScannerError("while scanning a "+e,n,"expected '!' but found "+r,this.get_mark());if(i=1," "!==(r=this.peek(i))){for(;"0"<=r&&r<="9"||"A"<=r&&r<="Z"||"a"<=r&&r<="z"||l.call("-_",r)>=0;)i++,r=this.peek(i);if("!"!==r)throw this.forward(i),new t.ScannerError("while scanning a "+e,n,"expected '!' but found "+r,this.get_mark());i++}return o=this.prefix(i),this.forward(i),o},e.prototype.scan_tag_uri=function(e,n){var r,i,o;for(i=[],o=0,r=this.peek(o);"0"<=r&&r<="9"||"A"<=r&&r<="Z"||"a"<=r&&r<="z"||l.call("-;/?:@&=+$,_.!~*'()[]%",r)>=0;)"%"===r?(i.push(this.prefix(o)),this.forward(o),o=0,i.push(this.scan_uri_escapes(e,n))):o++,r=this.peek(o);if(0!==o&&(i.push(this.prefix(o)),this.forward(o),o=0),0===i.length)throw new t.ScannerError("while parsing a "+e,n,"expected URI but found "+r,this.get_mark());return i.join("")},e.prototype.scan_uri_escapes=function(e,n){var r,i,o;for(r=[],this.get_mark();"%"===this.peek();){for(this.forward(),o=i=0;i<=2;o=++i)throw new t.ScannerError("while scanning a "+e,n,"expected URI escape sequence of 2 hexadecimal numbers but found "+this.peek(o),this.get_mark());r.push(String.fromCharCode(parseInt(this.prefix(2),16))),this.forward(2)}return r.join("")},e.prototype.scan_line_break=function(){var e;return e=this.peek(),l.call("\r\n…",e)>=0?("\r\n"===this.prefix(2)?this.forward(2):this.forward(),"\n"):l.call("\u2028\u2029",e)>=0?(this.forward(),e):""},e}()}).call(this)},function(e,t){},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}var i=n(35),o=r(i),a=n(47),s=r(a),u=n(48),l=r(u),c=n(203),p=r(c),f=n(562),h=r(f),d=n(46),m=r(d),v=n(560),g=r(v),y=n(271),_=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(y),b=n(9),x={PACKAGE_VERSION:"3.10.0",GIT_COMMIT:"g2e05bb99",GIT_DIRTY:!0,HOSTNAME:"banjo",BUILD_TIME:"Sat, 10 Feb 2018 04:32:34 GMT"},w=x.GIT_DIRTY,k=x.GIT_COMMIT,E=x.PACKAGE_VERSION,S=x.HOSTNAME,C=x.BUILD_TIME;e.exports=function(e){m.default.versions=m.default.versions||{},m.default.versions.swaggerUi={version:E,gitRevision:k,gitDirty:w,buildTimestamp:C,machine:S};var t={dom_id:null,domNode:null,spec:{},url:"",urls:null,layout:"BaseLayout",docExpansion:"list",maxDisplayedTags:null,filter:null,validatorUrl:"https://online.swagger.io/validator",configs:{},custom:{},displayOperationId:!1,displayRequestDuration:!1,deepLinking:!1,requestInterceptor:function(e){return e},responseInterceptor:function(e){return e},showMutatedRequest:!0,defaultModelRendering:"example",defaultModelExpandDepth:1,defaultModelsExpandDepth:1,showExtensions:!1,supportedSubmitMethods:["get","put","post","delete","options","head","patch","trace"],presets:[g.default],plugins:[],initialState:{},fn:{},components:{}},n=(0,b.parseSearch)(),r=e.domNode;delete e.domNode;var i=(0,p.default)({},t,e,n),a={system:{configs:i.configs},plugins:i.presets,state:(0,p.default)({layout:{layout:i.layout,filter:i.filter},spec:{spec:"",url:i.url}},i.initialState)};if(i.initialState)for(var u in i.initialState)i.initialState.hasOwnProperty(u)&&void 0===i.initialState[u]&&delete a.state[u];var c=function(){return{fn:i.fn,components:i.components,state:i.state}},f=new h.default(a);f.register([i.plugins,c]);var d=f.getSystem(),v=function(e){if("object"!==(void 0===i?"undefined":(0,l.default)(i)))return d;var t=d.specSelectors.getLocalConfig?d.specSelectors.getLocalConfig():{},a=(0,p.default)({},t,i,e||{},n);if(r&&(a.domNode=r),f.setConfigs(a),null!==e&&(!n.url&&"object"===(0,l.default)(a.spec)&&(0,s.default)(a.spec).length?(d.specActions.updateUrl(""),d.specActions.updateLoadingStatus("success"),d.specActions.updateSpec((0,o.default)(a.spec))):d.specActions.download&&a.url&&(d.specActions.updateUrl(a.url),d.specActions.download(a.url))),a.domNode)d.render(a.domNode,"App");else if(a.dom_id){var u=document.querySelector(a.dom_id);d.render(u,"App")}else null===a.dom_id||null===a.domNode||console.error("Skipped rendering: no `dom_id` or `domNode` was specified");return d},y=n.config||i.configUrl;return!y||!d.specActions.getConfigByUrl||d.specActions.getConfigByUrl&&!d.specActions.getConfigByUrl(y,v)?v():d},e.exports.presets={apis:g.default},e.exports.plugins=_},function(e,t,n){"use strict";var r=n(46);void 0===function(e){return e&&e.__esModule?e:{default:e}}(r).default.Promise&&n(584),String.prototype.startsWith||n(583)},function(e,t,n){"use strict";function r(e){return u.indexOf(e[0])>-1}function i(e){var t,n,i=e.replace(a,"");return r(i)?i:(n=i.match(s))?(t=n[0],o.test(t)?"about:blank":i):"about:blank"}var o=/^(%20|\s)*(javascript|data)/im,a=/[^\x20-\x7E]/gim,s=/^([^:]+):/gm,u=[".","/"];e.exports={sanitizeUrl:i}},function(e,t,n){"use strict";(function(t){function n(e){for(var t=[],n=0;n<e.length;n++)-1===t.indexOf(e[n])&&t.push(e[n]);return t}function r(e){var t=new Set;return e.filter(function(e){return!t.has(e)&&(t.add(e),!0)})}function i(e){var t=[];return new Set(e).forEach(function(e){t.push(e)}),t}"Set"in t?"function"==typeof Set.prototype.forEach&&function(){var e=!1;return new Set([!0]).forEach(function(t){e=t}),!0===e}()?e.exports=i:e.exports=r:e.exports=n}).call(t,n(17))},function(e,t,n){var r,i;!function(n,o){r=[],void 0!==(i=function(){return n.Autolinker=o()}.apply(t,r))&&(e.exports=i)}(this,function(){/*!
-- * Autolinker.js
-- * 0.15.3
-- *
-- * Copyright(c) 2015 Gregory Jacobs <greg@greg-jacobs.com>
-- * MIT Licensed. http://www.opensource.org/licenses/mit-license.php
-- *
-- * https://github.com/gregjacobs/Autolinker.js
-- */
--var e=function(t){e.Util.assign(this,t)};return e.prototype={constructor:e,urls:!0,email:!0,twitter:!0,newWindow:!0,stripPrefix:!0,truncate:void 0,className:"",htmlParser:void 0,matchParser:void 0,tagBuilder:void 0,link:function(e){for(var t=this.getHtmlParser(),n=t.parse(e),r=0,i=[],o=0,a=n.length;o<a;o++){var s=n[o],u=s.getType(),l=s.getText();if("element"===u)"a"===s.getTagName()&&(s.isClosing()?r=Math.max(r-1,0):r++),i.push(l);else if("entity"===u)i.push(l);else if(0===r){var c=this.linkifyStr(l);i.push(c)}else i.push(l)}return i.join("")},linkifyStr:function(e){return this.getMatchParser().replace(e,this.createMatchReturnVal,this)},createMatchReturnVal:function(t){var n;return this.replaceFn&&(n=this.replaceFn.call(this,this,t)),"string"==typeof n?n:!1===n?t.getMatchedText():n instanceof e.HtmlTag?n.toString():this.getTagBuilder().build(t).toString()},getHtmlParser:function(){var t=this.htmlParser;return t||(t=this.htmlParser=new e.htmlParser.HtmlParser),t},getMatchParser:function(){var t=this.matchParser;return t||(t=this.matchParser=new e.matchParser.MatchParser({urls:this.urls,email:this.email,twitter:this.twitter,stripPrefix:this.stripPrefix})),t},getTagBuilder:function(){var t=this.tagBuilder;return t||(t=this.tagBuilder=new e.AnchorTagBuilder({newWindow:this.newWindow,truncate:this.truncate,className:this.className})),t}},e.link=function(t,n){return new e(n).link(t)},e.match={},e.htmlParser={},e.matchParser={},e.Util={abstractMethod:function(){throw"abstract"},assign:function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e},extend:function(t,n){var r=t.prototype,i=function(){};i.prototype=r;var o;o=n.hasOwnProperty("constructor")?n.constructor:function(){r.constructor.apply(this,arguments)};var a=o.prototype=new i;return a.constructor=o,a.superclass=r,delete n.constructor,e.Util.assign(a,n),o},ellipsis:function(e,t,n){return e.length>t&&(n=null==n?"..":n,e=e.substring(0,t-n.length)+n),e},indexOf:function(e,t){if(Array.prototype.indexOf)return e.indexOf(t);for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},splitAndCapture:function(e,t){if(!t.global)throw new Error("`splitRegex` must have the 'g' flag set");for(var n,r=[],i=0;n=t.exec(e);)r.push(e.substring(i,n.index)),r.push(n[0]),i=n.index+n[0].length;return r.push(e.substring(i)),r}},e.HtmlTag=e.Util.extend(Object,{whitespaceRegex:/\s+/,constructor:function(t){e.Util.assign(this,t),this.innerHtml=this.innerHtml||this.innerHTML},setTagName:function(e){return this.tagName=e,this},getTagName:function(){return this.tagName||""},setAttr:function(e,t){return this.getAttrs()[e]=t,this},getAttr:function(e){return this.getAttrs()[e]},setAttrs:function(t){var n=this.getAttrs();return e.Util.assign(n,t),this},getAttrs:function(){return this.attrs||(this.attrs={})},setClass:function(e){return this.setAttr("class",e)},addClass:function(t){for(var n,r=this.getClass(),i=this.whitespaceRegex,o=e.Util.indexOf,a=r?r.split(i):[],s=t.split(i);n=s.shift();)-1===o(a,n)&&a.push(n);return this.getAttrs().class=a.join(" "),this},removeClass:function(t){for(var n,r=this.getClass(),i=this.whitespaceRegex,o=e.Util.indexOf,a=r?r.split(i):[],s=t.split(i);a.length&&(n=s.shift());){var u=o(a,n);-1!==u&&a.splice(u,1)}return this.getAttrs().class=a.join(" "),this},getClass:function(){return this.getAttrs().class||""},hasClass:function(e){return-1!==(" "+this.getClass()+" ").indexOf(" "+e+" ")},setInnerHtml:function(e){return this.innerHtml=e,this},getInnerHtml:function(){return this.innerHtml||""},toString:function(){var e=this.getTagName(),t=this.buildAttrsStr();return t=t?" "+t:"",["<",e,t,">",this.getInnerHtml(),"</",e,">"].join("")},buildAttrsStr:function(){if(!this.attrs)return"";var e=this.getAttrs(),t=[];for(var n in e)e.hasOwnProperty(n)&&t.push(n+'="'+e[n]+'"');return t.join(" ")}}),e.AnchorTagBuilder=e.Util.extend(Object,{constructor:function(t){e.Util.assign(this,t)},build:function(t){return new e.HtmlTag({tagName:"a",attrs:this.createAttrs(t.getType(),t.getAnchorHref()),innerHtml:this.processAnchorText(t.getAnchorText())})},createAttrs:function(e,t){var n={href:t},r=this.createCssClass(e);return r&&(n.class=r),this.newWindow&&(n.target="_blank"),n},createCssClass:function(e){var t=this.className;return t?t+" "+t+"-"+e:""},processAnchorText:function(e){return e=this.doTruncate(e)},doTruncate:function(t){return e.Util.ellipsis(t,this.truncate||Number.POSITIVE_INFINITY)}}),e.htmlParser.HtmlParser=e.Util.extend(Object,{htmlRegex:function(){var e=/[0-9a-zA-Z][0-9a-zA-Z:]*/,t=/[^\s\0"'>\/=\x01-\x1F\x7F]+/,n=/(?:"[^"]*?"|'[^']*?'|[^'"=<>`\s]+)/,r=t.source+"(?:\\s*=\\s*"+n.source+")?";return new RegExp(["(?:","<(!DOCTYPE)","(?:","\\s+","(?:",r,"|",n.source+")",")*",">",")","|","(?:","<(/)?","("+e.source+")","(?:","\\s+",r,")*","\\s*/?",">",")"].join(""),"gi")}(),htmlCharacterEntitiesRegex:/(&nbsp;|&#160;|&lt;|&#60;|&gt;|&#62;|&quot;|&#34;|&#39;)/gi,parse:function(e){for(var t,n,r=this.htmlRegex,i=0,o=[];null!==(t=r.exec(e));){var a=t[0],s=t[1]||t[3],u=!!t[2],l=e.substring(i,t.index);l&&(n=this.parseTextAndEntityNodes(l),o.push.apply(o,n)),o.push(this.createElementNode(a,s,u)),i=t.index+a.length}if(i<e.length){var c=e.substring(i);c&&(n=this.parseTextAndEntityNodes(c),o.push.apply(o,n))}return o},parseTextAndEntityNodes:function(t){for(var n=[],r=e.Util.splitAndCapture(t,this.htmlCharacterEntitiesRegex),i=0,o=r.length;i<o;i+=2){var a=r[i],s=r[i+1];a&&n.push(this.createTextNode(a)),s&&n.push(this.createEntityNode(s))}return n},createElementNode:function(t,n,r){return new e.htmlParser.ElementNode({text:t,tagName:n.toLowerCase(),closing:r})},createEntityNode:function(t){return new e.htmlParser.EntityNode({text:t})},createTextNode:function(t){return new e.htmlParser.TextNode({text:t})}}),e.htmlParser.HtmlNode=e.Util.extend(Object,{text:"",constructor:function(t){e.Util.assign(this,t)},getType:e.Util.abstractMethod,getText:function(){return this.text}}),e.htmlParser.ElementNode=e.Util.extend(e.htmlParser.HtmlNode,{tagName:"",closing:!1,getType:function(){return"element"},getTagName:function(){return this.tagName},isClosing:function(){return this.closing}}),e.htmlParser.EntityNode=e.Util.extend(e.htmlParser.HtmlNode,{getType:function(){return"entity"}}),e.htmlParser.TextNode=e.Util.extend(e.htmlParser.HtmlNode,{getType:function(){return"text"}}),e.matchParser.MatchParser=e.Util.extend(Object,{urls:!0,email:!0,twitter:!0,stripPrefix:!0,matcherRegex:function(){var e=/(^|[^\w])@(\w{1,15})/,t=/(?:[\-;:&=\+\$,\w\.]+@)/,n=/(?:[A-Za-z][-.+A-Za-z0-9]+:(?![A-Za-z][-.+A-Za-z0-9]+:\/\/)(?!\d+\/?)(?:\/\/)?)/,r=/(?:www\.)/,i=/[A-Za-z0-9\.\-]*[A-Za-z0-9\-]/,o=/\.(?:international|construction|contractors|enterprises|photography|productions|foundation|immobilien|industries|management|properties|technology|christmas|community|directory|education|equipment|institute|marketing|solutions|vacations|bargains|boutique|builders|catering|cleaning|clothing|computer|democrat|diamonds|graphics|holdings|lighting|partners|plumbing|supplies|training|ventures|academy|careers|company|cruises|domains|exposed|flights|florist|gallery|guitars|holiday|kitchen|neustar|okinawa|recipes|rentals|reviews|shiksha|singles|support|systems|agency|berlin|camera|center|coffee|condos|dating|estate|events|expert|futbol|kaufen|luxury|maison|monash|museum|nagoya|photos|repair|report|social|supply|tattoo|tienda|travel|viajes|villas|vision|voting|voyage|actor|build|cards|cheap|codes|dance|email|glass|house|mango|ninja|parts|photo|shoes|solar|today|tokyo|tools|watch|works|aero|arpa|asia|best|bike|blue|buzz|camp|club|cool|coop|farm|fish|gift|guru|info|jobs|kiwi|kred|land|limo|link|menu|mobi|moda|name|pics|pink|post|qpon|rich|ruhr|sexy|tips|vote|voto|wang|wien|wiki|zone|bar|bid|biz|cab|cat|ceo|com|edu|gov|int|kim|mil|net|onl|org|pro|pub|red|tel|uno|wed|xxx|xyz|ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cu|cv|cw|cx|cy|cz|de|dj|dk|dm|do|dz|ec|ee|eg|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sx|sy|sz|tc|td|tf|tg|th|tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|za|zm|zw)\b/,a=/[\-A-Za-z0-9+&@#\/%=~_()|'$*\[\]?!:,.;]*[\-A-Za-z0-9+&@#\/%=~_()|'$*\[\]]/;return new RegExp(["(",e.source,")","|","(",t.source,i.source,o.source,")","|","(","(?:","(",n.source,i.source,")","|","(?:","(.?//)?",r.source,i.source,")","|","(?:","(.?//)?",i.source,o.source,")",")","(?:"+a.source+")?",")"].join(""),"gi")}(),charBeforeProtocolRelMatchRegex:/^(.)?\/\//,constructor:function(t){e.Util.assign(this,t),this.matchValidator=new e.MatchValidator},replace:function(e,t,n){var r=this;return e.replace(this.matcherRegex,function(e,i,o,a,s,u,l,c,p){var f=r.processCandidateMatch(e,i,o,a,s,u,l,c,p);if(f){var h=t.call(n,f.match);return f.prefixStr+h+f.suffixStr}return e})},processCandidateMatch:function(t,n,r,i,o,a,s,u,l){var c,p=u||l,f="",h="";if(n&&!this.twitter||o&&!this.email||a&&!this.urls||!this.matchValidator.isValidMatch(a,s,p))return null;if(this.matchHasUnbalancedClosingParen(t)&&(t=t.substr(0,t.length-1),h=")"),o)c=new e.match.Email({matchedText:t,email:o});else if(n)r&&(f=r,t=t.slice(1)),c=new e.match.Twitter({matchedText:t,twitterHandle:i});else{if(p){var d=p.match(this.charBeforeProtocolRelMatchRegex)[1]||"";d&&(f=d,t=t.slice(1))}c=new e.match.Url({matchedText:t,url:t,protocolUrlMatch:!!s,protocolRelativeMatch:!!p,stripPrefix:this.stripPrefix})}return{prefixStr:f,suffixStr:h,match:c}},matchHasUnbalancedClosingParen:function(e){if(")"===e.charAt(e.length-1)){var t=e.match(/\(/g),n=e.match(/\)/g);if((t&&t.length||0)<(n&&n.length||0))return!0}return!1}}),e.MatchValidator=e.Util.extend(Object,{invalidProtocolRelMatchRegex:/^[\w]\/\//,hasFullProtocolRegex:/^[A-Za-z][-.+A-Za-z0-9]+:\/\//,uriSchemeRegex:/^[A-Za-z][-.+A-Za-z0-9]+:/,hasWordCharAfterProtocolRegex:/:[^\s]*?[A-Za-z]/,isValidMatch:function(e,t,n){return!(t&&!this.isValidUriScheme(t)||this.urlMatchDoesNotHaveProtocolOrDot(e,t)||this.urlMatchDoesNotHaveAtLeastOneWordChar(e,t)||this.isInvalidProtocolRelativeMatch(n))},isValidUriScheme:function(e){var t=e.match(this.uriSchemeRegex)[0].toLowerCase();return"javascript:"!==t&&"vbscript:"!==t},urlMatchDoesNotHaveProtocolOrDot:function(e,t){return!(!e||t&&this.hasFullProtocolRegex.test(t)||-1!==e.indexOf("."))},urlMatchDoesNotHaveAtLeastOneWordChar:function(e,t){return!(!e||!t)&&!this.hasWordCharAfterProtocolRegex.test(e)},isInvalidProtocolRelativeMatch:function(e){return!!e&&this.invalidProtocolRelMatchRegex.test(e)}}),e.match.Match=e.Util.extend(Object,{constructor:function(t){e.Util.assign(this,t)},getType:e.Util.abstractMethod,getMatchedText:function(){return this.matchedText},getAnchorHref:e.Util.abstractMethod,getAnchorText:e.Util.abstractMethod}),e.match.Email=e.Util.extend(e.match.Match,{getType:function(){return"email"},getEmail:function(){return this.email},getAnchorHref:function(){return"mailto:"+this.email},getAnchorText:function(){return this.email}}),e.match.Twitter=e.Util.extend(e.match.Match,{getType:function(){return"twitter"},getTwitterHandle:function(){return this.twitterHandle},getAnchorHref:function(){return"https://twitter.com/"+this.twitterHandle},getAnchorText:function(){return"@"+this.twitterHandle}}),e.match.Url=e.Util.extend(e.match.Match,{urlPrefixRegex:/^(https?:\/\/)?(www\.)?/i,protocolRelativeRegex:/^\/\//,protocolPrepended:!1,getType:function(){return"url"},getUrl:function(){var e=this.url;return this.protocolRelativeMatch||this.protocolUrlMatch||this.protocolPrepended||(e=this.url="http://"+e,this.protocolPrepended=!0),e},getAnchorHref:function(){return this.getUrl().replace(/&amp;/g,"&")},getAnchorText:function(){var e=this.getUrl();return this.protocolRelativeMatch&&(e=this.stripProtocolRelativePrefix(e)),this.stripPrefix&&(e=this.stripUrlPrefix(e)),e=this.removeTrailingSlash(e)},stripUrlPrefix:function(e){return e.replace(this.urlPrefixRegex,"")},stripProtocolRelativePrefix:function(e){return e.replace(this.protocolRelativeRegex,"")},removeTrailingSlash:function(e){return"/"===e.charAt(e.length-1)&&(e=e.slice(0,-1)),e}}),e})},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"getLayout",value:function(){var e=this.props,t=e.getComponent,n=e.layoutSelectors,r=n.current(),i=t(r,!0);return i||function(){return m.default.createElement("h1",null,' No layout defined for "',r,'" ')}}},{key:"render",value:function(){var e=this.getLayout();return m.default.createElement(e,null)}}]),t}(m.default.Component);t.default=y,y.propTypes={getComponent:g.default.func.isRequired,layoutSelectors:g.default.object.isRequired},y.defaultProps={}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(18),s=r(a),u=n(4),l=r(u),c=n(2),p=r(c),f=n(3),h=r(f),d=n(6),m=r(d),v=n(5),g=r(v),y=n(0),_=r(y),b=n(1),x=r(b),w=n(12),k=r(w),E={color:"#999",fontStyle:"italic"},S=function(e){function t(){return(0,p.default)(this,t),(0,m.default)(this,(t.__proto__||(0,l.default)(t)).apply(this,arguments))}return(0,g.default)(t,e),(0,h.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.getConfigs,r=e.schema,i=e.depth,a=e.expandDepth,u=e.name,l=e.specPath,c=r.get("description"),p=r.get("items"),f=r.get("title")||u,h=r.filter(function(e,t){return-1===["type","items","description","$$ref"].indexOf(t)}),d=t("Markdown"),m=t("ModelCollapse"),v=t("Model"),g=t("Property"),y=f&&_.default.createElement("span",{className:"model-title"},_.default.createElement("span",{className:"model-title__text"},f));return _.default.createElement("span",{className:"model"},_.default.createElement(m,{title:y,expanded:i<=a,collapsedContent:"[...]"},"[",h.size?h.entrySeq().map(function(e){var t=(0,s.default)(e,2),n=t[0],r=t[1];return _.default.createElement(g,{key:n+"-"+r,propKey:n,propVal:r,propStyle:E})}):null,c?_.default.createElement(d,{source:c}):null,_.default.createElement("span",null,_.default.createElement(v,(0,o.default)({},this.props,{getConfigs:n,specPath:l.push("items"),name:null,schema:p,required:!1,depth:i+1}))),"]"))}}]),t}(y.Component);S.propTypes={schema:x.default.object.isRequired,getComponent:x.default.func.isRequired,getConfigs:x.default.func.isRequired,specSelectors:x.default.object.isRequired,name:x.default.string,required:x.default.bool,expandDepth:x.default.number,specPath:k.default.list.isRequired,depth:x.default.number},t.default=S},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(30),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=function(e){function t(e,n){(0,l.default)(this,t);var r=(0,h.default)(this,(t.__proto__||(0,s.default)(t)).call(this,e,n));x.call(r);var i=r.props,o=i.name,a=i.schema,u=r.getValue();return r.state={name:o,schema:a,value:u},r}return(0,m.default)(t,e),(0,p.default)(t,[{key:"getValue",value:function(){var e=this.props,t=e.name,n=e.authorized;return n&&n.getIn([t,"value"])}},{key:"render",value:function(){var e=this.props,t=e.schema,n=e.getComponent,r=e.errSelectors,i=e.name,o=n("Input"),a=n("Row"),s=n("Col"),u=n("authError"),l=n("Markdown"),c=n("JumpToPath",!0),p=this.getValue(),f=r.allErrors().filter(function(e){return e.get("authId")===i});return g.default.createElement("div",null,g.default.createElement("h4",null,g.default.createElement("code",null,i||t.get("name")),"  (apiKey)",g.default.createElement(c,{path:["securityDefinitions",i]})),p&&g.default.createElement("h6",null,"Authorized"),g.default.createElement(a,null,g.default.createElement(l,{source:t.get("description")})),g.default.createElement(a,null,g.default.createElement("p",null,"Name: ",g.default.createElement("code",null,t.get("name")))),g.default.createElement(a,null,g.default.createElement("p",null,"In: ",g.default.createElement("code",null,t.get("in")))),g.default.createElement(a,null,g.default.createElement("label",null,"Value:"),p?g.default.createElement("code",null," ****** "):g.default.createElement(s,null,g.default.createElement(o,{type:"text",onChange:this.onChange}))),f.valueSeq().map(function(e,t){return g.default.createElement(u,{error:e,key:t})}))}}]),t}(g.default.Component);b.propTypes={authorized:_.default.object,getComponent:_.default.func.isRequired,errSelectors:_.default.object.isRequired,schema:_.default.object.isRequired,name:_.default.string.isRequired,onChange:_.default.func};var x=function(){var e=this;this.onChange=function(t){var n=e.props.onChange,r=t.target.value,i=(0,o.default)({},e.state,{value:r});e.setState(i),n(i)}};t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.schema,n=e.name,r=e.getComponent,i=e.onAuthChange,o=e.authorized,a=e.errSelectors,s=r("apiKeyAuth"),u=r("basicAuth"),l=void 0,c=t.get("type");switch(c){case"apiKey":l=m.default.createElement(s,{key:n,schema:t,name:n,errSelectors:a,authorized:o,getComponent:r,onChange:i});break;case"basic":l=m.default.createElement(u,{key:n,schema:t,name:n,errSelectors:a,authorized:o,getComponent:r,onChange:i});break;default:l=m.default.createElement("div",{key:n},"Unknown security definition type ",c)}return m.default.createElement("div",{key:n+"-jump"},l)}}]),t}(m.default.Component);b.propTypes={schema:_.default.orderedMap.isRequired,name:g.default.string.isRequired,onAuthChange:g.default.func.isRequired,authorized:_.default.orderedMap.isRequired},b.propTypes={errSelectors:g.default.object.isRequired,getComponent:g.default.func.isRequired,authSelectors:g.default.object.isRequired,specSelectors:g.default.object.isRequired,authActions:g.default.object.isRequired,definitions:_.default.iterable.isRequired},t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.close=function(){r.props.authActions.showDefinitions(!1)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.authSelectors,n=e.authActions,r=e.getComponent,i=e.errSelectors,o=e.specSelectors,a=e.fn.AST,s=t.shownDefinitions(),u=r("auths");return m.default.createElement("div",{className:"dialog-ux"},m.default.createElement("div",{className:"backdrop-ux"}),m.default.createElement("div",{className:"modal-ux"},m.default.createElement("div",{className:"modal-dialog-ux"},m.default.createElement("div",{className:"modal-ux-inner"},m.default.createElement("div",{className:"modal-ux-header"},m.default.createElement("h3",null,"Available authorizations"),m.default.createElement("button",{type:"button",className:"close-modal",onClick:this.close},m.default.createElement("svg",{width:"20",height:"20"},m.default.createElement("use",{href:"#close",xlinkHref:"#close"})))),m.default.createElement("div",{className:"modal-ux-content"},s.valueSeq().map(function(e,s){return m.default.createElement(u,{key:s,AST:a,definitions:e,getComponent:r,errSelectors:i,authSelectors:t,authActions:n,specSelectors:o})}))))))}}]),t}(m.default.Component);y.propTypes={fn:g.default.object.isRequired,getComponent:g.default.func.isRequired,authSelectors:g.default.object.isRequired,specSelectors:g.default.object.isRequired,errSelectors:g.default.object.isRequired,authActions:g.default.object.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onClick=function(){var e=r.props,t=e.authActions,n=e.authSelectors,i=n.definitionsToAuthorize();t.showDefinitions(i)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.authSelectors,n=e.getComponent,r=n("authorizationPopup",!0),i=!!t.shownDefinitions(),o=!!t.authorized().size;return m.default.createElement("div",{className:"auth-wrapper"},m.default.createElement("button",{className:o?"btn authorize locked":"btn authorize unlocked",onClick:this.onClick},m.default.createElement("span",null,"Authorize"),m.default.createElement("svg",{width:"20",height:"20"},m.default.createElement("use",{href:o?"#locked":"#unlocked",xlinkHref:o?"#locked":"#unlocked"}))),i&&m.default.createElement(r,null))}}]),t}(m.default.Component);y.propTypes={className:g.default.string},y.propTypes={getComponent:g.default.func.isRequired,authSelectors:g.default.object.isRequired,errActions:g.default.object.isRequired,authActions:g.default.object.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onClick=function(e){e.stopPropagation();var t=r.props.onClick;t&&t()},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props.isAuthorized;return m.default.createElement("button",{className:e?"authorization__btn locked":"authorization__btn unlocked","aria-label":e?"authorization button locked":"authorization button unlocked",onClick:this.onClick},m.default.createElement("svg",{width:"20",height:"20"},m.default.createElement("use",{href:e?"#locked":"#unlocked",xlinkHref:e?"#locked":"#unlocked"})))}}]),t}(m.default.Component);y.propTypes={isAuthorized:g.default.bool.isRequired,onClick:g.default.func},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(36),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(12),x=r(b),w=function(e){function t(e,n){(0,l.default)(this,t);var r=(0,h.default)(this,(t.__proto__||(0,s.default)(t)).call(this,e,n));return r.onAuthChange=function(e){var t=e.name;r.setState((0,o.default)({},t,e))},r.submitAuth=function(e){e.preventDefault(),r.props.authActions.authorize(r.state)},r.logoutClick=function(e){e.preventDefault();var t=r.props,n=t.authActions,i=t.definitions,o=i.map(function(e,t){return t}).toArray();n.logout(o)},r.close=function(e){e.preventDefault(),r.props.authActions.showDefinitions(!1)},r.state={},r}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this,t=this.props,n=t.definitions,r=t.getComponent,i=t.authSelectors,o=t.errSelectors,a=r("AuthItem"),s=r("oauth2",!0),u=r("Button"),l=i.authorized(),c=n.filter(function(e,t){return!!l.get(t)}),p=n.filter(function(e){return"oauth2"!==e.get("type")}),f=n.filter(function(e){return"oauth2"===e.get("type")});return g.default.createElement("div",{className:"auth-container"},!!p.size&&g.default.createElement("form",{onSubmit:this.submitAuth},p.map(function(t,n){return g.default.createElement(a,{key:n,schema:t,name:n,getComponent:r,onAuthChange:e.onAuthChange,authorized:l,errSelectors:o})}).toArray(),g.default.createElement("div",{className:"auth-btn-wrapper"},g.default.createElement(u,{className:"btn modal-btn auth btn-done",onClick:this.close},"Done"),p.size===c.size?g.default.createElement(u,{className:"btn modal-btn auth",onClick:this.logoutClick},"Logout"):g.default.createElement(u,{type:"submit",className:"btn modal-btn auth authorize"},"Authorize"))),f&&f.size?g.default.createElement("div",null,g.default.createElement("div",{className:"scope-def"},g.default.createElement("p",null,"Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes."),g.default.createElement("p",null,"API requires the following scopes. Select which ones you want to grant to Swagger UI.")),n.filter(function(e){return"oauth2"===e.get("type")}).map(function(e,t){return g.default.createElement("div",{key:t},g.default.createElement(s,{authorized:l,schema:e,name:t}))}).toArray()):null)}}]),t}(g.default.Component);w.propTypes={definitions:_.default.object.isRequired,getComponent:_.default.func.isRequired,authSelectors:_.default.object.isRequired,authActions:_.default.object.isRequired,specSelectors:_.default.object.isRequired},w.propTypes={errSelectors:_.default.object.isRequired,getComponent:_.default.func.isRequired,authSelectors:_.default.object.isRequired,specSelectors:_.default.object.isRequired,authActions:_.default.object.isRequired,definitions:x.default.iterable.isRequired},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));x.call(r);var i=r.props,a=i.schema,u=i.name,l=r.getValue(),c=l.username;return r.state={name:u,schema:a,value:c?{username:c}:{}},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"getValue",value:function(){var e=this.props,t=e.authorized,n=e.name;return t&&t.getIn([n,"value"])||{}}},{key:"render",value:function(){var e=this.props,t=e.schema,n=e.getComponent,r=e.name,i=e.errSelectors,o=n("Input"),a=n("Row"),s=n("Col"),u=n("authError"),l=n("JumpToPath",!0),c=n("Markdown"),p=this.getValue().username,f=i.allErrors().filter(function(e){return e.get("authId")===r});return m.default.createElement("div",null,m.default.createElement("h4",null,"Basic authorization",m.default.createElement(l,{path:["securityDefinitions",r]})),p&&m.default.createElement("h6",null,"Authorized"),m.default.createElement(a,null,m.default.createElement(c,{source:t.get("description")})),m.default.createElement(a,null,m.default.createElement("label",null,"Username:"),p?m.default.createElement("code",null," ",p," "):m.default.createElement(s,null,m.default.createElement(o,{type:"text",required:"required",name:"username",onChange:this.onChange}))),m.default.createElement(a,null,m.default.createElement("label",null,"Password:"),p?m.default.createElement("code",null," ****** "):m.default.createElement(s,null,m.default.createElement(o,{required:"required",autoComplete:"new-password",name:"password",type:"password",onChange:this.onChange}))),f.valueSeq().map(function(e,t){return m.default.createElement(u,{error:e,key:t})}))}}]),t}(m.default.Component);b.propTypes={authorized:g.default.object,getComponent:g.default.func.isRequired,schema:g.default.object.isRequired,onChange:g.default.func.isRequired},b.propTypes={name:g.default.string.isRequired,errSelectors:g.default.object.isRequired,getComponent:g.default.func.isRequired,onChange:g.default.func,schema:_.default.map,authorized:_.default.map};var x=function(){var e=this;this.onChange=function(t){var n=e.props.onChange,r=t.target,i=r.value,o=r.name,a=e.state.value;a[o]=i,e.setState({value:a}),n(e.state)}};t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props.error,t=e.get("level"),n=e.get("message"),r=e.get("source");return m.default.createElement("div",{className:"errors",style:{backgroundColor:"#ffeeee",color:"red",margin:"1em"}},m.default.createElement("b",{style:{textTransform:"capitalize",marginRight:"1em"}},r," ",t),m.default.createElement("span",null,n))}}]),t}(m.default.Component);y.propTypes={error:g.default.object.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(36),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(559),x=r(b),w=function(e){function t(e,n){(0,l.default)(this,t);var r=(0,h.default)(this,(t.__proto__||(0,s.default)(t)).call(this,e,n));k.call(r);var i=r.props,o=i.name,a=i.schema,u=i.authorized,c=i.authSelectors,p=u&&u.get(o),f=c.getConfigs()||{},d=p&&p.get("username")||"",m=p&&p.get("clientId")||f.clientId||"",v=p&&p.get("clientSecret")||f.clientSecret||"",g=p&&p.get("passwordType")||"request-body";return r.state={appName:f.appName,name:o,schema:a,scopes:[],clientId:m,clientSecret:v,username:d,password:"",passwordType:g},r}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this,t=this.props,n=t.schema,r=t.getComponent,i=t.authSelectors,o=t.errSelectors,a=t.name,s=t.specSelectors,u=r("Input"),l=r("Row"),c=r("Col"),p=r("Button"),f=r("authError"),h=r("JumpToPath",!0),d=r("Markdown"),m=s.isOAS3,v=m()?"authorizationCode":"accessCode",y=m()?"clientCredentials":"application",_=n.get("flow"),b=n.get("allowedScopes")||n.get("scopes"),x=i.authorized().get(a),w=!!x,k=o.allErrors().filter(function(e){return e.get("authId")===a}),E=!k.filter(function(e){return"validation"===e.get("source")}).size,S=n.get("description");return g.default.createElement("div",null,g.default.createElement("h4",null,a," (OAuth2, ",n.get("flow"),") ",g.default.createElement(h,{path:["securityDefinitions",a]})),this.state.appName?g.default.createElement("h5",null,"Application: ",this.state.appName," "):null,S&&g.default.createElement(d,{source:n.get("description")}),w&&g.default.createElement("h6",null,"Authorized"),("implicit"===_||_===v)&&g.default.createElement("p",null,"Authorization URL: ",g.default.createElement("code",null,n.get("authorizationUrl"))),("password"===_||_===v||_===y)&&g.default.createElement("p",null,"Token URL:",g.default.createElement("code",null," ",n.get("tokenUrl"))),g.default.createElement("p",{className:"flow"},"Flow: ",g.default.createElement("code",null,n.get("flow"))),"password"!==_?null:g.default.createElement(l,null,g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"oauth_username"},"username:"),w?g.default.createElement("code",null," ",this.state.username," "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("input",{id:"oauth_username",type:"text","data-name":"username",onChange:this.onInputChange}))),g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"oauth_password"},"password:"),w?g.default.createElement("code",null," ****** "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("input",{id:"oauth_password",type:"password","data-name":"password",onChange:this.onInputChange}))),g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"password_type"},"type:"),w?g.default.createElement("code",null," ",this.state.passwordType," "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("select",{id:"password_type","data-name":"passwordType",onChange:this.onInputChange},g.default.createElement("option",{value:"request-body"},"Request body"),g.default.createElement("option",{value:"basic"},"Basic auth"),g.default.createElement("option",{value:"query"},"Query parameters"))))),(_===y||"implicit"===_||_===v||"password"===_&&"basic"!==this.state.passwordType)&&(!w||w&&this.state.clientId)&&g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"client_id"},"client_id:"),w?g.default.createElement("code",null," ****** "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("input",{id:"client_id",type:"text",required:"password"===_,value:this.state.clientId,"data-name":"clientId",onChange:this.onInputChange}))),(_===y||_===v||"password"===_&&"basic"!==this.state.passwordType)&&g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"client_secret"},"client_secret:"),w?g.default.createElement("code",null," ****** "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("input",{id:"client_secret",value:this.state.clientSecret,type:"text","data-name":"clientSecret",onChange:this.onInputChange}))),!w&&b&&b.size?g.default.createElement("div",{className:"scopes"},g.default.createElement("h2",null,"Scopes:"),b.map(function(t,n){return g.default.createElement(l,{key:n},g.default.createElement("div",{className:"checkbox"},g.default.createElement(u,{"data-value":n,id:n+"-"+_+"-checkbox-"+e.state.name,disabled:w,type:"checkbox",onChange:e.onScopeChange}),g.default.createElement("label",{htmlFor:n+"-"+_+"-checkbox-"+e.state.name},g.default.createElement("span",{className:"item"}),g.default.createElement("div",{className:"text"},g.default.createElement("p",{className:"name"},n),g.default.createElement("p",{className:"description"},t)))))}).toArray()):null,k.valueSeq().map(function(e,t){return g.default.createElement(f,{error:e,key:t})}),g.default.createElement("div",{className:"auth-btn-wrapper"},E&&(w?g.default.createElement(p,{className:"btn modal-btn auth authorize",onClick:this.logout},"Logout"):g.default.createElement(p,{className:"btn modal-btn auth authorize",onClick:this.authorize},"Authorize"))))}}]),t}(g.default.Component);w.propTypes={name:_.default.string,authorized:_.default.object,getComponent:_.default.func.isRequired,schema:_.default.object.isRequired,authSelectors:_.default.object.isRequired,authActions:_.default.object.isRequired,errSelectors:_.default.object.isRequired,specSelectors:_.default.object.isRequired,errActions:_.default.object.isRequired,getConfigs:_.default.any};var k=function(){var e=this;this.authorize=function(){var t=e.props,n=t.authActions,r=t.errActions,i=t.getConfigs,o=t.authSelectors,a=i(),s=o.getConfigs();r.clear({authId:name,type:"auth",source:"auth"}),(0,x.default)({auth:e.state,authActions:n,errActions:r,configs:a,authConfigs:s})},this.onScopeChange=function(t){var n=t.target,r=n.checked,i=n.dataset.value;if(r&&-1===e.state.scopes.indexOf(i)){var o=e.state.scopes.concat([i]);e.setState({scopes:o})}else!r&&e.state.scopes.indexOf(i)>-1&&e.setState({scopes:e.state.scopes.filter(function(e){return e!==i})})},this.onInputChange=function(t){var n=t.target,r=n.dataset.name,i=n.value,a=(0,o.default)({},r,i);e.setState(a)},this.logout=function(t){t.preventDefault();var n=e.props,r=n.authActions,i=n.errActions,o=n.name;i.clear({authId:o,type:"auth",source:"auth"}),r.logout([o])}};t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onClick=function(){var e=r.props,t=e.specActions,n=e.path,i=e.method;t.clearResponse(n,i),t.clearRequest(n,i)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){return m.default.createElement("button",{className:"btn btn-clear opblock-control__btn",onClick:this.onClick},"Clear")}}]),t}(d.Component);y.propTypes={specActions:g.default.object.isRequired,path:g.default.string.isRequired,method:g.default.string.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=n(7),x=function(){},w=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onChangeWrapper=function(e){return r.props.onChange(e.target.value)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){this.props.contentTypes&&this.props.onChange(this.props.contentTypes.first())}},{key:"componentWillReceiveProps",value:function(e){e.contentTypes&&e.contentTypes.size&&(e.contentTypes.includes(e.value)||e.onChange(e.contentTypes.first()))}},{key:"render",value:function(){var e=this.props,t=e.contentTypes,n=e.className,r=e.value;return t&&t.size?m.default.createElement("div",{className:"content-type-wrapper "+(n||"")},m.default.createElement("select",{className:"content-type",value:r||"",onChange:this.onChangeWrapper},t.map(function(e){return m.default.createElement("option",{key:e,value:e},e)}).toArray())):null}}]),t}(m.default.Component);w.propTypes={contentTypes:g.default.oneOfType([_.default.list,_.default.set,_.default.seq]),value:g.default.string,onChange:g.default.func,className:g.default.string},w.defaultProps={onChange:x,value:null,contentTypes:(0,b.fromJS)(["application/json"])},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(557),_=r(y),b=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"handleFocus",value:function(e){e.target.select(),document.execCommand("copy")}},{key:"render",value:function(){var e=this.props.request,t=(0,_.default)(e);return m.default.createElement("div",null,m.default.createElement("h4",null,"Curl"),m.default.createElement("div",{className:"copy-paste"},m.default.createElement("textarea",{onFocus:this.handleFocus,readOnly:"true",className:"curl",style:{whiteSpace:"normal"},value:t})))}}]),t}(m.default.Component);b.propTypes={request:g.default.object.isRequired},t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.DeepLink=void 0;var i=n(0),o=r(i),a=n(1),s=r(a),u=t.DeepLink=function(e){var t=e.enabled,n=e.path,r=e.text;return o.default.createElement("a",{className:"nostyle",onClick:t?function(e){return e.preventDefault()}:null,href:t?"#/"+n:null},o.default.createElement("span",null,r))};u.propTypes={enabled:s.default.bool,isShown:s.default.bool,path:s.default.string,text:s.default.string},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(0),o=r(i),a=n(12),s=r(a),u=function(e){var t=e.value,n=e.getComponent,r=n("ModelCollapse"),i=o.default.createElement("span",null,"Array [ ",t.count()," ]");return o.default.createElement("span",{className:"prop-enum"},"Enum:",o.default.createElement("br",null),o.default.createElement(r,{collapsedContent:i},"[ ",t.join(", ")," ]"))};u.propTypes={value:s.default.iterable,getComponent:s.default.func},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){return(e||"").split(" ").map(function(e){return e[0].toUpperCase()+e.slice(1)}).join(" ")}Object.defineProperty(t,"__esModule",{value:!0});var o=n(4),a=r(o),s=n(2),u=r(s),l=n(3),c=r(l),p=n(6),f=r(p),h=n(5),d=r(h),m=n(0),v=r(m),g=n(1),y=r(g),_=n(7),b=n(448),x=function(e){function t(){return(0,u.default)(this,t),(0,f.default)(this,(t.__proto__||(0,a.default)(t)).apply(this,arguments))}return(0,d.default)(t,e),(0,c.default)(t,[{key:"render",value:function(){var e=this.props,t=e.editorActions,n=e.errSelectors,r=e.layoutSelectors,i=e.layoutActions;if(t&&t.jumpToLine)var o=t.jumpToLine;var a=n.allErrors(),s=a.filter(function(e){return"thrown"===e.get("type")||"error"===e.get("level")});if(!s||s.count()<1)return null;var u=r.isShown(["errorPane"],!0),l=function(){return i.show(["errorPane"],!u)},c=s.sortBy(function(e){return e.get("line")});return v.default.createElement("pre",{className:"errors-wrapper"},v.default.createElement("hgroup",{className:"error"},v.default.createElement("h4",{className:"errors__title"},"Errors"),v.default.createElement("button",{className:"btn errors__clear-btn",onClick:l},u?"Hide":"Show")),v.default.createElement(b.Collapse,{isOpened:u,animated:!0},v.default.createElement("div",{className:"errors"},c.map(function(e,t){var n=e.get("type");return"thrown"===n||"auth"===n?v.default.createElement(w,{key:t,error:e.get("error")||e,jumpToLine:o}):"spec"===n?v.default.createElement(k,{key:t,error:e,jumpToLine:o}):void 0}))))}}]),t}(v.default.Component);x.propTypes={editorActions:y.default.object,errSelectors:y.default.object.isRequired,layoutSelectors:y.default.object.isRequired,layoutActions:y.default.object.isRequired},t.default=x;var w=function(e){var t=e.error,n=e.jumpToLine;if(!t)return null;var r=t.get("line");return v.default.createElement("div",{className:"error-wrapper"},t?v.default.createElement("div",null,v.default.createElement("h4",null,t.get("source")&&t.get("level")?i(t.get("source"))+" "+t.get("level"):"",t.get("path")?v.default.createElement("small",null," at ",t.get("path")):null),v.default.createElement("span",{style:{whiteSpace:"pre-line",maxWidth:"100%"}},t.get("message")),v.default.createElement("div",{style:{"text-decoration":"underline",cursor:"pointer"}},r&&n?v.default.createElement("a",{onClick:n.bind(null,r)},"Jump to line ",r):null)):null)},k=function(e){var t=e.error,n=e.jumpToLine,r=null;return t.get("path")?r=_.List.isList(t.get("path"))?v.default.createElement("small",null,"at ",t.get("path").join(".")):v.default.createElement("small",null,"at ",t.get("path")):t.get("line")&&!n&&(r=v.default.createElement("small",null,"on line ",t.get("line"))),v.default.createElement("div",{className:"error-wrapper"},t?v.default.createElement("div",null,v.default.createElement("h4",null,i(t.get("source"))+" "+t.get("level")," ",r),v.default.createElement("span",{style:{whiteSpace:"pre-line"}},t.get("message")),v.default.createElement("div",{style:{"text-decoration":"underline",cursor:"pointer"}},n?v.default.createElement("a",{onClick:n.bind(null,t.get("line"))},"Jump to line ",t.get("line")):null)):null)};w.propTypes={error:y.default.object.isRequired,jumpToLine:y.default.func},w.defaultProps={jumpToLine:null},k.propTypes={error:y.default.object.isRequired,jumpToLine:y.default.func}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onClick=function(){var e=r.props,t=e.specSelectors,n=e.specActions,i=e.operation,o=e.path,a=e.method;n.validateParams([o,a]),t.validateBeforeExecute([o,a])&&(r.props.onExecute&&r.props.onExecute(),n.execute({operation:i,path:o,method:a}))},r.onChangeProducesWrapper=function(e){return r.props.specActions.changeProducesValue([r.props.path,r.props.method],e)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){return m.default.createElement("button",{className:"btn execute opblock-control__btn",onClick:this.onClick},"Execute")}}]),t}(d.Component);y.propTypes={specSelectors:g.default.object.isRequired,specActions:g.default.object.isRequired,operation:g.default.object.isRequired,path:g.default.string.isRequired,method:g.default.string.isRequired,onExecute:g.default.func},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){return m.default.createElement("div",{className:"footer"})}}]),t}(m.default.Component);t.default=v},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(18),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(7),x=r(b),w={color:"#999",fontStyle:"italic"},k=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.headers,n=e.getComponent,r=n("Property");return t&&t.size?g.default.createElement("div",{className:"headers-wrapper"},g.default.createElement("h4",{className:"headers__title"},"Headers:"),g.default.createElement("table",{className:"headers"},g.default.createElement("thead",null,g.default.createElement("tr",{className:"header-row"},g.default.createElement("th",{className:"header-col"},"Name"),g.default.createElement("th",{className:"header-col"},"Description"),g.default.createElement("th",{className:"header-col"},"Type"))),g.default.createElement("tbody",null,t.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],i=t[1];if(!x.default.Map.isMap(i))return null;var a=i.getIn(["schema"])?i.getIn(["schema","type"]):i.getIn(["type"]),s=i.getIn(["schema","example"]);return g.default.createElement("tr",{key:n},g.default.createElement("td",{className:"header-col"},n),g.default.createElement("td",{className:"header-col"},i.get("description")),g.default.createElement("td",{className:"header-col"},a," ",s?g.default.createElement(r,{propKey:"Example",propVal:s,propStyle:w}):null))}).toArray()))):null}}]),t}(g.default.Component);k.propTypes={headers:_.default.object.isRequired,getComponent:_.default.func.isRequired},t.default=k},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(9),_=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.initializeComponent=function(e){r.el=e},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){(0,y.highlight)(this.el)}},{key:"componentDidUpdate",value:function(){(0,y.highlight)(this.el)}},{key:"render",value:function(){var e=this.props,t=e.value,n=e.className;return n=n||"",m.default.createElement("pre",{ref:this.initializeComponent,className:n+" microlight"},t)}}]),t}(d.Component);_.propTypes={value:g.default.string.isRequired,className:g.default.string},t.default=_},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(7),_=n(12),b=r(_),x=n(9),w=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.host,n=e.basePath;return m.default.createElement("pre",{className:"base-url"},"[ Base URL: ",t,n," ]")}}]),t}(m.default.Component);w.propTypes={host:g.default.string,basePath:g.default.string};var k=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props.data,t=e.get("name")||"the developer",n=e.get("url"),r=e.get("email");return m.default.createElement("div",null,n&&m.default.createElement("div",null,m.default.createElement("a",{href:(0,x.sanitizeUrl)(n),target:"_blank"},t," - Website")),r&&m.default.createElement("a",{href:(0,x.sanitizeUrl)("mailto:"+r)},n?"Send email to "+t:"Contact "+t))}}]),t}(m.default.Component);k.propTypes={data:g.default.object};var E=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props.license,t=e.get("name")||"License",n=e.get("url");return m.default.createElement("div",null,n?m.default.createElement("a",{target:"_blank",href:(0,x.sanitizeUrl)(n)},t):m.default.createElement("span",null,t))}}]),t}(m.default.Component);E.propTypes={license:g.default.object};var S=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.info,n=e.url,r=e.host,i=e.basePath,o=e.getComponent,a=e.externalDocs,s=t.get("version"),u=t.get("description"),l=t.get("title"),c=t.get("termsOfService"),p=t.get("contact"),f=t.get("license"),h=(a||(0,y.fromJS)({})).toJS(),d=h.url,v=h.description,g=o("Markdown"),_=o("VersionStamp");return m.default.createElement("div",{className:"info"},m.default.createElement("hgroup",{className:"main"},m.default.createElement("h2",{className:"title"},l,s&&m.default.createElement(_,{version:s})),r||i?m.default.createElement(w,{host:r,basePath:i}):null,n&&m.default.createElement("a",{target:"_blank",href:(0,x.sanitizeUrl)(n)},m.default.createElement("span",{className:"url"}," ",n," "))),m.default.createElement("div",{className:"description"},m.default.createElement(g,{source:u})),c&&m.default.createElement("div",null,m.default.createElement("a",{target:"_blank",href:(0,x.sanitizeUrl)(c)},"Terms of service")),p&&p.size?m.default.createElement(k,{data:p}):null,f&&f.size?m.default.createElement(E,{license:f}):null,d?m.default.createElement("a",{target:"_blank",href:(0,x.sanitizeUrl)(d)},v||d):null)}}]),t}(m.default.Component);S.propTypes={info:g.default.object,url:g.default.string,host:g.default.string,basePath:g.default.string,externalDocs:b.default.map,getComponent:g.default.func.isRequired},t.default=S,S.propTypes={title:g.default.any,description:g.default.any,version:g.default.any,url:g.default.string}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onFilterChange=function(e){var t=e.target.value;r.props.layoutActions.updateFilter(t)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.specSelectors,n=e.specActions,r=e.getComponent,i=e.layoutSelectors,o=e.oas3Selectors,a=e.oas3Actions,s=t.info(),u=t.url(),l=t.basePath(),c=t.host(),p=t.securityDefinitions(),f=t.externalDocs(),h=t.schemes(),d=t.servers(),v=r("info"),g=r("operations",!0),y=r("Models",!0),_=r("authorizeBtn",!0),b=r("Row"),x=r("Col"),w=r("Servers"),k=r("errors",!0),E="loading"===t.loadingStatus(),S="failed"===t.loadingStatus(),C=i.currentFilter(),A={};S&&(A.color="red"),E&&(A.color="#aaa");var D=r("schemes");if(!t.specStr()){var O=void 0;return O=E?m.default.createElement("div",{className:"loading"}):m.default.createElement("h4",null,"No API definition provided."),m.default.createElement("div",{className:"swagger-ui"},m.default.createElement("div",{className:"loading-container"},O))}return m.default.createElement("div",{className:"swagger-ui"},m.default.createElement("div",null,m.default.createElement(k,null),m.default.createElement(b,{className:"information-container"},m.default.createElement(x,{mobile:12},s.count()?m.default.createElement(v,{info:s,url:u,host:c,basePath:l,externalDocs:f,getComponent:r}):null)),h&&h.size||p?m.default.createElement("div",{className:"scheme-container"},m.default.createElement(x,{className:"schemes wrapper",mobile:12},h&&h.size?m.default.createElement(D,{currentScheme:t.operationScheme(),schemes:h,specActions:n}):null,p?m.default.createElement(_,null):null)):null,d&&d.size?m.default.createElement("div",{className:"global-server-container"},m.default.createElement(x,{className:"servers wrapper",mobile:12},m.default.createElement("span",{className:"servers-title"},"Server"),m.default.createElement(w,{servers:d,currentServer:o.selectedServer(),setSelectedServer:a.setSelectedServer,setServerVariableValue:a.setServerVariableValue,getServerVariable:o.serverVariableValue,getEffectiveServerValue:o.serverEffectiveValue}))):null,null===C||!1===C?null:m.default.createElement("div",{className:"filter-container"},m.default.createElement(x,{className:"filter wrapper",mobile:12},m.default.createElement("input",{className:"operation-filter-input",placeholder:"Filter by tag",type:"text",onChange:this.onFilterChange,value:!0===C||"true"===C?"":C,disabled:E,style:A}))),m.default.createElement(b,null,m.default.createElement(x,{mobile:12,desktop:12},m.default.createElement(g,null))),m.default.createElement(b,null,m.default.createElement(x,{mobile:12,desktop:12},m.default.createElement(y,null)))))}}]),t}(m.default.Component);y.propTypes={errSelectors:g.default.object.isRequired,errActions:g.default.object.isRequired,specActions:g.default.object.isRequired,specSelectors:g.default.object.isRequired,oas3Selectors:g.default.object.isRequired,oas3Actions:g.default.object.isRequired,layoutSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,getComponent:g.default.func.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(47),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(12),x=r(b),w=n(7),k=function(e){var t=e.headers;return g.default.createElement("div",null,g.default.createElement("h5",null,"Response headers"),g.default.createElement("pre",null,t))};k.propTypes={headers:_.default.array.isRequired};var E=function(e){var t=e.duration;return g.default.createElement("div",null,g.default.createElement("h5",null,"Request duration"),g.default.createElement("pre",null,t," ms"))};E.propTypes={duration:_.default.number.isRequired};var S=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"shouldComponentUpdate",value:function(e){return this.props.response!==e.response||this.props.path!==e.path||this.props.method!==e.method||this.props.displayRequestDuration!==e.displayRequestDuration}},{key:"render",value:function(){var e=this.props,t=e.response,n=e.getComponent,r=e.getConfigs,i=e.displayRequestDuration,a=e.specSelectors,s=e.path,u=e.method,l=r(),c=l.showMutatedRequest,p=c?a.mutatedRequestFor(s,u):a.requestFor(s,u),f=t.get("status"),h=p.get("url"),d=t.get("headers").toJS(),m=t.get("notDocumented"),v=t.get("error"),y=t.get("text"),_=t.get("duration"),b=(0,o.default)(d),x=d["content-type"],w=n("curl"),S=n("responseBody"),C=b.map(function(e){return g.default.createElement("span",{className:"headerline",key:e}," ",e,": ",d[e]," ")}),A=0!==C.length;return g.default.createElement("div",null,p&&g.default.createElement(w,{request:p}),h&&g.default.createElement("div",null,g.default.createElement("h4",null,"Request URL"),g.default.createElement("div",{className:"request-url"},g.default.createElement("pre",null,h))),g.default.createElement("h4",null,"Server response"),g.default.createElement("table",{className:"responses-table"},g.default.createElement("thead",null,g.default.createElement("tr",{className:"responses-header"},g.default.createElement("td",{className:"col col_header response-col_status"},"Code"),g.default.createElement("td",{className:"col col_header response-col_description"},"Details"))),g.default.createElement("tbody",null,g.default.createElement("tr",{className:"response"},g.default.createElement("td",{className:"col response-col_status"},f,m?g.default.createElement("div",{className:"response-undocumented"},g.default.createElement("i",null," Undocumented ")):null),g.default.createElement("td",{className:"col response-col_description"},v?g.default.createElement("span",null,t.get("name")+": "+t.get("message")):null,y?g.default.createElement(S,{content:y,contentType:x,url:h,headers:d,getComponent:n}):null,A?g.default.createElement(k,{headers:C}):null,i&&_?g.default.createElement(E,{duration:_}):null)))))}}]),t}(g.default.Component);S.propTypes={response:_.default.instanceOf(w.Iterable).isRequired,path:_.default.string.isRequired,method:_.default.string.isRequired,displayRequestDuration:_.default.bool.isRequired,specSelectors:_.default.object.isRequired,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired},S.propTypes={getComponent:_.default.func.isRequired,response:x.default.map},t.default=S},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));r.toggleCollapsed=function(){r.props.onToggle&&r.props.onToggle(r.props.modelName,!r.state.expanded),r.setState({expanded:!r.state.expanded})};var i=r.props,a=i.expanded,u=i.collapsedContent;return r.state={expanded:a,collapsedContent:u||t.defaultProps.collapsedContent},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentWillReceiveProps",value:function(e){this.props.expanded!=e.expanded&&this.setState({expanded:e.expanded})}},{key:"render",value:function(){var e=this.props.title;return m.default.createElement("span",null,e&&m.default.createElement("span",{onClick:this.toggleCollapsed,style:{cursor:"pointer"}},e),m.default.createElement("span",{onClick:this.toggleCollapsed,style:{cursor:"pointer"}},m.default.createElement("span",{className:"model-toggle"+(this.state.expanded?"":" collapsed")})),this.state.expanded?this.props.children:this.state.collapsedContent)}}]),t}(d.Component);y.propTypes={collapsedContent:g.default.any,expanded:g.default.bool,children:g.default.any,title:g.default.element,modelName:g.default.string,onToggle:g.default.func},y.defaultProps={collapsedContent:"{...}",expanded:!1,title:null,onToggle:function(){}},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));r.activeTab=function(e){var t=e.target.dataset.name;r.setState({activeTab:t})};var i=r.props.getConfigs,a=i(),u=a.defaultModelRendering;return"example"!==u&&"model"!==u&&(u="example"),r.state={activeTab:u},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.specSelectors,r=e.schema,i=e.example,o=e.isExecute,a=e.getConfigs,s=e.specPath,u=a(),l=u.defaultModelExpandDepth,c=t("ModelWrapper");return m.default.createElement("div",null,m.default.createElement("ul",{className:"tab"},m.default.createElement("li",{className:"tabitem"+(o||"example"===this.state.activeTab?" active":"")},m.default.createElement("a",{className:"tablinks","data-name":"example",onClick:this.activeTab},"Example Value")),r?m.default.createElement("li",{className:"tabitem"+(o||"model"!==this.state.activeTab?"":" active")},m.default.createElement("a",{className:"tablinks"+(o?" inactive":""),"data-name":"model",onClick:this.activeTab},"Model")):null),m.default.createElement("div",null,(o||"example"===this.state.activeTab)&&i,!o&&"model"===this.state.activeTab&&m.default.createElement(c,{schema:r,getComponent:t,getConfigs:a,specSelectors:n,expandDepth:l,specPath:s})))}}]),t}(m.default.Component);b.propTypes={getComponent:g.default.func.isRequired,specSelectors:g.default.object.isRequired,schema:g.default.object.isRequired,example:g.default.any.isRequired,isExecute:g.default.bool,getConfigs:g.default.func.isRequired,specPath:_.default.list.isRequired},t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=function(e){function t(){var e,n,r,i;(0,l.default)(this,t);for(var o=arguments.length,a=Array(o),u=0;u<o;u++)a[u]=arguments[u];return n=r=(0,h.default)(this,(e=t.__proto__||(0,s.default)(t)).call.apply(e,[this].concat(a))),r.onToggle=function(e,t){r.props.layoutActions&&r.props.layoutActions.show(["models",e],t)},i=n,(0,h.default)(r,i)}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.getConfigs,r=t("Model"),i=void 0;return this.props.layoutSelectors&&(i=this.props.layoutSelectors.isShown(["models",this.props.name])),g.default.createElement("div",{className:"model-box"},g.default.createElement(r,(0,o.default)({},this.props,{getConfigs:n,expanded:i,depth:1,onToggle:this.onToggle,expandDepth:this.props.expandDepth||0})))}}]),t}(v.Component);b.propTypes={schema:_.default.object.isRequired,name:_.default.string,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired,specSelectors:_.default.object.isRequired,expandDepth:_.default.number,layoutActions:_.default.object,layoutSelectors:_.default.object.isRequired},t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(18),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(7),_=r(y),b=n(1),x=r(b),w=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.specSelectors,n=e.getComponent,r=e.layoutSelectors,i=e.layoutActions,a=e.getConfigs,s=t.definitions(),u=a(),l=u.docExpansion,c=u.defaultModelsExpandDepth;if(!s.size||c<0)return null;var p=r.isShown("models",c>0&&"none"!==l),f=t.isOAS3()?["components","schemas"]:["definitions"],h=n("ModelWrapper"),d=n("Collapse");return g.default.createElement("section",{className:p?"models is-open":"models"},g.default.createElement("h4",{onClick:function(){return i.show("models",!p)}},g.default.createElement("span",null,"Models"),g.default.createElement("svg",{width:"20",height:"20"},g.default.createElement("use",{xlinkHref:p?"#large-arrow-down":"#large-arrow"}))),g.default.createElement(d,{isOpened:p},s.entrySeq().map(function(e){var s=(0,o.default)(e,2),u=s[0],l=s[1];return g.default.createElement("div",{id:"model-"+u,className:"model-container",key:"models-section-"+u},g.default.createElement(h,{name:u,expandDepth:c,schema:l,specPath:_.default.List([].concat(f,[u])),getComponent:n,specSelectors:t,getConfigs:a,layoutSelectors:r,layoutActions:i}))}).toArray()))}}]),t}(v.Component);w.propTypes={getComponent:x.default.func,specSelectors:x.default.object,layoutSelectors:x.default.object,layoutActions:x.default.object,getConfigs:x.default.func.isRequired},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(35),o=r(i),a=n(21),s=r(a),u=n(18),l=r(u),c=n(96),p=r(c),f=n(4),h=r(f),d=n(2),m=r(d),v=n(3),g=r(v),y=n(6),_=r(y),b=n(5),x=r(b),w=n(0),k=r(w),E=n(1),S=r(E),C=n(7),A=n(12),D=r(A),O=function(e){function t(){return(0,m.default)(this,t),(0,_.default)(this,(t.__proto__||(0,h.default)(t)).apply(this,arguments))}return(0,x.default)(t,e),(0,g.default)(t,[{key:"render",value:function(){var e=this.props,t=e.schema,n=e.name,r=e.isRef,i=e.getComponent,a=e.getConfigs,u=e.depth,c=e.onToggle,f=e.expanded,h=e.specPath,d=(0,p.default)(e,["schema","name","isRef","getComponent","getConfigs","depth","onToggle","expanded","specPath"]),m=d.specSelectors,v=d.expandDepth,g=m.isOAS3;if(!t)return null;var y=a(),_=y.showExtensions,b=t.get("description"),x=t.get("properties"),w=t.get("additionalProperties"),E=t.get("title")||n,S=t.get("required"),A=i("JumpToPath",!0),D=i("Markdown"),O=i("Model"),M=i("ModelCollapse"),T=function(){return k.default.createElement("span",{className:"model-jump-to-path"},k.default.createElement(A,{specPath:h}))},P=k.default.createElement("span",null,k.default.createElement("span",null,"{"),"...",k.default.createElement("span",null,"}"),r?k.default.createElement(T,null):""),I=m.isOAS3()?t.get("anyOf"):null,R=m.isOAS3()?t.get("oneOf"):null,j=m.isOAS3()?t.get("not"):null,F=E&&k.default.createElement("span",{className:"model-title"},r&&t.get("$$ref")&&k.default.createElement("span",{className:"model-hint"},t.get("$$ref")),k.default.createElement("span",{className:"model-title__text"},E));return k.default.createElement("span",{className:"model"},k.default.createElement(M,{modelName:n,title:F,onToggle:c,expanded:!!f||u<=v,collapsedContent:P},k.default.createElement("span",{className:"brace-open object"},"{"),r?k.default.createElement(T,null):null,k.default.createElement("span",{className:"inner-object"},k.default.createElement("table",{className:"model"},k.default.createElement("tbody",null,b?k.default.createElement("tr",{style:{color:"#999",fontStyle:"italic"}},k.default.createElement("td",null,"description:"),k.default.createElement("td",null,k.default.createElement(D,{source:b}))):null,x&&x.size?x.entrySeq().map(function(e){var t=(0,l.default)(e,2),r=t[0],o=t[1],c=g()&&o.get("deprecated"),p=C.List.isList(S)&&S.contains(r),f={verticalAlign:"top",paddingRight:"0.2em"};return p&&(f.fontWeight="bold"),k.default.createElement("tr",{key:r,className:c&&"deprecated"},k.default.createElement("td",{style:f},r,p&&k.default.createElement("span",{style:{color:"red"}},"*")),k.default.createElement("td",{style:{verticalAlign:"top"}},k.default.createElement(O,(0,s.default)({key:"object-"+n+"-"+r+"_"+o},d,{required:p,getComponent:i,specPath:h.push("properties",r),getConfigs:a,schema:o,depth:u+1}))))}).toArray():null,_?k.default.createElement("tr",null," "):null,_?t.entrySeq().map(function(e){var t=(0,l.default)(e,2),n=t[0],r=t[1];if("x-"===n.slice(0,2)){var i=r?r.toJS?r.toJS():r:null;return k.default.createElement("tr",{key:n,style:{color:"#777"}},k.default.createElement("td",null,n),k.default.createElement("td",{style:{verticalAlign:"top"}},(0,o.default)(i)))}}).toArray():null,w&&w.size?k.default.createElement("tr",null,k.default.createElement("td",null,"< * >:"),k.default.createElement("td",null,k.default.createElement(O,(0,s.default)({},d,{required:!1,getComponent:i,specPath:h.push("additionalProperties"),getConfigs:a,schema:w,depth:u+1})))):null,I?k.default.createElement("tr",null,k.default.createElement("td",null,"anyOf ->"),k.default.createElement("td",null,I.map(function(e,t){return k.default.createElement("div",{key:t},k.default.createElement(O,(0,s.default)({},d,{required:!1,getComponent:i,specPath:h.push("anyOf",t),getConfigs:a,schema:e,depth:u+1})))}))):null,R?k.default.createElement("tr",null,k.default.createElement("td",null,"oneOf ->"),k.default.createElement("td",null,R.map(function(e,t){return k.default.createElement("div",{key:t},k.default.createElement(O,(0,s.default)({},d,{required:!1,getComponent:i,specPath:h.push("oneOf",t),getConfigs:a,schema:e,depth:u+1})))}))):null,j?k.default.createElement("tr",null,k.default.createElement("td",null,"not ->"),k.default.createElement("td",null,k.default.createElement("div",null,k.default.createElement(O,(0,s.default)({},d,{required:!1,getComponent:i,specPath:h.push("not"),getConfigs:a,schema:j,depth:u+1}))))):null))),k.default.createElement("span",{className:"brace-close"},"}")))}}]),t}(w.Component);O.propTypes={schema:S.default.object.isRequired,getComponent:S.default.func.isRequired,getConfigs:S.default.func.isRequired,expanded:S.default.bool,onToggle:S.default.func,specSelectors:S.default.object.isRequired,name:S.default.string,isRef:S.default.bool,expandDepth:S.default.number,depth:S.default.number,specPath:D.default.list.isRequired},t.default=O},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(47),o=r(i),a=n(48),s=r(a),u=n(4),l=r(u),c=n(2),p=r(c),f=n(3),h=r(f),d=n(6),m=r(d),v=n(5),g=r(v),y=n(0),_=r(y),b=n(1),x=r(b),w=n(9),k=function(e){function t(e,n){(0,p.default)(this,t);var r=(0,m.default)(this,(t.__proto__||(0,l.default)(t)).call(this,e,n)),i=e.specSelectors,o=e.getConfigs,a=o(),s=a.validatorUrl;return r.state={url:i.url(),validatorUrl:void 0===s?"https://online.swagger.io/validator":s},r}return(0,g.default)(t,e),(0,h.default)(t,[{key:"componentWillReceiveProps",value:function(e){var t=e.specSelectors,n=e.getConfigs,r=n(),i=r.validatorUrl;this.setState({url:t.url(),validatorUrl:void 0===i?"https://online.swagger.io/validator":i})}},{key:"render",value:function(){var e=this.props.getConfigs,t=e(),n=t.spec,r=(0,w.sanitizeUrl)(this.state.validatorUrl);return"object"===(void 0===n?"undefined":(0,s.default)(n))&&(0,o.default)(n).length?null:!this.state.url||!this.state.validatorUrl||this.state.url.indexOf("localhost")>=0||this.state.url.indexOf("127.0.0.1")>=0?null:_.default.createElement("span",{style:{float:"right"}},_.default.createElement("a",{target:"_blank",href:r+"/debug?url="+this.state.url},_.default.createElement(E,{src:r+"?url="+this.state.url,alt:"Online validator badge"})))}}]),t}(_.default.Component);k.propTypes={getComponent:x.default.func.isRequired,getConfigs:x.default.func.isRequired,specSelectors:x.default.object.isRequired},t.default=k;var E=function(e){function t(e){(0,p.default)(this,t);var n=(0,m.default)(this,(t.__proto__||(0,l.default)(t)).call(this,e));return n.state={loaded:!1,error:!1},n}return(0,g.default)(t,e),(0,h.default)(t,[{key:"componentDidMount",value:function(){var e=this,t=new Image;t.onload=function(){e.setState({loaded:!0})},t.onerror=function(){e.setState({error:!0})},t.src=this.props.src}},{key:"componentWillReceiveProps",value:function(e){var t=this;if(e.src!==this.props.src){var n=new Image;n.onload=function(){t.setState({loaded:!0})},n.onerror=function(){t.setState({error:!0})},n.src=e.src}}},{key:"render",value:function(){return this.state.error?_.default.createElement("img",{alt:"Error"}):this.state.loaded?_.default.createElement("img",{src:this.props.src,alt:this.props.alt}):_.default.createElement("img",{alt:"Loading..."})}}]),t}(_.default.Component);E.propTypes={src:x.default.string,alt:x.default.string}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.OperationExtRow=void 0;var i=n(35),o=r(i),a=n(0),s=r(a),u=n(1),l=r(u),c=t.OperationExtRow=function(e){var t=e.xKey,n=e.xVal,r=n?n.toJS?n.toJS():n:null;return s.default.createElement("tr",null,s.default.createElement("td",null,t),s.default.createElement("td",null,(0,o.default)(r)))};c.propTypes={xKey:l.default.string,xVal:l.default.any},t.default=c},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.OperationExt=void 0;var i=n(18),o=r(i),a=n(0),s=r(a),u=n(1),l=r(u),c=t.OperationExt=function(e){var t=e.extensions,n=e.getComponent,r=n("OperationExtRow");return s.default.createElement("div",{className:"opblock-section"},s.default.createElement("div",{className:"opblock-section-header"},s.default.createElement("h4",null,"Extensions")),s.default.createElement("div",{className:"table-container"},s.default.createElement("table",null,s.default.createElement("thead",null,s.default.createElement("tr",null,s.default.createElement("td",{className:"col col_header"},"Field"),s.default.createElement("td",{className:"col col_header"},"Value"))),s.default.createElement("tbody",null,t.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],i=t[1];return s.default.createElement(r,{key:n+"-"+i,xKey:n,xVal:i})})))))};c.propTypes={extensions:l.default.object.isRequired,getComponent:l.default.func.isRequired},t.default=c},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(9),_=n(7),b=n(12),x=r(b),w=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.specPath,n=e.response,r=e.request,i=e.toggleShown,o=e.onTryoutClick,a=e.onCancelClick,s=e.onExecute,u=e.fn,l=e.getComponent,c=e.getConfigs,p=e.specActions,f=e.specSelectors,h=e.authActions,d=e.authSelectors,v=e.oas3Actions,g=e.oas3Selectors,_=this.props.operation,b=_.toJS(),x=b.isShown,w=b.isAuthorized,k=b.path,E=b.method,S=b.op,C=b.tag,A=b.showSummary,D=b.operationId,O=b.allowTryItOut,M=b.displayOperationId,T=b.displayRequestDuration,P=b.isDeepLinkingEnabled,I=b.tryItOutEnabled,R=b.executeInProgress,j=S.operation,F=j.summary,N=j.description,B=j.deprecated,L=j.externalDocs,q=j.schemes,z=_.getIn(["op","operation"]),U=_.get("security"),W=z.get("responses"),V=z.get("produces"),H=(0,y.getList)(z,["parameters"]),G=f.operationScheme(k,E),J=["operations",C,D],K=(0,y.getExtensions)(z),X=l("responses"),Y=l("parameters"),$=l("execute"),Z=l("clear"),Q=l("authorizeOperationBtn"),ee=l("JumpToPath",!0),te=l("Collapse"),ne=l("Markdown"),re=l("schemes"),ie=l("OperationServers"),oe=l("OperationExt"),ae=l("DeepLink"),se=c(),ue=se.showExtensions;if(W&&n&&n.size>0){var le=!W.get(String(n.get("status")))&&!W.get("default");n=n.set("notDocumented",le)}var ce=[k,E];return m.default.createElement("div",{className:B?"opblock opblock-deprecated":x?"opblock opblock-"+E+" is-open":"opblock opblock-"+E,id:J.join("-")},m.default.createElement("div",{className:"opblock-summary opblock-summary-"+E,onClick:i},m.default.createElement("span",{className:"opblock-summary-method"},E.toUpperCase()),m.default.createElement("span",{className:B?"opblock-summary-path__deprecated":"opblock-summary-path"},m.default.createElement(ae,{enabled:P,isShown:x,path:""+J.join("/"),text:k}),m.default.createElement(ee,{path:t})," "),A?m.default.createElement("div",{className:"opblock-summary-description"},F):null,M&&D?m.default.createElement("span",{className:"opblock-summary-operation-id"},D):null,U&&U.count()?m.default.createElement(Q,{isAuthorized:w,onClick:function(){var e=d.definitionsForRequirements(U);h.showDefinitions(e)}}):null),m.default.createElement(te,{isOpened:x},m.default.createElement("div",{className:"opblock-body"},B&&m.default.createElement("h4",{className:"opblock-title_normal"}," Warning: Deprecated"),N&&m.default.createElement("div",{className:"opblock-description-wrapper"},m.default.createElement("div",{className:"opblock-description"},m.default.createElement(ne,{source:N}))),L&&L.url?m.default.createElement("div",{className:"opblock-external-docs-wrapper"},m.default.createElement("h4",{className:"opblock-title_normal"},"Find more details"),m.default.createElement("div",{className:"opblock-external-docs"},m.default.createElement("span",{className:"opblock-external-docs__description"},m.default.createElement(ne,{source:L.description})),m.default.createElement("a",{target:"_blank",className:"opblock-external-docs__link",href:(0,y.sanitizeUrl)(L.url)},L.url))):null,m.default.createElement(Y,{parameters:H,specPath:t.push("parameters"),operation:z,onChangeKey:ce,onTryoutClick:o,onCancelClick:a,tryItOutEnabled:I,allowTryItOut:O,fn:u,getComponent:l,specActions:p,specSelectors:f,pathMethod:[k,E],getConfigs:c}),I?m.default.createElement(ie,{getComponent:l,path:k,method:E,operationServers:z.get("servers"),pathServers:f.paths().getIn([k,"servers"]),getSelectedServer:g.selectedServer,setSelectedServer:v.setSelectedServer,setServerVariableValue:v.setServerVariableValue,getServerVariable:g.serverVariableValue,getEffectiveServerValue:g.serverEffectiveValue}):null,I&&O&&q&&q.size?m.default.createElement("div",{className:"opblock-schemes"},m.default.createElement(re,{schemes:q,path:k,method:E,specActions:p,currentScheme:G})):null,m.default.createElement("div",{className:I&&n&&O?"btn-group":"execute-wrapper"},I&&O?m.default.createElement($,{operation:z,specActions:p,specSelectors:f,path:k,method:E,onExecute:s}):null,I&&n&&O?m.default.createElement(Z,{specActions:p,path:k,method:E}):null),R?m.default.createElement("div",{className:"loading-container"},m.default.createElement("div",{className:"loading"})):null,W?m.default.createElement(X,{responses:W,request:r,tryItOutResponse:n,getComponent:l,getConfigs:c,specSelectors:f,oas3Actions:v,specActions:p,produces:V,producesValue:f.currentProducesFor([k,E]),specPath:t.push("responses"),path:k,method:E,displayRequestDuration:T,fn:u}):null,ue&&K.size?m.default.createElement(oe,{extensions:K,getComponent:l}):null)))}}]),t}(d.PureComponent);w.propTypes={specPath:x.default.list.isRequired,operation:g.default.instanceOf(_.Iterable).isRequired,response:g.default.instanceOf(_.Iterable),request:g.default.instanceOf(_.Iterable),toggleShown:g.default.func.isRequired,onTryoutClick:g.default.func.isRequired,onCancelClick:g.default.func.isRequired,onExecute:g.default.func.isRequired,getComponent:g.default.func.isRequired,getConfigs:g.default.func.isRequired,authActions:g.default.object,authSelectors:g.default.object,specActions:g.default.object.isRequired,specSelectors:g.default.object.isRequired,oas3Actions:g.default.object.isRequired,oas3Selectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,layoutSelectors:g.default.object.isRequired,fn:g.default.object.isRequired},w.defaultProps={operation:null,response:null,request:null,specPath:(0,_.List)()},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(7),_=r(y),b=n(9),x=["get","put","post","delete","options","head","patch"],w=x.concat(["trace"]),k=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.specSelectors,n=e.getComponent,r=e.layoutSelectors,i=e.layoutActions,o=e.getConfigs,a=t.taggedOperations(),s=n("OperationContainer",!0),u=n("Collapse"),l=n("Markdown"),c=n("DeepLink"),p=o(),f=p.docExpansion,h=p.maxDisplayedTags,d=p.deepLinking,v=d&&"false"!==d,g=r.currentFilter();return g&&!0!==g&&(a=a.filter(function(e,t){return-1!==t.indexOf(g)})),h&&!isNaN(h)&&h>=0&&(a=a.slice(0,h)),m.default.createElement("div",null,a.map(function(e,n){var o=e.get("operations"),a=e.getIn(["tagDetails","description"],null),p=e.getIn(["tagDetails","externalDocs","description"]),h=e.getIn(["tagDetails","externalDocs","url"]),d=["operations-tag",(0,b.createDeepLinkPath)(n)],g=r.isShown(d,"full"===f||"list"===f);return m.default.createElement("div",{className:g?"opblock-tag-section is-open":"opblock-tag-section",key:"operation-"+n},m.default.createElement("h4",{onClick:function(){return i.show(d,!g)},className:a?"opblock-tag":"opblock-tag no-desc",id:d.join("-")},m.default.createElement(c,{enabled:v,isShown:g,path:n,text:n}),a?m.default.createElement("small",null,m.default.createElement(l,{source:a})):m.default.createElement("small",null),m.default.createElement("div",null,p?m.default.createElement("small",null,p,h?": ":null,h?m.default.createElement("a",{href:(0,b.sanitizeUrl)(h),onClick:function(e){return e.stopPropagation()},target:"_blank"},h):null):null),m.default.createElement("button",{className:"expand-operation",title:g?"Collapse operation":"Expand operation",onClick:function(){return i.show(d,!g)}},m.default.createElement("svg",{className:"arrow",width:"20",height:"20"},m.default.createElement("use",{href:g?"#large-arrow-down":"#large-arrow",xlinkHref:g?"#large-arrow-down":"#large-arrow"})))),m.default.createElement(u,{isOpened:g},o.map(function(e){var r=e.get("path"),i=e.get("method"),o=_.default.List(["paths",r,i]);return-1===(t.isOAS3()?w:x).indexOf(i)?null:m.default.createElement(s,{key:r+"-"+i,specPath:o,op:e,path:r,method:i,tag:n})}).toArray()))}).toArray(),a.size<1?m.default.createElement("h3",null," No operations defined in spec! "):null)}}]),t}(m.default.Component);k.propTypes={specSelectors:g.default.object.isRequired,specActions:g.default.object.isRequired,oas3Actions:g.default.object.isRequired,getComponent:g.default.func.isRequired,layoutSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,authActions:g.default.object.isRequired,authSelectors:g.default.object.isRequired,getConfigs:g.default.func.isRequired},t.default=k,k.propTypes={layoutActions:g.default.object.isRequired,specSelectors:g.default.object.isRequired,specActions:g.default.object.isRequired,layoutSelectors:g.default.object.isRequired,getComponent:g.default.func.isRequired,fn:g.default.object.isRequired}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.OperationLink=void 0;var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(268),_=function(e){function t(){var e;(0,s.default)(this,t);for(var n=arguments.length,r=Array(n),i=0;i<n;i++)r[i]=arguments[i];var a=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(r)));return a.setTagShown=a._setTagShown.bind(a),a}return(0,h.default)(t,e),(0,l.default)(t,[{key:"_setTagShown",value:function(e,t){this.props.layoutActions.show(e,t)}},{key:"showOp",value:function(e,t){this.props.layoutActions.show(e,t)}},{key:"render",value:function(){var e=this.props,t=e.specSelectors,n=e.layoutSelectors,r=e.layoutActions,i=e.getComponent,o=t.taggedOperations(),a=i("Collapse");return m.default.createElement("div",null,m.default.createElement("h4",{className:"overview-title"},"Overview"),o.map(function(e,t){var i=e.get("operations"),o=["overview-tags",t],s=n.isShown(o,!0),u=function(){return r.show(o,!s)};return m.default.createElement("div",{key:"overview-"+t},m.default.createElement("h4",{onClick:u,className:"link overview-tag"}," ",s?"-":"+",t),m.default.createElement(a,{isOpened:s,animated:!0},i.map(function(e){var t=e.toObject(),i=t.path,o=t.method,a=t.id,s=a,u=n.isShown(["operations",s]);return m.default.createElement(b,{key:a,path:i,method:o,id:i+"-"+o,shown:u,showOpId:s,showOpIdPrefix:"operations",href:"#operation-"+s,onClick:r.show})}).toArray()))}).toArray(),o.size<1&&m.default.createElement("h3",null," No operations defined in spec! "))}}]),t}(m.default.Component);t.default=_,_.propTypes={layoutSelectors:g.default.object.isRequired,specSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,getComponent:g.default.func.isRequired};var b=t.OperationLink=function(e){function t(e){(0,s.default)(this,t);var n=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e));return n.onClick=n._onClick.bind(n),n}return(0,h.default)(t,e),(0,l.default)(t,[{key:"_onClick",value:function(){var e=this.props,t=e.showOpId,n=e.showOpIdPrefix;(0,e.onClick)([n,t],!e.shown)}},{key:"render",value:function(){var e=this.props,t=e.id,n=e.method,r=e.shown,i=e.href;return m.default.createElement(y.Link,{href:i,style:{fontWeight:r?"bold":"normal"},onClick:this.onClick,className:"block opblock-link"},m.default.createElement("div",null,m.default.createElement("small",{className:"bold-label-"+n},n.toUpperCase()),m.default.createElement("span",{className:"bold-label"},t)))}}]),t}(m.default.Component);b.propTypes={href:g.default.string,onClick:g.default.func,id:g.default.string.isRequired,method:g.default.string.isRequired,shown:g.default.bool.isRequired,showOpId:g.default.string.isRequired,showOpIdPrefix:g.default.string.isRequired}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(7),_=n(9),b=Function.prototype,x=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));return w.call(r),r.state={isEditBox:!1,value:""},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){this.updateValues.call(this,this.props)}},{key:"componentWillReceiveProps",value:function(e){this.updateValues.call(this,e)}},{key:"render",value:function(){var e=this.props,n=e.onChangeConsumes,r=e.param,i=e.isExecute,o=e.specSelectors,a=e.pathMethod,s=e.getComponent,u=s("Button"),l=s("TextArea"),c=s("highlightCode"),p=s("contentType"),f=o?o.getParameter(a,r.get("name"),r.get("in")):r,h=f.get("errors",(0,y.List)()),d=o.contentTypeValues(a).get("requestContentType"),v=this.props.consumes&&this.props.consumes.size?this.props.consumes:t.defaultProp.consumes,g=this.state,_=g.value,b=g.isEditBox;return m.default.createElement("div",{className:"body-param"},b&&i?m.default.createElement(l,{className:"body-param__text"+(h.count()?" invalid":""),value:_,onChange:this.handleOnChange}):_&&m.default.createElement(c,{className:"body-param__example",value:_}),m.default.createElement("div",{className:"body-param-options"},i?m.default.createElement("div",{className:"body-param-edit"},m.default.createElement(u,{className:b?"btn cancel body-param__example-edit":"btn edit body-param__example-edit",onClick:this.toggleIsEditBox},b?"Cancel":"Edit")):null,m.default.createElement("label",{htmlFor:""},m.default.createElement("span",null,"Parameter content type"),m.default.createElement(p,{value:d,contentTypes:v,onChange:n,className:"body-param-content-type"}))))}}]),t}(d.PureComponent);x.propTypes={param:g.default.object,onChange:g.default.func,onChangeConsumes:g.default.func,consumes:g.default.object,consumesValue:g.default.string,fn:g.default.object.isRequired,getComponent:g.default.func.isRequired,isExecute:g.default.bool,specSelectors:g.default.object.isRequired,pathMethod:g.default.array.isRequired},x.defaultProp={consumes:(0,y.fromJS)(["application/json"]),param:(0,y.fromJS)({}),onChange:b,onChangeConsumes:b};var w=function(){var e=this;this.updateValues=function(t){var n=t.specSelectors,r=t.pathMethod,i=t.param,o=t.isExecute,a=t.consumesValue,s=void 0===a?"":a,u=n?n.getParameter(r,i.get("name"),i.get("in")):(0,y.fromJS)({}),l=/xml/i.test(s),c=/json/i.test(s),p=l?u.get("value_xml"):u.get("value");if(void 0!==p){var f=!p&&c?"{}":p;e.setState({value:f}),e.onChange(f,{isXml:l,isEditBox:o})}else l?e.onChange(e.sample("xml"),{isXml:l,isEditBox:o}):e.onChange(e.sample(),{isEditBox:o})},this.sample=function(t){var n=e.props,r=n.param,i=n.fn.inferSchema,o=i(r.toJS());return(0,_.getSampleSchema)(o,t,{includeWriteOnly:!0})},this.onChange=function(t,n){var r=n.isEditBox,i=n.isXml;e.setState({value:t,isEditBox:r}),e._onChange(t,i)},this._onChange=function(t,n){(e.props.onChange||b)(e.props.param,t,n)},this.handleOnChange=function(t){var n=e.props.consumesValue,r=/json/i.test(n),i=/xml/i.test(n),o=r?t.target.value.trim():t.target.value;e.onChange(o,{isXml:i})},this.toggleIsEditBox=function(){return e.setState(function(e){return{isEditBox:!e.isEditBox}})}};t.default=x},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.ParameterExt=void 0;var i=n(0),o=r(i),a=n(1),s=r(a),u=t.ParameterExt=function(e){var t=e.xKey,n=e.xVal;return o.default.createElement("div",{className:"parameter__extension"},t,": ",String(n))};u.propTypes={xKey:s.default.string,xVal:s.default.any},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(7),g=n(1),y=r(g),_=n(12),b=r(_),x=n(46),w=r(x),k=n(9),E=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));S.call(r);var i=e.specSelectors,a=e.pathMethod,u=e.param,l=u.get("default"),c=i.getParameter(a,u.get("name"),u.get("in")),f=c?c.get("value"):"";return void 0!==l&&void 0===f&&r.onChangeWrapper(l),r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentWillReceiveProps",value:function(e){var t=e.specSelectors,n=e.pathMethod,r=e.param,i=t.isOAS3,o=r.get("example"),a=r.get("default"),s=t.getParameter(n,r.get("name"),r.get("in")),u=void 0;if(i()){u=(r.get("schema")||(0,v.Map)()).get("enum")}else u=s?s.get("enum"):void 0;var l=s?s.get("value"):void 0,c=void 0;void 0!==l?c=l:void 0!==o?c=o:void 0!==a?c=a:r.get("required")&&u&&u.size&&(c=u.first()),void 0!==c&&this.onChangeWrapper(c)}},{key:"render",value:function(){var e=this.props,t=e.param,n=e.onChange,r=e.getComponent,i=e.getConfigs,o=e.isExecute,a=e.fn,s=e.onChangeConsumes,u=e.specSelectors,l=e.pathMethod,c=e.specPath,p=u.isOAS3,f=i(),h=f.showExtensions,d=r("JsonSchemaForm"),v=r("ParamBody"),g=t.get("in"),y="body"!==g?null:m.default.createElement(v,{getComponent:r,fn:a,param:t,consumes:u.operationConsumes(l),consumesValue:u.contentTypeValues(l).get("requestContentType"),onChange:n,onChangeConsumes:s,isExecute:o,specSelectors:u,pathMethod:l}),_=r("modelExample"),b=r("Markdown"),x=r("ParameterExt"),E=t.get("schema"),S=p&&p()?t.getIn(["schema","type"]):t.get("type"),C="formData"===g,A="FormData"in w.default,D=t.get("required"),O=t.getIn(p&&p()?["schema","items","type"]:["items","type"]),M=u.getParameter(l,t.get("name"),t.get("in")),T=M?M.get("value"):"",P=(0,k.getExtensions)(t),I=void 0,R=void 0,j=!1;void 0!==t&&(I=t.get("items")),void 0!==I&&(R=t.get("items").get("enum")),void 0!==R&&R.size>0&&(j=!0);var F=void 0,N=void 0;return void 0!==t&&(F=t.get("default"),N=t.get("example")),j&&(F=I.get("default")),m.default.createElement("tr",null,m.default.createElement("td",{className:"col parameters-col_name"},m.default.createElement("div",{className:D?"parameter__name required":"parameter__name"},t.get("name"),D?m.default.createElement("span",{style:{color:"red"}}," *"):null),m.default.createElement("div",{className:"parameter__type"},S," ",O&&"["+O+"]"),m.default.createElement("div",{className:"parameter__deprecated"},p&&p()&&t.get("deprecated")?"deprecated":null),m.default.createElement("div",{className:"parameter__in"},"(",t.get("in"),")"),h&&P.size?P.map(function(e,t){return m.default.createElement(x,{key:t+"-"+e,xKey:t,xVal:e})}):null),m.default.createElement("td",{className:"col parameters-col_description"},m.default.createElement(b,{source:t.get("description")}),!y&&o||!j?null:m.default.createElement(b,{source:"<i>Available values</i>: "+R.map(function(e){return e}).toArray().join(", ")}),!y&&o||void 0===F?null:m.default.createElement(b,{source:"<i>Default value</i>: "+F}),!y&&o||void 0===N?null:m.default.createElement(b,{source:"<i>Example</i>: "+N}),C&&!A&&m.default.createElement("div",null,"Error: your browser does not support FormData"),y||!o?null:m.default.createElement(d,{fn:a,getComponent:r,value:T,required:D,description:t.get("description")?t.get("name")+" - "+t.get("description"):""+t.get("name"),onChange:this.onChangeWrapper,errors:t.get("errors"),schema:p&&p()?t.get("schema"):t}),y&&E?m.default.createElement(_,{getComponent:r,specPath:c.push("schema"),getConfigs:i,isExecute:o,specSelectors:u,schema:E,example:y}):null))}}]),t}(d.Component);E.propTypes={onChange:y.default.func.isRequired,param:y.default.object.isRequired,getComponent:y.default.func.isRequired,fn:y.default.object.isRequired,isExecute:y.default.bool,onChangeConsumes:y.default.func.isRequired,specSelectors:y.default.object.isRequired,pathMethod:y.default.array.isRequired,getConfigs:y.default.func.isRequired,specPath:b.default.list.isRequired};var S=function(){var e=this;this.onChangeWrapper=function(t){var n=e.props;return(0,n.onChange)(n.param,t)}};t.default=E},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=n(7),x=r(b),w=function(e,t){return e.valueSeq().filter(x.default.Map.isMap).map(t)},k=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onChange=function(e,t,n){var i=r.props;(0,i.specActions.changeParam)(i.onChangeKey,e.get("name"),e.get("in"),t,n)},r.onChangeConsumesWrapper=function(e){var t=r.props;(0,t.specActions.changeConsumesValue)(t.onChangeKey,e)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this,t=this.props,n=t.onTryoutClick,r=t.onCancelClick,i=t.parameters,o=t.allowTryItOut,a=t.tryItOutEnabled,s=t.specPath,u=t.fn,l=t.getComponent,c=t.getConfigs,p=t.specSelectors,f=t.pathMethod,h=l("parameterRow"),d=l("TryItOutButton"),v=a&&o;return m.default.createElement("div",{className:"opblock-section"},m.default.createElement("div",{className:"opblock-section-header"},m.default.createElement("div",{className:"tab-header"},m.default.createElement("h4",{className:"opblock-title"},"Parameters")),o?m.default.createElement(d,{enabled:a,onCancelClick:r,onTryoutClick:n}):null),i.count()?m.default.createElement("div",{className:"table-container"},m.default.createElement("table",{className:"parameters"},m.default.createElement("thead",null,m.default.createElement("tr",null,m.default.createElement("th",{className:"col col_header parameters-col_name"},"Name"),m.default.createElement("th",{className:"col col_header parameters-col_description"},"Description"))),m.default.createElement("tbody",null,w(i,function(t,n){return m.default.createElement(h,{fn:u,specPath:s.push(n.toString()),getComponent:l,getConfigs:c,param:t,key:t.get("in")+"."+t.get("name"),onChange:e.onChange,onChangeConsumes:e.onChangeConsumesWrapper,specSelectors:p,pathMethod:f,isExecute:v})}).toArray()))):m.default.createElement("div",{className:"opblock-description-wrapper"},m.default.createElement("p",null,"No parameters")))}}]),t}(d.Component);k.propTypes={parameters:_.default.list.isRequired,specActions:g.default.object.isRequired,getComponent:g.default.func.isRequired,specSelectors:g.default.object.isRequired,fn:g.default.object.isRequired,tryItOutEnabled:g.default.bool,allowTryItOut:g.default.bool,onTryoutClick:g.default.func,onCancelClick:g.default.func,onChangeKey:g.default.array,pathMethod:g.default.array.isRequired,getConfigs:g.default.func.isRequired,specPath:_.default.list.isRequired},k.defaultProps={onTryoutClick:Function.prototype,onCancelClick:Function.prototype,tryItOutEnabled:!1,allowTryItOut:!0,onChangeKey:[],specPath:[]},t.default=k},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(18),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(9),x={color:"#6b6b6b",fontStyle:"italic"},w=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.schema,n=e.getComponent,r=e.getConfigs,i=e.name,a=e.depth,s=r(),u=s.showExtensions;if(!t||!t.get)return g.default.createElement("div",null);var l=t.get("type"),c=t.get("format"),p=t.get("xml"),f=t.get("enum"),h=t.get("title")||i,d=t.get("description"),m=(0,b.getExtensions)(t),v=t.filter(function(e,t){return-1===["enum","type","format","description","$$ref"].indexOf(t)}).filterNot(function(e,t){return m.has(t)}),y=n("Markdown"),_=n("EnumModel"),w=n("Property");return g.default.createElement("span",{className:"model"},g.default.createElement("span",{className:"prop"},i&&g.default.createElement("span",{className:(1===a&&"model-title")+" prop-name"},h),g.default.createElement("span",{className:"prop-type"},l),c&&g.default.createElement("span",{className:"prop-format"},"($",c,")"),v.size?v.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],r=t[1];return g.default.createElement(w,{key:n+"-"+r,propKey:n,propVal:r,propStyle:x})}):null,u&&m.size?m.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],r=t[1];return g.default.createElement(w,{key:n+"-"+r,propKey:n,propVal:r,propStyle:x})}):null,d?g.default.createElement(y,{source:d}):null,p&&p.size?g.default.createElement("span",null,g.default.createElement("br",null),g.default.createElement("span",{style:x},"xml:"),p.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],r=t[1];return g.default.createElement("span",{key:n+"-"+r,style:x},g.default.createElement("br",null),"   ",n,": ",String(r))}).toArray()):null,f&&g.default.createElement(_,{value:f,getComponent:n})))}}]),t}(v.Component);w.propTypes={schema:_.default.object.isRequired,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired,name:_.default.string,depth:_.default.number},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.Property=void 0;var i=n(0),o=r(i),a=n(1),s=r(a),u=t.Property=function(e){var t=e.propKey,n=e.propVal,r=e.propStyle;return o.default.createElement("span",{style:r},o.default.createElement("br",null),t,": ",String(n))};u.propTypes={propKey:s.default.string,propVal:s.default.any,propStyle:s.default.object},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(35),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(1196),x=r(b),w=n(948),k=r(w),E=n(9),S=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.content,n=e.contentType,r=e.url,i=e.headers,a=void 0===i?{}:i,s=e.getComponent,u=s("highlightCode"),l=void 0,c=void 0;if(r=r||"",/^application\/octet-stream/i.test(n)||a["Content-Disposition"]&&/attachment/i.test(a["Content-Disposition"])||a["content-disposition"]&&/attachment/i.test(a["content-disposition"])||a["Content-Description"]&&/File Transfer/i.test(a["Content-Description"])||a["content-description"]&&/File Transfer/i.test(a["content-description"])){if(!/^((?!chrome|android).)*safari/i.test(navigator.userAgent)&&"Blob"in window){var p=n||"text/html",f=t instanceof Blob?t:new Blob([t],{type:p}),h=window.URL.createObjectURL(f),d=r.substr(r.lastIndexOf("/")+1),m=[p,d,h].join(":"),v=a["content-disposition"]||a["Content-Disposition"];if(void 0!==v){var y=(0,E.extractFileNameFromContentDispositionHeader)(v);null!==y&&(m=y)}c=g.default.createElement("div",null,g.default.createElement("a",{href:h,download:m},"Download file"))}else c=g.default.createElement("pre",null,"Download headers detected but your browser does not support downloading binary via XHR (Blob).")}else if(/json/i.test(n)){try{l=(0,o.default)(JSON.parse(t),null,"  ")}catch(e){l="can't parse JSON.  Raw result:\n\n"+t}c=g.default.createElement(u,{value:l})}else/xml/i.test(n)?(l=(0,x.default)(t,{textNodesOnSameLine:!0,indentor:"  "}),c=g.default.createElement(u,{value:l})):c="text/html"===(0,k.default)(n)||/text\/plain/.test(n)?g.default.createElement(u,{value:t}):/^image\//i.test(n)?n.includes("svg")?g.default.createElement("div",null," ",t," "):g.default.createElement("img",{style:{maxWidth:"100%"},src:window.URL.createObjectURL(t)}):/^audio\//i.test(n)?g.default.createElement("pre",null,g.default.createElement("audio",{controls:!0},g.default.createElement("source",{src:r,type:n}))):"string"==typeof t?g.default.createElement(u,{value:t}):t.size>0?g.default.createElement("div",null,"Unknown response type"):null;return c?g.default.createElement("div",null,g.default.createElement("h5",null,"Response body"),c):null}}]),t}(g.default.Component);S.propTypes={content:_.default.any.isRequired,contentType:_.default.string,getComponent:_.default.func.isRequired,headers:_.default.object,url:_.default.string},t.default=S},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(35),m=r(d),v=n(18),g=r(v),y=n(0),_=r(y),b=n(1),x=r(b),w=n(12),k=r(w),E=n(573),S=r(E),C=n(7),A=n(9),D=function(e,t,n){return t&&t.size?t.entrySeq().map(function(e){var t=(0,g.default)(e,2),r=t[0],i=t[1],o=i;if(i.toJS)try{o=(0,m.default)(i.toJS(),null,2)}catch(e){o=String(i)}return _.default.createElement("div",{key:r},_.default.createElement("h5",null,r),_.default.createElement(n,{className:"example",value:o}))}).toArray():e?_.default.createElement("div",null,_.default.createElement(n,{className:"example",value:e})):null},O=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));return r._onContentTypeChange=function(e){var t=r.props,n=t.onContentTypeChange,i=t.controlsAcceptHeader;r.setState({responseContentType:e}),n({value:e,controlsAcceptHeader:i})},r.state={responseContentType:""},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e,t,n,r=this.props,i=r.code,o=r.response,a=r.className,s=r.specPath,u=r.fn,l=r.getComponent,c=r.getConfigs,p=r.specSelectors,f=r.contentType,h=r.controlsAcceptHeader,d=u.inferSchema,m=p.isOAS3,v=o.get("headers"),g=o.get("examples"),y=o.get("links"),b=l("headers"),x=l("highlightCode"),w=l("modelExample"),k=l("Markdown"),E=l("operationLink"),O=l("contentType");if(m()){var M=(0,C.List)(["content",this.state.responseContentType,"schema"]),T=o.getIn(M);e=T?(0,A.getSampleSchema)(T.toJS(),this.state.responseContentType,{includeReadOnly:!0}):null,t=T?d(T.toJS()):null,n=T?M:s}else t=d(o.toJS()),n=o.has("schema")?s.push("schema"):s,e=t?(0,A.getSampleSchema)(t,f,{includeReadOnly:!0,includeWriteOnly:!0}):null;g&&(g=g.map(function(e){return e.set?e.set("$$ref",void 0):e}));var P=D(e,g,x);return _.default.createElement("tr",{className:"response "+(a||"")},_.default.createElement("td",{className:"col response-col_status"},i),_.default.createElement("td",{className:"col response-col_description"},_.default.createElement("div",{className:"response-col_description__inner"},_.default.createElement(k,{source:o.get("description")})),m?_.default.createElement("div",{className:(0,S.default)("response-content-type",{"controls-accept-header":h})},_.default.createElement(O,{value:this.state.responseContentType,contentTypes:o.get("content")?o.get("content").keySeq():(0,C.Seq)(),onChange:this._onContentTypeChange}),h?_.default.createElement("small",null,"Controls ",_.default.createElement("code",null,"Accept")," header."):null):null,P?_.default.createElement(w,{specPath:n,getComponent:l,getConfigs:c,specSelectors:p,schema:(0,A.fromJSOrdered)(t),example:P}):null,v?_.default.createElement(b,{headers:v,getComponent:l}):null),p.isOAS3()?_.default.createElement("td",{className:"col response-col_links"},y?y.toSeq().map(function(e,t){return _.default.createElement(E,{key:t,name:t,link:e,getComponent:l})}):_.default.createElement("i",null,"No links")):null)}}]),t}(_.default.Component);O.propTypes={code:x.default.string.isRequired,response:x.default.instanceOf(C.Iterable),className:x.default.string,getComponent:x.default.func.isRequired,getConfigs:x.default.func.isRequired,specSelectors:x.default.object.isRequired,specPath:k.default.list.isRequired,fn:x.default.object.isRequired,contentType:x.default.string,controlsAcceptHeader:x.default.bool,onContentTypeChange:x.default.func},O.defaultProps={response:(0,C.fromJS)({}),onContentTypeChange:function(){}},t.default=O},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(18),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(7),_=n(1),b=r(_),x=n(12),w=r(x),k=n(9),E=function(e){function t(){var e,n,r,i;(0,l.default)(this,t);for(var o=arguments.length,a=Array(o),u=0;u<o;u++)a[u]=arguments[u];return n=r=(0,h.default)(this,(e=t.__proto__||(0,s.default)(t)).call.apply(e,[this].concat(a))),r.onChangeProducesWrapper=function(e){return r.props.specActions.changeProducesValue([r.props.path,r.props.method],e)},r.onResponseContentTypeChange=function(e){var t=e.controlsAcceptHeader,n=e.value,i=r.props,o=i.oas3Actions,a=i.path,s=i.method;t&&o.setResponseContentType({value:n,path:a,method:s})},i=n,(0,h.default)(r,i)}return(0,m.default)(t,e),(0,p.default)(t,[{key:"shouldComponentUpdate",value:function(e){return this.props.tryItOutResponse!==e.tryItOutResponse||this.props.responses!==e.responses||this.props.produces!==e.produces||this.props.producesValue!==e.producesValue||this.props.displayRequestDuration!==e.displayRequestDuration||this.props.path!==e.path||this.props.method!==e.method}},{key:"render",value:function(){var e=this,n=this.props,r=n.responses,i=n.tryItOutResponse,a=n.getComponent,s=n.getConfigs,u=n.specSelectors,l=n.fn,c=n.producesValue,p=n.displayRequestDuration,f=n.specPath,h=(0,k.defaultStatusCode)(r),d=a("contentType"),m=a("liveResponse"),v=a("response"),y=this.props.produces&&this.props.produces.size?this.props.produces:t.defaultProps.produces,_=u.isOAS3(),b=_?(0,k.getAcceptControllingResponse)(r):null;return g.default.createElement("div",{className:"responses-wrapper"},g.default.createElement("div",{className:"opblock-section-header"},g.default.createElement("h4",null,"Responses"),u.isOAS3()?null:g.default.createElement("label",null,g.default.createElement("span",null,"Response content type"),g.default.createElement(d,{value:c,onChange:this.onChangeProducesWrapper,contentTypes:y,className:"execute-content-type"}))),g.default.createElement("div",{className:"responses-inner"},i?g.default.createElement("div",null,g.default.createElement(m,{response:i,getComponent:a,getConfigs:s,specSelectors:u,path:this.props.path,method:this.props.method,displayRequestDuration:p}),g.default.createElement("h4",null,"Responses")):null,g.default.createElement("table",{className:"responses-table"},g.default.createElement("thead",null,g.default.createElement("tr",{className:"responses-header"},g.default.createElement("td",{className:"col col_header response-col_status"},"Code"),g.default.createElement("td",{className:"col col_header response-col_description"},"Description"),u.isOAS3()?g.default.createElement("td",{className:"col col_header response-col_links"},"Links"):null)),g.default.createElement("tbody",null,r.entrySeq().map(function(t){var n=(0,o.default)(t,2),r=n[0],p=n[1],d=i&&i.get("status")==r?"response_current":"";return g.default.createElement(v,{key:r,specPath:f.push(r),isDefault:h===r,fn:l,className:d,code:r,response:p,specSelectors:u,controlsAcceptHeader:p===b,onContentTypeChange:e.onResponseContentTypeChange,contentType:c,getConfigs:s,getComponent:a})}).toArray()))))}}]),t}(g.default.Component);E.propTypes={tryItOutResponse:b.default.instanceOf(y.Iterable),responses:b.default.instanceOf(y.Iterable).isRequired,produces:b.default.instanceOf(y.Iterable),producesValue:b.default.any,displayRequestDuration:b.default.bool.isRequired,path:b.default.string.isRequired,method:b.default.string.isRequired,getComponent:b.default.func.isRequired,getConfigs:b.default.func.isRequired,specSelectors:b.default.object.isRequired,specActions:b.default.object.isRequired,oas3Actions:b.default.object.isRequired,specPath:w.default.list.isRequired,fn:b.default.object.isRequired},E.defaultProps={tryItOutResponse:null,produces:(0,y.fromJS)(["application/json"]),displayRequestDuration:!1},t.default=E},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onChange=function(e){r.setScheme(e.target.value)},r.setScheme=function(e){var t=r.props,n=t.path,i=t.method;t.specActions.setScheme(e,n,i)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentWillMount",value:function(){var e=this.props.schemes;this.setScheme(e.first())}},{key:"componentWillReceiveProps",value:function(e){this.props.currentScheme&&e.schemes.includes(this.props.currentScheme)||this.setScheme(e.schemes.first())}},{key:"render",value:function(){var e=this.props.schemes;return m.default.createElement("label",{htmlFor:"schemes"},m.default.createElement("span",{className:"schemes-title"},"Schemes"),m.default.createElement("select",{onChange:this.onChange},e.valueSeq().map(function(e){return m.default.createElement("option",{value:e,key:e},e)}).toArray()))}}]),t}(m.default.Component);y.propTypes={specActions:g.default.object.isRequired,schemes:g.default.object.isRequired,currentScheme:g.default.string.isRequired,path:g.default.string,method:g.default.string},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.onTryoutClick,n=e.onCancelClick,r=e.enabled;return m.default.createElement("div",{className:"try-out"},r?m.default.createElement("button",{className:"btn try-out__btn cancel",onClick:t},"Cancel"):m.default.createElement("button",{className:"btn try-out__btn",onClick:n},"Try it out "))}}]),t}(m.default.Component);y.propTypes={onTryoutClick:g.default.func,onCancelClick:g.default.func,enabled:g.default.bool},y.defaultProps={onTryoutClick:Function.prototype,onCancelClick:Function.prototype,enabled:!1},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(0),o=r(i),a=n(1),s=r(a),u=function(e){var t=e.version;return o.default.createElement("small",null,o.default.createElement("pre",{className:"version"}," ",t," "))};u.propTypes={version:s.default.string.isRequired},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=n(495),x=n(7),w=b.helpers.opId,k=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));return r.toggleShown=function(){var e=r.props,t=e.layoutActions,n=e.tag,i=e.operationId,o=e.isShown;t.show(["operations",n,i],!o)},r.onTryoutClick=function(){r.setState({tryItOutEnabled:!r.state.tryItOutEnabled})},r.onCancelClick=function(){var e=r.props,t=e.specActions,n=e.path,i=e.method;r.setState({tryItOutEnabled:!r.state.tryItOutEnabled}),t.clearValidateParams([n,i])},r.onExecute=function(){r.setState({executeInProgress:!0})},r.state={tryItOutEnabled:!1,executeInProgress:!1},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"mapStateToProps",value:function(e,t){var n=t.op,r=t.layoutSelectors,i=t.getConfigs,o=i(),a=o.docExpansion,s=o.deepLinking,u=o.displayOperationId,l=o.displayRequestDuration,c=o.supportedSubmitMethods,p=r.showSummary(),f=n.getIn(["operation","operationId"])||n.getIn(["operation","__originalOperationId"])||w(n.get("operation"),t.path,t.method)||n.get("id"),h=["operations",t.tag,f],d=s&&"false"!==s,m=c.indexOf(t.method)>=0&&(void 0===t.allowTryItOut?t.specSelectors.allowTryItOutFor(t.path,t.method):t.allowTryItOut),v=n.getIn(["operation","security"])||t.specSelectors.security();return{operationId:f,isDeepLinkingEnabled:d,showSummary:p,displayOperationId:u,displayRequestDuration:l,allowTryItOut:m,security:v,isAuthorized:t.authSelectors.isAuthorized(v),isShown:r.isShown(h,"full"===a),jumpToKey:"paths."+t.path+"."+t.method,response:t.specSelectors.responseFor(t.path,t.method),request:t.specSelectors.requestFor(t.path,t.method)}}},{key:"componentWillReceiveProps",value:function(e){e.response!==this.props.response&&this.setState({executeInProgress:!1})}},{key:"render",value:function(){var e=this.props,t=e.op,n=e.tag,r=e.path,i=e.method,o=e.security,a=e.isAuthorized,s=e.operationId,u=e.showSummary,l=e.isShown,c=e.jumpToKey,p=e.allowTryItOut,f=e.response,h=e.request,d=e.displayOperationId,v=e.displayRequestDuration,g=e.isDeepLinkingEnabled,y=e.specPath,_=e.specSelectors,b=e.specActions,w=e.getComponent,k=e.getConfigs,E=e.layoutSelectors,S=e.layoutActions,C=e.authActions,A=e.authSelectors,D=e.oas3Actions,O=e.oas3Selectors,M=e.fn,T=w("operation"),P=(0,x.fromJS)({op:t,tag:n,path:r,method:i,security:o,isAuthorized:a,operationId:s,showSummary:u,isShown:l,jumpToKey:c,allowTryItOut:p,request:h,displayOperationId:d,displayRequestDuration:v,isDeepLinkingEnabled:g,executeInProgress:this.state.executeInProgress,tryItOutEnabled:this.state.tryItOutEnabled});return m.default.createElement(T,{operation:P,response:f,request:h,isShown:l,toggleShown:this.toggleShown,onTryoutClick:this.onTryoutClick,onCancelClick:this.onCancelClick,onExecute:this.onExecute,specPath:y,specActions:b,specSelectors:_,oas3Actions:D,oas3Selectors:O,layoutActions:S,layoutSelectors:E,authActions:C,authSelectors:A,getComponent:w,getConfigs:k,fn:M})}}]),t}(d.PureComponent);k.propTypes={op:g.default.instanceOf(x.Iterable).isRequired,tag:g.default.string.isRequired,path:g.default.string.isRequired,method:g.default.string.isRequired,operationId:g.default.string.isRequired,showSummary:g.default.bool.isRequired,isShown:g.default.bool.isRequired,jumpToKey:g.default.string.isRequired,allowTryItOut:g.default.bool,displayOperationId:g.default.bool,isAuthorized:g.default.bool,displayRequestDuration:g.default.bool,response:g.default.instanceOf(x.Iterable),request:g.default.instanceOf(x.Iterable),security:g.default.instanceOf(x.Iterable),isDeepLinkingEnabled:g.default.bool.isRequired,specPath:_.default.list.isRequired,getComponent:g.default.func.isRequired,authActions:g.default.object,oas3Actions:g.default.object,oas3Selectors:g.default.object,authSelectors:g.default.object,specActions:g.default.object.isRequired,specSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,layoutSelectors:g.default.object.isRequired,fn:g.default.object.isRequired,getConfigs:g.default.func.isRequired},k.defaultProps={showSummary:!0,response:null,allowTryItOut:!0,displayOperationId:!1,displayRequestDuration:!1},t.default=k},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=[],n="",r=e.get("headers");if(t.push("curl"),t.push("-X",e.get("method")),t.push('"'+e.get("url")+'"'),r&&r.size){var i=!0,o=!1,s=void 0;try{for(var l,p=(0,c.default)(e.get("headers").entries());!(i=(l=p.next()).done);i=!0){var h=l.value,d=(0,u.default)(h,2),m=d[0],v=d[1];n=v,t.push("-H "),t.push('"'+m+": "+v+'"')}}catch(e){o=!0,s=e}finally{try{!i&&p.return&&p.return()}finally{if(o)throw s}}}if(e.get("body"))if("multipart/form-data"===n&&"POST"===e.get("method")){var g=!0,y=!1,_=void 0;try{for(var b,x=(0,c.default)(e.get("body").entrySeq());!(g=(b=x.next()).done);g=!0){var w=(0,u.default)(b.value,2),k=w[0],v=w[1];t.push("-F"),v instanceof f.default.File?t.push('"'+k+"=@"+v.name+";type="+v.type+'"'):t.push('"'+k+"="+v+'"')}}catch(e){y=!0,_=e}finally{try{!g&&x.return&&x.return()}finally{if(y)throw _}}}else t.push("-d"),t.push((0,a.default)(e.get("body")).replace(/\\n/g,""));return t.join(" ")}Object.defineProperty(t,"__esModule",{value:!0});var o=n(35),a=r(o),s=n(18),u=r(s),l=n(95),c=r(l);t.default=i;var p=n(46),f=r(p)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.JsonSchema_boolean=t.JsonSchema_array=t.JsonSchema_string=t.JsonSchemaForm=void 0;var i=n(30),o=r(i),a=n(21),s=r(a),u=n(4),l=r(u),c=n(2),p=r(c),f=n(3),h=r(f),d=n(6),m=r(d),v=n(5),g=r(v),y=n(0),_=r(y),b=n(1),x=r(b),w=n(7),k=n(12),E=r(k),S=function(){},C={getComponent:x.default.func.isRequired,value:x.default.any,onChange:x.default.func,keyName:x.default.any,fn:x.default.object.isRequired,schema:x.default.object,errors:E.default.list,required:x.default.bool,description:x.default.any},A={value:"",onChange:S,schema:{},keyName:"",required:!1,errors:(0,w.List)()},D=t.JsonSchemaForm=function(e){function t(){return(0,p.default)(this,t),(0,m.default)(this,(t.__proto__||(0,l.default)(t)).apply(this,arguments))}return(0,g.default)(t,e),(0,h.default)(t,[{key:"render",value:function(){var e=this.props,t=e.schema,n=e.errors,r=e.value,i=e.onChange,o=e.getComponent,a=e.fn;t.toJS&&(t=t.toJS());var u=t,l=u.type,c=u.format,p=void 0===c?"":c,f=o(p?"JsonSchema_"+l+"_"+p:"JsonSchema_"+l)||o("JsonSchema_string");return _.default.createElement(f,(0,s.default)({},this.props,{errors:n,fn:a,getComponent:o,value:r,onChange:i,schema:t}))}}]),t}(y.Component);D.propTypes=C,D.defaultProps=A;var O=t.JsonSchema_string=function(e){function t(){var e,n,r,i;(0,p.default)(this,t);for(var o=arguments.length,a=Array(o),s=0;s<o;s++)a[s]=arguments[s];return n=r=(0,m.default)(this,(e=t.__proto__||(0,l.default)(t)).call.apply(e,[this].concat(a))),r.onChange=function(e){var t="file"===r.props.schema.type?e.target.files[0]:e.target.value;r.props.onChange(t,r.props.keyName)},r.onEnumChange=function(e){return r.props.onChange(e)},i=n,(0,m.default)(r,i)}return(0,g.default)(t,e),(0,h.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.value,r=e.schema,i=e.errors,o=e.required,a=e.description,s=r.enum;if(i=i.toJS?i.toJS():[],s){var u=t("Select");return _.default.createElement(u,{className:i.length?"invalid":"",title:i.length?i:"",allowedValues:s,value:n,allowEmptyValue:!o,onChange:this.onEnumChange})}var l="formData"===r.in&&!("FormData"in window),c=t("Input");return"file"===r.type?_.default.createElement(c,{type:"file",className:i.length?"invalid":"",title:i.length?i:"",onChange:this.onChange,disabled:l}):_.default.createElement(c,{type:"password"===r.format?"password":"text",className:i.length?"invalid":"",title:i.length?i:"",value:n,placeholder:a,onChange:this.onChange,disabled:l})}}]),t}(y.Component);O.propTypes=C,O.defaultProps=A;var M=t.JsonSchema_array=function(e){function t(e,n){(0,p.default)(this,t);var r=(0,m.default)(this,(t.__proto__||(0,l.default)(t)).call(this,e,n));return r.onChange=function(){return r.props.onChange(r.state.value)},r.onItemChange=function(e,t){r.setState(function(n){return{value:n.value.set(t,e)}},r.onChange)},r.removeItem=function(e){r.setState(function(t){return{value:t.value.remove(e)}},r.onChange)},r.addItem=function(){r.setState(function(e){return e.value=e.value||(0,w.List)(),{value:e.value.push("")}},r.onChange)},r.onEnumChange=function(e){r.setState(function(){return{value:e}},r.onChange)},r.state={value:e.value},r}return(0,g.default)(t,e),(0,h.default)(t,[{key:"componentWillReceiveProps",value:function(e){e.value!==this.state.value&&this.setState({value:e.value})}},{key:"render",value:function(){var e=this,t=this.props,n=t.getComponent,r=t.required,i=t.schema,a=t.errors,s=t.fn;a=a.toJS?a.toJS():[];var u=s.inferSchema(i.items),l=n("JsonSchemaForm"),c=n("Button"),p=u.enum,f=this.state.value;if(p){var h=n("Select");return _.default.createElement(h,{className:a.length?"invalid":"",title:a.length?a:"",multiple:!0,value:f,allowedValues:p,allowEmptyValue:!r,onChange:this.onEnumChange})}return _.default.createElement("div",null,!f||f.count()<1?null:f.map(function(t,r){var i=(0,o.default)({},u);if(a.length){var p=a.filter(function(e){return e.index===r});p.length&&(a=[p[0].error+r])}return _.default.createElement("div",{key:r,className:"json-schema-form-item"},_.default.createElement(l,{fn:s,getComponent:n,value:t,onChange:function(t){return e.onItemChange(t,r)},schema:i}),_.default.createElement(c,{className:"btn btn-sm json-schema-form-item-remove",onClick:function(){return e.removeItem(r)}}," - "))}).toArray(),_.default.createElement(c,{className:"btn btn-sm json-schema-form-item-add "+(a.length?"invalid":null),onClick:this.addItem}," Add item "))}}]),t}(y.PureComponent);M.propTypes=C,M.defaultProps=A;var T=t.JsonSchema_boolean=function(e){function t(){var e,n,r,i;(0,p.default)(this,t);for(var o=arguments.length,a=Array(o),s=0;s<o;s++)a[s]=arguments[s];return n=r=(0,m.default)(this,(e=t.__proto__||(0,l.default)(t)).call.apply(e,[this].concat(a))),r.onEnumChange=function(e){return r.props.onChange(e)},i=n,(0,m.default)(r,i)}return(0,g.default)(t,e),(0,h.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.value,r=e.errors,i=e.schema;r=r.toJS?r.toJS():[];var o=t("Select");return _.default.createElement(o,{className:r.length?"invalid":"",title:r.length?r:"",value:String(n),allowedValues:(0,w.fromJS)(i.enum||["true","false"]),allowEmptyValue:!this.props.required,onChange:this.onEnumChange})}}]),t}(y.Component);T.propTypes=C,T.defaultProps=A},function(e,t,n){"use strict";function r(e){var t=e.auth,n=e.authActions,r=e.errActions,i=e.configs,s=e.authConfigs,u=void 0===s?{}:s,l=t.schema,c=t.scopes,p=t.name,f=t.clientId,h=l.get("flow"),d=[];switch(h){case"password":return void n.authorizePassword(t);case"application":return void n.authorizeApplication(t);case"accessCode":d.push("response_type=code");break;case"implicit":d.push("response_type=token");break;case"clientCredentials":return void n.authorizeApplication(t);case"authorizationCode":d.push("response_type=code")}"string"==typeof f&&d.push("client_id="+encodeURIComponent(f));var m=i.oauth2RedirectUrl;if(void 0===m)return void r.newAuthErr({authId:p,source:"validation",level:"error",message:"oauth2RedirectUrl configuration is not passed. Oauth2 authorization cannot be performed."});if(d.push("redirect_uri="+encodeURIComponent(m)),Array.isArray(c)&&0<c.length){var v=u.scopeSeparator||" ";d.push("scope="+encodeURIComponent(c.join(v)))}var g=(0,a.btoa)(new Date);d.push("state="+encodeURIComponent(g)),void 0!==u.realm&&d.push("realm="+encodeURIComponent(u.realm));var y=u.additionalQueryStringParams;for(var _ in y)void 0!==y[_]&&d.push([_,y[_]].map(encodeURIComponent).join("="));var b=l.get("authorizationUrl"),x=[b,d.join("&")].join(-1===b.indexOf("?")?"?":"&"),w=void 0;w="implicit"===h?n.preAuthorizeImplicit:u.useBasicAuthenticationWithAccessCodeGrant?n.authorizeAccessCodeWithBasicAuthentication:n.authorizeAccessCodeWithFormParams,o.default.swaggerUIRedirectOauth2={auth:t,state:g,redirectUrl:m,callback:w,errCb:r.newAuthErr},o.default.open(x)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(46),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(9)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(){return[a.default,u.default]}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(561),a=r(o),s=n(307),u=r(s)},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}function i(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){var e={components:{App:F.default,authorizationPopup:B.default,authorizeBtn:q.default,authorizeOperationBtn:U.default,auths:V.default,AuthItem:G.default,authError:K.default,oauth2:ee.default,apiKeyAuth:Y.default,basicAuth:Z.default,clear:ne.default,liveResponse:ie.default,info:qe.default,onlineValidatorBadge:ae.default,operations:ue.default,operation:ce.default,highlightCode:ve.default,responses:ye.default,response:be.default,responseBody:we.default,parameters:Ee.default,parameterRow:De.default,execute:Me.default,headers:Pe.default,errors:Re.default,contentType:Fe.default,overview:Be.default,footer:Ue.default,ParamBody:Ve.default,curl:Ge.default,schemes:Ke.default,modelExample:Ze.default,ModelWrapper:et.default,ModelCollapse:Ye.default,Model:nt.default,Models:it.default,EnumModel:at.default,ObjectModel:ut.default,ArrayModel:ct.default,PrimitiveModel:ft.default,Property:dt.default,TryItOutButton:vt.default,Markdown:wt.default,BaseLayout:Et.default,VersionStamp:yt.default,OperationExt:fe.default,OperationExtRow:de.default,ParameterExt:Ce.default,OperationContainer:R.default,DeepLink:bt.default}},t={components:Ct},n={components:Dt};return[M.default,E.default,v.default,f.default,c.default,a.default,u.default,d.default,e,t,b.default,n,w.default,y.default,C.default,D.default,P.default]};var o=n(291),a=i(o),s=n(294),u=i(s),l=n(320),c=i(l),p=n(328),f=i(p),h=n(319),d=i(h),m=n(297),v=i(m),g=n(273),y=i(g),_=n(326),b=i(_),x=n(275),w=i(x),k=n(327),E=i(k),S=n(325),C=i(S),A=n(286),D=i(A),O=n(279),M=i(O),T=n(283),P=i(T),I=n(556),R=i(I),j=n(509),F=i(j),N=n(513),B=i(N),L=n(514),q=i(L),z=n(515),U=i(z),W=n(516),V=i(W),H=n(512),G=i(H),J=n(518),K=i(J),X=n(511),Y=i(X),$=n(517),Z=i($),Q=n(519),ee=i(Q),te=n(520),ne=i(te),re=n(532),ie=i(re),oe=n(538),ae=i(oe),se=n(542),ue=i(se),le=n(541),ce=i(le),pe=n(540),fe=i(pe),he=n(539),de=i(he),me=n(529),ve=i(me),ge=n(552),ye=i(ge),_e=n(551),be=i(_e),xe=n(550),we=i(xe),ke=n(547),Ee=i(ke),Se=n(545),Ce=i(Se),Ae=n(546),De=i(Ae),Oe=n(526),Me=i(Oe),Te=n(528),Pe=i(Te),Ie=n(525),Re=i(Ie),je=n(521),Fe=i(je),Ne=n(543),Be=i(Ne),Le=n(530),qe=i(Le),ze=n(527),Ue=i(ze),We=n(544),Ve=i(We),He=n(522),Ge=i(He),Je=n(553),Ke=i(Je),Xe=n(533),Ye=i(Xe),$e=n(534),Ze=i($e),Qe=n(535),et=i(Qe),tt=n(269),nt=i(tt),rt=n(536),it=i(rt),ot=n(524),at=i(ot),st=n(537),ut=i(st),lt=n(510),ct=i(lt),pt=n(548),ft=i(pt),ht=n(549),dt=i(ht),mt=n(554),vt=i(mt),gt=n(555),yt=i(gt),_t=n(523),bt=i(_t),xt=n(270),wt=i(xt),kt=n(531),Et=i(kt),St=n(268),Ct=r(St),At=n(558),Dt=r(At)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t,n){var r=[(0,F.systemThunkMiddleware)(n)],i=j.default.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__||S.compose;return(0,S.createStore)(e,t,i(S.applyMiddleware.apply(void 0,r)))}function o(e,t){return(0,F.isObject)(e)&&!(0,F.isArray)(e)?e:(0,F.isFunc)(e)?o(e(t),t):(0,F.isArray)(e)?e.map(function(e){return o(e,t)}).reduce(s,{}):{}}function a(e,t){var n=this,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},i=r.hasLoaded,o=i;return(0,F.isObject)(e)&&!(0,F.isArray)(e)&&"function"==typeof e.afterLoad&&(o=!0,p(e.afterLoad).call(this,t)),(0,F.isFunc)(e)?a.call(this,e(t),t,{hasLoaded:o}):(0,F.isArray)(e)?e.map(function(e){return a.call(n,e,t,{hasLoaded:o})}):o}function s(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(!(0,F.isObject)(e))return{};if(!(0,F.isObject)(t))return e;t.wrapComponents&&((0,F.objMap)(t.wrapComponents,function(n,r){var i=e.components&&e.components[r];i&&Array.isArray(i)?(e.components[r]=i.concat([n]),delete t.wrapComponents[r]):i&&(e.components[r]=[i,n],delete t.wrapComponents[r])}),(0,d.default)(t.wrapComponents).length||delete t.wrapComponents);var n=e.statePlugins;if((0,F.isObject)(n))for(var r in n){var i=n[r];if((0,F.isObject)(i)&&(0,F.isObject)(i.wrapActions)){var o=i.wrapActions;for(var a in o){var s=o[a];Array.isArray(s)||(s=[s],o[a]=s),t&&t.statePlugins&&t.statePlugins[r]&&t.statePlugins[r].wrapActions&&t.statePlugins[r].wrapActions[a]&&(t.statePlugins[r].wrapActions[a]=o[a].concat(t.statePlugins[r].wrapActions[a]))}}}return(0,O.default)(e,t)}function u(e){return l((0,F.objMap)(e,function(e){return e.reducers}))}function l(e){var t=(0,d.default)(e).reduce(function(t,n){return t[n]=c(e[n]),t},{});return(0,d.default)(t).length?(0,M.combineReducers)(t):N}function c(e){return function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:new C.Map,n=arguments[1];if(!e)return t;var r=e[n.type];if(r){var i=p(r)(t,n);return null===i?t:i}return t}}function p(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.logErrors,r=void 0===n||n;return"function"!=typeof e?e:function(){try{for(var t=arguments.length,n=Array(t),i=0;i<t;i++)n[i]=arguments[i];return e.call.apply(e,[this].concat(n))}catch(e){return r&&console.error(e),null}}}function f(e,t,n){return i(e,t,n)}Object.defineProperty(t,"__esModule",{value:!0});var h=n(47),d=r(h),m=n(36),v=r(m),g=n(30),y=r(g),_=n(2),b=r(_),x=n(3),w=r(x),k=n(0),E=r(k),S=n(486),C=n(7),A=r(C),D=n(203),O=r(D),M=n(1117),T=n(264),P=r(T),I=n(128),R=n(46),j=r(R),F=n(9),N=function(e){return e},B=function(){function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};(0,b.default)(this,e),(0,O.default)(this,{state:{},plugins:[],system:{configs:{},fn:{},components:{},rootInjects:{},statePlugins:{}},boundSystem:{},toolbox:{}},t),this.getSystem=this._getSystem.bind(this),this.store=f(N,(0,C.fromJS)(this.state),this.getSystem),this.buildSystem(!1),this.register(this.plugins)}return(0,w.default)(e,[{key:"getStore",value:function(){return this.store}},{key:"register",value:function(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],n=o(e,this.getSystem());s(this.system,n),t&&this.buildSystem(),a.call(this.system,e,this.getSystem())&&this.buildSystem()}},{key:"buildSystem",value:function(){var e=!(arguments.length>0&&void 0!==arguments[0])||arguments[0],t=this.getStore().dispatch,n=this.getStore().getState;this.boundSystem=(0,y.default)({},this.getRootInjects(),this.getWrappedAndBoundActions(t),this.getWrappedAndBoundSelectors(n,this.getSystem),this.getStateThunks(n),this.getFn(),this.getConfigs()),e&&this.rebuildReducer()}},{key:"_getSystem",value:function(){return this.boundSystem}},{key:"getRootInjects",value:function(){return(0,y.default)({getSystem:this.getSystem,getStore:this.getStore.bind(this),getComponents:this.getComponents.bind(this),getState:this.getStore().getState,getConfigs:this._getConfigs.bind(this),Im:A.default,React:E.default},this.system.rootInjects||{})}},{key:"_getConfigs",value:function(){return this.system.configs}},{key:"getConfigs",value:function(){return{configs:this.system.configs}}},{key:"setConfigs",value:function(e){this.system.configs=e}},{key:"rebuildReducer",value:function(){this.store.replaceReducer(u(this.system.statePlugins))}},{key:"getType",value:function(e){var t=e[0].toUpperCase()+e.slice(1);return(0,F.objReduce)(this.system.statePlugins,function(n,r){var i=n[e];if(i)return(0,v.default)({},r+t,i)})}},{key:"getSelectors",value:function(){return this.getType("selectors")}},{key:"getActions",value:function(){var e=this.getType("actions");return(0,F.objMap)(e,function(e){return(0,F.objReduce)(e,function(e,t){if((0,F.isFn)(e))return(0,v.default)({},t,e)})})}},{key:"getWrappedAndBoundActions",value:function(e){var t=this,n=this.getBoundActions(e);return(0,F.objMap)(n,function(e,n){var r=t.system.statePlugins[n.slice(0,-7)].wrapActions;return r?(0,F.objMap)(e,function(e,n){var i=r[n];return i?(Array.isArray(i)||(i=[i]),i.reduce(function(e,n){var r=function(){return n(e,t.getSystem()).apply(void 0,arguments)};if(!(0,F.isFn)(r))throw new TypeError("wrapActions needs to return a function that returns a new function (ie the wrapped action)");return p(r)},e||Function.prototype)):e}):e})}},{key:"getWrappedAndBoundSelectors",value:function(e,t){var n=this,r=this.getBoundSelectors(e,t);return(0,F.objMap)(r,function(t,r){var i=[r.slice(0,-9)],o=n.system.statePlugins[i].wrapSelectors;return o?(0,F.objMap)(t,function(t,r){var a=o[r];return a?(Array.isArray(a)||(a=[a]),a.reduce(function(t,r){var o=function(){for(var o=arguments.length,a=Array(o),s=0;s<o;s++)a[s]=arguments[s];return r(t,n.getSystem()).apply(void 0,[e().getIn(i)].concat(a))};if(!(0,F.isFn)(o))throw new TypeError("wrapSelector needs to return a function that returns a new function (ie the wrapped action)");return o},t||Function.prototype)):t}):t})}},{key:"getStates",value:function(e){return(0,d.default)(this.system.statePlugins).reduce(function(t,n){return t[n]=e.get(n),t},{})}},{key:"getStateThunks",value:function(e){return(0,d.default)(this.system.statePlugins).reduce(function(t,n){return t[n]=function(){return e().get(n)},t},{})}},{key:"getFn",value:function(){return{fn:this.system.fn}}},{key:"getComponents",value:function(e){var t=this,n=this.system.components[e];return Array.isArray(n)?n.reduce(function(e,n){return n(e,t.getSystem())}):void 0!==e?this.system.components[e]:this.system.components}},{key:"getBoundSelectors",value:function(e,t){return(0,F.objMap)(this.getSelectors(),function(n,r){var i=[r.slice(0,-9)],o=function(){return e().getIn(i)};return(0,F.objMap)(n,function(e){return function(){for(var n=arguments.length,r=Array(n),i=0;i<n;i++)r[i]=arguments[i];var a=p(e).apply(null,[o()].concat(r));return"function"==typeof a&&(a=p(a)(t())),a}})})}},{key:"getBoundActions",value:function(e){e=e||this.getStore().dispatch;var t=this.getActions(),n=function e(t){return"function"!=typeof t?(0,F.objMap)(t,function(t){return e(t)}):function(){var e=null;try{e=t.apply(void 0,arguments)}catch(t){e={type:I.NEW_THROWN_ERR,error:!0,payload:(0,P.default)(t)}}finally{return e}}};return(0,F.objMap)(t,function(t){return(0,S.bindActionCreators)(n(t),e)})}},{key:"getMapStateToProps",value:function(){var e=this;return function(){return(0,y.default)({},e.getSystem())}}},{key:"getMapDispatchToProps",value:function(e){var t=this;return function(n){return(0,O.default)({},t.getWrappedAndBoundActions(n),t.getFn(),e)}}}]),e}();t.default=B},function(e,t,n){e.exports={default:n(585),__esModule:!0}},function(e,t,n){e.exports={default:n(587),__esModule:!0}},function(e,t,n){e.exports={default:n(594),__esModule:!0}},function(e,t,n){e.exports={default:n(596),__esModule:!0}},function(e,t,n){e.exports={default:n(597),__esModule:!0}},function(e,t,n){e.exports={default:n(598),__esModule:!0}},function(e,t,n){e.exports=n(1124)},function(e,t,n){"use strict";function r(e){var t=e.length;if(t%4>0)throw new Error("Invalid string. Length must be a multiple of 4");return"="===e[t-2]?2:"="===e[t-1]?1:0}function i(e){return 3*e.length/4-r(e)}function o(e){var t,n,i,o,a,s=e.length;o=r(e),a=new p(3*s/4-o),n=o>0?s-4:s;var u=0;for(t=0;t<n;t+=4)i=c[e.charCodeAt(t)]<<18|c[e.charCodeAt(t+1)]<<12|c[e.charCodeAt(t+2)]<<6|c[e.charCodeAt(t+3)],a[u++]=i>>16&255,a[u++]=i>>8&255,a[u++]=255&i;return 2===o?(i=c[e.charCodeAt(t)]<<2|c[e.charCodeAt(t+1)]>>4,a[u++]=255&i):1===o&&(i=c[e.charCodeAt(t)]<<10|c[e.charCodeAt(t+1)]<<4|c[e.charCodeAt(t+2)]>>2,a[u++]=i>>8&255,a[u++]=255&i),a}function a(e){return l[e>>18&63]+l[e>>12&63]+l[e>>6&63]+l[63&e]}function s(e,t,n){for(var r,i=[],o=t;o<n;o+=3)r=(e[o]<<16)+(e[o+1]<<8)+e[o+2],i.push(a(r));return i.join("")}function u(e){for(var t,n=e.length,r=n%3,i="",o=[],a=0,u=n-r;a<u;a+=16383)o.push(s(e,a,a+16383>u?u:a+16383));return 1===r?(t=e[n-1],i+=l[t>>2],i+=l[t<<4&63],i+="=="):2===r&&(t=(e[n-2]<<8)+e[n-1],i+=l[t>>10],i+=l[t>>4&63],i+=l[t<<2&63],i+="="),o.push(i),o.join("")}t.byteLength=i,t.toByteArray=o,t.fromByteArray=u;for(var l=[],c=[],p="undefined"!=typeof Uint8Array?Uint8Array:Array,f="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",h=0,d=f.length;h<d;++h)l[h]=f[h],c[f.charCodeAt(h)]=h;c["-".charCodeAt(0)]=62,c["_".charCodeAt(0)]=63},function(e,t,n){/*!
-- * Bowser - a browser detector
-- * https://github.com/ded/bowser
-- * MIT License | (c) Dustin Diaz 2015
-- */
--!function(t,r,i){void 0!==e&&e.exports?e.exports=i():n(1195)("bowser",i)}(0,0,function(){function e(e){function t(t){var n=e.match(t);return n&&n.length>1&&n[1]||""}function n(t){var n=e.match(t);return n&&n.length>1&&n[2]||""}var r,i=t(/(ipod|iphone|ipad)/i).toLowerCase(),o=/like android/i.test(e),s=!o&&/android/i.test(e),u=/nexus\s*[0-6]\s*/i.test(e),l=!u&&/nexus\s*[0-9]+/i.test(e),c=/CrOS/.test(e),p=/silk/i.test(e),f=/sailfish/i.test(e),h=/tizen/i.test(e),d=/(web|hpw)os/i.test(e),m=/windows phone/i.test(e),v=(/SamsungBrowser/i.test(e),!m&&/windows/i.test(e)),g=!i&&!p&&/macintosh/i.test(e),y=!s&&!f&&!h&&!d&&/linux/i.test(e),_=n(/edg([ea]|ios)\/(\d+(\.\d+)?)/i),b=t(/version\/(\d+(\.\d+)?)/i),x=/tablet/i.test(e)&&!/tablet pc/i.test(e),w=!x&&/[^-]mobi/i.test(e),k=/xbox/i.test(e);/opera/i.test(e)?r={name:"Opera",opera:a,version:b||t(/(?:opera|opr|opios)[\s\/](\d+(\.\d+)?)/i)}:/opr\/|opios/i.test(e)?r={name:"Opera",opera:a,version:t(/(?:opr|opios)[\s\/](\d+(\.\d+)?)/i)||b}:/SamsungBrowser/i.test(e)?r={name:"Samsung Internet for Android",samsungBrowser:a,version:b||t(/(?:SamsungBrowser)[\s\/](\d+(\.\d+)?)/i)}:/coast/i.test(e)?r={name:"Opera Coast",coast:a,version:b||t(/(?:coast)[\s\/](\d+(\.\d+)?)/i)}:/yabrowser/i.test(e)?r={name:"Yandex Browser",yandexbrowser:a,version:b||t(/(?:yabrowser)[\s\/](\d+(\.\d+)?)/i)}:/ucbrowser/i.test(e)?r={name:"UC Browser",ucbrowser:a,version:t(/(?:ucbrowser)[\s\/](\d+(?:\.\d+)+)/i)}:/mxios/i.test(e)?r={name:"Maxthon",maxthon:a,version:t(/(?:mxios)[\s\/](\d+(?:\.\d+)+)/i)}:/epiphany/i.test(e)?r={name:"Epiphany",epiphany:a,version:t(/(?:epiphany)[\s\/](\d+(?:\.\d+)+)/i)}:/puffin/i.test(e)?r={name:"Puffin",puffin:a,version:t(/(?:puffin)[\s\/](\d+(?:\.\d+)?)/i)}:/sleipnir/i.test(e)?r={name:"Sleipnir",sleipnir:a,version:t(/(?:sleipnir)[\s\/](\d+(?:\.\d+)+)/i)}:/k-meleon/i.test(e)?r={name:"K-Meleon",kMeleon:a,version:t(/(?:k-meleon)[\s\/](\d+(?:\.\d+)+)/i)}:m?(r={name:"Windows Phone",osname:"Windows Phone",windowsphone:a},_?(r.msedge=a,r.version=_):(r.msie=a,r.version=t(/iemobile\/(\d+(\.\d+)?)/i))):/msie|trident/i.test(e)?r={name:"Internet Explorer",msie:a,version:t(/(?:msie |rv:)(\d+(\.\d+)?)/i)}:c?r={name:"Chrome",osname:"Chrome OS",chromeos:a,chromeBook:a,chrome:a,version:t(/(?:chrome|crios|crmo)\/(\d+(\.\d+)?)/i)}:/edg([ea]|ios)/i.test(e)?r={name:"Microsoft Edge",msedge:a,version:_}:/vivaldi/i.test(e)?r={name:"Vivaldi",vivaldi:a,version:t(/vivaldi\/(\d+(\.\d+)?)/i)||b}:f?r={name:"Sailfish",osname:"Sailfish OS",sailfish:a,version:t(/sailfish\s?browser\/(\d+(\.\d+)?)/i)}:/seamonkey\//i.test(e)?r={name:"SeaMonkey",seamonkey:a,version:t(/seamonkey\/(\d+(\.\d+)?)/i)}:/firefox|iceweasel|fxios/i.test(e)?(r={name:"Firefox",firefox:a,version:t(/(?:firefox|iceweasel|fxios)[ \/](\d+(\.\d+)?)/i)},/\((mobile|tablet);[^\)]*rv:[\d\.]+\)/i.test(e)&&(r.firefoxos=a,r.osname="Firefox OS")):p?r={name:"Amazon Silk",silk:a,version:t(/silk\/(\d+(\.\d+)?)/i)}:/phantom/i.test(e)?r={name:"PhantomJS",phantom:a,version:t(/phantomjs\/(\d+(\.\d+)?)/i)}:/slimerjs/i.test(e)?r={name:"SlimerJS",slimer:a,version:t(/slimerjs\/(\d+(\.\d+)?)/i)}:/blackberry|\bbb\d+/i.test(e)||/rim\stablet/i.test(e)?r={name:"BlackBerry",osname:"BlackBerry OS",blackberry:a,version:b||t(/blackberry[\d]+\/(\d+(\.\d+)?)/i)}:d?(r={name:"WebOS",osname:"WebOS",webos:a,version:b||t(/w(?:eb)?osbrowser\/(\d+(\.\d+)?)/i)},/touchpad\//i.test(e)&&(r.touchpad=a)):/bada/i.test(e)?r={name:"Bada",osname:"Bada",bada:a,version:t(/dolfin\/(\d+(\.\d+)?)/i)}:h?r={name:"Tizen",osname:"Tizen",tizen:a,version:t(/(?:tizen\s?)?browser\/(\d+(\.\d+)?)/i)||b}:/qupzilla/i.test(e)?r={name:"QupZilla",qupzilla:a,version:t(/(?:qupzilla)[\s\/](\d+(?:\.\d+)+)/i)||b}:/chromium/i.test(e)?r={name:"Chromium",chromium:a,version:t(/(?:chromium)[\s\/](\d+(?:\.\d+)?)/i)||b}:/chrome|crios|crmo/i.test(e)?r={name:"Chrome",chrome:a,version:t(/(?:chrome|crios|crmo)\/(\d+(\.\d+)?)/i)}:s?r={name:"Android",version:b}:/safari|applewebkit/i.test(e)?(r={name:"Safari",safari:a},b&&(r.version=b)):i?(r={name:"iphone"==i?"iPhone":"ipad"==i?"iPad":"iPod"},b&&(r.version=b)):r=/googlebot/i.test(e)?{name:"Googlebot",googlebot:a,version:t(/googlebot\/(\d+(\.\d+))/i)||b}:{name:t(/^(.*)\/(.*) /),version:n(/^(.*)\/(.*) /)},!r.msedge&&/(apple)?webkit/i.test(e)?(/(apple)?webkit\/537\.36/i.test(e)?(r.name=r.name||"Blink",r.blink=a):(r.name=r.name||"Webkit",r.webkit=a),!r.version&&b&&(r.version=b)):!r.opera&&/gecko\//i.test(e)&&(r.name=r.name||"Gecko",r.gecko=a,r.version=r.version||t(/gecko\/(\d+(\.\d+)?)/i)),r.windowsphone||!s&&!r.silk?!r.windowsphone&&i?(r[i]=a,r.ios=a,r.osname="iOS"):g?(r.mac=a,r.osname="macOS"):k?(r.xbox=a,r.osname="Xbox"):v?(r.windows=a,r.osname="Windows"):y&&(r.linux=a,r.osname="Linux"):(r.android=a,r.osname="Android");var E="";r.windows?E=function(e){switch(e){case"NT":return"NT";case"XP":return"XP";case"NT 5.0":return"2000";case"NT 5.1":return"XP";case"NT 5.2":return"2003";case"NT 6.0":return"Vista";case"NT 6.1":return"7";case"NT 6.2":return"8";case"NT 6.3":return"8.1";case"NT 10.0":return"10";default:return}}(t(/Windows ((NT|XP)( \d\d?.\d)?)/i)):r.windowsphone?E=t(/windows phone (?:os)?\s?(\d+(\.\d+)*)/i):r.mac?(E=t(/Mac OS X (\d+([_\.\s]\d+)*)/i),E=E.replace(/[_\s]/g,".")):i?(E=t(/os (\d+([_\s]\d+)*) like mac os x/i),E=E.replace(/[_\s]/g,".")):s?E=t(/android[ \/-](\d+(\.\d+)*)/i):r.webos?E=t(/(?:web|hpw)os\/(\d+(\.\d+)*)/i):r.blackberry?E=t(/rim\stablet\sos\s(\d+(\.\d+)*)/i):r.bada?E=t(/bada\/(\d+(\.\d+)*)/i):r.tizen&&(E=t(/tizen[\/\s](\d+(\.\d+)*)/i)),E&&(r.osversion=E);var S=!r.windows&&E.split(".")[0];return x||l||"ipad"==i||s&&(3==S||S>=4&&!w)||r.silk?r.tablet=a:(w||"iphone"==i||"ipod"==i||s||u||r.blackberry||r.webos||r.bada)&&(r.mobile=a),r.msedge||r.msie&&r.version>=10||r.yandexbrowser&&r.version>=15||r.vivaldi&&r.version>=1||r.chrome&&r.version>=20||r.samsungBrowser&&r.version>=4||r.firefox&&r.version>=20||r.safari&&r.version>=6||r.opera&&r.version>=10||r.ios&&r.osversion&&r.osversion.split(".")[0]>=6||r.blackberry&&r.version>=10.1||r.chromium&&r.version>=20?r.a=a:r.msie&&r.version<10||r.chrome&&r.version<20||r.firefox&&r.version<20||r.safari&&r.version<6||r.opera&&r.version<10||r.ios&&r.osversion&&r.osversion.split(".")[0]<6||r.chromium&&r.version<20?r.c=a:r.x=a,r}function t(e){return e.split(".").length}function n(e,t){var n,r=[];if(Array.prototype.map)return Array.prototype.map.call(e,t);for(n=0;n<e.length;n++)r.push(t(e[n]));return r}function r(e){for(var r=Math.max(t(e[0]),t(e[1])),i=n(e,function(e){var i=r-t(e);return e+=new Array(i+1).join(".0"),n(e.split("."),function(e){return new Array(20-e.length).join("0")+e}).reverse()});--r>=0;){if(i[0][r]>i[1][r])return 1;if(i[0][r]!==i[1][r])return-1;if(0===r)return 0}}function i(t,n,i){var o=s;"string"==typeof n&&(i=n,n=void 0),void 0===n&&(n=!1),i&&(o=e(i));var a=""+o.version;for(var u in t)if(t.hasOwnProperty(u)&&o[u]){if("string"!=typeof t[u])throw new Error("Browser version in the minVersion map should be a string: "+u+": "+String(t));return r([a,t[u]])<0}return n}function o(e,t,n){return!i(e,t,n)}var a=!0,s=e("undefined"!=typeof navigator?navigator.userAgent||"":"");return s.test=function(e){for(var t=0;t<e.length;++t){var n=e[t];if("string"==typeof n&&n in s)return!0}return!1},s.isUnsupportedBrowser=i,s.compareVersions=r,s.check=o,s._detect=e,s})},function(e,t,n){(function(t){!function(){"use strict";function n(e){var n;return n=e instanceof t?e:new t(e.toString(),"binary"),n.toString("base64")}e.exports=n}()}).call(t,n(40).Buffer)},function(e,t,n){var r,i;/*!
--  Copyright (c) 2016 Jed Watson.
--  Licensed under the MIT License (MIT), see
--  http://jedwatson.github.io/classnames
--*/
--!function(){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var i=typeof r;if("string"===i||"number"===i)e.push(r);else if(Array.isArray(r))e.push(n.apply(null,r));else if("object"===i)for(var a in r)o.call(r,a)&&r[a]&&e.push(a)}}return e.join(" ")}var o={}.hasOwnProperty;void 0!==e&&e.exports?e.exports=n:(r=[],void 0!==(i=function(){return n}.apply(t,r))&&(e.exports=i))}()},function(e,t,n){"use strict";function r(e){return{key:e.nodeKey,className:e.className,"data-sourcepos":e["data-sourcepos"]}}function i(e){var t=e.toLowerCase(),n=w[t]||t;return void 0!==k[n]?n:e}function o(e){return Object.keys(e||{}).reduce(function(t,n){return t[i(n)]=e[n],t},{})}function a(e){var t=r(e),n=e.escapeHtml?{}:{dangerouslySetInnerHTML:{__html:e.literal}},i=e.escapeHtml?[e.literal]:null;if(e.escapeHtml||!e.skipHtml){var o=y(t,n);return l(e.isBlock?"div":"span",o,i)}}function s(e){var t=e.parent.parent;return t&&"list"===t.type.toLowerCase()&&t.listTight}function u(e,t){var n=e;do{n=n.parent}while(!n.react);n.react.children.push(t)}function l(e,t,n){var r=Array.isArray(n)&&n.reduce(c,[]),i=[e,t].concat(r||n);return g.createElement.apply(g,i)}function c(e,t){var n=e.length-1;return"string"==typeof t&&"string"==typeof e[n]?e[n]+=t:e.push(t),e}function p(e){return[e[0][0],":",e[0][1],"-",e[1][0],":",e[1][1]].map(String).join("")}function f(e,t,n,r){var o={key:t};n.sourcePos&&e.sourcepos&&(o["data-sourcepos"]=p(e.sourcepos));var a=i(e.type);switch(a){case"html_inline":case"html_block":o.isBlock="html_block"===a,o.escapeHtml=n.escapeHtml,o.skipHtml=n.skipHtml;break;case"code_block":var s=e.info?e.info.split(/ +/):[];s.length>0&&s[0].length>0&&(o.language=s[0],o.codeinfo=s);break;case"code":o.children=e.literal,o.inline=!0;break;case"heading":o.level=e.level;break;case"softbreak":o.softBreak=n.softBreak;break;case"link":o.href=n.transformLinkUri?n.transformLinkUri(e.destination):e.destination,o.title=e.title||void 0,n.linkTarget&&(o.target=n.linkTarget);break;case"image":o.src=n.transformImageUri?n.transformImageUri(e.destination):e.destination,o.title=e.title||void 0,o.alt=e.react.children.join(""),e.react.children=void 0;break;case"list":o.start=e.listStart,o.type=e.listType,o.tight=e.listTight}"string"!=typeof r&&(o.literal=e.literal);var u=o.children||e.react&&e.react.children;return Array.isArray(u)&&(o.children=u.reduce(c,[])||null),o}function h(e){return e?e.sourcepos?p(e.sourcepos):h(e.parent):null}function d(e){for(var t,n,r,o,a,l,c,p,d,m=e.walker(),v={sourcePos:this.sourcePos,escapeHtml:this.escapeHtml,skipHtml:this.skipHtml,transformLinkUri:this.transformLinkUri,transformImageUri:this.transformImageUri,softBreak:this.softBreak,linkTarget:this.linkTarget},_=0;t=m.next();){var b=h(t.node.sourcepos?t.node:t.node.parent);if(d===b?(c=b+_,_++):(c=b,_=0),d=b,r=t.entering,o=!r,n=t.node,a=i(n.type),p=null,l){if(n!==l&&!("paragraph"===a&&s(n)||this.skipHtml&&("html_block"===a||"html_inline"===a))){var w=n===l,k=-1===this.allowedTypes.indexOf(a),E=!1,S=n.isContainer&&o,C=this.renderers[a];if(this.allowNode&&(S||!n.isContainer)){var A=S?n.react.children:[];p=f(n,c,v,C),E=!this.allowNode({type:x(a),renderer:this.renderers[a],props:p,children:A})}if(w||!E&&!k){var D="text"===a||"softbreak"===a;if("function"!=typeof C&&!D&&"string"!=typeof C)throw new Error("Renderer for type `"+x(n.type)+"` not defined or is not renderable");if(n.isContainer&&r)n.react={component:C,props:{},children:[]};else{var O=p||f(n,c,v,C);if(C)O="string"==typeof C?O:y(O,{nodeKey:O.key}),u(n,g.createElement(C,O));else if("text"===a)u(n,n.literal);else if("softbreak"===a){var M="br"===this.softBreak?g.createElement("br",{key:c}):this.softBreak;u(n,M)}}}else!this.unwrapDisallowed&&r&&n.isContainer&&m.resumeAt(n,!1)}}else l=n,n.react={children:[]}}return l.react.children}function m(e){var t=e.replace(/file:\/\//g,"x-file://");return decodeURI(b.uriInDoubleQuotedAttr(t))}function v(e){var t=e||{};if(t.allowedTypes&&t.disallowedTypes)throw new Error("Only one of `allowedTypes` and `disallowedTypes` should be defined");if(t.allowedTypes&&!Array.isArray(t.allowedTypes))throw new Error("`allowedTypes` must be an array");if(t.disallowedTypes&&!Array.isArray(t.disallowedTypes))throw new Error("`disallowedTypes` must be an array");if(t.allowNode&&"function"!=typeof t.allowNode)throw new Error("`allowNode` must be a function");var n=t.transformLinkUri;if(void 0===n)n=m;else if(n&&"function"!=typeof n)throw new Error("`transformLinkUri` must either be a function, or `null` to disable");var r=t.transformImageUri;if(void 0!==r&&"function"!=typeof r)throw new Error("`transformImageUri` must be a function");if(t.renderers&&!_(t.renderers))throw new Error("`renderers` must be a plain object of `Type`: `Renderer` pairs");var a=t.allowedTypes&&t.allowedTypes.map(i)||E;if(t.disallowedTypes){var s=t.disallowedTypes.map(i);a=a.filter(function(e){return-1===s.indexOf(e)})}return{sourcePos:Boolean(t.sourcePos),softBreak:t.softBreak||"\n",renderers:y({},k,o(t.renderers)),escapeHtml:Boolean(t.escapeHtml),skipHtml:Boolean(t.skipHtml),transformLinkUri:n,transformImageUri:r,allowNode:t.allowNode,allowedTypes:a,unwrapDisallowed:Boolean(t.unwrapDisallowed),render:d,linkTarget:t.linkTarget||!1}}var g=n(0),y=n(823),_=n(826),b=n(1199),x=n(979),w={blockquote:"block_quote",thematicbreak:"thematic_break",htmlblock:"html_block",htmlinline:"html_inline",codeblock:"code_block",hardbreak:"linebreak"},k={block_quote:"blockquote",emph:"em",linebreak:"br",image:"img",item:"li",link:"a",paragraph:"p",strong:"strong",thematic_break:"hr",html_block:a,html_inline:a,list:function(e){var t="bullet"===e.type.toLowerCase()?"ul":"ol",n=r(e);return null!==e.start&&1!==e.start&&(n.start=e.start.toString()),l(t,n,e.children)},code_block:function(e){var t=e.language&&"language-"+e.language,n=l("code",{className:t},e.literal);return l("pre",r(e),n)},code:function(e){return l("code",r(e),e.children)},heading:function(e){return l("h"+e.level,r(e),e.children)},text:null,softbreak:null},E=Object.keys(k);v.uriTransformer=m,v.types=E.map(x),v.renderers=E.reduce(function(e,t){return e[x(t)]=k[t],e},{}),e.exports=v},function(e,t,n){"use strict";function r(e){return{doc:new B,blocks:M,blockStarts:T,tip:this.doc,oldtip:this.doc,currentLine:"",lineNumber:0,offset:0,column:0,nextNonspace:0,nextNonspaceColumn:0,indent:0,indented:!1,blank:!1,partiallyConsumedTab:!1,allClosed:!0,lastMatchedContainer:this.doc,refmap:{},lastLineLength:0,inlineParser:new u(e),findNextNonspace:R,advanceOffset:P,advanceNextNonspace:I,addLine:S,addChild:C,incorporateLine:j,finalize:F,processInlines:N,closeUnmatchedBlocks:O,parse:L,options:e||{}}}var i=n(174),o=n(73).unescapeString,a=n(73).OPENTAG,s=n(73).CLOSETAG,u=n(578),l=[/./,/^<(?:script|pre|style)(?:\s|>|$)/i,/^<!--/,/^<[?]/,/^<![A-Z]/,/^<!\[CDATA\[/,/^<[\/]?(?:address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[123456]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|title|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(?:\s|[\/]?[>]|$)/i,new RegExp("^(?:"+a+"|"+s+")\\s*$","i")],c=[/./,/<\/(?:script|pre|style)>/i,/-->/,/\?>/,/>/,/\]\]>/],p=/^(?:(?:\*[ \t]*){3,}|(?:_[ \t]*){3,}|(?:-[ \t]*){3,})[ \t]*$/,f=/^[#`~*+_=<>0-9-]/,h=/[^ \t\f\v\r\n]/,d=/^[*+-]/,m=/^(\d{1,9})([.)])/,v=/^#{1,6}(?:[ \t]+|$)/,g=/^`{3,}(?!.*`)|^~{3,}(?!.*~)/,y=/^(?:`{3,}|~{3,})(?= *$)/,_=/^(?:=+|-+)[ \t]*$/,b=/\r\n|\n|\r/,x=function(e){return!h.test(e)},w=function(e){return 32===e||9===e},k=function(e,t){return t<e.length?e.charCodeAt(t):-1},E=function(e){for(;e;){if(e._lastLineBlank)return!0;var t=e.type;if("list"!==t&&"item"!==t)break;e=e._lastChild}return!1},S=function(){if(this.partiallyConsumedTab){this.offset+=1;var e=4-this.column%4;this.tip._string_content+=" ".repeat(e)}this.tip._string_content+=this.currentLine.slice(this.offset)+"\n"},C=function(e,t){for(;!this.blocks[this.tip.type].canContain(e);)this.finalize(this.tip,this.lineNumber-1);var n=t+1,r=new i(e,[[this.lineNumber,n],[0,0]]);return r._string_content="",this.tip.appendChild(r),this.tip=r,r},A=function(e,t){var n,r,i,o,a=e.currentLine.slice(e.nextNonspace),s={type:null,tight:!0,bulletChar:null,start:null,delimiter:null,padding:null,markerOffset:e.indent};if(n=a.match(d))s.type="bullet",s.bulletChar=n[0][0];else{if(!(n=a.match(m))||"paragraph"===t.type&&"1"!==n[1])return null;s.type="ordered",s.start=parseInt(n[1]),s.delimiter=n[2]}if(-1!==(r=k(e.currentLine,e.nextNonspace+n[0].length))&&9!==r&&32!==r)return null;if("paragraph"===t.type&&!e.currentLine.slice(e.nextNonspace+n[0].length).match(h))return null;e.advanceNextNonspace(),e.advanceOffset(n[0].length,!0),i=e.column,o=e.offset;do{e.advanceOffset(1,!0),r=k(e.currentLine,e.offset)}while(e.column-i<5&&w(r));var u=-1===k(e.currentLine,e.offset),l=e.column-i;return l>=5||l<1||u?(s.padding=n[0].length+1,e.column=i,e.offset=o,w(k(e.currentLine,e.offset))&&e.advanceOffset(1,!0)):s.padding=n[0].length+l,s},D=function(e,t){return e.type===t.type&&e.delimiter===t.delimiter&&e.bulletChar===t.bulletChar},O=function(){if(!this.allClosed){for(;this.oldtip!==this.lastMatchedContainer;){var e=this.oldtip._parent;this.finalize(this.oldtip,this.lineNumber-1),this.oldtip=e}this.allClosed=!0}},M={document:{continue:function(){return 0},finalize:function(){},canContain:function(e){return"item"!==e},acceptsLines:!1},list:{continue:function(){return 0},finalize:function(e,t){for(var n=t._firstChild;n;){if(E(n)&&n._next){t._listData.tight=!1;break}for(var r=n._firstChild;r;){if(E(r)&&(n._next||r._next)){t._listData.tight=!1;break}r=r._next}n=n._next}},canContain:function(e){return"item"===e},acceptsLines:!1},block_quote:{continue:function(e){var t=e.currentLine;return e.indented||62!==k(t,e.nextNonspace)?1:(e.advanceNextNonspace(),e.advanceOffset(1,!1),w(k(t,e.offset))&&e.advanceOffset(1,!0),0)},finalize:function(){},canContain:function(e){return"item"!==e},acceptsLines:!1},item:{continue:function(e,t){if(e.blank){if(null==t._firstChild)return 1;e.advanceNextNonspace()}else{if(!(e.indent>=t._listData.markerOffset+t._listData.padding))return 1;e.advanceOffset(t._listData.markerOffset+t._listData.padding,!0)}return 0},finalize:function(){},canContain:function(e){return"item"!==e},acceptsLines:!1},heading:{continue:function(){return 1},finalize:function(){},canContain:function(){return!1},acceptsLines:!1},thematic_break:{continue:function(){return 1},finalize:function(){},canContain:function(){return!1},acceptsLines:!1},code_block:{continue:function(e,t){var n=e.currentLine,r=e.indent;if(t._isFenced){var i=r<=3&&n.charAt(e.nextNonspace)===t._fenceChar&&n.slice(e.nextNonspace).match(y);if(i&&i[0].length>=t._fenceLength)return e.finalize(t,e.lineNumber),2;for(var o=t._fenceOffset;o>0&&w(k(n,e.offset));)e.advanceOffset(1,!0),o--}else if(r>=4)e.advanceOffset(4,!0);else{if(!e.blank)return 1;e.advanceNextNonspace()}return 0},finalize:function(e,t){if(t._isFenced){var n=t._string_content,r=n.indexOf("\n"),i=n.slice(0,r),a=n.slice(r+1);t.info=o(i.trim()),t._literal=a}else t._literal=t._string_content.replace(/(\n *)+$/,"\n");t._string_content=null},canContain:function(){return!1},acceptsLines:!0},html_block:{continue:function(e,t){return!e.blank||6!==t._htmlBlockType&&7!==t._htmlBlockType?0:1},finalize:function(e,t){t._literal=t._string_content.replace(/(\n *)+$/,""),t._string_content=null},canContain:function(){return!1},acceptsLines:!0},paragraph:{continue:function(e){return e.blank?1:0},finalize:function(e,t){for(var n,r=!1;91===k(t._string_content,0)&&(n=e.inlineParser.parseReference(t._string_content,e.refmap));)t._string_content=t._string_content.slice(n),r=!0;r&&x(t._string_content)&&t.unlink()},canContain:function(){return!1},acceptsLines:!0}},T=[function(e){return e.indented||62!==k(e.currentLine,e.nextNonspace)?0:(e.advanceNextNonspace(),e.advanceOffset(1,!1),w(k(e.currentLine,e.offset))&&e.advanceOffset(1,!0),e.closeUnmatchedBlocks(),e.addChild("block_quote",e.nextNonspace),1)},function(e){var t;if(!e.indented&&(t=e.currentLine.slice(e.nextNonspace).match(v))){e.advanceNextNonspace(),e.advanceOffset(t[0].length,!1),e.closeUnmatchedBlocks();var n=e.addChild("heading",e.nextNonspace);return n.level=t[0].trim().length,n._string_content=e.currentLine.slice(e.offset).replace(/^[ \t]*#+[ \t]*$/,"").replace(/[ \t]+#+[ \t]*$/,""),e.advanceOffset(e.currentLine.length-e.offset),2}return 0},function(e){var t;if(!e.indented&&(t=e.currentLine.slice(e.nextNonspace).match(g))){var n=t[0].length;e.closeUnmatchedBlocks();var r=e.addChild("code_block",e.nextNonspace);return r._isFenced=!0,r._fenceLength=n,r._fenceChar=t[0][0],r._fenceOffset=e.indent,e.advanceNextNonspace(),e.advanceOffset(n,!1),2}return 0},function(e,t){if(!e.indented&&60===k(e.currentLine,e.nextNonspace)){var n,r=e.currentLine.slice(e.nextNonspace);for(n=1;n<=7;n++)if(l[n].test(r)&&(n<7||"paragraph"!==t.type)){e.closeUnmatchedBlocks();var i=e.addChild("html_block",e.offset);return i._htmlBlockType=n,2}}return 0},function(e,t){var n;if(!e.indented&&"paragraph"===t.type&&(n=e.currentLine.slice(e.nextNonspace).match(_))){e.closeUnmatchedBlocks();var r=new i("heading",t.sourcepos);return r.level="="===n[0][0]?1:2,r._string_content=t._string_content,t.insertAfter(r),t.unlink(),e.tip=r,e.advanceOffset(e.currentLine.length-e.offset,!1),2}return 0},function(e){return!e.indented&&p.test(e.currentLine.slice(e.nextNonspace))?(e.closeUnmatchedBlocks(),e.addChild("thematic_break",e.nextNonspace),e.advanceOffset(e.currentLine.length-e.offset,!1),2):0},function(e,t){var n;return e.indented&&"list"!==t.type||!(n=A(e,t))?0:(e.closeUnmatchedBlocks(),"list"===e.tip.type&&D(t._listData,n)||(t=e.addChild("list",e.nextNonspace),t._listData=n),t=e.addChild("item",e.nextNonspace),t._listData=n,1)},function(e){return e.indented&&"paragraph"!==e.tip.type&&!e.blank?(e.advanceOffset(4,!0),e.closeUnmatchedBlocks(),e.addChild("code_block",e.offset),2):0}],P=function(e,t){for(var n,r,i,o=this.currentLine;e>0&&(i=o[this.offset]);)"\t"===i?(n=4-this.column%4,t?(this.partiallyConsumedTab=n>e,r=n>e?e:n,this.column+=r,this.offset+=this.partiallyConsumedTab?0:1,e-=r):(this.partiallyConsumedTab=!1,this.column+=n,this.offset+=1,e-=1)):(this.partiallyConsumedTab=!1,this.offset+=1,this.column+=1,e-=1)},I=function(){this.offset=this.nextNonspace,this.column=this.nextNonspaceColumn,this.partiallyConsumedTab=!1},R=function(){for(var e,t=this.currentLine,n=this.offset,r=this.column;""!==(e=t.charAt(n));)if(" "===e)n++,r++;else{if("\t"!==e)break;n++,r+=4-r%4}this.blank="\n"===e||"\r"===e||""===e,this.nextNonspace=n,this.nextNonspaceColumn=r,this.indent=this.nextNonspaceColumn-this.column,this.indented=this.indent>=4},j=function(e){var t,n=!0,r=this.doc;this.oldtip=this.tip,this.offset=0,this.column=0,this.blank=!1,this.partiallyConsumedTab=!1,this.lineNumber+=1,-1!==e.indexOf("\0")&&(e=e.replace(/\0/g,"�")),this.currentLine=e;for(var i;(i=r._lastChild)&&i._open;){switch(r=i,this.findNextNonspace(),this.blocks[r.type].continue(this,r)){case 0:break;case 1:n=!1;break;case 2:return void(this.lastLineLength=e.length);default:throw"continue returned illegal value, must be 0, 1, or 2"}if(!n){r=r._parent;break}}this.allClosed=r===this.oldtip,this.lastMatchedContainer=r;for(var o="paragraph"!==r.type&&M[r.type].acceptsLines,a=this.blockStarts,s=a.length;!o;){if(this.findNextNonspace(),!this.indented&&!f.test(e.slice(this.nextNonspace))){this.advanceNextNonspace();break}for(var u=0;u<s;){var l=a[u](this,r);if(1===l){r=this.tip;break}if(2===l){r=this.tip,o=!0;break}u++}if(u===s){this.advanceNextNonspace();break}}if(this.allClosed||this.blank||"paragraph"!==this.tip.type){this.closeUnmatchedBlocks(),this.blank&&r.lastChild&&(r.lastChild._lastLineBlank=!0),t=r.type;for(var p=this.blank&&!("block_quote"===t||"code_block"===t&&r._isFenced||"item"===t&&!r._firstChild&&r.sourcepos[0][0]===this.lineNumber),h=r;h;)h._lastLineBlank=p,h=h._parent;this.blocks[t].acceptsLines?(this.addLine(),"html_block"===t&&r._htmlBlockType>=1&&r._htmlBlockType<=5&&c[r._htmlBlockType].test(this.currentLine.slice(this.offset))&&this.finalize(r,this.lineNumber)):this.offset<e.length&&!this.blank&&(r=this.addChild("paragraph",this.offset),this.advanceNextNonspace(),this.addLine())}else this.addLine();this.lastLineLength=e.length},F=function(e,t){var n=e._parent;e._open=!1,e.sourcepos[1]=[t,this.lastLineLength],this.blocks[e.type].finalize(this,e),this.tip=n},N=function(e){var t,n,r,i=e.walker();for(this.inlineParser.refmap=this.refmap,this.inlineParser.options=this.options;n=i.next();)t=n.node,r=t.type,n.entering||"paragraph"!==r&&"heading"!==r||this.inlineParser.parse(t)},B=function(){return new i("document",[[1,1],[0,0]])},L=function(e){this.doc=new B,this.tip=this.doc,this.refmap={},this.lineNumber=0,this.lastLineLength=0,this.offset=0,this.column=0,this.lastMatchedContainer=this.doc,this.currentLine="",this.options.time&&console.time("preparing input");var t=e.split(b),n=t.length;10===e.charCodeAt(e.length-1)&&(n-=1),this.options.time&&console.timeEnd("preparing input"),this.options.time&&console.time("block parsing");for(var r=0;r<n;r++)this.incorporateLine(t[r]);for(;this.tip;)this.finalize(this.tip,n);return this.options.time&&console.timeEnd("block parsing"),this.options.time&&console.time("inline parsing"),this.processInlines(this.doc),this.options.time&&console.timeEnd("inline parsing"),this.doc};e.exports=r},function(e,t,n){"use strict";/*! http://mths.be/fromcodepoint v0.2.1 by @mathias */
--if(String.fromCodePoint)e.exports=function(e){try{return String.fromCodePoint(e)}catch(e){if(e instanceof RangeError)return String.fromCharCode(65533);throw e}};else{var r=String.fromCharCode,i=Math.floor,o=function(){var e,t,n=[],o=-1,a=arguments.length;if(!a)return"";for(var s="";++o<a;){var u=Number(arguments[o]);if(!isFinite(u)||u<0||u>1114111||i(u)!==u)return String.fromCharCode(65533);u<=65535?n.push(u):(u-=65536,e=55296+(u>>10),t=u%1024+56320,n.push(e,t)),(o+1===a||n.length>16384)&&(s+=r.apply(null,n),n.length=0)}return s};e.exports=o}},function(e,t,n){"use strict";e.exports.Node=n(174),e.exports.Parser=n(575),e.exports.HtmlRenderer=n(580),e.exports.XmlRenderer=n(581)},function(e,t,n){"use strict";function r(e){return{subject:"",delimiters:null,brackets:null,pos:0,refmap:{},match:F,peek:N,spnl:B,parseBackticks:L,parseBackslash:q,parseAutolink:z,parseHtmlTag:U,scanDelims:W,handleDelim:V,parseLinkTitle:K,parseLinkDestination:X,parseLinkLabel:Y,parseOpenBracket:$,parseBang:Z,parseCloseBracket:Q,addBracket:ee,removeBracket:te,parseEntity:ne,parseString:re,parseNewline:ie,parseReference:oe,parseInline:ae,processEmphasis:J,removeDelimiter:H,options:e||{},parse:se}}var i=n(174),o=n(73),a=n(579),s=o.normalizeURI,u=o.unescapeString,l=n(576),c=n(114).decodeHTML;n(494);var p=o.ESCAPABLE,f="\\\\"+p,h=o.ENTITY,d=o.reHtmlTag,m=new RegExp(/[!"#$%&'()*+,\-.\/:;<=>?@\[\]^_`{|}~\xA1\xA7\xAB\xB6\xB7\xBB\xBF\u037E\u0387\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061E\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u0AF0\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F14\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1360-\u1368\u1400\u166D\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CC0-\u1CC7\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u2308-\u230B\u2329\u232A\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30-\u2E42\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uAAF0\uAAF1\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]|\uD800[\uDD00-\uDD02\uDF9F\uDFD0]|\uD801\uDD6F|\uD802[\uDC57\uDD1F\uDD3F\uDE50-\uDE58\uDE7F\uDEF0-\uDEF6\uDF39-\uDF3F\uDF99-\uDF9C]|\uD804[\uDC47-\uDC4D\uDCBB\uDCBC\uDCBE-\uDCC1\uDD40-\uDD43\uDD74\uDD75\uDDC5-\uDDC9\uDDCD\uDDDB\uDDDD-\uDDDF\uDE38-\uDE3D\uDEA9]|\uD805[\uDCC6\uDDC1-\uDDD7\uDE41-\uDE43\uDF3C-\uDF3E]|\uD809[\uDC70-\uDC74]|\uD81A[\uDE6E\uDE6F\uDEF5\uDF37-\uDF3B\uDF44]|\uD82F\uDC9F|\uD836[\uDE87-\uDE8B]/),v=new RegExp('^(?:"('+f+'|[^"\\x00])*"|\'('+f+"|[^'\\x00])*'|\\(("+f+"|[^)\\x00])*\\))"),g=new RegExp("^(?:[<](?:[^ <>\\t\\n\\\\\\x00]|"+f+"|\\\\)*[>])"),y=new RegExp("^"+p),_=new RegExp("^"+h,"i"),b=/`+/,x=/^`+/,w=/\.\.\./g,k=/--+/g,E=/^<([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/,S=/^<[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*>/i,C=/^ *(?:\n *)?/,A=/^[ \t\n\x0b\x0c\x0d]/,D=/[ \t\n\x0b\x0c\x0d]+/g,O=/^\s/,M=/ *$/,T=/^ */,P=/^ *(?:\n|$)/,I=new RegExp("^\\[(?:[^\\\\\\[\\]]|"+f+"|\\\\){0,1000}\\]"),R=/^[^\n`\[\]\\!<&*_'"]+/m,j=function(e){var t=new i("text");return t._literal=e,t},F=function(e){var t=e.exec(this.subject.slice(this.pos));return null===t?null:(this.pos+=t.index+t[0].length,t[0])},N=function(){return this.pos<this.subject.length?this.subject.charCodeAt(this.pos):-1},B=function(){return this.match(C),!0},L=function(e){var t=this.match(x);if(null===t)return!1;for(var n,r,o=this.pos;null!==(n=this.match(b));)if(n===t)return r=new i("code"),r._literal=this.subject.slice(o,this.pos-t.length).trim().replace(D," "),e.appendChild(r),!0;return this.pos=o,e.appendChild(j(t)),!0},q=function(e){var t,n=this.subject;return this.pos+=1,10===this.peek()?(this.pos+=1,t=new i("linebreak"),e.appendChild(t)):y.test(n.charAt(this.pos))?(e.appendChild(j(n.charAt(this.pos))),this.pos+=1):e.appendChild(j("\\")),!0},z=function(e){var t,n,r;return(t=this.match(E))?(n=t.slice(1,t.length-1),r=new i("link"),r._destination=s("mailto:"+n),r._title="",r.appendChild(j(n)),e.appendChild(r),!0):!!(t=this.match(S))&&(n=t.slice(1,t.length-1),r=new i("link"),r._destination=s(n),r._title="",r.appendChild(j(n)),e.appendChild(r),!0)},U=function(e){var t=this.match(d);if(null===t)return!1;var n=new i("html_inline");return n._literal=t,e.appendChild(n),!0},W=function(e){var t,n,r,i,o,a,s,u,c,p,f,h=0,d=this.pos;if(39===e||34===e)h++,this.pos++;else for(;this.peek()===e;)h++,this.pos++;return 0===h?null:(t=0===d?"\n":this.subject.charAt(d-1),r=this.peek(),n=-1===r?"\n":l(r),u=O.test(n),c=m.test(n),p=O.test(t),f=m.test(t),i=!u&&(!c||p||f),o=!p&&(!f||u||c),95===e?(a=i&&(!o||f),s=o&&(!i||c)):39===e||34===e?(a=i&&!o,s=o):(a=i,s=o),this.pos=d,{numdelims:h,can_open:a,can_close:s})},V=function(e,t){var n=this.scanDelims(e);if(!n)return!1;var r,i=n.numdelims,o=this.pos;this.pos+=i,r=39===e?"’":34===e?"“":this.subject.slice(o,this.pos);var a=j(r);return t.appendChild(a),this.delimiters={cc:e,numdelims:i,origdelims:i,node:a,previous:this.delimiters,next:null,can_open:n.can_open,can_close:n.can_close},null!==this.delimiters.previous&&(this.delimiters.previous.next=this.delimiters),!0},H=function(e){null!==e.previous&&(e.previous.next=e.next),null===e.next?this.delimiters=e.previous:e.next.previous=e.previous},G=function(e,t){e.next!==t&&(e.next=t,t.previous=e)},J=function(e){var t,n,r,o,a,s,u,l,c,p,f=[],h=!1;for(f[95]=e,f[42]=e,f[39]=e,f[34]=e,n=this.delimiters;null!==n&&n.previous!==e;)n=n.previous;for(;null!==n;){var d=n.cc;if(n.can_close){for(t=n.previous,p=!1;null!==t&&t!==e&&t!==f[d];){if(h=(n.can_open||t.can_close)&&(t.origdelims+n.origdelims)%3==0,t.cc===n.cc&&t.can_open&&!h){p=!0;break}t=t.previous}if(r=n,42===d||95===d)if(p){u=n.numdelims>=2&&t.numdelims>=2?2:1,o=t.node,a=n.node,t.numdelims-=u,n.numdelims-=u,o._literal=o._literal.slice(0,o._literal.length-u),a._literal=a._literal.slice(0,a._literal.length-u);var m=new i(1===u?"emph":"strong");for(l=o._next;l&&l!==a;)c=l._next,l.unlink(),m.appendChild(l),l=c;o.insertAfter(m),G(t,n),0===t.numdelims&&(o.unlink(),this.removeDelimiter(t)),0===n.numdelims&&(a.unlink(),s=n.next,this.removeDelimiter(n),n=s)}else n=n.next;else 39===d?(n.node._literal="’",p&&(t.node._literal="‘"),n=n.next):34===d&&(n.node._literal="”",p&&(t.node.literal="“"),n=n.next);p||h||(f[d]=r.previous,r.can_open||this.removeDelimiter(r))}else n=n.next}for(;null!==this.delimiters&&this.delimiters!==e;)this.removeDelimiter(this.delimiters)},K=function(){var e=this.match(v);return null===e?null:u(e.substr(1,e.length-2))},X=function(){var e=this.match(g);if(null===e){for(var t,n=this.pos,r=0;-1!==(t=this.peek());)if(92===t)this.pos+=1,-1!==this.peek()&&(this.pos+=1);else if(40===t)this.pos+=1,r+=1;else if(41===t){if(r<1)break;this.pos+=1,r-=1}else{if(null!==A.exec(l(t)))break;this.pos+=1}return e=this.subject.substr(n,this.pos-n),s(u(e))}return s(u(e.substr(1,e.length-2)))},Y=function(){var e=this.match(I);return null===e||e.length>1001||/[^\\]\\\]$/.exec(e)?0:e.length},$=function(e){var t=this.pos;this.pos+=1;var n=j("[");return e.appendChild(n),this.addBracket(n,t,!1),!0},Z=function(e){var t=this.pos;if(this.pos+=1,91===this.peek()){this.pos+=1;var n=j("![");e.appendChild(n),this.addBracket(n,t+1,!0)}else e.appendChild(j("!"));return!0},Q=function(e){var t,n,r,o,s,u,l=!1;if(this.pos+=1,t=this.pos,null===(u=this.brackets))return e.appendChild(j("]")),!0;if(!u.active)return e.appendChild(j("]")),this.removeBracket(),!0;n=u.image;var c=this.pos;if(40===this.peek()&&(this.pos++,this.spnl()&&null!==(r=this.parseLinkDestination())&&this.spnl()&&(A.test(this.subject.charAt(this.pos-1))&&(o=this.parseLinkTitle()),!0)&&this.spnl()&&41===this.peek()?(this.pos+=1,l=!0):this.pos=c),!l){var p=this.pos,f=this.parseLinkLabel();if(f>2?s=this.subject.slice(p,p+f):u.bracketAfter||(s=this.subject.slice(u.index,t)),0===f&&(this.pos=c),s){var h=this.refmap[a(s)];h&&(r=h.destination,o=h.title,l=!0)}}if(l){var d=new i(n?"image":"link");d._destination=r,d._title=o||"";var m,v;for(m=u.node._next;m;)v=m._next,m.unlink(),d.appendChild(m),m=v;if(e.appendChild(d),this.processEmphasis(u.previousDelimiter),this.removeBracket(),u.node.unlink(),!n)for(u=this.brackets;null!==u;)u.image||(u.active=!1),u=u.previous;return!0}return this.removeBracket(),this.pos=t,e.appendChild(j("]")),!0},ee=function(e,t,n){null!==this.brackets&&(this.brackets.bracketAfter=!0),this.brackets={node:e,previous:this.brackets,previousDelimiter:this.delimiters,index:t,image:n,active:!0}},te=function(){this.brackets=this.brackets.previous},ne=function(e){var t;return!!(t=this.match(_))&&(e.appendChild(j(c(t))),!0)},re=function(e){var t;return!!(t=this.match(R))&&(this.options.smart?e.appendChild(j(t.replace(w,"…").replace(k,function(e){var t=0,n=0;return e.length%3==0?n=e.length/3:e.length%2==0?t=e.length/2:e.length%3==2?(t=1,n=(e.length-2)/3):(t=2,n=(e.length-4)/3),"—".repeat(n)+"–".repeat(t)}))):e.appendChild(j(t)),!0)},ie=function(e){this.pos+=1;var t=e._lastChild;if(t&&"text"===t.type&&" "===t._literal[t._literal.length-1]){var n=" "===t._literal[t._literal.length-2];t._literal=t._literal.replace(M,""),e.appendChild(new i(n?"linebreak":"softbreak"))}else e.appendChild(new i("softbreak"));return this.match(T),!0},oe=function(e,t){this.subject=e,this.pos=0;var n,r,i,o,s=this.pos;if(0===(o=this.parseLinkLabel()))return 0;if(n=this.subject.substr(0,o),58!==this.peek())return this.pos=s,0;if(this.pos++,this.spnl(),null===(r=this.parseLinkDestination())||0===r.length)return this.pos=s,0;var u=this.pos;this.spnl(),null===(i=this.parseLinkTitle())&&(i="",this.pos=u);var l=!0;if(null===this.match(P)&&(""===i?l=!1:(i="",this.pos=u,l=null!==this.match(P))),!l)return this.pos=s,0;var c=a(n);return""===c?(this.pos=s,0):(t[c]||(t[c]={destination:r,title:i}),this.pos-s)},ae=function(e){var t=!1,n=this.peek();if(-1===n)return!1;switch(n){case 10:t=this.parseNewline(e);break;case 92:t=this.parseBackslash(e);break;case 96:t=this.parseBackticks(e);break;case 42:case 95:t=this.handleDelim(n,e);break;case 39:case 34:t=this.options.smart&&this.handleDelim(n,e);break;case 91:t=this.parseOpenBracket(e);break;case 33:t=this.parseBang(e);break;case 93:t=this.parseCloseBracket(e);break;case 60:t=this.parseAutolink(e)||this.parseHtmlTag(e);break;case 38:t=this.parseEntity(e);break;default:t=this.parseString(e)}return t||(this.pos+=1,e.appendChild(j(l(n)))),!0},se=function(e){for(this.subject=e._string_content.trim(),this.pos=0,this.delimiters=null,this.brackets=null;this.parseInline(e););e._string_content=null,this.processEmphasis(null)};e.exports=r},function(e,t,n){"use strict";var r=/[ \t\r\n]+|[A-Z\xB5\xC0-\xD6\xD8-\xDF\u0100\u0102\u0104\u0106\u0108\u010A\u010C\u010E\u0110\u0112\u0114\u0116\u0118\u011A\u011C\u011E\u0120\u0122\u0124\u0126\u0128\u012A\u012C\u012E\u0130\u0132\u0134\u0136\u0139\u013B\u013D\u013F\u0141\u0143\u0145\u0147\u0149\u014A\u014C\u014E\u0150\u0152\u0154\u0156\u0158\u015A\u015C\u015E\u0160\u0162\u0164\u0166\u0168\u016A\u016C\u016E\u0170\u0172\u0174\u0176\u0178\u0179\u017B\u017D\u017F\u0181\u0182\u0184\u0186\u0187\u0189-\u018B\u018E-\u0191\u0193\u0194\u0196-\u0198\u019C\u019D\u019F\u01A0\u01A2\u01A4\u01A6\u01A7\u01A9\u01AC\u01AE\u01AF\u01B1-\u01B3\u01B5\u01B7\u01B8\u01BC\u01C4\u01C5\u01C7\u01C8\u01CA\u01CB\u01CD\u01CF\u01D1\u01D3\u01D5\u01D7\u01D9\u01DB\u01DE\u01E0\u01E2\u01E4\u01E6\u01E8\u01EA\u01EC\u01EE\u01F0-\u01F2\u01F4\u01F6-\u01F8\u01FA\u01FC\u01FE\u0200\u0202\u0204\u0206\u0208\u020A\u020C\u020E\u0210\u0212\u0214\u0216\u0218\u021A\u021C\u021E\u0220\u0222\u0224\u0226\u0228\u022A\u022C\u022E\u0230\u0232\u023A\u023B\u023D\u023E\u0241\u0243-\u0246\u0248\u024A\u024C\u024E\u0345\u0370\u0372\u0376\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03AB\u03B0\u03C2\u03CF-\u03D1\u03D5\u03D6\u03D8\u03DA\u03DC\u03DE\u03E0\u03E2\u03E4\u03E6\u03E8\u03EA\u03EC\u03EE\u03F0\u03F1\u03F4\u03F5\u03F7\u03F9\u03FA\u03FD-\u042F\u0460\u0462\u0464\u0466\u0468\u046A\u046C\u046E\u0470\u0472\u0474\u0476\u0478\u047A\u047C\u047E\u0480\u048A\u048C\u048E\u0490\u0492\u0494\u0496\u0498\u049A\u049C\u049E\u04A0\u04A2\u04A4\u04A6\u04A8\u04AA\u04AC\u04AE\u04B0\u04B2\u04B4\u04B6\u04B8\u04BA\u04BC\u04BE\u04C0\u04C1\u04C3\u04C5\u04C7\u04C9\u04CB\u04CD\u04D0\u04D2\u04D4\u04D6\u04D8\u04DA\u04DC\u04DE\u04E0\u04E2\u04E4\u04E6\u04E8\u04EA\u04EC\u04EE\u04F0\u04F2\u04F4\u04F6\u04F8\u04FA\u04FC\u04FE\u0500\u0502\u0504\u0506\u0508\u050A\u050C\u050E\u0510\u0512\u0514\u0516\u0518\u051A\u051C\u051E\u0520\u0522\u0524\u0526\u0528\u052A\u052C\u052E\u0531-\u0556\u0587\u10A0-\u10C5\u10C7\u10CD\u1E00\u1E02\u1E04\u1E06\u1E08\u1E0A\u1E0C\u1E0E\u1E10\u1E12\u1E14\u1E16\u1E18\u1E1A\u1E1C\u1E1E\u1E20\u1E22\u1E24\u1E26\u1E28\u1E2A\u1E2C\u1E2E\u1E30\u1E32\u1E34\u1E36\u1E38\u1E3A\u1E3C\u1E3E\u1E40\u1E42\u1E44\u1E46\u1E48\u1E4A\u1E4C\u1E4E\u1E50\u1E52\u1E54\u1E56\u1E58\u1E5A\u1E5C\u1E5E\u1E60\u1E62\u1E64\u1E66\u1E68\u1E6A\u1E6C\u1E6E\u1E70\u1E72\u1E74\u1E76\u1E78\u1E7A\u1E7C\u1E7E\u1E80\u1E82\u1E84\u1E86\u1E88\u1E8A\u1E8C\u1E8E\u1E90\u1E92\u1E94\u1E96-\u1E9B\u1E9E\u1EA0\u1EA2\u1EA4\u1EA6\u1EA8\u1EAA\u1EAC\u1EAE\u1EB0\u1EB2\u1EB4\u1EB6\u1EB8\u1EBA\u1EBC\u1EBE\u1EC0\u1EC2\u1EC4\u1EC6\u1EC8\u1ECA\u1ECC\u1ECE\u1ED0\u1ED2\u1ED4\u1ED6\u1ED8\u1EDA\u1EDC\u1EDE\u1EE0\u1EE2\u1EE4\u1EE6\u1EE8\u1EEA\u1EEC\u1EEE\u1EF0\u1EF2\u1EF4\u1EF6\u1EF8\u1EFA\u1EFC\u1EFE\u1F08-\u1F0F\u1F18-\u1F1D\u1F28-\u1F2F\u1F38-\u1F3F\u1F48-\u1F4D\u1F50\u1F52\u1F54\u1F56\u1F59\u1F5B\u1F5D\u1F5F\u1F68-\u1F6F\u1F80-\u1FAF\u1FB2-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD2\u1FD3\u1FD6-\u1FDB\u1FE2-\u1FE4\u1FE6-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2126\u212A\u212B\u2132\u2160-\u216F\u2183\u24B6-\u24CF\u2C00-\u2C2E\u2C60\u2C62-\u2C64\u2C67\u2C69\u2C6B\u2C6D-\u2C70\u2C72\u2C75\u2C7E-\u2C80\u2C82\u2C84\u2C86\u2C88\u2C8A\u2C8C\u2C8E\u2C90\u2C92\u2C94\u2C96\u2C98\u2C9A\u2C9C\u2C9E\u2CA0\u2CA2\u2CA4\u2CA6\u2CA8\u2CAA\u2CAC\u2CAE\u2CB0\u2CB2\u2CB4\u2CB6\u2CB8\u2CBA\u2CBC\u2CBE\u2CC0\u2CC2\u2CC4\u2CC6\u2CC8\u2CCA\u2CCC\u2CCE\u2CD0\u2CD2\u2CD4\u2CD6\u2CD8\u2CDA\u2CDC\u2CDE\u2CE0\u2CE2\u2CEB\u2CED\u2CF2\uA640\uA642\uA644\uA646\uA648\uA64A\uA64C\uA64E\uA650\uA652\uA654\uA656\uA658\uA65A\uA65C\uA65E\uA660\uA662\uA664\uA666\uA668\uA66A\uA66C\uA680\uA682\uA684\uA686\uA688\uA68A\uA68C\uA68E\uA690\uA692\uA694\uA696\uA698\uA69A\uA722\uA724\uA726\uA728\uA72A\uA72C\uA72E\uA732\uA734\uA736\uA738\uA73A\uA73C\uA73E\uA740\uA742\uA744\uA746\uA748\uA74A\uA74C\uA74E\uA750\uA752\uA754\uA756\uA758\uA75A\uA75C\uA75E\uA760\uA762\uA764\uA766\uA768\uA76A\uA76C\uA76E\uA779\uA77B\uA77D\uA77E\uA780\uA782\uA784\uA786\uA78B\uA78D\uA790\uA792\uA796\uA798\uA79A\uA79C\uA79E\uA7A0\uA7A2\uA7A4\uA7A6\uA7A8\uA7AA-\uA7AD\uA7B0\uA7B1\uFB00-\uFB06\uFB13-\uFB17\uFF21-\uFF3A]|\uD801[\uDC00-\uDC27]|\uD806[\uDCA0-\uDCBF]/g,i={A:"a",B:"b",C:"c",D:"d",E:"e",F:"f",G:"g",H:"h",I:"i",J:"j",K:"k",L:"l",M:"m",N:"n",O:"o",P:"p",Q:"q",R:"r",S:"s",T:"t",U:"u",V:"v",W:"w",X:"x",Y:"y",Z:"z","µ":"μ","À":"à","Á":"á","Â":"â","Ã":"ã","Ä":"ä","Å":"å","Æ":"æ","Ç":"ç","È":"è","É":"é","Ê":"ê","Ë":"ë","Ì":"ì","Í":"í","Î":"î","Ï":"ï","Ð":"ð","Ñ":"ñ","Ò":"ò","Ó":"ó","Ô":"ô","Õ":"õ","Ö":"ö","Ø":"ø","Ù":"ù","Ú":"ú","Û":"û","Ü":"ü","Ý":"ý","Þ":"þ","Ā":"ā","Ă":"ă","Ą":"ą","Ć":"ć","Ĉ":"ĉ","Ċ":"ċ","Č":"č","Ď":"ď","Đ":"đ","Ē":"ē","Ĕ":"ĕ","Ė":"ė","Ę":"ę","Ě":"ě","Ĝ":"ĝ","Ğ":"ğ","Ġ":"ġ","Ģ":"ģ","Ĥ":"ĥ","Ħ":"ħ","Ĩ":"ĩ","Ī":"ī","Ĭ":"ĭ","Į":"į","IJ":"ij","Ĵ":"ĵ","Ķ":"ķ","Ĺ":"ĺ","Ļ":"ļ","Ľ":"ľ","Ŀ":"ŀ","Ł":"ł","Ń":"ń","Ņ":"ņ","Ň":"ň","Ŋ":"ŋ","Ō":"ō","Ŏ":"ŏ","Ő":"ő","Œ":"œ","Ŕ":"ŕ","Ŗ":"ŗ","Ř":"ř","Ś":"ś","Ŝ":"ŝ","Ş":"ş","Š":"š","Ţ":"ţ","Ť":"ť","Ŧ":"ŧ","Ũ":"ũ","Ū":"ū","Ŭ":"ŭ","Ů":"ů","Ű":"ű","Ų":"ų","Ŵ":"ŵ","Ŷ":"ŷ","Ÿ":"ÿ","Ź":"ź","Ż":"ż","Ž":"ž","ſ":"s","Ɓ":"ɓ","Ƃ":"ƃ","Ƅ":"ƅ","Ɔ":"ɔ","Ƈ":"ƈ","Ɖ":"ɖ","Ɗ":"ɗ","Ƌ":"ƌ","Ǝ":"ǝ","Ə":"ə","Ɛ":"ɛ","Ƒ":"ƒ","Ɠ":"ɠ","Ɣ":"ɣ","Ɩ":"ɩ","Ɨ":"ɨ","Ƙ":"ƙ","Ɯ":"ɯ","Ɲ":"ɲ","Ɵ":"ɵ","Ơ":"ơ","Ƣ":"ƣ","Ƥ":"ƥ","Ʀ":"ʀ","Ƨ":"ƨ","Ʃ":"ʃ","Ƭ":"ƭ","Ʈ":"ʈ","Ư":"ư","Ʊ":"ʊ","Ʋ":"ʋ","Ƴ":"ƴ","Ƶ":"ƶ","Ʒ":"ʒ","Ƹ":"ƹ","Ƽ":"ƽ","DŽ":"dž","Dž":"dž","LJ":"lj","Lj":"lj","NJ":"nj","Nj":"nj","Ǎ":"ǎ","Ǐ":"ǐ","Ǒ":"ǒ","Ǔ":"ǔ","Ǖ":"ǖ","Ǘ":"ǘ","Ǚ":"ǚ","Ǜ":"ǜ","Ǟ":"ǟ","Ǡ":"ǡ","Ǣ":"ǣ","Ǥ":"ǥ","Ǧ":"ǧ","Ǩ":"ǩ","Ǫ":"ǫ","Ǭ":"ǭ","Ǯ":"ǯ","DZ":"dz","Dz":"dz","Ǵ":"ǵ","Ƕ":"ƕ","Ƿ":"ƿ","Ǹ":"ǹ","Ǻ":"ǻ","Ǽ":"ǽ","Ǿ":"ǿ","Ȁ":"ȁ","Ȃ":"ȃ","Ȅ":"ȅ","Ȇ":"ȇ","Ȉ":"ȉ","Ȋ":"ȋ","Ȍ":"ȍ","Ȏ":"ȏ","Ȑ":"ȑ","Ȓ":"ȓ","Ȕ":"ȕ","Ȗ":"ȗ","Ș":"ș","Ț":"ț","Ȝ":"ȝ","Ȟ":"ȟ","Ƞ":"ƞ","Ȣ":"ȣ","Ȥ":"ȥ","Ȧ":"ȧ","Ȩ":"ȩ","Ȫ":"ȫ","Ȭ":"ȭ","Ȯ":"ȯ","Ȱ":"ȱ","Ȳ":"ȳ","Ⱥ":"ⱥ","Ȼ":"ȼ","Ƚ":"ƚ","Ⱦ":"ⱦ","Ɂ":"ɂ","Ƀ":"ƀ","Ʉ":"ʉ","Ʌ":"ʌ","Ɇ":"ɇ","Ɉ":"ɉ","Ɋ":"ɋ","Ɍ":"ɍ","Ɏ":"ɏ","ͅ":"ι","Ͱ":"ͱ","Ͳ":"ͳ","Ͷ":"ͷ","Ϳ":"ϳ","Ά":"ά","Έ":"έ","Ή":"ή","Ί":"ί","Ό":"ό","Ύ":"ύ","Ώ":"ώ","Α":"α","Β":"β","Γ":"γ","Δ":"δ","Ε":"ε","Ζ":"ζ","Η":"η","Θ":"θ","Ι":"ι","Κ":"κ","Λ":"λ","Μ":"μ","Ν":"ν","Ξ":"ξ","Ο":"ο","Π":"π","Ρ":"ρ","Σ":"σ","Τ":"τ","Υ":"υ","Φ":"φ","Χ":"χ","Ψ":"ψ","Ω":"ω","Ϊ":"ϊ","Ϋ":"ϋ","ς":"σ","Ϗ":"ϗ","ϐ":"β","ϑ":"θ","ϕ":"φ","ϖ":"π","Ϙ":"ϙ","Ϛ":"ϛ","Ϝ":"ϝ","Ϟ":"ϟ","Ϡ":"ϡ","Ϣ":"ϣ","Ϥ":"ϥ","Ϧ":"ϧ","Ϩ":"ϩ","Ϫ":"ϫ","Ϭ":"ϭ","Ϯ":"ϯ","ϰ":"κ","ϱ":"ρ","ϴ":"θ","ϵ":"ε","Ϸ":"ϸ","Ϲ":"ϲ","Ϻ":"ϻ","Ͻ":"ͻ","Ͼ":"ͼ","Ͽ":"ͽ","Ѐ":"ѐ","Ё":"ё","Ђ":"ђ","Ѓ":"ѓ","Є":"є","Ѕ":"ѕ","І":"і","Ї":"ї","Ј":"ј","Љ":"љ","Њ":"њ","Ћ":"ћ","Ќ":"ќ","Ѝ":"ѝ","Ў":"ў","Џ":"џ","А":"а","Б":"б","В":"в","Г":"г","Д":"д","Е":"е","Ж":"ж","З":"з","И":"и","Й":"й","К":"к","Л":"л","М":"м","Н":"н","О":"о","П":"п","Р":"р","С":"с","Т":"т","У":"у","Ф":"ф","Х":"х","Ц":"ц","Ч":"ч","Ш":"ш","Щ":"щ","Ъ":"ъ","Ы":"ы","Ь":"ь","Э":"э","Ю":"ю","Я":"я","Ѡ":"ѡ","Ѣ":"ѣ","Ѥ":"ѥ","Ѧ":"ѧ","Ѩ":"ѩ","Ѫ":"ѫ","Ѭ":"ѭ","Ѯ":"ѯ","Ѱ":"ѱ","Ѳ":"ѳ","Ѵ":"ѵ","Ѷ":"ѷ","Ѹ":"ѹ","Ѻ":"ѻ","Ѽ":"ѽ","Ѿ":"ѿ","Ҁ":"ҁ","Ҋ":"ҋ","Ҍ":"ҍ","Ҏ":"ҏ","Ґ":"ґ","Ғ":"ғ","Ҕ":"ҕ","Җ":"җ","Ҙ":"ҙ","Қ":"қ","Ҝ":"ҝ","Ҟ":"ҟ","Ҡ":"ҡ","Ң":"ң","Ҥ":"ҥ","Ҧ":"ҧ","Ҩ":"ҩ","Ҫ":"ҫ","Ҭ":"ҭ","Ү":"ү","Ұ":"ұ","Ҳ":"ҳ","Ҵ":"ҵ","Ҷ":"ҷ","Ҹ":"ҹ","Һ":"һ","Ҽ":"ҽ","Ҿ":"ҿ","Ӏ":"ӏ","Ӂ":"ӂ","Ӄ":"ӄ","Ӆ":"ӆ","Ӈ":"ӈ","Ӊ":"ӊ","Ӌ":"ӌ","Ӎ":"ӎ","Ӑ":"ӑ","Ӓ":"ӓ","Ӕ":"ӕ","Ӗ":"ӗ","Ә":"ә","Ӛ":"ӛ","Ӝ":"ӝ","Ӟ":"ӟ","Ӡ":"ӡ","Ӣ":"ӣ","Ӥ":"ӥ","Ӧ":"ӧ","Ө":"ө","Ӫ":"ӫ","Ӭ":"ӭ","Ӯ":"ӯ","Ӱ":"ӱ","Ӳ":"ӳ","Ӵ":"ӵ","Ӷ":"ӷ","Ӹ":"ӹ","Ӻ":"ӻ","Ӽ":"ӽ","Ӿ":"ӿ","Ԁ":"ԁ","Ԃ":"ԃ","Ԅ":"ԅ","Ԇ":"ԇ","Ԉ":"ԉ","Ԋ":"ԋ","Ԍ":"ԍ","Ԏ":"ԏ","Ԑ":"ԑ","Ԓ":"ԓ","Ԕ":"ԕ","Ԗ":"ԗ","Ԙ":"ԙ","Ԛ":"ԛ","Ԝ":"ԝ","Ԟ":"ԟ","Ԡ":"ԡ","Ԣ":"ԣ","Ԥ":"ԥ","Ԧ":"ԧ","Ԩ":"ԩ","Ԫ":"ԫ","Ԭ":"ԭ","Ԯ":"ԯ","Ա":"ա","Բ":"բ","Գ":"գ","Դ":"դ","Ե":"ե","Զ":"զ","Է":"է","Ը":"ը","Թ":"թ","Ժ":"ժ","Ի":"ի","Լ":"լ","Խ":"խ","Ծ":"ծ","Կ":"կ","Հ":"հ","Ձ":"ձ","Ղ":"ղ","Ճ":"ճ","Մ":"մ","Յ":"յ","Ն":"ն","Շ":"շ","Ո":"ո","Չ":"չ","Պ":"պ","Ջ":"ջ","Ռ":"ռ","Ս":"ս","Վ":"վ","Տ":"տ","Ր":"ր","Ց":"ց","Ւ":"ւ","Փ":"փ","Ք":"ք","Օ":"օ","Ֆ":"ֆ","Ⴀ":"ⴀ","Ⴁ":"ⴁ","Ⴂ":"ⴂ","Ⴃ":"ⴃ","Ⴄ":"ⴄ","Ⴅ":"ⴅ","Ⴆ":"ⴆ","Ⴇ":"ⴇ","Ⴈ":"ⴈ","Ⴉ":"ⴉ","Ⴊ":"ⴊ","Ⴋ":"ⴋ","Ⴌ":"ⴌ","Ⴍ":"ⴍ","Ⴎ":"ⴎ","Ⴏ":"ⴏ","Ⴐ":"ⴐ","Ⴑ":"ⴑ","Ⴒ":"ⴒ","Ⴓ":"ⴓ","Ⴔ":"ⴔ","Ⴕ":"ⴕ","Ⴖ":"ⴖ","Ⴗ":"ⴗ","Ⴘ":"ⴘ","Ⴙ":"ⴙ","Ⴚ":"ⴚ","Ⴛ":"ⴛ","Ⴜ":"ⴜ","Ⴝ":"ⴝ","Ⴞ":"ⴞ","Ⴟ":"ⴟ","Ⴠ":"ⴠ","Ⴡ":"ⴡ","Ⴢ":"ⴢ","Ⴣ":"ⴣ","Ⴤ":"ⴤ","Ⴥ":"ⴥ","Ⴧ":"ⴧ","Ⴭ":"ⴭ","Ḁ":"ḁ","Ḃ":"ḃ","Ḅ":"ḅ","Ḇ":"ḇ","Ḉ":"ḉ","Ḋ":"ḋ","Ḍ":"ḍ","Ḏ":"ḏ","Ḑ":"ḑ","Ḓ":"ḓ","Ḕ":"ḕ","Ḗ":"ḗ","Ḙ":"ḙ","Ḛ":"ḛ","Ḝ":"ḝ","Ḟ":"ḟ","Ḡ":"ḡ","Ḣ":"ḣ","Ḥ":"ḥ","Ḧ":"ḧ","Ḩ":"ḩ","Ḫ":"ḫ","Ḭ":"ḭ","Ḯ":"ḯ","Ḱ":"ḱ","Ḳ":"ḳ","Ḵ":"ḵ","Ḷ":"ḷ","Ḹ":"ḹ","Ḻ":"ḻ","Ḽ":"ḽ","Ḿ":"ḿ","Ṁ":"ṁ","Ṃ":"ṃ","Ṅ":"ṅ","Ṇ":"ṇ","Ṉ":"ṉ","Ṋ":"ṋ","Ṍ":"ṍ","Ṏ":"ṏ","Ṑ":"ṑ","Ṓ":"ṓ","Ṕ":"ṕ","Ṗ":"ṗ","Ṙ":"ṙ","Ṛ":"ṛ","Ṝ":"ṝ","Ṟ":"ṟ","Ṡ":"ṡ","Ṣ":"ṣ","Ṥ":"ṥ","Ṧ":"ṧ","Ṩ":"ṩ","Ṫ":"ṫ","Ṭ":"ṭ","Ṯ":"ṯ","Ṱ":"ṱ","Ṳ":"ṳ","Ṵ":"ṵ","Ṷ":"ṷ","Ṹ":"ṹ","Ṻ":"ṻ","Ṽ":"ṽ","Ṿ":"ṿ","Ẁ":"ẁ","Ẃ":"ẃ","Ẅ":"ẅ","Ẇ":"ẇ","Ẉ":"ẉ","Ẋ":"ẋ","Ẍ":"ẍ","Ẏ":"ẏ","Ẑ":"ẑ","Ẓ":"ẓ","Ẕ":"ẕ","ẛ":"ṡ","Ạ":"ạ","Ả":"ả","Ấ":"ấ","Ầ":"ầ","Ẩ":"ẩ","Ẫ":"ẫ","Ậ":"ậ","Ắ":"ắ","Ằ":"ằ","Ẳ":"ẳ","Ẵ":"ẵ","Ặ":"ặ","Ẹ":"ẹ","Ẻ":"ẻ","Ẽ":"ẽ","Ế":"ế","Ề":"ề","Ể":"ể","Ễ":"ễ","Ệ":"ệ","Ỉ":"ỉ","Ị":"ị","Ọ":"ọ","Ỏ":"ỏ","Ố":"ố","Ồ":"ồ","Ổ":"ổ","Ỗ":"ỗ","Ộ":"ộ","Ớ":"ớ","Ờ":"ờ","Ở":"ở","Ỡ":"ỡ","Ợ":"ợ","Ụ":"ụ","Ủ":"ủ","Ứ":"ứ","Ừ":"ừ","Ử":"ử","Ữ":"ữ","Ự":"ự","Ỳ":"ỳ","Ỵ":"ỵ","Ỷ":"ỷ","Ỹ":"ỹ","Ỻ":"ỻ","Ỽ":"ỽ","Ỿ":"ỿ","Ἀ":"ἀ","Ἁ":"ἁ","Ἂ":"ἂ","Ἃ":"ἃ","Ἄ":"ἄ","Ἅ":"ἅ","Ἆ":"ἆ","Ἇ":"ἇ","Ἐ":"ἐ","Ἑ":"ἑ","Ἒ":"ἒ","Ἓ":"ἓ","Ἔ":"ἔ","Ἕ":"ἕ","Ἠ":"ἠ","Ἡ":"ἡ","Ἢ":"ἢ","Ἣ":"ἣ","Ἤ":"ἤ","Ἥ":"ἥ","Ἦ":"ἦ","Ἧ":"ἧ","Ἰ":"ἰ","Ἱ":"ἱ","Ἲ":"ἲ","Ἳ":"ἳ","Ἴ":"ἴ","Ἵ":"ἵ","Ἶ":"ἶ","Ἷ":"ἷ","Ὀ":"ὀ","Ὁ":"ὁ","Ὂ":"ὂ","Ὃ":"ὃ","Ὄ":"ὄ","Ὅ":"ὅ","Ὑ":"ὑ","Ὓ":"ὓ","Ὕ":"ὕ","Ὗ":"ὗ","Ὠ":"ὠ","Ὡ":"ὡ","Ὢ":"ὢ","Ὣ":"ὣ","Ὤ":"ὤ","Ὥ":"ὥ","Ὦ":"ὦ","Ὧ":"ὧ","Ᾰ":"ᾰ","Ᾱ":"ᾱ","Ὰ":"ὰ","Ά":"ά","ι":"ι","Ὲ":"ὲ","Έ":"έ","Ὴ":"ὴ","Ή":"ή","Ῐ":"ῐ","Ῑ":"ῑ","Ὶ":"ὶ","Ί":"ί","Ῠ":"ῠ","Ῡ":"ῡ","Ὺ":"ὺ","Ύ":"ύ","Ῥ":"ῥ","Ὸ":"ὸ","Ό":"ό","Ὼ":"ὼ","Ώ":"ώ","Ω":"ω","K":"k","Å":"å","Ⅎ":"ⅎ","Ⅰ":"ⅰ","Ⅱ":"ⅱ","Ⅲ":"ⅲ","Ⅳ":"ⅳ","Ⅴ":"ⅴ","Ⅵ":"ⅵ","Ⅶ":"ⅶ","Ⅷ":"ⅷ","Ⅸ":"ⅸ","Ⅹ":"ⅹ","Ⅺ":"ⅺ","Ⅻ":"ⅻ","Ⅼ":"ⅼ","Ⅽ":"ⅽ","Ⅾ":"ⅾ","Ⅿ":"ⅿ","Ↄ":"ↄ","Ⓐ":"ⓐ","Ⓑ":"ⓑ","Ⓒ":"ⓒ","Ⓓ":"ⓓ","Ⓔ":"ⓔ","Ⓕ":"ⓕ","Ⓖ":"ⓖ","Ⓗ":"ⓗ","Ⓘ":"ⓘ","Ⓙ":"ⓙ","Ⓚ":"ⓚ","Ⓛ":"ⓛ","Ⓜ":"ⓜ","Ⓝ":"ⓝ","Ⓞ":"ⓞ","Ⓟ":"ⓟ","Ⓠ":"ⓠ","Ⓡ":"ⓡ","Ⓢ":"ⓢ","Ⓣ":"ⓣ","Ⓤ":"ⓤ","Ⓥ":"ⓥ","Ⓦ":"ⓦ","Ⓧ":"ⓧ","Ⓨ":"ⓨ","Ⓩ":"ⓩ","Ⰰ":"ⰰ","Ⰱ":"ⰱ","Ⰲ":"ⰲ","Ⰳ":"ⰳ","Ⰴ":"ⰴ","Ⰵ":"ⰵ","Ⰶ":"ⰶ","Ⰷ":"ⰷ","Ⰸ":"ⰸ","Ⰹ":"ⰹ","Ⰺ":"ⰺ","Ⰻ":"ⰻ","Ⰼ":"ⰼ","Ⰽ":"ⰽ","Ⰾ":"ⰾ","Ⰿ":"ⰿ","Ⱀ":"ⱀ","Ⱁ":"ⱁ","Ⱂ":"ⱂ","Ⱃ":"ⱃ","Ⱄ":"ⱄ","Ⱅ":"ⱅ","Ⱆ":"ⱆ","Ⱇ":"ⱇ","Ⱈ":"ⱈ","Ⱉ":"ⱉ","Ⱊ":"ⱊ","Ⱋ":"ⱋ","Ⱌ":"ⱌ","Ⱍ":"ⱍ","Ⱎ":"ⱎ","Ⱏ":"ⱏ","Ⱐ":"ⱐ","Ⱑ":"ⱑ","Ⱒ":"ⱒ","Ⱓ":"ⱓ","Ⱔ":"ⱔ","Ⱕ":"ⱕ","Ⱖ":"ⱖ","Ⱗ":"ⱗ","Ⱘ":"ⱘ","Ⱙ":"ⱙ","Ⱚ":"ⱚ","Ⱛ":"ⱛ","Ⱜ":"ⱜ","Ⱝ":"ⱝ","Ⱞ":"ⱞ","Ⱡ":"ⱡ","Ɫ":"ɫ","Ᵽ":"ᵽ","Ɽ":"ɽ","Ⱨ":"ⱨ","Ⱪ":"ⱪ","Ⱬ":"ⱬ","Ɑ":"ɑ","Ɱ":"ɱ","Ɐ":"ɐ","Ɒ":"ɒ","Ⱳ":"ⱳ","Ⱶ":"ⱶ","Ȿ":"ȿ","Ɀ":"ɀ","Ⲁ":"ⲁ","Ⲃ":"ⲃ","Ⲅ":"ⲅ","Ⲇ":"ⲇ","Ⲉ":"ⲉ","Ⲋ":"ⲋ","Ⲍ":"ⲍ","Ⲏ":"ⲏ","Ⲑ":"ⲑ","Ⲓ":"ⲓ","Ⲕ":"ⲕ","Ⲗ":"ⲗ","Ⲙ":"ⲙ","Ⲛ":"ⲛ","Ⲝ":"ⲝ","Ⲟ":"ⲟ","Ⲡ":"ⲡ","Ⲣ":"ⲣ","Ⲥ":"ⲥ","Ⲧ":"ⲧ","Ⲩ":"ⲩ","Ⲫ":"ⲫ","Ⲭ":"ⲭ","Ⲯ":"ⲯ","Ⲱ":"ⲱ","Ⲳ":"ⲳ","Ⲵ":"ⲵ","Ⲷ":"ⲷ","Ⲹ":"ⲹ","Ⲻ":"ⲻ","Ⲽ":"ⲽ","Ⲿ":"ⲿ","Ⳁ":"ⳁ","Ⳃ":"ⳃ","Ⳅ":"ⳅ","Ⳇ":"ⳇ","Ⳉ":"ⳉ","Ⳋ":"ⳋ","Ⳍ":"ⳍ","Ⳏ":"ⳏ","Ⳑ":"ⳑ","Ⳓ":"ⳓ","Ⳕ":"ⳕ","Ⳗ":"ⳗ","Ⳙ":"ⳙ","Ⳛ":"ⳛ","Ⳝ":"ⳝ","Ⳟ":"ⳟ","Ⳡ":"ⳡ","Ⳣ":"ⳣ","Ⳬ":"ⳬ","Ⳮ":"ⳮ","Ⳳ":"ⳳ","Ꙁ":"ꙁ","Ꙃ":"ꙃ","Ꙅ":"ꙅ","Ꙇ":"ꙇ","Ꙉ":"ꙉ","Ꙋ":"ꙋ","Ꙍ":"ꙍ","Ꙏ":"ꙏ","Ꙑ":"ꙑ","Ꙓ":"ꙓ","Ꙕ":"ꙕ","Ꙗ":"ꙗ","Ꙙ":"ꙙ","Ꙛ":"ꙛ","Ꙝ":"ꙝ","Ꙟ":"ꙟ","Ꙡ":"ꙡ","Ꙣ":"ꙣ","Ꙥ":"ꙥ","Ꙧ":"ꙧ","Ꙩ":"ꙩ","Ꙫ":"ꙫ","Ꙭ":"ꙭ","Ꚁ":"ꚁ","Ꚃ":"ꚃ","Ꚅ":"ꚅ","Ꚇ":"ꚇ","Ꚉ":"ꚉ","Ꚋ":"ꚋ","Ꚍ":"ꚍ","Ꚏ":"ꚏ","Ꚑ":"ꚑ","Ꚓ":"ꚓ","Ꚕ":"ꚕ","Ꚗ":"ꚗ","Ꚙ":"ꚙ","Ꚛ":"ꚛ","Ꜣ":"ꜣ","Ꜥ":"ꜥ","Ꜧ":"ꜧ","Ꜩ":"ꜩ","Ꜫ":"ꜫ","Ꜭ":"ꜭ","Ꜯ":"ꜯ","Ꜳ":"ꜳ","Ꜵ":"ꜵ","Ꜷ":"ꜷ","Ꜹ":"ꜹ","Ꜻ":"ꜻ","Ꜽ":"ꜽ","Ꜿ":"ꜿ","Ꝁ":"ꝁ","Ꝃ":"ꝃ","Ꝅ":"ꝅ","Ꝇ":"ꝇ","Ꝉ":"ꝉ","Ꝋ":"ꝋ","Ꝍ":"ꝍ","Ꝏ":"ꝏ","Ꝑ":"ꝑ","Ꝓ":"ꝓ","Ꝕ":"ꝕ","Ꝗ":"ꝗ","Ꝙ":"ꝙ","Ꝛ":"ꝛ","Ꝝ":"ꝝ","Ꝟ":"ꝟ","Ꝡ":"ꝡ","Ꝣ":"ꝣ","Ꝥ":"ꝥ","Ꝧ":"ꝧ","Ꝩ":"ꝩ","Ꝫ":"ꝫ","Ꝭ":"ꝭ","Ꝯ":"ꝯ","Ꝺ":"ꝺ","Ꝼ":"ꝼ","Ᵹ":"ᵹ","Ꝿ":"ꝿ","Ꞁ":"ꞁ","Ꞃ":"ꞃ","Ꞅ":"ꞅ","Ꞇ":"ꞇ","Ꞌ":"ꞌ","Ɥ":"ɥ","Ꞑ":"ꞑ","Ꞓ":"ꞓ","Ꞗ":"ꞗ","Ꞙ":"ꞙ","Ꞛ":"ꞛ","Ꞝ":"ꞝ","Ꞟ":"ꞟ","Ꞡ":"ꞡ","Ꞣ":"ꞣ","Ꞥ":"ꞥ","Ꞧ":"ꞧ","Ꞩ":"ꞩ","Ɦ":"ɦ","Ɜ":"ɜ","Ɡ":"ɡ","Ɬ":"ɬ","Ʞ":"ʞ","Ʇ":"ʇ","Ａ":"ａ","Ｂ":"ｂ","Ｃ":"ｃ","Ｄ":"ｄ","Ｅ":"ｅ","Ｆ":"ｆ","Ｇ":"ｇ","Ｈ":"ｈ","Ｉ":"ｉ","Ｊ":"ｊ","Ｋ":"ｋ","Ｌ":"ｌ","Ｍ":"ｍ","Ｎ":"ｎ","Ｏ":"ｏ","Ｐ":"ｐ","Ｑ":"ｑ","Ｒ":"ｒ","Ｓ":"ｓ","Ｔ":"ｔ","Ｕ":"ｕ","Ｖ":"ｖ","Ｗ":"ｗ","Ｘ":"ｘ","Ｙ":"ｙ","Ｚ":"ｚ","𐐀":"𐐨","𐐁":"𐐩","𐐂":"𐐪","𐐃":"𐐫","𐐄":"𐐬","𐐅":"𐐭","𐐆":"𐐮","𐐇":"𐐯","𐐈":"𐐰","𐐉":"𐐱","𐐊":"𐐲","𐐋":"𐐳","𐐌":"𐐴","𐐍":"𐐵","𐐎":"𐐶","𐐏":"𐐷","𐐐":"𐐸","𐐑":"𐐹","𐐒":"𐐺","𐐓":"𐐻","𐐔":"𐐼","𐐕":"𐐽","𐐖":"𐐾","𐐗":"𐐿","𐐘":"𐑀","𐐙":"𐑁","𐐚":"𐑂","𐐛":"𐑃","𐐜":"𐑄","𐐝":"𐑅","𐐞":"𐑆","𐐟":"𐑇","𐐠":"𐑈","𐐡":"𐑉","𐐢":"𐑊","𐐣":"𐑋","𐐤":"𐑌","𐐥":"𐑍","𐐦":"𐑎","𐐧":"𐑏","𑢠":"𑣀","𑢡":"𑣁","𑢢":"𑣂","𑢣":"𑣃","𑢤":"𑣄","𑢥":"𑣅","𑢦":"𑣆","𑢧":"𑣇","𑢨":"𑣈","𑢩":"𑣉","𑢪":"𑣊","𑢫":"𑣋","𑢬":"𑣌","𑢭":"𑣍","𑢮":"𑣎","𑢯":"𑣏","𑢰":"𑣐","𑢱":"𑣑","𑢲":"𑣒","𑢳":"𑣓","𑢴":"𑣔","𑢵":"𑣕","𑢶":"𑣖","𑢷":"𑣗","𑢸":"𑣘","𑢹":"𑣙","𑢺":"𑣚","𑢻":"𑣛","𑢼":"𑣜","𑢽":"𑣝","𑢾":"𑣞","𑢿":"𑣟","ß":"ss","İ":"i̇","ʼn":"ʼn","ǰ":"ǰ","ΐ":"ΐ","ΰ":"ΰ","և":"եւ","ẖ":"ẖ","ẗ":"ẗ","ẘ":"ẘ","ẙ":"ẙ","ẚ":"aʾ","ẞ":"ss","ὐ":"ὐ","ὒ":"ὒ","ὔ":"ὔ","ὖ":"ὖ","ᾀ":"ἀι","ᾁ":"ἁι","ᾂ":"ἂι","ᾃ":"ἃι","ᾄ":"ἄι","ᾅ":"ἅι","ᾆ":"ἆι","ᾇ":"ἇι","ᾈ":"ἀι","ᾉ":"ἁι","ᾊ":"ἂι","ᾋ":"ἃι","ᾌ":"ἄι","ᾍ":"ἅι","ᾎ":"ἆι","ᾏ":"ἇι","ᾐ":"ἠι","ᾑ":"ἡι","ᾒ":"ἢι","ᾓ":"ἣι","ᾔ":"ἤι","ᾕ":"ἥι","ᾖ":"ἦι","ᾗ":"ἧι","ᾘ":"ἠι","ᾙ":"ἡι","ᾚ":"ἢι","ᾛ":"ἣι","ᾜ":"ἤι","ᾝ":"ἥι","ᾞ":"ἦι","ᾟ":"ἧι","ᾠ":"ὠι","ᾡ":"ὡι","ᾢ":"ὢι","ᾣ":"ὣι","ᾤ":"ὤι","ᾥ":"ὥι","ᾦ":"ὦι","ᾧ":"ὧι","ᾨ":"ὠι","ᾩ":"ὡι","ᾪ":"ὢι","ᾫ":"ὣι","ᾬ":"ὤι","ᾭ":"ὥι","ᾮ":"ὦι","ᾯ":"ὧι","ᾲ":"ὰι","ᾳ":"αι","ᾴ":"άι","ᾶ":"ᾶ","ᾷ":"ᾶι","ᾼ":"αι","ῂ":"ὴι","ῃ":"ηι","ῄ":"ήι","ῆ":"ῆ","ῇ":"ῆι","ῌ":"ηι","ῒ":"ῒ","ΐ":"ΐ","ῖ":"ῖ","ῗ":"ῗ","ῢ":"ῢ","ΰ":"ΰ","ῤ":"ῤ","ῦ":"ῦ","ῧ":"ῧ","ῲ":"ὼι","ῳ":"ωι","ῴ":"ώι","ῶ":"ῶ","ῷ":"ῶι","ῼ":"ωι","ff":"ff","fi":"fi","fl":"fl","ffi":"ffi","ffl":"ffl","ſt":"st","st":"st","ﬓ":"մն","ﬔ":"մե","ﬕ":"մի","ﬖ":"վն","ﬗ":"մխ"};e.exports=function(e){return e.slice(1,e.length-1).trim().replace(r,function(e){return i[e]||" "})}},function(e,t,n){"use strict";function r(e,t,n){if(!(this.disableTags>0)){if(this.buffer+="<"+e,t&&t.length>0)for(var r,i=0;void 0!==(r=t[i]);)this.buffer+=" "+r[0]+'="'+r[1]+'"',i++;n&&(this.buffer+=" /"),this.buffer+=">",this.lastOut=">"}}function i(e){e=e||{},e.softbreak=e.softbreak||"\n",this.disableTags=0,this.lastOut="\n",this.options=e}function o(e){this.out(e.literal)}function a(){this.lit(this.options.softbreak)}function s(){this.tag("br",[],!0),this.cr()}function u(e,t){var n=this.attrs(e);t?(this.options.safe&&O(e.destination)||n.push(["href",this.esc(e.destination,!0)]),e.title&&n.push(["title",this.esc(e.title,!0)]),this.tag("a",n)):this.tag("/a")}function l(e,t){t?(0===this.disableTags&&(this.options.safe&&O(e.destination)?this.lit('<img src="" alt="'):this.lit('<img src="'+this.esc(e.destination,!0)+'" alt="')),this.disableTags+=1):(this.disableTags-=1,0===this.disableTags&&(e.title&&this.lit('" title="'+this.esc(e.title,!0)),this.lit('" />')))}function c(e,t){this.tag(t?"em":"/em")}function p(e,t){this.tag(t?"strong":"/strong")}function f(e,t){var n=e.parent.parent,r=this.attrs(e);null!==n&&"list"===n.type&&n.listTight||(t?(this.cr(),this.tag("p",r)):(this.tag("/p"),this.cr()))}function h(e,t){var n="h"+e.level,r=this.attrs(e);t?(this.cr(),this.tag(n,r)):(this.tag("/"+n),this.cr())}function d(e){this.tag("code"),this.out(e.literal),this.tag("/code")}function m(e){var t=e.info?e.info.split(/\s+/):[],n=this.attrs(e);t.length>0&&t[0].length>0&&n.push(["class","language-"+this.esc(t[0],!0)]),this.cr(),this.tag("pre"),this.tag("code",n),this.out(e.literal),this.tag("/code"),this.tag("/pre"),this.cr()}function v(e){var t=this.attrs(e);this.cr(),this.tag("hr",t,!0),this.cr()}function g(e,t){var n=this.attrs(e);t?(this.cr(),this.tag("blockquote",n),this.cr()):(this.cr(),this.tag("/blockquote"),this.cr())}function y(e,t){var n="bullet"===e.listType?"ul":"ol",r=this.attrs(e);if(t){var i=e.listStart;null!==i&&1!==i&&r.push(["start",i.toString()]),this.cr(),this.tag(n,r),this.cr()}else this.cr(),this.tag("/"+n),this.cr()}function _(e,t){var n=this.attrs(e);t?this.tag("li",n):(this.tag("/li"),this.cr())}function b(e){this.options.safe?this.lit("\x3c!-- raw HTML omitted --\x3e"):this.lit(e.literal)}function x(e){this.cr(),this.options.safe?this.lit("\x3c!-- raw HTML omitted --\x3e"):this.lit(e.literal),this.cr()}function w(e,t){t&&e.onEnter?this.lit(e.onEnter):!t&&e.onExit&&this.lit(e.onExit)}function k(e,t){this.cr(),t&&e.onEnter?this.lit(e.onEnter):!t&&e.onExit&&this.lit(e.onExit),this.cr()}function E(e){this.lit(this.esc(e,!1))}function S(e){var t=[];if(this.options.sourcepos){var n=e.sourcepos;n&&t.push(["data-sourcepos",String(n[0][0])+":"+String(n[0][1])+"-"+String(n[1][0])+":"+String(n[1][1])])}return t}var C=n(333),A=/^javascript:|vbscript:|file:|data:/i,D=/^data:image\/(?:png|gif|jpeg|webp)/i,O=function(e){return A.test(e)&&!D.test(e)};i.prototype=Object.create(C.prototype),i.prototype.text=o,i.prototype.html_inline=b,i.prototype.html_block=x,i.prototype.softbreak=a,i.prototype.linebreak=s,i.prototype.link=u,i.prototype.image=l,i.prototype.emph=c,i.prototype.strong=p,i.prototype.paragraph=f,i.prototype.heading=h,i.prototype.code=d,i.prototype.code_block=m,i.prototype.thematic_break=v,i.prototype.block_quote=g,i.prototype.list=y,i.prototype.item=_,i.prototype.custom_inline=w,i.prototype.custom_block=k,i.prototype.esc=n(73).escapeXml,i.prototype.out=E,i.prototype.tag=r,i.prototype.attrs=S,e.exports=i},function(e,t,n){"use strict";function r(e){return e.replace(/([a-z])([A-Z])/g,"$1_$2").toLowerCase()}function i(e){e=e||{},this.disableTags=0,this.lastOut="\n",this.indentLevel=0,this.indent="  ",this.options=e}function o(e){this.buffer="";var t,n,i,o,a,s,u,l,c=e.walker(),p=this.options;for(p.time&&console.time("rendering"),this.buffer+='<?xml version="1.0" encoding="UTF-8"?>\n',this.buffer+='<!DOCTYPE document SYSTEM "CommonMark.dtd">\n';i=c.next();)if(a=i.entering,o=i.node,l=o.type,s=o.isContainer,u="thematic_break"===l||"linebreak"===l||"softbreak"===l,n=r(l),a){switch(t=[],l){case"document":t.push(["xmlns","http://commonmark.org/xml/1.0"]);break;case"list":null!==o.listType&&t.push(["type",o.listType.toLowerCase()]),null!==o.listStart&&t.push(["start",String(o.listStart)]),null!==o.listTight&&t.push(["tight",o.listTight?"true":"false"]);var f=o.listDelimiter;if(null!==f){var h="";h="."===f?"period":"paren",t.push(["delimiter",h])}break;case"code_block":o.info&&t.push(["info",o.info]);break;case"heading":t.push(["level",String(o.level)]);break;case"link":case"image":t.push(["destination",o.destination]),t.push(["title",o.title]);break;case"custom_inline":case"custom_block":t.push(["on_enter",o.onEnter]),t.push(["on_exit",o.onExit])}if(p.sourcepos){var d=o.sourcepos;d&&t.push(["sourcepos",String(d[0][0])+":"+String(d[0][1])+"-"+String(d[1][0])+":"+String(d[1][1])])}if(this.cr(),this.out(this.tag(n,t,u)),s)this.indentLevel+=1;else if(!s&&!u){var m=o.literal;m&&this.out(this.esc(m)),this.out(this.tag("/"+n))}}else this.indentLevel-=1,this.cr(),this.out(this.tag("/"+n));return p.time&&console.timeEnd("rendering"),this.buffer+="\n",this.buffer}function a(e){this.disableTags>0?this.buffer+=e.replace(c,""):this.buffer+=e,this.lastOut=e}function s(){if("\n"!==this.lastOut){this.buffer+="\n",this.lastOut="\n";for(var e=this.indentLevel;e>0;e--)this.buffer+=this.indent}}function u(e,t,n){var r="<"+e;if(t&&t.length>0)for(var i,o=0;void 0!==(i=t[o]);)r+=" "+i[0]+'="'+this.esc(i[1])+'"',o++;return n&&(r+=" /"),r+=">"}var l=n(333),c=/\<[^>]*\>/;i.prototype=Object.create(l.prototype),i.prototype.render=o,i.prototype.out=a,i.prototype.cr=s,i.prototype.tag=u,i.prototype.esc=n(73).escapeXml,e.exports=i},function(e,t,n){"use strict";function r(e,t){if("string"!=typeof e)throw new TypeError("argument str must be a string");for(var n={},r=t||{},i=e.split(u),s=r.decode||a,l=0;l<i.length;l++){var c=i[l],p=c.indexOf("=");if(!(p<0)){var f=c.substr(0,p).trim(),h=c.substr(++p,c.length).trim();'"'==h[0]&&(h=h.slice(1,-1)),void 0==n[f]&&(n[f]=o(h,s))}}return n}function i(e,t,n){var r=n||{},i=r.encode||s;if("function"!=typeof i)throw new TypeError("option encode is invalid");if(!l.test(e))throw new TypeError("argument name is invalid");var o=i(t);if(o&&!l.test(o))throw new TypeError("argument val is invalid");var a=e+"="+o;if(null!=r.maxAge){var u=r.maxAge-0;if(isNaN(u))throw new Error("maxAge should be a Number");a+="; Max-Age="+Math.floor(u)}if(r.domain){if(!l.test(r.domain))throw new TypeError("option domain is invalid");a+="; Domain="+r.domain}if(r.path){if(!l.test(r.path))throw new TypeError("option path is invalid");a+="; Path="+r.path}if(r.expires){if("function"!=typeof r.expires.toUTCString)throw new TypeError("option expires is invalid");a+="; Expires="+r.expires.toUTCString()}if(r.httpOnly&&(a+="; HttpOnly"),r.secure&&(a+="; Secure"),r.sameSite){switch("string"==typeof r.sameSite?r.sameSite.toLowerCase():r.sameSite){case!0:a+="; SameSite=Strict";break;case"lax":a+="; SameSite=Lax";break;case"strict":a+="; SameSite=Strict";break;default:throw new TypeError("option sameSite is invalid")}}return a}function o(e,t){try{return t(e)}catch(t){return e}}/*!
-- * cookie
-- * Copyright(c) 2012-2014 Roman Shtylman
-- * Copyright(c) 2015 Douglas Christopher Wilson
-- * MIT Licensed
-- */
--t.parse=r,t.serialize=i;var a=decodeURIComponent,s=encodeURIComponent,u=/; */,l=/^[\u0009\u0020-\u007e\u0080-\u00ff]+$/},function(e,t,n){n(679),n(683),n(690),n(366),n(674),n(675),n(680),n(684),n(686),n(670),n(671),n(672),n(673),n(676),n(677),n(678),n(681),n(682),n(685),n(687),n(688),n(689),n(666),n(667),n(668),n(669),e.exports=n(63).String},function(e,t,n){n(664),n(366),n(693),n(665),n(691),n(692),e.exports=n(63).Promise},function(e,t,n){n(103),n(621),e.exports=n(15).Array.from},function(e,t,n){n(104),n(103),e.exports=n(619)},function(e,t,n){n(104),n(103),e.exports=n(620)},function(e,t,n){var r=n(15),i=r.JSON||(r.JSON={stringify:JSON.stringify});e.exports=function(e){return i.stringify.apply(i,arguments)}},function(e,t,n){n(623),e.exports=n(15).Object.assign},function(e,t,n){n(624);var r=n(15).Object;e.exports=function(e,t){return r.create(e,t)}},function(e,t,n){n(625);var r=n(15).Object;e.exports=function(e,t,n){return r.defineProperty(e,t,n)}},function(e,t,n){n(626),e.exports=n(15).Object.getPrototypeOf},function(e,t,n){n(627),e.exports=n(15).Object.keys},function(e,t,n){n(628),e.exports=n(15).Object.setPrototypeOf},function(e,t,n){n(194),n(103),n(104),n(629),n(632),n(633),e.exports=n(15).Promise},function(e,t,n){n(630),n(194),n(634),n(635),e.exports=n(15).Symbol},function(e,t,n){n(103),n(104),e.exports=n(192).f("iterator")},function(e,t,n){n(194),n(104),n(631),n(637),n(636),e.exports=n(15).WeakMap},function(e,t){e.exports=function(){}},function(e,t,n){var r=n(75),i=n(133),o=n(618);e.exports=function(e){return function(t,n,a){var s,u=r(t),l=i(u.length),c=o(a,l);if(e&&n!=n){for(;l>c;)if((s=u[c++])!=s)return!0}else for(;l>c;c++)if((e||c in u)&&u[c]===n)return e||c||0;return!e&&-1}}},function(e,t,n){var r=n(27),i=n(337),o=n(22)("species");e.exports=function(e){var t;return i(e)&&(t=e.constructor,"function"!=typeof t||t!==Array&&!i(t.prototype)||(t=void 0),r(t)&&null===(t=t[o])&&(t=void 0)),void 0===t?Array:t}},function(e,t,n){var r=n(601);e.exports=function(e,t){return new(r(e))(t)}},function(e,t,n){"use strict";var r=n(185),i=n(131).getWeak,o=n(37),a=n(27),s=n(175),u=n(129),l=n(176),c=n(55),p=n(351),f=l(5),h=l(6),d=0,m=function(e){return e._l||(e._l=new v)},v=function(){this.a=[]},g=function(e,t){return f(e.a,function(e){return e[0]===t})};v.prototype={get:function(e){var t=g(this,e);if(t)return t[1]},has:function(e){return!!g(this,e)},set:function(e,t){var n=g(this,e);n?n[1]=t:this.a.push([e,t])},delete:function(e){var t=h(this.a,function(t){return t[0]===e});return~t&&this.a.splice(t,1),!!~t}},e.exports={getConstructor:function(e,t,n,o){var l=e(function(e,r){s(e,l,t,"_i"),e._t=t,e._i=d++,e._l=void 0,void 0!=r&&u(r,n,e[o],e)});return r(l.prototype,{delete:function(e){if(!a(e))return!1;var n=i(e);return!0===n?m(p(this,t)).delete(e):n&&c(n,this._i)&&delete n[this._i]},has:function(e){if(!a(e))return!1;var n=i(e);return!0===n?m(p(this,t)).has(e):n&&c(n,this._i)}}),l},def:function(e,t,n){var r=i(o(t),!0);return!0===r?m(e).set(t,n):r[e._i]=n,e},ufstore:m}},function(e,t,n){"use strict";var r=n(24),i=n(23),o=n(131),a=n(54),s=n(56),u=n(185),l=n(129),c=n(175),p=n(27),f=n(102),h=n(41).f,d=n(176)(0),m=n(49);e.exports=function(e,t,n,v,g,y){var _=r[e],b=_,x=g?"set":"add",w=b&&b.prototype,k={};return m&&"function"==typeof b&&(y||w.forEach&&!a(function(){(new b).entries().next()}))?(b=t(function(t,n){c(t,b,e,"_c"),t._c=new _,void 0!=n&&l(n,g,t[x],t)}),d("add,clear,delete,forEach,get,has,set,keys,values,entries,toJSON".split(","),function(e){var t="add"==e||"set"==e;e in w&&(!y||"clear"!=e)&&s(b.prototype,e,function(n,r){if(c(this,b,e),!t&&y&&!p(n))return"get"==e&&void 0;var i=this._c[e](0===n?0:n,r);return t?this:i})}),y||h(b.prototype,"size",{get:function(){return this._c.size}})):(b=v.getConstructor(t,e,g,x),u(b.prototype,n),o.NEED=!0),f(b,e),k[e]=b,i(i.G+i.W+i.F,k),y||v.setStrong(b,e,g),b}},function(e,t,n){"use strict";var r=n(41),i=n(101);e.exports=function(e,t,n){t in e?r.f(e,t,i(0,n)):e[t]=n}},function(e,t,n){var r=n(100),i=n(184),o=n(132);e.exports=function(e){var t=r(e),n=i.f;if(n)for(var a,s=n(e),u=o.f,l=0;s.length>l;)u.call(e,a=s[l++])&&t.push(a);return t}},function(e,t){e.exports=function(e,t,n){var r=void 0===n;switch(t.length){case 0:return r?e():e.call(n);case 1:return r?e(t[0]):e.call(n,t[0]);case 2:return r?e(t[0],t[1]):e.call(n,t[0],t[1]);case 3:return r?e(t[0],t[1],t[2]):e.call(n,t[0],t[1],t[2]);case 4:return r?e(t[0],t[1],t[2],t[3]):e.call(n,t[0],t[1],t[2],t[3])}return e.apply(n,t)}},function(e,t,n){"use strict";var r=n(183),i=n(101),o=n(102),a={};n(56)(a,n(22)("iterator"),function(){return this}),e.exports=function(e,t,n){e.prototype=r(a,{next:i(1,n)}),o(e,t+" Iterator")}},function(e,t){e.exports=function(e,t){return{value:t,done:!!e}}},function(e,t,n){var r=n(24),i=n(350).set,o=r.MutationObserver||r.WebKitMutationObserver,a=r.process,s=r.Promise,u="process"==n(99)(a);e.exports=function(){var e,t,n,l=function(){var r,i;for(u&&(r=a.domain)&&r.exit();e;){i=e.fn,e=e.next;try{i()}catch(r){throw e?n():t=void 0,r}}t=void 0,r&&r.enter()};if(u)n=function(){a.nextTick(l)};else if(!o||r.navigator&&r.navigator.standalone)if(s&&s.resolve){var c=s.resolve();n=function(){c.then(l)}}else n=function(){i.call(r,l)};else{var p=!0,f=document.createTextNode("");new o(l).observe(f,{characterData:!0}),n=function(){f.data=p=!p}}return function(r){var i={fn:r,next:void 0};t&&(t.next=i),e||(e=i,n()),t=i}}},function(e,t,n){var r=n(41),i=n(37),o=n(100);e.exports=n(49)?Object.defineProperties:function(e,t){i(e);for(var n,a=o(t),s=a.length,u=0;s>u;)r.f(e,n=a[u++],t[n]);return e}},function(e,t,n){var r=n(75),i=n(343).f,o={}.toString,a="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],s=function(e){try{return i(e)}catch(e){return a.slice()}};e.exports.f=function(e){return a&&"[object Window]"==o.call(e)?s(e):i(r(e))}},function(e,t,n){"use strict";var r=n(23),i=n(98),o=n(53),a=n(129);e.exports=function(e){r(r.S,e,{from:function(e){var t,n,r,s,u=arguments[1];return i(this),t=void 0!==u,t&&i(u),void 0==e?new this:(n=[],t?(r=0,s=o(u,arguments[2],2),a(e,!1,function(e){n.push(s(e,r++))})):a(e,!1,n.push,n),new this(n))}})}},function(e,t,n){"use strict";var r=n(23);e.exports=function(e){r(r.S,e,{of:function(){for(var e=arguments.length,t=new Array(e);e--;)t[e]=arguments[e];return new this(t)}})}},function(e,t,n){var r=n(27),i=n(37),o=function(e,t){if(i(e),!r(t)&&null!==t)throw TypeError(t+": can't set as prototype!")};e.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(e,t,r){try{r=n(53)(Function.call,n(342).f(Object.prototype,"__proto__").set,2),r(e,[]),t=!(e instanceof Array)}catch(e){t=!0}return function(e,n){return o(e,n),t?e.__proto__=n:r(e,n),e}}({},!1):void 0),check:o}},function(e,t,n){"use strict";var r=n(24),i=n(15),o=n(41),a=n(49),s=n(22)("species");e.exports=function(e){var t="function"==typeof i[e]?i[e]:r[e];a&&t&&!t[s]&&o.f(t,s,{configurable:!0,get:function(){return this}})}},function(e,t,n){var r=n(189),i=n(178);e.exports=function(e){return function(t,n){var o,a,s=String(i(t)),u=r(n),l=s.length;return u<0||u>=l?e?"":void 0:(o=s.charCodeAt(u),o<55296||o>56319||u+1===l||(a=s.charCodeAt(u+1))<56320||a>57343?e?s.charAt(u):o:e?s.slice(u,u+2):a-56320+(o-55296<<10)+65536)}}},function(e,t,n){var r=n(189),i=Math.max,o=Math.min;e.exports=function(e,t){return e=r(e),e<0?i(e+t,0):o(e,t)}},function(e,t,n){var r=n(37),i=n(193);e.exports=n(15).getIterator=function(e){var t=i(e);if("function"!=typeof t)throw TypeError(e+" is not iterable!");return r(t.call(e))}},function(e,t,n){var r=n(177),i=n(22)("iterator"),o=n(74);e.exports=n(15).isIterable=function(e){var t=Object(e);return void 0!==t[i]||"@@iterator"in t||o.hasOwnProperty(r(t))}},function(e,t,n){"use strict";var r=n(53),i=n(23),o=n(76),a=n(338),s=n(336),u=n(133),l=n(605),c=n(193);i(i.S+i.F*!n(340)(function(e){Array.from(e)}),"Array",{from:function(e){var t,n,i,p,f=o(e),h="function"==typeof this?this:Array,d=arguments.length,m=d>1?arguments[1]:void 0,v=void 0!==m,g=0,y=c(f);if(v&&(m=r(m,d>2?arguments[2]:void 0,2)),void 0==y||h==Array&&s(y))for(t=u(f.length),n=new h(t);t>g;g++)l(n,g,v?m(f[g],g):f[g]);else for(p=y.call(f),n=new h;!(i=p.next()).done;g++)l(n,g,v?a(p,m,[i.value,g],!0):i.value);return n.length=g,n}})},function(e,t,n){"use strict";var r=n(599),i=n(609),o=n(74),a=n(75);e.exports=n(339)(Array,"Array",function(e,t){this._t=a(e),this._i=0,this._k=t},function(){var e=this._t,t=this._k,n=this._i++;return!e||n>=e.length?(this._t=void 0,i(1)):"keys"==t?i(0,n):"values"==t?i(0,e[n]):i(0,[n,e[n]])},"values"),o.Arguments=o.Array,r("keys"),r("values"),r("entries")},function(e,t,n){var r=n(23);r(r.S+r.F,"Object",{assign:n(341)})},function(e,t,n){var r=n(23);r(r.S,"Object",{create:n(183)})},function(e,t,n){var r=n(23);r(r.S+r.F*!n(49),"Object",{defineProperty:n(41).f})},function(e,t,n){var r=n(76),i=n(344);n(346)("getPrototypeOf",function(){return function(e){return i(r(e))}})},function(e,t,n){var r=n(76),i=n(100);n(346)("keys",function(){return function(e){return i(r(e))}})},function(e,t,n){var r=n(23);r(r.S,"Object",{setPrototypeOf:n(615).set})},function(e,t,n){"use strict";var r,i,o,a,s=n(130),u=n(24),l=n(53),c=n(177),p=n(23),f=n(27),h=n(98),d=n(175),m=n(129),v=n(349),g=n(350).set,y=n(610)(),_=n(182),b=n(347),x=n(348),w=u.TypeError,k=u.process,E=u.Promise,S="process"==c(k),C=function(){},A=i=_.f,D=!!function(){try{var e=E.resolve(1),t=(e.constructor={})[n(22)("species")]=function(e){e(C,C)};return(S||"function"==typeof PromiseRejectionEvent)&&e.then(C)instanceof t}catch(e){}}(),O=function(e){var t;return!(!f(e)||"function"!=typeof(t=e.then))&&t},M=function(e,t){if(!e._n){e._n=!0;var n=e._c;y(function(){for(var r=e._v,i=1==e._s,o=0;n.length>o;)!function(t){var n,o,a=i?t.ok:t.fail,s=t.resolve,u=t.reject,l=t.domain;try{a?(i||(2==e._h&&I(e),e._h=1),!0===a?n=r:(l&&l.enter(),n=a(r),l&&l.exit()),n===t.promise?u(w("Promise-chain cycle")):(o=O(n))?o.call(n,s,u):s(n)):u(r)}catch(e){u(e)}}(n[o++]);e._c=[],e._n=!1,t&&!e._h&&T(e)})}},T=function(e){g.call(u,function(){var t,n,r,i=e._v,o=P(e);if(o&&(t=b(function(){S?k.emit("unhandledRejection",i,e):(n=u.onunhandledrejection)?n({promise:e,reason:i}):(r=u.console)&&r.error&&r.error("Unhandled promise rejection",i)}),e._h=S||P(e)?2:1),e._a=void 0,o&&t.e)throw t.v})},P=function(e){return 1!==e._h&&0===(e._a||e._c).length},I=function(e){g.call(u,function(){var t;S?k.emit("rejectionHandled",e):(t=u.onrejectionhandled)&&t({promise:e,reason:e._v})})},R=function(e){var t=this;t._d||(t._d=!0,t=t._w||t,t._v=e,t._s=2,t._a||(t._a=t._c.slice()),M(t,!0))},j=function(e){var t,n=this;if(!n._d){n._d=!0,n=n._w||n;try{if(n===e)throw w("Promise can't be resolved itself");(t=O(e))?y(function(){var r={_w:n,_d:!1};try{t.call(e,l(j,r,1),l(R,r,1))}catch(e){R.call(r,e)}}):(n._v=e,n._s=1,M(n,!1))}catch(e){R.call({_w:n,_d:!1},e)}}};D||(E=function(e){d(this,E,"Promise","_h"),h(e),r.call(this);try{e(l(j,this,1),l(R,this,1))}catch(e){R.call(this,e)}},r=function(e){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1},r.prototype=n(185)(E.prototype,{then:function(e,t){var n=A(v(this,E));return n.ok="function"!=typeof e||e,n.fail="function"==typeof t&&t,n.domain=S?k.domain:void 0,this._c.push(n),this._a&&this._a.push(n),this._s&&M(this,!1),n.promise},catch:function(e){return this.then(void 0,e)}}),o=function(){var e=new r;this.promise=e,this.resolve=l(j,e,1),this.reject=l(R,e,1)},_.f=A=function(e){return e===E||e===a?new o(e):i(e)}),p(p.G+p.W+p.F*!D,{Promise:E}),n(102)(E,"Promise"),n(616)("Promise"),a=n(15).Promise,p(p.S+p.F*!D,"Promise",{reject:function(e){var t=A(this);return(0,t.reject)(e),t.promise}}),p(p.S+p.F*(s||!D),"Promise",{resolve:function(e){return x(s&&this===a?E:this,e)}}),p(p.S+p.F*!(D&&n(340)(function(e){E.all(e).catch(C)})),"Promise",{all:function(e){var t=this,n=A(t),r=n.resolve,i=n.reject,o=b(function(){var n=[],o=0,a=1;m(e,!1,function(e){var s=o++,u=!1;n.push(void 0),a++,t.resolve(e).then(function(e){u||(u=!0,n[s]=e,--a||r(n))},i)}),--a||r(n)});return o.e&&i(o.v),n.promise},race:function(e){var t=this,n=A(t),r=n.reject,i=b(function(){m(e,!1,function(e){t.resolve(e).then(n.resolve,r)})});return i.e&&r(i.v),n.promise}})},function(e,t,n){"use strict";var r=n(24),i=n(55),o=n(49),a=n(23),s=n(186),u=n(131).KEY,l=n(54),c=n(188),p=n(102),f=n(134),h=n(22),d=n(192),m=n(191),v=n(606),g=n(337),y=n(37),_=n(27),b=n(75),x=n(190),w=n(101),k=n(183),E=n(612),S=n(342),C=n(41),A=n(100),D=S.f,O=C.f,M=E.f,T=r.Symbol,P=r.JSON,I=P&&P.stringify,R=h("_hidden"),j=h("toPrimitive"),F={}.propertyIsEnumerable,N=c("symbol-registry"),B=c("symbols"),L=c("op-symbols"),q=Object.prototype,z="function"==typeof T,U=r.QObject,W=!U||!U.prototype||!U.prototype.findChild,V=o&&l(function(){return 7!=k(O({},"a",{get:function(){return O(this,"a",{value:7}).a}})).a})?function(e,t,n){var r=D(q,t);r&&delete q[t],O(e,t,n),r&&e!==q&&O(q,t,r)}:O,H=function(e){var t=B[e]=k(T.prototype);return t._k=e,t},G=z&&"symbol"==typeof T.iterator?function(e){return"symbol"==typeof e}:function(e){return e instanceof T},J=function(e,t,n){return e===q&&J(L,t,n),y(e),t=x(t,!0),y(n),i(B,t)?(n.enumerable?(i(e,R)&&e[R][t]&&(e[R][t]=!1),n=k(n,{enumerable:w(0,!1)})):(i(e,R)||O(e,R,w(1,{})),e[R][t]=!0),V(e,t,n)):O(e,t,n)},K=function(e,t){y(e);for(var n,r=v(t=b(t)),i=0,o=r.length;o>i;)J(e,n=r[i++],t[n]);return e},X=function(e,t){return void 0===t?k(e):K(k(e),t)},Y=function(e){var t=F.call(this,e=x(e,!0));return!(this===q&&i(B,e)&&!i(L,e))&&(!(t||!i(this,e)||!i(B,e)||i(this,R)&&this[R][e])||t)},$=function(e,t){if(e=b(e),t=x(t,!0),e!==q||!i(B,t)||i(L,t)){var n=D(e,t);return!n||!i(B,t)||i(e,R)&&e[R][t]||(n.enumerable=!0),n}},Z=function(e){for(var t,n=M(b(e)),r=[],o=0;n.length>o;)i(B,t=n[o++])||t==R||t==u||r.push(t);return r},Q=function(e){for(var t,n=e===q,r=M(n?L:b(e)),o=[],a=0;r.length>a;)!i(B,t=r[a++])||n&&!i(q,t)||o.push(B[t]);return o};z||(T=function(){if(this instanceof T)throw TypeError("Symbol is not a constructor!");var e=f(arguments.length>0?arguments[0]:void 0),t=function(n){this===q&&t.call(L,n),i(this,R)&&i(this[R],e)&&(this[R][e]=!1),V(this,e,w(1,n))};return o&&W&&V(q,e,{configurable:!0,set:t}),H(e)},s(T.prototype,"toString",function(){return this._k}),S.f=$,C.f=J,n(343).f=E.f=Z,n(132).f=Y,n(184).f=Q,o&&!n(130)&&s(q,"propertyIsEnumerable",Y,!0),d.f=function(e){return H(h(e))}),a(a.G+a.W+a.F*!z,{Symbol:T});for(var ee="hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","),te=0;ee.length>te;)h(ee[te++]);for(var ne=A(h.store),re=0;ne.length>re;)m(ne[re++]);a(a.S+a.F*!z,"Symbol",{for:function(e){return i(N,e+="")?N[e]:N[e]=T(e)},keyFor:function(e){if(!G(e))throw TypeError(e+" is not a symbol!");for(var t in N)if(N[t]===e)return t},useSetter:function(){W=!0},useSimple:function(){W=!1}}),a(a.S+a.F*!z,"Object",{create:X,defineProperty:J,defineProperties:K,getOwnPropertyDescriptor:$,getOwnPropertyNames:Z,getOwnPropertySymbols:Q}),P&&a(a.S+a.F*(!z||l(function(){var e=T();return"[null]"!=I([e])||"{}"!=I({a:e})||"{}"!=I(Object(e))})),"JSON",{stringify:function(e){for(var t,n,r=[e],i=1;arguments.length>i;)r.push(arguments[i++]);if(n=t=r[1],(_(t)||void 0!==e)&&!G(e))return g(t)||(t=function(e,t){if("function"==typeof n&&(t=n.call(this,e,t)),!G(t))return t}),r[1]=t,I.apply(P,r)}}),T.prototype[j]||n(56)(T.prototype,j,T.prototype.valueOf),p(T,"Symbol"),p(Math,"Math",!0),p(r.JSON,"JSON",!0)},function(e,t,n){"use strict";var r,i=n(176)(0),o=n(186),a=n(131),s=n(341),u=n(603),l=n(27),c=n(54),p=n(351),f=a.getWeak,h=Object.isExtensible,d=u.ufstore,m={},v=function(e){return function(){return e(this,arguments.length>0?arguments[0]:void 0)}},g={get:function(e){if(l(e)){var t=f(e);return!0===t?d(p(this,"WeakMap")).get(e):t?t[this._i]:void 0}},set:function(e,t){return u.def(p(this,"WeakMap"),e,t)}},y=e.exports=n(604)("WeakMap",v,g,u,!0,!0);c(function(){return 7!=(new y).set((Object.freeze||Object)(m),7).get(m)})&&(r=u.getConstructor(v,"WeakMap"),s(r.prototype,g),a.NEED=!0,i(["delete","has","get","set"],function(e){var t=y.prototype,n=t[e];o(t,e,function(t,i){if(l(t)&&!h(t)){this._f||(this._f=new r);var o=this._f[e](t,i);return"set"==e?this:o}return n.call(this,t,i)})}))},function(e,t,n){"use strict";var r=n(23),i=n(15),o=n(24),a=n(349),s=n(348);r(r.P+r.R,"Promise",{finally:function(e){var t=a(this,i.Promise||o.Promise),n="function"==typeof e;return this.then(n?function(n){return s(t,e()).then(function(){return n})}:e,n?function(n){return s(t,e()).then(function(){throw n})}:e)}})},function(e,t,n){"use strict";var r=n(23),i=n(182),o=n(347);r(r.S,"Promise",{try:function(e){var t=i.f(this),n=o(e);return(n.e?t.reject:t.resolve)(n.v),t.promise}})},function(e,t,n){n(191)("asyncIterator")},function(e,t,n){n(191)("observable")},function(e,t,n){n(613)("WeakMap")},function(e,t,n){n(614)("WeakMap")},function(e,t,n){var r=n(19)("unscopables"),i=Array.prototype;void 0==i[r]&&n(64)(i,r,{}),e.exports=function(e){i[r][e]=!0}},function(e,t){e.exports=function(e,t,n,r){if(!(e instanceof t)||void 0!==r&&r in e)throw TypeError(n+": incorrect invocation!");return e}},function(e,t,n){var r=n(140),i=n(110),o=n(365);e.exports=function(e){return function(t,n,a){var s,u=r(t),l=i(u.length),c=o(a,l);if(e&&n!=n){for(;l>c;)if((s=u[c++])!=s)return!0}else for(;l>c;c++)if((e||c in u)&&u[c]===n)return e||c||0;return!e&&-1}}},function(e,t,n){var r=n(136),i=n(646),o=n(645),a=n(62),s=n(110),u=n(662),l={},c={},t=e.exports=function(e,t,n,p,f){var h,d,m,v,g=f?function(){return e}:u(e),y=r(n,p,t?2:1),_=0;if("function"!=typeof g)throw TypeError(e+" is not iterable!");if(o(g)){for(h=s(e.length);h>_;_++)if((v=t?y(a(d=e[_])[0],d[1]):y(e[_]))===l||v===c)return v}else for(m=g.call(e);!(d=m.next()).done;)if((v=i(m,y,d.value,t))===l||v===c)return v};t.BREAK=l,t.RETURN=c},function(e,t,n){e.exports=!n(106)&&!n(107)(function(){return 7!=Object.defineProperty(n(196)("div"),"a",{get:function(){return 7}}).a})},function(e,t){e.exports=function(e,t,n){var r=void 0===n;switch(t.length){case 0:return r?e():e.call(n);case 1:return r?e(t[0]):e.call(n,t[0]);case 2:return r?e(t[0],t[1]):e.call(n,t[0],t[1]);case 3:return r?e(t[0],t[1],t[2]):e.call(n,t[0],t[1],t[2]);case 4:return r?e(t[0],t[1],t[2],t[3]):e.call(n,t[0],t[1],t[2],t[3])}return e.apply(n,t)}},function(e,t,n){var r=n(105);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(e){return"String"==r(e)?e.split(""):Object(e)}},function(e,t,n){var r=n(109),i=n(19)("iterator"),o=Array.prototype;e.exports=function(e){return void 0!==e&&(r.Array===e||o[i]===e)}},function(e,t,n){var r=n(62);e.exports=function(e,t,n,i){try{return i?t(r(n)[0],n[1]):t(n)}catch(t){var o=e.return;throw void 0!==o&&r(o.call(e)),t}}},function(e,t,n){"use strict";var r=n(651),i=n(360),o=n(199),a={};n(64)(a,n(19)("iterator"),function(){return this}),e.exports=function(e,t,n){e.prototype=r(a,{next:i(1,n)}),o(e,t+" Iterator")}},function(e,t,n){var r=n(19)("iterator"),i=!1;try{var o=[7][r]();o.return=function(){i=!0},Array.from(o,function(){throw 2})}catch(e){}e.exports=function(e,t){if(!t&&!i)return!1;var n=!1;try{var o=[7],a=o[r]();a.next=function(){return{done:n=!0}},o[r]=function(){return a},e(o)}catch(e){}return n}},function(e,t){e.exports=function(e,t){return{value:t,done:!!e}}},function(e,t,n){var r=n(31),i=n(364).set,o=r.MutationObserver||r.WebKitMutationObserver,a=r.process,s=r.Promise,u="process"==n(105)(a);e.exports=function(){var e,t,n,l=function(){var r,i;for(u&&(r=a.domain)&&r.exit();e;){i=e.fn,e=e.next;try{i()}catch(r){throw e?n():t=void 0,r}}t=void 0,r&&r.enter()};if(u)n=function(){a.nextTick(l)};else if(!o||r.navigator&&r.navigator.standalone)if(s&&s.resolve){var c=s.resolve();n=function(){c.then(l)}}else n=function(){i.call(r,l)};else{var p=!0,f=document.createTextNode("");new o(l).observe(f,{characterData:!0}),n=function(){f.data=p=!p}}return function(r){var i={fn:r,next:void 0};t&&(t.next=i),e||(e=i,n()),t=i}}},function(e,t,n){var r=n(62),i=n(652),o=n(352),a=n(200)("IE_PROTO"),s=function(){},u=function(){var e,t=n(196)("iframe"),r=o.length;for(t.style.display="none",n(353).appendChild(t),t.src="javascript:",e=t.contentWindow.document,e.open(),e.write("<script>document.F=Object<\/script>"),e.close(),u=e.F;r--;)delete u.prototype[o[r]];return u()};e.exports=Object.create||function(e,t){var n;return null!==e?(s.prototype=r(e),n=new s,s.prototype=null,n[a]=e):n=u(),void 0===t?n:i(n,t)}},function(e,t,n){var r=n(138),i=n(62),o=n(357);e.exports=n(106)?Object.defineProperties:function(e,t){i(e);for(var n,a=o(t),s=a.length,u=0;s>u;)r.f(e,n=a[u++],t[n]);return e}},function(e,t,n){var r=n(108),i=n(660),o=n(200)("IE_PROTO"),a=Object.prototype;e.exports=Object.getPrototypeOf||function(e){return e=i(e),r(e,o)?e[o]:"function"==typeof e.constructor&&e instanceof e.constructor?e.constructor.prototype:e instanceof Object?a:null}},function(e,t,n){var r=n(108),i=n(140),o=n(640)(!1),a=n(200)("IE_PROTO");e.exports=function(e,t){var n,s=i(e),u=0,l=[];for(n in s)n!=a&&r(s,n)&&l.push(n);for(;t.length>u;)r(s,n=t[u++])&&(~o(l,n)||l.push(n));return l}},function(e,t,n){var r=n(78);e.exports=function(e,t,n){for(var i in t)r(e,i,t[i],n);return e}},function(e,t,n){"use strict";var r=n(31),i=n(138),o=n(106),a=n(19)("species");e.exports=function(e){var t=r[e];o&&t&&!t[a]&&i.f(t,a,{configurable:!0,get:function(){return this}})}},function(e,t,n){"use strict";var r=n(139),i=n(57);e.exports=function(e){var t=String(i(this)),n="",o=r(e);if(o<0||o==1/0)throw RangeError("Count can't be negative");for(;o>0;(o>>>=1)&&(t+=t))1&o&&(n+=t);return n}},function(e,t,n){var r=n(28),i=n(57),o=n(107),a=n(659),s="["+a+"]",u="​…",l=RegExp("^"+s+s+"*"),c=RegExp(s+s+"*$"),p=function(e,t,n){var i={},s=o(function(){return!!a[e]()||u[e]()!=u}),l=i[e]=s?t(f):a[e];n&&(i[n]=l),r(r.P+r.F*s,"String",i)},f=p.trim=function(e,t){return e=String(i(e)),1&t&&(e=e.replace(l,"")),2&t&&(e=e.replace(c,"")),e};e.exports=p},function(e,t){e.exports="\t\n\v\f\r   ᠎             　\u2028\u2029\ufeff"},function(e,t,n){var r=n(57);e.exports=function(e){return Object(r(e))}},function(e,t,n){var r=n(77);e.exports=function(e,t){if(!r(e))return e;var n,i;if(t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i;if("function"==typeof(n=e.valueOf)&&!r(i=n.call(e)))return i;if(!t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i;throw TypeError("Can't convert object to primitive value")}},function(e,t,n){var r=n(195),i=n(19)("iterator"),o=n(109);e.exports=n(63).getIteratorMethod=function(e){if(void 0!=e)return e[i]||e["@@iterator"]||o[r(e)]}},function(e,t,n){"use strict";var r=n(638),i=n(649),o=n(109),a=n(140);e.exports=n(355)(Array,"Array",function(e,t){this._t=a(e),this._i=0,this._k=t},function(){var e=this._t,t=this._k,n=this._i++;return!e||n>=e.length?(this._t=void 0,i(1)):"keys"==t?i(0,n):"values"==t?i(0,e[n]):i(0,[n,e[n]])},"values"),o.Arguments=o.Array,r("keys"),r("values"),r("entries")},function(e,t,n){"use strict";var r=n(195),i={};i[n(19)("toStringTag")]="z",i+""!="[object z]"&&n(78)(Object.prototype,"toString",function(){return"[object "+r(this)+"]"},!0)},function(e,t,n){"use strict";var r,i,o,a,s=n(356),u=n(31),l=n(136),c=n(195),p=n(28),f=n(77),h=n(135),d=n(639),m=n(641),v=n(362),g=n(364).set,y=n(650)(),_=n(198),b=n(358),x=n(359),w=u.TypeError,k=u.process,E=u.Promise,S="process"==c(k),C=function(){},A=i=_.f,D=!!function(){try{var e=E.resolve(1),t=(e.constructor={})[n(19)("species")]=function(e){e(C,C)};return(S||"function"==typeof PromiseRejectionEvent)&&e.then(C)instanceof t}catch(e){}}(),O=function(e){var t;return!(!f(e)||"function"!=typeof(t=e.then))&&t},M=function(e,t){if(!e._n){e._n=!0;var n=e._c;y(function(){for(var r=e._v,i=1==e._s,o=0;n.length>o;)!function(t){var n,o,a=i?t.ok:t.fail,s=t.resolve,u=t.reject,l=t.domain;try{a?(i||(2==e._h&&I(e),e._h=1),!0===a?n=r:(l&&l.enter(),n=a(r),l&&l.exit()),n===t.promise?u(w("Promise-chain cycle")):(o=O(n))?o.call(n,s,u):s(n)):u(r)}catch(e){u(e)}}(n[o++]);e._c=[],e._n=!1,t&&!e._h&&T(e)})}},T=function(e){g.call(u,function(){var t,n,r,i=e._v,o=P(e);if(o&&(t=b(function(){S?k.emit("unhandledRejection",i,e):(n=u.onunhandledrejection)?n({promise:e,reason:i}):(r=u.console)&&r.error&&r.error("Unhandled promise rejection",i)}),e._h=S||P(e)?2:1),e._a=void 0,o&&t.e)throw t.v})},P=function(e){return 1!==e._h&&0===(e._a||e._c).length},I=function(e){g.call(u,function(){var t;S?k.emit("rejectionHandled",e):(t=u.onrejectionhandled)&&t({promise:e,reason:e._v})})},R=function(e){var t=this;t._d||(t._d=!0,t=t._w||t,t._v=e,t._s=2,t._a||(t._a=t._c.slice()),M(t,!0))},j=function(e){var t,n=this;if(!n._d){n._d=!0,n=n._w||n;try{if(n===e)throw w("Promise can't be resolved itself");(t=O(e))?y(function(){var r={_w:n,_d:!1};try{t.call(e,l(j,r,1),l(R,r,1))}catch(e){R.call(r,e)}}):(n._v=e,n._s=1,M(n,!1))}catch(e){R.call({_w:n,_d:!1},e)}}};D||(E=function(e){d(this,E,"Promise","_h"),h(e),r.call(this);try{e(l(j,this,1),l(R,this,1))}catch(e){R.call(this,e)}},r=function(e){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1},r.prototype=n(655)(E.prototype,{then:function(e,t){var n=A(v(this,E));return n.ok="function"!=typeof e||e,n.fail="function"==typeof t&&t,n.domain=S?k.domain:void 0,this._c.push(n),this._a&&this._a.push(n),this._s&&M(this,!1),n.promise},catch:function(e){return this.then(void 0,e)}}),o=function(){var e=new r;this.promise=e,this.resolve=l(j,e,1),this.reject=l(R,e,1)},_.f=A=function(e){return e===E||e===a?new o(e):i(e)}),p(p.G+p.W+p.F*!D,{Promise:E}),n(199)(E,"Promise"),n(656)("Promise"),a=n(63).Promise,p(p.S+p.F*!D,"Promise",{reject:function(e){var t=A(this);return(0,t.reject)(e),t.promise}}),p(p.S+p.F*(s||!D),"Promise",{resolve:function(e){return x(s&&this===a?E:this,e)}}),p(p.S+p.F*!(D&&n(648)(function(e){E.all(e).catch(C)})),"Promise",{all:function(e){var t=this,n=A(t),r=n.resolve,i=n.reject,o=b(function(){var n=[],o=0,a=1;m(e,!1,function(e){var s=o++,u=!1;n.push(void 0),a++,t.resolve(e).then(function(e){u||(u=!0,n[s]=e,--a||r(n))},i)}),--a||r(n)});return o.e&&i(o.v),n.promise},race:function(e){var t=this,n=A(t),r=n.reject,i=b(function(){m(e,!1,function(e){t.resolve(e).then(n.resolve,r)})});return i.e&&r(i.v),n.promise}})},function(e,t,n){n(137)("match",1,function(e,t,n){return[function(n){"use strict";var r=e(this),i=void 0==n?void 0:n[t];return void 0!==i?i.call(n,r):new RegExp(n)[t](String(r))},n]})},function(e,t,n){n(137)("replace",2,function(e,t,n){return[function(r,i){"use strict";var o=e(this),a=void 0==r?void 0:r[t];return void 0!==a?a.call(r,o,i):n.call(String(o),r,i)},n]})},function(e,t,n){n(137)("search",1,function(e,t,n){return[function(n){"use strict";var r=e(this),i=void 0==n?void 0:n[t];return void 0!==i?i.call(n,r):new RegExp(n)[t](String(r))},n]})},function(e,t,n){n(137)("split",2,function(e,t,r){"use strict";var i=n(354),o=r,a=[].push,s="length";if("c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1)[s]||2!="ab".split(/(?:ab)*/)[s]||4!=".".split(/(.?)(.?)/)[s]||".".split(/()()/)[s]>1||"".split(/.?/)[s]){var u=void 0===/()??/.exec("")[1];r=function(e,t){var n=String(this);if(void 0===e&&0===t)return[];if(!i(e))return o.call(n,e,t);var r,l,c,p,f,h=[],d=(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.unicode?"u":"")+(e.sticky?"y":""),m=0,v=void 0===t?4294967295:t>>>0,g=new RegExp(e.source,d+"g");for(u||(r=new RegExp("^"+g.source+"$(?!\\s)",d));(l=g.exec(n))&&!((c=l.index+l[0][s])>m&&(h.push(n.slice(m,l.index)),!u&&l[s]>1&&l[0].replace(r,function(){for(f=1;f<arguments[s]-2;f++)void 0===arguments[f]&&(l[f]=void 0)}),l[s]>1&&l.index<n[s]&&a.apply(h,l.slice(1)),p=l[0][s],m=c,h[s]>=v));)g.lastIndex===l.index&&g.lastIndex++;return m===n[s]?!p&&g.test("")||h.push(""):h.push(n.slice(m)),h[s]>v?h.slice(0,v):h}}else"0".split(void 0,0)[s]&&(r=function(e,t){return void 0===e&&0===t?[]:o.call(this,e,t)});return[function(n,i){var o=e(this),a=void 0==n?void 0:n[t];return void 0!==a?a.call(n,o,i):r.call(String(o),n,i)},r]})},function(e,t,n){"use strict";n(29)("anchor",function(e){return function(t){return e(this,"a","name",t)}})},function(e,t,n){"use strict";n(29)("big",function(e){return function(){return e(this,"big","","")}})},function(e,t,n){"use strict";n(29)("blink",function(e){return function(){return e(this,"blink","","")}})},function(e,t,n){"use strict";n(29)("bold",function(e){return function(){return e(this,"b","","")}})},function(e,t,n){"use strict";var r=n(28),i=n(363)(!1);r(r.P,"String",{codePointAt:function(e){return i(this,e)}})},function(e,t,n){"use strict";var r=n(28),i=n(110),o=n(201),a="".endsWith;r(r.P+r.F*n(197)("endsWith"),"String",{endsWith:function(e){var t=o(this,e,"endsWith"),n=arguments.length>1?arguments[1]:void 0,r=i(t.length),s=void 0===n?r:Math.min(i(n),r),u=String(e);return a?a.call(t,u,s):t.slice(s-u.length,s)===u}})},function(e,t,n){"use strict";n(29)("fixed",function(e){return function(){return e(this,"tt","","")}})},function(e,t,n){"use strict";n(29)("fontcolor",function(e){return function(t){return e(this,"font","color",t)}})},function(e,t,n){"use strict";n(29)("fontsize",function(e){return function(t){return e(this,"font","size",t)}})},function(e,t,n){var r=n(28),i=n(365),o=String.fromCharCode,a=String.fromCodePoint;r(r.S+r.F*(!!a&&1!=a.length),"String",{fromCodePoint:function(e){for(var t,n=[],r=arguments.length,a=0;r>a;){if(t=+arguments[a++],i(t,1114111)!==t)throw RangeError(t+" is not a valid code point");n.push(t<65536?o(t):o(55296+((t-=65536)>>10),t%1024+56320))}return n.join("")}})},function(e,t,n){"use strict";var r=n(28),i=n(201);r(r.P+r.F*n(197)("includes"),"String",{includes:function(e){return!!~i(this,e,"includes").indexOf(e,arguments.length>1?arguments[1]:void 0)}})},function(e,t,n){"use strict";n(29)("italics",function(e){return function(){return e(this,"i","","")}})},function(e,t,n){"use strict";n(29)("link",function(e){return function(t){return e(this,"a","href",t)}})},function(e,t,n){var r=n(28),i=n(140),o=n(110);r(r.S,"String",{raw:function(e){for(var t=i(e.raw),n=o(t.length),r=arguments.length,a=[],s=0;n>s;)a.push(String(t[s++])),s<r&&a.push(String(arguments[s]));return a.join("")}})},function(e,t,n){var r=n(28);r(r.P,"String",{repeat:n(657)})},function(e,t,n){"use strict";n(29)("small",function(e){return function(){return e(this,"small","","")}})},function(e,t,n){"use strict";var r=n(28),i=n(110),o=n(201),a="".startsWith;r(r.P+r.F*n(197)("startsWith"),"String",{startsWith:function(e){var t=o(this,e,"startsWith"),n=i(Math.min(arguments.length>1?arguments[1]:void 0,t.length)),r=String(e);return a?a.call(t,r,n):t.slice(n,n+r.length)===r}})},function(e,t,n){"use strict";n(29)("strike",function(e){return function(){return e(this,"strike","","")}})},function(e,t,n){"use strict";n(29)("sub",function(e){return function(){return e(this,"sub","","")}})},function(e,t,n){"use strict";n(29)("sup",function(e){return function(){return e(this,"sup","","")}})},function(e,t,n){"use strict";n(658)("trim",function(e){return function(){return e(this,3)}})},function(e,t,n){"use strict";var r=n(28),i=n(63),o=n(31),a=n(362),s=n(359);r(r.P+r.R,"Promise",{finally:function(e){var t=a(this,i.Promise||o.Promise),n="function"==typeof e;return this.then(n?function(n){return s(t,e()).then(function(){return n})}:e,n?function(n){return s(t,e()).then(function(){throw n})}:e)}})},function(e,t,n){"use strict";var r=n(28),i=n(198),o=n(358);r(r.S,"Promise",{try:function(e){var t=i.f(this),n=o(e);return(n.e?t.reject:t.resolve)(n.v),t.promise}})},function(e,t,n){for(var r=n(663),i=n(357),o=n(78),a=n(31),s=n(64),u=n(109),l=n(19),c=l("iterator"),p=l("toStringTag"),f=u.Array,h={CSSRuleList:!0,CSSStyleDeclaration:!1,CSSValueList:!1,ClientRectList:!1,DOMRectList:!1,DOMStringList:!1,DOMTokenList:!0,DataTransferItemList:!1,FileList:!1,HTMLAllCollection:!1,HTMLCollection:!1,HTMLFormElement:!1,HTMLSelectElement:!1,MediaList:!0,MimeTypeArray:!1,NamedNodeMap:!1,NodeList:!0,PaintRequestList:!1,Plugin:!1,PluginArray:!1,SVGLengthList:!1,SVGNumberList:!1,SVGPathSegList:!1,SVGPointList:!1,SVGStringList:!1,SVGTransformList:!1,SourceBufferList:!1,StyleSheetList:!0,TextTrackCueList:!1,TextTrackList:!1,TouchList:!1},d=i(h),m=0;m<d.length;m++){var v,g=d[m],y=h[g],_=a[g],b=_&&_.prototype;if(b&&(b[c]||s(b,c,f),b[p]||s(b,p,g),u[g]=f,y))for(v in r)b[v]||o(b,v,r[v],!0)}},function(e,t,n){"use strict";function r(e){return e}function i(e,t,n){function i(e,t){var n=y.hasOwnProperty(t)?y[t]:null;w.hasOwnProperty(t)&&s("OVERRIDE_BASE"===n,"ReactClassInterface: You are attempting to override `%s` from your class specification. Ensure that your method names do not overlap with React methods.",t),e&&s("DEFINE_MANY"===n||"DEFINE_MANY_MERGED"===n,"ReactClassInterface: You are attempting to define `%s` on your component more than once. This conflict may be due to a mixin.",t)}function l(e,n){if(n){s("function"!=typeof n,"ReactClass: You're attempting to use a component class or function as a mixin. Instead, just use a regular object."),s(!t(n),"ReactClass: You're attempting to use a component as a mixin. Instead, just use a regular object.");var r=e.prototype,o=r.__reactAutoBindPairs;n.hasOwnProperty(u)&&_.mixins(e,n.mixins);for(var a in n)if(n.hasOwnProperty(a)&&a!==u){var l=n[a],c=r.hasOwnProperty(a);if(i(c,a),_.hasOwnProperty(a))_[a](e,l);else{var p=y.hasOwnProperty(a),d="function"==typeof l,m=d&&!p&&!c&&!1!==n.autobind;if(m)o.push(a,l),r[a]=l;else if(c){var v=y[a];s(p&&("DEFINE_MANY_MERGED"===v||"DEFINE_MANY"===v),"ReactClass: Unexpected spec policy %s for key %s when mixing in component specs.",v,a),"DEFINE_MANY_MERGED"===v?r[a]=f(r[a],l):"DEFINE_MANY"===v&&(r[a]=h(r[a],l))}else r[a]=l}}}else;}function c(e,t){if(t)for(var n in t){var r=t[n];if(t.hasOwnProperty(n)){var i=n in _;s(!i,'ReactClass: You are attempting to define a reserved property, `%s`, that shouldn\'t be on the "statics" key. Define it as an instance property instead; it will still be accessible on the constructor.',n);var o=n in e;s(!o,"ReactClass: You are attempting to define `%s` on your component more than once. This conflict may be due to a mixin.",n),e[n]=r}}}function p(e,t){s(e&&t&&"object"==typeof e&&"object"==typeof t,"mergeIntoWithNoDuplicateKeys(): Cannot merge non-objects.");for(var n in t)t.hasOwnProperty(n)&&(s(void 0===e[n],"mergeIntoWithNoDuplicateKeys(): Tried to merge two objects with the same key: `%s`. This conflict may be due to a mixin; in particular, this may be caused by two getInitialState() or getDefaultProps() methods returning objects with clashing keys.",n),e[n]=t[n]);return e}function f(e,t){return function(){var n=e.apply(this,arguments),r=t.apply(this,arguments);if(null==n)return r;if(null==r)return n;var i={};return p(i,n),p(i,r),i}}function h(e,t){return function(){e.apply(this,arguments),t.apply(this,arguments)}}function d(e,t){var n=t.bind(e);return n}function m(e){for(var t=e.__reactAutoBindPairs,n=0;n<t.length;n+=2){var r=t[n],i=t[n+1];e[r]=d(e,i)}}function v(e){var t=r(function(e,r,i){this.__reactAutoBindPairs.length&&m(this),this.props=e,this.context=r,this.refs=a,this.updater=i||n,this.state=null;var o=this.getInitialState?this.getInitialState():null;s("object"==typeof o&&!Array.isArray(o),"%s.getInitialState(): must return an object or null",t.displayName||"ReactCompositeComponent"),this.state=o});t.prototype=new k,t.prototype.constructor=t,t.prototype.__reactAutoBindPairs=[],g.forEach(l.bind(null,t)),l(t,b),l(t,e),l(t,x),t.getDefaultProps&&(t.defaultProps=t.getDefaultProps()),s(t.prototype.render,"createClass(...): Class specification must implement a `render` method.");for(var i in y)t.prototype[i]||(t.prototype[i]=null);return t}var g=[],y={mixins:"DEFINE_MANY",statics:"DEFINE_MANY",propTypes:"DEFINE_MANY",contextTypes:"DEFINE_MANY",childContextTypes:"DEFINE_MANY",getDefaultProps:"DEFINE_MANY_MERGED",getInitialState:"DEFINE_MANY_MERGED",getChildContext:"DEFINE_MANY_MERGED",render:"DEFINE_ONCE",componentWillMount:"DEFINE_MANY",componentDidMount:"DEFINE_MANY",componentWillReceiveProps:"DEFINE_MANY",shouldComponentUpdate:"DEFINE_ONCE",componentWillUpdate:"DEFINE_MANY",componentDidUpdate:"DEFINE_MANY",componentWillUnmount:"DEFINE_MANY",updateComponent:"OVERRIDE_BASE"},_={displayName:function(e,t){e.displayName=t},mixins:function(e,t){if(t)for(var n=0;n<t.length;n++)l(e,t[n])},childContextTypes:function(e,t){e.childContextTypes=o({},e.childContextTypes,t)},contextTypes:function(e,t){e.contextTypes=o({},e.contextTypes,t)},getDefaultProps:function(e,t){e.getDefaultProps?e.getDefaultProps=f(e.getDefaultProps,t):e.getDefaultProps=t},propTypes:function(e,t){e.propTypes=o({},e.propTypes,t)},statics:function(e,t){c(e,t)},autobind:function(){}},b={componentDidMount:function(){this.__isMounted=!0}},x={componentWillUnmount:function(){this.__isMounted=!1}},w={replaceState:function(e,t){this.updater.enqueueReplaceState(this,e,t)},isMounted:function(){return!!this.__isMounted}},k=function(){};return o(k.prototype,e.prototype,w),v}var o=n(13),a=n(144),s=n(8),u="mixins";e.exports=i},function(e,t){!function(e){"use strict";function t(e){if("string"!=typeof e&&(e=String(e)),/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(e))throw new TypeError("Invalid character in header field name");return e.toLowerCase()}function n(e){return"string"!=typeof e&&(e=String(e)),e}function r(e){var t={next:function(){var t=e.shift();return{done:void 0===t,value:t}}};return g.iterable&&(t[Symbol.iterator]=function(){return t}),t}function i(e){this.map={},e instanceof i?e.forEach(function(e,t){this.append(t,e)},this):Array.isArray(e)?e.forEach(function(e){this.append(e[0],e[1])},this):e&&Object.getOwnPropertyNames(e).forEach(function(t){this.append(t,e[t])},this)}function o(e){if(e.bodyUsed)return Promise.reject(new TypeError("Already read"));e.bodyUsed=!0}function a(e){return new Promise(function(t,n){e.onload=function(){t(e.result)},e.onerror=function(){n(e.error)}})}function s(e){var t=new FileReader,n=a(t);return t.readAsArrayBuffer(e),n}function u(e){var t=new FileReader,n=a(t);return t.readAsText(e),n}function l(e){for(var t=new Uint8Array(e),n=new Array(t.length),r=0;r<t.length;r++)n[r]=String.fromCharCode(t[r]);return n.join("")}function c(e){if(e.slice)return e.slice(0);var t=new Uint8Array(e.byteLength);return t.set(new Uint8Array(e)),t.buffer}function p(){return this.bodyUsed=!1,this._initBody=function(e){if(this._bodyInit=e,e)if("string"==typeof e)this._bodyText=e;else if(g.blob&&Blob.prototype.isPrototypeOf(e))this._bodyBlob=e;else if(g.formData&&FormData.prototype.isPrototypeOf(e))this._bodyFormData=e;else if(g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e))this._bodyText=e.toString();else if(g.arrayBuffer&&g.blob&&_(e))this._bodyArrayBuffer=c(e.buffer),this._bodyInit=new Blob([this._bodyArrayBuffer]);else{if(!g.arrayBuffer||!ArrayBuffer.prototype.isPrototypeOf(e)&&!b(e))throw new Error("unsupported BodyInit type");this._bodyArrayBuffer=c(e)}else this._bodyText="";this.headers.get("content-type")||("string"==typeof e?this.headers.set("content-type","text/plain;charset=UTF-8"):this._bodyBlob&&this._bodyBlob.type?this.headers.set("content-type",this._bodyBlob.type):g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e)&&this.headers.set("content-type","application/x-www-form-urlencoded;charset=UTF-8"))},g.blob&&(this.blob=function(){var e=o(this);if(e)return e;if(this._bodyBlob)return Promise.resolve(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(new Blob([this._bodyArrayBuffer]));if(this._bodyFormData)throw new Error("could not read FormData body as blob");return Promise.resolve(new Blob([this._bodyText]))},this.arrayBuffer=function(){return this._bodyArrayBuffer?o(this)||Promise.resolve(this._bodyArrayBuffer):this.blob().then(s)}),this.text=function(){var e=o(this);if(e)return e;if(this._bodyBlob)return u(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(l(this._bodyArrayBuffer));if(this._bodyFormData)throw new Error("could not read FormData body as text");return Promise.resolve(this._bodyText)},g.formData&&(this.formData=function(){return this.text().then(d)}),this.json=function(){return this.text().then(JSON.parse)},this}function f(e){var t=e.toUpperCase();return x.indexOf(t)>-1?t:e}function h(e,t){var n=(t=t||{}).body;if(e instanceof h){if(e.bodyUsed)throw new TypeError("Already read");this.url=e.url,this.credentials=e.credentials,t.headers||(this.headers=new i(e.headers)),this.method=e.method,this.mode=e.mode,n||null==e._bodyInit||(n=e._bodyInit,e.bodyUsed=!0)}else this.url=String(e);if(this.credentials=t.credentials||this.credentials||"omit",!t.headers&&this.headers||(this.headers=new i(t.headers)),this.method=f(t.method||this.method||"GET"),this.mode=t.mode||this.mode||null,this.referrer=null,("GET"===this.method||"HEAD"===this.method)&&n)throw new TypeError("Body not allowed for GET or HEAD requests");this._initBody(n)}function d(e){var t=new FormData;return e.trim().split("&").forEach(function(e){if(e){var n=e.split("="),r=n.shift().replace(/\+/g," "),i=n.join("=").replace(/\+/g," ");t.append(decodeURIComponent(r),decodeURIComponent(i))}}),t}function m(e){var t=new i;return e.split(/\r?\n/).forEach(function(e){var n=e.split(":"),r=n.shift().trim();if(r){var i=n.join(":").trim();t.append(r,i)}}),t}function v(e,t){t||(t={}),this.type="default",this.status="status"in t?t.status:200,this.ok=this.status>=200&&this.status<300,this.statusText="statusText"in t?t.statusText:"OK",this.headers=new i(t.headers),this.url=t.url||"",this._initBody(e)}if(!e.fetch){var g={searchParams:"URLSearchParams"in e,iterable:"Symbol"in e&&"iterator"in Symbol,blob:"FileReader"in e&&"Blob"in e&&function(){try{return new Blob,!0}catch(e){return!1}}(),formData:"FormData"in e,arrayBuffer:"ArrayBuffer"in e};if(g.arrayBuffer)var y=["[object Int8Array]","[object Uint8Array]","[object Uint8ClampedArray]","[object Int16Array]","[object Uint16Array]","[object Int32Array]","[object Uint32Array]","[object Float32Array]","[object Float64Array]"],_=function(e){return e&&DataView.prototype.isPrototypeOf(e)},b=ArrayBuffer.isView||function(e){return e&&y.indexOf(Object.prototype.toString.call(e))>-1};i.prototype.append=function(e,r){e=t(e),r=n(r);var i=this.map[e];this.map[e]=i?i+","+r:r},i.prototype.delete=function(e){delete this.map[t(e)]},i.prototype.get=function(e){return e=t(e),this.has(e)?this.map[e]:null},i.prototype.has=function(e){return this.map.hasOwnProperty(t(e))},i.prototype.set=function(e,r){this.map[t(e)]=n(r)},i.prototype.forEach=function(e,t){for(var n in this.map)this.map.hasOwnProperty(n)&&e.call(t,this.map[n],n,this)},i.prototype.keys=function(){var e=[];return this.forEach(function(t,n){e.push(n)}),r(e)},i.prototype.values=function(){var e=[];return this.forEach(function(t){e.push(t)}),r(e)},i.prototype.entries=function(){var e=[];return this.forEach(function(t,n){e.push([n,t])}),r(e)},g.iterable&&(i.prototype[Symbol.iterator]=i.prototype.entries);var x=["DELETE","GET","HEAD","OPTIONS","POST","PUT"];h.prototype.clone=function(){return new h(this,{body:this._bodyInit})},p.call(h.prototype),p.call(v.prototype),v.prototype.clone=function(){return new v(this._bodyInit,{status:this.status,statusText:this.statusText,headers:new i(this.headers),url:this.url})},v.error=function(){var e=new v(null,{status:0,statusText:""});return e.type="error",e};var w=[301,302,303,307,308];v.redirect=function(e,t){if(-1===w.indexOf(t))throw new RangeError("Invalid status code");return new v(null,{status:t,headers:{location:e}})},e.Headers=i,e.Request=h,e.Response=v,e.fetch=function(e,t){return new Promise(function(n,r){var i=new h(e,t),o=new XMLHttpRequest;o.onload=function(){var e={status:o.status,statusText:o.statusText,headers:m(o.getAllResponseHeaders()||"")};e.url="responseURL"in o?o.responseURL:e.headers.get("X-Request-URL");var t="response"in o?o.response:o.responseText;n(new v(t,e))},o.onerror=function(){r(new TypeError("Network request failed"))},o.ontimeout=function(){r(new TypeError("Network request failed"))},o.open(i.method,i.url,!0),"include"===i.credentials&&(o.withCredentials=!0),"responseType"in o&&g.blob&&(o.responseType="blob"),i.headers.forEach(function(e,t){o.setRequestHeader(t,e)}),o.send(void 0===i._bodyInit?null:i._bodyInit)})},e.fetch.polyfill=!0}}("undefined"!=typeof self?self:this)},function(e,t){var n={};!function(e){"use strict";function t(e){if("string"!=typeof e&&(e=String(e)),/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(e))throw new TypeError("Invalid character in header field name");return e.toLowerCase()}function n(e){return"string"!=typeof e&&(e=String(e)),e}function r(e){var t={next:function(){var t=e.shift();return{done:void 0===t,value:t}}};return g.iterable&&(t[Symbol.iterator]=function(){return t}),t}function i(e){this.map={},e instanceof i?e.forEach(function(e,t){this.append(t,e)},this):Array.isArray(e)?e.forEach(function(e){this.append(e[0],e[1])},this):e&&Object.getOwnPropertyNames(e).forEach(function(t){this.append(t,e[t])},this)}function o(e){if(e.bodyUsed)return Promise.reject(new TypeError("Already read"));e.bodyUsed=!0}function a(e){return new Promise(function(t,n){e.onload=function(){t(e.result)},e.onerror=function(){n(e.error)}})}function s(e){var t=new FileReader,n=a(t);return t.readAsArrayBuffer(e),n}function u(e){var t=new FileReader,n=a(t);return t.readAsText(e),n}function l(e){for(var t=new Uint8Array(e),n=new Array(t.length),r=0;r<t.length;r++)n[r]=String.fromCharCode(t[r]);return n.join("")}function c(e){if(e.slice)return e.slice(0);var t=new Uint8Array(e.byteLength);return t.set(new Uint8Array(e)),t.buffer}function p(){return this.bodyUsed=!1,this._initBody=function(e){if(this._bodyInit=e,e)if("string"==typeof e)this._bodyText=e;else if(g.blob&&Blob.prototype.isPrototypeOf(e))this._bodyBlob=e;else if(g.formData&&FormData.prototype.isPrototypeOf(e))this._bodyFormData=e;else if(g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e))this._bodyText=e.toString();else if(g.arrayBuffer&&g.blob&&_(e))this._bodyArrayBuffer=c(e.buffer),this._bodyInit=new Blob([this._bodyArrayBuffer]);else{if(!g.arrayBuffer||!ArrayBuffer.prototype.isPrototypeOf(e)&&!b(e))throw new Error("unsupported BodyInit type");this._bodyArrayBuffer=c(e)}else this._bodyText="";this.headers.get("content-type")||("string"==typeof e?this.headers.set("content-type","text/plain;charset=UTF-8"):this._bodyBlob&&this._bodyBlob.type?this.headers.set("content-type",this._bodyBlob.type):g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e)&&this.headers.set("content-type","application/x-www-form-urlencoded;charset=UTF-8"))},g.blob&&(this.blob=function(){var e=o(this);if(e)return e;if(this._bodyBlob)return Promise.resolve(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(new Blob([this._bodyArrayBuffer]));if(this._bodyFormData)throw new Error("could not read FormData body as blob");return Promise.resolve(new Blob([this._bodyText]))},this.arrayBuffer=function(){return this._bodyArrayBuffer?o(this)||Promise.resolve(this._bodyArrayBuffer):this.blob().then(s)}),this.text=function(){var e=o(this);if(e)return e;if(this._bodyBlob)return u(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(l(this._bodyArrayBuffer));if(this._bodyFormData)throw new Error("could not read FormData body as text");return Promise.resolve(this._bodyText)},g.formData&&(this.formData=function(){return this.text().then(d)}),this.json=function(){return this.text().then(JSON.parse)},this}function f(e){var t=e.toUpperCase();return x.indexOf(t)>-1?t:e}function h(e,t){var n=(t=t||{}).body;if(e instanceof h){if(e.bodyUsed)throw new TypeError("Already read");this.url=e.url,this.credentials=e.credentials,t.headers||(this.headers=new i(e.headers)),this.method=e.method,this.mode=e.mode,n||null==e._bodyInit||(n=e._bodyInit,e.bodyUsed=!0)}else this.url=String(e);if(this.credentials=t.credentials||this.credentials||"omit",!t.headers&&this.headers||(this.headers=new i(t.headers)),this.method=f(t.method||this.method||"GET"),this.mode=t.mode||this.mode||null,this.referrer=null,("GET"===this.method||"HEAD"===this.method)&&n)throw new TypeError("Body not allowed for GET or HEAD requests");this._initBody(n)}function d(e){var t=new FormData;return e.trim().split("&").forEach(function(e){if(e){var n=e.split("="),r=n.shift().replace(/\+/g," "),i=n.join("=").replace(/\+/g," ");t.append(decodeURIComponent(r),decodeURIComponent(i))}}),t}function m(e){var t=new i;return e.split(/\r?\n/).forEach(function(e){var n=e.split(":"),r=n.shift().trim();if(r){var i=n.join(":").trim();t.append(r,i)}}),t}function v(e,t){t||(t={}),this.type="default",this.status="status"in t?t.status:200,this.ok=this.status>=200&&this.status<300,this.statusText="statusText"in t?t.statusText:"OK",this.headers=new i(t.headers),this.url=t.url||"",this._initBody(e)}if(!e.fetch){var g={searchParams:"URLSearchParams"in e,iterable:"Symbol"in e&&"iterator"in Symbol,blob:"FileReader"in e&&"Blob"in e&&function(){try{return new Blob,!0}catch(e){return!1}}(),formData:"FormData"in e,arrayBuffer:"ArrayBuffer"in e};if(g.arrayBuffer)var y=["[object Int8Array]","[object Uint8Array]","[object Uint8ClampedArray]","[object Int16Array]","[object Uint16Array]","[object Int32Array]","[object Uint32Array]","[object Float32Array]","[object Float64Array]"],_=function(e){return e&&DataView.prototype.isPrototypeOf(e)},b=ArrayBuffer.isView||function(e){return e&&y.indexOf(Object.prototype.toString.call(e))>-1};i.prototype.append=function(e,r){e=t(e),r=n(r);var i=this.map[e];this.map[e]=i?i+","+r:r},i.prototype.delete=function(e){delete this.map[t(e)]},i.prototype.get=function(e){return e=t(e),this.has(e)?this.map[e]:null},i.prototype.has=function(e){return this.map.hasOwnProperty(t(e))},i.prototype.set=function(e,r){this.map[t(e)]=n(r)},i.prototype.forEach=function(e,t){for(var n in this.map)this.map.hasOwnProperty(n)&&e.call(t,this.map[n],n,this)},i.prototype.keys=function(){var e=[];return this.forEach(function(t,n){e.push(n)}),r(e)},i.prototype.values=function(){var e=[];return this.forEach(function(t){e.push(t)}),r(e)},i.prototype.entries=function(){var e=[];return this.forEach(function(t,n){e.push([n,t])}),r(e)},g.iterable&&(i.prototype[Symbol.iterator]=i.prototype.entries);var x=["DELETE","GET","HEAD","OPTIONS","POST","PUT"];h.prototype.clone=function(){return new h(this,{body:this._bodyInit})},p.call(h.prototype),p.call(v.prototype),v.prototype.clone=function(){return new v(this._bodyInit,{status:this.status,statusText:this.statusText,headers:new i(this.headers),url:this.url})},v.error=function(){var e=new v(null,{status:0,statusText:""});return e.type="error",e};var w=[301,302,303,307,308];v.redirect=function(e,t){if(-1===w.indexOf(t))throw new RangeError("Invalid status code");return new v(null,{status:t,headers:{location:e}})},e.Headers=i,e.Request=h,e.Response=v,e.fetch=function(e,t){return new Promise(function(n,r){var i=new h(e,t),o=new XMLHttpRequest;o.onload=function(){var e={status:o.status,statusText:o.statusText,headers:m(o.getAllResponseHeaders()||"")};e.url="responseURL"in o?o.responseURL:e.headers.get("X-Request-URL");var t="response"in o?o.response:o.responseText;n(new v(t,e))},o.onerror=function(){r(new TypeError("Network request failed"))},o.ontimeout=function(){r(new TypeError("Network request failed"))},o.open(i.method,i.url,!0),"include"===i.credentials&&(o.withCredentials=!0),"responseType"in o&&g.blob&&(o.responseType="blob"),i.headers.forEach(function(e,t){o.setRequestHeader(t,e)}),o.send(void 0===i._bodyInit?null:i._bodyInit)})},e.fetch.polyfill=!0}}(void 0!==n?n:this),e.exports=n},function(e,t,n){(function(t){!function(t,n){e.exports=n(t)}(void 0!==t?t:this,function(e){if(e.CSS&&e.CSS.escape)return e.CSS.escape;var t=function(e){if(0==arguments.length)throw new TypeError("`CSS.escape` requires an argument.");for(var t,n=String(e),r=n.length,i=-1,o="",a=n.charCodeAt(0);++i<r;)t=n.charCodeAt(i),o+=0!=t?t>=1&&t<=31||127==t||0==i&&t>=48&&t<=57||1==i&&t>=48&&t<=57&&45==a?"\\"+t.toString(16)+" ":(0!=i||1!=r||45!=t)&&(t>=128||45==t||95==t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122)?n.charAt(i):"\\"+n.charAt(i):"�";return o};return e.CSS||(e.CSS={}),e.CSS.escape=t,t})}).call(t,n(17))},function(e,t,n){function r(e,t){if(e){var n,r="";for(var i in e)n=e[i],r&&(r+=" "),!n&&p[i]?r+=i:r+=i+'="'+(t.decodeEntities?c.encodeXML(n):n)+'"';return r}}function i(e,t){"svg"===e.name&&(t={decodeEntities:t.decodeEntities,xmlMode:!0});var n="<"+e.name,i=r(e.attribs,t);return i&&(n+=" "+i),!t.xmlMode||e.children&&0!==e.children.length?(n+=">",e.children&&(n+=d(e.children,t)),h[e.name]&&!t.xmlMode||(n+="</"+e.name+">")):n+="/>",n}function o(e){return"<"+e.data+">"}function a(e,t){var n=e.data||"";return!t.decodeEntities||e.parent&&e.parent.name in f||(n=c.encodeXML(n)),n}function s(e){return"<![CDATA["+e.children[0].data+"]]>"}function u(e){return"\x3c!--"+e.data+"--\x3e"}var l=n(699),c=n(114),p={__proto__:null,allowfullscreen:!0,async:!0,autofocus:!0,autoplay:!0,checked:!0,controls:!0,default:!0,defer:!0,disabled:!0,hidden:!0,ismap:!0,loop:!0,multiple:!0,muted:!0,open:!0,readonly:!0,required:!0,reversed:!0,scoped:!0,seamless:!0,selected:!0,typemustmatch:!0},f={__proto__:null,style:!0,script:!0,xmp:!0,iframe:!0,noembed:!0,noframes:!0,plaintext:!0,noscript:!0},h={__proto__:null,area:!0,base:!0,basefont:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,isindex:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},d=e.exports=function(e,t){Array.isArray(e)||e.cheerio||(e=[e]),t=t||{};for(var n="",r=0;r<e.length;r++){var c=e[r];"root"===c.type?n+=d(c.children,t):l.isTag(c)?n+=i(c,t):c.type===l.Directive?n+=o(c):c.type===l.Comment?n+=u(c):c.type===l.CDATA?n+=s(c):n+=a(c,t)}return n}},function(e,t){e.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",isTag:function(e){return"tag"===e.type||"script"===e.type||"style"===e.type}}},function(e,t,n){function r(e,t,n){"object"==typeof e?(n=t,t=e,e=null):"function"==typeof t&&(n=t,t=u),this._callback=e,this._options=t||u,this._elementCB=n,this.dom=[],this._done=!1,this._tagStack=[],this._parser=this._parser||null}var i=n(113),o=/\s+/g,a=n(368),s=n(701),u={normalizeWhitespace:!1,withStartIndices:!1,withEndIndices:!1};r.prototype.onparserinit=function(e){this._parser=e},r.prototype.onreset=function(){r.call(this,this._callback,this._options,this._elementCB)},r.prototype.onend=function(){this._done||(this._done=!0,this._parser=null,this._handleCallback(null))},r.prototype._handleCallback=r.prototype.onerror=function(e){if("function"==typeof this._callback)this._callback(e,this.dom);else if(e)throw e},r.prototype.onclosetag=function(){var e=this._tagStack.pop();this._options.withEndIndices&&(e.endIndex=this._parser.endIndex),this._elementCB&&this._elementCB(e)},r.prototype._createDomElement=function(e){if(!this._options.withDomLvl1)return e;var t;t="tag"===e.type?Object.create(s):Object.create(a);for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t},r.prototype._addDomElement=function(e){var t=this._tagStack[this._tagStack.length-1],n=t?t.children:this.dom,r=n[n.length-1];e.next=null,this._options.withStartIndices&&(e.startIndex=this._parser.startIndex),this._options.withEndIndices&&(e.endIndex=this._parser.endIndex),r?(e.prev=r,r.next=e):e.prev=null,n.push(e),e.parent=t||null},r.prototype.onopentag=function(e,t){var n={type:"script"===e?i.Script:"style"===e?i.Style:i.Tag,name:e,attribs:t,children:[]},r=this._createDomElement(n);this._addDomElement(r),this._tagStack.push(r)},r.prototype.ontext=function(e){var t,n=this._options.normalizeWhitespace||this._options.ignoreWhitespace;if(!this._tagStack.length&&this.dom.length&&(t=this.dom[this.dom.length-1]).type===i.Text)n?t.data=(t.data+e).replace(o," "):t.data+=e;else if(this._tagStack.length&&(t=this._tagStack[this._tagStack.length-1])&&(t=t.children[t.children.length-1])&&t.type===i.Text)n?t.data=(t.data+e).replace(o," "):t.data+=e;else{n&&(e=e.replace(o," "));var r=this._createDomElement({data:e,type:i.Text});this._addDomElement(r)}},r.prototype.oncomment=function(e){var t=this._tagStack[this._tagStack.length-1];if(t&&t.type===i.Comment)return void(t.data+=e);var n={data:e,type:i.Comment},r=this._createDomElement(n);this._addDomElement(r),this._tagStack.push(r)},r.prototype.oncdatastart=function(){var e={children:[{data:"",type:i.Text}],type:i.CDATA},t=this._createDomElement(e);this._addDomElement(t),this._tagStack.push(t)},r.prototype.oncommentend=r.prototype.oncdataend=function(){this._tagStack.pop()},r.prototype.onprocessinginstruction=function(e,t){var n=this._createDomElement({name:e,data:t,type:i.Directive});this._addDomElement(n)},e.exports=r},function(e,t,n){var r=n(368),i=e.exports=Object.create(r),o={tagName:"name"};Object.keys(o).forEach(function(e){var t=o[e];Object.defineProperty(i,e,{get:function(){return this[t]||null},set:function(e){return this[t]=e,e}})})},function(e,t,n){var r=e.exports;[n(707),n(708),n(705),n(706),n(704),n(703)].forEach(function(e){Object.keys(e).forEach(function(t){r[t]=e[t].bind(r)})})},function(e,t){t.removeSubsets=function(e){for(var t,n,r,i=e.length;--i>-1;){for(t=n=e[i],e[i]=null,r=!0;n;){if(e.indexOf(n)>-1){r=!1,e.splice(i,1);break}n=n.parent}r&&(e[i]=t)}return e};var n={DISCONNECTED:1,PRECEDING:2,FOLLOWING:4,CONTAINS:8,CONTAINED_BY:16},r=t.compareDocumentPosition=function(e,t){var r,i,o,a,s,u,l=[],c=[];if(e===t)return 0;for(r=e;r;)l.unshift(r),r=r.parent;for(r=t;r;)c.unshift(r),r=r.parent;for(u=0;l[u]===c[u];)u++;return 0===u?n.DISCONNECTED:(i=l[u-1],o=i.children,a=l[u],s=c[u],o.indexOf(a)>o.indexOf(s)?i===t?n.FOLLOWING|n.CONTAINED_BY:n.FOLLOWING:i===e?n.PRECEDING|n.CONTAINS:n.PRECEDING)};t.uniqueSort=function(e){var t,i,o=e.length;for(e=e.slice();--o>-1;)t=e[o],(i=e.indexOf(t))>-1&&i<o&&e.splice(o,1);return e.sort(function(e,t){var i=r(e,t);return i&n.PRECEDING?-1:i&n.FOLLOWING?1:0}),e}},function(e,t,n){function r(e,t){return"function"==typeof t?function(n){return n.attribs&&t(n.attribs[e])}:function(n){return n.attribs&&n.attribs[e]===t}}function i(e,t){return function(n){return e(n)||t(n)}}var o=n(113),a=t.isTag=o.isTag;t.testElement=function(e,t){for(var n in e)if(e.hasOwnProperty(n)){if("tag_name"===n){if(!a(t)||!e.tag_name(t.name))return!1}else if("tag_type"===n){if(!e.tag_type(t.type))return!1}else if("tag_contains"===n){if(a(t)||!e.tag_contains(t.data))return!1}else if(!t.attribs||!e[n](t.attribs[n]))return!1}else;return!0};var s={tag_name:function(e){return"function"==typeof e?function(t){return a(t)&&e(t.name)}:"*"===e?a:function(t){return a(t)&&t.name===e}},tag_type:function(e){return"function"==typeof e?function(t){return e(t.type)}:function(t){return t.type===e}},tag_contains:function(e){return"function"==typeof e?function(t){return!a(t)&&e(t.data)}:function(t){return!a(t)&&t.data===e}}};t.getElements=function(e,t,n,o){var a=Object.keys(e).map(function(t){var n=e[t];return t in s?s[t](n):r(t,n)});return 0===a.length?[]:this.filter(a.reduce(i),t,n,o)},t.getElementById=function(e,t,n){return Array.isArray(t)||(t=[t]),this.findOne(r("id",e),t,!1!==n)},t.getElementsByTagName=function(e,t,n,r){return this.filter(s.tag_name(e),t,n,r)},t.getElementsByTagType=function(e,t,n,r){return this.filter(s.tag_type(e),t,n,r)}},function(e,t){t.removeElement=function(e){if(e.prev&&(e.prev.next=e.next),e.next&&(e.next.prev=e.prev),e.parent){var t=e.parent.children;t.splice(t.lastIndexOf(e),1)}},t.replaceElement=function(e,t){var n=t.prev=e.prev;n&&(n.next=t);var r=t.next=e.next;r&&(r.prev=t);var i=t.parent=e.parent;if(i){var o=i.children;o[o.lastIndexOf(e)]=t}},t.appendChild=function(e,t){if(t.parent=e,1!==e.children.push(t)){var n=e.children[e.children.length-2];n.next=t,t.prev=n,t.next=null}},t.append=function(e,t){var n=e.parent,r=e.next;if(t.next=r,t.prev=e,e.next=t,t.parent=n,r){if(r.prev=t,n){var i=n.children;i.splice(i.lastIndexOf(r),0,t)}}else n&&n.children.push(t)},t.prepend=function(e,t){var n=e.parent;if(n){var r=n.children;r.splice(r.lastIndexOf(e),0,t)}e.prev&&(e.prev.next=t),t.parent=n,t.prev=e.prev,t.next=e,e.prev=t}},function(e,t,n){function r(e,t,n,r){return Array.isArray(t)||(t=[t]),"number"==typeof r&&isFinite(r)||(r=1/0),i(e,t,!1!==n,r)}function i(e,t,n,r){for(var o,a=[],s=0,u=t.length;s<u&&!(e(t[s])&&(a.push(t[s]),--r<=0))&&(o=t[s].children,!(n&&o&&o.length>0&&(o=i(e,o,n,r),a=a.concat(o),(r-=o.length)<=0)));s++);return a}function o(e,t){for(var n=0,r=t.length;n<r;n++)if(e(t[n]))return t[n];return null}function a(e,t){for(var n=null,r=0,i=t.length;r<i&&!n;r++)l(t[r])&&(e(t[r])?n=t[r]:t[r].children.length>0&&(n=a(e,t[r].children)));return n}function s(e,t){for(var n=0,r=t.length;n<r;n++)if(l(t[n])&&(e(t[n])||t[n].children.length>0&&s(e,t[n].children)))return!0;return!1}function u(e,t){for(var n=[],r=[t];r.length;){for(var i=r.pop(),o=0,a=i.length;o<a;o++)l(i[o])&&e(i[o])&&n.push(i[o]);for(;a-- >0;)i[a].children&&i[a].children.length>0&&r.push(i[a].children)}return n}var l=n(113).isTag;e.exports={filter:r,find:i,findOneChild:o,findOne:a,existsOne:s,findAll:u}},function(e,t,n){function r(e,t){return e.children?e.children.map(function(e){return a(e,t)}).join(""):""}function i(e){return Array.isArray(e)?e.map(i).join(""):s(e)?"br"===e.name?"\n":i(e.children):e.type===o.CDATA?i(e.children):e.type===o.Text?e.data:""}var o=n(113),a=n(698),s=o.isTag;e.exports={getInnerHTML:r,getOuterHTML:a,getText:i}},function(e,t){var n=t.getChildren=function(e){return e.children},r=t.getParent=function(e){return e.parent};t.getSiblings=function(e){var t=r(e);return t?n(t):[e]},t.getAttributeValue=function(e,t){return e.attribs&&e.attribs[t]},t.hasAttrib=function(e,t){return!!e.attribs&&hasOwnProperty.call(e.attribs,t)},t.getName=function(e){return e.name}},function(e,t,n){"use strict";var r=function(e){return encodeURIComponent(e).replace(/[!'()*]/g,function(e){return"%"+e.charCodeAt(0).toString(16).toUpperCase()})};e.exports=r},function(e,t,n){function r(e){var t=Object.keys(e).join("|"),n=o(e);t+="|#[xX][\\da-fA-F]+|#\\d+";var r=new RegExp("&(?:"+t+");","g");return function(e){return String(e).replace(r,n)}}function i(e,t){return e<t?1:-1}function o(e){return function(t){return"#"===t.charAt(1)?l("X"===t.charAt(2)||"x"===t.charAt(2)?parseInt(t.substr(3),16):parseInt(t.substr(2),10)):e[t.slice(1,-1)]}}var a=n(204),s=n(370),u=n(205),l=n(369),c=r(u),p=r(a),f=function(){function e(e){return";"!==e.substr(-1)&&(e+=";"),c(e)}for(var t=Object.keys(s).sort(i),n=Object.keys(a).sort(i),r=0,u=0;r<n.length;r++)t[u]===n[r]?(n[r]+=";?",u++):n[r]+=";";var l=new RegExp("&(?:"+n.join("|")+"|#[xX][\\da-fA-F]+;?|#\\d+;?)","g"),c=o(a);return function(t){return String(t).replace(l,e)}}();e.exports={XML:c,HTML:f,HTMLStrict:p}},function(e,t,n){function r(e){return Object.keys(e).sort().reduce(function(t,n){return t[e[n]]="&"+n+";",t},{})}function i(e){var t=[],n=[];return Object.keys(e).forEach(function(e){1===e.length?t.push("\\"+e):n.push(e)}),n.unshift("["+t.join("")+"]"),new RegExp(n.join("|"),"g")}function o(e){return"&#x"+e.charCodeAt(0).toString(16).toUpperCase()+";"}function a(e){return"&#x"+(1024*(e.charCodeAt(0)-55296)+e.charCodeAt(1)-56320+65536).toString(16).toUpperCase()+";"}function s(e,t){function n(t){return e[t]}return function(e){return e.replace(t,n).replace(d,a).replace(h,o)}}function u(e){return e.replace(m,o).replace(d,a).replace(h,o)}var l=r(n(205)),c=i(l);t.XML=s(l,c);var p=r(n(204)),f=i(p);t.HTML=s(p,f);var h=/[^\0-\x7F]/g,d=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,m=i(l);t.escape=u},function(e,t){e.exports={0:65533,128:8364,130:8218,131:402,132:8222,133:8230,134:8224,135:8225,136:710,137:8240,138:352,139:8249,140:338,142:381,145:8216,146:8217,147:8220,148:8221,149:8226,150:8211,151:8212,152:732,153:8482,154:353,155:8250,156:339,158:382,159:376}},function(e,t,n){"use strict";e.exports=function(){var e,t,n=Array.from;return"function"==typeof n&&(e=["raz","dwa"],t=n(e),Boolean(t&&t!==e&&"dwa"===t[1]))}},function(e,t,n){"use strict";var r=n(738).iterator,i=n(717),o=n(718),a=n(65),s=n(58),u=n(115),l=n(79),c=n(737),p=Array.isArray,f=Function.prototype.call,h={configurable:!0,enumerable:!0,writable:!0,value:null},d=Object.defineProperty;e.exports=function(e){var t,n,m,v,g,y,_,b,x,w,k=arguments[1],E=arguments[2];if(e=Object(u(e)),l(k)&&s(k),this&&this!==Array&&o(this))t=this;else{if(!k){if(i(e))return 1!==(g=e.length)?Array.apply(null,e):(v=new Array(1),v[0]=e[0],v);if(p(e)){for(v=new Array(g=e.length),n=0;n<g;++n)v[n]=e[n];return v}}v=[]}if(!p(e))if(void 0!==(x=e[r])){for(_=s(x).call(e),t&&(v=new t),b=_.next(),n=0;!b.done;)w=k?f.call(k,E,b.value,n):b.value,t?(h.value=w,d(v,n,h)):v[n]=w,b=_.next(),++n;g=n}else if(c(e)){for(g=e.length,t&&(v=new t),n=0,m=0;n<g;++n)w=e[n],n+1<g&&(y=w.charCodeAt(0))>=55296&&y<=56319&&(w+=e[++n]),w=k?f.call(k,E,w,m):w,t?(h.value=w,d(v,m,h)):v[m]=w,++m;g=m}if(void 0===g)for(g=a(e.length),t&&(v=new t(g)),n=0;n<g;++n)w=k?f.call(k,E,e[n],n):e[n],t?(h.value=w,d(v,n,h)):v[n]=w;return t&&(h.value=null,v.length=g),v}},function(e,t,n){"use strict";var r=n(207),i=Array.isArray;e.exports=function(e){return i(e)?e:r(e)}},function(e,t,n){"use strict";var r=n(373),i=n(730),o=n(79),a=Error.captureStackTrace;t=e.exports=function(e){var n=new Error(e),s=arguments[1],u=arguments[2];return o(u)||i(s)&&(u=s,s=null),o(u)&&r(n,u),o(s)&&(n.code=s),a&&a(n,t),n}},function(e,t,n){"use strict";var r=Object.prototype.toString,i=r.call(function(){return arguments}());e.exports=function(e){return r.call(e)===i}},function(e,t,n){"use strict";var r=Object.prototype.toString,i=r.call(n(372));e.exports=function(e){return"function"==typeof e&&r.call(e)===i}},function(e,t,n){"use strict";e.exports=n(720)()?Math.sign:n(721)},function(e,t,n){"use strict";e.exports=function(){var e=Math.sign;return"function"==typeof e&&(1===e(10)&&-1===e(-20))}},function(e,t,n){"use strict";e.exports=function(e){return e=Number(e),isNaN(e)||0===e?e:e>0?1:-1}},function(e,t,n){"use strict";e.exports=n(723)()?Number.isNaN:n(724)},function(e,t,n){"use strict";e.exports=function(){var e=Number.isNaN;return"function"==typeof e&&(!e({})&&e(NaN)&&!e(34))}},function(e,t,n){"use strict";e.exports=function(e){return e!==e}},function(e,t,n){"use strict";var r=n(719),i=Math.abs,o=Math.floor;e.exports=function(e){return isNaN(e)?0:(e=Number(e),0!==e&&isFinite(e)?r(e)*o(i(e)):e)}},function(e,t,n){"use strict";var r=n(58),i=n(115),o=Function.prototype.bind,a=Function.prototype.call,s=Object.keys,u=Object.prototype.propertyIsEnumerable;e.exports=function(e,t){return function(n,l){var c,p=arguments[2],f=arguments[3];return n=Object(i(n)),r(l),c=s(n),f&&c.sort("function"==typeof f?o.call(f,n):void 0),"function"!=typeof e&&(e=c[e]),a.call(e,c,function(e,r){return u.call(n,e)?a.call(l,p,n[e],e,n,r):t})}}},function(e,t,n){"use strict";e.exports=function(){var e,t=Object.assign;return"function"==typeof t&&(e={foo:"raz"},t(e,{bar:"dwa"},{trzy:"trzy"}),e.foo+e.bar+e.trzy==="razdwatrzy")}},function(e,t,n){"use strict";var r=n(731),i=n(115),o=Math.max;e.exports=function(e,t){var n,a,s,u=o(arguments.length,2);for(e=Object(i(e)),s=function(r){try{e[r]=t[r]}catch(e){n||(n=e)}},a=1;a<u;++a)t=arguments[a],r(t).forEach(s);if(void 0!==n)throw n;return e}},function(e,t,n){"use strict";e.exports=function(e){return"function"==typeof e}},function(e,t,n){"use strict";var r=n(79),i={function:!0,object:!0};e.exports=function(e){return r(e)&&i[typeof e]||!1}},function(e,t,n){"use strict";e.exports=n(732)()?Object.keys:n(733)},function(e,t,n){"use strict";e.exports=function(){try{return Object.keys("primitive"),!0}catch(e){return!1}}},function(e,t,n){"use strict";var r=n(79),i=Object.keys;e.exports=function(e){return i(r(e)?Object(e):e)}},function(e,t,n){"use strict";e.exports=n(735)()?String.prototype.contains:n(736)},function(e,t,n){"use strict";var r="razdwatrzy";e.exports=function(){return"function"==typeof r.contains&&(!0===r.contains("dwa")&&!1===r.contains("foo"))}},function(e,t,n){"use strict";var r=String.prototype.indexOf;e.exports=function(e){return r.call(this,e,arguments[1])>-1}},function(e,t,n){"use strict";var r=Object.prototype.toString,i=r.call("");e.exports=function(e){return"string"==typeof e||e&&"object"==typeof e&&(e instanceof String||r.call(e)===i)||!1}},function(e,t,n){"use strict";e.exports=n(739)()?Symbol:n(741)},function(e,t,n){"use strict";var r={object:!0,symbol:!0};e.exports=function(){var e;if("function"!=typeof Symbol)return!1;e=Symbol("test symbol");try{String(e)}catch(e){return!1}return!!r[typeof Symbol.iterator]&&(!!r[typeof Symbol.toPrimitive]&&!!r[typeof Symbol.toStringTag])}},function(e,t,n){"use strict";e.exports=function(e){return!!e&&("symbol"==typeof e||!!e.constructor&&("Symbol"===e.constructor.name&&"Symbol"===e[e.constructor.toStringTag]))}},function(e,t,n){"use strict";var r,i,o,a,s=n(141),u=n(742),l=Object.create,c=Object.defineProperties,p=Object.defineProperty,f=Object.prototype,h=l(null);if("function"==typeof Symbol){r=Symbol;try{String(r()),a=!0}catch(e){}}var d=function(){var e=l(null);return function(t){for(var n,r,i=0;e[t+(i||"")];)++i;return t+=i||"",e[t]=!0,n="@@"+t,p(f,n,s.gs(null,function(e){r||(r=!0,p(this,n,s(e)),r=!1)})),n}}();o=function(e){if(this instanceof o)throw new TypeError("Symbol is not a constructor");return i(e)},e.exports=i=function e(t){var n;if(this instanceof e)throw new TypeError("Symbol is not a constructor");return a?r(t):(n=l(o.prototype),t=void 0===t?"":String(t),c(n,{__description__:s("",t),__name__:s("",d(t))}))},c(i,{for:s(function(e){return h[e]?h[e]:h[e]=i(String(e))}),keyFor:s(function(e){var t;u(e);for(t in h)if(h[t]===e)return t}),hasInstance:s("",r&&r.hasInstance||i("hasInstance")),isConcatSpreadable:s("",r&&r.isConcatSpreadable||i("isConcatSpreadable")),iterator:s("",r&&r.iterator||i("iterator")),match:s("",r&&r.match||i("match")),replace:s("",r&&r.replace||i("replace")),search:s("",r&&r.search||i("search")),species:s("",r&&r.species||i("species")),split:s("",r&&r.split||i("split")),toPrimitive:s("",r&&r.toPrimitive||i("toPrimitive")),toStringTag:s("",r&&r.toStringTag||i("toStringTag")),unscopables:s("",r&&r.unscopables||i("unscopables"))}),c(o.prototype,{constructor:s(i),toString:s("",function(){return this.__name__})}),c(i.prototype,{toString:s(function(){return"Symbol ("+u(this).__description__+")"}),valueOf:s(function(){return u(this)})}),p(i.prototype,i.toPrimitive,s("",function(){var e=u(this);return"symbol"==typeof e?e:e.toString()})),p(i.prototype,i.toStringTag,s("c","Symbol")),p(o.prototype,i.toStringTag,s("c",i.prototype[i.toStringTag])),p(o.prototype,i.toPrimitive,s("c",i.prototype[i.toPrimitive]))},function(e,t,n){"use strict";var r=n(740);e.exports=function(e){if(!r(e))throw new TypeError(e+" is not a symbol");return e}},function(e,t,n){!function(t,n){e.exports=n()}(0,function(){return function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={exports:{},id:r,loaded:!1};return e[r].call(i.exports,i,i.exports,t),i.loaded=!0,i.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function r(e,t,n){var r=null,i=function(e,t){n&&n(e,t),r&&r.visit(e,t)},o="function"==typeof n?i:null,a=!1;if(t){a="boolean"==typeof t.comment&&t.comment;var c="boolean"==typeof t.attachComment&&t.attachComment;(a||c)&&(r=new s.CommentHandler,r.attach=c,t.comment=!0,o=i)}var p=!1;t&&"string"==typeof t.sourceType&&(p="module"===t.sourceType);var f;f=t&&"boolean"==typeof t.jsx&&t.jsx?new u.JSXParser(e,t,o):new l.Parser(e,t,o);var h=p?f.parseModule():f.parseScript(),d=h;return a&&r&&(d.comments=r.comments),f.config.tokens&&(d.tokens=f.tokens),f.config.tolerant&&(d.errors=f.errorHandler.errors),d}function i(e,t,n){var i=t||{};return i.sourceType="module",r(e,i,n)}function o(e,t,n){var i=t||{};return i.sourceType="script",r(e,i,n)}function a(e,t,n){var r,i=new c.Tokenizer(e,t);r=[];try{for(;;){var o=i.getNextToken();if(!o)break;n&&(o=n(o)),r.push(o)}}catch(e){i.errorHandler.tolerate(e)}return i.errorHandler.tolerant&&(r.errors=i.errors()),r}Object.defineProperty(t,"__esModule",{value:!0});var s=n(1),u=n(3),l=n(8),c=n(15);t.parse=r,t.parseModule=i,t.parseScript=o,t.tokenize=a;var p=n(2);t.Syntax=p.Syntax,t.version="4.0.0"},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(2),i=function(){function e(){this.attach=!1,this.comments=[],this.stack=[],this.leading=[],this.trailing=[]}return e.prototype.insertInnerComments=function(e,t){if(e.type===r.Syntax.BlockStatement&&0===e.body.length){for(var n=[],i=this.leading.length-1;i>=0;--i){var o=this.leading[i];t.end.offset>=o.start&&(n.unshift(o.comment),this.leading.splice(i,1),this.trailing.splice(i,1))}n.length&&(e.innerComments=n)}},e.prototype.findTrailingComments=function(e){var t=[];if(this.trailing.length>0){for(var n=this.trailing.length-1;n>=0;--n){var r=this.trailing[n];r.start>=e.end.offset&&t.unshift(r.comment)}return this.trailing.length=0,t}var i=this.stack[this.stack.length-1];if(i&&i.node.trailingComments){var o=i.node.trailingComments[0];o&&o.range[0]>=e.end.offset&&(t=i.node.trailingComments,delete i.node.trailingComments)}return t},e.prototype.findLeadingComments=function(e){for(var t,n=[];this.stack.length>0;){var r=this.stack[this.stack.length-1];if(!(r&&r.start>=e.start.offset))break;t=r.node,this.stack.pop()}if(t){for(var i=t.leadingComments?t.leadingComments.length:0,o=i-1;o>=0;--o){var a=t.leadingComments[o];a.range[1]<=e.start.offset&&(n.unshift(a),t.leadingComments.splice(o,1))}return t.leadingComments&&0===t.leadingComments.length&&delete t.leadingComments,n}for(var o=this.leading.length-1;o>=0;--o){var r=this.leading[o];r.start<=e.start.offset&&(n.unshift(r.comment),this.leading.splice(o,1))}return n},e.prototype.visitNode=function(e,t){if(!(e.type===r.Syntax.Program&&e.body.length>0)){this.insertInnerComments(e,t);var n=this.findTrailingComments(t),i=this.findLeadingComments(t);i.length>0&&(e.leadingComments=i),n.length>0&&(e.trailingComments=n),this.stack.push({node:e,start:t.start.offset})}},e.prototype.visitComment=function(e,t){var n="L"===e.type[0]?"Line":"Block",r={type:n,value:e.value};if(e.range&&(r.range=e.range),e.loc&&(r.loc=e.loc),this.comments.push(r),this.attach){var i={comment:{type:n,value:e.value,range:[t.start.offset,t.end.offset]},start:t.start.offset};e.loc&&(i.comment.loc=e.loc),e.type=n,this.leading.push(i),this.trailing.push(i)}},e.prototype.visit=function(e,t){"LineComment"===e.type?this.visitComment(e,t):"BlockComment"===e.type?this.visitComment(e,t):this.attach&&this.visitNode(e,t)},e}();t.CommentHandler=i},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Syntax={AssignmentExpression:"AssignmentExpression",AssignmentPattern:"AssignmentPattern",ArrayExpression:"ArrayExpression",ArrayPattern:"ArrayPattern",ArrowFunctionExpression:"ArrowFunctionExpression",AwaitExpression:"AwaitExpression",BlockStatement:"BlockStatement",BinaryExpression:"BinaryExpression",BreakStatement:"BreakStatement",CallExpression:"CallExpression",CatchClause:"CatchClause",ClassBody:"ClassBody",ClassDeclaration:"ClassDeclaration",ClassExpression:"ClassExpression",ConditionalExpression:"ConditionalExpression",ContinueStatement:"ContinueStatement",DoWhileStatement:"DoWhileStatement",DebuggerStatement:"DebuggerStatement",EmptyStatement:"EmptyStatement",ExportAllDeclaration:"ExportAllDeclaration",ExportDefaultDeclaration:"ExportDefaultDeclaration",ExportNamedDeclaration:"ExportNamedDeclaration",ExportSpecifier:"ExportSpecifier",ExpressionStatement:"ExpressionStatement",ForStatement:"ForStatement",ForOfStatement:"ForOfStatement",ForInStatement:"ForInStatement",FunctionDeclaration:"FunctionDeclaration",FunctionExpression:"FunctionExpression",Identifier:"Identifier",IfStatement:"IfStatement",ImportDeclaration:"ImportDeclaration",ImportDefaultSpecifier:"ImportDefaultSpecifier",ImportNamespaceSpecifier:"ImportNamespaceSpecifier",ImportSpecifier:"ImportSpecifier",Literal:"Literal",LabeledStatement:"LabeledStatement",LogicalExpression:"LogicalExpression",MemberExpression:"MemberExpression",MetaProperty:"MetaProperty",MethodDefinition:"MethodDefinition",NewExpression:"NewExpression",ObjectExpression:"ObjectExpression",ObjectPattern:"ObjectPattern",Program:"Program",Property:"Property",RestElement:"RestElement",ReturnStatement:"ReturnStatement",SequenceExpression:"SequenceExpression",SpreadElement:"SpreadElement",Super:"Super",SwitchCase:"SwitchCase",SwitchStatement:"SwitchStatement",TaggedTemplateExpression:"TaggedTemplateExpression",TemplateElement:"TemplateElement",TemplateLiteral:"TemplateLiteral",ThisExpression:"ThisExpression",ThrowStatement:"ThrowStatement",TryStatement:"TryStatement",UnaryExpression:"UnaryExpression",UpdateExpression:"UpdateExpression",VariableDeclaration:"VariableDeclaration",VariableDeclarator:"VariableDeclarator",WhileStatement:"WhileStatement",WithStatement:"WithStatement",YieldExpression:"YieldExpression"}},function(e,t,n){"use strict";function r(e){var t;switch(e.type){case s.JSXSyntax.JSXIdentifier:t=e.name;break;case s.JSXSyntax.JSXNamespacedName:var n=e;t=r(n.namespace)+":"+r(n.name);break;case s.JSXSyntax.JSXMemberExpression:var i=e;t=r(i.object)+"."+r(i.property)}return t}var i=this&&this.__extends||function(){var e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(t,"__esModule",{value:!0});var o=n(4),a=n(5),s=n(6),u=n(7),l=n(8),c=n(13),p=n(14);c.TokenName[100]="JSXIdentifier",c.TokenName[101]="JSXText";var f=function(e){function t(t,n,r){return e.call(this,t,n,r)||this}return i(t,e),t.prototype.parsePrimaryExpression=function(){return this.match("<")?this.parseJSXRoot():e.prototype.parsePrimaryExpression.call(this)},t.prototype.startJSX=function(){this.scanner.index=this.startMarker.index,this.scanner.lineNumber=this.startMarker.line,this.scanner.lineStart=this.startMarker.index-this.startMarker.column},t.prototype.finishJSX=function(){this.nextToken()},t.prototype.reenterJSX=function(){this.startJSX(),this.expectJSX("}"),this.config.tokens&&this.tokens.pop()},t.prototype.createJSXNode=function(){return this.collectComments(),{index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}},t.prototype.createJSXChildNode=function(){return{index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}},t.prototype.scanXHTMLEntity=function(e){for(var t="&",n=!0,r=!1,i=!1,a=!1;!this.scanner.eof()&&n&&!r;){var s=this.scanner.source[this.scanner.index];if(s===e)break;if(r=";"===s,t+=s,++this.scanner.index,!r)switch(t.length){case 2:i="#"===s;break;case 3:i&&(a="x"===s,n=a||o.Character.isDecimalDigit(s.charCodeAt(0)),i=i&&!a);break;default:n=n&&!(i&&!o.Character.isDecimalDigit(s.charCodeAt(0))),n=n&&!(a&&!o.Character.isHexDigit(s.charCodeAt(0)))}}if(n&&r&&t.length>2){var u=t.substr(1,t.length-2);i&&u.length>1?t=String.fromCharCode(parseInt(u.substr(1),10)):a&&u.length>2?t=String.fromCharCode(parseInt("0"+u.substr(1),16)):i||a||!p.XHTMLEntities[u]||(t=p.XHTMLEntities[u])}return t},t.prototype.lexJSX=function(){var e=this.scanner.source.charCodeAt(this.scanner.index);if(60===e||62===e||47===e||58===e||61===e||123===e||125===e){var t=this.scanner.source[this.scanner.index++];return{type:7,value:t,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:this.scanner.index-1,end:this.scanner.index}}if(34===e||39===e){for(var n=this.scanner.index,r=this.scanner.source[this.scanner.index++],i="";!this.scanner.eof();){var a=this.scanner.source[this.scanner.index++];if(a===r)break;i+="&"===a?this.scanXHTMLEntity(r):a}return{type:8,value:i,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}if(46===e){var s=this.scanner.source.charCodeAt(this.scanner.index+1),u=this.scanner.source.charCodeAt(this.scanner.index+2),t=46===s&&46===u?"...":".",n=this.scanner.index;return this.scanner.index+=t.length,{type:7,value:t,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}if(96===e)return{type:10,value:"",lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:this.scanner.index,end:this.scanner.index};if(o.Character.isIdentifierStart(e)&&92!==e){var n=this.scanner.index;for(++this.scanner.index;!this.scanner.eof();){var a=this.scanner.source.charCodeAt(this.scanner.index);if(o.Character.isIdentifierPart(a)&&92!==a)++this.scanner.index;else{if(45!==a)break;++this.scanner.index}}return{type:100,value:this.scanner.source.slice(n,this.scanner.index),lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}return this.scanner.lex()},t.prototype.nextJSXToken=function(){this.collectComments(),this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart;var e=this.lexJSX();return this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.config.tokens&&this.tokens.push(this.convertToken(e)),e},t.prototype.nextJSXText=function(){this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart;for(var e=this.scanner.index,t="";!this.scanner.eof();){var n=this.scanner.source[this.scanner.index];if("{"===n||"<"===n)break;++this.scanner.index,t+=n,o.Character.isLineTerminator(n.charCodeAt(0))&&(++this.scanner.lineNumber,"\r"===n&&"\n"===this.scanner.source[this.scanner.index]&&++this.scanner.index,this.scanner.lineStart=this.scanner.index)}this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart;var r={type:101,value:t,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:e,end:this.scanner.index};return t.length>0&&this.config.tokens&&this.tokens.push(this.convertToken(r)),r},t.prototype.peekJSXToken=function(){var e=this.scanner.saveState();this.scanner.scanComments();var t=this.lexJSX();return this.scanner.restoreState(e),t},t.prototype.expectJSX=function(e){var t=this.nextJSXToken();7===t.type&&t.value===e||this.throwUnexpectedToken(t)},t.prototype.matchJSX=function(e){var t=this.peekJSXToken();return 7===t.type&&t.value===e},t.prototype.parseJSXIdentifier=function(){var e=this.createJSXNode(),t=this.nextJSXToken();return 100!==t.type&&this.throwUnexpectedToken(t),this.finalize(e,new a.JSXIdentifier(t.value))},t.prototype.parseJSXElementName=function(){var e=this.createJSXNode(),t=this.parseJSXIdentifier();if(this.matchJSX(":")){var n=t;this.expectJSX(":");var r=this.parseJSXIdentifier();t=this.finalize(e,new a.JSXNamespacedName(n,r))}else if(this.matchJSX("."))for(;this.matchJSX(".");){var i=t;this.expectJSX(".");var o=this.parseJSXIdentifier();t=this.finalize(e,new a.JSXMemberExpression(i,o))}return t},t.prototype.parseJSXAttributeName=function(){var e,t=this.createJSXNode(),n=this.parseJSXIdentifier();if(this.matchJSX(":")){var r=n;this.expectJSX(":");var i=this.parseJSXIdentifier();e=this.finalize(t,new a.JSXNamespacedName(r,i))}else e=n;return e},t.prototype.parseJSXStringLiteralAttribute=function(){var e=this.createJSXNode(),t=this.nextJSXToken();8!==t.type&&this.throwUnexpectedToken(t);var n=this.getTokenRaw(t);return this.finalize(e,new u.Literal(t.value,n))},t.prototype.parseJSXExpressionAttribute=function(){var e=this.createJSXNode();this.expectJSX("{"),this.finishJSX(),this.match("}")&&this.tolerateError("JSX attributes must only be assigned a non-empty expression");var t=this.parseAssignmentExpression();return this.reenterJSX(),this.finalize(e,new a.JSXExpressionContainer(t))},t.prototype.parseJSXAttributeValue=function(){return this.matchJSX("{")?this.parseJSXExpressionAttribute():this.matchJSX("<")?this.parseJSXElement():this.parseJSXStringLiteralAttribute()},t.prototype.parseJSXNameValueAttribute=function(){var e=this.createJSXNode(),t=this.parseJSXAttributeName(),n=null;return this.matchJSX("=")&&(this.expectJSX("="),n=this.parseJSXAttributeValue()),this.finalize(e,new a.JSXAttribute(t,n))},t.prototype.parseJSXSpreadAttribute=function(){var e=this.createJSXNode();this.expectJSX("{"),this.expectJSX("..."),this.finishJSX();var t=this.parseAssignmentExpression();return this.reenterJSX(),this.finalize(e,new a.JSXSpreadAttribute(t))},t.prototype.parseJSXAttributes=function(){for(var e=[];!this.matchJSX("/")&&!this.matchJSX(">");){var t=this.matchJSX("{")?this.parseJSXSpreadAttribute():this.parseJSXNameValueAttribute();e.push(t)}return e},t.prototype.parseJSXOpeningElement=function(){var e=this.createJSXNode();this.expectJSX("<");var t=this.parseJSXElementName(),n=this.parseJSXAttributes(),r=this.matchJSX("/");return r&&this.expectJSX("/"),this.expectJSX(">"),this.finalize(e,new a.JSXOpeningElement(t,r,n))},t.prototype.parseJSXBoundaryElement=function(){var e=this.createJSXNode();if(this.expectJSX("<"),this.matchJSX("/")){this.expectJSX("/");var t=this.parseJSXElementName();return this.expectJSX(">"),this.finalize(e,new a.JSXClosingElement(t))}var n=this.parseJSXElementName(),r=this.parseJSXAttributes(),i=this.matchJSX("/");return i&&this.expectJSX("/"),this.expectJSX(">"),this.finalize(e,new a.JSXOpeningElement(n,i,r))},t.prototype.parseJSXEmptyExpression=function(){var e=this.createJSXChildNode();return this.collectComments(),this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.finalize(e,new a.JSXEmptyExpression)},t.prototype.parseJSXExpressionContainer=function(){var e=this.createJSXNode();this.expectJSX("{");var t;return this.matchJSX("}")?(t=this.parseJSXEmptyExpression(),this.expectJSX("}")):(this.finishJSX(),t=this.parseAssignmentExpression(),this.reenterJSX()),this.finalize(e,new a.JSXExpressionContainer(t))},t.prototype.parseJSXChildren=function(){for(var e=[];!this.scanner.eof();){var t=this.createJSXChildNode(),n=this.nextJSXText();if(n.start<n.end){var r=this.getTokenRaw(n),i=this.finalize(t,new a.JSXText(n.value,r));e.push(i)}if("{"!==this.scanner.source[this.scanner.index])break;var o=this.parseJSXExpressionContainer();e.push(o)}return e},t.prototype.parseComplexJSXElement=function(e){for(var t=[];!this.scanner.eof();){e.children=e.children.concat(this.parseJSXChildren());var n=this.createJSXChildNode(),i=this.parseJSXBoundaryElement();if(i.type===s.JSXSyntax.JSXOpeningElement){var o=i;if(o.selfClosing){var u=this.finalize(n,new a.JSXElement(o,[],null));e.children.push(u)}else t.push(e),e={node:n,opening:o,closing:null,children:[]}}if(i.type===s.JSXSyntax.JSXClosingElement){e.closing=i;var l=r(e.opening.name);if(l!==r(e.closing.name)&&this.tolerateError("Expected corresponding JSX closing tag for %0",l),!(t.length>0))break;var u=this.finalize(e.node,new a.JSXElement(e.opening,e.children,e.closing));e=t[t.length-1],e.children.push(u),t.pop()}}return e},t.prototype.parseJSXElement=function(){var e=this.createJSXNode(),t=this.parseJSXOpeningElement(),n=[],r=null;if(!t.selfClosing){var i=this.parseComplexJSXElement({node:e,opening:t,closing:r,children:n});n=i.children,r=i.closing}return this.finalize(e,new a.JSXElement(t,n,r))},t.prototype.parseJSXRoot=function(){this.config.tokens&&this.tokens.pop(),this.startJSX();var e=this.parseJSXElement();return this.finishJSX(),e},t.prototype.isStartOfExpression=function(){return e.prototype.isStartOfExpression.call(this)||this.match("<")},t}(l.Parser);t.JSXParser=f},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n={NonAsciiIdentifierStart:/[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]/,NonAsciiIdentifierPart:/[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B4\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/};t.Character={fromCodePoint:function(e){return e<65536?String.fromCharCode(e):String.fromCharCode(55296+(e-65536>>10))+String.fromCharCode(56320+(e-65536&1023))},isWhiteSpace:function(e){return 32===e||9===e||11===e||12===e||160===e||e>=5760&&[5760,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8239,8287,12288,65279].indexOf(e)>=0},isLineTerminator:function(e){return 10===e||13===e||8232===e||8233===e},isIdentifierStart:function(e){return 36===e||95===e||e>=65&&e<=90||e>=97&&e<=122||92===e||e>=128&&n.NonAsciiIdentifierStart.test(t.Character.fromCodePoint(e))},isIdentifierPart:function(e){return 36===e||95===e||e>=65&&e<=90||e>=97&&e<=122||e>=48&&e<=57||92===e||e>=128&&n.NonAsciiIdentifierPart.test(t.Character.fromCodePoint(e))},isDecimalDigit:function(e){return e>=48&&e<=57},isHexDigit:function(e){return e>=48&&e<=57||e>=65&&e<=70||e>=97&&e<=102},isOctalDigit:function(e){return e>=48&&e<=55}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(6),i=function(){function e(e){this.type=r.JSXSyntax.JSXClosingElement,this.name=e}return e}();t.JSXClosingElement=i;var o=function(){function e(e,t,n){this.type=r.JSXSyntax.JSXElement,this.openingElement=e,this.children=t,this.closingElement=n}return e}();t.JSXElement=o;var a=function(){function e(){this.type=r.JSXSyntax.JSXEmptyExpression}return e}();t.JSXEmptyExpression=a;var s=function(){function e(e){this.type=r.JSXSyntax.JSXExpressionContainer,this.expression=e}return e}();t.JSXExpressionContainer=s;var u=function(){function e(e){this.type=r.JSXSyntax.JSXIdentifier,this.name=e}return e}();t.JSXIdentifier=u;var l=function(){function e(e,t){this.type=r.JSXSyntax.JSXMemberExpression,this.object=e,this.property=t}return e}();t.JSXMemberExpression=l;var c=function(){function e(e,t){this.type=r.JSXSyntax.JSXAttribute,this.name=e,this.value=t}return e}();t.JSXAttribute=c;var p=function(){function e(e,t){this.type=r.JSXSyntax.JSXNamespacedName,this.namespace=e,this.name=t}return e}();t.JSXNamespacedName=p;var f=function(){function e(e,t,n){this.type=r.JSXSyntax.JSXOpeningElement,this.name=e,this.selfClosing=t,this.attributes=n}return e}();t.JSXOpeningElement=f;var h=function(){function e(e){this.type=r.JSXSyntax.JSXSpreadAttribute,this.argument=e}return e}();t.JSXSpreadAttribute=h;var d=function(){function e(e,t){this.type=r.JSXSyntax.JSXText,this.value=e,this.raw=t}return e}();t.JSXText=d},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.JSXSyntax={JSXAttribute:"JSXAttribute",JSXClosingElement:"JSXClosingElement",JSXElement:"JSXElement",JSXEmptyExpression:"JSXEmptyExpression",JSXExpressionContainer:"JSXExpressionContainer",JSXIdentifier:"JSXIdentifier",JSXMemberExpression:"JSXMemberExpression",JSXNamespacedName:"JSXNamespacedName",JSXOpeningElement:"JSXOpeningElement",JSXSpreadAttribute:"JSXSpreadAttribute",JSXText:"JSXText"}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(2),i=function(){function e(e){this.type=r.Syntax.ArrayExpression,this.elements=e}return e}();t.ArrayExpression=i;var o=function(){function e(e){this.type=r.Syntax.ArrayPattern,this.elements=e}return e}();t.ArrayPattern=o;var a=function(){function e(e,t,n){this.type=r.Syntax.ArrowFunctionExpression,this.id=null,this.params=e,this.body=t,this.generator=!1,this.expression=n,this.async=!1}return e}();t.ArrowFunctionExpression=a;var s=function(){function e(e,t,n){this.type=r.Syntax.AssignmentExpression,this.operator=e,this.left=t,this.right=n}return e}();t.AssignmentExpression=s;var u=function(){function e(e,t){this.type=r.Syntax.AssignmentPattern,this.left=e,this.right=t}return e}();t.AssignmentPattern=u;var l=function(){function e(e,t,n){this.type=r.Syntax.ArrowFunctionExpression,this.id=null,this.params=e,this.body=t,this.generator=!1,this.expression=n,this.async=!0}return e}();t.AsyncArrowFunctionExpression=l;var c=function(){function e(e,t,n){this.type=r.Syntax.FunctionDeclaration,this.id=e,this.params=t,this.body=n,this.generator=!1,this.expression=!1,this.async=!0}return e}();t.AsyncFunctionDeclaration=c;var p=function(){function e(e,t,n){this.type=r.Syntax.FunctionExpression,this.id=e,this.params=t,this.body=n,this.generator=!1,this.expression=!1,this.async=!0}return e}();t.AsyncFunctionExpression=p;var f=function(){function e(e){this.type=r.Syntax.AwaitExpression,this.argument=e}return e}();t.AwaitExpression=f;var h=function(){function e(e,t,n){var i="||"===e||"&&"===e;this.type=i?r.Syntax.LogicalExpression:r.Syntax.BinaryExpression,this.operator=e,this.left=t,this.right=n}return e}();t.BinaryExpression=h;var d=function(){function e(e){this.type=r.Syntax.BlockStatement,this.body=e}return e}();t.BlockStatement=d;var m=function(){function e(e){this.type=r.Syntax.BreakStatement,this.label=e}return e}();t.BreakStatement=m;var v=function(){function e(e,t){this.type=r.Syntax.CallExpression,this.callee=e,this.arguments=t}return e}();t.CallExpression=v;var g=function(){function e(e,t){this.type=r.Syntax.CatchClause,this.param=e,this.body=t}return e}();t.CatchClause=g;var y=function(){function e(e){this.type=r.Syntax.ClassBody,this.body=e}return e}();t.ClassBody=y;var _=function(){function e(e,t,n){this.type=r.Syntax.ClassDeclaration,this.id=e,this.superClass=t,this.body=n}return e}();t.ClassDeclaration=_;var b=function(){function e(e,t,n){this.type=r.Syntax.ClassExpression,this.id=e,this.superClass=t,this.body=n}return e}();t.ClassExpression=b;var x=function(){function e(e,t){this.type=r.Syntax.MemberExpression,this.computed=!0,this.object=e,this.property=t}return e}();t.ComputedMemberExpression=x;var w=function(){function e(e,t,n){this.type=r.Syntax.ConditionalExpression,this.test=e,this.consequent=t,this.alternate=n}return e}();t.ConditionalExpression=w;var k=function(){function e(e){this.type=r.Syntax.ContinueStatement,this.label=e}return e}();t.ContinueStatement=k;var E=function(){function e(){this.type=r.Syntax.DebuggerStatement}return e}();t.DebuggerStatement=E;var S=function(){function e(e,t){this.type=r.Syntax.ExpressionStatement,this.expression=e,this.directive=t}return e}();t.Directive=S;var C=function(){function e(e,t){this.type=r.Syntax.DoWhileStatement,this.body=e,this.test=t}return e}();t.DoWhileStatement=C;var A=function(){function e(){this.type=r.Syntax.EmptyStatement}return e}();t.EmptyStatement=A;var D=function(){function e(e){this.type=r.Syntax.ExportAllDeclaration,this.source=e}return e}();t.ExportAllDeclaration=D;var O=function(){function e(e){this.type=r.Syntax.ExportDefaultDeclaration,this.declaration=e}return e}();t.ExportDefaultDeclaration=O;var M=function(){function e(e,t,n){this.type=r.Syntax.ExportNamedDeclaration,this.declaration=e,this.specifiers=t,this.source=n}return e}();t.ExportNamedDeclaration=M;var T=function(){function e(e,t){this.type=r.Syntax.ExportSpecifier,this.exported=t,this.local=e}return e}();t.ExportSpecifier=T;var P=function(){function e(e){this.type=r.Syntax.ExpressionStatement,this.expression=e}return e}();t.ExpressionStatement=P;var I=function(){function e(e,t,n){this.type=r.Syntax.ForInStatement,this.left=e,this.right=t,this.body=n,this.each=!1}return e}();t.ForInStatement=I;var R=function(){function e(e,t,n){this.type=r.Syntax.ForOfStatement,this.left=e,this.right=t,this.body=n}return e}();t.ForOfStatement=R;var j=function(){function e(e,t,n,i){this.type=r.Syntax.ForStatement,this.init=e,this.test=t,this.update=n,this.body=i}return e}();t.ForStatement=j;var F=function(){function e(e,t,n,i){this.type=r.Syntax.FunctionDeclaration,this.id=e,this.params=t,this.body=n,this.generator=i,this.expression=!1,this.async=!1}return e}();t.FunctionDeclaration=F;var N=function(){function e(e,t,n,i){this.type=r.Syntax.FunctionExpression,this.id=e,this.params=t,this.body=n,this.generator=i,this.expression=!1,this.async=!1}return e}();t.FunctionExpression=N;var B=function(){function e(e){this.type=r.Syntax.Identifier,this.name=e}return e}();t.Identifier=B;var L=function(){function e(e,t,n){this.type=r.Syntax.IfStatement,this.test=e,this.consequent=t,this.alternate=n}return e}();t.IfStatement=L;var q=function(){function e(e,t){this.type=r.Syntax.ImportDeclaration,this.specifiers=e,this.source=t}return e}();t.ImportDeclaration=q;var z=function(){function e(e){this.type=r.Syntax.ImportDefaultSpecifier,this.local=e}return e}();t.ImportDefaultSpecifier=z;var U=function(){function e(e){this.type=r.Syntax.ImportNamespaceSpecifier,this.local=e}return e}();t.ImportNamespaceSpecifier=U;var W=function(){function e(e,t){this.type=r.Syntax.ImportSpecifier,this.local=e,this.imported=t}return e}();t.ImportSpecifier=W;var V=function(){function e(e,t){this.type=r.Syntax.LabeledStatement,this.label=e,this.body=t}return e}();t.LabeledStatement=V;var H=function(){function e(e,t){this.type=r.Syntax.Literal,this.value=e,this.raw=t}return e}();t.Literal=H;var G=function(){function e(e,t){this.type=r.Syntax.MetaProperty,this.meta=e,this.property=t}return e}();t.MetaProperty=G;var J=function(){function e(e,t,n,i,o){this.type=r.Syntax.MethodDefinition,this.key=e,this.computed=t,this.value=n,this.kind=i,this.static=o}return e}();t.MethodDefinition=J;var K=function(){function e(e){this.type=r.Syntax.Program,this.body=e,this.sourceType="module"}return e}();t.Module=K;var X=function(){function e(e,t){this.type=r.Syntax.NewExpression,this.callee=e,this.arguments=t}return e}();t.NewExpression=X;var Y=function(){function e(e){this.type=r.Syntax.ObjectExpression,this.properties=e}return e}();t.ObjectExpression=Y;var $=function(){function e(e){this.type=r.Syntax.ObjectPattern,this.properties=e}return e}();t.ObjectPattern=$;var Z=function(){function e(e,t,n,i,o,a){this.type=r.Syntax.Property,this.key=t,this.computed=n,this.value=i,this.kind=e,this.method=o,this.shorthand=a}return e}();t.Property=Z;var Q=function(){function e(e,t,n,i){this.type=r.Syntax.Literal,this.value=e,this.raw=t,this.regex={pattern:n,flags:i}}return e}();t.RegexLiteral=Q;var ee=function(){function e(e){this.type=r.Syntax.RestElement,this.argument=e}return e}();t.RestElement=ee;var te=function(){function e(e){this.type=r.Syntax.ReturnStatement,this.argument=e}return e}();t.ReturnStatement=te;var ne=function(){function e(e){this.type=r.Syntax.Program,this.body=e,this.sourceType="script"}return e}();t.Script=ne;var re=function(){function e(e){this.type=r.Syntax.SequenceExpression,this.expressions=e}return e}();t.SequenceExpression=re;var ie=function(){function e(e){this.type=r.Syntax.SpreadElement,this.argument=e}return e}();t.SpreadElement=ie;var oe=function(){function e(e,t){this.type=r.Syntax.MemberExpression,this.computed=!1,this.object=e,this.property=t}return e}();t.StaticMemberExpression=oe;var ae=function(){function e(){this.type=r.Syntax.Super}return e}();t.Super=ae;var se=function(){function e(e,t){this.type=r.Syntax.SwitchCase,this.test=e,this.consequent=t}return e}();t.SwitchCase=se;var ue=function(){function e(e,t){this.type=r.Syntax.SwitchStatement,this.discriminant=e,this.cases=t}return e}();t.SwitchStatement=ue;var le=function(){function e(e,t){this.type=r.Syntax.TaggedTemplateExpression,this.tag=e,this.quasi=t}return e}();t.TaggedTemplateExpression=le;var ce=function(){function e(e,t){this.type=r.Syntax.TemplateElement,this.value=e,this.tail=t}return e}();t.TemplateElement=ce;var pe=function(){function e(e,t){this.type=r.Syntax.TemplateLiteral,this.quasis=e,this.expressions=t}return e}();t.TemplateLiteral=pe;var fe=function(){function e(){this.type=r.Syntax.ThisExpression}return e}();t.ThisExpression=fe;var he=function(){function e(e){this.type=r.Syntax.ThrowStatement,this.argument=e}return e}();t.ThrowStatement=he;var de=function(){function e(e,t,n){this.type=r.Syntax.TryStatement,this.block=e,this.handler=t,this.finalizer=n}return e}();t.TryStatement=de;var me=function(){function e(e,t){this.type=r.Syntax.UnaryExpression,this.operator=e,this.argument=t,this.prefix=!0}return e}();t.UnaryExpression=me;var ve=function(){function e(e,t,n){this.type=r.Syntax.UpdateExpression,this.operator=e,this.argument=t,this.prefix=n}return e}();t.UpdateExpression=ve;var ge=function(){function e(e,t){this.type=r.Syntax.VariableDeclaration,this.declarations=e,this.kind=t}return e}();t.VariableDeclaration=ge;var ye=function(){function e(e,t){this.type=r.Syntax.VariableDeclarator,this.id=e,this.init=t}return e}();t.VariableDeclarator=ye;var _e=function(){function e(e,t){this.type=r.Syntax.WhileStatement,this.test=e,this.body=t}return e}();t.WhileStatement=_e;var be=function(){function e(e,t){this.type=r.Syntax.WithStatement,this.object=e,this.body=t}return e}();t.WithStatement=be;var xe=function(){function e(e,t){this.type=r.Syntax.YieldExpression,this.argument=e,this.delegate=t}return e}();t.YieldExpression=xe},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(9),i=n(10),o=n(11),a=n(7),s=n(12),u=n(2),l=n(13),c=function(){function e(e,t,n){void 0===t&&(t={}),this.config={range:"boolean"==typeof t.range&&t.range,loc:"boolean"==typeof t.loc&&t.loc,source:null,tokens:"boolean"==typeof t.tokens&&t.tokens,comment:"boolean"==typeof t.comment&&t.comment,tolerant:"boolean"==typeof t.tolerant&&t.tolerant},this.config.loc&&t.source&&null!==t.source&&(this.config.source=String(t.source)),this.delegate=n,this.errorHandler=new i.ErrorHandler,this.errorHandler.tolerant=this.config.tolerant,this.scanner=new s.Scanner(e,this.errorHandler),this.scanner.trackComment=this.config.comment,this.operatorPrecedence={")":0,";":0,",":0,"=":0,"]":0,"||":1,"&&":2,"|":3,"^":4,"&":5,"==":6,"!=":6,"===":6,"!==":6,"<":7,">":7,"<=":7,">=":7,"<<":8,">>":8,">>>":8,"+":9,"-":9,"*":11,"/":11,"%":11},this.lookahead={type:2,value:"",lineNumber:this.scanner.lineNumber,lineStart:0,start:0,end:0},this.hasLineTerminator=!1,this.context={isModule:!1,await:!1,allowIn:!0,allowStrictDirective:!0,allowYield:!0,firstCoverInitializedNameError:null,isAssignmentTarget:!1,isBindingElement:!1,inFunctionBody:!1,inIteration:!1,inSwitch:!1,labelSet:{},strict:!1},this.tokens=[],this.startMarker={index:0,line:this.scanner.lineNumber,column:0},this.lastMarker={index:0,line:this.scanner.lineNumber,column:0},this.nextToken(),this.lastMarker={index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}}return e.prototype.throwError=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var i=Array.prototype.slice.call(arguments,1),o=e.replace(/%(\d)/g,function(e,t){return r.assert(t<i.length,"Message reference must be in range"),i[t]}),a=this.lastMarker.index,s=this.lastMarker.line,u=this.lastMarker.column+1;throw this.errorHandler.createError(a,s,u,o)},e.prototype.tolerateError=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var i=Array.prototype.slice.call(arguments,1),o=e.replace(/%(\d)/g,function(e,t){return r.assert(t<i.length,"Message reference must be in range"),i[t]}),a=this.lastMarker.index,s=this.scanner.lineNumber,u=this.lastMarker.column+1;this.errorHandler.tolerateError(a,s,u,o)},e.prototype.unexpectedTokenError=function(e,t){var n,r=t||o.Messages.UnexpectedToken;if(e?(t||(r=2===e.type?o.Messages.UnexpectedEOS:3===e.type?o.Messages.UnexpectedIdentifier:6===e.type?o.Messages.UnexpectedNumber:8===e.type?o.Messages.UnexpectedString:10===e.type?o.Messages.UnexpectedTemplate:o.Messages.UnexpectedToken,4===e.type&&(this.scanner.isFutureReservedWord(e.value)?r=o.Messages.UnexpectedReserved:this.context.strict&&this.scanner.isStrictModeReservedWord(e.value)&&(r=o.Messages.StrictReservedWord))),n=e.value):n="ILLEGAL",r=r.replace("%0",n),e&&"number"==typeof e.lineNumber){var i=e.start,a=e.lineNumber,s=this.lastMarker.index-this.lastMarker.column,u=e.start-s+1;return this.errorHandler.createError(i,a,u,r)}var i=this.lastMarker.index,a=this.lastMarker.line,u=this.lastMarker.column+1;return this.errorHandler.createError(i,a,u,r)},e.prototype.throwUnexpectedToken=function(e,t){throw this.unexpectedTokenError(e,t)},e.prototype.tolerateUnexpectedToken=function(e,t){this.errorHandler.tolerate(this.unexpectedTokenError(e,t))},e.prototype.collectComments=function(){if(this.config.comment){var e=this.scanner.scanComments();if(e.length>0&&this.delegate)for(var t=0;t<e.length;++t){var n=e[t],r=void 0;r={type:n.multiLine?"BlockComment":"LineComment",value:this.scanner.source.slice(n.slice[0],n.slice[1])},this.config.range&&(r.range=n.range),this.config.loc&&(r.loc=n.loc);var i={start:{line:n.loc.start.line,column:n.loc.start.column,offset:n.range[0]},end:{line:n.loc.end.line,column:n.loc.end.column,offset:n.range[1]}};this.delegate(r,i)}}else this.scanner.scanComments()},e.prototype.getTokenRaw=function(e){return this.scanner.source.slice(e.start,e.end)},e.prototype.convertToken=function(e){var t={type:l.TokenName[e.type],value:this.getTokenRaw(e)};if(this.config.range&&(t.range=[e.start,e.end]),this.config.loc&&(t.loc={start:{line:this.startMarker.line,column:this.startMarker.column},end:{line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}}),9===e.type){var n=e.pattern,r=e.flags;t.regex={pattern:n,flags:r}}return t},e.prototype.nextToken=function(){var e=this.lookahead;this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.collectComments(),this.scanner.index!==this.startMarker.index&&(this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart);var t=this.scanner.lex();return this.hasLineTerminator=e.lineNumber!==t.lineNumber,t&&this.context.strict&&3===t.type&&this.scanner.isStrictModeReservedWord(t.value)&&(t.type=4),this.lookahead=t,this.config.tokens&&2!==t.type&&this.tokens.push(this.convertToken(t)),e},e.prototype.nextRegexToken=function(){this.collectComments();var e=this.scanner.scanRegExp();return this.config.tokens&&(this.tokens.pop(),this.tokens.push(this.convertToken(e))),this.lookahead=e,this.nextToken(),e},e.prototype.createNode=function(){return{index:this.startMarker.index,line:this.startMarker.line,column:this.startMarker.column}},e.prototype.startNode=function(e){return{index:e.start,line:e.lineNumber,column:e.start-e.lineStart}},e.prototype.finalize=function(e,t){if(this.config.range&&(t.range=[e.index,this.lastMarker.index]),this.config.loc&&(t.loc={start:{line:e.line,column:e.column},end:{line:this.lastMarker.line,column:this.lastMarker.column}},this.config.source&&(t.loc.source=this.config.source)),this.delegate){var n={start:{line:e.line,column:e.column,offset:e.index},end:{line:this.lastMarker.line,column:this.lastMarker.column,offset:this.lastMarker.index}};this.delegate(t,n)}return t},e.prototype.expect=function(e){var t=this.nextToken();7===t.type&&t.value===e||this.throwUnexpectedToken(t)},e.prototype.expectCommaSeparator=function(){if(this.config.tolerant){var e=this.lookahead;7===e.type&&","===e.value?this.nextToken():7===e.type&&";"===e.value?(this.nextToken(),this.tolerateUnexpectedToken(e)):this.tolerateUnexpectedToken(e,o.Messages.UnexpectedToken)}else this.expect(",")},e.prototype.expectKeyword=function(e){var t=this.nextToken();4===t.type&&t.value===e||this.throwUnexpectedToken(t)},e.prototype.match=function(e){return 7===this.lookahead.type&&this.lookahead.value===e},e.prototype.matchKeyword=function(e){return 4===this.lookahead.type&&this.lookahead.value===e},e.prototype.matchContextualKeyword=function(e){return 3===this.lookahead.type&&this.lookahead.value===e},e.prototype.matchAssign=function(){if(7!==this.lookahead.type)return!1;var e=this.lookahead.value;return"="===e||"*="===e||"**="===e||"/="===e||"%="===e||"+="===e||"-="===e||"<<="===e||">>="===e||">>>="===e||"&="===e||"^="===e||"|="===e},e.prototype.isolateCoverGrammar=function(e){var t=this.context.isBindingElement,n=this.context.isAssignmentTarget,r=this.context.firstCoverInitializedNameError;this.context.isBindingElement=!0,this.context.isAssignmentTarget=!0,this.context.firstCoverInitializedNameError=null;var i=e.call(this);return null!==this.context.firstCoverInitializedNameError&&this.throwUnexpectedToken(this.context.firstCoverInitializedNameError),this.context.isBindingElement=t,this.context.isAssignmentTarget=n,this.context.firstCoverInitializedNameError=r,i},e.prototype.inheritCoverGrammar=function(e){var t=this.context.isBindingElement,n=this.context.isAssignmentTarget,r=this.context.firstCoverInitializedNameError;this.context.isBindingElement=!0,this.context.isAssignmentTarget=!0,this.context.firstCoverInitializedNameError=null;var i=e.call(this);return this.context.isBindingElement=this.context.isBindingElement&&t,this.context.isAssignmentTarget=this.context.isAssignmentTarget&&n,this.context.firstCoverInitializedNameError=r||this.context.firstCoverInitializedNameError,i},e.prototype.consumeSemicolon=function(){this.match(";")?this.nextToken():this.hasLineTerminator||(2===this.lookahead.type||this.match("}")||this.throwUnexpectedToken(this.lookahead),this.lastMarker.index=this.startMarker.index,this.lastMarker.line=this.startMarker.line,this.lastMarker.column=this.startMarker.column)},e.prototype.parsePrimaryExpression=function(){var e,t,n,r=this.createNode();switch(this.lookahead.type){case 3:(this.context.isModule||this.context.await)&&"await"===this.lookahead.value&&this.tolerateUnexpectedToken(this.lookahead),e=this.matchAsyncFunction()?this.parseFunctionExpression():this.finalize(r,new a.Identifier(this.nextToken().value));break;case 6:case 8:this.context.strict&&this.lookahead.octal&&this.tolerateUnexpectedToken(this.lookahead,o.Messages.StrictOctalLiteral),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,t=this.nextToken(),n=this.getTokenRaw(t),e=this.finalize(r,new a.Literal(t.value,n));break;case 1:this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,t=this.nextToken(),n=this.getTokenRaw(t),e=this.finalize(r,new a.Literal("true"===t.value,n));break;case 5:this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,t=this.nextToken(),n=this.getTokenRaw(t),e=this.finalize(r,new a.Literal(null,n));break;case 10:e=this.parseTemplateLiteral();break;case 7:switch(this.lookahead.value){case"(":this.context.isBindingElement=!1,e=this.inheritCoverGrammar(this.parseGroupExpression);break;case"[":e=this.inheritCoverGrammar(this.parseArrayInitializer);break;case"{":e=this.inheritCoverGrammar(this.parseObjectInitializer);break;case"/":case"/=":this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.scanner.index=this.startMarker.index,t=this.nextRegexToken(),n=this.getTokenRaw(t),e=this.finalize(r,new a.RegexLiteral(t.regex,n,t.pattern,t.flags));break;default:e=this.throwUnexpectedToken(this.nextToken())}break;case 4:!this.context.strict&&this.context.allowYield&&this.matchKeyword("yield")?e=this.parseIdentifierName():!this.context.strict&&this.matchKeyword("let")?e=this.finalize(r,new a.Identifier(this.nextToken().value)):(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.matchKeyword("function")?e=this.parseFunctionExpression():this.matchKeyword("this")?(this.nextToken(),e=this.finalize(r,new a.ThisExpression)):e=this.matchKeyword("class")?this.parseClassExpression():this.throwUnexpectedToken(this.nextToken()));break;default:e=this.throwUnexpectedToken(this.nextToken())}return e},e.prototype.parseSpreadElement=function(){var e=this.createNode();this.expect("...");var t=this.inheritCoverGrammar(this.parseAssignmentExpression);return this.finalize(e,new a.SpreadElement(t))},e.prototype.parseArrayInitializer=function(){var e=this.createNode(),t=[];for(this.expect("[");!this.match("]");)if(this.match(","))this.nextToken(),t.push(null);else if(this.match("...")){var n=this.parseSpreadElement();this.match("]")||(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.expect(",")),t.push(n)}else t.push(this.inheritCoverGrammar(this.parseAssignmentExpression)),this.match("]")||this.expect(",");return this.expect("]"),this.finalize(e,new a.ArrayExpression(t))},e.prototype.parsePropertyMethod=function(e){this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var t=this.context.strict,n=this.context.allowStrictDirective;this.context.allowStrictDirective=e.simple;var r=this.isolateCoverGrammar(this.parseFunctionSourceElements);return this.context.strict&&e.firstRestricted&&this.tolerateUnexpectedToken(e.firstRestricted,e.message),this.context.strict&&e.stricted&&this.tolerateUnexpectedToken(e.stricted,e.message),this.context.strict=t,this.context.allowStrictDirective=n,r},e.prototype.parsePropertyMethodFunction=function(){var e=this.createNode(),t=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters(),r=this.parsePropertyMethod(n);return this.context.allowYield=t,this.finalize(e,new a.FunctionExpression(null,n.params,r,!1))},e.prototype.parsePropertyMethodAsyncFunction=function(){var e=this.createNode(),t=this.context.allowYield,n=this.context.await;this.context.allowYield=!1,this.context.await=!0;var r=this.parseFormalParameters(),i=this.parsePropertyMethod(r);return this.context.allowYield=t,this.context.await=n,this.finalize(e,new a.AsyncFunctionExpression(null,r.params,i))},e.prototype.parseObjectPropertyKey=function(){var e,t=this.createNode(),n=this.nextToken();switch(n.type){case 8:case 6:this.context.strict&&n.octal&&this.tolerateUnexpectedToken(n,o.Messages.StrictOctalLiteral);var r=this.getTokenRaw(n);e=this.finalize(t,new a.Literal(n.value,r));break;case 3:case 1:case 5:case 4:e=this.finalize(t,new a.Identifier(n.value));break;case 7:"["===n.value?(e=this.isolateCoverGrammar(this.parseAssignmentExpression),this.expect("]")):e=this.throwUnexpectedToken(n);break;default:e=this.throwUnexpectedToken(n)}return e},e.prototype.isPropertyKey=function(e,t){return e.type===u.Syntax.Identifier&&e.name===t||e.type===u.Syntax.Literal&&e.value===t},e.prototype.parseObjectProperty=function(e){var t,n=this.createNode(),r=this.lookahead,i=null,s=null,u=!1,l=!1,c=!1,p=!1;if(3===r.type){var f=r.value;this.nextToken(),u=this.match("["),p=!(this.hasLineTerminator||"async"!==f||this.match(":")||this.match("(")||this.match("*")),i=p?this.parseObjectPropertyKey():this.finalize(n,new a.Identifier(f))}else this.match("*")?this.nextToken():(u=this.match("["),i=this.parseObjectPropertyKey());var h=this.qualifiedPropertyName(this.lookahead);if(3===r.type&&!p&&"get"===r.value&&h)t="get",u=this.match("["),i=this.parseObjectPropertyKey(),this.context.allowYield=!1,s=this.parseGetterMethod();else if(3===r.type&&!p&&"set"===r.value&&h)t="set",u=this.match("["),i=this.parseObjectPropertyKey(),s=this.parseSetterMethod();else if(7===r.type&&"*"===r.value&&h)t="init",u=this.match("["),i=this.parseObjectPropertyKey(),s=this.parseGeneratorMethod(),l=!0;else if(i||this.throwUnexpectedToken(this.lookahead),t="init",this.match(":")&&!p)!u&&this.isPropertyKey(i,"__proto__")&&(e.value&&this.tolerateError(o.Messages.DuplicateProtoProperty),e.value=!0),this.nextToken(),s=this.inheritCoverGrammar(this.parseAssignmentExpression);else if(this.match("("))s=p?this.parsePropertyMethodAsyncFunction():this.parsePropertyMethodFunction(),l=!0;else if(3===r.type){var f=this.finalize(n,new a.Identifier(r.value));if(this.match("=")){this.context.firstCoverInitializedNameError=this.lookahead,this.nextToken(),c=!0;var d=this.isolateCoverGrammar(this.parseAssignmentExpression);s=this.finalize(n,new a.AssignmentPattern(f,d))}else c=!0,s=f}else this.throwUnexpectedToken(this.nextToken());return this.finalize(n,new a.Property(t,i,u,s,l,c))},e.prototype.parseObjectInitializer=function(){var e=this.createNode();this.expect("{");for(var t=[],n={value:!1};!this.match("}");)t.push(this.parseObjectProperty(n)),this.match("}")||this.expectCommaSeparator();return this.expect("}"),this.finalize(e,new a.ObjectExpression(t))},e.prototype.parseTemplateHead=function(){r.assert(this.lookahead.head,"Template literal must start with a template head");var e=this.createNode(),t=this.nextToken(),n=t.value,i=t.cooked;return this.finalize(e,new a.TemplateElement({raw:n,cooked:i},t.tail))},e.prototype.parseTemplateElement=function(){10!==this.lookahead.type&&this.throwUnexpectedToken();var e=this.createNode(),t=this.nextToken(),n=t.value,r=t.cooked;return this.finalize(e,new a.TemplateElement({raw:n,cooked:r},t.tail))},e.prototype.parseTemplateLiteral=function(){var e=this.createNode(),t=[],n=[],r=this.parseTemplateHead();for(n.push(r);!r.tail;)t.push(this.parseExpression()),r=this.parseTemplateElement(),n.push(r);return this.finalize(e,new a.TemplateLiteral(n,t))},e.prototype.reinterpretExpressionAsPattern=function(e){switch(e.type){case u.Syntax.Identifier:case u.Syntax.MemberExpression:case u.Syntax.RestElement:case u.Syntax.AssignmentPattern:break;case u.Syntax.SpreadElement:e.type=u.Syntax.RestElement,this.reinterpretExpressionAsPattern(e.argument);break;case u.Syntax.ArrayExpression:e.type=u.Syntax.ArrayPattern;for(var t=0;t<e.elements.length;t++)null!==e.elements[t]&&this.reinterpretExpressionAsPattern(e.elements[t]);break;case u.Syntax.ObjectExpression:e.type=u.Syntax.ObjectPattern;for(var t=0;t<e.properties.length;t++)this.reinterpretExpressionAsPattern(e.properties[t].value);break;case u.Syntax.AssignmentExpression:e.type=u.Syntax.AssignmentPattern,delete e.operator,this.reinterpretExpressionAsPattern(e.left)}},e.prototype.parseGroupExpression=function(){var e;if(this.expect("("),this.match(")"))this.nextToken(),this.match("=>")||this.expect("=>"),e={type:"ArrowParameterPlaceHolder",params:[],async:!1};else{var t=this.lookahead,n=[];if(this.match("..."))e=this.parseRestElement(n),this.expect(")"),this.match("=>")||this.expect("=>"),e={type:"ArrowParameterPlaceHolder",params:[e],async:!1};else{var r=!1;if(this.context.isBindingElement=!0,e=this.inheritCoverGrammar(this.parseAssignmentExpression),this.match(",")){var i=[];for(this.context.isAssignmentTarget=!1,i.push(e);2!==this.lookahead.type&&this.match(",");){if(this.nextToken(),this.match(")")){this.nextToken();for(var o=0;o<i.length;o++)this.reinterpretExpressionAsPattern(i[o]);r=!0,e={type:"ArrowParameterPlaceHolder",params:i,async:!1}}else if(this.match("...")){this.context.isBindingElement||this.throwUnexpectedToken(this.lookahead),i.push(this.parseRestElement(n)),this.expect(")"),this.match("=>")||this.expect("=>"),this.context.isBindingElement=!1;for(var o=0;o<i.length;o++)this.reinterpretExpressionAsPattern(i[o]);r=!0,e={type:"ArrowParameterPlaceHolder",params:i,async:!1}}else i.push(this.inheritCoverGrammar(this.parseAssignmentExpression));if(r)break}r||(e=this.finalize(this.startNode(t),new a.SequenceExpression(i)))}if(!r){if(this.expect(")"),this.match("=>")&&(e.type===u.Syntax.Identifier&&"yield"===e.name&&(r=!0,e={type:"ArrowParameterPlaceHolder",params:[e],async:!1}),!r)){if(this.context.isBindingElement||this.throwUnexpectedToken(this.lookahead),e.type===u.Syntax.SequenceExpression)for(var o=0;o<e.expressions.length;o++)this.reinterpretExpressionAsPattern(e.expressions[o]);else this.reinterpretExpressionAsPattern(e);e={type:"ArrowParameterPlaceHolder",params:e.type===u.Syntax.SequenceExpression?e.expressions:[e],async:!1}}this.context.isBindingElement=!1}}}return e},e.prototype.parseArguments=function(){this.expect("(");var e=[];if(!this.match(")"))for(;;){var t=this.match("...")?this.parseSpreadElement():this.isolateCoverGrammar(this.parseAssignmentExpression);if(e.push(t),this.match(")"))break;if(this.expectCommaSeparator(),this.match(")"))break}return this.expect(")"),e},e.prototype.isIdentifierName=function(e){return 3===e.type||4===e.type||1===e.type||5===e.type},e.prototype.parseIdentifierName=function(){var e=this.createNode(),t=this.nextToken();return this.isIdentifierName(t)||this.throwUnexpectedToken(t),this.finalize(e,new a.Identifier(t.value))},e.prototype.parseNewExpression=function(){var e=this.createNode(),t=this.parseIdentifierName();r.assert("new"===t.name,"New expression must start with `new`");var n;if(this.match("."))if(this.nextToken(),3===this.lookahead.type&&this.context.inFunctionBody&&"target"===this.lookahead.value){var i=this.parseIdentifierName();n=new a.MetaProperty(t,i)}else this.throwUnexpectedToken(this.lookahead);else{var o=this.isolateCoverGrammar(this.parseLeftHandSideExpression),s=this.match("(")?this.parseArguments():[];n=new a.NewExpression(o,s),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}return this.finalize(e,n)},e.prototype.parseAsyncArgument=function(){var e=this.parseAssignmentExpression();return this.context.firstCoverInitializedNameError=null,e},e.prototype.parseAsyncArguments=function(){this.expect("(");var e=[];if(!this.match(")"))for(;;){var t=this.match("...")?this.parseSpreadElement():this.isolateCoverGrammar(this.parseAsyncArgument);if(e.push(t),this.match(")"))break;if(this.expectCommaSeparator(),this.match(")"))break}return this.expect(")"),e},e.prototype.parseLeftHandSideExpressionAllowCall=function(){var e=this.lookahead,t=this.matchContextualKeyword("async"),n=this.context.allowIn;this.context.allowIn=!0;var r;for(this.matchKeyword("super")&&this.context.inFunctionBody?(r=this.createNode(),this.nextToken(),r=this.finalize(r,new a.Super),this.match("(")||this.match(".")||this.match("[")||this.throwUnexpectedToken(this.lookahead)):r=this.inheritCoverGrammar(this.matchKeyword("new")?this.parseNewExpression:this.parsePrimaryExpression);;)if(this.match(".")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect(".");var i=this.parseIdentifierName();r=this.finalize(this.startNode(e),new a.StaticMemberExpression(r,i))}else if(this.match("(")){var o=t&&e.lineNumber===this.lookahead.lineNumber;this.context.isBindingElement=!1,this.context.isAssignmentTarget=!1;var s=o?this.parseAsyncArguments():this.parseArguments();if(r=this.finalize(this.startNode(e),new a.CallExpression(r,s)),o&&this.match("=>")){for(var u=0;u<s.length;++u)this.reinterpretExpressionAsPattern(s[u]);r={type:"ArrowParameterPlaceHolder",params:s,async:!0}}}else if(this.match("[")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect("[");var i=this.isolateCoverGrammar(this.parseExpression);this.expect("]"),r=this.finalize(this.startNode(e),new a.ComputedMemberExpression(r,i))}else{if(10!==this.lookahead.type||!this.lookahead.head)break;var l=this.parseTemplateLiteral();r=this.finalize(this.startNode(e),new a.TaggedTemplateExpression(r,l))}return this.context.allowIn=n,r},e.prototype.parseSuper=function(){var e=this.createNode();return this.expectKeyword("super"),this.match("[")||this.match(".")||this.throwUnexpectedToken(this.lookahead),this.finalize(e,new a.Super)},e.prototype.parseLeftHandSideExpression=function(){r.assert(this.context.allowIn,"callee of new expression always allow in keyword.");for(var e=this.startNode(this.lookahead),t=this.matchKeyword("super")&&this.context.inFunctionBody?this.parseSuper():this.inheritCoverGrammar(this.matchKeyword("new")?this.parseNewExpression:this.parsePrimaryExpression);;)if(this.match("[")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect("[");var n=this.isolateCoverGrammar(this.parseExpression);this.expect("]"),t=this.finalize(e,new a.ComputedMemberExpression(t,n))}else if(this.match(".")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect(".");var n=this.parseIdentifierName();t=this.finalize(e,new a.StaticMemberExpression(t,n))}else{if(10!==this.lookahead.type||!this.lookahead.head)break;var i=this.parseTemplateLiteral();t=this.finalize(e,new a.TaggedTemplateExpression(t,i))}return t},e.prototype.parseUpdateExpression=function(){var e,t=this.lookahead;if(this.match("++")||this.match("--")){var n=this.startNode(t),r=this.nextToken();e=this.inheritCoverGrammar(this.parseUnaryExpression),this.context.strict&&e.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(e.name)&&this.tolerateError(o.Messages.StrictLHSPrefix),this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment);var i=!0;e=this.finalize(n,new a.UpdateExpression(r.value,e,i)),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}else if(e=this.inheritCoverGrammar(this.parseLeftHandSideExpressionAllowCall),!this.hasLineTerminator&&7===this.lookahead.type&&(this.match("++")||this.match("--"))){this.context.strict&&e.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(e.name)&&this.tolerateError(o.Messages.StrictLHSPostfix),this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var s=this.nextToken().value,i=!1;e=this.finalize(this.startNode(t),new a.UpdateExpression(s,e,i))}return e},e.prototype.parseAwaitExpression=function(){var e=this.createNode();this.nextToken();var t=this.parseUnaryExpression();return this.finalize(e,new a.AwaitExpression(t))},e.prototype.parseUnaryExpression=function(){var e;if(this.match("+")||this.match("-")||this.match("~")||this.match("!")||this.matchKeyword("delete")||this.matchKeyword("void")||this.matchKeyword("typeof")){var t=this.startNode(this.lookahead),n=this.nextToken();e=this.inheritCoverGrammar(this.parseUnaryExpression),e=this.finalize(t,new a.UnaryExpression(n.value,e)),this.context.strict&&"delete"===e.operator&&e.argument.type===u.Syntax.Identifier&&this.tolerateError(o.Messages.StrictDelete),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}else e=this.context.await&&this.matchContextualKeyword("await")?this.parseAwaitExpression():this.parseUpdateExpression();return e},e.prototype.parseExponentiationExpression=function(){var e=this.lookahead,t=this.inheritCoverGrammar(this.parseUnaryExpression);if(t.type!==u.Syntax.UnaryExpression&&this.match("**")){this.nextToken(),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var n=t,r=this.isolateCoverGrammar(this.parseExponentiationExpression);t=this.finalize(this.startNode(e),new a.BinaryExpression("**",n,r))}return t},e.prototype.binaryPrecedence=function(e){var t=e.value;return 7===e.type?this.operatorPrecedence[t]||0:4===e.type&&("instanceof"===t||this.context.allowIn&&"in"===t)?7:0},e.prototype.parseBinaryExpression=function(){var e=this.lookahead,t=this.inheritCoverGrammar(this.parseExponentiationExpression),n=this.lookahead,r=this.binaryPrecedence(n);if(r>0){this.nextToken(),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;for(var i=[e,this.lookahead],o=t,s=this.isolateCoverGrammar(this.parseExponentiationExpression),u=[o,n.value,s],l=[r];;){if((r=this.binaryPrecedence(this.lookahead))<=0)break;for(;u.length>2&&r<=l[l.length-1];){s=u.pop();var c=u.pop();l.pop(),o=u.pop(),i.pop();var p=this.startNode(i[i.length-1]);u.push(this.finalize(p,new a.BinaryExpression(c,o,s)))}u.push(this.nextToken().value),l.push(r),i.push(this.lookahead),u.push(this.isolateCoverGrammar(this.parseExponentiationExpression))}var f=u.length-1;for(t=u[f],i.pop();f>1;){var p=this.startNode(i.pop()),c=u[f-1];t=this.finalize(p,new a.BinaryExpression(c,u[f-2],t)),f-=2}}return t},e.prototype.parseConditionalExpression=function(){var e=this.lookahead,t=this.inheritCoverGrammar(this.parseBinaryExpression);if(this.match("?")){this.nextToken();var n=this.context.allowIn;this.context.allowIn=!0;var r=this.isolateCoverGrammar(this.parseAssignmentExpression);this.context.allowIn=n,this.expect(":");var i=this.isolateCoverGrammar(this.parseAssignmentExpression);t=this.finalize(this.startNode(e),new a.ConditionalExpression(t,r,i)),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}return t},e.prototype.checkPatternParam=function(e,t){switch(t.type){case u.Syntax.Identifier:this.validateParam(e,t,t.name);break;case u.Syntax.RestElement:this.checkPatternParam(e,t.argument);break;case u.Syntax.AssignmentPattern:this.checkPatternParam(e,t.left);break;case u.Syntax.ArrayPattern:for(var n=0;n<t.elements.length;n++)null!==t.elements[n]&&this.checkPatternParam(e,t.elements[n]);break;case u.Syntax.ObjectPattern:for(var n=0;n<t.properties.length;n++)this.checkPatternParam(e,t.properties[n].value)}e.simple=e.simple&&t instanceof a.Identifier},e.prototype.reinterpretAsCoverFormalsList=function(e){var t,n=[e],r=!1;switch(e.type){case u.Syntax.Identifier:break;case"ArrowParameterPlaceHolder":n=e.params,r=e.async;break;default:return null}t={simple:!0,paramSet:{}};for(var i=0;i<n.length;++i){var a=n[i];a.type===u.Syntax.AssignmentPattern?a.right.type===u.Syntax.YieldExpression&&(a.right.argument&&this.throwUnexpectedToken(this.lookahead),a.right.type=u.Syntax.Identifier,a.right.name="yield",delete a.right.argument,delete a.right.delegate):r&&a.type===u.Syntax.Identifier&&"await"===a.name&&this.throwUnexpectedToken(this.lookahead),this.checkPatternParam(t,a),n[i]=a}if(this.context.strict||!this.context.allowYield)for(var i=0;i<n.length;++i){var a=n[i];a.type===u.Syntax.YieldExpression&&this.throwUnexpectedToken(this.lookahead)}if(t.message===o.Messages.StrictParamDupe){var s=this.context.strict?t.stricted:t.firstRestricted;this.throwUnexpectedToken(s,t.message)}return{simple:t.simple,params:n,stricted:t.stricted,firstRestricted:t.firstRestricted,message:t.message}},e.prototype.parseAssignmentExpression=function(){var e;if(!this.context.allowYield&&this.matchKeyword("yield"))e=this.parseYieldExpression();else{var t=this.lookahead,n=t;if(e=this.parseConditionalExpression(),3===n.type&&n.lineNumber===this.lookahead.lineNumber&&"async"===n.value&&(3===this.lookahead.type||this.matchKeyword("yield"))){var r=this.parsePrimaryExpression();this.reinterpretExpressionAsPattern(r),e={type:"ArrowParameterPlaceHolder",params:[r],async:!0}}if("ArrowParameterPlaceHolder"===e.type||this.match("=>")){this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var i=e.async,s=this.reinterpretAsCoverFormalsList(e);if(s){this.hasLineTerminator&&this.tolerateUnexpectedToken(this.lookahead),this.context.firstCoverInitializedNameError=null;var l=this.context.strict,c=this.context.allowStrictDirective;this.context.allowStrictDirective=s.simple;var p=this.context.allowYield,f=this.context.await;this.context.allowYield=!0,this.context.await=i;var h=this.startNode(t);this.expect("=>");var d=void 0;if(this.match("{")){var m=this.context.allowIn;this.context.allowIn=!0,d=this.parseFunctionSourceElements(),this.context.allowIn=m}else d=this.isolateCoverGrammar(this.parseAssignmentExpression);var v=d.type!==u.Syntax.BlockStatement;this.context.strict&&s.firstRestricted&&this.throwUnexpectedToken(s.firstRestricted,s.message),this.context.strict&&s.stricted&&this.tolerateUnexpectedToken(s.stricted,s.message),e=i?this.finalize(h,new a.AsyncArrowFunctionExpression(s.params,d,v)):this.finalize(h,new a.ArrowFunctionExpression(s.params,d,v)),this.context.strict=l,this.context.allowStrictDirective=c,this.context.allowYield=p,this.context.await=f}}else if(this.matchAssign()){if(this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment),this.context.strict&&e.type===u.Syntax.Identifier){var g=e;this.scanner.isRestrictedWord(g.name)&&this.tolerateUnexpectedToken(n,o.Messages.StrictLHSAssignment),this.scanner.isStrictModeReservedWord(g.name)&&this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord)}this.match("=")?this.reinterpretExpressionAsPattern(e):(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1),n=this.nextToken();var y=n.value,_=this.isolateCoverGrammar(this.parseAssignmentExpression);e=this.finalize(this.startNode(t),new a.AssignmentExpression(y,e,_)),this.context.firstCoverInitializedNameError=null}}return e},e.prototype.parseExpression=function(){var e=this.lookahead,t=this.isolateCoverGrammar(this.parseAssignmentExpression);if(this.match(",")){var n=[];for(n.push(t);2!==this.lookahead.type&&this.match(",");)this.nextToken(),n.push(this.isolateCoverGrammar(this.parseAssignmentExpression));t=this.finalize(this.startNode(e),new a.SequenceExpression(n))}return t},e.prototype.parseStatementListItem=function(){var e;if(this.context.isAssignmentTarget=!0,this.context.isBindingElement=!0,4===this.lookahead.type)switch(this.lookahead.value){case"export":this.context.isModule||this.tolerateUnexpectedToken(this.lookahead,o.Messages.IllegalExportDeclaration),e=this.parseExportDeclaration();break;case"import":this.context.isModule||this.tolerateUnexpectedToken(this.lookahead,o.Messages.IllegalImportDeclaration),e=this.parseImportDeclaration();break;case"const":e=this.parseLexicalDeclaration({inFor:!1});break;case"function":e=this.parseFunctionDeclaration();break;case"class":e=this.parseClassDeclaration();break;case"let":e=this.isLexicalDeclaration()?this.parseLexicalDeclaration({inFor:!1}):this.parseStatement();break;default:e=this.parseStatement()}else e=this.parseStatement();return e},e.prototype.parseBlock=function(){var e=this.createNode();this.expect("{");for(var t=[];;){if(this.match("}"))break;t.push(this.parseStatementListItem())}return this.expect("}"),this.finalize(e,new a.BlockStatement(t))},e.prototype.parseLexicalBinding=function(e,t){var n=this.createNode(),r=[],i=this.parsePattern(r,e);this.context.strict&&i.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(i.name)&&this.tolerateError(o.Messages.StrictVarName);var s=null;return"const"===e?this.matchKeyword("in")||this.matchContextualKeyword("of")||(this.match("=")?(this.nextToken(),s=this.isolateCoverGrammar(this.parseAssignmentExpression)):this.throwError(o.Messages.DeclarationMissingInitializer,"const")):(!t.inFor&&i.type!==u.Syntax.Identifier||this.match("="))&&(this.expect("="),s=this.isolateCoverGrammar(this.parseAssignmentExpression)),this.finalize(n,new a.VariableDeclarator(i,s))},e.prototype.parseBindingList=function(e,t){for(var n=[this.parseLexicalBinding(e,t)];this.match(",");)this.nextToken(),n.push(this.parseLexicalBinding(e,t));return n},e.prototype.isLexicalDeclaration=function(){var e=this.scanner.saveState();this.scanner.scanComments();var t=this.scanner.lex();return this.scanner.restoreState(e),3===t.type||7===t.type&&"["===t.value||7===t.type&&"{"===t.value||4===t.type&&"let"===t.value||4===t.type&&"yield"===t.value},e.prototype.parseLexicalDeclaration=function(e){var t=this.createNode(),n=this.nextToken().value;r.assert("let"===n||"const"===n,"Lexical declaration must be either let or const");var i=this.parseBindingList(n,e);return this.consumeSemicolon(),this.finalize(t,new a.VariableDeclaration(i,n))},e.prototype.parseBindingRestElement=function(e,t){var n=this.createNode();this.expect("...");var r=this.parsePattern(e,t);return this.finalize(n,new a.RestElement(r))},e.prototype.parseArrayPattern=function(e,t){var n=this.createNode();this.expect("[");for(var r=[];!this.match("]");)if(this.match(","))this.nextToken(),r.push(null);else{if(this.match("...")){r.push(this.parseBindingRestElement(e,t));break}r.push(this.parsePatternWithDefault(e,t)),this.match("]")||this.expect(",")}return this.expect("]"),this.finalize(n,new a.ArrayPattern(r))},e.prototype.parsePropertyPattern=function(e,t){var n,r,i=this.createNode(),o=!1,s=!1;if(3===this.lookahead.type){var u=this.lookahead;n=this.parseVariableIdentifier();var l=this.finalize(i,new a.Identifier(u.value));if(this.match("=")){e.push(u),s=!0,this.nextToken();var c=this.parseAssignmentExpression();r=this.finalize(this.startNode(u),new a.AssignmentPattern(l,c))}else this.match(":")?(this.expect(":"),r=this.parsePatternWithDefault(e,t)):(e.push(u),s=!0,r=l)}else o=this.match("["),n=this.parseObjectPropertyKey(),this.expect(":"),r=this.parsePatternWithDefault(e,t);return this.finalize(i,new a.Property("init",n,o,r,!1,s))},e.prototype.parseObjectPattern=function(e,t){var n=this.createNode(),r=[];for(this.expect("{");!this.match("}");)r.push(this.parsePropertyPattern(e,t)),this.match("}")||this.expect(",");return this.expect("}"),this.finalize(n,new a.ObjectPattern(r))},e.prototype.parsePattern=function(e,t){var n;return this.match("[")?n=this.parseArrayPattern(e,t):this.match("{")?n=this.parseObjectPattern(e,t):(!this.matchKeyword("let")||"const"!==t&&"let"!==t||this.tolerateUnexpectedToken(this.lookahead,o.Messages.LetInLexicalBinding),e.push(this.lookahead),n=this.parseVariableIdentifier(t)),n},e.prototype.parsePatternWithDefault=function(e,t){var n=this.lookahead,r=this.parsePattern(e,t);if(this.match("=")){this.nextToken();var i=this.context.allowYield;this.context.allowYield=!0;var o=this.isolateCoverGrammar(this.parseAssignmentExpression);this.context.allowYield=i,r=this.finalize(this.startNode(n),new a.AssignmentPattern(r,o))}return r},e.prototype.parseVariableIdentifier=function(e){var t=this.createNode(),n=this.nextToken();return 4===n.type&&"yield"===n.value?this.context.strict?this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord):this.context.allowYield||this.throwUnexpectedToken(n):3!==n.type?this.context.strict&&4===n.type&&this.scanner.isStrictModeReservedWord(n.value)?this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord):(this.context.strict||"let"!==n.value||"var"!==e)&&this.throwUnexpectedToken(n):(this.context.isModule||this.context.await)&&3===n.type&&"await"===n.value&&this.tolerateUnexpectedToken(n),this.finalize(t,new a.Identifier(n.value))},e.prototype.parseVariableDeclaration=function(e){var t=this.createNode(),n=[],r=this.parsePattern(n,"var");this.context.strict&&r.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(r.name)&&this.tolerateError(o.Messages.StrictVarName);var i=null;return this.match("=")?(this.nextToken(),i=this.isolateCoverGrammar(this.parseAssignmentExpression)):r.type===u.Syntax.Identifier||e.inFor||this.expect("="),this.finalize(t,new a.VariableDeclarator(r,i))},e.prototype.parseVariableDeclarationList=function(e){var t={inFor:e.inFor},n=[];for(n.push(this.parseVariableDeclaration(t));this.match(",");)this.nextToken(),n.push(this.parseVariableDeclaration(t));return n},e.prototype.parseVariableStatement=function(){var e=this.createNode();this.expectKeyword("var");var t=this.parseVariableDeclarationList({inFor:!1});return this.consumeSemicolon(),this.finalize(e,new a.VariableDeclaration(t,"var"))},e.prototype.parseEmptyStatement=function(){var e=this.createNode();return this.expect(";"),this.finalize(e,new a.EmptyStatement)},e.prototype.parseExpressionStatement=function(){var e=this.createNode(),t=this.parseExpression();return this.consumeSemicolon(),this.finalize(e,new a.ExpressionStatement(t))},e.prototype.parseIfClause=function(){return this.context.strict&&this.matchKeyword("function")&&this.tolerateError(o.Messages.StrictFunction),this.parseStatement()},e.prototype.parseIfStatement=function(){var e,t=this.createNode(),n=null;this.expectKeyword("if"),this.expect("(");var r=this.parseExpression();return!this.match(")")&&this.config.tolerant?(this.tolerateUnexpectedToken(this.nextToken()),e=this.finalize(this.createNode(),new a.EmptyStatement)):(this.expect(")"),e=this.parseIfClause(),this.matchKeyword("else")&&(this.nextToken(),n=this.parseIfClause())),this.finalize(t,new a.IfStatement(r,e,n))},e.prototype.parseDoWhileStatement=function(){var e=this.createNode();this.expectKeyword("do");var t=this.context.inIteration;this.context.inIteration=!0;var n=this.parseStatement();this.context.inIteration=t,this.expectKeyword("while"),this.expect("(");var r=this.parseExpression();return!this.match(")")&&this.config.tolerant?this.tolerateUnexpectedToken(this.nextToken()):(this.expect(")"),this.match(";")&&this.nextToken()),this.finalize(e,new a.DoWhileStatement(n,r))},e.prototype.parseWhileStatement=function(){var e,t=this.createNode();this.expectKeyword("while"),this.expect("(");var n=this.parseExpression();if(!this.match(")")&&this.config.tolerant)this.tolerateUnexpectedToken(this.nextToken()),e=this.finalize(this.createNode(),new a.EmptyStatement);else{this.expect(")");var r=this.context.inIteration;this.context.inIteration=!0,e=this.parseStatement(),this.context.inIteration=r}return this.finalize(t,new a.WhileStatement(n,e))},e.prototype.parseForStatement=function(){var e,t,n=null,r=null,i=null,s=!0,l=this.createNode();if(this.expectKeyword("for"),this.expect("("),this.match(";"))this.nextToken();else if(this.matchKeyword("var")){n=this.createNode(),this.nextToken();var c=this.context.allowIn;this.context.allowIn=!1;var p=this.parseVariableDeclarationList({inFor:!0});if(this.context.allowIn=c,1===p.length&&this.matchKeyword("in")){var f=p[0];f.init&&(f.id.type===u.Syntax.ArrayPattern||f.id.type===u.Syntax.ObjectPattern||this.context.strict)&&this.tolerateError(o.Messages.ForInOfLoopInitializer,"for-in"),n=this.finalize(n,new a.VariableDeclaration(p,"var")),this.nextToken(),e=n,t=this.parseExpression(),n=null}else 1===p.length&&null===p[0].init&&this.matchContextualKeyword("of")?(n=this.finalize(n,new a.VariableDeclaration(p,"var")),this.nextToken(),e=n,t=this.parseAssignmentExpression(),n=null,s=!1):(n=this.finalize(n,new a.VariableDeclaration(p,"var")),this.expect(";"))}else if(this.matchKeyword("const")||this.matchKeyword("let")){n=this.createNode();var h=this.nextToken().value;if(this.context.strict||"in"!==this.lookahead.value){var c=this.context.allowIn;this.context.allowIn=!1;var p=this.parseBindingList(h,{inFor:!0});this.context.allowIn=c,1===p.length&&null===p[0].init&&this.matchKeyword("in")?(n=this.finalize(n,new a.VariableDeclaration(p,h)),this.nextToken(),e=n,t=this.parseExpression(),n=null):1===p.length&&null===p[0].init&&this.matchContextualKeyword("of")?(n=this.finalize(n,new a.VariableDeclaration(p,h)),this.nextToken(),e=n,t=this.parseAssignmentExpression(),n=null,s=!1):(this.consumeSemicolon(),n=this.finalize(n,new a.VariableDeclaration(p,h)))}else n=this.finalize(n,new a.Identifier(h)),this.nextToken(),e=n,t=this.parseExpression(),n=null}else{var d=this.lookahead,c=this.context.allowIn;if(this.context.allowIn=!1,n=this.inheritCoverGrammar(this.parseAssignmentExpression),this.context.allowIn=c,this.matchKeyword("in"))this.context.isAssignmentTarget&&n.type!==u.Syntax.AssignmentExpression||this.tolerateError(o.Messages.InvalidLHSInForIn),this.nextToken(),this.reinterpretExpressionAsPattern(n),e=n,t=this.parseExpression(),n=null;else if(this.matchContextualKeyword("of"))this.context.isAssignmentTarget&&n.type!==u.Syntax.AssignmentExpression||this.tolerateError(o.Messages.InvalidLHSInForLoop),this.nextToken(),this.reinterpretExpressionAsPattern(n),e=n,t=this.parseAssignmentExpression(),n=null,s=!1;else{if(this.match(",")){for(var m=[n];this.match(",");)this.nextToken(),m.push(this.isolateCoverGrammar(this.parseAssignmentExpression));n=this.finalize(this.startNode(d),new a.SequenceExpression(m))}this.expect(";")}}void 0===e&&(this.match(";")||(r=this.parseExpression()),this.expect(";"),this.match(")")||(i=this.parseExpression()));var v;if(!this.match(")")&&this.config.tolerant)this.tolerateUnexpectedToken(this.nextToken()),v=this.finalize(this.createNode(),new a.EmptyStatement);else{this.expect(")");var g=this.context.inIteration;this.context.inIteration=!0,v=this.isolateCoverGrammar(this.parseStatement),this.context.inIteration=g}return void 0===e?this.finalize(l,new a.ForStatement(n,r,i,v)):s?this.finalize(l,new a.ForInStatement(e,t,v)):this.finalize(l,new a.ForOfStatement(e,t,v))},e.prototype.parseContinueStatement=function(){var e=this.createNode();this.expectKeyword("continue");var t=null;if(3===this.lookahead.type&&!this.hasLineTerminator){var n=this.parseVariableIdentifier();t=n;var r="$"+n.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,r)||this.throwError(o.Messages.UnknownLabel,n.name)}return this.consumeSemicolon(),null!==t||this.context.inIteration||this.throwError(o.Messages.IllegalContinue),this.finalize(e,new a.ContinueStatement(t))},e.prototype.parseBreakStatement=function(){var e=this.createNode();this.expectKeyword("break");var t=null;if(3===this.lookahead.type&&!this.hasLineTerminator){var n=this.parseVariableIdentifier(),r="$"+n.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,r)||this.throwError(o.Messages.UnknownLabel,n.name),t=n}return this.consumeSemicolon(),null!==t||this.context.inIteration||this.context.inSwitch||this.throwError(o.Messages.IllegalBreak),this.finalize(e,new a.BreakStatement(t))},e.prototype.parseReturnStatement=function(){this.context.inFunctionBody||this.tolerateError(o.Messages.IllegalReturn);var e=this.createNode();this.expectKeyword("return");var t=!this.match(";")&&!this.match("}")&&!this.hasLineTerminator&&2!==this.lookahead.type,n=t?this.parseExpression():null;return this.consumeSemicolon(),this.finalize(e,new a.ReturnStatement(n))},e.prototype.parseWithStatement=function(){this.context.strict&&this.tolerateError(o.Messages.StrictModeWith);var e,t=this.createNode();this.expectKeyword("with"),this.expect("(");var n=this.parseExpression();return!this.match(")")&&this.config.tolerant?(this.tolerateUnexpectedToken(this.nextToken()),e=this.finalize(this.createNode(),new a.EmptyStatement)):(this.expect(")"),e=this.parseStatement()),this.finalize(t,new a.WithStatement(n,e))},e.prototype.parseSwitchCase=function(){var e,t=this.createNode();this.matchKeyword("default")?(this.nextToken(),e=null):(this.expectKeyword("case"),e=this.parseExpression()),this.expect(":");for(var n=[];;){if(this.match("}")||this.matchKeyword("default")||this.matchKeyword("case"))break;n.push(this.parseStatementListItem())}return this.finalize(t,new a.SwitchCase(e,n))},e.prototype.parseSwitchStatement=function(){var e=this.createNode();this.expectKeyword("switch"),this.expect("(");var t=this.parseExpression();this.expect(")");var n=this.context.inSwitch;this.context.inSwitch=!0;var r=[],i=!1;for(this.expect("{");;){if(this.match("}"))break;var s=this.parseSwitchCase();null===s.test&&(i&&this.throwError(o.Messages.MultipleDefaultsInSwitch),i=!0),r.push(s)}return this.expect("}"),this.context.inSwitch=n,this.finalize(e,new a.SwitchStatement(t,r))},e.prototype.parseLabelledStatement=function(){var e,t=this.createNode(),n=this.parseExpression();if(n.type===u.Syntax.Identifier&&this.match(":")){this.nextToken();var r=n,i="$"+r.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,i)&&this.throwError(o.Messages.Redeclaration,"Label",r.name),this.context.labelSet[i]=!0;var s=void 0;if(this.matchKeyword("class"))this.tolerateUnexpectedToken(this.lookahead),s=this.parseClassDeclaration();else if(this.matchKeyword("function")){var l=this.lookahead,c=this.parseFunctionDeclaration();this.context.strict?this.tolerateUnexpectedToken(l,o.Messages.StrictFunction):c.generator&&this.tolerateUnexpectedToken(l,o.Messages.GeneratorInLegacyContext),s=c}else s=this.parseStatement();delete this.context.labelSet[i],e=new a.LabeledStatement(r,s)}else this.consumeSemicolon(),e=new a.ExpressionStatement(n);return this.finalize(t,e)},e.prototype.parseThrowStatement=function(){var e=this.createNode();this.expectKeyword("throw"),this.hasLineTerminator&&this.throwError(o.Messages.NewlineAfterThrow);var t=this.parseExpression();return this.consumeSemicolon(),this.finalize(e,new a.ThrowStatement(t))},e.prototype.parseCatchClause=function(){var e=this.createNode();this.expectKeyword("catch"),this.expect("("),this.match(")")&&this.throwUnexpectedToken(this.lookahead);for(var t=[],n=this.parsePattern(t),r={},i=0;i<t.length;i++){var s="$"+t[i].value;Object.prototype.hasOwnProperty.call(r,s)&&this.tolerateError(o.Messages.DuplicateBinding,t[i].value),r[s]=!0}this.context.strict&&n.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(n.name)&&this.tolerateError(o.Messages.StrictCatchVariable),this.expect(")");var l=this.parseBlock();return this.finalize(e,new a.CatchClause(n,l))},e.prototype.parseFinallyClause=function(){return this.expectKeyword("finally"),this.parseBlock()},e.prototype.parseTryStatement=function(){var e=this.createNode();this.expectKeyword("try");var t=this.parseBlock(),n=this.matchKeyword("catch")?this.parseCatchClause():null,r=this.matchKeyword("finally")?this.parseFinallyClause():null;return n||r||this.throwError(o.Messages.NoCatchOrFinally),this.finalize(e,new a.TryStatement(t,n,r))},e.prototype.parseDebuggerStatement=function(){var e=this.createNode();return this.expectKeyword("debugger"),this.consumeSemicolon(),this.finalize(e,new a.DebuggerStatement)},e.prototype.parseStatement=function(){var e;switch(this.lookahead.type){case 1:case 5:case 6:case 8:case 10:case 9:e=this.parseExpressionStatement();break;case 7:var t=this.lookahead.value;e="{"===t?this.parseBlock():"("===t?this.parseExpressionStatement():";"===t?this.parseEmptyStatement():this.parseExpressionStatement();break;case 3:e=this.matchAsyncFunction()?this.parseFunctionDeclaration():this.parseLabelledStatement();break;case 4:switch(this.lookahead.value){case"break":e=this.parseBreakStatement();break;case"continue":e=this.parseContinueStatement();break;case"debugger":e=this.parseDebuggerStatement();break;case"do":e=this.parseDoWhileStatement();break;case"for":e=this.parseForStatement();break;case"function":e=this.parseFunctionDeclaration();break;case"if":e=this.parseIfStatement();break;case"return":e=this.parseReturnStatement();break;case"switch":e=this.parseSwitchStatement();break;case"throw":e=this.parseThrowStatement();break;case"try":e=this.parseTryStatement();break;case"var":e=this.parseVariableStatement();break;case"while":e=this.parseWhileStatement();break;case"with":e=this.parseWithStatement();break;default:e=this.parseExpressionStatement()}break;default:e=this.throwUnexpectedToken(this.lookahead)}return e},e.prototype.parseFunctionSourceElements=function(){var e=this.createNode();this.expect("{");var t=this.parseDirectivePrologues(),n=this.context.labelSet,r=this.context.inIteration,i=this.context.inSwitch,o=this.context.inFunctionBody;for(this.context.labelSet={},this.context.inIteration=!1,this.context.inSwitch=!1,this.context.inFunctionBody=!0;2!==this.lookahead.type&&!this.match("}");)t.push(this.parseStatementListItem());return this.expect("}"),this.context.labelSet=n,this.context.inIteration=r,this.context.inSwitch=i,this.context.inFunctionBody=o,this.finalize(e,new a.BlockStatement(t))},e.prototype.validateParam=function(e,t,n){var r="$"+n;this.context.strict?(this.scanner.isRestrictedWord(n)&&(e.stricted=t,e.message=o.Messages.StrictParamName),Object.prototype.hasOwnProperty.call(e.paramSet,r)&&(e.stricted=t,e.message=o.Messages.StrictParamDupe)):e.firstRestricted||(this.scanner.isRestrictedWord(n)?(e.firstRestricted=t,e.message=o.Messages.StrictParamName):this.scanner.isStrictModeReservedWord(n)?(e.firstRestricted=t,e.message=o.Messages.StrictReservedWord):Object.prototype.hasOwnProperty.call(e.paramSet,r)&&(e.stricted=t,e.message=o.Messages.StrictParamDupe)),"function"==typeof Object.defineProperty?Object.defineProperty(e.paramSet,r,{value:!0,enumerable:!0,writable:!0,configurable:!0}):e.paramSet[r]=!0},e.prototype.parseRestElement=function(e){var t=this.createNode();this.expect("...");var n=this.parsePattern(e);return this.match("=")&&this.throwError(o.Messages.DefaultRestParameter),this.match(")")||this.throwError(o.Messages.ParameterAfterRestParameter),this.finalize(t,new a.RestElement(n))},e.prototype.parseFormalParameter=function(e){for(var t=[],n=this.match("...")?this.parseRestElement(t):this.parsePatternWithDefault(t),r=0;r<t.length;r++)this.validateParam(e,t[r],t[r].value);e.simple=e.simple&&n instanceof a.Identifier,e.params.push(n)},e.prototype.parseFormalParameters=function(e){var t;if(t={simple:!0,params:[],firstRestricted:e},this.expect("("),!this.match(")"))for(t.paramSet={};2!==this.lookahead.type&&(this.parseFormalParameter(t),!this.match(")"))&&(this.expect(","),!this.match(")")););return this.expect(")"),{simple:t.simple,params:t.params,stricted:t.stricted,firstRestricted:t.firstRestricted,message:t.message}},e.prototype.matchAsyncFunction=function(){var e=this.matchContextualKeyword("async");if(e){var t=this.scanner.saveState();this.scanner.scanComments();var n=this.scanner.lex();this.scanner.restoreState(t),e=t.lineNumber===n.lineNumber&&4===n.type&&"function"===n.value}return e},e.prototype.parseFunctionDeclaration=function(e){var t=this.createNode(),n=this.matchContextualKeyword("async");n&&this.nextToken(),this.expectKeyword("function");var r=!n&&this.match("*");r&&this.nextToken();var i,s=null,u=null;if(!e||!this.match("(")){var l=this.lookahead;s=this.parseVariableIdentifier(),this.context.strict?this.scanner.isRestrictedWord(l.value)&&this.tolerateUnexpectedToken(l,o.Messages.StrictFunctionName):this.scanner.isRestrictedWord(l.value)?(u=l,i=o.Messages.StrictFunctionName):this.scanner.isStrictModeReservedWord(l.value)&&(u=l,i=o.Messages.StrictReservedWord)}var c=this.context.await,p=this.context.allowYield;this.context.await=n,this.context.allowYield=!r;var f=this.parseFormalParameters(u),h=f.params,d=f.stricted;u=f.firstRestricted,f.message&&(i=f.message);var m=this.context.strict,v=this.context.allowStrictDirective;this.context.allowStrictDirective=f.simple;var g=this.parseFunctionSourceElements();return this.context.strict&&u&&this.throwUnexpectedToken(u,i),this.context.strict&&d&&this.tolerateUnexpectedToken(d,i),this.context.strict=m,this.context.allowStrictDirective=v,this.context.await=c,this.context.allowYield=p,n?this.finalize(t,new a.AsyncFunctionDeclaration(s,h,g)):this.finalize(t,new a.FunctionDeclaration(s,h,g,r))},e.prototype.parseFunctionExpression=function(){var e=this.createNode(),t=this.matchContextualKeyword("async");t&&this.nextToken(),this.expectKeyword("function");var n=!t&&this.match("*");n&&this.nextToken();var r,i,s=null,u=this.context.await,l=this.context.allowYield;if(this.context.await=t,this.context.allowYield=!n,!this.match("(")){var c=this.lookahead;s=this.context.strict||n||!this.matchKeyword("yield")?this.parseVariableIdentifier():this.parseIdentifierName(),this.context.strict?this.scanner.isRestrictedWord(c.value)&&this.tolerateUnexpectedToken(c,o.Messages.StrictFunctionName):this.scanner.isRestrictedWord(c.value)?(i=c,r=o.Messages.StrictFunctionName):this.scanner.isStrictModeReservedWord(c.value)&&(i=c,r=o.Messages.StrictReservedWord)}var p=this.parseFormalParameters(i),f=p.params,h=p.stricted;i=p.firstRestricted,p.message&&(r=p.message);var d=this.context.strict,m=this.context.allowStrictDirective;this.context.allowStrictDirective=p.simple;var v=this.parseFunctionSourceElements();return this.context.strict&&i&&this.throwUnexpectedToken(i,r),this.context.strict&&h&&this.tolerateUnexpectedToken(h,r),this.context.strict=d,this.context.allowStrictDirective=m,this.context.await=u,this.context.allowYield=l,t?this.finalize(e,new a.AsyncFunctionExpression(s,f,v)):this.finalize(e,new a.FunctionExpression(s,f,v,n))},e.prototype.parseDirective=function(){var e=this.lookahead,t=this.createNode(),n=this.parseExpression(),r=n.type===u.Syntax.Literal?this.getTokenRaw(e).slice(1,-1):null;return this.consumeSemicolon(),this.finalize(t,r?new a.Directive(n,r):new a.ExpressionStatement(n))},e.prototype.parseDirectivePrologues=function(){for(var e=null,t=[];;){var n=this.lookahead;if(8!==n.type)break;var r=this.parseDirective();t.push(r);var i=r.directive;if("string"!=typeof i)break;"use strict"===i?(this.context.strict=!0,e&&this.tolerateUnexpectedToken(e,o.Messages.StrictOctalLiteral),this.context.allowStrictDirective||this.tolerateUnexpectedToken(n,o.Messages.IllegalLanguageModeDirective)):!e&&n.octal&&(e=n)}return t},e.prototype.qualifiedPropertyName=function(e){switch(e.type){case 3:case 8:case 1:case 5:case 6:case 4:return!0;case 7:return"["===e.value}return!1},e.prototype.parseGetterMethod=function(){var e=this.createNode(),t=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters();n.params.length>0&&this.tolerateError(o.Messages.BadGetterArity);var r=this.parsePropertyMethod(n);return this.context.allowYield=t,this.finalize(e,new a.FunctionExpression(null,n.params,r,!1))},e.prototype.parseSetterMethod=function(){var e=this.createNode(),t=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters();1!==n.params.length?this.tolerateError(o.Messages.BadSetterArity):n.params[0]instanceof a.RestElement&&this.tolerateError(o.Messages.BadSetterRestParameter);var r=this.parsePropertyMethod(n);return this.context.allowYield=t,this.finalize(e,new a.FunctionExpression(null,n.params,r,!1))},e.prototype.parseGeneratorMethod=function(){var e=this.createNode(),t=this.context.allowYield;this.context.allowYield=!0;var n=this.parseFormalParameters();this.context.allowYield=!1;var r=this.parsePropertyMethod(n);return this.context.allowYield=t,this.finalize(e,new a.FunctionExpression(null,n.params,r,!0))},e.prototype.isStartOfExpression=function(){var e=!0,t=this.lookahead.value;switch(this.lookahead.type){case 7:e="["===t||"("===t||"{"===t||"+"===t||"-"===t||"!"===t||"~"===t||"++"===t||"--"===t||"/"===t||"/="===t;break;case 4:e="class"===t||"delete"===t||"function"===t||"let"===t||"new"===t||"super"===t||"this"===t||"typeof"===t||"void"===t||"yield"===t}return e},e.prototype.parseYieldExpression=function(){var e=this.createNode();this.expectKeyword("yield");var t=null,n=!1;if(!this.hasLineTerminator){var r=this.context.allowYield;this.context.allowYield=!1,n=this.match("*"),n?(this.nextToken(),t=this.parseAssignmentExpression()):this.isStartOfExpression()&&(t=this.parseAssignmentExpression()),this.context.allowYield=r}return this.finalize(e,new a.YieldExpression(t,n))},e.prototype.parseClassElement=function(e){var t=this.lookahead,n=this.createNode(),r="",i=null,s=null,u=!1,l=!1,c=!1,p=!1;if(this.match("*"))this.nextToken();else{u=this.match("["),i=this.parseObjectPropertyKey();if("static"===i.name&&(this.qualifiedPropertyName(this.lookahead)||this.match("*"))&&(t=this.lookahead,c=!0,u=this.match("["),this.match("*")?this.nextToken():i=this.parseObjectPropertyKey()),3===t.type&&!this.hasLineTerminator&&"async"===t.value){var f=this.lookahead.value;":"!==f&&"("!==f&&"*"!==f&&(p=!0,t=this.lookahead,i=this.parseObjectPropertyKey(),3===t.type&&("get"===t.value||"set"===t.value?this.tolerateUnexpectedToken(t):"constructor"===t.value&&this.tolerateUnexpectedToken(t,o.Messages.ConstructorIsAsync)))}}var h=this.qualifiedPropertyName(this.lookahead);return 3===t.type?"get"===t.value&&h?(r="get",u=this.match("["),i=this.parseObjectPropertyKey(),this.context.allowYield=!1,s=this.parseGetterMethod()):"set"===t.value&&h&&(r="set",u=this.match("["),i=this.parseObjectPropertyKey(),s=this.parseSetterMethod()):7===t.type&&"*"===t.value&&h&&(r="init",u=this.match("["),i=this.parseObjectPropertyKey(),s=this.parseGeneratorMethod(),l=!0),!r&&i&&this.match("(")&&(r="init",s=p?this.parsePropertyMethodAsyncFunction():this.parsePropertyMethodFunction(),l=!0),r||this.throwUnexpectedToken(this.lookahead),"init"===r&&(r="method"),u||(c&&this.isPropertyKey(i,"prototype")&&this.throwUnexpectedToken(t,o.Messages.StaticPrototype),!c&&this.isPropertyKey(i,"constructor")&&(("method"!==r||!l||s&&s.generator)&&this.throwUnexpectedToken(t,o.Messages.ConstructorSpecialMethod),e.value?this.throwUnexpectedToken(t,o.Messages.DuplicateConstructor):e.value=!0,r="constructor")),this.finalize(n,new a.MethodDefinition(i,u,s,r,c))},e.prototype.parseClassElementList=function(){var e=[],t={value:!1};for(this.expect("{");!this.match("}");)this.match(";")?this.nextToken():e.push(this.parseClassElement(t));return this.expect("}"),e},e.prototype.parseClassBody=function(){var e=this.createNode(),t=this.parseClassElementList();return this.finalize(e,new a.ClassBody(t))},e.prototype.parseClassDeclaration=function(e){var t=this.createNode(),n=this.context.strict;this.context.strict=!0,this.expectKeyword("class");var r=e&&3!==this.lookahead.type?null:this.parseVariableIdentifier(),i=null;this.matchKeyword("extends")&&(this.nextToken(),i=this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall));var o=this.parseClassBody();return this.context.strict=n,this.finalize(t,new a.ClassDeclaration(r,i,o))},e.prototype.parseClassExpression=function(){var e=this.createNode(),t=this.context.strict;this.context.strict=!0,this.expectKeyword("class");var n=3===this.lookahead.type?this.parseVariableIdentifier():null,r=null;this.matchKeyword("extends")&&(this.nextToken(),r=this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall));var i=this.parseClassBody();return this.context.strict=t,this.finalize(e,new a.ClassExpression(n,r,i))},e.prototype.parseModule=function(){this.context.strict=!0,this.context.isModule=!0;for(var e=this.createNode(),t=this.parseDirectivePrologues();2!==this.lookahead.type;)t.push(this.parseStatementListItem());return this.finalize(e,new a.Module(t))},e.prototype.parseScript=function(){for(var e=this.createNode(),t=this.parseDirectivePrologues();2!==this.lookahead.type;)t.push(this.parseStatementListItem());return this.finalize(e,new a.Script(t))},e.prototype.parseModuleSpecifier=function(){var e=this.createNode();8!==this.lookahead.type&&this.throwError(o.Messages.InvalidModuleSpecifier);var t=this.nextToken(),n=this.getTokenRaw(t);return this.finalize(e,new a.Literal(t.value,n))},e.prototype.parseImportSpecifier=function(){var e,t,n=this.createNode();return 3===this.lookahead.type?(e=this.parseVariableIdentifier(),t=e,this.matchContextualKeyword("as")&&(this.nextToken(),t=this.parseVariableIdentifier())):(e=this.parseIdentifierName(),t=e,this.matchContextualKeyword("as")?(this.nextToken(),t=this.parseVariableIdentifier()):this.throwUnexpectedToken(this.nextToken())),this.finalize(n,new a.ImportSpecifier(t,e))},e.prototype.parseNamedImports=function(){this.expect("{");for(var e=[];!this.match("}");)e.push(this.parseImportSpecifier()),this.match("}")||this.expect(",");return this.expect("}"),e},e.prototype.parseImportDefaultSpecifier=function(){var e=this.createNode(),t=this.parseIdentifierName();return this.finalize(e,new a.ImportDefaultSpecifier(t))},e.prototype.parseImportNamespaceSpecifier=function(){var e=this.createNode();this.expect("*"),this.matchContextualKeyword("as")||this.throwError(o.Messages.NoAsAfterImportNamespace),this.nextToken();var t=this.parseIdentifierName();return this.finalize(e,new a.ImportNamespaceSpecifier(t))},e.prototype.parseImportDeclaration=function(){this.context.inFunctionBody&&this.throwError(o.Messages.IllegalImportDeclaration);var e=this.createNode();this.expectKeyword("import");var t,n=[];if(8===this.lookahead.type)t=this.parseModuleSpecifier();else{if(this.match("{")?n=n.concat(this.parseNamedImports()):this.match("*")?n.push(this.parseImportNamespaceSpecifier()):this.isIdentifierName(this.lookahead)&&!this.matchKeyword("default")?(n.push(this.parseImportDefaultSpecifier()),this.match(",")&&(this.nextToken(),this.match("*")?n.push(this.parseImportNamespaceSpecifier()):this.match("{")?n=n.concat(this.parseNamedImports()):this.throwUnexpectedToken(this.lookahead))):this.throwUnexpectedToken(this.nextToken()),!this.matchContextualKeyword("from")){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}this.nextToken(),t=this.parseModuleSpecifier()}return this.consumeSemicolon(),this.finalize(e,new a.ImportDeclaration(n,t))},e.prototype.parseExportSpecifier=function(){var e=this.createNode(),t=this.parseIdentifierName(),n=t;return this.matchContextualKeyword("as")&&(this.nextToken(),n=this.parseIdentifierName()),this.finalize(e,new a.ExportSpecifier(t,n))},e.prototype.parseExportDeclaration=function(){this.context.inFunctionBody&&this.throwError(o.Messages.IllegalExportDeclaration);var e=this.createNode();this.expectKeyword("export");var t;if(this.matchKeyword("default"))if(this.nextToken(),this.matchKeyword("function")){var n=this.parseFunctionDeclaration(!0);t=this.finalize(e,new a.ExportDefaultDeclaration(n))}else if(this.matchKeyword("class")){var n=this.parseClassDeclaration(!0);t=this.finalize(e,new a.ExportDefaultDeclaration(n))}else if(this.matchContextualKeyword("async")){var n=this.matchAsyncFunction()?this.parseFunctionDeclaration(!0):this.parseAssignmentExpression();t=this.finalize(e,new a.ExportDefaultDeclaration(n))}else{this.matchContextualKeyword("from")&&this.throwError(o.Messages.UnexpectedToken,this.lookahead.value);var n=this.match("{")?this.parseObjectInitializer():this.match("[")?this.parseArrayInitializer():this.parseAssignmentExpression();this.consumeSemicolon(),t=this.finalize(e,new a.ExportDefaultDeclaration(n))}else if(this.match("*")){if(this.nextToken(),!this.matchContextualKeyword("from")){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}this.nextToken();var i=this.parseModuleSpecifier();this.consumeSemicolon(),t=this.finalize(e,new a.ExportAllDeclaration(i))}else if(4===this.lookahead.type){var n=void 0;switch(this.lookahead.value){case"let":case"const":n=this.parseLexicalDeclaration({inFor:!1});break;case"var":case"class":case"function":n=this.parseStatementListItem();break;default:this.throwUnexpectedToken(this.lookahead)}t=this.finalize(e,new a.ExportNamedDeclaration(n,[],null))}else if(this.matchAsyncFunction()){var n=this.parseFunctionDeclaration();t=this.finalize(e,new a.ExportNamedDeclaration(n,[],null))}else{var s=[],u=null,l=!1;for(this.expect("{");!this.match("}");)l=l||this.matchKeyword("default"),s.push(this.parseExportSpecifier()),this.match("}")||this.expect(",");if(this.expect("}"),this.matchContextualKeyword("from"))this.nextToken(),u=this.parseModuleSpecifier(),this.consumeSemicolon();else if(l){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}else this.consumeSemicolon();t=this.finalize(e,new a.ExportNamedDeclaration(null,s,u))}return t},e}();t.Parser=c},function(e,t){"use strict";function n(e,t){if(!e)throw new Error("ASSERT: "+t)}Object.defineProperty(t,"__esModule",{value:!0}),t.assert=n},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=function(){function e(){this.errors=[],this.tolerant=!1}return e.prototype.recordError=function(e){this.errors.push(e)},e.prototype.tolerate=function(e){if(!this.tolerant)throw e;this.recordError(e)},e.prototype.constructError=function(e,t){var n=new Error(e);try{throw n}catch(e){Object.create&&Object.defineProperty&&(n=Object.create(e),Object.defineProperty(n,"column",{value:t}))}return n},e.prototype.createError=function(e,t,n,r){var i="Line "+t+": "+r,o=this.constructError(i,n);return o.index=e,o.lineNumber=t,o.description=r,o},e.prototype.throwError=function(e,t,n,r){throw this.createError(e,t,n,r)},e.prototype.tolerateError=function(e,t,n,r){var i=this.createError(e,t,n,r);if(!this.tolerant)throw i;this.recordError(i)},e}();t.ErrorHandler=n},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Messages={BadGetterArity:"Getter must not have any formal parameters",BadSetterArity:"Setter must have exactly one formal parameter",BadSetterRestParameter:"Setter function argument must not be a rest parameter",ConstructorIsAsync:"Class constructor may not be an async method",ConstructorSpecialMethod:"Class constructor may not be an accessor",DeclarationMissingInitializer:"Missing initializer in %0 declaration",DefaultRestParameter:"Unexpected token =",DuplicateBinding:"Duplicate binding %0",DuplicateConstructor:"A class may only have one constructor",DuplicateProtoProperty:"Duplicate __proto__ fields are not allowed in object literals",ForInOfLoopInitializer:"%0 loop variable declaration may not have an initializer",GeneratorInLegacyContext:"Generator declarations are not allowed in legacy contexts",IllegalBreak:"Illegal break statement",IllegalContinue:"Illegal continue statement",IllegalExportDeclaration:"Unexpected token",IllegalImportDeclaration:"Unexpected token",IllegalLanguageModeDirective:"Illegal 'use strict' directive in function with non-simple parameter list",IllegalReturn:"Illegal return statement",InvalidEscapedReservedWord:"Keyword must not contain escaped characters",InvalidHexEscapeSequence:"Invalid hexadecimal escape sequence",InvalidLHSInAssignment:"Invalid left-hand side in assignment",InvalidLHSInForIn:"Invalid left-hand side in for-in",InvalidLHSInForLoop:"Invalid left-hand side in for-loop",InvalidModuleSpecifier:"Unexpected token",InvalidRegExp:"Invalid regular expression",LetInLexicalBinding:"let is disallowed as a lexically bound name",MissingFromClause:"Unexpected token",MultipleDefaultsInSwitch:"More than one default clause in switch statement",NewlineAfterThrow:"Illegal newline after throw",NoAsAfterImportNamespace:"Unexpected token",NoCatchOrFinally:"Missing catch or finally after try",ParameterAfterRestParameter:"Rest parameter must be last formal parameter",Redeclaration:"%0 '%1' has already been declared",StaticPrototype:"Classes may not have static property named prototype",StrictCatchVariable:"Catch variable may not be eval or arguments in strict mode",StrictDelete:"Delete of an unqualified identifier in strict mode.",StrictFunction:"In strict mode code, functions can only be declared at top level or inside a block",StrictFunctionName:"Function name may not be eval or arguments in strict mode",StrictLHSAssignment:"Assignment to eval or arguments is not allowed in strict mode",StrictLHSPostfix:"Postfix increment/decrement may not have eval or arguments operand in strict mode",StrictLHSPrefix:"Prefix increment/decrement may not have eval or arguments operand in strict mode",StrictModeWith:"Strict mode code may not include a with statement",StrictOctalLiteral:"Octal literals are not allowed in strict mode.",StrictParamDupe:"Strict mode function may not have duplicate parameter names",StrictParamName:"Parameter name eval or arguments is not allowed in strict mode",StrictReservedWord:"Use of future reserved word in strict mode",StrictVarName:"Variable name may not be eval or arguments in strict mode",TemplateOctalLiteral:"Octal literals are not allowed in template strings.",UnexpectedEOS:"Unexpected end of input",UnexpectedIdentifier:"Unexpected identifier",UnexpectedNumber:"Unexpected number",UnexpectedReserved:"Unexpected reserved word",UnexpectedString:"Unexpected string",UnexpectedTemplate:"Unexpected quasi %0",UnexpectedToken:"Unexpected token %0",UnexpectedTokenIllegal:"Unexpected token ILLEGAL",UnknownLabel:"Undefined label '%0'",UnterminatedRegExp:"Invalid regular expression: missing /"}},function(e,t,n){"use strict";function r(e){return"0123456789abcdef".indexOf(e.toLowerCase())}function i(e){return"01234567".indexOf(e)}Object.defineProperty(t,"__esModule",{value:!0});var o=n(9),a=n(4),s=n(11),u=function(){function e(e,t){this.source=e,this.errorHandler=t,this.trackComment=!1,this.length=e.length,this.index=0,this.lineNumber=e.length>0?1:0,this.lineStart=0,this.curlyStack=[]}return e.prototype.saveState=function(){return{index:this.index,lineNumber:this.lineNumber,lineStart:this.lineStart}},e.prototype.restoreState=function(e){this.index=e.index,this.lineNumber=e.lineNumber,this.lineStart=e.lineStart},e.prototype.eof=function(){return this.index>=this.length},e.prototype.throwUnexpectedToken=function(e){return void 0===e&&(e=s.Messages.UnexpectedTokenIllegal),this.errorHandler.throwError(this.index,this.lineNumber,this.index-this.lineStart+1,e)},e.prototype.tolerateUnexpectedToken=function(e){void 0===e&&(e=s.Messages.UnexpectedTokenIllegal),this.errorHandler.tolerateError(this.index,this.lineNumber,this.index-this.lineStart+1,e)},e.prototype.skipSingleLineComment=function(e){var t,n,r=[];for(this.trackComment&&(r=[],t=this.index-e,n={start:{line:this.lineNumber,column:this.index-this.lineStart-e},end:{}});!this.eof();){var i=this.source.charCodeAt(this.index);if(++this.index,a.Character.isLineTerminator(i)){if(this.trackComment){n.end={line:this.lineNumber,column:this.index-this.lineStart-1};var o={multiLine:!1,slice:[t+e,this.index-1],range:[t,this.index-1],loc:n};r.push(o)}return 13===i&&10===this.source.charCodeAt(this.index)&&++this.index,++this.lineNumber,this.lineStart=this.index,r}}if(this.trackComment){n.end={line:this.lineNumber,column:this.index-this.lineStart};var o={multiLine:!1,slice:[t+e,this.index],range:[t,this.index],loc:n};r.push(o)}return r},e.prototype.skipMultiLineComment=function(){var e,t,n=[];for(this.trackComment&&(n=[],e=this.index-2,t={start:{line:this.lineNumber,column:this.index-this.lineStart-2},end:{}});!this.eof();){var r=this.source.charCodeAt(this.index);if(a.Character.isLineTerminator(r))13===r&&10===this.source.charCodeAt(this.index+1)&&++this.index,++this.lineNumber,++this.index,this.lineStart=this.index;else if(42===r){if(47===this.source.charCodeAt(this.index+1)){if(this.index+=2,this.trackComment){t.end={line:this.lineNumber,column:this.index-this.lineStart};var i={multiLine:!0,slice:[e+2,this.index-2],range:[e,this.index],loc:t};n.push(i)}return n}++this.index}else++this.index}if(this.trackComment){t.end={line:this.lineNumber,column:this.index-this.lineStart};var i={multiLine:!0,slice:[e+2,this.index],range:[e,this.index],loc:t};n.push(i)}return this.tolerateUnexpectedToken(),n},e.prototype.scanComments=function(){var e;this.trackComment&&(e=[]);for(var t=0===this.index;!this.eof();){var n=this.source.charCodeAt(this.index);if(a.Character.isWhiteSpace(n))++this.index;else if(a.Character.isLineTerminator(n))++this.index,13===n&&10===this.source.charCodeAt(this.index)&&++this.index,++this.lineNumber,this.lineStart=this.index,t=!0;else if(47===n)if(47===(n=this.source.charCodeAt(this.index+1))){this.index+=2;var r=this.skipSingleLineComment(2);this.trackComment&&(e=e.concat(r)),t=!0}else{if(42!==n)break;this.index+=2;var r=this.skipMultiLineComment();this.trackComment&&(e=e.concat(r))}else if(t&&45===n){if(45!==this.source.charCodeAt(this.index+1)||62!==this.source.charCodeAt(this.index+2))break;this.index+=3;var r=this.skipSingleLineComment(3);this.trackComment&&(e=e.concat(r))}else{if(60!==n)break;if("!--"!==this.source.slice(this.index+1,this.index+4))break;this.index+=4;var r=this.skipSingleLineComment(4);this.trackComment&&(e=e.concat(r))}}return e},e.prototype.isFutureReservedWord=function(e){switch(e){case"enum":case"export":case"import":case"super":return!0;default:return!1}},e.prototype.isStrictModeReservedWord=function(e){switch(e){case"implements":case"interface":case"package":case"private":case"protected":case"public":case"static":case"yield":case"let":return!0;default:return!1}},e.prototype.isRestrictedWord=function(e){return"eval"===e||"arguments"===e},e.prototype.isKeyword=function(e){switch(e.length){case 2:return"if"===e||"in"===e||"do"===e;case 3:return"var"===e||"for"===e||"new"===e||"try"===e||"let"===e;case 4:return"this"===e||"else"===e||"case"===e||"void"===e||"with"===e||"enum"===e;case 5:return"while"===e||"break"===e||"catch"===e||"throw"===e||"const"===e||"yield"===e||"class"===e||"super"===e;case 6:return"return"===e||"typeof"===e||"delete"===e||"switch"===e||"export"===e||"import"===e;case 7:return"default"===e||"finally"===e||"extends"===e;case 8:return"function"===e||"continue"===e||"debugger"===e;case 10:return"instanceof"===e;default:return!1}},e.prototype.codePointAt=function(e){var t=this.source.charCodeAt(e);if(t>=55296&&t<=56319){var n=this.source.charCodeAt(e+1);if(n>=56320&&n<=57343){t=1024*(t-55296)+n-56320+65536}}return t},e.prototype.scanHexEscape=function(e){for(var t="u"===e?4:2,n=0,i=0;i<t;++i){if(this.eof()||!a.Character.isHexDigit(this.source.charCodeAt(this.index)))return null;n=16*n+r(this.source[this.index++])}return String.fromCharCode(n)},e.prototype.scanUnicodeCodePointEscape=function(){var e=this.source[this.index],t=0;for("}"===e&&this.throwUnexpectedToken();!this.eof()&&(e=this.source[this.index++],a.Character.isHexDigit(e.charCodeAt(0)));)t=16*t+r(e);return(t>1114111||"}"!==e)&&this.throwUnexpectedToken(),a.Character.fromCodePoint(t)},e.prototype.getIdentifier=function(){for(var e=this.index++;!this.eof();){var t=this.source.charCodeAt(this.index);if(92===t)return this.index=e,this.getComplexIdentifier();if(t>=55296&&t<57343)return this.index=e,this.getComplexIdentifier();if(!a.Character.isIdentifierPart(t))break;++this.index}return this.source.slice(e,this.index)},e.prototype.getComplexIdentifier=function(){var e=this.codePointAt(this.index),t=a.Character.fromCodePoint(e);this.index+=t.length;var n;for(92===e&&(117!==this.source.charCodeAt(this.index)&&this.throwUnexpectedToken(),++this.index,"{"===this.source[this.index]?(++this.index,n=this.scanUnicodeCodePointEscape()):null!==(n=this.scanHexEscape("u"))&&"\\"!==n&&a.Character.isIdentifierStart(n.charCodeAt(0))||this.throwUnexpectedToken(),t=n);!this.eof()&&(e=this.codePointAt(this.index),a.Character.isIdentifierPart(e));)n=a.Character.fromCodePoint(e),t+=n,this.index+=n.length,92===e&&(t=t.substr(0,t.length-1),117!==this.source.charCodeAt(this.index)&&this.throwUnexpectedToken(),++this.index,"{"===this.source[this.index]?(++this.index,n=this.scanUnicodeCodePointEscape()):null!==(n=this.scanHexEscape("u"))&&"\\"!==n&&a.Character.isIdentifierPart(n.charCodeAt(0))||this.throwUnexpectedToken(),t+=n);return t},e.prototype.octalToDecimal=function(e){var t="0"!==e,n=i(e);return!this.eof()&&a.Character.isOctalDigit(this.source.charCodeAt(this.index))&&(t=!0,n=8*n+i(this.source[this.index++]),"0123".indexOf(e)>=0&&!this.eof()&&a.Character.isOctalDigit(this.source.charCodeAt(this.index))&&(n=8*n+i(this.source[this.index++]))),{code:n,octal:t}},e.prototype.scanIdentifier=function(){var e,t=this.index,n=92===this.source.charCodeAt(t)?this.getComplexIdentifier():this.getIdentifier();if(3!==(e=1===n.length?3:this.isKeyword(n)?4:"null"===n?5:"true"===n||"false"===n?1:3)&&t+n.length!==this.index){var r=this.index;this.index=t,this.tolerateUnexpectedToken(s.Messages.InvalidEscapedReservedWord),this.index=r}return{type:e,value:n,lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},e.prototype.scanPunctuator=function(){var e=this.index,t=this.source[this.index];switch(t){case"(":case"{":"{"===t&&this.curlyStack.push("{"),++this.index;break;case".":++this.index,"."===this.source[this.index]&&"."===this.source[this.index+1]&&(this.index+=2,t="...");break;case"}":++this.index,this.curlyStack.pop();break;case")":case";":case",":case"[":case"]":case":":case"?":case"~":++this.index;break;default:t=this.source.substr(this.index,4),">>>="===t?this.index+=4:(t=t.substr(0,3),"==="===t||"!=="===t||">>>"===t||"<<="===t||">>="===t||"**="===t?this.index+=3:(t=t.substr(0,2),"&&"===t||"||"===t||"=="===t||"!="===t||"+="===t||"-="===t||"*="===t||"/="===t||"++"===t||"--"===t||"<<"===t||">>"===t||"&="===t||"|="===t||"^="===t||"%="===t||"<="===t||">="===t||"=>"===t||"**"===t?this.index+=2:(t=this.source[this.index],"<>=!+-*%&|^/".indexOf(t)>=0&&++this.index)))}return this.index===e&&this.throwUnexpectedToken(),{type:7,value:t,lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanHexLiteral=function(e){for(var t="";!this.eof()&&a.Character.isHexDigit(this.source.charCodeAt(this.index));)t+=this.source[this.index++];return 0===t.length&&this.throwUnexpectedToken(),a.Character.isIdentifierStart(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(),{type:6,value:parseInt("0x"+t,16),lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanBinaryLiteral=function(e){for(var t,n="";!this.eof()&&("0"===(t=this.source[this.index])||"1"===t);)n+=this.source[this.index++];return 0===n.length&&this.throwUnexpectedToken(),this.eof()||(t=this.source.charCodeAt(this.index),(a.Character.isIdentifierStart(t)||a.Character.isDecimalDigit(t))&&this.throwUnexpectedToken()),{type:6,value:parseInt(n,2),lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanOctalLiteral=function(e,t){var n="",r=!1;for(a.Character.isOctalDigit(e.charCodeAt(0))?(r=!0,n="0"+this.source[this.index++]):++this.index;!this.eof()&&a.Character.isOctalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];return r||0!==n.length||this.throwUnexpectedToken(),(a.Character.isIdentifierStart(this.source.charCodeAt(this.index))||a.Character.isDecimalDigit(this.source.charCodeAt(this.index)))&&this.throwUnexpectedToken(),{type:6,value:parseInt(n,8),octal:r,lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},e.prototype.isImplicitOctalLiteral=function(){for(var e=this.index+1;e<this.length;++e){var t=this.source[e];if("8"===t||"9"===t)return!1;if(!a.Character.isOctalDigit(t.charCodeAt(0)))return!0}return!0},e.prototype.scanNumericLiteral=function(){var e=this.index,t=this.source[e];o.assert(a.Character.isDecimalDigit(t.charCodeAt(0))||"."===t,"Numeric literal must start with a decimal digit or a decimal point");var n="";if("."!==t){if(n=this.source[this.index++],t=this.source[this.index],"0"===n){if("x"===t||"X"===t)return++this.index,this.scanHexLiteral(e);if("b"===t||"B"===t)return++this.index,this.scanBinaryLiteral(e);if("o"===t||"O"===t)return this.scanOctalLiteral(t,e);if(t&&a.Character.isOctalDigit(t.charCodeAt(0))&&this.isImplicitOctalLiteral())return this.scanOctalLiteral(t,e)}for(;a.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];t=this.source[this.index]}if("."===t){for(n+=this.source[this.index++];a.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];t=this.source[this.index]}if("e"===t||"E"===t)if(n+=this.source[this.index++],t=this.source[this.index],"+"!==t&&"-"!==t||(n+=this.source[this.index++]),a.Character.isDecimalDigit(this.source.charCodeAt(this.index)))for(;a.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];else this.throwUnexpectedToken();return a.Character.isIdentifierStart(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(),{type:6,value:parseFloat(n),lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanStringLiteral=function(){var e=this.index,t=this.source[e];o.assert("'"===t||'"'===t,"String literal must starts with a quote"),++this.index;for(var n=!1,r="";!this.eof();){var i=this.source[this.index++];if(i===t){t="";break}if("\\"===i)if((i=this.source[this.index++])&&a.Character.isLineTerminator(i.charCodeAt(0)))++this.lineNumber,"\r"===i&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index;else switch(i){case"u":if("{"===this.source[this.index])++this.index,r+=this.scanUnicodeCodePointEscape();else{var u=this.scanHexEscape(i);null===u&&this.throwUnexpectedToken(),r+=u}break;case"x":var l=this.scanHexEscape(i);null===l&&this.throwUnexpectedToken(s.Messages.InvalidHexEscapeSequence),r+=l;break;case"n":r+="\n";break;case"r":r+="\r";break;case"t":r+="\t";break;case"b":r+="\b";break;case"f":r+="\f";break;case"v":r+="\v";break;case"8":case"9":r+=i,this.tolerateUnexpectedToken();break;default:if(i&&a.Character.isOctalDigit(i.charCodeAt(0))){var c=this.octalToDecimal(i);n=c.octal||n,r+=String.fromCharCode(c.code)}else r+=i}else{if(a.Character.isLineTerminator(i.charCodeAt(0)))break;r+=i}}return""!==t&&(this.index=e,this.throwUnexpectedToken()),{type:8,value:r,octal:n,lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanTemplate=function(){var e="",t=!1,n=this.index,r="`"===this.source[n],i=!1,o=2;for(++this.index;!this.eof();){var u=this.source[this.index++];if("`"===u){o=1,i=!0,t=!0;break}if("$"===u){if("{"===this.source[this.index]){this.curlyStack.push("${"),++this.index,t=!0;break}e+=u}else if("\\"===u)if(u=this.source[this.index++],a.Character.isLineTerminator(u.charCodeAt(0)))++this.lineNumber,"\r"===u&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index;else switch(u){case"n":e+="\n";break;case"r":e+="\r";break;case"t":e+="\t";break;case"u":if("{"===this.source[this.index])++this.index,e+=this.scanUnicodeCodePointEscape();else{var l=this.index,c=this.scanHexEscape(u);null!==c?e+=c:(this.index=l,e+=u)}break;case"x":var p=this.scanHexEscape(u);null===p&&this.throwUnexpectedToken(s.Messages.InvalidHexEscapeSequence),e+=p;break;case"b":e+="\b";break;case"f":e+="\f";break;case"v":e+="\v";break;default:"0"===u?(a.Character.isDecimalDigit(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(s.Messages.TemplateOctalLiteral),e+="\0"):a.Character.isOctalDigit(u.charCodeAt(0))?this.throwUnexpectedToken(s.Messages.TemplateOctalLiteral):e+=u}else a.Character.isLineTerminator(u.charCodeAt(0))?(++this.lineNumber,"\r"===u&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index,e+="\n"):e+=u}return t||this.throwUnexpectedToken(),r||this.curlyStack.pop(),{type:10,value:this.source.slice(n+1,this.index-o),cooked:e,head:r,tail:i,lineNumber:this.lineNumber,lineStart:this.lineStart,start:n,end:this.index}},e.prototype.testRegExp=function(e,t){var n=e,r=this;t.indexOf("u")>=0&&(n=n.replace(/\\u\{([0-9a-fA-F]+)\}|\\u([a-fA-F0-9]{4})/g,function(e,t,n){var i=parseInt(t||n,16);return i>1114111&&r.throwUnexpectedToken(s.Messages.InvalidRegExp),i<=65535?String.fromCharCode(i):"￿"}).replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,"￿"));try{RegExp(n)}catch(e){this.throwUnexpectedToken(s.Messages.InvalidRegExp)}try{return new RegExp(e,t)}catch(e){return null}},e.prototype.scanRegExpBody=function(){var e=this.source[this.index];o.assert("/"===e,"Regular expression literal must start with a slash");for(var t=this.source[this.index++],n=!1,r=!1;!this.eof();)if(e=this.source[this.index++],t+=e,"\\"===e)e=this.source[this.index++],a.Character.isLineTerminator(e.charCodeAt(0))&&this.throwUnexpectedToken(s.Messages.UnterminatedRegExp),t+=e;else if(a.Character.isLineTerminator(e.charCodeAt(0)))this.throwUnexpectedToken(s.Messages.UnterminatedRegExp);else if(n)"]"===e&&(n=!1);else{if("/"===e){r=!0;break}"["===e&&(n=!0)}return r||this.throwUnexpectedToken(s.Messages.UnterminatedRegExp),t.substr(1,t.length-2)},e.prototype.scanRegExpFlags=function(){for(var e="",t="";!this.eof();){var n=this.source[this.index];if(!a.Character.isIdentifierPart(n.charCodeAt(0)))break;if(++this.index,"\\"!==n||this.eof())t+=n,e+=n;else if("u"===(n=this.source[this.index])){++this.index;var r=this.index,i=this.scanHexEscape("u");if(null!==i)for(t+=i,e+="\\u";r<this.index;++r)e+=this.source[r];else this.index=r,t+="u",e+="\\u";this.tolerateUnexpectedToken()}else e+="\\",this.tolerateUnexpectedToken()}return t},e.prototype.scanRegExp=function(){var e=this.index,t=this.scanRegExpBody(),n=this.scanRegExpFlags();return{type:9,value:"",pattern:t,flags:n,regex:this.testRegExp(t,n),lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.lex=function(){if(this.eof())return{type:2,value:"",lineNumber:this.lineNumber,lineStart:this.lineStart,start:this.index,end:this.index};var e=this.source.charCodeAt(this.index);return a.Character.isIdentifierStart(e)?this.scanIdentifier():40===e||41===e||59===e?this.scanPunctuator():39===e||34===e?this.scanStringLiteral():46===e?a.Character.isDecimalDigit(this.source.charCodeAt(this.index+1))?this.scanNumericLiteral():this.scanPunctuator():a.Character.isDecimalDigit(e)?this.scanNumericLiteral():96===e||125===e&&"${"===this.curlyStack[this.curlyStack.length-1]?this.scanTemplate():e>=55296&&e<57343&&a.Character.isIdentifierStart(this.codePointAt(this.index))?this.scanIdentifier():this.scanPunctuator()},e}();t.Scanner=u},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.TokenName={},t.TokenName[1]="Boolean",t.TokenName[2]="<end>",t.TokenName[3]="Identifier",t.TokenName[4]="Keyword",t.TokenName[5]="Null",t.TokenName[6]="Numeric",t.TokenName[7]="Punctuator",t.TokenName[8]="String",t.TokenName[9]="RegularExpression",t.TokenName[10]="Template"},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.XHTMLEntities={quot:'"',amp:"&",apos:"'",gt:">",nbsp:" ",iexcl:"¡",cent:"¢",pound:"£",curren:"¤",yen:"¥",brvbar:"¦",sect:"§",uml:"¨",copy:"©",ordf:"ª",laquo:"«",not:"¬",shy:"­",reg:"®",macr:"¯",deg:"°",plusmn:"±",sup2:"²",sup3:"³",acute:"´",micro:"µ",para:"¶",middot:"·",cedil:"¸",sup1:"¹",ordm:"º",raquo:"»",frac14:"¼",frac12:"½",frac34:"¾",iquest:"¿",Agrave:"À",Aacute:"Á",Acirc:"Â",Atilde:"Ã",Auml:"Ä",Aring:"Å",AElig:"Æ",Ccedil:"Ç",Egrave:"È",Eacute:"É",Ecirc:"Ê",Euml:"Ë",Igrave:"Ì",Iacute:"Í",Icirc:"Î",Iuml:"Ï",ETH:"Ð",Ntilde:"Ñ",Ograve:"Ò",Oacute:"Ó",Ocirc:"Ô",Otilde:"Õ",Ouml:"Ö",times:"×",Oslash:"Ø",Ugrave:"Ù",Uacute:"Ú",Ucirc:"Û",Uuml:"Ü",Yacute:"Ý",THORN:"Þ",szlig:"ß",agrave:"à",aacute:"á",acirc:"â",atilde:"ã",auml:"ä",aring:"å",aelig:"æ",ccedil:"ç",egrave:"è",eacute:"é",ecirc:"ê",euml:"ë",igrave:"ì",iacute:"í",icirc:"î",iuml:"ï",eth:"ð",ntilde:"ñ",ograve:"ò",oacute:"ó",ocirc:"ô",otilde:"õ",ouml:"ö",divide:"÷",oslash:"ø",ugrave:"ù",uacute:"ú",ucirc:"û",uuml:"ü",yacute:"ý",thorn:"þ",yuml:"ÿ",OElig:"Œ",oelig:"œ",Scaron:"Š",scaron:"š",Yuml:"Ÿ",fnof:"ƒ",circ:"ˆ",tilde:"˜",Alpha:"Α",Beta:"Β",Gamma:"Γ",Delta:"Δ",Epsilon:"Ε",Zeta:"Ζ",Eta:"Η",Theta:"Θ",Iota:"Ι",Kappa:"Κ",Lambda:"Λ",Mu:"Μ",Nu:"Ν",Xi:"Ξ",Omicron:"Ο",Pi:"Π",Rho:"Ρ",Sigma:"Σ",Tau:"Τ",Upsilon:"Υ",Phi:"Φ",Chi:"Χ",Psi:"Ψ",Omega:"Ω",alpha:"α",beta:"β",gamma:"γ",delta:"δ",epsilon:"ε",zeta:"ζ",eta:"η",theta:"θ",iota:"ι",kappa:"κ",lambda:"λ",mu:"μ",nu:"ν",xi:"ξ",omicron:"ο",pi:"π",rho:"ρ",sigmaf:"ς",sigma:"σ",tau:"τ",upsilon:"υ",phi:"φ",chi:"χ",psi:"ψ",omega:"ω",thetasym:"ϑ",upsih:"ϒ",piv:"ϖ",ensp:" ",emsp:" ",thinsp:" ",zwnj:"‌",zwj:"‍",lrm:"‎",rlm:"‏",ndash:"–",mdash:"—",lsquo:"‘",rsquo:"’",sbquo:"‚",ldquo:"“",rdquo:"”",bdquo:"„",dagger:"†",Dagger:"‡",bull:"•",hellip:"…",permil:"‰",prime:"′",Prime:"″",lsaquo:"‹",rsaquo:"›",oline:"‾",frasl:"⁄",euro:"€",image:"ℑ",weierp:"℘",real:"ℜ",trade:"™",alefsym:"ℵ",larr:"←",uarr:"↑",rarr:"→",darr:"↓",harr:"↔",crarr:"↵",lArr:"⇐",uArr:"⇑",rArr:"⇒",dArr:"⇓",hArr:"⇔",forall:"∀",part:"∂",exist:"∃",empty:"∅",nabla:"∇",isin:"∈",notin:"∉",ni:"∋",prod:"∏",sum:"∑",minus:"−",lowast:"∗",radic:"√",prop:"∝",infin:"∞",ang:"∠",and:"∧",or:"∨",cap:"∩",cup:"∪",int:"∫",there4:"∴",sim:"∼",cong:"≅",asymp:"≈",ne:"≠",equiv:"≡",le:"≤",ge:"≥",sub:"⊂",sup:"⊃",nsub:"⊄",sube:"⊆",supe:"⊇",oplus:"⊕",otimes:"⊗",perp:"⊥",sdot:"⋅",lceil:"⌈",rceil:"⌉",lfloor:"⌊",rfloor:"⌋",loz:"◊",spades:"♠",clubs:"♣",hearts:"♥",diams:"♦",lang:"⟨",rang:"⟩"}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(10),i=n(12),o=n(13),a=function(){function e(){this.values=[],this.curly=this.paren=-1}return e.prototype.beforeFunctionExpression=function(e){return["(","{","[","in","typeof","instanceof","new","return","case","delete","throw","void","=","+=","-=","*=","**=","/=","%=","<<=",">>=",">>>=","&=","|=","^=",",","+","-","*","**","/","%","++","--","<<",">>",">>>","&","|","^","!","~","&&","||","?",":","===","==",">=","<=","<",">","!=","!=="].indexOf(e)>=0},e.prototype.isRegexStart=function(){var e=this.values[this.values.length-1],t=null!==e;switch(e){case"this":case"]":t=!1;break;case")":var n=this.values[this.paren-1];t="if"===n||"while"===n||"for"===n||"with"===n;break;case"}":if(t=!1,"function"===this.values[this.curly-3]){var r=this.values[this.curly-4];t=!!r&&!this.beforeFunctionExpression(r)}else if("function"===this.values[this.curly-4]){var r=this.values[this.curly-5];t=!r||!this.beforeFunctionExpression(r)}}return t},e.prototype.push=function(e){7===e.type||4===e.type?("{"===e.value?this.curly=this.values.length:"("===e.value&&(this.paren=this.values.length),this.values.push(e.value)):this.values.push(null)},e}(),s=function(){function e(e,t){this.errorHandler=new r.ErrorHandler,this.errorHandler.tolerant=!!t&&("boolean"==typeof t.tolerant&&t.tolerant),this.scanner=new i.Scanner(e,this.errorHandler),this.scanner.trackComment=!!t&&("boolean"==typeof t.comment&&t.comment),this.trackRange=!!t&&("boolean"==typeof t.range&&t.range),this.trackLoc=!!t&&("boolean"==typeof t.loc&&t.loc),this.buffer=[],this.reader=new a}return e.prototype.errors=function(){return this.errorHandler.errors},e.prototype.getNextToken=function(){if(0===this.buffer.length){var e=this.scanner.scanComments();if(this.scanner.trackComment)for(var t=0;t<e.length;++t){var n=e[t],r=this.scanner.source.slice(n.slice[0],n.slice[1]),i={type:n.multiLine?"BlockComment":"LineComment",value:r};this.trackRange&&(i.range=n.range),this.trackLoc&&(i.loc=n.loc),this.buffer.push(i)}if(!this.scanner.eof()){var a=void 0;this.trackLoc&&(a={start:{line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart},end:{}});var s="/"===this.scanner.source[this.scanner.index]&&this.reader.isRegexStart(),u=s?this.scanner.scanRegExp():this.scanner.lex();this.reader.push(u);var l={type:o.TokenName[u.type],value:this.scanner.source.slice(u.start,u.end)};if(this.trackRange&&(l.range=[u.start,u.end]),this.trackLoc&&(a.end={line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart},l.loc=a),9===u.type){var c=u.pattern,p=u.flags;l.regex={pattern:c,flags:p}}this.buffer.push(l)}}return this.buffer.shift()},e}();t.Tokenizer=s}])})},function(e,t,n){"use strict";var r,i,o,a,s,u,l,c=n(141),p=n(58),f=Function.prototype.apply,h=Function.prototype.call,d=Object.create,m=Object.defineProperty,v=Object.defineProperties,g=Object.prototype.hasOwnProperty,y={configurable:!0,enumerable:!1,writable:!0};r=function(e,t){var n;return p(t),g.call(this,"__ee__")?n=this.__ee__:(n=y.value=d(null),m(this,"__ee__",y),y.value=null),n[e]?"object"==typeof n[e]?n[e].push(t):n[e]=[n[e],t]:n[e]=t,this},i=function(e,t){var n,i;return p(t),i=this,r.call(this,e,n=function(){o.call(i,e,n),f.call(t,this,arguments)}),n.__eeOnceListener__=t,this},o=function(e,t){var n,r,i,o;if(p(t),!g.call(this,"__ee__"))return this;if(n=this.__ee__,!n[e])return this;if("object"==typeof(r=n[e]))for(o=0;i=r[o];++o)i!==t&&i.__eeOnceListener__!==t||(2===r.length?n[e]=r[o?0:1]:r.splice(o,1));else r!==t&&r.__eeOnceListener__!==t||delete n[e];return this},a=function(e){var t,n,r,i,o;if(g.call(this,"__ee__")&&(i=this.__ee__[e]))if("object"==typeof i){for(n=arguments.length,o=new Array(n-1),t=1;t<n;++t)o[t-1]=arguments[t];for(i=i.slice(),t=0;r=i[t];++t)f.call(r,this,o)}else switch(arguments.length){case 1:h.call(i,this);break;case 2:h.call(i,this,arguments[1]);break;case 3:h.call(i,this,arguments[1],arguments[2]);break;default:for(n=arguments.length,o=new Array(n-1),t=1;t<n;++t)o[t-1]=arguments[t];f.call(i,this,o)}},s={on:r,once:i,off:o,emit:a},u={on:c(r),once:c(i),off:c(o),emit:c(a)},l=v({},u),e.exports=t=function(e){return null==e?d(l):v(Object(e),u)},t.methods=s},function(e,t){/*!
-- * https://github.com/Starcounter-Jack/JSON-Patch
-- * json-patch-duplex.js version: 1.2.2
-- * (c) 2013 Joachim Wester
-- * MIT license
-- */
--var n;if(function(e){function t(e,n){switch(typeof e){case"undefined":case"boolean":case"string":case"number":return e===n;case"object":if(null===e)return null===n;if(k(e)){if(!k(n)||e.length!==n.length)return!1;for(var r=0,i=e.length;r<i;r++)if(!t(e[r],n[r]))return!1;return!0}for(var o=E(e),a=E(n),s=0;s<o.length;s++){var u=o[s];if(!t(e[u],n[u]))return!1;var l=a.indexOf(u);l>=0&&a.splice(l,1)}for(var c=0;c<a.length;c++){var p=a[c];if(!t(e[p],n[p]))return!1}return!0;default:return!1}}function n(e){for(var t=0,n=A.length;t<n;t++)if(A[t].obj===e)return A[t]}function r(e,t){for(var n=0,r=e.observers.length;n<r;n++)if(e.observers[n].callback===t)return e.observers[n].observer}function i(e,t){for(var n=0,r=e.observers.length;n<r;n++)if(e.observers[n].observer===t)return void e.observers.splice(n,1)}function o(e,t){t.unobserve()}function a(e,t){var o,a=[],u=n(e);if(u?o=r(u,t):(u=new D(e),A.push(u)),o)return o;if(o={},u.value=c(e),t){o.callback=t,o.next=null;var l=function(){s(o)},p=function(){clearTimeout(o.next),o.next=setTimeout(l)};"undefined"!=typeof window&&(window.addEventListener?(window.addEventListener("mouseup",p),window.addEventListener("keyup",p),window.addEventListener("mousedown",p),window.addEventListener("keydown",p),window.addEventListener("change",p)):(document.documentElement.attachEvent("onmouseup",p),document.documentElement.attachEvent("onkeyup",p),document.documentElement.attachEvent("onmousedown",p),document.documentElement.attachEvent("onkeydown",p),document.documentElement.attachEvent("onchange",p)))}return o.patches=a,o.object=e,o.unobserve=function(){s(o),clearTimeout(o.next),i(u,o),"undefined"!=typeof window&&(window.removeEventListener?(window.removeEventListener("mouseup",p),window.removeEventListener("keyup",p),window.removeEventListener("mousedown",p),window.removeEventListener("keydown",p)):(document.documentElement.detachEvent("onmouseup",p),document.documentElement.detachEvent("onkeyup",p),document.documentElement.detachEvent("onmousedown",p),document.documentElement.detachEvent("onkeydown",p)))},u.observers.push(new O(t,o)),o}function s(e){for(var t,n=0,r=A.length;n<r;n++)if(A[n].obj===e.object){t=A[n];break}u(t.value,e.object,e.patches,""),e.patches.length&&m(t.value,e.patches);var i=e.patches;return i.length>0&&(e.patches=[],e.callback&&e.callback(i)),i}function u(e,t,n,r){if(t!==e){"function"==typeof t.toJSON&&(t=t.toJSON());for(var i=E(t),o=E(e),a=!1,s=o.length-1;s>=0;s--){var l=o[s],f=e[l];if(!t.hasOwnProperty(l)||void 0===t[l]&&void 0!==f&&!1===k(t))n.push({op:"remove",path:r+"/"+p(l)}),a=!0;else{var h=t[l];"object"==typeof f&&null!=f&&"object"==typeof h&&null!=h?u(f,h,n,r+"/"+p(l)):f!==h&&(!0,n.push({op:"replace",path:r+"/"+p(l),value:c(h)}))}}if(a||i.length!=o.length)for(var s=0;s<i.length;s++){var l=i[s];e.hasOwnProperty(l)||void 0===t[l]||n.push({op:"add",path:r+"/"+p(l),value:c(t[l])})}}}function l(e){for(var t,n=0,r=e.length;n<r;){t=e.charCodeAt(n);{if(!(t>=48&&t<=57))return!1;n++}}return!0}function c(e){switch(typeof e){case"object":return JSON.parse(JSON.stringify(e));case"undefined":return null;default:return e}}function p(e){return-1===e.indexOf("/")&&-1===e.indexOf("~")?e:e.replace(/~/g,"~0").replace(/\//g,"~1")}function f(e){return e.replace(/~1/g,"/").replace(/~0/g,"~")}function h(e,t){if(""==t)return e;var n={op:"_get",path:t};return d(e,n),n.value}function d(e,n,r,i){if(void 0===r&&(r=!1),void 0===i&&(i=!0),r&&("function"==typeof r?r(n,0,e,n.path):b(n,0)),""===n.path){var o={newDocument:e};if("add"===n.op)return o.newDocument=n.value,o;if("replace"===n.op)return o.newDocument=n.value,o.removed=e,o;if("move"===n.op||"copy"===n.op)return o.newDocument=h(e,n.from),"move"===n.op&&(o.removed=e),o;if("test"===n.op){if(o.test=t(e,n.value),!1===o.test)throw new M("Test operation failed","TEST_OPERATION_FAILED",0,n,e);return o.newDocument=e,o}if("remove"===n.op)return o.removed=e,o.newDocument=null,o;if("_get"===n.op)return n.value=e,o;if(r)throw new M("Operation `op` property is not one of operations defined in RFC-6902","OPERATION_OP_INVALID",0,n,e);return o}i||(e=c(e));var a=n.path||"",s=a.split("/"),u=e,p=1,d=s.length,m=void 0,v=void 0,g=void 0;for(g="function"==typeof r?r:b;;){if(v=s[p],r&&void 0===m&&(void 0===u[v]?m=s.slice(0,p).join("/"):p==d-1&&(m=n.path),void 0!==m&&g(n,0,e,m)),p++,k(u)){if("-"===v)v=u.length;else{if(r&&!l(v))throw new M("Expected an unsigned base-10 integer value, making the new referenced value the array element with the zero-based index","OPERATION_PATH_ILLEGAL_ARRAY_INDEX",0,n.path,n);v=~~v}if(p>=d){if(r&&"add"===n.op&&v>u.length)throw new M("The specified index MUST NOT be greater than the number of elements in the array","OPERATION_VALUE_OUT_OF_BOUNDS",0,n.path,n);var o=C[n.op].call(n,u,v,e);if(!1===o.test)throw new M("Test operation failed","TEST_OPERATION_FAILED",0,n,e);return o}}else if(v&&-1!=v.indexOf("~")&&(v=f(v)),p>=d){var o=S[n.op].call(n,u,v,e);if(!1===o.test)throw new M("Test operation failed","TEST_OPERATION_FAILED",0,n,e);return o}u=u[v]}}function m(e,t,n){for(var r=new Array(t.length),i=0,o=t.length;i<o;i++)r[i]=d(e,t[i],n),e=r[i].newDocument;return r.newDocument=e,r}function v(e,t,n){console.warn("jsonpatch.apply is deprecated, please use `applyPatch` for applying patch sequences, or `applyOperation` to apply individual operations.");for(var r=new Array(t.length),i=0,o=t.length;i<o;i++)!function(i,o){if(""==t[i].path&&"remove"!=t[i].op&&"test"!=t[i].op){var a;if("_get"==t[i].op)return t[i].value=e,"continue";"replace"!=t[i].op&&"move"!=t[i].op||(r[i]=c(e)),"copy"!=t[i].op&&"move"!=t[i].op||(a=h(e,t[i].from)),"replace"!=t[i].op&&"add"!=t[i].op||(a=t[i].value),Object.keys(e).forEach(function(t){return delete e[t]}),Object.keys(a).forEach(function(t){return e[t]=a[t]})}else r[i]=d(e,t[i],n),r[i]=r[i].removed||r[i].test}(i);return r}function g(e,t){var n=d(e,t);if(!1===n.test)throw new M("Test operation failed","TEST_OPERATION_FAILED",0,t,e);return n.newDocument}function y(e,t){function n(){this.constructor=e}for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r]);e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}function _(e){if(void 0===e)return!0;if(e)if(k(e)){for(var t=0,n=e.length;t<n;t++)if(_(e[t]))return!0}else if("object"==typeof e)for(var r=E(e),i=r.length,t=0;t<i;t++)if(_(e[r[t]]))return!0;return!1}function b(e,t,n,r){if("object"!=typeof e||null===e||k(e))throw new M("Operation is not an object","OPERATION_NOT_AN_OBJECT",t,e,n);if(!S[e.op])throw new M("Operation `op` property is not one of operations defined in RFC-6902","OPERATION_OP_INVALID",t,e,n);if("string"!=typeof e.path)throw new M("Operation `path` property is not a string","OPERATION_PATH_INVALID",t,e,n);if(0!==e.path.indexOf("/")&&e.path.length>0)throw new M('Operation `path` property must start with "/"',"OPERATION_PATH_INVALID",t,e,n);if(("move"===e.op||"copy"===e.op)&&"string"!=typeof e.from)throw new M("Operation `from` property is not present (applicable in `move` and `copy` operations)","OPERATION_FROM_REQUIRED",t,e,n);if(("add"===e.op||"replace"===e.op||"test"===e.op)&&void 0===e.value)throw new M("Operation `value` property is not present (applicable in `add`, `replace` and `test` operations)","OPERATION_VALUE_REQUIRED",t,e,n);if(("add"===e.op||"replace"===e.op||"test"===e.op)&&_(e.value))throw new M("Operation `value` property is not present (applicable in `add`, `replace` and `test` operations)","OPERATION_VALUE_CANNOT_CONTAIN_UNDEFINED",t,e,n);if(n)if("add"==e.op){var i=e.path.split("/").length,o=r.split("/").length;if(i!==o+1&&i!==o)throw new M("Cannot perform an `add` operation at the desired path","OPERATION_PATH_CANNOT_ADD",t,e,n)}else if("replace"===e.op||"remove"===e.op||"_get"===e.op){if(e.path!==r)throw new M("Cannot perform the operation at a path that does not exist","OPERATION_PATH_UNRESOLVABLE",t,e,n)}else if("move"===e.op||"copy"===e.op){var a={op:"_get",path:e.from,value:void 0},s=x([a],n);if(s&&"OPERATION_PATH_UNRESOLVABLE"===s.name)throw new M("Cannot perform the operation from a path that does not exist","OPERATION_FROM_UNRESOLVABLE",t,e,n)}}function x(e,t,n){try{if(!k(e))throw new M("Patch sequence must be an array","SEQUENCE_NOT_AN_ARRAY");if(t)m(c(t),c(e),n||!0);else{n=n||b;for(var r=0;r<e.length;r++)n(e[r],r,t,void 0)}}catch(e){if(e instanceof M)return e;throw e}}function w(e,t){var n=[];return u(e,t,n,""),n}var k,E=function(e){if(k(e)){for(var t=new Array(e.length),n=0;n<t.length;n++)t[n]=""+n;return t}if(Object.keys)return Object.keys(e);var t=[];for(var r in e)e.hasOwnProperty(r)&&t.push(r);return t},S={add:function(e,t,n){return e[t]=this.value,{newDocument:n}},remove:function(e,t,n){var r=e[t];return delete e[t],{newDocument:n,removed:r}},replace:function(e,t,n){var r=e[t];return e[t]=this.value,{newDocument:n,removed:r}},move:function(e,t,n){var r=h(n,this.path);r&&(r=c(r));var i=d(n,{op:"remove",path:this.from}).removed;return d(n,{op:"add",path:this.path,value:i}),{newDocument:n,removed:r}},copy:function(e,t,n){var r=h(n,this.from);return d(n,{op:"add",path:this.path,value:c(r)}),{newDocument:n}},test:function(e,n,r){return{newDocument:r,test:t(e[n],this.value)}},_get:function(e,t,n){return this.value=e[t],{newDocument:n}}},C={add:function(e,t,n){return e.splice(t,0,this.value),{newDocument:n,index:t}},remove:function(e,t,n){return{newDocument:n,removed:e.splice(t,1)[0]}},replace:function(e,t,n){var r=e[t];return e[t]=this.value,{newDocument:n,removed:r}},move:S.move,copy:S.copy,test:S.test,_get:S._get};k=Array.isArray?Array.isArray:function(e){return e.push&&"number"==typeof e.length};var A=[],D=function(){function e(e){this.observers=[],this.obj=e}return e}(),O=function(){function e(e,t){this.callback=e,this.observer=t}return e}();e.unobserve=o,e.observe=a,e.generate=s;var k;k=Array.isArray?Array.isArray:function(e){return e.push&&"number"==typeof e.length},e.deepClone=c,e.escapePathComponent=p,e.unescapePathComponent=f,e.getValueByPointer=h,e.applyOperation=d,e.applyPatch=m,e.apply=v,e.applyReducer=g;var M=function(e){function t(t,n,r,i,o){e.call(this,t),this.message=t,this.name=n,this.index=r,this.operation=i,this.tree=o}return y(t,e),t}(Error);e.JsonPatchError=M,e.validator=b,e.validate=x,e.compare=w}(n||(n={})),void 0!==t)t.apply=n.apply,t.applyPatch=n.applyPatch,t.applyOperation=n.applyOperation,t.applyReducer=n.applyReducer,t.getValueByPointer=n.getValueByPointer,t.deepClone=n.deepClone,t.escapePathComponent=n.escapePathComponent,t.unescapePathComponent=n.unescapePathComponent,t.observe=n.observe,t.unobserve=n.unobserve,t.generate=n.generate,t.compare=n.compare,t.validate=n.validate,t.validator=n.validator,t.JsonPatchError=n.JsonPatchError;else var t={},r=!0;Object.defineProperty(t,"__esModule",{value:!0}),t.default=n,r&&(t=void 0)},function(e,t,n){"use strict";function r(e){return e.replace(i,function(e,t){return t.toUpperCase()})}var i=/-(.)/g;e.exports=r},function(e,t,n){"use strict";function r(e){return i(e.replace(o,"ms-"))}var i=n(746),o=/^-ms-/;e.exports=r},function(e,t,n){"use strict";function r(e,t){return!(!e||!t)&&(e===t||!i(e)&&(i(t)?r(e,t.parentNode):"contains"in e?e.contains(t):!!e.compareDocumentPosition&&!!(16&e.compareDocumentPosition(t))))}var i=n(756);e.exports=r},function(e,t,n){"use strict";function r(e){var t=e.length;if((Array.isArray(e)||"object"!=typeof e&&"function"!=typeof e)&&a(!1),"number"!=typeof t&&a(!1),0===t||t-1 in e||a(!1),"function"==typeof e.callee&&a(!1),e.hasOwnProperty)try{return Array.prototype.slice.call(e)}catch(e){}for(var n=Array(t),r=0;r<t;r++)n[r]=e[r];return n}function i(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"length"in e&&!("setInterval"in e)&&"number"!=typeof e.nodeType&&(Array.isArray(e)||"callee"in e||"item"in e)}function o(e){return i(e)?Array.isArray(e)?e.slice():r(e):[e]}var a=n(8);e.exports=o},function(e,t,n){"use strict";function r(e){var t=e.match(c);return t&&t[1].toLowerCase()}function i(e,t){var n=l;l||u(!1);var i=r(e),o=i&&s(i);if(o){n.innerHTML=o[1]+e+o[2];for(var c=o[0];c--;)n=n.lastChild}else n.innerHTML=e;var p=n.getElementsByTagName("script");p.length&&(t||u(!1),a(p).forEach(t));for(var f=Array.from(n.childNodes);n.lastChild;)n.removeChild(n.lastChild);return f}var o=n(25),a=n(749),s=n(751),u=n(8),l=o.canUseDOM?document.createElement("div"):null,c=/^\s*<(\w+)/;e.exports=i},function(e,t,n){"use strict";function r(e){return a||o(!1),f.hasOwnProperty(e)||(e="*"),s.hasOwnProperty(e)||(a.innerHTML="*"===e?"<link />":"<"+e+"></"+e+">",s[e]=!a.firstChild),s[e]?f[e]:null}var i=n(25),o=n(8),a=i.canUseDOM?document.createElement("div"):null,s={},u=[1,'<select multiple="true">',"</select>"],l=[1,"<table>","</table>"],c=[3,"<table><tbody><tr>","</tr></tbody></table>"],p=[1,'<svg xmlns="http://www.w3.org/2000/svg">',"</svg>"],f={"*":[1,"?<div>","</div>"],area:[1,"<map>","</map>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],legend:[1,"<fieldset>","</fieldset>"],param:[1,"<object>","</object>"],tr:[2,"<table><tbody>","</tbody></table>"],optgroup:u,option:u,caption:l,colgroup:l,tbody:l,tfoot:l,thead:l,td:c,th:c};["circle","clipPath","defs","ellipse","g","image","line","linearGradient","mask","path","pattern","polygon","polyline","radialGradient","rect","stop","text","tspan"].forEach(function(e){f[e]=p,s[e]=!0}),e.exports=r},function(e,t,n){"use strict";function r(e){return e.Window&&e instanceof e.Window?{x:e.pageXOffset||e.document.documentElement.scrollLeft,y:e.pageYOffset||e.document.documentElement.scrollTop}:{x:e.scrollLeft,y:e.scrollTop}}e.exports=r},function(e,t,n){"use strict";function r(e){return e.replace(i,"-$1").toLowerCase()}var i=/([A-Z])/g;e.exports=r},function(e,t,n){"use strict";function r(e){return i(e).replace(o,"-ms-")}var i=n(753),o=/^ms-/;e.exports=r},function(e,t,n){"use strict";function r(e){var t=e?e.ownerDocument||e:document,n=t.defaultView||window;return!(!e||!("function"==typeof n.Node?e instanceof n.Node:"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName))}e.exports=r},function(e,t,n){"use strict";function r(e){return i(e)&&3==e.nodeType}var i=n(755);e.exports=r},function(e,t,n){"use strict";function r(e){var t={};return function(n){return t.hasOwnProperty(n)||(t[n]=e.call(this,n)),t[n]}}e.exports=r},function(e,t,n){"use strict";var r={childContextTypes:!0,contextTypes:!0,defaultProps:!0,displayName:!0,getDefaultProps:!0,mixins:!0,propTypes:!0,type:!0},i={name:!0,length:!0,prototype:!0,caller:!0,arguments:!0,arity:!0},o="function"==typeof Object.getOwnPropertySymbols;e.exports=function(e,t,n){if("string"!=typeof t){var a=Object.getOwnPropertyNames(t);o&&(a=a.concat(Object.getOwnPropertySymbols(t)));for(var s=0;s<a.length;++s)if(!(r[a[s]]||i[a[s]]||n&&n[a[s]]))try{e[a[s]]=t[a[s]]}catch(e){}}return e}},function(e,t,n){function r(e){this._cbs=e||{},this.events=[]}e.exports=r;var i=n(116).EVENTS;Object.keys(i).forEach(function(e){if(0===i[e])e="on"+e,r.prototype[e]=function(){this.events.push([e]),this._cbs[e]&&this._cbs[e]()};else if(1===i[e])e="on"+e,r.prototype[e]=function(t){this.events.push([e,t]),this._cbs[e]&&this._cbs[e](t)};else{if(2!==i[e])throw Error("wrong number of arguments");e="on"+e,r.prototype[e]=function(t,n){this.events.push([e,t,n]),this._cbs[e]&&this._cbs[e](t,n)}}}),r.prototype.onreset=function(){this.events=[],this._cbs.onreset&&this._cbs.onreset()},r.prototype.restart=function(){this._cbs.onreset&&this._cbs.onreset();for(var e=0,t=this.events.length;e<t;e++)if(this._cbs[this.events[e][0]]){var n=this.events[e].length;1===n?this._cbs[this.events[e][0]]():2===n?this._cbs[this.events[e][0]](this.events[e][1]):this._cbs[this.events[e][0]](this.events[e][1],this.events[e][2])}}},function(e,t,n){function r(e,t){this.init(e,t)}function i(e,t){return c.getElementsByTagName(e,t,!0)}function o(e,t){return c.getElementsByTagName(e,t,!0,1)[0]}function a(e,t,n){return c.getText(c.getElementsByTagName(e,t,n,1)).trim()}function s(e,t,n,r,i){var o=a(n,r,i);o&&(e[t]=o)}var u=n(116),l=u.DomHandler,c=u.DomUtils;n(42)(r,l),r.prototype.init=l;var p=function(e){return"rss"===e||"feed"===e||"rdf:RDF"===e};r.prototype.onend=function(){var e,t,n={},r=o(p,this.dom);r&&("feed"===r.name?(t=r.children,n.type="atom",s(n,"id","id",t),s(n,"title","title",t),(e=o("link",t))&&(e=e.attribs)&&(e=e.href)&&(n.link=e),s(n,"description","subtitle",t),(e=a("updated",t))&&(n.updated=new Date(e)),s(n,"author","email",t,!0),n.items=i("entry",t).map(function(e){var t,n={};return e=e.children,s(n,"id","id",e),s(n,"title","title",e),(t=o("link",e))&&(t=t.attribs)&&(t=t.href)&&(n.link=t),(t=a("summary",e)||a("content",e))&&(n.description=t),(t=a("updated",e))&&(n.pubDate=new Date(t)),n})):(t=o("channel",r.children).children,n.type=r.name.substr(0,3),n.id="",s(n,"title","title",t),s(n,"link","link",t),s(n,"description","description",t),(e=a("lastBuildDate",t))&&(n.updated=new Date(e)),s(n,"author","managingEditor",t,!0),n.items=i("item",r.children).map(function(e){var t,n={};return e=e.children,s(n,"id","guid",e),s(n,"title","title",e),s(n,"link","link",e),s(n,"description","description",e),(t=a("pubDate",e))&&(n.pubDate=new Date(t)),n}))),this.dom=n,l.prototype._handleCallback.call(this,r?null:Error("couldn't find root of feed"))},e.exports=r},function(e,t,n){function r(e){this._cbs=e||{}}e.exports=r;var i=n(116).EVENTS;Object.keys(i).forEach(function(e){if(0===i[e])e="on"+e,r.prototype[e]=function(){this._cbs[e]&&this._cbs[e]()};else if(1===i[e])e="on"+e,r.prototype[e]=function(t){this._cbs[e]&&this._cbs[e](t)};else{if(2!==i[e])throw Error("wrong number of arguments");e="on"+e,r.prototype[e]=function(t,n){this._cbs[e]&&this._cbs[e](t,n)}}})},function(e,t,n){function r(e){o.call(this,new i(this),e)}function i(e){this.scope=e}e.exports=r;var o=n(382);n(42)(r,o),r.prototype.readable=!0;var a=n(116).EVENTS;Object.keys(a).forEach(function(e){if(0===a[e])i.prototype["on"+e]=function(){this.scope.emit(e)};else if(1===a[e])i.prototype["on"+e]=function(t){this.scope.emit(e,t)};else{if(2!==a[e])throw Error("wrong number of arguments!");i.prototype["on"+e]=function(t,n){this.scope.emit(e,t,n)}}})},function(e,t,n){"use strict";function r(e){return e in a?a[e]:a[e]=e.replace(i,"-$&").toLowerCase().replace(o,"-ms-")}var i=/[A-Z]/g,o=/^ms-/,a={};e.exports=r},function(e,t){t.read=function(e,t,n,r,i){var o,a,s=8*i-r-1,u=(1<<s)-1,l=u>>1,c=-7,p=n?i-1:0,f=n?-1:1,h=e[t+p];for(p+=f,o=h&(1<<-c)-1,h>>=-c,c+=s;c>0;o=256*o+e[t+p],p+=f,c-=8);for(a=o&(1<<-c)-1,o>>=-c,c+=r;c>0;a=256*a+e[t+p],p+=f,c-=8);if(0===o)o=1-l;else{if(o===u)return a?NaN:1/0*(h?-1:1);a+=Math.pow(2,r),o-=l}return(h?-1:1)*a*Math.pow(2,o-r)},t.write=function(e,t,n,r,i,o){var a,s,u,l=8*o-i-1,c=(1<<l)-1,p=c>>1,f=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,h=r?0:o-1,d=r?1:-1,m=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(s=isNaN(t)?1:0,a=c):(a=Math.floor(Math.log(t)/Math.LN2),t*(u=Math.pow(2,-a))<1&&(a--,u*=2),t+=a+p>=1?f/u:f*Math.pow(2,1-p),t*u>=2&&(a++,u/=2),a+p>=c?(s=0,a=c):a+p>=1?(s=(t*u-1)*Math.pow(2,i),a+=p):(s=t*Math.pow(2,p-1)*Math.pow(2,i),a=0));i>=8;e[n+h]=255&s,h+=d,s/=256,i-=8);for(a=a<<i|s,l+=i;l>0;e[n+h]=255&a,h+=d,a/=256,l-=8);e[n+h-d]|=128*m}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e){var t=e.prefixMap,n=e.plugins,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:function(e){return e};return function(){function e(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};i(this,e);var r="undefined"!=typeof navigator?navigator.userAgent:void 0;if(this._userAgent=n.userAgent||r,this._keepUnprefixed=n.keepUnprefixed||!1,this._userAgent&&(this._browserInfo=(0,u.default)(this._userAgent)),!this._browserInfo||!this._browserInfo.cssPrefix)return this._useFallback=!0,!1;this.prefixedKeyframes=(0,c.default)(this._browserInfo.browserName,this._browserInfo.browserVersion,this._browserInfo.cssPrefix);var o=this._browserInfo.browserName&&t[this._browserInfo.browserName];if(o){this._requiresPrefix={};for(var a in o)o[a]>=this._browserInfo.browserVersion&&(this._requiresPrefix[a]=!0);this._hasPropsRequiringPrefix=Object.keys(this._requiresPrefix).length>0}else this._useFallback=!0;this._metaData={browserVersion:this._browserInfo.browserVersion,browserName:this._browserInfo.browserName,cssPrefix:this._browserInfo.cssPrefix,jsPrefix:this._browserInfo.jsPrefix,keepUnprefixed:this._keepUnprefixed,requiresPrefix:this._requiresPrefix}}return a(e,[{key:"prefix",value:function(e){return this._useFallback?r(e):this._hasPropsRequiringPrefix?this._prefixStyle(e):e}},{key:"_prefixStyle",value:function(e){for(var t in e){var r=e[t];if((0,v.default)(r))e[t]=this.prefix(r);else if(Array.isArray(r)){for(var i=[],o=0,a=r.length;o<a;++o){var s=(0,y.default)(n,t,r[o],e,this._metaData);(0,d.default)(i,s||r[o])}i.length>0&&(e[t]=i)}else{var u=(0,y.default)(n,t,r,e,this._metaData);u&&(e[t]=u),this._requiresPrefix.hasOwnProperty(t)&&(e[this._browserInfo.jsPrefix+(0,f.default)(t)]=r,this._keepUnprefixed||delete e[t])}}return e}}],[{key:"prefixAll",value:function(e){return r(e)}}]),e}()}Object.defineProperty(t,"__esModule",{value:!0});var a=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}();t.default=o;var s=n(790),u=r(s),l=n(791),c=r(l),p=n(210),f=r(p),h=n(383),d=r(h),m=n(384),v=r(m),g=n(385),y=r(g);e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default={plugins:[],prefixMap:{chrome:{appearance:64,userSelect:53,textEmphasisPosition:64,textEmphasis:64,textEmphasisStyle:64,textEmphasisColor:64,boxDecorationBreak:64,clipPath:54,maskImage:64,maskMode:64,maskRepeat:64,maskPosition:64,maskClip:64,maskOrigin:64,maskSize:64,maskComposite:64,mask:64,maskBorderSource:64,maskBorderMode:64,maskBorderSlice:64,maskBorderWidth:64,maskBorderOutset:64,maskBorderRepeat:64,maskBorder:64,maskType:64,textDecorationStyle:56,textDecorationSkip:56,textDecorationLine:56,textDecorationColor:56,filter:52,fontFeatureSettings:47,breakAfter:49,breakBefore:49,breakInside:49,columnCount:49,columnFill:49,columnGap:49,columnRule:49,columnRuleColor:49,columnRuleStyle:49,columnRuleWidth:49,columns:49,columnSpan:49,columnWidth:49,writingMode:47},safari:{flex:8,flexBasis:8,flexDirection:8,flexGrow:8,flexFlow:8,flexShrink:8,flexWrap:8,alignContent:8,alignItems:8,alignSelf:8,justifyContent:8,order:8,transform:8,transformOrigin:8,transformOriginX:8,transformOriginY:8,backfaceVisibility:8,perspective:8,perspectiveOrigin:8,transformStyle:8,transformOriginZ:8,animation:8,animationDelay:8,animationDirection:8,animationFillMode:8,animationDuration:8,animationIterationCount:8,animationName:8,animationPlayState:8,animationTimingFunction:8,appearance:11,userSelect:11,backdropFilter:11,fontKerning:9,scrollSnapType:10.1,scrollSnapPointsX:10.1,scrollSnapPointsY:10.1,scrollSnapDestination:10.1,scrollSnapCoordinate:10.1,boxDecorationBreak:11,clipPath:11,maskImage:11,maskMode:11,maskRepeat:11,maskPosition:11,maskClip:11,maskOrigin:11,maskSize:11,maskComposite:11,mask:11,maskBorderSource:11,maskBorderMode:11,maskBorderSlice:11,maskBorderWidth:11,maskBorderOutset:11,maskBorderRepeat:11,maskBorder:11,maskType:11,textDecorationStyle:11,textDecorationSkip:11,textDecorationLine:11,textDecorationColor:11,shapeImageThreshold:10,shapeImageMargin:10,shapeImageOutside:10,filter:9,hyphens:11,flowInto:11,flowFrom:11,breakBefore:8,breakAfter:8,breakInside:8,regionFragment:11,columnCount:8,columnFill:8,columnGap:8,columnRule:8,columnRuleColor:8,columnRuleStyle:8,columnRuleWidth:8,columns:8,columnSpan:8,columnWidth:8,writingMode:11},firefox:{appearance:58,userSelect:58,textAlignLast:48,tabSize:58,hyphens:42,breakAfter:51,breakBefore:51,breakInside:51,columnCount:51,columnFill:51,columnGap:51,columnRule:51,columnRuleColor:51,columnRuleStyle:51,columnRuleWidth:51,columns:51,columnSpan:51,columnWidth:51},opera:{flex:16,flexBasis:16,flexDirection:16,flexGrow:16,flexFlow:16,flexShrink:16,flexWrap:16,alignContent:16,alignItems:16,alignSelf:16,justifyContent:16,order:16,transform:22,transformOrigin:22,transformOriginX:22,transformOriginY:22,backfaceVisibility:22,perspective:22,perspectiveOrigin:22,transformStyle:22,transformOriginZ:22,animation:29,animationDelay:29,animationDirection:29,animationFillMode:29,animationDuration:29,animationIterationCount:29,animationName:29,animationPlayState:29,animationTimingFunction:29,appearance:49,userSelect:40,fontKerning:19,textEmphasisPosition:49,textEmphasis:49,textEmphasisStyle:49,textEmphasisColor:49,boxDecorationBreak:49,clipPath:41,maskImage:49,maskMode:49,maskRepeat:49,maskPosition:49,maskClip:49,maskOrigin:49,maskSize:49,maskComposite:49,mask:49,maskBorderSource:49,maskBorderMode:49,maskBorderSlice:49,maskBorderWidth:49,maskBorderOutset:49,maskBorderRepeat:49,maskBorder:49,maskType:49,textDecorationStyle:43,textDecorationSkip:43,textDecorationLine:43,textDecorationColor:43,filter:39,fontFeatureSettings:34,breakAfter:36,breakBefore:36,breakInside:36,columnCount:36,columnFill:36,columnGap:36,columnRule:36,columnRuleColor:36,columnRuleStyle:36,columnRuleWidth:36,columns:36,columnSpan:36,columnWidth:36,writingMode:34},ie:{userSelect:11,wrapFlow:11,wrapThrough:11,wrapMargin:11,scrollSnapType:11,scrollSnapPointsX:11,scrollSnapPointsY:11,scrollSnapDestination:11,scrollSnapCoordinate:11,hyphens:11,flowInto:11,flowFrom:11,breakBefore:11,breakAfter:11,breakInside:11,regionFragment:11,gridTemplateColumns:11,gridTemplateRows:11,gridTemplateAreas:11,gridTemplate:11,gridAutoColumns:11,gridAutoRows:11,gridAutoFlow:11,grid:11,gridRowStart:11,gridColumnStart:11,gridRowEnd:11,gridRow:11,gridColumn:11,gridColumnEnd:11,gridColumnGap:11,gridRowGap:11,gridArea:11,gridGap:11,textSizeAdjust:11,writingMode:11},edge:{userSelect:16,wrapFlow:16,wrapThrough:16,wrapMargin:16,scrollSnapType:16,scrollSnapPointsX:16,scrollSnapPointsY:16,scrollSnapDestination:16,scrollSnapCoordinate:16,hyphens:16,flowInto:16,flowFrom:16,breakBefore:16,breakAfter:16,breakInside:16,regionFragment:16,gridTemplateColumns:15,gridTemplateRows:15,gridTemplateAreas:15,gridTemplate:15,gridAutoColumns:15,gridAutoRows:15,gridAutoFlow:15,grid:15,gridRowStart:15,gridColumnStart:15,gridRowEnd:15,gridRow:15,gridColumn:15,gridColumnEnd:15,gridColumnGap:15,gridRowGap:15,gridArea:15,gridGap:15},ios_saf:{flex:8.1,flexBasis:8.1,flexDirection:8.1,flexGrow:8.1,flexFlow:8.1,flexShrink:8.1,flexWrap:8.1,alignContent:8.1,alignItems:8.1,alignSelf:8.1,justifyContent:8.1,order:8.1,transform:8.1,transformOrigin:8.1,transformOriginX:8.1,transformOriginY:8.1,backfaceVisibility:8.1,perspective:8.1,perspectiveOrigin:8.1,transformStyle:8.1,transformOriginZ:8.1,animation:8.1,animationDelay:8.1,animationDirection:8.1,animationFillMode:8.1,animationDuration:8.1,animationIterationCount:8.1,animationName:8.1,animationPlayState:8.1,animationTimingFunction:8.1,appearance:11,userSelect:11,backdropFilter:11,fontKerning:11,scrollSnapType:11,scrollSnapPointsX:11,scrollSnapPointsY:11,scrollSnapDestination:11,scrollSnapCoordinate:11,boxDecorationBreak:11,clipPath:11,maskImage:11,maskMode:11,maskRepeat:11,maskPosition:11,maskClip:11,maskOrigin:11,maskSize:11,maskComposite:11,mask:11,maskBorderSource:11,maskBorderMode:11,maskBorderSlice:11,maskBorderWidth:11,maskBorderOutset:11,maskBorderRepeat:11,maskBorder:11,maskType:11,textSizeAdjust:11,textDecorationStyle:11,textDecorationSkip:11,textDecorationLine:11,textDecorationColor:11,shapeImageThreshold:10,shapeImageMargin:10,shapeImageOutside:10,filter:9,hyphens:11,flowInto:11,flowFrom:11,breakBefore:8.1,breakAfter:8.1,breakInside:8.1,regionFragment:11,columnCount:8.1,columnFill:8.1,columnGap:8.1,columnRule:8.1,columnRuleColor:8.1,columnRuleStyle:8.1,columnRuleWidth:8.1,columns:8.1,columnSpan:8.1,columnWidth:8.1,writingMode:11},android:{borderImage:4.2,borderImageOutset:4.2,borderImageRepeat:4.2,borderImageSlice:4.2,borderImageSource:4.2,borderImageWidth:4.2,flex:4.2,flexBasis:4.2,flexDirection:4.2,flexGrow:4.2,flexFlow:4.2,flexShrink:4.2,flexWrap:4.2,alignContent:4.2,alignItems:4.2,alignSelf:4.2,justifyContent:4.2,order:4.2,transition:4.2,transitionDelay:4.2,transitionDuration:4.2,transitionProperty:4.2,transitionTimingFunction:4.2,transform:4.4,transformOrigin:4.4,transformOriginX:4.4,transformOriginY:4.4,backfaceVisibility:4.4,perspective:4.4,perspectiveOrigin:4.4,transformStyle:4.4,transformOriginZ:4.4,animation:4.4,animationDelay:4.4,animationDirection:4.4,animationFillMode:4.4,animationDuration:4.4,animationIterationCount:4.4,animationName:4.4,animationPlayState:4.4,animationTimingFunction:4.4,appearance:56,userSelect:4.4,fontKerning:4.4,textEmphasisPosition:56,textEmphasis:56,textEmphasisStyle:56,textEmphasisColor:56,boxDecorationBreak:56,clipPath:4.4,maskImage:56,maskMode:56,maskRepeat:56,maskPosition:56,maskClip:56,maskOrigin:56,maskSize:56,maskComposite:56,mask:56,maskBorderSource:56,maskBorderMode:56,maskBorderSlice:56,maskBorderWidth:56,maskBorderOutset:56,maskBorderRepeat:56,maskBorder:56,maskType:56,filter:4.4,fontFeatureSettings:4.4,breakAfter:4.4,breakBefore:4.4,breakInside:4.4,columnCount:4.4,columnFill:4.4,columnGap:4.4,columnRule:4.4,columnRuleColor:4.4,columnRuleStyle:4.4,columnRuleWidth:4.4,columns:4.4,columnSpan:4.4,columnWidth:4.4,writingMode:4.4},and_chr:{appearance:61,textEmphasisPosition:61,textEmphasis:61,textEmphasisStyle:61,textEmphasisColor:61,boxDecorationBreak:61,maskImage:61,maskMode:61,maskRepeat:61,maskPosition:61,maskClip:61,maskOrigin:61,maskSize:61,maskComposite:61,mask:61,maskBorderSource:61,maskBorderMode:61,maskBorderSlice:61,maskBorderWidth:61,maskBorderOutset:61,maskBorderRepeat:61,maskBorder:61,maskType:61},and_uc:{flex:11.4,flexBasis:11.4,flexDirection:11.4,flexGrow:11.4,flexFlow:11.4,flexShrink:11.4,flexWrap:11.4,alignContent:11.4,alignItems:11.4,alignSelf:11.4,justifyContent:11.4,order:11.4,transform:11.4,transformOrigin:11.4,transformOriginX:11.4,transformOriginY:11.4,backfaceVisibility:11.4,perspective:11.4,perspectiveOrigin:11.4,transformStyle:11.4,transformOriginZ:11.4,animation:11.4,animationDelay:11.4,animationDirection:11.4,animationFillMode:11.4,animationDuration:11.4,animationIterationCount:11.4,animationName:11.4,animationPlayState:11.4,animationTimingFunction:11.4,appearance:11.4,userSelect:11.4,textEmphasisPosition:11.4,textEmphasis:11.4,textEmphasisStyle:11.4,textEmphasisColor:11.4,clipPath:11.4,maskImage:11.4,maskMode:11.4,maskRepeat:11.4,maskPosition:11.4,maskClip:11.4,maskOrigin:11.4,maskSize:11.4,maskComposite:11.4,mask:11.4,maskBorderSource:11.4,maskBorderMode:11.4,maskBorderSlice:11.4,maskBorderWidth:11.4,maskBorderOutset:11.4,maskBorderRepeat:11.4,maskBorder:11.4,maskType:11.4,textSizeAdjust:11.4,filter:11.4,hyphens:11.4,fontFeatureSettings:11.4,breakAfter:11.4,breakBefore:11.4,breakInside:11.4,columnCount:11.4,columnFill:11.4,columnGap:11.4,columnRule:11.4,columnRuleColor:11.4,columnRuleStyle:11.4,columnRuleWidth:11.4,columns:11.4,columnSpan:11.4,columnWidth:11.4,writingMode:11.4},op_mini:{}}},e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,a=r.browserVersion,s=r.cssPrefix,u=r.keepUnprefixed;if("string"==typeof t&&t.indexOf("cross-fade(")>-1&&("chrome"===i||"opera"===i||"and_chr"===i||("ios_saf"===i||"safari"===i)&&a<10))return(0,o.default)(t.replace(/cross-fade\(/g,s+"cross-fade("),t,u)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,u=r.browserVersion,l=r.cssPrefix,c=r.keepUnprefixed;return"cursor"!==e||!a[t]||"firefox"!==i&&"chrome"!==i&&"safari"!==i&&"opera"!==i?"cursor"===e&&s[t]&&("firefox"===i&&u<24||"chrome"===i&&u<37||"safari"===i&&u<9||"opera"===i&&u<24)?(0,o.default)(l+t,t,c):void 0:(0,o.default)(l+t,t,c)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={grab:!0,grabbing:!0},s={"zoom-in":!0,"zoom-out":!0};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,a=r.browserVersion,s=r.cssPrefix,u=r.keepUnprefixed;if("string"==typeof t&&t.indexOf("filter(")>-1&&("ios_saf"===i||"safari"===i&&a<9.1))return(0,o.default)(t.replace(/filter\(/g,s+"filter("),t,u)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,s=r.browserVersion,u=r.cssPrefix,l=r.keepUnprefixed;if("display"===e&&a[t]&&("chrome"===i&&s<29&&s>20||("safari"===i||"ios_saf"===i)&&s<9&&s>6||"opera"===i&&(15===s||16===s)))return(0,o.default)(u+t,t,l)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={flex:!0,"inline-flex":!0};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,u=r.browserVersion,c=r.cssPrefix,p=r.keepUnprefixed,f=r.requiresPrefix;if((l.indexOf(e)>-1||"display"===e&&"string"==typeof t&&t.indexOf("flex")>-1)&&("firefox"===i&&u<22||"chrome"===i&&u<21||("safari"===i||"ios_saf"===i)&&u<=6.1||"android"===i&&u<4.4||"and_uc"===i)){if(delete f[e],p||Array.isArray(n[e])||delete n[e],"flexDirection"===e&&"string"==typeof t&&(t.indexOf("column")>-1?n.WebkitBoxOrient="vertical":n.WebkitBoxOrient="horizontal",t.indexOf("reverse")>-1?n.WebkitBoxDirection="reverse":n.WebkitBoxDirection="normal"),"display"===e&&a.hasOwnProperty(t))return(0,o.default)(c+a[t],t,p);s.hasOwnProperty(e)&&(n[s[e]]=a[t]||t)}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={"space-around":"justify","space-between":"justify","flex-start":"start","flex-end":"end","wrap-reverse":"multiple",wrap:"multiple",flex:"box","inline-flex":"inline-box"},s={alignItems:"WebkitBoxAlign",justifyContent:"WebkitBoxPack",flexWrap:"WebkitBoxLines"},u=["alignContent","alignSelf","order","flexGrow","flexShrink","flexBasis","flexDirection"],l=Object.keys(s).concat(u);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,s=r.browserVersion,u=r.cssPrefix,l=r.keepUnprefixed;if("string"==typeof t&&a.test(t)&&("firefox"===i&&s<16||"chrome"===i&&s<26||("safari"===i||"ios_saf"===i)&&s<7||("opera"===i||"op_mini"===i)&&s<12.1||"android"===i&&s<4.4||"and_uc"===i))return(0,o.default)(u+t,t,l)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=/linear-gradient|radial-gradient|repeating-linear-gradient|repeating-radial-gradient/;e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,a=r.cssPrefix,s=r.keepUnprefixed;if("string"==typeof t&&t.indexOf("image-set(")>-1&&("chrome"===i||"opera"===i||"and_chr"===i||"and_uc"===i||"ios_saf"===i||"safari"===i))return(0,o.default)(t.replace(/image-set\(/g,a+"image-set("),t,s)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,a=r.cssPrefix,s=r.keepUnprefixed;if("position"===e&&"sticky"===t&&("safari"===i||"ios_saf"===i))return(0,o.default)(a+t,t,s)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.cssPrefix,u=r.keepUnprefixed;if(a.hasOwnProperty(e)&&s.hasOwnProperty(t))return(0,o.default)(i+t,t,u)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={maxHeight:!0,maxWidth:!0,width:!0,height:!0,columnWidth:!0,minWidth:!0,minHeight:!0},s={"min-content":!0,"max-content":!0,"fill-available":!0,"fit-content":!0,"contain-floats":!0};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.cssPrefix,u=r.keepUnprefixed,l=r.requiresPrefix;if("string"==typeof t&&a.hasOwnProperty(e)){s||(s=Object.keys(l).map(function(e){return(0,o.default)(e)}));var c=t.split(/,(?![^()]*(?:\([^()]*\))?\))/g);return s.forEach(function(e){c.forEach(function(t,n){t.indexOf(e)>-1&&"order"!==e&&(c[n]=t.replace(e,i+e)+(u?","+t:""))})}),c.join(",")}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(367),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={transition:!0,transitionProperty:!0,WebkitTransition:!0,WebkitTransitionProperty:!0,MozTransition:!0,MozTransitionProperty:!0},s=void 0;e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){function t(e){for(var i in e){var o=e[i];if((0,f.default)(o))e[i]=t(o);else if(Array.isArray(o)){for(var s=[],l=0,p=o.length;l<p;++l){var h=(0,u.default)(r,i,o[l],e,n);(0,c.default)(s,h||o[l])}s.length>0&&(e[i]=s)}else{var d=(0,u.default)(r,i,o,e,n);d&&(e[i]=d),(0,a.default)(n,i,e)}}return e}var n=e.prefixMap,r=e.plugins;return t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(792),a=r(o),s=n(385),u=r(s),l=n(383),c=r(l),p=n(384),f=r(p);e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(777),o=r(i),a=n(789),s=r(a),u=n(780),l=r(u),c=n(779),p=r(c),f=n(781),h=r(f),d=n(782),m=r(d),v=n(783),g=r(v),y=n(784),_=r(y),b=n(785),x=r(b),w=n(786),k=r(w),E=n(787),S=r(E),C=n(788),A=r(C),D=[p.default,l.default,h.default,g.default,_.default,x.default,k.default,S.default,A.default,m.default];t.default=(0,o.default)({prefixMap:s.default.prefixMap,plugins:D}),e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("string"==typeof t&&!(0,o.default)(t)&&t.indexOf("cross-fade(")>-1)return a.map(function(e){return t.replace(/cross-fade\(/g,e+"cross-fade(")})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(112),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=["-webkit-",""];e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("cursor"===e&&o.hasOwnProperty(t))return i.map(function(e){return e+t})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=["-webkit-","-moz-",""],o={"zoom-in":!0,"zoom-out":!0,grab:!0,grabbing:!0};e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("string"==typeof t&&!(0,o.default)(t)&&t.indexOf("filter(")>-1)return a.map(function(e){return t.replace(/filter\(/g,e+"filter(")})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(112),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=["-webkit-",""];e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("display"===e&&i.hasOwnProperty(t))return i[t]}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i={flex:["-webkit-box","-moz-box","-ms-flexbox","-webkit-flex","flex"],"inline-flex":["-webkit-inline-box","-moz-inline-box","-ms-inline-flexbox","-webkit-inline-flex","inline-flex"]};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){"flexDirection"===e&&"string"==typeof t&&(t.indexOf("column")>-1?n.WebkitBoxOrient="vertical":n.WebkitBoxOrient="horizontal",t.indexOf("reverse")>-1?n.WebkitBoxDirection="reverse":n.WebkitBoxDirection="normal"),o.hasOwnProperty(e)&&(n[o[e]]=i[t]||t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i={"space-around":"justify","space-between":"justify","flex-start":"start","flex-end":"end","wrap-reverse":"multiple",wrap:"multiple"},o={alignItems:"WebkitBoxAlign",justifyContent:"WebkitBoxPack",flexWrap:"WebkitBoxLines"};e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("string"==typeof t&&!(0,o.default)(t)&&s.test(t))return a.map(function(e){return e+t})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(112),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=["-webkit-","-moz-",""],s=/linear-gradient|radial-gradient|repeating-linear-gradient|repeating-radial-gradient/;e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("string"==typeof t&&!(0,o.default)(t)&&t.indexOf("image-set(")>-1)return a.map(function(e){return t.replace(/image-set\(/g,e+"image-set(")})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(112),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=["-webkit-",""];e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("position"===e&&"sticky"===t)return["-webkit-sticky","sticky"]}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(o.hasOwnProperty(e)&&a.hasOwnProperty(t))return i.map(function(e){return e+t})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=["-webkit-","-moz-",""],o={maxHeight:!0,maxWidth:!0,width:!0,height:!0,columnWidth:!0,minWidth:!0,minHeight:!0},a={"min-content":!0,"max-content":!0,"fill-available":!0,"fit-content":!0,"contain-floats":!0};e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if((0,l.default)(e))return e;for(var n=e.split(/,(?![^()]*(?:\([^()]*\))?\))/g),r=0,i=n.length;r<i;++r){var o=n[r],a=[o];for(var u in t){var c=(0,s.default)(u);if(o.indexOf(c)>-1&&"order"!==c)for(var p=t[u],f=0,d=p.length;f<d;++f)a.unshift(o.replace(c,h[p[f]]+c))}n[r]=a.join(",")}return n.join(",")}function o(e,t,n,r){if("string"==typeof t&&f.hasOwnProperty(e)){var o=i(t,r),a=o.split(/,(?![^()]*(?:\([^()]*\))?\))/g).filter(function(e){return!/-moz-|-ms-/.test(e)}).join(",");if(e.indexOf("Webkit")>-1)return a;var s=o.split(/,(?![^()]*(?:\([^()]*\))?\))/g).filter(function(e){return!/-webkit-|-ms-/.test(e)}).join(",");return e.indexOf("Moz")>-1?s:(n["Webkit"+(0,p.default)(e)]=a,n["Moz"+(0,p.default)(e)]=s,o)}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=o;var a=n(367),s=r(a),u=n(112),l=r(u),c=n(210),p=r(c),f={transition:!0,transitionProperty:!0,WebkitTransition:!0,WebkitTransitionProperty:!0,MozTransition:!0,MozTransitionProperty:!0},h={Webkit:"-webkit-",Moz:"-moz-",ms:"-ms-"};e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=["Webkit"],i=["Moz"],o=["ms"],a=["Webkit","Moz"],s=["Webkit","ms"],u=["Webkit","Moz","ms"];t.default={plugins:[],prefixMap:{appearance:a,userSelect:u,textEmphasisPosition:r,textEmphasis:r,textEmphasisStyle:r,textEmphasisColor:r,boxDecorationBreak:r,clipPath:r,maskImage:r,maskMode:r,maskRepeat:r,maskPosition:r,maskClip:r,maskOrigin:r,maskSize:r,maskComposite:r,mask:r,maskBorderSource:r,maskBorderMode:r,maskBorderSlice:r,maskBorderWidth:r,maskBorderOutset:r,maskBorderRepeat:r,maskBorder:r,maskType:r,textDecorationStyle:r,textDecorationSkip:r,textDecorationLine:r,textDecorationColor:r,filter:r,fontFeatureSettings:r,breakAfter:u,breakBefore:u,breakInside:u,columnCount:a,columnFill:a,columnGap:a,columnRule:a,columnRuleColor:a,columnRuleStyle:a,columnRuleWidth:a,columns:a,columnSpan:a,columnWidth:a,writingMode:s,flex:r,flexBasis:r,flexDirection:r,flexGrow:r,flexFlow:r,flexShrink:r,flexWrap:r,alignContent:r,alignItems:r,alignSelf:r,justifyContent:r,order:r,transform:r,transformOrigin:r,transformOriginX:r,transformOriginY:r,backfaceVisibility:r,perspective:r,perspectiveOrigin:r,transformStyle:r,transformOriginZ:r,animation:r,animationDelay:r,animationDirection:r,animationFillMode:r,animationDuration:r,animationIterationCount:r,animationName:r,animationPlayState:r,animationTimingFunction:r,backdropFilter:r,fontKerning:r,scrollSnapType:s,scrollSnapPointsX:s,scrollSnapPointsY:s,scrollSnapDestination:s,scrollSnapCoordinate:s,shapeImageThreshold:r,shapeImageMargin:r,shapeImageOutside:r,hyphens:u,flowInto:s,flowFrom:s,regionFragment:s,textAlignLast:i,tabSize:i,wrapFlow:o,wrapThrough:o,wrapMargin:o,gridTemplateColumns:o,gridTemplateRows:o,gridTemplateAreas:o,gridTemplate:o,gridAutoColumns:o,gridAutoRows:o,gridAutoFlow:o,grid:o,gridRowStart:o,gridColumnStart:o,gridRowEnd:o,gridRow:o,gridColumn:o,gridColumnEnd:o,gridColumnGap:o,gridRowGap:o,gridArea:o,gridGap:o,textSizeAdjust:s,borderImage:r,borderImageOutset:r,borderImageRepeat:r,borderImageSlice:r,borderImageSource:r,borderImageWidth:r,transitionDelay:r,transitionDuration:r,transitionProperty:r,transitionTimingFunction:r}},e.exports=t.default},function(e,t,n){"use strict";function r(e){if(e.firefox)return"firefox";if(e.mobile||e.tablet){if(e.ios)return"ios_saf";if(e.android)return"android";if(e.opera)return"op_mini"}for(var t in u)if(e.hasOwnProperty(t))return u[t]}function i(e){var t=a.default._detect(e);t.yandexbrowser&&(t=a.default._detect(e.replace(/YaBrowser\/[0-9.]*/,"")));for(var n in s)if(t.hasOwnProperty(n)){var i=s[n];t.jsPrefix=i,t.cssPrefix="-"+i.toLowerCase()+"-";break}return t.browserName=r(t),t.version?t.browserVersion=parseFloat(t.version):t.browserVersion=parseInt(parseFloat(t.osversion),10),t.osVersion=parseFloat(t.osversion),"ios_saf"===t.browserName&&t.browserVersion>t.osVersion&&(t.browserVersion=t.osVersion),"android"===t.browserName&&t.chrome&&t.browserVersion>37&&(t.browserName="and_chr"),"android"===t.browserName&&t.osVersion<5&&(t.browserVersion=t.osVersion),"android"===t.browserName&&t.samsungBrowser&&(t.browserName="and_chr",t.browserVersion=44),t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(571),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s={chrome:"Webkit",safari:"Webkit",ios:"Webkit",android:"Webkit",phantom:"Webkit",opera:"Webkit",webos:"Webkit",blackberry:"Webkit",bada:"Webkit",tizen:"Webkit",chromium:"Webkit",vivaldi:"Webkit",firefox:"Moz",seamoney:"Moz",sailfish:"Moz",msie:"ms",msedge:"ms"},u={chrome:"chrome",chromium:"chrome",safari:"safari",firfox:"firefox",msedge:"edge",opera:"opera",vivaldi:"opera",msie:"ie"};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){return"chrome"===e&&t<43||("safari"===e||"ios_saf"===e)&&t<9||"opera"===e&&t<30||"android"===e&&t<=4.4||"and_uc"===e?n+"keyframes":"keyframes"}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){if(e.hasOwnProperty(t))for(var r=e[t],i=0,a=r.length;i<a;++i)n[r[i]+(0,o.default)(t)]=n[t]}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(210),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";var r=function(e,t,n,r,i,o,a,s){if(!e){var u;if(void 0===t)u=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var l=[n,r,i,o,a,s],c=0;u=new Error(t.replace(/%s/g,function(){return l[c++]})),u.name="Invariant Violation"}throw u.framesToPop=1,u}};e.exports=r},function(e,t){e.exports=FormData},function(e,t,n){"use strict";function r(e){return function(){throw new Error("Function "+e+" is deprecated and cannot be used.")}}var i=n(797),o=n(796);e.exports.Type=n(16),e.exports.Schema=n(81),e.exports.FAILSAFE_SCHEMA=n(212),e.exports.JSON_SCHEMA=n(389),e.exports.CORE_SCHEMA=n(388),e.exports.DEFAULT_SAFE_SCHEMA=n(118),e.exports.DEFAULT_FULL_SCHEMA=n(145),e.exports.load=i.load,e.exports.loadAll=i.loadAll,e.exports.safeLoad=i.safeLoad,e.exports.safeLoadAll=i.safeLoadAll,e.exports.dump=o.dump,e.exports.safeDump=o.safeDump,e.exports.YAMLException=n(117),e.exports.MINIMAL_SCHEMA=n(212),e.exports.SAFE_SCHEMA=n(118),e.exports.DEFAULT_SCHEMA=n(145),e.exports.scan=r("scan"),e.exports.parse=r("parse"),e.exports.compose=r("compose"),e.exports.addConstructor=r("addConstructor")},function(e,t,n){"use strict";function r(e,t){var n,r,i,o,a,s,u;if(null===t)return{};for(n={},r=Object.keys(t),i=0,o=r.length;i<o;i+=1)a=r[i],s=String(t[a]),"!!"===a.slice(0,2)&&(a="tag:yaml.org,2002:"+a.slice(2)),u=e.compiledTypeMap.fallback[a],u&&j.call(u.styleAliases,s)&&(s=u.styleAliases[s]),n[a]=s;return n}function i(e){var t,n,r;if(t=e.toString(16).toUpperCase(),e<=255)n="x",r=2;else if(e<=65535)n="u",r=4;else{if(!(e<=4294967295))throw new T("code point within a string may not be greater than 0xFFFFFFFF");n="U",r=8}return"\\"+n+M.repeat("0",r-t.length)+t}function o(e){this.schema=e.schema||P,this.indent=Math.max(1,e.indent||2),this.skipInvalid=e.skipInvalid||!1,this.flowLevel=M.isNothing(e.flowLevel)?-1:e.flowLevel,this.styleMap=r(this.schema,e.styles||null),this.sortKeys=e.sortKeys||!1,this.lineWidth=e.lineWidth||80,this.noRefs=e.noRefs||!1,this.noCompatMode=e.noCompatMode||!1,this.condenseFlow=e.condenseFlow||!1,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function a(e,t){for(var n,r=M.repeat(" ",t),i=0,o=-1,a="",s=e.length;i<s;)o=e.indexOf("\n",i),-1===o?(n=e.slice(i),i=s):(n=e.slice(i,o+1),i=o+1),n.length&&"\n"!==n&&(a+=r),a+=n;return a}function s(e,t){return"\n"+M.repeat(" ",e.indent*t)}function u(e,t){var n,r,i;for(n=0,r=e.implicitTypes.length;n<r;n+=1)if(i=e.implicitTypes[n],i.resolve(t))return!0;return!1}function l(e){return e===B||e===F}function c(e){return 32<=e&&e<=126||161<=e&&e<=55295&&8232!==e&&8233!==e||57344<=e&&e<=65533&&65279!==e||65536<=e&&e<=1114111}function p(e){return c(e)&&65279!==e&&e!==G&&e!==Z&&e!==Q&&e!==te&&e!==re&&e!==K&&e!==z}function f(e){return c(e)&&65279!==e&&!l(e)&&e!==J&&e!==Y&&e!==K&&e!==G&&e!==Z&&e!==Q&&e!==te&&e!==re&&e!==z&&e!==W&&e!==H&&e!==L&&e!==ne&&e!==X&&e!==V&&e!==q&&e!==U&&e!==$&&e!==ee}function h(e,t,n,r,i){var o,a,s=!1,u=!1,h=-1!==r,d=-1,m=f(e.charCodeAt(0))&&!l(e.charCodeAt(e.length-1));if(t)for(o=0;o<e.length;o++){if(a=e.charCodeAt(o),!c(a))return ce;m=m&&p(a)}else{for(o=0;o<e.length;o++){if((a=e.charCodeAt(o))===N)s=!0,h&&(u=u||o-d-1>r&&" "!==e[d+1],d=o);else if(!c(a))return ce;m=m&&p(a)}u=u||h&&o-d-1>r&&" "!==e[d+1]}return s||u?" "===e[0]&&n>9?ce:u?le:ue:m&&!i(e)?ae:se}function d(e,t,n,r){e.dump=function(){function i(t){return u(e,t)}if(0===t.length)return"''";if(!e.noCompatMode&&-1!==oe.indexOf(t))return"'"+t+"'";var o=e.indent*Math.max(1,n),s=-1===e.lineWidth?-1:Math.max(Math.min(e.lineWidth,40),e.lineWidth-o),l=r||e.flowLevel>-1&&n>=e.flowLevel;switch(h(t,l,e.indent,s,i)){case ae:return t;case se:return"'"+t.replace(/'/g,"''")+"'";case ue:return"|"+m(t,e.indent)+v(a(t,o));case le:return">"+m(t,e.indent)+v(a(g(t,s),o));case ce:return'"'+_(t)+'"';default:throw new T("impossible error: invalid scalar style")}}()}function m(e,t){var n=" "===e[0]?String(t):"",r="\n"===e[e.length-1];return n+(!r||"\n"!==e[e.length-2]&&"\n"!==e?r?"":"-":"+")+"\n"}function v(e){return"\n"===e[e.length-1]?e.slice(0,-1):e}function g(e,t){for(var n,r,i=/(\n+)([^\n]*)/g,o=function(){var n=e.indexOf("\n");return n=-1!==n?n:e.length,i.lastIndex=n,y(e.slice(0,n),t)}(),a="\n"===e[0]||" "===e[0];r=i.exec(e);){var s=r[1],u=r[2];n=" "===u[0],o+=s+(a||n||""===u?"":"\n")+y(u,t),a=n}return o}function y(e,t){if(""===e||" "===e[0])return e;for(var n,r,i=/ [^ ]/g,o=0,a=0,s=0,u="";n=i.exec(e);)s=n.index,s-o>t&&(r=a>o?a:s,u+="\n"+e.slice(o,r),o=r+1),a=s;return u+="\n",e.length-o>t&&a>o?u+=e.slice(o,a)+"\n"+e.slice(a+1):u+=e.slice(o),u.slice(1)}function _(e){for(var t,n,r,o="",a=0;a<e.length;a++)t=e.charCodeAt(a),t>=55296&&t<=56319&&(n=e.charCodeAt(a+1))>=56320&&n<=57343?(o+=i(1024*(t-55296)+n-56320+65536),a++):(r=ie[t],o+=!r&&c(t)?e[a]:r||i(t));return o}function b(e,t,n){var r,i,o="",a=e.tag;for(r=0,i=n.length;r<i;r+=1)S(e,t,n[r],!1,!1)&&(0!==r&&(o+=","+(e.condenseFlow?"":" ")),o+=e.dump);e.tag=a,e.dump="["+o+"]"}function x(e,t,n,r){var i,o,a="",u=e.tag;for(i=0,o=n.length;i<o;i+=1)S(e,t+1,n[i],!0,!0)&&(r&&0===i||(a+=s(e,t)),e.dump&&N===e.dump.charCodeAt(0)?a+="-":a+="- ",a+=e.dump);e.tag=u,e.dump=a||"[]"}function w(e,t,n){var r,i,o,a,s,u="",l=e.tag,c=Object.keys(n);for(r=0,i=c.length;r<i;r+=1)s=e.condenseFlow?'"':"",0!==r&&(s+=", "),o=c[r],a=n[o],S(e,t,o,!1,!1)&&(e.dump.length>1024&&(s+="? "),s+=e.dump+(e.condenseFlow?'"':"")+":"+(e.condenseFlow?"":" "),S(e,t,a,!1,!1)&&(s+=e.dump,u+=s));e.tag=l,e.dump="{"+u+"}"}function k(e,t,n,r){var i,o,a,u,l,c,p="",f=e.tag,h=Object.keys(n);if(!0===e.sortKeys)h.sort();else if("function"==typeof e.sortKeys)h.sort(e.sortKeys);else if(e.sortKeys)throw new T("sortKeys must be a boolean or a function");for(i=0,o=h.length;i<o;i+=1)c="",r&&0===i||(c+=s(e,t)),a=h[i],u=n[a],S(e,t+1,a,!0,!0,!0)&&(l=null!==e.tag&&"?"!==e.tag||e.dump&&e.dump.length>1024,l&&(e.dump&&N===e.dump.charCodeAt(0)?c+="?":c+="? "),c+=e.dump,l&&(c+=s(e,t)),S(e,t+1,u,!0,l)&&(e.dump&&N===e.dump.charCodeAt(0)?c+=":":c+=": ",c+=e.dump,p+=c));e.tag=f,e.dump=p||"{}"}function E(e,t,n){var r,i,o,a,s,u;for(i=n?e.explicitTypes:e.implicitTypes,o=0,a=i.length;o<a;o+=1)if(s=i[o],(s.instanceOf||s.predicate)&&(!s.instanceOf||"object"==typeof t&&t instanceof s.instanceOf)&&(!s.predicate||s.predicate(t))){if(e.tag=n?s.tag:"?",s.represent){if(u=e.styleMap[s.tag]||s.defaultStyle,"[object Function]"===R.call(s.represent))r=s.represent(t,u);else{if(!j.call(s.represent,u))throw new T("!<"+s.tag+'> tag resolver accepts not "'+u+'" style');r=s.represent[u](t,u)}e.dump=r}return!0}return!1}function S(e,t,n,r,i,o){e.tag=null,e.dump=n,E(e,n,!1)||E(e,n,!0);var a=R.call(e.dump);r&&(r=e.flowLevel<0||e.flowLevel>t);var s,u,l="[object Object]"===a||"[object Array]"===a;if(l&&(s=e.duplicates.indexOf(n),u=-1!==s),(null!==e.tag&&"?"!==e.tag||u||2!==e.indent&&t>0)&&(i=!1),u&&e.usedDuplicates[s])e.dump="*ref_"+s;else{if(l&&u&&!e.usedDuplicates[s]&&(e.usedDuplicates[s]=!0),"[object Object]"===a)r&&0!==Object.keys(e.dump).length?(k(e,t,e.dump,i),u&&(e.dump="&ref_"+s+e.dump)):(w(e,t,e.dump),u&&(e.dump="&ref_"+s+" "+e.dump));else if("[object Array]"===a)r&&0!==e.dump.length?(x(e,t,e.dump,i),u&&(e.dump="&ref_"+s+e.dump)):(b(e,t,e.dump),u&&(e.dump="&ref_"+s+" "+e.dump));else{if("[object String]"!==a){if(e.skipInvalid)return!1;throw new T("unacceptable kind of an object to dump "+a)}"?"!==e.tag&&d(e,e.dump,t,o)}null!==e.tag&&"?"!==e.tag&&(e.dump="!<"+e.tag+"> "+e.dump)}return!0}function C(e,t){var n,r,i=[],o=[];for(A(e,i,o),n=0,r=o.length;n<r;n+=1)t.duplicates.push(i[o[n]]);t.usedDuplicates=new Array(r)}function A(e,t,n){var r,i,o;if(null!==e&&"object"==typeof e)if(-1!==(i=t.indexOf(e)))-1===n.indexOf(i)&&n.push(i);else if(t.push(e),Array.isArray(e))for(i=0,o=e.length;i<o;i+=1)A(e[i],t,n);else for(r=Object.keys(e),i=0,o=r.length;i<o;i+=1)A(e[r[i]],t,n)}function D(e,t){t=t||{};var n=new o(t);return n.noRefs||C(e,n),S(n,0,e,!0,!0)?n.dump+"\n":""}function O(e,t){return D(e,M.extend({schema:I},t))}var M=n(80),T=n(117),P=n(145),I=n(118),R=Object.prototype.toString,j=Object.prototype.hasOwnProperty,F=9,N=10,B=32,L=33,q=34,z=35,U=37,W=38,V=39,H=42,G=44,J=45,K=58,X=62,Y=63,$=64,Z=91,Q=93,ee=96,te=123,ne=124,re=125,ie={};ie[0]="\\0",ie[7]="\\a",ie[8]="\\b",ie[9]="\\t",ie[10]="\\n",ie[11]="\\v",ie[12]="\\f",ie[13]="\\r",ie[27]="\\e",ie[34]='\\"',ie[92]="\\\\",ie[133]="\\N",ie[160]="\\_",ie[8232]="\\L",ie[8233]="\\P";var oe=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"],ae=1,se=2,ue=3,le=4,ce=5;e.exports.dump=D,e.exports.safeDump=O},function(e,t,n){"use strict";function r(e){return 10===e||13===e}function i(e){return 9===e||32===e}function o(e){return 9===e||32===e||10===e||13===e}function a(e){return 44===e||91===e||93===e||123===e||125===e}function s(e){var t;return 48<=e&&e<=57?e-48:(t=32|e,97<=t&&t<=102?t-97+10:-1)}function u(e){return 120===e?2:117===e?4:85===e?8:0}function l(e){return 48<=e&&e<=57?e-48:-1}function c(e){return 48===e?"\0":97===e?"":98===e?"\b":116===e?"\t":9===e?"\t":110===e?"\n":118===e?"\v":102===e?"\f":114===e?"\r":101===e?"":32===e?" ":34===e?'"':47===e?"/":92===e?"\\":78===e?"…":95===e?" ":76===e?"\u2028":80===e?"\u2029":""}function p(e){return e<=65535?String.fromCharCode(e):String.fromCharCode(55296+(e-65536>>10),56320+(e-65536&1023))}function f(e,t){this.input=e,this.filename=t.filename||null,this.schema=t.schema||V,this.onWarning=t.onWarning||null,this.legacy=t.legacy||!1,this.json=t.json||!1,this.listener=t.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=e.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.documents=[]}function h(e,t){return new z(t,new U(e.filename,e.input,e.position,e.line,e.position-e.lineStart))}function d(e,t){throw h(e,t)}function m(e,t){e.onWarning&&e.onWarning.call(null,h(e,t))}function v(e,t,n,r){var i,o,a,s;if(t<n){if(s=e.input.slice(t,n),r)for(i=0,o=s.length;i<o;i+=1)9===(a=s.charCodeAt(i))||32<=a&&a<=1114111||d(e,"expected valid JSON character");else Q.test(s)&&d(e,"the stream contains non-printable characters");e.result+=s}}function g(e,t,n,r){var i,o,a,s;for(q.isObject(n)||d(e,"cannot merge mappings; the provided source object is unacceptable"),i=Object.keys(n),a=0,s=i.length;a<s;a+=1)o=i[a],H.call(t,o)||(t[o]=n[o],r[o]=!0)}function y(e,t,n,r,i,o,a,s){var u,l;if(i=String(i),null===t&&(t={}),"tag:yaml.org,2002:merge"===r)if(Array.isArray(o))for(u=0,l=o.length;u<l;u+=1)g(e,t,o[u],n);else g(e,t,o,n);else e.json||H.call(n,i)||!H.call(t,i)||(e.line=a||e.line,e.position=s||e.position,d(e,"duplicated mapping key")),t[i]=o,delete n[i];return t}function _(e){var t;t=e.input.charCodeAt(e.position),10===t?e.position++:13===t?(e.position++,10===e.input.charCodeAt(e.position)&&e.position++):d(e,"a line break is expected"),e.line+=1,e.lineStart=e.position}function b(e,t,n){for(var o=0,a=e.input.charCodeAt(e.position);0!==a;){for(;i(a);)a=e.input.charCodeAt(++e.position);if(t&&35===a)do{a=e.input.charCodeAt(++e.position)}while(10!==a&&13!==a&&0!==a);if(!r(a))break;for(_(e),a=e.input.charCodeAt(e.position),o++,e.lineIndent=0;32===a;)e.lineIndent++,a=e.input.charCodeAt(++e.position)}return-1!==n&&0!==o&&e.lineIndent<n&&m(e,"deficient indentation"),o}function x(e){var t,n=e.position;return!(45!==(t=e.input.charCodeAt(n))&&46!==t||t!==e.input.charCodeAt(n+1)||t!==e.input.charCodeAt(n+2)||(n+=3,0!==(t=e.input.charCodeAt(n))&&!o(t)))}function w(e,t){1===t?e.result+=" ":t>1&&(e.result+=q.repeat("\n",t-1))}function k(e,t,n){var s,u,l,c,p,f,h,d,m,g=e.kind,y=e.result;if(m=e.input.charCodeAt(e.position),o(m)||a(m)||35===m||38===m||42===m||33===m||124===m||62===m||39===m||34===m||37===m||64===m||96===m)return!1;if((63===m||45===m)&&(u=e.input.charCodeAt(e.position+1),o(u)||n&&a(u)))return!1;for(e.kind="scalar",e.result="",l=c=e.position,p=!1;0!==m;){if(58===m){if(u=e.input.charCodeAt(e.position+1),o(u)||n&&a(u))break}else if(35===m){if(s=e.input.charCodeAt(e.position-1),o(s))break}else{if(e.position===e.lineStart&&x(e)||n&&a(m))break;if(r(m)){if(f=e.line,h=e.lineStart,d=e.lineIndent,b(e,!1,-1),e.lineIndent>=t){p=!0,m=e.input.charCodeAt(e.position);continue}e.position=c,e.line=f,e.lineStart=h,e.lineIndent=d;break}}p&&(v(e,l,c,!1),w(e,e.line-f),l=c=e.position,p=!1),i(m)||(c=e.position+1),m=e.input.charCodeAt(++e.position)}return v(e,l,c,!1),!!e.result||(e.kind=g,e.result=y,!1)}function E(e,t){var n,i,o;if(39!==(n=e.input.charCodeAt(e.position)))return!1;for(e.kind="scalar",e.result="",e.position++,i=o=e.position;0!==(n=e.input.charCodeAt(e.position));)if(39===n){if(v(e,i,e.position,!0),39!==(n=e.input.charCodeAt(++e.position)))return!0;i=e.position,e.position++,o=e.position}else r(n)?(v(e,i,o,!0),w(e,b(e,!1,t)),i=o=e.position):e.position===e.lineStart&&x(e)?d(e,"unexpected end of the document within a single quoted scalar"):(e.position++,o=e.position);d(e,"unexpected end of the stream within a single quoted scalar")}function S(e,t){var n,i,o,a,l,c;if(34!==(c=e.input.charCodeAt(e.position)))return!1;for(e.kind="scalar",e.result="",e.position++,n=i=e.position;0!==(c=e.input.charCodeAt(e.position));){if(34===c)return v(e,n,e.position,!0),e.position++,!0;if(92===c){if(v(e,n,e.position,!0),c=e.input.charCodeAt(++e.position),r(c))b(e,!1,t);else if(c<256&&ie[c])e.result+=oe[c],e.position++;else if((l=u(c))>0){for(o=l,a=0;o>0;o--)c=e.input.charCodeAt(++e.position),(l=s(c))>=0?a=(a<<4)+l:d(e,"expected hexadecimal character");e.result+=p(a),e.position++}else d(e,"unknown escape sequence");n=i=e.position}else r(c)?(v(e,n,i,!0),w(e,b(e,!1,t)),n=i=e.position):e.position===e.lineStart&&x(e)?d(e,"unexpected end of the document within a double quoted scalar"):(e.position++,i=e.position)}d(e,"unexpected end of the stream within a double quoted scalar")}function C(e,t){var n,r,i,a,s,u,l,c,p,f,h,m=!0,v=e.tag,g=e.anchor,_={};if(91===(h=e.input.charCodeAt(e.position)))a=93,l=!1,r=[];else{if(123!==h)return!1;a=125,l=!0,r={}}for(null!==e.anchor&&(e.anchorMap[e.anchor]=r),h=e.input.charCodeAt(++e.position);0!==h;){if(b(e,!0,t),(h=e.input.charCodeAt(e.position))===a)return e.position++,e.tag=v,e.anchor=g,e.kind=l?"mapping":"sequence",e.result=r,!0;m||d(e,"missed comma between flow collection entries"),p=c=f=null,s=u=!1,63===h&&(i=e.input.charCodeAt(e.position+1),o(i)&&(s=u=!0,e.position++,b(e,!0,t))),n=e.line,I(e,t,G,!1,!0),p=e.tag,c=e.result,b(e,!0,t),h=e.input.charCodeAt(e.position),!u&&e.line!==n||58!==h||(s=!0,h=e.input.charCodeAt(++e.position),b(e,!0,t),I(e,t,G,!1,!0),f=e.result),l?y(e,r,_,p,c,f):s?r.push(y(e,null,_,p,c,f)):r.push(c),b(e,!0,t),h=e.input.charCodeAt(e.position),44===h?(m=!0,h=e.input.charCodeAt(++e.position)):m=!1}d(e,"unexpected end of the stream within a flow collection")}function A(e,t){var n,o,a,s,u=Y,c=!1,p=!1,f=t,h=0,m=!1;if(124===(s=e.input.charCodeAt(e.position)))o=!1;else{if(62!==s)return!1;o=!0}for(e.kind="scalar",e.result="";0!==s;)if(43===(s=e.input.charCodeAt(++e.position))||45===s)Y===u?u=43===s?Z:$:d(e,"repeat of a chomping mode identifier");else{if(!((a=l(s))>=0))break;0===a?d(e,"bad explicit indentation width of a block scalar; it cannot be less than one"):p?d(e,"repeat of an indentation width identifier"):(f=t+a-1,p=!0)}if(i(s)){do{s=e.input.charCodeAt(++e.position)}while(i(s));if(35===s)do{s=e.input.charCodeAt(++e.position)}while(!r(s)&&0!==s)}for(;0!==s;){for(_(e),e.lineIndent=0,s=e.input.charCodeAt(e.position);(!p||e.lineIndent<f)&&32===s;)e.lineIndent++,s=e.input.charCodeAt(++e.position);if(!p&&e.lineIndent>f&&(f=e.lineIndent),r(s))h++;else{if(e.lineIndent<f){u===Z?e.result+=q.repeat("\n",c?1+h:h):u===Y&&c&&(e.result+="\n");break}for(o?i(s)?(m=!0,e.result+=q.repeat("\n",c?1+h:h)):m?(m=!1,e.result+=q.repeat("\n",h+1)):0===h?c&&(e.result+=" "):e.result+=q.repeat("\n",h):e.result+=q.repeat("\n",c?1+h:h),c=!0,p=!0,h=0,n=e.position;!r(s)&&0!==s;)s=e.input.charCodeAt(++e.position);v(e,n,e.position,!1)}}return!0}function D(e,t){var n,r,i,a=e.tag,s=e.anchor,u=[],l=!1;for(null!==e.anchor&&(e.anchorMap[e.anchor]=u),i=e.input.charCodeAt(e.position);0!==i&&45===i&&(r=e.input.charCodeAt(e.position+1),o(r));)if(l=!0,e.position++,b(e,!0,-1)&&e.lineIndent<=t)u.push(null),i=e.input.charCodeAt(e.position);else if(n=e.line,I(e,t,K,!1,!0),u.push(e.result),b(e,!0,-1),i=e.input.charCodeAt(e.position),(e.line===n||e.lineIndent>t)&&0!==i)d(e,"bad indentation of a sequence entry");else if(e.lineIndent<t)break;return!!l&&(e.tag=a,e.anchor=s,e.kind="sequence",e.result=u,!0)}function O(e,t,n){var r,a,s,u,l,c=e.tag,p=e.anchor,f={},h={},m=null,v=null,g=null,_=!1,x=!1;for(null!==e.anchor&&(e.anchorMap[e.anchor]=f),l=e.input.charCodeAt(e.position);0!==l;){if(r=e.input.charCodeAt(e.position+1),s=e.line,u=e.position,63!==l&&58!==l||!o(r)){if(!I(e,n,J,!1,!0))break;if(e.line===s){for(l=e.input.charCodeAt(e.position);i(l);)l=e.input.charCodeAt(++e.position);if(58===l)l=e.input.charCodeAt(++e.position),o(l)||d(e,"a whitespace character is expected after the key-value separator within a block mapping"),_&&(y(e,f,h,m,v,null),m=v=g=null),x=!0,_=!1,a=!1,m=e.tag,v=e.result;else{if(!x)return e.tag=c,e.anchor=p,!0;d(e,"can not read an implicit mapping pair; a colon is missed")}}else{if(!x)return e.tag=c,e.anchor=p,!0;d(e,"can not read a block mapping entry; a multiline key may not be an implicit key")}}else 63===l?(_&&(y(e,f,h,m,v,null),m=v=g=null),x=!0,_=!0,a=!0):_?(_=!1,a=!0):d(e,"incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"),e.position+=1,l=r;if((e.line===s||e.lineIndent>t)&&(I(e,t,X,!0,a)&&(_?v=e.result:g=e.result),_||(y(e,f,h,m,v,g,s,u),m=v=g=null),b(e,!0,-1),l=e.input.charCodeAt(e.position)),e.lineIndent>t&&0!==l)d(e,"bad indentation of a mapping entry");else if(e.lineIndent<t)break}return _&&y(e,f,h,m,v,null),x&&(e.tag=c,e.anchor=p,e.kind="mapping",e.result=f),x}function M(e){var t,n,r,i,a=!1,s=!1;if(33!==(i=e.input.charCodeAt(e.position)))return!1;if(null!==e.tag&&d(e,"duplication of a tag property"),i=e.input.charCodeAt(++e.position),60===i?(a=!0,i=e.input.charCodeAt(++e.position)):33===i?(s=!0,n="!!",i=e.input.charCodeAt(++e.position)):n="!",t=e.position,a){do{i=e.input.charCodeAt(++e.position)}while(0!==i&&62!==i);e.position<e.length?(r=e.input.slice(t,e.position),i=e.input.charCodeAt(++e.position)):d(e,"unexpected end of the stream within a verbatim tag")}else{for(;0!==i&&!o(i);)33===i&&(s?d(e,"tag suffix cannot contain exclamation marks"):(n=e.input.slice(t-1,e.position+1),ne.test(n)||d(e,"named tag handle cannot contain such characters"),s=!0,t=e.position+1)),i=e.input.charCodeAt(++e.position);r=e.input.slice(t,e.position),te.test(r)&&d(e,"tag suffix cannot contain flow indicator characters")}return r&&!re.test(r)&&d(e,"tag name cannot contain such characters: "+r),a?e.tag=r:H.call(e.tagMap,n)?e.tag=e.tagMap[n]+r:"!"===n?e.tag="!"+r:"!!"===n?e.tag="tag:yaml.org,2002:"+r:d(e,'undeclared tag handle "'+n+'"'),!0}function T(e){var t,n;if(38!==(n=e.input.charCodeAt(e.position)))return!1;for(null!==e.anchor&&d(e,"duplication of an anchor property"),n=e.input.charCodeAt(++e.position),t=e.position;0!==n&&!o(n)&&!a(n);)n=e.input.charCodeAt(++e.position);return e.position===t&&d(e,"name of an anchor node must contain at least one character"),e.anchor=e.input.slice(t,e.position),!0}function P(e){var t,n,r;if(42!==(r=e.input.charCodeAt(e.position)))return!1;for(r=e.input.charCodeAt(++e.position),t=e.position;0!==r&&!o(r)&&!a(r);)r=e.input.charCodeAt(++e.position);return e.position===t&&d(e,"name of an alias node must contain at least one character"),n=e.input.slice(t,e.position),e.anchorMap.hasOwnProperty(n)||d(e,'unidentified alias "'+n+'"'),e.result=e.anchorMap[n],b(e,!0,-1),!0}function I(e,t,n,r,i){var o,a,s,u,l,c,p,f,h=1,m=!1,v=!1;if(null!==e.listener&&e.listener("open",e),e.tag=null,e.anchor=null,e.kind=null,e.result=null,o=a=s=X===n||K===n,r&&b(e,!0,-1)&&(m=!0,e.lineIndent>t?h=1:e.lineIndent===t?h=0:e.lineIndent<t&&(h=-1)),1===h)for(;M(e)||T(e);)b(e,!0,-1)?(m=!0,s=o,e.lineIndent>t?h=1:e.lineIndent===t?h=0:e.lineIndent<t&&(h=-1)):s=!1;if(s&&(s=m||i),1!==h&&X!==n||(p=G===n||J===n?t:t+1,f=e.position-e.lineStart,1===h?s&&(D(e,f)||O(e,f,p))||C(e,p)?v=!0:(a&&A(e,p)||E(e,p)||S(e,p)?v=!0:P(e)?(v=!0,null===e.tag&&null===e.anchor||d(e,"alias node should not have any properties")):k(e,p,G===n)&&(v=!0,null===e.tag&&(e.tag="?")),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):0===h&&(v=s&&D(e,f))),null!==e.tag&&"!"!==e.tag)if("?"===e.tag){for(u=0,l=e.implicitTypes.length;u<l;u+=1)if(c=e.implicitTypes[u],c.resolve(e.result)){e.result=c.construct(e.result),e.tag=c.tag,null!==e.anchor&&(e.anchorMap[e.anchor]=e.result);break}}else H.call(e.typeMap[e.kind||"fallback"],e.tag)?(c=e.typeMap[e.kind||"fallback"][e.tag],null!==e.result&&c.kind!==e.kind&&d(e,"unacceptable node kind for !<"+e.tag+'> tag; it should be "'+c.kind+'", not "'+e.kind+'"'),c.resolve(e.result)?(e.result=c.construct(e.result),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):d(e,"cannot resolve a node with !<"+e.tag+"> explicit tag")):d(e,"unknown tag !<"+e.tag+">");return null!==e.listener&&e.listener("close",e),null!==e.tag||null!==e.anchor||v}function R(e){var t,n,a,s,u=e.position,l=!1;for(e.version=null,e.checkLineBreaks=e.legacy,e.tagMap={},e.anchorMap={};0!==(s=e.input.charCodeAt(e.position))&&(b(e,!0,-1),s=e.input.charCodeAt(e.position),!(e.lineIndent>0||37!==s));){for(l=!0,s=e.input.charCodeAt(++e.position),t=e.position;0!==s&&!o(s);)s=e.input.charCodeAt(++e.position);for(n=e.input.slice(t,e.position),a=[],n.length<1&&d(e,"directive name must not be less than one character in length");0!==s;){for(;i(s);)s=e.input.charCodeAt(++e.position);if(35===s){do{s=e.input.charCodeAt(++e.position)}while(0!==s&&!r(s));break}if(r(s))break;for(t=e.position;0!==s&&!o(s);)s=e.input.charCodeAt(++e.position);a.push(e.input.slice(t,e.position))}0!==s&&_(e),H.call(se,n)?se[n](e,n,a):m(e,'unknown document directive "'+n+'"')}if(b(e,!0,-1),0===e.lineIndent&&45===e.input.charCodeAt(e.position)&&45===e.input.charCodeAt(e.position+1)&&45===e.input.charCodeAt(e.position+2)?(e.position+=3,b(e,!0,-1)):l&&d(e,"directives end mark is expected"),I(e,e.lineIndent-1,X,!1,!0),b(e,!0,-1),e.checkLineBreaks&&ee.test(e.input.slice(u,e.position))&&m(e,"non-ASCII line breaks are interpreted as content"),e.documents.push(e.result),e.position===e.lineStart&&x(e))return void(46===e.input.charCodeAt(e.position)&&(e.position+=3,b(e,!0,-1)));e.position<e.length-1&&d(e,"end of the stream or a document separator is expected")}function j(e,t){e=String(e),t=t||{},0!==e.length&&(10!==e.charCodeAt(e.length-1)&&13!==e.charCodeAt(e.length-1)&&(e+="\n"),65279===e.charCodeAt(0)&&(e=e.slice(1)));var n=new f(e,t);for(n.input+="\0";32===n.input.charCodeAt(n.position);)n.lineIndent+=1,n.position+=1;for(;n.position<n.length-1;)R(n);return n.documents}function F(e,t,n){var r,i,o=j(e,n);if("function"!=typeof t)return o;for(r=0,i=o.length;r<i;r+=1)t(o[r])}function N(e,t){var n=j(e,t);if(0!==n.length){if(1===n.length)return n[0];throw new z("expected a single document in the stream, but found more")}}function B(e,t,n){if("function"!=typeof t)return F(e,q.extend({schema:W},n));F(e,t,q.extend({schema:W},n))}function L(e,t){return N(e,q.extend({schema:W},t))}for(var q=n(80),z=n(117),U=n(798),W=n(118),V=n(145),H=Object.prototype.hasOwnProperty,G=1,J=2,K=3,X=4,Y=1,$=2,Z=3,Q=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,ee=/[\x85\u2028\u2029]/,te=/[,\[\]\{\}]/,ne=/^(?:!|!!|![a-z\-]+!)$/i,re=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i,ie=new Array(256),oe=new Array(256),ae=0;ae<256;ae++)ie[ae]=c(ae)?1:0,oe[ae]=c(ae);var se={YAML:function(e,t,n){var r,i,o;null!==e.version&&d(e,"duplication of %YAML directive"),1!==n.length&&d(e,"YAML directive accepts exactly one argument"),r=/^([0-9]+)\.([0-9]+)$/.exec(n[0]),null===r&&d(e,"ill-formed argument of the YAML directive"),i=parseInt(r[1],10),o=parseInt(r[2],10),1!==i&&d(e,"unacceptable YAML version of the document"),e.version=n[0],e.checkLineBreaks=o<2,1!==o&&2!==o&&m(e,"unsupported YAML version of the document")},TAG:function(e,t,n){var r,i;2!==n.length&&d(e,"TAG directive accepts exactly two arguments"),r=n[0],i=n[1],ne.test(r)||d(e,"ill-formed tag handle (first argument) of the TAG directive"),H.call(e.tagMap,r)&&d(e,'there is a previously declared suffix for "'+r+'" tag handle'),re.test(i)||d(e,"ill-formed tag prefix (second argument) of the TAG directive"),e.tagMap[r]=i}};e.exports.loadAll=F,e.exports.load=N,e.exports.safeLoadAll=B,e.exports.safeLoad=L},function(e,t,n){"use strict";function r(e,t,n,r,i){this.name=e,this.buffer=t,this.position=n,this.line=r,this.column=i}var i=n(80);r.prototype.getSnippet=function(e,t){var n,r,o,a,s;if(!this.buffer)return null;for(e=e||4,t=t||75,n="",r=this.position;r>0&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(r-1));)if(r-=1,this.position-r>t/2-1){n=" ... ",r+=5;break}for(o="",a=this.position;a<this.buffer.length&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(a));)if((a+=1)-this.position>t/2-1){o=" ... ",a-=5;break}return s=this.buffer.slice(r,a),i.repeat(" ",e)+n+s+o+"\n"+i.repeat(" ",e+this.position-r+n.length)+"^"},r.prototype.toString=function(e){var t,n="";return this.name&&(n+='in "'+this.name+'" '),n+="at line "+(this.line+1)+", column "+(this.column+1),e||(t=this.getSnippet())&&(n+=":\n"+t),n},e.exports=r},function(e,t,n){"use strict";function r(e){if(null===e)return!1;var t,n,r=0,i=e.length,o=l;for(n=0;n<i;n++)if(!((t=o.indexOf(e.charAt(n)))>64)){if(t<0)return!1;r+=6}return r%8==0}function i(e){var t,n,r=e.replace(/[\r\n=]/g,""),i=r.length,o=l,a=0,u=[];for(t=0;t<i;t++)t%4==0&&t&&(u.push(a>>16&255),u.push(a>>8&255),u.push(255&a)),a=a<<6|o.indexOf(r.charAt(t));return n=i%4*6,0===n?(u.push(a>>16&255),u.push(a>>8&255),u.push(255&a)):18===n?(u.push(a>>10&255),u.push(a>>2&255)):12===n&&u.push(a>>4&255),s?s.from?s.from(u):new s(u):u}function o(e){var t,n,r="",i=0,o=e.length,a=l;for(t=0;t<o;t++)t%3==0&&t&&(r+=a[i>>18&63],r+=a[i>>12&63],r+=a[i>>6&63],r+=a[63&i]),i=(i<<8)+e[t];return n=o%3,0===n?(r+=a[i>>18&63],r+=a[i>>12&63],r+=a[i>>6&63],r+=a[63&i]):2===n?(r+=a[i>>10&63],r+=a[i>>4&63],r+=a[i<<2&63],r+=a[64]):1===n&&(r+=a[i>>2&63],r+=a[i<<4&63],r+=a[64],r+=a[64]),r}function a(e){return s&&s.isBuffer(e)}var s;try{s=n(40).Buffer}catch(e){}var u=n(16),l="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r";e.exports=new u("tag:yaml.org,2002:binary",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o})},function(e,t,n){"use strict";function r(e){if(null===e)return!1;var t=e.length;return 4===t&&("true"===e||"True"===e||"TRUE"===e)||5===t&&("false"===e||"False"===e||"FALSE"===e)}function i(e){return"true"===e||"True"===e||"TRUE"===e}function o(e){return"[object Boolean]"===Object.prototype.toString.call(e)}var a=n(16);e.exports=new a("tag:yaml.org,2002:bool",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:{lowercase:function(e){return e?"true":"false"},uppercase:function(e){return e?"TRUE":"FALSE"},camelcase:function(e){return e?"True":"False"}},defaultStyle:"lowercase"})},function(e,t,n){"use strict";function r(e){return null!==e&&!(!l.test(e)||"_"===e[e.length-1])}function i(e){var t,n,r,i;return t=e.replace(/_/g,"").toLowerCase(),n="-"===t[0]?-1:1,i=[],"+-".indexOf(t[0])>=0&&(t=t.slice(1)),".inf"===t?1===n?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:".nan"===t?NaN:t.indexOf(":")>=0?(t.split(":").forEach(function(e){i.unshift(parseFloat(e,10))}),t=0,r=1,i.forEach(function(e){t+=e*r,r*=60}),n*t):n*parseFloat(t,10)}function o(e,t){var n;if(isNaN(e))switch(t){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===e)switch(t){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===e)switch(t){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(s.isNegativeZero(e))return"-0.0";return n=e.toString(10),c.test(n)?n.replace("e",".e"):n}function a(e){return"[object Number]"===Object.prototype.toString.call(e)&&(e%1!=0||s.isNegativeZero(e))}var s=n(80),u=n(16),l=new RegExp("^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$"),c=/^[-+]?[0-9]+e/;e.exports=new u("tag:yaml.org,2002:float",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o,defaultStyle:"lowercase"})},function(e,t,n){"use strict";function r(e){return 48<=e&&e<=57||65<=e&&e<=70||97<=e&&e<=102}function i(e){return 48<=e&&e<=55}function o(e){return 48<=e&&e<=57}function a(e){if(null===e)return!1;var t,n=e.length,a=0,s=!1;if(!n)return!1;if(t=e[a],"-"!==t&&"+"!==t||(t=e[++a]),"0"===t){if(a+1===n)return!0;if("b"===(t=e[++a])){for(a++;a<n;a++)if("_"!==(t=e[a])){if("0"!==t&&"1"!==t)return!1;s=!0}return s&&"_"!==t}if("x"===t){for(a++;a<n;a++)if("_"!==(t=e[a])){if(!r(e.charCodeAt(a)))return!1;s=!0}return s&&"_"!==t}for(;a<n;a++)if("_"!==(t=e[a])){if(!i(e.charCodeAt(a)))return!1;s=!0}return s&&"_"!==t}if("_"===t)return!1;for(;a<n;a++)if("_"!==(t=e[a])){if(":"===t)break;if(!o(e.charCodeAt(a)))return!1;s=!0}return!(!s||"_"===t)&&(":"!==t||/^(:[0-5]?[0-9])+$/.test(e.slice(a)))}function s(e){var t,n,r=e,i=1,o=[];return-1!==r.indexOf("_")&&(r=r.replace(/_/g,"")),t=r[0],"-"!==t&&"+"!==t||("-"===t&&(i=-1),r=r.slice(1),t=r[0]),"0"===r?0:"0"===t?"b"===r[1]?i*parseInt(r.slice(2),2):"x"===r[1]?i*parseInt(r,16):i*parseInt(r,8):-1!==r.indexOf(":")?(r.split(":").forEach(function(e){o.unshift(parseInt(e,10))}),r=0,n=1,o.forEach(function(e){r+=e*n,n*=60}),i*r):i*parseInt(r,10)}function u(e){return"[object Number]"===Object.prototype.toString.call(e)&&e%1==0&&!l.isNegativeZero(e)}var l=n(80),c=n(16);e.exports=new c("tag:yaml.org,2002:int",{kind:"scalar",resolve:a,construct:s,predicate:u,represent:{binary:function(e){return"0b"+e.toString(2)},octal:function(e){return"0"+e.toString(8)},decimal:function(e){return e.toString(10)},hexadecimal:function(e){return"0x"+e.toString(16).toUpperCase()}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}})},function(e,t,n){"use strict";function r(e){if(null===e)return!1;try{var t="("+e+")",n=s.parse(t,{range:!0});return"Program"===n.type&&1===n.body.length&&"ExpressionStatement"===n.body[0].type&&"FunctionExpression"===n.body[0].expression.type}catch(e){return!1}}function i(e){var t,n="("+e+")",r=s.parse(n,{range:!0}),i=[];if("Program"!==r.type||1!==r.body.length||"ExpressionStatement"!==r.body[0].type||"FunctionExpression"!==r.body[0].expression.type)throw new Error("Failed to resolve function");return r.body[0].expression.params.forEach(function(e){i.push(e.name)}),t=r.body[0].expression.body.range,new Function(i,n.slice(t[0]+1,t[1]-1))}function o(e){return e.toString()}function a(e){return"[object Function]"===Object.prototype.toString.call(e)}var s;try{s=n(743)}catch(e){"undefined"!=typeof window&&(s=window.esprima)}var u=n(16);e.exports=new u("tag:yaml.org,2002:js/function",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o})},function(e,t,n){"use strict";function r(e){if(null===e)return!1;if(0===e.length)return!1;var t=e,n=/\/([gim]*)$/.exec(e),r="";if("/"===t[0]){if(n&&(r=n[1]),r.length>3)return!1;if("/"!==t[t.length-r.length-1])return!1}return!0}function i(e){var t=e,n=/\/([gim]*)$/.exec(e),r="";return"/"===t[0]&&(n&&(r=n[1]),t=t.slice(1,t.length-r.length-1)),new RegExp(t,r)}function o(e){var t="/"+e.source+"/";return e.global&&(t+="g"),e.multiline&&(t+="m"),e.ignoreCase&&(t+="i"),t}function a(e){return"[object RegExp]"===Object.prototype.toString.call(e)}var s=n(16);e.exports=new s("tag:yaml.org,2002:js/regexp",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o})},function(e,t,n){"use strict";function r(){return!0}function i(){}function o(){return""}function a(e){return void 0===e}var s=n(16);e.exports=new s("tag:yaml.org,2002:js/undefined",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o})},function(e,t,n){"use strict";var r=n(16);e.exports=new r("tag:yaml.org,2002:map",{kind:"mapping",construct:function(e){return null!==e?e:{}}})},function(e,t,n){"use strict";function r(e){return"<<"===e||null===e}var i=n(16);e.exports=new i("tag:yaml.org,2002:merge",{kind:"scalar",resolve:r})},function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t=e.length;return 1===t&&"~"===e||4===t&&("null"===e||"Null"===e||"NULL"===e)}function i(){return null}function o(e){return null===e}var a=n(16);e.exports=new a("tag:yaml.org,2002:null",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"}},defaultStyle:"lowercase"})},function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t,n,r,i,o,u=[],l=e;for(t=0,n=l.length;t<n;t+=1){if(r=l[t],o=!1,"[object Object]"!==s.call(r))return!1;for(i in r)if(a.call(r,i)){if(o)return!1;o=!0}if(!o)return!1;if(-1!==u.indexOf(i))return!1;u.push(i)}return!0}function i(e){return null!==e?e:[]}var o=n(16),a=Object.prototype.hasOwnProperty,s=Object.prototype.toString;e.exports=new o("tag:yaml.org,2002:omap",{kind:"sequence",resolve:r,construct:i})},function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t,n,r,i,o,s=e;for(o=new Array(s.length),t=0,n=s.length;t<n;t+=1){if(r=s[t],"[object Object]"!==a.call(r))return!1;if(i=Object.keys(r),1!==i.length)return!1;o[t]=[i[0],r[i[0]]]}return!0}function i(e){if(null===e)return[];var t,n,r,i,o,a=e;for(o=new Array(a.length),t=0,n=a.length;t<n;t+=1)r=a[t],i=Object.keys(r),o[t]=[i[0],r[i[0]]];return o}var o=n(16),a=Object.prototype.toString;e.exports=new o("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:r,construct:i})},function(e,t,n){"use strict";var r=n(16);e.exports=new r("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(e){return null!==e?e:[]}})},function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t,n=e;for(t in n)if(a.call(n,t)&&null!==n[t])return!1;return!0}function i(e){return null!==e?e:{}}var o=n(16),a=Object.prototype.hasOwnProperty;e.exports=new o("tag:yaml.org,2002:set",{kind:"mapping",resolve:r,construct:i})},function(e,t,n){"use strict";var r=n(16);e.exports=new r("tag:yaml.org,2002:str",{kind:"scalar",construct:function(e){return null!==e?e:""}})},function(e,t,n){"use strict";function r(e){return null!==e&&(null!==s.exec(e)||null!==u.exec(e))}function i(e){var t,n,r,i,o,a,l,c,p,f,h=0,d=null;if(t=s.exec(e),null===t&&(t=u.exec(e)),null===t)throw new Error("Date resolve error");if(n=+t[1],r=+t[2]-1,i=+t[3],!t[4])return new Date(Date.UTC(n,r,i));if(o=+t[4],a=+t[5],l=+t[6],t[7]){for(h=t[7].slice(0,3);h.length<3;)h+="0";h=+h}return t[9]&&(c=+t[10],p=+(t[11]||0),d=6e4*(60*c+p),"-"===t[9]&&(d=-d)),f=new Date(Date.UTC(n,r,i,o,a,l,h)),d&&f.setTime(f.getTime()-d),f}function o(e){return e.toISOString()}var a=n(16),s=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),u=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");e.exports=new a("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:r,construct:i,instanceOf:Date,represent:o})},function(e,t,n){"use strict";function r(e){return null==e?void 0===e?u:s:l&&l in Object(e)?n.i(o.a)(e):n.i(a.a)(e)}var i=n(390),o=n(818),a=n(819),s="[object Null]",u="[object Undefined]",l=i.a?i.a.toStringTag:void 0;t.a=r},function(e,t,n){"use strict";(function(e){var n="object"==typeof e&&e&&e.Object===Object&&e;t.a=n}).call(t,n(17))},function(e,t,n){"use strict";var r=n(820),i=n.i(r.a)(Object.getPrototypeOf,Object);t.a=i},function(e,t,n){"use strict";function r(e){var t=a.call(e,u),n=e[u];try{e[u]=void 0;var r=!0}catch(e){}var i=s.call(e);return r&&(t?e[u]=n:delete e[u]),i}var i=n(390),o=Object.prototype,a=o.hasOwnProperty,s=o.toString,u=i.a?i.a.toStringTag:void 0;t.a=r},function(e,t,n){"use strict";function r(e){return o.call(e)}var i=Object.prototype,o=i.toString;t.a=r},function(e,t,n){"use strict";function r(e,t){return function(n){return e(t(n))}}t.a=r},function(e,t,n){"use strict";var r=n(816),i="object"==typeof self&&self&&self.Object===Object&&self,o=r.a||i||Function("return this")();t.a=o},function(e,t,n){"use strict";function r(e){return null!=e&&"object"==typeof e}t.a=r},function(e,t){function n(e,t,n){switch(n.length){case 0:return e.call(t);case 1:return e.call(t,n[0]);case 2:return e.call(t,n[0],n[1]);case 3:return e.call(t,n[0],n[1],n[2])}return e.apply(t,n)}function r(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}function i(e,t){var n=I(e)||h(e)?r(e.length,String):[],i=n.length,o=!!i;for(var a in e)!t&&!A.call(e,a)||o&&("length"==a||l(a,i))||n.push(a);return n}function o(e,t,n){var r=e[t];A.call(e,t)&&f(r,n)&&(void 0!==n||t in e)||(e[t]=n)}function a(e){if(!p(e))return M(e);var t=[];for(var n in Object(e))A.call(e,n)&&"constructor"!=n&&t.push(n);return t}function s(e,t){return t=T(void 0===t?e.length-1:t,0),function(){for(var r=arguments,i=-1,o=T(r.length-t,0),a=Array(o);++i<o;)a[i]=r[t+i];i=-1;for(var s=Array(t+1);++i<t;)s[i]=r[i];return s[t]=a,n(e,this,s)}}function u(e,t,n,r){n||(n={});for(var i=-1,a=t.length;++i<a;){var s=t[i],u=r?r(n[s],e[s],s,n,e):void 0;o(n,s,void 0===u?e[s]:u)}return n}function l(e,t){return!!(t=null==t?x:t)&&("number"==typeof e||S.test(e))&&e>-1&&e%1==0&&e<t}function c(e,t,n){if(!y(n))return!1;var r=typeof t;return!!("number"==r?d(n)&&l(t,n.length):"string"==r&&t in n)&&f(n[t],e)}function p(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||C)}function f(e,t){return e===t||e!==e&&t!==t}function h(e){return m(e)&&A.call(e,"callee")&&(!O.call(e,"callee")||D.call(e)==w)}function d(e){return null!=e&&g(e.length)&&!v(e)}function m(e){return _(e)&&d(e)}function v(e){var t=y(e)?D.call(e):"";return t==k||t==E}function g(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=x}function y(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function _(e){return!!e&&"object"==typeof e}function b(e){return d(e)?i(e):a(e)}var x=9007199254740991,w="[object Arguments]",k="[object Function]",E="[object GeneratorFunction]",S=/^(?:0|[1-9]\d*)$/,C=Object.prototype,A=C.hasOwnProperty,D=C.toString,O=C.propertyIsEnumerable,M=function(e,t){return function(n){return e(t(n))}}(Object.keys,Object),T=Math.max,P=!O.call({valueOf:1},"valueOf"),I=Array.isArray,R=function(e){return s(function(t,n){var r=-1,i=n.length,o=i>1?n[i-1]:void 0,a=i>2?n[2]:void 0;for(o=e.length>3&&"function"==typeof o?(i--,o):void 0,a&&c(n[0],n[1],a)&&(o=i<3?void 0:o,i=1),t=Object(t);++r<i;){var s=n[r];s&&e(t,s,r,o)}return t})}(function(e,t){if(P||p(t)||d(t))return void u(t,b(t),e);for(var n in t)A.call(t,n)&&o(e,n,t[n])});e.exports=R},function(e,t,n){(function(e,n){function r(e,t){return e.set(t[0],t[1]),e}function i(e,t){return e.add(t),e}function o(e,t){for(var n=-1,r=e?e.length:0;++n<r&&!1!==t(e[n],n,e););return e}function a(e,t){for(var n=-1,r=t.length,i=e.length;++n<r;)e[i+n]=t[n];return e}function s(e,t,n,r){var i=-1,o=e?e.length:0;for(r&&o&&(n=e[++i]);++i<o;)n=t(n,e[i],i,e);return n}function u(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}function l(e,t){return null==e?void 0:e[t]}function c(e){var t=!1;if(null!=e&&"function"!=typeof e.toString)try{t=!!(e+"")}catch(e){}return t}function p(e){var t=-1,n=Array(e.size);return e.forEach(function(e,r){n[++t]=[r,e]}),n}function f(e,t){return function(n){return e(t(n))}}function h(e){var t=-1,n=Array(e.size);return e.forEach(function(e){n[++t]=e}),n}function d(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function m(){this.__data__=jt?jt(null):{}}function v(e){return this.has(e)&&delete this.__data__[e]}function g(e){var t=this.__data__;if(jt){var n=t[e];return n===Oe?void 0:n}return gt.call(t,e)?t[e]:void 0}function y(e){var t=this.__data__;return jt?void 0!==t[e]:gt.call(t,e)}function _(e,t){return this.__data__[e]=jt&&void 0===t?Oe:t,this}function b(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function x(){this.__data__=[]}function w(e){var t=this.__data__,n=q(t,e);return!(n<0)&&(n==t.length-1?t.pop():Ct.call(t,n,1),!0)}function k(e){var t=this.__data__,n=q(t,e);return n<0?void 0:t[n][1]}function E(e){return q(this.__data__,e)>-1}function S(e,t){var n=this.__data__,r=q(n,e);return r<0?n.push([e,t]):n[r][1]=t,this}function C(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function A(){this.__data__={hash:new d,map:new(Tt||b),string:new d}}function D(e){return ae(this,e).delete(e)}function O(e){return ae(this,e).get(e)}function M(e){return ae(this,e).has(e)}function T(e,t){return ae(this,e).set(e,t),this}function P(e){this.__data__=new b(e)}function I(){this.__data__=new b}function R(e){return this.__data__.delete(e)}function j(e){return this.__data__.get(e)}function F(e){return this.__data__.has(e)}function N(e,t){var n=this.__data__;if(n instanceof b){var r=n.__data__;if(!Tt||r.length<De-1)return r.push([e,t]),this;n=this.__data__=new C(r)}return n.set(e,t),this}function B(e,t){var n=Ht(e)||ye(e)?u(e.length,String):[],r=n.length,i=!!r;for(var o in e)!t&&!gt.call(e,o)||i&&("length"==o||pe(o,r))||n.push(o);return n}function L(e,t,n){var r=e[t];gt.call(e,t)&&ge(r,n)&&(void 0!==n||t in e)||(e[t]=n)}function q(e,t){for(var n=e.length;n--;)if(ge(e[n][0],t))return n;return-1}function z(e,t){return e&&re(t,Se(t),e)}function U(e,t,n,r,i,a,s){var u;if(r&&(u=a?r(e,i,a,s):r(e)),void 0!==u)return u;if(!ke(e))return e;var l=Ht(e);if(l){if(u=ue(e),!t)return ne(e,u)}else{var p=Vt(e),f=p==Re||p==je;if(Gt(e))return K(e,t);if(p==Be||p==Te||f&&!a){if(c(e))return a?e:{};if(u=le(f?{}:e),!t)return ie(e,z(u,e))}else{if(!it[p])return a?e:{};u=ce(e,p,U,t)}}s||(s=new P);var h=s.get(e);if(h)return h;if(s.set(e,u),!l)var d=n?oe(e):Se(e);return o(d||e,function(i,o){d&&(o=i,i=e[o]),L(u,o,U(i,t,n,r,o,e,s))}),u}function W(e){return ke(e)?Et(e):{}}function V(e,t,n){var r=t(e);return Ht(e)?r:a(r,n(e))}function H(e){return yt.call(e)}function G(e){return!(!ke(e)||he(e))&&(xe(e)||c(e)?_t:nt).test(me(e))}function J(e){if(!de(e))return Ot(e);var t=[];for(var n in Object(e))gt.call(e,n)&&"constructor"!=n&&t.push(n);return t}function K(e,t){if(t)return e.slice();var n=new e.constructor(e.length);return e.copy(n),n}function X(e){var t=new e.constructor(e.byteLength);return new wt(t).set(new wt(e)),t}function Y(e,t){var n=t?X(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.byteLength)}function $(e,t,n){return s(t?n(p(e),!0):p(e),r,new e.constructor)}function Z(e){var t=new e.constructor(e.source,tt.exec(e));return t.lastIndex=e.lastIndex,t}function Q(e,t,n){return s(t?n(h(e),!0):h(e),i,new e.constructor)}function ee(e){return Ut?Object(Ut.call(e)):{}}function te(e,t){var n=t?X(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.length)}function ne(e,t){var n=-1,r=e.length;for(t||(t=Array(r));++n<r;)t[n]=e[n];return t}function re(e,t,n,r){n||(n={});for(var i=-1,o=t.length;++i<o;){var a=t[i],s=r?r(n[a],e[a],a,n,e):void 0;L(n,a,void 0===s?e[a]:s)}return n}function ie(e,t){return re(e,Wt(e),t)}function oe(e){return V(e,Se,Wt)}function ae(e,t){var n=e.__data__;return fe(t)?n["string"==typeof t?"string":"hash"]:n.map}function se(e,t){var n=l(e,t);return G(n)?n:void 0}function ue(e){var t=e.length,n=e.constructor(t);return t&&"string"==typeof e[0]&&gt.call(e,"index")&&(n.index=e.index,n.input=e.input),n}function le(e){return"function"!=typeof e.constructor||de(e)?{}:W(kt(e))}function ce(e,t,n,r){var i=e.constructor;switch(t){case We:return X(e);case Pe:case Ie:return new i(+e);case Ve:return Y(e,r);case He:case Ge:case Je:case Ke:case Xe:case Ye:case $e:case Ze:case Qe:return te(e,r);case Fe:return $(e,r,n);case Ne:case ze:return new i(e);case Le:return Z(e);case qe:return Q(e,r,n);case Ue:return ee(e)}}function pe(e,t){return!!(t=null==t?Me:t)&&("number"==typeof e||rt.test(e))&&e>-1&&e%1==0&&e<t}function fe(e){var t=typeof e;return"string"==t||"number"==t||"symbol"==t||"boolean"==t?"__proto__"!==e:null===e}function he(e){return!!mt&&mt in e}function de(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||ht)}function me(e){if(null!=e){try{return vt.call(e)}catch(e){}try{return e+""}catch(e){}}return""}function ve(e){return U(e,!0,!0)}function ge(e,t){return e===t||e!==e&&t!==t}function ye(e){return be(e)&&gt.call(e,"callee")&&(!St.call(e,"callee")||yt.call(e)==Te)}function _e(e){return null!=e&&we(e.length)&&!xe(e)}function be(e){return Ee(e)&&_e(e)}function xe(e){var t=ke(e)?yt.call(e):"";return t==Re||t==je}function we(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=Me}function ke(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function Ee(e){return!!e&&"object"==typeof e}function Se(e){return _e(e)?B(e):J(e)}function Ce(){return[]}function Ae(){return!1}var De=200,Oe="__lodash_hash_undefined__",Me=9007199254740991,Te="[object Arguments]",Pe="[object Boolean]",Ie="[object Date]",Re="[object Function]",je="[object GeneratorFunction]",Fe="[object Map]",Ne="[object Number]",Be="[object Object]",Le="[object RegExp]",qe="[object Set]",ze="[object String]",Ue="[object Symbol]",We="[object ArrayBuffer]",Ve="[object DataView]",He="[object Float32Array]",Ge="[object Float64Array]",Je="[object Int8Array]",Ke="[object Int16Array]",Xe="[object Int32Array]",Ye="[object Uint8Array]",$e="[object Uint8ClampedArray]",Ze="[object Uint16Array]",Qe="[object Uint32Array]",et=/[\\^$.*+?()[\]{}|]/g,tt=/\w*$/,nt=/^\[object .+?Constructor\]$/,rt=/^(?:0|[1-9]\d*)$/,it={};it[Te]=it["[object Array]"]=it[We]=it[Ve]=it[Pe]=it[Ie]=it[He]=it[Ge]=it[Je]=it[Ke]=it[Xe]=it[Fe]=it[Ne]=it[Be]=it[Le]=it[qe]=it[ze]=it[Ue]=it[Ye]=it[$e]=it[Ze]=it[Qe]=!0,it["[object Error]"]=it[Re]=it["[object WeakMap]"]=!1;var ot="object"==typeof e&&e&&e.Object===Object&&e,at="object"==typeof self&&self&&self.Object===Object&&self,st=ot||at||Function("return this")(),ut="object"==typeof t&&t&&!t.nodeType&&t,lt=ut&&"object"==typeof n&&n&&!n.nodeType&&n,ct=lt&&lt.exports===ut,pt=Array.prototype,ft=Function.prototype,ht=Object.prototype,dt=st["__core-js_shared__"],mt=function(){var e=/[^.]+$/.exec(dt&&dt.keys&&dt.keys.IE_PROTO||"");return e?"Symbol(src)_1."+e:""}(),vt=ft.toString,gt=ht.hasOwnProperty,yt=ht.toString,_t=RegExp("^"+vt.call(gt).replace(et,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),bt=ct?st.Buffer:void 0,xt=st.Symbol,wt=st.Uint8Array,kt=f(Object.getPrototypeOf,Object),Et=Object.create,St=ht.propertyIsEnumerable,Ct=pt.splice,At=Object.getOwnPropertySymbols,Dt=bt?bt.isBuffer:void 0,Ot=f(Object.keys,Object),Mt=se(st,"DataView"),Tt=se(st,"Map"),Pt=se(st,"Promise"),It=se(st,"Set"),Rt=se(st,"WeakMap"),jt=se(Object,"create"),Ft=me(Mt),Nt=me(Tt),Bt=me(Pt),Lt=me(It),qt=me(Rt),zt=xt?xt.prototype:void 0,Ut=zt?zt.valueOf:void 0;d.prototype.clear=m,d.prototype.delete=v,d.prototype.get=g,d.prototype.has=y,d.prototype.set=_,b.prototype.clear=x,b.prototype.delete=w,b.prototype.get=k,b.prototype.has=E,b.prototype.set=S,C.prototype.clear=A,C.prototype.delete=D,C.prototype.get=O,C.prototype.has=M,C.prototype.set=T,P.prototype.clear=I,P.prototype.delete=R,P.prototype.get=j,P.prototype.has=F,P.prototype.set=N;var Wt=At?f(At,Object):Ce,Vt=H;(Mt&&Vt(new Mt(new ArrayBuffer(1)))!=Ve||Tt&&Vt(new Tt)!=Fe||Pt&&"[object Promise]"!=Vt(Pt.resolve())||It&&Vt(new It)!=qe||Rt&&"[object WeakMap]"!=Vt(new Rt))&&(Vt=function(e){var t=yt.call(e),n=t==Be?e.constructor:void 0,r=n?me(n):void 0;if(r)switch(r){case Ft:return Ve;case Nt:return Fe;case Bt:return"[object Promise]";case Lt:return qe;case qt:return"[object WeakMap]"}return t});var Ht=Array.isArray,Gt=Dt||Ae;n.exports=ve}).call(t,n(17),n(72)(e))},function(e,t,n){(function(t){function n(e){if("string"==typeof e)return e;if(i(e))return y?y.call(e):"";var t=e+"";return"0"==t&&1/e==-s?"-0":t}function r(e){return!!e&&"object"==typeof e}function i(e){return"symbol"==typeof e||r(e)&&m.call(e)==u}function o(e){return null==e?"":n(e)}function a(e){return e=o(e),e&&c.test(e)?e.replace(l,"\\$&"):e}var s=1/0,u="[object Symbol]",l=/[\\^$.*+?()[\]{}|]/g,c=RegExp(l.source),p="object"==typeof t&&t&&t.Object===Object&&t,f="object"==typeof self&&self&&self.Object===Object&&self,h=p||f||Function("return this")(),d=Object.prototype,m=d.toString,v=h.Symbol,g=v?v.prototype:void 0,y=g?g.toString:void 0;e.exports=a}).call(t,n(17))},function(e,t){function n(e){var t=!1;if(null!=e&&"function"!=typeof e.toString)try{t=!!(e+"")}catch(e){}return t}function r(e){return!!e&&"object"==typeof e}function i(e){if(!r(e)||p.call(e)!=o||n(e))return!1;var t=f(e);if(null===t)return!0;var i=l.call(t,"constructor")&&t.constructor;return"function"==typeof i&&i instanceof i&&u.call(i)==c}var o="[object Object]",a=Function.prototype,s=Object.prototype,u=a.toString,l=s.hasOwnProperty,c=u.call(Object),p=s.toString,f=function(e,t){return function(n){return e(t(n))}}(Object.getPrototypeOf,Object);e.exports=i},function(e,t,n){(function(e,n){function r(e,t){return e.set(t[0],t[1]),e}function i(e,t){return e.add(t),e}function o(e,t,n){switch(n.length){case 0:return e.call(t);case 1:return e.call(t,n[0]);case 2:return e.call(t,n[0],n[1]);case 3:return e.call(t,n[0],n[1],n[2])}return e.apply(t,n)}function a(e,t){for(var n=-1,r=e?e.length:0;++n<r&&!1!==t(e[n],n,e););return e}function s(e,t){for(var n=-1,r=t.length,i=e.length;++n<r;)e[i+n]=t[n];return e}function u(e,t,n,r){var i=-1,o=e?e.length:0;for(r&&o&&(n=e[++i]);++i<o;)n=t(n,e[i],i,e);return n}function l(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}function c(e,t){return null==e?void 0:e[t]}function p(e){var t=!1;if(null!=e&&"function"!=typeof e.toString)try{t=!!(e+"")}catch(e){}return t}function f(e){var t=-1,n=Array(e.size);return e.forEach(function(e,r){n[++t]=[r,e]}),n}function h(e,t){return function(n){return e(t(n))}}function d(e){var t=-1,n=Array(e.size);return e.forEach(function(e){n[++t]=e}),n}function m(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function v(){this.__data__=Qt?Qt(null):{}}function g(e){return this.has(e)&&delete this.__data__[e]}function y(e){var t=this.__data__;if(Qt){var n=t[e];return n===qe?void 0:n}return It.call(t,e)?t[e]:void 0}function _(e){var t=this.__data__;return Qt?void 0!==t[e]:It.call(t,e)}function b(e,t){return this.__data__[e]=Qt&&void 0===t?qe:t,this}function x(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function w(){this.__data__=[]}function k(e){var t=this.__data__,n=U(t,e);return!(n<0)&&(n==t.length-1?t.pop():Wt.call(t,n,1),!0)}function E(e){var t=this.__data__,n=U(t,e);return n<0?void 0:t[n][1]}function S(e){return U(this.__data__,e)>-1}function C(e,t){var n=this.__data__,r=U(n,e);return r<0?n.push([e,t]):n[r][1]=t,this}function A(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function D(){this.__data__={hash:new m,map:new(Xt||x),string:new m}}function O(e){return he(this,e).delete(e)}function M(e){return he(this,e).get(e)}function T(e){return he(this,e).has(e)}function P(e,t){return he(this,e).set(e,t),this}function I(e){this.__data__=new x(e)}function R(){this.__data__=new x}function j(e){return this.__data__.delete(e)}function F(e){return this.__data__.get(e)}function N(e){return this.__data__.has(e)}function B(e,t){var n=this.__data__;if(n instanceof x){var r=n.__data__;if(!Xt||r.length<Le-1)return r.push([e,t]),this;n=this.__data__=new A(r)}return n.set(e,t),this}function L(e,t){var n=cn(e)||Ce(e)?l(e.length,String):[],r=n.length,i=!!r;for(var o in e)!t&&!It.call(e,o)||i&&("length"==o||ye(o,r))||n.push(o);return n}function q(e,t,n){(void 0===n||Se(e[t],n))&&("number"!=typeof t||void 0!==n||t in e)||(e[t]=n)}function z(e,t,n){var r=e[t];It.call(e,t)&&Se(r,n)&&(void 0!==n||t in e)||(e[t]=n)}function U(e,t){for(var n=e.length;n--;)if(Se(e[n][0],t))return n;return-1}function W(e,t){return e&&ce(t,je(t),e)}function V(e,t,n,r,i,o,s){var u;if(r&&(u=o?r(e,i,o,s):r(e)),void 0!==u)return u;if(!Te(e))return e;var l=cn(e);if(l){if(u=me(e),!t)return le(e,u)}else{var c=ln(e),f=c==He||c==Ge;if(pn(e))return te(e,t);if(c==Xe||c==Ue||f&&!o){if(p(e))return o?e:{};if(u=ve(f?{}:e),!t)return pe(e,W(u,e))}else{if(!gt[c])return o?e:{};u=ge(e,c,V,t)}}s||(s=new I);var h=s.get(e);if(h)return h;if(s.set(e,u),!l)var d=n?fe(e):je(e);return a(d||e,function(i,o){d&&(o=i,i=e[o]),z(u,o,V(i,t,n,r,o,e,s))}),u}function H(e){return Te(e)?zt(e):{}}function G(e,t,n){var r=t(e);return cn(e)?r:s(r,n(e))}function J(e){return jt.call(e)}function K(e){return!(!Te(e)||xe(e))&&(Oe(e)||p(e)?Ft:dt).test(Ee(e))}function X(e){return Pe(e)&&Me(e.length)&&!!vt[jt.call(e)]}function Y(e){if(!we(e))return Gt(e);var t=[];for(var n in Object(e))It.call(e,n)&&"constructor"!=n&&t.push(n);return t}function $(e){if(!Te(e))return ke(e);var t=we(e),n=[];for(var r in e)("constructor"!=r||!t&&It.call(e,r))&&n.push(r);return n}function Z(e,t,n,r,i){if(e!==t){if(!cn(t)&&!fn(t))var o=$(t);a(o||t,function(a,s){if(o&&(s=a,a=t[s]),Te(a))i||(i=new I),Q(e,t,s,n,Z,r,i);else{var u=r?r(e[s],a,s+"",e,t,i):void 0;void 0===u&&(u=a),q(e,s,u)}})}}function Q(e,t,n,r,i,o,a){var s=e[n],u=t[n],l=a.get(u);if(l)return void q(e,n,l);var c=o?o(s,u,n+"",e,t,a):void 0,p=void 0===c;p&&(c=u,cn(u)||fn(u)?cn(s)?c=s:De(s)?c=le(s):(p=!1,c=V(u,!0)):Ie(u)||Ce(u)?Ce(s)?c=Re(s):!Te(s)||r&&Oe(s)?(p=!1,c=V(u,!0)):c=s:p=!1),p&&(a.set(u,c),i(c,u,r,o,a),a.delete(u)),q(e,n,c)}function ee(e,t){return t=Jt(void 0===t?e.length-1:t,0),function(){for(var n=arguments,r=-1,i=Jt(n.length-t,0),a=Array(i);++r<i;)a[r]=n[t+r];r=-1;for(var s=Array(t+1);++r<t;)s[r]=n[r];return s[t]=a,o(e,this,s)}}function te(e,t){if(t)return e.slice();var n=new e.constructor(e.length);return e.copy(n),n}function ne(e){var t=new e.constructor(e.byteLength);return new Lt(t).set(new Lt(e)),t}function re(e,t){var n=t?ne(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.byteLength)}function ie(e,t,n){return u(t?n(f(e),!0):f(e),r,new e.constructor)}function oe(e){var t=new e.constructor(e.source,ht.exec(e));return t.lastIndex=e.lastIndex,t}function ae(e,t,n){return u(t?n(d(e),!0):d(e),i,new e.constructor)}function se(e){return sn?Object(sn.call(e)):{}}function ue(e,t){var n=t?ne(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.length)}function le(e,t){var n=-1,r=e.length;for(t||(t=Array(r));++n<r;)t[n]=e[n];return t}function ce(e,t,n,r){n||(n={});for(var i=-1,o=t.length;++i<o;){var a=t[i],s=r?r(n[a],e[a],a,n,e):void 0;z(n,a,void 0===s?e[a]:s)}return n}function pe(e,t){return ce(e,un(e),t)}function fe(e){return G(e,je,un)}function he(e,t){var n=e.__data__;return be(t)?n["string"==typeof t?"string":"hash"]:n.map}function de(e,t){var n=c(e,t);return K(n)?n:void 0}function me(e){var t=e.length,n=e.constructor(t);return t&&"string"==typeof e[0]&&It.call(e,"index")&&(n.index=e.index,n.input=e.input),n}function ve(e){return"function"!=typeof e.constructor||we(e)?{}:H(qt(e))}function ge(e,t,n,r){var i=e.constructor;switch(t){case tt:return ne(e);case We:case Ve:return new i(+e);case nt:return re(e,r);case rt:case it:case ot:case at:case st:case ut:case lt:case ct:case pt:return ue(e,r);case Je:return ie(e,r,n);case Ke:case Ze:return new i(e);case Ye:return oe(e);case $e:return ae(e,r,n);case Qe:return se(e)}}function ye(e,t){return!!(t=null==t?ze:t)&&("number"==typeof e||mt.test(e))&&e>-1&&e%1==0&&e<t}function _e(e,t,n){if(!Te(n))return!1;var r=typeof t;return!!("number"==r?Ae(n)&&ye(t,n.length):"string"==r&&t in n)&&Se(n[t],e)}function be(e){var t=typeof e;return"string"==t||"number"==t||"symbol"==t||"boolean"==t?"__proto__"!==e:null===e}function xe(e){return!!Tt&&Tt in e}function we(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||Ot)}function ke(e){var t=[];if(null!=e)for(var n in Object(e))t.push(n);return t}function Ee(e){if(null!=e){try{return Pt.call(e)}catch(e){}try{return e+""}catch(e){}}return""}function Se(e,t){return e===t||e!==e&&t!==t}function Ce(e){return De(e)&&It.call(e,"callee")&&(!Ut.call(e,"callee")||jt.call(e)==Ue)}function Ae(e){return null!=e&&Me(e.length)&&!Oe(e)}function De(e){return Pe(e)&&Ae(e)}function Oe(e){var t=Te(e)?jt.call(e):"";return t==He||t==Ge}function Me(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=ze}function Te(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function Pe(e){return!!e&&"object"==typeof e}function Ie(e){if(!Pe(e)||jt.call(e)!=Xe||p(e))return!1;var t=qt(e);if(null===t)return!0;var n=It.call(t,"constructor")&&t.constructor;return"function"==typeof n&&n instanceof n&&Pt.call(n)==Rt}function Re(e){return ce(e,Fe(e))}function je(e){return Ae(e)?L(e):Y(e)}function Fe(e){return Ae(e)?L(e,!0):$(e)}function Ne(){return[]}function Be(){return!1}var Le=200,qe="__lodash_hash_undefined__",ze=9007199254740991,Ue="[object Arguments]",We="[object Boolean]",Ve="[object Date]",He="[object Function]",Ge="[object GeneratorFunction]",Je="[object Map]",Ke="[object Number]",Xe="[object Object]",Ye="[object RegExp]",$e="[object Set]",Ze="[object String]",Qe="[object Symbol]",et="[object WeakMap]",tt="[object ArrayBuffer]",nt="[object DataView]",rt="[object Float32Array]",it="[object Float64Array]",ot="[object Int8Array]",at="[object Int16Array]",st="[object Int32Array]",ut="[object Uint8Array]",lt="[object Uint8ClampedArray]",ct="[object Uint16Array]",pt="[object Uint32Array]",ft=/[\\^$.*+?()[\]{}|]/g,ht=/\w*$/,dt=/^\[object .+?Constructor\]$/,mt=/^(?:0|[1-9]\d*)$/,vt={};vt[rt]=vt[it]=vt[ot]=vt[at]=vt[st]=vt[ut]=vt[lt]=vt[ct]=vt[pt]=!0,vt[Ue]=vt["[object Array]"]=vt[tt]=vt[We]=vt[nt]=vt[Ve]=vt["[object Error]"]=vt[He]=vt[Je]=vt[Ke]=vt[Xe]=vt[Ye]=vt[$e]=vt[Ze]=vt[et]=!1;var gt={};gt[Ue]=gt["[object Array]"]=gt[tt]=gt[nt]=gt[We]=gt[Ve]=gt[rt]=gt[it]=gt[ot]=gt[at]=gt[st]=gt[Je]=gt[Ke]=gt[Xe]=gt[Ye]=gt[$e]=gt[Ze]=gt[Qe]=gt[ut]=gt[lt]=gt[ct]=gt[pt]=!0,gt["[object Error]"]=gt[He]=gt[et]=!1;var yt="object"==typeof e&&e&&e.Object===Object&&e,_t="object"==typeof self&&self&&self.Object===Object&&self,bt=yt||_t||Function("return this")(),xt="object"==typeof t&&t&&!t.nodeType&&t,wt=xt&&"object"==typeof n&&n&&!n.nodeType&&n,kt=wt&&wt.exports===xt,Et=kt&&yt.process,St=function(){try{return Et&&Et.binding("util")}catch(e){}}(),Ct=St&&St.isTypedArray,At=Array.prototype,Dt=Function.prototype,Ot=Object.prototype,Mt=bt["__core-js_shared__"],Tt=function(){var e=/[^.]+$/.exec(Mt&&Mt.keys&&Mt.keys.IE_PROTO||"");return e?"Symbol(src)_1."+e:""}(),Pt=Dt.toString,It=Ot.hasOwnProperty,Rt=Pt.call(Object),jt=Ot.toString,Ft=RegExp("^"+Pt.call(It).replace(ft,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),Nt=kt?bt.Buffer:void 0,Bt=bt.Symbol,Lt=bt.Uint8Array,qt=h(Object.getPrototypeOf,Object),zt=Object.create,Ut=Ot.propertyIsEnumerable,Wt=At.splice,Vt=Object.getOwnPropertySymbols,Ht=Nt?Nt.isBuffer:void 0,Gt=h(Object.keys,Object),Jt=Math.max,Kt=de(bt,"DataView"),Xt=de(bt,"Map"),Yt=de(bt,"Promise"),$t=de(bt,"Set"),Zt=de(bt,"WeakMap"),Qt=de(Object,"create"),en=Ee(Kt),tn=Ee(Xt),nn=Ee(Yt),rn=Ee($t),on=Ee(Zt),an=Bt?Bt.prototype:void 0,sn=an?an.valueOf:void 0;m.prototype.clear=v,m.prototype.delete=g,m.prototype.get=y,m.prototype.has=_,m.prototype.set=b,x.prototype.clear=w,x.prototype.delete=k,x.prototype.get=E,x.prototype.has=S,x.prototype.set=C,A.prototype.clear=D,A.prototype.delete=O,A.prototype.get=M,A.prototype.has=T,A.prototype.set=P,I.prototype.clear=R,I.prototype.delete=j,I.prototype.get=F,I.prototype.has=N,I.prototype.set=B;var un=Vt?h(Vt,Object):Ne,ln=J;(Kt&&ln(new Kt(new ArrayBuffer(1)))!=nt||Xt&&ln(new Xt)!=Je||Yt&&"[object Promise]"!=ln(Yt.resolve())||$t&&ln(new $t)!=$e||Zt&&ln(new Zt)!=et)&&(ln=function(e){var t=jt.call(e),n=t==Xe?e.constructor:void 0,r=n?Ee(n):void 0;if(r)switch(r){case en:return nt;case tn:return Je;case nn:return"[object Promise]";case rn:return $e;case on:return et}return t});var cn=Array.isArray,pn=Ht||Be,fn=Ct?function(e){return function(t){return e(t)}}(Ct):X,hn=function(e){return ee(function(t,n){var r=-1,i=n.length,o=i>1?n[i-1]:void 0,a=i>2?n[2]:void 0;for(o=e.length>3&&"function"==typeof o?(i--,o):void 0,a&&_e(n[0],n[1],a)&&(o=i<3?void 0:o,i=1),t=Object(t);++r<i;){var s=n[r];s&&e(t,s,r,o)}return t})}(function(e,t,n,r){Z(e,t,n,r)});n.exports=hn}).call(t,n(17),n(72)(e))},function(e,t,n){var r=n(67),i=n(43),o=r(i,"DataView");e.exports=o},function(e,t,n){function r(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}var i=n(900),o=n(901),a=n(902),s=n(903),u=n(904);r.prototype.clear=i,r.prototype.delete=o,r.prototype.get=a,r.prototype.has=s,r.prototype.set=u,e.exports=r},function(e,t,n){var r=n(67),i=n(43),o=r(i,"Promise");e.exports=o},function(e,t,n){var r=n(67),i=n(43),o=r(i,"Set");e.exports=o},function(e,t,n){function r(e){var t=-1,n=null==e?0:e.length;for(this.__data__=new i;++t<n;)this.add(e[t])}var i=n(214),o=n(927),a=n(928);r.prototype.add=r.prototype.push=o,r.prototype.has=a,e.exports=r},function(e,t,n){var r=n(67),i=n(43),o=r(i,"WeakMap");e.exports=o},function(e,t){function n(e,t){return e.set(t[0],t[1]),e}e.exports=n},function(e,t){function n(e,t){return e.add(t),e}e.exports=n},function(e,t){function n(e,t,n){switch(n.length){case 0:return e.call(t);case 1:return e.call(t,n[0]);case 2:return e.call(t,n[0],n[1]);case 3:return e.call(t,n[0],n[1],n[2])}return e.apply(t,n)}e.exports=n},function(e,t){function n(e,t){for(var n=-1,r=null==e?0:e.length;++n<r&&!1!==t(e[n],n,e););return e}e.exports=n},function(e,t){function n(e,t){for(var n=-1,r=null==e?0:e.length,i=0,o=[];++n<r;){var a=e[n];t(a,n,e)&&(o[i++]=a)}return o}e.exports=n},function(e,t){function n(e){return e.split("")}e.exports=n},function(e,t){function n(e){return e.match(r)||[]}var r=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;e.exports=n},function(e,t,n){function r(e,t){return e&&i(t,o(t),e)}var i=n(84),o=n(59);e.exports=r},function(e,t,n){function r(e,t){return e&&i(t,o(t),e)}var i=n(84),o=n(424);e.exports=r},function(e,t){function n(e,t,n){return e===e&&(void 0!==n&&(e=e<=n?e:n),void 0!==t&&(e=e>=t?e:t)),e}e.exports=n},function(e,t,n){var r=n(38),i=Object.create,o=function(){function e(){}return function(t){if(!r(t))return{};if(i)return i(t);e.prototype=t;var n=new e;return e.prototype=void 0,n}}();e.exports=o},function(e,t,n){function r(e,t){var n=[];return i(e,function(e,r,i){t(e,r,i)&&n.push(e)}),n}var i=n(217);e.exports=r},function(e,t){function n(e,t,n,r){for(var i=e.length,o=n+(r?1:-1);r?o--:++o<i;)if(t(e[o],o,e))return o;return-1}e.exports=n},function(e,t,n){function r(e,t,n,a,s){var u=-1,l=e.length;for(n||(n=o),s||(s=[]);++u<l;){var c=e[u];t>0&&n(c)?t>1?r(c,t-1,n,a,s):i(s,c):a||(s[s.length]=c)}return s}var i=n(216),o=n(908);e.exports=r},function(e,t,n){var r=n(888),i=r();e.exports=i},function(e,t,n){function r(e,t){return e&&i(e,t,o)}var i=n(848),o=n(59);e.exports=r},function(e,t){function n(e,t){return null!=e&&t in Object(e)}e.exports=n},function(e,t,n){function r(e){return o(e)&&i(e)==a}var i=n(66),o=n(68),a="[object Arguments]";e.exports=r},function(e,t,n){function r(e,t,n,r,v,y){var _=l(e),b=l(t),x=d,w=d;_||(x=u(e),x=x==h?m:x),b||(w=u(t),w=w==h?m:w);var k=x==m,E=w==m,S=x==w;if(S&&c(e)){if(!c(t))return!1;_=!0,k=!1}if(S&&!k)return y||(y=new i),_||p(e)?o(e,t,n,r,v,y):a(e,t,x,n,r,v,y);if(!(n&f)){var C=k&&g.call(e,"__wrapped__"),A=E&&g.call(t,"__wrapped__");if(C||A){var D=C?e.value():e,O=A?t.value():t;return y||(y=new i),v(D,O,n,r,y)}}return!!S&&(y||(y=new i),s(e,t,n,r,v,y))}var i=n(215),o=n(404),a=n(892),s=n(893),u=n(409),l=n(20),c=n(227),p=n(423),f=1,h="[object Arguments]",d="[object Array]",m="[object Object]",v=Object.prototype,g=v.hasOwnProperty;e.exports=r},function(e,t,n){function r(e,t,n,r){var u=n.length,l=u,c=!r;if(null==e)return!l;for(e=Object(e);u--;){var p=n[u];if(c&&p[2]?p[1]!==e[p[0]]:!(p[0]in e))return!1}for(;++u<l;){p=n[u];var f=p[0],h=e[f],d=p[1];if(c&&p[2]){if(void 0===h&&!(f in e))return!1}else{var m=new i;if(r)var v=r(h,d,f,e,t,m);if(!(void 0===v?o(d,h,a|s,r,m):v))return!1}}return!0}var i=n(215),o=n(399),a=1,s=2;e.exports=r},function(e,t,n){function r(e){return!(!a(e)||o(e))&&(i(e)?d:l).test(s(e))}var i=n(420),o=n(910),a=n(38),s=n(418),u=/[\\^$.*+?()[\]{}|]/g,l=/^\[object .+?Constructor\]$/,c=Function.prototype,p=Object.prototype,f=c.toString,h=p.hasOwnProperty,d=RegExp("^"+f.call(h).replace(u,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");e.exports=r},function(e,t,n){function r(e){return a(e)&&o(e.length)&&!!s[i(e)]}var i=n(66),o=n(228),a=n(68),s={};s["[object Float32Array]"]=s["[object Float64Array]"]=s["[object Int8Array]"]=s["[object Int16Array]"]=s["[object Int32Array]"]=s["[object Uint8Array]"]=s["[object Uint8ClampedArray]"]=s["[object Uint16Array]"]=s["[object Uint32Array]"]=!0,s["[object Arguments]"]=s["[object Array]"]=s["[object ArrayBuffer]"]=s["[object Boolean]"]=s["[object DataView]"]=s["[object Date]"]=s["[object Error]"]=s["[object Function]"]=s["[object Map]"]=s["[object Number]"]=s["[object Object]"]=s["[object RegExp]"]=s["[object Set]"]=s["[object String]"]=s["[object WeakMap]"]=!1,e.exports=r},function(e,t,n){function r(e){if(!i(e))return o(e);var t=[];for(var n in Object(e))s.call(e,n)&&"constructor"!=n&&t.push(n);return t}var i=n(153),o=n(922),a=Object.prototype,s=a.hasOwnProperty;e.exports=r},function(e,t,n){function r(e){if(!i(e))return a(e);var t=o(e),n=[];for(var r in e)("constructor"!=r||!t&&u.call(e,r))&&n.push(r);return n}var i=n(38),o=n(153),a=n(923),s=Object.prototype,u=s.hasOwnProperty;e.exports=r},function(e,t,n){function r(e){var t=o(e);return 1==t.length&&t[0][2]?a(t[0][0],t[0][1]):function(n){return n===e||i(n,e,t)}}var i=n(853),o=n(895),a=n(414);e.exports=r},function(e,t,n){function r(e,t){return s(e)&&u(t)?l(c(e),t):function(n){var r=o(n,e);return void 0===r&&r===t?a(n,e):i(t,r,p|f)}}var i=n(399),o=n(224),a=n(419),s=n(221),u=n(412),l=n(414),c=n(85),p=1,f=2;e.exports=r},function(e,t,n){function r(e,t){return e=Object(e),i(e,t,function(t,n){return o(e,n)})}var i=n(861),o=n(419);e.exports=r},function(e,t,n){function r(e,t,n){for(var r=-1,s=t.length,u={};++r<s;){var l=t[r],c=i(e,l);n(c,l)&&o(u,a(l,e),c)}return u}var i=n(150),o=n(867),a=n(83);e.exports=r},function(e,t){function n(e){return function(t){return null==t?void 0:t[e]}}e.exports=n},function(e,t,n){function r(e){return function(t){return i(t,e)}}var i=n(150);e.exports=r},function(e,t){function n(e){return function(t){return null==e?void 0:e[t]}}e.exports=n},function(e,t){function n(e,t,n,r,i){return i(e,function(e,i,o){n=r?(r=!1,e):t(n,e,i,o)}),n}e.exports=n},function(e,t,n){function r(e,t){return a(o(e,t,i),e+"")}var i=n(225),o=n(415),a=n(417);e.exports=r},function(e,t,n){function r(e,t,n,r){if(!s(e))return e;t=o(t,e);for(var l=-1,c=t.length,p=c-1,f=e;null!=f&&++l<c;){var h=u(t[l]),d=n;if(l!=p){var m=f[h];d=r?r(m,h,f):void 0,void 0===d&&(d=s(m)?m:a(t[l+1])?[]:{})}i(f,h,d),f=f[h]}return e}var i=n(148),o=n(83),a=n(152),s=n(38),u=n(85);e.exports=r},function(e,t,n){var r=n(943),i=n(403),o=n(225),a=i?function(e,t){return i(e,"toString",{configurable:!0,enumerable:!1,value:r(t),writable:!0})}:o;e.exports=a},function(e,t,n){function r(e,t){var n;return i(e,function(e,r,i){return!(n=t(e,r,i))}),!!n}var i=n(217);e.exports=r},function(e,t){function n(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}e.exports=n},function(e,t){function n(e){return function(t){return e(t)}}e.exports=n},function(e,t,n){function r(e,t){return t=i(t,e),null==(e=a(e,t))||delete e[s(o(t))]}var i=n(83),o=n(947),a=n(926),s=n(85);e.exports=r},function(e,t){function n(e,t){return e.has(t)}e.exports=n},function(e,t,n){function r(e,t,n){var r=e.length;return n=void 0===n?r:n,!t&&n>=r?e:i(e,t,n)}var i=n(400);e.exports=r},function(e,t,n){(function(e){function r(e,t){if(t)return e.slice();var n=e.length,r=l?l(n):new e.constructor(n);return e.copy(r),r}var i=n(43),o="object"==typeof t&&t&&!t.nodeType&&t,a=o&&"object"==typeof e&&e&&!e.nodeType&&e,s=a&&a.exports===o,u=s?i.Buffer:void 0,l=u?u.allocUnsafe:void 0;e.exports=r}).call(t,n(72)(e))},function(e,t,n){function r(e,t){var n=t?i(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.byteLength)}var i=n(218);e.exports=r},function(e,t,n){function r(e,t,n){var r=t?n(a(e),s):a(e);return o(r,i,new e.constructor)}var i=n(834),o=n(147),a=n(413),s=1;e.exports=r},function(e,t){function n(e){var t=new e.constructor(e.source,r.exec(e));return t.lastIndex=e.lastIndex,t}var r=/\w*$/;e.exports=n},function(e,t,n){function r(e,t,n){var r=t?n(a(e),s):a(e);return o(r,i,new e.constructor)}var i=n(835),o=n(147),a=n(416),s=1;e.exports=r},function(e,t,n){function r(e){return a?Object(a.call(e)):{}}var i=n(82),o=i?i.prototype:void 0,a=o?o.valueOf:void 0;e.exports=r},function(e,t,n){function r(e,t){var n=t?i(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.length)}var i=n(218);e.exports=r},function(e,t){function n(e,t){var n=-1,r=e.length;for(t||(t=Array(r));++n<r;)t[n]=e[n];return t}e.exports=n},function(e,t,n){function r(e,t){return i(e,o(e),t)}var i=n(84),o=n(220);e.exports=r},function(e,t,n){function r(e,t){return i(e,o(e),t)}var i=n(84),o=n(408);e.exports=r},function(e,t,n){var r=n(43),i=r["__core-js_shared__"];e.exports=i},function(e,t,n){function r(e){return i(function(t,n){var r=-1,i=n.length,a=i>1?n[i-1]:void 0,s=i>2?n[2]:void 0;for(a=e.length>3&&"function"==typeof a?(i--,a):void 0,s&&o(n[0],n[1],s)&&(a=i<3?void 0:a,i=1),t=Object(t);++r<i;){var u=n[r];u&&e(t,u,r,a)}return t})}var i=n(866),o=n(411);e.exports=r},function(e,t,n){function r(e,t){return function(n,r){if(null==n)return n;if(!i(n))return e(n,r);for(var o=n.length,a=t?o:-1,s=Object(n);(t?a--:++a<o)&&!1!==r(s[a],a,s););return n}}var i=n(86);e.exports=r},function(e,t){function n(e){return function(t,n,r){for(var i=-1,o=Object(t),a=r(t),s=a.length;s--;){var u=a[e?s:++i];if(!1===n(o[u],u,o))break}return t}}e.exports=n},function(e,t,n){function r(e){return function(t){t=s(t);var n=o(t)?a(t):void 0,r=n?n[0]:t.charAt(0),u=n?i(n,1).join(""):t.slice(1);return r[e]()+u}}var i=n(874),o=n(410),a=n(935),s=n(87);e.exports=r},function(e,t,n){function r(e){return function(t,n,r){var s=Object(t);if(!o(t)){var u=i(n,3);t=a(t),n=function(e){return u(s[e],e,s)}}var l=e(t,n,r);return l>-1?s[u?t[l]:l]:void 0}}var i=n(119),o=n(86),a=n(59);e.exports=r},function(e,t,n){var r=n(864),i={"À":"A","Á":"A","Â":"A","Ã":"A","Ä":"A","Å":"A","à":"a","á":"a","â":"a","ã":"a","ä":"a","å":"a","Ç":"C","ç":"c","Ð":"D","ð":"d","È":"E","É":"E","Ê":"E","Ë":"E","è":"e","é":"e","ê":"e","ë":"e","Ì":"I","Í":"I","Î":"I","Ï":"I","ì":"i","í":"i","î":"i","ï":"i","Ñ":"N","ñ":"n","Ò":"O","Ó":"O","Ô":"O","Õ":"O","Ö":"O","Ø":"O","ò":"o","ó":"o","ô":"o","õ":"o","ö":"o","ø":"o","Ù":"U","Ú":"U","Û":"U","Ü":"U","ù":"u","ú":"u","û":"u","ü":"u","Ý":"Y","ý":"y","ÿ":"y","Æ":"Ae","æ":"ae","Þ":"Th","þ":"th","ß":"ss","Ā":"A","Ă":"A","Ą":"A","ā":"a","ă":"a","ą":"a","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","ć":"c","ĉ":"c","ċ":"c","č":"c","Ď":"D","Đ":"D","ď":"d","đ":"d","Ē":"E","Ĕ":"E","Ė":"E","Ę":"E","Ě":"E","ē":"e","ĕ":"e","ė":"e","ę":"e","ě":"e","Ĝ":"G","Ğ":"G","Ġ":"G","Ģ":"G","ĝ":"g","ğ":"g","ġ":"g","ģ":"g","Ĥ":"H","Ħ":"H","ĥ":"h","ħ":"h","Ĩ":"I","Ī":"I","Ĭ":"I","Į":"I","İ":"I","ĩ":"i","ī":"i","ĭ":"i","į":"i","ı":"i","Ĵ":"J","ĵ":"j","Ķ":"K","ķ":"k","ĸ":"k","Ĺ":"L","Ļ":"L","Ľ":"L","Ŀ":"L","Ł":"L","ĺ":"l","ļ":"l","ľ":"l","ŀ":"l","ł":"l","Ń":"N","Ņ":"N","Ň":"N","Ŋ":"N","ń":"n","ņ":"n","ň":"n","ŋ":"n","Ō":"O","Ŏ":"O","Ő":"O","ō":"o","ŏ":"o","ő":"o","Ŕ":"R","Ŗ":"R","Ř":"R","ŕ":"r","ŗ":"r","ř":"r","Ś":"S","Ŝ":"S","Ş":"S","Š":"S","ś":"s","ŝ":"s","ş":"s","š":"s","Ţ":"T","Ť":"T","Ŧ":"T","ţ":"t","ť":"t","ŧ":"t","Ũ":"U","Ū":"U","Ŭ":"U","Ů":"U","Ű":"U","Ų":"U","ũ":"u","ū":"u","ŭ":"u","ů":"u","ű":"u","ų":"u","Ŵ":"W","ŵ":"w","Ŷ":"Y","ŷ":"y","Ÿ":"Y","Ź":"Z","Ż":"Z","Ž":"Z","ź":"z","ż":"z","ž":"z","IJ":"IJ","ij":"ij","Œ":"Oe","œ":"oe","ʼn":"'n","ſ":"s"},o=r(i);e.exports=o},function(e,t,n){function r(e,t,n,r,i,k,S){switch(n){case w:if(e.byteLength!=t.byteLength||e.byteOffset!=t.byteOffset)return!1;e=e.buffer,t=t.buffer;case x:return!(e.byteLength!=t.byteLength||!k(new o(e),new o(t)));case f:case h:case v:return a(+e,+t);case d:return e.name==t.name&&e.message==t.message;case g:case _:return e==t+"";case m:var C=u;case y:var A=r&c;if(C||(C=l),e.size!=t.size&&!A)return!1;var D=S.get(e);if(D)return D==t;r|=p,S.set(e,t);var O=s(C(e),C(t),r,i,k,S);return S.delete(e),O;case b:if(E)return E.call(e)==E.call(t)}return!1}var i=n(82),o=n(392),a=n(120),s=n(404),u=n(413),l=n(416),c=1,p=2,f="[object Boolean]",h="[object Date]",d="[object Error]",m="[object Map]",v="[object Number]",g="[object RegExp]",y="[object Set]",_="[object String]",b="[object Symbol]",x="[object ArrayBuffer]",w="[object DataView]",k=i?i.prototype:void 0,E=k?k.valueOf:void 0;e.exports=r},function(e,t,n){function r(e,t,n,r,a,u){var l=n&o,c=i(e),p=c.length;if(p!=i(t).length&&!l)return!1;for(var f=p;f--;){var h=c[f];if(!(l?h in t:s.call(t,h)))return!1}var d=u.get(e);if(d&&u.get(t))return d==t;var m=!0;u.set(e,t),u.set(t,e);for(var v=l;++f<p;){h=c[f];var g=e[h],y=t[h];if(r)var _=l?r(y,g,h,t,e,u):r(g,y,h,e,t,u);if(!(void 0===_?g===y||a(g,y,n,r,u):_)){m=!1;break}v||(v="constructor"==h)}if(m&&!v){var b=e.constructor,x=t.constructor;b!=x&&"constructor"in e&&"constructor"in t&&!("function"==typeof b&&b instanceof b&&"function"==typeof x&&x instanceof x)&&(m=!1)}return u.delete(e),u.delete(t),m}var i=n(59),o=1,a=Object.prototype,s=a.hasOwnProperty;e.exports=r},function(e,t,n){function r(e){return i(e,a,o)}var i=n(398),o=n(220),a=n(59);e.exports=r},function(e,t,n){function r(e){for(var t=o(e),n=t.length;n--;){var r=t[n],a=e[r];t[n]=[r,a,i(a)]}return t}var i=n(412),o=n(59);e.exports=r},function(e,t,n){function r(e){var t=a.call(e,u),n=e[u];try{e[u]=void 0;var r=!0}catch(e){}var i=s.call(e);return r&&(t?e[u]=n:delete e[u]),i}var i=n(82),o=Object.prototype,a=o.hasOwnProperty,s=o.toString,u=i?i.toStringTag:void 0;e.exports=r},function(e,t){function n(e,t){return null==e?void 0:e[t]}e.exports=n},function(e,t,n){function r(e,t,n){t=i(t,e);for(var r=-1,c=t.length,p=!1;++r<c;){var f=l(t[r]);if(!(p=null!=e&&n(e,f)))break;e=e[f]}return p||++r!=c?p:!!(c=null==e?0:e.length)&&u(c)&&s(f,c)&&(a(e)||o(e))}var i=n(83),o=n(226),a=n(20),s=n(152),u=n(228),l=n(85);e.exports=r},function(e,t){function n(e){return r.test(e)}var r=/[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;e.exports=n},function(e,t,n){function r(){this.__data__=i?i(null):{},this.size=0}var i=n(154);e.exports=r},function(e,t){function n(e){var t=this.has(e)&&delete this.__data__[e];return this.size-=t?1:0,t}e.exports=n},function(e,t,n){function r(e){var t=this.__data__;if(i){var n=t[e];return n===o?void 0:n}return s.call(t,e)?t[e]:void 0}var i=n(154),o="__lodash_hash_undefined__",a=Object.prototype,s=a.hasOwnProperty;e.exports=r},function(e,t,n){function r(e){var t=this.__data__;return i?void 0!==t[e]:a.call(t,e)}var i=n(154),o=Object.prototype,a=o.hasOwnProperty;e.exports=r},function(e,t,n){function r(e,t){var n=this.__data__;return this.size+=this.has(e)?0:1,n[e]=i&&void 0===t?o:t,this}var i=n(154),o="__lodash_hash_undefined__";e.exports=r},function(e,t){function n(e){var t=e.length,n=e.constructor(t);return t&&"string"==typeof e[0]&&i.call(e,"index")&&(n.index=e.index,n.input=e.input),n}var r=Object.prototype,i=r.hasOwnProperty;e.exports=n},function(e,t,n){function r(e,t,n,r){var M=e.constructor;switch(t){case _:return i(e);case p:case f:return new M(+e);case b:return o(e,r);case x:case w:case k:case E:case S:case C:case A:case D:case O:return c(e,r);case h:return a(e,r,n);case d:case g:return new M(e);case m:return s(e);case v:return u(e,r,n);case y:return l(e)}}var i=n(218),o=n(876),a=n(877),s=n(878),u=n(879),l=n(880),c=n(881),p="[object Boolean]",f="[object Date]",h="[object Map]",d="[object Number]",m="[object RegExp]",v="[object Set]",g="[object String]",y="[object Symbol]",_="[object ArrayBuffer]",b="[object DataView]",x="[object Float32Array]",w="[object Float64Array]",k="[object Int8Array]",E="[object Int16Array]",S="[object Int32Array]",C="[object Uint8Array]",A="[object Uint8ClampedArray]",D="[object Uint16Array]",O="[object Uint32Array]";e.exports=r},function(e,t,n){function r(e){return"function"!=typeof e.constructor||a(e)?{}:i(o(e))}var i=n(844),o=n(219),a=n(153);e.exports=r},function(e,t,n){function r(e){return a(e)||o(e)||!!(s&&e&&e[s])}var i=n(82),o=n(226),a=n(20),s=i?i.isConcatSpreadable:void 0;e.exports=r},function(e,t){function n(e){var t=typeof e;return"string"==t||"number"==t||"symbol"==t||"boolean"==t?"__proto__"!==e:null===e}e.exports=n},function(e,t,n){function r(e){return!!o&&o in e}var i=n(885),o=function(){var e=/[^.]+$/.exec(i&&i.keys&&i.keys.IE_PROTO||"");return e?"Symbol(src)_1."+e:""}();e.exports=r},function(e,t){function n(){this.__data__=[],this.size=0}e.exports=n},function(e,t,n){function r(e){var t=this.__data__,n=i(t,e);return!(n<0)&&(n==t.length-1?t.pop():a.call(t,n,1),--this.size,!0)}var i=n(149),o=Array.prototype,a=o.splice;e.exports=r},function(e,t,n){function r(e){var t=this.__data__,n=i(t,e);return n<0?void 0:t[n][1]}var i=n(149);e.exports=r},function(e,t,n){function r(e){return i(this.__data__,e)>-1}var i=n(149);e.exports=r},function(e,t,n){function r(e,t){var n=this.__data__,r=i(n,e);return r<0?(++this.size,n.push([e,t])):n[r][1]=t,this}var i=n(149);e.exports=r},function(e,t,n){function r(){this.size=0,this.__data__={hash:new i,map:new(a||o),string:new i}}var i=n(829),o=n(146),a=n(213);e.exports=r},function(e,t,n){function r(e){var t=i(this,e).delete(e);return this.size-=t?1:0,t}var i=n(151);e.exports=r},function(e,t,n){function r(e){return i(this,e).get(e)}var i=n(151);e.exports=r},function(e,t,n){function r(e){return i(this,e).has(e)}var i=n(151);e.exports=r},function(e,t,n){function r(e,t){var n=i(this,e),r=n.size;return n.set(e,t),this.size+=n.size==r?0:1,this}var i=n(151);e.exports=r},function(e,t,n){function r(e){var t=i(e,function(e){return n.size===o&&n.clear(),e}),n=t.cache;return t}var i=n(425),o=500;e.exports=r},function(e,t,n){var r=n(222),i=r(Object.keys,Object);e.exports=i},function(e,t){function n(e){var t=[];if(null!=e)for(var n in Object(e))t.push(n);return t}e.exports=n},function(e,t,n){(function(e){var r=n(406),i="object"==typeof t&&t&&!t.nodeType&&t,o=i&&"object"==typeof e&&e&&!e.nodeType&&e,a=o&&o.exports===i,s=a&&r.process,u=function(){try{return s&&s.binding&&s.binding("util")}catch(e){}}();e.exports=u}).call(t,n(72)(e))},function(e,t){function n(e){return i.call(e)}var r=Object.prototype,i=r.toString;e.exports=n},function(e,t,n){function r(e,t){return t.length<2?e:i(e,o(t,0,-1))}var i=n(150),o=n(400);e.exports=r},function(e,t){function n(e){return this.__data__.set(e,r),this}var r="__lodash_hash_undefined__";e.exports=n},function(e,t){function n(e){return this.__data__.has(e)}e.exports=n},function(e,t){function n(e){var t=0,n=0;return function(){var a=o(),s=i-(a-n);if(n=a,s>0){if(++t>=r)return arguments[0]}else t=0;return e.apply(void 0,arguments)}}var r=800,i=16,o=Date.now;e.exports=n},function(e,t,n){function r(){this.__data__=new i,this.size=0}var i=n(146);e.exports=r},function(e,t){function n(e){var t=this.__data__,n=t.delete(e);return this.size=t.size,n}e.exports=n},function(e,t){function n(e){return this.__data__.get(e)}e.exports=n},function(e,t){function n(e){return this.__data__.has(e)}e.exports=n},function(e,t,n){function r(e,t){var n=this.__data__;if(n instanceof i){var r=n.__data__;if(!o||r.length<s-1)return r.push([e,t]),this.size=++n.size,this;n=this.__data__=new a(r)}return n.set(e,t),this.size=n.size,this}var i=n(146),o=n(213),a=n(214),s=200;e.exports=r},function(e,t,n){function r(e){return o(e)?a(e):i(e)}var i=n(839),o=n(410),a=n(937);e.exports=r},function(e,t,n){var r=n(921),i=/^\./,o=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,a=/\\(\\)?/g,s=r(function(e){var t=[];return i.test(e)&&t.push(""),e.replace(o,function(e,n,r,i){t.push(r?i.replace(a,"$1"):n||e)}),t});e.exports=s},function(e,t){function n(e){return e.match(p)||[]}var r="[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]",i="\\ud83c[\\udffb-\\udfff]",o="(?:\\ud83c[\\udde6-\\uddff]){2}",a="[\\ud800-\\udbff][\\udc00-\\udfff]",s="(?:[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|\\ud83c[\\udffb-\\udfff])?",u="(?:\\u200d(?:"+["[^\\ud800-\\udfff]",o,a].join("|")+")[\\ufe0e\\ufe0f]?"+s+")*",l="[\\ufe0e\\ufe0f]?"+s+u,c="(?:"+["[^\\ud800-\\udfff]"+r+"?",r,o,a,"[\\ud800-\\udfff]"].join("|")+")",p=RegExp(i+"(?="+i+")|"+c+l,"g");e.exports=n},function(e,t){function n(e){return e.match(m)||[]}var r="\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",i="["+r+"]",o="[a-z\\xdf-\\xf6\\xf8-\\xff]",a="[^\\ud800-\\udfff"+r+"\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde]",s="(?:\\ud83c[\\udde6-\\uddff]){2}",u="[\\ud800-\\udbff][\\udc00-\\udfff]",l="[A-Z\\xc0-\\xd6\\xd8-\\xde]",c="(?:"+o+"|"+a+")",p="(?:[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|\\ud83c[\\udffb-\\udfff])?",f="(?:\\u200d(?:"+["[^\\ud800-\\udfff]",s,u].join("|")+")[\\ufe0e\\ufe0f]?"+p+")*",h="[\\ufe0e\\ufe0f]?"+p+f,d="(?:"+["[\\u2700-\\u27bf]",s,u].join("|")+")"+h,m=RegExp([l+"?"+o+"+(?:['’](?:d|ll|m|re|s|t|ve))?(?="+[i,l,"$"].join("|")+")","(?:[A-Z\\xc0-\\xd6\\xd8-\\xde]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?:['’](?:D|LL|M|RE|S|T|VE))?(?="+[i,l+c,"$"].join("|")+")",l+"?"+c+"+(?:['’](?:d|ll|m|re|s|t|ve))?",l+"+(?:['’](?:D|LL|M|RE|S|T|VE))?","\\d*(?:(?:1ST|2ND|3RD|(?![123])\\dTH)\\b)","\\d*(?:(?:1st|2nd|3rd|(?![123])\\dth)\\b)","\\d+",d].join("|"),"g");e.exports=n},function(e,t,n){var r=n(148),i=n(84),o=n(886),a=n(86),s=n(153),u=n(59),l=Object.prototype,c=l.hasOwnProperty,p=o(function(e,t){if(s(t)||a(t))return void i(t,u(t),e);for(var n in t)c.call(t,n)&&r(e,n,t[n])});e.exports=p},function(e,t,n){var r=n(941),i=n(402),o=i(function(e,t,n){return t=t.toLowerCase(),e+(n?r(t):t)});e.exports=o},function(e,t,n){function r(e){return o(i(e).toLowerCase())}var i=n(87),o=n(428);e.exports=r},function(e,t,n){function r(e){return i(e,o|a)}var i=n(397),o=1,a=4;e.exports=r},function(e,t){function n(e){return function(){return e}}e.exports=n},function(e,t,n){function r(e){return(e=o(e))&&e.replace(a,i).replace(s,"")}var i=n(891),o=n(87),a=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,s=RegExp("[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]","g");e.exports=r},function(e,t,n){function r(e,t,n){var r=null==e?0:e.length;if(!r)return-1;var u=null==n?0:a(n);return u<0&&(u=s(r+u,0)),i(e,o(t,3),u)}var i=n(846),o=n(119),a=n(427),s=Math.max;e.exports=r},function(e,t,n){function r(e){return(null==e?0:e.length)?i(e,1):[]}var i=n(847);e.exports=r},function(e,t){function n(e){var t=null==e?0:e.length;return t?e[t-1]:void 0}e.exports=n},function(e,t,n){var r=n(402),i=r(function(e,t,n){return e+(n?" ":"")+t.toLowerCase()});e.exports=i},function(e,t){function n(e){if("function"!=typeof e)throw new TypeError(r);return function(){var t=arguments;switch(t.length){case 0:return!e.call(this);case 1:return!e.call(this,t[0]);case 2:return!e.call(this,t[0],t[1]);case 3:return!e.call(this,t[0],t[1],t[2])}return!e.apply(this,t)}}var r="Expected a function";e.exports=n},function(e,t,n){var r=n(394),i=n(397),o=n(872),a=n(83),s=n(84),u=n(405),l=n(407),c=u(function(e,t){var n={};if(null==e)return n;var u=!1;t=r(t,function(t){return t=a(t,e),u||(u=t.length>1),t}),s(e,l(e),n),u&&(n=i(n,7));for(var c=t.length;c--;)o(n,t[c]);return n});e.exports=c},function(e,t,n){var r=n(860),i=n(405),o=i(function(e,t){return null==e?{}:r(e,t)});e.exports=o},function(e,t,n){function r(e){return a(e)?i(s(e)):o(e)}var i=n(862),o=n(863),a=n(221),s=n(85);e.exports=r},function(e,t,n){function r(e,t,n){var r=u(e)?i:s,l=arguments.length<3;return r(e,a(t,4),n,l,o)}var i=n(147),o=n(217),a=n(119),s=n(865),u=n(20);e.exports=r},function(e,t,n){function r(e,t){return(s(e)?i:o)(e,u(a(t,3)))}var i=n(838),o=n(845),a=n(119),s=n(20),u=n(949);e.exports=r},function(e,t,n){function r(e,t,n){var r=s(e)?i:a;return n&&u(e,t,n)&&(t=void 0),r(e,o(t,3))}var i=n(395),o=n(119),a=n(869),s=n(20),u=n(411);e.exports=r},function(e,t,n){function r(e,t,n){return e=s(e),n=i(a(n),0,e.length),t=o(t),e.slice(n,n+t.length)==t}var i=n(843),o=n(401),a=n(427),s=n(87);e.exports=r},function(e,t){function n(){return!1}e.exports=n},function(e,t,n){function r(e){if(!e)return 0===e?e:0;if((e=i(e))===o||e===-o){return(e<0?-1:1)*a}return e===e?e:0}var i=n(959),o=1/0,a=1.7976931348623157e308;e.exports=r},function(e,t,n){function r(e){if("number"==typeof e)return e;if(o(e))return a;if(i(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=i(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(s,"");var n=l.test(e);return n||c.test(e)?p(e.slice(2),n?2:8):u.test(e)?a:+e}var i=n(38),o=n(155),a=NaN,s=/^\s+|\s+$/g,u=/^[-+]0x[0-9a-f]+$/i,l=/^0b[01]+$/i,c=/^0o[0-7]+$/i,p=parseInt;e.exports=r},function(e,t,n){function r(e,t,n){return e=a(e),t=n?void 0:t,void 0===t?o(e)?s(e):i(e):e.match(t)||[]}var i=n(840),o=n(899),a=n(87),s=n(938);e.exports=r},function(e,t,n){"use strict";var r=n(65),i=Object.create,o=Object.prototype.hasOwnProperty;e.exports=function(e){var t,n=0,a=1,s=i(null),u=i(null),l=0;return e=r(e),{hit:function(r){var i=u[r],c=++l;if(s[c]=r,u[r]=c,!i){if(++n<=e)return;return r=s[a],t(r),r}if(delete s[i],a===i)for(;!o.call(s,++a);)continue},delete:t=function(e){var t=u[e];if(t&&(delete s[t],delete u[e],--n,a===t)){if(!n)return l=0,void(a=1);for(;!o.call(s,++a);)continue}},clear:function(){n=0,a=1,s=i(null),u=i(null),l=0}}}},function(e,t,n){"use strict";var r=n(207),i=n(374),o=n(375),a=n(371),s=n(229),u=Array.prototype.slice,l=Function.prototype.apply,c=Object.create,p=Object.prototype.hasOwnProperty;n(69).async=function(e,t){var n,f,h,d=c(null),m=c(null),v=t.memoized,g=t.original;t.memoized=a(function(e){var t=arguments,r=t[t.length-1];return"function"==typeof r&&(n=r,t=u.call(t,0,-1)),v.apply(f=this,h=t)},v);try{o(t.memoized,v)}catch(e){}t.on("get",function(e){var r,i,o;if(n){if(d[e])return"function"==typeof d[e]?d[e]=[d[e],n]:d[e].push(n),void(n=null);r=n,i=f,o=h,n=f=h=null,s(function(){var a;p.call(m,e)?(a=m[e],t.emit("getasync",e,o,i),l.call(r,a.context,a.args)):(n=r,f=i,h=o,v.apply(i,o))})}}),t.original=function(){var e,i,o,a;return n?(e=r(arguments),i=function e(n){var i,o,u=e.id;return null==u?void s(l.bind(e,this,arguments)):(delete e.id,i=d[u],delete d[u],i?(o=r(arguments),t.has(u)&&(n?t.delete(u):(m[u]={context:this,args:o},t.emit("setasync",u,"function"==typeof i?1:i.length))),"function"==typeof i?a=l.call(i,this,o):i.forEach(function(e){a=l.call(e,this,o)},this),a):void 0)},o=n,n=f=h=null,e.push(i),a=l.call(g,this,e),i.cb=o,n=i,a):l.call(g,this,arguments)},t.on("set",function(e){if(!n)return void t.delete(e);d[e]?"function"==typeof d[e]?d[e]=[d[e],n.cb]:d[e].push(n.cb):d[e]=n.cb,delete n.cb,n.id=e,n=null}),t.on("delete",function(e){var n;p.call(d,e)||m[e]&&(n=m[e],delete m[e],t.emit("deleteasync",e,u.call(n.args,1)))}),t.on("clear",function(){var e=m;m=c(null),t.emit("clearasync",i(e,function(e){return u.call(e.args,1)}))})}},function(e,t,n){"use strict";var r=n(58),i=n(142),o=n(69),a=Function.prototype.apply;o.dispose=function(e,t,n){var s;if(r(e),n.async&&o.async||n.promise&&o.promise)return t.on("deleteasync",s=function(t,n){a.call(e,null,n)}),void t.on("clearasync",function(e){i(e,function(e,t){s(t,e)})});t.on("delete",s=function(t,n){e(n)}),t.on("clear",function(e){i(e,function(e,t){s(t,e)})})}},function(e,t,n){"use strict";var r=n(207),i=n(142),o=n(229),a=n(386),s=n(1186),u=n(69),l=Function.prototype,c=Math.max,p=Math.min,f=Object.create;u.maxAge=function(e,t,n){var h,d,m,v;(e=s(e))&&(h=f(null),d=n.async&&u.async||n.promise&&u.promise?"async":"",t.on("set"+d,function(n){h[n]=setTimeout(function(){t.delete(n)},e),v&&(v[n]&&"nextTick"!==v[n]&&clearTimeout(v[n]),v[n]=setTimeout(function(){delete v[n]},m))}),t.on("delete"+d,function(e){clearTimeout(h[e]),delete h[e],v&&("nextTick"!==v[e]&&clearTimeout(v[e]),delete v[e])}),n.preFetch&&(m=!0===n.preFetch||isNaN(n.preFetch)?.333:c(p(Number(n.preFetch),1),0))&&(v={},m=(1-m)*e,t.on("get"+d,function(e,i,s){v[e]||(v[e]="nextTick",o(function(){var o;"nextTick"===v[e]&&(delete v[e],t.delete(e),n.async&&(i=r(i),i.push(l)),o=t.memoized.apply(s,i),n.promise&&a(o)&&("function"==typeof o.done?o.done(l,l):o.then(l,l)))}))})),t.on("clear"+d,function(){i(h,function(e){clearTimeout(e)}),h={},v&&(i(v,function(e){"nextTick"!==e&&clearTimeout(e)}),v={})}))}},function(e,t,n){"use strict";var r=n(65),i=n(961),o=n(69);o.max=function(e,t,n){var a,s,u;(e=r(e))&&(s=i(e),a=n.async&&o.async||n.promise&&o.promise?"async":"",t.on("set"+a,u=function(e){void 0!==(e=s.hit(e))&&t.delete(e)}),t.on("get"+a,u),t.on("delete"+a,s.delete),t.on("clear"+a,s.clear))}},function(e,t,n){"use strict";var r=n(374),i=n(386),o=n(229),a=Object.create,s=Object.prototype.hasOwnProperty;n(69).promise=function(e,t){var n=a(null),u=a(null),l=a(null);t.on("set",function(r,a,s){if(!i(s))return u[r]=s,void t.emit("setasync",r,1);n[r]=1,l[r]=s;var c=function(e){var i=n[r];i&&(delete n[r],u[r]=e,t.emit("setasync",r,i))},p=function(){n[r]&&(delete n[r],delete l[r],t.delete(r))};"then"!==e&&"function"==typeof s.done?"done"!==e&&"function"==typeof s.finally?(s.done(c),s.finally(p)):s.done(c,p):s.then(function(e){o(c.bind(this,e))},function(){o(p)})}),t.on("get",function(e,r,a){var s;if(n[e])return void++n[e];s=l[e];var u=function(){t.emit("getasync",e,r,a)};i(s)?"function"==typeof s.done?s.done(u):s.then(function(){o(u)}):u()}),t.on("delete",function(e){if(delete l[e],n[e])return void delete n[e];if(s.call(u,e)){var r=u[e];delete u[e],t.emit("deleteasync",e,[r])}}),t.on("clear",function(){var e=u;u=a(null),n=a(null),l=a(null),t.emit("clearasync",r(e,function(e){return[e]}))})}},function(e,t,n){"use strict";var r=n(141),i=n(69),o=Object.create,a=Object.defineProperties;i.refCounter=function(e,t,n){var s,u;s=o(null),u=n.async&&i.async||n.promise&&i.promise?"async":"",t.on("set"+u,function(e,t){s[e]=t||1}),t.on("get"+u,function(e){++s[e]}),t.on("delete"+u,function(e){delete s[e]}),t.on("clear"+u,function(){s={}}),a(t.memoized,{deleteRef:r(function(){var e=t.get(arguments);return null===e?null:s[e]?!--s[e]&&(t.delete(e),!0):null}),getRefCount:r(function(){var e=t.get(arguments);return null===e?0:s[e]?s[e]:0})})}},function(e,t,n){"use strict";var r=n(376),i=n(431),o=n(977);e.exports=function(e){var t,a=r(arguments[1]);return a.normalizer||0!==(t=a.length=i(a.length,e.length,a.async))&&(a.primitive?!1===t?a.normalizer=n(976):t>1&&(a.normalizer=n(974)(t)):a.normalizer=!1===t?n(975)():1===t?n(972)():n(973)(t)),a.async&&n(962),a.promise&&n(966),a.dispose&&n(963),a.maxAge&&n(964),a.max&&n(965),a.refCounter&&n(967),o(e,a)}},function(e,t,n){"use strict";var r=n(716),i=n(371),o=n(141),a=n(744).methods,s=n(971),u=n(970),l=Function.prototype.apply,c=Function.prototype.call,p=Object.create,f=Object.prototype.hasOwnProperty,h=Object.defineProperties,d=a.on,m=a.emit;e.exports=function(e,t,n){var a,v,g,y,_,b,x,w,k,E,S,C,A,D=p(null);return v=!1!==t?t:isNaN(e.length)?1:e.length,n.normalizer&&(w=u(n.normalizer),g=w.get,y=w.set,_=w.delete,b=w.clear),null!=n.resolvers&&(A=s(n.resolvers)),C=g?i(function(t){var n,i,o=arguments;if(A&&(o=A(o)),null!==(n=g(o))&&f.call(D,n))return k&&a.emit("get",n,o,this),D[n];if(i=1===o.length?c.call(e,this,o[0]):l.call(e,this,o),null===n){if(null!==(n=g(o)))throw r("Circular invocation","CIRCULAR_INVOCATION");n=y(o)}else if(f.call(D,n))throw r("Circular invocation","CIRCULAR_INVOCATION");return D[n]=i,E&&a.emit("set",n,null,i),i},v):0===t?function(){var t;if(f.call(D,"data"))return k&&a.emit("get","data",arguments,this),D.data;if(t=arguments.length?l.call(e,this,arguments):c.call(e,this),f.call(D,"data"))throw r("Circular invocation","CIRCULAR_INVOCATION");return D.data=t,E&&a.emit("set","data",null,t),t}:function(t){var n,i,o=arguments;if(A&&(o=A(arguments)),i=String(o[0]),f.call(D,i))return k&&a.emit("get",i,o,this),D[i];if(n=1===o.length?c.call(e,this,o[0]):l.call(e,this,o),f.call(D,i))throw r("Circular invocation","CIRCULAR_INVOCATION");return D[i]=n,E&&a.emit("set",i,null,n),n},a={original:e,memoized:C,get:function(e){return A&&(e=A(e)),g?g(e):String(e[0])},has:function(e){return f.call(D,e)},delete:function(e){var t;f.call(D,e)&&(_&&_(e),t=D[e],delete D[e],S&&a.emit("delete",e,t))},clear:function(){var e=D;b&&b(),D=p(null),a.emit("clear",e)},on:function(e,t){return"get"===e?k=!0:"set"===e?E=!0:"delete"===e&&(S=!0),d.call(this,e,t)},emit:m,updateEnv:function(){e=a.original}},x=g?i(function(e){var t,n=arguments;A&&(n=A(n)),null!==(t=g(n))&&a.delete(t)},v):0===t?function(){return a.delete("data")}:function(e){return A&&(e=A(arguments)[0]),a.delete(e)},h(C,{__memoized__:o(!0),delete:o(x),clear:o(a.clear)}),a}},function(e,t,n){"use strict";var r=n(58);e.exports=function(e){var t;return"function"==typeof e?{set:e,get:e}:(t={get:r(e.get)},void 0!==e.set?(t.set=r(e.set),t.delete=r(e.delete),t.clear=r(e.clear),t):(t.set=t.get,t))}},function(e,t,n){"use strict";var r,i=n(715),o=n(58),a=Array.prototype.slice;r=function(e){return this.map(function(t,n){return t?t(e[n]):e[n]}).concat(a.call(e,this.length))},e.exports=function(e){return e=i(e),e.forEach(function(e){null!=e&&o(e)}),r.bind(e)}},function(e,t,n){"use strict";var r=n(206);e.exports=function(){var e=0,t=[],n=[];return{get:function(e){var i=r.call(t,e[0]);return-1===i?null:n[i]},set:function(r){return t.push(r[0]),n.push(++e),e},delete:function(e){var i=r.call(n,e);-1!==i&&(t.splice(i,1),n.splice(i,1))},clear:function(){t=[],n=[]}}}},function(e,t,n){"use strict";var r=n(206),i=Object.create;e.exports=function(e){var t=0,n=[[],[]],o=i(null);return{get:function(t){for(var i,o=0,a=n;o<e-1;){if(-1===(i=r.call(a[0],t[o])))return null;a=a[1][i],++o}return i=r.call(a[0],t[o]),-1===i?null:a[1][i]||null},set:function(i){for(var a,s=0,u=n;s<e-1;)a=r.call(u[0],i[s]),-1===a&&(a=u[0].push(i[s])-1,u[1].push([[],[]])),u=u[1][a],++s;return a=r.call(u[0],i[s]),-1===a&&(a=u[0].push(i[s])-1),u[1][a]=++t,o[t]=i,t},delete:function(t){for(var i,a=0,s=n,u=[],l=o[t];a<e-1;){if(-1===(i=r.call(s[0],l[a])))return;u.push(s,i),s=s[1][i],++a}if(-1!==(i=r.call(s[0],l[a]))){for(t=s[1][i],s[0].splice(i,1),s[1].splice(i,1);!s[0].length&&u.length;)i=u.pop(),s=u.pop(),s[0].splice(i,1),s[1].splice(i,1);delete o[t]}},clear:function(){n=[[],[]],o=i(null)}}}},function(e,t,n){"use strict";e.exports=function(e){return e?function(t){for(var n=String(t[0]),r=0,i=e;--i;)n+="
"+t[++r];return n}:function(){return""}}},function(e,t,n){"use strict";var r=n(206),i=Object.create;e.exports=function(){var e=0,t=[],n=i(null);return{get:function(e){var n,i=0,o=t,a=e.length;if(0===a)return o[a]||null;if(o=o[a]){for(;i<a-1;){if(-1===(n=r.call(o[0],e[i])))return null;o=o[1][n],++i}return n=r.call(o[0],e[i]),-1===n?null:o[1][n]||null}return null},set:function(i){var o,a=0,s=t,u=i.length;if(0===u)s[u]=++e;else{for(s[u]||(s[u]=[[],[]]),s=s[u];a<u-1;)o=r.call(s[0],i[a]),-1===o&&(o=s[0].push(i[a])-1,s[1].push([[],[]])),s=s[1][o],++a;o=r.call(s[0],i[a]),-1===o&&(o=s[0].push(i[a])-1),s[1][o]=++e}return n[e]=i,e},delete:function(e){var i,o=0,a=t,s=n[e],u=s.length,l=[];if(0===u)delete a[u];else if(a=a[u]){for(;o<u-1;){if(-1===(i=r.call(a[0],s[o])))return;l.push(a,i),a=a[1][i],++o}if(-1===(i=r.call(a[0],s[o])))return;for(e=a[1][i],a[0].splice(i,1),a[1].splice(i,1);!a[0].length&&l.length;)i=l.pop(),a=l.pop(),a[0].splice(i,1),a[1].splice(i,1)}delete n[e]},clear:function(){t=[],n=i(null)}}}},function(e,t,n){"use strict";e.exports=function(e){var t,n,r=e.length;if(!r)return"";for(t=String(e[n=0]);--r;)t+="
"+e[++n];return t}},function(e,t,n){"use strict";var r=n(58),i=n(142),o=n(69),a=n(969),s=n(431),u=Object.prototype.hasOwnProperty;e.exports=function e(t){var n,l,c;if(r(t),n=Object(arguments[1]),n.async&&n.promise)throw new Error("Options 'async' and 'promise' cannot be used together");return u.call(t,"__memoized__")&&!n.force?t:(l=s(n.length,t.length,n.async&&o.async),c=a(t,l,n),i(o,function(e,t){n[t]&&e(n[t],c,n)}),e.__profiler__&&e.__profiler__(c),c.updateEnv(),c.memoized)}},function(e,t,n){"use strict";e.exports=Number.isNaN||function(e){return e!==e}},function(e,t){/*!
-- * pascalcase <https://github.com/jonschlinkert/pascalcase>
-- *
-- * Copyright (c) 2015, Jon Schlinkert.
-- * Licensed under the MIT License.
-- */
--function n(e){if("string"!=typeof e)throw new TypeError("expected a string.");return e=e.replace(/([A-Z])/g," $1"),1===e.length?e.toUpperCase():(e=e.replace(/^[\W_]+|[\W_]+$/g,"").toLowerCase(),e=e.charAt(0).toUpperCase()+e.slice(1),e.replace(/[\W_]+(\w|$)/g,function(e,t){return t.toUpperCase()}))}e.exports=n},function(e,t,n){"use strict";(function(r){function i(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var a=n(442),s=i(a),u=n(230),l=i(u),c=function(){function e(t,n,r){o(this,e),this.stringify=t,this.mapOpts=r.map||{},this.root=n,this.opts=r}return e.prototype.isMap=function(){return void 0!==this.opts.map?!!this.opts.map:this.previous().length>0},e.prototype.previous=function(){var e=this;return this.previousMaps||(this.previousMaps=[],this.root.walk(function(t){if(t.source&&t.source.input.map){var n=t.source.input.map;-1===e.previousMaps.indexOf(n)&&e.previousMaps.push(n)}})),this.previousMaps},e.prototype.isInline=function(){if(void 0!==this.mapOpts.inline)return this.mapOpts.inline;var e=this.mapOpts.annotation;return(void 0===e||!0===e)&&(!this.previous().length||this.previous().some(function(e){return e.inline}))},e.prototype.isSourcesContent=function(){return void 0!==this.mapOpts.sourcesContent?this.mapOpts.sourcesContent:!this.previous().length||this.previous().some(function(e){return e.withContent()})},e.prototype.clearAnnotation=function(){if(!1!==this.mapOpts.annotation)for(var e=void 0,t=this.root.nodes.length-1;t>=0;t--)e=this.root.nodes[t],"comment"===e.type&&0===e.text.indexOf("# sourceMappingURL=")&&this.root.removeChild(t)},e.prototype.setSourcesContent=function(){var e=this,t={};this.root.walk(function(n){if(n.source){var r=n.source.input.from;if(r&&!t[r]){t[r]=!0;var i=e.relative(r);e.map.setSourceContent(i,n.source.input.css)}}})},e.prototype.applyPrevMaps=function(){for(var e=this.previous(),t=Array.isArray(e),n=0,e=t?e:e[Symbol.iterator]();;){var r;if(t){if(n>=e.length)break;r=e[n++]}else{if(n=e.next(),n.done)break;r=n.value}var i=r,o=this.relative(i.file),a=i.root||l.default.dirname(i.file),u=void 0;!1===this.mapOpts.sourcesContent?(u=new s.default.SourceMapConsumer(i.text),u.sourcesContent&&(u.sourcesContent=u.sourcesContent.map(function(){return null}))):u=i.consumer(),this.map.applySourceMap(u,o,this.relative(a))}},e.prototype.isAnnotation=function(){return!!this.isInline()||(void 0!==this.mapOpts.annotation?this.mapOpts.annotation:!this.previous().length||this.previous().some(function(e){return e.annotation}))},e.prototype.toBase64=function(e){return r?r.from&&r.from!==Uint8Array.from?r.from(e).toString("base64"):new r(e).toString("base64"):window.btoa(unescape(encodeURIComponent(e)))},e.prototype.addAnnotation=function(){var e=void 0;e=this.isInline()?"data:application/json;base64,"+this.toBase64(this.map.toString()):"string"==typeof this.mapOpts.annotation?this.mapOpts.annotation:this.outputFile()+".map";var t="\n";-1!==this.css.indexOf("\r\n")&&(t="\r\n"),this.css+=t+"/*# sourceMappingURL="+e+" */"},e.prototype.outputFile=function(){return this.opts.to?this.relative(this.opts.to):this.opts.from?this.relative(this.opts.from):"to.css"},e.prototype.generateMap=function(){return this.generateString(),this.isSourcesContent()&&this.setSourcesContent(),this.previous().length>0&&this.applyPrevMaps(),this.isAnnotation()&&this.addAnnotation(),this.isInline()?[this.css]:[this.css,this.map]},e.prototype.relative=function(e){if(0===e.indexOf("<"))return e;if(/^\w+:\/\//.test(e))return e;var t=this.opts.to?l.default.dirname(this.opts.to):".";return"string"==typeof this.mapOpts.annotation&&(t=l.default.dirname(l.default.resolve(t,this.mapOpts.annotation))),e=l.default.relative(t,e),"\\"===l.default.sep?e.replace(/\\/g,"/"):e},e.prototype.sourcePath=function(e){return this.mapOpts.from?this.mapOpts.from:this.relative(e.source.input.from)},e.prototype.generateString=function(){var e=this;this.css="",this.map=new s.default.SourceMapGenerator({file:this.outputFile()});var t=1,n=1,r=void 0,i=void 0;this.stringify(this.root,function(o,a,s){e.css+=o,a&&"end"!==s&&(a.source&&a.source.start?e.map.addMapping({source:e.sourcePath(a),generated:{line:t,column:n-1},original:{line:a.source.start.line,column:a.source.start.column-1}}):e.map.addMapping({source:"<no source>",original:{line:1,column:0},generated:{line:t,column:n-1}})),r=o.match(/\n/g),r?(t+=r.length,i=o.lastIndexOf("\n"),n=o.length-i):n+=o.length,a&&"start"!==s&&(a.source&&a.source.end?e.map.addMapping({source:e.sourcePath(a),generated:{line:t,column:n-1},original:{line:a.source.end.line,column:a.source.end.column}}):e.map.addMapping({source:"<no source>",original:{line:1,column:0},generated:{line:t,column:n-1}}))})},e.prototype.generate=function(){if(this.clearAnnotation(),this.isMap())return this.generateMap();var e="";return this.stringify(this.root,function(t){e+=t}),[e]},e}();t.default=c,e.exports=t.default}).call(t,n(40).Buffer)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var o=n(234),a=r(o),s=n(438),u=r(s),l=n(232),c=r(l),p=n(156),f=r(p),h=n(237),d=r(h),m=n(157),v=r(m),g=function(){function e(t){i(this,e),this.input=t,this.root=new d.default,this.current=this.root,this.spaces="",this.semicolon=!1,this.createTokenizer(),this.root.source={input:t,start:{line:1,column:1}}}return e.prototype.createTokenizer=function(){this.tokenizer=(0,u.default)(this.input)},e.prototype.parse=function(){for(var e=void 0;!this.tokenizer.endOfFile();)switch(e=this.tokenizer.nextToken(),e[0]){case"space":this.spaces+=e[1];break;case";":this.freeSemicolon(e);break;case"}":this.end(e);break;case"comment":this.comment(e);break;case"at-word":this.atrule(e);break;case"{":this.emptyRule(e);break;default:this.other(e)}this.endFile()},e.prototype.comment=function(e){var t=new c.default;this.init(t,e[2],e[3]),t.source.end={line:e[4],column:e[5]};var n=e[1].slice(2,-2);if(/^\s*$/.test(n))t.text="",t.raws.left=n,t.raws.right="";else{var r=n.match(/^(\s*)([^]*[^\s])(\s*)$/);t.text=r[2],t.raws.left=r[1],t.raws.right=r[3]}},e.prototype.emptyRule=function(e){var t=new v.default;this.init(t,e[2],e[3]),t.selector="",t.raws.between="",this.current=t},e.prototype.other=function(e){for(var t=!1,n=null,r=!1,i=null,o=[],a=[],s=e;s;){if(n=s[0],a.push(s),"("===n||"["===n)i||(i=s),o.push("("===n?")":"]");else if(0===o.length){if(";"===n){if(r)return void this.decl(a);break}if("{"===n)return void this.rule(a);if("}"===n){this.tokenizer.back(a.pop()),t=!0;break}":"===n&&(r=!0)}else n===o[o.length-1]&&(o.pop(),0===o.length&&(i=null));s=this.tokenizer.nextToken()}if(this.tokenizer.endOfFile()&&(t=!0),o.length>0&&this.unclosedBracket(i),t&&r){for(;a.length&&("space"===(s=a[a.length-1][0])||"comment"===s);)this.tokenizer.back(a.pop());return void this.decl(a)}this.unknownWord(a)},e.prototype.rule=function(e){e.pop();var t=new v.default;this.init(t,e[0][2],e[0][3]),t.raws.between=this.spacesAndCommentsFromEnd(e),this.raw(t,"selector",e),this.current=t},e.prototype.decl=function(e){var t=new a.default;this.init(t);var n=e[e.length-1];for(";"===n[0]&&(this.semicolon=!0,e.pop()),n[4]?t.source.end={line:n[4],column:n[5]}:t.source.end={line:n[2],column:n[3]};"word"!==e[0][0];)1===e.length&&this.unknownWord(e),t.raws.before+=e.shift()[1];for(t.source.start={line:e[0][2],column:e[0][3]},t.prop="";e.length;){var r=e[0][0];if(":"===r||"space"===r||"comment"===r)break;t.prop+=e.shift()[1]}t.raws.between="";for(var i=void 0;e.length;){if(i=e.shift(),":"===i[0]){t.raws.between+=i[1];break}t.raws.between+=i[1]}"_"!==t.prop[0]&&"*"!==t.prop[0]||(t.raws.before+=t.prop[0],t.prop=t.prop.slice(1)),t.raws.between+=this.spacesAndCommentsFromStart(e),this.precheckMissedSemicolon(e);for(var o=e.length-1;o>0;o--){if(i=e[o],"!important"===i[1].toLowerCase()){t.important=!0;var s=this.stringFrom(e,o);s=this.spacesFromEnd(e)+s," !important"!==s&&(t.raws.important=s);break}if("important"===i[1].toLowerCase()){for(var u=e.slice(0),l="",c=o;c>0;c--){var p=u[c][0];if(0===l.trim().indexOf("!")&&"space"!==p)break;l=u.pop()[1]+l}0===l.trim().indexOf("!")&&(t.important=!0,t.raws.important=l,e=u)}if("space"!==i[0]&&"comment"!==i[0])break}this.raw(t,"value",e),-1!==t.value.indexOf(":")&&this.checkMissedSemicolon(e)},e.prototype.atrule=function(e){var t=new f.default;t.name=e[1].slice(1),""===t.name&&this.unnamedAtrule(t,e),this.init(t,e[2],e[3]);for(var n=void 0,r=void 0,i=!1,o=!1,a=[];!this.tokenizer.endOfFile();){if(e=this.tokenizer.nextToken(),";"===e[0]){t.source.end={line:e[2],column:e[3]},this.semicolon=!0;break}if("{"===e[0]){o=!0;break}if("}"===e[0]){if(a.length>0){for(r=a.length-1,n=a[r];n&&"space"===n[0];)n=a[--r];n&&(t.source.end={line:n[4],column:n[5]})}this.end(e);break}if(a.push(e),this.tokenizer.endOfFile()){i=!0;break}}t.raws.between=this.spacesAndCommentsFromEnd(a),a.length?(t.raws.afterName=this.spacesAndCommentsFromStart(a),this.raw(t,"params",a),i&&(e=a[a.length-1],t.source.end={line:e[4],column:e[5]},this.spaces=t.raws.between,t.raws.between="")):(t.raws.afterName="",t.params=""),o&&(t.nodes=[],this.current=t)},e.prototype.end=function(e){this.current.nodes&&this.current.nodes.length&&(this.current.raws.semicolon=this.semicolon),this.semicolon=!1,this.current.raws.after=(this.current.raws.after||"")+this.spaces,this.spaces="",this.current.parent?(this.current.source.end={line:e[2],column:e[3]},this.current=this.current.parent):this.unexpectedClose(e)},e.prototype.endFile=function(){this.current.parent&&this.unclosedBlock(),this.current.nodes&&this.current.nodes.length&&(this.current.raws.semicolon=this.semicolon),this.current.raws.after=(this.current.raws.after||"")+this.spaces},e.prototype.freeSemicolon=function(e){if(this.spaces+=e[1],this.current.nodes){var t=this.current.nodes[this.current.nodes.length-1];t&&"rule"===t.type&&!t.raws.ownSemicolon&&(t.raws.ownSemicolon=this.spaces,this.spaces="")}},e.prototype.init=function(e,t,n){this.current.push(e),e.source={start:{line:t,column:n},input:this.input},e.raws.before=this.spaces,this.spaces="","comment"!==e.type&&(this.semicolon=!1)},e.prototype.raw=function(e,t,n){for(var r=void 0,i=void 0,o=n.length,a="",s=!0,u=0;u<o;u+=1)r=n[u],i=r[0],"comment"===i||"space"===i&&u===o-1?s=!1:a+=r[1];if(!s){var l=n.reduce(function(e,t){return e+t[1]},"");e.raws[t]={value:a,raw:l}}e[t]=a},e.prototype.spacesAndCommentsFromEnd=function(e){for(var t=void 0,n="";e.length&&("space"===(t=e[e.length-1][0])||"comment"===t);)n=e.pop()[1]+n;return n},e.prototype.spacesAndCommentsFromStart=function(e){for(var t=void 0,n="";e.length&&("space"===(t=e[0][0])||"comment"===t);)n+=e.shift()[1];return n},e.prototype.spacesFromEnd=function(e){for(var t="";e.length&&"space"===e[e.length-1][0];)t=e.pop()[1]+t;return t},e.prototype.stringFrom=function(e,t){for(var n="",r=t;r<e.length;r++)n+=e[r][1];return e.splice(t,e.length-t),n},e.prototype.colon=function(e){for(var t=0,n=void 0,r=void 0,i=void 0,o=0;o<e.length;o++){if(n=e[o],"("===(r=n[0]))t+=1;else if(")"===r)t-=1;else if(0===t&&":"===r){if(i){if("word"===i[0]&&"progid"===i[1])continue;return o}this.doubleColon(n)}i=n}return!1},e.prototype.unclosedBracket=function(e){throw this.input.error("Unclosed bracket",e[2],e[3])},e.prototype.unknownWord=function(e){throw this.input.error("Unknown word",e[0][2],e[0][3])},e.prototype.unexpectedClose=function(e){throw this.input.error("Unexpected }",e[2],e[3])},e.prototype.unclosedBlock=function(){var e=this.current.source.start;throw this.input.error("Unclosed block",e.line,e.column)},e.prototype.doubleColon=function(e){throw this.input.error("Double colon",e[2],e[3])},e.prototype.unnamedAtrule=function(e,t){throw this.input.error("At-rule without name",t[2],t[3])},e.prototype.precheckMissedSemicolon=function(e){},e.prototype.checkMissedSemicolon=function(e){var t=this.colon(e);if(!1!==t){for(var n=0,r=void 0,i=t-1;i>=0&&(r=e[i],"space"===r[0]||2!==(n+=1));i--);throw this.input.error("Missed semicolon",r[2],r[3])}},e}();t.default=g,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];return 1===t.length&&Array.isArray(t[0])&&(t=t[0]),new u.default(t)}t.__esModule=!0;var o=n(234),a=r(o),s=n(436),u=r(s),l=n(238),c=r(l),p=n(232),f=r(p),h=n(156),d=r(h),m=n(986),v=r(m),g=n(236),y=r(g),_=n(435),b=r(_),x=n(157),w=r(x),k=n(237),E=r(k);i.plugin=function(e,t){var n=function(){var n=t.apply(void 0,arguments);return n.postcssPlugin=e,n.postcssVersion=(new u.default).version,n},r=void 0;return Object.defineProperty(n,"postcss",{get:function(){return r||(r=n()),r}}),n.process=function(e,t,r){return i([n(r)]).process(e,t)},n},i.stringify=c.default,i.parse=y.default,i.vendor=v.default,i.list=b.default,i.comment=function(e){return new f.default(e)},i.atRule=function(e){return new d.default(e)},i.decl=function(e){return new a.default(e)},i.rule=function(e){return new w.default(e)},i.root=function(e){return new E.default(e)},t.default=i,e.exports=t.default},function(e,t,n){"use strict";(function(r){function i(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e){return r?r.from&&r.from!==Uint8Array.from?r.from(e,"base64").toString():new r(e,"base64").toString():window.atob(e)}t.__esModule=!0;var s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},u=n(442),l=i(u),c=n(230),p=i(c),f=n(1210),h=i(f),d=function(){function e(t,n){o(this,e),this.loadAnnotation(t),this.inline=this.startWith(this.annotation,"data:");var r=n.map?n.map.prev:void 0,i=this.loadMap(n.from,r);i&&(this.text=i)}return e.prototype.consumer=function(){return this.consumerCache||(this.consumerCache=new l.default.SourceMapConsumer(this.text)),this.consumerCache},e.prototype.withContent=function(){return!!(this.consumer().sourcesContent&&this.consumer().sourcesContent.length>0)},e.prototype.startWith=function(e,t){return!!e&&e.substr(0,t.length)===t},e.prototype.loadAnnotation=function(e){var t=e.match(/\/\*\s*# sourceMappingURL=(.*)\s*\*\//);t&&(this.annotation=t[1].trim())},e.prototype.decodeInline=function(e){var t=/^data:application\/json;(?:charset=utf-?8;)?base64,/,n="data:application/json,";if(this.startWith(e,n))return decodeURIComponent(e.substr(n.length));if(t.test(e))return a(e.substr(RegExp.lastMatch.length));var r=e.match(/data:application\/json;([^,]+),/)[1];throw new Error("Unsupported source map encoding "+r)},e.prototype.loadMap=function(e,t){if(!1===t)return!1;if(t){if("string"==typeof t)return t;if("function"==typeof t){var n=t(e);if(n&&h.default.existsSync&&h.default.existsSync(n))return h.default.readFileSync(n,"utf-8").toString().trim();throw new Error("Unable to load previous source map: "+n.toString())}if(t instanceof l.default.SourceMapConsumer)return l.default.SourceMapGenerator.fromSourceMap(t).toString();if(t instanceof l.default.SourceMapGenerator)return t.toString();if(this.isMap(t))return JSON.stringify(t);throw new Error("Unsupported previous source map format: "+t.toString())}if(this.inline)return this.decodeInline(this.annotation);if(this.annotation){var r=this.annotation;return e&&(r=p.default.join(p.default.dirname(e),r)),this.root=p.default.dirname(r),!(!h.default.existsSync||!h.default.existsSync(r))&&h.default.readFileSync(r,"utf-8").toString().trim()}},e.prototype.isMap=function(e){return"object"===(void 0===e?"undefined":s(e))&&("string"==typeof e.mappings||"string"==typeof e._mappings)},e}();t.default=d,e.exports=t.default}).call(t,n(40).Buffer)},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var i=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),o=n(988),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s=function(){function e(t,n,i){r(this,e),this.processor=t,this.messages=[],this.root=n,this.opts=i,this.css=void 0,this.map=void 0}return e.prototype.toString=function(){return this.css},e.prototype.warn=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};t.plugin||this.lastPlugin&&this.lastPlugin.postcssPlugin&&(t.plugin=this.lastPlugin.postcssPlugin);var n=new a.default(e,t);return this.messages.push(n),n},e.prototype.warnings=function(){return this.messages.filter(function(e){return"warning"===e.type})},i(e,[{key:"content",get:function(){return this.css}}]),e}();t.default=s,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){var n=e[0],r=e[1];if("word"===n){if("."===r[0])return"class";if("#"===r[0])return"hash"}if(!t.endOfFile()){var i=t.nextToken();if(t.back(i),"brackets"===i[0]||"("===i[0])return"call"}return n}function o(e){for(var t=(0,l.default)(new p.default(e),{ignoreErrors:!0}),n="";!t.endOfFile();)!function(){var e=t.nextToken(),r=f[i(e,t)];n+=r?e[1].split(/\r?\n/).map(function(e){return r(e)}).join("\n"):e[1]}();return n}t.__esModule=!0;var a=n(503),s=r(a),u=n(438),l=r(u),c=n(433),p=r(c),f={brackets:s.default.cyan,"at-word":s.default.cyan,call:s.default.cyan,comment:s.default.gray,string:s.default.green,class:s.default.yellow,hash:s.default.magenta,"(":s.default.cyan,")":s.default.cyan,"{":s.default.yellow,"}":s.default.yellow,"[":s.default.yellow,"]":s.default.yellow,":":s.default.yellow,";":s.default.yellow};t.default=o,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var r={prefix:function(e){var t=e.match(/^(-\w+-)/);return t?t[0]:""},unprefixed:function(e){return e.replace(/^-\w+-/,"")}};t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e){i[e]||(i[e]=!0,"undefined"!=typeof console&&console.warn&&console.warn(e))}t.__esModule=!0,t.default=r;var i={};e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var i=function(){function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(r(this,e),this.type="warning",this.text=t,n.node&&n.node.source){var i=n.node.positionBy(n);this.line=i.line,this.column=i.column}for(var o in n)this[o]=n[o]}return e.prototype.toString=function(){return this.node?this.node.error(this.text,{plugin:this.plugin,index:this.index,word:this.word}).message:this.plugin?this.plugin+": "+this.text:this.text},e}();t.default=i,e.exports=t.default},function(e,t){var n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");t.encode=function(e){if(0<=e&&e<n.length)return n[e];throw new TypeError("Must be between 0 and 63: "+e)},t.decode=function(e){return 65<=e&&e<=90?e-65:97<=e&&e<=122?e-97+26:48<=e&&e<=57?e-48+52:43==e?62:47==e?63:-1}},function(e,t){function n(e,r,i,o,a,s){var u=Math.floor((r-e)/2)+e,l=a(i,o[u],!0);return 0===l?u:l>0?r-u>1?n(u,r,i,o,a,s):s==t.LEAST_UPPER_BOUND?r<o.length?r:-1:u:u-e>1?n(e,u,i,o,a,s):s==t.LEAST_UPPER_BOUND?u:e<0?-1:e}t.GREATEST_LOWER_BOUND=1,t.LEAST_UPPER_BOUND=2,t.search=function(e,r,i,o){if(0===r.length)return-1;var a=n(-1,r.length,e,r,i,o||t.GREATEST_LOWER_BOUND);if(a<0)return-1;for(;a-1>=0&&0===i(r[a],r[a-1],!0);)--a;return a}},function(e,t,n){function r(e,t){var n=e.generatedLine,r=t.generatedLine,i=e.generatedColumn,a=t.generatedColumn;return r>n||r==n&&a>=i||o.compareByGeneratedPositionsInflated(e,t)<=0}function i(){this._array=[],this._sorted=!0,this._last={generatedLine:-1,generatedColumn:0}}var o=n(121);i.prototype.unsortedForEach=function(e,t){this._array.forEach(e,t)},i.prototype.add=function(e){r(this._last,e)?(this._last=e,this._array.push(e)):(this._sorted=!1,this._array.push(e))},i.prototype.toArray=function(){return this._sorted||(this._array.sort(o.compareByGeneratedPositionsInflated),this._sorted=!0),this._array},t.MappingList=i},function(e,t){function n(e,t,n){var r=e[t];e[t]=e[n],e[n]=r}function r(e,t){return Math.round(e+Math.random()*(t-e))}function i(e,t,o,a){if(o<a){var s=r(o,a),u=o-1;n(e,s,a);for(var l=e[a],c=o;c<a;c++)t(e[c],l)<=0&&(u+=1,n(e,u,c));n(e,u+1,c);var p=u+1;i(e,t,o,p-1),i(e,t,p+1,a)}}t.quickSort=function(e,t){i(e,t,0,e.length-1)}},function(e,t,n){function r(e,t){var n=e;return"string"==typeof e&&(n=s.parseSourceMapInput(e)),null!=n.sections?new a(n,t):new i(n,t)}function i(e,t){var n=e;"string"==typeof e&&(n=s.parseSourceMapInput(e));var r=s.getArg(n,"version"),i=s.getArg(n,"sources"),o=s.getArg(n,"names",[]),a=s.getArg(n,"sourceRoot",null),u=s.getArg(n,"sourcesContent",null),c=s.getArg(n,"mappings"),p=s.getArg(n,"file",null);if(r!=this._version)throw new Error("Unsupported version: "+r);a&&(a=s.normalize(a)),i=i.map(String).map(s.normalize).map(function(e){return a&&s.isAbsolute(a)&&s.isAbsolute(e)?s.relative(a,e):e}),this._names=l.fromArray(o.map(String),!0),this._sources=l.fromArray(i,!0),this._absoluteSources=this._sources.toArray().map(function(e){return s.computeSourceURL(a,e,t)}),this.sourceRoot=a,this.sourcesContent=u,this._mappings=c,this._sourceMapURL=t,this.file=p}function o(){this.generatedLine=0,this.generatedColumn=0,this.source=null,this.originalLine=null,this.originalColumn=null,this.name=null}function a(e,t){var n=e;"string"==typeof e&&(n=s.parseSourceMapInput(e));var i=s.getArg(n,"version"),o=s.getArg(n,"sections");if(i!=this._version)throw new Error("Unsupported version: "+i);this._sources=new l,this._names=new l;var a={line:-1,column:0};this._sections=o.map(function(e){if(e.url)throw new Error("Support for url field in sections not implemented.");var n=s.getArg(e,"offset"),i=s.getArg(n,"line"),o=s.getArg(n,"column");if(i<a.line||i===a.line&&o<a.column)throw new Error("Section offsets must be ordered and non-overlapping.");return a=n,{generatedOffset:{generatedLine:i+1,generatedColumn:o+1},consumer:new r(s.getArg(e,"map"),t)}})}var s=n(121),u=n(990),l=n(439).ArraySet,c=n(440),p=n(992).quickSort;r.fromSourceMap=function(e,t){return i.fromSourceMap(e,t)},r.prototype._version=3,r.prototype.__generatedMappings=null,Object.defineProperty(r.prototype,"_generatedMappings",{configurable:!0,enumerable:!0,get:function(){return this.__generatedMappings||this._parseMappings(this._mappings,this.sourceRoot),this.__generatedMappings}}),r.prototype.__originalMappings=null,Object.defineProperty(r.prototype,"_originalMappings",{configurable:!0,enumerable:!0,get:function(){return this.__originalMappings||this._parseMappings(this._mappings,this.sourceRoot),this.__originalMappings}}),r.prototype._charIsMappingSeparator=function(e,t){var n=e.charAt(t);return";"===n||","===n},r.prototype._parseMappings=function(e,t){throw new Error("Subclasses must implement _parseMappings")},r.GENERATED_ORDER=1,r.ORIGINAL_ORDER=2,r.GREATEST_LOWER_BOUND=1,r.LEAST_UPPER_BOUND=2,r.prototype.eachMapping=function(e,t,n){var i,o=t||null,a=n||r.GENERATED_ORDER;switch(a){case r.GENERATED_ORDER:i=this._generatedMappings;break;case r.ORIGINAL_ORDER:i=this._originalMappings;break;default:throw new Error("Unknown order of iteration.")}var u=this.sourceRoot;i.map(function(e){var t=null===e.source?null:this._sources.at(e.source);return t=s.computeSourceURL(u,t,this._sourceMapURL),{source:t,generatedLine:e.generatedLine,generatedColumn:e.generatedColumn,originalLine:e.originalLine,originalColumn:e.originalColumn,name:null===e.name?null:this._names.at(e.name)}},this).forEach(e,o)},r.prototype.allGeneratedPositionsFor=function(e){var t=s.getArg(e,"line"),n={source:s.getArg(e,"source"),originalLine:t,originalColumn:s.getArg(e,"column",0)};if(n.source=this._findSourceIndex(n.source),n.source<0)return[];var r=[],i=this._findMapping(n,this._originalMappings,"originalLine","originalColumn",s.compareByOriginalPositions,u.LEAST_UPPER_BOUND);if(i>=0){var o=this._originalMappings[i];if(void 0===e.column)for(var a=o.originalLine;o&&o.originalLine===a;)r.push({line:s.getArg(o,"generatedLine",null),column:s.getArg(o,"generatedColumn",null),lastColumn:s.getArg(o,"lastGeneratedColumn",null)}),o=this._originalMappings[++i];else for(var l=o.originalColumn;o&&o.originalLine===t&&o.originalColumn==l;)r.push({line:s.getArg(o,"generatedLine",null),column:s.getArg(o,"generatedColumn",null),lastColumn:s.getArg(o,"lastGeneratedColumn",null)}),o=this._originalMappings[++i]}return r},t.SourceMapConsumer=r,i.prototype=Object.create(r.prototype),i.prototype.consumer=r,i.prototype._findSourceIndex=function(e){var t=e;if(null!=this.sourceRoot&&(t=s.relative(this.sourceRoot,t)),this._sources.has(t))return this._sources.indexOf(t);var n;for(n=0;n<this._absoluteSources.length;++n)if(this._absoluteSources[n]==e)return n;return-1},i.fromSourceMap=function(e,t){var n=Object.create(i.prototype),r=n._names=l.fromArray(e._names.toArray(),!0),a=n._sources=l.fromArray(e._sources.toArray(),!0);n.sourceRoot=e._sourceRoot,n.sourcesContent=e._generateSourcesContent(n._sources.toArray(),n.sourceRoot),n.file=e._file,n._sourceMapURL=t,n._absoluteSources=n._sources.toArray().map(function(e){return s.computeSourceURL(n.sourceRoot,e,t)});for(var u=e._mappings.toArray().slice(),c=n.__generatedMappings=[],f=n.__originalMappings=[],h=0,d=u.length;h<d;h++){var m=u[h],v=new o;v.generatedLine=m.generatedLine,v.generatedColumn=m.generatedColumn,m.source&&(v.source=a.indexOf(m.source),v.originalLine=m.originalLine,v.originalColumn=m.originalColumn,m.name&&(v.name=r.indexOf(m.name)),f.push(v)),c.push(v)}return p(n.__originalMappings,s.compareByOriginalPositions),n},i.prototype._version=3,Object.defineProperty(i.prototype,"sources",{get:function(){return this._absoluteSources.slice()}}),i.prototype._parseMappings=function(e,t){for(var n,r,i,a,u,l=1,f=0,h=0,d=0,m=0,v=0,g=e.length,y=0,_={},b={},x=[],w=[];y<g;)if(";"===e.charAt(y))l++,y++,f=0;else if(","===e.charAt(y))y++;else{for(n=new o,n.generatedLine=l,a=y;a<g&&!this._charIsMappingSeparator(e,a);a++);if(r=e.slice(y,a),i=_[r])y+=r.length;else{for(i=[];y<a;)c.decode(e,y,b),u=b.value,y=b.rest,i.push(u);if(2===i.length)throw new Error("Found a source, but no line and column");if(3===i.length)throw new Error("Found a source and line, but no column");_[r]=i}n.generatedColumn=f+i[0],f=n.generatedColumn,i.length>1&&(n.source=m+i[1],m+=i[1],n.originalLine=h+i[2],h=n.originalLine,n.originalLine+=1,n.originalColumn=d+i[3],d=n.originalColumn,i.length>4&&(n.name=v+i[4],v+=i[4])),w.push(n),"number"==typeof n.originalLine&&x.push(n)}p(w,s.compareByGeneratedPositionsDeflated),this.__generatedMappings=w,p(x,s.compareByOriginalPositions),this.__originalMappings=x},i.prototype._findMapping=function(e,t,n,r,i,o){if(e[n]<=0)throw new TypeError("Line must be greater than or equal to 1, got "+e[n]);if(e[r]<0)throw new TypeError("Column must be greater than or equal to 0, got "+e[r]);return u.search(e,t,i,o)},i.prototype.computeColumnSpans=function(){for(var e=0;e<this._generatedMappings.length;++e){var t=this._generatedMappings[e];if(e+1<this._generatedMappings.length){var n=this._generatedMappings[e+1];if(t.generatedLine===n.generatedLine){t.lastGeneratedColumn=n.generatedColumn-1;continue}}t.lastGeneratedColumn=1/0}},i.prototype.originalPositionFor=function(e){var t={generatedLine:s.getArg(e,"line"),generatedColumn:s.getArg(e,"column")},n=this._findMapping(t,this._generatedMappings,"generatedLine","generatedColumn",s.compareByGeneratedPositionsDeflated,s.getArg(e,"bias",r.GREATEST_LOWER_BOUND));if(n>=0){var i=this._generatedMappings[n];if(i.generatedLine===t.generatedLine){var o=s.getArg(i,"source",null);null!==o&&(o=this._sources.at(o),o=s.computeSourceURL(this.sourceRoot,o,this._sourceMapURL));var a=s.getArg(i,"name",null);return null!==a&&(a=this._names.at(a)),{source:o,line:s.getArg(i,"originalLine",null),column:s.getArg(i,"originalColumn",null),name:a}}}return{source:null,line:null,column:null,name:null}},i.prototype.hasContentsOfAllSources=function(){return!!this.sourcesContent&&(this.sourcesContent.length>=this._sources.size()&&!this.sourcesContent.some(function(e){return null==e}))},i.prototype.sourceContentFor=function(e,t){if(!this.sourcesContent)return null;var n=this._findSourceIndex(e);if(n>=0)return this.sourcesContent[n];var r=e;null!=this.sourceRoot&&(r=s.relative(this.sourceRoot,r));var i;if(null!=this.sourceRoot&&(i=s.urlParse(this.sourceRoot))){var o=r.replace(/^file:\/\//,"");if("file"==i.scheme&&this._sources.has(o))return this.sourcesContent[this._sources.indexOf(o)];if((!i.path||"/"==i.path)&&this._sources.has("/"+r))return this.sourcesContent[this._sources.indexOf("/"+r)]}if(t)return null;throw new Error('"'+r+'" is not in the SourceMap.')},i.prototype.generatedPositionFor=function(e){var t=s.getArg(e,"source");if((t=this._findSourceIndex(t))<0)return{line:null,column:null,lastColumn:null};var n={source:t,originalLine:s.getArg(e,"line"),originalColumn:s.getArg(e,"column")},i=this._findMapping(n,this._originalMappings,"originalLine","originalColumn",s.compareByOriginalPositions,s.getArg(e,"bias",r.GREATEST_LOWER_BOUND));if(i>=0){var o=this._originalMappings[i];if(o.source===n.source)return{line:s.getArg(o,"generatedLine",null),column:s.getArg(o,"generatedColumn",null),lastColumn:s.getArg(o,"lastGeneratedColumn",null)}}return{line:null,column:null,lastColumn:null}},t.BasicSourceMapConsumer=i,a.prototype=Object.create(r.prototype),a.prototype.constructor=r,a.prototype._version=3,Object.defineProperty(a.prototype,"sources",{get:function(){for(var e=[],t=0;t<this._sections.length;t++)for(var n=0;n<this._sections[t].consumer.sources.length;n++)e.push(this._sections[t].consumer.sources[n]);return e}}),a.prototype.originalPositionFor=function(e){var t={generatedLine:s.getArg(e,"line"),generatedColumn:s.getArg(e,"column")},n=u.search(t,this._sections,function(e,t){var n=e.generatedLine-t.generatedOffset.generatedLine;return n||e.generatedColumn-t.generatedOffset.generatedColumn}),r=this._sections[n];return r?r.consumer.originalPositionFor({line:t.generatedLine-(r.generatedOffset.generatedLine-1),column:t.generatedColumn-(r.generatedOffset.generatedLine===t.generatedLine?r.generatedOffset.generatedColumn-1:0),bias:e.bias}):{source:null,line:null,column:null,name:null}},a.prototype.hasContentsOfAllSources=function(){return this._sections.every(function(e){return e.consumer.hasContentsOfAllSources()})},a.prototype.sourceContentFor=function(e,t){for(var n=0;n<this._sections.length;n++){var r=this._sections[n],i=r.consumer.sourceContentFor(e,!0);if(i)return i}if(t)return null;throw new Error('"'+e+'" is not in the SourceMap.')},a.prototype.generatedPositionFor=function(e){for(var t=0;t<this._sections.length;t++){var n=this._sections[t];if(-1!==n.consumer._findSourceIndex(s.getArg(e,"source"))){var r=n.consumer.generatedPositionFor(e);if(r){return{line:r.line+(n.generatedOffset.generatedLine-1),column:r.column+(n.generatedOffset.generatedLine===r.line?n.generatedOffset.generatedColumn-1:0)}}}}return{line:null,column:null}},a.prototype._parseMappings=function(e,t){this.__generatedMappings=[],this.__originalMappings=[];for(var n=0;n<this._sections.length;n++)for(var r=this._sections[n],i=r.consumer._generatedMappings,o=0;o<i.length;o++){var a=i[o],u=r.consumer._sources.at(a.source);u=s.computeSourceURL(r.consumer.sourceRoot,u,this._sourceMapURL),this._sources.add(u),u=this._sources.indexOf(u);var l=null;a.name&&(l=r.consumer._names.at(a.name),this._names.add(l),l=this._names.indexOf(l));var c={source:u,generatedLine:a.generatedLine+(r.generatedOffset.generatedLine-1),generatedColumn:a.generatedColumn+(r.generatedOffset.generatedLine===a.generatedLine?r.generatedOffset.generatedColumn-1:0),originalLine:a.originalLine,originalColumn:a.originalColumn,name:l};this.__generatedMappings.push(c),"number"==typeof c.originalLine&&this.__originalMappings.push(c)}p(this.__generatedMappings,s.compareByGeneratedPositionsDeflated),p(this.__originalMappings,s.compareByOriginalPositions)},t.IndexedSourceMapConsumer=a},function(e,t,n){function r(e,t,n,r,i){this.children=[],this.sourceContents={},this.line=null==e?null:e,this.column=null==t?null:t,this.source=null==n?null:n,this.name=null==i?null:i,this[s]=!0,null!=r&&this.add(r)}var i=n(441).SourceMapGenerator,o=n(121),a=/(\r?\n)/,s="$$$isSourceNode$$$";r.fromStringWithSourceMap=function(e,t,n){function i(e,t){if(null===e||void 0===e.source)s.add(t);else{var i=n?o.join(n,e.source):e.source;s.add(new r(e.originalLine,e.originalColumn,i,t,e.name))}}var s=new r,u=e.split(a),l=0,c=function(){function e(){return l<u.length?u[l++]:void 0}return e()+(e()||"")},p=1,f=0,h=null;return t.eachMapping(function(e){if(null!==h){if(!(p<e.generatedLine)){var t=u[l]||"",n=t.substr(0,e.generatedColumn-f);return u[l]=t.substr(e.generatedColumn-f),f=e.generatedColumn,i(h,n),void(h=e)}i(h,c()),p++,f=0}for(;p<e.generatedLine;)s.add(c()),p++;if(f<e.generatedColumn){var t=u[l]||"";s.add(t.substr(0,e.generatedColumn)),u[l]=t.substr(e.generatedColumn),f=e.generatedColumn}h=e},this),l<u.length&&(h&&i(h,c()),s.add(u.splice(l).join(""))),t.sources.forEach(function(e){var r=t.sourceContentFor(e);null!=r&&(null!=n&&(e=o.join(n,e)),s.setSourceContent(e,r))}),s},r.prototype.add=function(e){if(Array.isArray(e))e.forEach(function(e){this.add(e)},this);else{if(!e[s]&&"string"!=typeof e)throw new TypeError("Expected a SourceNode, string, or an array of SourceNodes and strings. Got "+e);e&&this.children.push(e)}return this},r.prototype.prepend=function(e){if(Array.isArray(e))for(var t=e.length-1;t>=0;t--)this.prepend(e[t]);else{if(!e[s]&&"string"!=typeof e)throw new TypeError("Expected a SourceNode, string, or an array of SourceNodes and strings. Got "+e);this.children.unshift(e)}return this},r.prototype.walk=function(e){for(var t,n=0,r=this.children.length;n<r;n++)t=this.children[n],t[s]?t.walk(e):""!==t&&e(t,{source:this.source,line:this.line,column:this.column,name:this.name})},r.prototype.join=function(e){var t,n,r=this.children.length;if(r>0){for(t=[],n=0;n<r-1;n++)t.push(this.children[n]),t.push(e);t.push(this.children[n]),this.children=t}return this},r.prototype.replaceRight=function(e,t){var n=this.children[this.children.length-1];return n[s]?n.replaceRight(e,t):"string"==typeof n?this.children[this.children.length-1]=n.replace(e,t):this.children.push("".replace(e,t)),this},r.prototype.setSourceContent=function(e,t){this.sourceContents[o.toSetString(e)]=t},r.prototype.walkSourceContents=function(e){for(var t=0,n=this.children.length;t<n;t++)this.children[t][s]&&this.children[t].walkSourceContents(e);for(var r=Object.keys(this.sourceContents),t=0,n=r.length;t<n;t++)e(o.fromSetString(r[t]),this.sourceContents[r[t]])},r.prototype.toString=function(){var e="";return this.walk(function(t){e+=t}),e},r.prototype.toStringWithSourceMap=function(e){var t={code:"",line:1,column:0},n=new i(e),r=!1,o=null,a=null,s=null,u=null;return this.walk(function(e,i){t.code+=e,null!==i.source&&null!==i.line&&null!==i.column?(o===i.source&&a===i.line&&s===i.column&&u===i.name||n.addMapping({source:i.source,original:{line:i.line,column:i.column},generated:{line:t.line,column:t.column},name:i.name}),o=i.source,a=i.line,s=i.column,u=i.name,r=!0):r&&(n.addMapping({generated:{line:t.line,column:t.column}}),o=null,r=!1);for(var l=0,c=e.length;l<c;l++)10===e.charCodeAt(l)?(t.line++,t.column=0,l+1===c?(o=null,r=!1):r&&n.addMapping({source:i.source,original:{line:i.line,column:i.column},generated:{line:t.line,column:t.column},name:i.name})):t.column++}),this.walkSourceContents(function(e,t){n.setSourceContent(e,t)}),{code:t.code,map:n}},t.SourceNode=r},function(e,t,n){"use strict";function r(e,t,n,r,i){}e.exports=r},function(e,t,n){"use strict";var r=n(32),i=n(8),o=n(444);e.exports=function(){function e(e,t,n,r,a,s){s!==o&&i(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types")}function t(){return e}e.isRequired=e;var n={array:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t};return n.checkPropTypes=r,n.PropTypes=n,n}},function(e,t,n){"use strict";var r=n(32),i=n(8),o=n(10),a=n(13),s=n(444),u=n(995);e.exports=function(e,t){function n(e){var t=e&&(C&&e[C]||e[A]);if("function"==typeof t)return t}function l(e,t){return e===t?0!==e||1/e==1/t:e!==e&&t!==t}function c(e){this.message=e,this.stack=""}function p(e){function n(n,r,o,a,u,l,p){if(a=a||D,l=l||o,p!==s)if(t)i(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use `PropTypes.checkPropTypes()` to call them. Read more at http://fb.me/use-check-prop-types");else;return null==r[o]?n?new c(null===r[o]?"The "+u+" `"+l+"` is marked as required in `"+a+"`, but its value is `null`.":"The "+u+" `"+l+"` is marked as required in `"+a+"`, but its value is `undefined`."):null:e(r,o,a,u,l)}var r=n.bind(null,!1);return r.isRequired=n.bind(null,!0),r}function f(e){function t(t,n,r,i,o,a){var s=t[n];if(w(s)!==e)return new c("Invalid "+i+" `"+o+"` of type `"+k(s)+"` supplied to `"+r+"`, expected `"+e+"`.");return null}return p(t)}function h(e){function t(t,n,r,i,o){if("function"!=typeof e)return new c("Property `"+o+"` of component `"+r+"` has invalid PropType notation inside arrayOf.");var a=t[n];if(!Array.isArray(a)){return new c("Invalid "+i+" `"+o+"` of type `"+w(a)+"` supplied to `"+r+"`, expected an array.")}for(var u=0;u<a.length;u++){var l=e(a,u,r,i,o+"["+u+"]",s);if(l instanceof Error)return l}return null}return p(t)}function d(e){function t(t,n,r,i,o){if(!(t[n]instanceof e)){var a=e.name||D;return new c("Invalid "+i+" `"+o+"` of type `"+S(t[n])+"` supplied to `"+r+"`, expected instance of `"+a+"`.")}return null}return p(t)}function m(e){function t(t,n,r,i,o){for(var a=t[n],s=0;s<e.length;s++)if(l(a,e[s]))return null;return new c("Invalid "+i+" `"+o+"` of value `"+a+"` supplied to `"+r+"`, expected one of "+JSON.stringify(e)+".")}return Array.isArray(e)?p(t):r.thatReturnsNull}function v(e){function t(t,n,r,i,o){if("function"!=typeof e)return new c("Property `"+o+"` of component `"+r+"` has invalid PropType notation inside objectOf.");var a=t[n],u=w(a);if("object"!==u)return new c("Invalid "+i+" `"+o+"` of type `"+u+"` supplied to `"+r+"`, expected an object.");for(var l in a)if(a.hasOwnProperty(l)){var p=e(a,l,r,i,o+"."+l,s);if(p instanceof Error)return p}return null}return p(t)}function g(e){function t(t,n,r,i,o){for(var a=0;a<e.length;a++){if(null==(0,e[a])(t,n,r,i,o,s))return null}return new c("Invalid "+i+" `"+o+"` supplied to `"+r+"`.")}if(!Array.isArray(e))return r.thatReturnsNull;for(var n=0;n<e.length;n++){var i=e[n];if("function"!=typeof i)return o(!1,"Invalid argument supplied to oneOfType. Expected an array of check functions, but received %s at index %s.",E(i),n),r.thatReturnsNull}return p(t)}function y(e){function t(t,n,r,i,o){var a=t[n],u=w(a);if("object"!==u)return new c("Invalid "+i+" `"+o+"` of type `"+u+"` supplied to `"+r+"`, expected `object`.");for(var l in e){var p=e[l];if(p){var f=p(a,l,r,i,o+"."+l,s);if(f)return f}}return null}return p(t)}function _(e){function t(t,n,r,i,o){var u=t[n],l=w(u);if("object"!==l)return new c("Invalid "+i+" `"+o+"` of type `"+l+"` supplied to `"+r+"`, expected `object`.");var p=a({},t[n],e);for(var f in p){var h=e[f];if(!h)return new c("Invalid "+i+" `"+o+"` key `"+f+"` supplied to `"+r+"`.\nBad object: "+JSON.stringify(t[n],null,"  ")+"\nValid keys: "+JSON.stringify(Object.keys(e),null,"  "));var d=h(u,f,r,i,o+"."+f,s);if(d)return d}return null}return p(t)}function b(t){switch(typeof t){case"number":case"string":case"undefined":return!0;case"boolean":return!t;case"object":if(Array.isArray(t))return t.every(b);if(null===t||e(t))return!0;var r=n(t);if(!r)return!1;var i,o=r.call(t);if(r!==t.entries){for(;!(i=o.next()).done;)if(!b(i.value))return!1}else for(;!(i=o.next()).done;){var a=i.value;if(a&&!b(a[1]))return!1}return!0;default:return!1}}function x(e,t){return"symbol"===e||("Symbol"===t["@@toStringTag"]||"function"==typeof Symbol&&t instanceof Symbol)}function w(e){var t=typeof e;return Array.isArray(e)?"array":e instanceof RegExp?"object":x(t,e)?"symbol":t}function k(e){if(void 0===e||null===e)return""+e;var t=w(e);if("object"===t){if(e instanceof Date)return"date";if(e instanceof RegExp)return"regexp"}return t}function E(e){var t=k(e);switch(t){case"array":case"object":return"an "+t;case"boolean":case"date":case"regexp":return"a "+t;default:return t}}function S(e){return e.constructor&&e.constructor.name?e.constructor.name:D}var C="function"==typeof Symbol&&Symbol.iterator,A="@@iterator",D="<<anonymous>>",O={array:f("array"),bool:f("boolean"),func:f("function"),number:f("number"),object:f("object"),string:f("string"),symbol:f("symbol"),any:function(){return p(r.thatReturnsNull)}(),arrayOf:h,element:function(){function t(t,n,r,i,o){var a=t[n];if(!e(a)){return new c("Invalid "+i+" `"+o+"` of type `"+w(a)+"` supplied to `"+r+"`, expected a single ReactElement.")}return null}return p(t)}(),instanceOf:d,node:function(){function e(e,t,n,r,i){return b(e[t])?null:new c("Invalid "+r+" `"+i+"` supplied to `"+n+"`, expected a ReactNode.")}return p(e)}(),objectOf:v,oneOf:m,oneOfType:g,shape:y,exact:_};return c.prototype=Error.prototype,O.checkPropTypes=u,O.PropTypes=O,O}},function(e,t,n){(function(e,r){var i;!function(o){function a(e){throw RangeError(P[e])}function s(e,t){for(var n=e.length,r=[];n--;)r[n]=t(e[n]);return r}function u(e,t){var n=e.split("@"),r="";return n.length>1&&(r=n[0]+"@",e=n[1]),e=e.replace(T,"."),r+s(e.split("."),t).join(".")}function l(e){for(var t,n,r=[],i=0,o=e.length;i<o;)t=e.charCodeAt(i++),t>=55296&&t<=56319&&i<o?(n=e.charCodeAt(i++),56320==(64512&n)?r.push(((1023&t)<<10)+(1023&n)+65536):(r.push(t),i--)):r.push(t);return r}function c(e){return s(e,function(e){var t="";return e>65535&&(e-=65536,t+=j(e>>>10&1023|55296),e=56320|1023&e),t+=j(e)}).join("")}function p(e){return e-48<10?e-22:e-65<26?e-65:e-97<26?e-97:x}function f(e,t){return e+22+75*(e<26)-((0!=t)<<5)}function h(e,t,n){var r=0;for(e=n?R(e/S):e>>1,e+=R(e/t);e>I*k>>1;r+=x)e=R(e/I);return R(r+(I+1)*e/(e+E))}function d(e){var t,n,r,i,o,s,u,l,f,d,m=[],v=e.length,g=0,y=A,_=C;for(n=e.lastIndexOf(D),n<0&&(n=0),r=0;r<n;++r)e.charCodeAt(r)>=128&&a("not-basic"),m.push(e.charCodeAt(r));for(i=n>0?n+1:0;i<v;){for(o=g,s=1,u=x;i>=v&&a("invalid-input"),l=p(e.charCodeAt(i++)),(l>=x||l>R((b-g)/s))&&a("overflow"),g+=l*s,f=u<=_?w:u>=_+k?k:u-_,!(l<f);u+=x)d=x-f,s>R(b/d)&&a("overflow"),s*=d;t=m.length+1,_=h(g-o,t,0==o),R(g/t)>b-y&&a("overflow"),y+=R(g/t),g%=t,m.splice(g++,0,y)}return c(m)}function m(e){var t,n,r,i,o,s,u,c,p,d,m,v,g,y,_,E=[];for(e=l(e),v=e.length,t=A,n=0,o=C,s=0;s<v;++s)(m=e[s])<128&&E.push(j(m));for(r=i=E.length,i&&E.push(D);r<v;){for(u=b,s=0;s<v;++s)(m=e[s])>=t&&m<u&&(u=m);for(g=r+1,u-t>R((b-n)/g)&&a("overflow"),n+=(u-t)*g,t=u,s=0;s<v;++s)if(m=e[s],m<t&&++n>b&&a("overflow"),m==t){for(c=n,p=x;d=p<=o?w:p>=o+k?k:p-o,!(c<d);p+=x)_=c-d,y=x-d,E.push(j(f(d+_%y,0))),c=R(_/y);E.push(j(f(c,0))),o=h(n,g,r==i),n=0,++r}++n,++t}return E.join("")}function v(e){return u(e,function(e){return O.test(e)?d(e.slice(4).toLowerCase()):e})}function g(e){return u(e,function(e){return M.test(e)?"xn--"+m(e):e})}var y=("object"==typeof t&&t&&t.nodeType,"object"==typeof e&&e&&e.nodeType,"object"==typeof r&&r);var _,b=2147483647,x=36,w=1,k=26,E=38,S=700,C=72,A=128,D="-",O=/^xn--/,M=/[^\x20-\x7E]/,T=/[\x2E\u3002\uFF0E\uFF61]/g,P={overflow:"Overflow: input needs wider integers to process","not-basic":"Illegal input >= 0x80 (not a basic code point)","invalid-input":"Invalid input"},I=x-w,R=Math.floor,j=String.fromCharCode;_={version:"1.3.2",ucs2:{decode:l,encode:c},decode:d,encode:m,toASCII:g,toUnicode:v},void 0!==(i=function(){return _}.call(t,n,t,e))&&(e.exports=i)}()}).call(t,n(72)(e),n(17))},function(e,t,n){"use strict";var r=n(1001),i=n(1e3),o=n(445);e.exports={formats:o,parse:i,stringify:r}},function(e,t,n){"use strict";var r=n(446),i=Object.prototype.hasOwnProperty,o={allowDots:!1,allowPrototypes:!1,arrayLimit:20,decoder:r.decode,delimiter:"&",depth:5,parameterLimit:1e3,plainObjects:!1,strictNullHandling:!1},a=function(e,t){for(var n={},r=t.ignoreQueryPrefix?e.replace(/^\?/,""):e,a=t.parameterLimit===1/0?void 0:t.parameterLimit,s=r.split(t.delimiter,a),u=0;u<s.length;++u){var l,c,p=s[u],f=p.indexOf("]="),h=-1===f?p.indexOf("="):f+1;-1===h?(l=t.decoder(p,o.decoder),c=t.strictNullHandling?null:""):(l=t.decoder(p.slice(0,h),o.decoder),c=t.decoder(p.slice(h+1),o.decoder)),i.call(n,l)?n[l]=[].concat(n[l]).concat(c):n[l]=c}return n},s=function(e,t,n){for(var r=t,i=e.length-1;i>=0;--i){var o,a=e[i];if("[]"===a)o=[],o=o.concat(r);else{o=n.plainObjects?Object.create(null):{};var s="["===a.charAt(0)&&"]"===a.charAt(a.length-1)?a.slice(1,-1):a,u=parseInt(s,10);!isNaN(u)&&a!==s&&String(u)===s&&u>=0&&n.parseArrays&&u<=n.arrayLimit?(o=[],o[u]=r):o[s]=r}r=o}return r},u=function(e,t,n){if(e){var r=n.allowDots?e.replace(/\.([^.[]+)/g,"[$1]"):e,o=/(\[[^[\]]*])/,a=/(\[[^[\]]*])/g,u=o.exec(r),l=u?r.slice(0,u.index):r,c=[];if(l){if(!n.plainObjects&&i.call(Object.prototype,l)&&!n.allowPrototypes)return;c.push(l)}for(var p=0;null!==(u=a.exec(r))&&p<n.depth;){if(p+=1,!n.plainObjects&&i.call(Object.prototype,u[1].slice(1,-1))&&!n.allowPrototypes)return;c.push(u[1])}return u&&c.push("["+r.slice(u.index)+"]"),s(c,t,n)}};e.exports=function(e,t){var n=t?r.assign({},t):{};if(null!==n.decoder&&void 0!==n.decoder&&"function"!=typeof n.decoder)throw new TypeError("Decoder has to be a function.");if(n.ignoreQueryPrefix=!0===n.ignoreQueryPrefix,n.delimiter="string"==typeof n.delimiter||r.isRegExp(n.delimiter)?n.delimiter:o.delimiter,n.depth="number"==typeof n.depth?n.depth:o.depth,n.arrayLimit="number"==typeof n.arrayLimit?n.arrayLimit:o.arrayLimit,n.parseArrays=!1!==n.parseArrays,n.decoder="function"==typeof n.decoder?n.decoder:o.decoder,n.allowDots="boolean"==typeof n.allowDots?n.allowDots:o.allowDots,n.plainObjects="boolean"==typeof n.plainObjects?n.plainObjects:o.plainObjects,n.allowPrototypes="boolean"==typeof n.allowPrototypes?n.allowPrototypes:o.allowPrototypes,n.parameterLimit="number"==typeof n.parameterLimit?n.parameterLimit:o.parameterLimit,n.strictNullHandling="boolean"==typeof n.strictNullHandling?n.strictNullHandling:o.strictNullHandling,""===e||null===e||void 0===e)return n.plainObjects?Object.create(null):{};for(var i="string"==typeof e?a(e,n):e,s=n.plainObjects?Object.create(null):{},l=Object.keys(i),c=0;c<l.length;++c){var p=l[c],f=u(p,i[p],n);s=r.merge(s,f,n)}return r.compact(s)}},function(e,t,n){"use strict";var r=n(446),i=n(445),o={brackets:function(e){return e+"[]"},indices:function(e,t){return e+"["+t+"]"},repeat:function(e){return e}},a=Date.prototype.toISOString,s={delimiter:"&",encode:!0,encoder:r.encode,encodeValuesOnly:!1,serializeDate:function(e){return a.call(e)},skipNulls:!1,strictNullHandling:!1},u=function e(t,n,i,o,a,u,l,c,p,f,h,d){var m=t;if("function"==typeof l)m=l(n,m);else if(m instanceof Date)m=f(m);else if(null===m){if(o)return u&&!d?u(n,s.encoder):n;m=""}if("string"==typeof m||"number"==typeof m||"boolean"==typeof m||r.isBuffer(m)){if(u){return[h(d?n:u(n,s.encoder))+"="+h(u(m,s.encoder))]}return[h(n)+"="+h(String(m))]}var v=[];if(void 0===m)return v;var g;if(Array.isArray(l))g=l;else{var y=Object.keys(m);g=c?y.sort(c):y}for(var _=0;_<g.length;++_){var b=g[_];a&&null===m[b]||(v=Array.isArray(m)?v.concat(e(m[b],i(n,b),i,o,a,u,l,c,p,f,h,d)):v.concat(e(m[b],n+(p?"."+b:"["+b+"]"),i,o,a,u,l,c,p,f,h,d)))}return v};e.exports=function(e,t){var n=e,a=t?r.assign({},t):{};if(null!==a.encoder&&void 0!==a.encoder&&"function"!=typeof a.encoder)throw new TypeError("Encoder has to be a function.");var l=void 0===a.delimiter?s.delimiter:a.delimiter,c="boolean"==typeof a.strictNullHandling?a.strictNullHandling:s.strictNullHandling,p="boolean"==typeof a.skipNulls?a.skipNulls:s.skipNulls,f="boolean"==typeof a.encode?a.encode:s.encode,h="function"==typeof a.encoder?a.encoder:s.encoder,d="function"==typeof a.sort?a.sort:null,m=void 0!==a.allowDots&&a.allowDots,v="function"==typeof a.serializeDate?a.serializeDate:s.serializeDate,g="boolean"==typeof a.encodeValuesOnly?a.encodeValuesOnly:s.encodeValuesOnly;if(void 0===a.format)a.format=i.default;else if(!Object.prototype.hasOwnProperty.call(i.formatters,a.format))throw new TypeError("Unknown format option provided.");var y,_,b=i.formatters[a.format];"function"==typeof a.filter?(_=a.filter,n=_("",n)):Array.isArray(a.filter)&&(_=a.filter,y=_);var x=[];if("object"!=typeof n||null===n)return"";var w;w=a.arrayFormat in o?a.arrayFormat:"indices"in a?a.indices?"indices":"repeat":"indices";var k=o[w];y||(y=Object.keys(n)),d&&y.sort(d);for(var E=0;E<y.length;++E){var S=y[E];p&&null===n[S]||(x=x.concat(u(n[S],S,k,c,p,f?h:null,_,d,m,v,b,g)))}var C=x.join(l),A=!0===a.addQueryPrefix?"?":"";return C.length>0?A+C:""}},function(e,t,n){"use strict";function r(e,t){return Object.prototype.hasOwnProperty.call(e,t)}e.exports=function(e,t,n,o){t=t||"&",n=n||"=";var a={};if("string"!=typeof e||0===e.length)return a;var s=/\+/g;e=e.split(t);var u=1e3;o&&"number"==typeof o.maxKeys&&(u=o.maxKeys);var l=e.length;u>0&&l>u&&(l=u);for(var c=0;c<l;++c){var p,f,h,d,m=e[c].replace(s,"%20"),v=m.indexOf(n);v>=0?(p=m.substr(0,v),f=m.substr(v+1)):(p=m,f=""),h=decodeURIComponent(p),d=decodeURIComponent(f),r(a,h)?i(a[h])?a[h].push(d):a[h]=[a[h],d]:a[h]=d}return a};var i=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)}},function(e,t,n){"use strict";function r(e,t){if(e.map)return e.map(t);for(var n=[],r=0;r<e.length;r++)n.push(t(e[r],r));return n}var i=function(e){switch(typeof e){case"string":return e;case"boolean":return e?"true":"false";case"number":return isFinite(e)?e:"";default:return""}};e.exports=function(e,t,n,s){return t=t||"&",n=n||"=",null===e&&(e=void 0),"object"==typeof e?r(a(e),function(a){var s=encodeURIComponent(i(a))+n;return o(e[a])?r(e[a],function(e){return s+encodeURIComponent(i(e))}).join(t):s+encodeURIComponent(i(e[a]))}).join(t):s?encodeURIComponent(i(s))+n+encodeURIComponent(i(e)):""};var o=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)},a=Object.keys||function(e){var t=[];for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&t.push(n);return t}},function(e,t,n){"use strict";t.decode=t.parse=n(1002),t.encode=t.stringify=n(1003)},function(e,t,n){"use strict";function r(e){return decodeURIComponent(e.replace(/\+/g," "))}function i(e){for(var t,n=/([^=?&]+)=?([^&]*)/g,i={};t=n.exec(e);i[r(t[1])]=r(t[2]));return i}function o(e,t){t=t||"";var n=[];"string"!=typeof t&&(t="?");for(var r in e)a.call(e,r)&&n.push(encodeURIComponent(r)+"="+encodeURIComponent(e[r]));return n.length?t+n.join("&"):""}var a=Object.prototype.hasOwnProperty;t.stringify=o,t.parse=i},function(e,t,n){(function(t){(function(){var n,r,i,o,a,s;"undefined"!=typeof performance&&null!==performance&&performance.now?e.exports=function(){return performance.now()}:void 0!==t&&null!==t&&t.hrtime?(e.exports=function(){return(n()-a)/1e6},r=t.hrtime,n=function(){var e;return e=r(),1e9*e[0]+e[1]},o=n(),s=1e9*t.uptime(),a=o-s):Date.now?(e.exports=function(){return Date.now()-i},i=Date.now()):(e.exports=function(){return(new Date).getTime()-i},i=(new Date).getTime())}).call(this)}).call(t,n(33))},function(e,t){e.exports='---\nurl: "http://petstore.swagger.io/v2/swagger.json"\ndom_id: "#swagger-ui"\nvalidatorUrl: "https://online.swagger.io/validator"\noauth2RedirectUrl: "http://localhost:3200/oauth2-redirect.html"\n'},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){var n={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0}),t.UnmountClosed=void 0;var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},l=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),c=n(0),p=r(c),f=n(1),h=r(f),d=n(447);(t.UnmountClosed=function(e){function t(e){o(this,t);var n=a(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e));return n.componentWillReceiveProps=function(e){var t=e.isOpened;!n.props.isOpened&&t&&n.setState({forceInitialAnimation:!0,shouldUnmount:!1})},n.onRest=function(){var e=n.props,t=e.isOpened,r=e.onRest;t||n.setState({shouldUnmount:!0}),r&&r.apply(void 0,arguments)},n.state={shouldUnmount:!n.props.isOpened,forceInitialAnimation:!n.props.isOpened},n}return s(t,e),l(t,[{key:"render",value:function(){var e=this.props,t=e.isOpened,n=(e.onRest,i(e,["isOpened","onRest"])),r=this.state,o=r.forceInitialAnimation;return r.shouldUnmount?null:p.default.createElement(d.Collapse,u({forceInitialAnimation:o,isOpened:t,onRest:this.onRest},n))}}]),t}(p.default.PureComponent)).propTypes={isOpened:h.default.bool.isRequired,onRest:h.default.func}},function(e,t,n){"use strict";var r={Properties:{"aria-current":0,"aria-details":0,"aria-disabled":0,"aria-hidden":0,"aria-invalid":0,"aria-keyshortcuts":0,"aria-label":0,"aria-roledescription":0,"aria-autocomplete":0,"aria-checked":0,"aria-expanded":0,"aria-haspopup":0,"aria-level":0,"aria-modal":0,"aria-multiline":0,"aria-multiselectable":0,"aria-orientation":0,"aria-placeholder":0,"aria-pressed":0,"aria-readonly":0,"aria-required":0,"aria-selected":0,"aria-sort":0,"aria-valuemax":0,"aria-valuemin":0,"aria-valuenow":0,"aria-valuetext":0,"aria-atomic":0,"aria-busy":0,"aria-live":0,"aria-relevant":0,"aria-dropeffect":0,"aria-grabbed":0,"aria-activedescendant":0,"aria-colcount":0,"aria-colindex":0,"aria-colspan":0,"aria-controls":0,"aria-describedby":0,"aria-errormessage":0,"aria-flowto":0,"aria-labelledby":0,"aria-owns":0,"aria-posinset":0,"aria-rowcount":0,"aria-rowindex":0,"aria-rowspan":0,"aria-setsize":0},DOMAttributeNames:{},DOMPropertyNames:{}};e.exports=r},function(e,t,n){"use strict";var r=n(14),i=n(378),o={focusDOMComponent:function(){i(r.getNodeFromInstance(this))}};e.exports=o},function(e,t,n){"use strict";function r(e){return(e.ctrlKey||e.altKey||e.metaKey)&&!(e.ctrlKey&&e.altKey)}function i(e){switch(e){case"topCompositionStart":return S.compositionStart;case"topCompositionEnd":return S.compositionEnd;case"topCompositionUpdate":return S.compositionUpdate}}function o(e,t){return"topKeyDown"===e&&t.keyCode===y}function a(e,t){switch(e){case"topKeyUp":return-1!==g.indexOf(t.keyCode);case"topKeyDown":return t.keyCode!==y;case"topKeyPress":case"topMouseDown":case"topBlur":return!0;default:return!1}}function s(e){var t=e.detail;return"object"==typeof t&&"data"in t?t.data:null}function u(e,t,n,r){var u,l;if(_?u=i(e):A?a(e,n)&&(u=S.compositionEnd):o(e,n)&&(u=S.compositionStart),!u)return null;w&&(A||u!==S.compositionStart?u===S.compositionEnd&&A&&(l=A.getData()):A=d.getPooled(r));var c=m.getPooled(u,t,n,r);if(l)c.data=l;else{var p=s(n);null!==p&&(c.data=p)}return f.accumulateTwoPhaseDispatches(c),c}function l(e,t){switch(e){case"topCompositionEnd":return s(t);case"topKeyPress":return t.which!==k?null:(C=!0,E);case"topTextInput":var n=t.data;return n===E&&C?null:n;default:return null}}function c(e,t){if(A){if("topCompositionEnd"===e||!_&&a(e,t)){var n=A.getData();return d.release(A),A=null,n}return null}switch(e){case"topPaste":return null;case"topKeyPress":return t.which&&!r(t)?String.fromCharCode(t.which):null;case"topCompositionEnd":return w?null:t.data;default:return null}}function p(e,t,n,r){var i;if(!(i=x?l(e,n):c(e,n)))return null;var o=v.getPooled(S.beforeInput,t,n,r);return o.data=i,f.accumulateTwoPhaseDispatches(o),o}var f=n(123),h=n(25),d=n(1017),m=n(1054),v=n(1057),g=[9,13,27,32],y=229,_=h.canUseDOM&&"CompositionEvent"in window,b=null;h.canUseDOM&&"documentMode"in document&&(b=document.documentMode);var x=h.canUseDOM&&"TextEvent"in window&&!b&&!function(){var e=window.opera;return"object"==typeof e&&"function"==typeof e.version&&parseInt(e.version(),10)<=12}(),w=h.canUseDOM&&(!_||b&&b>8&&b<=11),k=32,E=String.fromCharCode(k),S={beforeInput:{phasedRegistrationNames:{bubbled:"onBeforeInput",captured:"onBeforeInputCapture"},dependencies:["topCompositionEnd","topKeyPress","topTextInput","topPaste"]},compositionEnd:{phasedRegistrationNames:{bubbled:"onCompositionEnd",captured:"onCompositionEndCapture"},dependencies:["topBlur","topCompositionEnd","topKeyDown","topKeyPress","topKeyUp","topMouseDown"]},compositionStart:{phasedRegistrationNames:{bubbled:"onCompositionStart",captured:"onCompositionStartCapture"},dependencies:["topBlur","topCompositionStart","topKeyDown","topKeyPress","topKeyUp","topMouseDown"]},compositionUpdate:{phasedRegistrationNames:{bubbled:"onCompositionUpdate",captured:"onCompositionUpdateCapture"},dependencies:["topBlur","topCompositionUpdate","topKeyDown","topKeyPress","topKeyUp","topMouseDown"]}},C=!1,A=null,D={eventTypes:S,extractEvents:function(e,t,n,r){return[u(e,t,n,r),p(e,t,n,r)]}};e.exports=D},function(e,t,n){"use strict";var r=n(450),i=n(25),o=(n(39),n(747),n(1063)),a=n(754),s=n(757),u=(n(10),s(function(e){return a(e)})),l=!1,c="cssFloat";if(i.canUseDOM){var p=document.createElement("div").style;try{p.font=""}catch(e){l=!0}void 0===document.documentElement.style.cssFloat&&(c="styleFloat")}var f={createMarkupForStyles:function(e,t){var n="";for(var r in e)if(e.hasOwnProperty(r)){var i=0===r.indexOf("--"),a=e[r];null!=a&&(n+=u(r)+":",n+=o(r,a,t,i)+";")}return n||null},setValueForStyles:function(e,t,n){var i=e.style;for(var a in t)if(t.hasOwnProperty(a)){var s=0===a.indexOf("--"),u=o(a,t[a],n,s);if("float"!==a&&"cssFloat"!==a||(a=c),s)i.setProperty(a,u);else if(u)i[a]=u;else{var p=l&&r.shorthandPropertyExpansions[a];if(p)for(var f in p)i[f]="";else i[a]=""}}}};e.exports=f},function(e,t,n){"use strict";function r(e,t,n){var r=C.getPooled(T.change,e,t,n);return r.type="change",w.accumulateTwoPhaseDispatches(r),r}function i(e){var t=e.nodeName&&e.nodeName.toLowerCase();return"select"===t||"input"===t&&"file"===e.type}function o(e){var t=r(I,e,D(e));S.batchedUpdates(a,t)}function a(e){x.enqueueEvents(e),x.processEventQueue(!1)}function s(e,t){P=e,I=t,P.attachEvent("onchange",o)}function u(){P&&(P.detachEvent("onchange",o),P=null,I=null)}function l(e,t){var n=A.updateValueIfChanged(e),r=!0===t.simulated&&F._allowSimulatedPassThrough;if(n||r)return e}function c(e,t){if("topChange"===e)return t}function p(e,t,n){"topFocus"===e?(u(),s(t,n)):"topBlur"===e&&u()}function f(e,t){P=e,I=t,P.attachEvent("onpropertychange",d)}function h(){P&&(P.detachEvent("onpropertychange",d),P=null,I=null)}function d(e){"value"===e.propertyName&&l(I,e)&&o(e)}function m(e,t,n){"topFocus"===e?(h(),f(t,n)):"topBlur"===e&&h()}function v(e,t,n){if("topSelectionChange"===e||"topKeyUp"===e||"topKeyDown"===e)return l(I,n)}function g(e){var t=e.nodeName;return t&&"input"===t.toLowerCase()&&("checkbox"===e.type||"radio"===e.type)}function y(e,t,n){if("topClick"===e)return l(t,n)}function _(e,t,n){if("topInput"===e||"topChange"===e)return l(t,n)}function b(e,t){if(null!=e){var n=e._wrapperState||t._wrapperState;if(n&&n.controlled&&"number"===t.type){var r=""+t.value;t.getAttribute("value")!==r&&t.setAttribute("value",r)}}}var x=n(122),w=n(123),k=n(25),E=n(14),S=n(44),C=n(51),A=n(466),D=n(252),O=n(253),M=n(468),T={change:{phasedRegistrationNames:{bubbled:"onChange",captured:"onChangeCapture"},dependencies:["topBlur","topChange","topClick","topFocus","topInput","topKeyDown","topKeyUp","topSelectionChange"]}},P=null,I=null,R=!1;k.canUseDOM&&(R=O("change")&&(!document.documentMode||document.documentMode>8));var j=!1;k.canUseDOM&&(j=O("input")&&(!document.documentMode||document.documentMode>9));var F={eventTypes:T,_allowSimulatedPassThrough:!0,_isInputEventSupported:j,extractEvents:function(e,t,n,o){var a,s,u=t?E.getNodeFromInstance(t):window;if(i(u)?R?a=c:s=p:M(u)?j?a=_:(a=v,s=m):g(u)&&(a=y),a){var l=a(e,t,n);if(l){return r(l,n,o)}}s&&s(e,u,t),"topBlur"===e&&b(t,u)}};e.exports=F},function(e,t,n){"use strict";var r=n(11),i=n(88),o=n(25),a=n(750),s=n(32),u=(n(8),{dangerouslyReplaceNodeWithMarkup:function(e,t){if(o.canUseDOM||r("56"),t||r("57"),"HTML"===e.nodeName&&r("58"),"string"==typeof t){var n=a(t,s)[0];e.parentNode.replaceChild(n,e)}else i.replaceChildWithTree(e,t)}});e.exports=u},function(e,t,n){"use strict";var r=["ResponderEventPlugin","SimpleEventPlugin","TapEventPlugin","EnterLeaveEventPlugin","ChangeEventPlugin","SelectEventPlugin","BeforeInputEventPlugin"];e.exports=r},function(e,t,n){"use strict";var r=n(123),i=n(14),o=n(160),a={mouseEnter:{registrationName:"onMouseEnter",dependencies:["topMouseOut","topMouseOver"]},mouseLeave:{registrationName:"onMouseLeave",dependencies:["topMouseOut","topMouseOver"]}},s={eventTypes:a,extractEvents:function(e,t,n,s){if("topMouseOver"===e&&(n.relatedTarget||n.fromElement))return null;if("topMouseOut"!==e&&"topMouseOver"!==e)return null;var u;if(s.window===s)u=s;else{var l=s.ownerDocument;u=l?l.defaultView||l.parentWindow:window}var c,p;if("topMouseOut"===e){c=t;var f=n.relatedTarget||n.toElement;p=f?i.getClosestInstanceFromNode(f):null}else c=null,p=t;if(c===p)return null;var h=null==c?u:i.getNodeFromInstance(c),d=null==p?u:i.getNodeFromInstance(p),m=o.getPooled(a.mouseLeave,c,n,s);m.type="mouseleave",m.target=h,m.relatedTarget=d;var v=o.getPooled(a.mouseEnter,p,n,s);return v.type="mouseenter",v.target=d,v.relatedTarget=h,r.accumulateEnterLeaveDispatches(m,v,c,p),[m,v]}};e.exports=s},function(e,t,n){"use strict";function r(e){this._root=e,this._startText=this.getText(),this._fallbackText=null}var i=n(13),o=n(70),a=n(465);i(r.prototype,{destructor:function(){this._root=null,this._startText=null,this._fallbackText=null},getText:function(){return"value"in this._root?this._root.value:this._root[a()]},getData:function(){if(this._fallbackText)return this._fallbackText;var e,t,n=this._startText,r=n.length,i=this.getText(),o=i.length;for(e=0;e<r&&n[e]===i[e];e++);var a=r-e;for(t=1;t<=a&&n[r-t]===i[o-t];t++);var s=t>1?1-t:void 0;return this._fallbackText=i.slice(e,s),this._fallbackText}}),o.addPoolingTo(r),e.exports=r},function(e,t,n){"use strict";var r=n(89),i=r.injection.MUST_USE_PROPERTY,o=r.injection.HAS_BOOLEAN_VALUE,a=r.injection.HAS_NUMERIC_VALUE,s=r.injection.HAS_POSITIVE_NUMERIC_VALUE,u=r.injection.HAS_OVERLOADED_BOOLEAN_VALUE,l={isCustomAttribute:RegExp.prototype.test.bind(new RegExp("^(data|aria)-["+r.ATTRIBUTE_NAME_CHAR+"]*$")),Properties:{accept:0,acceptCharset:0,accessKey:0,action:0,allowFullScreen:o,allowTransparency:0,alt:0,as:0,async:o,autoComplete:0,autoPlay:o,capture:o,cellPadding:0,cellSpacing:0,charSet:0,challenge:0,checked:i|o,cite:0,classID:0,className:0,cols:s,colSpan:0,content:0,contentEditable:0,contextMenu:0,controls:o,controlsList:0,coords:0,crossOrigin:0,data:0,dateTime:0,default:o,defer:o,dir:0,disabled:o,download:u,draggable:0,encType:0,form:0,formAction:0,formEncType:0,formMethod:0,formNoValidate:o,formTarget:0,frameBorder:0,headers:0,height:0,hidden:o,high:0,href:0,hrefLang:0,htmlFor:0,httpEquiv:0,icon:0,id:0,inputMode:0,integrity:0,is:0,keyParams:0,keyType:0,kind:0,label:0,lang:0,list:0,loop:o,low:0,manifest:0,marginHeight:0,marginWidth:0,max:0,maxLength:0,media:0,mediaGroup:0,method:0,min:0,minLength:0,multiple:i|o,muted:i|o,name:0,nonce:0,noValidate:o,open:o,optimum:0,pattern:0,placeholder:0,playsInline:o,poster:0,preload:0,profile:0,radioGroup:0,readOnly:o,referrerPolicy:0,rel:0,required:o,reversed:o,role:0,rows:s,rowSpan:a,sandbox:0,scope:0,scoped:o,scrolling:0,seamless:o,selected:i|o,shape:0,size:s,sizes:0,span:s,spellCheck:0,src:0,srcDoc:0,srcLang:0,srcSet:0,start:a,step:0,style:0,summary:0,tabIndex:0,target:0,title:0,type:0,useMap:0,value:0,width:0,wmode:0,wrap:0,about:0,datatype:0,inlist:0,prefix:0,property:0,resource:0,typeof:0,vocab:0,autoCapitalize:0,autoCorrect:0,autoSave:0,color:0,itemProp:0,itemScope:o,itemType:0,itemID:0,itemRef:0,results:0,security:0,unselectable:0},DOMAttributeNames:{acceptCharset:"accept-charset",className:"class",htmlFor:"for",httpEquiv:"http-equiv"},DOMPropertyNames:{},DOMMutationMethods:{value:function(e,t){if(null==t)return e.removeAttribute("value");"number"!==e.type||!1===e.hasAttribute("value")?e.setAttribute("value",""+t):e.validity&&!e.validity.badInput&&e.ownerDocument.activeElement!==e&&e.setAttribute("value",""+t)}}};e.exports=l},function(e,t,n){"use strict";(function(t){function r(e,t,n,r){var i=void 0===e[n];null!=t&&i&&(e[n]=o(t,!0))}var i=n(90),o=n(467),a=(n(244),n(254)),s=n(470);n(10);void 0!==t&&n.i({NODE_ENV:"production",WEBPACK_INLINE_STYLES:!1});var u={instantiateChildren:function(e,t,n,i){if(null==e)return null;var o={};return s(e,r,o),o},updateChildren:function(e,t,n,r,s,u,l,c,p){if(t||e){var f,h;for(f in t)if(t.hasOwnProperty(f)){h=e&&e[f];var d=h&&h._currentElement,m=t[f];if(null!=h&&a(d,m))i.receiveComponent(h,m,s,c),t[f]=h;else{h&&(r[f]=i.getHostNode(h),i.unmountComponent(h,!1));var v=o(m,!0);t[f]=v;var g=i.mountComponent(v,s,u,l,c,p);n.push(g)}}for(f in e)!e.hasOwnProperty(f)||t&&t.hasOwnProperty(f)||(h=e[f],r[f]=i.getHostNode(h),i.unmountComponent(h,!1))}},unmountChildren:function(e,t){for(var n in e)if(e.hasOwnProperty(n)){var r=e[n];i.unmountComponent(r,t)}}};e.exports=u}).call(t,n(33))},function(e,t,n){"use strict";var r=n(240),i=n(1027),o={processChildrenUpdates:i.dangerouslyProcessChildrenUpdates,replaceNodeWithMarkup:r.dangerouslyReplaceNodeWithMarkup};e.exports=o},function(e,t,n){"use strict";function r(e){}function i(e){return!(!e.prototype||!e.prototype.isReactComponent)}function o(e){return!(!e.prototype||!e.prototype.isPureReactComponent)}var a=n(11),s=n(13),u=n(92),l=n(246),c=n(52),p=n(247),f=n(124),h=(n(39),n(460)),d=n(90),m=n(144),v=(n(8),n(208)),g=n(254),y=(n(10),{ImpureClass:0,PureClass:1,StatelessFunctional:2});r.prototype.render=function(){var e=f.get(this)._currentElement.type,t=e(this.props,this.context,this.updater);return t};var _=1,b={construct:function(e){this._currentElement=e,this._rootNodeID=0,this._compositeType=null,this._instance=null,this._hostParent=null,this._hostContainerInfo=null,this._updateBatchNumber=null,this._pendingElement=null,this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._renderedNodeType=null,this._renderedComponent=null,this._context=null,this._mountOrder=0,this._topLevelWrapper=null,this._pendingCallbacks=null,this._calledComponentWillUnmount=!1},mountComponent:function(e,t,n,s){this._context=s,this._mountOrder=_++,this._hostParent=t,this._hostContainerInfo=n;var l,c=this._currentElement.props,p=this._processContext(s),h=this._currentElement.type,d=e.getUpdateQueue(),v=i(h),g=this._constructComponent(v,c,p,d);v||null!=g&&null!=g.render?o(h)?this._compositeType=y.PureClass:this._compositeType=y.ImpureClass:(l=g,null===g||!1===g||u.isValidElement(g)||a("105",h.displayName||h.name||"Component"),g=new r(h),this._compositeType=y.StatelessFunctional);g.props=c,g.context=p,g.refs=m,g.updater=d,this._instance=g,f.set(g,this);var b=g.state;void 0===b&&(g.state=b=null),("object"!=typeof b||Array.isArray(b))&&a("106",this.getName()||"ReactCompositeComponent"),this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1;var x;return x=g.unstable_handleError?this.performInitialMountWithErrorHandling(l,t,n,e,s):this.performInitialMount(l,t,n,e,s),g.componentDidMount&&e.getReactMountReady().enqueue(g.componentDidMount,g),x},_constructComponent:function(e,t,n,r){return this._constructComponentWithoutOwner(e,t,n,r)},_constructComponentWithoutOwner:function(e,t,n,r){var i=this._currentElement.type;return e?new i(t,n,r):i(t,n,r)},performInitialMountWithErrorHandling:function(e,t,n,r,i){var o,a=r.checkpoint();try{o=this.performInitialMount(e,t,n,r,i)}catch(s){r.rollback(a),this._instance.unstable_handleError(s),this._pendingStateQueue&&(this._instance.state=this._processPendingState(this._instance.props,this._instance.context)),a=r.checkpoint(),this._renderedComponent.unmountComponent(!0),r.rollback(a),o=this.performInitialMount(e,t,n,r,i)}return o},performInitialMount:function(e,t,n,r,i){var o=this._instance,a=0;o.componentWillMount&&(o.componentWillMount(),this._pendingStateQueue&&(o.state=this._processPendingState(o.props,o.context))),void 0===e&&(e=this._renderValidatedComponent());var s=h.getType(e);this._renderedNodeType=s;var u=this._instantiateReactComponent(e,s!==h.EMPTY);this._renderedComponent=u;var l=d.mountComponent(u,r,t,n,this._processChildContext(i),a);return l},getHostNode:function(){return d.getHostNode(this._renderedComponent)},unmountComponent:function(e){if(this._renderedComponent){var t=this._instance;if(t.componentWillUnmount&&!t._calledComponentWillUnmount)if(t._calledComponentWillUnmount=!0,e){var n=this.getName()+".componentWillUnmount()";p.invokeGuardedCallback(n,t.componentWillUnmount.bind(t))}else t.componentWillUnmount();this._renderedComponent&&(d.unmountComponent(this._renderedComponent,e),this._renderedNodeType=null,this._renderedComponent=null,this._instance=null),this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._pendingCallbacks=null,this._pendingElement=null,this._context=null,this._rootNodeID=0,this._topLevelWrapper=null,f.remove(t)}},_maskContext:function(e){var t=this._currentElement.type,n=t.contextTypes;if(!n)return m;var r={};for(var i in n)r[i]=e[i];return r},_processContext:function(e){var t=this._maskContext(e);return t},_processChildContext:function(e){var t,n=this._currentElement.type,r=this._instance;if(r.getChildContext&&(t=r.getChildContext()),t){"object"!=typeof n.childContextTypes&&a("107",this.getName()||"ReactCompositeComponent");for(var i in t)i in n.childContextTypes||a("108",this.getName()||"ReactCompositeComponent",i);return s({},e,t)}return e},_checkContextTypes:function(e,t,n){},receiveComponent:function(e,t,n){var r=this._currentElement,i=this._context;this._pendingElement=null,this.updateComponent(t,r,e,i,n)},performUpdateIfNecessary:function(e){null!=this._pendingElement?d.receiveComponent(this,this._pendingElement,e,this._context):null!==this._pendingStateQueue||this._pendingForceUpdate?this.updateComponent(e,this._currentElement,this._currentElement,this._context,this._context):this._updateBatchNumber=null},updateComponent:function(e,t,n,r,i){var o=this._instance;null==o&&a("136",this.getName()||"ReactCompositeComponent");var s,u=!1;this._context===i?s=o.context:(s=this._processContext(i),u=!0);var l=t.props,c=n.props;t!==n&&(u=!0),u&&o.componentWillReceiveProps&&o.componentWillReceiveProps(c,s);var p=this._processPendingState(c,s),f=!0;this._pendingForceUpdate||(o.shouldComponentUpdate?f=o.shouldComponentUpdate(c,p,s):this._compositeType===y.PureClass&&(f=!v(l,c)||!v(o.state,p))),this._updateBatchNumber=null,f?(this._pendingForceUpdate=!1,this._performComponentUpdate(n,c,p,s,e,i)):(this._currentElement=n,this._context=i,o.props=c,o.state=p,o.context=s)},_processPendingState:function(e,t){var n=this._instance,r=this._pendingStateQueue,i=this._pendingReplaceState;if(this._pendingReplaceState=!1,this._pendingStateQueue=null,!r)return n.state;if(i&&1===r.length)return r[0];for(var o=s({},i?r[0]:n.state),a=i?1:0;a<r.length;a++){var u=r[a];s(o,"function"==typeof u?u.call(n,o,e,t):u)}return o},_performComponentUpdate:function(e,t,n,r,i,o){var a,s,u,l=this._instance,c=Boolean(l.componentDidUpdate);c&&(a=l.props,s=l.state,u=l.context),l.componentWillUpdate&&l.componentWillUpdate(t,n,r),this._currentElement=e,this._context=o,l.props=t,l.state=n,l.context=r,this._updateRenderedComponent(i,o),c&&i.getReactMountReady().enqueue(l.componentDidUpdate.bind(l,a,s,u),l)},_updateRenderedComponent:function(e,t){var n=this._renderedComponent,r=n._currentElement,i=this._renderValidatedComponent(),o=0;if(g(r,i))d.receiveComponent(n,i,e,this._processChildContext(t));else{var a=d.getHostNode(n);d.unmountComponent(n,!1);var s=h.getType(i);this._renderedNodeType=s;var u=this._instantiateReactComponent(i,s!==h.EMPTY);this._renderedComponent=u;var l=d.mountComponent(u,e,this._hostParent,this._hostContainerInfo,this._processChildContext(t),o);this._replaceNodeWithMarkup(a,l,n)}},_replaceNodeWithMarkup:function(e,t,n){l.replaceNodeWithMarkup(e,t,n)},_renderValidatedComponentWithoutOwnerOrContext:function(){var e=this._instance;return e.render()},_renderValidatedComponent:function(){var e;if(this._compositeType!==y.StatelessFunctional){c.current=this;try{e=this._renderValidatedComponentWithoutOwnerOrContext()}finally{c.current=null}}else e=this._renderValidatedComponentWithoutOwnerOrContext();return null===e||!1===e||u.isValidElement(e)||a("109",this.getName()||"ReactCompositeComponent"),e},attachRef:function(e,t){var n=this.getPublicInstance();null==n&&a("110");var r=t.getPublicInstance();(n.refs===m?n.refs={}:n.refs)[e]=r},detachRef:function(e){delete this.getPublicInstance().refs[e]},getName:function(){var e=this._currentElement.type,t=this._instance&&this._instance.constructor;return e.displayName||t&&t.displayName||e.name||t&&t.name||null},getPublicInstance:function(){var e=this._instance;return this._compositeType===y.StatelessFunctional?null:e},_instantiateReactComponent:null};e.exports=b},function(e,t,n){"use strict";var r=n(14),i=n(1035),o=n(459),a=n(90),s=n(44),u=n(1048),l=n(1064),c=n(464),p=n(1071);n(10);i.inject();var f={findDOMNode:l,render:o.render,unmountComponentAtNode:o.unmountComponentAtNode,version:u,unstable_batchedUpdates:s.batchedUpdates,unstable_renderSubtreeIntoContainer:p};"undefined"!=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&"function"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject&&__REACT_DEVTOOLS_GLOBAL_HOOK__.inject({ComponentTree:{getClosestInstanceFromNode:r.getClosestInstanceFromNode,getNodeFromInstance:function(e){return e._renderedComponent&&(e=c(e)),e?r.getNodeFromInstance(e):null}},Mount:o,Reconciler:a});e.exports=f},function(e,t,n){"use strict";function r(e){if(e){var t=e._currentElement._owner||null;if(t){var n=t.getName();if(n)return" This DOM node was rendered by `"+n+"`."}}return""}function i(e,t){t&&(X[e._tag]&&(null!=t.children||null!=t.dangerouslySetInnerHTML)&&v("137",e._tag,e._currentElement._owner?" Check the render method of "+e._currentElement._owner.getName()+".":""),null!=t.dangerouslySetInnerHTML&&(null!=t.children&&v("60"),"object"==typeof t.dangerouslySetInnerHTML&&W in t.dangerouslySetInnerHTML||v("61")),null!=t.style&&"object"!=typeof t.style&&v("62",r(e)))}function o(e,t,n,r){if(!(r instanceof R)){var i=e._hostContainerInfo,o=i._node&&i._node.nodeType===H,s=o?i._node:i._ownerDocument;q(t,s),r.getReactMountReady().enqueue(a,{inst:e,registrationName:t,listener:n})}}function a(){var e=this;E.putListener(e.inst,e.registrationName,e.listener)}function s(){var e=this;O.postMountWrapper(e)}function u(){var e=this;P.postMountWrapper(e)}function l(){var e=this;M.postMountWrapper(e)}function c(){F.track(this)}function p(){var e=this;e._rootNodeID||v("63");var t=L(e);switch(t||v("64"),e._tag){case"iframe":case"object":e._wrapperState.listeners=[C.trapBubbledEvent("topLoad","load",t)];break;case"video":case"audio":e._wrapperState.listeners=[];for(var n in G)G.hasOwnProperty(n)&&e._wrapperState.listeners.push(C.trapBubbledEvent(n,G[n],t));break;case"source":e._wrapperState.listeners=[C.trapBubbledEvent("topError","error",t)];break;case"img":e._wrapperState.listeners=[C.trapBubbledEvent("topError","error",t),C.trapBubbledEvent("topLoad","load",t)];break;case"form":e._wrapperState.listeners=[C.trapBubbledEvent("topReset","reset",t),C.trapBubbledEvent("topSubmit","submit",t)];break;case"input":case"select":case"textarea":e._wrapperState.listeners=[C.trapBubbledEvent("topInvalid","invalid",t)]}}function f(){T.postUpdateWrapper(this)}function h(e){Z.call($,e)||(Y.test(e)||v("65",e),$[e]=!0)}function d(e,t){return e.indexOf("-")>=0||null!=t.is}function m(e){var t=e.type;h(t),this._currentElement=e,this._tag=t.toLowerCase(),this._namespaceURI=null,this._renderedChildren=null,this._previousStyle=null,this._previousStyleCopy=null,this._hostNode=null,this._hostParent=null,this._rootNodeID=0,this._domID=0,this._hostContainerInfo=null,this._wrapperState=null,this._topLevelWrapper=null,this._flags=0}var v=n(11),g=n(13),y=n(1010),_=n(1012),b=n(88),x=n(241),w=n(89),k=n(452),E=n(122),S=n(242),C=n(159),A=n(453),D=n(14),O=n(1028),M=n(1029),T=n(454),P=n(1032),I=(n(39),n(1041)),R=n(1046),j=(n(32),n(162)),F=(n(8),n(253),n(208),n(466)),N=(n(255),n(10),A),B=E.deleteListener,L=D.getNodeFromInstance,q=C.listenTo,z=S.registrationNameModules,U={string:!0,number:!0},W="__html",V={children:null,dangerouslySetInnerHTML:null,suppressContentEditableWarning:null},H=11,G={topAbort:"abort",topCanPlay:"canplay",topCanPlayThrough:"canplaythrough",topDurationChange:"durationchange",topEmptied:"emptied",topEncrypted:"encrypted",topEnded:"ended",topError:"error",topLoadedData:"loadeddata",topLoadedMetadata:"loadedmetadata",topLoadStart:"loadstart",topPause:"pause",topPlay:"play",topPlaying:"playing",topProgress:"progress",topRateChange:"ratechange",topSeeked:"seeked",topSeeking:"seeking",topStalled:"stalled",topSuspend:"suspend",topTimeUpdate:"timeupdate",topVolumeChange:"volumechange",topWaiting:"waiting"},J={area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},K={listing:!0,pre:!0,textarea:!0},X=g({menuitem:!0},J),Y=/^[a-zA-Z][a-zA-Z:_\.\-\d]*$/,$={},Z={}.hasOwnProperty,Q=1;m.displayName="ReactDOMComponent",m.Mixin={mountComponent:function(e,t,n,r){this._rootNodeID=Q++,this._domID=n._idCounter++,this._hostParent=t,this._hostContainerInfo=n;var o=this._currentElement.props;switch(this._tag){case"audio":case"form":case"iframe":case"img":case"link":case"object":case"source":case"video":this._wrapperState={listeners:null},e.getReactMountReady().enqueue(p,this);break;case"input":O.mountWrapper(this,o,t),o=O.getHostProps(this,o),e.getReactMountReady().enqueue(c,this),e.getReactMountReady().enqueue(p,this);break;case"option":M.mountWrapper(this,o,t),o=M.getHostProps(this,o);break;case"select":T.mountWrapper(this,o,t),o=T.getHostProps(this,o),e.getReactMountReady().enqueue(p,this);break;case"textarea":P.mountWrapper(this,o,t),o=P.getHostProps(this,o),e.getReactMountReady().enqueue(c,this),e.getReactMountReady().enqueue(p,this)}i(this,o);var a,f;null!=t?(a=t._namespaceURI,f=t._tag):n._tag&&(a=n._namespaceURI,f=n._tag),(null==a||a===x.svg&&"foreignobject"===f)&&(a=x.html),a===x.html&&("svg"===this._tag?a=x.svg:"math"===this._tag&&(a=x.mathml)),this._namespaceURI=a;var h;if(e.useCreateElement){var d,m=n._ownerDocument;if(a===x.html)if("script"===this._tag){var v=m.createElement("div"),g=this._currentElement.type;v.innerHTML="<"+g+"></"+g+">",d=v.removeChild(v.firstChild)}else d=o.is?m.createElement(this._currentElement.type,o.is):m.createElement(this._currentElement.type);else d=m.createElementNS(a,this._currentElement.type);D.precacheNode(this,d),this._flags|=N.hasCachedChildNodes,this._hostParent||k.setAttributeForRoot(d),this._updateDOMProperties(null,o,e);var _=b(d);this._createInitialChildren(e,o,r,_),h=_}else{var w=this._createOpenTagMarkupAndPutListeners(e,o),E=this._createContentMarkup(e,o,r);h=!E&&J[this._tag]?w+"/>":w+">"+E+"</"+this._currentElement.type+">"}switch(this._tag){case"input":e.getReactMountReady().enqueue(s,this),o.autoFocus&&e.getReactMountReady().enqueue(y.focusDOMComponent,this);break;case"textarea":e.getReactMountReady().enqueue(u,this),o.autoFocus&&e.getReactMountReady().enqueue(y.focusDOMComponent,this);break;case"select":case"button":o.autoFocus&&e.getReactMountReady().enqueue(y.focusDOMComponent,this);break;case"option":e.getReactMountReady().enqueue(l,this)}return h},_createOpenTagMarkupAndPutListeners:function(e,t){var n="<"+this._currentElement.type;for(var r in t)if(t.hasOwnProperty(r)){var i=t[r];if(null!=i)if(z.hasOwnProperty(r))i&&o(this,r,i,e);else{"style"===r&&(i&&(i=this._previousStyleCopy=g({},t.style)),i=_.createMarkupForStyles(i,this));var a=null;null!=this._tag&&d(this._tag,t)?V.hasOwnProperty(r)||(a=k.createMarkupForCustomAttribute(r,i)):a=k.createMarkupForProperty(r,i),a&&(n+=" "+a)}}return e.renderToStaticMarkup?n:(this._hostParent||(n+=" "+k.createMarkupForRoot()),n+=" "+k.createMarkupForID(this._domID))},_createContentMarkup:function(e,t,n){var r="",i=t.dangerouslySetInnerHTML;if(null!=i)null!=i.__html&&(r=i.__html);else{var o=U[typeof t.children]?t.children:null,a=null!=o?null:t.children;if(null!=o)r=j(o);else if(null!=a){var s=this.mountChildren(a,e,n);r=s.join("")}}return K[this._tag]&&"\n"===r.charAt(0)?"\n"+r:r},_createInitialChildren:function(e,t,n,r){var i=t.dangerouslySetInnerHTML;if(null!=i)null!=i.__html&&b.queueHTML(r,i.__html);else{var o=U[typeof t.children]?t.children:null,a=null!=o?null:t.children;if(null!=o)""!==o&&b.queueText(r,o);else if(null!=a)for(var s=this.mountChildren(a,e,n),u=0;u<s.length;u++)b.queueChild(r,s[u])}},receiveComponent:function(e,t,n){var r=this._currentElement;this._currentElement=e,this.updateComponent(t,r,e,n)},updateComponent:function(e,t,n,r){var o=t.props,a=this._currentElement.props;switch(this._tag){case"input":o=O.getHostProps(this,o),a=O.getHostProps(this,a);break;case"option":o=M.getHostProps(this,o),a=M.getHostProps(this,a);break;case"select":o=T.getHostProps(this,o),a=T.getHostProps(this,a);break;case"textarea":o=P.getHostProps(this,o),a=P.getHostProps(this,a)}switch(i(this,a),this._updateDOMProperties(o,a,e),this._updateDOMChildren(o,a,e,r),this._tag){case"input":O.updateWrapper(this),F.updateValueIfChanged(this);break;case"textarea":P.updateWrapper(this);break;case"select":e.getReactMountReady().enqueue(f,this)}},_updateDOMProperties:function(e,t,n){var r,i,a;for(r in e)if(!t.hasOwnProperty(r)&&e.hasOwnProperty(r)&&null!=e[r])if("style"===r){var s=this._previousStyleCopy;for(i in s)s.hasOwnProperty(i)&&(a=a||{},a[i]="");this._previousStyleCopy=null}else z.hasOwnProperty(r)?e[r]&&B(this,r):d(this._tag,e)?V.hasOwnProperty(r)||k.deleteValueForAttribute(L(this),r):(w.properties[r]||w.isCustomAttribute(r))&&k.deleteValueForProperty(L(this),r);for(r in t){var u=t[r],l="style"===r?this._previousStyleCopy:null!=e?e[r]:void 0;if(t.hasOwnProperty(r)&&u!==l&&(null!=u||null!=l))if("style"===r)if(u?u=this._previousStyleCopy=g({},u):this._previousStyleCopy=null,l){for(i in l)!l.hasOwnProperty(i)||u&&u.hasOwnProperty(i)||(a=a||{},a[i]="");for(i in u)u.hasOwnProperty(i)&&l[i]!==u[i]&&(a=a||{},a[i]=u[i])}else a=u;else if(z.hasOwnProperty(r))u?o(this,r,u,n):l&&B(this,r);else if(d(this._tag,t))V.hasOwnProperty(r)||k.setValueForAttribute(L(this),r,u);else if(w.properties[r]||w.isCustomAttribute(r)){var c=L(this);null!=u?k.setValueForProperty(c,r,u):k.deleteValueForProperty(c,r)}}a&&_.setValueForStyles(L(this),a,this)},_updateDOMChildren:function(e,t,n,r){var i=U[typeof e.children]?e.children:null,o=U[typeof t.children]?t.children:null,a=e.dangerouslySetInnerHTML&&e.dangerouslySetInnerHTML.__html,s=t.dangerouslySetInnerHTML&&t.dangerouslySetInnerHTML.__html,u=null!=i?null:e.children,l=null!=o?null:t.children,c=null!=i||null!=a,p=null!=o||null!=s;null!=u&&null==l?this.updateChildren(null,n,r):c&&!p&&this.updateTextContent(""),null!=o?i!==o&&this.updateTextContent(""+o):null!=s?a!==s&&this.updateMarkup(""+s):null!=l&&this.updateChildren(l,n,r)},getHostNode:function(){return L(this)},unmountComponent:function(e){switch(this._tag){case"audio":case"form":case"iframe":case"img":case"link":case"object":case"source":case"video":var t=this._wrapperState.listeners;if(t)for(var n=0;n<t.length;n++)t[n].remove();break;case"input":case"textarea":F.stopTracking(this);break;case"html":case"head":case"body":v("66",this._tag)}this.unmountChildren(e),D.uncacheNode(this),E.deleteAllListeners(this),this._rootNodeID=0,this._domID=0,this._wrapperState=null},getPublicInstance:function(){return L(this)}},g(m.prototype,m.Mixin,I.Mixin),e.exports=m},function(e,t,n){"use strict";function r(e,t){var n={_topLevelWrapper:e,_idCounter:1,_ownerDocument:t?t.nodeType===i?t:t.ownerDocument:null,_node:t,_tag:t?t.nodeName.toLowerCase():null,_namespaceURI:t?t.namespaceURI:null};return n}var i=(n(255),9);e.exports=r},function(e,t,n){"use strict";var r=n(13),i=n(88),o=n(14),a=function(e){this._currentElement=null,this._hostNode=null,this._hostParent=null,this._hostContainerInfo=null,this._domID=0};r(a.prototype,{mountComponent:function(e,t,n,r){var a=n._idCounter++;this._domID=a,this._hostParent=t,this._hostContainerInfo=n;var s=" react-empty: "+this._domID+" ";if(e.useCreateElement){var u=n._ownerDocument,l=u.createComment(s);return o.precacheNode(this,l),i(l)}return e.renderToStaticMarkup?"":"\x3c!--"+s+"--\x3e"},receiveComponent:function(){},getHostNode:function(){return o.getNodeFromInstance(this)},unmountComponent:function(){o.uncacheNode(this)}}),e.exports=a},function(e,t,n){"use strict";var r={useCreateElement:!0,useFiber:!1};e.exports=r},function(e,t,n){"use strict";var r=n(240),i=n(14),o={dangerouslyProcessChildrenUpdates:function(e,t){var n=i.getNodeFromInstance(e);r.processUpdates(n,t)}};e.exports=o},function(e,t,n){"use strict";function r(){this._rootNodeID&&f.updateWrapper(this)}function i(e){return"checkbox"===e.type||"radio"===e.type?null!=e.checked:null!=e.value}function o(e){var t=this._currentElement.props,n=l.executeOnChange(t,e);p.asap(r,this);var i=t.name;if("radio"===t.type&&null!=i){for(var o=c.getNodeFromInstance(this),s=o;s.parentNode;)s=s.parentNode;for(var u=s.querySelectorAll("input[name="+JSON.stringify(""+i)+'][type="radio"]'),f=0;f<u.length;f++){var h=u[f];if(h!==o&&h.form===o.form){var d=c.getInstanceFromNode(h);d||a("90"),p.asap(r,d)}}}return n}var a=n(11),s=n(13),u=n(452),l=n(245),c=n(14),p=n(44),f=(n(8),n(10),{getHostProps:function(e,t){var n=l.getValue(t),r=l.getChecked(t);return s({type:void 0,step:void 0,min:void 0,max:void 0},t,{defaultChecked:void 0,defaultValue:void 0,value:null!=n?n:e._wrapperState.initialValue,checked:null!=r?r:e._wrapperState.initialChecked,onChange:e._wrapperState.onChange})},mountWrapper:function(e,t){var n=t.defaultValue;e._wrapperState={initialChecked:null!=t.checked?t.checked:t.defaultChecked,initialValue:null!=t.value?t.value:n,listeners:null,onChange:o.bind(e),controlled:i(t)}},updateWrapper:function(e){var t=e._currentElement.props,n=t.checked;null!=n&&u.setValueForProperty(c.getNodeFromInstance(e),"checked",n||!1);var r=c.getNodeFromInstance(e),i=l.getValue(t);if(null!=i)if(0===i&&""===r.value)r.value="0";else if("number"===t.type){var o=parseFloat(r.value,10)||0;(i!=o||i==o&&r.value!=i)&&(r.value=""+i)}else r.value!==""+i&&(r.value=""+i);else null==t.value&&null!=t.defaultValue&&r.defaultValue!==""+t.defaultValue&&(r.defaultValue=""+t.defaultValue),null==t.checked&&null!=t.defaultChecked&&(r.defaultChecked=!!t.defaultChecked)},postMountWrapper:function(e){var t=e._currentElement.props,n=c.getNodeFromInstance(e);switch(t.type){case"submit":case"reset":break;case"color":case"date":case"datetime":case"datetime-local":case"month":case"time":case"week":n.value="",n.value=n.defaultValue;break;default:n.value=n.value}var r=n.name;""!==r&&(n.name=""),n.defaultChecked=!n.defaultChecked,n.defaultChecked=!n.defaultChecked,""!==r&&(n.name=r)}});e.exports=f},function(e,t,n){"use strict";function r(e){var t="";return o.Children.forEach(e,function(e){null!=e&&("string"==typeof e||"number"==typeof e?t+=e:u||(u=!0))}),t}var i=n(13),o=n(92),a=n(14),s=n(454),u=(n(10),!1),l={mountWrapper:function(e,t,n){var i=null;if(null!=n){var o=n;"optgroup"===o._tag&&(o=o._hostParent),null!=o&&"select"===o._tag&&(i=s.getSelectValueContext(o))}var a=null;if(null!=i){var u;if(u=null!=t.value?t.value+"":r(t.children),a=!1,Array.isArray(i)){for(var l=0;l<i.length;l++)if(""+i[l]===u){a=!0;break}}else a=""+i===u}e._wrapperState={selected:a}},postMountWrapper:function(e){var t=e._currentElement.props;if(null!=t.value){a.getNodeFromInstance(e).setAttribute("value",t.value)}},getHostProps:function(e,t){var n=i({selected:void 0,children:void 0},t);null!=e._wrapperState.selected&&(n.selected=e._wrapperState.selected);var o=r(t.children);return o&&(n.children=o),n}};e.exports=l},function(e,t,n){"use strict";function r(e,t,n,r){return e===n&&t===r}function i(e){var t=document.selection,n=t.createRange(),r=n.text.length,i=n.duplicate();i.moveToElementText(e),i.setEndPoint("EndToStart",n);var o=i.text.length;return{start:o,end:o+r}}function o(e){var t=window.getSelection&&window.getSelection();if(!t||0===t.rangeCount)return null;var n=t.anchorNode,i=t.anchorOffset,o=t.focusNode,a=t.focusOffset,s=t.getRangeAt(0);try{s.startContainer.nodeType,s.endContainer.nodeType}catch(e){return null}var u=r(t.anchorNode,t.anchorOffset,t.focusNode,t.focusOffset),l=u?0:s.toString().length,c=s.cloneRange();c.selectNodeContents(e),c.setEnd(s.startContainer,s.startOffset);var p=r(c.startContainer,c.startOffset,c.endContainer,c.endOffset),f=p?0:c.toString().length,h=f+l,d=document.createRange();d.setStart(n,i),d.setEnd(o,a);var m=d.collapsed;return{start:m?h:f,end:m?f:h}}function a(e,t){var n,r,i=document.selection.createRange().duplicate();void 0===t.end?(n=t.start,r=n):t.start>t.end?(n=t.end,r=t.start):(n=t.start,r=t.end),i.moveToElementText(e),i.moveStart("character",n),i.setEndPoint("EndToStart",i),i.moveEnd("character",r-n),i.select()}function s(e,t){if(window.getSelection){var n=window.getSelection(),r=e[c()].length,i=Math.min(t.start,r),o=void 0===t.end?i:Math.min(t.end,r);if(!n.extend&&i>o){var a=o;o=i,i=a}var s=l(e,i),u=l(e,o);if(s&&u){var p=document.createRange();p.setStart(s.node,s.offset),n.removeAllRanges(),i>o?(n.addRange(p),n.extend(u.node,u.offset)):(p.setEnd(u.node,u.offset),n.addRange(p))}}}var u=n(25),l=n(1068),c=n(465),p=u.canUseDOM&&"selection"in document&&!("getSelection"in window),f={getOffsets:p?i:o,setOffsets:p?a:s};e.exports=f},function(e,t,n){"use strict";var r=n(11),i=n(13),o=n(240),a=n(88),s=n(14),u=n(162),l=(n(8),n(255),function(e){this._currentElement=e,this._stringText=""+e,this._hostNode=null,this._hostParent=null,this._domID=0,this._mountIndex=0,this._closingComment=null,this._commentNodes=null});i(l.prototype,{mountComponent:function(e,t,n,r){var i=n._idCounter++,o=" react-text: "+i+" ";if(this._domID=i,this._hostParent=t,e.useCreateElement){var l=n._ownerDocument,c=l.createComment(o),p=l.createComment(" /react-text "),f=a(l.createDocumentFragment());return a.queueChild(f,a(c)),this._stringText&&a.queueChild(f,a(l.createTextNode(this._stringText))),a.queueChild(f,a(p)),s.precacheNode(this,c),this._closingComment=p,f}var h=u(this._stringText);return e.renderToStaticMarkup?h:"\x3c!--"+o+"--\x3e"+h+"\x3c!-- /react-text --\x3e"},receiveComponent:function(e,t){if(e!==this._currentElement){this._currentElement=e;var n=""+e;if(n!==this._stringText){this._stringText=n;var r=this.getHostNode();o.replaceDelimitedText(r[0],r[1],n)}}},getHostNode:function(){var e=this._commentNodes;if(e)return e;if(!this._closingComment)for(var t=s.getNodeFromInstance(this),n=t.nextSibling;;){if(null==n&&r("67",this._domID),8===n.nodeType&&" /react-text "===n.nodeValue){this._closingComment=n;break}n=n.nextSibling}return e=[this._hostNode,this._closingComment],this._commentNodes=e,e},unmountComponent:function(){this._closingComment=null,this._commentNodes=null,s.uncacheNode(this)}}),e.exports=l},function(e,t,n){"use strict";function r(){this._rootNodeID&&c.updateWrapper(this)}function i(e){var t=this._currentElement.props,n=s.executeOnChange(t,e);return l.asap(r,this),n}var o=n(11),a=n(13),s=n(245),u=n(14),l=n(44),c=(n(8),n(10),{getHostProps:function(e,t){return null!=t.dangerouslySetInnerHTML&&o("91"),a({},t,{value:void 0,defaultValue:void 0,children:""+e._wrapperState.initialValue,onChange:e._wrapperState.onChange})},mountWrapper:function(e,t){var n=s.getValue(t),r=n;if(null==n){var a=t.defaultValue,u=t.children;null!=u&&(null!=a&&o("92"),Array.isArray(u)&&(u.length<=1||o("93"),u=u[0]),a=""+u),null==a&&(a=""),r=a}e._wrapperState={initialValue:""+r,listeners:null,onChange:i.bind(e)}},updateWrapper:function(e){var t=e._currentElement.props,n=u.getNodeFromInstance(e),r=s.getValue(t);if(null!=r){var i=""+r;i!==n.value&&(n.value=i),null==t.defaultValue&&(n.defaultValue=i)}null!=t.defaultValue&&(n.defaultValue=t.defaultValue)},postMountWrapper:function(e){var t=u.getNodeFromInstance(e),n=t.textContent;n===e._wrapperState.initialValue&&(t.value=n)}});e.exports=c},function(e,t,n){"use strict";function r(e,t){"_hostNode"in e||u("33"),"_hostNode"in t||u("33");for(var n=0,r=e;r;r=r._hostParent)n++;for(var i=0,o=t;o;o=o._hostParent)i++;for(;n-i>0;)e=e._hostParent,n--;for(;i-n>0;)t=t._hostParent,i--;for(var a=n;a--;){if(e===t)return e;e=e._hostParent,t=t._hostParent}return null}function i(e,t){"_hostNode"in e||u("35"),"_hostNode"in t||u("35");for(;t;){if(t===e)return!0;t=t._hostParent}return!1}function o(e){return"_hostNode"in e||u("36"),e._hostParent}function a(e,t,n){for(var r=[];e;)r.push(e),e=e._hostParent;var i;for(i=r.length;i-- >0;)t(r[i],"captured",n);for(i=0;i<r.length;i++)t(r[i],"bubbled",n)}function s(e,t,n,i,o){for(var a=e&&t?r(e,t):null,s=[];e&&e!==a;)s.push(e),e=e._hostParent;for(var u=[];t&&t!==a;)u.push(t),t=t._hostParent;var l;for(l=0;l<s.length;l++)n(s[l],"bubbled",i);for(l=u.length;l-- >0;)n(u[l],"captured",o)}var u=n(11);n(8);e.exports={isAncestor:i,getLowestCommonAncestor:r,getParentInstance:o,traverseTwoPhase:a,traverseEnterLeave:s}},function(e,t,n){"use strict";function r(){this.reinitializeTransaction()}var i=n(13),o=n(44),a=n(161),s=n(32),u={initialize:s,close:function(){f.isBatchingUpdates=!1}},l={initialize:s,close:o.flushBatchedUpdates.bind(o)},c=[l,u];i(r.prototype,a,{getTransactionWrappers:function(){return c}});var p=new r,f={isBatchingUpdates:!1,batchedUpdates:function(e,t,n,r,i,o){var a=f.isBatchingUpdates;return f.isBatchingUpdates=!0,a?e(t,n,r,i,o):p.perform(e,null,t,n,r,i,o)}};e.exports=f},function(e,t,n){"use strict";function r(){k||(k=!0,y.EventEmitter.injectReactEventListener(g),y.EventPluginHub.injectEventPluginOrder(s),y.EventPluginUtils.injectComponentTree(f),y.EventPluginUtils.injectTreeTraversal(d),y.EventPluginHub.injectEventPluginsByName({SimpleEventPlugin:w,EnterLeaveEventPlugin:u,ChangeEventPlugin:a,SelectEventPlugin:x,BeforeInputEventPlugin:o}),y.HostComponent.injectGenericComponentClass(p),y.HostComponent.injectTextComponentClass(m),y.DOMProperty.injectDOMPropertyConfig(i),y.DOMProperty.injectDOMPropertyConfig(l),y.DOMProperty.injectDOMPropertyConfig(b),y.EmptyComponent.injectEmptyComponentFactory(function(e){return new h(e)}),y.Updates.injectReconcileTransaction(_),y.Updates.injectBatchingStrategy(v),y.Component.injectEnvironment(c))}var i=n(1009),o=n(1011),a=n(1013),s=n(1015),u=n(1016),l=n(1018),c=n(1020),p=n(1023),f=n(14),h=n(1025),d=n(1033),m=n(1031),v=n(1034),g=n(1038),y=n(1039),_=n(1044),b=n(1049),x=n(1050),w=n(1051),k=!1;e.exports={inject:r}},function(e,t,n){"use strict";var r="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103;e.exports=r},function(e,t,n){"use strict";function r(e){i.enqueueEvents(e),i.processEventQueue(!1)}var i=n(122),o={handleTopLevel:function(e,t,n,o){r(i.extractEvents(e,t,n,o))}};e.exports=o},function(e,t,n){"use strict";function r(e){for(;e._hostParent;)e=e._hostParent;var t=p.getNodeFromInstance(e),n=t.parentNode;return p.getClosestInstanceFromNode(n)}function i(e,t){this.topLevelType=e,this.nativeEvent=t,this.ancestors=[]}function o(e){var t=h(e.nativeEvent),n=p.getClosestInstanceFromNode(t),i=n;do{e.ancestors.push(i),i=i&&r(i)}while(i);for(var o=0;o<e.ancestors.length;o++)n=e.ancestors[o],m._handleTopLevel(e.topLevelType,n,e.nativeEvent,h(e.nativeEvent))}function a(e){e(d(window))}var s=n(13),u=n(377),l=n(25),c=n(70),p=n(14),f=n(44),h=n(252),d=n(752);s(i.prototype,{destructor:function(){this.topLevelType=null,this.nativeEvent=null,this.ancestors.length=0}}),c.addPoolingTo(i,c.twoArgumentPooler);var m={_enabled:!0,_handleTopLevel:null,WINDOW_HANDLE:l.canUseDOM?window:null,setHandleTopLevel:function(e){m._handleTopLevel=e},setEnabled:function(e){m._enabled=!!e},isEnabled:function(){return m._enabled},trapBubbledEvent:function(e,t,n){return n?u.listen(n,t,m.dispatchEvent.bind(null,e)):null},trapCapturedEvent:function(e,t,n){return n?u.capture(n,t,m.dispatchEvent.bind(null,e)):null},monitorScrollValue:function(e){var t=a.bind(null,e);u.listen(window,"scroll",t)},dispatchEvent:function(e,t){if(m._enabled){var n=i.getPooled(e,t);try{f.batchedUpdates(o,n)}finally{i.release(n)}}}};e.exports=m},function(e,t,n){"use strict";var r=n(89),i=n(122),o=n(243),a=n(246),s=n(455),u=n(159),l=n(457),c=n(44),p={Component:a.injection,DOMProperty:r.injection,EmptyComponent:s.injection,EventPluginHub:i.injection,EventPluginUtils:o.injection,EventEmitter:u.injection,HostComponent:l.injection,Updates:c.injection};e.exports=p},function(e,t,n){"use strict";var r=n(1062),i=/\/?>/,o=/^<\!\-\-/,a={CHECKSUM_ATTR_NAME:"data-react-checksum",addChecksumToMarkup:function(e){var t=r(e);return o.test(e)?e:e.replace(i," "+a.CHECKSUM_ATTR_NAME+'="'+t+'"$&')},canReuseMarkup:function(e,t){var n=t.getAttribute(a.CHECKSUM_ATTR_NAME);return n=n&&parseInt(n,10),r(e)===n}};e.exports=a},function(e,t,n){"use strict";function r(e,t,n){return{type:"INSERT_MARKUP",content:e,fromIndex:null,fromNode:null,toIndex:n,afterNode:t}}function i(e,t,n){return{type:"MOVE_EXISTING",content:null,fromIndex:e._mountIndex,fromNode:f.getHostNode(e),toIndex:n,afterNode:t}}function o(e,t){return{type:"REMOVE_NODE",content:null,fromIndex:e._mountIndex,fromNode:t,toIndex:null,afterNode:null}}function a(e){return{type:"SET_MARKUP",content:e,fromIndex:null,fromNode:null,toIndex:null,afterNode:null}}function s(e){return{type:"TEXT_CONTENT",content:e,fromIndex:null,fromNode:null,toIndex:null,afterNode:null}}function u(e,t){return t&&(e=e||[],e.push(t)),e}function l(e,t){p.processChildrenUpdates(e,t)}var c=n(11),p=n(246),f=(n(124),n(39),n(52),n(90)),h=n(1019),d=(n(32),n(1065)),m=(n(8),{Mixin:{_reconcilerInstantiateChildren:function(e,t,n){return h.instantiateChildren(e,t,n)},_reconcilerUpdateChildren:function(e,t,n,r,i,o){var a,s=0;return a=d(t,s),h.updateChildren(e,a,n,r,i,this,this._hostContainerInfo,o,s),a},mountChildren:function(e,t,n){var r=this._reconcilerInstantiateChildren(e,t,n);this._renderedChildren=r;var i=[],o=0;for(var a in r)if(r.hasOwnProperty(a)){var s=r[a],u=0,l=f.mountComponent(s,t,this,this._hostContainerInfo,n,u);s._mountIndex=o++,i.push(l)}return i},updateTextContent:function(e){var t=this._renderedChildren;h.unmountChildren(t,!1);for(var n in t)t.hasOwnProperty(n)&&c("118");l(this,[s(e)])},updateMarkup:function(e){var t=this._renderedChildren;h.unmountChildren(t,!1);for(var n in t)t.hasOwnProperty(n)&&c("118");l(this,[a(e)])},updateChildren:function(e,t,n){this._updateChildren(e,t,n)},_updateChildren:function(e,t,n){var r=this._renderedChildren,i={},o=[],a=this._reconcilerUpdateChildren(r,e,o,i,t,n);if(a||r){var s,c=null,p=0,h=0,d=0,m=null;for(s in a)if(a.hasOwnProperty(s)){var v=r&&r[s],g=a[s];v===g?(c=u(c,this.moveChild(v,m,p,h)),h=Math.max(v._mountIndex,h),v._mountIndex=p):(v&&(h=Math.max(v._mountIndex,h)),c=u(c,this._mountChildAtIndex(g,o[d],m,p,t,n)),d++),p++,m=f.getHostNode(g)}for(s in i)i.hasOwnProperty(s)&&(c=u(c,this._unmountChild(r[s],i[s])));c&&l(this,c),this._renderedChildren=a}},unmountChildren:function(e){var t=this._renderedChildren;h.unmountChildren(t,e),this._renderedChildren=null},moveChild:function(e,t,n,r){if(e._mountIndex<r)return i(e,t,n)},createChild:function(e,t,n){return r(n,t,e._mountIndex)},removeChild:function(e,t){return o(e,t)},_mountChildAtIndex:function(e,t,n,r,i,o){return e._mountIndex=r,this.createChild(e,n,t)},_unmountChild:function(e,t){var n=this.removeChild(e,t);return e._mountIndex=null,n}}});e.exports=m},function(e,t,n){"use strict";function r(e){return!(!e||"function"!=typeof e.attachRef||"function"!=typeof e.detachRef)}var i=n(11),o=(n(8),{addComponentAsRefTo:function(e,t,n){r(n)||i("119"),n.attachRef(t,e)},removeComponentAsRefFrom:function(e,t,n){r(n)||i("120");var o=n.getPublicInstance();o&&o.refs[t]===e.getPublicInstance()&&n.detachRef(t)}});e.exports=o},function(e,t,n){"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},function(e,t,n){"use strict";function r(e){this.reinitializeTransaction(),this.renderToStaticMarkup=!1,this.reactMountReady=o.getPooled(null),this.useCreateElement=e}var i=n(13),o=n(451),a=n(70),s=n(159),u=n(458),l=(n(39),n(161)),c=n(248),p={initialize:u.getSelectionInformation,close:u.restoreSelection},f={initialize:function(){var e=s.isEnabled();return s.setEnabled(!1),e},close:function(e){s.setEnabled(e)}},h={initialize:function(){this.reactMountReady.reset()},close:function(){this.reactMountReady.notifyAll()}},d=[p,f,h],m={getTransactionWrappers:function(){return d},getReactMountReady:function(){return this.reactMountReady},getUpdateQueue:function(){return c},checkpoint:function(){return this.reactMountReady.checkpoint()},rollback:function(e){this.reactMountReady.rollback(e)},destructor:function(){o.release(this.reactMountReady),this.reactMountReady=null}};i(r.prototype,l,m),a.addPoolingTo(r),e.exports=r},function(e,t,n){"use strict";function r(e,t,n){"function"==typeof e?e(t.getPublicInstance()):o.addComponentAsRefTo(t,e,n)}function i(e,t,n){"function"==typeof e?e(null):o.removeComponentAsRefFrom(t,e,n)}var o=n(1042),a={};a.attachRefs=function(e,t){if(null!==t&&"object"==typeof t){var n=t.ref;null!=n&&r(n,e,t._owner)}},a.shouldUpdateRefs=function(e,t){var n=null,r=null;null!==e&&"object"==typeof e&&(n=e.ref,r=e._owner);var i=null,o=null;return null!==t&&"object"==typeof t&&(i=t.ref,o=t._owner),n!==i||"string"==typeof i&&o!==r},a.detachRefs=function(e,t){if(null!==t&&"object"==typeof t){var n=t.ref;null!=n&&i(n,e,t._owner)}},e.exports=a},function(e,t,n){"use strict";function r(e){this.reinitializeTransaction(),this.renderToStaticMarkup=e,this.useCreateElement=!1,this.updateQueue=new s(this)}var i=n(13),o=n(70),a=n(161),s=(n(39),n(1047)),u=[],l={enqueue:function(){}},c={getTransactionWrappers:function(){return u},getReactMountReady:function(){return l},getUpdateQueue:function(){return this.updateQueue},destructor:function(){},checkpoint:function(){},rollback:function(){}};i(r.prototype,a,c),o.addPoolingTo(r),e.exports=r},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var i=n(248),o=(n(10),function(){function e(t){r(this,e),this.transaction=t}return e.prototype.isMounted=function(e){return!1},e.prototype.enqueueCallback=function(e,t,n){this.transaction.isInTransaction()&&i.enqueueCallback(e,t,n)},e.prototype.enqueueForceUpdate=function(e){this.transaction.isInTransaction()&&i.enqueueForceUpdate(e)},e.prototype.enqueueReplaceState=function(e,t){this.transaction.isInTransaction()&&i.enqueueReplaceState(e,t)},e.prototype.enqueueSetState=function(e,t){this.transaction.isInTransaction()&&i.enqueueSetState(e,t)},e}());e.exports=o},function(e,t,n){"use strict";e.exports="15.6.2"},function(e,t,n){"use strict";var r={xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace"},i={accentHeight:"accent-height",accumulate:0,additive:0,alignmentBaseline:"alignment-baseline",allowReorder:"allowReorder",alphabetic:0,amplitude:0,arabicForm:"arabic-form",ascent:0,attributeName:"attributeName",attributeType:"attributeType",autoReverse:"autoReverse",azimuth:0,baseFrequency:"baseFrequency",baseProfile:"baseProfile",baselineShift:"baseline-shift",bbox:0,begin:0,bias:0,by:0,calcMode:"calcMode",capHeight:"cap-height",clip:0,clipPath:"clip-path",clipRule:"clip-rule",clipPathUnits:"clipPathUnits",colorInterpolation:"color-interpolation",colorInterpolationFilters:"color-interpolation-filters",colorProfile:"color-profile",colorRendering:"color-rendering",contentScriptType:"contentScriptType",contentStyleType:"contentStyleType",cursor:0,cx:0,cy:0,d:0,decelerate:0,descent:0,diffuseConstant:"diffuseConstant",direction:0,display:0,divisor:0,dominantBaseline:"dominant-baseline",dur:0,dx:0,dy:0,edgeMode:"edgeMode",elevation:0,enableBackground:"enable-background",end:0,exponent:0,externalResourcesRequired:"externalResourcesRequired",fill:0,fillOpacity:"fill-opacity",fillRule:"fill-rule",filter:0,filterRes:"filterRes",filterUnits:"filterUnits",floodColor:"flood-color",floodOpacity:"flood-opacity",focusable:0,fontFamily:"font-family",fontSize:"font-size",fontSizeAdjust:"font-size-adjust",fontStretch:"font-stretch",fontStyle:"font-style",fontVariant:"font-variant",fontWeight:"font-weight",format:0,from:0,fx:0,fy:0,g1:0,g2:0,glyphName:"glyph-name",glyphOrientationHorizontal:"glyph-orientation-horizontal",glyphOrientationVertical:"glyph-orientation-vertical",glyphRef:"glyphRef",gradientTransform:"gradientTransform",gradientUnits:"gradientUnits",hanging:0,horizAdvX:"horiz-adv-x",horizOriginX:"horiz-origin-x",ideographic:0,imageRendering:"image-rendering",in:0,in2:0,intercept:0,k:0,k1:0,k2:0,k3:0,k4:0,kernelMatrix:"kernelMatrix",kernelUnitLength:"kernelUnitLength",kerning:0,keyPoints:"keyPoints",keySplines:"keySplines",keyTimes:"keyTimes",lengthAdjust:"lengthAdjust",letterSpacing:"letter-spacing",lightingColor:"lighting-color",limitingConeAngle:"limitingConeAngle",local:0,markerEnd:"marker-end",markerMid:"marker-mid",markerStart:"marker-start",markerHeight:"markerHeight",markerUnits:"markerUnits",markerWidth:"markerWidth",mask:0,maskContentUnits:"maskContentUnits",maskUnits:"maskUnits",mathematical:0,mode:0,numOctaves:"numOctaves",offset:0,opacity:0,operator:0,order:0,orient:0,orientation:0,origin:0,overflow:0,overlinePosition:"overline-position",overlineThickness:"overline-thickness",paintOrder:"paint-order",panose1:"panose-1",pathLength:"pathLength",patternContentUnits:"patternContentUnits",patternTransform:"patternTransform",patternUnits:"patternUnits",pointerEvents:"pointer-events",points:0,pointsAtX:"pointsAtX",pointsAtY:"pointsAtY",pointsAtZ:"pointsAtZ",preserveAlpha:"preserveAlpha",preserveAspectRatio:"preserveAspectRatio",primitiveUnits:"primitiveUnits",r:0,radius:0,refX:"refX",refY:"refY",renderingIntent:"rendering-intent",repeatCount:"repeatCount",repeatDur:"repeatDur",requiredExtensions:"requiredExtensions",requiredFeatures:"requiredFeatures",restart:0,result:0,rotate:0,rx:0,ry:0,scale:0,seed:0,shapeRendering:"shape-rendering",slope:0,spacing:0,specularConstant:"specularConstant",specularExponent:"specularExponent",speed:0,spreadMethod:"spreadMethod",startOffset:"startOffset",stdDeviation:"stdDeviation",stemh:0,stemv:0,stitchTiles:"stitchTiles",stopColor:"stop-color",stopOpacity:"stop-opacity",strikethroughPosition:"strikethrough-position",strikethroughThickness:"strikethrough-thickness",string:0,stroke:0,strokeDasharray:"stroke-dasharray",strokeDashoffset:"stroke-dashoffset",strokeLinecap:"stroke-linecap",strokeLinejoin:"stroke-linejoin",strokeMiterlimit:"stroke-miterlimit",strokeOpacity:"stroke-opacity",strokeWidth:"stroke-width",surfaceScale:"surfaceScale",systemLanguage:"systemLanguage",tableValues:"tableValues",targetX:"targetX",targetY:"targetY",textAnchor:"text-anchor",textDecoration:"text-decoration",textRendering:"text-rendering",textLength:"textLength",to:0,transform:0,u1:0,u2:0,underlinePosition:"underline-position",underlineThickness:"underline-thickness",unicode:0,unicodeBidi:"unicode-bidi",unicodeRange:"unicode-range",unitsPerEm:"units-per-em",vAlphabetic:"v-alphabetic",vHanging:"v-hanging",vIdeographic:"v-ideographic",vMathematical:"v-mathematical",values:0,vectorEffect:"vector-effect",version:0,vertAdvY:"vert-adv-y",vertOriginX:"vert-origin-x",vertOriginY:"vert-origin-y",viewBox:"viewBox",viewTarget:"viewTarget",visibility:0,widths:0,wordSpacing:"word-spacing",writingMode:"writing-mode",x:0,xHeight:"x-height",x1:0,x2:0,xChannelSelector:"xChannelSelector",xlinkActuate:"xlink:actuate",xlinkArcrole:"xlink:arcrole",xlinkHref:"xlink:href",xlinkRole:"xlink:role",xlinkShow:"xlink:show",xlinkTitle:"xlink:title",xlinkType:"xlink:type",xmlBase:"xml:base",xmlns:0,xmlnsXlink:"xmlns:xlink",xmlLang:"xml:lang",xmlSpace:"xml:space",y:0,y1:0,y2:0,yChannelSelector:"yChannelSelector",z:0,zoomAndPan:"zoomAndPan"},o={Properties:{},DOMAttributeNamespaces:{xlinkActuate:r.xlink,xlinkArcrole:r.xlink,xlinkHref:r.xlink,xlinkRole:r.xlink,xlinkShow:r.xlink,xlinkTitle:r.xlink,xlinkType:r.xlink,xmlBase:r.xml,xmlLang:r.xml,xmlSpace:r.xml},DOMAttributeNames:{}};Object.keys(i).forEach(function(e){o.Properties[e]=0,i[e]&&(o.DOMAttributeNames[e]=i[e])}),e.exports=o},function(e,t,n){"use strict";function r(e){if("selectionStart"in e&&u.hasSelectionCapabilities(e))return{start:e.selectionStart,end:e.selectionEnd};if(window.getSelection){var t=window.getSelection();return{anchorNode:t.anchorNode,anchorOffset:t.anchorOffset,focusNode:t.focusNode,focusOffset:t.focusOffset}}if(document.selection){var n=document.selection.createRange();return{parentElement:n.parentElement(),text:n.text,top:n.boundingTop,left:n.boundingLeft}}}function i(e,t){if(y||null==m||m!==c())return null;var n=r(m);if(!g||!f(g,n)){g=n;var i=l.getPooled(d.select,v,e,t);return i.type="select",i.target=m,o.accumulateTwoPhaseDispatches(i),i}return null}var o=n(123),a=n(25),s=n(14),u=n(458),l=n(51),c=n(379),p=n(468),f=n(208),h=a.canUseDOM&&"documentMode"in document&&document.documentMode<=11,d={select:{phasedRegistrationNames:{bubbled:"onSelect",captured:"onSelectCapture"},dependencies:["topBlur","topContextMenu","topFocus","topKeyDown","topKeyUp","topMouseDown","topMouseUp","topSelectionChange"]}},m=null,v=null,g=null,y=!1,_=!1,b={eventTypes:d,extractEvents:function(e,t,n,r){if(!_)return null;var o=t?s.getNodeFromInstance(t):window;switch(e){case"topFocus":(p(o)||"true"===o.contentEditable)&&(m=o,v=t,g=null);break;case"topBlur":m=null,v=null,g=null;break;case"topMouseDown":y=!0;break;case"topContextMenu":case"topMouseUp":return y=!1,i(n,r);case"topSelectionChange":if(h)break;case"topKeyDown":case"topKeyUp":return i(n,r)}return null},didPutListener:function(e,t,n){"onSelect"===t&&(_=!0)}};e.exports=b},function(e,t,n){"use strict";function r(e){return"."+e._rootNodeID}function i(e){return"button"===e||"input"===e||"select"===e||"textarea"===e}var o=n(11),a=n(377),s=n(123),u=n(14),l=n(1052),c=n(1053),p=n(51),f=n(1056),h=n(1058),d=n(160),m=n(1055),v=n(1059),g=n(1060),y=n(125),_=n(1061),b=n(32),x=n(250),w=(n(8),{}),k={};["abort","animationEnd","animationIteration","animationStart","blur","canPlay","canPlayThrough","click","contextMenu","copy","cut","doubleClick","drag","dragEnd","dragEnter","dragExit","dragLeave","dragOver","dragStart","drop","durationChange","emptied","encrypted","ended","error","focus","input","invalid","keyDown","keyPress","keyUp","load","loadedData","loadedMetadata","loadStart","mouseDown","mouseMove","mouseOut","mouseOver","mouseUp","paste","pause","play","playing","progress","rateChange","reset","scroll","seeked","seeking","stalled","submit","suspend","timeUpdate","touchCancel","touchEnd","touchMove","touchStart","transitionEnd","volumeChange","waiting","wheel"].forEach(function(e){var t=e[0].toUpperCase()+e.slice(1),n="on"+t,r="top"+t,i={phasedRegistrationNames:{bubbled:n,captured:n+"Capture"},dependencies:[r]};w[e]=i,k[r]=i});var E={},S={eventTypes:w,extractEvents:function(e,t,n,r){var i=k[e];if(!i)return null;var a;switch(e){case"topAbort":case"topCanPlay":case"topCanPlayThrough":case"topDurationChange":case"topEmptied":case"topEncrypted":case"topEnded":case"topError":case"topInput":case"topInvalid":case"topLoad":case"topLoadedData":case"topLoadedMetadata":case"topLoadStart":case"topPause":case"topPlay":case"topPlaying":case"topProgress":case"topRateChange":case"topReset":case"topSeeked":case"topSeeking":case"topStalled":case"topSubmit":case"topSuspend":case"topTimeUpdate":case"topVolumeChange":case"topWaiting":a=p;break;case"topKeyPress":if(0===x(n))return null;case"topKeyDown":case"topKeyUp":a=h;break;case"topBlur":case"topFocus":a=f;break;case"topClick":if(2===n.button)return null;case"topDoubleClick":case"topMouseDown":case"topMouseMove":case"topMouseUp":case"topMouseOut":case"topMouseOver":case"topContextMenu":a=d;break;case"topDrag":case"topDragEnd":case"topDragEnter":case"topDragExit":case"topDragLeave":case"topDragOver":case"topDragStart":case"topDrop":a=m;break;case"topTouchCancel":case"topTouchEnd":case"topTouchMove":case"topTouchStart":a=v;break;case"topAnimationEnd":case"topAnimationIteration":case"topAnimationStart":a=l;break;case"topTransitionEnd":a=g;break;case"topScroll":a=y;break;case"topWheel":a=_;break;case"topCopy":case"topCut":case"topPaste":a=c}a||o("86",e);var u=a.getPooled(i,t,n,r);return s.accumulateTwoPhaseDispatches(u),u},didPutListener:function(e,t,n){if("onClick"===t&&!i(e._tag)){var o=r(e),s=u.getNodeFromInstance(e);E[o]||(E[o]=a.listen(s,"click",b))}},willDeleteListener:function(e,t){if("onClick"===t&&!i(e._tag)){var n=r(e);E[n].remove(),delete E[n]}}};e.exports=S},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={animationName:null,elapsedTime:null,pseudoElement:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={clipboardData:function(e){return"clipboardData"in e?e.clipboardData:window.clipboardData}};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={data:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(160),o={dataTransfer:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(125),o={relatedTarget:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={data:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(125),o=n(250),a=n(1066),s=n(251),u={key:a,location:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,repeat:null,locale:null,getModifierState:s,charCode:function(e){return"keypress"===e.type?o(e):0},keyCode:function(e){return"keydown"===e.type||"keyup"===e.type?e.keyCode:0},which:function(e){return"keypress"===e.type?o(e):"keydown"===e.type||"keyup"===e.type?e.keyCode:0}};i.augmentClass(r,u),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(125),o=n(251),a={touches:null,targetTouches:null,changedTouches:null,altKey:null,metaKey:null,ctrlKey:null,shiftKey:null,getModifierState:o};i.augmentClass(r,a),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={propertyName:null,elapsedTime:null,pseudoElement:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(160),o={deltaX:function(e){return"deltaX"in e?e.deltaX:"wheelDeltaX"in e?-e.wheelDeltaX:0},deltaY:function(e){return"deltaY"in e?e.deltaY:"wheelDeltaY"in e?-e.wheelDeltaY:"wheelDelta"in e?-e.wheelDelta:0},deltaZ:null,deltaMode:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e){for(var t=1,n=0,r=0,o=e.length,a=-4&o;r<a;){for(var s=Math.min(r+4096,a);r<s;r+=4)n+=(t+=e.charCodeAt(r))+(t+=e.charCodeAt(r+1))+(t+=e.charCodeAt(r+2))+(t+=e.charCodeAt(r+3));t%=i,n%=i}for(;r<o;r++)n+=t+=e.charCodeAt(r);return t%=i,n%=i,t|n<<16}var i=65521;e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){if(null==t||"boolean"==typeof t||""===t)return"";var i=isNaN(t);if(r||i||0===t||o.hasOwnProperty(e)&&o[e])return""+t;if("string"==typeof t){t=t.trim()}return t+"px"}var i=n(450),o=(n(10),i.isUnitlessNumber);e.exports=r},function(e,t,n){"use strict";function r(e){if(null==e)return null;if(1===e.nodeType)return e;var t=a.get(e);if(t)return t=s(t),t?o.getNodeFromInstance(t):null;"function"==typeof e.render?i("44"):i("45",Object.keys(e))}var i=n(11),o=(n(52),n(14)),a=n(124),s=n(464);n(8),n(10);e.exports=r},function(e,t,n){"use strict";(function(t){function r(e,t,n,r){if(e&&"object"==typeof e){var i=e,o=void 0===i[n];o&&null!=t&&(i[n]=t)}}function i(e,t){if(null==e)return e;var n={};return o(e,r,n),n}var o=(n(244),n(470));n(10);void 0!==t&&n.i({NODE_ENV:"production",WEBPACK_INLINE_STYLES:!1}),e.exports=i}).call(t,n(33))},function(e,t,n){"use strict";function r(e){if(e.key){var t=o[e.key]||e.key;if("Unidentified"!==t)return t}if("keypress"===e.type){var n=i(e);return 13===n?"Enter":String.fromCharCode(n)}return"keydown"===e.type||"keyup"===e.type?a[e.keyCode]||"Unidentified":""}var i=n(250),o={Esc:"Escape",Spacebar:" ",Left:"ArrowLeft",Up:"ArrowUp",Right:"ArrowRight",Down:"ArrowDown",Del:"Delete",Win:"OS",Menu:"ContextMenu",Apps:"ContextMenu",Scroll:"ScrollLock",MozPrintableKey:"Unidentified"},a={8:"Backspace",9:"Tab",12:"Clear",13:"Enter",16:"Shift",17:"Control",18:"Alt",19:"Pause",20:"CapsLock",27:"Escape",32:" ",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"ArrowLeft",38:"ArrowUp",39:"ArrowRight",40:"ArrowDown",45:"Insert",46:"Delete",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NumLock",145:"ScrollLock",224:"Meta"};e.exports=r},function(e,t,n){"use strict";function r(e){var t=e&&(i&&e[i]||e[o]);if("function"==typeof t)return t}var i="function"==typeof Symbol&&Symbol.iterator,o="@@iterator";e.exports=r},function(e,t,n){"use strict";function r(e){for(;e&&e.firstChild;)e=e.firstChild;return e}function i(e){for(;e;){if(e.nextSibling)return e.nextSibling;e=e.parentNode}}function o(e,t){for(var n=r(e),o=0,a=0;n;){if(3===n.nodeType){if(a=o+n.textContent.length,o<=t&&a>=t)return{node:n,offset:t-o};o=a}n=r(i(n))}}e.exports=o},function(e,t,n){"use strict";function r(e,t){var n={};return n[e.toLowerCase()]=t.toLowerCase(),n["Webkit"+e]="webkit"+t,n["Moz"+e]="moz"+t,n["ms"+e]="MS"+t,n["O"+e]="o"+t.toLowerCase(),n}function i(e){if(s[e])return s[e];if(!a[e])return e;var t=a[e];for(var n in t)if(t.hasOwnProperty(n)&&n in u)return s[e]=t[n];return""}var o=n(25),a={animationend:r("Animation","AnimationEnd"),animationiteration:r("Animation","AnimationIteration"),animationstart:r("Animation","AnimationStart"),transitionend:r("Transition","TransitionEnd")},s={},u={};o.canUseDOM&&(u=document.createElement("div").style,"AnimationEvent"in window||(delete a.animationend.animation,delete a.animationiteration.animation,delete a.animationstart.animation),"TransitionEvent"in window||delete a.transitionend.transition),e.exports=i},function(e,t,n){"use strict";function r(e){return'"'+i(e)+'"'}var i=n(162);e.exports=r},function(e,t,n){"use strict";var r=n(459);e.exports=r.renderSubtreeIntoContainer},function(e,t,n){!function(e,r){r(t,n(0),n(7))}(0,function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t=t&&"default"in t?t.default:t;var a=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=function(e){function t(){return r(this,t),i(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return o(t,e),s(t,[{key:"shouldComponentUpdate",value:function(e){var t=this,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},i=this.state||{};return!(this.updateOnProps||Object.keys(a({},e,this.props))).every(function(r){return n.is(e[r],t.props[r])})||!(this.updateOnStates||Object.keys(a({},r,i))).every(function(e){return n.is(r[e],i[e])})}}]),t}(t.Component);e.ImmutablePureComponent=u,e.default=u,Object.defineProperty(e,"__esModule",{value:!0})})},function(e,t,n){"use strict";function r(e){return{doc:new B,blocks:M,blockStarts:T,tip:this.doc,oldtip:this.doc,currentLine:"",lineNumber:0,offset:0,column:0,nextNonspace:0,nextNonspaceColumn:0,indent:0,indented:!1,blank:!1,allClosed:!0,lastMatchedContainer:this.doc,refmap:{},lastLineLength:0,inlineParser:new u(e),findNextNonspace:R,advanceOffset:P,advanceNextNonspace:I,breakOutOfLists:E,addLine:S,addChild:C,incorporateLine:j,finalize:F,processInlines:N,closeUnmatchedBlocks:O,parse:L,options:e||{}}}var i=n(256),o=n(91).unescapeString,a=n(91).OPENTAG,s=n(91).CLOSETAG,u=n(1077),l=[/./,/^<(?:script|pre|style)(?:\s|>|$)/i,/^<!--/,/^<[?]/,/^<![A-Z]/,/^<!\[CDATA\[/,/^<[\/]?(?:address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h1|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|title|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(?:\s|[\/]?[>]|$)/i,new RegExp("^(?:"+a+"|"+s+")s*$","i")],c=[/./,/<\/(?:script|pre|style)>/i,/-->/,/\?>/,/>/,/\]\]>/],p=/^(?:(?:\* *){3,}|(?:_ *){3,}|(?:- *){3,}) *$/,f=/^[#`~*+_=<>0-9-]/,h=/[^ \t\f\v\r\n]/,d=/^[*+-]/,m=/^(\d{1,9})([.)])/,v=/^#{1,6}(?: +|$)/,g=/^`{3,}(?!.*`)|^~{3,}(?!.*~)/,y=/^(?:`{3,}|~{3,})(?= *$)/,_=/^(?:=+|-+) *$/,b=/\r\n|\n|\r/,x=function(e){return!h.test(e)},w=function(e,t){return t<e.length?e.charCodeAt(t):-1},k=function(e){for(;e;){if(e._lastLineBlank)return!0;var t=e.type;if("List"!==t&&"Item"!==t)break;e=e._lastChild}return!1},E=function(e){var t=e,n=null;do{"List"===t.type&&(n=t),t=t._parent}while(t);if(n){for(;e!==n;)this.finalize(e,this.lineNumber),e=e._parent;this.finalize(n,this.lineNumber),this.tip=n._parent}},S=function(){this.tip._string_content+=this.currentLine.slice(this.offset)+"\n"},C=function(e,t){for(;!this.blocks[this.tip.type].canContain(e);)this.finalize(this.tip,this.lineNumber-1);var n=t+1,r=new i(e,[[this.lineNumber,n],[0,0]]);return r._string_content="",this.tip.appendChild(r),this.tip=r,r},A=function(e){var t,n,r,i,o=e.currentLine.slice(e.nextNonspace),a={type:null,tight:!0,bulletChar:null,start:null,delimiter:null,padding:null,markerOffset:e.indent};if(t=o.match(d))a.type="Bullet",a.bulletChar=t[0][0];else{if(!(t=o.match(m)))return null;a.type="Ordered",a.start=parseInt(t[1]),a.delimiter=t[2]}if(-1!==(n=w(e.currentLine,e.nextNonspace+t[0].length))&&9!==n&&32!==n)return null;e.advanceNextNonspace(),e.advanceOffset(t[0].length,!0),r=e.column,i=e.offset;do{e.advanceOffset(1,!0),n=w(e.currentLine,e.offset)}while(e.column-r<5&&(32===n||9===n));var s=-1===w(e.currentLine,e.offset),u=e.column-r;return u>=5||u<1||s?(a.padding=t[0].length+1,e.column=r,e.offset=i,32===w(e.currentLine,e.offset)&&e.advanceOffset(1,!0)):a.padding=t[0].length+u,a},D=function(e,t){return e.type===t.type&&e.delimiter===t.delimiter&&e.bulletChar===t.bulletChar},O=function(){if(!this.allClosed){for(;this.oldtip!==this.lastMatchedContainer;){var e=this.oldtip._parent;this.finalize(this.oldtip,this.lineNumber-1),this.oldtip=e}this.allClosed=!0}},M={Document:{continue:function(){return 0},finalize:function(){},canContain:function(e){return"Item"!==e},acceptsLines:!1},List:{continue:function(){return 0},finalize:function(e,t){for(var n=t._firstChild;n;){if(k(n)&&n._next){t._listData.tight=!1;break}for(var r=n._firstChild;r;){if(k(r)&&(n._next||r._next)){t._listData.tight=!1;break}r=r._next}n=n._next}},canContain:function(e){return"Item"===e},acceptsLines:!1},BlockQuote:{continue:function(e){var t=e.currentLine;return e.indented||62!==w(t,e.nextNonspace)?1:(e.advanceNextNonspace(),e.advanceOffset(1,!1),32===w(t,e.offset)&&e.offset++,0)},finalize:function(){},canContain:function(e){return"Item"!==e},acceptsLines:!1},Item:{continue:function(e,t){if(e.blank&&null!==t._firstChild)e.advanceNextNonspace();else{if(!(e.indent>=t._listData.markerOffset+t._listData.padding))return 1;e.advanceOffset(t._listData.markerOffset+t._listData.padding,!0)}return 0},finalize:function(){},canContain:function(e){return"Item"!==e},acceptsLines:!1},Heading:{continue:function(){return 1},finalize:function(){},canContain:function(){return!1},acceptsLines:!1},ThematicBreak:{continue:function(){return 1},finalize:function(){},canContain:function(){return!1},acceptsLines:!1},CodeBlock:{continue:function(e,t){var n=e.currentLine,r=e.indent;if(t._isFenced){var i=r<=3&&n.charAt(e.nextNonspace)===t._fenceChar&&n.slice(e.nextNonspace).match(y);if(i&&i[0].length>=t._fenceLength)return e.finalize(t,e.lineNumber),2;for(var o=t._fenceOffset;o>0&&32===w(n,e.offset);)e.advanceOffset(1,!1),o--}else if(r>=4)e.advanceOffset(4,!0);else{if(!e.blank)return 1;e.advanceNextNonspace()}return 0},finalize:function(e,t){if(t._isFenced){var n=t._string_content,r=n.indexOf("\n"),i=n.slice(0,r),a=n.slice(r+1);t.info=o(i.trim()),t._literal=a}else t._literal=t._string_content.replace(/(\n *)+$/,"\n");t._string_content=null},canContain:function(){return!1},acceptsLines:!0},HtmlBlock:{continue:function(e,t){return!e.blank||6!==t._htmlBlockType&&7!==t._htmlBlockType?0:1},finalize:function(e,t){t._literal=t._string_content.replace(/(\n *)+$/,""),t._string_content=null},canContain:function(){return!1},acceptsLines:!0},Paragraph:{continue:function(e){return e.blank?1:0},finalize:function(e,t){for(var n,r=!1;91===w(t._string_content,0)&&(n=e.inlineParser.parseReference(t._string_content,e.refmap));)t._string_content=t._string_content.slice(n),r=!0;r&&x(t._string_content)&&t.unlink()},canContain:function(){return!1},acceptsLines:!0}},T=[function(e){return e.indented||62!==w(e.currentLine,e.nextNonspace)?0:(e.advanceNextNonspace(),e.advanceOffset(1,!1),32===w(e.currentLine,e.offset)&&e.advanceOffset(1,!1),e.closeUnmatchedBlocks(),e.addChild("BlockQuote",e.nextNonspace),1)},function(e){var t;if(!e.indented&&(t=e.currentLine.slice(e.nextNonspace).match(v))){e.advanceNextNonspace(),e.advanceOffset(t[0].length,!1),e.closeUnmatchedBlocks();var n=e.addChild("Heading",e.nextNonspace);return n.level=t[0].trim().length,n._string_content=e.currentLine.slice(e.offset).replace(/^ *#+ *$/,"").replace(/ +#+ *$/,""),e.advanceOffset(e.currentLine.length-e.offset),2}return 0},function(e){var t;if(!e.indented&&(t=e.currentLine.slice(e.nextNonspace).match(g))){var n=t[0].length;e.closeUnmatchedBlocks();var r=e.addChild("CodeBlock",e.nextNonspace);return r._isFenced=!0,r._fenceLength=n,r._fenceChar=t[0][0],r._fenceOffset=e.indent,e.advanceNextNonspace(),e.advanceOffset(n,!1),2}return 0},function(e,t){if(!e.indented&&60===w(e.currentLine,e.nextNonspace)){var n,r=e.currentLine.slice(e.nextNonspace);for(n=1;n<=7;n++)if(l[n].test(r)&&(n<7||"Paragraph"!==t.type)){e.closeUnmatchedBlocks();var i=e.addChild("HtmlBlock",e.offset);return i._htmlBlockType=n,2}}return 0},function(e,t){var n;if(!e.indented&&"Paragraph"===t.type&&(n=e.currentLine.slice(e.nextNonspace).match(_))){e.closeUnmatchedBlocks();var r=new i("Heading",t.sourcepos);return r.level="="===n[0][0]?1:2,r._string_content=t._string_content,t.insertAfter(r),t.unlink(),e.tip=r,e.advanceOffset(e.currentLine.length-e.offset,!1),2}return 0},function(e){return!e.indented&&p.test(e.currentLine.slice(e.nextNonspace))?(e.closeUnmatchedBlocks(),e.addChild("ThematicBreak",e.nextNonspace),e.advanceOffset(e.currentLine.length-e.offset,!1),2):0},function(e,t){var n;return e.indented&&"List"!==t.type||!(n=A(e))?0:(e.closeUnmatchedBlocks(),"List"===e.tip.type&&D(t._listData,n)||(t=e.addChild("List",e.nextNonspace),t._listData=n),t=e.addChild("Item",e.nextNonspace),t._listData=n,1)},function(e){return e.indented&&"Paragraph"!==e.tip.type&&!e.blank?(e.advanceOffset(4,!0),e.closeUnmatchedBlocks(),e.addChild("CodeBlock",e.offset),2):0}],P=function(e,t){for(var n,r,i=0,o=this.currentLine;e>0&&(r=o[this.offset]);)"\t"===r?(n=4-this.column%4,this.column+=n,this.offset+=1,e-=t?n:1):(i+=1,this.offset+=1,this.column+=1,e-=1)},I=function(){this.offset=this.nextNonspace,this.column=this.nextNonspaceColumn},R=function(){for(var e,t=this.currentLine,n=this.offset,r=this.column;""!==(e=t.charAt(n));)if(" "===e)n++,r++;else{if("\t"!==e)break;n++,r+=4-r%4}this.blank="\n"===e||"\r"===e||""===e,this.nextNonspace=n,this.nextNonspaceColumn=r,this.indent=this.nextNonspaceColumn-this.column,this.indented=this.indent>=4},j=function(e){var t,n=!0,r=this.doc;this.oldtip=this.tip,this.offset=0,this.column=0,this.lineNumber+=1,-1!==e.indexOf("\0")&&(e=e.replace(/\0/g,"�")),this.currentLine=e;for(var i;(i=r._lastChild)&&i._open;){switch(r=i,this.findNextNonspace(),this.blocks[r.type].continue(this,r)){case 0:break;case 1:n=!1;break;case 2:return void(this.lastLineLength=e.length);default:throw"continue returned illegal value, must be 0, 1, or 2"}if(!n){r=r._parent;break}}this.allClosed=r===this.oldtip,this.lastMatchedContainer=r,this.blank&&r._lastLineBlank&&(this.breakOutOfLists(r),r=this.tip);for(var o="Paragraph"!==r.type&&M[r.type].acceptsLines,a=this.blockStarts,s=a.length;!o;){if(this.findNextNonspace(),!this.indented&&!f.test(e.slice(this.nextNonspace))){this.advanceNextNonspace();break}for(var u=0;u<s;){var l=a[u](this,r);if(1===l){r=this.tip;break}if(2===l){r=this.tip,o=!0;break}u++}if(u===s){this.advanceNextNonspace();break}}if(this.allClosed||this.blank||"Paragraph"!==this.tip.type){this.closeUnmatchedBlocks(),this.blank&&r.lastChild&&(r.lastChild._lastLineBlank=!0),t=r.type;for(var p=this.blank&&!("BlockQuote"===t||"CodeBlock"===t&&r._isFenced||"Item"===t&&!r._firstChild&&r.sourcepos[0][0]===this.lineNumber),h=r;h;)h._lastLineBlank=p,h=h._parent;this.blocks[t].acceptsLines?(this.addLine(),"HtmlBlock"===t&&r._htmlBlockType>=1&&r._htmlBlockType<=5&&c[r._htmlBlockType].test(this.currentLine.slice(this.offset))&&this.finalize(r,this.lineNumber)):this.offset<e.length&&!this.blank&&(r=this.addChild("Paragraph",this.offset),this.advanceNextNonspace(),this.addLine())}else this.addLine();this.lastLineLength=e.length},F=function(e,t){var n=e._parent;e._open=!1,e.sourcepos[1]=[t,this.lastLineLength],this.blocks[e.type].finalize(this,e),this.tip=n},N=function(e){var t,n,r,i=e.walker();for(this.inlineParser.refmap=this.refmap,this.inlineParser.options=this.options;n=i.next();)t=n.node,r=t.type,n.entering||"Paragraph"!==r&&"Heading"!==r||this.inlineParser.parse(t)},B=function(){return new i("Document",[[1,1],[0,0]])},L=function(e){this.doc=new B,this.tip=this.doc,this.refmap={},this.lineNumber=0,this.lastLineLength=0,this.offset=0,this.column=0,this.lastMatchedContainer=this.doc,this.currentLine="",this.options.time&&console.time("preparing input");var t=e.split(b),n=t.length;10===e.charCodeAt(e.length-1)&&(n-=1),this.options.time&&console.timeEnd("preparing input"),this.options.time&&console.time("block parsing");for(var r=0;r<n;r++)this.incorporateLine(t[r]);for(;this.tip;)this.finalize(this.tip,n);return this.options.time&&console.timeEnd("block parsing"),this.options.time&&console.time("inline parsing"),this.processInlines(this.doc),this.options.time&&console.timeEnd("inline parsing"),this.doc};e.exports=r},function(e,t,n){"use strict";/*! http://mths.be/fromcodepoint v0.2.1 by @mathias */
--if(String.fromCodePoint)e.exports=function(e){try{return String.fromCodePoint(e)}catch(e){if(e instanceof RangeError)return String.fromCharCode(65533);throw e}};else{var r=String.fromCharCode,i=Math.floor,o=function(){var e,t,n=[],o=-1,a=arguments.length;if(!a)return"";for(var s="";++o<a;){var u=Number(arguments[o]);if(!isFinite(u)||u<0||u>1114111||i(u)!==u)return String.fromCharCode(65533);u<=65535?n.push(u):(u-=65536,e=55296+(u>>10),t=u%1024+56320,n.push(e,t)),(o+1===a||n.length>16384)&&(s+=r.apply(null,n),n.length=0)}return s};e.exports=o}},function(e,t,n){"use strict";function r(e){return{softbreak:"\n",escape:i,options:e||{},render:c}}var i=n(91).escapeXml,o=function(e,t,n){var r="<"+e;if(t&&t.length>0)for(var i,o=0;void 0!==(i=t[o]);)r+=" "+i[0]+'="'+i[1]+'"',o++;return n&&(r+=" /"),r+=">"},a=/\<[^>]*\>/,s=/^javascript:|vbscript:|file:|data:/i,u=/^data:image\/(?:png|gif|jpeg|webp)/i,l=function(e){return s.test(e)&&!u.test(e)},c=function(e){var t,n,r,i,s,u,c,p=e.walker(),f="",h="\n",d=0,m=function(e){f+=d>0?e.replace(a,""):e,h=e},v=this.escape,g=function(){"\n"!==h&&(f+="\n",h="\n")},y=this.options;for(y.time&&console.time("rendering");i=p.next();){if(u=i.entering,s=i.node,t=[],y.sourcepos){var _=s.sourcepos;_&&t.push(["data-sourcepos",String(_[0][0])+":"+String(_[0][1])+"-"+String(_[1][0])+":"+String(_[1][1])])}switch(s.type){case"Text":m(v(s.literal,!1));break;case"Softbreak":m(this.softbreak);break;case"Hardbreak":m(o("br",[],!0)),g();break;case"Emph":m(o(u?"em":"/em"));break;case"Strong":m(o(u?"strong":"/strong"));break;case"HtmlInline":m(y.safe?"\x3c!-- raw HTML omitted --\x3e":s.literal);break;case"CustomInline":u&&s.onEnter?m(s.onEnter):!u&&s.onExit&&m(s.onExit);break;case"Link":u?(y.safe&&l(s.destination)||t.push(["href",v(s.destination,!0)]),s.title&&t.push(["title",v(s.title,!0)]),m(o("a",t))):m(o("/a"));break;case"Image":u?(0===d&&m(y.safe&&l(s.destination)?'<img src="" alt="':'<img src="'+v(s.destination,!0)+'" alt="'),d+=1):0===(d-=1)&&(s.title&&m('" title="'+v(s.title,!0)),m('" />'));break;case"Code":m(o("code")+v(s.literal,!1)+o("/code"));break;case"Document":break;case"Paragraph":if(null!==(c=s.parent.parent)&&"List"===c.type&&c.listTight)break;u?(g(),m(o("p",t))):(m(o("/p")),g());break;case"BlockQuote":u?(g(),m(o("blockquote",t)),g()):(g(),m(o("/blockquote")),g());break;case"Item":u?m(o("li",t)):(m(o("/li")),g());break;case"List":if(r="Bullet"===s.listType?"ul":"ol",u){var b=s.listStart;null!==b&&1!==b&&t.push(["start",b.toString()]),g(),m(o(r,t)),g()}else g(),m(o("/"+r)),g();break;case"Heading":r="h"+s.level,u?(g(),m(o(r,t))):(m(o("/"+r)),g());break;case"CodeBlock":n=s.info?s.info.split(/\s+/):[],n.length>0&&n[0].length>0&&t.push(["class","language-"+v(n[0],!0)]),g(),m(o("pre")+o("code",t)),m(v(s.literal,!1)),m(o("/code")+o("/pre")),g();break;case"HtmlBlock":g(),m(y.safe?"\x3c!-- raw HTML omitted --\x3e":s.literal),g();break;case"CustomBlock":g(),u&&s.onEnter?m(s.onEnter):!u&&s.onExit&&m(s.onExit),g();break;case"ThematicBreak":g(),m(o("hr",t,!0)),g();break;default:throw"Unknown node type "+s.type}}return y.time&&console.timeEnd("rendering"),f};e.exports=r},function(e,t,n){"use strict";e.exports.version="0.24.0",e.exports.Node=n(256),e.exports.Parser=n(1073),e.exports.HtmlRenderer=n(1075),e.exports.XmlRenderer=n(1079)},function(e,t,n){"use strict";function r(e){return{subject:"",delimiters:null,pos:0,refmap:{},match:N,peek:B,spnl:L,parseBackticks:q,parseBackslash:z,parseAutolink:U,parseHtmlTag:W,scanDelims:V,handleDelim:H,parseLinkTitle:X,parseLinkDestination:Y,parseLinkLabel:$,parseOpenBracket:Z,parseCloseBracket:ee,parseBang:Q,parseEntity:te,parseString:ne,parseNewline:re,parseReference:ie,parseInline:oe,processEmphasis:K,removeDelimiter:G,options:e||{},parse:ae}}var i=n(256),o=n(91),a=n(1078),s=o.normalizeURI,u=o.unescapeString,l=n(1074),c=n(114).decodeHTML;n(494);var p=o.ESCAPABLE,f="\\\\"+p,h="\\(([^\\\\()\\x00-\\x20]|"+f+"|\\\\)*\\)",d=o.ENTITY,m=o.reHtmlTag,v=new RegExp(/^[\u2000-\u206F\u2E00-\u2E7F\\'!"#\$%&\(\)\*\+,\-\.\/:;<=>\?@\[\]\^_`\{\|\}~]/),g=new RegExp('^(?:"('+f+'|[^"\\x00])*"|\'('+f+"|[^'\\x00])*'|\\(("+f+"|[^)\\x00])*\\))"),y=new RegExp("^(?:[<](?:[^ <>\\t\\n\\\\\\x00]|"+f+"|\\\\)*[>])"),_=new RegExp("^(?:[^\\\\()\\x00-\\x20]+|"+f+"|\\\\|"+h+")*"),b=new RegExp("^"+p),x=new RegExp("^"+d,"i"),w=/`+/,k=/^`+/,E=/\.\.\./g,S=/--+/g,C=/^<([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/,A=/^<[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*>/i,D=/^ *(?:\n *)?/,O=/^\s/,M=/\s+/g,T=/ *$/,P=/^ */,I=/^ *(?:\n|$)/,R=new RegExp("^\\[(?:[^\\\\\\[\\]]|"+f+"|\\\\){0,1000}\\]"),j=/^[^\n`\[\]\\!<&*_'"]+/m,F=function(e){var t=new i("Text");return t._literal=e,t},N=function(e){var t=e.exec(this.subject.slice(this.pos));return null===t?null:(this.pos+=t.index+t[0].length,t[0])},B=function(){return this.pos<this.subject.length?this.subject.charCodeAt(this.pos):-1},L=function(){return this.match(D),!0},q=function(e){var t=this.match(k);if(null===t)return!1;for(var n,r,o=this.pos;null!==(n=this.match(w));)if(n===t)return r=new i("Code"),r._literal=this.subject.slice(o,this.pos-t.length).trim().replace(M," "),e.appendChild(r),!0;return this.pos=o,e.appendChild(F(t)),!0},z=function(e){var t,n=this.subject;return this.pos+=1,10===this.peek()?(this.pos+=1,t=new i("Hardbreak"),e.appendChild(t)):b.test(n.charAt(this.pos))?(e.appendChild(F(n.charAt(this.pos))),this.pos+=1):e.appendChild(F("\\")),!0},U=function(e){var t,n,r;return(t=this.match(C))?(n=t.slice(1,t.length-1),r=new i("Link"),r._destination=s("mailto:"+n),r._title="",r.appendChild(F(n)),e.appendChild(r),!0):!!(t=this.match(A))&&(n=t.slice(1,t.length-1),r=new i("Link"),r._destination=s(n),r._title="",r.appendChild(F(n)),e.appendChild(r),!0)},W=function(e){var t=this.match(m);if(null===t)return!1;var n=new i("HtmlInline");return n._literal=t,e.appendChild(n),!0},V=function(e){var t,n,r,i,o,a,s,u,c,p,f,h=0,d=this.pos;if(39===e||34===e)h++,this.pos++;else for(;this.peek()===e;)h++,this.pos++;return 0===h?null:(t=0===d?"\n":this.subject.charAt(d-1),r=this.peek(),n=-1===r?"\n":l(r),u=O.test(n),c=v.test(n),p=O.test(t),f=v.test(t),i=!(u||c&&!p&&!f),o=!(p||f&&!u&&!c),95===e?(a=i&&(!o||f),s=o&&(!i||c)):39===e||34===e?(a=i&&!o,s=o):(a=i,s=o),this.pos=d,{numdelims:h,can_open:a,can_close:s})},H=function(e,t){var n=this.scanDelims(e);if(!n)return!1;var r,i=n.numdelims,o=this.pos;this.pos+=i,r=39===e?"’":34===e?"“":this.subject.slice(o,this.pos);var a=F(r);return t.appendChild(a),this.delimiters={cc:e,numdelims:i,node:a,previous:this.delimiters,next:null,can_open:n.can_open,can_close:n.can_close,active:!0},null!==this.delimiters.previous&&(this.delimiters.previous.next=this.delimiters),!0},G=function(e){null!==e.previous&&(e.previous.next=e.next),null===e.next?this.delimiters=e.previous:e.next.previous=e.previous},J=function(e,t){e.next!==t&&(e.next=t,t.previous=e)},K=function(e){var t,n,r,o,a,s,u,l,c,p,f=[];for(f[95]=e,f[42]=e,f[39]=e,f[34]=e,n=this.delimiters;null!==n&&n.previous!==e;)n=n.previous;for(;null!==n;){var h=n.cc;if(!n.can_close||95!==h&&42!==h&&39!==h&&34!==h)n=n.next;else{for(t=n.previous,p=!1;null!==t&&t!==e&&t!==f[h];){if(t.cc===n.cc&&t.can_open){p=!0;break}t=t.previous}if(r=n,42===h||95===h)if(p){u=n.numdelims<3||t.numdelims<3?n.numdelims<=t.numdelims?n.numdelims:t.numdelims:n.numdelims%2==0?2:1,o=t.node,a=n.node,t.numdelims-=u,n.numdelims-=u,o._literal=o._literal.slice(0,o._literal.length-u),a._literal=a._literal.slice(0,a._literal.length-u);var d=new i(1===u?"Emph":"Strong");for(l=o._next;l&&l!==a;)c=l._next,l.unlink(),d.appendChild(l),l=c;o.insertAfter(d),J(t,n),0===t.numdelims&&(o.unlink(),this.removeDelimiter(t)),0===n.numdelims&&(a.unlink(),s=n.next,this.removeDelimiter(n),n=s)}else n=n.next;else 39===h?(n.node._literal="’",p&&(t.node._literal="‘"),n=n.next):34===h&&(n.node._literal="”",p&&(t.node.literal="“"),n=n.next);p||(f[h]=r.previous,r.can_open||this.removeDelimiter(r))}}for(;null!==this.delimiters&&this.delimiters!==e;)this.removeDelimiter(this.delimiters)},X=function(){var e=this.match(g);return null===e?null:u(e.substr(1,e.length-2))},Y=function(){var e=this.match(y);return null===e?(e=this.match(_),null===e?null:s(u(e))):s(u(e.substr(1,e.length-2)))},$=function(){var e=this.match(R);return null===e||e.length>1001?0:e.length},Z=function(e){var t=this.pos;this.pos+=1;var n=F("[");return e.appendChild(n),this.delimiters={cc:91,numdelims:1,node:n,previous:this.delimiters,next:null,can_open:!0,can_close:!1,index:t,active:!0},null!==this.delimiters.previous&&(this.delimiters.previous.next=this.delimiters),!0},Q=function(e){var t=this.pos;if(this.pos+=1,91===this.peek()){this.pos+=1;var n=F("![");e.appendChild(n),this.delimiters={cc:33,numdelims:1,node:n,previous:this.delimiters,next:null,can_open:!0,can_close:!1,index:t+1,active:!0},null!==this.delimiters.previous&&(this.delimiters.previous.next=this.delimiters)}else e.appendChild(F("!"));return!0},ee=function(e){var t,n,r,o,s,u,l=!1;for(this.pos+=1,t=this.pos,u=this.delimiters;null!==u&&91!==u.cc&&33!==u.cc;)u=u.previous;if(null===u)return e.appendChild(F("]")),!0;if(!u.active)return e.appendChild(F("]")),this.removeDelimiter(u),!0;if(n=33===u.cc,40===this.peek())this.pos++,this.spnl()&&null!==(r=this.parseLinkDestination())&&this.spnl()&&(O.test(this.subject.charAt(this.pos-1))&&(o=this.parseLinkTitle()),!0)&&this.spnl()&&41===this.peek()&&(this.pos+=1,l=!0);else{var c=this.pos,p=this.pos,f=this.parseLinkLabel();s=0===f||2===f?this.subject.slice(u.index,t):this.subject.slice(p,p+f),0===f&&(this.pos=c);var h=this.refmap[a(s)];h&&(r=h.destination,o=h.title,l=!0)}if(l){var d=new i(n?"Image":"Link");d._destination=r,d._title=o||"";var m,v;for(m=u.node._next;m;)v=m._next,m.unlink(),d.appendChild(m),m=v;if(e.appendChild(d),this.processEmphasis(u.previous),u.node.unlink(),!n)for(u=this.delimiters;null!==u;)91===u.cc&&(u.active=!1),u=u.previous;return!0}return this.removeDelimiter(u),this.pos=t,e.appendChild(F("]")),!0},te=function(e){var t;return!!(t=this.match(x))&&(e.appendChild(F(c(t))),!0)},ne=function(e){var t;return!!(t=this.match(j))&&(this.options.smart?e.appendChild(F(t.replace(E,"…").replace(S,function(e){var t=0,n=0;return e.length%3==0?n=e.length/3:e.length%2==0?t=e.length/2:e.length%3==2?(t=1,n=(e.length-2)/3):(t=2,n=(e.length-4)/3),"—".repeat(n)+"–".repeat(t)}))):e.appendChild(F(t)),!0)},re=function(e){this.pos+=1;var t=e._lastChild;if(t&&"Text"===t.type&&" "===t._literal[t._literal.length-1]){var n=" "===t._literal[t._literal.length-2];t._literal=t._literal.replace(T,""),e.appendChild(new i(n?"Hardbreak":"Softbreak"))}else e.appendChild(new i("Softbreak"));return this.match(P),!0},ie=function(e,t){this.subject=e,this.pos=0;var n,r,i,o,s=this.pos;if(0===(o=this.parseLinkLabel()))return 0;if(n=this.subject.substr(0,o),58!==this.peek())return this.pos=s,0;if(this.pos++,this.spnl(),null===(r=this.parseLinkDestination())||0===r.length)return this.pos=s,0;var u=this.pos;this.spnl(),null===(i=this.parseLinkTitle())&&(i="",this.pos=u);var l=!0;if(null===this.match(I)&&(""===i?l=!1:(i="",this.pos=u,l=null!==this.match(I))),!l)return this.pos=s,0;var c=a(n);return""===c?(this.pos=s,0):(t[c]||(t[c]={destination:r,title:i}),this.pos-s)},oe=function(e){var t=!1,n=this.peek();if(-1===n)return!1;switch(n){case 10:t=this.parseNewline(e);break;case 92:t=this.parseBackslash(e);break;case 96:t=this.parseBackticks(e);break;case 42:case 95:t=this.handleDelim(n,e);break;case 39:case 34:t=this.options.smart&&this.handleDelim(n,e);break;case 91:t=this.parseOpenBracket(e);break;case 33:t=this.parseBang(e);break;case 93:t=this.parseCloseBracket(e);break;case 60:t=this.parseAutolink(e)||this.parseHtmlTag(e);break;case 38:t=this.parseEntity(e);break;default:t=this.parseString(e)}return t||(this.pos+=1,e.appendChild(F(l(n)))),!0},ae=function(e){for(this.subject=e._string_content.trim(),this.pos=0,this.delimiters=null;this.parseInline(e););e._string_content=null,this.processEmphasis(null)};e.exports=r},function(e,t,n){"use strict";var r=/[ \t\r\n]+|[A-Z\xB5\xC0-\xD6\xD8-\xDF\u0100\u0102\u0104\u0106\u0108\u010A\u010C\u010E\u0110\u0112\u0114\u0116\u0118\u011A\u011C\u011E\u0120\u0122\u0124\u0126\u0128\u012A\u012C\u012E\u0130\u0132\u0134\u0136\u0139\u013B\u013D\u013F\u0141\u0143\u0145\u0147\u0149\u014A\u014C\u014E\u0150\u0152\u0154\u0156\u0158\u015A\u015C\u015E\u0160\u0162\u0164\u0166\u0168\u016A\u016C\u016E\u0170\u0172\u0174\u0176\u0178\u0179\u017B\u017D\u017F\u0181\u0182\u0184\u0186\u0187\u0189-\u018B\u018E-\u0191\u0193\u0194\u0196-\u0198\u019C\u019D\u019F\u01A0\u01A2\u01A4\u01A6\u01A7\u01A9\u01AC\u01AE\u01AF\u01B1-\u01B3\u01B5\u01B7\u01B8\u01BC\u01C4\u01C5\u01C7\u01C8\u01CA\u01CB\u01CD\u01CF\u01D1\u01D3\u01D5\u01D7\u01D9\u01DB\u01DE\u01E0\u01E2\u01E4\u01E6\u01E8\u01EA\u01EC\u01EE\u01F0-\u01F2\u01F4\u01F6-\u01F8\u01FA\u01FC\u01FE\u0200\u0202\u0204\u0206\u0208\u020A\u020C\u020E\u0210\u0212\u0214\u0216\u0218\u021A\u021C\u021E\u0220\u0222\u0224\u0226\u0228\u022A\u022C\u022E\u0230\u0232\u023A\u023B\u023D\u023E\u0241\u0243-\u0246\u0248\u024A\u024C\u024E\u0345\u0370\u0372\u0376\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03AB\u03B0\u03C2\u03CF-\u03D1\u03D5\u03D6\u03D8\u03DA\u03DC\u03DE\u03E0\u03E2\u03E4\u03E6\u03E8\u03EA\u03EC\u03EE\u03F0\u03F1\u03F4\u03F5\u03F7\u03F9\u03FA\u03FD-\u042F\u0460\u0462\u0464\u0466\u0468\u046A\u046C\u046E\u0470\u0472\u0474\u0476\u0478\u047A\u047C\u047E\u0480\u048A\u048C\u048E\u0490\u0492\u0494\u0496\u0498\u049A\u049C\u049E\u04A0\u04A2\u04A4\u04A6\u04A8\u04AA\u04AC\u04AE\u04B0\u04B2\u04B4\u04B6\u04B8\u04BA\u04BC\u04BE\u04C0\u04C1\u04C3\u04C5\u04C7\u04C9\u04CB\u04CD\u04D0\u04D2\u04D4\u04D6\u04D8\u04DA\u04DC\u04DE\u04E0\u04E2\u04E4\u04E6\u04E8\u04EA\u04EC\u04EE\u04F0\u04F2\u04F4\u04F6\u04F8\u04FA\u04FC\u04FE\u0500\u0502\u0504\u0506\u0508\u050A\u050C\u050E\u0510\u0512\u0514\u0516\u0518\u051A\u051C\u051E\u0520\u0522\u0524\u0526\u0528\u052A\u052C\u052E\u0531-\u0556\u0587\u10A0-\u10C5\u10C7\u10CD\u1E00\u1E02\u1E04\u1E06\u1E08\u1E0A\u1E0C\u1E0E\u1E10\u1E12\u1E14\u1E16\u1E18\u1E1A\u1E1C\u1E1E\u1E20\u1E22\u1E24\u1E26\u1E28\u1E2A\u1E2C\u1E2E\u1E30\u1E32\u1E34\u1E36\u1E38\u1E3A\u1E3C\u1E3E\u1E40\u1E42\u1E44\u1E46\u1E48\u1E4A\u1E4C\u1E4E\u1E50\u1E52\u1E54\u1E56\u1E58\u1E5A\u1E5C\u1E5E\u1E60\u1E62\u1E64\u1E66\u1E68\u1E6A\u1E6C\u1E6E\u1E70\u1E72\u1E74\u1E76\u1E78\u1E7A\u1E7C\u1E7E\u1E80\u1E82\u1E84\u1E86\u1E88\u1E8A\u1E8C\u1E8E\u1E90\u1E92\u1E94\u1E96-\u1E9B\u1E9E\u1EA0\u1EA2\u1EA4\u1EA6\u1EA8\u1EAA\u1EAC\u1EAE\u1EB0\u1EB2\u1EB4\u1EB6\u1EB8\u1EBA\u1EBC\u1EBE\u1EC0\u1EC2\u1EC4\u1EC6\u1EC8\u1ECA\u1ECC\u1ECE\u1ED0\u1ED2\u1ED4\u1ED6\u1ED8\u1EDA\u1EDC\u1EDE\u1EE0\u1EE2\u1EE4\u1EE6\u1EE8\u1EEA\u1EEC\u1EEE\u1EF0\u1EF2\u1EF4\u1EF6\u1EF8\u1EFA\u1EFC\u1EFE\u1F08-\u1F0F\u1F18-\u1F1D\u1F28-\u1F2F\u1F38-\u1F3F\u1F48-\u1F4D\u1F50\u1F52\u1F54\u1F56\u1F59\u1F5B\u1F5D\u1F5F\u1F68-\u1F6F\u1F80-\u1FAF\u1FB2-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD2\u1FD3\u1FD6-\u1FDB\u1FE2-\u1FE4\u1FE6-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2126\u212A\u212B\u2132\u2160-\u216F\u2183\u24B6-\u24CF\u2C00-\u2C2E\u2C60\u2C62-\u2C64\u2C67\u2C69\u2C6B\u2C6D-\u2C70\u2C72\u2C75\u2C7E-\u2C80\u2C82\u2C84\u2C86\u2C88\u2C8A\u2C8C\u2C8E\u2C90\u2C92\u2C94\u2C96\u2C98\u2C9A\u2C9C\u2C9E\u2CA0\u2CA2\u2CA4\u2CA6\u2CA8\u2CAA\u2CAC\u2CAE\u2CB0\u2CB2\u2CB4\u2CB6\u2CB8\u2CBA\u2CBC\u2CBE\u2CC0\u2CC2\u2CC4\u2CC6\u2CC8\u2CCA\u2CCC\u2CCE\u2CD0\u2CD2\u2CD4\u2CD6\u2CD8\u2CDA\u2CDC\u2CDE\u2CE0\u2CE2\u2CEB\u2CED\u2CF2\uA640\uA642\uA644\uA646\uA648\uA64A\uA64C\uA64E\uA650\uA652\uA654\uA656\uA658\uA65A\uA65C\uA65E\uA660\uA662\uA664\uA666\uA668\uA66A\uA66C\uA680\uA682\uA684\uA686\uA688\uA68A\uA68C\uA68E\uA690\uA692\uA694\uA696\uA698\uA69A\uA722\uA724\uA726\uA728\uA72A\uA72C\uA72E\uA732\uA734\uA736\uA738\uA73A\uA73C\uA73E\uA740\uA742\uA744\uA746\uA748\uA74A\uA74C\uA74E\uA750\uA752\uA754\uA756\uA758\uA75A\uA75C\uA75E\uA760\uA762\uA764\uA766\uA768\uA76A\uA76C\uA76E\uA779\uA77B\uA77D\uA77E\uA780\uA782\uA784\uA786\uA78B\uA78D\uA790\uA792\uA796\uA798\uA79A\uA79C\uA79E\uA7A0\uA7A2\uA7A4\uA7A6\uA7A8\uA7AA-\uA7AD\uA7B0\uA7B1\uFB00-\uFB06\uFB13-\uFB17\uFF21-\uFF3A]|\uD801[\uDC00-\uDC27]|\uD806[\uDCA0-\uDCBF]/g,i={A:"a",B:"b",C:"c",D:"d",E:"e",F:"f",G:"g",H:"h",I:"i",J:"j",K:"k",L:"l",M:"m",N:"n",O:"o",P:"p",Q:"q",R:"r",S:"s",T:"t",U:"u",V:"v",W:"w",X:"x",Y:"y",Z:"z","µ":"μ","À":"à","Á":"á","Â":"â","Ã":"ã","Ä":"ä","Å":"å","Æ":"æ","Ç":"ç","È":"è","É":"é","Ê":"ê","Ë":"ë","Ì":"ì","Í":"í","Î":"î","Ï":"ï","Ð":"ð","Ñ":"ñ","Ò":"ò","Ó":"ó","Ô":"ô","Õ":"õ","Ö":"ö","Ø":"ø","Ù":"ù","Ú":"ú","Û":"û","Ü":"ü","Ý":"ý","Þ":"þ","Ā":"ā","Ă":"ă","Ą":"ą","Ć":"ć","Ĉ":"ĉ","Ċ":"ċ","Č":"č","Ď":"ď","Đ":"đ","Ē":"ē","Ĕ":"ĕ","Ė":"ė","Ę":"ę","Ě":"ě","Ĝ":"ĝ","Ğ":"ğ","Ġ":"ġ","Ģ":"ģ","Ĥ":"ĥ","Ħ":"ħ","Ĩ":"ĩ","Ī":"ī","Ĭ":"ĭ","Į":"į","IJ":"ij","Ĵ":"ĵ","Ķ":"ķ","Ĺ":"ĺ","Ļ":"ļ","Ľ":"ľ","Ŀ":"ŀ","Ł":"ł","Ń":"ń","Ņ":"ņ","Ň":"ň","Ŋ":"ŋ","Ō":"ō","Ŏ":"ŏ","Ő":"ő","Œ":"œ","Ŕ":"ŕ","Ŗ":"ŗ","Ř":"ř","Ś":"ś","Ŝ":"ŝ","Ş":"ş","Š":"š","Ţ":"ţ","Ť":"ť","Ŧ":"ŧ","Ũ":"ũ","Ū":"ū","Ŭ":"ŭ","Ů":"ů","Ű":"ű","Ų":"ų","Ŵ":"ŵ","Ŷ":"ŷ","Ÿ":"ÿ","Ź":"ź","Ż":"ż","Ž":"ž","ſ":"s","Ɓ":"ɓ","Ƃ":"ƃ","Ƅ":"ƅ","Ɔ":"ɔ","Ƈ":"ƈ","Ɖ":"ɖ","Ɗ":"ɗ","Ƌ":"ƌ","Ǝ":"ǝ","Ə":"ə","Ɛ":"ɛ","Ƒ":"ƒ","Ɠ":"ɠ","Ɣ":"ɣ","Ɩ":"ɩ","Ɨ":"ɨ","Ƙ":"ƙ","Ɯ":"ɯ","Ɲ":"ɲ","Ɵ":"ɵ","Ơ":"ơ","Ƣ":"ƣ","Ƥ":"ƥ","Ʀ":"ʀ","Ƨ":"ƨ","Ʃ":"ʃ","Ƭ":"ƭ","Ʈ":"ʈ","Ư":"ư","Ʊ":"ʊ","Ʋ":"ʋ","Ƴ":"ƴ","Ƶ":"ƶ","Ʒ":"ʒ","Ƹ":"ƹ","Ƽ":"ƽ","DŽ":"dž","Dž":"dž","LJ":"lj","Lj":"lj","NJ":"nj","Nj":"nj","Ǎ":"ǎ","Ǐ":"ǐ","Ǒ":"ǒ","Ǔ":"ǔ","Ǖ":"ǖ","Ǘ":"ǘ","Ǚ":"ǚ","Ǜ":"ǜ","Ǟ":"ǟ","Ǡ":"ǡ","Ǣ":"ǣ","Ǥ":"ǥ","Ǧ":"ǧ","Ǩ":"ǩ","Ǫ":"ǫ","Ǭ":"ǭ","Ǯ":"ǯ","DZ":"dz","Dz":"dz","Ǵ":"ǵ","Ƕ":"ƕ","Ƿ":"ƿ","Ǹ":"ǹ","Ǻ":"ǻ","Ǽ":"ǽ","Ǿ":"ǿ","Ȁ":"ȁ","Ȃ":"ȃ","Ȅ":"ȅ","Ȇ":"ȇ","Ȉ":"ȉ","Ȋ":"ȋ","Ȍ":"ȍ","Ȏ":"ȏ","Ȑ":"ȑ","Ȓ":"ȓ","Ȕ":"ȕ","Ȗ":"ȗ","Ș":"ș","Ț":"ț","Ȝ":"ȝ","Ȟ":"ȟ","Ƞ":"ƞ","Ȣ":"ȣ","Ȥ":"ȥ","Ȧ":"ȧ","Ȩ":"ȩ","Ȫ":"ȫ","Ȭ":"ȭ","Ȯ":"ȯ","Ȱ":"ȱ","Ȳ":"ȳ","Ⱥ":"ⱥ","Ȼ":"ȼ","Ƚ":"ƚ","Ⱦ":"ⱦ","Ɂ":"ɂ","Ƀ":"ƀ","Ʉ":"ʉ","Ʌ":"ʌ","Ɇ":"ɇ","Ɉ":"ɉ","Ɋ":"ɋ","Ɍ":"ɍ","Ɏ":"ɏ","ͅ":"ι","Ͱ":"ͱ","Ͳ":"ͳ","Ͷ":"ͷ","Ϳ":"ϳ","Ά":"ά","Έ":"έ","Ή":"ή","Ί":"ί","Ό":"ό","Ύ":"ύ","Ώ":"ώ","Α":"α","Β":"β","Γ":"γ","Δ":"δ","Ε":"ε","Ζ":"ζ","Η":"η","Θ":"θ","Ι":"ι","Κ":"κ","Λ":"λ","Μ":"μ","Ν":"ν","Ξ":"ξ","Ο":"ο","Π":"π","Ρ":"ρ","Σ":"σ","Τ":"τ","Υ":"υ","Φ":"φ","Χ":"χ","Ψ":"ψ","Ω":"ω","Ϊ":"ϊ","Ϋ":"ϋ","ς":"σ","Ϗ":"ϗ","ϐ":"β","ϑ":"θ","ϕ":"φ","ϖ":"π","Ϙ":"ϙ","Ϛ":"ϛ","Ϝ":"ϝ","Ϟ":"ϟ","Ϡ":"ϡ","Ϣ":"ϣ","Ϥ":"ϥ","Ϧ":"ϧ","Ϩ":"ϩ","Ϫ":"ϫ","Ϭ":"ϭ","Ϯ":"ϯ","ϰ":"κ","ϱ":"ρ","ϴ":"θ","ϵ":"ε","Ϸ":"ϸ","Ϲ":"ϲ","Ϻ":"ϻ","Ͻ":"ͻ","Ͼ":"ͼ","Ͽ":"ͽ","Ѐ":"ѐ","Ё":"ё","Ђ":"ђ","Ѓ":"ѓ","Є":"є","Ѕ":"ѕ","І":"і","Ї":"ї","Ј":"ј","Љ":"љ","Њ":"њ","Ћ":"ћ","Ќ":"ќ","Ѝ":"ѝ","Ў":"ў","Џ":"џ","А":"а","Б":"б","В":"в","Г":"г","Д":"д","Е":"е","Ж":"ж","З":"з","И":"и","Й":"й","К":"к","Л":"л","М":"м","Н":"н","О":"о","П":"п","Р":"р","С":"с","Т":"т","У":"у","Ф":"ф","Х":"х","Ц":"ц","Ч":"ч","Ш":"ш","Щ":"щ","Ъ":"ъ","Ы":"ы","Ь":"ь","Э":"э","Ю":"ю","Я":"я","Ѡ":"ѡ","Ѣ":"ѣ","Ѥ":"ѥ","Ѧ":"ѧ","Ѩ":"ѩ","Ѫ":"ѫ","Ѭ":"ѭ","Ѯ":"ѯ","Ѱ":"ѱ","Ѳ":"ѳ","Ѵ":"ѵ","Ѷ":"ѷ","Ѹ":"ѹ","Ѻ":"ѻ","Ѽ":"ѽ","Ѿ":"ѿ","Ҁ":"ҁ","Ҋ":"ҋ","Ҍ":"ҍ","Ҏ":"ҏ","Ґ":"ґ","Ғ":"ғ","Ҕ":"ҕ","Җ":"җ","Ҙ":"ҙ","Қ":"қ","Ҝ":"ҝ","Ҟ":"ҟ","Ҡ":"ҡ","Ң":"ң","Ҥ":"ҥ","Ҧ":"ҧ","Ҩ":"ҩ","Ҫ":"ҫ","Ҭ":"ҭ","Ү":"ү","Ұ":"ұ","Ҳ":"ҳ","Ҵ":"ҵ","Ҷ":"ҷ","Ҹ":"ҹ","Һ":"һ","Ҽ":"ҽ","Ҿ":"ҿ","Ӏ":"ӏ","Ӂ":"ӂ","Ӄ":"ӄ","Ӆ":"ӆ","Ӈ":"ӈ","Ӊ":"ӊ","Ӌ":"ӌ","Ӎ":"ӎ","Ӑ":"ӑ","Ӓ":"ӓ","Ӕ":"ӕ","Ӗ":"ӗ","Ә":"ә","Ӛ":"ӛ","Ӝ":"ӝ","Ӟ":"ӟ","Ӡ":"ӡ","Ӣ":"ӣ","Ӥ":"ӥ","Ӧ":"ӧ","Ө":"ө","Ӫ":"ӫ","Ӭ":"ӭ","Ӯ":"ӯ","Ӱ":"ӱ","Ӳ":"ӳ","Ӵ":"ӵ","Ӷ":"ӷ","Ӹ":"ӹ","Ӻ":"ӻ","Ӽ":"ӽ","Ӿ":"ӿ","Ԁ":"ԁ","Ԃ":"ԃ","Ԅ":"ԅ","Ԇ":"ԇ","Ԉ":"ԉ","Ԋ":"ԋ","Ԍ":"ԍ","Ԏ":"ԏ","Ԑ":"ԑ","Ԓ":"ԓ","Ԕ":"ԕ","Ԗ":"ԗ","Ԙ":"ԙ","Ԛ":"ԛ","Ԝ":"ԝ","Ԟ":"ԟ","Ԡ":"ԡ","Ԣ":"ԣ","Ԥ":"ԥ","Ԧ":"ԧ","Ԩ":"ԩ","Ԫ":"ԫ","Ԭ":"ԭ","Ԯ":"ԯ","Ա":"ա","Բ":"բ","Գ":"գ","Դ":"դ","Ե":"ե","Զ":"զ","Է":"է","Ը":"ը","Թ":"թ","Ժ":"ժ","Ի":"ի","Լ":"լ","Խ":"խ","Ծ":"ծ","Կ":"կ","Հ":"հ","Ձ":"ձ","Ղ":"ղ","Ճ":"ճ","Մ":"մ","Յ":"յ","Ն":"ն","Շ":"շ","Ո":"ո","Չ":"չ","Պ":"պ","Ջ":"ջ","Ռ":"ռ","Ս":"ս","Վ":"վ","Տ":"տ","Ր":"ր","Ց":"ց","Ւ":"ւ","Փ":"փ","Ք":"ք","Օ":"օ","Ֆ":"ֆ","Ⴀ":"ⴀ","Ⴁ":"ⴁ","Ⴂ":"ⴂ","Ⴃ":"ⴃ","Ⴄ":"ⴄ","Ⴅ":"ⴅ","Ⴆ":"ⴆ","Ⴇ":"ⴇ","Ⴈ":"ⴈ","Ⴉ":"ⴉ","Ⴊ":"ⴊ","Ⴋ":"ⴋ","Ⴌ":"ⴌ","Ⴍ":"ⴍ","Ⴎ":"ⴎ","Ⴏ":"ⴏ","Ⴐ":"ⴐ","Ⴑ":"ⴑ","Ⴒ":"ⴒ","Ⴓ":"ⴓ","Ⴔ":"ⴔ","Ⴕ":"ⴕ","Ⴖ":"ⴖ","Ⴗ":"ⴗ","Ⴘ":"ⴘ","Ⴙ":"ⴙ","Ⴚ":"ⴚ","Ⴛ":"ⴛ","Ⴜ":"ⴜ","Ⴝ":"ⴝ","Ⴞ":"ⴞ","Ⴟ":"ⴟ","Ⴠ":"ⴠ","Ⴡ":"ⴡ","Ⴢ":"ⴢ","Ⴣ":"ⴣ","Ⴤ":"ⴤ","Ⴥ":"ⴥ","Ⴧ":"ⴧ","Ⴭ":"ⴭ","Ḁ":"ḁ","Ḃ":"ḃ","Ḅ":"ḅ","Ḇ":"ḇ","Ḉ":"ḉ","Ḋ":"ḋ","Ḍ":"ḍ","Ḏ":"ḏ","Ḑ":"ḑ","Ḓ":"ḓ","Ḕ":"ḕ","Ḗ":"ḗ","Ḙ":"ḙ","Ḛ":"ḛ","Ḝ":"ḝ","Ḟ":"ḟ","Ḡ":"ḡ","Ḣ":"ḣ","Ḥ":"ḥ","Ḧ":"ḧ","Ḩ":"ḩ","Ḫ":"ḫ","Ḭ":"ḭ","Ḯ":"ḯ","Ḱ":"ḱ","Ḳ":"ḳ","Ḵ":"ḵ","Ḷ":"ḷ","Ḹ":"ḹ","Ḻ":"ḻ","Ḽ":"ḽ","Ḿ":"ḿ","Ṁ":"ṁ","Ṃ":"ṃ","Ṅ":"ṅ","Ṇ":"ṇ","Ṉ":"ṉ","Ṋ":"ṋ","Ṍ":"ṍ","Ṏ":"ṏ","Ṑ":"ṑ","Ṓ":"ṓ","Ṕ":"ṕ","Ṗ":"ṗ","Ṙ":"ṙ","Ṛ":"ṛ","Ṝ":"ṝ","Ṟ":"ṟ","Ṡ":"ṡ","Ṣ":"ṣ","Ṥ":"ṥ","Ṧ":"ṧ","Ṩ":"ṩ","Ṫ":"ṫ","Ṭ":"ṭ","Ṯ":"ṯ","Ṱ":"ṱ","Ṳ":"ṳ","Ṵ":"ṵ","Ṷ":"ṷ","Ṹ":"ṹ","Ṻ":"ṻ","Ṽ":"ṽ","Ṿ":"ṿ","Ẁ":"ẁ","Ẃ":"ẃ","Ẅ":"ẅ","Ẇ":"ẇ","Ẉ":"ẉ","Ẋ":"ẋ","Ẍ":"ẍ","Ẏ":"ẏ","Ẑ":"ẑ","Ẓ":"ẓ","Ẕ":"ẕ","ẛ":"ṡ","Ạ":"ạ","Ả":"ả","Ấ":"ấ","Ầ":"ầ","Ẩ":"ẩ","Ẫ":"ẫ","Ậ":"ậ","Ắ":"ắ","Ằ":"ằ","Ẳ":"ẳ","Ẵ":"ẵ","Ặ":"ặ","Ẹ":"ẹ","Ẻ":"ẻ","Ẽ":"ẽ","Ế":"ế","Ề":"ề","Ể":"ể","Ễ":"ễ","Ệ":"ệ","Ỉ":"ỉ","Ị":"ị","Ọ":"ọ","Ỏ":"ỏ","Ố":"ố","Ồ":"ồ","Ổ":"ổ","Ỗ":"ỗ","Ộ":"ộ","Ớ":"ớ","Ờ":"ờ","Ở":"ở","Ỡ":"ỡ","Ợ":"ợ","Ụ":"ụ","Ủ":"ủ","Ứ":"ứ","Ừ":"ừ","Ử":"ử","Ữ":"ữ","Ự":"ự","Ỳ":"ỳ","Ỵ":"ỵ","Ỷ":"ỷ","Ỹ":"ỹ","Ỻ":"ỻ","Ỽ":"ỽ","Ỿ":"ỿ","Ἀ":"ἀ","Ἁ":"ἁ","Ἂ":"ἂ","Ἃ":"ἃ","Ἄ":"ἄ","Ἅ":"ἅ","Ἆ":"ἆ","Ἇ":"ἇ","Ἐ":"ἐ","Ἑ":"ἑ","Ἒ":"ἒ","Ἓ":"ἓ","Ἔ":"ἔ","Ἕ":"ἕ","Ἠ":"ἠ","Ἡ":"ἡ","Ἢ":"ἢ","Ἣ":"ἣ","Ἤ":"ἤ","Ἥ":"ἥ","Ἦ":"ἦ","Ἧ":"ἧ","Ἰ":"ἰ","Ἱ":"ἱ","Ἲ":"ἲ","Ἳ":"ἳ","Ἴ":"ἴ","Ἵ":"ἵ","Ἶ":"ἶ","Ἷ":"ἷ","Ὀ":"ὀ","Ὁ":"ὁ","Ὂ":"ὂ","Ὃ":"ὃ","Ὄ":"ὄ","Ὅ":"ὅ","Ὑ":"ὑ","Ὓ":"ὓ","Ὕ":"ὕ","Ὗ":"ὗ","Ὠ":"ὠ","Ὡ":"ὡ","Ὢ":"ὢ","Ὣ":"ὣ","Ὤ":"ὤ","Ὥ":"ὥ","Ὦ":"ὦ","Ὧ":"ὧ","Ᾰ":"ᾰ","Ᾱ":"ᾱ","Ὰ":"ὰ","Ά":"ά","ι":"ι","Ὲ":"ὲ","Έ":"έ","Ὴ":"ὴ","Ή":"ή","Ῐ":"ῐ","Ῑ":"ῑ","Ὶ":"ὶ","Ί":"ί","Ῠ":"ῠ","Ῡ":"ῡ","Ὺ":"ὺ","Ύ":"ύ","Ῥ":"ῥ","Ὸ":"ὸ","Ό":"ό","Ὼ":"ὼ","Ώ":"ώ","Ω":"ω","K":"k","Å":"å","Ⅎ":"ⅎ","Ⅰ":"ⅰ","Ⅱ":"ⅱ","Ⅲ":"ⅲ","Ⅳ":"ⅳ","Ⅴ":"ⅴ","Ⅵ":"ⅵ","Ⅶ":"ⅶ","Ⅷ":"ⅷ","Ⅸ":"ⅸ","Ⅹ":"ⅹ","Ⅺ":"ⅺ","Ⅻ":"ⅻ","Ⅼ":"ⅼ","Ⅽ":"ⅽ","Ⅾ":"ⅾ","Ⅿ":"ⅿ","Ↄ":"ↄ","Ⓐ":"ⓐ","Ⓑ":"ⓑ","Ⓒ":"ⓒ","Ⓓ":"ⓓ","Ⓔ":"ⓔ","Ⓕ":"ⓕ","Ⓖ":"ⓖ","Ⓗ":"ⓗ","Ⓘ":"ⓘ","Ⓙ":"ⓙ","Ⓚ":"ⓚ","Ⓛ":"ⓛ","Ⓜ":"ⓜ","Ⓝ":"ⓝ","Ⓞ":"ⓞ","Ⓟ":"ⓟ","Ⓠ":"ⓠ","Ⓡ":"ⓡ","Ⓢ":"ⓢ","Ⓣ":"ⓣ","Ⓤ":"ⓤ","Ⓥ":"ⓥ","Ⓦ":"ⓦ","Ⓧ":"ⓧ","Ⓨ":"ⓨ","Ⓩ":"ⓩ","Ⰰ":"ⰰ","Ⰱ":"ⰱ","Ⰲ":"ⰲ","Ⰳ":"ⰳ","Ⰴ":"ⰴ","Ⰵ":"ⰵ","Ⰶ":"ⰶ","Ⰷ":"ⰷ","Ⰸ":"ⰸ","Ⰹ":"ⰹ","Ⰺ":"ⰺ","Ⰻ":"ⰻ","Ⰼ":"ⰼ","Ⰽ":"ⰽ","Ⰾ":"ⰾ","Ⰿ":"ⰿ","Ⱀ":"ⱀ","Ⱁ":"ⱁ","Ⱂ":"ⱂ","Ⱃ":"ⱃ","Ⱄ":"ⱄ","Ⱅ":"ⱅ","Ⱆ":"ⱆ","Ⱇ":"ⱇ","Ⱈ":"ⱈ","Ⱉ":"ⱉ","Ⱊ":"ⱊ","Ⱋ":"ⱋ","Ⱌ":"ⱌ","Ⱍ":"ⱍ","Ⱎ":"ⱎ","Ⱏ":"ⱏ","Ⱐ":"ⱐ","Ⱑ":"ⱑ","Ⱒ":"ⱒ","Ⱓ":"ⱓ","Ⱔ":"ⱔ","Ⱕ":"ⱕ","Ⱖ":"ⱖ","Ⱗ":"ⱗ","Ⱘ":"ⱘ","Ⱙ":"ⱙ","Ⱚ":"ⱚ","Ⱛ":"ⱛ","Ⱜ":"ⱜ","Ⱝ":"ⱝ","Ⱞ":"ⱞ","Ⱡ":"ⱡ","Ɫ":"ɫ","Ᵽ":"ᵽ","Ɽ":"ɽ","Ⱨ":"ⱨ","Ⱪ":"ⱪ","Ⱬ":"ⱬ","Ɑ":"ɑ","Ɱ":"ɱ","Ɐ":"ɐ","Ɒ":"ɒ","Ⱳ":"ⱳ","Ⱶ":"ⱶ","Ȿ":"ȿ","Ɀ":"ɀ","Ⲁ":"ⲁ","Ⲃ":"ⲃ","Ⲅ":"ⲅ","Ⲇ":"ⲇ","Ⲉ":"ⲉ","Ⲋ":"ⲋ","Ⲍ":"ⲍ","Ⲏ":"ⲏ","Ⲑ":"ⲑ","Ⲓ":"ⲓ","Ⲕ":"ⲕ","Ⲗ":"ⲗ","Ⲙ":"ⲙ","Ⲛ":"ⲛ","Ⲝ":"ⲝ","Ⲟ":"ⲟ","Ⲡ":"ⲡ","Ⲣ":"ⲣ","Ⲥ":"ⲥ","Ⲧ":"ⲧ","Ⲩ":"ⲩ","Ⲫ":"ⲫ","Ⲭ":"ⲭ","Ⲯ":"ⲯ","Ⲱ":"ⲱ","Ⲳ":"ⲳ","Ⲵ":"ⲵ","Ⲷ":"ⲷ","Ⲹ":"ⲹ","Ⲻ":"ⲻ","Ⲽ":"ⲽ","Ⲿ":"ⲿ","Ⳁ":"ⳁ","Ⳃ":"ⳃ","Ⳅ":"ⳅ","Ⳇ":"ⳇ","Ⳉ":"ⳉ","Ⳋ":"ⳋ","Ⳍ":"ⳍ","Ⳏ":"ⳏ","Ⳑ":"ⳑ","Ⳓ":"ⳓ","Ⳕ":"ⳕ","Ⳗ":"ⳗ","Ⳙ":"ⳙ","Ⳛ":"ⳛ","Ⳝ":"ⳝ","Ⳟ":"ⳟ","Ⳡ":"ⳡ","Ⳣ":"ⳣ","Ⳬ":"ⳬ","Ⳮ":"ⳮ","Ⳳ":"ⳳ","Ꙁ":"ꙁ","Ꙃ":"ꙃ","Ꙅ":"ꙅ","Ꙇ":"ꙇ","Ꙉ":"ꙉ","Ꙋ":"ꙋ","Ꙍ":"ꙍ","Ꙏ":"ꙏ","Ꙑ":"ꙑ","Ꙓ":"ꙓ","Ꙕ":"ꙕ","Ꙗ":"ꙗ","Ꙙ":"ꙙ","Ꙛ":"ꙛ","Ꙝ":"ꙝ","Ꙟ":"ꙟ","Ꙡ":"ꙡ","Ꙣ":"ꙣ","Ꙥ":"ꙥ","Ꙧ":"ꙧ","Ꙩ":"ꙩ","Ꙫ":"ꙫ","Ꙭ":"ꙭ","Ꚁ":"ꚁ","Ꚃ":"ꚃ","Ꚅ":"ꚅ","Ꚇ":"ꚇ","Ꚉ":"ꚉ","Ꚋ":"ꚋ","Ꚍ":"ꚍ","Ꚏ":"ꚏ","Ꚑ":"ꚑ","Ꚓ":"ꚓ","Ꚕ":"ꚕ","Ꚗ":"ꚗ","Ꚙ":"ꚙ","Ꚛ":"ꚛ","Ꜣ":"ꜣ","Ꜥ":"ꜥ","Ꜧ":"ꜧ","Ꜩ":"ꜩ","Ꜫ":"ꜫ","Ꜭ":"ꜭ","Ꜯ":"ꜯ","Ꜳ":"ꜳ","Ꜵ":"ꜵ","Ꜷ":"ꜷ","Ꜹ":"ꜹ","Ꜻ":"ꜻ","Ꜽ":"ꜽ","Ꜿ":"ꜿ","Ꝁ":"ꝁ","Ꝃ":"ꝃ","Ꝅ":"ꝅ","Ꝇ":"ꝇ","Ꝉ":"ꝉ","Ꝋ":"ꝋ","Ꝍ":"ꝍ","Ꝏ":"ꝏ","Ꝑ":"ꝑ","Ꝓ":"ꝓ","Ꝕ":"ꝕ","Ꝗ":"ꝗ","Ꝙ":"ꝙ","Ꝛ":"ꝛ","Ꝝ":"ꝝ","Ꝟ":"ꝟ","Ꝡ":"ꝡ","Ꝣ":"ꝣ","Ꝥ":"ꝥ","Ꝧ":"ꝧ","Ꝩ":"ꝩ","Ꝫ":"ꝫ","Ꝭ":"ꝭ","Ꝯ":"ꝯ","Ꝺ":"ꝺ","Ꝼ":"ꝼ","Ᵹ":"ᵹ","Ꝿ":"ꝿ","Ꞁ":"ꞁ","Ꞃ":"ꞃ","Ꞅ":"ꞅ","Ꞇ":"ꞇ","Ꞌ":"ꞌ","Ɥ":"ɥ","Ꞑ":"ꞑ","Ꞓ":"ꞓ","Ꞗ":"ꞗ","Ꞙ":"ꞙ","Ꞛ":"ꞛ","Ꞝ":"ꞝ","Ꞟ":"ꞟ","Ꞡ":"ꞡ","Ꞣ":"ꞣ","Ꞥ":"ꞥ","Ꞧ":"ꞧ","Ꞩ":"ꞩ","Ɦ":"ɦ","Ɜ":"ɜ","Ɡ":"ɡ","Ɬ":"ɬ","Ʞ":"ʞ","Ʇ":"ʇ","Ａ":"ａ","Ｂ":"ｂ","Ｃ":"ｃ","Ｄ":"ｄ","Ｅ":"ｅ","Ｆ":"ｆ","Ｇ":"ｇ","Ｈ":"ｈ","Ｉ":"ｉ","Ｊ":"ｊ","Ｋ":"ｋ","Ｌ":"ｌ","Ｍ":"ｍ","Ｎ":"ｎ","Ｏ":"ｏ","Ｐ":"ｐ","Ｑ":"ｑ","Ｒ":"ｒ","Ｓ":"ｓ","Ｔ":"ｔ","Ｕ":"ｕ","Ｖ":"ｖ","Ｗ":"ｗ","Ｘ":"ｘ","Ｙ":"ｙ","Ｚ":"ｚ","𐐀":"𐐨","𐐁":"𐐩","𐐂":"𐐪","𐐃":"𐐫","𐐄":"𐐬","𐐅":"𐐭","𐐆":"𐐮","𐐇":"𐐯","𐐈":"𐐰","𐐉":"𐐱","𐐊":"𐐲","𐐋":"𐐳","𐐌":"𐐴","𐐍":"𐐵","𐐎":"𐐶","𐐏":"𐐷","𐐐":"𐐸","𐐑":"𐐹","𐐒":"𐐺","𐐓":"𐐻","𐐔":"𐐼","𐐕":"𐐽","𐐖":"𐐾","𐐗":"𐐿","𐐘":"𐑀","𐐙":"𐑁","𐐚":"𐑂","𐐛":"𐑃","𐐜":"𐑄","𐐝":"𐑅","𐐞":"𐑆","𐐟":"𐑇","𐐠":"𐑈","𐐡":"𐑉","𐐢":"𐑊","𐐣":"𐑋","𐐤":"𐑌","𐐥":"𐑍","𐐦":"𐑎","𐐧":"𐑏","𑢠":"𑣀","𑢡":"𑣁","𑢢":"𑣂","𑢣":"𑣃","𑢤":"𑣄","𑢥":"𑣅","𑢦":"𑣆","𑢧":"𑣇","𑢨":"𑣈","𑢩":"𑣉","𑢪":"𑣊","𑢫":"𑣋","𑢬":"𑣌","𑢭":"𑣍","𑢮":"𑣎","𑢯":"𑣏","𑢰":"𑣐","𑢱":"𑣑","𑢲":"𑣒","𑢳":"𑣓","𑢴":"𑣔","𑢵":"𑣕","𑢶":"𑣖","𑢷":"𑣗","𑢸":"𑣘","𑢹":"𑣙","𑢺":"𑣚","𑢻":"𑣛","𑢼":"𑣜","𑢽":"𑣝","𑢾":"𑣞","𑢿":"𑣟","ß":"ss","İ":"i̇","ʼn":"ʼn","ǰ":"ǰ","ΐ":"ΐ","ΰ":"ΰ","և":"եւ","ẖ":"ẖ","ẗ":"ẗ","ẘ":"ẘ","ẙ":"ẙ","ẚ":"aʾ","ẞ":"ss","ὐ":"ὐ","ὒ":"ὒ","ὔ":"ὔ","ὖ":"ὖ","ᾀ":"ἀι","ᾁ":"ἁι","ᾂ":"ἂι","ᾃ":"ἃι","ᾄ":"ἄι","ᾅ":"ἅι","ᾆ":"ἆι","ᾇ":"ἇι","ᾈ":"ἀι","ᾉ":"ἁι","ᾊ":"ἂι","ᾋ":"ἃι","ᾌ":"ἄι","ᾍ":"ἅι","ᾎ":"ἆι","ᾏ":"ἇι","ᾐ":"ἠι","ᾑ":"ἡι","ᾒ":"ἢι","ᾓ":"ἣι","ᾔ":"ἤι","ᾕ":"ἥι","ᾖ":"ἦι","ᾗ":"ἧι","ᾘ":"ἠι","ᾙ":"ἡι","ᾚ":"ἢι","ᾛ":"ἣι","ᾜ":"ἤι","ᾝ":"ἥι","ᾞ":"ἦι","ᾟ":"ἧι","ᾠ":"ὠι","ᾡ":"ὡι","ᾢ":"ὢι","ᾣ":"ὣι","ᾤ":"ὤι","ᾥ":"ὥι","ᾦ":"ὦι","ᾧ":"ὧι","ᾨ":"ὠι","ᾩ":"ὡι","ᾪ":"ὢι","ᾫ":"ὣι","ᾬ":"ὤι","ᾭ":"ὥι","ᾮ":"ὦι","ᾯ":"ὧι","ᾲ":"ὰι","ᾳ":"αι","ᾴ":"άι","ᾶ":"ᾶ","ᾷ":"ᾶι","ᾼ":"αι","ῂ":"ὴι","ῃ":"ηι","ῄ":"ήι","ῆ":"ῆ","ῇ":"ῆι","ῌ":"ηι","ῒ":"ῒ","ΐ":"ΐ","ῖ":"ῖ","ῗ":"ῗ","ῢ":"ῢ","ΰ":"ΰ","ῤ":"ῤ","ῦ":"ῦ","ῧ":"ῧ","ῲ":"ὼι","ῳ":"ωι","ῴ":"ώι","ῶ":"ῶ","ῷ":"ῶι","ῼ":"ωι","ff":"ff","fi":"fi","fl":"fl","ffi":"ffi","ffl":"ffl","ſt":"st","st":"st","ﬓ":"մն","ﬔ":"մե","ﬕ":"մի","ﬖ":"վն","ﬗ":"մխ"};e.exports=function(e){return e.slice(1,e.length-1).trim().replace(r,function(e){return i[e]||" "})}},function(e,t,n){"use strict";function r(e){return{softbreak:"\n",escape:i,options:e||{},render:s}}var i=n(91).escapeXml,o=function(e,t,n){var r="<"+e;if(t&&t.length>0)for(var i,o=0;void 0!==(i=t[o]);)r+=" "+i[0]+'="'+i[1]+'"',o++;return n&&(r+=" /"),r+=">"},a=function(e){return e.replace(/([a-z])([A-Z])/g,"$1_$2").toLowerCase()},s=function(e){var t,n,r,i,s,u,l,c,p=e.walker(),f="",h="\n",d=0,m=function(e){f+=e,h=e},v=this.escape,g=function(){if("\n"!==h){f+="\n",h="\n";for(var e=d;e>0;e--)f+="  "}},y=this.options;for(y.time&&console.time("rendering"),f+='<?xml version="1.0" encoding="UTF-8"?>\n',f+='<!DOCTYPE CommonMark SYSTEM "CommonMark.dtd">\n';r=p.next();)if(s=r.entering,i=r.node,c=i.type,u=i.isContainer,l="ThematicBreak"===c||"Hardbreak"===c||"Softbreak"===c,n=a(c),s){switch(t=[],c){case"Document":t.push(["xmlns","http://commonmark.org/xml/1.0"]);break;case"List":null!==i.listType&&t.push(["type",i.listType.toLowerCase()]),null!==i.listStart&&t.push(["start",String(i.listStart)]),null!==i.listTight&&t.push(["tight",i.listTight?"true":"false"]);var _=i.listDelimiter;if(null!==_){var b="";b="."===_?"period":"paren",t.push(["delimiter",b])}break;case"CodeBlock":i.info&&t.push(["info",i.info]);break;case"Heading":t.push(["level",String(i.level)]);break;case"Link":case"Image":t.push(["destination",i.destination]),t.push(["title",i.title]);break;case"CustomInline":case"CustomBlock":t.push(["on_enter",i.onEnter]),t.push(["on_exit",i.onExit])}if(y.sourcepos){var x=i.sourcepos;x&&t.push(["sourcepos",String(x[0][0])+":"+String(x[0][1])+"-"+String(x[1][0])+":"+String(x[1][1])])}if(g(),m(o(n,t,l)),u)d+=1;else if(!u&&!l){var w=i.literal;w&&m(v(w)),m(o("/"+n))}}else d-=1,g(),m(o("/"+n));return y.time&&console.timeEnd("rendering"),f+="\n"};e.exports=r},function(e,t,n){"use strict";function r(e){i.Component.call(this,e)}var i=n(0),o=n(1076).Parser,a=n(574),s=n(1);r.prototype=Object.create(i.Component.prototype),r.prototype.constructor=r,r.prototype.render=function(){var e=this.props.containerProps||{},t=new a(this.props),n=new o(this.props.parserOptions),r=n.parse(this.props.source||"");if(this.props.walker)for(var s,u=r.walker();s=u.next();)this.props.walker.call(this,s,u);return this.props.className&&(e.className=this.props.className),i.createElement.apply(i,[this.props.containerTagName,e,this.props.childBefore].concat(t.render(r).concat([this.props.childAfter])))},r.propTypes={className:s.string,containerProps:s.object,source:s.string.isRequired,containerTagName:s.string,childBefore:s.object,childAfter:s.object,sourcePos:s.bool,escapeHtml:s.bool,skipHtml:s.bool,softBreak:s.string,allowNode:s.func,allowedTypes:s.array,disallowedTypes:s.array,transformLinkUri:s.func,transformImageUri:s.func,unwrapDisallowed:s.bool,renderers:s.object,walker:s.func,parserOptions:s.object},r.defaultProps={containerTagName:"div",parserOptions:{}},r.types=a.types,r.renderers=a.renderers,r.uriTransformer=a.uriTransformer,e.exports=r},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(257),l=r(u),c=n(164),p=r(c),f=n(259),h=r(f),d=n(231),m=r(d),v=n(239),g=r(v),y=n(258),_=r(y),b=n(0),x=r(b),w=n(1),k=r(w),E=1e3/60,S=function(e){function t(n){var r=this;i(this,t),e.call(this,n),this.wasAnimating=!1,this.animationID=null,this.prevTime=0,this.accumulatedTime=0,this.unreadPropStyle=null,this.clearUnreadPropStyle=function(e){var t=!1,n=r.state,i=n.currentStyle,o=n.currentVelocity,s=n.lastIdealStyle,u=n.lastIdealVelocity;for(var l in e)if(Object.prototype.hasOwnProperty.call(e,l)){var c=e[l];"number"==typeof c&&(t||(t=!0,i=a({},i),o=a({},o),s=a({},s),u=a({},u)),i[l]=c,o[l]=0,s[l]=c,u[l]=0)}t&&r.setState({currentStyle:i,currentVelocity:o,lastIdealStyle:s,lastIdealVelocity:u})},this.startAnimationIfNecessary=function(){r.animationID=g.default(function(e){var t=r.props.style;if(_.default(r.state.currentStyle,t,r.state.currentVelocity))return r.wasAnimating&&r.props.onRest&&r.props.onRest(),r.animationID=null,r.wasAnimating=!1,void(r.accumulatedTime=0);r.wasAnimating=!0;var n=e||m.default(),i=n-r.prevTime;if(r.prevTime=n,r.accumulatedTime=r.accumulatedTime+i,r.accumulatedTime>10*E&&(r.accumulatedTime=0),0===r.accumulatedTime)return r.animationID=null,void r.startAnimationIfNecessary();var o=(r.accumulatedTime-Math.floor(r.accumulatedTime/E)*E)/E,a=Math.floor(r.accumulatedTime/E),s={},u={},l={},c={};for(var p in t)if(Object.prototype.hasOwnProperty.call(t,p)){var f=t[p];if("number"==typeof f)l[p]=f,c[p]=0,s[p]=f,u[p]=0;else{for(var d=r.state.lastIdealStyle[p],v=r.state.lastIdealVelocity[p],g=0;g<a;g++){var y=h.default(E/1e3,d,v,f.val,f.stiffness,f.damping,f.precision);d=y[0],v=y[1]}var b=h.default(E/1e3,d,v,f.val,f.stiffness,f.damping,f.precision),x=b[0],w=b[1];l[p]=d+(x-d)*o,c[p]=v+(w-v)*o,s[p]=d,u[p]=v}}r.animationID=null,r.accumulatedTime-=a*E,r.setState({currentStyle:l,currentVelocity:c,lastIdealStyle:s,lastIdealVelocity:u}),r.unreadPropStyle=null,r.startAnimationIfNecessary()})},this.state=this.defaultState()}return o(t,e),s(t,null,[{key:"propTypes",value:{defaultStyle:k.default.objectOf(k.default.number),style:k.default.objectOf(k.default.oneOfType([k.default.number,k.default.object])).isRequired,children:k.default.func.isRequired,onRest:k.default.func},enumerable:!0}]),t.prototype.defaultState=function(){var e=this.props,t=e.defaultStyle,n=e.style,r=t||p.default(n),i=l.default(r);return{currentStyle:r,currentVelocity:i,lastIdealStyle:r,lastIdealVelocity:i}},t.prototype.componentDidMount=function(){this.prevTime=m.default(),this.startAnimationIfNecessary()},t.prototype.componentWillReceiveProps=function(e){null!=this.unreadPropStyle&&this.clearUnreadPropStyle(this.unreadPropStyle),this.unreadPropStyle=e.style,null==this.animationID&&(this.prevTime=m.default(),this.startAnimationIfNecessary())},t.prototype.componentWillUnmount=function(){null!=this.animationID&&(g.default.cancel(this.animationID),this.animationID=null)},t.prototype.render=function(){var e=this.props.children(this.state.currentStyle);return e&&x.default.Children.only(e)},t}(x.default.Component);t.default=S,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function a(e,t,n){for(var r=0;r<e.length;r++)if(!b.default(e[r],t[r],n[r]))return!1;return!0}t.__esModule=!0;var s=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),l=n(257),c=r(l),p=n(164),f=r(p),h=n(259),d=r(h),m=n(231),v=r(m),g=n(239),y=r(g),_=n(258),b=r(_),x=n(0),w=r(x),k=n(1),E=r(k),S=1e3/60,C=function(e){function t(n){var r=this;i(this,t),e.call(this,n),this.animationID=null,this.prevTime=0,this.accumulatedTime=0,this.unreadPropStyles=null,this.clearUnreadPropStyle=function(e){for(var t=r.state,n=t.currentStyles,i=t.currentVelocities,o=t.lastIdealStyles,a=t.lastIdealVelocities,u=!1,l=0;l<e.length;l++){var c=e[l],p=!1;for(var f in c)if(Object.prototype.hasOwnProperty.call(c,f)){var h=c[f];"number"==typeof h&&(p||(p=!0,u=!0,n[l]=s({},n[l]),i[l]=s({},i[l]),o[l]=s({},o[l]),a[l]=s({},a[l])),n[l][f]=h,i[l][f]=0,o[l][f]=h,a[l][f]=0)}}u&&r.setState({currentStyles:n,currentVelocities:i,lastIdealStyles:o,lastIdealVelocities:a})},this.startAnimationIfNecessary=function(){r.animationID=y.default(function(e){var t=r.props.styles(r.state.lastIdealStyles);if(a(r.state.currentStyles,t,r.state.currentVelocities))return r.animationID=null,void(r.accumulatedTime=0);var n=e||v.default(),i=n-r.prevTime;if(r.prevTime=n,r.accumulatedTime=r.accumulatedTime+i,r.accumulatedTime>10*S&&(r.accumulatedTime=0),0===r.accumulatedTime)return r.animationID=null,void r.startAnimationIfNecessary();for(var o=(r.accumulatedTime-Math.floor(r.accumulatedTime/S)*S)/S,s=Math.floor(r.accumulatedTime/S),u=[],l=[],c=[],p=[],f=0;f<t.length;f++){var h=t[f],m={},g={},y={},_={};for(var b in h)if(Object.prototype.hasOwnProperty.call(h,b)){var x=h[b];if("number"==typeof x)m[b]=x,g[b]=0,y[b]=x,_[b]=0;else{for(var w=r.state.lastIdealStyles[f][b],k=r.state.lastIdealVelocities[f][b],E=0;E<s;E++){var C=d.default(S/1e3,w,k,x.val,x.stiffness,x.damping,x.precision);w=C[0],k=C[1]}var A=d.default(S/1e3,w,k,x.val,x.stiffness,x.damping,x.precision),D=A[0],O=A[1];m[b]=w+(D-w)*o,g[b]=k+(O-k)*o,y[b]=w,_[b]=k}}c[f]=m,p[f]=g,u[f]=y,l[f]=_}r.animationID=null,r.accumulatedTime-=s*S,r.setState({currentStyles:c,currentVelocities:p,lastIdealStyles:u,lastIdealVelocities:l}),r.unreadPropStyles=null,r.startAnimationIfNecessary()})},this.state=this.defaultState()}return o(t,e),u(t,null,[{key:"propTypes",value:{defaultStyles:E.default.arrayOf(E.default.objectOf(E.default.number)),styles:E.default.func.isRequired,children:E.default.func.isRequired},enumerable:!0}]),t.prototype.defaultState=function(){var e=this.props,t=e.defaultStyles,n=e.styles,r=t||n().map(f.default),i=r.map(function(e){return c.default(e)});return{currentStyles:r,currentVelocities:i,lastIdealStyles:r,lastIdealVelocities:i}},t.prototype.componentDidMount=function(){this.prevTime=v.default(),this.startAnimationIfNecessary()},t.prototype.componentWillReceiveProps=function(e){null!=this.unreadPropStyles&&this.clearUnreadPropStyle(this.unreadPropStyles),this.unreadPropStyles=e.styles(this.state.lastIdealStyles),null==this.animationID&&(this.prevTime=v.default(),this.startAnimationIfNecessary())},t.prototype.componentWillUnmount=function(){null!=this.animationID&&(y.default.cancel(this.animationID),this.animationID=null)},t.prototype.render=function(){var e=this.props.children(this.state.currentStyles);return e&&w.default.Children.only(e)},t}(w.default.Component);t.default=C,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function a(e,t,n){var r=t;return null==r?e.map(function(e,t){return{key:e.key,data:e.data,style:n[t]}}):e.map(function(e,t){for(var i=0;i<r.length;i++)if(r[i].key===e.key)return{key:r[i].key,data:r[i].data,style:n[t]};return{key:e.key,data:e.data,style:n[t]}})}function s(e,t,n,r){if(r.length!==t.length)return!1;for(var i=0;i<r.length;i++)if(r[i].key!==t[i].key)return!1;for(var i=0;i<r.length;i++)if(!E.default(e[i],t[i].style,n[i]))return!1;return!0}function u(e,t,n,r,i,o,a,s,u){for(var l=y.default(r,i,function(e,r){var i=t(r);return null==i?(n({key:r.key,data:r.data}),null):E.default(o[e],i,a[e])?(n({key:r.key,data:r.data}),null):{key:r.key,data:r.data,style:i}}),c=[],p=[],h=[],d=[],m=0;m<l.length;m++){for(var v=l[m],g=null,_=0;_<r.length;_++)if(r[_].key===v.key){g=_;break}if(null==g){var b=e(v);c[m]=b,h[m]=b;var x=f.default(v.style);p[m]=x,d[m]=x}else c[m]=o[g],h[m]=s[g],p[m]=a[g],d[m]=u[g]}return[l,c,p,h,d]}t.__esModule=!0;var l=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},c=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),p=n(257),f=r(p),h=n(164),d=r(h),m=n(259),v=r(m),g=n(1084),y=r(g),_=n(231),b=r(_),x=n(239),w=r(x),k=n(258),E=r(k),S=n(0),C=r(S),A=n(1),D=r(A),O=1e3/60,M=function(e){function t(n){var r=this;i(this,t),e.call(this,n),this.unmounting=!1,this.animationID=null,this.prevTime=0,this.accumulatedTime=0,this.unreadPropStyles=null,this.clearUnreadPropStyle=function(e){for(var t=u(r.props.willEnter,r.props.willLeave,r.props.didLeave,r.state.mergedPropsStyles,e,r.state.currentStyles,r.state.currentVelocities,r.state.lastIdealStyles,r.state.lastIdealVelocities),n=t[0],i=t[1],o=t[2],a=t[3],s=t[4],c=0;c<e.length;c++){var p=e[c].style,f=!1;for(var h in p)if(Object.prototype.hasOwnProperty.call(p,h)){var d=p[h];"number"==typeof d&&(f||(f=!0,i[c]=l({},i[c]),o[c]=l({},o[c]),a[c]=l({},a[c]),s[c]=l({},s[c]),n[c]={key:n[c].key,data:n[c].data,style:l({},n[c].style)}),i[c][h]=d,o[c][h]=0,a[c][h]=d,s[c][h]=0,n[c].style[h]=d)}}r.setState({currentStyles:i,currentVelocities:o,mergedPropsStyles:n,lastIdealStyles:a,lastIdealVelocities:s})},this.startAnimationIfNecessary=function(){r.unmounting||(r.animationID=w.default(function(e){if(!r.unmounting){var t=r.props.styles,n="function"==typeof t?t(a(r.state.mergedPropsStyles,r.unreadPropStyles,r.state.lastIdealStyles)):t;if(s(r.state.currentStyles,n,r.state.currentVelocities,r.state.mergedPropsStyles))return r.animationID=null,void(r.accumulatedTime=0);var i=e||b.default(),o=i-r.prevTime;if(r.prevTime=i,r.accumulatedTime=r.accumulatedTime+o,r.accumulatedTime>10*O&&(r.accumulatedTime=0),0===r.accumulatedTime)return r.animationID=null,void r.startAnimationIfNecessary();for(var l=(r.accumulatedTime-Math.floor(r.accumulatedTime/O)*O)/O,c=Math.floor(r.accumulatedTime/O),p=u(r.props.willEnter,r.props.willLeave,r.props.didLeave,r.state.mergedPropsStyles,n,r.state.currentStyles,r.state.currentVelocities,r.state.lastIdealStyles,r.state.lastIdealVelocities),f=p[0],h=p[1],d=p[2],m=p[3],g=p[4],y=0;y<f.length;y++){var _=f[y].style,x={},w={},k={},E={};for(var S in _)if(Object.prototype.hasOwnProperty.call(_,S)){var C=_[S];if("number"==typeof C)x[S]=C,w[S]=0,k[S]=C,E[S]=0;else{for(var A=m[y][S],D=g[y][S],M=0;M<c;M++){var T=v.default(O/1e3,A,D,C.val,C.stiffness,C.damping,C.precision);A=T[0],D=T[1]}var P=v.default(O/1e3,A,D,C.val,C.stiffness,C.damping,C.precision),I=P[0],R=P[1];x[S]=A+(I-A)*l,w[S]=D+(R-D)*l,k[S]=A,E[S]=D}}m[y]=k,g[y]=E,h[y]=x,d[y]=w}r.animationID=null,r.accumulatedTime-=c*O,r.setState({currentStyles:h,currentVelocities:d,lastIdealStyles:m,lastIdealVelocities:g,mergedPropsStyles:f}),r.unreadPropStyles=null,r.startAnimationIfNecessary()}}))},this.state=this.defaultState()}return o(t,e),c(t,null,[{key:"propTypes",value:{defaultStyles:D.default.arrayOf(D.default.shape({key:D.default.string.isRequired,data:D.default.any,style:D.default.objectOf(D.default.number).isRequired})),styles:D.default.oneOfType([D.default.func,D.default.arrayOf(D.default.shape({key:D.default.string.isRequired,data:D.default.any,style:D.default.objectOf(D.default.oneOfType([D.default.number,D.default.object])).isRequired}))]).isRequired,children:D.default.func.isRequired,willEnter:D.default.func,willLeave:D.default.func,didLeave:D.default.func},enumerable:!0},{key:"defaultProps",value:{willEnter:function(e){return d.default(e.style)},willLeave:function(){return null},didLeave:function(){}},enumerable:!0}]),t.prototype.defaultState=function(){var e=this.props,t=e.defaultStyles,n=e.styles,r=e.willEnter,i=e.willLeave,o=e.didLeave,a="function"==typeof n?n(t):n,s=void 0;s=null==t?a:t.map(function(e){for(var t=0;t<a.length;t++)if(a[t].key===e.key)return a[t];return e});var l=null==t?a.map(function(e){return d.default(e.style)}):t.map(function(e){return d.default(e.style)}),c=null==t?a.map(function(e){return f.default(e.style)}):t.map(function(e){return f.default(e.style)}),p=u(r,i,o,s,a,l,c,l,c),h=p[0];return{currentStyles:p[1],currentVelocities:p[2],lastIdealStyles:p[3],lastIdealVelocities:p[4],mergedPropsStyles:h}},t.prototype.componentDidMount=function(){this.prevTime=b.default(),this.startAnimationIfNecessary()},t.prototype.componentWillReceiveProps=function(e){this.unreadPropStyles&&this.clearUnreadPropStyle(this.unreadPropStyles);var t=e.styles;this.unreadPropStyles="function"==typeof t?t(a(this.state.mergedPropsStyles,this.unreadPropStyles,this.state.lastIdealStyles)):t,null==this.animationID&&(this.prevTime=b.default(),this.startAnimationIfNecessary())},t.prototype.componentWillUnmount=function(){this.unmounting=!0,null!=this.animationID&&(w.default.cancel(this.animationID),this.animationID=null)},t.prototype.render=function(){var e=a(this.state.mergedPropsStyles,this.unreadPropStyles,this.state.currentStyles),t=this.props.children(e);return t&&C.default.Children.only(t)},t}(C.default.Component);t.default=M,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){for(var r={},i=0;i<e.length;i++)r[e[i].key]=i;for(var o={},i=0;i<t.length;i++)o[t[i].key]=i;for(var a=[],i=0;i<t.length;i++)a[i]=t[i];for(var i=0;i<e.length;i++)if(!Object.prototype.hasOwnProperty.call(o,e[i].key)){var s=n(i,e[i]);null!=s&&a.push(s)}return a.sort(function(e,n){var i=o[e.key],a=o[n.key],s=r[e.key],u=r[n.key];if(null!=i&&null!=a)return o[e.key]-o[n.key];if(null!=s&&null!=u)return r[e.key]-r[n.key];if(null!=i){for(var l=0;l<t.length;l++){var c=t[l].key;if(Object.prototype.hasOwnProperty.call(r,c)){if(i<o[c]&&u>r[c])return-1;if(i>o[c]&&u<r[c])return 1}}return 1}for(var l=0;l<t.length;l++){var c=t[l].key;if(Object.prototype.hasOwnProperty.call(r,c)){if(a<o[c]&&s>r[c])return 1;if(a>o[c]&&s<r[c])return-1}}return-1})}t.__esModule=!0,t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e.default:e}t.__esModule=!0;var i=n(1081);t.Motion=r(i);var o=n(1082);t.StaggeredMotion=r(o);var a=n(1083);t.TransitionMotion=r(a);var s=n(1087);t.spring=r(s);var u=n(471);t.presets=r(u);var l=n(164);t.stripStyle=r(l);var c=n(1086);t.reorderKeys=r(c)},function(e,t,n){"use strict";function r(){}t.__esModule=!0,t.default=r;e.exports=t.default},function(e,t,n){"use strict";function r(e,t){return i({},s,t,{val:e})}t.__esModule=!0;var i=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e};t.default=r;var o=n(471),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s=i({},a.default.noWobble,{precision:.01});e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0,t.default=void 0;var s=n(0),u=n(1),l=r(u),c=n(472),p=r(c),f=n(473),h=(r(f),function(e){function t(n,r){i(this,t);var a=o(this,e.call(this,n,r));return a.store=n.store,a}return a(t,e),t.prototype.getChildContext=function(){return{store:this.store}},t.prototype.render=function(){return s.Children.only(this.props.children)},t}(s.Component));t.default=h,h.propTypes={store:p.default.isRequired,children:l.default.element.isRequired},h.childContextTypes={store:p.default.isRequired}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function s(e){return e.displayName||e.name||"Component"}function u(e,t){try{return e.apply(t)}catch(e){return A.value=e,A}}function l(e,t,n){var r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},l=Boolean(e),f=e||E,d=void 0;d="function"==typeof t?t:t?(0,g.default)(t):S;var v=n||C,y=r.pure,_=void 0===y||y,b=r.withRef,w=void 0!==b&&b,O=_&&v!==C,M=D++;return function(e){function t(e,t,n){var r=v(e,t,n);return r}var n="Connect("+s(e)+")",r=function(r){function s(e,t){i(this,s);var a=o(this,r.call(this,e,t));a.version=M,a.store=e.store||t.store,(0,k.default)(a.store,'Could not find "store" in either the context or props of "'+n+'". Either wrap the root component in a <Provider>, or explicitly pass "store" as a prop to "'+n+'".');var u=a.store.getState();return a.state={storeState:u},a.clearCache(),a}return a(s,r),s.prototype.shouldComponentUpdate=function(){return!_||this.haveOwnPropsChanged||this.hasStoreStateChanged},s.prototype.computeStateProps=function(e,t){if(!this.finalMapStateToProps)return this.configureFinalMapState(e,t);var n=e.getState(),r=this.doStatePropsDependOnOwnProps?this.finalMapStateToProps(n,t):this.finalMapStateToProps(n);return r},s.prototype.configureFinalMapState=function(e,t){var n=f(e.getState(),t),r="function"==typeof n;return this.finalMapStateToProps=r?n:f,this.doStatePropsDependOnOwnProps=1!==this.finalMapStateToProps.length,r?this.computeStateProps(e,t):n},s.prototype.computeDispatchProps=function(e,t){if(!this.finalMapDispatchToProps)return this.configureFinalMapDispatch(e,t);var n=e.dispatch,r=this.doDispatchPropsDependOnOwnProps?this.finalMapDispatchToProps(n,t):this.finalMapDispatchToProps(n);return r},s.prototype.configureFinalMapDispatch=function(e,t){var n=d(e.dispatch,t),r="function"==typeof n;return this.finalMapDispatchToProps=r?n:d,this.doDispatchPropsDependOnOwnProps=1!==this.finalMapDispatchToProps.length,r?this.computeDispatchProps(e,t):n},s.prototype.updateStatePropsIfNeeded=function(){var e=this.computeStateProps(this.store,this.props);return(!this.stateProps||!(0,m.default)(e,this.stateProps))&&(this.stateProps=e,!0)},s.prototype.updateDispatchPropsIfNeeded=function(){var e=this.computeDispatchProps(this.store,this.props);return(!this.dispatchProps||!(0,m.default)(e,this.dispatchProps))&&(this.dispatchProps=e,!0)},s.prototype.updateMergedPropsIfNeeded=function(){var e=t(this.stateProps,this.dispatchProps,this.props);return!(this.mergedProps&&O&&(0,m.default)(e,this.mergedProps))&&(this.mergedProps=e,!0)},s.prototype.isSubscribed=function(){return"function"==typeof this.unsubscribe},s.prototype.trySubscribe=function(){l&&!this.unsubscribe&&(this.unsubscribe=this.store.subscribe(this.handleChange.bind(this)),this.handleChange())},s.prototype.tryUnsubscribe=function(){this.unsubscribe&&(this.unsubscribe(),this.unsubscribe=null)},s.prototype.componentDidMount=function(){this.trySubscribe()},s.prototype.componentWillReceiveProps=function(e){_&&(0,m.default)(e,this.props)||(this.haveOwnPropsChanged=!0)},s.prototype.componentWillUnmount=function(){this.tryUnsubscribe(),this.clearCache()},s.prototype.clearCache=function(){this.dispatchProps=null,this.stateProps=null,this.mergedProps=null,this.haveOwnPropsChanged=!0,this.hasStoreStateChanged=!0,this.haveStatePropsBeenPrecalculated=!1,this.statePropsPrecalculationError=null,this.renderedElement=null,this.finalMapDispatchToProps=null,this.finalMapStateToProps=null},s.prototype.handleChange=function(){if(this.unsubscribe){var e=this.store.getState(),t=this.state.storeState;if(!_||t!==e){if(_&&!this.doStatePropsDependOnOwnProps){var n=u(this.updateStatePropsIfNeeded,this);if(!n)return;n===A&&(this.statePropsPrecalculationError=A.value),this.haveStatePropsBeenPrecalculated=!0}this.hasStoreStateChanged=!0,this.setState({storeState:e})}}},s.prototype.getWrappedInstance=function(){return(0,k.default)(w,"To access the wrapped instance, you need to specify { withRef: true } as the fourth argument of the connect() call."),this.refs.wrappedInstance},s.prototype.render=function(){var t=this.haveOwnPropsChanged,n=this.hasStoreStateChanged,r=this.haveStatePropsBeenPrecalculated,i=this.statePropsPrecalculationError,o=this.renderedElement;if(this.haveOwnPropsChanged=!1,this.hasStoreStateChanged=!1,this.haveStatePropsBeenPrecalculated=!1,this.statePropsPrecalculationError=null,i)throw i;var a=!0,s=!0;_&&o&&(a=n||t&&this.doStatePropsDependOnOwnProps,s=t&&this.doDispatchPropsDependOnOwnProps);var u=!1,l=!1;r?u=!0:a&&(u=this.updateStatePropsIfNeeded()),s&&(l=this.updateDispatchPropsIfNeeded());return!(!!(u||l||t)&&this.updateMergedPropsIfNeeded())&&o?o:(this.renderedElement=w?(0,p.createElement)(e,c({},this.mergedProps,{ref:"wrappedInstance"})):(0,p.createElement)(e,this.mergedProps),this.renderedElement)},s}(p.Component);return r.displayName=n,r.WrappedComponent=e,r.contextTypes={store:h.default},r.propTypes={store:h.default},(0,x.default)(r,e)}}t.__esModule=!0;var c=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e};t.default=l;var p=n(0),f=n(472),h=r(f),d=n(1091),m=r(d),v=n(1092),g=r(v),y=n(473),_=(r(y),n(421)),b=(r(_),n(758)),x=r(b),w=n(793),k=r(w),E=function(e){return{}},S=function(e){return{dispatch:e}},C=function(e,t,n){return c({},n,e,t)},A={value:null},D=0},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}t.__esModule=!0,t.connect=t.Provider=void 0;var i=n(1088),o=r(i),a=n(1089),s=r(a);t.Provider=o.default,t.connect=s.default},function(e,t,n){"use strict";function r(e,t){if(e===t)return!0;var n=Object.keys(e),r=Object.keys(t);if(n.length!==r.length)return!1;for(var i=Object.prototype.hasOwnProperty,o=0;o<n.length;o++)if(!i.call(t,n[o])||e[n[o]]!==t[n[o]])return!1;return!0}t.__esModule=!0,t.default=r},function(e,t,n){"use strict";function r(e){return function(t){return(0,i.bindActionCreators)(e,t)}}t.__esModule=!0,t.default=r;var i=n(486)},function(e,t,n){var r=n(1096);e.exports=r},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var s=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),l=n(0),c=r(l),p=n(1),f=r(p),h=n(209),d=r(h),m=n(260),v=r(m),g="undefined"!=typeof navigator?navigator.userAgent:"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.2 (KHTML, like Gecko) Safari/537.2",y=function(e){function t(e){i(this,t);var n=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e));return n.state={size:n.props.size},n}return a(t,e),u(t,[{key:"render",value:function(){var e=this.props,t=e.children,n=e.className,r=e.prefixer,i=e.split,o=e.style,a=this.state.size,u=["Pane",i,n],l=s({},o||{},{flex:1,position:"relative",outline:"none"});return void 0!==a&&("vertical"===i?l.width=a:(l.height=a,l.display="flex"),l.flex="none"),c.default.createElement("div",{className:u.join(" "),style:r.prefix(l)},t)}}]),t}(c.default.Component);y.propTypes={className:f.default.string.isRequired,children:f.default.node.isRequired,prefixer:f.default.instanceOf(d.default).isRequired,size:f.default.oneOfType([f.default.string,f.default.number]),split:f.default.oneOf(["vertical","horizontal"]),style:v.default},y.defaultProps={prefixer:new d.default({userAgent:g})},t.default=y,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0}),t.RESIZER_DEFAULT_CLASSNAME=void 0;var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(0),l=r(u),c=n(1),p=r(c),f=n(209),h=r(f),d=n(260),m=r(d),v="undefined"!=typeof navigator?navigator.userAgent:"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.2 (KHTML, like Gecko) Safari/537.2",g=t.RESIZER_DEFAULT_CLASSNAME="Resizer",y=function(e){function t(){return i(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return a(t,e),s(t,[{key:"render",value:function(){var e=this.props,t=e.className,n=e.onClick,r=e.onDoubleClick,i=e.onMouseDown,o=e.onTouchEnd,a=e.onTouchStart,s=e.prefixer,u=e.resizerClassName,c=e.split,p=e.style,f=[u,c,t];return l.default.createElement("span",{className:f.join(" "),style:s.prefix(p)||{},onMouseDown:function(e){return i(e)},onTouchStart:function(e){e.preventDefault(),a(e)},onTouchEnd:function(e){e.preventDefault(),o(e)},onClick:function(e){n&&(e.preventDefault(),n(e))},onDoubleClick:function(e){r&&(e.preventDefault(),r(e))}})}}]),t}(l.default.Component);y.propTypes={className:p.default.string.isRequired,onClick:p.default.func,onDoubleClick:p.default.func,onMouseDown:p.default.func.isRequired,onTouchStart:p.default.func.isRequired,onTouchEnd:p.default.func.isRequired,prefixer:p.default.instanceOf(h.default).isRequired,split:p.default.oneOf(["vertical","horizontal"]),style:m.default,resizerClassName:p.default.string.isRequired},y.defaultProps={prefixer:new h.default({userAgent:v}),resizerClassName:g},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function s(e,t){if(e.selection)e.selection.empty();else try{t.getSelection().removeAllRanges()}catch(e){}}Object.defineProperty(t,"__esModule",{value:!0});var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},l=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),c=n(0),p=r(c),f=n(1),h=r(f),d=n(449),m=r(d),v=n(209),g=r(v),y=n(260),_=r(y),b=n(1094),x=r(b),w=n(1095),k=r(w),E="undefined"!=typeof navigator?navigator.userAgent:"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.2 (KHTML, like Gecko) Safari/537.2",S=function(e){function t(){i(this,t);var e=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return e.onMouseDown=e.onMouseDown.bind(e),e.onTouchStart=e.onTouchStart.bind(e),e.onMouseMove=e.onMouseMove.bind(e),e.onTouchMove=e.onTouchMove.bind(e),e.onMouseUp=e.onMouseUp.bind(e),e.state={active:!1,resized:!1},e}return a(t,e),l(t,[{key:"componentDidMount",value:function(){this.setSize(this.props,this.state),document.addEventListener("mouseup",this.onMouseUp),document.addEventListener("mousemove",this.onMouseMove),document.addEventListener("touchmove",this.onTouchMove)}},{key:"componentWillReceiveProps",value:function(e){this.setSize(e,this.state)}},{key:"componentWillUnmount",value:function(){document.removeEventListener("mouseup",this.onMouseUp),document.removeEventListener("mousemove",this.onMouseMove),document.removeEventListener("touchmove",this.onTouchMove)}},{key:"onMouseDown",value:function(e){var t=u({},e,{touches:[{clientX:e.clientX,clientY:e.clientY}]});this.onTouchStart(t)}},{key:"onTouchStart",value:function(e){var t=this.props,n=t.allowResize,r=t.onDragStarted,i=t.split;if(n){s(document,window);var o="vertical"===i?e.touches[0].clientX:e.touches[0].clientY;"function"==typeof r&&r(),this.setState({active:!0,position:o})}}},{key:"onMouseMove",value:function(e){var t=u({},e,{touches:[{clientX:e.clientX,clientY:e.clientY}]});this.onTouchMove(t)}},{key:"onTouchMove",value:function(e){var t=this.props,n=t.allowResize,r=t.maxSize,i=t.minSize,o=t.onChange,a=t.split,u=t.step,l=this.state,c=l.active,p=l.position;if(n&&c){s(document,window);var f="first"===this.props.primary,h=f?this.pane1:this.pane2;if(h){var d=m.default.findDOMNode(h);if(d.getBoundingClientRect){var v=d.getBoundingClientRect().width,g=d.getBoundingClientRect().height,y="vertical"===a?e.touches[0].clientX:e.touches[0].clientY,_="vertical"===a?v:g,b=p-y;if(u){if(Math.abs(b)<u)return;b=~~(b/u)*u}var x=f?b:-b,w=r;if(void 0!==r&&r<=0){var k=this.splitPane;w="vertical"===a?k.getBoundingClientRect().width+r:k.getBoundingClientRect().height+r}var E=_-x,S=p-b;E<i?E=i:void 0!==r&&E>w?E=w:this.setState({position:S,resized:!0}),o&&o(E),this.setState({draggedSize:E}),h.setState({size:E})}}}}},{key:"onMouseUp",value:function(){var e=this.props,t=e.allowResize,n=e.onDragFinished,r=this.state,i=r.active,o=r.draggedSize;t&&i&&("function"==typeof n&&n(o),this.setState({active:!1}))}},{key:"setSize",value:function(e,t){var n=this.props.primary,r="first"===n?this.pane1:this.pane2,i=void 0;r&&(i=e.size||t&&t.draggedSize||e.defaultSize||e.minSize,r.setState({size:i}),e.size!==t.draggedSize&&this.setState({draggedSize:i}))}},{key:"render",value:function(){var e=this,t=this.props,n=t.allowResize,r=t.children,i=t.className,o=t.defaultSize,a=t.minSize,s=t.onResizerClick,l=t.onResizerDoubleClick,c=t.paneClassName,f=t.pane1ClassName,h=t.pane2ClassName,d=t.paneStyle,m=t.pane1Style,v=t.pane2Style,g=t.primary,y=t.prefixer,_=t.resizerClassName,b=t.resizerStyle,E=t.size,S=t.split,C=t.style,A=n?"":"disabled",D=_?_+" "+w.RESIZER_DEFAULT_CLASSNAME:_,O=u({},{display:"flex",flex:1,height:"100%",position:"absolute",outline:"none",overflow:"hidden",MozUserSelect:"text",WebkitUserSelect:"text",msUserSelect:"text",userSelect:"text"},C||{});"vertical"===S?u(O,{flexDirection:"row",left:0,right:0}):u(O,{bottom:0,flexDirection:"column",minHeight:"100%",top:0,width:"100%"});var M=["SplitPane",i,S,A],T=y.prefix(u({},d||{},m||{})),P=y.prefix(u({},d||{},v||{})),I=["Pane1",c,f].join(" "),R=["Pane2",c,h].join(" ");return p.default.createElement("div",{className:M.join(" "),ref:function(t){e.splitPane=t},style:y.prefix(O)},p.default.createElement(x.default,{className:I,key:"pane1",ref:function(t){e.pane1=t},size:"first"===g?E||o||a:void 0,split:S,style:T},r[0]),p.default.createElement(k.default,{className:A,onClick:s,onDoubleClick:l,onMouseDown:this.onMouseDown,onTouchStart:this.onTouchStart,onTouchEnd:this.onMouseUp,key:"resizer",ref:function(t){e.resizer=t},resizerClassName:D,split:S,style:b||{}}),p.default.createElement(x.default,{className:R,key:"pane2",ref:function(t){e.pane2=t},size:"second"===g?E||o||a:void 0,split:S,style:P},r[1]))}}]),t}(p.default.Component);S.propTypes={allowResize:h.default.bool,children:h.default.arrayOf(h.default.node).isRequired,className:h.default.string,primary:h.default.oneOf(["first","second"]),minSize:h.default.oneOfType([h.default.string,h.default.number]),maxSize:h.default.oneOfType([h.default.string,h.default.number]),defaultSize:h.default.oneOfType([h.default.string,h.default.number]),size:h.default.oneOfType([h.default.string,h.default.number]),split:h.default.oneOf(["vertical","horizontal"]),onDragStarted:h.default.func,onDragFinished:h.default.func,onChange:h.default.func,onResizerClick:h.default.func,onResizerDoubleClick:h.default.func,prefixer:h.default.instanceOf(g.default).isRequired,style:_.default,resizerStyle:_.default,paneClassName:h.default.string,pane1ClassName:h.default.string,pane2ClassName:h.default.string,paneStyle:_.default,pane1Style:_.default,pane2Style:_.default,resizerClassName:h.default.string,step:h.default.number},S.defaultProps={allowResize:!0,minSize:50,prefixer:new g.default({userAgent:E}),primary:"first",split:"vertical",paneClassName:"",pane1ClassName:"",pane2ClassName:""},t.default=S,e.exports=t.default},function(e,t){e.exports=["alignContent","MozAlignContent","WebkitAlignContent","MSAlignContent","OAlignContent","alignItems","MozAlignItems","WebkitAlignItems","MSAlignItems","OAlignItems","alignSelf","MozAlignSelf","WebkitAlignSelf","MSAlignSelf","OAlignSelf","all","MozAll","WebkitAll","MSAll","OAll","animation","MozAnimation","WebkitAnimation","MSAnimation","OAnimation","animationDelay","MozAnimationDelay","WebkitAnimationDelay","MSAnimationDelay","OAnimationDelay","animationDirection","MozAnimationDirection","WebkitAnimationDirection","MSAnimationDirection","OAnimationDirection","animationDuration","MozAnimationDuration","WebkitAnimationDuration","MSAnimationDuration","OAnimationDuration","animationFillMode","MozAnimationFillMode","WebkitAnimationFillMode","MSAnimationFillMode","OAnimationFillMode","animationIterationCount","MozAnimationIterationCount","WebkitAnimationIterationCount","MSAnimationIterationCount","OAnimationIterationCount","animationName","MozAnimationName","WebkitAnimationName","MSAnimationName","OAnimationName","animationPlayState","MozAnimationPlayState","WebkitAnimationPlayState","MSAnimationPlayState","OAnimationPlayState","animationTimingFunction","MozAnimationTimingFunction","WebkitAnimationTimingFunction","MSAnimationTimingFunction","OAnimationTimingFunction","backfaceVisibility","MozBackfaceVisibility","WebkitBackfaceVisibility","MSBackfaceVisibility","OBackfaceVisibility","background","MozBackground","WebkitBackground","MSBackground","OBackground","backgroundAttachment","MozBackgroundAttachment","WebkitBackgroundAttachment","MSBackgroundAttachment","OBackgroundAttachment","backgroundBlendMode","MozBackgroundBlendMode","WebkitBackgroundBlendMode","MSBackgroundBlendMode","OBackgroundBlendMode","backgroundClip","MozBackgroundClip","WebkitBackgroundClip","MSBackgroundClip","OBackgroundClip","backgroundColor","MozBackgroundColor","WebkitBackgroundColor","MSBackgroundColor","OBackgroundColor","backgroundImage","MozBackgroundImage","WebkitBackgroundImage","MSBackgroundImage","OBackgroundImage","backgroundOrigin","MozBackgroundOrigin","WebkitBackgroundOrigin","MSBackgroundOrigin","OBackgroundOrigin","backgroundPosition","MozBackgroundPosition","WebkitBackgroundPosition","MSBackgroundPosition","OBackgroundPosition","backgroundRepeat","MozBackgroundRepeat","WebkitBackgroundRepeat","MSBackgroundRepeat","OBackgroundRepeat","backgroundSize","MozBackgroundSize","WebkitBackgroundSize","MSBackgroundSize","OBackgroundSize","blockSize","MozBlockSize","WebkitBlockSize","MSBlockSize","OBlockSize","border","MozBorder","WebkitBorder","MSBorder","OBorder","borderBlockEnd","MozBorderBlockEnd","WebkitBorderBlockEnd","MSBorderBlockEnd","OBorderBlockEnd","borderBlockEndColor","MozBorderBlockEndColor","WebkitBorderBlockEndColor","MSBorderBlockEndColor","OBorderBlockEndColor","borderBlockEndStyle","MozBorderBlockEndStyle","WebkitBorderBlockEndStyle","MSBorderBlockEndStyle","OBorderBlockEndStyle","borderBlockEndWidth","MozBorderBlockEndWidth","WebkitBorderBlockEndWidth","MSBorderBlockEndWidth","OBorderBlockEndWidth","borderBlockStart","MozBorderBlockStart","WebkitBorderBlockStart","MSBorderBlockStart","OBorderBlockStart","borderBlockStartColor","MozBorderBlockStartColor","WebkitBorderBlockStartColor","MSBorderBlockStartColor","OBorderBlockStartColor","borderBlockStartStyle","MozBorderBlockStartStyle","WebkitBorderBlockStartStyle","MSBorderBlockStartStyle","OBorderBlockStartStyle","borderBlockStartWidth","MozBorderBlockStartWidth","WebkitBorderBlockStartWidth","MSBorderBlockStartWidth","OBorderBlockStartWidth","borderBottom","MozBorderBottom","WebkitBorderBottom","MSBorderBottom","OBorderBottom","borderBottomColor","MozBorderBottomColor","WebkitBorderBottomColor","MSBorderBottomColor","OBorderBottomColor","borderBottomLeftRadius","MozBorderBottomLeftRadius","WebkitBorderBottomLeftRadius","MSBorderBottomLeftRadius","OBorderBottomLeftRadius","borderBottomRightRadius","MozBorderBottomRightRadius","WebkitBorderBottomRightRadius","MSBorderBottomRightRadius","OBorderBottomRightRadius","borderBottomStyle","MozBorderBottomStyle","WebkitBorderBottomStyle","MSBorderBottomStyle","OBorderBottomStyle","borderBottomWidth","MozBorderBottomWidth","WebkitBorderBottomWidth","MSBorderBottomWidth","OBorderBottomWidth","borderCollapse","MozBorderCollapse","WebkitBorderCollapse","MSBorderCollapse","OBorderCollapse","borderColor","MozBorderColor","WebkitBorderColor","MSBorderColor","OBorderColor","borderImage","MozBorderImage","WebkitBorderImage","MSBorderImage","OBorderImage","borderImageOutset","MozBorderImageOutset","WebkitBorderImageOutset","MSBorderImageOutset","OBorderImageOutset","borderImageRepeat","MozBorderImageRepeat","WebkitBorderImageRepeat","MSBorderImageRepeat","OBorderImageRepeat","borderImageSlice","MozBorderImageSlice","WebkitBorderImageSlice","MSBorderImageSlice","OBorderImageSlice","borderImageSource","MozBorderImageSource","WebkitBorderImageSource","MSBorderImageSource","OBorderImageSource","borderImageWidth","MozBorderImageWidth","WebkitBorderImageWidth","MSBorderImageWidth","OBorderImageWidth","borderInlineEnd","MozBorderInlineEnd","WebkitBorderInlineEnd","MSBorderInlineEnd","OBorderInlineEnd","borderInlineEndColor","MozBorderInlineEndColor","WebkitBorderInlineEndColor","MSBorderInlineEndColor","OBorderInlineEndColor","borderInlineEndStyle","MozBorderInlineEndStyle","WebkitBorderInlineEndStyle","MSBorderInlineEndStyle","OBorderInlineEndStyle","borderInlineEndWidth","MozBorderInlineEndWidth","WebkitBorderInlineEndWidth","MSBorderInlineEndWidth","OBorderInlineEndWidth","borderInlineStart","MozBorderInlineStart","WebkitBorderInlineStart","MSBorderInlineStart","OBorderInlineStart","borderInlineStartColor","MozBorderInlineStartColor","WebkitBorderInlineStartColor","MSBorderInlineStartColor","OBorderInlineStartColor","borderInlineStartStyle","MozBorderInlineStartStyle","WebkitBorderInlineStartStyle","MSBorderInlineStartStyle","OBorderInlineStartStyle","borderInlineStartWidth","MozBorderInlineStartWidth","WebkitBorderInlineStartWidth","MSBorderInlineStartWidth","OBorderInlineStartWidth","borderLeft","MozBorderLeft","WebkitBorderLeft","MSBorderLeft","OBorderLeft","borderLeftColor","MozBorderLeftColor","WebkitBorderLeftColor","MSBorderLeftColor","OBorderLeftColor","borderLeftStyle","MozBorderLeftStyle","WebkitBorderLeftStyle","MSBorderLeftStyle","OBorderLeftStyle","borderLeftWidth","MozBorderLeftWidth","WebkitBorderLeftWidth","MSBorderLeftWidth","OBorderLeftWidth","borderRadius","MozBorderRadius","WebkitBorderRadius","MSBorderRadius","OBorderRadius","borderRight","MozBorderRight","WebkitBorderRight","MSBorderRight","OBorderRight","borderRightColor","MozBorderRightColor","WebkitBorderRightColor","MSBorderRightColor","OBorderRightColor","borderRightStyle","MozBorderRightStyle","WebkitBorderRightStyle","MSBorderRightStyle","OBorderRightStyle","borderRightWidth","MozBorderRightWidth","WebkitBorderRightWidth","MSBorderRightWidth","OBorderRightWidth","borderSpacing","MozBorderSpacing","WebkitBorderSpacing","MSBorderSpacing","OBorderSpacing","borderStyle","MozBorderStyle","WebkitBorderStyle","MSBorderStyle","OBorderStyle","borderTop","MozBorderTop","WebkitBorderTop","MSBorderTop","OBorderTop","borderTopColor","MozBorderTopColor","WebkitBorderTopColor","MSBorderTopColor","OBorderTopColor","borderTopLeftRadius","MozBorderTopLeftRadius","WebkitBorderTopLeftRadius","MSBorderTopLeftRadius","OBorderTopLeftRadius","borderTopRightRadius","MozBorderTopRightRadius","WebkitBorderTopRightRadius","MSBorderTopRightRadius","OBorderTopRightRadius","borderTopStyle","MozBorderTopStyle","WebkitBorderTopStyle","MSBorderTopStyle","OBorderTopStyle","borderTopWidth","MozBorderTopWidth","WebkitBorderTopWidth","MSBorderTopWidth","OBorderTopWidth","borderWidth","MozBorderWidth","WebkitBorderWidth","MSBorderWidth","OBorderWidth","bottom","MozBottom","WebkitBottom","MSBottom","OBottom","boxDecorationBreak","MozBoxDecorationBreak","WebkitBoxDecorationBreak","MSBoxDecorationBreak","OBoxDecorationBreak","boxShadow","MozBoxShadow","WebkitBoxShadow","MSBoxShadow","OBoxShadow","boxSizing","MozBoxSizing","WebkitBoxSizing","MSBoxSizing","OBoxSizing","breakAfter","MozBreakAfter","WebkitBreakAfter","MSBreakAfter","OBreakAfter","breakBefore","MozBreakBefore","WebkitBreakBefore","MSBreakBefore","OBreakBefore","breakInside","MozBreakInside","WebkitBreakInside","MSBreakInside","OBreakInside","captionSide","MozCaptionSide","WebkitCaptionSide","MSCaptionSide","OCaptionSide","caretColor","MozCaretColor","WebkitCaretColor","MSCaretColor","OCaretColor","ch","MozCh","WebkitCh","MSCh","OCh","clear","MozClear","WebkitClear","MSClear","OClear","clip","MozClip","WebkitClip","MSClip","OClip","clipPath","MozClipPath","WebkitClipPath","MSClipPath","OClipPath","cm","MozCm","WebkitCm","MSCm","OCm","color","MozColor","WebkitColor","MSColor","OColor","columnCount","MozColumnCount","WebkitColumnCount","MSColumnCount","OColumnCount","columnFill","MozColumnFill","WebkitColumnFill","MSColumnFill","OColumnFill","columnGap","MozColumnGap","WebkitColumnGap","MSColumnGap","OColumnGap","columnRule","MozColumnRule","WebkitColumnRule","MSColumnRule","OColumnRule","columnRuleColor","MozColumnRuleColor","WebkitColumnRuleColor","MSColumnRuleColor","OColumnRuleColor","columnRuleStyle","MozColumnRuleStyle","WebkitColumnRuleStyle","MSColumnRuleStyle","OColumnRuleStyle","columnRuleWidth","MozColumnRuleWidth","WebkitColumnRuleWidth","MSColumnRuleWidth","OColumnRuleWidth","columnSpan","MozColumnSpan","WebkitColumnSpan","MSColumnSpan","OColumnSpan","columnWidth","MozColumnWidth","WebkitColumnWidth","MSColumnWidth","OColumnWidth","columns","MozColumns","WebkitColumns","MSColumns","OColumns","content","MozContent","WebkitContent","MSContent","OContent","counterIncrement","MozCounterIncrement","WebkitCounterIncrement","MSCounterIncrement","OCounterIncrement","counterReset","MozCounterReset","WebkitCounterReset","MSCounterReset","OCounterReset","cursor","MozCursor","WebkitCursor","MSCursor","OCursor","deg","MozDeg","WebkitDeg","MSDeg","ODeg","direction","MozDirection","WebkitDirection","MSDirection","ODirection","display","MozDisplay","WebkitDisplay","MSDisplay","ODisplay","dpcm","MozDpcm","WebkitDpcm","MSDpcm","ODpcm","dpi","MozDpi","WebkitDpi","MSDpi","ODpi","dppx","MozDppx","WebkitDppx","MSDppx","ODppx","em","MozEm","WebkitEm","MSEm","OEm","emptyCells","MozEmptyCells","WebkitEmptyCells","MSEmptyCells","OEmptyCells","ex","MozEx","WebkitEx","MSEx","OEx","filter","MozFilter","WebkitFilter","MSFilter","OFilter","flexBasis","MozFlexBasis","WebkitFlexBasis","MSFlexBasis","OFlexBasis","flexDirection","MozFlexDirection","WebkitFlexDirection","MSFlexDirection","OFlexDirection","flexFlow","MozFlexFlow","WebkitFlexFlow","MSFlexFlow","OFlexFlow","flexGrow","MozFlexGrow","WebkitFlexGrow","MSFlexGrow","OFlexGrow","flexShrink","MozFlexShrink","WebkitFlexShrink","MSFlexShrink","OFlexShrink","flexWrap","MozFlexWrap","WebkitFlexWrap","MSFlexWrap","OFlexWrap","float","MozFloat","WebkitFloat","MSFloat","OFloat","font","MozFont","WebkitFont","MSFont","OFont","fontFamily","MozFontFamily","WebkitFontFamily","MSFontFamily","OFontFamily","fontFeatureSettings","MozFontFeatureSettings","WebkitFontFeatureSettings","MSFontFeatureSettings","OFontFeatureSettings","fontKerning","MozFontKerning","WebkitFontKerning","MSFontKerning","OFontKerning","fontLanguageOverride","MozFontLanguageOverride","WebkitFontLanguageOverride","MSFontLanguageOverride","OFontLanguageOverride","fontSize","MozFontSize","WebkitFontSize","MSFontSize","OFontSize","fontSizeAdjust","MozFontSizeAdjust","WebkitFontSizeAdjust","MSFontSizeAdjust","OFontSizeAdjust","fontStretch","MozFontStretch","WebkitFontStretch","MSFontStretch","OFontStretch","fontStyle","MozFontStyle","WebkitFontStyle","MSFontStyle","OFontStyle","fontSynthesis","MozFontSynthesis","WebkitFontSynthesis","MSFontSynthesis","OFontSynthesis","fontVariant","MozFontVariant","WebkitFontVariant","MSFontVariant","OFontVariant","fontVariantAlternates","MozFontVariantAlternates","WebkitFontVariantAlternates","MSFontVariantAlternates","OFontVariantAlternates","fontVariantCaps","MozFontVariantCaps","WebkitFontVariantCaps","MSFontVariantCaps","OFontVariantCaps","fontVariantEastAsian","MozFontVariantEastAsian","WebkitFontVariantEastAsian","MSFontVariantEastAsian","OFontVariantEastAsian","fontVariantLigatures","MozFontVariantLigatures","WebkitFontVariantLigatures","MSFontVariantLigatures","OFontVariantLigatures","fontVariantNumeric","MozFontVariantNumeric","WebkitFontVariantNumeric","MSFontVariantNumeric","OFontVariantNumeric","fontVariantPosition","MozFontVariantPosition","WebkitFontVariantPosition","MSFontVariantPosition","OFontVariantPosition","fontWeight","MozFontWeight","WebkitFontWeight","MSFontWeight","OFontWeight","fr","MozFr","WebkitFr","MSFr","OFr","grad","MozGrad","WebkitGrad","MSGrad","OGrad","grid","MozGrid","WebkitGrid","MSGrid","OGrid","gridArea","MozGridArea","WebkitGridArea","MSGridArea","OGridArea","gridAutoColumns","MozGridAutoColumns","WebkitGridAutoColumns","MSGridAutoColumns","OGridAutoColumns","gridAutoFlow","MozGridAutoFlow","WebkitGridAutoFlow","MSGridAutoFlow","OGridAutoFlow","gridAutoRows","MozGridAutoRows","WebkitGridAutoRows","MSGridAutoRows","OGridAutoRows","gridColumn","MozGridColumn","WebkitGridColumn","MSGridColumn","OGridColumn","gridColumnEnd","MozGridColumnEnd","WebkitGridColumnEnd","MSGridColumnEnd","OGridColumnEnd","gridColumnGap","MozGridColumnGap","WebkitGridColumnGap","MSGridColumnGap","OGridColumnGap","gridColumnStart","MozGridColumnStart","WebkitGridColumnStart","MSGridColumnStart","OGridColumnStart","gridGap","MozGridGap","WebkitGridGap","MSGridGap","OGridGap","gridRow","MozGridRow","WebkitGridRow","MSGridRow","OGridRow","gridRowEnd","MozGridRowEnd","WebkitGridRowEnd","MSGridRowEnd","OGridRowEnd","gridRowGap","MozGridRowGap","WebkitGridRowGap","MSGridRowGap","OGridRowGap","gridRowStart","MozGridRowStart","WebkitGridRowStart","MSGridRowStart","OGridRowStart","gridTemplate","MozGridTemplate","WebkitGridTemplate","MSGridTemplate","OGridTemplate","gridTemplateAreas","MozGridTemplateAreas","WebkitGridTemplateAreas","MSGridTemplateAreas","OGridTemplateAreas","gridTemplateColumns","MozGridTemplateColumns","WebkitGridTemplateColumns","MSGridTemplateColumns","OGridTemplateColumns","gridTemplateRows","MozGridTemplateRows","WebkitGridTemplateRows","MSGridTemplateRows","OGridTemplateRows","height","MozHeight","WebkitHeight","MSHeight","OHeight","hyphens","MozHyphens","WebkitHyphens","MSHyphens","OHyphens","hz","MozHz","WebkitHz","MSHz","OHz","imageOrientation","MozImageOrientation","WebkitImageOrientation","MSImageOrientation","OImageOrientation","imageRendering","MozImageRendering","WebkitImageRendering","MSImageRendering","OImageRendering","imageResolution","MozImageResolution","WebkitImageResolution","MSImageResolution","OImageResolution","imeMode","MozImeMode","WebkitImeMode","MSImeMode","OImeMode","in","MozIn","WebkitIn","MSIn","OIn","inherit","MozInherit","WebkitInherit","MSInherit","OInherit","initial","MozInitial","WebkitInitial","MSInitial","OInitial","inlineSize","MozInlineSize","WebkitInlineSize","MSInlineSize","OInlineSize","isolation","MozIsolation","WebkitIsolation","MSIsolation","OIsolation","justifyContent","MozJustifyContent","WebkitJustifyContent","MSJustifyContent","OJustifyContent","khz","MozKhz","WebkitKhz","MSKhz","OKhz","left","MozLeft","WebkitLeft","MSLeft","OLeft","letterSpacing","MozLetterSpacing","WebkitLetterSpacing","MSLetterSpacing","OLetterSpacing","lineBreak","MozLineBreak","WebkitLineBreak","MSLineBreak","OLineBreak","lineHeight","MozLineHeight","WebkitLineHeight","MSLineHeight","OLineHeight","listStyle","MozListStyle","WebkitListStyle","MSListStyle","OListStyle","listStyleImage","MozListStyleImage","WebkitListStyleImage","MSListStyleImage","OListStyleImage","listStylePosition","MozListStylePosition","WebkitListStylePosition","MSListStylePosition","OListStylePosition","listStyleType","MozListStyleType","WebkitListStyleType","MSListStyleType","OListStyleType","margin","MozMargin","WebkitMargin","MSMargin","OMargin","marginBlockEnd","MozMarginBlockEnd","WebkitMarginBlockEnd","MSMarginBlockEnd","OMarginBlockEnd","marginBlockStart","MozMarginBlockStart","WebkitMarginBlockStart","MSMarginBlockStart","OMarginBlockStart","marginBottom","MozMarginBottom","WebkitMarginBottom","MSMarginBottom","OMarginBottom","marginInlineEnd","MozMarginInlineEnd","WebkitMarginInlineEnd","MSMarginInlineEnd","OMarginInlineEnd","marginInlineStart","MozMarginInlineStart","WebkitMarginInlineStart","MSMarginInlineStart","OMarginInlineStart","marginLeft","MozMarginLeft","WebkitMarginLeft","MSMarginLeft","OMarginLeft","marginRight","MozMarginRight","WebkitMarginRight","MSMarginRight","OMarginRight","marginTop","MozMarginTop","WebkitMarginTop","MSMarginTop","OMarginTop","mask","MozMask","WebkitMask","MSMask","OMask","maskClip","MozMaskClip","WebkitMaskClip","MSMaskClip","OMaskClip","maskComposite","MozMaskComposite","WebkitMaskComposite","MSMaskComposite","OMaskComposite","maskImage","MozMaskImage","WebkitMaskImage","MSMaskImage","OMaskImage","maskMode","MozMaskMode","WebkitMaskMode","MSMaskMode","OMaskMode","maskOrigin","MozMaskOrigin","WebkitMaskOrigin","MSMaskOrigin","OMaskOrigin","maskPosition","MozMaskPosition","WebkitMaskPosition","MSMaskPosition","OMaskPosition","maskRepeat","MozMaskRepeat","WebkitMaskRepeat","MSMaskRepeat","OMaskRepeat","maskSize","MozMaskSize","WebkitMaskSize","MSMaskSize","OMaskSize","maskType","MozMaskType","WebkitMaskType","MSMaskType","OMaskType","maxHeight","MozMaxHeight","WebkitMaxHeight","MSMaxHeight","OMaxHeight","maxWidth","MozMaxWidth","WebkitMaxWidth","MSMaxWidth","OMaxWidth","minBlockSize","MozMinBlockSize","WebkitMinBlockSize","MSMinBlockSize","OMinBlockSize","minHeight","MozMinHeight","WebkitMinHeight","MSMinHeight","OMinHeight","minInlineSize","MozMinInlineSize","WebkitMinInlineSize","MSMinInlineSize","OMinInlineSize","minWidth","MozMinWidth","WebkitMinWidth","MSMinWidth","OMinWidth","mixBlendMode","MozMixBlendMode","WebkitMixBlendMode","MSMixBlendMode","OMixBlendMode","mm","MozMm","WebkitMm","MSMm","OMm","ms","MozMs","WebkitMs","MSMs","OMs","objectFit","MozObjectFit","WebkitObjectFit","MSObjectFit","OObjectFit","objectPosition","MozObjectPosition","WebkitObjectPosition","MSObjectPosition","OObjectPosition","offsetBlockEnd","MozOffsetBlockEnd","WebkitOffsetBlockEnd","MSOffsetBlockEnd","OOffsetBlockEnd","offsetBlockStart","MozOffsetBlockStart","WebkitOffsetBlockStart","MSOffsetBlockStart","OOffsetBlockStart","offsetInlineEnd","MozOffsetInlineEnd","WebkitOffsetInlineEnd","MSOffsetInlineEnd","OOffsetInlineEnd","offsetInlineStart","MozOffsetInlineStart","WebkitOffsetInlineStart","MSOffsetInlineStart","OOffsetInlineStart","opacity","MozOpacity","WebkitOpacity","MSOpacity","OOpacity","order","MozOrder","WebkitOrder","MSOrder","OOrder","orphans","MozOrphans","WebkitOrphans","MSOrphans","OOrphans","outline","MozOutline","WebkitOutline","MSOutline","OOutline","outlineColor","MozOutlineColor","WebkitOutlineColor","MSOutlineColor","OOutlineColor","outlineOffset","MozOutlineOffset","WebkitOutlineOffset","MSOutlineOffset","OOutlineOffset","outlineStyle","MozOutlineStyle","WebkitOutlineStyle","MSOutlineStyle","OOutlineStyle","outlineWidth","MozOutlineWidth","WebkitOutlineWidth","MSOutlineWidth","OOutlineWidth","overflow","MozOverflow","WebkitOverflow","MSOverflow","OOverflow","overflowWrap","MozOverflowWrap","WebkitOverflowWrap","MSOverflowWrap","OOverflowWrap","overflowX","MozOverflowX","WebkitOverflowX","MSOverflowX","OOverflowX","overflowY","MozOverflowY","WebkitOverflowY","MSOverflowY","OOverflowY","padding","MozPadding","WebkitPadding","MSPadding","OPadding","paddingBlockEnd","MozPaddingBlockEnd","WebkitPaddingBlockEnd","MSPaddingBlockEnd","OPaddingBlockEnd","paddingBlockStart","MozPaddingBlockStart","WebkitPaddingBlockStart","MSPaddingBlockStart","OPaddingBlockStart","paddingBottom","MozPaddingBottom","WebkitPaddingBottom","MSPaddingBottom","OPaddingBottom","paddingInlineEnd","MozPaddingInlineEnd","WebkitPaddingInlineEnd","MSPaddingInlineEnd","OPaddingInlineEnd","paddingInlineStart","MozPaddingInlineStart","WebkitPaddingInlineStart","MSPaddingInlineStart","OPaddingInlineStart","paddingLeft","MozPaddingLeft","WebkitPaddingLeft","MSPaddingLeft","OPaddingLeft","paddingRight","MozPaddingRight","WebkitPaddingRight","MSPaddingRight","OPaddingRight","paddingTop","MozPaddingTop","WebkitPaddingTop","MSPaddingTop","OPaddingTop","pageBreakAfter","MozPageBreakAfter","WebkitPageBreakAfter","MSPageBreakAfter","OPageBreakAfter","pageBreakBefore","MozPageBreakBefore","WebkitPageBreakBefore","MSPageBreakBefore","OPageBreakBefore","pageBreakInside","MozPageBreakInside","WebkitPageBreakInside","MSPageBreakInside","OPageBreakInside","pc","MozPc","WebkitPc","MSPc","OPc","perspective","MozPerspective","WebkitPerspective","MSPerspective","OPerspective","perspectiveOrigin","MozPerspectiveOrigin","WebkitPerspectiveOrigin","MSPerspectiveOrigin","OPerspectiveOrigin","pointerEvents","MozPointerEvents","WebkitPointerEvents","MSPointerEvents","OPointerEvents","position","MozPosition","WebkitPosition","MSPosition","OPosition","pt","MozPt","WebkitPt","MSPt","OPt","px","MozPx","WebkitPx","MSPx","OPx","q","MozQ","WebkitQ","MSQ","OQ","quotes","MozQuotes","WebkitQuotes","MSQuotes","OQuotes","rad","MozRad","WebkitRad","MSRad","ORad","rem","MozRem","WebkitRem","MSRem","ORem","resize","MozResize","WebkitResize","MSResize","OResize","revert","MozRevert","WebkitRevert","MSRevert","ORevert","right","MozRight","WebkitRight","MSRight","ORight","rubyAlign","MozRubyAlign","WebkitRubyAlign","MSRubyAlign","ORubyAlign","rubyMerge","MozRubyMerge","WebkitRubyMerge","MSRubyMerge","ORubyMerge","rubyPosition","MozRubyPosition","WebkitRubyPosition","MSRubyPosition","ORubyPosition","s","MozS","WebkitS","MSS","OS","scrollBehavior","MozScrollBehavior","WebkitScrollBehavior","MSScrollBehavior","OScrollBehavior","scrollSnapCoordinate","MozScrollSnapCoordinate","WebkitScrollSnapCoordinate","MSScrollSnapCoordinate","OScrollSnapCoordinate","scrollSnapDestination","MozScrollSnapDestination","WebkitScrollSnapDestination","MSScrollSnapDestination","OScrollSnapDestination","scrollSnapType","MozScrollSnapType","WebkitScrollSnapType","MSScrollSnapType","OScrollSnapType","shapeImageThreshold","MozShapeImageThreshold","WebkitShapeImageThreshold","MSShapeImageThreshold","OShapeImageThreshold","shapeMargin","MozShapeMargin","WebkitShapeMargin","MSShapeMargin","OShapeMargin","shapeOutside","MozShapeOutside","WebkitShapeOutside","MSShapeOutside","OShapeOutside","tabSize","MozTabSize","WebkitTabSize","MSTabSize","OTabSize","tableLayout","MozTableLayout","WebkitTableLayout","MSTableLayout","OTableLayout","textAlign","MozTextAlign","WebkitTextAlign","MSTextAlign","OTextAlign","textAlignLast","MozTextAlignLast","WebkitTextAlignLast","MSTextAlignLast","OTextAlignLast","textCombineUpright","MozTextCombineUpright","WebkitTextCombineUpright","MSTextCombineUpright","OTextCombineUpright","textDecoration","MozTextDecoration","WebkitTextDecoration","MSTextDecoration","OTextDecoration","textDecorationColor","MozTextDecorationColor","WebkitTextDecorationColor","MSTextDecorationColor","OTextDecorationColor","textDecorationLine","MozTextDecorationLine","WebkitTextDecorationLine","MSTextDecorationLine","OTextDecorationLine","textDecorationStyle","MozTextDecorationStyle","WebkitTextDecorationStyle","MSTextDecorationStyle","OTextDecorationStyle","textEmphasis","MozTextEmphasis","WebkitTextEmphasis","MSTextEmphasis","OTextEmphasis","textEmphasisColor","MozTextEmphasisColor","WebkitTextEmphasisColor","MSTextEmphasisColor","OTextEmphasisColor","textEmphasisPosition","MozTextEmphasisPosition","WebkitTextEmphasisPosition","MSTextEmphasisPosition","OTextEmphasisPosition","textEmphasisStyle","MozTextEmphasisStyle","WebkitTextEmphasisStyle","MSTextEmphasisStyle","OTextEmphasisStyle","textIndent","MozTextIndent","WebkitTextIndent","MSTextIndent","OTextIndent","textOrientation","MozTextOrientation","WebkitTextOrientation","MSTextOrientation","OTextOrientation","textOverflow","MozTextOverflow","WebkitTextOverflow","MSTextOverflow","OTextOverflow","textRendering","MozTextRendering","WebkitTextRendering","MSTextRendering","OTextRendering","textShadow","MozTextShadow","WebkitTextShadow","MSTextShadow","OTextShadow","textTransform","MozTextTransform","WebkitTextTransform","MSTextTransform","OTextTransform","textUnderlinePosition","MozTextUnderlinePosition","WebkitTextUnderlinePosition","MSTextUnderlinePosition","OTextUnderlinePosition","top","MozTop","WebkitTop","MSTop","OTop","touchAction","MozTouchAction","WebkitTouchAction","MSTouchAction","OTouchAction","transform","MozTransform","WebkitTransform","msTransform","OTransform","transformBox","MozTransformBox","WebkitTransformBox","MSTransformBox","OTransformBox","transformOrigin","MozTransformOrigin","WebkitTransformOrigin","MSTransformOrigin","OTransformOrigin","transformStyle","MozTransformStyle","WebkitTransformStyle","MSTransformStyle","OTransformStyle","transition","MozTransition","WebkitTransition","MSTransition","OTransition","transitionDelay","MozTransitionDelay","WebkitTransitionDelay","MSTransitionDelay","OTransitionDelay","transitionDuration","MozTransitionDuration","WebkitTransitionDuration","MSTransitionDuration","OTransitionDuration","transitionProperty","MozTransitionProperty","WebkitTransitionProperty","MSTransitionProperty","OTransitionProperty","transitionTimingFunction","MozTransitionTimingFunction","WebkitTransitionTimingFunction","MSTransitionTimingFunction","OTransitionTimingFunction","turn","MozTurn","WebkitTurn","MSTurn","OTurn","unicodeBidi","MozUnicodeBidi","WebkitUnicodeBidi","MSUnicodeBidi","OUnicodeBidi","unset","MozUnset","WebkitUnset","MSUnset","OUnset","verticalAlign","MozVerticalAlign","WebkitVerticalAlign","MSVerticalAlign","OVerticalAlign","vh","MozVh","WebkitVh","MSVh","OVh","visibility","MozVisibility","WebkitVisibility","MSVisibility","OVisibility","vmax","MozVmax","WebkitVmax","MSVmax","OVmax","vmin","MozVmin","WebkitVmin","MSVmin","OVmin","vw","MozVw","WebkitVw","MSVw","OVw","whiteSpace","MozWhiteSpace","WebkitWhiteSpace","MSWhiteSpace","OWhiteSpace","widows","MozWidows","WebkitWidows","MSWidows","OWidows","width","MozWidth","WebkitWidth","MSWidth","OWidth","willChange","MozWillChange","WebkitWillChange","MSWillChange","OWillChange","wordBreak","MozWordBreak","WebkitWordBreak","MSWordBreak","OWordBreak","wordSpacing","MozWordSpacing","WebkitWordSpacing","MSWordSpacing","OWordSpacing","wordWrap","MozWordWrap","WebkitWordWrap","MSWordWrap","OWordWrap","writingMode","MozWritingMode","WebkitWritingMode","MSWritingMode","OWritingMode","zIndex","MozZIndex","WebkitZIndex","MSZIndex","OZIndex","fontSize","MozFontSize","WebkitFontSize","MSFontSize","OFontSize","flex","MozFlex","WebkitFlex","MSFlex","OFlex","fr","MozFr","WebkitFr","MSFr","OFr","overflowScrolling","MozOverflowScrolling","WebkitOverflowScrolling","MSOverflowScrolling","OOverflowScrolling"]},function(e,t,n){"use strict";function r(e){var t={"=":"=0",":":"=2"};return"$"+(""+e).replace(/[=:]/g,function(e){return t[e]})}function i(e){var t=/(=0|=2)/g,n={"=0":"=","=2":":"};return(""+("."===e[0]&&"$"===e[1]?e.substring(2):e.substring(1))).replace(t,function(e){return n[e]})}var o={escape:r,unescape:i};e.exports=o},function(e,t,n){"use strict";var r=n(126),i=(n(8),function(e){var t=this;if(t.instancePool.length){var n=t.instancePool.pop();return t.call(n,e),n}return new t(e)}),o=function(e,t){var n=this;if(n.instancePool.length){var r=n.instancePool.pop();return n.call(r,e,t),r}return new n(e,t)},a=function(e,t,n){var r=this;if(r.instancePool.length){var i=r.instancePool.pop();return r.call(i,e,t,n),i}return new r(e,t,n)},s=function(e,t,n,r){var i=this;if(i.instancePool.length){var o=i.instancePool.pop();return i.call(o,e,t,n,r),o}return new i(e,t,n,r)},u=function(e){var t=this;e instanceof t||r("25"),e.destructor(),t.instancePool.length<t.poolSize&&t.instancePool.push(e)},l=i,c=function(e,t){var n=e;return n.instancePool=[],n.getPooled=t||l,n.poolSize||(n.poolSize=10),n.release=u,n},p={addPoolingTo:c,oneArgumentPooler:i,twoArgumentPooler:o,threeArgumentPooler:a,fourArgumentPooler:s};e.exports=p},function(e,t,n){"use strict";function r(e){return(""+e).replace(b,"$&/")}function i(e,t){this.func=e,this.context=t,this.count=0}function o(e,t,n){var r=e.func,i=e.context;r.call(i,t,e.count++)}function a(e,t,n){if(null==e)return e;var r=i.getPooled(t,n);g(e,o,r),i.release(r)}function s(e,t,n,r){this.result=e,this.keyPrefix=t,this.func=n,this.context=r,this.count=0}function u(e,t,n){var i=e.result,o=e.keyPrefix,a=e.func,s=e.context,u=a.call(s,t,e.count++);Array.isArray(u)?l(u,i,n,v.thatReturnsArgument):null!=u&&(m.isValidElement(u)&&(u=m.cloneAndReplaceKey(u,o+(!u.key||t&&t.key===u.key?"":r(u.key)+"/")+n)),i.push(u))}function l(e,t,n,i,o){var a="";null!=n&&(a=r(n)+"/");var l=s.getPooled(t,a,i,o);g(e,u,l),s.release(l)}function c(e,t,n){if(null==e)return e;var r=[];return l(e,r,null,t,n),r}function p(e,t,n){return null}function f(e,t){return g(e,p,null)}function h(e){var t=[];return l(e,t,null,v.thatReturnsArgument),t}var d=n(1099),m=n(93),v=n(32),g=n(1109),y=d.twoArgumentPooler,_=d.fourArgumentPooler,b=/\/+/g;i.prototype.destructor=function(){this.func=null,this.context=null,this.count=0},d.addPoolingTo(i,y),s.prototype.destructor=function(){this.result=null,this.keyPrefix=null,this.func=null,this.context=null,this.count=0},d.addPoolingTo(s,_);var x={forEach:a,map:c,mapIntoWithKeyPrefixInternal:l,count:f,toArray:h};e.exports=x},function(e,t,n){"use strict";var r=n(93),i=r.createFactory,o={a:i("a"),abbr:i("abbr"),address:i("address"),area:i("area"),article:i("article"),aside:i("aside"),audio:i("audio"),b:i("b"),base:i("base"),bdi:i("bdi"),bdo:i("bdo"),big:i("big"),blockquote:i("blockquote"),body:i("body"),br:i("br"),button:i("button"),canvas:i("canvas"),caption:i("caption"),cite:i("cite"),code:i("code"),col:i("col"),colgroup:i("colgroup"),data:i("data"),datalist:i("datalist"),dd:i("dd"),del:i("del"),details:i("details"),dfn:i("dfn"),dialog:i("dialog"),div:i("div"),dl:i("dl"),dt:i("dt"),em:i("em"),embed:i("embed"),fieldset:i("fieldset"),figcaption:i("figcaption"),figure:i("figure"),footer:i("footer"),form:i("form"),h1:i("h1"),h2:i("h2"),h3:i("h3"),h4:i("h4"),h5:i("h5"),h6:i("h6"),head:i("head"),header:i("header"),hgroup:i("hgroup"),hr:i("hr"),html:i("html"),i:i("i"),iframe:i("iframe"),img:i("img"),input:i("input"),ins:i("ins"),kbd:i("kbd"),keygen:i("keygen"),label:i("label"),legend:i("legend"),li:i("li"),link:i("link"),main:i("main"),map:i("map"),mark:i("mark"),menu:i("menu"),menuitem:i("menuitem"),meta:i("meta"),meter:i("meter"),nav:i("nav"),noscript:i("noscript"),object:i("object"),ol:i("ol"),optgroup:i("optgroup"),option:i("option"),output:i("output"),p:i("p"),param:i("param"),picture:i("picture"),pre:i("pre"),progress:i("progress"),q:i("q"),rp:i("rp"),rt:i("rt"),ruby:i("ruby"),s:i("s"),samp:i("samp"),script:i("script"),section:i("section"),select:i("select"),small:i("small"),source:i("source"),span:i("span"),strong:i("strong"),style:i("style"),sub:i("sub"),summary:i("summary"),sup:i("sup"),table:i("table"),tbody:i("tbody"),td:i("td"),textarea:i("textarea"),tfoot:i("tfoot"),th:i("th"),thead:i("thead"),time:i("time"),title:i("title"),tr:i("tr"),track:i("track"),u:i("u"),ul:i("ul"),var:i("var"),video:i("video"),wbr:i("wbr"),circle:i("circle"),clipPath:i("clipPath"),defs:i("defs"),ellipse:i("ellipse"),g:i("g"),image:i("image"),line:i("line"),linearGradient:i("linearGradient"),mask:i("mask"),path:i("path"),pattern:i("pattern"),polygon:i("polygon"),polyline:i("polyline"),radialGradient:i("radialGradient"),rect:i("rect"),stop:i("stop"),svg:i("svg"),text:i("text"),tspan:i("tspan")};e.exports=o},function(e,t,n){"use strict";var r=n(93),i=r.isValidElement,o=n(443);e.exports=o(i)},function(e,t,n){"use strict";e.exports="15.6.2"},function(e,t,n){"use strict";var r=n(474),i=r.Component,o=n(93),a=o.isValidElement,s=n(477),u=n(694);e.exports=u(i,a,s)},function(e,t,n){"use strict";function r(e){var t=e&&(i&&e[i]||e[o]);if("function"==typeof t)return t}var i="function"==typeof Symbol&&Symbol.iterator,o="@@iterator";e.exports=r},function(e,t,n){"use strict";function r(){return i++}var i=1;e.exports=r},function(e,t,n){"use strict";var r=function(){};e.exports=r},function(e,t,n){"use strict";function r(e){return o.isValidElement(e)||i("143"),e}var i=n(126),o=n(93);n(8);e.exports=r},function(e,t,n){"use strict";function r(e,t){return e&&"object"==typeof e&&null!=e.key?l.escape(e.key):t.toString(36)}function i(e,t,n,o){var f=typeof e;if("undefined"!==f&&"boolean"!==f||(e=null),null===e||"string"===f||"number"===f||"object"===f&&e.$$typeof===s)return n(o,e,""===t?c+r(e,0):t),1;var h,d,m=0,v=""===t?c:t+p;if(Array.isArray(e))for(var g=0;g<e.length;g++)h=e[g],d=v+r(h,g),m+=i(h,d,n,o);else{var y=u(e);if(y){var _,b=y.call(e);if(y!==e.entries)for(var x=0;!(_=b.next()).done;)h=_.value,d=v+r(h,x++),m+=i(h,d,n,o);else for(;!(_=b.next()).done;){var w=_.value;w&&(h=w[1],d=v+l.escape(w[0])+p+r(h,0),m+=i(h,d,n,o))}}else if("object"===f){var k="",E=String(e);a("31","[object Object]"===E?"object with keys {"+Object.keys(e).join(", ")+"}":E,k)}}return m}function o(e,t,n){return null==e?0:i(e,"",t,n)}var a=n(126),s=(n(52),n(476)),u=n(1105),l=(n(8),n(1098)),c=(n(10),"."),p=":";e.exports=o},function(e,t,n){e.exports=n(71)},function(e,t,n){"use strict";function r(e){if(!(this instanceof r))return new r(e);i.call(this,e)}e.exports=r;var i=n(480),o=n(111);o.inherits=n(42),o.inherits(r,i),r.prototype._transform=function(e,t,n){n(null,e)}},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t,n){e.copy(t,n)}var o=n(167).Buffer;e.exports=function(){function e(){r(this,e),this.head=null,this.tail=null,this.length=0}return e.prototype.push=function(e){var t={data:e,next:null};this.length>0?this.tail.next=t:this.head=t,this.tail=t,++this.length},e.prototype.unshift=function(e){var t={data:e,next:this.head};0===this.length&&(this.tail=t),this.head=t,++this.length},e.prototype.shift=function(){if(0!==this.length){var e=this.head.data;return 1===this.length?this.head=this.tail=null:this.head=this.head.next,--this.length,e}},e.prototype.clear=function(){this.head=this.tail=null,this.length=0},e.prototype.join=function(e){if(0===this.length)return"";for(var t=this.head,n=""+t.data;t=t.next;)n+=e+t.data;return n},e.prototype.concat=function(e){if(0===this.length)return o.alloc(0);if(1===this.length)return this.head.data;for(var t=o.allocUnsafe(e>>>0),n=this.head,r=0;n;)i(n.data,t,r),r+=n.data.length,n=n.next;return t},e}()},function(e,t,n){e.exports=n(262).PassThrough},function(e,t,n){e.exports=n(262).Transform},function(e,t,n){e.exports=n(261)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(7),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(1119);t.default=function(e){var t=Object.keys(e);return function(){var n=arguments.length<=0||void 0===arguments[0]?i.default.Map():arguments[0],r=arguments[1];return n.withMutations(function(n){t.forEach(function(t){var i=e[t],a=n.get(t),s=i(a,r);(0,o.validateNextState)(s,t,r),n.set(t,s)})})}},e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.combineReducers=void 0;var r=n(1116),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.combineReducers=i.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(7),o=r(i),a=n(483),s=r(a);t.default=function(e,t,n){var r=Object.keys(t);if(!r.length)return"Store does not have a valid reducer. Make sure the argument passed to combineReducers is an object whose values are reducers.";var i=(0,s.default)(n);if(!o.default.Iterable.isIterable(e))return"The "+i+' is of unexpected type. Expected argument to be an instance of Immutable.Iterable with the following properties: "'+r.join('", "')+'".';var a=e.keySeq().toArray().filter(function(e){return!t.hasOwnProperty(e)});return a.length>0?"Unexpected "+(1===a.length?"property":"properties")+' "'+a.join('", "')+'" found in '+i+'. Expected to find one of the known reducer property names instead: "'+r.join('", "')+'". Unexpected properties will be ignored.':null},e.exports=t.default},function(e,t,n){"use strict";"create index";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.validateNextState=t.getUnexpectedInvocationParameterMessage=t.getStateName=void 0;var i=n(483),o=r(i),a=n(1118),s=r(a),u=n(1120),l=r(u);t.getStateName=o.default,t.getUnexpectedInvocationParameterMessage=s.default,t.validateNextState=l.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e,t,n){if(void 0===e)throw new Error('Reducer "'+t+'" returned undefined when handling "'+n.type+'" action. To ignore an action, you must explicitly return the previous state.');return null},e.exports=t.default},function(e,t,n){"use strict";function r(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];return function(e){return function(n,r,a){var s=e(n,r,a),u=s.dispatch,l=[],c={getState:s.getState,dispatch:function(e){return u(e)}};return l=t.map(function(e){return e(c)}),u=i.a.apply(void 0,l)(s.dispatch),o({},s,{dispatch:u})}}}t.a=r;var i=n(484),o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}},function(e,t,n){"use strict";function r(e,t){return function(){return t(e.apply(void 0,arguments))}}function i(e,t){if("function"==typeof e)return r(e,t);if("object"!=typeof e||null===e)throw new Error("bindActionCreators expected an object or a function, instead received "+(null===e?"null":typeof e)+'. Did you write "import ActionCreators from" instead of "import * as ActionCreators from"?');for(var n=Object.keys(e),i={},o=0;o<n.length;o++){var a=n[o],s=e[a];"function"==typeof s&&(i[a]=r(s,t))}return i}t.a=i},function(e,t,n){"use strict";function r(e,t){var n=t&&t.type;return"Given action "+(n&&'"'+n.toString()+'"'||"an action")+', reducer "'+e+'" returned undefined. To ignore an action, you must explicitly return the previous state. If you want this reducer to hold no value, you can return null instead of undefined.'}function i(e){Object.keys(e).forEach(function(t){var n=e[t];if(void 0===n(void 0,{type:a.b.INIT}))throw new Error('Reducer "'+t+"\" returned undefined during initialization. If the state passed to the reducer is undefined, you must explicitly return the initial state. The initial state may not be undefined. If you don't want to set a value for this reducer, you can use null instead of undefined.");if(void 0===n(void 0,{type:"@@redux/PROBE_UNKNOWN_ACTION_"+Math.random().toString(36).substring(7).split("").join(".")}))throw new Error('Reducer "'+t+"\" returned undefined when probed with a random type. Don't try to handle "+a.b.INIT+' or other actions in "redux/*" namespace. They are considered private. Instead, you must return the current state for any unknown actions, unless it is undefined, in which case you must return the initial state, regardless of the action type. The initial state may not be undefined, but can be null.')})}function o(e){for(var t=Object.keys(e),n={},o=0;o<t.length;o++){var a=t[o];"function"==typeof e[a]&&(n[a]=e[a])}var s=Object.keys(n),u=void 0;try{i(n)}catch(e){u=e}return function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=arguments[1];if(u)throw u;for(var i=!1,o={},a=0;a<s.length;a++){var l=s[a],c=n[l],p=e[l],f=c(p,t);if(void 0===f){var h=r(l,t);throw new Error(h)}o[l]=f,i=i||f!==p}return i?o:e}}t.a=o;var a=n(485);n(391),n(487)},function(e,t,n){var r=function(){return this}()||Function("return this")(),i=r.regeneratorRuntime&&Object.getOwnPropertyNames(r).indexOf("regeneratorRuntime")>=0,o=i&&r.regeneratorRuntime;if(r.regeneratorRuntime=void 0,e.exports=n(1125),i)r.regeneratorRuntime=o;else try{delete r.regeneratorRuntime}catch(e){r.regeneratorRuntime=void 0}},function(e,t){!function(t){"use strict";function n(e,t,n,r){var o=t&&t.prototype instanceof i?t:i,a=Object.create(o.prototype),s=new h(r||[]);return a._invoke=l(e,n,s),a}function r(e,t,n){try{return{type:"normal",arg:e.call(t,n)}}catch(e){return{type:"throw",arg:e}}}function i(){}function o(){}function a(){}function s(e){["next","throw","return"].forEach(function(t){e[t]=function(e){return this._invoke(t,e)}})}function u(e){function t(n,i,o,a){var s=r(e[n],e,i);if("throw"!==s.type){var u=s.arg,l=u.value;return l&&"object"==typeof l&&y.call(l,"__await")?Promise.resolve(l.__await).then(function(e){t("next",e,o,a)},function(e){t("throw",e,o,a)}):Promise.resolve(l).then(function(e){u.value=e,o(u)},a)}a(s.arg)}function n(e,n){function r(){return new Promise(function(r,i){t(e,n,r,i)})}return i=i?i.then(r,r):r()}var i;this._invoke=n}function l(e,t,n){var i=S;return function(o,a){if(i===A)throw new Error("Generator is already running");if(i===D){if("throw"===o)throw a;return m()}for(n.method=o,n.arg=a;;){var s=n.delegate;if(s){var u=c(s,n);if(u){if(u===O)continue;return u}}if("next"===n.method)n.sent=n._sent=n.arg;else if("throw"===n.method){if(i===S)throw i=D,n.arg;n.dispatchException(n.arg)}else"return"===n.method&&n.abrupt("return",n.arg);i=A;var l=r(e,t,n);if("normal"===l.type){if(i=n.done?D:C,l.arg===O)continue;return{value:l.arg,done:n.done}}"throw"===l.type&&(i=D,n.method="throw",n.arg=l.arg)}}}function c(e,t){var n=e.iterator[t.method];if(n===v){if(t.delegate=null,"throw"===t.method){if(e.iterator.return&&(t.method="return",t.arg=v,c(e,t),"throw"===t.method))return O;t.method="throw",t.arg=new TypeError("The iterator does not provide a 'throw' method")}return O}var i=r(n,e.iterator,t.arg);if("throw"===i.type)return t.method="throw",t.arg=i.arg,t.delegate=null,O;var o=i.arg;return o?o.done?(t[e.resultName]=o.value,t.next=e.nextLoc,"return"!==t.method&&(t.method="next",t.arg=v),t.delegate=null,O):o:(t.method="throw",t.arg=new TypeError("iterator result is not an object"),t.delegate=null,O)}function p(e){var t={tryLoc:e[0]};1 in e&&(t.catchLoc=e[1]),2 in e&&(t.finallyLoc=e[2],t.afterLoc=e[3]),this.tryEntries.push(t)}function f(e){var t=e.completion||{};t.type="normal",delete t.arg,e.completion=t}function h(e){this.tryEntries=[{tryLoc:"root"}],e.forEach(p,this),this.reset(!0)}function d(e){if(e){var t=e[b];if(t)return t.call(e);if("function"==typeof e.next)return e;if(!isNaN(e.length)){var n=-1,r=function t(){for(;++n<e.length;)if(y.call(e,n))return t.value=e[n],t.done=!1,t;return t.value=v,t.done=!0,t};return r.next=r}}return{next:m}}function m(){return{value:v,done:!0}}var v,g=Object.prototype,y=g.hasOwnProperty,_="function"==typeof Symbol?Symbol:{},b=_.iterator||"@@iterator",x=_.asyncIterator||"@@asyncIterator",w=_.toStringTag||"@@toStringTag",k="object"==typeof e,E=t.regeneratorRuntime;if(E)return void(k&&(e.exports=E));E=t.regeneratorRuntime=k?e.exports:{},E.wrap=n;var S="suspendedStart",C="suspendedYield",A="executing",D="completed",O={},M={};M[b]=function(){return this};var T=Object.getPrototypeOf,P=T&&T(T(d([])));P&&P!==g&&y.call(P,b)&&(M=P);var I=a.prototype=i.prototype=Object.create(M);o.prototype=I.constructor=a,a.constructor=o,a[w]=o.displayName="GeneratorFunction",E.isGeneratorFunction=function(e){var t="function"==typeof e&&e.constructor;return!!t&&(t===o||"GeneratorFunction"===(t.displayName||t.name))},E.mark=function(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,a):(e.__proto__=a,w in e||(e[w]="GeneratorFunction")),e.prototype=Object.create(I),e},E.awrap=function(e){return{__await:e}},s(u.prototype),u.prototype[x]=function(){return this},E.AsyncIterator=u,E.async=function(e,t,r,i){var o=new u(n(e,t,r,i));return E.isGeneratorFunction(t)?o:o.next().then(function(e){return e.done?e.value:o.next()})},s(I),I[w]="Generator",I[b]=function(){return this},I.toString=function(){return"[object Generator]"},E.keys=function(e){var t=[];for(var n in e)t.push(n);return t.reverse(),function n(){for(;t.length;){var r=t.pop();if(r in e)return n.value=r,n.done=!1,n}return n.done=!0,n}},E.values=d,h.prototype={constructor:h,reset:function(e){if(this.prev=0,this.next=0,this.sent=this._sent=v,this.done=!1,this.delegate=null,this.method="next",this.arg=v,this.tryEntries.forEach(f),!e)for(var t in this)"t"===t.charAt(0)&&y.call(this,t)&&!isNaN(+t.slice(1))&&(this[t]=v)},stop:function(){this.done=!0;var e=this.tryEntries[0],t=e.completion;if("throw"===t.type)throw t.arg;return this.rval},dispatchException:function(e){function t(t,r){return o.type="throw",o.arg=e,n.next=t,r&&(n.method="next",n.arg=v),!!r}if(this.done)throw e;for(var n=this,r=this.tryEntries.length-1;r>=0;--r){var i=this.tryEntries[r],o=i.completion;if("root"===i.tryLoc)return t("end");if(i.tryLoc<=this.prev){var a=y.call(i,"catchLoc"),s=y.call(i,"finallyLoc");if(a&&s){if(this.prev<i.catchLoc)return t(i.catchLoc,!0);if(this.prev<i.finallyLoc)return t(i.finallyLoc)}else if(a){if(this.prev<i.catchLoc)return t(i.catchLoc,!0)}else{if(!s)throw new Error("try statement without catch or finally");if(this.prev<i.finallyLoc)return t(i.finallyLoc)}}}},abrupt:function(e,t){for(var n=this.tryEntries.length-1;n>=0;--n){var r=this.tryEntries[n];if(r.tryLoc<=this.prev&&y.call(r,"finallyLoc")&&this.prev<r.finallyLoc){var i=r;break}}i&&("break"===e||"continue"===e)&&i.tryLoc<=t&&t<=i.finallyLoc&&(i=null);var o=i?i.completion:{};return o.type=e,o.arg=t,i?(this.method="next",this.next=i.finallyLoc,O):this.complete(o)},complete:function(e,t){if("throw"===e.type)throw e.arg;return"break"===e.type||"continue"===e.type?this.next=e.arg:"return"===e.type?(this.rval=this.arg=e.arg,this.method="return",this.next="end"):"normal"===e.type&&t&&(this.next=t),O},finish:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var n=this.tryEntries[t];if(n.finallyLoc===e)return this.complete(n.completion,n.afterLoc),f(n),O}},catch:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var n=this.tryEntries[t];if(n.tryLoc===e){var r=n.completion;if("throw"===r.type){var i=r.arg;f(n)}return i}}throw new Error("illegal catch attempt")},delegateYield:function(e,t,n){return this.delegate={iterator:d(e),resultName:t,nextLoc:n},"next"===this.method&&(this.arg=v),O}}}(function(){return this}()||Function("return this")())},function(e,t,n){"use strict";e.exports=n(1133)},function(e,t,n){"use strict";var r={};["article","aside","button","blockquote","body","canvas","caption","col","colgroup","dd","div","dl","dt","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","hr","iframe","li","map","object","ol","output","p","pre","progress","script","section","style","table","tbody","td","textarea","tfoot","th","tr","thead","ul","video"].forEach(function(e){r[e]=!0}),e.exports=r},function(e,t,n){"use strict";function r(e,t){return e=e.source,t=t||"",function n(r,i){return r?(i=i.source||i,e=e.replace(r,i),n):new RegExp(e,t)}}var i=/[a-zA-Z_:][a-zA-Z0-9:._-]*/,o=/[^"'=<>`\x00-\x20]+/,a=/'[^']*'/,s=/"[^"]*"/,u=r(/(?:unquoted|single_quoted|double_quoted)/)("unquoted",o)("single_quoted",a)("double_quoted",s)(),l=r(/(?:\s+attr_name(?:\s*=\s*attr_value)?)/)("attr_name",i)("attr_value",u)(),c=r(/<[A-Za-z][A-Za-z0-9]*attribute*\s*\/?>/)("attribute",l)(),p=/<\/[A-Za-z][A-Za-z0-9]*\s*>/,f=/<!--([^-]+|[-][^-]+)*-->/,h=/<[?].*?[?]>/,d=/<![A-Z]+\s+[^>]*>/,m=/<!\[CDATA\[([^\]]+|\][^\]]|\]\][^>])*\]\]>/,v=r(/^(?:open_tag|close_tag|comment|processing|declaration|cdata)/)("open_tag",c)("close_tag",p)("comment",f)("processing",h)("declaration",d)("cdata",m)();e.exports.HTML_TAG_RE=v},function(e,t,n){"use strict";e.exports=["coap","doi","javascript","aaa","aaas","about","acap","cap","cid","crid","data","dav","dict","dns","file","ftp","geo","go","gopher","h323","http","https","iax","icap","im","imap","info","ipp","iris","iris.beep","iris.xpc","iris.xpcs","iris.lwz","ldap","mailto","mid","msrp","msrps","mtqp","mupdate","news","nfs","ni","nih","nntp","opaquelocktoken","pop","pres","rtsp","service","session","shttp","sieve","sip","sips","sms","snmp","soap.beep","soap.beeps","tag","tel","telnet","tftp","thismessage","tn3270","tip","tv","urn","vemmi","ws","wss","xcon","xcon-userid","xmlrpc.beep","xmlrpc.beeps","xmpp","z39.50r","z39.50s","adiumxtra","afp","afs","aim","apt","attachment","aw","beshare","bitcoin","bolo","callto","chrome","chrome-extension","com-eventbrite-attendee","content","cvs","dlna-playsingle","dlna-playcontainer","dtn","dvb","ed2k","facetime","feed","finger","fish","gg","git","gizmoproject","gtalk","hcp","icon","ipn","irc","irc6","ircs","itms","jar","jms","keyparc","lastfm","ldaps","magnet","maps","market","message","mms","ms-help","msnim","mumble","mvn","notes","oid","palm","paparazzi","platform","proxy","psyc","query","res","resource","rmi","rsync","rtmp","secondlife","sftp","sgn","skype","smb","soldat","spotify","ssh","steam","svn","teamspeak","things","udp","unreal","ut2004","ventrilo","view-source","webcal","wtai","wyciwyg","xfire","xri","ymsgr"]},function(e,t,n){"use strict";e.exports={options:{html:!0,xhtmlOut:!0,breaks:!1,langPrefix:"language-",linkify:!1,linkTarget:"",typographer:!1,quotes:"“”‘’",highlight:null,maxNesting:20},components:{core:{rules:["block","inline","references","abbr2"]},block:{rules:["blockquote","code","fences","heading","hr","htmlblock","lheading","list","paragraph"]},inline:{rules:["autolink","backticks","emphasis","entity","escape","htmltag","links","newline","text"]}}}},function(e,t,n){"use strict";e.exports={options:{html:!1,xhtmlOut:!1,breaks:!1,langPrefix:"language-",linkify:!1,linkTarget:"",typographer:!1,quotes:"“”‘’",highlight:null,maxNesting:20},components:{core:{rules:["block","inline","references","replacements","linkify","smartquotes","references","abbr2","footnote_tail"]},block:{rules:["blockquote","code","fences","footnote","heading","hr","htmlblock","lheading","list","paragraph","table"]},inline:{rules:["autolink","backticks","del","emphasis","entity","escape","footnote_ref","htmltag","links","newline","text"]}}}},function(e,t,n){"use strict";e.exports={options:{html:!1,xhtmlOut:!1,breaks:!1,langPrefix:"language-",linkify:!1,linkTarget:"",typographer:!1,quotes:"“”‘’",highlight:null,maxNesting:20},components:{core:{},block:{},inline:{}}}},function(e,t,n){"use strict";function r(e,t,n){this.src=t,this.env=n,this.options=e.options,this.tokens=[],this.inlineMode=!1,this.inline=e.inline,this.block=e.block,this.renderer=e.renderer,this.typographer=e.typographer}function i(e,t){"string"!=typeof e&&(t=e,e="default"),this.inline=new l,this.block=new u,this.core=new s,this.renderer=new a,this.ruler=new c,this.options={},this.configure(p[e]),this.set(t||{})}var o=n(26).assign,a=n(1137),s=n(1135),u=n(1134),l=n(1136),c=n(166),p={default:n(1131),full:n(1132),commonmark:n(1130)};i.prototype.set=function(e){o(this.options,e)},i.prototype.configure=function(e){var t=this;if(!e)throw new Error("Wrong `remarkable` preset, check name/content");e.options&&t.set(e.options),e.components&&Object.keys(e.components).forEach(function(n){e.components[n].rules&&t[n].ruler.enable(e.components[n].rules,!0)})},i.prototype.use=function(e,t){return e(this,t),this},i.prototype.parse=function(e,t){var n=new r(this,e,t);return this.core.process(n),n.tokens},i.prototype.render=function(e,t){return t=t||{},this.renderer.render(this.parse(e,t),this.options,t)},i.prototype.parseInline=function(e,t){var n=new r(this,e,t);return n.inlineMode=!0,this.core.process(n),n.tokens},i.prototype.renderInline=function(e,t){return t=t||{},this.renderer.render(this.parseInline(e,t),this.options,t)},e.exports=i,e.exports.utils=n(26)},function(e,t,n){"use strict";function r(){this.ruler=new i;for(var e=0;e<a.length;e++)this.ruler.push(a[e][0],a[e][1],{alt:(a[e][2]||[]).slice()})}var i=n(166),o=n(1150),a=[["code",n(1140)],["fences",n(1142),["paragraph","blockquote","list"]],["blockquote",n(1139),["paragraph","blockquote","list"]],["hr",n(1145),["paragraph","blockquote","list"]],["list",n(1148),["paragraph","blockquote"]],["footnote",n(1143),["paragraph"]],["heading",n(1144),["paragraph","blockquote"]],["lheading",n(1147)],["htmlblock",n(1146),["paragraph","blockquote"]],["table",n(1151),["paragraph"]],["deflist",n(1141),["paragraph"]],["paragraph",n(1149)]];r.prototype.tokenize=function(e,t,n){for(var r,i=this.ruler.getRules(""),o=i.length,a=t,s=!1;a<n&&(e.line=a=e.skipEmptyLines(a),!(a>=n))&&!(e.tShift[a]<e.blkIndent);){for(r=0;r<o&&!i[r](e,a,n,!1);r++);if(e.tight=!s,e.isEmpty(e.line-1)&&(s=!0),(a=e.line)<n&&e.isEmpty(a)){if(s=!0,++a<n&&"list"===e.parentType&&e.isEmpty(a))break;e.line=a}}};var s=/[\n\t]/g,u=/\r[\n\u0085]|[\u2424\u2028\u0085]/g,l=/\u00a0/g;r.prototype.parse=function(e,t,n,r){var i,a=0,c=0;if(!e)return[];e=e.replace(l," "),e=e.replace(u,"\n"),e.indexOf("\t")>=0&&(e=e.replace(s,function(t,n){var r;return 10===e.charCodeAt(n)?(a=n+1,c=0,t):(r="    ".slice((n-a-c)%4),c=n-a+1,r)})),i=new o(e,this,t,n,r),this.tokenize(i,i.line,i.lineMax)},e.exports=r},function(e,t,n){"use strict";function r(){this.options={},this.ruler=new i;for(var e=0;e<o.length;e++)this.ruler.push(o[e][0],o[e][1])}var i=n(166),o=[["block",n(1154)],["abbr",n(1152)],["references",n(1158)],["inline",n(1156)],["footnote_tail",n(1155)],["abbr2",n(1153)],["replacements",n(1159)],["smartquotes",n(1160)],["linkify",n(1157)]];r.prototype.process=function(e){var t,n,r;for(r=this.ruler.getRules(""),t=0,n=r.length;t<n;t++)r[t](e)},e.exports=r},function(e,t,n){"use strict";function r(){this.ruler=new o;for(var e=0;e<u.length;e++)this.ruler.push(u[e][0],u[e][1]);this.validateLink=i}function i(e){var t=["vbscript","javascript","file","data"],n=e.trim().toLowerCase();return n=s.replaceEntities(n),-1===n.indexOf(":")||-1===t.indexOf(n.split(":")[0])}var o=n(166),a=n(263),s=n(26),u=[["text",n(1176)],["newline",n(1173)],["escape",n(1166)],["backticks",n(1162)],["del",n(1163)],["ins",n(1170)],["mark",n(1172)],["emphasis",n(1164)],["sub",n(1174)],["sup",n(1175)],["links",n(1171)],["footnote_inline",n(1167)],["footnote_ref",n(1168)],["autolink",n(1161)],["htmltag",n(1169)],["entity",n(1165)]];r.prototype.skipToken=function(e){var t,n,r=this.ruler.getRules(""),i=r.length,o=e.pos;if((n=e.cacheGet(o))>0)return void(e.pos=n);for(t=0;t<i;t++)if(r[t](e,!0))return void e.cacheSet(o,e.pos);e.pos++,e.cacheSet(o,e.pos)},r.prototype.tokenize=function(e){for(var t,n,r=this.ruler.getRules(""),i=r.length,o=e.posMax;e.pos<o;){for(n=0;n<i&&!(t=r[n](e,!1));n++);if(t){if(e.pos>=o)break}else e.pending+=e.src[e.pos++]}e.pending&&e.pushPending()},r.prototype.parse=function(e,t,n,r){var i=new a(e,this,t,n,r);this.tokenize(i)},e.exports=r},function(e,t,n){"use strict";function r(){this.rules=i.assign({},o),this.getBreak=o.getBreak}var i=n(26),o=n(1138);e.exports=r,r.prototype.renderInline=function(e,t,n){for(var r=this.rules,i=e.length,o=0,a="";i--;)a+=r[e[o].type](e,o++,t,n,this);return a},r.prototype.render=function(e,t,n){for(var r=this.rules,i=e.length,o=-1,a="";++o<i;)"inline"===e[o].type?a+=this.renderInline(e[o].children,t,n):a+=r[e[o].type](e,o,t,n,this);return a}},function(e,t,n){"use strict";function r(e,t){return++t>=e.length-2?t:"paragraph_open"===e[t].type&&e[t].tight&&"inline"===e[t+1].type&&0===e[t+1].content.length&&"paragraph_close"===e[t+2].type&&e[t+2].tight?r(e,t+2):t}var i=n(26).has,o=n(26).unescapeMd,a=n(26).replaceEntities,s=n(26).escapeHtml,u={};u.blockquote_open=function(){return"<blockquote>\n"},u.blockquote_close=function(e,t){return"</blockquote>"+l(e,t)},u.code=function(e,t){return e[t].block?"<pre><code>"+s(e[t].content)+"</code></pre>"+l(e,t):"<code>"+s(e[t].content)+"</code>"},u.fence=function(e,t,n,r,u){var c,p,f,h=e[t],d="",m=n.langPrefix,v="";if(h.params){if(c=h.params.split(/\s+/g),p=c.join(" "),i(u.rules.fence_custom,c[0]))return u.rules.fence_custom[c[0]](e,t,n,r,u);v=s(a(o(p))),d=' class="'+m+v+'"'}return f=n.highlight?n.highlight.apply(n.highlight,[h.content].concat(c))||s(h.content):s(h.content),"<pre><code"+d+">"+f+"</code></pre>"+l(e,t)},u.fence_custom={},u.heading_open=function(e,t){return"<h"+e[t].hLevel+">"},u.heading_close=function(e,t){return"</h"+e[t].hLevel+">\n"},u.hr=function(e,t,n){return(n.xhtmlOut?"<hr />":"<hr>")+l(e,t)},u.bullet_list_open=function(){return"<ul>\n"},u.bullet_list_close=function(e,t){return"</ul>"+l(e,t)},u.list_item_open=function(){return"<li>"},u.list_item_close=function(){return"</li>\n"},u.ordered_list_open=function(e,t){var n=e[t];return"<ol"+(n.order>1?' start="'+n.order+'"':"")+">\n"},u.ordered_list_close=function(e,t){return"</ol>"+l(e,t)},u.paragraph_open=function(e,t){return e[t].tight?"":"<p>"},u.paragraph_close=function(e,t){var n=!(e[t].tight&&t&&"inline"===e[t-1].type&&!e[t-1].content);return(e[t].tight?"":"</p>")+(n?l(e,t):"")},u.link_open=function(e,t,n){var r=e[t].title?' title="'+s(a(e[t].title))+'"':"",i=n.linkTarget?' target="'+n.linkTarget+'"':"";return'<a href="'+s(e[t].href)+'"'+r+i+">"},u.link_close=function(){return"</a>"},u.image=function(e,t,n){var r=' src="'+s(e[t].src)+'"',i=e[t].title?' title="'+s(a(e[t].title))+'"':"";return"<img"+r+' alt="'+(e[t].alt?s(a(o(e[t].alt))):"")+'"'+i+(n.xhtmlOut?" /":"")+">"},u.table_open=function(){return"<table>\n"},u.table_close=function(){return"</table>\n"},u.thead_open=function(){return"<thead>\n"},u.thead_close=function(){return"</thead>\n"},u.tbody_open=function(){return"<tbody>\n"},u.tbody_close=function(){return"</tbody>\n"},u.tr_open=function(){return"<tr>"},u.tr_close=function(){return"</tr>\n"},u.th_open=function(e,t){var n=e[t];return"<th"+(n.align?' style="text-align:'+n.align+'"':"")+">"},u.th_close=function(){return"</th>"},u.td_open=function(e,t){var n=e[t];return"<td"+(n.align?' style="text-align:'+n.align+'"':"")+">"},u.td_close=function(){return"</td>"},u.strong_open=function(){return"<strong>"},u.strong_close=function(){return"</strong>"},u.em_open=function(){return"<em>"},u.em_close=function(){return"</em>"},u.del_open=function(){return"<del>"},u.del_close=function(){return"</del>"},u.ins_open=function(){return"<ins>"},u.ins_close=function(){return"</ins>"},u.mark_open=function(){return"<mark>"},u.mark_close=function(){return"</mark>"},u.sub=function(e,t){return"<sub>"+s(e[t].content)+"</sub>"},u.sup=function(e,t){return"<sup>"+s(e[t].content)+"</sup>"},u.hardbreak=function(e,t,n){return n.xhtmlOut?"<br />\n":"<br>\n"},u.softbreak=function(e,t,n){return n.breaks?n.xhtmlOut?"<br />\n":"<br>\n":"\n"},u.text=function(e,t){return s(e[t].content)},u.htmlblock=function(e,t){return e[t].content},u.htmltag=function(e,t){return e[t].content},u.abbr_open=function(e,t){return'<abbr title="'+s(a(e[t].title))+'">'},u.abbr_close=function(){return"</abbr>"},u.footnote_ref=function(e,t){var n=Number(e[t].id+1).toString(),r="fnref"+n;return e[t].subId>0&&(r+=":"+e[t].subId),'<sup class="footnote-ref"><a href="#fn'+n+'" id="'+r+'">['+n+"]</a></sup>"},u.footnote_block_open=function(e,t,n){return(n.xhtmlOut?'<hr class="footnotes-sep" />\n':'<hr class="footnotes-sep">\n')+'<section class="footnotes">\n<ol class="footnotes-list">\n'},u.footnote_block_close=function(){return"</ol>\n</section>\n"},u.footnote_open=function(e,t){return'<li id="fn'+Number(e[t].id+1).toString()+'"  class="footnote-item">'},u.footnote_close=function(){return"</li>\n"},u.footnote_anchor=function(e,t){var n=Number(e[t].id+1).toString(),r="fnref"+n;return e[t].subId>0&&(r+=":"+e[t].subId),' <a href="#'+r+'" class="footnote-backref">↩</a>'},u.dl_open=function(){return"<dl>\n"},u.dt_open=function(){return"<dt>"},u.dd_open=function(){return"<dd>"},u.dl_close=function(){return"</dl>\n"},u.dt_close=function(){return"</dt>\n"},u.dd_close=function(){return"</dd>\n"};var l=u.getBreak=function(e,t){return t=r(e,t),t<e.length&&"list_item_close"===e[t].type?"":"\n"};e.exports=u},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s,u,l,c,p,f,h,d,m=e.bMarks[t]+e.tShift[t],v=e.eMarks[t];if(m>v)return!1;if(62!==e.src.charCodeAt(m++))return!1;if(e.level>=e.options.maxNesting)return!1;if(r)return!0;for(32===e.src.charCodeAt(m)&&m++,u=e.blkIndent,e.blkIndent=0,s=[e.bMarks[t]],e.bMarks[t]=m,m=m<v?e.skipSpaces(m):m,o=m>=v,a=[e.tShift[t]],e.tShift[t]=m-e.bMarks[t],p=e.parser.ruler.getRules("blockquote"),i=t+1;i<n&&(m=e.bMarks[i]+e.tShift[i],v=e.eMarks[i],!(m>=v));i++)if(62!==e.src.charCodeAt(m++)){if(o)break;for(d=!1,f=0,h=p.length;f<h;f++)if(p[f](e,i,n,!0)){d=!0;break}if(d)break;s.push(e.bMarks[i]),a.push(e.tShift[i]),e.tShift[i]=-1337}else 32===e.src.charCodeAt(m)&&m++,s.push(e.bMarks[i]),e.bMarks[i]=m,m=m<v?e.skipSpaces(m):m,o=m>=v,a.push(e.tShift[i]),e.tShift[i]=m-e.bMarks[i];for(l=e.parentType,e.parentType="blockquote",e.tokens.push({type:"blockquote_open",lines:c=[t,0],level:e.level++}),e.parser.tokenize(e,t,i),e.tokens.push({type:"blockquote_close",level:--e.level}),e.parentType=l,c[1]=e.line,f=0;f<a.length;f++)e.bMarks[f+t]=s[f],e.tShift[f+t]=a[f];return e.blkIndent=u,!0}},function(e,t,n){"use strict";e.exports=function(e,t,n){var r,i;if(e.tShift[t]-e.blkIndent<4)return!1;for(i=r=t+1;r<n;)if(e.isEmpty(r))r++;else{if(!(e.tShift[r]-e.blkIndent>=4))break;r++,i=r}return e.line=r,e.tokens.push({type:"code",content:e.getLines(t,i,4+e.blkIndent,!0),block:!0,lines:[t,e.line],level:e.level}),!0}},function(e,t,n){"use strict";function r(e,t){var n,r,i=e.bMarks[t]+e.tShift[t],o=e.eMarks[t];return i>=o?-1:126!==(r=e.src.charCodeAt(i++))&&58!==r?-1:(n=e.skipSpaces(i),i===n?-1:n>=o?-1:n)}function i(e,t){var n,r,i=e.level+2;for(n=t+2,r=e.tokens.length-2;n<r;n++)e.tokens[n].level===i&&"paragraph_open"===e.tokens[n].type&&(e.tokens[n+2].tight=!0,e.tokens[n].tight=!0,n+=2)}e.exports=function(e,t,n,o){var a,s,u,l,c,p,f,h,d,m,v,g,y,_;if(o)return!(e.ddIndent<0)&&r(e,t)>=0;if(f=t+1,e.isEmpty(f)&&++f>n)return!1;if(e.tShift[f]<e.blkIndent)return!1;if((a=r(e,f))<0)return!1;if(e.level>=e.options.maxNesting)return!1;p=e.tokens.length,e.tokens.push({type:"dl_open",lines:c=[t,0],level:e.level++}),u=t,s=f;e:for(;;){for(_=!0,y=!1,e.tokens.push({type:"dt_open",lines:[u,u],level:e.level++}),e.tokens.push({type:"inline",content:e.getLines(u,u+1,e.blkIndent,!1).trim(),level:e.level+1,lines:[u,u],children:[]}),e.tokens.push({type:"dt_close",level:--e.level});;){if(e.tokens.push({type:"dd_open",lines:l=[f,0],level:e.level++}),g=e.tight,d=e.ddIndent,h=e.blkIndent,v=e.tShift[s],m=e.parentType,e.blkIndent=e.ddIndent=e.tShift[s]+2,e.tShift[s]=a-e.bMarks[s],e.tight=!0,e.parentType="deflist",e.parser.tokenize(e,s,n,!0),e.tight&&!y||(_=!1),y=e.line-s>1&&e.isEmpty(e.line-1),e.tShift[s]=v,e.tight=g,e.parentType=m,e.blkIndent=h,e.ddIndent=d,e.tokens.push({type:"dd_close",level:--e.level}),l[1]=f=e.line,f>=n)break e;if(e.tShift[f]<e.blkIndent)break e;if((a=r(e,f))<0)break;s=f}if(f>=n)break;if(u=f,e.isEmpty(u))break;if(e.tShift[u]<e.blkIndent)break;if((s=u+1)>=n)break;if(e.isEmpty(s)&&s++,s>=n)break;if(e.tShift[s]<e.blkIndent)break;if((a=r(e,s))<0)break}return e.tokens.push({type:"dl_close",level:--e.level}),c[1]=f,e.line=f,_&&i(e,p),!0}},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s,u,l=!1,c=e.bMarks[t]+e.tShift[t],p=e.eMarks[t];if(c+3>p)return!1;if(126!==(i=e.src.charCodeAt(c))&&96!==i)return!1;if(u=c,c=e.skipChars(c,i),(o=c-u)<3)return!1;if(a=e.src.slice(c,p).trim(),a.indexOf("`")>=0)return!1;if(r)return!0;for(s=t;!(++s>=n)&&(c=u=e.bMarks[s]+e.tShift[s],p=e.eMarks[s],!(c<p&&e.tShift[s]<e.blkIndent));)if(e.src.charCodeAt(c)===i&&!(e.tShift[s]-e.blkIndent>=4||(c=e.skipChars(c,i))-u<o||(c=e.skipSpaces(c))<p)){l=!0;break}return o=e.tShift[t],e.line=s+(l?1:0),e.tokens.push({type:"fence",params:a,content:e.getLines(t+1,s,o,!0),lines:[t,e.line],level:e.level}),!0}},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s,u,l=e.bMarks[t]+e.tShift[t],c=e.eMarks[t];if(l+4>c)return!1;if(91!==e.src.charCodeAt(l))return!1;if(94!==e.src.charCodeAt(l+1))return!1;if(e.level>=e.options.maxNesting)return!1;for(s=l+2;s<c;s++){if(32===e.src.charCodeAt(s))return!1;if(93===e.src.charCodeAt(s))break}return s!==l+2&&(!(s+1>=c||58!==e.src.charCodeAt(++s))&&(!!r||(s++,e.env.footnotes||(e.env.footnotes={}),e.env.footnotes.refs||(e.env.footnotes.refs={}),u=e.src.slice(l+2,s-2),e.env.footnotes.refs[":"+u]=-1,e.tokens.push({type:"footnote_reference_open",label:u,level:e.level++}),i=e.bMarks[t],o=e.tShift[t],a=e.parentType,e.tShift[t]=e.skipSpaces(s)-s,e.bMarks[t]=s,e.blkIndent+=4,e.parentType="footnote",e.tShift[t]<e.blkIndent&&(e.tShift[t]+=e.blkIndent,e.bMarks[t]-=e.blkIndent),e.parser.tokenize(e,t,n,!0),e.parentType=a,e.blkIndent-=4,e.tShift[t]=o,e.bMarks[t]=i,e.tokens.push({type:"footnote_reference_close",level:--e.level}),!0)))}},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s=e.bMarks[t]+e.tShift[t],u=e.eMarks[t];if(s>=u)return!1;if(35!==(i=e.src.charCodeAt(s))||s>=u)return!1;for(o=1,i=e.src.charCodeAt(++s);35===i&&s<u&&o<=6;)o++,i=e.src.charCodeAt(++s);return!(o>6||s<u&&32!==i)&&(!!r||(u=e.skipCharsBack(u,32,s),a=e.skipCharsBack(u,35,s),a>s&&32===e.src.charCodeAt(a-1)&&(u=a),e.line=t+1,e.tokens.push({type:"heading_open",hLevel:o,lines:[t,e.line],level:e.level}),s<u&&e.tokens.push({type:"inline",content:e.src.slice(s,u).trim(),level:e.level+1,lines:[t,e.line],children:[]}),e.tokens.push({type:"heading_close",hLevel:o,level:e.level}),!0))}},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s=e.bMarks[t],u=e.eMarks[t];if((s+=e.tShift[t])>u)return!1;if(42!==(i=e.src.charCodeAt(s++))&&45!==i&&95!==i)return!1;for(o=1;s<u;){if((a=e.src.charCodeAt(s++))!==i&&32!==a)return!1;a===i&&o++}return!(o<3)&&(!!r||(e.line=t+1,e.tokens.push({type:"hr",lines:[t,e.line],level:e.level}),!0))}},function(e,t,n){"use strict";function r(e){var t=32|e;return t>=97&&t<=122}var i=n(1127),o=/^<([a-zA-Z]{1,15})[\s\/>]/,a=/^<\/([a-zA-Z]{1,15})[\s>]/;e.exports=function(e,t,n,s){var u,l,c,p=e.bMarks[t],f=e.eMarks[t],h=e.tShift[t];if(p+=h,!e.options.html)return!1;if(h>3||p+2>=f)return!1;if(60!==e.src.charCodeAt(p))return!1;if(33===(u=e.src.charCodeAt(p+1))||63===u){if(s)return!0}else{if(47!==u&&!r(u))return!1;if(47===u){if(!(l=e.src.slice(p,f).match(a)))return!1}else if(!(l=e.src.slice(p,f).match(o)))return!1;if(!0!==i[l[1].toLowerCase()])return!1;if(s)return!0}for(c=t+1;c<e.lineMax&&!e.isEmpty(c);)c++;return e.line=c,e.tokens.push({type:"htmlblock",level:e.level,lines:[t,e.line],content:e.getLines(t,c,0,!0)}),!0}},function(e,t,n){"use strict";e.exports=function(e,t,n){var r,i,o,a=t+1;return!(a>=n)&&(!(e.tShift[a]<e.blkIndent)&&(!(e.tShift[a]-e.blkIndent>3)&&(i=e.bMarks[a]+e.tShift[a],o=e.eMarks[a],!(i>=o)&&((45===(r=e.src.charCodeAt(i))||61===r)&&(i=e.skipChars(i,r),!((i=e.skipSpaces(i))<o)&&(i=e.bMarks[t]+e.tShift[t],e.line=a+1,e.tokens.push({type:"heading_open",hLevel:61===r?1:2,lines:[t,e.line],level:e.level}),e.tokens.push({type:"inline",content:e.src.slice(i,e.eMarks[t]).trim(),level:e.level+1,lines:[t,e.line-1],children:[]}),e.tokens.push({type:"heading_close",hLevel:61===r?1:2,level:e.level}),!0))))))}},function(e,t,n){"use strict";function r(e,t){var n,r,i;return r=e.bMarks[t]+e.tShift[t],i=e.eMarks[t],r>=i?-1:(n=e.src.charCodeAt(r++),42!==n&&45!==n&&43!==n?-1:r<i&&32!==e.src.charCodeAt(r)?-1:r)}function i(e,t){var n,r=e.bMarks[t]+e.tShift[t],i=e.eMarks[t];if(r+1>=i)return-1;if((n=e.src.charCodeAt(r++))<48||n>57)return-1;for(;;){if(r>=i)return-1;if(!((n=e.src.charCodeAt(r++))>=48&&n<=57)){if(41===n||46===n)break;return-1}}return r<i&&32!==e.src.charCodeAt(r)?-1:r}function o(e,t){var n,r,i=e.level+2;for(n=t+2,r=e.tokens.length-2;n<r;n++)e.tokens[n].level===i&&"paragraph_open"===e.tokens[n].type&&(e.tokens[n+2].tight=!0,e.tokens[n].tight=!0,n+=2)}e.exports=function(e,t,n,a){var s,u,l,c,p,f,h,d,m,v,g,y,_,b,x,w,k,E,S,C,A,D,O=!0;if((d=i(e,t))>=0)_=!0;else{if(!((d=r(e,t))>=0))return!1;_=!1}if(e.level>=e.options.maxNesting)return!1;if(y=e.src.charCodeAt(d-1),a)return!0;for(x=e.tokens.length,_?(h=e.bMarks[t]+e.tShift[t],g=Number(e.src.substr(h,d-h-1)),e.tokens.push({type:"ordered_list_open",order:g,lines:k=[t,0],level:e.level++})):e.tokens.push({type:"bullet_list_open",lines:k=[t,0],level:e.level++}),s=t,w=!1,S=e.parser.ruler.getRules("list");!(!(s<n)||(b=e.skipSpaces(d),m=e.eMarks[s],v=b>=m?1:b-d,v>4&&(v=1),v<1&&(v=1),u=d-e.bMarks[s]+v,e.tokens.push({type:"list_item_open",lines:E=[t,0],level:e.level++}),c=e.blkIndent,p=e.tight,l=e.tShift[t],f=e.parentType,e.tShift[t]=b-e.bMarks[t],e.blkIndent=u,e.tight=!0,e.parentType="list",e.parser.tokenize(e,t,n,!0),e.tight&&!w||(O=!1),w=e.line-t>1&&e.isEmpty(e.line-1),e.blkIndent=c,e.tShift[t]=l,e.tight=p,e.parentType=f,e.tokens.push({type:"list_item_close",level:--e.level}),s=t=e.line,E[1]=s,b=e.bMarks[t],s>=n)||e.isEmpty(s)||e.tShift[s]<e.blkIndent);){for(D=!1,C=0,A=S.length;C<A;C++)if(S[C](e,s,n,!0)){D=!0;break}if(D)break;if(_){if((d=i(e,s))<0)break}else if((d=r(e,s))<0)break;if(y!==e.src.charCodeAt(d-1))break}return e.tokens.push({type:_?"ordered_list_close":"bullet_list_close",level:--e.level}),k[1]=s,e.line=s,O&&o(e,x),!0}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s,u=t+1;if(n=e.lineMax,u<n&&!e.isEmpty(u))for(s=e.parser.ruler.getRules("paragraph");u<n&&!e.isEmpty(u);u++)if(!(e.tShift[u]-e.blkIndent>3)){for(i=!1,o=0,a=s.length;o<a;o++)if(s[o](e,u,n,!0)){i=!0;break}if(i)break}return r=e.getLines(t,u,e.blkIndent,!1).trim(),e.line=u,r.length&&(e.tokens.push({type:"paragraph_open",tight:!1,lines:[t,e.line],level:e.level}),e.tokens.push({type:"inline",content:r,level:e.level+1,lines:[t,e.line],children:[]}),e.tokens.push({type:"paragraph_close",tight:!1,level:e.level})),!0}},function(e,t,n){"use strict";function r(e,t,n,r,i){var o,a,s,u,l,c,p;for(this.src=e,this.parser=t,this.options=n,this.env=r,this.tokens=i,this.bMarks=[],this.eMarks=[],this.tShift=[],this.blkIndent=0,this.line=0,this.lineMax=0,this.tight=!1,this.parentType="root",this.ddIndent=-1,this.level=0,this.result="",a=this.src,c=0,p=!1,s=u=c=0,l=a.length;u<l;u++){if(o=a.charCodeAt(u),!p){if(32===o){c++;continue}p=!0}10!==o&&u!==l-1||(10!==o&&u++,this.bMarks.push(s),this.eMarks.push(u),this.tShift.push(c),p=!1,c=0,s=u+1)}this.bMarks.push(a.length),this.eMarks.push(a.length),this.tShift.push(0),this.lineMax=this.bMarks.length-1}r.prototype.isEmpty=function(e){return this.bMarks[e]+this.tShift[e]>=this.eMarks[e]},r.prototype.skipEmptyLines=function(e){for(var t=this.lineMax;e<t&&!(this.bMarks[e]+this.tShift[e]<this.eMarks[e]);e++);return e},r.prototype.skipSpaces=function(e){for(var t=this.src.length;e<t&&32===this.src.charCodeAt(e);e++);return e},r.prototype.skipChars=function(e,t){for(var n=this.src.length;e<n&&this.src.charCodeAt(e)===t;e++);return e},r.prototype.skipCharsBack=function(e,t,n){if(e<=n)return e;for(;e>n;)if(t!==this.src.charCodeAt(--e))return e+1;return e},r.prototype.getLines=function(e,t,n,r){var i,o,a,s,u,l=e;if(e>=t)return"";if(l+1===t)return o=this.bMarks[l]+Math.min(this.tShift[l],n),a=r?this.eMarks[l]+1:this.eMarks[l],this.src.slice(o,a);for(s=new Array(t-e),i=0;l<t;l++,i++)u=this.tShift[l],u>n&&(u=n),u<0&&(u=0),o=this.bMarks[l]+u,a=l+1<t||r?this.eMarks[l]+1:this.eMarks[l],s[i]=this.src.slice(o,a);return s.join("")},e.exports=r},function(e,t,n){"use strict";function r(e,t){var n=e.bMarks[t]+e.blkIndent,r=e.eMarks[t];return e.src.substr(n,r-n)}e.exports=function(e,t,n,i){var o,a,s,u,l,c,p,f,h,d,m;if(t+2>n)return!1;if(l=t+1,e.tShift[l]<e.blkIndent)return!1;if((s=e.bMarks[l]+e.tShift[l])>=e.eMarks[l])return!1;if(124!==(o=e.src.charCodeAt(s))&&45!==o&&58!==o)return!1;if(a=r(e,t+1),!/^[-:| ]+$/.test(a))return!1;if((c=a.split("|"))<=2)return!1;for(f=[],u=0;u<c.length;u++){if(!(h=c[u].trim())){if(0===u||u===c.length-1)continue;return!1}if(!/^:?-+:?$/.test(h))return!1;58===h.charCodeAt(h.length-1)?f.push(58===h.charCodeAt(0)?"center":"right"):58===h.charCodeAt(0)?f.push("left"):f.push("")}if(a=r(e,t).trim(),-1===a.indexOf("|"))return!1;if(c=a.replace(/^\||\|$/g,"").split("|"),f.length!==c.length)return!1;if(i)return!0;for(e.tokens.push({type:"table_open",lines:d=[t,0],level:e.level++}),e.tokens.push({type:"thead_open",lines:[t,t+1],level:e.level++}),e.tokens.push({type:"tr_open",lines:[t,t+1],level:e.level++}),u=0;u<c.length;u++)e.tokens.push({type:"th_open",align:f[u],lines:[t,t+1],level:e.level++}),e.tokens.push({type:"inline",content:c[u].trim(),lines:[t,t+1],level:e.level,children:[]}),e.tokens.push({type:"th_close",level:--e.level});for(e.tokens.push({type:"tr_close",level:--e.level}),e.tokens.push({type:"thead_close",level:--e.level}),e.tokens.push({type:"tbody_open",lines:m=[t+2,0],level:e.level++}),l=t+2;l<n&&!(e.tShift[l]<e.blkIndent)&&(a=r(e,l).trim(),-1!==a.indexOf("|"));l++){for(c=a.replace(/^\||\|$/g,"").split("|"),e.tokens.push({type:"tr_open",level:e.level++}),u=0;u<c.length;u++)e.tokens.push({type:"td_open",align:f[u],level:e.level++}),p=c[u].substring(124===c[u].charCodeAt(0)?1:0,124===c[u].charCodeAt(c[u].length-1)?c[u].length-1:c[u].length).trim(),e.tokens.push({type:"inline",content:p,level:e.level,children:[]}),e.tokens.push({type:"td_close",level:--e.level});e.tokens.push({type:"tr_close",level:--e.level})}return e.tokens.push({type:"tbody_close",level:--e.level}),e.tokens.push({type:"table_close",level:--e.level}),d[1]=m[1]=l,e.line=l,!0}},function(e,t,n){"use strict";function r(e,t,n,r){var a,s,u,l,c,p;if(42!==e.charCodeAt(0))return-1;if(91!==e.charCodeAt(1))return-1;if(-1===e.indexOf("]:"))return-1;if(a=new i(e,t,n,r,[]),(s=o(a,1))<0||58!==e.charCodeAt(s+1))return-1;for(l=a.posMax,u=s+2;u<l&&10!==a.src.charCodeAt(u);u++);return c=e.slice(2,s),p=e.slice(s+2,u).trim(),0===p.length?-1:(r.abbreviations||(r.abbreviations={}),void 0===r.abbreviations[":"+c]&&(r.abbreviations[":"+c]=p),u)}var i=n(263),o=n(165);e.exports=function(e){var t,n,i,o,a=e.tokens;if(!e.inlineMode)for(t=1,n=a.length-1;t<n;t++)if("paragraph_open"===a[t-1].type&&"inline"===a[t].type&&"paragraph_close"===a[t+1].type){for(i=a[t].content;i.length&&!((o=r(i,e.inline,e.options,e.env))<0);)i=i.slice(o).trim();a[t].content=i,i.length||(a[t-1].tight=!0,a[t+1].tight=!0)}}},function(e,t,n){"use strict";function r(e){return e.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,"\\$1")}var i=" \n()[]'\".,!?-";e.exports=function(e){var t,n,o,a,s,u,l,c,p,f,h,d,m=e.tokens;if(e.env.abbreviations)for(e.env.abbrRegExp||(d="(^|["+i.split("").map(r).join("")+"])("+Object.keys(e.env.abbreviations).map(function(e){return e.substr(1)}).sort(function(e,t){return t.length-e.length}).map(r).join("|")+")($|["+i.split("").map(r).join("")+"])",e.env.abbrRegExp=new RegExp(d,"g")),f=e.env.abbrRegExp,n=0,o=m.length;n<o;n++)if("inline"===m[n].type)for(a=m[n].children,t=a.length-1;t>=0;t--)if(s=a[t],"text"===s.type){for(c=0,u=s.content,f.lastIndex=0,p=s.level,l=[];h=f.exec(u);)f.lastIndex>c&&l.push({type:"text",content:u.slice(c,h.index+h[1].length),level:p}),l.push({type:"abbr_open",title:e.env.abbreviations[":"+h[2]],level:p++}),l.push({type:"text",content:h[2],level:p}),l.push({type:"abbr_close",level:--p}),c=f.lastIndex-h[3].length;l.length&&(c<u.length&&l.push({type:"text",content:u.slice(c),level:p}),m[n].children=a=[].concat(a.slice(0,t),l,a.slice(t+1)))}}},function(e,t,n){"use strict";e.exports=function(e){e.inlineMode?e.tokens.push({type:"inline",content:e.src.replace(/\n/g," ").trim(),level:0,lines:[0,1],children:[]}):e.block.parse(e.src,e.options,e.env,e.tokens)}},function(e,t,n){"use strict";e.exports=function(e){var t,n,r,i,o,a,s,u,l,c=0,p=!1,f={};if(e.env.footnotes&&(e.tokens=e.tokens.filter(function(e){return"footnote_reference_open"===e.type?(p=!0,u=[],l=e.label,!1):"footnote_reference_close"===e.type?(p=!1,f[":"+l]=u,!1):(p&&u.push(e),!p)}),e.env.footnotes.list)){for(a=e.env.footnotes.list,e.tokens.push({type:"footnote_block_open",level:c++}),t=0,n=a.length;t<n;t++){for(e.tokens.push({type:"footnote_open",id:t,level:c++}),a[t].tokens?(s=[],s.push({type:"paragraph_open",tight:!1,level:c++}),s.push({type:"inline",content:"",level:c,children:a[t].tokens}),s.push({type:"paragraph_close",tight:!1,level:--c})):a[t].label&&(s=f[":"+a[t].label]),e.tokens=e.tokens.concat(s),o="paragraph_close"===e.tokens[e.tokens.length-1].type?e.tokens.pop():null,i=a[t].count>0?a[t].count:1,r=0;r<i;r++)e.tokens.push({type:"footnote_anchor",id:t,subId:r,level:c});o&&e.tokens.push(o),e.tokens.push({type:"footnote_close",level:--c})}e.tokens.push({type:"footnote_block_close",level:--c})}}},function(e,t,n){"use strict";e.exports=function(e){var t,n,r,i=e.tokens;for(n=0,r=i.length;n<r;n++)t=i[n],"inline"===t.type&&e.inline.parse(t.content,e.options,e.env,t.children)}},function(e,t,n){"use strict";function r(e){return/^<a[>\s]/i.test(e)}function i(e){return/^<\/a\s*>/i.test(e)}function o(){var e=[],t=new a({stripPrefix:!1,url:!0,email:!0,twitter:!1,replaceFn:function(t,n){switch(n.getType()){case"url":e.push({text:n.matchedText,url:n.getUrl()});break;case"email":e.push({text:n.matchedText,url:"mailto:"+n.getEmail().replace(/^mailto:/i,"")})}return!1}});return{links:e,autolinker:t}}var a=n(508),s=/www|@|\:\/\//;e.exports=function(e){var t,n,a,u,l,c,p,f,h,d,m,v,g,y=e.tokens,_=null;if(e.options.linkify)for(n=0,a=y.length;n<a;n++)if("inline"===y[n].type)for(u=y[n].children,m=0,t=u.length-1;t>=0;t--)if(l=u[t],"link_close"!==l.type){if("htmltag"===l.type&&(r(l.content)&&m>0&&m--,i(l.content)&&m++),!(m>0)&&"text"===l.type&&s.test(l.content)){if(_||(_=o(),v=_.links,g=_.autolinker),c=l.content,v.length=0,g.link(c),!v.length)continue;for(p=[],d=l.level,f=0;f<v.length;f++)e.inline.validateLink(v[f].url)&&(h=c.indexOf(v[f].text),h&&(d=d,p.push({type:"text",content:c.slice(0,h),level:d})),p.push({type:"link_open",href:v[f].url,title:"",level:d++}),p.push({type:"text",content:v[f].text,level:d}),p.push({type:"link_close",level:--d}),c=c.slice(h+v[f].text.length));c.length&&p.push({type:"text",content:c,level:d}),y[n].children=u=[].concat(u.slice(0,t),p,u.slice(t+1))}}else for(t--;u[t].level!==l.level&&"link_open"!==u[t].type;)t--}},function(e,t,n){"use strict";function r(e,t,n,r){var l,c,p,f,h,d,m,v,g;if(91!==e.charCodeAt(0))return-1;if(-1===e.indexOf("]:"))return-1;if(l=new i(e,t,n,r,[]),(c=o(l,0))<0||58!==e.charCodeAt(c+1))return-1;for(f=l.posMax,p=c+2;p<f&&(32===(h=l.src.charCodeAt(p))||10===h);p++);if(!a(l,p))return-1;for(m=l.linkContent,p=l.pos,d=p,p+=1;p<f&&(32===(h=l.src.charCodeAt(p))||10===h);p++);for(p<f&&d!==p&&s(l,p)?(v=l.linkContent,p=l.pos):(v="",p=d);p<f&&32===l.src.charCodeAt(p);)p++;return p<f&&10!==l.src.charCodeAt(p)?-1:(g=u(e.slice(1,c)),void 0===r.references[g]&&(r.references[g]={title:v,href:m}),p)}var i=n(263),o=n(165),a=n(491),s=n(492),u=n(490);e.exports=function(e){var t,n,i,o,a=e.tokens;if(e.env.references=e.env.references||{},!e.inlineMode)for(t=1,n=a.length-1;t<n;t++)if("inline"===a[t].type&&"paragraph_open"===a[t-1].type&&"paragraph_close"===a[t+1].type){for(i=a[t].content;i.length&&!((o=r(i,e.inline,e.options,e.env))<0);)i=i.slice(o).trim();a[t].content=i,i.length||(a[t-1].tight=!0,a[t+1].tight=!0)}}},function(e,t,n){"use strict";function r(e){return e.indexOf("(")<0?e:e.replace(o,function(e,t){return a[t.toLowerCase()]})}var i=/\+-|\.\.|\?\?\?\?|!!!!|,,|--/,o=/\((c|tm|r|p)\)/gi,a={c:"©",r:"®",p:"§",tm:"™"};e.exports=function(e){var t,n,o,a,s;if(e.options.typographer)for(s=e.tokens.length-1;s>=0;s--)if("inline"===e.tokens[s].type)for(a=e.tokens[s].children,t=a.length-1;t>=0;t--)n=a[t],"text"===n.type&&(o=n.content,o=r(o),i.test(o)&&(o=o.replace(/\+-/g,"±").replace(/\.{2,}/g,"…").replace(/([?!])…/g,"$1..").replace(/([?!]){4,}/g,"$1$1$1").replace(/,{2,}/g,",").replace(/(^|[^-])---([^-]|$)/gm,"$1—$2").replace(/(^|\s)--(\s|$)/gm,"$1–$2").replace(/(^|[^-\s])--([^-\s]|$)/gm,"$1–$2")),n.content=o)}},function(e,t,n){"use strict";function r(e,t){return!(t<0||t>=e.length)&&!s.test(e[t])}function i(e,t,n){return e.substr(0,t)+n+e.substr(t+1)}var o=/['"]/,a=/['"]/g,s=/[-\s()\[\]]/;e.exports=function(e){var t,n,s,u,l,c,p,f,h,d,m,v,g,y,_,b,x;if(e.options.typographer)for(x=[],_=e.tokens.length-1;_>=0;_--)if("inline"===e.tokens[_].type)for(b=e.tokens[_].children,x.length=0,t=0;t<b.length;t++)if(n=b[t],"text"===n.type&&!o.test(n.text)){for(p=b[t].level,g=x.length-1;g>=0&&!(x[g].level<=p);g--);x.length=g+1,s=n.content,l=0,c=s.length;e:for(;l<c&&(a.lastIndex=l,u=a.exec(s));)if(f=!r(s,u.index-1),l=u.index+1,y="'"===u[0],(h=!r(s,l))||f){if(m=!h,v=!f)for(g=x.length-1;g>=0&&(d=x[g],!(x[g].level<p));g--)if(d.single===y&&x[g].level===p){d=x[g],y?(b[d.token].content=i(b[d.token].content,d.pos,e.options.quotes[2]),n.content=i(n.content,u.index,e.options.quotes[3])):(b[d.token].content=i(b[d.token].content,d.pos,e.options.quotes[0]),n.content=i(n.content,u.index,e.options.quotes[1])),x.length=g;continue e}m?x.push({token:t,pos:u.index,single:y,level:p}):v&&y&&(n.content=i(n.content,u.index,"’"))}else y&&(n.content=i(n.content,u.index,"’"))}}},function(e,t,n){"use strict";var r=n(1129),i=n(489),o=/^<([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/,a=/^<([a-zA-Z.\-]{1,25}):([^<>\x00-\x20]*)>/;e.exports=function(e,t){var n,s,u,l,c,p=e.pos;return 60===e.src.charCodeAt(p)&&(n=e.src.slice(p),!(n.indexOf(">")<0)&&((s=n.match(a))?!(r.indexOf(s[1].toLowerCase())<0)&&(l=s[0].slice(1,-1),c=i(l),!!e.parser.validateLink(l)&&(t||(e.push({type:"link_open",href:c,level:e.level}),e.push({type:"text",content:l,level:e.level+1}),e.push({type:"link_close",level:e.level})),e.pos+=s[0].length,!0)):!!(u=n.match(o))&&(l=u[0].slice(1,-1),c=i("mailto:"+l),!!e.parser.validateLink(c)&&(t||(e.push({type:"link_open",href:c,level:e.level}),e.push({type:"text",content:l,level:e.level+1}),e.push({type:"link_close",level:e.level})),e.pos+=u[0].length,!0))))}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s=e.pos;if(96!==e.src.charCodeAt(s))return!1;for(n=s,s++,r=e.posMax;s<r&&96===e.src.charCodeAt(s);)s++;for(i=e.src.slice(n,s),o=a=s;-1!==(o=e.src.indexOf("`",a));){for(a=o+1;a<r&&96===e.src.charCodeAt(a);)a++;if(a-o===i.length)return t||e.push({type:"code",content:e.src.slice(s,o).replace(/[ \n]+/g," ").trim(),block:!1,level:e.level}),e.pos=a,!0}return t||(e.pending+=i),e.pos+=i.length,!0}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s=e.posMax,u=e.pos;if(126!==e.src.charCodeAt(u))return!1;if(t)return!1;if(u+4>=s)return!1;if(126!==e.src.charCodeAt(u+1))return!1;if(e.level>=e.options.maxNesting)return!1;if(o=u>0?e.src.charCodeAt(u-1):-1,a=e.src.charCodeAt(u+2),126===o)return!1;if(126===a)return!1;if(32===a||10===a)return!1;for(r=u+2;r<s&&126===e.src.charCodeAt(r);)r++;if(r>u+3)return e.pos+=r-u,t||(e.pending+=e.src.slice(u,r)),!0;for(e.pos=u+2,i=1;e.pos+1<s;){if(126===e.src.charCodeAt(e.pos)&&126===e.src.charCodeAt(e.pos+1)&&(o=e.src.charCodeAt(e.pos-1),126!==(a=e.pos+2<s?e.src.charCodeAt(e.pos+2):-1)&&126!==o&&(32!==o&&10!==o?i--:32!==a&&10!==a&&i++,i<=0))){n=!0;break}e.parser.skipToken(e)}return n?(e.posMax=e.pos,e.pos=u+2,t||(e.push({type:"del_open",level:e.level++}),e.parser.tokenize(e),e.push({type:"del_close",level:--e.level})),e.pos=e.posMax+2,e.posMax=s,!0):(e.pos=u,!1)}},function(e,t,n){"use strict";function r(e){return e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122}function i(e,t){var n,i,o,a=t,s=!0,u=!0,l=e.posMax,c=e.src.charCodeAt(t);for(n=t>0?e.src.charCodeAt(t-1):-1;a<l&&e.src.charCodeAt(a)===c;)a++;return a>=l&&(s=!1),o=a-t,o>=4?s=u=!1:(i=a<l?e.src.charCodeAt(a):-1,32!==i&&10!==i||(s=!1),32!==n&&10!==n||(u=!1),95===c&&(r(n)&&(s=!1),r(i)&&(u=!1))),{can_open:s,can_close:u,delims:o}}e.exports=function(e,t){var n,r,o,a,s,u,l,c=e.posMax,p=e.pos,f=e.src.charCodeAt(p);if(95!==f&&42!==f)return!1;if(t)return!1;if(l=i(e,p),n=l.delims,!l.can_open)return e.pos+=n,t||(e.pending+=e.src.slice(p,e.pos)),!0;if(e.level>=e.options.maxNesting)return!1;for(e.pos=p+n,u=[n];e.pos<c;)if(e.src.charCodeAt(e.pos)!==f)e.parser.skipToken(e);else{if(l=i(e,e.pos),r=l.delims,l.can_close){for(a=u.pop(),s=r;a!==s;){if(s<a){u.push(a-s);break}if(s-=a,0===u.length)break;e.pos+=a,a=u.pop()}if(0===u.length){n=a,o=!0;break}e.pos+=r;continue}l.can_open&&u.push(r),e.pos+=r}return o?(e.posMax=e.pos,e.pos=p+n,t||(2!==n&&3!==n||e.push({type:"strong_open",level:e.level++}),1!==n&&3!==n||e.push({type:"em_open",level:e.level++}),e.parser.tokenize(e),1!==n&&3!==n||e.push({type:"em_close",level:--e.level}),2!==n&&3!==n||e.push({type:"strong_close",level:--e.level})),e.pos=e.posMax+n,e.posMax=c,!0):(e.pos=p,!1)}},function(e,t,n){"use strict";var r=n(488),i=n(26).has,o=n(26).isValidEntityCode,a=n(26).fromCodePoint,s=/^&#((?:x[a-f0-9]{1,8}|[0-9]{1,8}));/i,u=/^&([a-z][a-z0-9]{1,31});/i;e.exports=function(e,t){var n,l,c=e.pos,p=e.posMax;if(38!==e.src.charCodeAt(c))return!1;if(c+1<p)if(35===e.src.charCodeAt(c+1)){if(l=e.src.slice(c).match(s))return t||(n="x"===l[1][0].toLowerCase()?parseInt(l[1].slice(1),16):parseInt(l[1],10),e.pending+=a(o(n)?n:65533)),e.pos+=l[0].length,!0}else if((l=e.src.slice(c).match(u))&&i(r,l[1]))return t||(e.pending+=r[l[1]]),e.pos+=l[0].length,!0;return t||(e.pending+="&"),e.pos++,!0}},function(e,t,n){"use strict";for(var r=[],i=0;i<256;i++)r.push(0);"\\!\"#$%&'()*+,./:;<=>?@[]^_`{|}~-".split("").forEach(function(e){r[e.charCodeAt(0)]=1}),e.exports=function(e,t){var n,i=e.pos,o=e.posMax;if(92!==e.src.charCodeAt(i))return!1;if(++i<o){if((n=e.src.charCodeAt(i))<256&&0!==r[n])return t||(e.pending+=e.src[i]),e.pos+=2,!0;if(10===n){for(t||e.push({type:"hardbreak",level:e.level}),i++;i<o&&32===e.src.charCodeAt(i);)i++;return e.pos=i,!0}}return t||(e.pending+="\\"),e.pos++,!0}},function(e,t,n){"use strict";var r=n(165);e.exports=function(e,t){var n,i,o,a,s=e.posMax,u=e.pos;return!(u+2>=s)&&(94===e.src.charCodeAt(u)&&(91===e.src.charCodeAt(u+1)&&(!(e.level>=e.options.maxNesting)&&(n=u+2,!((i=r(e,u+1))<0)&&(t||(e.env.footnotes||(e.env.footnotes={}),e.env.footnotes.list||(e.env.footnotes.list=[]),o=e.env.footnotes.list.length,e.pos=n,e.posMax=i,e.push({type:"footnote_ref",id:o,level:e.level}),e.linkLevel++,a=e.tokens.length,e.parser.tokenize(e),e.env.footnotes.list[o]={tokens:e.tokens.splice(a)},e.linkLevel--),e.pos=i+1,e.posMax=s,!0)))))}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a=e.posMax,s=e.pos;if(s+3>a)return!1;if(!e.env.footnotes||!e.env.footnotes.refs)return!1;if(91!==e.src.charCodeAt(s))return!1;if(94!==e.src.charCodeAt(s+1))return!1;if(e.level>=e.options.maxNesting)return!1;for(r=s+2;r<a;r++){if(32===e.src.charCodeAt(r))return!1;if(10===e.src.charCodeAt(r))return!1;if(93===e.src.charCodeAt(r))break}return r!==s+2&&(!(r>=a)&&(r++,n=e.src.slice(s+2,r-1),void 0!==e.env.footnotes.refs[":"+n]&&(t||(e.env.footnotes.list||(e.env.footnotes.list=[]),e.env.footnotes.refs[":"+n]<0?(i=e.env.footnotes.list.length,e.env.footnotes.list[i]={label:n,count:0},e.env.footnotes.refs[":"+n]=i):i=e.env.footnotes.refs[":"+n],o=e.env.footnotes.list[i].count,e.env.footnotes.list[i].count++,e.push({type:"footnote_ref",id:i,subId:o,level:e.level})),e.pos=r,e.posMax=a,!0)))}},function(e,t,n){"use strict";function r(e){var t=32|e;return t>=97&&t<=122}var i=n(1128).HTML_TAG_RE;e.exports=function(e,t){var n,o,a,s=e.pos;return!!e.options.html&&(a=e.posMax,!(60!==e.src.charCodeAt(s)||s+2>=a)&&(!(33!==(n=e.src.charCodeAt(s+1))&&63!==n&&47!==n&&!r(n))&&(!!(o=e.src.slice(s).match(i))&&(t||e.push({type:"htmltag",content:e.src.slice(s,s+o[0].length),level:e.level}),e.pos+=o[0].length,!0))))}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s=e.posMax,u=e.pos;if(43!==e.src.charCodeAt(u))return!1;if(t)return!1;if(u+4>=s)return!1;if(43!==e.src.charCodeAt(u+1))return!1;if(e.level>=e.options.maxNesting)return!1;if(o=u>0?e.src.charCodeAt(u-1):-1,a=e.src.charCodeAt(u+2),43===o)return!1;if(43===a)return!1;if(32===a||10===a)return!1;for(r=u+2;r<s&&43===e.src.charCodeAt(r);)r++;if(r!==u+2)return e.pos+=r-u,t||(e.pending+=e.src.slice(u,r)),!0;for(e.pos=u+2,i=1;e.pos+1<s;){if(43===e.src.charCodeAt(e.pos)&&43===e.src.charCodeAt(e.pos+1)&&(o=e.src.charCodeAt(e.pos-1),43!==(a=e.pos+2<s?e.src.charCodeAt(e.pos+2):-1)&&43!==o&&(32!==o&&10!==o?i--:32!==a&&10!==a&&i++,i<=0))){n=!0;break}e.parser.skipToken(e)}return n?(e.posMax=e.pos,e.pos=u+2,t||(e.push({type:"ins_open",level:e.level++}),e.parser.tokenize(e),e.push({type:"ins_close",level:--e.level})),e.pos=e.posMax+2,e.posMax=s,!0):(e.pos=u,!1)}},function(e,t,n){"use strict";var r=n(165),i=n(491),o=n(492),a=n(490);e.exports=function(e,t){var n,s,u,l,c,p,f,h,d=!1,m=e.pos,v=e.posMax,g=e.pos,y=e.src.charCodeAt(g);if(33===y&&(d=!0,y=e.src.charCodeAt(++g)),91!==y)return!1;if(e.level>=e.options.maxNesting)return!1;if(n=g+1,(s=r(e,g))<0)return!1;if((p=s+1)<v&&40===e.src.charCodeAt(p)){for(p++;p<v&&(32===(h=e.src.charCodeAt(p))||10===h);p++);if(p>=v)return!1;for(g=p,i(e,p)?(l=e.linkContent,p=e.pos):l="",g=p;p<v&&(32===(h=e.src.charCodeAt(p))||10===h);p++);if(p<v&&g!==p&&o(e,p))for(c=e.linkContent,p=e.pos;p<v&&(32===(h=e.src.charCodeAt(p))||10===h);p++);else c="";if(p>=v||41!==e.src.charCodeAt(p))return e.pos=m,!1;p++}else{if(e.linkLevel>0)return!1;for(;p<v&&(32===(h=e.src.charCodeAt(p))||10===h);p++);if(p<v&&91===e.src.charCodeAt(p)&&(g=p+1,p=r(e,p),p>=0?u=e.src.slice(g,p++):p=g-1),u||(void 0===u&&(p=s+1),u=e.src.slice(n,s)),!(f=e.env.references[a(u)]))return e.pos=m,!1;l=f.href,c=f.title}return t||(e.pos=n,e.posMax=s,d?e.push({type:"image",src:l,title:c,alt:e.src.substr(n,s-n),level:e.level}):(e.push({type:"link_open",href:l,title:c,level:e.level++}),e.linkLevel++,e.parser.tokenize(e),e.linkLevel--,e.push({type:"link_close",level:--e.level}))),e.pos=p,e.posMax=v,!0}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s=e.posMax,u=e.pos;if(61!==e.src.charCodeAt(u))return!1;if(t)return!1;if(u+4>=s)return!1;if(61!==e.src.charCodeAt(u+1))return!1;if(e.level>=e.options.maxNesting)return!1;if(o=u>0?e.src.charCodeAt(u-1):-1,a=e.src.charCodeAt(u+2),61===o)return!1;if(61===a)return!1;if(32===a||10===a)return!1;for(r=u+2;r<s&&61===e.src.charCodeAt(r);)r++;if(r!==u+2)return e.pos+=r-u,t||(e.pending+=e.src.slice(u,r)),!0;for(e.pos=u+2,i=1;e.pos+1<s;){if(61===e.src.charCodeAt(e.pos)&&61===e.src.charCodeAt(e.pos+1)&&(o=e.src.charCodeAt(e.pos-1),61!==(a=e.pos+2<s?e.src.charCodeAt(e.pos+2):-1)&&61!==o&&(32!==o&&10!==o?i--:32!==a&&10!==a&&i++,i<=0))){n=!0;break}e.parser.skipToken(e)}return n?(e.posMax=e.pos,e.pos=u+2,t||(e.push({type:"mark_open",level:e.level++}),e.parser.tokenize(e),e.push({type:"mark_close",level:--e.level})),e.pos=e.posMax+2,e.posMax=s,!0):(e.pos=u,!1)}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i=e.pos;if(10!==e.src.charCodeAt(i))return!1;if(n=e.pending.length-1,r=e.posMax,!t)if(n>=0&&32===e.pending.charCodeAt(n))if(n>=1&&32===e.pending.charCodeAt(n-1)){for(var o=n-2;o>=0;o--)if(32!==e.pending.charCodeAt(o)){e.pending=e.pending.substring(0,o+1);break}e.push({type:"hardbreak",level:e.level})}else e.pending=e.pending.slice(0,-1),e.push({type:"softbreak",level:e.level});else e.push({type:"softbreak",level:e.level});for(i++;i<r&&32===e.src.charCodeAt(i);)i++;return e.pos=i,!0}},function(e,t,n){"use strict";var r=/\\([ \\!"#$%&'()*+,.\/:;<=>?@[\]^_`{|}~-])/g;e.exports=function(e,t){var n,i,o=e.posMax,a=e.pos;if(126!==e.src.charCodeAt(a))return!1;if(t)return!1;if(a+2>=o)return!1;if(e.level>=e.options.maxNesting)return!1;for(e.pos=a+1;e.pos<o;){if(126===e.src.charCodeAt(e.pos)){n=!0;break}e.parser.skipToken(e)}return n&&a+1!==e.pos?(i=e.src.slice(a+1,e.pos),i.match(/(^|[^\\])(\\\\)*\s/)?(e.pos=a,!1):(e.posMax=e.pos,e.pos=a+1,t||e.push({type:"sub",level:e.level,content:i.replace(r,"$1")}),e.pos=e.posMax+1,e.posMax=o,!0)):(e.pos=a,!1)}},function(e,t,n){"use strict";var r=/\\([ \\!"#$%&'()*+,.\/:;<=>?@[\]^_`{|}~-])/g;e.exports=function(e,t){var n,i,o=e.posMax,a=e.pos;if(94!==e.src.charCodeAt(a))return!1;if(t)return!1;if(a+2>=o)return!1;if(e.level>=e.options.maxNesting)return!1;for(e.pos=a+1;e.pos<o;){if(94===e.src.charCodeAt(e.pos)){n=!0;break}e.parser.skipToken(e)}return n&&a+1!==e.pos?(i=e.src.slice(a+1,e.pos),i.match(/(^|[^\\])(\\\\)*\s/)?(e.pos=a,!1):(e.posMax=e.pos,e.pos=a+1,t||e.push({type:"sup",level:e.level,content:i.replace(r,"$1")}),e.pos=e.posMax+1,e.posMax=o,!0)):(e.pos=a,!1)}},function(e,t,n){"use strict";function r(e){switch(e){case 10:case 92:case 96:case 42:case 95:case 94:case 91:case 93:case 33:case 38:case 60:case 62:case 123:case 125:case 36:case 37:case 64:case 126:case 43:case 61:case 58:return!0;default:return!1}}e.exports=function(e,t){for(var n=e.pos;n<e.posMax&&!r(e.src.charCodeAt(n));)n++;return n!==e.pos&&(t||(e.pending+=e.src.slice(e.pos,n)),e.pos=n,!0)}},function(e,t,n){"use strict";function r(e,t){if("string"!=typeof e)throw new TypeError("expected a string");if(1===t)return e;if(2===t)return e+e;var n=e.length*t;if(i!==e||void 0===i)i=e,o="";else if(o.length>=n)return o.substr(0,n);for(;n>o.length&&t>1;)1&t&&(o+=e),t>>=1,e+=e;return o+=e,o=o.substr(0,n)}/*!
-- * repeat-string <https://github.com/jonschlinkert/repeat-string>
-- *
-- * Copyright (c) 2014-2015, Jon Schlinkert.
-- * Licensed under the MIT License.
-- */
--var i,o="";e.exports=r},function(e,t,n){"use strict";e.exports=function(e,t){if(t=t.split(":")[0],!(e=+e))return!1;switch(t){case"http":case"ws":return 80!==e;case"https":case"wss":return 443!==e;case"ftp":return 21!==e;case"gopher":return 70!==e;case"file":return!1}return 0!==e}},function(e,t,n){"use strict";function r(e,t){e&&Object.keys(e).forEach(function(n){t(e[n],n)})}function i(e,t){return{}.hasOwnProperty.call(e,t)}function o(e,t){var n=[];return r(e,function(e){t(e)&&n.push(e)}),n}function a(e,t,n){function g(e,t){var n=this;this.tag=e,this.attribs=t||{},this.tagPosition=E.length,this.text="",this.updateParentNodeText=function(){if(P.length){P[P.length-1].text+=n.text}}}function y(e){return"string"!=typeof e&&(e+=""),e.replace(/\&/g,"&amp;").replace(/</g,"&lt;").replace(/\>/g,"&gt;").replace(/\"/g,"&quot;")}function _(e,n){n=n.replace(/[\x00-\x20]+/g,""),n=n.replace(/<\!\-\-.*?\-\-\>/g,"");var r=n.match(/^([a-zA-Z]+)\:/);if(!r)return!!n.match(/^[\/\\]{2}/)&&!t.allowProtocolRelative;var o=r[1].toLowerCase();return i(t.allowedSchemesByTag,e)?-1===t.allowedSchemesByTag[e].indexOf(o):!t.allowedSchemes||-1===t.allowedSchemes.indexOf(o)}function b(e,t){if(!t)return e;var n,r=c(e),i=e.nodes[0];return n=t[i.selector]&&t["*"]?p(c(t[i.selector]),t["*"],function(e,t){if(Array.isArray(e))return e.concat(t)}):t[i.selector]||t["*"],n&&(r.nodes[0].nodes=i.nodes.reduce(w(n),[])),r}function x(e){return e.nodes[0].nodes.reduce(function(e,t){return e.push(t.prop+":"+t.value+";"),e},[]).join("")}function w(e){return function(t,n){if(e.hasOwnProperty(n.prop)){e[n.prop].some(function(e){return e.test(n.value)})&&t.push(n)}return t}}function k(e,t){return t?(e=e.split(/\s+/),e.filter(function(e){return-1!==t.indexOf(e)}).join(" ")):e}var E="";t?(t=u(a.defaults,t),t.parser?t.parser=u(v,t.parser):t.parser=v):(t=a.defaults,t.parser=v);var S,C,A=t.nonTextTags||["script","style","textarea"];t.allowedAttributes&&(S={},C={},r(t.allowedAttributes,function(e,t){S[t]=[];var n=[];e.forEach(function(e){e.indexOf("*")>=0?n.push(l(e).replace(/\\\*/g,".*")):S[t].push(e)}),C[t]=new RegExp("^("+n.join("|")+")$")}));var D={};r(t.allowedClasses,function(e,t){S&&(i(S,t)||(S[t]=[]),S[t].push("class")),D[t]=e});var O,M={};r(t.transformTags,function(e,t){var n;"function"==typeof e?n=e:"string"==typeof e&&(n=a.simpleTransform(e)),"*"===t?O=n:M[t]=n});var T=0,P=[],I={},R={},j=!1,F=0,N=new s.Parser({onopentag:function(e,n){if(j)return void F++;var a=new g(e,n);P.push(a);var s,u=!1,l=!!a.text;i(M,e)&&(s=M[e](e,n),a.attribs=n=s.attribs,void 0!==s.text&&(a.innerText=s.text),e!==s.tagName&&(a.name=e=s.tagName,R[T]=s.tagName)),O&&(s=O(e,n),a.attribs=n=s.attribs,e!==s.tagName&&(a.name=e=s.tagName,R[T]=s.tagName)),t.allowedTags&&-1===t.allowedTags.indexOf(e)&&(u=!0,-1!==A.indexOf(e)&&(j=!0,F=1),I[T]=!0),T++,u||(E+="<"+e,(!S||i(S,e)||S["*"])&&r(n,function(n,s){if(!m.test(s))return void delete a.attribs[s];var u;if(!S||i(S,e)&&-1!==S[e].indexOf(s)||S["*"]&&-1!==S["*"].indexOf(s)||i(C,e)&&C[e].test(s)||C["*"]&&C["*"].test(s)){if(("href"===s||"src"===s)&&_(e,n))return void delete a.attribs[s];if("iframe"===e&&"src"===s){if("//"===n.substring(0,2)){n="https:".concat(n)}try{if(u=d.parse(n),t.allowedIframeHostnames){if(!t.allowedIframeHostnames.find(function(e){return e===u.hostname}))return void delete a.attribs[s]}}catch(e){return void delete a.attribs[s]}}if("srcset"===s)try{if(u=f.parse(n),r(u,function(e){_("srcset",e.url)&&(e.evil=!0)}),u=o(u,function(e){return!e.evil}),!u.length)return void delete a.attribs[s];n=f.stringify(o(u,function(e){return!e.evil})),a.attribs[s]=n}catch(e){return void delete a.attribs[s]}if("class"===s&&(n=k(n,D[e]),!n.length))return void delete a.attribs[s];if("style"===s)try{if(n=x(b(h.parse(e+" {"+n+"}"),t.allowedStyles)),0===n.length)return void delete a.attribs[s]}catch(e){return void delete a.attribs[s]}E+=" "+s,n.length&&(E+='="'+y(n)+'"')}else delete a.attribs[s]}),-1!==t.selfClosing.indexOf(e)?E+=" />":(E+=">",!a.innerText||l||t.textFilter||(E+=a.innerText)))},ontext:function(e){if(!j){var n,r=P[P.length-1];if(r&&(n=r.tag,e=void 0!==r.innerText?r.innerText:e),"script"===n||"style"===n)E+=e;else{var i=y(e);t.textFilter?E+=t.textFilter(i):E+=i}if(P.length){P[P.length-1].text+=e}}},onclosetag:function(e){if(j){if(--F)return;j=!1}var n=P.pop();if(n){if(j=!1,T--,I[T])return delete I[T],void n.updateParentNodeText();if(R[T]&&(e=R[T],delete R[T]),t.exclusiveFilter&&t.exclusiveFilter(n))return void(E=E.substr(0,n.tagPosition));n.updateParentNodeText(),-1===t.selfClosing.indexOf(e)&&(E+="</"+e+">")}}},t.parser);return N.write(e),N.end(),E}var s=n(116),u=n(1200),l=n(825),c=n(824),p=n(827),f=n(1181),h=n(982),d=n(497);e.exports=a;var m=/^[^\0\t\n\f\r \/<=>]+$/,v={decodeEntities:!0};a.defaults={allowedTags:["h3","h4","h5","h6","blockquote","p","a","ul","ol","nl","li","b","i","strong","em","strike","code","hr","br","div","table","thead","caption","tbody","tr","th","td","pre","iframe"],allowedAttributes:{a:["href","name","target"],img:["src"]},selfClosing:["img","br","hr","area","base","basefont","input","link","meta"],allowedSchemes:["http","https","ftp","mailto"],allowedSchemesByTag:{},allowProtocolRelative:!0},a.simpleTransform=function(e,t,n){return n=void 0===n||n,t=t||{},function(r,i){var o;if(n)for(o in t)i[o]=t[o];else i=t;return{tagName:e,attribs:i}}}},function(e,t,n){(function(e,t){!function(e,n){"use strict";function r(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n<t.length;n++)t[n]=arguments[n+1];var r={callback:e,args:t};return l[u]=r,s(u),u++}function i(e){delete l[e]}function o(e){var t=e.callback,r=e.args;switch(r.length){case 0:t();break;case 1:t(r[0]);break;case 2:t(r[0],r[1]);break;case 3:t(r[0],r[1],r[2]);break;default:t.apply(n,r)}}function a(e){if(c)setTimeout(a,0,e);else{var t=l[e];if(t){c=!0;try{o(t)}finally{i(e),c=!1}}}}if(!e.setImmediate){var s,u=1,l={},c=!1,p=e.document,f=Object.getPrototypeOf&&Object.getPrototypeOf(e);f=f&&f.setTimeout?f:e,"[object process]"==={}.toString.call(e.process)?function(){s=function(e){t.nextTick(function(){a(e)})}}():function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?function(){var t="setImmediate$"+Math.random()+"$",n=function(n){n.source===e&&"string"==typeof n.data&&0===n.data.indexOf(t)&&a(+n.data.slice(t.length))};e.addEventListener?e.addEventListener("message",n,!1):e.attachEvent("onmessage",n),s=function(n){e.postMessage(t+n,"*")}}():e.MessageChannel?function(){var e=new MessageChannel;e.port1.onmessage=function(e){a(e.data)},s=function(t){e.port2.postMessage(t)}}():p&&"onreadystatechange"in p.createElement("script")?function(){var e=p.documentElement;s=function(t){var n=p.createElement("script");n.onreadystatechange=function(){a(t),n.onreadystatechange=null,e.removeChild(n),n=null},e.appendChild(n)}}():function(){s=function(e){setTimeout(a,0,e)}}(),f.setImmediate=r,f.clearImmediate=i}}("undefined"==typeof self?void 0===e?this:e:self)}).call(t,n(17),n(33))},function(e,t,n){"use strict";function r(e){return e.sort().filter(function(t,n){return JSON.stringify(t)!==JSON.stringify(e[n-1])})}var i=n(978),o=n(507),a=/^\d+$/;t.parse=function(e){return r(e.split(",").map(function(e){var t={};return e.trim().split(/\s+/).forEach(function(e,n){if(0===n)return t.url=e;var r=e.substring(0,e.length-1),o=e[e.length-1],s=parseInt(r,10),u=parseFloat(r);if("w"===o&&a.test(r))t.width=s;else if("h"===o&&a.test(r))t.height=s;else{if("x"!==o||i(u))throw new Error("Invalid srcset descriptor: "+e+".");t.density=u}}),t}))},t.stringify=function(e){return o(e.map(function(e){if(!e.url)throw new Error("URL is required.");var t=[e.url];return e.width&&t.push(e.width+"w"),e.height&&t.push(e.height+"h"),e.density&&t.push(e.density+"x"),t.join(" ")})).join(", ")}},function(e,t,n){e.exports=n(1183)},function(e,t,n){"use strict";(function(e,r){Object.defineProperty(t,"__esModule",{value:!0});var i,o=n(1184),a=function(e){return e&&e.__esModule?e:{default:e}}(o);i="undefined"!=typeof self?self:"undefined"!=typeof window?window:void 0!==e?e:r;var s=(0,a.default)(i);t.default=s}).call(t,n(17),n(72)(e))},function(e,t,n){"use strict";function r(e){var t,n=e.Symbol;return"function"==typeof n?n.observable?t=n.observable:(t=n("observable"),n.observable=t):t="@@observable",t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r},function(e,t,n){"use strict";e.exports=2147483647},function(e,t,n){"use strict";var r=n(65),i=n(1185);e.exports=function(e){if((e=r(e))>i)throw new TypeError(e+" exceeds maximum possible timeout");return e}},function(e,t,n){"use strict";(function(t){function r(e){e=e||t.location||{};var n,r={},i=typeof e;if("blob:"===e.protocol)r=new a(unescape(e.pathname),{});else if("string"===i){r=new a(e,{});for(n in d)delete r[n]}else if("object"===i){for(n in e)n in d||(r[n]=e[n]);void 0===r.slashes&&(r.slashes=f.test(e.href))}return r}function i(e){var t=p.exec(e);return{protocol:t[1]?t[1].toLowerCase():"",slashes:!!t[2],rest:t[3]}}function o(e,t){for(var n=(t||"/").split("/").slice(0,-1).concat(e.split("/")),r=n.length,i=n[r-1],o=!1,a=0;r--;)"."===n[r]?n.splice(r,1):".."===n[r]?(n.splice(r,1),a++):a&&(0===r&&(o=!0),n.splice(r,1),a--);return o&&n.unshift(""),"."!==i&&".."!==i||n.push(""),n.join("/")}function a(e,t,n){if(!(this instanceof a))return new a(e,t,n);var s,u,p,f,d,m,v=h.slice(),g=typeof t,y=this,_=0;for("object"!==g&&"string"!==g&&(n=t,t=null),n&&"function"!=typeof n&&(n=c.parse),t=r(t),u=i(e||""),s=!u.protocol&&!u.slashes,y.slashes=u.slashes||s&&t.slashes,y.protocol=u.protocol||t.protocol||"",e=u.rest,u.slashes||(v[2]=[/(.*)/,"pathname"]);_<v.length;_++)f=v[_],p=f[0],m=f[1],p!==p?y[m]=e:"string"==typeof p?~(d=e.indexOf(p))&&("number"==typeof f[2]?(y[m]=e.slice(0,d),e=e.slice(d+f[2])):(y[m]=e.slice(d),e=e.slice(0,d))):(d=p.exec(e))&&(y[m]=d[1],e=e.slice(0,d.index)),y[m]=y[m]||(s&&f[3]?t[m]||"":""),f[4]&&(y[m]=y[m].toLowerCase());n&&(y.query=n(y.query)),s&&t.slashes&&"/"!==y.pathname.charAt(0)&&(""!==y.pathname||""!==t.pathname)&&(y.pathname=o(y.pathname,t.pathname)),l(y.port,y.protocol)||(y.host=y.hostname,y.port=""),y.username=y.password="",y.auth&&(f=y.auth.split(":"),y.username=f[0]||"",y.password=f[1]||""),y.origin=y.protocol&&y.host&&"file:"!==y.protocol?y.protocol+"//"+y.host:"null",y.href=y.toString()}function s(e,t,n){var r=this;switch(e){case"query":"string"==typeof t&&t.length&&(t=(n||c.parse)(t)),r[e]=t;break;case"port":r[e]=t,l(t,r.protocol)?t&&(r.host=r.hostname+":"+t):(r.host=r.hostname,r[e]="");break;case"hostname":r[e]=t,r.port&&(t+=":"+r.port),r.host=t;break;case"host":r[e]=t,/:\d+$/.test(t)?(t=t.split(":"),r.port=t.pop(),r.hostname=t.join(":")):(r.hostname=t,r.port="");break;case"protocol":r.protocol=t.toLowerCase(),r.slashes=!n;break;case"pathname":case"hash":if(t){var i="pathname"===e?"/":"#";r[e]=t.charAt(0)!==i?i+t:t}else r[e]=t;break;default:r[e]=t}for(var o=0;o<h.length;o++){var a=h[o];a[4]&&(r[a[1]]=r[a[1]].toLowerCase())}return r.origin=r.protocol&&r.host&&"file:"!==r.protocol?r.protocol+"//"+r.host:"null",r.href=r.toString(),r}function u(e){e&&"function"==typeof e||(e=c.stringify);var t,n=this,r=n.protocol;r&&":"!==r.charAt(r.length-1)&&(r+=":");var i=r+(n.slashes?"//":"");return n.username&&(i+=n.username,n.password&&(i+=":"+n.password),i+="@"),i+=n.host+n.pathname,t="object"==typeof n.query?e(n.query):n.query,t&&(i+="?"!==t.charAt(0)?"?"+t:t),n.hash&&(i+=n.hash),i}var l=n(1178),c=n(1005),p=/^([a-z][a-z0-9.+-]*:)?(\/\/)?([\S\s]*)/i,f=/^[A-Za-z][A-Za-z0-9+-.]*:\/\//,h=[["#","hash"],["?","query"],["/","pathname"],["@","auth",1],[NaN,"host",void 0,1,1],[/:(\d+)$/,"port",void 0,1],[NaN,"hostname",void 0,1,1]],d={hash:1,query:1};a.prototype={set:s,toString:u},a.extractProtocol=i,a.location=r,a.qs=c,e.exports=a}).call(t,n(17))},function(e,t,n){"use strict";e.exports={isString:function(e){return"string"==typeof e},isObject:function(e){return"object"==typeof e&&null!==e},isNull:function(e){return null===e},isNullOrUndefined:function(e){return null==e}}},function(e,t){e.exports=function(e){for(var t=[],n=0;n<e.length;n++){var r=e.charCodeAt(n);if(r>=55296&&r<=56319&&n+1<e.length){var i=e.charCodeAt(n+1);if(i>=56320&&i<=57343){var o=1024*(r-55296)+i-56320+65536;t.push(240+Math.floor(o/64/64/64),128+Math.floor(o/64/64)%64,128+Math.floor(o/64)%64,128+o%64),n+=1;continue}}r>=2048?t.push(224+Math.floor(r/64/64),128+Math.floor(r/64)%64,128+r%64):r>=128?t.push(192+Math.floor(r/64),128+r%64):t.push(r)}return t}},function(e,t){!function(){function e(e,t){function n(e,t){return r(e,new RegExp(a.source,"g"),t)}function r(e,t,n){if(!i(e))return n;var r=0,o=0;do{var a=t.exec(e);if(null===a)break;if(!(o<n))break;r+=a[0].length,o++}while(null!==a);return r>=e.length?-1:r}function i(e){return s.test(e)}function o(e,n){void 0==e&&(e=["[^]"]),void 0==n&&(n="g");var r=[];return t.forEach(function(e){r.push(e.source)}),r.push(a.source),r=r.concat(e),new RegExp(r.join("|"),n)}e.findCharIndex=function(e,t){if(t>=e.length)return-1;if(!i(e))return t;for(var n=o(),r=0;null!==n.exec(e)&&!(n.lastIndex>t);)r++;return r},e.findByteIndex=function(e,t){return t>=this.length(e)?-1:r(e,o(),t)},e.charAt=function(e,t){var n=this.findByteIndex(e,t);if(n<0||n>=e.length)return"";var r=e.slice(n,n+8),i=s.exec(r);return null===i?r[0]:i[0]},e.charCodeAt=function(e,t){var r=n(e,t);if(r<0)return NaN;var i=e.charCodeAt(r);if(55296<=i&&i<=56319){return 1024*(i-55296)+(e.charCodeAt(r+1)-56320)+65536}return i},e.fromCharCode=function(e){return e>65535?(e-=65536,String.fromCharCode(55296+(e>>10),56320+(1023&e))):String.fromCharCode(e)},e.indexOf=function(e,t,n){void 0!==n&&null!==n||(n=0);var r=this.findByteIndex(e,n),i=e.indexOf(t,r);return i<0?-1:this.findCharIndex(e,i)},e.lastIndexOf=function(e,t,n){var r;if(void 0===n||null===n)r=e.lastIndexOf(t);else{var i=this.findByteIndex(e,n);r=e.lastIndexOf(t,i)}return r<0?-1:this.findCharIndex(e,r)},e.slice=function(e,t,n){var r,i=this.findByteIndex(e,t);return i<0&&(i=e.length),void 0===n||null===n?r=e.length:(r=this.findByteIndex(e,n))<0&&(r=e.length),e.slice(i,r)},e.substr=function(e,t,n){return t<0&&(t=this.length(e)+t),void 0===n||null===n?this.slice(e,t):this.slice(e,t,t+n)},e.substring=e.slice,e.length=function(e){return this.findCharIndex(e,e.length-1)+1},e.stringToCodePoints=function(e){for(var t=[],n=0;n<e.length&&(codePoint=this.charCodeAt(e,n),codePoint);n++)t.push(codePoint);return t},e.codePointsToString=function(e){for(var t=[],n=0;n<e.length;n++)t.push(this.fromCharCode(e[n]));return t.join("")},e.stringToBytes=function(e){for(var t=[],n=0;n<e.length;n++){for(var r=e.charCodeAt(n),i=[];r>0;)i.push(255&r),r>>=8;1==i.length&&i.push(0),t=t.concat(i.reverse())}return t},e.bytesToString=function(e){for(var t=[],n=0;n<e.length;n+=2){var r=e[n],i=e[n+1],o=r<<8|i;t.push(String.fromCharCode(o))}return t.join("")},e.stringToCharArray=function(e){var t=[],n=o();do{var r=n.exec(e);if(null===r)break;t.push(r[0])}while(null!==r);return t};var a=/[\uD800-\uDBFF][\uDC00-\uDFFF]/,s=o([],"")}var n;void 0!==t&&null!==t?n=t:"undefined"!=typeof window&&null!==window&&(void 0!==window.UtfString&&null!==window.UtfString||(window.UtfString={}),n=window.UtfString);var r=/\uD83C[\uDDE6-\uDDFF]\uD83C[\uDDE6-\uDDFF]/;n.visual={},e(n,[]),e(n.visual,[r])}()},function(e,t,n){(function(t){function n(e,t){function n(){if(!i){if(r("throwDeprecation"))throw new Error(t);r("traceDeprecation")?console.trace(t):console.warn(t),i=!0}return e.apply(this,arguments)}if(r("noDeprecation"))return e;var i=!1;return n}function r(e){try{if(!t.localStorage)return!1}catch(e){return!1}var n=t.localStorage[e];return null!=n&&"true"===String(n).toLowerCase()}e.exports=n}).call(t,n(17))},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},function(e,t){e.exports=function(e){return e&&"object"==typeof e&&"function"==typeof e.copy&&"function"==typeof e.fill&&"function"==typeof e.readUInt8}},function(e,t,n){(function(e,r){function i(e,n){var r={seen:[],stylize:a};return arguments.length>=3&&(r.depth=arguments[2]),arguments.length>=4&&(r.colors=arguments[3]),m(n)?r.showHidden=n:n&&t._extend(r,n),x(r.showHidden)&&(r.showHidden=!1),x(r.depth)&&(r.depth=2),x(r.colors)&&(r.colors=!1),x(r.customInspect)&&(r.customInspect=!0),r.colors&&(r.stylize=o),u(r,e,r.depth)}function o(e,t){var n=i.styles[t];return n?"["+i.colors[n][0]+"m"+e+"["+i.colors[n][1]+"m":e}function a(e,t){return e}function s(e){var t={};return e.forEach(function(e,n){t[e]=!0}),t}function u(e,n,r){if(e.customInspect&&n&&C(n.inspect)&&n.inspect!==t.inspect&&(!n.constructor||n.constructor.prototype!==n)){var i=n.inspect(r,e);return _(i)||(i=u(e,i,r)),i}var o=l(e,n);if(o)return o;var a=Object.keys(n),m=s(a);if(e.showHidden&&(a=Object.getOwnPropertyNames(n)),S(n)&&(a.indexOf("message")>=0||a.indexOf("description")>=0))return c(n);if(0===a.length){if(C(n)){var v=n.name?": "+n.name:"";return e.stylize("[Function"+v+"]","special")}if(w(n))return e.stylize(RegExp.prototype.toString.call(n),"regexp");if(E(n))return e.stylize(Date.prototype.toString.call(n),"date");if(S(n))return c(n)}var g="",y=!1,b=["{","}"];if(d(n)&&(y=!0,b=["[","]"]),C(n)){g=" [Function"+(n.name?": "+n.name:"")+"]"}if(w(n)&&(g=" "+RegExp.prototype.toString.call(n)),E(n)&&(g=" "+Date.prototype.toUTCString.call(n)),S(n)&&(g=" "+c(n)),0===a.length&&(!y||0==n.length))return b[0]+g+b[1];if(r<0)return w(n)?e.stylize(RegExp.prototype.toString.call(n),"regexp"):e.stylize("[Object]","special");e.seen.push(n);var x;return x=y?p(e,n,r,m,a):a.map(function(t){return f(e,n,r,m,t,y)}),e.seen.pop(),h(x,g,b)}function l(e,t){if(x(t))return e.stylize("undefined","undefined");if(_(t)){var n="'"+JSON.stringify(t).replace(/^"|"$/g,"").replace(/'/g,"\\'").replace(/\\"/g,'"')+"'";return e.stylize(n,"string")}return y(t)?e.stylize(""+t,"number"):m(t)?e.stylize(""+t,"boolean"):v(t)?e.stylize("null","null"):void 0}function c(e){return"["+Error.prototype.toString.call(e)+"]"}function p(e,t,n,r,i){for(var o=[],a=0,s=t.length;a<s;++a)T(t,String(a))?o.push(f(e,t,n,r,String(a),!0)):o.push("");return i.forEach(function(i){i.match(/^\d+$/)||o.push(f(e,t,n,r,i,!0))}),o}function f(e,t,n,r,i,o){var a,s,l;if(l=Object.getOwnPropertyDescriptor(t,i)||{value:t[i]},l.get?s=l.set?e.stylize("[Getter/Setter]","special"):e.stylize("[Getter]","special"):l.set&&(s=e.stylize("[Setter]","special")),T(r,i)||(a="["+i+"]"),s||(e.seen.indexOf(l.value)<0?(s=v(n)?u(e,l.value,null):u(e,l.value,n-1),s.indexOf("\n")>-1&&(s=o?s.split("\n").map(function(e){return"  "+e}).join("\n").substr(2):"\n"+s.split("\n").map(function(e){return"   "+e}).join("\n"))):s=e.stylize("[Circular]","special")),x(a)){if(o&&i.match(/^\d+$/))return s;a=JSON.stringify(""+i),a.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)?(a=a.substr(1,a.length-2),a=e.stylize(a,"name")):(a=a.replace(/'/g,"\\'").replace(/\\"/g,'"').replace(/(^"|"$)/g,"'"),a=e.stylize(a,"string"))}return a+": "+s}function h(e,t,n){var r=0;return e.reduce(function(e,t){return r++,t.indexOf("\n")>=0&&r++,e+t.replace(/\u001b\[\d\d?m/g,"").length+1},0)>60?n[0]+(""===t?"":t+"\n ")+" "+e.join(",\n  ")+" "+n[1]:n[0]+t+" "+e.join(", ")+" "+n[1]}function d(e){return Array.isArray(e)}function m(e){return"boolean"==typeof e}function v(e){return null===e}function g(e){return null==e}function y(e){return"number"==typeof e}function _(e){return"string"==typeof e}function b(e){return"symbol"==typeof e}function x(e){return void 0===e}function w(e){return k(e)&&"[object RegExp]"===D(e)}function k(e){return"object"==typeof e&&null!==e}function E(e){return k(e)&&"[object Date]"===D(e)}function S(e){return k(e)&&("[object Error]"===D(e)||e instanceof Error)}function C(e){return"function"==typeof e}function A(e){return null===e||"boolean"==typeof e||"number"==typeof e||"string"==typeof e||"symbol"==typeof e||void 0===e}function D(e){return Object.prototype.toString.call(e)}function O(e){return e<10?"0"+e.toString(10):e.toString(10)}function M(){var e=new Date,t=[O(e.getHours()),O(e.getMinutes()),O(e.getSeconds())].join(":");return[e.getDate(),j[e.getMonth()],t].join(" ")}function T(e,t){return Object.prototype.hasOwnProperty.call(e,t)}var P=/%[sdj%]/g;t.format=function(e){if(!_(e)){for(var t=[],n=0;n<arguments.length;n++)t.push(i(arguments[n]));return t.join(" ")}for(var n=1,r=arguments,o=r.length,a=String(e).replace(P,function(e){if("%%"===e)return"%";if(n>=o)return e;switch(e){case"%s":return String(r[n++]);case"%d":return Number(r[n++]);case"%j":try{return JSON.stringify(r[n++])}catch(e){return"[Circular]"}default:return e}}),s=r[n];n<o;s=r[++n])v(s)||!k(s)?a+=" "+s:a+=" "+i(s);return a},t.deprecate=function(n,i){function o(){if(!a){if(r.throwDeprecation)throw new Error(i);r.traceDeprecation?console.trace(i):console.error(i),a=!0}return n.apply(this,arguments)}if(x(e.process))return function(){return t.deprecate(n,i).apply(this,arguments)};if(!0===r.noDeprecation)return n;var a=!1;return o};var I,R={};t.debuglog=function(e){if(x(I)&&(I=n.i({NODE_ENV:"production",WEBPACK_INLINE_STYLES:!1}).NODE_DEBUG||""),e=e.toUpperCase(),!R[e])if(new RegExp("\\b"+e+"\\b","i").test(I)){var i=r.pid;R[e]=function(){var n=t.format.apply(t,arguments);console.error("%s %d: %s",e,i,n)}}else R[e]=function(){};return R[e]},t.inspect=i,i.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]},i.styles={special:"cyan",number:"yellow",boolean:"yellow",undefined:"grey",null:"bold",string:"green",date:"magenta",regexp:"red"},t.isArray=d,t.isBoolean=m,t.isNull=v,t.isNullOrUndefined=g,t.isNumber=y,t.isString=_,t.isSymbol=b,t.isUndefined=x,t.isRegExp=w,t.isObject=k,t.isDate=E,t.isError=S,t.isFunction=C,t.isPrimitive=A,t.isBuffer=n(1193);var j=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];t.log=function(){console.log("%s - %s",M(),t.format.apply(t,arguments))},t.inherits=n(1192),t._extend=function(e,t){if(!t||!k(t))return e;for(var n=Object.keys(t),r=n.length;r--;)e[n[r]]=t[n[r]];return e}}).call(t,n(17),n(33))},function(e,t){e.exports=function(){throw new Error("define cannot be used indirect")}},function(e,t,n){"use strict";function r(e){return a(e).map(function(e){return{value:e,type:i(e)}})}function i(e){return u(e)?"ClosingTag":c(e)?"OpeningTag":l(e)?"SelfClosingTag":"Text"}var o=n(1177),a=function(e){return e.split(/(<\/?[^>]+>)/g).filter(function(e){return""!==e.trim()})},s=function(e){return/<[^>!]+>/.test(e)},u=function(e){return/<\/+[^>]+>/.test(e)},l=function(e){return/<[^>]+\/>/.test(e)},c=function(e){return s(e)&&!u(e)&&!l(e)};e.exports=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.indentor,i=t.textNodesOnSameLine,a=0,s=[];n=n||"    ";var u=r(e).map(function(e,t,r){var u=e.value,l=e.type;"ClosingTag"===l&&a--;var c=o(n,a),p=c+u;if("OpeningTag"===l&&a++,i){var f=r[t-1],h=r[t-2];"ClosingTag"===l&&"Text"===f.type&&"OpeningTag"===h.type&&(p=""+c+h.value+f.value+u,s.push(t-2,t-1))}return p});return s.forEach(function(e){return u[e]=null}),u.filter(function(e){return!!e}).join("\n")}},function(e,t){function n(e){return e&&e.replace?e.replace(/([&"<>'])/g,function(e,t){return r[t]}):e}var r={"&":"&amp;",'"':"&quot;","'":"&apos;","<":"&lt;",">":"&gt;"};e.exports=n},function(e,t,n){(function(t){function r(e,n){function r(e){m?t.nextTick(e):e()}function i(e,t){if(void 0!==t&&(f+=t),e&&!h&&(l=l||new c,h=!0),e&&h){var n=f;r(function(){l.emit("data",n)}),f=""}}function o(e,t){s(i,a(e,d,d?1:0),t)}function u(){if(l){var e=f;r(function(){l.emit("data",e),l.emit("end"),l.readable=!1,l.emit("close")})}}"object"!=typeof n&&(n={indent:n});var l=n.stream?new c:null,f="",h=!1,d=n.indent?!0===n.indent?p:n.indent:"",m=!0;return r(function(){m=!1}),n.declaration&&function(e){var t=e.encoding||"UTF-8",n={version:"1.0",encoding:t};e.standalone&&(n.standalone=e.standalone),o({"?xml":{_attr:n}}),f=f.replace("/>","?>")}(n.declaration),e&&e.forEach?e.forEach(function(t,n){var r;n+1===e.length&&(r=u),o(t,r)}):o(e,u),l?(l.readable=!0,l):f}function i(){var e=Array.prototype.slice.call(arguments),t={_elem:a(e)};return t.push=function(e){if(!this.append)throw new Error("not assigned to a parent!");var t=this,n=this._elem.indent;s(this.append,a(e,n,this._elem.icount+(n?1:0)),function(){t.append(!0)})},t.close=function(e){void 0!==e&&this.push(e),this.end&&this.end()},t}function o(e,t){return new Array(t||0).join(e||"")}function a(e,t,n){function r(e){Object.keys(e).forEach(function(t){f.push(u(t,e[t]))})}n=n||0;var i,s=o(t,n),c=e;if("object"==typeof e){if(i=Object.keys(e)[0],(c=e[i])&&c._elem)return c._elem.name=i,c._elem.icount=n,c._elem.indent=t,c._elem.indents=s,c._elem.interrupt=c,c._elem}var p,f=[],h=[];switch(typeof c){case"object":if(null===c)break;c._attr&&r(c._attr),c._cdata&&h.push(("<![CDATA["+c._cdata).replace(/\]\]>/g,"]]]]><![CDATA[>")+"]]>"),c.forEach&&(p=!1,h.push(""),c.forEach(function(e){if("object"==typeof e){"_attr"==Object.keys(e)[0]?r(e._attr):h.push(a(e,t,n+1))}else h.pop(),p=!0,h.push(l(e))}),p||h.push(""));break;default:h.push(l(c))}return{name:i,interrupt:!1,attributes:f,content:h,icount:n,indents:s,indent:t}}function s(e,t,n){function r(){for(;t.content.length;){var r=t.content.shift();if(void 0!==r){if(i(r))return;s(e,r)}}e(!1,(o>1?t.indents:"")+(t.name?"</"+t.name+">":"")+(t.indent&&!n?"\n":"")),n&&n()}function i(t){return!!t.interrupt&&(t.interrupt.append=e,t.interrupt.end=r,t.interrupt=!1,e(!0),!0)}if("object"!=typeof t)return e(!1,t);var o=t.interrupt?1:t.content.length;if(e(!1,t.indents+(t.name?"<"+t.name:"")+(t.attributes.length?" "+t.attributes.join(" "):"")+(o?t.name?">":"":t.name?"/>":"")+(t.indent&&o>1?"\n":"")),!o)return e(!1,t.indent?"\n":"");i(t)||r()}function u(e,t){return e+'="'+l(t)+'"'}var l=n(1197),c=n(493).Stream,p="    ";e.exports=r,e.exports.element=e.exports.Element=i}).call(t,n(33))},function(e,t){function n(e,t,n){return r.yubl(t((n||r.yufull)(e)))}t._getPrivFilters=function(){function e(e){var t=e.split(k,2);return!t[0]||2!==t.length&&e.length===t[0].length?null:t[0]}function t(e,t,n,r){function i(e,n,i,a){return n?(n=Number(n[0]<="9"?n:"0"+n),r?A(n):128===n?"€":130===n?"‚":131===n?"ƒ":132===n?"„":133===n?"…":134===n?"†":135===n?"‡":136===n?"ˆ":137===n?"‰":138===n?"Š":139===n?"‹":140===n?"Œ":142===n?"Ž":145===n?"‘":146===n?"’":147===n?"“":148===n?"”":149===n?"•":150===n?"–":151===n?"—":152===n?"˜":153===n?"™":154===n?"š":155===n?"›":156===n?"œ":158===n?"ž":159===n?"Ÿ":n>=55296&&n<=57343||13===n?"�":o.frCoPt(n)):t[i||a]||e}return t=t||m,n=n||d,void 0===e?"undefined":null===e?"null":e.toString().replace(c,"�").replace(n,i)}function n(e){return"\\"+e.charCodeAt(0).toString(16).toLowerCase()+" "}function r(e){return e.replace(_,function(e){return"-x-"+e})}function i(n){n=o.yufull(t(n));var r=e(n);return r&&w[r.toLowerCase()]?"##"+n:n}var o,a=/</g,s=/"/g,u=/'/g,l=/&/g,c=/\x00/g,p=/(?:^$|[\x00\x09-\x0D "'`=<>])/g,f=/[&<>"'`]/g,h=/(?:\x00|^-*!?>|--!?>|--?!?$|\]>|\]$)/g,d=/&(?:#([xX][0-9A-Fa-f]+|\d+);?|(Tab|NewLine|colon|semi|lpar|rpar|apos|sol|comma|excl|ast|midast|ensp|emsp|thinsp);|(nbsp|amp|AMP|lt|LT|gt|GT|quot|QUOT);?)/g,m={Tab:"\t",NewLine:"\n",colon:":",semi:";",lpar:"(",rpar:")",apos:"'",sol:"/",comma:",",excl:"!",ast:"*",midast:"*",ensp:" ",emsp:" ",thinsp:" ",nbsp:" ",amp:"&",lt:"<",gt:">",quot:'"',QUOT:'"'},v=/^(?:(?!-*expression)#?[-\w]+|[+-]?(?:\d+|\d*\.\d+)(?:r?em|ex|ch|cm|mm|in|px|pt|pc|%|vh|vw|vmin|vmax)?|!important|)$/i,g=/[\x00-\x1F\x7F\[\]{}\\"]/g,y=/[\x00-\x1F\x7F\[\]{}\\']/g,_=/url[\(\u207D\u208D]+/g,b=/['\(\)]/g,x=/\/\/%5[Bb]([A-Fa-f0-9:]+)%5[Dd]/,w={javascript:1,data:1,vbscript:1,mhtml:1,"x-schema":1},k=/(?::|&#[xX]0*3[aA];?|&#0*58;?|&colon;)/,E=/(?:^[\x00-\x20]+|[\t\n\r\x00]+)/g,S={Tab:"\t",NewLine:"\n"},C=function(e,t,n){return void 0===e?"undefined":null===e?"null":e.toString().replace(t,n)},A=String.fromCodePoint||function(e){return 0===arguments.length?"":e<=65535?String.fromCharCode(e):(e-=65536,String.fromCharCode(55296+(e>>10),e%1024+56320))};return o={frCoPt:function(e){return void 0===e||null===e?"":!isFinite(e=Number(e))||e<=0||e>1114111||e>=1&&e<=8||e>=14&&e<=31||e>=127&&e<=159||e>=64976&&e<=65007||11===e||65535==(65535&e)||65534==(65535&e)?"�":A(e)},d:t,yup:function(n){return n=e(n.replace(c,"")),n?t(n,S,null,!0).replace(E,"").toLowerCase():null},y:function(e){return C(e,f,function(e){return"&"===e?"&amp;":"<"===e?"&lt;":">"===e?"&gt;":'"'===e?"&quot;":"'"===e?"&#39;":"&#96;"})},ya:function(e){return C(e,l,"&amp;")},yd:function(e){return C(e,a,"&lt;")},yc:function(e){return C(e,h,function(e){return"\0"===e?"�":"--!"===e||"--"===e||"-"===e||"]"===e?e+" ":e.slice(0,-1)+" >"})},yavd:function(e){return C(e,s,"&quot;")},yavs:function(e){return C(e,u,"&#39;")},yavu:function(e){return C(e,p,function(e){return"\t"===e?"&#9;":"\n"===e?"&#10;":"\v"===e?"&#11;":"\f"===e?"&#12;":"\r"===e?"&#13;":" "===e?"&#32;":"="===e?"&#61;":"<"===e?"&lt;":">"===e?"&gt;":'"'===e?"&quot;":"'"===e?"&#39;":"`"===e?"&#96;":"�"})},yu:encodeURI,yuc:encodeURIComponent,yubl:function(e){return w[o.yup(e)]?"x-"+e:e},yufull:function(e){return o.yu(e).replace(x,function(e,t){return"//["+t+"]"})},yublf:function(e){return o.yubl(o.yufull(e))},yceu:function(e){return e=t(e),v.test(e)?e:";-x:'"+r(e.replace(y,n))+"';-v:"},yced:function(e){return r(t(e).replace(g,n))},yces:function(e){return r(t(e).replace(y,n))},yceuu:function(e){return i(e).replace(b,function(e){return"'"===e?"\\27 ":"("===e?"%28":"%29"})},yceud:function(e){return i(e)},yceus:function(e){return i(e).replace(u,"\\27 ")}}};var r=t._privFilters=t._getPrivFilters();t.inHTMLData=r.yd,t.inHTMLComment=r.yc,t.inSingleQuotedAttr=r.yavs,t.inDoubleQuotedAttr=r.yavd,t.inUnQuotedAttr=r.yavu,t.uriInSingleQuotedAttr=function(e){return n(e,r.yavs)},t.uriInDoubleQuotedAttr=function(e){return n(e,r.yavd)},t.uriInUnQuotedAttr=function(e){return n(e,r.yavu)},t.uriInHTMLData=r.yufull,t.uriInHTMLComment=function(e){return r.yc(r.yufull(e))},t.uriPathInSingleQuotedAttr=function(e){return n(e,r.yavs,r.yu)},t.uriPathInDoubleQuotedAttr=function(e){return n(e,r.yavd,r.yu)},t.uriPathInUnQuotedAttr=function(e){return n(e,r.yavu,r.yu)},t.uriPathInHTMLData=r.yu,t.uriPathInHTMLComment=function(e){return r.yc(r.yu(e))},t.uriQueryInSingleQuotedAttr=t.uriPathInSingleQuotedAttr,t.uriQueryInDoubleQuotedAttr=t.uriPathInDoubleQuotedAttr,t.uriQueryInUnQuotedAttr=t.uriPathInUnQuotedAttr,t.uriQueryInHTMLData=t.uriPathInHTMLData,t.uriQueryInHTMLComment=t.uriPathInHTMLComment,t.uriComponentInSingleQuotedAttr=function(e){return r.yavs(r.yuc(e))},t.uriComponentInDoubleQuotedAttr=function(e){return r.yavd(r.yuc(e))},t.uriComponentInUnQuotedAttr=function(e){return r.yavu(r.yuc(e))},t.uriComponentInHTMLData=r.yuc,t.uriComponentInHTMLComment=function(e){return r.yc(r.yuc(e))},t.uriFragmentInSingleQuotedAttr=function(e){return r.yubl(r.yavs(r.yuc(e)))},t.uriFragmentInDoubleQuotedAttr=function(e){return r.yubl(r.yavd(r.yuc(e)))},t.uriFragmentInUnQuotedAttr=function(e){return r.yubl(r.yavu(r.yuc(e)))},t.uriFragmentInHTMLData=t.uriComponentInHTMLData,t.uriFragmentInHTMLComment=t.uriComponentInHTMLComment},function(e,t){function n(){for(var e={},t=0;t<arguments.length;t++){var n=arguments[t];for(var i in n)r.call(n,i)&&(e[i]=n[i])}return e}e.exports=n;var r=Object.prototype.hasOwnProperty},function(e,t,n){(function(){var e,t,r,i,o,a=[].slice;o=n(61),e=n(1202),i=n(1205),t=n(1204),r=n(266),this.make_dumper=function(n,s,u,l){var c;return null==n&&(n=e.Emitter),null==s&&(s=i.Serializer),null==u&&(u=t.Representer),null==l&&(l=r.Resolver),c=[n,s,u,l],function(){function e(e,n){var r,i,o;for(null==n&&(n={}),c[0].call(this,e,n),o=c.slice(1),r=0,i=o.length;r<i;r++)t=o[r],t.call(this,n)}var t;return o.extend.apply(o,[e.prototype].concat(a.call(function(){var e,n,r;for(r=[],e=0,n=c.length;e<n;e++)t=c[e],r.push(t.prototype);return r}()))),e}()},this.Dumper=this.make_dumper()}).call(this)},function(e,t,n){(function(){var e,r,i,o,a=function(e,t){function n(){this.constructor=e}for(var r in t)s.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},s={}.hasOwnProperty,u=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};i=n(127),o=n(61),r=n(45).YAMLError,this.EmitterError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return a(t,e),t}(r),this.Emitter=function(){function n(e,t){var n;this.stream=e,this.encoding=null,this.states=[],this.state=this.expect_stream_start,this.events=[],this.event=null,this.indents=[],this.indent=null,this.flow_level=0,this.root_context=!1,this.sequence_context=!1,this.mapping_context=!1,this.simple_key_context=!1,this.line=0,this.column=0,this.whitespace=!0,this.indentation=!0,this.open_ended=!1,this.canonical=t.canonical,this.allow_unicode=t.allow_unicode,null==this.canonical&&(this.canonical=!1),null==this.allow_unicode&&(this.allow_unicode=!0),this.best_indent=1<t.indent&&t.indent<10?t.indent:2,this.best_width=t.width>2*this.indent?t.width:80,this.best_line_break="\r"===(n=t.line_break)||"\n"===n||"\r\n"===n?t.line_break:"\n",this.tag_prefixes=null,this.prepared_anchor=null,this.prepared_tag=null,this.analysis=null,this.style=null}var r,a,l;return r="\0 \t\r\n…\u2028\u2029",a={"!":"!","tag:yaml.org,2002:":"!!"},l={"\0":"0","":"a","\b":"b","\t":"t","\n":"n","\v":"v","\f":"f","\r":"r","":"e",'"':'"',"\\":"\\","…":"N"," ":"_","\u2028":"L","\u2029":"P"},n.prototype.dispose=function(){return this.states=[],this.state=null},n.prototype.emit=function(e){var t;for(this.events.push(e),t=[];!this.need_more_events();)this.event=this.events.shift(),this.state(),t.push(this.event=null);return t},n.prototype.need_more_events=function(){var e;return 0===this.events.length||(e=this.events[0],e instanceof i.DocumentStartEvent?this.need_events(1):e instanceof i.SequenceStartEvent?this.need_events(2):e instanceof i.MappingStartEvent&&this.need_events(3))},n.prototype.need_events=function(e){var t,n,r,o,a;for(o=0,a=this.events.slice(1),n=0,r=a.length;n<r;n++)if(t=a[n],t instanceof i.DocumentStartEvent||t instanceof i.CollectionStartEvent?o++:t instanceof i.DocumentEndEvent||t instanceof i.CollectionEndEvent?o--:t instanceof i.StreamEndEvent&&(o=-1),o<0)return!1;return this.events.length<e+1},n.prototype.increase_indent=function(e){return null==e&&(e={}),this.indents.push(this.indent),null==this.indent?this.indent=e.flow?this.best_indent:0:e.indentless?void 0:this.indent+=this.best_indent},n.prototype.expect_stream_start=function(){return this.event instanceof i.StreamStartEvent?(!this.event.encoding||"encoding"in this.stream||(this.encoding=this.event.encoding),this.write_stream_start(),this.state=this.expect_first_document_start):this.error("expected StreamStartEvent, but got",this.event)},n.prototype.expect_nothing=function(){return this.error("expected nothing, but got",this.event)},n.prototype.expect_first_document_start=function(){return this.expect_document_start(!0)},n.prototype.expect_document_start=function(e){var t,n,r,u,l,c,p;if(null==e&&(e=!1),this.event instanceof i.DocumentStartEvent){if((this.event.version||this.event.tags)&&this.open_ended&&(this.write_indicator("...",!0),this.write_indent()),this.event.version&&this.write_version_directive(this.prepare_version(this.event.version)),this.tag_prefixes=o.clone(a),this.event.tags)for(p=function(){var e,t;e=this.event.tags,t=[];for(u in e)s.call(e,u)&&t.push(u);return t}.call(this).sort(),r=0,l=p.length;r<l;r++)n=p[r],c=this.event.tags[n],this.tag_prefixes[c]=n,this.write_tag_directive(this.prepare_tag_handle(n),this.prepare_tag_prefix(c));return t=!e||this.event.explicit||this.canonical||this.event.version||this.event.tags||this.check_empty_document(),t&&(this.write_indent(),this.write_indicator("---",!0),this.canonical&&this.write_indent()),this.state=this.expect_document_root}return this.event instanceof i.StreamEndEvent?(this.open_ended&&(this.write_indicator("...",!0),this.write_indent()),this.write_stream_end(),this.state=this.expect_nothing):this.error("expected DocumentStartEvent, but got",this.event)},n.prototype.expect_document_end=function(){return this.event instanceof i.DocumentEndEvent?(this.write_indent(),this.event.explicit&&(this.write_indicator("...",!0),this.write_indent()),this.flush_stream(),this.state=this.expect_document_start):this.error("expected DocumentEndEvent, but got",this.event)},n.prototype.expect_document_root=function(){return this.states.push(this.expect_document_end),this.expect_node({root:!0})},n.prototype.expect_node=function(e){return null==e&&(e={}),this.root_context=!!e.root,this.sequence_context=!!e.sequence,this.mapping_context=!!e.mapping,this.simple_key_context=!!e.simple_key,this.event instanceof i.AliasEvent?this.expect_alias():this.event instanceof i.ScalarEvent||this.event instanceof i.CollectionStartEvent?(this.process_anchor("&"),this.process_tag(),this.event instanceof i.ScalarEvent?this.expect_scalar():this.event instanceof i.SequenceStartEvent?this.flow_level||this.canonical||this.event.flow_style||this.check_empty_sequence()?this.expect_flow_sequence():this.expect_block_sequence():this.event instanceof i.MappingStartEvent?this.flow_level||this.canonical||this.event.flow_style||this.check_empty_mapping()?this.expect_flow_mapping():this.expect_block_mapping():void 0):this.error("expected NodeEvent, but got",this.event)},n.prototype.expect_alias=function(){return this.event.anchor||this.error("anchor is not specified for alias"),this.process_anchor("*"),this.state=this.states.pop()},n.prototype.expect_scalar=function(){return this.increase_indent({flow:!0}),this.process_scalar(),this.indent=this.indents.pop(),this.state=this.states.pop()},n.prototype.expect_flow_sequence=function(){return this.write_indicator("[",!0,{whitespace:!0}),this.flow_level++,this.increase_indent({flow:!0}),this.state=this.expect_first_flow_sequence_item},n.prototype.expect_first_flow_sequence_item=function(){return this.event instanceof i.SequenceEndEvent?(this.indent=this.indents.pop(),this.flow_level--,this.write_indicator("]",!1),this.state=this.states.pop()):((this.canonical||this.column>this.best_width)&&this.write_indent(),this.states.push(this.expect_flow_sequence_item),this.expect_node({sequence:!0}))},n.prototype.expect_flow_sequence_item=function(){return this.event instanceof i.SequenceEndEvent?(this.indent=this.indents.pop(),this.flow_level--,this.canonical&&(this.write_indicator(",",!1),this.write_indent()),this.write_indicator("]",!1),this.state=this.states.pop()):(this.write_indicator(",",!1),(this.canonical||this.column>this.best_width)&&this.write_indent(),this.states.push(this.expect_flow_sequence_item),this.expect_node({sequence:!0}))},n.prototype.expect_flow_mapping=function(){return this.write_indicator("{",!0,{whitespace:!0}),this.flow_level++,this.increase_indent({flow:!0}),this.state=this.expect_first_flow_mapping_key},n.prototype.expect_first_flow_mapping_key=function(){return this.event instanceof i.MappingEndEvent?(this.indent=this.indents.pop(),this.flow_level--,this.write_indicator("}",!1),this.state=this.states.pop()):((this.canonical||this.column>this.best_width)&&this.write_indent(),!this.canonical&&this.check_simple_key()?(this.states.push(this.expect_flow_mapping_simple_value),this.expect_node({mapping:!0,simple_key:!0})):(this.write_indicator("?",!0),this.states.push(this.expect_flow_mapping_value),this.expect_node({mapping:!0})))},n.prototype.expect_flow_mapping_key=function(){return this.event instanceof i.MappingEndEvent?(this.indent=this.indents.pop(),this.flow_level--,this.canonical&&(this.write_indicator(",",!1),this.write_indent()),this.write_indicator("}",!1),this.state=this.states.pop()):(this.write_indicator(",",!1),(this.canonical||this.column>this.best_width)&&this.write_indent(),!this.canonical&&this.check_simple_key()?(this.states.push(this.expect_flow_mapping_simple_value),this.expect_node({mapping:!0,simple_key:!0})):(this.write_indicator("?",!0),this.states.push(this.expect_flow_mapping_value),this.expect_node({mapping:!0})))},n.prototype.expect_flow_mapping_simple_value=function(){return this.write_indicator(":",!1),this.states.push(this.expect_flow_mapping_key),this.expect_node({mapping:!0})},n.prototype.expect_flow_mapping_value=function(){return(this.canonical||this.column>this.best_width)&&this.write_indent(),this.write_indicator(":",!0),this.states.push(this.expect_flow_mapping_key),this.expect_node({mapping:!0})},n.prototype.expect_block_sequence=function(){var e;return e=this.mapping_context&&!this.indentation,this.increase_indent({indentless:e}),this.state=this.expect_first_block_sequence_item},n.prototype.expect_first_block_sequence_item=function(){return this.expect_block_sequence_item(!0)},n.prototype.expect_block_sequence_item=function(e){return null==e&&(e=!1),!e&&this.event instanceof i.SequenceEndEvent?(this.indent=this.indents.pop(),this.state=this.states.pop()):(this.write_indent(),this.write_indicator("-",!0,{indentation:!0}),this.states.push(this.expect_block_sequence_item),this.expect_node({sequence:!0}))},n.prototype.expect_block_mapping=function(){return this.increase_indent(),this.state=this.expect_first_block_mapping_key},n.prototype.expect_first_block_mapping_key=function(){return this.expect_block_mapping_key(!0)},n.prototype.expect_block_mapping_key=function(e){return null==e&&(e=!1),!e&&this.event instanceof i.MappingEndEvent?(this.indent=this.indents.pop(),this.state=this.states.pop()):(this.write_indent(),this.check_simple_key()?(this.states.push(this.expect_block_mapping_simple_value),this.expect_node({mapping:!0,simple_key:!0})):(this.write_indicator("?",!0,{indentation:!0}),this.states.push(this.expect_block_mapping_value),this.expect_node({mapping:!0})))},n.prototype.expect_block_mapping_simple_value=function(){return this.write_indicator(":",!1),this.states.push(this.expect_block_mapping_key),this.expect_node({mapping:!0})},n.prototype.expect_block_mapping_value=function(){return this.write_indent(),this.write_indicator(":",!0,{indentation:!0}),this.states.push(this.expect_block_mapping_key),this.expect_node({mapping:!0})},n.prototype.check_empty_document=function(){var e;return this.event instanceof i.DocumentStartEvent&&0!==this.events.length&&((e=this.events[0])instanceof i.ScalarEvent&&null==e.anchor&&null==e.tag&&e.implicit&&""===e.value)},n.prototype.check_empty_sequence=function(){return this.event instanceof i.SequenceStartEvent&&this.events[0]instanceof i.SequenceEndEvent},n.prototype.check_empty_mapping=function(){return this.event instanceof i.MappingStartEvent&&this.events[0]instanceof i.MappingEndEvent},n.prototype.check_simple_key=function(){var e;return e=0,this.event instanceof i.NodeEvent&&null!=this.event.anchor&&(null==this.prepared_anchor&&(this.prepared_anchor=this.prepare_anchor(this.event.anchor)),e+=this.prepared_anchor.length),null!=this.event.tag&&(this.event instanceof i.ScalarEvent||this.event instanceof i.CollectionStartEvent)&&(null==this.prepared_tag&&(this.prepared_tag=this.prepare_tag(this.event.tag)),e+=this.prepared_tag.length),this.event instanceof i.ScalarEvent&&(null==this.analysis&&(this.analysis=this.analyze_scalar(this.event.value)),e+=this.analysis.scalar.length),e<128&&(this.event instanceof i.AliasEvent||this.event instanceof i.ScalarEvent&&!this.analysis.empty&&!this.analysis.multiline||this.check_empty_sequence()||this.check_empty_mapping())},n.prototype.process_anchor=function(e){return null==this.event.anchor?void(this.prepared_anchor=null):(null==this.prepared_anchor&&(this.prepared_anchor=this.prepare_anchor(this.event.anchor)),this.prepared_anchor&&this.write_indicator(""+e+this.prepared_anchor,!0),this.prepared_anchor=null)},n.prototype.process_tag=function(){var e;if(e=this.event.tag,this.event instanceof i.ScalarEvent){if(null==this.style&&(this.style=this.choose_scalar_style()),(!this.canonical||null==e)&&(""===this.style&&this.event.implicit[0]||""!==this.style&&this.event.implicit[1]))return void(this.prepared_tag=null);this.event.implicit[0]&&null==e&&(e="!",this.prepared_tag=null)}else if((!this.canonical||null==e)&&this.event.implicit)return void(this.prepared_tag=null);return null==e&&this.error("tag is not specified"),null==this.prepared_tag&&(this.prepared_tag=this.prepare_tag(e)),this.write_indicator(this.prepared_tag,!0),this.prepared_tag=null},n.prototype.process_scalar=function(){var e;switch(null==this.analysis&&(this.analysis=this.analyze_scalar(this.event.value)),null==this.style&&(this.style=this.choose_scalar_style()),e=!this.simple_key_context,this.style){case'"':this.write_double_quoted(this.analysis.scalar,e);break;case"'":this.write_single_quoted(this.analysis.scalar,e);break;case">":this.write_folded(this.analysis.scalar);break;case"|":this.write_literal(this.analysis.scalar);break;default:this.write_plain(this.analysis.scalar,e)}return this.analysis=null,this.style=null},n.prototype.choose_scalar_style=function(){var e;return null==this.analysis&&(this.analysis=this.analyze_scalar(this.event.value)),'"'===this.event.style||this.canonical?'"':this.event.style||!this.event.implicit[0]||this.simple_key_context&&(this.analysis.empty||this.analysis.multiline)||!(this.flow_level&&this.analysis.allow_flow_plain||!this.flow_level&&this.analysis.allow_block_plain)?this.event.style&&(e=this.event.style,u.call("|>",e)>=0)&&!this.flow_level&&!this.simple_key_context&&this.analysis.allow_block?this.event.style:this.event.style&&"'"!==this.event.style||!this.analysis.allow_single_quoted||this.simple_key_context&&this.analysis.multiline?'"':"'":""},n.prototype.prepare_version=function(e){var t,n,r;return t=e[0],n=e[1],r=t+"."+n,1===t?r:this.error("unsupported YAML version",r)},n.prototype.prepare_tag_handle=function(e){var t,n,r,i;for(e||this.error("tag handle must not be empty"),"!"===e[0]&&"!"===e.slice(-1)||this.error("tag handle must start and end with '!':",e),i=e.slice(1,-1),n=0,r=i.length;n<r;n++)"0"<=(t=i[n])&&t<="9"||"A"<=t&&t<="Z"||"a"<=t&&t<="z"||u.call("-_",t)>=0||this.error("invalid character '"+t+"' in the tag handle:",e);return e},n.prototype.prepare_tag_prefix=function(e){var t,n,r,i;for(e||this.error("tag prefix must not be empty"),n=[],i=0,r=+("!"===e[0]);r<e.length;)t=e[r],"0"<=t&&t<="9"||"A"<=t&&t<="Z"||"a"<=t&&t<="z"||u.call("-;/?!:@&=+$,_.~*'()[]",t)>=0?r++:(i<r&&n.push(e.slice(i,r)),i=r+=1,n.push(t));return i<r&&n.push(e.slice(i,r)),n.join("")},n.prototype.prepare_tag=function(e){var t,n,r,i,o,a,l,c,p,f,h,d;if(e||this.error("tag must not be empty"),"!"===e)return e;for(i=null,h=e,p=function(){var e,t;e=this.tag_prefixes,t=[];for(a in e)s.call(e,a)&&t.push(a);return t}.call(this).sort(),o=0,l=p.length;o<l;o++)c=p[o],0===e.indexOf(c)&&("!"===c||c.length<e.length)&&(i=this.tag_prefixes[c],h=e.slice(c.length));for(n=[],f=r=0;r<h.length;)t=h[r],"0"<=t&&t<="9"||"A"<=t&&t<="Z"||"a"<=t&&t<="z"||u.call("-;/?!:@&=+$,_.~*'()[]",t)>=0||"!"===t&&"!"!==i?r++:(f<r&&n.push(h.slice(f,r)),f=r+=1,n.push(t));return f<r&&n.push(h.slice(f,r)),d=n.join(""),i?""+i+d:"!<"+d+">"},n.prototype.prepare_anchor=function(e){var t,n,r;for(e||this.error("anchor must not be empty"),n=0,r=e.length;n<r;n++)"0"<=(t=e[n])&&t<="9"||"A"<=t&&t<="Z"||"a"<=t&&t<="z"||u.call("-_",t)>=0||this.error("invalid character '"+t+"' in the anchor:",e);return e},n.prototype.analyze_scalar=function(t){var n,i,o,a,s,l,c,p,f,h,d,m,v,g,y,_,b,x,w,k,E,S,C,A,D;for(t||new e(t,!0,!1,!1,!0,!0,!0,!1),l=!1,f=!1,_=!1,C=!1,!1,g=!1,v=!1,D=!1,A=!1,c=!1,S=!1,0!==t.indexOf("---")&&0!==t.indexOf("...")||(l=!0,f=!0),b=!0,h=1===t.length||(k=t[1],u.call("\0 \t\r\n…\u2028\u2029",k)>=0),w=!1,x=!1,m=0,m=d=0,y=t.length;d<y;m=++d)p=t[m],0===m?u.call("#,[]{}&*!|>'\"%@`",p)>=0||"-"===p&&h?(f=!0,l=!0):u.call("?:",p)>=0&&(f=!0,h&&(l=!0)):u.call(",?[]{}",p)>=0?f=!0:":"===p?(f=!0,h&&(l=!0)):"#"===p&&b&&(f=!0,l=!0),u.call("\n…\u2028\u2029",p)>=0&&(_=!0),"\n"===p||" "<=p&&p<="~"||("\ufeff"!==p&&("…"===p||" "<=p&&p<="퟿"||""<=p&&p<="�")?(!0,this.allow_unicode||(C=!0)):C=!0)," "===p?(0===m&&(g=!0),m===t.length-1&&(D=!0),x&&(c=!0),x=!1,w=!0):u.call("\n…\u2028\u2029",p)>=0?(0===m&&(v=!0),m===t.length-1&&(A=!0),w&&(S=!0),x=!0,w=!1):(x=!1,w=!1),b=u.call(r,p)>=0,h=m+2>=t.length||(E=t[m+2],u.call(r,E)>=0);return a=!0,i=!0,s=!0,o=!0,n=!0,(g||v||D||A)&&(a=i=!1),D&&(n=!1),c&&(a=i=s=!1),(S||C)&&(a=i=s=n=!1),_&&(a=i=!1),f&&(a=!1),l&&(i=!1),new e(t,!1,_,a,i,s,o,n)},n.prototype.write_stream_start=function(){if(this.encoding&&0===this.encoding.indexOf("utf-16"))return this.stream.write("\ufeff",this.encoding)},n.prototype.write_stream_end=function(){return this.flush_stream()},n.prototype.write_indicator=function(e,t,n){var r;return null==n&&(n={}),r=this.whitespace||!t?e:" "+e,this.whitespace=!!n.whitespace,this.indentation&&(this.indentation=!!n.indentation),this.column+=r.length,this.open_ended=!1,this.stream.write(r,this.encoding)},n.prototype.write_indent=function(){var e,t,n;if(t=null!=(n=this.indent)?n:0,(!this.indentation||this.column>t||this.column===t&&!this.whitespace)&&this.write_line_break(),this.column<t)return this.whitespace=!0,e=new Array(t-this.column+1).join(" "),this.column=t,this.stream.write(e,this.encoding)},n.prototype.write_line_break=function(e){return this.whitespace=!0,this.indentation=!0,this.line+=1,this.column=0,this.stream.write(null!=e?e:this.best_line_break,this.encoding)},n.prototype.write_version_directive=function(e){return this.stream.write("%YAML "+e,this.encoding),this.write_line_break()},n.prototype.write_tag_directive=function(e,t){return this.stream.write("%TAG "+e+" "+t,this.encoding),this.write_line_break()},n.prototype.write_single_quoted=function(e,t){var n,r,i,o,a,s,l,c,p,f;for(null==t&&(t=!0),this.write_indicator("'",!0),p=!1,r=!1,f=a=0;a<=e.length;){if(i=e[a],p)null!=i&&" "===i||(f+1===a&&this.column>this.best_width&&t&&0!==f&&a!==e.length?this.write_indent():(o=e.slice(f,a),this.column+=o.length,this.stream.write(o,this.encoding)),f=a);else if(r){if(null==i||u.call("\n…\u2028\u2029",i)<0){for("\n"===e[f]&&this.write_line_break(),c=e.slice(f,a),s=0,l=c.length;s<l;s++)n=c[s],"\n"===n?this.write_line_break():this.write_line_break(n);this.write_indent(),f=a}}else(null==i||u.call(" \n…\u2028\u2029",i)>=0||"'"===i)&&f<a&&(o=e.slice(f,a),this.column+=o.length,this.stream.write(o,this.encoding),f=a);"'"===i&&(this.column+=2,this.stream.write("''",this.encoding),f=a+1),null!=i&&(p=" "===i,r=u.call("\n…\u2028\u2029",i)>=0),a++}return this.write_indicator("'",!1)},n.prototype.write_double_quoted=function(e,t){var n,r,i,a;for(null==t&&(t=!0),this.write_indicator('"',!0),a=i=0;i<=e.length;)n=e[i],(null==n||u.call('"\\…\u2028\u2029\ufeff',n)>=0||!(" "<=n&&n<="~"||this.allow_unicode&&(" "<=n&&n<="퟿"||""<=n&&n<="�")))&&(a<i&&(r=e.slice(a,i),this.column+=r.length,this.stream.write(r,this.encoding),a=i),null!=n&&(r=n in l?"\\"+l[n]:n<="ÿ"?"\\x"+o.pad_left(o.to_hex(n),"0",2):n<="￿"?"\\u"+o.pad_left(o.to_hex(n),"0",4):"\\U"+o.pad_left(o.to_hex(n),"0",16),this.column+=r.length,this.stream.write(r,this.encoding),a=i+1)),t&&0<i&&i<e.length-1&&(" "===n||a>=i)&&this.column+(i-a)>this.best_width&&(r=e.slice(a,i)+"\\",a<i&&(a=i),this.column+=r.length,this.stream.write(r,this.encoding),this.write_indent(),this.whitespace=!1,this.indentation=!1," "===e[a]&&(r="\\",this.column+=r.length,this.stream.write(r,this.encoding))),i++;return this.write_indicator('"',!1)},n.prototype.write_folded=function(e){var t,n,r,i,o,a,s,l,c,p,f,h,d;for(a=this.determine_block_hints(e),this.write_indicator(">"+a,!0),"+"===a.slice(-1)&&(this.open_ended=!0),this.write_line_break(),l=!0,n=!0,h=!1,d=o=0,f=[];o<=e.length;){if(r=e[o],n){if(null==r||u.call("\n…\u2028\u2029",r)<0){for(l||null==r||" "===r||"\n"!==e[d]||this.write_line_break(),l=" "===r,p=e.slice(d,o),s=0,c=p.length;s<c;s++)t=p[s],"\n"===t?this.write_line_break():this.write_line_break(t);null!=r&&this.write_indent(),d=o}}else h?" "!==r&&(d+1===o&&this.column>this.best_width?this.write_indent():(i=e.slice(d,o),this.column+=i.length,this.stream.write(i,this.encoding)),d=o):(null==r||u.call(" \n…\u2028\u2029",r)>=0)&&(i=e.slice(d,o),this.column+=i.length,this.stream.write(i,this.encoding),null==r&&this.write_line_break(),d=o);null!=r&&(n=u.call("\n…\u2028\u2029",r)>=0,h=" "===r),f.push(o++)}return f},n.prototype.write_literal=function(e){var t,n,r,i,o,a,s,l,c,p,f;for(a=this.determine_block_hints(e),this.write_indicator("|"+a,!0),"+"===a.slice(-1)&&(this.open_ended=!0),this.write_line_break(),n=!0,f=o=0,p=[];o<=e.length;){if(r=e[o],n){if(null==r||u.call("\n…\u2028\u2029",r)<0){for(c=e.slice(f,o),s=0,l=c.length;s<l;s++)t=c[s],"\n"===t?this.write_line_break():this.write_line_break(t);null!=r&&this.write_indent(),f=o}}else(null==r||u.call("\n…\u2028\u2029",r)>=0)&&(i=e.slice(f,o),this.stream.write(i,this.encoding),null==r&&this.write_line_break(),f=o);null!=r&&(n=u.call("\n…\u2028\u2029",r)>=0),p.push(o++)}return p},n.prototype.write_plain=function(e,t){var n,r,i,o,a,s,l,c,p,f,h;if(null==t&&(t=!0),e){for(this.root_context&&(this.open_ended=!0),this.whitespace||(o=" ",this.column+=o.length,this.stream.write(o,this.encoding)),this.whitespace=!1,this.indentation=!1,f=!1,r=!1,h=a=0,p=[];a<=e.length;){if(i=e[a],f)" "!==i&&(h+1===a&&this.column>this.best_width&&t?(this.write_indent(),this.whitespace=!1,this.indentation=!1):(o=e.slice(h,a),this.column+=o.length,this.stream.write(o,this.encoding)),h=a);else if(r){if(u.call("\n…\u2028\u2029",i)<0){for("\n"===e[h]&&this.write_line_break(),c=e.slice(h,a),s=0,l=c.length;s<l;s++)n=c[s],"\n"===n?this.write_line_break():this.write_line_break(n);this.write_indent(),this.whitespace=!1,this.indentation=!1,h=a}}else(null==i||u.call(" \n…\u2028\u2029",i)>=0)&&(o=e.slice(h,a),this.column+=o.length,this.stream.write(o,this.encoding),h=a);null!=i&&(f=" "===i,r=u.call("\n…\u2028\u2029",i)>=0),p.push(a++)}return p}},n.prototype.determine_block_hints=function(e){var t,n,r,i,o;return n="",t=e[0],r=e.length-2,o=e[r++],i=e[r++],u.call(" \n…\u2028\u2029",t)>=0&&(n+=this.best_indent),u.call("\n…\u2028\u2029",i)<0?n+="-":(1===e.length||u.call("\n…\u2028\u2029",o)>=0)&&(n+="+"),n},n.prototype.flush_stream=function(){var e;return"function"==typeof(e=this.stream).flush?e.flush():void 0},n.prototype.error=function(e,n){var r,i;throw n&&(n=null!=(r=null!=n&&null!=(i=n.constructor)?i.name:void 0)?r:o.inspect(n)),new t.EmitterError(e+(n?" "+n:""))},n}(),e=function(){function e(e,t,n,r,i,o,a,s){this.scalar=e,this.empty=t,this.multiline=n,this.allow_flow_plain=r,this.allow_block_plain=i,this.allow_single_quoted=o,this.allow_double_quoted=a,this.allow_block=s}return e}()}).call(this)},function(e,t,n){(function(){var e,t,r,i,o,a,s,u=[].slice;s=n(61),i=n(501),a=n(502),r=n(500),e=n(498),o=n(266),t=n(499),this.make_loader=function(n,l,c,p,f,h){var d;return null==n&&(n=i.Reader),null==l&&(l=a.Scanner),null==c&&(c=r.Parser),null==p&&(p=e.Composer),null==f&&(f=o.Resolver),null==h&&(h=t.Constructor),d=[n,l,c,p,f,h],function(){function e(e){var n,r,i;for(d[0].call(this,e),i=d.slice(1),n=0,r=i.length;n<r;n++)t=i[n],t.call(this)}var t;return s.extend.apply(s,[e.prototype].concat(u.call(function(){var e,n,r;for(r=[],e=0,n=d.length;e<n;e++)t=d[e],r.push(t.prototype);return r}()))),e}()},this.Loader=this.make_loader()}).call(this)},function(e,t,n){(function(){var e,r,i=function(e,t){function n(){this.constructor=e}for(var r in t)o.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},o={}.hasOwnProperty;r=n(94),e=n(45).YAMLError,this.RepresenterError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return i(t,e),t}(e),this.BaseRepresenter=function(){function e(e){var t;t=null!=e?e:{},this.default_style=t.default_style,this.default_flow_style=t.default_flow_style,this.represented_objects={},this.object_keeper=[],this.alias_key=null}return e.prototype.yaml_representers_types=[],e.prototype.yaml_representers_handlers=[],e.prototype.yaml_multi_representers_types=[],e.prototype.yaml_multi_representers_handlers=[],e.add_representer=function(e,t){return this.prototype.hasOwnProperty("yaml_representers_types")||(this.prototype.yaml_representers_types=[].concat(this.prototype.yaml_representers_types)),this.prototype.hasOwnProperty("yaml_representers_handlers")||(this.prototype.yaml_representers_handlers=[].concat(this.prototype.yaml_representers_handlers)),this.prototype.yaml_representers_types.push(e),this.prototype.yaml_representers_handlers.push(t)},e.add_multi_representer=function(e,t){return this.prototype.hasOwnProperty("yaml_multi_representers_types")||(this.prototype.yaml_multi_representers_types=[].concat(this.prototype.yaml_multi_representers_types)),this.prototype.hasOwnProperty("yaml_multi_representers_handlers")||(this.prototype.yaml_multi_representers_handlers=[].concat(this.prototype.yaml_multi_representers_handlers)),this.prototype.yaml_multi_representers_types.push(e),this.prototype.yaml_multi_representers_handlers.push(t)},e.prototype.represent=function(e){var t;return t=this.represent_data(e),this.serialize(t),this.represented_objects={},this.object_keeper=[],this.alias_key=null},e.prototype.represent_data=function(e){var t,n,i,o,a,s,u;if(this.ignore_aliases(e))this.alias_key=null;else if(-1!==(n=this.object_keeper.indexOf(e))){if(this.alias_key=n,this.alias_key in this.represented_objects)return this.represented_objects[this.alias_key]}else this.alias_key=this.object_keeper.length,this.object_keeper.push(e);if(s=null,t=null===e?"null":typeof e,"object"===t&&(t=e.constructor),-1!==(n=this.yaml_representers_types.lastIndexOf(t))&&(s=this.yaml_representers_handlers[n]),null==s)for(a=this.yaml_multi_representers_types,n=i=0,o=a.length;i<o;n=++i)if(u=a[n],e instanceof u){s=this.yaml_multi_representers_handlers[n];break}return null==s&&(-1!==(n=this.yaml_multi_representers_types.lastIndexOf(void 0))?s=this.yaml_multi_representers_handlers[n]:-1!==(n=this.yaml_representers_types.lastIndexOf(void 0))&&(s=this.yaml_representers_handlers[n])),null!=s?s.call(this,e):new r.ScalarNode(null,""+e)},e.prototype.represent_scalar=function(e,t,n){var i;return null==n&&(n=this.default_style),i=new r.ScalarNode(e,t,null,null,n),null!=this.alias_key&&(this.represented_objects[this.alias_key]=i),i},e.prototype.represent_sequence=function(e,t,n){var i,o,a,s,u,l,c,p;for(p=[],u=new r.SequenceNode(e,p,null,null,n),null!=this.alias_key&&(this.represented_objects[this.alias_key]=u),i=!0,a=0,s=t.length;a<s;a++)o=t[a],l=this.represent_data(o),l instanceof r.ScalarNode||l.style||(i=!1),p.push(l);return null==n&&(u.flow_style=null!=(c=this.default_flow_style)?c:i),u},e.prototype.represent_mapping=function(e,t,n){var i,a,s,u,l,c,p,f;f=[],u=new r.MappingNode(e,f,n),this.alias_key&&(this.represented_objects[this.alias_key]=u),i=!0;for(a in t)o.call(t,a)&&(s=t[a],l=this.represent_data(a),c=this.represent_data(s),l instanceof r.ScalarNode||l.style||(i=!1),c instanceof r.ScalarNode||c.style||(i=!1),f.push([l,c]));return n||(u.flow_style=null!=(p=this.default_flow_style)?p:i),u},e.prototype.ignore_aliases=function(e){return!1},e}(),this.Representer=function(e){function n(){return n.__super__.constructor.apply(this,arguments)}return i(n,e),n.prototype.represent_boolean=function(e){return this.represent_scalar("tag:yaml.org,2002:bool",e?"true":"false")},n.prototype.represent_null=function(e){return this.represent_scalar("tag:yaml.org,2002:null","null")},n.prototype.represent_number=function(e){var t,n;return t="tag:yaml.org,2002:"+(e%1==0?"int":"float"),n=e!==e?".nan":Infinity===e?".inf":-Infinity===e?"-.inf":e.toString(),this.represent_scalar(t,n)},n.prototype.represent_string=function(e){return this.represent_scalar("tag:yaml.org,2002:str",e)},n.prototype.represent_array=function(e){return this.represent_sequence("tag:yaml.org,2002:seq",e)},n.prototype.represent_date=function(e){return this.represent_scalar("tag:yaml.org,2002:timestamp",e.toISOString())},n.prototype.represent_object=function(e){return this.represent_mapping("tag:yaml.org,2002:map",e)},n.prototype.represent_undefined=function(e){throw new t.RepresenterError("cannot represent an onbject: "+e)},n.prototype.ignore_aliases=function(e){var t;return null==e||("boolean"==(t=typeof e)||"number"===t||"string"===t)},n}(this.BaseRepresenter),this.Representer.add_representer("boolean",this.Representer.prototype.represent_boolean),this.Representer.add_representer("null",this.Representer.prototype.represent_null),this.Representer.add_representer("number",this.Representer.prototype.represent_number),this.Representer.add_representer("string",this.Representer.prototype.represent_string),this.Representer.add_representer(Array,this.Representer.prototype.represent_array),this.Representer.add_representer(Date,this.Representer.prototype.represent_date),this.Representer.add_representer(Object,this.Representer.prototype.represent_object),this.Representer.add_representer(null,this.Representer.prototype.represent_undefined)}).call(this)},function(e,t,n){(function(){var e,t,r,i,o=function(e,t){function n(){this.constructor=e}for(var r in t)a.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},a={}.hasOwnProperty;t=n(127),r=n(94),i=n(61),e=n(45).YAMLError,this.SerializerError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return o(t,e),t}(e),this.Serializer=function(){function e(e){var t;t=null!=e?e:{},this.encoding=t.encoding,this.explicit_start=t.explicit_start,this.explicit_end=t.explicit_end,this.version=t.version,this.tags=t.tags,this.serialized_nodes={},this.anchors={},this.last_anchor_id=0,this.closed=null}return e.prototype.open=function(){if(null===this.closed)return this.emit(new t.StreamStartEvent(this.encoding)),this.closed=!1;throw this.closed?new SerializerError("serializer is closed"):new SerializerError("serializer is already open")},e.prototype.close=function(){if(null===this.closed)throw new SerializerError("serializer is not opened");if(!this.closed)return this.emit(new t.StreamEndEvent),this.closed=!0},e.prototype.serialize=function(e){if(null===this.closed)throw new SerializerError("serializer is not opened");if(this.closed)throw new SerializerError("serializer is closed");return null!=e&&(this.emit(new t.DocumentStartEvent(void 0,void 0,this.explicit_start,this.version,this.tags)),this.anchor_node(e),this.serialize_node(e),this.emit(new t.DocumentEndEvent(void 0,void 0,this.explicit_end))),this.serialized_nodes={},this.anchors={},this.last_anchor_id=0},e.prototype.anchor_node=function(e){var t,n,i,o,a,s,u,l,c,p,f,h,d,m;if(e.unique_id in this.anchors)return null!=(t=this.anchors)[l=e.unique_id]?t[l]:t[l]=this.generate_anchor(e);if(this.anchors[e.unique_id]=null,e instanceof r.SequenceNode){for(c=e.value,h=[],n=0,s=c.length;n<s;n++)i=c[n],h.push(this.anchor_node(i));return h}if(e instanceof r.MappingNode){for(p=e.value,d=[],o=0,u=p.length;o<u;o++)f=p[o],a=f[0],m=f[1],this.anchor_node(a),d.push(this.anchor_node(m));return d}},e.prototype.generate_anchor=function(e){return"id"+i.pad_left(++this.last_anchor_id,"0",4)},e.prototype.serialize_node=function(e,n,i){var o,a,s,u,l,c,p,f,h,d,m,v,g,y;if(o=this.anchors[e.unique_id],e.unique_id in this.serialized_nodes)return this.emit(new t.AliasEvent(o));if(this.serialized_nodes[e.unique_id]=!0,this.descend_resolver(n,i),e instanceof r.ScalarNode)s=this.resolve(r.ScalarNode,e.value,[!0,!1]),a=this.resolve(r.ScalarNode,e.value,[!1,!0]),l=[e.tag===s,e.tag===a],this.emit(new t.ScalarEvent(o,e.tag,l,e.value,void 0,void 0,e.style));else if(e instanceof r.SequenceNode){for(l=e.tag===this.resolve(r.SequenceNode,e.value,!0),this.emit(new t.SequenceStartEvent(o,e.tag,l,void 0,void 0,e.flow_style)),m=e.value,i=u=0,h=m.length;u<h;i=++u)c=m[i],this.serialize_node(c,e,i);this.emit(new t.SequenceEndEvent)}else if(e instanceof r.MappingNode){for(l=e.tag===this.resolve(r.MappingNode,e.value,!0),this.emit(new t.MappingStartEvent(o,e.tag,l,void 0,void 0,e.flow_style)),v=e.value,p=0,d=v.length;p<d;p++)g=v[p],f=g[0],y=g[1],this.serialize_node(f,e,null),this.serialize_node(y,e,f);this.emit(new t.MappingEndEvent)}return this.ascend_resolver()},e}()}).call(this)},function(e,t,n){(function(){var e,r,i;this.composer=n(498),this.constructor=n(499),e=this.dumper=n(1201),this.errors=n(45),this.events=n(127),r=this.loader=n(1203),this.nodes=n(94),this.parser=n(500),this.reader=n(501),this.resolver=n(266),this.scanner=n(502),this.tokens=n(267),i=n(61),this.scan=function(e,t){var n,i;for(null==t&&(t=r.Loader),n=new t(e),i=[];n.check_token();)i.push(n.get_token());return i},this.parse=function(e,t){var n,i;for(null==t&&(t=r.Loader),n=new t(e),i=[];n.check_event();)i.push(n.get_event());return i},this.compose=function(e,t){var n;return null==t&&(t=r.Loader),n=new t(e),n.get_single_node()},this.compose_all=function(e,t){var n,i;for(null==t&&(t=r.Loader),n=new t(e),i=[];n.check_node();)i.push(n.get_node());return i},this.load=function(e,t){var n;return null==t&&(t=r.Loader),n=new t(e),n.get_single_data()},this.load_all=function(e,t){var n,i;for(null==t&&(t=r.Loader),n=new t(e),i=[];n.check_data();)i.push(n.get_data());return i},this.emit=function(t,n,r,o){var a,s,u,l,c;null==r&&(r=e.Dumper),null==o&&(o={}),s=n||new i.StringStream,a=new r(s,o);try{for(l=0,c=t.length;l<c;l++)u=t[l],a.emit(u)}finally{a.dispose()}return n||s.string},this.serialize=function(n,r,i,o){return null==i&&(i=e.Dumper),null==o&&(o={}),t.serialize_all([n],r,i,o)},this.serialize_all=function(t,n,r,o){var a,s,u,l,c;null==r&&(r=e.Dumper),null==o&&(o={}),s=n||new i.StringStream,a=new r(s,o);try{for(a.open(),u=0,l=t.length;u<l;u++)c=t[u],a.serialize(c);a.close()}finally{a.dispose()}return n||s.string},this.dump=function(n,r,i,o){return null==i&&(i=e.Dumper),null==o&&(o={}),t.dump_all([n],r,i,o)},this.dump_all=function(t,n,r,o){var a,s,u,l,c;null==r&&(r=e.Dumper),null==o&&(o={}),s=n||new i.StringStream,a=new r(s,o);try{for(a.open(),l=0,c=t.length;l<c;l++)u=t[l],a.represent(u);a.close()}finally{a.dispose()}return n||s.string}}).call(this)},function(e,t,n){var r,i,o;!function(n,a){i=[],r=a(),void 0!==(o="function"==typeof r?r.apply(t,i):r)&&(e.exports=o)}(0,function(){"use strict";var e=function(e){return"getComputedStyle"in window&&"smooth"===window.getComputedStyle(e)["scroll-behavior"]};if("undefined"==typeof window||!("document"in window))return{};var t=function(t,n,r){n=n||999,r||0===r||(r=9);var i,o=function(e){i=e},a=function(){clearTimeout(i),o(0)},s=function(e){return Math.max(0,t.getTopOf(e)-r)},u=function(r,i,s){if(a(),0===i||i&&i<0||e(t.body))t.toY(r),s&&s();else{var u=t.getY(),l=Math.max(0,r)-u,c=(new Date).getTime();i=i||Math.min(Math.abs(l),n),function e(){o(setTimeout(function(){var n=Math.min(1,((new Date).getTime()-c)/i),r=Math.max(0,Math.floor(u+l*(n<.5?2*n*n:n*(4-2*n)-1)));t.toY(r),n<1&&t.getHeight()+r<t.body.scrollHeight?e():(setTimeout(a,99),s&&s())},9))}()}},l=function(e,t,n){u(s(e),t,n)},c=function(e,n,i){var o=e.getBoundingClientRect().height,a=t.getTopOf(e)+o,c=t.getHeight(),p=t.getY(),f=p+c;s(e)<p||o+r>c?l(e,n,i):a+r>f?u(a-c+r,n,i):i&&i()},p=function(e,n,r,i){u(Math.max(0,t.getTopOf(e)-t.getHeight()/2+(r||e.getBoundingClientRect().height/2)),n,i)};return{setup:function(e,t){return(0===e||e)&&(n=e),(0===t||t)&&(r=t),{defaultDuration:n,edgeOffset:r}},to:l,toY:u,intoView:c,center:p,stop:a,moving:function(){return!!i},getY:t.getY,getTopOf:t.getTopOf}},n=document.documentElement,r=function(){return window.scrollY||n.scrollTop},i=t({body:document.scrollingElement||document.body,toY:function(e){window.scrollTo(0,e)},getY:r,getHeight:function(){return window.innerHeight||n.clientHeight},getTopOf:function(e){return e.getBoundingClientRect().top+r()-n.offsetTop}});if(i.createScroller=function(e,r,i){return t({body:e,toY:function(t){e.scrollTop=t},getY:function(){return e.scrollTop},getHeight:function(){return Math.min(e.clientHeight,window.innerHeight||n.clientHeight)},getTopOf:function(e){return e.offsetTop}},r,i)},"addEventListener"in window&&!window.noZensmooth&&!e(document.body)){var o="scrollRestoration"in history;o&&(history.scrollRestoration="auto"),window.addEventListener("load",function(){o&&(setTimeout(function(){history.scrollRestoration="manual"},9),window.addEventListener("popstate",function(e){e.state&&"zenscrollY"in e.state&&i.toY(e.state.zenscrollY)},!1)),window.location.hash&&setTimeout(function(){var e=i.setup().edgeOffset;if(e){var t=document.getElementById(window.location.href.split("#")[1]);if(t){var n=Math.max(0,i.getTopOf(t)-e),r=i.getY()-n;0<=r&&r<9&&window.scrollTo(0,n)}}},9)},!1);var a=new RegExp("(^|\\s)noZensmooth(\\s|$)");window.addEventListener("click",function(e){for(var t=e.target;t&&"A"!==t.tagName;)t=t.parentNode;if(!(!t||1!==e.which||e.shiftKey||e.metaKey||e.ctrlKey||e.altKey)){if(o)try{history.replaceState({zenscrollY:i.getY()},"")}catch(e){}var n=t.getAttribute("href")||"";if(0===n.indexOf("#")&&!a.test(t.className)){var r=0,s=document.getElementById(n.substring(1));if("#"!==n){if(!s)return;r=i.getTopOf(s)}e.preventDefault();var u=function(){window.location=n},l=i.setup().edgeOffset;l&&(r=Math.max(0,r-l),u=function(){history.pushState(null,"",n)}),i.toY(r,null,u)}}},!1)}return i})},function(e,t,n){function r(e){return n(i(e))}function i(e){var t=o[e];if(!(t+1))throw new Error("Cannot find module '"+e+"'.");return t}var o={"./all.js":271,"./ast/ast.js":272,"./ast/index.js":273,"./ast/jump-to-path.jsx":274,"./auth/actions.js":168,"./auth/index.js":275,"./auth/reducers.js":276,"./auth/selectors.js":277,"./auth/spec-wrap-actions.js":278,"./configs/actions.js":169,"./configs/index.js":279,"./configs/reducers.js":280,"./configs/selectors.js":281,"./deep-linking/helpers.js":282,"./deep-linking/index.js":283,"./deep-linking/layout-wrap-actions.js":284,"./deep-linking/spec-wrap-actions.js":285,"./download-url.js":286,"./err/actions.js":128,"./err/error-transformers/hook.js":287,"./err/error-transformers/transformers/not-of-type.js":288,"./err/error-transformers/transformers/parameter-oneof.js":289,"./err/error-transformers/transformers/strip-instance.js":290,"./err/index.js":291,"./err/reducers.js":292,"./err/selectors.js":293,"./layout/actions.js":170,"./layout/index.js":294,"./layout/reducers.js":295,"./layout/selectors.js":296,"./logs/index.js":297,"./oas3/actions.js":171,"./oas3/auth-extensions/wrap-selectors.js":298,"./oas3/components/callbacks.jsx":299,"./oas3/components/http-auth.jsx":300,"./oas3/components/index.js":301,"./oas3/components/operation-link.jsx":302,"./oas3/components/operation-servers.jsx":303,"./oas3/components/request-body-editor.jsx":304,"./oas3/components/request-body.jsx":305,"./oas3/components/servers.jsx":306,"./oas3/helpers.js":34,"./oas3/index.js":307,"./oas3/reducers.js":308,"./oas3/selectors.js":309,"./oas3/spec-extensions/selectors.js":310,"./oas3/spec-extensions/wrap-selectors.js":311,"./oas3/wrap-components/auth-item.jsx":312,"./oas3/wrap-components/index.js":313,"./oas3/wrap-components/markdown.js":314,"./oas3/wrap-components/model.jsx":315,"./oas3/wrap-components/online-validator-badge.js":316,"./oas3/wrap-components/parameters.jsx":317,"./oas3/wrap-components/version-stamp.jsx":318,"./samples/fn.js":172,"./samples/index.js":319,"./spec/actions.js":173,"./spec/index.js":320,"./spec/reducers.js":321,"./spec/selectors.js":322,"./spec/wrap-actions.js":323,"./split-pane-mode/components/split-pane-mode.jsx":324,"./split-pane-mode/index.js":325,"./swagger-js/index.js":326,"./util/index.js":327,"./view/index.js":328,"./view/root-injects.js":329};r.keys=function(){return Object.keys(o)},r.resolve=i,e.exports=r,r.id=1208},function(e,t){},function(e,t){},function(e,t){},function(e,t){},function(e,t,n){n(505),e.exports=n(504)}])});
--//# sourceMappingURL=swagger-ui-bundle.js.map
-\ No newline at end of file
-diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-bundle.min.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-bundle.min.js
-new file mode 100644
-index 00000000000..453934ea536
---- /dev/null
-+++ b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-bundle.min.js
-@@ -0,0 +1,99 @@
-+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.SwaggerUIBundle=t():e.SwaggerUIBundle=t()}(this,function(){return function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,t),i.l=!0,i.exports}var n={};return t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="/dist",t(t.s=1213)}([function(e,t,n){"use strict";e.exports=n(92)},function(e,t,n){e.exports=n(996)()},function(e,t,n){"use strict";t.__esModule=!0,t.default=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}},function(e,t,n){"use strict";t.__esModule=!0;var r=n(331),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),(0,i.default)(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}()},function(e,t,n){e.exports={default:n(592),__esModule:!0}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}t.__esModule=!0;var i=n(565),o=r(i),a=n(330),s=r(a),u=n(48),l=r(u);t.default=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+(void 0===t?"undefined":(0,l.default)(t)));e.prototype=(0,s.default)(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(o.default?(0,o.default)(e,t):e.__proto__=t)}},function(e,t,n){"use strict";t.__esModule=!0;var r=n(48),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!==(void 0===t?"undefined":(0,i.default)(t))&&"function"!=typeof t?e:t}},function(e,t,n){!function(t,n){e.exports=n()}(0,function(){"use strict";function e(e,t){t&&(e.prototype=Object.create(t.prototype)),e.prototype.constructor=e}function t(e){return o(e)?e:O(e)}function n(e){return a(e)?e:M(e)}function r(e){return s(e)?e:T(e)}function i(e){return o(e)&&!u(e)?e:P(e)}function o(e){return!(!e||!e[ln])}function a(e){return!(!e||!e[cn])}function s(e){return!(!e||!e[pn])}function u(e){return a(e)||s(e)}function l(e){return!(!e||!e[fn])}function c(e){return e.value=!1,e}function p(e){e&&(e.value=!0)}function f(){}function h(e,t){t=t||0;for(var n=Math.max(0,e.length-t),r=new Array(n),i=0;i<n;i++)r[i]=e[i+t];return r}function d(e){return void 0===e.size&&(e.size=e.__iterate(v)),e.size}function m(e,t){if("number"!=typeof t){var n=t>>>0;if(""+n!==t||4294967295===n)return NaN;t=n}return t<0?d(e)+t:t}function v(){return!0}function g(e,t,n){return(0===e||void 0!==n&&e<=-n)&&(void 0===t||void 0!==n&&t>=n)}function y(e,t){return b(e,t,0)}function _(e,t){return b(e,t,t)}function b(e,t,n){return void 0===e?n:e<0?Math.max(0,t+e):void 0===t?e:Math.min(t,e)}function x(e){this.next=e}function w(e,t,n,r){var i=0===e?t:1===e?n:[t,n];return r?r.value=i:r={value:i,done:!1},r}function k(){return{value:void 0,done:!0}}function E(e){return!!A(e)}function S(e){return e&&"function"==typeof e.next}function C(e){var t=A(e);return t&&t.call(e)}function A(e){var t=e&&(wn&&e[wn]||e[kn]);if("function"==typeof t)return t}function D(e){return e&&"number"==typeof e.length}function O(e){return null===e||void 0===e?B():o(e)?e.toSeq():z(e)}function M(e){return null===e||void 0===e?B().toKeyedSeq():o(e)?a(e)?e.toSeq():e.fromEntrySeq():L(e)}function T(e){return null===e||void 0===e?B():o(e)?a(e)?e.entrySeq():e.toIndexedSeq():q(e)}function P(e){return(null===e||void 0===e?B():o(e)?a(e)?e.entrySeq():e:q(e)).toSetSeq()}function I(e){this._array=e,this.size=e.length}function R(e){var t=Object.keys(e);this._object=e,this._keys=t,this.size=t.length}function j(e){this._iterable=e,this.size=e.length||e.size}function F(e){this._iterator=e,this._iteratorCache=[]}function N(e){return!(!e||!e[Sn])}function B(){return Cn||(Cn=new I([]))}function L(e){var t=Array.isArray(e)?new I(e).fromEntrySeq():S(e)?new F(e).fromEntrySeq():E(e)?new j(e).fromEntrySeq():"object"==typeof e?new R(e):void 0;if(!t)throw new TypeError("Expected Array or iterable object of [k, v] entries, or keyed object: "+e);return t}function q(e){var t=U(e);if(!t)throw new TypeError("Expected Array or iterable object of values: "+e);return t}function z(e){var t=U(e)||"object"==typeof e&&new R(e);if(!t)throw new TypeError("Expected Array or iterable object of values, or keyed object: "+e);return t}function U(e){return D(e)?new I(e):S(e)?new F(e):E(e)?new j(e):void 0}function W(e,t,n,r){var i=e._cache;if(i){for(var o=i.length-1,a=0;a<=o;a++){var s=i[n?o-a:a];if(!1===t(s[1],r?s[0]:a,e))return a+1}return a}return e.__iterateUncached(t,n)}function V(e,t,n,r){var i=e._cache;if(i){var o=i.length-1,a=0;return new x(function(){var e=i[n?o-a:a];return a++>o?k():w(t,r?e[0]:a-1,e[1])})}return e.__iteratorUncached(t,n)}function H(e,t){return t?G(t,e,"",{"":e}):J(e)}function G(e,t,n,r){return Array.isArray(t)?e.call(r,n,T(t).map(function(n,r){return G(e,n,r,t)})):K(t)?e.call(r,n,M(t).map(function(n,r){return G(e,n,r,t)})):t}function J(e){return Array.isArray(e)?T(e).map(J).toList():K(e)?M(e).map(J).toMap():e}function K(e){return e&&(e.constructor===Object||void 0===e.constructor)}function X(e,t){if(e===t||e!==e&&t!==t)return!0;if(!e||!t)return!1;if("function"==typeof e.valueOf&&"function"==typeof t.valueOf){if(e=e.valueOf(),t=t.valueOf(),e===t||e!==e&&t!==t)return!0;if(!e||!t)return!1}return!("function"!=typeof e.equals||"function"!=typeof t.equals||!e.equals(t))}function Y(e,t){if(e===t)return!0;if(!o(t)||void 0!==e.size&&void 0!==t.size&&e.size!==t.size||void 0!==e.__hash&&void 0!==t.__hash&&e.__hash!==t.__hash||a(e)!==a(t)||s(e)!==s(t)||l(e)!==l(t))return!1;if(0===e.size&&0===t.size)return!0;var n=!u(e);if(l(e)){var r=e.entries();return t.every(function(e,t){var i=r.next().value;return i&&X(i[1],e)&&(n||X(i[0],t))})&&r.next().done}var i=!1;if(void 0===e.size)if(void 0===t.size)"function"==typeof e.cacheResult&&e.cacheResult();else{i=!0;var c=e;e=t,t=c}var p=!0,f=t.__iterate(function(t,r){if(n?!e.has(t):i?!X(t,e.get(r,vn)):!X(e.get(r,vn),t))return p=!1,!1});return p&&e.size===f}function $(e,t){if(!(this instanceof $))return new $(e,t);if(this._value=e,this.size=void 0===t?1/0:Math.max(0,t),0===this.size){if(An)return An;An=this}}function Z(e,t){if(!e)throw new Error(t)}function Q(e,t,n){if(!(this instanceof Q))return new Q(e,t,n);if(Z(0!==n,"Cannot step a Range by 0"),e=e||0,void 0===t&&(t=1/0),n=void 0===n?1:Math.abs(n),t<e&&(n=-n),this._start=e,this._end=t,this._step=n,this.size=Math.max(0,Math.ceil((t-e)/n-1)+1),0===this.size){if(Dn)return Dn;Dn=this}}function ee(){throw TypeError("Abstract")}function te(){}function ne(){}function re(){}function ie(e){return e>>>1&1073741824|3221225471&e}function oe(e){if(!1===e||null===e||void 0===e)return 0;if("function"==typeof e.valueOf&&(!1===(e=e.valueOf())||null===e||void 0===e))return 0;if(!0===e)return 1;var t=typeof e;if("number"===t){if(e!==e||e===1/0)return 0;var n=0|e;for(n!==e&&(n^=4294967295*e);e>4294967295;)e/=4294967295,n^=e;return ie(n)}if("string"===t)return e.length>Fn?ae(e):se(e);if("function"==typeof e.hashCode)return e.hashCode();if("object"===t)return ue(e);if("function"==typeof e.toString)return se(e.toString());throw new Error("Value type "+t+" cannot be hashed.")}function ae(e){var t=Ln[e];return void 0===t&&(t=se(e),Bn===Nn&&(Bn=0,Ln={}),Bn++,Ln[e]=t),t}function se(e){for(var t=0,n=0;n<e.length;n++)t=31*t+e.charCodeAt(n)|0;return ie(t)}function ue(e){var t;if(In&&void 0!==(t=On.get(e)))return t;if(void 0!==(t=e[jn]))return t;if(!Pn){if(void 0!==(t=e.propertyIsEnumerable&&e.propertyIsEnumerable[jn]))return t;if(void 0!==(t=le(e)))return t}if(t=++Rn,1073741824&Rn&&(Rn=0),In)On.set(e,t);else{if(void 0!==Tn&&!1===Tn(e))throw new Error("Non-extensible objects are not allowed as keys.");if(Pn)Object.defineProperty(e,jn,{enumerable:!1,configurable:!1,writable:!1,value:t});else if(void 0!==e.propertyIsEnumerable&&e.propertyIsEnumerable===e.constructor.prototype.propertyIsEnumerable)e.propertyIsEnumerable=function(){return this.constructor.prototype.propertyIsEnumerable.apply(this,arguments)},e.propertyIsEnumerable[jn]=t;else{if(void 0===e.nodeType)throw new Error("Unable to set a non-enumerable property on object.");e[jn]=t}}return t}function le(e){if(e&&e.nodeType>0)switch(e.nodeType){case 1:return e.uniqueID;case 9:return e.documentElement&&e.documentElement.uniqueID}}function ce(e){Z(e!==1/0,"Cannot perform this action with an infinite size.")}function pe(e){return null===e||void 0===e?we():fe(e)&&!l(e)?e:we().withMutations(function(t){var r=n(e);ce(r.size),r.forEach(function(e,n){return t.set(n,e)})})}function fe(e){return!(!e||!e[qn])}function he(e,t){this.ownerID=e,this.entries=t}function de(e,t,n){this.ownerID=e,this.bitmap=t,this.nodes=n}function me(e,t,n){this.ownerID=e,this.count=t,this.nodes=n}function ve(e,t,n){this.ownerID=e,this.keyHash=t,this.entries=n}function ge(e,t,n){this.ownerID=e,this.keyHash=t,this.entry=n}function ye(e,t,n){this._type=t,this._reverse=n,this._stack=e._root&&be(e._root)}function _e(e,t){return w(e,t[0],t[1])}function be(e,t){return{node:e,index:0,__prev:t}}function xe(e,t,n,r){var i=Object.create(zn);return i.size=e,i._root=t,i.__ownerID=n,i.__hash=r,i.__altered=!1,i}function we(){return Un||(Un=xe(0))}function ke(e,t,n){var r,i;if(e._root){var o=c(gn),a=c(yn);if(r=Ee(e._root,e.__ownerID,0,void 0,t,n,o,a),!a.value)return e;i=e.size+(o.value?n===vn?-1:1:0)}else{if(n===vn)return e;i=1,r=new he(e.__ownerID,[[t,n]])}return e.__ownerID?(e.size=i,e._root=r,e.__hash=void 0,e.__altered=!0,e):r?xe(i,r):we()}function Ee(e,t,n,r,i,o,a,s){return e?e.update(t,n,r,i,o,a,s):o===vn?e:(p(s),p(a),new ge(t,r,[i,o]))}function Se(e){return e.constructor===ge||e.constructor===ve}function Ce(e,t,n,r,i){if(e.keyHash===r)return new ve(t,r,[e.entry,i]);var o,a=(0===n?e.keyHash:e.keyHash>>>n)&mn,s=(0===n?r:r>>>n)&mn;return new de(t,1<<a|1<<s,a===s?[Ce(e,t,n+hn,r,i)]:(o=new ge(t,r,i),a<s?[e,o]:[o,e]))}function Ae(e,t,n,r){e||(e=new f);for(var i=new ge(e,oe(n),[n,r]),o=0;o<t.length;o++){var a=t[o];i=i.update(e,0,void 0,a[0],a[1])}return i}function De(e,t,n,r){for(var i=0,o=0,a=new Array(n),s=0,u=1,l=t.length;s<l;s++,u<<=1){var c=t[s];void 0!==c&&s!==r&&(i|=u,a[o++]=c)}return new de(e,i,a)}function Oe(e,t,n,r,i){for(var o=0,a=new Array(dn),s=0;0!==n;s++,n>>>=1)a[s]=1&n?t[o++]:void 0;return a[r]=i,new me(e,o+1,a)}function Me(e,t,r){for(var i=[],a=0;a<r.length;a++){var s=r[a],u=n(s);o(s)||(u=u.map(function(e){return H(e)})),i.push(u)}return Ie(e,t,i)}function Te(e,t,n){return e&&e.mergeDeep&&o(t)?e.mergeDeep(t):X(e,t)?e:t}function Pe(e){return function(t,n,r){if(t&&t.mergeDeepWith&&o(n))return t.mergeDeepWith(e,n);var i=e(t,n,r);return X(t,i)?t:i}}function Ie(e,t,n){return n=n.filter(function(e){return 0!==e.size}),0===n.length?e:0!==e.size||e.__ownerID||1!==n.length?e.withMutations(function(e){for(var r=t?function(n,r){e.update(r,vn,function(e){return e===vn?n:t(e,n,r)})}:function(t,n){e.set(n,t)},i=0;i<n.length;i++)n[i].forEach(r)}):e.constructor(n[0])}function Re(e,t,n,r){var i=e===vn,o=t.next();if(o.done){var a=i?n:e,s=r(a);return s===a?e:s}Z(i||e&&e.set,"invalid keyPath");var u=o.value,l=i?vn:e.get(u,vn),c=Re(l,t,n,r);return c===l?e:c===vn?e.remove(u):(i?we():e).set(u,c)}function je(e){return e-=e>>1&1431655765,e=(858993459&e)+(e>>2&858993459),e=e+(e>>4)&252645135,e+=e>>8,127&(e+=e>>16)}function Fe(e,t,n,r){var i=r?e:h(e);return i[t]=n,i}function Ne(e,t,n,r){var i=e.length+1;if(r&&t+1===i)return e[t]=n,e;for(var o=new Array(i),a=0,s=0;s<i;s++)s===t?(o[s]=n,a=-1):o[s]=e[s+a];return o}function Be(e,t,n){var r=e.length-1;if(n&&t===r)return e.pop(),e;for(var i=new Array(r),o=0,a=0;a<r;a++)a===t&&(o=1),i[a]=e[a+o];return i}function Le(e){var t=Ve();if(null===e||void 0===e)return t;if(qe(e))return e;var n=r(e),i=n.size;return 0===i?t:(ce(i),i>0&&i<dn?We(0,i,hn,null,new ze(n.toArray())):t.withMutations(function(e){e.setSize(i),n.forEach(function(t,n){return e.set(n,t)})}))}function qe(e){return!(!e||!e[Gn])}function ze(e,t){this.array=e,this.ownerID=t}function Ue(e,t){function n(e,t,n){return 0===t?r(e,n):i(e,t,n)}function r(e,n){var r=n===s?u&&u.array:e&&e.array,i=n>o?0:o-n,l=a-n;return l>dn&&(l=dn),function(){if(i===l)return Xn;var e=t?--l:i++;return r&&r[e]}}function i(e,r,i){var s,u=e&&e.array,l=i>o?0:o-i>>r,c=1+(a-i>>r);return c>dn&&(c=dn),function(){for(;;){if(s){var e=s();if(e!==Xn)return e;s=null}if(l===c)return Xn;var o=t?--c:l++;s=n(u&&u[o],r-hn,i+(o<<r))}}}var o=e._origin,a=e._capacity,s=$e(a),u=e._tail;return n(e._root,e._level,0)}function We(e,t,n,r,i,o,a){var s=Object.create(Jn);return s.size=t-e,s._origin=e,s._capacity=t,s._level=n,s._root=r,s._tail=i,s.__ownerID=o,s.__hash=a,s.__altered=!1,s}function Ve(){return Kn||(Kn=We(0,0,hn))}function He(e,t,n){if((t=m(e,t))!==t)return e;if(t>=e.size||t<0)return e.withMutations(function(e){t<0?Xe(e,t).set(0,n):Xe(e,0,t+1).set(t,n)});t+=e._origin;var r=e._tail,i=e._root,o=c(yn);return t>=$e(e._capacity)?r=Ge(r,e.__ownerID,0,t,n,o):i=Ge(i,e.__ownerID,e._level,t,n,o),o.value?e.__ownerID?(e._root=i,e._tail=r,e.__hash=void 0,e.__altered=!0,e):We(e._origin,e._capacity,e._level,i,r):e}function Ge(e,t,n,r,i,o){var a=r>>>n&mn,s=e&&a<e.array.length;if(!s&&void 0===i)return e;var u;if(n>0){var l=e&&e.array[a],c=Ge(l,t,n-hn,r,i,o);return c===l?e:(u=Je(e,t),u.array[a]=c,u)}return s&&e.array[a]===i?e:(p(o),u=Je(e,t),void 0===i&&a===u.array.length-1?u.array.pop():u.array[a]=i,u)}function Je(e,t){return t&&e&&t===e.ownerID?e:new ze(e?e.array.slice():[],t)}function Ke(e,t){if(t>=$e(e._capacity))return e._tail;if(t<1<<e._level+hn){for(var n=e._root,r=e._level;n&&r>0;)n=n.array[t>>>r&mn],r-=hn;return n}}function Xe(e,t,n){void 0!==t&&(t|=0),void 0!==n&&(n|=0);var r=e.__ownerID||new f,i=e._origin,o=e._capacity,a=i+t,s=void 0===n?o:n<0?o+n:i+n;if(a===i&&s===o)return e;if(a>=s)return e.clear();for(var u=e._level,l=e._root,c=0;a+c<0;)l=new ze(l&&l.array.length?[void 0,l]:[],r),u+=hn,c+=1<<u;c&&(a+=c,i+=c,s+=c,o+=c);for(var p=$e(o),h=$e(s);h>=1<<u+hn;)l=new ze(l&&l.array.length?[l]:[],r),u+=hn;var d=e._tail,m=h<p?Ke(e,s-1):h>p?new ze([],r):d;if(d&&h>p&&a<o&&d.array.length){l=Je(l,r);for(var v=l,g=u;g>hn;g-=hn){var y=p>>>g&mn;v=v.array[y]=Je(v.array[y],r)}v.array[p>>>hn&mn]=d}if(s<o&&(m=m&&m.removeAfter(r,0,s)),a>=h)a-=h,s-=h,u=hn,l=null,m=m&&m.removeBefore(r,0,a);else if(a>i||h<p){for(c=0;l;){var _=a>>>u&mn;if(_!==h>>>u&mn)break;_&&(c+=(1<<u)*_),u-=hn,l=l.array[_]}l&&a>i&&(l=l.removeBefore(r,u,a-c)),l&&h<p&&(l=l.removeAfter(r,u,h-c)),c&&(a-=c,s-=c)}return e.__ownerID?(e.size=s-a,e._origin=a,e._capacity=s,e._level=u,e._root=l,e._tail=m,e.__hash=void 0,e.__altered=!0,e):We(a,s,u,l,m)}function Ye(e,t,n){for(var i=[],a=0,s=0;s<n.length;s++){var u=n[s],l=r(u);l.size>a&&(a=l.size),o(u)||(l=l.map(function(e){return H(e)})),i.push(l)}return a>e.size&&(e=e.setSize(a)),Ie(e,t,i)}function $e(e){return e<dn?0:e-1>>>hn<<hn}function Ze(e){return null===e||void 0===e?tt():Qe(e)?e:tt().withMutations(function(t){var r=n(e);ce(r.size),r.forEach(function(e,n){return t.set(n,e)})})}function Qe(e){return fe(e)&&l(e)}function et(e,t,n,r){var i=Object.create(Ze.prototype);return i.size=e?e.size:0,i._map=e,i._list=t,i.__ownerID=n,i.__hash=r,i}function tt(){return Yn||(Yn=et(we(),Ve()))}function nt(e,t,n){var r,i,o=e._map,a=e._list,s=o.get(t),u=void 0!==s;if(n===vn){if(!u)return e;a.size>=dn&&a.size>=2*o.size?(i=a.filter(function(e,t){return void 0!==e&&s!==t}),r=i.toKeyedSeq().map(function(e){return e[0]}).flip().toMap(),e.__ownerID&&(r.__ownerID=i.__ownerID=e.__ownerID)):(r=o.remove(t),i=s===a.size-1?a.pop():a.set(s,void 0))}else if(u){if(n===a.get(s)[1])return e;r=o,i=a.set(s,[t,n])}else r=o.set(t,a.size),i=a.set(a.size,[t,n]);return e.__ownerID?(e.size=r.size,e._map=r,e._list=i,e.__hash=void 0,e):et(r,i)}function rt(e,t){this._iter=e,this._useKeys=t,this.size=e.size}function it(e){this._iter=e,this.size=e.size}function ot(e){this._iter=e,this.size=e.size}function at(e){this._iter=e,this.size=e.size}function st(e){var t=Dt(e);return t._iter=e,t.size=e.size,t.flip=function(){return e},t.reverse=function(){var t=e.reverse.apply(this);return t.flip=function(){return e.reverse()},t},t.has=function(t){return e.includes(t)},t.includes=function(t){return e.has(t)},t.cacheResult=Ot,t.__iterateUncached=function(t,n){var r=this;return e.__iterate(function(e,n){return!1!==t(n,e,r)},n)},t.__iteratorUncached=function(t,n){if(t===xn){var r=e.__iterator(t,n);return new x(function(){var e=r.next();if(!e.done){var t=e.value[0];e.value[0]=e.value[1],e.value[1]=t}return e})}return e.__iterator(t===bn?_n:bn,n)},t}function ut(e,t,n){var r=Dt(e);return r.size=e.size,r.has=function(t){return e.has(t)},r.get=function(r,i){var o=e.get(r,vn);return o===vn?i:t.call(n,o,r,e)},r.__iterateUncached=function(r,i){var o=this;return e.__iterate(function(e,i,a){return!1!==r(t.call(n,e,i,a),i,o)},i)},r.__iteratorUncached=function(r,i){var o=e.__iterator(xn,i);return new x(function(){var i=o.next();if(i.done)return i;var a=i.value,s=a[0];return w(r,s,t.call(n,a[1],s,e),i)})},r}function lt(e,t){var n=Dt(e);return n._iter=e,n.size=e.size,n.reverse=function(){return e},e.flip&&(n.flip=function(){var t=st(e);return t.reverse=function(){return e.flip()},t}),n.get=function(n,r){return e.get(t?n:-1-n,r)},n.has=function(n){return e.has(t?n:-1-n)},n.includes=function(t){return e.includes(t)},n.cacheResult=Ot,n.__iterate=function(t,n){var r=this;return e.__iterate(function(e,n){return t(e,n,r)},!n)},n.__iterator=function(t,n){return e.__iterator(t,!n)},n}function ct(e,t,n,r){var i=Dt(e);return r&&(i.has=function(r){var i=e.get(r,vn);return i!==vn&&!!t.call(n,i,r,e)},i.get=function(r,i){var o=e.get(r,vn);return o!==vn&&t.call(n,o,r,e)?o:i}),i.__iterateUncached=function(i,o){var a=this,s=0;return e.__iterate(function(e,o,u){if(t.call(n,e,o,u))return s++,i(e,r?o:s-1,a)},o),s},i.__iteratorUncached=function(i,o){var a=e.__iterator(xn,o),s=0;return new x(function(){for(;;){var o=a.next();if(o.done)return o;var u=o.value,l=u[0],c=u[1];if(t.call(n,c,l,e))return w(i,r?l:s++,c,o)}})},i}function pt(e,t,n){var r=pe().asMutable();return e.__iterate(function(i,o){r.update(t.call(n,i,o,e),0,function(e){return e+1})}),r.asImmutable()}function ft(e,t,n){var r=a(e),i=(l(e)?Ze():pe()).asMutable();e.__iterate(function(o,a){i.update(t.call(n,o,a,e),function(e){return e=e||[],e.push(r?[a,o]:o),e})});var o=At(e);return i.map(function(t){return Et(e,o(t))})}function ht(e,t,n,r){var i=e.size;if(void 0!==t&&(t|=0),void 0!==n&&(n===1/0?n=i:n|=0),g(t,n,i))return e;var o=y(t,i),a=_(n,i);if(o!==o||a!==a)return ht(e.toSeq().cacheResult(),t,n,r);var s,u=a-o;u===u&&(s=u<0?0:u);var l=Dt(e);return l.size=0===s?s:e.size&&s||void 0,!r&&N(e)&&s>=0&&(l.get=function(t,n){return t=m(this,t),t>=0&&t<s?e.get(t+o,n):n}),l.__iterateUncached=function(t,n){var i=this;if(0===s)return 0;if(n)return this.cacheResult().__iterate(t,n);var a=0,u=!0,l=0;return e.__iterate(function(e,n){if(!u||!(u=a++<o))return l++,!1!==t(e,r?n:l-1,i)&&l!==s}),l},l.__iteratorUncached=function(t,n){if(0!==s&&n)return this.cacheResult().__iterator(t,n);var i=0!==s&&e.__iterator(t,n),a=0,u=0;return new x(function(){for(;a++<o;)i.next();if(++u>s)return k();var e=i.next();return r||t===bn?e:t===_n?w(t,u-1,void 0,e):w(t,u-1,e.value[1],e)})},l}function dt(e,t,n){var r=Dt(e);return r.__iterateUncached=function(r,i){var o=this;if(i)return this.cacheResult().__iterate(r,i);var a=0;return e.__iterate(function(e,i,s){return t.call(n,e,i,s)&&++a&&r(e,i,o)}),a},r.__iteratorUncached=function(r,i){var o=this;if(i)return this.cacheResult().__iterator(r,i);var a=e.__iterator(xn,i),s=!0;return new x(function(){if(!s)return k();var e=a.next();if(e.done)return e;var i=e.value,u=i[0],l=i[1];return t.call(n,l,u,o)?r===xn?e:w(r,u,l,e):(s=!1,k())})},r}function mt(e,t,n,r){var i=Dt(e);return i.__iterateUncached=function(i,o){var a=this;if(o)return this.cacheResult().__iterate(i,o);var s=!0,u=0;return e.__iterate(function(e,o,l){if(!s||!(s=t.call(n,e,o,l)))return u++,i(e,r?o:u-1,a)}),u},i.__iteratorUncached=function(i,o){var a=this;if(o)return this.cacheResult().__iterator(i,o);var s=e.__iterator(xn,o),u=!0,l=0;return new x(function(){var e,o,c;do{if(e=s.next(),e.done)return r||i===bn?e:i===_n?w(i,l++,void 0,e):w(i,l++,e.value[1],e);var p=e.value;o=p[0],c=p[1],u&&(u=t.call(n,c,o,a))}while(u);return i===xn?e:w(i,o,c,e)})},i}function vt(e,t){var r=a(e),i=[e].concat(t).map(function(e){return o(e)?r&&(e=n(e)):e=r?L(e):q(Array.isArray(e)?e:[e]),e}).filter(function(e){return 0!==e.size});if(0===i.length)return e;if(1===i.length){var u=i[0];if(u===e||r&&a(u)||s(e)&&s(u))return u}var l=new I(i);return r?l=l.toKeyedSeq():s(e)||(l=l.toSetSeq()),l=l.flatten(!0),l.size=i.reduce(function(e,t){if(void 0!==e){var n=t.size;if(void 0!==n)return e+n}},0),l}function gt(e,t,n){var r=Dt(e);return r.__iterateUncached=function(r,i){function a(e,l){var c=this;e.__iterate(function(e,i){return(!t||l<t)&&o(e)?a(e,l+1):!1===r(e,n?i:s++,c)&&(u=!0),!u},i)}var s=0,u=!1;return a(e,0),s},r.__iteratorUncached=function(r,i){var a=e.__iterator(r,i),s=[],u=0;return new x(function(){for(;a;){var e=a.next();if(!1===e.done){var l=e.value;if(r===xn&&(l=l[1]),t&&!(s.length<t)||!o(l))return n?e:w(r,u++,l,e);s.push(a),a=l.__iterator(r,i)}else a=s.pop()}return k()})},r}function yt(e,t,n){var r=At(e);return e.toSeq().map(function(i,o){return r(t.call(n,i,o,e))}).flatten(!0)}function _t(e,t){var n=Dt(e);return n.size=e.size&&2*e.size-1,n.__iterateUncached=function(n,r){var i=this,o=0;return e.__iterate(function(e,r){return(!o||!1!==n(t,o++,i))&&!1!==n(e,o++,i)},r),o},n.__iteratorUncached=function(n,r){var i,o=e.__iterator(bn,r),a=0;return new x(function(){return(!i||a%2)&&(i=o.next(),i.done)?i:a%2?w(n,a++,t):w(n,a++,i.value,i)})},n}function bt(e,t,n){t||(t=Mt);var r=a(e),i=0,o=e.toSeq().map(function(t,r){return[r,t,i++,n?n(t,r,e):t]}).toArray();return o.sort(function(e,n){return t(e[3],n[3])||e[2]-n[2]}).forEach(r?function(e,t){o[t].length=2}:function(e,t){o[t]=e[1]}),r?M(o):s(e)?T(o):P(o)}function xt(e,t,n){if(t||(t=Mt),n){var r=e.toSeq().map(function(t,r){return[t,n(t,r,e)]}).reduce(function(e,n){return wt(t,e[1],n[1])?n:e});return r&&r[0]}return e.reduce(function(e,n){return wt(t,e,n)?n:e})}function wt(e,t,n){var r=e(n,t);return 0===r&&n!==t&&(void 0===n||null===n||n!==n)||r>0}function kt(e,n,r){var i=Dt(e);return i.size=new I(r).map(function(e){return e.size}).min(),i.__iterate=function(e,t){for(var n,r=this.__iterator(bn,t),i=0;!(n=r.next()).done&&!1!==e(n.value,i++,this););return i},i.__iteratorUncached=function(e,i){var o=r.map(function(e){return e=t(e),C(i?e.reverse():e)}),a=0,s=!1;return new x(function(){var t;return s||(t=o.map(function(e){return e.next()}),s=t.some(function(e){return e.done})),s?k():w(e,a++,n.apply(null,t.map(function(e){return e.value})))})},i}function Et(e,t){return N(e)?t:e.constructor(t)}function St(e){if(e!==Object(e))throw new TypeError("Expected [K, V] tuple: "+e)}function Ct(e){return ce(e.size),d(e)}function At(e){return a(e)?n:s(e)?r:i}function Dt(e){return Object.create((a(e)?M:s(e)?T:P).prototype)}function Ot(){return this._iter.cacheResult?(this._iter.cacheResult(),this.size=this._iter.size,this):O.prototype.cacheResult.call(this)}function Mt(e,t){return e>t?1:e<t?-1:0}function Tt(e){var n=C(e);if(!n){if(!D(e))throw new TypeError("Expected iterable or array-like: "+e);n=C(t(e))}return n}function Pt(e,t){var n,r=function(o){if(o instanceof r)return o;if(!(this instanceof r))return new r(o);if(!n){n=!0;var a=Object.keys(e);jt(i,a),i.size=a.length,i._name=t,i._keys=a,i._defaultValues=e}this._map=pe(o)},i=r.prototype=Object.create($n);return i.constructor=r,r}function It(e,t,n){var r=Object.create(Object.getPrototypeOf(e));return r._map=t,r.__ownerID=n,r}function Rt(e){return e._name||e.constructor.name||"Record"}function jt(e,t){try{t.forEach(Ft.bind(void 0,e))}catch(e){}}function Ft(e,t){Object.defineProperty(e,t,{get:function(){return this.get(t)},set:function(e){Z(this.__ownerID,"Cannot set on an immutable record."),this.set(t,e)}})}function Nt(e){return null===e||void 0===e?zt():Bt(e)&&!l(e)?e:zt().withMutations(function(t){var n=i(e);ce(n.size),n.forEach(function(e){return t.add(e)})})}function Bt(e){return!(!e||!e[Zn])}function Lt(e,t){return e.__ownerID?(e.size=t.size,e._map=t,e):t===e._map?e:0===t.size?e.__empty():e.__make(t)}function qt(e,t){var n=Object.create(Qn);return n.size=e?e.size:0,n._map=e,n.__ownerID=t,n}function zt(){return er||(er=qt(we()))}function Ut(e){return null===e||void 0===e?Ht():Wt(e)?e:Ht().withMutations(function(t){var n=i(e);ce(n.size),n.forEach(function(e){return t.add(e)})})}function Wt(e){return Bt(e)&&l(e)}function Vt(e,t){var n=Object.create(tr);return n.size=e?e.size:0,n._map=e,n.__ownerID=t,n}function Ht(){return nr||(nr=Vt(tt()))}function Gt(e){return null===e||void 0===e?Xt():Jt(e)?e:Xt().unshiftAll(e)}function Jt(e){return!(!e||!e[rr])}function Kt(e,t,n,r){var i=Object.create(ir);return i.size=e,i._head=t,i.__ownerID=n,i.__hash=r,i.__altered=!1,i}function Xt(){return or||(or=Kt(0))}function Yt(e,t){var n=function(n){e.prototype[n]=t[n]};return Object.keys(t).forEach(n),Object.getOwnPropertySymbols&&Object.getOwnPropertySymbols(t).forEach(n),e}function $t(e,t){return t}function Zt(e,t){return[t,e]}function Qt(e){return function(){return!e.apply(this,arguments)}}function en(e){return function(){return-e.apply(this,arguments)}}function tn(e){return"string"==typeof e?JSON.stringify(e):String(e)}function nn(){return h(arguments)}function rn(e,t){return e<t?1:e>t?-1:0}function on(e){if(e.size===1/0)return 0;var t=l(e),n=a(e),r=t?1:0;return an(e.__iterate(n?t?function(e,t){r=31*r+sn(oe(e),oe(t))|0}:function(e,t){r=r+sn(oe(e),oe(t))|0}:t?function(e){r=31*r+oe(e)|0}:function(e){r=r+oe(e)|0}),r)}function an(e,t){return t=Mn(t,3432918353),t=Mn(t<<15|t>>>-15,461845907),t=Mn(t<<13|t>>>-13,5),t=(t+3864292196|0)^e,t=Mn(t^t>>>16,2246822507),t=Mn(t^t>>>13,3266489909),t=ie(t^t>>>16)}function sn(e,t){return e^t+2654435769+(e<<6)+(e>>2)|0}var un=Array.prototype.slice;e(n,t),e(r,t),e(i,t),t.isIterable=o,t.isKeyed=a,t.isIndexed=s,t.isAssociative=u,t.isOrdered=l,t.Keyed=n,t.Indexed=r,t.Set=i;var ln="@@__IMMUTABLE_ITERABLE__@@",cn="@@__IMMUTABLE_KEYED__@@",pn="@@__IMMUTABLE_INDEXED__@@",fn="@@__IMMUTABLE_ORDERED__@@",hn=5,dn=1<<hn,mn=dn-1,vn={},gn={value:!1},yn={value:!1},_n=0,bn=1,xn=2,wn="function"==typeof Symbol&&Symbol.iterator,kn="@@iterator",En=wn||kn;x.prototype.toString=function(){return"[Iterator]"},x.KEYS=_n,x.VALUES=bn,x.ENTRIES=xn,x.prototype.inspect=x.prototype.toSource=function(){return this.toString()},x.prototype[En]=function(){return this},e(O,t),O.of=function(){return O(arguments)},O.prototype.toSeq=function(){return this},O.prototype.toString=function(){return this.__toString("Seq {","}")},O.prototype.cacheResult=function(){return!this._cache&&this.__iterateUncached&&(this._cache=this.entrySeq().toArray(),this.size=this._cache.length),this},O.prototype.__iterate=function(e,t){return W(this,e,t,!0)},O.prototype.__iterator=function(e,t){return V(this,e,t,!0)},e(M,O),M.prototype.toKeyedSeq=function(){return this},e(T,O),T.of=function(){return T(arguments)},T.prototype.toIndexedSeq=function(){return this},T.prototype.toString=function(){return this.__toString("Seq [","]")},T.prototype.__iterate=function(e,t){return W(this,e,t,!1)},T.prototype.__iterator=function(e,t){return V(this,e,t,!1)},e(P,O),P.of=function(){return P(arguments)},P.prototype.toSetSeq=function(){return this},O.isSeq=N,O.Keyed=M,O.Set=P,O.Indexed=T;var Sn="@@__IMMUTABLE_SEQ__@@";O.prototype[Sn]=!0,e(I,T),I.prototype.get=function(e,t){return this.has(e)?this._array[m(this,e)]:t},I.prototype.__iterate=function(e,t){for(var n=this._array,r=n.length-1,i=0;i<=r;i++)if(!1===e(n[t?r-i:i],i,this))return i+1;return i},I.prototype.__iterator=function(e,t){var n=this._array,r=n.length-1,i=0;return new x(function(){return i>r?k():w(e,i,n[t?r-i++:i++])})},e(R,M),R.prototype.get=function(e,t){return void 0===t||this.has(e)?this._object[e]:t},R.prototype.has=function(e){return this._object.hasOwnProperty(e)},R.prototype.__iterate=function(e,t){for(var n=this._object,r=this._keys,i=r.length-1,o=0;o<=i;o++){var a=r[t?i-o:o];if(!1===e(n[a],a,this))return o+1}return o},R.prototype.__iterator=function(e,t){var n=this._object,r=this._keys,i=r.length-1,o=0;return new x(function(){var a=r[t?i-o:o];return o++>i?k():w(e,a,n[a])})},R.prototype[fn]=!0,e(j,T),j.prototype.__iterateUncached=function(e,t){if(t)return this.cacheResult().__iterate(e,t);var n=this._iterable,r=C(n),i=0;if(S(r))for(var o;!(o=r.next()).done&&!1!==e(o.value,i++,this););return i},j.prototype.__iteratorUncached=function(e,t){if(t)return this.cacheResult().__iterator(e,t);var n=this._iterable,r=C(n);if(!S(r))return new x(k);var i=0;return new x(function(){var t=r.next();return t.done?t:w(e,i++,t.value)})},e(F,T),F.prototype.__iterateUncached=function(e,t){if(t)return this.cacheResult().__iterate(e,t);for(var n=this._iterator,r=this._iteratorCache,i=0;i<r.length;)if(!1===e(r[i],i++,this))return i;for(var o;!(o=n.next()).done;){var a=o.value;if(r[i]=a,!1===e(a,i++,this))break}return i},F.prototype.__iteratorUncached=function(e,t){if(t)return this.cacheResult().__iterator(e,t);var n=this._iterator,r=this._iteratorCache,i=0;return new x(function(){if(i>=r.length){var t=n.next();if(t.done)return t;r[i]=t.value}return w(e,i,r[i++])})};var Cn;e($,T),$.prototype.toString=function(){return 0===this.size?"Repeat []":"Repeat [ "+this._value+" "+this.size+" times ]"},$.prototype.get=function(e,t){return this.has(e)?this._value:t},$.prototype.includes=function(e){return X(this._value,e)},$.prototype.slice=function(e,t){var n=this.size;return g(e,t,n)?this:new $(this._value,_(t,n)-y(e,n))},$.prototype.reverse=function(){return this},$.prototype.indexOf=function(e){return X(this._value,e)?0:-1},$.prototype.lastIndexOf=function(e){return X(this._value,e)?this.size:-1},$.prototype.__iterate=function(e,t){for(var n=0;n<this.size;n++)if(!1===e(this._value,n,this))return n+1;return n},$.prototype.__iterator=function(e,t){var n=this,r=0;return new x(function(){return r<n.size?w(e,r++,n._value):k()})},$.prototype.equals=function(e){return e instanceof $?X(this._value,e._value):Y(e)};var An;e(Q,T),Q.prototype.toString=function(){return 0===this.size?"Range []":"Range [ "+this._start+"..."+this._end+(1!==this._step?" by "+this._step:"")+" ]"},Q.prototype.get=function(e,t){return this.has(e)?this._start+m(this,e)*this._step:t},Q.prototype.includes=function(e){var t=(e-this._start)/this._step;return t>=0&&t<this.size&&t===Math.floor(t)},Q.prototype.slice=function(e,t){return g(e,t,this.size)?this:(e=y(e,this.size),t=_(t,this.size),t<=e?new Q(0,0):new Q(this.get(e,this._end),this.get(t,this._end),this._step))},Q.prototype.indexOf=function(e){var t=e-this._start;if(t%this._step==0){var n=t/this._step;if(n>=0&&n<this.size)return n}return-1},Q.prototype.lastIndexOf=function(e){return this.indexOf(e)},Q.prototype.__iterate=function(e,t){for(var n=this.size-1,r=this._step,i=t?this._start+n*r:this._start,o=0;o<=n;o++){if(!1===e(i,o,this))return o+1;i+=t?-r:r}return o},Q.prototype.__iterator=function(e,t){var n=this.size-1,r=this._step,i=t?this._start+n*r:this._start,o=0;return new x(function(){var a=i;return i+=t?-r:r,o>n?k():w(e,o++,a)})},Q.prototype.equals=function(e){return e instanceof Q?this._start===e._start&&this._end===e._end&&this._step===e._step:Y(this,e)};var Dn;e(ee,t),e(te,ee),e(ne,ee),e(re,ee),ee.Keyed=te,ee.Indexed=ne,ee.Set=re;var On,Mn="function"==typeof Math.imul&&-2===Math.imul(4294967295,2)?Math.imul:function(e,t){e|=0,t|=0;var n=65535&e,r=65535&t;return n*r+((e>>>16)*r+n*(t>>>16)<<16>>>0)|0},Tn=Object.isExtensible,Pn=function(){try{return Object.defineProperty({},"@",{}),!0}catch(e){return!1}}(),In="function"==typeof WeakMap;In&&(On=new WeakMap);var Rn=0,jn="__immutablehash__";"function"==typeof Symbol&&(jn=Symbol(jn));var Fn=16,Nn=255,Bn=0,Ln={};e(pe,te),pe.of=function(){var e=un.call(arguments,0);return we().withMutations(function(t){for(var n=0;n<e.length;n+=2){if(n+1>=e.length)throw new Error("Missing value for key: "+e[n]);t.set(e[n],e[n+1])}})},pe.prototype.toString=function(){return this.__toString("Map {","}")},pe.prototype.get=function(e,t){return this._root?this._root.get(0,void 0,e,t):t},pe.prototype.set=function(e,t){return ke(this,e,t)},pe.prototype.setIn=function(e,t){return this.updateIn(e,vn,function(){return t})},pe.prototype.remove=function(e){return ke(this,e,vn)},pe.prototype.deleteIn=function(e){return this.updateIn(e,function(){return vn})},pe.prototype.update=function(e,t,n){return 1===arguments.length?e(this):this.updateIn([e],t,n)},pe.prototype.updateIn=function(e,t,n){n||(n=t,t=void 0);var r=Re(this,Tt(e),t,n);return r===vn?void 0:r},pe.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._root=null,this.__hash=void 0,this.__altered=!0,this):we()},pe.prototype.merge=function(){return Me(this,void 0,arguments)},pe.prototype.mergeWith=function(e){return Me(this,e,un.call(arguments,1))},pe.prototype.mergeIn=function(e){var t=un.call(arguments,1);return this.updateIn(e,we(),function(e){return"function"==typeof e.merge?e.merge.apply(e,t):t[t.length-1]})},pe.prototype.mergeDeep=function(){return Me(this,Te,arguments)},pe.prototype.mergeDeepWith=function(e){var t=un.call(arguments,1);return Me(this,Pe(e),t)},pe.prototype.mergeDeepIn=function(e){var t=un.call(arguments,1);return this.updateIn(e,we(),function(e){return"function"==typeof e.mergeDeep?e.mergeDeep.apply(e,t):t[t.length-1]})},pe.prototype.sort=function(e){return Ze(bt(this,e))},pe.prototype.sortBy=function(e,t){return Ze(bt(this,t,e))},pe.prototype.withMutations=function(e){var t=this.asMutable();return e(t),t.wasAltered()?t.__ensureOwner(this.__ownerID):this},pe.prototype.asMutable=function(){return this.__ownerID?this:this.__ensureOwner(new f)},pe.prototype.asImmutable=function(){return this.__ensureOwner()},pe.prototype.wasAltered=function(){return this.__altered},pe.prototype.__iterator=function(e,t){return new ye(this,e,t)},pe.prototype.__iterate=function(e,t){var n=this,r=0;return this._root&&this._root.iterate(function(t){return r++,e(t[1],t[0],n)},t),r},pe.prototype.__ensureOwner=function(e){return e===this.__ownerID?this:e?xe(this.size,this._root,e,this.__hash):(this.__ownerID=e,this.__altered=!1,this)},pe.isMap=fe;var qn="@@__IMMUTABLE_MAP__@@",zn=pe.prototype;zn[qn]=!0,zn.delete=zn.remove,zn.removeIn=zn.deleteIn,he.prototype.get=function(e,t,n,r){for(var i=this.entries,o=0,a=i.length;o<a;o++)if(X(n,i[o][0]))return i[o][1];return r},he.prototype.update=function(e,t,n,r,i,o,a){for(var s=i===vn,u=this.entries,l=0,c=u.length;l<c&&!X(r,u[l][0]);l++);var f=l<c;if(f?u[l][1]===i:s)return this;if(p(a),(s||!f)&&p(o),!s||1!==u.length){if(!f&&!s&&u.length>=Wn)return Ae(e,u,r,i);var d=e&&e===this.ownerID,m=d?u:h(u);return f?s?l===c-1?m.pop():m[l]=m.pop():m[l]=[r,i]:m.push([r,i]),d?(this.entries=m,this):new he(e,m)}},de.prototype.get=function(e,t,n,r){void 0===t&&(t=oe(n));var i=1<<((0===e?t:t>>>e)&mn),o=this.bitmap;return 0==(o&i)?r:this.nodes[je(o&i-1)].get(e+hn,t,n,r)},de.prototype.update=function(e,t,n,r,i,o,a){void 0===n&&(n=oe(r));var s=(0===t?n:n>>>t)&mn,u=1<<s,l=this.bitmap,c=0!=(l&u);if(!c&&i===vn)return this;var p=je(l&u-1),f=this.nodes,h=c?f[p]:void 0,d=Ee(h,e,t+hn,n,r,i,o,a);if(d===h)return this;if(!c&&d&&f.length>=Vn)return Oe(e,f,l,s,d);if(c&&!d&&2===f.length&&Se(f[1^p]))return f[1^p];if(c&&d&&1===f.length&&Se(d))return d;var m=e&&e===this.ownerID,v=c?d?l:l^u:l|u,g=c?d?Fe(f,p,d,m):Be(f,p,m):Ne(f,p,d,m);return m?(this.bitmap=v,this.nodes=g,this):new de(e,v,g)},me.prototype.get=function(e,t,n,r){void 0===t&&(t=oe(n));var i=(0===e?t:t>>>e)&mn,o=this.nodes[i];return o?o.get(e+hn,t,n,r):r},me.prototype.update=function(e,t,n,r,i,o,a){void 0===n&&(n=oe(r));var s=(0===t?n:n>>>t)&mn,u=i===vn,l=this.nodes,c=l[s];if(u&&!c)return this;var p=Ee(c,e,t+hn,n,r,i,o,a);if(p===c)return this;var f=this.count;if(c){if(!p&&--f<Hn)return De(e,l,f,s)}else f++;var h=e&&e===this.ownerID,d=Fe(l,s,p,h);return h?(this.count=f,this.nodes=d,this):new me(e,f,d)},ve.prototype.get=function(e,t,n,r){for(var i=this.entries,o=0,a=i.length;o<a;o++)if(X(n,i[o][0]))return i[o][1];return r},ve.prototype.update=function(e,t,n,r,i,o,a){void 0===n&&(n=oe(r));var s=i===vn;if(n!==this.keyHash)return s?this:(p(a),p(o),Ce(this,e,t,n,[r,i]));for(var u=this.entries,l=0,c=u.length;l<c&&!X(r,u[l][0]);l++);var f=l<c;if(f?u[l][1]===i:s)return this;if(p(a),(s||!f)&&p(o),s&&2===c)return new ge(e,this.keyHash,u[1^l]);var d=e&&e===this.ownerID,m=d?u:h(u);return f?s?l===c-1?m.pop():m[l]=m.pop():m[l]=[r,i]:m.push([r,i]),d?(this.entries=m,this):new ve(e,this.keyHash,m)},ge.prototype.get=function(e,t,n,r){return X(n,this.entry[0])?this.entry[1]:r},ge.prototype.update=function(e,t,n,r,i,o,a){var s=i===vn,u=X(r,this.entry[0]);return(u?i===this.entry[1]:s)?this:(p(a),s?void p(o):u?e&&e===this.ownerID?(this.entry[1]=i,this):new ge(e,this.keyHash,[r,i]):(p(o),Ce(this,e,t,oe(r),[r,i])))},he.prototype.iterate=ve.prototype.iterate=function(e,t){for(var n=this.entries,r=0,i=n.length-1;r<=i;r++)if(!1===e(n[t?i-r:r]))return!1},de.prototype.iterate=me.prototype.iterate=function(e,t){for(var n=this.nodes,r=0,i=n.length-1;r<=i;r++){var o=n[t?i-r:r];if(o&&!1===o.iterate(e,t))return!1}},ge.prototype.iterate=function(e,t){return e(this.entry)},e(ye,x),ye.prototype.next=function(){for(var e=this._type,t=this._stack;t;){var n,r=t.node,i=t.index++;if(r.entry){if(0===i)return _e(e,r.entry)}else if(r.entries){if(n=r.entries.length-1,i<=n)return _e(e,r.entries[this._reverse?n-i:i])}else if(n=r.nodes.length-1,i<=n){var o=r.nodes[this._reverse?n-i:i];if(o){if(o.entry)return _e(e,o.entry);t=this._stack=be(o,t)}continue}t=this._stack=this._stack.__prev}return k()};var Un,Wn=dn/4,Vn=dn/2,Hn=dn/4;e(Le,ne),Le.of=function(){return this(arguments)},Le.prototype.toString=function(){return this.__toString("List [","]")},Le.prototype.get=function(e,t){if((e=m(this,e))>=0&&e<this.size){e+=this._origin;var n=Ke(this,e);return n&&n.array[e&mn]}return t},Le.prototype.set=function(e,t){return He(this,e,t)},Le.prototype.remove=function(e){return this.has(e)?0===e?this.shift():e===this.size-1?this.pop():this.splice(e,1):this},Le.prototype.insert=function(e,t){return this.splice(e,0,t)},Le.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=this._origin=this._capacity=0,this._level=hn,this._root=this._tail=null,this.__hash=void 0,this.__altered=!0,this):Ve()},Le.prototype.push=function(){var e=arguments,t=this.size;return this.withMutations(function(n){Xe(n,0,t+e.length);for(var r=0;r<e.length;r++)n.set(t+r,e[r])})},Le.prototype.pop=function(){return Xe(this,0,-1)},Le.prototype.unshift=function(){var e=arguments;return this.withMutations(function(t){Xe(t,-e.length);for(var n=0;n<e.length;n++)t.set(n,e[n])})},Le.prototype.shift=function(){return Xe(this,1)},Le.prototype.merge=function(){return Ye(this,void 0,arguments)},Le.prototype.mergeWith=function(e){return Ye(this,e,un.call(arguments,1))},Le.prototype.mergeDeep=function(){return Ye(this,Te,arguments)},Le.prototype.mergeDeepWith=function(e){var t=un.call(arguments,1);return Ye(this,Pe(e),t)},Le.prototype.setSize=function(e){return Xe(this,0,e)},Le.prototype.slice=function(e,t){var n=this.size;return g(e,t,n)?this:Xe(this,y(e,n),_(t,n))},Le.prototype.__iterator=function(e,t){var n=0,r=Ue(this,t);return new x(function(){var t=r();return t===Xn?k():w(e,n++,t)})},Le.prototype.__iterate=function(e,t){for(var n,r=0,i=Ue(this,t);(n=i())!==Xn&&!1!==e(n,r++,this););return r},Le.prototype.__ensureOwner=function(e){return e===this.__ownerID?this:e?We(this._origin,this._capacity,this._level,this._root,this._tail,e,this.__hash):(this.__ownerID=e,this)},Le.isList=qe;var Gn="@@__IMMUTABLE_LIST__@@",Jn=Le.prototype;Jn[Gn]=!0,Jn.delete=Jn.remove,Jn.setIn=zn.setIn,Jn.deleteIn=Jn.removeIn=zn.removeIn,Jn.update=zn.update,Jn.updateIn=zn.updateIn,Jn.mergeIn=zn.mergeIn,Jn.mergeDeepIn=zn.mergeDeepIn,Jn.withMutations=zn.withMutations,Jn.asMutable=zn.asMutable,Jn.asImmutable=zn.asImmutable,Jn.wasAltered=zn.wasAltered,ze.prototype.removeBefore=function(e,t,n){if(n===t?1<<t:0===this.array.length)return this;var r=n>>>t&mn;if(r>=this.array.length)return new ze([],e);var i,o=0===r;if(t>0){var a=this.array[r];if((i=a&&a.removeBefore(e,t-hn,n))===a&&o)return this}if(o&&!i)return this;var s=Je(this,e);if(!o)for(var u=0;u<r;u++)s.array[u]=void 0;return i&&(s.array[r]=i),s},ze.prototype.removeAfter=function(e,t,n){if(n===(t?1<<t:0)||0===this.array.length)return this;var r=n-1>>>t&mn;if(r>=this.array.length)return this;var i;if(t>0){var o=this.array[r];if((i=o&&o.removeAfter(e,t-hn,n))===o&&r===this.array.length-1)return this}var a=Je(this,e);return a.array.splice(r+1),i&&(a.array[r]=i),a};var Kn,Xn={};e(Ze,pe),Ze.of=function(){return this(arguments)},Ze.prototype.toString=function(){return this.__toString("OrderedMap {","}")},Ze.prototype.get=function(e,t){var n=this._map.get(e);return void 0!==n?this._list.get(n)[1]:t},Ze.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._map.clear(),this._list.clear(),this):tt()},Ze.prototype.set=function(e,t){return nt(this,e,t)},Ze.prototype.remove=function(e){return nt(this,e,vn)},Ze.prototype.wasAltered=function(){return this._map.wasAltered()||this._list.wasAltered()},Ze.prototype.__iterate=function(e,t){var n=this;return this._list.__iterate(function(t){return t&&e(t[1],t[0],n)},t)},Ze.prototype.__iterator=function(e,t){return this._list.fromEntrySeq().__iterator(e,t)},Ze.prototype.__ensureOwner=function(e){if(e===this.__ownerID)return this;var t=this._map.__ensureOwner(e),n=this._list.__ensureOwner(e);return e?et(t,n,e,this.__hash):(this.__ownerID=e,this._map=t,this._list=n,this)},Ze.isOrderedMap=Qe,Ze.prototype[fn]=!0,Ze.prototype.delete=Ze.prototype.remove;var Yn;e(rt,M),rt.prototype.get=function(e,t){return this._iter.get(e,t)},rt.prototype.has=function(e){return this._iter.has(e)},rt.prototype.valueSeq=function(){return this._iter.valueSeq()},rt.prototype.reverse=function(){var e=this,t=lt(this,!0);return this._useKeys||(t.valueSeq=function(){return e._iter.toSeq().reverse()}),t},rt.prototype.map=function(e,t){var n=this,r=ut(this,e,t);return this._useKeys||(r.valueSeq=function(){return n._iter.toSeq().map(e,t)}),r},rt.prototype.__iterate=function(e,t){var n,r=this;return this._iter.__iterate(this._useKeys?function(t,n){return e(t,n,r)}:(n=t?Ct(this):0,function(i){return e(i,t?--n:n++,r)}),t)},rt.prototype.__iterator=function(e,t){if(this._useKeys)return this._iter.__iterator(e,t);var n=this._iter.__iterator(bn,t),r=t?Ct(this):0;return new x(function(){var i=n.next();return i.done?i:w(e,t?--r:r++,i.value,i)})},rt.prototype[fn]=!0,e(it,T),it.prototype.includes=function(e){return this._iter.includes(e)},it.prototype.__iterate=function(e,t){var n=this,r=0;return this._iter.__iterate(function(t){return e(t,r++,n)},t)},it.prototype.__iterator=function(e,t){var n=this._iter.__iterator(bn,t),r=0;return new x(function(){var t=n.next();return t.done?t:w(e,r++,t.value,t)})},e(ot,P),ot.prototype.has=function(e){return this._iter.includes(e)},ot.prototype.__iterate=function(e,t){var n=this;return this._iter.__iterate(function(t){return e(t,t,n)},t)},ot.prototype.__iterator=function(e,t){var n=this._iter.__iterator(bn,t);return new x(function(){var t=n.next();return t.done?t:w(e,t.value,t.value,t)})},e(at,M),at.prototype.entrySeq=function(){return this._iter.toSeq()},at.prototype.__iterate=function(e,t){var n=this;return this._iter.__iterate(function(t){if(t){St(t);var r=o(t);return e(r?t.get(1):t[1],r?t.get(0):t[0],n)}},t)},at.prototype.__iterator=function(e,t){var n=this._iter.__iterator(bn,t);return new x(function(){for(;;){var t=n.next();if(t.done)return t;var r=t.value;if(r){St(r);var i=o(r);return w(e,i?r.get(0):r[0],i?r.get(1):r[1],t)}}})},it.prototype.cacheResult=rt.prototype.cacheResult=ot.prototype.cacheResult=at.prototype.cacheResult=Ot,e(Pt,te),Pt.prototype.toString=function(){return this.__toString(Rt(this)+" {","}")},Pt.prototype.has=function(e){return this._defaultValues.hasOwnProperty(e)},Pt.prototype.get=function(e,t){if(!this.has(e))return t;var n=this._defaultValues[e];return this._map?this._map.get(e,n):n},Pt.prototype.clear=function(){if(this.__ownerID)return this._map&&this._map.clear(),this;var e=this.constructor;return e._empty||(e._empty=It(this,we()))},Pt.prototype.set=function(e,t){if(!this.has(e))throw new Error('Cannot set unknown key "'+e+'" on '+Rt(this));if(this._map&&!this._map.has(e)){if(t===this._defaultValues[e])return this}var n=this._map&&this._map.set(e,t);return this.__ownerID||n===this._map?this:It(this,n)},Pt.prototype.remove=function(e){if(!this.has(e))return this;var t=this._map&&this._map.remove(e);return this.__ownerID||t===this._map?this:It(this,t)},Pt.prototype.wasAltered=function(){return this._map.wasAltered()},Pt.prototype.__iterator=function(e,t){var r=this;return n(this._defaultValues).map(function(e,t){return r.get(t)}).__iterator(e,t)},Pt.prototype.__iterate=function(e,t){var r=this;return n(this._defaultValues).map(function(e,t){return r.get(t)}).__iterate(e,t)},Pt.prototype.__ensureOwner=function(e){if(e===this.__ownerID)return this;var t=this._map&&this._map.__ensureOwner(e);return e?It(this,t,e):(this.__ownerID=e,this._map=t,this)};var $n=Pt.prototype;$n.delete=$n.remove,$n.deleteIn=$n.removeIn=zn.removeIn,$n.merge=zn.merge,$n.mergeWith=zn.mergeWith,$n.mergeIn=zn.mergeIn,$n.mergeDeep=zn.mergeDeep,$n.mergeDeepWith=zn.mergeDeepWith,$n.mergeDeepIn=zn.mergeDeepIn,$n.setIn=zn.setIn,$n.update=zn.update,$n.updateIn=zn.updateIn,$n.withMutations=zn.withMutations,$n.asMutable=zn.asMutable,$n.asImmutable=zn.asImmutable,e(Nt,re),Nt.of=function(){return this(arguments)},Nt.fromKeys=function(e){return this(n(e).keySeq())},Nt.prototype.toString=function(){return this.__toString("Set {","}")},Nt.prototype.has=function(e){return this._map.has(e)},Nt.prototype.add=function(e){return Lt(this,this._map.set(e,!0))},Nt.prototype.remove=function(e){return Lt(this,this._map.remove(e))},Nt.prototype.clear=function(){return Lt(this,this._map.clear())},Nt.prototype.union=function(){var e=un.call(arguments,0);return e=e.filter(function(e){return 0!==e.size}),0===e.length?this:0!==this.size||this.__ownerID||1!==e.length?this.withMutations(function(t){for(var n=0;n<e.length;n++)i(e[n]).forEach(function(e){return t.add(e)})}):this.constructor(e[0])},Nt.prototype.intersect=function(){var e=un.call(arguments,0);if(0===e.length)return this;e=e.map(function(e){return i(e)});var t=this;return this.withMutations(function(n){t.forEach(function(t){e.every(function(e){return e.includes(t)})||n.remove(t)})})},Nt.prototype.subtract=function(){var e=un.call(arguments,0);if(0===e.length)return this;e=e.map(function(e){return i(e)});var t=this;return this.withMutations(function(n){t.forEach(function(t){e.some(function(e){return e.includes(t)})&&n.remove(t)})})},Nt.prototype.merge=function(){return this.union.apply(this,arguments)},Nt.prototype.mergeWith=function(e){var t=un.call(arguments,1);return this.union.apply(this,t)},Nt.prototype.sort=function(e){return Ut(bt(this,e))},Nt.prototype.sortBy=function(e,t){return Ut(bt(this,t,e))},Nt.prototype.wasAltered=function(){return this._map.wasAltered()},Nt.prototype.__iterate=function(e,t){var n=this;return this._map.__iterate(function(t,r){return e(r,r,n)},t)},Nt.prototype.__iterator=function(e,t){return this._map.map(function(e,t){return t}).__iterator(e,t)},Nt.prototype.__ensureOwner=function(e){if(e===this.__ownerID)return this;var t=this._map.__ensureOwner(e);return e?this.__make(t,e):(this.__ownerID=e,this._map=t,this)},Nt.isSet=Bt;var Zn="@@__IMMUTABLE_SET__@@",Qn=Nt.prototype;Qn[Zn]=!0,Qn.delete=Qn.remove,Qn.mergeDeep=Qn.merge,Qn.mergeDeepWith=Qn.mergeWith,Qn.withMutations=zn.withMutations,Qn.asMutable=zn.asMutable,Qn.asImmutable=zn.asImmutable,Qn.__empty=zt,Qn.__make=qt;var er;e(Ut,Nt),Ut.of=function(){return this(arguments)},Ut.fromKeys=function(e){return this(n(e).keySeq())},Ut.prototype.toString=function(){return this.__toString("OrderedSet {","}")},Ut.isOrderedSet=Wt;var tr=Ut.prototype;tr[fn]=!0,tr.__empty=Ht,tr.__make=Vt;var nr;e(Gt,ne),Gt.of=function(){return this(arguments)},Gt.prototype.toString=function(){return this.__toString("Stack [","]")},Gt.prototype.get=function(e,t){var n=this._head;for(e=m(this,e);n&&e--;)n=n.next;return n?n.value:t},Gt.prototype.peek=function(){return this._head&&this._head.value},Gt.prototype.push=function(){if(0===arguments.length)return this;for(var e=this.size+arguments.length,t=this._head,n=arguments.length-1;n>=0;n--)t={value:arguments[n],next:t};return this.__ownerID?(this.size=e,this._head=t,this.__hash=void 0,this.__altered=!0,this):Kt(e,t)},Gt.prototype.pushAll=function(e){if(e=r(e),0===e.size)return this;ce(e.size);var t=this.size,n=this._head;return e.reverse().forEach(function(e){t++,n={value:e,next:n}}),this.__ownerID?(this.size=t,this._head=n,this.__hash=void 0,this.__altered=!0,this):Kt(t,n)},Gt.prototype.pop=function(){return this.slice(1)},Gt.prototype.unshift=function(){return this.push.apply(this,arguments)},Gt.prototype.unshiftAll=function(e){return this.pushAll(e)},Gt.prototype.shift=function(){return this.pop.apply(this,arguments)},Gt.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._head=void 0,this.__hash=void 0,this.__altered=!0,this):Xt()},Gt.prototype.slice=function(e,t){if(g(e,t,this.size))return this;var n=y(e,this.size);if(_(t,this.size)!==this.size)return ne.prototype.slice.call(this,e,t);for(var r=this.size-n,i=this._head;n--;)i=i.next;return this.__ownerID?(this.size=r,this._head=i,this.__hash=void 0,this.__altered=!0,this):Kt(r,i)},Gt.prototype.__ensureOwner=function(e){return e===this.__ownerID?this:e?Kt(this.size,this._head,e,this.__hash):(this.__ownerID=e,this.__altered=!1,this)},Gt.prototype.__iterate=function(e,t){if(t)return this.reverse().__iterate(e);for(var n=0,r=this._head;r&&!1!==e(r.value,n++,this);)r=r.next;return n},Gt.prototype.__iterator=function(e,t){if(t)return this.reverse().__iterator(e);var n=0,r=this._head;return new x(function(){if(r){var t=r.value;return r=r.next,w(e,n++,t)}return k()})},Gt.isStack=Jt;var rr="@@__IMMUTABLE_STACK__@@",ir=Gt.prototype;ir[rr]=!0,ir.withMutations=zn.withMutations,ir.asMutable=zn.asMutable,ir.asImmutable=zn.asImmutable,ir.wasAltered=zn.wasAltered;var or;t.Iterator=x,Yt(t,{toArray:function(){ce(this.size);var e=new Array(this.size||0);return this.valueSeq().__iterate(function(t,n){e[n]=t}),e},toIndexedSeq:function(){return new it(this)},toJS:function(){return this.toSeq().map(function(e){return e&&"function"==typeof e.toJS?e.toJS():e}).__toJS()},toJSON:function(){return this.toSeq().map(function(e){return e&&"function"==typeof e.toJSON?e.toJSON():e}).__toJS()},toKeyedSeq:function(){return new rt(this,!0)},toMap:function(){return pe(this.toKeyedSeq())},toObject:function(){ce(this.size);var e={};return this.__iterate(function(t,n){e[n]=t}),e},toOrderedMap:function(){return Ze(this.toKeyedSeq())},toOrderedSet:function(){return Ut(a(this)?this.valueSeq():this)},toSet:function(){return Nt(a(this)?this.valueSeq():this)},toSetSeq:function(){return new ot(this)},toSeq:function(){return s(this)?this.toIndexedSeq():a(this)?this.toKeyedSeq():this.toSetSeq()},toStack:function(){return Gt(a(this)?this.valueSeq():this)},toList:function(){return Le(a(this)?this.valueSeq():this)},toString:function(){return"[Iterable]"},__toString:function(e,t){return 0===this.size?e+t:e+" "+this.toSeq().map(this.__toStringMapper).join(", ")+" "+t},concat:function(){return Et(this,vt(this,un.call(arguments,0)))},includes:function(e){return this.some(function(t){return X(t,e)})},entries:function(){return this.__iterator(xn)},every:function(e,t){ce(this.size);var n=!0;return this.__iterate(function(r,i,o){if(!e.call(t,r,i,o))return n=!1,!1}),n},filter:function(e,t){return Et(this,ct(this,e,t,!0))},find:function(e,t,n){var r=this.findEntry(e,t);return r?r[1]:n},forEach:function(e,t){return ce(this.size),this.__iterate(t?e.bind(t):e)},join:function(e){ce(this.size),e=void 0!==e?""+e:",";var t="",n=!0;return this.__iterate(function(r){n?n=!1:t+=e,t+=null!==r&&void 0!==r?r.toString():""}),t},keys:function(){return this.__iterator(_n)},map:function(e,t){return Et(this,ut(this,e,t))},reduce:function(e,t,n){ce(this.size);var r,i;return arguments.length<2?i=!0:r=t,this.__iterate(function(t,o,a){i?(i=!1,r=t):r=e.call(n,r,t,o,a)}),r},reduceRight:function(e,t,n){var r=this.toKeyedSeq().reverse();return r.reduce.apply(r,arguments)},reverse:function(){return Et(this,lt(this,!0))},slice:function(e,t){return Et(this,ht(this,e,t,!0))},some:function(e,t){return!this.every(Qt(e),t)},sort:function(e){return Et(this,bt(this,e))},values:function(){return this.__iterator(bn)},butLast:function(){return this.slice(0,-1)},isEmpty:function(){return void 0!==this.size?0===this.size:!this.some(function(){return!0})},count:function(e,t){return d(e?this.toSeq().filter(e,t):this)},countBy:function(e,t){return pt(this,e,t)},equals:function(e){return Y(this,e)},entrySeq:function(){var e=this;if(e._cache)return new I(e._cache);var t=e.toSeq().map(Zt).toIndexedSeq();return t.fromEntrySeq=function(){return e.toSeq()},t},filterNot:function(e,t){return this.filter(Qt(e),t)},findEntry:function(e,t,n){var r=n;return this.__iterate(function(n,i,o){if(e.call(t,n,i,o))return r=[i,n],!1}),r},findKey:function(e,t){var n=this.findEntry(e,t);return n&&n[0]},findLast:function(e,t,n){return this.toKeyedSeq().reverse().find(e,t,n)},findLastEntry:function(e,t,n){return this.toKeyedSeq().reverse().findEntry(e,t,n)},findLastKey:function(e,t){return this.toKeyedSeq().reverse().findKey(e,t)},first:function(){return this.find(v)},flatMap:function(e,t){return Et(this,yt(this,e,t))},flatten:function(e){return Et(this,gt(this,e,!0))},fromEntrySeq:function(){return new at(this)},get:function(e,t){return this.find(function(t,n){return X(n,e)},void 0,t)},getIn:function(e,t){for(var n,r=this,i=Tt(e);!(n=i.next()).done;){var o=n.value;if((r=r&&r.get?r.get(o,vn):vn)===vn)return t}return r},groupBy:function(e,t){return ft(this,e,t)},has:function(e){return this.get(e,vn)!==vn},hasIn:function(e){return this.getIn(e,vn)!==vn},isSubset:function(e){return e="function"==typeof e.includes?e:t(e),this.every(function(t){return e.includes(t)})},isSuperset:function(e){return e="function"==typeof e.isSubset?e:t(e),e.isSubset(this)},keyOf:function(e){return this.findKey(function(t){return X(t,e)})},keySeq:function(){return this.toSeq().map($t).toIndexedSeq()},last:function(){return this.toSeq().reverse().first()},lastKeyOf:function(e){return this.toKeyedSeq().reverse().keyOf(e)},max:function(e){return xt(this,e)},maxBy:function(e,t){return xt(this,t,e)},min:function(e){return xt(this,e?en(e):rn)},minBy:function(e,t){return xt(this,t?en(t):rn,e)},rest:function(){return this.slice(1)},skip:function(e){return this.slice(Math.max(0,e))},skipLast:function(e){return Et(this,this.toSeq().reverse().skip(e).reverse())},skipWhile:function(e,t){return Et(this,mt(this,e,t,!0))},skipUntil:function(e,t){return this.skipWhile(Qt(e),t)},sortBy:function(e,t){return Et(this,bt(this,t,e))},take:function(e){return this.slice(0,Math.max(0,e))},takeLast:function(e){return Et(this,this.toSeq().reverse().take(e).reverse())},takeWhile:function(e,t){return Et(this,dt(this,e,t))},takeUntil:function(e,t){return this.takeWhile(Qt(e),t)},valueSeq:function(){return this.toIndexedSeq()},hashCode:function(){return this.__hash||(this.__hash=on(this))}});var ar=t.prototype;ar[ln]=!0,ar[En]=ar.values,ar.__toJS=ar.toArray,ar.__toStringMapper=tn,ar.inspect=ar.toSource=function(){return this.toString()},ar.chain=ar.flatMap,ar.contains=ar.includes,Yt(n,{flip:function(){return Et(this,st(this))},mapEntries:function(e,t){var n=this,r=0;return Et(this,this.toSeq().map(function(i,o){return e.call(t,[o,i],r++,n)}).fromEntrySeq())},mapKeys:function(e,t){var n=this;return Et(this,this.toSeq().flip().map(function(r,i){return e.call(t,r,i,n)}).flip())}});var sr=n.prototype;return sr[cn]=!0,sr[En]=ar.entries,sr.__toJS=ar.toObject,sr.__toStringMapper=function(e,t){return JSON.stringify(t)+": "+tn(e)},Yt(r,{toKeyedSeq:function(){return new rt(this,!1)},filter:function(e,t){return Et(this,ct(this,e,t,!1))},findIndex:function(e,t){var n=this.findEntry(e,t);return n?n[0]:-1},indexOf:function(e){var t=this.keyOf(e);return void 0===t?-1:t},lastIndexOf:function(e){var t=this.lastKeyOf(e);return void 0===t?-1:t},reverse:function(){return Et(this,lt(this,!1))},slice:function(e,t){return Et(this,ht(this,e,t,!1))},splice:function(e,t){var n=arguments.length;if(t=Math.max(0|t,0),0===n||2===n&&!t)return this;e=y(e,e<0?this.count():this.size);var r=this.slice(0,e);return Et(this,1===n?r:r.concat(h(arguments,2),this.slice(e+t)))},findLastIndex:function(e,t){var n=this.findLastEntry(e,t);return n?n[0]:-1},first:function(){return this.get(0)},flatten:function(e){return Et(this,gt(this,e,!1))},get:function(e,t){return e=m(this,e),e<0||this.size===1/0||void 0!==this.size&&e>this.size?t:this.find(function(t,n){return n===e},void 0,t)},has:function(e){return(e=m(this,e))>=0&&(void 0!==this.size?this.size===1/0||e<this.size:-1!==this.indexOf(e))},interpose:function(e){return Et(this,_t(this,e))},interleave:function(){var e=[this].concat(h(arguments)),t=kt(this.toSeq(),T.of,e),n=t.flatten(!0);return t.size&&(n.size=t.size*e.length),Et(this,n)},keySeq:function(){return Q(0,this.size)},last:function(){return this.get(-1)},skipWhile:function(e,t){return Et(this,mt(this,e,t,!1))},zip:function(){return Et(this,kt(this,nn,[this].concat(h(arguments))))},zipWith:function(e){var t=h(arguments);return t[0]=this,Et(this,kt(this,e,t))}}),r.prototype[pn]=!0,r.prototype[fn]=!0,Yt(i,{get:function(e,t){return this.has(e)?e:t},includes:function(e){return this.has(e)},keySeq:function(){return this.valueSeq()}}),i.prototype.has=ar.includes,i.prototype.contains=i.prototype.includes,Yt(M,n.prototype),Yt(T,r.prototype),Yt(P,i.prototype),Yt(te,n.prototype),Yt(ne,r.prototype),Yt(re,i.prototype),{Iterable:t,Seq:O,Collection:ee,Map:pe,OrderedMap:Ze,List:Le,Stack:Gt,Set:Nt,OrderedSet:Ut,Record:Pt,Range:Q,Repeat:$,is:X,fromJS:H}})},function(e,t,n){"use strict";function r(e,t,n,r,o,a,s,u){if(i(t),!e){var l;if(void 0===t)l=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var c=[n,r,o,a,s,u],p=0;l=new Error(t.replace(/%s/g,function(){return c[p++]})),l.name="Invariant Violation"}throw l.framesToPop=1,l}}var i=function(e){};e.exports=r},function(e,t,n){"use strict";(function(e){function r(e){return e&&e.__esModule?e:{default:e}}function i(e){try{var t=JSON.parse(e);if(t&&"object"===(void 0===t?"undefined":(0,N.default)(t)))return t}catch(e){}return!1}function o(e){return p(e)?oe(e)?e.toObject():e:{}}function a(e){return e?e.toArray?e.toArray():l(e):[]}function s(e){return oe(e)?e:e instanceof te.default.File?e:p(e)?Array.isArray(e)?L.default.Seq(e).map(s).toList():L.default.OrderedMap(e).map(s):e}function u(e,t){var n={};return(0,j.default)(e).filter(function(t){return"function"==typeof e[t]}).forEach(function(r){return n[r]=e[r].bind(null,t)}),n}function l(e){return Array.isArray(e)?e:[e]}function c(e){return"function"==typeof e}function p(e){return!!e&&"object"===(void 0===e?"undefined":(0,N.default)(e))}function f(e){return"function"==typeof e}function h(e){return Array.isArray(e)}function d(e,t){return(0,j.default)(e).reduce(function(n,r){return n[r]=t(e[r],r),n},{})}function m(e,t){return(0,j.default)(e).reduce(function(n,r){var i=t(e[r],r);return i&&"object"===(void 0===i?"undefined":(0,N.default)(i))&&(0,I.default)(n,i),n},{})}function v(e){return function(t){t.dispatch,t.getState;return function(t){return function(n){return"function"==typeof n?n(e()):t(n)}}}}function g(e){var t=e.keySeq();return t.contains(ie)?ie:t.filter(function(e){return"2"===(e+"")[0]}).sort().first()}function y(e,t){if(!L.default.Iterable.isIterable(e))return L.default.List();var n=e.getIn(Array.isArray(t)?t:[t]);return L.default.List.isList(n)?n:L.default.List()}function _(e){var t=document;if(!e)return"";if(e.textContent.length>5e3)return e.textContent;return function(e){for(var n,r,i,o,a,s=e.textContent,u=0,l=s[0],c=1,p=e.innerHTML="",f=0;r=n,n=f<7&&"\\"==n?1:c;){if(c=l,l=s[++u],o=p.length>1,!c||f>8&&"\n"==c||[/\S/.test(c),1,1,!/[$\w]/.test(c),("/"==n||"\n"==n)&&o,'"'==n&&o,"'"==n&&o,s[u-4]+r+n=="--\x3e",r+n=="*/"][f])for(p&&(e.appendChild(a=t.createElement("span")).setAttribute("style",["color: #555; font-weight: bold;","","","color: #555;",""][f?f<3?2:f>6?4:f>3?3:+/^(a(bstract|lias|nd|rguments|rray|s(m|sert)?|uto)|b(ase|egin|ool(ean)?|reak|yte)|c(ase|atch|har|hecked|lass|lone|ompl|onst|ontinue)|de(bugger|cimal|clare|f(ault|er)?|init|l(egate|ete)?)|do|double|e(cho|ls?if|lse(if)?|nd|nsure|num|vent|x(cept|ec|p(licit|ort)|te(nds|nsion|rn)))|f(allthrough|alse|inal(ly)?|ixed|loat|or(each)?|riend|rom|unc(tion)?)|global|goto|guard|i(f|mp(lements|licit|ort)|n(it|clude(_once)?|line|out|stanceof|t(erface|ernal)?)?|s)|l(ambda|et|ock|ong)|m(icrolight|odule|utable)|NaN|n(amespace|ative|ext|ew|il|ot|ull)|o(bject|perator|r|ut|verride)|p(ackage|arams|rivate|rotected|rotocol|ublic)|r(aise|e(adonly|do|f|gister|peat|quire(_once)?|scue|strict|try|turn))|s(byte|ealed|elf|hort|igned|izeof|tatic|tring|truct|ubscript|uper|ynchronized|witch)|t(emplate|hen|his|hrows?|ransient|rue|ry|ype(alias|def|id|name|of))|u(n(checked|def(ined)?|ion|less|signed|til)|se|sing)|v(ar|irtual|oid|olatile)|w(char_t|hen|here|hile|ith)|xor|yield)$/.test(p):0]),a.appendChild(t.createTextNode(p))),i=f&&f<7?f:i,p="",f=11;![1,/[\/{}[(\-+*=<>:;|\\.,?!&@~]/.test(c),/[\])]/.test(c),/[$\w]/.test(c),"/"==c&&i<2&&"<"!=n,'"'==c,"'"==c,c+l+s[u+1]+s[u+2]=="\x3c!--",c+l=="/*",c+l=="//","#"==c][--f];);p+=c}}(e)}function b(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"key",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:L.default.Map();if(!L.default.Map.isMap(e)||!e.size)return L.default.List();if(Array.isArray(t)||(t=[t]),t.length<1)return e.merge(n);var r=L.default.List(),i=t[0],o=!0,a=!1,s=void 0;try{for(var u,l=(0,T.default)(e.entries());!(o=(u=l.next()).done);o=!0){var c=u.value,p=(0,O.default)(c,2),f=p[0],h=p[1],d=b(h,t.slice(1),n.set(i,f));r=L.default.List.isList(d)?r.concat(d):r.push(d)}}catch(e){a=!0,s=e}finally{try{!o&&l.return&&l.return()}finally{if(a)throw s}}return r}function x(e){var t=/filename="([^;]*);?"/i.exec(e);return null===t&&(t=/filename=([^;]*);?/i.exec(e)),null!==t&&t.length>1?t[1]:null}function w(e){return(0,V.default)((0,U.default)(e))}function k(e){return w(e.replace(/\.[^.\/]*$/,""))}function E(e){return"string"!=typeof e||""===e?"":(0,q.sanitizeUrl)(e)}function S(e){if(!L.default.OrderedMap.isOrderedMap(e))return null;if(!e.size)return null;var t=e.find(function(e,t){return t.startsWith("2")&&(0,j.default)(e.get("content")||{}).length>0}),n=e.get("default")||L.default.OrderedMap(),r=(n.get("content")||L.default.OrderedMap()).keySeq().toJS(),i=r.length?n:null;return t||i}Object.defineProperty(t,"__esModule",{value:!0}),t.getExtensions=t.escapeDeepLinkPath=t.createDeepLinkPath=t.shallowEqualKeys=t.buildFormData=t.sorters=t.btoa=t.parseSearch=t.getSampleSchema=t.validateParam=t.validatePattern=t.validateMinLength=t.validateMaxLength=t.validateGuid=t.validateDateTime=t.validateString=t.validateBoolean=t.validateFile=t.validateInteger=t.validateNumber=t.validateMinimum=t.validateMaximum=t.propChecker=t.memoize=t.isImmutable=void 0;var C=n(35),A=r(C),D=n(18),O=r(D),M=n(95),T=r(M),P=n(30),I=r(P),R=n(47),j=r(R),F=n(48),N=r(F);t.isJSONObject=i,t.objectify=o,t.arrayify=a,t.fromJSOrdered=s,t.bindToState=u,t.normalizeArray=l,t.isFn=c,t.isObject=p,t.isFunc=f,t.isArray=h,t.objMap=d,t.objReduce=m,t.systemThunkMiddleware=v,t.defaultStatusCode=g,t.getList=y,t.highlight=_,t.mapToList=b,t.extractFileNameFromContentDispositionHeader=x,t.pascalCase=w,t.pascalCaseFilename=k,t.sanitizeUrl=E,t.getAcceptControllingResponse=S;var B=n(7),L=r(B),q=n(506),z=n(940),U=r(z),W=n(428),V=r(W),H=n(425),G=r(H),J=n(223),K=r(J),X=n(955),Y=r(X),$=n(120),Z=r($),Q=n(172),ee=n(46),te=r(ee),ne=n(697),re=r(ne),ie="default",oe=t.isImmutable=function(e){return L.default.Iterable.isIterable(e)},ae=(t.memoize=G.default,t.propChecker=function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:[];return(0,j.default)(e).length!==(0,j.default)(t).length||((0,Y.default)(e,function(e,n){if(r.includes(n))return!1;var i=t[n];return L.default.Iterable.isIterable(e)?!L.default.is(e,i):("object"!==(void 0===e?"undefined":(0,N.default)(e))||"object"!==(void 0===i?"undefined":(0,N.default)(i)))&&e!==i})||n.some(function(n){return!(0,Z.default)(e[n],t[n])}))},t.validateMaximum=function(e,t){if(e>t)return"Value must be less than Maximum"}),se=t.validateMinimum=function(e,t){if(e<t)return"Value must be greater than Minimum"},ue=t.validateNumber=function(e){if(!/^-?\d+(\.?\d+)?$/.test(e))return"Value must be a number"},le=t.validateInteger=function(e){if(!/^-?\d+$/.test(e))return"Value must be an integer"},ce=t.validateFile=function(e){if(e&&!(e instanceof te.default.File))return"Value must be a file"},pe=t.validateBoolean=function(e){if("true"!==e&&"false"!==e&&!0!==e&&!1!==e)return"Value must be a boolean"},fe=t.validateString=function(e){if(e&&"string"!=typeof e)return"Value must be a string"},he=t.validateDateTime=function(e){if(isNaN(Date.parse(e)))return"Value must be a DateTime"},de=t.validateGuid=function(e){if(e=e.toString().toLowerCase(),!/^[{(]?[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}[)}]?$/.test(e))return"Value must be a Guid"},me=t.validateMaxLength=function(e,t){if(e.length>t)return"Value must be less than MaxLength"},ve=t.validateMinLength=function(e,t){if(e.length<t)return"Value must be greater than MinLength"},ge=t.validatePattern=function(e,t){if(!new RegExp(t).test(e))return"Value must follow pattern "+t},ye=(t.validateParam=function(e,t){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],r=[],i=t&&"body"===e.get("in")?e.get("value_xml"):e.get("value"),o=e.get("required"),a=n?e.get("schema"):e;if(!a)return r;var s=a.get("maximum"),u=a.get("minimum"),l=a.get("type"),c=a.get("format"),p=a.get("maxLength"),f=a.get("minLength"),h=a.get("pattern");if(l&&(o||i)){var d="string"===l&&i,m="array"===l&&Array.isArray(i)&&i.length,v="array"===l&&L.default.List.isList(i)&&i.count(),g="file"===l&&i instanceof te.default.File,y="boolean"===l&&(i||!1===i),_="number"===l&&(i||0===i),b="integer"===l&&(i||0===i);if(o&&!(d||m||v||g||y||_||b))return r.push("Required field is not provided"),r;if(h){var x=ge(i,h);x&&r.push(x)}if(p||0===p){var w=me(i,p);w&&r.push(w)}if(f){var k=ve(i,f);k&&r.push(k)}if(s||0===s){var E=ae(i,s);E&&r.push(E)}if(u||0===u){var S=se(i,u);S&&r.push(S)}if("string"===l){var C=void 0;if(!(C="date-time"===c?he(i):"uuid"===c?de(i):fe(i)))return r;r.push(C)}else if("boolean"===l){var A=pe(i);if(!A)return r;r.push(A)}else if("number"===l){var D=ue(i);if(!D)return r;r.push(D)}else if("integer"===l){var O=le(i);if(!O)return r;r.push(O)}else if("array"===l){var M=void 0;if(!i.count())return r;M=a.getIn(["items","type"]),i.forEach(function(e,t){var n=void 0;"number"===M?n=ue(e):"integer"===M?n=le(e):"string"===M&&(n=fe(e)),n&&r.push({index:t,error:n})})}else if("file"===l){var T=ce(i);if(!T)return r;r.push(T)}}return r},t.getSampleSchema=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};if(/xml/.test(t)){if(!e.xml||!e.xml.name){if(e.xml=e.xml||{},!e.$$ref)return e.type||e.items||e.properties||e.additionalProperties?'<?xml version="1.0" encoding="UTF-8"?>\n\x3c!-- XML example cannot be generated --\x3e':null;var r=e.$$ref.match(/\S*\/(\S+)$/);e.xml.name=r[1]}return(0,Q.memoizedCreateXMLExample)(e,n)}return(0,A.default)((0,Q.memoizedSampleFromSchema)(e,n),null,2)},t.parseSearch=function(){var e={},t=te.default.location.search;if(!t)return{};if(""!=t){var n=t.substr(1).split("&");for(var r in n)n.hasOwnProperty(r)&&(r=n[r].split("="),e[decodeURIComponent(r[0])]=decodeURIComponent(r[1]))}return e},t.btoa=function(t){var n=void 0;return n=t instanceof e?t:new e(t.toString(),"utf-8"),n.toString("base64")},t.sorters={operationsSorter:{alpha:function(e,t){return e.get("path").localeCompare(t.get("path"))},method:function(e,t){return e.get("method").localeCompare(t.get("method"))}},tagsSorter:{alpha:function(e,t){return e.localeCompare(t)}}},t.buildFormData=function(e){var t=[];for(var n in e){var r=e[n];void 0!==r&&""!==r&&t.push([n,"=",encodeURIComponent(r).replace(/%20/g,"+")].join(""))}return t.join("&")},t.shallowEqualKeys=function(e,t,n){return!!(0,K.default)(n,function(n){return(0,Z.default)(e[n],t[n])})},t.createDeepLinkPath=function(e){return"string"==typeof e||e instanceof String?e.trim().replace(/\s/g,"_"):""});t.escapeDeepLinkPath=function(e){return(0,re.default)(ye(e))},t.getExtensions=function(e){return e.filter(function(e,t){return/^x-/.test(t)})}}).call(t,n(40).Buffer)},function(e,t,n){"use strict";var r=n(32),i=r;e.exports=i},function(e,t,n){"use strict";function r(e){for(var t=arguments.length-1,n="Minified React error #"+e+"; visit http://facebook.github.io/react/docs/error-decoder.html?invariant="+e,r=0;r<t;r++)n+="&args[]="+encodeURIComponent(arguments[r+1]);n+=" for the full message or use the non-minified dev environment for full errors and additional helpful warnings.";var i=new Error(n);throw i.name="Invariant Violation",i.framesToPop=1,i}e.exports=r},function(e,t,n){"use strict";function r(e){var t=typeof e;return Array.isArray(e)?"array":e instanceof RegExp?"object":e instanceof b.Iterable?"Immutable."+e.toSource().split(" ")[0]:t}function i(e){function t(t,n,r,i,o,a){for(var s=arguments.length,u=Array(s>6?s-6:0),l=6;l<s;l++)u[l-6]=arguments[l];if(a=a||r,i=i||x,null!=n[r])return e.apply(void 0,[n,r,i,o,a].concat(u));var c=o;return t?new Error("Required "+c+" `"+a+"` was not specified in `"+i+"`."):void 0}var n=t.bind(null,!1);return n.isRequired=t.bind(null,!0),n}function o(e,t){function n(n,i,o,a,s){var u=n[i];if(!t(u)){var l=r(u);return new Error("Invalid "+a+" `"+s+"` of type `"+l+"` supplied to `"+o+"`, expected `"+e+"`.")}return null}return i(n)}function a(e,t,n){function o(i,o,a,s,u){for(var l=arguments.length,c=Array(l>5?l-5:0),p=5;p<l;p++)c[p-5]=arguments[p];var f=i[o];if(!n(f)){var h=s,d=r(f);return new Error("Invalid "+h+" `"+u+"` of type `"+d+"` supplied to `"+a+"`, expected an Immutable.js "+t+".")}if("function"!=typeof e)return new Error("Invalid typeChecker supplied to `"+a+"` for propType `"+u+"`, expected a function.");for(var m=f.toArray(),v=0,g=m.length;v<g;v++){var y=e.apply(void 0,[m,v,a,s,u+"["+v+"]"].concat(c));if(y instanceof Error)return y}}return i(o)}function s(e){function t(t,n,r,i,o){for(var a=arguments.length,s=Array(a>5?a-5:0),u=5;u<a;u++)s[u-5]=arguments[u];var l=t[n];if("function"!=typeof e)return new Error("Invalid keysTypeChecker (optional second argument) supplied to `"+r+"` for propType `"+o+"`, expected a function.");for(var c=l.keySeq().toArray(),p=0,f=c.length;p<f;p++){var h=e.apply(void 0,[c,p,r,i,o+" -> key("+c[p]+")"].concat(s));if(h instanceof Error)return h}}return i(t)}function u(e){return a(e,"List",b.List.isList)}function l(e,t,n,r){function o(){for(var i=arguments.length,o=Array(i),u=0;u<i;u++)o[u]=arguments[u];return a(e,n,r).apply(void 0,o)||t&&s(t).apply(void 0,o)}return i(o)}function c(e,t){return l(e,t,"Map",b.Map.isMap)}function p(e,t){return l(e,t,"OrderedMap",b.OrderedMap.isOrderedMap)}function f(e){return a(e,"Set",b.Set.isSet)}function h(e){return a(e,"OrderedSet",b.OrderedSet.isOrderedSet)}function d(e){return a(e,"Stack",b.Stack.isStack)}function m(e){return a(e,"Iterable",b.Iterable.isIterable)}function v(e){function t(t,n,i,o,a){for(var s=arguments.length,u=Array(s>5?s-5:0),l=5;l<s;l++)u[l-5]=arguments[l];var c=t[n];if(!(c instanceof b.Record)){var p=r(c),f=o;return new Error("Invalid "+f+" `"+a+"` of type `"+p+"` supplied to `"+i+"`, expected an Immutable.js Record.")}for(var h in e){var d=e[h];if(d){var m=c.toObject(),v=d.apply(void 0,[m,h,i,o,a+"."+h].concat(u));if(v)return v}}}return i(t)}function g(e){function t(t,i,a,s,u){for(var l=arguments.length,c=Array(l>5?l-5:0),p=5;p<l;p++)c[p-5]=arguments[p];var f=t[i];if(!o(f)){var h=r(f),d=s;return new Error("Invalid "+d+" `"+u+"` of type `"+h+"` supplied to `"+a+"`, expected an Immutable.js "+n+".")}var m=f.toObject();for(var v in e){var g=e[v];if(g){var y=g.apply(void 0,[m,v,a,s,u+"."+v].concat(c));if(y)return y}}}var n=void 0===arguments[1]?"Iterable":arguments[1],o=void 0===arguments[2]?b.Iterable.isIterable:arguments[2];return i(t)}function y(e){return g(e)}function _(e){return g(e,"Map",b.Map.isMap)}var b=n(7),x="<<anonymous>>",w={listOf:u,mapOf:c,orderedMapOf:p,setOf:f,orderedSetOf:h,stackOf:d,iterableOf:m,recordOf:v,shape:y,contains:y,mapContains:_,list:o("List",b.List.isList),map:o("Map",b.Map.isMap),orderedMap:o("OrderedMap",b.OrderedMap.isOrderedMap),set:o("Set",b.Set.isSet),orderedSet:o("OrderedSet",b.OrderedSet.isOrderedSet),stack:o("Stack",b.Stack.isStack),seq:o("Seq",b.Seq.isSeq),record:o("Record",function(e){return e instanceof b.Record}),iterable:o("Iterable",b.Iterable.isIterable)};e.exports=w},function(e,t,n){"use strict";function r(e){if(null===e||void 0===e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}/*
-+object-assign
-+(c) Sindre Sorhus
-+@license MIT
-+*/
-+var i=Object.getOwnPropertySymbols,o=Object.prototype.hasOwnProperty,a=Object.prototype.propertyIsEnumerable;e.exports=function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map(function(e){return t[e]}).join(""))return!1;var r={};return"abcdefghijklmnopqrst".split("").forEach(function(e){r[e]=e}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},r)).join("")}catch(e){return!1}}()?Object.assign:function(e,t){for(var n,s,u=r(e),l=1;l<arguments.length;l++){n=Object(arguments[l]);for(var c in n)o.call(n,c)&&(u[c]=n[c]);if(i){s=i(n);for(var p=0;p<s.length;p++)a.call(n,s[p])&&(u[s[p]]=n[s[p]])}}return u}},function(e,t,n){"use strict";function r(e,t){return 1===e.nodeType&&e.getAttribute(d)===String(t)||8===e.nodeType&&e.nodeValue===" react-text: "+t+" "||8===e.nodeType&&e.nodeValue===" react-empty: "+t+" "}function i(e){for(var t;t=e._renderedComponent;)e=t;return e}function o(e,t){var n=i(e);n._hostNode=t,t[v]=n}function a(e){var t=e._hostNode;t&&(delete t[v],e._hostNode=null)}function s(e,t){if(!(e._flags&m.hasCachedChildNodes)){var n=e._renderedChildren,a=t.firstChild;e:for(var s in n)if(n.hasOwnProperty(s)){var u=n[s],l=i(u)._domID;if(0!==l){for(;null!==a;a=a.nextSibling)if(r(a,l)){o(u,a);continue e}p("32",l)}}e._flags|=m.hasCachedChildNodes}}function u(e){if(e[v])return e[v];for(var t=[];!e[v];){if(t.push(e),!e.parentNode)return null;e=e.parentNode}for(var n,r;e&&(r=e[v]);e=t.pop())n=r,t.length&&s(r,e);return n}function l(e){var t=u(e);return null!=t&&t._hostNode===e?t:null}function c(e){if(void 0===e._hostNode&&p("33"),e._hostNode)return e._hostNode;for(var t=[];!e._hostNode;)t.push(e),e._hostParent||p("34"),e=e._hostParent;for(;t.length;e=t.pop())s(e,e._hostNode);return e._hostNode}var p=n(11),f=n(89),h=n(453),d=(n(8),f.ID_ATTRIBUTE_NAME),m=h,v="__reactInternalInstance$"+Math.random().toString(36).slice(2),g={getClosestInstanceFromNode:u,getInstanceFromNode:l,getNodeFromInstance:c,precacheChildNodes:s,precacheNode:o,uncacheNode:a};e.exports=g},function(e,t){var n=e.exports={version:"2.5.3"};"number"==typeof __e&&(__e=n)},function(e,t,n){"use strict";function r(e){var t={};return null!==e&&Object.keys(e).forEach(function(n){e[n].forEach(function(e){t[String(e)]=n})}),t}function i(e,t){if(t=t||{},Object.keys(t).forEach(function(t){if(-1===a.indexOf(t))throw new o('Unknown option "'+t+'" is met in definition of "'+e+'" YAML type.')}),this.tag=e,this.kind=t.kind||null,this.resolve=t.resolve||function(){return!0},this.construct=t.construct||function(e){return e},this.instanceOf=t.instanceOf||null,this.predicate=t.predicate||null,this.represent=t.represent||null,this.defaultStyle=t.defaultStyle||null,this.styleAliases=r(t.styleAliases||null),-1===s.indexOf(this.kind))throw new o('Unknown kind "'+this.kind+'" is specified for "'+e+'" YAML type.')}var o=n(117),a=["kind","resolve","construct","instanceOf","predicate","represent","defaultStyle","styleAliases"],s=["scalar","sequence","mapping"];e.exports=i},function(e,t){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(e){"object"==typeof window&&(n=window)}e.exports=n},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}t.__esModule=!0;var i=n(564),o=r(i),a=n(95),s=r(a);t.default=function(){function e(e,t){var n=[],r=!0,i=!1,o=void 0;try{for(var a,u=(0,s.default)(e);!(r=(a=u.next()).done)&&(n.push(a.value),!t||n.length!==t);r=!0);}catch(e){i=!0,o=e}finally{try{!r&&u.return&&u.return()}finally{if(i)throw o}}return n}return function(t,n){if(Array.isArray(t))return t;if((0,o.default)(Object(t)))return e(t,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}()},function(e,t,n){var r=n(361)("wks"),i=n(202),o=n(31).Symbol,a="function"==typeof o;(e.exports=function(e){return r[e]||(r[e]=a&&o[e]||(a?o:i)("Symbol."+e))}).store=r},function(e,t){var n=Array.isArray;e.exports=n},function(e,t,n){"use strict";t.__esModule=!0;var r=n(30),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=i.default||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}},function(e,t,n){var r=n(188)("wks"),i=n(134),o=n(24).Symbol,a="function"==typeof o;(e.exports=function(e){return r[e]||(r[e]=a&&o[e]||(a?o:i)("Symbol."+e))}).store=r},function(e,t,n){var r=n(24),i=n(15),o=n(53),a=n(56),s=function(e,t,n){var u,l,c,p=e&s.F,f=e&s.G,h=e&s.S,d=e&s.P,m=e&s.B,v=e&s.W,g=f?i:i[t]||(i[t]={}),y=g.prototype,_=f?r:h?r[t]:(r[t]||{}).prototype;f&&(n=t);for(u in n)(l=!p&&_&&void 0!==_[u])&&u in g||(c=l?_[u]:n[u],g[u]=f&&"function"!=typeof _[u]?n[u]:m&&l?o(c,r):v&&_[u]==c?function(e){var t=function(t,n,r){if(this instanceof e){switch(arguments.length){case 0:return new e;case 1:return new e(t);case 2:return new e(t,n)}return new e(t,n,r)}return e.apply(this,arguments)};return t.prototype=e.prototype,t}(c):d&&"function"==typeof c?o(Function.call,c):c,d&&((g.virtual||(g.virtual={}))[u]=c,e&s.R&&y&&!y[u]&&a(y,u,c)))};s.F=1,s.G=2,s.S=4,s.P=8,s.B=16,s.W=32,s.U=64,s.R=128,e.exports=s},function(e,t){var n=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(e,t,n){"use strict";var r=!("undefined"==typeof window||!window.document||!window.document.createElement),i={canUseDOM:r,canUseWorkers:"undefined"!=typeof Worker,canUseEventListeners:r&&!(!window.addEventListener&&!window.attachEvent),canUseViewport:r&&!!window.screen,isInWorker:!r};e.exports=i},function(e,t,n){"use strict";function r(e){return Object.prototype.toString.call(e)}function i(e){return"[object String]"===r(e)}function o(e,t){return!!e&&d.call(e,t)}function a(e){return[].slice.call(arguments,1).forEach(function(t){if(t){if("object"!=typeof t)throw new TypeError(t+"must be object");Object.keys(t).forEach(function(n){e[n]=t[n]})}}),e}function s(e){return e.indexOf("\\")<0?e:e.replace(m,"$1")}function u(e){return!(e>=55296&&e<=57343)&&(!(e>=64976&&e<=65007)&&(65535!=(65535&e)&&65534!=(65535&e)&&(!(e>=0&&e<=8)&&(11!==e&&(!(e>=14&&e<=31)&&(!(e>=127&&e<=159)&&!(e>1114111)))))))}function l(e){if(e>65535){e-=65536;var t=55296+(e>>10),n=56320+(1023&e);return String.fromCharCode(t,n)}return String.fromCharCode(e)}function c(e,t){var n=0;return o(y,t)?y[t]:35===t.charCodeAt(0)&&g.test(t)&&(n="x"===t[1].toLowerCase()?parseInt(t.slice(2),16):parseInt(t.slice(1),10),u(n))?l(n):e}function p(e){return e.indexOf("&")<0?e:e.replace(v,c)}function f(e){return x[e]}function h(e){return _.test(e)?e.replace(b,f):e}var d=Object.prototype.hasOwnProperty,m=/\\([\\!"#$%&'()*+,.\/:;<=>?@[\]^_`{|}~-])/g,v=/&([a-z#][a-z0-9]{1,31});/gi,g=/^#((?:x[a-f0-9]{1,8}|[0-9]{1,8}))/i,y=n(488),_=/[&<>"]/,b=/[&<>"]/g,x={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;"};t.assign=a,t.isString=i,t.has=o,t.unescapeMd=s,t.isValidEntityCode=u,t.fromCodePoint=l,t.replaceEntities=p,t.escapeHtml=h},function(e,t){e.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},function(e,t,n){var r=n(31),i=n(63),o=n(64),a=n(78),s=n(136),u=function(e,t,n){var l,c,p,f,h=e&u.F,d=e&u.G,m=e&u.S,v=e&u.P,g=e&u.B,y=d?r:m?r[t]||(r[t]={}):(r[t]||{}).prototype,_=d?i:i[t]||(i[t]={}),b=_.prototype||(_.prototype={});d&&(n=t);for(l in n)c=!h&&y&&void 0!==y[l],p=(c?y:n)[l],f=g&&c?s(p,r):v&&"function"==typeof p?s(Function.call,p):p,y&&a(y,l,p,e&u.U),_[l]!=p&&o(_,l,f),v&&b[l]!=p&&(b[l]=p)};r.core=i,u.F=1,u.G=2,u.S=4,u.P=8,u.B=16,u.W=32,u.U=64,u.R=128,e.exports=u},function(e,t,n){var r=n(28),i=n(107),o=n(57),a=/"/g,s=function(e,t,n,r){var i=String(o(e)),s="<"+t;return""!==n&&(s+=" "+n+'="'+String(r).replace(a,"&quot;")+'"'),s+">"+i+"</"+t+">"};e.exports=function(e,t){var n={};n[e]=t(s),r(r.P+r.F*i(function(){var t=""[e]('"');return t!==t.toLowerCase()||t.split('"').length>3}),"String",n)}},function(e,t,n){e.exports={default:n(589),__esModule:!0}},function(e,t){var n=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(e,t,n){"use strict";function r(e){return function(){return e}}var i=function(){};i.thatReturns=r,i.thatReturnsFalse=r(!1),i.thatReturnsTrue=r(!0),i.thatReturnsNull=r(null),i.thatReturnsThis=function(){return this},i.thatReturnsArgument=function(e){return e},e.exports=i},function(e,t){function n(){throw new Error("setTimeout has not been defined")}function r(){throw new Error("clearTimeout has not been defined")}function i(e){if(c===setTimeout)return setTimeout(e,0);if((c===n||!c)&&setTimeout)return c=setTimeout,setTimeout(e,0);try{return c(e,0)}catch(t){try{return c.call(null,e,0)}catch(t){return c.call(this,e,0)}}}function o(e){if(p===clearTimeout)return clearTimeout(e);if((p===r||!p)&&clearTimeout)return p=clearTimeout,clearTimeout(e);try{return p(e)}catch(t){try{return p.call(null,e)}catch(t){return p.call(this,e)}}}function a(){m&&h&&(m=!1,h.length?d=h.concat(d):v=-1,d.length&&s())}function s(){if(!m){var e=i(a);m=!0;for(var t=d.length;t;){for(h=d,d=[];++v<t;)h&&h[v].run();v=-1,t=d.length}h=null,m=!1,o(e)}}function u(e,t){this.fun=e,this.array=t}function l(){}var c,p,f=e.exports={};!function(){try{c="function"==typeof setTimeout?setTimeout:n}catch(e){c=n}try{p="function"==typeof clearTimeout?clearTimeout:r}catch(e){p=r}}();var h,d=[],m=!1,v=-1;f.nextTick=function(e){var t=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];d.push(new u(e,t)),1!==d.length||m||i(s)},u.prototype.run=function(){this.fun.apply(null,this.array)},f.title="browser",f.browser=!0,f.env={},f.argv=[],f.version="",f.versions={},f.on=l,f.addListener=l,f.once=l,f.off=l,f.removeListener=l,f.removeAllListeners=l,f.emit=l,f.prependListener=l,f.prependOnceListener=l,f.listeners=function(e){return[]},f.binding=function(e){throw new Error("process.binding is not supported")},f.cwd=function(){return"/"},f.chdir=function(e){throw new Error("process.chdir is not supported")},f.umask=function(){return 0}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.get("openapi");return!!t&&t.startsWith("3")}function o(e){var t=e.get("swagger");return!!t&&t.startsWith("2")}function a(e){return function(t,n){return function(r){if(n&&n.specSelectors&&n.specSelectors.specJson){return i(n.specSelectors.specJson())?c.default.createElement(e,(0,u.default)({},r,n,{Ori:t})):c.default.createElement(t,r)}return console.warn("OAS3 wrapper: couldn't get spec"),null}}}Object.defineProperty(t,"__esModule",{value:!0});var s=n(21),u=r(s);t.isOAS3=i,t.isSwagger2=o,t.OAS3ComponentWrapFactory=a;var l=n(0),c=r(l)},function(e,t,n){e.exports={default:n(588),__esModule:!0}},function(e,t,n){"use strict";t.__esModule=!0;var r=n(331),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=function(e,t,n){return t in e?(0,i.default)(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}},function(e,t,n){var r=n(27);e.exports=function(e){if(!r(e))throw TypeError(e+" is not an object!");return e}},function(e,t){function n(e){var t=typeof e;return null!=e&&("object"==t||"function"==t)}e.exports=n},function(e,t,n){"use strict";var r=null;e.exports={debugTool:r}},function(e,t,n){"use strict";(function(e){function r(){return o.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function i(e,t){if(r()<t)throw new RangeError("Invalid typed array length");return o.TYPED_ARRAY_SUPPORT?(e=new Uint8Array(t),e.__proto__=o.prototype):(null===e&&(e=new o(t)),e.length=t),e}function o(e,t,n){if(!(o.TYPED_ARRAY_SUPPORT||this instanceof o))return new o(e,t,n);if("number"==typeof e){if("string"==typeof t)throw new Error("If encoding is specified then the first argument must be a string");return l(this,e)}return a(this,e,t,n)}function a(e,t,n,r){if("number"==typeof t)throw new TypeError('"value" argument must not be a number');return"undefined"!=typeof ArrayBuffer&&t instanceof ArrayBuffer?f(e,t,n,r):"string"==typeof t?c(e,t,n):h(e,t)}function s(e){if("number"!=typeof e)throw new TypeError('"size" argument must be a number');if(e<0)throw new RangeError('"size" argument must not be negative')}function u(e,t,n,r){return s(t),t<=0?i(e,t):void 0!==n?"string"==typeof r?i(e,t).fill(n,r):i(e,t).fill(n):i(e,t)}function l(e,t){if(s(t),e=i(e,t<0?0:0|d(t)),!o.TYPED_ARRAY_SUPPORT)for(var n=0;n<t;++n)e[n]=0;return e}function c(e,t,n){if("string"==typeof n&&""!==n||(n="utf8"),!o.isEncoding(n))throw new TypeError('"encoding" must be a valid string encoding');var r=0|v(t,n);e=i(e,r);var a=e.write(t,n);return a!==r&&(e=e.slice(0,a)),e}function p(e,t){var n=t.length<0?0:0|d(t.length);e=i(e,n);for(var r=0;r<n;r+=1)e[r]=255&t[r];return e}function f(e,t,n,r){if(t.byteLength,n<0||t.byteLength<n)throw new RangeError("'offset' is out of bounds");if(t.byteLength<n+(r||0))throw new RangeError("'length' is out of bounds");return t=void 0===n&&void 0===r?new Uint8Array(t):void 0===r?new Uint8Array(t,n):new Uint8Array(t,n,r),o.TYPED_ARRAY_SUPPORT?(e=t,e.__proto__=o.prototype):e=p(e,t),e}function h(e,t){if(o.isBuffer(t)){var n=0|d(t.length);return e=i(e,n),0===e.length?e:(t.copy(e,0,0,n),e)}if(t){if("undefined"!=typeof ArrayBuffer&&t.buffer instanceof ArrayBuffer||"length"in t)return"number"!=typeof t.length||X(t.length)?i(e,0):p(e,t);if("Buffer"===t.type&&Z(t.data))return p(e,t.data)}throw new TypeError("First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.")}function d(e){if(e>=r())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+r().toString(16)+" bytes");return 0|e}function m(e){return+e!=e&&(e=0),o.alloc(+e)}function v(e,t){if(o.isBuffer(e))return e.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(e)||e instanceof ArrayBuffer))return e.byteLength;"string"!=typeof e&&(e=""+e);var n=e.length;if(0===n)return 0;for(var r=!1;;)switch(t){case"ascii":case"latin1":case"binary":return n;case"utf8":case"utf-8":case void 0:return V(e).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*n;case"hex":return n>>>1;case"base64":return J(e).length;default:if(r)return V(e).length;t=(""+t).toLowerCase(),r=!0}}function g(e,t,n){var r=!1;if((void 0===t||t<0)&&(t=0),t>this.length)return"";if((void 0===n||n>this.length)&&(n=this.length),n<=0)return"";if(n>>>=0,t>>>=0,n<=t)return"";for(e||(e="utf8");;)switch(e){case"hex":return P(this,t,n);case"utf8":case"utf-8":return D(this,t,n);case"ascii":return M(this,t,n);case"latin1":case"binary":return T(this,t,n);case"base64":return A(this,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return I(this,t,n);default:if(r)throw new TypeError("Unknown encoding: "+e);e=(e+"").toLowerCase(),r=!0}}function y(e,t,n){var r=e[t];e[t]=e[n],e[n]=r}function _(e,t,n,r,i){if(0===e.length)return-1;if("string"==typeof n?(r=n,n=0):n>2147483647?n=2147483647:n<-2147483648&&(n=-2147483648),n=+n,isNaN(n)&&(n=i?0:e.length-1),n<0&&(n=e.length+n),n>=e.length){if(i)return-1;n=e.length-1}else if(n<0){if(!i)return-1;n=0}if("string"==typeof t&&(t=o.from(t,r)),o.isBuffer(t))return 0===t.length?-1:b(e,t,n,r,i);if("number"==typeof t)return t&=255,o.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?i?Uint8Array.prototype.indexOf.call(e,t,n):Uint8Array.prototype.lastIndexOf.call(e,t,n):b(e,[t],n,r,i);throw new TypeError("val must be string, number or Buffer")}function b(e,t,n,r,i){function o(e,t){return 1===a?e[t]:e.readUInt16BE(t*a)}var a=1,s=e.length,u=t.length;if(void 0!==r&&("ucs2"===(r=String(r).toLowerCase())||"ucs-2"===r||"utf16le"===r||"utf-16le"===r)){if(e.length<2||t.length<2)return-1;a=2,s/=2,u/=2,n/=2}var l;if(i){var c=-1;for(l=n;l<s;l++)if(o(e,l)===o(t,-1===c?0:l-c)){if(-1===c&&(c=l),l-c+1===u)return c*a}else-1!==c&&(l-=l-c),c=-1}else for(n+u>s&&(n=s-u),l=n;l>=0;l--){for(var p=!0,f=0;f<u;f++)if(o(e,l+f)!==o(t,f)){p=!1;break}if(p)return l}return-1}function x(e,t,n,r){n=Number(n)||0;var i=e.length-n;r?(r=Number(r))>i&&(r=i):r=i;var o=t.length;if(o%2!=0)throw new TypeError("Invalid hex string");r>o/2&&(r=o/2);for(var a=0;a<r;++a){var s=parseInt(t.substr(2*a,2),16);if(isNaN(s))return a;e[n+a]=s}return a}function w(e,t,n,r){return K(V(t,e.length-n),e,n,r)}function k(e,t,n,r){return K(H(t),e,n,r)}function E(e,t,n,r){return k(e,t,n,r)}function S(e,t,n,r){return K(J(t),e,n,r)}function C(e,t,n,r){return K(G(t,e.length-n),e,n,r)}function A(e,t,n){return 0===t&&n===e.length?Y.fromByteArray(e):Y.fromByteArray(e.slice(t,n))}function D(e,t,n){n=Math.min(e.length,n);for(var r=[],i=t;i<n;){var o=e[i],a=null,s=o>239?4:o>223?3:o>191?2:1;if(i+s<=n){var u,l,c,p;switch(s){case 1:o<128&&(a=o);break;case 2:u=e[i+1],128==(192&u)&&(p=(31&o)<<6|63&u)>127&&(a=p);break;case 3:u=e[i+1],l=e[i+2],128==(192&u)&&128==(192&l)&&(p=(15&o)<<12|(63&u)<<6|63&l)>2047&&(p<55296||p>57343)&&(a=p);break;case 4:u=e[i+1],l=e[i+2],c=e[i+3],128==(192&u)&&128==(192&l)&&128==(192&c)&&(p=(15&o)<<18|(63&u)<<12|(63&l)<<6|63&c)>65535&&p<1114112&&(a=p)}}null===a?(a=65533,s=1):a>65535&&(a-=65536,r.push(a>>>10&1023|55296),a=56320|1023&a),r.push(a),i+=s}return O(r)}function O(e){var t=e.length;if(t<=Q)return String.fromCharCode.apply(String,e);for(var n="",r=0;r<t;)n+=String.fromCharCode.apply(String,e.slice(r,r+=Q));return n}function M(e,t,n){var r="";n=Math.min(e.length,n);for(var i=t;i<n;++i)r+=String.fromCharCode(127&e[i]);return r}function T(e,t,n){var r="";n=Math.min(e.length,n);for(var i=t;i<n;++i)r+=String.fromCharCode(e[i]);return r}function P(e,t,n){var r=e.length;(!t||t<0)&&(t=0),(!n||n<0||n>r)&&(n=r);for(var i="",o=t;o<n;++o)i+=W(e[o]);return i}function I(e,t,n){for(var r=e.slice(t,n),i="",o=0;o<r.length;o+=2)i+=String.fromCharCode(r[o]+256*r[o+1]);return i}function R(e,t,n){if(e%1!=0||e<0)throw new RangeError("offset is not uint");if(e+t>n)throw new RangeError("Trying to access beyond buffer length")}function j(e,t,n,r,i,a){if(!o.isBuffer(e))throw new TypeError('"buffer" argument must be a Buffer instance');if(t>i||t<a)throw new RangeError('"value" argument is out of bounds');if(n+r>e.length)throw new RangeError("Index out of range")}function F(e,t,n,r){t<0&&(t=65535+t+1);for(var i=0,o=Math.min(e.length-n,2);i<o;++i)e[n+i]=(t&255<<8*(r?i:1-i))>>>8*(r?i:1-i)}function N(e,t,n,r){t<0&&(t=4294967295+t+1);for(var i=0,o=Math.min(e.length-n,4);i<o;++i)e[n+i]=t>>>8*(r?i:3-i)&255}function B(e,t,n,r,i,o){if(n+r>e.length)throw new RangeError("Index out of range");if(n<0)throw new RangeError("Index out of range")}function L(e,t,n,r,i){return i||B(e,t,n,4,3.4028234663852886e38,-3.4028234663852886e38),$.write(e,t,n,r,23,4),n+4}function q(e,t,n,r,i){return i||B(e,t,n,8,1.7976931348623157e308,-1.7976931348623157e308),$.write(e,t,n,r,52,8),n+8}function z(e){if(e=U(e).replace(ee,""),e.length<2)return"";for(;e.length%4!=0;)e+="=";return e}function U(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}function W(e){return e<16?"0"+e.toString(16):e.toString(16)}function V(e,t){t=t||1/0;for(var n,r=e.length,i=null,o=[],a=0;a<r;++a){if((n=e.charCodeAt(a))>55295&&n<57344){if(!i){if(n>56319){(t-=3)>-1&&o.push(239,191,189);continue}if(a+1===r){(t-=3)>-1&&o.push(239,191,189);continue}i=n;continue}if(n<56320){(t-=3)>-1&&o.push(239,191,189),i=n;continue}n=65536+(i-55296<<10|n-56320)}else i&&(t-=3)>-1&&o.push(239,191,189);if(i=null,n<128){if((t-=1)<0)break;o.push(n)}else if(n<2048){if((t-=2)<0)break;o.push(n>>6|192,63&n|128)}else if(n<65536){if((t-=3)<0)break;o.push(n>>12|224,n>>6&63|128,63&n|128)}else{if(!(n<1114112))throw new Error("Invalid code point");if((t-=4)<0)break;o.push(n>>18|240,n>>12&63|128,n>>6&63|128,63&n|128)}}return o}function H(e){for(var t=[],n=0;n<e.length;++n)t.push(255&e.charCodeAt(n));return t}function G(e,t){for(var n,r,i,o=[],a=0;a<e.length&&!((t-=2)<0);++a)n=e.charCodeAt(a),r=n>>8,i=n%256,o.push(i),o.push(r);return o}function J(e){return Y.toByteArray(z(e))}function K(e,t,n,r){for(var i=0;i<r&&!(i+n>=t.length||i>=e.length);++i)t[i+n]=e[i];return i}function X(e){return e!==e}/*!
-+ * The buffer module from node.js, for the browser.
-+ *
-+ * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
-+ * @license  MIT
-+ */
-+var Y=n(570),$=n(764),Z=n(387);t.Buffer=o,t.SlowBuffer=m,t.INSPECT_MAX_BYTES=50,o.TYPED_ARRAY_SUPPORT=void 0!==e.TYPED_ARRAY_SUPPORT?e.TYPED_ARRAY_SUPPORT:function(){try{var e=new Uint8Array(1);return e.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}},42===e.foo()&&"function"==typeof e.subarray&&0===e.subarray(1,1).byteLength}catch(e){return!1}}(),t.kMaxLength=r(),o.poolSize=8192,o._augment=function(e){return e.__proto__=o.prototype,e},o.from=function(e,t,n){return a(null,e,t,n)},o.TYPED_ARRAY_SUPPORT&&(o.prototype.__proto__=Uint8Array.prototype,o.__proto__=Uint8Array,"undefined"!=typeof Symbol&&Symbol.species&&o[Symbol.species]===o&&Object.defineProperty(o,Symbol.species,{value:null,configurable:!0})),o.alloc=function(e,t,n){return u(null,e,t,n)},o.allocUnsafe=function(e){return l(null,e)},o.allocUnsafeSlow=function(e){return l(null,e)},o.isBuffer=function(e){return!(null==e||!e._isBuffer)},o.compare=function(e,t){if(!o.isBuffer(e)||!o.isBuffer(t))throw new TypeError("Arguments must be Buffers");if(e===t)return 0;for(var n=e.length,r=t.length,i=0,a=Math.min(n,r);i<a;++i)if(e[i]!==t[i]){n=e[i],r=t[i];break}return n<r?-1:r<n?1:0},o.isEncoding=function(e){switch(String(e).toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"latin1":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return!0;default:return!1}},o.concat=function(e,t){if(!Z(e))throw new TypeError('"list" argument must be an Array of Buffers');if(0===e.length)return o.alloc(0);var n;if(void 0===t)for(t=0,n=0;n<e.length;++n)t+=e[n].length;var r=o.allocUnsafe(t),i=0;for(n=0;n<e.length;++n){var a=e[n];if(!o.isBuffer(a))throw new TypeError('"list" argument must be an Array of Buffers');a.copy(r,i),i+=a.length}return r},o.byteLength=v,o.prototype._isBuffer=!0,o.prototype.swap16=function(){var e=this.length;if(e%2!=0)throw new RangeError("Buffer size must be a multiple of 16-bits");for(var t=0;t<e;t+=2)y(this,t,t+1);return this},o.prototype.swap32=function(){var e=this.length;if(e%4!=0)throw new RangeError("Buffer size must be a multiple of 32-bits");for(var t=0;t<e;t+=4)y(this,t,t+3),y(this,t+1,t+2);return this},o.prototype.swap64=function(){var e=this.length;if(e%8!=0)throw new RangeError("Buffer size must be a multiple of 64-bits");for(var t=0;t<e;t+=8)y(this,t,t+7),y(this,t+1,t+6),y(this,t+2,t+5),y(this,t+3,t+4);return this},o.prototype.toString=function(){var e=0|this.length;return 0===e?"":0===arguments.length?D(this,0,e):g.apply(this,arguments)},o.prototype.equals=function(e){if(!o.isBuffer(e))throw new TypeError("Argument must be a Buffer");return this===e||0===o.compare(this,e)},o.prototype.inspect=function(){var e="",n=t.INSPECT_MAX_BYTES;return this.length>0&&(e=this.toString("hex",0,n).match(/.{2}/g).join(" "),this.length>n&&(e+=" ... ")),"<Buffer "+e+">"},o.prototype.compare=function(e,t,n,r,i){if(!o.isBuffer(e))throw new TypeError("Argument must be a Buffer");if(void 0===t&&(t=0),void 0===n&&(n=e?e.length:0),void 0===r&&(r=0),void 0===i&&(i=this.length),t<0||n>e.length||r<0||i>this.length)throw new RangeError("out of range index");if(r>=i&&t>=n)return 0;if(r>=i)return-1;if(t>=n)return 1;if(t>>>=0,n>>>=0,r>>>=0,i>>>=0,this===e)return 0;for(var a=i-r,s=n-t,u=Math.min(a,s),l=this.slice(r,i),c=e.slice(t,n),p=0;p<u;++p)if(l[p]!==c[p]){a=l[p],s=c[p];break}return a<s?-1:s<a?1:0},o.prototype.includes=function(e,t,n){return-1!==this.indexOf(e,t,n)},o.prototype.indexOf=function(e,t,n){return _(this,e,t,n,!0)},o.prototype.lastIndexOf=function(e,t,n){return _(this,e,t,n,!1)},o.prototype.write=function(e,t,n,r){if(void 0===t)r="utf8",n=this.length,t=0;else if(void 0===n&&"string"==typeof t)r=t,n=this.length,t=0;else{if(!isFinite(t))throw new Error("Buffer.write(string, encoding, offset[, length]) is no longer supported");t|=0,isFinite(n)?(n|=0,void 0===r&&(r="utf8")):(r=n,n=void 0)}var i=this.length-t;if((void 0===n||n>i)&&(n=i),e.length>0&&(n<0||t<0)||t>this.length)throw new RangeError("Attempt to write outside buffer bounds");r||(r="utf8");for(var o=!1;;)switch(r){case"hex":return x(this,e,t,n);case"utf8":case"utf-8":return w(this,e,t,n);case"ascii":return k(this,e,t,n);case"latin1":case"binary":return E(this,e,t,n);case"base64":return S(this,e,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return C(this,e,t,n);default:if(o)throw new TypeError("Unknown encoding: "+r);r=(""+r).toLowerCase(),o=!0}},o.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var Q=4096;o.prototype.slice=function(e,t){var n=this.length;e=~~e,t=void 0===t?n:~~t,e<0?(e+=n)<0&&(e=0):e>n&&(e=n),t<0?(t+=n)<0&&(t=0):t>n&&(t=n),t<e&&(t=e);var r;if(o.TYPED_ARRAY_SUPPORT)r=this.subarray(e,t),r.__proto__=o.prototype;else{var i=t-e;r=new o(i,void 0);for(var a=0;a<i;++a)r[a]=this[a+e]}return r},o.prototype.readUIntLE=function(e,t,n){e|=0,t|=0,n||R(e,t,this.length);for(var r=this[e],i=1,o=0;++o<t&&(i*=256);)r+=this[e+o]*i;return r},o.prototype.readUIntBE=function(e,t,n){e|=0,t|=0,n||R(e,t,this.length);for(var r=this[e+--t],i=1;t>0&&(i*=256);)r+=this[e+--t]*i;return r},o.prototype.readUInt8=function(e,t){return t||R(e,1,this.length),this[e]},o.prototype.readUInt16LE=function(e,t){return t||R(e,2,this.length),this[e]|this[e+1]<<8},o.prototype.readUInt16BE=function(e,t){return t||R(e,2,this.length),this[e]<<8|this[e+1]},o.prototype.readUInt32LE=function(e,t){return t||R(e,4,this.length),(this[e]|this[e+1]<<8|this[e+2]<<16)+16777216*this[e+3]},o.prototype.readUInt32BE=function(e,t){return t||R(e,4,this.length),16777216*this[e]+(this[e+1]<<16|this[e+2]<<8|this[e+3])},o.prototype.readIntLE=function(e,t,n){e|=0,t|=0,n||R(e,t,this.length);for(var r=this[e],i=1,o=0;++o<t&&(i*=256);)r+=this[e+o]*i;return i*=128,r>=i&&(r-=Math.pow(2,8*t)),r},o.prototype.readIntBE=function(e,t,n){e|=0,t|=0,n||R(e,t,this.length);for(var r=t,i=1,o=this[e+--r];r>0&&(i*=256);)o+=this[e+--r]*i;return i*=128,o>=i&&(o-=Math.pow(2,8*t)),o},o.prototype.readInt8=function(e,t){return t||R(e,1,this.length),128&this[e]?-1*(255-this[e]+1):this[e]},o.prototype.readInt16LE=function(e,t){t||R(e,2,this.length);var n=this[e]|this[e+1]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt16BE=function(e,t){t||R(e,2,this.length);var n=this[e+1]|this[e]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt32LE=function(e,t){return t||R(e,4,this.length),this[e]|this[e+1]<<8|this[e+2]<<16|this[e+3]<<24},o.prototype.readInt32BE=function(e,t){return t||R(e,4,this.length),this[e]<<24|this[e+1]<<16|this[e+2]<<8|this[e+3]},o.prototype.readFloatLE=function(e,t){return t||R(e,4,this.length),$.read(this,e,!0,23,4)},o.prototype.readFloatBE=function(e,t){return t||R(e,4,this.length),$.read(this,e,!1,23,4)},o.prototype.readDoubleLE=function(e,t){return t||R(e,8,this.length),$.read(this,e,!0,52,8)},o.prototype.readDoubleBE=function(e,t){return t||R(e,8,this.length),$.read(this,e,!1,52,8)},o.prototype.writeUIntLE=function(e,t,n,r){if(e=+e,t|=0,n|=0,!r){j(this,e,t,n,Math.pow(2,8*n)-1,0)}var i=1,o=0;for(this[t]=255&e;++o<n&&(i*=256);)this[t+o]=e/i&255;return t+n},o.prototype.writeUIntBE=function(e,t,n,r){if(e=+e,t|=0,n|=0,!r){j(this,e,t,n,Math.pow(2,8*n)-1,0)}var i=n-1,o=1;for(this[t+i]=255&e;--i>=0&&(o*=256);)this[t+i]=e/o&255;return t+n},o.prototype.writeUInt8=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,1,255,0),o.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),this[t]=255&e,t+1},o.prototype.writeUInt16LE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):F(this,e,t,!0),t+2},o.prototype.writeUInt16BE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):F(this,e,t,!1),t+2},o.prototype.writeUInt32LE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[t+3]=e>>>24,this[t+2]=e>>>16,this[t+1]=e>>>8,this[t]=255&e):N(this,e,t,!0),t+4},o.prototype.writeUInt32BE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):N(this,e,t,!1),t+4},o.prototype.writeIntLE=function(e,t,n,r){if(e=+e,t|=0,!r){var i=Math.pow(2,8*n-1);j(this,e,t,n,i-1,-i)}var o=0,a=1,s=0;for(this[t]=255&e;++o<n&&(a*=256);)e<0&&0===s&&0!==this[t+o-1]&&(s=1),this[t+o]=(e/a>>0)-s&255;return t+n},o.prototype.writeIntBE=function(e,t,n,r){if(e=+e,t|=0,!r){var i=Math.pow(2,8*n-1);j(this,e,t,n,i-1,-i)}var o=n-1,a=1,s=0;for(this[t+o]=255&e;--o>=0&&(a*=256);)e<0&&0===s&&0!==this[t+o+1]&&(s=1),this[t+o]=(e/a>>0)-s&255;return t+n},o.prototype.writeInt8=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,1,127,-128),o.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),e<0&&(e=255+e+1),this[t]=255&e,t+1},o.prototype.writeInt16LE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):F(this,e,t,!0),t+2},o.prototype.writeInt16BE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):F(this,e,t,!1),t+2},o.prototype.writeInt32LE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,4,2147483647,-2147483648),o.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8,this[t+2]=e>>>16,this[t+3]=e>>>24):N(this,e,t,!0),t+4},o.prototype.writeInt32BE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,4,2147483647,-2147483648),e<0&&(e=4294967295+e+1),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):N(this,e,t,!1),t+4},o.prototype.writeFloatLE=function(e,t,n){return L(this,e,t,!0,n)},o.prototype.writeFloatBE=function(e,t,n){return L(this,e,t,!1,n)},o.prototype.writeDoubleLE=function(e,t,n){return q(this,e,t,!0,n)},o.prototype.writeDoubleBE=function(e,t,n){return q(this,e,t,!1,n)},o.prototype.copy=function(e,t,n,r){if(n||(n=0),r||0===r||(r=this.length),t>=e.length&&(t=e.length),t||(t=0),r>0&&r<n&&(r=n),r===n)return 0;if(0===e.length||0===this.length)return 0;if(t<0)throw new RangeError("targetStart out of bounds");if(n<0||n>=this.length)throw new RangeError("sourceStart out of bounds");if(r<0)throw new RangeError("sourceEnd out of bounds");r>this.length&&(r=this.length),e.length-t<r-n&&(r=e.length-t+n);var i,a=r-n;if(this===e&&n<t&&t<r)for(i=a-1;i>=0;--i)e[i+t]=this[i+n];else if(a<1e3||!o.TYPED_ARRAY_SUPPORT)for(i=0;i<a;++i)e[i+t]=this[i+n];else Uint8Array.prototype.set.call(e,this.subarray(n,n+a),t);return a},o.prototype.fill=function(e,t,n,r){if("string"==typeof e){if("string"==typeof t?(r=t,t=0,n=this.length):"string"==typeof n&&(r=n,n=this.length),1===e.length){var i=e.charCodeAt(0);i<256&&(e=i)}if(void 0!==r&&"string"!=typeof r)throw new TypeError("encoding must be a string");if("string"==typeof r&&!o.isEncoding(r))throw new TypeError("Unknown encoding: "+r)}else"number"==typeof e&&(e&=255);if(t<0||this.length<t||this.length<n)throw new RangeError("Out of range index");if(n<=t)return this;t>>>=0,n=void 0===n?this.length:n>>>0,e||(e=0);var a;if("number"==typeof e)for(a=t;a<n;++a)this[a]=e;else{var s=o.isBuffer(e)?e:V(new o(e,r).toString()),u=s.length;for(a=0;a<n-t;++a)this[a+t]=s[a%u]}return this};var ee=/[^+\/0-9A-Za-z-_]/g}).call(t,n(17))},function(e,t,n){var r=n(37),i=n(335),o=n(190),a=Object.defineProperty;t.f=n(49)?Object.defineProperty:function(e,t,n){if(r(e),t=o(t,!0),r(n),i)try{return a(e,t,n)}catch(e){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(e[t]=n.value),e}},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},function(e,t,n){var r=n(406),i="object"==typeof self&&self&&self.Object===Object&&self,o=r||i||Function("return this")();e.exports=o},function(e,t,n){"use strict";function r(){D.ReactReconcileTransaction&&w||c("123")}function i(){this.reinitializeTransaction(),this.dirtyComponentsLength=null,this.callbackQueue=f.getPooled(),this.reconcileTransaction=D.ReactReconcileTransaction.getPooled(!0)}function o(e,t,n,i,o,a){return r(),w.batchedUpdates(e,t,n,i,o,a)}function a(e,t){return e._mountOrder-t._mountOrder}function s(e){var t=e.dirtyComponentsLength;t!==y.length&&c("124",t,y.length),y.sort(a),_++;for(var n=0;n<t;n++){var r=y[n],i=r._pendingCallbacks;r._pendingCallbacks=null;var o;if(d.logTopLevelRenders){var s=r;r._currentElement.type.isReactTopLevelWrapper&&(s=r._renderedComponent),o="React update: "+s.getName(),console.time(o)}if(m.performUpdateIfNecessary(r,e.reconcileTransaction,_),o&&console.timeEnd(o),i)for(var u=0;u<i.length;u++)e.callbackQueue.enqueue(i[u],r.getPublicInstance())}}function u(e){if(r(),!w.isBatchingUpdates)return void w.batchedUpdates(u,e);y.push(e),null==e._updateBatchNumber&&(e._updateBatchNumber=_+1)}function l(e,t){g(w.isBatchingUpdates,"ReactUpdates.asap: Can't enqueue an asap callback in a context whereupdates are not being batched."),b.enqueue(e,t),x=!0}var c=n(11),p=n(13),f=n(451),h=n(70),d=n(456),m=n(90),v=n(161),g=n(8),y=[],_=0,b=f.getPooled(),x=!1,w=null,k={initialize:function(){this.dirtyComponentsLength=y.length},close:function(){this.dirtyComponentsLength!==y.length?(y.splice(0,this.dirtyComponentsLength),C()):y.length=0}},E={initialize:function(){this.callbackQueue.reset()},close:function(){this.callbackQueue.notifyAll()}},S=[k,E];p(i.prototype,v,{getTransactionWrappers:function(){return S},destructor:function(){this.dirtyComponentsLength=null,f.release(this.callbackQueue),this.callbackQueue=null,D.ReactReconcileTransaction.release(this.reconcileTransaction),this.reconcileTransaction=null},perform:function(e,t,n){return v.perform.call(this,this.reconcileTransaction.perform,this.reconcileTransaction,e,t,n)}}),h.addPoolingTo(i);var C=function(){for(;y.length||x;){if(y.length){var e=i.getPooled();e.perform(s,null,e),i.release(e)}if(x){x=!1;var t=b;b=f.getPooled(),t.notifyAll(),f.release(t)}}},A={injectReconcileTransaction:function(e){e||c("126"),D.ReactReconcileTransaction=e},injectBatchingStrategy:function(e){e||c("127"),"function"!=typeof e.batchedUpdates&&c("128"),"boolean"!=typeof e.isBatchingUpdates&&c("129"),w=e}},D={ReactReconcileTransaction:null,batchedUpdates:o,enqueueUpdate:u,flushBatchedUpdates:C,injection:A,asap:l};e.exports=D},function(e,t){(function(){var e=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1},t=function(e,t){function r(){this.constructor=e}for(var i in t)n.call(t,i)&&(e[i]=t[i]);return r.prototype=t.prototype,e.prototype=new r,e.__super__=t.prototype,e},n={}.hasOwnProperty;this.Mark=function(){function t(e,t,n,r){this.line=e,this.column=t,this.buffer=n,this.pointer=r}return t.prototype.get_snippet=function(t,n){var r,i,o,a,s,u,l;if(null==t&&(t=4),null==n&&(n=75),null==this.buffer)return null;for(r="\0\r\n…\u2028\u2029",o="",u=this.pointer;u>0&&(a=this.buffer[u-1],e.call(r,a)<0);)if(u--,this.pointer-u>n/2-1){o=" ... ",u+=5;break}for(l="",i=this.pointer;i<this.buffer.length&&(s=this.buffer[i],e.call(r,s)<0);)if(++i-this.pointer>n/2-1){l=" ... ",i-=5;break}return""+new Array(t).join(" ")+o+this.buffer.slice(u,i)+l+"\n"+new Array(t+this.pointer-u+o.length).join(" ")+"^"},t.prototype.toString=function(){var e,t;return e=this.get_snippet(),t="  on line "+(this.line+1)+", column "+(this.column+1),e?t:t+":\n"+e},t}(),this.YAMLError=function(e){function n(e){this.message=e,n.__super__.constructor.call(this),this.stack=this.toString()+"\n"+(new Error).stack.split("\n").slice(1).join("\n")}return t(n,e),n.prototype.toString=function(){return this.message},n}(Error),this.MarkedYAMLError=function(e){function n(e,t,r,i,o){this.context=e,this.context_mark=t,this.problem=r,this.problem_mark=i,this.note=o,n.__super__.constructor.call(this)}return t(n,e),n.prototype.toString=function(){var e;return e=[],null!=this.context&&e.push(this.context),null==this.context_mark||null!=this.problem&&null!=this.problem_mark&&this.context_mark.line===this.problem_mark.line&&this.context_mark.column===this.problem_mark.column||e.push(this.context_mark.toString()),null!=this.problem&&e.push(this.problem),null!=this.problem_mark&&e.push(this.problem_mark.toString()),null!=this.note&&e.push(this.note),e.join("\n")},n}(this.YAMLError)}).call(this)},function(e,t,n){"use strict";var r=n(95),i=function(e){return e&&e.__esModule?e:{default:e}}(r);e.exports=function(){var e={location:{},history:{},open:function(){},close:function(){},File:function(){}};if("undefined"==typeof window)return e;try{e=window;var t=["File","Blob","FormData"],n=!0,r=!1,o=void 0;try{for(var a,s=(0,i.default)(t);!(n=(a=s.next()).done);n=!0){var u=a.value;u in window&&(e[u]=window[u])}}catch(e){r=!0,o=e}finally{try{!n&&s.return&&s.return()}finally{if(r)throw o}}}catch(e){console.error(e)}return e}()},function(e,t,n){e.exports={default:n(593),__esModule:!0}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}t.__esModule=!0;var i=n(567),o=r(i),a=n(566),s=r(a),u="function"==typeof s.default&&"symbol"==typeof o.default?function(e){return typeof e}:function(e){return e&&"function"==typeof s.default&&e.constructor===s.default&&e!==s.default.prototype?"symbol":typeof e};t.default="function"==typeof s.default&&"symbol"===u(o.default)?function(e){return void 0===e?"undefined":u(e)}:function(e){return e&&"function"==typeof s.default&&e.constructor===s.default&&e!==s.default.prototype?"symbol":void 0===e?"undefined":u(e)}},function(e,t,n){e.exports=!n(54)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(e,t,n){"use strict";function r(e,t,n){return n?[e,t]:e}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){this.dispatchConfig=e,this._targetInst=t,this.nativeEvent=n;var i=this.constructor.Interface;for(var o in i)if(i.hasOwnProperty(o)){var s=i[o];s?this[o]=s(n):"target"===o?this.target=r:this[o]=n[o]}var u=null!=n.defaultPrevented?n.defaultPrevented:!1===n.returnValue;return this.isDefaultPrevented=u?a.thatReturnsTrue:a.thatReturnsFalse,this.isPropagationStopped=a.thatReturnsFalse,this}var i=n(13),o=n(70),a=n(32),s=(n(10),["dispatchConfig","_targetInst","nativeEvent","isDefaultPrevented","isPropagationStopped","_dispatchListeners","_dispatchInstances"]),u={type:null,target:null,currentTarget:a.thatReturnsNull,eventPhase:null,bubbles:null,cancelable:null,timeStamp:function(e){return e.timeStamp||Date.now()},defaultPrevented:null,isTrusted:null};i(r.prototype,{preventDefault:function(){this.defaultPrevented=!0;var e=this.nativeEvent;e&&(e.preventDefault?e.preventDefault():"unknown"!=typeof e.returnValue&&(e.returnValue=!1),this.isDefaultPrevented=a.thatReturnsTrue)},stopPropagation:function(){var e=this.nativeEvent;e&&(e.stopPropagation?e.stopPropagation():"unknown"!=typeof e.cancelBubble&&(e.cancelBubble=!0),this.isPropagationStopped=a.thatReturnsTrue)},persist:function(){this.isPersistent=a.thatReturnsTrue},isPersistent:a.thatReturnsFalse,destructor:function(){var e=this.constructor.Interface;for(var t in e)this[t]=null;for(var n=0;n<s.length;n++)this[s[n]]=null}}),r.Interface=u,r.augmentClass=function(e,t){var n=this,r=function(){};r.prototype=n.prototype;var a=new r;i(a,e.prototype),e.prototype=a,e.prototype.constructor=e,e.Interface=i({},n.Interface,t),e.augmentClass=n.augmentClass,o.addPoolingTo(e,o.fourArgumentPooler)},o.addPoolingTo(r,o.fourArgumentPooler),e.exports=r},function(e,t,n){"use strict";var r={current:null};e.exports=r},function(e,t,n){var r=n(98);e.exports=function(e,t,n){if(r(e),void 0===t)return e;switch(n){case 1:return function(n){return e.call(t,n)};case 2:return function(n,r){return e.call(t,n,r)};case 3:return function(n,r,i){return e.call(t,n,r,i)}}return function(){return e.apply(t,arguments)}}},function(e,t){e.exports=function(e){try{return!!e()}catch(e){return!0}}},function(e,t){var n={}.hasOwnProperty;e.exports=function(e,t){return n.call(e,t)}},function(e,t,n){var r=n(41),i=n(101);e.exports=n(49)?function(e,t,n){return r.f(e,t,i(1,n))}:function(e,t,n){return e[t]=n,e}},function(e,t){e.exports=function(e){if(void 0==e)throw TypeError("Can't call method on  "+e);return e}},function(e,t,n){"use strict";e.exports=function(e){if("function"!=typeof e)throw new TypeError(e+" is not a function");return e}},function(e,t,n){function r(e){return a(e)?i(e):o(e)}var i=n(393),o=n(856),a=n(86);e.exports=r},function(e,t,n){"use strict";function r(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t<e.length;t++)n[t]=e[t];return n}return Array.from(e)}function i(e,t){return e===t}function o(e){var t=arguments.length<=1||void 0===arguments[1]?i:arguments[1],n=null,r=null;return function(){for(var i=arguments.length,o=Array(i),a=0;a<i;a++)o[a]=arguments[a];return null!==n&&n.length===o.length&&o.every(function(e,r){return t(e,n[r])})?r:(r=e.apply(void 0,o),n=o,r)}}function a(e){var t=Array.isArray(e[0])?e[0]:e;if(!t.every(function(e){return"function"==typeof e})){var n=t.map(function(e){return typeof e}).join(", ");throw new Error("Selector creators expect all input-selectors to be functions, instead received the following types: ["+n+"]")}return t}function s(e){for(var t=arguments.length,n=Array(t>1?t-1:0),i=1;i<t;i++)n[i-1]=arguments[i];return function(){for(var t=arguments.length,i=Array(t),o=0;o<t;o++)i[o]=arguments[o];var s=0,u=i.pop(),l=a(i),c=e.apply(void 0,[function(){return s++,u.apply(void 0,arguments)}].concat(n)),p=function(e,t){for(var n=arguments.length,i=Array(n>2?n-2:0),o=2;o<n;o++)i[o-2]=arguments[o];var a=l.map(function(n){return n.apply(void 0,[e,t].concat(i))});return c.apply(void 0,r(a))};return p.resultFunc=u,p.recomputations=function(){return s},p.resetRecomputations=function(){return s=0},p}}function u(){return s(o).apply(void 0,arguments)}function l(e){var t=arguments.length<=1||void 0===arguments[1]?u:arguments[1];if("object"!=typeof e)throw new Error("createStructuredSelector expects first argument to be an object where each property is a selector, instead received a "+typeof e);var n=Object.keys(e);return t(n.map(function(t){return e[t]}),function(){for(var e=arguments.length,t=Array(e),r=0;r<e;r++)t[r]=arguments[r];return t.reduce(function(e,t,r){return e[n[r]]=t,e},{})})}t.__esModule=!0,t.defaultMemoize=o,t.createSelectorCreator=s,t.createSelector=u,t.createStructuredSelector=l},function(e,t,n){(function(e){(function(){var t,r,i,o=[].slice,a={}.hasOwnProperty;this.StringStream=function(){function e(){this.string=""}return e.prototype.write=function(e){return this.string+=e},e}(),this.clone=function(e){return function(t){return e.extend({},t)}}(this),this.extend=function(){var e,t,n,r,i,a,s;for(e=arguments[0],a=2<=arguments.length?o.call(arguments,1):[],t=0,r=a.length;t<r;t++){i=a[t];for(n in i)s=i[n],e[n]=s}return e},this.is_empty=function(e){var t;if(Array.isArray(e)||"string"==typeof e)return 0===e.length;for(t in e)if(a.call(e,t))return!1;return!0},this.inspect=null!=(t=null!=(r=null!=(i=n(1194))?i.inspect:void 0)?r:e.inspect)?t:function(e){return""+e},this.pad_left=function(e,t,n){return e=String(e),e.length>=n?e:e.length+1===n?""+t+e:""+new Array(n-e.length+1).join(t)+e},this.to_hex=function(e){return"string"==typeof e&&(e=e.charCodeAt(0)),e.toString(16)}}).call(this)}).call(t,n(17))},function(e,t,n){var r=n(77);e.exports=function(e){if(!r(e))throw TypeError(e+" is not an object!");return e}},function(e,t){var n=e.exports={version:"2.5.3"};"number"==typeof __e&&(__e=n)},function(e,t,n){var r=n(138),i=n(360);e.exports=n(106)?function(e,t,n){return r.f(e,t,i(1,n))}:function(e,t,n){return e[t]=n,e}},function(e,t,n){"use strict";var r=n(725),i=Math.max;e.exports=function(e){return i(0,r(e))}},function(e,t,n){function r(e){return null==e?void 0===e?u:s:(e=Object(e),l&&l in e?o(e):a(e))}var i=n(82),o=n(896),a=n(925),s="[object Null]",u="[object Undefined]",l=i?i.toStringTag:void 0;e.exports=r},function(e,t,n){function r(e,t){var n=o(e,t);return i(n)?n:void 0}var i=n(854),o=n(897);e.exports=r},function(e,t){function n(e){return null!=e&&"object"==typeof e}e.exports=n},function(e,t,n){"use strict"},function(e,t,n){"use strict";var r=n(11),i=(n(8),function(e){var t=this;if(t.instancePool.length){var n=t.instancePool.pop();return t.call(n,e),n}return new t(e)}),o=function(e,t){var n=this;if(n.instancePool.length){var r=n.instancePool.pop();return n.call(r,e,t),r}return new n(e,t)},a=function(e,t,n){var r=this;if(r.instancePool.length){var i=r.instancePool.pop();return r.call(i,e,t,n),i}return new r(e,t,n)},s=function(e,t,n,r){var i=this;if(i.instancePool.length){var o=i.instancePool.pop();return i.call(o,e,t,n,r),o}return new i(e,t,n,r)},u=function(e){var t=this;e instanceof t||r("25"),e.destructor(),t.instancePool.length<t.poolSize&&t.instancePool.push(e)},l=i,c=function(e,t){var n=e;return n.instancePool=[],n.getPooled=t||l,n.poolSize||(n.poolSize=10),n.release=u,n},p={addPoolingTo:c,oneArgumentPooler:i,twoArgumentPooler:o,threeArgumentPooler:a,fourArgumentPooler:s};e.exports=p},function(e,t,n){"use strict";function r(e){if(!(this instanceof r))return new r(e);l.call(this,e),c.call(this,e),e&&!1===e.readable&&(this.readable=!1),e&&!1===e.writable&&(this.writable=!1),this.allowHalfOpen=!0,e&&!1===e.allowHalfOpen&&(this.allowHalfOpen=!1),this.once("end",i)}function i(){this.allowHalfOpen||this._writableState.ended||a(o,this)}function o(e){e.end()}var a=n(158),s=Object.keys||function(e){var t=[];for(var n in e)t.push(n);return t};e.exports=r;var u=n(111);u.inherits=n(42);var l=n(479),c=n(261);u.inherits(r,l);for(var p=s(c.prototype),f=0;f<p.length;f++){var h=p[f];r.prototype[h]||(r.prototype[h]=c.prototype[h])}Object.defineProperty(r.prototype,"destroyed",{get:function(){return void 0!==this._readableState&&void 0!==this._writableState&&(this._readableState.destroyed&&this._writableState.destroyed)},set:function(e){void 0!==this._readableState&&void 0!==this._writableState&&(this._readableState.destroyed=e,this._writableState.destroyed=e)}}),r.prototype._destroy=function(e,t){this.push(null),this.end(),a(t,e)}},function(e,t){e.exports=function(e){return e.webpackPolyfill||(e.deprecate=function(){},e.paths=[],e.children||(e.children=[]),Object.defineProperty(e,"loaded",{enumerable:!0,get:function(){return e.l}}),Object.defineProperty(e,"id",{enumerable:!0,get:function(){return e.i}}),e.webpackPolyfill=1),e}},function(e,t,n){"use strict";var r=n(430),i=n(429),o=n(114).decodeHTML,a="&(?:#x[a-f0-9]{1,8}|#[0-9]{1,8}|[a-z][a-z0-9]{1,31});",s="<[A-Za-z][A-Za-z0-9-]*(?:\\s+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:\\s*=\\s*(?:[^\"'=<>`\\x00-\\x20]+|'[^']*'|\"[^\"]*\"))?)*\\s*/?>",u="</[A-Za-z][A-Za-z0-9-]*\\s*[>]",l=new RegExp("^(?:<[A-Za-z][A-Za-z0-9-]*(?:\\s+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:\\s*=\\s*(?:[^\"'=<>`\\x00-\\x20]+|'[^']*'|\"[^\"]*\"))?)*\\s*/?>|</[A-Za-z][A-Za-z0-9-]*\\s*[>]|\x3c!----\x3e|\x3c!--(?:-?[^>-])(?:-?[^-])*--\x3e|[<][?].*?[?][>]|<![A-Z]+\\s+[^>]*>|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>)","i"),c=/[\\&]/,p="[!\"#$%&'()*+,./:;<=>?@[\\\\\\]^_`{|}~-]",f=new RegExp("\\\\"+p+"|"+a,"gi"),h=new RegExp('[&<>"]',"g"),d=new RegExp(a+'|[&<>"]',"gi"),m=function(e){return 92===e.charCodeAt(0)?e.charAt(1):o(e)},v=function(e){return c.test(e)?e.replace(f,m):e},g=function(e){try{return r(i(e))}catch(t){return e}},y=function(e){switch(e){case"&":return"&amp;";case"<":return"&lt;";case">":return"&gt;";case'"':return"&quot;";default:return e}},_=function(e,t){return h.test(e)?t?e.replace(d,y):e.replace(h,y):e};e.exports={unescapeString:v,normalizeURI:g,escapeXml:_,reHtmlTag:l,OPENTAG:s,CLOSETAG:u,ENTITY:a,ESCAPABLE:p}},function(e,t){e.exports={}},function(e,t,n){var r=n(181),i=n(178);e.exports=function(e){return r(i(e))}},function(e,t,n){var r=n(178);e.exports=function(e){return Object(r(e))}},function(e,t){e.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},function(e,t,n){var r=n(31),i=n(64),o=n(108),a=n(202)("src"),s=Function.toString,u=(""+s).split("toString");n(63).inspectSource=function(e){return s.call(e)},(e.exports=function(e,t,n,s){var l="function"==typeof n;l&&(o(n,"name")||i(n,"name",t)),e[t]!==n&&(l&&(o(n,a)||i(n,a,e[t]?""+e[t]:u.join(String(t)))),e===r?e[t]=n:s?e[t]?e[t]=n:i(e,t,n):(delete e[t],i(e,t,n)))})(Function.prototype,"toString",function(){return"function"==typeof this&&this[a]||s.call(this)})},function(e,t,n){"use strict";var r=n(372)();e.exports=function(e){return e!==r&&null!==e}},function(e,t,n){"use strict";function r(e){return void 0===e||null===e}function i(e){return"object"==typeof e&&null!==e}function o(e){return Array.isArray(e)?e:r(e)?[]:[e]}function a(e,t){var n,r,i,o;if(t)for(o=Object.keys(t),n=0,r=o.length;n<r;n+=1)i=o[n],e[i]=t[i];return e}function s(e,t){var n,r="";for(n=0;n<t;n+=1)r+=e;return r}function u(e){return 0===e&&Number.NEGATIVE_INFINITY===1/e}e.exports.isNothing=r,e.exports.isObject=i,e.exports.toArray=o,e.exports.repeat=s,e.exports.isNegativeZero=u,e.exports.extend=a},function(e,t,n){"use strict";function r(e,t,n){var i=[];return e.include.forEach(function(e){n=r(e,t,n)}),e[t].forEach(function(e){n.forEach(function(t,n){t.tag===e.tag&&t.kind===e.kind&&i.push(n)}),n.push(e)}),n.filter(function(e,t){return-1===i.indexOf(t)})}function i(){function e(e){r[e.kind][e.tag]=r.fallback[e.tag]=e}var t,n,r={scalar:{},sequence:{},mapping:{},fallback:{}};for(t=0,n=arguments.length;t<n;t+=1)arguments[t].forEach(e);return r}function o(e){this.include=e.include||[],this.implicit=e.implicit||[],this.explicit=e.explicit||[],this.implicit.forEach(function(e){if(e.loadKind&&"scalar"!==e.loadKind)throw new s("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.")}),this.compiledImplicit=r(this,"implicit",[]),this.compiledExplicit=r(this,"explicit",[]),this.compiledTypeMap=i(this.compiledImplicit,this.compiledExplicit)}var a=n(80),s=n(117),u=n(16);o.DEFAULT=null,o.create=function(){var e,t;switch(arguments.length){case 1:e=o.DEFAULT,t=arguments[0];break;case 2:e=arguments[0],t=arguments[1];break;default:throw new s("Wrong number of arguments for Schema.create function")}if(e=a.toArray(e),t=a.toArray(t),!e.every(function(e){return e instanceof o}))throw new s("Specified list of super schemas (or a single Schema object) contains a non-Schema object.");if(!t.every(function(e){return e instanceof u}))throw new s("Specified list of YAML types (or a single Type object) contains a non-Type object.");return new o({include:e,explicit:t})},e.exports=o},function(e,t,n){var r=n(43),i=r.Symbol;e.exports=i},function(e,t,n){function r(e,t){return i(e)?e:o(e,t)?[e]:a(s(e))}var i=n(20),o=n(221),a=n(936),s=n(87);e.exports=r},function(e,t,n){function r(e,t,n,r){var a=!n;n||(n={});for(var s=-1,u=t.length;++s<u;){var l=t[s],c=r?r(n[l],e[l],l,n,e):void 0;void 0===c&&(c=e[l]),a?o(n,l,c):i(n,l,c)}return n}var i=n(148),o=n(396);e.exports=r},function(e,t,n){function r(e){if("string"==typeof e||i(e))return e;var t=e+"";return"0"==t&&1/e==-o?"-0":t}var i=n(155),o=1/0;e.exports=r},function(e,t,n){function r(e){return null!=e&&o(e.length)&&!i(e)}var i=n(420),o=n(228);e.exports=r},function(e,t,n){function r(e){return null==e?"":i(e)}var i=n(401);e.exports=r},function(e,t,n){"use strict";function r(e){if(d){var t=e.node,n=e.children;if(n.length)for(var r=0;r<n.length;r++)m(t,n[r],null);else null!=e.html?p(t,e.html):null!=e.text&&h(t,e.text)}}function i(e,t){e.parentNode.replaceChild(t.node,e),r(t)}function o(e,t){d?e.children.push(t):e.node.appendChild(t.node)}function a(e,t){d?e.html=t:p(e.node,t)}function s(e,t){d?e.text=t:h(e.node,t)}function u(){return this.node.nodeName}function l(e){return{node:e,children:[],html:null,text:null,toString:u}}var c=n(241),p=n(163),f=n(249),h=n(469),d="undefined"!=typeof document&&"number"==typeof document.documentMode||"undefined"!=typeof navigator&&"string"==typeof navigator.userAgent&&/\bEdge\/\d/.test(navigator.userAgent),m=f(function(e,t,n){11===t.node.nodeType||1===t.node.nodeType&&"object"===t.node.nodeName.toLowerCase()&&(null==t.node.namespaceURI||t.node.namespaceURI===c.html)?(r(t),e.insertBefore(t.node,n)):(e.insertBefore(t.node,n),r(t))});l.insertTreeBefore=m,l.replaceChildWithTree=i,l.queueChild=o,l.queueHTML=a,l.queueText=s,e.exports=l},function(e,t,n){"use strict";function r(e,t){return(e&t)===t}var i=n(11),o=(n(8),{MUST_USE_PROPERTY:1,HAS_BOOLEAN_VALUE:4,HAS_NUMERIC_VALUE:8,HAS_POSITIVE_NUMERIC_VALUE:24,HAS_OVERLOADED_BOOLEAN_VALUE:32,injectDOMPropertyConfig:function(e){var t=o,n=e.Properties||{},a=e.DOMAttributeNamespaces||{},u=e.DOMAttributeNames||{},l=e.DOMPropertyNames||{},c=e.DOMMutationMethods||{};e.isCustomAttribute&&s._isCustomAttributeFunctions.push(e.isCustomAttribute);for(var p in n){s.properties.hasOwnProperty(p)&&i("48",p);var f=p.toLowerCase(),h=n[p],d={attributeName:f,attributeNamespace:null,propertyName:p,mutationMethod:null,mustUseProperty:r(h,t.MUST_USE_PROPERTY),hasBooleanValue:r(h,t.HAS_BOOLEAN_VALUE),hasNumericValue:r(h,t.HAS_NUMERIC_VALUE),hasPositiveNumericValue:r(h,t.HAS_POSITIVE_NUMERIC_VALUE),hasOverloadedBooleanValue:r(h,t.HAS_OVERLOADED_BOOLEAN_VALUE)};if(d.hasBooleanValue+d.hasNumericValue+d.hasOverloadedBooleanValue<=1||i("50",p),u.hasOwnProperty(p)){var m=u[p];d.attributeName=m}a.hasOwnProperty(p)&&(d.attributeNamespace=a[p]),l.hasOwnProperty(p)&&(d.propertyName=l[p]),c.hasOwnProperty(p)&&(d.mutationMethod=c[p]),s.properties[p]=d}}}),a=":A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",s={ID_ATTRIBUTE_NAME:"data-reactid",ROOT_ATTRIBUTE_NAME:"data-reactroot",ATTRIBUTE_NAME_START_CHAR:a,ATTRIBUTE_NAME_CHAR:a+"\\-.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040",properties:{},getPossibleStandardName:null,_isCustomAttributeFunctions:[],isCustomAttribute:function(e){for(var t=0;t<s._isCustomAttributeFunctions.length;t++){if((0,s._isCustomAttributeFunctions[t])(e))return!0}return!1},injection:o};e.exports=s},function(e,t,n){"use strict";function r(){i.attachRefs(this,this._currentElement)}var i=n(1045),o=(n(39),n(10),{mountComponent:function(e,t,n,i,o,a){var s=e.mountComponent(t,n,i,o,a);return e._currentElement&&null!=e._currentElement.ref&&t.getReactMountReady().enqueue(r,e),s},getHostNode:function(e){return e.getHostNode()},unmountComponent:function(e,t){i.detachRefs(e,e._currentElement),e.unmountComponent(t)},receiveComponent:function(e,t,n,o){var a=e._currentElement;if(t!==a||o!==e._context){var s=i.shouldUpdateRefs(a,t);s&&i.detachRefs(e,a),e.receiveComponent(t,n,o),s&&e._currentElement&&null!=e._currentElement.ref&&n.getReactMountReady().enqueue(r,e)}},performUpdateIfNecessary:function(e,t,n){e._updateBatchNumber===n&&e.performUpdateIfNecessary(t)}});e.exports=o},function(e,t,n){"use strict";var r=n(430),i=n(429),o=n(114).decodeHTML,a="&(?:#x[a-f0-9]{1,8}|#[0-9]{1,8}|[a-z][a-z0-9]{1,31});",s="<[A-Za-z][A-Za-z0-9-]*(?:\\s+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:\\s*=\\s*(?:[^\"'=<>`\\x00-\\x20]+|'[^']*'|\"[^\"]*\"))?)*\\s*/?>",u="</[A-Za-z][A-Za-z0-9-]*\\s*[>]",l=new RegExp("^(?:<[A-Za-z][A-Za-z0-9-]*(?:\\s+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:\\s*=\\s*(?:[^\"'=<>`\\x00-\\x20]+|'[^']*'|\"[^\"]*\"))?)*\\s*/?>|</[A-Za-z][A-Za-z0-9-]*\\s*[>]|\x3c!----\x3e|\x3c!--(?:-?[^>-])(?:-?[^-])*--\x3e|[<][?].*?[?][>]|<![A-Z]+\\s+[^>]*>|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>)","i"),c=/[\\&]/,p="[!\"#$%&'()*+,./:;<=>?@[\\\\\\]^_`{|}~-]",f=new RegExp("\\\\"+p+"|"+a,"gi"),h=new RegExp('[&<>"]',"g"),d=new RegExp(a+'|[&<>"]',"gi"),m=function(e){return 92===e.charCodeAt(0)?e.charAt(1):o(e)},v=function(e){return c.test(e)?e.replace(f,m):e},g=function(e){try{return r(i(e))}catch(t){return e}},y=function(e){switch(e){case"&":return"&amp;";case"<":return"&lt;";case">":return"&gt;";case'"':return"&quot;";default:return e}},_=function(e,t){return h.test(e)?t?e.replace(d,y):e.replace(h,y):e};e.exports={unescapeString:v,normalizeURI:g,escapeXml:_,reHtmlTag:l,OPENTAG:s,CLOSETAG:u,ENTITY:a,ESCAPABLE:p}},function(e,t,n){"use strict";var r=n(13),i=n(474),o=n(1100),a=n(1101),s=n(93),u=n(1102),l=n(1103),c=n(1104),p=n(1108),f=s.createElement,h=s.createFactory,d=s.cloneElement,m=r,v=function(e){return e},g={Children:{map:o.map,forEach:o.forEach,count:o.count,toArray:o.toArray,only:p},Component:i.Component,PureComponent:i.PureComponent,createElement:f,cloneElement:d,isValidElement:s.isValidElement,PropTypes:u,createClass:c,createFactory:h,createMixin:v,DOM:a,version:l,__spread:m};e.exports=g},function(e,t,n){"use strict";function r(e){return void 0!==e.ref}function i(e){return void 0!==e.key}var o=n(13),a=n(52),s=(n(10),n(478),Object.prototype.hasOwnProperty),u=n(476),l={key:!0,ref:!0,__self:!0,__source:!0},c=function(e,t,n,r,i,o,a){var s={$$typeof:u,type:e,key:t,ref:n,props:a,_owner:o};return s};c.createElement=function(e,t,n){var o,u={},p=null,f=null;if(null!=t){r(t)&&(f=t.ref),i(t)&&(p=""+t.key),void 0===t.__self?null:t.__self,void 0===t.__source?null:t.__source;for(o in t)s.call(t,o)&&!l.hasOwnProperty(o)&&(u[o]=t[o])}var h=arguments.length-2;if(1===h)u.children=n;else if(h>1){for(var d=Array(h),m=0;m<h;m++)d[m]=arguments[m+2];u.children=d}if(e&&e.defaultProps){var v=e.defaultProps;for(o in v)void 0===u[o]&&(u[o]=v[o])}return c(e,p,f,0,0,a.current,u)},c.createFactory=function(e){var t=c.createElement.bind(null,e);return t.type=e,t},c.cloneAndReplaceKey=function(e,t){return c(e.type,t,e.ref,e._self,e._source,e._owner,e.props)},c.cloneElement=function(e,t,n){var u,p=o({},e.props),f=e.key,h=e.ref,d=(e._self,e._source,e._owner);if(null!=t){r(t)&&(h=t.ref,d=a.current),i(t)&&(f=""+t.key);var m;e.type&&e.type.defaultProps&&(m=e.type.defaultProps);for(u in t)s.call(t,u)&&!l.hasOwnProperty(u)&&(void 0===t[u]&&void 0!==m?p[u]=m[u]:p[u]=t[u])}var v=arguments.length-2;if(1===v)p.children=n;else if(v>1){for(var g=Array(v),y=0;y<v;y++)g[y]=arguments[y+2];p.children=g}return c(e.type,f,h,0,0,d,p)},c.isValidElement=function(e){return"object"==typeof e&&null!==e&&e.$$typeof===u},e.exports=c},function(e,t){(function(){var e,t=function(e,t){function r(){this.constructor=e}for(var i in t)n.call(t,i)&&(e[i]=t[i]);return r.prototype=t.prototype,e.prototype=new r,e.__super__=t.prototype,e},n={}.hasOwnProperty;e=0,this.Node=function(){function t(t,n,r,i){this.tag=t,this.value=n,this.start_mark=r,this.end_mark=i,this.unique_id="node_"+e++}return t}(),this.ScalarNode=function(e){function n(e,t,r,i,o){this.tag=e,this.value=t,this.start_mark=r,this.end_mark=i,this.style=o,n.__super__.constructor.apply(this,arguments)}return t(n,e),n.prototype.id="scalar",n}(this.Node),this.CollectionNode=function(e){function n(e,t,r,i,o){this.tag=e,this.value=t,this.start_mark=r,this.end_mark=i,this.flow_style=o,n.__super__.constructor.apply(this,arguments)}return t(n,e),n}(this.Node),this.SequenceNode=function(e){function n(){return n.__super__.constructor.apply(this,arguments)}return t(n,e),n.prototype.id="sequence",n}(this.CollectionNode),this.MappingNode=function(e){function n(){return n.__super__.constructor.apply(this,arguments)}return t(n,e),n.prototype.id="mapping",n}(this.CollectionNode)}).call(this)},function(e,t,n){e.exports={default:n(586),__esModule:!0}},function(e,t,n){"use strict";t.__esModule=!0,t.default=function(e,t){var n={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n}},function(e,t,n){"use strict";t.__esModule=!0;var r=n(563),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=function(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t<e.length;t++)n[t]=e[t];return n}return(0,i.default)(e)}},function(e,t){e.exports=function(e){if("function"!=typeof e)throw TypeError(e+" is not a function!");return e}},function(e,t){var n={}.toString;e.exports=function(e){return n.call(e).slice(8,-1)}},function(e,t,n){var r=n(345),i=n(180);e.exports=Object.keys||function(e){return r(e,i)}},function(e,t){e.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},function(e,t,n){var r=n(41).f,i=n(55),o=n(22)("toStringTag");e.exports=function(e,t,n){e&&!i(e=n?e:e.prototype,o)&&r(e,o,{configurable:!0,value:t})}},function(e,t,n){"use strict";var r=n(617)(!0);n(339)(String,"String",function(e){this._t=String(e),this._i=0},function(){var e,t=this._t,n=this._i;return n>=t.length?{value:void 0,done:!0}:(e=r(t,n),this._i+=e.length,{value:e,done:!1})})},function(e,t,n){n(622);for(var r=n(24),i=n(56),o=n(74),a=n(22)("toStringTag"),s="CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,TextTrackList,TouchList".split(","),u=0;u<s.length;u++){var l=s[u],c=r[l],p=c&&c.prototype;p&&!p[a]&&i(p,a,l),o[l]=o.Array}},function(e,t){var n={}.toString;e.exports=function(e){return n.call(e).slice(8,-1)}},function(e,t,n){e.exports=!n(107)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(e,t){e.exports=function(e){try{return!!e()}catch(e){return!0}}},function(e,t){var n={}.hasOwnProperty;e.exports=function(e,t){return n.call(e,t)}},function(e,t){e.exports={}},function(e,t,n){var r=n(139),i=Math.min;e.exports=function(e){return e>0?i(r(e),9007199254740991):0}},function(e,t,n){(function(e){function n(e){return Array.isArray?Array.isArray(e):"[object Array]"===v(e)}function r(e){return"boolean"==typeof e}function i(e){return null===e}function o(e){return null==e}function a(e){return"number"==typeof e}function s(e){return"string"==typeof e}function u(e){return"symbol"==typeof e}function l(e){return void 0===e}function c(e){return"[object RegExp]"===v(e)}function p(e){return"object"==typeof e&&null!==e}function f(e){return"[object Date]"===v(e)}function h(e){return"[object Error]"===v(e)||e instanceof Error}function d(e){return"function"==typeof e}function m(e){return null===e||"boolean"==typeof e||"number"==typeof e||"string"==typeof e||"symbol"==typeof e||void 0===e}function v(e){return Object.prototype.toString.call(e)}t.isArray=n,t.isBoolean=r,t.isNull=i,t.isNullOrUndefined=o,t.isNumber=a,t.isString=s,t.isSymbol=u,t.isUndefined=l,t.isRegExp=c,t.isObject=p,t.isDate=f,t.isError=h,t.isFunction=d,t.isPrimitive=m,t.isBuffer=e.isBuffer}).call(t,n(40).Buffer)},function(e,t,n){"use strict";function r(e){return"string"==typeof e&&i.test(e)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=/-webkit-|-moz-|-ms-/;e.exports=t.default},function(e,t){e.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",Doctype:"doctype",isTag:function(e){return"tag"===e.type||"script"===e.type||"style"===e.type}}},function(e,t,n){var r=n(711),i=n(710);t.decode=function(e,t){return(!t||t<=0?i.XML:i.HTML)(e)},t.decodeStrict=function(e,t){return(!t||t<=0?i.XML:i.HTMLStrict)(e)},t.encode=function(e,t){return(!t||t<=0?r.XML:r.HTML)(e)},t.encodeXML=r.XML,t.encodeHTML4=t.encodeHTML5=t.encodeHTML=r.HTML,t.decodeXML=t.decodeXMLStrict=i.XML,t.decodeHTML4=t.decodeHTML5=t.decodeHTML=i.HTML,t.decodeHTML4Strict=t.decodeHTML5Strict=t.decodeHTMLStrict=i.HTMLStrict,t.escape=r.escape},function(e,t,n){"use strict";var r=n(79);e.exports=function(e){if(!r(e))throw new TypeError("Cannot use null or undefined");return e}},function(e,t,n){function r(t,n){return delete e.exports[t],e.exports[t]=n,n}var i=n(380),o=n(700);e.exports={Parser:i,Tokenizer:n(381),ElementType:n(113),DomHandler:o,get FeedHandler(){return r("FeedHandler",n(760))},get Stream(){return r("Stream",n(762))},get WritableStream(){return r("WritableStream",n(382))},get ProxyHandler(){return r("ProxyHandler",n(761))},get DomUtils(){return r("DomUtils",n(702))},get CollectingHandler(){return r("CollectingHandler",n(759))},DefaultHandler:o,get RssHandler(){return r("RssHandler",this.FeedHandler)},parseDOM:function(e,t){var n=new o(t);return new i(n,t).end(e),n.dom},parseFeed:function(t,n){var r=new e.exports.FeedHandler(n);return new i(r,n).end(t),r.dom},createDomStream:function(e,t,n){var r=new o(e,t,n);return new i(r,t)},EVENTS:{attribute:2,cdatastart:0,cdataend:0,text:1,processinginstruction:2,comment:1,commentend:0,closetag:1,opentag:2,opentagname:1,error:1,end:0}}},function(e,t,n){"use strict";function r(e,t){Error.call(this),this.name="YAMLException",this.reason=e,this.mark=t,this.message=(this.reason||"(unknown reason)")+(this.mark?" "+this.mark.toString():""),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=(new Error).stack||""}r.prototype=Object.create(Error.prototype),r.prototype.constructor=r,r.prototype.toString=function(e){var t=this.name+": ";return t+=this.reason||"(unknown reason)",!e&&this.mark&&(t+=" "+this.mark.toString()),t},e.exports=r},function(e,t,n){"use strict";var r=n(81);e.exports=new r({include:[n(388)],implicit:[n(814),n(807)],explicit:[n(799),n(809),n(810),n(812)]})},function(e,t,n){function r(e){return"function"==typeof e?e:null==e?a:"object"==typeof e?s(e)?o(e[0],e[1]):i(e):u(e)}var i=n(858),o=n(859),a=n(225),s=n(20),u=n(952);e.exports=r},function(e,t){function n(e,t){return e===t||e!==e&&t!==t}e.exports=n},function(e,t){function n(e,t,n){if(t in e)return e[t];if(3===arguments.length)return n;throw new Error('"'+t+'" is a required argument.')}function r(e){var t=e.match(y);return t?{scheme:t[1],auth:t[2],host:t[3],port:t[4],path:t[5]}:null}function i(e){var t="";return e.scheme&&(t+=e.scheme+":"),t+="//",e.auth&&(t+=e.auth+"@"),e.host&&(t+=e.host),e.port&&(t+=":"+e.port),e.path&&(t+=e.path),t}function o(e){var n=e,o=r(e);if(o){if(!o.path)return e;n=o.path}for(var a,s=t.isAbsolute(n),u=n.split(/\/+/),l=0,c=u.length-1;c>=0;c--)a=u[c],"."===a?u.splice(c,1):".."===a?l++:l>0&&(""===a?(u.splice(c+1,l),l=0):(u.splice(c,2),l--));return n=u.join("/"),""===n&&(n=s?"/":"."),o?(o.path=n,i(o)):n}function a(e,t){""===e&&(e="."),""===t&&(t=".");var n=r(t),a=r(e);if(a&&(e=a.path||"/"),n&&!n.scheme)return a&&(n.scheme=a.scheme),i(n);if(n||t.match(_))return t;if(a&&!a.host&&!a.path)return a.host=t,i(a);var s="/"===t.charAt(0)?t:o(e.replace(/\/+$/,"")+"/"+t);return a?(a.path=s,i(a)):s}function s(e,t){""===e&&(e="."),e=e.replace(/\/$/,"");for(var n=0;0!==t.indexOf(e+"/");){var r=e.lastIndexOf("/");if(r<0)return t;if(e=e.slice(0,r),e.match(/^([^\/]+:\/)?\/*$/))return t;++n}return Array(n+1).join("../")+t.substr(e.length+1)}function u(e){return e}function l(e){return p(e)?"$"+e:e}function c(e){return p(e)?e.slice(1):e}function p(e){if(!e)return!1;var t=e.length;if(t<9)return!1;if(95!==e.charCodeAt(t-1)||95!==e.charCodeAt(t-2)||111!==e.charCodeAt(t-3)||116!==e.charCodeAt(t-4)||111!==e.charCodeAt(t-5)||114!==e.charCodeAt(t-6)||112!==e.charCodeAt(t-7)||95!==e.charCodeAt(t-8)||95!==e.charCodeAt(t-9))return!1;for(var n=t-10;n>=0;n--)if(36!==e.charCodeAt(n))return!1;return!0}function f(e,t,n){var r=d(e.source,t.source);return 0!==r?r:0!==(r=e.originalLine-t.originalLine)?r:0!==(r=e.originalColumn-t.originalColumn)||n?r:0!==(r=e.generatedColumn-t.generatedColumn)?r:(r=e.generatedLine-t.generatedLine,0!==r?r:d(e.name,t.name))}function h(e,t,n){var r=e.generatedLine-t.generatedLine;return 0!==r?r:0!==(r=e.generatedColumn-t.generatedColumn)||n?r:0!==(r=d(e.source,t.source))?r:0!==(r=e.originalLine-t.originalLine)?r:(r=e.originalColumn-t.originalColumn,0!==r?r:d(e.name,t.name))}function d(e,t){return e===t?0:null===e?1:null===t?-1:e>t?1:-1}function m(e,t){var n=e.generatedLine-t.generatedLine;return 0!==n?n:0!==(n=e.generatedColumn-t.generatedColumn)?n:0!==(n=d(e.source,t.source))?n:0!==(n=e.originalLine-t.originalLine)?n:(n=e.originalColumn-t.originalColumn,0!==n?n:d(e.name,t.name))}function v(e){return JSON.parse(e.replace(/^\)]}'[^\n]*\n/,""))}function g(e,t,n){if(t=t||"",e&&("/"!==e[e.length-1]&&"/"!==t[0]&&(e+="/"),t=e+t),n){var s=r(n);if(!s)throw new Error("sourceMapURL could not be parsed");if(s.path){var u=s.path.lastIndexOf("/");u>=0&&(s.path=s.path.substring(0,u+1))}t=a(i(s),t)}return o(t)}t.getArg=n;var y=/^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.-]*)(?::(\d+))?(.*)$/,_=/^data:.+\,.+$/;t.urlParse=r,t.urlGenerate=i,t.normalize=o,t.join=a,t.isAbsolute=function(e){return"/"===e.charAt(0)||y.test(e)},t.relative=s;var b=function(){return!("__proto__"in Object.create(null))}();t.toSetString=b?u:l,t.fromSetString=b?u:c,t.compareByOriginalPositions=f,t.compareByGeneratedPositionsDeflated=h,t.compareByGeneratedPositionsInflated=m,t.parseSourceMapInput=v,t.computeSourceURL=g},function(e,t,n){"use strict";function r(e){return"button"===e||"input"===e||"select"===e||"textarea"===e}function i(e,t,n){switch(e){case"onClick":case"onClickCapture":case"onDoubleClick":case"onDoubleClickCapture":case"onMouseDown":case"onMouseDownCapture":case"onMouseMove":case"onMouseMoveCapture":case"onMouseUp":case"onMouseUpCapture":return!(!n.disabled||!r(t));default:return!1}}var o=n(11),a=n(242),s=n(243),u=n(247),l=n(462),c=n(463),p=(n(8),{}),f=null,h=function(e,t){e&&(s.executeDispatchesInOrder(e,t),e.isPersistent()||e.constructor.release(e))},d=function(e){return h(e,!0)},m=function(e){return h(e,!1)},v=function(e){return"."+e._rootNodeID},g={injection:{injectEventPluginOrder:a.injectEventPluginOrder,injectEventPluginsByName:a.injectEventPluginsByName},putListener:function(e,t,n){"function"!=typeof n&&o("94",t,typeof n);var r=v(e);(p[t]||(p[t]={}))[r]=n;var i=a.registrationNameModules[t];i&&i.didPutListener&&i.didPutListener(e,t,n)},getListener:function(e,t){var n=p[t];if(i(t,e._currentElement.type,e._currentElement.props))return null;var r=v(e);return n&&n[r]},deleteListener:function(e,t){var n=a.registrationNameModules[t];n&&n.willDeleteListener&&n.willDeleteListener(e,t);var r=p[t];if(r){delete r[v(e)]}},deleteAllListeners:function(e){var t=v(e);for(var n in p)if(p.hasOwnProperty(n)&&p[n][t]){var r=a.registrationNameModules[n];r&&r.willDeleteListener&&r.willDeleteListener(e,n),delete p[n][t]}},extractEvents:function(e,t,n,r){for(var i,o=a.plugins,s=0;s<o.length;s++){var u=o[s];if(u){var c=u.extractEvents(e,t,n,r);c&&(i=l(i,c))}}return i},enqueueEvents:function(e){e&&(f=l(f,e))},processEventQueue:function(e){var t=f;f=null,e?c(t,d):c(t,m),f&&o("95"),u.rethrowCaughtError()},__purge:function(){p={}},__getListenerBank:function(){return p}};e.exports=g},function(e,t,n){"use strict";function r(e,t,n){var r=t.dispatchConfig.phasedRegistrationNames[n];return g(e,r)}function i(e,t,n){var i=r(e,n,t);i&&(n._dispatchListeners=m(n._dispatchListeners,i),n._dispatchInstances=m(n._dispatchInstances,e))}function o(e){e&&e.dispatchConfig.phasedRegistrationNames&&d.traverseTwoPhase(e._targetInst,i,e)}function a(e){if(e&&e.dispatchConfig.phasedRegistrationNames){var t=e._targetInst,n=t?d.getParentInstance(t):null;d.traverseTwoPhase(n,i,e)}}function s(e,t,n){if(n&&n.dispatchConfig.registrationName){var r=n.dispatchConfig.registrationName,i=g(e,r);i&&(n._dispatchListeners=m(n._dispatchListeners,i),n._dispatchInstances=m(n._dispatchInstances,e))}}function u(e){e&&e.dispatchConfig.registrationName&&s(e._targetInst,null,e)}function l(e){v(e,o)}function c(e){v(e,a)}function p(e,t,n,r){d.traverseEnterLeave(n,r,s,e,t)}function f(e){v(e,u)}var h=n(122),d=n(243),m=n(462),v=n(463),g=(n(10),h.getListener),y={accumulateTwoPhaseDispatches:l,accumulateTwoPhaseDispatchesSkipTarget:c,accumulateDirectDispatches:f,accumulateEnterLeaveDispatches:p};e.exports=y},function(e,t,n){"use strict";var r={remove:function(e){e._reactInternalInstance=void 0},get:function(e){return e._reactInternalInstance},has:function(e){return void 0!==e._reactInternalInstance},set:function(e,t){e._reactInternalInstance=t}};e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o=n(252),a={view:function(e){if(e.view)return e.view;var t=o(e);if(t.window===t)return t;var n=t.ownerDocument;return n?n.defaultView||n.parentWindow:window},detail:function(e){return e.detail||0}};i.augmentClass(r,a),e.exports=r},function(e,t,n){"use strict";function r(e){for(var t=arguments.length-1,n="Minified React error #"+e+"; visit http://facebook.github.io/react/docs/error-decoder.html?invariant="+e,r=0;r<t;r++)n+="&args[]="+encodeURIComponent(arguments[r+1]);n+=" for the full message or use the non-minified dev environment for full errors and additional helpful warnings.";var i=new Error(n);throw i.name="Invariant Violation",i.framesToPop=1,i}e.exports=r},function(e,t){(function(){var e=function(e,n){function r(){this.constructor=e}for(var i in n)t.call(n,i)&&(e[i]=n[i]);return r.prototype=n.prototype,e.prototype=new r,e.__super__=n.prototype,e},t={}.hasOwnProperty;this.Event=function(){function e(e,t){this.start_mark=e,this.end_mark=t}return e}(),this.NodeEvent=function(t){function n(e,t,n){this.anchor=e,this.start_mark=t,this.end_mark=n}return e(n,t),n}(this.Event),this.CollectionStartEvent=function(t){function n(e,t,n,r,i,o){this.anchor=e,this.tag=t,this.implicit=n,this.start_mark=r,this.end_mark=i,this.flow_style=o}return e(n,t),n}(this.NodeEvent),this.CollectionEndEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.Event),this.StreamStartEvent=function(t){function n(e,t,n){this.start_mark=e,this.end_mark=t,this.encoding=n}return e(n,t),n}(this.Event),this.StreamEndEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.Event),this.DocumentStartEvent=function(t){function n(e,t,n,r,i){this.start_mark=e,this.end_mark=t,this.explicit=n,this.version=r,this.tags=i}return e(n,t),n}(this.Event),this.DocumentEndEvent=function(t){function n(e,t,n){this.start_mark=e,this.end_mark=t,this.explicit=n}return e(n,t),n}(this.Event),this.AliasEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.NodeEvent),this.ScalarEvent=function(t){function n(e,t,n,r,i,o,a){this.anchor=e,this.tag=t,this.implicit=n,this.value=r,this.start_mark=i,this.end_mark=o,this.style=a}return e(n,t),n}(this.NodeEvent),this.SequenceStartEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.CollectionStartEvent),this.SequenceEndEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.CollectionEndEvent),this.MappingStartEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.CollectionStartEvent),this.MappingEndEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.CollectionEndEvent)}).call(this)},function(e,t,n){"use strict";function r(e){return{type:p,payload:(0,c.default)(e)}}function i(e){return{type:f,payload:e}}function o(e){return{type:h,payload:e}}function a(e){return{type:d,payload:e}}function s(e){return{type:m,payload:e}}function u(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return{type:v,payload:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.CLEAR=t.NEW_AUTH_ERR=t.NEW_SPEC_ERR_BATCH=t.NEW_SPEC_ERR=t.NEW_THROWN_ERR_BATCH=t.NEW_THROWN_ERR=void 0,t.newThrownErr=r,t.newThrownErrBatch=i,t.newSpecErr=o,t.newSpecErrBatch=a,t.newAuthErr=s,t.clear=u;var l=n(264),c=function(e){return e&&e.__esModule?e:{default:e}}(l),p=t.NEW_THROWN_ERR="err_new_thrown_err",f=t.NEW_THROWN_ERR_BATCH="err_new_thrown_err_batch",h=t.NEW_SPEC_ERR="err_new_spec_err",d=t.NEW_SPEC_ERR_BATCH="err_new_spec_err_batch",m=t.NEW_AUTH_ERR="err_new_auth_err",v=t.CLEAR="err_clear"},function(e,t,n){var r=n(53),i=n(338),o=n(336),a=n(37),s=n(133),u=n(193),l={},c={},t=e.exports=function(e,t,n,p,f){var h,d,m,v,g=f?function(){return e}:u(e),y=r(n,p,t?2:1),_=0;if("function"!=typeof g)throw TypeError(e+" is not iterable!");if(o(g)){for(h=s(e.length);h>_;_++)if((v=t?y(a(d=e[_])[0],d[1]):y(e[_]))===l||v===c)return v}else for(m=g.call(e);!(d=m.next()).done;)if((v=i(m,y,d.value,t))===l||v===c)return v};t.BREAK=l,t.RETURN=c},function(e,t){e.exports=!0},function(e,t,n){var r=n(134)("meta"),i=n(27),o=n(55),a=n(41).f,s=0,u=Object.isExtensible||function(){return!0},l=!n(54)(function(){return u(Object.preventExtensions({}))}),c=function(e){a(e,r,{value:{i:"O"+ ++s,w:{}}})},p=function(e,t){if(!i(e))return"symbol"==typeof e?e:("string"==typeof e?"S":"P")+e;if(!o(e,r)){if(!u(e))return"F";if(!t)return"E";c(e)}return e[r].i},f=function(e,t){if(!o(e,r)){if(!u(e))return!0;if(!t)return!1;c(e)}return e[r].w},h=function(e){return l&&d.NEED&&u(e)&&!o(e,r)&&c(e),e},d=e.exports={KEY:r,NEED:!1,fastKey:p,getWeak:f,onFreeze:h}},function(e,t){t.f={}.propertyIsEnumerable},function(e,t,n){var r=n(189),i=Math.min;e.exports=function(e){return e>0?i(r(e),9007199254740991):0}},function(e,t){var n=0,r=Math.random();e.exports=function(e){return"Symbol(".concat(void 0===e?"":e,")_",(++n+r).toString(36))}},function(e,t){e.exports=function(e){if("function"!=typeof e)throw TypeError(e+" is not a function!");return e}},function(e,t,n){var r=n(135);e.exports=function(e,t,n){if(r(e),void 0===t)return e;switch(n){case 1:return function(n){return e.call(t,n)};case 2:return function(n,r){return e.call(t,n,r)};case 3:return function(n,r,i){return e.call(t,n,r,i)}}return function(){return e.apply(t,arguments)}}},function(e,t,n){"use strict";var r=n(64),i=n(78),o=n(107),a=n(57),s=n(19);e.exports=function(e,t,n){var u=s(e),l=n(a,u,""[e]),c=l[0],p=l[1];o(function(){var t={};return t[u]=function(){return 7},7!=""[e](t)})&&(i(String.prototype,e,c),r(RegExp.prototype,u,2==t?function(e,t){return p.call(e,this,t)}:function(e){return p.call(e,this)}))}},function(e,t,n){var r=n(62),i=n(642),o=n(661),a=Object.defineProperty;t.f=n(106)?Object.defineProperty:function(e,t,n){if(r(e),t=o(t,!0),r(n),i)try{return a(e,t,n)}catch(e){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(e[t]=n.value),e}},function(e,t){var n=Math.ceil,r=Math.floor;e.exports=function(e){return isNaN(e=+e)?0:(e>0?r:n)(e)}},function(e,t,n){var r=n(644),i=n(57);e.exports=function(e){return r(i(e))}},function(e,t,n){"use strict";var r,i=n(373),o=n(376),a=n(729),s=n(734);r=e.exports=function(e,t){var n,r,a,u,l;return arguments.length<2||"string"!=typeof e?(u=t,t=e,e=null):u=arguments[2],null==e?(n=a=!0,r=!1):(n=s.call(e,"c"),r=s.call(e,"e"),a=s.call(e,"w")),l={value:t,configurable:n,enumerable:r,writable:a},u?i(o(u),l):l},r.gs=function(e,t,n){var r,u,l,c;return"string"!=typeof e?(l=n,n=t,t=e,e=null):l=arguments[3],null==t?t=void 0:a(t)?null==n?n=void 0:a(n)||(l=n,n=void 0):(l=t,t=n=void 0),null==e?(r=!0,u=!1):(r=s.call(e,"c"),u=s.call(e,"e")),c={get:t,set:n,configurable:r,enumerable:u},l?i(o(l),c):c}},function(e,t,n){"use strict";e.exports=n(726)("forEach")},function(e,t){function n(){this._events=this._events||{},this._maxListeners=this._maxListeners||void 0}function r(e){return"function"==typeof e}function i(e){return"number"==typeof e}function o(e){return"object"==typeof e&&null!==e}function a(e){return void 0===e}e.exports=n,n.EventEmitter=n,n.prototype._events=void 0,n.prototype._maxListeners=void 0,n.defaultMaxListeners=10,n.prototype.setMaxListeners=function(e){if(!i(e)||e<0||isNaN(e))throw TypeError("n must be a positive number");return this._maxListeners=e,this},n.prototype.emit=function(e){var t,n,i,s,u,l;if(this._events||(this._events={}),"error"===e&&(!this._events.error||o(this._events.error)&&!this._events.error.length)){if((t=arguments[1])instanceof Error)throw t;var c=new Error('Uncaught, unspecified "error" event. ('+t+")");throw c.context=t,c}if(n=this._events[e],a(n))return!1;if(r(n))switch(arguments.length){case 1:n.call(this);break;case 2:n.call(this,arguments[1]);break;case 3:n.call(this,arguments[1],arguments[2]);break;default:s=Array.prototype.slice.call(arguments,1),n.apply(this,s)}else if(o(n))for(s=Array.prototype.slice.call(arguments,1),l=n.slice(),i=l.length,u=0;u<i;u++)l[u].apply(this,s);return!0},n.prototype.addListener=function(e,t){var i;if(!r(t))throw TypeError("listener must be a function");return this._events||(this._events={}),this._events.newListener&&this.emit("newListener",e,r(t.listener)?t.listener:t),this._events[e]?o(this._events[e])?this._events[e].push(t):this._events[e]=[this._events[e],t]:this._events[e]=t,o(this._events[e])&&!this._events[e].warned&&(i=a(this._maxListeners)?n.defaultMaxListeners:this._maxListeners)&&i>0&&this._events[e].length>i&&(this._events[e].warned=!0,console.error("(node) warning: possible EventEmitter memory leak detected. %d listeners added. Use emitter.setMaxListeners() to increase limit.",this._events[e].length),"function"==typeof console.trace&&console.trace()),this},n.prototype.on=n.prototype.addListener,n.prototype.once=function(e,t){function n(){this.removeListener(e,n),i||(i=!0,t.apply(this,arguments))}if(!r(t))throw TypeError("listener must be a function");var i=!1;return n.listener=t,this.on(e,n),this},n.prototype.removeListener=function(e,t){var n,i,a,s;if(!r(t))throw TypeError("listener must be a function");if(!this._events||!this._events[e])return this;if(n=this._events[e],a=n.length,i=-1,n===t||r(n.listener)&&n.listener===t)delete this._events[e],this._events.removeListener&&this.emit("removeListener",e,t);else if(o(n)){for(s=a;s-- >0;)if(n[s]===t||n[s].listener&&n[s].listener===t){i=s;break}if(i<0)return this;1===n.length?(n.length=0,delete this._events[e]):n.splice(i,1),this._events.removeListener&&this.emit("removeListener",e,t)}return this},n.prototype.removeAllListeners=function(e){var t,n;if(!this._events)return this;if(!this._events.removeListener)return 0===arguments.length?this._events={}:this._events[e]&&delete this._events[e],this;if(0===arguments.length){for(t in this._events)"removeListener"!==t&&this.removeAllListeners(t);return this.removeAllListeners("removeListener"),this._events={},this}if(n=this._events[e],r(n))this.removeListener(e,n);else if(n)for(;n.length;)this.removeListener(e,n[n.length-1]);return delete this._events[e],this},n.prototype.listeners=function(e){return this._events&&this._events[e]?r(this._events[e])?[this._events[e]]:this._events[e].slice():[]},n.prototype.listenerCount=function(e){if(this._events){var t=this._events[e];if(r(t))return 1;if(t)return t.length}return 0},n.listenerCount=function(e,t){return e.listenerCount(t)}},function(e,t,n){"use strict";var r={};e.exports=r},function(e,t,n){"use strict";var r=n(81);e.exports=r.DEFAULT=new r({include:[n(118)],explicit:[n(805),n(804),n(803)]})},function(e,t,n){function r(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}var i=n(911),o=n(912),a=n(913),s=n(914),u=n(915);r.prototype.clear=i,r.prototype.delete=o,r.prototype.get=a,r.prototype.has=s,r.prototype.set=u,e.exports=r},function(e,t){function n(e,t,n,r){var i=-1,o=null==e?0:e.length;for(r&&o&&(n=e[++i]);++i<o;)n=t(n,e[i],i,e);return n}e.exports=n},function(e,t,n){function r(e,t,n){var r=e[t];s.call(e,t)&&o(r,n)&&(void 0!==n||t in e)||i(e,t,n)}var i=n(396),o=n(120),a=Object.prototype,s=a.hasOwnProperty;e.exports=r},function(e,t,n){function r(e,t){for(var n=e.length;n--;)if(i(e[n][0],t))return n;return-1}var i=n(120);e.exports=r},function(e,t,n){function r(e,t){t=i(t,e);for(var n=0,r=t.length;null!=e&&n<r;)e=e[o(t[n++])];return n&&n==r?e:void 0}var i=n(83),o=n(85);e.exports=r},function(e,t,n){function r(e,t){var n=e.__data__;return i(t)?n["string"==typeof t?"string":"hash"]:n.map}var i=n(909);e.exports=r},function(e,t){function n(e,t){return!!(t=null==t?r:t)&&("number"==typeof e||i.test(e))&&e>-1&&e%1==0&&e<t}var r=9007199254740991,i=/^(?:0|[1-9]\d*)$/;e.exports=n},function(e,t){function n(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||r)}var r=Object.prototype;e.exports=n},function(e,t,n){var r=n(67),i=r(Object,"create");e.exports=i},function(e,t,n){function r(e){return"symbol"==typeof e||o(e)&&i(e)==a}var i=n(66),o=n(68),a="[object Symbol]";e.exports=r},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=n(233),s=function(e){return e&&e.__esModule?e:{default:e}}(a),u=function(e){function t(n){r(this,t);var o=i(this,e.call(this,n));return o.type="atrule",o}return o(t,e),t.prototype.append=function(){var t;this.nodes||(this.nodes=[]);for(var n=arguments.length,r=Array(n),i=0;i<n;i++)r[i]=arguments[i];return(t=e.prototype.append).call.apply(t,[this].concat(r))},t.prototype.prepend=function(){var t;this.nodes||(this.nodes=[]);for(var n=arguments.length,r=Array(n),i=0;i<n;i++)r[i]=arguments[i];return(t=e.prototype.prepend).call.apply(t,[this].concat(r))},t}(s.default);t.default=u,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(233),l=r(u),c=n(435),p=r(c),f=function(e){function t(n){i(this,t);var r=o(this,e.call(this,n));return r.type="rule",r.nodes||(r.nodes=[]),r}return a(t,e),s(t,[{key:"selectors",get:function(){return p.default.comma(this.selector)},set:function(e){var t=this.selector?this.selector.match(/,\s*/):null,n=t?t[0]:","+this.raw("between","beforeOpen");this.selector=e.join(n)}}]),t}(l.default);t.default=f,e.exports=t.default},function(e,t,n){"use strict";(function(t){function n(e,n,r,i){if("function"!=typeof e)throw new TypeError('"callback" argument must be a function');var o,a,s=arguments.length;switch(s){case 0:case 1:return t.nextTick(e);case 2:return t.nextTick(function(){e.call(null,n)});case 3:return t.nextTick(function(){e.call(null,n,r)});case 4:return t.nextTick(function(){e.call(null,n,r,i)});default:for(o=new Array(s-1),a=0;a<o.length;)o[a++]=arguments[a];return t.nextTick(function(){e.apply(null,o)})}}!t.version||0===t.version.indexOf("v0.")||0===t.version.indexOf("v1.")&&0!==t.version.indexOf("v1.8.")?e.exports=n:e.exports=t.nextTick}).call(t,n(33))},function(e,t,n){"use strict";function r(e){return Object.prototype.hasOwnProperty.call(e,m)||(e[m]=h++,p[e[m]]={}),p[e[m]]}var i,o=n(13),a=n(242),s=n(1037),u=n(461),l=n(1069),c=n(253),p={},f=!1,h=0,d={topAbort:"abort",topAnimationEnd:l("animationend")||"animationend",topAnimationIteration:l("animationiteration")||"animationiteration",topAnimationStart:l("animationstart")||"animationstart",topBlur:"blur",topCanPlay:"canplay",topCanPlayThrough:"canplaythrough",topChange:"change",topClick:"click",topCompositionEnd:"compositionend",topCompositionStart:"compositionstart",topCompositionUpdate:"compositionupdate",topContextMenu:"contextmenu",topCopy:"copy",topCut:"cut",topDoubleClick:"dblclick",topDrag:"drag",topDragEnd:"dragend",topDragEnter:"dragenter",topDragExit:"dragexit",topDragLeave:"dragleave",topDragOver:"dragover",topDragStart:"dragstart",topDrop:"drop",topDurationChange:"durationchange",topEmptied:"emptied",topEncrypted:"encrypted",topEnded:"ended",topError:"error",topFocus:"focus",topInput:"input",topKeyDown:"keydown",topKeyPress:"keypress",topKeyUp:"keyup",topLoadedData:"loadeddata",topLoadedMetadata:"loadedmetadata",topLoadStart:"loadstart",topMouseDown:"mousedown",topMouseMove:"mousemove",topMouseOut:"mouseout",topMouseOver:"mouseover",topMouseUp:"mouseup",topPaste:"paste",topPause:"pause",topPlay:"play",topPlaying:"playing",topProgress:"progress",topRateChange:"ratechange",topScroll:"scroll",topSeeked:"seeked",topSeeking:"seeking",topSelectionChange:"selectionchange",topStalled:"stalled",topSuspend:"suspend",topTextInput:"textInput",topTimeUpdate:"timeupdate",topTouchCancel:"touchcancel",topTouchEnd:"touchend",topTouchMove:"touchmove",topTouchStart:"touchstart",topTransitionEnd:l("transitionend")||"transitionend",topVolumeChange:"volumechange",topWaiting:"waiting",topWheel:"wheel"},m="_reactListenersID"+String(Math.random()).slice(2),v=o({},s,{ReactEventListener:null,injection:{injectReactEventListener:function(e){e.setHandleTopLevel(v.handleTopLevel),v.ReactEventListener=e}},setEnabled:function(e){v.ReactEventListener&&v.ReactEventListener.setEnabled(e)},isEnabled:function(){return!(!v.ReactEventListener||!v.ReactEventListener.isEnabled())},listenTo:function(e,t){for(var n=t,i=r(n),o=a.registrationNameDependencies[e],s=0;s<o.length;s++){var u=o[s];i.hasOwnProperty(u)&&i[u]||("topWheel"===u?c("wheel")?v.ReactEventListener.trapBubbledEvent("topWheel","wheel",n):c("mousewheel")?v.ReactEventListener.trapBubbledEvent("topWheel","mousewheel",n):v.ReactEventListener.trapBubbledEvent("topWheel","DOMMouseScroll",n):"topScroll"===u?c("scroll",!0)?v.ReactEventListener.trapCapturedEvent("topScroll","scroll",n):v.ReactEventListener.trapBubbledEvent("topScroll","scroll",v.ReactEventListener.WINDOW_HANDLE):"topFocus"===u||"topBlur"===u?(c("focus",!0)?(v.ReactEventListener.trapCapturedEvent("topFocus","focus",n),v.ReactEventListener.trapCapturedEvent("topBlur","blur",n)):c("focusin")&&(v.ReactEventListener.trapBubbledEvent("topFocus","focusin",n),v.ReactEventListener.trapBubbledEvent("topBlur","focusout",n)),i.topBlur=!0,i.topFocus=!0):d.hasOwnProperty(u)&&v.ReactEventListener.trapBubbledEvent(u,d[u],n),i[u]=!0)}},trapBubbledEvent:function(e,t,n){return v.ReactEventListener.trapBubbledEvent(e,t,n)},trapCapturedEvent:function(e,t,n){return v.ReactEventListener.trapCapturedEvent(e,t,n)},supportsEventPageXY:function(){if(!document.createEvent)return!1;var e=document.createEvent("MouseEvent");return null!=e&&"pageX"in e},ensureScrollValueMonitoring:function(){if(void 0===i&&(i=v.supportsEventPageXY()),!i&&!f){var e=u.refreshScrollValues;v.ReactEventListener.monitorScrollValue(e),f=!0}}});e.exports=v},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(125),o=n(461),a=n(251),s={screenX:null,screenY:null,clientX:null,clientY:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,getModifierState:a,button:function(e){var t=e.button;return"which"in e?t:2===t?2:4===t?1:0},buttons:null,relatedTarget:function(e){return e.relatedTarget||(e.fromElement===e.srcElement?e.toElement:e.fromElement)},pageX:function(e){return"pageX"in e?e.pageX:e.clientX+o.currentScrollLeft},pageY:function(e){return"pageY"in e?e.pageY:e.clientY+o.currentScrollTop}};i.augmentClass(r,s),e.exports=r},function(e,t,n){"use strict";var r=n(11),i=(n(8),{}),o={reinitializeTransaction:function(){this.transactionWrappers=this.getTransactionWrappers(),this.wrapperInitData?this.wrapperInitData.length=0:this.wrapperInitData=[],this._isInTransaction=!1},_isInTransaction:!1,getTransactionWrappers:null,isInTransaction:function(){return!!this._isInTransaction},perform:function(e,t,n,i,o,a,s,u){this.isInTransaction()&&r("27");var l,c;try{this._isInTransaction=!0,l=!0,this.initializeAll(0),c=e.call(t,n,i,o,a,s,u),l=!1}finally{try{if(l)try{this.closeAll(0)}catch(e){}else this.closeAll(0)}finally{this._isInTransaction=!1}}return c},initializeAll:function(e){for(var t=this.transactionWrappers,n=e;n<t.length;n++){var r=t[n];try{this.wrapperInitData[n]=i,this.wrapperInitData[n]=r.initialize?r.initialize.call(this):null}finally{if(this.wrapperInitData[n]===i)try{this.initializeAll(n+1)}catch(e){}}}},closeAll:function(e){this.isInTransaction()||r("28");for(var t=this.transactionWrappers,n=e;n<t.length;n++){var o,a=t[n],s=this.wrapperInitData[n];try{o=!0,s!==i&&a.close&&a.close.call(this,s),o=!1}finally{if(o)try{this.closeAll(n+1)}catch(e){}}}this.wrapperInitData.length=0}};e.exports=o},function(e,t,n){"use strict";function r(e){var t=""+e,n=o.exec(t);if(!n)return t;var r,i="",a=0,s=0;for(a=n.index;a<t.length;a++){switch(t.charCodeAt(a)){case 34:r="&quot;";break;case 38:r="&amp;";break;case 39:r="&#x27;";break;case 60:r="&lt;";break;case 62:r="&gt;";break;default:continue}s!==a&&(i+=t.substring(s,a)),s=a+1,i+=r}return s!==a?i+t.substring(s,a):i}function i(e){return"boolean"==typeof e||"number"==typeof e?""+e:r(e)}var o=/["'&<>]/;e.exports=i},function(e,t,n){"use strict";var r,i=n(25),o=n(241),a=/^[ \r\n\t\f]/,s=/<(!--|link|noscript|meta|script|style)[ \r\n\t\f\/>]/,u=n(249),l=u(function(e,t){if(e.namespaceURI!==o.svg||"innerHTML"in e)e.innerHTML=t;else{r=r||document.createElement("div"),r.innerHTML="<svg>"+t+"</svg>";for(var n=r.firstChild;n.firstChild;)e.appendChild(n.firstChild)}});if(i.canUseDOM){var c=document.createElement("div");c.innerHTML=" ",""===c.innerHTML&&(l=function(e,t){if(e.parentNode&&e.parentNode.replaceChild(e,e),a.test(t)||"<"===t[0]&&s.test(t)){e.innerHTML=String.fromCharCode(65279)+t;var n=e.firstChild;1===n.data.length?e.removeChild(n):n.deleteData(0,1)}else e.innerHTML=t}),c=null}e.exports=l},function(e,t,n){"use strict";function r(e){var t={};for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]="number"==typeof e[n]?e[n]:e[n].val);return t}t.__esModule=!0,t.default=r,e.exports=t.default},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o=-1,a=e.posMax,s=e.pos,u=e.isInLabel;if(e.isInLabel)return-1;if(e.labelUnmatchedScopes)return e.labelUnmatchedScopes--,-1;for(e.pos=t+1,e.isInLabel=!0,n=1;e.pos<a;){if(91===(i=e.src.charCodeAt(e.pos)))n++;else if(93===i&&0===--n){r=!0;break}e.parser.skipToken(e)}return r?(o=e.pos,e.labelUnmatchedScopes=0):e.labelUnmatchedScopes=n-1,e.pos=s,e.isInLabel=u,o}},function(e,t,n){"use strict";function r(){this.__rules__=[],this.__cache__=null}r.prototype.__find__=function(e){for(var t=this.__rules__.length,n=-1;t--;)if(this.__rules__[++n].name===e)return n;return-1},r.prototype.__compile__=function(){var e=this,t=[""];e.__rules__.forEach(function(e){e.enabled&&e.alt.forEach(function(e){t.indexOf(e)<0&&t.push(e)})}),e.__cache__={},t.forEach(function(t){e.__cache__[t]=[],e.__rules__.forEach(function(n){n.enabled&&(t&&n.alt.indexOf(t)<0||e.__cache__[t].push(n.fn))})})},r.prototype.at=function(e,t,n){var r=this.__find__(e),i=n||{};if(-1===r)throw new Error("Parser rule not found: "+e);this.__rules__[r].fn=t,this.__rules__[r].alt=i.alt||[],this.__cache__=null},r.prototype.before=function(e,t,n,r){var i=this.__find__(e),o=r||{};if(-1===i)throw new Error("Parser rule not found: "+e);this.__rules__.splice(i,0,{name:t,enabled:!0,fn:n,alt:o.alt||[]}),this.__cache__=null},r.prototype.after=function(e,t,n,r){var i=this.__find__(e),o=r||{};if(-1===i)throw new Error("Parser rule not found: "+e);this.__rules__.splice(i+1,0,{name:t,enabled:!0,fn:n,alt:o.alt||[]}),this.__cache__=null},r.prototype.push=function(e,t,n){var r=n||{};this.__rules__.push({name:e,enabled:!0,fn:t,alt:r.alt||[]}),this.__cache__=null},r.prototype.enable=function(e,t){e=Array.isArray(e)?e:[e],t&&this.__rules__.forEach(function(e){e.enabled=!1}),e.forEach(function(e){var t=this.__find__(e);if(t<0)throw new Error("Rules manager: invalid rule name "+e);this.__rules__[t].enabled=!0},this),this.__cache__=null},r.prototype.disable=function(e){e=Array.isArray(e)?e:[e],e.forEach(function(e){var t=this.__find__(e);if(t<0)throw new Error("Rules manager: invalid rule name "+e);this.__rules__[t].enabled=!1},this),this.__cache__=null},r.prototype.getRules=function(e){return null===this.__cache__&&this.__compile__(),this.__cache__[e]||[]},e.exports=r},function(e,t,n){function r(e,t){for(var n in e)t[n]=e[n]}function i(e,t,n){return a(e,t,n)}var o=n(40),a=o.Buffer;a.from&&a.alloc&&a.allocUnsafe&&a.allocUnsafeSlow?e.exports=o:(r(o,t),t.Buffer=i),r(a,i),i.from=function(e,t,n){if("number"==typeof e)throw new TypeError("Argument must not be a number");return a(e,t,n)},i.alloc=function(e,t,n){if("number"!=typeof e)throw new TypeError("Argument must be a number");var r=a(e);return void 0!==t?"string"==typeof n?r.fill(t,n):r.fill(t):r.fill(0),r},i.allocUnsafe=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return a(e)},i.allocUnsafeSlow=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return o.SlowBuffer(e)}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){return{type:v,payload:e}}function o(e){return{type:g,payload:e}}function a(e){return{type:y,payload:e}}function s(e){return{type:_,payload:e}}function u(e){return{type:b,payload:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.authorizeRequest=t.authorizeAccessCodeWithBasicAuthentication=t.authorizeAccessCodeWithFormParams=t.authorizeApplication=t.authorizePassword=t.preAuthorizeImplicit=t.CONFIGURE_AUTH=t.VALIDATE=t.AUTHORIZE_OAUTH2=t.PRE_AUTHORIZE_OAUTH2=t.LOGOUT=t.AUTHORIZE=t.SHOW_AUTH_POPUP=void 0;var l=n(30),c=r(l),p=n(35),f=r(p);t.showDefinitions=i,t.authorize=o,t.logout=a,t.authorizeOauth2=s,t.configureAuth=u;var h=n(46),d=r(h),m=n(9),v=t.SHOW_AUTH_POPUP="show_popup",g=t.AUTHORIZE="authorize",y=t.LOGOUT="logout",_=(t.PRE_AUTHORIZE_OAUTH2="pre_authorize_oauth2",t.AUTHORIZE_OAUTH2="authorize_oauth2"),b=(t.VALIDATE="validate",t.CONFIGURE_AUTH="configure_auth");t.preAuthorizeImplicit=function(e){return function(t){var n=t.authActions,r=t.errActions,i=e.auth,o=e.token,a=e.isValid,s=i.schema,u=i.name,l=s.get("flow");if(delete d.default.swaggerUIRedirectOauth2,"accessCode"===l||a||r.newAuthErr({authId:u,source:"auth",level:"warning",message:"Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"}),o.error)return void r.newAuthErr({authId:u,source:"auth",level:"error",message:(0,f.default)(o)});n.authorizeOauth2({auth:i,token:o})}},t.authorizePassword=function(e){return function(t){var n=t.authActions,r=e.schema,i=e.name,o=e.username,a=e.password,s=e.passwordType,u=e.clientId,l=e.clientSecret,p={grant_type:"password",scope:e.scopes.join(" ")},f={},h={};return"basic"===s?h.Authorization="Basic "+(0,m.btoa)(o+":"+a):((0,c.default)(p,{username:o},{password:a}),"query"===s?(u&&(f.client_id=u),l&&(f.client_secret=l)):h.Authorization="Basic "+(0,m.btoa)(u+":"+l)),n.authorizeRequest({body:(0,m.buildFormData)(p),url:r.get("tokenUrl"),name:i,headers:h,query:f,auth:e})}},t.authorizeApplication=function(e){return function(t){var n=t.authActions,r=e.schema,i=e.scopes,o=e.name,a=e.clientId,s=e.clientSecret,u={Authorization:"Basic "+(0,m.btoa)(a+":"+s)},l={grant_type:"client_credentials",scope:i.join(" ")};return n.authorizeRequest({body:(0,m.buildFormData)(l),name:o,url:r.get("tokenUrl"),auth:e,headers:u})}},t.authorizeAccessCodeWithFormParams=function(e){var t=e.auth,n=e.redirectUrl;return function(e){var r=e.authActions,i=t.schema,o=t.name,a=t.clientId,s=t.clientSecret,u={grant_type:"authorization_code",code:t.code,client_id:a,client_secret:s,redirect_uri:n};return r.authorizeRequest({body:(0,m.buildFormData)(u),name:o,url:i.get("tokenUrl"),auth:t})}},t.authorizeAccessCodeWithBasicAuthentication=function(e){var t=e.auth,n=e.redirectUrl;return function(e){var r=e.authActions,i=t.schema,o=t.name,a=t.clientId,s=t.clientSecret,u={Authorization:"Basic "+(0,m.btoa)(a+":"+s)},l={grant_type:"authorization_code",code:t.code,client_id:a,redirect_uri:n};return r.authorizeRequest({body:(0,m.buildFormData)(l),name:o,url:i.get("tokenUrl"),auth:t,headers:u})}},t.authorizeRequest=function(e){return function(t){var n=t.fn,r=t.getConfigs,i=t.authActions,o=t.errActions,a=t.authSelectors,s=e.body,u=e.query,l=void 0===u?{}:u,p=e.headers,h=void 0===p?{}:p,d=e.name,m=e.url,v=e.auth,g=a.getConfigs()||{},y=g.additionalQueryStringParams,_=m;for(var b in y)m+="&"+b+"="+encodeURIComponent(y[b]);var x=(0,c.default)({Accept:"application/json, text/plain, */*","Content-Type":"application/x-www-form-urlencoded"},h);n.fetch({url:_,method:"post",headers:x,query:l,body:s,requestInterceptor:r().requestInterceptor,responseInterceptor:r().responseInterceptor}).then(function(e){var t=JSON.parse(e.data),n=t&&(t.error||""),r=t&&(t.parseError||"");return e.ok?n||r?void o.newAuthErr({authId:d,level:"error",source:"auth",message:(0,f.default)(t)}):void i.authorizeOauth2({auth:v,token:t}):void o.newAuthErr({authId:d,level:"error",source:"auth",message:e.statusText})}).catch(function(e){var t=new Error(e);o.newAuthErr({authId:d,level:"error",source:"auth",message:t.message})})}}},function(e,t,n){"use strict";function r(e,t){return{type:s,payload:(0,a.default)({},e,t)}}function i(e){return{type:u,payload:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.TOGGLE_CONFIGS=t.UPDATE_CONFIGS=void 0;var o=n(36),a=function(e){return e&&e.__esModule?e:{default:e}}(o);t.update=r,t.toggle=i;var s=t.UPDATE_CONFIGS="configs_update",u=t.TOGGLE_CONFIGS="configs_toggle"},function(e,t,n){"use strict";function r(e){return{type:u,payload:e}}function i(e){return{type:l,payload:e}}function o(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];return e=(0,s.normalizeArray)(e),{type:p,payload:{thing:e,shown:t}}}function a(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return e=(0,s.normalizeArray)(e),{type:c,payload:{thing:e,mode:t}}}Object.defineProperty(t,"__esModule",{value:!0}),t.SHOW=t.UPDATE_MODE=t.UPDATE_FILTER=t.UPDATE_LAYOUT=void 0,t.updateLayout=r,t.updateFilter=i,t.show=o,t.changeMode=a;var s=n(9),u=t.UPDATE_LAYOUT="layout_update_layout",l=t.UPDATE_FILTER="layout_update_filter",c=t.UPDATE_MODE="layout_update_mode",p=t.SHOW="layout_show"},function(e,t,n){"use strict";function r(e,t){return{type:u,payload:{selectedServerUrl:e,namespace:t}}}function i(e){var t=e.value,n=e.pathMethod;return{type:l,payload:{value:t,pathMethod:n}}}function o(e){var t=e.value,n=e.pathMethod;return{type:c,payload:{value:t,pathMethod:n}}}function a(e){var t=e.value,n=e.path,r=e.method;return{type:p,payload:{value:t,path:n,method:r}}}function s(e){var t=e.server,n=e.namespace,r=e.key,i=e.val;return{type:f,payload:{server:t,namespace:n,key:r,val:i}}}Object.defineProperty(t,"__esModule",{value:!0}),t.setSelectedServer=r,t.setRequestBodyValue=i,t.setRequestContentType=o,t.setResponseContentType=a,t.setServerVariableValue=s;var u=t.UPDATE_SELECTED_SERVER="oas3_set_servers",l=t.UPDATE_REQUEST_BODY_VALUE="oas3_set_request_body_value",c=t.UPDATE_REQUEST_CONTENT_TYPE="oas3_set_request_content_type",p=t.UPDATE_RESPONSE_CONTENT_TYPE="oas3_set_response_content_type",f=t.UPDATE_SERVER_VARIABLE_VALUE="oas3_set_server_variable_value"},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){var n=h(e,t);if(n)return(0,s.default)(n,{declaration:!0,indent:"\t"})}Object.defineProperty(t,"__esModule",{value:!0}),t.memoizedSampleFromSchema=t.memoizedCreateXMLExample=t.sampleXmlFromSchema=t.inferSchema=t.sampleFromSchema=void 0,t.createXMLExample=i;var o=n(9),a=n(1198),s=r(a),u=n(968),l=r(u),c={string:function(){return"string"},string_email:function(){return"user@example.com"},"string_date-time":function(){return(new Date).toISOString()},number:function(){return 0},number_float:function(){return 0},integer:function(){return 0},boolean:function(e){return"boolean"!=typeof e.default||e.default}},p=function(e){e=(0,o.objectify)(e);var t=e,n=t.type,r=t.format,i=c[n+"_"+r]||c[n];return(0,o.isFunc)(i)?i(e):"Unknown Type: "+e.type},f=t.sampleFromSchema=function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=(0,o.objectify)(t),i=r.type,a=r.example,s=r.properties,u=r.additionalProperties,l=r.items,c=n.includeReadOnly,f=n.includeWriteOnly;if(void 0!==a)return a;if(!i)if(s)i="object";else{if(!l)return;i="array"}if("object"===i){var h=(0,o.objectify)(s),d={};for(var m in h)h[m].readOnly&&!c||h[m].writeOnly&&!f||(d[m]=e(h[m],n));if(!0===u)d.additionalProp1={};else if(u)for(var v=(0,o.objectify)(u),g=e(v,n),y=1;y<4;y++)d["additionalProp"+y]=g;return d}return"array"===i?[e(l,n)]:t.enum?t.default?t.default:(0,o.normalizeArray)(t.enum)[0]:"file"!==i?p(t):void 0},h=(t.inferSchema=function(e){return e.schema&&(e=e.schema),e.properties&&(e.type="object"),e},t.sampleXmlFromSchema=function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=(0,o.objectify)(t),i=r.type,a=r.properties,s=r.additionalProperties,u=r.items,l=r.example,c=n.includeReadOnly,f=n.includeWriteOnly,h=r.default,d={},m={},v=t.xml,g=v.name,y=v.prefix,_=v.namespace,b=r.enum,x=void 0,w=void 0;if(!i)if(a||s)i="object";else{if(!u)return;i="array"}if(g=g||"notagname",x=(y?y+":":"")+g,_){m[y?"xmlns:"+y:"xmlns"]=_}if("array"===i&&u){if(u.xml=u.xml||v||{},u.xml.name=u.xml.name||v.name,v.wrapped)return d[x]=[],Array.isArray(l)?l.forEach(function(t){u.example=t,d[x].push(e(u,n))}):Array.isArray(h)?h.forEach(function(t){u.default=t,d[x].push(e(u,n))}):d[x]=[e(u,n)],m&&d[x].push({_attr:m}),d;var k=[];return Array.isArray(l)?(l.forEach(function(t){u.example=t,k.push(e(u,n))}),k):Array.isArray(h)?(h.forEach(function(t){u.default=t,k.push(e(u,n))}),k):e(u,n)}if("object"===i){var E=(0,o.objectify)(a);d[x]=[],l=l||{};for(var S in E)if(E.hasOwnProperty(S)&&(!E[S].readOnly||c)&&(!E[S].writeOnly||f))if(E[S].xml=E[S].xml||{},E[S].xml.attribute){var C=Array.isArray(E[S].enum)&&E[S].enum[0],A=E[S].example,D=E[S].default;m[E[S].xml.name||S]=void 0!==A&&A||void 0!==l[S]&&l[S]||void 0!==D&&D||C||p(E[S])}else{E[S].xml.name=E[S].xml.name||S,E[S].example=void 0!==E[S].example?E[S].example:l[S];var O=e(E[S]);Array.isArray(O)?d[x]=d[x].concat(O):d[x].push(O)}return!0===s?d[x].push({additionalProp:"Anything can be here"}):s&&d[x].push({additionalProp:p(s)}),m&&d[x].push({_attr:m}),d}return w=void 0!==l?l:void 0!==h?h:Array.isArray(b)?b[0]:p(t),d[x]=m?[{_attr:m},w]:w,d});t.memoizedCreateXMLExample=(0,l.default)(i),t.memoizedSampleFromSchema=(0,l.default)(f)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=X(e).replace(/\t/g,"  ");if("string"==typeof e)return{type:R,payload:t}}function o(e){return{type:J,payload:e}}function a(e){return{type:j,payload:e}}function s(e){return{type:F,payload:e}}function u(e,t,n,r,i){return{type:N,payload:{path:e,value:r,paramName:t,paramIn:n,isXml:i}}}function l(e){return{type:H,payload:{pathMethod:e}}}function c(e,t){return{type:G,payload:{path:e,value:t,key:"consumes_value"}}}function p(e,t){return{type:G,payload:{path:e,value:t,key:"produces_value"}}}function f(e,t){return{type:W,payload:{path:e,method:t}}}function h(e,t){return{type:V,payload:{path:e,method:t}}}function d(e,t,n){return{type:K,payload:{scheme:e,path:t,method:n}}}Object.defineProperty(t,"__esModule",{value:!0}),t.execute=t.executeRequest=t.logRequest=t.setMutatedRequest=t.setRequest=t.setResponse=t.validateParams=t.resolveSpec=t.parseToJson=t.SET_SCHEME=t.UPDATE_RESOLVED=t.UPDATE_OPERATION_META_VALUE=t.CLEAR_VALIDATE_PARAMS=t.CLEAR_REQUEST=t.CLEAR_RESPONSE=t.LOG_REQUEST=t.SET_MUTATED_REQUEST=t.SET_REQUEST=t.SET_RESPONSE=t.VALIDATE_PARAMS=t.UPDATE_PARAM=t.UPDATE_JSON=t.UPDATE_URL=t.UPDATE_SPEC=void 0;var m=n(21),v=r(m),g=n(96),y=r(g),_=n(30),b=r(_),x=n(47),w=r(x),k=n(48),E=r(k);t.updateSpec=i,t.updateResolved=o,t.updateUrl=a,t.updateJsonSpec=s,t.changeParam=u,t.clearValidateParams=l,t.changeConsumesValue=c,t.changeProducesValue=p,t.clearResponse=f,t.clearRequest=h,t.setScheme=d;var S=n(211),C=r(S),A=n(1187),D=r(A),O=n(264),M=r(O),T=n(422),P=r(T),I=n(9),R=t.UPDATE_SPEC="spec_update_spec",j=t.UPDATE_URL="spec_update_url",F=t.UPDATE_JSON="spec_update_json",N=t.UPDATE_PARAM="spec_update_param",B=t.VALIDATE_PARAMS="spec_validate_param",L=t.SET_RESPONSE="spec_set_response",q=t.SET_REQUEST="spec_set_request",z=t.SET_MUTATED_REQUEST="spec_set_mutated_request",U=t.LOG_REQUEST="spec_log_request",W=t.CLEAR_RESPONSE="spec_clear_response",V=t.CLEAR_REQUEST="spec_clear_request",H=t.CLEAR_VALIDATE_PARAMS="spec_clear_validate_param",G=t.UPDATE_OPERATION_META_VALUE="spec_update_operation_meta_value",J=t.UPDATE_RESOLVED="spec_update_resolved",K=t.SET_SCHEME="set_scheme",X=function(e){return(0,P.default)(e)?e:""},Y=(t.parseToJson=function(e){return function(t){var n=t.specActions,r=t.specSelectors,i=t.errActions,o=r.specStr,a=null;try{e=e||o(),i.clear({source:"parser"}),a=C.default.safeLoad(e)}catch(e){return console.error(e),i.newSpecErr({source:"parser",level:"error",message:e.reason,line:e.mark&&e.mark.line?e.mark.line+1:void 0})}return a&&"object"===(void 0===a?"undefined":(0,E.default)(a))?n.updateJsonSpec(a):{}}},t.resolveSpec=function(e,t){return function(n){var r=n.specActions,i=n.specSelectors,o=n.errActions,a=n.fn,s=a.fetch,u=a.resolve,l=a.AST,c=n.getConfigs,p=c(),f=p.modelPropertyMacro,h=p.parameterMacro,d=p.requestInterceptor,m=p.responseInterceptor;void 0===e&&(e=i.specJson()),void 0===t&&(t=i.url());var v=l.getLineNumberForPath,g=i.specStr();return u({fetch:s,spec:e,baseDoc:t,modelPropertyMacro:f,parameterMacro:h,requestInterceptor:d,responseInterceptor:m}).then(function(e){var t=e.spec,n=e.errors;if(o.clear({type:"thrown"}),Array.isArray(n)&&n.length>0){var i=n.map(function(e){return console.error(e),e.line=e.fullPath?v(g,e.fullPath):null,e.path=e.fullPath?e.fullPath.join("."):null,e.level="error",e.type="thrown",e.source="resolver",Object.defineProperty(e,"message",{enumerable:!0,value:e.message}),e});o.newThrownErrBatch(i)}return r.updateResolved(t)})}},t.validateParams=function(e,t){return{type:B,payload:{pathMethod:e,isOAS3:t}}},t.setResponse=function(e,t,n){return{payload:{path:e,method:t,res:n},type:L}},t.setRequest=function(e,t,n){return{payload:{path:e,method:t,req:n},type:q}},t.setMutatedRequest=function(e,t,n){return{payload:{path:e,method:t,req:n},type:z}},t.logRequest=function(e){return{payload:e,type:U}},t.executeRequest=function(e){return function(t){var n=t.fn,r=t.specActions,i=t.specSelectors,o=t.getConfigs,a=t.oas3Selectors,s=e.pathName,u=e.method,l=e.operation,c=o(),p=c.requestInterceptor,f=c.responseInterceptor,h=l.toJS();if(e.contextUrl=(0,D.default)(i.url()).toString(),h&&h.operationId?e.operationId=h.operationId:h&&s&&u&&(e.operationId=n.opId(h,s,u)),i.isOAS3()){var d=s+":"+u;e.server=a.selectedServer(d)||a.selectedServer();var m=a.serverVariables({server:e.server,namespace:d}).toJS(),v=a.serverVariables({server:e.server}).toJS();e.serverVariables=(0,w.default)(m).length?m:v,e.requestContentType=a.requestContentType(s,u),e.responseContentType=a.responseContentType(s,u)||"*/*";var g=a.requestBodyValue(s,u);(0,I.isJSONObject)(g)?e.requestBody=JSON.parse(g):e.requestBody=g}var y=(0,b.default)({},e);y=n.buildRequest(y),r.setRequest(e.pathName,e.method,y);var _=function(t){var n=p.apply(this,[t]),i=(0,b.default)({},n);return r.setMutatedRequest(e.pathName,e.method,i),n};e.requestInterceptor=_,e.responseInterceptor=f;var x=Date.now();return n.execute(e).then(function(t){t.duration=Date.now()-x,r.setResponse(e.pathName,e.method,t)}).catch(function(t){return r.setResponse(e.pathName,e.method,{error:!0,err:(0,M.default)(t)})})}},function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=e.path,n=e.method,r=(0,y.default)(e,["path","method"]);return function(e){var i=e.fn.fetch,o=e.specSelectors,a=e.specActions,s=o.spec().toJS(),u=o.operationScheme(t,n),l=o.contentTypeValues([t,n]).toJS(),c=l.requestContentType,p=l.responseContentType,f=/xml/i.test(c),h=o.parameterValues([t,n],f).toJS();return a.executeRequest((0,v.default)({fetch:i,spec:s,pathName:t,method:n,parameters:h,requestContentType:c,scheme:u,responseContentType:p},r))}});t.execute=Y},function(e,t,n){"use strict";function r(e){switch(e._type){case"document":case"block_quote":case"list":case"item":case"paragraph":case"heading":case"emph":case"strong":case"link":case"image":case"custom_inline":case"custom_block":return!0;default:return!1}}var i=function(e,t){this.current=e,this.entering=!0===t},o=function(){var e=this.current,t=this.entering;if(null===e)return null;var n=r(e);return t&&n?e._firstChild?(this.current=e._firstChild,this.entering=!0):this.entering=!1:e===this.root?this.current=null:null===e._next?(this.current=e._parent,this.entering=!1):(this.current=e._next,this.entering=!0),{entering:t,node:e}},a=function(e){return{current:e,root:e,entering:!0,next:o,resumeAt:i}},s=function(e,t){this._type=e,this._parent=null,this._firstChild=null,this._lastChild=null,this._prev=null,this._next=null,this._sourcepos=t,this._lastLineBlank=!1,this._open=!0,this._string_content=null,this._literal=null,this._listData={},this._info=null,this._destination=null,this._title=null,this._isFenced=!1,this._fenceChar=null,this._fenceLength=0,this._fenceOffset=null,this._level=null,this._onEnter=null,this._onExit=null},u=s.prototype;Object.defineProperty(u,"isContainer",{get:function(){return r(this)}}),Object.defineProperty(u,"type",{get:function(){return this._type}}),Object.defineProperty(u,"firstChild",{get:function(){return this._firstChild}}),Object.defineProperty(u,"lastChild",{get:function(){return this._lastChild}}),Object.defineProperty(u,"next",{get:function(){return this._next}}),Object.defineProperty(u,"prev",{get:function(){return this._prev}}),Object.defineProperty(u,"parent",{get:function(){return this._parent}}),Object.defineProperty(u,"sourcepos",{get:function(){return this._sourcepos}}),Object.defineProperty(u,"literal",{get:function(){return this._literal},set:function(e){this._literal=e}}),Object.defineProperty(u,"destination",{get:function(){return this._destination},set:function(e){this._destination=e}}),Object.defineProperty(u,"title",{get:function(){return this._title},set:function(e){this._title=e}}),Object.defineProperty(u,"info",{get:function(){return this._info},set:function(e){this._info=e}}),Object.defineProperty(u,"level",{get:function(){return this._level},set:function(e){this._level=e}}),Object.defineProperty(u,"listType",{get:function(){return this._listData.type},set:function(e){this._listData.type=e}}),Object.defineProperty(u,"listTight",{get:function(){return this._listData.tight},set:function(e){this._listData.tight=e}}),Object.defineProperty(u,"listStart",{get:function(){return this._listData.start},set:function(e){this._listData.start=e}}),Object.defineProperty(u,"listDelimiter",{get:function(){return this._listData.delimiter},set:function(e){this._listData.delimiter=e}}),Object.defineProperty(u,"onEnter",{get:function(){return this._onEnter},set:function(e){this._onEnter=e}}),Object.defineProperty(u,"onExit",{get:function(){return this._onExit},set:function(e){this._onExit=e}}),s.prototype.appendChild=function(e){e.unlink(),e._parent=this,this._lastChild?(this._lastChild._next=e,e._prev=this._lastChild,this._lastChild=e):(this._firstChild=e,this._lastChild=e)},s.prototype.prependChild=function(e){e.unlink(),e._parent=this,this._firstChild?(this._firstChild._prev=e,e._next=this._firstChild,this._firstChild=e):(this._firstChild=e,this._lastChild=e)},s.prototype.unlink=function(){this._prev?this._prev._next=this._next:this._parent&&(this._parent._firstChild=this._next),this._next?this._next._prev=this._prev:this._parent&&(this._parent._lastChild=this._prev),this._parent=null,this._next=null,this._prev=null},s.prototype.insertAfter=function(e){e.unlink(),e._next=this._next,e._next&&(e._next._prev=e),e._prev=this,this._next=e,e._parent=this._parent,e._next||(e._parent._lastChild=e)},s.prototype.insertBefore=function(e){e.unlink(),e._prev=this._prev,e._prev&&(e._prev._next=e),e._next=this,this._prev=e,e._parent=this._parent,e._prev||(e._parent._firstChild=e)},s.prototype.walker=function(){return new a(this)},e.exports=s},function(e,t){e.exports=function(e,t,n,r){if(!(e instanceof t)||void 0!==r&&r in e)throw TypeError(n+": incorrect invocation!");return e}},function(e,t,n){var r=n(53),i=n(181),o=n(76),a=n(133),s=n(602);e.exports=function(e,t){var n=1==e,u=2==e,l=3==e,c=4==e,p=6==e,f=5==e||p,h=t||s;return function(t,s,d){for(var m,v,g=o(t),y=i(g),_=r(s,d,3),b=a(y.length),x=0,w=n?h(t,b):u?h(t,0):void 0;b>x;x++)if((f||x in y)&&(m=y[x],v=_(m,x,g),e))if(n)w[x]=v;else if(v)switch(e){case 3:return!0;case 5:return m;case 6:return x;case 2:w.push(m)}else if(c)return!1;return p?-1:l||c?c:w}}},function(e,t,n){var r=n(99),i=n(22)("toStringTag"),o="Arguments"==r(function(){return arguments}()),a=function(e,t){try{return e[t]}catch(e){}};e.exports=function(e){var t,n,s;return void 0===e?"Undefined":null===e?"Null":"string"==typeof(n=a(t=Object(e),i))?n:o?r(t):"Object"==(s=r(t))&&"function"==typeof t.callee?"Arguments":s}},function(e,t){e.exports=function(e){if(void 0==e)throw TypeError("Can't call method on  "+e);return e}},function(e,t,n){var r=n(27),i=n(24).document,o=r(i)&&r(i.createElement);e.exports=function(e){return o?i.createElement(e):{}}},function(e,t){e.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(e,t,n){var r=n(99);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(e){return"String"==r(e)?e.split(""):Object(e)}},function(e,t,n){"use strict";function r(e){var t,n;this.promise=new e(function(e,r){if(void 0!==t||void 0!==n)throw TypeError("Bad Promise constructor");t=e,n=r}),this.resolve=i(t),this.reject=i(n)}var i=n(98);e.exports.f=function(e){return new r(e)}},function(e,t,n){var r=n(37),i=n(611),o=n(180),a=n(187)("IE_PROTO"),s=function(){},u=function(){var e,t=n(179)("iframe"),r=o.length;for(t.style.display="none",n(334).appendChild(t),t.src="javascript:",e=t.contentWindow.document,e.open(),e.write("<script>document.F=Object<\/script>"),e.close(),u=e.F;r--;)delete u.prototype[o[r]];return u()};e.exports=Object.create||function(e,t){var n;return null!==e?(s.prototype=r(e),n=new s,s.prototype=null,n[a]=e):n=u(),void 0===t?n:i(n,t)}},function(e,t){t.f=Object.getOwnPropertySymbols},function(e,t,n){var r=n(56);e.exports=function(e,t,n){for(var i in t)n&&e[i]?e[i]=t[i]:r(e,i,t[i]);return e}},function(e,t,n){e.exports=n(56)},function(e,t,n){var r=n(188)("keys"),i=n(134);e.exports=function(e){return r[e]||(r[e]=i(e))}},function(e,t,n){var r=n(24),i=r["__core-js_shared__"]||(r["__core-js_shared__"]={});e.exports=function(e){return i[e]||(i[e]={})}},function(e,t){var n=Math.ceil,r=Math.floor;e.exports=function(e){return isNaN(e=+e)?0:(e>0?r:n)(e)}},function(e,t,n){var r=n(27);e.exports=function(e,t){if(!r(e))return e;var n,i;if(t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i;if("function"==typeof(n=e.valueOf)&&!r(i=n.call(e)))return i;if(!t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i;throw TypeError("Can't convert object to primitive value")}},function(e,t,n){var r=n(24),i=n(15),o=n(130),a=n(192),s=n(41).f;e.exports=function(e){var t=i.Symbol||(i.Symbol=o?{}:r.Symbol||{});"_"==e.charAt(0)||e in t||s(t,e,{value:a.f(e)})}},function(e,t,n){t.f=n(22)},function(e,t,n){var r=n(177),i=n(22)("iterator"),o=n(74);e.exports=n(15).getIteratorMethod=function(e){if(void 0!=e)return e[i]||e["@@iterator"]||o[r(e)]}},function(e,t){},function(e,t,n){var r=n(105),i=n(19)("toStringTag"),o="Arguments"==r(function(){return arguments}()),a=function(e,t){try{return e[t]}catch(e){}};e.exports=function(e){var t,n,s;return void 0===e?"Undefined":null===e?"Null":"string"==typeof(n=a(t=Object(e),i))?n:o?r(t):"Object"==(s=r(t))&&"function"==typeof t.callee?"Arguments":s}},function(e,t,n){var r=n(77),i=n(31).document,o=r(i)&&r(i.createElement);e.exports=function(e){return o?i.createElement(e):{}}},function(e,t,n){var r=n(19)("match");e.exports=function(e){var t=/./;try{"/./"[e](t)}catch(n){try{return t[r]=!1,!"/./"[e](t)}catch(e){}}return!0}},function(e,t,n){"use strict";function r(e){var t,n;this.promise=new e(function(e,r){if(void 0!==t||void 0!==n)throw TypeError("Bad Promise constructor");t=e,n=r}),this.resolve=i(t),this.reject=i(n)}var i=n(135);e.exports.f=function(e){return new r(e)}},function(e,t,n){var r=n(138).f,i=n(108),o=n(19)("toStringTag");e.exports=function(e,t,n){e&&!i(e=n?e:e.prototype,o)&&r(e,o,{configurable:!0,value:t})}},function(e,t,n){var r=n(361)("keys"),i=n(202);e.exports=function(e){return r[e]||(r[e]=i(e))}},function(e,t,n){var r=n(354),i=n(57);e.exports=function(e,t,n){if(r(t))throw TypeError("String#"+n+" doesn't accept regex!");return String(i(e))}},function(e,t){var n=0,r=Math.random();e.exports=function(e){return"Symbol(".concat(void 0===e?"":e,")_",(++n+r).toString(36))}},function(e,t,n){"use strict";(function(t){/*!
-+ * @description Recursive object extending
-+ * @author Viacheslav Lotsmanov <lotsmanov89@gmail.com>
-+ * @license MIT
-+ *
-+ * The MIT License (MIT)
-+ *
-+ * Copyright (c) 2013-2015 Viacheslav Lotsmanov
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
-+ * this software and associated documentation files (the "Software"), to deal in
-+ * the Software without restriction, including without limitation the rights to
-+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-+ * the Software, and to permit persons to whom the Software is furnished to do so,
-+ * subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in all
-+ * copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+function n(e){return e instanceof t||e instanceof Date||e instanceof RegExp}function r(e){if(e instanceof t){var n=new t(e.length);return e.copy(n),n}if(e instanceof Date)return new Date(e.getTime());if(e instanceof RegExp)return new RegExp(e);throw new Error("Unexpected situation")}function i(e){var t=[];return e.forEach(function(e,a){"object"==typeof e&&null!==e?Array.isArray(e)?t[a]=i(e):n(e)?t[a]=r(e):t[a]=o({},e):t[a]=e}),t}var o=e.exports=function(){if(arguments.length<1||"object"!=typeof arguments[0])return!1;if(arguments.length<2)return arguments[0];var e,t,a=arguments[0],s=Array.prototype.slice.call(arguments,1);return s.forEach(function(s){"object"!=typeof s||Array.isArray(s)||Object.keys(s).forEach(function(u){return t=a[u],e=s[u],e===a?void 0:"object"!=typeof e||null===e?void(a[u]=e):Array.isArray(e)?void(a[u]=i(e)):n(e)?void(a[u]=r(e)):"object"!=typeof t||null===t||Array.isArray(t)?void(a[u]=o({},e)):void(a[u]=o(t,e))})}),a}}).call(t,n(40).Buffer)},function(e,t){e.exports={Aacute:"Á",aacute:"á",Abreve:"Ă",abreve:"ă",ac:"∾",acd:"∿",acE:"∾̳",Acirc:"Â",acirc:"â",acute:"´",Acy:"А",acy:"а",AElig:"Æ",aelig:"æ",af:"⁡",Afr:"𝔄",afr:"𝔞",Agrave:"À",agrave:"à",alefsym:"ℵ",aleph:"ℵ",Alpha:"Α",alpha:"α",Amacr:"Ā",amacr:"ā",amalg:"⨿",amp:"&",AMP:"&",andand:"⩕",And:"⩓",and:"∧",andd:"⩜",andslope:"⩘",andv:"⩚",ang:"∠",ange:"⦤",angle:"∠",angmsdaa:"⦨",angmsdab:"⦩",angmsdac:"⦪",angmsdad:"⦫",angmsdae:"⦬",angmsdaf:"⦭",angmsdag:"⦮",angmsdah:"⦯",angmsd:"∡",angrt:"∟",angrtvb:"⊾",angrtvbd:"⦝",angsph:"∢",angst:"Å",angzarr:"⍼",Aogon:"Ą",aogon:"ą",Aopf:"𝔸",aopf:"𝕒",apacir:"⩯",ap:"≈",apE:"⩰",ape:"≊",apid:"≋",apos:"'",ApplyFunction:"⁡",approx:"≈",approxeq:"≊",Aring:"Å",aring:"å",Ascr:"𝒜",ascr:"𝒶",Assign:"≔",ast:"*",asymp:"≈",asympeq:"≍",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",awconint:"∳",awint:"⨑",backcong:"≌",backepsilon:"϶",backprime:"‵",backsim:"∽",backsimeq:"⋍",Backslash:"∖",Barv:"⫧",barvee:"⊽",barwed:"⌅",Barwed:"⌆",barwedge:"⌅",bbrk:"⎵",bbrktbrk:"⎶",bcong:"≌",Bcy:"Б",bcy:"б",bdquo:"„",becaus:"∵",because:"∵",Because:"∵",bemptyv:"⦰",bepsi:"϶",bernou:"ℬ",Bernoullis:"ℬ",Beta:"Β",beta:"β",beth:"ℶ",between:"≬",Bfr:"𝔅",bfr:"𝔟",bigcap:"⋂",bigcirc:"◯",bigcup:"⋃",bigodot:"⨀",bigoplus:"⨁",bigotimes:"⨂",bigsqcup:"⨆",bigstar:"★",bigtriangledown:"▽",bigtriangleup:"△",biguplus:"⨄",bigvee:"⋁",bigwedge:"⋀",bkarow:"⤍",blacklozenge:"⧫",blacksquare:"▪",blacktriangle:"▴",blacktriangledown:"▾",blacktriangleleft:"◂",blacktriangleright:"▸",blank:"␣",blk12:"▒",blk14:"░",blk34:"▓",block:"█",bne:"=⃥",bnequiv:"≡⃥",bNot:"⫭",bnot:"⌐",Bopf:"𝔹",bopf:"𝕓",bot:"⊥",bottom:"⊥",bowtie:"⋈",boxbox:"⧉",boxdl:"┐",boxdL:"╕",boxDl:"╖",boxDL:"╗",boxdr:"┌",boxdR:"╒",boxDr:"╓",boxDR:"╔",boxh:"─",boxH:"═",boxhd:"┬",boxHd:"╤",boxhD:"╥",boxHD:"╦",boxhu:"┴",boxHu:"╧",boxhU:"╨",boxHU:"╩",boxminus:"⊟",boxplus:"⊞",boxtimes:"⊠",boxul:"┘",boxuL:"╛",boxUl:"╜",boxUL:"╝",boxur:"└",boxuR:"╘",boxUr:"╙",boxUR:"╚",boxv:"│",boxV:"║",boxvh:"┼",boxvH:"╪",boxVh:"╫",boxVH:"╬",boxvl:"┤",boxvL:"╡",boxVl:"╢",boxVL:"╣",boxvr:"├",boxvR:"╞",boxVr:"╟",boxVR:"╠",bprime:"‵",breve:"˘",Breve:"˘",brvbar:"¦",bscr:"𝒷",Bscr:"ℬ",bsemi:"⁏",bsim:"∽",bsime:"⋍",bsolb:"⧅",bsol:"\\",bsolhsub:"⟈",bull:"•",bullet:"•",bump:"≎",bumpE:"⪮",bumpe:"≏",Bumpeq:"≎",bumpeq:"≏",Cacute:"Ć",cacute:"ć",capand:"⩄",capbrcup:"⩉",capcap:"⩋",cap:"∩",Cap:"⋒",capcup:"⩇",capdot:"⩀",CapitalDifferentialD:"ⅅ",caps:"∩︀",caret:"⁁",caron:"ˇ",Cayleys:"ℭ",ccaps:"⩍",Ccaron:"Č",ccaron:"č",Ccedil:"Ç",ccedil:"ç",Ccirc:"Ĉ",ccirc:"ĉ",Cconint:"∰",ccups:"⩌",ccupssm:"⩐",Cdot:"Ċ",cdot:"ċ",cedil:"¸",Cedilla:"¸",cemptyv:"⦲",cent:"¢",centerdot:"·",CenterDot:"·",cfr:"𝔠",Cfr:"ℭ",CHcy:"Ч",chcy:"ч",check:"✓",checkmark:"✓",Chi:"Χ",chi:"χ",circ:"ˆ",circeq:"≗",circlearrowleft:"↺",circlearrowright:"↻",circledast:"⊛",circledcirc:"⊚",circleddash:"⊝",CircleDot:"⊙",circledR:"®",circledS:"Ⓢ",CircleMinus:"⊖",CirclePlus:"⊕",CircleTimes:"⊗",cir:"○",cirE:"⧃",cire:"≗",cirfnint:"⨐",cirmid:"⫯",cirscir:"⧂",ClockwiseContourIntegral:"∲",CloseCurlyDoubleQuote:"”",CloseCurlyQuote:"’",clubs:"♣",clubsuit:"♣",colon:":",Colon:"∷",Colone:"⩴",colone:"≔",coloneq:"≔",comma:",",commat:"@",comp:"∁",compfn:"∘",complement:"∁",complexes:"ℂ",cong:"≅",congdot:"⩭",Congruent:"≡",conint:"∮",Conint:"∯",ContourIntegral:"∮",copf:"𝕔",Copf:"ℂ",coprod:"∐",Coproduct:"∐",copy:"©",COPY:"©",copysr:"℗",CounterClockwiseContourIntegral:"∳",crarr:"↵",cross:"✗",Cross:"⨯",Cscr:"𝒞",cscr:"𝒸",csub:"⫏",csube:"⫑",csup:"⫐",csupe:"⫒",ctdot:"⋯",cudarrl:"⤸",cudarrr:"⤵",cuepr:"⋞",cuesc:"⋟",cularr:"↶",cularrp:"⤽",cupbrcap:"⩈",cupcap:"⩆",CupCap:"≍",cup:"∪",Cup:"⋓",cupcup:"⩊",cupdot:"⊍",cupor:"⩅",cups:"∪︀",curarr:"↷",curarrm:"⤼",curlyeqprec:"⋞",curlyeqsucc:"⋟",curlyvee:"⋎",curlywedge:"⋏",curren:"¤",curvearrowleft:"↶",curvearrowright:"↷",cuvee:"⋎",cuwed:"⋏",cwconint:"∲",cwint:"∱",cylcty:"⌭",dagger:"†",Dagger:"‡",daleth:"ℸ",darr:"↓",Darr:"↡",dArr:"⇓",dash:"‐",Dashv:"⫤",dashv:"⊣",dbkarow:"⤏",dblac:"˝",Dcaron:"Ď",dcaron:"ď",Dcy:"Д",dcy:"д",ddagger:"‡",ddarr:"⇊",DD:"ⅅ",dd:"ⅆ",DDotrahd:"⤑",ddotseq:"⩷",deg:"°",Del:"∇",Delta:"Δ",delta:"δ",demptyv:"⦱",dfisht:"⥿",Dfr:"𝔇",dfr:"𝔡",dHar:"⥥",dharl:"⇃",dharr:"⇂",DiacriticalAcute:"´",DiacriticalDot:"˙",DiacriticalDoubleAcute:"˝",DiacriticalGrave:"`",DiacriticalTilde:"˜",diam:"⋄",diamond:"⋄",Diamond:"⋄",diamondsuit:"♦",diams:"♦",die:"¨",DifferentialD:"ⅆ",digamma:"ϝ",disin:"⋲",div:"÷",divide:"÷",divideontimes:"⋇",divonx:"⋇",DJcy:"Ђ",djcy:"ђ",dlcorn:"⌞",dlcrop:"⌍",dollar:"$",Dopf:"𝔻",dopf:"𝕕",Dot:"¨",dot:"˙",DotDot:"⃜",doteq:"≐",doteqdot:"≑",DotEqual:"≐",dotminus:"∸",dotplus:"∔",dotsquare:"⊡",doublebarwedge:"⌆",DoubleContourIntegral:"∯",DoubleDot:"¨",DoubleDownArrow:"⇓",DoubleLeftArrow:"⇐",DoubleLeftRightArrow:"⇔",DoubleLeftTee:"⫤",DoubleLongLeftArrow:"⟸",DoubleLongLeftRightArrow:"⟺",DoubleLongRightArrow:"⟹",DoubleRightArrow:"⇒",DoubleRightTee:"⊨",DoubleUpArrow:"⇑",DoubleUpDownArrow:"⇕",DoubleVerticalBar:"∥",DownArrowBar:"⤓",downarrow:"↓",DownArrow:"↓",Downarrow:"⇓",DownArrowUpArrow:"⇵",DownBreve:"̑",downdownarrows:"⇊",downharpoonleft:"⇃",downharpoonright:"⇂",DownLeftRightVector:"⥐",DownLeftTeeVector:"⥞",DownLeftVectorBar:"⥖",DownLeftVector:"↽",DownRightTeeVector:"⥟",DownRightVectorBar:"⥗",DownRightVector:"⇁",DownTeeArrow:"↧",DownTee:"⊤",drbkarow:"⤐",drcorn:"⌟",drcrop:"⌌",Dscr:"𝒟",dscr:"𝒹",DScy:"Ѕ",dscy:"ѕ",dsol:"⧶",Dstrok:"Đ",dstrok:"đ",dtdot:"⋱",dtri:"▿",dtrif:"▾",duarr:"⇵",duhar:"⥯",dwangle:"⦦",DZcy:"Џ",dzcy:"џ",dzigrarr:"⟿",Eacute:"É",eacute:"é",easter:"⩮",Ecaron:"Ě",ecaron:"ě",Ecirc:"Ê",ecirc:"ê",ecir:"≖",ecolon:"≕",Ecy:"Э",ecy:"э",eDDot:"⩷",Edot:"Ė",edot:"ė",eDot:"≑",ee:"ⅇ",efDot:"≒",Efr:"𝔈",efr:"𝔢",eg:"⪚",Egrave:"È",egrave:"è",egs:"⪖",egsdot:"⪘",el:"⪙",Element:"∈",elinters:"⏧",ell:"ℓ",els:"⪕",elsdot:"⪗",Emacr:"Ē",emacr:"ē",empty:"∅",emptyset:"∅",EmptySmallSquare:"◻",emptyv:"∅",EmptyVerySmallSquare:"▫",emsp13:" ",emsp14:" ",emsp:" ",ENG:"Ŋ",eng:"ŋ",ensp:" ",Eogon:"Ę",eogon:"ę",Eopf:"𝔼",eopf:"𝕖",epar:"⋕",eparsl:"⧣",eplus:"⩱",epsi:"ε",Epsilon:"Ε",epsilon:"ε",epsiv:"ϵ",eqcirc:"≖",eqcolon:"≕",eqsim:"≂",eqslantgtr:"⪖",eqslantless:"⪕",Equal:"⩵",equals:"=",EqualTilde:"≂",equest:"≟",Equilibrium:"⇌",equiv:"≡",equivDD:"⩸",eqvparsl:"⧥",erarr:"⥱",erDot:"≓",escr:"ℯ",Escr:"ℰ",esdot:"≐",Esim:"⩳",esim:"≂",Eta:"Η",eta:"η",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",euro:"€",excl:"!",exist:"∃",Exists:"∃",expectation:"ℰ",exponentiale:"ⅇ",ExponentialE:"ⅇ",fallingdotseq:"≒",Fcy:"Ф",fcy:"ф",female:"♀",ffilig:"ffi",fflig:"ff",ffllig:"ffl",Ffr:"𝔉",ffr:"𝔣",filig:"fi",FilledSmallSquare:"◼",FilledVerySmallSquare:"▪",fjlig:"fj",flat:"♭",fllig:"fl",fltns:"▱",fnof:"ƒ",Fopf:"𝔽",fopf:"𝕗",forall:"∀",ForAll:"∀",fork:"⋔",forkv:"⫙",Fouriertrf:"ℱ",fpartint:"⨍",frac12:"½",frac13:"⅓",frac14:"¼",frac15:"⅕",frac16:"⅙",frac18:"⅛",frac23:"⅔",frac25:"⅖",frac34:"¾",frac35:"⅗",frac38:"⅜",frac45:"⅘",frac56:"⅚",frac58:"⅝",frac78:"⅞",frasl:"⁄",frown:"⌢",fscr:"𝒻",Fscr:"ℱ",gacute:"ǵ",Gamma:"Γ",gamma:"γ",Gammad:"Ϝ",gammad:"ϝ",gap:"⪆",Gbreve:"Ğ",gbreve:"ğ",Gcedil:"Ģ",Gcirc:"Ĝ",gcirc:"ĝ",Gcy:"Г",gcy:"г",Gdot:"Ġ",gdot:"ġ",ge:"≥",gE:"≧",gEl:"⪌",gel:"⋛",geq:"≥",geqq:"≧",geqslant:"⩾",gescc:"⪩",ges:"⩾",gesdot:"⪀",gesdoto:"⪂",gesdotol:"⪄",gesl:"⋛︀",gesles:"⪔",Gfr:"𝔊",gfr:"𝔤",gg:"≫",Gg:"⋙",ggg:"⋙",gimel:"ℷ",GJcy:"Ѓ",gjcy:"ѓ",gla:"⪥",gl:"≷",glE:"⪒",glj:"⪤",gnap:"⪊",gnapprox:"⪊",gne:"⪈",gnE:"≩",gneq:"⪈",gneqq:"≩",gnsim:"⋧",Gopf:"𝔾",gopf:"𝕘",grave:"`",GreaterEqual:"≥",GreaterEqualLess:"⋛",GreaterFullEqual:"≧",GreaterGreater:"⪢",GreaterLess:"≷",GreaterSlantEqual:"⩾",GreaterTilde:"≳",Gscr:"𝒢",gscr:"ℊ",gsim:"≳",gsime:"⪎",gsiml:"⪐",gtcc:"⪧",gtcir:"⩺",gt:">",GT:">",Gt:"≫",gtdot:"⋗",gtlPar:"⦕",gtquest:"⩼",gtrapprox:"⪆",gtrarr:"⥸",gtrdot:"⋗",gtreqless:"⋛",gtreqqless:"⪌",gtrless:"≷",gtrsim:"≳",gvertneqq:"≩︀",gvnE:"≩︀",Hacek:"ˇ",hairsp:" ",half:"½",hamilt:"ℋ",HARDcy:"Ъ",hardcy:"ъ",harrcir:"⥈",harr:"↔",hArr:"⇔",harrw:"↭",Hat:"^",hbar:"ℏ",Hcirc:"Ĥ",hcirc:"ĥ",hearts:"♥",heartsuit:"♥",hellip:"…",hercon:"⊹",hfr:"𝔥",Hfr:"ℌ",HilbertSpace:"ℋ",hksearow:"⤥",hkswarow:"⤦",hoarr:"⇿",homtht:"∻",hookleftarrow:"↩",hookrightarrow:"↪",hopf:"𝕙",Hopf:"ℍ",horbar:"―",HorizontalLine:"─",hscr:"𝒽",Hscr:"ℋ",hslash:"ℏ",Hstrok:"Ħ",hstrok:"ħ",HumpDownHump:"≎",HumpEqual:"≏",hybull:"⁃",hyphen:"‐",Iacute:"Í",iacute:"í",ic:"⁣",Icirc:"Î",icirc:"î",Icy:"И",icy:"и",Idot:"İ",IEcy:"Е",iecy:"е",iexcl:"¡",iff:"⇔",ifr:"𝔦",Ifr:"ℑ",Igrave:"Ì",igrave:"ì",ii:"ⅈ",iiiint:"⨌",iiint:"∭",iinfin:"⧜",iiota:"℩",IJlig:"IJ",ijlig:"ij",Imacr:"Ī",imacr:"ī",image:"ℑ",ImaginaryI:"ⅈ",imagline:"ℐ",imagpart:"ℑ",imath:"ı",Im:"ℑ",imof:"⊷",imped:"Ƶ",Implies:"⇒",incare:"℅",in:"∈",infin:"∞",infintie:"⧝",inodot:"ı",intcal:"⊺",int:"∫",Int:"∬",integers:"ℤ",Integral:"∫",intercal:"⊺",Intersection:"⋂",intlarhk:"⨗",intprod:"⨼",InvisibleComma:"⁣",InvisibleTimes:"⁢",IOcy:"Ё",iocy:"ё",Iogon:"Į",iogon:"į",Iopf:"𝕀",iopf:"𝕚",Iota:"Ι",iota:"ι",iprod:"⨼",iquest:"¿",iscr:"𝒾",Iscr:"ℐ",isin:"∈",isindot:"⋵",isinE:"⋹",isins:"⋴",isinsv:"⋳",isinv:"∈",it:"⁢",Itilde:"Ĩ",itilde:"ĩ",Iukcy:"І",iukcy:"і",Iuml:"Ï",iuml:"ï",Jcirc:"Ĵ",jcirc:"ĵ",Jcy:"Й",jcy:"й",Jfr:"𝔍",jfr:"𝔧",jmath:"ȷ",Jopf:"𝕁",jopf:"𝕛",Jscr:"𝒥",jscr:"𝒿",Jsercy:"Ј",jsercy:"ј",Jukcy:"Є",jukcy:"є",Kappa:"Κ",kappa:"κ",kappav:"ϰ",Kcedil:"Ķ",kcedil:"ķ",Kcy:"К",kcy:"к",Kfr:"𝔎",kfr:"𝔨",kgreen:"ĸ",KHcy:"Х",khcy:"х",KJcy:"Ќ",kjcy:"ќ",Kopf:"𝕂",kopf:"𝕜",Kscr:"𝒦",kscr:"𝓀",lAarr:"⇚",Lacute:"Ĺ",lacute:"ĺ",laemptyv:"⦴",lagran:"ℒ",Lambda:"Λ",lambda:"λ",lang:"⟨",Lang:"⟪",langd:"⦑",langle:"⟨",lap:"⪅",Laplacetrf:"ℒ",laquo:"«",larrb:"⇤",larrbfs:"⤟",larr:"←",Larr:"↞",lArr:"⇐",larrfs:"⤝",larrhk:"↩",larrlp:"↫",larrpl:"⤹",larrsim:"⥳",larrtl:"↢",latail:"⤙",lAtail:"⤛",lat:"⪫",late:"⪭",lates:"⪭︀",lbarr:"⤌",lBarr:"⤎",lbbrk:"❲",lbrace:"{",lbrack:"[",lbrke:"⦋",lbrksld:"⦏",lbrkslu:"⦍",Lcaron:"Ľ",lcaron:"ľ",Lcedil:"Ļ",lcedil:"ļ",lceil:"⌈",lcub:"{",Lcy:"Л",lcy:"л",ldca:"⤶",ldquo:"“",ldquor:"„",ldrdhar:"⥧",ldrushar:"⥋",ldsh:"↲",le:"≤",lE:"≦",LeftAngleBracket:"⟨",LeftArrowBar:"⇤",leftarrow:"←",LeftArrow:"←",Leftarrow:"⇐",LeftArrowRightArrow:"⇆",leftarrowtail:"↢",LeftCeiling:"⌈",LeftDoubleBracket:"⟦",LeftDownTeeVector:"⥡",LeftDownVectorBar:"⥙",LeftDownVector:"⇃",LeftFloor:"⌊",leftharpoondown:"↽",leftharpoonup:"↼",leftleftarrows:"⇇",leftrightarrow:"↔",LeftRightArrow:"↔",Leftrightarrow:"⇔",leftrightarrows:"⇆",leftrightharpoons:"⇋",leftrightsquigarrow:"↭",LeftRightVector:"⥎",LeftTeeArrow:"↤",LeftTee:"⊣",LeftTeeVector:"⥚",leftthreetimes:"⋋",LeftTriangleBar:"⧏",LeftTriangle:"⊲",LeftTriangleEqual:"⊴",LeftUpDownVector:"⥑",LeftUpTeeVector:"⥠",LeftUpVectorBar:"⥘",LeftUpVector:"↿",LeftVectorBar:"⥒",LeftVector:"↼",lEg:"⪋",leg:"⋚",leq:"≤",leqq:"≦",leqslant:"⩽",lescc:"⪨",les:"⩽",lesdot:"⩿",lesdoto:"⪁",lesdotor:"⪃",lesg:"⋚︀",lesges:"⪓",lessapprox:"⪅",lessdot:"⋖",lesseqgtr:"⋚",lesseqqgtr:"⪋",LessEqualGreater:"⋚",LessFullEqual:"≦",LessGreater:"≶",lessgtr:"≶",LessLess:"⪡",lesssim:"≲",LessSlantEqual:"⩽",LessTilde:"≲",lfisht:"⥼",lfloor:"⌊",Lfr:"𝔏",lfr:"𝔩",lg:"≶",lgE:"⪑",lHar:"⥢",lhard:"↽",lharu:"↼",lharul:"⥪",lhblk:"▄",LJcy:"Љ",ljcy:"љ",llarr:"⇇",ll:"≪",Ll:"⋘",llcorner:"⌞",Lleftarrow:"⇚",llhard:"⥫",lltri:"◺",Lmidot:"Ŀ",lmidot:"ŀ",lmoustache:"⎰",lmoust:"⎰",lnap:"⪉",lnapprox:"⪉",lne:"⪇",lnE:"≨",lneq:"⪇",lneqq:"≨",lnsim:"⋦",loang:"⟬",loarr:"⇽",lobrk:"⟦",longleftarrow:"⟵",LongLeftArrow:"⟵",Longleftarrow:"⟸",longleftrightarrow:"⟷",LongLeftRightArrow:"⟷",Longleftrightarrow:"⟺",longmapsto:"⟼",longrightarrow:"⟶",LongRightArrow:"⟶",Longrightarrow:"⟹",looparrowleft:"↫",looparrowright:"↬",lopar:"⦅",Lopf:"𝕃",lopf:"𝕝",loplus:"⨭",lotimes:"⨴",lowast:"∗",lowbar:"_",LowerLeftArrow:"↙",LowerRightArrow:"↘",loz:"◊",lozenge:"◊",lozf:"⧫",lpar:"(",lparlt:"⦓",lrarr:"⇆",lrcorner:"⌟",lrhar:"⇋",lrhard:"⥭",lrm:"‎",lrtri:"⊿",lsaquo:"‹",lscr:"𝓁",Lscr:"ℒ",lsh:"↰",Lsh:"↰",lsim:"≲",lsime:"⪍",lsimg:"⪏",lsqb:"[",lsquo:"‘",lsquor:"‚",Lstrok:"Ł",lstrok:"ł",ltcc:"⪦",ltcir:"⩹",lt:"<",LT:"<",Lt:"≪",ltdot:"⋖",lthree:"⋋",ltimes:"⋉",ltlarr:"⥶",ltquest:"⩻",ltri:"◃",ltrie:"⊴",ltrif:"◂",ltrPar:"⦖",lurdshar:"⥊",luruhar:"⥦",lvertneqq:"≨︀",lvnE:"≨︀",macr:"¯",male:"♂",malt:"✠",maltese:"✠",Map:"⤅",map:"↦",mapsto:"↦",mapstodown:"↧",mapstoleft:"↤",mapstoup:"↥",marker:"▮",mcomma:"⨩",Mcy:"М",mcy:"м",mdash:"—",mDDot:"∺",measuredangle:"∡",MediumSpace:" ",Mellintrf:"ℳ",Mfr:"𝔐",mfr:"𝔪",mho:"℧",micro:"µ",midast:"*",midcir:"⫰",mid:"∣",middot:"·",minusb:"⊟",minus:"−",minusd:"∸",minusdu:"⨪",MinusPlus:"∓",mlcp:"⫛",mldr:"…",mnplus:"∓",models:"⊧",Mopf:"𝕄",mopf:"𝕞",mp:"∓",mscr:"𝓂",Mscr:"ℳ",mstpos:"∾",Mu:"Μ",mu:"μ",multimap:"⊸",mumap:"⊸",nabla:"∇",Nacute:"Ń",nacute:"ń",nang:"∠⃒",nap:"≉",napE:"⩰̸",napid:"≋̸",napos:"ʼn",napprox:"≉",natural:"♮",naturals:"ℕ",natur:"♮",nbsp:" ",nbump:"≎̸",nbumpe:"≏̸",ncap:"⩃",Ncaron:"Ň",ncaron:"ň",Ncedil:"Ņ",ncedil:"ņ",ncong:"≇",ncongdot:"⩭̸",ncup:"⩂",Ncy:"Н",ncy:"н",ndash:"–",nearhk:"⤤",nearr:"↗",neArr:"⇗",nearrow:"↗",ne:"≠",nedot:"≐̸",NegativeMediumSpace:"​",NegativeThickSpace:"​",NegativeThinSpace:"​",NegativeVeryThinSpace:"​",nequiv:"≢",nesear:"⤨",nesim:"≂̸",NestedGreaterGreater:"≫",NestedLessLess:"≪",NewLine:"\n",nexist:"∄",nexists:"∄",Nfr:"𝔑",nfr:"𝔫",ngE:"≧̸",nge:"≱",ngeq:"≱",ngeqq:"≧̸",ngeqslant:"⩾̸",nges:"⩾̸",nGg:"⋙̸",ngsim:"≵",nGt:"≫⃒",ngt:"≯",ngtr:"≯",nGtv:"≫̸",nharr:"↮",nhArr:"⇎",nhpar:"⫲",ni:"∋",nis:"⋼",nisd:"⋺",niv:"∋",NJcy:"Њ",njcy:"њ",nlarr:"↚",nlArr:"⇍",nldr:"‥",nlE:"≦̸",nle:"≰",nleftarrow:"↚",nLeftarrow:"⇍",nleftrightarrow:"↮",nLeftrightarrow:"⇎",nleq:"≰",nleqq:"≦̸",nleqslant:"⩽̸",nles:"⩽̸",nless:"≮",nLl:"⋘̸",nlsim:"≴",nLt:"≪⃒",nlt:"≮",nltri:"⋪",nltrie:"⋬",nLtv:"≪̸",nmid:"∤",NoBreak:"⁠",NonBreakingSpace:" ",nopf:"𝕟",Nopf:"ℕ",Not:"⫬",not:"¬",NotCongruent:"≢",NotCupCap:"≭",NotDoubleVerticalBar:"∦",NotElement:"∉",NotEqual:"≠",NotEqualTilde:"≂̸",NotExists:"∄",NotGreater:"≯",NotGreaterEqual:"≱",NotGreaterFullEqual:"≧̸",NotGreaterGreater:"≫̸",NotGreaterLess:"≹",NotGreaterSlantEqual:"⩾̸",NotGreaterTilde:"≵",NotHumpDownHump:"≎̸",NotHumpEqual:"≏̸",notin:"∉",notindot:"⋵̸",notinE:"⋹̸",notinva:"∉",notinvb:"⋷",notinvc:"⋶",NotLeftTriangleBar:"⧏̸",NotLeftTriangle:"⋪",NotLeftTriangleEqual:"⋬",NotLess:"≮",NotLessEqual:"≰",NotLessGreater:"≸",NotLessLess:"≪̸",NotLessSlantEqual:"⩽̸",NotLessTilde:"≴",NotNestedGreaterGreater:"⪢̸",NotNestedLessLess:"⪡̸",notni:"∌",notniva:"∌",notnivb:"⋾",notnivc:"⋽",NotPrecedes:"⊀",NotPrecedesEqual:"⪯̸",NotPrecedesSlantEqual:"⋠",NotReverseElement:"∌",NotRightTriangleBar:"⧐̸",NotRightTriangle:"⋫",NotRightTriangleEqual:"⋭",NotSquareSubset:"⊏̸",NotSquareSubsetEqual:"⋢",NotSquareSuperset:"⊐̸",NotSquareSupersetEqual:"⋣",NotSubset:"⊂⃒",NotSubsetEqual:"⊈",NotSucceeds:"⊁",NotSucceedsEqual:"⪰̸",NotSucceedsSlantEqual:"⋡",NotSucceedsTilde:"≿̸",NotSuperset:"⊃⃒",NotSupersetEqual:"⊉",NotTilde:"≁",NotTildeEqual:"≄",NotTildeFullEqual:"≇",NotTildeTilde:"≉",NotVerticalBar:"∤",nparallel:"∦",npar:"∦",nparsl:"⫽⃥",npart:"∂̸",npolint:"⨔",npr:"⊀",nprcue:"⋠",nprec:"⊀",npreceq:"⪯̸",npre:"⪯̸",nrarrc:"⤳̸",nrarr:"↛",nrArr:"⇏",nrarrw:"↝̸",nrightarrow:"↛",nRightarrow:"⇏",nrtri:"⋫",nrtrie:"⋭",nsc:"⊁",nsccue:"⋡",nsce:"⪰̸",Nscr:"𝒩",nscr:"𝓃",nshortmid:"∤",nshortparallel:"∦",nsim:"≁",nsime:"≄",nsimeq:"≄",nsmid:"∤",nspar:"∦",nsqsube:"⋢",nsqsupe:"⋣",nsub:"⊄",nsubE:"⫅̸",nsube:"⊈",nsubset:"⊂⃒",nsubseteq:"⊈",nsubseteqq:"⫅̸",nsucc:"⊁",nsucceq:"⪰̸",nsup:"⊅",nsupE:"⫆̸",nsupe:"⊉",nsupset:"⊃⃒",nsupseteq:"⊉",nsupseteqq:"⫆̸",ntgl:"≹",Ntilde:"Ñ",ntilde:"ñ",ntlg:"≸",ntriangleleft:"⋪",ntrianglelefteq:"⋬",ntriangleright:"⋫",ntrianglerighteq:"⋭",Nu:"Ν",nu:"ν",num:"#",numero:"№",numsp:" ",nvap:"≍⃒",nvdash:"⊬",nvDash:"⊭",nVdash:"⊮",nVDash:"⊯",nvge:"≥⃒",nvgt:">⃒",nvHarr:"⤄",nvinfin:"⧞",nvlArr:"⤂",nvle:"≤⃒",nvlt:"<⃒",nvltrie:"⊴⃒",nvrArr:"⤃",nvrtrie:"⊵⃒",nvsim:"∼⃒",nwarhk:"⤣",nwarr:"↖",nwArr:"⇖",nwarrow:"↖",nwnear:"⤧",Oacute:"Ó",oacute:"ó",oast:"⊛",Ocirc:"Ô",ocirc:"ô",ocir:"⊚",Ocy:"О",ocy:"о",odash:"⊝",Odblac:"Ő",odblac:"ő",odiv:"⨸",odot:"⊙",odsold:"⦼",OElig:"Œ",oelig:"œ",ofcir:"⦿",Ofr:"𝔒",ofr:"𝔬",ogon:"˛",Ograve:"Ò",ograve:"ò",ogt:"⧁",ohbar:"⦵",ohm:"Ω",oint:"∮",olarr:"↺",olcir:"⦾",olcross:"⦻",oline:"‾",olt:"⧀",Omacr:"Ō",omacr:"ō",Omega:"Ω",omega:"ω",Omicron:"Ο",omicron:"ο",omid:"⦶",ominus:"⊖",Oopf:"𝕆",oopf:"𝕠",opar:"⦷",OpenCurlyDoubleQuote:"“",OpenCurlyQuote:"‘",operp:"⦹",oplus:"⊕",orarr:"↻",Or:"⩔",or:"∨",ord:"⩝",order:"ℴ",orderof:"ℴ",ordf:"ª",ordm:"º",origof:"⊶",oror:"⩖",orslope:"⩗",orv:"⩛",oS:"Ⓢ",Oscr:"𝒪",oscr:"ℴ",Oslash:"Ø",oslash:"ø",osol:"⊘",Otilde:"Õ",otilde:"õ",otimesas:"⨶",Otimes:"⨷",otimes:"⊗",Ouml:"Ö",ouml:"ö",ovbar:"⌽",OverBar:"‾",OverBrace:"⏞",OverBracket:"⎴",OverParenthesis:"⏜",para:"¶",parallel:"∥",par:"∥",parsim:"⫳",parsl:"⫽",part:"∂",PartialD:"∂",Pcy:"П",pcy:"п",percnt:"%",period:".",permil:"‰",perp:"⊥",pertenk:"‱",Pfr:"𝔓",pfr:"𝔭",Phi:"Φ",phi:"φ",phiv:"ϕ",phmmat:"ℳ",phone:"☎",Pi:"Π",pi:"π",pitchfork:"⋔",piv:"ϖ",planck:"ℏ",planckh:"ℎ",plankv:"ℏ",plusacir:"⨣",plusb:"⊞",pluscir:"⨢",plus:"+",plusdo:"∔",plusdu:"⨥",pluse:"⩲",PlusMinus:"±",plusmn:"±",plussim:"⨦",plustwo:"⨧",pm:"±",Poincareplane:"ℌ",pointint:"⨕",popf:"𝕡",Popf:"ℙ",pound:"£",prap:"⪷",Pr:"⪻",pr:"≺",prcue:"≼",precapprox:"⪷",prec:"≺",preccurlyeq:"≼",Precedes:"≺",PrecedesEqual:"⪯",PrecedesSlantEqual:"≼",PrecedesTilde:"≾",preceq:"⪯",precnapprox:"⪹",precneqq:"⪵",precnsim:"⋨",pre:"⪯",prE:"⪳",precsim:"≾",prime:"′",Prime:"″",primes:"ℙ",prnap:"⪹",prnE:"⪵",prnsim:"⋨",prod:"∏",Product:"∏",profalar:"⌮",profline:"⌒",profsurf:"⌓",prop:"∝",Proportional:"∝",Proportion:"∷",propto:"∝",prsim:"≾",prurel:"⊰",Pscr:"𝒫",pscr:"𝓅",Psi:"Ψ",psi:"ψ",puncsp:" ",Qfr:"𝔔",qfr:"𝔮",qint:"⨌",qopf:"𝕢",Qopf:"ℚ",qprime:"⁗",Qscr:"𝒬",qscr:"𝓆",quaternions:"ℍ",quatint:"⨖",quest:"?",questeq:"≟",quot:'"',QUOT:'"',rAarr:"⇛",race:"∽̱",Racute:"Ŕ",racute:"ŕ",radic:"√",raemptyv:"⦳",rang:"⟩",Rang:"⟫",rangd:"⦒",range:"⦥",rangle:"⟩",raquo:"»",rarrap:"⥵",rarrb:"⇥",rarrbfs:"⤠",rarrc:"⤳",rarr:"→",Rarr:"↠",rArr:"⇒",rarrfs:"⤞",rarrhk:"↪",rarrlp:"↬",rarrpl:"⥅",rarrsim:"⥴",Rarrtl:"⤖",rarrtl:"↣",rarrw:"↝",ratail:"⤚",rAtail:"⤜",ratio:"∶",rationals:"ℚ",rbarr:"⤍",rBarr:"⤏",RBarr:"⤐",rbbrk:"❳",rbrace:"}",rbrack:"]",rbrke:"⦌",rbrksld:"⦎",rbrkslu:"⦐",Rcaron:"Ř",rcaron:"ř",Rcedil:"Ŗ",rcedil:"ŗ",rceil:"⌉",rcub:"}",Rcy:"Р",rcy:"р",rdca:"⤷",rdldhar:"⥩",rdquo:"”",rdquor:"”",rdsh:"↳",real:"ℜ",realine:"ℛ",realpart:"ℜ",reals:"ℝ",Re:"ℜ",rect:"▭",reg:"®",REG:"®",ReverseElement:"∋",ReverseEquilibrium:"⇋",ReverseUpEquilibrium:"⥯",rfisht:"⥽",rfloor:"⌋",rfr:"𝔯",Rfr:"ℜ",rHar:"⥤",rhard:"⇁",rharu:"⇀",rharul:"⥬",Rho:"Ρ",rho:"ρ",rhov:"ϱ",RightAngleBracket:"⟩",RightArrowBar:"⇥",rightarrow:"→",RightArrow:"→",Rightarrow:"⇒",RightArrowLeftArrow:"⇄",rightarrowtail:"↣",RightCeiling:"⌉",RightDoubleBracket:"⟧",RightDownTeeVector:"⥝",RightDownVectorBar:"⥕",RightDownVector:"⇂",RightFloor:"⌋",rightharpoondown:"⇁",rightharpoonup:"⇀",rightleftarrows:"⇄",rightleftharpoons:"⇌",rightrightarrows:"⇉",rightsquigarrow:"↝",RightTeeArrow:"↦",RightTee:"⊢",RightTeeVector:"⥛",rightthreetimes:"⋌",RightTriangleBar:"⧐",RightTriangle:"⊳",RightTriangleEqual:"⊵",RightUpDownVector:"⥏",RightUpTeeVector:"⥜",RightUpVectorBar:"⥔",RightUpVector:"↾",RightVectorBar:"⥓",RightVector:"⇀",ring:"˚",risingdotseq:"≓",rlarr:"⇄",rlhar:"⇌",rlm:"‏",rmoustache:"⎱",rmoust:"⎱",rnmid:"⫮",roang:"⟭",roarr:"⇾",robrk:"⟧",ropar:"⦆",ropf:"𝕣",Ropf:"ℝ",roplus:"⨮",rotimes:"⨵",RoundImplies:"⥰",rpar:")",rpargt:"⦔",rppolint:"⨒",rrarr:"⇉",Rrightarrow:"⇛",rsaquo:"›",rscr:"𝓇",Rscr:"ℛ",rsh:"↱",Rsh:"↱",rsqb:"]",rsquo:"’",rsquor:"’",rthree:"⋌",rtimes:"⋊",rtri:"▹",rtrie:"⊵",rtrif:"▸",rtriltri:"⧎",RuleDelayed:"⧴",ruluhar:"⥨",rx:"℞",Sacute:"Ś",sacute:"ś",sbquo:"‚",scap:"⪸",Scaron:"Š",scaron:"š",Sc:"⪼",sc:"≻",sccue:"≽",sce:"⪰",scE:"⪴",Scedil:"Ş",scedil:"ş",Scirc:"Ŝ",scirc:"ŝ",scnap:"⪺",scnE:"⪶",scnsim:"⋩",scpolint:"⨓",scsim:"≿",Scy:"С",scy:"с",sdotb:"⊡",sdot:"⋅",sdote:"⩦",searhk:"⤥",searr:"↘",seArr:"⇘",searrow:"↘",sect:"§",semi:";",seswar:"⤩",setminus:"∖",setmn:"∖",sext:"✶",Sfr:"𝔖",sfr:"𝔰",sfrown:"⌢",sharp:"♯",SHCHcy:"Щ",shchcy:"щ",SHcy:"Ш",shcy:"ш",ShortDownArrow:"↓",ShortLeftArrow:"←",shortmid:"∣",shortparallel:"∥",ShortRightArrow:"→",ShortUpArrow:"↑",shy:"­",Sigma:"Σ",sigma:"σ",sigmaf:"ς",sigmav:"ς",sim:"∼",simdot:"⩪",sime:"≃",simeq:"≃",simg:"⪞",simgE:"⪠",siml:"⪝",simlE:"⪟",simne:"≆",simplus:"⨤",simrarr:"⥲",slarr:"←",SmallCircle:"∘",smallsetminus:"∖",smashp:"⨳",smeparsl:"⧤",smid:"∣",smile:"⌣",smt:"⪪",smte:"⪬",smtes:"⪬︀",SOFTcy:"Ь",softcy:"ь",solbar:"⌿",solb:"⧄",sol:"/",Sopf:"𝕊",sopf:"𝕤",spades:"♠",spadesuit:"♠",spar:"∥",sqcap:"⊓",sqcaps:"⊓︀",sqcup:"⊔",sqcups:"⊔︀",Sqrt:"√",sqsub:"⊏",sqsube:"⊑",sqsubset:"⊏",sqsubseteq:"⊑",sqsup:"⊐",sqsupe:"⊒",sqsupset:"⊐",sqsupseteq:"⊒",square:"□",Square:"□",SquareIntersection:"⊓",SquareSubset:"⊏",SquareSubsetEqual:"⊑",SquareSuperset:"⊐",SquareSupersetEqual:"⊒",SquareUnion:"⊔",squarf:"▪",squ:"□",squf:"▪",srarr:"→",Sscr:"𝒮",sscr:"𝓈",ssetmn:"∖",ssmile:"⌣",sstarf:"⋆",Star:"⋆",star:"☆",starf:"★",straightepsilon:"ϵ",straightphi:"ϕ",strns:"¯",sub:"⊂",Sub:"⋐",subdot:"⪽",subE:"⫅",sube:"⊆",subedot:"⫃",submult:"⫁",subnE:"⫋",subne:"⊊",subplus:"⪿",subrarr:"⥹",subset:"⊂",Subset:"⋐",subseteq:"⊆",subseteqq:"⫅",SubsetEqual:"⊆",subsetneq:"⊊",subsetneqq:"⫋",subsim:"⫇",subsub:"⫕",subsup:"⫓",succapprox:"⪸",succ:"≻",succcurlyeq:"≽",Succeeds:"≻",SucceedsEqual:"⪰",SucceedsSlantEqual:"≽",SucceedsTilde:"≿",succeq:"⪰",succnapprox:"⪺",succneqq:"⪶",succnsim:"⋩",succsim:"≿",SuchThat:"∋",sum:"∑",Sum:"∑",sung:"♪",sup1:"¹",sup2:"²",sup3:"³",sup:"⊃",Sup:"⋑",supdot:"⪾",supdsub:"⫘",supE:"⫆",supe:"⊇",supedot:"⫄",Superset:"⊃",SupersetEqual:"⊇",suphsol:"⟉",suphsub:"⫗",suplarr:"⥻",supmult:"⫂",supnE:"⫌",supne:"⊋",supplus:"⫀",supset:"⊃",Supset:"⋑",supseteq:"⊇",supseteqq:"⫆",supsetneq:"⊋",supsetneqq:"⫌",supsim:"⫈",supsub:"⫔",supsup:"⫖",swarhk:"⤦",swarr:"↙",swArr:"⇙",swarrow:"↙",swnwar:"⤪",szlig:"ß",Tab:"\t",target:"⌖",Tau:"Τ",tau:"τ",tbrk:"⎴",Tcaron:"Ť",tcaron:"ť",Tcedil:"Ţ",tcedil:"ţ",Tcy:"Т",tcy:"т",tdot:"⃛",telrec:"⌕",Tfr:"𝔗",tfr:"𝔱",there4:"∴",therefore:"∴",Therefore:"∴",Theta:"Θ",theta:"θ",thetasym:"ϑ",thetav:"ϑ",thickapprox:"≈",thicksim:"∼",ThickSpace:"  ",ThinSpace:" ",thinsp:" ",thkap:"≈",thksim:"∼",THORN:"Þ",thorn:"þ",tilde:"˜",Tilde:"∼",TildeEqual:"≃",TildeFullEqual:"≅",TildeTilde:"≈",timesbar:"⨱",timesb:"⊠",times:"×",timesd:"⨰",tint:"∭",toea:"⤨",topbot:"⌶",topcir:"⫱",top:"⊤",Topf:"𝕋",topf:"𝕥",topfork:"⫚",tosa:"⤩",tprime:"‴",trade:"™",TRADE:"™",triangle:"▵",triangledown:"▿",triangleleft:"◃",trianglelefteq:"⊴",triangleq:"≜",triangleright:"▹",trianglerighteq:"⊵",tridot:"◬",trie:"≜",triminus:"⨺",TripleDot:"⃛",triplus:"⨹",trisb:"⧍",tritime:"⨻",trpezium:"⏢",Tscr:"𝒯",tscr:"𝓉",TScy:"Ц",tscy:"ц",TSHcy:"Ћ",tshcy:"ћ",Tstrok:"Ŧ",tstrok:"ŧ",twixt:"≬",twoheadleftarrow:"↞",twoheadrightarrow:"↠",Uacute:"Ú",uacute:"ú",uarr:"↑",Uarr:"↟",uArr:"⇑",Uarrocir:"⥉",Ubrcy:"Ў",ubrcy:"ў",Ubreve:"Ŭ",ubreve:"ŭ",Ucirc:"Û",ucirc:"û",Ucy:"У",ucy:"у",udarr:"⇅",Udblac:"Ű",udblac:"ű",udhar:"⥮",ufisht:"⥾",Ufr:"𝔘",ufr:"𝔲",Ugrave:"Ù",ugrave:"ù",uHar:"⥣",uharl:"↿",uharr:"↾",uhblk:"▀",ulcorn:"⌜",ulcorner:"⌜",ulcrop:"⌏",ultri:"◸",Umacr:"Ū",umacr:"ū",uml:"¨",UnderBar:"_",UnderBrace:"⏟",UnderBracket:"⎵",UnderParenthesis:"⏝",Union:"⋃",UnionPlus:"⊎",Uogon:"Ų",uogon:"ų",Uopf:"𝕌",uopf:"𝕦",UpArrowBar:"⤒",uparrow:"↑",UpArrow:"↑",Uparrow:"⇑",UpArrowDownArrow:"⇅",updownarrow:"↕",UpDownArrow:"↕",Updownarrow:"⇕",UpEquilibrium:"⥮",upharpoonleft:"↿",upharpoonright:"↾",uplus:"⊎",UpperLeftArrow:"↖",UpperRightArrow:"↗",upsi:"υ",Upsi:"ϒ",upsih:"ϒ",Upsilon:"Υ",upsilon:"υ",UpTeeArrow:"↥",UpTee:"⊥",upuparrows:"⇈",urcorn:"⌝",urcorner:"⌝",urcrop:"⌎",Uring:"Ů",uring:"ů",urtri:"◹",Uscr:"𝒰",uscr:"𝓊",utdot:"⋰",Utilde:"Ũ",utilde:"ũ",utri:"▵",utrif:"▴",uuarr:"⇈",Uuml:"Ü",uuml:"ü",uwangle:"⦧",vangrt:"⦜",varepsilon:"ϵ",varkappa:"ϰ",varnothing:"∅",varphi:"ϕ",varpi:"ϖ",varpropto:"∝",varr:"↕",vArr:"⇕",varrho:"ϱ",varsigma:"ς",varsubsetneq:"⊊︀",varsubsetneqq:"⫋︀",varsupsetneq:"⊋︀",varsupsetneqq:"⫌︀",vartheta:"ϑ",vartriangleleft:"⊲",vartriangleright:"⊳",vBar:"⫨",Vbar:"⫫",vBarv:"⫩",Vcy:"В",vcy:"в",vdash:"⊢",vDash:"⊨",Vdash:"⊩",VDash:"⊫",Vdashl:"⫦",veebar:"⊻",vee:"∨",Vee:"⋁",veeeq:"≚",vellip:"⋮",verbar:"|",Verbar:"‖",vert:"|",Vert:"‖",VerticalBar:"∣",VerticalLine:"|",VerticalSeparator:"❘",VerticalTilde:"≀",VeryThinSpace:" ",Vfr:"𝔙",vfr:"𝔳",vltri:"⊲",vnsub:"⊂⃒",vnsup:"⊃⃒",Vopf:"𝕍",vopf:"𝕧",vprop:"∝",vrtri:"⊳",Vscr:"𝒱",vscr:"𝓋",vsubnE:"⫋︀",vsubne:"⊊︀",vsupnE:"⫌︀",vsupne:"⊋︀",Vvdash:"⊪",vzigzag:"⦚",Wcirc:"Ŵ",wcirc:"ŵ",wedbar:"⩟",wedge:"∧",Wedge:"⋀",wedgeq:"≙",weierp:"℘",Wfr:"𝔚",wfr:"𝔴",Wopf:"𝕎",wopf:"𝕨",wp:"℘",wr:"≀",wreath:"≀",Wscr:"𝒲",wscr:"𝓌",xcap:"⋂",xcirc:"◯",xcup:"⋃",xdtri:"▽",Xfr:"𝔛",xfr:"𝔵",xharr:"⟷",xhArr:"⟺",Xi:"Ξ",xi:"ξ",xlarr:"⟵",xlArr:"⟸",xmap:"⟼",xnis:"⋻",xodot:"⨀",Xopf:"𝕏",xopf:"𝕩",xoplus:"⨁",xotime:"⨂",xrarr:"⟶",xrArr:"⟹",Xscr:"𝒳",xscr:"𝓍",xsqcup:"⨆",xuplus:"⨄",xutri:"△",xvee:"⋁",xwedge:"⋀",Yacute:"Ý",yacute:"ý",YAcy:"Я",yacy:"я",Ycirc:"Ŷ",ycirc:"ŷ",Ycy:"Ы",ycy:"ы",yen:"¥",Yfr:"𝔜",yfr:"𝔶",YIcy:"Ї",yicy:"ї",Yopf:"𝕐",yopf:"𝕪",Yscr:"𝒴",yscr:"𝓎",YUcy:"Ю",yucy:"ю",yuml:"ÿ",Yuml:"Ÿ",Zacute:"Ź",zacute:"ź",Zcaron:"Ž",zcaron:"ž",Zcy:"З",zcy:"з",Zdot:"Ż",zdot:"ż",zeetrf:"ℨ",ZeroWidthSpace:"​",Zeta:"Ζ",zeta:"ζ",zfr:"𝔷",Zfr:"ℨ",ZHcy:"Ж",zhcy:"ж",zigrarr:"⇝",zopf:"𝕫",Zopf:"ℤ",Zscr:"𝒵",zscr:"𝓏",zwj:"‍",zwnj:"‌"}},function(e,t){e.exports={amp:"&",apos:"'",gt:">",lt:"<",quot:'"'}},function(e,t,n){"use strict";var r=n(722),i=n(65),o=n(115),a=Array.prototype.indexOf,s=Object.prototype.hasOwnProperty,u=Math.abs,l=Math.floor;e.exports=function(e){var t,n,c,p;if(!r(e))return a.apply(this,arguments);for(n=i(o(this).length),c=arguments[1],c=isNaN(c)?0:c>=0?l(c):i(this.length)-l(u(c)),t=c;t<n;++t)if(s.call(this,t)&&(p=this[t],r(p)))return t;return-1}},function(e,t,n){"use strict";e.exports=n(713)()?Array.from:n(714)},function(e,t,n){"use strict";function r(e,t){return e===t?0!==e||0!==t||1/e==1/t:e!==e&&t!==t}function i(e,t){if(r(e,t))return!0;if("object"!=typeof e||null===e||"object"!=typeof t||null===t)return!1;var n=Object.keys(e),i=Object.keys(t);if(n.length!==i.length)return!1;for(var a=0;a<n.length;a++)if(!o.call(t,n[a])||!r(e[n[a]],t[n[a]]))return!1;return!0}var o=Object.prototype.hasOwnProperty;e.exports=i},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(765),o=r(i),a=n(768),s=r(a),u=n(767),l=r(u),c=n(769),p=r(c),f=n(770),h=r(f),d=n(771),m=r(d),v=n(772),g=r(v),y=n(773),_=r(y),b=n(774),x=r(b),w=n(775),k=r(w),E=n(776),S=r(E),C=n(778),A=r(C),D=n(766),O=r(D),M=[l.default,s.default,p.default,m.default,g.default,_.default,x.default,k.default,S.default,h.default],T=(0,o.default)({prefixMap:O.default.prefixMap,plugins:M},A.default);t.default=T,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e.charAt(0).toUpperCase()+e.slice(1)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";var r=n(795);e.exports=r},function(e,t,n){"use strict";var r=n(81);e.exports=new r({explicit:[n(813),n(811),n(806)]})},function(e,t,n){var r=n(67),i=n(43),o=r(i,"Map");e.exports=o},function(e,t,n){function r(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}var i=n(916),o=n(917),a=n(918),s=n(919),u=n(920);r.prototype.clear=i,r.prototype.delete=o,r.prototype.get=a,r.prototype.has=s,r.prototype.set=u,e.exports=r},function(e,t,n){function r(e){var t=this.__data__=new i(e);this.size=t.size}var i=n(146),o=n(930),a=n(931),s=n(932),u=n(933),l=n(934);r.prototype.clear=o,r.prototype.delete=a,r.prototype.get=s,r.prototype.has=u,r.prototype.set=l,e.exports=r},function(e,t){function n(e,t){for(var n=-1,r=t.length,i=e.length;++n<r;)e[i+n]=t[n];return e}e.exports=n},function(e,t,n){var r=n(849),i=n(887),o=i(r);e.exports=o},function(e,t,n){function r(e){var t=new e.constructor(e.byteLength);return new i(t).set(new i(e)),t}var i=n(392);e.exports=r},function(e,t,n){var r=n(222),i=r(Object.getPrototypeOf,Object);e.exports=i},function(e,t,n){var r=n(222),i=n(426),o=Object.getOwnPropertySymbols,a=o?r(o,Object):i;e.exports=a},function(e,t,n){function r(e,t){if(i(e))return!1;var n=typeof e;return!("number"!=n&&"symbol"!=n&&"boolean"!=n&&null!=e&&!o(e))||(s.test(e)||!a.test(e)||null!=t&&e in Object(t))}var i=n(20),o=n(155),a=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,s=/^\w*$/;e.exports=r},function(e,t){function n(e,t){return function(n){return e(t(n))}}e.exports=n},function(e,t,n){var r=n(890),i=n(945),o=r(i);e.exports=o},function(e,t,n){function r(e,t,n){var r=null==e?void 0:i(e,t);return void 0===r?n:r}var i=n(150);e.exports=r},function(e,t){function n(e){return e}e.exports=n},function(e,t,n){var r=n(851),i=n(68),o=Object.prototype,a=o.hasOwnProperty,s=o.propertyIsEnumerable,u=r(function(){return arguments}())?r:function(e){return i(e)&&a.call(e,"callee")&&!s.call(e,"callee")};e.exports=u},function(e,t,n){(function(e){var r=n(43),i=n(957),o="object"==typeof t&&t&&!t.nodeType&&t,a=o&&"object"==typeof e&&e&&!e.nodeType&&e,s=a&&a.exports===o,u=s?r.Buffer:void 0,l=u?u.isBuffer:void 0,c=l||i;e.exports=c}).call(t,n(72)(e))},function(e,t){function n(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=r}var r=9007199254740991;e.exports=n},function(e,t,n){"use strict";(function(t,n){var r,i;r=function(e){if("function"!=typeof e)throw new TypeError(e+" is not a function");return e},i=function(e){var t,n,i=document.createTextNode(""),o=0;return new e(function(){var e;if(t)n&&(t=n.concat(t));else{if(!n)return;t=n}if(n=t,t=null,"function"==typeof n)return e=n,n=null,void e();for(i.data=o=++o%2;n;)e=n.shift(),n.length||(n=null),e()}).observe(i,{characterData:!0}),function(e){if(r(e),t)return void("function"==typeof t?t=[t,e]:t.push(e));t=e,i.data=o=++o%2}},e.exports=function(){if("object"==typeof t&&t&&"function"==typeof t.nextTick)return t.nextTick;if("object"==typeof document&&document){if("function"==typeof MutationObserver)return i(MutationObserver);if("function"==typeof WebKitMutationObserver)return i(WebKitMutationObserver)}return"function"==typeof n?function(e){n(r(e))}:"function"==typeof setTimeout||"object"==typeof setTimeout?function(e){setTimeout(r(e),0)}:null}()}).call(t,n(33),n(496).setImmediate)},function(e,t,n){(function(e){function n(e,t){for(var n=0,r=e.length-1;r>=0;r--){var i=e[r];"."===i?e.splice(r,1):".."===i?(e.splice(r,1),n++):n&&(e.splice(r,1),n--)}if(t)for(;n--;n)e.unshift("..");return e}function r(e,t){if(e.filter)return e.filter(t);for(var n=[],r=0;r<e.length;r++)t(e[r],r,e)&&n.push(e[r]);return n}var i=/^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/,o=function(e){return i.exec(e).slice(1)};t.resolve=function(){for(var t="",i=!1,o=arguments.length-1;o>=-1&&!i;o--){var a=o>=0?arguments[o]:e.cwd();if("string"!=typeof a)throw new TypeError("Arguments to path.resolve must be strings");a&&(t=a+"/"+t,i="/"===a.charAt(0))}return t=n(r(t.split("/"),function(e){return!!e}),!i).join("/"),(i?"/":"")+t||"."},t.normalize=function(e){var i=t.isAbsolute(e),o="/"===a(e,-1);return e=n(r(e.split("/"),function(e){return!!e}),!i).join("/"),e||i||(e="."),e&&o&&(e+="/"),(i?"/":"")+e},t.isAbsolute=function(e){return"/"===e.charAt(0)},t.join=function(){var e=Array.prototype.slice.call(arguments,0);return t.normalize(r(e,function(e,t){if("string"!=typeof e)throw new TypeError("Arguments to path.join must be strings");return e}).join("/"))},t.relative=function(e,n){function r(e){for(var t=0;t<e.length&&""===e[t];t++);for(var n=e.length-1;n>=0&&""===e[n];n--);return t>n?[]:e.slice(t,n-t+1)}e=t.resolve(e).substr(1),n=t.resolve(n).substr(1);for(var i=r(e.split("/")),o=r(n.split("/")),a=Math.min(i.length,o.length),s=a,u=0;u<a;u++)if(i[u]!==o[u]){s=u;break}for(var l=[],u=s;u<i.length;u++)l.push("..");return l=l.concat(o.slice(s)),l.join("/")},t.sep="/",t.delimiter=":",t.dirname=function(e){var t=o(e),n=t[0],r=t[1];return n||r?(r&&(r=r.substr(0,r.length-1)),n+r):"."},t.basename=function(e,t){var n=o(e)[2];return t&&n.substr(-1*t.length)===t&&(n=n.substr(0,n.length-t.length)),n},t.extname=function(e){return o(e)[3]};var a="b"==="ab".substr(-1)?function(e,t,n){return e.substr(t,n)}:function(e,t,n){return t<0&&(t=e.length+t),e.substr(t,n)}}).call(t,n(33))},function(e,t,n){(function(t){(function(){var n,r,i;"undefined"!=typeof performance&&null!==performance&&performance.now?e.exports=function(){return performance.now()}:void 0!==t&&null!==t&&t.hrtime?(e.exports=function(){return(n()-i)/1e6},r=t.hrtime,n=function(){var e;return e=r(),1e9*e[0]+e[1]},i=n()):Date.now?(e.exports=function(){return Date.now()-i},i=Date.now()):(e.exports=function(){return(new Date).getTime()-i},i=(new Date).getTime())}).call(this)}).call(t,n(33))},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=n(235),s=function(e){return e&&e.__esModule?e:{default:e}}(a),u=function(e){function t(n){r(this,t);var o=i(this,e.call(this,n));return o.type="comment",o}return o(t,e),t}(s.default);t.default=u,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function s(e){return e.map(function(e){return e.nodes&&(e.nodes=s(e.nodes)),delete e.source,e})}t.__esModule=!0;var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),l=n(234),c=r(l),p=n(232),f=r(p),h=n(235),d=r(h),m=function(e){function t(){return i(this,t),o(this,e.apply(this,arguments))}return a(t,e),t.prototype.push=function(e){return e.parent=this,this.nodes.push(e),this},t.prototype.each=function(e){this.lastEach||(this.lastEach=0),this.indexes||(this.indexes={}),this.lastEach+=1;var t=this.lastEach;if(this.indexes[t]=0,this.nodes){for(var n=void 0,r=void 0;this.indexes[t]<this.nodes.length&&(n=this.indexes[t],!1!==(r=e(this.nodes[n],n)));)this.indexes[t]+=1;return delete this.indexes[t],r}},t.prototype.walk=function(e){return this.each(function(t,n){var r=e(t,n);return!1!==r&&t.walk&&(r=t.walk(e)),r})},t.prototype.walkDecls=function(e,t){return t?e instanceof RegExp?this.walk(function(n,r){if("decl"===n.type&&e.test(n.prop))return t(n,r)}):this.walk(function(n,r){if("decl"===n.type&&n.prop===e)return t(n,r)}):(t=e,this.walk(function(e,n){if("decl"===e.type)return t(e,n)}))},t.prototype.walkRules=function(e,t){return t?e instanceof RegExp?this.walk(function(n,r){if("rule"===n.type&&e.test(n.selector))return t(n,r)}):this.walk(function(n,r){if("rule"===n.type&&n.selector===e)return t(n,r)}):(t=e,this.walk(function(e,n){if("rule"===e.type)return t(e,n)}))},t.prototype.walkAtRules=function(e,t){return t?e instanceof RegExp?this.walk(function(n,r){if("atrule"===n.type&&e.test(n.name))return t(n,r)}):this.walk(function(n,r){if("atrule"===n.type&&n.name===e)return t(n,r)}):(t=e,this.walk(function(e,n){if("atrule"===e.type)return t(e,n)}))},t.prototype.walkComments=function(e){return this.walk(function(t,n){if("comment"===t.type)return e(t,n)})},t.prototype.append=function(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];for(var r=t,i=Array.isArray(r),o=0,r=i?r:r[Symbol.iterator]();;){var a;if(i){if(o>=r.length)break;a=r[o++]}else{if(o=r.next(),o.done)break;a=o.value}for(var s=a,u=this.normalize(s,this.last),l=u,c=Array.isArray(l),p=0,l=c?l:l[Symbol.iterator]();;){var f;if(c){if(p>=l.length)break;f=l[p++]}else{if(p=l.next(),p.done)break;f=p.value}var h=f;this.nodes.push(h)}}return this},t.prototype.prepend=function(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];t=t.reverse();for(var r=t,i=Array.isArray(r),o=0,r=i?r:r[Symbol.iterator]();;){var a;if(i){if(o>=r.length)break;a=r[o++]}else{if(o=r.next(),o.done)break;a=o.value}for(var s=a,u=this.normalize(s,this.first,"prepend").reverse(),l=u,c=Array.isArray(l),p=0,l=c?l:l[Symbol.iterator]();;){var f;if(c){if(p>=l.length)break;f=l[p++]}else{if(p=l.next(),p.done)break;f=p.value}var h=f;this.nodes.unshift(h)}for(var d in this.indexes)this.indexes[d]=this.indexes[d]+u.length}return this},t.prototype.cleanRaws=function(t){if(e.prototype.cleanRaws.call(this,t),this.nodes)for(var n=this.nodes,r=Array.isArray(n),i=0,n=r?n:n[Symbol.iterator]();;){var o;if(r){if(i>=n.length)break;o=n[i++]}else{if(i=n.next(),i.done)break;o=i.value}var a=o;a.cleanRaws(t)}},t.prototype.insertBefore=function(e,t){e=this.index(e);for(var n=0===e&&"prepend",r=this.normalize(t,this.nodes[e],n).reverse(),i=r,o=Array.isArray(i),a=0,i=o?i:i[Symbol.iterator]();;){var s;if(o){if(a>=i.length)break;s=i[a++]}else{if(a=i.next(),a.done)break;s=a.value}var u=s;this.nodes.splice(e,0,u)}var l=void 0;for(var c in this.indexes)l=this.indexes[c],e<=l&&(this.indexes[c]=l+r.length);return this},t.prototype.insertAfter=function(e,t){e=this.index(e);for(var n=this.normalize(t,this.nodes[e]).reverse(),r=n,i=Array.isArray(r),o=0,r=i?r:r[Symbol.iterator]();;){var a;if(i){if(o>=r.length)break;a=r[o++]}else{if(o=r.next(),o.done)break;a=o.value}var s=a;this.nodes.splice(e+1,0,s)}var u=void 0;for(var l in this.indexes)u=this.indexes[l],e<u&&(this.indexes[l]=u+n.length);return this},t.prototype.removeChild=function(e){e=this.index(e),this.nodes[e].parent=void 0,this.nodes.splice(e,1);var t=void 0;for(var n in this.indexes)(t=this.indexes[n])>=e&&(this.indexes[n]=t-1);return this},t.prototype.removeAll=function(){for(var e=this.nodes,t=Array.isArray(e),n=0,e=t?e:e[Symbol.iterator]();;){var r;if(t){if(n>=e.length)break;r=e[n++]}else{if(n=e.next(),n.done)break;r=n.value}r.parent=void 0}return this.nodes=[],this},t.prototype.replaceValues=function(e,t,n){return n||(n=t,t={}),this.walkDecls(function(r){t.props&&-1===t.props.indexOf(r.prop)||t.fast&&-1===r.value.indexOf(t.fast)||(r.value=r.value.replace(e,n))}),this},t.prototype.every=function(e){return this.nodes.every(e)},t.prototype.some=function(e){return this.nodes.some(e)},t.prototype.index=function(e){return"number"==typeof e?e:this.nodes.indexOf(e)},t.prototype.normalize=function(e,t){var r=this;if("string"==typeof e){e=s(n(236)(e).nodes)}else if(Array.isArray(e)){e=e.slice(0);for(var i=e,o=Array.isArray(i),a=0,i=o?i:i[Symbol.iterator]();;){var u;if(o){if(a>=i.length)break;u=i[a++]}else{if(a=i.next(),a.done)break;u=a.value}var l=u;l.parent&&l.parent.removeChild(l,"ignore")}}else if("root"===e.type){e=e.nodes.slice(0);for(var p=e,h=Array.isArray(p),d=0,p=h?p:p[Symbol.iterator]();;){var m;if(h){if(d>=p.length)break;m=p[d++]}else{if(d=p.next(),d.done)break;m=d.value}var v=m;v.parent&&v.parent.removeChild(v,"ignore")}}else if(e.type)e=[e];else if(e.prop){if(void 0===e.value)throw new Error("Value field is missed in node creation");"string"!=typeof e.value&&(e.value=String(e.value)),e=[new c.default(e)]}else if(e.selector){var g=n(157);e=[new g(e)]}else if(e.name){var y=n(156);e=[new y(e)]}else{if(!e.text)throw new Error("Unknown node type in node creation");e=[new f.default(e)]}return e.map(function(e){return"function"!=typeof e.before&&(e=r.rebuild(e)),e.parent&&e.parent.removeChild(e),void 0===e.raws.before&&t&&void 0!==t.raws.before&&(e.raws.before=t.raws.before.replace(/[^\s]/g,"")),e.parent=r,e})},t.prototype.rebuild=function(e,t){var r=this,i=void 0;if("root"===e.type){var o=n(237);i=new o}else if("atrule"===e.type){var a=n(156);i=new a}else if("rule"===e.type){var s=n(157);i=new s}else"decl"===e.type?i=new c.default:"comment"===e.type&&(i=new f.default);for(var u in e)"nodes"===u?i.nodes=e.nodes.map(function(e){return r.rebuild(e,i)}):"parent"===u&&t?i.parent=t:e.hasOwnProperty(u)&&(i[u]=e[u]);return i},u(t,[{key:"first",get:function(){if(this.nodes)return this.nodes[0]}},{key:"last",get:function(){if(this.nodes)return this.nodes[this.nodes.length-1]}}]),t}(d.default);t.default=m,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=n(235),s=function(e){return e&&e.__esModule?e:{default:e}}(a),u=function(e){function t(n){r(this,t);var o=i(this,e.call(this,n));return o.type="decl",o}return o(t,e),t}(s.default);t.default=u,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a=n(432),s=r(a),u=n(437),l=r(u),c=n(238),p=r(c),f=n(987),h=r(f),d=function e(t,n){var r=new t.constructor;for(var i in t)if(t.hasOwnProperty(i)){var a=t[i],s=void 0===a?"undefined":o(a);"parent"===i&&"object"===s?n&&(r[i]=n):"source"===i?r[i]=a:a instanceof Array?r[i]=a.map(function(t){return e(t,r)}):("object"===s&&null!==a&&(a=e(a)),r[i]=a)}return r},m=function(){function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};if(i(this,e),this.raws={},"object"!==(void 0===t?"undefined":o(t))&&void 0!==t)throw new Error("PostCSS nodes constructor accepts object, not "+JSON.stringify(t));for(var n in t)this[n]=t[n]}return e.prototype.error=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(this.source){var n=this.positionBy(t);return this.source.input.error(e,n.line,n.column,t)}return new s.default(e)},e.prototype.warn=function(e,t,n){var r={node:this};for(var i in n)r[i]=n[i];return e.warn(t,r)},e.prototype.remove=function(){return this.parent&&this.parent.removeChild(this),this.parent=void 0,this},e.prototype.toString=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:p.default;e.stringify&&(e=e.stringify);var t="";return e(this,function(e){t+=e}),t},e.prototype.clone=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=d(this);for(var n in e)t[n]=e[n];return t},e.prototype.cloneBefore=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=this.clone(e);return this.parent.insertBefore(this,t),t},e.prototype.cloneAfter=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=this.clone(e);return this.parent.insertAfter(this,t),t},e.prototype.replaceWith=function(){if(this.parent){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];for(var r=t,i=Array.isArray(r),o=0,r=i?r:r[Symbol.iterator]();;){var a;if(i){if(o>=r.length)break;a=r[o++]}else{if(o=r.next(),o.done)break;a=o.value}var s=a;this.parent.insertBefore(this,s)}this.remove()}return this},e.prototype.moveTo=function(e){return(0,h.default)("Node#moveTo was deprecated. Use Container#append."),this.cleanRaws(this.root()===e.root()),this.remove(),e.append(this),this},e.prototype.moveBefore=function(e){return(0,h.default)("Node#moveBefore was deprecated. Use Node#before."),this.cleanRaws(this.root()===e.root()),this.remove(),e.parent.insertBefore(e,this),this},e.prototype.moveAfter=function(e){return(0,h.default)("Node#moveAfter was deprecated. Use Node#after."),this.cleanRaws(this.root()===e.root()),this.remove(),e.parent.insertAfter(e,this),this},e.prototype.next=function(){var e=this.parent.index(this);return this.parent.nodes[e+1]},e.prototype.prev=function(){var e=this.parent.index(this);return this.parent.nodes[e-1]},e.prototype.before=function(e){return this.parent.insertBefore(this,e),this},e.prototype.after=function(e){return this.parent.insertAfter(this,e),this},e.prototype.toJSON=function(){var e={};for(var t in this)if(this.hasOwnProperty(t)&&"parent"!==t){var n=this[t];n instanceof Array?e[t]=n.map(function(e){return"object"===(void 0===e?"undefined":o(e))&&e.toJSON?e.toJSON():e}):"object"===(void 0===n?"undefined":o(n))&&n.toJSON?e[t]=n.toJSON():e[t]=n}return e},e.prototype.raw=function(e,t){return(new l.default).raw(this,e,t)},e.prototype.root=function(){for(var e=this;e.parent;)e=e.parent;return e},e.prototype.cleanRaws=function(e){delete this.raws.before,delete this.raws.after,e||delete this.raws.between},e.prototype.positionInside=function(e){for(var t=this.toString(),n=this.source.start.column,r=this.source.start.line,i=0;i<e;i++)"\n"===t[i]?(n=1,r+=1):n+=1;return{line:r,column:n}},e.prototype.positionBy=function(e){var t=this.source.start;if(e.index)t=this.positionInside(e.index);else if(e.word){var n=this.toString().indexOf(e.word);-1!==n&&(t=this.positionInside(n))}return t},e}();t.default=m,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(t&&t.safe)throw new Error('Option safe was removed. Use parser: require("postcss-safe-parser")');var n=new u.default(e,t),r=new a.default(n);try{r.parse()}catch(e){throw"CssSyntaxError"===e.name&&t&&t.from&&(/\.scss$/i.test(t.from)?e.message+="\nYou tried to parse SCSS with the standard CSS parser; try again with the postcss-scss parser":/\.sass/i.test(t.from)?e.message+="\nYou tried to parse Sass with the standard CSS parser; try again with the postcss-sass parser":/\.less$/i.test(t.from)&&(e.message+="\nYou tried to parse Less with the standard CSS parser; try again with the postcss-less parser")),e}return r.root}t.__esModule=!0,t.default=i;var o=n(981),a=r(o),s=n(433),u=r(s);e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=n(233),s=function(e){return e&&e.__esModule?e:{default:e}}(a),u=function(e){function t(n){r(this,t);var o=i(this,e.call(this,n));return o.type="root",o.nodes||(o.nodes=[]),o}return o(t,e),t.prototype.removeChild=function(t,n){var r=this.index(t);return!n&&0===r&&this.nodes.length>1&&(this.nodes[1].raws.before=this.nodes[r].raws.before),e.prototype.removeChild.call(this,t)},t.prototype.normalize=function(t,n,r){var i=e.prototype.normalize.call(this,t);if(n)if("prepend"===r)this.nodes.length>1?n.raws.before=this.nodes[1].raws.before:delete n.raws.before;else if(this.first!==n)for(var o=i,a=Array.isArray(o),s=0,o=a?o:o[Symbol.iterator]();;){var u;if(a){if(s>=o.length)break;u=o[s++]}else{if(s=o.next(),s.done)break;u=s.value}var l=u;l.raws.before=n.raws.before}return i},t.prototype.toResult=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return new(n(434))(new(n(436)),this,e).stringify()},t}(s.default);t.default=u,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){new o.default(t).stringify(e)}t.__esModule=!0,t.default=r;var i=n(437),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){(function(t){for(var r=n(1006),i="undefined"==typeof window?t:window,o=["moz","webkit"],a="AnimationFrame",s=i["request"+a],u=i["cancel"+a]||i["cancelRequest"+a],l=0;!s&&l<o.length;l++)s=i[o[l]+"Request"+a],u=i[o[l]+"Cancel"+a]||i[o[l]+"CancelRequest"+a];if(!s||!u){var c=0,p=0,f=[];s=function(e){if(0===f.length){var t=r(),n=Math.max(0,1e3/60-(t-c));c=n+t,setTimeout(function(){var e=f.slice(0);f.length=0;for(var t=0;t<e.length;t++)if(!e[t].cancelled)try{e[t].callback(c)}catch(e){setTimeout(function(){throw e},0)}},Math.round(n))}return f.push({handle:++p,callback:e,cancelled:!1}),p},u=function(e){for(var t=0;t<f.length;t++)f[t].handle===e&&(f[t].cancelled=!0)}}e.exports=function(e){return s.call(i,e)},e.exports.cancel=function(){u.apply(i,arguments)},e.exports.polyfill=function(e){e||(e=i),e.requestAnimationFrame=s,e.cancelAnimationFrame=u}}).call(t,n(17))},function(e,t,n){"use strict";function r(e,t){return Array.isArray(t)&&(t=t[1]),t?t.nextSibling:e.firstChild}function i(e,t,n){c.insertTreeBefore(e,t,n)}function o(e,t,n){Array.isArray(t)?s(e,t[0],t[1],n):m(e,t,n)}function a(e,t){if(Array.isArray(t)){var n=t[1];t=t[0],u(e,t,n),e.removeChild(n)}e.removeChild(t)}function s(e,t,n,r){for(var i=t;;){var o=i.nextSibling;if(m(e,i,r),i===n)break;i=o}}function u(e,t,n){for(;;){var r=t.nextSibling;if(r===n)break;e.removeChild(r)}}function l(e,t,n){var r=e.parentNode,i=e.nextSibling;i===t?n&&m(r,document.createTextNode(n),i):n?(d(i,n),u(r,i,t)):u(r,e,t)}var c=n(88),p=n(1014),f=(n(14),n(39),n(249)),h=n(163),d=n(469),m=f(function(e,t,n){e.insertBefore(t,n)}),v=p.dangerouslyReplaceNodeWithMarkup,g={dangerouslyReplaceNodeWithMarkup:v,replaceDelimitedText:l,processUpdates:function(e,t){for(var n=0;n<t.length;n++){var s=t[n];switch(s.type){case"INSERT_MARKUP":i(e,s.content,r(e,s.afterNode));break;case"MOVE_EXISTING":o(e,s.fromNode,r(e,s.afterNode));break;case"SET_MARKUP":h(e,s.content);break;case"TEXT_CONTENT":d(e,s.content);break;case"REMOVE_NODE":a(e,s.fromNode)}}}};e.exports=g},function(e,t,n){"use strict";var r={html:"http://www.w3.org/1999/xhtml",mathml:"http://www.w3.org/1998/Math/MathML",svg:"http://www.w3.org/2000/svg"};e.exports=r},function(e,t,n){"use strict";function r(){if(s)for(var e in u){var t=u[e],n=s.indexOf(e);if(n>-1||a("96",e),!l.plugins[n]){t.extractEvents||a("97",e),l.plugins[n]=t;var r=t.eventTypes;for(var o in r)i(r[o],t,o)||a("98",o,e)}}}function i(e,t,n){l.eventNameDispatchConfigs.hasOwnProperty(n)&&a("99",n),l.eventNameDispatchConfigs[n]=e;var r=e.phasedRegistrationNames;if(r){for(var i in r)if(r.hasOwnProperty(i)){var s=r[i];o(s,t,n)}return!0}return!!e.registrationName&&(o(e.registrationName,t,n),!0)}function o(e,t,n){l.registrationNameModules[e]&&a("100",e),l.registrationNameModules[e]=t,l.registrationNameDependencies[e]=t.eventTypes[n].dependencies}var a=n(11),s=(n(8),null),u={},l={plugins:[],eventNameDispatchConfigs:{},registrationNameModules:{},registrationNameDependencies:{},possibleRegistrationNames:null,injectEventPluginOrder:function(e){s&&a("101"),s=Array.prototype.slice.call(e),r()},injectEventPluginsByName:function(e){var t=!1;for(var n in e)if(e.hasOwnProperty(n)){var i=e[n];u.hasOwnProperty(n)&&u[n]===i||(u[n]&&a("102",n),u[n]=i,t=!0)}t&&r()},getPluginModuleForEvent:function(e){var t=e.dispatchConfig;if(t.registrationName)return l.registrationNameModules[t.registrationName]||null;if(void 0!==t.phasedRegistrationNames){var n=t.phasedRegistrationNames;for(var r in n)if(n.hasOwnProperty(r)){var i=l.registrationNameModules[n[r]];if(i)return i}}return null},_resetEventPlugins:function(){s=null;for(var e in u)u.hasOwnProperty(e)&&delete u[e];l.plugins.length=0;var t=l.eventNameDispatchConfigs;for(var n in t)t.hasOwnProperty(n)&&delete t[n];var r=l.registrationNameModules;for(var i in r)r.hasOwnProperty(i)&&delete r[i]}};e.exports=l},function(e,t,n){"use strict";function r(e){return"topMouseUp"===e||"topTouchEnd"===e||"topTouchCancel"===e}function i(e){return"topMouseMove"===e||"topTouchMove"===e}function o(e){return"topMouseDown"===e||"topTouchStart"===e}function a(e,t,n,r){var i=e.type||"unknown-event";e.currentTarget=g.getNodeFromInstance(r),t?m.invokeGuardedCallbackWithCatch(i,n,e):m.invokeGuardedCallback(i,n,e),e.currentTarget=null}function s(e,t){var n=e._dispatchListeners,r=e._dispatchInstances;if(Array.isArray(n))for(var i=0;i<n.length&&!e.isPropagationStopped();i++)a(e,t,n[i],r[i]);else n&&a(e,t,n,r);e._dispatchListeners=null,e._dispatchInstances=null}function u(e){var t=e._dispatchListeners,n=e._dispatchInstances;if(Array.isArray(t)){for(var r=0;r<t.length&&!e.isPropagationStopped();r++)if(t[r](e,n[r]))return n[r]}else if(t&&t(e,n))return n;return null}function l(e){var t=u(e);return e._dispatchInstances=null,e._dispatchListeners=null,t}function c(e){var t=e._dispatchListeners,n=e._dispatchInstances;Array.isArray(t)&&d("103"),e.currentTarget=t?g.getNodeFromInstance(n):null;var r=t?t(e):null;return e.currentTarget=null,e._dispatchListeners=null,e._dispatchInstances=null,r}function p(e){return!!e._dispatchListeners}var f,h,d=n(11),m=n(247),v=(n(8),n(10),{injectComponentTree:function(e){f=e},injectTreeTraversal:function(e){h=e}}),g={isEndish:r,isMoveish:i,isStartish:o,executeDirectDispatch:c,executeDispatchesInOrder:s,executeDispatchesInOrderStopAtTrue:l,hasDispatches:p,getInstanceFromNode:function(e){return f.getInstanceFromNode(e)},getNodeFromInstance:function(e){return f.getNodeFromInstance(e)},isAncestor:function(e,t){return h.isAncestor(e,t)},getLowestCommonAncestor:function(e,t){return h.getLowestCommonAncestor(e,t)},getParentInstance:function(e){return h.getParentInstance(e)},traverseTwoPhase:function(e,t,n){return h.traverseTwoPhase(e,t,n)},traverseEnterLeave:function(e,t,n,r,i){return h.traverseEnterLeave(e,t,n,r,i)},injection:v};e.exports=g},function(e,t,n){"use strict";function r(e){var t={"=":"=0",":":"=2"};return"$"+(""+e).replace(/[=:]/g,function(e){return t[e]})}function i(e){var t=/(=0|=2)/g,n={"=0":"=","=2":":"};return(""+("."===e[0]&&"$"===e[1]?e.substring(2):e.substring(1))).replace(t,function(e){return n[e]})}var o={escape:r,unescape:i};e.exports=o},function(e,t,n){"use strict";function r(e){null!=e.checkedLink&&null!=e.valueLink&&s("87")}function i(e){r(e),(null!=e.value||null!=e.onChange)&&s("88")}function o(e){r(e),(null!=e.checked||null!=e.onChange)&&s("89")}function a(e){if(e){var t=e.getName();if(t)return" Check the render method of `"+t+"`."}return""}var s=n(11),u=n(1043),l=n(443),c=n(92),p=l(c.isValidElement),f=(n(8),n(10),{button:!0,checkbox:!0,image:!0,hidden:!0,radio:!0,reset:!0,submit:!0}),h={value:function(e,t,n){return!e[t]||f[e.type]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `value` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultValue`. Otherwise, set either `onChange` or `readOnly`.")},checked:function(e,t,n){return!e[t]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `checked` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultChecked`. Otherwise, set either `onChange` or `readOnly`.")},onChange:p.func},d={},m={checkPropTypes:function(e,t,n){for(var r in h){if(h.hasOwnProperty(r))var i=h[r](t,r,e,"prop",null,u);if(i instanceof Error&&!(i.message in d)){d[i.message]=!0;a(n)}}},getValue:function(e){return e.valueLink?(i(e),e.valueLink.value):e.value},getChecked:function(e){return e.checkedLink?(o(e),e.checkedLink.value):e.checked},executeOnChange:function(e,t){return e.valueLink?(i(e),e.valueLink.requestChange(t.target.value)):e.checkedLink?(o(e),e.checkedLink.requestChange(t.target.checked)):e.onChange?e.onChange.call(void 0,t):void 0}};e.exports=m},function(e,t,n){"use strict";var r=n(11),i=(n(8),!1),o={replaceNodeWithMarkup:null,processChildrenUpdates:null,injection:{injectEnvironment:function(e){i&&r("104"),o.replaceNodeWithMarkup=e.replaceNodeWithMarkup,o.processChildrenUpdates=e.processChildrenUpdates,i=!0}}};e.exports=o},function(e,t,n){"use strict";function r(e,t,n){try{t(n)}catch(e){null===i&&(i=e)}}var i=null,o={invokeGuardedCallback:r,invokeGuardedCallbackWithCatch:r,rethrowCaughtError:function(){if(i){var e=i;throw i=null,e}}};e.exports=o},function(e,t,n){"use strict";function r(e){u.enqueueUpdate(e)}function i(e){var t=typeof e;if("object"!==t)return t;var n=e.constructor&&e.constructor.name||t,r=Object.keys(e);return r.length>0&&r.length<20?n+" (keys: "+r.join(", ")+")":n}function o(e,t){var n=s.get(e);if(!n){return null}return n}var a=n(11),s=(n(52),n(124)),u=(n(39),n(44)),l=(n(8),n(10),{isMounted:function(e){var t=s.get(e);return!!t&&!!t._renderedComponent},enqueueCallback:function(e,t,n){l.validateCallback(t,n);var i=o(e);if(!i)return null;i._pendingCallbacks?i._pendingCallbacks.push(t):i._pendingCallbacks=[t],r(i)},enqueueCallbackInternal:function(e,t){e._pendingCallbacks?e._pendingCallbacks.push(t):e._pendingCallbacks=[t],r(e)},enqueueForceUpdate:function(e){var t=o(e,"forceUpdate");t&&(t._pendingForceUpdate=!0,r(t))},enqueueReplaceState:function(e,t,n){var i=o(e,"replaceState");i&&(i._pendingStateQueue=[t],i._pendingReplaceState=!0,void 0!==n&&null!==n&&(l.validateCallback(n,"replaceState"),i._pendingCallbacks?i._pendingCallbacks.push(n):i._pendingCallbacks=[n]),r(i))},enqueueSetState:function(e,t){var n=o(e,"setState");if(n){(n._pendingStateQueue||(n._pendingStateQueue=[])).push(t),r(n)}},enqueueElementInternal:function(e,t,n){e._pendingElement=t,e._context=n,r(e)},validateCallback:function(e,t){e&&"function"!=typeof e&&a("122",t,i(e))}});e.exports=l},function(e,t,n){"use strict";var r=function(e){return"undefined"!=typeof MSApp&&MSApp.execUnsafeLocalFunction?function(t,n,r,i){MSApp.execUnsafeLocalFunction(function(){return e(t,n,r,i)})}:e};e.exports=r},function(e,t,n){"use strict";function r(e){var t,n=e.keyCode;return"charCode"in e?0===(t=e.charCode)&&13===n&&(t=13):t=n,t>=32||13===t?t:0}e.exports=r},function(e,t,n){"use strict";function r(e){var t=this,n=t.nativeEvent;if(n.getModifierState)return n.getModifierState(e);var r=o[e];return!!r&&!!n[r]}function i(e){return r}var o={Alt:"altKey",Control:"ctrlKey",Meta:"metaKey",Shift:"shiftKey"};e.exports=i},function(e,t,n){"use strict";function r(e){var t=e.target||e.srcElement||window;return t.correspondingUseElement&&(t=t.correspondingUseElement),3===t.nodeType?t.parentNode:t}e.exports=r},function(e,t,n){"use strict";/**
-+ * Checks if an event is supported in the current execution environment.
-+ *
-+ * NOTE: This will not work correctly for non-generic events such as `change`,
-+ * `reset`, `load`, `error`, and `select`.
-+ *
-+ * Borrows from Modernizr.
-+ *
-+ * @param {string} eventNameSuffix Event name, e.g. "click".
-+ * @param {?boolean} capture Check if the capture phase is supported.
-+ * @return {boolean} True if the event is supported.
-+ * @internal
-+ * @license Modernizr 3.0.0pre (Custom Build) | MIT
-+ */
-+function r(e,t){if(!o.canUseDOM||t&&!("addEventListener"in document))return!1;var n="on"+e,r=n in document;if(!r){var a=document.createElement("div");a.setAttribute(n,"return;"),r="function"==typeof a[n]}return!r&&i&&"wheel"===e&&(r=document.implementation.hasFeature("Events.wheel","3.0")),r}var i,o=n(25);o.canUseDOM&&(i=document.implementation&&document.implementation.hasFeature&&!0!==document.implementation.hasFeature("","")),e.exports=r},function(e,t,n){"use strict";function r(e,t){var n=null===e||!1===e,r=null===t||!1===t;if(n||r)return n===r;var i=typeof e,o=typeof t;return"string"===i||"number"===i?"string"===o||"number"===o:"object"===o&&e.type===t.type&&e.key===t.key}e.exports=r},function(e,t,n){"use strict";var r=(n(13),n(32)),i=(n(10),r);e.exports=i},function(e,t,n){"use strict";function r(e){switch(e._type){case"Document":case"BlockQuote":case"List":case"Item":case"Paragraph":case"Heading":case"Emph":case"Strong":case"Link":case"Image":case"CustomInline":case"CustomBlock":return!0;default:return!1}}var i=function(e,t){this.current=e,this.entering=!0===t},o=function(){var e=this.current,t=this.entering;if(null===e)return null;var n=r(e);return t&&n?e._firstChild?(this.current=e._firstChild,this.entering=!0):this.entering=!1:e===this.root?this.current=null:null===e._next?(this.current=e._parent,this.entering=!1):(this.current=e._next,this.entering=!0),{entering:t,node:e}},a=function(e){return{current:e,root:e,entering:!0,next:o,resumeAt:i}},s=function(e,t){this._type=e,this._parent=null,this._firstChild=null,this._lastChild=null,this._prev=null,this._next=null,this._sourcepos=t,this._lastLineBlank=!1,this._open=!0,this._string_content=null,this._literal=null,this._listData={},this._info=null,this._destination=null,this._title=null,this._isFenced=!1,this._fenceChar=null,this._fenceLength=0,this._fenceOffset=null,this._level=null,this._onEnter=null,this._onExit=null},u=s.prototype;Object.defineProperty(u,"isContainer",{get:function(){return r(this)}}),Object.defineProperty(u,"type",{get:function(){return this._type}}),Object.defineProperty(u,"firstChild",{get:function(){return this._firstChild}}),Object.defineProperty(u,"lastChild",{get:function(){return this._lastChild}}),Object.defineProperty(u,"next",{get:function(){return this._next}}),Object.defineProperty(u,"prev",{get:function(){return this._prev}}),Object.defineProperty(u,"parent",{get:function(){return this._parent}}),Object.defineProperty(u,"sourcepos",{get:function(){return this._sourcepos}}),Object.defineProperty(u,"literal",{get:function(){return this._literal},set:function(e){this._literal=e}}),Object.defineProperty(u,"destination",{get:function(){return this._destination},set:function(e){this._destination=e}}),Object.defineProperty(u,"title",{get:function(){return this._title},set:function(e){this._title=e}}),Object.defineProperty(u,"info",{get:function(){return this._info},set:function(e){this._info=e}}),Object.defineProperty(u,"level",{get:function(){return this._level},set:function(e){this._level=e}}),Object.defineProperty(u,"listType",{get:function(){return this._listData.type},set:function(e){this._listData.type=e}}),Object.defineProperty(u,"listTight",{get:function(){return this._listData.tight},set:function(e){this._listData.tight=e}}),Object.defineProperty(u,"listStart",{get:function(){return this._listData.start},set:function(e){this._listData.start=e}}),Object.defineProperty(u,"listDelimiter",{get:function(){return this._listData.delimiter},set:function(e){this._listData.delimiter=e}}),Object.defineProperty(u,"onEnter",{get:function(){return this._onEnter},set:function(e){this._onEnter=e}}),Object.defineProperty(u,"onExit",{get:function(){return this._onExit},set:function(e){this._onExit=e}}),s.prototype.appendChild=function(e){e.unlink(),e._parent=this,this._lastChild?(this._lastChild._next=e,e._prev=this._lastChild,this._lastChild=e):(this._firstChild=e,this._lastChild=e)},s.prototype.prependChild=function(e){e.unlink(),e._parent=this,this._firstChild?(this._firstChild._prev=e,e._next=this._firstChild,this._firstChild=e):(this._firstChild=e,this._lastChild=e)},s.prototype.unlink=function(){this._prev?this._prev._next=this._next:this._parent&&(this._parent._firstChild=this._next),this._next?this._next._prev=this._prev:this._parent&&(this._parent._lastChild=this._prev),this._parent=null,this._next=null,this._prev=null},s.prototype.insertAfter=function(e){e.unlink(),e._next=this._next,e._next&&(e._next._prev=e),e._prev=this,this._next=e,e._parent=this._parent,e._next||(e._parent._lastChild=e)},s.prototype.insertBefore=function(e){e.unlink(),e._prev=this._prev,e._prev&&(e._prev._next=e),e._next=this,this._prev=e,e._parent=this._parent,e._prev||(e._parent._firstChild=e)},s.prototype.walker=function(){return new a(this)},e.exports=s},function(e,t,n){"use strict";function r(e){var t={};for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=0);return t}t.__esModule=!0,t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){for(var r in t)if(Object.prototype.hasOwnProperty.call(t,r)){if(0!==n[r])return!1;var i="number"==typeof t[r]?t[r]:t[r].val;if(e[r]!==i)return!1}return!0}t.__esModule=!0,t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r,o,a,s){var u=-o*(t-r),l=-a*n,c=u+l,p=n+c*e,f=t+p*e;return Math.abs(p)<s&&Math.abs(f-r)<s?(i[0]=r,i[1]=0,i):(i[0]=f,i[1]=p,i)}t.__esModule=!0,t.default=r;var i=[0,0];e.exports=t.default},function(e,t,n){var r=n(1097),i=n(1);e.exports=function(e,t,n){var i=e[t];if(i){var o=[];if(Object.keys(i).forEach(function(e){-1===r.indexOf(e)&&o.push(e)}),o.length)throw new Error("Prop "+t+" passed to "+n+". Has invalid keys "+o.join(", "))}},e.exports.isRequired=function(t,n,r){if(!t[n])throw new Error("Prop "+n+" passed to "+r+" is required");return e.exports(t,n,r)},e.exports.supportingArrays=i.oneOfType([i.arrayOf(e.exports),e.exports])},function(e,t,n){"use strict";(function(t,r,i){function o(e){var t=this;this.next=null,this.entry=null,this.finish=function(){A(t,e)}}function a(e){return R.from(e)}function s(e){return R.isBuffer(e)||e instanceof j}function u(){}function l(e,t){O=O||n(71),e=e||{},this.objectMode=!!e.objectMode,t instanceof O&&(this.objectMode=this.objectMode||!!e.writableObjectMode);var r=e.highWaterMark,i=this.objectMode?16:16384;this.highWaterMark=r||0===r?r:i,this.highWaterMark=Math.floor(this.highWaterMark),this.finalCalled=!1,this.needDrain=!1,this.ending=!1,this.ended=!1,this.finished=!1,this.destroyed=!1;var a=!1===e.decodeStrings;this.decodeStrings=!a,this.defaultEncoding=e.defaultEncoding||"utf8",this.length=0,this.writing=!1,this.corked=0,this.sync=!0,this.bufferProcessing=!1,this.onwrite=function(e){y(t,e)},this.writecb=null,this.writelen=0,this.bufferedRequest=null,this.lastBufferedRequest=null,this.pendingcb=0,this.prefinished=!1,this.errorEmitted=!1,this.bufferedRequestCount=0,this.corkedRequestsFree=new o(this)}function c(e){if(O=O||n(71),!(N.call(c,this)||this instanceof O))return new c(e);this._writableState=new l(e,this),this.writable=!0,e&&("function"==typeof e.write&&(this._write=e.write),"function"==typeof e.writev&&(this._writev=e.writev),"function"==typeof e.destroy&&(this._destroy=e.destroy),"function"==typeof e.final&&(this._final=e.final)),I.call(this)}function p(e,t){var n=new Error("write after end");e.emit("error",n),D(t,n)}function f(e,t,n,r){var i=!0,o=!1;return null===n?o=new TypeError("May not write null values to stream"):"string"==typeof n||void 0===n||t.objectMode||(o=new TypeError("Invalid non-string/buffer chunk")),o&&(e.emit("error",o),D(r,o),i=!1),i}function h(e,t,n){return e.objectMode||!1===e.decodeStrings||"string"!=typeof t||(t=R.from(t,n)),t}function d(e,t,n,r,i,o){if(!n){var a=h(t,r,i);r!==a&&(n=!0,i="buffer",r=a)}var s=t.objectMode?1:r.length;t.length+=s;var u=t.length<t.highWaterMark;if(u||(t.needDrain=!0),t.writing||t.corked){var l=t.lastBufferedRequest;t.lastBufferedRequest={chunk:r,encoding:i,isBuf:n,callback:o,next:null},l?l.next=t.lastBufferedRequest:t.bufferedRequest=t.lastBufferedRequest,t.bufferedRequestCount+=1}else m(e,t,!1,s,r,i,o);return u}function m(e,t,n,r,i,o,a){t.writelen=r,t.writecb=a,t.writing=!0,t.sync=!0,n?e._writev(i,t.onwrite):e._write(i,o,t.onwrite),t.sync=!1}function v(e,t,n,r,i){--t.pendingcb,n?(D(i,r),D(S,e,t),e._writableState.errorEmitted=!0,e.emit("error",r)):(i(r),e._writableState.errorEmitted=!0,e.emit("error",r),S(e,t))}function g(e){e.writing=!1,e.writecb=null,e.length-=e.writelen,e.writelen=0}function y(e,t){var n=e._writableState,r=n.sync,i=n.writecb;if(g(n),t)v(e,n,r,t,i);else{var o=w(n);o||n.corked||n.bufferProcessing||!n.bufferedRequest||x(e,n),r?M(_,e,n,o,i):_(e,n,o,i)}}function _(e,t,n,r){n||b(e,t),t.pendingcb--,r(),S(e,t)}function b(e,t){0===t.length&&t.needDrain&&(t.needDrain=!1,e.emit("drain"))}function x(e,t){t.bufferProcessing=!0;var n=t.bufferedRequest;if(e._writev&&n&&n.next){var r=t.bufferedRequestCount,i=new Array(r),a=t.corkedRequestsFree;a.entry=n;for(var s=0,u=!0;n;)i[s]=n,n.isBuf||(u=!1),n=n.next,s+=1;i.allBuffers=u,m(e,t,!0,t.length,i,"",a.finish),t.pendingcb++,t.lastBufferedRequest=null,a.next?(t.corkedRequestsFree=a.next,a.next=null):t.corkedRequestsFree=new o(t)}else{for(;n;){var l=n.chunk,c=n.encoding,p=n.callback;if(m(e,t,!1,t.objectMode?1:l.length,l,c,p),n=n.next,t.writing)break}null===n&&(t.lastBufferedRequest=null)}t.bufferedRequestCount=0,t.bufferedRequest=n,t.bufferProcessing=!1}function w(e){return e.ending&&0===e.length&&null===e.bufferedRequest&&!e.finished&&!e.writing}function k(e,t){e._final(function(n){t.pendingcb--,n&&e.emit("error",n),t.prefinished=!0,e.emit("prefinish"),S(e,t)})}function E(e,t){t.prefinished||t.finalCalled||("function"==typeof e._final?(t.pendingcb++,t.finalCalled=!0,D(k,e,t)):(t.prefinished=!0,e.emit("prefinish")))}function S(e,t){var n=w(t);return n&&(E(e,t),0===t.pendingcb&&(t.finished=!0,e.emit("finish"))),n}function C(e,t,n){t.ending=!0,S(e,t),n&&(t.finished?D(n):e.once("finish",n)),t.ended=!0,e.writable=!1}function A(e,t,n){var r=e.entry;for(e.entry=null;r;){var i=r.callback;t.pendingcb--,i(n),r=r.next}t.corkedRequestsFree?t.corkedRequestsFree.next=e:t.corkedRequestsFree=e}var D=n(158);e.exports=c;var O,M=!t.browser&&["v0.10","v0.9."].indexOf(t.version.slice(0,5))>-1?r:D;c.WritableState=l;var T=n(111);T.inherits=n(42);var P={deprecate:n(1191)},I=n(482),R=n(167).Buffer,j=i.Uint8Array||function(){},F=n(481);T.inherits(c,I),l.prototype.getBuffer=function(){for(var e=this.bufferedRequest,t=[];e;)t.push(e),e=e.next;return t},function(){try{Object.defineProperty(l.prototype,"buffer",{get:P.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer instead.","DEP0003")})}catch(e){}}();var N;"function"==typeof Symbol&&Symbol.hasInstance&&"function"==typeof Function.prototype[Symbol.hasInstance]?(N=Function.prototype[Symbol.hasInstance],Object.defineProperty(c,Symbol.hasInstance,{value:function(e){return!!N.call(this,e)||e&&e._writableState instanceof l}})):N=function(e){return e instanceof this},c.prototype.pipe=function(){this.emit("error",new Error("Cannot pipe, not readable"))},c.prototype.write=function(e,t,n){var r=this._writableState,i=!1,o=s(e)&&!r.objectMode;return o&&!R.isBuffer(e)&&(e=a(e)),"function"==typeof t&&(n=t,t=null),o?t="buffer":t||(t=r.defaultEncoding),"function"!=typeof n&&(n=u),r.ended?p(this,n):(o||f(this,r,e,n))&&(r.pendingcb++,i=d(this,r,o,e,t,n)),i},c.prototype.cork=function(){this._writableState.corked++},c.prototype.uncork=function(){var e=this._writableState;e.corked&&(e.corked--,e.writing||e.corked||e.finished||e.bufferProcessing||!e.bufferedRequest||x(this,e))},c.prototype.setDefaultEncoding=function(e){if("string"==typeof e&&(e=e.toLowerCase()),!(["hex","utf8","utf-8","ascii","binary","base64","ucs2","ucs-2","utf16le","utf-16le","raw"].indexOf((e+"").toLowerCase())>-1))throw new TypeError("Unknown encoding: "+e);return this._writableState.defaultEncoding=e,this},c.prototype._write=function(e,t,n){n(new Error("_write() is not implemented"))},c.prototype._writev=null,c.prototype.end=function(e,t,n){var r=this._writableState;"function"==typeof e?(n=e,e=null,t=null):"function"==typeof t&&(n=t,t=null),null!==e&&void 0!==e&&this.write(e,t),r.corked&&(r.corked=1,this.uncork()),r.ending||r.finished||C(this,r,n)},Object.defineProperty(c.prototype,"destroyed",{get:function(){return void 0!==this._writableState&&this._writableState.destroyed},set:function(e){this._writableState&&(this._writableState.destroyed=e)}}),c.prototype.destroy=F.destroy,c.prototype._undestroy=F.undestroy,c.prototype._destroy=function(e,t){this.end(),t(e)}}).call(t,n(33),n(496).setImmediate,n(17))},function(e,t,n){t=e.exports=n(479),t.Stream=t,t.Readable=t,t.Writable=n(261),t.Duplex=n(71),t.Transform=n(480),t.PassThrough=n(1111)},function(e,t,n){"use strict";function r(e,t,n,r,i){this.src=e,this.env=r,this.options=n,this.parser=t,this.tokens=i,this.pos=0,this.posMax=this.src.length,this.level=0,this.pending="",this.pendingLevel=0,this.cache=[],this.isInLabel=!1,this.linkLevel=0,this.linkContent="",this.labelUnmatchedScopes=0}r.prototype.pushPending=function(){this.tokens.push({type:"text",content:this.pending,level:this.pendingLevel}),this.pending=""},r.prototype.push=function(e){this.pending&&this.pushPending(),this.tokens.push(e),this.pendingLevel=this.level},r.prototype.cacheSet=function(e,t){for(var n=this.cache.length;n<=e;n++)this.cache.push(0);this.cache[e]=t},r.prototype.cacheGet=function(e){return e<this.cache.length?this.cache[e]:0},e.exports=r},function(e,t,n){"use strict";function r(e,t){var n;return n=Array.isArray(e)?[]:{},t.push(e),Object.keys(e).forEach(function(i){var o=e[i];if("function"!=typeof o)return o&&"object"==typeof o?-1===t.indexOf(e[i])?void(n[i]=r(e[i],t.slice(0))):void(n[i]="[Circular]"):void(n[i]=o)}),n}e.exports=function(e){if("object"==typeof e){var t=r(e,[]);return"string"==typeof e.name&&(t.name=e.name),"string"==typeof e.message&&(t.message=e.message),"string"==typeof e.stack&&(t.stack=e.stack),t}return"function"==typeof e?"[Function: "+(e.name||"anonymous")+"]":e}},function(e,t,n){"use strict";function r(e){if(!e)return"utf8";for(var t;;)switch(e){case"utf8":case"utf-8":return"utf8";case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return"utf16le";case"latin1":case"binary":return"latin1";case"base64":case"ascii":case"hex":return e;default:if(t)return;e=(""+e).toLowerCase(),t=!0}}function i(e){var t=r(e);if("string"!=typeof t&&(y.isEncoding===_||!_(e)))throw new Error("Unknown encoding: "+e);return t||e}function o(e){this.encoding=i(e);var t;switch(this.encoding){case"utf16le":this.text=f,this.end=h,t=4;break;case"utf8":this.fillLast=l,t=4;break;case"base64":this.text=d,this.end=m,t=3;break;default:return this.write=v,void(this.end=g)}this.lastNeed=0,this.lastTotal=0,this.lastChar=y.allocUnsafe(t)}function a(e){return e<=127?0:e>>5==6?2:e>>4==14?3:e>>3==30?4:-1}function s(e,t,n){var r=t.length-1;if(r<n)return 0;var i=a(t[r]);return i>=0?(i>0&&(e.lastNeed=i-1),i):--r<n?0:(i=a(t[r]))>=0?(i>0&&(e.lastNeed=i-2),i):--r<n?0:(i=a(t[r]),i>=0?(i>0&&(2===i?i=0:e.lastNeed=i-3),i):0)}function u(e,t,n){if(128!=(192&t[0]))return e.lastNeed=0,"�".repeat(n);if(e.lastNeed>1&&t.length>1){if(128!=(192&t[1]))return e.lastNeed=1,"�".repeat(n+1);if(e.lastNeed>2&&t.length>2&&128!=(192&t[2]))return e.lastNeed=2,"�".repeat(n+2)}}function l(e){var t=this.lastTotal-this.lastNeed,n=u(this,e,t);return void 0!==n?n:this.lastNeed<=e.length?(e.copy(this.lastChar,t,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal)):(e.copy(this.lastChar,t,0,e.length),void(this.lastNeed-=e.length))}function c(e,t){var n=s(this,e,t);if(!this.lastNeed)return e.toString("utf8",t);this.lastTotal=n;var r=e.length-(n-this.lastNeed);return e.copy(this.lastChar,0,r),e.toString("utf8",t,r)}function p(e){var t=e&&e.length?this.write(e):"";return this.lastNeed?t+"�".repeat(this.lastTotal-this.lastNeed):t}function f(e,t){if((e.length-t)%2==0){var n=e.toString("utf16le",t);if(n){var r=n.charCodeAt(n.length-1);if(r>=55296&&r<=56319)return this.lastNeed=2,this.lastTotal=4,this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1],n.slice(0,-1)}return n}return this.lastNeed=1,this.lastTotal=2,this.lastChar[0]=e[e.length-1],e.toString("utf16le",t,e.length-1)}function h(e){var t=e&&e.length?this.write(e):"";if(this.lastNeed){var n=this.lastTotal-this.lastNeed;return t+this.lastChar.toString("utf16le",0,n)}return t}function d(e,t){var n=(e.length-t)%3;return 0===n?e.toString("base64",t):(this.lastNeed=3-n,this.lastTotal=3,1===n?this.lastChar[0]=e[e.length-1]:(this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1]),e.toString("base64",t,e.length-n))}function m(e){var t=e&&e.length?this.write(e):"";return this.lastNeed?t+this.lastChar.toString("base64",0,3-this.lastNeed):t}function v(e){return e.toString(this.encoding)}function g(e){return e&&e.length?this.write(e):""}var y=n(167).Buffer,_=y.isEncoding||function(e){switch((e=""+e)&&e.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}};t.StringDecoder=o,o.prototype.write=function(e){if(0===e.length)return"";var t,n;if(this.lastNeed){if(void 0===(t=this.fillLast(e)))return"";n=this.lastNeed,this.lastNeed=0}else n=0;return n<e.length?t?t+this.text(e,n):this.text(e,n):t||""},o.prototype.end=p,o.prototype.text=c,o.prototype.fillLast=function(e){if(this.lastNeed<=e.length)return e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,e.length),this.lastNeed-=e.length}},function(e,t,n){(function(){var e,t,r,i=function(e,t){function n(){this.constructor=e}for(var r in t)o.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},o={}.hasOwnProperty,a=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};t=n(94),r=n(61),e=n(45).YAMLError,this.ResolverError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return i(t,e),t}(e),this.BaseResolver=function(){function e(){this.resolver_exact_paths=[],this.resolver_prefix_paths=[]}var n,i,o;return i="tag:yaml.org,2002:str",o="tag:yaml.org,2002:seq",n="tag:yaml.org,2002:map",e.prototype.yaml_implicit_resolvers={},e.prototype.yaml_path_resolvers={},e.add_implicit_resolver=function(e,t,n){var i,o,a,s,u;for(null==n&&(n=[null]),this.prototype.hasOwnProperty("yaml_implicit_resolvers")||(this.prototype.yaml_implicit_resolvers=r.extend({},this.prototype.yaml_implicit_resolvers)),u=[],a=0,s=n.length;a<s;a++)o=n[a],u.push((null!=(i=this.prototype.yaml_implicit_resolvers)[o]?i[o]:i[o]=[]).push([e,t]));return u},e.prototype.descend_resolver=function(e,t){var n,i,o,a,s,u,l,c,p,f,h,d,m;if(!r.is_empty(this.yaml_path_resolvers)){if(i={},p=[],e)for(n=this.resolver_prefix_paths.length,f=this.resolver_prefix_paths.slice(-1)[0],o=0,u=f.length;o<u;o++)h=f[o],c=h[0],s=h[1],this.check_resolver_prefix(n,c,s,e,t)&&(c.length>n?p.push([c,s]):i[s]=this.yaml_path_resolvers[c][s]);else for(d=this.yaml_path_resolvers,a=0,l=d.length;a<l;a++)m=d[a],c=m[0],s=m[1],c?p.push([c,s]):i[s]=this.yaml_path_resolvers[c][s];return this.resolver_exact_paths.push(i),this.resolver_prefix_paths.push(p)}},e.prototype.ascend_resolver=function(){if(!r.is_empty(this.yaml_path_resolvers))return this.resolver_exact_paths.pop(),this.resolver_prefix_paths.pop()},e.prototype.check_resolver_prefix=function(e,n,r,i,o){var a,s,u;if(u=n[e-1],s=u[0],a=u[1],"string"==typeof s){if(i.tag!==s)return}else if(null!==s&&!(i instanceof s))return;if((!0!==a||null===o)&&(!1!==a&&null!==a||null!==o)){if("string"==typeof a){if(!(o instanceof t.ScalarNode)&&a===o.value)return}else if("number"==typeof a&&a!==o)return;return!0}},e.prototype.resolve=function(e,r,s){var u,l,c,p,f,h,d,m,v,g,y,_;if(e===t.ScalarNode&&s[0]){for(y=""===r?null!=(h=this.yaml_implicit_resolvers[""])?h:[]:null!=(d=this.yaml_implicit_resolvers[r[0]])?d:[],y=y.concat(null!=(m=this.yaml_implicit_resolvers[null])?m:[]),c=0,f=y.length;c<f;c++)if(v=y[c],_=v[0],g=v[1],r.match(g))return _;s=s[1]}u=!0;for(p in this.yaml_path_resolvers)null=={}[p]&&(u=!1);if(!u){if(l=this.resolver_exact_paths.slice(-1)[0],a.call(l,e)>=0)return l[e];if(a.call(l,null)>=0)return l[null]}return e===t.ScalarNode?i:e===t.SequenceNode?o:e===t.MappingNode?n:void 0},e}(),this.Resolver=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return i(t,e),t}(this.BaseResolver),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:bool",/^(?:yes|Yes|YES|true|True|TRUE|on|On|ON|no|No|NO|false|False|FALSE|off|Off|OFF)$/,"yYnNtTfFoO"),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:float",/^(?:[-+]?(?:[0-9][0-9_]*)\.[0-9_]*(?:[eE][-+][0-9]+)?|\.[0-9_]+(?:[eE][-+][0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\.[0-9_]*|[-+]?\.(?:inf|Inf|INF)|\.(?:nan|NaN|NAN))$/,"-+0123456789."),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:int",/^(?:[-+]?0b[01_]+|[-+]?0[0-7_]+|[-+]?(?:0|[1-9][0-9_]*)|[-+]?0x[0-9a-fA-F_]+|[-+]?0o[0-7_]+|[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+)$/,"-+0123456789"),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:merge",/^(?:<<)$/,"<"),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:null",/^(?:~|null|Null|NULL|)$/,["~","n","N",""]),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:timestamp",/^(?:[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]|[0-9][0-9][0-9][0-9]-[0-9][0-9]?-[0-9][0-9]?(?:[Tt]|[\x20\t]+)[0-9][0-9]?:[0-9][0-9]:[0-9][0-9](?:\.[0-9]*)?(?:[\x20\t]*(?:Z|[-+][0-9][0-9]?(?::[0-9][0-9])?))?)$/,"0123456789"),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:value",/^(?:=)$/,"="),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:yaml",/^(?:!|&|\*)$/,"!&*")}).call(this)},function(e,t){(function(){var e=function(e,n){function r(){this.constructor=e}for(var i in n)t.call(n,i)&&(e[i]=n[i]);return r.prototype=n.prototype,e.prototype=new r,e.__super__=n.prototype,e},t={}.hasOwnProperty;this.Token=function(){function e(e,t){this.start_mark=e,this.end_mark=t}return e}(),this.DirectiveToken=function(t){function n(e,t,n,r){this.name=e,this.value=t,this.start_mark=n,this.end_mark=r}return e(n,t),n.prototype.id="<directive>",n}(this.Token),this.DocumentStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<document start>",n}(this.Token),this.DocumentEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<document end>",n}(this.Token),this.StreamStartToken=function(t){function n(e,t,n){this.start_mark=e,this.end_mark=t,this.encoding=n}return e(n,t),n.prototype.id="<stream start>",n}(this.Token),this.StreamEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<stream end>",n}(this.Token),this.BlockSequenceStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<block sequence start>",n}(this.Token),this.BlockMappingStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<block mapping end>",n}(this.Token),this.BlockEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<block end>",n}(this.Token),this.FlowSequenceStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="[",n}(this.Token),this.FlowMappingStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="{",n}(this.Token),this.FlowSequenceEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="]",n}(this.Token),this.FlowMappingEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="}",n}(this.Token),this.KeyToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="?",n}(this.Token),this.ValueToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id=":",n}(this.Token),this.BlockEntryToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="-",n}(this.Token),this.FlowEntryToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id=",",n}(this.Token),this.AliasToken=function(t){function n(e,t,n){this.value=e,this.start_mark=t,this.end_mark=n}return e(n,t),n.prototype.id="<alias>",n}(this.Token),this.AnchorToken=function(t){function n(e,t,n){this.value=e,this.start_mark=t,this.end_mark=n}return e(n,t),n.prototype.id="<anchor>",n}(this.Token),this.TagToken=function(t){function n(e,t,n){this.value=e,this.start_mark=t,this.end_mark=n}return e(n,t),n.prototype.id="<tag>",n}(this.Token),this.ScalarToken=function(t){function n(e,t,n,r,i){this.value=e,this.plain=t,this.start_mark=n,this.end_mark=r,this.style=i}return e(n,t),n.prototype.id="<scalar>",n}(this.Token)}).call(this)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];return t.filter(function(e){return!!e}).join(" ").trim()}Object.defineProperty(t,"__esModule",{value:!0}),t.Collapse=t.Link=t.Select=t.Input=t.TextArea=t.Button=t.Row=t.Col=t.Container=void 0;var o=n(21),a=r(o),s=n(96),u=r(s),l=n(4),c=r(l),p=n(2),f=r(p),h=n(3),d=r(h),m=n(6),v=r(m),g=n(5),y=r(g),_=n(0),b=r(_),x=n(1),w=r(x),k=n(448);(t.Container=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){var e=this.props,t=e.fullscreen,n=e.full,r=(0,u.default)(e,["fullscreen","full"]);if(t)return b.default.createElement("section",r);var o="swagger-container"+(n?"-full":"");return b.default.createElement("section",(0,a.default)({},r,{className:i(r.className,o)}))}}]),t}(b.default.Component)).propTypes={fullscreen:w.default.bool,full:w.default.bool,className:w.default.string};var E={mobile:"",tablet:"-tablet",desktop:"-desktop",large:"-hd"};(t.Col=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){var e=this.props,t=e.hide,n=e.keepContents,r=(e.mobile,e.tablet,e.desktop,e.large,(0,u.default)(e,["hide","keepContents","mobile","tablet","desktop","large"]));if(t&&!n)return b.default.createElement("span",null);var o=[];for(var s in E)if(E.hasOwnProperty(s)){var l=E[s];if(s in this.props){var c=this.props[s];if(c<1){o.push("none"+l);continue}o.push("block"+l),o.push("col-"+c+l)}}var p=i.apply(void 0,[r.className].concat(o));return b.default.createElement("section",(0,a.default)({},r,{style:{display:t?"none":null},className:p}))}}]),t}(b.default.Component)).propTypes={hide:w.default.bool,keepContents:w.default.bool,mobile:w.default.number,tablet:w.default.number,desktop:w.default.number,large:w.default.number,className:w.default.string},(t.Row=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){return b.default.createElement("div",(0,a.default)({},this.props,{className:i(this.props.className,"wrapper")}))}}]),t}(b.default.Component)).propTypes={className:w.default.string};var S=t.Button=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){return b.default.createElement("button",(0,a.default)({},this.props,{className:i(this.props.className,"button")}))}}]),t}(b.default.Component);S.propTypes={className:w.default.string},S.defaultProps={className:""};var C=(t.TextArea=function(e){return b.default.createElement("textarea",e)},t.Input=function(e){return b.default.createElement("input",e)},t.Select=function(e){function t(e,n){(0,f.default)(this,t);var r=(0,v.default)(this,(t.__proto__||(0,c.default)(t)).call(this,e,n));A.call(r);var i=void 0;return i=e.value?e.value:e.multiple?[""]:"",r.state={value:i},r}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){var e=this.props,t=e.allowedValues,n=e.multiple,r=e.allowEmptyValue,i=this.state.value.toJS?this.state.value.toJS():this.state.value;return b.default.createElement("select",{className:this.props.className,multiple:n,value:i,onChange:this.onChange},r?b.default.createElement("option",{value:""},"--"):null,t.map(function(e,t){return b.default.createElement("option",{key:t,value:String(e)},String(e))}))}}]),t}(b.default.Component));C.propTypes={allowedValues:w.default.array,value:w.default.any,onChange:w.default.func,multiple:w.default.bool,allowEmptyValue:w.default.bool,className:w.default.string},C.defaultProps={multiple:!1,allowEmptyValue:!0};var A=function(){var e=this;this.onChange=function(t){var n=e.props,r=n.onChange,i=n.multiple,o=[].slice.call(t.target.options),a=void 0;a=i?o.filter(function(e){return e.selected}).map(function(e){return e.value}):t.target.value,e.setState({value:a}),r&&r(a)}};(t.Link=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){return b.default.createElement("a",(0,a.default)({},this.props,{className:i(this.props.className,"link")}))}}]),t}(b.default.Component)).propTypes={className:w.default.string};var D=function(e){var t=e.children;return b.default.createElement("div",{style:{height:"auto",border:"none",margin:0,padding:0}}," ",t," ")};D.propTypes={children:w.default.node};var O=t.Collapse=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"renderNotAnimated",value:function(){return this.props.isOpened?b.default.createElement(D,null,this.props.children):b.default.createElement("noscript",null)}},{key:"render",value:function(){var e=this.props,t=e.animated,n=e.isOpened,r=e.children;return t?(r=n?r:null,b.default.createElement(k.Collapse,{isOpened:n},b.default.createElement(D,null,r))):this.renderNotAnimated()}}]),t}(b.default.Component);O.propTypes={isOpened:w.default.bool,children:w.default.node.isRequired,animated:w.default.bool},O.defaultProps={isOpened:!1,animated:!1}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1072),_=r(y),b=n(12),x=r(b),w=n(1),k=r(w),E=function(e){function t(){var e,n,r,i;(0,l.default)(this,t);for(var o=arguments.length,a=Array(o),u=0;u<o;u++)a[u]=arguments[u];return n=r=(0,h.default)(this,(e=t.__proto__||(0,s.default)(t)).call.apply(e,[this].concat(a))),r.getModelName=function(e){return-1!==e.indexOf("#/definitions/")?e.replace(/^.*#\/definitions\//,""):-1!==e.indexOf("#/components/schemas/")?e.replace("#/components/schemas/",""):void 0},r.getRefSchema=function(e){return r.props.specSelectors.findDefinition(e)},i=n,(0,h.default)(r,i)}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.getConfigs,r=e.specSelectors,i=e.schema,a=e.required,s=e.name,u=e.isRef,l=e.specPath,c=t("ObjectModel"),p=t("ArrayModel"),f=t("PrimitiveModel"),h="object",d=i&&i.get("$$ref");!s&&d&&(s=this.getModelName(d)),!i&&d&&(i=this.getRefSchema(s));var m=r.isOAS3()&&i.get("deprecated");switch(u=void 0!==u?u:!!d,h=i&&i.get("type")||h){case"object":return g.default.createElement(c,(0,o.default)({className:"object"},this.props,{specPath:l,getConfigs:n,schema:i,name:s,deprecated:m,isRef:u}));case"array":return g.default.createElement(p,(0,o.default)({className:"array"},this.props,{getConfigs:n,schema:i,name:s,deprecated:m,required:a}));case"string":case"number":case"integer":case"boolean":default:return g.default.createElement(f,(0,o.default)({},this.props,{getComponent:t,getConfigs:n,schema:i,name:s,deprecated:m,required:a}))}}}]),t}(_.default);E.propTypes={schema:x.default.orderedMap.isRequired,getComponent:k.default.func.isRequired,getConfigs:k.default.func.isRequired,specSelectors:k.default.object.isRequired,name:k.default.string,isRef:k.default.bool,required:k.default.bool,expandDepth:k.default.number,depth:k.default.number,specPath:x.default.list.isRequired},t.default=E},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.source,n=new h.default({html:!0,typographer:!0,breaks:!0,linkify:!0,linkTarget:"_blank"}).render(t),r=o(n);return t&&n&&r?l.default.createElement("div",{className:"markdown",dangerouslySetInnerHTML:{__html:r}}):null}function o(e){return(0,m.default)(e,v)}Object.defineProperty(t,"__esModule",{value:!0});var a=n(21),s=r(a);t.sanitizer=o;var u=n(0),l=r(u),c=n(1),p=r(c),f=n(1126),h=r(f),d=n(1179),m=r(d);i.propTypes={source:p.default.string.isRequired},t.default=i;var v={allowedTags:m.default.defaults.allowedTags.concat(["h1","h2","img","span"]),allowedAttributes:(0,s.default)({},m.default.defaults.allowedAttributes,{img:m.default.defaults.allowedAttributes.img.concat(["title"]),td:["colspan"],"*":["class"]}),textFilter:function(e){return e.replace(/&quot;/g,'"')}}},function(e,t,n){"use strict";var r=n(9),i=n(1208);i.keys().forEach(function(t){if("./index.js"!==t){var n=i(t);e.exports[(0,r.pascalCaseFilename)(t)]=n.default?n.default:n}})},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){function n(e,t,i){if(!e)return i&&i.start_mark?i.start_mark.line:0;if(t.length&&e.tag===b)for(r=0;r<e.value.length;r++){var o=e.value[r],a=o[0],s=o[1];if(a.value===t[0])return n(s,t.slice(1),e);if(a.value===t[0].replace(/\[.*/,"")){var u=parseInt(t[0].match(/\[(.*)\]/)[1]);if(1===s.value.length&&0!==u&&u)var l=(0,g.default)(s.value[0],{value:u.toString()});else var l=s.value[u];return n(l,t.slice(1),s.value)}}if(t.length&&e.tag===x){var c=e.value[t[0]];if(c&&c.tag)return n(c,t.slice(1),e.value)}return e.tag!==b||Array.isArray(i)?e.start_mark.line+1:e.start_mark.line}if("string"!=typeof e)throw new TypeError("yaml should be a string");if(!(0,m.default)(t))throw new TypeError("path should be an array of strings");var r=0;return n(_(e),t)}function o(e,t){function n(e,o){if(e.tag===b)for(i=0;i<e.value.length;i++){var a=e.value[i],s=a[0],u=a[1];if(s.value===t[0])return t.shift(),n(u,s)}if(e.tag===x){var l=e.value[t[0]];if(l&&l.tag)return t.shift(),n(l,o)}if(t.length)return r;var c={start:{line:e.start_mark.line,column:e.start_mark.column,pointer:e.start_mark.pointer},end:{line:e.end_mark.line,column:e.end_mark.column,pointer:e.end_mark.pointer}};return o&&(c.key_start={line:o.start_mark.line,column:o.start_mark.column,pointer:o.start_mark.pointer},c.key_end={line:o.end_mark.line,column:o.end_mark.column,pointer:o.end_mark.pointer}),c}if("string"!=typeof e)throw new TypeError("yaml should be a string");if(!(0,m.default)(t))throw new TypeError("path should be an array of strings");var r={start:{line:-1,column:-1},end:{line:-1,column:-1}},i=0;return n(_(e))}function a(e,t){function n(e){function r(e){return e.start_mark.line===e.end_mark.line?t.line===e.start_mark.line&&e.start_mark.column<=t.column&&e.end_mark.column>=t.column:t.line===e.start_mark.line?t.column>=e.start_mark.column:t.line===e.end_mark.line?t.column<=e.end_mark.column:e.start_mark.line<t.line&&e.end_mark.line>t.line}var o=0;if(!e||-1===[b,x].indexOf(e.tag))return i;if(e.tag===b)for(o=0;o<e.value.length;o++){var a=e.value[o],s=a[0],u=a[1];if(r(s))return i;if(r(u))return i.push(s.value),n(u)}if(e.tag===x)for(o=0;o<e.value.length;o++){var l=e.value[o];if(r(l))return i.push(o.toString()),n(l)}return i}if("string"!=typeof e)throw new TypeError("yaml should be a string");if("object"!==(void 0===t?"undefined":(0,p.default)(t))||"number"!=typeof t.line||"number"!=typeof t.column)throw new TypeError("position should be an object with line and column properties");try{var r=_(e)}catch(n){return console.error("Error composing AST",n),console.error("Problem area:\n",e.split("\n").slice(t.line-5,t.line+5).join("\n")),null}var i=[];return n(r)}function s(e){return function(){for(var t=arguments.length,n=Array(t),r=0;r<t;r++)n[r]=arguments[r];return new l.default(function(t){return t(e.apply(void 0,n))})}}Object.defineProperty(t,"__esModule",{value:!0}),t.getLineNumberForPathAsync=t.positionRangeForPathAsync=t.pathForPositionAsync=void 0;var u=n(332),l=r(u),c=n(48),p=r(c);t.getLineNumberForPath=i,t.positionRangeForPath=o,t.pathForPosition=a;var f=n(1206),h=r(f),d=n(20),m=r(d),v=n(223),g=r(v),y=n(9),_=(0,y.memoize)(h.default.compose),b="tag:yaml.org,2002:map",x="tag:yaml.org,2002:seq";t.pathForPositionAsync=s(a),t.positionRangeForPathAsync=s(o),t.getLineNumberForPathAsync=s(i)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{fn:{AST:i},components:{JumpToPath:a.default}}};var r=n(272),i=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(r),o=n(274),a=function(e){return e&&e.__esModule?e:{default:e}}(o)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){return null}}]),t}(m.default.Component);t.default=v},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{afterLoad:function(e){this.rootInjects=this.rootInjects||{},this.rootInjects.initOAuth=e.authActions.configureAuth},statePlugins:{auth:{reducers:o.default,actions:s,selectors:l},spec:{wrapActions:p}}}};var i=n(276),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(168),s=r(a),u=n(277),l=r(u),c=n(278),p=r(c)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i,o=n(36),a=r(o),s=n(30),u=r(s),l=n(18),c=r(l),p=n(7),f=n(9),h=n(168);t.default=(i={},(0,a.default)(i,h.SHOW_AUTH_POPUP,function(e,t){var n=t.payload;return e.set("showDefinitions",n)}),(0,a.default)(i,h.AUTHORIZE,function(e,t){var n=t.payload,r=(0,p.fromJS)(n),i=e.get("authorized")||(0,p.Map)();return r.entrySeq().forEach(function(e){var t=(0,c.default)(e,2),n=t[0],r=t[1],o=r.getIn(["schema","type"]);if("apiKey"===o||"http"===o)i=i.set(n,r);else if("basic"===o){var a=r.getIn(["value","username"]),s=r.getIn(["value","password"]);i=i.setIn([n,"value"],{username:a,header:"Basic "+(0,f.btoa)(a+":"+s)}),i=i.setIn([n,"schema"],r.get("schema"))}}),e.set("authorized",i)}),(0,a.default)(i,h.AUTHORIZE_OAUTH2,function(e,t){var n=t.payload,r=n.auth,i=n.token,o=void 0;return r.token=(0,u.default)({},i),o=(0,p.fromJS)(r),e.setIn(["authorized",o.get("name")],o)}),(0,a.default)(i,h.LOGOUT,function(e,t){var n=t.payload,r=e.get("authorized").withMutations(function(e){n.forEach(function(t){e.delete(t)})});return e.set("authorized",r)}),(0,a.default)(i,h.CONFIGURE_AUTH,function(e,t){var n=t.payload;return e.set("configs",n)}),i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.getConfigs=t.isAuthorized=t.authorized=t.definitionsForRequirements=t.getDefinitionsByNames=t.definitionsToAuthorize=t.shownDefinitions=void 0;var i=n(47),o=r(i),a=n(18),s=r(a),u=n(60),l=n(7),c=function(e){return e};t.shownDefinitions=(0,u.createSelector)(c,function(e){return e.get("showDefinitions")}),t.definitionsToAuthorize=(0,u.createSelector)(c,function(){return function(e){var t=e.specSelectors,n=t.securityDefinitions()||(0,l.Map)({}),r=(0,l.List)();return n.entrySeq().forEach(function(e){var t=(0,s.default)(e,2),n=t[0],i=t[1],o=(0,l.Map)();o=o.set(n,i),r=r.push(o)}),r}}),t.getDefinitionsByNames=function(e,t){return function(e){var n=e.specSelectors;console.warn("WARNING: getDefinitionsByNames is deprecated and will be removed in the next major version.");var r=n.securityDefinitions(),i=(0,l.List)();return t.valueSeq().forEach(function(e){var t=(0,l.Map)();e.entrySeq().forEach(function(e){var n=(0,s.default)(e,2),i=n[0],o=n[1],a=r.get(i),u=void 0;"oauth2"===a.get("type")&&o.size&&(u=a.get("scopes"),u.keySeq().forEach(function(e){o.contains(e)||(u=u.delete(e))}),a=a.set("allowedScopes",u)),t=t.set(i,a)}),i=i.push(t)}),i}},t.definitionsForRequirements=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:(0,l.List)();return function(e){return(e.authSelectors.definitionsToAuthorize()||(0,l.List)()).filter(function(e){return t.some(function(t){return t.get(e.keySeq().first())})})}},t.authorized=(0,u.createSelector)(c,function(e){return e.get("authorized")||(0,l.Map)()}),t.isAuthorized=function(e,t){return function(e){var n=e.authSelectors,r=n.authorized();return l.List.isList(t)?!!t.toJS().filter(function(e){return-1===(0,o.default)(e).map(function(e){return!!r.get(e)}).indexOf(!1)}).length:null}},t.getConfigs=(0,u.createSelector)(c,function(e){return e.get("configs")})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.execute=void 0;var r=n(21),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.execute=function(e,t){var n=t.authSelectors,r=t.specSelectors;return function(t){var o=t.path,a=t.method,s=t.operation,u=t.extras,l={authorized:n.authorized()&&n.authorized().toJS(),definitions:r.securityDefinitions()&&r.securityDefinitions().toJS(),specSecurity:r.security()&&r.security().toJS()};return e((0,i.default)({path:o,method:a,operation:s,securities:l},u))}}},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}function i(e){return e&&e.__esModule?e:{default:e}}function o(){return{statePlugins:{spec:{actions:g,selectors:y},configs:{reducers:m.default,actions:p,selectors:h}}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=o;var a=n(211),s=i(a),u=n(1007),l=i(u),c=n(169),p=r(c),f=n(281),h=r(f),d=n(280),m=i(d),v=function(e,t){try{return s.default.safeLoad(e)}catch(e){return t&&t.errActions.newThrownErr(new Error(e)),{}}},g={downloadConfig:function(e){return function(t){return(0,t.fn.fetch)(e)}},getConfigByUrl:function(e,t){return function(n){function r(n){n instanceof Error||n.status>=400?(i.updateLoadingStatus("failedConfig"),i.updateLoadingStatus("failedConfig"),i.updateUrl(""),console.error(n.statusText+" "+e),t(null)):t(v(n.text))}var i=n.specActions;if(e)return i.downloadConfig(e).then(r,r)}}},y={getLocalConfig:function(){return v(l.default)}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,i=n(36),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(7),s=n(169);t.default=(r={},(0,o.default)(r,s.UPDATE_CONFIGS,function(e,t){return e.merge((0,a.fromJS)(t.payload))}),(0,o.default)(r,s.TOGGLE_CONFIGS,function(e,t){var n=t.payload,r=e.get(n);return e.set(n,!r)}),r)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.get=function(e,t){return e.getIn(Array.isArray(t)?t:[t])}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.setHash=function(e){return e?history.pushState(null,null,"#"+e):window.location.hash=""}},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{statePlugins:{spec:{wrapActions:o},layout:{wrapActions:s}}}};var i=n(285),o=r(i),a=n(284),s=r(a)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.show=void 0;var r=n(18),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(282),a=n(9);t.show=function(e,t){var n=t.getConfigs;return function(){for(var t=arguments.length,r=Array(t),s=0;s<t;s++)r[s]=arguments[s];e.apply(void 0,r);var u=n().deepLinking;if(u&&"false"!==u)try{var l=r[0],c=r[1],p=(0,i.default)(l,1),f=p[0];if("operations-tag"===f||"operations"===f){if(!c)return(0,o.setHash)("/");if("operations"===f){var h=(0,i.default)(l,3),d=h[1],m=h[2];(0,o.setHash)("/"+(0,a.createDeepLinkPath)(d)+"/"+(0,a.createDeepLinkPath)(m))}if("operations-tag"===f){var v=(0,i.default)(l,2),g=v[1];(0,o.setHash)("/"+(0,a.createDeepLinkPath)(g))}}}catch(e){console.error(e)}}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.updateResolved=void 0;var i=n(18),o=r(i),a=n(1207),s=r(a),u=n(9),l=!1;t.updateResolved=function(e,t){var n=t.layoutActions,r=t.getConfigs;return function(){e.apply(void 0,arguments);var t=r().deepLinking;if(t&&"false"!==t){if(window.location.hash&&!l){var i=window.location.hash.slice(1);"!"===i[0]&&(i=i.slice(1)),"/"===i[0]&&(i=i.slice(1));var a=i.split("/"),c=(0,o.default)(a,2),p=c[0],f=c[1],h=document.querySelector(".swagger-ui"),d=s.default.createScroller(h),m=void 0;p&&f?(n.show(["operations-tag",p],!0),n.show(["operations",p,f],!0),m=document.getElementById("operations-"+(0,u.escapeDeepLinkPath)(p)+"-"+(0,u.escapeDeepLinkPath)(f))):p&&(n.show(["operations-tag",p],!0),m=document.getElementById("operations-tag-"+(0,u.escapeDeepLinkPath)(p))),m&&(d.to(m),setTimeout(function(){0===s.default.getY()&&s.default.to(m)},50))}l=!0}}}},function(e,t,n){"use strict";function r(e){var t=e.fn;return{statePlugins:{spec:{actions:{download:function(e){return function(n){function r(t){if(t instanceof Error||t.status>=400)return a.updateLoadingStatus("failed"),i.newThrownErr(new Error((t.message||t.statusText)+" "+e));a.updateLoadingStatus("success"),a.updateSpec(t.text),a.updateUrl(e)}var i=n.errActions,o=n.specSelectors,a=n.specActions,s=n.getConfigs,u=t.fetch,l=s();e=e||o.url(),a.updateLoadingStatus("loading"),u({url:e,loadSpec:!0,requestInterceptor:l.requestInterceptor||function(e){return e},responseInterceptor:l.responseInterceptor||function(e){return e},credentials:"same-origin",headers:{Accept:"application/json,*/*"}}).then(r,r)}},updateLoadingStatus:function(e){var t=[null,"loading","failed","success","failedConfig"];return-1===t.indexOf(e)&&console.error("Error: "+e+" is not one of "+(0,o.default)(t)),{type:"spec_update_loading_status",payload:e}}},reducers:{spec_update_loading_status:function(e,t){return"string"==typeof t.payload?e.set("loadingStatus",t.payload):e}},selectors:{loadingStatus:(0,a.createSelector)(function(e){return e||(0,s.Map)()},function(e){return e.get("loadingStatus")||null})}}}}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(35),o=function(e){return e&&e.__esModule?e:{default:e}}(i);t.default=r;var a=n(60),s=n(7)},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}function i(e,t){var n={jsSpec:t.specSelectors.specJson().toJS()};return(0,a.default)(h,function(e,t){try{return t.transform(e,n).filter(function(e){return!!e})}catch(t){return console.error("Transformer error:",t),e}},e).filter(function(e){return!!e}).map(function(e){return!e.get("line")&&e.get("path"),e})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(953),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s=n(288),u=r(s),l=n(289),c=r(l),p=n(290),f=r(p),h=[u,c,f]},function(e,t,n){"use strict";function r(e){return e.map(function(e){var t=e.get("message").indexOf("is not of a type(s)");if(t>-1){var n=e.get("message").slice(t+"is not of a type(s)".length).split(",");return e.set("message",e.get("message").slice(0,t)+i(n))}return e})}function i(e){return e.reduce(function(e,t,n,r){return n===r.length-1&&r.length>1?e+"or "+t:r[n+1]&&r.length>2?e+t+", ":r[n+1]?e+t+" ":e+t},"should be a")}Object.defineProperty(t,"__esModule",{value:!0}),t.transform=r},function(e,t,n){"use strict";function r(e,t){t.jsSpec;return e}Object.defineProperty(t,"__esModule",{value:!0}),t.transform=r;var i=n(224);(function(e){e&&e.__esModule})(i),n(7)},function(e,t,n){"use strict";function r(e){return e.map(function(e){return e.set("message",i(e.get("message"),"instance."))})}function i(e,t){return e.replace(new RegExp(t,"g"),"")}Object.defineProperty(t,"__esModule",{value:!0}),t.transform=r},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){return{statePlugins:{err:{reducers:(0,o.default)(e),actions:s,selectors:l}}}};var i=n(292),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(128),s=r(a),u=n(293),l=r(u)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(36),o=r(i),a=n(30),s=r(a);t.default=function(e){var t;return t={},(0,o.default)(t,u.NEW_THROWN_ERR,function(t,n){var r=n.payload,i=(0,s.default)(m,r,{type:"thrown"});return t.update("errors",function(e){return(e||(0,p.List)()).push((0,p.fromJS)(i))}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.NEW_THROWN_ERR_BATCH,function(t,n){var r=n.payload;return r=r.map(function(e){return(0,p.fromJS)((0,s.default)(m,e,{type:"thrown"}))}),t.update("errors",function(e){return(e||(0,p.List)()).concat((0,p.fromJS)(r))}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.NEW_SPEC_ERR,function(t,n){var r=n.payload,i=(0,p.fromJS)(r);return i=i.set("type","spec"),t.update("errors",function(e){return(e||(0,p.List)()).push((0,p.fromJS)(i)).sortBy(function(e){return e.get("line")})}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.NEW_SPEC_ERR_BATCH,function(t,n){var r=n.payload;return r=r.map(function(e){return(0,p.fromJS)((0,s.default)(m,e,{type:"spec"}))}),t.update("errors",function(e){return(e||(0,p.List)()).concat((0,p.fromJS)(r))}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.NEW_AUTH_ERR,function(t,n){var r=n.payload,i=(0,p.fromJS)((0,s.default)({},r));return i=i.set("type","auth"),t.update("errors",function(e){return(e||(0,p.List)()).push((0,p.fromJS)(i))}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.CLEAR,function(e,t){var n=t.payload;if(n){var r=f.default.fromJS((0,c.default)((e.get("errors")||(0,p.List)()).toJS(),n));return e.merge({errors:r})}}),t};var u=n(128),l=n(954),c=r(l),p=n(7),f=r(p),h=n(287),d=r(h),m={line:0,level:"error",message:"Unknown error"}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.lastError=t.allErrors=void 0;var r=n(7),i=n(60),o=function(e){return e},a=t.allErrors=(0,i.createSelector)(o,function(e){return e.get("errors",(0,r.List)())});t.lastError=(0,i.createSelector)(a,function(e){return e.last()})},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{statePlugins:{layout:{reducers:o.default,actions:s,selectors:l}}}};var i=n(295),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(170),s=r(a),u=n(296),l=r(u)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,i=n(36),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(7),s=n(170);t.default=(r={},(0,o.default)(r,s.UPDATE_LAYOUT,function(e,t){return e.set("layout",t.payload)}),(0,o.default)(r,s.UPDATE_FILTER,function(e,t){return e.set("filter",t.payload)}),(0,o.default)(r,s.SHOW,function(e,t){var n=t.payload.shown,r=(0,a.fromJS)(t.payload.thing);return e.update("shown",(0,a.fromJS)({}),function(e){return e.set(r,n)})}),(0,o.default)(r,s.UPDATE_MODE,function(e,t){var n=t.payload.thing,r=t.payload.mode;return e.setIn(["modes"].concat(n),(r||"")+"")}),r)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.showSummary=t.whatMode=t.isShown=t.currentFilter=t.current=void 0;var r=n(97),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(60),a=n(9),s=n(7),u=function(e){return e},l=(t.current=function(e){return e.get("layout")},t.currentFilter=function(e){return e.get("filter")},t.isShown=function(e,t,n){return t=(0,a.normalizeArray)(t),e.get("shown",(0,s.fromJS)({})).get((0,s.fromJS)(t),n)});t.whatMode=function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"";return t=(0,a.normalizeArray)(t),e.getIn(["modes"].concat((0,i.default)(t)),n)},t.showSummary=(0,o.createSelector)(u,function(e){return!l(e,"editor")})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){function t(e){for(var t,n=arguments.length,r=Array(n>1?n-1:0),o=1;o<n;o++)r[o-1]=arguments[o];i(e)>=a&&(t=console)[e].apply(t,r)}var n=e.configs,r={debug:0,info:1,log:2,warn:3,error:4},i=function(e){return r[e]||-1},o=n.logLevel,a=i(o);return t.warn=t.bind(null,"warn"),t.error=t.bind(null,"error"),t.info=t.bind(null,"info"),t.debug=t.bind(null,"debug"),{rootInjects:{log:t}}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.definitionsToAuthorize=void 0;var i=n(36),o=r(i),a=n(18),s=r(a),u=n(60),l=n(7),c=n(34),p=function(e){return e};t.definitionsToAuthorize=function(e){return function(t,n){return function(r){for(var i=arguments.length,o=Array(i>1?i-1:0),a=1;a<i;a++)o[a-1]=arguments[a];var s=n.getSystem().specSelectors.specJson();return(0,c.isOAS3)(s)?e.apply(void 0,[n].concat(o)):t.apply(void 0,o)}}}((0,u.createSelector)(p,function(e){return e.specSelectors.securityDefinitions()},function(e,t){var n=(0,l.List)();return t.entrySeq().forEach(function(e){var t=(0,s.default)(e,2),r=t[0],i=t[1],a=i.get("type");"oauth2"===a&&i.get("flows").entrySeq().forEach(function(e){var t=(0,s.default)(e,2),a=t[0],u=t[1],c=(0,l.fromJS)({flow:a,authorizationUrl:u.get("authorizationUrl"),tokenUrl:u.get("tokenUrl"),scopes:u.get("scopes"),type:i.get("type")});n=n.push(new l.Map((0,o.default)({},r,c.filter(function(e){return void 0!==e}))))}),"http"!==a&&"apiKey"!==a||(n=n.push(new l.Map((0,o.default)({},r,i))))}),n}))},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(0),s=r(a),u=n(1),l=r(u),c=n(12),p=r(c),f=n(7),h=function(e){var t=e.callbacks,n=e.getComponent,r=n("OperationContainer",!0);if(!t)return s.default.createElement("span",null,"No callbacks");var i=t.map(function(t,n){return s.default.createElement("div",{key:n},s.default.createElement("h2",null,n),t.map(function(t,n){return s.default.createElement("div",{key:n},t.map(function(t,i){var a=(0,f.fromJS)({operation:t});return s.default.createElement(r,(0,o.default)({},e,{op:a,key:i,tag:"",method:i,path:n,allowTryItOut:!1}))}))}))});return s.default.createElement("div",null,i)};h.propTypes={getComponent:l.default.func.isRequired,callbacks:p.default.iterable.isRequired},t.default=h},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));_.call(r);var i=r.props,a=i.name,u=i.schema,l=r.getValue();return r.state={name:a,schema:u,value:l},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"getValue",value:function(){var e=this.props,t=e.name,n=e.authorized;return n&&n.getIn([t,"value"])}},{key:"render",value:function(){var e=this.props,t=e.schema,n=e.getComponent,r=e.errSelectors,i=e.name,o=n("Input"),a=n("Row"),s=n("Col"),u=n("authError"),l=n("Markdown"),c=n("JumpToPath",!0),p=t.get("scheme"),f=this.getValue(),h=r.allErrors().filter(function(e){return e.get("authId")===i});if("basic"===p){var d=f?f.get("username"):null;return m.default.createElement("div",null,m.default.createElement("h4",null,m.default.createElement("code",null,i||t.get("name")),"  (http, Basic)",m.default.createElement(c,{path:["securityDefinitions",i]})),d&&m.default.createElement("h6",null,"Authorized"),m.default.createElement(a,null,m.default.createElement(l,{source:t.get("description")})),m.default.createElement(a,null,m.default.createElement("label",null,"Username:"),d?m.default.createElement("code",null," ",d," "):m.default.createElement(s,null,m.default.createElement(o,{type:"text",required:"required",name:"username",onChange:this.onChange}))),m.default.createElement(a,null,m.default.createElement("label",null,"Password:"),d?m.default.createElement("code",null," ****** "):m.default.createElement(s,null,m.default.createElement(o,{required:"required",autoComplete:"new-password",name:"password",type:"password",onChange:this.onChange}))),h.valueSeq().map(function(e,t){return m.default.createElement(u,{error:e,key:t})}))}return"bearer"===p?m.default.createElement("div",null,m.default.createElement("h4",null,m.default.createElement("code",null,i||t.get("name")),"  (http, Bearer)",m.default.createElement(c,{path:["securityDefinitions",i]})),f&&m.default.createElement("h6",null,"Authorized"),m.default.createElement(a,null,m.default.createElement(l,{source:t.get("description")})),m.default.createElement(a,null,m.default.createElement("label",null,"Value:"),f?m.default.createElement("code",null," ****** "):m.default.createElement(s,null,m.default.createElement(o,{type:"text",onChange:this.onChange}))),h.valueSeq().map(function(e,t){return m.default.createElement(u,{error:e,key:t})})):m.default.createElement("div",null,m.default.createElement("em",null,m.default.createElement("b",null,i)," HTTP authentication: unsupported or missing scheme"))}}]),t}(m.default.Component);y.propTypes={authorized:g.default.object,getComponent:g.default.func.isRequired,errSelectors:g.default.object.isRequired,schema:g.default.object.isRequired,name:g.default.string.isRequired,onChange:g.default.func};var _=function(){var e=this;this.onChange=function(t){var n=e.props.onChange,r=t.target,i=r.value,o=r.name,a=e.state.value||{};o?a[o]=i:a=i,e.setState({value:a},function(){return n(e.state)})}};t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(299),o=r(i),a=n(305),s=r(a),u=n(302),l=r(u),c=n(306),p=r(c),f=n(304),h=r(f),d=n(300),m=r(d),v=n(303),g=r(v);t.default={Callbacks:o.default,HttpAuth:m.default,RequestBody:s.default,Servers:p.default,RequestBodyEditor:h.default,OperationServers:g.default,operationLink:l.default}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){return"string"!=typeof t?"":t.split("\n").map(function(t,n){return n>0?Array(e+1).join(" ")+t:t}).join("\n")}Object.defineProperty(t,"__esModule",{value:!0});var o=n(35),a=r(o),s=n(4),u=r(s),l=n(2),c=r(l),p=n(3),f=r(p),h=n(6),d=r(h),m=n(5),v=r(m),g=n(0),y=r(g),_=n(1),b=r(_),x=n(12),w=r(x),k=function(e){function t(){return(0,c.default)(this,t),(0,d.default)(this,(t.__proto__||(0,u.default)(t)).apply(this,arguments))}return(0,v.default)(t,e),(0,f.default)(t,[{key:"render",value:function(){var e=this.props,t=e.link,n=e.name,r=e.getComponent,o=r("Markdown"),s=t.get("operationId")||t.get("operationRef"),u=t.get("parameters")&&t.get("parameters").toJS(),l=t.get("description");return y.default.createElement("div",{style:{marginBottom:"1.5em"}},y.default.createElement("div",{style:{marginBottom:".5em"}},y.default.createElement("b",null,y.default.createElement("code",null,n)),l?y.default.createElement(o,{source:l}):null),y.default.createElement("pre",null,"Operation `",s,"`",y.default.createElement("br",null),y.default.createElement("br",null),"Parameters ",i(0,(0,a.default)(u,null,2))||"{}",y.default.createElement("br",null)))}}]),t}(g.Component);k.propTypes={getComponent:b.default.func.isRequired,link:w.default.orderedMap.isRequired,name:b.default.String},t.default=k},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(12),x=r(b),w=function(e){function t(){var e,n,r,i;(0,l.default)(this,t);for(var a=arguments.length,u=Array(a),c=0;c<a;c++)u[c]=arguments[c];return n=r=(0,h.default)(this,(e=t.__proto__||(0,s.default)(t)).call.apply(e,[this].concat(u))),r.setSelectedServer=function(e){var t=r.props,n=t.path,i=t.method;return r.forceUpdate(),r.props.setSelectedServer(e,n+":"+i)},r.setServerVariableValue=function(e){var t=r.props,n=t.path,i=t.method;return r.forceUpdate(),r.props.setServerVariableValue((0,o.default)({},e,{namespace:n+":"+i}))},r.getSelectedServer=function(){var e=r.props,t=e.path,n=e.method;return r.props.getSelectedServer(t+":"+n)},r.getServerVariable=function(e,t){var n=r.props,i=n.path,o=n.method;return r.props.getServerVariable({namespace:i+":"+o,server:e},t)},r.getEffectiveServerValue=function(e){var t=r.props,n=t.path,i=t.method;return r.props.getEffectiveServerValue({server:e,namespace:n+":"+i})},i=n,(0,h.default)(r,i)}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.operationServers,n=e.pathServers,r=e.getComponent;if(!t&&!n)return null;var i=r("Servers"),o=t||n,a=t?"operation":"path";return g.default.createElement("div",{className:"opblock-section operation-servers"},g.default.createElement("div",{className:"opblock-section-header"},g.default.createElement("div",{className:"tab-header"},g.default.createElement("h4",{className:"opblock-title"},"Servers"))),g.default.createElement("div",{className:"opblock-description-wrapper"},g.default.createElement("h4",{className:"message"},"These ",a,"-level options override the global server options."),g.default.createElement(i,{servers:o,currentServer:this.getSelectedServer(),setSelectedServer:this.setSelectedServer,setServerVariableValue:this.setServerVariableValue,getServerVariable:this.getServerVariable,getEffectiveServerValue:this.getEffectiveServerValue})))}}]),t}(g.default.Component);w.propTypes={path:_.default.string.isRequired,method:_.default.string.isRequired,operationServers:x.default.list,pathServers:x.default.list,setSelectedServer:_.default.func.isRequired,setServerVariableValue:_.default.func.isRequired,getSelectedServer:_.default.func.isRequired,getServerVariable:_.default.func.isRequired,getEffectiveServerValue:_.default.func.isRequired,getComponent:_.default.func.isRequired},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(7),_=n(9),b=Function.prototype,x=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));return r.setValueToSample=function(e){r.onChange(r.sample(e))},r.sample=function(e){var t=r.props,n=t.requestBody,i=t.mediaType,o=n.getIn(["content",e||i,"schema"]).toJS();return(0,_.getSampleSchema)(o,e||i,{includeWriteOnly:!0})},r.onChange=function(e){r.setState({value:e}),r.props.onChange(e)},r.handleOnChange=function(e){var t=r.props.mediaType,n=/json/i.test(t),i=n?e.target.value.trim():e.target.value;r.onChange(i)},r.toggleIsEditBox=function(){return r.setState(function(e){return{isEditBox:!e.isEditBox}})},r.state={isEditBox:!1,value:""},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){this.setValueToSample.call(this)}},{key:"componentWillReceiveProps",value:function(e){this.props.mediaType!==e.mediaType&&this.setValueToSample(e.mediaType),!this.props.isExecute&&e.isExecute&&this.setState({isEditBox:!0})}},{key:"componentDidUpdate",value:function(e){this.props.requestBody!==e.requestBody&&this.setValueToSample(this.props.mediaType)}},{key:"render",value:function(){var e=this.props,t=e.isExecute,n=e.getComponent,r=n("Button"),i=n("TextArea"),o=n("highlightCode"),a=this.state,s=a.value,u=a.isEditBox;return m.default.createElement("div",{className:"body-param"},u&&t?m.default.createElement(i,{className:"body-param__text",value:s,onChange:this.handleOnChange}):s&&m.default.createElement(o,{className:"body-param__example",value:s}),m.default.createElement("div",{className:"body-param-options"},t?m.default.createElement("div",{className:"body-param-edit"},m.default.createElement(r,{className:u?"btn cancel body-param__example-edit":"btn edit body-param__example-edit",onClick:this.toggleIsEditBox},u?"Cancel":"Edit")):null))}}]),t}(d.PureComponent);x.propTypes={requestBody:g.default.object.isRequired,mediaType:g.default.string.isRequired,onChange:g.default.func,getComponent:g.default.func.isRequired,isExecute:g.default.bool,specSelectors:g.default.object.isRequired},x.defaultProps={mediaType:"application/json",requestBody:(0,y.fromJS)({}),onChange:b},t.default=x},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(0),o=r(i),a=n(1),s=r(a),u=n(12),l=r(u),c=n(7),p=function(e){var t=e.requestBody,n=e.getComponent,r=e.getConfigs,i=e.specSelectors,a=e.contentType,s=e.isExecute,u=e.specPath,l=e.onChange,p=n("Markdown"),f=n("modelExample"),h=n("RequestBodyEditor"),d=t&&t.get("description")||null,m=t&&t.get("content")||new c.OrderedMap;a=a||m.keySeq().first();var v=m.get(a);return v?o.default.createElement("div",null,d&&o.default.createElement(p,{source:d}),o.default.createElement(f,{getComponent:n,getConfigs:r,specSelectors:i,expandDepth:1,isExecute:s,schema:v.get("schema"),specPath:u.push("content",a),example:o.default.createElement(h,{requestBody:t,onChange:l,mediaType:a,getComponent:n,isExecute:s,specSelectors:i})})):null};p.propTypes={requestBody:l.default.orderedMap.isRequired,getComponent:s.default.func.isRequired,getConfigs:s.default.func.isRequired,specSelectors:s.default.object.isRequired,contentType:s.default.string,isExecute:s.default.bool.isRequired,onChange:s.default.func.isRequired,specPath:s.default.array.isRequired},t.default=p},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(7),g=n(1),y=r(g),_=n(12),b=r(_),x=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onServerChange=function(e){r.setServer(e.target.value)},r.onServerVariableValueChange=function(e){var t=r.props,n=t.setServerVariableValue,i=t.currentServer,o=e.target.getAttribute("data-variable"),a=e.target.value;"function"==typeof n&&n({server:i,key:o,val:a})},r.setServer=function(e){(0,r.props.setSelectedServer)(e)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){var e=this.props,t=e.servers;e.currentServer||this.setServer(t.first().get("url"))}},{key:"componentWillReceiveProps",value:function(e){var t=this.props,n=t.servers,r=t.setServerVariableValue,i=t.getServerVariable;if(this.props.currentServer!==e.currentServer){var o=n.find(function(t){return t.get("url")===e.currentServer});if(!o)return this.setServer(n.first().get("url"));(o.get("variables")||(0,v.OrderedMap)()).map(function(t,n){i(e.currentServer,n)||r({server:e.currentServer,key:n,val:t.get("default")||""})})}}},{key:"render",value:function(){var e=this,t=this.props,n=t.servers,r=t.currentServer,i=t.getServerVariable,o=t.getEffectiveServerValue,a=n.find(function(e){return e.get("url")===r})||(0,v.OrderedMap)(),s=a.get("variables")||(0,v.OrderedMap)(),u=0!==s.size;return m.default.createElement("div",{className:"servers"},m.default.createElement("label",{htmlFor:"servers"},m.default.createElement("select",{onChange:this.onServerChange},n.valueSeq().map(function(e){return m.default.createElement("option",{value:e.get("url"),key:e.get("url")},e.get("url"))}).toArray())),u?m.default.createElement("div",null,m.default.createElement("div",{className:"computed-url"},"Computed URL:",m.default.createElement("code",null,o(r))),m.default.createElement("h4",null,"Server variables"),m.default.createElement("table",null,m.default.createElement("tbody",null,s.map(function(t,n){return m.default.createElement("tr",{key:n},m.default.createElement("td",null,n),m.default.createElement("td",null,t.get("enum")?m.default.createElement("select",{"data-variable":n,onChange:e.onServerVariableValueChange},t.get("enum").map(function(e){return m.default.createElement("option",{selected:e===i(r,n),key:e,value:e},e)})):m.default.createElement("input",{type:"text",value:i(r,n)||"",onChange:e.onServerVariableValueChange,"data-variable":n})))})))):null)}}]),t}(m.default.Component);x.propTypes={servers:b.default.list.isRequired,currentServer:y.default.string.isRequired,setSelectedServer:y.default.func.isRequired,setServerVariableValue:y.default.func.isRequired,getServerVariable:y.default.func.isRequired,getEffectiveServerValue:y.default.func.isRequired},t.default=x},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{components:f.default,wrapComponents:d.default,statePlugins:{spec:{wrapSelectors:a,selectors:c},auth:{wrapSelectors:u},oas3:{actions:v,reducers:b.default,selectors:y}}}};var o=n(311),a=i(o),s=n(298),u=i(s),l=n(310),c=i(l),p=n(301),f=r(p),h=n(313),d=r(h),m=n(171),v=i(m),g=n(309),y=i(g),_=n(308),b=r(_)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i,o=n(36),a=r(o),s=n(18),u=r(s),l=n(171);t.default=(i={},(0,a.default)(i,l.UPDATE_SELECTED_SERVER,function(e,t){var n=t.payload,r=n.selectedServerUrl,i=n.namespace,o=i?[i,"selectedServer"]:["selectedServer"];return e.setIn(o,r)}),(0,a.default)(i,l.UPDATE_REQUEST_BODY_VALUE,function(e,t){var n=t.payload,r=n.value,i=n.pathMethod,o=(0,u.default)(i,2),a=o[0],s=o[1];return e.setIn(["requestData",a,s,"bodyValue"],r)}),(0,a.default)(i,l.UPDATE_REQUEST_CONTENT_TYPE,function(e,t){var n=t.payload,r=n.value,i=n.pathMethod,o=(0,u.default)(i,2),a=o[0],s=o[1];return e.setIn(["requestData",a,s,"requestContentType"],r)}),(0,a.default)(i,l.UPDATE_RESPONSE_CONTENT_TYPE,function(e,t){var n=t.payload,r=n.value,i=n.path,o=n.method;return e.setIn(["requestData",i,o,"responseContentType"],r)}),(0,a.default)(i,l.UPDATE_SERVER_VARIABLE_VALUE,function(e,t){var n=t.payload,r=n.server,i=n.namespace,o=n.key,a=n.val,s=i?[i,"serverVariableValues",r,o]:["serverVariableValues",r,o];return e.setIn(s,a)}),i)},function(e,t,n){"use strict";function r(e){return function(){for(var t=arguments.length,n=Array(t),r=0;r<t;r++)n[r]=arguments[r];return function(t){var r=t.getSystem().specSelectors.specJson();return(0,o.isOAS3)(r)?e.apply(void 0,n):null}}}Object.defineProperty(t,"__esModule",{value:!0}),t.serverEffectiveValue=t.serverVariables=t.serverVariableValue=t.responseContentType=t.requestContentType=t.requestBodyValue=t.selectedServer=void 0;var i=n(7),o=n(34);t.selectedServer=r(function(e,t){var n=t?[t,"selectedServer"]:["selectedServer"];return e.getIn(n)||""}),t.requestBodyValue=r(function(e,t,n){return e.getIn(["requestData",t,n,"bodyValue"])||null}),t.requestContentType=r(function(e,t,n){return e.getIn(["requestData",t,n,"requestContentType"])||null}),t.responseContentType=r(function(e,t,n){return e.getIn(["requestData",t,n,"responseContentType"])||null}),t.serverVariableValue=r(function(e,t,n){var r=void 0;if("string"!=typeof t){var i=t.server,o=t.namespace;r=o?[o,"serverVariableValues",i,n]:["serverVariableValues",i,n]}else{r=["serverVariableValues",t,n]}return e.getIn(r)||null}),t.serverVariables=r(function(e,t){var n=void 0;if("string"!=typeof t){var r=t.server,o=t.namespace;n=o?[o,"serverVariableValues",r]:["serverVariableValues",r]}else{n=["serverVariableValues",t]}return e.getIn(n)||(0,i.OrderedMap)()}),t.serverEffectiveValue=r(function(e,t){var n,r;if("string"!=typeof t){var o=t.server,a=t.namespace;r=o,n=a?e.getIn([a,"serverVariableValues",r]):e.getIn(["serverVariableValues",r])}else r=t,n=e.getIn(["serverVariableValues",r]);n=n||(0,i.OrderedMap)();var s=r;return n.map(function(e,t){s=s.replace(new RegExp("{"+t+"}","g"),e)}),s})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.isSwagger2=t.servers=void 0;var r=n(60),i=n(7),o=n(34),a=function(e){return e||(0,i.Map)()},s=(0,r.createSelector)(a,function(e){return e.get("json",(0,i.Map)())}),u=(0,r.createSelector)(a,function(e){return e.get("resolved",(0,i.Map)())}),l=function(e){var t=u(e);return t.count()<1&&(t=s(e)),t};t.servers=function(e){return function(){return function(t){for(var n=arguments.length,r=Array(n>1?n-1:0),i=1;i<n;i++)r[i-1]=arguments[i];var a=t.getSystem().specSelectors.specJson();return(0,o.isOAS3)(a)?e.apply(void 0,r):null}}}((0,r.createSelector)(l,function(e){return e.getIn(["servers"])||(0,i.Map)()})),t.isSwagger2=function(e,t){return function(){var e=t.getSystem().specSelectors.specJson();return(0,o.isSwagger2)(e)}}},function(e,t,n){"use strict";function r(e){return function(t,n){return function(){var r=n.getSystem().specSelectors.specJson();return(0,a.isOAS3)(r)?e.apply(void 0,arguments):t.apply(void 0,arguments)}}}Object.defineProperty(t,"__esModule",{value:!0}),t.isSwagger2=t.isOAS3=t.servers=t.schemes=t.produces=t.consumes=t.basePath=t.host=t.securityDefinitions=t.hasHost=t.definitions=void 0;var i=n(60),o=n(7),a=n(34),s=function(e){return e||(0,o.Map)()},u=(0,i.createSelector)(function(){return null}),l=r(u),c=(0,i.createSelector)(s,function(e){return e.get("json",(0,o.Map)())}),p=(0,i.createSelector)(s,function(e){return e.get("resolved",(0,o.Map)())}),f=function(e){var t=p(e);return t.count()<1&&(t=c(e)),t};t.definitions=r((0,i.createSelector)(f,function(e){return e.getIn(["components","schemas"])||(0,o.Map)()})),t.hasHost=r(function(e){return f(e).hasIn(["servers",0])}),t.securityDefinitions=r((0,i.createSelector)(f,function(e){return e.getIn(["components","securitySchemes"])||null})),t.host=l,t.basePath=l,t.consumes=l,t.produces=l,t.schemes=l,t.servers=r((0,i.createSelector)(f,function(e){return e.getIn(["servers"])||(0,o.Map)()})),t.isOAS3=function(e,t){return function(){var e=t.getSystem().specSelectors.specJson();return(0,a.isOAS3)(o.Map.isMap(e)?e:(0,o.Map)())}},t.isSwagger2=function(e,t){return function(){var e=t.getSystem().specSelectors.specJson();return(0,a.isSwagger2)(o.Map.isMap(e)?e:(0,o.Map)())}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(96),o=r(i),a=n(0),s=r(a),u=n(34);t.default=(0,u.OAS3ComponentWrapFactory)(function(e){var t=e.Ori,n=(0,o.default)(e,["Ori"]),r=n.schema,i=n.getComponent,a=n.errSelectors,u=n.authorized,l=n.onAuthChange,c=n.name,p=i("HttpAuth");return"http"===r.get("type")?s.default.createElement(p,{key:c,schema:r,name:c,errSelectors:a,authorized:u,getComponent:i,onChange:l}):s.default.createElement(t,n)})},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(314),o=r(i),a=n(312),s=r(a),u=n(317),l=r(u),c=n(318),p=r(c),f=n(316),h=r(f),d=n(315),m=r(d);t.default={Markdown:o.default,AuthItem:s.default,parameters:l.default,VersionStamp:p.default,model:m.default,onlineValidatorBadge:h.default}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.Markdown=void 0;var i=n(0),o=r(i),a=n(1),s=r(a),u=n(1080),l=r(u),c=n(577),p=n(34),f=n(270),h=t.Markdown=function(e){var t=e.source;if(t){var n=new c.Parser,r=new c.HtmlRenderer,i=r.render(n.parse(t||"")),a=(0,f.sanitizer)(i);return t&&i&&a?o.default.createElement(l.default,{source:a,className:"renderedMarkdown"}):null}return null};h.propTypes={source:s.default.string},t.default=(0,p.OAS3ComponentWrapFactory)(h)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(34),x=n(269),w=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getConfigs,n=e.schema,r=["model-box"],i=!0===n.get("deprecated"),a=null;return i&&(r.push("deprecated"),a=g.default.createElement("span",{className:"model-deprecated-warning"},"Deprecated:")),g.default.createElement("div",{className:r.join(" ")},a,g.default.createElement(x.Model,(0,o.default)({},this.props,{getConfigs:t,depth:1,expandDepth:this.props.expandDepth||0})))}}]),t}(v.Component);w.propTypes={schema:_.default.object.isRequired,name:_.default.string,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired,specSelectors:_.default.object.isRequired,expandDepth:_.default.number},t.default=(0,b.OAS3ComponentWrapFactory)(w)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(34);t.default=(0,r.OAS3ComponentWrapFactory)(function(){return null})},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(97),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(7),x=r(b),w=n(12),k=r(w),E=n(34),S=function(e,t){return e.valueSeq().filter(x.default.Map.isMap).map(t)},C=function(e){function t(e){(0,l.default)(this,t);var n=(0,h.default)(this,(t.__proto__||(0,s.default)(t)).call(this,e));return n.onChange=function(e,t,r){var i=n.props;(0,i.specActions.changeParam)(i.onChangeKey,e.get("name"),e.get("in"),t,r)},n.onChangeConsumesWrapper=function(e){var t=n.props;(0,t.specActions.changeConsumesValue)(t.onChangeKey,e)},n.toggleTab=function(e){return"parameters"===e?n.setState({parametersVisible:!0,callbackVisible:!1}):"callbacks"===e?n.setState({callbackVisible:!0,parametersVisible:!1}):void 0},n.state={callbackVisible:!1,parametersVisible:!0},n}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this,t=this.props,n=t.onTryoutClick,r=t.onCancelClick,i=t.parameters,a=t.allowTryItOut,s=t.tryItOutEnabled,u=t.fn,l=t.getComponent,c=t.getConfigs,p=t.specSelectors,f=t.oas3Actions,h=t.oas3Selectors,d=t.pathMethod,m=t.specPath,v=t.operation,y=l("parameterRow"),_=l("TryItOutButton"),x=l("contentType"),w=l("Callbacks",!0),k=l("RequestBody",!0),E=s&&a,C=p.isOAS3,A=v.get("requestBody"),D=m.slice(0,-1).push("requestBody");return g.default.createElement("div",{className:"opblock-section"},g.default.createElement("div",{className:"opblock-section-header"},g.default.createElement("div",{className:"tab-header"},g.default.createElement("div",{onClick:function(){return e.toggleTab("parameters")},className:"tab-item "+(this.state.parametersVisible&&"active")},g.default.createElement("h4",{className:"opblock-title"},g.default.createElement("span",null,"Parameters"))),v.get("callbacks")?g.default.createElement("div",{onClick:function(){return e.toggleTab("callbacks")},className:"tab-item "+(this.state.callbackVisible&&"active")},g.default.createElement("h4",{className:"opblock-title"},g.default.createElement("span",null,"Callbacks"))):null),a?g.default.createElement(_,{enabled:s,onCancelClick:r,onTryoutClick:n}):null),this.state.parametersVisible?g.default.createElement("div",{className:"parameters-container"},i.count()?g.default.createElement("div",{className:"table-container"},g.default.createElement("table",{className:"parameters"},g.default.createElement("thead",null,g.default.createElement("tr",null,g.default.createElement("th",{className:"col col_header parameters-col_name"},"Name"),g.default.createElement("th",{className:"col col_header parameters-col_description"},"Description"))),g.default.createElement("tbody",null,S(i,function(t,n){return g.default.createElement(y,{fn:u,getComponent:l,specPath:m.push(n),getConfigs:c,param:t,key:t.get("name"),onChange:e.onChange,onChangeConsumes:e.onChangeConsumesWrapper,specSelectors:p,pathMethod:d,isExecute:E})}).toArray()))):g.default.createElement("div",{className:"opblock-description-wrapper"},g.default.createElement("p",null,"No parameters"))):"",this.state.callbackVisible?g.default.createElement("div",{className:"callbacks-container opblock-description-wrapper"},g.default.createElement(w,{callbacks:(0,b.Map)(v.get("callbacks"))})):"",C()&&A&&this.state.parametersVisible&&g.default.createElement("div",{className:"opblock-section"},g.default.createElement("div",{className:"opblock-section-header"},g.default.createElement("h4",{className:"opblock-title parameter__name "+(A.get("required")&&"required")},"Request body"),g.default.createElement("label",null,g.default.createElement(x,{value:h.requestContentType.apply(h,(0,o.default)(d)),contentTypes:A.get("content").keySeq(),onChange:function(e){f.setRequestContentType({value:e,pathMethod:d})},className:"body-param-content-type"}))),g.default.createElement("div",{className:"opblock-description-wrapper"},g.default.createElement(k,{specPath:D,requestBody:A,isExecute:E,onChange:function(e){f.setRequestBodyValue({value:e,pathMethod:d})},contentType:h.requestContentType.apply(h,(0,o.default)(d))}))))}}]),t}(v.Component);C.propTypes={parameters:k.default.list.isRequired,specActions:_.default.object.isRequired,operation:_.default.object.isRequired,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired,specSelectors:_.default.object.isRequired,oas3Actions:_.default.object.isRequired,oas3Selectors:_.default.object.isRequired,fn:_.default.object.isRequired,tryItOutEnabled:_.default.bool,allowTryItOut:_.default.bool,specPath:k.default.list.isRequired,onTryoutClick:_.default.func,onCancelClick:_.default.func,onChangeKey:_.default.array,pathMethod:_.default.array.isRequired},C.defaultProps={onTryoutClick:Function.prototype,onCancelClick:Function.prototype,tryItOutEnabled:!1,allowTryItOut:!0,onChangeKey:[]},t.default=(0,E.OAS3ComponentWrapFactory)(C)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(0),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(34);t.default=(0,o.OAS3ComponentWrapFactory)(function(e){var t=e.Ori;return i.default.createElement("span",null,i.default.createElement(t,e),i.default.createElement("small",{style:{backgroundColor:"#89bf04"}},i.default.createElement("pre",{className:"version"},"OAS3")))})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{fn:i}};var r=n(172),i=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(r)},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{statePlugins:{spec:{wrapActions:p,reducers:o.default,actions:s,selectors:l}}}};var i=n(321),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(173),s=r(a),u=n(322),l=r(u),c=n(323),p=r(c)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i,o=n(36),a=r(o),s=n(30),u=r(s),l=n(97),c=r(l),p=n(7),f=n(9),h=n(46),d=r(h),m=n(173);t.default=(i={},(0,a.default)(i,m.UPDATE_SPEC,function(e,t){return"string"==typeof t.payload?e.set("spec",t.payload):e}),(0,a.default)(i,m.UPDATE_URL,function(e,t){return e.set("url",t.payload+"")}),(0,a.default)(i,m.UPDATE_JSON,function(e,t){return e.set("json",(0,f.fromJSOrdered)(t.payload))}),(0,a.default)(i,m.UPDATE_RESOLVED,function(e,t){return e.setIn(["resolved"],(0,f.fromJSOrdered)(t.payload))}),(0,a.default)(i,m.UPDATE_PARAM,function(e,t){var n=t.payload,r=n.path,i=n.paramName,o=n.paramIn,a=n.value,s=n.isXml;return e.updateIn(["resolved","paths"].concat((0,c.default)(r),["parameters"]),(0,p.fromJS)([]),function(e){var t=e.findIndex(function(e){return e.get("name")===i&&e.get("in")===o});return a instanceof d.default.File||(a=(0,f.fromJSOrdered)(a)),e.setIn([t,s?"value_xml":"value"],a)})}),(0,a.default)(i,m.VALIDATE_PARAMS,function(e,t){var n=t.payload,r=n.pathMethod,i=n.isOAS3,o=e.getIn(["meta","paths"].concat((0,c.default)(r)),(0,p.fromJS)({})),a=/xml/i.test(o.get("consumes_value"));return e.updateIn(["resolved","paths"].concat((0,c.default)(r),["parameters"]),(0,p.fromJS)([]),function(e){return e.withMutations(function(e){for(var t=0,n=e.count();t<n;t++){var r=(0,f.validateParam)(e.get(t),a,i);e.setIn([t,"errors"],(0,p.fromJS)(r))}})})}),(0,a.default)(i,m.CLEAR_VALIDATE_PARAMS,function(e,t){var n=t.payload.pathMethod;return e.updateIn(["resolved","paths"].concat((0,c.default)(n),["parameters"]),(0,p.fromJS)([]),function(e){return e.withMutations(function(e){for(var t=0,n=e.count();t<n;t++)e.setIn([t,"errors"],(0,p.fromJS)([]))})})}),(0,a.default)(i,m.SET_RESPONSE,function(e,t){var n=t.payload,r=n.res,i=n.path,o=n.method,a=void 0;a=r.error?(0,u.default)({error:!0,name:r.err.name,message:r.err.message,statusCode:r.err.statusCode},r.err.response):r,a.headers=a.headers||{};var s=e.setIn(["responses",i,o],(0,f.fromJSOrdered)(a));return d.default.Blob&&r.data instanceof d.default.Blob&&(s=s.setIn(["responses",i,o,"text"],r.data)),s}),(0,a.default)(i,m.SET_REQUEST,function(e,t){var n=t.payload,r=n.req,i=n.path,o=n.method;return e.setIn(["requests",i,o],(0,f.fromJSOrdered)(r))}),(0,a.default)(i,m.SET_MUTATED_REQUEST,function(e,t){var n=t.payload,r=n.req,i=n.path,o=n.method;return e.setIn(["mutatedRequests",i,o],(0,f.fromJSOrdered)(r))}),(0,a.default)(i,m.UPDATE_OPERATION_META_VALUE,function(e,t){var n=t.payload,r=n.path,i=n.value,o=n.key,a=["resolved","paths"].concat((0,c.default)(r)),s=["meta","paths"].concat((0,c.default)(r));return e.getIn(a)?e.setIn([].concat((0,c.default)(s),[o]),(0,p.fromJS)(i)):e}),(0,a.default)(i,m.CLEAR_RESPONSE,function(e,t){var n=t.payload,r=n.path,i=n.method;return e.deleteIn(["responses",r,i])}),(0,a.default)(i,m.CLEAR_REQUEST,function(e,t){var n=t.payload,r=n.path,i=n.method;return e.deleteIn(["requests",r,i])}),(0,a.default)(i,m.SET_SCHEME,function(e,t){var n=t.payload,r=n.scheme,i=n.path,o=n.method;return i&&o?e.setIn(["scheme",i,o],r):i||o?void 0:e.setIn(["scheme","_defaultScheme"],r)}),i)},function(e,t,n){"use strict";function r(e,t,n,r){return t=t||[],_(e).getIn(["paths"].concat((0,f.default)(t),["parameters"]),(0,m.fromJS)([])).find(function(e){return m.Map.isMap(e)&&e.get("name")===n&&e.get("in")===r})||(0,m.Map)()}function i(e,t,n){return t=t||[],_(e).getIn(["paths"].concat((0,f.default)(t),["parameters"]),(0,m.fromJS)([])).reduce(function(e,t){var r=n&&"body"===t.get("in")?t.get("value_xml"):t.get("value");return e.set(t.get("in")+"."+t.get("name"),r)},(0,m.fromJS)({}))}function o(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(m.List.isList(e))return e.some(function(e){return m.Map.isMap(e)&&e.get("in")===t})}function a(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(m.List.isList(e))return e.some(function(e){return m.Map.isMap(e)&&e.get("type")===t})}function s(e,t){t=t||[];var n=_(e).getIn(["paths"].concat((0,f.default)(t)),(0,m.fromJS)({})),r=e.getIn(["meta","paths"].concat((0,f.default)(t)),(0,m.fromJS)({})),i=l(e,t),o=n.get("parameters")||new m.List,s=r.get("consumes_value")?r.get("consumes_value"):a(o,"file")?"multipart/form-data":a(o,"formData")?"application/x-www-form-urlencoded":void 0;return(0,m.fromJS)({requestContentType:s,responseContentType:i})}function u(e,t){return t=t||[],_(e).getIn(["paths"].concat((0,f.default)(t),["consumes"]),(0,m.fromJS)({}))}function l(e,t){t=t||[];var n=_(e).getIn(["paths"].concat((0,f.default)(t)),null);if(null!==n){var r=e.getIn(["meta","paths"].concat((0,f.default)(t),["produces_value"]),null),i=n.getIn(["produces",0],null);return r||i||"application/json"}}function c(e){return m.Map.isMap(e)?e:new m.Map}Object.defineProperty(t,"__esModule",{value:!0}),t.validateBeforeExecute=t.canExecuteScheme=t.operationScheme=t.hasHost=t.allowTryItOutFor=t.mutatedRequestFor=t.requestFor=t.responseFor=t.mutatedRequests=t.requests=t.responses=t.taggedOperations=t.operationsWithTags=t.tagDetails=t.tags=t.operationsWithRootInherited=t.schemes=t.host=t.basePath=t.definitions=t.findDefinition=t.securityDefinitions=t.security=t.produces=t.consumes=t.operations=t.paths=t.semver=t.version=t.externalDocs=t.info=t.isOAS3=t.spec=t.specResolved=t.specJson=t.specSource=t.specStr=t.url=t.lastError=void 0;var p=n(97),f=function(e){return e&&e.__esModule?e:{default:e}}(p);t.getParameter=r,t.parameterValues=i,t.parametersIncludeIn=o,t.parametersIncludeType=a,t.contentTypeValues=s,t.operationConsumes=u,t.currentProducesFor=l;var h=n(60),d=n(9),m=n(7),v=["get","put","post","delete","options","head","patch","trace"],g=function(e){return e||(0,m.Map)()},y=(t.lastError=(0,h.createSelector)(g,function(e){return e.get("lastError")}),t.url=(0,h.createSelector)(g,function(e){return e.get("url")}),t.specStr=(0,h.createSelector)(g,function(e){return e.get("spec")||""}),t.specSource=(0,h.createSelector)(g,function(e){return e.get("specSource")||"not-editor"}),t.specJson=(0,h.createSelector)(g,function(e){return e.get("json",(0,m.Map)())}),t.specResolved=(0,h.createSelector)(g,function(e){return e.get("resolved",(0,m.Map)())})),_=t.spec=function(e){return y(e)},b=(t.isOAS3=(0,h.createSelector)(_,function(){return!1}),t.info=(0,h.createSelector)(_,function(e){return c(e&&e.get("info"))})),x=(t.externalDocs=(0,h.createSelector)(_,function(e){return c(e&&e.get("externalDocs"))}),t.version=(0,h.createSelector)(b,function(e){return e&&e.get("version")})),w=(t.semver=(0,h.createSelector)(x,function(e){return/v?([0-9]*)\.([0-9]*)\.([0-9]*)/i.exec(e).slice(1)}),t.paths=(0,h.createSelector)(_,function(e){return e.get("paths")})),k=t.operations=(0,h.createSelector)(w,function(e){if(!e||e.size<1)return(0,m.List)();var t=(0,m.List)();return e&&e.forEach?(e.forEach(function(e,n){if(!e||!e.forEach)return{};e.forEach(function(e,r){v.indexOf(r)<0||(t=t.push((0,m.fromJS)({path:n,method:r,operation:e,id:r+"-"+n})))})}),t):(0,m.List)()}),E=t.consumes=(0,h.createSelector)(_,function(e){return(0,m.Set)(e.get("consumes"))}),S=t.produces=(0,h.createSelector)(_,function(e){return(0,m.Set)(e.get("produces"))}),C=(t.security=(0,h.createSelector)(_,function(e){return e.get("security",(0,m.List)())}),t.securityDefinitions=(0,h.createSelector)(_,function(e){return e.get("securityDefinitions")}),t.findDefinition=function(e,t){return y(e).getIn(["definitions",t],null)},t.definitions=(0,h.createSelector)(_,function(e){return e.get("definitions")||(0,m.Map)()}),t.basePath=(0,h.createSelector)(_,function(e){return e.get("basePath")}),t.host=(0,h.createSelector)(_,function(e){return e.get("host")}),t.schemes=(0,h.createSelector)(_,function(e){return e.get("schemes",(0,m.Map)())}),t.operationsWithRootInherited=(0,h.createSelector)(k,E,S,function(e,t,n){return e.map(function(e){return e.update("operation",function(e){if(e){if(!m.Map.isMap(e))return;return e.withMutations(function(e){return e.get("consumes")||e.update("consumes",function(e){return(0,m.Set)(e).merge(t)}),e.get("produces")||e.update("produces",function(e){return(0,m.Set)(e).merge(n)}),e})}return(0,m.Map)()})})})),A=t.tags=(0,h.createSelector)(_,function(e){return e.get("tags",(0,m.List)())}),D=t.tagDetails=function(e,t){return(A(e)||(0,m.List)()).filter(m.Map.isMap).find(function(e){return e.get("name")===t},(0,m.Map)())},O=t.operationsWithTags=(0,h.createSelector)(C,A,function(e,t){return e.reduce(function(e,t){var n=(0,m.Set)(t.getIn(["operation","tags"]));return n.count()<1?e.update("default",(0,m.List)(),function(e){return e.push(t)}):n.reduce(function(e,n){return e.update(n,(0,m.List)(),function(e){return e.push(t)})},e)},t.reduce(function(e,t){return e.set(t.get("name"),(0,m.List)())},(0,m.OrderedMap)()))}),M=(t.taggedOperations=function(e){return function(t){var n=t.getConfigs,r=n(),i=r.tagsSorter,o=r.operationsSorter;return O(e).sortBy(function(e,t){return t},function(e,t){var n="function"==typeof i?i:d.sorters.tagsSorter[i];return n?n(e,t):null}).map(function(t,n){var r="function"==typeof o?o:d.sorters.operationsSorter[o],i=r?t.sort(r):t;return(0,m.Map)({tagDetails:D(e,n),operations:i})})}},t.responses=(0,h.createSelector)(g,function(e){return e.get("responses",(0,m.Map)())})),T=t.requests=(0,h.createSelector)(g,function(e){return e.get("requests",(0,m.Map)())}),P=t.mutatedRequests=(0,h.createSelector)(g,function(e){return e.get("mutatedRequests",(0,m.Map)())}),I=(t.responseFor=function(e,t,n){return M(e).getIn([t,n],null)},t.requestFor=function(e,t,n){return T(e).getIn([t,n],null)},t.mutatedRequestFor=function(e,t,n){return P(e).getIn([t,n],null)},t.allowTryItOutFor=function(){return!0},t.hasHost=(0,h.createSelector)(_,function(e){var t=e.get("host");return"string"==typeof t&&t.length>0&&"/"!==t[0]}),t.operationScheme=function(e,t,n){var r=e.get("url"),i=r.match(/^([a-z][a-z0-9+\-.]*):/),o=Array.isArray(i)?i[1]:null;return e.getIn(["scheme",t,n])||e.getIn(["scheme","_defaultScheme"])||o||""});t.canExecuteScheme=function(e,t,n){return["http","https"].indexOf(I(e,t,n))>-1},t.validateBeforeExecute=function(e,t){t=t||[];var n=_(e).getIn(["paths"].concat((0,f.default)(t),["parameters"]),(0,m.fromJS)([])),r=!0;return n.forEach(function(e){var t=e.get("errors");t&&t.count()&&(r=!1)}),r}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.updateSpec=function(e,t){var n=t.specActions;return function(){e.apply(void 0,arguments),n.parseToJson.apply(n,arguments)}},t.updateJsonSpec=function(e,t){var n=t.specActions;return function(){e.apply(void 0,arguments),n.resolveSpec.apply(n,arguments)}},t.executeRequest=function(e,t){var n=t.specActions;return function(t){return n.logRequest(t),e(t)}},t.validateParams=function(e,t){var n=t.specSelectors;return function(t){return e(t,n.isOAS3())}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(1093),_=r(y),b=["split-pane-mode"],x="left",w="right",k="both",E=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.initializeComponent=function(e){r.splitPane=e},r.onDragFinished=function(){var e=r.props,t=e.threshold,n=e.layoutActions,i=r.splitPane.state,o=i.position,a=i.draggedSize;r.draggedSize=a;var s=o<=t,u=a<=t;n.changeMode(b,s?w:u?x:k)},r.sizeFromMode=function(e,t){return e===x?(r.draggedSize=null,"0px"):e===w?(r.draggedSize=null,"100%"):r.draggedSize||t},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.children,n=e.layoutSelectors,r=n.whatMode(b),i=r===w?m.default.createElement("noscript",null):t[0],o=r===x?m.default.createElement("noscript",null):t[1],a=this.sizeFromMode(r,"50%");return m.default.createElement(_.default,{disabledClass:"",ref:this.initializeComponent,split:"vertical",defaultSize:"50%",primary:"second",minSize:0,size:a,onDragFinished:this.onDragFinished,allowResize:r!==x&&r!==w,resizerStyle:{flex:"0 0 auto",position:"relative"}},i,o)}}]),t}(m.default.Component);E.propTypes={threshold:g.default.number,children:g.default.array,layoutSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired},E.defaultProps={threshold:100,children:[]},t.default=E},function(e,t,n){"use strict";function r(){return{components:{SplitPaneMode:o.default}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(324),o=function(e){return e&&e.__esModule?e:{default:e}}(i)},function(e,t,n){"use strict";var r=n(495),i=function(e){return e&&e.__esModule?e:{default:e}}(r);e.exports=function(e){var t=e.configs;return{fn:{fetch:i.default.makeHttp(t.preFetch,t.postFetch),buildRequest:i.default.buildRequest,execute:i.default.execute,resolve:i.default.resolve,serializeRes:i.default.serializeRes,opId:i.default.helpers.opId}}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{fn:{shallowEqualKeys:r.shallowEqualKeys}}};var r=n(9)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){var t=e.getComponents,n=e.getStore,r=e.getSystem,a=i.getComponent,s=i.render,u=i.makeMappedContainer,l=(0,o.memoize)(a.bind(null,r,n,t));return{rootInjects:{getComponent:l,makeMappedContainer:(0,o.memoize)(u.bind(null,r,n,l,t)),render:s.bind(null,r,n,a,t)}}};var r=n(329),i=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(r),o=n(9)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.getComponent=t.render=t.makeMappedContainer=void 0;var i=n(48),o=r(i),a=n(47),s=r(a),u=n(30),l=r(u),c=n(21),p=r(c),f=n(4),h=r(f),d=n(2),m=r(d),v=n(3),g=r(v),y=n(6),_=r(y),b=n(5),x=r(b),w=n(0),k=r(w),E=n(449),S=r(E),C=n(1090),A=n(950),D=r(A),O=function(e,t){return function(n){function r(){return(0,m.default)(this,r),(0,_.default)(this,(r.__proto__||(0,h.default)(r)).apply(this,arguments))}return(0,x.default)(r,n),(0,g.default)(r,[{key:"render",value:function(){return k.default.createElement(t,(0,p.default)({},e(),this.props,this.context))}}]),r}(w.Component)},M=function(e,t){return function(n){function r(){return(0,m.default)(this,r),(0,_.default)(this,(r.__proto__||(0,h.default)(r)).apply(this,arguments))}return(0,x.default)(r,n),(0,g.default)(r,[{key:"render",value:function(){return k.default.createElement(C.Provider,{store:e},k.default.createElement(t,(0,p.default)({},this.props,this.context)))}}]),r}(w.Component)},T=function(e,t,n){var r=function(n,r){var i=(0,l.default)({},r,e());return(t.prototype.mapStateToProps||function(e){return{state:e}})(n,i)},i=O(e,t),o=(0,C.connect)(r)(i);return n?M(n,o):o},P=function(e,t,n,r){for(var i in t){var o=t[i];"function"==typeof o&&o(n[i],r[i],e())}},I=(t.makeMappedContainer=function(e,t,n,r,i,o){return function(t){function r(t,n){(0,m.default)(this,r);var i=(0,_.default)(this,(r.__proto__||(0,h.default)(r)).call(this,t,n));return P(e,o,t,{}),i}return(0,x.default)(r,t),(0,g.default)(r,[{key:"componentWillReceiveProps",value:function(t){P(e,o,t,this.props)}},{key:"render",value:function(){var e=(0,D.default)(this.props,o?(0,s.default)(o):[]),t=n(i,"root");return k.default.createElement(t,e)}}]),r}(w.Component)},t.render=function(e,t,n,r,i){var o=n(e,t,r,"App","root");S.default.render(k.default.createElement(o,null),i)},function(e){return function(t){function n(){return(0,m.default)(this,n),(0,_.default)(this,(n.__proto__||(0,h.default)(n)).apply(this,arguments))}return(0,x.default)(n,t),(0,g.default)(n,[{key:"render",value:function(){return e(this.props)}}]),n}(w.Component)}),R=function(e){var t=e.name;return k.default.createElement("div",{style:{padding:"1em",color:"#aaa"}},"😱 ",k.default.createElement("i",null,"Could not render ","t"===t?"this component":t,", see the console."))},j=function(e){var t=function(e){return!(e.prototype&&e.prototype.isReactComponent)}(e)?I(e):e,n=t.prototype.render;return t.prototype.render=function(){try{for(var e=arguments.length,r=Array(e),i=0;i<e;i++)r[i]=arguments[i];return n.apply(this,r)}catch(e){return console.error(e),k.default.createElement(R,{error:e,name:t.name})}},t};t.getComponent=function(e,t,n,r,i){if("string"!=typeof r)throw new TypeError("Need a string, to fetch a component. Was given a "+(void 0===r?"undefined":(0,o.default)(r)));var a=n(r);return a?i?"root"===i?T(e,a,t()):T(e,j(a)):j(a):(e().log.warn("Could not find component",r),null)}},function(e,t,n){e.exports={default:n(590),__esModule:!0}},function(e,t,n){e.exports={default:n(591),__esModule:!0}},function(e,t,n){e.exports={default:n(595),__esModule:!0}},function(e,t,n){"use strict";function r(){}function i(e){var t,n,r=e.walker();for(this.buffer="",this.lastOut="\n";t=r.next();)n=t.node.type,this[n]&&this[n](t.node,t.entering);return this.buffer}function o(e){this.buffer+=e,this.lastOut=e}function a(){"\n"!==this.lastOut&&this.lit("\n")}function s(e){this.lit(e)}function u(e){return e}r.prototype.render=i,r.prototype.out=s,r.prototype.lit=o,r.prototype.cr=a,r.prototype.esc=u,e.exports=r},function(e,t,n){var r=n(24).document;e.exports=r&&r.documentElement},function(e,t,n){e.exports=!n(49)&&!n(54)(function(){return 7!=Object.defineProperty(n(179)("div"),"a",{get:function(){return 7}}).a})},function(e,t,n){var r=n(74),i=n(22)("iterator"),o=Array.prototype;e.exports=function(e){return void 0!==e&&(r.Array===e||o[i]===e)}},function(e,t,n){var r=n(99);e.exports=Array.isArray||function(e){return"Array"==r(e)}},function(e,t,n){var r=n(37);e.exports=function(e,t,n,i){try{return i?t(r(n)[0],n[1]):t(n)}catch(t){var o=e.return;throw void 0!==o&&r(o.call(e)),t}}},function(e,t,n){"use strict";var r=n(130),i=n(23),o=n(186),a=n(56),s=n(55),u=n(74),l=n(608),c=n(102),p=n(344),f=n(22)("iterator"),h=!([].keys&&"next"in[].keys()),d=function(){return this};e.exports=function(e,t,n,m,v,g,y){l(n,t,m);var _,b,x,w=function(e){if(!h&&e in C)return C[e];switch(e){case"keys":case"values":return function(){return new n(this,e)}}return function(){return new n(this,e)}},k=t+" Iterator",E="values"==v,S=!1,C=e.prototype,A=C[f]||C["@@iterator"]||v&&C[v],D=!h&&A||w(v),O=v?E?w("entries"):D:void 0,M="Array"==t?C.entries||A:A;if(M&&(x=p(M.call(new e)))!==Object.prototype&&x.next&&(c(x,k,!0),r||s(x,f)||a(x,f,d)),E&&A&&"values"!==A.name&&(S=!0,D=function(){return A.call(this)}),r&&!y||!h&&!S&&C[f]||a(C,f,D),u[t]=D,u[k]=d,v)if(_={values:E?D:w("values"),keys:g?D:w("keys"),entries:O},y)for(b in _)b in C||o(C,b,_[b]);else i(i.P+i.F*(h||S),t,_);return _}},function(e,t,n){var r=n(22)("iterator"),i=!1;try{var o=[7][r]();o.return=function(){i=!0},Array.from(o,function(){throw 2})}catch(e){}e.exports=function(e,t){if(!t&&!i)return!1;var n=!1;try{var o=[7],a=o[r]();a.next=function(){return{done:n=!0}},o[r]=function(){return a},e(o)}catch(e){}return n}},function(e,t,n){"use strict";var r=n(100),i=n(184),o=n(132),a=n(76),s=n(181),u=Object.assign;e.exports=!u||n(54)(function(){var e={},t={},n=Symbol(),r="abcdefghijklmnopqrst";return e[n]=7,r.split("").forEach(function(e){t[e]=e}),7!=u({},e)[n]||Object.keys(u({},t)).join("")!=r})?function(e,t){for(var n=a(e),u=arguments.length,l=1,c=i.f,p=o.f;u>l;)for(var f,h=s(arguments[l++]),d=c?r(h).concat(c(h)):r(h),m=d.length,v=0;m>v;)p.call(h,f=d[v++])&&(n[f]=h[f]);return n}:u},function(e,t,n){var r=n(132),i=n(101),o=n(75),a=n(190),s=n(55),u=n(335),l=Object.getOwnPropertyDescriptor;t.f=n(49)?l:function(e,t){if(e=o(e),t=a(t,!0),u)try{return l(e,t)}catch(e){}if(s(e,t))return i(!r.f.call(e,t),e[t])}},function(e,t,n){var r=n(345),i=n(180).concat("length","prototype");t.f=Object.getOwnPropertyNames||function(e){return r(e,i)}},function(e,t,n){var r=n(55),i=n(76),o=n(187)("IE_PROTO"),a=Object.prototype;e.exports=Object.getPrototypeOf||function(e){return e=i(e),r(e,o)?e[o]:"function"==typeof e.constructor&&e instanceof e.constructor?e.constructor.prototype:e instanceof Object?a:null}},function(e,t,n){var r=n(55),i=n(75),o=n(600)(!1),a=n(187)("IE_PROTO");e.exports=function(e,t){var n,s=i(e),u=0,l=[];for(n in s)n!=a&&r(s,n)&&l.push(n);for(;t.length>u;)r(s,n=t[u++])&&(~o(l,n)||l.push(n));return l}},function(e,t,n){var r=n(23),i=n(15),o=n(54);e.exports=function(e,t){var n=(i.Object||{})[e]||Object[e],a={};a[e]=t(n),r(r.S+r.F*o(function(){n(1)}),"Object",a)}},function(e,t){e.exports=function(e){try{return{e:!1,v:e()}}catch(e){return{e:!0,v:e}}}},function(e,t,n){var r=n(37),i=n(27),o=n(182);e.exports=function(e,t){if(r(e),i(t)&&t.constructor===e)return t;var n=o.f(e);return(0,n.resolve)(t),n.promise}},function(e,t,n){var r=n(37),i=n(98),o=n(22)("species");e.exports=function(e,t){var n,a=r(e).constructor;return void 0===a||void 0==(n=r(a)[o])?t:i(n)}},function(e,t,n){var r,i,o,a=n(53),s=n(607),u=n(334),l=n(179),c=n(24),p=c.process,f=c.setImmediate,h=c.clearImmediate,d=c.MessageChannel,m=c.Dispatch,v=0,g={},y=function(){var e=+this;if(g.hasOwnProperty(e)){var t=g[e];delete g[e],t()}},_=function(e){y.call(e.data)};f&&h||(f=function(e){for(var t=[],n=1;arguments.length>n;)t.push(arguments[n++]);return g[++v]=function(){s("function"==typeof e?e:Function(e),t)},r(v),v},h=function(e){delete g[e]},"process"==n(99)(p)?r=function(e){p.nextTick(a(y,e,1))}:m&&m.now?r=function(e){m.now(a(y,e,1))}:d?(i=new d,o=i.port2,i.port1.onmessage=_,r=a(o.postMessage,o,1)):c.addEventListener&&"function"==typeof postMessage&&!c.importScripts?(r=function(e){c.postMessage(e+"","*")},c.addEventListener("message",_,!1)):r="onreadystatechange"in l("script")?function(e){u.appendChild(l("script")).onreadystatechange=function(){u.removeChild(this),y.call(e)}}:function(e){setTimeout(a(y,e,1),0)}),e.exports={set:f,clear:h}},function(e,t,n){var r=n(27);e.exports=function(e,t){if(!r(e)||e._t!==t)throw TypeError("Incompatible receiver, "+t+" required!");return e}},function(e,t){e.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(e,t,n){var r=n(31).document;e.exports=r&&r.documentElement},function(e,t,n){var r=n(77),i=n(105),o=n(19)("match");e.exports=function(e){var t;return r(e)&&(void 0!==(t=e[o])?!!t:"RegExp"==i(e))}},function(e,t,n){"use strict";var r=n(356),i=n(28),o=n(78),a=n(64),s=n(108),u=n(109),l=n(647),c=n(199),p=n(653),f=n(19)("iterator"),h=!([].keys&&"next"in[].keys()),d=function(){return this};e.exports=function(e,t,n,m,v,g,y){l(n,t,m);var _,b,x,w=function(e){if(!h&&e in C)return C[e];switch(e){case"keys":case"values":return function(){return new n(this,e)}}return function(){return new n(this,e)}},k=t+" Iterator",E="values"==v,S=!1,C=e.prototype,A=C[f]||C["@@iterator"]||v&&C[v],D=!h&&A||w(v),O=v?E?w("entries"):D:void 0,M="Array"==t?C.entries||A:A;if(M&&(x=p(M.call(new e)))!==Object.prototype&&x.next&&(c(x,k,!0),r||s(x,f)||a(x,f,d)),E&&A&&"values"!==A.name&&(S=!0,D=function(){return A.call(this)}),r&&!y||!h&&!S&&C[f]||a(C,f,D),u[t]=D,u[k]=d,v)if(_={values:E?D:w("values"),keys:g?D:w("keys"),entries:O},y)for(b in _)b in C||o(C,b,_[b]);else i(i.P+i.F*(h||S),t,_);return _}},function(e,t){e.exports=!1},function(e,t,n){var r=n(654),i=n(352);e.exports=Object.keys||function(e){return r(e,i)}},function(e,t){e.exports=function(e){try{return{e:!1,v:e()}}catch(e){return{e:!0,v:e}}}},function(e,t,n){var r=n(62),i=n(77),o=n(198);e.exports=function(e,t){if(r(e),i(t)&&t.constructor===e)return t;var n=o.f(e);return(0,n.resolve)(t),n.promise}},function(e,t){e.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},function(e,t,n){var r=n(31),i=r["__core-js_shared__"]||(r["__core-js_shared__"]={});e.exports=function(e){return i[e]||(i[e]={})}},function(e,t,n){var r=n(62),i=n(135),o=n(19)("species");e.exports=function(e,t){var n,a=r(e).constructor;return void 0===a||void 0==(n=r(a)[o])?t:i(n)}},function(e,t,n){var r=n(139),i=n(57);e.exports=function(e){return function(t,n){var o,a,s=String(i(t)),u=r(n),l=s.length;return u<0||u>=l?e?"":void 0:(o=s.charCodeAt(u),o<55296||o>56319||u+1===l||(a=s.charCodeAt(u+1))<56320||a>57343?e?s.charAt(u):o:e?s.slice(u,u+2):a-56320+(o-55296<<10)+65536)}}},function(e,t,n){var r,i,o,a=n(136),s=n(643),u=n(353),l=n(196),c=n(31),p=c.process,f=c.setImmediate,h=c.clearImmediate,d=c.MessageChannel,m=c.Dispatch,v=0,g={},y=function(){var e=+this;if(g.hasOwnProperty(e)){var t=g[e];delete g[e],t()}},_=function(e){y.call(e.data)};f&&h||(f=function(e){for(var t=[],n=1;arguments.length>n;)t.push(arguments[n++]);return g[++v]=function(){s("function"==typeof e?e:Function(e),t)},r(v),v},h=function(e){delete g[e]},"process"==n(105)(p)?r=function(e){p.nextTick(a(y,e,1))}:m&&m.now?r=function(e){m.now(a(y,e,1))}:d?(i=new d,o=i.port2,i.port1.onmessage=_,r=a(o.postMessage,o,1)):c.addEventListener&&"function"==typeof postMessage&&!c.importScripts?(r=function(e){c.postMessage(e+"","*")},c.addEventListener("message",_,!1)):r="onreadystatechange"in l("script")?function(e){u.appendChild(l("script")).onreadystatechange=function(){u.removeChild(this),y.call(e)}}:function(e){setTimeout(a(y,e,1),0)}),e.exports={set:f,clear:h}},function(e,t,n){var r=n(139),i=Math.max,o=Math.min;e.exports=function(e,t){return e=r(e),e<0?i(e+t,0):o(e,t)}},function(e,t,n){"use strict";var r=n(363)(!0);n(355)(String,"String",function(e){this._t=String(e),this._i=0},function(){var e,t=this._t,n=this._i;return n>=t.length?{value:void 0,done:!0}:(e=r(t,n),this._i+=e.length,{value:e,done:!1})})},function(e,t,n){"use strict";function r(e){return(0,o.default)(e)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(763),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t){var n=e.exports={get firstChild(){var e=this.children;return e&&e[0]||null},get lastChild(){var e=this.children;return e&&e[e.length-1]||null},get nodeType(){return i[this.type]||i.element}},r={tagName:"name",childNodes:"children",parentNode:"parent",previousSibling:"prev",nextSibling:"next",nodeValue:"data"},i={element:1,text:3,cdata:4,comment:8};Object.keys(r).forEach(function(e){var t=r[e];Object.defineProperty(n,e,{get:function(){return this[t]||null},set:function(e){return this[t]=e,e}})})},function(e,t,n){function r(e){if(e>=55296&&e<=57343||e>1114111)return"�";e in i&&(e=i[e]);var t="";return e>65535&&(e-=65536,t+=String.fromCharCode(e>>>10&1023|55296),e=56320|1023&e),t+=String.fromCharCode(e)}var i=n(712);e.exports=r},function(e,t){e.exports={Aacute:"Á",aacute:"á",Acirc:"Â",acirc:"â",acute:"´",AElig:"Æ",aelig:"æ",Agrave:"À",agrave:"à",amp:"&",AMP:"&",Aring:"Å",aring:"å",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",brvbar:"¦",Ccedil:"Ç",ccedil:"ç",cedil:"¸",cent:"¢",copy:"©",COPY:"©",curren:"¤",deg:"°",divide:"÷",Eacute:"É",eacute:"é",Ecirc:"Ê",ecirc:"ê",Egrave:"È",egrave:"è",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",frac12:"½",frac14:"¼",frac34:"¾",gt:">",GT:">",Iacute:"Í",iacute:"í",Icirc:"Î",icirc:"î",iexcl:"¡",Igrave:"Ì",igrave:"ì",iquest:"¿",Iuml:"Ï",iuml:"ï",laquo:"«",lt:"<",LT:"<",macr:"¯",micro:"µ",middot:"·",nbsp:" ",not:"¬",Ntilde:"Ñ",ntilde:"ñ",Oacute:"Ó",oacute:"ó",Ocirc:"Ô",ocirc:"ô",Ograve:"Ò",ograve:"ò",ordf:"ª",ordm:"º",Oslash:"Ø",oslash:"ø",Otilde:"Õ",otilde:"õ",Ouml:"Ö",ouml:"ö",para:"¶",plusmn:"±",pound:"£",quot:'"',QUOT:'"',raquo:"»",reg:"®",REG:"®",sect:"§",shy:"­",sup1:"¹",sup2:"²",sup3:"³",szlig:"ß",THORN:"Þ",thorn:"þ",times:"×",Uacute:"Ú",uacute:"ú",Ucirc:"Û",ucirc:"û",Ugrave:"Ù",ugrave:"ù",uml:"¨",Uuml:"Ü",uuml:"ü",Yacute:"Ý",yacute:"ý",yen:"¥",yuml:"ÿ"}},function(e,t,n){"use strict";var r,i,o,a,s=n(65),u=function(e,t){return t};try{Object.defineProperty(u,"length",{configurable:!0,writable:!1,enumerable:!1,value:1})}catch(e){}1===u.length?(r={configurable:!0,writable:!1,enumerable:!1},i=Object.defineProperty,e.exports=function(e,t){return t=s(t),e.length===t?e:(r.value=t,i(e,"length",r))}):(a=n(375),o=function(){var e=[];return function(t){var n,r=0;if(e[t])return e[t];for(n=[];t--;)n.push("a"+(++r).toString(36));return new Function("fn","return function ("+n.join(", ")+") { return fn.apply(this, arguments); };")}}(),e.exports=function(e,t){var n;if(t=s(t),e.length===t)return e;n=o(t)(e);try{a(n,e)}catch(e){}return n})},function(e,t,n){"use strict";e.exports=function(){}},function(e,t,n){"use strict";e.exports=n(727)()?Object.assign:n(728)},function(e,t,n){"use strict";var r=n(58),i=n(142),o=Function.prototype.call;e.exports=function(e,t){var n={},a=arguments[2];return r(t),i(e,function(e,r,i,s){n[r]=o.call(t,a,e,r,i,s)}),n}},function(e,t,n){"use strict";var r=n(115),i=Object.defineProperty,o=Object.getOwnPropertyDescriptor,a=Object.getOwnPropertyNames,s=Object.getOwnPropertySymbols;e.exports=function(e,t){var n,u=Object(r(t));if(e=Object(r(e)),a(u).forEach(function(r){try{i(e,r,o(t,r))}catch(e){n=e}}),"function"==typeof s&&s(u).forEach(function(r){try{i(e,r,o(t,r))}catch(e){n=e}}),void 0!==n)throw n;return e}},function(e,t,n){"use strict";var r=n(79),i=Array.prototype.forEach,o=Object.create,a=function(e,t){var n;for(n in e)t[n]=e[n]};e.exports=function(e){var t=o(null);return i.call(arguments,function(e){r(e)&&a(Object(e),t)}),t}},function(e,t,n){"use strict";var r=n(32),i={listen:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!1),{remove:function(){e.removeEventListener(t,n,!1)}}):e.attachEvent?(e.attachEvent("on"+t,n),{remove:function(){e.detachEvent("on"+t,n)}}):void 0},capture:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!0),{remove:function(){e.removeEventListener(t,n,!0)}}):{remove:r}},registerDefault:function(){}};e.exports=i},function(e,t,n){"use strict";function r(e){try{e.focus()}catch(e){}}e.exports=r},function(e,t,n){"use strict";function r(e){if(void 0===(e=e||("undefined"!=typeof document?document:void 0)))return null;try{return e.activeElement||e.body}catch(t){return e.body}}e.exports=r},function(e,t,n){function r(e,t){this._options=t||{},this._cbs=e||{},this._tagname="",this._attribname="",this._attribvalue="",this._attribs=null,this._stack=[],this.startIndex=0,this.endIndex=null,this._lowerCaseTagNames="lowerCaseTags"in this._options?!!this._options.lowerCaseTags:!this._options.xmlMode,this._lowerCaseAttributeNames="lowerCaseAttributeNames"in this._options?!!this._options.lowerCaseAttributeNames:!this._options.xmlMode,this._options.Tokenizer&&(i=this._options.Tokenizer),this._tokenizer=new i(this._options,this),this._cbs.onparserinit&&this._cbs.onparserinit(this)}var i=n(381),o={input:!0,option:!0,optgroup:!0,select:!0,button:!0,datalist:!0,textarea:!0},a={tr:{tr:!0,th:!0,td:!0},th:{th:!0},td:{thead:!0,th:!0,td:!0},body:{head:!0,link:!0,script:!0},li:{li:!0},p:{p:!0},h1:{p:!0},h2:{p:!0},h3:{p:!0},h4:{p:!0},h5:{p:!0},h6:{p:!0},select:o,input:o,output:o,button:o,datalist:o,textarea:o,option:{option:!0},optgroup:{optgroup:!0}},s={__proto__:null,area:!0,base:!0,basefont:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,isindex:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,path:!0,circle:!0,ellipse:!0,line:!0,rect:!0,use:!0,stop:!0,polyline:!0,polygon:!0},u=/\s|\//;n(42)(r,n(143).EventEmitter),r.prototype._updatePosition=function(e){null===this.endIndex?this._tokenizer._sectionStart<=e?this.startIndex=0:this.startIndex=this._tokenizer._sectionStart-e:this.startIndex=this.endIndex+1,this.endIndex=this._tokenizer.getAbsoluteIndex()},r.prototype.ontext=function(e){this._updatePosition(1),this.endIndex--,this._cbs.ontext&&this._cbs.ontext(e)},r.prototype.onopentagname=function(e){if(this._lowerCaseTagNames&&(e=e.toLowerCase()),this._tagname=e,!this._options.xmlMode&&e in a)for(var t;(t=this._stack[this._stack.length-1])in a[e];this.onclosetag(t));!this._options.xmlMode&&e in s||this._stack.push(e),this._cbs.onopentagname&&this._cbs.onopentagname(e),this._cbs.onopentag&&(this._attribs={})},r.prototype.onopentagend=function(){this._updatePosition(1),this._attribs&&(this._cbs.onopentag&&this._cbs.onopentag(this._tagname,this._attribs),this._attribs=null),!this._options.xmlMode&&this._cbs.onclosetag&&this._tagname in s&&this._cbs.onclosetag(this._tagname),this._tagname=""},r.prototype.onclosetag=function(e){if(this._updatePosition(1),this._lowerCaseTagNames&&(e=e.toLowerCase()),!this._stack.length||e in s&&!this._options.xmlMode)this._options.xmlMode||"br"!==e&&"p"!==e||(this.onopentagname(e),this._closeCurrentTag());else{var t=this._stack.lastIndexOf(e);if(-1!==t)if(this._cbs.onclosetag)for(t=this._stack.length-t;t--;)this._cbs.onclosetag(this._stack.pop());else this._stack.length=t;else"p"!==e||this._options.xmlMode||(this.onopentagname(e),this._closeCurrentTag())}},r.prototype.onselfclosingtag=function(){this._options.xmlMode||this._options.recognizeSelfClosing?this._closeCurrentTag():this.onopentagend()},r.prototype._closeCurrentTag=function(){var e=this._tagname;this.onopentagend(),this._stack[this._stack.length-1]===e&&(this._cbs.onclosetag&&this._cbs.onclosetag(e),this._stack.pop())},r.prototype.onattribname=function(e){this._lowerCaseAttributeNames&&(e=e.toLowerCase()),this._attribname=e},r.prototype.onattribdata=function(e){this._attribvalue+=e},r.prototype.onattribend=function(){this._cbs.onattribute&&this._cbs.onattribute(this._attribname,this._attribvalue),this._attribs&&!Object.prototype.hasOwnProperty.call(this._attribs,this._attribname)&&(this._attribs[this._attribname]=this._attribvalue),this._attribname="",this._attribvalue=""},r.prototype._getInstructionName=function(e){var t=e.search(u),n=t<0?e:e.substr(0,t);return this._lowerCaseTagNames&&(n=n.toLowerCase()),n},r.prototype.ondeclaration=function(e){if(this._cbs.onprocessinginstruction){var t=this._getInstructionName(e);this._cbs.onprocessinginstruction("!"+t,"!"+e)}},r.prototype.onprocessinginstruction=function(e){if(this._cbs.onprocessinginstruction){var t=this._getInstructionName(e);this._cbs.onprocessinginstruction("?"+t,"?"+e)}},r.prototype.oncomment=function(e){this._updatePosition(4),this._cbs.oncomment&&this._cbs.oncomment(e),this._cbs.oncommentend&&this._cbs.oncommentend()},r.prototype.oncdata=function(e){this._updatePosition(1),this._options.xmlMode||this._options.recognizeCDATA?(this._cbs.oncdatastart&&this._cbs.oncdatastart(),this._cbs.ontext&&this._cbs.ontext(e),this._cbs.oncdataend&&this._cbs.oncdataend()):this.oncomment("[CDATA["+e+"]]")},r.prototype.onerror=function(e){this._cbs.onerror&&this._cbs.onerror(e)},r.prototype.onend=function(){if(this._cbs.onclosetag)for(var e=this._stack.length;e>0;this._cbs.onclosetag(this._stack[--e]));this._cbs.onend&&this._cbs.onend()},r.prototype.reset=function(){this._cbs.onreset&&this._cbs.onreset(),this._tokenizer.reset(),this._tagname="",this._attribname="",this._attribs=null,this._stack=[],this._cbs.onparserinit&&this._cbs.onparserinit(this)},r.prototype.parseComplete=function(e){this.reset(),this.end(e)},r.prototype.write=function(e){this._tokenizer.write(e)},r.prototype.end=function(e){this._tokenizer.end(e)},r.prototype.pause=function(){this._tokenizer.pause()},r.prototype.resume=function(){this._tokenizer.resume()},r.prototype.parseChunk=r.prototype.write,r.prototype.done=r.prototype.end,e.exports=r},function(e,t,n){function r(e){return" "===e||"\n"===e||"\t"===e||"\f"===e||"\r"===e}function i(e,t,n){var r=e.toLowerCase();return e===r?function(e){e===r?this._state=t:(this._state=n,this._index--)}:function(i){i===r||i===e?this._state=t:(this._state=n,this._index--)}}function o(e,t){var n=e.toLowerCase();return function(r){r===n||r===e?this._state=t:(this._state=d,this._index--)}}function a(e,t){this._state=f,this._buffer="",this._sectionStart=0,this._index=0,this._bufferOffset=0,this._baseState=f,this._special=de,this._cbs=t,this._running=!0,this._ended=!1,this._xmlMode=!(!e||!e.xmlMode),this._decodeEntities=!(!e||!e.decodeEntities)}e.exports=a;var s=n(369),u=n(204),l=n(370),c=n(205),p=0,f=p++,h=p++,d=p++,m=p++,v=p++,g=p++,y=p++,_=p++,b=p++,x=p++,w=p++,k=p++,E=p++,S=p++,C=p++,A=p++,D=p++,O=p++,M=p++,T=p++,P=p++,I=p++,R=p++,j=p++,F=p++,N=p++,B=p++,L=p++,q=p++,z=p++,U=p++,W=p++,V=p++,H=p++,G=p++,J=p++,K=p++,X=p++,Y=p++,$=p++,Z=p++,Q=p++,ee=p++,te=p++,ne=p++,re=p++,ie=p++,oe=p++,ae=p++,se=p++,ue=p++,le=p++,ce=p++,pe=p++,fe=p++,he=0,de=he++,me=he++,ve=he++;a.prototype._stateText=function(e){"<"===e?(this._index>this._sectionStart&&this._cbs.ontext(this._getSection()),this._state=h,this._sectionStart=this._index):this._decodeEntities&&this._special===de&&"&"===e&&(this._index>this._sectionStart&&this._cbs.ontext(this._getSection()),this._baseState=f,this._state=ue,this._sectionStart=this._index)},a.prototype._stateBeforeTagName=function(e){"/"===e?this._state=v:"<"===e?(this._cbs.ontext(this._getSection()),this._sectionStart=this._index):">"===e||this._special!==de||r(e)?this._state=f:"!"===e?(this._state=C,this._sectionStart=this._index+1):"?"===e?(this._state=D,this._sectionStart=this._index+1):(this._state=this._xmlMode||"s"!==e&&"S"!==e?d:U,this._sectionStart=this._index)},a.prototype._stateInTagName=function(e){("/"===e||">"===e||r(e))&&(this._emitToken("onopentagname"),this._state=_,this._index--)},a.prototype._stateBeforeCloseingTagName=function(e){r(e)||(">"===e?this._state=f:this._special!==de?"s"===e||"S"===e?this._state=W:(this._state=f,this._index--):(this._state=g,this._sectionStart=this._index))},a.prototype._stateInCloseingTagName=function(e){(">"===e||r(e))&&(this._emitToken("onclosetag"),this._state=y,this._index--)},a.prototype._stateAfterCloseingTagName=function(e){">"===e&&(this._state=f,this._sectionStart=this._index+1)},a.prototype._stateBeforeAttributeName=function(e){">"===e?(this._cbs.onopentagend(),this._state=f,this._sectionStart=this._index+1):"/"===e?this._state=m:r(e)||(this._state=b,this._sectionStart=this._index)},a.prototype._stateInSelfClosingTag=function(e){">"===e?(this._cbs.onselfclosingtag(),this._state=f,this._sectionStart=this._index+1):r(e)||(this._state=_,this._index--)},a.prototype._stateInAttributeName=function(e){("="===e||"/"===e||">"===e||r(e))&&(this._cbs.onattribname(this._getSection()),this._sectionStart=-1,this._state=x,this._index--)},a.prototype._stateAfterAttributeName=function(e){"="===e?this._state=w:"/"===e||">"===e?(this._cbs.onattribend(),this._state=_,this._index--):r(e)||(this._cbs.onattribend(),this._state=b,this._sectionStart=this._index)},a.prototype._stateBeforeAttributeValue=function(e){'"'===e?(this._state=k,this._sectionStart=this._index+1):"'"===e?(this._state=E,this._sectionStart=this._index+1):r(e)||(this._state=S,this._sectionStart=this._index,this._index--)},a.prototype._stateInAttributeValueDoubleQuotes=function(e){'"'===e?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=_):this._decodeEntities&&"&"===e&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ue,this._sectionStart=this._index)},a.prototype._stateInAttributeValueSingleQuotes=function(e){"'"===e?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=_):this._decodeEntities&&"&"===e&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ue,this._sectionStart=this._index)},a.prototype._stateInAttributeValueNoQuotes=function(e){r(e)||">"===e?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=_,this._index--):this._decodeEntities&&"&"===e&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ue,this._sectionStart=this._index)},a.prototype._stateBeforeDeclaration=function(e){this._state="["===e?I:"-"===e?O:A},a.prototype._stateInDeclaration=function(e){">"===e&&(this._cbs.ondeclaration(this._getSection()),this._state=f,this._sectionStart=this._index+1)},a.prototype._stateInProcessingInstruction=function(e){">"===e&&(this._cbs.onprocessinginstruction(this._getSection()),this._state=f,this._sectionStart=this._index+1)},a.prototype._stateBeforeComment=function(e){"-"===e?(this._state=M,this._sectionStart=this._index+1):this._state=A},a.prototype._stateInComment=function(e){"-"===e&&(this._state=T)},a.prototype._stateAfterComment1=function(e){this._state="-"===e?P:M},a.prototype._stateAfterComment2=function(e){">"===e?(this._cbs.oncomment(this._buffer.substring(this._sectionStart,this._index-2)),this._state=f,this._sectionStart=this._index+1):"-"!==e&&(this._state=M)},a.prototype._stateBeforeCdata1=i("C",R,A),a.prototype._stateBeforeCdata2=i("D",j,A),a.prototype._stateBeforeCdata3=i("A",F,A),a.prototype._stateBeforeCdata4=i("T",N,A),a.prototype._stateBeforeCdata5=i("A",B,A),a.prototype._stateBeforeCdata6=function(e){"["===e?(this._state=L,this._sectionStart=this._index+1):(this._state=A,this._index--)},a.prototype._stateInCdata=function(e){"]"===e&&(this._state=q)},a.prototype._stateAfterCdata1=function(e,t){return function(n){n===e&&(this._state=t)}}("]",z),a.prototype._stateAfterCdata2=function(e){">"===e?(this._cbs.oncdata(this._buffer.substring(this._sectionStart,this._index-2)),this._state=f,this._sectionStart=this._index+1):"]"!==e&&(this._state=L)},a.prototype._stateBeforeSpecial=function(e){"c"===e||"C"===e?this._state=V:"t"===e||"T"===e?this._state=ee:(this._state=d,this._index--)},a.prototype._stateBeforeSpecialEnd=function(e){this._special!==me||"c"!==e&&"C"!==e?this._special!==ve||"t"!==e&&"T"!==e?this._state=f:this._state=ie:this._state=X},a.prototype._stateBeforeScript1=o("R",H),a.prototype._stateBeforeScript2=o("I",G),a.prototype._stateBeforeScript3=o("P",J),a.prototype._stateBeforeScript4=o("T",K),a.prototype._stateBeforeScript5=function(e){("/"===e||">"===e||r(e))&&(this._special=me),this._state=d,this._index--},a.prototype._stateAfterScript1=i("R",Y,f),a.prototype._stateAfterScript2=i("I",$,f),a.prototype._stateAfterScript3=i("P",Z,f),a.prototype._stateAfterScript4=i("T",Q,f),a.prototype._stateAfterScript5=function(e){">"===e||r(e)?(this._special=de,this._state=g,this._sectionStart=this._index-6,this._index--):this._state=f},a.prototype._stateBeforeStyle1=o("Y",te),a.prototype._stateBeforeStyle2=o("L",ne),a.prototype._stateBeforeStyle3=o("E",re),a.prototype._stateBeforeStyle4=function(e){("/"===e||">"===e||r(e))&&(this._special=ve),this._state=d,this._index--},a.prototype._stateAfterStyle1=i("Y",oe,f),a.prototype._stateAfterStyle2=i("L",ae,f),a.prototype._stateAfterStyle3=i("E",se,f),a.prototype._stateAfterStyle4=function(e){">"===e||r(e)?(this._special=de,this._state=g,this._sectionStart=this._index-5,this._index--):this._state=f},a.prototype._stateBeforeEntity=i("#",le,ce),a.prototype._stateBeforeNumericEntity=i("X",fe,pe),a.prototype._parseNamedEntityStrict=function(){if(this._sectionStart+1<this._index){var e=this._buffer.substring(this._sectionStart+1,this._index),t=this._xmlMode?c:u;t.hasOwnProperty(e)&&(this._emitPartial(t[e]),this._sectionStart=this._index+1)}},a.prototype._parseLegacyEntity=function(){var e=this._sectionStart+1,t=this._index-e;for(t>6&&(t=6);t>=2;){var n=this._buffer.substr(e,t);if(l.hasOwnProperty(n))return this._emitPartial(l[n]),void(this._sectionStart+=t+1);t--}},a.prototype._stateInNamedEntity=function(e){";"===e?(this._parseNamedEntityStrict(),this._sectionStart+1<this._index&&!this._xmlMode&&this._parseLegacyEntity(),this._state=this._baseState):(e<"a"||e>"z")&&(e<"A"||e>"Z")&&(e<"0"||e>"9")&&(this._xmlMode||this._sectionStart+1===this._index||(this._baseState!==f?"="!==e&&this._parseNamedEntityStrict():this._parseLegacyEntity()),this._state=this._baseState,this._index--)},a.prototype._decodeNumericEntity=function(e,t){var n=this._sectionStart+e;if(n!==this._index){var r=this._buffer.substring(n,this._index),i=parseInt(r,t);this._emitPartial(s(i)),this._sectionStart=this._index}else this._sectionStart--;this._state=this._baseState},a.prototype._stateInNumericEntity=function(e){";"===e?(this._decodeNumericEntity(2,10),this._sectionStart++):(e<"0"||e>"9")&&(this._xmlMode?this._state=this._baseState:this._decodeNumericEntity(2,10),this._index--)},a.prototype._stateInHexEntity=function(e){";"===e?(this._decodeNumericEntity(3,16),this._sectionStart++):(e<"a"||e>"f")&&(e<"A"||e>"F")&&(e<"0"||e>"9")&&(this._xmlMode?this._state=this._baseState:this._decodeNumericEntity(3,16),this._index--)},a.prototype._cleanup=function(){this._sectionStart<0?(this._buffer="",this._bufferOffset+=this._index,this._index=0):this._running&&(this._state===f?(this._sectionStart!==this._index&&this._cbs.ontext(this._buffer.substr(this._sectionStart)),this._buffer="",this._bufferOffset+=this._index,this._index=0):this._sectionStart===this._index?(this._buffer="",this._bufferOffset+=this._index,this._index=0):(this._buffer=this._buffer.substr(this._sectionStart),this._index-=this._sectionStart,this._bufferOffset+=this._sectionStart),this._sectionStart=0)},a.prototype.write=function(e){this._ended&&this._cbs.onerror(Error(".write() after done!")),this._buffer+=e,this._parse()},a.prototype._parse=function(){for(;this._index<this._buffer.length&&this._running;){var e=this._buffer.charAt(this._index);this._state===f?this._stateText(e):this._state===h?this._stateBeforeTagName(e):this._state===d?this._stateInTagName(e):this._state===v?this._stateBeforeCloseingTagName(e):this._state===g?this._stateInCloseingTagName(e):this._state===y?this._stateAfterCloseingTagName(e):this._state===m?this._stateInSelfClosingTag(e):this._state===_?this._stateBeforeAttributeName(e):this._state===b?this._stateInAttributeName(e):this._state===x?this._stateAfterAttributeName(e):this._state===w?this._stateBeforeAttributeValue(e):this._state===k?this._stateInAttributeValueDoubleQuotes(e):this._state===E?this._stateInAttributeValueSingleQuotes(e):this._state===S?this._stateInAttributeValueNoQuotes(e):this._state===C?this._stateBeforeDeclaration(e):this._state===A?this._stateInDeclaration(e):this._state===D?this._stateInProcessingInstruction(e):this._state===O?this._stateBeforeComment(e):this._state===M?this._stateInComment(e):this._state===T?this._stateAfterComment1(e):this._state===P?this._stateAfterComment2(e):this._state===I?this._stateBeforeCdata1(e):this._state===R?this._stateBeforeCdata2(e):this._state===j?this._stateBeforeCdata3(e):this._state===F?this._stateBeforeCdata4(e):this._state===N?this._stateBeforeCdata5(e):this._state===B?this._stateBeforeCdata6(e):this._state===L?this._stateInCdata(e):this._state===q?this._stateAfterCdata1(e):this._state===z?this._stateAfterCdata2(e):this._state===U?this._stateBeforeSpecial(e):this._state===W?this._stateBeforeSpecialEnd(e):this._state===V?this._stateBeforeScript1(e):this._state===H?this._stateBeforeScript2(e):this._state===G?this._stateBeforeScript3(e):this._state===J?this._stateBeforeScript4(e):this._state===K?this._stateBeforeScript5(e):this._state===X?this._stateAfterScript1(e):this._state===Y?this._stateAfterScript2(e):this._state===$?this._stateAfterScript3(e):this._state===Z?this._stateAfterScript4(e):this._state===Q?this._stateAfterScript5(e):this._state===ee?this._stateBeforeStyle1(e):this._state===te?this._stateBeforeStyle2(e):this._state===ne?this._stateBeforeStyle3(e):this._state===re?this._stateBeforeStyle4(e):this._state===ie?this._stateAfterStyle1(e):this._state===oe?this._stateAfterStyle2(e):this._state===ae?this._stateAfterStyle3(e):this._state===se?this._stateAfterStyle4(e):this._state===ue?this._stateBeforeEntity(e):this._state===le?this._stateBeforeNumericEntity(e):this._state===ce?this._stateInNamedEntity(e):this._state===pe?this._stateInNumericEntity(e):this._state===fe?this._stateInHexEntity(e):this._cbs.onerror(Error("unknown _state"),this._state),this._index++}this._cleanup()},a.prototype.pause=function(){this._running=!1},a.prototype.resume=function(){this._running=!0,this._index<this._buffer.length&&this._parse(),this._ended&&this._finish()},a.prototype.end=function(e){this._ended&&this._cbs.onerror(Error(".end() after done!")),e&&this.write(e),this._ended=!0,this._running&&this._finish()},a.prototype._finish=function(){this._sectionStart<this._index&&this._handleTrailingData(),this._cbs.onend()},a.prototype._handleTrailingData=function(){var e=this._buffer.substr(this._sectionStart);this._state===L||this._state===q||this._state===z?this._cbs.oncdata(e):this._state===M||this._state===T||this._state===P?this._cbs.oncomment(e):this._state!==ce||this._xmlMode?this._state!==pe||this._xmlMode?this._state!==fe||this._xmlMode?this._state!==d&&this._state!==_&&this._state!==w&&this._state!==x&&this._state!==b&&this._state!==E&&this._state!==k&&this._state!==S&&this._state!==g&&this._cbs.ontext(e):(this._decodeNumericEntity(3,16),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData())):(this._decodeNumericEntity(2,10),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData())):(this._parseLegacyEntity(),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData()))},a.prototype.reset=function(){a.call(this,{xmlMode:this._xmlMode,decodeEntities:this._decodeEntities},this._cbs)},a.prototype.getAbsoluteIndex=function(){return this._bufferOffset+this._index},a.prototype._getSection=function(){return this._buffer.substring(this._sectionStart,this._index)},a.prototype._emitToken=function(e){this._cbs[e](this._getSection()),this._sectionStart=-1},a.prototype._emitPartial=function(e){this._baseState!==f?this._cbs.onattribdata(e):this._cbs.ontext(e)}},function(e,t,n){function r(e,t){var n=this._parser=new i(e,t),r=this._decoder=new a;o.call(this,{decodeStrings:!1}),this.once("finish",function(){n.end(r.end())})}e.exports=r;var i=n(380),o=n(493).Writable||n(1209).Writable,a=n(265).StringDecoder,s=n(40).Buffer;n(42)(r,o),o.prototype._write=function(e,t,n){e instanceof s&&(e=this._decoder.write(e)),this._parser.write(e),n()}},function(e,t,n){"use strict";function r(e,t){-1===e.indexOf(t)&&e.push(t)}function i(e,t){if(Array.isArray(t))for(var n=0,i=t.length;n<i;++n)r(e,t[n]);else r(e,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e instanceof Object&&!Array.isArray(e)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r,i){for(var o=0,a=e.length;o<a;++o){var s=e[o](t,n,r,i);if(s)return s}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t){function n(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof e.then}e.exports=n},function(e,t){var n={}.toString;e.exports=Array.isArray||function(e){return"[object Array]"==n.call(e)}},function(e,t,n){"use strict";var r=n(81);e.exports=new r({include:[n(389)]})},function(e,t,n){"use strict";var r=n(81);e.exports=new r({include:[n(212)],implicit:[n(808),n(800),n(802),n(801)]})},function(e,t,n){"use strict";var r=n(821),i=r.a.Symbol;t.a=i},function(e,t,n){"use strict";function r(e){if(!n.i(a.a)(e)||n.i(i.a)(e)!=s)return!1;var t=n.i(o.a)(e);if(null===t)return!0;var r=p.call(t,"constructor")&&t.constructor;return"function"==typeof r&&r instanceof r&&c.call(r)==f}var i=n(815),o=n(817),a=n(822),s="[object Object]",u=Function.prototype,l=Object.prototype,c=u.toString,p=l.hasOwnProperty,f=c.call(Object);t.a=r},function(e,t,n){var r=n(43),i=r.Uint8Array;e.exports=i},function(e,t,n){function r(e,t){var n=a(e),r=!n&&o(e),c=!n&&!r&&s(e),f=!n&&!r&&!c&&l(e),h=n||r||c||f,d=h?i(e.length,String):[],m=d.length;for(var v in e)!t&&!p.call(e,v)||h&&("length"==v||c&&("offset"==v||"parent"==v)||f&&("buffer"==v||"byteLength"==v||"byteOffset"==v)||u(v,m))||d.push(v);return d}var i=n(870),o=n(226),a=n(20),s=n(227),u=n(152),l=n(423),c=Object.prototype,p=c.hasOwnProperty;e.exports=r},function(e,t){function n(e,t){for(var n=-1,r=null==e?0:e.length,i=Array(r);++n<r;)i[n]=t(e[n],n,e);return i}e.exports=n},function(e,t){function n(e,t){for(var n=-1,r=null==e?0:e.length;++n<r;)if(t(e[n],n,e))return!0;return!1}e.exports=n},function(e,t,n){function r(e,t,n){"__proto__"==t&&i?i(e,t,{configurable:!0,enumerable:!0,value:n,writable:!0}):e[t]=n}var i=n(403);e.exports=r},function(e,t,n){function r(e,t,n,T,P,I){var R,j=t&k,F=t&E,N=t&S;if(n&&(R=P?n(e,T,P,I):n(e)),void 0!==R)return R;if(!x(e))return e;var B=_(e);if(B){if(R=v(e),!j)return c(e,R)}else{var L=m(e),q=L==A||L==D;if(b(e))return l(e,j);if(L==O||L==C||q&&!P){if(R=F||q?{}:y(e),!j)return F?f(e,u(R,e)):p(e,s(R,e))}else{if(!M[L])return P?e:{};R=g(e,L,r,j)}}I||(I=new i);var z=I.get(e);if(z)return z;I.set(e,R);var U=N?F?d:h:F?keysIn:w,W=B?void 0:U(e);return o(W||e,function(i,o){W&&(o=i,i=e[o]),a(R,o,r(i,t,n,o,e,I))}),R}var i=n(215),o=n(837),a=n(148),s=n(841),u=n(842),l=n(875),c=n(882),p=n(883),f=n(884),h=n(894),d=n(407),m=n(409),v=n(905),g=n(906),y=n(907),_=n(20),b=n(227),x=n(38),w=n(59),k=1,E=2,S=4,C="[object Arguments]",A="[object Function]",D="[object GeneratorFunction]",O="[object Object]",M={};M[C]=M["[object Array]"]=M["[object ArrayBuffer]"]=M["[object DataView]"]=M["[object Boolean]"]=M["[object Date]"]=M["[object Float32Array]"]=M["[object Float64Array]"]=M["[object Int8Array]"]=M["[object Int16Array]"]=M["[object Int32Array]"]=M["[object Map]"]=M["[object Number]"]=M[O]=M["[object RegExp]"]=M["[object Set]"]=M["[object String]"]=M["[object Symbol]"]=M["[object Uint8Array]"]=M["[object Uint8ClampedArray]"]=M["[object Uint16Array]"]=M["[object Uint32Array]"]=!0,M["[object Error]"]=M[A]=M["[object WeakMap]"]=!1,e.exports=r},function(e,t,n){function r(e,t,n){var r=t(e);return o(e)?r:i(r,n(e))}var i=n(216),o=n(20);e.exports=r},function(e,t,n){function r(e,t,n,s,u){return e===t||(null==e||null==t||!o(e)&&!a(t)?e!==e&&t!==t:i(e,t,n,s,r,u))}var i=n(852),o=n(38),a=n(68);e.exports=r},function(e,t){function n(e,t,n){var r=-1,i=e.length;t<0&&(t=-t>i?0:i+t),n=n>i?i:n,n<0&&(n+=i),i=t>n?0:n-t>>>0,t>>>=0;for(var o=Array(i);++r<i;)o[r]=e[r+t];return o}e.exports=n},function(e,t,n){function r(e){if("string"==typeof e)return e;if(a(e))return o(e,r)+"";if(s(e))return c?c.call(e):"";var t=e+"";return"0"==t&&1/e==-u?"-0":t}var i=n(82),o=n(394),a=n(20),s=n(155),u=1/0,l=i?i.prototype:void 0,c=l?l.toString:void 0;e.exports=r},function(e,t,n){function r(e){return function(t){return i(a(o(t).replace(s,"")),e,"")}}var i=n(147),o=n(944),a=n(960),s=RegExp("['’]","g");e.exports=r},function(e,t,n){var r=n(67),i=function(){try{var e=r(Object,"defineProperty");return e({},"",{}),e}catch(e){}}();e.exports=i},function(e,t,n){function r(e,t,n,r,l,c){var p=n&s,f=e.length,h=t.length;if(f!=h&&!(p&&h>f))return!1;var d=c.get(e);if(d&&c.get(t))return d==t;var m=-1,v=!0,g=n&u?new i:void 0;for(c.set(e,t),c.set(t,e);++m<f;){var y=e[m],_=t[m];if(r)var b=p?r(_,y,m,t,e,c):r(y,_,m,e,t,c);if(void 0!==b){if(b)continue;v=!1;break}if(g){if(!o(t,function(e,t){if(!a(g,t)&&(y===e||l(y,e,n,r,c)))return g.push(t)})){v=!1;break}}else if(y!==_&&!l(y,_,n,r,c)){v=!1;break}}return c.delete(e),c.delete(t),v}var i=n(832),o=n(395),a=n(873),s=1,u=2;e.exports=r},function(e,t,n){function r(e){return a(o(e,void 0,i),e+"")}var i=n(946),o=n(415),a=n(417);e.exports=r},function(e,t,n){(function(t){var n="object"==typeof t&&t&&t.Object===Object&&t;e.exports=n}).call(t,n(17))},function(e,t,n){function r(e){return i(e,a,o)}var i=n(398),o=n(408),a=n(424);e.exports=r},function(e,t,n){var r=n(216),i=n(219),o=n(220),a=n(426),s=Object.getOwnPropertySymbols,u=s?function(e){for(var t=[];e;)r(t,o(e)),e=i(e);return t}:a;e.exports=u},function(e,t,n){var r=n(828),i=n(213),o=n(830),a=n(831),s=n(833),u=n(66),l=n(418),c=l(r),p=l(i),f=l(o),h=l(a),d=l(s),m=u;(r&&"[object DataView]"!=m(new r(new ArrayBuffer(1)))||i&&"[object Map]"!=m(new i)||o&&"[object Promise]"!=m(o.resolve())||a&&"[object Set]"!=m(new a)||s&&"[object WeakMap]"!=m(new s))&&(m=function(e){var t=u(e),n="[object Object]"==t?e.constructor:void 0,r=n?l(n):"";if(r)switch(r){case c:return"[object DataView]";case p:return"[object Map]";case f:return"[object Promise]";case h:return"[object Set]";case d:return"[object WeakMap]"}return t}),e.exports=m},function(e,t){function n(e){return r.test(e)}var r=RegExp("[\\u200d\\ud800-\\udfff\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff\\ufe0e\\ufe0f]");e.exports=n},function(e,t,n){function r(e,t,n){if(!s(n))return!1;var r=typeof t;return!!("number"==r?o(n)&&a(t,n.length):"string"==r&&t in n)&&i(n[t],e)}var i=n(120),o=n(86),a=n(152),s=n(38);e.exports=r},function(e,t,n){function r(e){return e===e&&!i(e)}var i=n(38);e.exports=r},function(e,t){function n(e){var t=-1,n=Array(e.size);return e.forEach(function(e,r){n[++t]=[r,e]}),n}e.exports=n},function(e,t){function n(e,t){return function(n){return null!=n&&(n[e]===t&&(void 0!==t||e in Object(n)))}}e.exports=n},function(e,t,n){function r(e,t,n){return t=o(void 0===t?e.length-1:t,0),function(){for(var r=arguments,a=-1,s=o(r.length-t,0),u=Array(s);++a<s;)u[a]=r[t+a];a=-1;for(var l=Array(t+1);++a<t;)l[a]=r[a];return l[t]=n(u),i(e,this,l)}}var i=n(836),o=Math.max;e.exports=r},function(e,t){function n(e){var t=-1,n=Array(e.size);return e.forEach(function(e){n[++t]=e}),n}e.exports=n},function(e,t,n){var r=n(868),i=n(929),o=i(r);e.exports=o},function(e,t){function n(e){if(null!=e){try{return i.call(e)}catch(e){}try{return e+""}catch(e){}}return""}var r=Function.prototype,i=r.toString;e.exports=n},function(e,t,n){function r(e,t){return null!=e&&o(e,t,i)}var i=n(850),o=n(898);e.exports=r},function(e,t,n){function r(e){if(!o(e))return!1;var t=i(e);return t==s||t==u||t==a||t==l}var i=n(66),o=n(38),a="[object AsyncFunction]",s="[object Function]",u="[object GeneratorFunction]",l="[object Proxy]";e.exports=r},function(e,t,n){function r(e){if(!a(e)||i(e)!=s)return!1;var t=o(e);if(null===t)return!0;var n=p.call(t,"constructor")&&t.constructor;return"function"==typeof n&&n instanceof n&&c.call(n)==f}var i=n(66),o=n(219),a=n(68),s="[object Object]",u=Function.prototype,l=Object.prototype,c=u.toString,p=l.hasOwnProperty,f=c.call(Object);e.exports=r},function(e,t,n){function r(e){return"string"==typeof e||!o(e)&&a(e)&&i(e)==s}var i=n(66),o=n(20),a=n(68),s="[object String]";e.exports=r},function(e,t,n){var r=n(855),i=n(871),o=n(924),a=o&&o.isTypedArray,s=a?i(a):r;e.exports=s},function(e,t,n){function r(e){return a(e)?i(e,!0):o(e)}var i=n(393),o=n(857),a=n(86);e.exports=r},function(e,t,n){function r(e,t){if("function"!=typeof e||null!=t&&"function"!=typeof t)throw new TypeError(o);var n=function(){var r=arguments,i=t?t.apply(this,r):r[0],o=n.cache;if(o.has(i))return o.get(i);var a=e.apply(this,r);return n.cache=o.set(i,a)||o,a};return n.cache=new(r.Cache||i),n}var i=n(214),o="Expected a function";r.Cache=i,e.exports=r},function(e,t){function n(){return[]}e.exports=n},function(e,t,n){function r(e){var t=i(e),n=t%1;return t===t?n?t-n:t:0}var i=n(958);e.exports=r},function(e,t,n){var r=n(889),i=r("toUpperCase");e.exports=i},function(e,t,n){"use strict";function r(e){var t,n,r=o[e];if(r)return r;for(r=o[e]=[],t=0;t<128;t++)n=String.fromCharCode(t),r.push(n);for(t=0;t<e.length;t++)n=e.charCodeAt(t),r[n]="%"+("0"+n.toString(16).toUpperCase()).slice(-2);return r}function i(e,t){var n;return"string"!=typeof t&&(t=i.defaultChars),n=r(t),e.replace(/(%[a-f0-9]{2})+/gi,function(e){var t,r,i,o,a,s,u,l="";for(t=0,r=e.length;t<r;t+=3)i=parseInt(e.slice(t+1,t+3),16),i<128?l+=n[i]:192==(224&i)&&t+3<r&&128==(192&(o=parseInt(e.slice(t+4,t+6),16)))?(u=i<<6&1984|63&o,l+=u<128?"��":String.fromCharCode(u),t+=3):224==(240&i)&&t+6<r&&(o=parseInt(e.slice(t+4,t+6),16),a=parseInt(e.slice(t+7,t+9),16),128==(192&o)&&128==(192&a))?(u=i<<12&61440|o<<6&4032|63&a,l+=u<2048||u>=55296&&u<=57343?"���":String.fromCharCode(u),t+=6):240==(248&i)&&t+9<r&&(o=parseInt(e.slice(t+4,t+6),16),a=parseInt(e.slice(t+7,t+9),16),s=parseInt(e.slice(t+10,t+12),16),128==(192&o)&&128==(192&a)&&128==(192&s))?(u=i<<18&1835008|o<<12&258048|a<<6&4032|63&s,u<65536||u>1114111?l+="����":(u-=65536,l+=String.fromCharCode(55296+(u>>10),56320+(1023&u))),t+=9):l+="�";return l})}var o={};i.defaultChars=";/?:@&=+$,#",i.componentChars="",e.exports=i},function(e,t,n){"use strict";function r(e){var t,n,r=o[e];if(r)return r;for(r=o[e]=[],t=0;t<128;t++)n=String.fromCharCode(t),/^[0-9a-z]$/i.test(n)?r.push(n):r.push("%"+("0"+t.toString(16).toUpperCase()).slice(-2));for(t=0;t<e.length;t++)r[e.charCodeAt(t)]=e[t];return r}function i(e,t,n){var o,a,s,u,l,c="";for("string"!=typeof t&&(n=t,t=i.defaultChars),void 0===n&&(n=!0),l=r(t),o=0,a=e.length;o<a;o++)if(s=e.charCodeAt(o),n&&37===s&&o+2<a&&/^[0-9a-f]{2}$/i.test(e.slice(o+1,o+3)))c+=e.slice(o,o+3),o+=2;else if(s<128)c+=l[s];else if(s>=55296&&s<=57343){if(s>=55296&&s<=56319&&o+1<a&&(u=e.charCodeAt(o+1))>=56320&&u<=57343){c+=encodeURIComponent(e[o]+e[o+1]),o++;continue}c+="%EF%BF%BD"}else c+=encodeURIComponent(e[o]);return c}var o={};i.defaultChars=";/?:@&=+$,-_.!~*'()#",i.componentChars="-_.!~*'()",e.exports=i},function(e,t,n){"use strict";var r=n(65);e.exports=function(e,t,n){var i;return isNaN(e)?(i=t,i>=0?n&&i?i-1:i:1):!1!==e&&r(e)}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var o=n(1211),a=r(o),s=n(503),u=r(s),l=n(985),c=r(l),p=function(){function e(t,n,r,o,a,s){i(this,e),this.name="CssSyntaxError",this.reason=t,a&&(this.file=a),o&&(this.source=o),s&&(this.plugin=s),void 0!==n&&void 0!==r&&(this.line=n,this.column=r),this.setMessage(),Error.captureStackTrace&&Error.captureStackTrace(this,e)}return e.prototype.setMessage=function(){this.message=this.plugin?this.plugin+": ":"",this.message+=this.file?this.file:"<css input>",void 0!==this.line&&(this.message+=":"+this.line+":"+this.column),this.message+=": "+this.reason},e.prototype.showSourceCode=function(e){function t(t){return e&&u.default.red?u.default.red.bold(t):t}function n(t){return e&&u.default.gray?u.default.gray(t):t}var r=this;if(!this.source)return"";var i=this.source;void 0===e&&(e=a.default),e&&(i=(0,c.default)(i));var o=i.split(/\r?\n/),s=Math.max(this.line-3,0),l=Math.min(this.line+2,o.length),p=String(l).length;return o.slice(s,l).map(function(e,i){var o=s+1+i,a=" "+(" "+o).slice(-p)+" | ";if(o===r.line){var u=n(a.replace(/\d/g," "))+e.slice(0,r.column-1).replace(/[^\t]/g," ");return t(">")+n(a)+e+"\n "+u+t("^")}return" "+n(a)+e}).join("\n")},e.prototype.toString=function(){var e=this.showSourceCode();return e&&(e="\n\n"+e+"\n"),this.name+": "+this.message+e},e}();t.default=p,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(432),s=r(a),u=n(983),l=r(u),c=n(230),p=r(c),f=0,h=function(){function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};i(this,e),this.css=t.toString(),"\ufeff"!==this.css[0]&&"￾"!==this.css[0]||(this.css=this.css.slice(1)),n.from&&(/^\w+:\/\//.test(n.from)?this.file=n.from:this.file=p.default.resolve(n.from));var r=new l.default(this.css,n);if(r.text){this.map=r;var o=r.consumer().file;!this.file&&o&&(this.file=this.mapResolve(o))}this.file||(f+=1,this.id="<input css "+f+">"),this.map&&(this.map.file=this.from)}return e.prototype.error=function(e,t,n){var r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},i=void 0,o=this.origin(t,n);return i=o?new s.default(e,o.line,o.column,o.source,o.file,r.plugin):new s.default(e,t,n,this.css,this.file,r.plugin),i.input={line:t,column:n,source:this.css},this.file&&(i.input.file=this.file),i},e.prototype.origin=function(e,t){if(!this.map)return!1;var n=this.map.consumer(),r=n.originalPositionFor({line:e,column:t});if(!r.source)return!1;var i={file:this.mapResolve(r.source),line:r.line,column:r.column},o=n.sourceContentFor(r.source);return o&&(i.source=o),i},e.prototype.mapResolve=function(e){return/^\w+:\/\//.test(e)?e:p.default.resolve(this.map.consumer().sourceRoot||".",e)},o(e,[{key:"from",get:function(){return this.file||this.id}}]),e}();t.default=h,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e){return"object"===(void 0===e?"undefined":s(e))&&"function"==typeof e.then}t.__esModule=!0;var a=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},u=n(980),l=r(u),c=n(238),p=r(c),f=n(984),h=r(f),d=n(236),m=r(d),v=function(){function e(t,n,r){i(this,e),this.stringified=!1,this.processed=!1;var o=void 0;if("object"===(void 0===n?"undefined":s(n))&&"root"===n.type)o=n;else if(n instanceof e||n instanceof h.default)o=n.root,n.map&&(void 0===r.map&&(r.map={}),r.map.inline||(r.map.inline=!1),r.map.prev=n.map);else{var a=m.default;r.syntax&&(a=r.syntax.parse),r.parser&&(a=r.parser),a.parse&&(a=a.parse);try{o=a(n,r)}catch(e){this.error=e}}this.result=new h.default(t,o,r)}return e.prototype.warnings=function(){return this.sync().warnings()},e.prototype.toString=function(){return this.css},e.prototype.then=function(e,t){return this.async().then(e,t)},e.prototype.catch=function(e){return this.async().catch(e)},e.prototype.handleError=function(e,t){try{if(this.error=e,"CssSyntaxError"!==e.name||e.plugin){if(t.postcssVersion){var n=t.postcssPlugin,r=t.postcssVersion,i=this.result.processor.version,o=r.split("."),a=i.split(".");(o[0]!==a[0]||parseInt(o[1])>parseInt(a[1]))&&console.error("Unknown error from PostCSS plugin. Your current PostCSS version is "+i+", but "+n+" uses "+r+". Perhaps this is the source of the error below.")}}else e.plugin=t.postcssPlugin,e.setMessage()}catch(e){console&&console.error&&console.error(e)}},e.prototype.asyncTick=function(e,t){var n=this;if(this.plugin>=this.processor.plugins.length)return this.processed=!0,e();try{var r=this.processor.plugins[this.plugin],i=this.run(r);this.plugin+=1,o(i)?i.then(function(){n.asyncTick(e,t)}).catch(function(e){n.handleError(e,r),n.processed=!0,t(e)}):this.asyncTick(e,t)}catch(e){this.processed=!0,t(e)}},e.prototype.async=function(){var e=this;return this.processed?new Promise(function(t,n){e.error?n(e.error):t(e.stringify())}):this.processing?this.processing:(this.processing=new Promise(function(t,n){if(e.error)return n(e.error);e.plugin=0,e.asyncTick(t,n)}).then(function(){return e.processed=!0,e.stringify()}),this.processing)},e.prototype.sync=function(){if(this.processed)return this.result;if(this.processed=!0,this.processing)throw new Error("Use process(css).then(cb) to work with async plugins");if(this.error)throw this.error;for(var e=this.result.processor.plugins,t=Array.isArray(e),n=0,e=t?e:e[Symbol.iterator]();;){var r;if(t){if(n>=e.length)break;r=e[n++]}else{if(n=e.next(),n.done)break;r=n.value}var i=r;if(o(this.run(i)))throw new Error("Use process(css).then(cb) to work with async plugins")}return this.result},e.prototype.run=function(e){this.result.lastPlugin=e;try{return e(this.result.root,this.result)}catch(t){throw this.handleError(t,e),t}},e.prototype.stringify=function(){if(this.stringified)return this.result;this.stringified=!0,this.sync();var e=this.result.opts,t=p.default;e.syntax&&(t=e.syntax.stringify),e.stringifier&&(t=e.stringifier),t.stringify&&(t=t.stringify);var n=new l.default(t,this.result.root,this.result.opts),r=n.generate();return this.result.css=r[0],this.result.map=r[1],this.result},a(e,[{key:"processor",get:function(){return this.result.processor}},{key:"opts",get:function(){return this.result.opts}},{key:"css",get:function(){return this.stringify().css}},{key:"content",get:function(){return this.stringify().content}},{key:"map",get:function(){return this.stringify().map}},{key:"root",get:function(){return this.sync().root}},{key:"messages",get:function(){return this.sync().messages}}]),e}();t.default=v,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var r={split:function(e,t,n){for(var r=[],i="",o=!1,a=0,s=!1,u=!1,l=0;l<e.length;l++){var c=e[l];s?u?u=!1:"\\"===c?u=!0:c===s&&(s=!1):'"'===c||"'"===c?s=c:"("===c?a+=1:")"===c?a>0&&(a-=1):0===a&&-1!==t.indexOf(c)&&(o=!0),o?(""!==i&&r.push(i.trim()),i="",o=!1):i+=c}return(n||""!==i)&&r.push(i.trim()),r},space:function(e){var t=[" ","\n","\t"];return r.split(e,t)},comma:function(e){return r.split(e,[","],!0)}};t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o=n(434),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s=function(){function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[];r(this,e),this.version="6.0.14",this.plugins=this.normalize(t)}return e.prototype.use=function(e){return this.plugins=this.plugins.concat(this.normalize([e])),this},e.prototype.process=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return new a.default(this,e,t)},e.prototype.normalize=function(e){for(var t=[],n=e,r=Array.isArray(n),o=0,n=r?n:n[Symbol.iterator]();;){var a;if(r){if(o>=n.length)break;a=n[o++]}else{if(o=n.next(),o.done)break;a=o.value}var s=a;if(s.postcss&&(s=s.postcss),"object"===(void 0===s?"undefined":i(s))&&Array.isArray(s.plugins))t=t.concat(s.plugins);else{if("function"!=typeof s)throw"object"===(void 0===s?"undefined":i(s))&&(s.parse||s.stringify)?new Error("PostCSS syntaxes cannot be used as plugins. Instead, please use one of the syntax/parser/stringifier options as outlined in your PostCSS runner documentation."):new Error(s+" is not a PostCSS plugin");t.push(s)}}return t},e}();t.default=s,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e){return e[0].toUpperCase()+e.slice(1)}t.__esModule=!0;var o={colon:": ",indent:"    ",beforeDecl:"\n",beforeRule:"\n",beforeOpen:" ",beforeClose:"\n",beforeComment:"\n",after:"\n",emptyBody:"",commentLeft:" ",commentRight:" "},a=function(){function e(t){r(this,e),this.builder=t}return e.prototype.stringify=function(e,t){this[e.type](e,t)},e.prototype.root=function(e){this.body(e),e.raws.after&&this.builder(e.raws.after)},e.prototype.comment=function(e){var t=this.raw(e,"left","commentLeft"),n=this.raw(e,"right","commentRight");this.builder("/*"+t+e.text+n+"*/",e)},e.prototype.decl=function(e,t){var n=this.raw(e,"between","colon"),r=e.prop+n+this.rawValue(e,"value");e.important&&(r+=e.raws.important||" !important"),t&&(r+=";"),this.builder(r,e)},e.prototype.rule=function(e){this.block(e,this.rawValue(e,"selector")),e.raws.ownSemicolon&&this.builder(e.raws.ownSemicolon,e,"end")},e.prototype.atrule=function(e,t){var n="@"+e.name,r=e.params?this.rawValue(e,"params"):"";if(void 0!==e.raws.afterName?n+=e.raws.afterName:r&&(n+=" "),e.nodes)this.block(e,n+r);else{var i=(e.raws.between||"")+(t?";":"");this.builder(n+r+i,e)}},e.prototype.body=function(e){for(var t=e.nodes.length-1;t>0&&"comment"===e.nodes[t].type;)t-=1;for(var n=this.raw(e,"semicolon"),r=0;r<e.nodes.length;r++){var i=e.nodes[r],o=this.raw(i,"before");o&&this.builder(o),this.stringify(i,t!==r||n)}},e.prototype.block=function(e,t){var n=this.raw(e,"between","beforeOpen");this.builder(t+n+"{",e,"start");var r=void 0;e.nodes&&e.nodes.length?(this.body(e),r=this.raw(e,"after")):r=this.raw(e,"after","emptyBody"),r&&this.builder(r),this.builder("}",e,"end")},e.prototype.raw=function(e,t,n){var r=void 0;if(n||(n=t),t&&void 0!==(r=e.raws[t]))return r;var a=e.parent;if("before"===n&&(!a||"root"===a.type&&a.first===e))return"";if(!a)return o[n];var s=e.root();if(s.rawCache||(s.rawCache={}),void 0!==s.rawCache[n])return s.rawCache[n];if("before"===n||"after"===n)return this.beforeAfter(e,n);var u="raw"+i(n);return this[u]?r=this[u](s,e):s.walk(function(e){if(void 0!==(r=e.raws[t]))return!1}),void 0===r&&(r=o[n]),s.rawCache[n]=r,r},e.prototype.rawSemicolon=function(e){var t=void 0;return e.walk(function(e){if(e.nodes&&e.nodes.length&&"decl"===e.last.type&&void 0!==(t=e.raws.semicolon))return!1}),t},e.prototype.rawEmptyBody=function(e){var t=void 0;return e.walk(function(e){if(e.nodes&&0===e.nodes.length&&void 0!==(t=e.raws.after))return!1}),t},e.prototype.rawIndent=function(e){if(e.raws.indent)return e.raws.indent;var t=void 0;return e.walk(function(n){var r=n.parent;if(r&&r!==e&&r.parent&&r.parent===e&&void 0!==n.raws.before){var i=n.raws.before.split("\n");return t=i[i.length-1],t=t.replace(/[^\s]/g,""),!1}}),t},e.prototype.rawBeforeComment=function(e,t){var n=void 0;return e.walkComments(function(e){if(void 0!==e.raws.before)return n=e.raws.before,-1!==n.indexOf("\n")&&(n=n.replace(/[^\n]+$/,"")),!1}),void 0===n?n=this.raw(t,null,"beforeDecl"):n&&(n=n.replace(/[^\s]/g,"")),n},e.prototype.rawBeforeDecl=function(e,t){var n=void 0;return e.walkDecls(function(e){if(void 0!==e.raws.before)return n=e.raws.before,-1!==n.indexOf("\n")&&(n=n.replace(/[^\n]+$/,"")),!1}),void 0===n?n=this.raw(t,null,"beforeRule"):n&&(n=n.replace(/[^\s]/g,"")),n},e.prototype.rawBeforeRule=function(e){var t=void 0;return e.walk(function(n){if(n.nodes&&(n.parent!==e||e.first!==n)&&void 0!==n.raws.before)return t=n.raws.before,-1!==t.indexOf("\n")&&(t=t.replace(/[^\n]+$/,"")),!1}),t&&(t=t.replace(/[^\s]/g,"")),t},e.prototype.rawBeforeClose=function(e){var t=void 0;return e.walk(function(e){if(e.nodes&&e.nodes.length>0&&void 0!==e.raws.after)return t=e.raws.after,-1!==t.indexOf("\n")&&(t=t.replace(/[^\n]+$/,"")),!1}),t&&(t=t.replace(/[^\s]/g,"")),t},e.prototype.rawBeforeOpen=function(e){var t=void 0;return e.walk(function(e){if("decl"!==e.type&&void 0!==(t=e.raws.between))return!1}),t},e.prototype.rawColon=function(e){var t=void 0;return e.walkDecls(function(e){if(void 0!==e.raws.between)return t=e.raws.between.replace(/[^\s:]/g,""),!1}),t},e.prototype.beforeAfter=function(e,t){var n=void 0;n="decl"===e.type?this.raw(e,null,"beforeDecl"):"comment"===e.type?this.raw(e,null,"beforeComment"):"before"===t?this.raw(e,null,"beforeRule"):this.raw(e,null,"beforeClose");for(var r=e.parent,i=0;r&&"root"!==r.type;)i+=1,r=r.parent;if(-1!==n.indexOf("\n")){var o=this.raw(e,null,"indent");if(o.length)for(var a=0;a<i;a++)n+=o}return n},e.prototype.rawValue=function(e,t){var n=e[t],r=e.raws[t];return r&&r.value===n?r.raw:n},e}();t.default=a,e.exports=t.default},function(e,t,n){"use strict";function r(e){function t(t){throw e.error("Unclosed "+t,J,K-G)}function n(){return 0===Y.length&&K>=H}function r(){if(Y.length)return Y.pop();if(!(K>=H)){switch(T=O.charCodeAt(K),(T===u||T===c||T===f&&O.charCodeAt(K+1)!==u)&&(G=K,J+=1),T){case u:case l:case p:case f:case c:P=K;do{P+=1,(T=O.charCodeAt(P))===u&&(G=P,J+=1)}while(T===l||T===u||T===p||T===f||T===c);V=["space",O.slice(K,P)],K=P-1;break;case h:V=["[","[",J,K-G];break;case d:V=["]","]",J,K-G];break;case g:V=["{","{",J,K-G];break;case y:V=["}","}",J,K-G];break;case x:V=[":",":",J,K-G];break;case _:V=[";",";",J,K-G];break;case m:if(U=X.length?X.pop()[1]:"",W=O.charCodeAt(K+1),"url"===U&&W!==i&&W!==o&&W!==l&&W!==u&&W!==p&&W!==c&&W!==f){P=K;do{if(q=!1,-1===(P=O.indexOf(")",P+1))){if(M){P=K;break}t("bracket")}for(z=P;O.charCodeAt(z-1)===a;)z-=1,q=!q}while(q);V=["brackets",O.slice(K,P+1),J,K-G,J,P-G],K=P}else P=O.indexOf(")",K+1),F=O.slice(K,P+1),-1===P||S.test(F)?V=["(","(",J,K-G]:(V=["brackets",F,J,K-G,J,P-G],K=P);break;case v:V=[")",")",J,K-G];break;case i:case o:I=T===i?"'":'"',P=K;do{if(q=!1,-1===(P=O.indexOf(I,P+1))){if(M){P=K+1;break}t("string")}for(z=P;O.charCodeAt(z-1)===a;)z-=1,q=!q}while(q);F=O.slice(K,P+1),R=F.split("\n"),j=R.length-1,j>0?(B=J+j,L=P-R[j].length):(B=J,L=G),V=["string",O.slice(K,P+1),J,K-G,B,P-L],G=L,J=B,K=P;break;case w:k.lastIndex=K+1,k.test(O),P=0===k.lastIndex?O.length-1:k.lastIndex-2,V=["at-word",O.slice(K,P+1),J,K-G,J,P-G],K=P;break;case a:for(P=K,N=!0;O.charCodeAt(P+1)===a;)P+=1,N=!N;if(T=O.charCodeAt(P+1),N&&T!==s&&T!==l&&T!==u&&T!==p&&T!==f&&T!==c&&(P+=1,C.test(O.charAt(P)))){for(;C.test(O.charAt(P+1));)P+=1;O.charCodeAt(P+1)===l&&(P+=1)}V=["word",O.slice(K,P+1),J,K-G,J,P-G],K=P;break;default:T===s&&O.charCodeAt(K+1)===b?(P=O.indexOf("*/",K+2)+1,0===P&&(M?P=O.length:t("comment")),F=O.slice(K,P+1),R=F.split("\n"),j=R.length-1,j>0?(B=J+j,L=P-R[j].length):(B=J,L=G),V=["comment",F,J,K-G,B,P-L],G=L,J=B,K=P):(E.lastIndex=K+1,E.test(O),P=0===E.lastIndex?O.length-1:E.lastIndex-2,V=["word",O.slice(K,P+1),J,K-G,J,P-G],X.push(V),K=P)}return K++,V}}function A(e){Y.push(e)}var D=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},O=e.css.valueOf(),M=D.ignoreErrors,T=void 0,P=void 0,I=void 0,R=void 0,j=void 0,F=void 0,N=void 0,B=void 0,L=void 0,q=void 0,z=void 0,U=void 0,W=void 0,V=void 0,H=O.length,G=-1,J=1,K=0,X=[],Y=[];return{back:A,nextToken:r,endOfFile:n}}t.__esModule=!0,t.default=r;var i=39,o=34,a=92,s=47,u=10,l=32,c=12,p=9,f=13,h=91,d=93,m=40,v=41,g=123,y=125,_=59,b=42,x=58,w=64,k=/[ \n\t\r\f\{\(\)'"\\;\/\[\]#]/g,E=/[ \n\t\r\f\(\)\{\}:;@!'"\\\]\[#]|\/(?=\*)/g,S=/.[\\\/\("'\n]/,C=/[a-f0-9]/i;e.exports=t.default},function(e,t,n){function r(){this._array=[],this._set=a?new Map:Object.create(null)}var i=n(121),o=Object.prototype.hasOwnProperty,a="undefined"!=typeof Map;r.fromArray=function(e,t){for(var n=new r,i=0,o=e.length;i<o;i++)n.add(e[i],t);return n},r.prototype.size=function(){return a?this._set.size:Object.getOwnPropertyNames(this._set).length},r.prototype.add=function(e,t){var n=a?e:i.toSetString(e),r=a?this.has(e):o.call(this._set,n),s=this._array.length;r&&!t||this._array.push(e),r||(a?this._set.set(e,s):this._set[n]=s)},r.prototype.has=function(e){if(a)return this._set.has(e);var t=i.toSetString(e);return o.call(this._set,t)},r.prototype.indexOf=function(e){if(a){var t=this._set.get(e);if(t>=0)return t}else{var n=i.toSetString(e);if(o.call(this._set,n))return this._set[n]}throw new Error('"'+e+'" is not in the set.')},r.prototype.at=function(e){if(e>=0&&e<this._array.length)return this._array[e];throw new Error("No element indexed by "+e)},r.prototype.toArray=function(){return this._array.slice()},t.ArraySet=r},function(e,t,n){function r(e){return e<0?1+(-e<<1):0+(e<<1)}function i(e){var t=1==(1&e),n=e>>1;return t?-n:n}var o=n(989);t.encode=function(e){var t,n="",i=r(e);do{t=31&i,i>>>=5,i>0&&(t|=32),n+=o.encode(t)}while(i>0);return n},t.decode=function(e,t,n){var r,a,s=e.length,u=0,l=0;do{if(t>=s)throw new Error("Expected more digits in base 64 VLQ value.");if(-1===(a=o.decode(e.charCodeAt(t++))))throw new Error("Invalid base64 digit: "+e.charAt(t-1));r=!!(32&a),a&=31,u+=a<<l,l+=5}while(r);n.value=i(u),n.rest=t}},function(e,t,n){function r(e){e||(e={}),this._file=o.getArg(e,"file",null),this._sourceRoot=o.getArg(e,"sourceRoot",null),this._skipValidation=o.getArg(e,"skipValidation",!1),this._sources=new a,this._names=new a,this._mappings=new s,this._sourcesContents=null}var i=n(440),o=n(121),a=n(439).ArraySet,s=n(991).MappingList;r.prototype._version=3,r.fromSourceMap=function(e){var t=e.sourceRoot,n=new r({file:e.file,sourceRoot:t});return e.eachMapping(function(e){var r={generated:{line:e.generatedLine,column:e.generatedColumn}};null!=e.source&&(r.source=e.source,null!=t&&(r.source=o.relative(t,r.source)),r.original={line:e.originalLine,column:e.originalColumn},null!=e.name&&(r.name=e.name)),n.addMapping(r)}),e.sources.forEach(function(r){var i=r;null!==t&&(i=o.relative(t,r)),n._sources.has(i)||n._sources.add(i);var a=e.sourceContentFor(r);null!=a&&n.setSourceContent(r,a)}),n},r.prototype.addMapping=function(e){var t=o.getArg(e,"generated"),n=o.getArg(e,"original",null),r=o.getArg(e,"source",null),i=o.getArg(e,"name",null);this._skipValidation||this._validateMapping(t,n,r,i),null!=r&&(r=String(r),this._sources.has(r)||this._sources.add(r)),null!=i&&(i=String(i),this._names.has(i)||this._names.add(i)),this._mappings.add({generatedLine:t.line,generatedColumn:t.column,originalLine:null!=n&&n.line,originalColumn:null!=n&&n.column,source:r,name:i})},r.prototype.setSourceContent=function(e,t){var n=e;null!=this._sourceRoot&&(n=o.relative(this._sourceRoot,n)),null!=t?(this._sourcesContents||(this._sourcesContents=Object.create(null)),this._sourcesContents[o.toSetString(n)]=t):this._sourcesContents&&(delete this._sourcesContents[o.toSetString(n)],0===Object.keys(this._sourcesContents).length&&(this._sourcesContents=null))},r.prototype.applySourceMap=function(e,t,n){var r=t;if(null==t){if(null==e.file)throw new Error('SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, or the source map\'s "file" property. Both were omitted.');r=e.file}var i=this._sourceRoot;null!=i&&(r=o.relative(i,r));var s=new a,u=new a;this._mappings.unsortedForEach(function(t){if(t.source===r&&null!=t.originalLine){var a=e.originalPositionFor({line:t.originalLine,column:t.originalColumn});null!=a.source&&(t.source=a.source,null!=n&&(t.source=o.join(n,t.source)),null!=i&&(t.source=o.relative(i,t.source)),t.originalLine=a.line,t.originalColumn=a.column,null!=a.name&&(t.name=a.name))}var l=t.source;null==l||s.has(l)||s.add(l);var c=t.name;null==c||u.has(c)||u.add(c)},this),this._sources=s,this._names=u,e.sources.forEach(function(t){var r=e.sourceContentFor(t);null!=r&&(null!=n&&(t=o.join(n,t)),null!=i&&(t=o.relative(i,t)),this.setSourceContent(t,r))},this)},r.prototype._validateMapping=function(e,t,n,r){if(t&&"number"!=typeof t.line&&"number"!=typeof t.column)throw new Error("original.line and original.column are not numbers -- you probably meant to omit the original mapping entirely and only map the generated position. If so, pass null for the original mapping instead of an object with empty or null values.");if((!(e&&"line"in e&&"column"in e&&e.line>0&&e.column>=0)||t||n||r)&&!(e&&"line"in e&&"column"in e&&t&&"line"in t&&"column"in t&&e.line>0&&e.column>=0&&t.line>0&&t.column>=0&&n))throw new Error("Invalid mapping: "+JSON.stringify({generated:e,source:n,original:t,name:r}))},r.prototype._serializeMappings=function(){for(var e,t,n,r,a=0,s=1,u=0,l=0,c=0,p=0,f="",h=this._mappings.toArray(),d=0,m=h.length;d<m;d++){if(t=h[d],e="",t.generatedLine!==s)for(a=0;t.generatedLine!==s;)e+=";",s++;else if(d>0){if(!o.compareByGeneratedPositionsInflated(t,h[d-1]))continue;e+=","}e+=i.encode(t.generatedColumn-a),a=t.generatedColumn,null!=t.source&&(r=this._sources.indexOf(t.source),e+=i.encode(r-p),p=r,e+=i.encode(t.originalLine-1-l),l=t.originalLine-1,e+=i.encode(t.originalColumn-u),u=t.originalColumn,null!=t.name&&(n=this._names.indexOf(t.name),e+=i.encode(n-c),c=n)),f+=e}return f},r.prototype._generateSourcesContent=function(e,t){return e.map(function(e){if(!this._sourcesContents)return null;null!=t&&(e=o.relative(t,e));var n=o.toSetString(e);return Object.prototype.hasOwnProperty.call(this._sourcesContents,n)?this._sourcesContents[n]:null},this)},r.prototype.toJSON=function(){var e={version:this._version,sources:this._sources.toArray(),names:this._names.toArray(),mappings:this._serializeMappings()};return null!=this._file&&(e.file=this._file),null!=this._sourceRoot&&(e.sourceRoot=this._sourceRoot),this._sourcesContents&&(e.sourcesContent=this._generateSourcesContent(e.sources,e.sourceRoot)),e},r.prototype.toString=function(){return JSON.stringify(this.toJSON())},t.SourceMapGenerator=r},function(e,t,n){t.SourceMapGenerator=n(441).SourceMapGenerator,t.SourceMapConsumer=n(993).SourceMapConsumer,t.SourceNode=n(994).SourceNode},function(e,t,n){"use strict";var r=n(997);e.exports=function(e){return r(e,!1)}},function(e,t,n){"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},function(e,t,n){"use strict";var r=String.prototype.replace,i=/%20/g;e.exports={default:"RFC3986",formatters:{RFC1738:function(e){return r.call(e,i,"+")},RFC3986:function(e){return e}},RFC1738:"RFC1738",RFC3986:"RFC3986"}},function(e,t,n){"use strict";var r=Object.prototype.hasOwnProperty,i=function(){for(var e=[],t=0;t<256;++t)e.push("%"+((t<16?"0":"")+t.toString(16)).toUpperCase());return e}(),o=function(e){for(var t;e.length;){var n=e.pop();if(t=n.obj[n.prop],Array.isArray(t)){for(var r=[],i=0;i<t.length;++i)void 0!==t[i]&&r.push(t[i]);n.obj[n.prop]=r}}return t};t.arrayToObject=function(e,t){for(var n=t&&t.plainObjects?Object.create(null):{},r=0;r<e.length;++r)void 0!==e[r]&&(n[r]=e[r]);return n},t.merge=function(e,n,i){if(!n)return e;if("object"!=typeof n){if(Array.isArray(e))e.push(n);else{if("object"!=typeof e)return[e,n];(i.plainObjects||i.allowPrototypes||!r.call(Object.prototype,n))&&(e[n]=!0)}return e}if("object"!=typeof e)return[e].concat(n);var o=e;return Array.isArray(e)&&!Array.isArray(n)&&(o=t.arrayToObject(e,i)),Array.isArray(e)&&Array.isArray(n)?(n.forEach(function(n,o){r.call(e,o)?e[o]&&"object"==typeof e[o]?e[o]=t.merge(e[o],n,i):e.push(n):e[o]=n}),e):Object.keys(n).reduce(function(e,o){var a=n[o];return r.call(e,o)?e[o]=t.merge(e[o],a,i):e[o]=a,e},o)},t.assign=function(e,t){return Object.keys(t).reduce(function(e,n){return e[n]=t[n],e},e)},t.decode=function(e){try{return decodeURIComponent(e.replace(/\+/g," "))}catch(t){return e}},t.encode=function(e){if(0===e.length)return e;for(var t="string"==typeof e?e:String(e),n="",r=0;r<t.length;++r){var o=t.charCodeAt(r);45===o||46===o||95===o||126===o||o>=48&&o<=57||o>=65&&o<=90||o>=97&&o<=122?n+=t.charAt(r):o<128?n+=i[o]:o<2048?n+=i[192|o>>6]+i[128|63&o]:o<55296||o>=57344?n+=i[224|o>>12]+i[128|o>>6&63]+i[128|63&o]:(r+=1,o=65536+((1023&o)<<10|1023&t.charCodeAt(r)),n+=i[240|o>>18]+i[128|o>>12&63]+i[128|o>>6&63]+i[128|63&o])}return n},t.compact=function(e){for(var t=[{obj:{o:e},prop:"o"}],n=[],r=0;r<t.length;++r)for(var i=t[r],a=i.obj[i.prop],s=Object.keys(a),u=0;u<s.length;++u){var l=s[u],c=a[l];"object"==typeof c&&null!==c&&-1===n.indexOf(c)&&(t.push({obj:a,prop:l}),n.push(c))}return o(t)},t.isRegExp=function(e){return"[object RegExp]"===Object.prototype.toString.call(e)},t.isBuffer=function(e){return null!==e&&void 0!==e&&!!(e.constructor&&e.constructor.isBuffer&&e.constructor.isBuffer(e))}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){var n={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0}),t.Collapse=void 0;var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},l=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),c=n(0),p=r(c),f=n(1),h=r(f),d=n(1085),m="IDLING",v=function(){return null},g={collapse:"ReactCollapse--collapse",content:"ReactCollapse--content"},y=t.Collapse=function(e){function t(e){o(this,t);var n=a(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e));return _.call(n),n.state={currentState:m,from:0,to:0},n}return s(t,e),l(t,[{key:"componentDidMount",value:function(){var e=this.props,t=e.isOpened,n=e.forceInitialAnimation,r=e.onRest;if(t){var i=this.getTo();if(n){var o=this.wrapper.clientHeight;this.setState({currentState:"RESIZING",from:o,to:i})}else this.setState({currentState:m,from:i,to:i})}r()}},{key:"componentWillReceiveProps",value:function(e){e.hasNestedCollapse?e.isOpened!==this.props.isOpened&&this.setState({currentState:"WAITING"}):this.state.currentState===m&&(e.isOpened||this.props.isOpened)&&this.setState({currentState:"WAITING"})}},{key:"componentDidUpdate",value:function(e,t){var n=this.props,r=n.isOpened,i=n.onRest,o=n.onMeasure;if(this.state.currentState===m)return void i();t.to!==this.state.to&&o({height:this.state.to,width:this.content.clientWidth});var a=this.wrapper.clientHeight,s=r?this.getTo():0;if(a!==s)return void this.setState({currentState:"RESIZING",from:a,to:s});"RESTING"!==this.state.currentState&&"WAITING"!==this.state.currentState||this.setState({currentState:m,from:a,to:s})}},{key:"componentWillUnmount",value:function(){cancelAnimationFrame(this.raf)}},{key:"render",value:function(){return p.default.createElement(d.Motion,u({},this.getMotionProps(),{onRest:this.onRest,children:this.renderContent}))}}]),t}(p.default.PureComponent);y.propTypes={isOpened:h.default.bool.isRequired,springConfig:h.default.objectOf(h.default.number),forceInitialAnimation:h.default.bool,hasNestedCollapse:h.default.bool,fixedHeight:h.default.number,theme:h.default.objectOf(h.default.string),style:h.default.object,onRender:h.default.func,onRest:h.default.func,onMeasure:h.default.func,children:h.default.node.isRequired},y.defaultProps={forceInitialAnimation:!1,hasNestedCollapse:!1,fixedHeight:-1,style:{},theme:g,onRender:v,onRest:v,onMeasure:v};var _=function(){var e=this;this.onContentRef=function(t){e.content=t},this.onWrapperRef=function(t){e.wrapper=t},this.onRest=function(){e.raf=requestAnimationFrame(e.setResting)},this.setResting=function(){e.setState({currentState:"RESTING"})},this.getTo=function(){var t=e.props.fixedHeight;return t>-1?t:e.content.clientHeight},this.getWrapperStyle=function(t){if(e.state.currentState===m&&e.state.to){var n=e.props.fixedHeight;return n>-1?{overflow:"hidden",height:n}:{height:"auto"}}return"WAITING"!==e.state.currentState||e.state.to?{overflow:"hidden",height:Math.max(0,t)}:{overflow:"hidden",height:0}},this.getMotionProps=function(){var t=e.props.springConfig;return e.state.currentState===m?{defaultStyle:{height:e.state.to},style:{height:e.state.to}}:{defaultStyle:{height:e.state.from},style:{height:(0,d.spring)(e.state.to,u({precision:1},t))}}},this.renderContent=function(t){var n=t.height,r=e.props,o=(r.isOpened,r.springConfig,r.forceInitialAnimation,r.hasNestedCollapse,r.fixedHeight,r.theme),a=r.style,s=r.onRender,l=(r.onRest,r.onMeasure,r.children),c=i(r,["isOpened","springConfig","forceInitialAnimation","hasNestedCollapse","fixedHeight","theme","style","onRender","onRest","onMeasure","children"]),f=e.state;return s({current:n,from:f.from,to:f.to}),p.default.createElement("div",u({ref:e.onWrapperRef,className:o.collapse,style:u({},e.getWrapperStyle(Math.max(0,n)),a)},c),p.default.createElement("div",{ref:e.onContentRef,className:o.content},l))}}},function(e,t,n){"use strict";var r=n(447),i=r.Collapse,o=n(1008),a=o.UnmountClosed;a.Collapse=i,a.UnmountClosed=a,e.exports=a},function(e,t,n){"use strict";e.exports=n(1022)},function(e,t,n){"use strict";function r(e,t){return e+t.charAt(0).toUpperCase()+t.substring(1)}var i={animationIterationCount:!0,borderImageOutset:!0,borderImageSlice:!0,borderImageWidth:!0,boxFlex:!0,boxFlexGroup:!0,boxOrdinalGroup:!0,columnCount:!0,columns:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,flexOrder:!0,gridRow:!0,gridRowEnd:!0,gridRowSpan:!0,gridRowStart:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnSpan:!0,gridColumnStart:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,tabSize:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeDasharray:!0,strokeDashoffset:!0,strokeMiterlimit:!0,strokeOpacity:!0,strokeWidth:!0},o=["Webkit","ms","Moz","O"];Object.keys(i).forEach(function(e){o.forEach(function(t){i[r(t,e)]=i[e]})});var a={background:{backgroundAttachment:!0,backgroundColor:!0,backgroundImage:!0,backgroundPositionX:!0,backgroundPositionY:!0,backgroundRepeat:!0},backgroundPosition:{backgroundPositionX:!0,backgroundPositionY:!0},border:{borderWidth:!0,borderStyle:!0,borderColor:!0},borderBottom:{borderBottomWidth:!0,borderBottomStyle:!0,borderBottomColor:!0},borderLeft:{borderLeftWidth:!0,borderLeftStyle:!0,borderLeftColor:!0},borderRight:{borderRightWidth:!0,borderRightStyle:!0,borderRightColor:!0},borderTop:{borderTopWidth:!0,borderTopStyle:!0,borderTopColor:!0},font:{fontStyle:!0,fontVariant:!0,fontWeight:!0,fontSize:!0,lineHeight:!0,fontFamily:!0},outline:{outlineWidth:!0,outlineStyle:!0,outlineColor:!0}},s={isUnitlessNumber:i,shorthandPropertyExpansions:a};e.exports=s},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var i=n(11),o=n(70),a=(n(8),function(){function e(t){r(this,e),this._callbacks=null,this._contexts=null,this._arg=t}return e.prototype.enqueue=function(e,t){this._callbacks=this._callbacks||[],this._callbacks.push(e),this._contexts=this._contexts||[],this._contexts.push(t)},e.prototype.notifyAll=function(){var e=this._callbacks,t=this._contexts,n=this._arg;if(e&&t){e.length!==t.length&&i("24"),this._callbacks=null,this._contexts=null;for(var r=0;r<e.length;r++)e[r].call(t[r],n);e.length=0,t.length=0}},e.prototype.checkpoint=function(){return this._callbacks?this._callbacks.length:0},e.prototype.rollback=function(e){this._callbacks&&this._contexts&&(this._callbacks.length=e,this._contexts.length=e)},e.prototype.reset=function(){this._callbacks=null,this._contexts=null},e.prototype.destructor=function(){this.reset()},e}());e.exports=o.addPoolingTo(a)},function(e,t,n){"use strict";function r(e){return!!l.hasOwnProperty(e)||!u.hasOwnProperty(e)&&(s.test(e)?(l[e]=!0,!0):(u[e]=!0,!1))}function i(e,t){return null==t||e.hasBooleanValue&&!t||e.hasNumericValue&&isNaN(t)||e.hasPositiveNumericValue&&t<1||e.hasOverloadedBooleanValue&&!1===t}var o=n(89),a=(n(14),n(39),n(1070)),s=(n(10),new RegExp("^["+o.ATTRIBUTE_NAME_START_CHAR+"]["+o.ATTRIBUTE_NAME_CHAR+"]*$")),u={},l={},c={createMarkupForID:function(e){return o.ID_ATTRIBUTE_NAME+"="+a(e)},setAttributeForID:function(e,t){e.setAttribute(o.ID_ATTRIBUTE_NAME,t)},createMarkupForRoot:function(){return o.ROOT_ATTRIBUTE_NAME+'=""'},setAttributeForRoot:function(e){e.setAttribute(o.ROOT_ATTRIBUTE_NAME,"")},createMarkupForProperty:function(e,t){var n=o.properties.hasOwnProperty(e)?o.properties[e]:null;if(n){if(i(n,t))return"";var r=n.attributeName;return n.hasBooleanValue||n.hasOverloadedBooleanValue&&!0===t?r+'=""':r+"="+a(t)}return o.isCustomAttribute(e)?null==t?"":e+"="+a(t):null},createMarkupForCustomAttribute:function(e,t){return r(e)&&null!=t?e+"="+a(t):""},setValueForProperty:function(e,t,n){var r=o.properties.hasOwnProperty(t)?o.properties[t]:null;if(r){var a=r.mutationMethod;if(a)a(e,n);else{if(i(r,n))return void this.deleteValueForProperty(e,t);if(r.mustUseProperty)e[r.propertyName]=n;else{var s=r.attributeName,u=r.attributeNamespace;u?e.setAttributeNS(u,s,""+n):r.hasBooleanValue||r.hasOverloadedBooleanValue&&!0===n?e.setAttribute(s,""):e.setAttribute(s,""+n)}}}else if(o.isCustomAttribute(t))return void c.setValueForAttribute(e,t,n)},setValueForAttribute:function(e,t,n){if(r(t)){null==n?e.removeAttribute(t):e.setAttribute(t,""+n)}},deleteValueForAttribute:function(e,t){e.removeAttribute(t)},deleteValueForProperty:function(e,t){var n=o.properties.hasOwnProperty(t)?o.properties[t]:null;if(n){var r=n.mutationMethod;if(r)r(e,void 0);else if(n.mustUseProperty){var i=n.propertyName;n.hasBooleanValue?e[i]=!1:e[i]=""}else e.removeAttribute(n.attributeName)}else o.isCustomAttribute(t)&&e.removeAttribute(t)}};e.exports=c},function(e,t,n){"use strict";var r={hasCachedChildNodes:1};e.exports=r},function(e,t,n){"use strict";function r(){if(this._rootNodeID&&this._wrapperState.pendingUpdate){this._wrapperState.pendingUpdate=!1;var e=this._currentElement.props,t=s.getValue(e);null!=t&&i(this,Boolean(e.multiple),t)}}function i(e,t,n){var r,i,o=u.getNodeFromInstance(e).options;if(t){for(r={},i=0;i<n.length;i++)r[""+n[i]]=!0;for(i=0;i<o.length;i++){var a=r.hasOwnProperty(o[i].value);o[i].selected!==a&&(o[i].selected=a)}}else{for(r=""+n,i=0;i<o.length;i++)if(o[i].value===r)return void(o[i].selected=!0);o.length&&(o[0].selected=!0)}}function o(e){var t=this._currentElement.props,n=s.executeOnChange(t,e);return this._rootNodeID&&(this._wrapperState.pendingUpdate=!0),l.asap(r,this),n}var a=n(13),s=n(245),u=n(14),l=n(44),c=(n(10),!1),p={getHostProps:function(e,t){return a({},t,{onChange:e._wrapperState.onChange,value:void 0})},mountWrapper:function(e,t){var n=s.getValue(t);e._wrapperState={pendingUpdate:!1,initialValue:null!=n?n:t.defaultValue,listeners:null,onChange:o.bind(e),wasMultiple:Boolean(t.multiple)},void 0===t.value||void 0===t.defaultValue||c||(c=!0)},getSelectValueContext:function(e){return e._wrapperState.initialValue},postUpdateWrapper:function(e){var t=e._currentElement.props;e._wrapperState.initialValue=void 0;var n=e._wrapperState.wasMultiple;e._wrapperState.wasMultiple=Boolean(t.multiple);var r=s.getValue(t);null!=r?(e._wrapperState.pendingUpdate=!1,i(e,Boolean(t.multiple),r)):n!==Boolean(t.multiple)&&(null!=t.defaultValue?i(e,Boolean(t.multiple),t.defaultValue):i(e,Boolean(t.multiple),t.multiple?[]:""))}};e.exports=p},function(e,t,n){"use strict";var r,i={injectEmptyComponentFactory:function(e){r=e}},o={create:function(e){return r(e)}};o.injection=i,e.exports=o},function(e,t,n){"use strict";var r={logTopLevelRenders:!1};e.exports=r},function(e,t,n){"use strict";function r(e){return s||a("111",e.type),new s(e)}function i(e){return new u(e)}function o(e){return e instanceof u}var a=n(11),s=(n(8),null),u=null,l={injectGenericComponentClass:function(e){s=e},injectTextComponentClass:function(e){u=e}},c={createInternalComponent:r,createInstanceForText:i,isTextComponent:o,injection:l};e.exports=c},function(e,t,n){"use strict";function r(e){return o(document.documentElement,e)}var i=n(1030),o=n(748),a=n(378),s=n(379),u={hasSelectionCapabilities:function(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&("input"===t&&"text"===e.type||"textarea"===t||"true"===e.contentEditable)},getSelectionInformation:function(){var e=s();return{focusedElem:e,selectionRange:u.hasSelectionCapabilities(e)?u.getSelection(e):null}},restoreSelection:function(e){var t=s(),n=e.focusedElem,i=e.selectionRange;t!==n&&r(n)&&(u.hasSelectionCapabilities(n)&&u.setSelection(n,i),a(n))},getSelection:function(e){var t;if("selectionStart"in e)t={start:e.selectionStart,end:e.selectionEnd};else if(document.selection&&e.nodeName&&"input"===e.nodeName.toLowerCase()){var n=document.selection.createRange();n.parentElement()===e&&(t={start:-n.moveStart("character",-e.value.length),end:-n.moveEnd("character",-e.value.length)})}else t=i.getOffsets(e);return t||{start:0,end:0}},setSelection:function(e,t){var n=t.start,r=t.end;if(void 0===r&&(r=n),"selectionStart"in e)e.selectionStart=n,e.selectionEnd=Math.min(r,e.value.length);else if(document.selection&&e.nodeName&&"input"===e.nodeName.toLowerCase()){var o=e.createTextRange();o.collapse(!0),o.moveStart("character",n),o.moveEnd("character",r-n),o.select()}else i.setOffsets(e,t)}};e.exports=u},function(e,t,n){"use strict";function r(e,t){for(var n=Math.min(e.length,t.length),r=0;r<n;r++)if(e.charAt(r)!==t.charAt(r))return r;return e.length===t.length?-1:n}function i(e){return e?e.nodeType===R?e.documentElement:e.firstChild:null}function o(e){return e.getAttribute&&e.getAttribute(T)||""}function a(e,t,n,r,i){var o;if(x.logTopLevelRenders){var a=e._currentElement.props.child,s=a.type;o="React mount: "+("string"==typeof s?s:s.displayName||s.name),console.time(o)}var u=E.mountComponent(e,n,null,_(e,t),i,0);o&&console.timeEnd(o),e._renderedComponent._topLevelWrapper=e,L._mountImageIntoNode(u,t,e,r,n)}function s(e,t,n,r){var i=C.ReactReconcileTransaction.getPooled(!n&&b.useCreateElement);i.perform(a,null,e,t,i,n,r),C.ReactReconcileTransaction.release(i)}function u(e,t,n){for(E.unmountComponent(e,n),t.nodeType===R&&(t=t.documentElement);t.lastChild;)t.removeChild(t.lastChild)}function l(e){var t=i(e);if(t){var n=y.getInstanceFromNode(t);return!(!n||!n._hostParent)}}function c(e){return!(!e||e.nodeType!==I&&e.nodeType!==R&&e.nodeType!==j)}function p(e){var t=i(e),n=t&&y.getInstanceFromNode(t);return n&&!n._hostParent?n:null}function f(e){var t=p(e);return t?t._hostContainerInfo._topLevelWrapper:null}var h=n(11),d=n(88),m=n(89),v=n(92),g=n(159),y=(n(52),n(14)),_=n(1024),b=n(1026),x=n(456),w=n(124),k=(n(39),n(1040)),E=n(90),S=n(248),C=n(44),A=n(144),D=n(467),O=(n(8),n(163)),M=n(254),T=(n(10),m.ID_ATTRIBUTE_NAME),P=m.ROOT_ATTRIBUTE_NAME,I=1,R=9,j=11,F={},N=1,B=function(){this.rootID=N++};B.prototype.isReactComponent={},B.prototype.render=function(){return this.props.child},B.isReactTopLevelWrapper=!0;var L={TopLevelWrapper:B,_instancesByReactRootID:F,scrollMonitor:function(e,t){t()},_updateRootComponent:function(e,t,n,r,i){return L.scrollMonitor(r,function(){S.enqueueElementInternal(e,t,n),i&&S.enqueueCallbackInternal(e,i)}),e},_renderNewRootComponent:function(e,t,n,r){c(t)||h("37"),g.ensureScrollValueMonitoring();var i=D(e,!1);C.batchedUpdates(s,i,t,n,r);var o=i._instance.rootID;return F[o]=i,i},renderSubtreeIntoContainer:function(e,t,n,r){return null!=e&&w.has(e)||h("38"),L._renderSubtreeIntoContainer(e,t,n,r)},_renderSubtreeIntoContainer:function(e,t,n,r){S.validateCallback(r,"ReactDOM.render"),v.isValidElement(t)||h("39","string"==typeof t?" Instead of passing a string like 'div', pass React.createElement('div') or <div />.":"function"==typeof t?" Instead of passing a class like Foo, pass React.createElement(Foo) or <Foo />.":null!=t&&void 0!==t.props?" This may be caused by unintentionally loading two independent copies of React.":"");var a,s=v.createElement(B,{child:t});if(e){var u=w.get(e);a=u._processChildContext(u._context)}else a=A;var c=f(n);if(c){var p=c._currentElement,d=p.props.child;if(M(d,t)){var m=c._renderedComponent.getPublicInstance(),g=r&&function(){r.call(m)};return L._updateRootComponent(c,s,a,n,g),m}L.unmountComponentAtNode(n)}var y=i(n),_=y&&!!o(y),b=l(n),x=_&&!c&&!b,k=L._renderNewRootComponent(s,n,x,a)._renderedComponent.getPublicInstance();return r&&r.call(k),k},render:function(e,t,n){return L._renderSubtreeIntoContainer(null,e,t,n)},unmountComponentAtNode:function(e){c(e)||h("40");var t=f(e);if(!t){l(e),1===e.nodeType&&e.hasAttribute(P);return!1}return delete F[t._instance.rootID],C.batchedUpdates(u,t,e,!1),!0},_mountImageIntoNode:function(e,t,n,o,a){if(c(t)||h("41"),o){var s=i(t);if(k.canReuseMarkup(e,s))return void y.precacheNode(n,s);var u=s.getAttribute(k.CHECKSUM_ATTR_NAME);s.removeAttribute(k.CHECKSUM_ATTR_NAME);var l=s.outerHTML;s.setAttribute(k.CHECKSUM_ATTR_NAME,u);var p=e,f=r(p,l),m=" (client) "+p.substring(f-20,f+20)+"\n (server) "+l.substring(f-20,f+20);t.nodeType===R&&h("42",m)}if(t.nodeType===R&&h("43"),a.useCreateElement){for(;t.lastChild;)t.removeChild(t.lastChild);d.insertTreeBefore(t,e,null)}else O(t,e),y.precacheNode(n,t.firstChild)}};e.exports=L},function(e,t,n){"use strict";var r=n(11),i=n(92),o=(n(8),{HOST:0,COMPOSITE:1,EMPTY:2,getType:function(e){return null===e||!1===e?o.EMPTY:i.isValidElement(e)?"function"==typeof e.type?o.COMPOSITE:o.HOST:void r("26",e)}});e.exports=o},function(e,t,n){"use strict";var r={currentScrollLeft:0,currentScrollTop:0,refreshScrollValues:function(e){r.currentScrollLeft=e.x,r.currentScrollTop=e.y}};e.exports=r},function(e,t,n){"use strict";function r(e,t){return null==t&&i("30"),null==e?t:Array.isArray(e)?Array.isArray(t)?(e.push.apply(e,t),e):(e.push(t),e):Array.isArray(t)?[e].concat(t):[e,t]}var i=n(11);n(8);e.exports=r},function(e,t,n){"use strict";function r(e,t,n){Array.isArray(e)?e.forEach(t,n):e&&t.call(n,e)}e.exports=r},function(e,t,n){"use strict";function r(e){for(var t;(t=e._renderedNodeType)===i.COMPOSITE;)e=e._renderedComponent;return t===i.HOST?e._renderedComponent:t===i.EMPTY?null:void 0}var i=n(460);e.exports=r},function(e,t,n){"use strict";function r(){return!o&&i.canUseDOM&&(o="textContent"in document.documentElement?"textContent":"innerText"),o}var i=n(25),o=null;e.exports=r},function(e,t,n){"use strict";function r(e){var t=e.type,n=e.nodeName;return n&&"input"===n.toLowerCase()&&("checkbox"===t||"radio"===t)}function i(e){return e._wrapperState.valueTracker}function o(e,t){e._wrapperState.valueTracker=t}function a(e){e._wrapperState.valueTracker=null}function s(e){var t;return e&&(t=r(e)?""+e.checked:e.value),t}var u=n(14),l={_getTrackerFromNode:function(e){return i(u.getInstanceFromNode(e))},track:function(e){if(!i(e)){var t=u.getNodeFromInstance(e),n=r(t)?"checked":"value",s=Object.getOwnPropertyDescriptor(t.constructor.prototype,n),l=""+t[n];t.hasOwnProperty(n)||"function"!=typeof s.get||"function"!=typeof s.set||(Object.defineProperty(t,n,{enumerable:s.enumerable,configurable:!0,get:function(){return s.get.call(this)},set:function(e){l=""+e,s.set.call(this,e)}}),o(e,{getValue:function(){return l},setValue:function(e){l=""+e},stopTracking:function(){a(e),delete t[n]}}))}},updateValueIfChanged:function(e){if(!e)return!1;var t=i(e);if(!t)return l.track(e),!0;var n=t.getValue(),r=s(u.getNodeFromInstance(e));return r!==n&&(t.setValue(r),!0)},stopTracking:function(e){var t=i(e);t&&t.stopTracking()}};e.exports=l},function(e,t,n){"use strict";function r(e){if(e){var t=e.getName();if(t)return" Check the render method of `"+t+"`."}return""}function i(e){return"function"==typeof e&&void 0!==e.prototype&&"function"==typeof e.prototype.mountComponent&&"function"==typeof e.prototype.receiveComponent}function o(e,t){var n;if(null===e||!1===e)n=l.create(o);else if("object"==typeof e){var s=e,u=s.type;if("function"!=typeof u&&"string"!=typeof u){var f="";f+=r(s._owner),a("130",null==u?u:typeof u,f)}"string"==typeof s.type?n=c.createInternalComponent(s):i(s.type)?(n=new s.type(s),n.getHostNode||(n.getHostNode=n.getNativeNode)):n=new p(s)}else"string"==typeof e||"number"==typeof e?n=c.createInstanceForText(e):a("131",typeof e);return n._mountIndex=0,n._mountImage=null,n}var a=n(11),s=n(13),u=n(1021),l=n(455),c=n(457),p=(n(1106),n(8),n(10),function(e){this.construct(e)});s(p.prototype,u,{_instantiateReactComponent:o}),e.exports=o},function(e,t,n){"use strict";function r(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return"input"===t?!!i[e.type]:"textarea"===t}var i={color:!0,date:!0,datetime:!0,"datetime-local":!0,email:!0,month:!0,number:!0,password:!0,range:!0,search:!0,tel:!0,text:!0,time:!0,url:!0,week:!0};e.exports=r},function(e,t,n){"use strict";var r=n(25),i=n(162),o=n(163),a=function(e,t){if(t){var n=e.firstChild;if(n&&n===e.lastChild&&3===n.nodeType)return void(n.nodeValue=t)}e.textContent=t};r.canUseDOM&&("textContent"in document.documentElement||(a=function(e,t){if(3===e.nodeType)return void(e.nodeValue=t);o(e,i(t))})),e.exports=a},function(e,t,n){"use strict";function r(e,t){return e&&"object"==typeof e&&null!=e.key?l.escape(e.key):t.toString(36)}function i(e,t,n,o){var f=typeof e;if("undefined"!==f&&"boolean"!==f||(e=null),null===e||"string"===f||"number"===f||"object"===f&&e.$$typeof===s)return n(o,e,""===t?c+r(e,0):t),1;var h,d,m=0,v=""===t?c:t+p;if(Array.isArray(e))for(var g=0;g<e.length;g++)h=e[g],d=v+r(h,g),m+=i(h,d,n,o);else{var y=u(e);if(y){var _,b=y.call(e);if(y!==e.entries)for(var x=0;!(_=b.next()).done;)h=_.value,d=v+r(h,x++),m+=i(h,d,n,o);else for(;!(_=b.next()).done;){var w=_.value;w&&(h=w[1],d=v+l.escape(w[0])+p+r(h,0),m+=i(h,d,n,o))}}else if("object"===f){var k="",E=String(e);a("31","[object Object]"===E?"object with keys {"+Object.keys(e).join(", ")+"}":E,k)}}return m}function o(e,t,n){return null==e?0:i(e,"",t,n)}var a=n(11),s=(n(52),n(1036)),u=n(1067),l=(n(8),n(244)),c=(n(10),"."),p=":";e.exports=o},function(e,t,n){"use strict";t.__esModule=!0,t.default={noWobble:{stiffness:170,damping:26},gentle:{stiffness:120,damping:14},wobbly:{stiffness:180,damping:12},stiff:{stiffness:210,damping:20}},e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var r=n(1),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=i.default.shape({subscribe:i.default.func.isRequired,dispatch:i.default.func.isRequired,getState:i.default.func.isRequired})},function(e,t,n){"use strict";function r(e){"undefined"!=typeof console&&"function"==typeof console.error&&console.error(e);try{throw new Error(e)}catch(e){}}t.__esModule=!0,t.default=r},function(e,t,n){"use strict";function r(e,t,n){this.props=e,this.context=t,this.refs=l,this.updater=n||u}function i(e,t,n){this.props=e,this.context=t,this.refs=l,this.updater=n||u}function o(){}var a=n(126),s=n(13),u=n(477),l=(n(478),n(144));n(8),n(1107);r.prototype.isReactComponent={},r.prototype.setState=function(e,t){"object"!=typeof e&&"function"!=typeof e&&null!=e&&a("85"),this.updater.enqueueSetState(this,e),t&&this.updater.enqueueCallback(this,t,"setState")},r.prototype.forceUpdate=function(e){this.updater.enqueueForceUpdate(this),e&&this.updater.enqueueCallback(this,e,"forceUpdate")};o.prototype=r.prototype,i.prototype=new o,i.prototype.constructor=i,s(i.prototype,r.prototype),i.prototype.isPureReactComponent=!0,e.exports={Component:r,PureComponent:i}},function(e,t,n){"use strict";function r(e){var t=Function.prototype.toString,n=Object.prototype.hasOwnProperty,r=RegExp("^"+t.call(n).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");try{var i=t.call(e);return r.test(i)}catch(e){return!1}}function i(e){var t=l(e);if(t){var n=t.childIDs;c(e),n.forEach(i)}}function o(e,t,n){return"\n    in "+(e||"Unknown")+(t?" (at "+t.fileName.replace(/^.*[\\\/]/,"")+":"+t.lineNumber+")":n?" (created by "+n+")":"")}function a(e){return null==e?"#empty":"string"==typeof e||"number"==typeof e?"#text":"string"==typeof e.type?e.type:e.type.displayName||e.type.name||"Unknown"}function s(e){var t,n=S.getDisplayName(e),r=S.getElement(e),i=S.getOwnerID(e);return i&&(t=S.getDisplayName(i)),o(n,r&&r._source,t)}var u,l,c,p,f,h,d,m=n(126),v=n(52),g=(n(8),n(10),"function"==typeof Array.from&&"function"==typeof Map&&r(Map)&&null!=Map.prototype&&"function"==typeof Map.prototype.keys&&r(Map.prototype.keys)&&"function"==typeof Set&&r(Set)&&null!=Set.prototype&&"function"==typeof Set.prototype.keys&&r(Set.prototype.keys));if(g){var y=new Map,_=new Set;u=function(e,t){y.set(e,t)},l=function(e){return y.get(e)},c=function(e){y.delete(e)},p=function(){return Array.from(y.keys())},f=function(e){_.add(e)},h=function(e){_.delete(e)},d=function(){return Array.from(_.keys())}}else{var b={},x={},w=function(e){return"."+e},k=function(e){return parseInt(e.substr(1),10)};u=function(e,t){var n=w(e);b[n]=t},l=function(e){var t=w(e);return b[t]},c=function(e){var t=w(e);delete b[t]},p=function(){return Object.keys(b).map(k)},f=function(e){var t=w(e);x[t]=!0},h=function(e){var t=w(e);delete x[t]},d=function(){return Object.keys(x).map(k)}}var E=[],S={onSetChildren:function(e,t){var n=l(e);n||m("144"),n.childIDs=t;for(var r=0;r<t.length;r++){var i=t[r],o=l(i);o||m("140"),null==o.childIDs&&"object"==typeof o.element&&null!=o.element&&m("141"),o.isMounted||m("71"),null==o.parentID&&(o.parentID=e),o.parentID!==e&&m("142",i,o.parentID,e)}},onBeforeMountComponent:function(e,t,n){u(e,{element:t,parentID:n,text:null,childIDs:[],isMounted:!1,updateCount:0})},onBeforeUpdateComponent:function(e,t){var n=l(e);n&&n.isMounted&&(n.element=t)},onMountComponent:function(e){var t=l(e);t||m("144"),t.isMounted=!0,0===t.parentID&&f(e)},onUpdateComponent:function(e){var t=l(e);t&&t.isMounted&&t.updateCount++},onUnmountComponent:function(e){var t=l(e);if(t){t.isMounted=!1;0===t.parentID&&h(e)}E.push(e)},purgeUnmountedComponents:function(){if(!S._preventPurging){for(var e=0;e<E.length;e++){i(E[e])}E.length=0}},isMounted:function(e){var t=l(e);return!!t&&t.isMounted},getCurrentStackAddendum:function(e){var t="";if(e){var n=a(e),r=e._owner;t+=o(n,e._source,r&&r.getName())}var i=v.current,s=i&&i._debugID;return t+=S.getStackAddendumByID(s)},getStackAddendumByID:function(e){for(var t="";e;)t+=s(e),e=S.getParentID(e);return t},getChildIDs:function(e){var t=l(e);return t?t.childIDs:[]},getDisplayName:function(e){var t=S.getElement(e);return t?a(t):null},getElement:function(e){var t=l(e);return t?t.element:null},getOwnerID:function(e){var t=S.getElement(e);return t&&t._owner?t._owner._debugID:null},getParentID:function(e){var t=l(e);return t?t.parentID:null},getSource:function(e){var t=l(e),n=t?t.element:null;return null!=n?n._source:null},getText:function(e){var t=S.getElement(e);return"string"==typeof t?t:"number"==typeof t?""+t:null},getUpdateCount:function(e){var t=l(e);return t?t.updateCount:0},getRootIDs:d,getRegisteredIDs:p,pushNonStandardWarningStack:function(e,t){if("function"==typeof console.reactStack){var n=[],r=v.current,i=r&&r._debugID;try{for(e&&n.push({name:i?S.getDisplayName(i):null,fileName:t?t.fileName:null,lineNumber:t?t.lineNumber:null});i;){var o=S.getElement(i),a=S.getParentID(i),s=S.getOwnerID(i),u=s?S.getDisplayName(s):null,l=o&&o._source;n.push({name:u,fileName:l?l.fileName:null,lineNumber:l?l.lineNumber:null}),i=a}}catch(e){}console.reactStack(n)}},popNonStandardWarningStack:function(){"function"==typeof console.reactStackEnd&&console.reactStackEnd()}};e.exports=S},function(e,t,n){"use strict";var r="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103;e.exports=r},function(e,t,n){"use strict";var r=(n(10),{isMounted:function(e){return!1},enqueueCallback:function(e,t){},enqueueForceUpdate:function(e){},enqueueReplaceState:function(e,t){},enqueueSetState:function(e,t){}});e.exports=r},function(e,t,n){"use strict";var r=!1;e.exports=r},function(e,t,n){"use strict";(function(t,r){function i(e){return N.from(e)}function o(e){return N.isBuffer(e)||e instanceof B}function a(e,t,n){if("function"==typeof e.prependListener)return e.prependListener(t,n);e._events&&e._events[t]?R(e._events[t])?e._events[t].unshift(n):e._events[t]=[n,e._events[t]]:e.on(t,n)}function s(e,t){I=I||n(71),e=e||{},this.objectMode=!!e.objectMode,t instanceof I&&(this.objectMode=this.objectMode||!!e.readableObjectMode);var r=e.highWaterMark,i=this.objectMode?16:16384;this.highWaterMark=r||0===r?r:i,this.highWaterMark=Math.floor(this.highWaterMark),this.buffer=new W,this.length=0,this.pipes=null,this.pipesCount=0,this.flowing=null,this.ended=!1,this.endEmitted=!1,this.reading=!1,this.sync=!0,this.needReadable=!1,this.emittedReadable=!1,this.readableListening=!1,this.resumeScheduled=!1,this.destroyed=!1,this.defaultEncoding=e.defaultEncoding||"utf8",this.awaitDrain=0,this.readingMore=!1,this.decoder=null,this.encoding=null,e.encoding&&(U||(U=n(265).StringDecoder),this.decoder=new U(e.encoding),this.encoding=e.encoding)}function u(e){if(I=I||n(71),!(this instanceof u))return new u(e);this._readableState=new s(e,this),this.readable=!0,e&&("function"==typeof e.read&&(this._read=e.read),"function"==typeof e.destroy&&(this._destroy=e.destroy)),F.call(this)}function l(e,t,n,r,o){var a=e._readableState;if(null===t)a.reading=!1,m(e,a);else{var s;o||(s=p(a,t)),s?e.emit("error",s):a.objectMode||t&&t.length>0?("string"==typeof t||a.objectMode||Object.getPrototypeOf(t)===N.prototype||(t=i(t)),r?a.endEmitted?e.emit("error",new Error("stream.unshift() after end event")):c(e,a,t,!0):a.ended?e.emit("error",new Error("stream.push() after EOF")):(a.reading=!1,a.decoder&&!n?(t=a.decoder.write(t),a.objectMode||0!==t.length?c(e,a,t,!1):y(e,a)):c(e,a,t,!1))):r||(a.reading=!1)}return f(a)}function c(e,t,n,r){t.flowing&&0===t.length&&!t.sync?(e.emit("data",n),e.read(0)):(t.length+=t.objectMode?1:n.length,r?t.buffer.unshift(n):t.buffer.push(n),t.needReadable&&v(e)),y(e,t)}function p(e,t){var n;return o(t)||"string"==typeof t||void 0===t||e.objectMode||(n=new TypeError("Invalid non-string/buffer chunk")),n}function f(e){return!e.ended&&(e.needReadable||e.length<e.highWaterMark||0===e.length)}function h(e){return e>=G?e=G:(e--,e|=e>>>1,e|=e>>>2,e|=e>>>4,e|=e>>>8,e|=e>>>16,e++),e}function d(e,t){return e<=0||0===t.length&&t.ended?0:t.objectMode?1:e!==e?t.flowing&&t.length?t.buffer.head.data.length:t.length:(e>t.highWaterMark&&(t.highWaterMark=h(e)),e<=t.length?e:t.ended?t.length:(t.needReadable=!0,0))}function m(e,t){if(!t.ended){if(t.decoder){var n=t.decoder.end();n&&n.length&&(t.buffer.push(n),t.length+=t.objectMode?1:n.length)}t.ended=!0,v(e)}}function v(e){var t=e._readableState;t.needReadable=!1,t.emittedReadable||(z("emitReadable",t.flowing),t.emittedReadable=!0,t.sync?P(g,e):g(e))}function g(e){z("emit readable"),e.emit("readable"),E(e)}function y(e,t){t.readingMore||(t.readingMore=!0,P(_,e,t))}function _(e,t){for(var n=t.length;!t.reading&&!t.flowing&&!t.ended&&t.length<t.highWaterMark&&(z("maybeReadMore read 0"),e.read(0),n!==t.length);)n=t.length;t.readingMore=!1}function b(e){return function(){var t=e._readableState;z("pipeOnDrain",t.awaitDrain),t.awaitDrain&&t.awaitDrain--,0===t.awaitDrain&&j(e,"data")&&(t.flowing=!0,E(e))}}function x(e){z("readable nexttick read 0"),e.read(0)}function w(e,t){t.resumeScheduled||(t.resumeScheduled=!0,P(k,e,t))}function k(e,t){t.reading||(z("resume read 0"),e.read(0)),t.resumeScheduled=!1,t.awaitDrain=0,e.emit("resume"),E(e),t.flowing&&!t.reading&&e.read(0)}function E(e){var t=e._readableState;for(z("flow",t.flowing);t.flowing&&null!==e.read(););}function S(e,t){if(0===t.length)return null;var n;return t.objectMode?n=t.buffer.shift():!e||e>=t.length?(n=t.decoder?t.buffer.join(""):1===t.buffer.length?t.buffer.head.data:t.buffer.concat(t.length),t.buffer.clear()):n=C(e,t.buffer,t.decoder),n}function C(e,t,n){var r;return e<t.head.data.length?(r=t.head.data.slice(0,e),t.head.data=t.head.data.slice(e)):r=e===t.head.data.length?t.shift():n?A(e,t):D(e,t),r}function A(e,t){var n=t.head,r=1,i=n.data;for(e-=i.length;n=n.next;){var o=n.data,a=e>o.length?o.length:e;if(a===o.length?i+=o:i+=o.slice(0,e),0===(e-=a)){a===o.length?(++r,n.next?t.head=n.next:t.head=t.tail=null):(t.head=n,n.data=o.slice(a));break}++r}return t.length-=r,i}function D(e,t){var n=N.allocUnsafe(e),r=t.head,i=1;for(r.data.copy(n),e-=r.data.length;r=r.next;){var o=r.data,a=e>o.length?o.length:e;if(o.copy(n,n.length-e,0,a),0===(e-=a)){a===o.length?(++i,r.next?t.head=r.next:t.head=t.tail=null):(t.head=r,r.data=o.slice(a));break}++i}return t.length-=i,n}function O(e){var t=e._readableState;if(t.length>0)throw new Error('"endReadable()" called on non-empty stream');t.endEmitted||(t.ended=!0,P(M,t,e))}function M(e,t){e.endEmitted||0!==e.length||(e.endEmitted=!0,t.readable=!1,t.emit("end"))}function T(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1}var P=n(158);e.exports=u;var I,R=n(387);u.ReadableState=s;var j=(n(143).EventEmitter,function(e,t){return e.listeners(t).length}),F=n(482),N=n(167).Buffer,B=t.Uint8Array||function(){},L=n(111);L.inherits=n(42);var q=n(1212),z=void 0;z=q&&q.debuglog?q.debuglog("stream"):function(){};var U,W=n(1112),V=n(481);L.inherits(u,F);var H=["error","close","destroy","pause","resume"];Object.defineProperty(u.prototype,"destroyed",{get:function(){return void 0!==this._readableState&&this._readableState.destroyed},set:function(e){this._readableState&&(this._readableState.destroyed=e)}}),u.prototype.destroy=V.destroy,u.prototype._undestroy=V.undestroy,u.prototype._destroy=function(e,t){this.push(null),t(e)},u.prototype.push=function(e,t){var n,r=this._readableState;return r.objectMode?n=!0:"string"==typeof e&&(t=t||r.defaultEncoding,t!==r.encoding&&(e=N.from(e,t),t=""),n=!0),l(this,e,t,!1,n)},u.prototype.unshift=function(e){return l(this,e,null,!0,!1)},u.prototype.isPaused=function(){return!1===this._readableState.flowing},u.prototype.setEncoding=function(e){return U||(U=n(265).StringDecoder),this._readableState.decoder=new U(e),this._readableState.encoding=e,this};var G=8388608;u.prototype.read=function(e){z("read",e),e=parseInt(e,10);var t=this._readableState,n=e;if(0!==e&&(t.emittedReadable=!1),0===e&&t.needReadable&&(t.length>=t.highWaterMark||t.ended))return z("read: emitReadable",t.length,t.ended),0===t.length&&t.ended?O(this):v(this),null;if(0===(e=d(e,t))&&t.ended)return 0===t.length&&O(this),null;var r=t.needReadable;z("need readable",r),(0===t.length||t.length-e<t.highWaterMark)&&(r=!0,z("length less than watermark",r)),t.ended||t.reading?(r=!1,z("reading or ended",r)):r&&(z("do read"),t.reading=!0,t.sync=!0,0===t.length&&(t.needReadable=!0),this._read(t.highWaterMark),t.sync=!1,t.reading||(e=d(n,t)));var i;return i=e>0?S(e,t):null,null===i?(t.needReadable=!0,e=0):t.length-=e,0===t.length&&(t.ended||(t.needReadable=!0),n!==e&&t.ended&&O(this)),null!==i&&this.emit("data",i),i},u.prototype._read=function(e){this.emit("error",new Error("_read() is not implemented"))},u.prototype.pipe=function(e,t){function n(e,t){z("onunpipe"),e===f&&t&&!1===t.hasUnpiped&&(t.hasUnpiped=!0,o())}function i(){z("onend"),e.end()}function o(){z("cleanup"),e.removeListener("close",l),e.removeListener("finish",c),e.removeListener("drain",v),e.removeListener("error",u),e.removeListener("unpipe",n),f.removeListener("end",i),f.removeListener("end",p),f.removeListener("data",s),g=!0,!h.awaitDrain||e._writableState&&!e._writableState.needDrain||v()}function s(t){z("ondata"),y=!1,!1!==e.write(t)||y||((1===h.pipesCount&&h.pipes===e||h.pipesCount>1&&-1!==T(h.pipes,e))&&!g&&(z("false write response, pause",f._readableState.awaitDrain),f._readableState.awaitDrain++,y=!0),f.pause())}function u(t){z("onerror",t),p(),e.removeListener("error",u),0===j(e,"error")&&e.emit("error",t)}function l(){e.removeListener("finish",c),p()}function c(){z("onfinish"),e.removeListener("close",l),p()}function p(){z("unpipe"),f.unpipe(e)}var f=this,h=this._readableState;switch(h.pipesCount){case 0:h.pipes=e;break;case 1:h.pipes=[h.pipes,e];break;default:h.pipes.push(e)}h.pipesCount+=1,z("pipe count=%d opts=%j",h.pipesCount,t);var d=(!t||!1!==t.end)&&e!==r.stdout&&e!==r.stderr,m=d?i:p;h.endEmitted?P(m):f.once("end",m),e.on("unpipe",n);var v=b(f);e.on("drain",v);var g=!1,y=!1;return f.on("data",s),a(e,"error",u),e.once("close",l),e.once("finish",c),e.emit("pipe",f),h.flowing||(z("pipe resume"),f.resume()),e},u.prototype.unpipe=function(e){var t=this._readableState,n={hasUnpiped:!1};if(0===t.pipesCount)return this;if(1===t.pipesCount)return e&&e!==t.pipes?this:(e||(e=t.pipes),t.pipes=null,t.pipesCount=0,t.flowing=!1,e&&e.emit("unpipe",this,n),this);if(!e){var r=t.pipes,i=t.pipesCount;t.pipes=null,t.pipesCount=0,t.flowing=!1;for(var o=0;o<i;o++)r[o].emit("unpipe",this,n);return this}var a=T(t.pipes,e);return-1===a?this:(t.pipes.splice(a,1),t.pipesCount-=1,1===t.pipesCount&&(t.pipes=t.pipes[0]),e.emit("unpipe",this,n),this)},u.prototype.on=function(e,t){var n=F.prototype.on.call(this,e,t);if("data"===e)!1!==this._readableState.flowing&&this.resume();else if("readable"===e){var r=this._readableState;r.endEmitted||r.readableListening||(r.readableListening=r.needReadable=!0,r.emittedReadable=!1,r.reading?r.length&&v(this):P(x,this))}return n},u.prototype.addListener=u.prototype.on,u.prototype.resume=function(){var e=this._readableState;return e.flowing||(z("resume"),e.flowing=!0,w(this,e)),this},u.prototype.pause=function(){return z("call pause flowing=%j",this._readableState.flowing),!1!==this._readableState.flowing&&(z("pause"),this._readableState.flowing=!1,this.emit("pause")),this},u.prototype.wrap=function(e){var t=this._readableState,n=!1,r=this;e.on("end",function(){if(z("wrapped end"),t.decoder&&!t.ended){var e=t.decoder.end();e&&e.length&&r.push(e)}r.push(null)}),e.on("data",function(i){if(z("wrapped data"),t.decoder&&(i=t.decoder.write(i)),(!t.objectMode||null!==i&&void 0!==i)&&(t.objectMode||i&&i.length)){r.push(i)||(n=!0,e.pause())}});for(var i in e)void 0===this[i]&&"function"==typeof e[i]&&(this[i]=function(t){return function(){return e[t].apply(e,arguments)}}(i));for(var o=0;o<H.length;o++)e.on(H[o],r.emit.bind(r,H[o]));return r._read=function(t){z("wrapped _read",t),n&&(n=!1,e.resume())},r},u._fromList=S}).call(t,n(17),n(33))},function(e,t,n){"use strict";function r(e){this.afterTransform=function(t,n){return i(e,t,n)},this.needTransform=!1,this.transforming=!1,this.writecb=null,this.writechunk=null,this.writeencoding=null}function i(e,t,n){var r=e._transformState;r.transforming=!1;var i=r.writecb;if(!i)return e.emit("error",new Error("write callback called multiple times"));r.writechunk=null,r.writecb=null,null!==n&&void 0!==n&&e.push(n),i(t);var o=e._readableState;o.reading=!1,(o.needReadable||o.length<o.highWaterMark)&&e._read(o.highWaterMark)}function o(e){if(!(this instanceof o))return new o(e);s.call(this,e),this._transformState=new r(this);var t=this;this._readableState.needReadable=!0,this._readableState.sync=!1,e&&("function"==typeof e.transform&&(this._transform=e.transform),"function"==typeof e.flush&&(this._flush=e.flush)),this.once("prefinish",function(){"function"==typeof this._flush?this._flush(function(e,n){a(t,e,n)}):a(t)})}function a(e,t,n){if(t)return e.emit("error",t);null!==n&&void 0!==n&&e.push(n);var r=e._writableState,i=e._transformState;if(r.length)throw new Error("Calling transform done when ws.length != 0");if(i.transforming)throw new Error("Calling transform done when still transforming");return e.push(null)}e.exports=o;var s=n(71),u=n(111);u.inherits=n(42),u.inherits(o,s),o.prototype.push=function(e,t){return this._transformState.needTransform=!1,s.prototype.push.call(this,e,t)},o.prototype._transform=function(e,t,n){throw new Error("_transform() is not implemented")},o.prototype._write=function(e,t,n){var r=this._transformState;if(r.writecb=n,r.writechunk=e,r.writeencoding=t,!r.transforming){var i=this._readableState;(r.needTransform||i.needReadable||i.length<i.highWaterMark)&&this._read(i.highWaterMark)}},o.prototype._read=function(e){var t=this._transformState;null!==t.writechunk&&t.writecb&&!t.transforming?(t.transforming=!0,this._transform(t.writechunk,t.writeencoding,t.afterTransform)):t.needTransform=!0},o.prototype._destroy=function(e,t){var n=this;s.prototype._destroy.call(this,e,function(e){t(e),n.emit("close")})}},function(e,t,n){"use strict";function r(e,t){var n=this,r=this._readableState&&this._readableState.destroyed,i=this._writableState&&this._writableState.destroyed;if(r||i)return void(t?t(e):!e||this._writableState&&this._writableState.errorEmitted||a(o,this,e));this._readableState&&(this._readableState.destroyed=!0),this._writableState&&(this._writableState.destroyed=!0),this._destroy(e||null,function(e){!t&&e?(a(o,n,e),n._writableState&&(n._writableState.errorEmitted=!0)):t&&t(e)})}function i(){this._readableState&&(this._readableState.destroyed=!1,this._readableState.reading=!1,this._readableState.ended=!1,this._readableState.endEmitted=!1),this._writableState&&(this._writableState.destroyed=!1,this._writableState.ended=!1,this._writableState.ending=!1,this._writableState.finished=!1,this._writableState.errorEmitted=!1)}function o(e,t){e.emit("error",t)}var a=n(158);e.exports={destroy:r,undestroy:i}},function(e,t,n){e.exports=n(143).EventEmitter},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){return e&&"@@redux/INIT"===e.type?"initialState argument passed to createStore":"previous state received by the reducer"},e.exports=t.default},function(e,t,n){"use strict";function r(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];return 0===t.length?function(e){return e}:1===t.length?t[0]:t.reduce(function(e,t){return function(){return e(t.apply(void 0,arguments))}})}t.a=r},function(e,t,n){"use strict";function r(e,t,o){function u(){y===g&&(y=g.slice())}function l(){return v}function c(e){if("function"!=typeof e)throw new Error("Expected listener to be a function.");var t=!0;return u(),y.push(e),function(){if(t){t=!1,u();var n=y.indexOf(e);y.splice(n,1)}}}function p(e){if(!n.i(i.a)(e))throw new Error("Actions must be plain objects. Use custom middleware for async actions.");if(void 0===e.type)throw new Error('Actions may not have an undefined "type" property. Have you misspelled a constant?');if(_)throw new Error("Reducers may not dispatch actions.");try{_=!0,v=m(v,e)}finally{_=!1}for(var t=g=y,r=0;r<t.length;r++){(0,t[r])()}return e}function f(e){if("function"!=typeof e)throw new Error("Expected the nextReducer to be a function.");m=e,p({type:s.INIT})}function h(){var e,t=c;return e={subscribe:function(e){function n(){e.next&&e.next(l())}if("object"!=typeof e)throw new TypeError("Expected the observer to be an object.");return n(),{unsubscribe:t(n)}}},e[a.a]=function(){return this},e}var d;if("function"==typeof t&&void 0===o&&(o=t,t=void 0),void 0!==o){if("function"!=typeof o)throw new Error("Expected the enhancer to be a function.");return o(r)(e,t)}if("function"!=typeof e)throw new Error("Expected the reducer to be a function.");var m=e,v=t,g=[],y=g,_=!1;return p({type:s.INIT}),d={dispatch:p,subscribe:c,getState:l,replaceReducer:f},d[a.a]=h,d}n.d(t,"b",function(){return s}),t.a=r;var i=n(391),o=n(1182),a=n.n(o),s={INIT:"@@redux/INIT"}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(485),i=n(1123),o=n(1122),a=n(1121),s=n(484);n(487);n.d(t,"createStore",function(){return r.a}),n.d(t,"combineReducers",function(){return i.a}),n.d(t,"bindActionCreators",function(){return o.a}),n.d(t,"applyMiddleware",function(){return a.a}),n.d(t,"compose",function(){return s.a})},function(e,t,n){"use strict"},function(e,t,n){"use strict";e.exports={Aacute:"Á",aacute:"á",Abreve:"Ă",abreve:"ă",ac:"∾",acd:"∿",acE:"∾̳",Acirc:"Â",acirc:"â",acute:"´",Acy:"А",acy:"а",AElig:"Æ",aelig:"æ",af:"⁡",Afr:"𝔄",afr:"𝔞",Agrave:"À",agrave:"à",alefsym:"ℵ",aleph:"ℵ",Alpha:"Α",alpha:"α",Amacr:"Ā",amacr:"ā",amalg:"⨿",AMP:"&",amp:"&",And:"⩓",and:"∧",andand:"⩕",andd:"⩜",andslope:"⩘",andv:"⩚",ang:"∠",ange:"⦤",angle:"∠",angmsd:"∡",angmsdaa:"⦨",angmsdab:"⦩",angmsdac:"⦪",angmsdad:"⦫",angmsdae:"⦬",angmsdaf:"⦭",angmsdag:"⦮",angmsdah:"⦯",angrt:"∟",angrtvb:"⊾",angrtvbd:"⦝",angsph:"∢",angst:"Å",angzarr:"⍼",Aogon:"Ą",aogon:"ą",Aopf:"𝔸",aopf:"𝕒",ap:"≈",apacir:"⩯",apE:"⩰",ape:"≊",apid:"≋",apos:"'",ApplyFunction:"⁡",approx:"≈",approxeq:"≊",Aring:"Å",aring:"å",Ascr:"𝒜",ascr:"𝒶",Assign:"≔",ast:"*",asymp:"≈",asympeq:"≍",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",awconint:"∳",awint:"⨑",backcong:"≌",backepsilon:"϶",backprime:"‵",backsim:"∽",backsimeq:"⋍",Backslash:"∖",Barv:"⫧",barvee:"⊽",Barwed:"⌆",barwed:"⌅",barwedge:"⌅",bbrk:"⎵",bbrktbrk:"⎶",bcong:"≌",Bcy:"Б",bcy:"б",bdquo:"„",becaus:"∵",Because:"∵",because:"∵",bemptyv:"⦰",bepsi:"϶",bernou:"ℬ",Bernoullis:"ℬ",Beta:"Β",beta:"β",beth:"ℶ",between:"≬",Bfr:"𝔅",bfr:"𝔟",bigcap:"⋂",bigcirc:"◯",bigcup:"⋃",bigodot:"⨀",bigoplus:"⨁",bigotimes:"⨂",bigsqcup:"⨆",bigstar:"★",bigtriangledown:"▽",bigtriangleup:"△",biguplus:"⨄",bigvee:"⋁",bigwedge:"⋀",bkarow:"⤍",blacklozenge:"⧫",blacksquare:"▪",blacktriangle:"▴",blacktriangledown:"▾",blacktriangleleft:"◂",blacktriangleright:"▸",blank:"␣",blk12:"▒",blk14:"░",blk34:"▓",block:"█",bne:"=⃥",bnequiv:"≡⃥",bNot:"⫭",bnot:"⌐",Bopf:"𝔹",bopf:"𝕓",bot:"⊥",bottom:"⊥",bowtie:"⋈",boxbox:"⧉",boxDL:"╗",boxDl:"╖",boxdL:"╕",boxdl:"┐",boxDR:"╔",boxDr:"╓",boxdR:"╒",boxdr:"┌",boxH:"═",boxh:"─",boxHD:"╦",boxHd:"╤",boxhD:"╥",boxhd:"┬",boxHU:"╩",boxHu:"╧",boxhU:"╨",boxhu:"┴",boxminus:"⊟",boxplus:"⊞",boxtimes:"⊠",boxUL:"╝",boxUl:"╜",boxuL:"╛",boxul:"┘",boxUR:"╚",boxUr:"╙",boxuR:"╘",boxur:"└",boxV:"║",boxv:"│",boxVH:"╬",boxVh:"╫",boxvH:"╪",boxvh:"┼",boxVL:"╣",boxVl:"╢",boxvL:"╡",boxvl:"┤",boxVR:"╠",boxVr:"╟",boxvR:"╞",boxvr:"├",bprime:"‵",Breve:"˘",breve:"˘",brvbar:"¦",Bscr:"ℬ",bscr:"𝒷",bsemi:"⁏",bsim:"∽",bsime:"⋍",bsol:"\\",bsolb:"⧅",bsolhsub:"⟈",bull:"•",bullet:"•",bump:"≎",bumpE:"⪮",bumpe:"≏",Bumpeq:"≎",bumpeq:"≏",Cacute:"Ć",cacute:"ć",Cap:"⋒",cap:"∩",capand:"⩄",capbrcup:"⩉",capcap:"⩋",capcup:"⩇",capdot:"⩀",CapitalDifferentialD:"ⅅ",caps:"∩︀",caret:"⁁",caron:"ˇ",Cayleys:"ℭ",ccaps:"⩍",Ccaron:"Č",ccaron:"č",Ccedil:"Ç",ccedil:"ç",Ccirc:"Ĉ",ccirc:"ĉ",Cconint:"∰",ccups:"⩌",ccupssm:"⩐",Cdot:"Ċ",cdot:"ċ",cedil:"¸",Cedilla:"¸",cemptyv:"⦲",cent:"¢",CenterDot:"·",centerdot:"·",Cfr:"ℭ",cfr:"𝔠",CHcy:"Ч",chcy:"ч",check:"✓",checkmark:"✓",Chi:"Χ",chi:"χ",cir:"○",circ:"ˆ",circeq:"≗",circlearrowleft:"↺",circlearrowright:"↻",circledast:"⊛",circledcirc:"⊚",circleddash:"⊝",CircleDot:"⊙",circledR:"®",circledS:"Ⓢ",CircleMinus:"⊖",CirclePlus:"⊕",CircleTimes:"⊗",cirE:"⧃",cire:"≗",cirfnint:"⨐",cirmid:"⫯",cirscir:"⧂",ClockwiseContourIntegral:"∲",CloseCurlyDoubleQuote:"”",CloseCurlyQuote:"’",clubs:"♣",clubsuit:"♣",Colon:"∷",colon:":",Colone:"⩴",colone:"≔",coloneq:"≔",comma:",",commat:"@",comp:"∁",compfn:"∘",complement:"∁",complexes:"ℂ",cong:"≅",congdot:"⩭",Congruent:"≡",Conint:"∯",conint:"∮",ContourIntegral:"∮",Copf:"ℂ",copf:"𝕔",coprod:"∐",Coproduct:"∐",COPY:"©",copy:"©",copysr:"℗",CounterClockwiseContourIntegral:"∳",crarr:"↵",Cross:"⨯",cross:"✗",Cscr:"𝒞",cscr:"𝒸",csub:"⫏",csube:"⫑",csup:"⫐",csupe:"⫒",ctdot:"⋯",cudarrl:"⤸",cudarrr:"⤵",cuepr:"⋞",cuesc:"⋟",cularr:"↶",cularrp:"⤽",Cup:"⋓",cup:"∪",cupbrcap:"⩈",CupCap:"≍",cupcap:"⩆",cupcup:"⩊",cupdot:"⊍",cupor:"⩅",cups:"∪︀",curarr:"↷",curarrm:"⤼",curlyeqprec:"⋞",curlyeqsucc:"⋟",curlyvee:"⋎",curlywedge:"⋏",curren:"¤",curvearrowleft:"↶",curvearrowright:"↷",cuvee:"⋎",cuwed:"⋏",cwconint:"∲",cwint:"∱",cylcty:"⌭",Dagger:"‡",dagger:"†",daleth:"ℸ",Darr:"↡",dArr:"⇓",darr:"↓",dash:"‐",Dashv:"⫤",dashv:"⊣",dbkarow:"⤏",dblac:"˝",Dcaron:"Ď",dcaron:"ď",Dcy:"Д",dcy:"д",DD:"ⅅ",dd:"ⅆ",ddagger:"‡",ddarr:"⇊",DDotrahd:"⤑",ddotseq:"⩷",deg:"°",Del:"∇",Delta:"Δ",delta:"δ",demptyv:"⦱",dfisht:"⥿",Dfr:"𝔇",dfr:"𝔡",dHar:"⥥",dharl:"⇃",dharr:"⇂",DiacriticalAcute:"´",DiacriticalDot:"˙",DiacriticalDoubleAcute:"˝",DiacriticalGrave:"`",DiacriticalTilde:"˜",diam:"⋄",Diamond:"⋄",diamond:"⋄",diamondsuit:"♦",diams:"♦",die:"¨",DifferentialD:"ⅆ",digamma:"ϝ",disin:"⋲",div:"÷",divide:"÷",divideontimes:"⋇",divonx:"⋇",DJcy:"Ђ",djcy:"ђ",dlcorn:"⌞",dlcrop:"⌍",dollar:"$",Dopf:"𝔻",dopf:"𝕕",Dot:"¨",dot:"˙",DotDot:"⃜",doteq:"≐",doteqdot:"≑",DotEqual:"≐",dotminus:"∸",dotplus:"∔",dotsquare:"⊡",doublebarwedge:"⌆",DoubleContourIntegral:"∯",DoubleDot:"¨",DoubleDownArrow:"⇓",DoubleLeftArrow:"⇐",DoubleLeftRightArrow:"⇔",DoubleLeftTee:"⫤",DoubleLongLeftArrow:"⟸",DoubleLongLeftRightArrow:"⟺",DoubleLongRightArrow:"⟹",DoubleRightArrow:"⇒",DoubleRightTee:"⊨",DoubleUpArrow:"⇑",DoubleUpDownArrow:"⇕",DoubleVerticalBar:"∥",DownArrow:"↓",Downarrow:"⇓",downarrow:"↓",DownArrowBar:"⤓",DownArrowUpArrow:"⇵",DownBreve:"̑",downdownarrows:"⇊",downharpoonleft:"⇃",downharpoonright:"⇂",DownLeftRightVector:"⥐",DownLeftTeeVector:"⥞",DownLeftVector:"↽",DownLeftVectorBar:"⥖",DownRightTeeVector:"⥟",DownRightVector:"⇁",DownRightVectorBar:"⥗",DownTee:"⊤",DownTeeArrow:"↧",drbkarow:"⤐",drcorn:"⌟",drcrop:"⌌",Dscr:"𝒟",dscr:"𝒹",DScy:"Ѕ",dscy:"ѕ",dsol:"⧶",Dstrok:"Đ",dstrok:"đ",dtdot:"⋱",dtri:"▿",dtrif:"▾",duarr:"⇵",duhar:"⥯",dwangle:"⦦",DZcy:"Џ",dzcy:"џ",dzigrarr:"⟿",Eacute:"É",eacute:"é",easter:"⩮",Ecaron:"Ě",ecaron:"ě",ecir:"≖",Ecirc:"Ê",ecirc:"ê",ecolon:"≕",Ecy:"Э",ecy:"э",eDDot:"⩷",Edot:"Ė",eDot:"≑",edot:"ė",ee:"ⅇ",efDot:"≒",Efr:"𝔈",efr:"𝔢",eg:"⪚",Egrave:"È",egrave:"è",egs:"⪖",egsdot:"⪘",el:"⪙",Element:"∈",elinters:"⏧",ell:"ℓ",els:"⪕",elsdot:"⪗",Emacr:"Ē",emacr:"ē",empty:"∅",emptyset:"∅",EmptySmallSquare:"◻",emptyv:"∅",EmptyVerySmallSquare:"▫",emsp:" ",emsp13:" ",emsp14:" ",ENG:"Ŋ",eng:"ŋ",ensp:" ",Eogon:"Ę",eogon:"ę",Eopf:"𝔼",eopf:"𝕖",epar:"⋕",eparsl:"⧣",eplus:"⩱",epsi:"ε",Epsilon:"Ε",epsilon:"ε",epsiv:"ϵ",eqcirc:"≖",eqcolon:"≕",eqsim:"≂",eqslantgtr:"⪖",eqslantless:"⪕",Equal:"⩵",equals:"=",EqualTilde:"≂",equest:"≟",Equilibrium:"⇌",equiv:"≡",equivDD:"⩸",eqvparsl:"⧥",erarr:"⥱",erDot:"≓",Escr:"ℰ",escr:"ℯ",esdot:"≐",Esim:"⩳",esim:"≂",Eta:"Η",eta:"η",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",euro:"€",excl:"!",exist:"∃",Exists:"∃",expectation:"ℰ",ExponentialE:"ⅇ",exponentiale:"ⅇ",fallingdotseq:"≒",Fcy:"Ф",fcy:"ф",female:"♀",ffilig:"ffi",fflig:"ff",ffllig:"ffl",Ffr:"𝔉",ffr:"𝔣",filig:"fi",FilledSmallSquare:"◼",FilledVerySmallSquare:"▪",fjlig:"fj",flat:"♭",fllig:"fl",fltns:"▱",fnof:"ƒ",Fopf:"𝔽",fopf:"𝕗",ForAll:"∀",forall:"∀",fork:"⋔",forkv:"⫙",Fouriertrf:"ℱ",fpartint:"⨍",frac12:"½",frac13:"⅓",frac14:"¼",frac15:"⅕",frac16:"⅙",frac18:"⅛",frac23:"⅔",frac25:"⅖",frac34:"¾",frac35:"⅗",frac38:"⅜",frac45:"⅘",frac56:"⅚",frac58:"⅝",frac78:"⅞",frasl:"⁄",frown:"⌢",Fscr:"ℱ",fscr:"𝒻",gacute:"ǵ",Gamma:"Γ",gamma:"γ",Gammad:"Ϝ",gammad:"ϝ",gap:"⪆",Gbreve:"Ğ",gbreve:"ğ",Gcedil:"Ģ",Gcirc:"Ĝ",gcirc:"ĝ",Gcy:"Г",gcy:"г",Gdot:"Ġ",gdot:"ġ",gE:"≧",ge:"≥",gEl:"⪌",gel:"⋛",geq:"≥",geqq:"≧",geqslant:"⩾",ges:"⩾",gescc:"⪩",gesdot:"⪀",gesdoto:"⪂",gesdotol:"⪄",gesl:"⋛︀",gesles:"⪔",Gfr:"𝔊",gfr:"𝔤",Gg:"⋙",gg:"≫",ggg:"⋙",gimel:"ℷ",GJcy:"Ѓ",gjcy:"ѓ",gl:"≷",gla:"⪥",glE:"⪒",glj:"⪤",gnap:"⪊",gnapprox:"⪊",gnE:"≩",gne:"⪈",gneq:"⪈",gneqq:"≩",gnsim:"⋧",Gopf:"𝔾",gopf:"𝕘",grave:"`",GreaterEqual:"≥",GreaterEqualLess:"⋛",GreaterFullEqual:"≧",GreaterGreater:"⪢",GreaterLess:"≷",GreaterSlantEqual:"⩾",GreaterTilde:"≳",Gscr:"𝒢",gscr:"ℊ",gsim:"≳",gsime:"⪎",gsiml:"⪐",GT:">",Gt:"≫",gt:">",gtcc:"⪧",gtcir:"⩺",gtdot:"⋗",gtlPar:"⦕",gtquest:"⩼",gtrapprox:"⪆",gtrarr:"⥸",gtrdot:"⋗",gtreqless:"⋛",gtreqqless:"⪌",gtrless:"≷",gtrsim:"≳",gvertneqq:"≩︀",gvnE:"≩︀",Hacek:"ˇ",hairsp:" ",half:"½",hamilt:"ℋ",HARDcy:"Ъ",hardcy:"ъ",hArr:"⇔",harr:"↔",harrcir:"⥈",harrw:"↭",Hat:"^",hbar:"ℏ",Hcirc:"Ĥ",hcirc:"ĥ",hearts:"♥",heartsuit:"♥",hellip:"…",hercon:"⊹",Hfr:"ℌ",hfr:"𝔥",HilbertSpace:"ℋ",hksearow:"⤥",hkswarow:"⤦",hoarr:"⇿",homtht:"∻",hookleftarrow:"↩",hookrightarrow:"↪",Hopf:"ℍ",hopf:"𝕙",horbar:"―",HorizontalLine:"─",Hscr:"ℋ",hscr:"𝒽",hslash:"ℏ",Hstrok:"Ħ",hstrok:"ħ",HumpDownHump:"≎",HumpEqual:"≏",hybull:"⁃",hyphen:"‐",Iacute:"Í",iacute:"í",ic:"⁣",Icirc:"Î",icirc:"î",Icy:"И",icy:"и",Idot:"İ",IEcy:"Е",iecy:"е",iexcl:"¡",iff:"⇔",Ifr:"ℑ",ifr:"𝔦",Igrave:"Ì",igrave:"ì",ii:"ⅈ",iiiint:"⨌",iiint:"∭",iinfin:"⧜",iiota:"℩",IJlig:"IJ",ijlig:"ij",Im:"ℑ",Imacr:"Ī",imacr:"ī",image:"ℑ",ImaginaryI:"ⅈ",imagline:"ℐ",imagpart:"ℑ",imath:"ı",imof:"⊷",imped:"Ƶ",Implies:"⇒",in:"∈",incare:"℅",infin:"∞",infintie:"⧝",inodot:"ı",Int:"∬",int:"∫",intcal:"⊺",integers:"ℤ",Integral:"∫",intercal:"⊺",Intersection:"⋂",intlarhk:"⨗",intprod:"⨼",InvisibleComma:"⁣",InvisibleTimes:"⁢",IOcy:"Ё",iocy:"ё",Iogon:"Į",iogon:"į",Iopf:"𝕀",iopf:"𝕚",Iota:"Ι",iota:"ι",iprod:"⨼",iquest:"¿",Iscr:"ℐ",iscr:"𝒾",isin:"∈",isindot:"⋵",isinE:"⋹",isins:"⋴",isinsv:"⋳",isinv:"∈",it:"⁢",Itilde:"Ĩ",itilde:"ĩ",Iukcy:"І",iukcy:"і",Iuml:"Ï",iuml:"ï",Jcirc:"Ĵ",jcirc:"ĵ",Jcy:"Й",jcy:"й",Jfr:"𝔍",jfr:"𝔧",jmath:"ȷ",Jopf:"𝕁",jopf:"𝕛",Jscr:"𝒥",jscr:"𝒿",Jsercy:"Ј",jsercy:"ј",Jukcy:"Є",jukcy:"є",Kappa:"Κ",kappa:"κ",kappav:"ϰ",Kcedil:"Ķ",kcedil:"ķ",Kcy:"К",kcy:"к",Kfr:"𝔎",kfr:"𝔨",kgreen:"ĸ",KHcy:"Х",khcy:"х",KJcy:"Ќ",kjcy:"ќ",Kopf:"𝕂",kopf:"𝕜",Kscr:"𝒦",kscr:"𝓀",lAarr:"⇚",Lacute:"Ĺ",lacute:"ĺ",laemptyv:"⦴",lagran:"ℒ",Lambda:"Λ",lambda:"λ",Lang:"⟪",lang:"⟨",langd:"⦑",langle:"⟨",lap:"⪅",Laplacetrf:"ℒ",laquo:"«",Larr:"↞",lArr:"⇐",larr:"←",larrb:"⇤",larrbfs:"⤟",larrfs:"⤝",larrhk:"↩",larrlp:"↫",larrpl:"⤹",larrsim:"⥳",larrtl:"↢",lat:"⪫",lAtail:"⤛",latail:"⤙",late:"⪭",lates:"⪭︀",lBarr:"⤎",lbarr:"⤌",lbbrk:"❲",lbrace:"{",lbrack:"[",lbrke:"⦋",lbrksld:"⦏",lbrkslu:"⦍",Lcaron:"Ľ",lcaron:"ľ",Lcedil:"Ļ",lcedil:"ļ",lceil:"⌈",lcub:"{",Lcy:"Л",lcy:"л",ldca:"⤶",ldquo:"“",ldquor:"„",ldrdhar:"⥧",ldrushar:"⥋",ldsh:"↲",lE:"≦",le:"≤",LeftAngleBracket:"⟨",LeftArrow:"←",Leftarrow:"⇐",leftarrow:"←",LeftArrowBar:"⇤",LeftArrowRightArrow:"⇆",leftarrowtail:"↢",LeftCeiling:"⌈",LeftDoubleBracket:"⟦",LeftDownTeeVector:"⥡",LeftDownVector:"⇃",LeftDownVectorBar:"⥙",LeftFloor:"⌊",leftharpoondown:"↽",leftharpoonup:"↼",leftleftarrows:"⇇",LeftRightArrow:"↔",Leftrightarrow:"⇔",leftrightarrow:"↔",leftrightarrows:"⇆",leftrightharpoons:"⇋",leftrightsquigarrow:"↭",LeftRightVector:"⥎",LeftTee:"⊣",LeftTeeArrow:"↤",LeftTeeVector:"⥚",leftthreetimes:"⋋",LeftTriangle:"⊲",LeftTriangleBar:"⧏",LeftTriangleEqual:"⊴",LeftUpDownVector:"⥑",LeftUpTeeVector:"⥠",LeftUpVector:"↿",LeftUpVectorBar:"⥘",LeftVector:"↼",LeftVectorBar:"⥒",lEg:"⪋",leg:"⋚",leq:"≤",leqq:"≦",leqslant:"⩽",les:"⩽",lescc:"⪨",lesdot:"⩿",lesdoto:"⪁",lesdotor:"⪃",lesg:"⋚︀",lesges:"⪓",lessapprox:"⪅",lessdot:"⋖",lesseqgtr:"⋚",lesseqqgtr:"⪋",LessEqualGreater:"⋚",LessFullEqual:"≦",LessGreater:"≶",lessgtr:"≶",LessLess:"⪡",lesssim:"≲",LessSlantEqual:"⩽",LessTilde:"≲",lfisht:"⥼",lfloor:"⌊",Lfr:"𝔏",lfr:"𝔩",lg:"≶",lgE:"⪑",lHar:"⥢",lhard:"↽",lharu:"↼",lharul:"⥪",lhblk:"▄",LJcy:"Љ",ljcy:"љ",Ll:"⋘",ll:"≪",llarr:"⇇",llcorner:"⌞",Lleftarrow:"⇚",llhard:"⥫",lltri:"◺",Lmidot:"Ŀ",lmidot:"ŀ",lmoust:"⎰",lmoustache:"⎰",lnap:"⪉",lnapprox:"⪉",lnE:"≨",lne:"⪇",lneq:"⪇",lneqq:"≨",lnsim:"⋦",loang:"⟬",loarr:"⇽",lobrk:"⟦",LongLeftArrow:"⟵",Longleftarrow:"⟸",longleftarrow:"⟵",LongLeftRightArrow:"⟷",Longleftrightarrow:"⟺",longleftrightarrow:"⟷",longmapsto:"⟼",LongRightArrow:"⟶",Longrightarrow:"⟹",longrightarrow:"⟶",looparrowleft:"↫",looparrowright:"↬",lopar:"⦅",Lopf:"𝕃",lopf:"𝕝",loplus:"⨭",lotimes:"⨴",lowast:"∗",lowbar:"_",LowerLeftArrow:"↙",LowerRightArrow:"↘",loz:"◊",lozenge:"◊",lozf:"⧫",lpar:"(",lparlt:"⦓",lrarr:"⇆",lrcorner:"⌟",lrhar:"⇋",lrhard:"⥭",lrm:"‎",lrtri:"⊿",lsaquo:"‹",Lscr:"ℒ",lscr:"𝓁",Lsh:"↰",lsh:"↰",lsim:"≲",lsime:"⪍",lsimg:"⪏",lsqb:"[",lsquo:"‘",lsquor:"‚",Lstrok:"Ł",lstrok:"ł",LT:"<",Lt:"≪",lt:"<",ltcc:"⪦",ltcir:"⩹",ltdot:"⋖",lthree:"⋋",ltimes:"⋉",ltlarr:"⥶",ltquest:"⩻",ltri:"◃",ltrie:"⊴",ltrif:"◂",ltrPar:"⦖",lurdshar:"⥊",luruhar:"⥦",lvertneqq:"≨︀",lvnE:"≨︀",macr:"¯",male:"♂",malt:"✠",maltese:"✠",Map:"⤅",map:"↦",mapsto:"↦",mapstodown:"↧",mapstoleft:"↤",mapstoup:"↥",marker:"▮",mcomma:"⨩",Mcy:"М",mcy:"м",mdash:"—",mDDot:"∺",measuredangle:"∡",MediumSpace:" ",Mellintrf:"ℳ",Mfr:"𝔐",mfr:"𝔪",mho:"℧",micro:"µ",mid:"∣",midast:"*",midcir:"⫰",middot:"·",minus:"−",minusb:"⊟",minusd:"∸",minusdu:"⨪",MinusPlus:"∓",mlcp:"⫛",mldr:"…",mnplus:"∓",models:"⊧",Mopf:"𝕄",mopf:"𝕞",mp:"∓",Mscr:"ℳ",mscr:"𝓂",mstpos:"∾",Mu:"Μ",mu:"μ",multimap:"⊸",mumap:"⊸",nabla:"∇",Nacute:"Ń",nacute:"ń",nang:"∠⃒",nap:"≉",napE:"⩰̸",napid:"≋̸",napos:"ʼn",napprox:"≉",natur:"♮",natural:"♮",naturals:"ℕ",nbsp:" ",nbump:"≎̸",nbumpe:"≏̸",ncap:"⩃",Ncaron:"Ň",ncaron:"ň",Ncedil:"Ņ",ncedil:"ņ",ncong:"≇",ncongdot:"⩭̸",ncup:"⩂",Ncy:"Н",ncy:"н",ndash:"–",ne:"≠",nearhk:"⤤",neArr:"⇗",nearr:"↗",nearrow:"↗",nedot:"≐̸",NegativeMediumSpace:"​",NegativeThickSpace:"​",NegativeThinSpace:"​",NegativeVeryThinSpace:"​",nequiv:"≢",nesear:"⤨",nesim:"≂̸",NestedGreaterGreater:"≫",NestedLessLess:"≪",NewLine:"\n",nexist:"∄",nexists:"∄",Nfr:"𝔑",nfr:"𝔫",ngE:"≧̸",nge:"≱",ngeq:"≱",ngeqq:"≧̸",ngeqslant:"⩾̸",nges:"⩾̸",nGg:"⋙̸",ngsim:"≵",nGt:"≫⃒",ngt:"≯",ngtr:"≯",nGtv:"≫̸",nhArr:"⇎",nharr:"↮",nhpar:"⫲",ni:"∋",nis:"⋼",nisd:"⋺",niv:"∋",NJcy:"Њ",njcy:"њ",nlArr:"⇍",nlarr:"↚",nldr:"‥",nlE:"≦̸",nle:"≰",nLeftarrow:"⇍",nleftarrow:"↚",nLeftrightarrow:"⇎",nleftrightarrow:"↮",nleq:"≰",nleqq:"≦̸",nleqslant:"⩽̸",nles:"⩽̸",nless:"≮",nLl:"⋘̸",nlsim:"≴",nLt:"≪⃒",nlt:"≮",nltri:"⋪",nltrie:"⋬",nLtv:"≪̸",nmid:"∤",NoBreak:"⁠",NonBreakingSpace:" ",Nopf:"ℕ",nopf:"𝕟",Not:"⫬",not:"¬",NotCongruent:"≢",NotCupCap:"≭",NotDoubleVerticalBar:"∦",NotElement:"∉",NotEqual:"≠",NotEqualTilde:"≂̸",NotExists:"∄",NotGreater:"≯",NotGreaterEqual:"≱",NotGreaterFullEqual:"≧̸",NotGreaterGreater:"≫̸",NotGreaterLess:"≹",NotGreaterSlantEqual:"⩾̸",NotGreaterTilde:"≵",NotHumpDownHump:"≎̸",NotHumpEqual:"≏̸",notin:"∉",notindot:"⋵̸",notinE:"⋹̸",notinva:"∉",notinvb:"⋷",notinvc:"⋶",NotLeftTriangle:"⋪",NotLeftTriangleBar:"⧏̸",NotLeftTriangleEqual:"⋬",NotLess:"≮",NotLessEqual:"≰",NotLessGreater:"≸",NotLessLess:"≪̸",NotLessSlantEqual:"⩽̸",NotLessTilde:"≴",NotNestedGreaterGreater:"⪢̸",NotNestedLessLess:"⪡̸",notni:"∌",notniva:"∌",notnivb:"⋾",notnivc:"⋽",NotPrecedes:"⊀",NotPrecedesEqual:"⪯̸",NotPrecedesSlantEqual:"⋠",NotReverseElement:"∌",NotRightTriangle:"⋫",NotRightTriangleBar:"⧐̸",NotRightTriangleEqual:"⋭",NotSquareSubset:"⊏̸",NotSquareSubsetEqual:"⋢",NotSquareSuperset:"⊐̸",NotSquareSupersetEqual:"⋣",NotSubset:"⊂⃒",NotSubsetEqual:"⊈",NotSucceeds:"⊁",NotSucceedsEqual:"⪰̸",NotSucceedsSlantEqual:"⋡",NotSucceedsTilde:"≿̸",NotSuperset:"⊃⃒",NotSupersetEqual:"⊉",NotTilde:"≁",NotTildeEqual:"≄",NotTildeFullEqual:"≇",NotTildeTilde:"≉",NotVerticalBar:"∤",npar:"∦",nparallel:"∦",nparsl:"⫽⃥",npart:"∂̸",npolint:"⨔",npr:"⊀",nprcue:"⋠",npre:"⪯̸",nprec:"⊀",npreceq:"⪯̸",nrArr:"⇏",nrarr:"↛",nrarrc:"⤳̸",nrarrw:"↝̸",nRightarrow:"⇏",nrightarrow:"↛",nrtri:"⋫",nrtrie:"⋭",nsc:"⊁",nsccue:"⋡",nsce:"⪰̸",Nscr:"𝒩",nscr:"𝓃",nshortmid:"∤",nshortparallel:"∦",nsim:"≁",nsime:"≄",nsimeq:"≄",nsmid:"∤",nspar:"∦",nsqsube:"⋢",nsqsupe:"⋣",nsub:"⊄",nsubE:"⫅̸",nsube:"⊈",nsubset:"⊂⃒",nsubseteq:"⊈",nsubseteqq:"⫅̸",nsucc:"⊁",nsucceq:"⪰̸",nsup:"⊅",nsupE:"⫆̸",nsupe:"⊉",nsupset:"⊃⃒",nsupseteq:"⊉",nsupseteqq:"⫆̸",ntgl:"≹",Ntilde:"Ñ",ntilde:"ñ",ntlg:"≸",ntriangleleft:"⋪",ntrianglelefteq:"⋬",ntriangleright:"⋫",ntrianglerighteq:"⋭",Nu:"Ν",nu:"ν",num:"#",numero:"№",numsp:" ",nvap:"≍⃒",nVDash:"⊯",nVdash:"⊮",nvDash:"⊭",nvdash:"⊬",nvge:"≥⃒",nvgt:">⃒",nvHarr:"⤄",nvinfin:"⧞",nvlArr:"⤂",nvle:"≤⃒",nvlt:"<⃒",nvltrie:"⊴⃒",nvrArr:"⤃",nvrtrie:"⊵⃒",nvsim:"∼⃒",nwarhk:"⤣",nwArr:"⇖",nwarr:"↖",nwarrow:"↖",nwnear:"⤧",Oacute:"Ó",oacute:"ó",oast:"⊛",ocir:"⊚",Ocirc:"Ô",ocirc:"ô",Ocy:"О",ocy:"о",odash:"⊝",Odblac:"Ő",odblac:"ő",odiv:"⨸",odot:"⊙",odsold:"⦼",OElig:"Œ",oelig:"œ",ofcir:"⦿",Ofr:"𝔒",ofr:"𝔬",ogon:"˛",Ograve:"Ò",ograve:"ò",ogt:"⧁",ohbar:"⦵",ohm:"Ω",oint:"∮",olarr:"↺",olcir:"⦾",olcross:"⦻",oline:"‾",olt:"⧀",Omacr:"Ō",omacr:"ō",Omega:"Ω",omega:"ω",Omicron:"Ο",omicron:"ο",omid:"⦶",ominus:"⊖",Oopf:"𝕆",oopf:"𝕠",opar:"⦷",OpenCurlyDoubleQuote:"“",OpenCurlyQuote:"‘",operp:"⦹",oplus:"⊕",Or:"⩔",or:"∨",orarr:"↻",ord:"⩝",order:"ℴ",orderof:"ℴ",ordf:"ª",ordm:"º",origof:"⊶",oror:"⩖",orslope:"⩗",orv:"⩛",oS:"Ⓢ",Oscr:"𝒪",oscr:"ℴ",Oslash:"Ø",oslash:"ø",osol:"⊘",Otilde:"Õ",otilde:"õ",Otimes:"⨷",otimes:"⊗",otimesas:"⨶",Ouml:"Ö",ouml:"ö",ovbar:"⌽",OverBar:"‾",OverBrace:"⏞",OverBracket:"⎴",OverParenthesis:"⏜",par:"∥",para:"¶",parallel:"∥",parsim:"⫳",parsl:"⫽",part:"∂",PartialD:"∂",Pcy:"П",pcy:"п",percnt:"%",period:".",permil:"‰",perp:"⊥",pertenk:"‱",Pfr:"𝔓",pfr:"𝔭",Phi:"Φ",phi:"φ",phiv:"ϕ",phmmat:"ℳ",phone:"☎",Pi:"Π",pi:"π",pitchfork:"⋔",piv:"ϖ",planck:"ℏ",planckh:"ℎ",plankv:"ℏ",plus:"+",plusacir:"⨣",plusb:"⊞",pluscir:"⨢",plusdo:"∔",plusdu:"⨥",pluse:"⩲",PlusMinus:"±",plusmn:"±",plussim:"⨦",plustwo:"⨧",pm:"±",Poincareplane:"ℌ",pointint:"⨕",Popf:"ℙ",popf:"𝕡",pound:"£",Pr:"⪻",pr:"≺",prap:"⪷",prcue:"≼",prE:"⪳",pre:"⪯",prec:"≺",precapprox:"⪷",preccurlyeq:"≼",Precedes:"≺",PrecedesEqual:"⪯",PrecedesSlantEqual:"≼",PrecedesTilde:"≾",preceq:"⪯",precnapprox:"⪹",precneqq:"⪵",precnsim:"⋨",precsim:"≾",Prime:"″",prime:"′",primes:"ℙ",prnap:"⪹",prnE:"⪵",prnsim:"⋨",prod:"∏",Product:"∏",profalar:"⌮",profline:"⌒",profsurf:"⌓",prop:"∝",Proportion:"∷",Proportional:"∝",propto:"∝",prsim:"≾",prurel:"⊰",Pscr:"𝒫",pscr:"𝓅",Psi:"Ψ",psi:"ψ",puncsp:" ",Qfr:"𝔔",qfr:"𝔮",qint:"⨌",Qopf:"ℚ",qopf:"𝕢",qprime:"⁗",Qscr:"𝒬",qscr:"𝓆",quaternions:"ℍ",quatint:"⨖",quest:"?",questeq:"≟",QUOT:'"',quot:'"',rAarr:"⇛",race:"∽̱",Racute:"Ŕ",racute:"ŕ",radic:"√",raemptyv:"⦳",Rang:"⟫",rang:"⟩",rangd:"⦒",range:"⦥",rangle:"⟩",raquo:"»",Rarr:"↠",rArr:"⇒",rarr:"→",rarrap:"⥵",rarrb:"⇥",rarrbfs:"⤠",rarrc:"⤳",rarrfs:"⤞",rarrhk:"↪",rarrlp:"↬",rarrpl:"⥅",rarrsim:"⥴",Rarrtl:"⤖",rarrtl:"↣",rarrw:"↝",rAtail:"⤜",ratail:"⤚",ratio:"∶",rationals:"ℚ",RBarr:"⤐",rBarr:"⤏",rbarr:"⤍",rbbrk:"❳",rbrace:"}",rbrack:"]",rbrke:"⦌",rbrksld:"⦎",rbrkslu:"⦐",Rcaron:"Ř",rcaron:"ř",Rcedil:"Ŗ",rcedil:"ŗ",rceil:"⌉",rcub:"}",Rcy:"Р",rcy:"р",rdca:"⤷",rdldhar:"⥩",rdquo:"”",rdquor:"”",rdsh:"↳",Re:"ℜ",real:"ℜ",realine:"ℛ",realpart:"ℜ",reals:"ℝ",rect:"▭",REG:"®",reg:"®",ReverseElement:"∋",ReverseEquilibrium:"⇋",ReverseUpEquilibrium:"⥯",rfisht:"⥽",rfloor:"⌋",Rfr:"ℜ",rfr:"𝔯",rHar:"⥤",rhard:"⇁",rharu:"⇀",rharul:"⥬",Rho:"Ρ",rho:"ρ",rhov:"ϱ",RightAngleBracket:"⟩",RightArrow:"→",Rightarrow:"⇒",rightarrow:"→",RightArrowBar:"⇥",RightArrowLeftArrow:"⇄",rightarrowtail:"↣",RightCeiling:"⌉",RightDoubleBracket:"⟧",RightDownTeeVector:"⥝",RightDownVector:"⇂",RightDownVectorBar:"⥕",RightFloor:"⌋",rightharpoondown:"⇁",rightharpoonup:"⇀",rightleftarrows:"⇄",rightleftharpoons:"⇌",rightrightarrows:"⇉",rightsquigarrow:"↝",RightTee:"⊢",RightTeeArrow:"↦",RightTeeVector:"⥛",rightthreetimes:"⋌",RightTriangle:"⊳",RightTriangleBar:"⧐",RightTriangleEqual:"⊵",RightUpDownVector:"⥏",RightUpTeeVector:"⥜",RightUpVector:"↾",RightUpVectorBar:"⥔",RightVector:"⇀",RightVectorBar:"⥓",ring:"˚",risingdotseq:"≓",rlarr:"⇄",rlhar:"⇌",rlm:"‏",rmoust:"⎱",rmoustache:"⎱",rnmid:"⫮",roang:"⟭",roarr:"⇾",robrk:"⟧",ropar:"⦆",Ropf:"ℝ",ropf:"𝕣",roplus:"⨮",rotimes:"⨵",RoundImplies:"⥰",rpar:")",rpargt:"⦔",rppolint:"⨒",rrarr:"⇉",Rrightarrow:"⇛",rsaquo:"›",Rscr:"ℛ",rscr:"𝓇",Rsh:"↱",rsh:"↱",rsqb:"]",rsquo:"’",rsquor:"’",rthree:"⋌",rtimes:"⋊",rtri:"▹",rtrie:"⊵",rtrif:"▸",rtriltri:"⧎",RuleDelayed:"⧴",ruluhar:"⥨",rx:"℞",Sacute:"Ś",sacute:"ś",sbquo:"‚",Sc:"⪼",sc:"≻",scap:"⪸",Scaron:"Š",scaron:"š",sccue:"≽",scE:"⪴",sce:"⪰",Scedil:"Ş",scedil:"ş",Scirc:"Ŝ",scirc:"ŝ",scnap:"⪺",scnE:"⪶",scnsim:"⋩",scpolint:"⨓",scsim:"≿",Scy:"С",scy:"с",sdot:"⋅",sdotb:"⊡",sdote:"⩦",searhk:"⤥",seArr:"⇘",searr:"↘",searrow:"↘",sect:"§",semi:";",seswar:"⤩",setminus:"∖",setmn:"∖",sext:"✶",Sfr:"𝔖",sfr:"𝔰",sfrown:"⌢",sharp:"♯",SHCHcy:"Щ",shchcy:"щ",SHcy:"Ш",shcy:"ш",ShortDownArrow:"↓",ShortLeftArrow:"←",shortmid:"∣",shortparallel:"∥",ShortRightArrow:"→",ShortUpArrow:"↑",shy:"­",Sigma:"Σ",sigma:"σ",sigmaf:"ς",sigmav:"ς",sim:"∼",simdot:"⩪",sime:"≃",simeq:"≃",simg:"⪞",simgE:"⪠",siml:"⪝",simlE:"⪟",simne:"≆",simplus:"⨤",simrarr:"⥲",slarr:"←",SmallCircle:"∘",smallsetminus:"∖",smashp:"⨳",smeparsl:"⧤",smid:"∣",smile:"⌣",smt:"⪪",smte:"⪬",smtes:"⪬︀",SOFTcy:"Ь",softcy:"ь",sol:"/",solb:"⧄",solbar:"⌿",Sopf:"𝕊",sopf:"𝕤",spades:"♠",spadesuit:"♠",spar:"∥",sqcap:"⊓",sqcaps:"⊓︀",sqcup:"⊔",sqcups:"⊔︀",Sqrt:"√",sqsub:"⊏",sqsube:"⊑",sqsubset:"⊏",sqsubseteq:"⊑",sqsup:"⊐",sqsupe:"⊒",sqsupset:"⊐",sqsupseteq:"⊒",squ:"□",Square:"□",square:"□",SquareIntersection:"⊓",SquareSubset:"⊏",SquareSubsetEqual:"⊑",SquareSuperset:"⊐",SquareSupersetEqual:"⊒",SquareUnion:"⊔",squarf:"▪",squf:"▪",srarr:"→",Sscr:"𝒮",sscr:"𝓈",ssetmn:"∖",ssmile:"⌣",sstarf:"⋆",Star:"⋆",star:"☆",starf:"★",straightepsilon:"ϵ",straightphi:"ϕ",strns:"¯",Sub:"⋐",sub:"⊂",subdot:"⪽",subE:"⫅",sube:"⊆",subedot:"⫃",submult:"⫁",subnE:"⫋",subne:"⊊",subplus:"⪿",subrarr:"⥹",Subset:"⋐",subset:"⊂",subseteq:"⊆",subseteqq:"⫅",SubsetEqual:"⊆",subsetneq:"⊊",subsetneqq:"⫋",subsim:"⫇",subsub:"⫕",subsup:"⫓",succ:"≻",succapprox:"⪸",succcurlyeq:"≽",Succeeds:"≻",SucceedsEqual:"⪰",SucceedsSlantEqual:"≽",SucceedsTilde:"≿",succeq:"⪰",succnapprox:"⪺",succneqq:"⪶",succnsim:"⋩",succsim:"≿",SuchThat:"∋",Sum:"∑",sum:"∑",sung:"♪",Sup:"⋑",sup:"⊃",sup1:"¹",sup2:"²",sup3:"³",supdot:"⪾",supdsub:"⫘",supE:"⫆",supe:"⊇",supedot:"⫄",Superset:"⊃",SupersetEqual:"⊇",suphsol:"⟉",suphsub:"⫗",suplarr:"⥻",supmult:"⫂",supnE:"⫌",supne:"⊋",supplus:"⫀",Supset:"⋑",supset:"⊃",supseteq:"⊇",supseteqq:"⫆",supsetneq:"⊋",supsetneqq:"⫌",supsim:"⫈",supsub:"⫔",supsup:"⫖",swarhk:"⤦",swArr:"⇙",swarr:"↙",swarrow:"↙",swnwar:"⤪",szlig:"ß",Tab:"\t",target:"⌖",Tau:"Τ",tau:"τ",tbrk:"⎴",Tcaron:"Ť",tcaron:"ť",Tcedil:"Ţ",tcedil:"ţ",Tcy:"Т",tcy:"т",tdot:"⃛",telrec:"⌕",Tfr:"𝔗",tfr:"𝔱",there4:"∴",Therefore:"∴",therefore:"∴",Theta:"Θ",theta:"θ",thetasym:"ϑ",thetav:"ϑ",thickapprox:"≈",thicksim:"∼",ThickSpace:"  ",thinsp:" ",ThinSpace:" ",thkap:"≈",thksim:"∼",THORN:"Þ",thorn:"þ",Tilde:"∼",tilde:"˜",TildeEqual:"≃",TildeFullEqual:"≅",TildeTilde:"≈",times:"×",timesb:"⊠",timesbar:"⨱",timesd:"⨰",tint:"∭",toea:"⤨",top:"⊤",topbot:"⌶",topcir:"⫱",Topf:"𝕋",topf:"𝕥",topfork:"⫚",tosa:"⤩",tprime:"‴",TRADE:"™",trade:"™",triangle:"▵",triangledown:"▿",triangleleft:"◃",trianglelefteq:"⊴",triangleq:"≜",triangleright:"▹",trianglerighteq:"⊵",tridot:"◬",trie:"≜",triminus:"⨺",TripleDot:"⃛",triplus:"⨹",trisb:"⧍",tritime:"⨻",trpezium:"⏢",Tscr:"𝒯",tscr:"𝓉",TScy:"Ц",tscy:"ц",TSHcy:"Ћ",tshcy:"ћ",Tstrok:"Ŧ",tstrok:"ŧ",twixt:"≬",twoheadleftarrow:"↞",twoheadrightarrow:"↠",Uacute:"Ú",uacute:"ú",Uarr:"↟",uArr:"⇑",uarr:"↑",Uarrocir:"⥉",Ubrcy:"Ў",ubrcy:"ў",Ubreve:"Ŭ",ubreve:"ŭ",Ucirc:"Û",ucirc:"û",Ucy:"У",ucy:"у",udarr:"⇅",Udblac:"Ű",udblac:"ű",udhar:"⥮",ufisht:"⥾",Ufr:"𝔘",ufr:"𝔲",Ugrave:"Ù",ugrave:"ù",uHar:"⥣",uharl:"↿",uharr:"↾",uhblk:"▀",ulcorn:"⌜",ulcorner:"⌜",ulcrop:"⌏",ultri:"◸",Umacr:"Ū",umacr:"ū",uml:"¨",UnderBar:"_",UnderBrace:"⏟",UnderBracket:"⎵",UnderParenthesis:"⏝",Union:"⋃",UnionPlus:"⊎",Uogon:"Ų",uogon:"ų",Uopf:"𝕌",uopf:"𝕦",UpArrow:"↑",Uparrow:"⇑",uparrow:"↑",UpArrowBar:"⤒",UpArrowDownArrow:"⇅",UpDownArrow:"↕",Updownarrow:"⇕",updownarrow:"↕",UpEquilibrium:"⥮",upharpoonleft:"↿",upharpoonright:"↾",uplus:"⊎",UpperLeftArrow:"↖",UpperRightArrow:"↗",Upsi:"ϒ",upsi:"υ",upsih:"ϒ",Upsilon:"Υ",upsilon:"υ",UpTee:"⊥",UpTeeArrow:"↥",upuparrows:"⇈",urcorn:"⌝",urcorner:"⌝",urcrop:"⌎",Uring:"Ů",uring:"ů",urtri:"◹",Uscr:"𝒰",uscr:"𝓊",utdot:"⋰",Utilde:"Ũ",utilde:"ũ",utri:"▵",utrif:"▴",uuarr:"⇈",Uuml:"Ü",uuml:"ü",uwangle:"⦧",vangrt:"⦜",varepsilon:"ϵ",varkappa:"ϰ",varnothing:"∅",varphi:"ϕ",varpi:"ϖ",varpropto:"∝",vArr:"⇕",varr:"↕",varrho:"ϱ",varsigma:"ς",varsubsetneq:"⊊︀",varsubsetneqq:"⫋︀",varsupsetneq:"⊋︀",varsupsetneqq:"⫌︀",vartheta:"ϑ",vartriangleleft:"⊲",vartriangleright:"⊳",Vbar:"⫫",vBar:"⫨",vBarv:"⫩",Vcy:"В",vcy:"в",VDash:"⊫",Vdash:"⊩",vDash:"⊨",vdash:"⊢",Vdashl:"⫦",Vee:"⋁",vee:"∨",veebar:"⊻",veeeq:"≚",vellip:"⋮",Verbar:"‖",verbar:"|",Vert:"‖",vert:"|",VerticalBar:"∣",VerticalLine:"|",VerticalSeparator:"❘",VerticalTilde:"≀",VeryThinSpace:" ",Vfr:"𝔙",vfr:"𝔳",vltri:"⊲",vnsub:"⊂⃒",vnsup:"⊃⃒",Vopf:"𝕍",vopf:"𝕧",vprop:"∝",vrtri:"⊳",Vscr:"𝒱",vscr:"𝓋",vsubnE:"⫋︀",vsubne:"⊊︀",vsupnE:"⫌︀",vsupne:"⊋︀",Vvdash:"⊪",vzigzag:"⦚",Wcirc:"Ŵ",wcirc:"ŵ",wedbar:"⩟",Wedge:"⋀",wedge:"∧",wedgeq:"≙",weierp:"℘",Wfr:"𝔚",wfr:"𝔴",Wopf:"𝕎",wopf:"𝕨",wp:"℘",wr:"≀",wreath:"≀",Wscr:"𝒲",wscr:"𝓌",xcap:"⋂",xcirc:"◯",xcup:"⋃",xdtri:"▽",Xfr:"𝔛",xfr:"𝔵",xhArr:"⟺",xharr:"⟷",Xi:"Ξ",xi:"ξ",xlArr:"⟸",xlarr:"⟵",xmap:"⟼",xnis:"⋻",xodot:"⨀",Xopf:"𝕏",xopf:"𝕩",xoplus:"⨁",xotime:"⨂",xrArr:"⟹",xrarr:"⟶",Xscr:"𝒳",xscr:"𝓍",xsqcup:"⨆",xuplus:"⨄",xutri:"△",xvee:"⋁",xwedge:"⋀",Yacute:"Ý",yacute:"ý",YAcy:"Я",yacy:"я",Ycirc:"Ŷ",ycirc:"ŷ",Ycy:"Ы",ycy:"ы",yen:"¥",Yfr:"𝔜",yfr:"𝔶",YIcy:"Ї",yicy:"ї",Yopf:"𝕐",yopf:"𝕪",Yscr:"𝒴",yscr:"𝓎",YUcy:"Ю",yucy:"ю",Yuml:"Ÿ",yuml:"ÿ",Zacute:"Ź",zacute:"ź",Zcaron:"Ž",zcaron:"ž",Zcy:"З",zcy:"з",Zdot:"Ż",zdot:"ż",zeetrf:"ℨ",ZeroWidthSpace:"​",Zeta:"Ζ",zeta:"ζ",Zfr:"ℨ",zfr:"𝔷",ZHcy:"Ж",zhcy:"ж",zigrarr:"⇝",Zopf:"ℤ",zopf:"𝕫",Zscr:"𝒵",zscr:"𝓏",zwj:"‍",zwnj:"‌"}},function(e,t,n){"use strict";var r=n(26).replaceEntities;e.exports=function(e){var t=r(e);try{t=decodeURI(t)}catch(e){}return encodeURI(t)}},function(e,t,n){"use strict";e.exports=function(e){return e.trim().replace(/\s+/g," ").toUpperCase()}},function(e,t,n){"use strict";var r=n(489),i=n(26).unescapeMd;e.exports=function(e,t){var n,o,a,s=t,u=e.posMax;if(60===e.src.charCodeAt(t)){for(t++;t<u;){if(10===(n=e.src.charCodeAt(t)))return!1;if(62===n)return a=r(i(e.src.slice(s+1,t))),!!e.parser.validateLink(a)&&(e.pos=t+1,e.linkContent=a,!0);92===n&&t+1<u?t+=2:t++}return!1}for(o=0;t<u&&32!==(n=e.src.charCodeAt(t))&&!(n>8&&n<14);)if(92===n&&t+1<u)t+=2;else{if(40===n&&++o>1)break;if(41===n&&--o<0)break;t++}return s!==t&&(a=i(e.src.slice(s,t)),!!e.parser.validateLink(a)&&(e.linkContent=a,e.pos=t,!0))}},function(e,t,n){"use strict";var r=n(26).unescapeMd;e.exports=function(e,t){var n,i=t,o=e.posMax,a=e.src.charCodeAt(t);if(34!==a&&39!==a&&40!==a)return!1;for(t++,40===a&&(a=41);t<o;){if((n=e.src.charCodeAt(t))===a)return e.pos=t+1,e.linkContent=r(e.src.slice(i+1,t)),!0;92===n&&t+1<o?t+=2:t++}return!1}},function(e,t,n){function r(){i.call(this)}e.exports=r;var i=n(143).EventEmitter;n(42)(r,i),r.Readable=n(262),r.Writable=n(1115),r.Duplex=n(1110),r.Transform=n(1114),r.PassThrough=n(1113),r.Stream=r,r.prototype.pipe=function(e,t){function n(t){e.writable&&!1===e.write(t)&&l.pause&&l.pause()}function r(){l.readable&&l.resume&&l.resume()}function o(){c||(c=!0,e.end())}function a(){c||(c=!0,"function"==typeof e.destroy&&e.destroy())}function s(e){if(u(),0===i.listenerCount(this,"error"))throw e}function u(){l.removeListener("data",n),e.removeListener("drain",r),l.removeListener("end",o),l.removeListener("close",a),l.removeListener("error",s),e.removeListener("error",s),l.removeListener("end",u),l.removeListener("close",u),e.removeListener("close",u)}var l=this;l.on("data",n),e.on("drain",r),e._isStdio||t&&!1===t.end||(l.on("end",o),l.on("close",a));var c=!1;return l.on("error",s),e.on("error",s),l.on("end",u),l.on("close",u),e.on("close",u),e.emit("pipe",l),e}},function(e,t){/*! http://mths.be/repeat v0.2.0 by @mathias */
-+String.prototype.repeat||function(){"use strict";var e=function(){try{var e={},t=Object.defineProperty,n=t(e,e,e)&&t}catch(e){}return n}(),t=function(e){if(null==this)throw TypeError();var t=String(this),n=e?Number(e):0;if(n!=n&&(n=0),n<0||n==1/0)throw RangeError();for(var r="";n;)n%2==1&&(r+=t),n>1&&(t+=t),n>>=1;return r};e?e(String.prototype,"repeat",{value:t,configurable:!0,writable:!0}):String.prototype.repeat=t}()},function(e,t,n){e.exports=function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,t),i.l=!0,i.exports}var n={};return t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=58)}([function(e,t){e.exports=n(47)},function(e,t){e.exports=n(30)},function(e,t){e.exports=n(48)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.openapi;return!!t&&(0,b.default)(t,"3")}function o(e){var t=e.swagger;return!!t&&(0,b.default)(t,"2")}function a(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"";return e&&"object"===(void 0===e?"undefined":(0,v.default)(e))?(e.operationId||"").replace(/\s/g,"").length?w(e.operationId):s(t,n):null}function s(e,t){return""+x(t)+w(e)}function u(e,t){return x(t)+"-"+e}function l(e,t){return e&&e.paths?c(e,function(e){var n=e.pathName,r=e.method,i=e.operation;if(!i||"object"!==(void 0===i?"undefined":(0,v.default)(i)))return!1;var o=i.operationId;return[a(i,n,r),u(n,r),o].some(function(e){return e&&e===t})}):null}function c(e,t){return p(e,t,!0)||null}function p(e,t,n){if(!e||"object"!==(void 0===e?"undefined":(0,v.default)(e))||!e.paths||"object"!==(0,v.default)(e.paths))return null;var r=e.paths;for(var i in r)for(var o in r[i])if("PARAMETERS"!==o.toUpperCase()){var a=r[i][o];if(a&&"object"===(void 0===a?"undefined":(0,v.default)(a))){var s={spec:e,pathName:i,method:o.toUpperCase(),operation:a},u=t(s);if(n&&u)return s}}}function f(e){var t=e.spec,n=t.paths,r={};if(!n)return e;for(var i in n){var o=n[i];if((0,y.default)(o)){var s=o.parameters;for(var u in o)!function(e){var n=o[e];if(!(0,y.default)(n))return"continue";var u=a(n,i,e);if(u){r[u]?r[u].push(n):r[u]=[n];var l=r[u];if(l.length>1)l.forEach(function(e,t){e.__originalOperationId=e.__originalOperationId||e.operationId,e.operationId=""+u+(t+1)});else if(void 0!==n.operationId){var c=l[0];c.__originalOperationId=c.__originalOperationId||n.operationId,c.operationId=u}}if("parameters"!==e){var p=[],f={};for(var h in t)"produces"!==h&&"consumes"!==h&&"security"!==h||(f[h]=t[h],p.push(f));if(s&&(f.parameters=s,p.push(f)),p.length){var m=!0,v=!1,g=void 0;try{for(var _,b=(0,d.default)(p);!(m=(_=b.next()).done);m=!0){var x=_.value;for(var w in x)if(n[w]){if("parameters"===w){var k=!0,E=!1,S=void 0;try{for(var C,A=(0,d.default)(x[w]);!(k=(C=A.next()).done);k=!0)!function(){var e=C.value;n[w].some(function(t){return t.name===e.name})||n[w].push(e)}()}catch(e){E=!0,S=e}finally{try{!k&&A.return&&A.return()}finally{if(E)throw S}}}}else n[w]=x[w]}}catch(e){v=!0,g=e}finally{try{!m&&b.return&&b.return()}finally{if(v)throw g}}}}}(u)}}return e}Object.defineProperty(t,"__esModule",{value:!0});var h=n(13),d=r(h),m=n(2),v=r(m);t.isOAS3=i,t.isSwagger2=o,t.opId=a,t.idFromPathMethod=s,t.legacyIdFromPathMethod=u,t.getOperationRaw=l,t.findOperation=c,t.eachOperation=p,t.normalizeSwagger=f;var g=n(51),y=r(g),_=n(19),b=r(_),x=function(e){return String.prototype.toLowerCase.call(e)},w=function(e){return e.replace(/[^\w]/gi,"_")}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return"object"===(void 0===e?"undefined":(0,b.default)(e))&&(t=e,e=t.url),t.headers=t.headers||{},A.mergeInQueryOrForm(t),t.requestInterceptor&&(t=t.requestInterceptor(t)||t),/multipart\/form-data/i.test(t.headers["content-type"]||t.headers["Content-Type"])&&(delete t.headers["content-type"],delete t.headers["Content-Type"]),(t.userFetch||fetch)(t.url,t).then(function(n){var r=A.serializeRes(n,e,t).then(function(e){return t.responseInterceptor&&(e=t.responseInterceptor(e)||e),e});if(!n.ok){var i=new Error(n.statusText);return i.statusCode=i.status=n.status,r.then(function(e){throw i.response=e,i},function(e){throw i.responseError=e,i})}return r})}function o(e,t){return"application/json"===t?JSON.parse(e):E.default.safeLoad(e)}function a(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=n.loadSpec,i=void 0!==r&&r,a={ok:e.ok,url:e.url||t,status:e.status,statusText:e.statusText,headers:s(e.headers)},u=a.headers["content-type"],l=i||D(u);return(l?e.text:e.blob||e.buffer).call(e).then(function(e){if(a.text=e,a.data=e,l)try{var t=o(e,u);a.body=t,a.obj=t}catch(e){a.parseError=e}return a})}function s(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t={};return"function"==typeof e.forEach?(e.forEach(function(e,n){void 0!==t[n]?(t[n]=Array.isArray(t[n])?t[n]:[t[n]],t[n].push(e)):t[n]=e}),t):t}function u(e){return"undefined"!=typeof File?e instanceof File:null!==e&&"object"===(void 0===e?"undefined":(0,b.default)(e))&&"function"==typeof e.pipe}function l(e,t){var n=e.collectionFormat,r=e.allowEmptyValue,i="object"===(void 0===e?"undefined":(0,b.default)(e))?e.value:e,o={csv:",",ssv:"%20",tsv:"%09",pipes:"|"};if(void 0===i&&r)return"";if(u(i)||"boolean"==typeof i)return i;var a=encodeURIComponent;return t&&(a=(0,C.default)(i)?function(e){return e}:function(e){return(0,y.default)(e)}),"object"!==(void 0===i?"undefined":(0,b.default)(i))||Array.isArray(i)?Array.isArray(i)?Array.isArray(i)&&!n?i.map(a).join(","):"multi"===n?i.map(a):i.map(a).join(o[n]):a(i):""}function c(e){var t=(0,v.default)(e).reduce(function(t,n){var r=e[n],i=!!r.skipEncoding,o=i?n:encodeURIComponent(n),a=function(e){return e&&"object"===(void 0===e?"undefined":(0,b.default)(e))}(r)&&!Array.isArray(r);return t[o]=l(a?r:{value:r},i),t},{});return w.default.stringify(t,{encode:!1,indices:!1})||""}function p(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=e.url,r=void 0===t?"":t,i=e.query,o=e.form;if(o){var a=(0,v.default)(o).some(function(e){return u(o[e].value)}),s=e.headers["content-type"]||e.headers["Content-Type"];if(a||/multipart\/form-data/i.test(s)){var p=n(46);e.body=new p,(0,v.default)(o).forEach(function(t){e.body.append(t,l(o[t],!0))})}else e.body=c(o);delete e.form}if(i){var f=r.split("?"),h=(0,d.default)(f,2),m=h[0],g=h[1],y="";if(g){var _=w.default.parse(g);(0,v.default)(i).forEach(function(e){return delete _[e]}),y=w.default.stringify(_,{encode:!0})}var b=function(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];var r=t.filter(function(e){return e}).join("&");return r?"?"+r:""}(y,c(i));e.url=m+b,delete e.query}return e}function f(e,t,n){return n=n||function(e){return e},t=t||function(e){return e},function(r){return"string"==typeof r&&(r={url:r}),A.mergeInQueryOrForm(r),r=t(r),n(e(r))}}Object.defineProperty(t,"__esModule",{value:!0}),t.shouldDownloadAsText=t.self=void 0;var h=n(38),d=r(h),m=n(0),v=r(m),g=n(6),y=r(g),_=n(2),b=r(_);t.default=i,t.serializeRes=a,t.serializeHeaders=s,t.encodeFormOrQuery=c,t.mergeInQueryOrForm=p,t.makeHttp=f,n(42);var x=n(55),w=r(x),k=n(47),E=r(k),S=n(53),C=r(S),A=t.self={serializeRes:a,mergeInQueryOrForm:p},D=t.shouldDownloadAsText=function(){return/(json|xml|yaml|text)\b/.test(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"")}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t,n){if(n=n||{},t=(0,z.default)({},t,{path:t.path&&o(t.path)}),"merge"===t.op){var r=I(e,t.path);(0,z.default)(r,t.value),W.default.applyPatch(e,[s(t.path,r)])}else if("mergeDeep"===t.op){var i=I(e,t.path),a=(0,z.default)({},i);(0,J.default)(i,t.value);for(var u in t.value)if(Object.prototype.hasOwnProperty.call(t.value,u)){var l=t.value[u];if(Array.isArray(l)){var c=a[u]||[];i[u]=c.concat(l)}}}else if("add"===t.op&&""===t.path&&k(t.value)){var p=(0,L.default)(t.value).reduce(function(e,n){return e.push({op:"add",path:"/"+o(n),value:t.value[n]}),e},[]);W.default.applyPatch(e,p)}else if("replace"===t.op&&""===t.path){var f=t.value;n.allowMetaPatches&&t.meta&&M(t)&&(Array.isArray(t.value)||k(t.value))&&(f=(0,z.default)({},f,t.meta)),e=f}else if(W.default.applyPatch(e,[t]),n.allowMetaPatches&&t.meta&&M(t)&&(Array.isArray(t.value)||k(t.value))){var h=I(e,t.path),d=(0,z.default)({},h,t.meta);W.default.applyPatch(e,[s(t.path,d)])}return e}function o(e){return Array.isArray(e)?e.length<1?"":"/"+e.map(function(e){return(e+"").replace(/~/g,"~0").replace(/\//g,"~1")}).join("/"):e}function a(e,t){return{op:"add",path:e,value:t}}function s(e,t,n){return{op:"replace",path:e,value:t,meta:n}}function u(e,t){return{op:"remove",path:e}}function l(e,t){return{type:"mutation",op:"merge",path:e,value:t}}function c(e,t){return{type:"mutation",op:"mergeDeep",path:e,value:t}}function p(e,t){return{type:"context",path:e,value:t}}function f(e,t){try{return d(e,v,t)}catch(e){return e}}function h(e,t){try{return d(e,m,t)}catch(e){return e}}function d(e,t,n){return w(x(e.filter(M).map(function(e){return t(e.value,n,e.path)})||[]))}function m(e,t,n){return n=n||[],Array.isArray(e)?e.map(function(e,r){return m(e,t,n.concat(r))}):k(e)?(0,L.default)(e).map(function(r){return m(e[r],t,n.concat(r))}):t(e,n[n.length-1],n)}function v(e,t,n){n=n||[];var r=[];if(n.length>0){var i=t(e,n[n.length-1],n);i&&(r=r.concat(i))}if(Array.isArray(e)){var o=e.map(function(e,r){return v(e,t,n.concat(r))});o&&(r=r.concat(o))}else if(k(e)){var a=(0,L.default)(e).map(function(r){return v(e[r],t,n.concat(r))});a&&(r=r.concat(a))}return r=x(r)}function g(e,t){if(!Array.isArray(t))return!1;for(var n=0,r=t.length;n<r;n++)if(t[n]!==e[n])return!1;return!0}function y(e,t){return t.reduce(function(e,t){return void 0!==t&&e?e[t]:e},e)}function _(e){return w(x(b(e)))}function b(e){return Array.isArray(e)?e:[e]}function x(e){var t;return(t=[]).concat.apply(t,(0,N.default)(e.map(function(e){return Array.isArray(e)?x(e):e})))}function w(e){return e.filter(function(e){return void 0!==e})}function k(e){return e&&"object"===(void 0===e?"undefined":(0,j.default)(e))}function E(e){return k(e)&&S(e.then)}function S(e){return e&&"function"==typeof e}function C(e){return e instanceof Error}function A(e){if(P(e)){var t=e.op;return"add"===t||"remove"===t||"replace"===t}return!1}function D(e){return H.default.isGeneratorFunction(e)}function O(e){return A(e)||P(e)&&"mutation"===e.type}function M(e){return O(e)&&("add"===e.op||"replace"===e.op||"merge"===e.op||"mergeDeep"===e.op)}function T(e){return P(e)&&"context"===e.type}function P(e){return e&&"object"===(void 0===e?"undefined":(0,j.default)(e))}function I(e,t){try{return W.default.getValueByPointer(e,t)}catch(e){return console.error(e),{}}}Object.defineProperty(t,"__esModule",{value:!0});var R=n(2),j=r(R),F=n(39),N=r(F),B=n(0),L=r(B),q=n(1),z=r(q),U=n(45),W=r(U),V=n(17),H=r(V),G=n(43),J=r(G);t.default={add:a,replace:s,remove:u,merge:l,mergeDeep:c,context:p,getIn:y,applyPatch:i,parentPathMatch:g,flatten:x,fullyNormalizeArray:_,normalizeArray:b,isPromise:E,forEachNew:f,forEachNewPrimitive:h,isJsonPatch:A,isContextPatch:T,isPatch:P,isMutation:O,isAdditiveMutation:M,isGenerator:D,isFunction:S,isObject:k,isError:C}},function(e,t){e.exports=n(35)},function(e,t){e.exports=n(21)},function(e,t){e.exports=n(939)},function(e,t){e.exports=n(572)},function(e,t){e.exports=n(497)},function(e,t,n){"use strict";function r(e){var t=e[e.length-1],n=e.join("/");return i.indexOf(t)>-1||o.indexOf(n)>-1}Object.defineProperty(t,"__esModule",{value:!0}),t.isFreelyNamed=r;var i=["properties"],o=["definitions","parameters","responses","securityDefinitions","components/schemas","components/responses","components/parameters","components/securitySchemes"]},function(e,t,n){"use strict";function r(e,t){function n(){Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=(new Error).stack;for(var e=arguments.length,n=Array(e),r=0;r<e;r++)n[r]=arguments[r];this.message=n[0],t&&t.apply(this,n)}return n.prototype=new Error,n.prototype.name=e,n.prototype.constructor=n,n}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r},function(e,t){e.exports=n(95)},function(e,t){e.exports=n(332)},function(e,t){e.exports=n(2)},function(e,t){e.exports=n(3)},function(e,t){e.exports=n(569)},function(e,t){e.exports=n(224)},function(e,t){e.exports=n(956)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=this,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if("string"==typeof e?n.url=e:n=e,!(this instanceof i))return new i(n);(0,l.default)(this,n);var r=this.resolve().then(function(){return t.disableInterfaces||(0,l.default)(t,i.makeApisTagOperation(t)),t});return r.client=this,r}var o=n(7),a=r(o),s=n(48),u=(r(s),n(8)),l=r(u),c=n(19),p=r(c),f=n(10),h=r(f),d=n(4),m=r(d),v=n(28),g=r(v),y=n(27),_=n(21),b=n(3);i.http=m.default,i.makeHttp=d.makeHttp.bind(null,i.http),i.resolve=g.default,i.execute=_.execute,i.serializeRes=d.serializeRes,i.serializeHeaders=d.serializeHeaders,i.clearCache=v.clearCache,i.parameterBuilders=_.PARAMETER_BUILDERS,i.makeApisTagOperation=y.makeApisTagOperation,i.buildRequest=_.buildRequest,i.helpers={opId:b.opId},e.exports=i,i.prototype={http:m.default,execute:function(e){return this.applyDefaults(),i.execute((0,a.default)({spec:this.spec,http:this.http,securities:{authorized:this.authorizations}},e))},resolve:function(){var e=this;return i.resolve({spec:this.spec,url:this.url,allowMetaPatches:this.allowMetaPatches,requestInterceptor:this.requestInterceptor||null,responseInterceptor:this.responseInterceptor||null}).then(function(t){return e.originalSpec=e.spec,e.spec=t.spec,e.errors=t.errors,e})}},i.prototype.applyDefaults=function(){var e=this.spec,t=this.url;if(t&&(0,p.default)(t,"http")){var n=h.default.parse(t);e.host||(e.host=n.host),e.schemes||(e.schemes=[n.protocol.replace(":","")]),e.basePath||(e.basePath="/")}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.http,n=e.fetch,r=e.spec,i=e.operationId,o=e.pathName,a=e.method,s=e.parameters,u=e.securities,l=(0,v.default)(e,["http","fetch","spec","operationId","pathName","method","parameters","securities"]),c=t||n||R.default;o&&a&&!i&&(i=(0,H.legacyIdFromPathMethod)(o,a));var p=Y.buildRequest((0,d.default)({spec:r,operationId:i,parameters:s,securities:u,http:c},l));return p.body&&((0,S.default)(p.body)||(0,A.default)(p.body))&&(p.body=(0,f.default)(p.body)),c(p)}function o(e){var t=e.spec,n=e.operationId,r=(e.securities,e.requestContentType,e.responseContentType),i=e.scheme,o=e.requestInterceptor,s=e.responseInterceptor,u=e.contextUrl,l=e.userFetch,c=(e.requestBody,e.server),p=e.serverVariables,f=e.http,h=e.parameters,m=e.parameterBuilders,v=(0,H.isOAS3)(t);m||(m=v?q.default:B.default);var g=f&&f.withCredentials?"include":"same-origin",_={url:"",credentials:g,headers:{},cookies:{}};o&&(_.requestInterceptor=o),s&&(_.responseInterceptor=s),l&&(_.userFetch=l);var b=(0,H.getOperationRaw)(t,n);if(!b)throw new J("Operation "+n+" not found");var x=b.operation,w=void 0===x?{}:x,k=b.method,E=b.pathName;if(_.url+=a({spec:t,scheme:i,contextUrl:u,server:c,serverVariables:p,pathName:E,method:k}),!n)return delete _.cookies,_;_.url+=E,_.method=(""+k).toUpperCase(),h=h||{};var S=t.paths[E]||{};r&&(_.headers.accept=r);var C=X([].concat(G(w.parameters)).concat(G(S.parameters)));C.forEach(function(e){var n=m[e.in],r=void 0;if("body"===e.in&&e.schema&&e.schema.properties&&(r=h),r=e&&e.name&&h[e.name],void 0===r?r=e&&e.name&&h[e.in+"."+e.name]:K(e.name,C).length>1&&console.warn("Parameter '"+e.name+"' is ambiguous because the defined spec has more than one parameter with the name: '"+e.name+"' and the passed-in parameter values did not define an 'in' value."),void 0!==e.default&&void 0===r&&(r=e.default),void 0===r&&e.required&&!e.allowEmptyValue)throw new Error("Required parameter "+e.name+" is not provided");n&&n({req:_,parameter:e,value:r,operation:w,spec:t})});var A=(0,d.default)({},e,{operation:w});if(_=v?(0,U.default)(A,_):(0,V.default)(A,_),_.cookies&&(0,y.default)(_.cookies).length){var D=(0,y.default)(_.cookies).reduce(function(e,t){var n=_.cookies[t];return e+(e?"&":"")+P.default.serialize(t,n)},"");_.headers.Cookie=D}return _.cookies&&delete _.cookies,(0,I.mergeInQueryOrForm)(_),_}function a(e){return(0,H.isOAS3)(e.spec)?s(e):c(e)}function s(e){var t=e.spec,n=e.pathName,r=e.method,i=e.server,o=e.contextUrl,a=e.serverVariables,s=void 0===a?{}:a,c=(0,k.default)(t,["paths",n,(r||"").toLowerCase(),"servers"])||(0,k.default)(t,["paths",n,"servers"])||(0,k.default)(t,["servers"]),p="",f=null;if(i&&c){var h=c.map(function(e){return e.url});h.indexOf(i)>-1&&(p=i,f=c[h.indexOf(i)])}return!p&&c&&(p=c[0].url,f=c[0]),p.indexOf("{")>-1&&l(p).forEach(function(e){if(f.variables&&f.variables[e]){var t=f.variables[e],n=s[e]||t.default,r=new RegExp("{"+e+"}","g");p=p.replace(r,n)}}),u(p,o)}function u(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",n=M.default.parse(e),r=M.default.parse(t),i=$(n.protocol)||$(r.protocol)||"",o=n.host||r.host,a=n.pathname||"",s=void 0;return s=i&&o?i+"://"+(o+a):a,"/"===s[s.length-1]?s.slice(0,-1):s}function l(e){for(var t=[],n=/{([^}]+)}/g,r=void 0;r=n.exec(e);)t.push(r[1]);return t}function c(e){var t=e.spec,n=e.scheme,r=e.contextUrl,i=void 0===r?"":r,o=M.default.parse(i),a=Array.isArray(t.schemes)?t.schemes[0]:null,s=n||a||$(o.protocol)||"http",u=t.host||o.host||"",l=t.basePath||"",c=void 0;return c=s&&u?s+"://"+(u+l):l,"/"===c[c.length-1]?c.slice(0,-1):c}Object.defineProperty(t,"__esModule",{value:!0}),t.self=void 0;var p=n(6),f=r(p),h=n(7),d=r(h),m=n(37),v=r(m),g=n(0),y=r(g),_=n(1),b=r(_);t.execute=i,t.buildRequest=o,t.baseUrl=a;var x=n(8),w=(r(x),n(18)),k=r(w),E=n(52),S=r(E),C=n(50),A=r(C),D=n(9),O=(r(D),n(10)),M=r(O),T=n(40),P=r(T),I=n(4),R=r(I),j=n(12),F=r(j),N=n(26),B=r(N),L=n(23),q=r(L),z=n(22),U=r(z),W=n(25),V=r(W),H=n(3),G=function(e){return Array.isArray(e)?e:[]},J=(0,F.default)("OperationNotFoundError",function(e,t,n){this.originalError=n,(0,b.default)(this,t||{})}),K=function(e,t){return t.filter(function(t){return t.name===e})},X=function(e){var t={};e.forEach(function(e){t[e.in]||(t[e.in]={}),t[e.in][e.name]=e});var n=[];return(0,y.default)(t).forEach(function(e){(0,y.default)(t[e]).forEach(function(r){n.push(t[e][r])})}),n},Y=t.self={buildRequest:o},$=function(e){return e?e.replace(/\W/g,""):null}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.request,n=e.securities,r=void 0===n?{}:n,i=e.operation,o=void 0===i?{}:i,a=e.spec,s=(0,f.default)({},t),u=r.authorized,l=void 0===u?{}:u,p=o.security||a.security||[],h=l&&!!(0,c.default)(l).length,m=(0,d.default)(a,["components","securitySchemes"])||{};return s.headers=s.headers||{},s.query=s.query||{},(0,c.default)(r).length&&h&&p&&(!Array.isArray(o.security)||o.security.length)?(p.forEach(function(e,t){for(var n in e){var r=l[n],i=m[n];if(r){var o=r.value||r,a=i.type;if(r)if("apiKey"===a)"query"===i.in&&(s.query[i.name]=o),"header"===i.in&&(s.headers[i.name]=o),"cookie"===i.in&&(s.cookies[i.name]=o);else if("http"===a){if("basic"===i.scheme){var u=o.username,c=o.password,p=(0,v.default)(u+":"+c);s.headers.Authorization="Basic "+p}"bearer"===i.scheme&&(s.headers.Authorization="Bearer "+o)}else if("oauth2"===a){var f=r.token||{},h=f.access_token,d=f.token_type;d&&"bearer"!==d.toLowerCase()||(d="Bearer"),s.headers.Authorization=d+" "+h}}}}),s):t}Object.defineProperty(t,"__esModule",{value:!0});var o=n(6),a=r(o),s=n(2),u=r(s),l=n(0),c=r(l);t.default=function(e,t){var n=e.operation,r=e.requestBody,o=e.securities,s=e.spec,l=e.requestContentType;t=i({request:t,securities:o,operation:n,spec:s});var p=n.requestBody||{},f=(0,c.default)(p.content||{});if(r){var h=l&&f.indexOf(l)>-1;if(l&&h)t.headers["Content-Type"]=l;else if(!l){var d=f[0];d&&(t.headers["Content-Type"]=d,l=d)}}return r&&(l?f.indexOf(l)>-1&&("application/x-www-form-urlencoded"===l?"object"===(void 0===r?"undefined":(0,u.default)(r))?(t.form={},(0,c.default)(r).forEach(function(e){var n=r[e],i=void 0;i="object"===(void 0===n?"undefined":(0,u.default)(n))?Array.isArray(n)?n.toString():(0,a.default)(n):n,t.form[e]={value:i}})):t.form=r:t.body=r):t.body=r),t},t.applySecurities=i;var p=n(8),f=r(p),h=n(18),d=r(h),m=n(9),v=r(m)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.req,n=e.value,r=e.parameter,i=r.name,o=r.style,a=r.explode,s=(0,h.default)({key:r.name,value:n,style:o||"simple",explode:a||!1,escape:!1});t.url=t.url.replace("{"+i+"}",s)}function o(e){var t=e.req,n=e.value,r=e.parameter;if(t.query=t.query||{},!1===n&&(n="false"),0===n&&(n="0"),n){var i=void 0===n?"undefined":(0,p.default)(n);if("deepObject"===r.style)(0,l.default)(n).forEach(function(e){var i=n[e];t.query[r.name+"["+e+"]"]={value:(0,h.default)({key:e,value:i,style:"deepObject",escape:r.allowReserved?"unsafe":"reserved"}),skipEncoding:!0}});else if("object"!==i||Array.isArray(n)||"form"!==r.style&&r.style||!r.explode&&void 0!==r.explode)t.query[r.name]={value:(0,h.default)({key:r.name,value:n,style:r.style||"form",explode:void 0===r.explode||r.explode,escape:r.allowReserved?"unsafe":"reserved"}),skipEncoding:!0};else{var o=(0,l.default)(n);o.forEach(function(e){var i=n[e];t.query[e]={value:(0,h.default)({key:e,value:i,style:r.style||"form",escape:r.allowReserved?"unsafe":"reserved"}),skipEncoding:!0}})}}else if(r.allowEmptyValue){var a=r.name;t.query[a]=t.query[a]||{},t.query[a].allowEmptyValue=!0}}function a(e){var t=e.req,n=e.parameter,r=e.value;t.headers=t.headers||{},d.indexOf(n.name.toLowerCase())>-1||void 0!==r&&(t.headers[n.name]=(0,h.default)({key:n.name,value:r,style:n.style||"simple",explode:void 0!==n.explode&&n.explode,escape:!1}))}function s(e){var t=e.req,n=e.parameter,r=e.value;t.headers=t.headers||{};var i=void 0===r?"undefined":(0,p.default)(r);if("undefined"!==i){var o="object"===i&&!Array.isArray(r)&&n.explode?"":n.name+"=";t.headers.Cookie=o+(0,h.default)({key:n.name,value:r,escape:!1,style:n.style||"form",explode:void 0!==n.explode&&n.explode})}}Object.defineProperty(t,"__esModule",{value:!0});var u=n(0),l=r(u),c=n(2),p=r(c),f=n(24),h=r(f);t.default={path:i,query:o,header:a,cookie:s};var d=["accept","authorization","content-type"]},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.escape,r=arguments[2];return"number"==typeof e&&(e=e.toString()),"string"==typeof e&&e.length&&n?r?JSON.parse(e):(0,m.stringToCharArray)(e).map(function(e){return g(e)?e:v(e)&&"unsafe"===n?e:((0,d.default)(e)||[]).map(function(e){return e.toString(16).toUpperCase()}).map(function(e){return"%"+e}).join("")}).join(""):e}function o(e){var t=e.key,n=e.value,r=e.style,o=e.explode,a=e.escape,s=function(e){return i(e,{escape:a})};if("simple"===r)return n.map(function(e){return s(e)}).join(",");if("label"===r)return"."+n.map(function(e){return s(e)}).join(".");if("matrix"===r)return n.map(function(e){return s(e)}).reduce(function(e,n){return!e||o?(e||"")+";"+t+"="+n:e+","+n},"");if("form"===r){var u=o?"&"+t+"=":",";return n.map(function(e){return s(e)}).join(u)}if("spaceDelimited"===r){var l=o?t+"=":"";return n.map(function(e){return s(e)}).join(" "+l)}if("pipeDelimited"===r){var c=o?t+"=":"";return n.map(function(e){return s(e)}).join("|"+c)}}function a(e){var t=e.key,n=e.value,r=e.style,o=e.explode,a=e.escape,s=function(e){return i(e,{escape:a})},u=(0,l.default)(n);return"simple"===r?u.reduce(function(e,t){var r=s(n[t]),i=o?"=":",";return(e?e+",":"")+t+i+r},""):"label"===r?u.reduce(function(e,t){var r=s(n[t]),i=o?"=":".";return(e?e+".":".")+t+i+r},""):"matrix"===r&&o?u.reduce(function(e,t){var r=s(n[t]);return(e?e+";":";")+t+"="+r},""):"matrix"===r?u.reduce(function(e,r){var i=s(n[r]);return(e?e+",":";"+t+"=")+r+","+i},""):"form"===r?u.reduce(function(e,t){var r=s(n[t]);return(e?e+(o?"&":","):"")+t+(o?"=":",")+r},""):void 0}function s(e){var t=e.key,n=e.value,r=e.style,o=e.escape,a=function(e){return i(e,{escape:o})};return"simple"===r?a(n):"label"===r?"."+a(n):"matrix"===r?";"+t+"="+a(n):"form"===r?a(n):"deepObject"===r?a(n):void 0}Object.defineProperty(t,"__esModule",{value:!0});var u=n(0),l=r(u),c=n(2),p=r(c);t.encodeDisallowedCharacters=i,t.default=function(e){var t=e.value;return Array.isArray(t)?o(e):"object"===(void 0===t?"undefined":(0,p.default)(t))?a(e):s(e)};var f=n(44),h=(r(f),n(56)),d=r(h),m=n(57),v=function(e){return":/?#[]@!$&'()*+,;=".indexOf(e)>-1},g=function(e){return/^[a-z0-9\-._~]+$/i.test(e)}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.request,n=e.securities,r=void 0===n?{}:n,i=e.operation,o=void 0===i?{}:i,s=e.spec,l=(0,c.default)({},t),p=r.authorized,f=void 0===p?{}:p,h=r.specSecurity,d=void 0===h?[]:h,m=o.security||d,v=f&&!!(0,a.default)(f).length,g=s.securityDefinitions;return l.headers=l.headers||{},l.query=l.query||{},(0,a.default)(r).length&&v&&m&&(!Array.isArray(o.security)||o.security.length)?(m.forEach(function(e,t){for(var n in e){var r=f[n];if(r){var i=r.token,o=r.value||r,a=g[n],s=a.type,c=i&&i.access_token,p=i&&i.token_type;if(r)if("apiKey"===s){var h="query"===a.in?"query":"headers";l[h]=l[h]||{},l[h][a.name]=o}else"basic"===s?o.header?l.headers.authorization=o.header:(o.base64=(0,u.default)(o.username+":"+o.password),l.headers.authorization="Basic "+o.base64):"oauth2"===s&&c&&(p=p&&"bearer"!==p.toLowerCase()?p:"Bearer",l.headers.authorization=p+" "+c)}}}),l):t}Object.defineProperty(t,"__esModule",{value:!0});var o=n(0),a=r(o);t.default=function(e,t){var n=e.spec,r=e.operation,o=e.securities,a=e.requestContentType;return t=i({request:t,securities:o,operation:r,spec:n}),(t.body||t.form)&&(a?t.headers["Content-Type"]=a:Array.isArray(r.consumes)?t.headers["Content-Type"]=r.consumes[0]:Array.isArray(n.consumes)?t.headers["Content-Type"]=n.consumes[0]:r.parameters&&r.parameters.filter(function(e){return"file"===e.type}).length?t.headers["Content-Type"]="multipart/form-data":r.parameters&&r.parameters.filter(function(e){return"formData"===e.in}).length&&(t.headers["Content-Type"]="application/x-www-form-urlencoded")),t},t.applySecurities=i;var s=n(9),u=r(s),l=n(8),c=r(l);r(n(4))},function(e,t,n){"use strict";function r(e){var t=e.req,n=e.value;t.body=n}function i(e){var t=e.req,n=e.value,r=e.parameter;t.form=t.form||{},(n||r.allowEmptyValue)&&(t.form[r.name]={value:n,allowEmptyValue:r.allowEmptyValue,collectionFormat:r.collectionFormat})}function o(e){var t=e.req,n=e.parameter,r=e.value;t.headers=t.headers||{},void 0!==r&&(t.headers[n.name]=r)}function a(e){var t=e.req,n=e.value,r=e.parameter;t.url=t.url.replace("{"+r.name+"}",encodeURIComponent(n))}function s(e){var t=e.req,n=e.value,r=e.parameter;if(t.query=t.query||{},!1===n&&"boolean"===r.type&&(n="false"),0===n&&["number","integer"].indexOf(r.type)>-1&&(n="0"),n)t.query[r.name]={collectionFormat:r.collectionFormat,value:n};else if(r.allowEmptyValue){var i=r.name;t.query[i]=t.query[i]||{},t.query[i].allowEmptyValue=!0}}Object.defineProperty(t,"__esModule",{value:!0}),t.default={body:r,header:o,query:s,path:a,formData:i}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return function(t){var n=t.pathName,r=t.method,i=t.operationId;return function(t){var o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return e.execute((0,l.default)({spec:e.spec},(0,p.default)(e,"requestInterceptor","responseInterceptor","userFetch"),{pathName:n,method:r,parameters:t,operationId:i},o))}}}function o(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=m.makeExecute(e),n=m.mapTagOperations({spec:e.spec,cb:t}),r={};for(var i in n){r[i]={operations:{}};for(var o in n[i])r[i].operations[o]={execute:n[i][o]}}return{apis:r}}function a(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=m.makeExecute(e);return{apis:m.mapTagOperations({spec:e.spec,cb:t})}}function s(e){var t=e.spec,n=e.cb,r=void 0===n?h:n,i=e.defaultTag,o=void 0===i?"default":i,a={},s={};return(0,f.eachOperation)(t,function(e){var n=e.pathName,i=e.method,u=e.operation;(u.tags?d(u.tags):[o]).forEach(function(e){if("string"==typeof e){var o=s[e]=s[e]||{},l=(0,f.opId)(u,n,i),c=r({spec:t,pathName:n,method:i,operation:u,operationId:l});if(a[l])a[l]++,o[""+l+a[l]]=c;else if(void 0!==o[l]){var p=a[l]||1;a[l]=p+1,o[""+l+a[l]]=c;var h=o[l];delete o[l],o[""+l+p]=h}else o[l]=c}})}),s}Object.defineProperty(t,"__esModule",{value:!0}),t.self=void 0;var u=n(7),l=r(u);t.makeExecute=i,t.makeApisTagOperationsOperationExecute=o,t.makeApisTagOperation=a,t.mapTagOperations=s;var c=n(54),p=r(c),f=n(3),h=function(){return null},d=function(e){return Array.isArray(e)?e:[e]},m=t.self={mapTagOperations:s,makeExecute:i}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.requestInterceptor,r=t.responseInterceptor,i=e.withCredentials?"include":"same-origin";return function(t){return e({url:t,loadSpec:!0,requestInterceptor:n,responseInterceptor:r,headers:{Accept:"application/json"},credentials:i}).then(function(e){return e.body})}}function o(){l.plugins.refs.clearCache()}function a(e){function t(e){y&&(l.plugins.refs.docCache[y]=e),l.plugins.refs.fetchJSON=i(g,{requestInterceptor:m,responseInterceptor:v});var t=[l.plugins.refs];return"function"==typeof d&&t.push(l.plugins.parameters),"function"==typeof h&&t.push(l.plugins.properties),"strict"!==a&&t.push(l.plugins.allOf),(0,c.default)({spec:e,context:{baseDoc:y},plugins:t,allowMetaPatches:f,parameterMacro:d,modelPropertyMacro:h}).then(p.normalizeSwagger)}var n=e.fetch,r=e.spec,o=e.url,a=e.mode,s=e.allowMetaPatches,f=void 0===s||s,h=e.modelPropertyMacro,d=e.parameterMacro,m=e.requestInterceptor,v=e.responseInterceptor,g=e.http,y=e.baseDoc;return y=y||o,g=n||g||u.default,r?t(r):i(g,{requestInterceptor:m,responseInterceptor:v})(y).then(t)}Object.defineProperty(t,"__esModule",{value:!0}),t.makeFetchJSON=i,t.clearCache=o,t.default=a;var s=n(4),u=r(s),l=n(29),c=r(l),p=n(3)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){return new N(e).dispatch()}Object.defineProperty(t,"__esModule",{value:!0}),t.plugins=t.SpecMap=void 0;var o=n(6),a=r(o),s=n(14),u=r(s),l=n(17),c=r(l),p=n(0),f=r(p),h=n(13),d=r(h),m=n(35),v=r(m),g=n(1),y=r(g),_=n(15),b=r(_),x=n(16),w=r(x);t.default=i;var k=n(49),E=r(k),S=n(5),C=r(S),A=n(34),D=r(A),O=n(30),M=r(O),T=n(32),P=r(T),I=n(33),R=r(I),j=n(31),F=r(j),N=function(){function e(t){(0,b.default)(this,e),(0,y.default)(this,{spec:"",debugLevel:"info",plugins:[],pluginHistory:{},errors:[],mutations:[],promisedPatches:[],state:{},patches:[],context:{},contextTree:new F.default,showDebug:!1,allPatches:[],pluginProp:"specMap",libMethods:(0,y.default)((0,v.default)(this),C.default),allowMetaPatches:!1},t),this.get=this._get.bind(this),this.getContext=this._getContext.bind(this),this.hasRun=this._hasRun.bind(this),this.wrappedPlugins=this.plugins.map(this.wrapPlugin.bind(this)).filter(C.default.isFunction),this.patches.push(C.default.add([],this.spec)),this.patches.push(C.default.context([],this.context)),this.updatePatches(this.patches)}return(0,w.default)(e,[{key:"debug",value:function(e){if(this.debugLevel===e){for(var t,n=arguments.length,r=Array(n>1?n-1:0),i=1;i<n;i++)r[i-1]=arguments[i];(t=console).log.apply(t,r)}}},{key:"verbose",value:function(e){if("verbose"===this.debugLevel){for(var t,n=arguments.length,r=Array(n>1?n-1:0),i=1;i<n;i++)r[i-1]=arguments[i];(t=console).log.apply(t,["["+e+"]   "].concat(r))}}},{key:"wrapPlugin",value:function(e,t){var n=null,r=void 0;return e[this.pluginProp]?(n=e,r=e[this.pluginProp]):C.default.isFunction(e)?r=e:C.default.isObject(e)&&(r=function(e){return c.default.mark(function t(n,r){var i,o,a,s,u,l,p,h,m;return c.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:m=function t(n,a,s){var u,l,p,h,m,v,g,y,_,b,x,w,k,E,S;return c.default.wrap(function(i){for(;;)switch(i.prev=i.next){case 0:if(C.default.isObject(n)){i.next=6;break}if(e.key!==a[a.length-1]){i.next=4;break}return i.next=4,e.plugin(n,e.key,a,r);case 4:i.next=46;break;case 6:u=a.length-1,l=a[u],p=a.indexOf("properties"),h="properties"===l&&u===p,m=r.allowMetaPatches&&o[n.$$ref],v=!0,g=!1,y=void 0,i.prev=14,_=(0,d.default)((0,f.default)(n));case 16:if(v=(b=_.next()).done){i.next=32;break}if(x=b.value,w=n[x],k=a.concat(x),E=C.default.isObject(w),S=n.$$ref,m){i.next=26;break}if(!E){i.next=26;break}return r.allowMetaPatches&&S&&(o[S]=!0),i.delegateYield(t(w,k,s),"t0",26);case 26:if(h||x!==e.key){i.next=29;break}return i.next=29,e.plugin(w,x,k,r,s);case 29:v=!0,i.next=16;break;case 32:i.next=38;break;case 34:i.prev=34,i.t1=i.catch(14),g=!0,y=i.t1;case 38:i.prev=38,i.prev=39,!v&&_.return&&_.return();case 41:if(i.prev=41,!g){i.next=44;break}throw y;case 44:return i.finish(41);case 45:return i.finish(38);case 46:case"end":return i.stop()}},i,this,[[14,34,38,46],[39,,41,45]])},i=c.default.mark(m),o={},a=!0,s=!1,u=void 0,t.prev=6,l=(0,d.default)(n.filter(C.default.isAdditiveMutation));case 8:if(a=(p=l.next()).done){t.next=14;break}return h=p.value,t.delegateYield(m(h.value,h.path,h),"t0",11);case 11:a=!0,t.next=8;break;case 14:t.next=20;break;case 16:t.prev=16,t.t1=t.catch(6),s=!0,u=t.t1;case 20:t.prev=20,t.prev=21,!a&&l.return&&l.return();case 23:if(t.prev=23,!s){t.next=26;break}throw u;case 26:return t.finish(23);case 27:return t.finish(20);case 28:case"end":return t.stop()}},t,this,[[6,16,20,28],[21,,23,27]])})}(e)),(0,y.default)(r.bind(n),{pluginName:e.name||t,isGenerator:C.default.isGenerator(r)})}},{key:"nextPlugin",value:function(){var e=this;return(0,E.default)(this.wrappedPlugins,function(t){return e.getMutationsForPlugin(t).length>0})}},{key:"nextPromisedPatch",value:function(){if(this.promisedPatches.length>0)return u.default.race(this.promisedPatches.map(function(e){return e.value}))}},{key:"getPluginHistory",value:function(e){var t=this.getPluginName(e);return this.pluginHistory[t]||[]}},{key:"getPluginRunCount",value:function(e){return this.getPluginHistory(e).length}},{key:"getPluginHistoryTip",value:function(e){var t=this.getPluginHistory(e);return t&&t[t.length-1]||{}}},{key:"getPluginMutationIndex",value:function(e){var t=this.getPluginHistoryTip(e).mutationIndex;return"number"!=typeof t?-1:t}},{key:"getPluginName",value:function(e){return e.pluginName}},{key:"updatePluginHistory",value:function(e,t){var n=this.getPluginName(e);(this.pluginHistory[n]=this.pluginHistory[n]||[]).push(t)}},{key:"updatePatches",value:function(e,t){var n=this;C.default.normalizeArray(e).forEach(function(e){if(e instanceof Error)return void n.errors.push(e);try{if(!C.default.isObject(e))return void n.debug("updatePatches","Got a non-object patch",e);if(n.showDebug&&n.allPatches.push(e),C.default.isPromise(e.value))return n.promisedPatches.push(e),void n.promisedPatchThen(e);if(C.default.isContextPatch(e))return void n.setContext(e.path,e.value);if(C.default.isMutation(e))return void n.updateMutations(e)}catch(e){n.errors.push(e)}})}},{key:"updateMutations",value:function(e){var t=C.default.applyPatch(this.state,e,{allowMetaPatches:this.allowMetaPatches});t&&(this.mutations.push(e),this.state=t)}},{key:"removePromisedPatch",value:function(e){var t=this.promisedPatches.indexOf(e);if(t<0)return void this.debug("Tried to remove a promisedPatch that isn't there!");this.promisedPatches.splice(t,1)}},{key:"promisedPatchThen",value:function(e){var t=this;return e.value=e.value.then(function(n){var r=(0,y.default)({},e,{value:n});t.removePromisedPatch(e),t.updatePatches(r)}).catch(function(n){t.removePromisedPatch(e),t.updatePatches(n)})}},{key:"getMutations",value:function(e,t){return e=e||0,"number"!=typeof t&&(t=this.mutations.length),this.mutations.slice(e,t)}},{key:"getCurrentMutations",value:function(){return this.getMutationsForPlugin(this.getCurrentPlugin())}},{key:"getMutationsForPlugin",value:function(e){var t=this.getPluginMutationIndex(e);return this.getMutations(t+1)}},{key:"getCurrentPlugin",value:function(){return this.currentPlugin}},{key:"getPatchesOfType",value:function(e,t){return e.filter(t)}},{key:"getLib",value:function(){return this.libMethods}},{key:"_get",value:function(e){return C.default.getIn(this.state,e)}},{key:"_getContext",value:function(e){return this.contextTree.get(e)}},{key:"setContext",value:function(e,t){return this.contextTree.set(e,t)}},{key:"_hasRun",value:function(e){return this.getPluginRunCount(this.getCurrentPlugin())>(e||0)}},{key:"_clone",value:function(e){return JSON.parse((0,a.default)(e))}},{key:"dispatch",value:function(){function e(e){e&&(e=C.default.fullyNormalizeArray(e),n.updatePatches(e,r))}var t=this,n=this,r=this.nextPlugin();if(!r){var i=this.nextPromisedPatch();if(i)return i.then(function(){return t.dispatch()}).catch(function(){return t.dispatch()});var o={spec:this.state,errors:this.errors};return this.showDebug&&(o.patches=this.allPatches),u.default.resolve(o)}if(n.pluginCount=n.pluginCount||{},n.pluginCount[r]=(n.pluginCount[r]||0)+1,n.pluginCount[r]>100)return u.default.resolve({spec:n.state,errors:n.errors.concat(new Error("We've reached a hard limit of 100 plugin runs"))});if(r!==this.currentPlugin&&this.promisedPatches.length){var a=this.promisedPatches.map(function(e){return e.value});return u.default.all(a.map(function(e){return e.then(Function,Function)})).then(function(){return t.dispatch()})}return function(){n.currentPlugin=r;var t=n.getCurrentMutations(),i=n.mutations.length-1;try{if(r.isGenerator){var o=!0,a=!1,s=void 0;try{for(var u,l=(0,d.default)(r(t,n.getLib()));!(o=(u=l.next()).done);o=!0)e(u.value)}catch(e){a=!0,s=e}finally{try{!o&&l.return&&l.return()}finally{if(a)throw s}}}else e(r(t,n.getLib()))}catch(t){e([(0,y.default)((0,v.default)(t),{plugin:r})])}finally{n.updatePluginHistory(r,{mutationIndex:i})}return n.dispatch()}()}}]),e}(),B={refs:D.default,allOf:M.default,parameters:P.default,properties:R.default};t.SpecMap=N,t.plugins=B},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(1),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(11);t.default={key:"allOf",plugin:function(e,t,n,r,a){if(!a.meta||!a.meta.$$ref){var s=n.slice(0,-1);if(!(0,o.isFreelyNamed)(s)){if(!Array.isArray(e)){var u=new TypeError("allOf must be an array");return u.fullPath=n,u}var l=!1,c=a.value;s.forEach(function(e){c=c[e]}),c=(0,i.default)({},c),delete c.allOf;var p=[r.replace(s,{})].concat(e.map(function(e,t){if(!r.isObject(e)){if(l)return null;l=!0;var i=new TypeError("Elements in allOf must be objects");return i.fullPath=n,i}return r.mergeDeep(s,e)}));return p.push(r.mergeDeep(s,c)),c.$$ref||p.push(r.remove([].concat(s,"$$ref"))),p}}}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){return o({children:{}},e,t)}function o(e,t,n){return e.value=t||{},e.protoValue=n?(0,l.default)({},n.protoValue,e.value):e.value,(0,s.default)(e.children).forEach(function(t){var n=e.children[t];e.children[t]=o(n,n.value,e)}),e}Object.defineProperty(t,"__esModule",{value:!0});var a=n(0),s=r(a),u=n(7),l=r(u),c=n(15),p=r(c),f=n(16),h=r(f),d=function(){function e(t){(0,p.default)(this,e),this.root=i(t||{})}return(0,h.default)(e,[{key:"set",value:function(e,t){var n=this.getParent(e,!0);if(!n)return void o(this.root,t,null);var r=e[e.length-1],a=n.children;if(a[r])return void o(a[r],t,n);a[r]=i(t,n)}},{key:"get",value:function(e){if(e=e||[],e.length<1)return this.root.value;for(var t=this.root,n=void 0,r=void 0,i=0;i<e.length&&(r=e[i],n=t.children,n[r]);i++)t=n[r];return t&&t.protoValue}},{key:"getParent",value:function(e,t){return!e||e.length<1?null:e.length<2?this.root:e.slice(0,-1).reduce(function(e,n){if(!e)return e;var r=e.children;return!r[n]&&t&&(r[n]=i(null,e)),r[n]},this.root)}}]),e}();t.default=d},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(1),o=r(i),a=n(5),s=r(a);t.default={key:"parameters",plugin:function(e,t,n,r,i){if(Array.isArray(e)&&e.length){var a=(0,o.default)([],e),u=n.slice(0,-1),l=(0,o.default)({},s.default.getIn(r.spec,u));return e.forEach(function(e,t){try{a[t].default=r.parameterMacro(l,e)}catch(e){var i=new Error(e);return i.fullPath=n,i}}),s.default.replace(n,a)}return s.default.replace(n,e)}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(1),o=r(i),a=n(5),s=r(a);t.default={key:"properties",plugin:function(e,t,n,r){var i=(0,o.default)({},e);for(var a in e)try{i[a].default=r.modelPropertyMacro(i[a])}catch(e){var u=new Error(e);return u.fullPath=n,u}return s.default.replace(n,i)}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!N.test(e)){if(!t)throw new B("Tried to resolve a relative URL, without having a basePath. path: '"+e+"' basePath: '"+t+"'");return T.default.resolve(t,e)}return e}function o(e,t){return new B("Could not resolve reference because of: "+e.message,t,e)}function a(e){return(e+"").split("#")}function s(e,t){var n=L[e];if(n&&!I.default.isPromise(n))try{var r=p(t,n);return(0,D.default)(E.default.resolve(r),{__value:r})}catch(e){return E.default.reject(e)}return l(e).then(function(e){return p(t,e)})}function u(e){void 0!==e?delete L[e]:(0,w.default)(L).forEach(function(e){delete L[e]})}function l(e){var t=L[e];return t?I.default.isPromise(t)?t:E.default.resolve(t):(L[e]=U.fetchJSON(e).then(function(t){return L[e]=t,t}),L[e])}function c(e){return(0,O.fetch)(e,{headers:{Accept:"application/json, application/yaml"},loadSpec:!0}).then(function(e){return e.json()})}function p(e,t){var n=f(e);if(n.length<1)return t;var r=I.default.getIn(t,n);if(void 0===r)throw new B("Could not resolve pointer: "+e+" does not exist in document",{pointer:e});return r}function f(e){if("string"!=typeof e)throw new TypeError("Expected a string, got a "+(void 0===e?"undefined":(0,b.default)(e)));return"/"===e[0]&&(e=e.substr(1)),""===e?[]:e.split("/").map(h)}function h(e){return"string"!=typeof e?e:e.replace(/~1/g,"/").replace(/~0/g,"~")}function d(e){return e.replace(/~/g,"~0").replace(/\//g,"~1")}function m(e){return 0===e.length?"":"/"+e.map(d).join("/")}function v(e,t){if(W(t))return!0;var n=e.charAt(t.length);return 0===e.indexOf(t)&&(!n||"/"===n||"#"===n)}function g(e,t,n,r){var i=q.get(r);i||(i={},q.set(r,i));var o=m(n),a=(t||"<specmap-base>")+"#"+e;if(t==r.contextTree.get([]).baseDoc&&v(o,e))return!0;var s="";if(n.some(function(e){return s=s+"/"+d(e),i[s]&&i[s].some(function(e){return v(e,a)||v(a,e)})}))return!0;i[o]=(i[o]||[]).concat(a)}function y(e,t){function n(e){return I.default.isObject(e)&&(r.indexOf(e)>=0||(0,w.default)(e).some(function(t){return n(e[t])}))}var r=[e];return t.path.reduce(function(e,t){return r.push(e[t]),e[t]},e),n(t.value)}Object.defineProperty(t,"__esModule",{value:!0});var _=n(2),b=r(_),x=n(0),w=r(x),k=n(14),E=r(k),S=n(36),C=r(S),A=n(1),D=r(A),O=n(41),M=n(10),T=r(M),P=n(5),I=r(P),R=n(12),j=r(R),F=n(11),N=new RegExp("^([a-z]+://|//)","i"),B=(0,j.default)("JSONRefError",function(e,t,n){this.originalError=n,(0,D.default)(this,t||{})}),L={},q=new C.default,z={key:"$ref",plugin:function(e,t,n,r){var u=n.slice(0,-1);if(!(0,F.isFreelyNamed)(u)){var l=r.getContext(n).baseDoc;if("string"!=typeof e)return new B("$ref: must be a string (JSON-Ref)",{$ref:e,baseDoc:l,fullPath:n});var c=a(e),p=c[0],h=c[1]||"",d=void 0;try{d=l||p?i(p,l):null}catch(t){return o(t,{pointer:h,$ref:e,basePath:d,fullPath:n})}var m=void 0,v=void 0;if(!g(h,d,u,r)){if(null==d?(v=f(h),void 0===(m=r.get(v))&&(m=new B("Could not resolve reference: "+e,{pointer:h,$ref:e,baseDoc:l,fullPath:n}))):(m=s(d,h),m=null!=m.__value?m.__value:m.catch(function(t){throw o(t,{pointer:h,$ref:e,baseDoc:l,fullPath:n})})),m instanceof Error)return[I.default.remove(n),m];var _=I.default.replace(u,m,{$$ref:e});return d&&d!==l?[_,I.default.context(u,{baseDoc:d})]:y(r.state,_)?void 0:_}}}},U=(0,D.default)(z,{docCache:L,absoluteify:i,clearCache:u,JSONRefError:B,wrapError:o,getDoc:l,split:a,extractFromDoc:s,fetchJSON:c,extract:p,jsonPointerToArray:f,unescapeJsonPointerToken:h});t.default=U;var W=function(e){return!e||"/"===e||"#"===e}},function(e,t){e.exports=n(330)},function(e,t){e.exports=n(568)},function(e,t){e.exports=n(96)},function(e,t){e.exports=n(18)},function(e,t){e.exports=n(97)},function(e,t){e.exports=n(582)},function(e,t){e.exports=n(696)},function(e,t){e.exports=n(695)},function(e,t){e.exports=n(203)},function(e,t){e.exports=n(709)},function(e,t){e.exports=n(745)},function(e,t){e.exports=n(794)},function(e,t){e.exports=n(211)},function(e,t){e.exports=n(942)},function(e,t){e.exports=n(223)},function(e,t){e.exports=n(20)},function(e,t){e.exports=n(38)},function(e,t){e.exports=n(421)},function(e,t){e.exports=n(422)},function(e,t){e.exports=n(951)},function(e,t){e.exports=n(999)},function(e,t){e.exports=n(1189)},function(e,t){e.exports=n(1190)},function(e,t,n){e.exports=n(20)}])},function(e,t,n){function r(e,t){this._id=e,this._clearFn=t}var i=Function.prototype.apply;t.setTimeout=function(){return new r(i.call(setTimeout,window,arguments),clearTimeout)},t.setInterval=function(){return new r(i.call(setInterval,window,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},r.prototype.unref=r.prototype.ref=function(){},r.prototype.close=function(){this._clearFn.call(window,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n(1180),t.setImmediate=setImmediate,t.clearImmediate=clearImmediate},function(e,t,n){"use strict";function r(){this.protocol=null,this.slashes=null,this.auth=null,this.host=null,this.port=null,this.hostname=null,this.hash=null,this.search=null,this.query=null,this.pathname=null,this.path=null,this.href=null}function i(e,t,n){if(e&&l.isObject(e)&&e instanceof r)return e;var i=new r;return i.parse(e,t,n),i}function o(e){return l.isString(e)&&(e=i(e)),e instanceof r?e.format():r.prototype.format.call(e)}function a(e,t){return i(e,!1,!0).resolve(t)}function s(e,t){return e?i(e,!1,!0).resolveObject(t):t}var u=n(998),l=n(1188);t.parse=i,t.resolve=a,t.resolveObject=s,t.format=o,t.Url=r;var c=/^([a-z0-9.+-]+:)/i,p=/:[0-9]*$/,f=/^(\/\/?(?!\/)[^\?\s]*)(\?[^\s]*)?$/,h=["<",">",'"',"`"," ","\r","\n","\t"],d=["{","}","|","\\","^","`"].concat(h),m=["'"].concat(d),v=["%","/","?",";","#"].concat(m),g=["/","?","#"],y=/^[+a-z0-9A-Z_-]{0,63}$/,_=/^([+a-z0-9A-Z_-]{0,63})(.*)$/,b={javascript:!0,"javascript:":!0},x={javascript:!0,"javascript:":!0},w={http:!0,https:!0,ftp:!0,gopher:!0,file:!0,"http:":!0,"https:":!0,"ftp:":!0,"gopher:":!0,"file:":!0},k=n(1004);r.prototype.parse=function(e,t,n){if(!l.isString(e))throw new TypeError("Parameter 'url' must be a string, not "+typeof e);var r=e.indexOf("?"),i=-1!==r&&r<e.indexOf("#")?"?":"#",o=e.split(i),a=/\\/g;o[0]=o[0].replace(a,"/"),e=o.join(i);var s=e;if(s=s.trim(),!n&&1===e.split("#").length){var p=f.exec(s);if(p)return this.path=s,this.href=s,this.pathname=p[1],p[2]?(this.search=p[2],this.query=t?k.parse(this.search.substr(1)):this.search.substr(1)):t&&(this.search="",this.query={}),this}var h=c.exec(s);if(h){h=h[0];var d=h.toLowerCase();this.protocol=d,s=s.substr(h.length)}if(n||h||s.match(/^\/\/[^@\/]+@[^@\/]+/)){var E="//"===s.substr(0,2);!E||h&&x[h]||(s=s.substr(2),this.slashes=!0)}if(!x[h]&&(E||h&&!w[h])){for(var S=-1,C=0;C<g.length;C++){var A=s.indexOf(g[C]);-1!==A&&(-1===S||A<S)&&(S=A)}var D,O;O=-1===S?s.lastIndexOf("@"):s.lastIndexOf("@",S),-1!==O&&(D=s.slice(0,O),s=s.slice(O+1),this.auth=decodeURIComponent(D)),S=-1;for(var C=0;C<v.length;C++){var A=s.indexOf(v[C]);-1!==A&&(-1===S||A<S)&&(S=A)}-1===S&&(S=s.length),this.host=s.slice(0,S),s=s.slice(S),this.parseHost(),this.hostname=this.hostname||"";var M="["===this.hostname[0]&&"]"===this.hostname[this.hostname.length-1];if(!M)for(var T=this.hostname.split(/\./),C=0,P=T.length;C<P;C++){var I=T[C];if(I&&!I.match(y)){for(var R="",j=0,F=I.length;j<F;j++)I.charCodeAt(j)>127?R+="x":R+=I[j];if(!R.match(y)){var N=T.slice(0,C),B=T.slice(C+1),L=I.match(_);L&&(N.push(L[1]),B.unshift(L[2])),B.length&&(s="/"+B.join(".")+s),this.hostname=N.join(".");break}}}this.hostname.length>255?this.hostname="":this.hostname=this.hostname.toLowerCase(),M||(this.hostname=u.toASCII(this.hostname));var q=this.port?":"+this.port:"",z=this.hostname||"";this.host=z+q,this.href+=this.host,M&&(this.hostname=this.hostname.substr(1,this.hostname.length-2),"/"!==s[0]&&(s="/"+s))}if(!b[d])for(var C=0,P=m.length;C<P;C++){var U=m[C];if(-1!==s.indexOf(U)){var W=encodeURIComponent(U);W===U&&(W=escape(U)),s=s.split(U).join(W)}}var V=s.indexOf("#");-1!==V&&(this.hash=s.substr(V),s=s.slice(0,V));var H=s.indexOf("?");if(-1!==H?(this.search=s.substr(H),this.query=s.substr(H+1),t&&(this.query=k.parse(this.query)),s=s.slice(0,H)):t&&(this.search="",this.query={}),s&&(this.pathname=s),w[d]&&this.hostname&&!this.pathname&&(this.pathname="/"),this.pathname||this.search){var q=this.pathname||"",G=this.search||"";this.path=q+G}return this.href=this.format(),this},r.prototype.format=function(){var e=this.auth||"";e&&(e=encodeURIComponent(e),e=e.replace(/%3A/i,":"),e+="@");var t=this.protocol||"",n=this.pathname||"",r=this.hash||"",i=!1,o="";this.host?i=e+this.host:this.hostname&&(i=e+(-1===this.hostname.indexOf(":")?this.hostname:"["+this.hostname+"]"),this.port&&(i+=":"+this.port)),this.query&&l.isObject(this.query)&&Object.keys(this.query).length&&(o=k.stringify(this.query));var a=this.search||o&&"?"+o||"";return t&&":"!==t.substr(-1)&&(t+=":"),this.slashes||(!t||w[t])&&!1!==i?(i="//"+(i||""),n&&"/"!==n.charAt(0)&&(n="/"+n)):i||(i=""),r&&"#"!==r.charAt(0)&&(r="#"+r),a&&"?"!==a.charAt(0)&&(a="?"+a),n=n.replace(/[?#]/g,function(e){return encodeURIComponent(e)}),a=a.replace("#","%23"),t+i+n+a+r},r.prototype.resolve=function(e){return this.resolveObject(i(e,!1,!0)).format()},r.prototype.resolveObject=function(e){if(l.isString(e)){var t=new r;t.parse(e,!1,!0),e=t}for(var n=new r,i=Object.keys(this),o=0;o<i.length;o++){var a=i[o];n[a]=this[a]}if(n.hash=e.hash,""===e.href)return n.href=n.format(),n;if(e.slashes&&!e.protocol){for(var s=Object.keys(e),u=0;u<s.length;u++){var c=s[u];"protocol"!==c&&(n[c]=e[c])}return w[n.protocol]&&n.hostname&&!n.pathname&&(n.path=n.pathname="/"),n.href=n.format(),n}if(e.protocol&&e.protocol!==n.protocol){if(!w[e.protocol]){for(var p=Object.keys(e),f=0;f<p.length;f++){var h=p[f];n[h]=e[h]}return n.href=n.format(),n}if(n.protocol=e.protocol,e.host||x[e.protocol])n.pathname=e.pathname;else{for(var d=(e.pathname||"").split("/");d.length&&!(e.host=d.shift()););e.host||(e.host=""),e.hostname||(e.hostname=""),""!==d[0]&&d.unshift(""),d.length<2&&d.unshift(""),n.pathname=d.join("/")}if(n.search=e.search,n.query=e.query,n.host=e.host||"",n.auth=e.auth,n.hostname=e.hostname||e.host,n.port=e.port,n.pathname||n.search){var m=n.pathname||"",v=n.search||"";n.path=m+v}return n.slashes=n.slashes||e.slashes,n.href=n.format(),n}var g=n.pathname&&"/"===n.pathname.charAt(0),y=e.host||e.pathname&&"/"===e.pathname.charAt(0),_=y||g||n.host&&e.pathname,b=_,k=n.pathname&&n.pathname.split("/")||[],d=e.pathname&&e.pathname.split("/")||[],E=n.protocol&&!w[n.protocol];if(E&&(n.hostname="",n.port=null,n.host&&(""===k[0]?k[0]=n.host:k.unshift(n.host)),n.host="",e.protocol&&(e.hostname=null,e.port=null,e.host&&(""===d[0]?d[0]=e.host:d.unshift(e.host)),e.host=null),_=_&&(""===d[0]||""===k[0])),y)n.host=e.host||""===e.host?e.host:n.host,n.hostname=e.hostname||""===e.hostname?e.hostname:n.hostname,n.search=e.search,n.query=e.query,k=d;else if(d.length)k||(k=[]),k.pop(),k=k.concat(d),n.search=e.search,n.query=e.query;else if(!l.isNullOrUndefined(e.search)){if(E){n.hostname=n.host=k.shift();var S=!!(n.host&&n.host.indexOf("@")>0)&&n.host.split("@");S&&(n.auth=S.shift(),n.host=n.hostname=S.shift())}return n.search=e.search,n.query=e.query,l.isNull(n.pathname)&&l.isNull(n.search)||(n.path=(n.pathname?n.pathname:"")+(n.search?n.search:"")),n.href=n.format(),n}if(!k.length)return n.pathname=null,n.search?n.path="/"+n.search:n.path=null,n.href=n.format(),n;for(var C=k.slice(-1)[0],A=(n.host||e.host||k.length>1)&&("."===C||".."===C)||""===C,D=0,O=k.length;O>=0;O--)C=k[O],"."===C?k.splice(O,1):".."===C?(k.splice(O,1),D++):D&&(k.splice(O,1),D--);if(!_&&!b)for(;D--;D)k.unshift("..");!_||""===k[0]||k[0]&&"/"===k[0].charAt(0)||k.unshift(""),A&&"/"!==k.join("/").substr(-1)&&k.push("");var M=""===k[0]||k[0]&&"/"===k[0].charAt(0);if(E){n.hostname=n.host=M?"":k.length?k.shift():"";var S=!!(n.host&&n.host.indexOf("@")>0)&&n.host.split("@");S&&(n.auth=S.shift(),n.host=n.hostname=S.shift())}return _=_||n.host&&k.length,_&&!M&&k.unshift(""),k.length?n.pathname=k.join("/"):(n.pathname=null,n.path=null),l.isNull(n.pathname)&&l.isNull(n.search)||(n.path=(n.pathname?n.pathname:"")+(n.search?n.search:"")),n.auth=e.auth||n.auth,n.slashes=n.slashes||e.slashes,n.href=n.format(),n},r.prototype.parseHost=function(){var e=this.host,t=p.exec(e);t&&(t=t[0],":"!==t&&(this.port=t.substr(1)),e=e.substr(0,e.length-t.length)),e&&(this.hostname=e)}},function(e,t,n){(function(){var e,r,i,o=function(e,t){function n(){this.constructor=e}for(var r in t)a.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},a={}.hasOwnProperty;r=n(127),e=n(45).MarkedYAMLError,i=n(94),this.ComposerError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return o(t,e),t}(e),this.Composer=function(){function e(){this.anchors={}}return e.prototype.check_node=function(){return this.check_event(r.StreamStartEvent)&&this.get_event(),!this.check_event(r.StreamEndEvent)},e.prototype.get_node=function(){if(!this.check_event(r.StreamEndEvent))return this.compose_document()},e.prototype.get_single_node=function(){var e,n;if(this.get_event(),e=null,this.check_event(r.StreamEndEvent)||(e=this.compose_document()),!this.check_event(r.StreamEndEvent))throw n=this.get_event(),new t.ComposerError("expected a single document in the stream",e.start_mark,"but found another document",n.start_mark);return this.get_event(),e},e.prototype.compose_document=function(){var e;return this.get_event(),e=this.compose_node(),this.get_event(),this.anchors={},e},e.prototype.compose_node=function(e,n){var i,o,a;if(this.check_event(r.AliasEvent)){if(o=this.get_event(),!((i=o.anchor)in this.anchors))throw new t.ComposerError(null,null,"found undefined alias "+i,o.start_mark);return this.anchors[i]}if(o=this.peek_event(),null!==(i=o.anchor)&&i in this.anchors)throw new t.ComposerError("found duplicate anchor "+i+"; first occurence",this.anchors[i].start_mark,"second occurrence",o.start_mark);return this.descend_resolver(e,n),this.check_event(r.ScalarEvent)?a=this.compose_scalar_node(i):this.check_event(r.SequenceStartEvent)?a=this.compose_sequence_node(i):this.check_event(r.MappingStartEvent)&&(a=this.compose_mapping_node(i)),this.ascend_resolver(),a},e.prototype.compose_scalar_node=function(e){var t,n,r;return t=this.get_event(),r=t.tag,null!==r&&"!"!==r||(r=this.resolve(i.ScalarNode,t.value,t.implicit)),n=new i.ScalarNode(r,t.value,t.start_mark,t.end_mark,t.style),null!==e&&(this.anchors[e]=n),n},e.prototype.compose_sequence_node=function(e){var t,n,o,a,s;for(a=this.get_event(),s=a.tag,null!==s&&"!"!==s||(s=this.resolve(i.SequenceNode,null,a.implicit)),o=new i.SequenceNode(s,[],a.start_mark,null,a.flow_style),null!==e&&(this.anchors[e]=o),n=0;!this.check_event(r.SequenceEndEvent);)o.value.push(this.compose_node(o,n)),n++;return t=this.get_event(),o.end_mark=t.end_mark,o},e.prototype.compose_mapping_node=function(e){var t,n,o,a,s,u;for(s=this.get_event(),u=s.tag,null!==u&&"!"!==u||(u=this.resolve(i.MappingNode,null,s.implicit)),a=new i.MappingNode(u,[],s.start_mark,null,s.flow_style),null!==e&&(this.anchors[e]=a);!this.check_event(r.MappingEndEvent);)n=this.compose_node(a),o=this.compose_node(a,n),a.value.push([n,o]);return t=this.get_event(),a.end_mark=t.end_mark,a},e}()}).call(this)},function(e,t,n){(function(e){(function(){var r,i,o,a=function(e,t){function n(){this.constructor=e}for(var r in t)s.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},s={}.hasOwnProperty,u=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};r=n(45).MarkedYAMLError,i=n(94),o=n(61),this.ConstructorError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return a(t,e),t}(r),this.BaseConstructor=function(){function e(){this.constructed_objects={},this.constructing_nodes=[],this.deferred_constructors=[]}return e.prototype.yaml_constructors={},e.prototype.yaml_multi_constructors={},e.add_constructor=function(e,t){return this.prototype.hasOwnProperty("yaml_constructors")||(this.prototype.yaml_constructors=o.extend({},this.prototype.yaml_constructors)),this.prototype.yaml_constructors[e]=t},e.add_multi_constructor=function(e,t){return this.prototype.hasOwnProperty("yaml_multi_constructors")||(this.prototype.yaml_multi_constructors=o.extend({},this.prototype.yaml_multi_constructors)),this.prototype.yaml_multi_constructors[e]=t},e.prototype.check_data=function(){return this.check_node()},e.prototype.get_data=function(){if(this.check_node())return this.construct_document(this.get_node())},e.prototype.get_single_data=function(){var e;return e=this.get_single_node(),null!=e?this.construct_document(e):null},e.prototype.construct_document=function(e){var t;for(t=this.construct_object(e);!o.is_empty(this.deferred_constructors);)this.deferred_constructors.pop()();return t},e.prototype.defer=function(e){return this.deferred_constructors.push(e)},e.prototype.construct_object=function(e){var n,r,o,a,s;if(e.unique_id in this.constructed_objects)return this.constructed_objects[e.unique_id];if(o=e.unique_id,u.call(this.constructing_nodes,o)>=0)throw new t.ConstructorError(null,null,"found unconstructable recursive node",e.start_mark);if(this.constructing_nodes.push(e.unique_id),n=null,s=null,e.tag in this.yaml_constructors)n=this.yaml_constructors[e.tag];else{for(a in this.yaml_multi_constructors)if(e.tag.indexOf(0===a)){s=e.tag.slice(a.length),n=this.yaml_multi_constructors[a];break}null==n&&(null in this.yaml_multi_constructors?(s=e.tag,n=this.yaml_multi_constructors[null]):null in this.yaml_constructors?n=this.yaml_constructors[null]:e instanceof i.ScalarNode?n=this.construct_scalar:e instanceof i.SequenceNode?n=this.construct_sequence:e instanceof i.MappingNode&&(n=this.construct_mapping))}return r=n.call(this,null!=s?s:e,e),this.constructed_objects[e.unique_id]=r,this.constructing_nodes.pop(),r},e.prototype.construct_scalar=function(e){if(!(e instanceof i.ScalarNode))throw new t.ConstructorError(null,null,"expected a scalar node but found "+e.id,e.start_mark);return e.value},e.prototype.construct_sequence=function(e){var n,r,o,a,s;if(!(e instanceof i.SequenceNode))throw new t.ConstructorError(null,null,"expected a sequence node but found "+e.id,e.start_mark);for(a=e.value,s=[],r=0,o=a.length;r<o;r++)n=a[r],s.push(this.construct_object(n));return s},e.prototype.construct_mapping=function(e){var n,r,o,a,s,u,l,c,p;if(!(e instanceof i.MappingNode))throw new ConstructorError(null,null,"expected a mapping node but found "+e.id,e.start_mark);for(s={},u=e.value,n=0,a=u.length;n<a;n++){if(l=u[n],o=l[0],p=l[1],"object"==typeof(r=this.construct_object(o)))throw new t.ConstructorError("while constructing a mapping",e.start_mark,"found unhashable key",o.start_mark);c=this.construct_object(p),s[r]=c}return s},e.prototype.construct_pairs=function(e){var n,r,o,a,s,u,l,c,p;if(!(e instanceof i.MappingNode))throw new t.ConstructorError(null,null,"expected a mapping node but found "+e.id,e.start_mark);for(s=[],u=e.value,n=0,a=u.length;n<a;n++)l=u[n],o=l[0],p=l[1],r=this.construct_object(o),c=this.construct_object(p),s.push([r,c]);return s},e}(),this.Constructor=function(n){function r(){return r.__super__.constructor.apply(this,arguments)}var o,s,l;return a(r,n),o={on:!0,off:!1,true:!0,false:!1,yes:!0,no:!1},l=/^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:(?:[Tt]|[\x20\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\.([0-9]*))?(?:[\x20\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?)?$/,s={year:1,month:2,day:3,hour:4,minute:5,second:6,fraction:7,tz:8,tz_sign:9,tz_hour:10,tz_minute:11},r.prototype.construct_scalar=function(e){var t,n,o,a,s,u;if(e instanceof i.MappingNode)for(a=e.value,t=0,o=a.length;t<o;t++)if(s=a[t],n=s[0],u=s[1],"tag:yaml.org,2002:value"===n.tag)return this.construct_scalar(u);return r.__super__.construct_scalar.call(this,e)},r.prototype.flatten_mapping=function(e){var n,r,o,a,s,u,l,c,p,f,h,d,m;for(l=[],r=0;r<e.value.length;)if(c=e.value[r],a=c[0],m=c[1],"tag:yaml.org,2002:merge"===a.tag)if(e.value.splice(r,1),m instanceof i.MappingNode)this.flatten_mapping(m),l=l.concat(m.value);else{if(!(m instanceof i.SequenceNode))throw new t.ConstructorError("while constructing a mapping",e.start_mark,"expected a mapping or list of mappings for merging but found "+m.id,m.start_mark);for(f=[],p=m.value,n=0,s=p.length;n<s;n++){if(!((h=p[n])instanceof i.MappingNode))throw new t.ConstructorError("while constructing a mapping",e.start_mark,"expected a mapping for merging, but found "+h.id,h.start_mark);this.flatten_mapping(h),f.push(h.value)}for(f.reverse(),o=0,u=f.length;o<u;o++)d=f[o],l=l.concat(d)}else"tag:yaml.org,2002:value"===a.tag?(a.tag="tag:yaml.org,2002:str",r++):r++;if(l.length)return e.value=l.concat(e.value)},r.prototype.construct_mapping=function(e){return e instanceof i.MappingNode&&this.flatten_mapping(e),r.__super__.construct_mapping.call(this,e)},r.prototype.construct_yaml_null=function(e){return this.construct_scalar(e),null},r.prototype.construct_yaml_bool=function(e){var t;return t=this.construct_scalar(e),o[t.toLowerCase()]},r.prototype.construct_yaml_int=function(e){var t,n,r,i,o,a,s,l,c;if(c=this.construct_scalar(e),c=c.replace(/_/g,""),l="-"===c[0]?-1:1,s=c[0],u.call("+-",s)>=0&&(c=c.slice(1)),"0"===c)return 0;if(0===c.indexOf("0b"))return l*parseInt(c.slice(2),2);if(0===c.indexOf("0x"))return l*parseInt(c.slice(2),16);if(0===c.indexOf("0o"))return l*parseInt(c.slice(2),8);if("0"===c[0])return l*parseInt(c,8);if(u.call(c,":")>=0){for(r=function(){var e,t,n,r;for(n=c.split(/:/g),r=[],e=0,t=n.length;e<t;e++)a=n[e],r.push(parseInt(a));return r}(),r.reverse(),t=1,c=0,i=0,o=r.length;i<o;i++)n=r[i],c+=n*t,t*=60;return l*c}return l*parseInt(c)},r.prototype.construct_yaml_float=function(e){var t,n,r,i,o,a,s,l,c;if(c=this.construct_scalar(e),c=c.replace(/_/g,"").toLowerCase(),l="-"===c[0]?-1:1,s=c[0],u.call("+-",s)>=0&&(c=c.slice(1)),".inf"===c)return Infinity*l;if(".nan"===c)return NaN;if(u.call(c,":")>=0){for(r=function(){var e,t,n,r;for(n=c.split(/:/g),r=[],e=0,t=n.length;e<t;e++)a=n[e],r.push(parseFloat(a));return r}(),r.reverse(),t=1,c=0,i=0,o=r.length;i<o;i++)n=r[i],c+=n*t,t*=60;return l*c}return l*parseFloat(c)},r.prototype.construct_yaml_binary=function(n){var r,i;i=this.construct_scalar(n);try{return"undefined"!=typeof window&&null!==window?atob(i):new e(i,"base64").toString("ascii")}catch(e){throw r=e,new t.ConstructorError(null,null,"failed to decode base64 data: "+r,n.start_mark)}},r.prototype.construct_yaml_timestamp=function(e){var t,n,r,i,o,a,u,c,p,f,h,d,m,v,g;this.construct_scalar(e),a=e.value.match(l),v={};for(o in s)i=s[o],v[o]=a[i];if(g=parseInt(v.year),p=parseInt(v.month)-1,t=parseInt(v.day),!v.hour)return new Date(Date.UTC(g,p,t));if(r=parseInt(v.hour),c=parseInt(v.minute),f=parseInt(v.second),u=0,v.fraction){for(n=v.fraction.slice(0,6);n.length<6;)n+="0";n=parseInt(n),u=Math.round(n/1e3)}return v.tz_sign&&(m="-"===v.tz_sign?1:-1,(h=parseInt(v.tz_hour))&&(r+=m*h),(d=parseInt(v.tz_minute))&&(c+=m*d)),new Date(Date.UTC(g,p,t,r,c,f,u))},r.prototype.construct_yaml_pair_list=function(e,n){var r;if(r=[],!(n instanceof i.SequenceNode))throw new t.ConstructorError("while constructing "+e,n.start_mark,"expected a sequence but found "+n.id,n.start_mark);return this.defer(function(o){return function(){var a,s,u,l,c,p,f,h,d,m;for(c=n.value,f=[],a=0,l=c.length;a<l;a++){if(!((h=c[a])instanceof i.MappingNode))throw new t.ConstructorError("while constructing "+e,n.start_mark,"expected a mapping of length 1 but found "+h.id,h.start_mark);if(1!==h.value.length)throw new t.ConstructorError("while constructing "+e,n.start_mark,"expected a mapping of length 1 but found "+h.id,h.start_mark);p=h.value[0],u=p[0],m=p[1],s=o.construct_object(u),d=o.construct_object(m),f.push(r.push([s,d]))}return f}}(this)),r},r.prototype.construct_yaml_omap=function(e){return this.construct_yaml_pair_list("an ordered map",e)},r.prototype.construct_yaml_pairs=function(e){return this.construct_yaml_pair_list("pairs",e)},r.prototype.construct_yaml_set=function(e){var t;return t=[],this.defer(function(n){return function(){var r,i;i=[];for(r in n.construct_mapping(e))i.push(t.push(r));return i}}(this)),t},r.prototype.construct_yaml_str=function(e){return this.construct_scalar(e)},r.prototype.construct_yaml_seq=function(e){var t;return t=[],this.defer(function(n){return function(){var r,i,o,a,s;for(a=n.construct_sequence(e),s=[],r=0,o=a.length;r<o;r++)i=a[r],s.push(t.push(i));return s}}(this)),t},r.prototype.construct_yaml_map=function(e){var t;return t={},this.defer(function(n){return function(){var r,i,o,a;i=n.construct_mapping(e),o=[];for(r in i)a=i[r],o.push(t[r]=a);return o}}(this)),t},r.prototype.construct_yaml_object=function(e,t){var n;return n=new t,this.defer(function(t){return function(){var r,i,o,a;i=t.construct_mapping(e,!0),o=[];for(r in i)a=i[r],o.push(n[r]=a);return o}}(this)),n},r.prototype.construct_undefined=function(e){throw new t.ConstructorError(null,null,"could not determine a constructor for the tag "+e.tag,e.start_mark)},r}(this.BaseConstructor),this.Constructor.add_constructor("tag:yaml.org,2002:null",this.Constructor.prototype.construct_yaml_null),this.Constructor.add_constructor("tag:yaml.org,2002:bool",this.Constructor.prototype.construct_yaml_bool),this.Constructor.add_constructor("tag:yaml.org,2002:int",this.Constructor.prototype.construct_yaml_int),this.Constructor.add_constructor("tag:yaml.org,2002:float",this.Constructor.prototype.construct_yaml_float),this.Constructor.add_constructor("tag:yaml.org,2002:binary",this.Constructor.prototype.construct_yaml_binary),this.Constructor.add_constructor("tag:yaml.org,2002:timestamp",this.Constructor.prototype.construct_yaml_timestamp),this.Constructor.add_constructor("tag:yaml.org,2002:omap",this.Constructor.prototype.construct_yaml_omap),this.Constructor.add_constructor("tag:yaml.org,2002:pairs",this.Constructor.prototype.construct_yaml_pairs),this.Constructor.add_constructor("tag:yaml.org,2002:set",this.Constructor.prototype.construct_yaml_set),this.Constructor.add_constructor("tag:yaml.org,2002:str",this.Constructor.prototype.construct_yaml_str),this.Constructor.add_constructor("tag:yaml.org,2002:seq",this.Constructor.prototype.construct_yaml_seq),this.Constructor.add_constructor("tag:yaml.org,2002:map",this.Constructor.prototype.construct_yaml_map),this.Constructor.add_constructor(null,this.Constructor.prototype.construct_undefined)}).call(this)}).call(t,n(40).Buffer)},function(e,t,n){(function(){var e,r,i,o=function(e,t){function n(){this.constructor=e}for(var r in t)a.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},a={}.hasOwnProperty,s=[].slice;r=n(127),e=n(45).MarkedYAMLError,i=n(267),this.ParserError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return o(t,e),t}(e),this.Parser=function(){function e(){this.current_event=null,this.yaml_version=null,this.tag_handles={},this.states=[],this.marks=[],this.state="parse_stream_start"}var n;return n={"!":"!","!!":"tag:yaml.org,2002:"},e.prototype.dispose=function(){return this.states=[],this.state=null},e.prototype.check_event=function(){var e,t,n,r;if(t=1<=arguments.length?s.call(arguments,0):[],null===this.current_event&&null!=this.state&&(this.current_event=this[this.state]()),null!==this.current_event){if(0===t.length)return!0;for(n=0,r=t.length;n<r;n++)if(e=t[n],this.current_event instanceof e)return!0}return!1},e.prototype.peek_event=function(){return null===this.current_event&&null!=this.state&&(this.current_event=this[this.state]()),this.current_event},e.prototype.get_event=function(){var e;return null===this.current_event&&null!=this.state&&(this.current_event=this[this.state]()),e=this.current_event,this.current_event=null,e},e.prototype.parse_stream_start=function(){var e,t;return t=this.get_token(),e=new r.StreamStartEvent(t.start_mark,t.end_mark),this.state="parse_implicit_document_start",e},e.prototype.parse_implicit_document_start=function(){var e,t,o,a;return this.check_token(i.DirectiveToken,i.DocumentStartToken,i.StreamEndToken)?this.parse_document_start():(this.tag_handles=n,a=this.peek_token(),o=e=a.start_mark,t=new r.DocumentStartEvent(o,e,!1),this.states.push("parse_document_end"),this.state="parse_block_node",t)},e.prototype.parse_document_start=function(){for(var e,n,o,a,s,u,l;this.check_token(i.DocumentEndToken);)this.get_token();if(this.check_token(i.StreamEndToken)){if(u=this.get_token(),n=new r.StreamEndEvent(u.start_mark,u.end_mark),0!==this.states.length)throw new Error("assertion error, states should be empty");if(0!==this.marks.length)throw new Error("assertion error, marks should be empty");this.state=null}else{if(a=this.peek_token().start_mark,o=this.process_directives(),l=o[0],s=o[1],!this.check_token(i.DocumentStartToken))throw new t.ParserError("expected '<document start>', but found "+this.peek_token().id,this.peek_token().start_mark);u=this.get_token(),e=u.end_mark,n=new r.DocumentStartEvent(a,e,!0,l,s),this.states.push("parse_document_end"),this.state="parse_document_content"}return n},e.prototype.parse_document_end=function(){var e,t,n,o,a;return a=this.peek_token(),o=e=a.start_mark,n=!1,this.check_token(i.DocumentEndToken)&&(a=this.get_token(),e=a.end_mark,n=!0),t=new r.DocumentEndEvent(o,e,n),this.state="parse_document_start",t},e.prototype.parse_document_content=function(){var e;return this.check_token(i.DirectiveToken,i.DocumentStartToken,i.DocumentEndToken,i.StreamEndToken)?(e=this.process_empty_scalar(this.peek_token().start_mark),this.state=this.states.pop(),e):this.parse_block_node()},e.prototype.process_directives=function(){var e,r,o,s,u,l,c,p,f;for(this.yaml_version=null,this.tag_handles={};this.check_token(i.DirectiveToken);)if(p=this.get_token(),"YAML"===p.name){if(null!==this.yaml_version)throw new t.ParserError(null,null,"found duplicate YAML directive",p.start_mark);if(s=p.value,r=s[0],s[1],1!==r)throw new t.ParserError(null,null,"found incompatible YAML document (version 1.* is required)",p.start_mark);this.yaml_version=p.value}else if("TAG"===p.name){if(u=p.value,e=u[0],o=u[1],e in this.tag_handles)throw new t.ParserError(null,null,"duplicate tag handle "+e,p.start_mark);this.tag_handles[e]=o}c=null,l=this.tag_handles;for(e in l)a.call(l,e)&&(o=l[e],null==c&&(c={}),c[e]=o);f=[this.yaml_version,c];for(e in n)a.call(n,e)&&((o=n[e])in this.tag_handles||(this.tag_handles[e]=o));return f},e.prototype.parse_block_node=function(){return this.parse_node(!0)},e.prototype.parse_flow_node=function(){return this.parse_node()},e.prototype.parse_block_node_or_indentless_sequence=function(){return this.parse_node(!0,!0)},e.prototype.parse_node=function(e,n){var o,a,s,u,l,c,p,f,h,d,m;if(null==e&&(e=!1),null==n&&(n=!1),this.check_token(i.AliasToken))m=this.get_token(),s=new r.AliasEvent(m.value,m.start_mark,m.end_mark),this.state=this.states.pop();else{if(o=null,h=null,p=a=d=null,this.check_token(i.AnchorToken)?(m=this.get_token(),p=m.start_mark,a=m.end_mark,o=m.value,this.check_token(i.TagToken)&&(m=this.get_token(),d=m.start_mark,a=m.end_mark,h=m.value)):this.check_token(i.TagToken)&&(m=this.get_token(),p=d=m.start_mark,a=m.end_mark,h=m.value,this.check_token(i.AnchorToken)&&(m=this.get_token(),a=m.end_mark,o=m.value)),null!==h)if(u=h[0],f=h[1],null!==u){if(!(u in this.tag_handles))throw new t.ParserError("while parsing a node",p,"found undefined tag handle "+u,d);h=this.tag_handles[u]+f}else h=f;if(null===p&&(p=a=this.peek_token().start_mark),s=null,l=null===h||"!"===h,n&&this.check_token(i.BlockEntryToken))a=this.peek_token().end_mark,s=new r.SequenceStartEvent(o,h,l,p,a),this.state="parse_indentless_sequence_entry";else if(this.check_token(i.ScalarToken))m=this.get_token(),a=m.end_mark,l=m.plain&&null===h||"!"===h?[!0,!1]:null===h?[!1,!0]:[!1,!1],s=new r.ScalarEvent(o,h,l,m.value,p,a,m.style),this.state=this.states.pop();else if(this.check_token(i.FlowSequenceStartToken))a=this.peek_token().end_mark,s=new r.SequenceStartEvent(o,h,l,p,a,!0),this.state="parse_flow_sequence_first_entry";else if(this.check_token(i.FlowMappingStartToken))a=this.peek_token().end_mark,s=new r.MappingStartEvent(o,h,l,p,a,!0),this.state="parse_flow_mapping_first_key";else if(e&&this.check_token(i.BlockSequenceStartToken))a=this.peek_token().end_mark,s=new r.SequenceStartEvent(o,h,l,p,a,!1),this.state="parse_block_sequence_first_entry";else if(e&&this.check_token(i.BlockMappingStartToken))a=this.peek_token().end_mark,s=new r.MappingStartEvent(o,h,l,p,a,!1),this.state="parse_block_mapping_first_key";else{if(null===o&&null===h)throw c=e?"block":"flow",m=this.peek_token(),new t.ParserError("while parsing a "+c+" node",p,"expected the node content, but found "+m.id,m.start_mark);s=new r.ScalarEvent(o,h,[l,!1],"",p,a),this.state=this.states.pop()}}return s},e.prototype.parse_block_sequence_first_entry=function(){var e;return e=this.get_token(),this.marks.push(e.start_mark),this.parse_block_sequence_entry()},e.prototype.parse_block_sequence_entry=function(){var e,n;if(this.check_token(i.BlockEntryToken))return n=this.get_token(),this.check_token(i.BlockEntryToken,i.BlockEndToken)?(this.state="parse_block_sequence_entry",this.process_empty_scalar(n.end_mark)):(this.states.push("parse_block_sequence_entry"),this.parse_block_node());if(!this.check_token(i.BlockEndToken))throw n=this.peek_token(),new t.ParserError("while parsing a block collection",this.marks.slice(-1)[0],"expected <block end>, but found "+n.id,n.start_mark);return n=this.get_token(),e=new r.SequenceEndEvent(n.start_mark,n.end_mark),this.state=this.states.pop(),this.marks.pop(),e},e.prototype.parse_indentless_sequence_entry=function(){var e,t;return this.check_token(i.BlockEntryToken)?(t=this.get_token(),this.check_token(i.BlockEntryToken,i.KeyToken,i.ValueToken,i.BlockEndToken)?(this.state="parse_indentless_sequence_entry",this.process_empty_scalar(t.end_mark)):(this.states.push("parse_indentless_sequence_entry"),this.parse_block_node())):(t=this.peek_token(),e=new r.SequenceEndEvent(t.start_mark,t.start_mark),this.state=this.states.pop(),e)},e.prototype.parse_block_mapping_first_key=function(){var e;return e=this.get_token(),this.marks.push(e.start_mark),this.parse_block_mapping_key()},e.prototype.parse_block_mapping_key=function(){var e,n;if(this.check_token(i.KeyToken))return n=this.get_token(),this.check_token(i.KeyToken,i.ValueToken,i.BlockEndToken)?(this.state="parse_block_mapping_value",this.process_empty_scalar(n.end_mark)):(this.states.push("parse_block_mapping_value"),this.parse_block_node_or_indentless_sequence());if(!this.check_token(i.BlockEndToken))throw n=this.peek_token(),new t.ParserError("while parsing a block mapping",this.marks.slice(-1)[0],"expected <block end>, but found "+n.id,n.start_mark);return n=this.get_token(),e=new r.MappingEndEvent(n.start_mark,n.end_mark),this.state=this.states.pop(),this.marks.pop(),e},e.prototype.parse_block_mapping_value=function(){var e;return this.check_token(i.ValueToken)?(e=this.get_token(),this.check_token(i.KeyToken,i.ValueToken,i.BlockEndToken)?(this.state="parse_block_mapping_key",this.process_empty_scalar(e.end_mark)):(this.states.push("parse_block_mapping_key"),this.parse_block_node_or_indentless_sequence())):(this.state="parse_block_mapping_key",e=this.peek_token(),this.process_empty_scalar(e.start_mark))},e.prototype.parse_flow_sequence_first_entry=function(){var e;return e=this.get_token(),this.marks.push(e.start_mark),this.parse_flow_sequence_entry(!0)},e.prototype.parse_flow_sequence_entry=function(e){var n,o;if(null==e&&(e=!1),!this.check_token(i.FlowSequenceEndToken)){if(!e){if(!this.check_token(i.FlowEntryToken))throw o=this.peek_token(),new t.ParserError("while parsing a flow sequence",this.marks.slice(-1)[0],"expected ',' or ']', but got "+o.id,o.start_mark);this.get_token()}if(this.check_token(i.KeyToken))return o=this.peek_token(),n=new r.MappingStartEvent(null,null,!0,o.start_mark,o.end_mark,!0),this.state="parse_flow_sequence_entry_mapping_key",n;if(!this.check_token(i.FlowSequenceEndToken))return this.states.push("parse_flow_sequence_entry"),this.parse_flow_node()}return o=this.get_token(),n=new r.SequenceEndEvent(o.start_mark,o.end_mark),this.state=this.states.pop(),this.marks.pop(),n},e.prototype.parse_flow_sequence_entry_mapping_key=function(){var e;return e=this.get_token(),this.check_token(i.ValueToken,i.FlowEntryToken,i.FlowSequenceEndToken)?(this.state="parse_flow_sequence_entry_mapping_value",this.process_empty_scalar(e.end_mark)):(this.states.push("parse_flow_sequence_entry_mapping_value"),this.parse_flow_node())},e.prototype.parse_flow_sequence_entry_mapping_value=function(){var e;return this.check_token(i.ValueToken)?(e=this.get_token(),this.check_token(i.FlowEntryToken,i.FlowSequenceEndToken)?(this.state="parse_flow_sequence_entry_mapping_end",this.process_empty_scalar(e.end_mark)):(this.states.push("parse_flow_sequence_entry_mapping_end"),this.parse_flow_node())):(this.state="parse_flow_sequence_entry_mapping_end",e=this.peek_token(),this.process_empty_scalar(e.start_mark))},e.prototype.parse_flow_sequence_entry_mapping_end=function(){var e;return this.state="parse_flow_sequence_entry",e=this.peek_token(),new r.MappingEndEvent(e.start_mark,e.start_mark)},e.prototype.parse_flow_mapping_first_key=function(){var e;return e=this.get_token(),this.marks.push(e.start_mark),this.parse_flow_mapping_key(!0)},e.prototype.parse_flow_mapping_key=function(e){var n,o;if(null==e&&(e=!1),!this.check_token(i.FlowMappingEndToken)){if(!e){if(!this.check_token(i.FlowEntryToken))throw o=this.peek_token(),new t.ParserError("while parsing a flow mapping",this.marks.slice(-1)[0],"expected ',' or '}', but got "+o.id,o.start_mark);this.get_token()}if(this.check_token(i.KeyToken))return o=this.get_token(),this.check_token(i.ValueToken,i.FlowEntryToken,i.FlowMappingEndToken)?(this.state="parse_flow_mapping_value",this.process_empty_scalar(o.end_mark)):(this.states.push("parse_flow_mapping_value"),this.parse_flow_node());if(!this.check_token(i.FlowMappingEndToken))return this.states.push("parse_flow_mapping_empty_value"),this.parse_flow_node()}return o=this.get_token(),n=new r.MappingEndEvent(o.start_mark,o.end_mark),this.state=this.states.pop(),this.marks.pop(),n},e.prototype.parse_flow_mapping_value=function(){var e;return this.check_token(i.ValueToken)?(e=this.get_token(),this.check_token(i.FlowEntryToken,i.FlowMappingEndToken)?(this.state="parse_flow_mapping_key",this.process_empty_scalar(e.end_mark)):(this.states.push("parse_flow_mapping_key"),this.parse_flow_node())):(this.state="parse_flow_mapping_key",e=this.peek_token(),this.process_empty_scalar(e.start_mark))},e.prototype.parse_flow_mapping_empty_value=function(){return this.state="parse_flow_mapping_key",this.process_empty_scalar(this.peek_token().start_mark)},e.prototype.process_empty_scalar=function(e){return new r.ScalarEvent(null,null,[!0,!1],"",e,e)},e}()}).call(this)},function(e,t,n){(function(){var e,r,i,o=function(e,t){function n(){this.constructor=e}for(var r in t)a.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},a={}.hasOwnProperty,s=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};i=n(45),e=i.Mark,r=i.YAMLError,this.ReaderError=function(e){function t(e,n,r){this.position=e,this.character=n,this.reason=r,t.__super__.constructor.call(this)}return o(t,e),t.prototype.toString=function(){return"unacceptable character #"+this.character.charCodeAt(0).toString(16)+": "+this.reason+"\n  position "+this.position},t}(r),this.Reader=function(){function n(e){this.string=e,this.line=0,this.column=0,this.index=0,this.check_printable(),this.string+="\0"}var r;return r=/[^\x09\x0A\x0D\x20-\x7E\x85\xA0-\uFFFD]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,n.prototype.peek=function(e){return null==e&&(e=0),this.string[this.index+e]},n.prototype.prefix=function(e){return null==e&&(e=1),this.string.slice(this.index,this.index+e)},n.prototype.forward=function(e){var t,n;for(null==e&&(e=1),n=[];e;)t=this.string[this.index],this.index++,s.call("\n…₂\u2029",t)>=0||"\r"===t&&"\n"!==this.string[this.index]?(this.line++,this.column=0):this.column++,n.push(e--);return n},n.prototype.get_mark=function(){return new e(this.line,this.column,this.string,this.index)},n.prototype.check_printable=function(){var e,n,i;if(n=r.exec(this.string))throw e=n[0],i=this.string.length-this.index+n.index,new t.ReaderError(i,e,"special characters are not allowed")},n}()}).call(this)},function(e,t,n){(function(){var e,r,i,o,a=function(e,t){function n(){this.constructor=e}for(var r in t)s.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},s={}.hasOwnProperty,u=[].slice,l=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};e=n(45).MarkedYAMLError,i=n(267),o=n(61),this.ScannerError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return a(t,e),t}(e),r=function(){function e(e,t,n,r,i,o){this.token_number=e,this.required=t,this.index=n,this.line=r,this.column=i,this.mark=o}return e}(),this.Scanner=function(){function e(){this.done=!1,this.flow_level=0,this.tokens=[],this.fetch_stream_start(),this.tokens_taken=0,this.indent=-1,this.indents=[],this.allow_simple_key=!0,this.possible_simple_keys={}}var n,a,c,p,f;return n="\r\n…\u2028\u2029",c="\t ",a="0123456789",f={0:"\0",a:"",b:"\b",t:"\t","\t":"\t",n:"\n",v:"\v",f:"\f",r:"\r",e:""," ":" ",'"':'"',"\\":"\\",N:"…",_:" ",L:"\u2028",P:"\u2029"},p={x:2,u:4,U:8},e.prototype.check_token=function(){var e,t,n,r;for(t=1<=arguments.length?u.call(arguments,0):[];this.need_more_tokens();)this.fetch_more_tokens();if(0!==this.tokens.length){if(0===t.length)return!0;for(n=0,r=t.length;n<r;n++)if(e=t[n],this.tokens[0]instanceof e)return!0}return!1},e.prototype.peek_token=function(){for(;this.need_more_tokens();)this.fetch_more_tokens();if(0!==this.tokens.length)return this.tokens[0]},e.prototype.get_token=function(){for(;this.need_more_tokens();)this.fetch_more_tokens();if(0!==this.tokens.length)return this.tokens_taken++,this.tokens.shift()},e.prototype.need_more_tokens=function(){return!this.done&&(0===this.tokens.length||(this.stale_possible_simple_keys(),this.next_possible_simple_key()===this.tokens_taken))},e.prototype.fetch_more_tokens=function(){var e;if(this.scan_to_next_token(),this.stale_possible_simple_keys(),this.unwind_indent(this.column),"\0"===(e=this.peek()))return this.fetch_stream_end();if("%"===e&&this.check_directive())return this.fetch_directive();if("-"===e&&this.check_document_start())return this.fetch_document_start();if("."===e&&this.check_document_end())return this.fetch_document_end();if("["===e)return this.fetch_flow_sequence_start();if("{"===e)return this.fetch_flow_mapping_start();if("]"===e)return this.fetch_flow_sequence_end();if("}"===e)return this.fetch_flow_mapping_end();if(","===e)return this.fetch_flow_entry();if("-"===e&&this.check_block_entry())return this.fetch_block_entry();if("?"===e&&this.check_key())return this.fetch_key();if(":"===e&&this.check_value())return this.fetch_value();if("*"===e)return this.fetch_alias();if("&"===e)return this.fetch_anchor();if("!"===e)return this.fetch_tag();if("|"===e&&0===this.flow_level)return this.fetch_literal();if(">"===e&&0===this.flow_level)return this.fetch_folded();if("'"===e)return this.fetch_single();if('"'===e)return this.fetch_double();if(this.check_plain())return this.fetch_plain();throw new t.ScannerError("while scanning for the next token",null,"found character "+e+" that cannot start any token",this.get_mark())},e.prototype.next_possible_simple_key=function(){var e,t,n,r;n=null,r=this.possible_simple_keys;for(t in r)s.call(r,t)&&(e=r[t],(null===n||e.token_number<n)&&(n=e.token_number));return n},e.prototype.stale_possible_simple_keys=function(){var e,n,r,i;r=this.possible_simple_keys,i=[];for(n in r)if(s.call(r,n)&&(e=r[n],!(e.line===this.line&&this.index-e.index<=1024))){if(e.required)throw new t.ScannerError("while scanning a simple key",e.mark,"could not find expected ':'",this.get_mark());i.push(delete this.possible_simple_keys[n])}return i},e.prototype.save_possible_simple_key=function(){var e,t;if((e=0===this.flow_level&&this.indent===this.column)&&!this.allow_simple_key)throw new Error("logic failure");if(this.allow_simple_key)return this.remove_possible_simple_key(),t=this.tokens_taken+this.tokens.length,this.possible_simple_keys[this.flow_level]=new r(t,e,this.index,this.line,this.column,this.get_mark())},e.prototype.remove_possible_simple_key=function(){var e;if(e=this.possible_simple_keys[this.flow_level]){if(e.required)throw new t.ScannerError("while scanning a simple key",e.mark,"could not find expected ':'",this.get_mark());return delete this.possible_simple_keys[this.flow_level]}},e.prototype.unwind_indent=function(e){var t,n;if(0===this.flow_level){for(n=[];this.indent>e;)t=this.get_mark(),this.indent=this.indents.pop(),n.push(this.tokens.push(new i.BlockEndToken(t,t)));return n}},e.prototype.add_indent=function(e){return e>this.indent&&(this.indents.push(this.indent),this.indent=e,!0)},e.prototype.fetch_stream_start=function(){var e;return e=this.get_mark(),this.tokens.push(new i.StreamStartToken(e,e,this.encoding))},e.prototype.fetch_stream_end=function(){var e;return this.unwind_indent(-1),this.remove_possible_simple_key(),this.allow_possible_simple_key=!1,this.possible_simple_keys={},e=this.get_mark(),this.tokens.push(new i.StreamEndToken(e,e)),this.done=!0},e.prototype.fetch_directive=function(){return this.unwind_indent(-1),this.remove_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_directive())},e.prototype.fetch_document_start=function(){return this.fetch_document_indicator(i.DocumentStartToken)},e.prototype.fetch_document_end=function(){return this.fetch_document_indicator(i.DocumentEndToken)},e.prototype.fetch_document_indicator=function(e){var t;return this.unwind_indent(-1),this.remove_possible_simple_key(),this.allow_simple_key=!1,t=this.get_mark(),this.forward(3),this.tokens.push(new e(t,this.get_mark()))},e.prototype.fetch_flow_sequence_start=function(){return this.fetch_flow_collection_start(i.FlowSequenceStartToken)},e.prototype.fetch_flow_mapping_start=function(){return this.fetch_flow_collection_start(i.FlowMappingStartToken)},e.prototype.fetch_flow_collection_start=function(e){var t;return this.save_possible_simple_key(),this.flow_level++,this.allow_simple_key=!0,t=this.get_mark(),this.forward(),this.tokens.push(new e(t,this.get_mark()))},e.prototype.fetch_flow_sequence_end=function(){return this.fetch_flow_collection_end(i.FlowSequenceEndToken)},e.prototype.fetch_flow_mapping_end=function(){return this.fetch_flow_collection_end(i.FlowMappingEndToken)},e.prototype.fetch_flow_collection_end=function(e){var t;return this.remove_possible_simple_key(),this.flow_level--,this.allow_simple_key=!1,t=this.get_mark(),this.forward(),this.tokens.push(new e(t,this.get_mark()))},e.prototype.fetch_flow_entry=function(){var e;return this.allow_simple_key=!0,this.remove_possible_simple_key(),e=this.get_mark(),this.forward(),this.tokens.push(new i.FlowEntryToken(e,this.get_mark()))},e.prototype.fetch_block_entry=function(){var e,n;if(0===this.flow_level){if(!this.allow_simple_key)throw new t.ScannerError(null,null,"sequence entries are not allowed here",this.get_mark());this.add_indent(this.column)&&(e=this.get_mark(),this.tokens.push(new i.BlockSequenceStartToken(e,e)))}return this.allow_simple_key=!0,this.remove_possible_simple_key(),n=this.get_mark(),this.forward(),this.tokens.push(new i.BlockEntryToken(n,this.get_mark()))},e.prototype.fetch_key=function(){var e,n;if(0===this.flow_level){if(!this.allow_simple_key)throw new t.ScannerError(null,null,"mapping keys are not allowed here",this.get_mark());this.add_indent(this.column)&&(e=this.get_mark(),this.tokens.push(new i.BlockMappingStartToken(e,e)))}return this.allow_simple_key=!this.flow_level,this.remove_possible_simple_key(),n=this.get_mark(),this.forward(),this.tokens.push(new i.KeyToken(n,this.get_mark()))},e.prototype.fetch_value=function(){var e,n,r;if(e=this.possible_simple_keys[this.flow_level])delete this.possible_simple_keys[this.flow_level],this.tokens.splice(e.token_number-this.tokens_taken,0,new i.KeyToken(e.mark,e.mark)),0===this.flow_level&&this.add_indent(e.column)&&this.tokens.splice(e.token_number-this.tokens_taken,0,new i.BlockMappingStartToken(e.mark,e.mark)),this.allow_simple_key=!1;else{if(0===this.flow_level){if(!this.allow_simple_key)throw new t.ScannerError(null,null,"mapping values are not allowed here",this.get_mark());this.add_indent(this.column)&&(n=this.get_mark(),this.tokens.push(new i.BlockMappingStartToken(n,n)))}this.allow_simple_key=!this.flow_level,this.remove_possible_simple_key()}return r=this.get_mark(),this.forward(),this.tokens.push(new i.ValueToken(r,this.get_mark()))},e.prototype.fetch_alias=function(){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_anchor(i.AliasToken))},e.prototype.fetch_anchor=function(){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_anchor(i.AnchorToken))},e.prototype.fetch_tag=function(){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_tag())},e.prototype.fetch_literal=function(){return this.fetch_block_scalar("|")},e.prototype.fetch_folded=function(){return this.fetch_block_scalar(">")},e.prototype.fetch_block_scalar=function(e){return this.allow_simple_key=!0,this.remove_possible_simple_key(),this.tokens.push(this.scan_block_scalar(e))},e.prototype.fetch_single=function(){return this.fetch_flow_scalar("'")},e.prototype.fetch_double=function(){return this.fetch_flow_scalar('"')},e.prototype.fetch_flow_scalar=function(e){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_flow_scalar(e))},e.prototype.fetch_plain=function(){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_plain())},e.prototype.check_directive=function(){return 0===this.column},e.prototype.check_document_start=function(){var e;return 0===this.column&&"---"===this.prefix(3)&&(e=this.peek(3),l.call(n+c+"\0",e)>=0)},e.prototype.check_document_end=function(){var e;return 0===this.column&&"..."===this.prefix(3)&&(e=this.peek(3),l.call(n+c+"\0",e)>=0)},e.prototype.check_block_entry=function(){var e;return e=this.peek(1),l.call(n+c+"\0",e)>=0},e.prototype.check_key=function(){var e;return 0!==this.flow_level||(e=this.peek(1),l.call(n+c+"\0",e)>=0)},e.prototype.check_value=function(){var e;return 0!==this.flow_level||(e=this.peek(1),l.call(n+c+"\0",e)>=0)},e.prototype.check_plain=function(){var e,t;return e=this.peek(),l.call(n+c+"\0-?:,[]{}#&*!|>'\"%@`",e)<0||(t=this.peek(1),l.call(n+c+"\0",t)<0&&("-"===e||0===this.flow_level&&l.call("?:",e)>=0))},e.prototype.scan_to_next_token=function(){var e,t,r;for(0===this.index&&"\ufeff"===this.peek()&&this.forward(),e=!1,r=[];!e;){for(;" "===this.peek();)this.forward();if("#"===this.peek())for(;t=this.peek(),l.call(n+"\0",t)<0;)this.forward();this.scan_line_break()?0===this.flow_level?r.push(this.allow_simple_key=!0):r.push(void 0):r.push(e=!0)}return r},e.prototype.scan_directive=function(){var e,t,r,o,a;if(o=this.get_mark(),this.forward(),t=this.scan_directive_name(o),a=null,"YAML"===t)a=this.scan_yaml_directive_value(o),e=this.get_mark();else if("TAG"===t)a=this.scan_tag_directive_value(o),e=this.get_mark();else for(e=this.get_mark();r=this.peek(),l.call(n+"\0",r)<0;)this.forward();return this.scan_directive_ignored_line(o),new i.DirectiveToken(t,a,o,e)},e.prototype.scan_directive_name=function(e){var r,i,o;for(i=0,r=this.peek(i);"0"<=r&&r<="9"||"A"<=r&&r<="Z"||"a"<=r&&r<="z"||l.call("-_",r)>=0;)i++,r=this.peek(i);if(0===i)throw new t.ScannerError("while scanning a directive",e,"expected alphanumeric or numeric character but found "+r,this.get_mark());if(o=this.prefix(i),this.forward(i),r=this.peek(),l.call(n+"\0 ",r)<0)throw new t.ScannerError("while scanning a directive",e,"expected alphanumeric or numeric character but found "+r,this.get_mark());return o},e.prototype.scan_yaml_directive_value=function(e){for(var r,i,o;" "===this.peek();)this.forward();if(r=this.scan_yaml_directive_number(e),"."!==this.peek())throw new t.ScannerError("while scanning a directive",e,"expected a digit or '.' but found "+this.peek(),this.get_mark());if(this.forward(),i=this.scan_yaml_directive_number(e),o=this.peek(),l.call(n+"\0 ",o)<0)throw new t.ScannerError("while scanning a directive",e,"expected a digit or ' ' but found "+this.peek(),this.get_mark());return[r,i]},e.prototype.scan_yaml_directive_number=function(e){var n,r,i,o;if(!("0"<=(n=this.peek())&&n<="9"))throw new t.ScannerError("while scanning a directive",e,"expected a digit but found "+n,this.get_mark());for(r=0;"0"<=(i=this.peek(r))&&i<="9";)r++;return o=parseInt(this.prefix(r)),this.forward(r),o},e.prototype.scan_tag_directive_value=function(e){for(var t,n;" "===this.peek();)this.forward();for(t=this.scan_tag_directive_handle(e);" "===this.peek();)this.forward();return n=this.scan_tag_directive_prefix(e),[t,n]},e.prototype.scan_tag_directive_handle=function(e){var n,r;if(r=this.scan_tag_handle("directive",e)," "!==(n=this.peek()))throw new t.ScannerError("while scanning a directive",e,"expected ' ' but found "+n,this.get_mark());return r},e.prototype.scan_tag_directive_prefix=function(e){var r,i;if(i=this.scan_tag_uri("directive",e),r=this.peek(),l.call(n+"\0 ",r)<0)throw new t.ScannerError("while scanning a directive",e,"expected ' ' but found "+r,this.get_mark());return i},e.prototype.scan_directive_ignored_line=function(e){for(var r,i;" "===this.peek();)this.forward();if("#"===this.peek())for(;i=this.peek(),l.call(n+"\0",i)<0;)this.forward();if(r=this.peek(),l.call(n+"\0",r)<0)throw new t.ScannerError("while scanning a directive",e,"expected a comment or a line break but found "+r,this.get_mark());return this.scan_line_break()},e.prototype.scan_anchor=function(e){var r,i,o,a,s,u;for(s=this.get_mark(),i=this.peek(),a="*"===i?"alias":"anchor",this.forward(),o=0,r=this.peek(o);"0"<=r&&r<="9"||"A"<=r&&r<="Z"||"a"<=r&&r<="z"||l.call("-_",r)>=0;)o++,r=this.peek(o);if(0===o)throw new t.ScannerError("while scanning an "+a,s,"expected alphabetic or numeric character but found '"+r+"'",this.get_mark());if(u=this.prefix(o),this.forward(o),r=this.peek(),l.call(n+c+"\0?:,]}%@`",r)<0)throw new t.ScannerError("while scanning an "+a,s,"expected alphabetic or numeric character but found '"+r+"'",this.get_mark());return new e(u,s,this.get_mark())},e.prototype.scan_tag=function(){var e,r,o,a,s,u;if(a=this.get_mark(),"<"===(e=this.peek(1))){if(r=null,this.forward(2),s=this.scan_tag_uri("tag",a),">"!==this.peek())throw new t.ScannerError("while parsing a tag",a,"expected '>' but found "+this.peek(),this.get_mark());this.forward()}else if(l.call(n+c+"\0",e)>=0)r=null,s="!",this.forward();else{for(o=1,u=!1;l.call(n+"\0 ",e)<0;){if("!"===e){u=!0;break}o++,e=this.peek(o)}u?r=this.scan_tag_handle("tag",a):(r="!",this.forward()),s=this.scan_tag_uri("tag",a)}if(e=this.peek(),l.call(n+"\0 ",e)<0)throw new t.ScannerError("while scanning a tag",a,"expected ' ' but found "+e,this.get_mark());return new i.TagToken([r,s],a,this.get_mark())},e.prototype.scan_block_scalar=function(e){var t,r,a,s,u,c,p,f,h,d,m,v,g,y,_,b,x,w,k,E;for(u=">"===e,a=[],E=this.get_mark(),this.forward(),g=this.scan_block_scalar_indicators(E),r=g[0],c=g[1],this.scan_block_scalar_ignored_line(E),v=this.indent+1,v<1&&(v=1),null==c?(y=this.scan_block_scalar_indentation(),t=y[0],m=y[1],s=y[2],p=Math.max(v,m)):(p=v+c-1,_=this.scan_block_scalar_breaks(p),t=_[0],s=_[1]),d="";this.column===p&&"\0"!==this.peek();){for(a=a.concat(t),b=this.peek(),f=l.call(" \t",b)<0,h=0;x=this.peek(h),l.call(n+"\0",x)<0;)h++;if(a.push(this.prefix(h)),this.forward(h),d=this.scan_line_break(),w=this.scan_block_scalar_breaks(p),t=w[0],s=w[1],this.column!==p||"\0"===this.peek())break;u&&"\n"===d&&f&&(k=this.peek(),l.call(" \t",k)<0)?o.is_empty(t)&&a.push(" "):a.push(d)}return!1!==r&&a.push(d),!0===r&&(a=a.concat(t)),new i.ScalarToken(a.join(""),!1,E,s,e)},e.prototype.scan_block_scalar_indicators=function(e){var r,i,o;if(i=null,o=null,r=this.peek(),l.call("+-",r)>=0){if(i="+"===r,this.forward(),r=this.peek(),l.call(a,r)>=0){if(0===(o=parseInt(r)))throw new t.ScannerError("while scanning a block scalar",e,"expected indentation indicator in the range 1-9 but found 0",this.get_mark());this.forward()}}else if(l.call(a,r)>=0){if(0===(o=parseInt(r)))throw new t.ScannerError("while scanning a block scalar",e,"expected indentation indicator in the range 1-9 but found 0",this.get_mark());this.forward(),r=this.peek(),l.call("+-",r)>=0&&(i="+"===r,this.forward())}if(r=this.peek(),l.call(n+"\0 ",r)<0)throw new t.ScannerError("while scanning a block scalar",e,"expected chomping or indentation indicators, but found "+r,this.get_mark());return[i,o]},e.prototype.scan_block_scalar_ignored_line=function(e){for(var r,i;" "===this.peek();)this.forward();if("#"===this.peek())for(;i=this.peek(),l.call(n+"\0",i)<0;)this.forward();if(r=this.peek(),l.call(n+"\0",r)<0)throw new t.ScannerError("while scanning a block scalar",e,"expected a comment or a line break but found "+r,this.get_mark());return this.scan_line_break()},e.prototype.scan_block_scalar_indentation=function(){var e,t,r,i;for(e=[],r=0,t=this.get_mark();i=this.peek(),l.call(n+" ",i)>=0;)" "!==this.peek()?(e.push(this.scan_line_break()),t=this.get_mark()):(this.forward(),this.column>r&&(r=this.column));return[e,r,t]},e.prototype.scan_block_scalar_breaks=function(e){var t,r,i;for(t=[],r=this.get_mark();this.column<e&&" "===this.peek();)this.forward();for(;i=this.peek(),l.call(n,i)>=0;)for(t.push(this.scan_line_break()),r=this.get_mark();this.column<e&&" "===this.peek();)this.forward();return[t,r]},e.prototype.scan_flow_scalar=function(e){var t,n,r,o;for(n='"'===e,t=[],o=this.get_mark(),r=this.peek(),this.forward(),t=t.concat(this.scan_flow_scalar_non_spaces(n,o));this.peek()!==r;)t=t.concat(this.scan_flow_scalar_spaces(n,o)),t=t.concat(this.scan_flow_scalar_non_spaces(n,o));return this.forward(),new i.ScalarToken(t.join(""),!1,o,this.get_mark(),e)},e.prototype.scan_flow_scalar_non_spaces=function(e,r){var i,o,s,u,h,d,m,v,g;for(o=[];;){for(d=0;m=this.peek(d),l.call(n+c+"'\"\\\0",m)<0;)d++;if(0!==d&&(o.push(this.prefix(d)),this.forward(d)),i=this.peek(),e||"'"!==i||"'"!==this.peek(1))if(e&&"'"===i||!e&&l.call('"\\',i)>=0)o.push(i),this.forward();else{if(!e||"\\"!==i)return o;if(this.forward(),(i=this.peek())in f)o.push(f[i]),this.forward();else if(i in p){for(d=p[i],this.forward(),h=u=0,v=d;0<=v?u<v:u>v;h=0<=v?++u:--u)if(g=this.peek(h),l.call(a+"ABCDEFabcdef",g)<0)throw new t.ScannerError("while scanning a double-quoted scalar",r,"expected escape sequence of "+d+" hexadecimal numbers, but found "+this.peek(h),this.get_mark());s=parseInt(this.prefix(d),16),o.push(String.fromCharCode(s)),this.forward(d)}else{if(!(l.call(n,i)>=0))throw new t.ScannerError("while scanning a double-quoted scalar",r,"found unknown escape character "+i,this.get_mark());this.scan_line_break(),o=o.concat(this.scan_flow_scalar_breaks(e,r))}}else o.push("'"),this.forward(2)}},e.prototype.scan_flow_scalar_spaces=function(e,r){var i,o,a,s,u,p,f;for(a=[],s=0;p=this.peek(s),l.call(c,p)>=0;)s++;if(f=this.prefix(s),this.forward(s),"\0"===(o=this.peek()))throw new t.ScannerError("while scanning a quoted scalar",r,"found unexpected end of stream",this.get_mark());return l.call(n,o)>=0?(u=this.scan_line_break(),i=this.scan_flow_scalar_breaks(e,r),"\n"!==u?a.push(u):0===i.length&&a.push(" "),a=a.concat(i)):a.push(f),a},e.prototype.scan_flow_scalar_breaks=function(e,r){var i,o,a,s,u;for(i=[];;){if("---"===(o=this.prefix(3))||"..."===o&&(a=this.peek(3),l.call(n+c+"\0",a)>=0))throw new t.ScannerError("while scanning a quoted scalar",r,"found unexpected document separator",this.get_mark());for(;s=this.peek(),l.call(c,s)>=0;)this.forward();if(u=this.peek(),!(l.call(n,u)>=0))return i;i.push(this.scan_line_break())}},e.prototype.scan_plain=function(){var e,r,o,a,s,u,p,f,h;for(r=[],h=o=this.get_mark(),a=this.indent+1,f=[];;){if(s=0,"#"===this.peek())break;for(;;){if(e=this.peek(s),l.call(n+c+"\0",e)>=0||0===this.flow_level&&":"===e&&(u=this.peek(s+1),l.call(n+c+"\0",u)>=0)||0!==this.flow_level&&l.call(",:?[]{}",e)>=0)break;s++}if(0!==this.flow_level&&":"===e&&(p=this.peek(s+1),l.call(n+c+"\0,[]{}",p)<0))throw this.forward(s),new t.ScannerError("while scanning a plain scalar",h,"found unexpected ':'",this.get_mark(),"Please check http://pyyaml.org/wiki/YAMLColonInFlowContext");if(0===s)break;if(this.allow_simple_key=!1,r=r.concat(f),r.push(this.prefix(s)),this.forward(s),o=this.get_mark(),null==(f=this.scan_plain_spaces(a,h))||0===f.length||"#"===this.peek()||0===this.flow_level&&this.column<a)break}return new i.ScalarToken(r.join(""),!0,h,o)},e.prototype.scan_plain_spaces=function(e,t){var r,i,o,a,s,u,p,f,h,d,m;for(o=[],a=0;p=this.peek(a),l.call(" ",p)>=0;)a++;if(m=this.prefix(a),this.forward(a),i=this.peek(),l.call(n,i)>=0){if(s=this.scan_line_break(),this.allow_simple_key=!0,"---"===(u=this.prefix(3))||"..."===u&&(f=this.peek(3),l.call(n+c+"\0",f)>=0))return;for(r=[];d=this.peek(),l.call(n+" ",d)>=0;)if(" "===this.peek())this.forward();else if(r.push(this.scan_line_break()),"---"===(u=this.prefix(3))||"..."===u&&(h=this.peek(3),l.call(n+c+"\0",h)>=0))return;"\n"!==s?o.push(s):0===r.length&&o.push(" "),o=o.concat(r)}else m&&o.push(m);return o},e.prototype.scan_tag_handle=function(e,n){var r,i,o;if("!"!==(r=this.peek()))throw new t.ScannerError("while scanning a "+e,n,"expected '!' but found "+r,this.get_mark());if(i=1," "!==(r=this.peek(i))){for(;"0"<=r&&r<="9"||"A"<=r&&r<="Z"||"a"<=r&&r<="z"||l.call("-_",r)>=0;)i++,r=this.peek(i);if("!"!==r)throw this.forward(i),new t.ScannerError("while scanning a "+e,n,"expected '!' but found "+r,this.get_mark());i++}return o=this.prefix(i),this.forward(i),o},e.prototype.scan_tag_uri=function(e,n){var r,i,o;for(i=[],o=0,r=this.peek(o);"0"<=r&&r<="9"||"A"<=r&&r<="Z"||"a"<=r&&r<="z"||l.call("-;/?:@&=+$,_.!~*'()[]%",r)>=0;)"%"===r?(i.push(this.prefix(o)),this.forward(o),o=0,i.push(this.scan_uri_escapes(e,n))):o++,r=this.peek(o);if(0!==o&&(i.push(this.prefix(o)),this.forward(o),o=0),0===i.length)throw new t.ScannerError("while parsing a "+e,n,"expected URI but found "+r,this.get_mark());return i.join("")},e.prototype.scan_uri_escapes=function(e,n){var r,i,o;for(r=[],this.get_mark();"%"===this.peek();){for(this.forward(),o=i=0;i<=2;o=++i)throw new t.ScannerError("while scanning a "+e,n,"expected URI escape sequence of 2 hexadecimal numbers but found "+this.peek(o),this.get_mark());r.push(String.fromCharCode(parseInt(this.prefix(2),16))),this.forward(2)}return r.join("")},e.prototype.scan_line_break=function(){var e;return e=this.peek(),l.call("\r\n…",e)>=0?("\r\n"===this.prefix(2)?this.forward(2):this.forward(),"\n"):l.call("\u2028\u2029",e)>=0?(this.forward(),e):""},e}()}).call(this)},function(e,t){},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}var i=n(35),o=r(i),a=n(47),s=r(a),u=n(48),l=r(u),c=n(203),p=r(c),f=n(562),h=r(f),d=n(46),m=r(d),v=n(560),g=r(v),y=n(271),_=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(y),b=n(9),x={PACKAGE_VERSION:"3.10.0",GIT_COMMIT:"g2e05bb99",GIT_DIRTY:!0,HOSTNAME:"banjo",BUILD_TIME:"Sat, 10 Feb 2018 04:32:34 GMT"},w=x.GIT_DIRTY,k=x.GIT_COMMIT,E=x.PACKAGE_VERSION,S=x.HOSTNAME,C=x.BUILD_TIME;e.exports=function(e){m.default.versions=m.default.versions||{},m.default.versions.swaggerUi={version:E,gitRevision:k,gitDirty:w,buildTimestamp:C,machine:S};var t={dom_id:null,domNode:null,spec:{},url:"",urls:null,layout:"BaseLayout",docExpansion:"list",maxDisplayedTags:null,filter:null,validatorUrl:"https://online.swagger.io/validator",configs:{},custom:{},displayOperationId:!1,displayRequestDuration:!1,deepLinking:!1,requestInterceptor:function(e){return e},responseInterceptor:function(e){return e},showMutatedRequest:!0,defaultModelRendering:"example",defaultModelExpandDepth:1,defaultModelsExpandDepth:1,showExtensions:!1,supportedSubmitMethods:["get","put","post","delete","options","head","patch","trace"],presets:[g.default],plugins:[],initialState:{},fn:{},components:{}},n=(0,b.parseSearch)(),r=e.domNode;delete e.domNode;var i=(0,p.default)({},t,e,n),a={system:{configs:i.configs},plugins:i.presets,state:(0,p.default)({layout:{layout:i.layout,filter:i.filter},spec:{spec:"",url:i.url}},i.initialState)};if(i.initialState)for(var u in i.initialState)i.initialState.hasOwnProperty(u)&&void 0===i.initialState[u]&&delete a.state[u];var c=function(){return{fn:i.fn,components:i.components,state:i.state}},f=new h.default(a);f.register([i.plugins,c]);var d=f.getSystem(),v=function(e){if("object"!==(void 0===i?"undefined":(0,l.default)(i)))return d;var t=d.specSelectors.getLocalConfig?d.specSelectors.getLocalConfig():{},a=(0,p.default)({},t,i,e||{},n);if(r&&(a.domNode=r),f.setConfigs(a),null!==e&&(!n.url&&"object"===(0,l.default)(a.spec)&&(0,s.default)(a.spec).length?(d.specActions.updateUrl(""),d.specActions.updateLoadingStatus("success"),d.specActions.updateSpec((0,o.default)(a.spec))):d.specActions.download&&a.url&&(d.specActions.updateUrl(a.url),d.specActions.download(a.url))),a.domNode)d.render(a.domNode,"App");else if(a.dom_id){var u=document.querySelector(a.dom_id);d.render(u,"App")}else null===a.dom_id||null===a.domNode||console.error("Skipped rendering: no `dom_id` or `domNode` was specified");return d},y=n.config||i.configUrl;return!y||!d.specActions.getConfigByUrl||d.specActions.getConfigByUrl&&!d.specActions.getConfigByUrl(y,v)?v():d},e.exports.presets={apis:g.default},e.exports.plugins=_},function(e,t,n){"use strict";var r=n(46);void 0===function(e){return e&&e.__esModule?e:{default:e}}(r).default.Promise&&n(584),String.prototype.startsWith||n(583)},function(e,t,n){"use strict";function r(e){return u.indexOf(e[0])>-1}function i(e){var t,n,i=e.replace(a,"");return r(i)?i:(n=i.match(s))?(t=n[0],o.test(t)?"about:blank":i):"about:blank"}var o=/^(%20|\s)*(javascript|data)/im,a=/[^\x20-\x7E]/gim,s=/^([^:]+):/gm,u=[".","/"];e.exports={sanitizeUrl:i}},function(e,t,n){"use strict";(function(t){function n(e){for(var t=[],n=0;n<e.length;n++)-1===t.indexOf(e[n])&&t.push(e[n]);return t}function r(e){var t=new Set;return e.filter(function(e){return!t.has(e)&&(t.add(e),!0)})}function i(e){var t=[];return new Set(e).forEach(function(e){t.push(e)}),t}"Set"in t?"function"==typeof Set.prototype.forEach&&function(){var e=!1;return new Set([!0]).forEach(function(t){e=t}),!0===e}()?e.exports=i:e.exports=r:e.exports=n}).call(t,n(17))},function(e,t,n){var r,i;!function(n,o){r=[],void 0!==(i=function(){return n.Autolinker=o()}.apply(t,r))&&(e.exports=i)}(this,function(){/*!
-+ * Autolinker.js
-+ * 0.15.3
-+ *
-+ * Copyright(c) 2015 Gregory Jacobs <greg@greg-jacobs.com>
-+ * MIT Licensed. http://www.opensource.org/licenses/mit-license.php
-+ *
-+ * https://github.com/gregjacobs/Autolinker.js
-+ */
-+var e=function(t){e.Util.assign(this,t)};return e.prototype={constructor:e,urls:!0,email:!0,twitter:!0,newWindow:!0,stripPrefix:!0,truncate:void 0,className:"",htmlParser:void 0,matchParser:void 0,tagBuilder:void 0,link:function(e){for(var t=this.getHtmlParser(),n=t.parse(e),r=0,i=[],o=0,a=n.length;o<a;o++){var s=n[o],u=s.getType(),l=s.getText();if("element"===u)"a"===s.getTagName()&&(s.isClosing()?r=Math.max(r-1,0):r++),i.push(l);else if("entity"===u)i.push(l);else if(0===r){var c=this.linkifyStr(l);i.push(c)}else i.push(l)}return i.join("")},linkifyStr:function(e){return this.getMatchParser().replace(e,this.createMatchReturnVal,this)},createMatchReturnVal:function(t){var n;return this.replaceFn&&(n=this.replaceFn.call(this,this,t)),"string"==typeof n?n:!1===n?t.getMatchedText():n instanceof e.HtmlTag?n.toString():this.getTagBuilder().build(t).toString()},getHtmlParser:function(){var t=this.htmlParser;return t||(t=this.htmlParser=new e.htmlParser.HtmlParser),t},getMatchParser:function(){var t=this.matchParser;return t||(t=this.matchParser=new e.matchParser.MatchParser({urls:this.urls,email:this.email,twitter:this.twitter,stripPrefix:this.stripPrefix})),t},getTagBuilder:function(){var t=this.tagBuilder;return t||(t=this.tagBuilder=new e.AnchorTagBuilder({newWindow:this.newWindow,truncate:this.truncate,className:this.className})),t}},e.link=function(t,n){return new e(n).link(t)},e.match={},e.htmlParser={},e.matchParser={},e.Util={abstractMethod:function(){throw"abstract"},assign:function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e},extend:function(t,n){var r=t.prototype,i=function(){};i.prototype=r;var o;o=n.hasOwnProperty("constructor")?n.constructor:function(){r.constructor.apply(this,arguments)};var a=o.prototype=new i;return a.constructor=o,a.superclass=r,delete n.constructor,e.Util.assign(a,n),o},ellipsis:function(e,t,n){return e.length>t&&(n=null==n?"..":n,e=e.substring(0,t-n.length)+n),e},indexOf:function(e,t){if(Array.prototype.indexOf)return e.indexOf(t);for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},splitAndCapture:function(e,t){if(!t.global)throw new Error("`splitRegex` must have the 'g' flag set");for(var n,r=[],i=0;n=t.exec(e);)r.push(e.substring(i,n.index)),r.push(n[0]),i=n.index+n[0].length;return r.push(e.substring(i)),r}},e.HtmlTag=e.Util.extend(Object,{whitespaceRegex:/\s+/,constructor:function(t){e.Util.assign(this,t),this.innerHtml=this.innerHtml||this.innerHTML},setTagName:function(e){return this.tagName=e,this},getTagName:function(){return this.tagName||""},setAttr:function(e,t){return this.getAttrs()[e]=t,this},getAttr:function(e){return this.getAttrs()[e]},setAttrs:function(t){var n=this.getAttrs();return e.Util.assign(n,t),this},getAttrs:function(){return this.attrs||(this.attrs={})},setClass:function(e){return this.setAttr("class",e)},addClass:function(t){for(var n,r=this.getClass(),i=this.whitespaceRegex,o=e.Util.indexOf,a=r?r.split(i):[],s=t.split(i);n=s.shift();)-1===o(a,n)&&a.push(n);return this.getAttrs().class=a.join(" "),this},removeClass:function(t){for(var n,r=this.getClass(),i=this.whitespaceRegex,o=e.Util.indexOf,a=r?r.split(i):[],s=t.split(i);a.length&&(n=s.shift());){var u=o(a,n);-1!==u&&a.splice(u,1)}return this.getAttrs().class=a.join(" "),this},getClass:function(){return this.getAttrs().class||""},hasClass:function(e){return-1!==(" "+this.getClass()+" ").indexOf(" "+e+" ")},setInnerHtml:function(e){return this.innerHtml=e,this},getInnerHtml:function(){return this.innerHtml||""},toString:function(){var e=this.getTagName(),t=this.buildAttrsStr();return t=t?" "+t:"",["<",e,t,">",this.getInnerHtml(),"</",e,">"].join("")},buildAttrsStr:function(){if(!this.attrs)return"";var e=this.getAttrs(),t=[];for(var n in e)e.hasOwnProperty(n)&&t.push(n+'="'+e[n]+'"');return t.join(" ")}}),e.AnchorTagBuilder=e.Util.extend(Object,{constructor:function(t){e.Util.assign(this,t)},build:function(t){return new e.HtmlTag({tagName:"a",attrs:this.createAttrs(t.getType(),t.getAnchorHref()),innerHtml:this.processAnchorText(t.getAnchorText())})},createAttrs:function(e,t){var n={href:t},r=this.createCssClass(e);return r&&(n.class=r),this.newWindow&&(n.target="_blank"),n},createCssClass:function(e){var t=this.className;return t?t+" "+t+"-"+e:""},processAnchorText:function(e){return e=this.doTruncate(e)},doTruncate:function(t){return e.Util.ellipsis(t,this.truncate||Number.POSITIVE_INFINITY)}}),e.htmlParser.HtmlParser=e.Util.extend(Object,{htmlRegex:function(){var e=/[0-9a-zA-Z][0-9a-zA-Z:]*/,t=/[^\s\0"'>\/=\x01-\x1F\x7F]+/,n=/(?:"[^"]*?"|'[^']*?'|[^'"=<>`\s]+)/,r=t.source+"(?:\\s*=\\s*"+n.source+")?";return new RegExp(["(?:","<(!DOCTYPE)","(?:","\\s+","(?:",r,"|",n.source+")",")*",">",")","|","(?:","<(/)?","("+e.source+")","(?:","\\s+",r,")*","\\s*/?",">",")"].join(""),"gi")}(),htmlCharacterEntitiesRegex:/(&nbsp;|&#160;|&lt;|&#60;|&gt;|&#62;|&quot;|&#34;|&#39;)/gi,parse:function(e){for(var t,n,r=this.htmlRegex,i=0,o=[];null!==(t=r.exec(e));){var a=t[0],s=t[1]||t[3],u=!!t[2],l=e.substring(i,t.index);l&&(n=this.parseTextAndEntityNodes(l),o.push.apply(o,n)),o.push(this.createElementNode(a,s,u)),i=t.index+a.length}if(i<e.length){var c=e.substring(i);c&&(n=this.parseTextAndEntityNodes(c),o.push.apply(o,n))}return o},parseTextAndEntityNodes:function(t){for(var n=[],r=e.Util.splitAndCapture(t,this.htmlCharacterEntitiesRegex),i=0,o=r.length;i<o;i+=2){var a=r[i],s=r[i+1];a&&n.push(this.createTextNode(a)),s&&n.push(this.createEntityNode(s))}return n},createElementNode:function(t,n,r){return new e.htmlParser.ElementNode({text:t,tagName:n.toLowerCase(),closing:r})},createEntityNode:function(t){return new e.htmlParser.EntityNode({text:t})},createTextNode:function(t){return new e.htmlParser.TextNode({text:t})}}),e.htmlParser.HtmlNode=e.Util.extend(Object,{text:"",constructor:function(t){e.Util.assign(this,t)},getType:e.Util.abstractMethod,getText:function(){return this.text}}),e.htmlParser.ElementNode=e.Util.extend(e.htmlParser.HtmlNode,{tagName:"",closing:!1,getType:function(){return"element"},getTagName:function(){return this.tagName},isClosing:function(){return this.closing}}),e.htmlParser.EntityNode=e.Util.extend(e.htmlParser.HtmlNode,{getType:function(){return"entity"}}),e.htmlParser.TextNode=e.Util.extend(e.htmlParser.HtmlNode,{getType:function(){return"text"}}),e.matchParser.MatchParser=e.Util.extend(Object,{urls:!0,email:!0,twitter:!0,stripPrefix:!0,matcherRegex:function(){var e=/(^|[^\w])@(\w{1,15})/,t=/(?:[\-;:&=\+\$,\w\.]+@)/,n=/(?:[A-Za-z][-.+A-Za-z0-9]+:(?![A-Za-z][-.+A-Za-z0-9]+:\/\/)(?!\d+\/?)(?:\/\/)?)/,r=/(?:www\.)/,i=/[A-Za-z0-9\.\-]*[A-Za-z0-9\-]/,o=/\.(?:international|construction|contractors|enterprises|photography|productions|foundation|immobilien|industries|management|properties|technology|christmas|community|directory|education|equipment|institute|marketing|solutions|vacations|bargains|boutique|builders|catering|cleaning|clothing|computer|democrat|diamonds|graphics|holdings|lighting|partners|plumbing|supplies|training|ventures|academy|careers|company|cruises|domains|exposed|flights|florist|gallery|guitars|holiday|kitchen|neustar|okinawa|recipes|rentals|reviews|shiksha|singles|support|systems|agency|berlin|camera|center|coffee|condos|dating|estate|events|expert|futbol|kaufen|luxury|maison|monash|museum|nagoya|photos|repair|report|social|supply|tattoo|tienda|travel|viajes|villas|vision|voting|voyage|actor|build|cards|cheap|codes|dance|email|glass|house|mango|ninja|parts|photo|shoes|solar|today|tokyo|tools|watch|works|aero|arpa|asia|best|bike|blue|buzz|camp|club|cool|coop|farm|fish|gift|guru|info|jobs|kiwi|kred|land|limo|link|menu|mobi|moda|name|pics|pink|post|qpon|rich|ruhr|sexy|tips|vote|voto|wang|wien|wiki|zone|bar|bid|biz|cab|cat|ceo|com|edu|gov|int|kim|mil|net|onl|org|pro|pub|red|tel|uno|wed|xxx|xyz|ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cu|cv|cw|cx|cy|cz|de|dj|dk|dm|do|dz|ec|ee|eg|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sx|sy|sz|tc|td|tf|tg|th|tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|za|zm|zw)\b/,a=/[\-A-Za-z0-9+&@#\/%=~_()|'$*\[\]?!:,.;]*[\-A-Za-z0-9+&@#\/%=~_()|'$*\[\]]/;return new RegExp(["(",e.source,")","|","(",t.source,i.source,o.source,")","|","(","(?:","(",n.source,i.source,")","|","(?:","(.?//)?",r.source,i.source,")","|","(?:","(.?//)?",i.source,o.source,")",")","(?:"+a.source+")?",")"].join(""),"gi")}(),charBeforeProtocolRelMatchRegex:/^(.)?\/\//,constructor:function(t){e.Util.assign(this,t),this.matchValidator=new e.MatchValidator},replace:function(e,t,n){var r=this;return e.replace(this.matcherRegex,function(e,i,o,a,s,u,l,c,p){var f=r.processCandidateMatch(e,i,o,a,s,u,l,c,p);if(f){var h=t.call(n,f.match);return f.prefixStr+h+f.suffixStr}return e})},processCandidateMatch:function(t,n,r,i,o,a,s,u,l){var c,p=u||l,f="",h="";if(n&&!this.twitter||o&&!this.email||a&&!this.urls||!this.matchValidator.isValidMatch(a,s,p))return null;if(this.matchHasUnbalancedClosingParen(t)&&(t=t.substr(0,t.length-1),h=")"),o)c=new e.match.Email({matchedText:t,email:o});else if(n)r&&(f=r,t=t.slice(1)),c=new e.match.Twitter({matchedText:t,twitterHandle:i});else{if(p){var d=p.match(this.charBeforeProtocolRelMatchRegex)[1]||"";d&&(f=d,t=t.slice(1))}c=new e.match.Url({matchedText:t,url:t,protocolUrlMatch:!!s,protocolRelativeMatch:!!p,stripPrefix:this.stripPrefix})}return{prefixStr:f,suffixStr:h,match:c}},matchHasUnbalancedClosingParen:function(e){if(")"===e.charAt(e.length-1)){var t=e.match(/\(/g),n=e.match(/\)/g);if((t&&t.length||0)<(n&&n.length||0))return!0}return!1}}),e.MatchValidator=e.Util.extend(Object,{invalidProtocolRelMatchRegex:/^[\w]\/\//,hasFullProtocolRegex:/^[A-Za-z][-.+A-Za-z0-9]+:\/\//,uriSchemeRegex:/^[A-Za-z][-.+A-Za-z0-9]+:/,hasWordCharAfterProtocolRegex:/:[^\s]*?[A-Za-z]/,isValidMatch:function(e,t,n){return!(t&&!this.isValidUriScheme(t)||this.urlMatchDoesNotHaveProtocolOrDot(e,t)||this.urlMatchDoesNotHaveAtLeastOneWordChar(e,t)||this.isInvalidProtocolRelativeMatch(n))},isValidUriScheme:function(e){var t=e.match(this.uriSchemeRegex)[0].toLowerCase();return"javascript:"!==t&&"vbscript:"!==t},urlMatchDoesNotHaveProtocolOrDot:function(e,t){return!(!e||t&&this.hasFullProtocolRegex.test(t)||-1!==e.indexOf("."))},urlMatchDoesNotHaveAtLeastOneWordChar:function(e,t){return!(!e||!t)&&!this.hasWordCharAfterProtocolRegex.test(e)},isInvalidProtocolRelativeMatch:function(e){return!!e&&this.invalidProtocolRelMatchRegex.test(e)}}),e.match.Match=e.Util.extend(Object,{constructor:function(t){e.Util.assign(this,t)},getType:e.Util.abstractMethod,getMatchedText:function(){return this.matchedText},getAnchorHref:e.Util.abstractMethod,getAnchorText:e.Util.abstractMethod}),e.match.Email=e.Util.extend(e.match.Match,{getType:function(){return"email"},getEmail:function(){return this.email},getAnchorHref:function(){return"mailto:"+this.email},getAnchorText:function(){return this.email}}),e.match.Twitter=e.Util.extend(e.match.Match,{getType:function(){return"twitter"},getTwitterHandle:function(){return this.twitterHandle},getAnchorHref:function(){return"https://twitter.com/"+this.twitterHandle},getAnchorText:function(){return"@"+this.twitterHandle}}),e.match.Url=e.Util.extend(e.match.Match,{urlPrefixRegex:/^(https?:\/\/)?(www\.)?/i,protocolRelativeRegex:/^\/\//,protocolPrepended:!1,getType:function(){return"url"},getUrl:function(){var e=this.url;return this.protocolRelativeMatch||this.protocolUrlMatch||this.protocolPrepended||(e=this.url="http://"+e,this.protocolPrepended=!0),e},getAnchorHref:function(){return this.getUrl().replace(/&amp;/g,"&")},getAnchorText:function(){var e=this.getUrl();return this.protocolRelativeMatch&&(e=this.stripProtocolRelativePrefix(e)),this.stripPrefix&&(e=this.stripUrlPrefix(e)),e=this.removeTrailingSlash(e)},stripUrlPrefix:function(e){return e.replace(this.urlPrefixRegex,"")},stripProtocolRelativePrefix:function(e){return e.replace(this.protocolRelativeRegex,"")},removeTrailingSlash:function(e){return"/"===e.charAt(e.length-1)&&(e=e.slice(0,-1)),e}}),e})},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"getLayout",value:function(){var e=this.props,t=e.getComponent,n=e.layoutSelectors,r=n.current(),i=t(r,!0);return i||function(){return m.default.createElement("h1",null,' No layout defined for "',r,'" ')}}},{key:"render",value:function(){var e=this.getLayout();return m.default.createElement(e,null)}}]),t}(m.default.Component);t.default=y,y.propTypes={getComponent:g.default.func.isRequired,layoutSelectors:g.default.object.isRequired},y.defaultProps={}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(18),s=r(a),u=n(4),l=r(u),c=n(2),p=r(c),f=n(3),h=r(f),d=n(6),m=r(d),v=n(5),g=r(v),y=n(0),_=r(y),b=n(1),x=r(b),w=n(12),k=r(w),E={color:"#999",fontStyle:"italic"},S=function(e){function t(){return(0,p.default)(this,t),(0,m.default)(this,(t.__proto__||(0,l.default)(t)).apply(this,arguments))}return(0,g.default)(t,e),(0,h.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.getConfigs,r=e.schema,i=e.depth,a=e.expandDepth,u=e.name,l=e.specPath,c=r.get("description"),p=r.get("items"),f=r.get("title")||u,h=r.filter(function(e,t){return-1===["type","items","description","$$ref"].indexOf(t)}),d=t("Markdown"),m=t("ModelCollapse"),v=t("Model"),g=t("Property"),y=f&&_.default.createElement("span",{className:"model-title"},_.default.createElement("span",{className:"model-title__text"},f));return _.default.createElement("span",{className:"model"},_.default.createElement(m,{title:y,expanded:i<=a,collapsedContent:"[...]"},"[",h.size?h.entrySeq().map(function(e){var t=(0,s.default)(e,2),n=t[0],r=t[1];return _.default.createElement(g,{key:n+"-"+r,propKey:n,propVal:r,propStyle:E})}):null,c?_.default.createElement(d,{source:c}):null,_.default.createElement("span",null,_.default.createElement(v,(0,o.default)({},this.props,{getConfigs:n,specPath:l.push("items"),name:null,schema:p,required:!1,depth:i+1}))),"]"))}}]),t}(y.Component);S.propTypes={schema:x.default.object.isRequired,getComponent:x.default.func.isRequired,getConfigs:x.default.func.isRequired,specSelectors:x.default.object.isRequired,name:x.default.string,required:x.default.bool,expandDepth:x.default.number,specPath:k.default.list.isRequired,depth:x.default.number},t.default=S},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(30),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=function(e){function t(e,n){(0,l.default)(this,t);var r=(0,h.default)(this,(t.__proto__||(0,s.default)(t)).call(this,e,n));x.call(r);var i=r.props,o=i.name,a=i.schema,u=r.getValue();return r.state={name:o,schema:a,value:u},r}return(0,m.default)(t,e),(0,p.default)(t,[{key:"getValue",value:function(){var e=this.props,t=e.name,n=e.authorized;return n&&n.getIn([t,"value"])}},{key:"render",value:function(){var e=this.props,t=e.schema,n=e.getComponent,r=e.errSelectors,i=e.name,o=n("Input"),a=n("Row"),s=n("Col"),u=n("authError"),l=n("Markdown"),c=n("JumpToPath",!0),p=this.getValue(),f=r.allErrors().filter(function(e){return e.get("authId")===i});return g.default.createElement("div",null,g.default.createElement("h4",null,g.default.createElement("code",null,i||t.get("name")),"  (apiKey)",g.default.createElement(c,{path:["securityDefinitions",i]})),p&&g.default.createElement("h6",null,"Authorized"),g.default.createElement(a,null,g.default.createElement(l,{source:t.get("description")})),g.default.createElement(a,null,g.default.createElement("p",null,"Name: ",g.default.createElement("code",null,t.get("name")))),g.default.createElement(a,null,g.default.createElement("p",null,"In: ",g.default.createElement("code",null,t.get("in")))),g.default.createElement(a,null,g.default.createElement("label",null,"Value:"),p?g.default.createElement("code",null," ****** "):g.default.createElement(s,null,g.default.createElement(o,{type:"text",onChange:this.onChange}))),f.valueSeq().map(function(e,t){return g.default.createElement(u,{error:e,key:t})}))}}]),t}(g.default.Component);b.propTypes={authorized:_.default.object,getComponent:_.default.func.isRequired,errSelectors:_.default.object.isRequired,schema:_.default.object.isRequired,name:_.default.string.isRequired,onChange:_.default.func};var x=function(){var e=this;this.onChange=function(t){var n=e.props.onChange,r=t.target.value,i=(0,o.default)({},e.state,{value:r});e.setState(i),n(i)}};t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.schema,n=e.name,r=e.getComponent,i=e.onAuthChange,o=e.authorized,a=e.errSelectors,s=r("apiKeyAuth"),u=r("basicAuth"),l=void 0,c=t.get("type");switch(c){case"apiKey":l=m.default.createElement(s,{key:n,schema:t,name:n,errSelectors:a,authorized:o,getComponent:r,onChange:i});break;case"basic":l=m.default.createElement(u,{key:n,schema:t,name:n,errSelectors:a,authorized:o,getComponent:r,onChange:i});break;default:l=m.default.createElement("div",{key:n},"Unknown security definition type ",c)}return m.default.createElement("div",{key:n+"-jump"},l)}}]),t}(m.default.Component);b.propTypes={schema:_.default.orderedMap.isRequired,name:g.default.string.isRequired,onAuthChange:g.default.func.isRequired,authorized:_.default.orderedMap.isRequired},b.propTypes={errSelectors:g.default.object.isRequired,getComponent:g.default.func.isRequired,authSelectors:g.default.object.isRequired,specSelectors:g.default.object.isRequired,authActions:g.default.object.isRequired,definitions:_.default.iterable.isRequired},t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.close=function(){r.props.authActions.showDefinitions(!1)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.authSelectors,n=e.authActions,r=e.getComponent,i=e.errSelectors,o=e.specSelectors,a=e.fn.AST,s=t.shownDefinitions(),u=r("auths");return m.default.createElement("div",{className:"dialog-ux"},m.default.createElement("div",{className:"backdrop-ux"}),m.default.createElement("div",{className:"modal-ux"},m.default.createElement("div",{className:"modal-dialog-ux"},m.default.createElement("div",{className:"modal-ux-inner"},m.default.createElement("div",{className:"modal-ux-header"},m.default.createElement("h3",null,"Available authorizations"),m.default.createElement("button",{type:"button",className:"close-modal",onClick:this.close},m.default.createElement("svg",{width:"20",height:"20"},m.default.createElement("use",{href:"#close",xlinkHref:"#close"})))),m.default.createElement("div",{className:"modal-ux-content"},s.valueSeq().map(function(e,s){return m.default.createElement(u,{key:s,AST:a,definitions:e,getComponent:r,errSelectors:i,authSelectors:t,authActions:n,specSelectors:o})}))))))}}]),t}(m.default.Component);y.propTypes={fn:g.default.object.isRequired,getComponent:g.default.func.isRequired,authSelectors:g.default.object.isRequired,specSelectors:g.default.object.isRequired,errSelectors:g.default.object.isRequired,authActions:g.default.object.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onClick=function(){var e=r.props,t=e.authActions,n=e.authSelectors,i=n.definitionsToAuthorize();t.showDefinitions(i)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.authSelectors,n=e.getComponent,r=n("authorizationPopup",!0),i=!!t.shownDefinitions(),o=!!t.authorized().size;return m.default.createElement("div",{className:"auth-wrapper"},m.default.createElement("button",{className:o?"btn authorize locked":"btn authorize unlocked",onClick:this.onClick},m.default.createElement("span",null,"Authorize"),m.default.createElement("svg",{width:"20",height:"20"},m.default.createElement("use",{href:o?"#locked":"#unlocked",xlinkHref:o?"#locked":"#unlocked"}))),i&&m.default.createElement(r,null))}}]),t}(m.default.Component);y.propTypes={className:g.default.string},y.propTypes={getComponent:g.default.func.isRequired,authSelectors:g.default.object.isRequired,errActions:g.default.object.isRequired,authActions:g.default.object.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onClick=function(e){e.stopPropagation();var t=r.props.onClick;t&&t()},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props.isAuthorized;return m.default.createElement("button",{className:e?"authorization__btn locked":"authorization__btn unlocked","aria-label":e?"authorization button locked":"authorization button unlocked",onClick:this.onClick},m.default.createElement("svg",{width:"20",height:"20"},m.default.createElement("use",{href:e?"#locked":"#unlocked",xlinkHref:e?"#locked":"#unlocked"})))}}]),t}(m.default.Component);y.propTypes={isAuthorized:g.default.bool.isRequired,onClick:g.default.func},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(36),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(12),x=r(b),w=function(e){function t(e,n){(0,l.default)(this,t);var r=(0,h.default)(this,(t.__proto__||(0,s.default)(t)).call(this,e,n));return r.onAuthChange=function(e){var t=e.name;r.setState((0,o.default)({},t,e))},r.submitAuth=function(e){e.preventDefault(),r.props.authActions.authorize(r.state)},r.logoutClick=function(e){e.preventDefault();var t=r.props,n=t.authActions,i=t.definitions,o=i.map(function(e,t){return t}).toArray();n.logout(o)},r.close=function(e){e.preventDefault(),r.props.authActions.showDefinitions(!1)},r.state={},r}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this,t=this.props,n=t.definitions,r=t.getComponent,i=t.authSelectors,o=t.errSelectors,a=r("AuthItem"),s=r("oauth2",!0),u=r("Button"),l=i.authorized(),c=n.filter(function(e,t){return!!l.get(t)}),p=n.filter(function(e){return"oauth2"!==e.get("type")}),f=n.filter(function(e){return"oauth2"===e.get("type")});return g.default.createElement("div",{className:"auth-container"},!!p.size&&g.default.createElement("form",{onSubmit:this.submitAuth},p.map(function(t,n){return g.default.createElement(a,{key:n,schema:t,name:n,getComponent:r,onAuthChange:e.onAuthChange,authorized:l,errSelectors:o})}).toArray(),g.default.createElement("div",{className:"auth-btn-wrapper"},g.default.createElement(u,{className:"btn modal-btn auth btn-done",onClick:this.close},"Done"),p.size===c.size?g.default.createElement(u,{className:"btn modal-btn auth",onClick:this.logoutClick},"Logout"):g.default.createElement(u,{type:"submit",className:"btn modal-btn auth authorize"},"Authorize"))),f&&f.size?g.default.createElement("div",null,g.default.createElement("div",{className:"scope-def"},g.default.createElement("p",null,"Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes."),g.default.createElement("p",null,"API requires the following scopes. Select which ones you want to grant to Swagger UI.")),n.filter(function(e){return"oauth2"===e.get("type")}).map(function(e,t){return g.default.createElement("div",{key:t},g.default.createElement(s,{authorized:l,schema:e,name:t}))}).toArray()):null)}}]),t}(g.default.Component);w.propTypes={definitions:_.default.object.isRequired,getComponent:_.default.func.isRequired,authSelectors:_.default.object.isRequired,authActions:_.default.object.isRequired,specSelectors:_.default.object.isRequired},w.propTypes={errSelectors:_.default.object.isRequired,getComponent:_.default.func.isRequired,authSelectors:_.default.object.isRequired,specSelectors:_.default.object.isRequired,authActions:_.default.object.isRequired,definitions:x.default.iterable.isRequired},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));x.call(r);var i=r.props,a=i.schema,u=i.name,l=r.getValue(),c=l.username;return r.state={name:u,schema:a,value:c?{username:c}:{}},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"getValue",value:function(){var e=this.props,t=e.authorized,n=e.name;return t&&t.getIn([n,"value"])||{}}},{key:"render",value:function(){var e=this.props,t=e.schema,n=e.getComponent,r=e.name,i=e.errSelectors,o=n("Input"),a=n("Row"),s=n("Col"),u=n("authError"),l=n("JumpToPath",!0),c=n("Markdown"),p=this.getValue().username,f=i.allErrors().filter(function(e){return e.get("authId")===r});return m.default.createElement("div",null,m.default.createElement("h4",null,"Basic authorization",m.default.createElement(l,{path:["securityDefinitions",r]})),p&&m.default.createElement("h6",null,"Authorized"),m.default.createElement(a,null,m.default.createElement(c,{source:t.get("description")})),m.default.createElement(a,null,m.default.createElement("label",null,"Username:"),p?m.default.createElement("code",null," ",p," "):m.default.createElement(s,null,m.default.createElement(o,{type:"text",required:"required",name:"username",onChange:this.onChange}))),m.default.createElement(a,null,m.default.createElement("label",null,"Password:"),p?m.default.createElement("code",null," ****** "):m.default.createElement(s,null,m.default.createElement(o,{required:"required",autoComplete:"new-password",name:"password",type:"password",onChange:this.onChange}))),f.valueSeq().map(function(e,t){return m.default.createElement(u,{error:e,key:t})}))}}]),t}(m.default.Component);b.propTypes={authorized:g.default.object,getComponent:g.default.func.isRequired,schema:g.default.object.isRequired,onChange:g.default.func.isRequired},b.propTypes={name:g.default.string.isRequired,errSelectors:g.default.object.isRequired,getComponent:g.default.func.isRequired,onChange:g.default.func,schema:_.default.map,authorized:_.default.map};var x=function(){var e=this;this.onChange=function(t){var n=e.props.onChange,r=t.target,i=r.value,o=r.name,a=e.state.value;a[o]=i,e.setState({value:a}),n(e.state)}};t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props.error,t=e.get("level"),n=e.get("message"),r=e.get("source");return m.default.createElement("div",{className:"errors",style:{backgroundColor:"#ffeeee",color:"red",margin:"1em"}},m.default.createElement("b",{style:{textTransform:"capitalize",marginRight:"1em"}},r," ",t),m.default.createElement("span",null,n))}}]),t}(m.default.Component);y.propTypes={error:g.default.object.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(36),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(559),x=r(b),w=function(e){function t(e,n){(0,l.default)(this,t);var r=(0,h.default)(this,(t.__proto__||(0,s.default)(t)).call(this,e,n));k.call(r);var i=r.props,o=i.name,a=i.schema,u=i.authorized,c=i.authSelectors,p=u&&u.get(o),f=c.getConfigs()||{},d=p&&p.get("username")||"",m=p&&p.get("clientId")||f.clientId||"",v=p&&p.get("clientSecret")||f.clientSecret||"",g=p&&p.get("passwordType")||"request-body";return r.state={appName:f.appName,name:o,schema:a,scopes:[],clientId:m,clientSecret:v,username:d,password:"",passwordType:g},r}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this,t=this.props,n=t.schema,r=t.getComponent,i=t.authSelectors,o=t.errSelectors,a=t.name,s=t.specSelectors,u=r("Input"),l=r("Row"),c=r("Col"),p=r("Button"),f=r("authError"),h=r("JumpToPath",!0),d=r("Markdown"),m=s.isOAS3,v=m()?"authorizationCode":"accessCode",y=m()?"clientCredentials":"application",_=n.get("flow"),b=n.get("allowedScopes")||n.get("scopes"),x=i.authorized().get(a),w=!!x,k=o.allErrors().filter(function(e){return e.get("authId")===a}),E=!k.filter(function(e){return"validation"===e.get("source")}).size,S=n.get("description");return g.default.createElement("div",null,g.default.createElement("h4",null,a," (OAuth2, ",n.get("flow"),") ",g.default.createElement(h,{path:["securityDefinitions",a]})),this.state.appName?g.default.createElement("h5",null,"Application: ",this.state.appName," "):null,S&&g.default.createElement(d,{source:n.get("description")}),w&&g.default.createElement("h6",null,"Authorized"),("implicit"===_||_===v)&&g.default.createElement("p",null,"Authorization URL: ",g.default.createElement("code",null,n.get("authorizationUrl"))),("password"===_||_===v||_===y)&&g.default.createElement("p",null,"Token URL:",g.default.createElement("code",null," ",n.get("tokenUrl"))),g.default.createElement("p",{className:"flow"},"Flow: ",g.default.createElement("code",null,n.get("flow"))),"password"!==_?null:g.default.createElement(l,null,g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"oauth_username"},"username:"),w?g.default.createElement("code",null," ",this.state.username," "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("input",{id:"oauth_username",type:"text","data-name":"username",onChange:this.onInputChange}))),g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"oauth_password"},"password:"),w?g.default.createElement("code",null," ****** "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("input",{id:"oauth_password",type:"password","data-name":"password",onChange:this.onInputChange}))),g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"password_type"},"type:"),w?g.default.createElement("code",null," ",this.state.passwordType," "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("select",{id:"password_type","data-name":"passwordType",onChange:this.onInputChange},g.default.createElement("option",{value:"request-body"},"Request body"),g.default.createElement("option",{value:"basic"},"Basic auth"),g.default.createElement("option",{value:"query"},"Query parameters"))))),(_===y||"implicit"===_||_===v||"password"===_&&"basic"!==this.state.passwordType)&&(!w||w&&this.state.clientId)&&g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"client_id"},"client_id:"),w?g.default.createElement("code",null," ****** "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("input",{id:"client_id",type:"text",required:"password"===_,value:this.state.clientId,"data-name":"clientId",onChange:this.onInputChange}))),(_===y||_===v||"password"===_&&"basic"!==this.state.passwordType)&&g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"client_secret"},"client_secret:"),w?g.default.createElement("code",null," ****** "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("input",{id:"client_secret",value:this.state.clientSecret,type:"text","data-name":"clientSecret",onChange:this.onInputChange}))),!w&&b&&b.size?g.default.createElement("div",{className:"scopes"},g.default.createElement("h2",null,"Scopes:"),b.map(function(t,n){return g.default.createElement(l,{key:n},g.default.createElement("div",{className:"checkbox"},g.default.createElement(u,{"data-value":n,id:n+"-"+_+"-checkbox-"+e.state.name,disabled:w,type:"checkbox",onChange:e.onScopeChange}),g.default.createElement("label",{htmlFor:n+"-"+_+"-checkbox-"+e.state.name},g.default.createElement("span",{className:"item"}),g.default.createElement("div",{className:"text"},g.default.createElement("p",{className:"name"},n),g.default.createElement("p",{className:"description"},t)))))}).toArray()):null,k.valueSeq().map(function(e,t){return g.default.createElement(f,{error:e,key:t})}),g.default.createElement("div",{className:"auth-btn-wrapper"},E&&(w?g.default.createElement(p,{className:"btn modal-btn auth authorize",onClick:this.logout},"Logout"):g.default.createElement(p,{className:"btn modal-btn auth authorize",onClick:this.authorize},"Authorize"))))}}]),t}(g.default.Component);w.propTypes={name:_.default.string,authorized:_.default.object,getComponent:_.default.func.isRequired,schema:_.default.object.isRequired,authSelectors:_.default.object.isRequired,authActions:_.default.object.isRequired,errSelectors:_.default.object.isRequired,specSelectors:_.default.object.isRequired,errActions:_.default.object.isRequired,getConfigs:_.default.any};var k=function(){var e=this;this.authorize=function(){var t=e.props,n=t.authActions,r=t.errActions,i=t.getConfigs,o=t.authSelectors,a=i(),s=o.getConfigs();r.clear({authId:name,type:"auth",source:"auth"}),(0,x.default)({auth:e.state,authActions:n,errActions:r,configs:a,authConfigs:s})},this.onScopeChange=function(t){var n=t.target,r=n.checked,i=n.dataset.value;if(r&&-1===e.state.scopes.indexOf(i)){var o=e.state.scopes.concat([i]);e.setState({scopes:o})}else!r&&e.state.scopes.indexOf(i)>-1&&e.setState({scopes:e.state.scopes.filter(function(e){return e!==i})})},this.onInputChange=function(t){var n=t.target,r=n.dataset.name,i=n.value,a=(0,o.default)({},r,i);e.setState(a)},this.logout=function(t){t.preventDefault();var n=e.props,r=n.authActions,i=n.errActions,o=n.name;i.clear({authId:o,type:"auth",source:"auth"}),r.logout([o])}};t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onClick=function(){var e=r.props,t=e.specActions,n=e.path,i=e.method;t.clearResponse(n,i),t.clearRequest(n,i)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){return m.default.createElement("button",{className:"btn btn-clear opblock-control__btn",onClick:this.onClick},"Clear")}}]),t}(d.Component);y.propTypes={specActions:g.default.object.isRequired,path:g.default.string.isRequired,method:g.default.string.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=n(7),x=function(){},w=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onChangeWrapper=function(e){return r.props.onChange(e.target.value)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){this.props.contentTypes&&this.props.onChange(this.props.contentTypes.first())}},{key:"componentWillReceiveProps",value:function(e){e.contentTypes&&e.contentTypes.size&&(e.contentTypes.includes(e.value)||e.onChange(e.contentTypes.first()))}},{key:"render",value:function(){var e=this.props,t=e.contentTypes,n=e.className,r=e.value;return t&&t.size?m.default.createElement("div",{className:"content-type-wrapper "+(n||"")},m.default.createElement("select",{className:"content-type",value:r||"",onChange:this.onChangeWrapper},t.map(function(e){return m.default.createElement("option",{key:e,value:e},e)}).toArray())):null}}]),t}(m.default.Component);w.propTypes={contentTypes:g.default.oneOfType([_.default.list,_.default.set,_.default.seq]),value:g.default.string,onChange:g.default.func,className:g.default.string},w.defaultProps={onChange:x,value:null,contentTypes:(0,b.fromJS)(["application/json"])},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(557),_=r(y),b=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"handleFocus",value:function(e){e.target.select(),document.execCommand("copy")}},{key:"render",value:function(){var e=this.props.request,t=(0,_.default)(e);return m.default.createElement("div",null,m.default.createElement("h4",null,"Curl"),m.default.createElement("div",{className:"copy-paste"},m.default.createElement("textarea",{onFocus:this.handleFocus,readOnly:"true",className:"curl",style:{whiteSpace:"normal"},value:t})))}}]),t}(m.default.Component);b.propTypes={request:g.default.object.isRequired},t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.DeepLink=void 0;var i=n(0),o=r(i),a=n(1),s=r(a),u=t.DeepLink=function(e){var t=e.enabled,n=e.path,r=e.text;return o.default.createElement("a",{className:"nostyle",onClick:t?function(e){return e.preventDefault()}:null,href:t?"#/"+n:null},o.default.createElement("span",null,r))};u.propTypes={enabled:s.default.bool,isShown:s.default.bool,path:s.default.string,text:s.default.string},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(0),o=r(i),a=n(12),s=r(a),u=function(e){var t=e.value,n=e.getComponent,r=n("ModelCollapse"),i=o.default.createElement("span",null,"Array [ ",t.count()," ]");return o.default.createElement("span",{className:"prop-enum"},"Enum:",o.default.createElement("br",null),o.default.createElement(r,{collapsedContent:i},"[ ",t.join(", ")," ]"))};u.propTypes={value:s.default.iterable,getComponent:s.default.func},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){return(e||"").split(" ").map(function(e){return e[0].toUpperCase()+e.slice(1)}).join(" ")}Object.defineProperty(t,"__esModule",{value:!0});var o=n(4),a=r(o),s=n(2),u=r(s),l=n(3),c=r(l),p=n(6),f=r(p),h=n(5),d=r(h),m=n(0),v=r(m),g=n(1),y=r(g),_=n(7),b=n(448),x=function(e){function t(){return(0,u.default)(this,t),(0,f.default)(this,(t.__proto__||(0,a.default)(t)).apply(this,arguments))}return(0,d.default)(t,e),(0,c.default)(t,[{key:"render",value:function(){var e=this.props,t=e.editorActions,n=e.errSelectors,r=e.layoutSelectors,i=e.layoutActions;if(t&&t.jumpToLine)var o=t.jumpToLine;var a=n.allErrors(),s=a.filter(function(e){return"thrown"===e.get("type")||"error"===e.get("level")});if(!s||s.count()<1)return null;var u=r.isShown(["errorPane"],!0),l=function(){return i.show(["errorPane"],!u)},c=s.sortBy(function(e){return e.get("line")});return v.default.createElement("pre",{className:"errors-wrapper"},v.default.createElement("hgroup",{className:"error"},v.default.createElement("h4",{className:"errors__title"},"Errors"),v.default.createElement("button",{className:"btn errors__clear-btn",onClick:l},u?"Hide":"Show")),v.default.createElement(b.Collapse,{isOpened:u,animated:!0},v.default.createElement("div",{className:"errors"},c.map(function(e,t){var n=e.get("type");return"thrown"===n||"auth"===n?v.default.createElement(w,{key:t,error:e.get("error")||e,jumpToLine:o}):"spec"===n?v.default.createElement(k,{key:t,error:e,jumpToLine:o}):void 0}))))}}]),t}(v.default.Component);x.propTypes={editorActions:y.default.object,errSelectors:y.default.object.isRequired,layoutSelectors:y.default.object.isRequired,layoutActions:y.default.object.isRequired},t.default=x;var w=function(e){var t=e.error,n=e.jumpToLine;if(!t)return null;var r=t.get("line");return v.default.createElement("div",{className:"error-wrapper"},t?v.default.createElement("div",null,v.default.createElement("h4",null,t.get("source")&&t.get("level")?i(t.get("source"))+" "+t.get("level"):"",t.get("path")?v.default.createElement("small",null," at ",t.get("path")):null),v.default.createElement("span",{style:{whiteSpace:"pre-line",maxWidth:"100%"}},t.get("message")),v.default.createElement("div",{style:{"text-decoration":"underline",cursor:"pointer"}},r&&n?v.default.createElement("a",{onClick:n.bind(null,r)},"Jump to line ",r):null)):null)},k=function(e){var t=e.error,n=e.jumpToLine,r=null;return t.get("path")?r=_.List.isList(t.get("path"))?v.default.createElement("small",null,"at ",t.get("path").join(".")):v.default.createElement("small",null,"at ",t.get("path")):t.get("line")&&!n&&(r=v.default.createElement("small",null,"on line ",t.get("line"))),v.default.createElement("div",{className:"error-wrapper"},t?v.default.createElement("div",null,v.default.createElement("h4",null,i(t.get("source"))+" "+t.get("level")," ",r),v.default.createElement("span",{style:{whiteSpace:"pre-line"}},t.get("message")),v.default.createElement("div",{style:{"text-decoration":"underline",cursor:"pointer"}},n?v.default.createElement("a",{onClick:n.bind(null,t.get("line"))},"Jump to line ",t.get("line")):null)):null)};w.propTypes={error:y.default.object.isRequired,jumpToLine:y.default.func},w.defaultProps={jumpToLine:null},k.propTypes={error:y.default.object.isRequired,jumpToLine:y.default.func}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onClick=function(){var e=r.props,t=e.specSelectors,n=e.specActions,i=e.operation,o=e.path,a=e.method;n.validateParams([o,a]),t.validateBeforeExecute([o,a])&&(r.props.onExecute&&r.props.onExecute(),n.execute({operation:i,path:o,method:a}))},r.onChangeProducesWrapper=function(e){return r.props.specActions.changeProducesValue([r.props.path,r.props.method],e)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){return m.default.createElement("button",{className:"btn execute opblock-control__btn",onClick:this.onClick},"Execute")}}]),t}(d.Component);y.propTypes={specSelectors:g.default.object.isRequired,specActions:g.default.object.isRequired,operation:g.default.object.isRequired,path:g.default.string.isRequired,method:g.default.string.isRequired,onExecute:g.default.func},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){return m.default.createElement("div",{className:"footer"})}}]),t}(m.default.Component);t.default=v},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(18),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(7),x=r(b),w={color:"#999",fontStyle:"italic"},k=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.headers,n=e.getComponent,r=n("Property");return t&&t.size?g.default.createElement("div",{className:"headers-wrapper"},g.default.createElement("h4",{className:"headers__title"},"Headers:"),g.default.createElement("table",{className:"headers"},g.default.createElement("thead",null,g.default.createElement("tr",{className:"header-row"},g.default.createElement("th",{className:"header-col"},"Name"),g.default.createElement("th",{className:"header-col"},"Description"),g.default.createElement("th",{className:"header-col"},"Type"))),g.default.createElement("tbody",null,t.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],i=t[1];if(!x.default.Map.isMap(i))return null;var a=i.getIn(["schema"])?i.getIn(["schema","type"]):i.getIn(["type"]),s=i.getIn(["schema","example"]);return g.default.createElement("tr",{key:n},g.default.createElement("td",{className:"header-col"},n),g.default.createElement("td",{className:"header-col"},i.get("description")),g.default.createElement("td",{className:"header-col"},a," ",s?g.default.createElement(r,{propKey:"Example",propVal:s,propStyle:w}):null))}).toArray()))):null}}]),t}(g.default.Component);k.propTypes={headers:_.default.object.isRequired,getComponent:_.default.func.isRequired},t.default=k},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(9),_=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.initializeComponent=function(e){r.el=e},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){(0,y.highlight)(this.el)}},{key:"componentDidUpdate",value:function(){(0,y.highlight)(this.el)}},{key:"render",value:function(){var e=this.props,t=e.value,n=e.className;return n=n||"",m.default.createElement("pre",{ref:this.initializeComponent,className:n+" microlight"},t)}}]),t}(d.Component);_.propTypes={value:g.default.string.isRequired,className:g.default.string},t.default=_},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(7),_=n(12),b=r(_),x=n(9),w=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.host,n=e.basePath;return m.default.createElement("pre",{className:"base-url"},"[ Base URL: ",t,n," ]")}}]),t}(m.default.Component);w.propTypes={host:g.default.string,basePath:g.default.string};var k=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props.data,t=e.get("name")||"the developer",n=e.get("url"),r=e.get("email");return m.default.createElement("div",null,n&&m.default.createElement("div",null,m.default.createElement("a",{href:(0,x.sanitizeUrl)(n),target:"_blank"},t," - Website")),r&&m.default.createElement("a",{href:(0,x.sanitizeUrl)("mailto:"+r)},n?"Send email to "+t:"Contact "+t))}}]),t}(m.default.Component);k.propTypes={data:g.default.object};var E=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props.license,t=e.get("name")||"License",n=e.get("url");return m.default.createElement("div",null,n?m.default.createElement("a",{target:"_blank",href:(0,x.sanitizeUrl)(n)},t):m.default.createElement("span",null,t))}}]),t}(m.default.Component);E.propTypes={license:g.default.object};var S=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.info,n=e.url,r=e.host,i=e.basePath,o=e.getComponent,a=e.externalDocs,s=t.get("version"),u=t.get("description"),l=t.get("title"),c=t.get("termsOfService"),p=t.get("contact"),f=t.get("license"),h=(a||(0,y.fromJS)({})).toJS(),d=h.url,v=h.description,g=o("Markdown"),_=o("VersionStamp");return m.default.createElement("div",{className:"info"},m.default.createElement("hgroup",{className:"main"},m.default.createElement("h2",{className:"title"},l,s&&m.default.createElement(_,{version:s})),r||i?m.default.createElement(w,{host:r,basePath:i}):null,n&&m.default.createElement("a",{target:"_blank",href:(0,x.sanitizeUrl)(n)},m.default.createElement("span",{className:"url"}," ",n," "))),m.default.createElement("div",{className:"description"},m.default.createElement(g,{source:u})),c&&m.default.createElement("div",null,m.default.createElement("a",{target:"_blank",href:(0,x.sanitizeUrl)(c)},"Terms of service")),p&&p.size?m.default.createElement(k,{data:p}):null,f&&f.size?m.default.createElement(E,{license:f}):null,d?m.default.createElement("a",{target:"_blank",href:(0,x.sanitizeUrl)(d)},v||d):null)}}]),t}(m.default.Component);S.propTypes={info:g.default.object,url:g.default.string,host:g.default.string,basePath:g.default.string,externalDocs:b.default.map,getComponent:g.default.func.isRequired},t.default=S,S.propTypes={title:g.default.any,description:g.default.any,version:g.default.any,url:g.default.string}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onFilterChange=function(e){var t=e.target.value;r.props.layoutActions.updateFilter(t)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.specSelectors,n=e.specActions,r=e.getComponent,i=e.layoutSelectors,o=e.oas3Selectors,a=e.oas3Actions,s=t.info(),u=t.url(),l=t.basePath(),c=t.host(),p=t.securityDefinitions(),f=t.externalDocs(),h=t.schemes(),d=t.servers(),v=r("info"),g=r("operations",!0),y=r("Models",!0),_=r("authorizeBtn",!0),b=r("Row"),x=r("Col"),w=r("Servers"),k=r("errors",!0),E="loading"===t.loadingStatus(),S="failed"===t.loadingStatus(),C=i.currentFilter(),A={};S&&(A.color="red"),E&&(A.color="#aaa");var D=r("schemes");if(!t.specStr()){var O=void 0;return O=E?m.default.createElement("div",{className:"loading"}):m.default.createElement("h4",null,"No API definition provided."),m.default.createElement("div",{className:"swagger-ui"},m.default.createElement("div",{className:"loading-container"},O))}return m.default.createElement("div",{className:"swagger-ui"},m.default.createElement("div",null,m.default.createElement(k,null),m.default.createElement(b,{className:"information-container"},m.default.createElement(x,{mobile:12},s.count()?m.default.createElement(v,{info:s,url:u,host:c,basePath:l,externalDocs:f,getComponent:r}):null)),h&&h.size||p?m.default.createElement("div",{className:"scheme-container"},m.default.createElement(x,{className:"schemes wrapper",mobile:12},h&&h.size?m.default.createElement(D,{currentScheme:t.operationScheme(),schemes:h,specActions:n}):null,p?m.default.createElement(_,null):null)):null,d&&d.size?m.default.createElement("div",{className:"global-server-container"},m.default.createElement(x,{className:"servers wrapper",mobile:12},m.default.createElement("span",{className:"servers-title"},"Server"),m.default.createElement(w,{servers:d,currentServer:o.selectedServer(),setSelectedServer:a.setSelectedServer,setServerVariableValue:a.setServerVariableValue,getServerVariable:o.serverVariableValue,getEffectiveServerValue:o.serverEffectiveValue}))):null,null===C||!1===C?null:m.default.createElement("div",{className:"filter-container"},m.default.createElement(x,{className:"filter wrapper",mobile:12},m.default.createElement("input",{className:"operation-filter-input",placeholder:"Filter by tag",type:"text",onChange:this.onFilterChange,value:!0===C||"true"===C?"":C,disabled:E,style:A}))),m.default.createElement(b,null,m.default.createElement(x,{mobile:12,desktop:12},m.default.createElement(g,null))),m.default.createElement(b,null,m.default.createElement(x,{mobile:12,desktop:12},m.default.createElement(y,null)))))}}]),t}(m.default.Component);y.propTypes={errSelectors:g.default.object.isRequired,errActions:g.default.object.isRequired,specActions:g.default.object.isRequired,specSelectors:g.default.object.isRequired,oas3Selectors:g.default.object.isRequired,oas3Actions:g.default.object.isRequired,layoutSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,getComponent:g.default.func.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(47),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(12),x=r(b),w=n(7),k=function(e){var t=e.headers;return g.default.createElement("div",null,g.default.createElement("h5",null,"Response headers"),g.default.createElement("pre",null,t))};k.propTypes={headers:_.default.array.isRequired};var E=function(e){var t=e.duration;return g.default.createElement("div",null,g.default.createElement("h5",null,"Request duration"),g.default.createElement("pre",null,t," ms"))};E.propTypes={duration:_.default.number.isRequired};var S=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"shouldComponentUpdate",value:function(e){return this.props.response!==e.response||this.props.path!==e.path||this.props.method!==e.method||this.props.displayRequestDuration!==e.displayRequestDuration}},{key:"render",value:function(){var e=this.props,t=e.response,n=e.getComponent,r=e.getConfigs,i=e.displayRequestDuration,a=e.specSelectors,s=e.path,u=e.method,l=r(),c=l.showMutatedRequest,p=c?a.mutatedRequestFor(s,u):a.requestFor(s,u),f=t.get("status"),h=p.get("url"),d=t.get("headers").toJS(),m=t.get("notDocumented"),v=t.get("error"),y=t.get("text"),_=t.get("duration"),b=(0,o.default)(d),x=d["content-type"],w=n("curl"),S=n("responseBody"),C=b.map(function(e){return g.default.createElement("span",{className:"headerline",key:e}," ",e,": ",d[e]," ")}),A=0!==C.length;return g.default.createElement("div",null,p&&g.default.createElement(w,{request:p}),h&&g.default.createElement("div",null,g.default.createElement("h4",null,"Request URL"),g.default.createElement("div",{className:"request-url"},g.default.createElement("pre",null,h))),g.default.createElement("h4",null,"Server response"),g.default.createElement("table",{className:"responses-table"},g.default.createElement("thead",null,g.default.createElement("tr",{className:"responses-header"},g.default.createElement("td",{className:"col col_header response-col_status"},"Code"),g.default.createElement("td",{className:"col col_header response-col_description"},"Details"))),g.default.createElement("tbody",null,g.default.createElement("tr",{className:"response"},g.default.createElement("td",{className:"col response-col_status"},f,m?g.default.createElement("div",{className:"response-undocumented"},g.default.createElement("i",null," Undocumented ")):null),g.default.createElement("td",{className:"col response-col_description"},v?g.default.createElement("span",null,t.get("name")+": "+t.get("message")):null,y?g.default.createElement(S,{content:y,contentType:x,url:h,headers:d,getComponent:n}):null,A?g.default.createElement(k,{headers:C}):null,i&&_?g.default.createElement(E,{duration:_}):null)))))}}]),t}(g.default.Component);S.propTypes={response:_.default.instanceOf(w.Iterable).isRequired,path:_.default.string.isRequired,method:_.default.string.isRequired,displayRequestDuration:_.default.bool.isRequired,specSelectors:_.default.object.isRequired,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired},S.propTypes={getComponent:_.default.func.isRequired,response:x.default.map},t.default=S},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));r.toggleCollapsed=function(){r.props.onToggle&&r.props.onToggle(r.props.modelName,!r.state.expanded),r.setState({expanded:!r.state.expanded})};var i=r.props,a=i.expanded,u=i.collapsedContent;return r.state={expanded:a,collapsedContent:u||t.defaultProps.collapsedContent},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentWillReceiveProps",value:function(e){this.props.expanded!=e.expanded&&this.setState({expanded:e.expanded})}},{key:"render",value:function(){var e=this.props.title;return m.default.createElement("span",null,e&&m.default.createElement("span",{onClick:this.toggleCollapsed,style:{cursor:"pointer"}},e),m.default.createElement("span",{onClick:this.toggleCollapsed,style:{cursor:"pointer"}},m.default.createElement("span",{className:"model-toggle"+(this.state.expanded?"":" collapsed")})),this.state.expanded?this.props.children:this.state.collapsedContent)}}]),t}(d.Component);y.propTypes={collapsedContent:g.default.any,expanded:g.default.bool,children:g.default.any,title:g.default.element,modelName:g.default.string,onToggle:g.default.func},y.defaultProps={collapsedContent:"{...}",expanded:!1,title:null,onToggle:function(){}},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));r.activeTab=function(e){var t=e.target.dataset.name;r.setState({activeTab:t})};var i=r.props.getConfigs,a=i(),u=a.defaultModelRendering;return"example"!==u&&"model"!==u&&(u="example"),r.state={activeTab:u},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.specSelectors,r=e.schema,i=e.example,o=e.isExecute,a=e.getConfigs,s=e.specPath,u=a(),l=u.defaultModelExpandDepth,c=t("ModelWrapper");return m.default.createElement("div",null,m.default.createElement("ul",{className:"tab"},m.default.createElement("li",{className:"tabitem"+(o||"example"===this.state.activeTab?" active":"")},m.default.createElement("a",{className:"tablinks","data-name":"example",onClick:this.activeTab},"Example Value")),r?m.default.createElement("li",{className:"tabitem"+(o||"model"!==this.state.activeTab?"":" active")},m.default.createElement("a",{className:"tablinks"+(o?" inactive":""),"data-name":"model",onClick:this.activeTab},"Model")):null),m.default.createElement("div",null,(o||"example"===this.state.activeTab)&&i,!o&&"model"===this.state.activeTab&&m.default.createElement(c,{schema:r,getComponent:t,getConfigs:a,specSelectors:n,expandDepth:l,specPath:s})))}}]),t}(m.default.Component);b.propTypes={getComponent:g.default.func.isRequired,specSelectors:g.default.object.isRequired,schema:g.default.object.isRequired,example:g.default.any.isRequired,isExecute:g.default.bool,getConfigs:g.default.func.isRequired,specPath:_.default.list.isRequired},t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=function(e){function t(){var e,n,r,i;(0,l.default)(this,t);for(var o=arguments.length,a=Array(o),u=0;u<o;u++)a[u]=arguments[u];return n=r=(0,h.default)(this,(e=t.__proto__||(0,s.default)(t)).call.apply(e,[this].concat(a))),r.onToggle=function(e,t){r.props.layoutActions&&r.props.layoutActions.show(["models",e],t)},i=n,(0,h.default)(r,i)}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.getConfigs,r=t("Model"),i=void 0;return this.props.layoutSelectors&&(i=this.props.layoutSelectors.isShown(["models",this.props.name])),g.default.createElement("div",{className:"model-box"},g.default.createElement(r,(0,o.default)({},this.props,{getConfigs:n,expanded:i,depth:1,onToggle:this.onToggle,expandDepth:this.props.expandDepth||0})))}}]),t}(v.Component);b.propTypes={schema:_.default.object.isRequired,name:_.default.string,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired,specSelectors:_.default.object.isRequired,expandDepth:_.default.number,layoutActions:_.default.object,layoutSelectors:_.default.object.isRequired},t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(18),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(7),_=r(y),b=n(1),x=r(b),w=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.specSelectors,n=e.getComponent,r=e.layoutSelectors,i=e.layoutActions,a=e.getConfigs,s=t.definitions(),u=a(),l=u.docExpansion,c=u.defaultModelsExpandDepth;if(!s.size||c<0)return null;var p=r.isShown("models",c>0&&"none"!==l),f=t.isOAS3()?["components","schemas"]:["definitions"],h=n("ModelWrapper"),d=n("Collapse");return g.default.createElement("section",{className:p?"models is-open":"models"},g.default.createElement("h4",{onClick:function(){return i.show("models",!p)}},g.default.createElement("span",null,"Models"),g.default.createElement("svg",{width:"20",height:"20"},g.default.createElement("use",{xlinkHref:p?"#large-arrow-down":"#large-arrow"}))),g.default.createElement(d,{isOpened:p},s.entrySeq().map(function(e){var s=(0,o.default)(e,2),u=s[0],l=s[1];return g.default.createElement("div",{id:"model-"+u,className:"model-container",key:"models-section-"+u},g.default.createElement(h,{name:u,expandDepth:c,schema:l,specPath:_.default.List([].concat(f,[u])),getComponent:n,specSelectors:t,getConfigs:a,layoutSelectors:r,layoutActions:i}))}).toArray()))}}]),t}(v.Component);w.propTypes={getComponent:x.default.func,specSelectors:x.default.object,layoutSelectors:x.default.object,layoutActions:x.default.object,getConfigs:x.default.func.isRequired},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(35),o=r(i),a=n(21),s=r(a),u=n(18),l=r(u),c=n(96),p=r(c),f=n(4),h=r(f),d=n(2),m=r(d),v=n(3),g=r(v),y=n(6),_=r(y),b=n(5),x=r(b),w=n(0),k=r(w),E=n(1),S=r(E),C=n(7),A=n(12),D=r(A),O=function(e){function t(){return(0,m.default)(this,t),(0,_.default)(this,(t.__proto__||(0,h.default)(t)).apply(this,arguments))}return(0,x.default)(t,e),(0,g.default)(t,[{key:"render",value:function(){var e=this.props,t=e.schema,n=e.name,r=e.isRef,i=e.getComponent,a=e.getConfigs,u=e.depth,c=e.onToggle,f=e.expanded,h=e.specPath,d=(0,p.default)(e,["schema","name","isRef","getComponent","getConfigs","depth","onToggle","expanded","specPath"]),m=d.specSelectors,v=d.expandDepth,g=m.isOAS3;if(!t)return null;var y=a(),_=y.showExtensions,b=t.get("description"),x=t.get("properties"),w=t.get("additionalProperties"),E=t.get("title")||n,S=t.get("required"),A=i("JumpToPath",!0),D=i("Markdown"),O=i("Model"),M=i("ModelCollapse"),T=function(){return k.default.createElement("span",{className:"model-jump-to-path"},k.default.createElement(A,{specPath:h}))},P=k.default.createElement("span",null,k.default.createElement("span",null,"{"),"...",k.default.createElement("span",null,"}"),r?k.default.createElement(T,null):""),I=m.isOAS3()?t.get("anyOf"):null,R=m.isOAS3()?t.get("oneOf"):null,j=m.isOAS3()?t.get("not"):null,F=E&&k.default.createElement("span",{className:"model-title"},r&&t.get("$$ref")&&k.default.createElement("span",{className:"model-hint"},t.get("$$ref")),k.default.createElement("span",{className:"model-title__text"},E));return k.default.createElement("span",{className:"model"},k.default.createElement(M,{modelName:n,title:F,onToggle:c,expanded:!!f||u<=v,collapsedContent:P},k.default.createElement("span",{className:"brace-open object"},"{"),r?k.default.createElement(T,null):null,k.default.createElement("span",{className:"inner-object"},k.default.createElement("table",{className:"model"},k.default.createElement("tbody",null,b?k.default.createElement("tr",{style:{color:"#999",fontStyle:"italic"}},k.default.createElement("td",null,"description:"),k.default.createElement("td",null,k.default.createElement(D,{source:b}))):null,x&&x.size?x.entrySeq().map(function(e){var t=(0,l.default)(e,2),r=t[0],o=t[1],c=g()&&o.get("deprecated"),p=C.List.isList(S)&&S.contains(r),f={verticalAlign:"top",paddingRight:"0.2em"};return p&&(f.fontWeight="bold"),k.default.createElement("tr",{key:r,className:c&&"deprecated"},k.default.createElement("td",{style:f},r,p&&k.default.createElement("span",{style:{color:"red"}},"*")),k.default.createElement("td",{style:{verticalAlign:"top"}},k.default.createElement(O,(0,s.default)({key:"object-"+n+"-"+r+"_"+o},d,{required:p,getComponent:i,specPath:h.push("properties",r),getConfigs:a,schema:o,depth:u+1}))))}).toArray():null,_?k.default.createElement("tr",null," "):null,_?t.entrySeq().map(function(e){var t=(0,l.default)(e,2),n=t[0],r=t[1];if("x-"===n.slice(0,2)){var i=r?r.toJS?r.toJS():r:null;return k.default.createElement("tr",{key:n,style:{color:"#777"}},k.default.createElement("td",null,n),k.default.createElement("td",{style:{verticalAlign:"top"}},(0,o.default)(i)))}}).toArray():null,w&&w.size?k.default.createElement("tr",null,k.default.createElement("td",null,"< * >:"),k.default.createElement("td",null,k.default.createElement(O,(0,s.default)({},d,{required:!1,getComponent:i,specPath:h.push("additionalProperties"),getConfigs:a,schema:w,depth:u+1})))):null,I?k.default.createElement("tr",null,k.default.createElement("td",null,"anyOf ->"),k.default.createElement("td",null,I.map(function(e,t){return k.default.createElement("div",{key:t},k.default.createElement(O,(0,s.default)({},d,{required:!1,getComponent:i,specPath:h.push("anyOf",t),getConfigs:a,schema:e,depth:u+1})))}))):null,R?k.default.createElement("tr",null,k.default.createElement("td",null,"oneOf ->"),k.default.createElement("td",null,R.map(function(e,t){return k.default.createElement("div",{key:t},k.default.createElement(O,(0,s.default)({},d,{required:!1,getComponent:i,specPath:h.push("oneOf",t),getConfigs:a,schema:e,depth:u+1})))}))):null,j?k.default.createElement("tr",null,k.default.createElement("td",null,"not ->"),k.default.createElement("td",null,k.default.createElement("div",null,k.default.createElement(O,(0,s.default)({},d,{required:!1,getComponent:i,specPath:h.push("not"),getConfigs:a,schema:j,depth:u+1}))))):null))),k.default.createElement("span",{className:"brace-close"},"}")))}}]),t}(w.Component);O.propTypes={schema:S.default.object.isRequired,getComponent:S.default.func.isRequired,getConfigs:S.default.func.isRequired,expanded:S.default.bool,onToggle:S.default.func,specSelectors:S.default.object.isRequired,name:S.default.string,isRef:S.default.bool,expandDepth:S.default.number,depth:S.default.number,specPath:D.default.list.isRequired},t.default=O},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(47),o=r(i),a=n(48),s=r(a),u=n(4),l=r(u),c=n(2),p=r(c),f=n(3),h=r(f),d=n(6),m=r(d),v=n(5),g=r(v),y=n(0),_=r(y),b=n(1),x=r(b),w=n(9),k=function(e){function t(e,n){(0,p.default)(this,t);var r=(0,m.default)(this,(t.__proto__||(0,l.default)(t)).call(this,e,n)),i=e.specSelectors,o=e.getConfigs,a=o(),s=a.validatorUrl;return r.state={url:i.url(),validatorUrl:void 0===s?"https://online.swagger.io/validator":s},r}return(0,g.default)(t,e),(0,h.default)(t,[{key:"componentWillReceiveProps",value:function(e){var t=e.specSelectors,n=e.getConfigs,r=n(),i=r.validatorUrl;this.setState({url:t.url(),validatorUrl:void 0===i?"https://online.swagger.io/validator":i})}},{key:"render",value:function(){var e=this.props.getConfigs,t=e(),n=t.spec,r=(0,w.sanitizeUrl)(this.state.validatorUrl);return"object"===(void 0===n?"undefined":(0,s.default)(n))&&(0,o.default)(n).length?null:!this.state.url||!this.state.validatorUrl||this.state.url.indexOf("localhost")>=0||this.state.url.indexOf("127.0.0.1")>=0?null:_.default.createElement("span",{style:{float:"right"}},_.default.createElement("a",{target:"_blank",href:r+"/debug?url="+this.state.url},_.default.createElement(E,{src:r+"?url="+this.state.url,alt:"Online validator badge"})))}}]),t}(_.default.Component);k.propTypes={getComponent:x.default.func.isRequired,getConfigs:x.default.func.isRequired,specSelectors:x.default.object.isRequired},t.default=k;var E=function(e){function t(e){(0,p.default)(this,t);var n=(0,m.default)(this,(t.__proto__||(0,l.default)(t)).call(this,e));return n.state={loaded:!1,error:!1},n}return(0,g.default)(t,e),(0,h.default)(t,[{key:"componentDidMount",value:function(){var e=this,t=new Image;t.onload=function(){e.setState({loaded:!0})},t.onerror=function(){e.setState({error:!0})},t.src=this.props.src}},{key:"componentWillReceiveProps",value:function(e){var t=this;if(e.src!==this.props.src){var n=new Image;n.onload=function(){t.setState({loaded:!0})},n.onerror=function(){t.setState({error:!0})},n.src=e.src}}},{key:"render",value:function(){return this.state.error?_.default.createElement("img",{alt:"Error"}):this.state.loaded?_.default.createElement("img",{src:this.props.src,alt:this.props.alt}):_.default.createElement("img",{alt:"Loading..."})}}]),t}(_.default.Component);E.propTypes={src:x.default.string,alt:x.default.string}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.OperationExtRow=void 0;var i=n(35),o=r(i),a=n(0),s=r(a),u=n(1),l=r(u),c=t.OperationExtRow=function(e){var t=e.xKey,n=e.xVal,r=n?n.toJS?n.toJS():n:null;return s.default.createElement("tr",null,s.default.createElement("td",null,t),s.default.createElement("td",null,(0,o.default)(r)))};c.propTypes={xKey:l.default.string,xVal:l.default.any},t.default=c},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.OperationExt=void 0;var i=n(18),o=r(i),a=n(0),s=r(a),u=n(1),l=r(u),c=t.OperationExt=function(e){var t=e.extensions,n=e.getComponent,r=n("OperationExtRow");return s.default.createElement("div",{className:"opblock-section"},s.default.createElement("div",{className:"opblock-section-header"},s.default.createElement("h4",null,"Extensions")),s.default.createElement("div",{className:"table-container"},s.default.createElement("table",null,s.default.createElement("thead",null,s.default.createElement("tr",null,s.default.createElement("td",{className:"col col_header"},"Field"),s.default.createElement("td",{className:"col col_header"},"Value"))),s.default.createElement("tbody",null,t.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],i=t[1];return s.default.createElement(r,{key:n+"-"+i,xKey:n,xVal:i})})))))};c.propTypes={extensions:l.default.object.isRequired,getComponent:l.default.func.isRequired},t.default=c},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(9),_=n(7),b=n(12),x=r(b),w=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.specPath,n=e.response,r=e.request,i=e.toggleShown,o=e.onTryoutClick,a=e.onCancelClick,s=e.onExecute,u=e.fn,l=e.getComponent,c=e.getConfigs,p=e.specActions,f=e.specSelectors,h=e.authActions,d=e.authSelectors,v=e.oas3Actions,g=e.oas3Selectors,_=this.props.operation,b=_.toJS(),x=b.isShown,w=b.isAuthorized,k=b.path,E=b.method,S=b.op,C=b.tag,A=b.showSummary,D=b.operationId,O=b.allowTryItOut,M=b.displayOperationId,T=b.displayRequestDuration,P=b.isDeepLinkingEnabled,I=b.tryItOutEnabled,R=b.executeInProgress,j=S.operation,F=j.summary,N=j.description,B=j.deprecated,L=j.externalDocs,q=j.schemes,z=_.getIn(["op","operation"]),U=_.get("security"),W=z.get("responses"),V=z.get("produces"),H=(0,y.getList)(z,["parameters"]),G=f.operationScheme(k,E),J=["operations",C,D],K=(0,y.getExtensions)(z),X=l("responses"),Y=l("parameters"),$=l("execute"),Z=l("clear"),Q=l("authorizeOperationBtn"),ee=l("JumpToPath",!0),te=l("Collapse"),ne=l("Markdown"),re=l("schemes"),ie=l("OperationServers"),oe=l("OperationExt"),ae=l("DeepLink"),se=c(),ue=se.showExtensions;if(W&&n&&n.size>0){var le=!W.get(String(n.get("status")))&&!W.get("default");n=n.set("notDocumented",le)}var ce=[k,E];return m.default.createElement("div",{className:B?"opblock opblock-deprecated":x?"opblock opblock-"+E+" is-open":"opblock opblock-"+E,id:J.join("-")},m.default.createElement("div",{className:"opblock-summary opblock-summary-"+E,onClick:i},m.default.createElement("span",{className:"opblock-summary-method"},E.toUpperCase()),m.default.createElement("span",{className:B?"opblock-summary-path__deprecated":"opblock-summary-path"},m.default.createElement(ae,{enabled:P,isShown:x,path:""+J.join("/"),text:k}),m.default.createElement(ee,{path:t})," "),A?m.default.createElement("div",{className:"opblock-summary-description"},F):null,M&&D?m.default.createElement("span",{className:"opblock-summary-operation-id"},D):null,U&&U.count()?m.default.createElement(Q,{isAuthorized:w,onClick:function(){var e=d.definitionsForRequirements(U);h.showDefinitions(e)}}):null),m.default.createElement(te,{isOpened:x},m.default.createElement("div",{className:"opblock-body"},B&&m.default.createElement("h4",{className:"opblock-title_normal"}," Warning: Deprecated"),N&&m.default.createElement("div",{className:"opblock-description-wrapper"},m.default.createElement("div",{className:"opblock-description"},m.default.createElement(ne,{source:N}))),L&&L.url?m.default.createElement("div",{className:"opblock-external-docs-wrapper"},m.default.createElement("h4",{className:"opblock-title_normal"},"Find more details"),m.default.createElement("div",{className:"opblock-external-docs"},m.default.createElement("span",{className:"opblock-external-docs__description"},m.default.createElement(ne,{source:L.description})),m.default.createElement("a",{target:"_blank",className:"opblock-external-docs__link",href:(0,y.sanitizeUrl)(L.url)},L.url))):null,m.default.createElement(Y,{parameters:H,specPath:t.push("parameters"),operation:z,onChangeKey:ce,onTryoutClick:o,onCancelClick:a,tryItOutEnabled:I,allowTryItOut:O,fn:u,getComponent:l,specActions:p,specSelectors:f,pathMethod:[k,E],getConfigs:c}),I?m.default.createElement(ie,{getComponent:l,path:k,method:E,operationServers:z.get("servers"),pathServers:f.paths().getIn([k,"servers"]),getSelectedServer:g.selectedServer,setSelectedServer:v.setSelectedServer,setServerVariableValue:v.setServerVariableValue,getServerVariable:g.serverVariableValue,getEffectiveServerValue:g.serverEffectiveValue}):null,I&&O&&q&&q.size?m.default.createElement("div",{className:"opblock-schemes"},m.default.createElement(re,{schemes:q,path:k,method:E,specActions:p,currentScheme:G})):null,m.default.createElement("div",{className:I&&n&&O?"btn-group":"execute-wrapper"},I&&O?m.default.createElement($,{operation:z,specActions:p,specSelectors:f,path:k,method:E,onExecute:s}):null,I&&n&&O?m.default.createElement(Z,{specActions:p,path:k,method:E}):null),R?m.default.createElement("div",{className:"loading-container"},m.default.createElement("div",{className:"loading"})):null,W?m.default.createElement(X,{responses:W,request:r,tryItOutResponse:n,getComponent:l,getConfigs:c,specSelectors:f,oas3Actions:v,specActions:p,produces:V,producesValue:f.currentProducesFor([k,E]),specPath:t.push("responses"),path:k,method:E,displayRequestDuration:T,fn:u}):null,ue&&K.size?m.default.createElement(oe,{extensions:K,getComponent:l}):null)))}}]),t}(d.PureComponent);w.propTypes={specPath:x.default.list.isRequired,operation:g.default.instanceOf(_.Iterable).isRequired,response:g.default.instanceOf(_.Iterable),request:g.default.instanceOf(_.Iterable),toggleShown:g.default.func.isRequired,onTryoutClick:g.default.func.isRequired,onCancelClick:g.default.func.isRequired,onExecute:g.default.func.isRequired,getComponent:g.default.func.isRequired,getConfigs:g.default.func.isRequired,authActions:g.default.object,authSelectors:g.default.object,specActions:g.default.object.isRequired,specSelectors:g.default.object.isRequired,oas3Actions:g.default.object.isRequired,oas3Selectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,layoutSelectors:g.default.object.isRequired,fn:g.default.object.isRequired},w.defaultProps={operation:null,response:null,request:null,specPath:(0,_.List)()},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(7),_=r(y),b=n(9),x=["get","put","post","delete","options","head","patch"],w=x.concat(["trace"]),k=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.specSelectors,n=e.getComponent,r=e.layoutSelectors,i=e.layoutActions,o=e.getConfigs,a=t.taggedOperations(),s=n("OperationContainer",!0),u=n("Collapse"),l=n("Markdown"),c=n("DeepLink"),p=o(),f=p.docExpansion,h=p.maxDisplayedTags,d=p.deepLinking,v=d&&"false"!==d,g=r.currentFilter();return g&&!0!==g&&(a=a.filter(function(e,t){return-1!==t.indexOf(g)})),h&&!isNaN(h)&&h>=0&&(a=a.slice(0,h)),m.default.createElement("div",null,a.map(function(e,n){var o=e.get("operations"),a=e.getIn(["tagDetails","description"],null),p=e.getIn(["tagDetails","externalDocs","description"]),h=e.getIn(["tagDetails","externalDocs","url"]),d=["operations-tag",(0,b.createDeepLinkPath)(n)],g=r.isShown(d,"full"===f||"list"===f);return m.default.createElement("div",{className:g?"opblock-tag-section is-open":"opblock-tag-section",key:"operation-"+n},m.default.createElement("h4",{onClick:function(){return i.show(d,!g)},className:a?"opblock-tag":"opblock-tag no-desc",id:d.join("-")},m.default.createElement(c,{enabled:v,isShown:g,path:n,text:n}),a?m.default.createElement("small",null,m.default.createElement(l,{source:a})):m.default.createElement("small",null),m.default.createElement("div",null,p?m.default.createElement("small",null,p,h?": ":null,h?m.default.createElement("a",{href:(0,b.sanitizeUrl)(h),onClick:function(e){return e.stopPropagation()},target:"_blank"},h):null):null),m.default.createElement("button",{className:"expand-operation",title:g?"Collapse operation":"Expand operation",onClick:function(){return i.show(d,!g)}},m.default.createElement("svg",{className:"arrow",width:"20",height:"20"},m.default.createElement("use",{href:g?"#large-arrow-down":"#large-arrow",xlinkHref:g?"#large-arrow-down":"#large-arrow"})))),m.default.createElement(u,{isOpened:g},o.map(function(e){var r=e.get("path"),i=e.get("method"),o=_.default.List(["paths",r,i]);return-1===(t.isOAS3()?w:x).indexOf(i)?null:m.default.createElement(s,{key:r+"-"+i,specPath:o,op:e,path:r,method:i,tag:n})}).toArray()))}).toArray(),a.size<1?m.default.createElement("h3",null," No operations defined in spec! "):null)}}]),t}(m.default.Component);k.propTypes={specSelectors:g.default.object.isRequired,specActions:g.default.object.isRequired,oas3Actions:g.default.object.isRequired,getComponent:g.default.func.isRequired,layoutSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,authActions:g.default.object.isRequired,authSelectors:g.default.object.isRequired,getConfigs:g.default.func.isRequired},t.default=k,k.propTypes={layoutActions:g.default.object.isRequired,specSelectors:g.default.object.isRequired,specActions:g.default.object.isRequired,layoutSelectors:g.default.object.isRequired,getComponent:g.default.func.isRequired,fn:g.default.object.isRequired}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.OperationLink=void 0;var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(268),_=function(e){function t(){var e;(0,s.default)(this,t);for(var n=arguments.length,r=Array(n),i=0;i<n;i++)r[i]=arguments[i];var a=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(r)));return a.setTagShown=a._setTagShown.bind(a),a}return(0,h.default)(t,e),(0,l.default)(t,[{key:"_setTagShown",value:function(e,t){this.props.layoutActions.show(e,t)}},{key:"showOp",value:function(e,t){this.props.layoutActions.show(e,t)}},{key:"render",value:function(){var e=this.props,t=e.specSelectors,n=e.layoutSelectors,r=e.layoutActions,i=e.getComponent,o=t.taggedOperations(),a=i("Collapse");return m.default.createElement("div",null,m.default.createElement("h4",{className:"overview-title"},"Overview"),o.map(function(e,t){var i=e.get("operations"),o=["overview-tags",t],s=n.isShown(o,!0),u=function(){return r.show(o,!s)};return m.default.createElement("div",{key:"overview-"+t},m.default.createElement("h4",{onClick:u,className:"link overview-tag"}," ",s?"-":"+",t),m.default.createElement(a,{isOpened:s,animated:!0},i.map(function(e){var t=e.toObject(),i=t.path,o=t.method,a=t.id,s=a,u=n.isShown(["operations",s]);return m.default.createElement(b,{key:a,path:i,method:o,id:i+"-"+o,shown:u,showOpId:s,showOpIdPrefix:"operations",href:"#operation-"+s,onClick:r.show})}).toArray()))}).toArray(),o.size<1&&m.default.createElement("h3",null," No operations defined in spec! "))}}]),t}(m.default.Component);t.default=_,_.propTypes={layoutSelectors:g.default.object.isRequired,specSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,getComponent:g.default.func.isRequired};var b=t.OperationLink=function(e){function t(e){(0,s.default)(this,t);var n=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e));return n.onClick=n._onClick.bind(n),n}return(0,h.default)(t,e),(0,l.default)(t,[{key:"_onClick",value:function(){var e=this.props,t=e.showOpId,n=e.showOpIdPrefix;(0,e.onClick)([n,t],!e.shown)}},{key:"render",value:function(){var e=this.props,t=e.id,n=e.method,r=e.shown,i=e.href;return m.default.createElement(y.Link,{href:i,style:{fontWeight:r?"bold":"normal"},onClick:this.onClick,className:"block opblock-link"},m.default.createElement("div",null,m.default.createElement("small",{className:"bold-label-"+n},n.toUpperCase()),m.default.createElement("span",{className:"bold-label"},t)))}}]),t}(m.default.Component);b.propTypes={href:g.default.string,onClick:g.default.func,id:g.default.string.isRequired,method:g.default.string.isRequired,shown:g.default.bool.isRequired,showOpId:g.default.string.isRequired,showOpIdPrefix:g.default.string.isRequired}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(7),_=n(9),b=Function.prototype,x=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));return w.call(r),r.state={isEditBox:!1,value:""},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){this.updateValues.call(this,this.props)}},{key:"componentWillReceiveProps",value:function(e){this.updateValues.call(this,e)}},{key:"render",value:function(){var e=this.props,n=e.onChangeConsumes,r=e.param,i=e.isExecute,o=e.specSelectors,a=e.pathMethod,s=e.getComponent,u=s("Button"),l=s("TextArea"),c=s("highlightCode"),p=s("contentType"),f=o?o.getParameter(a,r.get("name"),r.get("in")):r,h=f.get("errors",(0,y.List)()),d=o.contentTypeValues(a).get("requestContentType"),v=this.props.consumes&&this.props.consumes.size?this.props.consumes:t.defaultProp.consumes,g=this.state,_=g.value,b=g.isEditBox;return m.default.createElement("div",{className:"body-param"},b&&i?m.default.createElement(l,{className:"body-param__text"+(h.count()?" invalid":""),value:_,onChange:this.handleOnChange}):_&&m.default.createElement(c,{className:"body-param__example",value:_}),m.default.createElement("div",{className:"body-param-options"},i?m.default.createElement("div",{className:"body-param-edit"},m.default.createElement(u,{className:b?"btn cancel body-param__example-edit":"btn edit body-param__example-edit",onClick:this.toggleIsEditBox},b?"Cancel":"Edit")):null,m.default.createElement("label",{htmlFor:""},m.default.createElement("span",null,"Parameter content type"),m.default.createElement(p,{value:d,contentTypes:v,onChange:n,className:"body-param-content-type"}))))}}]),t}(d.PureComponent);x.propTypes={param:g.default.object,onChange:g.default.func,onChangeConsumes:g.default.func,consumes:g.default.object,consumesValue:g.default.string,fn:g.default.object.isRequired,getComponent:g.default.func.isRequired,isExecute:g.default.bool,specSelectors:g.default.object.isRequired,pathMethod:g.default.array.isRequired},x.defaultProp={consumes:(0,y.fromJS)(["application/json"]),param:(0,y.fromJS)({}),onChange:b,onChangeConsumes:b};var w=function(){var e=this;this.updateValues=function(t){var n=t.specSelectors,r=t.pathMethod,i=t.param,o=t.isExecute,a=t.consumesValue,s=void 0===a?"":a,u=n?n.getParameter(r,i.get("name"),i.get("in")):(0,y.fromJS)({}),l=/xml/i.test(s),c=/json/i.test(s),p=l?u.get("value_xml"):u.get("value");if(void 0!==p){var f=!p&&c?"{}":p;e.setState({value:f}),e.onChange(f,{isXml:l,isEditBox:o})}else l?e.onChange(e.sample("xml"),{isXml:l,isEditBox:o}):e.onChange(e.sample(),{isEditBox:o})},this.sample=function(t){var n=e.props,r=n.param,i=n.fn.inferSchema,o=i(r.toJS());return(0,_.getSampleSchema)(o,t,{includeWriteOnly:!0})},this.onChange=function(t,n){var r=n.isEditBox,i=n.isXml;e.setState({value:t,isEditBox:r}),e._onChange(t,i)},this._onChange=function(t,n){(e.props.onChange||b)(e.props.param,t,n)},this.handleOnChange=function(t){var n=e.props.consumesValue,r=/json/i.test(n),i=/xml/i.test(n),o=r?t.target.value.trim():t.target.value;e.onChange(o,{isXml:i})},this.toggleIsEditBox=function(){return e.setState(function(e){return{isEditBox:!e.isEditBox}})}};t.default=x},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.ParameterExt=void 0;var i=n(0),o=r(i),a=n(1),s=r(a),u=t.ParameterExt=function(e){var t=e.xKey,n=e.xVal;return o.default.createElement("div",{className:"parameter__extension"},t,": ",String(n))};u.propTypes={xKey:s.default.string,xVal:s.default.any},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(7),g=n(1),y=r(g),_=n(12),b=r(_),x=n(46),w=r(x),k=n(9),E=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));S.call(r);var i=e.specSelectors,a=e.pathMethod,u=e.param,l=u.get("default"),c=i.getParameter(a,u.get("name"),u.get("in")),f=c?c.get("value"):"";return void 0!==l&&void 0===f&&r.onChangeWrapper(l),r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentWillReceiveProps",value:function(e){var t=e.specSelectors,n=e.pathMethod,r=e.param,i=t.isOAS3,o=r.get("example"),a=r.get("default"),s=t.getParameter(n,r.get("name"),r.get("in")),u=void 0;if(i()){u=(r.get("schema")||(0,v.Map)()).get("enum")}else u=s?s.get("enum"):void 0;var l=s?s.get("value"):void 0,c=void 0;void 0!==l?c=l:void 0!==o?c=o:void 0!==a?c=a:r.get("required")&&u&&u.size&&(c=u.first()),void 0!==c&&this.onChangeWrapper(c)}},{key:"render",value:function(){var e=this.props,t=e.param,n=e.onChange,r=e.getComponent,i=e.getConfigs,o=e.isExecute,a=e.fn,s=e.onChangeConsumes,u=e.specSelectors,l=e.pathMethod,c=e.specPath,p=u.isOAS3,f=i(),h=f.showExtensions,d=r("JsonSchemaForm"),v=r("ParamBody"),g=t.get("in"),y="body"!==g?null:m.default.createElement(v,{getComponent:r,fn:a,param:t,consumes:u.operationConsumes(l),consumesValue:u.contentTypeValues(l).get("requestContentType"),onChange:n,onChangeConsumes:s,isExecute:o,specSelectors:u,pathMethod:l}),_=r("modelExample"),b=r("Markdown"),x=r("ParameterExt"),E=t.get("schema"),S=p&&p()?t.getIn(["schema","type"]):t.get("type"),C="formData"===g,A="FormData"in w.default,D=t.get("required"),O=t.getIn(p&&p()?["schema","items","type"]:["items","type"]),M=u.getParameter(l,t.get("name"),t.get("in")),T=M?M.get("value"):"",P=(0,k.getExtensions)(t),I=void 0,R=void 0,j=!1;void 0!==t&&(I=t.get("items")),void 0!==I&&(R=t.get("items").get("enum")),void 0!==R&&R.size>0&&(j=!0);var F=void 0,N=void 0;return void 0!==t&&(F=t.get("default"),N=t.get("example")),j&&(F=I.get("default")),m.default.createElement("tr",null,m.default.createElement("td",{className:"col parameters-col_name"},m.default.createElement("div",{className:D?"parameter__name required":"parameter__name"},t.get("name"),D?m.default.createElement("span",{style:{color:"red"}}," *"):null),m.default.createElement("div",{className:"parameter__type"},S," ",O&&"["+O+"]"),m.default.createElement("div",{className:"parameter__deprecated"},p&&p()&&t.get("deprecated")?"deprecated":null),m.default.createElement("div",{className:"parameter__in"},"(",t.get("in"),")"),h&&P.size?P.map(function(e,t){return m.default.createElement(x,{key:t+"-"+e,xKey:t,xVal:e})}):null),m.default.createElement("td",{className:"col parameters-col_description"},m.default.createElement(b,{source:t.get("description")}),!y&&o||!j?null:m.default.createElement(b,{source:"<i>Available values</i>: "+R.map(function(e){return e}).toArray().join(", ")}),!y&&o||void 0===F?null:m.default.createElement(b,{source:"<i>Default value</i>: "+F}),!y&&o||void 0===N?null:m.default.createElement(b,{source:"<i>Example</i>: "+N}),C&&!A&&m.default.createElement("div",null,"Error: your browser does not support FormData"),y||!o?null:m.default.createElement(d,{fn:a,getComponent:r,value:T,required:D,description:t.get("description")?t.get("name")+" - "+t.get("description"):""+t.get("name"),onChange:this.onChangeWrapper,errors:t.get("errors"),schema:p&&p()?t.get("schema"):t}),y&&E?m.default.createElement(_,{getComponent:r,specPath:c.push("schema"),getConfigs:i,isExecute:o,specSelectors:u,schema:E,example:y}):null))}}]),t}(d.Component);E.propTypes={onChange:y.default.func.isRequired,param:y.default.object.isRequired,getComponent:y.default.func.isRequired,fn:y.default.object.isRequired,isExecute:y.default.bool,onChangeConsumes:y.default.func.isRequired,specSelectors:y.default.object.isRequired,pathMethod:y.default.array.isRequired,getConfigs:y.default.func.isRequired,specPath:b.default.list.isRequired};var S=function(){var e=this;this.onChangeWrapper=function(t){var n=e.props;return(0,n.onChange)(n.param,t)}};t.default=E},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=n(7),x=r(b),w=function(e,t){return e.valueSeq().filter(x.default.Map.isMap).map(t)},k=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onChange=function(e,t,n){var i=r.props;(0,i.specActions.changeParam)(i.onChangeKey,e.get("name"),e.get("in"),t,n)},r.onChangeConsumesWrapper=function(e){var t=r.props;(0,t.specActions.changeConsumesValue)(t.onChangeKey,e)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this,t=this.props,n=t.onTryoutClick,r=t.onCancelClick,i=t.parameters,o=t.allowTryItOut,a=t.tryItOutEnabled,s=t.specPath,u=t.fn,l=t.getComponent,c=t.getConfigs,p=t.specSelectors,f=t.pathMethod,h=l("parameterRow"),d=l("TryItOutButton"),v=a&&o;return m.default.createElement("div",{className:"opblock-section"},m.default.createElement("div",{className:"opblock-section-header"},m.default.createElement("div",{className:"tab-header"},m.default.createElement("h4",{className:"opblock-title"},"Parameters")),o?m.default.createElement(d,{enabled:a,onCancelClick:r,onTryoutClick:n}):null),i.count()?m.default.createElement("div",{className:"table-container"},m.default.createElement("table",{className:"parameters"},m.default.createElement("thead",null,m.default.createElement("tr",null,m.default.createElement("th",{className:"col col_header parameters-col_name"},"Name"),m.default.createElement("th",{className:"col col_header parameters-col_description"},"Description"))),m.default.createElement("tbody",null,w(i,function(t,n){return m.default.createElement(h,{fn:u,specPath:s.push(n.toString()),getComponent:l,getConfigs:c,param:t,key:t.get("in")+"."+t.get("name"),onChange:e.onChange,onChangeConsumes:e.onChangeConsumesWrapper,specSelectors:p,pathMethod:f,isExecute:v})}).toArray()))):m.default.createElement("div",{className:"opblock-description-wrapper"},m.default.createElement("p",null,"No parameters")))}}]),t}(d.Component);k.propTypes={parameters:_.default.list.isRequired,specActions:g.default.object.isRequired,getComponent:g.default.func.isRequired,specSelectors:g.default.object.isRequired,fn:g.default.object.isRequired,tryItOutEnabled:g.default.bool,allowTryItOut:g.default.bool,onTryoutClick:g.default.func,onCancelClick:g.default.func,onChangeKey:g.default.array,pathMethod:g.default.array.isRequired,getConfigs:g.default.func.isRequired,specPath:_.default.list.isRequired},k.defaultProps={onTryoutClick:Function.prototype,onCancelClick:Function.prototype,tryItOutEnabled:!1,allowTryItOut:!0,onChangeKey:[],specPath:[]},t.default=k},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(18),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(9),x={color:"#6b6b6b",fontStyle:"italic"},w=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.schema,n=e.getComponent,r=e.getConfigs,i=e.name,a=e.depth,s=r(),u=s.showExtensions;if(!t||!t.get)return g.default.createElement("div",null);var l=t.get("type"),c=t.get("format"),p=t.get("xml"),f=t.get("enum"),h=t.get("title")||i,d=t.get("description"),m=(0,b.getExtensions)(t),v=t.filter(function(e,t){return-1===["enum","type","format","description","$$ref"].indexOf(t)}).filterNot(function(e,t){return m.has(t)}),y=n("Markdown"),_=n("EnumModel"),w=n("Property");return g.default.createElement("span",{className:"model"},g.default.createElement("span",{className:"prop"},i&&g.default.createElement("span",{className:(1===a&&"model-title")+" prop-name"},h),g.default.createElement("span",{className:"prop-type"},l),c&&g.default.createElement("span",{className:"prop-format"},"($",c,")"),v.size?v.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],r=t[1];return g.default.createElement(w,{key:n+"-"+r,propKey:n,propVal:r,propStyle:x})}):null,u&&m.size?m.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],r=t[1];return g.default.createElement(w,{key:n+"-"+r,propKey:n,propVal:r,propStyle:x})}):null,d?g.default.createElement(y,{source:d}):null,p&&p.size?g.default.createElement("span",null,g.default.createElement("br",null),g.default.createElement("span",{style:x},"xml:"),p.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],r=t[1];return g.default.createElement("span",{key:n+"-"+r,style:x},g.default.createElement("br",null),"   ",n,": ",String(r))}).toArray()):null,f&&g.default.createElement(_,{value:f,getComponent:n})))}}]),t}(v.Component);w.propTypes={schema:_.default.object.isRequired,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired,name:_.default.string,depth:_.default.number},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.Property=void 0;var i=n(0),o=r(i),a=n(1),s=r(a),u=t.Property=function(e){var t=e.propKey,n=e.propVal,r=e.propStyle;return o.default.createElement("span",{style:r},o.default.createElement("br",null),t,": ",String(n))};u.propTypes={propKey:s.default.string,propVal:s.default.any,propStyle:s.default.object},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(35),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(1196),x=r(b),w=n(948),k=r(w),E=n(9),S=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.content,n=e.contentType,r=e.url,i=e.headers,a=void 0===i?{}:i,s=e.getComponent,u=s("highlightCode"),l=void 0,c=void 0;if(r=r||"",/^application\/octet-stream/i.test(n)||a["Content-Disposition"]&&/attachment/i.test(a["Content-Disposition"])||a["content-disposition"]&&/attachment/i.test(a["content-disposition"])||a["Content-Description"]&&/File Transfer/i.test(a["Content-Description"])||a["content-description"]&&/File Transfer/i.test(a["content-description"])){if(!/^((?!chrome|android).)*safari/i.test(navigator.userAgent)&&"Blob"in window){var p=n||"text/html",f=t instanceof Blob?t:new Blob([t],{type:p}),h=window.URL.createObjectURL(f),d=r.substr(r.lastIndexOf("/")+1),m=[p,d,h].join(":"),v=a["content-disposition"]||a["Content-Disposition"];if(void 0!==v){var y=(0,E.extractFileNameFromContentDispositionHeader)(v);null!==y&&(m=y)}c=g.default.createElement("div",null,g.default.createElement("a",{href:h,download:m},"Download file"))}else c=g.default.createElement("pre",null,"Download headers detected but your browser does not support downloading binary via XHR (Blob).")}else if(/json/i.test(n)){try{l=(0,o.default)(JSON.parse(t),null,"  ")}catch(e){l="can't parse JSON.  Raw result:\n\n"+t}c=g.default.createElement(u,{value:l})}else/xml/i.test(n)?(l=(0,x.default)(t,{textNodesOnSameLine:!0,indentor:"  "}),c=g.default.createElement(u,{value:l})):c="text/html"===(0,k.default)(n)||/text\/plain/.test(n)?g.default.createElement(u,{value:t}):/^image\//i.test(n)?n.includes("svg")?g.default.createElement("div",null," ",t," "):g.default.createElement("img",{style:{maxWidth:"100%"},src:window.URL.createObjectURL(t)}):/^audio\//i.test(n)?g.default.createElement("pre",null,g.default.createElement("audio",{controls:!0},g.default.createElement("source",{src:r,type:n}))):"string"==typeof t?g.default.createElement(u,{value:t}):t.size>0?g.default.createElement("div",null,"Unknown response type"):null;return c?g.default.createElement("div",null,g.default.createElement("h5",null,"Response body"),c):null}}]),t}(g.default.Component);S.propTypes={content:_.default.any.isRequired,contentType:_.default.string,getComponent:_.default.func.isRequired,headers:_.default.object,url:_.default.string},t.default=S},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(35),m=r(d),v=n(18),g=r(v),y=n(0),_=r(y),b=n(1),x=r(b),w=n(12),k=r(w),E=n(573),S=r(E),C=n(7),A=n(9),D=function(e,t,n){return t&&t.size?t.entrySeq().map(function(e){var t=(0,g.default)(e,2),r=t[0],i=t[1],o=i;if(i.toJS)try{o=(0,m.default)(i.toJS(),null,2)}catch(e){o=String(i)}return _.default.createElement("div",{key:r},_.default.createElement("h5",null,r),_.default.createElement(n,{className:"example",value:o}))}).toArray():e?_.default.createElement("div",null,_.default.createElement(n,{className:"example",value:e})):null},O=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));return r._onContentTypeChange=function(e){var t=r.props,n=t.onContentTypeChange,i=t.controlsAcceptHeader;r.setState({responseContentType:e}),n({value:e,controlsAcceptHeader:i})},r.state={responseContentType:""},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e,t,n,r=this.props,i=r.code,o=r.response,a=r.className,s=r.specPath,u=r.fn,l=r.getComponent,c=r.getConfigs,p=r.specSelectors,f=r.contentType,h=r.controlsAcceptHeader,d=u.inferSchema,m=p.isOAS3,v=o.get("headers"),g=o.get("examples"),y=o.get("links"),b=l("headers"),x=l("highlightCode"),w=l("modelExample"),k=l("Markdown"),E=l("operationLink"),O=l("contentType");if(m()){var M=(0,C.List)(["content",this.state.responseContentType,"schema"]),T=o.getIn(M);e=T?(0,A.getSampleSchema)(T.toJS(),this.state.responseContentType,{includeReadOnly:!0}):null,t=T?d(T.toJS()):null,n=T?M:s}else t=d(o.toJS()),n=o.has("schema")?s.push("schema"):s,e=t?(0,A.getSampleSchema)(t,f,{includeReadOnly:!0,includeWriteOnly:!0}):null;g&&(g=g.map(function(e){return e.set?e.set("$$ref",void 0):e}));var P=D(e,g,x);return _.default.createElement("tr",{className:"response "+(a||"")},_.default.createElement("td",{className:"col response-col_status"},i),_.default.createElement("td",{className:"col response-col_description"},_.default.createElement("div",{className:"response-col_description__inner"},_.default.createElement(k,{source:o.get("description")})),m?_.default.createElement("div",{className:(0,S.default)("response-content-type",{"controls-accept-header":h})},_.default.createElement(O,{value:this.state.responseContentType,contentTypes:o.get("content")?o.get("content").keySeq():(0,C.Seq)(),onChange:this._onContentTypeChange}),h?_.default.createElement("small",null,"Controls ",_.default.createElement("code",null,"Accept")," header."):null):null,P?_.default.createElement(w,{specPath:n,getComponent:l,getConfigs:c,specSelectors:p,schema:(0,A.fromJSOrdered)(t),example:P}):null,v?_.default.createElement(b,{headers:v,getComponent:l}):null),p.isOAS3()?_.default.createElement("td",{className:"col response-col_links"},y?y.toSeq().map(function(e,t){return _.default.createElement(E,{key:t,name:t,link:e,getComponent:l})}):_.default.createElement("i",null,"No links")):null)}}]),t}(_.default.Component);O.propTypes={code:x.default.string.isRequired,response:x.default.instanceOf(C.Iterable),className:x.default.string,getComponent:x.default.func.isRequired,getConfigs:x.default.func.isRequired,specSelectors:x.default.object.isRequired,specPath:k.default.list.isRequired,fn:x.default.object.isRequired,contentType:x.default.string,controlsAcceptHeader:x.default.bool,onContentTypeChange:x.default.func},O.defaultProps={response:(0,C.fromJS)({}),onContentTypeChange:function(){}},t.default=O},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(18),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(7),_=n(1),b=r(_),x=n(12),w=r(x),k=n(9),E=function(e){function t(){var e,n,r,i;(0,l.default)(this,t);for(var o=arguments.length,a=Array(o),u=0;u<o;u++)a[u]=arguments[u];return n=r=(0,h.default)(this,(e=t.__proto__||(0,s.default)(t)).call.apply(e,[this].concat(a))),r.onChangeProducesWrapper=function(e){return r.props.specActions.changeProducesValue([r.props.path,r.props.method],e)},r.onResponseContentTypeChange=function(e){var t=e.controlsAcceptHeader,n=e.value,i=r.props,o=i.oas3Actions,a=i.path,s=i.method;t&&o.setResponseContentType({value:n,path:a,method:s})},i=n,(0,h.default)(r,i)}return(0,m.default)(t,e),(0,p.default)(t,[{key:"shouldComponentUpdate",value:function(e){return this.props.tryItOutResponse!==e.tryItOutResponse||this.props.responses!==e.responses||this.props.produces!==e.produces||this.props.producesValue!==e.producesValue||this.props.displayRequestDuration!==e.displayRequestDuration||this.props.path!==e.path||this.props.method!==e.method}},{key:"render",value:function(){var e=this,n=this.props,r=n.responses,i=n.tryItOutResponse,a=n.getComponent,s=n.getConfigs,u=n.specSelectors,l=n.fn,c=n.producesValue,p=n.displayRequestDuration,f=n.specPath,h=(0,k.defaultStatusCode)(r),d=a("contentType"),m=a("liveResponse"),v=a("response"),y=this.props.produces&&this.props.produces.size?this.props.produces:t.defaultProps.produces,_=u.isOAS3(),b=_?(0,k.getAcceptControllingResponse)(r):null;return g.default.createElement("div",{className:"responses-wrapper"},g.default.createElement("div",{className:"opblock-section-header"},g.default.createElement("h4",null,"Responses"),u.isOAS3()?null:g.default.createElement("label",null,g.default.createElement("span",null,"Response content type"),g.default.createElement(d,{value:c,onChange:this.onChangeProducesWrapper,contentTypes:y,className:"execute-content-type"}))),g.default.createElement("div",{className:"responses-inner"},i?g.default.createElement("div",null,g.default.createElement(m,{response:i,getComponent:a,getConfigs:s,specSelectors:u,path:this.props.path,method:this.props.method,displayRequestDuration:p}),g.default.createElement("h4",null,"Responses")):null,g.default.createElement("table",{className:"responses-table"},g.default.createElement("thead",null,g.default.createElement("tr",{className:"responses-header"},g.default.createElement("td",{className:"col col_header response-col_status"},"Code"),g.default.createElement("td",{className:"col col_header response-col_description"},"Description"),u.isOAS3()?g.default.createElement("td",{className:"col col_header response-col_links"},"Links"):null)),g.default.createElement("tbody",null,r.entrySeq().map(function(t){var n=(0,o.default)(t,2),r=n[0],p=n[1],d=i&&i.get("status")==r?"response_current":"";return g.default.createElement(v,{key:r,specPath:f.push(r),isDefault:h===r,fn:l,className:d,code:r,response:p,specSelectors:u,controlsAcceptHeader:p===b,onContentTypeChange:e.onResponseContentTypeChange,contentType:c,getConfigs:s,getComponent:a})}).toArray()))))}}]),t}(g.default.Component);E.propTypes={tryItOutResponse:b.default.instanceOf(y.Iterable),responses:b.default.instanceOf(y.Iterable).isRequired,produces:b.default.instanceOf(y.Iterable),producesValue:b.default.any,displayRequestDuration:b.default.bool.isRequired,path:b.default.string.isRequired,method:b.default.string.isRequired,getComponent:b.default.func.isRequired,getConfigs:b.default.func.isRequired,specSelectors:b.default.object.isRequired,specActions:b.default.object.isRequired,oas3Actions:b.default.object.isRequired,specPath:w.default.list.isRequired,fn:b.default.object.isRequired},E.defaultProps={tryItOutResponse:null,produces:(0,y.fromJS)(["application/json"]),displayRequestDuration:!1},t.default=E},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onChange=function(e){r.setScheme(e.target.value)},r.setScheme=function(e){var t=r.props,n=t.path,i=t.method;t.specActions.setScheme(e,n,i)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentWillMount",value:function(){var e=this.props.schemes;this.setScheme(e.first())}},{key:"componentWillReceiveProps",value:function(e){this.props.currentScheme&&e.schemes.includes(this.props.currentScheme)||this.setScheme(e.schemes.first())}},{key:"render",value:function(){var e=this.props.schemes;return m.default.createElement("label",{htmlFor:"schemes"},m.default.createElement("span",{className:"schemes-title"},"Schemes"),m.default.createElement("select",{onChange:this.onChange},e.valueSeq().map(function(e){return m.default.createElement("option",{value:e,key:e},e)}).toArray()))}}]),t}(m.default.Component);y.propTypes={specActions:g.default.object.isRequired,schemes:g.default.object.isRequired,currentScheme:g.default.string.isRequired,path:g.default.string,method:g.default.string},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.onTryoutClick,n=e.onCancelClick,r=e.enabled;return m.default.createElement("div",{className:"try-out"},r?m.default.createElement("button",{className:"btn try-out__btn cancel",onClick:t},"Cancel"):m.default.createElement("button",{className:"btn try-out__btn",onClick:n},"Try it out "))}}]),t}(m.default.Component);y.propTypes={onTryoutClick:g.default.func,onCancelClick:g.default.func,enabled:g.default.bool},y.defaultProps={onTryoutClick:Function.prototype,onCancelClick:Function.prototype,enabled:!1},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(0),o=r(i),a=n(1),s=r(a),u=function(e){var t=e.version;return o.default.createElement("small",null,o.default.createElement("pre",{className:"version"}," ",t," "))};u.propTypes={version:s.default.string.isRequired},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=n(495),x=n(7),w=b.helpers.opId,k=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));return r.toggleShown=function(){var e=r.props,t=e.layoutActions,n=e.tag,i=e.operationId,o=e.isShown;t.show(["operations",n,i],!o)},r.onTryoutClick=function(){r.setState({tryItOutEnabled:!r.state.tryItOutEnabled})},r.onCancelClick=function(){var e=r.props,t=e.specActions,n=e.path,i=e.method;r.setState({tryItOutEnabled:!r.state.tryItOutEnabled}),t.clearValidateParams([n,i])},r.onExecute=function(){r.setState({executeInProgress:!0})},r.state={tryItOutEnabled:!1,executeInProgress:!1},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"mapStateToProps",value:function(e,t){var n=t.op,r=t.layoutSelectors,i=t.getConfigs,o=i(),a=o.docExpansion,s=o.deepLinking,u=o.displayOperationId,l=o.displayRequestDuration,c=o.supportedSubmitMethods,p=r.showSummary(),f=n.getIn(["operation","operationId"])||n.getIn(["operation","__originalOperationId"])||w(n.get("operation"),t.path,t.method)||n.get("id"),h=["operations",t.tag,f],d=s&&"false"!==s,m=c.indexOf(t.method)>=0&&(void 0===t.allowTryItOut?t.specSelectors.allowTryItOutFor(t.path,t.method):t.allowTryItOut),v=n.getIn(["operation","security"])||t.specSelectors.security();return{operationId:f,isDeepLinkingEnabled:d,showSummary:p,displayOperationId:u,displayRequestDuration:l,allowTryItOut:m,security:v,isAuthorized:t.authSelectors.isAuthorized(v),isShown:r.isShown(h,"full"===a),jumpToKey:"paths."+t.path+"."+t.method,response:t.specSelectors.responseFor(t.path,t.method),request:t.specSelectors.requestFor(t.path,t.method)}}},{key:"componentWillReceiveProps",value:function(e){e.response!==this.props.response&&this.setState({executeInProgress:!1})}},{key:"render",value:function(){var e=this.props,t=e.op,n=e.tag,r=e.path,i=e.method,o=e.security,a=e.isAuthorized,s=e.operationId,u=e.showSummary,l=e.isShown,c=e.jumpToKey,p=e.allowTryItOut,f=e.response,h=e.request,d=e.displayOperationId,v=e.displayRequestDuration,g=e.isDeepLinkingEnabled,y=e.specPath,_=e.specSelectors,b=e.specActions,w=e.getComponent,k=e.getConfigs,E=e.layoutSelectors,S=e.layoutActions,C=e.authActions,A=e.authSelectors,D=e.oas3Actions,O=e.oas3Selectors,M=e.fn,T=w("operation"),P=(0,x.fromJS)({op:t,tag:n,path:r,method:i,security:o,isAuthorized:a,operationId:s,showSummary:u,isShown:l,jumpToKey:c,allowTryItOut:p,request:h,displayOperationId:d,displayRequestDuration:v,isDeepLinkingEnabled:g,executeInProgress:this.state.executeInProgress,tryItOutEnabled:this.state.tryItOutEnabled});return m.default.createElement(T,{operation:P,response:f,request:h,isShown:l,toggleShown:this.toggleShown,onTryoutClick:this.onTryoutClick,onCancelClick:this.onCancelClick,onExecute:this.onExecute,specPath:y,specActions:b,specSelectors:_,oas3Actions:D,oas3Selectors:O,layoutActions:S,layoutSelectors:E,authActions:C,authSelectors:A,getComponent:w,getConfigs:k,fn:M})}}]),t}(d.PureComponent);k.propTypes={op:g.default.instanceOf(x.Iterable).isRequired,tag:g.default.string.isRequired,path:g.default.string.isRequired,method:g.default.string.isRequired,operationId:g.default.string.isRequired,showSummary:g.default.bool.isRequired,isShown:g.default.bool.isRequired,jumpToKey:g.default.string.isRequired,allowTryItOut:g.default.bool,displayOperationId:g.default.bool,isAuthorized:g.default.bool,displayRequestDuration:g.default.bool,response:g.default.instanceOf(x.Iterable),request:g.default.instanceOf(x.Iterable),security:g.default.instanceOf(x.Iterable),isDeepLinkingEnabled:g.default.bool.isRequired,specPath:_.default.list.isRequired,getComponent:g.default.func.isRequired,authActions:g.default.object,oas3Actions:g.default.object,oas3Selectors:g.default.object,authSelectors:g.default.object,specActions:g.default.object.isRequired,specSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,layoutSelectors:g.default.object.isRequired,fn:g.default.object.isRequired,getConfigs:g.default.func.isRequired},k.defaultProps={showSummary:!0,response:null,allowTryItOut:!0,displayOperationId:!1,displayRequestDuration:!1},t.default=k},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=[],n="",r=e.get("headers");if(t.push("curl"),t.push("-X",e.get("method")),t.push('"'+e.get("url")+'"'),r&&r.size){var i=!0,o=!1,s=void 0;try{for(var l,p=(0,c.default)(e.get("headers").entries());!(i=(l=p.next()).done);i=!0){var h=l.value,d=(0,u.default)(h,2),m=d[0],v=d[1];n=v,t.push("-H "),t.push('"'+m+": "+v+'"')}}catch(e){o=!0,s=e}finally{try{!i&&p.return&&p.return()}finally{if(o)throw s}}}if(e.get("body"))if("multipart/form-data"===n&&"POST"===e.get("method")){var g=!0,y=!1,_=void 0;try{for(var b,x=(0,c.default)(e.get("body").entrySeq());!(g=(b=x.next()).done);g=!0){var w=(0,u.default)(b.value,2),k=w[0],v=w[1];t.push("-F"),v instanceof f.default.File?t.push('"'+k+"=@"+v.name+";type="+v.type+'"'):t.push('"'+k+"="+v+'"')}}catch(e){y=!0,_=e}finally{try{!g&&x.return&&x.return()}finally{if(y)throw _}}}else t.push("-d"),t.push((0,a.default)(e.get("body")).replace(/\\n/g,""));return t.join(" ")}Object.defineProperty(t,"__esModule",{value:!0});var o=n(35),a=r(o),s=n(18),u=r(s),l=n(95),c=r(l);t.default=i;var p=n(46),f=r(p)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.JsonSchema_boolean=t.JsonSchema_array=t.JsonSchema_string=t.JsonSchemaForm=void 0;var i=n(30),o=r(i),a=n(21),s=r(a),u=n(4),l=r(u),c=n(2),p=r(c),f=n(3),h=r(f),d=n(6),m=r(d),v=n(5),g=r(v),y=n(0),_=r(y),b=n(1),x=r(b),w=n(7),k=n(12),E=r(k),S=function(){},C={getComponent:x.default.func.isRequired,value:x.default.any,onChange:x.default.func,keyName:x.default.any,fn:x.default.object.isRequired,schema:x.default.object,errors:E.default.list,required:x.default.bool,description:x.default.any},A={value:"",onChange:S,schema:{},keyName:"",required:!1,errors:(0,w.List)()},D=t.JsonSchemaForm=function(e){function t(){return(0,p.default)(this,t),(0,m.default)(this,(t.__proto__||(0,l.default)(t)).apply(this,arguments))}return(0,g.default)(t,e),(0,h.default)(t,[{key:"render",value:function(){var e=this.props,t=e.schema,n=e.errors,r=e.value,i=e.onChange,o=e.getComponent,a=e.fn;t.toJS&&(t=t.toJS());var u=t,l=u.type,c=u.format,p=void 0===c?"":c,f=o(p?"JsonSchema_"+l+"_"+p:"JsonSchema_"+l)||o("JsonSchema_string");return _.default.createElement(f,(0,s.default)({},this.props,{errors:n,fn:a,getComponent:o,value:r,onChange:i,schema:t}))}}]),t}(y.Component);D.propTypes=C,D.defaultProps=A;var O=t.JsonSchema_string=function(e){function t(){var e,n,r,i;(0,p.default)(this,t);for(var o=arguments.length,a=Array(o),s=0;s<o;s++)a[s]=arguments[s];return n=r=(0,m.default)(this,(e=t.__proto__||(0,l.default)(t)).call.apply(e,[this].concat(a))),r.onChange=function(e){var t="file"===r.props.schema.type?e.target.files[0]:e.target.value;r.props.onChange(t,r.props.keyName)},r.onEnumChange=function(e){return r.props.onChange(e)},i=n,(0,m.default)(r,i)}return(0,g.default)(t,e),(0,h.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.value,r=e.schema,i=e.errors,o=e.required,a=e.description,s=r.enum;if(i=i.toJS?i.toJS():[],s){var u=t("Select");return _.default.createElement(u,{className:i.length?"invalid":"",title:i.length?i:"",allowedValues:s,value:n,allowEmptyValue:!o,onChange:this.onEnumChange})}var l="formData"===r.in&&!("FormData"in window),c=t("Input");return"file"===r.type?_.default.createElement(c,{type:"file",className:i.length?"invalid":"",title:i.length?i:"",onChange:this.onChange,disabled:l}):_.default.createElement(c,{type:"password"===r.format?"password":"text",className:i.length?"invalid":"",title:i.length?i:"",value:n,placeholder:a,onChange:this.onChange,disabled:l})}}]),t}(y.Component);O.propTypes=C,O.defaultProps=A;var M=t.JsonSchema_array=function(e){function t(e,n){(0,p.default)(this,t);var r=(0,m.default)(this,(t.__proto__||(0,l.default)(t)).call(this,e,n));return r.onChange=function(){return r.props.onChange(r.state.value)},r.onItemChange=function(e,t){r.setState(function(n){return{value:n.value.set(t,e)}},r.onChange)},r.removeItem=function(e){r.setState(function(t){return{value:t.value.remove(e)}},r.onChange)},r.addItem=function(){r.setState(function(e){return e.value=e.value||(0,w.List)(),{value:e.value.push("")}},r.onChange)},r.onEnumChange=function(e){r.setState(function(){return{value:e}},r.onChange)},r.state={value:e.value},r}return(0,g.default)(t,e),(0,h.default)(t,[{key:"componentWillReceiveProps",value:function(e){e.value!==this.state.value&&this.setState({value:e.value})}},{key:"render",value:function(){var e=this,t=this.props,n=t.getComponent,r=t.required,i=t.schema,a=t.errors,s=t.fn;a=a.toJS?a.toJS():[];var u=s.inferSchema(i.items),l=n("JsonSchemaForm"),c=n("Button"),p=u.enum,f=this.state.value;if(p){var h=n("Select");return _.default.createElement(h,{className:a.length?"invalid":"",title:a.length?a:"",multiple:!0,value:f,allowedValues:p,allowEmptyValue:!r,onChange:this.onEnumChange})}return _.default.createElement("div",null,!f||f.count()<1?null:f.map(function(t,r){var i=(0,o.default)({},u);if(a.length){var p=a.filter(function(e){return e.index===r});p.length&&(a=[p[0].error+r])}return _.default.createElement("div",{key:r,className:"json-schema-form-item"},_.default.createElement(l,{fn:s,getComponent:n,value:t,onChange:function(t){return e.onItemChange(t,r)},schema:i}),_.default.createElement(c,{className:"btn btn-sm json-schema-form-item-remove",onClick:function(){return e.removeItem(r)}}," - "))}).toArray(),_.default.createElement(c,{className:"btn btn-sm json-schema-form-item-add "+(a.length?"invalid":null),onClick:this.addItem}," Add item "))}}]),t}(y.PureComponent);M.propTypes=C,M.defaultProps=A;var T=t.JsonSchema_boolean=function(e){function t(){var e,n,r,i;(0,p.default)(this,t);for(var o=arguments.length,a=Array(o),s=0;s<o;s++)a[s]=arguments[s];return n=r=(0,m.default)(this,(e=t.__proto__||(0,l.default)(t)).call.apply(e,[this].concat(a))),r.onEnumChange=function(e){return r.props.onChange(e)},i=n,(0,m.default)(r,i)}return(0,g.default)(t,e),(0,h.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.value,r=e.errors,i=e.schema;r=r.toJS?r.toJS():[];var o=t("Select");return _.default.createElement(o,{className:r.length?"invalid":"",title:r.length?r:"",value:String(n),allowedValues:(0,w.fromJS)(i.enum||["true","false"]),allowEmptyValue:!this.props.required,onChange:this.onEnumChange})}}]),t}(y.Component);T.propTypes=C,T.defaultProps=A},function(e,t,n){"use strict";function r(e){var t=e.auth,n=e.authActions,r=e.errActions,i=e.configs,s=e.authConfigs,u=void 0===s?{}:s,l=t.schema,c=t.scopes,p=t.name,f=t.clientId,h=l.get("flow"),d=[];switch(h){case"password":return void n.authorizePassword(t);case"application":return void n.authorizeApplication(t);case"accessCode":d.push("response_type=code");break;case"implicit":d.push("response_type=token");break;case"clientCredentials":return void n.authorizeApplication(t);case"authorizationCode":d.push("response_type=code")}"string"==typeof f&&d.push("client_id="+encodeURIComponent(f));var m=i.oauth2RedirectUrl;if(void 0===m)return void r.newAuthErr({authId:p,source:"validation",level:"error",message:"oauth2RedirectUrl configuration is not passed. Oauth2 authorization cannot be performed."});if(d.push("redirect_uri="+encodeURIComponent(m)),Array.isArray(c)&&0<c.length){var v=u.scopeSeparator||" ";d.push("scope="+encodeURIComponent(c.join(v)))}var g=(0,a.btoa)(new Date);d.push("state="+encodeURIComponent(g)),void 0!==u.realm&&d.push("realm="+encodeURIComponent(u.realm));var y=u.additionalQueryStringParams;for(var _ in y)void 0!==y[_]&&d.push([_,y[_]].map(encodeURIComponent).join("="));var b=l.get("authorizationUrl"),x=[b,d.join("&")].join(-1===b.indexOf("?")?"?":"&"),w=void 0;w="implicit"===h?n.preAuthorizeImplicit:u.useBasicAuthenticationWithAccessCodeGrant?n.authorizeAccessCodeWithBasicAuthentication:n.authorizeAccessCodeWithFormParams,o.default.swaggerUIRedirectOauth2={auth:t,state:g,redirectUrl:m,callback:w,errCb:r.newAuthErr},o.default.open(x)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(46),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(9)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(){return[a.default,u.default]}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(561),a=r(o),s=n(307),u=r(s)},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}function i(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){var e={components:{App:F.default,authorizationPopup:B.default,authorizeBtn:q.default,authorizeOperationBtn:U.default,auths:V.default,AuthItem:G.default,authError:K.default,oauth2:ee.default,apiKeyAuth:Y.default,basicAuth:Z.default,clear:ne.default,liveResponse:ie.default,info:qe.default,onlineValidatorBadge:ae.default,operations:ue.default,operation:ce.default,highlightCode:ve.default,responses:ye.default,response:be.default,responseBody:we.default,parameters:Ee.default,parameterRow:De.default,execute:Me.default,headers:Pe.default,errors:Re.default,contentType:Fe.default,overview:Be.default,footer:Ue.default,ParamBody:Ve.default,curl:Ge.default,schemes:Ke.default,modelExample:Ze.default,ModelWrapper:et.default,ModelCollapse:Ye.default,Model:nt.default,Models:it.default,EnumModel:at.default,ObjectModel:ut.default,ArrayModel:ct.default,PrimitiveModel:ft.default,Property:dt.default,TryItOutButton:vt.default,Markdown:wt.default,BaseLayout:Et.default,VersionStamp:yt.default,OperationExt:fe.default,OperationExtRow:de.default,ParameterExt:Ce.default,OperationContainer:R.default,DeepLink:bt.default}},t={components:Ct},n={components:Dt};return[M.default,E.default,v.default,f.default,c.default,a.default,u.default,d.default,e,t,b.default,n,w.default,y.default,C.default,D.default,P.default]};var o=n(291),a=i(o),s=n(294),u=i(s),l=n(320),c=i(l),p=n(328),f=i(p),h=n(319),d=i(h),m=n(297),v=i(m),g=n(273),y=i(g),_=n(326),b=i(_),x=n(275),w=i(x),k=n(327),E=i(k),S=n(325),C=i(S),A=n(286),D=i(A),O=n(279),M=i(O),T=n(283),P=i(T),I=n(556),R=i(I),j=n(509),F=i(j),N=n(513),B=i(N),L=n(514),q=i(L),z=n(515),U=i(z),W=n(516),V=i(W),H=n(512),G=i(H),J=n(518),K=i(J),X=n(511),Y=i(X),$=n(517),Z=i($),Q=n(519),ee=i(Q),te=n(520),ne=i(te),re=n(532),ie=i(re),oe=n(538),ae=i(oe),se=n(542),ue=i(se),le=n(541),ce=i(le),pe=n(540),fe=i(pe),he=n(539),de=i(he),me=n(529),ve=i(me),ge=n(552),ye=i(ge),_e=n(551),be=i(_e),xe=n(550),we=i(xe),ke=n(547),Ee=i(ke),Se=n(545),Ce=i(Se),Ae=n(546),De=i(Ae),Oe=n(526),Me=i(Oe),Te=n(528),Pe=i(Te),Ie=n(525),Re=i(Ie),je=n(521),Fe=i(je),Ne=n(543),Be=i(Ne),Le=n(530),qe=i(Le),ze=n(527),Ue=i(ze),We=n(544),Ve=i(We),He=n(522),Ge=i(He),Je=n(553),Ke=i(Je),Xe=n(533),Ye=i(Xe),$e=n(534),Ze=i($e),Qe=n(535),et=i(Qe),tt=n(269),nt=i(tt),rt=n(536),it=i(rt),ot=n(524),at=i(ot),st=n(537),ut=i(st),lt=n(510),ct=i(lt),pt=n(548),ft=i(pt),ht=n(549),dt=i(ht),mt=n(554),vt=i(mt),gt=n(555),yt=i(gt),_t=n(523),bt=i(_t),xt=n(270),wt=i(xt),kt=n(531),Et=i(kt),St=n(268),Ct=r(St),At=n(558),Dt=r(At)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t,n){var r=[(0,F.systemThunkMiddleware)(n)],i=j.default.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__||S.compose;return(0,S.createStore)(e,t,i(S.applyMiddleware.apply(void 0,r)))}function o(e,t){return(0,F.isObject)(e)&&!(0,F.isArray)(e)?e:(0,F.isFunc)(e)?o(e(t),t):(0,F.isArray)(e)?e.map(function(e){return o(e,t)}).reduce(s,{}):{}}function a(e,t){var n=this,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},i=r.hasLoaded,o=i;return(0,F.isObject)(e)&&!(0,F.isArray)(e)&&"function"==typeof e.afterLoad&&(o=!0,p(e.afterLoad).call(this,t)),(0,F.isFunc)(e)?a.call(this,e(t),t,{hasLoaded:o}):(0,F.isArray)(e)?e.map(function(e){return a.call(n,e,t,{hasLoaded:o})}):o}function s(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(!(0,F.isObject)(e))return{};if(!(0,F.isObject)(t))return e;t.wrapComponents&&((0,F.objMap)(t.wrapComponents,function(n,r){var i=e.components&&e.components[r];i&&Array.isArray(i)?(e.components[r]=i.concat([n]),delete t.wrapComponents[r]):i&&(e.components[r]=[i,n],delete t.wrapComponents[r])}),(0,d.default)(t.wrapComponents).length||delete t.wrapComponents);var n=e.statePlugins;if((0,F.isObject)(n))for(var r in n){var i=n[r];if((0,F.isObject)(i)&&(0,F.isObject)(i.wrapActions)){var o=i.wrapActions;for(var a in o){var s=o[a];Array.isArray(s)||(s=[s],o[a]=s),t&&t.statePlugins&&t.statePlugins[r]&&t.statePlugins[r].wrapActions&&t.statePlugins[r].wrapActions[a]&&(t.statePlugins[r].wrapActions[a]=o[a].concat(t.statePlugins[r].wrapActions[a]))}}}return(0,O.default)(e,t)}function u(e){return l((0,F.objMap)(e,function(e){return e.reducers}))}function l(e){var t=(0,d.default)(e).reduce(function(t,n){return t[n]=c(e[n]),t},{});return(0,d.default)(t).length?(0,M.combineReducers)(t):N}function c(e){return function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:new C.Map,n=arguments[1];if(!e)return t;var r=e[n.type];if(r){var i=p(r)(t,n);return null===i?t:i}return t}}function p(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.logErrors,r=void 0===n||n;return"function"!=typeof e?e:function(){try{for(var t=arguments.length,n=Array(t),i=0;i<t;i++)n[i]=arguments[i];return e.call.apply(e,[this].concat(n))}catch(e){return r&&console.error(e),null}}}function f(e,t,n){return i(e,t,n)}Object.defineProperty(t,"__esModule",{value:!0});var h=n(47),d=r(h),m=n(36),v=r(m),g=n(30),y=r(g),_=n(2),b=r(_),x=n(3),w=r(x),k=n(0),E=r(k),S=n(486),C=n(7),A=r(C),D=n(203),O=r(D),M=n(1117),T=n(264),P=r(T),I=n(128),R=n(46),j=r(R),F=n(9),N=function(e){return e},B=function(){function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};(0,b.default)(this,e),(0,O.default)(this,{state:{},plugins:[],system:{configs:{},fn:{},components:{},rootInjects:{},statePlugins:{}},boundSystem:{},toolbox:{}},t),this.getSystem=this._getSystem.bind(this),this.store=f(N,(0,C.fromJS)(this.state),this.getSystem),this.buildSystem(!1),this.register(this.plugins)}return(0,w.default)(e,[{key:"getStore",value:function(){return this.store}},{key:"register",value:function(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],n=o(e,this.getSystem());s(this.system,n),t&&this.buildSystem(),a.call(this.system,e,this.getSystem())&&this.buildSystem()}},{key:"buildSystem",value:function(){var e=!(arguments.length>0&&void 0!==arguments[0])||arguments[0],t=this.getStore().dispatch,n=this.getStore().getState;this.boundSystem=(0,y.default)({},this.getRootInjects(),this.getWrappedAndBoundActions(t),this.getWrappedAndBoundSelectors(n,this.getSystem),this.getStateThunks(n),this.getFn(),this.getConfigs()),e&&this.rebuildReducer()}},{key:"_getSystem",value:function(){return this.boundSystem}},{key:"getRootInjects",value:function(){return(0,y.default)({getSystem:this.getSystem,getStore:this.getStore.bind(this),getComponents:this.getComponents.bind(this),getState:this.getStore().getState,getConfigs:this._getConfigs.bind(this),Im:A.default,React:E.default},this.system.rootInjects||{})}},{key:"_getConfigs",value:function(){return this.system.configs}},{key:"getConfigs",value:function(){return{configs:this.system.configs}}},{key:"setConfigs",value:function(e){this.system.configs=e}},{key:"rebuildReducer",value:function(){this.store.replaceReducer(u(this.system.statePlugins))}},{key:"getType",value:function(e){var t=e[0].toUpperCase()+e.slice(1);return(0,F.objReduce)(this.system.statePlugins,function(n,r){var i=n[e];if(i)return(0,v.default)({},r+t,i)})}},{key:"getSelectors",value:function(){return this.getType("selectors")}},{key:"getActions",value:function(){var e=this.getType("actions");return(0,F.objMap)(e,function(e){return(0,F.objReduce)(e,function(e,t){if((0,F.isFn)(e))return(0,v.default)({},t,e)})})}},{key:"getWrappedAndBoundActions",value:function(e){var t=this,n=this.getBoundActions(e);return(0,F.objMap)(n,function(e,n){var r=t.system.statePlugins[n.slice(0,-7)].wrapActions;return r?(0,F.objMap)(e,function(e,n){var i=r[n];return i?(Array.isArray(i)||(i=[i]),i.reduce(function(e,n){var r=function(){return n(e,t.getSystem()).apply(void 0,arguments)};if(!(0,F.isFn)(r))throw new TypeError("wrapActions needs to return a function that returns a new function (ie the wrapped action)");return p(r)},e||Function.prototype)):e}):e})}},{key:"getWrappedAndBoundSelectors",value:function(e,t){var n=this,r=this.getBoundSelectors(e,t);return(0,F.objMap)(r,function(t,r){var i=[r.slice(0,-9)],o=n.system.statePlugins[i].wrapSelectors;return o?(0,F.objMap)(t,function(t,r){var a=o[r];return a?(Array.isArray(a)||(a=[a]),a.reduce(function(t,r){var o=function(){for(var o=arguments.length,a=Array(o),s=0;s<o;s++)a[s]=arguments[s];return r(t,n.getSystem()).apply(void 0,[e().getIn(i)].concat(a))};if(!(0,F.isFn)(o))throw new TypeError("wrapSelector needs to return a function that returns a new function (ie the wrapped action)");return o},t||Function.prototype)):t}):t})}},{key:"getStates",value:function(e){return(0,d.default)(this.system.statePlugins).reduce(function(t,n){return t[n]=e.get(n),t},{})}},{key:"getStateThunks",value:function(e){return(0,d.default)(this.system.statePlugins).reduce(function(t,n){return t[n]=function(){return e().get(n)},t},{})}},{key:"getFn",value:function(){return{fn:this.system.fn}}},{key:"getComponents",value:function(e){var t=this,n=this.system.components[e];return Array.isArray(n)?n.reduce(function(e,n){return n(e,t.getSystem())}):void 0!==e?this.system.components[e]:this.system.components}},{key:"getBoundSelectors",value:function(e,t){return(0,F.objMap)(this.getSelectors(),function(n,r){var i=[r.slice(0,-9)],o=function(){return e().getIn(i)};return(0,F.objMap)(n,function(e){return function(){for(var n=arguments.length,r=Array(n),i=0;i<n;i++)r[i]=arguments[i];var a=p(e).apply(null,[o()].concat(r));return"function"==typeof a&&(a=p(a)(t())),a}})})}},{key:"getBoundActions",value:function(e){e=e||this.getStore().dispatch;var t=this.getActions(),n=function e(t){return"function"!=typeof t?(0,F.objMap)(t,function(t){return e(t)}):function(){var e=null;try{e=t.apply(void 0,arguments)}catch(t){e={type:I.NEW_THROWN_ERR,error:!0,payload:(0,P.default)(t)}}finally{return e}}};return(0,F.objMap)(t,function(t){return(0,S.bindActionCreators)(n(t),e)})}},{key:"getMapStateToProps",value:function(){var e=this;return function(){return(0,y.default)({},e.getSystem())}}},{key:"getMapDispatchToProps",value:function(e){var t=this;return function(n){return(0,O.default)({},t.getWrappedAndBoundActions(n),t.getFn(),e)}}}]),e}();t.default=B},function(e,t,n){e.exports={default:n(585),__esModule:!0}},function(e,t,n){e.exports={default:n(587),__esModule:!0}},function(e,t,n){e.exports={default:n(594),__esModule:!0}},function(e,t,n){e.exports={default:n(596),__esModule:!0}},function(e,t,n){e.exports={default:n(597),__esModule:!0}},function(e,t,n){e.exports={default:n(598),__esModule:!0}},function(e,t,n){e.exports=n(1124)},function(e,t,n){"use strict";function r(e){var t=e.length;if(t%4>0)throw new Error("Invalid string. Length must be a multiple of 4");return"="===e[t-2]?2:"="===e[t-1]?1:0}function i(e){return 3*e.length/4-r(e)}function o(e){var t,n,i,o,a,s=e.length;o=r(e),a=new p(3*s/4-o),n=o>0?s-4:s;var u=0;for(t=0;t<n;t+=4)i=c[e.charCodeAt(t)]<<18|c[e.charCodeAt(t+1)]<<12|c[e.charCodeAt(t+2)]<<6|c[e.charCodeAt(t+3)],a[u++]=i>>16&255,a[u++]=i>>8&255,a[u++]=255&i;return 2===o?(i=c[e.charCodeAt(t)]<<2|c[e.charCodeAt(t+1)]>>4,a[u++]=255&i):1===o&&(i=c[e.charCodeAt(t)]<<10|c[e.charCodeAt(t+1)]<<4|c[e.charCodeAt(t+2)]>>2,a[u++]=i>>8&255,a[u++]=255&i),a}function a(e){return l[e>>18&63]+l[e>>12&63]+l[e>>6&63]+l[63&e]}function s(e,t,n){for(var r,i=[],o=t;o<n;o+=3)r=(e[o]<<16)+(e[o+1]<<8)+e[o+2],i.push(a(r));return i.join("")}function u(e){for(var t,n=e.length,r=n%3,i="",o=[],a=0,u=n-r;a<u;a+=16383)o.push(s(e,a,a+16383>u?u:a+16383));return 1===r?(t=e[n-1],i+=l[t>>2],i+=l[t<<4&63],i+="=="):2===r&&(t=(e[n-2]<<8)+e[n-1],i+=l[t>>10],i+=l[t>>4&63],i+=l[t<<2&63],i+="="),o.push(i),o.join("")}t.byteLength=i,t.toByteArray=o,t.fromByteArray=u;for(var l=[],c=[],p="undefined"!=typeof Uint8Array?Uint8Array:Array,f="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",h=0,d=f.length;h<d;++h)l[h]=f[h],c[f.charCodeAt(h)]=h;c["-".charCodeAt(0)]=62,c["_".charCodeAt(0)]=63},function(e,t,n){/*!
-+ * Bowser - a browser detector
-+ * https://github.com/ded/bowser
-+ * MIT License | (c) Dustin Diaz 2015
-+ */
-+!function(t,r,i){void 0!==e&&e.exports?e.exports=i():n(1195)("bowser",i)}(0,0,function(){function e(e){function t(t){var n=e.match(t);return n&&n.length>1&&n[1]||""}function n(t){var n=e.match(t);return n&&n.length>1&&n[2]||""}var r,i=t(/(ipod|iphone|ipad)/i).toLowerCase(),o=/like android/i.test(e),s=!o&&/android/i.test(e),u=/nexus\s*[0-6]\s*/i.test(e),l=!u&&/nexus\s*[0-9]+/i.test(e),c=/CrOS/.test(e),p=/silk/i.test(e),f=/sailfish/i.test(e),h=/tizen/i.test(e),d=/(web|hpw)os/i.test(e),m=/windows phone/i.test(e),v=(/SamsungBrowser/i.test(e),!m&&/windows/i.test(e)),g=!i&&!p&&/macintosh/i.test(e),y=!s&&!f&&!h&&!d&&/linux/i.test(e),_=n(/edg([ea]|ios)\/(\d+(\.\d+)?)/i),b=t(/version\/(\d+(\.\d+)?)/i),x=/tablet/i.test(e)&&!/tablet pc/i.test(e),w=!x&&/[^-]mobi/i.test(e),k=/xbox/i.test(e);/opera/i.test(e)?r={name:"Opera",opera:a,version:b||t(/(?:opera|opr|opios)[\s\/](\d+(\.\d+)?)/i)}:/opr\/|opios/i.test(e)?r={name:"Opera",opera:a,version:t(/(?:opr|opios)[\s\/](\d+(\.\d+)?)/i)||b}:/SamsungBrowser/i.test(e)?r={name:"Samsung Internet for Android",samsungBrowser:a,version:b||t(/(?:SamsungBrowser)[\s\/](\d+(\.\d+)?)/i)}:/coast/i.test(e)?r={name:"Opera Coast",coast:a,version:b||t(/(?:coast)[\s\/](\d+(\.\d+)?)/i)}:/yabrowser/i.test(e)?r={name:"Yandex Browser",yandexbrowser:a,version:b||t(/(?:yabrowser)[\s\/](\d+(\.\d+)?)/i)}:/ucbrowser/i.test(e)?r={name:"UC Browser",ucbrowser:a,version:t(/(?:ucbrowser)[\s\/](\d+(?:\.\d+)+)/i)}:/mxios/i.test(e)?r={name:"Maxthon",maxthon:a,version:t(/(?:mxios)[\s\/](\d+(?:\.\d+)+)/i)}:/epiphany/i.test(e)?r={name:"Epiphany",epiphany:a,version:t(/(?:epiphany)[\s\/](\d+(?:\.\d+)+)/i)}:/puffin/i.test(e)?r={name:"Puffin",puffin:a,version:t(/(?:puffin)[\s\/](\d+(?:\.\d+)?)/i)}:/sleipnir/i.test(e)?r={name:"Sleipnir",sleipnir:a,version:t(/(?:sleipnir)[\s\/](\d+(?:\.\d+)+)/i)}:/k-meleon/i.test(e)?r={name:"K-Meleon",kMeleon:a,version:t(/(?:k-meleon)[\s\/](\d+(?:\.\d+)+)/i)}:m?(r={name:"Windows Phone",osname:"Windows Phone",windowsphone:a},_?(r.msedge=a,r.version=_):(r.msie=a,r.version=t(/iemobile\/(\d+(\.\d+)?)/i))):/msie|trident/i.test(e)?r={name:"Internet Explorer",msie:a,version:t(/(?:msie |rv:)(\d+(\.\d+)?)/i)}:c?r={name:"Chrome",osname:"Chrome OS",chromeos:a,chromeBook:a,chrome:a,version:t(/(?:chrome|crios|crmo)\/(\d+(\.\d+)?)/i)}:/edg([ea]|ios)/i.test(e)?r={name:"Microsoft Edge",msedge:a,version:_}:/vivaldi/i.test(e)?r={name:"Vivaldi",vivaldi:a,version:t(/vivaldi\/(\d+(\.\d+)?)/i)||b}:f?r={name:"Sailfish",osname:"Sailfish OS",sailfish:a,version:t(/sailfish\s?browser\/(\d+(\.\d+)?)/i)}:/seamonkey\//i.test(e)?r={name:"SeaMonkey",seamonkey:a,version:t(/seamonkey\/(\d+(\.\d+)?)/i)}:/firefox|iceweasel|fxios/i.test(e)?(r={name:"Firefox",firefox:a,version:t(/(?:firefox|iceweasel|fxios)[ \/](\d+(\.\d+)?)/i)},/\((mobile|tablet);[^\)]*rv:[\d\.]+\)/i.test(e)&&(r.firefoxos=a,r.osname="Firefox OS")):p?r={name:"Amazon Silk",silk:a,version:t(/silk\/(\d+(\.\d+)?)/i)}:/phantom/i.test(e)?r={name:"PhantomJS",phantom:a,version:t(/phantomjs\/(\d+(\.\d+)?)/i)}:/slimerjs/i.test(e)?r={name:"SlimerJS",slimer:a,version:t(/slimerjs\/(\d+(\.\d+)?)/i)}:/blackberry|\bbb\d+/i.test(e)||/rim\stablet/i.test(e)?r={name:"BlackBerry",osname:"BlackBerry OS",blackberry:a,version:b||t(/blackberry[\d]+\/(\d+(\.\d+)?)/i)}:d?(r={name:"WebOS",osname:"WebOS",webos:a,version:b||t(/w(?:eb)?osbrowser\/(\d+(\.\d+)?)/i)},/touchpad\//i.test(e)&&(r.touchpad=a)):/bada/i.test(e)?r={name:"Bada",osname:"Bada",bada:a,version:t(/dolfin\/(\d+(\.\d+)?)/i)}:h?r={name:"Tizen",osname:"Tizen",tizen:a,version:t(/(?:tizen\s?)?browser\/(\d+(\.\d+)?)/i)||b}:/qupzilla/i.test(e)?r={name:"QupZilla",qupzilla:a,version:t(/(?:qupzilla)[\s\/](\d+(?:\.\d+)+)/i)||b}:/chromium/i.test(e)?r={name:"Chromium",chromium:a,version:t(/(?:chromium)[\s\/](\d+(?:\.\d+)?)/i)||b}:/chrome|crios|crmo/i.test(e)?r={name:"Chrome",chrome:a,version:t(/(?:chrome|crios|crmo)\/(\d+(\.\d+)?)/i)}:s?r={name:"Android",version:b}:/safari|applewebkit/i.test(e)?(r={name:"Safari",safari:a},b&&(r.version=b)):i?(r={name:"iphone"==i?"iPhone":"ipad"==i?"iPad":"iPod"},b&&(r.version=b)):r=/googlebot/i.test(e)?{name:"Googlebot",googlebot:a,version:t(/googlebot\/(\d+(\.\d+))/i)||b}:{name:t(/^(.*)\/(.*) /),version:n(/^(.*)\/(.*) /)},!r.msedge&&/(apple)?webkit/i.test(e)?(/(apple)?webkit\/537\.36/i.test(e)?(r.name=r.name||"Blink",r.blink=a):(r.name=r.name||"Webkit",r.webkit=a),!r.version&&b&&(r.version=b)):!r.opera&&/gecko\//i.test(e)&&(r.name=r.name||"Gecko",r.gecko=a,r.version=r.version||t(/gecko\/(\d+(\.\d+)?)/i)),r.windowsphone||!s&&!r.silk?!r.windowsphone&&i?(r[i]=a,r.ios=a,r.osname="iOS"):g?(r.mac=a,r.osname="macOS"):k?(r.xbox=a,r.osname="Xbox"):v?(r.windows=a,r.osname="Windows"):y&&(r.linux=a,r.osname="Linux"):(r.android=a,r.osname="Android");var E="";r.windows?E=function(e){switch(e){case"NT":return"NT";case"XP":return"XP";case"NT 5.0":return"2000";case"NT 5.1":return"XP";case"NT 5.2":return"2003";case"NT 6.0":return"Vista";case"NT 6.1":return"7";case"NT 6.2":return"8";case"NT 6.3":return"8.1";case"NT 10.0":return"10";default:return}}(t(/Windows ((NT|XP)( \d\d?.\d)?)/i)):r.windowsphone?E=t(/windows phone (?:os)?\s?(\d+(\.\d+)*)/i):r.mac?(E=t(/Mac OS X (\d+([_\.\s]\d+)*)/i),E=E.replace(/[_\s]/g,".")):i?(E=t(/os (\d+([_\s]\d+)*) like mac os x/i),E=E.replace(/[_\s]/g,".")):s?E=t(/android[ \/-](\d+(\.\d+)*)/i):r.webos?E=t(/(?:web|hpw)os\/(\d+(\.\d+)*)/i):r.blackberry?E=t(/rim\stablet\sos\s(\d+(\.\d+)*)/i):r.bada?E=t(/bada\/(\d+(\.\d+)*)/i):r.tizen&&(E=t(/tizen[\/\s](\d+(\.\d+)*)/i)),E&&(r.osversion=E);var S=!r.windows&&E.split(".")[0];return x||l||"ipad"==i||s&&(3==S||S>=4&&!w)||r.silk?r.tablet=a:(w||"iphone"==i||"ipod"==i||s||u||r.blackberry||r.webos||r.bada)&&(r.mobile=a),r.msedge||r.msie&&r.version>=10||r.yandexbrowser&&r.version>=15||r.vivaldi&&r.version>=1||r.chrome&&r.version>=20||r.samsungBrowser&&r.version>=4||r.firefox&&r.version>=20||r.safari&&r.version>=6||r.opera&&r.version>=10||r.ios&&r.osversion&&r.osversion.split(".")[0]>=6||r.blackberry&&r.version>=10.1||r.chromium&&r.version>=20?r.a=a:r.msie&&r.version<10||r.chrome&&r.version<20||r.firefox&&r.version<20||r.safari&&r.version<6||r.opera&&r.version<10||r.ios&&r.osversion&&r.osversion.split(".")[0]<6||r.chromium&&r.version<20?r.c=a:r.x=a,r}function t(e){return e.split(".").length}function n(e,t){var n,r=[];if(Array.prototype.map)return Array.prototype.map.call(e,t);for(n=0;n<e.length;n++)r.push(t(e[n]));return r}function r(e){for(var r=Math.max(t(e[0]),t(e[1])),i=n(e,function(e){var i=r-t(e);return e+=new Array(i+1).join(".0"),n(e.split("."),function(e){return new Array(20-e.length).join("0")+e}).reverse()});--r>=0;){if(i[0][r]>i[1][r])return 1;if(i[0][r]!==i[1][r])return-1;if(0===r)return 0}}function i(t,n,i){var o=s;"string"==typeof n&&(i=n,n=void 0),void 0===n&&(n=!1),i&&(o=e(i));var a=""+o.version;for(var u in t)if(t.hasOwnProperty(u)&&o[u]){if("string"!=typeof t[u])throw new Error("Browser version in the minVersion map should be a string: "+u+": "+String(t));return r([a,t[u]])<0}return n}function o(e,t,n){return!i(e,t,n)}var a=!0,s=e("undefined"!=typeof navigator?navigator.userAgent||"":"");return s.test=function(e){for(var t=0;t<e.length;++t){var n=e[t];if("string"==typeof n&&n in s)return!0}return!1},s.isUnsupportedBrowser=i,s.compareVersions=r,s.check=o,s._detect=e,s})},function(e,t,n){(function(t){!function(){"use strict";function n(e){var n;return n=e instanceof t?e:new t(e.toString(),"binary"),n.toString("base64")}e.exports=n}()}).call(t,n(40).Buffer)},function(e,t,n){var r,i;/*!
-+  Copyright (c) 2016 Jed Watson.
-+  Licensed under the MIT License (MIT), see
-+  http://jedwatson.github.io/classnames
-+*/
-+!function(){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var i=typeof r;if("string"===i||"number"===i)e.push(r);else if(Array.isArray(r))e.push(n.apply(null,r));else if("object"===i)for(var a in r)o.call(r,a)&&r[a]&&e.push(a)}}return e.join(" ")}var o={}.hasOwnProperty;void 0!==e&&e.exports?e.exports=n:(r=[],void 0!==(i=function(){return n}.apply(t,r))&&(e.exports=i))}()},function(e,t,n){"use strict";function r(e){return{key:e.nodeKey,className:e.className,"data-sourcepos":e["data-sourcepos"]}}function i(e){var t=e.toLowerCase(),n=w[t]||t;return void 0!==k[n]?n:e}function o(e){return Object.keys(e||{}).reduce(function(t,n){return t[i(n)]=e[n],t},{})}function a(e){var t=r(e),n=e.escapeHtml?{}:{dangerouslySetInnerHTML:{__html:e.literal}},i=e.escapeHtml?[e.literal]:null;if(e.escapeHtml||!e.skipHtml){var o=y(t,n);return l(e.isBlock?"div":"span",o,i)}}function s(e){var t=e.parent.parent;return t&&"list"===t.type.toLowerCase()&&t.listTight}function u(e,t){var n=e;do{n=n.parent}while(!n.react);n.react.children.push(t)}function l(e,t,n){var r=Array.isArray(n)&&n.reduce(c,[]),i=[e,t].concat(r||n);return g.createElement.apply(g,i)}function c(e,t){var n=e.length-1;return"string"==typeof t&&"string"==typeof e[n]?e[n]+=t:e.push(t),e}function p(e){return[e[0][0],":",e[0][1],"-",e[1][0],":",e[1][1]].map(String).join("")}function f(e,t,n,r){var o={key:t};n.sourcePos&&e.sourcepos&&(o["data-sourcepos"]=p(e.sourcepos));var a=i(e.type);switch(a){case"html_inline":case"html_block":o.isBlock="html_block"===a,o.escapeHtml=n.escapeHtml,o.skipHtml=n.skipHtml;break;case"code_block":var s=e.info?e.info.split(/ +/):[];s.length>0&&s[0].length>0&&(o.language=s[0],o.codeinfo=s);break;case"code":o.children=e.literal,o.inline=!0;break;case"heading":o.level=e.level;break;case"softbreak":o.softBreak=n.softBreak;break;case"link":o.href=n.transformLinkUri?n.transformLinkUri(e.destination):e.destination,o.title=e.title||void 0,n.linkTarget&&(o.target=n.linkTarget);break;case"image":o.src=n.transformImageUri?n.transformImageUri(e.destination):e.destination,o.title=e.title||void 0,o.alt=e.react.children.join(""),e.react.children=void 0;break;case"list":o.start=e.listStart,o.type=e.listType,o.tight=e.listTight}"string"!=typeof r&&(o.literal=e.literal);var u=o.children||e.react&&e.react.children;return Array.isArray(u)&&(o.children=u.reduce(c,[])||null),o}function h(e){return e?e.sourcepos?p(e.sourcepos):h(e.parent):null}function d(e){for(var t,n,r,o,a,l,c,p,d,m=e.walker(),v={sourcePos:this.sourcePos,escapeHtml:this.escapeHtml,skipHtml:this.skipHtml,transformLinkUri:this.transformLinkUri,transformImageUri:this.transformImageUri,softBreak:this.softBreak,linkTarget:this.linkTarget},_=0;t=m.next();){var b=h(t.node.sourcepos?t.node:t.node.parent);if(d===b?(c=b+_,_++):(c=b,_=0),d=b,r=t.entering,o=!r,n=t.node,a=i(n.type),p=null,l){if(n!==l&&!("paragraph"===a&&s(n)||this.skipHtml&&("html_block"===a||"html_inline"===a))){var w=n===l,k=-1===this.allowedTypes.indexOf(a),E=!1,S=n.isContainer&&o,C=this.renderers[a];if(this.allowNode&&(S||!n.isContainer)){var A=S?n.react.children:[];p=f(n,c,v,C),E=!this.allowNode({type:x(a),renderer:this.renderers[a],props:p,children:A})}if(w||!E&&!k){var D="text"===a||"softbreak"===a;if("function"!=typeof C&&!D&&"string"!=typeof C)throw new Error("Renderer for type `"+x(n.type)+"` not defined or is not renderable");if(n.isContainer&&r)n.react={component:C,props:{},children:[]};else{var O=p||f(n,c,v,C);if(C)O="string"==typeof C?O:y(O,{nodeKey:O.key}),u(n,g.createElement(C,O));else if("text"===a)u(n,n.literal);else if("softbreak"===a){var M="br"===this.softBreak?g.createElement("br",{key:c}):this.softBreak;u(n,M)}}}else!this.unwrapDisallowed&&r&&n.isContainer&&m.resumeAt(n,!1)}}else l=n,n.react={children:[]}}return l.react.children}function m(e){var t=e.replace(/file:\/\//g,"x-file://");return decodeURI(b.uriInDoubleQuotedAttr(t))}function v(e){var t=e||{};if(t.allowedTypes&&t.disallowedTypes)throw new Error("Only one of `allowedTypes` and `disallowedTypes` should be defined");if(t.allowedTypes&&!Array.isArray(t.allowedTypes))throw new Error("`allowedTypes` must be an array");if(t.disallowedTypes&&!Array.isArray(t.disallowedTypes))throw new Error("`disallowedTypes` must be an array");if(t.allowNode&&"function"!=typeof t.allowNode)throw new Error("`allowNode` must be a function");var n=t.transformLinkUri;if(void 0===n)n=m;else if(n&&"function"!=typeof n)throw new Error("`transformLinkUri` must either be a function, or `null` to disable");var r=t.transformImageUri;if(void 0!==r&&"function"!=typeof r)throw new Error("`transformImageUri` must be a function");if(t.renderers&&!_(t.renderers))throw new Error("`renderers` must be a plain object of `Type`: `Renderer` pairs");var a=t.allowedTypes&&t.allowedTypes.map(i)||E;if(t.disallowedTypes){var s=t.disallowedTypes.map(i);a=a.filter(function(e){return-1===s.indexOf(e)})}return{sourcePos:Boolean(t.sourcePos),softBreak:t.softBreak||"\n",renderers:y({},k,o(t.renderers)),escapeHtml:Boolean(t.escapeHtml),skipHtml:Boolean(t.skipHtml),transformLinkUri:n,transformImageUri:r,allowNode:t.allowNode,allowedTypes:a,unwrapDisallowed:Boolean(t.unwrapDisallowed),render:d,linkTarget:t.linkTarget||!1}}var g=n(0),y=n(823),_=n(826),b=n(1199),x=n(979),w={blockquote:"block_quote",thematicbreak:"thematic_break",htmlblock:"html_block",htmlinline:"html_inline",codeblock:"code_block",hardbreak:"linebreak"},k={block_quote:"blockquote",emph:"em",linebreak:"br",image:"img",item:"li",link:"a",paragraph:"p",strong:"strong",thematic_break:"hr",html_block:a,html_inline:a,list:function(e){var t="bullet"===e.type.toLowerCase()?"ul":"ol",n=r(e);return null!==e.start&&1!==e.start&&(n.start=e.start.toString()),l(t,n,e.children)},code_block:function(e){var t=e.language&&"language-"+e.language,n=l("code",{className:t},e.literal);return l("pre",r(e),n)},code:function(e){return l("code",r(e),e.children)},heading:function(e){return l("h"+e.level,r(e),e.children)},text:null,softbreak:null},E=Object.keys(k);v.uriTransformer=m,v.types=E.map(x),v.renderers=E.reduce(function(e,t){return e[x(t)]=k[t],e},{}),e.exports=v},function(e,t,n){"use strict";function r(e){return{doc:new B,blocks:M,blockStarts:T,tip:this.doc,oldtip:this.doc,currentLine:"",lineNumber:0,offset:0,column:0,nextNonspace:0,nextNonspaceColumn:0,indent:0,indented:!1,blank:!1,partiallyConsumedTab:!1,allClosed:!0,lastMatchedContainer:this.doc,refmap:{},lastLineLength:0,inlineParser:new u(e),findNextNonspace:R,advanceOffset:P,advanceNextNonspace:I,addLine:S,addChild:C,incorporateLine:j,finalize:F,processInlines:N,closeUnmatchedBlocks:O,parse:L,options:e||{}}}var i=n(174),o=n(73).unescapeString,a=n(73).OPENTAG,s=n(73).CLOSETAG,u=n(578),l=[/./,/^<(?:script|pre|style)(?:\s|>|$)/i,/^<!--/,/^<[?]/,/^<![A-Z]/,/^<!\[CDATA\[/,/^<[\/]?(?:address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[123456]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|title|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(?:\s|[\/]?[>]|$)/i,new RegExp("^(?:"+a+"|"+s+")\\s*$","i")],c=[/./,/<\/(?:script|pre|style)>/i,/-->/,/\?>/,/>/,/\]\]>/],p=/^(?:(?:\*[ \t]*){3,}|(?:_[ \t]*){3,}|(?:-[ \t]*){3,})[ \t]*$/,f=/^[#`~*+_=<>0-9-]/,h=/[^ \t\f\v\r\n]/,d=/^[*+-]/,m=/^(\d{1,9})([.)])/,v=/^#{1,6}(?:[ \t]+|$)/,g=/^`{3,}(?!.*`)|^~{3,}(?!.*~)/,y=/^(?:`{3,}|~{3,})(?= *$)/,_=/^(?:=+|-+)[ \t]*$/,b=/\r\n|\n|\r/,x=function(e){return!h.test(e)},w=function(e){return 32===e||9===e},k=function(e,t){return t<e.length?e.charCodeAt(t):-1},E=function(e){for(;e;){if(e._lastLineBlank)return!0;var t=e.type;if("list"!==t&&"item"!==t)break;e=e._lastChild}return!1},S=function(){if(this.partiallyConsumedTab){this.offset+=1;var e=4-this.column%4;this.tip._string_content+=" ".repeat(e)}this.tip._string_content+=this.currentLine.slice(this.offset)+"\n"},C=function(e,t){for(;!this.blocks[this.tip.type].canContain(e);)this.finalize(this.tip,this.lineNumber-1);var n=t+1,r=new i(e,[[this.lineNumber,n],[0,0]]);return r._string_content="",this.tip.appendChild(r),this.tip=r,r},A=function(e,t){var n,r,i,o,a=e.currentLine.slice(e.nextNonspace),s={type:null,tight:!0,bulletChar:null,start:null,delimiter:null,padding:null,markerOffset:e.indent};if(n=a.match(d))s.type="bullet",s.bulletChar=n[0][0];else{if(!(n=a.match(m))||"paragraph"===t.type&&"1"!==n[1])return null;s.type="ordered",s.start=parseInt(n[1]),s.delimiter=n[2]}if(-1!==(r=k(e.currentLine,e.nextNonspace+n[0].length))&&9!==r&&32!==r)return null;if("paragraph"===t.type&&!e.currentLine.slice(e.nextNonspace+n[0].length).match(h))return null;e.advanceNextNonspace(),e.advanceOffset(n[0].length,!0),i=e.column,o=e.offset;do{e.advanceOffset(1,!0),r=k(e.currentLine,e.offset)}while(e.column-i<5&&w(r));var u=-1===k(e.currentLine,e.offset),l=e.column-i;return l>=5||l<1||u?(s.padding=n[0].length+1,e.column=i,e.offset=o,w(k(e.currentLine,e.offset))&&e.advanceOffset(1,!0)):s.padding=n[0].length+l,s},D=function(e,t){return e.type===t.type&&e.delimiter===t.delimiter&&e.bulletChar===t.bulletChar},O=function(){if(!this.allClosed){for(;this.oldtip!==this.lastMatchedContainer;){var e=this.oldtip._parent;this.finalize(this.oldtip,this.lineNumber-1),this.oldtip=e}this.allClosed=!0}},M={document:{continue:function(){return 0},finalize:function(){},canContain:function(e){return"item"!==e},acceptsLines:!1},list:{continue:function(){return 0},finalize:function(e,t){for(var n=t._firstChild;n;){if(E(n)&&n._next){t._listData.tight=!1;break}for(var r=n._firstChild;r;){if(E(r)&&(n._next||r._next)){t._listData.tight=!1;break}r=r._next}n=n._next}},canContain:function(e){return"item"===e},acceptsLines:!1},block_quote:{continue:function(e){var t=e.currentLine;return e.indented||62!==k(t,e.nextNonspace)?1:(e.advanceNextNonspace(),e.advanceOffset(1,!1),w(k(t,e.offset))&&e.advanceOffset(1,!0),0)},finalize:function(){},canContain:function(e){return"item"!==e},acceptsLines:!1},item:{continue:function(e,t){if(e.blank){if(null==t._firstChild)return 1;e.advanceNextNonspace()}else{if(!(e.indent>=t._listData.markerOffset+t._listData.padding))return 1;e.advanceOffset(t._listData.markerOffset+t._listData.padding,!0)}return 0},finalize:function(){},canContain:function(e){return"item"!==e},acceptsLines:!1},heading:{continue:function(){return 1},finalize:function(){},canContain:function(){return!1},acceptsLines:!1},thematic_break:{continue:function(){return 1},finalize:function(){},canContain:function(){return!1},acceptsLines:!1},code_block:{continue:function(e,t){var n=e.currentLine,r=e.indent;if(t._isFenced){var i=r<=3&&n.charAt(e.nextNonspace)===t._fenceChar&&n.slice(e.nextNonspace).match(y);if(i&&i[0].length>=t._fenceLength)return e.finalize(t,e.lineNumber),2;for(var o=t._fenceOffset;o>0&&w(k(n,e.offset));)e.advanceOffset(1,!0),o--}else if(r>=4)e.advanceOffset(4,!0);else{if(!e.blank)return 1;e.advanceNextNonspace()}return 0},finalize:function(e,t){if(t._isFenced){var n=t._string_content,r=n.indexOf("\n"),i=n.slice(0,r),a=n.slice(r+1);t.info=o(i.trim()),t._literal=a}else t._literal=t._string_content.replace(/(\n *)+$/,"\n");t._string_content=null},canContain:function(){return!1},acceptsLines:!0},html_block:{continue:function(e,t){return!e.blank||6!==t._htmlBlockType&&7!==t._htmlBlockType?0:1},finalize:function(e,t){t._literal=t._string_content.replace(/(\n *)+$/,""),t._string_content=null},canContain:function(){return!1},acceptsLines:!0},paragraph:{continue:function(e){return e.blank?1:0},finalize:function(e,t){for(var n,r=!1;91===k(t._string_content,0)&&(n=e.inlineParser.parseReference(t._string_content,e.refmap));)t._string_content=t._string_content.slice(n),r=!0;r&&x(t._string_content)&&t.unlink()},canContain:function(){return!1},acceptsLines:!0}},T=[function(e){return e.indented||62!==k(e.currentLine,e.nextNonspace)?0:(e.advanceNextNonspace(),e.advanceOffset(1,!1),w(k(e.currentLine,e.offset))&&e.advanceOffset(1,!0),e.closeUnmatchedBlocks(),e.addChild("block_quote",e.nextNonspace),1)},function(e){var t;if(!e.indented&&(t=e.currentLine.slice(e.nextNonspace).match(v))){e.advanceNextNonspace(),e.advanceOffset(t[0].length,!1),e.closeUnmatchedBlocks();var n=e.addChild("heading",e.nextNonspace);return n.level=t[0].trim().length,n._string_content=e.currentLine.slice(e.offset).replace(/^[ \t]*#+[ \t]*$/,"").replace(/[ \t]+#+[ \t]*$/,""),e.advanceOffset(e.currentLine.length-e.offset),2}return 0},function(e){var t;if(!e.indented&&(t=e.currentLine.slice(e.nextNonspace).match(g))){var n=t[0].length;e.closeUnmatchedBlocks();var r=e.addChild("code_block",e.nextNonspace);return r._isFenced=!0,r._fenceLength=n,r._fenceChar=t[0][0],r._fenceOffset=e.indent,e.advanceNextNonspace(),e.advanceOffset(n,!1),2}return 0},function(e,t){if(!e.indented&&60===k(e.currentLine,e.nextNonspace)){var n,r=e.currentLine.slice(e.nextNonspace);for(n=1;n<=7;n++)if(l[n].test(r)&&(n<7||"paragraph"!==t.type)){e.closeUnmatchedBlocks();var i=e.addChild("html_block",e.offset);return i._htmlBlockType=n,2}}return 0},function(e,t){var n;if(!e.indented&&"paragraph"===t.type&&(n=e.currentLine.slice(e.nextNonspace).match(_))){e.closeUnmatchedBlocks();var r=new i("heading",t.sourcepos);return r.level="="===n[0][0]?1:2,r._string_content=t._string_content,t.insertAfter(r),t.unlink(),e.tip=r,e.advanceOffset(e.currentLine.length-e.offset,!1),2}return 0},function(e){return!e.indented&&p.test(e.currentLine.slice(e.nextNonspace))?(e.closeUnmatchedBlocks(),e.addChild("thematic_break",e.nextNonspace),e.advanceOffset(e.currentLine.length-e.offset,!1),2):0},function(e,t){var n;return e.indented&&"list"!==t.type||!(n=A(e,t))?0:(e.closeUnmatchedBlocks(),"list"===e.tip.type&&D(t._listData,n)||(t=e.addChild("list",e.nextNonspace),t._listData=n),t=e.addChild("item",e.nextNonspace),t._listData=n,1)},function(e){return e.indented&&"paragraph"!==e.tip.type&&!e.blank?(e.advanceOffset(4,!0),e.closeUnmatchedBlocks(),e.addChild("code_block",e.offset),2):0}],P=function(e,t){for(var n,r,i,o=this.currentLine;e>0&&(i=o[this.offset]);)"\t"===i?(n=4-this.column%4,t?(this.partiallyConsumedTab=n>e,r=n>e?e:n,this.column+=r,this.offset+=this.partiallyConsumedTab?0:1,e-=r):(this.partiallyConsumedTab=!1,this.column+=n,this.offset+=1,e-=1)):(this.partiallyConsumedTab=!1,this.offset+=1,this.column+=1,e-=1)},I=function(){this.offset=this.nextNonspace,this.column=this.nextNonspaceColumn,this.partiallyConsumedTab=!1},R=function(){for(var e,t=this.currentLine,n=this.offset,r=this.column;""!==(e=t.charAt(n));)if(" "===e)n++,r++;else{if("\t"!==e)break;n++,r+=4-r%4}this.blank="\n"===e||"\r"===e||""===e,this.nextNonspace=n,this.nextNonspaceColumn=r,this.indent=this.nextNonspaceColumn-this.column,this.indented=this.indent>=4},j=function(e){var t,n=!0,r=this.doc;this.oldtip=this.tip,this.offset=0,this.column=0,this.blank=!1,this.partiallyConsumedTab=!1,this.lineNumber+=1,-1!==e.indexOf("\0")&&(e=e.replace(/\0/g,"�")),this.currentLine=e;for(var i;(i=r._lastChild)&&i._open;){switch(r=i,this.findNextNonspace(),this.blocks[r.type].continue(this,r)){case 0:break;case 1:n=!1;break;case 2:return void(this.lastLineLength=e.length);default:throw"continue returned illegal value, must be 0, 1, or 2"}if(!n){r=r._parent;break}}this.allClosed=r===this.oldtip,this.lastMatchedContainer=r;for(var o="paragraph"!==r.type&&M[r.type].acceptsLines,a=this.blockStarts,s=a.length;!o;){if(this.findNextNonspace(),!this.indented&&!f.test(e.slice(this.nextNonspace))){this.advanceNextNonspace();break}for(var u=0;u<s;){var l=a[u](this,r);if(1===l){r=this.tip;break}if(2===l){r=this.tip,o=!0;break}u++}if(u===s){this.advanceNextNonspace();break}}if(this.allClosed||this.blank||"paragraph"!==this.tip.type){this.closeUnmatchedBlocks(),this.blank&&r.lastChild&&(r.lastChild._lastLineBlank=!0),t=r.type;for(var p=this.blank&&!("block_quote"===t||"code_block"===t&&r._isFenced||"item"===t&&!r._firstChild&&r.sourcepos[0][0]===this.lineNumber),h=r;h;)h._lastLineBlank=p,h=h._parent;this.blocks[t].acceptsLines?(this.addLine(),"html_block"===t&&r._htmlBlockType>=1&&r._htmlBlockType<=5&&c[r._htmlBlockType].test(this.currentLine.slice(this.offset))&&this.finalize(r,this.lineNumber)):this.offset<e.length&&!this.blank&&(r=this.addChild("paragraph",this.offset),this.advanceNextNonspace(),this.addLine())}else this.addLine();this.lastLineLength=e.length},F=function(e,t){var n=e._parent;e._open=!1,e.sourcepos[1]=[t,this.lastLineLength],this.blocks[e.type].finalize(this,e),this.tip=n},N=function(e){var t,n,r,i=e.walker();for(this.inlineParser.refmap=this.refmap,this.inlineParser.options=this.options;n=i.next();)t=n.node,r=t.type,n.entering||"paragraph"!==r&&"heading"!==r||this.inlineParser.parse(t)},B=function(){return new i("document",[[1,1],[0,0]])},L=function(e){this.doc=new B,this.tip=this.doc,this.refmap={},this.lineNumber=0,this.lastLineLength=0,this.offset=0,this.column=0,this.lastMatchedContainer=this.doc,this.currentLine="",this.options.time&&console.time("preparing input");var t=e.split(b),n=t.length;10===e.charCodeAt(e.length-1)&&(n-=1),this.options.time&&console.timeEnd("preparing input"),this.options.time&&console.time("block parsing");for(var r=0;r<n;r++)this.incorporateLine(t[r]);for(;this.tip;)this.finalize(this.tip,n);return this.options.time&&console.timeEnd("block parsing"),this.options.time&&console.time("inline parsing"),this.processInlines(this.doc),this.options.time&&console.timeEnd("inline parsing"),this.doc};e.exports=r},function(e,t,n){"use strict";/*! http://mths.be/fromcodepoint v0.2.1 by @mathias */
-+if(String.fromCodePoint)e.exports=function(e){try{return String.fromCodePoint(e)}catch(e){if(e instanceof RangeError)return String.fromCharCode(65533);throw e}};else{var r=String.fromCharCode,i=Math.floor,o=function(){var e,t,n=[],o=-1,a=arguments.length;if(!a)return"";for(var s="";++o<a;){var u=Number(arguments[o]);if(!isFinite(u)||u<0||u>1114111||i(u)!==u)return String.fromCharCode(65533);u<=65535?n.push(u):(u-=65536,e=55296+(u>>10),t=u%1024+56320,n.push(e,t)),(o+1===a||n.length>16384)&&(s+=r.apply(null,n),n.length=0)}return s};e.exports=o}},function(e,t,n){"use strict";e.exports.Node=n(174),e.exports.Parser=n(575),e.exports.HtmlRenderer=n(580),e.exports.XmlRenderer=n(581)},function(e,t,n){"use strict";function r(e){return{subject:"",delimiters:null,brackets:null,pos:0,refmap:{},match:F,peek:N,spnl:B,parseBackticks:L,parseBackslash:q,parseAutolink:z,parseHtmlTag:U,scanDelims:W,handleDelim:V,parseLinkTitle:K,parseLinkDestination:X,parseLinkLabel:Y,parseOpenBracket:$,parseBang:Z,parseCloseBracket:Q,addBracket:ee,removeBracket:te,parseEntity:ne,parseString:re,parseNewline:ie,parseReference:oe,parseInline:ae,processEmphasis:J,removeDelimiter:H,options:e||{},parse:se}}var i=n(174),o=n(73),a=n(579),s=o.normalizeURI,u=o.unescapeString,l=n(576),c=n(114).decodeHTML;n(494);var p=o.ESCAPABLE,f="\\\\"+p,h=o.ENTITY,d=o.reHtmlTag,m=new RegExp(/[!"#$%&'()*+,\-.\/:;<=>?@\[\]^_`{|}~\xA1\xA7\xAB\xB6\xB7\xBB\xBF\u037E\u0387\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061E\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u0AF0\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F14\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1360-\u1368\u1400\u166D\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CC0-\u1CC7\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u2308-\u230B\u2329\u232A\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30-\u2E42\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uAAF0\uAAF1\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]|\uD800[\uDD00-\uDD02\uDF9F\uDFD0]|\uD801\uDD6F|\uD802[\uDC57\uDD1F\uDD3F\uDE50-\uDE58\uDE7F\uDEF0-\uDEF6\uDF39-\uDF3F\uDF99-\uDF9C]|\uD804[\uDC47-\uDC4D\uDCBB\uDCBC\uDCBE-\uDCC1\uDD40-\uDD43\uDD74\uDD75\uDDC5-\uDDC9\uDDCD\uDDDB\uDDDD-\uDDDF\uDE38-\uDE3D\uDEA9]|\uD805[\uDCC6\uDDC1-\uDDD7\uDE41-\uDE43\uDF3C-\uDF3E]|\uD809[\uDC70-\uDC74]|\uD81A[\uDE6E\uDE6F\uDEF5\uDF37-\uDF3B\uDF44]|\uD82F\uDC9F|\uD836[\uDE87-\uDE8B]/),v=new RegExp('^(?:"('+f+'|[^"\\x00])*"|\'('+f+"|[^'\\x00])*'|\\(("+f+"|[^)\\x00])*\\))"),g=new RegExp("^(?:[<](?:[^ <>\\t\\n\\\\\\x00]|"+f+"|\\\\)*[>])"),y=new RegExp("^"+p),_=new RegExp("^"+h,"i"),b=/`+/,x=/^`+/,w=/\.\.\./g,k=/--+/g,E=/^<([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/,S=/^<[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*>/i,C=/^ *(?:\n *)?/,A=/^[ \t\n\x0b\x0c\x0d]/,D=/[ \t\n\x0b\x0c\x0d]+/g,O=/^\s/,M=/ *$/,T=/^ */,P=/^ *(?:\n|$)/,I=new RegExp("^\\[(?:[^\\\\\\[\\]]|"+f+"|\\\\){0,1000}\\]"),R=/^[^\n`\[\]\\!<&*_'"]+/m,j=function(e){var t=new i("text");return t._literal=e,t},F=function(e){var t=e.exec(this.subject.slice(this.pos));return null===t?null:(this.pos+=t.index+t[0].length,t[0])},N=function(){return this.pos<this.subject.length?this.subject.charCodeAt(this.pos):-1},B=function(){return this.match(C),!0},L=function(e){var t=this.match(x);if(null===t)return!1;for(var n,r,o=this.pos;null!==(n=this.match(b));)if(n===t)return r=new i("code"),r._literal=this.subject.slice(o,this.pos-t.length).trim().replace(D," "),e.appendChild(r),!0;return this.pos=o,e.appendChild(j(t)),!0},q=function(e){var t,n=this.subject;return this.pos+=1,10===this.peek()?(this.pos+=1,t=new i("linebreak"),e.appendChild(t)):y.test(n.charAt(this.pos))?(e.appendChild(j(n.charAt(this.pos))),this.pos+=1):e.appendChild(j("\\")),!0},z=function(e){var t,n,r;return(t=this.match(E))?(n=t.slice(1,t.length-1),r=new i("link"),r._destination=s("mailto:"+n),r._title="",r.appendChild(j(n)),e.appendChild(r),!0):!!(t=this.match(S))&&(n=t.slice(1,t.length-1),r=new i("link"),r._destination=s(n),r._title="",r.appendChild(j(n)),e.appendChild(r),!0)},U=function(e){var t=this.match(d);if(null===t)return!1;var n=new i("html_inline");return n._literal=t,e.appendChild(n),!0},W=function(e){var t,n,r,i,o,a,s,u,c,p,f,h=0,d=this.pos;if(39===e||34===e)h++,this.pos++;else for(;this.peek()===e;)h++,this.pos++;return 0===h?null:(t=0===d?"\n":this.subject.charAt(d-1),r=this.peek(),n=-1===r?"\n":l(r),u=O.test(n),c=m.test(n),p=O.test(t),f=m.test(t),i=!u&&(!c||p||f),o=!p&&(!f||u||c),95===e?(a=i&&(!o||f),s=o&&(!i||c)):39===e||34===e?(a=i&&!o,s=o):(a=i,s=o),this.pos=d,{numdelims:h,can_open:a,can_close:s})},V=function(e,t){var n=this.scanDelims(e);if(!n)return!1;var r,i=n.numdelims,o=this.pos;this.pos+=i,r=39===e?"’":34===e?"“":this.subject.slice(o,this.pos);var a=j(r);return t.appendChild(a),this.delimiters={cc:e,numdelims:i,origdelims:i,node:a,previous:this.delimiters,next:null,can_open:n.can_open,can_close:n.can_close},null!==this.delimiters.previous&&(this.delimiters.previous.next=this.delimiters),!0},H=function(e){null!==e.previous&&(e.previous.next=e.next),null===e.next?this.delimiters=e.previous:e.next.previous=e.previous},G=function(e,t){e.next!==t&&(e.next=t,t.previous=e)},J=function(e){var t,n,r,o,a,s,u,l,c,p,f=[],h=!1;for(f[95]=e,f[42]=e,f[39]=e,f[34]=e,n=this.delimiters;null!==n&&n.previous!==e;)n=n.previous;for(;null!==n;){var d=n.cc;if(n.can_close){for(t=n.previous,p=!1;null!==t&&t!==e&&t!==f[d];){if(h=(n.can_open||t.can_close)&&(t.origdelims+n.origdelims)%3==0,t.cc===n.cc&&t.can_open&&!h){p=!0;break}t=t.previous}if(r=n,42===d||95===d)if(p){u=n.numdelims>=2&&t.numdelims>=2?2:1,o=t.node,a=n.node,t.numdelims-=u,n.numdelims-=u,o._literal=o._literal.slice(0,o._literal.length-u),a._literal=a._literal.slice(0,a._literal.length-u);var m=new i(1===u?"emph":"strong");for(l=o._next;l&&l!==a;)c=l._next,l.unlink(),m.appendChild(l),l=c;o.insertAfter(m),G(t,n),0===t.numdelims&&(o.unlink(),this.removeDelimiter(t)),0===n.numdelims&&(a.unlink(),s=n.next,this.removeDelimiter(n),n=s)}else n=n.next;else 39===d?(n.node._literal="’",p&&(t.node._literal="‘"),n=n.next):34===d&&(n.node._literal="”",p&&(t.node.literal="“"),n=n.next);p||h||(f[d]=r.previous,r.can_open||this.removeDelimiter(r))}else n=n.next}for(;null!==this.delimiters&&this.delimiters!==e;)this.removeDelimiter(this.delimiters)},K=function(){var e=this.match(v);return null===e?null:u(e.substr(1,e.length-2))},X=function(){var e=this.match(g);if(null===e){for(var t,n=this.pos,r=0;-1!==(t=this.peek());)if(92===t)this.pos+=1,-1!==this.peek()&&(this.pos+=1);else if(40===t)this.pos+=1,r+=1;else if(41===t){if(r<1)break;this.pos+=1,r-=1}else{if(null!==A.exec(l(t)))break;this.pos+=1}return e=this.subject.substr(n,this.pos-n),s(u(e))}return s(u(e.substr(1,e.length-2)))},Y=function(){var e=this.match(I);return null===e||e.length>1001||/[^\\]\\\]$/.exec(e)?0:e.length},$=function(e){var t=this.pos;this.pos+=1;var n=j("[");return e.appendChild(n),this.addBracket(n,t,!1),!0},Z=function(e){var t=this.pos;if(this.pos+=1,91===this.peek()){this.pos+=1;var n=j("![");e.appendChild(n),this.addBracket(n,t+1,!0)}else e.appendChild(j("!"));return!0},Q=function(e){var t,n,r,o,s,u,l=!1;if(this.pos+=1,t=this.pos,null===(u=this.brackets))return e.appendChild(j("]")),!0;if(!u.active)return e.appendChild(j("]")),this.removeBracket(),!0;n=u.image;var c=this.pos;if(40===this.peek()&&(this.pos++,this.spnl()&&null!==(r=this.parseLinkDestination())&&this.spnl()&&(A.test(this.subject.charAt(this.pos-1))&&(o=this.parseLinkTitle()),!0)&&this.spnl()&&41===this.peek()?(this.pos+=1,l=!0):this.pos=c),!l){var p=this.pos,f=this.parseLinkLabel();if(f>2?s=this.subject.slice(p,p+f):u.bracketAfter||(s=this.subject.slice(u.index,t)),0===f&&(this.pos=c),s){var h=this.refmap[a(s)];h&&(r=h.destination,o=h.title,l=!0)}}if(l){var d=new i(n?"image":"link");d._destination=r,d._title=o||"";var m,v;for(m=u.node._next;m;)v=m._next,m.unlink(),d.appendChild(m),m=v;if(e.appendChild(d),this.processEmphasis(u.previousDelimiter),this.removeBracket(),u.node.unlink(),!n)for(u=this.brackets;null!==u;)u.image||(u.active=!1),u=u.previous;return!0}return this.removeBracket(),this.pos=t,e.appendChild(j("]")),!0},ee=function(e,t,n){null!==this.brackets&&(this.brackets.bracketAfter=!0),this.brackets={node:e,previous:this.brackets,previousDelimiter:this.delimiters,index:t,image:n,active:!0}},te=function(){this.brackets=this.brackets.previous},ne=function(e){var t;return!!(t=this.match(_))&&(e.appendChild(j(c(t))),!0)},re=function(e){var t;return!!(t=this.match(R))&&(this.options.smart?e.appendChild(j(t.replace(w,"…").replace(k,function(e){var t=0,n=0;return e.length%3==0?n=e.length/3:e.length%2==0?t=e.length/2:e.length%3==2?(t=1,n=(e.length-2)/3):(t=2,n=(e.length-4)/3),"—".repeat(n)+"–".repeat(t)}))):e.appendChild(j(t)),!0)},ie=function(e){this.pos+=1;var t=e._lastChild;if(t&&"text"===t.type&&" "===t._literal[t._literal.length-1]){var n=" "===t._literal[t._literal.length-2];t._literal=t._literal.replace(M,""),e.appendChild(new i(n?"linebreak":"softbreak"))}else e.appendChild(new i("softbreak"));return this.match(T),!0},oe=function(e,t){this.subject=e,this.pos=0;var n,r,i,o,s=this.pos;if(0===(o=this.parseLinkLabel()))return 0;if(n=this.subject.substr(0,o),58!==this.peek())return this.pos=s,0;if(this.pos++,this.spnl(),null===(r=this.parseLinkDestination())||0===r.length)return this.pos=s,0;var u=this.pos;this.spnl(),null===(i=this.parseLinkTitle())&&(i="",this.pos=u);var l=!0;if(null===this.match(P)&&(""===i?l=!1:(i="",this.pos=u,l=null!==this.match(P))),!l)return this.pos=s,0;var c=a(n);return""===c?(this.pos=s,0):(t[c]||(t[c]={destination:r,title:i}),this.pos-s)},ae=function(e){var t=!1,n=this.peek();if(-1===n)return!1;switch(n){case 10:t=this.parseNewline(e);break;case 92:t=this.parseBackslash(e);break;case 96:t=this.parseBackticks(e);break;case 42:case 95:t=this.handleDelim(n,e);break;case 39:case 34:t=this.options.smart&&this.handleDelim(n,e);break;case 91:t=this.parseOpenBracket(e);break;case 33:t=this.parseBang(e);break;case 93:t=this.parseCloseBracket(e);break;case 60:t=this.parseAutolink(e)||this.parseHtmlTag(e);break;case 38:t=this.parseEntity(e);break;default:t=this.parseString(e)}return t||(this.pos+=1,e.appendChild(j(l(n)))),!0},se=function(e){for(this.subject=e._string_content.trim(),this.pos=0,this.delimiters=null,this.brackets=null;this.parseInline(e););e._string_content=null,this.processEmphasis(null)};e.exports=r},function(e,t,n){"use strict";var r=/[ \t\r\n]+|[A-Z\xB5\xC0-\xD6\xD8-\xDF\u0100\u0102\u0104\u0106\u0108\u010A\u010C\u010E\u0110\u0112\u0114\u0116\u0118\u011A\u011C\u011E\u0120\u0122\u0124\u0126\u0128\u012A\u012C\u012E\u0130\u0132\u0134\u0136\u0139\u013B\u013D\u013F\u0141\u0143\u0145\u0147\u0149\u014A\u014C\u014E\u0150\u0152\u0154\u0156\u0158\u015A\u015C\u015E\u0160\u0162\u0164\u0166\u0168\u016A\u016C\u016E\u0170\u0172\u0174\u0176\u0178\u0179\u017B\u017D\u017F\u0181\u0182\u0184\u0186\u0187\u0189-\u018B\u018E-\u0191\u0193\u0194\u0196-\u0198\u019C\u019D\u019F\u01A0\u01A2\u01A4\u01A6\u01A7\u01A9\u01AC\u01AE\u01AF\u01B1-\u01B3\u01B5\u01B7\u01B8\u01BC\u01C4\u01C5\u01C7\u01C8\u01CA\u01CB\u01CD\u01CF\u01D1\u01D3\u01D5\u01D7\u01D9\u01DB\u01DE\u01E0\u01E2\u01E4\u01E6\u01E8\u01EA\u01EC\u01EE\u01F0-\u01F2\u01F4\u01F6-\u01F8\u01FA\u01FC\u01FE\u0200\u0202\u0204\u0206\u0208\u020A\u020C\u020E\u0210\u0212\u0214\u0216\u0218\u021A\u021C\u021E\u0220\u0222\u0224\u0226\u0228\u022A\u022C\u022E\u0230\u0232\u023A\u023B\u023D\u023E\u0241\u0243-\u0246\u0248\u024A\u024C\u024E\u0345\u0370\u0372\u0376\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03AB\u03B0\u03C2\u03CF-\u03D1\u03D5\u03D6\u03D8\u03DA\u03DC\u03DE\u03E0\u03E2\u03E4\u03E6\u03E8\u03EA\u03EC\u03EE\u03F0\u03F1\u03F4\u03F5\u03F7\u03F9\u03FA\u03FD-\u042F\u0460\u0462\u0464\u0466\u0468\u046A\u046C\u046E\u0470\u0472\u0474\u0476\u0478\u047A\u047C\u047E\u0480\u048A\u048C\u048E\u0490\u0492\u0494\u0496\u0498\u049A\u049C\u049E\u04A0\u04A2\u04A4\u04A6\u04A8\u04AA\u04AC\u04AE\u04B0\u04B2\u04B4\u04B6\u04B8\u04BA\u04BC\u04BE\u04C0\u04C1\u04C3\u04C5\u04C7\u04C9\u04CB\u04CD\u04D0\u04D2\u04D4\u04D6\u04D8\u04DA\u04DC\u04DE\u04E0\u04E2\u04E4\u04E6\u04E8\u04EA\u04EC\u04EE\u04F0\u04F2\u04F4\u04F6\u04F8\u04FA\u04FC\u04FE\u0500\u0502\u0504\u0506\u0508\u050A\u050C\u050E\u0510\u0512\u0514\u0516\u0518\u051A\u051C\u051E\u0520\u0522\u0524\u0526\u0528\u052A\u052C\u052E\u0531-\u0556\u0587\u10A0-\u10C5\u10C7\u10CD\u1E00\u1E02\u1E04\u1E06\u1E08\u1E0A\u1E0C\u1E0E\u1E10\u1E12\u1E14\u1E16\u1E18\u1E1A\u1E1C\u1E1E\u1E20\u1E22\u1E24\u1E26\u1E28\u1E2A\u1E2C\u1E2E\u1E30\u1E32\u1E34\u1E36\u1E38\u1E3A\u1E3C\u1E3E\u1E40\u1E42\u1E44\u1E46\u1E48\u1E4A\u1E4C\u1E4E\u1E50\u1E52\u1E54\u1E56\u1E58\u1E5A\u1E5C\u1E5E\u1E60\u1E62\u1E64\u1E66\u1E68\u1E6A\u1E6C\u1E6E\u1E70\u1E72\u1E74\u1E76\u1E78\u1E7A\u1E7C\u1E7E\u1E80\u1E82\u1E84\u1E86\u1E88\u1E8A\u1E8C\u1E8E\u1E90\u1E92\u1E94\u1E96-\u1E9B\u1E9E\u1EA0\u1EA2\u1EA4\u1EA6\u1EA8\u1EAA\u1EAC\u1EAE\u1EB0\u1EB2\u1EB4\u1EB6\u1EB8\u1EBA\u1EBC\u1EBE\u1EC0\u1EC2\u1EC4\u1EC6\u1EC8\u1ECA\u1ECC\u1ECE\u1ED0\u1ED2\u1ED4\u1ED6\u1ED8\u1EDA\u1EDC\u1EDE\u1EE0\u1EE2\u1EE4\u1EE6\u1EE8\u1EEA\u1EEC\u1EEE\u1EF0\u1EF2\u1EF4\u1EF6\u1EF8\u1EFA\u1EFC\u1EFE\u1F08-\u1F0F\u1F18-\u1F1D\u1F28-\u1F2F\u1F38-\u1F3F\u1F48-\u1F4D\u1F50\u1F52\u1F54\u1F56\u1F59\u1F5B\u1F5D\u1F5F\u1F68-\u1F6F\u1F80-\u1FAF\u1FB2-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD2\u1FD3\u1FD6-\u1FDB\u1FE2-\u1FE4\u1FE6-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2126\u212A\u212B\u2132\u2160-\u216F\u2183\u24B6-\u24CF\u2C00-\u2C2E\u2C60\u2C62-\u2C64\u2C67\u2C69\u2C6B\u2C6D-\u2C70\u2C72\u2C75\u2C7E-\u2C80\u2C82\u2C84\u2C86\u2C88\u2C8A\u2C8C\u2C8E\u2C90\u2C92\u2C94\u2C96\u2C98\u2C9A\u2C9C\u2C9E\u2CA0\u2CA2\u2CA4\u2CA6\u2CA8\u2CAA\u2CAC\u2CAE\u2CB0\u2CB2\u2CB4\u2CB6\u2CB8\u2CBA\u2CBC\u2CBE\u2CC0\u2CC2\u2CC4\u2CC6\u2CC8\u2CCA\u2CCC\u2CCE\u2CD0\u2CD2\u2CD4\u2CD6\u2CD8\u2CDA\u2CDC\u2CDE\u2CE0\u2CE2\u2CEB\u2CED\u2CF2\uA640\uA642\uA644\uA646\uA648\uA64A\uA64C\uA64E\uA650\uA652\uA654\uA656\uA658\uA65A\uA65C\uA65E\uA660\uA662\uA664\uA666\uA668\uA66A\uA66C\uA680\uA682\uA684\uA686\uA688\uA68A\uA68C\uA68E\uA690\uA692\uA694\uA696\uA698\uA69A\uA722\uA724\uA726\uA728\uA72A\uA72C\uA72E\uA732\uA734\uA736\uA738\uA73A\uA73C\uA73E\uA740\uA742\uA744\uA746\uA748\uA74A\uA74C\uA74E\uA750\uA752\uA754\uA756\uA758\uA75A\uA75C\uA75E\uA760\uA762\uA764\uA766\uA768\uA76A\uA76C\uA76E\uA779\uA77B\uA77D\uA77E\uA780\uA782\uA784\uA786\uA78B\uA78D\uA790\uA792\uA796\uA798\uA79A\uA79C\uA79E\uA7A0\uA7A2\uA7A4\uA7A6\uA7A8\uA7AA-\uA7AD\uA7B0\uA7B1\uFB00-\uFB06\uFB13-\uFB17\uFF21-\uFF3A]|\uD801[\uDC00-\uDC27]|\uD806[\uDCA0-\uDCBF]/g,i={A:"a",B:"b",C:"c",D:"d",E:"e",F:"f",G:"g",H:"h",I:"i",J:"j",K:"k",L:"l",M:"m",N:"n",O:"o",P:"p",Q:"q",R:"r",S:"s",T:"t",U:"u",V:"v",W:"w",X:"x",Y:"y",Z:"z","µ":"μ","À":"à","Á":"á","Â":"â","Ã":"ã","Ä":"ä","Å":"å","Æ":"æ","Ç":"ç","È":"è","É":"é","Ê":"ê","Ë":"ë","Ì":"ì","Í":"í","Î":"î","Ï":"ï","Ð":"ð","Ñ":"ñ","Ò":"ò","Ó":"ó","Ô":"ô","Õ":"õ","Ö":"ö","Ø":"ø","Ù":"ù","Ú":"ú","Û":"û","Ü":"ü","Ý":"ý","Þ":"þ","Ā":"ā","Ă":"ă","Ą":"ą","Ć":"ć","Ĉ":"ĉ","Ċ":"ċ","Č":"č","Ď":"ď","Đ":"đ","Ē":"ē","Ĕ":"ĕ","Ė":"ė","Ę":"ę","Ě":"ě","Ĝ":"ĝ","Ğ":"ğ","Ġ":"ġ","Ģ":"ģ","Ĥ":"ĥ","Ħ":"ħ","Ĩ":"ĩ","Ī":"ī","Ĭ":"ĭ","Į":"į","IJ":"ij","Ĵ":"ĵ","Ķ":"ķ","Ĺ":"ĺ","Ļ":"ļ","Ľ":"ľ","Ŀ":"ŀ","Ł":"ł","Ń":"ń","Ņ":"ņ","Ň":"ň","Ŋ":"ŋ","Ō":"ō","Ŏ":"ŏ","Ő":"ő","Œ":"œ","Ŕ":"ŕ","Ŗ":"ŗ","Ř":"ř","Ś":"ś","Ŝ":"ŝ","Ş":"ş","Š":"š","Ţ":"ţ","Ť":"ť","Ŧ":"ŧ","Ũ":"ũ","Ū":"ū","Ŭ":"ŭ","Ů":"ů","Ű":"ű","Ų":"ų","Ŵ":"ŵ","Ŷ":"ŷ","Ÿ":"ÿ","Ź":"ź","Ż":"ż","Ž":"ž","ſ":"s","Ɓ":"ɓ","Ƃ":"ƃ","Ƅ":"ƅ","Ɔ":"ɔ","Ƈ":"ƈ","Ɖ":"ɖ","Ɗ":"ɗ","Ƌ":"ƌ","Ǝ":"ǝ","Ə":"ə","Ɛ":"ɛ","Ƒ":"ƒ","Ɠ":"ɠ","Ɣ":"ɣ","Ɩ":"ɩ","Ɨ":"ɨ","Ƙ":"ƙ","Ɯ":"ɯ","Ɲ":"ɲ","Ɵ":"ɵ","Ơ":"ơ","Ƣ":"ƣ","Ƥ":"ƥ","Ʀ":"ʀ","Ƨ":"ƨ","Ʃ":"ʃ","Ƭ":"ƭ","Ʈ":"ʈ","Ư":"ư","Ʊ":"ʊ","Ʋ":"ʋ","Ƴ":"ƴ","Ƶ":"ƶ","Ʒ":"ʒ","Ƹ":"ƹ","Ƽ":"ƽ","DŽ":"dž","Dž":"dž","LJ":"lj","Lj":"lj","NJ":"nj","Nj":"nj","Ǎ":"ǎ","Ǐ":"ǐ","Ǒ":"ǒ","Ǔ":"ǔ","Ǖ":"ǖ","Ǘ":"ǘ","Ǚ":"ǚ","Ǜ":"ǜ","Ǟ":"ǟ","Ǡ":"ǡ","Ǣ":"ǣ","Ǥ":"ǥ","Ǧ":"ǧ","Ǩ":"ǩ","Ǫ":"ǫ","Ǭ":"ǭ","Ǯ":"ǯ","DZ":"dz","Dz":"dz","Ǵ":"ǵ","Ƕ":"ƕ","Ƿ":"ƿ","Ǹ":"ǹ","Ǻ":"ǻ","Ǽ":"ǽ","Ǿ":"ǿ","Ȁ":"ȁ","Ȃ":"ȃ","Ȅ":"ȅ","Ȇ":"ȇ","Ȉ":"ȉ","Ȋ":"ȋ","Ȍ":"ȍ","Ȏ":"ȏ","Ȑ":"ȑ","Ȓ":"ȓ","Ȕ":"ȕ","Ȗ":"ȗ","Ș":"ș","Ț":"ț","Ȝ":"ȝ","Ȟ":"ȟ","Ƞ":"ƞ","Ȣ":"ȣ","Ȥ":"ȥ","Ȧ":"ȧ","Ȩ":"ȩ","Ȫ":"ȫ","Ȭ":"ȭ","Ȯ":"ȯ","Ȱ":"ȱ","Ȳ":"ȳ","Ⱥ":"ⱥ","Ȼ":"ȼ","Ƚ":"ƚ","Ⱦ":"ⱦ","Ɂ":"ɂ","Ƀ":"ƀ","Ʉ":"ʉ","Ʌ":"ʌ","Ɇ":"ɇ","Ɉ":"ɉ","Ɋ":"ɋ","Ɍ":"ɍ","Ɏ":"ɏ","ͅ":"ι","Ͱ":"ͱ","Ͳ":"ͳ","Ͷ":"ͷ","Ϳ":"ϳ","Ά":"ά","Έ":"έ","Ή":"ή","Ί":"ί","Ό":"ό","Ύ":"ύ","Ώ":"ώ","Α":"α","Β":"β","Γ":"γ","Δ":"δ","Ε":"ε","Ζ":"ζ","Η":"η","Θ":"θ","Ι":"ι","Κ":"κ","Λ":"λ","Μ":"μ","Ν":"ν","Ξ":"ξ","Ο":"ο","Π":"π","Ρ":"ρ","Σ":"σ","Τ":"τ","Υ":"υ","Φ":"φ","Χ":"χ","Ψ":"ψ","Ω":"ω","Ϊ":"ϊ","Ϋ":"ϋ","ς":"σ","Ϗ":"ϗ","ϐ":"β","ϑ":"θ","ϕ":"φ","ϖ":"π","Ϙ":"ϙ","Ϛ":"ϛ","Ϝ":"ϝ","Ϟ":"ϟ","Ϡ":"ϡ","Ϣ":"ϣ","Ϥ":"ϥ","Ϧ":"ϧ","Ϩ":"ϩ","Ϫ":"ϫ","Ϭ":"ϭ","Ϯ":"ϯ","ϰ":"κ","ϱ":"ρ","ϴ":"θ","ϵ":"ε","Ϸ":"ϸ","Ϲ":"ϲ","Ϻ":"ϻ","Ͻ":"ͻ","Ͼ":"ͼ","Ͽ":"ͽ","Ѐ":"ѐ","Ё":"ё","Ђ":"ђ","Ѓ":"ѓ","Є":"є","Ѕ":"ѕ","І":"і","Ї":"ї","Ј":"ј","Љ":"љ","Њ":"њ","Ћ":"ћ","Ќ":"ќ","Ѝ":"ѝ","Ў":"ў","Џ":"џ","А":"а","Б":"б","В":"в","Г":"г","Д":"д","Е":"е","Ж":"ж","З":"з","И":"и","Й":"й","К":"к","Л":"л","М":"м","Н":"н","О":"о","П":"п","Р":"р","С":"с","Т":"т","У":"у","Ф":"ф","Х":"х","Ц":"ц","Ч":"ч","Ш":"ш","Щ":"щ","Ъ":"ъ","Ы":"ы","Ь":"ь","Э":"э","Ю":"ю","Я":"я","Ѡ":"ѡ","Ѣ":"ѣ","Ѥ":"ѥ","Ѧ":"ѧ","Ѩ":"ѩ","Ѫ":"ѫ","Ѭ":"ѭ","Ѯ":"ѯ","Ѱ":"ѱ","Ѳ":"ѳ","Ѵ":"ѵ","Ѷ":"ѷ","Ѹ":"ѹ","Ѻ":"ѻ","Ѽ":"ѽ","Ѿ":"ѿ","Ҁ":"ҁ","Ҋ":"ҋ","Ҍ":"ҍ","Ҏ":"ҏ","Ґ":"ґ","Ғ":"ғ","Ҕ":"ҕ","Җ":"җ","Ҙ":"ҙ","Қ":"қ","Ҝ":"ҝ","Ҟ":"ҟ","Ҡ":"ҡ","Ң":"ң","Ҥ":"ҥ","Ҧ":"ҧ","Ҩ":"ҩ","Ҫ":"ҫ","Ҭ":"ҭ","Ү":"ү","Ұ":"ұ","Ҳ":"ҳ","Ҵ":"ҵ","Ҷ":"ҷ","Ҹ":"ҹ","Һ":"һ","Ҽ":"ҽ","Ҿ":"ҿ","Ӏ":"ӏ","Ӂ":"ӂ","Ӄ":"ӄ","Ӆ":"ӆ","Ӈ":"ӈ","Ӊ":"ӊ","Ӌ":"ӌ","Ӎ":"ӎ","Ӑ":"ӑ","Ӓ":"ӓ","Ӕ":"ӕ","Ӗ":"ӗ","Ә":"ә","Ӛ":"ӛ","Ӝ":"ӝ","Ӟ":"ӟ","Ӡ":"ӡ","Ӣ":"ӣ","Ӥ":"ӥ","Ӧ":"ӧ","Ө":"ө","Ӫ":"ӫ","Ӭ":"ӭ","Ӯ":"ӯ","Ӱ":"ӱ","Ӳ":"ӳ","Ӵ":"ӵ","Ӷ":"ӷ","Ӹ":"ӹ","Ӻ":"ӻ","Ӽ":"ӽ","Ӿ":"ӿ","Ԁ":"ԁ","Ԃ":"ԃ","Ԅ":"ԅ","Ԇ":"ԇ","Ԉ":"ԉ","Ԋ":"ԋ","Ԍ":"ԍ","Ԏ":"ԏ","Ԑ":"ԑ","Ԓ":"ԓ","Ԕ":"ԕ","Ԗ":"ԗ","Ԙ":"ԙ","Ԛ":"ԛ","Ԝ":"ԝ","Ԟ":"ԟ","Ԡ":"ԡ","Ԣ":"ԣ","Ԥ":"ԥ","Ԧ":"ԧ","Ԩ":"ԩ","Ԫ":"ԫ","Ԭ":"ԭ","Ԯ":"ԯ","Ա":"ա","Բ":"բ","Գ":"գ","Դ":"դ","Ե":"ե","Զ":"զ","Է":"է","Ը":"ը","Թ":"թ","Ժ":"ժ","Ի":"ի","Լ":"լ","Խ":"խ","Ծ":"ծ","Կ":"կ","Հ":"հ","Ձ":"ձ","Ղ":"ղ","Ճ":"ճ","Մ":"մ","Յ":"յ","Ն":"ն","Շ":"շ","Ո":"ո","Չ":"չ","Պ":"պ","Ջ":"ջ","Ռ":"ռ","Ս":"ս","Վ":"վ","Տ":"տ","Ր":"ր","Ց":"ց","Ւ":"ւ","Փ":"փ","Ք":"ք","Օ":"օ","Ֆ":"ֆ","Ⴀ":"ⴀ","Ⴁ":"ⴁ","Ⴂ":"ⴂ","Ⴃ":"ⴃ","Ⴄ":"ⴄ","Ⴅ":"ⴅ","Ⴆ":"ⴆ","Ⴇ":"ⴇ","Ⴈ":"ⴈ","Ⴉ":"ⴉ","Ⴊ":"ⴊ","Ⴋ":"ⴋ","Ⴌ":"ⴌ","Ⴍ":"ⴍ","Ⴎ":"ⴎ","Ⴏ":"ⴏ","Ⴐ":"ⴐ","Ⴑ":"ⴑ","Ⴒ":"ⴒ","Ⴓ":"ⴓ","Ⴔ":"ⴔ","Ⴕ":"ⴕ","Ⴖ":"ⴖ","Ⴗ":"ⴗ","Ⴘ":"ⴘ","Ⴙ":"ⴙ","Ⴚ":"ⴚ","Ⴛ":"ⴛ","Ⴜ":"ⴜ","Ⴝ":"ⴝ","Ⴞ":"ⴞ","Ⴟ":"ⴟ","Ⴠ":"ⴠ","Ⴡ":"ⴡ","Ⴢ":"ⴢ","Ⴣ":"ⴣ","Ⴤ":"ⴤ","Ⴥ":"ⴥ","Ⴧ":"ⴧ","Ⴭ":"ⴭ","Ḁ":"ḁ","Ḃ":"ḃ","Ḅ":"ḅ","Ḇ":"ḇ","Ḉ":"ḉ","Ḋ":"ḋ","Ḍ":"ḍ","Ḏ":"ḏ","Ḑ":"ḑ","Ḓ":"ḓ","Ḕ":"ḕ","Ḗ":"ḗ","Ḙ":"ḙ","Ḛ":"ḛ","Ḝ":"ḝ","Ḟ":"ḟ","Ḡ":"ḡ","Ḣ":"ḣ","Ḥ":"ḥ","Ḧ":"ḧ","Ḩ":"ḩ","Ḫ":"ḫ","Ḭ":"ḭ","Ḯ":"ḯ","Ḱ":"ḱ","Ḳ":"ḳ","Ḵ":"ḵ","Ḷ":"ḷ","Ḹ":"ḹ","Ḻ":"ḻ","Ḽ":"ḽ","Ḿ":"ḿ","Ṁ":"ṁ","Ṃ":"ṃ","Ṅ":"ṅ","Ṇ":"ṇ","Ṉ":"ṉ","Ṋ":"ṋ","Ṍ":"ṍ","Ṏ":"ṏ","Ṑ":"ṑ","Ṓ":"ṓ","Ṕ":"ṕ","Ṗ":"ṗ","Ṙ":"ṙ","Ṛ":"ṛ","Ṝ":"ṝ","Ṟ":"ṟ","Ṡ":"ṡ","Ṣ":"ṣ","Ṥ":"ṥ","Ṧ":"ṧ","Ṩ":"ṩ","Ṫ":"ṫ","Ṭ":"ṭ","Ṯ":"ṯ","Ṱ":"ṱ","Ṳ":"ṳ","Ṵ":"ṵ","Ṷ":"ṷ","Ṹ":"ṹ","Ṻ":"ṻ","Ṽ":"ṽ","Ṿ":"ṿ","Ẁ":"ẁ","Ẃ":"ẃ","Ẅ":"ẅ","Ẇ":"ẇ","Ẉ":"ẉ","Ẋ":"ẋ","Ẍ":"ẍ","Ẏ":"ẏ","Ẑ":"ẑ","Ẓ":"ẓ","Ẕ":"ẕ","ẛ":"ṡ","Ạ":"ạ","Ả":"ả","Ấ":"ấ","Ầ":"ầ","Ẩ":"ẩ","Ẫ":"ẫ","Ậ":"ậ","Ắ":"ắ","Ằ":"ằ","Ẳ":"ẳ","Ẵ":"ẵ","Ặ":"ặ","Ẹ":"ẹ","Ẻ":"ẻ","Ẽ":"ẽ","Ế":"ế","Ề":"ề","Ể":"ể","Ễ":"ễ","Ệ":"ệ","Ỉ":"ỉ","Ị":"ị","Ọ":"ọ","Ỏ":"ỏ","Ố":"ố","Ồ":"ồ","Ổ":"ổ","Ỗ":"ỗ","Ộ":"ộ","Ớ":"ớ","Ờ":"ờ","Ở":"ở","Ỡ":"ỡ","Ợ":"ợ","Ụ":"ụ","Ủ":"ủ","Ứ":"ứ","Ừ":"ừ","Ử":"ử","Ữ":"ữ","Ự":"ự","Ỳ":"ỳ","Ỵ":"ỵ","Ỷ":"ỷ","Ỹ":"ỹ","Ỻ":"ỻ","Ỽ":"ỽ","Ỿ":"ỿ","Ἀ":"ἀ","Ἁ":"ἁ","Ἂ":"ἂ","Ἃ":"ἃ","Ἄ":"ἄ","Ἅ":"ἅ","Ἆ":"ἆ","Ἇ":"ἇ","Ἐ":"ἐ","Ἑ":"ἑ","Ἒ":"ἒ","Ἓ":"ἓ","Ἔ":"ἔ","Ἕ":"ἕ","Ἠ":"ἠ","Ἡ":"ἡ","Ἢ":"ἢ","Ἣ":"ἣ","Ἤ":"ἤ","Ἥ":"ἥ","Ἦ":"ἦ","Ἧ":"ἧ","Ἰ":"ἰ","Ἱ":"ἱ","Ἲ":"ἲ","Ἳ":"ἳ","Ἴ":"ἴ","Ἵ":"ἵ","Ἶ":"ἶ","Ἷ":"ἷ","Ὀ":"ὀ","Ὁ":"ὁ","Ὂ":"ὂ","Ὃ":"ὃ","Ὄ":"ὄ","Ὅ":"ὅ","Ὑ":"ὑ","Ὓ":"ὓ","Ὕ":"ὕ","Ὗ":"ὗ","Ὠ":"ὠ","Ὡ":"ὡ","Ὢ":"ὢ","Ὣ":"ὣ","Ὤ":"ὤ","Ὥ":"ὥ","Ὦ":"ὦ","Ὧ":"ὧ","Ᾰ":"ᾰ","Ᾱ":"ᾱ","Ὰ":"ὰ","Ά":"ά","ι":"ι","Ὲ":"ὲ","Έ":"έ","Ὴ":"ὴ","Ή":"ή","Ῐ":"ῐ","Ῑ":"ῑ","Ὶ":"ὶ","Ί":"ί","Ῠ":"ῠ","Ῡ":"ῡ","Ὺ":"ὺ","Ύ":"ύ","Ῥ":"ῥ","Ὸ":"ὸ","Ό":"ό","Ὼ":"ὼ","Ώ":"ώ","Ω":"ω","K":"k","Å":"å","Ⅎ":"ⅎ","Ⅰ":"ⅰ","Ⅱ":"ⅱ","Ⅲ":"ⅲ","Ⅳ":"ⅳ","Ⅴ":"ⅴ","Ⅵ":"ⅵ","Ⅶ":"ⅶ","Ⅷ":"ⅷ","Ⅸ":"ⅸ","Ⅹ":"ⅹ","Ⅺ":"ⅺ","Ⅻ":"ⅻ","Ⅼ":"ⅼ","Ⅽ":"ⅽ","Ⅾ":"ⅾ","Ⅿ":"ⅿ","Ↄ":"ↄ","Ⓐ":"ⓐ","Ⓑ":"ⓑ","Ⓒ":"ⓒ","Ⓓ":"ⓓ","Ⓔ":"ⓔ","Ⓕ":"ⓕ","Ⓖ":"ⓖ","Ⓗ":"ⓗ","Ⓘ":"ⓘ","Ⓙ":"ⓙ","Ⓚ":"ⓚ","Ⓛ":"ⓛ","Ⓜ":"ⓜ","Ⓝ":"ⓝ","Ⓞ":"ⓞ","Ⓟ":"ⓟ","Ⓠ":"ⓠ","Ⓡ":"ⓡ","Ⓢ":"ⓢ","Ⓣ":"ⓣ","Ⓤ":"ⓤ","Ⓥ":"ⓥ","Ⓦ":"ⓦ","Ⓧ":"ⓧ","Ⓨ":"ⓨ","Ⓩ":"ⓩ","Ⰰ":"ⰰ","Ⰱ":"ⰱ","Ⰲ":"ⰲ","Ⰳ":"ⰳ","Ⰴ":"ⰴ","Ⰵ":"ⰵ","Ⰶ":"ⰶ","Ⰷ":"ⰷ","Ⰸ":"ⰸ","Ⰹ":"ⰹ","Ⰺ":"ⰺ","Ⰻ":"ⰻ","Ⰼ":"ⰼ","Ⰽ":"ⰽ","Ⰾ":"ⰾ","Ⰿ":"ⰿ","Ⱀ":"ⱀ","Ⱁ":"ⱁ","Ⱂ":"ⱂ","Ⱃ":"ⱃ","Ⱄ":"ⱄ","Ⱅ":"ⱅ","Ⱆ":"ⱆ","Ⱇ":"ⱇ","Ⱈ":"ⱈ","Ⱉ":"ⱉ","Ⱊ":"ⱊ","Ⱋ":"ⱋ","Ⱌ":"ⱌ","Ⱍ":"ⱍ","Ⱎ":"ⱎ","Ⱏ":"ⱏ","Ⱐ":"ⱐ","Ⱑ":"ⱑ","Ⱒ":"ⱒ","Ⱓ":"ⱓ","Ⱔ":"ⱔ","Ⱕ":"ⱕ","Ⱖ":"ⱖ","Ⱗ":"ⱗ","Ⱘ":"ⱘ","Ⱙ":"ⱙ","Ⱚ":"ⱚ","Ⱛ":"ⱛ","Ⱜ":"ⱜ","Ⱝ":"ⱝ","Ⱞ":"ⱞ","Ⱡ":"ⱡ","Ɫ":"ɫ","Ᵽ":"ᵽ","Ɽ":"ɽ","Ⱨ":"ⱨ","Ⱪ":"ⱪ","Ⱬ":"ⱬ","Ɑ":"ɑ","Ɱ":"ɱ","Ɐ":"ɐ","Ɒ":"ɒ","Ⱳ":"ⱳ","Ⱶ":"ⱶ","Ȿ":"ȿ","Ɀ":"ɀ","Ⲁ":"ⲁ","Ⲃ":"ⲃ","Ⲅ":"ⲅ","Ⲇ":"ⲇ","Ⲉ":"ⲉ","Ⲋ":"ⲋ","Ⲍ":"ⲍ","Ⲏ":"ⲏ","Ⲑ":"ⲑ","Ⲓ":"ⲓ","Ⲕ":"ⲕ","Ⲗ":"ⲗ","Ⲙ":"ⲙ","Ⲛ":"ⲛ","Ⲝ":"ⲝ","Ⲟ":"ⲟ","Ⲡ":"ⲡ","Ⲣ":"ⲣ","Ⲥ":"ⲥ","Ⲧ":"ⲧ","Ⲩ":"ⲩ","Ⲫ":"ⲫ","Ⲭ":"ⲭ","Ⲯ":"ⲯ","Ⲱ":"ⲱ","Ⲳ":"ⲳ","Ⲵ":"ⲵ","Ⲷ":"ⲷ","Ⲹ":"ⲹ","Ⲻ":"ⲻ","Ⲽ":"ⲽ","Ⲿ":"ⲿ","Ⳁ":"ⳁ","Ⳃ":"ⳃ","Ⳅ":"ⳅ","Ⳇ":"ⳇ","Ⳉ":"ⳉ","Ⳋ":"ⳋ","Ⳍ":"ⳍ","Ⳏ":"ⳏ","Ⳑ":"ⳑ","Ⳓ":"ⳓ","Ⳕ":"ⳕ","Ⳗ":"ⳗ","Ⳙ":"ⳙ","Ⳛ":"ⳛ","Ⳝ":"ⳝ","Ⳟ":"ⳟ","Ⳡ":"ⳡ","Ⳣ":"ⳣ","Ⳬ":"ⳬ","Ⳮ":"ⳮ","Ⳳ":"ⳳ","Ꙁ":"ꙁ","Ꙃ":"ꙃ","Ꙅ":"ꙅ","Ꙇ":"ꙇ","Ꙉ":"ꙉ","Ꙋ":"ꙋ","Ꙍ":"ꙍ","Ꙏ":"ꙏ","Ꙑ":"ꙑ","Ꙓ":"ꙓ","Ꙕ":"ꙕ","Ꙗ":"ꙗ","Ꙙ":"ꙙ","Ꙛ":"ꙛ","Ꙝ":"ꙝ","Ꙟ":"ꙟ","Ꙡ":"ꙡ","Ꙣ":"ꙣ","Ꙥ":"ꙥ","Ꙧ":"ꙧ","Ꙩ":"ꙩ","Ꙫ":"ꙫ","Ꙭ":"ꙭ","Ꚁ":"ꚁ","Ꚃ":"ꚃ","Ꚅ":"ꚅ","Ꚇ":"ꚇ","Ꚉ":"ꚉ","Ꚋ":"ꚋ","Ꚍ":"ꚍ","Ꚏ":"ꚏ","Ꚑ":"ꚑ","Ꚓ":"ꚓ","Ꚕ":"ꚕ","Ꚗ":"ꚗ","Ꚙ":"ꚙ","Ꚛ":"ꚛ","Ꜣ":"ꜣ","Ꜥ":"ꜥ","Ꜧ":"ꜧ","Ꜩ":"ꜩ","Ꜫ":"ꜫ","Ꜭ":"ꜭ","Ꜯ":"ꜯ","Ꜳ":"ꜳ","Ꜵ":"ꜵ","Ꜷ":"ꜷ","Ꜹ":"ꜹ","Ꜻ":"ꜻ","Ꜽ":"ꜽ","Ꜿ":"ꜿ","Ꝁ":"ꝁ","Ꝃ":"ꝃ","Ꝅ":"ꝅ","Ꝇ":"ꝇ","Ꝉ":"ꝉ","Ꝋ":"ꝋ","Ꝍ":"ꝍ","Ꝏ":"ꝏ","Ꝑ":"ꝑ","Ꝓ":"ꝓ","Ꝕ":"ꝕ","Ꝗ":"ꝗ","Ꝙ":"ꝙ","Ꝛ":"ꝛ","Ꝝ":"ꝝ","Ꝟ":"ꝟ","Ꝡ":"ꝡ","Ꝣ":"ꝣ","Ꝥ":"ꝥ","Ꝧ":"ꝧ","Ꝩ":"ꝩ","Ꝫ":"ꝫ","Ꝭ":"ꝭ","Ꝯ":"ꝯ","Ꝺ":"ꝺ","Ꝼ":"ꝼ","Ᵹ":"ᵹ","Ꝿ":"ꝿ","Ꞁ":"ꞁ","Ꞃ":"ꞃ","Ꞅ":"ꞅ","Ꞇ":"ꞇ","Ꞌ":"ꞌ","Ɥ":"ɥ","Ꞑ":"ꞑ","Ꞓ":"ꞓ","Ꞗ":"ꞗ","Ꞙ":"ꞙ","Ꞛ":"ꞛ","Ꞝ":"ꞝ","Ꞟ":"ꞟ","Ꞡ":"ꞡ","Ꞣ":"ꞣ","Ꞥ":"ꞥ","Ꞧ":"ꞧ","Ꞩ":"ꞩ","Ɦ":"ɦ","Ɜ":"ɜ","Ɡ":"ɡ","Ɬ":"ɬ","Ʞ":"ʞ","Ʇ":"ʇ","Ａ":"ａ","Ｂ":"ｂ","Ｃ":"ｃ","Ｄ":"ｄ","Ｅ":"ｅ","Ｆ":"ｆ","Ｇ":"ｇ","Ｈ":"ｈ","Ｉ":"ｉ","Ｊ":"ｊ","Ｋ":"ｋ","Ｌ":"ｌ","Ｍ":"ｍ","Ｎ":"ｎ","Ｏ":"ｏ","Ｐ":"ｐ","Ｑ":"ｑ","Ｒ":"ｒ","Ｓ":"ｓ","Ｔ":"ｔ","Ｕ":"ｕ","Ｖ":"ｖ","Ｗ":"ｗ","Ｘ":"ｘ","Ｙ":"ｙ","Ｚ":"ｚ","𐐀":"𐐨","𐐁":"𐐩","𐐂":"𐐪","𐐃":"𐐫","𐐄":"𐐬","𐐅":"𐐭","𐐆":"𐐮","𐐇":"𐐯","𐐈":"𐐰","𐐉":"𐐱","𐐊":"𐐲","𐐋":"𐐳","𐐌":"𐐴","𐐍":"𐐵","𐐎":"𐐶","𐐏":"𐐷","𐐐":"𐐸","𐐑":"𐐹","𐐒":"𐐺","𐐓":"𐐻","𐐔":"𐐼","𐐕":"𐐽","𐐖":"𐐾","𐐗":"𐐿","𐐘":"𐑀","𐐙":"𐑁","𐐚":"𐑂","𐐛":"𐑃","𐐜":"𐑄","𐐝":"𐑅","𐐞":"𐑆","𐐟":"𐑇","𐐠":"𐑈","𐐡":"𐑉","𐐢":"𐑊","𐐣":"𐑋","𐐤":"𐑌","𐐥":"𐑍","𐐦":"𐑎","𐐧":"𐑏","𑢠":"𑣀","𑢡":"𑣁","𑢢":"𑣂","𑢣":"𑣃","𑢤":"𑣄","𑢥":"𑣅","𑢦":"𑣆","𑢧":"𑣇","𑢨":"𑣈","𑢩":"𑣉","𑢪":"𑣊","𑢫":"𑣋","𑢬":"𑣌","𑢭":"𑣍","𑢮":"𑣎","𑢯":"𑣏","𑢰":"𑣐","𑢱":"𑣑","𑢲":"𑣒","𑢳":"𑣓","𑢴":"𑣔","𑢵":"𑣕","𑢶":"𑣖","𑢷":"𑣗","𑢸":"𑣘","𑢹":"𑣙","𑢺":"𑣚","𑢻":"𑣛","𑢼":"𑣜","𑢽":"𑣝","𑢾":"𑣞","𑢿":"𑣟","ß":"ss","İ":"i̇","ʼn":"ʼn","ǰ":"ǰ","ΐ":"ΐ","ΰ":"ΰ","և":"եւ","ẖ":"ẖ","ẗ":"ẗ","ẘ":"ẘ","ẙ":"ẙ","ẚ":"aʾ","ẞ":"ss","ὐ":"ὐ","ὒ":"ὒ","ὔ":"ὔ","ὖ":"ὖ","ᾀ":"ἀι","ᾁ":"ἁι","ᾂ":"ἂι","ᾃ":"ἃι","ᾄ":"ἄι","ᾅ":"ἅι","ᾆ":"ἆι","ᾇ":"ἇι","ᾈ":"ἀι","ᾉ":"ἁι","ᾊ":"ἂι","ᾋ":"ἃι","ᾌ":"ἄι","ᾍ":"ἅι","ᾎ":"ἆι","ᾏ":"ἇι","ᾐ":"ἠι","ᾑ":"ἡι","ᾒ":"ἢι","ᾓ":"ἣι","ᾔ":"ἤι","ᾕ":"ἥι","ᾖ":"ἦι","ᾗ":"ἧι","ᾘ":"ἠι","ᾙ":"ἡι","ᾚ":"ἢι","ᾛ":"ἣι","ᾜ":"ἤι","ᾝ":"ἥι","ᾞ":"ἦι","ᾟ":"ἧι","ᾠ":"ὠι","ᾡ":"ὡι","ᾢ":"ὢι","ᾣ":"ὣι","ᾤ":"ὤι","ᾥ":"ὥι","ᾦ":"ὦι","ᾧ":"ὧι","ᾨ":"ὠι","ᾩ":"ὡι","ᾪ":"ὢι","ᾫ":"ὣι","ᾬ":"ὤι","ᾭ":"ὥι","ᾮ":"ὦι","ᾯ":"ὧι","ᾲ":"ὰι","ᾳ":"αι","ᾴ":"άι","ᾶ":"ᾶ","ᾷ":"ᾶι","ᾼ":"αι","ῂ":"ὴι","ῃ":"ηι","ῄ":"ήι","ῆ":"ῆ","ῇ":"ῆι","ῌ":"ηι","ῒ":"ῒ","ΐ":"ΐ","ῖ":"ῖ","ῗ":"ῗ","ῢ":"ῢ","ΰ":"ΰ","ῤ":"ῤ","ῦ":"ῦ","ῧ":"ῧ","ῲ":"ὼι","ῳ":"ωι","ῴ":"ώι","ῶ":"ῶ","ῷ":"ῶι","ῼ":"ωι","ff":"ff","fi":"fi","fl":"fl","ffi":"ffi","ffl":"ffl","ſt":"st","st":"st","ﬓ":"մն","ﬔ":"մե","ﬕ":"մի","ﬖ":"վն","ﬗ":"մխ"};e.exports=function(e){return e.slice(1,e.length-1).trim().replace(r,function(e){return i[e]||" "})}},function(e,t,n){"use strict";function r(e,t,n){if(!(this.disableTags>0)){if(this.buffer+="<"+e,t&&t.length>0)for(var r,i=0;void 0!==(r=t[i]);)this.buffer+=" "+r[0]+'="'+r[1]+'"',i++;n&&(this.buffer+=" /"),this.buffer+=">",this.lastOut=">"}}function i(e){e=e||{},e.softbreak=e.softbreak||"\n",this.disableTags=0,this.lastOut="\n",this.options=e}function o(e){this.out(e.literal)}function a(){this.lit(this.options.softbreak)}function s(){this.tag("br",[],!0),this.cr()}function u(e,t){var n=this.attrs(e);t?(this.options.safe&&O(e.destination)||n.push(["href",this.esc(e.destination,!0)]),e.title&&n.push(["title",this.esc(e.title,!0)]),this.tag("a",n)):this.tag("/a")}function l(e,t){t?(0===this.disableTags&&(this.options.safe&&O(e.destination)?this.lit('<img src="" alt="'):this.lit('<img src="'+this.esc(e.destination,!0)+'" alt="')),this.disableTags+=1):(this.disableTags-=1,0===this.disableTags&&(e.title&&this.lit('" title="'+this.esc(e.title,!0)),this.lit('" />')))}function c(e,t){this.tag(t?"em":"/em")}function p(e,t){this.tag(t?"strong":"/strong")}function f(e,t){var n=e.parent.parent,r=this.attrs(e);null!==n&&"list"===n.type&&n.listTight||(t?(this.cr(),this.tag("p",r)):(this.tag("/p"),this.cr()))}function h(e,t){var n="h"+e.level,r=this.attrs(e);t?(this.cr(),this.tag(n,r)):(this.tag("/"+n),this.cr())}function d(e){this.tag("code"),this.out(e.literal),this.tag("/code")}function m(e){var t=e.info?e.info.split(/\s+/):[],n=this.attrs(e);t.length>0&&t[0].length>0&&n.push(["class","language-"+this.esc(t[0],!0)]),this.cr(),this.tag("pre"),this.tag("code",n),this.out(e.literal),this.tag("/code"),this.tag("/pre"),this.cr()}function v(e){var t=this.attrs(e);this.cr(),this.tag("hr",t,!0),this.cr()}function g(e,t){var n=this.attrs(e);t?(this.cr(),this.tag("blockquote",n),this.cr()):(this.cr(),this.tag("/blockquote"),this.cr())}function y(e,t){var n="bullet"===e.listType?"ul":"ol",r=this.attrs(e);if(t){var i=e.listStart;null!==i&&1!==i&&r.push(["start",i.toString()]),this.cr(),this.tag(n,r),this.cr()}else this.cr(),this.tag("/"+n),this.cr()}function _(e,t){var n=this.attrs(e);t?this.tag("li",n):(this.tag("/li"),this.cr())}function b(e){this.options.safe?this.lit("\x3c!-- raw HTML omitted --\x3e"):this.lit(e.literal)}function x(e){this.cr(),this.options.safe?this.lit("\x3c!-- raw HTML omitted --\x3e"):this.lit(e.literal),this.cr()}function w(e,t){t&&e.onEnter?this.lit(e.onEnter):!t&&e.onExit&&this.lit(e.onExit)}function k(e,t){this.cr(),t&&e.onEnter?this.lit(e.onEnter):!t&&e.onExit&&this.lit(e.onExit),this.cr()}function E(e){this.lit(this.esc(e,!1))}function S(e){var t=[];if(this.options.sourcepos){var n=e.sourcepos;n&&t.push(["data-sourcepos",String(n[0][0])+":"+String(n[0][1])+"-"+String(n[1][0])+":"+String(n[1][1])])}return t}var C=n(333),A=/^javascript:|vbscript:|file:|data:/i,D=/^data:image\/(?:png|gif|jpeg|webp)/i,O=function(e){return A.test(e)&&!D.test(e)};i.prototype=Object.create(C.prototype),i.prototype.text=o,i.prototype.html_inline=b,i.prototype.html_block=x,i.prototype.softbreak=a,i.prototype.linebreak=s,i.prototype.link=u,i.prototype.image=l,i.prototype.emph=c,i.prototype.strong=p,i.prototype.paragraph=f,i.prototype.heading=h,i.prototype.code=d,i.prototype.code_block=m,i.prototype.thematic_break=v,i.prototype.block_quote=g,i.prototype.list=y,i.prototype.item=_,i.prototype.custom_inline=w,i.prototype.custom_block=k,i.prototype.esc=n(73).escapeXml,i.prototype.out=E,i.prototype.tag=r,i.prototype.attrs=S,e.exports=i},function(e,t,n){"use strict";function r(e){return e.replace(/([a-z])([A-Z])/g,"$1_$2").toLowerCase()}function i(e){e=e||{},this.disableTags=0,this.lastOut="\n",this.indentLevel=0,this.indent="  ",this.options=e}function o(e){this.buffer="";var t,n,i,o,a,s,u,l,c=e.walker(),p=this.options;for(p.time&&console.time("rendering"),this.buffer+='<?xml version="1.0" encoding="UTF-8"?>\n',this.buffer+='<!DOCTYPE document SYSTEM "CommonMark.dtd">\n';i=c.next();)if(a=i.entering,o=i.node,l=o.type,s=o.isContainer,u="thematic_break"===l||"linebreak"===l||"softbreak"===l,n=r(l),a){switch(t=[],l){case"document":t.push(["xmlns","http://commonmark.org/xml/1.0"]);break;case"list":null!==o.listType&&t.push(["type",o.listType.toLowerCase()]),null!==o.listStart&&t.push(["start",String(o.listStart)]),null!==o.listTight&&t.push(["tight",o.listTight?"true":"false"]);var f=o.listDelimiter;if(null!==f){var h="";h="."===f?"period":"paren",t.push(["delimiter",h])}break;case"code_block":o.info&&t.push(["info",o.info]);break;case"heading":t.push(["level",String(o.level)]);break;case"link":case"image":t.push(["destination",o.destination]),t.push(["title",o.title]);break;case"custom_inline":case"custom_block":t.push(["on_enter",o.onEnter]),t.push(["on_exit",o.onExit])}if(p.sourcepos){var d=o.sourcepos;d&&t.push(["sourcepos",String(d[0][0])+":"+String(d[0][1])+"-"+String(d[1][0])+":"+String(d[1][1])])}if(this.cr(),this.out(this.tag(n,t,u)),s)this.indentLevel+=1;else if(!s&&!u){var m=o.literal;m&&this.out(this.esc(m)),this.out(this.tag("/"+n))}}else this.indentLevel-=1,this.cr(),this.out(this.tag("/"+n));return p.time&&console.timeEnd("rendering"),this.buffer+="\n",this.buffer}function a(e){this.disableTags>0?this.buffer+=e.replace(c,""):this.buffer+=e,this.lastOut=e}function s(){if("\n"!==this.lastOut){this.buffer+="\n",this.lastOut="\n";for(var e=this.indentLevel;e>0;e--)this.buffer+=this.indent}}function u(e,t,n){var r="<"+e;if(t&&t.length>0)for(var i,o=0;void 0!==(i=t[o]);)r+=" "+i[0]+'="'+this.esc(i[1])+'"',o++;return n&&(r+=" /"),r+=">"}var l=n(333),c=/\<[^>]*\>/;i.prototype=Object.create(l.prototype),i.prototype.render=o,i.prototype.out=a,i.prototype.cr=s,i.prototype.tag=u,i.prototype.esc=n(73).escapeXml,e.exports=i},function(e,t,n){"use strict";function r(e,t){if("string"!=typeof e)throw new TypeError("argument str must be a string");for(var n={},r=t||{},i=e.split(u),s=r.decode||a,l=0;l<i.length;l++){var c=i[l],p=c.indexOf("=");if(!(p<0)){var f=c.substr(0,p).trim(),h=c.substr(++p,c.length).trim();'"'==h[0]&&(h=h.slice(1,-1)),void 0==n[f]&&(n[f]=o(h,s))}}return n}function i(e,t,n){var r=n||{},i=r.encode||s;if("function"!=typeof i)throw new TypeError("option encode is invalid");if(!l.test(e))throw new TypeError("argument name is invalid");var o=i(t);if(o&&!l.test(o))throw new TypeError("argument val is invalid");var a=e+"="+o;if(null!=r.maxAge){var u=r.maxAge-0;if(isNaN(u))throw new Error("maxAge should be a Number");a+="; Max-Age="+Math.floor(u)}if(r.domain){if(!l.test(r.domain))throw new TypeError("option domain is invalid");a+="; Domain="+r.domain}if(r.path){if(!l.test(r.path))throw new TypeError("option path is invalid");a+="; Path="+r.path}if(r.expires){if("function"!=typeof r.expires.toUTCString)throw new TypeError("option expires is invalid");a+="; Expires="+r.expires.toUTCString()}if(r.httpOnly&&(a+="; HttpOnly"),r.secure&&(a+="; Secure"),r.sameSite){switch("string"==typeof r.sameSite?r.sameSite.toLowerCase():r.sameSite){case!0:a+="; SameSite=Strict";break;case"lax":a+="; SameSite=Lax";break;case"strict":a+="; SameSite=Strict";break;default:throw new TypeError("option sameSite is invalid")}}return a}function o(e,t){try{return t(e)}catch(t){return e}}/*!
-+ * cookie
-+ * Copyright(c) 2012-2014 Roman Shtylman
-+ * Copyright(c) 2015 Douglas Christopher Wilson
-+ * MIT Licensed
-+ */
-+t.parse=r,t.serialize=i;var a=decodeURIComponent,s=encodeURIComponent,u=/; */,l=/^[\u0009\u0020-\u007e\u0080-\u00ff]+$/},function(e,t,n){n(679),n(683),n(690),n(366),n(674),n(675),n(680),n(684),n(686),n(670),n(671),n(672),n(673),n(676),n(677),n(678),n(681),n(682),n(685),n(687),n(688),n(689),n(666),n(667),n(668),n(669),e.exports=n(63).String},function(e,t,n){n(664),n(366),n(693),n(665),n(691),n(692),e.exports=n(63).Promise},function(e,t,n){n(103),n(621),e.exports=n(15).Array.from},function(e,t,n){n(104),n(103),e.exports=n(619)},function(e,t,n){n(104),n(103),e.exports=n(620)},function(e,t,n){var r=n(15),i=r.JSON||(r.JSON={stringify:JSON.stringify});e.exports=function(e){return i.stringify.apply(i,arguments)}},function(e,t,n){n(623),e.exports=n(15).Object.assign},function(e,t,n){n(624);var r=n(15).Object;e.exports=function(e,t){return r.create(e,t)}},function(e,t,n){n(625);var r=n(15).Object;e.exports=function(e,t,n){return r.defineProperty(e,t,n)}},function(e,t,n){n(626),e.exports=n(15).Object.getPrototypeOf},function(e,t,n){n(627),e.exports=n(15).Object.keys},function(e,t,n){n(628),e.exports=n(15).Object.setPrototypeOf},function(e,t,n){n(194),n(103),n(104),n(629),n(632),n(633),e.exports=n(15).Promise},function(e,t,n){n(630),n(194),n(634),n(635),e.exports=n(15).Symbol},function(e,t,n){n(103),n(104),e.exports=n(192).f("iterator")},function(e,t,n){n(194),n(104),n(631),n(637),n(636),e.exports=n(15).WeakMap},function(e,t){e.exports=function(){}},function(e,t,n){var r=n(75),i=n(133),o=n(618);e.exports=function(e){return function(t,n,a){var s,u=r(t),l=i(u.length),c=o(a,l);if(e&&n!=n){for(;l>c;)if((s=u[c++])!=s)return!0}else for(;l>c;c++)if((e||c in u)&&u[c]===n)return e||c||0;return!e&&-1}}},function(e,t,n){var r=n(27),i=n(337),o=n(22)("species");e.exports=function(e){var t;return i(e)&&(t=e.constructor,"function"!=typeof t||t!==Array&&!i(t.prototype)||(t=void 0),r(t)&&null===(t=t[o])&&(t=void 0)),void 0===t?Array:t}},function(e,t,n){var r=n(601);e.exports=function(e,t){return new(r(e))(t)}},function(e,t,n){"use strict";var r=n(185),i=n(131).getWeak,o=n(37),a=n(27),s=n(175),u=n(129),l=n(176),c=n(55),p=n(351),f=l(5),h=l(6),d=0,m=function(e){return e._l||(e._l=new v)},v=function(){this.a=[]},g=function(e,t){return f(e.a,function(e){return e[0]===t})};v.prototype={get:function(e){var t=g(this,e);if(t)return t[1]},has:function(e){return!!g(this,e)},set:function(e,t){var n=g(this,e);n?n[1]=t:this.a.push([e,t])},delete:function(e){var t=h(this.a,function(t){return t[0]===e});return~t&&this.a.splice(t,1),!!~t}},e.exports={getConstructor:function(e,t,n,o){var l=e(function(e,r){s(e,l,t,"_i"),e._t=t,e._i=d++,e._l=void 0,void 0!=r&&u(r,n,e[o],e)});return r(l.prototype,{delete:function(e){if(!a(e))return!1;var n=i(e);return!0===n?m(p(this,t)).delete(e):n&&c(n,this._i)&&delete n[this._i]},has:function(e){if(!a(e))return!1;var n=i(e);return!0===n?m(p(this,t)).has(e):n&&c(n,this._i)}}),l},def:function(e,t,n){var r=i(o(t),!0);return!0===r?m(e).set(t,n):r[e._i]=n,e},ufstore:m}},function(e,t,n){"use strict";var r=n(24),i=n(23),o=n(131),a=n(54),s=n(56),u=n(185),l=n(129),c=n(175),p=n(27),f=n(102),h=n(41).f,d=n(176)(0),m=n(49);e.exports=function(e,t,n,v,g,y){var _=r[e],b=_,x=g?"set":"add",w=b&&b.prototype,k={};return m&&"function"==typeof b&&(y||w.forEach&&!a(function(){(new b).entries().next()}))?(b=t(function(t,n){c(t,b,e,"_c"),t._c=new _,void 0!=n&&l(n,g,t[x],t)}),d("add,clear,delete,forEach,get,has,set,keys,values,entries,toJSON".split(","),function(e){var t="add"==e||"set"==e;e in w&&(!y||"clear"!=e)&&s(b.prototype,e,function(n,r){if(c(this,b,e),!t&&y&&!p(n))return"get"==e&&void 0;var i=this._c[e](0===n?0:n,r);return t?this:i})}),y||h(b.prototype,"size",{get:function(){return this._c.size}})):(b=v.getConstructor(t,e,g,x),u(b.prototype,n),o.NEED=!0),f(b,e),k[e]=b,i(i.G+i.W+i.F,k),y||v.setStrong(b,e,g),b}},function(e,t,n){"use strict";var r=n(41),i=n(101);e.exports=function(e,t,n){t in e?r.f(e,t,i(0,n)):e[t]=n}},function(e,t,n){var r=n(100),i=n(184),o=n(132);e.exports=function(e){var t=r(e),n=i.f;if(n)for(var a,s=n(e),u=o.f,l=0;s.length>l;)u.call(e,a=s[l++])&&t.push(a);return t}},function(e,t){e.exports=function(e,t,n){var r=void 0===n;switch(t.length){case 0:return r?e():e.call(n);case 1:return r?e(t[0]):e.call(n,t[0]);case 2:return r?e(t[0],t[1]):e.call(n,t[0],t[1]);case 3:return r?e(t[0],t[1],t[2]):e.call(n,t[0],t[1],t[2]);case 4:return r?e(t[0],t[1],t[2],t[3]):e.call(n,t[0],t[1],t[2],t[3])}return e.apply(n,t)}},function(e,t,n){"use strict";var r=n(183),i=n(101),o=n(102),a={};n(56)(a,n(22)("iterator"),function(){return this}),e.exports=function(e,t,n){e.prototype=r(a,{next:i(1,n)}),o(e,t+" Iterator")}},function(e,t){e.exports=function(e,t){return{value:t,done:!!e}}},function(e,t,n){var r=n(24),i=n(350).set,o=r.MutationObserver||r.WebKitMutationObserver,a=r.process,s=r.Promise,u="process"==n(99)(a);e.exports=function(){var e,t,n,l=function(){var r,i;for(u&&(r=a.domain)&&r.exit();e;){i=e.fn,e=e.next;try{i()}catch(r){throw e?n():t=void 0,r}}t=void 0,r&&r.enter()};if(u)n=function(){a.nextTick(l)};else if(!o||r.navigator&&r.navigator.standalone)if(s&&s.resolve){var c=s.resolve();n=function(){c.then(l)}}else n=function(){i.call(r,l)};else{var p=!0,f=document.createTextNode("");new o(l).observe(f,{characterData:!0}),n=function(){f.data=p=!p}}return function(r){var i={fn:r,next:void 0};t&&(t.next=i),e||(e=i,n()),t=i}}},function(e,t,n){var r=n(41),i=n(37),o=n(100);e.exports=n(49)?Object.defineProperties:function(e,t){i(e);for(var n,a=o(t),s=a.length,u=0;s>u;)r.f(e,n=a[u++],t[n]);return e}},function(e,t,n){var r=n(75),i=n(343).f,o={}.toString,a="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],s=function(e){try{return i(e)}catch(e){return a.slice()}};e.exports.f=function(e){return a&&"[object Window]"==o.call(e)?s(e):i(r(e))}},function(e,t,n){"use strict";var r=n(23),i=n(98),o=n(53),a=n(129);e.exports=function(e){r(r.S,e,{from:function(e){var t,n,r,s,u=arguments[1];return i(this),t=void 0!==u,t&&i(u),void 0==e?new this:(n=[],t?(r=0,s=o(u,arguments[2],2),a(e,!1,function(e){n.push(s(e,r++))})):a(e,!1,n.push,n),new this(n))}})}},function(e,t,n){"use strict";var r=n(23);e.exports=function(e){r(r.S,e,{of:function(){for(var e=arguments.length,t=new Array(e);e--;)t[e]=arguments[e];return new this(t)}})}},function(e,t,n){var r=n(27),i=n(37),o=function(e,t){if(i(e),!r(t)&&null!==t)throw TypeError(t+": can't set as prototype!")};e.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(e,t,r){try{r=n(53)(Function.call,n(342).f(Object.prototype,"__proto__").set,2),r(e,[]),t=!(e instanceof Array)}catch(e){t=!0}return function(e,n){return o(e,n),t?e.__proto__=n:r(e,n),e}}({},!1):void 0),check:o}},function(e,t,n){"use strict";var r=n(24),i=n(15),o=n(41),a=n(49),s=n(22)("species");e.exports=function(e){var t="function"==typeof i[e]?i[e]:r[e];a&&t&&!t[s]&&o.f(t,s,{configurable:!0,get:function(){return this}})}},function(e,t,n){var r=n(189),i=n(178);e.exports=function(e){return function(t,n){var o,a,s=String(i(t)),u=r(n),l=s.length;return u<0||u>=l?e?"":void 0:(o=s.charCodeAt(u),o<55296||o>56319||u+1===l||(a=s.charCodeAt(u+1))<56320||a>57343?e?s.charAt(u):o:e?s.slice(u,u+2):a-56320+(o-55296<<10)+65536)}}},function(e,t,n){var r=n(189),i=Math.max,o=Math.min;e.exports=function(e,t){return e=r(e),e<0?i(e+t,0):o(e,t)}},function(e,t,n){var r=n(37),i=n(193);e.exports=n(15).getIterator=function(e){var t=i(e);if("function"!=typeof t)throw TypeError(e+" is not iterable!");return r(t.call(e))}},function(e,t,n){var r=n(177),i=n(22)("iterator"),o=n(74);e.exports=n(15).isIterable=function(e){var t=Object(e);return void 0!==t[i]||"@@iterator"in t||o.hasOwnProperty(r(t))}},function(e,t,n){"use strict";var r=n(53),i=n(23),o=n(76),a=n(338),s=n(336),u=n(133),l=n(605),c=n(193);i(i.S+i.F*!n(340)(function(e){Array.from(e)}),"Array",{from:function(e){var t,n,i,p,f=o(e),h="function"==typeof this?this:Array,d=arguments.length,m=d>1?arguments[1]:void 0,v=void 0!==m,g=0,y=c(f);if(v&&(m=r(m,d>2?arguments[2]:void 0,2)),void 0==y||h==Array&&s(y))for(t=u(f.length),n=new h(t);t>g;g++)l(n,g,v?m(f[g],g):f[g]);else for(p=y.call(f),n=new h;!(i=p.next()).done;g++)l(n,g,v?a(p,m,[i.value,g],!0):i.value);return n.length=g,n}})},function(e,t,n){"use strict";var r=n(599),i=n(609),o=n(74),a=n(75);e.exports=n(339)(Array,"Array",function(e,t){this._t=a(e),this._i=0,this._k=t},function(){var e=this._t,t=this._k,n=this._i++;return!e||n>=e.length?(this._t=void 0,i(1)):"keys"==t?i(0,n):"values"==t?i(0,e[n]):i(0,[n,e[n]])},"values"),o.Arguments=o.Array,r("keys"),r("values"),r("entries")},function(e,t,n){var r=n(23);r(r.S+r.F,"Object",{assign:n(341)})},function(e,t,n){var r=n(23);r(r.S,"Object",{create:n(183)})},function(e,t,n){var r=n(23);r(r.S+r.F*!n(49),"Object",{defineProperty:n(41).f})},function(e,t,n){var r=n(76),i=n(344);n(346)("getPrototypeOf",function(){return function(e){return i(r(e))}})},function(e,t,n){var r=n(76),i=n(100);n(346)("keys",function(){return function(e){return i(r(e))}})},function(e,t,n){var r=n(23);r(r.S,"Object",{setPrototypeOf:n(615).set})},function(e,t,n){"use strict";var r,i,o,a,s=n(130),u=n(24),l=n(53),c=n(177),p=n(23),f=n(27),h=n(98),d=n(175),m=n(129),v=n(349),g=n(350).set,y=n(610)(),_=n(182),b=n(347),x=n(348),w=u.TypeError,k=u.process,E=u.Promise,S="process"==c(k),C=function(){},A=i=_.f,D=!!function(){try{var e=E.resolve(1),t=(e.constructor={})[n(22)("species")]=function(e){e(C,C)};return(S||"function"==typeof PromiseRejectionEvent)&&e.then(C)instanceof t}catch(e){}}(),O=function(e){var t;return!(!f(e)||"function"!=typeof(t=e.then))&&t},M=function(e,t){if(!e._n){e._n=!0;var n=e._c;y(function(){for(var r=e._v,i=1==e._s,o=0;n.length>o;)!function(t){var n,o,a=i?t.ok:t.fail,s=t.resolve,u=t.reject,l=t.domain;try{a?(i||(2==e._h&&I(e),e._h=1),!0===a?n=r:(l&&l.enter(),n=a(r),l&&l.exit()),n===t.promise?u(w("Promise-chain cycle")):(o=O(n))?o.call(n,s,u):s(n)):u(r)}catch(e){u(e)}}(n[o++]);e._c=[],e._n=!1,t&&!e._h&&T(e)})}},T=function(e){g.call(u,function(){var t,n,r,i=e._v,o=P(e);if(o&&(t=b(function(){S?k.emit("unhandledRejection",i,e):(n=u.onunhandledrejection)?n({promise:e,reason:i}):(r=u.console)&&r.error&&r.error("Unhandled promise rejection",i)}),e._h=S||P(e)?2:1),e._a=void 0,o&&t.e)throw t.v})},P=function(e){return 1!==e._h&&0===(e._a||e._c).length},I=function(e){g.call(u,function(){var t;S?k.emit("rejectionHandled",e):(t=u.onrejectionhandled)&&t({promise:e,reason:e._v})})},R=function(e){var t=this;t._d||(t._d=!0,t=t._w||t,t._v=e,t._s=2,t._a||(t._a=t._c.slice()),M(t,!0))},j=function(e){var t,n=this;if(!n._d){n._d=!0,n=n._w||n;try{if(n===e)throw w("Promise can't be resolved itself");(t=O(e))?y(function(){var r={_w:n,_d:!1};try{t.call(e,l(j,r,1),l(R,r,1))}catch(e){R.call(r,e)}}):(n._v=e,n._s=1,M(n,!1))}catch(e){R.call({_w:n,_d:!1},e)}}};D||(E=function(e){d(this,E,"Promise","_h"),h(e),r.call(this);try{e(l(j,this,1),l(R,this,1))}catch(e){R.call(this,e)}},r=function(e){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1},r.prototype=n(185)(E.prototype,{then:function(e,t){var n=A(v(this,E));return n.ok="function"!=typeof e||e,n.fail="function"==typeof t&&t,n.domain=S?k.domain:void 0,this._c.push(n),this._a&&this._a.push(n),this._s&&M(this,!1),n.promise},catch:function(e){return this.then(void 0,e)}}),o=function(){var e=new r;this.promise=e,this.resolve=l(j,e,1),this.reject=l(R,e,1)},_.f=A=function(e){return e===E||e===a?new o(e):i(e)}),p(p.G+p.W+p.F*!D,{Promise:E}),n(102)(E,"Promise"),n(616)("Promise"),a=n(15).Promise,p(p.S+p.F*!D,"Promise",{reject:function(e){var t=A(this);return(0,t.reject)(e),t.promise}}),p(p.S+p.F*(s||!D),"Promise",{resolve:function(e){return x(s&&this===a?E:this,e)}}),p(p.S+p.F*!(D&&n(340)(function(e){E.all(e).catch(C)})),"Promise",{all:function(e){var t=this,n=A(t),r=n.resolve,i=n.reject,o=b(function(){var n=[],o=0,a=1;m(e,!1,function(e){var s=o++,u=!1;n.push(void 0),a++,t.resolve(e).then(function(e){u||(u=!0,n[s]=e,--a||r(n))},i)}),--a||r(n)});return o.e&&i(o.v),n.promise},race:function(e){var t=this,n=A(t),r=n.reject,i=b(function(){m(e,!1,function(e){t.resolve(e).then(n.resolve,r)})});return i.e&&r(i.v),n.promise}})},function(e,t,n){"use strict";var r=n(24),i=n(55),o=n(49),a=n(23),s=n(186),u=n(131).KEY,l=n(54),c=n(188),p=n(102),f=n(134),h=n(22),d=n(192),m=n(191),v=n(606),g=n(337),y=n(37),_=n(27),b=n(75),x=n(190),w=n(101),k=n(183),E=n(612),S=n(342),C=n(41),A=n(100),D=S.f,O=C.f,M=E.f,T=r.Symbol,P=r.JSON,I=P&&P.stringify,R=h("_hidden"),j=h("toPrimitive"),F={}.propertyIsEnumerable,N=c("symbol-registry"),B=c("symbols"),L=c("op-symbols"),q=Object.prototype,z="function"==typeof T,U=r.QObject,W=!U||!U.prototype||!U.prototype.findChild,V=o&&l(function(){return 7!=k(O({},"a",{get:function(){return O(this,"a",{value:7}).a}})).a})?function(e,t,n){var r=D(q,t);r&&delete q[t],O(e,t,n),r&&e!==q&&O(q,t,r)}:O,H=function(e){var t=B[e]=k(T.prototype);return t._k=e,t},G=z&&"symbol"==typeof T.iterator?function(e){return"symbol"==typeof e}:function(e){return e instanceof T},J=function(e,t,n){return e===q&&J(L,t,n),y(e),t=x(t,!0),y(n),i(B,t)?(n.enumerable?(i(e,R)&&e[R][t]&&(e[R][t]=!1),n=k(n,{enumerable:w(0,!1)})):(i(e,R)||O(e,R,w(1,{})),e[R][t]=!0),V(e,t,n)):O(e,t,n)},K=function(e,t){y(e);for(var n,r=v(t=b(t)),i=0,o=r.length;o>i;)J(e,n=r[i++],t[n]);return e},X=function(e,t){return void 0===t?k(e):K(k(e),t)},Y=function(e){var t=F.call(this,e=x(e,!0));return!(this===q&&i(B,e)&&!i(L,e))&&(!(t||!i(this,e)||!i(B,e)||i(this,R)&&this[R][e])||t)},$=function(e,t){if(e=b(e),t=x(t,!0),e!==q||!i(B,t)||i(L,t)){var n=D(e,t);return!n||!i(B,t)||i(e,R)&&e[R][t]||(n.enumerable=!0),n}},Z=function(e){for(var t,n=M(b(e)),r=[],o=0;n.length>o;)i(B,t=n[o++])||t==R||t==u||r.push(t);return r},Q=function(e){for(var t,n=e===q,r=M(n?L:b(e)),o=[],a=0;r.length>a;)!i(B,t=r[a++])||n&&!i(q,t)||o.push(B[t]);return o};z||(T=function(){if(this instanceof T)throw TypeError("Symbol is not a constructor!");var e=f(arguments.length>0?arguments[0]:void 0),t=function(n){this===q&&t.call(L,n),i(this,R)&&i(this[R],e)&&(this[R][e]=!1),V(this,e,w(1,n))};return o&&W&&V(q,e,{configurable:!0,set:t}),H(e)},s(T.prototype,"toString",function(){return this._k}),S.f=$,C.f=J,n(343).f=E.f=Z,n(132).f=Y,n(184).f=Q,o&&!n(130)&&s(q,"propertyIsEnumerable",Y,!0),d.f=function(e){return H(h(e))}),a(a.G+a.W+a.F*!z,{Symbol:T});for(var ee="hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","),te=0;ee.length>te;)h(ee[te++]);for(var ne=A(h.store),re=0;ne.length>re;)m(ne[re++]);a(a.S+a.F*!z,"Symbol",{for:function(e){return i(N,e+="")?N[e]:N[e]=T(e)},keyFor:function(e){if(!G(e))throw TypeError(e+" is not a symbol!");for(var t in N)if(N[t]===e)return t},useSetter:function(){W=!0},useSimple:function(){W=!1}}),a(a.S+a.F*!z,"Object",{create:X,defineProperty:J,defineProperties:K,getOwnPropertyDescriptor:$,getOwnPropertyNames:Z,getOwnPropertySymbols:Q}),P&&a(a.S+a.F*(!z||l(function(){var e=T();return"[null]"!=I([e])||"{}"!=I({a:e})||"{}"!=I(Object(e))})),"JSON",{stringify:function(e){for(var t,n,r=[e],i=1;arguments.length>i;)r.push(arguments[i++]);if(n=t=r[1],(_(t)||void 0!==e)&&!G(e))return g(t)||(t=function(e,t){if("function"==typeof n&&(t=n.call(this,e,t)),!G(t))return t}),r[1]=t,I.apply(P,r)}}),T.prototype[j]||n(56)(T.prototype,j,T.prototype.valueOf),p(T,"Symbol"),p(Math,"Math",!0),p(r.JSON,"JSON",!0)},function(e,t,n){"use strict";var r,i=n(176)(0),o=n(186),a=n(131),s=n(341),u=n(603),l=n(27),c=n(54),p=n(351),f=a.getWeak,h=Object.isExtensible,d=u.ufstore,m={},v=function(e){return function(){return e(this,arguments.length>0?arguments[0]:void 0)}},g={get:function(e){if(l(e)){var t=f(e);return!0===t?d(p(this,"WeakMap")).get(e):t?t[this._i]:void 0}},set:function(e,t){return u.def(p(this,"WeakMap"),e,t)}},y=e.exports=n(604)("WeakMap",v,g,u,!0,!0);c(function(){return 7!=(new y).set((Object.freeze||Object)(m),7).get(m)})&&(r=u.getConstructor(v,"WeakMap"),s(r.prototype,g),a.NEED=!0,i(["delete","has","get","set"],function(e){var t=y.prototype,n=t[e];o(t,e,function(t,i){if(l(t)&&!h(t)){this._f||(this._f=new r);var o=this._f[e](t,i);return"set"==e?this:o}return n.call(this,t,i)})}))},function(e,t,n){"use strict";var r=n(23),i=n(15),o=n(24),a=n(349),s=n(348);r(r.P+r.R,"Promise",{finally:function(e){var t=a(this,i.Promise||o.Promise),n="function"==typeof e;return this.then(n?function(n){return s(t,e()).then(function(){return n})}:e,n?function(n){return s(t,e()).then(function(){throw n})}:e)}})},function(e,t,n){"use strict";var r=n(23),i=n(182),o=n(347);r(r.S,"Promise",{try:function(e){var t=i.f(this),n=o(e);return(n.e?t.reject:t.resolve)(n.v),t.promise}})},function(e,t,n){n(191)("asyncIterator")},function(e,t,n){n(191)("observable")},function(e,t,n){n(613)("WeakMap")},function(e,t,n){n(614)("WeakMap")},function(e,t,n){var r=n(19)("unscopables"),i=Array.prototype;void 0==i[r]&&n(64)(i,r,{}),e.exports=function(e){i[r][e]=!0}},function(e,t){e.exports=function(e,t,n,r){if(!(e instanceof t)||void 0!==r&&r in e)throw TypeError(n+": incorrect invocation!");return e}},function(e,t,n){var r=n(140),i=n(110),o=n(365);e.exports=function(e){return function(t,n,a){var s,u=r(t),l=i(u.length),c=o(a,l);if(e&&n!=n){for(;l>c;)if((s=u[c++])!=s)return!0}else for(;l>c;c++)if((e||c in u)&&u[c]===n)return e||c||0;return!e&&-1}}},function(e,t,n){var r=n(136),i=n(646),o=n(645),a=n(62),s=n(110),u=n(662),l={},c={},t=e.exports=function(e,t,n,p,f){var h,d,m,v,g=f?function(){return e}:u(e),y=r(n,p,t?2:1),_=0;if("function"!=typeof g)throw TypeError(e+" is not iterable!");if(o(g)){for(h=s(e.length);h>_;_++)if((v=t?y(a(d=e[_])[0],d[1]):y(e[_]))===l||v===c)return v}else for(m=g.call(e);!(d=m.next()).done;)if((v=i(m,y,d.value,t))===l||v===c)return v};t.BREAK=l,t.RETURN=c},function(e,t,n){e.exports=!n(106)&&!n(107)(function(){return 7!=Object.defineProperty(n(196)("div"),"a",{get:function(){return 7}}).a})},function(e,t){e.exports=function(e,t,n){var r=void 0===n;switch(t.length){case 0:return r?e():e.call(n);case 1:return r?e(t[0]):e.call(n,t[0]);case 2:return r?e(t[0],t[1]):e.call(n,t[0],t[1]);case 3:return r?e(t[0],t[1],t[2]):e.call(n,t[0],t[1],t[2]);case 4:return r?e(t[0],t[1],t[2],t[3]):e.call(n,t[0],t[1],t[2],t[3])}return e.apply(n,t)}},function(e,t,n){var r=n(105);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(e){return"String"==r(e)?e.split(""):Object(e)}},function(e,t,n){var r=n(109),i=n(19)("iterator"),o=Array.prototype;e.exports=function(e){return void 0!==e&&(r.Array===e||o[i]===e)}},function(e,t,n){var r=n(62);e.exports=function(e,t,n,i){try{return i?t(r(n)[0],n[1]):t(n)}catch(t){var o=e.return;throw void 0!==o&&r(o.call(e)),t}}},function(e,t,n){"use strict";var r=n(651),i=n(360),o=n(199),a={};n(64)(a,n(19)("iterator"),function(){return this}),e.exports=function(e,t,n){e.prototype=r(a,{next:i(1,n)}),o(e,t+" Iterator")}},function(e,t,n){var r=n(19)("iterator"),i=!1;try{var o=[7][r]();o.return=function(){i=!0},Array.from(o,function(){throw 2})}catch(e){}e.exports=function(e,t){if(!t&&!i)return!1;var n=!1;try{var o=[7],a=o[r]();a.next=function(){return{done:n=!0}},o[r]=function(){return a},e(o)}catch(e){}return n}},function(e,t){e.exports=function(e,t){return{value:t,done:!!e}}},function(e,t,n){var r=n(31),i=n(364).set,o=r.MutationObserver||r.WebKitMutationObserver,a=r.process,s=r.Promise,u="process"==n(105)(a);e.exports=function(){var e,t,n,l=function(){var r,i;for(u&&(r=a.domain)&&r.exit();e;){i=e.fn,e=e.next;try{i()}catch(r){throw e?n():t=void 0,r}}t=void 0,r&&r.enter()};if(u)n=function(){a.nextTick(l)};else if(!o||r.navigator&&r.navigator.standalone)if(s&&s.resolve){var c=s.resolve();n=function(){c.then(l)}}else n=function(){i.call(r,l)};else{var p=!0,f=document.createTextNode("");new o(l).observe(f,{characterData:!0}),n=function(){f.data=p=!p}}return function(r){var i={fn:r,next:void 0};t&&(t.next=i),e||(e=i,n()),t=i}}},function(e,t,n){var r=n(62),i=n(652),o=n(352),a=n(200)("IE_PROTO"),s=function(){},u=function(){var e,t=n(196)("iframe"),r=o.length;for(t.style.display="none",n(353).appendChild(t),t.src="javascript:",e=t.contentWindow.document,e.open(),e.write("<script>document.F=Object<\/script>"),e.close(),u=e.F;r--;)delete u.prototype[o[r]];return u()};e.exports=Object.create||function(e,t){var n;return null!==e?(s.prototype=r(e),n=new s,s.prototype=null,n[a]=e):n=u(),void 0===t?n:i(n,t)}},function(e,t,n){var r=n(138),i=n(62),o=n(357);e.exports=n(106)?Object.defineProperties:function(e,t){i(e);for(var n,a=o(t),s=a.length,u=0;s>u;)r.f(e,n=a[u++],t[n]);return e}},function(e,t,n){var r=n(108),i=n(660),o=n(200)("IE_PROTO"),a=Object.prototype;e.exports=Object.getPrototypeOf||function(e){return e=i(e),r(e,o)?e[o]:"function"==typeof e.constructor&&e instanceof e.constructor?e.constructor.prototype:e instanceof Object?a:null}},function(e,t,n){var r=n(108),i=n(140),o=n(640)(!1),a=n(200)("IE_PROTO");e.exports=function(e,t){var n,s=i(e),u=0,l=[];for(n in s)n!=a&&r(s,n)&&l.push(n);for(;t.length>u;)r(s,n=t[u++])&&(~o(l,n)||l.push(n));return l}},function(e,t,n){var r=n(78);e.exports=function(e,t,n){for(var i in t)r(e,i,t[i],n);return e}},function(e,t,n){"use strict";var r=n(31),i=n(138),o=n(106),a=n(19)("species");e.exports=function(e){var t=r[e];o&&t&&!t[a]&&i.f(t,a,{configurable:!0,get:function(){return this}})}},function(e,t,n){"use strict";var r=n(139),i=n(57);e.exports=function(e){var t=String(i(this)),n="",o=r(e);if(o<0||o==1/0)throw RangeError("Count can't be negative");for(;o>0;(o>>>=1)&&(t+=t))1&o&&(n+=t);return n}},function(e,t,n){var r=n(28),i=n(57),o=n(107),a=n(659),s="["+a+"]",u="​…",l=RegExp("^"+s+s+"*"),c=RegExp(s+s+"*$"),p=function(e,t,n){var i={},s=o(function(){return!!a[e]()||u[e]()!=u}),l=i[e]=s?t(f):a[e];n&&(i[n]=l),r(r.P+r.F*s,"String",i)},f=p.trim=function(e,t){return e=String(i(e)),1&t&&(e=e.replace(l,"")),2&t&&(e=e.replace(c,"")),e};e.exports=p},function(e,t){e.exports="\t\n\v\f\r   ᠎             　\u2028\u2029\ufeff"},function(e,t,n){var r=n(57);e.exports=function(e){return Object(r(e))}},function(e,t,n){var r=n(77);e.exports=function(e,t){if(!r(e))return e;var n,i;if(t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i;if("function"==typeof(n=e.valueOf)&&!r(i=n.call(e)))return i;if(!t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i;throw TypeError("Can't convert object to primitive value")}},function(e,t,n){var r=n(195),i=n(19)("iterator"),o=n(109);e.exports=n(63).getIteratorMethod=function(e){if(void 0!=e)return e[i]||e["@@iterator"]||o[r(e)]}},function(e,t,n){"use strict";var r=n(638),i=n(649),o=n(109),a=n(140);e.exports=n(355)(Array,"Array",function(e,t){this._t=a(e),this._i=0,this._k=t},function(){var e=this._t,t=this._k,n=this._i++;return!e||n>=e.length?(this._t=void 0,i(1)):"keys"==t?i(0,n):"values"==t?i(0,e[n]):i(0,[n,e[n]])},"values"),o.Arguments=o.Array,r("keys"),r("values"),r("entries")},function(e,t,n){"use strict";var r=n(195),i={};i[n(19)("toStringTag")]="z",i+""!="[object z]"&&n(78)(Object.prototype,"toString",function(){return"[object "+r(this)+"]"},!0)},function(e,t,n){"use strict";var r,i,o,a,s=n(356),u=n(31),l=n(136),c=n(195),p=n(28),f=n(77),h=n(135),d=n(639),m=n(641),v=n(362),g=n(364).set,y=n(650)(),_=n(198),b=n(358),x=n(359),w=u.TypeError,k=u.process,E=u.Promise,S="process"==c(k),C=function(){},A=i=_.f,D=!!function(){try{var e=E.resolve(1),t=(e.constructor={})[n(19)("species")]=function(e){e(C,C)};return(S||"function"==typeof PromiseRejectionEvent)&&e.then(C)instanceof t}catch(e){}}(),O=function(e){var t;return!(!f(e)||"function"!=typeof(t=e.then))&&t},M=function(e,t){if(!e._n){e._n=!0;var n=e._c;y(function(){for(var r=e._v,i=1==e._s,o=0;n.length>o;)!function(t){var n,o,a=i?t.ok:t.fail,s=t.resolve,u=t.reject,l=t.domain;try{a?(i||(2==e._h&&I(e),e._h=1),!0===a?n=r:(l&&l.enter(),n=a(r),l&&l.exit()),n===t.promise?u(w("Promise-chain cycle")):(o=O(n))?o.call(n,s,u):s(n)):u(r)}catch(e){u(e)}}(n[o++]);e._c=[],e._n=!1,t&&!e._h&&T(e)})}},T=function(e){g.call(u,function(){var t,n,r,i=e._v,o=P(e);if(o&&(t=b(function(){S?k.emit("unhandledRejection",i,e):(n=u.onunhandledrejection)?n({promise:e,reason:i}):(r=u.console)&&r.error&&r.error("Unhandled promise rejection",i)}),e._h=S||P(e)?2:1),e._a=void 0,o&&t.e)throw t.v})},P=function(e){return 1!==e._h&&0===(e._a||e._c).length},I=function(e){g.call(u,function(){var t;S?k.emit("rejectionHandled",e):(t=u.onrejectionhandled)&&t({promise:e,reason:e._v})})},R=function(e){var t=this;t._d||(t._d=!0,t=t._w||t,t._v=e,t._s=2,t._a||(t._a=t._c.slice()),M(t,!0))},j=function(e){var t,n=this;if(!n._d){n._d=!0,n=n._w||n;try{if(n===e)throw w("Promise can't be resolved itself");(t=O(e))?y(function(){var r={_w:n,_d:!1};try{t.call(e,l(j,r,1),l(R,r,1))}catch(e){R.call(r,e)}}):(n._v=e,n._s=1,M(n,!1))}catch(e){R.call({_w:n,_d:!1},e)}}};D||(E=function(e){d(this,E,"Promise","_h"),h(e),r.call(this);try{e(l(j,this,1),l(R,this,1))}catch(e){R.call(this,e)}},r=function(e){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1},r.prototype=n(655)(E.prototype,{then:function(e,t){var n=A(v(this,E));return n.ok="function"!=typeof e||e,n.fail="function"==typeof t&&t,n.domain=S?k.domain:void 0,this._c.push(n),this._a&&this._a.push(n),this._s&&M(this,!1),n.promise},catch:function(e){return this.then(void 0,e)}}),o=function(){var e=new r;this.promise=e,this.resolve=l(j,e,1),this.reject=l(R,e,1)},_.f=A=function(e){return e===E||e===a?new o(e):i(e)}),p(p.G+p.W+p.F*!D,{Promise:E}),n(199)(E,"Promise"),n(656)("Promise"),a=n(63).Promise,p(p.S+p.F*!D,"Promise",{reject:function(e){var t=A(this);return(0,t.reject)(e),t.promise}}),p(p.S+p.F*(s||!D),"Promise",{resolve:function(e){return x(s&&this===a?E:this,e)}}),p(p.S+p.F*!(D&&n(648)(function(e){E.all(e).catch(C)})),"Promise",{all:function(e){var t=this,n=A(t),r=n.resolve,i=n.reject,o=b(function(){var n=[],o=0,a=1;m(e,!1,function(e){var s=o++,u=!1;n.push(void 0),a++,t.resolve(e).then(function(e){u||(u=!0,n[s]=e,--a||r(n))},i)}),--a||r(n)});return o.e&&i(o.v),n.promise},race:function(e){var t=this,n=A(t),r=n.reject,i=b(function(){m(e,!1,function(e){t.resolve(e).then(n.resolve,r)})});return i.e&&r(i.v),n.promise}})},function(e,t,n){n(137)("match",1,function(e,t,n){return[function(n){"use strict";var r=e(this),i=void 0==n?void 0:n[t];return void 0!==i?i.call(n,r):new RegExp(n)[t](String(r))},n]})},function(e,t,n){n(137)("replace",2,function(e,t,n){return[function(r,i){"use strict";var o=e(this),a=void 0==r?void 0:r[t];return void 0!==a?a.call(r,o,i):n.call(String(o),r,i)},n]})},function(e,t,n){n(137)("search",1,function(e,t,n){return[function(n){"use strict";var r=e(this),i=void 0==n?void 0:n[t];return void 0!==i?i.call(n,r):new RegExp(n)[t](String(r))},n]})},function(e,t,n){n(137)("split",2,function(e,t,r){"use strict";var i=n(354),o=r,a=[].push,s="length";if("c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1)[s]||2!="ab".split(/(?:ab)*/)[s]||4!=".".split(/(.?)(.?)/)[s]||".".split(/()()/)[s]>1||"".split(/.?/)[s]){var u=void 0===/()??/.exec("")[1];r=function(e,t){var n=String(this);if(void 0===e&&0===t)return[];if(!i(e))return o.call(n,e,t);var r,l,c,p,f,h=[],d=(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.unicode?"u":"")+(e.sticky?"y":""),m=0,v=void 0===t?4294967295:t>>>0,g=new RegExp(e.source,d+"g");for(u||(r=new RegExp("^"+g.source+"$(?!\\s)",d));(l=g.exec(n))&&!((c=l.index+l[0][s])>m&&(h.push(n.slice(m,l.index)),!u&&l[s]>1&&l[0].replace(r,function(){for(f=1;f<arguments[s]-2;f++)void 0===arguments[f]&&(l[f]=void 0)}),l[s]>1&&l.index<n[s]&&a.apply(h,l.slice(1)),p=l[0][s],m=c,h[s]>=v));)g.lastIndex===l.index&&g.lastIndex++;return m===n[s]?!p&&g.test("")||h.push(""):h.push(n.slice(m)),h[s]>v?h.slice(0,v):h}}else"0".split(void 0,0)[s]&&(r=function(e,t){return void 0===e&&0===t?[]:o.call(this,e,t)});return[function(n,i){var o=e(this),a=void 0==n?void 0:n[t];return void 0!==a?a.call(n,o,i):r.call(String(o),n,i)},r]})},function(e,t,n){"use strict";n(29)("anchor",function(e){return function(t){return e(this,"a","name",t)}})},function(e,t,n){"use strict";n(29)("big",function(e){return function(){return e(this,"big","","")}})},function(e,t,n){"use strict";n(29)("blink",function(e){return function(){return e(this,"blink","","")}})},function(e,t,n){"use strict";n(29)("bold",function(e){return function(){return e(this,"b","","")}})},function(e,t,n){"use strict";var r=n(28),i=n(363)(!1);r(r.P,"String",{codePointAt:function(e){return i(this,e)}})},function(e,t,n){"use strict";var r=n(28),i=n(110),o=n(201),a="".endsWith;r(r.P+r.F*n(197)("endsWith"),"String",{endsWith:function(e){var t=o(this,e,"endsWith"),n=arguments.length>1?arguments[1]:void 0,r=i(t.length),s=void 0===n?r:Math.min(i(n),r),u=String(e);return a?a.call(t,u,s):t.slice(s-u.length,s)===u}})},function(e,t,n){"use strict";n(29)("fixed",function(e){return function(){return e(this,"tt","","")}})},function(e,t,n){"use strict";n(29)("fontcolor",function(e){return function(t){return e(this,"font","color",t)}})},function(e,t,n){"use strict";n(29)("fontsize",function(e){return function(t){return e(this,"font","size",t)}})},function(e,t,n){var r=n(28),i=n(365),o=String.fromCharCode,a=String.fromCodePoint;r(r.S+r.F*(!!a&&1!=a.length),"String",{fromCodePoint:function(e){for(var t,n=[],r=arguments.length,a=0;r>a;){if(t=+arguments[a++],i(t,1114111)!==t)throw RangeError(t+" is not a valid code point");n.push(t<65536?o(t):o(55296+((t-=65536)>>10),t%1024+56320))}return n.join("")}})},function(e,t,n){"use strict";var r=n(28),i=n(201);r(r.P+r.F*n(197)("includes"),"String",{includes:function(e){return!!~i(this,e,"includes").indexOf(e,arguments.length>1?arguments[1]:void 0)}})},function(e,t,n){"use strict";n(29)("italics",function(e){return function(){return e(this,"i","","")}})},function(e,t,n){"use strict";n(29)("link",function(e){return function(t){return e(this,"a","href",t)}})},function(e,t,n){var r=n(28),i=n(140),o=n(110);r(r.S,"String",{raw:function(e){for(var t=i(e.raw),n=o(t.length),r=arguments.length,a=[],s=0;n>s;)a.push(String(t[s++])),s<r&&a.push(String(arguments[s]));return a.join("")}})},function(e,t,n){var r=n(28);r(r.P,"String",{repeat:n(657)})},function(e,t,n){"use strict";n(29)("small",function(e){return function(){return e(this,"small","","")}})},function(e,t,n){"use strict";var r=n(28),i=n(110),o=n(201),a="".startsWith;r(r.P+r.F*n(197)("startsWith"),"String",{startsWith:function(e){var t=o(this,e,"startsWith"),n=i(Math.min(arguments.length>1?arguments[1]:void 0,t.length)),r=String(e);return a?a.call(t,r,n):t.slice(n,n+r.length)===r}})},function(e,t,n){"use strict";n(29)("strike",function(e){return function(){return e(this,"strike","","")}})},function(e,t,n){"use strict";n(29)("sub",function(e){return function(){return e(this,"sub","","")}})},function(e,t,n){"use strict";n(29)("sup",function(e){return function(){return e(this,"sup","","")}})},function(e,t,n){"use strict";n(658)("trim",function(e){return function(){return e(this,3)}})},function(e,t,n){"use strict";var r=n(28),i=n(63),o=n(31),a=n(362),s=n(359);r(r.P+r.R,"Promise",{finally:function(e){var t=a(this,i.Promise||o.Promise),n="function"==typeof e;return this.then(n?function(n){return s(t,e()).then(function(){return n})}:e,n?function(n){return s(t,e()).then(function(){throw n})}:e)}})},function(e,t,n){"use strict";var r=n(28),i=n(198),o=n(358);r(r.S,"Promise",{try:function(e){var t=i.f(this),n=o(e);return(n.e?t.reject:t.resolve)(n.v),t.promise}})},function(e,t,n){for(var r=n(663),i=n(357),o=n(78),a=n(31),s=n(64),u=n(109),l=n(19),c=l("iterator"),p=l("toStringTag"),f=u.Array,h={CSSRuleList:!0,CSSStyleDeclaration:!1,CSSValueList:!1,ClientRectList:!1,DOMRectList:!1,DOMStringList:!1,DOMTokenList:!0,DataTransferItemList:!1,FileList:!1,HTMLAllCollection:!1,HTMLCollection:!1,HTMLFormElement:!1,HTMLSelectElement:!1,MediaList:!0,MimeTypeArray:!1,NamedNodeMap:!1,NodeList:!0,PaintRequestList:!1,Plugin:!1,PluginArray:!1,SVGLengthList:!1,SVGNumberList:!1,SVGPathSegList:!1,SVGPointList:!1,SVGStringList:!1,SVGTransformList:!1,SourceBufferList:!1,StyleSheetList:!0,TextTrackCueList:!1,TextTrackList:!1,TouchList:!1},d=i(h),m=0;m<d.length;m++){var v,g=d[m],y=h[g],_=a[g],b=_&&_.prototype;if(b&&(b[c]||s(b,c,f),b[p]||s(b,p,g),u[g]=f,y))for(v in r)b[v]||o(b,v,r[v],!0)}},function(e,t,n){"use strict";function r(e){return e}function i(e,t,n){function i(e,t){var n=y.hasOwnProperty(t)?y[t]:null;w.hasOwnProperty(t)&&s("OVERRIDE_BASE"===n,"ReactClassInterface: You are attempting to override `%s` from your class specification. Ensure that your method names do not overlap with React methods.",t),e&&s("DEFINE_MANY"===n||"DEFINE_MANY_MERGED"===n,"ReactClassInterface: You are attempting to define `%s` on your component more than once. This conflict may be due to a mixin.",t)}function l(e,n){if(n){s("function"!=typeof n,"ReactClass: You're attempting to use a component class or function as a mixin. Instead, just use a regular object."),s(!t(n),"ReactClass: You're attempting to use a component as a mixin. Instead, just use a regular object.");var r=e.prototype,o=r.__reactAutoBindPairs;n.hasOwnProperty(u)&&_.mixins(e,n.mixins);for(var a in n)if(n.hasOwnProperty(a)&&a!==u){var l=n[a],c=r.hasOwnProperty(a);if(i(c,a),_.hasOwnProperty(a))_[a](e,l);else{var p=y.hasOwnProperty(a),d="function"==typeof l,m=d&&!p&&!c&&!1!==n.autobind;if(m)o.push(a,l),r[a]=l;else if(c){var v=y[a];s(p&&("DEFINE_MANY_MERGED"===v||"DEFINE_MANY"===v),"ReactClass: Unexpected spec policy %s for key %s when mixing in component specs.",v,a),"DEFINE_MANY_MERGED"===v?r[a]=f(r[a],l):"DEFINE_MANY"===v&&(r[a]=h(r[a],l))}else r[a]=l}}}else;}function c(e,t){if(t)for(var n in t){var r=t[n];if(t.hasOwnProperty(n)){var i=n in _;s(!i,'ReactClass: You are attempting to define a reserved property, `%s`, that shouldn\'t be on the "statics" key. Define it as an instance property instead; it will still be accessible on the constructor.',n);var o=n in e;s(!o,"ReactClass: You are attempting to define `%s` on your component more than once. This conflict may be due to a mixin.",n),e[n]=r}}}function p(e,t){s(e&&t&&"object"==typeof e&&"object"==typeof t,"mergeIntoWithNoDuplicateKeys(): Cannot merge non-objects.");for(var n in t)t.hasOwnProperty(n)&&(s(void 0===e[n],"mergeIntoWithNoDuplicateKeys(): Tried to merge two objects with the same key: `%s`. This conflict may be due to a mixin; in particular, this may be caused by two getInitialState() or getDefaultProps() methods returning objects with clashing keys.",n),e[n]=t[n]);return e}function f(e,t){return function(){var n=e.apply(this,arguments),r=t.apply(this,arguments);if(null==n)return r;if(null==r)return n;var i={};return p(i,n),p(i,r),i}}function h(e,t){return function(){e.apply(this,arguments),t.apply(this,arguments)}}function d(e,t){var n=t.bind(e);return n}function m(e){for(var t=e.__reactAutoBindPairs,n=0;n<t.length;n+=2){var r=t[n],i=t[n+1];e[r]=d(e,i)}}function v(e){var t=r(function(e,r,i){this.__reactAutoBindPairs.length&&m(this),this.props=e,this.context=r,this.refs=a,this.updater=i||n,this.state=null;var o=this.getInitialState?this.getInitialState():null;s("object"==typeof o&&!Array.isArray(o),"%s.getInitialState(): must return an object or null",t.displayName||"ReactCompositeComponent"),this.state=o});t.prototype=new k,t.prototype.constructor=t,t.prototype.__reactAutoBindPairs=[],g.forEach(l.bind(null,t)),l(t,b),l(t,e),l(t,x),t.getDefaultProps&&(t.defaultProps=t.getDefaultProps()),s(t.prototype.render,"createClass(...): Class specification must implement a `render` method.");for(var i in y)t.prototype[i]||(t.prototype[i]=null);return t}var g=[],y={mixins:"DEFINE_MANY",statics:"DEFINE_MANY",propTypes:"DEFINE_MANY",contextTypes:"DEFINE_MANY",childContextTypes:"DEFINE_MANY",getDefaultProps:"DEFINE_MANY_MERGED",getInitialState:"DEFINE_MANY_MERGED",getChildContext:"DEFINE_MANY_MERGED",render:"DEFINE_ONCE",componentWillMount:"DEFINE_MANY",componentDidMount:"DEFINE_MANY",componentWillReceiveProps:"DEFINE_MANY",shouldComponentUpdate:"DEFINE_ONCE",componentWillUpdate:"DEFINE_MANY",componentDidUpdate:"DEFINE_MANY",componentWillUnmount:"DEFINE_MANY",updateComponent:"OVERRIDE_BASE"},_={displayName:function(e,t){e.displayName=t},mixins:function(e,t){if(t)for(var n=0;n<t.length;n++)l(e,t[n])},childContextTypes:function(e,t){e.childContextTypes=o({},e.childContextTypes,t)},contextTypes:function(e,t){e.contextTypes=o({},e.contextTypes,t)},getDefaultProps:function(e,t){e.getDefaultProps?e.getDefaultProps=f(e.getDefaultProps,t):e.getDefaultProps=t},propTypes:function(e,t){e.propTypes=o({},e.propTypes,t)},statics:function(e,t){c(e,t)},autobind:function(){}},b={componentDidMount:function(){this.__isMounted=!0}},x={componentWillUnmount:function(){this.__isMounted=!1}},w={replaceState:function(e,t){this.updater.enqueueReplaceState(this,e,t)},isMounted:function(){return!!this.__isMounted}},k=function(){};return o(k.prototype,e.prototype,w),v}var o=n(13),a=n(144),s=n(8),u="mixins";e.exports=i},function(e,t){!function(e){"use strict";function t(e){if("string"!=typeof e&&(e=String(e)),/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(e))throw new TypeError("Invalid character in header field name");return e.toLowerCase()}function n(e){return"string"!=typeof e&&(e=String(e)),e}function r(e){var t={next:function(){var t=e.shift();return{done:void 0===t,value:t}}};return g.iterable&&(t[Symbol.iterator]=function(){return t}),t}function i(e){this.map={},e instanceof i?e.forEach(function(e,t){this.append(t,e)},this):Array.isArray(e)?e.forEach(function(e){this.append(e[0],e[1])},this):e&&Object.getOwnPropertyNames(e).forEach(function(t){this.append(t,e[t])},this)}function o(e){if(e.bodyUsed)return Promise.reject(new TypeError("Already read"));e.bodyUsed=!0}function a(e){return new Promise(function(t,n){e.onload=function(){t(e.result)},e.onerror=function(){n(e.error)}})}function s(e){var t=new FileReader,n=a(t);return t.readAsArrayBuffer(e),n}function u(e){var t=new FileReader,n=a(t);return t.readAsText(e),n}function l(e){for(var t=new Uint8Array(e),n=new Array(t.length),r=0;r<t.length;r++)n[r]=String.fromCharCode(t[r]);return n.join("")}function c(e){if(e.slice)return e.slice(0);var t=new Uint8Array(e.byteLength);return t.set(new Uint8Array(e)),t.buffer}function p(){return this.bodyUsed=!1,this._initBody=function(e){if(this._bodyInit=e,e)if("string"==typeof e)this._bodyText=e;else if(g.blob&&Blob.prototype.isPrototypeOf(e))this._bodyBlob=e;else if(g.formData&&FormData.prototype.isPrototypeOf(e))this._bodyFormData=e;else if(g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e))this._bodyText=e.toString();else if(g.arrayBuffer&&g.blob&&_(e))this._bodyArrayBuffer=c(e.buffer),this._bodyInit=new Blob([this._bodyArrayBuffer]);else{if(!g.arrayBuffer||!ArrayBuffer.prototype.isPrototypeOf(e)&&!b(e))throw new Error("unsupported BodyInit type");this._bodyArrayBuffer=c(e)}else this._bodyText="";this.headers.get("content-type")||("string"==typeof e?this.headers.set("content-type","text/plain;charset=UTF-8"):this._bodyBlob&&this._bodyBlob.type?this.headers.set("content-type",this._bodyBlob.type):g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e)&&this.headers.set("content-type","application/x-www-form-urlencoded;charset=UTF-8"))},g.blob&&(this.blob=function(){var e=o(this);if(e)return e;if(this._bodyBlob)return Promise.resolve(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(new Blob([this._bodyArrayBuffer]));if(this._bodyFormData)throw new Error("could not read FormData body as blob");return Promise.resolve(new Blob([this._bodyText]))},this.arrayBuffer=function(){return this._bodyArrayBuffer?o(this)||Promise.resolve(this._bodyArrayBuffer):this.blob().then(s)}),this.text=function(){var e=o(this);if(e)return e;if(this._bodyBlob)return u(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(l(this._bodyArrayBuffer));if(this._bodyFormData)throw new Error("could not read FormData body as text");return Promise.resolve(this._bodyText)},g.formData&&(this.formData=function(){return this.text().then(d)}),this.json=function(){return this.text().then(JSON.parse)},this}function f(e){var t=e.toUpperCase();return x.indexOf(t)>-1?t:e}function h(e,t){var n=(t=t||{}).body;if(e instanceof h){if(e.bodyUsed)throw new TypeError("Already read");this.url=e.url,this.credentials=e.credentials,t.headers||(this.headers=new i(e.headers)),this.method=e.method,this.mode=e.mode,n||null==e._bodyInit||(n=e._bodyInit,e.bodyUsed=!0)}else this.url=String(e);if(this.credentials=t.credentials||this.credentials||"omit",!t.headers&&this.headers||(this.headers=new i(t.headers)),this.method=f(t.method||this.method||"GET"),this.mode=t.mode||this.mode||null,this.referrer=null,("GET"===this.method||"HEAD"===this.method)&&n)throw new TypeError("Body not allowed for GET or HEAD requests");this._initBody(n)}function d(e){var t=new FormData;return e.trim().split("&").forEach(function(e){if(e){var n=e.split("="),r=n.shift().replace(/\+/g," "),i=n.join("=").replace(/\+/g," ");t.append(decodeURIComponent(r),decodeURIComponent(i))}}),t}function m(e){var t=new i;return e.split(/\r?\n/).forEach(function(e){var n=e.split(":"),r=n.shift().trim();if(r){var i=n.join(":").trim();t.append(r,i)}}),t}function v(e,t){t||(t={}),this.type="default",this.status="status"in t?t.status:200,this.ok=this.status>=200&&this.status<300,this.statusText="statusText"in t?t.statusText:"OK",this.headers=new i(t.headers),this.url=t.url||"",this._initBody(e)}if(!e.fetch){var g={searchParams:"URLSearchParams"in e,iterable:"Symbol"in e&&"iterator"in Symbol,blob:"FileReader"in e&&"Blob"in e&&function(){try{return new Blob,!0}catch(e){return!1}}(),formData:"FormData"in e,arrayBuffer:"ArrayBuffer"in e};if(g.arrayBuffer)var y=["[object Int8Array]","[object Uint8Array]","[object Uint8ClampedArray]","[object Int16Array]","[object Uint16Array]","[object Int32Array]","[object Uint32Array]","[object Float32Array]","[object Float64Array]"],_=function(e){return e&&DataView.prototype.isPrototypeOf(e)},b=ArrayBuffer.isView||function(e){return e&&y.indexOf(Object.prototype.toString.call(e))>-1};i.prototype.append=function(e,r){e=t(e),r=n(r);var i=this.map[e];this.map[e]=i?i+","+r:r},i.prototype.delete=function(e){delete this.map[t(e)]},i.prototype.get=function(e){return e=t(e),this.has(e)?this.map[e]:null},i.prototype.has=function(e){return this.map.hasOwnProperty(t(e))},i.prototype.set=function(e,r){this.map[t(e)]=n(r)},i.prototype.forEach=function(e,t){for(var n in this.map)this.map.hasOwnProperty(n)&&e.call(t,this.map[n],n,this)},i.prototype.keys=function(){var e=[];return this.forEach(function(t,n){e.push(n)}),r(e)},i.prototype.values=function(){var e=[];return this.forEach(function(t){e.push(t)}),r(e)},i.prototype.entries=function(){var e=[];return this.forEach(function(t,n){e.push([n,t])}),r(e)},g.iterable&&(i.prototype[Symbol.iterator]=i.prototype.entries);var x=["DELETE","GET","HEAD","OPTIONS","POST","PUT"];h.prototype.clone=function(){return new h(this,{body:this._bodyInit})},p.call(h.prototype),p.call(v.prototype),v.prototype.clone=function(){return new v(this._bodyInit,{status:this.status,statusText:this.statusText,headers:new i(this.headers),url:this.url})},v.error=function(){var e=new v(null,{status:0,statusText:""});return e.type="error",e};var w=[301,302,303,307,308];v.redirect=function(e,t){if(-1===w.indexOf(t))throw new RangeError("Invalid status code");return new v(null,{status:t,headers:{location:e}})},e.Headers=i,e.Request=h,e.Response=v,e.fetch=function(e,t){return new Promise(function(n,r){var i=new h(e,t),o=new XMLHttpRequest;o.onload=function(){var e={status:o.status,statusText:o.statusText,headers:m(o.getAllResponseHeaders()||"")};e.url="responseURL"in o?o.responseURL:e.headers.get("X-Request-URL");var t="response"in o?o.response:o.responseText;n(new v(t,e))},o.onerror=function(){r(new TypeError("Network request failed"))},o.ontimeout=function(){r(new TypeError("Network request failed"))},o.open(i.method,i.url,!0),"include"===i.credentials&&(o.withCredentials=!0),"responseType"in o&&g.blob&&(o.responseType="blob"),i.headers.forEach(function(e,t){o.setRequestHeader(t,e)}),o.send(void 0===i._bodyInit?null:i._bodyInit)})},e.fetch.polyfill=!0}}("undefined"!=typeof self?self:this)},function(e,t){var n={};!function(e){"use strict";function t(e){if("string"!=typeof e&&(e=String(e)),/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(e))throw new TypeError("Invalid character in header field name");return e.toLowerCase()}function n(e){return"string"!=typeof e&&(e=String(e)),e}function r(e){var t={next:function(){var t=e.shift();return{done:void 0===t,value:t}}};return g.iterable&&(t[Symbol.iterator]=function(){return t}),t}function i(e){this.map={},e instanceof i?e.forEach(function(e,t){this.append(t,e)},this):Array.isArray(e)?e.forEach(function(e){this.append(e[0],e[1])},this):e&&Object.getOwnPropertyNames(e).forEach(function(t){this.append(t,e[t])},this)}function o(e){if(e.bodyUsed)return Promise.reject(new TypeError("Already read"));e.bodyUsed=!0}function a(e){return new Promise(function(t,n){e.onload=function(){t(e.result)},e.onerror=function(){n(e.error)}})}function s(e){var t=new FileReader,n=a(t);return t.readAsArrayBuffer(e),n}function u(e){var t=new FileReader,n=a(t);return t.readAsText(e),n}function l(e){for(var t=new Uint8Array(e),n=new Array(t.length),r=0;r<t.length;r++)n[r]=String.fromCharCode(t[r]);return n.join("")}function c(e){if(e.slice)return e.slice(0);var t=new Uint8Array(e.byteLength);return t.set(new Uint8Array(e)),t.buffer}function p(){return this.bodyUsed=!1,this._initBody=function(e){if(this._bodyInit=e,e)if("string"==typeof e)this._bodyText=e;else if(g.blob&&Blob.prototype.isPrototypeOf(e))this._bodyBlob=e;else if(g.formData&&FormData.prototype.isPrototypeOf(e))this._bodyFormData=e;else if(g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e))this._bodyText=e.toString();else if(g.arrayBuffer&&g.blob&&_(e))this._bodyArrayBuffer=c(e.buffer),this._bodyInit=new Blob([this._bodyArrayBuffer]);else{if(!g.arrayBuffer||!ArrayBuffer.prototype.isPrototypeOf(e)&&!b(e))throw new Error("unsupported BodyInit type");this._bodyArrayBuffer=c(e)}else this._bodyText="";this.headers.get("content-type")||("string"==typeof e?this.headers.set("content-type","text/plain;charset=UTF-8"):this._bodyBlob&&this._bodyBlob.type?this.headers.set("content-type",this._bodyBlob.type):g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e)&&this.headers.set("content-type","application/x-www-form-urlencoded;charset=UTF-8"))},g.blob&&(this.blob=function(){var e=o(this);if(e)return e;if(this._bodyBlob)return Promise.resolve(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(new Blob([this._bodyArrayBuffer]));if(this._bodyFormData)throw new Error("could not read FormData body as blob");return Promise.resolve(new Blob([this._bodyText]))},this.arrayBuffer=function(){return this._bodyArrayBuffer?o(this)||Promise.resolve(this._bodyArrayBuffer):this.blob().then(s)}),this.text=function(){var e=o(this);if(e)return e;if(this._bodyBlob)return u(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(l(this._bodyArrayBuffer));if(this._bodyFormData)throw new Error("could not read FormData body as text");return Promise.resolve(this._bodyText)},g.formData&&(this.formData=function(){return this.text().then(d)}),this.json=function(){return this.text().then(JSON.parse)},this}function f(e){var t=e.toUpperCase();return x.indexOf(t)>-1?t:e}function h(e,t){var n=(t=t||{}).body;if(e instanceof h){if(e.bodyUsed)throw new TypeError("Already read");this.url=e.url,this.credentials=e.credentials,t.headers||(this.headers=new i(e.headers)),this.method=e.method,this.mode=e.mode,n||null==e._bodyInit||(n=e._bodyInit,e.bodyUsed=!0)}else this.url=String(e);if(this.credentials=t.credentials||this.credentials||"omit",!t.headers&&this.headers||(this.headers=new i(t.headers)),this.method=f(t.method||this.method||"GET"),this.mode=t.mode||this.mode||null,this.referrer=null,("GET"===this.method||"HEAD"===this.method)&&n)throw new TypeError("Body not allowed for GET or HEAD requests");this._initBody(n)}function d(e){var t=new FormData;return e.trim().split("&").forEach(function(e){if(e){var n=e.split("="),r=n.shift().replace(/\+/g," "),i=n.join("=").replace(/\+/g," ");t.append(decodeURIComponent(r),decodeURIComponent(i))}}),t}function m(e){var t=new i;return e.split(/\r?\n/).forEach(function(e){var n=e.split(":"),r=n.shift().trim();if(r){var i=n.join(":").trim();t.append(r,i)}}),t}function v(e,t){t||(t={}),this.type="default",this.status="status"in t?t.status:200,this.ok=this.status>=200&&this.status<300,this.statusText="statusText"in t?t.statusText:"OK",this.headers=new i(t.headers),this.url=t.url||"",this._initBody(e)}if(!e.fetch){var g={searchParams:"URLSearchParams"in e,iterable:"Symbol"in e&&"iterator"in Symbol,blob:"FileReader"in e&&"Blob"in e&&function(){try{return new Blob,!0}catch(e){return!1}}(),formData:"FormData"in e,arrayBuffer:"ArrayBuffer"in e};if(g.arrayBuffer)var y=["[object Int8Array]","[object Uint8Array]","[object Uint8ClampedArray]","[object Int16Array]","[object Uint16Array]","[object Int32Array]","[object Uint32Array]","[object Float32Array]","[object Float64Array]"],_=function(e){return e&&DataView.prototype.isPrototypeOf(e)},b=ArrayBuffer.isView||function(e){return e&&y.indexOf(Object.prototype.toString.call(e))>-1};i.prototype.append=function(e,r){e=t(e),r=n(r);var i=this.map[e];this.map[e]=i?i+","+r:r},i.prototype.delete=function(e){delete this.map[t(e)]},i.prototype.get=function(e){return e=t(e),this.has(e)?this.map[e]:null},i.prototype.has=function(e){return this.map.hasOwnProperty(t(e))},i.prototype.set=function(e,r){this.map[t(e)]=n(r)},i.prototype.forEach=function(e,t){for(var n in this.map)this.map.hasOwnProperty(n)&&e.call(t,this.map[n],n,this)},i.prototype.keys=function(){var e=[];return this.forEach(function(t,n){e.push(n)}),r(e)},i.prototype.values=function(){var e=[];return this.forEach(function(t){e.push(t)}),r(e)},i.prototype.entries=function(){var e=[];return this.forEach(function(t,n){e.push([n,t])}),r(e)},g.iterable&&(i.prototype[Symbol.iterator]=i.prototype.entries);var x=["DELETE","GET","HEAD","OPTIONS","POST","PUT"];h.prototype.clone=function(){return new h(this,{body:this._bodyInit})},p.call(h.prototype),p.call(v.prototype),v.prototype.clone=function(){return new v(this._bodyInit,{status:this.status,statusText:this.statusText,headers:new i(this.headers),url:this.url})},v.error=function(){var e=new v(null,{status:0,statusText:""});return e.type="error",e};var w=[301,302,303,307,308];v.redirect=function(e,t){if(-1===w.indexOf(t))throw new RangeError("Invalid status code");return new v(null,{status:t,headers:{location:e}})},e.Headers=i,e.Request=h,e.Response=v,e.fetch=function(e,t){return new Promise(function(n,r){var i=new h(e,t),o=new XMLHttpRequest;o.onload=function(){var e={status:o.status,statusText:o.statusText,headers:m(o.getAllResponseHeaders()||"")};e.url="responseURL"in o?o.responseURL:e.headers.get("X-Request-URL");var t="response"in o?o.response:o.responseText;n(new v(t,e))},o.onerror=function(){r(new TypeError("Network request failed"))},o.ontimeout=function(){r(new TypeError("Network request failed"))},o.open(i.method,i.url,!0),"include"===i.credentials&&(o.withCredentials=!0),"responseType"in o&&g.blob&&(o.responseType="blob"),i.headers.forEach(function(e,t){o.setRequestHeader(t,e)}),o.send(void 0===i._bodyInit?null:i._bodyInit)})},e.fetch.polyfill=!0}}(void 0!==n?n:this),e.exports=n},function(e,t,n){(function(t){!function(t,n){e.exports=n(t)}(void 0!==t?t:this,function(e){if(e.CSS&&e.CSS.escape)return e.CSS.escape;var t=function(e){if(0==arguments.length)throw new TypeError("`CSS.escape` requires an argument.");for(var t,n=String(e),r=n.length,i=-1,o="",a=n.charCodeAt(0);++i<r;)t=n.charCodeAt(i),o+=0!=t?t>=1&&t<=31||127==t||0==i&&t>=48&&t<=57||1==i&&t>=48&&t<=57&&45==a?"\\"+t.toString(16)+" ":(0!=i||1!=r||45!=t)&&(t>=128||45==t||95==t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122)?n.charAt(i):"\\"+n.charAt(i):"�";return o};return e.CSS||(e.CSS={}),e.CSS.escape=t,t})}).call(t,n(17))},function(e,t,n){function r(e,t){if(e){var n,r="";for(var i in e)n=e[i],r&&(r+=" "),!n&&p[i]?r+=i:r+=i+'="'+(t.decodeEntities?c.encodeXML(n):n)+'"';return r}}function i(e,t){"svg"===e.name&&(t={decodeEntities:t.decodeEntities,xmlMode:!0});var n="<"+e.name,i=r(e.attribs,t);return i&&(n+=" "+i),!t.xmlMode||e.children&&0!==e.children.length?(n+=">",e.children&&(n+=d(e.children,t)),h[e.name]&&!t.xmlMode||(n+="</"+e.name+">")):n+="/>",n}function o(e){return"<"+e.data+">"}function a(e,t){var n=e.data||"";return!t.decodeEntities||e.parent&&e.parent.name in f||(n=c.encodeXML(n)),n}function s(e){return"<![CDATA["+e.children[0].data+"]]>"}function u(e){return"\x3c!--"+e.data+"--\x3e"}var l=n(699),c=n(114),p={__proto__:null,allowfullscreen:!0,async:!0,autofocus:!0,autoplay:!0,checked:!0,controls:!0,default:!0,defer:!0,disabled:!0,hidden:!0,ismap:!0,loop:!0,multiple:!0,muted:!0,open:!0,readonly:!0,required:!0,reversed:!0,scoped:!0,seamless:!0,selected:!0,typemustmatch:!0},f={__proto__:null,style:!0,script:!0,xmp:!0,iframe:!0,noembed:!0,noframes:!0,plaintext:!0,noscript:!0},h={__proto__:null,area:!0,base:!0,basefont:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,isindex:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},d=e.exports=function(e,t){Array.isArray(e)||e.cheerio||(e=[e]),t=t||{};for(var n="",r=0;r<e.length;r++){var c=e[r];"root"===c.type?n+=d(c.children,t):l.isTag(c)?n+=i(c,t):c.type===l.Directive?n+=o(c):c.type===l.Comment?n+=u(c):c.type===l.CDATA?n+=s(c):n+=a(c,t)}return n}},function(e,t){e.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",isTag:function(e){return"tag"===e.type||"script"===e.type||"style"===e.type}}},function(e,t,n){function r(e,t,n){"object"==typeof e?(n=t,t=e,e=null):"function"==typeof t&&(n=t,t=u),this._callback=e,this._options=t||u,this._elementCB=n,this.dom=[],this._done=!1,this._tagStack=[],this._parser=this._parser||null}var i=n(113),o=/\s+/g,a=n(368),s=n(701),u={normalizeWhitespace:!1,withStartIndices:!1,withEndIndices:!1};r.prototype.onparserinit=function(e){this._parser=e},r.prototype.onreset=function(){r.call(this,this._callback,this._options,this._elementCB)},r.prototype.onend=function(){this._done||(this._done=!0,this._parser=null,this._handleCallback(null))},r.prototype._handleCallback=r.prototype.onerror=function(e){if("function"==typeof this._callback)this._callback(e,this.dom);else if(e)throw e},r.prototype.onclosetag=function(){var e=this._tagStack.pop();this._options.withEndIndices&&(e.endIndex=this._parser.endIndex),this._elementCB&&this._elementCB(e)},r.prototype._createDomElement=function(e){if(!this._options.withDomLvl1)return e;var t;t="tag"===e.type?Object.create(s):Object.create(a);for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t},r.prototype._addDomElement=function(e){var t=this._tagStack[this._tagStack.length-1],n=t?t.children:this.dom,r=n[n.length-1];e.next=null,this._options.withStartIndices&&(e.startIndex=this._parser.startIndex),this._options.withEndIndices&&(e.endIndex=this._parser.endIndex),r?(e.prev=r,r.next=e):e.prev=null,n.push(e),e.parent=t||null},r.prototype.onopentag=function(e,t){var n={type:"script"===e?i.Script:"style"===e?i.Style:i.Tag,name:e,attribs:t,children:[]},r=this._createDomElement(n);this._addDomElement(r),this._tagStack.push(r)},r.prototype.ontext=function(e){var t,n=this._options.normalizeWhitespace||this._options.ignoreWhitespace;if(!this._tagStack.length&&this.dom.length&&(t=this.dom[this.dom.length-1]).type===i.Text)n?t.data=(t.data+e).replace(o," "):t.data+=e;else if(this._tagStack.length&&(t=this._tagStack[this._tagStack.length-1])&&(t=t.children[t.children.length-1])&&t.type===i.Text)n?t.data=(t.data+e).replace(o," "):t.data+=e;else{n&&(e=e.replace(o," "));var r=this._createDomElement({data:e,type:i.Text});this._addDomElement(r)}},r.prototype.oncomment=function(e){var t=this._tagStack[this._tagStack.length-1];if(t&&t.type===i.Comment)return void(t.data+=e);var n={data:e,type:i.Comment},r=this._createDomElement(n);this._addDomElement(r),this._tagStack.push(r)},r.prototype.oncdatastart=function(){var e={children:[{data:"",type:i.Text}],type:i.CDATA},t=this._createDomElement(e);this._addDomElement(t),this._tagStack.push(t)},r.prototype.oncommentend=r.prototype.oncdataend=function(){this._tagStack.pop()},r.prototype.onprocessinginstruction=function(e,t){var n=this._createDomElement({name:e,data:t,type:i.Directive});this._addDomElement(n)},e.exports=r},function(e,t,n){var r=n(368),i=e.exports=Object.create(r),o={tagName:"name"};Object.keys(o).forEach(function(e){var t=o[e];Object.defineProperty(i,e,{get:function(){return this[t]||null},set:function(e){return this[t]=e,e}})})},function(e,t,n){var r=e.exports;[n(707),n(708),n(705),n(706),n(704),n(703)].forEach(function(e){Object.keys(e).forEach(function(t){r[t]=e[t].bind(r)})})},function(e,t){t.removeSubsets=function(e){for(var t,n,r,i=e.length;--i>-1;){for(t=n=e[i],e[i]=null,r=!0;n;){if(e.indexOf(n)>-1){r=!1,e.splice(i,1);break}n=n.parent}r&&(e[i]=t)}return e};var n={DISCONNECTED:1,PRECEDING:2,FOLLOWING:4,CONTAINS:8,CONTAINED_BY:16},r=t.compareDocumentPosition=function(e,t){var r,i,o,a,s,u,l=[],c=[];if(e===t)return 0;for(r=e;r;)l.unshift(r),r=r.parent;for(r=t;r;)c.unshift(r),r=r.parent;for(u=0;l[u]===c[u];)u++;return 0===u?n.DISCONNECTED:(i=l[u-1],o=i.children,a=l[u],s=c[u],o.indexOf(a)>o.indexOf(s)?i===t?n.FOLLOWING|n.CONTAINED_BY:n.FOLLOWING:i===e?n.PRECEDING|n.CONTAINS:n.PRECEDING)};t.uniqueSort=function(e){var t,i,o=e.length;for(e=e.slice();--o>-1;)t=e[o],(i=e.indexOf(t))>-1&&i<o&&e.splice(o,1);return e.sort(function(e,t){var i=r(e,t);return i&n.PRECEDING?-1:i&n.FOLLOWING?1:0}),e}},function(e,t,n){function r(e,t){return"function"==typeof t?function(n){return n.attribs&&t(n.attribs[e])}:function(n){return n.attribs&&n.attribs[e]===t}}function i(e,t){return function(n){return e(n)||t(n)}}var o=n(113),a=t.isTag=o.isTag;t.testElement=function(e,t){for(var n in e)if(e.hasOwnProperty(n)){if("tag_name"===n){if(!a(t)||!e.tag_name(t.name))return!1}else if("tag_type"===n){if(!e.tag_type(t.type))return!1}else if("tag_contains"===n){if(a(t)||!e.tag_contains(t.data))return!1}else if(!t.attribs||!e[n](t.attribs[n]))return!1}else;return!0};var s={tag_name:function(e){return"function"==typeof e?function(t){return a(t)&&e(t.name)}:"*"===e?a:function(t){return a(t)&&t.name===e}},tag_type:function(e){return"function"==typeof e?function(t){return e(t.type)}:function(t){return t.type===e}},tag_contains:function(e){return"function"==typeof e?function(t){return!a(t)&&e(t.data)}:function(t){return!a(t)&&t.data===e}}};t.getElements=function(e,t,n,o){var a=Object.keys(e).map(function(t){var n=e[t];return t in s?s[t](n):r(t,n)});return 0===a.length?[]:this.filter(a.reduce(i),t,n,o)},t.getElementById=function(e,t,n){return Array.isArray(t)||(t=[t]),this.findOne(r("id",e),t,!1!==n)},t.getElementsByTagName=function(e,t,n,r){return this.filter(s.tag_name(e),t,n,r)},t.getElementsByTagType=function(e,t,n,r){return this.filter(s.tag_type(e),t,n,r)}},function(e,t){t.removeElement=function(e){if(e.prev&&(e.prev.next=e.next),e.next&&(e.next.prev=e.prev),e.parent){var t=e.parent.children;t.splice(t.lastIndexOf(e),1)}},t.replaceElement=function(e,t){var n=t.prev=e.prev;n&&(n.next=t);var r=t.next=e.next;r&&(r.prev=t);var i=t.parent=e.parent;if(i){var o=i.children;o[o.lastIndexOf(e)]=t}},t.appendChild=function(e,t){if(t.parent=e,1!==e.children.push(t)){var n=e.children[e.children.length-2];n.next=t,t.prev=n,t.next=null}},t.append=function(e,t){var n=e.parent,r=e.next;if(t.next=r,t.prev=e,e.next=t,t.parent=n,r){if(r.prev=t,n){var i=n.children;i.splice(i.lastIndexOf(r),0,t)}}else n&&n.children.push(t)},t.prepend=function(e,t){var n=e.parent;if(n){var r=n.children;r.splice(r.lastIndexOf(e),0,t)}e.prev&&(e.prev.next=t),t.parent=n,t.prev=e.prev,t.next=e,e.prev=t}},function(e,t,n){function r(e,t,n,r){return Array.isArray(t)||(t=[t]),"number"==typeof r&&isFinite(r)||(r=1/0),i(e,t,!1!==n,r)}function i(e,t,n,r){for(var o,a=[],s=0,u=t.length;s<u&&!(e(t[s])&&(a.push(t[s]),--r<=0))&&(o=t[s].children,!(n&&o&&o.length>0&&(o=i(e,o,n,r),a=a.concat(o),(r-=o.length)<=0)));s++);return a}function o(e,t){for(var n=0,r=t.length;n<r;n++)if(e(t[n]))return t[n];return null}function a(e,t){for(var n=null,r=0,i=t.length;r<i&&!n;r++)l(t[r])&&(e(t[r])?n=t[r]:t[r].children.length>0&&(n=a(e,t[r].children)));return n}function s(e,t){for(var n=0,r=t.length;n<r;n++)if(l(t[n])&&(e(t[n])||t[n].children.length>0&&s(e,t[n].children)))return!0;return!1}function u(e,t){for(var n=[],r=[t];r.length;){for(var i=r.pop(),o=0,a=i.length;o<a;o++)l(i[o])&&e(i[o])&&n.push(i[o]);for(;a-- >0;)i[a].children&&i[a].children.length>0&&r.push(i[a].children)}return n}var l=n(113).isTag;e.exports={filter:r,find:i,findOneChild:o,findOne:a,existsOne:s,findAll:u}},function(e,t,n){function r(e,t){return e.children?e.children.map(function(e){return a(e,t)}).join(""):""}function i(e){return Array.isArray(e)?e.map(i).join(""):s(e)?"br"===e.name?"\n":i(e.children):e.type===o.CDATA?i(e.children):e.type===o.Text?e.data:""}var o=n(113),a=n(698),s=o.isTag;e.exports={getInnerHTML:r,getOuterHTML:a,getText:i}},function(e,t){var n=t.getChildren=function(e){return e.children},r=t.getParent=function(e){return e.parent};t.getSiblings=function(e){var t=r(e);return t?n(t):[e]},t.getAttributeValue=function(e,t){return e.attribs&&e.attribs[t]},t.hasAttrib=function(e,t){return!!e.attribs&&hasOwnProperty.call(e.attribs,t)},t.getName=function(e){return e.name}},function(e,t,n){"use strict";var r=function(e){return encodeURIComponent(e).replace(/[!'()*]/g,function(e){return"%"+e.charCodeAt(0).toString(16).toUpperCase()})};e.exports=r},function(e,t,n){function r(e){var t=Object.keys(e).join("|"),n=o(e);t+="|#[xX][\\da-fA-F]+|#\\d+";var r=new RegExp("&(?:"+t+");","g");return function(e){return String(e).replace(r,n)}}function i(e,t){return e<t?1:-1}function o(e){return function(t){return"#"===t.charAt(1)?l("X"===t.charAt(2)||"x"===t.charAt(2)?parseInt(t.substr(3),16):parseInt(t.substr(2),10)):e[t.slice(1,-1)]}}var a=n(204),s=n(370),u=n(205),l=n(369),c=r(u),p=r(a),f=function(){function e(e){return";"!==e.substr(-1)&&(e+=";"),c(e)}for(var t=Object.keys(s).sort(i),n=Object.keys(a).sort(i),r=0,u=0;r<n.length;r++)t[u]===n[r]?(n[r]+=";?",u++):n[r]+=";";var l=new RegExp("&(?:"+n.join("|")+"|#[xX][\\da-fA-F]+;?|#\\d+;?)","g"),c=o(a);return function(t){return String(t).replace(l,e)}}();e.exports={XML:c,HTML:f,HTMLStrict:p}},function(e,t,n){function r(e){return Object.keys(e).sort().reduce(function(t,n){return t[e[n]]="&"+n+";",t},{})}function i(e){var t=[],n=[];return Object.keys(e).forEach(function(e){1===e.length?t.push("\\"+e):n.push(e)}),n.unshift("["+t.join("")+"]"),new RegExp(n.join("|"),"g")}function o(e){return"&#x"+e.charCodeAt(0).toString(16).toUpperCase()+";"}function a(e){return"&#x"+(1024*(e.charCodeAt(0)-55296)+e.charCodeAt(1)-56320+65536).toString(16).toUpperCase()+";"}function s(e,t){function n(t){return e[t]}return function(e){return e.replace(t,n).replace(d,a).replace(h,o)}}function u(e){return e.replace(m,o).replace(d,a).replace(h,o)}var l=r(n(205)),c=i(l);t.XML=s(l,c);var p=r(n(204)),f=i(p);t.HTML=s(p,f);var h=/[^\0-\x7F]/g,d=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,m=i(l);t.escape=u},function(e,t){e.exports={0:65533,128:8364,130:8218,131:402,132:8222,133:8230,134:8224,135:8225,136:710,137:8240,138:352,139:8249,140:338,142:381,145:8216,146:8217,147:8220,148:8221,149:8226,150:8211,151:8212,152:732,153:8482,154:353,155:8250,156:339,158:382,159:376}},function(e,t,n){"use strict";e.exports=function(){var e,t,n=Array.from;return"function"==typeof n&&(e=["raz","dwa"],t=n(e),Boolean(t&&t!==e&&"dwa"===t[1]))}},function(e,t,n){"use strict";var r=n(738).iterator,i=n(717),o=n(718),a=n(65),s=n(58),u=n(115),l=n(79),c=n(737),p=Array.isArray,f=Function.prototype.call,h={configurable:!0,enumerable:!0,writable:!0,value:null},d=Object.defineProperty;e.exports=function(e){var t,n,m,v,g,y,_,b,x,w,k=arguments[1],E=arguments[2];if(e=Object(u(e)),l(k)&&s(k),this&&this!==Array&&o(this))t=this;else{if(!k){if(i(e))return 1!==(g=e.length)?Array.apply(null,e):(v=new Array(1),v[0]=e[0],v);if(p(e)){for(v=new Array(g=e.length),n=0;n<g;++n)v[n]=e[n];return v}}v=[]}if(!p(e))if(void 0!==(x=e[r])){for(_=s(x).call(e),t&&(v=new t),b=_.next(),n=0;!b.done;)w=k?f.call(k,E,b.value,n):b.value,t?(h.value=w,d(v,n,h)):v[n]=w,b=_.next(),++n;g=n}else if(c(e)){for(g=e.length,t&&(v=new t),n=0,m=0;n<g;++n)w=e[n],n+1<g&&(y=w.charCodeAt(0))>=55296&&y<=56319&&(w+=e[++n]),w=k?f.call(k,E,w,m):w,t?(h.value=w,d(v,m,h)):v[m]=w,++m;g=m}if(void 0===g)for(g=a(e.length),t&&(v=new t(g)),n=0;n<g;++n)w=k?f.call(k,E,e[n],n):e[n],t?(h.value=w,d(v,n,h)):v[n]=w;return t&&(h.value=null,v.length=g),v}},function(e,t,n){"use strict";var r=n(207),i=Array.isArray;e.exports=function(e){return i(e)?e:r(e)}},function(e,t,n){"use strict";var r=n(373),i=n(730),o=n(79),a=Error.captureStackTrace;t=e.exports=function(e){var n=new Error(e),s=arguments[1],u=arguments[2];return o(u)||i(s)&&(u=s,s=null),o(u)&&r(n,u),o(s)&&(n.code=s),a&&a(n,t),n}},function(e,t,n){"use strict";var r=Object.prototype.toString,i=r.call(function(){return arguments}());e.exports=function(e){return r.call(e)===i}},function(e,t,n){"use strict";var r=Object.prototype.toString,i=r.call(n(372));e.exports=function(e){return"function"==typeof e&&r.call(e)===i}},function(e,t,n){"use strict";e.exports=n(720)()?Math.sign:n(721)},function(e,t,n){"use strict";e.exports=function(){var e=Math.sign;return"function"==typeof e&&(1===e(10)&&-1===e(-20))}},function(e,t,n){"use strict";e.exports=function(e){return e=Number(e),isNaN(e)||0===e?e:e>0?1:-1}},function(e,t,n){"use strict";e.exports=n(723)()?Number.isNaN:n(724)},function(e,t,n){"use strict";e.exports=function(){var e=Number.isNaN;return"function"==typeof e&&(!e({})&&e(NaN)&&!e(34))}},function(e,t,n){"use strict";e.exports=function(e){return e!==e}},function(e,t,n){"use strict";var r=n(719),i=Math.abs,o=Math.floor;e.exports=function(e){return isNaN(e)?0:(e=Number(e),0!==e&&isFinite(e)?r(e)*o(i(e)):e)}},function(e,t,n){"use strict";var r=n(58),i=n(115),o=Function.prototype.bind,a=Function.prototype.call,s=Object.keys,u=Object.prototype.propertyIsEnumerable;e.exports=function(e,t){return function(n,l){var c,p=arguments[2],f=arguments[3];return n=Object(i(n)),r(l),c=s(n),f&&c.sort("function"==typeof f?o.call(f,n):void 0),"function"!=typeof e&&(e=c[e]),a.call(e,c,function(e,r){return u.call(n,e)?a.call(l,p,n[e],e,n,r):t})}}},function(e,t,n){"use strict";e.exports=function(){var e,t=Object.assign;return"function"==typeof t&&(e={foo:"raz"},t(e,{bar:"dwa"},{trzy:"trzy"}),e.foo+e.bar+e.trzy==="razdwatrzy")}},function(e,t,n){"use strict";var r=n(731),i=n(115),o=Math.max;e.exports=function(e,t){var n,a,s,u=o(arguments.length,2);for(e=Object(i(e)),s=function(r){try{e[r]=t[r]}catch(e){n||(n=e)}},a=1;a<u;++a)t=arguments[a],r(t).forEach(s);if(void 0!==n)throw n;return e}},function(e,t,n){"use strict";e.exports=function(e){return"function"==typeof e}},function(e,t,n){"use strict";var r=n(79),i={function:!0,object:!0};e.exports=function(e){return r(e)&&i[typeof e]||!1}},function(e,t,n){"use strict";e.exports=n(732)()?Object.keys:n(733)},function(e,t,n){"use strict";e.exports=function(){try{return Object.keys("primitive"),!0}catch(e){return!1}}},function(e,t,n){"use strict";var r=n(79),i=Object.keys;e.exports=function(e){return i(r(e)?Object(e):e)}},function(e,t,n){"use strict";e.exports=n(735)()?String.prototype.contains:n(736)},function(e,t,n){"use strict";var r="razdwatrzy";e.exports=function(){return"function"==typeof r.contains&&(!0===r.contains("dwa")&&!1===r.contains("foo"))}},function(e,t,n){"use strict";var r=String.prototype.indexOf;e.exports=function(e){return r.call(this,e,arguments[1])>-1}},function(e,t,n){"use strict";var r=Object.prototype.toString,i=r.call("");e.exports=function(e){return"string"==typeof e||e&&"object"==typeof e&&(e instanceof String||r.call(e)===i)||!1}},function(e,t,n){"use strict";e.exports=n(739)()?Symbol:n(741)},function(e,t,n){"use strict";var r={object:!0,symbol:!0};e.exports=function(){var e;if("function"!=typeof Symbol)return!1;e=Symbol("test symbol");try{String(e)}catch(e){return!1}return!!r[typeof Symbol.iterator]&&(!!r[typeof Symbol.toPrimitive]&&!!r[typeof Symbol.toStringTag])}},function(e,t,n){"use strict";e.exports=function(e){return!!e&&("symbol"==typeof e||!!e.constructor&&("Symbol"===e.constructor.name&&"Symbol"===e[e.constructor.toStringTag]))}},function(e,t,n){"use strict";var r,i,o,a,s=n(141),u=n(742),l=Object.create,c=Object.defineProperties,p=Object.defineProperty,f=Object.prototype,h=l(null);if("function"==typeof Symbol){r=Symbol;try{String(r()),a=!0}catch(e){}}var d=function(){var e=l(null);return function(t){for(var n,r,i=0;e[t+(i||"")];)++i;return t+=i||"",e[t]=!0,n="@@"+t,p(f,n,s.gs(null,function(e){r||(r=!0,p(this,n,s(e)),r=!1)})),n}}();o=function(e){if(this instanceof o)throw new TypeError("Symbol is not a constructor");return i(e)},e.exports=i=function e(t){var n;if(this instanceof e)throw new TypeError("Symbol is not a constructor");return a?r(t):(n=l(o.prototype),t=void 0===t?"":String(t),c(n,{__description__:s("",t),__name__:s("",d(t))}))},c(i,{for:s(function(e){return h[e]?h[e]:h[e]=i(String(e))}),keyFor:s(function(e){var t;u(e);for(t in h)if(h[t]===e)return t}),hasInstance:s("",r&&r.hasInstance||i("hasInstance")),isConcatSpreadable:s("",r&&r.isConcatSpreadable||i("isConcatSpreadable")),iterator:s("",r&&r.iterator||i("iterator")),match:s("",r&&r.match||i("match")),replace:s("",r&&r.replace||i("replace")),search:s("",r&&r.search||i("search")),species:s("",r&&r.species||i("species")),split:s("",r&&r.split||i("split")),toPrimitive:s("",r&&r.toPrimitive||i("toPrimitive")),toStringTag:s("",r&&r.toStringTag||i("toStringTag")),unscopables:s("",r&&r.unscopables||i("unscopables"))}),c(o.prototype,{constructor:s(i),toString:s("",function(){return this.__name__})}),c(i.prototype,{toString:s(function(){return"Symbol ("+u(this).__description__+")"}),valueOf:s(function(){return u(this)})}),p(i.prototype,i.toPrimitive,s("",function(){var e=u(this);return"symbol"==typeof e?e:e.toString()})),p(i.prototype,i.toStringTag,s("c","Symbol")),p(o.prototype,i.toStringTag,s("c",i.prototype[i.toStringTag])),p(o.prototype,i.toPrimitive,s("c",i.prototype[i.toPrimitive]))},function(e,t,n){"use strict";var r=n(740);e.exports=function(e){if(!r(e))throw new TypeError(e+" is not a symbol");return e}},function(e,t,n){!function(t,n){e.exports=n()}(0,function(){return function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={exports:{},id:r,loaded:!1};return e[r].call(i.exports,i,i.exports,t),i.loaded=!0,i.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function r(e,t,n){var r=null,i=function(e,t){n&&n(e,t),r&&r.visit(e,t)},o="function"==typeof n?i:null,a=!1;if(t){a="boolean"==typeof t.comment&&t.comment;var c="boolean"==typeof t.attachComment&&t.attachComment;(a||c)&&(r=new s.CommentHandler,r.attach=c,t.comment=!0,o=i)}var p=!1;t&&"string"==typeof t.sourceType&&(p="module"===t.sourceType);var f;f=t&&"boolean"==typeof t.jsx&&t.jsx?new u.JSXParser(e,t,o):new l.Parser(e,t,o);var h=p?f.parseModule():f.parseScript(),d=h;return a&&r&&(d.comments=r.comments),f.config.tokens&&(d.tokens=f.tokens),f.config.tolerant&&(d.errors=f.errorHandler.errors),d}function i(e,t,n){var i=t||{};return i.sourceType="module",r(e,i,n)}function o(e,t,n){var i=t||{};return i.sourceType="script",r(e,i,n)}function a(e,t,n){var r,i=new c.Tokenizer(e,t);r=[];try{for(;;){var o=i.getNextToken();if(!o)break;n&&(o=n(o)),r.push(o)}}catch(e){i.errorHandler.tolerate(e)}return i.errorHandler.tolerant&&(r.errors=i.errors()),r}Object.defineProperty(t,"__esModule",{value:!0});var s=n(1),u=n(3),l=n(8),c=n(15);t.parse=r,t.parseModule=i,t.parseScript=o,t.tokenize=a;var p=n(2);t.Syntax=p.Syntax,t.version="4.0.0"},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(2),i=function(){function e(){this.attach=!1,this.comments=[],this.stack=[],this.leading=[],this.trailing=[]}return e.prototype.insertInnerComments=function(e,t){if(e.type===r.Syntax.BlockStatement&&0===e.body.length){for(var n=[],i=this.leading.length-1;i>=0;--i){var o=this.leading[i];t.end.offset>=o.start&&(n.unshift(o.comment),this.leading.splice(i,1),this.trailing.splice(i,1))}n.length&&(e.innerComments=n)}},e.prototype.findTrailingComments=function(e){var t=[];if(this.trailing.length>0){for(var n=this.trailing.length-1;n>=0;--n){var r=this.trailing[n];r.start>=e.end.offset&&t.unshift(r.comment)}return this.trailing.length=0,t}var i=this.stack[this.stack.length-1];if(i&&i.node.trailingComments){var o=i.node.trailingComments[0];o&&o.range[0]>=e.end.offset&&(t=i.node.trailingComments,delete i.node.trailingComments)}return t},e.prototype.findLeadingComments=function(e){for(var t,n=[];this.stack.length>0;){var r=this.stack[this.stack.length-1];if(!(r&&r.start>=e.start.offset))break;t=r.node,this.stack.pop()}if(t){for(var i=t.leadingComments?t.leadingComments.length:0,o=i-1;o>=0;--o){var a=t.leadingComments[o];a.range[1]<=e.start.offset&&(n.unshift(a),t.leadingComments.splice(o,1))}return t.leadingComments&&0===t.leadingComments.length&&delete t.leadingComments,n}for(var o=this.leading.length-1;o>=0;--o){var r=this.leading[o];r.start<=e.start.offset&&(n.unshift(r.comment),this.leading.splice(o,1))}return n},e.prototype.visitNode=function(e,t){if(!(e.type===r.Syntax.Program&&e.body.length>0)){this.insertInnerComments(e,t);var n=this.findTrailingComments(t),i=this.findLeadingComments(t);i.length>0&&(e.leadingComments=i),n.length>0&&(e.trailingComments=n),this.stack.push({node:e,start:t.start.offset})}},e.prototype.visitComment=function(e,t){var n="L"===e.type[0]?"Line":"Block",r={type:n,value:e.value};if(e.range&&(r.range=e.range),e.loc&&(r.loc=e.loc),this.comments.push(r),this.attach){var i={comment:{type:n,value:e.value,range:[t.start.offset,t.end.offset]},start:t.start.offset};e.loc&&(i.comment.loc=e.loc),e.type=n,this.leading.push(i),this.trailing.push(i)}},e.prototype.visit=function(e,t){"LineComment"===e.type?this.visitComment(e,t):"BlockComment"===e.type?this.visitComment(e,t):this.attach&&this.visitNode(e,t)},e}();t.CommentHandler=i},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Syntax={AssignmentExpression:"AssignmentExpression",AssignmentPattern:"AssignmentPattern",ArrayExpression:"ArrayExpression",ArrayPattern:"ArrayPattern",ArrowFunctionExpression:"ArrowFunctionExpression",AwaitExpression:"AwaitExpression",BlockStatement:"BlockStatement",BinaryExpression:"BinaryExpression",BreakStatement:"BreakStatement",CallExpression:"CallExpression",CatchClause:"CatchClause",ClassBody:"ClassBody",ClassDeclaration:"ClassDeclaration",ClassExpression:"ClassExpression",ConditionalExpression:"ConditionalExpression",ContinueStatement:"ContinueStatement",DoWhileStatement:"DoWhileStatement",DebuggerStatement:"DebuggerStatement",EmptyStatement:"EmptyStatement",ExportAllDeclaration:"ExportAllDeclaration",ExportDefaultDeclaration:"ExportDefaultDeclaration",ExportNamedDeclaration:"ExportNamedDeclaration",ExportSpecifier:"ExportSpecifier",ExpressionStatement:"ExpressionStatement",ForStatement:"ForStatement",ForOfStatement:"ForOfStatement",ForInStatement:"ForInStatement",FunctionDeclaration:"FunctionDeclaration",FunctionExpression:"FunctionExpression",Identifier:"Identifier",IfStatement:"IfStatement",ImportDeclaration:"ImportDeclaration",ImportDefaultSpecifier:"ImportDefaultSpecifier",ImportNamespaceSpecifier:"ImportNamespaceSpecifier",ImportSpecifier:"ImportSpecifier",Literal:"Literal",LabeledStatement:"LabeledStatement",LogicalExpression:"LogicalExpression",MemberExpression:"MemberExpression",MetaProperty:"MetaProperty",MethodDefinition:"MethodDefinition",NewExpression:"NewExpression",ObjectExpression:"ObjectExpression",ObjectPattern:"ObjectPattern",Program:"Program",Property:"Property",RestElement:"RestElement",ReturnStatement:"ReturnStatement",SequenceExpression:"SequenceExpression",SpreadElement:"SpreadElement",Super:"Super",SwitchCase:"SwitchCase",SwitchStatement:"SwitchStatement",TaggedTemplateExpression:"TaggedTemplateExpression",TemplateElement:"TemplateElement",TemplateLiteral:"TemplateLiteral",ThisExpression:"ThisExpression",ThrowStatement:"ThrowStatement",TryStatement:"TryStatement",UnaryExpression:"UnaryExpression",UpdateExpression:"UpdateExpression",VariableDeclaration:"VariableDeclaration",VariableDeclarator:"VariableDeclarator",WhileStatement:"WhileStatement",WithStatement:"WithStatement",YieldExpression:"YieldExpression"}},function(e,t,n){"use strict";function r(e){var t;switch(e.type){case s.JSXSyntax.JSXIdentifier:t=e.name;break;case s.JSXSyntax.JSXNamespacedName:var n=e;t=r(n.namespace)+":"+r(n.name);break;case s.JSXSyntax.JSXMemberExpression:var i=e;t=r(i.object)+"."+r(i.property)}return t}var i=this&&this.__extends||function(){var e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(t,"__esModule",{value:!0});var o=n(4),a=n(5),s=n(6),u=n(7),l=n(8),c=n(13),p=n(14);c.TokenName[100]="JSXIdentifier",c.TokenName[101]="JSXText";var f=function(e){function t(t,n,r){return e.call(this,t,n,r)||this}return i(t,e),t.prototype.parsePrimaryExpression=function(){return this.match("<")?this.parseJSXRoot():e.prototype.parsePrimaryExpression.call(this)},t.prototype.startJSX=function(){this.scanner.index=this.startMarker.index,this.scanner.lineNumber=this.startMarker.line,this.scanner.lineStart=this.startMarker.index-this.startMarker.column},t.prototype.finishJSX=function(){this.nextToken()},t.prototype.reenterJSX=function(){this.startJSX(),this.expectJSX("}"),this.config.tokens&&this.tokens.pop()},t.prototype.createJSXNode=function(){return this.collectComments(),{index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}},t.prototype.createJSXChildNode=function(){return{index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}},t.prototype.scanXHTMLEntity=function(e){for(var t="&",n=!0,r=!1,i=!1,a=!1;!this.scanner.eof()&&n&&!r;){var s=this.scanner.source[this.scanner.index];if(s===e)break;if(r=";"===s,t+=s,++this.scanner.index,!r)switch(t.length){case 2:i="#"===s;break;case 3:i&&(a="x"===s,n=a||o.Character.isDecimalDigit(s.charCodeAt(0)),i=i&&!a);break;default:n=n&&!(i&&!o.Character.isDecimalDigit(s.charCodeAt(0))),n=n&&!(a&&!o.Character.isHexDigit(s.charCodeAt(0)))}}if(n&&r&&t.length>2){var u=t.substr(1,t.length-2);i&&u.length>1?t=String.fromCharCode(parseInt(u.substr(1),10)):a&&u.length>2?t=String.fromCharCode(parseInt("0"+u.substr(1),16)):i||a||!p.XHTMLEntities[u]||(t=p.XHTMLEntities[u])}return t},t.prototype.lexJSX=function(){var e=this.scanner.source.charCodeAt(this.scanner.index);if(60===e||62===e||47===e||58===e||61===e||123===e||125===e){var t=this.scanner.source[this.scanner.index++];return{type:7,value:t,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:this.scanner.index-1,end:this.scanner.index}}if(34===e||39===e){for(var n=this.scanner.index,r=this.scanner.source[this.scanner.index++],i="";!this.scanner.eof();){var a=this.scanner.source[this.scanner.index++];if(a===r)break;i+="&"===a?this.scanXHTMLEntity(r):a}return{type:8,value:i,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}if(46===e){var s=this.scanner.source.charCodeAt(this.scanner.index+1),u=this.scanner.source.charCodeAt(this.scanner.index+2),t=46===s&&46===u?"...":".",n=this.scanner.index;return this.scanner.index+=t.length,{type:7,value:t,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}if(96===e)return{type:10,value:"",lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:this.scanner.index,end:this.scanner.index};if(o.Character.isIdentifierStart(e)&&92!==e){var n=this.scanner.index;for(++this.scanner.index;!this.scanner.eof();){var a=this.scanner.source.charCodeAt(this.scanner.index);if(o.Character.isIdentifierPart(a)&&92!==a)++this.scanner.index;else{if(45!==a)break;++this.scanner.index}}return{type:100,value:this.scanner.source.slice(n,this.scanner.index),lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}return this.scanner.lex()},t.prototype.nextJSXToken=function(){this.collectComments(),this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart;var e=this.lexJSX();return this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.config.tokens&&this.tokens.push(this.convertToken(e)),e},t.prototype.nextJSXText=function(){this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart;for(var e=this.scanner.index,t="";!this.scanner.eof();){var n=this.scanner.source[this.scanner.index];if("{"===n||"<"===n)break;++this.scanner.index,t+=n,o.Character.isLineTerminator(n.charCodeAt(0))&&(++this.scanner.lineNumber,"\r"===n&&"\n"===this.scanner.source[this.scanner.index]&&++this.scanner.index,this.scanner.lineStart=this.scanner.index)}this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart;var r={type:101,value:t,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:e,end:this.scanner.index};return t.length>0&&this.config.tokens&&this.tokens.push(this.convertToken(r)),r},t.prototype.peekJSXToken=function(){var e=this.scanner.saveState();this.scanner.scanComments();var t=this.lexJSX();return this.scanner.restoreState(e),t},t.prototype.expectJSX=function(e){var t=this.nextJSXToken();7===t.type&&t.value===e||this.throwUnexpectedToken(t)},t.prototype.matchJSX=function(e){var t=this.peekJSXToken();return 7===t.type&&t.value===e},t.prototype.parseJSXIdentifier=function(){var e=this.createJSXNode(),t=this.nextJSXToken();return 100!==t.type&&this.throwUnexpectedToken(t),this.finalize(e,new a.JSXIdentifier(t.value))},t.prototype.parseJSXElementName=function(){var e=this.createJSXNode(),t=this.parseJSXIdentifier();if(this.matchJSX(":")){var n=t;this.expectJSX(":");var r=this.parseJSXIdentifier();t=this.finalize(e,new a.JSXNamespacedName(n,r))}else if(this.matchJSX("."))for(;this.matchJSX(".");){var i=t;this.expectJSX(".");var o=this.parseJSXIdentifier();t=this.finalize(e,new a.JSXMemberExpression(i,o))}return t},t.prototype.parseJSXAttributeName=function(){var e,t=this.createJSXNode(),n=this.parseJSXIdentifier();if(this.matchJSX(":")){var r=n;this.expectJSX(":");var i=this.parseJSXIdentifier();e=this.finalize(t,new a.JSXNamespacedName(r,i))}else e=n;return e},t.prototype.parseJSXStringLiteralAttribute=function(){var e=this.createJSXNode(),t=this.nextJSXToken();8!==t.type&&this.throwUnexpectedToken(t);var n=this.getTokenRaw(t);return this.finalize(e,new u.Literal(t.value,n))},t.prototype.parseJSXExpressionAttribute=function(){var e=this.createJSXNode();this.expectJSX("{"),this.finishJSX(),this.match("}")&&this.tolerateError("JSX attributes must only be assigned a non-empty expression");var t=this.parseAssignmentExpression();return this.reenterJSX(),this.finalize(e,new a.JSXExpressionContainer(t))},t.prototype.parseJSXAttributeValue=function(){return this.matchJSX("{")?this.parseJSXExpressionAttribute():this.matchJSX("<")?this.parseJSXElement():this.parseJSXStringLiteralAttribute()},t.prototype.parseJSXNameValueAttribute=function(){var e=this.createJSXNode(),t=this.parseJSXAttributeName(),n=null;return this.matchJSX("=")&&(this.expectJSX("="),n=this.parseJSXAttributeValue()),this.finalize(e,new a.JSXAttribute(t,n))},t.prototype.parseJSXSpreadAttribute=function(){var e=this.createJSXNode();this.expectJSX("{"),this.expectJSX("..."),this.finishJSX();var t=this.parseAssignmentExpression();return this.reenterJSX(),this.finalize(e,new a.JSXSpreadAttribute(t))},t.prototype.parseJSXAttributes=function(){for(var e=[];!this.matchJSX("/")&&!this.matchJSX(">");){var t=this.matchJSX("{")?this.parseJSXSpreadAttribute():this.parseJSXNameValueAttribute();e.push(t)}return e},t.prototype.parseJSXOpeningElement=function(){var e=this.createJSXNode();this.expectJSX("<");var t=this.parseJSXElementName(),n=this.parseJSXAttributes(),r=this.matchJSX("/");return r&&this.expectJSX("/"),this.expectJSX(">"),this.finalize(e,new a.JSXOpeningElement(t,r,n))},t.prototype.parseJSXBoundaryElement=function(){var e=this.createJSXNode();if(this.expectJSX("<"),this.matchJSX("/")){this.expectJSX("/");var t=this.parseJSXElementName();return this.expectJSX(">"),this.finalize(e,new a.JSXClosingElement(t))}var n=this.parseJSXElementName(),r=this.parseJSXAttributes(),i=this.matchJSX("/");return i&&this.expectJSX("/"),this.expectJSX(">"),this.finalize(e,new a.JSXOpeningElement(n,i,r))},t.prototype.parseJSXEmptyExpression=function(){var e=this.createJSXChildNode();return this.collectComments(),this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.finalize(e,new a.JSXEmptyExpression)},t.prototype.parseJSXExpressionContainer=function(){var e=this.createJSXNode();this.expectJSX("{");var t;return this.matchJSX("}")?(t=this.parseJSXEmptyExpression(),this.expectJSX("}")):(this.finishJSX(),t=this.parseAssignmentExpression(),this.reenterJSX()),this.finalize(e,new a.JSXExpressionContainer(t))},t.prototype.parseJSXChildren=function(){for(var e=[];!this.scanner.eof();){var t=this.createJSXChildNode(),n=this.nextJSXText();if(n.start<n.end){var r=this.getTokenRaw(n),i=this.finalize(t,new a.JSXText(n.value,r));e.push(i)}if("{"!==this.scanner.source[this.scanner.index])break;var o=this.parseJSXExpressionContainer();e.push(o)}return e},t.prototype.parseComplexJSXElement=function(e){for(var t=[];!this.scanner.eof();){e.children=e.children.concat(this.parseJSXChildren());var n=this.createJSXChildNode(),i=this.parseJSXBoundaryElement();if(i.type===s.JSXSyntax.JSXOpeningElement){var o=i;if(o.selfClosing){var u=this.finalize(n,new a.JSXElement(o,[],null));e.children.push(u)}else t.push(e),e={node:n,opening:o,closing:null,children:[]}}if(i.type===s.JSXSyntax.JSXClosingElement){e.closing=i;var l=r(e.opening.name);if(l!==r(e.closing.name)&&this.tolerateError("Expected corresponding JSX closing tag for %0",l),!(t.length>0))break;var u=this.finalize(e.node,new a.JSXElement(e.opening,e.children,e.closing));e=t[t.length-1],e.children.push(u),t.pop()}}return e},t.prototype.parseJSXElement=function(){var e=this.createJSXNode(),t=this.parseJSXOpeningElement(),n=[],r=null;if(!t.selfClosing){var i=this.parseComplexJSXElement({node:e,opening:t,closing:r,children:n});n=i.children,r=i.closing}return this.finalize(e,new a.JSXElement(t,n,r))},t.prototype.parseJSXRoot=function(){this.config.tokens&&this.tokens.pop(),this.startJSX();var e=this.parseJSXElement();return this.finishJSX(),e},t.prototype.isStartOfExpression=function(){return e.prototype.isStartOfExpression.call(this)||this.match("<")},t}(l.Parser);t.JSXParser=f},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n={NonAsciiIdentifierStart:/[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]/,NonAsciiIdentifierPart:/[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B4\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/};t.Character={fromCodePoint:function(e){return e<65536?String.fromCharCode(e):String.fromCharCode(55296+(e-65536>>10))+String.fromCharCode(56320+(e-65536&1023))},isWhiteSpace:function(e){return 32===e||9===e||11===e||12===e||160===e||e>=5760&&[5760,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8239,8287,12288,65279].indexOf(e)>=0},isLineTerminator:function(e){return 10===e||13===e||8232===e||8233===e},isIdentifierStart:function(e){return 36===e||95===e||e>=65&&e<=90||e>=97&&e<=122||92===e||e>=128&&n.NonAsciiIdentifierStart.test(t.Character.fromCodePoint(e))},isIdentifierPart:function(e){return 36===e||95===e||e>=65&&e<=90||e>=97&&e<=122||e>=48&&e<=57||92===e||e>=128&&n.NonAsciiIdentifierPart.test(t.Character.fromCodePoint(e))},isDecimalDigit:function(e){return e>=48&&e<=57},isHexDigit:function(e){return e>=48&&e<=57||e>=65&&e<=70||e>=97&&e<=102},isOctalDigit:function(e){return e>=48&&e<=55}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(6),i=function(){function e(e){this.type=r.JSXSyntax.JSXClosingElement,this.name=e}return e}();t.JSXClosingElement=i;var o=function(){function e(e,t,n){this.type=r.JSXSyntax.JSXElement,this.openingElement=e,this.children=t,this.closingElement=n}return e}();t.JSXElement=o;var a=function(){function e(){this.type=r.JSXSyntax.JSXEmptyExpression}return e}();t.JSXEmptyExpression=a;var s=function(){function e(e){this.type=r.JSXSyntax.JSXExpressionContainer,this.expression=e}return e}();t.JSXExpressionContainer=s;var u=function(){function e(e){this.type=r.JSXSyntax.JSXIdentifier,this.name=e}return e}();t.JSXIdentifier=u;var l=function(){function e(e,t){this.type=r.JSXSyntax.JSXMemberExpression,this.object=e,this.property=t}return e}();t.JSXMemberExpression=l;var c=function(){function e(e,t){this.type=r.JSXSyntax.JSXAttribute,this.name=e,this.value=t}return e}();t.JSXAttribute=c;var p=function(){function e(e,t){this.type=r.JSXSyntax.JSXNamespacedName,this.namespace=e,this.name=t}return e}();t.JSXNamespacedName=p;var f=function(){function e(e,t,n){this.type=r.JSXSyntax.JSXOpeningElement,this.name=e,this.selfClosing=t,this.attributes=n}return e}();t.JSXOpeningElement=f;var h=function(){function e(e){this.type=r.JSXSyntax.JSXSpreadAttribute,this.argument=e}return e}();t.JSXSpreadAttribute=h;var d=function(){function e(e,t){this.type=r.JSXSyntax.JSXText,this.value=e,this.raw=t}return e}();t.JSXText=d},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.JSXSyntax={JSXAttribute:"JSXAttribute",JSXClosingElement:"JSXClosingElement",JSXElement:"JSXElement",JSXEmptyExpression:"JSXEmptyExpression",JSXExpressionContainer:"JSXExpressionContainer",JSXIdentifier:"JSXIdentifier",JSXMemberExpression:"JSXMemberExpression",JSXNamespacedName:"JSXNamespacedName",JSXOpeningElement:"JSXOpeningElement",JSXSpreadAttribute:"JSXSpreadAttribute",JSXText:"JSXText"}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(2),i=function(){function e(e){this.type=r.Syntax.ArrayExpression,this.elements=e}return e}();t.ArrayExpression=i;var o=function(){function e(e){this.type=r.Syntax.ArrayPattern,this.elements=e}return e}();t.ArrayPattern=o;var a=function(){function e(e,t,n){this.type=r.Syntax.ArrowFunctionExpression,this.id=null,this.params=e,this.body=t,this.generator=!1,this.expression=n,this.async=!1}return e}();t.ArrowFunctionExpression=a;var s=function(){function e(e,t,n){this.type=r.Syntax.AssignmentExpression,this.operator=e,this.left=t,this.right=n}return e}();t.AssignmentExpression=s;var u=function(){function e(e,t){this.type=r.Syntax.AssignmentPattern,this.left=e,this.right=t}return e}();t.AssignmentPattern=u;var l=function(){function e(e,t,n){this.type=r.Syntax.ArrowFunctionExpression,this.id=null,this.params=e,this.body=t,this.generator=!1,this.expression=n,this.async=!0}return e}();t.AsyncArrowFunctionExpression=l;var c=function(){function e(e,t,n){this.type=r.Syntax.FunctionDeclaration,this.id=e,this.params=t,this.body=n,this.generator=!1,this.expression=!1,this.async=!0}return e}();t.AsyncFunctionDeclaration=c;var p=function(){function e(e,t,n){this.type=r.Syntax.FunctionExpression,this.id=e,this.params=t,this.body=n,this.generator=!1,this.expression=!1,this.async=!0}return e}();t.AsyncFunctionExpression=p;var f=function(){function e(e){this.type=r.Syntax.AwaitExpression,this.argument=e}return e}();t.AwaitExpression=f;var h=function(){function e(e,t,n){var i="||"===e||"&&"===e;this.type=i?r.Syntax.LogicalExpression:r.Syntax.BinaryExpression,this.operator=e,this.left=t,this.right=n}return e}();t.BinaryExpression=h;var d=function(){function e(e){this.type=r.Syntax.BlockStatement,this.body=e}return e}();t.BlockStatement=d;var m=function(){function e(e){this.type=r.Syntax.BreakStatement,this.label=e}return e}();t.BreakStatement=m;var v=function(){function e(e,t){this.type=r.Syntax.CallExpression,this.callee=e,this.arguments=t}return e}();t.CallExpression=v;var g=function(){function e(e,t){this.type=r.Syntax.CatchClause,this.param=e,this.body=t}return e}();t.CatchClause=g;var y=function(){function e(e){this.type=r.Syntax.ClassBody,this.body=e}return e}();t.ClassBody=y;var _=function(){function e(e,t,n){this.type=r.Syntax.ClassDeclaration,this.id=e,this.superClass=t,this.body=n}return e}();t.ClassDeclaration=_;var b=function(){function e(e,t,n){this.type=r.Syntax.ClassExpression,this.id=e,this.superClass=t,this.body=n}return e}();t.ClassExpression=b;var x=function(){function e(e,t){this.type=r.Syntax.MemberExpression,this.computed=!0,this.object=e,this.property=t}return e}();t.ComputedMemberExpression=x;var w=function(){function e(e,t,n){this.type=r.Syntax.ConditionalExpression,this.test=e,this.consequent=t,this.alternate=n}return e}();t.ConditionalExpression=w;var k=function(){function e(e){this.type=r.Syntax.ContinueStatement,this.label=e}return e}();t.ContinueStatement=k;var E=function(){function e(){this.type=r.Syntax.DebuggerStatement}return e}();t.DebuggerStatement=E;var S=function(){function e(e,t){this.type=r.Syntax.ExpressionStatement,this.expression=e,this.directive=t}return e}();t.Directive=S;var C=function(){function e(e,t){this.type=r.Syntax.DoWhileStatement,this.body=e,this.test=t}return e}();t.DoWhileStatement=C;var A=function(){function e(){this.type=r.Syntax.EmptyStatement}return e}();t.EmptyStatement=A;var D=function(){function e(e){this.type=r.Syntax.ExportAllDeclaration,this.source=e}return e}();t.ExportAllDeclaration=D;var O=function(){function e(e){this.type=r.Syntax.ExportDefaultDeclaration,this.declaration=e}return e}();t.ExportDefaultDeclaration=O;var M=function(){function e(e,t,n){this.type=r.Syntax.ExportNamedDeclaration,this.declaration=e,this.specifiers=t,this.source=n}return e}();t.ExportNamedDeclaration=M;var T=function(){function e(e,t){this.type=r.Syntax.ExportSpecifier,this.exported=t,this.local=e}return e}();t.ExportSpecifier=T;var P=function(){function e(e){this.type=r.Syntax.ExpressionStatement,this.expression=e}return e}();t.ExpressionStatement=P;var I=function(){function e(e,t,n){this.type=r.Syntax.ForInStatement,this.left=e,this.right=t,this.body=n,this.each=!1}return e}();t.ForInStatement=I;var R=function(){function e(e,t,n){this.type=r.Syntax.ForOfStatement,this.left=e,this.right=t,this.body=n}return e}();t.ForOfStatement=R;var j=function(){function e(e,t,n,i){this.type=r.Syntax.ForStatement,this.init=e,this.test=t,this.update=n,this.body=i}return e}();t.ForStatement=j;var F=function(){function e(e,t,n,i){this.type=r.Syntax.FunctionDeclaration,this.id=e,this.params=t,this.body=n,this.generator=i,this.expression=!1,this.async=!1}return e}();t.FunctionDeclaration=F;var N=function(){function e(e,t,n,i){this.type=r.Syntax.FunctionExpression,this.id=e,this.params=t,this.body=n,this.generator=i,this.expression=!1,this.async=!1}return e}();t.FunctionExpression=N;var B=function(){function e(e){this.type=r.Syntax.Identifier,this.name=e}return e}();t.Identifier=B;var L=function(){function e(e,t,n){this.type=r.Syntax.IfStatement,this.test=e,this.consequent=t,this.alternate=n}return e}();t.IfStatement=L;var q=function(){function e(e,t){this.type=r.Syntax.ImportDeclaration,this.specifiers=e,this.source=t}return e}();t.ImportDeclaration=q;var z=function(){function e(e){this.type=r.Syntax.ImportDefaultSpecifier,this.local=e}return e}();t.ImportDefaultSpecifier=z;var U=function(){function e(e){this.type=r.Syntax.ImportNamespaceSpecifier,this.local=e}return e}();t.ImportNamespaceSpecifier=U;var W=function(){function e(e,t){this.type=r.Syntax.ImportSpecifier,this.local=e,this.imported=t}return e}();t.ImportSpecifier=W;var V=function(){function e(e,t){this.type=r.Syntax.LabeledStatement,this.label=e,this.body=t}return e}();t.LabeledStatement=V;var H=function(){function e(e,t){this.type=r.Syntax.Literal,this.value=e,this.raw=t}return e}();t.Literal=H;var G=function(){function e(e,t){this.type=r.Syntax.MetaProperty,this.meta=e,this.property=t}return e}();t.MetaProperty=G;var J=function(){function e(e,t,n,i,o){this.type=r.Syntax.MethodDefinition,this.key=e,this.computed=t,this.value=n,this.kind=i,this.static=o}return e}();t.MethodDefinition=J;var K=function(){function e(e){this.type=r.Syntax.Program,this.body=e,this.sourceType="module"}return e}();t.Module=K;var X=function(){function e(e,t){this.type=r.Syntax.NewExpression,this.callee=e,this.arguments=t}return e}();t.NewExpression=X;var Y=function(){function e(e){this.type=r.Syntax.ObjectExpression,this.properties=e}return e}();t.ObjectExpression=Y;var $=function(){function e(e){this.type=r.Syntax.ObjectPattern,this.properties=e}return e}();t.ObjectPattern=$;var Z=function(){function e(e,t,n,i,o,a){this.type=r.Syntax.Property,this.key=t,this.computed=n,this.value=i,this.kind=e,this.method=o,this.shorthand=a}return e}();t.Property=Z;var Q=function(){function e(e,t,n,i){this.type=r.Syntax.Literal,this.value=e,this.raw=t,this.regex={pattern:n,flags:i}}return e}();t.RegexLiteral=Q;var ee=function(){function e(e){this.type=r.Syntax.RestElement,this.argument=e}return e}();t.RestElement=ee;var te=function(){function e(e){this.type=r.Syntax.ReturnStatement,this.argument=e}return e}();t.ReturnStatement=te;var ne=function(){function e(e){this.type=r.Syntax.Program,this.body=e,this.sourceType="script"}return e}();t.Script=ne;var re=function(){function e(e){this.type=r.Syntax.SequenceExpression,this.expressions=e}return e}();t.SequenceExpression=re;var ie=function(){function e(e){this.type=r.Syntax.SpreadElement,this.argument=e}return e}();t.SpreadElement=ie;var oe=function(){function e(e,t){this.type=r.Syntax.MemberExpression,this.computed=!1,this.object=e,this.property=t}return e}();t.StaticMemberExpression=oe;var ae=function(){function e(){this.type=r.Syntax.Super}return e}();t.Super=ae;var se=function(){function e(e,t){this.type=r.Syntax.SwitchCase,this.test=e,this.consequent=t}return e}();t.SwitchCase=se;var ue=function(){function e(e,t){this.type=r.Syntax.SwitchStatement,this.discriminant=e,this.cases=t}return e}();t.SwitchStatement=ue;var le=function(){function e(e,t){this.type=r.Syntax.TaggedTemplateExpression,this.tag=e,this.quasi=t}return e}();t.TaggedTemplateExpression=le;var ce=function(){function e(e,t){this.type=r.Syntax.TemplateElement,this.value=e,this.tail=t}return e}();t.TemplateElement=ce;var pe=function(){function e(e,t){this.type=r.Syntax.TemplateLiteral,this.quasis=e,this.expressions=t}return e}();t.TemplateLiteral=pe;var fe=function(){function e(){this.type=r.Syntax.ThisExpression}return e}();t.ThisExpression=fe;var he=function(){function e(e){this.type=r.Syntax.ThrowStatement,this.argument=e}return e}();t.ThrowStatement=he;var de=function(){function e(e,t,n){this.type=r.Syntax.TryStatement,this.block=e,this.handler=t,this.finalizer=n}return e}();t.TryStatement=de;var me=function(){function e(e,t){this.type=r.Syntax.UnaryExpression,this.operator=e,this.argument=t,this.prefix=!0}return e}();t.UnaryExpression=me;var ve=function(){function e(e,t,n){this.type=r.Syntax.UpdateExpression,this.operator=e,this.argument=t,this.prefix=n}return e}();t.UpdateExpression=ve;var ge=function(){function e(e,t){this.type=r.Syntax.VariableDeclaration,this.declarations=e,this.kind=t}return e}();t.VariableDeclaration=ge;var ye=function(){function e(e,t){this.type=r.Syntax.VariableDeclarator,this.id=e,this.init=t}return e}();t.VariableDeclarator=ye;var _e=function(){function e(e,t){this.type=r.Syntax.WhileStatement,this.test=e,this.body=t}return e}();t.WhileStatement=_e;var be=function(){function e(e,t){this.type=r.Syntax.WithStatement,this.object=e,this.body=t}return e}();t.WithStatement=be;var xe=function(){function e(e,t){this.type=r.Syntax.YieldExpression,this.argument=e,this.delegate=t}return e}();t.YieldExpression=xe},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(9),i=n(10),o=n(11),a=n(7),s=n(12),u=n(2),l=n(13),c=function(){function e(e,t,n){void 0===t&&(t={}),this.config={range:"boolean"==typeof t.range&&t.range,loc:"boolean"==typeof t.loc&&t.loc,source:null,tokens:"boolean"==typeof t.tokens&&t.tokens,comment:"boolean"==typeof t.comment&&t.comment,tolerant:"boolean"==typeof t.tolerant&&t.tolerant},this.config.loc&&t.source&&null!==t.source&&(this.config.source=String(t.source)),this.delegate=n,this.errorHandler=new i.ErrorHandler,this.errorHandler.tolerant=this.config.tolerant,this.scanner=new s.Scanner(e,this.errorHandler),this.scanner.trackComment=this.config.comment,this.operatorPrecedence={")":0,";":0,",":0,"=":0,"]":0,"||":1,"&&":2,"|":3,"^":4,"&":5,"==":6,"!=":6,"===":6,"!==":6,"<":7,">":7,"<=":7,">=":7,"<<":8,">>":8,">>>":8,"+":9,"-":9,"*":11,"/":11,"%":11},this.lookahead={type:2,value:"",lineNumber:this.scanner.lineNumber,lineStart:0,start:0,end:0},this.hasLineTerminator=!1,this.context={isModule:!1,await:!1,allowIn:!0,allowStrictDirective:!0,allowYield:!0,firstCoverInitializedNameError:null,isAssignmentTarget:!1,isBindingElement:!1,inFunctionBody:!1,inIteration:!1,inSwitch:!1,labelSet:{},strict:!1},this.tokens=[],this.startMarker={index:0,line:this.scanner.lineNumber,column:0},this.lastMarker={index:0,line:this.scanner.lineNumber,column:0},this.nextToken(),this.lastMarker={index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}}return e.prototype.throwError=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var i=Array.prototype.slice.call(arguments,1),o=e.replace(/%(\d)/g,function(e,t){return r.assert(t<i.length,"Message reference must be in range"),i[t]}),a=this.lastMarker.index,s=this.lastMarker.line,u=this.lastMarker.column+1;throw this.errorHandler.createError(a,s,u,o)},e.prototype.tolerateError=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var i=Array.prototype.slice.call(arguments,1),o=e.replace(/%(\d)/g,function(e,t){return r.assert(t<i.length,"Message reference must be in range"),i[t]}),a=this.lastMarker.index,s=this.scanner.lineNumber,u=this.lastMarker.column+1;this.errorHandler.tolerateError(a,s,u,o)},e.prototype.unexpectedTokenError=function(e,t){var n,r=t||o.Messages.UnexpectedToken;if(e?(t||(r=2===e.type?o.Messages.UnexpectedEOS:3===e.type?o.Messages.UnexpectedIdentifier:6===e.type?o.Messages.UnexpectedNumber:8===e.type?o.Messages.UnexpectedString:10===e.type?o.Messages.UnexpectedTemplate:o.Messages.UnexpectedToken,4===e.type&&(this.scanner.isFutureReservedWord(e.value)?r=o.Messages.UnexpectedReserved:this.context.strict&&this.scanner.isStrictModeReservedWord(e.value)&&(r=o.Messages.StrictReservedWord))),n=e.value):n="ILLEGAL",r=r.replace("%0",n),e&&"number"==typeof e.lineNumber){var i=e.start,a=e.lineNumber,s=this.lastMarker.index-this.lastMarker.column,u=e.start-s+1;return this.errorHandler.createError(i,a,u,r)}var i=this.lastMarker.index,a=this.lastMarker.line,u=this.lastMarker.column+1;return this.errorHandler.createError(i,a,u,r)},e.prototype.throwUnexpectedToken=function(e,t){throw this.unexpectedTokenError(e,t)},e.prototype.tolerateUnexpectedToken=function(e,t){this.errorHandler.tolerate(this.unexpectedTokenError(e,t))},e.prototype.collectComments=function(){if(this.config.comment){var e=this.scanner.scanComments();if(e.length>0&&this.delegate)for(var t=0;t<e.length;++t){var n=e[t],r=void 0;r={type:n.multiLine?"BlockComment":"LineComment",value:this.scanner.source.slice(n.slice[0],n.slice[1])},this.config.range&&(r.range=n.range),this.config.loc&&(r.loc=n.loc);var i={start:{line:n.loc.start.line,column:n.loc.start.column,offset:n.range[0]},end:{line:n.loc.end.line,column:n.loc.end.column,offset:n.range[1]}};this.delegate(r,i)}}else this.scanner.scanComments()},e.prototype.getTokenRaw=function(e){return this.scanner.source.slice(e.start,e.end)},e.prototype.convertToken=function(e){var t={type:l.TokenName[e.type],value:this.getTokenRaw(e)};if(this.config.range&&(t.range=[e.start,e.end]),this.config.loc&&(t.loc={start:{line:this.startMarker.line,column:this.startMarker.column},end:{line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}}),9===e.type){var n=e.pattern,r=e.flags;t.regex={pattern:n,flags:r}}return t},e.prototype.nextToken=function(){var e=this.lookahead;this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.collectComments(),this.scanner.index!==this.startMarker.index&&(this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart);var t=this.scanner.lex();return this.hasLineTerminator=e.lineNumber!==t.lineNumber,t&&this.context.strict&&3===t.type&&this.scanner.isStrictModeReservedWord(t.value)&&(t.type=4),this.lookahead=t,this.config.tokens&&2!==t.type&&this.tokens.push(this.convertToken(t)),e},e.prototype.nextRegexToken=function(){this.collectComments();var e=this.scanner.scanRegExp();return this.config.tokens&&(this.tokens.pop(),this.tokens.push(this.convertToken(e))),this.lookahead=e,this.nextToken(),e},e.prototype.createNode=function(){return{index:this.startMarker.index,line:this.startMarker.line,column:this.startMarker.column}},e.prototype.startNode=function(e){return{index:e.start,line:e.lineNumber,column:e.start-e.lineStart}},e.prototype.finalize=function(e,t){if(this.config.range&&(t.range=[e.index,this.lastMarker.index]),this.config.loc&&(t.loc={start:{line:e.line,column:e.column},end:{line:this.lastMarker.line,column:this.lastMarker.column}},this.config.source&&(t.loc.source=this.config.source)),this.delegate){var n={start:{line:e.line,column:e.column,offset:e.index},end:{line:this.lastMarker.line,column:this.lastMarker.column,offset:this.lastMarker.index}};this.delegate(t,n)}return t},e.prototype.expect=function(e){var t=this.nextToken();7===t.type&&t.value===e||this.throwUnexpectedToken(t)},e.prototype.expectCommaSeparator=function(){if(this.config.tolerant){var e=this.lookahead;7===e.type&&","===e.value?this.nextToken():7===e.type&&";"===e.value?(this.nextToken(),this.tolerateUnexpectedToken(e)):this.tolerateUnexpectedToken(e,o.Messages.UnexpectedToken)}else this.expect(",")},e.prototype.expectKeyword=function(e){var t=this.nextToken();4===t.type&&t.value===e||this.throwUnexpectedToken(t)},e.prototype.match=function(e){return 7===this.lookahead.type&&this.lookahead.value===e},e.prototype.matchKeyword=function(e){return 4===this.lookahead.type&&this.lookahead.value===e},e.prototype.matchContextualKeyword=function(e){return 3===this.lookahead.type&&this.lookahead.value===e},e.prototype.matchAssign=function(){if(7!==this.lookahead.type)return!1;var e=this.lookahead.value;return"="===e||"*="===e||"**="===e||"/="===e||"%="===e||"+="===e||"-="===e||"<<="===e||">>="===e||">>>="===e||"&="===e||"^="===e||"|="===e},e.prototype.isolateCoverGrammar=function(e){var t=this.context.isBindingElement,n=this.context.isAssignmentTarget,r=this.context.firstCoverInitializedNameError;this.context.isBindingElement=!0,this.context.isAssignmentTarget=!0,this.context.firstCoverInitializedNameError=null;var i=e.call(this);return null!==this.context.firstCoverInitializedNameError&&this.throwUnexpectedToken(this.context.firstCoverInitializedNameError),this.context.isBindingElement=t,this.context.isAssignmentTarget=n,this.context.firstCoverInitializedNameError=r,i},e.prototype.inheritCoverGrammar=function(e){var t=this.context.isBindingElement,n=this.context.isAssignmentTarget,r=this.context.firstCoverInitializedNameError;this.context.isBindingElement=!0,this.context.isAssignmentTarget=!0,this.context.firstCoverInitializedNameError=null;var i=e.call(this);return this.context.isBindingElement=this.context.isBindingElement&&t,this.context.isAssignmentTarget=this.context.isAssignmentTarget&&n,this.context.firstCoverInitializedNameError=r||this.context.firstCoverInitializedNameError,i},e.prototype.consumeSemicolon=function(){this.match(";")?this.nextToken():this.hasLineTerminator||(2===this.lookahead.type||this.match("}")||this.throwUnexpectedToken(this.lookahead),this.lastMarker.index=this.startMarker.index,this.lastMarker.line=this.startMarker.line,this.lastMarker.column=this.startMarker.column)},e.prototype.parsePrimaryExpression=function(){var e,t,n,r=this.createNode();switch(this.lookahead.type){case 3:(this.context.isModule||this.context.await)&&"await"===this.lookahead.value&&this.tolerateUnexpectedToken(this.lookahead),e=this.matchAsyncFunction()?this.parseFunctionExpression():this.finalize(r,new a.Identifier(this.nextToken().value));break;case 6:case 8:this.context.strict&&this.lookahead.octal&&this.tolerateUnexpectedToken(this.lookahead,o.Messages.StrictOctalLiteral),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,t=this.nextToken(),n=this.getTokenRaw(t),e=this.finalize(r,new a.Literal(t.value,n));break;case 1:this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,t=this.nextToken(),n=this.getTokenRaw(t),e=this.finalize(r,new a.Literal("true"===t.value,n));break;case 5:this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,t=this.nextToken(),n=this.getTokenRaw(t),e=this.finalize(r,new a.Literal(null,n));break;case 10:e=this.parseTemplateLiteral();break;case 7:switch(this.lookahead.value){case"(":this.context.isBindingElement=!1,e=this.inheritCoverGrammar(this.parseGroupExpression);break;case"[":e=this.inheritCoverGrammar(this.parseArrayInitializer);break;case"{":e=this.inheritCoverGrammar(this.parseObjectInitializer);break;case"/":case"/=":this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.scanner.index=this.startMarker.index,t=this.nextRegexToken(),n=this.getTokenRaw(t),e=this.finalize(r,new a.RegexLiteral(t.regex,n,t.pattern,t.flags));break;default:e=this.throwUnexpectedToken(this.nextToken())}break;case 4:!this.context.strict&&this.context.allowYield&&this.matchKeyword("yield")?e=this.parseIdentifierName():!this.context.strict&&this.matchKeyword("let")?e=this.finalize(r,new a.Identifier(this.nextToken().value)):(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.matchKeyword("function")?e=this.parseFunctionExpression():this.matchKeyword("this")?(this.nextToken(),e=this.finalize(r,new a.ThisExpression)):e=this.matchKeyword("class")?this.parseClassExpression():this.throwUnexpectedToken(this.nextToken()));break;default:e=this.throwUnexpectedToken(this.nextToken())}return e},e.prototype.parseSpreadElement=function(){var e=this.createNode();this.expect("...");var t=this.inheritCoverGrammar(this.parseAssignmentExpression);return this.finalize(e,new a.SpreadElement(t))},e.prototype.parseArrayInitializer=function(){var e=this.createNode(),t=[];for(this.expect("[");!this.match("]");)if(this.match(","))this.nextToken(),t.push(null);else if(this.match("...")){var n=this.parseSpreadElement();this.match("]")||(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.expect(",")),t.push(n)}else t.push(this.inheritCoverGrammar(this.parseAssignmentExpression)),this.match("]")||this.expect(",");return this.expect("]"),this.finalize(e,new a.ArrayExpression(t))},e.prototype.parsePropertyMethod=function(e){this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var t=this.context.strict,n=this.context.allowStrictDirective;this.context.allowStrictDirective=e.simple;var r=this.isolateCoverGrammar(this.parseFunctionSourceElements);return this.context.strict&&e.firstRestricted&&this.tolerateUnexpectedToken(e.firstRestricted,e.message),this.context.strict&&e.stricted&&this.tolerateUnexpectedToken(e.stricted,e.message),this.context.strict=t,this.context.allowStrictDirective=n,r},e.prototype.parsePropertyMethodFunction=function(){var e=this.createNode(),t=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters(),r=this.parsePropertyMethod(n);return this.context.allowYield=t,this.finalize(e,new a.FunctionExpression(null,n.params,r,!1))},e.prototype.parsePropertyMethodAsyncFunction=function(){var e=this.createNode(),t=this.context.allowYield,n=this.context.await;this.context.allowYield=!1,this.context.await=!0;var r=this.parseFormalParameters(),i=this.parsePropertyMethod(r);return this.context.allowYield=t,this.context.await=n,this.finalize(e,new a.AsyncFunctionExpression(null,r.params,i))},e.prototype.parseObjectPropertyKey=function(){var e,t=this.createNode(),n=this.nextToken();switch(n.type){case 8:case 6:this.context.strict&&n.octal&&this.tolerateUnexpectedToken(n,o.Messages.StrictOctalLiteral);var r=this.getTokenRaw(n);e=this.finalize(t,new a.Literal(n.value,r));break;case 3:case 1:case 5:case 4:e=this.finalize(t,new a.Identifier(n.value));break;case 7:"["===n.value?(e=this.isolateCoverGrammar(this.parseAssignmentExpression),this.expect("]")):e=this.throwUnexpectedToken(n);break;default:e=this.throwUnexpectedToken(n)}return e},e.prototype.isPropertyKey=function(e,t){return e.type===u.Syntax.Identifier&&e.name===t||e.type===u.Syntax.Literal&&e.value===t},e.prototype.parseObjectProperty=function(e){var t,n=this.createNode(),r=this.lookahead,i=null,s=null,u=!1,l=!1,c=!1,p=!1;if(3===r.type){var f=r.value;this.nextToken(),u=this.match("["),p=!(this.hasLineTerminator||"async"!==f||this.match(":")||this.match("(")||this.match("*")),i=p?this.parseObjectPropertyKey():this.finalize(n,new a.Identifier(f))}else this.match("*")?this.nextToken():(u=this.match("["),i=this.parseObjectPropertyKey());var h=this.qualifiedPropertyName(this.lookahead);if(3===r.type&&!p&&"get"===r.value&&h)t="get",u=this.match("["),i=this.parseObjectPropertyKey(),this.context.allowYield=!1,s=this.parseGetterMethod();else if(3===r.type&&!p&&"set"===r.value&&h)t="set",u=this.match("["),i=this.parseObjectPropertyKey(),s=this.parseSetterMethod();else if(7===r.type&&"*"===r.value&&h)t="init",u=this.match("["),i=this.parseObjectPropertyKey(),s=this.parseGeneratorMethod(),l=!0;else if(i||this.throwUnexpectedToken(this.lookahead),t="init",this.match(":")&&!p)!u&&this.isPropertyKey(i,"__proto__")&&(e.value&&this.tolerateError(o.Messages.DuplicateProtoProperty),e.value=!0),this.nextToken(),s=this.inheritCoverGrammar(this.parseAssignmentExpression);else if(this.match("("))s=p?this.parsePropertyMethodAsyncFunction():this.parsePropertyMethodFunction(),l=!0;else if(3===r.type){var f=this.finalize(n,new a.Identifier(r.value));if(this.match("=")){this.context.firstCoverInitializedNameError=this.lookahead,this.nextToken(),c=!0;var d=this.isolateCoverGrammar(this.parseAssignmentExpression);s=this.finalize(n,new a.AssignmentPattern(f,d))}else c=!0,s=f}else this.throwUnexpectedToken(this.nextToken());return this.finalize(n,new a.Property(t,i,u,s,l,c))},e.prototype.parseObjectInitializer=function(){var e=this.createNode();this.expect("{");for(var t=[],n={value:!1};!this.match("}");)t.push(this.parseObjectProperty(n)),this.match("}")||this.expectCommaSeparator();return this.expect("}"),this.finalize(e,new a.ObjectExpression(t))},e.prototype.parseTemplateHead=function(){r.assert(this.lookahead.head,"Template literal must start with a template head");var e=this.createNode(),t=this.nextToken(),n=t.value,i=t.cooked;return this.finalize(e,new a.TemplateElement({raw:n,cooked:i},t.tail))},e.prototype.parseTemplateElement=function(){10!==this.lookahead.type&&this.throwUnexpectedToken();var e=this.createNode(),t=this.nextToken(),n=t.value,r=t.cooked;return this.finalize(e,new a.TemplateElement({raw:n,cooked:r},t.tail))},e.prototype.parseTemplateLiteral=function(){var e=this.createNode(),t=[],n=[],r=this.parseTemplateHead();for(n.push(r);!r.tail;)t.push(this.parseExpression()),r=this.parseTemplateElement(),n.push(r);return this.finalize(e,new a.TemplateLiteral(n,t))},e.prototype.reinterpretExpressionAsPattern=function(e){switch(e.type){case u.Syntax.Identifier:case u.Syntax.MemberExpression:case u.Syntax.RestElement:case u.Syntax.AssignmentPattern:break;case u.Syntax.SpreadElement:e.type=u.Syntax.RestElement,this.reinterpretExpressionAsPattern(e.argument);break;case u.Syntax.ArrayExpression:e.type=u.Syntax.ArrayPattern;for(var t=0;t<e.elements.length;t++)null!==e.elements[t]&&this.reinterpretExpressionAsPattern(e.elements[t]);break;case u.Syntax.ObjectExpression:e.type=u.Syntax.ObjectPattern;for(var t=0;t<e.properties.length;t++)this.reinterpretExpressionAsPattern(e.properties[t].value);break;case u.Syntax.AssignmentExpression:e.type=u.Syntax.AssignmentPattern,delete e.operator,this.reinterpretExpressionAsPattern(e.left)}},e.prototype.parseGroupExpression=function(){var e;if(this.expect("("),this.match(")"))this.nextToken(),this.match("=>")||this.expect("=>"),e={type:"ArrowParameterPlaceHolder",params:[],async:!1};else{var t=this.lookahead,n=[];if(this.match("..."))e=this.parseRestElement(n),this.expect(")"),this.match("=>")||this.expect("=>"),e={type:"ArrowParameterPlaceHolder",params:[e],async:!1};else{var r=!1;if(this.context.isBindingElement=!0,e=this.inheritCoverGrammar(this.parseAssignmentExpression),this.match(",")){var i=[];for(this.context.isAssignmentTarget=!1,i.push(e);2!==this.lookahead.type&&this.match(",");){if(this.nextToken(),this.match(")")){this.nextToken();for(var o=0;o<i.length;o++)this.reinterpretExpressionAsPattern(i[o]);r=!0,e={type:"ArrowParameterPlaceHolder",params:i,async:!1}}else if(this.match("...")){this.context.isBindingElement||this.throwUnexpectedToken(this.lookahead),i.push(this.parseRestElement(n)),this.expect(")"),this.match("=>")||this.expect("=>"),this.context.isBindingElement=!1;for(var o=0;o<i.length;o++)this.reinterpretExpressionAsPattern(i[o]);r=!0,e={type:"ArrowParameterPlaceHolder",params:i,async:!1}}else i.push(this.inheritCoverGrammar(this.parseAssignmentExpression));if(r)break}r||(e=this.finalize(this.startNode(t),new a.SequenceExpression(i)))}if(!r){if(this.expect(")"),this.match("=>")&&(e.type===u.Syntax.Identifier&&"yield"===e.name&&(r=!0,e={type:"ArrowParameterPlaceHolder",params:[e],async:!1}),!r)){if(this.context.isBindingElement||this.throwUnexpectedToken(this.lookahead),e.type===u.Syntax.SequenceExpression)for(var o=0;o<e.expressions.length;o++)this.reinterpretExpressionAsPattern(e.expressions[o]);else this.reinterpretExpressionAsPattern(e);e={type:"ArrowParameterPlaceHolder",params:e.type===u.Syntax.SequenceExpression?e.expressions:[e],async:!1}}this.context.isBindingElement=!1}}}return e},e.prototype.parseArguments=function(){this.expect("(");var e=[];if(!this.match(")"))for(;;){var t=this.match("...")?this.parseSpreadElement():this.isolateCoverGrammar(this.parseAssignmentExpression);if(e.push(t),this.match(")"))break;if(this.expectCommaSeparator(),this.match(")"))break}return this.expect(")"),e},e.prototype.isIdentifierName=function(e){return 3===e.type||4===e.type||1===e.type||5===e.type},e.prototype.parseIdentifierName=function(){var e=this.createNode(),t=this.nextToken();return this.isIdentifierName(t)||this.throwUnexpectedToken(t),this.finalize(e,new a.Identifier(t.value))},e.prototype.parseNewExpression=function(){var e=this.createNode(),t=this.parseIdentifierName();r.assert("new"===t.name,"New expression must start with `new`");var n;if(this.match("."))if(this.nextToken(),3===this.lookahead.type&&this.context.inFunctionBody&&"target"===this.lookahead.value){var i=this.parseIdentifierName();n=new a.MetaProperty(t,i)}else this.throwUnexpectedToken(this.lookahead);else{var o=this.isolateCoverGrammar(this.parseLeftHandSideExpression),s=this.match("(")?this.parseArguments():[];n=new a.NewExpression(o,s),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}return this.finalize(e,n)},e.prototype.parseAsyncArgument=function(){var e=this.parseAssignmentExpression();return this.context.firstCoverInitializedNameError=null,e},e.prototype.parseAsyncArguments=function(){this.expect("(");var e=[];if(!this.match(")"))for(;;){var t=this.match("...")?this.parseSpreadElement():this.isolateCoverGrammar(this.parseAsyncArgument);if(e.push(t),this.match(")"))break;if(this.expectCommaSeparator(),this.match(")"))break}return this.expect(")"),e},e.prototype.parseLeftHandSideExpressionAllowCall=function(){var e=this.lookahead,t=this.matchContextualKeyword("async"),n=this.context.allowIn;this.context.allowIn=!0;var r;for(this.matchKeyword("super")&&this.context.inFunctionBody?(r=this.createNode(),this.nextToken(),r=this.finalize(r,new a.Super),this.match("(")||this.match(".")||this.match("[")||this.throwUnexpectedToken(this.lookahead)):r=this.inheritCoverGrammar(this.matchKeyword("new")?this.parseNewExpression:this.parsePrimaryExpression);;)if(this.match(".")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect(".");var i=this.parseIdentifierName();r=this.finalize(this.startNode(e),new a.StaticMemberExpression(r,i))}else if(this.match("(")){var o=t&&e.lineNumber===this.lookahead.lineNumber;this.context.isBindingElement=!1,this.context.isAssignmentTarget=!1;var s=o?this.parseAsyncArguments():this.parseArguments();if(r=this.finalize(this.startNode(e),new a.CallExpression(r,s)),o&&this.match("=>")){for(var u=0;u<s.length;++u)this.reinterpretExpressionAsPattern(s[u]);r={type:"ArrowParameterPlaceHolder",params:s,async:!0}}}else if(this.match("[")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect("[");var i=this.isolateCoverGrammar(this.parseExpression);this.expect("]"),r=this.finalize(this.startNode(e),new a.ComputedMemberExpression(r,i))}else{if(10!==this.lookahead.type||!this.lookahead.head)break;var l=this.parseTemplateLiteral();r=this.finalize(this.startNode(e),new a.TaggedTemplateExpression(r,l))}return this.context.allowIn=n,r},e.prototype.parseSuper=function(){var e=this.createNode();return this.expectKeyword("super"),this.match("[")||this.match(".")||this.throwUnexpectedToken(this.lookahead),this.finalize(e,new a.Super)},e.prototype.parseLeftHandSideExpression=function(){r.assert(this.context.allowIn,"callee of new expression always allow in keyword.");for(var e=this.startNode(this.lookahead),t=this.matchKeyword("super")&&this.context.inFunctionBody?this.parseSuper():this.inheritCoverGrammar(this.matchKeyword("new")?this.parseNewExpression:this.parsePrimaryExpression);;)if(this.match("[")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect("[");var n=this.isolateCoverGrammar(this.parseExpression);this.expect("]"),t=this.finalize(e,new a.ComputedMemberExpression(t,n))}else if(this.match(".")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect(".");var n=this.parseIdentifierName();t=this.finalize(e,new a.StaticMemberExpression(t,n))}else{if(10!==this.lookahead.type||!this.lookahead.head)break;var i=this.parseTemplateLiteral();t=this.finalize(e,new a.TaggedTemplateExpression(t,i))}return t},e.prototype.parseUpdateExpression=function(){var e,t=this.lookahead;if(this.match("++")||this.match("--")){var n=this.startNode(t),r=this.nextToken();e=this.inheritCoverGrammar(this.parseUnaryExpression),this.context.strict&&e.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(e.name)&&this.tolerateError(o.Messages.StrictLHSPrefix),this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment);var i=!0;e=this.finalize(n,new a.UpdateExpression(r.value,e,i)),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}else if(e=this.inheritCoverGrammar(this.parseLeftHandSideExpressionAllowCall),!this.hasLineTerminator&&7===this.lookahead.type&&(this.match("++")||this.match("--"))){this.context.strict&&e.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(e.name)&&this.tolerateError(o.Messages.StrictLHSPostfix),this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var s=this.nextToken().value,i=!1;e=this.finalize(this.startNode(t),new a.UpdateExpression(s,e,i))}return e},e.prototype.parseAwaitExpression=function(){var e=this.createNode();this.nextToken();var t=this.parseUnaryExpression();return this.finalize(e,new a.AwaitExpression(t))},e.prototype.parseUnaryExpression=function(){var e;if(this.match("+")||this.match("-")||this.match("~")||this.match("!")||this.matchKeyword("delete")||this.matchKeyword("void")||this.matchKeyword("typeof")){var t=this.startNode(this.lookahead),n=this.nextToken();e=this.inheritCoverGrammar(this.parseUnaryExpression),e=this.finalize(t,new a.UnaryExpression(n.value,e)),this.context.strict&&"delete"===e.operator&&e.argument.type===u.Syntax.Identifier&&this.tolerateError(o.Messages.StrictDelete),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}else e=this.context.await&&this.matchContextualKeyword("await")?this.parseAwaitExpression():this.parseUpdateExpression();return e},e.prototype.parseExponentiationExpression=function(){var e=this.lookahead,t=this.inheritCoverGrammar(this.parseUnaryExpression);if(t.type!==u.Syntax.UnaryExpression&&this.match("**")){this.nextToken(),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var n=t,r=this.isolateCoverGrammar(this.parseExponentiationExpression);t=this.finalize(this.startNode(e),new a.BinaryExpression("**",n,r))}return t},e.prototype.binaryPrecedence=function(e){var t=e.value;return 7===e.type?this.operatorPrecedence[t]||0:4===e.type&&("instanceof"===t||this.context.allowIn&&"in"===t)?7:0},e.prototype.parseBinaryExpression=function(){var e=this.lookahead,t=this.inheritCoverGrammar(this.parseExponentiationExpression),n=this.lookahead,r=this.binaryPrecedence(n);if(r>0){this.nextToken(),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;for(var i=[e,this.lookahead],o=t,s=this.isolateCoverGrammar(this.parseExponentiationExpression),u=[o,n.value,s],l=[r];;){if((r=this.binaryPrecedence(this.lookahead))<=0)break;for(;u.length>2&&r<=l[l.length-1];){s=u.pop();var c=u.pop();l.pop(),o=u.pop(),i.pop();var p=this.startNode(i[i.length-1]);u.push(this.finalize(p,new a.BinaryExpression(c,o,s)))}u.push(this.nextToken().value),l.push(r),i.push(this.lookahead),u.push(this.isolateCoverGrammar(this.parseExponentiationExpression))}var f=u.length-1;for(t=u[f],i.pop();f>1;){var p=this.startNode(i.pop()),c=u[f-1];t=this.finalize(p,new a.BinaryExpression(c,u[f-2],t)),f-=2}}return t},e.prototype.parseConditionalExpression=function(){var e=this.lookahead,t=this.inheritCoverGrammar(this.parseBinaryExpression);if(this.match("?")){this.nextToken();var n=this.context.allowIn;this.context.allowIn=!0;var r=this.isolateCoverGrammar(this.parseAssignmentExpression);this.context.allowIn=n,this.expect(":");var i=this.isolateCoverGrammar(this.parseAssignmentExpression);t=this.finalize(this.startNode(e),new a.ConditionalExpression(t,r,i)),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}return t},e.prototype.checkPatternParam=function(e,t){switch(t.type){case u.Syntax.Identifier:this.validateParam(e,t,t.name);break;case u.Syntax.RestElement:this.checkPatternParam(e,t.argument);break;case u.Syntax.AssignmentPattern:this.checkPatternParam(e,t.left);break;case u.Syntax.ArrayPattern:for(var n=0;n<t.elements.length;n++)null!==t.elements[n]&&this.checkPatternParam(e,t.elements[n]);break;case u.Syntax.ObjectPattern:for(var n=0;n<t.properties.length;n++)this.checkPatternParam(e,t.properties[n].value)}e.simple=e.simple&&t instanceof a.Identifier},e.prototype.reinterpretAsCoverFormalsList=function(e){var t,n=[e],r=!1;switch(e.type){case u.Syntax.Identifier:break;case"ArrowParameterPlaceHolder":n=e.params,r=e.async;break;default:return null}t={simple:!0,paramSet:{}};for(var i=0;i<n.length;++i){var a=n[i];a.type===u.Syntax.AssignmentPattern?a.right.type===u.Syntax.YieldExpression&&(a.right.argument&&this.throwUnexpectedToken(this.lookahead),a.right.type=u.Syntax.Identifier,a.right.name="yield",delete a.right.argument,delete a.right.delegate):r&&a.type===u.Syntax.Identifier&&"await"===a.name&&this.throwUnexpectedToken(this.lookahead),this.checkPatternParam(t,a),n[i]=a}if(this.context.strict||!this.context.allowYield)for(var i=0;i<n.length;++i){var a=n[i];a.type===u.Syntax.YieldExpression&&this.throwUnexpectedToken(this.lookahead)}if(t.message===o.Messages.StrictParamDupe){var s=this.context.strict?t.stricted:t.firstRestricted;this.throwUnexpectedToken(s,t.message)}return{simple:t.simple,params:n,stricted:t.stricted,firstRestricted:t.firstRestricted,message:t.message}},e.prototype.parseAssignmentExpression=function(){var e;if(!this.context.allowYield&&this.matchKeyword("yield"))e=this.parseYieldExpression();else{var t=this.lookahead,n=t;if(e=this.parseConditionalExpression(),3===n.type&&n.lineNumber===this.lookahead.lineNumber&&"async"===n.value&&(3===this.lookahead.type||this.matchKeyword("yield"))){var r=this.parsePrimaryExpression();this.reinterpretExpressionAsPattern(r),e={type:"ArrowParameterPlaceHolder",params:[r],async:!0}}if("ArrowParameterPlaceHolder"===e.type||this.match("=>")){this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var i=e.async,s=this.reinterpretAsCoverFormalsList(e);if(s){this.hasLineTerminator&&this.tolerateUnexpectedToken(this.lookahead),this.context.firstCoverInitializedNameError=null;var l=this.context.strict,c=this.context.allowStrictDirective;this.context.allowStrictDirective=s.simple;var p=this.context.allowYield,f=this.context.await;this.context.allowYield=!0,this.context.await=i;var h=this.startNode(t);this.expect("=>");var d=void 0;if(this.match("{")){var m=this.context.allowIn;this.context.allowIn=!0,d=this.parseFunctionSourceElements(),this.context.allowIn=m}else d=this.isolateCoverGrammar(this.parseAssignmentExpression);var v=d.type!==u.Syntax.BlockStatement;this.context.strict&&s.firstRestricted&&this.throwUnexpectedToken(s.firstRestricted,s.message),this.context.strict&&s.stricted&&this.tolerateUnexpectedToken(s.stricted,s.message),e=i?this.finalize(h,new a.AsyncArrowFunctionExpression(s.params,d,v)):this.finalize(h,new a.ArrowFunctionExpression(s.params,d,v)),this.context.strict=l,this.context.allowStrictDirective=c,this.context.allowYield=p,this.context.await=f}}else if(this.matchAssign()){if(this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment),this.context.strict&&e.type===u.Syntax.Identifier){var g=e;this.scanner.isRestrictedWord(g.name)&&this.tolerateUnexpectedToken(n,o.Messages.StrictLHSAssignment),this.scanner.isStrictModeReservedWord(g.name)&&this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord)}this.match("=")?this.reinterpretExpressionAsPattern(e):(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1),n=this.nextToken();var y=n.value,_=this.isolateCoverGrammar(this.parseAssignmentExpression);e=this.finalize(this.startNode(t),new a.AssignmentExpression(y,e,_)),this.context.firstCoverInitializedNameError=null}}return e},e.prototype.parseExpression=function(){var e=this.lookahead,t=this.isolateCoverGrammar(this.parseAssignmentExpression);if(this.match(",")){var n=[];for(n.push(t);2!==this.lookahead.type&&this.match(",");)this.nextToken(),n.push(this.isolateCoverGrammar(this.parseAssignmentExpression));t=this.finalize(this.startNode(e),new a.SequenceExpression(n))}return t},e.prototype.parseStatementListItem=function(){var e;if(this.context.isAssignmentTarget=!0,this.context.isBindingElement=!0,4===this.lookahead.type)switch(this.lookahead.value){case"export":this.context.isModule||this.tolerateUnexpectedToken(this.lookahead,o.Messages.IllegalExportDeclaration),e=this.parseExportDeclaration();break;case"import":this.context.isModule||this.tolerateUnexpectedToken(this.lookahead,o.Messages.IllegalImportDeclaration),e=this.parseImportDeclaration();break;case"const":e=this.parseLexicalDeclaration({inFor:!1});break;case"function":e=this.parseFunctionDeclaration();break;case"class":e=this.parseClassDeclaration();break;case"let":e=this.isLexicalDeclaration()?this.parseLexicalDeclaration({inFor:!1}):this.parseStatement();break;default:e=this.parseStatement()}else e=this.parseStatement();return e},e.prototype.parseBlock=function(){var e=this.createNode();this.expect("{");for(var t=[];;){if(this.match("}"))break;t.push(this.parseStatementListItem())}return this.expect("}"),this.finalize(e,new a.BlockStatement(t))},e.prototype.parseLexicalBinding=function(e,t){var n=this.createNode(),r=[],i=this.parsePattern(r,e);this.context.strict&&i.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(i.name)&&this.tolerateError(o.Messages.StrictVarName);var s=null;return"const"===e?this.matchKeyword("in")||this.matchContextualKeyword("of")||(this.match("=")?(this.nextToken(),s=this.isolateCoverGrammar(this.parseAssignmentExpression)):this.throwError(o.Messages.DeclarationMissingInitializer,"const")):(!t.inFor&&i.type!==u.Syntax.Identifier||this.match("="))&&(this.expect("="),s=this.isolateCoverGrammar(this.parseAssignmentExpression)),this.finalize(n,new a.VariableDeclarator(i,s))},e.prototype.parseBindingList=function(e,t){for(var n=[this.parseLexicalBinding(e,t)];this.match(",");)this.nextToken(),n.push(this.parseLexicalBinding(e,t));return n},e.prototype.isLexicalDeclaration=function(){var e=this.scanner.saveState();this.scanner.scanComments();var t=this.scanner.lex();return this.scanner.restoreState(e),3===t.type||7===t.type&&"["===t.value||7===t.type&&"{"===t.value||4===t.type&&"let"===t.value||4===t.type&&"yield"===t.value},e.prototype.parseLexicalDeclaration=function(e){var t=this.createNode(),n=this.nextToken().value;r.assert("let"===n||"const"===n,"Lexical declaration must be either let or const");var i=this.parseBindingList(n,e);return this.consumeSemicolon(),this.finalize(t,new a.VariableDeclaration(i,n))},e.prototype.parseBindingRestElement=function(e,t){var n=this.createNode();this.expect("...");var r=this.parsePattern(e,t);return this.finalize(n,new a.RestElement(r))},e.prototype.parseArrayPattern=function(e,t){var n=this.createNode();this.expect("[");for(var r=[];!this.match("]");)if(this.match(","))this.nextToken(),r.push(null);else{if(this.match("...")){r.push(this.parseBindingRestElement(e,t));break}r.push(this.parsePatternWithDefault(e,t)),this.match("]")||this.expect(",")}return this.expect("]"),this.finalize(n,new a.ArrayPattern(r))},e.prototype.parsePropertyPattern=function(e,t){var n,r,i=this.createNode(),o=!1,s=!1;if(3===this.lookahead.type){var u=this.lookahead;n=this.parseVariableIdentifier();var l=this.finalize(i,new a.Identifier(u.value));if(this.match("=")){e.push(u),s=!0,this.nextToken();var c=this.parseAssignmentExpression();r=this.finalize(this.startNode(u),new a.AssignmentPattern(l,c))}else this.match(":")?(this.expect(":"),r=this.parsePatternWithDefault(e,t)):(e.push(u),s=!0,r=l)}else o=this.match("["),n=this.parseObjectPropertyKey(),this.expect(":"),r=this.parsePatternWithDefault(e,t);return this.finalize(i,new a.Property("init",n,o,r,!1,s))},e.prototype.parseObjectPattern=function(e,t){var n=this.createNode(),r=[];for(this.expect("{");!this.match("}");)r.push(this.parsePropertyPattern(e,t)),this.match("}")||this.expect(",");return this.expect("}"),this.finalize(n,new a.ObjectPattern(r))},e.prototype.parsePattern=function(e,t){var n;return this.match("[")?n=this.parseArrayPattern(e,t):this.match("{")?n=this.parseObjectPattern(e,t):(!this.matchKeyword("let")||"const"!==t&&"let"!==t||this.tolerateUnexpectedToken(this.lookahead,o.Messages.LetInLexicalBinding),e.push(this.lookahead),n=this.parseVariableIdentifier(t)),n},e.prototype.parsePatternWithDefault=function(e,t){var n=this.lookahead,r=this.parsePattern(e,t);if(this.match("=")){this.nextToken();var i=this.context.allowYield;this.context.allowYield=!0;var o=this.isolateCoverGrammar(this.parseAssignmentExpression);this.context.allowYield=i,r=this.finalize(this.startNode(n),new a.AssignmentPattern(r,o))}return r},e.prototype.parseVariableIdentifier=function(e){var t=this.createNode(),n=this.nextToken();return 4===n.type&&"yield"===n.value?this.context.strict?this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord):this.context.allowYield||this.throwUnexpectedToken(n):3!==n.type?this.context.strict&&4===n.type&&this.scanner.isStrictModeReservedWord(n.value)?this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord):(this.context.strict||"let"!==n.value||"var"!==e)&&this.throwUnexpectedToken(n):(this.context.isModule||this.context.await)&&3===n.type&&"await"===n.value&&this.tolerateUnexpectedToken(n),this.finalize(t,new a.Identifier(n.value))},e.prototype.parseVariableDeclaration=function(e){var t=this.createNode(),n=[],r=this.parsePattern(n,"var");this.context.strict&&r.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(r.name)&&this.tolerateError(o.Messages.StrictVarName);var i=null;return this.match("=")?(this.nextToken(),i=this.isolateCoverGrammar(this.parseAssignmentExpression)):r.type===u.Syntax.Identifier||e.inFor||this.expect("="),this.finalize(t,new a.VariableDeclarator(r,i))},e.prototype.parseVariableDeclarationList=function(e){var t={inFor:e.inFor},n=[];for(n.push(this.parseVariableDeclaration(t));this.match(",");)this.nextToken(),n.push(this.parseVariableDeclaration(t));return n},e.prototype.parseVariableStatement=function(){var e=this.createNode();this.expectKeyword("var");var t=this.parseVariableDeclarationList({inFor:!1});return this.consumeSemicolon(),this.finalize(e,new a.VariableDeclaration(t,"var"))},e.prototype.parseEmptyStatement=function(){var e=this.createNode();return this.expect(";"),this.finalize(e,new a.EmptyStatement)},e.prototype.parseExpressionStatement=function(){var e=this.createNode(),t=this.parseExpression();return this.consumeSemicolon(),this.finalize(e,new a.ExpressionStatement(t))},e.prototype.parseIfClause=function(){return this.context.strict&&this.matchKeyword("function")&&this.tolerateError(o.Messages.StrictFunction),this.parseStatement()},e.prototype.parseIfStatement=function(){var e,t=this.createNode(),n=null;this.expectKeyword("if"),this.expect("(");var r=this.parseExpression();return!this.match(")")&&this.config.tolerant?(this.tolerateUnexpectedToken(this.nextToken()),e=this.finalize(this.createNode(),new a.EmptyStatement)):(this.expect(")"),e=this.parseIfClause(),this.matchKeyword("else")&&(this.nextToken(),n=this.parseIfClause())),this.finalize(t,new a.IfStatement(r,e,n))},e.prototype.parseDoWhileStatement=function(){var e=this.createNode();this.expectKeyword("do");var t=this.context.inIteration;this.context.inIteration=!0;var n=this.parseStatement();this.context.inIteration=t,this.expectKeyword("while"),this.expect("(");var r=this.parseExpression();return!this.match(")")&&this.config.tolerant?this.tolerateUnexpectedToken(this.nextToken()):(this.expect(")"),this.match(";")&&this.nextToken()),this.finalize(e,new a.DoWhileStatement(n,r))},e.prototype.parseWhileStatement=function(){var e,t=this.createNode();this.expectKeyword("while"),this.expect("(");var n=this.parseExpression();if(!this.match(")")&&this.config.tolerant)this.tolerateUnexpectedToken(this.nextToken()),e=this.finalize(this.createNode(),new a.EmptyStatement);else{this.expect(")");var r=this.context.inIteration;this.context.inIteration=!0,e=this.parseStatement(),this.context.inIteration=r}return this.finalize(t,new a.WhileStatement(n,e))},e.prototype.parseForStatement=function(){var e,t,n=null,r=null,i=null,s=!0,l=this.createNode();if(this.expectKeyword("for"),this.expect("("),this.match(";"))this.nextToken();else if(this.matchKeyword("var")){n=this.createNode(),this.nextToken();var c=this.context.allowIn;this.context.allowIn=!1;var p=this.parseVariableDeclarationList({inFor:!0});if(this.context.allowIn=c,1===p.length&&this.matchKeyword("in")){var f=p[0];f.init&&(f.id.type===u.Syntax.ArrayPattern||f.id.type===u.Syntax.ObjectPattern||this.context.strict)&&this.tolerateError(o.Messages.ForInOfLoopInitializer,"for-in"),n=this.finalize(n,new a.VariableDeclaration(p,"var")),this.nextToken(),e=n,t=this.parseExpression(),n=null}else 1===p.length&&null===p[0].init&&this.matchContextualKeyword("of")?(n=this.finalize(n,new a.VariableDeclaration(p,"var")),this.nextToken(),e=n,t=this.parseAssignmentExpression(),n=null,s=!1):(n=this.finalize(n,new a.VariableDeclaration(p,"var")),this.expect(";"))}else if(this.matchKeyword("const")||this.matchKeyword("let")){n=this.createNode();var h=this.nextToken().value;if(this.context.strict||"in"!==this.lookahead.value){var c=this.context.allowIn;this.context.allowIn=!1;var p=this.parseBindingList(h,{inFor:!0});this.context.allowIn=c,1===p.length&&null===p[0].init&&this.matchKeyword("in")?(n=this.finalize(n,new a.VariableDeclaration(p,h)),this.nextToken(),e=n,t=this.parseExpression(),n=null):1===p.length&&null===p[0].init&&this.matchContextualKeyword("of")?(n=this.finalize(n,new a.VariableDeclaration(p,h)),this.nextToken(),e=n,t=this.parseAssignmentExpression(),n=null,s=!1):(this.consumeSemicolon(),n=this.finalize(n,new a.VariableDeclaration(p,h)))}else n=this.finalize(n,new a.Identifier(h)),this.nextToken(),e=n,t=this.parseExpression(),n=null}else{var d=this.lookahead,c=this.context.allowIn;if(this.context.allowIn=!1,n=this.inheritCoverGrammar(this.parseAssignmentExpression),this.context.allowIn=c,this.matchKeyword("in"))this.context.isAssignmentTarget&&n.type!==u.Syntax.AssignmentExpression||this.tolerateError(o.Messages.InvalidLHSInForIn),this.nextToken(),this.reinterpretExpressionAsPattern(n),e=n,t=this.parseExpression(),n=null;else if(this.matchContextualKeyword("of"))this.context.isAssignmentTarget&&n.type!==u.Syntax.AssignmentExpression||this.tolerateError(o.Messages.InvalidLHSInForLoop),this.nextToken(),this.reinterpretExpressionAsPattern(n),e=n,t=this.parseAssignmentExpression(),n=null,s=!1;else{if(this.match(",")){for(var m=[n];this.match(",");)this.nextToken(),m.push(this.isolateCoverGrammar(this.parseAssignmentExpression));n=this.finalize(this.startNode(d),new a.SequenceExpression(m))}this.expect(";")}}void 0===e&&(this.match(";")||(r=this.parseExpression()),this.expect(";"),this.match(")")||(i=this.parseExpression()));var v;if(!this.match(")")&&this.config.tolerant)this.tolerateUnexpectedToken(this.nextToken()),v=this.finalize(this.createNode(),new a.EmptyStatement);else{this.expect(")");var g=this.context.inIteration;this.context.inIteration=!0,v=this.isolateCoverGrammar(this.parseStatement),this.context.inIteration=g}return void 0===e?this.finalize(l,new a.ForStatement(n,r,i,v)):s?this.finalize(l,new a.ForInStatement(e,t,v)):this.finalize(l,new a.ForOfStatement(e,t,v))},e.prototype.parseContinueStatement=function(){var e=this.createNode();this.expectKeyword("continue");var t=null;if(3===this.lookahead.type&&!this.hasLineTerminator){var n=this.parseVariableIdentifier();t=n;var r="$"+n.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,r)||this.throwError(o.Messages.UnknownLabel,n.name)}return this.consumeSemicolon(),null!==t||this.context.inIteration||this.throwError(o.Messages.IllegalContinue),this.finalize(e,new a.ContinueStatement(t))},e.prototype.parseBreakStatement=function(){var e=this.createNode();this.expectKeyword("break");var t=null;if(3===this.lookahead.type&&!this.hasLineTerminator){var n=this.parseVariableIdentifier(),r="$"+n.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,r)||this.throwError(o.Messages.UnknownLabel,n.name),t=n}return this.consumeSemicolon(),null!==t||this.context.inIteration||this.context.inSwitch||this.throwError(o.Messages.IllegalBreak),this.finalize(e,new a.BreakStatement(t))},e.prototype.parseReturnStatement=function(){this.context.inFunctionBody||this.tolerateError(o.Messages.IllegalReturn);var e=this.createNode();this.expectKeyword("return");var t=!this.match(";")&&!this.match("}")&&!this.hasLineTerminator&&2!==this.lookahead.type,n=t?this.parseExpression():null;return this.consumeSemicolon(),this.finalize(e,new a.ReturnStatement(n))},e.prototype.parseWithStatement=function(){this.context.strict&&this.tolerateError(o.Messages.StrictModeWith);var e,t=this.createNode();this.expectKeyword("with"),this.expect("(");var n=this.parseExpression();return!this.match(")")&&this.config.tolerant?(this.tolerateUnexpectedToken(this.nextToken()),e=this.finalize(this.createNode(),new a.EmptyStatement)):(this.expect(")"),e=this.parseStatement()),this.finalize(t,new a.WithStatement(n,e))},e.prototype.parseSwitchCase=function(){var e,t=this.createNode();this.matchKeyword("default")?(this.nextToken(),e=null):(this.expectKeyword("case"),e=this.parseExpression()),this.expect(":");for(var n=[];;){if(this.match("}")||this.matchKeyword("default")||this.matchKeyword("case"))break;n.push(this.parseStatementListItem())}return this.finalize(t,new a.SwitchCase(e,n))},e.prototype.parseSwitchStatement=function(){var e=this.createNode();this.expectKeyword("switch"),this.expect("(");var t=this.parseExpression();this.expect(")");var n=this.context.inSwitch;this.context.inSwitch=!0;var r=[],i=!1;for(this.expect("{");;){if(this.match("}"))break;var s=this.parseSwitchCase();null===s.test&&(i&&this.throwError(o.Messages.MultipleDefaultsInSwitch),i=!0),r.push(s)}return this.expect("}"),this.context.inSwitch=n,this.finalize(e,new a.SwitchStatement(t,r))},e.prototype.parseLabelledStatement=function(){var e,t=this.createNode(),n=this.parseExpression();if(n.type===u.Syntax.Identifier&&this.match(":")){this.nextToken();var r=n,i="$"+r.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,i)&&this.throwError(o.Messages.Redeclaration,"Label",r.name),this.context.labelSet[i]=!0;var s=void 0;if(this.matchKeyword("class"))this.tolerateUnexpectedToken(this.lookahead),s=this.parseClassDeclaration();else if(this.matchKeyword("function")){var l=this.lookahead,c=this.parseFunctionDeclaration();this.context.strict?this.tolerateUnexpectedToken(l,o.Messages.StrictFunction):c.generator&&this.tolerateUnexpectedToken(l,o.Messages.GeneratorInLegacyContext),s=c}else s=this.parseStatement();delete this.context.labelSet[i],e=new a.LabeledStatement(r,s)}else this.consumeSemicolon(),e=new a.ExpressionStatement(n);return this.finalize(t,e)},e.prototype.parseThrowStatement=function(){var e=this.createNode();this.expectKeyword("throw"),this.hasLineTerminator&&this.throwError(o.Messages.NewlineAfterThrow);var t=this.parseExpression();return this.consumeSemicolon(),this.finalize(e,new a.ThrowStatement(t))},e.prototype.parseCatchClause=function(){var e=this.createNode();this.expectKeyword("catch"),this.expect("("),this.match(")")&&this.throwUnexpectedToken(this.lookahead);for(var t=[],n=this.parsePattern(t),r={},i=0;i<t.length;i++){var s="$"+t[i].value;Object.prototype.hasOwnProperty.call(r,s)&&this.tolerateError(o.Messages.DuplicateBinding,t[i].value),r[s]=!0}this.context.strict&&n.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(n.name)&&this.tolerateError(o.Messages.StrictCatchVariable),this.expect(")");var l=this.parseBlock();return this.finalize(e,new a.CatchClause(n,l))},e.prototype.parseFinallyClause=function(){return this.expectKeyword("finally"),this.parseBlock()},e.prototype.parseTryStatement=function(){var e=this.createNode();this.expectKeyword("try");var t=this.parseBlock(),n=this.matchKeyword("catch")?this.parseCatchClause():null,r=this.matchKeyword("finally")?this.parseFinallyClause():null;return n||r||this.throwError(o.Messages.NoCatchOrFinally),this.finalize(e,new a.TryStatement(t,n,r))},e.prototype.parseDebuggerStatement=function(){var e=this.createNode();return this.expectKeyword("debugger"),this.consumeSemicolon(),this.finalize(e,new a.DebuggerStatement)},e.prototype.parseStatement=function(){var e;switch(this.lookahead.type){case 1:case 5:case 6:case 8:case 10:case 9:e=this.parseExpressionStatement();break;case 7:var t=this.lookahead.value;e="{"===t?this.parseBlock():"("===t?this.parseExpressionStatement():";"===t?this.parseEmptyStatement():this.parseExpressionStatement();break;case 3:e=this.matchAsyncFunction()?this.parseFunctionDeclaration():this.parseLabelledStatement();break;case 4:switch(this.lookahead.value){case"break":e=this.parseBreakStatement();break;case"continue":e=this.parseContinueStatement();break;case"debugger":e=this.parseDebuggerStatement();break;case"do":e=this.parseDoWhileStatement();break;case"for":e=this.parseForStatement();break;case"function":e=this.parseFunctionDeclaration();break;case"if":e=this.parseIfStatement();break;case"return":e=this.parseReturnStatement();break;case"switch":e=this.parseSwitchStatement();break;case"throw":e=this.parseThrowStatement();break;case"try":e=this.parseTryStatement();break;case"var":e=this.parseVariableStatement();break;case"while":e=this.parseWhileStatement();break;case"with":e=this.parseWithStatement();break;default:e=this.parseExpressionStatement()}break;default:e=this.throwUnexpectedToken(this.lookahead)}return e},e.prototype.parseFunctionSourceElements=function(){var e=this.createNode();this.expect("{");var t=this.parseDirectivePrologues(),n=this.context.labelSet,r=this.context.inIteration,i=this.context.inSwitch,o=this.context.inFunctionBody;for(this.context.labelSet={},this.context.inIteration=!1,this.context.inSwitch=!1,this.context.inFunctionBody=!0;2!==this.lookahead.type&&!this.match("}");)t.push(this.parseStatementListItem());return this.expect("}"),this.context.labelSet=n,this.context.inIteration=r,this.context.inSwitch=i,this.context.inFunctionBody=o,this.finalize(e,new a.BlockStatement(t))},e.prototype.validateParam=function(e,t,n){var r="$"+n;this.context.strict?(this.scanner.isRestrictedWord(n)&&(e.stricted=t,e.message=o.Messages.StrictParamName),Object.prototype.hasOwnProperty.call(e.paramSet,r)&&(e.stricted=t,e.message=o.Messages.StrictParamDupe)):e.firstRestricted||(this.scanner.isRestrictedWord(n)?(e.firstRestricted=t,e.message=o.Messages.StrictParamName):this.scanner.isStrictModeReservedWord(n)?(e.firstRestricted=t,e.message=o.Messages.StrictReservedWord):Object.prototype.hasOwnProperty.call(e.paramSet,r)&&(e.stricted=t,e.message=o.Messages.StrictParamDupe)),"function"==typeof Object.defineProperty?Object.defineProperty(e.paramSet,r,{value:!0,enumerable:!0,writable:!0,configurable:!0}):e.paramSet[r]=!0},e.prototype.parseRestElement=function(e){var t=this.createNode();this.expect("...");var n=this.parsePattern(e);return this.match("=")&&this.throwError(o.Messages.DefaultRestParameter),this.match(")")||this.throwError(o.Messages.ParameterAfterRestParameter),this.finalize(t,new a.RestElement(n))},e.prototype.parseFormalParameter=function(e){for(var t=[],n=this.match("...")?this.parseRestElement(t):this.parsePatternWithDefault(t),r=0;r<t.length;r++)this.validateParam(e,t[r],t[r].value);e.simple=e.simple&&n instanceof a.Identifier,e.params.push(n)},e.prototype.parseFormalParameters=function(e){var t;if(t={simple:!0,params:[],firstRestricted:e},this.expect("("),!this.match(")"))for(t.paramSet={};2!==this.lookahead.type&&(this.parseFormalParameter(t),!this.match(")"))&&(this.expect(","),!this.match(")")););return this.expect(")"),{simple:t.simple,params:t.params,stricted:t.stricted,firstRestricted:t.firstRestricted,message:t.message}},e.prototype.matchAsyncFunction=function(){var e=this.matchContextualKeyword("async");if(e){var t=this.scanner.saveState();this.scanner.scanComments();var n=this.scanner.lex();this.scanner.restoreState(t),e=t.lineNumber===n.lineNumber&&4===n.type&&"function"===n.value}return e},e.prototype.parseFunctionDeclaration=function(e){var t=this.createNode(),n=this.matchContextualKeyword("async");n&&this.nextToken(),this.expectKeyword("function");var r=!n&&this.match("*");r&&this.nextToken();var i,s=null,u=null;if(!e||!this.match("(")){var l=this.lookahead;s=this.parseVariableIdentifier(),this.context.strict?this.scanner.isRestrictedWord(l.value)&&this.tolerateUnexpectedToken(l,o.Messages.StrictFunctionName):this.scanner.isRestrictedWord(l.value)?(u=l,i=o.Messages.StrictFunctionName):this.scanner.isStrictModeReservedWord(l.value)&&(u=l,i=o.Messages.StrictReservedWord)}var c=this.context.await,p=this.context.allowYield;this.context.await=n,this.context.allowYield=!r;var f=this.parseFormalParameters(u),h=f.params,d=f.stricted;u=f.firstRestricted,f.message&&(i=f.message);var m=this.context.strict,v=this.context.allowStrictDirective;this.context.allowStrictDirective=f.simple;var g=this.parseFunctionSourceElements();return this.context.strict&&u&&this.throwUnexpectedToken(u,i),this.context.strict&&d&&this.tolerateUnexpectedToken(d,i),this.context.strict=m,this.context.allowStrictDirective=v,this.context.await=c,this.context.allowYield=p,n?this.finalize(t,new a.AsyncFunctionDeclaration(s,h,g)):this.finalize(t,new a.FunctionDeclaration(s,h,g,r))},e.prototype.parseFunctionExpression=function(){var e=this.createNode(),t=this.matchContextualKeyword("async");t&&this.nextToken(),this.expectKeyword("function");var n=!t&&this.match("*");n&&this.nextToken();var r,i,s=null,u=this.context.await,l=this.context.allowYield;if(this.context.await=t,this.context.allowYield=!n,!this.match("(")){var c=this.lookahead;s=this.context.strict||n||!this.matchKeyword("yield")?this.parseVariableIdentifier():this.parseIdentifierName(),this.context.strict?this.scanner.isRestrictedWord(c.value)&&this.tolerateUnexpectedToken(c,o.Messages.StrictFunctionName):this.scanner.isRestrictedWord(c.value)?(i=c,r=o.Messages.StrictFunctionName):this.scanner.isStrictModeReservedWord(c.value)&&(i=c,r=o.Messages.StrictReservedWord)}var p=this.parseFormalParameters(i),f=p.params,h=p.stricted;i=p.firstRestricted,p.message&&(r=p.message);var d=this.context.strict,m=this.context.allowStrictDirective;this.context.allowStrictDirective=p.simple;var v=this.parseFunctionSourceElements();return this.context.strict&&i&&this.throwUnexpectedToken(i,r),this.context.strict&&h&&this.tolerateUnexpectedToken(h,r),this.context.strict=d,this.context.allowStrictDirective=m,this.context.await=u,this.context.allowYield=l,t?this.finalize(e,new a.AsyncFunctionExpression(s,f,v)):this.finalize(e,new a.FunctionExpression(s,f,v,n))},e.prototype.parseDirective=function(){var e=this.lookahead,t=this.createNode(),n=this.parseExpression(),r=n.type===u.Syntax.Literal?this.getTokenRaw(e).slice(1,-1):null;return this.consumeSemicolon(),this.finalize(t,r?new a.Directive(n,r):new a.ExpressionStatement(n))},e.prototype.parseDirectivePrologues=function(){for(var e=null,t=[];;){var n=this.lookahead;if(8!==n.type)break;var r=this.parseDirective();t.push(r);var i=r.directive;if("string"!=typeof i)break;"use strict"===i?(this.context.strict=!0,e&&this.tolerateUnexpectedToken(e,o.Messages.StrictOctalLiteral),this.context.allowStrictDirective||this.tolerateUnexpectedToken(n,o.Messages.IllegalLanguageModeDirective)):!e&&n.octal&&(e=n)}return t},e.prototype.qualifiedPropertyName=function(e){switch(e.type){case 3:case 8:case 1:case 5:case 6:case 4:return!0;case 7:return"["===e.value}return!1},e.prototype.parseGetterMethod=function(){var e=this.createNode(),t=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters();n.params.length>0&&this.tolerateError(o.Messages.BadGetterArity);var r=this.parsePropertyMethod(n);return this.context.allowYield=t,this.finalize(e,new a.FunctionExpression(null,n.params,r,!1))},e.prototype.parseSetterMethod=function(){var e=this.createNode(),t=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters();1!==n.params.length?this.tolerateError(o.Messages.BadSetterArity):n.params[0]instanceof a.RestElement&&this.tolerateError(o.Messages.BadSetterRestParameter);var r=this.parsePropertyMethod(n);return this.context.allowYield=t,this.finalize(e,new a.FunctionExpression(null,n.params,r,!1))},e.prototype.parseGeneratorMethod=function(){var e=this.createNode(),t=this.context.allowYield;this.context.allowYield=!0;var n=this.parseFormalParameters();this.context.allowYield=!1;var r=this.parsePropertyMethod(n);return this.context.allowYield=t,this.finalize(e,new a.FunctionExpression(null,n.params,r,!0))},e.prototype.isStartOfExpression=function(){var e=!0,t=this.lookahead.value;switch(this.lookahead.type){case 7:e="["===t||"("===t||"{"===t||"+"===t||"-"===t||"!"===t||"~"===t||"++"===t||"--"===t||"/"===t||"/="===t;break;case 4:e="class"===t||"delete"===t||"function"===t||"let"===t||"new"===t||"super"===t||"this"===t||"typeof"===t||"void"===t||"yield"===t}return e},e.prototype.parseYieldExpression=function(){var e=this.createNode();this.expectKeyword("yield");var t=null,n=!1;if(!this.hasLineTerminator){var r=this.context.allowYield;this.context.allowYield=!1,n=this.match("*"),n?(this.nextToken(),t=this.parseAssignmentExpression()):this.isStartOfExpression()&&(t=this.parseAssignmentExpression()),this.context.allowYield=r}return this.finalize(e,new a.YieldExpression(t,n))},e.prototype.parseClassElement=function(e){var t=this.lookahead,n=this.createNode(),r="",i=null,s=null,u=!1,l=!1,c=!1,p=!1;if(this.match("*"))this.nextToken();else{u=this.match("["),i=this.parseObjectPropertyKey();if("static"===i.name&&(this.qualifiedPropertyName(this.lookahead)||this.match("*"))&&(t=this.lookahead,c=!0,u=this.match("["),this.match("*")?this.nextToken():i=this.parseObjectPropertyKey()),3===t.type&&!this.hasLineTerminator&&"async"===t.value){var f=this.lookahead.value;":"!==f&&"("!==f&&"*"!==f&&(p=!0,t=this.lookahead,i=this.parseObjectPropertyKey(),3===t.type&&("get"===t.value||"set"===t.value?this.tolerateUnexpectedToken(t):"constructor"===t.value&&this.tolerateUnexpectedToken(t,o.Messages.ConstructorIsAsync)))}}var h=this.qualifiedPropertyName(this.lookahead);return 3===t.type?"get"===t.value&&h?(r="get",u=this.match("["),i=this.parseObjectPropertyKey(),this.context.allowYield=!1,s=this.parseGetterMethod()):"set"===t.value&&h&&(r="set",u=this.match("["),i=this.parseObjectPropertyKey(),s=this.parseSetterMethod()):7===t.type&&"*"===t.value&&h&&(r="init",u=this.match("["),i=this.parseObjectPropertyKey(),s=this.parseGeneratorMethod(),l=!0),!r&&i&&this.match("(")&&(r="init",s=p?this.parsePropertyMethodAsyncFunction():this.parsePropertyMethodFunction(),l=!0),r||this.throwUnexpectedToken(this.lookahead),"init"===r&&(r="method"),u||(c&&this.isPropertyKey(i,"prototype")&&this.throwUnexpectedToken(t,o.Messages.StaticPrototype),!c&&this.isPropertyKey(i,"constructor")&&(("method"!==r||!l||s&&s.generator)&&this.throwUnexpectedToken(t,o.Messages.ConstructorSpecialMethod),e.value?this.throwUnexpectedToken(t,o.Messages.DuplicateConstructor):e.value=!0,r="constructor")),this.finalize(n,new a.MethodDefinition(i,u,s,r,c))},e.prototype.parseClassElementList=function(){var e=[],t={value:!1};for(this.expect("{");!this.match("}");)this.match(";")?this.nextToken():e.push(this.parseClassElement(t));return this.expect("}"),e},e.prototype.parseClassBody=function(){var e=this.createNode(),t=this.parseClassElementList();return this.finalize(e,new a.ClassBody(t))},e.prototype.parseClassDeclaration=function(e){var t=this.createNode(),n=this.context.strict;this.context.strict=!0,this.expectKeyword("class");var r=e&&3!==this.lookahead.type?null:this.parseVariableIdentifier(),i=null;this.matchKeyword("extends")&&(this.nextToken(),i=this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall));var o=this.parseClassBody();return this.context.strict=n,this.finalize(t,new a.ClassDeclaration(r,i,o))},e.prototype.parseClassExpression=function(){var e=this.createNode(),t=this.context.strict;this.context.strict=!0,this.expectKeyword("class");var n=3===this.lookahead.type?this.parseVariableIdentifier():null,r=null;this.matchKeyword("extends")&&(this.nextToken(),r=this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall));var i=this.parseClassBody();return this.context.strict=t,this.finalize(e,new a.ClassExpression(n,r,i))},e.prototype.parseModule=function(){this.context.strict=!0,this.context.isModule=!0;for(var e=this.createNode(),t=this.parseDirectivePrologues();2!==this.lookahead.type;)t.push(this.parseStatementListItem());return this.finalize(e,new a.Module(t))},e.prototype.parseScript=function(){for(var e=this.createNode(),t=this.parseDirectivePrologues();2!==this.lookahead.type;)t.push(this.parseStatementListItem());return this.finalize(e,new a.Script(t))},e.prototype.parseModuleSpecifier=function(){var e=this.createNode();8!==this.lookahead.type&&this.throwError(o.Messages.InvalidModuleSpecifier);var t=this.nextToken(),n=this.getTokenRaw(t);return this.finalize(e,new a.Literal(t.value,n))},e.prototype.parseImportSpecifier=function(){var e,t,n=this.createNode();return 3===this.lookahead.type?(e=this.parseVariableIdentifier(),t=e,this.matchContextualKeyword("as")&&(this.nextToken(),t=this.parseVariableIdentifier())):(e=this.parseIdentifierName(),t=e,this.matchContextualKeyword("as")?(this.nextToken(),t=this.parseVariableIdentifier()):this.throwUnexpectedToken(this.nextToken())),this.finalize(n,new a.ImportSpecifier(t,e))},e.prototype.parseNamedImports=function(){this.expect("{");for(var e=[];!this.match("}");)e.push(this.parseImportSpecifier()),this.match("}")||this.expect(",");return this.expect("}"),e},e.prototype.parseImportDefaultSpecifier=function(){var e=this.createNode(),t=this.parseIdentifierName();return this.finalize(e,new a.ImportDefaultSpecifier(t))},e.prototype.parseImportNamespaceSpecifier=function(){var e=this.createNode();this.expect("*"),this.matchContextualKeyword("as")||this.throwError(o.Messages.NoAsAfterImportNamespace),this.nextToken();var t=this.parseIdentifierName();return this.finalize(e,new a.ImportNamespaceSpecifier(t))},e.prototype.parseImportDeclaration=function(){this.context.inFunctionBody&&this.throwError(o.Messages.IllegalImportDeclaration);var e=this.createNode();this.expectKeyword("import");var t,n=[];if(8===this.lookahead.type)t=this.parseModuleSpecifier();else{if(this.match("{")?n=n.concat(this.parseNamedImports()):this.match("*")?n.push(this.parseImportNamespaceSpecifier()):this.isIdentifierName(this.lookahead)&&!this.matchKeyword("default")?(n.push(this.parseImportDefaultSpecifier()),this.match(",")&&(this.nextToken(),this.match("*")?n.push(this.parseImportNamespaceSpecifier()):this.match("{")?n=n.concat(this.parseNamedImports()):this.throwUnexpectedToken(this.lookahead))):this.throwUnexpectedToken(this.nextToken()),!this.matchContextualKeyword("from")){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}this.nextToken(),t=this.parseModuleSpecifier()}return this.consumeSemicolon(),this.finalize(e,new a.ImportDeclaration(n,t))},e.prototype.parseExportSpecifier=function(){var e=this.createNode(),t=this.parseIdentifierName(),n=t;return this.matchContextualKeyword("as")&&(this.nextToken(),n=this.parseIdentifierName()),this.finalize(e,new a.ExportSpecifier(t,n))},e.prototype.parseExportDeclaration=function(){this.context.inFunctionBody&&this.throwError(o.Messages.IllegalExportDeclaration);var e=this.createNode();this.expectKeyword("export");var t;if(this.matchKeyword("default"))if(this.nextToken(),this.matchKeyword("function")){var n=this.parseFunctionDeclaration(!0);t=this.finalize(e,new a.ExportDefaultDeclaration(n))}else if(this.matchKeyword("class")){var n=this.parseClassDeclaration(!0);t=this.finalize(e,new a.ExportDefaultDeclaration(n))}else if(this.matchContextualKeyword("async")){var n=this.matchAsyncFunction()?this.parseFunctionDeclaration(!0):this.parseAssignmentExpression();t=this.finalize(e,new a.ExportDefaultDeclaration(n))}else{this.matchContextualKeyword("from")&&this.throwError(o.Messages.UnexpectedToken,this.lookahead.value);var n=this.match("{")?this.parseObjectInitializer():this.match("[")?this.parseArrayInitializer():this.parseAssignmentExpression();this.consumeSemicolon(),t=this.finalize(e,new a.ExportDefaultDeclaration(n))}else if(this.match("*")){if(this.nextToken(),!this.matchContextualKeyword("from")){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}this.nextToken();var i=this.parseModuleSpecifier();this.consumeSemicolon(),t=this.finalize(e,new a.ExportAllDeclaration(i))}else if(4===this.lookahead.type){var n=void 0;switch(this.lookahead.value){case"let":case"const":n=this.parseLexicalDeclaration({inFor:!1});break;case"var":case"class":case"function":n=this.parseStatementListItem();break;default:this.throwUnexpectedToken(this.lookahead)}t=this.finalize(e,new a.ExportNamedDeclaration(n,[],null))}else if(this.matchAsyncFunction()){var n=this.parseFunctionDeclaration();t=this.finalize(e,new a.ExportNamedDeclaration(n,[],null))}else{var s=[],u=null,l=!1;for(this.expect("{");!this.match("}");)l=l||this.matchKeyword("default"),s.push(this.parseExportSpecifier()),this.match("}")||this.expect(",");if(this.expect("}"),this.matchContextualKeyword("from"))this.nextToken(),u=this.parseModuleSpecifier(),this.consumeSemicolon();else if(l){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}else this.consumeSemicolon();t=this.finalize(e,new a.ExportNamedDeclaration(null,s,u))}return t},e}();t.Parser=c},function(e,t){"use strict";function n(e,t){if(!e)throw new Error("ASSERT: "+t)}Object.defineProperty(t,"__esModule",{value:!0}),t.assert=n},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=function(){function e(){this.errors=[],this.tolerant=!1}return e.prototype.recordError=function(e){this.errors.push(e)},e.prototype.tolerate=function(e){if(!this.tolerant)throw e;this.recordError(e)},e.prototype.constructError=function(e,t){var n=new Error(e);try{throw n}catch(e){Object.create&&Object.defineProperty&&(n=Object.create(e),Object.defineProperty(n,"column",{value:t}))}return n},e.prototype.createError=function(e,t,n,r){var i="Line "+t+": "+r,o=this.constructError(i,n);return o.index=e,o.lineNumber=t,o.description=r,o},e.prototype.throwError=function(e,t,n,r){throw this.createError(e,t,n,r)},e.prototype.tolerateError=function(e,t,n,r){var i=this.createError(e,t,n,r);if(!this.tolerant)throw i;this.recordError(i)},e}();t.ErrorHandler=n},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Messages={BadGetterArity:"Getter must not have any formal parameters",BadSetterArity:"Setter must have exactly one formal parameter",BadSetterRestParameter:"Setter function argument must not be a rest parameter",ConstructorIsAsync:"Class constructor may not be an async method",ConstructorSpecialMethod:"Class constructor may not be an accessor",DeclarationMissingInitializer:"Missing initializer in %0 declaration",DefaultRestParameter:"Unexpected token =",DuplicateBinding:"Duplicate binding %0",DuplicateConstructor:"A class may only have one constructor",DuplicateProtoProperty:"Duplicate __proto__ fields are not allowed in object literals",ForInOfLoopInitializer:"%0 loop variable declaration may not have an initializer",GeneratorInLegacyContext:"Generator declarations are not allowed in legacy contexts",IllegalBreak:"Illegal break statement",IllegalContinue:"Illegal continue statement",IllegalExportDeclaration:"Unexpected token",IllegalImportDeclaration:"Unexpected token",IllegalLanguageModeDirective:"Illegal 'use strict' directive in function with non-simple parameter list",IllegalReturn:"Illegal return statement",InvalidEscapedReservedWord:"Keyword must not contain escaped characters",InvalidHexEscapeSequence:"Invalid hexadecimal escape sequence",InvalidLHSInAssignment:"Invalid left-hand side in assignment",InvalidLHSInForIn:"Invalid left-hand side in for-in",InvalidLHSInForLoop:"Invalid left-hand side in for-loop",InvalidModuleSpecifier:"Unexpected token",InvalidRegExp:"Invalid regular expression",LetInLexicalBinding:"let is disallowed as a lexically bound name",MissingFromClause:"Unexpected token",MultipleDefaultsInSwitch:"More than one default clause in switch statement",NewlineAfterThrow:"Illegal newline after throw",NoAsAfterImportNamespace:"Unexpected token",NoCatchOrFinally:"Missing catch or finally after try",ParameterAfterRestParameter:"Rest parameter must be last formal parameter",Redeclaration:"%0 '%1' has already been declared",StaticPrototype:"Classes may not have static property named prototype",StrictCatchVariable:"Catch variable may not be eval or arguments in strict mode",StrictDelete:"Delete of an unqualified identifier in strict mode.",StrictFunction:"In strict mode code, functions can only be declared at top level or inside a block",StrictFunctionName:"Function name may not be eval or arguments in strict mode",StrictLHSAssignment:"Assignment to eval or arguments is not allowed in strict mode",StrictLHSPostfix:"Postfix increment/decrement may not have eval or arguments operand in strict mode",StrictLHSPrefix:"Prefix increment/decrement may not have eval or arguments operand in strict mode",StrictModeWith:"Strict mode code may not include a with statement",StrictOctalLiteral:"Octal literals are not allowed in strict mode.",StrictParamDupe:"Strict mode function may not have duplicate parameter names",StrictParamName:"Parameter name eval or arguments is not allowed in strict mode",StrictReservedWord:"Use of future reserved word in strict mode",StrictVarName:"Variable name may not be eval or arguments in strict mode",TemplateOctalLiteral:"Octal literals are not allowed in template strings.",UnexpectedEOS:"Unexpected end of input",UnexpectedIdentifier:"Unexpected identifier",UnexpectedNumber:"Unexpected number",UnexpectedReserved:"Unexpected reserved word",UnexpectedString:"Unexpected string",UnexpectedTemplate:"Unexpected quasi %0",UnexpectedToken:"Unexpected token %0",UnexpectedTokenIllegal:"Unexpected token ILLEGAL",UnknownLabel:"Undefined label '%0'",UnterminatedRegExp:"Invalid regular expression: missing /"}},function(e,t,n){"use strict";function r(e){return"0123456789abcdef".indexOf(e.toLowerCase())}function i(e){return"01234567".indexOf(e)}Object.defineProperty(t,"__esModule",{value:!0});var o=n(9),a=n(4),s=n(11),u=function(){function e(e,t){this.source=e,this.errorHandler=t,this.trackComment=!1,this.length=e.length,this.index=0,this.lineNumber=e.length>0?1:0,this.lineStart=0,this.curlyStack=[]}return e.prototype.saveState=function(){return{index:this.index,lineNumber:this.lineNumber,lineStart:this.lineStart}},e.prototype.restoreState=function(e){this.index=e.index,this.lineNumber=e.lineNumber,this.lineStart=e.lineStart},e.prototype.eof=function(){return this.index>=this.length},e.prototype.throwUnexpectedToken=function(e){return void 0===e&&(e=s.Messages.UnexpectedTokenIllegal),this.errorHandler.throwError(this.index,this.lineNumber,this.index-this.lineStart+1,e)},e.prototype.tolerateUnexpectedToken=function(e){void 0===e&&(e=s.Messages.UnexpectedTokenIllegal),this.errorHandler.tolerateError(this.index,this.lineNumber,this.index-this.lineStart+1,e)},e.prototype.skipSingleLineComment=function(e){var t,n,r=[];for(this.trackComment&&(r=[],t=this.index-e,n={start:{line:this.lineNumber,column:this.index-this.lineStart-e},end:{}});!this.eof();){var i=this.source.charCodeAt(this.index);if(++this.index,a.Character.isLineTerminator(i)){if(this.trackComment){n.end={line:this.lineNumber,column:this.index-this.lineStart-1};var o={multiLine:!1,slice:[t+e,this.index-1],range:[t,this.index-1],loc:n};r.push(o)}return 13===i&&10===this.source.charCodeAt(this.index)&&++this.index,++this.lineNumber,this.lineStart=this.index,r}}if(this.trackComment){n.end={line:this.lineNumber,column:this.index-this.lineStart};var o={multiLine:!1,slice:[t+e,this.index],range:[t,this.index],loc:n};r.push(o)}return r},e.prototype.skipMultiLineComment=function(){var e,t,n=[];for(this.trackComment&&(n=[],e=this.index-2,t={start:{line:this.lineNumber,column:this.index-this.lineStart-2},end:{}});!this.eof();){var r=this.source.charCodeAt(this.index);if(a.Character.isLineTerminator(r))13===r&&10===this.source.charCodeAt(this.index+1)&&++this.index,++this.lineNumber,++this.index,this.lineStart=this.index;else if(42===r){if(47===this.source.charCodeAt(this.index+1)){if(this.index+=2,this.trackComment){t.end={line:this.lineNumber,column:this.index-this.lineStart};var i={multiLine:!0,slice:[e+2,this.index-2],range:[e,this.index],loc:t};n.push(i)}return n}++this.index}else++this.index}if(this.trackComment){t.end={line:this.lineNumber,column:this.index-this.lineStart};var i={multiLine:!0,slice:[e+2,this.index],range:[e,this.index],loc:t};n.push(i)}return this.tolerateUnexpectedToken(),n},e.prototype.scanComments=function(){var e;this.trackComment&&(e=[]);for(var t=0===this.index;!this.eof();){var n=this.source.charCodeAt(this.index);if(a.Character.isWhiteSpace(n))++this.index;else if(a.Character.isLineTerminator(n))++this.index,13===n&&10===this.source.charCodeAt(this.index)&&++this.index,++this.lineNumber,this.lineStart=this.index,t=!0;else if(47===n)if(47===(n=this.source.charCodeAt(this.index+1))){this.index+=2;var r=this.skipSingleLineComment(2);this.trackComment&&(e=e.concat(r)),t=!0}else{if(42!==n)break;this.index+=2;var r=this.skipMultiLineComment();this.trackComment&&(e=e.concat(r))}else if(t&&45===n){if(45!==this.source.charCodeAt(this.index+1)||62!==this.source.charCodeAt(this.index+2))break;this.index+=3;var r=this.skipSingleLineComment(3);this.trackComment&&(e=e.concat(r))}else{if(60!==n)break;if("!--"!==this.source.slice(this.index+1,this.index+4))break;this.index+=4;var r=this.skipSingleLineComment(4);this.trackComment&&(e=e.concat(r))}}return e},e.prototype.isFutureReservedWord=function(e){switch(e){case"enum":case"export":case"import":case"super":return!0;default:return!1}},e.prototype.isStrictModeReservedWord=function(e){switch(e){case"implements":case"interface":case"package":case"private":case"protected":case"public":case"static":case"yield":case"let":return!0;default:return!1}},e.prototype.isRestrictedWord=function(e){return"eval"===e||"arguments"===e},e.prototype.isKeyword=function(e){switch(e.length){case 2:return"if"===e||"in"===e||"do"===e;case 3:return"var"===e||"for"===e||"new"===e||"try"===e||"let"===e;case 4:return"this"===e||"else"===e||"case"===e||"void"===e||"with"===e||"enum"===e;case 5:return"while"===e||"break"===e||"catch"===e||"throw"===e||"const"===e||"yield"===e||"class"===e||"super"===e;case 6:return"return"===e||"typeof"===e||"delete"===e||"switch"===e||"export"===e||"import"===e;case 7:return"default"===e||"finally"===e||"extends"===e;case 8:return"function"===e||"continue"===e||"debugger"===e;case 10:return"instanceof"===e;default:return!1}},e.prototype.codePointAt=function(e){var t=this.source.charCodeAt(e);if(t>=55296&&t<=56319){var n=this.source.charCodeAt(e+1);if(n>=56320&&n<=57343){t=1024*(t-55296)+n-56320+65536}}return t},e.prototype.scanHexEscape=function(e){for(var t="u"===e?4:2,n=0,i=0;i<t;++i){if(this.eof()||!a.Character.isHexDigit(this.source.charCodeAt(this.index)))return null;n=16*n+r(this.source[this.index++])}return String.fromCharCode(n)},e.prototype.scanUnicodeCodePointEscape=function(){var e=this.source[this.index],t=0;for("}"===e&&this.throwUnexpectedToken();!this.eof()&&(e=this.source[this.index++],a.Character.isHexDigit(e.charCodeAt(0)));)t=16*t+r(e);return(t>1114111||"}"!==e)&&this.throwUnexpectedToken(),a.Character.fromCodePoint(t)},e.prototype.getIdentifier=function(){for(var e=this.index++;!this.eof();){var t=this.source.charCodeAt(this.index);if(92===t)return this.index=e,this.getComplexIdentifier();if(t>=55296&&t<57343)return this.index=e,this.getComplexIdentifier();if(!a.Character.isIdentifierPart(t))break;++this.index}return this.source.slice(e,this.index)},e.prototype.getComplexIdentifier=function(){var e=this.codePointAt(this.index),t=a.Character.fromCodePoint(e);this.index+=t.length;var n;for(92===e&&(117!==this.source.charCodeAt(this.index)&&this.throwUnexpectedToken(),++this.index,"{"===this.source[this.index]?(++this.index,n=this.scanUnicodeCodePointEscape()):null!==(n=this.scanHexEscape("u"))&&"\\"!==n&&a.Character.isIdentifierStart(n.charCodeAt(0))||this.throwUnexpectedToken(),t=n);!this.eof()&&(e=this.codePointAt(this.index),a.Character.isIdentifierPart(e));)n=a.Character.fromCodePoint(e),t+=n,this.index+=n.length,92===e&&(t=t.substr(0,t.length-1),117!==this.source.charCodeAt(this.index)&&this.throwUnexpectedToken(),++this.index,"{"===this.source[this.index]?(++this.index,n=this.scanUnicodeCodePointEscape()):null!==(n=this.scanHexEscape("u"))&&"\\"!==n&&a.Character.isIdentifierPart(n.charCodeAt(0))||this.throwUnexpectedToken(),t+=n);return t},e.prototype.octalToDecimal=function(e){var t="0"!==e,n=i(e);return!this.eof()&&a.Character.isOctalDigit(this.source.charCodeAt(this.index))&&(t=!0,n=8*n+i(this.source[this.index++]),"0123".indexOf(e)>=0&&!this.eof()&&a.Character.isOctalDigit(this.source.charCodeAt(this.index))&&(n=8*n+i(this.source[this.index++]))),{code:n,octal:t}},e.prototype.scanIdentifier=function(){var e,t=this.index,n=92===this.source.charCodeAt(t)?this.getComplexIdentifier():this.getIdentifier();if(3!==(e=1===n.length?3:this.isKeyword(n)?4:"null"===n?5:"true"===n||"false"===n?1:3)&&t+n.length!==this.index){var r=this.index;this.index=t,this.tolerateUnexpectedToken(s.Messages.InvalidEscapedReservedWord),this.index=r}return{type:e,value:n,lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},e.prototype.scanPunctuator=function(){var e=this.index,t=this.source[this.index];switch(t){case"(":case"{":"{"===t&&this.curlyStack.push("{"),++this.index;break;case".":++this.index,"."===this.source[this.index]&&"."===this.source[this.index+1]&&(this.index+=2,t="...");break;case"}":++this.index,this.curlyStack.pop();break;case")":case";":case",":case"[":case"]":case":":case"?":case"~":++this.index;break;default:t=this.source.substr(this.index,4),">>>="===t?this.index+=4:(t=t.substr(0,3),"==="===t||"!=="===t||">>>"===t||"<<="===t||">>="===t||"**="===t?this.index+=3:(t=t.substr(0,2),"&&"===t||"||"===t||"=="===t||"!="===t||"+="===t||"-="===t||"*="===t||"/="===t||"++"===t||"--"===t||"<<"===t||">>"===t||"&="===t||"|="===t||"^="===t||"%="===t||"<="===t||">="===t||"=>"===t||"**"===t?this.index+=2:(t=this.source[this.index],"<>=!+-*%&|^/".indexOf(t)>=0&&++this.index)))}return this.index===e&&this.throwUnexpectedToken(),{type:7,value:t,lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanHexLiteral=function(e){for(var t="";!this.eof()&&a.Character.isHexDigit(this.source.charCodeAt(this.index));)t+=this.source[this.index++];return 0===t.length&&this.throwUnexpectedToken(),a.Character.isIdentifierStart(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(),{type:6,value:parseInt("0x"+t,16),lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanBinaryLiteral=function(e){for(var t,n="";!this.eof()&&("0"===(t=this.source[this.index])||"1"===t);)n+=this.source[this.index++];return 0===n.length&&this.throwUnexpectedToken(),this.eof()||(t=this.source.charCodeAt(this.index),(a.Character.isIdentifierStart(t)||a.Character.isDecimalDigit(t))&&this.throwUnexpectedToken()),{type:6,value:parseInt(n,2),lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanOctalLiteral=function(e,t){var n="",r=!1;for(a.Character.isOctalDigit(e.charCodeAt(0))?(r=!0,n="0"+this.source[this.index++]):++this.index;!this.eof()&&a.Character.isOctalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];return r||0!==n.length||this.throwUnexpectedToken(),(a.Character.isIdentifierStart(this.source.charCodeAt(this.index))||a.Character.isDecimalDigit(this.source.charCodeAt(this.index)))&&this.throwUnexpectedToken(),{type:6,value:parseInt(n,8),octal:r,lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},e.prototype.isImplicitOctalLiteral=function(){for(var e=this.index+1;e<this.length;++e){var t=this.source[e];if("8"===t||"9"===t)return!1;if(!a.Character.isOctalDigit(t.charCodeAt(0)))return!0}return!0},e.prototype.scanNumericLiteral=function(){var e=this.index,t=this.source[e];o.assert(a.Character.isDecimalDigit(t.charCodeAt(0))||"."===t,"Numeric literal must start with a decimal digit or a decimal point");var n="";if("."!==t){if(n=this.source[this.index++],t=this.source[this.index],"0"===n){if("x"===t||"X"===t)return++this.index,this.scanHexLiteral(e);if("b"===t||"B"===t)return++this.index,this.scanBinaryLiteral(e);if("o"===t||"O"===t)return this.scanOctalLiteral(t,e);if(t&&a.Character.isOctalDigit(t.charCodeAt(0))&&this.isImplicitOctalLiteral())return this.scanOctalLiteral(t,e)}for(;a.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];t=this.source[this.index]}if("."===t){for(n+=this.source[this.index++];a.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];t=this.source[this.index]}if("e"===t||"E"===t)if(n+=this.source[this.index++],t=this.source[this.index],"+"!==t&&"-"!==t||(n+=this.source[this.index++]),a.Character.isDecimalDigit(this.source.charCodeAt(this.index)))for(;a.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];else this.throwUnexpectedToken();return a.Character.isIdentifierStart(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(),{type:6,value:parseFloat(n),lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanStringLiteral=function(){var e=this.index,t=this.source[e];o.assert("'"===t||'"'===t,"String literal must starts with a quote"),++this.index;for(var n=!1,r="";!this.eof();){var i=this.source[this.index++];if(i===t){t="";break}if("\\"===i)if((i=this.source[this.index++])&&a.Character.isLineTerminator(i.charCodeAt(0)))++this.lineNumber,"\r"===i&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index;else switch(i){case"u":if("{"===this.source[this.index])++this.index,r+=this.scanUnicodeCodePointEscape();else{var u=this.scanHexEscape(i);null===u&&this.throwUnexpectedToken(),r+=u}break;case"x":var l=this.scanHexEscape(i);null===l&&this.throwUnexpectedToken(s.Messages.InvalidHexEscapeSequence),r+=l;break;case"n":r+="\n";break;case"r":r+="\r";break;case"t":r+="\t";break;case"b":r+="\b";break;case"f":r+="\f";break;case"v":r+="\v";break;case"8":case"9":r+=i,this.tolerateUnexpectedToken();break;default:if(i&&a.Character.isOctalDigit(i.charCodeAt(0))){var c=this.octalToDecimal(i);n=c.octal||n,r+=String.fromCharCode(c.code)}else r+=i}else{if(a.Character.isLineTerminator(i.charCodeAt(0)))break;r+=i}}return""!==t&&(this.index=e,this.throwUnexpectedToken()),{type:8,value:r,octal:n,lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanTemplate=function(){var e="",t=!1,n=this.index,r="`"===this.source[n],i=!1,o=2;for(++this.index;!this.eof();){var u=this.source[this.index++];if("`"===u){o=1,i=!0,t=!0;break}if("$"===u){if("{"===this.source[this.index]){this.curlyStack.push("${"),++this.index,t=!0;break}e+=u}else if("\\"===u)if(u=this.source[this.index++],a.Character.isLineTerminator(u.charCodeAt(0)))++this.lineNumber,"\r"===u&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index;else switch(u){case"n":e+="\n";break;case"r":e+="\r";break;case"t":e+="\t";break;case"u":if("{"===this.source[this.index])++this.index,e+=this.scanUnicodeCodePointEscape();else{var l=this.index,c=this.scanHexEscape(u);null!==c?e+=c:(this.index=l,e+=u)}break;case"x":var p=this.scanHexEscape(u);null===p&&this.throwUnexpectedToken(s.Messages.InvalidHexEscapeSequence),e+=p;break;case"b":e+="\b";break;case"f":e+="\f";break;case"v":e+="\v";break;default:"0"===u?(a.Character.isDecimalDigit(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(s.Messages.TemplateOctalLiteral),e+="\0"):a.Character.isOctalDigit(u.charCodeAt(0))?this.throwUnexpectedToken(s.Messages.TemplateOctalLiteral):e+=u}else a.Character.isLineTerminator(u.charCodeAt(0))?(++this.lineNumber,"\r"===u&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index,e+="\n"):e+=u}return t||this.throwUnexpectedToken(),r||this.curlyStack.pop(),{type:10,value:this.source.slice(n+1,this.index-o),cooked:e,head:r,tail:i,lineNumber:this.lineNumber,lineStart:this.lineStart,start:n,end:this.index}},e.prototype.testRegExp=function(e,t){var n=e,r=this;t.indexOf("u")>=0&&(n=n.replace(/\\u\{([0-9a-fA-F]+)\}|\\u([a-fA-F0-9]{4})/g,function(e,t,n){var i=parseInt(t||n,16);return i>1114111&&r.throwUnexpectedToken(s.Messages.InvalidRegExp),i<=65535?String.fromCharCode(i):"￿"}).replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,"￿"));try{RegExp(n)}catch(e){this.throwUnexpectedToken(s.Messages.InvalidRegExp)}try{return new RegExp(e,t)}catch(e){return null}},e.prototype.scanRegExpBody=function(){var e=this.source[this.index];o.assert("/"===e,"Regular expression literal must start with a slash");for(var t=this.source[this.index++],n=!1,r=!1;!this.eof();)if(e=this.source[this.index++],t+=e,"\\"===e)e=this.source[this.index++],a.Character.isLineTerminator(e.charCodeAt(0))&&this.throwUnexpectedToken(s.Messages.UnterminatedRegExp),t+=e;else if(a.Character.isLineTerminator(e.charCodeAt(0)))this.throwUnexpectedToken(s.Messages.UnterminatedRegExp);else if(n)"]"===e&&(n=!1);else{if("/"===e){r=!0;break}"["===e&&(n=!0)}return r||this.throwUnexpectedToken(s.Messages.UnterminatedRegExp),t.substr(1,t.length-2)},e.prototype.scanRegExpFlags=function(){for(var e="",t="";!this.eof();){var n=this.source[this.index];if(!a.Character.isIdentifierPart(n.charCodeAt(0)))break;if(++this.index,"\\"!==n||this.eof())t+=n,e+=n;else if("u"===(n=this.source[this.index])){++this.index;var r=this.index,i=this.scanHexEscape("u");if(null!==i)for(t+=i,e+="\\u";r<this.index;++r)e+=this.source[r];else this.index=r,t+="u",e+="\\u";this.tolerateUnexpectedToken()}else e+="\\",this.tolerateUnexpectedToken()}return t},e.prototype.scanRegExp=function(){var e=this.index,t=this.scanRegExpBody(),n=this.scanRegExpFlags();return{type:9,value:"",pattern:t,flags:n,regex:this.testRegExp(t,n),lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.lex=function(){if(this.eof())return{type:2,value:"",lineNumber:this.lineNumber,lineStart:this.lineStart,start:this.index,end:this.index};var e=this.source.charCodeAt(this.index);return a.Character.isIdentifierStart(e)?this.scanIdentifier():40===e||41===e||59===e?this.scanPunctuator():39===e||34===e?this.scanStringLiteral():46===e?a.Character.isDecimalDigit(this.source.charCodeAt(this.index+1))?this.scanNumericLiteral():this.scanPunctuator():a.Character.isDecimalDigit(e)?this.scanNumericLiteral():96===e||125===e&&"${"===this.curlyStack[this.curlyStack.length-1]?this.scanTemplate():e>=55296&&e<57343&&a.Character.isIdentifierStart(this.codePointAt(this.index))?this.scanIdentifier():this.scanPunctuator()},e}();t.Scanner=u},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.TokenName={},t.TokenName[1]="Boolean",t.TokenName[2]="<end>",t.TokenName[3]="Identifier",t.TokenName[4]="Keyword",t.TokenName[5]="Null",t.TokenName[6]="Numeric",t.TokenName[7]="Punctuator",t.TokenName[8]="String",t.TokenName[9]="RegularExpression",t.TokenName[10]="Template"},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.XHTMLEntities={quot:'"',amp:"&",apos:"'",gt:">",nbsp:" ",iexcl:"¡",cent:"¢",pound:"£",curren:"¤",yen:"¥",brvbar:"¦",sect:"§",uml:"¨",copy:"©",ordf:"ª",laquo:"«",not:"¬",shy:"­",reg:"®",macr:"¯",deg:"°",plusmn:"±",sup2:"²",sup3:"³",acute:"´",micro:"µ",para:"¶",middot:"·",cedil:"¸",sup1:"¹",ordm:"º",raquo:"»",frac14:"¼",frac12:"½",frac34:"¾",iquest:"¿",Agrave:"À",Aacute:"Á",Acirc:"Â",Atilde:"Ã",Auml:"Ä",Aring:"Å",AElig:"Æ",Ccedil:"Ç",Egrave:"È",Eacute:"É",Ecirc:"Ê",Euml:"Ë",Igrave:"Ì",Iacute:"Í",Icirc:"Î",Iuml:"Ï",ETH:"Ð",Ntilde:"Ñ",Ograve:"Ò",Oacute:"Ó",Ocirc:"Ô",Otilde:"Õ",Ouml:"Ö",times:"×",Oslash:"Ø",Ugrave:"Ù",Uacute:"Ú",Ucirc:"Û",Uuml:"Ü",Yacute:"Ý",THORN:"Þ",szlig:"ß",agrave:"à",aacute:"á",acirc:"â",atilde:"ã",auml:"ä",aring:"å",aelig:"æ",ccedil:"ç",egrave:"è",eacute:"é",ecirc:"ê",euml:"ë",igrave:"ì",iacute:"í",icirc:"î",iuml:"ï",eth:"ð",ntilde:"ñ",ograve:"ò",oacute:"ó",ocirc:"ô",otilde:"õ",ouml:"ö",divide:"÷",oslash:"ø",ugrave:"ù",uacute:"ú",ucirc:"û",uuml:"ü",yacute:"ý",thorn:"þ",yuml:"ÿ",OElig:"Œ",oelig:"œ",Scaron:"Š",scaron:"š",Yuml:"Ÿ",fnof:"ƒ",circ:"ˆ",tilde:"˜",Alpha:"Α",Beta:"Β",Gamma:"Γ",Delta:"Δ",Epsilon:"Ε",Zeta:"Ζ",Eta:"Η",Theta:"Θ",Iota:"Ι",Kappa:"Κ",Lambda:"Λ",Mu:"Μ",Nu:"Ν",Xi:"Ξ",Omicron:"Ο",Pi:"Π",Rho:"Ρ",Sigma:"Σ",Tau:"Τ",Upsilon:"Υ",Phi:"Φ",Chi:"Χ",Psi:"Ψ",Omega:"Ω",alpha:"α",beta:"β",gamma:"γ",delta:"δ",epsilon:"ε",zeta:"ζ",eta:"η",theta:"θ",iota:"ι",kappa:"κ",lambda:"λ",mu:"μ",nu:"ν",xi:"ξ",omicron:"ο",pi:"π",rho:"ρ",sigmaf:"ς",sigma:"σ",tau:"τ",upsilon:"υ",phi:"φ",chi:"χ",psi:"ψ",omega:"ω",thetasym:"ϑ",upsih:"ϒ",piv:"ϖ",ensp:" ",emsp:" ",thinsp:" ",zwnj:"‌",zwj:"‍",lrm:"‎",rlm:"‏",ndash:"–",mdash:"—",lsquo:"‘",rsquo:"’",sbquo:"‚",ldquo:"“",rdquo:"”",bdquo:"„",dagger:"†",Dagger:"‡",bull:"•",hellip:"…",permil:"‰",prime:"′",Prime:"″",lsaquo:"‹",rsaquo:"›",oline:"‾",frasl:"⁄",euro:"€",image:"ℑ",weierp:"℘",real:"ℜ",trade:"™",alefsym:"ℵ",larr:"←",uarr:"↑",rarr:"→",darr:"↓",harr:"↔",crarr:"↵",lArr:"⇐",uArr:"⇑",rArr:"⇒",dArr:"⇓",hArr:"⇔",forall:"∀",part:"∂",exist:"∃",empty:"∅",nabla:"∇",isin:"∈",notin:"∉",ni:"∋",prod:"∏",sum:"∑",minus:"−",lowast:"∗",radic:"√",prop:"∝",infin:"∞",ang:"∠",and:"∧",or:"∨",cap:"∩",cup:"∪",int:"∫",there4:"∴",sim:"∼",cong:"≅",asymp:"≈",ne:"≠",equiv:"≡",le:"≤",ge:"≥",sub:"⊂",sup:"⊃",nsub:"⊄",sube:"⊆",supe:"⊇",oplus:"⊕",otimes:"⊗",perp:"⊥",sdot:"⋅",lceil:"⌈",rceil:"⌉",lfloor:"⌊",rfloor:"⌋",loz:"◊",spades:"♠",clubs:"♣",hearts:"♥",diams:"♦",lang:"⟨",rang:"⟩"}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(10),i=n(12),o=n(13),a=function(){function e(){this.values=[],this.curly=this.paren=-1}return e.prototype.beforeFunctionExpression=function(e){return["(","{","[","in","typeof","instanceof","new","return","case","delete","throw","void","=","+=","-=","*=","**=","/=","%=","<<=",">>=",">>>=","&=","|=","^=",",","+","-","*","**","/","%","++","--","<<",">>",">>>","&","|","^","!","~","&&","||","?",":","===","==",">=","<=","<",">","!=","!=="].indexOf(e)>=0},e.prototype.isRegexStart=function(){var e=this.values[this.values.length-1],t=null!==e;switch(e){case"this":case"]":t=!1;break;case")":var n=this.values[this.paren-1];t="if"===n||"while"===n||"for"===n||"with"===n;break;case"}":if(t=!1,"function"===this.values[this.curly-3]){var r=this.values[this.curly-4];t=!!r&&!this.beforeFunctionExpression(r)}else if("function"===this.values[this.curly-4]){var r=this.values[this.curly-5];t=!r||!this.beforeFunctionExpression(r)}}return t},e.prototype.push=function(e){7===e.type||4===e.type?("{"===e.value?this.curly=this.values.length:"("===e.value&&(this.paren=this.values.length),this.values.push(e.value)):this.values.push(null)},e}(),s=function(){function e(e,t){this.errorHandler=new r.ErrorHandler,this.errorHandler.tolerant=!!t&&("boolean"==typeof t.tolerant&&t.tolerant),this.scanner=new i.Scanner(e,this.errorHandler),this.scanner.trackComment=!!t&&("boolean"==typeof t.comment&&t.comment),this.trackRange=!!t&&("boolean"==typeof t.range&&t.range),this.trackLoc=!!t&&("boolean"==typeof t.loc&&t.loc),this.buffer=[],this.reader=new a}return e.prototype.errors=function(){return this.errorHandler.errors},e.prototype.getNextToken=function(){if(0===this.buffer.length){var e=this.scanner.scanComments();if(this.scanner.trackComment)for(var t=0;t<e.length;++t){var n=e[t],r=this.scanner.source.slice(n.slice[0],n.slice[1]),i={type:n.multiLine?"BlockComment":"LineComment",value:r};this.trackRange&&(i.range=n.range),this.trackLoc&&(i.loc=n.loc),this.buffer.push(i)}if(!this.scanner.eof()){var a=void 0;this.trackLoc&&(a={start:{line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart},end:{}});var s="/"===this.scanner.source[this.scanner.index]&&this.reader.isRegexStart(),u=s?this.scanner.scanRegExp():this.scanner.lex();this.reader.push(u);var l={type:o.TokenName[u.type],value:this.scanner.source.slice(u.start,u.end)};if(this.trackRange&&(l.range=[u.start,u.end]),this.trackLoc&&(a.end={line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart},l.loc=a),9===u.type){var c=u.pattern,p=u.flags;l.regex={pattern:c,flags:p}}this.buffer.push(l)}}return this.buffer.shift()},e}();t.Tokenizer=s}])})},function(e,t,n){"use strict";var r,i,o,a,s,u,l,c=n(141),p=n(58),f=Function.prototype.apply,h=Function.prototype.call,d=Object.create,m=Object.defineProperty,v=Object.defineProperties,g=Object.prototype.hasOwnProperty,y={configurable:!0,enumerable:!1,writable:!0};r=function(e,t){var n;return p(t),g.call(this,"__ee__")?n=this.__ee__:(n=y.value=d(null),m(this,"__ee__",y),y.value=null),n[e]?"object"==typeof n[e]?n[e].push(t):n[e]=[n[e],t]:n[e]=t,this},i=function(e,t){var n,i;return p(t),i=this,r.call(this,e,n=function(){o.call(i,e,n),f.call(t,this,arguments)}),n.__eeOnceListener__=t,this},o=function(e,t){var n,r,i,o;if(p(t),!g.call(this,"__ee__"))return this;if(n=this.__ee__,!n[e])return this;if("object"==typeof(r=n[e]))for(o=0;i=r[o];++o)i!==t&&i.__eeOnceListener__!==t||(2===r.length?n[e]=r[o?0:1]:r.splice(o,1));else r!==t&&r.__eeOnceListener__!==t||delete n[e];return this},a=function(e){var t,n,r,i,o;if(g.call(this,"__ee__")&&(i=this.__ee__[e]))if("object"==typeof i){for(n=arguments.length,o=new Array(n-1),t=1;t<n;++t)o[t-1]=arguments[t];for(i=i.slice(),t=0;r=i[t];++t)f.call(r,this,o)}else switch(arguments.length){case 1:h.call(i,this);break;case 2:h.call(i,this,arguments[1]);break;case 3:h.call(i,this,arguments[1],arguments[2]);break;default:for(n=arguments.length,o=new Array(n-1),t=1;t<n;++t)o[t-1]=arguments[t];f.call(i,this,o)}},s={on:r,once:i,off:o,emit:a},u={on:c(r),once:c(i),off:c(o),emit:c(a)},l=v({},u),e.exports=t=function(e){return null==e?d(l):v(Object(e),u)},t.methods=s},function(e,t){/*!
-+ * https://github.com/Starcounter-Jack/JSON-Patch
-+ * json-patch-duplex.js version: 1.2.2
-+ * (c) 2013 Joachim Wester
-+ * MIT license
-+ */
-+var n;if(function(e){function t(e,n){switch(typeof e){case"undefined":case"boolean":case"string":case"number":return e===n;case"object":if(null===e)return null===n;if(k(e)){if(!k(n)||e.length!==n.length)return!1;for(var r=0,i=e.length;r<i;r++)if(!t(e[r],n[r]))return!1;return!0}for(var o=E(e),a=E(n),s=0;s<o.length;s++){var u=o[s];if(!t(e[u],n[u]))return!1;var l=a.indexOf(u);l>=0&&a.splice(l,1)}for(var c=0;c<a.length;c++){var p=a[c];if(!t(e[p],n[p]))return!1}return!0;default:return!1}}function n(e){for(var t=0,n=A.length;t<n;t++)if(A[t].obj===e)return A[t]}function r(e,t){for(var n=0,r=e.observers.length;n<r;n++)if(e.observers[n].callback===t)return e.observers[n].observer}function i(e,t){for(var n=0,r=e.observers.length;n<r;n++)if(e.observers[n].observer===t)return void e.observers.splice(n,1)}function o(e,t){t.unobserve()}function a(e,t){var o,a=[],u=n(e);if(u?o=r(u,t):(u=new D(e),A.push(u)),o)return o;if(o={},u.value=c(e),t){o.callback=t,o.next=null;var l=function(){s(o)},p=function(){clearTimeout(o.next),o.next=setTimeout(l)};"undefined"!=typeof window&&(window.addEventListener?(window.addEventListener("mouseup",p),window.addEventListener("keyup",p),window.addEventListener("mousedown",p),window.addEventListener("keydown",p),window.addEventListener("change",p)):(document.documentElement.attachEvent("onmouseup",p),document.documentElement.attachEvent("onkeyup",p),document.documentElement.attachEvent("onmousedown",p),document.documentElement.attachEvent("onkeydown",p),document.documentElement.attachEvent("onchange",p)))}return o.patches=a,o.object=e,o.unobserve=function(){s(o),clearTimeout(o.next),i(u,o),"undefined"!=typeof window&&(window.removeEventListener?(window.removeEventListener("mouseup",p),window.removeEventListener("keyup",p),window.removeEventListener("mousedown",p),window.removeEventListener("keydown",p)):(document.documentElement.detachEvent("onmouseup",p),document.documentElement.detachEvent("onkeyup",p),document.documentElement.detachEvent("onmousedown",p),document.documentElement.detachEvent("onkeydown",p)))},u.observers.push(new O(t,o)),o}function s(e){for(var t,n=0,r=A.length;n<r;n++)if(A[n].obj===e.object){t=A[n];break}u(t.value,e.object,e.patches,""),e.patches.length&&m(t.value,e.patches);var i=e.patches;return i.length>0&&(e.patches=[],e.callback&&e.callback(i)),i}function u(e,t,n,r){if(t!==e){"function"==typeof t.toJSON&&(t=t.toJSON());for(var i=E(t),o=E(e),a=!1,s=o.length-1;s>=0;s--){var l=o[s],f=e[l];if(!t.hasOwnProperty(l)||void 0===t[l]&&void 0!==f&&!1===k(t))n.push({op:"remove",path:r+"/"+p(l)}),a=!0;else{var h=t[l];"object"==typeof f&&null!=f&&"object"==typeof h&&null!=h?u(f,h,n,r+"/"+p(l)):f!==h&&(!0,n.push({op:"replace",path:r+"/"+p(l),value:c(h)}))}}if(a||i.length!=o.length)for(var s=0;s<i.length;s++){var l=i[s];e.hasOwnProperty(l)||void 0===t[l]||n.push({op:"add",path:r+"/"+p(l),value:c(t[l])})}}}function l(e){for(var t,n=0,r=e.length;n<r;){t=e.charCodeAt(n);{if(!(t>=48&&t<=57))return!1;n++}}return!0}function c(e){switch(typeof e){case"object":return JSON.parse(JSON.stringify(e));case"undefined":return null;default:return e}}function p(e){return-1===e.indexOf("/")&&-1===e.indexOf("~")?e:e.replace(/~/g,"~0").replace(/\//g,"~1")}function f(e){return e.replace(/~1/g,"/").replace(/~0/g,"~")}function h(e,t){if(""==t)return e;var n={op:"_get",path:t};return d(e,n),n.value}function d(e,n,r,i){if(void 0===r&&(r=!1),void 0===i&&(i=!0),r&&("function"==typeof r?r(n,0,e,n.path):b(n,0)),""===n.path){var o={newDocument:e};if("add"===n.op)return o.newDocument=n.value,o;if("replace"===n.op)return o.newDocument=n.value,o.removed=e,o;if("move"===n.op||"copy"===n.op)return o.newDocument=h(e,n.from),"move"===n.op&&(o.removed=e),o;if("test"===n.op){if(o.test=t(e,n.value),!1===o.test)throw new M("Test operation failed","TEST_OPERATION_FAILED",0,n,e);return o.newDocument=e,o}if("remove"===n.op)return o.removed=e,o.newDocument=null,o;if("_get"===n.op)return n.value=e,o;if(r)throw new M("Operation `op` property is not one of operations defined in RFC-6902","OPERATION_OP_INVALID",0,n,e);return o}i||(e=c(e));var a=n.path||"",s=a.split("/"),u=e,p=1,d=s.length,m=void 0,v=void 0,g=void 0;for(g="function"==typeof r?r:b;;){if(v=s[p],r&&void 0===m&&(void 0===u[v]?m=s.slice(0,p).join("/"):p==d-1&&(m=n.path),void 0!==m&&g(n,0,e,m)),p++,k(u)){if("-"===v)v=u.length;else{if(r&&!l(v))throw new M("Expected an unsigned base-10 integer value, making the new referenced value the array element with the zero-based index","OPERATION_PATH_ILLEGAL_ARRAY_INDEX",0,n.path,n);v=~~v}if(p>=d){if(r&&"add"===n.op&&v>u.length)throw new M("The specified index MUST NOT be greater than the number of elements in the array","OPERATION_VALUE_OUT_OF_BOUNDS",0,n.path,n);var o=C[n.op].call(n,u,v,e);if(!1===o.test)throw new M("Test operation failed","TEST_OPERATION_FAILED",0,n,e);return o}}else if(v&&-1!=v.indexOf("~")&&(v=f(v)),p>=d){var o=S[n.op].call(n,u,v,e);if(!1===o.test)throw new M("Test operation failed","TEST_OPERATION_FAILED",0,n,e);return o}u=u[v]}}function m(e,t,n){for(var r=new Array(t.length),i=0,o=t.length;i<o;i++)r[i]=d(e,t[i],n),e=r[i].newDocument;return r.newDocument=e,r}function v(e,t,n){console.warn("jsonpatch.apply is deprecated, please use `applyPatch` for applying patch sequences, or `applyOperation` to apply individual operations.");for(var r=new Array(t.length),i=0,o=t.length;i<o;i++)!function(i,o){if(""==t[i].path&&"remove"!=t[i].op&&"test"!=t[i].op){var a;if("_get"==t[i].op)return t[i].value=e,"continue";"replace"!=t[i].op&&"move"!=t[i].op||(r[i]=c(e)),"copy"!=t[i].op&&"move"!=t[i].op||(a=h(e,t[i].from)),"replace"!=t[i].op&&"add"!=t[i].op||(a=t[i].value),Object.keys(e).forEach(function(t){return delete e[t]}),Object.keys(a).forEach(function(t){return e[t]=a[t]})}else r[i]=d(e,t[i],n),r[i]=r[i].removed||r[i].test}(i);return r}function g(e,t){var n=d(e,t);if(!1===n.test)throw new M("Test operation failed","TEST_OPERATION_FAILED",0,t,e);return n.newDocument}function y(e,t){function n(){this.constructor=e}for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r]);e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}function _(e){if(void 0===e)return!0;if(e)if(k(e)){for(var t=0,n=e.length;t<n;t++)if(_(e[t]))return!0}else if("object"==typeof e)for(var r=E(e),i=r.length,t=0;t<i;t++)if(_(e[r[t]]))return!0;return!1}function b(e,t,n,r){if("object"!=typeof e||null===e||k(e))throw new M("Operation is not an object","OPERATION_NOT_AN_OBJECT",t,e,n);if(!S[e.op])throw new M("Operation `op` property is not one of operations defined in RFC-6902","OPERATION_OP_INVALID",t,e,n);if("string"!=typeof e.path)throw new M("Operation `path` property is not a string","OPERATION_PATH_INVALID",t,e,n);if(0!==e.path.indexOf("/")&&e.path.length>0)throw new M('Operation `path` property must start with "/"',"OPERATION_PATH_INVALID",t,e,n);if(("move"===e.op||"copy"===e.op)&&"string"!=typeof e.from)throw new M("Operation `from` property is not present (applicable in `move` and `copy` operations)","OPERATION_FROM_REQUIRED",t,e,n);if(("add"===e.op||"replace"===e.op||"test"===e.op)&&void 0===e.value)throw new M("Operation `value` property is not present (applicable in `add`, `replace` and `test` operations)","OPERATION_VALUE_REQUIRED",t,e,n);if(("add"===e.op||"replace"===e.op||"test"===e.op)&&_(e.value))throw new M("Operation `value` property is not present (applicable in `add`, `replace` and `test` operations)","OPERATION_VALUE_CANNOT_CONTAIN_UNDEFINED",t,e,n);if(n)if("add"==e.op){var i=e.path.split("/").length,o=r.split("/").length;if(i!==o+1&&i!==o)throw new M("Cannot perform an `add` operation at the desired path","OPERATION_PATH_CANNOT_ADD",t,e,n)}else if("replace"===e.op||"remove"===e.op||"_get"===e.op){if(e.path!==r)throw new M("Cannot perform the operation at a path that does not exist","OPERATION_PATH_UNRESOLVABLE",t,e,n)}else if("move"===e.op||"copy"===e.op){var a={op:"_get",path:e.from,value:void 0},s=x([a],n);if(s&&"OPERATION_PATH_UNRESOLVABLE"===s.name)throw new M("Cannot perform the operation from a path that does not exist","OPERATION_FROM_UNRESOLVABLE",t,e,n)}}function x(e,t,n){try{if(!k(e))throw new M("Patch sequence must be an array","SEQUENCE_NOT_AN_ARRAY");if(t)m(c(t),c(e),n||!0);else{n=n||b;for(var r=0;r<e.length;r++)n(e[r],r,t,void 0)}}catch(e){if(e instanceof M)return e;throw e}}function w(e,t){var n=[];return u(e,t,n,""),n}var k,E=function(e){if(k(e)){for(var t=new Array(e.length),n=0;n<t.length;n++)t[n]=""+n;return t}if(Object.keys)return Object.keys(e);var t=[];for(var r in e)e.hasOwnProperty(r)&&t.push(r);return t},S={add:function(e,t,n){return e[t]=this.value,{newDocument:n}},remove:function(e,t,n){var r=e[t];return delete e[t],{newDocument:n,removed:r}},replace:function(e,t,n){var r=e[t];return e[t]=this.value,{newDocument:n,removed:r}},move:function(e,t,n){var r=h(n,this.path);r&&(r=c(r));var i=d(n,{op:"remove",path:this.from}).removed;return d(n,{op:"add",path:this.path,value:i}),{newDocument:n,removed:r}},copy:function(e,t,n){var r=h(n,this.from);return d(n,{op:"add",path:this.path,value:c(r)}),{newDocument:n}},test:function(e,n,r){return{newDocument:r,test:t(e[n],this.value)}},_get:function(e,t,n){return this.value=e[t],{newDocument:n}}},C={add:function(e,t,n){return e.splice(t,0,this.value),{newDocument:n,index:t}},remove:function(e,t,n){return{newDocument:n,removed:e.splice(t,1)[0]}},replace:function(e,t,n){var r=e[t];return e[t]=this.value,{newDocument:n,removed:r}},move:S.move,copy:S.copy,test:S.test,_get:S._get};k=Array.isArray?Array.isArray:function(e){return e.push&&"number"==typeof e.length};var A=[],D=function(){function e(e){this.observers=[],this.obj=e}return e}(),O=function(){function e(e,t){this.callback=e,this.observer=t}return e}();e.unobserve=o,e.observe=a,e.generate=s;var k;k=Array.isArray?Array.isArray:function(e){return e.push&&"number"==typeof e.length},e.deepClone=c,e.escapePathComponent=p,e.unescapePathComponent=f,e.getValueByPointer=h,e.applyOperation=d,e.applyPatch=m,e.apply=v,e.applyReducer=g;var M=function(e){function t(t,n,r,i,o){e.call(this,t),this.message=t,this.name=n,this.index=r,this.operation=i,this.tree=o}return y(t,e),t}(Error);e.JsonPatchError=M,e.validator=b,e.validate=x,e.compare=w}(n||(n={})),void 0!==t)t.apply=n.apply,t.applyPatch=n.applyPatch,t.applyOperation=n.applyOperation,t.applyReducer=n.applyReducer,t.getValueByPointer=n.getValueByPointer,t.deepClone=n.deepClone,t.escapePathComponent=n.escapePathComponent,t.unescapePathComponent=n.unescapePathComponent,t.observe=n.observe,t.unobserve=n.unobserve,t.generate=n.generate,t.compare=n.compare,t.validate=n.validate,t.validator=n.validator,t.JsonPatchError=n.JsonPatchError;else var t={},r=!0;Object.defineProperty(t,"__esModule",{value:!0}),t.default=n,r&&(t=void 0)},function(e,t,n){"use strict";function r(e){return e.replace(i,function(e,t){return t.toUpperCase()})}var i=/-(.)/g;e.exports=r},function(e,t,n){"use strict";function r(e){return i(e.replace(o,"ms-"))}var i=n(746),o=/^-ms-/;e.exports=r},function(e,t,n){"use strict";function r(e,t){return!(!e||!t)&&(e===t||!i(e)&&(i(t)?r(e,t.parentNode):"contains"in e?e.contains(t):!!e.compareDocumentPosition&&!!(16&e.compareDocumentPosition(t))))}var i=n(756);e.exports=r},function(e,t,n){"use strict";function r(e){var t=e.length;if((Array.isArray(e)||"object"!=typeof e&&"function"!=typeof e)&&a(!1),"number"!=typeof t&&a(!1),0===t||t-1 in e||a(!1),"function"==typeof e.callee&&a(!1),e.hasOwnProperty)try{return Array.prototype.slice.call(e)}catch(e){}for(var n=Array(t),r=0;r<t;r++)n[r]=e[r];return n}function i(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"length"in e&&!("setInterval"in e)&&"number"!=typeof e.nodeType&&(Array.isArray(e)||"callee"in e||"item"in e)}function o(e){return i(e)?Array.isArray(e)?e.slice():r(e):[e]}var a=n(8);e.exports=o},function(e,t,n){"use strict";function r(e){var t=e.match(c);return t&&t[1].toLowerCase()}function i(e,t){var n=l;l||u(!1);var i=r(e),o=i&&s(i);if(o){n.innerHTML=o[1]+e+o[2];for(var c=o[0];c--;)n=n.lastChild}else n.innerHTML=e;var p=n.getElementsByTagName("script");p.length&&(t||u(!1),a(p).forEach(t));for(var f=Array.from(n.childNodes);n.lastChild;)n.removeChild(n.lastChild);return f}var o=n(25),a=n(749),s=n(751),u=n(8),l=o.canUseDOM?document.createElement("div"):null,c=/^\s*<(\w+)/;e.exports=i},function(e,t,n){"use strict";function r(e){return a||o(!1),f.hasOwnProperty(e)||(e="*"),s.hasOwnProperty(e)||(a.innerHTML="*"===e?"<link />":"<"+e+"></"+e+">",s[e]=!a.firstChild),s[e]?f[e]:null}var i=n(25),o=n(8),a=i.canUseDOM?document.createElement("div"):null,s={},u=[1,'<select multiple="true">',"</select>"],l=[1,"<table>","</table>"],c=[3,"<table><tbody><tr>","</tr></tbody></table>"],p=[1,'<svg xmlns="http://www.w3.org/2000/svg">',"</svg>"],f={"*":[1,"?<div>","</div>"],area:[1,"<map>","</map>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],legend:[1,"<fieldset>","</fieldset>"],param:[1,"<object>","</object>"],tr:[2,"<table><tbody>","</tbody></table>"],optgroup:u,option:u,caption:l,colgroup:l,tbody:l,tfoot:l,thead:l,td:c,th:c};["circle","clipPath","defs","ellipse","g","image","line","linearGradient","mask","path","pattern","polygon","polyline","radialGradient","rect","stop","text","tspan"].forEach(function(e){f[e]=p,s[e]=!0}),e.exports=r},function(e,t,n){"use strict";function r(e){return e.Window&&e instanceof e.Window?{x:e.pageXOffset||e.document.documentElement.scrollLeft,y:e.pageYOffset||e.document.documentElement.scrollTop}:{x:e.scrollLeft,y:e.scrollTop}}e.exports=r},function(e,t,n){"use strict";function r(e){return e.replace(i,"-$1").toLowerCase()}var i=/([A-Z])/g;e.exports=r},function(e,t,n){"use strict";function r(e){return i(e).replace(o,"-ms-")}var i=n(753),o=/^ms-/;e.exports=r},function(e,t,n){"use strict";function r(e){var t=e?e.ownerDocument||e:document,n=t.defaultView||window;return!(!e||!("function"==typeof n.Node?e instanceof n.Node:"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName))}e.exports=r},function(e,t,n){"use strict";function r(e){return i(e)&&3==e.nodeType}var i=n(755);e.exports=r},function(e,t,n){"use strict";function r(e){var t={};return function(n){return t.hasOwnProperty(n)||(t[n]=e.call(this,n)),t[n]}}e.exports=r},function(e,t,n){"use strict";var r={childContextTypes:!0,contextTypes:!0,defaultProps:!0,displayName:!0,getDefaultProps:!0,mixins:!0,propTypes:!0,type:!0},i={name:!0,length:!0,prototype:!0,caller:!0,arguments:!0,arity:!0},o="function"==typeof Object.getOwnPropertySymbols;e.exports=function(e,t,n){if("string"!=typeof t){var a=Object.getOwnPropertyNames(t);o&&(a=a.concat(Object.getOwnPropertySymbols(t)));for(var s=0;s<a.length;++s)if(!(r[a[s]]||i[a[s]]||n&&n[a[s]]))try{e[a[s]]=t[a[s]]}catch(e){}}return e}},function(e,t,n){function r(e){this._cbs=e||{},this.events=[]}e.exports=r;var i=n(116).EVENTS;Object.keys(i).forEach(function(e){if(0===i[e])e="on"+e,r.prototype[e]=function(){this.events.push([e]),this._cbs[e]&&this._cbs[e]()};else if(1===i[e])e="on"+e,r.prototype[e]=function(t){this.events.push([e,t]),this._cbs[e]&&this._cbs[e](t)};else{if(2!==i[e])throw Error("wrong number of arguments");e="on"+e,r.prototype[e]=function(t,n){this.events.push([e,t,n]),this._cbs[e]&&this._cbs[e](t,n)}}}),r.prototype.onreset=function(){this.events=[],this._cbs.onreset&&this._cbs.onreset()},r.prototype.restart=function(){this._cbs.onreset&&this._cbs.onreset();for(var e=0,t=this.events.length;e<t;e++)if(this._cbs[this.events[e][0]]){var n=this.events[e].length;1===n?this._cbs[this.events[e][0]]():2===n?this._cbs[this.events[e][0]](this.events[e][1]):this._cbs[this.events[e][0]](this.events[e][1],this.events[e][2])}}},function(e,t,n){function r(e,t){this.init(e,t)}function i(e,t){return c.getElementsByTagName(e,t,!0)}function o(e,t){return c.getElementsByTagName(e,t,!0,1)[0]}function a(e,t,n){return c.getText(c.getElementsByTagName(e,t,n,1)).trim()}function s(e,t,n,r,i){var o=a(n,r,i);o&&(e[t]=o)}var u=n(116),l=u.DomHandler,c=u.DomUtils;n(42)(r,l),r.prototype.init=l;var p=function(e){return"rss"===e||"feed"===e||"rdf:RDF"===e};r.prototype.onend=function(){var e,t,n={},r=o(p,this.dom);r&&("feed"===r.name?(t=r.children,n.type="atom",s(n,"id","id",t),s(n,"title","title",t),(e=o("link",t))&&(e=e.attribs)&&(e=e.href)&&(n.link=e),s(n,"description","subtitle",t),(e=a("updated",t))&&(n.updated=new Date(e)),s(n,"author","email",t,!0),n.items=i("entry",t).map(function(e){var t,n={};return e=e.children,s(n,"id","id",e),s(n,"title","title",e),(t=o("link",e))&&(t=t.attribs)&&(t=t.href)&&(n.link=t),(t=a("summary",e)||a("content",e))&&(n.description=t),(t=a("updated",e))&&(n.pubDate=new Date(t)),n})):(t=o("channel",r.children).children,n.type=r.name.substr(0,3),n.id="",s(n,"title","title",t),s(n,"link","link",t),s(n,"description","description",t),(e=a("lastBuildDate",t))&&(n.updated=new Date(e)),s(n,"author","managingEditor",t,!0),n.items=i("item",r.children).map(function(e){var t,n={};return e=e.children,s(n,"id","guid",e),s(n,"title","title",e),s(n,"link","link",e),s(n,"description","description",e),(t=a("pubDate",e))&&(n.pubDate=new Date(t)),n}))),this.dom=n,l.prototype._handleCallback.call(this,r?null:Error("couldn't find root of feed"))},e.exports=r},function(e,t,n){function r(e){this._cbs=e||{}}e.exports=r;var i=n(116).EVENTS;Object.keys(i).forEach(function(e){if(0===i[e])e="on"+e,r.prototype[e]=function(){this._cbs[e]&&this._cbs[e]()};else if(1===i[e])e="on"+e,r.prototype[e]=function(t){this._cbs[e]&&this._cbs[e](t)};else{if(2!==i[e])throw Error("wrong number of arguments");e="on"+e,r.prototype[e]=function(t,n){this._cbs[e]&&this._cbs[e](t,n)}}})},function(e,t,n){function r(e){o.call(this,new i(this),e)}function i(e){this.scope=e}e.exports=r;var o=n(382);n(42)(r,o),r.prototype.readable=!0;var a=n(116).EVENTS;Object.keys(a).forEach(function(e){if(0===a[e])i.prototype["on"+e]=function(){this.scope.emit(e)};else if(1===a[e])i.prototype["on"+e]=function(t){this.scope.emit(e,t)};else{if(2!==a[e])throw Error("wrong number of arguments!");i.prototype["on"+e]=function(t,n){this.scope.emit(e,t,n)}}})},function(e,t,n){"use strict";function r(e){return e in a?a[e]:a[e]=e.replace(i,"-$&").toLowerCase().replace(o,"-ms-")}var i=/[A-Z]/g,o=/^ms-/,a={};e.exports=r},function(e,t){t.read=function(e,t,n,r,i){var o,a,s=8*i-r-1,u=(1<<s)-1,l=u>>1,c=-7,p=n?i-1:0,f=n?-1:1,h=e[t+p];for(p+=f,o=h&(1<<-c)-1,h>>=-c,c+=s;c>0;o=256*o+e[t+p],p+=f,c-=8);for(a=o&(1<<-c)-1,o>>=-c,c+=r;c>0;a=256*a+e[t+p],p+=f,c-=8);if(0===o)o=1-l;else{if(o===u)return a?NaN:1/0*(h?-1:1);a+=Math.pow(2,r),o-=l}return(h?-1:1)*a*Math.pow(2,o-r)},t.write=function(e,t,n,r,i,o){var a,s,u,l=8*o-i-1,c=(1<<l)-1,p=c>>1,f=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,h=r?0:o-1,d=r?1:-1,m=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(s=isNaN(t)?1:0,a=c):(a=Math.floor(Math.log(t)/Math.LN2),t*(u=Math.pow(2,-a))<1&&(a--,u*=2),t+=a+p>=1?f/u:f*Math.pow(2,1-p),t*u>=2&&(a++,u/=2),a+p>=c?(s=0,a=c):a+p>=1?(s=(t*u-1)*Math.pow(2,i),a+=p):(s=t*Math.pow(2,p-1)*Math.pow(2,i),a=0));i>=8;e[n+h]=255&s,h+=d,s/=256,i-=8);for(a=a<<i|s,l+=i;l>0;e[n+h]=255&a,h+=d,a/=256,l-=8);e[n+h-d]|=128*m}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e){var t=e.prefixMap,n=e.plugins,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:function(e){return e};return function(){function e(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};i(this,e);var r="undefined"!=typeof navigator?navigator.userAgent:void 0;if(this._userAgent=n.userAgent||r,this._keepUnprefixed=n.keepUnprefixed||!1,this._userAgent&&(this._browserInfo=(0,u.default)(this._userAgent)),!this._browserInfo||!this._browserInfo.cssPrefix)return this._useFallback=!0,!1;this.prefixedKeyframes=(0,c.default)(this._browserInfo.browserName,this._browserInfo.browserVersion,this._browserInfo.cssPrefix);var o=this._browserInfo.browserName&&t[this._browserInfo.browserName];if(o){this._requiresPrefix={};for(var a in o)o[a]>=this._browserInfo.browserVersion&&(this._requiresPrefix[a]=!0);this._hasPropsRequiringPrefix=Object.keys(this._requiresPrefix).length>0}else this._useFallback=!0;this._metaData={browserVersion:this._browserInfo.browserVersion,browserName:this._browserInfo.browserName,cssPrefix:this._browserInfo.cssPrefix,jsPrefix:this._browserInfo.jsPrefix,keepUnprefixed:this._keepUnprefixed,requiresPrefix:this._requiresPrefix}}return a(e,[{key:"prefix",value:function(e){return this._useFallback?r(e):this._hasPropsRequiringPrefix?this._prefixStyle(e):e}},{key:"_prefixStyle",value:function(e){for(var t in e){var r=e[t];if((0,v.default)(r))e[t]=this.prefix(r);else if(Array.isArray(r)){for(var i=[],o=0,a=r.length;o<a;++o){var s=(0,y.default)(n,t,r[o],e,this._metaData);(0,d.default)(i,s||r[o])}i.length>0&&(e[t]=i)}else{var u=(0,y.default)(n,t,r,e,this._metaData);u&&(e[t]=u),this._requiresPrefix.hasOwnProperty(t)&&(e[this._browserInfo.jsPrefix+(0,f.default)(t)]=r,this._keepUnprefixed||delete e[t])}}return e}}],[{key:"prefixAll",value:function(e){return r(e)}}]),e}()}Object.defineProperty(t,"__esModule",{value:!0});var a=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}();t.default=o;var s=n(790),u=r(s),l=n(791),c=r(l),p=n(210),f=r(p),h=n(383),d=r(h),m=n(384),v=r(m),g=n(385),y=r(g);e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default={plugins:[],prefixMap:{chrome:{appearance:64,userSelect:53,textEmphasisPosition:64,textEmphasis:64,textEmphasisStyle:64,textEmphasisColor:64,boxDecorationBreak:64,clipPath:54,maskImage:64,maskMode:64,maskRepeat:64,maskPosition:64,maskClip:64,maskOrigin:64,maskSize:64,maskComposite:64,mask:64,maskBorderSource:64,maskBorderMode:64,maskBorderSlice:64,maskBorderWidth:64,maskBorderOutset:64,maskBorderRepeat:64,maskBorder:64,maskType:64,textDecorationStyle:56,textDecorationSkip:56,textDecorationLine:56,textDecorationColor:56,filter:52,fontFeatureSettings:47,breakAfter:49,breakBefore:49,breakInside:49,columnCount:49,columnFill:49,columnGap:49,columnRule:49,columnRuleColor:49,columnRuleStyle:49,columnRuleWidth:49,columns:49,columnSpan:49,columnWidth:49,writingMode:47},safari:{flex:8,flexBasis:8,flexDirection:8,flexGrow:8,flexFlow:8,flexShrink:8,flexWrap:8,alignContent:8,alignItems:8,alignSelf:8,justifyContent:8,order:8,transform:8,transformOrigin:8,transformOriginX:8,transformOriginY:8,backfaceVisibility:8,perspective:8,perspectiveOrigin:8,transformStyle:8,transformOriginZ:8,animation:8,animationDelay:8,animationDirection:8,animationFillMode:8,animationDuration:8,animationIterationCount:8,animationName:8,animationPlayState:8,animationTimingFunction:8,appearance:11,userSelect:11,backdropFilter:11,fontKerning:9,scrollSnapType:10.1,scrollSnapPointsX:10.1,scrollSnapPointsY:10.1,scrollSnapDestination:10.1,scrollSnapCoordinate:10.1,boxDecorationBreak:11,clipPath:11,maskImage:11,maskMode:11,maskRepeat:11,maskPosition:11,maskClip:11,maskOrigin:11,maskSize:11,maskComposite:11,mask:11,maskBorderSource:11,maskBorderMode:11,maskBorderSlice:11,maskBorderWidth:11,maskBorderOutset:11,maskBorderRepeat:11,maskBorder:11,maskType:11,textDecorationStyle:11,textDecorationSkip:11,textDecorationLine:11,textDecorationColor:11,shapeImageThreshold:10,shapeImageMargin:10,shapeImageOutside:10,filter:9,hyphens:11,flowInto:11,flowFrom:11,breakBefore:8,breakAfter:8,breakInside:8,regionFragment:11,columnCount:8,columnFill:8,columnGap:8,columnRule:8,columnRuleColor:8,columnRuleStyle:8,columnRuleWidth:8,columns:8,columnSpan:8,columnWidth:8,writingMode:11},firefox:{appearance:58,userSelect:58,textAlignLast:48,tabSize:58,hyphens:42,breakAfter:51,breakBefore:51,breakInside:51,columnCount:51,columnFill:51,columnGap:51,columnRule:51,columnRuleColor:51,columnRuleStyle:51,columnRuleWidth:51,columns:51,columnSpan:51,columnWidth:51},opera:{flex:16,flexBasis:16,flexDirection:16,flexGrow:16,flexFlow:16,flexShrink:16,flexWrap:16,alignContent:16,alignItems:16,alignSelf:16,justifyContent:16,order:16,transform:22,transformOrigin:22,transformOriginX:22,transformOriginY:22,backfaceVisibility:22,perspective:22,perspectiveOrigin:22,transformStyle:22,transformOriginZ:22,animation:29,animationDelay:29,animationDirection:29,animationFillMode:29,animationDuration:29,animationIterationCount:29,animationName:29,animationPlayState:29,animationTimingFunction:29,appearance:49,userSelect:40,fontKerning:19,textEmphasisPosition:49,textEmphasis:49,textEmphasisStyle:49,textEmphasisColor:49,boxDecorationBreak:49,clipPath:41,maskImage:49,maskMode:49,maskRepeat:49,maskPosition:49,maskClip:49,maskOrigin:49,maskSize:49,maskComposite:49,mask:49,maskBorderSource:49,maskBorderMode:49,maskBorderSlice:49,maskBorderWidth:49,maskBorderOutset:49,maskBorderRepeat:49,maskBorder:49,maskType:49,textDecorationStyle:43,textDecorationSkip:43,textDecorationLine:43,textDecorationColor:43,filter:39,fontFeatureSettings:34,breakAfter:36,breakBefore:36,breakInside:36,columnCount:36,columnFill:36,columnGap:36,columnRule:36,columnRuleColor:36,columnRuleStyle:36,columnRuleWidth:36,columns:36,columnSpan:36,columnWidth:36,writingMode:34},ie:{userSelect:11,wrapFlow:11,wrapThrough:11,wrapMargin:11,scrollSnapType:11,scrollSnapPointsX:11,scrollSnapPointsY:11,scrollSnapDestination:11,scrollSnapCoordinate:11,hyphens:11,flowInto:11,flowFrom:11,breakBefore:11,breakAfter:11,breakInside:11,regionFragment:11,gridTemplateColumns:11,gridTemplateRows:11,gridTemplateAreas:11,gridTemplate:11,gridAutoColumns:11,gridAutoRows:11,gridAutoFlow:11,grid:11,gridRowStart:11,gridColumnStart:11,gridRowEnd:11,gridRow:11,gridColumn:11,gridColumnEnd:11,gridColumnGap:11,gridRowGap:11,gridArea:11,gridGap:11,textSizeAdjust:11,writingMode:11},edge:{userSelect:16,wrapFlow:16,wrapThrough:16,wrapMargin:16,scrollSnapType:16,scrollSnapPointsX:16,scrollSnapPointsY:16,scrollSnapDestination:16,scrollSnapCoordinate:16,hyphens:16,flowInto:16,flowFrom:16,breakBefore:16,breakAfter:16,breakInside:16,regionFragment:16,gridTemplateColumns:15,gridTemplateRows:15,gridTemplateAreas:15,gridTemplate:15,gridAutoColumns:15,gridAutoRows:15,gridAutoFlow:15,grid:15,gridRowStart:15,gridColumnStart:15,gridRowEnd:15,gridRow:15,gridColumn:15,gridColumnEnd:15,gridColumnGap:15,gridRowGap:15,gridArea:15,gridGap:15},ios_saf:{flex:8.1,flexBasis:8.1,flexDirection:8.1,flexGrow:8.1,flexFlow:8.1,flexShrink:8.1,flexWrap:8.1,alignContent:8.1,alignItems:8.1,alignSelf:8.1,justifyContent:8.1,order:8.1,transform:8.1,transformOrigin:8.1,transformOriginX:8.1,transformOriginY:8.1,backfaceVisibility:8.1,perspective:8.1,perspectiveOrigin:8.1,transformStyle:8.1,transformOriginZ:8.1,animation:8.1,animationDelay:8.1,animationDirection:8.1,animationFillMode:8.1,animationDuration:8.1,animationIterationCount:8.1,animationName:8.1,animationPlayState:8.1,animationTimingFunction:8.1,appearance:11,userSelect:11,backdropFilter:11,fontKerning:11,scrollSnapType:11,scrollSnapPointsX:11,scrollSnapPointsY:11,scrollSnapDestination:11,scrollSnapCoordinate:11,boxDecorationBreak:11,clipPath:11,maskImage:11,maskMode:11,maskRepeat:11,maskPosition:11,maskClip:11,maskOrigin:11,maskSize:11,maskComposite:11,mask:11,maskBorderSource:11,maskBorderMode:11,maskBorderSlice:11,maskBorderWidth:11,maskBorderOutset:11,maskBorderRepeat:11,maskBorder:11,maskType:11,textSizeAdjust:11,textDecorationStyle:11,textDecorationSkip:11,textDecorationLine:11,textDecorationColor:11,shapeImageThreshold:10,shapeImageMargin:10,shapeImageOutside:10,filter:9,hyphens:11,flowInto:11,flowFrom:11,breakBefore:8.1,breakAfter:8.1,breakInside:8.1,regionFragment:11,columnCount:8.1,columnFill:8.1,columnGap:8.1,columnRule:8.1,columnRuleColor:8.1,columnRuleStyle:8.1,columnRuleWidth:8.1,columns:8.1,columnSpan:8.1,columnWidth:8.1,writingMode:11},android:{borderImage:4.2,borderImageOutset:4.2,borderImageRepeat:4.2,borderImageSlice:4.2,borderImageSource:4.2,borderImageWidth:4.2,flex:4.2,flexBasis:4.2,flexDirection:4.2,flexGrow:4.2,flexFlow:4.2,flexShrink:4.2,flexWrap:4.2,alignContent:4.2,alignItems:4.2,alignSelf:4.2,justifyContent:4.2,order:4.2,transition:4.2,transitionDelay:4.2,transitionDuration:4.2,transitionProperty:4.2,transitionTimingFunction:4.2,transform:4.4,transformOrigin:4.4,transformOriginX:4.4,transformOriginY:4.4,backfaceVisibility:4.4,perspective:4.4,perspectiveOrigin:4.4,transformStyle:4.4,transformOriginZ:4.4,animation:4.4,animationDelay:4.4,animationDirection:4.4,animationFillMode:4.4,animationDuration:4.4,animationIterationCount:4.4,animationName:4.4,animationPlayState:4.4,animationTimingFunction:4.4,appearance:56,userSelect:4.4,fontKerning:4.4,textEmphasisPosition:56,textEmphasis:56,textEmphasisStyle:56,textEmphasisColor:56,boxDecorationBreak:56,clipPath:4.4,maskImage:56,maskMode:56,maskRepeat:56,maskPosition:56,maskClip:56,maskOrigin:56,maskSize:56,maskComposite:56,mask:56,maskBorderSource:56,maskBorderMode:56,maskBorderSlice:56,maskBorderWidth:56,maskBorderOutset:56,maskBorderRepeat:56,maskBorder:56,maskType:56,filter:4.4,fontFeatureSettings:4.4,breakAfter:4.4,breakBefore:4.4,breakInside:4.4,columnCount:4.4,columnFill:4.4,columnGap:4.4,columnRule:4.4,columnRuleColor:4.4,columnRuleStyle:4.4,columnRuleWidth:4.4,columns:4.4,columnSpan:4.4,columnWidth:4.4,writingMode:4.4},and_chr:{appearance:61,textEmphasisPosition:61,textEmphasis:61,textEmphasisStyle:61,textEmphasisColor:61,boxDecorationBreak:61,maskImage:61,maskMode:61,maskRepeat:61,maskPosition:61,maskClip:61,maskOrigin:61,maskSize:61,maskComposite:61,mask:61,maskBorderSource:61,maskBorderMode:61,maskBorderSlice:61,maskBorderWidth:61,maskBorderOutset:61,maskBorderRepeat:61,maskBorder:61,maskType:61},and_uc:{flex:11.4,flexBasis:11.4,flexDirection:11.4,flexGrow:11.4,flexFlow:11.4,flexShrink:11.4,flexWrap:11.4,alignContent:11.4,alignItems:11.4,alignSelf:11.4,justifyContent:11.4,order:11.4,transform:11.4,transformOrigin:11.4,transformOriginX:11.4,transformOriginY:11.4,backfaceVisibility:11.4,perspective:11.4,perspectiveOrigin:11.4,transformStyle:11.4,transformOriginZ:11.4,animation:11.4,animationDelay:11.4,animationDirection:11.4,animationFillMode:11.4,animationDuration:11.4,animationIterationCount:11.4,animationName:11.4,animationPlayState:11.4,animationTimingFunction:11.4,appearance:11.4,userSelect:11.4,textEmphasisPosition:11.4,textEmphasis:11.4,textEmphasisStyle:11.4,textEmphasisColor:11.4,clipPath:11.4,maskImage:11.4,maskMode:11.4,maskRepeat:11.4,maskPosition:11.4,maskClip:11.4,maskOrigin:11.4,maskSize:11.4,maskComposite:11.4,mask:11.4,maskBorderSource:11.4,maskBorderMode:11.4,maskBorderSlice:11.4,maskBorderWidth:11.4,maskBorderOutset:11.4,maskBorderRepeat:11.4,maskBorder:11.4,maskType:11.4,textSizeAdjust:11.4,filter:11.4,hyphens:11.4,fontFeatureSettings:11.4,breakAfter:11.4,breakBefore:11.4,breakInside:11.4,columnCount:11.4,columnFill:11.4,columnGap:11.4,columnRule:11.4,columnRuleColor:11.4,columnRuleStyle:11.4,columnRuleWidth:11.4,columns:11.4,columnSpan:11.4,columnWidth:11.4,writingMode:11.4},op_mini:{}}},e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,a=r.browserVersion,s=r.cssPrefix,u=r.keepUnprefixed;if("string"==typeof t&&t.indexOf("cross-fade(")>-1&&("chrome"===i||"opera"===i||"and_chr"===i||("ios_saf"===i||"safari"===i)&&a<10))return(0,o.default)(t.replace(/cross-fade\(/g,s+"cross-fade("),t,u)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,u=r.browserVersion,l=r.cssPrefix,c=r.keepUnprefixed;return"cursor"!==e||!a[t]||"firefox"!==i&&"chrome"!==i&&"safari"!==i&&"opera"!==i?"cursor"===e&&s[t]&&("firefox"===i&&u<24||"chrome"===i&&u<37||"safari"===i&&u<9||"opera"===i&&u<24)?(0,o.default)(l+t,t,c):void 0:(0,o.default)(l+t,t,c)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={grab:!0,grabbing:!0},s={"zoom-in":!0,"zoom-out":!0};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,a=r.browserVersion,s=r.cssPrefix,u=r.keepUnprefixed;if("string"==typeof t&&t.indexOf("filter(")>-1&&("ios_saf"===i||"safari"===i&&a<9.1))return(0,o.default)(t.replace(/filter\(/g,s+"filter("),t,u)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,s=r.browserVersion,u=r.cssPrefix,l=r.keepUnprefixed;if("display"===e&&a[t]&&("chrome"===i&&s<29&&s>20||("safari"===i||"ios_saf"===i)&&s<9&&s>6||"opera"===i&&(15===s||16===s)))return(0,o.default)(u+t,t,l)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={flex:!0,"inline-flex":!0};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,u=r.browserVersion,c=r.cssPrefix,p=r.keepUnprefixed,f=r.requiresPrefix;if((l.indexOf(e)>-1||"display"===e&&"string"==typeof t&&t.indexOf("flex")>-1)&&("firefox"===i&&u<22||"chrome"===i&&u<21||("safari"===i||"ios_saf"===i)&&u<=6.1||"android"===i&&u<4.4||"and_uc"===i)){if(delete f[e],p||Array.isArray(n[e])||delete n[e],"flexDirection"===e&&"string"==typeof t&&(t.indexOf("column")>-1?n.WebkitBoxOrient="vertical":n.WebkitBoxOrient="horizontal",t.indexOf("reverse")>-1?n.WebkitBoxDirection="reverse":n.WebkitBoxDirection="normal"),"display"===e&&a.hasOwnProperty(t))return(0,o.default)(c+a[t],t,p);s.hasOwnProperty(e)&&(n[s[e]]=a[t]||t)}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={"space-around":"justify","space-between":"justify","flex-start":"start","flex-end":"end","wrap-reverse":"multiple",wrap:"multiple",flex:"box","inline-flex":"inline-box"},s={alignItems:"WebkitBoxAlign",justifyContent:"WebkitBoxPack",flexWrap:"WebkitBoxLines"},u=["alignContent","alignSelf","order","flexGrow","flexShrink","flexBasis","flexDirection"],l=Object.keys(s).concat(u);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,s=r.browserVersion,u=r.cssPrefix,l=r.keepUnprefixed;if("string"==typeof t&&a.test(t)&&("firefox"===i&&s<16||"chrome"===i&&s<26||("safari"===i||"ios_saf"===i)&&s<7||("opera"===i||"op_mini"===i)&&s<12.1||"android"===i&&s<4.4||"and_uc"===i))return(0,o.default)(u+t,t,l)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=/linear-gradient|radial-gradient|repeating-linear-gradient|repeating-radial-gradient/;e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,a=r.cssPrefix,s=r.keepUnprefixed;if("string"==typeof t&&t.indexOf("image-set(")>-1&&("chrome"===i||"opera"===i||"and_chr"===i||"and_uc"===i||"ios_saf"===i||"safari"===i))return(0,o.default)(t.replace(/image-set\(/g,a+"image-set("),t,s)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,a=r.cssPrefix,s=r.keepUnprefixed;if("position"===e&&"sticky"===t&&("safari"===i||"ios_saf"===i))return(0,o.default)(a+t,t,s)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.cssPrefix,u=r.keepUnprefixed;if(a.hasOwnProperty(e)&&s.hasOwnProperty(t))return(0,o.default)(i+t,t,u)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={maxHeight:!0,maxWidth:!0,width:!0,height:!0,columnWidth:!0,minWidth:!0,minHeight:!0},s={"min-content":!0,"max-content":!0,"fill-available":!0,"fit-content":!0,"contain-floats":!0};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.cssPrefix,u=r.keepUnprefixed,l=r.requiresPrefix;if("string"==typeof t&&a.hasOwnProperty(e)){s||(s=Object.keys(l).map(function(e){return(0,o.default)(e)}));var c=t.split(/,(?![^()]*(?:\([^()]*\))?\))/g);return s.forEach(function(e){c.forEach(function(t,n){t.indexOf(e)>-1&&"order"!==e&&(c[n]=t.replace(e,i+e)+(u?","+t:""))})}),c.join(",")}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(367),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={transition:!0,transitionProperty:!0,WebkitTransition:!0,WebkitTransitionProperty:!0,MozTransition:!0,MozTransitionProperty:!0},s=void 0;e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){function t(e){for(var i in e){var o=e[i];if((0,f.default)(o))e[i]=t(o);else if(Array.isArray(o)){for(var s=[],l=0,p=o.length;l<p;++l){var h=(0,u.default)(r,i,o[l],e,n);(0,c.default)(s,h||o[l])}s.length>0&&(e[i]=s)}else{var d=(0,u.default)(r,i,o,e,n);d&&(e[i]=d),(0,a.default)(n,i,e)}}return e}var n=e.prefixMap,r=e.plugins;return t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(792),a=r(o),s=n(385),u=r(s),l=n(383),c=r(l),p=n(384),f=r(p);e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(777),o=r(i),a=n(789),s=r(a),u=n(780),l=r(u),c=n(779),p=r(c),f=n(781),h=r(f),d=n(782),m=r(d),v=n(783),g=r(v),y=n(784),_=r(y),b=n(785),x=r(b),w=n(786),k=r(w),E=n(787),S=r(E),C=n(788),A=r(C),D=[p.default,l.default,h.default,g.default,_.default,x.default,k.default,S.default,A.default,m.default];t.default=(0,o.default)({prefixMap:s.default.prefixMap,plugins:D}),e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("string"==typeof t&&!(0,o.default)(t)&&t.indexOf("cross-fade(")>-1)return a.map(function(e){return t.replace(/cross-fade\(/g,e+"cross-fade(")})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(112),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=["-webkit-",""];e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("cursor"===e&&o.hasOwnProperty(t))return i.map(function(e){return e+t})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=["-webkit-","-moz-",""],o={"zoom-in":!0,"zoom-out":!0,grab:!0,grabbing:!0};e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("string"==typeof t&&!(0,o.default)(t)&&t.indexOf("filter(")>-1)return a.map(function(e){return t.replace(/filter\(/g,e+"filter(")})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(112),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=["-webkit-",""];e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("display"===e&&i.hasOwnProperty(t))return i[t]}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i={flex:["-webkit-box","-moz-box","-ms-flexbox","-webkit-flex","flex"],"inline-flex":["-webkit-inline-box","-moz-inline-box","-ms-inline-flexbox","-webkit-inline-flex","inline-flex"]};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){"flexDirection"===e&&"string"==typeof t&&(t.indexOf("column")>-1?n.WebkitBoxOrient="vertical":n.WebkitBoxOrient="horizontal",t.indexOf("reverse")>-1?n.WebkitBoxDirection="reverse":n.WebkitBoxDirection="normal"),o.hasOwnProperty(e)&&(n[o[e]]=i[t]||t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i={"space-around":"justify","space-between":"justify","flex-start":"start","flex-end":"end","wrap-reverse":"multiple",wrap:"multiple"},o={alignItems:"WebkitBoxAlign",justifyContent:"WebkitBoxPack",flexWrap:"WebkitBoxLines"};e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("string"==typeof t&&!(0,o.default)(t)&&s.test(t))return a.map(function(e){return e+t})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(112),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=["-webkit-","-moz-",""],s=/linear-gradient|radial-gradient|repeating-linear-gradient|repeating-radial-gradient/;e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("string"==typeof t&&!(0,o.default)(t)&&t.indexOf("image-set(")>-1)return a.map(function(e){return t.replace(/image-set\(/g,e+"image-set(")})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(112),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=["-webkit-",""];e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("position"===e&&"sticky"===t)return["-webkit-sticky","sticky"]}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(o.hasOwnProperty(e)&&a.hasOwnProperty(t))return i.map(function(e){return e+t})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=["-webkit-","-moz-",""],o={maxHeight:!0,maxWidth:!0,width:!0,height:!0,columnWidth:!0,minWidth:!0,minHeight:!0},a={"min-content":!0,"max-content":!0,"fill-available":!0,"fit-content":!0,"contain-floats":!0};e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if((0,l.default)(e))return e;for(var n=e.split(/,(?![^()]*(?:\([^()]*\))?\))/g),r=0,i=n.length;r<i;++r){var o=n[r],a=[o];for(var u in t){var c=(0,s.default)(u);if(o.indexOf(c)>-1&&"order"!==c)for(var p=t[u],f=0,d=p.length;f<d;++f)a.unshift(o.replace(c,h[p[f]]+c))}n[r]=a.join(",")}return n.join(",")}function o(e,t,n,r){if("string"==typeof t&&f.hasOwnProperty(e)){var o=i(t,r),a=o.split(/,(?![^()]*(?:\([^()]*\))?\))/g).filter(function(e){return!/-moz-|-ms-/.test(e)}).join(",");if(e.indexOf("Webkit")>-1)return a;var s=o.split(/,(?![^()]*(?:\([^()]*\))?\))/g).filter(function(e){return!/-webkit-|-ms-/.test(e)}).join(",");return e.indexOf("Moz")>-1?s:(n["Webkit"+(0,p.default)(e)]=a,n["Moz"+(0,p.default)(e)]=s,o)}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=o;var a=n(367),s=r(a),u=n(112),l=r(u),c=n(210),p=r(c),f={transition:!0,transitionProperty:!0,WebkitTransition:!0,WebkitTransitionProperty:!0,MozTransition:!0,MozTransitionProperty:!0},h={Webkit:"-webkit-",Moz:"-moz-",ms:"-ms-"};e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=["Webkit"],i=["Moz"],o=["ms"],a=["Webkit","Moz"],s=["Webkit","ms"],u=["Webkit","Moz","ms"];t.default={plugins:[],prefixMap:{appearance:a,userSelect:u,textEmphasisPosition:r,textEmphasis:r,textEmphasisStyle:r,textEmphasisColor:r,boxDecorationBreak:r,clipPath:r,maskImage:r,maskMode:r,maskRepeat:r,maskPosition:r,maskClip:r,maskOrigin:r,maskSize:r,maskComposite:r,mask:r,maskBorderSource:r,maskBorderMode:r,maskBorderSlice:r,maskBorderWidth:r,maskBorderOutset:r,maskBorderRepeat:r,maskBorder:r,maskType:r,textDecorationStyle:r,textDecorationSkip:r,textDecorationLine:r,textDecorationColor:r,filter:r,fontFeatureSettings:r,breakAfter:u,breakBefore:u,breakInside:u,columnCount:a,columnFill:a,columnGap:a,columnRule:a,columnRuleColor:a,columnRuleStyle:a,columnRuleWidth:a,columns:a,columnSpan:a,columnWidth:a,writingMode:s,flex:r,flexBasis:r,flexDirection:r,flexGrow:r,flexFlow:r,flexShrink:r,flexWrap:r,alignContent:r,alignItems:r,alignSelf:r,justifyContent:r,order:r,transform:r,transformOrigin:r,transformOriginX:r,transformOriginY:r,backfaceVisibility:r,perspective:r,perspectiveOrigin:r,transformStyle:r,transformOriginZ:r,animation:r,animationDelay:r,animationDirection:r,animationFillMode:r,animationDuration:r,animationIterationCount:r,animationName:r,animationPlayState:r,animationTimingFunction:r,backdropFilter:r,fontKerning:r,scrollSnapType:s,scrollSnapPointsX:s,scrollSnapPointsY:s,scrollSnapDestination:s,scrollSnapCoordinate:s,shapeImageThreshold:r,shapeImageMargin:r,shapeImageOutside:r,hyphens:u,flowInto:s,flowFrom:s,regionFragment:s,textAlignLast:i,tabSize:i,wrapFlow:o,wrapThrough:o,wrapMargin:o,gridTemplateColumns:o,gridTemplateRows:o,gridTemplateAreas:o,gridTemplate:o,gridAutoColumns:o,gridAutoRows:o,gridAutoFlow:o,grid:o,gridRowStart:o,gridColumnStart:o,gridRowEnd:o,gridRow:o,gridColumn:o,gridColumnEnd:o,gridColumnGap:o,gridRowGap:o,gridArea:o,gridGap:o,textSizeAdjust:s,borderImage:r,borderImageOutset:r,borderImageRepeat:r,borderImageSlice:r,borderImageSource:r,borderImageWidth:r,transitionDelay:r,transitionDuration:r,transitionProperty:r,transitionTimingFunction:r}},e.exports=t.default},function(e,t,n){"use strict";function r(e){if(e.firefox)return"firefox";if(e.mobile||e.tablet){if(e.ios)return"ios_saf";if(e.android)return"android";if(e.opera)return"op_mini"}for(var t in u)if(e.hasOwnProperty(t))return u[t]}function i(e){var t=a.default._detect(e);t.yandexbrowser&&(t=a.default._detect(e.replace(/YaBrowser\/[0-9.]*/,"")));for(var n in s)if(t.hasOwnProperty(n)){var i=s[n];t.jsPrefix=i,t.cssPrefix="-"+i.toLowerCase()+"-";break}return t.browserName=r(t),t.version?t.browserVersion=parseFloat(t.version):t.browserVersion=parseInt(parseFloat(t.osversion),10),t.osVersion=parseFloat(t.osversion),"ios_saf"===t.browserName&&t.browserVersion>t.osVersion&&(t.browserVersion=t.osVersion),"android"===t.browserName&&t.chrome&&t.browserVersion>37&&(t.browserName="and_chr"),"android"===t.browserName&&t.osVersion<5&&(t.browserVersion=t.osVersion),"android"===t.browserName&&t.samsungBrowser&&(t.browserName="and_chr",t.browserVersion=44),t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(571),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s={chrome:"Webkit",safari:"Webkit",ios:"Webkit",android:"Webkit",phantom:"Webkit",opera:"Webkit",webos:"Webkit",blackberry:"Webkit",bada:"Webkit",tizen:"Webkit",chromium:"Webkit",vivaldi:"Webkit",firefox:"Moz",seamoney:"Moz",sailfish:"Moz",msie:"ms",msedge:"ms"},u={chrome:"chrome",chromium:"chrome",safari:"safari",firfox:"firefox",msedge:"edge",opera:"opera",vivaldi:"opera",msie:"ie"};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){return"chrome"===e&&t<43||("safari"===e||"ios_saf"===e)&&t<9||"opera"===e&&t<30||"android"===e&&t<=4.4||"and_uc"===e?n+"keyframes":"keyframes"}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){if(e.hasOwnProperty(t))for(var r=e[t],i=0,a=r.length;i<a;++i)n[r[i]+(0,o.default)(t)]=n[t]}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(210),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";var r=function(e,t,n,r,i,o,a,s){if(!e){var u;if(void 0===t)u=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var l=[n,r,i,o,a,s],c=0;u=new Error(t.replace(/%s/g,function(){return l[c++]})),u.name="Invariant Violation"}throw u.framesToPop=1,u}};e.exports=r},function(e,t){e.exports=FormData},function(e,t,n){"use strict";function r(e){return function(){throw new Error("Function "+e+" is deprecated and cannot be used.")}}var i=n(797),o=n(796);e.exports.Type=n(16),e.exports.Schema=n(81),e.exports.FAILSAFE_SCHEMA=n(212),e.exports.JSON_SCHEMA=n(389),e.exports.CORE_SCHEMA=n(388),e.exports.DEFAULT_SAFE_SCHEMA=n(118),e.exports.DEFAULT_FULL_SCHEMA=n(145),e.exports.load=i.load,e.exports.loadAll=i.loadAll,e.exports.safeLoad=i.safeLoad,e.exports.safeLoadAll=i.safeLoadAll,e.exports.dump=o.dump,e.exports.safeDump=o.safeDump,e.exports.YAMLException=n(117),e.exports.MINIMAL_SCHEMA=n(212),e.exports.SAFE_SCHEMA=n(118),e.exports.DEFAULT_SCHEMA=n(145),e.exports.scan=r("scan"),e.exports.parse=r("parse"),e.exports.compose=r("compose"),e.exports.addConstructor=r("addConstructor")},function(e,t,n){"use strict";function r(e,t){var n,r,i,o,a,s,u;if(null===t)return{};for(n={},r=Object.keys(t),i=0,o=r.length;i<o;i+=1)a=r[i],s=String(t[a]),"!!"===a.slice(0,2)&&(a="tag:yaml.org,2002:"+a.slice(2)),u=e.compiledTypeMap.fallback[a],u&&j.call(u.styleAliases,s)&&(s=u.styleAliases[s]),n[a]=s;return n}function i(e){var t,n,r;if(t=e.toString(16).toUpperCase(),e<=255)n="x",r=2;else if(e<=65535)n="u",r=4;else{if(!(e<=4294967295))throw new T("code point within a string may not be greater than 0xFFFFFFFF");n="U",r=8}return"\\"+n+M.repeat("0",r-t.length)+t}function o(e){this.schema=e.schema||P,this.indent=Math.max(1,e.indent||2),this.skipInvalid=e.skipInvalid||!1,this.flowLevel=M.isNothing(e.flowLevel)?-1:e.flowLevel,this.styleMap=r(this.schema,e.styles||null),this.sortKeys=e.sortKeys||!1,this.lineWidth=e.lineWidth||80,this.noRefs=e.noRefs||!1,this.noCompatMode=e.noCompatMode||!1,this.condenseFlow=e.condenseFlow||!1,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function a(e,t){for(var n,r=M.repeat(" ",t),i=0,o=-1,a="",s=e.length;i<s;)o=e.indexOf("\n",i),-1===o?(n=e.slice(i),i=s):(n=e.slice(i,o+1),i=o+1),n.length&&"\n"!==n&&(a+=r),a+=n;return a}function s(e,t){return"\n"+M.repeat(" ",e.indent*t)}function u(e,t){var n,r,i;for(n=0,r=e.implicitTypes.length;n<r;n+=1)if(i=e.implicitTypes[n],i.resolve(t))return!0;return!1}function l(e){return e===B||e===F}function c(e){return 32<=e&&e<=126||161<=e&&e<=55295&&8232!==e&&8233!==e||57344<=e&&e<=65533&&65279!==e||65536<=e&&e<=1114111}function p(e){return c(e)&&65279!==e&&e!==G&&e!==Z&&e!==Q&&e!==te&&e!==re&&e!==K&&e!==z}function f(e){return c(e)&&65279!==e&&!l(e)&&e!==J&&e!==Y&&e!==K&&e!==G&&e!==Z&&e!==Q&&e!==te&&e!==re&&e!==z&&e!==W&&e!==H&&e!==L&&e!==ne&&e!==X&&e!==V&&e!==q&&e!==U&&e!==$&&e!==ee}function h(e,t,n,r,i){var o,a,s=!1,u=!1,h=-1!==r,d=-1,m=f(e.charCodeAt(0))&&!l(e.charCodeAt(e.length-1));if(t)for(o=0;o<e.length;o++){if(a=e.charCodeAt(o),!c(a))return ce;m=m&&p(a)}else{for(o=0;o<e.length;o++){if((a=e.charCodeAt(o))===N)s=!0,h&&(u=u||o-d-1>r&&" "!==e[d+1],d=o);else if(!c(a))return ce;m=m&&p(a)}u=u||h&&o-d-1>r&&" "!==e[d+1]}return s||u?" "===e[0]&&n>9?ce:u?le:ue:m&&!i(e)?ae:se}function d(e,t,n,r){e.dump=function(){function i(t){return u(e,t)}if(0===t.length)return"''";if(!e.noCompatMode&&-1!==oe.indexOf(t))return"'"+t+"'";var o=e.indent*Math.max(1,n),s=-1===e.lineWidth?-1:Math.max(Math.min(e.lineWidth,40),e.lineWidth-o),l=r||e.flowLevel>-1&&n>=e.flowLevel;switch(h(t,l,e.indent,s,i)){case ae:return t;case se:return"'"+t.replace(/'/g,"''")+"'";case ue:return"|"+m(t,e.indent)+v(a(t,o));case le:return">"+m(t,e.indent)+v(a(g(t,s),o));case ce:return'"'+_(t)+'"';default:throw new T("impossible error: invalid scalar style")}}()}function m(e,t){var n=" "===e[0]?String(t):"",r="\n"===e[e.length-1];return n+(!r||"\n"!==e[e.length-2]&&"\n"!==e?r?"":"-":"+")+"\n"}function v(e){return"\n"===e[e.length-1]?e.slice(0,-1):e}function g(e,t){for(var n,r,i=/(\n+)([^\n]*)/g,o=function(){var n=e.indexOf("\n");return n=-1!==n?n:e.length,i.lastIndex=n,y(e.slice(0,n),t)}(),a="\n"===e[0]||" "===e[0];r=i.exec(e);){var s=r[1],u=r[2];n=" "===u[0],o+=s+(a||n||""===u?"":"\n")+y(u,t),a=n}return o}function y(e,t){if(""===e||" "===e[0])return e;for(var n,r,i=/ [^ ]/g,o=0,a=0,s=0,u="";n=i.exec(e);)s=n.index,s-o>t&&(r=a>o?a:s,u+="\n"+e.slice(o,r),o=r+1),a=s;return u+="\n",e.length-o>t&&a>o?u+=e.slice(o,a)+"\n"+e.slice(a+1):u+=e.slice(o),u.slice(1)}function _(e){for(var t,n,r,o="",a=0;a<e.length;a++)t=e.charCodeAt(a),t>=55296&&t<=56319&&(n=e.charCodeAt(a+1))>=56320&&n<=57343?(o+=i(1024*(t-55296)+n-56320+65536),a++):(r=ie[t],o+=!r&&c(t)?e[a]:r||i(t));return o}function b(e,t,n){var r,i,o="",a=e.tag;for(r=0,i=n.length;r<i;r+=1)S(e,t,n[r],!1,!1)&&(0!==r&&(o+=","+(e.condenseFlow?"":" ")),o+=e.dump);e.tag=a,e.dump="["+o+"]"}function x(e,t,n,r){var i,o,a="",u=e.tag;for(i=0,o=n.length;i<o;i+=1)S(e,t+1,n[i],!0,!0)&&(r&&0===i||(a+=s(e,t)),e.dump&&N===e.dump.charCodeAt(0)?a+="-":a+="- ",a+=e.dump);e.tag=u,e.dump=a||"[]"}function w(e,t,n){var r,i,o,a,s,u="",l=e.tag,c=Object.keys(n);for(r=0,i=c.length;r<i;r+=1)s=e.condenseFlow?'"':"",0!==r&&(s+=", "),o=c[r],a=n[o],S(e,t,o,!1,!1)&&(e.dump.length>1024&&(s+="? "),s+=e.dump+(e.condenseFlow?'"':"")+":"+(e.condenseFlow?"":" "),S(e,t,a,!1,!1)&&(s+=e.dump,u+=s));e.tag=l,e.dump="{"+u+"}"}function k(e,t,n,r){var i,o,a,u,l,c,p="",f=e.tag,h=Object.keys(n);if(!0===e.sortKeys)h.sort();else if("function"==typeof e.sortKeys)h.sort(e.sortKeys);else if(e.sortKeys)throw new T("sortKeys must be a boolean or a function");for(i=0,o=h.length;i<o;i+=1)c="",r&&0===i||(c+=s(e,t)),a=h[i],u=n[a],S(e,t+1,a,!0,!0,!0)&&(l=null!==e.tag&&"?"!==e.tag||e.dump&&e.dump.length>1024,l&&(e.dump&&N===e.dump.charCodeAt(0)?c+="?":c+="? "),c+=e.dump,l&&(c+=s(e,t)),S(e,t+1,u,!0,l)&&(e.dump&&N===e.dump.charCodeAt(0)?c+=":":c+=": ",c+=e.dump,p+=c));e.tag=f,e.dump=p||"{}"}function E(e,t,n){var r,i,o,a,s,u;for(i=n?e.explicitTypes:e.implicitTypes,o=0,a=i.length;o<a;o+=1)if(s=i[o],(s.instanceOf||s.predicate)&&(!s.instanceOf||"object"==typeof t&&t instanceof s.instanceOf)&&(!s.predicate||s.predicate(t))){if(e.tag=n?s.tag:"?",s.represent){if(u=e.styleMap[s.tag]||s.defaultStyle,"[object Function]"===R.call(s.represent))r=s.represent(t,u);else{if(!j.call(s.represent,u))throw new T("!<"+s.tag+'> tag resolver accepts not "'+u+'" style');r=s.represent[u](t,u)}e.dump=r}return!0}return!1}function S(e,t,n,r,i,o){e.tag=null,e.dump=n,E(e,n,!1)||E(e,n,!0);var a=R.call(e.dump);r&&(r=e.flowLevel<0||e.flowLevel>t);var s,u,l="[object Object]"===a||"[object Array]"===a;if(l&&(s=e.duplicates.indexOf(n),u=-1!==s),(null!==e.tag&&"?"!==e.tag||u||2!==e.indent&&t>0)&&(i=!1),u&&e.usedDuplicates[s])e.dump="*ref_"+s;else{if(l&&u&&!e.usedDuplicates[s]&&(e.usedDuplicates[s]=!0),"[object Object]"===a)r&&0!==Object.keys(e.dump).length?(k(e,t,e.dump,i),u&&(e.dump="&ref_"+s+e.dump)):(w(e,t,e.dump),u&&(e.dump="&ref_"+s+" "+e.dump));else if("[object Array]"===a)r&&0!==e.dump.length?(x(e,t,e.dump,i),u&&(e.dump="&ref_"+s+e.dump)):(b(e,t,e.dump),u&&(e.dump="&ref_"+s+" "+e.dump));else{if("[object String]"!==a){if(e.skipInvalid)return!1;throw new T("unacceptable kind of an object to dump "+a)}"?"!==e.tag&&d(e,e.dump,t,o)}null!==e.tag&&"?"!==e.tag&&(e.dump="!<"+e.tag+"> "+e.dump)}return!0}function C(e,t){var n,r,i=[],o=[];for(A(e,i,o),n=0,r=o.length;n<r;n+=1)t.duplicates.push(i[o[n]]);t.usedDuplicates=new Array(r)}function A(e,t,n){var r,i,o;if(null!==e&&"object"==typeof e)if(-1!==(i=t.indexOf(e)))-1===n.indexOf(i)&&n.push(i);else if(t.push(e),Array.isArray(e))for(i=0,o=e.length;i<o;i+=1)A(e[i],t,n);else for(r=Object.keys(e),i=0,o=r.length;i<o;i+=1)A(e[r[i]],t,n)}function D(e,t){t=t||{};var n=new o(t);return n.noRefs||C(e,n),S(n,0,e,!0,!0)?n.dump+"\n":""}function O(e,t){return D(e,M.extend({schema:I},t))}var M=n(80),T=n(117),P=n(145),I=n(118),R=Object.prototype.toString,j=Object.prototype.hasOwnProperty,F=9,N=10,B=32,L=33,q=34,z=35,U=37,W=38,V=39,H=42,G=44,J=45,K=58,X=62,Y=63,$=64,Z=91,Q=93,ee=96,te=123,ne=124,re=125,ie={};ie[0]="\\0",ie[7]="\\a",ie[8]="\\b",ie[9]="\\t",ie[10]="\\n",ie[11]="\\v",ie[12]="\\f",ie[13]="\\r",ie[27]="\\e",ie[34]='\\"',ie[92]="\\\\",ie[133]="\\N",ie[160]="\\_",ie[8232]="\\L",ie[8233]="\\P";var oe=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"],ae=1,se=2,ue=3,le=4,ce=5;e.exports.dump=D,e.exports.safeDump=O},function(e,t,n){"use strict";function r(e){return 10===e||13===e}function i(e){return 9===e||32===e}function o(e){return 9===e||32===e||10===e||13===e}function a(e){return 44===e||91===e||93===e||123===e||125===e}function s(e){var t;return 48<=e&&e<=57?e-48:(t=32|e,97<=t&&t<=102?t-97+10:-1)}function u(e){return 120===e?2:117===e?4:85===e?8:0}function l(e){return 48<=e&&e<=57?e-48:-1}function c(e){return 48===e?"\0":97===e?"":98===e?"\b":116===e?"\t":9===e?"\t":110===e?"\n":118===e?"\v":102===e?"\f":114===e?"\r":101===e?"":32===e?" ":34===e?'"':47===e?"/":92===e?"\\":78===e?"…":95===e?" ":76===e?"\u2028":80===e?"\u2029":""}function p(e){return e<=65535?String.fromCharCode(e):String.fromCharCode(55296+(e-65536>>10),56320+(e-65536&1023))}function f(e,t){this.input=e,this.filename=t.filename||null,this.schema=t.schema||V,this.onWarning=t.onWarning||null,this.legacy=t.legacy||!1,this.json=t.json||!1,this.listener=t.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=e.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.documents=[]}function h(e,t){return new z(t,new U(e.filename,e.input,e.position,e.line,e.position-e.lineStart))}function d(e,t){throw h(e,t)}function m(e,t){e.onWarning&&e.onWarning.call(null,h(e,t))}function v(e,t,n,r){var i,o,a,s;if(t<n){if(s=e.input.slice(t,n),r)for(i=0,o=s.length;i<o;i+=1)9===(a=s.charCodeAt(i))||32<=a&&a<=1114111||d(e,"expected valid JSON character");else Q.test(s)&&d(e,"the stream contains non-printable characters");e.result+=s}}function g(e,t,n,r){var i,o,a,s;for(q.isObject(n)||d(e,"cannot merge mappings; the provided source object is unacceptable"),i=Object.keys(n),a=0,s=i.length;a<s;a+=1)o=i[a],H.call(t,o)||(t[o]=n[o],r[o]=!0)}function y(e,t,n,r,i,o,a,s){var u,l;if(i=String(i),null===t&&(t={}),"tag:yaml.org,2002:merge"===r)if(Array.isArray(o))for(u=0,l=o.length;u<l;u+=1)g(e,t,o[u],n);else g(e,t,o,n);else e.json||H.call(n,i)||!H.call(t,i)||(e.line=a||e.line,e.position=s||e.position,d(e,"duplicated mapping key")),t[i]=o,delete n[i];return t}function _(e){var t;t=e.input.charCodeAt(e.position),10===t?e.position++:13===t?(e.position++,10===e.input.charCodeAt(e.position)&&e.position++):d(e,"a line break is expected"),e.line+=1,e.lineStart=e.position}function b(e,t,n){for(var o=0,a=e.input.charCodeAt(e.position);0!==a;){for(;i(a);)a=e.input.charCodeAt(++e.position);if(t&&35===a)do{a=e.input.charCodeAt(++e.position)}while(10!==a&&13!==a&&0!==a);if(!r(a))break;for(_(e),a=e.input.charCodeAt(e.position),o++,e.lineIndent=0;32===a;)e.lineIndent++,a=e.input.charCodeAt(++e.position)}return-1!==n&&0!==o&&e.lineIndent<n&&m(e,"deficient indentation"),o}function x(e){var t,n=e.position;return!(45!==(t=e.input.charCodeAt(n))&&46!==t||t!==e.input.charCodeAt(n+1)||t!==e.input.charCodeAt(n+2)||(n+=3,0!==(t=e.input.charCodeAt(n))&&!o(t)))}function w(e,t){1===t?e.result+=" ":t>1&&(e.result+=q.repeat("\n",t-1))}function k(e,t,n){var s,u,l,c,p,f,h,d,m,g=e.kind,y=e.result;if(m=e.input.charCodeAt(e.position),o(m)||a(m)||35===m||38===m||42===m||33===m||124===m||62===m||39===m||34===m||37===m||64===m||96===m)return!1;if((63===m||45===m)&&(u=e.input.charCodeAt(e.position+1),o(u)||n&&a(u)))return!1;for(e.kind="scalar",e.result="",l=c=e.position,p=!1;0!==m;){if(58===m){if(u=e.input.charCodeAt(e.position+1),o(u)||n&&a(u))break}else if(35===m){if(s=e.input.charCodeAt(e.position-1),o(s))break}else{if(e.position===e.lineStart&&x(e)||n&&a(m))break;if(r(m)){if(f=e.line,h=e.lineStart,d=e.lineIndent,b(e,!1,-1),e.lineIndent>=t){p=!0,m=e.input.charCodeAt(e.position);continue}e.position=c,e.line=f,e.lineStart=h,e.lineIndent=d;break}}p&&(v(e,l,c,!1),w(e,e.line-f),l=c=e.position,p=!1),i(m)||(c=e.position+1),m=e.input.charCodeAt(++e.position)}return v(e,l,c,!1),!!e.result||(e.kind=g,e.result=y,!1)}function E(e,t){var n,i,o;if(39!==(n=e.input.charCodeAt(e.position)))return!1;for(e.kind="scalar",e.result="",e.position++,i=o=e.position;0!==(n=e.input.charCodeAt(e.position));)if(39===n){if(v(e,i,e.position,!0),39!==(n=e.input.charCodeAt(++e.position)))return!0;i=e.position,e.position++,o=e.position}else r(n)?(v(e,i,o,!0),w(e,b(e,!1,t)),i=o=e.position):e.position===e.lineStart&&x(e)?d(e,"unexpected end of the document within a single quoted scalar"):(e.position++,o=e.position);d(e,"unexpected end of the stream within a single quoted scalar")}function S(e,t){var n,i,o,a,l,c;if(34!==(c=e.input.charCodeAt(e.position)))return!1;for(e.kind="scalar",e.result="",e.position++,n=i=e.position;0!==(c=e.input.charCodeAt(e.position));){if(34===c)return v(e,n,e.position,!0),e.position++,!0;if(92===c){if(v(e,n,e.position,!0),c=e.input.charCodeAt(++e.position),r(c))b(e,!1,t);else if(c<256&&ie[c])e.result+=oe[c],e.position++;else if((l=u(c))>0){for(o=l,a=0;o>0;o--)c=e.input.charCodeAt(++e.position),(l=s(c))>=0?a=(a<<4)+l:d(e,"expected hexadecimal character");e.result+=p(a),e.position++}else d(e,"unknown escape sequence");n=i=e.position}else r(c)?(v(e,n,i,!0),w(e,b(e,!1,t)),n=i=e.position):e.position===e.lineStart&&x(e)?d(e,"unexpected end of the document within a double quoted scalar"):(e.position++,i=e.position)}d(e,"unexpected end of the stream within a double quoted scalar")}function C(e,t){var n,r,i,a,s,u,l,c,p,f,h,m=!0,v=e.tag,g=e.anchor,_={};if(91===(h=e.input.charCodeAt(e.position)))a=93,l=!1,r=[];else{if(123!==h)return!1;a=125,l=!0,r={}}for(null!==e.anchor&&(e.anchorMap[e.anchor]=r),h=e.input.charCodeAt(++e.position);0!==h;){if(b(e,!0,t),(h=e.input.charCodeAt(e.position))===a)return e.position++,e.tag=v,e.anchor=g,e.kind=l?"mapping":"sequence",e.result=r,!0;m||d(e,"missed comma between flow collection entries"),p=c=f=null,s=u=!1,63===h&&(i=e.input.charCodeAt(e.position+1),o(i)&&(s=u=!0,e.position++,b(e,!0,t))),n=e.line,I(e,t,G,!1,!0),p=e.tag,c=e.result,b(e,!0,t),h=e.input.charCodeAt(e.position),!u&&e.line!==n||58!==h||(s=!0,h=e.input.charCodeAt(++e.position),b(e,!0,t),I(e,t,G,!1,!0),f=e.result),l?y(e,r,_,p,c,f):s?r.push(y(e,null,_,p,c,f)):r.push(c),b(e,!0,t),h=e.input.charCodeAt(e.position),44===h?(m=!0,h=e.input.charCodeAt(++e.position)):m=!1}d(e,"unexpected end of the stream within a flow collection")}function A(e,t){var n,o,a,s,u=Y,c=!1,p=!1,f=t,h=0,m=!1;if(124===(s=e.input.charCodeAt(e.position)))o=!1;else{if(62!==s)return!1;o=!0}for(e.kind="scalar",e.result="";0!==s;)if(43===(s=e.input.charCodeAt(++e.position))||45===s)Y===u?u=43===s?Z:$:d(e,"repeat of a chomping mode identifier");else{if(!((a=l(s))>=0))break;0===a?d(e,"bad explicit indentation width of a block scalar; it cannot be less than one"):p?d(e,"repeat of an indentation width identifier"):(f=t+a-1,p=!0)}if(i(s)){do{s=e.input.charCodeAt(++e.position)}while(i(s));if(35===s)do{s=e.input.charCodeAt(++e.position)}while(!r(s)&&0!==s)}for(;0!==s;){for(_(e),e.lineIndent=0,s=e.input.charCodeAt(e.position);(!p||e.lineIndent<f)&&32===s;)e.lineIndent++,s=e.input.charCodeAt(++e.position);if(!p&&e.lineIndent>f&&(f=e.lineIndent),r(s))h++;else{if(e.lineIndent<f){u===Z?e.result+=q.repeat("\n",c?1+h:h):u===Y&&c&&(e.result+="\n");break}for(o?i(s)?(m=!0,e.result+=q.repeat("\n",c?1+h:h)):m?(m=!1,e.result+=q.repeat("\n",h+1)):0===h?c&&(e.result+=" "):e.result+=q.repeat("\n",h):e.result+=q.repeat("\n",c?1+h:h),c=!0,p=!0,h=0,n=e.position;!r(s)&&0!==s;)s=e.input.charCodeAt(++e.position);v(e,n,e.position,!1)}}return!0}function D(e,t){var n,r,i,a=e.tag,s=e.anchor,u=[],l=!1;for(null!==e.anchor&&(e.anchorMap[e.anchor]=u),i=e.input.charCodeAt(e.position);0!==i&&45===i&&(r=e.input.charCodeAt(e.position+1),o(r));)if(l=!0,e.position++,b(e,!0,-1)&&e.lineIndent<=t)u.push(null),i=e.input.charCodeAt(e.position);else if(n=e.line,I(e,t,K,!1,!0),u.push(e.result),b(e,!0,-1),i=e.input.charCodeAt(e.position),(e.line===n||e.lineIndent>t)&&0!==i)d(e,"bad indentation of a sequence entry");else if(e.lineIndent<t)break;return!!l&&(e.tag=a,e.anchor=s,e.kind="sequence",e.result=u,!0)}function O(e,t,n){var r,a,s,u,l,c=e.tag,p=e.anchor,f={},h={},m=null,v=null,g=null,_=!1,x=!1;for(null!==e.anchor&&(e.anchorMap[e.anchor]=f),l=e.input.charCodeAt(e.position);0!==l;){if(r=e.input.charCodeAt(e.position+1),s=e.line,u=e.position,63!==l&&58!==l||!o(r)){if(!I(e,n,J,!1,!0))break;if(e.line===s){for(l=e.input.charCodeAt(e.position);i(l);)l=e.input.charCodeAt(++e.position);if(58===l)l=e.input.charCodeAt(++e.position),o(l)||d(e,"a whitespace character is expected after the key-value separator within a block mapping"),_&&(y(e,f,h,m,v,null),m=v=g=null),x=!0,_=!1,a=!1,m=e.tag,v=e.result;else{if(!x)return e.tag=c,e.anchor=p,!0;d(e,"can not read an implicit mapping pair; a colon is missed")}}else{if(!x)return e.tag=c,e.anchor=p,!0;d(e,"can not read a block mapping entry; a multiline key may not be an implicit key")}}else 63===l?(_&&(y(e,f,h,m,v,null),m=v=g=null),x=!0,_=!0,a=!0):_?(_=!1,a=!0):d(e,"incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"),e.position+=1,l=r;if((e.line===s||e.lineIndent>t)&&(I(e,t,X,!0,a)&&(_?v=e.result:g=e.result),_||(y(e,f,h,m,v,g,s,u),m=v=g=null),b(e,!0,-1),l=e.input.charCodeAt(e.position)),e.lineIndent>t&&0!==l)d(e,"bad indentation of a mapping entry");else if(e.lineIndent<t)break}return _&&y(e,f,h,m,v,null),x&&(e.tag=c,e.anchor=p,e.kind="mapping",e.result=f),x}function M(e){var t,n,r,i,a=!1,s=!1;if(33!==(i=e.input.charCodeAt(e.position)))return!1;if(null!==e.tag&&d(e,"duplication of a tag property"),i=e.input.charCodeAt(++e.position),60===i?(a=!0,i=e.input.charCodeAt(++e.position)):33===i?(s=!0,n="!!",i=e.input.charCodeAt(++e.position)):n="!",t=e.position,a){do{i=e.input.charCodeAt(++e.position)}while(0!==i&&62!==i);e.position<e.length?(r=e.input.slice(t,e.position),i=e.input.charCodeAt(++e.position)):d(e,"unexpected end of the stream within a verbatim tag")}else{for(;0!==i&&!o(i);)33===i&&(s?d(e,"tag suffix cannot contain exclamation marks"):(n=e.input.slice(t-1,e.position+1),ne.test(n)||d(e,"named tag handle cannot contain such characters"),s=!0,t=e.position+1)),i=e.input.charCodeAt(++e.position);r=e.input.slice(t,e.position),te.test(r)&&d(e,"tag suffix cannot contain flow indicator characters")}return r&&!re.test(r)&&d(e,"tag name cannot contain such characters: "+r),a?e.tag=r:H.call(e.tagMap,n)?e.tag=e.tagMap[n]+r:"!"===n?e.tag="!"+r:"!!"===n?e.tag="tag:yaml.org,2002:"+r:d(e,'undeclared tag handle "'+n+'"'),!0}function T(e){var t,n;if(38!==(n=e.input.charCodeAt(e.position)))return!1;for(null!==e.anchor&&d(e,"duplication of an anchor property"),n=e.input.charCodeAt(++e.position),t=e.position;0!==n&&!o(n)&&!a(n);)n=e.input.charCodeAt(++e.position);return e.position===t&&d(e,"name of an anchor node must contain at least one character"),e.anchor=e.input.slice(t,e.position),!0}function P(e){var t,n,r;if(42!==(r=e.input.charCodeAt(e.position)))return!1;for(r=e.input.charCodeAt(++e.position),t=e.position;0!==r&&!o(r)&&!a(r);)r=e.input.charCodeAt(++e.position);return e.position===t&&d(e,"name of an alias node must contain at least one character"),n=e.input.slice(t,e.position),e.anchorMap.hasOwnProperty(n)||d(e,'unidentified alias "'+n+'"'),e.result=e.anchorMap[n],b(e,!0,-1),!0}function I(e,t,n,r,i){var o,a,s,u,l,c,p,f,h=1,m=!1,v=!1;if(null!==e.listener&&e.listener("open",e),e.tag=null,e.anchor=null,e.kind=null,e.result=null,o=a=s=X===n||K===n,r&&b(e,!0,-1)&&(m=!0,e.lineIndent>t?h=1:e.lineIndent===t?h=0:e.lineIndent<t&&(h=-1)),1===h)for(;M(e)||T(e);)b(e,!0,-1)?(m=!0,s=o,e.lineIndent>t?h=1:e.lineIndent===t?h=0:e.lineIndent<t&&(h=-1)):s=!1;if(s&&(s=m||i),1!==h&&X!==n||(p=G===n||J===n?t:t+1,f=e.position-e.lineStart,1===h?s&&(D(e,f)||O(e,f,p))||C(e,p)?v=!0:(a&&A(e,p)||E(e,p)||S(e,p)?v=!0:P(e)?(v=!0,null===e.tag&&null===e.anchor||d(e,"alias node should not have any properties")):k(e,p,G===n)&&(v=!0,null===e.tag&&(e.tag="?")),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):0===h&&(v=s&&D(e,f))),null!==e.tag&&"!"!==e.tag)if("?"===e.tag){for(u=0,l=e.implicitTypes.length;u<l;u+=1)if(c=e.implicitTypes[u],c.resolve(e.result)){e.result=c.construct(e.result),e.tag=c.tag,null!==e.anchor&&(e.anchorMap[e.anchor]=e.result);break}}else H.call(e.typeMap[e.kind||"fallback"],e.tag)?(c=e.typeMap[e.kind||"fallback"][e.tag],null!==e.result&&c.kind!==e.kind&&d(e,"unacceptable node kind for !<"+e.tag+'> tag; it should be "'+c.kind+'", not "'+e.kind+'"'),c.resolve(e.result)?(e.result=c.construct(e.result),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):d(e,"cannot resolve a node with !<"+e.tag+"> explicit tag")):d(e,"unknown tag !<"+e.tag+">");return null!==e.listener&&e.listener("close",e),null!==e.tag||null!==e.anchor||v}function R(e){var t,n,a,s,u=e.position,l=!1;for(e.version=null,e.checkLineBreaks=e.legacy,e.tagMap={},e.anchorMap={};0!==(s=e.input.charCodeAt(e.position))&&(b(e,!0,-1),s=e.input.charCodeAt(e.position),!(e.lineIndent>0||37!==s));){for(l=!0,s=e.input.charCodeAt(++e.position),t=e.position;0!==s&&!o(s);)s=e.input.charCodeAt(++e.position);for(n=e.input.slice(t,e.position),a=[],n.length<1&&d(e,"directive name must not be less than one character in length");0!==s;){for(;i(s);)s=e.input.charCodeAt(++e.position);if(35===s){do{s=e.input.charCodeAt(++e.position)}while(0!==s&&!r(s));break}if(r(s))break;for(t=e.position;0!==s&&!o(s);)s=e.input.charCodeAt(++e.position);a.push(e.input.slice(t,e.position))}0!==s&&_(e),H.call(se,n)?se[n](e,n,a):m(e,'unknown document directive "'+n+'"')}if(b(e,!0,-1),0===e.lineIndent&&45===e.input.charCodeAt(e.position)&&45===e.input.charCodeAt(e.position+1)&&45===e.input.charCodeAt(e.position+2)?(e.position+=3,b(e,!0,-1)):l&&d(e,"directives end mark is expected"),I(e,e.lineIndent-1,X,!1,!0),b(e,!0,-1),e.checkLineBreaks&&ee.test(e.input.slice(u,e.position))&&m(e,"non-ASCII line breaks are interpreted as content"),e.documents.push(e.result),e.position===e.lineStart&&x(e))return void(46===e.input.charCodeAt(e.position)&&(e.position+=3,b(e,!0,-1)));e.position<e.length-1&&d(e,"end of the stream or a document separator is expected")}function j(e,t){e=String(e),t=t||{},0!==e.length&&(10!==e.charCodeAt(e.length-1)&&13!==e.charCodeAt(e.length-1)&&(e+="\n"),65279===e.charCodeAt(0)&&(e=e.slice(1)));var n=new f(e,t);for(n.input+="\0";32===n.input.charCodeAt(n.position);)n.lineIndent+=1,n.position+=1;for(;n.position<n.length-1;)R(n);return n.documents}function F(e,t,n){var r,i,o=j(e,n);if("function"!=typeof t)return o;for(r=0,i=o.length;r<i;r+=1)t(o[r])}function N(e,t){var n=j(e,t);if(0!==n.length){if(1===n.length)return n[0];throw new z("expected a single document in the stream, but found more")}}function B(e,t,n){if("function"!=typeof t)return F(e,q.extend({schema:W},n));F(e,t,q.extend({schema:W},n))}function L(e,t){return N(e,q.extend({schema:W},t))}for(var q=n(80),z=n(117),U=n(798),W=n(118),V=n(145),H=Object.prototype.hasOwnProperty,G=1,J=2,K=3,X=4,Y=1,$=2,Z=3,Q=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,ee=/[\x85\u2028\u2029]/,te=/[,\[\]\{\}]/,ne=/^(?:!|!!|![a-z\-]+!)$/i,re=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i,ie=new Array(256),oe=new Array(256),ae=0;ae<256;ae++)ie[ae]=c(ae)?1:0,oe[ae]=c(ae);var se={YAML:function(e,t,n){var r,i,o;null!==e.version&&d(e,"duplication of %YAML directive"),1!==n.length&&d(e,"YAML directive accepts exactly one argument"),r=/^([0-9]+)\.([0-9]+)$/.exec(n[0]),null===r&&d(e,"ill-formed argument of the YAML directive"),i=parseInt(r[1],10),o=parseInt(r[2],10),1!==i&&d(e,"unacceptable YAML version of the document"),e.version=n[0],e.checkLineBreaks=o<2,1!==o&&2!==o&&m(e,"unsupported YAML version of the document")},TAG:function(e,t,n){var r,i;2!==n.length&&d(e,"TAG directive accepts exactly two arguments"),r=n[0],i=n[1],ne.test(r)||d(e,"ill-formed tag handle (first argument) of the TAG directive"),H.call(e.tagMap,r)&&d(e,'there is a previously declared suffix for "'+r+'" tag handle'),re.test(i)||d(e,"ill-formed tag prefix (second argument) of the TAG directive"),e.tagMap[r]=i}};e.exports.loadAll=F,e.exports.load=N,e.exports.safeLoadAll=B,e.exports.safeLoad=L},function(e,t,n){"use strict";function r(e,t,n,r,i){this.name=e,this.buffer=t,this.position=n,this.line=r,this.column=i}var i=n(80);r.prototype.getSnippet=function(e,t){var n,r,o,a,s;if(!this.buffer)return null;for(e=e||4,t=t||75,n="",r=this.position;r>0&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(r-1));)if(r-=1,this.position-r>t/2-1){n=" ... ",r+=5;break}for(o="",a=this.position;a<this.buffer.length&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(a));)if((a+=1)-this.position>t/2-1){o=" ... ",a-=5;break}return s=this.buffer.slice(r,a),i.repeat(" ",e)+n+s+o+"\n"+i.repeat(" ",e+this.position-r+n.length)+"^"},r.prototype.toString=function(e){var t,n="";return this.name&&(n+='in "'+this.name+'" '),n+="at line "+(this.line+1)+", column "+(this.column+1),e||(t=this.getSnippet())&&(n+=":\n"+t),n},e.exports=r},function(e,t,n){"use strict";function r(e){if(null===e)return!1;var t,n,r=0,i=e.length,o=l;for(n=0;n<i;n++)if(!((t=o.indexOf(e.charAt(n)))>64)){if(t<0)return!1;r+=6}return r%8==0}function i(e){var t,n,r=e.replace(/[\r\n=]/g,""),i=r.length,o=l,a=0,u=[];for(t=0;t<i;t++)t%4==0&&t&&(u.push(a>>16&255),u.push(a>>8&255),u.push(255&a)),a=a<<6|o.indexOf(r.charAt(t));return n=i%4*6,0===n?(u.push(a>>16&255),u.push(a>>8&255),u.push(255&a)):18===n?(u.push(a>>10&255),u.push(a>>2&255)):12===n&&u.push(a>>4&255),s?s.from?s.from(u):new s(u):u}function o(e){var t,n,r="",i=0,o=e.length,a=l;for(t=0;t<o;t++)t%3==0&&t&&(r+=a[i>>18&63],r+=a[i>>12&63],r+=a[i>>6&63],r+=a[63&i]),i=(i<<8)+e[t];return n=o%3,0===n?(r+=a[i>>18&63],r+=a[i>>12&63],r+=a[i>>6&63],r+=a[63&i]):2===n?(r+=a[i>>10&63],r+=a[i>>4&63],r+=a[i<<2&63],r+=a[64]):1===n&&(r+=a[i>>2&63],r+=a[i<<4&63],r+=a[64],r+=a[64]),r}function a(e){return s&&s.isBuffer(e)}var s;try{s=n(40).Buffer}catch(e){}var u=n(16),l="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r";e.exports=new u("tag:yaml.org,2002:binary",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o})},function(e,t,n){"use strict";function r(e){if(null===e)return!1;var t=e.length;return 4===t&&("true"===e||"True"===e||"TRUE"===e)||5===t&&("false"===e||"False"===e||"FALSE"===e)}function i(e){return"true"===e||"True"===e||"TRUE"===e}function o(e){return"[object Boolean]"===Object.prototype.toString.call(e)}var a=n(16);e.exports=new a("tag:yaml.org,2002:bool",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:{lowercase:function(e){return e?"true":"false"},uppercase:function(e){return e?"TRUE":"FALSE"},camelcase:function(e){return e?"True":"False"}},defaultStyle:"lowercase"})},function(e,t,n){"use strict";function r(e){return null!==e&&!(!l.test(e)||"_"===e[e.length-1])}function i(e){var t,n,r,i;return t=e.replace(/_/g,"").toLowerCase(),n="-"===t[0]?-1:1,i=[],"+-".indexOf(t[0])>=0&&(t=t.slice(1)),".inf"===t?1===n?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:".nan"===t?NaN:t.indexOf(":")>=0?(t.split(":").forEach(function(e){i.unshift(parseFloat(e,10))}),t=0,r=1,i.forEach(function(e){t+=e*r,r*=60}),n*t):n*parseFloat(t,10)}function o(e,t){var n;if(isNaN(e))switch(t){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===e)switch(t){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===e)switch(t){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(s.isNegativeZero(e))return"-0.0";return n=e.toString(10),c.test(n)?n.replace("e",".e"):n}function a(e){return"[object Number]"===Object.prototype.toString.call(e)&&(e%1!=0||s.isNegativeZero(e))}var s=n(80),u=n(16),l=new RegExp("^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$"),c=/^[-+]?[0-9]+e/;e.exports=new u("tag:yaml.org,2002:float",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o,defaultStyle:"lowercase"})},function(e,t,n){"use strict";function r(e){return 48<=e&&e<=57||65<=e&&e<=70||97<=e&&e<=102}function i(e){return 48<=e&&e<=55}function o(e){return 48<=e&&e<=57}function a(e){if(null===e)return!1;var t,n=e.length,a=0,s=!1;if(!n)return!1;if(t=e[a],"-"!==t&&"+"!==t||(t=e[++a]),"0"===t){if(a+1===n)return!0;if("b"===(t=e[++a])){for(a++;a<n;a++)if("_"!==(t=e[a])){if("0"!==t&&"1"!==t)return!1;s=!0}return s&&"_"!==t}if("x"===t){for(a++;a<n;a++)if("_"!==(t=e[a])){if(!r(e.charCodeAt(a)))return!1;s=!0}return s&&"_"!==t}for(;a<n;a++)if("_"!==(t=e[a])){if(!i(e.charCodeAt(a)))return!1;s=!0}return s&&"_"!==t}if("_"===t)return!1;for(;a<n;a++)if("_"!==(t=e[a])){if(":"===t)break;if(!o(e.charCodeAt(a)))return!1;s=!0}return!(!s||"_"===t)&&(":"!==t||/^(:[0-5]?[0-9])+$/.test(e.slice(a)))}function s(e){var t,n,r=e,i=1,o=[];return-1!==r.indexOf("_")&&(r=r.replace(/_/g,"")),t=r[0],"-"!==t&&"+"!==t||("-"===t&&(i=-1),r=r.slice(1),t=r[0]),"0"===r?0:"0"===t?"b"===r[1]?i*parseInt(r.slice(2),2):"x"===r[1]?i*parseInt(r,16):i*parseInt(r,8):-1!==r.indexOf(":")?(r.split(":").forEach(function(e){o.unshift(parseInt(e,10))}),r=0,n=1,o.forEach(function(e){r+=e*n,n*=60}),i*r):i*parseInt(r,10)}function u(e){return"[object Number]"===Object.prototype.toString.call(e)&&e%1==0&&!l.isNegativeZero(e)}var l=n(80),c=n(16);e.exports=new c("tag:yaml.org,2002:int",{kind:"scalar",resolve:a,construct:s,predicate:u,represent:{binary:function(e){return"0b"+e.toString(2)},octal:function(e){return"0"+e.toString(8)},decimal:function(e){return e.toString(10)},hexadecimal:function(e){return"0x"+e.toString(16).toUpperCase()}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}})},function(e,t,n){"use strict";function r(e){if(null===e)return!1;try{var t="("+e+")",n=s.parse(t,{range:!0});return"Program"===n.type&&1===n.body.length&&"ExpressionStatement"===n.body[0].type&&"FunctionExpression"===n.body[0].expression.type}catch(e){return!1}}function i(e){var t,n="("+e+")",r=s.parse(n,{range:!0}),i=[];if("Program"!==r.type||1!==r.body.length||"ExpressionStatement"!==r.body[0].type||"FunctionExpression"!==r.body[0].expression.type)throw new Error("Failed to resolve function");return r.body[0].expression.params.forEach(function(e){i.push(e.name)}),t=r.body[0].expression.body.range,new Function(i,n.slice(t[0]+1,t[1]-1))}function o(e){return e.toString()}function a(e){return"[object Function]"===Object.prototype.toString.call(e)}var s;try{s=n(743)}catch(e){"undefined"!=typeof window&&(s=window.esprima)}var u=n(16);e.exports=new u("tag:yaml.org,2002:js/function",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o})},function(e,t,n){"use strict";function r(e){if(null===e)return!1;if(0===e.length)return!1;var t=e,n=/\/([gim]*)$/.exec(e),r="";if("/"===t[0]){if(n&&(r=n[1]),r.length>3)return!1;if("/"!==t[t.length-r.length-1])return!1}return!0}function i(e){var t=e,n=/\/([gim]*)$/.exec(e),r="";return"/"===t[0]&&(n&&(r=n[1]),t=t.slice(1,t.length-r.length-1)),new RegExp(t,r)}function o(e){var t="/"+e.source+"/";return e.global&&(t+="g"),e.multiline&&(t+="m"),e.ignoreCase&&(t+="i"),t}function a(e){return"[object RegExp]"===Object.prototype.toString.call(e)}var s=n(16);e.exports=new s("tag:yaml.org,2002:js/regexp",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o})},function(e,t,n){"use strict";function r(){return!0}function i(){}function o(){return""}function a(e){return void 0===e}var s=n(16);e.exports=new s("tag:yaml.org,2002:js/undefined",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o})},function(e,t,n){"use strict";var r=n(16);e.exports=new r("tag:yaml.org,2002:map",{kind:"mapping",construct:function(e){return null!==e?e:{}}})},function(e,t,n){"use strict";function r(e){return"<<"===e||null===e}var i=n(16);e.exports=new i("tag:yaml.org,2002:merge",{kind:"scalar",resolve:r})},function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t=e.length;return 1===t&&"~"===e||4===t&&("null"===e||"Null"===e||"NULL"===e)}function i(){return null}function o(e){return null===e}var a=n(16);e.exports=new a("tag:yaml.org,2002:null",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"}},defaultStyle:"lowercase"})},function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t,n,r,i,o,u=[],l=e;for(t=0,n=l.length;t<n;t+=1){if(r=l[t],o=!1,"[object Object]"!==s.call(r))return!1;for(i in r)if(a.call(r,i)){if(o)return!1;o=!0}if(!o)return!1;if(-1!==u.indexOf(i))return!1;u.push(i)}return!0}function i(e){return null!==e?e:[]}var o=n(16),a=Object.prototype.hasOwnProperty,s=Object.prototype.toString;e.exports=new o("tag:yaml.org,2002:omap",{kind:"sequence",resolve:r,construct:i})},function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t,n,r,i,o,s=e;for(o=new Array(s.length),t=0,n=s.length;t<n;t+=1){if(r=s[t],"[object Object]"!==a.call(r))return!1;if(i=Object.keys(r),1!==i.length)return!1;o[t]=[i[0],r[i[0]]]}return!0}function i(e){if(null===e)return[];var t,n,r,i,o,a=e;for(o=new Array(a.length),t=0,n=a.length;t<n;t+=1)r=a[t],i=Object.keys(r),o[t]=[i[0],r[i[0]]];return o}var o=n(16),a=Object.prototype.toString;e.exports=new o("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:r,construct:i})},function(e,t,n){"use strict";var r=n(16);e.exports=new r("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(e){return null!==e?e:[]}})},function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t,n=e;for(t in n)if(a.call(n,t)&&null!==n[t])return!1;return!0}function i(e){return null!==e?e:{}}var o=n(16),a=Object.prototype.hasOwnProperty;e.exports=new o("tag:yaml.org,2002:set",{kind:"mapping",resolve:r,construct:i})},function(e,t,n){"use strict";var r=n(16);e.exports=new r("tag:yaml.org,2002:str",{kind:"scalar",construct:function(e){return null!==e?e:""}})},function(e,t,n){"use strict";function r(e){return null!==e&&(null!==s.exec(e)||null!==u.exec(e))}function i(e){var t,n,r,i,o,a,l,c,p,f,h=0,d=null;if(t=s.exec(e),null===t&&(t=u.exec(e)),null===t)throw new Error("Date resolve error");if(n=+t[1],r=+t[2]-1,i=+t[3],!t[4])return new Date(Date.UTC(n,r,i));if(o=+t[4],a=+t[5],l=+t[6],t[7]){for(h=t[7].slice(0,3);h.length<3;)h+="0";h=+h}return t[9]&&(c=+t[10],p=+(t[11]||0),d=6e4*(60*c+p),"-"===t[9]&&(d=-d)),f=new Date(Date.UTC(n,r,i,o,a,l,h)),d&&f.setTime(f.getTime()-d),f}function o(e){return e.toISOString()}var a=n(16),s=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),u=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");e.exports=new a("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:r,construct:i,instanceOf:Date,represent:o})},function(e,t,n){"use strict";function r(e){return null==e?void 0===e?u:s:l&&l in Object(e)?n.i(o.a)(e):n.i(a.a)(e)}var i=n(390),o=n(818),a=n(819),s="[object Null]",u="[object Undefined]",l=i.a?i.a.toStringTag:void 0;t.a=r},function(e,t,n){"use strict";(function(e){var n="object"==typeof e&&e&&e.Object===Object&&e;t.a=n}).call(t,n(17))},function(e,t,n){"use strict";var r=n(820),i=n.i(r.a)(Object.getPrototypeOf,Object);t.a=i},function(e,t,n){"use strict";function r(e){var t=a.call(e,u),n=e[u];try{e[u]=void 0;var r=!0}catch(e){}var i=s.call(e);return r&&(t?e[u]=n:delete e[u]),i}var i=n(390),o=Object.prototype,a=o.hasOwnProperty,s=o.toString,u=i.a?i.a.toStringTag:void 0;t.a=r},function(e,t,n){"use strict";function r(e){return o.call(e)}var i=Object.prototype,o=i.toString;t.a=r},function(e,t,n){"use strict";function r(e,t){return function(n){return e(t(n))}}t.a=r},function(e,t,n){"use strict";var r=n(816),i="object"==typeof self&&self&&self.Object===Object&&self,o=r.a||i||Function("return this")();t.a=o},function(e,t,n){"use strict";function r(e){return null!=e&&"object"==typeof e}t.a=r},function(e,t){function n(e,t,n){switch(n.length){case 0:return e.call(t);case 1:return e.call(t,n[0]);case 2:return e.call(t,n[0],n[1]);case 3:return e.call(t,n[0],n[1],n[2])}return e.apply(t,n)}function r(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}function i(e,t){var n=I(e)||h(e)?r(e.length,String):[],i=n.length,o=!!i;for(var a in e)!t&&!A.call(e,a)||o&&("length"==a||l(a,i))||n.push(a);return n}function o(e,t,n){var r=e[t];A.call(e,t)&&f(r,n)&&(void 0!==n||t in e)||(e[t]=n)}function a(e){if(!p(e))return M(e);var t=[];for(var n in Object(e))A.call(e,n)&&"constructor"!=n&&t.push(n);return t}function s(e,t){return t=T(void 0===t?e.length-1:t,0),function(){for(var r=arguments,i=-1,o=T(r.length-t,0),a=Array(o);++i<o;)a[i]=r[t+i];i=-1;for(var s=Array(t+1);++i<t;)s[i]=r[i];return s[t]=a,n(e,this,s)}}function u(e,t,n,r){n||(n={});for(var i=-1,a=t.length;++i<a;){var s=t[i],u=r?r(n[s],e[s],s,n,e):void 0;o(n,s,void 0===u?e[s]:u)}return n}function l(e,t){return!!(t=null==t?x:t)&&("number"==typeof e||S.test(e))&&e>-1&&e%1==0&&e<t}function c(e,t,n){if(!y(n))return!1;var r=typeof t;return!!("number"==r?d(n)&&l(t,n.length):"string"==r&&t in n)&&f(n[t],e)}function p(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||C)}function f(e,t){return e===t||e!==e&&t!==t}function h(e){return m(e)&&A.call(e,"callee")&&(!O.call(e,"callee")||D.call(e)==w)}function d(e){return null!=e&&g(e.length)&&!v(e)}function m(e){return _(e)&&d(e)}function v(e){var t=y(e)?D.call(e):"";return t==k||t==E}function g(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=x}function y(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function _(e){return!!e&&"object"==typeof e}function b(e){return d(e)?i(e):a(e)}var x=9007199254740991,w="[object Arguments]",k="[object Function]",E="[object GeneratorFunction]",S=/^(?:0|[1-9]\d*)$/,C=Object.prototype,A=C.hasOwnProperty,D=C.toString,O=C.propertyIsEnumerable,M=function(e,t){return function(n){return e(t(n))}}(Object.keys,Object),T=Math.max,P=!O.call({valueOf:1},"valueOf"),I=Array.isArray,R=function(e){return s(function(t,n){var r=-1,i=n.length,o=i>1?n[i-1]:void 0,a=i>2?n[2]:void 0;for(o=e.length>3&&"function"==typeof o?(i--,o):void 0,a&&c(n[0],n[1],a)&&(o=i<3?void 0:o,i=1),t=Object(t);++r<i;){var s=n[r];s&&e(t,s,r,o)}return t})}(function(e,t){if(P||p(t)||d(t))return void u(t,b(t),e);for(var n in t)A.call(t,n)&&o(e,n,t[n])});e.exports=R},function(e,t,n){(function(e,n){function r(e,t){return e.set(t[0],t[1]),e}function i(e,t){return e.add(t),e}function o(e,t){for(var n=-1,r=e?e.length:0;++n<r&&!1!==t(e[n],n,e););return e}function a(e,t){for(var n=-1,r=t.length,i=e.length;++n<r;)e[i+n]=t[n];return e}function s(e,t,n,r){var i=-1,o=e?e.length:0;for(r&&o&&(n=e[++i]);++i<o;)n=t(n,e[i],i,e);return n}function u(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}function l(e,t){return null==e?void 0:e[t]}function c(e){var t=!1;if(null!=e&&"function"!=typeof e.toString)try{t=!!(e+"")}catch(e){}return t}function p(e){var t=-1,n=Array(e.size);return e.forEach(function(e,r){n[++t]=[r,e]}),n}function f(e,t){return function(n){return e(t(n))}}function h(e){var t=-1,n=Array(e.size);return e.forEach(function(e){n[++t]=e}),n}function d(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function m(){this.__data__=jt?jt(null):{}}function v(e){return this.has(e)&&delete this.__data__[e]}function g(e){var t=this.__data__;if(jt){var n=t[e];return n===Oe?void 0:n}return gt.call(t,e)?t[e]:void 0}function y(e){var t=this.__data__;return jt?void 0!==t[e]:gt.call(t,e)}function _(e,t){return this.__data__[e]=jt&&void 0===t?Oe:t,this}function b(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function x(){this.__data__=[]}function w(e){var t=this.__data__,n=q(t,e);return!(n<0)&&(n==t.length-1?t.pop():Ct.call(t,n,1),!0)}function k(e){var t=this.__data__,n=q(t,e);return n<0?void 0:t[n][1]}function E(e){return q(this.__data__,e)>-1}function S(e,t){var n=this.__data__,r=q(n,e);return r<0?n.push([e,t]):n[r][1]=t,this}function C(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function A(){this.__data__={hash:new d,map:new(Tt||b),string:new d}}function D(e){return ae(this,e).delete(e)}function O(e){return ae(this,e).get(e)}function M(e){return ae(this,e).has(e)}function T(e,t){return ae(this,e).set(e,t),this}function P(e){this.__data__=new b(e)}function I(){this.__data__=new b}function R(e){return this.__data__.delete(e)}function j(e){return this.__data__.get(e)}function F(e){return this.__data__.has(e)}function N(e,t){var n=this.__data__;if(n instanceof b){var r=n.__data__;if(!Tt||r.length<De-1)return r.push([e,t]),this;n=this.__data__=new C(r)}return n.set(e,t),this}function B(e,t){var n=Ht(e)||ye(e)?u(e.length,String):[],r=n.length,i=!!r;for(var o in e)!t&&!gt.call(e,o)||i&&("length"==o||pe(o,r))||n.push(o);return n}function L(e,t,n){var r=e[t];gt.call(e,t)&&ge(r,n)&&(void 0!==n||t in e)||(e[t]=n)}function q(e,t){for(var n=e.length;n--;)if(ge(e[n][0],t))return n;return-1}function z(e,t){return e&&re(t,Se(t),e)}function U(e,t,n,r,i,a,s){var u;if(r&&(u=a?r(e,i,a,s):r(e)),void 0!==u)return u;if(!ke(e))return e;var l=Ht(e);if(l){if(u=ue(e),!t)return ne(e,u)}else{var p=Vt(e),f=p==Re||p==je;if(Gt(e))return K(e,t);if(p==Be||p==Te||f&&!a){if(c(e))return a?e:{};if(u=le(f?{}:e),!t)return ie(e,z(u,e))}else{if(!it[p])return a?e:{};u=ce(e,p,U,t)}}s||(s=new P);var h=s.get(e);if(h)return h;if(s.set(e,u),!l)var d=n?oe(e):Se(e);return o(d||e,function(i,o){d&&(o=i,i=e[o]),L(u,o,U(i,t,n,r,o,e,s))}),u}function W(e){return ke(e)?Et(e):{}}function V(e,t,n){var r=t(e);return Ht(e)?r:a(r,n(e))}function H(e){return yt.call(e)}function G(e){return!(!ke(e)||he(e))&&(xe(e)||c(e)?_t:nt).test(me(e))}function J(e){if(!de(e))return Ot(e);var t=[];for(var n in Object(e))gt.call(e,n)&&"constructor"!=n&&t.push(n);return t}function K(e,t){if(t)return e.slice();var n=new e.constructor(e.length);return e.copy(n),n}function X(e){var t=new e.constructor(e.byteLength);return new wt(t).set(new wt(e)),t}function Y(e,t){var n=t?X(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.byteLength)}function $(e,t,n){return s(t?n(p(e),!0):p(e),r,new e.constructor)}function Z(e){var t=new e.constructor(e.source,tt.exec(e));return t.lastIndex=e.lastIndex,t}function Q(e,t,n){return s(t?n(h(e),!0):h(e),i,new e.constructor)}function ee(e){return Ut?Object(Ut.call(e)):{}}function te(e,t){var n=t?X(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.length)}function ne(e,t){var n=-1,r=e.length;for(t||(t=Array(r));++n<r;)t[n]=e[n];return t}function re(e,t,n,r){n||(n={});for(var i=-1,o=t.length;++i<o;){var a=t[i],s=r?r(n[a],e[a],a,n,e):void 0;L(n,a,void 0===s?e[a]:s)}return n}function ie(e,t){return re(e,Wt(e),t)}function oe(e){return V(e,Se,Wt)}function ae(e,t){var n=e.__data__;return fe(t)?n["string"==typeof t?"string":"hash"]:n.map}function se(e,t){var n=l(e,t);return G(n)?n:void 0}function ue(e){var t=e.length,n=e.constructor(t);return t&&"string"==typeof e[0]&&gt.call(e,"index")&&(n.index=e.index,n.input=e.input),n}function le(e){return"function"!=typeof e.constructor||de(e)?{}:W(kt(e))}function ce(e,t,n,r){var i=e.constructor;switch(t){case We:return X(e);case Pe:case Ie:return new i(+e);case Ve:return Y(e,r);case He:case Ge:case Je:case Ke:case Xe:case Ye:case $e:case Ze:case Qe:return te(e,r);case Fe:return $(e,r,n);case Ne:case ze:return new i(e);case Le:return Z(e);case qe:return Q(e,r,n);case Ue:return ee(e)}}function pe(e,t){return!!(t=null==t?Me:t)&&("number"==typeof e||rt.test(e))&&e>-1&&e%1==0&&e<t}function fe(e){var t=typeof e;return"string"==t||"number"==t||"symbol"==t||"boolean"==t?"__proto__"!==e:null===e}function he(e){return!!mt&&mt in e}function de(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||ht)}function me(e){if(null!=e){try{return vt.call(e)}catch(e){}try{return e+""}catch(e){}}return""}function ve(e){return U(e,!0,!0)}function ge(e,t){return e===t||e!==e&&t!==t}function ye(e){return be(e)&&gt.call(e,"callee")&&(!St.call(e,"callee")||yt.call(e)==Te)}function _e(e){return null!=e&&we(e.length)&&!xe(e)}function be(e){return Ee(e)&&_e(e)}function xe(e){var t=ke(e)?yt.call(e):"";return t==Re||t==je}function we(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=Me}function ke(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function Ee(e){return!!e&&"object"==typeof e}function Se(e){return _e(e)?B(e):J(e)}function Ce(){return[]}function Ae(){return!1}var De=200,Oe="__lodash_hash_undefined__",Me=9007199254740991,Te="[object Arguments]",Pe="[object Boolean]",Ie="[object Date]",Re="[object Function]",je="[object GeneratorFunction]",Fe="[object Map]",Ne="[object Number]",Be="[object Object]",Le="[object RegExp]",qe="[object Set]",ze="[object String]",Ue="[object Symbol]",We="[object ArrayBuffer]",Ve="[object DataView]",He="[object Float32Array]",Ge="[object Float64Array]",Je="[object Int8Array]",Ke="[object Int16Array]",Xe="[object Int32Array]",Ye="[object Uint8Array]",$e="[object Uint8ClampedArray]",Ze="[object Uint16Array]",Qe="[object Uint32Array]",et=/[\\^$.*+?()[\]{}|]/g,tt=/\w*$/,nt=/^\[object .+?Constructor\]$/,rt=/^(?:0|[1-9]\d*)$/,it={};it[Te]=it["[object Array]"]=it[We]=it[Ve]=it[Pe]=it[Ie]=it[He]=it[Ge]=it[Je]=it[Ke]=it[Xe]=it[Fe]=it[Ne]=it[Be]=it[Le]=it[qe]=it[ze]=it[Ue]=it[Ye]=it[$e]=it[Ze]=it[Qe]=!0,it["[object Error]"]=it[Re]=it["[object WeakMap]"]=!1;var ot="object"==typeof e&&e&&e.Object===Object&&e,at="object"==typeof self&&self&&self.Object===Object&&self,st=ot||at||Function("return this")(),ut="object"==typeof t&&t&&!t.nodeType&&t,lt=ut&&"object"==typeof n&&n&&!n.nodeType&&n,ct=lt&&lt.exports===ut,pt=Array.prototype,ft=Function.prototype,ht=Object.prototype,dt=st["__core-js_shared__"],mt=function(){var e=/[^.]+$/.exec(dt&&dt.keys&&dt.keys.IE_PROTO||"");return e?"Symbol(src)_1."+e:""}(),vt=ft.toString,gt=ht.hasOwnProperty,yt=ht.toString,_t=RegExp("^"+vt.call(gt).replace(et,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),bt=ct?st.Buffer:void 0,xt=st.Symbol,wt=st.Uint8Array,kt=f(Object.getPrototypeOf,Object),Et=Object.create,St=ht.propertyIsEnumerable,Ct=pt.splice,At=Object.getOwnPropertySymbols,Dt=bt?bt.isBuffer:void 0,Ot=f(Object.keys,Object),Mt=se(st,"DataView"),Tt=se(st,"Map"),Pt=se(st,"Promise"),It=se(st,"Set"),Rt=se(st,"WeakMap"),jt=se(Object,"create"),Ft=me(Mt),Nt=me(Tt),Bt=me(Pt),Lt=me(It),qt=me(Rt),zt=xt?xt.prototype:void 0,Ut=zt?zt.valueOf:void 0;d.prototype.clear=m,d.prototype.delete=v,d.prototype.get=g,d.prototype.has=y,d.prototype.set=_,b.prototype.clear=x,b.prototype.delete=w,b.prototype.get=k,b.prototype.has=E,b.prototype.set=S,C.prototype.clear=A,C.prototype.delete=D,C.prototype.get=O,C.prototype.has=M,C.prototype.set=T,P.prototype.clear=I,P.prototype.delete=R,P.prototype.get=j,P.prototype.has=F,P.prototype.set=N;var Wt=At?f(At,Object):Ce,Vt=H;(Mt&&Vt(new Mt(new ArrayBuffer(1)))!=Ve||Tt&&Vt(new Tt)!=Fe||Pt&&"[object Promise]"!=Vt(Pt.resolve())||It&&Vt(new It)!=qe||Rt&&"[object WeakMap]"!=Vt(new Rt))&&(Vt=function(e){var t=yt.call(e),n=t==Be?e.constructor:void 0,r=n?me(n):void 0;if(r)switch(r){case Ft:return Ve;case Nt:return Fe;case Bt:return"[object Promise]";case Lt:return qe;case qt:return"[object WeakMap]"}return t});var Ht=Array.isArray,Gt=Dt||Ae;n.exports=ve}).call(t,n(17),n(72)(e))},function(e,t,n){(function(t){function n(e){if("string"==typeof e)return e;if(i(e))return y?y.call(e):"";var t=e+"";return"0"==t&&1/e==-s?"-0":t}function r(e){return!!e&&"object"==typeof e}function i(e){return"symbol"==typeof e||r(e)&&m.call(e)==u}function o(e){return null==e?"":n(e)}function a(e){return e=o(e),e&&c.test(e)?e.replace(l,"\\$&"):e}var s=1/0,u="[object Symbol]",l=/[\\^$.*+?()[\]{}|]/g,c=RegExp(l.source),p="object"==typeof t&&t&&t.Object===Object&&t,f="object"==typeof self&&self&&self.Object===Object&&self,h=p||f||Function("return this")(),d=Object.prototype,m=d.toString,v=h.Symbol,g=v?v.prototype:void 0,y=g?g.toString:void 0;e.exports=a}).call(t,n(17))},function(e,t){function n(e){var t=!1;if(null!=e&&"function"!=typeof e.toString)try{t=!!(e+"")}catch(e){}return t}function r(e){return!!e&&"object"==typeof e}function i(e){if(!r(e)||p.call(e)!=o||n(e))return!1;var t=f(e);if(null===t)return!0;var i=l.call(t,"constructor")&&t.constructor;return"function"==typeof i&&i instanceof i&&u.call(i)==c}var o="[object Object]",a=Function.prototype,s=Object.prototype,u=a.toString,l=s.hasOwnProperty,c=u.call(Object),p=s.toString,f=function(e,t){return function(n){return e(t(n))}}(Object.getPrototypeOf,Object);e.exports=i},function(e,t,n){(function(e,n){function r(e,t){return e.set(t[0],t[1]),e}function i(e,t){return e.add(t),e}function o(e,t,n){switch(n.length){case 0:return e.call(t);case 1:return e.call(t,n[0]);case 2:return e.call(t,n[0],n[1]);case 3:return e.call(t,n[0],n[1],n[2])}return e.apply(t,n)}function a(e,t){for(var n=-1,r=e?e.length:0;++n<r&&!1!==t(e[n],n,e););return e}function s(e,t){for(var n=-1,r=t.length,i=e.length;++n<r;)e[i+n]=t[n];return e}function u(e,t,n,r){var i=-1,o=e?e.length:0;for(r&&o&&(n=e[++i]);++i<o;)n=t(n,e[i],i,e);return n}function l(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}function c(e,t){return null==e?void 0:e[t]}function p(e){var t=!1;if(null!=e&&"function"!=typeof e.toString)try{t=!!(e+"")}catch(e){}return t}function f(e){var t=-1,n=Array(e.size);return e.forEach(function(e,r){n[++t]=[r,e]}),n}function h(e,t){return function(n){return e(t(n))}}function d(e){var t=-1,n=Array(e.size);return e.forEach(function(e){n[++t]=e}),n}function m(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function v(){this.__data__=Qt?Qt(null):{}}function g(e){return this.has(e)&&delete this.__data__[e]}function y(e){var t=this.__data__;if(Qt){var n=t[e];return n===qe?void 0:n}return It.call(t,e)?t[e]:void 0}function _(e){var t=this.__data__;return Qt?void 0!==t[e]:It.call(t,e)}function b(e,t){return this.__data__[e]=Qt&&void 0===t?qe:t,this}function x(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function w(){this.__data__=[]}function k(e){var t=this.__data__,n=U(t,e);return!(n<0)&&(n==t.length-1?t.pop():Wt.call(t,n,1),!0)}function E(e){var t=this.__data__,n=U(t,e);return n<0?void 0:t[n][1]}function S(e){return U(this.__data__,e)>-1}function C(e,t){var n=this.__data__,r=U(n,e);return r<0?n.push([e,t]):n[r][1]=t,this}function A(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function D(){this.__data__={hash:new m,map:new(Xt||x),string:new m}}function O(e){return he(this,e).delete(e)}function M(e){return he(this,e).get(e)}function T(e){return he(this,e).has(e)}function P(e,t){return he(this,e).set(e,t),this}function I(e){this.__data__=new x(e)}function R(){this.__data__=new x}function j(e){return this.__data__.delete(e)}function F(e){return this.__data__.get(e)}function N(e){return this.__data__.has(e)}function B(e,t){var n=this.__data__;if(n instanceof x){var r=n.__data__;if(!Xt||r.length<Le-1)return r.push([e,t]),this;n=this.__data__=new A(r)}return n.set(e,t),this}function L(e,t){var n=cn(e)||Ce(e)?l(e.length,String):[],r=n.length,i=!!r;for(var o in e)!t&&!It.call(e,o)||i&&("length"==o||ye(o,r))||n.push(o);return n}function q(e,t,n){(void 0===n||Se(e[t],n))&&("number"!=typeof t||void 0!==n||t in e)||(e[t]=n)}function z(e,t,n){var r=e[t];It.call(e,t)&&Se(r,n)&&(void 0!==n||t in e)||(e[t]=n)}function U(e,t){for(var n=e.length;n--;)if(Se(e[n][0],t))return n;return-1}function W(e,t){return e&&ce(t,je(t),e)}function V(e,t,n,r,i,o,s){var u;if(r&&(u=o?r(e,i,o,s):r(e)),void 0!==u)return u;if(!Te(e))return e;var l=cn(e);if(l){if(u=me(e),!t)return le(e,u)}else{var c=ln(e),f=c==He||c==Ge;if(pn(e))return te(e,t);if(c==Xe||c==Ue||f&&!o){if(p(e))return o?e:{};if(u=ve(f?{}:e),!t)return pe(e,W(u,e))}else{if(!gt[c])return o?e:{};u=ge(e,c,V,t)}}s||(s=new I);var h=s.get(e);if(h)return h;if(s.set(e,u),!l)var d=n?fe(e):je(e);return a(d||e,function(i,o){d&&(o=i,i=e[o]),z(u,o,V(i,t,n,r,o,e,s))}),u}function H(e){return Te(e)?zt(e):{}}function G(e,t,n){var r=t(e);return cn(e)?r:s(r,n(e))}function J(e){return jt.call(e)}function K(e){return!(!Te(e)||xe(e))&&(Oe(e)||p(e)?Ft:dt).test(Ee(e))}function X(e){return Pe(e)&&Me(e.length)&&!!vt[jt.call(e)]}function Y(e){if(!we(e))return Gt(e);var t=[];for(var n in Object(e))It.call(e,n)&&"constructor"!=n&&t.push(n);return t}function $(e){if(!Te(e))return ke(e);var t=we(e),n=[];for(var r in e)("constructor"!=r||!t&&It.call(e,r))&&n.push(r);return n}function Z(e,t,n,r,i){if(e!==t){if(!cn(t)&&!fn(t))var o=$(t);a(o||t,function(a,s){if(o&&(s=a,a=t[s]),Te(a))i||(i=new I),Q(e,t,s,n,Z,r,i);else{var u=r?r(e[s],a,s+"",e,t,i):void 0;void 0===u&&(u=a),q(e,s,u)}})}}function Q(e,t,n,r,i,o,a){var s=e[n],u=t[n],l=a.get(u);if(l)return void q(e,n,l);var c=o?o(s,u,n+"",e,t,a):void 0,p=void 0===c;p&&(c=u,cn(u)||fn(u)?cn(s)?c=s:De(s)?c=le(s):(p=!1,c=V(u,!0)):Ie(u)||Ce(u)?Ce(s)?c=Re(s):!Te(s)||r&&Oe(s)?(p=!1,c=V(u,!0)):c=s:p=!1),p&&(a.set(u,c),i(c,u,r,o,a),a.delete(u)),q(e,n,c)}function ee(e,t){return t=Jt(void 0===t?e.length-1:t,0),function(){for(var n=arguments,r=-1,i=Jt(n.length-t,0),a=Array(i);++r<i;)a[r]=n[t+r];r=-1;for(var s=Array(t+1);++r<t;)s[r]=n[r];return s[t]=a,o(e,this,s)}}function te(e,t){if(t)return e.slice();var n=new e.constructor(e.length);return e.copy(n),n}function ne(e){var t=new e.constructor(e.byteLength);return new Lt(t).set(new Lt(e)),t}function re(e,t){var n=t?ne(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.byteLength)}function ie(e,t,n){return u(t?n(f(e),!0):f(e),r,new e.constructor)}function oe(e){var t=new e.constructor(e.source,ht.exec(e));return t.lastIndex=e.lastIndex,t}function ae(e,t,n){return u(t?n(d(e),!0):d(e),i,new e.constructor)}function se(e){return sn?Object(sn.call(e)):{}}function ue(e,t){var n=t?ne(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.length)}function le(e,t){var n=-1,r=e.length;for(t||(t=Array(r));++n<r;)t[n]=e[n];return t}function ce(e,t,n,r){n||(n={});for(var i=-1,o=t.length;++i<o;){var a=t[i],s=r?r(n[a],e[a],a,n,e):void 0;z(n,a,void 0===s?e[a]:s)}return n}function pe(e,t){return ce(e,un(e),t)}function fe(e){return G(e,je,un)}function he(e,t){var n=e.__data__;return be(t)?n["string"==typeof t?"string":"hash"]:n.map}function de(e,t){var n=c(e,t);return K(n)?n:void 0}function me(e){var t=e.length,n=e.constructor(t);return t&&"string"==typeof e[0]&&It.call(e,"index")&&(n.index=e.index,n.input=e.input),n}function ve(e){return"function"!=typeof e.constructor||we(e)?{}:H(qt(e))}function ge(e,t,n,r){var i=e.constructor;switch(t){case tt:return ne(e);case We:case Ve:return new i(+e);case nt:return re(e,r);case rt:case it:case ot:case at:case st:case ut:case lt:case ct:case pt:return ue(e,r);case Je:return ie(e,r,n);case Ke:case Ze:return new i(e);case Ye:return oe(e);case $e:return ae(e,r,n);case Qe:return se(e)}}function ye(e,t){return!!(t=null==t?ze:t)&&("number"==typeof e||mt.test(e))&&e>-1&&e%1==0&&e<t}function _e(e,t,n){if(!Te(n))return!1;var r=typeof t;return!!("number"==r?Ae(n)&&ye(t,n.length):"string"==r&&t in n)&&Se(n[t],e)}function be(e){var t=typeof e;return"string"==t||"number"==t||"symbol"==t||"boolean"==t?"__proto__"!==e:null===e}function xe(e){return!!Tt&&Tt in e}function we(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||Ot)}function ke(e){var t=[];if(null!=e)for(var n in Object(e))t.push(n);return t}function Ee(e){if(null!=e){try{return Pt.call(e)}catch(e){}try{return e+""}catch(e){}}return""}function Se(e,t){return e===t||e!==e&&t!==t}function Ce(e){return De(e)&&It.call(e,"callee")&&(!Ut.call(e,"callee")||jt.call(e)==Ue)}function Ae(e){return null!=e&&Me(e.length)&&!Oe(e)}function De(e){return Pe(e)&&Ae(e)}function Oe(e){var t=Te(e)?jt.call(e):"";return t==He||t==Ge}function Me(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=ze}function Te(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function Pe(e){return!!e&&"object"==typeof e}function Ie(e){if(!Pe(e)||jt.call(e)!=Xe||p(e))return!1;var t=qt(e);if(null===t)return!0;var n=It.call(t,"constructor")&&t.constructor;return"function"==typeof n&&n instanceof n&&Pt.call(n)==Rt}function Re(e){return ce(e,Fe(e))}function je(e){return Ae(e)?L(e):Y(e)}function Fe(e){return Ae(e)?L(e,!0):$(e)}function Ne(){return[]}function Be(){return!1}var Le=200,qe="__lodash_hash_undefined__",ze=9007199254740991,Ue="[object Arguments]",We="[object Boolean]",Ve="[object Date]",He="[object Function]",Ge="[object GeneratorFunction]",Je="[object Map]",Ke="[object Number]",Xe="[object Object]",Ye="[object RegExp]",$e="[object Set]",Ze="[object String]",Qe="[object Symbol]",et="[object WeakMap]",tt="[object ArrayBuffer]",nt="[object DataView]",rt="[object Float32Array]",it="[object Float64Array]",ot="[object Int8Array]",at="[object Int16Array]",st="[object Int32Array]",ut="[object Uint8Array]",lt="[object Uint8ClampedArray]",ct="[object Uint16Array]",pt="[object Uint32Array]",ft=/[\\^$.*+?()[\]{}|]/g,ht=/\w*$/,dt=/^\[object .+?Constructor\]$/,mt=/^(?:0|[1-9]\d*)$/,vt={};vt[rt]=vt[it]=vt[ot]=vt[at]=vt[st]=vt[ut]=vt[lt]=vt[ct]=vt[pt]=!0,vt[Ue]=vt["[object Array]"]=vt[tt]=vt[We]=vt[nt]=vt[Ve]=vt["[object Error]"]=vt[He]=vt[Je]=vt[Ke]=vt[Xe]=vt[Ye]=vt[$e]=vt[Ze]=vt[et]=!1;var gt={};gt[Ue]=gt["[object Array]"]=gt[tt]=gt[nt]=gt[We]=gt[Ve]=gt[rt]=gt[it]=gt[ot]=gt[at]=gt[st]=gt[Je]=gt[Ke]=gt[Xe]=gt[Ye]=gt[$e]=gt[Ze]=gt[Qe]=gt[ut]=gt[lt]=gt[ct]=gt[pt]=!0,gt["[object Error]"]=gt[He]=gt[et]=!1;var yt="object"==typeof e&&e&&e.Object===Object&&e,_t="object"==typeof self&&self&&self.Object===Object&&self,bt=yt||_t||Function("return this")(),xt="object"==typeof t&&t&&!t.nodeType&&t,wt=xt&&"object"==typeof n&&n&&!n.nodeType&&n,kt=wt&&wt.exports===xt,Et=kt&&yt.process,St=function(){try{return Et&&Et.binding("util")}catch(e){}}(),Ct=St&&St.isTypedArray,At=Array.prototype,Dt=Function.prototype,Ot=Object.prototype,Mt=bt["__core-js_shared__"],Tt=function(){var e=/[^.]+$/.exec(Mt&&Mt.keys&&Mt.keys.IE_PROTO||"");return e?"Symbol(src)_1."+e:""}(),Pt=Dt.toString,It=Ot.hasOwnProperty,Rt=Pt.call(Object),jt=Ot.toString,Ft=RegExp("^"+Pt.call(It).replace(ft,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),Nt=kt?bt.Buffer:void 0,Bt=bt.Symbol,Lt=bt.Uint8Array,qt=h(Object.getPrototypeOf,Object),zt=Object.create,Ut=Ot.propertyIsEnumerable,Wt=At.splice,Vt=Object.getOwnPropertySymbols,Ht=Nt?Nt.isBuffer:void 0,Gt=h(Object.keys,Object),Jt=Math.max,Kt=de(bt,"DataView"),Xt=de(bt,"Map"),Yt=de(bt,"Promise"),$t=de(bt,"Set"),Zt=de(bt,"WeakMap"),Qt=de(Object,"create"),en=Ee(Kt),tn=Ee(Xt),nn=Ee(Yt),rn=Ee($t),on=Ee(Zt),an=Bt?Bt.prototype:void 0,sn=an?an.valueOf:void 0;m.prototype.clear=v,m.prototype.delete=g,m.prototype.get=y,m.prototype.has=_,m.prototype.set=b,x.prototype.clear=w,x.prototype.delete=k,x.prototype.get=E,x.prototype.has=S,x.prototype.set=C,A.prototype.clear=D,A.prototype.delete=O,A.prototype.get=M,A.prototype.has=T,A.prototype.set=P,I.prototype.clear=R,I.prototype.delete=j,I.prototype.get=F,I.prototype.has=N,I.prototype.set=B;var un=Vt?h(Vt,Object):Ne,ln=J;(Kt&&ln(new Kt(new ArrayBuffer(1)))!=nt||Xt&&ln(new Xt)!=Je||Yt&&"[object Promise]"!=ln(Yt.resolve())||$t&&ln(new $t)!=$e||Zt&&ln(new Zt)!=et)&&(ln=function(e){var t=jt.call(e),n=t==Xe?e.constructor:void 0,r=n?Ee(n):void 0;if(r)switch(r){case en:return nt;case tn:return Je;case nn:return"[object Promise]";case rn:return $e;case on:return et}return t});var cn=Array.isArray,pn=Ht||Be,fn=Ct?function(e){return function(t){return e(t)}}(Ct):X,hn=function(e){return ee(function(t,n){var r=-1,i=n.length,o=i>1?n[i-1]:void 0,a=i>2?n[2]:void 0;for(o=e.length>3&&"function"==typeof o?(i--,o):void 0,a&&_e(n[0],n[1],a)&&(o=i<3?void 0:o,i=1),t=Object(t);++r<i;){var s=n[r];s&&e(t,s,r,o)}return t})}(function(e,t,n,r){Z(e,t,n,r)});n.exports=hn}).call(t,n(17),n(72)(e))},function(e,t,n){var r=n(67),i=n(43),o=r(i,"DataView");e.exports=o},function(e,t,n){function r(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}var i=n(900),o=n(901),a=n(902),s=n(903),u=n(904);r.prototype.clear=i,r.prototype.delete=o,r.prototype.get=a,r.prototype.has=s,r.prototype.set=u,e.exports=r},function(e,t,n){var r=n(67),i=n(43),o=r(i,"Promise");e.exports=o},function(e,t,n){var r=n(67),i=n(43),o=r(i,"Set");e.exports=o},function(e,t,n){function r(e){var t=-1,n=null==e?0:e.length;for(this.__data__=new i;++t<n;)this.add(e[t])}var i=n(214),o=n(927),a=n(928);r.prototype.add=r.prototype.push=o,r.prototype.has=a,e.exports=r},function(e,t,n){var r=n(67),i=n(43),o=r(i,"WeakMap");e.exports=o},function(e,t){function n(e,t){return e.set(t[0],t[1]),e}e.exports=n},function(e,t){function n(e,t){return e.add(t),e}e.exports=n},function(e,t){function n(e,t,n){switch(n.length){case 0:return e.call(t);case 1:return e.call(t,n[0]);case 2:return e.call(t,n[0],n[1]);case 3:return e.call(t,n[0],n[1],n[2])}return e.apply(t,n)}e.exports=n},function(e,t){function n(e,t){for(var n=-1,r=null==e?0:e.length;++n<r&&!1!==t(e[n],n,e););return e}e.exports=n},function(e,t){function n(e,t){for(var n=-1,r=null==e?0:e.length,i=0,o=[];++n<r;){var a=e[n];t(a,n,e)&&(o[i++]=a)}return o}e.exports=n},function(e,t){function n(e){return e.split("")}e.exports=n},function(e,t){function n(e){return e.match(r)||[]}var r=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;e.exports=n},function(e,t,n){function r(e,t){return e&&i(t,o(t),e)}var i=n(84),o=n(59);e.exports=r},function(e,t,n){function r(e,t){return e&&i(t,o(t),e)}var i=n(84),o=n(424);e.exports=r},function(e,t){function n(e,t,n){return e===e&&(void 0!==n&&(e=e<=n?e:n),void 0!==t&&(e=e>=t?e:t)),e}e.exports=n},function(e,t,n){var r=n(38),i=Object.create,o=function(){function e(){}return function(t){if(!r(t))return{};if(i)return i(t);e.prototype=t;var n=new e;return e.prototype=void 0,n}}();e.exports=o},function(e,t,n){function r(e,t){var n=[];return i(e,function(e,r,i){t(e,r,i)&&n.push(e)}),n}var i=n(217);e.exports=r},function(e,t){function n(e,t,n,r){for(var i=e.length,o=n+(r?1:-1);r?o--:++o<i;)if(t(e[o],o,e))return o;return-1}e.exports=n},function(e,t,n){function r(e,t,n,a,s){var u=-1,l=e.length;for(n||(n=o),s||(s=[]);++u<l;){var c=e[u];t>0&&n(c)?t>1?r(c,t-1,n,a,s):i(s,c):a||(s[s.length]=c)}return s}var i=n(216),o=n(908);e.exports=r},function(e,t,n){var r=n(888),i=r();e.exports=i},function(e,t,n){function r(e,t){return e&&i(e,t,o)}var i=n(848),o=n(59);e.exports=r},function(e,t){function n(e,t){return null!=e&&t in Object(e)}e.exports=n},function(e,t,n){function r(e){return o(e)&&i(e)==a}var i=n(66),o=n(68),a="[object Arguments]";e.exports=r},function(e,t,n){function r(e,t,n,r,v,y){var _=l(e),b=l(t),x=d,w=d;_||(x=u(e),x=x==h?m:x),b||(w=u(t),w=w==h?m:w);var k=x==m,E=w==m,S=x==w;if(S&&c(e)){if(!c(t))return!1;_=!0,k=!1}if(S&&!k)return y||(y=new i),_||p(e)?o(e,t,n,r,v,y):a(e,t,x,n,r,v,y);if(!(n&f)){var C=k&&g.call(e,"__wrapped__"),A=E&&g.call(t,"__wrapped__");if(C||A){var D=C?e.value():e,O=A?t.value():t;return y||(y=new i),v(D,O,n,r,y)}}return!!S&&(y||(y=new i),s(e,t,n,r,v,y))}var i=n(215),o=n(404),a=n(892),s=n(893),u=n(409),l=n(20),c=n(227),p=n(423),f=1,h="[object Arguments]",d="[object Array]",m="[object Object]",v=Object.prototype,g=v.hasOwnProperty;e.exports=r},function(e,t,n){function r(e,t,n,r){var u=n.length,l=u,c=!r;if(null==e)return!l;for(e=Object(e);u--;){var p=n[u];if(c&&p[2]?p[1]!==e[p[0]]:!(p[0]in e))return!1}for(;++u<l;){p=n[u];var f=p[0],h=e[f],d=p[1];if(c&&p[2]){if(void 0===h&&!(f in e))return!1}else{var m=new i;if(r)var v=r(h,d,f,e,t,m);if(!(void 0===v?o(d,h,a|s,r,m):v))return!1}}return!0}var i=n(215),o=n(399),a=1,s=2;e.exports=r},function(e,t,n){function r(e){return!(!a(e)||o(e))&&(i(e)?d:l).test(s(e))}var i=n(420),o=n(910),a=n(38),s=n(418),u=/[\\^$.*+?()[\]{}|]/g,l=/^\[object .+?Constructor\]$/,c=Function.prototype,p=Object.prototype,f=c.toString,h=p.hasOwnProperty,d=RegExp("^"+f.call(h).replace(u,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");e.exports=r},function(e,t,n){function r(e){return a(e)&&o(e.length)&&!!s[i(e)]}var i=n(66),o=n(228),a=n(68),s={};s["[object Float32Array]"]=s["[object Float64Array]"]=s["[object Int8Array]"]=s["[object Int16Array]"]=s["[object Int32Array]"]=s["[object Uint8Array]"]=s["[object Uint8ClampedArray]"]=s["[object Uint16Array]"]=s["[object Uint32Array]"]=!0,s["[object Arguments]"]=s["[object Array]"]=s["[object ArrayBuffer]"]=s["[object Boolean]"]=s["[object DataView]"]=s["[object Date]"]=s["[object Error]"]=s["[object Function]"]=s["[object Map]"]=s["[object Number]"]=s["[object Object]"]=s["[object RegExp]"]=s["[object Set]"]=s["[object String]"]=s["[object WeakMap]"]=!1,e.exports=r},function(e,t,n){function r(e){if(!i(e))return o(e);var t=[];for(var n in Object(e))s.call(e,n)&&"constructor"!=n&&t.push(n);return t}var i=n(153),o=n(922),a=Object.prototype,s=a.hasOwnProperty;e.exports=r},function(e,t,n){function r(e){if(!i(e))return a(e);var t=o(e),n=[];for(var r in e)("constructor"!=r||!t&&u.call(e,r))&&n.push(r);return n}var i=n(38),o=n(153),a=n(923),s=Object.prototype,u=s.hasOwnProperty;e.exports=r},function(e,t,n){function r(e){var t=o(e);return 1==t.length&&t[0][2]?a(t[0][0],t[0][1]):function(n){return n===e||i(n,e,t)}}var i=n(853),o=n(895),a=n(414);e.exports=r},function(e,t,n){function r(e,t){return s(e)&&u(t)?l(c(e),t):function(n){var r=o(n,e);return void 0===r&&r===t?a(n,e):i(t,r,p|f)}}var i=n(399),o=n(224),a=n(419),s=n(221),u=n(412),l=n(414),c=n(85),p=1,f=2;e.exports=r},function(e,t,n){function r(e,t){return e=Object(e),i(e,t,function(t,n){return o(e,n)})}var i=n(861),o=n(419);e.exports=r},function(e,t,n){function r(e,t,n){for(var r=-1,s=t.length,u={};++r<s;){var l=t[r],c=i(e,l);n(c,l)&&o(u,a(l,e),c)}return u}var i=n(150),o=n(867),a=n(83);e.exports=r},function(e,t){function n(e){return function(t){return null==t?void 0:t[e]}}e.exports=n},function(e,t,n){function r(e){return function(t){return i(t,e)}}var i=n(150);e.exports=r},function(e,t){function n(e){return function(t){return null==e?void 0:e[t]}}e.exports=n},function(e,t){function n(e,t,n,r,i){return i(e,function(e,i,o){n=r?(r=!1,e):t(n,e,i,o)}),n}e.exports=n},function(e,t,n){function r(e,t){return a(o(e,t,i),e+"")}var i=n(225),o=n(415),a=n(417);e.exports=r},function(e,t,n){function r(e,t,n,r){if(!s(e))return e;t=o(t,e);for(var l=-1,c=t.length,p=c-1,f=e;null!=f&&++l<c;){var h=u(t[l]),d=n;if(l!=p){var m=f[h];d=r?r(m,h,f):void 0,void 0===d&&(d=s(m)?m:a(t[l+1])?[]:{})}i(f,h,d),f=f[h]}return e}var i=n(148),o=n(83),a=n(152),s=n(38),u=n(85);e.exports=r},function(e,t,n){var r=n(943),i=n(403),o=n(225),a=i?function(e,t){return i(e,"toString",{configurable:!0,enumerable:!1,value:r(t),writable:!0})}:o;e.exports=a},function(e,t,n){function r(e,t){var n;return i(e,function(e,r,i){return!(n=t(e,r,i))}),!!n}var i=n(217);e.exports=r},function(e,t){function n(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}e.exports=n},function(e,t){function n(e){return function(t){return e(t)}}e.exports=n},function(e,t,n){function r(e,t){return t=i(t,e),null==(e=a(e,t))||delete e[s(o(t))]}var i=n(83),o=n(947),a=n(926),s=n(85);e.exports=r},function(e,t){function n(e,t){return e.has(t)}e.exports=n},function(e,t,n){function r(e,t,n){var r=e.length;return n=void 0===n?r:n,!t&&n>=r?e:i(e,t,n)}var i=n(400);e.exports=r},function(e,t,n){(function(e){function r(e,t){if(t)return e.slice();var n=e.length,r=l?l(n):new e.constructor(n);return e.copy(r),r}var i=n(43),o="object"==typeof t&&t&&!t.nodeType&&t,a=o&&"object"==typeof e&&e&&!e.nodeType&&e,s=a&&a.exports===o,u=s?i.Buffer:void 0,l=u?u.allocUnsafe:void 0;e.exports=r}).call(t,n(72)(e))},function(e,t,n){function r(e,t){var n=t?i(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.byteLength)}var i=n(218);e.exports=r},function(e,t,n){function r(e,t,n){var r=t?n(a(e),s):a(e);return o(r,i,new e.constructor)}var i=n(834),o=n(147),a=n(413),s=1;e.exports=r},function(e,t){function n(e){var t=new e.constructor(e.source,r.exec(e));return t.lastIndex=e.lastIndex,t}var r=/\w*$/;e.exports=n},function(e,t,n){function r(e,t,n){var r=t?n(a(e),s):a(e);return o(r,i,new e.constructor)}var i=n(835),o=n(147),a=n(416),s=1;e.exports=r},function(e,t,n){function r(e){return a?Object(a.call(e)):{}}var i=n(82),o=i?i.prototype:void 0,a=o?o.valueOf:void 0;e.exports=r},function(e,t,n){function r(e,t){var n=t?i(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.length)}var i=n(218);e.exports=r},function(e,t){function n(e,t){var n=-1,r=e.length;for(t||(t=Array(r));++n<r;)t[n]=e[n];return t}e.exports=n},function(e,t,n){function r(e,t){return i(e,o(e),t)}var i=n(84),o=n(220);e.exports=r},function(e,t,n){function r(e,t){return i(e,o(e),t)}var i=n(84),o=n(408);e.exports=r},function(e,t,n){var r=n(43),i=r["__core-js_shared__"];e.exports=i},function(e,t,n){function r(e){return i(function(t,n){var r=-1,i=n.length,a=i>1?n[i-1]:void 0,s=i>2?n[2]:void 0;for(a=e.length>3&&"function"==typeof a?(i--,a):void 0,s&&o(n[0],n[1],s)&&(a=i<3?void 0:a,i=1),t=Object(t);++r<i;){var u=n[r];u&&e(t,u,r,a)}return t})}var i=n(866),o=n(411);e.exports=r},function(e,t,n){function r(e,t){return function(n,r){if(null==n)return n;if(!i(n))return e(n,r);for(var o=n.length,a=t?o:-1,s=Object(n);(t?a--:++a<o)&&!1!==r(s[a],a,s););return n}}var i=n(86);e.exports=r},function(e,t){function n(e){return function(t,n,r){for(var i=-1,o=Object(t),a=r(t),s=a.length;s--;){var u=a[e?s:++i];if(!1===n(o[u],u,o))break}return t}}e.exports=n},function(e,t,n){function r(e){return function(t){t=s(t);var n=o(t)?a(t):void 0,r=n?n[0]:t.charAt(0),u=n?i(n,1).join(""):t.slice(1);return r[e]()+u}}var i=n(874),o=n(410),a=n(935),s=n(87);e.exports=r},function(e,t,n){function r(e){return function(t,n,r){var s=Object(t);if(!o(t)){var u=i(n,3);t=a(t),n=function(e){return u(s[e],e,s)}}var l=e(t,n,r);return l>-1?s[u?t[l]:l]:void 0}}var i=n(119),o=n(86),a=n(59);e.exports=r},function(e,t,n){var r=n(864),i={"À":"A","Á":"A","Â":"A","Ã":"A","Ä":"A","Å":"A","à":"a","á":"a","â":"a","ã":"a","ä":"a","å":"a","Ç":"C","ç":"c","Ð":"D","ð":"d","È":"E","É":"E","Ê":"E","Ë":"E","è":"e","é":"e","ê":"e","ë":"e","Ì":"I","Í":"I","Î":"I","Ï":"I","ì":"i","í":"i","î":"i","ï":"i","Ñ":"N","ñ":"n","Ò":"O","Ó":"O","Ô":"O","Õ":"O","Ö":"O","Ø":"O","ò":"o","ó":"o","ô":"o","õ":"o","ö":"o","ø":"o","Ù":"U","Ú":"U","Û":"U","Ü":"U","ù":"u","ú":"u","û":"u","ü":"u","Ý":"Y","ý":"y","ÿ":"y","Æ":"Ae","æ":"ae","Þ":"Th","þ":"th","ß":"ss","Ā":"A","Ă":"A","Ą":"A","ā":"a","ă":"a","ą":"a","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","ć":"c","ĉ":"c","ċ":"c","č":"c","Ď":"D","Đ":"D","ď":"d","đ":"d","Ē":"E","Ĕ":"E","Ė":"E","Ę":"E","Ě":"E","ē":"e","ĕ":"e","ė":"e","ę":"e","ě":"e","Ĝ":"G","Ğ":"G","Ġ":"G","Ģ":"G","ĝ":"g","ğ":"g","ġ":"g","ģ":"g","Ĥ":"H","Ħ":"H","ĥ":"h","ħ":"h","Ĩ":"I","Ī":"I","Ĭ":"I","Į":"I","İ":"I","ĩ":"i","ī":"i","ĭ":"i","į":"i","ı":"i","Ĵ":"J","ĵ":"j","Ķ":"K","ķ":"k","ĸ":"k","Ĺ":"L","Ļ":"L","Ľ":"L","Ŀ":"L","Ł":"L","ĺ":"l","ļ":"l","ľ":"l","ŀ":"l","ł":"l","Ń":"N","Ņ":"N","Ň":"N","Ŋ":"N","ń":"n","ņ":"n","ň":"n","ŋ":"n","Ō":"O","Ŏ":"O","Ő":"O","ō":"o","ŏ":"o","ő":"o","Ŕ":"R","Ŗ":"R","Ř":"R","ŕ":"r","ŗ":"r","ř":"r","Ś":"S","Ŝ":"S","Ş":"S","Š":"S","ś":"s","ŝ":"s","ş":"s","š":"s","Ţ":"T","Ť":"T","Ŧ":"T","ţ":"t","ť":"t","ŧ":"t","Ũ":"U","Ū":"U","Ŭ":"U","Ů":"U","Ű":"U","Ų":"U","ũ":"u","ū":"u","ŭ":"u","ů":"u","ű":"u","ų":"u","Ŵ":"W","ŵ":"w","Ŷ":"Y","ŷ":"y","Ÿ":"Y","Ź":"Z","Ż":"Z","Ž":"Z","ź":"z","ż":"z","ž":"z","IJ":"IJ","ij":"ij","Œ":"Oe","œ":"oe","ʼn":"'n","ſ":"s"},o=r(i);e.exports=o},function(e,t,n){function r(e,t,n,r,i,k,S){switch(n){case w:if(e.byteLength!=t.byteLength||e.byteOffset!=t.byteOffset)return!1;e=e.buffer,t=t.buffer;case x:return!(e.byteLength!=t.byteLength||!k(new o(e),new o(t)));case f:case h:case v:return a(+e,+t);case d:return e.name==t.name&&e.message==t.message;case g:case _:return e==t+"";case m:var C=u;case y:var A=r&c;if(C||(C=l),e.size!=t.size&&!A)return!1;var D=S.get(e);if(D)return D==t;r|=p,S.set(e,t);var O=s(C(e),C(t),r,i,k,S);return S.delete(e),O;case b:if(E)return E.call(e)==E.call(t)}return!1}var i=n(82),o=n(392),a=n(120),s=n(404),u=n(413),l=n(416),c=1,p=2,f="[object Boolean]",h="[object Date]",d="[object Error]",m="[object Map]",v="[object Number]",g="[object RegExp]",y="[object Set]",_="[object String]",b="[object Symbol]",x="[object ArrayBuffer]",w="[object DataView]",k=i?i.prototype:void 0,E=k?k.valueOf:void 0;e.exports=r},function(e,t,n){function r(e,t,n,r,a,u){var l=n&o,c=i(e),p=c.length;if(p!=i(t).length&&!l)return!1;for(var f=p;f--;){var h=c[f];if(!(l?h in t:s.call(t,h)))return!1}var d=u.get(e);if(d&&u.get(t))return d==t;var m=!0;u.set(e,t),u.set(t,e);for(var v=l;++f<p;){h=c[f];var g=e[h],y=t[h];if(r)var _=l?r(y,g,h,t,e,u):r(g,y,h,e,t,u);if(!(void 0===_?g===y||a(g,y,n,r,u):_)){m=!1;break}v||(v="constructor"==h)}if(m&&!v){var b=e.constructor,x=t.constructor;b!=x&&"constructor"in e&&"constructor"in t&&!("function"==typeof b&&b instanceof b&&"function"==typeof x&&x instanceof x)&&(m=!1)}return u.delete(e),u.delete(t),m}var i=n(59),o=1,a=Object.prototype,s=a.hasOwnProperty;e.exports=r},function(e,t,n){function r(e){return i(e,a,o)}var i=n(398),o=n(220),a=n(59);e.exports=r},function(e,t,n){function r(e){for(var t=o(e),n=t.length;n--;){var r=t[n],a=e[r];t[n]=[r,a,i(a)]}return t}var i=n(412),o=n(59);e.exports=r},function(e,t,n){function r(e){var t=a.call(e,u),n=e[u];try{e[u]=void 0;var r=!0}catch(e){}var i=s.call(e);return r&&(t?e[u]=n:delete e[u]),i}var i=n(82),o=Object.prototype,a=o.hasOwnProperty,s=o.toString,u=i?i.toStringTag:void 0;e.exports=r},function(e,t){function n(e,t){return null==e?void 0:e[t]}e.exports=n},function(e,t,n){function r(e,t,n){t=i(t,e);for(var r=-1,c=t.length,p=!1;++r<c;){var f=l(t[r]);if(!(p=null!=e&&n(e,f)))break;e=e[f]}return p||++r!=c?p:!!(c=null==e?0:e.length)&&u(c)&&s(f,c)&&(a(e)||o(e))}var i=n(83),o=n(226),a=n(20),s=n(152),u=n(228),l=n(85);e.exports=r},function(e,t){function n(e){return r.test(e)}var r=/[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;e.exports=n},function(e,t,n){function r(){this.__data__=i?i(null):{},this.size=0}var i=n(154);e.exports=r},function(e,t){function n(e){var t=this.has(e)&&delete this.__data__[e];return this.size-=t?1:0,t}e.exports=n},function(e,t,n){function r(e){var t=this.__data__;if(i){var n=t[e];return n===o?void 0:n}return s.call(t,e)?t[e]:void 0}var i=n(154),o="__lodash_hash_undefined__",a=Object.prototype,s=a.hasOwnProperty;e.exports=r},function(e,t,n){function r(e){var t=this.__data__;return i?void 0!==t[e]:a.call(t,e)}var i=n(154),o=Object.prototype,a=o.hasOwnProperty;e.exports=r},function(e,t,n){function r(e,t){var n=this.__data__;return this.size+=this.has(e)?0:1,n[e]=i&&void 0===t?o:t,this}var i=n(154),o="__lodash_hash_undefined__";e.exports=r},function(e,t){function n(e){var t=e.length,n=e.constructor(t);return t&&"string"==typeof e[0]&&i.call(e,"index")&&(n.index=e.index,n.input=e.input),n}var r=Object.prototype,i=r.hasOwnProperty;e.exports=n},function(e,t,n){function r(e,t,n,r){var M=e.constructor;switch(t){case _:return i(e);case p:case f:return new M(+e);case b:return o(e,r);case x:case w:case k:case E:case S:case C:case A:case D:case O:return c(e,r);case h:return a(e,r,n);case d:case g:return new M(e);case m:return s(e);case v:return u(e,r,n);case y:return l(e)}}var i=n(218),o=n(876),a=n(877),s=n(878),u=n(879),l=n(880),c=n(881),p="[object Boolean]",f="[object Date]",h="[object Map]",d="[object Number]",m="[object RegExp]",v="[object Set]",g="[object String]",y="[object Symbol]",_="[object ArrayBuffer]",b="[object DataView]",x="[object Float32Array]",w="[object Float64Array]",k="[object Int8Array]",E="[object Int16Array]",S="[object Int32Array]",C="[object Uint8Array]",A="[object Uint8ClampedArray]",D="[object Uint16Array]",O="[object Uint32Array]";e.exports=r},function(e,t,n){function r(e){return"function"!=typeof e.constructor||a(e)?{}:i(o(e))}var i=n(844),o=n(219),a=n(153);e.exports=r},function(e,t,n){function r(e){return a(e)||o(e)||!!(s&&e&&e[s])}var i=n(82),o=n(226),a=n(20),s=i?i.isConcatSpreadable:void 0;e.exports=r},function(e,t){function n(e){var t=typeof e;return"string"==t||"number"==t||"symbol"==t||"boolean"==t?"__proto__"!==e:null===e}e.exports=n},function(e,t,n){function r(e){return!!o&&o in e}var i=n(885),o=function(){var e=/[^.]+$/.exec(i&&i.keys&&i.keys.IE_PROTO||"");return e?"Symbol(src)_1."+e:""}();e.exports=r},function(e,t){function n(){this.__data__=[],this.size=0}e.exports=n},function(e,t,n){function r(e){var t=this.__data__,n=i(t,e);return!(n<0)&&(n==t.length-1?t.pop():a.call(t,n,1),--this.size,!0)}var i=n(149),o=Array.prototype,a=o.splice;e.exports=r},function(e,t,n){function r(e){var t=this.__data__,n=i(t,e);return n<0?void 0:t[n][1]}var i=n(149);e.exports=r},function(e,t,n){function r(e){return i(this.__data__,e)>-1}var i=n(149);e.exports=r},function(e,t,n){function r(e,t){var n=this.__data__,r=i(n,e);return r<0?(++this.size,n.push([e,t])):n[r][1]=t,this}var i=n(149);e.exports=r},function(e,t,n){function r(){this.size=0,this.__data__={hash:new i,map:new(a||o),string:new i}}var i=n(829),o=n(146),a=n(213);e.exports=r},function(e,t,n){function r(e){var t=i(this,e).delete(e);return this.size-=t?1:0,t}var i=n(151);e.exports=r},function(e,t,n){function r(e){return i(this,e).get(e)}var i=n(151);e.exports=r},function(e,t,n){function r(e){return i(this,e).has(e)}var i=n(151);e.exports=r},function(e,t,n){function r(e,t){var n=i(this,e),r=n.size;return n.set(e,t),this.size+=n.size==r?0:1,this}var i=n(151);e.exports=r},function(e,t,n){function r(e){var t=i(e,function(e){return n.size===o&&n.clear(),e}),n=t.cache;return t}var i=n(425),o=500;e.exports=r},function(e,t,n){var r=n(222),i=r(Object.keys,Object);e.exports=i},function(e,t){function n(e){var t=[];if(null!=e)for(var n in Object(e))t.push(n);return t}e.exports=n},function(e,t,n){(function(e){var r=n(406),i="object"==typeof t&&t&&!t.nodeType&&t,o=i&&"object"==typeof e&&e&&!e.nodeType&&e,a=o&&o.exports===i,s=a&&r.process,u=function(){try{return s&&s.binding&&s.binding("util")}catch(e){}}();e.exports=u}).call(t,n(72)(e))},function(e,t){function n(e){return i.call(e)}var r=Object.prototype,i=r.toString;e.exports=n},function(e,t,n){function r(e,t){return t.length<2?e:i(e,o(t,0,-1))}var i=n(150),o=n(400);e.exports=r},function(e,t){function n(e){return this.__data__.set(e,r),this}var r="__lodash_hash_undefined__";e.exports=n},function(e,t){function n(e){return this.__data__.has(e)}e.exports=n},function(e,t){function n(e){var t=0,n=0;return function(){var a=o(),s=i-(a-n);if(n=a,s>0){if(++t>=r)return arguments[0]}else t=0;return e.apply(void 0,arguments)}}var r=800,i=16,o=Date.now;e.exports=n},function(e,t,n){function r(){this.__data__=new i,this.size=0}var i=n(146);e.exports=r},function(e,t){function n(e){var t=this.__data__,n=t.delete(e);return this.size=t.size,n}e.exports=n},function(e,t){function n(e){return this.__data__.get(e)}e.exports=n},function(e,t){function n(e){return this.__data__.has(e)}e.exports=n},function(e,t,n){function r(e,t){var n=this.__data__;if(n instanceof i){var r=n.__data__;if(!o||r.length<s-1)return r.push([e,t]),this.size=++n.size,this;n=this.__data__=new a(r)}return n.set(e,t),this.size=n.size,this}var i=n(146),o=n(213),a=n(214),s=200;e.exports=r},function(e,t,n){function r(e){return o(e)?a(e):i(e)}var i=n(839),o=n(410),a=n(937);e.exports=r},function(e,t,n){var r=n(921),i=/^\./,o=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,a=/\\(\\)?/g,s=r(function(e){var t=[];return i.test(e)&&t.push(""),e.replace(o,function(e,n,r,i){t.push(r?i.replace(a,"$1"):n||e)}),t});e.exports=s},function(e,t){function n(e){return e.match(p)||[]}var r="[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]",i="\\ud83c[\\udffb-\\udfff]",o="(?:\\ud83c[\\udde6-\\uddff]){2}",a="[\\ud800-\\udbff][\\udc00-\\udfff]",s="(?:[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|\\ud83c[\\udffb-\\udfff])?",u="(?:\\u200d(?:"+["[^\\ud800-\\udfff]",o,a].join("|")+")[\\ufe0e\\ufe0f]?"+s+")*",l="[\\ufe0e\\ufe0f]?"+s+u,c="(?:"+["[^\\ud800-\\udfff]"+r+"?",r,o,a,"[\\ud800-\\udfff]"].join("|")+")",p=RegExp(i+"(?="+i+")|"+c+l,"g");e.exports=n},function(e,t){function n(e){return e.match(m)||[]}var r="\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",i="["+r+"]",o="[a-z\\xdf-\\xf6\\xf8-\\xff]",a="[^\\ud800-\\udfff"+r+"\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde]",s="(?:\\ud83c[\\udde6-\\uddff]){2}",u="[\\ud800-\\udbff][\\udc00-\\udfff]",l="[A-Z\\xc0-\\xd6\\xd8-\\xde]",c="(?:"+o+"|"+a+")",p="(?:[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|\\ud83c[\\udffb-\\udfff])?",f="(?:\\u200d(?:"+["[^\\ud800-\\udfff]",s,u].join("|")+")[\\ufe0e\\ufe0f]?"+p+")*",h="[\\ufe0e\\ufe0f]?"+p+f,d="(?:"+["[\\u2700-\\u27bf]",s,u].join("|")+")"+h,m=RegExp([l+"?"+o+"+(?:['’](?:d|ll|m|re|s|t|ve))?(?="+[i,l,"$"].join("|")+")","(?:[A-Z\\xc0-\\xd6\\xd8-\\xde]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?:['’](?:D|LL|M|RE|S|T|VE))?(?="+[i,l+c,"$"].join("|")+")",l+"?"+c+"+(?:['’](?:d|ll|m|re|s|t|ve))?",l+"+(?:['’](?:D|LL|M|RE|S|T|VE))?","\\d*(?:(?:1ST|2ND|3RD|(?![123])\\dTH)\\b)","\\d*(?:(?:1st|2nd|3rd|(?![123])\\dth)\\b)","\\d+",d].join("|"),"g");e.exports=n},function(e,t,n){var r=n(148),i=n(84),o=n(886),a=n(86),s=n(153),u=n(59),l=Object.prototype,c=l.hasOwnProperty,p=o(function(e,t){if(s(t)||a(t))return void i(t,u(t),e);for(var n in t)c.call(t,n)&&r(e,n,t[n])});e.exports=p},function(e,t,n){var r=n(941),i=n(402),o=i(function(e,t,n){return t=t.toLowerCase(),e+(n?r(t):t)});e.exports=o},function(e,t,n){function r(e){return o(i(e).toLowerCase())}var i=n(87),o=n(428);e.exports=r},function(e,t,n){function r(e){return i(e,o|a)}var i=n(397),o=1,a=4;e.exports=r},function(e,t){function n(e){return function(){return e}}e.exports=n},function(e,t,n){function r(e){return(e=o(e))&&e.replace(a,i).replace(s,"")}var i=n(891),o=n(87),a=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,s=RegExp("[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]","g");e.exports=r},function(e,t,n){function r(e,t,n){var r=null==e?0:e.length;if(!r)return-1;var u=null==n?0:a(n);return u<0&&(u=s(r+u,0)),i(e,o(t,3),u)}var i=n(846),o=n(119),a=n(427),s=Math.max;e.exports=r},function(e,t,n){function r(e){return(null==e?0:e.length)?i(e,1):[]}var i=n(847);e.exports=r},function(e,t){function n(e){var t=null==e?0:e.length;return t?e[t-1]:void 0}e.exports=n},function(e,t,n){var r=n(402),i=r(function(e,t,n){return e+(n?" ":"")+t.toLowerCase()});e.exports=i},function(e,t){function n(e){if("function"!=typeof e)throw new TypeError(r);return function(){var t=arguments;switch(t.length){case 0:return!e.call(this);case 1:return!e.call(this,t[0]);case 2:return!e.call(this,t[0],t[1]);case 3:return!e.call(this,t[0],t[1],t[2])}return!e.apply(this,t)}}var r="Expected a function";e.exports=n},function(e,t,n){var r=n(394),i=n(397),o=n(872),a=n(83),s=n(84),u=n(405),l=n(407),c=u(function(e,t){var n={};if(null==e)return n;var u=!1;t=r(t,function(t){return t=a(t,e),u||(u=t.length>1),t}),s(e,l(e),n),u&&(n=i(n,7));for(var c=t.length;c--;)o(n,t[c]);return n});e.exports=c},function(e,t,n){var r=n(860),i=n(405),o=i(function(e,t){return null==e?{}:r(e,t)});e.exports=o},function(e,t,n){function r(e){return a(e)?i(s(e)):o(e)}var i=n(862),o=n(863),a=n(221),s=n(85);e.exports=r},function(e,t,n){function r(e,t,n){var r=u(e)?i:s,l=arguments.length<3;return r(e,a(t,4),n,l,o)}var i=n(147),o=n(217),a=n(119),s=n(865),u=n(20);e.exports=r},function(e,t,n){function r(e,t){return(s(e)?i:o)(e,u(a(t,3)))}var i=n(838),o=n(845),a=n(119),s=n(20),u=n(949);e.exports=r},function(e,t,n){function r(e,t,n){var r=s(e)?i:a;return n&&u(e,t,n)&&(t=void 0),r(e,o(t,3))}var i=n(395),o=n(119),a=n(869),s=n(20),u=n(411);e.exports=r},function(e,t,n){function r(e,t,n){return e=s(e),n=i(a(n),0,e.length),t=o(t),e.slice(n,n+t.length)==t}var i=n(843),o=n(401),a=n(427),s=n(87);e.exports=r},function(e,t){function n(){return!1}e.exports=n},function(e,t,n){function r(e){if(!e)return 0===e?e:0;if((e=i(e))===o||e===-o){return(e<0?-1:1)*a}return e===e?e:0}var i=n(959),o=1/0,a=1.7976931348623157e308;e.exports=r},function(e,t,n){function r(e){if("number"==typeof e)return e;if(o(e))return a;if(i(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=i(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(s,"");var n=l.test(e);return n||c.test(e)?p(e.slice(2),n?2:8):u.test(e)?a:+e}var i=n(38),o=n(155),a=NaN,s=/^\s+|\s+$/g,u=/^[-+]0x[0-9a-f]+$/i,l=/^0b[01]+$/i,c=/^0o[0-7]+$/i,p=parseInt;e.exports=r},function(e,t,n){function r(e,t,n){return e=a(e),t=n?void 0:t,void 0===t?o(e)?s(e):i(e):e.match(t)||[]}var i=n(840),o=n(899),a=n(87),s=n(938);e.exports=r},function(e,t,n){"use strict";var r=n(65),i=Object.create,o=Object.prototype.hasOwnProperty;e.exports=function(e){var t,n=0,a=1,s=i(null),u=i(null),l=0;return e=r(e),{hit:function(r){var i=u[r],c=++l;if(s[c]=r,u[r]=c,!i){if(++n<=e)return;return r=s[a],t(r),r}if(delete s[i],a===i)for(;!o.call(s,++a);)continue},delete:t=function(e){var t=u[e];if(t&&(delete s[t],delete u[e],--n,a===t)){if(!n)return l=0,void(a=1);for(;!o.call(s,++a);)continue}},clear:function(){n=0,a=1,s=i(null),u=i(null),l=0}}}},function(e,t,n){"use strict";var r=n(207),i=n(374),o=n(375),a=n(371),s=n(229),u=Array.prototype.slice,l=Function.prototype.apply,c=Object.create,p=Object.prototype.hasOwnProperty;n(69).async=function(e,t){var n,f,h,d=c(null),m=c(null),v=t.memoized,g=t.original;t.memoized=a(function(e){var t=arguments,r=t[t.length-1];return"function"==typeof r&&(n=r,t=u.call(t,0,-1)),v.apply(f=this,h=t)},v);try{o(t.memoized,v)}catch(e){}t.on("get",function(e){var r,i,o;if(n){if(d[e])return"function"==typeof d[e]?d[e]=[d[e],n]:d[e].push(n),void(n=null);r=n,i=f,o=h,n=f=h=null,s(function(){var a;p.call(m,e)?(a=m[e],t.emit("getasync",e,o,i),l.call(r,a.context,a.args)):(n=r,f=i,h=o,v.apply(i,o))})}}),t.original=function(){var e,i,o,a;return n?(e=r(arguments),i=function e(n){var i,o,u=e.id;return null==u?void s(l.bind(e,this,arguments)):(delete e.id,i=d[u],delete d[u],i?(o=r(arguments),t.has(u)&&(n?t.delete(u):(m[u]={context:this,args:o},t.emit("setasync",u,"function"==typeof i?1:i.length))),"function"==typeof i?a=l.call(i,this,o):i.forEach(function(e){a=l.call(e,this,o)},this),a):void 0)},o=n,n=f=h=null,e.push(i),a=l.call(g,this,e),i.cb=o,n=i,a):l.call(g,this,arguments)},t.on("set",function(e){if(!n)return void t.delete(e);d[e]?"function"==typeof d[e]?d[e]=[d[e],n.cb]:d[e].push(n.cb):d[e]=n.cb,delete n.cb,n.id=e,n=null}),t.on("delete",function(e){var n;p.call(d,e)||m[e]&&(n=m[e],delete m[e],t.emit("deleteasync",e,u.call(n.args,1)))}),t.on("clear",function(){var e=m;m=c(null),t.emit("clearasync",i(e,function(e){return u.call(e.args,1)}))})}},function(e,t,n){"use strict";var r=n(58),i=n(142),o=n(69),a=Function.prototype.apply;o.dispose=function(e,t,n){var s;if(r(e),n.async&&o.async||n.promise&&o.promise)return t.on("deleteasync",s=function(t,n){a.call(e,null,n)}),void t.on("clearasync",function(e){i(e,function(e,t){s(t,e)})});t.on("delete",s=function(t,n){e(n)}),t.on("clear",function(e){i(e,function(e,t){s(t,e)})})}},function(e,t,n){"use strict";var r=n(207),i=n(142),o=n(229),a=n(386),s=n(1186),u=n(69),l=Function.prototype,c=Math.max,p=Math.min,f=Object.create;u.maxAge=function(e,t,n){var h,d,m,v;(e=s(e))&&(h=f(null),d=n.async&&u.async||n.promise&&u.promise?"async":"",t.on("set"+d,function(n){h[n]=setTimeout(function(){t.delete(n)},e),v&&(v[n]&&"nextTick"!==v[n]&&clearTimeout(v[n]),v[n]=setTimeout(function(){delete v[n]},m))}),t.on("delete"+d,function(e){clearTimeout(h[e]),delete h[e],v&&("nextTick"!==v[e]&&clearTimeout(v[e]),delete v[e])}),n.preFetch&&(m=!0===n.preFetch||isNaN(n.preFetch)?.333:c(p(Number(n.preFetch),1),0))&&(v={},m=(1-m)*e,t.on("get"+d,function(e,i,s){v[e]||(v[e]="nextTick",o(function(){var o;"nextTick"===v[e]&&(delete v[e],t.delete(e),n.async&&(i=r(i),i.push(l)),o=t.memoized.apply(s,i),n.promise&&a(o)&&("function"==typeof o.done?o.done(l,l):o.then(l,l)))}))})),t.on("clear"+d,function(){i(h,function(e){clearTimeout(e)}),h={},v&&(i(v,function(e){"nextTick"!==e&&clearTimeout(e)}),v={})}))}},function(e,t,n){"use strict";var r=n(65),i=n(961),o=n(69);o.max=function(e,t,n){var a,s,u;(e=r(e))&&(s=i(e),a=n.async&&o.async||n.promise&&o.promise?"async":"",t.on("set"+a,u=function(e){void 0!==(e=s.hit(e))&&t.delete(e)}),t.on("get"+a,u),t.on("delete"+a,s.delete),t.on("clear"+a,s.clear))}},function(e,t,n){"use strict";var r=n(374),i=n(386),o=n(229),a=Object.create,s=Object.prototype.hasOwnProperty;n(69).promise=function(e,t){var n=a(null),u=a(null),l=a(null);t.on("set",function(r,a,s){if(!i(s))return u[r]=s,void t.emit("setasync",r,1);n[r]=1,l[r]=s;var c=function(e){var i=n[r];i&&(delete n[r],u[r]=e,t.emit("setasync",r,i))},p=function(){n[r]&&(delete n[r],delete l[r],t.delete(r))};"then"!==e&&"function"==typeof s.done?"done"!==e&&"function"==typeof s.finally?(s.done(c),s.finally(p)):s.done(c,p):s.then(function(e){o(c.bind(this,e))},function(){o(p)})}),t.on("get",function(e,r,a){var s;if(n[e])return void++n[e];s=l[e];var u=function(){t.emit("getasync",e,r,a)};i(s)?"function"==typeof s.done?s.done(u):s.then(function(){o(u)}):u()}),t.on("delete",function(e){if(delete l[e],n[e])return void delete n[e];if(s.call(u,e)){var r=u[e];delete u[e],t.emit("deleteasync",e,[r])}}),t.on("clear",function(){var e=u;u=a(null),n=a(null),l=a(null),t.emit("clearasync",r(e,function(e){return[e]}))})}},function(e,t,n){"use strict";var r=n(141),i=n(69),o=Object.create,a=Object.defineProperties;i.refCounter=function(e,t,n){var s,u;s=o(null),u=n.async&&i.async||n.promise&&i.promise?"async":"",t.on("set"+u,function(e,t){s[e]=t||1}),t.on("get"+u,function(e){++s[e]}),t.on("delete"+u,function(e){delete s[e]}),t.on("clear"+u,function(){s={}}),a(t.memoized,{deleteRef:r(function(){var e=t.get(arguments);return null===e?null:s[e]?!--s[e]&&(t.delete(e),!0):null}),getRefCount:r(function(){var e=t.get(arguments);return null===e?0:s[e]?s[e]:0})})}},function(e,t,n){"use strict";var r=n(376),i=n(431),o=n(977);e.exports=function(e){var t,a=r(arguments[1]);return a.normalizer||0!==(t=a.length=i(a.length,e.length,a.async))&&(a.primitive?!1===t?a.normalizer=n(976):t>1&&(a.normalizer=n(974)(t)):a.normalizer=!1===t?n(975)():1===t?n(972)():n(973)(t)),a.async&&n(962),a.promise&&n(966),a.dispose&&n(963),a.maxAge&&n(964),a.max&&n(965),a.refCounter&&n(967),o(e,a)}},function(e,t,n){"use strict";var r=n(716),i=n(371),o=n(141),a=n(744).methods,s=n(971),u=n(970),l=Function.prototype.apply,c=Function.prototype.call,p=Object.create,f=Object.prototype.hasOwnProperty,h=Object.defineProperties,d=a.on,m=a.emit;e.exports=function(e,t,n){var a,v,g,y,_,b,x,w,k,E,S,C,A,D=p(null);return v=!1!==t?t:isNaN(e.length)?1:e.length,n.normalizer&&(w=u(n.normalizer),g=w.get,y=w.set,_=w.delete,b=w.clear),null!=n.resolvers&&(A=s(n.resolvers)),C=g?i(function(t){var n,i,o=arguments;if(A&&(o=A(o)),null!==(n=g(o))&&f.call(D,n))return k&&a.emit("get",n,o,this),D[n];if(i=1===o.length?c.call(e,this,o[0]):l.call(e,this,o),null===n){if(null!==(n=g(o)))throw r("Circular invocation","CIRCULAR_INVOCATION");n=y(o)}else if(f.call(D,n))throw r("Circular invocation","CIRCULAR_INVOCATION");return D[n]=i,E&&a.emit("set",n,null,i),i},v):0===t?function(){var t;if(f.call(D,"data"))return k&&a.emit("get","data",arguments,this),D.data;if(t=arguments.length?l.call(e,this,arguments):c.call(e,this),f.call(D,"data"))throw r("Circular invocation","CIRCULAR_INVOCATION");return D.data=t,E&&a.emit("set","data",null,t),t}:function(t){var n,i,o=arguments;if(A&&(o=A(arguments)),i=String(o[0]),f.call(D,i))return k&&a.emit("get",i,o,this),D[i];if(n=1===o.length?c.call(e,this,o[0]):l.call(e,this,o),f.call(D,i))throw r("Circular invocation","CIRCULAR_INVOCATION");return D[i]=n,E&&a.emit("set",i,null,n),n},a={original:e,memoized:C,get:function(e){return A&&(e=A(e)),g?g(e):String(e[0])},has:function(e){return f.call(D,e)},delete:function(e){var t;f.call(D,e)&&(_&&_(e),t=D[e],delete D[e],S&&a.emit("delete",e,t))},clear:function(){var e=D;b&&b(),D=p(null),a.emit("clear",e)},on:function(e,t){return"get"===e?k=!0:"set"===e?E=!0:"delete"===e&&(S=!0),d.call(this,e,t)},emit:m,updateEnv:function(){e=a.original}},x=g?i(function(e){var t,n=arguments;A&&(n=A(n)),null!==(t=g(n))&&a.delete(t)},v):0===t?function(){return a.delete("data")}:function(e){return A&&(e=A(arguments)[0]),a.delete(e)},h(C,{__memoized__:o(!0),delete:o(x),clear:o(a.clear)}),a}},function(e,t,n){"use strict";var r=n(58);e.exports=function(e){var t;return"function"==typeof e?{set:e,get:e}:(t={get:r(e.get)},void 0!==e.set?(t.set=r(e.set),t.delete=r(e.delete),t.clear=r(e.clear),t):(t.set=t.get,t))}},function(e,t,n){"use strict";var r,i=n(715),o=n(58),a=Array.prototype.slice;r=function(e){return this.map(function(t,n){return t?t(e[n]):e[n]}).concat(a.call(e,this.length))},e.exports=function(e){return e=i(e),e.forEach(function(e){null!=e&&o(e)}),r.bind(e)}},function(e,t,n){"use strict";var r=n(206);e.exports=function(){var e=0,t=[],n=[];return{get:function(e){var i=r.call(t,e[0]);return-1===i?null:n[i]},set:function(r){return t.push(r[0]),n.push(++e),e},delete:function(e){var i=r.call(n,e);-1!==i&&(t.splice(i,1),n.splice(i,1))},clear:function(){t=[],n=[]}}}},function(e,t,n){"use strict";var r=n(206),i=Object.create;e.exports=function(e){var t=0,n=[[],[]],o=i(null);return{get:function(t){for(var i,o=0,a=n;o<e-1;){if(-1===(i=r.call(a[0],t[o])))return null;a=a[1][i],++o}return i=r.call(a[0],t[o]),-1===i?null:a[1][i]||null},set:function(i){for(var a,s=0,u=n;s<e-1;)a=r.call(u[0],i[s]),-1===a&&(a=u[0].push(i[s])-1,u[1].push([[],[]])),u=u[1][a],++s;return a=r.call(u[0],i[s]),-1===a&&(a=u[0].push(i[s])-1),u[1][a]=++t,o[t]=i,t},delete:function(t){for(var i,a=0,s=n,u=[],l=o[t];a<e-1;){if(-1===(i=r.call(s[0],l[a])))return;u.push(s,i),s=s[1][i],++a}if(-1!==(i=r.call(s[0],l[a]))){for(t=s[1][i],s[0].splice(i,1),s[1].splice(i,1);!s[0].length&&u.length;)i=u.pop(),s=u.pop(),s[0].splice(i,1),s[1].splice(i,1);delete o[t]}},clear:function(){n=[[],[]],o=i(null)}}}},function(e,t,n){"use strict";e.exports=function(e){return e?function(t){for(var n=String(t[0]),r=0,i=e;--i;)n+="
"+t[++r];return n}:function(){return""}}},function(e,t,n){"use strict";var r=n(206),i=Object.create;e.exports=function(){var e=0,t=[],n=i(null);return{get:function(e){var n,i=0,o=t,a=e.length;if(0===a)return o[a]||null;if(o=o[a]){for(;i<a-1;){if(-1===(n=r.call(o[0],e[i])))return null;o=o[1][n],++i}return n=r.call(o[0],e[i]),-1===n?null:o[1][n]||null}return null},set:function(i){var o,a=0,s=t,u=i.length;if(0===u)s[u]=++e;else{for(s[u]||(s[u]=[[],[]]),s=s[u];a<u-1;)o=r.call(s[0],i[a]),-1===o&&(o=s[0].push(i[a])-1,s[1].push([[],[]])),s=s[1][o],++a;o=r.call(s[0],i[a]),-1===o&&(o=s[0].push(i[a])-1),s[1][o]=++e}return n[e]=i,e},delete:function(e){var i,o=0,a=t,s=n[e],u=s.length,l=[];if(0===u)delete a[u];else if(a=a[u]){for(;o<u-1;){if(-1===(i=r.call(a[0],s[o])))return;l.push(a,i),a=a[1][i],++o}if(-1===(i=r.call(a[0],s[o])))return;for(e=a[1][i],a[0].splice(i,1),a[1].splice(i,1);!a[0].length&&l.length;)i=l.pop(),a=l.pop(),a[0].splice(i,1),a[1].splice(i,1)}delete n[e]},clear:function(){t=[],n=i(null)}}}},function(e,t,n){"use strict";e.exports=function(e){var t,n,r=e.length;if(!r)return"";for(t=String(e[n=0]);--r;)t+="
"+e[++n];return t}},function(e,t,n){"use strict";var r=n(58),i=n(142),o=n(69),a=n(969),s=n(431),u=Object.prototype.hasOwnProperty;e.exports=function e(t){var n,l,c;if(r(t),n=Object(arguments[1]),n.async&&n.promise)throw new Error("Options 'async' and 'promise' cannot be used together");return u.call(t,"__memoized__")&&!n.force?t:(l=s(n.length,t.length,n.async&&o.async),c=a(t,l,n),i(o,function(e,t){n[t]&&e(n[t],c,n)}),e.__profiler__&&e.__profiler__(c),c.updateEnv(),c.memoized)}},function(e,t,n){"use strict";e.exports=Number.isNaN||function(e){return e!==e}},function(e,t){/*!
-+ * pascalcase <https://github.com/jonschlinkert/pascalcase>
-+ *
-+ * Copyright (c) 2015, Jon Schlinkert.
-+ * Licensed under the MIT License.
-+ */
-+function n(e){if("string"!=typeof e)throw new TypeError("expected a string.");return e=e.replace(/([A-Z])/g," $1"),1===e.length?e.toUpperCase():(e=e.replace(/^[\W_]+|[\W_]+$/g,"").toLowerCase(),e=e.charAt(0).toUpperCase()+e.slice(1),e.replace(/[\W_]+(\w|$)/g,function(e,t){return t.toUpperCase()}))}e.exports=n},function(e,t,n){"use strict";(function(r){function i(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var a=n(442),s=i(a),u=n(230),l=i(u),c=function(){function e(t,n,r){o(this,e),this.stringify=t,this.mapOpts=r.map||{},this.root=n,this.opts=r}return e.prototype.isMap=function(){return void 0!==this.opts.map?!!this.opts.map:this.previous().length>0},e.prototype.previous=function(){var e=this;return this.previousMaps||(this.previousMaps=[],this.root.walk(function(t){if(t.source&&t.source.input.map){var n=t.source.input.map;-1===e.previousMaps.indexOf(n)&&e.previousMaps.push(n)}})),this.previousMaps},e.prototype.isInline=function(){if(void 0!==this.mapOpts.inline)return this.mapOpts.inline;var e=this.mapOpts.annotation;return(void 0===e||!0===e)&&(!this.previous().length||this.previous().some(function(e){return e.inline}))},e.prototype.isSourcesContent=function(){return void 0!==this.mapOpts.sourcesContent?this.mapOpts.sourcesContent:!this.previous().length||this.previous().some(function(e){return e.withContent()})},e.prototype.clearAnnotation=function(){if(!1!==this.mapOpts.annotation)for(var e=void 0,t=this.root.nodes.length-1;t>=0;t--)e=this.root.nodes[t],"comment"===e.type&&0===e.text.indexOf("# sourceMappingURL=")&&this.root.removeChild(t)},e.prototype.setSourcesContent=function(){var e=this,t={};this.root.walk(function(n){if(n.source){var r=n.source.input.from;if(r&&!t[r]){t[r]=!0;var i=e.relative(r);e.map.setSourceContent(i,n.source.input.css)}}})},e.prototype.applyPrevMaps=function(){for(var e=this.previous(),t=Array.isArray(e),n=0,e=t?e:e[Symbol.iterator]();;){var r;if(t){if(n>=e.length)break;r=e[n++]}else{if(n=e.next(),n.done)break;r=n.value}var i=r,o=this.relative(i.file),a=i.root||l.default.dirname(i.file),u=void 0;!1===this.mapOpts.sourcesContent?(u=new s.default.SourceMapConsumer(i.text),u.sourcesContent&&(u.sourcesContent=u.sourcesContent.map(function(){return null}))):u=i.consumer(),this.map.applySourceMap(u,o,this.relative(a))}},e.prototype.isAnnotation=function(){return!!this.isInline()||(void 0!==this.mapOpts.annotation?this.mapOpts.annotation:!this.previous().length||this.previous().some(function(e){return e.annotation}))},e.prototype.toBase64=function(e){return r?r.from&&r.from!==Uint8Array.from?r.from(e).toString("base64"):new r(e).toString("base64"):window.btoa(unescape(encodeURIComponent(e)))},e.prototype.addAnnotation=function(){var e=void 0;e=this.isInline()?"data:application/json;base64,"+this.toBase64(this.map.toString()):"string"==typeof this.mapOpts.annotation?this.mapOpts.annotation:this.outputFile()+".map";var t="\n";-1!==this.css.indexOf("\r\n")&&(t="\r\n"),this.css+=t+"/*# sourceMappingURL="+e+" */"},e.prototype.outputFile=function(){return this.opts.to?this.relative(this.opts.to):this.opts.from?this.relative(this.opts.from):"to.css"},e.prototype.generateMap=function(){return this.generateString(),this.isSourcesContent()&&this.setSourcesContent(),this.previous().length>0&&this.applyPrevMaps(),this.isAnnotation()&&this.addAnnotation(),this.isInline()?[this.css]:[this.css,this.map]},e.prototype.relative=function(e){if(0===e.indexOf("<"))return e;if(/^\w+:\/\//.test(e))return e;var t=this.opts.to?l.default.dirname(this.opts.to):".";return"string"==typeof this.mapOpts.annotation&&(t=l.default.dirname(l.default.resolve(t,this.mapOpts.annotation))),e=l.default.relative(t,e),"\\"===l.default.sep?e.replace(/\\/g,"/"):e},e.prototype.sourcePath=function(e){return this.mapOpts.from?this.mapOpts.from:this.relative(e.source.input.from)},e.prototype.generateString=function(){var e=this;this.css="",this.map=new s.default.SourceMapGenerator({file:this.outputFile()});var t=1,n=1,r=void 0,i=void 0;this.stringify(this.root,function(o,a,s){e.css+=o,a&&"end"!==s&&(a.source&&a.source.start?e.map.addMapping({source:e.sourcePath(a),generated:{line:t,column:n-1},original:{line:a.source.start.line,column:a.source.start.column-1}}):e.map.addMapping({source:"<no source>",original:{line:1,column:0},generated:{line:t,column:n-1}})),r=o.match(/\n/g),r?(t+=r.length,i=o.lastIndexOf("\n"),n=o.length-i):n+=o.length,a&&"start"!==s&&(a.source&&a.source.end?e.map.addMapping({source:e.sourcePath(a),generated:{line:t,column:n-1},original:{line:a.source.end.line,column:a.source.end.column}}):e.map.addMapping({source:"<no source>",original:{line:1,column:0},generated:{line:t,column:n-1}}))})},e.prototype.generate=function(){if(this.clearAnnotation(),this.isMap())return this.generateMap();var e="";return this.stringify(this.root,function(t){e+=t}),[e]},e}();t.default=c,e.exports=t.default}).call(t,n(40).Buffer)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var o=n(234),a=r(o),s=n(438),u=r(s),l=n(232),c=r(l),p=n(156),f=r(p),h=n(237),d=r(h),m=n(157),v=r(m),g=function(){function e(t){i(this,e),this.input=t,this.root=new d.default,this.current=this.root,this.spaces="",this.semicolon=!1,this.createTokenizer(),this.root.source={input:t,start:{line:1,column:1}}}return e.prototype.createTokenizer=function(){this.tokenizer=(0,u.default)(this.input)},e.prototype.parse=function(){for(var e=void 0;!this.tokenizer.endOfFile();)switch(e=this.tokenizer.nextToken(),e[0]){case"space":this.spaces+=e[1];break;case";":this.freeSemicolon(e);break;case"}":this.end(e);break;case"comment":this.comment(e);break;case"at-word":this.atrule(e);break;case"{":this.emptyRule(e);break;default:this.other(e)}this.endFile()},e.prototype.comment=function(e){var t=new c.default;this.init(t,e[2],e[3]),t.source.end={line:e[4],column:e[5]};var n=e[1].slice(2,-2);if(/^\s*$/.test(n))t.text="",t.raws.left=n,t.raws.right="";else{var r=n.match(/^(\s*)([^]*[^\s])(\s*)$/);t.text=r[2],t.raws.left=r[1],t.raws.right=r[3]}},e.prototype.emptyRule=function(e){var t=new v.default;this.init(t,e[2],e[3]),t.selector="",t.raws.between="",this.current=t},e.prototype.other=function(e){for(var t=!1,n=null,r=!1,i=null,o=[],a=[],s=e;s;){if(n=s[0],a.push(s),"("===n||"["===n)i||(i=s),o.push("("===n?")":"]");else if(0===o.length){if(";"===n){if(r)return void this.decl(a);break}if("{"===n)return void this.rule(a);if("}"===n){this.tokenizer.back(a.pop()),t=!0;break}":"===n&&(r=!0)}else n===o[o.length-1]&&(o.pop(),0===o.length&&(i=null));s=this.tokenizer.nextToken()}if(this.tokenizer.endOfFile()&&(t=!0),o.length>0&&this.unclosedBracket(i),t&&r){for(;a.length&&("space"===(s=a[a.length-1][0])||"comment"===s);)this.tokenizer.back(a.pop());return void this.decl(a)}this.unknownWord(a)},e.prototype.rule=function(e){e.pop();var t=new v.default;this.init(t,e[0][2],e[0][3]),t.raws.between=this.spacesAndCommentsFromEnd(e),this.raw(t,"selector",e),this.current=t},e.prototype.decl=function(e){var t=new a.default;this.init(t);var n=e[e.length-1];for(";"===n[0]&&(this.semicolon=!0,e.pop()),n[4]?t.source.end={line:n[4],column:n[5]}:t.source.end={line:n[2],column:n[3]};"word"!==e[0][0];)1===e.length&&this.unknownWord(e),t.raws.before+=e.shift()[1];for(t.source.start={line:e[0][2],column:e[0][3]},t.prop="";e.length;){var r=e[0][0];if(":"===r||"space"===r||"comment"===r)break;t.prop+=e.shift()[1]}t.raws.between="";for(var i=void 0;e.length;){if(i=e.shift(),":"===i[0]){t.raws.between+=i[1];break}t.raws.between+=i[1]}"_"!==t.prop[0]&&"*"!==t.prop[0]||(t.raws.before+=t.prop[0],t.prop=t.prop.slice(1)),t.raws.between+=this.spacesAndCommentsFromStart(e),this.precheckMissedSemicolon(e);for(var o=e.length-1;o>0;o--){if(i=e[o],"!important"===i[1].toLowerCase()){t.important=!0;var s=this.stringFrom(e,o);s=this.spacesFromEnd(e)+s," !important"!==s&&(t.raws.important=s);break}if("important"===i[1].toLowerCase()){for(var u=e.slice(0),l="",c=o;c>0;c--){var p=u[c][0];if(0===l.trim().indexOf("!")&&"space"!==p)break;l=u.pop()[1]+l}0===l.trim().indexOf("!")&&(t.important=!0,t.raws.important=l,e=u)}if("space"!==i[0]&&"comment"!==i[0])break}this.raw(t,"value",e),-1!==t.value.indexOf(":")&&this.checkMissedSemicolon(e)},e.prototype.atrule=function(e){var t=new f.default;t.name=e[1].slice(1),""===t.name&&this.unnamedAtrule(t,e),this.init(t,e[2],e[3]);for(var n=void 0,r=void 0,i=!1,o=!1,a=[];!this.tokenizer.endOfFile();){if(e=this.tokenizer.nextToken(),";"===e[0]){t.source.end={line:e[2],column:e[3]},this.semicolon=!0;break}if("{"===e[0]){o=!0;break}if("}"===e[0]){if(a.length>0){for(r=a.length-1,n=a[r];n&&"space"===n[0];)n=a[--r];n&&(t.source.end={line:n[4],column:n[5]})}this.end(e);break}if(a.push(e),this.tokenizer.endOfFile()){i=!0;break}}t.raws.between=this.spacesAndCommentsFromEnd(a),a.length?(t.raws.afterName=this.spacesAndCommentsFromStart(a),this.raw(t,"params",a),i&&(e=a[a.length-1],t.source.end={line:e[4],column:e[5]},this.spaces=t.raws.between,t.raws.between="")):(t.raws.afterName="",t.params=""),o&&(t.nodes=[],this.current=t)},e.prototype.end=function(e){this.current.nodes&&this.current.nodes.length&&(this.current.raws.semicolon=this.semicolon),this.semicolon=!1,this.current.raws.after=(this.current.raws.after||"")+this.spaces,this.spaces="",this.current.parent?(this.current.source.end={line:e[2],column:e[3]},this.current=this.current.parent):this.unexpectedClose(e)},e.prototype.endFile=function(){this.current.parent&&this.unclosedBlock(),this.current.nodes&&this.current.nodes.length&&(this.current.raws.semicolon=this.semicolon),this.current.raws.after=(this.current.raws.after||"")+this.spaces},e.prototype.freeSemicolon=function(e){if(this.spaces+=e[1],this.current.nodes){var t=this.current.nodes[this.current.nodes.length-1];t&&"rule"===t.type&&!t.raws.ownSemicolon&&(t.raws.ownSemicolon=this.spaces,this.spaces="")}},e.prototype.init=function(e,t,n){this.current.push(e),e.source={start:{line:t,column:n},input:this.input},e.raws.before=this.spaces,this.spaces="","comment"!==e.type&&(this.semicolon=!1)},e.prototype.raw=function(e,t,n){for(var r=void 0,i=void 0,o=n.length,a="",s=!0,u=0;u<o;u+=1)r=n[u],i=r[0],"comment"===i||"space"===i&&u===o-1?s=!1:a+=r[1];if(!s){var l=n.reduce(function(e,t){return e+t[1]},"");e.raws[t]={value:a,raw:l}}e[t]=a},e.prototype.spacesAndCommentsFromEnd=function(e){for(var t=void 0,n="";e.length&&("space"===(t=e[e.length-1][0])||"comment"===t);)n=e.pop()[1]+n;return n},e.prototype.spacesAndCommentsFromStart=function(e){for(var t=void 0,n="";e.length&&("space"===(t=e[0][0])||"comment"===t);)n+=e.shift()[1];return n},e.prototype.spacesFromEnd=function(e){for(var t="";e.length&&"space"===e[e.length-1][0];)t=e.pop()[1]+t;return t},e.prototype.stringFrom=function(e,t){for(var n="",r=t;r<e.length;r++)n+=e[r][1];return e.splice(t,e.length-t),n},e.prototype.colon=function(e){for(var t=0,n=void 0,r=void 0,i=void 0,o=0;o<e.length;o++){if(n=e[o],"("===(r=n[0]))t+=1;else if(")"===r)t-=1;else if(0===t&&":"===r){if(i){if("word"===i[0]&&"progid"===i[1])continue;return o}this.doubleColon(n)}i=n}return!1},e.prototype.unclosedBracket=function(e){throw this.input.error("Unclosed bracket",e[2],e[3])},e.prototype.unknownWord=function(e){throw this.input.error("Unknown word",e[0][2],e[0][3])},e.prototype.unexpectedClose=function(e){throw this.input.error("Unexpected }",e[2],e[3])},e.prototype.unclosedBlock=function(){var e=this.current.source.start;throw this.input.error("Unclosed block",e.line,e.column)},e.prototype.doubleColon=function(e){throw this.input.error("Double colon",e[2],e[3])},e.prototype.unnamedAtrule=function(e,t){throw this.input.error("At-rule without name",t[2],t[3])},e.prototype.precheckMissedSemicolon=function(e){},e.prototype.checkMissedSemicolon=function(e){var t=this.colon(e);if(!1!==t){for(var n=0,r=void 0,i=t-1;i>=0&&(r=e[i],"space"===r[0]||2!==(n+=1));i--);throw this.input.error("Missed semicolon",r[2],r[3])}},e}();t.default=g,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];return 1===t.length&&Array.isArray(t[0])&&(t=t[0]),new u.default(t)}t.__esModule=!0;var o=n(234),a=r(o),s=n(436),u=r(s),l=n(238),c=r(l),p=n(232),f=r(p),h=n(156),d=r(h),m=n(986),v=r(m),g=n(236),y=r(g),_=n(435),b=r(_),x=n(157),w=r(x),k=n(237),E=r(k);i.plugin=function(e,t){var n=function(){var n=t.apply(void 0,arguments);return n.postcssPlugin=e,n.postcssVersion=(new u.default).version,n},r=void 0;return Object.defineProperty(n,"postcss",{get:function(){return r||(r=n()),r}}),n.process=function(e,t,r){return i([n(r)]).process(e,t)},n},i.stringify=c.default,i.parse=y.default,i.vendor=v.default,i.list=b.default,i.comment=function(e){return new f.default(e)},i.atRule=function(e){return new d.default(e)},i.decl=function(e){return new a.default(e)},i.rule=function(e){return new w.default(e)},i.root=function(e){return new E.default(e)},t.default=i,e.exports=t.default},function(e,t,n){"use strict";(function(r){function i(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e){return r?r.from&&r.from!==Uint8Array.from?r.from(e,"base64").toString():new r(e,"base64").toString():window.atob(e)}t.__esModule=!0;var s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},u=n(442),l=i(u),c=n(230),p=i(c),f=n(1210),h=i(f),d=function(){function e(t,n){o(this,e),this.loadAnnotation(t),this.inline=this.startWith(this.annotation,"data:");var r=n.map?n.map.prev:void 0,i=this.loadMap(n.from,r);i&&(this.text=i)}return e.prototype.consumer=function(){return this.consumerCache||(this.consumerCache=new l.default.SourceMapConsumer(this.text)),this.consumerCache},e.prototype.withContent=function(){return!!(this.consumer().sourcesContent&&this.consumer().sourcesContent.length>0)},e.prototype.startWith=function(e,t){return!!e&&e.substr(0,t.length)===t},e.prototype.loadAnnotation=function(e){var t=e.match(/\/\*\s*# sourceMappingURL=(.*)\s*\*\//);t&&(this.annotation=t[1].trim())},e.prototype.decodeInline=function(e){var t=/^data:application\/json;(?:charset=utf-?8;)?base64,/,n="data:application/json,";if(this.startWith(e,n))return decodeURIComponent(e.substr(n.length));if(t.test(e))return a(e.substr(RegExp.lastMatch.length));var r=e.match(/data:application\/json;([^,]+),/)[1];throw new Error("Unsupported source map encoding "+r)},e.prototype.loadMap=function(e,t){if(!1===t)return!1;if(t){if("string"==typeof t)return t;if("function"==typeof t){var n=t(e);if(n&&h.default.existsSync&&h.default.existsSync(n))return h.default.readFileSync(n,"utf-8").toString().trim();throw new Error("Unable to load previous source map: "+n.toString())}if(t instanceof l.default.SourceMapConsumer)return l.default.SourceMapGenerator.fromSourceMap(t).toString();if(t instanceof l.default.SourceMapGenerator)return t.toString();if(this.isMap(t))return JSON.stringify(t);throw new Error("Unsupported previous source map format: "+t.toString())}if(this.inline)return this.decodeInline(this.annotation);if(this.annotation){var r=this.annotation;return e&&(r=p.default.join(p.default.dirname(e),r)),this.root=p.default.dirname(r),!(!h.default.existsSync||!h.default.existsSync(r))&&h.default.readFileSync(r,"utf-8").toString().trim()}},e.prototype.isMap=function(e){return"object"===(void 0===e?"undefined":s(e))&&("string"==typeof e.mappings||"string"==typeof e._mappings)},e}();t.default=d,e.exports=t.default}).call(t,n(40).Buffer)},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var i=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),o=n(988),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s=function(){function e(t,n,i){r(this,e),this.processor=t,this.messages=[],this.root=n,this.opts=i,this.css=void 0,this.map=void 0}return e.prototype.toString=function(){return this.css},e.prototype.warn=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};t.plugin||this.lastPlugin&&this.lastPlugin.postcssPlugin&&(t.plugin=this.lastPlugin.postcssPlugin);var n=new a.default(e,t);return this.messages.push(n),n},e.prototype.warnings=function(){return this.messages.filter(function(e){return"warning"===e.type})},i(e,[{key:"content",get:function(){return this.css}}]),e}();t.default=s,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){var n=e[0],r=e[1];if("word"===n){if("."===r[0])return"class";if("#"===r[0])return"hash"}if(!t.endOfFile()){var i=t.nextToken();if(t.back(i),"brackets"===i[0]||"("===i[0])return"call"}return n}function o(e){for(var t=(0,l.default)(new p.default(e),{ignoreErrors:!0}),n="";!t.endOfFile();)!function(){var e=t.nextToken(),r=f[i(e,t)];n+=r?e[1].split(/\r?\n/).map(function(e){return r(e)}).join("\n"):e[1]}();return n}t.__esModule=!0;var a=n(503),s=r(a),u=n(438),l=r(u),c=n(433),p=r(c),f={brackets:s.default.cyan,"at-word":s.default.cyan,call:s.default.cyan,comment:s.default.gray,string:s.default.green,class:s.default.yellow,hash:s.default.magenta,"(":s.default.cyan,")":s.default.cyan,"{":s.default.yellow,"}":s.default.yellow,"[":s.default.yellow,"]":s.default.yellow,":":s.default.yellow,";":s.default.yellow};t.default=o,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var r={prefix:function(e){var t=e.match(/^(-\w+-)/);return t?t[0]:""},unprefixed:function(e){return e.replace(/^-\w+-/,"")}};t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e){i[e]||(i[e]=!0,"undefined"!=typeof console&&console.warn&&console.warn(e))}t.__esModule=!0,t.default=r;var i={};e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var i=function(){function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(r(this,e),this.type="warning",this.text=t,n.node&&n.node.source){var i=n.node.positionBy(n);this.line=i.line,this.column=i.column}for(var o in n)this[o]=n[o]}return e.prototype.toString=function(){return this.node?this.node.error(this.text,{plugin:this.plugin,index:this.index,word:this.word}).message:this.plugin?this.plugin+": "+this.text:this.text},e}();t.default=i,e.exports=t.default},function(e,t){var n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");t.encode=function(e){if(0<=e&&e<n.length)return n[e];throw new TypeError("Must be between 0 and 63: "+e)},t.decode=function(e){return 65<=e&&e<=90?e-65:97<=e&&e<=122?e-97+26:48<=e&&e<=57?e-48+52:43==e?62:47==e?63:-1}},function(e,t){function n(e,r,i,o,a,s){var u=Math.floor((r-e)/2)+e,l=a(i,o[u],!0);return 0===l?u:l>0?r-u>1?n(u,r,i,o,a,s):s==t.LEAST_UPPER_BOUND?r<o.length?r:-1:u:u-e>1?n(e,u,i,o,a,s):s==t.LEAST_UPPER_BOUND?u:e<0?-1:e}t.GREATEST_LOWER_BOUND=1,t.LEAST_UPPER_BOUND=2,t.search=function(e,r,i,o){if(0===r.length)return-1;var a=n(-1,r.length,e,r,i,o||t.GREATEST_LOWER_BOUND);if(a<0)return-1;for(;a-1>=0&&0===i(r[a],r[a-1],!0);)--a;return a}},function(e,t,n){function r(e,t){var n=e.generatedLine,r=t.generatedLine,i=e.generatedColumn,a=t.generatedColumn;return r>n||r==n&&a>=i||o.compareByGeneratedPositionsInflated(e,t)<=0}function i(){this._array=[],this._sorted=!0,this._last={generatedLine:-1,generatedColumn:0}}var o=n(121);i.prototype.unsortedForEach=function(e,t){this._array.forEach(e,t)},i.prototype.add=function(e){r(this._last,e)?(this._last=e,this._array.push(e)):(this._sorted=!1,this._array.push(e))},i.prototype.toArray=function(){return this._sorted||(this._array.sort(o.compareByGeneratedPositionsInflated),this._sorted=!0),this._array},t.MappingList=i},function(e,t){function n(e,t,n){var r=e[t];e[t]=e[n],e[n]=r}function r(e,t){return Math.round(e+Math.random()*(t-e))}function i(e,t,o,a){if(o<a){var s=r(o,a),u=o-1;n(e,s,a);for(var l=e[a],c=o;c<a;c++)t(e[c],l)<=0&&(u+=1,n(e,u,c));n(e,u+1,c);var p=u+1;i(e,t,o,p-1),i(e,t,p+1,a)}}t.quickSort=function(e,t){i(e,t,0,e.length-1)}},function(e,t,n){function r(e,t){var n=e;return"string"==typeof e&&(n=s.parseSourceMapInput(e)),null!=n.sections?new a(n,t):new i(n,t)}function i(e,t){var n=e;"string"==typeof e&&(n=s.parseSourceMapInput(e));var r=s.getArg(n,"version"),i=s.getArg(n,"sources"),o=s.getArg(n,"names",[]),a=s.getArg(n,"sourceRoot",null),u=s.getArg(n,"sourcesContent",null),c=s.getArg(n,"mappings"),p=s.getArg(n,"file",null);if(r!=this._version)throw new Error("Unsupported version: "+r);a&&(a=s.normalize(a)),i=i.map(String).map(s.normalize).map(function(e){return a&&s.isAbsolute(a)&&s.isAbsolute(e)?s.relative(a,e):e}),this._names=l.fromArray(o.map(String),!0),this._sources=l.fromArray(i,!0),this._absoluteSources=this._sources.toArray().map(function(e){return s.computeSourceURL(a,e,t)}),this.sourceRoot=a,this.sourcesContent=u,this._mappings=c,this._sourceMapURL=t,this.file=p}function o(){this.generatedLine=0,this.generatedColumn=0,this.source=null,this.originalLine=null,this.originalColumn=null,this.name=null}function a(e,t){var n=e;"string"==typeof e&&(n=s.parseSourceMapInput(e));var i=s.getArg(n,"version"),o=s.getArg(n,"sections");if(i!=this._version)throw new Error("Unsupported version: "+i);this._sources=new l,this._names=new l;var a={line:-1,column:0};this._sections=o.map(function(e){if(e.url)throw new Error("Support for url field in sections not implemented.");var n=s.getArg(e,"offset"),i=s.getArg(n,"line"),o=s.getArg(n,"column");if(i<a.line||i===a.line&&o<a.column)throw new Error("Section offsets must be ordered and non-overlapping.");return a=n,{generatedOffset:{generatedLine:i+1,generatedColumn:o+1},consumer:new r(s.getArg(e,"map"),t)}})}var s=n(121),u=n(990),l=n(439).ArraySet,c=n(440),p=n(992).quickSort;r.fromSourceMap=function(e,t){return i.fromSourceMap(e,t)},r.prototype._version=3,r.prototype.__generatedMappings=null,Object.defineProperty(r.prototype,"_generatedMappings",{configurable:!0,enumerable:!0,get:function(){return this.__generatedMappings||this._parseMappings(this._mappings,this.sourceRoot),this.__generatedMappings}}),r.prototype.__originalMappings=null,Object.defineProperty(r.prototype,"_originalMappings",{configurable:!0,enumerable:!0,get:function(){return this.__originalMappings||this._parseMappings(this._mappings,this.sourceRoot),this.__originalMappings}}),r.prototype._charIsMappingSeparator=function(e,t){var n=e.charAt(t);return";"===n||","===n},r.prototype._parseMappings=function(e,t){throw new Error("Subclasses must implement _parseMappings")},r.GENERATED_ORDER=1,r.ORIGINAL_ORDER=2,r.GREATEST_LOWER_BOUND=1,r.LEAST_UPPER_BOUND=2,r.prototype.eachMapping=function(e,t,n){var i,o=t||null,a=n||r.GENERATED_ORDER;switch(a){case r.GENERATED_ORDER:i=this._generatedMappings;break;case r.ORIGINAL_ORDER:i=this._originalMappings;break;default:throw new Error("Unknown order of iteration.")}var u=this.sourceRoot;i.map(function(e){var t=null===e.source?null:this._sources.at(e.source);return t=s.computeSourceURL(u,t,this._sourceMapURL),{source:t,generatedLine:e.generatedLine,generatedColumn:e.generatedColumn,originalLine:e.originalLine,originalColumn:e.originalColumn,name:null===e.name?null:this._names.at(e.name)}},this).forEach(e,o)},r.prototype.allGeneratedPositionsFor=function(e){var t=s.getArg(e,"line"),n={source:s.getArg(e,"source"),originalLine:t,originalColumn:s.getArg(e,"column",0)};if(n.source=this._findSourceIndex(n.source),n.source<0)return[];var r=[],i=this._findMapping(n,this._originalMappings,"originalLine","originalColumn",s.compareByOriginalPositions,u.LEAST_UPPER_BOUND);if(i>=0){var o=this._originalMappings[i];if(void 0===e.column)for(var a=o.originalLine;o&&o.originalLine===a;)r.push({line:s.getArg(o,"generatedLine",null),column:s.getArg(o,"generatedColumn",null),lastColumn:s.getArg(o,"lastGeneratedColumn",null)}),o=this._originalMappings[++i];else for(var l=o.originalColumn;o&&o.originalLine===t&&o.originalColumn==l;)r.push({line:s.getArg(o,"generatedLine",null),column:s.getArg(o,"generatedColumn",null),lastColumn:s.getArg(o,"lastGeneratedColumn",null)}),o=this._originalMappings[++i]}return r},t.SourceMapConsumer=r,i.prototype=Object.create(r.prototype),i.prototype.consumer=r,i.prototype._findSourceIndex=function(e){var t=e;if(null!=this.sourceRoot&&(t=s.relative(this.sourceRoot,t)),this._sources.has(t))return this._sources.indexOf(t);var n;for(n=0;n<this._absoluteSources.length;++n)if(this._absoluteSources[n]==e)return n;return-1},i.fromSourceMap=function(e,t){var n=Object.create(i.prototype),r=n._names=l.fromArray(e._names.toArray(),!0),a=n._sources=l.fromArray(e._sources.toArray(),!0);n.sourceRoot=e._sourceRoot,n.sourcesContent=e._generateSourcesContent(n._sources.toArray(),n.sourceRoot),n.file=e._file,n._sourceMapURL=t,n._absoluteSources=n._sources.toArray().map(function(e){return s.computeSourceURL(n.sourceRoot,e,t)});for(var u=e._mappings.toArray().slice(),c=n.__generatedMappings=[],f=n.__originalMappings=[],h=0,d=u.length;h<d;h++){var m=u[h],v=new o;v.generatedLine=m.generatedLine,v.generatedColumn=m.generatedColumn,m.source&&(v.source=a.indexOf(m.source),v.originalLine=m.originalLine,v.originalColumn=m.originalColumn,m.name&&(v.name=r.indexOf(m.name)),f.push(v)),c.push(v)}return p(n.__originalMappings,s.compareByOriginalPositions),n},i.prototype._version=3,Object.defineProperty(i.prototype,"sources",{get:function(){return this._absoluteSources.slice()}}),i.prototype._parseMappings=function(e,t){for(var n,r,i,a,u,l=1,f=0,h=0,d=0,m=0,v=0,g=e.length,y=0,_={},b={},x=[],w=[];y<g;)if(";"===e.charAt(y))l++,y++,f=0;else if(","===e.charAt(y))y++;else{for(n=new o,n.generatedLine=l,a=y;a<g&&!this._charIsMappingSeparator(e,a);a++);if(r=e.slice(y,a),i=_[r])y+=r.length;else{for(i=[];y<a;)c.decode(e,y,b),u=b.value,y=b.rest,i.push(u);if(2===i.length)throw new Error("Found a source, but no line and column");if(3===i.length)throw new Error("Found a source and line, but no column");_[r]=i}n.generatedColumn=f+i[0],f=n.generatedColumn,i.length>1&&(n.source=m+i[1],m+=i[1],n.originalLine=h+i[2],h=n.originalLine,n.originalLine+=1,n.originalColumn=d+i[3],d=n.originalColumn,i.length>4&&(n.name=v+i[4],v+=i[4])),w.push(n),"number"==typeof n.originalLine&&x.push(n)}p(w,s.compareByGeneratedPositionsDeflated),this.__generatedMappings=w,p(x,s.compareByOriginalPositions),this.__originalMappings=x},i.prototype._findMapping=function(e,t,n,r,i,o){if(e[n]<=0)throw new TypeError("Line must be greater than or equal to 1, got "+e[n]);if(e[r]<0)throw new TypeError("Column must be greater than or equal to 0, got "+e[r]);return u.search(e,t,i,o)},i.prototype.computeColumnSpans=function(){for(var e=0;e<this._generatedMappings.length;++e){var t=this._generatedMappings[e];if(e+1<this._generatedMappings.length){var n=this._generatedMappings[e+1];if(t.generatedLine===n.generatedLine){t.lastGeneratedColumn=n.generatedColumn-1;continue}}t.lastGeneratedColumn=1/0}},i.prototype.originalPositionFor=function(e){var t={generatedLine:s.getArg(e,"line"),generatedColumn:s.getArg(e,"column")},n=this._findMapping(t,this._generatedMappings,"generatedLine","generatedColumn",s.compareByGeneratedPositionsDeflated,s.getArg(e,"bias",r.GREATEST_LOWER_BOUND));if(n>=0){var i=this._generatedMappings[n];if(i.generatedLine===t.generatedLine){var o=s.getArg(i,"source",null);null!==o&&(o=this._sources.at(o),o=s.computeSourceURL(this.sourceRoot,o,this._sourceMapURL));var a=s.getArg(i,"name",null);return null!==a&&(a=this._names.at(a)),{source:o,line:s.getArg(i,"originalLine",null),column:s.getArg(i,"originalColumn",null),name:a}}}return{source:null,line:null,column:null,name:null}},i.prototype.hasContentsOfAllSources=function(){return!!this.sourcesContent&&(this.sourcesContent.length>=this._sources.size()&&!this.sourcesContent.some(function(e){return null==e}))},i.prototype.sourceContentFor=function(e,t){if(!this.sourcesContent)return null;var n=this._findSourceIndex(e);if(n>=0)return this.sourcesContent[n];var r=e;null!=this.sourceRoot&&(r=s.relative(this.sourceRoot,r));var i;if(null!=this.sourceRoot&&(i=s.urlParse(this.sourceRoot))){var o=r.replace(/^file:\/\//,"");if("file"==i.scheme&&this._sources.has(o))return this.sourcesContent[this._sources.indexOf(o)];if((!i.path||"/"==i.path)&&this._sources.has("/"+r))return this.sourcesContent[this._sources.indexOf("/"+r)]}if(t)return null;throw new Error('"'+r+'" is not in the SourceMap.')},i.prototype.generatedPositionFor=function(e){var t=s.getArg(e,"source");if((t=this._findSourceIndex(t))<0)return{line:null,column:null,lastColumn:null};var n={source:t,originalLine:s.getArg(e,"line"),originalColumn:s.getArg(e,"column")},i=this._findMapping(n,this._originalMappings,"originalLine","originalColumn",s.compareByOriginalPositions,s.getArg(e,"bias",r.GREATEST_LOWER_BOUND));if(i>=0){var o=this._originalMappings[i];if(o.source===n.source)return{line:s.getArg(o,"generatedLine",null),column:s.getArg(o,"generatedColumn",null),lastColumn:s.getArg(o,"lastGeneratedColumn",null)}}return{line:null,column:null,lastColumn:null}},t.BasicSourceMapConsumer=i,a.prototype=Object.create(r.prototype),a.prototype.constructor=r,a.prototype._version=3,Object.defineProperty(a.prototype,"sources",{get:function(){for(var e=[],t=0;t<this._sections.length;t++)for(var n=0;n<this._sections[t].consumer.sources.length;n++)e.push(this._sections[t].consumer.sources[n]);return e}}),a.prototype.originalPositionFor=function(e){var t={generatedLine:s.getArg(e,"line"),generatedColumn:s.getArg(e,"column")},n=u.search(t,this._sections,function(e,t){var n=e.generatedLine-t.generatedOffset.generatedLine;return n||e.generatedColumn-t.generatedOffset.generatedColumn}),r=this._sections[n];return r?r.consumer.originalPositionFor({line:t.generatedLine-(r.generatedOffset.generatedLine-1),column:t.generatedColumn-(r.generatedOffset.generatedLine===t.generatedLine?r.generatedOffset.generatedColumn-1:0),bias:e.bias}):{source:null,line:null,column:null,name:null}},a.prototype.hasContentsOfAllSources=function(){return this._sections.every(function(e){return e.consumer.hasContentsOfAllSources()})},a.prototype.sourceContentFor=function(e,t){for(var n=0;n<this._sections.length;n++){var r=this._sections[n],i=r.consumer.sourceContentFor(e,!0);if(i)return i}if(t)return null;throw new Error('"'+e+'" is not in the SourceMap.')},a.prototype.generatedPositionFor=function(e){for(var t=0;t<this._sections.length;t++){var n=this._sections[t];if(-1!==n.consumer._findSourceIndex(s.getArg(e,"source"))){var r=n.consumer.generatedPositionFor(e);if(r){return{line:r.line+(n.generatedOffset.generatedLine-1),column:r.column+(n.generatedOffset.generatedLine===r.line?n.generatedOffset.generatedColumn-1:0)}}}}return{line:null,column:null}},a.prototype._parseMappings=function(e,t){this.__generatedMappings=[],this.__originalMappings=[];for(var n=0;n<this._sections.length;n++)for(var r=this._sections[n],i=r.consumer._generatedMappings,o=0;o<i.length;o++){var a=i[o],u=r.consumer._sources.at(a.source);u=s.computeSourceURL(r.consumer.sourceRoot,u,this._sourceMapURL),this._sources.add(u),u=this._sources.indexOf(u);var l=null;a.name&&(l=r.consumer._names.at(a.name),this._names.add(l),l=this._names.indexOf(l));var c={source:u,generatedLine:a.generatedLine+(r.generatedOffset.generatedLine-1),generatedColumn:a.generatedColumn+(r.generatedOffset.generatedLine===a.generatedLine?r.generatedOffset.generatedColumn-1:0),originalLine:a.originalLine,originalColumn:a.originalColumn,name:l};this.__generatedMappings.push(c),"number"==typeof c.originalLine&&this.__originalMappings.push(c)}p(this.__generatedMappings,s.compareByGeneratedPositionsDeflated),p(this.__originalMappings,s.compareByOriginalPositions)},t.IndexedSourceMapConsumer=a},function(e,t,n){function r(e,t,n,r,i){this.children=[],this.sourceContents={},this.line=null==e?null:e,this.column=null==t?null:t,this.source=null==n?null:n,this.name=null==i?null:i,this[s]=!0,null!=r&&this.add(r)}var i=n(441).SourceMapGenerator,o=n(121),a=/(\r?\n)/,s="$$$isSourceNode$$$";r.fromStringWithSourceMap=function(e,t,n){function i(e,t){if(null===e||void 0===e.source)s.add(t);else{var i=n?o.join(n,e.source):e.source;s.add(new r(e.originalLine,e.originalColumn,i,t,e.name))}}var s=new r,u=e.split(a),l=0,c=function(){function e(){return l<u.length?u[l++]:void 0}return e()+(e()||"")},p=1,f=0,h=null;return t.eachMapping(function(e){if(null!==h){if(!(p<e.generatedLine)){var t=u[l]||"",n=t.substr(0,e.generatedColumn-f);return u[l]=t.substr(e.generatedColumn-f),f=e.generatedColumn,i(h,n),void(h=e)}i(h,c()),p++,f=0}for(;p<e.generatedLine;)s.add(c()),p++;if(f<e.generatedColumn){var t=u[l]||"";s.add(t.substr(0,e.generatedColumn)),u[l]=t.substr(e.generatedColumn),f=e.generatedColumn}h=e},this),l<u.length&&(h&&i(h,c()),s.add(u.splice(l).join(""))),t.sources.forEach(function(e){var r=t.sourceContentFor(e);null!=r&&(null!=n&&(e=o.join(n,e)),s.setSourceContent(e,r))}),s},r.prototype.add=function(e){if(Array.isArray(e))e.forEach(function(e){this.add(e)},this);else{if(!e[s]&&"string"!=typeof e)throw new TypeError("Expected a SourceNode, string, or an array of SourceNodes and strings. Got "+e);e&&this.children.push(e)}return this},r.prototype.prepend=function(e){if(Array.isArray(e))for(var t=e.length-1;t>=0;t--)this.prepend(e[t]);else{if(!e[s]&&"string"!=typeof e)throw new TypeError("Expected a SourceNode, string, or an array of SourceNodes and strings. Got "+e);this.children.unshift(e)}return this},r.prototype.walk=function(e){for(var t,n=0,r=this.children.length;n<r;n++)t=this.children[n],t[s]?t.walk(e):""!==t&&e(t,{source:this.source,line:this.line,column:this.column,name:this.name})},r.prototype.join=function(e){var t,n,r=this.children.length;if(r>0){for(t=[],n=0;n<r-1;n++)t.push(this.children[n]),t.push(e);t.push(this.children[n]),this.children=t}return this},r.prototype.replaceRight=function(e,t){var n=this.children[this.children.length-1];return n[s]?n.replaceRight(e,t):"string"==typeof n?this.children[this.children.length-1]=n.replace(e,t):this.children.push("".replace(e,t)),this},r.prototype.setSourceContent=function(e,t){this.sourceContents[o.toSetString(e)]=t},r.prototype.walkSourceContents=function(e){for(var t=0,n=this.children.length;t<n;t++)this.children[t][s]&&this.children[t].walkSourceContents(e);for(var r=Object.keys(this.sourceContents),t=0,n=r.length;t<n;t++)e(o.fromSetString(r[t]),this.sourceContents[r[t]])},r.prototype.toString=function(){var e="";return this.walk(function(t){e+=t}),e},r.prototype.toStringWithSourceMap=function(e){var t={code:"",line:1,column:0},n=new i(e),r=!1,o=null,a=null,s=null,u=null;return this.walk(function(e,i){t.code+=e,null!==i.source&&null!==i.line&&null!==i.column?(o===i.source&&a===i.line&&s===i.column&&u===i.name||n.addMapping({source:i.source,original:{line:i.line,column:i.column},generated:{line:t.line,column:t.column},name:i.name}),o=i.source,a=i.line,s=i.column,u=i.name,r=!0):r&&(n.addMapping({generated:{line:t.line,column:t.column}}),o=null,r=!1);for(var l=0,c=e.length;l<c;l++)10===e.charCodeAt(l)?(t.line++,t.column=0,l+1===c?(o=null,r=!1):r&&n.addMapping({source:i.source,original:{line:i.line,column:i.column},generated:{line:t.line,column:t.column},name:i.name})):t.column++}),this.walkSourceContents(function(e,t){n.setSourceContent(e,t)}),{code:t.code,map:n}},t.SourceNode=r},function(e,t,n){"use strict";function r(e,t,n,r,i){}e.exports=r},function(e,t,n){"use strict";var r=n(32),i=n(8),o=n(444);e.exports=function(){function e(e,t,n,r,a,s){s!==o&&i(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types")}function t(){return e}e.isRequired=e;var n={array:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t};return n.checkPropTypes=r,n.PropTypes=n,n}},function(e,t,n){"use strict";var r=n(32),i=n(8),o=n(10),a=n(13),s=n(444),u=n(995);e.exports=function(e,t){function n(e){var t=e&&(C&&e[C]||e[A]);if("function"==typeof t)return t}function l(e,t){return e===t?0!==e||1/e==1/t:e!==e&&t!==t}function c(e){this.message=e,this.stack=""}function p(e){function n(n,r,o,a,u,l,p){if(a=a||D,l=l||o,p!==s)if(t)i(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use `PropTypes.checkPropTypes()` to call them. Read more at http://fb.me/use-check-prop-types");else;return null==r[o]?n?new c(null===r[o]?"The "+u+" `"+l+"` is marked as required in `"+a+"`, but its value is `null`.":"The "+u+" `"+l+"` is marked as required in `"+a+"`, but its value is `undefined`."):null:e(r,o,a,u,l)}var r=n.bind(null,!1);return r.isRequired=n.bind(null,!0),r}function f(e){function t(t,n,r,i,o,a){var s=t[n];if(w(s)!==e)return new c("Invalid "+i+" `"+o+"` of type `"+k(s)+"` supplied to `"+r+"`, expected `"+e+"`.");return null}return p(t)}function h(e){function t(t,n,r,i,o){if("function"!=typeof e)return new c("Property `"+o+"` of component `"+r+"` has invalid PropType notation inside arrayOf.");var a=t[n];if(!Array.isArray(a)){return new c("Invalid "+i+" `"+o+"` of type `"+w(a)+"` supplied to `"+r+"`, expected an array.")}for(var u=0;u<a.length;u++){var l=e(a,u,r,i,o+"["+u+"]",s);if(l instanceof Error)return l}return null}return p(t)}function d(e){function t(t,n,r,i,o){if(!(t[n]instanceof e)){var a=e.name||D;return new c("Invalid "+i+" `"+o+"` of type `"+S(t[n])+"` supplied to `"+r+"`, expected instance of `"+a+"`.")}return null}return p(t)}function m(e){function t(t,n,r,i,o){for(var a=t[n],s=0;s<e.length;s++)if(l(a,e[s]))return null;return new c("Invalid "+i+" `"+o+"` of value `"+a+"` supplied to `"+r+"`, expected one of "+JSON.stringify(e)+".")}return Array.isArray(e)?p(t):r.thatReturnsNull}function v(e){function t(t,n,r,i,o){if("function"!=typeof e)return new c("Property `"+o+"` of component `"+r+"` has invalid PropType notation inside objectOf.");var a=t[n],u=w(a);if("object"!==u)return new c("Invalid "+i+" `"+o+"` of type `"+u+"` supplied to `"+r+"`, expected an object.");for(var l in a)if(a.hasOwnProperty(l)){var p=e(a,l,r,i,o+"."+l,s);if(p instanceof Error)return p}return null}return p(t)}function g(e){function t(t,n,r,i,o){for(var a=0;a<e.length;a++){if(null==(0,e[a])(t,n,r,i,o,s))return null}return new c("Invalid "+i+" `"+o+"` supplied to `"+r+"`.")}if(!Array.isArray(e))return r.thatReturnsNull;for(var n=0;n<e.length;n++){var i=e[n];if("function"!=typeof i)return o(!1,"Invalid argument supplied to oneOfType. Expected an array of check functions, but received %s at index %s.",E(i),n),r.thatReturnsNull}return p(t)}function y(e){function t(t,n,r,i,o){var a=t[n],u=w(a);if("object"!==u)return new c("Invalid "+i+" `"+o+"` of type `"+u+"` supplied to `"+r+"`, expected `object`.");for(var l in e){var p=e[l];if(p){var f=p(a,l,r,i,o+"."+l,s);if(f)return f}}return null}return p(t)}function _(e){function t(t,n,r,i,o){var u=t[n],l=w(u);if("object"!==l)return new c("Invalid "+i+" `"+o+"` of type `"+l+"` supplied to `"+r+"`, expected `object`.");var p=a({},t[n],e);for(var f in p){var h=e[f];if(!h)return new c("Invalid "+i+" `"+o+"` key `"+f+"` supplied to `"+r+"`.\nBad object: "+JSON.stringify(t[n],null,"  ")+"\nValid keys: "+JSON.stringify(Object.keys(e),null,"  "));var d=h(u,f,r,i,o+"."+f,s);if(d)return d}return null}return p(t)}function b(t){switch(typeof t){case"number":case"string":case"undefined":return!0;case"boolean":return!t;case"object":if(Array.isArray(t))return t.every(b);if(null===t||e(t))return!0;var r=n(t);if(!r)return!1;var i,o=r.call(t);if(r!==t.entries){for(;!(i=o.next()).done;)if(!b(i.value))return!1}else for(;!(i=o.next()).done;){var a=i.value;if(a&&!b(a[1]))return!1}return!0;default:return!1}}function x(e,t){return"symbol"===e||("Symbol"===t["@@toStringTag"]||"function"==typeof Symbol&&t instanceof Symbol)}function w(e){var t=typeof e;return Array.isArray(e)?"array":e instanceof RegExp?"object":x(t,e)?"symbol":t}function k(e){if(void 0===e||null===e)return""+e;var t=w(e);if("object"===t){if(e instanceof Date)return"date";if(e instanceof RegExp)return"regexp"}return t}function E(e){var t=k(e);switch(t){case"array":case"object":return"an "+t;case"boolean":case"date":case"regexp":return"a "+t;default:return t}}function S(e){return e.constructor&&e.constructor.name?e.constructor.name:D}var C="function"==typeof Symbol&&Symbol.iterator,A="@@iterator",D="<<anonymous>>",O={array:f("array"),bool:f("boolean"),func:f("function"),number:f("number"),object:f("object"),string:f("string"),symbol:f("symbol"),any:function(){return p(r.thatReturnsNull)}(),arrayOf:h,element:function(){function t(t,n,r,i,o){var a=t[n];if(!e(a)){return new c("Invalid "+i+" `"+o+"` of type `"+w(a)+"` supplied to `"+r+"`, expected a single ReactElement.")}return null}return p(t)}(),instanceOf:d,node:function(){function e(e,t,n,r,i){return b(e[t])?null:new c("Invalid "+r+" `"+i+"` supplied to `"+n+"`, expected a ReactNode.")}return p(e)}(),objectOf:v,oneOf:m,oneOfType:g,shape:y,exact:_};return c.prototype=Error.prototype,O.checkPropTypes=u,O.PropTypes=O,O}},function(e,t,n){(function(e,r){var i;!function(o){function a(e){throw RangeError(P[e])}function s(e,t){for(var n=e.length,r=[];n--;)r[n]=t(e[n]);return r}function u(e,t){var n=e.split("@"),r="";return n.length>1&&(r=n[0]+"@",e=n[1]),e=e.replace(T,"."),r+s(e.split("."),t).join(".")}function l(e){for(var t,n,r=[],i=0,o=e.length;i<o;)t=e.charCodeAt(i++),t>=55296&&t<=56319&&i<o?(n=e.charCodeAt(i++),56320==(64512&n)?r.push(((1023&t)<<10)+(1023&n)+65536):(r.push(t),i--)):r.push(t);return r}function c(e){return s(e,function(e){var t="";return e>65535&&(e-=65536,t+=j(e>>>10&1023|55296),e=56320|1023&e),t+=j(e)}).join("")}function p(e){return e-48<10?e-22:e-65<26?e-65:e-97<26?e-97:x}function f(e,t){return e+22+75*(e<26)-((0!=t)<<5)}function h(e,t,n){var r=0;for(e=n?R(e/S):e>>1,e+=R(e/t);e>I*k>>1;r+=x)e=R(e/I);return R(r+(I+1)*e/(e+E))}function d(e){var t,n,r,i,o,s,u,l,f,d,m=[],v=e.length,g=0,y=A,_=C;for(n=e.lastIndexOf(D),n<0&&(n=0),r=0;r<n;++r)e.charCodeAt(r)>=128&&a("not-basic"),m.push(e.charCodeAt(r));for(i=n>0?n+1:0;i<v;){for(o=g,s=1,u=x;i>=v&&a("invalid-input"),l=p(e.charCodeAt(i++)),(l>=x||l>R((b-g)/s))&&a("overflow"),g+=l*s,f=u<=_?w:u>=_+k?k:u-_,!(l<f);u+=x)d=x-f,s>R(b/d)&&a("overflow"),s*=d;t=m.length+1,_=h(g-o,t,0==o),R(g/t)>b-y&&a("overflow"),y+=R(g/t),g%=t,m.splice(g++,0,y)}return c(m)}function m(e){var t,n,r,i,o,s,u,c,p,d,m,v,g,y,_,E=[];for(e=l(e),v=e.length,t=A,n=0,o=C,s=0;s<v;++s)(m=e[s])<128&&E.push(j(m));for(r=i=E.length,i&&E.push(D);r<v;){for(u=b,s=0;s<v;++s)(m=e[s])>=t&&m<u&&(u=m);for(g=r+1,u-t>R((b-n)/g)&&a("overflow"),n+=(u-t)*g,t=u,s=0;s<v;++s)if(m=e[s],m<t&&++n>b&&a("overflow"),m==t){for(c=n,p=x;d=p<=o?w:p>=o+k?k:p-o,!(c<d);p+=x)_=c-d,y=x-d,E.push(j(f(d+_%y,0))),c=R(_/y);E.push(j(f(c,0))),o=h(n,g,r==i),n=0,++r}++n,++t}return E.join("")}function v(e){return u(e,function(e){return O.test(e)?d(e.slice(4).toLowerCase()):e})}function g(e){return u(e,function(e){return M.test(e)?"xn--"+m(e):e})}var y=("object"==typeof t&&t&&t.nodeType,"object"==typeof e&&e&&e.nodeType,"object"==typeof r&&r);var _,b=2147483647,x=36,w=1,k=26,E=38,S=700,C=72,A=128,D="-",O=/^xn--/,M=/[^\x20-\x7E]/,T=/[\x2E\u3002\uFF0E\uFF61]/g,P={overflow:"Overflow: input needs wider integers to process","not-basic":"Illegal input >= 0x80 (not a basic code point)","invalid-input":"Invalid input"},I=x-w,R=Math.floor,j=String.fromCharCode;_={version:"1.3.2",ucs2:{decode:l,encode:c},decode:d,encode:m,toASCII:g,toUnicode:v},void 0!==(i=function(){return _}.call(t,n,t,e))&&(e.exports=i)}()}).call(t,n(72)(e),n(17))},function(e,t,n){"use strict";var r=n(1001),i=n(1e3),o=n(445);e.exports={formats:o,parse:i,stringify:r}},function(e,t,n){"use strict";var r=n(446),i=Object.prototype.hasOwnProperty,o={allowDots:!1,allowPrototypes:!1,arrayLimit:20,decoder:r.decode,delimiter:"&",depth:5,parameterLimit:1e3,plainObjects:!1,strictNullHandling:!1},a=function(e,t){for(var n={},r=t.ignoreQueryPrefix?e.replace(/^\?/,""):e,a=t.parameterLimit===1/0?void 0:t.parameterLimit,s=r.split(t.delimiter,a),u=0;u<s.length;++u){var l,c,p=s[u],f=p.indexOf("]="),h=-1===f?p.indexOf("="):f+1;-1===h?(l=t.decoder(p,o.decoder),c=t.strictNullHandling?null:""):(l=t.decoder(p.slice(0,h),o.decoder),c=t.decoder(p.slice(h+1),o.decoder)),i.call(n,l)?n[l]=[].concat(n[l]).concat(c):n[l]=c}return n},s=function(e,t,n){for(var r=t,i=e.length-1;i>=0;--i){var o,a=e[i];if("[]"===a)o=[],o=o.concat(r);else{o=n.plainObjects?Object.create(null):{};var s="["===a.charAt(0)&&"]"===a.charAt(a.length-1)?a.slice(1,-1):a,u=parseInt(s,10);!isNaN(u)&&a!==s&&String(u)===s&&u>=0&&n.parseArrays&&u<=n.arrayLimit?(o=[],o[u]=r):o[s]=r}r=o}return r},u=function(e,t,n){if(e){var r=n.allowDots?e.replace(/\.([^.[]+)/g,"[$1]"):e,o=/(\[[^[\]]*])/,a=/(\[[^[\]]*])/g,u=o.exec(r),l=u?r.slice(0,u.index):r,c=[];if(l){if(!n.plainObjects&&i.call(Object.prototype,l)&&!n.allowPrototypes)return;c.push(l)}for(var p=0;null!==(u=a.exec(r))&&p<n.depth;){if(p+=1,!n.plainObjects&&i.call(Object.prototype,u[1].slice(1,-1))&&!n.allowPrototypes)return;c.push(u[1])}return u&&c.push("["+r.slice(u.index)+"]"),s(c,t,n)}};e.exports=function(e,t){var n=t?r.assign({},t):{};if(null!==n.decoder&&void 0!==n.decoder&&"function"!=typeof n.decoder)throw new TypeError("Decoder has to be a function.");if(n.ignoreQueryPrefix=!0===n.ignoreQueryPrefix,n.delimiter="string"==typeof n.delimiter||r.isRegExp(n.delimiter)?n.delimiter:o.delimiter,n.depth="number"==typeof n.depth?n.depth:o.depth,n.arrayLimit="number"==typeof n.arrayLimit?n.arrayLimit:o.arrayLimit,n.parseArrays=!1!==n.parseArrays,n.decoder="function"==typeof n.decoder?n.decoder:o.decoder,n.allowDots="boolean"==typeof n.allowDots?n.allowDots:o.allowDots,n.plainObjects="boolean"==typeof n.plainObjects?n.plainObjects:o.plainObjects,n.allowPrototypes="boolean"==typeof n.allowPrototypes?n.allowPrototypes:o.allowPrototypes,n.parameterLimit="number"==typeof n.parameterLimit?n.parameterLimit:o.parameterLimit,n.strictNullHandling="boolean"==typeof n.strictNullHandling?n.strictNullHandling:o.strictNullHandling,""===e||null===e||void 0===e)return n.plainObjects?Object.create(null):{};for(var i="string"==typeof e?a(e,n):e,s=n.plainObjects?Object.create(null):{},l=Object.keys(i),c=0;c<l.length;++c){var p=l[c],f=u(p,i[p],n);s=r.merge(s,f,n)}return r.compact(s)}},function(e,t,n){"use strict";var r=n(446),i=n(445),o={brackets:function(e){return e+"[]"},indices:function(e,t){return e+"["+t+"]"},repeat:function(e){return e}},a=Date.prototype.toISOString,s={delimiter:"&",encode:!0,encoder:r.encode,encodeValuesOnly:!1,serializeDate:function(e){return a.call(e)},skipNulls:!1,strictNullHandling:!1},u=function e(t,n,i,o,a,u,l,c,p,f,h,d){var m=t;if("function"==typeof l)m=l(n,m);else if(m instanceof Date)m=f(m);else if(null===m){if(o)return u&&!d?u(n,s.encoder):n;m=""}if("string"==typeof m||"number"==typeof m||"boolean"==typeof m||r.isBuffer(m)){if(u){return[h(d?n:u(n,s.encoder))+"="+h(u(m,s.encoder))]}return[h(n)+"="+h(String(m))]}var v=[];if(void 0===m)return v;var g;if(Array.isArray(l))g=l;else{var y=Object.keys(m);g=c?y.sort(c):y}for(var _=0;_<g.length;++_){var b=g[_];a&&null===m[b]||(v=Array.isArray(m)?v.concat(e(m[b],i(n,b),i,o,a,u,l,c,p,f,h,d)):v.concat(e(m[b],n+(p?"."+b:"["+b+"]"),i,o,a,u,l,c,p,f,h,d)))}return v};e.exports=function(e,t){var n=e,a=t?r.assign({},t):{};if(null!==a.encoder&&void 0!==a.encoder&&"function"!=typeof a.encoder)throw new TypeError("Encoder has to be a function.");var l=void 0===a.delimiter?s.delimiter:a.delimiter,c="boolean"==typeof a.strictNullHandling?a.strictNullHandling:s.strictNullHandling,p="boolean"==typeof a.skipNulls?a.skipNulls:s.skipNulls,f="boolean"==typeof a.encode?a.encode:s.encode,h="function"==typeof a.encoder?a.encoder:s.encoder,d="function"==typeof a.sort?a.sort:null,m=void 0!==a.allowDots&&a.allowDots,v="function"==typeof a.serializeDate?a.serializeDate:s.serializeDate,g="boolean"==typeof a.encodeValuesOnly?a.encodeValuesOnly:s.encodeValuesOnly;if(void 0===a.format)a.format=i.default;else if(!Object.prototype.hasOwnProperty.call(i.formatters,a.format))throw new TypeError("Unknown format option provided.");var y,_,b=i.formatters[a.format];"function"==typeof a.filter?(_=a.filter,n=_("",n)):Array.isArray(a.filter)&&(_=a.filter,y=_);var x=[];if("object"!=typeof n||null===n)return"";var w;w=a.arrayFormat in o?a.arrayFormat:"indices"in a?a.indices?"indices":"repeat":"indices";var k=o[w];y||(y=Object.keys(n)),d&&y.sort(d);for(var E=0;E<y.length;++E){var S=y[E];p&&null===n[S]||(x=x.concat(u(n[S],S,k,c,p,f?h:null,_,d,m,v,b,g)))}var C=x.join(l),A=!0===a.addQueryPrefix?"?":"";return C.length>0?A+C:""}},function(e,t,n){"use strict";function r(e,t){return Object.prototype.hasOwnProperty.call(e,t)}e.exports=function(e,t,n,o){t=t||"&",n=n||"=";var a={};if("string"!=typeof e||0===e.length)return a;var s=/\+/g;e=e.split(t);var u=1e3;o&&"number"==typeof o.maxKeys&&(u=o.maxKeys);var l=e.length;u>0&&l>u&&(l=u);for(var c=0;c<l;++c){var p,f,h,d,m=e[c].replace(s,"%20"),v=m.indexOf(n);v>=0?(p=m.substr(0,v),f=m.substr(v+1)):(p=m,f=""),h=decodeURIComponent(p),d=decodeURIComponent(f),r(a,h)?i(a[h])?a[h].push(d):a[h]=[a[h],d]:a[h]=d}return a};var i=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)}},function(e,t,n){"use strict";function r(e,t){if(e.map)return e.map(t);for(var n=[],r=0;r<e.length;r++)n.push(t(e[r],r));return n}var i=function(e){switch(typeof e){case"string":return e;case"boolean":return e?"true":"false";case"number":return isFinite(e)?e:"";default:return""}};e.exports=function(e,t,n,s){return t=t||"&",n=n||"=",null===e&&(e=void 0),"object"==typeof e?r(a(e),function(a){var s=encodeURIComponent(i(a))+n;return o(e[a])?r(e[a],function(e){return s+encodeURIComponent(i(e))}).join(t):s+encodeURIComponent(i(e[a]))}).join(t):s?encodeURIComponent(i(s))+n+encodeURIComponent(i(e)):""};var o=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)},a=Object.keys||function(e){var t=[];for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&t.push(n);return t}},function(e,t,n){"use strict";t.decode=t.parse=n(1002),t.encode=t.stringify=n(1003)},function(e,t,n){"use strict";function r(e){return decodeURIComponent(e.replace(/\+/g," "))}function i(e){for(var t,n=/([^=?&]+)=?([^&]*)/g,i={};t=n.exec(e);i[r(t[1])]=r(t[2]));return i}function o(e,t){t=t||"";var n=[];"string"!=typeof t&&(t="?");for(var r in e)a.call(e,r)&&n.push(encodeURIComponent(r)+"="+encodeURIComponent(e[r]));return n.length?t+n.join("&"):""}var a=Object.prototype.hasOwnProperty;t.stringify=o,t.parse=i},function(e,t,n){(function(t){(function(){var n,r,i,o,a,s;"undefined"!=typeof performance&&null!==performance&&performance.now?e.exports=function(){return performance.now()}:void 0!==t&&null!==t&&t.hrtime?(e.exports=function(){return(n()-a)/1e6},r=t.hrtime,n=function(){var e;return e=r(),1e9*e[0]+e[1]},o=n(),s=1e9*t.uptime(),a=o-s):Date.now?(e.exports=function(){return Date.now()-i},i=Date.now()):(e.exports=function(){return(new Date).getTime()-i},i=(new Date).getTime())}).call(this)}).call(t,n(33))},function(e,t){e.exports='---\nurl: "http://petstore.swagger.io/v2/swagger.json"\ndom_id: "#swagger-ui"\nvalidatorUrl: "https://online.swagger.io/validator"\noauth2RedirectUrl: "http://localhost:3200/oauth2-redirect.html"\n'},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){var n={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0}),t.UnmountClosed=void 0;var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},l=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),c=n(0),p=r(c),f=n(1),h=r(f),d=n(447);(t.UnmountClosed=function(e){function t(e){o(this,t);var n=a(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e));return n.componentWillReceiveProps=function(e){var t=e.isOpened;!n.props.isOpened&&t&&n.setState({forceInitialAnimation:!0,shouldUnmount:!1})},n.onRest=function(){var e=n.props,t=e.isOpened,r=e.onRest;t||n.setState({shouldUnmount:!0}),r&&r.apply(void 0,arguments)},n.state={shouldUnmount:!n.props.isOpened,forceInitialAnimation:!n.props.isOpened},n}return s(t,e),l(t,[{key:"render",value:function(){var e=this.props,t=e.isOpened,n=(e.onRest,i(e,["isOpened","onRest"])),r=this.state,o=r.forceInitialAnimation;return r.shouldUnmount?null:p.default.createElement(d.Collapse,u({forceInitialAnimation:o,isOpened:t,onRest:this.onRest},n))}}]),t}(p.default.PureComponent)).propTypes={isOpened:h.default.bool.isRequired,onRest:h.default.func}},function(e,t,n){"use strict";var r={Properties:{"aria-current":0,"aria-details":0,"aria-disabled":0,"aria-hidden":0,"aria-invalid":0,"aria-keyshortcuts":0,"aria-label":0,"aria-roledescription":0,"aria-autocomplete":0,"aria-checked":0,"aria-expanded":0,"aria-haspopup":0,"aria-level":0,"aria-modal":0,"aria-multiline":0,"aria-multiselectable":0,"aria-orientation":0,"aria-placeholder":0,"aria-pressed":0,"aria-readonly":0,"aria-required":0,"aria-selected":0,"aria-sort":0,"aria-valuemax":0,"aria-valuemin":0,"aria-valuenow":0,"aria-valuetext":0,"aria-atomic":0,"aria-busy":0,"aria-live":0,"aria-relevant":0,"aria-dropeffect":0,"aria-grabbed":0,"aria-activedescendant":0,"aria-colcount":0,"aria-colindex":0,"aria-colspan":0,"aria-controls":0,"aria-describedby":0,"aria-errormessage":0,"aria-flowto":0,"aria-labelledby":0,"aria-owns":0,"aria-posinset":0,"aria-rowcount":0,"aria-rowindex":0,"aria-rowspan":0,"aria-setsize":0},DOMAttributeNames:{},DOMPropertyNames:{}};e.exports=r},function(e,t,n){"use strict";var r=n(14),i=n(378),o={focusDOMComponent:function(){i(r.getNodeFromInstance(this))}};e.exports=o},function(e,t,n){"use strict";function r(e){return(e.ctrlKey||e.altKey||e.metaKey)&&!(e.ctrlKey&&e.altKey)}function i(e){switch(e){case"topCompositionStart":return S.compositionStart;case"topCompositionEnd":return S.compositionEnd;case"topCompositionUpdate":return S.compositionUpdate}}function o(e,t){return"topKeyDown"===e&&t.keyCode===y}function a(e,t){switch(e){case"topKeyUp":return-1!==g.indexOf(t.keyCode);case"topKeyDown":return t.keyCode!==y;case"topKeyPress":case"topMouseDown":case"topBlur":return!0;default:return!1}}function s(e){var t=e.detail;return"object"==typeof t&&"data"in t?t.data:null}function u(e,t,n,r){var u,l;if(_?u=i(e):A?a(e,n)&&(u=S.compositionEnd):o(e,n)&&(u=S.compositionStart),!u)return null;w&&(A||u!==S.compositionStart?u===S.compositionEnd&&A&&(l=A.getData()):A=d.getPooled(r));var c=m.getPooled(u,t,n,r);if(l)c.data=l;else{var p=s(n);null!==p&&(c.data=p)}return f.accumulateTwoPhaseDispatches(c),c}function l(e,t){switch(e){case"topCompositionEnd":return s(t);case"topKeyPress":return t.which!==k?null:(C=!0,E);case"topTextInput":var n=t.data;return n===E&&C?null:n;default:return null}}function c(e,t){if(A){if("topCompositionEnd"===e||!_&&a(e,t)){var n=A.getData();return d.release(A),A=null,n}return null}switch(e){case"topPaste":return null;case"topKeyPress":return t.which&&!r(t)?String.fromCharCode(t.which):null;case"topCompositionEnd":return w?null:t.data;default:return null}}function p(e,t,n,r){var i;if(!(i=x?l(e,n):c(e,n)))return null;var o=v.getPooled(S.beforeInput,t,n,r);return o.data=i,f.accumulateTwoPhaseDispatches(o),o}var f=n(123),h=n(25),d=n(1017),m=n(1054),v=n(1057),g=[9,13,27,32],y=229,_=h.canUseDOM&&"CompositionEvent"in window,b=null;h.canUseDOM&&"documentMode"in document&&(b=document.documentMode);var x=h.canUseDOM&&"TextEvent"in window&&!b&&!function(){var e=window.opera;return"object"==typeof e&&"function"==typeof e.version&&parseInt(e.version(),10)<=12}(),w=h.canUseDOM&&(!_||b&&b>8&&b<=11),k=32,E=String.fromCharCode(k),S={beforeInput:{phasedRegistrationNames:{bubbled:"onBeforeInput",captured:"onBeforeInputCapture"},dependencies:["topCompositionEnd","topKeyPress","topTextInput","topPaste"]},compositionEnd:{phasedRegistrationNames:{bubbled:"onCompositionEnd",captured:"onCompositionEndCapture"},dependencies:["topBlur","topCompositionEnd","topKeyDown","topKeyPress","topKeyUp","topMouseDown"]},compositionStart:{phasedRegistrationNames:{bubbled:"onCompositionStart",captured:"onCompositionStartCapture"},dependencies:["topBlur","topCompositionStart","topKeyDown","topKeyPress","topKeyUp","topMouseDown"]},compositionUpdate:{phasedRegistrationNames:{bubbled:"onCompositionUpdate",captured:"onCompositionUpdateCapture"},dependencies:["topBlur","topCompositionUpdate","topKeyDown","topKeyPress","topKeyUp","topMouseDown"]}},C=!1,A=null,D={eventTypes:S,extractEvents:function(e,t,n,r){return[u(e,t,n,r),p(e,t,n,r)]}};e.exports=D},function(e,t,n){"use strict";var r=n(450),i=n(25),o=(n(39),n(747),n(1063)),a=n(754),s=n(757),u=(n(10),s(function(e){return a(e)})),l=!1,c="cssFloat";if(i.canUseDOM){var p=document.createElement("div").style;try{p.font=""}catch(e){l=!0}void 0===document.documentElement.style.cssFloat&&(c="styleFloat")}var f={createMarkupForStyles:function(e,t){var n="";for(var r in e)if(e.hasOwnProperty(r)){var i=0===r.indexOf("--"),a=e[r];null!=a&&(n+=u(r)+":",n+=o(r,a,t,i)+";")}return n||null},setValueForStyles:function(e,t,n){var i=e.style;for(var a in t)if(t.hasOwnProperty(a)){var s=0===a.indexOf("--"),u=o(a,t[a],n,s);if("float"!==a&&"cssFloat"!==a||(a=c),s)i.setProperty(a,u);else if(u)i[a]=u;else{var p=l&&r.shorthandPropertyExpansions[a];if(p)for(var f in p)i[f]="";else i[a]=""}}}};e.exports=f},function(e,t,n){"use strict";function r(e,t,n){var r=C.getPooled(T.change,e,t,n);return r.type="change",w.accumulateTwoPhaseDispatches(r),r}function i(e){var t=e.nodeName&&e.nodeName.toLowerCase();return"select"===t||"input"===t&&"file"===e.type}function o(e){var t=r(I,e,D(e));S.batchedUpdates(a,t)}function a(e){x.enqueueEvents(e),x.processEventQueue(!1)}function s(e,t){P=e,I=t,P.attachEvent("onchange",o)}function u(){P&&(P.detachEvent("onchange",o),P=null,I=null)}function l(e,t){var n=A.updateValueIfChanged(e),r=!0===t.simulated&&F._allowSimulatedPassThrough;if(n||r)return e}function c(e,t){if("topChange"===e)return t}function p(e,t,n){"topFocus"===e?(u(),s(t,n)):"topBlur"===e&&u()}function f(e,t){P=e,I=t,P.attachEvent("onpropertychange",d)}function h(){P&&(P.detachEvent("onpropertychange",d),P=null,I=null)}function d(e){"value"===e.propertyName&&l(I,e)&&o(e)}function m(e,t,n){"topFocus"===e?(h(),f(t,n)):"topBlur"===e&&h()}function v(e,t,n){if("topSelectionChange"===e||"topKeyUp"===e||"topKeyDown"===e)return l(I,n)}function g(e){var t=e.nodeName;return t&&"input"===t.toLowerCase()&&("checkbox"===e.type||"radio"===e.type)}function y(e,t,n){if("topClick"===e)return l(t,n)}function _(e,t,n){if("topInput"===e||"topChange"===e)return l(t,n)}function b(e,t){if(null!=e){var n=e._wrapperState||t._wrapperState;if(n&&n.controlled&&"number"===t.type){var r=""+t.value;t.getAttribute("value")!==r&&t.setAttribute("value",r)}}}var x=n(122),w=n(123),k=n(25),E=n(14),S=n(44),C=n(51),A=n(466),D=n(252),O=n(253),M=n(468),T={change:{phasedRegistrationNames:{bubbled:"onChange",captured:"onChangeCapture"},dependencies:["topBlur","topChange","topClick","topFocus","topInput","topKeyDown","topKeyUp","topSelectionChange"]}},P=null,I=null,R=!1;k.canUseDOM&&(R=O("change")&&(!document.documentMode||document.documentMode>8));var j=!1;k.canUseDOM&&(j=O("input")&&(!document.documentMode||document.documentMode>9));var F={eventTypes:T,_allowSimulatedPassThrough:!0,_isInputEventSupported:j,extractEvents:function(e,t,n,o){var a,s,u=t?E.getNodeFromInstance(t):window;if(i(u)?R?a=c:s=p:M(u)?j?a=_:(a=v,s=m):g(u)&&(a=y),a){var l=a(e,t,n);if(l){return r(l,n,o)}}s&&s(e,u,t),"topBlur"===e&&b(t,u)}};e.exports=F},function(e,t,n){"use strict";var r=n(11),i=n(88),o=n(25),a=n(750),s=n(32),u=(n(8),{dangerouslyReplaceNodeWithMarkup:function(e,t){if(o.canUseDOM||r("56"),t||r("57"),"HTML"===e.nodeName&&r("58"),"string"==typeof t){var n=a(t,s)[0];e.parentNode.replaceChild(n,e)}else i.replaceChildWithTree(e,t)}});e.exports=u},function(e,t,n){"use strict";var r=["ResponderEventPlugin","SimpleEventPlugin","TapEventPlugin","EnterLeaveEventPlugin","ChangeEventPlugin","SelectEventPlugin","BeforeInputEventPlugin"];e.exports=r},function(e,t,n){"use strict";var r=n(123),i=n(14),o=n(160),a={mouseEnter:{registrationName:"onMouseEnter",dependencies:["topMouseOut","topMouseOver"]},mouseLeave:{registrationName:"onMouseLeave",dependencies:["topMouseOut","topMouseOver"]}},s={eventTypes:a,extractEvents:function(e,t,n,s){if("topMouseOver"===e&&(n.relatedTarget||n.fromElement))return null;if("topMouseOut"!==e&&"topMouseOver"!==e)return null;var u;if(s.window===s)u=s;else{var l=s.ownerDocument;u=l?l.defaultView||l.parentWindow:window}var c,p;if("topMouseOut"===e){c=t;var f=n.relatedTarget||n.toElement;p=f?i.getClosestInstanceFromNode(f):null}else c=null,p=t;if(c===p)return null;var h=null==c?u:i.getNodeFromInstance(c),d=null==p?u:i.getNodeFromInstance(p),m=o.getPooled(a.mouseLeave,c,n,s);m.type="mouseleave",m.target=h,m.relatedTarget=d;var v=o.getPooled(a.mouseEnter,p,n,s);return v.type="mouseenter",v.target=d,v.relatedTarget=h,r.accumulateEnterLeaveDispatches(m,v,c,p),[m,v]}};e.exports=s},function(e,t,n){"use strict";function r(e){this._root=e,this._startText=this.getText(),this._fallbackText=null}var i=n(13),o=n(70),a=n(465);i(r.prototype,{destructor:function(){this._root=null,this._startText=null,this._fallbackText=null},getText:function(){return"value"in this._root?this._root.value:this._root[a()]},getData:function(){if(this._fallbackText)return this._fallbackText;var e,t,n=this._startText,r=n.length,i=this.getText(),o=i.length;for(e=0;e<r&&n[e]===i[e];e++);var a=r-e;for(t=1;t<=a&&n[r-t]===i[o-t];t++);var s=t>1?1-t:void 0;return this._fallbackText=i.slice(e,s),this._fallbackText}}),o.addPoolingTo(r),e.exports=r},function(e,t,n){"use strict";var r=n(89),i=r.injection.MUST_USE_PROPERTY,o=r.injection.HAS_BOOLEAN_VALUE,a=r.injection.HAS_NUMERIC_VALUE,s=r.injection.HAS_POSITIVE_NUMERIC_VALUE,u=r.injection.HAS_OVERLOADED_BOOLEAN_VALUE,l={isCustomAttribute:RegExp.prototype.test.bind(new RegExp("^(data|aria)-["+r.ATTRIBUTE_NAME_CHAR+"]*$")),Properties:{accept:0,acceptCharset:0,accessKey:0,action:0,allowFullScreen:o,allowTransparency:0,alt:0,as:0,async:o,autoComplete:0,autoPlay:o,capture:o,cellPadding:0,cellSpacing:0,charSet:0,challenge:0,checked:i|o,cite:0,classID:0,className:0,cols:s,colSpan:0,content:0,contentEditable:0,contextMenu:0,controls:o,controlsList:0,coords:0,crossOrigin:0,data:0,dateTime:0,default:o,defer:o,dir:0,disabled:o,download:u,draggable:0,encType:0,form:0,formAction:0,formEncType:0,formMethod:0,formNoValidate:o,formTarget:0,frameBorder:0,headers:0,height:0,hidden:o,high:0,href:0,hrefLang:0,htmlFor:0,httpEquiv:0,icon:0,id:0,inputMode:0,integrity:0,is:0,keyParams:0,keyType:0,kind:0,label:0,lang:0,list:0,loop:o,low:0,manifest:0,marginHeight:0,marginWidth:0,max:0,maxLength:0,media:0,mediaGroup:0,method:0,min:0,minLength:0,multiple:i|o,muted:i|o,name:0,nonce:0,noValidate:o,open:o,optimum:0,pattern:0,placeholder:0,playsInline:o,poster:0,preload:0,profile:0,radioGroup:0,readOnly:o,referrerPolicy:0,rel:0,required:o,reversed:o,role:0,rows:s,rowSpan:a,sandbox:0,scope:0,scoped:o,scrolling:0,seamless:o,selected:i|o,shape:0,size:s,sizes:0,span:s,spellCheck:0,src:0,srcDoc:0,srcLang:0,srcSet:0,start:a,step:0,style:0,summary:0,tabIndex:0,target:0,title:0,type:0,useMap:0,value:0,width:0,wmode:0,wrap:0,about:0,datatype:0,inlist:0,prefix:0,property:0,resource:0,typeof:0,vocab:0,autoCapitalize:0,autoCorrect:0,autoSave:0,color:0,itemProp:0,itemScope:o,itemType:0,itemID:0,itemRef:0,results:0,security:0,unselectable:0},DOMAttributeNames:{acceptCharset:"accept-charset",className:"class",htmlFor:"for",httpEquiv:"http-equiv"},DOMPropertyNames:{},DOMMutationMethods:{value:function(e,t){if(null==t)return e.removeAttribute("value");"number"!==e.type||!1===e.hasAttribute("value")?e.setAttribute("value",""+t):e.validity&&!e.validity.badInput&&e.ownerDocument.activeElement!==e&&e.setAttribute("value",""+t)}}};e.exports=l},function(e,t,n){"use strict";(function(t){function r(e,t,n,r){var i=void 0===e[n];null!=t&&i&&(e[n]=o(t,!0))}var i=n(90),o=n(467),a=(n(244),n(254)),s=n(470);n(10);void 0!==t&&n.i({NODE_ENV:"production",WEBPACK_INLINE_STYLES:!1});var u={instantiateChildren:function(e,t,n,i){if(null==e)return null;var o={};return s(e,r,o),o},updateChildren:function(e,t,n,r,s,u,l,c,p){if(t||e){var f,h;for(f in t)if(t.hasOwnProperty(f)){h=e&&e[f];var d=h&&h._currentElement,m=t[f];if(null!=h&&a(d,m))i.receiveComponent(h,m,s,c),t[f]=h;else{h&&(r[f]=i.getHostNode(h),i.unmountComponent(h,!1));var v=o(m,!0);t[f]=v;var g=i.mountComponent(v,s,u,l,c,p);n.push(g)}}for(f in e)!e.hasOwnProperty(f)||t&&t.hasOwnProperty(f)||(h=e[f],r[f]=i.getHostNode(h),i.unmountComponent(h,!1))}},unmountChildren:function(e,t){for(var n in e)if(e.hasOwnProperty(n)){var r=e[n];i.unmountComponent(r,t)}}};e.exports=u}).call(t,n(33))},function(e,t,n){"use strict";var r=n(240),i=n(1027),o={processChildrenUpdates:i.dangerouslyProcessChildrenUpdates,replaceNodeWithMarkup:r.dangerouslyReplaceNodeWithMarkup};e.exports=o},function(e,t,n){"use strict";function r(e){}function i(e){return!(!e.prototype||!e.prototype.isReactComponent)}function o(e){return!(!e.prototype||!e.prototype.isPureReactComponent)}var a=n(11),s=n(13),u=n(92),l=n(246),c=n(52),p=n(247),f=n(124),h=(n(39),n(460)),d=n(90),m=n(144),v=(n(8),n(208)),g=n(254),y=(n(10),{ImpureClass:0,PureClass:1,StatelessFunctional:2});r.prototype.render=function(){var e=f.get(this)._currentElement.type,t=e(this.props,this.context,this.updater);return t};var _=1,b={construct:function(e){this._currentElement=e,this._rootNodeID=0,this._compositeType=null,this._instance=null,this._hostParent=null,this._hostContainerInfo=null,this._updateBatchNumber=null,this._pendingElement=null,this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._renderedNodeType=null,this._renderedComponent=null,this._context=null,this._mountOrder=0,this._topLevelWrapper=null,this._pendingCallbacks=null,this._calledComponentWillUnmount=!1},mountComponent:function(e,t,n,s){this._context=s,this._mountOrder=_++,this._hostParent=t,this._hostContainerInfo=n;var l,c=this._currentElement.props,p=this._processContext(s),h=this._currentElement.type,d=e.getUpdateQueue(),v=i(h),g=this._constructComponent(v,c,p,d);v||null!=g&&null!=g.render?o(h)?this._compositeType=y.PureClass:this._compositeType=y.ImpureClass:(l=g,null===g||!1===g||u.isValidElement(g)||a("105",h.displayName||h.name||"Component"),g=new r(h),this._compositeType=y.StatelessFunctional);g.props=c,g.context=p,g.refs=m,g.updater=d,this._instance=g,f.set(g,this);var b=g.state;void 0===b&&(g.state=b=null),("object"!=typeof b||Array.isArray(b))&&a("106",this.getName()||"ReactCompositeComponent"),this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1;var x;return x=g.unstable_handleError?this.performInitialMountWithErrorHandling(l,t,n,e,s):this.performInitialMount(l,t,n,e,s),g.componentDidMount&&e.getReactMountReady().enqueue(g.componentDidMount,g),x},_constructComponent:function(e,t,n,r){return this._constructComponentWithoutOwner(e,t,n,r)},_constructComponentWithoutOwner:function(e,t,n,r){var i=this._currentElement.type;return e?new i(t,n,r):i(t,n,r)},performInitialMountWithErrorHandling:function(e,t,n,r,i){var o,a=r.checkpoint();try{o=this.performInitialMount(e,t,n,r,i)}catch(s){r.rollback(a),this._instance.unstable_handleError(s),this._pendingStateQueue&&(this._instance.state=this._processPendingState(this._instance.props,this._instance.context)),a=r.checkpoint(),this._renderedComponent.unmountComponent(!0),r.rollback(a),o=this.performInitialMount(e,t,n,r,i)}return o},performInitialMount:function(e,t,n,r,i){var o=this._instance,a=0;o.componentWillMount&&(o.componentWillMount(),this._pendingStateQueue&&(o.state=this._processPendingState(o.props,o.context))),void 0===e&&(e=this._renderValidatedComponent());var s=h.getType(e);this._renderedNodeType=s;var u=this._instantiateReactComponent(e,s!==h.EMPTY);this._renderedComponent=u;var l=d.mountComponent(u,r,t,n,this._processChildContext(i),a);return l},getHostNode:function(){return d.getHostNode(this._renderedComponent)},unmountComponent:function(e){if(this._renderedComponent){var t=this._instance;if(t.componentWillUnmount&&!t._calledComponentWillUnmount)if(t._calledComponentWillUnmount=!0,e){var n=this.getName()+".componentWillUnmount()";p.invokeGuardedCallback(n,t.componentWillUnmount.bind(t))}else t.componentWillUnmount();this._renderedComponent&&(d.unmountComponent(this._renderedComponent,e),this._renderedNodeType=null,this._renderedComponent=null,this._instance=null),this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._pendingCallbacks=null,this._pendingElement=null,this._context=null,this._rootNodeID=0,this._topLevelWrapper=null,f.remove(t)}},_maskContext:function(e){var t=this._currentElement.type,n=t.contextTypes;if(!n)return m;var r={};for(var i in n)r[i]=e[i];return r},_processContext:function(e){var t=this._maskContext(e);return t},_processChildContext:function(e){var t,n=this._currentElement.type,r=this._instance;if(r.getChildContext&&(t=r.getChildContext()),t){"object"!=typeof n.childContextTypes&&a("107",this.getName()||"ReactCompositeComponent");for(var i in t)i in n.childContextTypes||a("108",this.getName()||"ReactCompositeComponent",i);return s({},e,t)}return e},_checkContextTypes:function(e,t,n){},receiveComponent:function(e,t,n){var r=this._currentElement,i=this._context;this._pendingElement=null,this.updateComponent(t,r,e,i,n)},performUpdateIfNecessary:function(e){null!=this._pendingElement?d.receiveComponent(this,this._pendingElement,e,this._context):null!==this._pendingStateQueue||this._pendingForceUpdate?this.updateComponent(e,this._currentElement,this._currentElement,this._context,this._context):this._updateBatchNumber=null},updateComponent:function(e,t,n,r,i){var o=this._instance;null==o&&a("136",this.getName()||"ReactCompositeComponent");var s,u=!1;this._context===i?s=o.context:(s=this._processContext(i),u=!0);var l=t.props,c=n.props;t!==n&&(u=!0),u&&o.componentWillReceiveProps&&o.componentWillReceiveProps(c,s);var p=this._processPendingState(c,s),f=!0;this._pendingForceUpdate||(o.shouldComponentUpdate?f=o.shouldComponentUpdate(c,p,s):this._compositeType===y.PureClass&&(f=!v(l,c)||!v(o.state,p))),this._updateBatchNumber=null,f?(this._pendingForceUpdate=!1,this._performComponentUpdate(n,c,p,s,e,i)):(this._currentElement=n,this._context=i,o.props=c,o.state=p,o.context=s)},_processPendingState:function(e,t){var n=this._instance,r=this._pendingStateQueue,i=this._pendingReplaceState;if(this._pendingReplaceState=!1,this._pendingStateQueue=null,!r)return n.state;if(i&&1===r.length)return r[0];for(var o=s({},i?r[0]:n.state),a=i?1:0;a<r.length;a++){var u=r[a];s(o,"function"==typeof u?u.call(n,o,e,t):u)}return o},_performComponentUpdate:function(e,t,n,r,i,o){var a,s,u,l=this._instance,c=Boolean(l.componentDidUpdate);c&&(a=l.props,s=l.state,u=l.context),l.componentWillUpdate&&l.componentWillUpdate(t,n,r),this._currentElement=e,this._context=o,l.props=t,l.state=n,l.context=r,this._updateRenderedComponent(i,o),c&&i.getReactMountReady().enqueue(l.componentDidUpdate.bind(l,a,s,u),l)},_updateRenderedComponent:function(e,t){var n=this._renderedComponent,r=n._currentElement,i=this._renderValidatedComponent(),o=0;if(g(r,i))d.receiveComponent(n,i,e,this._processChildContext(t));else{var a=d.getHostNode(n);d.unmountComponent(n,!1);var s=h.getType(i);this._renderedNodeType=s;var u=this._instantiateReactComponent(i,s!==h.EMPTY);this._renderedComponent=u;var l=d.mountComponent(u,e,this._hostParent,this._hostContainerInfo,this._processChildContext(t),o);this._replaceNodeWithMarkup(a,l,n)}},_replaceNodeWithMarkup:function(e,t,n){l.replaceNodeWithMarkup(e,t,n)},_renderValidatedComponentWithoutOwnerOrContext:function(){var e=this._instance;return e.render()},_renderValidatedComponent:function(){var e;if(this._compositeType!==y.StatelessFunctional){c.current=this;try{e=this._renderValidatedComponentWithoutOwnerOrContext()}finally{c.current=null}}else e=this._renderValidatedComponentWithoutOwnerOrContext();return null===e||!1===e||u.isValidElement(e)||a("109",this.getName()||"ReactCompositeComponent"),e},attachRef:function(e,t){var n=this.getPublicInstance();null==n&&a("110");var r=t.getPublicInstance();(n.refs===m?n.refs={}:n.refs)[e]=r},detachRef:function(e){delete this.getPublicInstance().refs[e]},getName:function(){var e=this._currentElement.type,t=this._instance&&this._instance.constructor;return e.displayName||t&&t.displayName||e.name||t&&t.name||null},getPublicInstance:function(){var e=this._instance;return this._compositeType===y.StatelessFunctional?null:e},_instantiateReactComponent:null};e.exports=b},function(e,t,n){"use strict";var r=n(14),i=n(1035),o=n(459),a=n(90),s=n(44),u=n(1048),l=n(1064),c=n(464),p=n(1071);n(10);i.inject();var f={findDOMNode:l,render:o.render,unmountComponentAtNode:o.unmountComponentAtNode,version:u,unstable_batchedUpdates:s.batchedUpdates,unstable_renderSubtreeIntoContainer:p};"undefined"!=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&"function"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject&&__REACT_DEVTOOLS_GLOBAL_HOOK__.inject({ComponentTree:{getClosestInstanceFromNode:r.getClosestInstanceFromNode,getNodeFromInstance:function(e){return e._renderedComponent&&(e=c(e)),e?r.getNodeFromInstance(e):null}},Mount:o,Reconciler:a});e.exports=f},function(e,t,n){"use strict";function r(e){if(e){var t=e._currentElement._owner||null;if(t){var n=t.getName();if(n)return" This DOM node was rendered by `"+n+"`."}}return""}function i(e,t){t&&(X[e._tag]&&(null!=t.children||null!=t.dangerouslySetInnerHTML)&&v("137",e._tag,e._currentElement._owner?" Check the render method of "+e._currentElement._owner.getName()+".":""),null!=t.dangerouslySetInnerHTML&&(null!=t.children&&v("60"),"object"==typeof t.dangerouslySetInnerHTML&&W in t.dangerouslySetInnerHTML||v("61")),null!=t.style&&"object"!=typeof t.style&&v("62",r(e)))}function o(e,t,n,r){if(!(r instanceof R)){var i=e._hostContainerInfo,o=i._node&&i._node.nodeType===H,s=o?i._node:i._ownerDocument;q(t,s),r.getReactMountReady().enqueue(a,{inst:e,registrationName:t,listener:n})}}function a(){var e=this;E.putListener(e.inst,e.registrationName,e.listener)}function s(){var e=this;O.postMountWrapper(e)}function u(){var e=this;P.postMountWrapper(e)}function l(){var e=this;M.postMountWrapper(e)}function c(){F.track(this)}function p(){var e=this;e._rootNodeID||v("63");var t=L(e);switch(t||v("64"),e._tag){case"iframe":case"object":e._wrapperState.listeners=[C.trapBubbledEvent("topLoad","load",t)];break;case"video":case"audio":e._wrapperState.listeners=[];for(var n in G)G.hasOwnProperty(n)&&e._wrapperState.listeners.push(C.trapBubbledEvent(n,G[n],t));break;case"source":e._wrapperState.listeners=[C.trapBubbledEvent("topError","error",t)];break;case"img":e._wrapperState.listeners=[C.trapBubbledEvent("topError","error",t),C.trapBubbledEvent("topLoad","load",t)];break;case"form":e._wrapperState.listeners=[C.trapBubbledEvent("topReset","reset",t),C.trapBubbledEvent("topSubmit","submit",t)];break;case"input":case"select":case"textarea":e._wrapperState.listeners=[C.trapBubbledEvent("topInvalid","invalid",t)]}}function f(){T.postUpdateWrapper(this)}function h(e){Z.call($,e)||(Y.test(e)||v("65",e),$[e]=!0)}function d(e,t){return e.indexOf("-")>=0||null!=t.is}function m(e){var t=e.type;h(t),this._currentElement=e,this._tag=t.toLowerCase(),this._namespaceURI=null,this._renderedChildren=null,this._previousStyle=null,this._previousStyleCopy=null,this._hostNode=null,this._hostParent=null,this._rootNodeID=0,this._domID=0,this._hostContainerInfo=null,this._wrapperState=null,this._topLevelWrapper=null,this._flags=0}var v=n(11),g=n(13),y=n(1010),_=n(1012),b=n(88),x=n(241),w=n(89),k=n(452),E=n(122),S=n(242),C=n(159),A=n(453),D=n(14),O=n(1028),M=n(1029),T=n(454),P=n(1032),I=(n(39),n(1041)),R=n(1046),j=(n(32),n(162)),F=(n(8),n(253),n(208),n(466)),N=(n(255),n(10),A),B=E.deleteListener,L=D.getNodeFromInstance,q=C.listenTo,z=S.registrationNameModules,U={string:!0,number:!0},W="__html",V={children:null,dangerouslySetInnerHTML:null,suppressContentEditableWarning:null},H=11,G={topAbort:"abort",topCanPlay:"canplay",topCanPlayThrough:"canplaythrough",topDurationChange:"durationchange",topEmptied:"emptied",topEncrypted:"encrypted",topEnded:"ended",topError:"error",topLoadedData:"loadeddata",topLoadedMetadata:"loadedmetadata",topLoadStart:"loadstart",topPause:"pause",topPlay:"play",topPlaying:"playing",topProgress:"progress",topRateChange:"ratechange",topSeeked:"seeked",topSeeking:"seeking",topStalled:"stalled",topSuspend:"suspend",topTimeUpdate:"timeupdate",topVolumeChange:"volumechange",topWaiting:"waiting"},J={area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},K={listing:!0,pre:!0,textarea:!0},X=g({menuitem:!0},J),Y=/^[a-zA-Z][a-zA-Z:_\.\-\d]*$/,$={},Z={}.hasOwnProperty,Q=1;m.displayName="ReactDOMComponent",m.Mixin={mountComponent:function(e,t,n,r){this._rootNodeID=Q++,this._domID=n._idCounter++,this._hostParent=t,this._hostContainerInfo=n;var o=this._currentElement.props;switch(this._tag){case"audio":case"form":case"iframe":case"img":case"link":case"object":case"source":case"video":this._wrapperState={listeners:null},e.getReactMountReady().enqueue(p,this);break;case"input":O.mountWrapper(this,o,t),o=O.getHostProps(this,o),e.getReactMountReady().enqueue(c,this),e.getReactMountReady().enqueue(p,this);break;case"option":M.mountWrapper(this,o,t),o=M.getHostProps(this,o);break;case"select":T.mountWrapper(this,o,t),o=T.getHostProps(this,o),e.getReactMountReady().enqueue(p,this);break;case"textarea":P.mountWrapper(this,o,t),o=P.getHostProps(this,o),e.getReactMountReady().enqueue(c,this),e.getReactMountReady().enqueue(p,this)}i(this,o);var a,f;null!=t?(a=t._namespaceURI,f=t._tag):n._tag&&(a=n._namespaceURI,f=n._tag),(null==a||a===x.svg&&"foreignobject"===f)&&(a=x.html),a===x.html&&("svg"===this._tag?a=x.svg:"math"===this._tag&&(a=x.mathml)),this._namespaceURI=a;var h;if(e.useCreateElement){var d,m=n._ownerDocument;if(a===x.html)if("script"===this._tag){var v=m.createElement("div"),g=this._currentElement.type;v.innerHTML="<"+g+"></"+g+">",d=v.removeChild(v.firstChild)}else d=o.is?m.createElement(this._currentElement.type,o.is):m.createElement(this._currentElement.type);else d=m.createElementNS(a,this._currentElement.type);D.precacheNode(this,d),this._flags|=N.hasCachedChildNodes,this._hostParent||k.setAttributeForRoot(d),this._updateDOMProperties(null,o,e);var _=b(d);this._createInitialChildren(e,o,r,_),h=_}else{var w=this._createOpenTagMarkupAndPutListeners(e,o),E=this._createContentMarkup(e,o,r);h=!E&&J[this._tag]?w+"/>":w+">"+E+"</"+this._currentElement.type+">"}switch(this._tag){case"input":e.getReactMountReady().enqueue(s,this),o.autoFocus&&e.getReactMountReady().enqueue(y.focusDOMComponent,this);break;case"textarea":e.getReactMountReady().enqueue(u,this),o.autoFocus&&e.getReactMountReady().enqueue(y.focusDOMComponent,this);break;case"select":case"button":o.autoFocus&&e.getReactMountReady().enqueue(y.focusDOMComponent,this);break;case"option":e.getReactMountReady().enqueue(l,this)}return h},_createOpenTagMarkupAndPutListeners:function(e,t){var n="<"+this._currentElement.type;for(var r in t)if(t.hasOwnProperty(r)){var i=t[r];if(null!=i)if(z.hasOwnProperty(r))i&&o(this,r,i,e);else{"style"===r&&(i&&(i=this._previousStyleCopy=g({},t.style)),i=_.createMarkupForStyles(i,this));var a=null;null!=this._tag&&d(this._tag,t)?V.hasOwnProperty(r)||(a=k.createMarkupForCustomAttribute(r,i)):a=k.createMarkupForProperty(r,i),a&&(n+=" "+a)}}return e.renderToStaticMarkup?n:(this._hostParent||(n+=" "+k.createMarkupForRoot()),n+=" "+k.createMarkupForID(this._domID))},_createContentMarkup:function(e,t,n){var r="",i=t.dangerouslySetInnerHTML;if(null!=i)null!=i.__html&&(r=i.__html);else{var o=U[typeof t.children]?t.children:null,a=null!=o?null:t.children;if(null!=o)r=j(o);else if(null!=a){var s=this.mountChildren(a,e,n);r=s.join("")}}return K[this._tag]&&"\n"===r.charAt(0)?"\n"+r:r},_createInitialChildren:function(e,t,n,r){var i=t.dangerouslySetInnerHTML;if(null!=i)null!=i.__html&&b.queueHTML(r,i.__html);else{var o=U[typeof t.children]?t.children:null,a=null!=o?null:t.children;if(null!=o)""!==o&&b.queueText(r,o);else if(null!=a)for(var s=this.mountChildren(a,e,n),u=0;u<s.length;u++)b.queueChild(r,s[u])}},receiveComponent:function(e,t,n){var r=this._currentElement;this._currentElement=e,this.updateComponent(t,r,e,n)},updateComponent:function(e,t,n,r){var o=t.props,a=this._currentElement.props;switch(this._tag){case"input":o=O.getHostProps(this,o),a=O.getHostProps(this,a);break;case"option":o=M.getHostProps(this,o),a=M.getHostProps(this,a);break;case"select":o=T.getHostProps(this,o),a=T.getHostProps(this,a);break;case"textarea":o=P.getHostProps(this,o),a=P.getHostProps(this,a)}switch(i(this,a),this._updateDOMProperties(o,a,e),this._updateDOMChildren(o,a,e,r),this._tag){case"input":O.updateWrapper(this),F.updateValueIfChanged(this);break;case"textarea":P.updateWrapper(this);break;case"select":e.getReactMountReady().enqueue(f,this)}},_updateDOMProperties:function(e,t,n){var r,i,a;for(r in e)if(!t.hasOwnProperty(r)&&e.hasOwnProperty(r)&&null!=e[r])if("style"===r){var s=this._previousStyleCopy;for(i in s)s.hasOwnProperty(i)&&(a=a||{},a[i]="");this._previousStyleCopy=null}else z.hasOwnProperty(r)?e[r]&&B(this,r):d(this._tag,e)?V.hasOwnProperty(r)||k.deleteValueForAttribute(L(this),r):(w.properties[r]||w.isCustomAttribute(r))&&k.deleteValueForProperty(L(this),r);for(r in t){var u=t[r],l="style"===r?this._previousStyleCopy:null!=e?e[r]:void 0;if(t.hasOwnProperty(r)&&u!==l&&(null!=u||null!=l))if("style"===r)if(u?u=this._previousStyleCopy=g({},u):this._previousStyleCopy=null,l){for(i in l)!l.hasOwnProperty(i)||u&&u.hasOwnProperty(i)||(a=a||{},a[i]="");for(i in u)u.hasOwnProperty(i)&&l[i]!==u[i]&&(a=a||{},a[i]=u[i])}else a=u;else if(z.hasOwnProperty(r))u?o(this,r,u,n):l&&B(this,r);else if(d(this._tag,t))V.hasOwnProperty(r)||k.setValueForAttribute(L(this),r,u);else if(w.properties[r]||w.isCustomAttribute(r)){var c=L(this);null!=u?k.setValueForProperty(c,r,u):k.deleteValueForProperty(c,r)}}a&&_.setValueForStyles(L(this),a,this)},_updateDOMChildren:function(e,t,n,r){var i=U[typeof e.children]?e.children:null,o=U[typeof t.children]?t.children:null,a=e.dangerouslySetInnerHTML&&e.dangerouslySetInnerHTML.__html,s=t.dangerouslySetInnerHTML&&t.dangerouslySetInnerHTML.__html,u=null!=i?null:e.children,l=null!=o?null:t.children,c=null!=i||null!=a,p=null!=o||null!=s;null!=u&&null==l?this.updateChildren(null,n,r):c&&!p&&this.updateTextContent(""),null!=o?i!==o&&this.updateTextContent(""+o):null!=s?a!==s&&this.updateMarkup(""+s):null!=l&&this.updateChildren(l,n,r)},getHostNode:function(){return L(this)},unmountComponent:function(e){switch(this._tag){case"audio":case"form":case"iframe":case"img":case"link":case"object":case"source":case"video":var t=this._wrapperState.listeners;if(t)for(var n=0;n<t.length;n++)t[n].remove();break;case"input":case"textarea":F.stopTracking(this);break;case"html":case"head":case"body":v("66",this._tag)}this.unmountChildren(e),D.uncacheNode(this),E.deleteAllListeners(this),this._rootNodeID=0,this._domID=0,this._wrapperState=null},getPublicInstance:function(){return L(this)}},g(m.prototype,m.Mixin,I.Mixin),e.exports=m},function(e,t,n){"use strict";function r(e,t){var n={_topLevelWrapper:e,_idCounter:1,_ownerDocument:t?t.nodeType===i?t:t.ownerDocument:null,_node:t,_tag:t?t.nodeName.toLowerCase():null,_namespaceURI:t?t.namespaceURI:null};return n}var i=(n(255),9);e.exports=r},function(e,t,n){"use strict";var r=n(13),i=n(88),o=n(14),a=function(e){this._currentElement=null,this._hostNode=null,this._hostParent=null,this._hostContainerInfo=null,this._domID=0};r(a.prototype,{mountComponent:function(e,t,n,r){var a=n._idCounter++;this._domID=a,this._hostParent=t,this._hostContainerInfo=n;var s=" react-empty: "+this._domID+" ";if(e.useCreateElement){var u=n._ownerDocument,l=u.createComment(s);return o.precacheNode(this,l),i(l)}return e.renderToStaticMarkup?"":"\x3c!--"+s+"--\x3e"},receiveComponent:function(){},getHostNode:function(){return o.getNodeFromInstance(this)},unmountComponent:function(){o.uncacheNode(this)}}),e.exports=a},function(e,t,n){"use strict";var r={useCreateElement:!0,useFiber:!1};e.exports=r},function(e,t,n){"use strict";var r=n(240),i=n(14),o={dangerouslyProcessChildrenUpdates:function(e,t){var n=i.getNodeFromInstance(e);r.processUpdates(n,t)}};e.exports=o},function(e,t,n){"use strict";function r(){this._rootNodeID&&f.updateWrapper(this)}function i(e){return"checkbox"===e.type||"radio"===e.type?null!=e.checked:null!=e.value}function o(e){var t=this._currentElement.props,n=l.executeOnChange(t,e);p.asap(r,this);var i=t.name;if("radio"===t.type&&null!=i){for(var o=c.getNodeFromInstance(this),s=o;s.parentNode;)s=s.parentNode;for(var u=s.querySelectorAll("input[name="+JSON.stringify(""+i)+'][type="radio"]'),f=0;f<u.length;f++){var h=u[f];if(h!==o&&h.form===o.form){var d=c.getInstanceFromNode(h);d||a("90"),p.asap(r,d)}}}return n}var a=n(11),s=n(13),u=n(452),l=n(245),c=n(14),p=n(44),f=(n(8),n(10),{getHostProps:function(e,t){var n=l.getValue(t),r=l.getChecked(t);return s({type:void 0,step:void 0,min:void 0,max:void 0},t,{defaultChecked:void 0,defaultValue:void 0,value:null!=n?n:e._wrapperState.initialValue,checked:null!=r?r:e._wrapperState.initialChecked,onChange:e._wrapperState.onChange})},mountWrapper:function(e,t){var n=t.defaultValue;e._wrapperState={initialChecked:null!=t.checked?t.checked:t.defaultChecked,initialValue:null!=t.value?t.value:n,listeners:null,onChange:o.bind(e),controlled:i(t)}},updateWrapper:function(e){var t=e._currentElement.props,n=t.checked;null!=n&&u.setValueForProperty(c.getNodeFromInstance(e),"checked",n||!1);var r=c.getNodeFromInstance(e),i=l.getValue(t);if(null!=i)if(0===i&&""===r.value)r.value="0";else if("number"===t.type){var o=parseFloat(r.value,10)||0;(i!=o||i==o&&r.value!=i)&&(r.value=""+i)}else r.value!==""+i&&(r.value=""+i);else null==t.value&&null!=t.defaultValue&&r.defaultValue!==""+t.defaultValue&&(r.defaultValue=""+t.defaultValue),null==t.checked&&null!=t.defaultChecked&&(r.defaultChecked=!!t.defaultChecked)},postMountWrapper:function(e){var t=e._currentElement.props,n=c.getNodeFromInstance(e);switch(t.type){case"submit":case"reset":break;case"color":case"date":case"datetime":case"datetime-local":case"month":case"time":case"week":n.value="",n.value=n.defaultValue;break;default:n.value=n.value}var r=n.name;""!==r&&(n.name=""),n.defaultChecked=!n.defaultChecked,n.defaultChecked=!n.defaultChecked,""!==r&&(n.name=r)}});e.exports=f},function(e,t,n){"use strict";function r(e){var t="";return o.Children.forEach(e,function(e){null!=e&&("string"==typeof e||"number"==typeof e?t+=e:u||(u=!0))}),t}var i=n(13),o=n(92),a=n(14),s=n(454),u=(n(10),!1),l={mountWrapper:function(e,t,n){var i=null;if(null!=n){var o=n;"optgroup"===o._tag&&(o=o._hostParent),null!=o&&"select"===o._tag&&(i=s.getSelectValueContext(o))}var a=null;if(null!=i){var u;if(u=null!=t.value?t.value+"":r(t.children),a=!1,Array.isArray(i)){for(var l=0;l<i.length;l++)if(""+i[l]===u){a=!0;break}}else a=""+i===u}e._wrapperState={selected:a}},postMountWrapper:function(e){var t=e._currentElement.props;if(null!=t.value){a.getNodeFromInstance(e).setAttribute("value",t.value)}},getHostProps:function(e,t){var n=i({selected:void 0,children:void 0},t);null!=e._wrapperState.selected&&(n.selected=e._wrapperState.selected);var o=r(t.children);return o&&(n.children=o),n}};e.exports=l},function(e,t,n){"use strict";function r(e,t,n,r){return e===n&&t===r}function i(e){var t=document.selection,n=t.createRange(),r=n.text.length,i=n.duplicate();i.moveToElementText(e),i.setEndPoint("EndToStart",n);var o=i.text.length;return{start:o,end:o+r}}function o(e){var t=window.getSelection&&window.getSelection();if(!t||0===t.rangeCount)return null;var n=t.anchorNode,i=t.anchorOffset,o=t.focusNode,a=t.focusOffset,s=t.getRangeAt(0);try{s.startContainer.nodeType,s.endContainer.nodeType}catch(e){return null}var u=r(t.anchorNode,t.anchorOffset,t.focusNode,t.focusOffset),l=u?0:s.toString().length,c=s.cloneRange();c.selectNodeContents(e),c.setEnd(s.startContainer,s.startOffset);var p=r(c.startContainer,c.startOffset,c.endContainer,c.endOffset),f=p?0:c.toString().length,h=f+l,d=document.createRange();d.setStart(n,i),d.setEnd(o,a);var m=d.collapsed;return{start:m?h:f,end:m?f:h}}function a(e,t){var n,r,i=document.selection.createRange().duplicate();void 0===t.end?(n=t.start,r=n):t.start>t.end?(n=t.end,r=t.start):(n=t.start,r=t.end),i.moveToElementText(e),i.moveStart("character",n),i.setEndPoint("EndToStart",i),i.moveEnd("character",r-n),i.select()}function s(e,t){if(window.getSelection){var n=window.getSelection(),r=e[c()].length,i=Math.min(t.start,r),o=void 0===t.end?i:Math.min(t.end,r);if(!n.extend&&i>o){var a=o;o=i,i=a}var s=l(e,i),u=l(e,o);if(s&&u){var p=document.createRange();p.setStart(s.node,s.offset),n.removeAllRanges(),i>o?(n.addRange(p),n.extend(u.node,u.offset)):(p.setEnd(u.node,u.offset),n.addRange(p))}}}var u=n(25),l=n(1068),c=n(465),p=u.canUseDOM&&"selection"in document&&!("getSelection"in window),f={getOffsets:p?i:o,setOffsets:p?a:s};e.exports=f},function(e,t,n){"use strict";var r=n(11),i=n(13),o=n(240),a=n(88),s=n(14),u=n(162),l=(n(8),n(255),function(e){this._currentElement=e,this._stringText=""+e,this._hostNode=null,this._hostParent=null,this._domID=0,this._mountIndex=0,this._closingComment=null,this._commentNodes=null});i(l.prototype,{mountComponent:function(e,t,n,r){var i=n._idCounter++,o=" react-text: "+i+" ";if(this._domID=i,this._hostParent=t,e.useCreateElement){var l=n._ownerDocument,c=l.createComment(o),p=l.createComment(" /react-text "),f=a(l.createDocumentFragment());return a.queueChild(f,a(c)),this._stringText&&a.queueChild(f,a(l.createTextNode(this._stringText))),a.queueChild(f,a(p)),s.precacheNode(this,c),this._closingComment=p,f}var h=u(this._stringText);return e.renderToStaticMarkup?h:"\x3c!--"+o+"--\x3e"+h+"\x3c!-- /react-text --\x3e"},receiveComponent:function(e,t){if(e!==this._currentElement){this._currentElement=e;var n=""+e;if(n!==this._stringText){this._stringText=n;var r=this.getHostNode();o.replaceDelimitedText(r[0],r[1],n)}}},getHostNode:function(){var e=this._commentNodes;if(e)return e;if(!this._closingComment)for(var t=s.getNodeFromInstance(this),n=t.nextSibling;;){if(null==n&&r("67",this._domID),8===n.nodeType&&" /react-text "===n.nodeValue){this._closingComment=n;break}n=n.nextSibling}return e=[this._hostNode,this._closingComment],this._commentNodes=e,e},unmountComponent:function(){this._closingComment=null,this._commentNodes=null,s.uncacheNode(this)}}),e.exports=l},function(e,t,n){"use strict";function r(){this._rootNodeID&&c.updateWrapper(this)}function i(e){var t=this._currentElement.props,n=s.executeOnChange(t,e);return l.asap(r,this),n}var o=n(11),a=n(13),s=n(245),u=n(14),l=n(44),c=(n(8),n(10),{getHostProps:function(e,t){return null!=t.dangerouslySetInnerHTML&&o("91"),a({},t,{value:void 0,defaultValue:void 0,children:""+e._wrapperState.initialValue,onChange:e._wrapperState.onChange})},mountWrapper:function(e,t){var n=s.getValue(t),r=n;if(null==n){var a=t.defaultValue,u=t.children;null!=u&&(null!=a&&o("92"),Array.isArray(u)&&(u.length<=1||o("93"),u=u[0]),a=""+u),null==a&&(a=""),r=a}e._wrapperState={initialValue:""+r,listeners:null,onChange:i.bind(e)}},updateWrapper:function(e){var t=e._currentElement.props,n=u.getNodeFromInstance(e),r=s.getValue(t);if(null!=r){var i=""+r;i!==n.value&&(n.value=i),null==t.defaultValue&&(n.defaultValue=i)}null!=t.defaultValue&&(n.defaultValue=t.defaultValue)},postMountWrapper:function(e){var t=u.getNodeFromInstance(e),n=t.textContent;n===e._wrapperState.initialValue&&(t.value=n)}});e.exports=c},function(e,t,n){"use strict";function r(e,t){"_hostNode"in e||u("33"),"_hostNode"in t||u("33");for(var n=0,r=e;r;r=r._hostParent)n++;for(var i=0,o=t;o;o=o._hostParent)i++;for(;n-i>0;)e=e._hostParent,n--;for(;i-n>0;)t=t._hostParent,i--;for(var a=n;a--;){if(e===t)return e;e=e._hostParent,t=t._hostParent}return null}function i(e,t){"_hostNode"in e||u("35"),"_hostNode"in t||u("35");for(;t;){if(t===e)return!0;t=t._hostParent}return!1}function o(e){return"_hostNode"in e||u("36"),e._hostParent}function a(e,t,n){for(var r=[];e;)r.push(e),e=e._hostParent;var i;for(i=r.length;i-- >0;)t(r[i],"captured",n);for(i=0;i<r.length;i++)t(r[i],"bubbled",n)}function s(e,t,n,i,o){for(var a=e&&t?r(e,t):null,s=[];e&&e!==a;)s.push(e),e=e._hostParent;for(var u=[];t&&t!==a;)u.push(t),t=t._hostParent;var l;for(l=0;l<s.length;l++)n(s[l],"bubbled",i);for(l=u.length;l-- >0;)n(u[l],"captured",o)}var u=n(11);n(8);e.exports={isAncestor:i,getLowestCommonAncestor:r,getParentInstance:o,traverseTwoPhase:a,traverseEnterLeave:s}},function(e,t,n){"use strict";function r(){this.reinitializeTransaction()}var i=n(13),o=n(44),a=n(161),s=n(32),u={initialize:s,close:function(){f.isBatchingUpdates=!1}},l={initialize:s,close:o.flushBatchedUpdates.bind(o)},c=[l,u];i(r.prototype,a,{getTransactionWrappers:function(){return c}});var p=new r,f={isBatchingUpdates:!1,batchedUpdates:function(e,t,n,r,i,o){var a=f.isBatchingUpdates;return f.isBatchingUpdates=!0,a?e(t,n,r,i,o):p.perform(e,null,t,n,r,i,o)}};e.exports=f},function(e,t,n){"use strict";function r(){k||(k=!0,y.EventEmitter.injectReactEventListener(g),y.EventPluginHub.injectEventPluginOrder(s),y.EventPluginUtils.injectComponentTree(f),y.EventPluginUtils.injectTreeTraversal(d),y.EventPluginHub.injectEventPluginsByName({SimpleEventPlugin:w,EnterLeaveEventPlugin:u,ChangeEventPlugin:a,SelectEventPlugin:x,BeforeInputEventPlugin:o}),y.HostComponent.injectGenericComponentClass(p),y.HostComponent.injectTextComponentClass(m),y.DOMProperty.injectDOMPropertyConfig(i),y.DOMProperty.injectDOMPropertyConfig(l),y.DOMProperty.injectDOMPropertyConfig(b),y.EmptyComponent.injectEmptyComponentFactory(function(e){return new h(e)}),y.Updates.injectReconcileTransaction(_),y.Updates.injectBatchingStrategy(v),y.Component.injectEnvironment(c))}var i=n(1009),o=n(1011),a=n(1013),s=n(1015),u=n(1016),l=n(1018),c=n(1020),p=n(1023),f=n(14),h=n(1025),d=n(1033),m=n(1031),v=n(1034),g=n(1038),y=n(1039),_=n(1044),b=n(1049),x=n(1050),w=n(1051),k=!1;e.exports={inject:r}},function(e,t,n){"use strict";var r="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103;e.exports=r},function(e,t,n){"use strict";function r(e){i.enqueueEvents(e),i.processEventQueue(!1)}var i=n(122),o={handleTopLevel:function(e,t,n,o){r(i.extractEvents(e,t,n,o))}};e.exports=o},function(e,t,n){"use strict";function r(e){for(;e._hostParent;)e=e._hostParent;var t=p.getNodeFromInstance(e),n=t.parentNode;return p.getClosestInstanceFromNode(n)}function i(e,t){this.topLevelType=e,this.nativeEvent=t,this.ancestors=[]}function o(e){var t=h(e.nativeEvent),n=p.getClosestInstanceFromNode(t),i=n;do{e.ancestors.push(i),i=i&&r(i)}while(i);for(var o=0;o<e.ancestors.length;o++)n=e.ancestors[o],m._handleTopLevel(e.topLevelType,n,e.nativeEvent,h(e.nativeEvent))}function a(e){e(d(window))}var s=n(13),u=n(377),l=n(25),c=n(70),p=n(14),f=n(44),h=n(252),d=n(752);s(i.prototype,{destructor:function(){this.topLevelType=null,this.nativeEvent=null,this.ancestors.length=0}}),c.addPoolingTo(i,c.twoArgumentPooler);var m={_enabled:!0,_handleTopLevel:null,WINDOW_HANDLE:l.canUseDOM?window:null,setHandleTopLevel:function(e){m._handleTopLevel=e},setEnabled:function(e){m._enabled=!!e},isEnabled:function(){return m._enabled},trapBubbledEvent:function(e,t,n){return n?u.listen(n,t,m.dispatchEvent.bind(null,e)):null},trapCapturedEvent:function(e,t,n){return n?u.capture(n,t,m.dispatchEvent.bind(null,e)):null},monitorScrollValue:function(e){var t=a.bind(null,e);u.listen(window,"scroll",t)},dispatchEvent:function(e,t){if(m._enabled){var n=i.getPooled(e,t);try{f.batchedUpdates(o,n)}finally{i.release(n)}}}};e.exports=m},function(e,t,n){"use strict";var r=n(89),i=n(122),o=n(243),a=n(246),s=n(455),u=n(159),l=n(457),c=n(44),p={Component:a.injection,DOMProperty:r.injection,EmptyComponent:s.injection,EventPluginHub:i.injection,EventPluginUtils:o.injection,EventEmitter:u.injection,HostComponent:l.injection,Updates:c.injection};e.exports=p},function(e,t,n){"use strict";var r=n(1062),i=/\/?>/,o=/^<\!\-\-/,a={CHECKSUM_ATTR_NAME:"data-react-checksum",addChecksumToMarkup:function(e){var t=r(e);return o.test(e)?e:e.replace(i," "+a.CHECKSUM_ATTR_NAME+'="'+t+'"$&')},canReuseMarkup:function(e,t){var n=t.getAttribute(a.CHECKSUM_ATTR_NAME);return n=n&&parseInt(n,10),r(e)===n}};e.exports=a},function(e,t,n){"use strict";function r(e,t,n){return{type:"INSERT_MARKUP",content:e,fromIndex:null,fromNode:null,toIndex:n,afterNode:t}}function i(e,t,n){return{type:"MOVE_EXISTING",content:null,fromIndex:e._mountIndex,fromNode:f.getHostNode(e),toIndex:n,afterNode:t}}function o(e,t){return{type:"REMOVE_NODE",content:null,fromIndex:e._mountIndex,fromNode:t,toIndex:null,afterNode:null}}function a(e){return{type:"SET_MARKUP",content:e,fromIndex:null,fromNode:null,toIndex:null,afterNode:null}}function s(e){return{type:"TEXT_CONTENT",content:e,fromIndex:null,fromNode:null,toIndex:null,afterNode:null}}function u(e,t){return t&&(e=e||[],e.push(t)),e}function l(e,t){p.processChildrenUpdates(e,t)}var c=n(11),p=n(246),f=(n(124),n(39),n(52),n(90)),h=n(1019),d=(n(32),n(1065)),m=(n(8),{Mixin:{_reconcilerInstantiateChildren:function(e,t,n){return h.instantiateChildren(e,t,n)},_reconcilerUpdateChildren:function(e,t,n,r,i,o){var a,s=0;return a=d(t,s),h.updateChildren(e,a,n,r,i,this,this._hostContainerInfo,o,s),a},mountChildren:function(e,t,n){var r=this._reconcilerInstantiateChildren(e,t,n);this._renderedChildren=r;var i=[],o=0;for(var a in r)if(r.hasOwnProperty(a)){var s=r[a],u=0,l=f.mountComponent(s,t,this,this._hostContainerInfo,n,u);s._mountIndex=o++,i.push(l)}return i},updateTextContent:function(e){var t=this._renderedChildren;h.unmountChildren(t,!1);for(var n in t)t.hasOwnProperty(n)&&c("118");l(this,[s(e)])},updateMarkup:function(e){var t=this._renderedChildren;h.unmountChildren(t,!1);for(var n in t)t.hasOwnProperty(n)&&c("118");l(this,[a(e)])},updateChildren:function(e,t,n){this._updateChildren(e,t,n)},_updateChildren:function(e,t,n){var r=this._renderedChildren,i={},o=[],a=this._reconcilerUpdateChildren(r,e,o,i,t,n);if(a||r){var s,c=null,p=0,h=0,d=0,m=null;for(s in a)if(a.hasOwnProperty(s)){var v=r&&r[s],g=a[s];v===g?(c=u(c,this.moveChild(v,m,p,h)),h=Math.max(v._mountIndex,h),v._mountIndex=p):(v&&(h=Math.max(v._mountIndex,h)),c=u(c,this._mountChildAtIndex(g,o[d],m,p,t,n)),d++),p++,m=f.getHostNode(g)}for(s in i)i.hasOwnProperty(s)&&(c=u(c,this._unmountChild(r[s],i[s])));c&&l(this,c),this._renderedChildren=a}},unmountChildren:function(e){var t=this._renderedChildren;h.unmountChildren(t,e),this._renderedChildren=null},moveChild:function(e,t,n,r){if(e._mountIndex<r)return i(e,t,n)},createChild:function(e,t,n){return r(n,t,e._mountIndex)},removeChild:function(e,t){return o(e,t)},_mountChildAtIndex:function(e,t,n,r,i,o){return e._mountIndex=r,this.createChild(e,n,t)},_unmountChild:function(e,t){var n=this.removeChild(e,t);return e._mountIndex=null,n}}});e.exports=m},function(e,t,n){"use strict";function r(e){return!(!e||"function"!=typeof e.attachRef||"function"!=typeof e.detachRef)}var i=n(11),o=(n(8),{addComponentAsRefTo:function(e,t,n){r(n)||i("119"),n.attachRef(t,e)},removeComponentAsRefFrom:function(e,t,n){r(n)||i("120");var o=n.getPublicInstance();o&&o.refs[t]===e.getPublicInstance()&&n.detachRef(t)}});e.exports=o},function(e,t,n){"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},function(e,t,n){"use strict";function r(e){this.reinitializeTransaction(),this.renderToStaticMarkup=!1,this.reactMountReady=o.getPooled(null),this.useCreateElement=e}var i=n(13),o=n(451),a=n(70),s=n(159),u=n(458),l=(n(39),n(161)),c=n(248),p={initialize:u.getSelectionInformation,close:u.restoreSelection},f={initialize:function(){var e=s.isEnabled();return s.setEnabled(!1),e},close:function(e){s.setEnabled(e)}},h={initialize:function(){this.reactMountReady.reset()},close:function(){this.reactMountReady.notifyAll()}},d=[p,f,h],m={getTransactionWrappers:function(){return d},getReactMountReady:function(){return this.reactMountReady},getUpdateQueue:function(){return c},checkpoint:function(){return this.reactMountReady.checkpoint()},rollback:function(e){this.reactMountReady.rollback(e)},destructor:function(){o.release(this.reactMountReady),this.reactMountReady=null}};i(r.prototype,l,m),a.addPoolingTo(r),e.exports=r},function(e,t,n){"use strict";function r(e,t,n){"function"==typeof e?e(t.getPublicInstance()):o.addComponentAsRefTo(t,e,n)}function i(e,t,n){"function"==typeof e?e(null):o.removeComponentAsRefFrom(t,e,n)}var o=n(1042),a={};a.attachRefs=function(e,t){if(null!==t&&"object"==typeof t){var n=t.ref;null!=n&&r(n,e,t._owner)}},a.shouldUpdateRefs=function(e,t){var n=null,r=null;null!==e&&"object"==typeof e&&(n=e.ref,r=e._owner);var i=null,o=null;return null!==t&&"object"==typeof t&&(i=t.ref,o=t._owner),n!==i||"string"==typeof i&&o!==r},a.detachRefs=function(e,t){if(null!==t&&"object"==typeof t){var n=t.ref;null!=n&&i(n,e,t._owner)}},e.exports=a},function(e,t,n){"use strict";function r(e){this.reinitializeTransaction(),this.renderToStaticMarkup=e,this.useCreateElement=!1,this.updateQueue=new s(this)}var i=n(13),o=n(70),a=n(161),s=(n(39),n(1047)),u=[],l={enqueue:function(){}},c={getTransactionWrappers:function(){return u},getReactMountReady:function(){return l},getUpdateQueue:function(){return this.updateQueue},destructor:function(){},checkpoint:function(){},rollback:function(){}};i(r.prototype,a,c),o.addPoolingTo(r),e.exports=r},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var i=n(248),o=(n(10),function(){function e(t){r(this,e),this.transaction=t}return e.prototype.isMounted=function(e){return!1},e.prototype.enqueueCallback=function(e,t,n){this.transaction.isInTransaction()&&i.enqueueCallback(e,t,n)},e.prototype.enqueueForceUpdate=function(e){this.transaction.isInTransaction()&&i.enqueueForceUpdate(e)},e.prototype.enqueueReplaceState=function(e,t){this.transaction.isInTransaction()&&i.enqueueReplaceState(e,t)},e.prototype.enqueueSetState=function(e,t){this.transaction.isInTransaction()&&i.enqueueSetState(e,t)},e}());e.exports=o},function(e,t,n){"use strict";e.exports="15.6.2"},function(e,t,n){"use strict";var r={xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace"},i={accentHeight:"accent-height",accumulate:0,additive:0,alignmentBaseline:"alignment-baseline",allowReorder:"allowReorder",alphabetic:0,amplitude:0,arabicForm:"arabic-form",ascent:0,attributeName:"attributeName",attributeType:"attributeType",autoReverse:"autoReverse",azimuth:0,baseFrequency:"baseFrequency",baseProfile:"baseProfile",baselineShift:"baseline-shift",bbox:0,begin:0,bias:0,by:0,calcMode:"calcMode",capHeight:"cap-height",clip:0,clipPath:"clip-path",clipRule:"clip-rule",clipPathUnits:"clipPathUnits",colorInterpolation:"color-interpolation",colorInterpolationFilters:"color-interpolation-filters",colorProfile:"color-profile",colorRendering:"color-rendering",contentScriptType:"contentScriptType",contentStyleType:"contentStyleType",cursor:0,cx:0,cy:0,d:0,decelerate:0,descent:0,diffuseConstant:"diffuseConstant",direction:0,display:0,divisor:0,dominantBaseline:"dominant-baseline",dur:0,dx:0,dy:0,edgeMode:"edgeMode",elevation:0,enableBackground:"enable-background",end:0,exponent:0,externalResourcesRequired:"externalResourcesRequired",fill:0,fillOpacity:"fill-opacity",fillRule:"fill-rule",filter:0,filterRes:"filterRes",filterUnits:"filterUnits",floodColor:"flood-color",floodOpacity:"flood-opacity",focusable:0,fontFamily:"font-family",fontSize:"font-size",fontSizeAdjust:"font-size-adjust",fontStretch:"font-stretch",fontStyle:"font-style",fontVariant:"font-variant",fontWeight:"font-weight",format:0,from:0,fx:0,fy:0,g1:0,g2:0,glyphName:"glyph-name",glyphOrientationHorizontal:"glyph-orientation-horizontal",glyphOrientationVertical:"glyph-orientation-vertical",glyphRef:"glyphRef",gradientTransform:"gradientTransform",gradientUnits:"gradientUnits",hanging:0,horizAdvX:"horiz-adv-x",horizOriginX:"horiz-origin-x",ideographic:0,imageRendering:"image-rendering",in:0,in2:0,intercept:0,k:0,k1:0,k2:0,k3:0,k4:0,kernelMatrix:"kernelMatrix",kernelUnitLength:"kernelUnitLength",kerning:0,keyPoints:"keyPoints",keySplines:"keySplines",keyTimes:"keyTimes",lengthAdjust:"lengthAdjust",letterSpacing:"letter-spacing",lightingColor:"lighting-color",limitingConeAngle:"limitingConeAngle",local:0,markerEnd:"marker-end",markerMid:"marker-mid",markerStart:"marker-start",markerHeight:"markerHeight",markerUnits:"markerUnits",markerWidth:"markerWidth",mask:0,maskContentUnits:"maskContentUnits",maskUnits:"maskUnits",mathematical:0,mode:0,numOctaves:"numOctaves",offset:0,opacity:0,operator:0,order:0,orient:0,orientation:0,origin:0,overflow:0,overlinePosition:"overline-position",overlineThickness:"overline-thickness",paintOrder:"paint-order",panose1:"panose-1",pathLength:"pathLength",patternContentUnits:"patternContentUnits",patternTransform:"patternTransform",patternUnits:"patternUnits",pointerEvents:"pointer-events",points:0,pointsAtX:"pointsAtX",pointsAtY:"pointsAtY",pointsAtZ:"pointsAtZ",preserveAlpha:"preserveAlpha",preserveAspectRatio:"preserveAspectRatio",primitiveUnits:"primitiveUnits",r:0,radius:0,refX:"refX",refY:"refY",renderingIntent:"rendering-intent",repeatCount:"repeatCount",repeatDur:"repeatDur",requiredExtensions:"requiredExtensions",requiredFeatures:"requiredFeatures",restart:0,result:0,rotate:0,rx:0,ry:0,scale:0,seed:0,shapeRendering:"shape-rendering",slope:0,spacing:0,specularConstant:"specularConstant",specularExponent:"specularExponent",speed:0,spreadMethod:"spreadMethod",startOffset:"startOffset",stdDeviation:"stdDeviation",stemh:0,stemv:0,stitchTiles:"stitchTiles",stopColor:"stop-color",stopOpacity:"stop-opacity",strikethroughPosition:"strikethrough-position",strikethroughThickness:"strikethrough-thickness",string:0,stroke:0,strokeDasharray:"stroke-dasharray",strokeDashoffset:"stroke-dashoffset",strokeLinecap:"stroke-linecap",strokeLinejoin:"stroke-linejoin",strokeMiterlimit:"stroke-miterlimit",strokeOpacity:"stroke-opacity",strokeWidth:"stroke-width",surfaceScale:"surfaceScale",systemLanguage:"systemLanguage",tableValues:"tableValues",targetX:"targetX",targetY:"targetY",textAnchor:"text-anchor",textDecoration:"text-decoration",textRendering:"text-rendering",textLength:"textLength",to:0,transform:0,u1:0,u2:0,underlinePosition:"underline-position",underlineThickness:"underline-thickness",unicode:0,unicodeBidi:"unicode-bidi",unicodeRange:"unicode-range",unitsPerEm:"units-per-em",vAlphabetic:"v-alphabetic",vHanging:"v-hanging",vIdeographic:"v-ideographic",vMathematical:"v-mathematical",values:0,vectorEffect:"vector-effect",version:0,vertAdvY:"vert-adv-y",vertOriginX:"vert-origin-x",vertOriginY:"vert-origin-y",viewBox:"viewBox",viewTarget:"viewTarget",visibility:0,widths:0,wordSpacing:"word-spacing",writingMode:"writing-mode",x:0,xHeight:"x-height",x1:0,x2:0,xChannelSelector:"xChannelSelector",xlinkActuate:"xlink:actuate",xlinkArcrole:"xlink:arcrole",xlinkHref:"xlink:href",xlinkRole:"xlink:role",xlinkShow:"xlink:show",xlinkTitle:"xlink:title",xlinkType:"xlink:type",xmlBase:"xml:base",xmlns:0,xmlnsXlink:"xmlns:xlink",xmlLang:"xml:lang",xmlSpace:"xml:space",y:0,y1:0,y2:0,yChannelSelector:"yChannelSelector",z:0,zoomAndPan:"zoomAndPan"},o={Properties:{},DOMAttributeNamespaces:{xlinkActuate:r.xlink,xlinkArcrole:r.xlink,xlinkHref:r.xlink,xlinkRole:r.xlink,xlinkShow:r.xlink,xlinkTitle:r.xlink,xlinkType:r.xlink,xmlBase:r.xml,xmlLang:r.xml,xmlSpace:r.xml},DOMAttributeNames:{}};Object.keys(i).forEach(function(e){o.Properties[e]=0,i[e]&&(o.DOMAttributeNames[e]=i[e])}),e.exports=o},function(e,t,n){"use strict";function r(e){if("selectionStart"in e&&u.hasSelectionCapabilities(e))return{start:e.selectionStart,end:e.selectionEnd};if(window.getSelection){var t=window.getSelection();return{anchorNode:t.anchorNode,anchorOffset:t.anchorOffset,focusNode:t.focusNode,focusOffset:t.focusOffset}}if(document.selection){var n=document.selection.createRange();return{parentElement:n.parentElement(),text:n.text,top:n.boundingTop,left:n.boundingLeft}}}function i(e,t){if(y||null==m||m!==c())return null;var n=r(m);if(!g||!f(g,n)){g=n;var i=l.getPooled(d.select,v,e,t);return i.type="select",i.target=m,o.accumulateTwoPhaseDispatches(i),i}return null}var o=n(123),a=n(25),s=n(14),u=n(458),l=n(51),c=n(379),p=n(468),f=n(208),h=a.canUseDOM&&"documentMode"in document&&document.documentMode<=11,d={select:{phasedRegistrationNames:{bubbled:"onSelect",captured:"onSelectCapture"},dependencies:["topBlur","topContextMenu","topFocus","topKeyDown","topKeyUp","topMouseDown","topMouseUp","topSelectionChange"]}},m=null,v=null,g=null,y=!1,_=!1,b={eventTypes:d,extractEvents:function(e,t,n,r){if(!_)return null;var o=t?s.getNodeFromInstance(t):window;switch(e){case"topFocus":(p(o)||"true"===o.contentEditable)&&(m=o,v=t,g=null);break;case"topBlur":m=null,v=null,g=null;break;case"topMouseDown":y=!0;break;case"topContextMenu":case"topMouseUp":return y=!1,i(n,r);case"topSelectionChange":if(h)break;case"topKeyDown":case"topKeyUp":return i(n,r)}return null},didPutListener:function(e,t,n){"onSelect"===t&&(_=!0)}};e.exports=b},function(e,t,n){"use strict";function r(e){return"."+e._rootNodeID}function i(e){return"button"===e||"input"===e||"select"===e||"textarea"===e}var o=n(11),a=n(377),s=n(123),u=n(14),l=n(1052),c=n(1053),p=n(51),f=n(1056),h=n(1058),d=n(160),m=n(1055),v=n(1059),g=n(1060),y=n(125),_=n(1061),b=n(32),x=n(250),w=(n(8),{}),k={};["abort","animationEnd","animationIteration","animationStart","blur","canPlay","canPlayThrough","click","contextMenu","copy","cut","doubleClick","drag","dragEnd","dragEnter","dragExit","dragLeave","dragOver","dragStart","drop","durationChange","emptied","encrypted","ended","error","focus","input","invalid","keyDown","keyPress","keyUp","load","loadedData","loadedMetadata","loadStart","mouseDown","mouseMove","mouseOut","mouseOver","mouseUp","paste","pause","play","playing","progress","rateChange","reset","scroll","seeked","seeking","stalled","submit","suspend","timeUpdate","touchCancel","touchEnd","touchMove","touchStart","transitionEnd","volumeChange","waiting","wheel"].forEach(function(e){var t=e[0].toUpperCase()+e.slice(1),n="on"+t,r="top"+t,i={phasedRegistrationNames:{bubbled:n,captured:n+"Capture"},dependencies:[r]};w[e]=i,k[r]=i});var E={},S={eventTypes:w,extractEvents:function(e,t,n,r){var i=k[e];if(!i)return null;var a;switch(e){case"topAbort":case"topCanPlay":case"topCanPlayThrough":case"topDurationChange":case"topEmptied":case"topEncrypted":case"topEnded":case"topError":case"topInput":case"topInvalid":case"topLoad":case"topLoadedData":case"topLoadedMetadata":case"topLoadStart":case"topPause":case"topPlay":case"topPlaying":case"topProgress":case"topRateChange":case"topReset":case"topSeeked":case"topSeeking":case"topStalled":case"topSubmit":case"topSuspend":case"topTimeUpdate":case"topVolumeChange":case"topWaiting":a=p;break;case"topKeyPress":if(0===x(n))return null;case"topKeyDown":case"topKeyUp":a=h;break;case"topBlur":case"topFocus":a=f;break;case"topClick":if(2===n.button)return null;case"topDoubleClick":case"topMouseDown":case"topMouseMove":case"topMouseUp":case"topMouseOut":case"topMouseOver":case"topContextMenu":a=d;break;case"topDrag":case"topDragEnd":case"topDragEnter":case"topDragExit":case"topDragLeave":case"topDragOver":case"topDragStart":case"topDrop":a=m;break;case"topTouchCancel":case"topTouchEnd":case"topTouchMove":case"topTouchStart":a=v;break;case"topAnimationEnd":case"topAnimationIteration":case"topAnimationStart":a=l;break;case"topTransitionEnd":a=g;break;case"topScroll":a=y;break;case"topWheel":a=_;break;case"topCopy":case"topCut":case"topPaste":a=c}a||o("86",e);var u=a.getPooled(i,t,n,r);return s.accumulateTwoPhaseDispatches(u),u},didPutListener:function(e,t,n){if("onClick"===t&&!i(e._tag)){var o=r(e),s=u.getNodeFromInstance(e);E[o]||(E[o]=a.listen(s,"click",b))}},willDeleteListener:function(e,t){if("onClick"===t&&!i(e._tag)){var n=r(e);E[n].remove(),delete E[n]}}};e.exports=S},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={animationName:null,elapsedTime:null,pseudoElement:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={clipboardData:function(e){return"clipboardData"in e?e.clipboardData:window.clipboardData}};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={data:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(160),o={dataTransfer:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(125),o={relatedTarget:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={data:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(125),o=n(250),a=n(1066),s=n(251),u={key:a,location:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,repeat:null,locale:null,getModifierState:s,charCode:function(e){return"keypress"===e.type?o(e):0},keyCode:function(e){return"keydown"===e.type||"keyup"===e.type?e.keyCode:0},which:function(e){return"keypress"===e.type?o(e):"keydown"===e.type||"keyup"===e.type?e.keyCode:0}};i.augmentClass(r,u),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(125),o=n(251),a={touches:null,targetTouches:null,changedTouches:null,altKey:null,metaKey:null,ctrlKey:null,shiftKey:null,getModifierState:o};i.augmentClass(r,a),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={propertyName:null,elapsedTime:null,pseudoElement:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(160),o={deltaX:function(e){return"deltaX"in e?e.deltaX:"wheelDeltaX"in e?-e.wheelDeltaX:0},deltaY:function(e){return"deltaY"in e?e.deltaY:"wheelDeltaY"in e?-e.wheelDeltaY:"wheelDelta"in e?-e.wheelDelta:0},deltaZ:null,deltaMode:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e){for(var t=1,n=0,r=0,o=e.length,a=-4&o;r<a;){for(var s=Math.min(r+4096,a);r<s;r+=4)n+=(t+=e.charCodeAt(r))+(t+=e.charCodeAt(r+1))+(t+=e.charCodeAt(r+2))+(t+=e.charCodeAt(r+3));t%=i,n%=i}for(;r<o;r++)n+=t+=e.charCodeAt(r);return t%=i,n%=i,t|n<<16}var i=65521;e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){if(null==t||"boolean"==typeof t||""===t)return"";var i=isNaN(t);if(r||i||0===t||o.hasOwnProperty(e)&&o[e])return""+t;if("string"==typeof t){t=t.trim()}return t+"px"}var i=n(450),o=(n(10),i.isUnitlessNumber);e.exports=r},function(e,t,n){"use strict";function r(e){if(null==e)return null;if(1===e.nodeType)return e;var t=a.get(e);if(t)return t=s(t),t?o.getNodeFromInstance(t):null;"function"==typeof e.render?i("44"):i("45",Object.keys(e))}var i=n(11),o=(n(52),n(14)),a=n(124),s=n(464);n(8),n(10);e.exports=r},function(e,t,n){"use strict";(function(t){function r(e,t,n,r){if(e&&"object"==typeof e){var i=e,o=void 0===i[n];o&&null!=t&&(i[n]=t)}}function i(e,t){if(null==e)return e;var n={};return o(e,r,n),n}var o=(n(244),n(470));n(10);void 0!==t&&n.i({NODE_ENV:"production",WEBPACK_INLINE_STYLES:!1}),e.exports=i}).call(t,n(33))},function(e,t,n){"use strict";function r(e){if(e.key){var t=o[e.key]||e.key;if("Unidentified"!==t)return t}if("keypress"===e.type){var n=i(e);return 13===n?"Enter":String.fromCharCode(n)}return"keydown"===e.type||"keyup"===e.type?a[e.keyCode]||"Unidentified":""}var i=n(250),o={Esc:"Escape",Spacebar:" ",Left:"ArrowLeft",Up:"ArrowUp",Right:"ArrowRight",Down:"ArrowDown",Del:"Delete",Win:"OS",Menu:"ContextMenu",Apps:"ContextMenu",Scroll:"ScrollLock",MozPrintableKey:"Unidentified"},a={8:"Backspace",9:"Tab",12:"Clear",13:"Enter",16:"Shift",17:"Control",18:"Alt",19:"Pause",20:"CapsLock",27:"Escape",32:" ",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"ArrowLeft",38:"ArrowUp",39:"ArrowRight",40:"ArrowDown",45:"Insert",46:"Delete",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NumLock",145:"ScrollLock",224:"Meta"};e.exports=r},function(e,t,n){"use strict";function r(e){var t=e&&(i&&e[i]||e[o]);if("function"==typeof t)return t}var i="function"==typeof Symbol&&Symbol.iterator,o="@@iterator";e.exports=r},function(e,t,n){"use strict";function r(e){for(;e&&e.firstChild;)e=e.firstChild;return e}function i(e){for(;e;){if(e.nextSibling)return e.nextSibling;e=e.parentNode}}function o(e,t){for(var n=r(e),o=0,a=0;n;){if(3===n.nodeType){if(a=o+n.textContent.length,o<=t&&a>=t)return{node:n,offset:t-o};o=a}n=r(i(n))}}e.exports=o},function(e,t,n){"use strict";function r(e,t){var n={};return n[e.toLowerCase()]=t.toLowerCase(),n["Webkit"+e]="webkit"+t,n["Moz"+e]="moz"+t,n["ms"+e]="MS"+t,n["O"+e]="o"+t.toLowerCase(),n}function i(e){if(s[e])return s[e];if(!a[e])return e;var t=a[e];for(var n in t)if(t.hasOwnProperty(n)&&n in u)return s[e]=t[n];return""}var o=n(25),a={animationend:r("Animation","AnimationEnd"),animationiteration:r("Animation","AnimationIteration"),animationstart:r("Animation","AnimationStart"),transitionend:r("Transition","TransitionEnd")},s={},u={};o.canUseDOM&&(u=document.createElement("div").style,"AnimationEvent"in window||(delete a.animationend.animation,delete a.animationiteration.animation,delete a.animationstart.animation),"TransitionEvent"in window||delete a.transitionend.transition),e.exports=i},function(e,t,n){"use strict";function r(e){return'"'+i(e)+'"'}var i=n(162);e.exports=r},function(e,t,n){"use strict";var r=n(459);e.exports=r.renderSubtreeIntoContainer},function(e,t,n){!function(e,r){r(t,n(0),n(7))}(0,function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t=t&&"default"in t?t.default:t;var a=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=function(e){function t(){return r(this,t),i(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return o(t,e),s(t,[{key:"shouldComponentUpdate",value:function(e){var t=this,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},i=this.state||{};return!(this.updateOnProps||Object.keys(a({},e,this.props))).every(function(r){return n.is(e[r],t.props[r])})||!(this.updateOnStates||Object.keys(a({},r,i))).every(function(e){return n.is(r[e],i[e])})}}]),t}(t.Component);e.ImmutablePureComponent=u,e.default=u,Object.defineProperty(e,"__esModule",{value:!0})})},function(e,t,n){"use strict";function r(e){return{doc:new B,blocks:M,blockStarts:T,tip:this.doc,oldtip:this.doc,currentLine:"",lineNumber:0,offset:0,column:0,nextNonspace:0,nextNonspaceColumn:0,indent:0,indented:!1,blank:!1,allClosed:!0,lastMatchedContainer:this.doc,refmap:{},lastLineLength:0,inlineParser:new u(e),findNextNonspace:R,advanceOffset:P,advanceNextNonspace:I,breakOutOfLists:E,addLine:S,addChild:C,incorporateLine:j,finalize:F,processInlines:N,closeUnmatchedBlocks:O,parse:L,options:e||{}}}var i=n(256),o=n(91).unescapeString,a=n(91).OPENTAG,s=n(91).CLOSETAG,u=n(1077),l=[/./,/^<(?:script|pre|style)(?:\s|>|$)/i,/^<!--/,/^<[?]/,/^<![A-Z]/,/^<!\[CDATA\[/,/^<[\/]?(?:address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h1|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|title|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(?:\s|[\/]?[>]|$)/i,new RegExp("^(?:"+a+"|"+s+")s*$","i")],c=[/./,/<\/(?:script|pre|style)>/i,/-->/,/\?>/,/>/,/\]\]>/],p=/^(?:(?:\* *){3,}|(?:_ *){3,}|(?:- *){3,}) *$/,f=/^[#`~*+_=<>0-9-]/,h=/[^ \t\f\v\r\n]/,d=/^[*+-]/,m=/^(\d{1,9})([.)])/,v=/^#{1,6}(?: +|$)/,g=/^`{3,}(?!.*`)|^~{3,}(?!.*~)/,y=/^(?:`{3,}|~{3,})(?= *$)/,_=/^(?:=+|-+) *$/,b=/\r\n|\n|\r/,x=function(e){return!h.test(e)},w=function(e,t){return t<e.length?e.charCodeAt(t):-1},k=function(e){for(;e;){if(e._lastLineBlank)return!0;var t=e.type;if("List"!==t&&"Item"!==t)break;e=e._lastChild}return!1},E=function(e){var t=e,n=null;do{"List"===t.type&&(n=t),t=t._parent}while(t);if(n){for(;e!==n;)this.finalize(e,this.lineNumber),e=e._parent;this.finalize(n,this.lineNumber),this.tip=n._parent}},S=function(){this.tip._string_content+=this.currentLine.slice(this.offset)+"\n"},C=function(e,t){for(;!this.blocks[this.tip.type].canContain(e);)this.finalize(this.tip,this.lineNumber-1);var n=t+1,r=new i(e,[[this.lineNumber,n],[0,0]]);return r._string_content="",this.tip.appendChild(r),this.tip=r,r},A=function(e){var t,n,r,i,o=e.currentLine.slice(e.nextNonspace),a={type:null,tight:!0,bulletChar:null,start:null,delimiter:null,padding:null,markerOffset:e.indent};if(t=o.match(d))a.type="Bullet",a.bulletChar=t[0][0];else{if(!(t=o.match(m)))return null;a.type="Ordered",a.start=parseInt(t[1]),a.delimiter=t[2]}if(-1!==(n=w(e.currentLine,e.nextNonspace+t[0].length))&&9!==n&&32!==n)return null;e.advanceNextNonspace(),e.advanceOffset(t[0].length,!0),r=e.column,i=e.offset;do{e.advanceOffset(1,!0),n=w(e.currentLine,e.offset)}while(e.column-r<5&&(32===n||9===n));var s=-1===w(e.currentLine,e.offset),u=e.column-r;return u>=5||u<1||s?(a.padding=t[0].length+1,e.column=r,e.offset=i,32===w(e.currentLine,e.offset)&&e.advanceOffset(1,!0)):a.padding=t[0].length+u,a},D=function(e,t){return e.type===t.type&&e.delimiter===t.delimiter&&e.bulletChar===t.bulletChar},O=function(){if(!this.allClosed){for(;this.oldtip!==this.lastMatchedContainer;){var e=this.oldtip._parent;this.finalize(this.oldtip,this.lineNumber-1),this.oldtip=e}this.allClosed=!0}},M={Document:{continue:function(){return 0},finalize:function(){},canContain:function(e){return"Item"!==e},acceptsLines:!1},List:{continue:function(){return 0},finalize:function(e,t){for(var n=t._firstChild;n;){if(k(n)&&n._next){t._listData.tight=!1;break}for(var r=n._firstChild;r;){if(k(r)&&(n._next||r._next)){t._listData.tight=!1;break}r=r._next}n=n._next}},canContain:function(e){return"Item"===e},acceptsLines:!1},BlockQuote:{continue:function(e){var t=e.currentLine;return e.indented||62!==w(t,e.nextNonspace)?1:(e.advanceNextNonspace(),e.advanceOffset(1,!1),32===w(t,e.offset)&&e.offset++,0)},finalize:function(){},canContain:function(e){return"Item"!==e},acceptsLines:!1},Item:{continue:function(e,t){if(e.blank&&null!==t._firstChild)e.advanceNextNonspace();else{if(!(e.indent>=t._listData.markerOffset+t._listData.padding))return 1;e.advanceOffset(t._listData.markerOffset+t._listData.padding,!0)}return 0},finalize:function(){},canContain:function(e){return"Item"!==e},acceptsLines:!1},Heading:{continue:function(){return 1},finalize:function(){},canContain:function(){return!1},acceptsLines:!1},ThematicBreak:{continue:function(){return 1},finalize:function(){},canContain:function(){return!1},acceptsLines:!1},CodeBlock:{continue:function(e,t){var n=e.currentLine,r=e.indent;if(t._isFenced){var i=r<=3&&n.charAt(e.nextNonspace)===t._fenceChar&&n.slice(e.nextNonspace).match(y);if(i&&i[0].length>=t._fenceLength)return e.finalize(t,e.lineNumber),2;for(var o=t._fenceOffset;o>0&&32===w(n,e.offset);)e.advanceOffset(1,!1),o--}else if(r>=4)e.advanceOffset(4,!0);else{if(!e.blank)return 1;e.advanceNextNonspace()}return 0},finalize:function(e,t){if(t._isFenced){var n=t._string_content,r=n.indexOf("\n"),i=n.slice(0,r),a=n.slice(r+1);t.info=o(i.trim()),t._literal=a}else t._literal=t._string_content.replace(/(\n *)+$/,"\n");t._string_content=null},canContain:function(){return!1},acceptsLines:!0},HtmlBlock:{continue:function(e,t){return!e.blank||6!==t._htmlBlockType&&7!==t._htmlBlockType?0:1},finalize:function(e,t){t._literal=t._string_content.replace(/(\n *)+$/,""),t._string_content=null},canContain:function(){return!1},acceptsLines:!0},Paragraph:{continue:function(e){return e.blank?1:0},finalize:function(e,t){for(var n,r=!1;91===w(t._string_content,0)&&(n=e.inlineParser.parseReference(t._string_content,e.refmap));)t._string_content=t._string_content.slice(n),r=!0;r&&x(t._string_content)&&t.unlink()},canContain:function(){return!1},acceptsLines:!0}},T=[function(e){return e.indented||62!==w(e.currentLine,e.nextNonspace)?0:(e.advanceNextNonspace(),e.advanceOffset(1,!1),32===w(e.currentLine,e.offset)&&e.advanceOffset(1,!1),e.closeUnmatchedBlocks(),e.addChild("BlockQuote",e.nextNonspace),1)},function(e){var t;if(!e.indented&&(t=e.currentLine.slice(e.nextNonspace).match(v))){e.advanceNextNonspace(),e.advanceOffset(t[0].length,!1),e.closeUnmatchedBlocks();var n=e.addChild("Heading",e.nextNonspace);return n.level=t[0].trim().length,n._string_content=e.currentLine.slice(e.offset).replace(/^ *#+ *$/,"").replace(/ +#+ *$/,""),e.advanceOffset(e.currentLine.length-e.offset),2}return 0},function(e){var t;if(!e.indented&&(t=e.currentLine.slice(e.nextNonspace).match(g))){var n=t[0].length;e.closeUnmatchedBlocks();var r=e.addChild("CodeBlock",e.nextNonspace);return r._isFenced=!0,r._fenceLength=n,r._fenceChar=t[0][0],r._fenceOffset=e.indent,e.advanceNextNonspace(),e.advanceOffset(n,!1),2}return 0},function(e,t){if(!e.indented&&60===w(e.currentLine,e.nextNonspace)){var n,r=e.currentLine.slice(e.nextNonspace);for(n=1;n<=7;n++)if(l[n].test(r)&&(n<7||"Paragraph"!==t.type)){e.closeUnmatchedBlocks();var i=e.addChild("HtmlBlock",e.offset);return i._htmlBlockType=n,2}}return 0},function(e,t){var n;if(!e.indented&&"Paragraph"===t.type&&(n=e.currentLine.slice(e.nextNonspace).match(_))){e.closeUnmatchedBlocks();var r=new i("Heading",t.sourcepos);return r.level="="===n[0][0]?1:2,r._string_content=t._string_content,t.insertAfter(r),t.unlink(),e.tip=r,e.advanceOffset(e.currentLine.length-e.offset,!1),2}return 0},function(e){return!e.indented&&p.test(e.currentLine.slice(e.nextNonspace))?(e.closeUnmatchedBlocks(),e.addChild("ThematicBreak",e.nextNonspace),e.advanceOffset(e.currentLine.length-e.offset,!1),2):0},function(e,t){var n;return e.indented&&"List"!==t.type||!(n=A(e))?0:(e.closeUnmatchedBlocks(),"List"===e.tip.type&&D(t._listData,n)||(t=e.addChild("List",e.nextNonspace),t._listData=n),t=e.addChild("Item",e.nextNonspace),t._listData=n,1)},function(e){return e.indented&&"Paragraph"!==e.tip.type&&!e.blank?(e.advanceOffset(4,!0),e.closeUnmatchedBlocks(),e.addChild("CodeBlock",e.offset),2):0}],P=function(e,t){for(var n,r,i=0,o=this.currentLine;e>0&&(r=o[this.offset]);)"\t"===r?(n=4-this.column%4,this.column+=n,this.offset+=1,e-=t?n:1):(i+=1,this.offset+=1,this.column+=1,e-=1)},I=function(){this.offset=this.nextNonspace,this.column=this.nextNonspaceColumn},R=function(){for(var e,t=this.currentLine,n=this.offset,r=this.column;""!==(e=t.charAt(n));)if(" "===e)n++,r++;else{if("\t"!==e)break;n++,r+=4-r%4}this.blank="\n"===e||"\r"===e||""===e,this.nextNonspace=n,this.nextNonspaceColumn=r,this.indent=this.nextNonspaceColumn-this.column,this.indented=this.indent>=4},j=function(e){var t,n=!0,r=this.doc;this.oldtip=this.tip,this.offset=0,this.column=0,this.lineNumber+=1,-1!==e.indexOf("\0")&&(e=e.replace(/\0/g,"�")),this.currentLine=e;for(var i;(i=r._lastChild)&&i._open;){switch(r=i,this.findNextNonspace(),this.blocks[r.type].continue(this,r)){case 0:break;case 1:n=!1;break;case 2:return void(this.lastLineLength=e.length);default:throw"continue returned illegal value, must be 0, 1, or 2"}if(!n){r=r._parent;break}}this.allClosed=r===this.oldtip,this.lastMatchedContainer=r,this.blank&&r._lastLineBlank&&(this.breakOutOfLists(r),r=this.tip);for(var o="Paragraph"!==r.type&&M[r.type].acceptsLines,a=this.blockStarts,s=a.length;!o;){if(this.findNextNonspace(),!this.indented&&!f.test(e.slice(this.nextNonspace))){this.advanceNextNonspace();break}for(var u=0;u<s;){var l=a[u](this,r);if(1===l){r=this.tip;break}if(2===l){r=this.tip,o=!0;break}u++}if(u===s){this.advanceNextNonspace();break}}if(this.allClosed||this.blank||"Paragraph"!==this.tip.type){this.closeUnmatchedBlocks(),this.blank&&r.lastChild&&(r.lastChild._lastLineBlank=!0),t=r.type;for(var p=this.blank&&!("BlockQuote"===t||"CodeBlock"===t&&r._isFenced||"Item"===t&&!r._firstChild&&r.sourcepos[0][0]===this.lineNumber),h=r;h;)h._lastLineBlank=p,h=h._parent;this.blocks[t].acceptsLines?(this.addLine(),"HtmlBlock"===t&&r._htmlBlockType>=1&&r._htmlBlockType<=5&&c[r._htmlBlockType].test(this.currentLine.slice(this.offset))&&this.finalize(r,this.lineNumber)):this.offset<e.length&&!this.blank&&(r=this.addChild("Paragraph",this.offset),this.advanceNextNonspace(),this.addLine())}else this.addLine();this.lastLineLength=e.length},F=function(e,t){var n=e._parent;e._open=!1,e.sourcepos[1]=[t,this.lastLineLength],this.blocks[e.type].finalize(this,e),this.tip=n},N=function(e){var t,n,r,i=e.walker();for(this.inlineParser.refmap=this.refmap,this.inlineParser.options=this.options;n=i.next();)t=n.node,r=t.type,n.entering||"Paragraph"!==r&&"Heading"!==r||this.inlineParser.parse(t)},B=function(){return new i("Document",[[1,1],[0,0]])},L=function(e){this.doc=new B,this.tip=this.doc,this.refmap={},this.lineNumber=0,this.lastLineLength=0,this.offset=0,this.column=0,this.lastMatchedContainer=this.doc,this.currentLine="",this.options.time&&console.time("preparing input");var t=e.split(b),n=t.length;10===e.charCodeAt(e.length-1)&&(n-=1),this.options.time&&console.timeEnd("preparing input"),this.options.time&&console.time("block parsing");for(var r=0;r<n;r++)this.incorporateLine(t[r]);for(;this.tip;)this.finalize(this.tip,n);return this.options.time&&console.timeEnd("block parsing"),this.options.time&&console.time("inline parsing"),this.processInlines(this.doc),this.options.time&&console.timeEnd("inline parsing"),this.doc};e.exports=r},function(e,t,n){"use strict";/*! http://mths.be/fromcodepoint v0.2.1 by @mathias */
-+if(String.fromCodePoint)e.exports=function(e){try{return String.fromCodePoint(e)}catch(e){if(e instanceof RangeError)return String.fromCharCode(65533);throw e}};else{var r=String.fromCharCode,i=Math.floor,o=function(){var e,t,n=[],o=-1,a=arguments.length;if(!a)return"";for(var s="";++o<a;){var u=Number(arguments[o]);if(!isFinite(u)||u<0||u>1114111||i(u)!==u)return String.fromCharCode(65533);u<=65535?n.push(u):(u-=65536,e=55296+(u>>10),t=u%1024+56320,n.push(e,t)),(o+1===a||n.length>16384)&&(s+=r.apply(null,n),n.length=0)}return s};e.exports=o}},function(e,t,n){"use strict";function r(e){return{softbreak:"\n",escape:i,options:e||{},render:c}}var i=n(91).escapeXml,o=function(e,t,n){var r="<"+e;if(t&&t.length>0)for(var i,o=0;void 0!==(i=t[o]);)r+=" "+i[0]+'="'+i[1]+'"',o++;return n&&(r+=" /"),r+=">"},a=/\<[^>]*\>/,s=/^javascript:|vbscript:|file:|data:/i,u=/^data:image\/(?:png|gif|jpeg|webp)/i,l=function(e){return s.test(e)&&!u.test(e)},c=function(e){var t,n,r,i,s,u,c,p=e.walker(),f="",h="\n",d=0,m=function(e){f+=d>0?e.replace(a,""):e,h=e},v=this.escape,g=function(){"\n"!==h&&(f+="\n",h="\n")},y=this.options;for(y.time&&console.time("rendering");i=p.next();){if(u=i.entering,s=i.node,t=[],y.sourcepos){var _=s.sourcepos;_&&t.push(["data-sourcepos",String(_[0][0])+":"+String(_[0][1])+"-"+String(_[1][0])+":"+String(_[1][1])])}switch(s.type){case"Text":m(v(s.literal,!1));break;case"Softbreak":m(this.softbreak);break;case"Hardbreak":m(o("br",[],!0)),g();break;case"Emph":m(o(u?"em":"/em"));break;case"Strong":m(o(u?"strong":"/strong"));break;case"HtmlInline":m(y.safe?"\x3c!-- raw HTML omitted --\x3e":s.literal);break;case"CustomInline":u&&s.onEnter?m(s.onEnter):!u&&s.onExit&&m(s.onExit);break;case"Link":u?(y.safe&&l(s.destination)||t.push(["href",v(s.destination,!0)]),s.title&&t.push(["title",v(s.title,!0)]),m(o("a",t))):m(o("/a"));break;case"Image":u?(0===d&&m(y.safe&&l(s.destination)?'<img src="" alt="':'<img src="'+v(s.destination,!0)+'" alt="'),d+=1):0===(d-=1)&&(s.title&&m('" title="'+v(s.title,!0)),m('" />'));break;case"Code":m(o("code")+v(s.literal,!1)+o("/code"));break;case"Document":break;case"Paragraph":if(null!==(c=s.parent.parent)&&"List"===c.type&&c.listTight)break;u?(g(),m(o("p",t))):(m(o("/p")),g());break;case"BlockQuote":u?(g(),m(o("blockquote",t)),g()):(g(),m(o("/blockquote")),g());break;case"Item":u?m(o("li",t)):(m(o("/li")),g());break;case"List":if(r="Bullet"===s.listType?"ul":"ol",u){var b=s.listStart;null!==b&&1!==b&&t.push(["start",b.toString()]),g(),m(o(r,t)),g()}else g(),m(o("/"+r)),g();break;case"Heading":r="h"+s.level,u?(g(),m(o(r,t))):(m(o("/"+r)),g());break;case"CodeBlock":n=s.info?s.info.split(/\s+/):[],n.length>0&&n[0].length>0&&t.push(["class","language-"+v(n[0],!0)]),g(),m(o("pre")+o("code",t)),m(v(s.literal,!1)),m(o("/code")+o("/pre")),g();break;case"HtmlBlock":g(),m(y.safe?"\x3c!-- raw HTML omitted --\x3e":s.literal),g();break;case"CustomBlock":g(),u&&s.onEnter?m(s.onEnter):!u&&s.onExit&&m(s.onExit),g();break;case"ThematicBreak":g(),m(o("hr",t,!0)),g();break;default:throw"Unknown node type "+s.type}}return y.time&&console.timeEnd("rendering"),f};e.exports=r},function(e,t,n){"use strict";e.exports.version="0.24.0",e.exports.Node=n(256),e.exports.Parser=n(1073),e.exports.HtmlRenderer=n(1075),e.exports.XmlRenderer=n(1079)},function(e,t,n){"use strict";function r(e){return{subject:"",delimiters:null,pos:0,refmap:{},match:N,peek:B,spnl:L,parseBackticks:q,parseBackslash:z,parseAutolink:U,parseHtmlTag:W,scanDelims:V,handleDelim:H,parseLinkTitle:X,parseLinkDestination:Y,parseLinkLabel:$,parseOpenBracket:Z,parseCloseBracket:ee,parseBang:Q,parseEntity:te,parseString:ne,parseNewline:re,parseReference:ie,parseInline:oe,processEmphasis:K,removeDelimiter:G,options:e||{},parse:ae}}var i=n(256),o=n(91),a=n(1078),s=o.normalizeURI,u=o.unescapeString,l=n(1074),c=n(114).decodeHTML;n(494);var p=o.ESCAPABLE,f="\\\\"+p,h="\\(([^\\\\()\\x00-\\x20]|"+f+"|\\\\)*\\)",d=o.ENTITY,m=o.reHtmlTag,v=new RegExp(/^[\u2000-\u206F\u2E00-\u2E7F\\'!"#\$%&\(\)\*\+,\-\.\/:;<=>\?@\[\]\^_`\{\|\}~]/),g=new RegExp('^(?:"('+f+'|[^"\\x00])*"|\'('+f+"|[^'\\x00])*'|\\(("+f+"|[^)\\x00])*\\))"),y=new RegExp("^(?:[<](?:[^ <>\\t\\n\\\\\\x00]|"+f+"|\\\\)*[>])"),_=new RegExp("^(?:[^\\\\()\\x00-\\x20]+|"+f+"|\\\\|"+h+")*"),b=new RegExp("^"+p),x=new RegExp("^"+d,"i"),w=/`+/,k=/^`+/,E=/\.\.\./g,S=/--+/g,C=/^<([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/,A=/^<[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*>/i,D=/^ *(?:\n *)?/,O=/^\s/,M=/\s+/g,T=/ *$/,P=/^ */,I=/^ *(?:\n|$)/,R=new RegExp("^\\[(?:[^\\\\\\[\\]]|"+f+"|\\\\){0,1000}\\]"),j=/^[^\n`\[\]\\!<&*_'"]+/m,F=function(e){var t=new i("Text");return t._literal=e,t},N=function(e){var t=e.exec(this.subject.slice(this.pos));return null===t?null:(this.pos+=t.index+t[0].length,t[0])},B=function(){return this.pos<this.subject.length?this.subject.charCodeAt(this.pos):-1},L=function(){return this.match(D),!0},q=function(e){var t=this.match(k);if(null===t)return!1;for(var n,r,o=this.pos;null!==(n=this.match(w));)if(n===t)return r=new i("Code"),r._literal=this.subject.slice(o,this.pos-t.length).trim().replace(M," "),e.appendChild(r),!0;return this.pos=o,e.appendChild(F(t)),!0},z=function(e){var t,n=this.subject;return this.pos+=1,10===this.peek()?(this.pos+=1,t=new i("Hardbreak"),e.appendChild(t)):b.test(n.charAt(this.pos))?(e.appendChild(F(n.charAt(this.pos))),this.pos+=1):e.appendChild(F("\\")),!0},U=function(e){var t,n,r;return(t=this.match(C))?(n=t.slice(1,t.length-1),r=new i("Link"),r._destination=s("mailto:"+n),r._title="",r.appendChild(F(n)),e.appendChild(r),!0):!!(t=this.match(A))&&(n=t.slice(1,t.length-1),r=new i("Link"),r._destination=s(n),r._title="",r.appendChild(F(n)),e.appendChild(r),!0)},W=function(e){var t=this.match(m);if(null===t)return!1;var n=new i("HtmlInline");return n._literal=t,e.appendChild(n),!0},V=function(e){var t,n,r,i,o,a,s,u,c,p,f,h=0,d=this.pos;if(39===e||34===e)h++,this.pos++;else for(;this.peek()===e;)h++,this.pos++;return 0===h?null:(t=0===d?"\n":this.subject.charAt(d-1),r=this.peek(),n=-1===r?"\n":l(r),u=O.test(n),c=v.test(n),p=O.test(t),f=v.test(t),i=!(u||c&&!p&&!f),o=!(p||f&&!u&&!c),95===e?(a=i&&(!o||f),s=o&&(!i||c)):39===e||34===e?(a=i&&!o,s=o):(a=i,s=o),this.pos=d,{numdelims:h,can_open:a,can_close:s})},H=function(e,t){var n=this.scanDelims(e);if(!n)return!1;var r,i=n.numdelims,o=this.pos;this.pos+=i,r=39===e?"’":34===e?"“":this.subject.slice(o,this.pos);var a=F(r);return t.appendChild(a),this.delimiters={cc:e,numdelims:i,node:a,previous:this.delimiters,next:null,can_open:n.can_open,can_close:n.can_close,active:!0},null!==this.delimiters.previous&&(this.delimiters.previous.next=this.delimiters),!0},G=function(e){null!==e.previous&&(e.previous.next=e.next),null===e.next?this.delimiters=e.previous:e.next.previous=e.previous},J=function(e,t){e.next!==t&&(e.next=t,t.previous=e)},K=function(e){var t,n,r,o,a,s,u,l,c,p,f=[];for(f[95]=e,f[42]=e,f[39]=e,f[34]=e,n=this.delimiters;null!==n&&n.previous!==e;)n=n.previous;for(;null!==n;){var h=n.cc;if(!n.can_close||95!==h&&42!==h&&39!==h&&34!==h)n=n.next;else{for(t=n.previous,p=!1;null!==t&&t!==e&&t!==f[h];){if(t.cc===n.cc&&t.can_open){p=!0;break}t=t.previous}if(r=n,42===h||95===h)if(p){u=n.numdelims<3||t.numdelims<3?n.numdelims<=t.numdelims?n.numdelims:t.numdelims:n.numdelims%2==0?2:1,o=t.node,a=n.node,t.numdelims-=u,n.numdelims-=u,o._literal=o._literal.slice(0,o._literal.length-u),a._literal=a._literal.slice(0,a._literal.length-u);var d=new i(1===u?"Emph":"Strong");for(l=o._next;l&&l!==a;)c=l._next,l.unlink(),d.appendChild(l),l=c;o.insertAfter(d),J(t,n),0===t.numdelims&&(o.unlink(),this.removeDelimiter(t)),0===n.numdelims&&(a.unlink(),s=n.next,this.removeDelimiter(n),n=s)}else n=n.next;else 39===h?(n.node._literal="’",p&&(t.node._literal="‘"),n=n.next):34===h&&(n.node._literal="”",p&&(t.node.literal="“"),n=n.next);p||(f[h]=r.previous,r.can_open||this.removeDelimiter(r))}}for(;null!==this.delimiters&&this.delimiters!==e;)this.removeDelimiter(this.delimiters)},X=function(){var e=this.match(g);return null===e?null:u(e.substr(1,e.length-2))},Y=function(){var e=this.match(y);return null===e?(e=this.match(_),null===e?null:s(u(e))):s(u(e.substr(1,e.length-2)))},$=function(){var e=this.match(R);return null===e||e.length>1001?0:e.length},Z=function(e){var t=this.pos;this.pos+=1;var n=F("[");return e.appendChild(n),this.delimiters={cc:91,numdelims:1,node:n,previous:this.delimiters,next:null,can_open:!0,can_close:!1,index:t,active:!0},null!==this.delimiters.previous&&(this.delimiters.previous.next=this.delimiters),!0},Q=function(e){var t=this.pos;if(this.pos+=1,91===this.peek()){this.pos+=1;var n=F("![");e.appendChild(n),this.delimiters={cc:33,numdelims:1,node:n,previous:this.delimiters,next:null,can_open:!0,can_close:!1,index:t+1,active:!0},null!==this.delimiters.previous&&(this.delimiters.previous.next=this.delimiters)}else e.appendChild(F("!"));return!0},ee=function(e){var t,n,r,o,s,u,l=!1;for(this.pos+=1,t=this.pos,u=this.delimiters;null!==u&&91!==u.cc&&33!==u.cc;)u=u.previous;if(null===u)return e.appendChild(F("]")),!0;if(!u.active)return e.appendChild(F("]")),this.removeDelimiter(u),!0;if(n=33===u.cc,40===this.peek())this.pos++,this.spnl()&&null!==(r=this.parseLinkDestination())&&this.spnl()&&(O.test(this.subject.charAt(this.pos-1))&&(o=this.parseLinkTitle()),!0)&&this.spnl()&&41===this.peek()&&(this.pos+=1,l=!0);else{var c=this.pos,p=this.pos,f=this.parseLinkLabel();s=0===f||2===f?this.subject.slice(u.index,t):this.subject.slice(p,p+f),0===f&&(this.pos=c);var h=this.refmap[a(s)];h&&(r=h.destination,o=h.title,l=!0)}if(l){var d=new i(n?"Image":"Link");d._destination=r,d._title=o||"";var m,v;for(m=u.node._next;m;)v=m._next,m.unlink(),d.appendChild(m),m=v;if(e.appendChild(d),this.processEmphasis(u.previous),u.node.unlink(),!n)for(u=this.delimiters;null!==u;)91===u.cc&&(u.active=!1),u=u.previous;return!0}return this.removeDelimiter(u),this.pos=t,e.appendChild(F("]")),!0},te=function(e){var t;return!!(t=this.match(x))&&(e.appendChild(F(c(t))),!0)},ne=function(e){var t;return!!(t=this.match(j))&&(this.options.smart?e.appendChild(F(t.replace(E,"…").replace(S,function(e){var t=0,n=0;return e.length%3==0?n=e.length/3:e.length%2==0?t=e.length/2:e.length%3==2?(t=1,n=(e.length-2)/3):(t=2,n=(e.length-4)/3),"—".repeat(n)+"–".repeat(t)}))):e.appendChild(F(t)),!0)},re=function(e){this.pos+=1;var t=e._lastChild;if(t&&"Text"===t.type&&" "===t._literal[t._literal.length-1]){var n=" "===t._literal[t._literal.length-2];t._literal=t._literal.replace(T,""),e.appendChild(new i(n?"Hardbreak":"Softbreak"))}else e.appendChild(new i("Softbreak"));return this.match(P),!0},ie=function(e,t){this.subject=e,this.pos=0;var n,r,i,o,s=this.pos;if(0===(o=this.parseLinkLabel()))return 0;if(n=this.subject.substr(0,o),58!==this.peek())return this.pos=s,0;if(this.pos++,this.spnl(),null===(r=this.parseLinkDestination())||0===r.length)return this.pos=s,0;var u=this.pos;this.spnl(),null===(i=this.parseLinkTitle())&&(i="",this.pos=u);var l=!0;if(null===this.match(I)&&(""===i?l=!1:(i="",this.pos=u,l=null!==this.match(I))),!l)return this.pos=s,0;var c=a(n);return""===c?(this.pos=s,0):(t[c]||(t[c]={destination:r,title:i}),this.pos-s)},oe=function(e){var t=!1,n=this.peek();if(-1===n)return!1;switch(n){case 10:t=this.parseNewline(e);break;case 92:t=this.parseBackslash(e);break;case 96:t=this.parseBackticks(e);break;case 42:case 95:t=this.handleDelim(n,e);break;case 39:case 34:t=this.options.smart&&this.handleDelim(n,e);break;case 91:t=this.parseOpenBracket(e);break;case 33:t=this.parseBang(e);break;case 93:t=this.parseCloseBracket(e);break;case 60:t=this.parseAutolink(e)||this.parseHtmlTag(e);break;case 38:t=this.parseEntity(e);break;default:t=this.parseString(e)}return t||(this.pos+=1,e.appendChild(F(l(n)))),!0},ae=function(e){for(this.subject=e._string_content.trim(),this.pos=0,this.delimiters=null;this.parseInline(e););e._string_content=null,this.processEmphasis(null)};e.exports=r},function(e,t,n){"use strict";var r=/[ \t\r\n]+|[A-Z\xB5\xC0-\xD6\xD8-\xDF\u0100\u0102\u0104\u0106\u0108\u010A\u010C\u010E\u0110\u0112\u0114\u0116\u0118\u011A\u011C\u011E\u0120\u0122\u0124\u0126\u0128\u012A\u012C\u012E\u0130\u0132\u0134\u0136\u0139\u013B\u013D\u013F\u0141\u0143\u0145\u0147\u0149\u014A\u014C\u014E\u0150\u0152\u0154\u0156\u0158\u015A\u015C\u015E\u0160\u0162\u0164\u0166\u0168\u016A\u016C\u016E\u0170\u0172\u0174\u0176\u0178\u0179\u017B\u017D\u017F\u0181\u0182\u0184\u0186\u0187\u0189-\u018B\u018E-\u0191\u0193\u0194\u0196-\u0198\u019C\u019D\u019F\u01A0\u01A2\u01A4\u01A6\u01A7\u01A9\u01AC\u01AE\u01AF\u01B1-\u01B3\u01B5\u01B7\u01B8\u01BC\u01C4\u01C5\u01C7\u01C8\u01CA\u01CB\u01CD\u01CF\u01D1\u01D3\u01D5\u01D7\u01D9\u01DB\u01DE\u01E0\u01E2\u01E4\u01E6\u01E8\u01EA\u01EC\u01EE\u01F0-\u01F2\u01F4\u01F6-\u01F8\u01FA\u01FC\u01FE\u0200\u0202\u0204\u0206\u0208\u020A\u020C\u020E\u0210\u0212\u0214\u0216\u0218\u021A\u021C\u021E\u0220\u0222\u0224\u0226\u0228\u022A\u022C\u022E\u0230\u0232\u023A\u023B\u023D\u023E\u0241\u0243-\u0246\u0248\u024A\u024C\u024E\u0345\u0370\u0372\u0376\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03AB\u03B0\u03C2\u03CF-\u03D1\u03D5\u03D6\u03D8\u03DA\u03DC\u03DE\u03E0\u03E2\u03E4\u03E6\u03E8\u03EA\u03EC\u03EE\u03F0\u03F1\u03F4\u03F5\u03F7\u03F9\u03FA\u03FD-\u042F\u0460\u0462\u0464\u0466\u0468\u046A\u046C\u046E\u0470\u0472\u0474\u0476\u0478\u047A\u047C\u047E\u0480\u048A\u048C\u048E\u0490\u0492\u0494\u0496\u0498\u049A\u049C\u049E\u04A0\u04A2\u04A4\u04A6\u04A8\u04AA\u04AC\u04AE\u04B0\u04B2\u04B4\u04B6\u04B8\u04BA\u04BC\u04BE\u04C0\u04C1\u04C3\u04C5\u04C7\u04C9\u04CB\u04CD\u04D0\u04D2\u04D4\u04D6\u04D8\u04DA\u04DC\u04DE\u04E0\u04E2\u04E4\u04E6\u04E8\u04EA\u04EC\u04EE\u04F0\u04F2\u04F4\u04F6\u04F8\u04FA\u04FC\u04FE\u0500\u0502\u0504\u0506\u0508\u050A\u050C\u050E\u0510\u0512\u0514\u0516\u0518\u051A\u051C\u051E\u0520\u0522\u0524\u0526\u0528\u052A\u052C\u052E\u0531-\u0556\u0587\u10A0-\u10C5\u10C7\u10CD\u1E00\u1E02\u1E04\u1E06\u1E08\u1E0A\u1E0C\u1E0E\u1E10\u1E12\u1E14\u1E16\u1E18\u1E1A\u1E1C\u1E1E\u1E20\u1E22\u1E24\u1E26\u1E28\u1E2A\u1E2C\u1E2E\u1E30\u1E32\u1E34\u1E36\u1E38\u1E3A\u1E3C\u1E3E\u1E40\u1E42\u1E44\u1E46\u1E48\u1E4A\u1E4C\u1E4E\u1E50\u1E52\u1E54\u1E56\u1E58\u1E5A\u1E5C\u1E5E\u1E60\u1E62\u1E64\u1E66\u1E68\u1E6A\u1E6C\u1E6E\u1E70\u1E72\u1E74\u1E76\u1E78\u1E7A\u1E7C\u1E7E\u1E80\u1E82\u1E84\u1E86\u1E88\u1E8A\u1E8C\u1E8E\u1E90\u1E92\u1E94\u1E96-\u1E9B\u1E9E\u1EA0\u1EA2\u1EA4\u1EA6\u1EA8\u1EAA\u1EAC\u1EAE\u1EB0\u1EB2\u1EB4\u1EB6\u1EB8\u1EBA\u1EBC\u1EBE\u1EC0\u1EC2\u1EC4\u1EC6\u1EC8\u1ECA\u1ECC\u1ECE\u1ED0\u1ED2\u1ED4\u1ED6\u1ED8\u1EDA\u1EDC\u1EDE\u1EE0\u1EE2\u1EE4\u1EE6\u1EE8\u1EEA\u1EEC\u1EEE\u1EF0\u1EF2\u1EF4\u1EF6\u1EF8\u1EFA\u1EFC\u1EFE\u1F08-\u1F0F\u1F18-\u1F1D\u1F28-\u1F2F\u1F38-\u1F3F\u1F48-\u1F4D\u1F50\u1F52\u1F54\u1F56\u1F59\u1F5B\u1F5D\u1F5F\u1F68-\u1F6F\u1F80-\u1FAF\u1FB2-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD2\u1FD3\u1FD6-\u1FDB\u1FE2-\u1FE4\u1FE6-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2126\u212A\u212B\u2132\u2160-\u216F\u2183\u24B6-\u24CF\u2C00-\u2C2E\u2C60\u2C62-\u2C64\u2C67\u2C69\u2C6B\u2C6D-\u2C70\u2C72\u2C75\u2C7E-\u2C80\u2C82\u2C84\u2C86\u2C88\u2C8A\u2C8C\u2C8E\u2C90\u2C92\u2C94\u2C96\u2C98\u2C9A\u2C9C\u2C9E\u2CA0\u2CA2\u2CA4\u2CA6\u2CA8\u2CAA\u2CAC\u2CAE\u2CB0\u2CB2\u2CB4\u2CB6\u2CB8\u2CBA\u2CBC\u2CBE\u2CC0\u2CC2\u2CC4\u2CC6\u2CC8\u2CCA\u2CCC\u2CCE\u2CD0\u2CD2\u2CD4\u2CD6\u2CD8\u2CDA\u2CDC\u2CDE\u2CE0\u2CE2\u2CEB\u2CED\u2CF2\uA640\uA642\uA644\uA646\uA648\uA64A\uA64C\uA64E\uA650\uA652\uA654\uA656\uA658\uA65A\uA65C\uA65E\uA660\uA662\uA664\uA666\uA668\uA66A\uA66C\uA680\uA682\uA684\uA686\uA688\uA68A\uA68C\uA68E\uA690\uA692\uA694\uA696\uA698\uA69A\uA722\uA724\uA726\uA728\uA72A\uA72C\uA72E\uA732\uA734\uA736\uA738\uA73A\uA73C\uA73E\uA740\uA742\uA744\uA746\uA748\uA74A\uA74C\uA74E\uA750\uA752\uA754\uA756\uA758\uA75A\uA75C\uA75E\uA760\uA762\uA764\uA766\uA768\uA76A\uA76C\uA76E\uA779\uA77B\uA77D\uA77E\uA780\uA782\uA784\uA786\uA78B\uA78D\uA790\uA792\uA796\uA798\uA79A\uA79C\uA79E\uA7A0\uA7A2\uA7A4\uA7A6\uA7A8\uA7AA-\uA7AD\uA7B0\uA7B1\uFB00-\uFB06\uFB13-\uFB17\uFF21-\uFF3A]|\uD801[\uDC00-\uDC27]|\uD806[\uDCA0-\uDCBF]/g,i={A:"a",B:"b",C:"c",D:"d",E:"e",F:"f",G:"g",H:"h",I:"i",J:"j",K:"k",L:"l",M:"m",N:"n",O:"o",P:"p",Q:"q",R:"r",S:"s",T:"t",U:"u",V:"v",W:"w",X:"x",Y:"y",Z:"z","µ":"μ","À":"à","Á":"á","Â":"â","Ã":"ã","Ä":"ä","Å":"å","Æ":"æ","Ç":"ç","È":"è","É":"é","Ê":"ê","Ë":"ë","Ì":"ì","Í":"í","Î":"î","Ï":"ï","Ð":"ð","Ñ":"ñ","Ò":"ò","Ó":"ó","Ô":"ô","Õ":"õ","Ö":"ö","Ø":"ø","Ù":"ù","Ú":"ú","Û":"û","Ü":"ü","Ý":"ý","Þ":"þ","Ā":"ā","Ă":"ă","Ą":"ą","Ć":"ć","Ĉ":"ĉ","Ċ":"ċ","Č":"č","Ď":"ď","Đ":"đ","Ē":"ē","Ĕ":"ĕ","Ė":"ė","Ę":"ę","Ě":"ě","Ĝ":"ĝ","Ğ":"ğ","Ġ":"ġ","Ģ":"ģ","Ĥ":"ĥ","Ħ":"ħ","Ĩ":"ĩ","Ī":"ī","Ĭ":"ĭ","Į":"į","IJ":"ij","Ĵ":"ĵ","Ķ":"ķ","Ĺ":"ĺ","Ļ":"ļ","Ľ":"ľ","Ŀ":"ŀ","Ł":"ł","Ń":"ń","Ņ":"ņ","Ň":"ň","Ŋ":"ŋ","Ō":"ō","Ŏ":"ŏ","Ő":"ő","Œ":"œ","Ŕ":"ŕ","Ŗ":"ŗ","Ř":"ř","Ś":"ś","Ŝ":"ŝ","Ş":"ş","Š":"š","Ţ":"ţ","Ť":"ť","Ŧ":"ŧ","Ũ":"ũ","Ū":"ū","Ŭ":"ŭ","Ů":"ů","Ű":"ű","Ų":"ų","Ŵ":"ŵ","Ŷ":"ŷ","Ÿ":"ÿ","Ź":"ź","Ż":"ż","Ž":"ž","ſ":"s","Ɓ":"ɓ","Ƃ":"ƃ","Ƅ":"ƅ","Ɔ":"ɔ","Ƈ":"ƈ","Ɖ":"ɖ","Ɗ":"ɗ","Ƌ":"ƌ","Ǝ":"ǝ","Ə":"ə","Ɛ":"ɛ","Ƒ":"ƒ","Ɠ":"ɠ","Ɣ":"ɣ","Ɩ":"ɩ","Ɨ":"ɨ","Ƙ":"ƙ","Ɯ":"ɯ","Ɲ":"ɲ","Ɵ":"ɵ","Ơ":"ơ","Ƣ":"ƣ","Ƥ":"ƥ","Ʀ":"ʀ","Ƨ":"ƨ","Ʃ":"ʃ","Ƭ":"ƭ","Ʈ":"ʈ","Ư":"ư","Ʊ":"ʊ","Ʋ":"ʋ","Ƴ":"ƴ","Ƶ":"ƶ","Ʒ":"ʒ","Ƹ":"ƹ","Ƽ":"ƽ","DŽ":"dž","Dž":"dž","LJ":"lj","Lj":"lj","NJ":"nj","Nj":"nj","Ǎ":"ǎ","Ǐ":"ǐ","Ǒ":"ǒ","Ǔ":"ǔ","Ǖ":"ǖ","Ǘ":"ǘ","Ǚ":"ǚ","Ǜ":"ǜ","Ǟ":"ǟ","Ǡ":"ǡ","Ǣ":"ǣ","Ǥ":"ǥ","Ǧ":"ǧ","Ǩ":"ǩ","Ǫ":"ǫ","Ǭ":"ǭ","Ǯ":"ǯ","DZ":"dz","Dz":"dz","Ǵ":"ǵ","Ƕ":"ƕ","Ƿ":"ƿ","Ǹ":"ǹ","Ǻ":"ǻ","Ǽ":"ǽ","Ǿ":"ǿ","Ȁ":"ȁ","Ȃ":"ȃ","Ȅ":"ȅ","Ȇ":"ȇ","Ȉ":"ȉ","Ȋ":"ȋ","Ȍ":"ȍ","Ȏ":"ȏ","Ȑ":"ȑ","Ȓ":"ȓ","Ȕ":"ȕ","Ȗ":"ȗ","Ș":"ș","Ț":"ț","Ȝ":"ȝ","Ȟ":"ȟ","Ƞ":"ƞ","Ȣ":"ȣ","Ȥ":"ȥ","Ȧ":"ȧ","Ȩ":"ȩ","Ȫ":"ȫ","Ȭ":"ȭ","Ȯ":"ȯ","Ȱ":"ȱ","Ȳ":"ȳ","Ⱥ":"ⱥ","Ȼ":"ȼ","Ƚ":"ƚ","Ⱦ":"ⱦ","Ɂ":"ɂ","Ƀ":"ƀ","Ʉ":"ʉ","Ʌ":"ʌ","Ɇ":"ɇ","Ɉ":"ɉ","Ɋ":"ɋ","Ɍ":"ɍ","Ɏ":"ɏ","ͅ":"ι","Ͱ":"ͱ","Ͳ":"ͳ","Ͷ":"ͷ","Ϳ":"ϳ","Ά":"ά","Έ":"έ","Ή":"ή","Ί":"ί","Ό":"ό","Ύ":"ύ","Ώ":"ώ","Α":"α","Β":"β","Γ":"γ","Δ":"δ","Ε":"ε","Ζ":"ζ","Η":"η","Θ":"θ","Ι":"ι","Κ":"κ","Λ":"λ","Μ":"μ","Ν":"ν","Ξ":"ξ","Ο":"ο","Π":"π","Ρ":"ρ","Σ":"σ","Τ":"τ","Υ":"υ","Φ":"φ","Χ":"χ","Ψ":"ψ","Ω":"ω","Ϊ":"ϊ","Ϋ":"ϋ","ς":"σ","Ϗ":"ϗ","ϐ":"β","ϑ":"θ","ϕ":"φ","ϖ":"π","Ϙ":"ϙ","Ϛ":"ϛ","Ϝ":"ϝ","Ϟ":"ϟ","Ϡ":"ϡ","Ϣ":"ϣ","Ϥ":"ϥ","Ϧ":"ϧ","Ϩ":"ϩ","Ϫ":"ϫ","Ϭ":"ϭ","Ϯ":"ϯ","ϰ":"κ","ϱ":"ρ","ϴ":"θ","ϵ":"ε","Ϸ":"ϸ","Ϲ":"ϲ","Ϻ":"ϻ","Ͻ":"ͻ","Ͼ":"ͼ","Ͽ":"ͽ","Ѐ":"ѐ","Ё":"ё","Ђ":"ђ","Ѓ":"ѓ","Є":"є","Ѕ":"ѕ","І":"і","Ї":"ї","Ј":"ј","Љ":"љ","Њ":"њ","Ћ":"ћ","Ќ":"ќ","Ѝ":"ѝ","Ў":"ў","Џ":"џ","А":"а","Б":"б","В":"в","Г":"г","Д":"д","Е":"е","Ж":"ж","З":"з","И":"и","Й":"й","К":"к","Л":"л","М":"м","Н":"н","О":"о","П":"п","Р":"р","С":"с","Т":"т","У":"у","Ф":"ф","Х":"х","Ц":"ц","Ч":"ч","Ш":"ш","Щ":"щ","Ъ":"ъ","Ы":"ы","Ь":"ь","Э":"э","Ю":"ю","Я":"я","Ѡ":"ѡ","Ѣ":"ѣ","Ѥ":"ѥ","Ѧ":"ѧ","Ѩ":"ѩ","Ѫ":"ѫ","Ѭ":"ѭ","Ѯ":"ѯ","Ѱ":"ѱ","Ѳ":"ѳ","Ѵ":"ѵ","Ѷ":"ѷ","Ѹ":"ѹ","Ѻ":"ѻ","Ѽ":"ѽ","Ѿ":"ѿ","Ҁ":"ҁ","Ҋ":"ҋ","Ҍ":"ҍ","Ҏ":"ҏ","Ґ":"ґ","Ғ":"ғ","Ҕ":"ҕ","Җ":"җ","Ҙ":"ҙ","Қ":"қ","Ҝ":"ҝ","Ҟ":"ҟ","Ҡ":"ҡ","Ң":"ң","Ҥ":"ҥ","Ҧ":"ҧ","Ҩ":"ҩ","Ҫ":"ҫ","Ҭ":"ҭ","Ү":"ү","Ұ":"ұ","Ҳ":"ҳ","Ҵ":"ҵ","Ҷ":"ҷ","Ҹ":"ҹ","Һ":"һ","Ҽ":"ҽ","Ҿ":"ҿ","Ӏ":"ӏ","Ӂ":"ӂ","Ӄ":"ӄ","Ӆ":"ӆ","Ӈ":"ӈ","Ӊ":"ӊ","Ӌ":"ӌ","Ӎ":"ӎ","Ӑ":"ӑ","Ӓ":"ӓ","Ӕ":"ӕ","Ӗ":"ӗ","Ә":"ә","Ӛ":"ӛ","Ӝ":"ӝ","Ӟ":"ӟ","Ӡ":"ӡ","Ӣ":"ӣ","Ӥ":"ӥ","Ӧ":"ӧ","Ө":"ө","Ӫ":"ӫ","Ӭ":"ӭ","Ӯ":"ӯ","Ӱ":"ӱ","Ӳ":"ӳ","Ӵ":"ӵ","Ӷ":"ӷ","Ӹ":"ӹ","Ӻ":"ӻ","Ӽ":"ӽ","Ӿ":"ӿ","Ԁ":"ԁ","Ԃ":"ԃ","Ԅ":"ԅ","Ԇ":"ԇ","Ԉ":"ԉ","Ԋ":"ԋ","Ԍ":"ԍ","Ԏ":"ԏ","Ԑ":"ԑ","Ԓ":"ԓ","Ԕ":"ԕ","Ԗ":"ԗ","Ԙ":"ԙ","Ԛ":"ԛ","Ԝ":"ԝ","Ԟ":"ԟ","Ԡ":"ԡ","Ԣ":"ԣ","Ԥ":"ԥ","Ԧ":"ԧ","Ԩ":"ԩ","Ԫ":"ԫ","Ԭ":"ԭ","Ԯ":"ԯ","Ա":"ա","Բ":"բ","Գ":"գ","Դ":"դ","Ե":"ե","Զ":"զ","Է":"է","Ը":"ը","Թ":"թ","Ժ":"ժ","Ի":"ի","Լ":"լ","Խ":"խ","Ծ":"ծ","Կ":"կ","Հ":"հ","Ձ":"ձ","Ղ":"ղ","Ճ":"ճ","Մ":"մ","Յ":"յ","Ն":"ն","Շ":"շ","Ո":"ո","Չ":"չ","Պ":"պ","Ջ":"ջ","Ռ":"ռ","Ս":"ս","Վ":"վ","Տ":"տ","Ր":"ր","Ց":"ց","Ւ":"ւ","Փ":"փ","Ք":"ք","Օ":"օ","Ֆ":"ֆ","Ⴀ":"ⴀ","Ⴁ":"ⴁ","Ⴂ":"ⴂ","Ⴃ":"ⴃ","Ⴄ":"ⴄ","Ⴅ":"ⴅ","Ⴆ":"ⴆ","Ⴇ":"ⴇ","Ⴈ":"ⴈ","Ⴉ":"ⴉ","Ⴊ":"ⴊ","Ⴋ":"ⴋ","Ⴌ":"ⴌ","Ⴍ":"ⴍ","Ⴎ":"ⴎ","Ⴏ":"ⴏ","Ⴐ":"ⴐ","Ⴑ":"ⴑ","Ⴒ":"ⴒ","Ⴓ":"ⴓ","Ⴔ":"ⴔ","Ⴕ":"ⴕ","Ⴖ":"ⴖ","Ⴗ":"ⴗ","Ⴘ":"ⴘ","Ⴙ":"ⴙ","Ⴚ":"ⴚ","Ⴛ":"ⴛ","Ⴜ":"ⴜ","Ⴝ":"ⴝ","Ⴞ":"ⴞ","Ⴟ":"ⴟ","Ⴠ":"ⴠ","Ⴡ":"ⴡ","Ⴢ":"ⴢ","Ⴣ":"ⴣ","Ⴤ":"ⴤ","Ⴥ":"ⴥ","Ⴧ":"ⴧ","Ⴭ":"ⴭ","Ḁ":"ḁ","Ḃ":"ḃ","Ḅ":"ḅ","Ḇ":"ḇ","Ḉ":"ḉ","Ḋ":"ḋ","Ḍ":"ḍ","Ḏ":"ḏ","Ḑ":"ḑ","Ḓ":"ḓ","Ḕ":"ḕ","Ḗ":"ḗ","Ḙ":"ḙ","Ḛ":"ḛ","Ḝ":"ḝ","Ḟ":"ḟ","Ḡ":"ḡ","Ḣ":"ḣ","Ḥ":"ḥ","Ḧ":"ḧ","Ḩ":"ḩ","Ḫ":"ḫ","Ḭ":"ḭ","Ḯ":"ḯ","Ḱ":"ḱ","Ḳ":"ḳ","Ḵ":"ḵ","Ḷ":"ḷ","Ḹ":"ḹ","Ḻ":"ḻ","Ḽ":"ḽ","Ḿ":"ḿ","Ṁ":"ṁ","Ṃ":"ṃ","Ṅ":"ṅ","Ṇ":"ṇ","Ṉ":"ṉ","Ṋ":"ṋ","Ṍ":"ṍ","Ṏ":"ṏ","Ṑ":"ṑ","Ṓ":"ṓ","Ṕ":"ṕ","Ṗ":"ṗ","Ṙ":"ṙ","Ṛ":"ṛ","Ṝ":"ṝ","Ṟ":"ṟ","Ṡ":"ṡ","Ṣ":"ṣ","Ṥ":"ṥ","Ṧ":"ṧ","Ṩ":"ṩ","Ṫ":"ṫ","Ṭ":"ṭ","Ṯ":"ṯ","Ṱ":"ṱ","Ṳ":"ṳ","Ṵ":"ṵ","Ṷ":"ṷ","Ṹ":"ṹ","Ṻ":"ṻ","Ṽ":"ṽ","Ṿ":"ṿ","Ẁ":"ẁ","Ẃ":"ẃ","Ẅ":"ẅ","Ẇ":"ẇ","Ẉ":"ẉ","Ẋ":"ẋ","Ẍ":"ẍ","Ẏ":"ẏ","Ẑ":"ẑ","Ẓ":"ẓ","Ẕ":"ẕ","ẛ":"ṡ","Ạ":"ạ","Ả":"ả","Ấ":"ấ","Ầ":"ầ","Ẩ":"ẩ","Ẫ":"ẫ","Ậ":"ậ","Ắ":"ắ","Ằ":"ằ","Ẳ":"ẳ","Ẵ":"ẵ","Ặ":"ặ","Ẹ":"ẹ","Ẻ":"ẻ","Ẽ":"ẽ","Ế":"ế","Ề":"ề","Ể":"ể","Ễ":"ễ","Ệ":"ệ","Ỉ":"ỉ","Ị":"ị","Ọ":"ọ","Ỏ":"ỏ","Ố":"ố","Ồ":"ồ","Ổ":"ổ","Ỗ":"ỗ","Ộ":"ộ","Ớ":"ớ","Ờ":"ờ","Ở":"ở","Ỡ":"ỡ","Ợ":"ợ","Ụ":"ụ","Ủ":"ủ","Ứ":"ứ","Ừ":"ừ","Ử":"ử","Ữ":"ữ","Ự":"ự","Ỳ":"ỳ","Ỵ":"ỵ","Ỷ":"ỷ","Ỹ":"ỹ","Ỻ":"ỻ","Ỽ":"ỽ","Ỿ":"ỿ","Ἀ":"ἀ","Ἁ":"ἁ","Ἂ":"ἂ","Ἃ":"ἃ","Ἄ":"ἄ","Ἅ":"ἅ","Ἆ":"ἆ","Ἇ":"ἇ","Ἐ":"ἐ","Ἑ":"ἑ","Ἒ":"ἒ","Ἓ":"ἓ","Ἔ":"ἔ","Ἕ":"ἕ","Ἠ":"ἠ","Ἡ":"ἡ","Ἢ":"ἢ","Ἣ":"ἣ","Ἤ":"ἤ","Ἥ":"ἥ","Ἦ":"ἦ","Ἧ":"ἧ","Ἰ":"ἰ","Ἱ":"ἱ","Ἲ":"ἲ","Ἳ":"ἳ","Ἴ":"ἴ","Ἵ":"ἵ","Ἶ":"ἶ","Ἷ":"ἷ","Ὀ":"ὀ","Ὁ":"ὁ","Ὂ":"ὂ","Ὃ":"ὃ","Ὄ":"ὄ","Ὅ":"ὅ","Ὑ":"ὑ","Ὓ":"ὓ","Ὕ":"ὕ","Ὗ":"ὗ","Ὠ":"ὠ","Ὡ":"ὡ","Ὢ":"ὢ","Ὣ":"ὣ","Ὤ":"ὤ","Ὥ":"ὥ","Ὦ":"ὦ","Ὧ":"ὧ","Ᾰ":"ᾰ","Ᾱ":"ᾱ","Ὰ":"ὰ","Ά":"ά","ι":"ι","Ὲ":"ὲ","Έ":"έ","Ὴ":"ὴ","Ή":"ή","Ῐ":"ῐ","Ῑ":"ῑ","Ὶ":"ὶ","Ί":"ί","Ῠ":"ῠ","Ῡ":"ῡ","Ὺ":"ὺ","Ύ":"ύ","Ῥ":"ῥ","Ὸ":"ὸ","Ό":"ό","Ὼ":"ὼ","Ώ":"ώ","Ω":"ω","K":"k","Å":"å","Ⅎ":"ⅎ","Ⅰ":"ⅰ","Ⅱ":"ⅱ","Ⅲ":"ⅲ","Ⅳ":"ⅳ","Ⅴ":"ⅴ","Ⅵ":"ⅵ","Ⅶ":"ⅶ","Ⅷ":"ⅷ","Ⅸ":"ⅸ","Ⅹ":"ⅹ","Ⅺ":"ⅺ","Ⅻ":"ⅻ","Ⅼ":"ⅼ","Ⅽ":"ⅽ","Ⅾ":"ⅾ","Ⅿ":"ⅿ","Ↄ":"ↄ","Ⓐ":"ⓐ","Ⓑ":"ⓑ","Ⓒ":"ⓒ","Ⓓ":"ⓓ","Ⓔ":"ⓔ","Ⓕ":"ⓕ","Ⓖ":"ⓖ","Ⓗ":"ⓗ","Ⓘ":"ⓘ","Ⓙ":"ⓙ","Ⓚ":"ⓚ","Ⓛ":"ⓛ","Ⓜ":"ⓜ","Ⓝ":"ⓝ","Ⓞ":"ⓞ","Ⓟ":"ⓟ","Ⓠ":"ⓠ","Ⓡ":"ⓡ","Ⓢ":"ⓢ","Ⓣ":"ⓣ","Ⓤ":"ⓤ","Ⓥ":"ⓥ","Ⓦ":"ⓦ","Ⓧ":"ⓧ","Ⓨ":"ⓨ","Ⓩ":"ⓩ","Ⰰ":"ⰰ","Ⰱ":"ⰱ","Ⰲ":"ⰲ","Ⰳ":"ⰳ","Ⰴ":"ⰴ","Ⰵ":"ⰵ","Ⰶ":"ⰶ","Ⰷ":"ⰷ","Ⰸ":"ⰸ","Ⰹ":"ⰹ","Ⰺ":"ⰺ","Ⰻ":"ⰻ","Ⰼ":"ⰼ","Ⰽ":"ⰽ","Ⰾ":"ⰾ","Ⰿ":"ⰿ","Ⱀ":"ⱀ","Ⱁ":"ⱁ","Ⱂ":"ⱂ","Ⱃ":"ⱃ","Ⱄ":"ⱄ","Ⱅ":"ⱅ","Ⱆ":"ⱆ","Ⱇ":"ⱇ","Ⱈ":"ⱈ","Ⱉ":"ⱉ","Ⱊ":"ⱊ","Ⱋ":"ⱋ","Ⱌ":"ⱌ","Ⱍ":"ⱍ","Ⱎ":"ⱎ","Ⱏ":"ⱏ","Ⱐ":"ⱐ","Ⱑ":"ⱑ","Ⱒ":"ⱒ","Ⱓ":"ⱓ","Ⱔ":"ⱔ","Ⱕ":"ⱕ","Ⱖ":"ⱖ","Ⱗ":"ⱗ","Ⱘ":"ⱘ","Ⱙ":"ⱙ","Ⱚ":"ⱚ","Ⱛ":"ⱛ","Ⱜ":"ⱜ","Ⱝ":"ⱝ","Ⱞ":"ⱞ","Ⱡ":"ⱡ","Ɫ":"ɫ","Ᵽ":"ᵽ","Ɽ":"ɽ","Ⱨ":"ⱨ","Ⱪ":"ⱪ","Ⱬ":"ⱬ","Ɑ":"ɑ","Ɱ":"ɱ","Ɐ":"ɐ","Ɒ":"ɒ","Ⱳ":"ⱳ","Ⱶ":"ⱶ","Ȿ":"ȿ","Ɀ":"ɀ","Ⲁ":"ⲁ","Ⲃ":"ⲃ","Ⲅ":"ⲅ","Ⲇ":"ⲇ","Ⲉ":"ⲉ","Ⲋ":"ⲋ","Ⲍ":"ⲍ","Ⲏ":"ⲏ","Ⲑ":"ⲑ","Ⲓ":"ⲓ","Ⲕ":"ⲕ","Ⲗ":"ⲗ","Ⲙ":"ⲙ","Ⲛ":"ⲛ","Ⲝ":"ⲝ","Ⲟ":"ⲟ","Ⲡ":"ⲡ","Ⲣ":"ⲣ","Ⲥ":"ⲥ","Ⲧ":"ⲧ","Ⲩ":"ⲩ","Ⲫ":"ⲫ","Ⲭ":"ⲭ","Ⲯ":"ⲯ","Ⲱ":"ⲱ","Ⲳ":"ⲳ","Ⲵ":"ⲵ","Ⲷ":"ⲷ","Ⲹ":"ⲹ","Ⲻ":"ⲻ","Ⲽ":"ⲽ","Ⲿ":"ⲿ","Ⳁ":"ⳁ","Ⳃ":"ⳃ","Ⳅ":"ⳅ","Ⳇ":"ⳇ","Ⳉ":"ⳉ","Ⳋ":"ⳋ","Ⳍ":"ⳍ","Ⳏ":"ⳏ","Ⳑ":"ⳑ","Ⳓ":"ⳓ","Ⳕ":"ⳕ","Ⳗ":"ⳗ","Ⳙ":"ⳙ","Ⳛ":"ⳛ","Ⳝ":"ⳝ","Ⳟ":"ⳟ","Ⳡ":"ⳡ","Ⳣ":"ⳣ","Ⳬ":"ⳬ","Ⳮ":"ⳮ","Ⳳ":"ⳳ","Ꙁ":"ꙁ","Ꙃ":"ꙃ","Ꙅ":"ꙅ","Ꙇ":"ꙇ","Ꙉ":"ꙉ","Ꙋ":"ꙋ","Ꙍ":"ꙍ","Ꙏ":"ꙏ","Ꙑ":"ꙑ","Ꙓ":"ꙓ","Ꙕ":"ꙕ","Ꙗ":"ꙗ","Ꙙ":"ꙙ","Ꙛ":"ꙛ","Ꙝ":"ꙝ","Ꙟ":"ꙟ","Ꙡ":"ꙡ","Ꙣ":"ꙣ","Ꙥ":"ꙥ","Ꙧ":"ꙧ","Ꙩ":"ꙩ","Ꙫ":"ꙫ","Ꙭ":"ꙭ","Ꚁ":"ꚁ","Ꚃ":"ꚃ","Ꚅ":"ꚅ","Ꚇ":"ꚇ","Ꚉ":"ꚉ","Ꚋ":"ꚋ","Ꚍ":"ꚍ","Ꚏ":"ꚏ","Ꚑ":"ꚑ","Ꚓ":"ꚓ","Ꚕ":"ꚕ","Ꚗ":"ꚗ","Ꚙ":"ꚙ","Ꚛ":"ꚛ","Ꜣ":"ꜣ","Ꜥ":"ꜥ","Ꜧ":"ꜧ","Ꜩ":"ꜩ","Ꜫ":"ꜫ","Ꜭ":"ꜭ","Ꜯ":"ꜯ","Ꜳ":"ꜳ","Ꜵ":"ꜵ","Ꜷ":"ꜷ","Ꜹ":"ꜹ","Ꜻ":"ꜻ","Ꜽ":"ꜽ","Ꜿ":"ꜿ","Ꝁ":"ꝁ","Ꝃ":"ꝃ","Ꝅ":"ꝅ","Ꝇ":"ꝇ","Ꝉ":"ꝉ","Ꝋ":"ꝋ","Ꝍ":"ꝍ","Ꝏ":"ꝏ","Ꝑ":"ꝑ","Ꝓ":"ꝓ","Ꝕ":"ꝕ","Ꝗ":"ꝗ","Ꝙ":"ꝙ","Ꝛ":"ꝛ","Ꝝ":"ꝝ","Ꝟ":"ꝟ","Ꝡ":"ꝡ","Ꝣ":"ꝣ","Ꝥ":"ꝥ","Ꝧ":"ꝧ","Ꝩ":"ꝩ","Ꝫ":"ꝫ","Ꝭ":"ꝭ","Ꝯ":"ꝯ","Ꝺ":"ꝺ","Ꝼ":"ꝼ","Ᵹ":"ᵹ","Ꝿ":"ꝿ","Ꞁ":"ꞁ","Ꞃ":"ꞃ","Ꞅ":"ꞅ","Ꞇ":"ꞇ","Ꞌ":"ꞌ","Ɥ":"ɥ","Ꞑ":"ꞑ","Ꞓ":"ꞓ","Ꞗ":"ꞗ","Ꞙ":"ꞙ","Ꞛ":"ꞛ","Ꞝ":"ꞝ","Ꞟ":"ꞟ","Ꞡ":"ꞡ","Ꞣ":"ꞣ","Ꞥ":"ꞥ","Ꞧ":"ꞧ","Ꞩ":"ꞩ","Ɦ":"ɦ","Ɜ":"ɜ","Ɡ":"ɡ","Ɬ":"ɬ","Ʞ":"ʞ","Ʇ":"ʇ","Ａ":"ａ","Ｂ":"ｂ","Ｃ":"ｃ","Ｄ":"ｄ","Ｅ":"ｅ","Ｆ":"ｆ","Ｇ":"ｇ","Ｈ":"ｈ","Ｉ":"ｉ","Ｊ":"ｊ","Ｋ":"ｋ","Ｌ":"ｌ","Ｍ":"ｍ","Ｎ":"ｎ","Ｏ":"ｏ","Ｐ":"ｐ","Ｑ":"ｑ","Ｒ":"ｒ","Ｓ":"ｓ","Ｔ":"ｔ","Ｕ":"ｕ","Ｖ":"ｖ","Ｗ":"ｗ","Ｘ":"ｘ","Ｙ":"ｙ","Ｚ":"ｚ","𐐀":"𐐨","𐐁":"𐐩","𐐂":"𐐪","𐐃":"𐐫","𐐄":"𐐬","𐐅":"𐐭","𐐆":"𐐮","𐐇":"𐐯","𐐈":"𐐰","𐐉":"𐐱","𐐊":"𐐲","𐐋":"𐐳","𐐌":"𐐴","𐐍":"𐐵","𐐎":"𐐶","𐐏":"𐐷","𐐐":"𐐸","𐐑":"𐐹","𐐒":"𐐺","𐐓":"𐐻","𐐔":"𐐼","𐐕":"𐐽","𐐖":"𐐾","𐐗":"𐐿","𐐘":"𐑀","𐐙":"𐑁","𐐚":"𐑂","𐐛":"𐑃","𐐜":"𐑄","𐐝":"𐑅","𐐞":"𐑆","𐐟":"𐑇","𐐠":"𐑈","𐐡":"𐑉","𐐢":"𐑊","𐐣":"𐑋","𐐤":"𐑌","𐐥":"𐑍","𐐦":"𐑎","𐐧":"𐑏","𑢠":"𑣀","𑢡":"𑣁","𑢢":"𑣂","𑢣":"𑣃","𑢤":"𑣄","𑢥":"𑣅","𑢦":"𑣆","𑢧":"𑣇","𑢨":"𑣈","𑢩":"𑣉","𑢪":"𑣊","𑢫":"𑣋","𑢬":"𑣌","𑢭":"𑣍","𑢮":"𑣎","𑢯":"𑣏","𑢰":"𑣐","𑢱":"𑣑","𑢲":"𑣒","𑢳":"𑣓","𑢴":"𑣔","𑢵":"𑣕","𑢶":"𑣖","𑢷":"𑣗","𑢸":"𑣘","𑢹":"𑣙","𑢺":"𑣚","𑢻":"𑣛","𑢼":"𑣜","𑢽":"𑣝","𑢾":"𑣞","𑢿":"𑣟","ß":"ss","İ":"i̇","ʼn":"ʼn","ǰ":"ǰ","ΐ":"ΐ","ΰ":"ΰ","և":"եւ","ẖ":"ẖ","ẗ":"ẗ","ẘ":"ẘ","ẙ":"ẙ","ẚ":"aʾ","ẞ":"ss","ὐ":"ὐ","ὒ":"ὒ","ὔ":"ὔ","ὖ":"ὖ","ᾀ":"ἀι","ᾁ":"ἁι","ᾂ":"ἂι","ᾃ":"ἃι","ᾄ":"ἄι","ᾅ":"ἅι","ᾆ":"ἆι","ᾇ":"ἇι","ᾈ":"ἀι","ᾉ":"ἁι","ᾊ":"ἂι","ᾋ":"ἃι","ᾌ":"ἄι","ᾍ":"ἅι","ᾎ":"ἆι","ᾏ":"ἇι","ᾐ":"ἠι","ᾑ":"ἡι","ᾒ":"ἢι","ᾓ":"ἣι","ᾔ":"ἤι","ᾕ":"ἥι","ᾖ":"ἦι","ᾗ":"ἧι","ᾘ":"ἠι","ᾙ":"ἡι","ᾚ":"ἢι","ᾛ":"ἣι","ᾜ":"ἤι","ᾝ":"ἥι","ᾞ":"ἦι","ᾟ":"ἧι","ᾠ":"ὠι","ᾡ":"ὡι","ᾢ":"ὢι","ᾣ":"ὣι","ᾤ":"ὤι","ᾥ":"ὥι","ᾦ":"ὦι","ᾧ":"ὧι","ᾨ":"ὠι","ᾩ":"ὡι","ᾪ":"ὢι","ᾫ":"ὣι","ᾬ":"ὤι","ᾭ":"ὥι","ᾮ":"ὦι","ᾯ":"ὧι","ᾲ":"ὰι","ᾳ":"αι","ᾴ":"άι","ᾶ":"ᾶ","ᾷ":"ᾶι","ᾼ":"αι","ῂ":"ὴι","ῃ":"ηι","ῄ":"ήι","ῆ":"ῆ","ῇ":"ῆι","ῌ":"ηι","ῒ":"ῒ","ΐ":"ΐ","ῖ":"ῖ","ῗ":"ῗ","ῢ":"ῢ","ΰ":"ΰ","ῤ":"ῤ","ῦ":"ῦ","ῧ":"ῧ","ῲ":"ὼι","ῳ":"ωι","ῴ":"ώι","ῶ":"ῶ","ῷ":"ῶι","ῼ":"ωι","ff":"ff","fi":"fi","fl":"fl","ffi":"ffi","ffl":"ffl","ſt":"st","st":"st","ﬓ":"մն","ﬔ":"մե","ﬕ":"մի","ﬖ":"վն","ﬗ":"մխ"};e.exports=function(e){return e.slice(1,e.length-1).trim().replace(r,function(e){return i[e]||" "})}},function(e,t,n){"use strict";function r(e){return{softbreak:"\n",escape:i,options:e||{},render:s}}var i=n(91).escapeXml,o=function(e,t,n){var r="<"+e;if(t&&t.length>0)for(var i,o=0;void 0!==(i=t[o]);)r+=" "+i[0]+'="'+i[1]+'"',o++;return n&&(r+=" /"),r+=">"},a=function(e){return e.replace(/([a-z])([A-Z])/g,"$1_$2").toLowerCase()},s=function(e){var t,n,r,i,s,u,l,c,p=e.walker(),f="",h="\n",d=0,m=function(e){f+=e,h=e},v=this.escape,g=function(){if("\n"!==h){f+="\n",h="\n";for(var e=d;e>0;e--)f+="  "}},y=this.options;for(y.time&&console.time("rendering"),f+='<?xml version="1.0" encoding="UTF-8"?>\n',f+='<!DOCTYPE CommonMark SYSTEM "CommonMark.dtd">\n';r=p.next();)if(s=r.entering,i=r.node,c=i.type,u=i.isContainer,l="ThematicBreak"===c||"Hardbreak"===c||"Softbreak"===c,n=a(c),s){switch(t=[],c){case"Document":t.push(["xmlns","http://commonmark.org/xml/1.0"]);break;case"List":null!==i.listType&&t.push(["type",i.listType.toLowerCase()]),null!==i.listStart&&t.push(["start",String(i.listStart)]),null!==i.listTight&&t.push(["tight",i.listTight?"true":"false"]);var _=i.listDelimiter;if(null!==_){var b="";b="."===_?"period":"paren",t.push(["delimiter",b])}break;case"CodeBlock":i.info&&t.push(["info",i.info]);break;case"Heading":t.push(["level",String(i.level)]);break;case"Link":case"Image":t.push(["destination",i.destination]),t.push(["title",i.title]);break;case"CustomInline":case"CustomBlock":t.push(["on_enter",i.onEnter]),t.push(["on_exit",i.onExit])}if(y.sourcepos){var x=i.sourcepos;x&&t.push(["sourcepos",String(x[0][0])+":"+String(x[0][1])+"-"+String(x[1][0])+":"+String(x[1][1])])}if(g(),m(o(n,t,l)),u)d+=1;else if(!u&&!l){var w=i.literal;w&&m(v(w)),m(o("/"+n))}}else d-=1,g(),m(o("/"+n));return y.time&&console.timeEnd("rendering"),f+="\n"};e.exports=r},function(e,t,n){"use strict";function r(e){i.Component.call(this,e)}var i=n(0),o=n(1076).Parser,a=n(574),s=n(1);r.prototype=Object.create(i.Component.prototype),r.prototype.constructor=r,r.prototype.render=function(){var e=this.props.containerProps||{},t=new a(this.props),n=new o(this.props.parserOptions),r=n.parse(this.props.source||"");if(this.props.walker)for(var s,u=r.walker();s=u.next();)this.props.walker.call(this,s,u);return this.props.className&&(e.className=this.props.className),i.createElement.apply(i,[this.props.containerTagName,e,this.props.childBefore].concat(t.render(r).concat([this.props.childAfter])))},r.propTypes={className:s.string,containerProps:s.object,source:s.string.isRequired,containerTagName:s.string,childBefore:s.object,childAfter:s.object,sourcePos:s.bool,escapeHtml:s.bool,skipHtml:s.bool,softBreak:s.string,allowNode:s.func,allowedTypes:s.array,disallowedTypes:s.array,transformLinkUri:s.func,transformImageUri:s.func,unwrapDisallowed:s.bool,renderers:s.object,walker:s.func,parserOptions:s.object},r.defaultProps={containerTagName:"div",parserOptions:{}},r.types=a.types,r.renderers=a.renderers,r.uriTransformer=a.uriTransformer,e.exports=r},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(257),l=r(u),c=n(164),p=r(c),f=n(259),h=r(f),d=n(231),m=r(d),v=n(239),g=r(v),y=n(258),_=r(y),b=n(0),x=r(b),w=n(1),k=r(w),E=1e3/60,S=function(e){function t(n){var r=this;i(this,t),e.call(this,n),this.wasAnimating=!1,this.animationID=null,this.prevTime=0,this.accumulatedTime=0,this.unreadPropStyle=null,this.clearUnreadPropStyle=function(e){var t=!1,n=r.state,i=n.currentStyle,o=n.currentVelocity,s=n.lastIdealStyle,u=n.lastIdealVelocity;for(var l in e)if(Object.prototype.hasOwnProperty.call(e,l)){var c=e[l];"number"==typeof c&&(t||(t=!0,i=a({},i),o=a({},o),s=a({},s),u=a({},u)),i[l]=c,o[l]=0,s[l]=c,u[l]=0)}t&&r.setState({currentStyle:i,currentVelocity:o,lastIdealStyle:s,lastIdealVelocity:u})},this.startAnimationIfNecessary=function(){r.animationID=g.default(function(e){var t=r.props.style;if(_.default(r.state.currentStyle,t,r.state.currentVelocity))return r.wasAnimating&&r.props.onRest&&r.props.onRest(),r.animationID=null,r.wasAnimating=!1,void(r.accumulatedTime=0);r.wasAnimating=!0;var n=e||m.default(),i=n-r.prevTime;if(r.prevTime=n,r.accumulatedTime=r.accumulatedTime+i,r.accumulatedTime>10*E&&(r.accumulatedTime=0),0===r.accumulatedTime)return r.animationID=null,void r.startAnimationIfNecessary();var o=(r.accumulatedTime-Math.floor(r.accumulatedTime/E)*E)/E,a=Math.floor(r.accumulatedTime/E),s={},u={},l={},c={};for(var p in t)if(Object.prototype.hasOwnProperty.call(t,p)){var f=t[p];if("number"==typeof f)l[p]=f,c[p]=0,s[p]=f,u[p]=0;else{for(var d=r.state.lastIdealStyle[p],v=r.state.lastIdealVelocity[p],g=0;g<a;g++){var y=h.default(E/1e3,d,v,f.val,f.stiffness,f.damping,f.precision);d=y[0],v=y[1]}var b=h.default(E/1e3,d,v,f.val,f.stiffness,f.damping,f.precision),x=b[0],w=b[1];l[p]=d+(x-d)*o,c[p]=v+(w-v)*o,s[p]=d,u[p]=v}}r.animationID=null,r.accumulatedTime-=a*E,r.setState({currentStyle:l,currentVelocity:c,lastIdealStyle:s,lastIdealVelocity:u}),r.unreadPropStyle=null,r.startAnimationIfNecessary()})},this.state=this.defaultState()}return o(t,e),s(t,null,[{key:"propTypes",value:{defaultStyle:k.default.objectOf(k.default.number),style:k.default.objectOf(k.default.oneOfType([k.default.number,k.default.object])).isRequired,children:k.default.func.isRequired,onRest:k.default.func},enumerable:!0}]),t.prototype.defaultState=function(){var e=this.props,t=e.defaultStyle,n=e.style,r=t||p.default(n),i=l.default(r);return{currentStyle:r,currentVelocity:i,lastIdealStyle:r,lastIdealVelocity:i}},t.prototype.componentDidMount=function(){this.prevTime=m.default(),this.startAnimationIfNecessary()},t.prototype.componentWillReceiveProps=function(e){null!=this.unreadPropStyle&&this.clearUnreadPropStyle(this.unreadPropStyle),this.unreadPropStyle=e.style,null==this.animationID&&(this.prevTime=m.default(),this.startAnimationIfNecessary())},t.prototype.componentWillUnmount=function(){null!=this.animationID&&(g.default.cancel(this.animationID),this.animationID=null)},t.prototype.render=function(){var e=this.props.children(this.state.currentStyle);return e&&x.default.Children.only(e)},t}(x.default.Component);t.default=S,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function a(e,t,n){for(var r=0;r<e.length;r++)if(!b.default(e[r],t[r],n[r]))return!1;return!0}t.__esModule=!0;var s=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),l=n(257),c=r(l),p=n(164),f=r(p),h=n(259),d=r(h),m=n(231),v=r(m),g=n(239),y=r(g),_=n(258),b=r(_),x=n(0),w=r(x),k=n(1),E=r(k),S=1e3/60,C=function(e){function t(n){var r=this;i(this,t),e.call(this,n),this.animationID=null,this.prevTime=0,this.accumulatedTime=0,this.unreadPropStyles=null,this.clearUnreadPropStyle=function(e){for(var t=r.state,n=t.currentStyles,i=t.currentVelocities,o=t.lastIdealStyles,a=t.lastIdealVelocities,u=!1,l=0;l<e.length;l++){var c=e[l],p=!1;for(var f in c)if(Object.prototype.hasOwnProperty.call(c,f)){var h=c[f];"number"==typeof h&&(p||(p=!0,u=!0,n[l]=s({},n[l]),i[l]=s({},i[l]),o[l]=s({},o[l]),a[l]=s({},a[l])),n[l][f]=h,i[l][f]=0,o[l][f]=h,a[l][f]=0)}}u&&r.setState({currentStyles:n,currentVelocities:i,lastIdealStyles:o,lastIdealVelocities:a})},this.startAnimationIfNecessary=function(){r.animationID=y.default(function(e){var t=r.props.styles(r.state.lastIdealStyles);if(a(r.state.currentStyles,t,r.state.currentVelocities))return r.animationID=null,void(r.accumulatedTime=0);var n=e||v.default(),i=n-r.prevTime;if(r.prevTime=n,r.accumulatedTime=r.accumulatedTime+i,r.accumulatedTime>10*S&&(r.accumulatedTime=0),0===r.accumulatedTime)return r.animationID=null,void r.startAnimationIfNecessary();for(var o=(r.accumulatedTime-Math.floor(r.accumulatedTime/S)*S)/S,s=Math.floor(r.accumulatedTime/S),u=[],l=[],c=[],p=[],f=0;f<t.length;f++){var h=t[f],m={},g={},y={},_={};for(var b in h)if(Object.prototype.hasOwnProperty.call(h,b)){var x=h[b];if("number"==typeof x)m[b]=x,g[b]=0,y[b]=x,_[b]=0;else{for(var w=r.state.lastIdealStyles[f][b],k=r.state.lastIdealVelocities[f][b],E=0;E<s;E++){var C=d.default(S/1e3,w,k,x.val,x.stiffness,x.damping,x.precision);w=C[0],k=C[1]}var A=d.default(S/1e3,w,k,x.val,x.stiffness,x.damping,x.precision),D=A[0],O=A[1];m[b]=w+(D-w)*o,g[b]=k+(O-k)*o,y[b]=w,_[b]=k}}c[f]=m,p[f]=g,u[f]=y,l[f]=_}r.animationID=null,r.accumulatedTime-=s*S,r.setState({currentStyles:c,currentVelocities:p,lastIdealStyles:u,lastIdealVelocities:l}),r.unreadPropStyles=null,r.startAnimationIfNecessary()})},this.state=this.defaultState()}return o(t,e),u(t,null,[{key:"propTypes",value:{defaultStyles:E.default.arrayOf(E.default.objectOf(E.default.number)),styles:E.default.func.isRequired,children:E.default.func.isRequired},enumerable:!0}]),t.prototype.defaultState=function(){var e=this.props,t=e.defaultStyles,n=e.styles,r=t||n().map(f.default),i=r.map(function(e){return c.default(e)});return{currentStyles:r,currentVelocities:i,lastIdealStyles:r,lastIdealVelocities:i}},t.prototype.componentDidMount=function(){this.prevTime=v.default(),this.startAnimationIfNecessary()},t.prototype.componentWillReceiveProps=function(e){null!=this.unreadPropStyles&&this.clearUnreadPropStyle(this.unreadPropStyles),this.unreadPropStyles=e.styles(this.state.lastIdealStyles),null==this.animationID&&(this.prevTime=v.default(),this.startAnimationIfNecessary())},t.prototype.componentWillUnmount=function(){null!=this.animationID&&(y.default.cancel(this.animationID),this.animationID=null)},t.prototype.render=function(){var e=this.props.children(this.state.currentStyles);return e&&w.default.Children.only(e)},t}(w.default.Component);t.default=C,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function a(e,t,n){var r=t;return null==r?e.map(function(e,t){return{key:e.key,data:e.data,style:n[t]}}):e.map(function(e,t){for(var i=0;i<r.length;i++)if(r[i].key===e.key)return{key:r[i].key,data:r[i].data,style:n[t]};return{key:e.key,data:e.data,style:n[t]}})}function s(e,t,n,r){if(r.length!==t.length)return!1;for(var i=0;i<r.length;i++)if(r[i].key!==t[i].key)return!1;for(var i=0;i<r.length;i++)if(!E.default(e[i],t[i].style,n[i]))return!1;return!0}function u(e,t,n,r,i,o,a,s,u){for(var l=y.default(r,i,function(e,r){var i=t(r);return null==i?(n({key:r.key,data:r.data}),null):E.default(o[e],i,a[e])?(n({key:r.key,data:r.data}),null):{key:r.key,data:r.data,style:i}}),c=[],p=[],h=[],d=[],m=0;m<l.length;m++){for(var v=l[m],g=null,_=0;_<r.length;_++)if(r[_].key===v.key){g=_;break}if(null==g){var b=e(v);c[m]=b,h[m]=b;var x=f.default(v.style);p[m]=x,d[m]=x}else c[m]=o[g],h[m]=s[g],p[m]=a[g],d[m]=u[g]}return[l,c,p,h,d]}t.__esModule=!0;var l=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},c=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),p=n(257),f=r(p),h=n(164),d=r(h),m=n(259),v=r(m),g=n(1084),y=r(g),_=n(231),b=r(_),x=n(239),w=r(x),k=n(258),E=r(k),S=n(0),C=r(S),A=n(1),D=r(A),O=1e3/60,M=function(e){function t(n){var r=this;i(this,t),e.call(this,n),this.unmounting=!1,this.animationID=null,this.prevTime=0,this.accumulatedTime=0,this.unreadPropStyles=null,this.clearUnreadPropStyle=function(e){for(var t=u(r.props.willEnter,r.props.willLeave,r.props.didLeave,r.state.mergedPropsStyles,e,r.state.currentStyles,r.state.currentVelocities,r.state.lastIdealStyles,r.state.lastIdealVelocities),n=t[0],i=t[1],o=t[2],a=t[3],s=t[4],c=0;c<e.length;c++){var p=e[c].style,f=!1;for(var h in p)if(Object.prototype.hasOwnProperty.call(p,h)){var d=p[h];"number"==typeof d&&(f||(f=!0,i[c]=l({},i[c]),o[c]=l({},o[c]),a[c]=l({},a[c]),s[c]=l({},s[c]),n[c]={key:n[c].key,data:n[c].data,style:l({},n[c].style)}),i[c][h]=d,o[c][h]=0,a[c][h]=d,s[c][h]=0,n[c].style[h]=d)}}r.setState({currentStyles:i,currentVelocities:o,mergedPropsStyles:n,lastIdealStyles:a,lastIdealVelocities:s})},this.startAnimationIfNecessary=function(){r.unmounting||(r.animationID=w.default(function(e){if(!r.unmounting){var t=r.props.styles,n="function"==typeof t?t(a(r.state.mergedPropsStyles,r.unreadPropStyles,r.state.lastIdealStyles)):t;if(s(r.state.currentStyles,n,r.state.currentVelocities,r.state.mergedPropsStyles))return r.animationID=null,void(r.accumulatedTime=0);var i=e||b.default(),o=i-r.prevTime;if(r.prevTime=i,r.accumulatedTime=r.accumulatedTime+o,r.accumulatedTime>10*O&&(r.accumulatedTime=0),0===r.accumulatedTime)return r.animationID=null,void r.startAnimationIfNecessary();for(var l=(r.accumulatedTime-Math.floor(r.accumulatedTime/O)*O)/O,c=Math.floor(r.accumulatedTime/O),p=u(r.props.willEnter,r.props.willLeave,r.props.didLeave,r.state.mergedPropsStyles,n,r.state.currentStyles,r.state.currentVelocities,r.state.lastIdealStyles,r.state.lastIdealVelocities),f=p[0],h=p[1],d=p[2],m=p[3],g=p[4],y=0;y<f.length;y++){var _=f[y].style,x={},w={},k={},E={};for(var S in _)if(Object.prototype.hasOwnProperty.call(_,S)){var C=_[S];if("number"==typeof C)x[S]=C,w[S]=0,k[S]=C,E[S]=0;else{for(var A=m[y][S],D=g[y][S],M=0;M<c;M++){var T=v.default(O/1e3,A,D,C.val,C.stiffness,C.damping,C.precision);A=T[0],D=T[1]}var P=v.default(O/1e3,A,D,C.val,C.stiffness,C.damping,C.precision),I=P[0],R=P[1];x[S]=A+(I-A)*l,w[S]=D+(R-D)*l,k[S]=A,E[S]=D}}m[y]=k,g[y]=E,h[y]=x,d[y]=w}r.animationID=null,r.accumulatedTime-=c*O,r.setState({currentStyles:h,currentVelocities:d,lastIdealStyles:m,lastIdealVelocities:g,mergedPropsStyles:f}),r.unreadPropStyles=null,r.startAnimationIfNecessary()}}))},this.state=this.defaultState()}return o(t,e),c(t,null,[{key:"propTypes",value:{defaultStyles:D.default.arrayOf(D.default.shape({key:D.default.string.isRequired,data:D.default.any,style:D.default.objectOf(D.default.number).isRequired})),styles:D.default.oneOfType([D.default.func,D.default.arrayOf(D.default.shape({key:D.default.string.isRequired,data:D.default.any,style:D.default.objectOf(D.default.oneOfType([D.default.number,D.default.object])).isRequired}))]).isRequired,children:D.default.func.isRequired,willEnter:D.default.func,willLeave:D.default.func,didLeave:D.default.func},enumerable:!0},{key:"defaultProps",value:{willEnter:function(e){return d.default(e.style)},willLeave:function(){return null},didLeave:function(){}},enumerable:!0}]),t.prototype.defaultState=function(){var e=this.props,t=e.defaultStyles,n=e.styles,r=e.willEnter,i=e.willLeave,o=e.didLeave,a="function"==typeof n?n(t):n,s=void 0;s=null==t?a:t.map(function(e){for(var t=0;t<a.length;t++)if(a[t].key===e.key)return a[t];return e});var l=null==t?a.map(function(e){return d.default(e.style)}):t.map(function(e){return d.default(e.style)}),c=null==t?a.map(function(e){return f.default(e.style)}):t.map(function(e){return f.default(e.style)}),p=u(r,i,o,s,a,l,c,l,c),h=p[0];return{currentStyles:p[1],currentVelocities:p[2],lastIdealStyles:p[3],lastIdealVelocities:p[4],mergedPropsStyles:h}},t.prototype.componentDidMount=function(){this.prevTime=b.default(),this.startAnimationIfNecessary()},t.prototype.componentWillReceiveProps=function(e){this.unreadPropStyles&&this.clearUnreadPropStyle(this.unreadPropStyles);var t=e.styles;this.unreadPropStyles="function"==typeof t?t(a(this.state.mergedPropsStyles,this.unreadPropStyles,this.state.lastIdealStyles)):t,null==this.animationID&&(this.prevTime=b.default(),this.startAnimationIfNecessary())},t.prototype.componentWillUnmount=function(){this.unmounting=!0,null!=this.animationID&&(w.default.cancel(this.animationID),this.animationID=null)},t.prototype.render=function(){var e=a(this.state.mergedPropsStyles,this.unreadPropStyles,this.state.currentStyles),t=this.props.children(e);return t&&C.default.Children.only(t)},t}(C.default.Component);t.default=M,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){for(var r={},i=0;i<e.length;i++)r[e[i].key]=i;for(var o={},i=0;i<t.length;i++)o[t[i].key]=i;for(var a=[],i=0;i<t.length;i++)a[i]=t[i];for(var i=0;i<e.length;i++)if(!Object.prototype.hasOwnProperty.call(o,e[i].key)){var s=n(i,e[i]);null!=s&&a.push(s)}return a.sort(function(e,n){var i=o[e.key],a=o[n.key],s=r[e.key],u=r[n.key];if(null!=i&&null!=a)return o[e.key]-o[n.key];if(null!=s&&null!=u)return r[e.key]-r[n.key];if(null!=i){for(var l=0;l<t.length;l++){var c=t[l].key;if(Object.prototype.hasOwnProperty.call(r,c)){if(i<o[c]&&u>r[c])return-1;if(i>o[c]&&u<r[c])return 1}}return 1}for(var l=0;l<t.length;l++){var c=t[l].key;if(Object.prototype.hasOwnProperty.call(r,c)){if(a<o[c]&&s>r[c])return 1;if(a>o[c]&&s<r[c])return-1}}return-1})}t.__esModule=!0,t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e.default:e}t.__esModule=!0;var i=n(1081);t.Motion=r(i);var o=n(1082);t.StaggeredMotion=r(o);var a=n(1083);t.TransitionMotion=r(a);var s=n(1087);t.spring=r(s);var u=n(471);t.presets=r(u);var l=n(164);t.stripStyle=r(l);var c=n(1086);t.reorderKeys=r(c)},function(e,t,n){"use strict";function r(){}t.__esModule=!0,t.default=r;e.exports=t.default},function(e,t,n){"use strict";function r(e,t){return i({},s,t,{val:e})}t.__esModule=!0;var i=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e};t.default=r;var o=n(471),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s=i({},a.default.noWobble,{precision:.01});e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0,t.default=void 0;var s=n(0),u=n(1),l=r(u),c=n(472),p=r(c),f=n(473),h=(r(f),function(e){function t(n,r){i(this,t);var a=o(this,e.call(this,n,r));return a.store=n.store,a}return a(t,e),t.prototype.getChildContext=function(){return{store:this.store}},t.prototype.render=function(){return s.Children.only(this.props.children)},t}(s.Component));t.default=h,h.propTypes={store:p.default.isRequired,children:l.default.element.isRequired},h.childContextTypes={store:p.default.isRequired}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function s(e){return e.displayName||e.name||"Component"}function u(e,t){try{return e.apply(t)}catch(e){return A.value=e,A}}function l(e,t,n){var r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},l=Boolean(e),f=e||E,d=void 0;d="function"==typeof t?t:t?(0,g.default)(t):S;var v=n||C,y=r.pure,_=void 0===y||y,b=r.withRef,w=void 0!==b&&b,O=_&&v!==C,M=D++;return function(e){function t(e,t,n){var r=v(e,t,n);return r}var n="Connect("+s(e)+")",r=function(r){function s(e,t){i(this,s);var a=o(this,r.call(this,e,t));a.version=M,a.store=e.store||t.store,(0,k.default)(a.store,'Could not find "store" in either the context or props of "'+n+'". Either wrap the root component in a <Provider>, or explicitly pass "store" as a prop to "'+n+'".');var u=a.store.getState();return a.state={storeState:u},a.clearCache(),a}return a(s,r),s.prototype.shouldComponentUpdate=function(){return!_||this.haveOwnPropsChanged||this.hasStoreStateChanged},s.prototype.computeStateProps=function(e,t){if(!this.finalMapStateToProps)return this.configureFinalMapState(e,t);var n=e.getState(),r=this.doStatePropsDependOnOwnProps?this.finalMapStateToProps(n,t):this.finalMapStateToProps(n);return r},s.prototype.configureFinalMapState=function(e,t){var n=f(e.getState(),t),r="function"==typeof n;return this.finalMapStateToProps=r?n:f,this.doStatePropsDependOnOwnProps=1!==this.finalMapStateToProps.length,r?this.computeStateProps(e,t):n},s.prototype.computeDispatchProps=function(e,t){if(!this.finalMapDispatchToProps)return this.configureFinalMapDispatch(e,t);var n=e.dispatch,r=this.doDispatchPropsDependOnOwnProps?this.finalMapDispatchToProps(n,t):this.finalMapDispatchToProps(n);return r},s.prototype.configureFinalMapDispatch=function(e,t){var n=d(e.dispatch,t),r="function"==typeof n;return this.finalMapDispatchToProps=r?n:d,this.doDispatchPropsDependOnOwnProps=1!==this.finalMapDispatchToProps.length,r?this.computeDispatchProps(e,t):n},s.prototype.updateStatePropsIfNeeded=function(){var e=this.computeStateProps(this.store,this.props);return(!this.stateProps||!(0,m.default)(e,this.stateProps))&&(this.stateProps=e,!0)},s.prototype.updateDispatchPropsIfNeeded=function(){var e=this.computeDispatchProps(this.store,this.props);return(!this.dispatchProps||!(0,m.default)(e,this.dispatchProps))&&(this.dispatchProps=e,!0)},s.prototype.updateMergedPropsIfNeeded=function(){var e=t(this.stateProps,this.dispatchProps,this.props);return!(this.mergedProps&&O&&(0,m.default)(e,this.mergedProps))&&(this.mergedProps=e,!0)},s.prototype.isSubscribed=function(){return"function"==typeof this.unsubscribe},s.prototype.trySubscribe=function(){l&&!this.unsubscribe&&(this.unsubscribe=this.store.subscribe(this.handleChange.bind(this)),this.handleChange())},s.prototype.tryUnsubscribe=function(){this.unsubscribe&&(this.unsubscribe(),this.unsubscribe=null)},s.prototype.componentDidMount=function(){this.trySubscribe()},s.prototype.componentWillReceiveProps=function(e){_&&(0,m.default)(e,this.props)||(this.haveOwnPropsChanged=!0)},s.prototype.componentWillUnmount=function(){this.tryUnsubscribe(),this.clearCache()},s.prototype.clearCache=function(){this.dispatchProps=null,this.stateProps=null,this.mergedProps=null,this.haveOwnPropsChanged=!0,this.hasStoreStateChanged=!0,this.haveStatePropsBeenPrecalculated=!1,this.statePropsPrecalculationError=null,this.renderedElement=null,this.finalMapDispatchToProps=null,this.finalMapStateToProps=null},s.prototype.handleChange=function(){if(this.unsubscribe){var e=this.store.getState(),t=this.state.storeState;if(!_||t!==e){if(_&&!this.doStatePropsDependOnOwnProps){var n=u(this.updateStatePropsIfNeeded,this);if(!n)return;n===A&&(this.statePropsPrecalculationError=A.value),this.haveStatePropsBeenPrecalculated=!0}this.hasStoreStateChanged=!0,this.setState({storeState:e})}}},s.prototype.getWrappedInstance=function(){return(0,k.default)(w,"To access the wrapped instance, you need to specify { withRef: true } as the fourth argument of the connect() call."),this.refs.wrappedInstance},s.prototype.render=function(){var t=this.haveOwnPropsChanged,n=this.hasStoreStateChanged,r=this.haveStatePropsBeenPrecalculated,i=this.statePropsPrecalculationError,o=this.renderedElement;if(this.haveOwnPropsChanged=!1,this.hasStoreStateChanged=!1,this.haveStatePropsBeenPrecalculated=!1,this.statePropsPrecalculationError=null,i)throw i;var a=!0,s=!0;_&&o&&(a=n||t&&this.doStatePropsDependOnOwnProps,s=t&&this.doDispatchPropsDependOnOwnProps);var u=!1,l=!1;r?u=!0:a&&(u=this.updateStatePropsIfNeeded()),s&&(l=this.updateDispatchPropsIfNeeded());return!(!!(u||l||t)&&this.updateMergedPropsIfNeeded())&&o?o:(this.renderedElement=w?(0,p.createElement)(e,c({},this.mergedProps,{ref:"wrappedInstance"})):(0,p.createElement)(e,this.mergedProps),this.renderedElement)},s}(p.Component);return r.displayName=n,r.WrappedComponent=e,r.contextTypes={store:h.default},r.propTypes={store:h.default},(0,x.default)(r,e)}}t.__esModule=!0;var c=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e};t.default=l;var p=n(0),f=n(472),h=r(f),d=n(1091),m=r(d),v=n(1092),g=r(v),y=n(473),_=(r(y),n(421)),b=(r(_),n(758)),x=r(b),w=n(793),k=r(w),E=function(e){return{}},S=function(e){return{dispatch:e}},C=function(e,t,n){return c({},n,e,t)},A={value:null},D=0},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}t.__esModule=!0,t.connect=t.Provider=void 0;var i=n(1088),o=r(i),a=n(1089),s=r(a);t.Provider=o.default,t.connect=s.default},function(e,t,n){"use strict";function r(e,t){if(e===t)return!0;var n=Object.keys(e),r=Object.keys(t);if(n.length!==r.length)return!1;for(var i=Object.prototype.hasOwnProperty,o=0;o<n.length;o++)if(!i.call(t,n[o])||e[n[o]]!==t[n[o]])return!1;return!0}t.__esModule=!0,t.default=r},function(e,t,n){"use strict";function r(e){return function(t){return(0,i.bindActionCreators)(e,t)}}t.__esModule=!0,t.default=r;var i=n(486)},function(e,t,n){var r=n(1096);e.exports=r},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var s=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),l=n(0),c=r(l),p=n(1),f=r(p),h=n(209),d=r(h),m=n(260),v=r(m),g="undefined"!=typeof navigator?navigator.userAgent:"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.2 (KHTML, like Gecko) Safari/537.2",y=function(e){function t(e){i(this,t);var n=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e));return n.state={size:n.props.size},n}return a(t,e),u(t,[{key:"render",value:function(){var e=this.props,t=e.children,n=e.className,r=e.prefixer,i=e.split,o=e.style,a=this.state.size,u=["Pane",i,n],l=s({},o||{},{flex:1,position:"relative",outline:"none"});return void 0!==a&&("vertical"===i?l.width=a:(l.height=a,l.display="flex"),l.flex="none"),c.default.createElement("div",{className:u.join(" "),style:r.prefix(l)},t)}}]),t}(c.default.Component);y.propTypes={className:f.default.string.isRequired,children:f.default.node.isRequired,prefixer:f.default.instanceOf(d.default).isRequired,size:f.default.oneOfType([f.default.string,f.default.number]),split:f.default.oneOf(["vertical","horizontal"]),style:v.default},y.defaultProps={prefixer:new d.default({userAgent:g})},t.default=y,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0}),t.RESIZER_DEFAULT_CLASSNAME=void 0;var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(0),l=r(u),c=n(1),p=r(c),f=n(209),h=r(f),d=n(260),m=r(d),v="undefined"!=typeof navigator?navigator.userAgent:"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.2 (KHTML, like Gecko) Safari/537.2",g=t.RESIZER_DEFAULT_CLASSNAME="Resizer",y=function(e){function t(){return i(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return a(t,e),s(t,[{key:"render",value:function(){var e=this.props,t=e.className,n=e.onClick,r=e.onDoubleClick,i=e.onMouseDown,o=e.onTouchEnd,a=e.onTouchStart,s=e.prefixer,u=e.resizerClassName,c=e.split,p=e.style,f=[u,c,t];return l.default.createElement("span",{className:f.join(" "),style:s.prefix(p)||{},onMouseDown:function(e){return i(e)},onTouchStart:function(e){e.preventDefault(),a(e)},onTouchEnd:function(e){e.preventDefault(),o(e)},onClick:function(e){n&&(e.preventDefault(),n(e))},onDoubleClick:function(e){r&&(e.preventDefault(),r(e))}})}}]),t}(l.default.Component);y.propTypes={className:p.default.string.isRequired,onClick:p.default.func,onDoubleClick:p.default.func,onMouseDown:p.default.func.isRequired,onTouchStart:p.default.func.isRequired,onTouchEnd:p.default.func.isRequired,prefixer:p.default.instanceOf(h.default).isRequired,split:p.default.oneOf(["vertical","horizontal"]),style:m.default,resizerClassName:p.default.string.isRequired},y.defaultProps={prefixer:new h.default({userAgent:v}),resizerClassName:g},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function s(e,t){if(e.selection)e.selection.empty();else try{t.getSelection().removeAllRanges()}catch(e){}}Object.defineProperty(t,"__esModule",{value:!0});var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},l=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),c=n(0),p=r(c),f=n(1),h=r(f),d=n(449),m=r(d),v=n(209),g=r(v),y=n(260),_=r(y),b=n(1094),x=r(b),w=n(1095),k=r(w),E="undefined"!=typeof navigator?navigator.userAgent:"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.2 (KHTML, like Gecko) Safari/537.2",S=function(e){function t(){i(this,t);var e=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return e.onMouseDown=e.onMouseDown.bind(e),e.onTouchStart=e.onTouchStart.bind(e),e.onMouseMove=e.onMouseMove.bind(e),e.onTouchMove=e.onTouchMove.bind(e),e.onMouseUp=e.onMouseUp.bind(e),e.state={active:!1,resized:!1},e}return a(t,e),l(t,[{key:"componentDidMount",value:function(){this.setSize(this.props,this.state),document.addEventListener("mouseup",this.onMouseUp),document.addEventListener("mousemove",this.onMouseMove),document.addEventListener("touchmove",this.onTouchMove)}},{key:"componentWillReceiveProps",value:function(e){this.setSize(e,this.state)}},{key:"componentWillUnmount",value:function(){document.removeEventListener("mouseup",this.onMouseUp),document.removeEventListener("mousemove",this.onMouseMove),document.removeEventListener("touchmove",this.onTouchMove)}},{key:"onMouseDown",value:function(e){var t=u({},e,{touches:[{clientX:e.clientX,clientY:e.clientY}]});this.onTouchStart(t)}},{key:"onTouchStart",value:function(e){var t=this.props,n=t.allowResize,r=t.onDragStarted,i=t.split;if(n){s(document,window);var o="vertical"===i?e.touches[0].clientX:e.touches[0].clientY;"function"==typeof r&&r(),this.setState({active:!0,position:o})}}},{key:"onMouseMove",value:function(e){var t=u({},e,{touches:[{clientX:e.clientX,clientY:e.clientY}]});this.onTouchMove(t)}},{key:"onTouchMove",value:function(e){var t=this.props,n=t.allowResize,r=t.maxSize,i=t.minSize,o=t.onChange,a=t.split,u=t.step,l=this.state,c=l.active,p=l.position;if(n&&c){s(document,window);var f="first"===this.props.primary,h=f?this.pane1:this.pane2;if(h){var d=m.default.findDOMNode(h);if(d.getBoundingClientRect){var v=d.getBoundingClientRect().width,g=d.getBoundingClientRect().height,y="vertical"===a?e.touches[0].clientX:e.touches[0].clientY,_="vertical"===a?v:g,b=p-y;if(u){if(Math.abs(b)<u)return;b=~~(b/u)*u}var x=f?b:-b,w=r;if(void 0!==r&&r<=0){var k=this.splitPane;w="vertical"===a?k.getBoundingClientRect().width+r:k.getBoundingClientRect().height+r}var E=_-x,S=p-b;E<i?E=i:void 0!==r&&E>w?E=w:this.setState({position:S,resized:!0}),o&&o(E),this.setState({draggedSize:E}),h.setState({size:E})}}}}},{key:"onMouseUp",value:function(){var e=this.props,t=e.allowResize,n=e.onDragFinished,r=this.state,i=r.active,o=r.draggedSize;t&&i&&("function"==typeof n&&n(o),this.setState({active:!1}))}},{key:"setSize",value:function(e,t){var n=this.props.primary,r="first"===n?this.pane1:this.pane2,i=void 0;r&&(i=e.size||t&&t.draggedSize||e.defaultSize||e.minSize,r.setState({size:i}),e.size!==t.draggedSize&&this.setState({draggedSize:i}))}},{key:"render",value:function(){var e=this,t=this.props,n=t.allowResize,r=t.children,i=t.className,o=t.defaultSize,a=t.minSize,s=t.onResizerClick,l=t.onResizerDoubleClick,c=t.paneClassName,f=t.pane1ClassName,h=t.pane2ClassName,d=t.paneStyle,m=t.pane1Style,v=t.pane2Style,g=t.primary,y=t.prefixer,_=t.resizerClassName,b=t.resizerStyle,E=t.size,S=t.split,C=t.style,A=n?"":"disabled",D=_?_+" "+w.RESIZER_DEFAULT_CLASSNAME:_,O=u({},{display:"flex",flex:1,height:"100%",position:"absolute",outline:"none",overflow:"hidden",MozUserSelect:"text",WebkitUserSelect:"text",msUserSelect:"text",userSelect:"text"},C||{});"vertical"===S?u(O,{flexDirection:"row",left:0,right:0}):u(O,{bottom:0,flexDirection:"column",minHeight:"100%",top:0,width:"100%"});var M=["SplitPane",i,S,A],T=y.prefix(u({},d||{},m||{})),P=y.prefix(u({},d||{},v||{})),I=["Pane1",c,f].join(" "),R=["Pane2",c,h].join(" ");return p.default.createElement("div",{className:M.join(" "),ref:function(t){e.splitPane=t},style:y.prefix(O)},p.default.createElement(x.default,{className:I,key:"pane1",ref:function(t){e.pane1=t},size:"first"===g?E||o||a:void 0,split:S,style:T},r[0]),p.default.createElement(k.default,{className:A,onClick:s,onDoubleClick:l,onMouseDown:this.onMouseDown,onTouchStart:this.onTouchStart,onTouchEnd:this.onMouseUp,key:"resizer",ref:function(t){e.resizer=t},resizerClassName:D,split:S,style:b||{}}),p.default.createElement(x.default,{className:R,key:"pane2",ref:function(t){e.pane2=t},size:"second"===g?E||o||a:void 0,split:S,style:P},r[1]))}}]),t}(p.default.Component);S.propTypes={allowResize:h.default.bool,children:h.default.arrayOf(h.default.node).isRequired,className:h.default.string,primary:h.default.oneOf(["first","second"]),minSize:h.default.oneOfType([h.default.string,h.default.number]),maxSize:h.default.oneOfType([h.default.string,h.default.number]),defaultSize:h.default.oneOfType([h.default.string,h.default.number]),size:h.default.oneOfType([h.default.string,h.default.number]),split:h.default.oneOf(["vertical","horizontal"]),onDragStarted:h.default.func,onDragFinished:h.default.func,onChange:h.default.func,onResizerClick:h.default.func,onResizerDoubleClick:h.default.func,prefixer:h.default.instanceOf(g.default).isRequired,style:_.default,resizerStyle:_.default,paneClassName:h.default.string,pane1ClassName:h.default.string,pane2ClassName:h.default.string,paneStyle:_.default,pane1Style:_.default,pane2Style:_.default,resizerClassName:h.default.string,step:h.default.number},S.defaultProps={allowResize:!0,minSize:50,prefixer:new g.default({userAgent:E}),primary:"first",split:"vertical",paneClassName:"",pane1ClassName:"",pane2ClassName:""},t.default=S,e.exports=t.default},function(e,t){e.exports=["alignContent","MozAlignContent","WebkitAlignContent","MSAlignContent","OAlignContent","alignItems","MozAlignItems","WebkitAlignItems","MSAlignItems","OAlignItems","alignSelf","MozAlignSelf","WebkitAlignSelf","MSAlignSelf","OAlignSelf","all","MozAll","WebkitAll","MSAll","OAll","animation","MozAnimation","WebkitAnimation","MSAnimation","OAnimation","animationDelay","MozAnimationDelay","WebkitAnimationDelay","MSAnimationDelay","OAnimationDelay","animationDirection","MozAnimationDirection","WebkitAnimationDirection","MSAnimationDirection","OAnimationDirection","animationDuration","MozAnimationDuration","WebkitAnimationDuration","MSAnimationDuration","OAnimationDuration","animationFillMode","MozAnimationFillMode","WebkitAnimationFillMode","MSAnimationFillMode","OAnimationFillMode","animationIterationCount","MozAnimationIterationCount","WebkitAnimationIterationCount","MSAnimationIterationCount","OAnimationIterationCount","animationName","MozAnimationName","WebkitAnimationName","MSAnimationName","OAnimationName","animationPlayState","MozAnimationPlayState","WebkitAnimationPlayState","MSAnimationPlayState","OAnimationPlayState","animationTimingFunction","MozAnimationTimingFunction","WebkitAnimationTimingFunction","MSAnimationTimingFunction","OAnimationTimingFunction","backfaceVisibility","MozBackfaceVisibility","WebkitBackfaceVisibility","MSBackfaceVisibility","OBackfaceVisibility","background","MozBackground","WebkitBackground","MSBackground","OBackground","backgroundAttachment","MozBackgroundAttachment","WebkitBackgroundAttachment","MSBackgroundAttachment","OBackgroundAttachment","backgroundBlendMode","MozBackgroundBlendMode","WebkitBackgroundBlendMode","MSBackgroundBlendMode","OBackgroundBlendMode","backgroundClip","MozBackgroundClip","WebkitBackgroundClip","MSBackgroundClip","OBackgroundClip","backgroundColor","MozBackgroundColor","WebkitBackgroundColor","MSBackgroundColor","OBackgroundColor","backgroundImage","MozBackgroundImage","WebkitBackgroundImage","MSBackgroundImage","OBackgroundImage","backgroundOrigin","MozBackgroundOrigin","WebkitBackgroundOrigin","MSBackgroundOrigin","OBackgroundOrigin","backgroundPosition","MozBackgroundPosition","WebkitBackgroundPosition","MSBackgroundPosition","OBackgroundPosition","backgroundRepeat","MozBackgroundRepeat","WebkitBackgroundRepeat","MSBackgroundRepeat","OBackgroundRepeat","backgroundSize","MozBackgroundSize","WebkitBackgroundSize","MSBackgroundSize","OBackgroundSize","blockSize","MozBlockSize","WebkitBlockSize","MSBlockSize","OBlockSize","border","MozBorder","WebkitBorder","MSBorder","OBorder","borderBlockEnd","MozBorderBlockEnd","WebkitBorderBlockEnd","MSBorderBlockEnd","OBorderBlockEnd","borderBlockEndColor","MozBorderBlockEndColor","WebkitBorderBlockEndColor","MSBorderBlockEndColor","OBorderBlockEndColor","borderBlockEndStyle","MozBorderBlockEndStyle","WebkitBorderBlockEndStyle","MSBorderBlockEndStyle","OBorderBlockEndStyle","borderBlockEndWidth","MozBorderBlockEndWidth","WebkitBorderBlockEndWidth","MSBorderBlockEndWidth","OBorderBlockEndWidth","borderBlockStart","MozBorderBlockStart","WebkitBorderBlockStart","MSBorderBlockStart","OBorderBlockStart","borderBlockStartColor","MozBorderBlockStartColor","WebkitBorderBlockStartColor","MSBorderBlockStartColor","OBorderBlockStartColor","borderBlockStartStyle","MozBorderBlockStartStyle","WebkitBorderBlockStartStyle","MSBorderBlockStartStyle","OBorderBlockStartStyle","borderBlockStartWidth","MozBorderBlockStartWidth","WebkitBorderBlockStartWidth","MSBorderBlockStartWidth","OBorderBlockStartWidth","borderBottom","MozBorderBottom","WebkitBorderBottom","MSBorderBottom","OBorderBottom","borderBottomColor","MozBorderBottomColor","WebkitBorderBottomColor","MSBorderBottomColor","OBorderBottomColor","borderBottomLeftRadius","MozBorderBottomLeftRadius","WebkitBorderBottomLeftRadius","MSBorderBottomLeftRadius","OBorderBottomLeftRadius","borderBottomRightRadius","MozBorderBottomRightRadius","WebkitBorderBottomRightRadius","MSBorderBottomRightRadius","OBorderBottomRightRadius","borderBottomStyle","MozBorderBottomStyle","WebkitBorderBottomStyle","MSBorderBottomStyle","OBorderBottomStyle","borderBottomWidth","MozBorderBottomWidth","WebkitBorderBottomWidth","MSBorderBottomWidth","OBorderBottomWidth","borderCollapse","MozBorderCollapse","WebkitBorderCollapse","MSBorderCollapse","OBorderCollapse","borderColor","MozBorderColor","WebkitBorderColor","MSBorderColor","OBorderColor","borderImage","MozBorderImage","WebkitBorderImage","MSBorderImage","OBorderImage","borderImageOutset","MozBorderImageOutset","WebkitBorderImageOutset","MSBorderImageOutset","OBorderImageOutset","borderImageRepeat","MozBorderImageRepeat","WebkitBorderImageRepeat","MSBorderImageRepeat","OBorderImageRepeat","borderImageSlice","MozBorderImageSlice","WebkitBorderImageSlice","MSBorderImageSlice","OBorderImageSlice","borderImageSource","MozBorderImageSource","WebkitBorderImageSource","MSBorderImageSource","OBorderImageSource","borderImageWidth","MozBorderImageWidth","WebkitBorderImageWidth","MSBorderImageWidth","OBorderImageWidth","borderInlineEnd","MozBorderInlineEnd","WebkitBorderInlineEnd","MSBorderInlineEnd","OBorderInlineEnd","borderInlineEndColor","MozBorderInlineEndColor","WebkitBorderInlineEndColor","MSBorderInlineEndColor","OBorderInlineEndColor","borderInlineEndStyle","MozBorderInlineEndStyle","WebkitBorderInlineEndStyle","MSBorderInlineEndStyle","OBorderInlineEndStyle","borderInlineEndWidth","MozBorderInlineEndWidth","WebkitBorderInlineEndWidth","MSBorderInlineEndWidth","OBorderInlineEndWidth","borderInlineStart","MozBorderInlineStart","WebkitBorderInlineStart","MSBorderInlineStart","OBorderInlineStart","borderInlineStartColor","MozBorderInlineStartColor","WebkitBorderInlineStartColor","MSBorderInlineStartColor","OBorderInlineStartColor","borderInlineStartStyle","MozBorderInlineStartStyle","WebkitBorderInlineStartStyle","MSBorderInlineStartStyle","OBorderInlineStartStyle","borderInlineStartWidth","MozBorderInlineStartWidth","WebkitBorderInlineStartWidth","MSBorderInlineStartWidth","OBorderInlineStartWidth","borderLeft","MozBorderLeft","WebkitBorderLeft","MSBorderLeft","OBorderLeft","borderLeftColor","MozBorderLeftColor","WebkitBorderLeftColor","MSBorderLeftColor","OBorderLeftColor","borderLeftStyle","MozBorderLeftStyle","WebkitBorderLeftStyle","MSBorderLeftStyle","OBorderLeftStyle","borderLeftWidth","MozBorderLeftWidth","WebkitBorderLeftWidth","MSBorderLeftWidth","OBorderLeftWidth","borderRadius","MozBorderRadius","WebkitBorderRadius","MSBorderRadius","OBorderRadius","borderRight","MozBorderRight","WebkitBorderRight","MSBorderRight","OBorderRight","borderRightColor","MozBorderRightColor","WebkitBorderRightColor","MSBorderRightColor","OBorderRightColor","borderRightStyle","MozBorderRightStyle","WebkitBorderRightStyle","MSBorderRightStyle","OBorderRightStyle","borderRightWidth","MozBorderRightWidth","WebkitBorderRightWidth","MSBorderRightWidth","OBorderRightWidth","borderSpacing","MozBorderSpacing","WebkitBorderSpacing","MSBorderSpacing","OBorderSpacing","borderStyle","MozBorderStyle","WebkitBorderStyle","MSBorderStyle","OBorderStyle","borderTop","MozBorderTop","WebkitBorderTop","MSBorderTop","OBorderTop","borderTopColor","MozBorderTopColor","WebkitBorderTopColor","MSBorderTopColor","OBorderTopColor","borderTopLeftRadius","MozBorderTopLeftRadius","WebkitBorderTopLeftRadius","MSBorderTopLeftRadius","OBorderTopLeftRadius","borderTopRightRadius","MozBorderTopRightRadius","WebkitBorderTopRightRadius","MSBorderTopRightRadius","OBorderTopRightRadius","borderTopStyle","MozBorderTopStyle","WebkitBorderTopStyle","MSBorderTopStyle","OBorderTopStyle","borderTopWidth","MozBorderTopWidth","WebkitBorderTopWidth","MSBorderTopWidth","OBorderTopWidth","borderWidth","MozBorderWidth","WebkitBorderWidth","MSBorderWidth","OBorderWidth","bottom","MozBottom","WebkitBottom","MSBottom","OBottom","boxDecorationBreak","MozBoxDecorationBreak","WebkitBoxDecorationBreak","MSBoxDecorationBreak","OBoxDecorationBreak","boxShadow","MozBoxShadow","WebkitBoxShadow","MSBoxShadow","OBoxShadow","boxSizing","MozBoxSizing","WebkitBoxSizing","MSBoxSizing","OBoxSizing","breakAfter","MozBreakAfter","WebkitBreakAfter","MSBreakAfter","OBreakAfter","breakBefore","MozBreakBefore","WebkitBreakBefore","MSBreakBefore","OBreakBefore","breakInside","MozBreakInside","WebkitBreakInside","MSBreakInside","OBreakInside","captionSide","MozCaptionSide","WebkitCaptionSide","MSCaptionSide","OCaptionSide","caretColor","MozCaretColor","WebkitCaretColor","MSCaretColor","OCaretColor","ch","MozCh","WebkitCh","MSCh","OCh","clear","MozClear","WebkitClear","MSClear","OClear","clip","MozClip","WebkitClip","MSClip","OClip","clipPath","MozClipPath","WebkitClipPath","MSClipPath","OClipPath","cm","MozCm","WebkitCm","MSCm","OCm","color","MozColor","WebkitColor","MSColor","OColor","columnCount","MozColumnCount","WebkitColumnCount","MSColumnCount","OColumnCount","columnFill","MozColumnFill","WebkitColumnFill","MSColumnFill","OColumnFill","columnGap","MozColumnGap","WebkitColumnGap","MSColumnGap","OColumnGap","columnRule","MozColumnRule","WebkitColumnRule","MSColumnRule","OColumnRule","columnRuleColor","MozColumnRuleColor","WebkitColumnRuleColor","MSColumnRuleColor","OColumnRuleColor","columnRuleStyle","MozColumnRuleStyle","WebkitColumnRuleStyle","MSColumnRuleStyle","OColumnRuleStyle","columnRuleWidth","MozColumnRuleWidth","WebkitColumnRuleWidth","MSColumnRuleWidth","OColumnRuleWidth","columnSpan","MozColumnSpan","WebkitColumnSpan","MSColumnSpan","OColumnSpan","columnWidth","MozColumnWidth","WebkitColumnWidth","MSColumnWidth","OColumnWidth","columns","MozColumns","WebkitColumns","MSColumns","OColumns","content","MozContent","WebkitContent","MSContent","OContent","counterIncrement","MozCounterIncrement","WebkitCounterIncrement","MSCounterIncrement","OCounterIncrement","counterReset","MozCounterReset","WebkitCounterReset","MSCounterReset","OCounterReset","cursor","MozCursor","WebkitCursor","MSCursor","OCursor","deg","MozDeg","WebkitDeg","MSDeg","ODeg","direction","MozDirection","WebkitDirection","MSDirection","ODirection","display","MozDisplay","WebkitDisplay","MSDisplay","ODisplay","dpcm","MozDpcm","WebkitDpcm","MSDpcm","ODpcm","dpi","MozDpi","WebkitDpi","MSDpi","ODpi","dppx","MozDppx","WebkitDppx","MSDppx","ODppx","em","MozEm","WebkitEm","MSEm","OEm","emptyCells","MozEmptyCells","WebkitEmptyCells","MSEmptyCells","OEmptyCells","ex","MozEx","WebkitEx","MSEx","OEx","filter","MozFilter","WebkitFilter","MSFilter","OFilter","flexBasis","MozFlexBasis","WebkitFlexBasis","MSFlexBasis","OFlexBasis","flexDirection","MozFlexDirection","WebkitFlexDirection","MSFlexDirection","OFlexDirection","flexFlow","MozFlexFlow","WebkitFlexFlow","MSFlexFlow","OFlexFlow","flexGrow","MozFlexGrow","WebkitFlexGrow","MSFlexGrow","OFlexGrow","flexShrink","MozFlexShrink","WebkitFlexShrink","MSFlexShrink","OFlexShrink","flexWrap","MozFlexWrap","WebkitFlexWrap","MSFlexWrap","OFlexWrap","float","MozFloat","WebkitFloat","MSFloat","OFloat","font","MozFont","WebkitFont","MSFont","OFont","fontFamily","MozFontFamily","WebkitFontFamily","MSFontFamily","OFontFamily","fontFeatureSettings","MozFontFeatureSettings","WebkitFontFeatureSettings","MSFontFeatureSettings","OFontFeatureSettings","fontKerning","MozFontKerning","WebkitFontKerning","MSFontKerning","OFontKerning","fontLanguageOverride","MozFontLanguageOverride","WebkitFontLanguageOverride","MSFontLanguageOverride","OFontLanguageOverride","fontSize","MozFontSize","WebkitFontSize","MSFontSize","OFontSize","fontSizeAdjust","MozFontSizeAdjust","WebkitFontSizeAdjust","MSFontSizeAdjust","OFontSizeAdjust","fontStretch","MozFontStretch","WebkitFontStretch","MSFontStretch","OFontStretch","fontStyle","MozFontStyle","WebkitFontStyle","MSFontStyle","OFontStyle","fontSynthesis","MozFontSynthesis","WebkitFontSynthesis","MSFontSynthesis","OFontSynthesis","fontVariant","MozFontVariant","WebkitFontVariant","MSFontVariant","OFontVariant","fontVariantAlternates","MozFontVariantAlternates","WebkitFontVariantAlternates","MSFontVariantAlternates","OFontVariantAlternates","fontVariantCaps","MozFontVariantCaps","WebkitFontVariantCaps","MSFontVariantCaps","OFontVariantCaps","fontVariantEastAsian","MozFontVariantEastAsian","WebkitFontVariantEastAsian","MSFontVariantEastAsian","OFontVariantEastAsian","fontVariantLigatures","MozFontVariantLigatures","WebkitFontVariantLigatures","MSFontVariantLigatures","OFontVariantLigatures","fontVariantNumeric","MozFontVariantNumeric","WebkitFontVariantNumeric","MSFontVariantNumeric","OFontVariantNumeric","fontVariantPosition","MozFontVariantPosition","WebkitFontVariantPosition","MSFontVariantPosition","OFontVariantPosition","fontWeight","MozFontWeight","WebkitFontWeight","MSFontWeight","OFontWeight","fr","MozFr","WebkitFr","MSFr","OFr","grad","MozGrad","WebkitGrad","MSGrad","OGrad","grid","MozGrid","WebkitGrid","MSGrid","OGrid","gridArea","MozGridArea","WebkitGridArea","MSGridArea","OGridArea","gridAutoColumns","MozGridAutoColumns","WebkitGridAutoColumns","MSGridAutoColumns","OGridAutoColumns","gridAutoFlow","MozGridAutoFlow","WebkitGridAutoFlow","MSGridAutoFlow","OGridAutoFlow","gridAutoRows","MozGridAutoRows","WebkitGridAutoRows","MSGridAutoRows","OGridAutoRows","gridColumn","MozGridColumn","WebkitGridColumn","MSGridColumn","OGridColumn","gridColumnEnd","MozGridColumnEnd","WebkitGridColumnEnd","MSGridColumnEnd","OGridColumnEnd","gridColumnGap","MozGridColumnGap","WebkitGridColumnGap","MSGridColumnGap","OGridColumnGap","gridColumnStart","MozGridColumnStart","WebkitGridColumnStart","MSGridColumnStart","OGridColumnStart","gridGap","MozGridGap","WebkitGridGap","MSGridGap","OGridGap","gridRow","MozGridRow","WebkitGridRow","MSGridRow","OGridRow","gridRowEnd","MozGridRowEnd","WebkitGridRowEnd","MSGridRowEnd","OGridRowEnd","gridRowGap","MozGridRowGap","WebkitGridRowGap","MSGridRowGap","OGridRowGap","gridRowStart","MozGridRowStart","WebkitGridRowStart","MSGridRowStart","OGridRowStart","gridTemplate","MozGridTemplate","WebkitGridTemplate","MSGridTemplate","OGridTemplate","gridTemplateAreas","MozGridTemplateAreas","WebkitGridTemplateAreas","MSGridTemplateAreas","OGridTemplateAreas","gridTemplateColumns","MozGridTemplateColumns","WebkitGridTemplateColumns","MSGridTemplateColumns","OGridTemplateColumns","gridTemplateRows","MozGridTemplateRows","WebkitGridTemplateRows","MSGridTemplateRows","OGridTemplateRows","height","MozHeight","WebkitHeight","MSHeight","OHeight","hyphens","MozHyphens","WebkitHyphens","MSHyphens","OHyphens","hz","MozHz","WebkitHz","MSHz","OHz","imageOrientation","MozImageOrientation","WebkitImageOrientation","MSImageOrientation","OImageOrientation","imageRendering","MozImageRendering","WebkitImageRendering","MSImageRendering","OImageRendering","imageResolution","MozImageResolution","WebkitImageResolution","MSImageResolution","OImageResolution","imeMode","MozImeMode","WebkitImeMode","MSImeMode","OImeMode","in","MozIn","WebkitIn","MSIn","OIn","inherit","MozInherit","WebkitInherit","MSInherit","OInherit","initial","MozInitial","WebkitInitial","MSInitial","OInitial","inlineSize","MozInlineSize","WebkitInlineSize","MSInlineSize","OInlineSize","isolation","MozIsolation","WebkitIsolation","MSIsolation","OIsolation","justifyContent","MozJustifyContent","WebkitJustifyContent","MSJustifyContent","OJustifyContent","khz","MozKhz","WebkitKhz","MSKhz","OKhz","left","MozLeft","WebkitLeft","MSLeft","OLeft","letterSpacing","MozLetterSpacing","WebkitLetterSpacing","MSLetterSpacing","OLetterSpacing","lineBreak","MozLineBreak","WebkitLineBreak","MSLineBreak","OLineBreak","lineHeight","MozLineHeight","WebkitLineHeight","MSLineHeight","OLineHeight","listStyle","MozListStyle","WebkitListStyle","MSListStyle","OListStyle","listStyleImage","MozListStyleImage","WebkitListStyleImage","MSListStyleImage","OListStyleImage","listStylePosition","MozListStylePosition","WebkitListStylePosition","MSListStylePosition","OListStylePosition","listStyleType","MozListStyleType","WebkitListStyleType","MSListStyleType","OListStyleType","margin","MozMargin","WebkitMargin","MSMargin","OMargin","marginBlockEnd","MozMarginBlockEnd","WebkitMarginBlockEnd","MSMarginBlockEnd","OMarginBlockEnd","marginBlockStart","MozMarginBlockStart","WebkitMarginBlockStart","MSMarginBlockStart","OMarginBlockStart","marginBottom","MozMarginBottom","WebkitMarginBottom","MSMarginBottom","OMarginBottom","marginInlineEnd","MozMarginInlineEnd","WebkitMarginInlineEnd","MSMarginInlineEnd","OMarginInlineEnd","marginInlineStart","MozMarginInlineStart","WebkitMarginInlineStart","MSMarginInlineStart","OMarginInlineStart","marginLeft","MozMarginLeft","WebkitMarginLeft","MSMarginLeft","OMarginLeft","marginRight","MozMarginRight","WebkitMarginRight","MSMarginRight","OMarginRight","marginTop","MozMarginTop","WebkitMarginTop","MSMarginTop","OMarginTop","mask","MozMask","WebkitMask","MSMask","OMask","maskClip","MozMaskClip","WebkitMaskClip","MSMaskClip","OMaskClip","maskComposite","MozMaskComposite","WebkitMaskComposite","MSMaskComposite","OMaskComposite","maskImage","MozMaskImage","WebkitMaskImage","MSMaskImage","OMaskImage","maskMode","MozMaskMode","WebkitMaskMode","MSMaskMode","OMaskMode","maskOrigin","MozMaskOrigin","WebkitMaskOrigin","MSMaskOrigin","OMaskOrigin","maskPosition","MozMaskPosition","WebkitMaskPosition","MSMaskPosition","OMaskPosition","maskRepeat","MozMaskRepeat","WebkitMaskRepeat","MSMaskRepeat","OMaskRepeat","maskSize","MozMaskSize","WebkitMaskSize","MSMaskSize","OMaskSize","maskType","MozMaskType","WebkitMaskType","MSMaskType","OMaskType","maxHeight","MozMaxHeight","WebkitMaxHeight","MSMaxHeight","OMaxHeight","maxWidth","MozMaxWidth","WebkitMaxWidth","MSMaxWidth","OMaxWidth","minBlockSize","MozMinBlockSize","WebkitMinBlockSize","MSMinBlockSize","OMinBlockSize","minHeight","MozMinHeight","WebkitMinHeight","MSMinHeight","OMinHeight","minInlineSize","MozMinInlineSize","WebkitMinInlineSize","MSMinInlineSize","OMinInlineSize","minWidth","MozMinWidth","WebkitMinWidth","MSMinWidth","OMinWidth","mixBlendMode","MozMixBlendMode","WebkitMixBlendMode","MSMixBlendMode","OMixBlendMode","mm","MozMm","WebkitMm","MSMm","OMm","ms","MozMs","WebkitMs","MSMs","OMs","objectFit","MozObjectFit","WebkitObjectFit","MSObjectFit","OObjectFit","objectPosition","MozObjectPosition","WebkitObjectPosition","MSObjectPosition","OObjectPosition","offsetBlockEnd","MozOffsetBlockEnd","WebkitOffsetBlockEnd","MSOffsetBlockEnd","OOffsetBlockEnd","offsetBlockStart","MozOffsetBlockStart","WebkitOffsetBlockStart","MSOffsetBlockStart","OOffsetBlockStart","offsetInlineEnd","MozOffsetInlineEnd","WebkitOffsetInlineEnd","MSOffsetInlineEnd","OOffsetInlineEnd","offsetInlineStart","MozOffsetInlineStart","WebkitOffsetInlineStart","MSOffsetInlineStart","OOffsetInlineStart","opacity","MozOpacity","WebkitOpacity","MSOpacity","OOpacity","order","MozOrder","WebkitOrder","MSOrder","OOrder","orphans","MozOrphans","WebkitOrphans","MSOrphans","OOrphans","outline","MozOutline","WebkitOutline","MSOutline","OOutline","outlineColor","MozOutlineColor","WebkitOutlineColor","MSOutlineColor","OOutlineColor","outlineOffset","MozOutlineOffset","WebkitOutlineOffset","MSOutlineOffset","OOutlineOffset","outlineStyle","MozOutlineStyle","WebkitOutlineStyle","MSOutlineStyle","OOutlineStyle","outlineWidth","MozOutlineWidth","WebkitOutlineWidth","MSOutlineWidth","OOutlineWidth","overflow","MozOverflow","WebkitOverflow","MSOverflow","OOverflow","overflowWrap","MozOverflowWrap","WebkitOverflowWrap","MSOverflowWrap","OOverflowWrap","overflowX","MozOverflowX","WebkitOverflowX","MSOverflowX","OOverflowX","overflowY","MozOverflowY","WebkitOverflowY","MSOverflowY","OOverflowY","padding","MozPadding","WebkitPadding","MSPadding","OPadding","paddingBlockEnd","MozPaddingBlockEnd","WebkitPaddingBlockEnd","MSPaddingBlockEnd","OPaddingBlockEnd","paddingBlockStart","MozPaddingBlockStart","WebkitPaddingBlockStart","MSPaddingBlockStart","OPaddingBlockStart","paddingBottom","MozPaddingBottom","WebkitPaddingBottom","MSPaddingBottom","OPaddingBottom","paddingInlineEnd","MozPaddingInlineEnd","WebkitPaddingInlineEnd","MSPaddingInlineEnd","OPaddingInlineEnd","paddingInlineStart","MozPaddingInlineStart","WebkitPaddingInlineStart","MSPaddingInlineStart","OPaddingInlineStart","paddingLeft","MozPaddingLeft","WebkitPaddingLeft","MSPaddingLeft","OPaddingLeft","paddingRight","MozPaddingRight","WebkitPaddingRight","MSPaddingRight","OPaddingRight","paddingTop","MozPaddingTop","WebkitPaddingTop","MSPaddingTop","OPaddingTop","pageBreakAfter","MozPageBreakAfter","WebkitPageBreakAfter","MSPageBreakAfter","OPageBreakAfter","pageBreakBefore","MozPageBreakBefore","WebkitPageBreakBefore","MSPageBreakBefore","OPageBreakBefore","pageBreakInside","MozPageBreakInside","WebkitPageBreakInside","MSPageBreakInside","OPageBreakInside","pc","MozPc","WebkitPc","MSPc","OPc","perspective","MozPerspective","WebkitPerspective","MSPerspective","OPerspective","perspectiveOrigin","MozPerspectiveOrigin","WebkitPerspectiveOrigin","MSPerspectiveOrigin","OPerspectiveOrigin","pointerEvents","MozPointerEvents","WebkitPointerEvents","MSPointerEvents","OPointerEvents","position","MozPosition","WebkitPosition","MSPosition","OPosition","pt","MozPt","WebkitPt","MSPt","OPt","px","MozPx","WebkitPx","MSPx","OPx","q","MozQ","WebkitQ","MSQ","OQ","quotes","MozQuotes","WebkitQuotes","MSQuotes","OQuotes","rad","MozRad","WebkitRad","MSRad","ORad","rem","MozRem","WebkitRem","MSRem","ORem","resize","MozResize","WebkitResize","MSResize","OResize","revert","MozRevert","WebkitRevert","MSRevert","ORevert","right","MozRight","WebkitRight","MSRight","ORight","rubyAlign","MozRubyAlign","WebkitRubyAlign","MSRubyAlign","ORubyAlign","rubyMerge","MozRubyMerge","WebkitRubyMerge","MSRubyMerge","ORubyMerge","rubyPosition","MozRubyPosition","WebkitRubyPosition","MSRubyPosition","ORubyPosition","s","MozS","WebkitS","MSS","OS","scrollBehavior","MozScrollBehavior","WebkitScrollBehavior","MSScrollBehavior","OScrollBehavior","scrollSnapCoordinate","MozScrollSnapCoordinate","WebkitScrollSnapCoordinate","MSScrollSnapCoordinate","OScrollSnapCoordinate","scrollSnapDestination","MozScrollSnapDestination","WebkitScrollSnapDestination","MSScrollSnapDestination","OScrollSnapDestination","scrollSnapType","MozScrollSnapType","WebkitScrollSnapType","MSScrollSnapType","OScrollSnapType","shapeImageThreshold","MozShapeImageThreshold","WebkitShapeImageThreshold","MSShapeImageThreshold","OShapeImageThreshold","shapeMargin","MozShapeMargin","WebkitShapeMargin","MSShapeMargin","OShapeMargin","shapeOutside","MozShapeOutside","WebkitShapeOutside","MSShapeOutside","OShapeOutside","tabSize","MozTabSize","WebkitTabSize","MSTabSize","OTabSize","tableLayout","MozTableLayout","WebkitTableLayout","MSTableLayout","OTableLayout","textAlign","MozTextAlign","WebkitTextAlign","MSTextAlign","OTextAlign","textAlignLast","MozTextAlignLast","WebkitTextAlignLast","MSTextAlignLast","OTextAlignLast","textCombineUpright","MozTextCombineUpright","WebkitTextCombineUpright","MSTextCombineUpright","OTextCombineUpright","textDecoration","MozTextDecoration","WebkitTextDecoration","MSTextDecoration","OTextDecoration","textDecorationColor","MozTextDecorationColor","WebkitTextDecorationColor","MSTextDecorationColor","OTextDecorationColor","textDecorationLine","MozTextDecorationLine","WebkitTextDecorationLine","MSTextDecorationLine","OTextDecorationLine","textDecorationStyle","MozTextDecorationStyle","WebkitTextDecorationStyle","MSTextDecorationStyle","OTextDecorationStyle","textEmphasis","MozTextEmphasis","WebkitTextEmphasis","MSTextEmphasis","OTextEmphasis","textEmphasisColor","MozTextEmphasisColor","WebkitTextEmphasisColor","MSTextEmphasisColor","OTextEmphasisColor","textEmphasisPosition","MozTextEmphasisPosition","WebkitTextEmphasisPosition","MSTextEmphasisPosition","OTextEmphasisPosition","textEmphasisStyle","MozTextEmphasisStyle","WebkitTextEmphasisStyle","MSTextEmphasisStyle","OTextEmphasisStyle","textIndent","MozTextIndent","WebkitTextIndent","MSTextIndent","OTextIndent","textOrientation","MozTextOrientation","WebkitTextOrientation","MSTextOrientation","OTextOrientation","textOverflow","MozTextOverflow","WebkitTextOverflow","MSTextOverflow","OTextOverflow","textRendering","MozTextRendering","WebkitTextRendering","MSTextRendering","OTextRendering","textShadow","MozTextShadow","WebkitTextShadow","MSTextShadow","OTextShadow","textTransform","MozTextTransform","WebkitTextTransform","MSTextTransform","OTextTransform","textUnderlinePosition","MozTextUnderlinePosition","WebkitTextUnderlinePosition","MSTextUnderlinePosition","OTextUnderlinePosition","top","MozTop","WebkitTop","MSTop","OTop","touchAction","MozTouchAction","WebkitTouchAction","MSTouchAction","OTouchAction","transform","MozTransform","WebkitTransform","msTransform","OTransform","transformBox","MozTransformBox","WebkitTransformBox","MSTransformBox","OTransformBox","transformOrigin","MozTransformOrigin","WebkitTransformOrigin","MSTransformOrigin","OTransformOrigin","transformStyle","MozTransformStyle","WebkitTransformStyle","MSTransformStyle","OTransformStyle","transition","MozTransition","WebkitTransition","MSTransition","OTransition","transitionDelay","MozTransitionDelay","WebkitTransitionDelay","MSTransitionDelay","OTransitionDelay","transitionDuration","MozTransitionDuration","WebkitTransitionDuration","MSTransitionDuration","OTransitionDuration","transitionProperty","MozTransitionProperty","WebkitTransitionProperty","MSTransitionProperty","OTransitionProperty","transitionTimingFunction","MozTransitionTimingFunction","WebkitTransitionTimingFunction","MSTransitionTimingFunction","OTransitionTimingFunction","turn","MozTurn","WebkitTurn","MSTurn","OTurn","unicodeBidi","MozUnicodeBidi","WebkitUnicodeBidi","MSUnicodeBidi","OUnicodeBidi","unset","MozUnset","WebkitUnset","MSUnset","OUnset","verticalAlign","MozVerticalAlign","WebkitVerticalAlign","MSVerticalAlign","OVerticalAlign","vh","MozVh","WebkitVh","MSVh","OVh","visibility","MozVisibility","WebkitVisibility","MSVisibility","OVisibility","vmax","MozVmax","WebkitVmax","MSVmax","OVmax","vmin","MozVmin","WebkitVmin","MSVmin","OVmin","vw","MozVw","WebkitVw","MSVw","OVw","whiteSpace","MozWhiteSpace","WebkitWhiteSpace","MSWhiteSpace","OWhiteSpace","widows","MozWidows","WebkitWidows","MSWidows","OWidows","width","MozWidth","WebkitWidth","MSWidth","OWidth","willChange","MozWillChange","WebkitWillChange","MSWillChange","OWillChange","wordBreak","MozWordBreak","WebkitWordBreak","MSWordBreak","OWordBreak","wordSpacing","MozWordSpacing","WebkitWordSpacing","MSWordSpacing","OWordSpacing","wordWrap","MozWordWrap","WebkitWordWrap","MSWordWrap","OWordWrap","writingMode","MozWritingMode","WebkitWritingMode","MSWritingMode","OWritingMode","zIndex","MozZIndex","WebkitZIndex","MSZIndex","OZIndex","fontSize","MozFontSize","WebkitFontSize","MSFontSize","OFontSize","flex","MozFlex","WebkitFlex","MSFlex","OFlex","fr","MozFr","WebkitFr","MSFr","OFr","overflowScrolling","MozOverflowScrolling","WebkitOverflowScrolling","MSOverflowScrolling","OOverflowScrolling"]},function(e,t,n){"use strict";function r(e){var t={"=":"=0",":":"=2"};return"$"+(""+e).replace(/[=:]/g,function(e){return t[e]})}function i(e){var t=/(=0|=2)/g,n={"=0":"=","=2":":"};return(""+("."===e[0]&&"$"===e[1]?e.substring(2):e.substring(1))).replace(t,function(e){return n[e]})}var o={escape:r,unescape:i};e.exports=o},function(e,t,n){"use strict";var r=n(126),i=(n(8),function(e){var t=this;if(t.instancePool.length){var n=t.instancePool.pop();return t.call(n,e),n}return new t(e)}),o=function(e,t){var n=this;if(n.instancePool.length){var r=n.instancePool.pop();return n.call(r,e,t),r}return new n(e,t)},a=function(e,t,n){var r=this;if(r.instancePool.length){var i=r.instancePool.pop();return r.call(i,e,t,n),i}return new r(e,t,n)},s=function(e,t,n,r){var i=this;if(i.instancePool.length){var o=i.instancePool.pop();return i.call(o,e,t,n,r),o}return new i(e,t,n,r)},u=function(e){var t=this;e instanceof t||r("25"),e.destructor(),t.instancePool.length<t.poolSize&&t.instancePool.push(e)},l=i,c=function(e,t){var n=e;return n.instancePool=[],n.getPooled=t||l,n.poolSize||(n.poolSize=10),n.release=u,n},p={addPoolingTo:c,oneArgumentPooler:i,twoArgumentPooler:o,threeArgumentPooler:a,fourArgumentPooler:s};e.exports=p},function(e,t,n){"use strict";function r(e){return(""+e).replace(b,"$&/")}function i(e,t){this.func=e,this.context=t,this.count=0}function o(e,t,n){var r=e.func,i=e.context;r.call(i,t,e.count++)}function a(e,t,n){if(null==e)return e;var r=i.getPooled(t,n);g(e,o,r),i.release(r)}function s(e,t,n,r){this.result=e,this.keyPrefix=t,this.func=n,this.context=r,this.count=0}function u(e,t,n){var i=e.result,o=e.keyPrefix,a=e.func,s=e.context,u=a.call(s,t,e.count++);Array.isArray(u)?l(u,i,n,v.thatReturnsArgument):null!=u&&(m.isValidElement(u)&&(u=m.cloneAndReplaceKey(u,o+(!u.key||t&&t.key===u.key?"":r(u.key)+"/")+n)),i.push(u))}function l(e,t,n,i,o){var a="";null!=n&&(a=r(n)+"/");var l=s.getPooled(t,a,i,o);g(e,u,l),s.release(l)}function c(e,t,n){if(null==e)return e;var r=[];return l(e,r,null,t,n),r}function p(e,t,n){return null}function f(e,t){return g(e,p,null)}function h(e){var t=[];return l(e,t,null,v.thatReturnsArgument),t}var d=n(1099),m=n(93),v=n(32),g=n(1109),y=d.twoArgumentPooler,_=d.fourArgumentPooler,b=/\/+/g;i.prototype.destructor=function(){this.func=null,this.context=null,this.count=0},d.addPoolingTo(i,y),s.prototype.destructor=function(){this.result=null,this.keyPrefix=null,this.func=null,this.context=null,this.count=0},d.addPoolingTo(s,_);var x={forEach:a,map:c,mapIntoWithKeyPrefixInternal:l,count:f,toArray:h};e.exports=x},function(e,t,n){"use strict";var r=n(93),i=r.createFactory,o={a:i("a"),abbr:i("abbr"),address:i("address"),area:i("area"),article:i("article"),aside:i("aside"),audio:i("audio"),b:i("b"),base:i("base"),bdi:i("bdi"),bdo:i("bdo"),big:i("big"),blockquote:i("blockquote"),body:i("body"),br:i("br"),button:i("button"),canvas:i("canvas"),caption:i("caption"),cite:i("cite"),code:i("code"),col:i("col"),colgroup:i("colgroup"),data:i("data"),datalist:i("datalist"),dd:i("dd"),del:i("del"),details:i("details"),dfn:i("dfn"),dialog:i("dialog"),div:i("div"),dl:i("dl"),dt:i("dt"),em:i("em"),embed:i("embed"),fieldset:i("fieldset"),figcaption:i("figcaption"),figure:i("figure"),footer:i("footer"),form:i("form"),h1:i("h1"),h2:i("h2"),h3:i("h3"),h4:i("h4"),h5:i("h5"),h6:i("h6"),head:i("head"),header:i("header"),hgroup:i("hgroup"),hr:i("hr"),html:i("html"),i:i("i"),iframe:i("iframe"),img:i("img"),input:i("input"),ins:i("ins"),kbd:i("kbd"),keygen:i("keygen"),label:i("label"),legend:i("legend"),li:i("li"),link:i("link"),main:i("main"),map:i("map"),mark:i("mark"),menu:i("menu"),menuitem:i("menuitem"),meta:i("meta"),meter:i("meter"),nav:i("nav"),noscript:i("noscript"),object:i("object"),ol:i("ol"),optgroup:i("optgroup"),option:i("option"),output:i("output"),p:i("p"),param:i("param"),picture:i("picture"),pre:i("pre"),progress:i("progress"),q:i("q"),rp:i("rp"),rt:i("rt"),ruby:i("ruby"),s:i("s"),samp:i("samp"),script:i("script"),section:i("section"),select:i("select"),small:i("small"),source:i("source"),span:i("span"),strong:i("strong"),style:i("style"),sub:i("sub"),summary:i("summary"),sup:i("sup"),table:i("table"),tbody:i("tbody"),td:i("td"),textarea:i("textarea"),tfoot:i("tfoot"),th:i("th"),thead:i("thead"),time:i("time"),title:i("title"),tr:i("tr"),track:i("track"),u:i("u"),ul:i("ul"),var:i("var"),video:i("video"),wbr:i("wbr"),circle:i("circle"),clipPath:i("clipPath"),defs:i("defs"),ellipse:i("ellipse"),g:i("g"),image:i("image"),line:i("line"),linearGradient:i("linearGradient"),mask:i("mask"),path:i("path"),pattern:i("pattern"),polygon:i("polygon"),polyline:i("polyline"),radialGradient:i("radialGradient"),rect:i("rect"),stop:i("stop"),svg:i("svg"),text:i("text"),tspan:i("tspan")};e.exports=o},function(e,t,n){"use strict";var r=n(93),i=r.isValidElement,o=n(443);e.exports=o(i)},function(e,t,n){"use strict";e.exports="15.6.2"},function(e,t,n){"use strict";var r=n(474),i=r.Component,o=n(93),a=o.isValidElement,s=n(477),u=n(694);e.exports=u(i,a,s)},function(e,t,n){"use strict";function r(e){var t=e&&(i&&e[i]||e[o]);if("function"==typeof t)return t}var i="function"==typeof Symbol&&Symbol.iterator,o="@@iterator";e.exports=r},function(e,t,n){"use strict";function r(){return i++}var i=1;e.exports=r},function(e,t,n){"use strict";var r=function(){};e.exports=r},function(e,t,n){"use strict";function r(e){return o.isValidElement(e)||i("143"),e}var i=n(126),o=n(93);n(8);e.exports=r},function(e,t,n){"use strict";function r(e,t){return e&&"object"==typeof e&&null!=e.key?l.escape(e.key):t.toString(36)}function i(e,t,n,o){var f=typeof e;if("undefined"!==f&&"boolean"!==f||(e=null),null===e||"string"===f||"number"===f||"object"===f&&e.$$typeof===s)return n(o,e,""===t?c+r(e,0):t),1;var h,d,m=0,v=""===t?c:t+p;if(Array.isArray(e))for(var g=0;g<e.length;g++)h=e[g],d=v+r(h,g),m+=i(h,d,n,o);else{var y=u(e);if(y){var _,b=y.call(e);if(y!==e.entries)for(var x=0;!(_=b.next()).done;)h=_.value,d=v+r(h,x++),m+=i(h,d,n,o);else for(;!(_=b.next()).done;){var w=_.value;w&&(h=w[1],d=v+l.escape(w[0])+p+r(h,0),m+=i(h,d,n,o))}}else if("object"===f){var k="",E=String(e);a("31","[object Object]"===E?"object with keys {"+Object.keys(e).join(", ")+"}":E,k)}}return m}function o(e,t,n){return null==e?0:i(e,"",t,n)}var a=n(126),s=(n(52),n(476)),u=n(1105),l=(n(8),n(1098)),c=(n(10),"."),p=":";e.exports=o},function(e,t,n){e.exports=n(71)},function(e,t,n){"use strict";function r(e){if(!(this instanceof r))return new r(e);i.call(this,e)}e.exports=r;var i=n(480),o=n(111);o.inherits=n(42),o.inherits(r,i),r.prototype._transform=function(e,t,n){n(null,e)}},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t,n){e.copy(t,n)}var o=n(167).Buffer;e.exports=function(){function e(){r(this,e),this.head=null,this.tail=null,this.length=0}return e.prototype.push=function(e){var t={data:e,next:null};this.length>0?this.tail.next=t:this.head=t,this.tail=t,++this.length},e.prototype.unshift=function(e){var t={data:e,next:this.head};0===this.length&&(this.tail=t),this.head=t,++this.length},e.prototype.shift=function(){if(0!==this.length){var e=this.head.data;return 1===this.length?this.head=this.tail=null:this.head=this.head.next,--this.length,e}},e.prototype.clear=function(){this.head=this.tail=null,this.length=0},e.prototype.join=function(e){if(0===this.length)return"";for(var t=this.head,n=""+t.data;t=t.next;)n+=e+t.data;return n},e.prototype.concat=function(e){if(0===this.length)return o.alloc(0);if(1===this.length)return this.head.data;for(var t=o.allocUnsafe(e>>>0),n=this.head,r=0;n;)i(n.data,t,r),r+=n.data.length,n=n.next;return t},e}()},function(e,t,n){e.exports=n(262).PassThrough},function(e,t,n){e.exports=n(262).Transform},function(e,t,n){e.exports=n(261)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(7),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(1119);t.default=function(e){var t=Object.keys(e);return function(){var n=arguments.length<=0||void 0===arguments[0]?i.default.Map():arguments[0],r=arguments[1];return n.withMutations(function(n){t.forEach(function(t){var i=e[t],a=n.get(t),s=i(a,r);(0,o.validateNextState)(s,t,r),n.set(t,s)})})}},e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.combineReducers=void 0;var r=n(1116),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.combineReducers=i.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(7),o=r(i),a=n(483),s=r(a);t.default=function(e,t,n){var r=Object.keys(t);if(!r.length)return"Store does not have a valid reducer. Make sure the argument passed to combineReducers is an object whose values are reducers.";var i=(0,s.default)(n);if(!o.default.Iterable.isIterable(e))return"The "+i+' is of unexpected type. Expected argument to be an instance of Immutable.Iterable with the following properties: "'+r.join('", "')+'".';var a=e.keySeq().toArray().filter(function(e){return!t.hasOwnProperty(e)});return a.length>0?"Unexpected "+(1===a.length?"property":"properties")+' "'+a.join('", "')+'" found in '+i+'. Expected to find one of the known reducer property names instead: "'+r.join('", "')+'". Unexpected properties will be ignored.':null},e.exports=t.default},function(e,t,n){"use strict";"create index";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.validateNextState=t.getUnexpectedInvocationParameterMessage=t.getStateName=void 0;var i=n(483),o=r(i),a=n(1118),s=r(a),u=n(1120),l=r(u);t.getStateName=o.default,t.getUnexpectedInvocationParameterMessage=s.default,t.validateNextState=l.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e,t,n){if(void 0===e)throw new Error('Reducer "'+t+'" returned undefined when handling "'+n.type+'" action. To ignore an action, you must explicitly return the previous state.');return null},e.exports=t.default},function(e,t,n){"use strict";function r(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];return function(e){return function(n,r,a){var s=e(n,r,a),u=s.dispatch,l=[],c={getState:s.getState,dispatch:function(e){return u(e)}};return l=t.map(function(e){return e(c)}),u=i.a.apply(void 0,l)(s.dispatch),o({},s,{dispatch:u})}}}t.a=r;var i=n(484),o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}},function(e,t,n){"use strict";function r(e,t){return function(){return t(e.apply(void 0,arguments))}}function i(e,t){if("function"==typeof e)return r(e,t);if("object"!=typeof e||null===e)throw new Error("bindActionCreators expected an object or a function, instead received "+(null===e?"null":typeof e)+'. Did you write "import ActionCreators from" instead of "import * as ActionCreators from"?');for(var n=Object.keys(e),i={},o=0;o<n.length;o++){var a=n[o],s=e[a];"function"==typeof s&&(i[a]=r(s,t))}return i}t.a=i},function(e,t,n){"use strict";function r(e,t){var n=t&&t.type;return"Given action "+(n&&'"'+n.toString()+'"'||"an action")+', reducer "'+e+'" returned undefined. To ignore an action, you must explicitly return the previous state. If you want this reducer to hold no value, you can return null instead of undefined.'}function i(e){Object.keys(e).forEach(function(t){var n=e[t];if(void 0===n(void 0,{type:a.b.INIT}))throw new Error('Reducer "'+t+"\" returned undefined during initialization. If the state passed to the reducer is undefined, you must explicitly return the initial state. The initial state may not be undefined. If you don't want to set a value for this reducer, you can use null instead of undefined.");if(void 0===n(void 0,{type:"@@redux/PROBE_UNKNOWN_ACTION_"+Math.random().toString(36).substring(7).split("").join(".")}))throw new Error('Reducer "'+t+"\" returned undefined when probed with a random type. Don't try to handle "+a.b.INIT+' or other actions in "redux/*" namespace. They are considered private. Instead, you must return the current state for any unknown actions, unless it is undefined, in which case you must return the initial state, regardless of the action type. The initial state may not be undefined, but can be null.')})}function o(e){for(var t=Object.keys(e),n={},o=0;o<t.length;o++){var a=t[o];"function"==typeof e[a]&&(n[a]=e[a])}var s=Object.keys(n),u=void 0;try{i(n)}catch(e){u=e}return function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=arguments[1];if(u)throw u;for(var i=!1,o={},a=0;a<s.length;a++){var l=s[a],c=n[l],p=e[l],f=c(p,t);if(void 0===f){var h=r(l,t);throw new Error(h)}o[l]=f,i=i||f!==p}return i?o:e}}t.a=o;var a=n(485);n(391),n(487)},function(e,t,n){var r=function(){return this}()||Function("return this")(),i=r.regeneratorRuntime&&Object.getOwnPropertyNames(r).indexOf("regeneratorRuntime")>=0,o=i&&r.regeneratorRuntime;if(r.regeneratorRuntime=void 0,e.exports=n(1125),i)r.regeneratorRuntime=o;else try{delete r.regeneratorRuntime}catch(e){r.regeneratorRuntime=void 0}},function(e,t){!function(t){"use strict";function n(e,t,n,r){var o=t&&t.prototype instanceof i?t:i,a=Object.create(o.prototype),s=new h(r||[]);return a._invoke=l(e,n,s),a}function r(e,t,n){try{return{type:"normal",arg:e.call(t,n)}}catch(e){return{type:"throw",arg:e}}}function i(){}function o(){}function a(){}function s(e){["next","throw","return"].forEach(function(t){e[t]=function(e){return this._invoke(t,e)}})}function u(e){function t(n,i,o,a){var s=r(e[n],e,i);if("throw"!==s.type){var u=s.arg,l=u.value;return l&&"object"==typeof l&&y.call(l,"__await")?Promise.resolve(l.__await).then(function(e){t("next",e,o,a)},function(e){t("throw",e,o,a)}):Promise.resolve(l).then(function(e){u.value=e,o(u)},a)}a(s.arg)}function n(e,n){function r(){return new Promise(function(r,i){t(e,n,r,i)})}return i=i?i.then(r,r):r()}var i;this._invoke=n}function l(e,t,n){var i=S;return function(o,a){if(i===A)throw new Error("Generator is already running");if(i===D){if("throw"===o)throw a;return m()}for(n.method=o,n.arg=a;;){var s=n.delegate;if(s){var u=c(s,n);if(u){if(u===O)continue;return u}}if("next"===n.method)n.sent=n._sent=n.arg;else if("throw"===n.method){if(i===S)throw i=D,n.arg;n.dispatchException(n.arg)}else"return"===n.method&&n.abrupt("return",n.arg);i=A;var l=r(e,t,n);if("normal"===l.type){if(i=n.done?D:C,l.arg===O)continue;return{value:l.arg,done:n.done}}"throw"===l.type&&(i=D,n.method="throw",n.arg=l.arg)}}}function c(e,t){var n=e.iterator[t.method];if(n===v){if(t.delegate=null,"throw"===t.method){if(e.iterator.return&&(t.method="return",t.arg=v,c(e,t),"throw"===t.method))return O;t.method="throw",t.arg=new TypeError("The iterator does not provide a 'throw' method")}return O}var i=r(n,e.iterator,t.arg);if("throw"===i.type)return t.method="throw",t.arg=i.arg,t.delegate=null,O;var o=i.arg;return o?o.done?(t[e.resultName]=o.value,t.next=e.nextLoc,"return"!==t.method&&(t.method="next",t.arg=v),t.delegate=null,O):o:(t.method="throw",t.arg=new TypeError("iterator result is not an object"),t.delegate=null,O)}function p(e){var t={tryLoc:e[0]};1 in e&&(t.catchLoc=e[1]),2 in e&&(t.finallyLoc=e[2],t.afterLoc=e[3]),this.tryEntries.push(t)}function f(e){var t=e.completion||{};t.type="normal",delete t.arg,e.completion=t}function h(e){this.tryEntries=[{tryLoc:"root"}],e.forEach(p,this),this.reset(!0)}function d(e){if(e){var t=e[b];if(t)return t.call(e);if("function"==typeof e.next)return e;if(!isNaN(e.length)){var n=-1,r=function t(){for(;++n<e.length;)if(y.call(e,n))return t.value=e[n],t.done=!1,t;return t.value=v,t.done=!0,t};return r.next=r}}return{next:m}}function m(){return{value:v,done:!0}}var v,g=Object.prototype,y=g.hasOwnProperty,_="function"==typeof Symbol?Symbol:{},b=_.iterator||"@@iterator",x=_.asyncIterator||"@@asyncIterator",w=_.toStringTag||"@@toStringTag",k="object"==typeof e,E=t.regeneratorRuntime;if(E)return void(k&&(e.exports=E));E=t.regeneratorRuntime=k?e.exports:{},E.wrap=n;var S="suspendedStart",C="suspendedYield",A="executing",D="completed",O={},M={};M[b]=function(){return this};var T=Object.getPrototypeOf,P=T&&T(T(d([])));P&&P!==g&&y.call(P,b)&&(M=P);var I=a.prototype=i.prototype=Object.create(M);o.prototype=I.constructor=a,a.constructor=o,a[w]=o.displayName="GeneratorFunction",E.isGeneratorFunction=function(e){var t="function"==typeof e&&e.constructor;return!!t&&(t===o||"GeneratorFunction"===(t.displayName||t.name))},E.mark=function(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,a):(e.__proto__=a,w in e||(e[w]="GeneratorFunction")),e.prototype=Object.create(I),e},E.awrap=function(e){return{__await:e}},s(u.prototype),u.prototype[x]=function(){return this},E.AsyncIterator=u,E.async=function(e,t,r,i){var o=new u(n(e,t,r,i));return E.isGeneratorFunction(t)?o:o.next().then(function(e){return e.done?e.value:o.next()})},s(I),I[w]="Generator",I[b]=function(){return this},I.toString=function(){return"[object Generator]"},E.keys=function(e){var t=[];for(var n in e)t.push(n);return t.reverse(),function n(){for(;t.length;){var r=t.pop();if(r in e)return n.value=r,n.done=!1,n}return n.done=!0,n}},E.values=d,h.prototype={constructor:h,reset:function(e){if(this.prev=0,this.next=0,this.sent=this._sent=v,this.done=!1,this.delegate=null,this.method="next",this.arg=v,this.tryEntries.forEach(f),!e)for(var t in this)"t"===t.charAt(0)&&y.call(this,t)&&!isNaN(+t.slice(1))&&(this[t]=v)},stop:function(){this.done=!0;var e=this.tryEntries[0],t=e.completion;if("throw"===t.type)throw t.arg;return this.rval},dispatchException:function(e){function t(t,r){return o.type="throw",o.arg=e,n.next=t,r&&(n.method="next",n.arg=v),!!r}if(this.done)throw e;for(var n=this,r=this.tryEntries.length-1;r>=0;--r){var i=this.tryEntries[r],o=i.completion;if("root"===i.tryLoc)return t("end");if(i.tryLoc<=this.prev){var a=y.call(i,"catchLoc"),s=y.call(i,"finallyLoc");if(a&&s){if(this.prev<i.catchLoc)return t(i.catchLoc,!0);if(this.prev<i.finallyLoc)return t(i.finallyLoc)}else if(a){if(this.prev<i.catchLoc)return t(i.catchLoc,!0)}else{if(!s)throw new Error("try statement without catch or finally");if(this.prev<i.finallyLoc)return t(i.finallyLoc)}}}},abrupt:function(e,t){for(var n=this.tryEntries.length-1;n>=0;--n){var r=this.tryEntries[n];if(r.tryLoc<=this.prev&&y.call(r,"finallyLoc")&&this.prev<r.finallyLoc){var i=r;break}}i&&("break"===e||"continue"===e)&&i.tryLoc<=t&&t<=i.finallyLoc&&(i=null);var o=i?i.completion:{};return o.type=e,o.arg=t,i?(this.method="next",this.next=i.finallyLoc,O):this.complete(o)},complete:function(e,t){if("throw"===e.type)throw e.arg;return"break"===e.type||"continue"===e.type?this.next=e.arg:"return"===e.type?(this.rval=this.arg=e.arg,this.method="return",this.next="end"):"normal"===e.type&&t&&(this.next=t),O},finish:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var n=this.tryEntries[t];if(n.finallyLoc===e)return this.complete(n.completion,n.afterLoc),f(n),O}},catch:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var n=this.tryEntries[t];if(n.tryLoc===e){var r=n.completion;if("throw"===r.type){var i=r.arg;f(n)}return i}}throw new Error("illegal catch attempt")},delegateYield:function(e,t,n){return this.delegate={iterator:d(e),resultName:t,nextLoc:n},"next"===this.method&&(this.arg=v),O}}}(function(){return this}()||Function("return this")())},function(e,t,n){"use strict";e.exports=n(1133)},function(e,t,n){"use strict";var r={};["article","aside","button","blockquote","body","canvas","caption","col","colgroup","dd","div","dl","dt","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","hr","iframe","li","map","object","ol","output","p","pre","progress","script","section","style","table","tbody","td","textarea","tfoot","th","tr","thead","ul","video"].forEach(function(e){r[e]=!0}),e.exports=r},function(e,t,n){"use strict";function r(e,t){return e=e.source,t=t||"",function n(r,i){return r?(i=i.source||i,e=e.replace(r,i),n):new RegExp(e,t)}}var i=/[a-zA-Z_:][a-zA-Z0-9:._-]*/,o=/[^"'=<>`\x00-\x20]+/,a=/'[^']*'/,s=/"[^"]*"/,u=r(/(?:unquoted|single_quoted|double_quoted)/)("unquoted",o)("single_quoted",a)("double_quoted",s)(),l=r(/(?:\s+attr_name(?:\s*=\s*attr_value)?)/)("attr_name",i)("attr_value",u)(),c=r(/<[A-Za-z][A-Za-z0-9]*attribute*\s*\/?>/)("attribute",l)(),p=/<\/[A-Za-z][A-Za-z0-9]*\s*>/,f=/<!--([^-]+|[-][^-]+)*-->/,h=/<[?].*?[?]>/,d=/<![A-Z]+\s+[^>]*>/,m=/<!\[CDATA\[([^\]]+|\][^\]]|\]\][^>])*\]\]>/,v=r(/^(?:open_tag|close_tag|comment|processing|declaration|cdata)/)("open_tag",c)("close_tag",p)("comment",f)("processing",h)("declaration",d)("cdata",m)();e.exports.HTML_TAG_RE=v},function(e,t,n){"use strict";e.exports=["coap","doi","javascript","aaa","aaas","about","acap","cap","cid","crid","data","dav","dict","dns","file","ftp","geo","go","gopher","h323","http","https","iax","icap","im","imap","info","ipp","iris","iris.beep","iris.xpc","iris.xpcs","iris.lwz","ldap","mailto","mid","msrp","msrps","mtqp","mupdate","news","nfs","ni","nih","nntp","opaquelocktoken","pop","pres","rtsp","service","session","shttp","sieve","sip","sips","sms","snmp","soap.beep","soap.beeps","tag","tel","telnet","tftp","thismessage","tn3270","tip","tv","urn","vemmi","ws","wss","xcon","xcon-userid","xmlrpc.beep","xmlrpc.beeps","xmpp","z39.50r","z39.50s","adiumxtra","afp","afs","aim","apt","attachment","aw","beshare","bitcoin","bolo","callto","chrome","chrome-extension","com-eventbrite-attendee","content","cvs","dlna-playsingle","dlna-playcontainer","dtn","dvb","ed2k","facetime","feed","finger","fish","gg","git","gizmoproject","gtalk","hcp","icon","ipn","irc","irc6","ircs","itms","jar","jms","keyparc","lastfm","ldaps","magnet","maps","market","message","mms","ms-help","msnim","mumble","mvn","notes","oid","palm","paparazzi","platform","proxy","psyc","query","res","resource","rmi","rsync","rtmp","secondlife","sftp","sgn","skype","smb","soldat","spotify","ssh","steam","svn","teamspeak","things","udp","unreal","ut2004","ventrilo","view-source","webcal","wtai","wyciwyg","xfire","xri","ymsgr"]},function(e,t,n){"use strict";e.exports={options:{html:!0,xhtmlOut:!0,breaks:!1,langPrefix:"language-",linkify:!1,linkTarget:"",typographer:!1,quotes:"“”‘’",highlight:null,maxNesting:20},components:{core:{rules:["block","inline","references","abbr2"]},block:{rules:["blockquote","code","fences","heading","hr","htmlblock","lheading","list","paragraph"]},inline:{rules:["autolink","backticks","emphasis","entity","escape","htmltag","links","newline","text"]}}}},function(e,t,n){"use strict";e.exports={options:{html:!1,xhtmlOut:!1,breaks:!1,langPrefix:"language-",linkify:!1,linkTarget:"",typographer:!1,quotes:"“”‘’",highlight:null,maxNesting:20},components:{core:{rules:["block","inline","references","replacements","linkify","smartquotes","references","abbr2","footnote_tail"]},block:{rules:["blockquote","code","fences","footnote","heading","hr","htmlblock","lheading","list","paragraph","table"]},inline:{rules:["autolink","backticks","del","emphasis","entity","escape","footnote_ref","htmltag","links","newline","text"]}}}},function(e,t,n){"use strict";e.exports={options:{html:!1,xhtmlOut:!1,breaks:!1,langPrefix:"language-",linkify:!1,linkTarget:"",typographer:!1,quotes:"“”‘’",highlight:null,maxNesting:20},components:{core:{},block:{},inline:{}}}},function(e,t,n){"use strict";function r(e,t,n){this.src=t,this.env=n,this.options=e.options,this.tokens=[],this.inlineMode=!1,this.inline=e.inline,this.block=e.block,this.renderer=e.renderer,this.typographer=e.typographer}function i(e,t){"string"!=typeof e&&(t=e,e="default"),this.inline=new l,this.block=new u,this.core=new s,this.renderer=new a,this.ruler=new c,this.options={},this.configure(p[e]),this.set(t||{})}var o=n(26).assign,a=n(1137),s=n(1135),u=n(1134),l=n(1136),c=n(166),p={default:n(1131),full:n(1132),commonmark:n(1130)};i.prototype.set=function(e){o(this.options,e)},i.prototype.configure=function(e){var t=this;if(!e)throw new Error("Wrong `remarkable` preset, check name/content");e.options&&t.set(e.options),e.components&&Object.keys(e.components).forEach(function(n){e.components[n].rules&&t[n].ruler.enable(e.components[n].rules,!0)})},i.prototype.use=function(e,t){return e(this,t),this},i.prototype.parse=function(e,t){var n=new r(this,e,t);return this.core.process(n),n.tokens},i.prototype.render=function(e,t){return t=t||{},this.renderer.render(this.parse(e,t),this.options,t)},i.prototype.parseInline=function(e,t){var n=new r(this,e,t);return n.inlineMode=!0,this.core.process(n),n.tokens},i.prototype.renderInline=function(e,t){return t=t||{},this.renderer.render(this.parseInline(e,t),this.options,t)},e.exports=i,e.exports.utils=n(26)},function(e,t,n){"use strict";function r(){this.ruler=new i;for(var e=0;e<a.length;e++)this.ruler.push(a[e][0],a[e][1],{alt:(a[e][2]||[]).slice()})}var i=n(166),o=n(1150),a=[["code",n(1140)],["fences",n(1142),["paragraph","blockquote","list"]],["blockquote",n(1139),["paragraph","blockquote","list"]],["hr",n(1145),["paragraph","blockquote","list"]],["list",n(1148),["paragraph","blockquote"]],["footnote",n(1143),["paragraph"]],["heading",n(1144),["paragraph","blockquote"]],["lheading",n(1147)],["htmlblock",n(1146),["paragraph","blockquote"]],["table",n(1151),["paragraph"]],["deflist",n(1141),["paragraph"]],["paragraph",n(1149)]];r.prototype.tokenize=function(e,t,n){for(var r,i=this.ruler.getRules(""),o=i.length,a=t,s=!1;a<n&&(e.line=a=e.skipEmptyLines(a),!(a>=n))&&!(e.tShift[a]<e.blkIndent);){for(r=0;r<o&&!i[r](e,a,n,!1);r++);if(e.tight=!s,e.isEmpty(e.line-1)&&(s=!0),(a=e.line)<n&&e.isEmpty(a)){if(s=!0,++a<n&&"list"===e.parentType&&e.isEmpty(a))break;e.line=a}}};var s=/[\n\t]/g,u=/\r[\n\u0085]|[\u2424\u2028\u0085]/g,l=/\u00a0/g;r.prototype.parse=function(e,t,n,r){var i,a=0,c=0;if(!e)return[];e=e.replace(l," "),e=e.replace(u,"\n"),e.indexOf("\t")>=0&&(e=e.replace(s,function(t,n){var r;return 10===e.charCodeAt(n)?(a=n+1,c=0,t):(r="    ".slice((n-a-c)%4),c=n-a+1,r)})),i=new o(e,this,t,n,r),this.tokenize(i,i.line,i.lineMax)},e.exports=r},function(e,t,n){"use strict";function r(){this.options={},this.ruler=new i;for(var e=0;e<o.length;e++)this.ruler.push(o[e][0],o[e][1])}var i=n(166),o=[["block",n(1154)],["abbr",n(1152)],["references",n(1158)],["inline",n(1156)],["footnote_tail",n(1155)],["abbr2",n(1153)],["replacements",n(1159)],["smartquotes",n(1160)],["linkify",n(1157)]];r.prototype.process=function(e){var t,n,r;for(r=this.ruler.getRules(""),t=0,n=r.length;t<n;t++)r[t](e)},e.exports=r},function(e,t,n){"use strict";function r(){this.ruler=new o;for(var e=0;e<u.length;e++)this.ruler.push(u[e][0],u[e][1]);this.validateLink=i}function i(e){var t=["vbscript","javascript","file","data"],n=e.trim().toLowerCase();return n=s.replaceEntities(n),-1===n.indexOf(":")||-1===t.indexOf(n.split(":")[0])}var o=n(166),a=n(263),s=n(26),u=[["text",n(1176)],["newline",n(1173)],["escape",n(1166)],["backticks",n(1162)],["del",n(1163)],["ins",n(1170)],["mark",n(1172)],["emphasis",n(1164)],["sub",n(1174)],["sup",n(1175)],["links",n(1171)],["footnote_inline",n(1167)],["footnote_ref",n(1168)],["autolink",n(1161)],["htmltag",n(1169)],["entity",n(1165)]];r.prototype.skipToken=function(e){var t,n,r=this.ruler.getRules(""),i=r.length,o=e.pos;if((n=e.cacheGet(o))>0)return void(e.pos=n);for(t=0;t<i;t++)if(r[t](e,!0))return void e.cacheSet(o,e.pos);e.pos++,e.cacheSet(o,e.pos)},r.prototype.tokenize=function(e){for(var t,n,r=this.ruler.getRules(""),i=r.length,o=e.posMax;e.pos<o;){for(n=0;n<i&&!(t=r[n](e,!1));n++);if(t){if(e.pos>=o)break}else e.pending+=e.src[e.pos++]}e.pending&&e.pushPending()},r.prototype.parse=function(e,t,n,r){var i=new a(e,this,t,n,r);this.tokenize(i)},e.exports=r},function(e,t,n){"use strict";function r(){this.rules=i.assign({},o),this.getBreak=o.getBreak}var i=n(26),o=n(1138);e.exports=r,r.prototype.renderInline=function(e,t,n){for(var r=this.rules,i=e.length,o=0,a="";i--;)a+=r[e[o].type](e,o++,t,n,this);return a},r.prototype.render=function(e,t,n){for(var r=this.rules,i=e.length,o=-1,a="";++o<i;)"inline"===e[o].type?a+=this.renderInline(e[o].children,t,n):a+=r[e[o].type](e,o,t,n,this);return a}},function(e,t,n){"use strict";function r(e,t){return++t>=e.length-2?t:"paragraph_open"===e[t].type&&e[t].tight&&"inline"===e[t+1].type&&0===e[t+1].content.length&&"paragraph_close"===e[t+2].type&&e[t+2].tight?r(e,t+2):t}var i=n(26).has,o=n(26).unescapeMd,a=n(26).replaceEntities,s=n(26).escapeHtml,u={};u.blockquote_open=function(){return"<blockquote>\n"},u.blockquote_close=function(e,t){return"</blockquote>"+l(e,t)},u.code=function(e,t){return e[t].block?"<pre><code>"+s(e[t].content)+"</code></pre>"+l(e,t):"<code>"+s(e[t].content)+"</code>"},u.fence=function(e,t,n,r,u){var c,p,f,h=e[t],d="",m=n.langPrefix,v="";if(h.params){if(c=h.params.split(/\s+/g),p=c.join(" "),i(u.rules.fence_custom,c[0]))return u.rules.fence_custom[c[0]](e,t,n,r,u);v=s(a(o(p))),d=' class="'+m+v+'"'}return f=n.highlight?n.highlight.apply(n.highlight,[h.content].concat(c))||s(h.content):s(h.content),"<pre><code"+d+">"+f+"</code></pre>"+l(e,t)},u.fence_custom={},u.heading_open=function(e,t){return"<h"+e[t].hLevel+">"},u.heading_close=function(e,t){return"</h"+e[t].hLevel+">\n"},u.hr=function(e,t,n){return(n.xhtmlOut?"<hr />":"<hr>")+l(e,t)},u.bullet_list_open=function(){return"<ul>\n"},u.bullet_list_close=function(e,t){return"</ul>"+l(e,t)},u.list_item_open=function(){return"<li>"},u.list_item_close=function(){return"</li>\n"},u.ordered_list_open=function(e,t){var n=e[t];return"<ol"+(n.order>1?' start="'+n.order+'"':"")+">\n"},u.ordered_list_close=function(e,t){return"</ol>"+l(e,t)},u.paragraph_open=function(e,t){return e[t].tight?"":"<p>"},u.paragraph_close=function(e,t){var n=!(e[t].tight&&t&&"inline"===e[t-1].type&&!e[t-1].content);return(e[t].tight?"":"</p>")+(n?l(e,t):"")},u.link_open=function(e,t,n){var r=e[t].title?' title="'+s(a(e[t].title))+'"':"",i=n.linkTarget?' target="'+n.linkTarget+'"':"";return'<a href="'+s(e[t].href)+'"'+r+i+">"},u.link_close=function(){return"</a>"},u.image=function(e,t,n){var r=' src="'+s(e[t].src)+'"',i=e[t].title?' title="'+s(a(e[t].title))+'"':"";return"<img"+r+' alt="'+(e[t].alt?s(a(o(e[t].alt))):"")+'"'+i+(n.xhtmlOut?" /":"")+">"},u.table_open=function(){return"<table>\n"},u.table_close=function(){return"</table>\n"},u.thead_open=function(){return"<thead>\n"},u.thead_close=function(){return"</thead>\n"},u.tbody_open=function(){return"<tbody>\n"},u.tbody_close=function(){return"</tbody>\n"},u.tr_open=function(){return"<tr>"},u.tr_close=function(){return"</tr>\n"},u.th_open=function(e,t){var n=e[t];return"<th"+(n.align?' style="text-align:'+n.align+'"':"")+">"},u.th_close=function(){return"</th>"},u.td_open=function(e,t){var n=e[t];return"<td"+(n.align?' style="text-align:'+n.align+'"':"")+">"},u.td_close=function(){return"</td>"},u.strong_open=function(){return"<strong>"},u.strong_close=function(){return"</strong>"},u.em_open=function(){return"<em>"},u.em_close=function(){return"</em>"},u.del_open=function(){return"<del>"},u.del_close=function(){return"</del>"},u.ins_open=function(){return"<ins>"},u.ins_close=function(){return"</ins>"},u.mark_open=function(){return"<mark>"},u.mark_close=function(){return"</mark>"},u.sub=function(e,t){return"<sub>"+s(e[t].content)+"</sub>"},u.sup=function(e,t){return"<sup>"+s(e[t].content)+"</sup>"},u.hardbreak=function(e,t,n){return n.xhtmlOut?"<br />\n":"<br>\n"},u.softbreak=function(e,t,n){return n.breaks?n.xhtmlOut?"<br />\n":"<br>\n":"\n"},u.text=function(e,t){return s(e[t].content)},u.htmlblock=function(e,t){return e[t].content},u.htmltag=function(e,t){return e[t].content},u.abbr_open=function(e,t){return'<abbr title="'+s(a(e[t].title))+'">'},u.abbr_close=function(){return"</abbr>"},u.footnote_ref=function(e,t){var n=Number(e[t].id+1).toString(),r="fnref"+n;return e[t].subId>0&&(r+=":"+e[t].subId),'<sup class="footnote-ref"><a href="#fn'+n+'" id="'+r+'">['+n+"]</a></sup>"},u.footnote_block_open=function(e,t,n){return(n.xhtmlOut?'<hr class="footnotes-sep" />\n':'<hr class="footnotes-sep">\n')+'<section class="footnotes">\n<ol class="footnotes-list">\n'},u.footnote_block_close=function(){return"</ol>\n</section>\n"},u.footnote_open=function(e,t){return'<li id="fn'+Number(e[t].id+1).toString()+'"  class="footnote-item">'},u.footnote_close=function(){return"</li>\n"},u.footnote_anchor=function(e,t){var n=Number(e[t].id+1).toString(),r="fnref"+n;return e[t].subId>0&&(r+=":"+e[t].subId),' <a href="#'+r+'" class="footnote-backref">↩</a>'},u.dl_open=function(){return"<dl>\n"},u.dt_open=function(){return"<dt>"},u.dd_open=function(){return"<dd>"},u.dl_close=function(){return"</dl>\n"},u.dt_close=function(){return"</dt>\n"},u.dd_close=function(){return"</dd>\n"};var l=u.getBreak=function(e,t){return t=r(e,t),t<e.length&&"list_item_close"===e[t].type?"":"\n"};e.exports=u},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s,u,l,c,p,f,h,d,m=e.bMarks[t]+e.tShift[t],v=e.eMarks[t];if(m>v)return!1;if(62!==e.src.charCodeAt(m++))return!1;if(e.level>=e.options.maxNesting)return!1;if(r)return!0;for(32===e.src.charCodeAt(m)&&m++,u=e.blkIndent,e.blkIndent=0,s=[e.bMarks[t]],e.bMarks[t]=m,m=m<v?e.skipSpaces(m):m,o=m>=v,a=[e.tShift[t]],e.tShift[t]=m-e.bMarks[t],p=e.parser.ruler.getRules("blockquote"),i=t+1;i<n&&(m=e.bMarks[i]+e.tShift[i],v=e.eMarks[i],!(m>=v));i++)if(62!==e.src.charCodeAt(m++)){if(o)break;for(d=!1,f=0,h=p.length;f<h;f++)if(p[f](e,i,n,!0)){d=!0;break}if(d)break;s.push(e.bMarks[i]),a.push(e.tShift[i]),e.tShift[i]=-1337}else 32===e.src.charCodeAt(m)&&m++,s.push(e.bMarks[i]),e.bMarks[i]=m,m=m<v?e.skipSpaces(m):m,o=m>=v,a.push(e.tShift[i]),e.tShift[i]=m-e.bMarks[i];for(l=e.parentType,e.parentType="blockquote",e.tokens.push({type:"blockquote_open",lines:c=[t,0],level:e.level++}),e.parser.tokenize(e,t,i),e.tokens.push({type:"blockquote_close",level:--e.level}),e.parentType=l,c[1]=e.line,f=0;f<a.length;f++)e.bMarks[f+t]=s[f],e.tShift[f+t]=a[f];return e.blkIndent=u,!0}},function(e,t,n){"use strict";e.exports=function(e,t,n){var r,i;if(e.tShift[t]-e.blkIndent<4)return!1;for(i=r=t+1;r<n;)if(e.isEmpty(r))r++;else{if(!(e.tShift[r]-e.blkIndent>=4))break;r++,i=r}return e.line=r,e.tokens.push({type:"code",content:e.getLines(t,i,4+e.blkIndent,!0),block:!0,lines:[t,e.line],level:e.level}),!0}},function(e,t,n){"use strict";function r(e,t){var n,r,i=e.bMarks[t]+e.tShift[t],o=e.eMarks[t];return i>=o?-1:126!==(r=e.src.charCodeAt(i++))&&58!==r?-1:(n=e.skipSpaces(i),i===n?-1:n>=o?-1:n)}function i(e,t){var n,r,i=e.level+2;for(n=t+2,r=e.tokens.length-2;n<r;n++)e.tokens[n].level===i&&"paragraph_open"===e.tokens[n].type&&(e.tokens[n+2].tight=!0,e.tokens[n].tight=!0,n+=2)}e.exports=function(e,t,n,o){var a,s,u,l,c,p,f,h,d,m,v,g,y,_;if(o)return!(e.ddIndent<0)&&r(e,t)>=0;if(f=t+1,e.isEmpty(f)&&++f>n)return!1;if(e.tShift[f]<e.blkIndent)return!1;if((a=r(e,f))<0)return!1;if(e.level>=e.options.maxNesting)return!1;p=e.tokens.length,e.tokens.push({type:"dl_open",lines:c=[t,0],level:e.level++}),u=t,s=f;e:for(;;){for(_=!0,y=!1,e.tokens.push({type:"dt_open",lines:[u,u],level:e.level++}),e.tokens.push({type:"inline",content:e.getLines(u,u+1,e.blkIndent,!1).trim(),level:e.level+1,lines:[u,u],children:[]}),e.tokens.push({type:"dt_close",level:--e.level});;){if(e.tokens.push({type:"dd_open",lines:l=[f,0],level:e.level++}),g=e.tight,d=e.ddIndent,h=e.blkIndent,v=e.tShift[s],m=e.parentType,e.blkIndent=e.ddIndent=e.tShift[s]+2,e.tShift[s]=a-e.bMarks[s],e.tight=!0,e.parentType="deflist",e.parser.tokenize(e,s,n,!0),e.tight&&!y||(_=!1),y=e.line-s>1&&e.isEmpty(e.line-1),e.tShift[s]=v,e.tight=g,e.parentType=m,e.blkIndent=h,e.ddIndent=d,e.tokens.push({type:"dd_close",level:--e.level}),l[1]=f=e.line,f>=n)break e;if(e.tShift[f]<e.blkIndent)break e;if((a=r(e,f))<0)break;s=f}if(f>=n)break;if(u=f,e.isEmpty(u))break;if(e.tShift[u]<e.blkIndent)break;if((s=u+1)>=n)break;if(e.isEmpty(s)&&s++,s>=n)break;if(e.tShift[s]<e.blkIndent)break;if((a=r(e,s))<0)break}return e.tokens.push({type:"dl_close",level:--e.level}),c[1]=f,e.line=f,_&&i(e,p),!0}},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s,u,l=!1,c=e.bMarks[t]+e.tShift[t],p=e.eMarks[t];if(c+3>p)return!1;if(126!==(i=e.src.charCodeAt(c))&&96!==i)return!1;if(u=c,c=e.skipChars(c,i),(o=c-u)<3)return!1;if(a=e.src.slice(c,p).trim(),a.indexOf("`")>=0)return!1;if(r)return!0;for(s=t;!(++s>=n)&&(c=u=e.bMarks[s]+e.tShift[s],p=e.eMarks[s],!(c<p&&e.tShift[s]<e.blkIndent));)if(e.src.charCodeAt(c)===i&&!(e.tShift[s]-e.blkIndent>=4||(c=e.skipChars(c,i))-u<o||(c=e.skipSpaces(c))<p)){l=!0;break}return o=e.tShift[t],e.line=s+(l?1:0),e.tokens.push({type:"fence",params:a,content:e.getLines(t+1,s,o,!0),lines:[t,e.line],level:e.level}),!0}},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s,u,l=e.bMarks[t]+e.tShift[t],c=e.eMarks[t];if(l+4>c)return!1;if(91!==e.src.charCodeAt(l))return!1;if(94!==e.src.charCodeAt(l+1))return!1;if(e.level>=e.options.maxNesting)return!1;for(s=l+2;s<c;s++){if(32===e.src.charCodeAt(s))return!1;if(93===e.src.charCodeAt(s))break}return s!==l+2&&(!(s+1>=c||58!==e.src.charCodeAt(++s))&&(!!r||(s++,e.env.footnotes||(e.env.footnotes={}),e.env.footnotes.refs||(e.env.footnotes.refs={}),u=e.src.slice(l+2,s-2),e.env.footnotes.refs[":"+u]=-1,e.tokens.push({type:"footnote_reference_open",label:u,level:e.level++}),i=e.bMarks[t],o=e.tShift[t],a=e.parentType,e.tShift[t]=e.skipSpaces(s)-s,e.bMarks[t]=s,e.blkIndent+=4,e.parentType="footnote",e.tShift[t]<e.blkIndent&&(e.tShift[t]+=e.blkIndent,e.bMarks[t]-=e.blkIndent),e.parser.tokenize(e,t,n,!0),e.parentType=a,e.blkIndent-=4,e.tShift[t]=o,e.bMarks[t]=i,e.tokens.push({type:"footnote_reference_close",level:--e.level}),!0)))}},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s=e.bMarks[t]+e.tShift[t],u=e.eMarks[t];if(s>=u)return!1;if(35!==(i=e.src.charCodeAt(s))||s>=u)return!1;for(o=1,i=e.src.charCodeAt(++s);35===i&&s<u&&o<=6;)o++,i=e.src.charCodeAt(++s);return!(o>6||s<u&&32!==i)&&(!!r||(u=e.skipCharsBack(u,32,s),a=e.skipCharsBack(u,35,s),a>s&&32===e.src.charCodeAt(a-1)&&(u=a),e.line=t+1,e.tokens.push({type:"heading_open",hLevel:o,lines:[t,e.line],level:e.level}),s<u&&e.tokens.push({type:"inline",content:e.src.slice(s,u).trim(),level:e.level+1,lines:[t,e.line],children:[]}),e.tokens.push({type:"heading_close",hLevel:o,level:e.level}),!0))}},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s=e.bMarks[t],u=e.eMarks[t];if((s+=e.tShift[t])>u)return!1;if(42!==(i=e.src.charCodeAt(s++))&&45!==i&&95!==i)return!1;for(o=1;s<u;){if((a=e.src.charCodeAt(s++))!==i&&32!==a)return!1;a===i&&o++}return!(o<3)&&(!!r||(e.line=t+1,e.tokens.push({type:"hr",lines:[t,e.line],level:e.level}),!0))}},function(e,t,n){"use strict";function r(e){var t=32|e;return t>=97&&t<=122}var i=n(1127),o=/^<([a-zA-Z]{1,15})[\s\/>]/,a=/^<\/([a-zA-Z]{1,15})[\s>]/;e.exports=function(e,t,n,s){var u,l,c,p=e.bMarks[t],f=e.eMarks[t],h=e.tShift[t];if(p+=h,!e.options.html)return!1;if(h>3||p+2>=f)return!1;if(60!==e.src.charCodeAt(p))return!1;if(33===(u=e.src.charCodeAt(p+1))||63===u){if(s)return!0}else{if(47!==u&&!r(u))return!1;if(47===u){if(!(l=e.src.slice(p,f).match(a)))return!1}else if(!(l=e.src.slice(p,f).match(o)))return!1;if(!0!==i[l[1].toLowerCase()])return!1;if(s)return!0}for(c=t+1;c<e.lineMax&&!e.isEmpty(c);)c++;return e.line=c,e.tokens.push({type:"htmlblock",level:e.level,lines:[t,e.line],content:e.getLines(t,c,0,!0)}),!0}},function(e,t,n){"use strict";e.exports=function(e,t,n){var r,i,o,a=t+1;return!(a>=n)&&(!(e.tShift[a]<e.blkIndent)&&(!(e.tShift[a]-e.blkIndent>3)&&(i=e.bMarks[a]+e.tShift[a],o=e.eMarks[a],!(i>=o)&&((45===(r=e.src.charCodeAt(i))||61===r)&&(i=e.skipChars(i,r),!((i=e.skipSpaces(i))<o)&&(i=e.bMarks[t]+e.tShift[t],e.line=a+1,e.tokens.push({type:"heading_open",hLevel:61===r?1:2,lines:[t,e.line],level:e.level}),e.tokens.push({type:"inline",content:e.src.slice(i,e.eMarks[t]).trim(),level:e.level+1,lines:[t,e.line-1],children:[]}),e.tokens.push({type:"heading_close",hLevel:61===r?1:2,level:e.level}),!0))))))}},function(e,t,n){"use strict";function r(e,t){var n,r,i;return r=e.bMarks[t]+e.tShift[t],i=e.eMarks[t],r>=i?-1:(n=e.src.charCodeAt(r++),42!==n&&45!==n&&43!==n?-1:r<i&&32!==e.src.charCodeAt(r)?-1:r)}function i(e,t){var n,r=e.bMarks[t]+e.tShift[t],i=e.eMarks[t];if(r+1>=i)return-1;if((n=e.src.charCodeAt(r++))<48||n>57)return-1;for(;;){if(r>=i)return-1;if(!((n=e.src.charCodeAt(r++))>=48&&n<=57)){if(41===n||46===n)break;return-1}}return r<i&&32!==e.src.charCodeAt(r)?-1:r}function o(e,t){var n,r,i=e.level+2;for(n=t+2,r=e.tokens.length-2;n<r;n++)e.tokens[n].level===i&&"paragraph_open"===e.tokens[n].type&&(e.tokens[n+2].tight=!0,e.tokens[n].tight=!0,n+=2)}e.exports=function(e,t,n,a){var s,u,l,c,p,f,h,d,m,v,g,y,_,b,x,w,k,E,S,C,A,D,O=!0;if((d=i(e,t))>=0)_=!0;else{if(!((d=r(e,t))>=0))return!1;_=!1}if(e.level>=e.options.maxNesting)return!1;if(y=e.src.charCodeAt(d-1),a)return!0;for(x=e.tokens.length,_?(h=e.bMarks[t]+e.tShift[t],g=Number(e.src.substr(h,d-h-1)),e.tokens.push({type:"ordered_list_open",order:g,lines:k=[t,0],level:e.level++})):e.tokens.push({type:"bullet_list_open",lines:k=[t,0],level:e.level++}),s=t,w=!1,S=e.parser.ruler.getRules("list");!(!(s<n)||(b=e.skipSpaces(d),m=e.eMarks[s],v=b>=m?1:b-d,v>4&&(v=1),v<1&&(v=1),u=d-e.bMarks[s]+v,e.tokens.push({type:"list_item_open",lines:E=[t,0],level:e.level++}),c=e.blkIndent,p=e.tight,l=e.tShift[t],f=e.parentType,e.tShift[t]=b-e.bMarks[t],e.blkIndent=u,e.tight=!0,e.parentType="list",e.parser.tokenize(e,t,n,!0),e.tight&&!w||(O=!1),w=e.line-t>1&&e.isEmpty(e.line-1),e.blkIndent=c,e.tShift[t]=l,e.tight=p,e.parentType=f,e.tokens.push({type:"list_item_close",level:--e.level}),s=t=e.line,E[1]=s,b=e.bMarks[t],s>=n)||e.isEmpty(s)||e.tShift[s]<e.blkIndent);){for(D=!1,C=0,A=S.length;C<A;C++)if(S[C](e,s,n,!0)){D=!0;break}if(D)break;if(_){if((d=i(e,s))<0)break}else if((d=r(e,s))<0)break;if(y!==e.src.charCodeAt(d-1))break}return e.tokens.push({type:_?"ordered_list_close":"bullet_list_close",level:--e.level}),k[1]=s,e.line=s,O&&o(e,x),!0}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s,u=t+1;if(n=e.lineMax,u<n&&!e.isEmpty(u))for(s=e.parser.ruler.getRules("paragraph");u<n&&!e.isEmpty(u);u++)if(!(e.tShift[u]-e.blkIndent>3)){for(i=!1,o=0,a=s.length;o<a;o++)if(s[o](e,u,n,!0)){i=!0;break}if(i)break}return r=e.getLines(t,u,e.blkIndent,!1).trim(),e.line=u,r.length&&(e.tokens.push({type:"paragraph_open",tight:!1,lines:[t,e.line],level:e.level}),e.tokens.push({type:"inline",content:r,level:e.level+1,lines:[t,e.line],children:[]}),e.tokens.push({type:"paragraph_close",tight:!1,level:e.level})),!0}},function(e,t,n){"use strict";function r(e,t,n,r,i){var o,a,s,u,l,c,p;for(this.src=e,this.parser=t,this.options=n,this.env=r,this.tokens=i,this.bMarks=[],this.eMarks=[],this.tShift=[],this.blkIndent=0,this.line=0,this.lineMax=0,this.tight=!1,this.parentType="root",this.ddIndent=-1,this.level=0,this.result="",a=this.src,c=0,p=!1,s=u=c=0,l=a.length;u<l;u++){if(o=a.charCodeAt(u),!p){if(32===o){c++;continue}p=!0}10!==o&&u!==l-1||(10!==o&&u++,this.bMarks.push(s),this.eMarks.push(u),this.tShift.push(c),p=!1,c=0,s=u+1)}this.bMarks.push(a.length),this.eMarks.push(a.length),this.tShift.push(0),this.lineMax=this.bMarks.length-1}r.prototype.isEmpty=function(e){return this.bMarks[e]+this.tShift[e]>=this.eMarks[e]},r.prototype.skipEmptyLines=function(e){for(var t=this.lineMax;e<t&&!(this.bMarks[e]+this.tShift[e]<this.eMarks[e]);e++);return e},r.prototype.skipSpaces=function(e){for(var t=this.src.length;e<t&&32===this.src.charCodeAt(e);e++);return e},r.prototype.skipChars=function(e,t){for(var n=this.src.length;e<n&&this.src.charCodeAt(e)===t;e++);return e},r.prototype.skipCharsBack=function(e,t,n){if(e<=n)return e;for(;e>n;)if(t!==this.src.charCodeAt(--e))return e+1;return e},r.prototype.getLines=function(e,t,n,r){var i,o,a,s,u,l=e;if(e>=t)return"";if(l+1===t)return o=this.bMarks[l]+Math.min(this.tShift[l],n),a=r?this.eMarks[l]+1:this.eMarks[l],this.src.slice(o,a);for(s=new Array(t-e),i=0;l<t;l++,i++)u=this.tShift[l],u>n&&(u=n),u<0&&(u=0),o=this.bMarks[l]+u,a=l+1<t||r?this.eMarks[l]+1:this.eMarks[l],s[i]=this.src.slice(o,a);return s.join("")},e.exports=r},function(e,t,n){"use strict";function r(e,t){var n=e.bMarks[t]+e.blkIndent,r=e.eMarks[t];return e.src.substr(n,r-n)}e.exports=function(e,t,n,i){var o,a,s,u,l,c,p,f,h,d,m;if(t+2>n)return!1;if(l=t+1,e.tShift[l]<e.blkIndent)return!1;if((s=e.bMarks[l]+e.tShift[l])>=e.eMarks[l])return!1;if(124!==(o=e.src.charCodeAt(s))&&45!==o&&58!==o)return!1;if(a=r(e,t+1),!/^[-:| ]+$/.test(a))return!1;if((c=a.split("|"))<=2)return!1;for(f=[],u=0;u<c.length;u++){if(!(h=c[u].trim())){if(0===u||u===c.length-1)continue;return!1}if(!/^:?-+:?$/.test(h))return!1;58===h.charCodeAt(h.length-1)?f.push(58===h.charCodeAt(0)?"center":"right"):58===h.charCodeAt(0)?f.push("left"):f.push("")}if(a=r(e,t).trim(),-1===a.indexOf("|"))return!1;if(c=a.replace(/^\||\|$/g,"").split("|"),f.length!==c.length)return!1;if(i)return!0;for(e.tokens.push({type:"table_open",lines:d=[t,0],level:e.level++}),e.tokens.push({type:"thead_open",lines:[t,t+1],level:e.level++}),e.tokens.push({type:"tr_open",lines:[t,t+1],level:e.level++}),u=0;u<c.length;u++)e.tokens.push({type:"th_open",align:f[u],lines:[t,t+1],level:e.level++}),e.tokens.push({type:"inline",content:c[u].trim(),lines:[t,t+1],level:e.level,children:[]}),e.tokens.push({type:"th_close",level:--e.level});for(e.tokens.push({type:"tr_close",level:--e.level}),e.tokens.push({type:"thead_close",level:--e.level}),e.tokens.push({type:"tbody_open",lines:m=[t+2,0],level:e.level++}),l=t+2;l<n&&!(e.tShift[l]<e.blkIndent)&&(a=r(e,l).trim(),-1!==a.indexOf("|"));l++){for(c=a.replace(/^\||\|$/g,"").split("|"),e.tokens.push({type:"tr_open",level:e.level++}),u=0;u<c.length;u++)e.tokens.push({type:"td_open",align:f[u],level:e.level++}),p=c[u].substring(124===c[u].charCodeAt(0)?1:0,124===c[u].charCodeAt(c[u].length-1)?c[u].length-1:c[u].length).trim(),e.tokens.push({type:"inline",content:p,level:e.level,children:[]}),e.tokens.push({type:"td_close",level:--e.level});e.tokens.push({type:"tr_close",level:--e.level})}return e.tokens.push({type:"tbody_close",level:--e.level}),e.tokens.push({type:"table_close",level:--e.level}),d[1]=m[1]=l,e.line=l,!0}},function(e,t,n){"use strict";function r(e,t,n,r){var a,s,u,l,c,p;if(42!==e.charCodeAt(0))return-1;if(91!==e.charCodeAt(1))return-1;if(-1===e.indexOf("]:"))return-1;if(a=new i(e,t,n,r,[]),(s=o(a,1))<0||58!==e.charCodeAt(s+1))return-1;for(l=a.posMax,u=s+2;u<l&&10!==a.src.charCodeAt(u);u++);return c=e.slice(2,s),p=e.slice(s+2,u).trim(),0===p.length?-1:(r.abbreviations||(r.abbreviations={}),void 0===r.abbreviations[":"+c]&&(r.abbreviations[":"+c]=p),u)}var i=n(263),o=n(165);e.exports=function(e){var t,n,i,o,a=e.tokens;if(!e.inlineMode)for(t=1,n=a.length-1;t<n;t++)if("paragraph_open"===a[t-1].type&&"inline"===a[t].type&&"paragraph_close"===a[t+1].type){for(i=a[t].content;i.length&&!((o=r(i,e.inline,e.options,e.env))<0);)i=i.slice(o).trim();a[t].content=i,i.length||(a[t-1].tight=!0,a[t+1].tight=!0)}}},function(e,t,n){"use strict";function r(e){return e.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,"\\$1")}var i=" \n()[]'\".,!?-";e.exports=function(e){var t,n,o,a,s,u,l,c,p,f,h,d,m=e.tokens;if(e.env.abbreviations)for(e.env.abbrRegExp||(d="(^|["+i.split("").map(r).join("")+"])("+Object.keys(e.env.abbreviations).map(function(e){return e.substr(1)}).sort(function(e,t){return t.length-e.length}).map(r).join("|")+")($|["+i.split("").map(r).join("")+"])",e.env.abbrRegExp=new RegExp(d,"g")),f=e.env.abbrRegExp,n=0,o=m.length;n<o;n++)if("inline"===m[n].type)for(a=m[n].children,t=a.length-1;t>=0;t--)if(s=a[t],"text"===s.type){for(c=0,u=s.content,f.lastIndex=0,p=s.level,l=[];h=f.exec(u);)f.lastIndex>c&&l.push({type:"text",content:u.slice(c,h.index+h[1].length),level:p}),l.push({type:"abbr_open",title:e.env.abbreviations[":"+h[2]],level:p++}),l.push({type:"text",content:h[2],level:p}),l.push({type:"abbr_close",level:--p}),c=f.lastIndex-h[3].length;l.length&&(c<u.length&&l.push({type:"text",content:u.slice(c),level:p}),m[n].children=a=[].concat(a.slice(0,t),l,a.slice(t+1)))}}},function(e,t,n){"use strict";e.exports=function(e){e.inlineMode?e.tokens.push({type:"inline",content:e.src.replace(/\n/g," ").trim(),level:0,lines:[0,1],children:[]}):e.block.parse(e.src,e.options,e.env,e.tokens)}},function(e,t,n){"use strict";e.exports=function(e){var t,n,r,i,o,a,s,u,l,c=0,p=!1,f={};if(e.env.footnotes&&(e.tokens=e.tokens.filter(function(e){return"footnote_reference_open"===e.type?(p=!0,u=[],l=e.label,!1):"footnote_reference_close"===e.type?(p=!1,f[":"+l]=u,!1):(p&&u.push(e),!p)}),e.env.footnotes.list)){for(a=e.env.footnotes.list,e.tokens.push({type:"footnote_block_open",level:c++}),t=0,n=a.length;t<n;t++){for(e.tokens.push({type:"footnote_open",id:t,level:c++}),a[t].tokens?(s=[],s.push({type:"paragraph_open",tight:!1,level:c++}),s.push({type:"inline",content:"",level:c,children:a[t].tokens}),s.push({type:"paragraph_close",tight:!1,level:--c})):a[t].label&&(s=f[":"+a[t].label]),e.tokens=e.tokens.concat(s),o="paragraph_close"===e.tokens[e.tokens.length-1].type?e.tokens.pop():null,i=a[t].count>0?a[t].count:1,r=0;r<i;r++)e.tokens.push({type:"footnote_anchor",id:t,subId:r,level:c});o&&e.tokens.push(o),e.tokens.push({type:"footnote_close",level:--c})}e.tokens.push({type:"footnote_block_close",level:--c})}}},function(e,t,n){"use strict";e.exports=function(e){var t,n,r,i=e.tokens;for(n=0,r=i.length;n<r;n++)t=i[n],"inline"===t.type&&e.inline.parse(t.content,e.options,e.env,t.children)}},function(e,t,n){"use strict";function r(e){return/^<a[>\s]/i.test(e)}function i(e){return/^<\/a\s*>/i.test(e)}function o(){var e=[],t=new a({stripPrefix:!1,url:!0,email:!0,twitter:!1,replaceFn:function(t,n){switch(n.getType()){case"url":e.push({text:n.matchedText,url:n.getUrl()});break;case"email":e.push({text:n.matchedText,url:"mailto:"+n.getEmail().replace(/^mailto:/i,"")})}return!1}});return{links:e,autolinker:t}}var a=n(508),s=/www|@|\:\/\//;e.exports=function(e){var t,n,a,u,l,c,p,f,h,d,m,v,g,y=e.tokens,_=null;if(e.options.linkify)for(n=0,a=y.length;n<a;n++)if("inline"===y[n].type)for(u=y[n].children,m=0,t=u.length-1;t>=0;t--)if(l=u[t],"link_close"!==l.type){if("htmltag"===l.type&&(r(l.content)&&m>0&&m--,i(l.content)&&m++),!(m>0)&&"text"===l.type&&s.test(l.content)){if(_||(_=o(),v=_.links,g=_.autolinker),c=l.content,v.length=0,g.link(c),!v.length)continue;for(p=[],d=l.level,f=0;f<v.length;f++)e.inline.validateLink(v[f].url)&&(h=c.indexOf(v[f].text),h&&(d=d,p.push({type:"text",content:c.slice(0,h),level:d})),p.push({type:"link_open",href:v[f].url,title:"",level:d++}),p.push({type:"text",content:v[f].text,level:d}),p.push({type:"link_close",level:--d}),c=c.slice(h+v[f].text.length));c.length&&p.push({type:"text",content:c,level:d}),y[n].children=u=[].concat(u.slice(0,t),p,u.slice(t+1))}}else for(t--;u[t].level!==l.level&&"link_open"!==u[t].type;)t--}},function(e,t,n){"use strict";function r(e,t,n,r){var l,c,p,f,h,d,m,v,g;if(91!==e.charCodeAt(0))return-1;if(-1===e.indexOf("]:"))return-1;if(l=new i(e,t,n,r,[]),(c=o(l,0))<0||58!==e.charCodeAt(c+1))return-1;for(f=l.posMax,p=c+2;p<f&&(32===(h=l.src.charCodeAt(p))||10===h);p++);if(!a(l,p))return-1;for(m=l.linkContent,p=l.pos,d=p,p+=1;p<f&&(32===(h=l.src.charCodeAt(p))||10===h);p++);for(p<f&&d!==p&&s(l,p)?(v=l.linkContent,p=l.pos):(v="",p=d);p<f&&32===l.src.charCodeAt(p);)p++;return p<f&&10!==l.src.charCodeAt(p)?-1:(g=u(e.slice(1,c)),void 0===r.references[g]&&(r.references[g]={title:v,href:m}),p)}var i=n(263),o=n(165),a=n(491),s=n(492),u=n(490);e.exports=function(e){var t,n,i,o,a=e.tokens;if(e.env.references=e.env.references||{},!e.inlineMode)for(t=1,n=a.length-1;t<n;t++)if("inline"===a[t].type&&"paragraph_open"===a[t-1].type&&"paragraph_close"===a[t+1].type){for(i=a[t].content;i.length&&!((o=r(i,e.inline,e.options,e.env))<0);)i=i.slice(o).trim();a[t].content=i,i.length||(a[t-1].tight=!0,a[t+1].tight=!0)}}},function(e,t,n){"use strict";function r(e){return e.indexOf("(")<0?e:e.replace(o,function(e,t){return a[t.toLowerCase()]})}var i=/\+-|\.\.|\?\?\?\?|!!!!|,,|--/,o=/\((c|tm|r|p)\)/gi,a={c:"©",r:"®",p:"§",tm:"™"};e.exports=function(e){var t,n,o,a,s;if(e.options.typographer)for(s=e.tokens.length-1;s>=0;s--)if("inline"===e.tokens[s].type)for(a=e.tokens[s].children,t=a.length-1;t>=0;t--)n=a[t],"text"===n.type&&(o=n.content,o=r(o),i.test(o)&&(o=o.replace(/\+-/g,"±").replace(/\.{2,}/g,"…").replace(/([?!])…/g,"$1..").replace(/([?!]){4,}/g,"$1$1$1").replace(/,{2,}/g,",").replace(/(^|[^-])---([^-]|$)/gm,"$1—$2").replace(/(^|\s)--(\s|$)/gm,"$1–$2").replace(/(^|[^-\s])--([^-\s]|$)/gm,"$1–$2")),n.content=o)}},function(e,t,n){"use strict";function r(e,t){return!(t<0||t>=e.length)&&!s.test(e[t])}function i(e,t,n){return e.substr(0,t)+n+e.substr(t+1)}var o=/['"]/,a=/['"]/g,s=/[-\s()\[\]]/;e.exports=function(e){var t,n,s,u,l,c,p,f,h,d,m,v,g,y,_,b,x;if(e.options.typographer)for(x=[],_=e.tokens.length-1;_>=0;_--)if("inline"===e.tokens[_].type)for(b=e.tokens[_].children,x.length=0,t=0;t<b.length;t++)if(n=b[t],"text"===n.type&&!o.test(n.text)){for(p=b[t].level,g=x.length-1;g>=0&&!(x[g].level<=p);g--);x.length=g+1,s=n.content,l=0,c=s.length;e:for(;l<c&&(a.lastIndex=l,u=a.exec(s));)if(f=!r(s,u.index-1),l=u.index+1,y="'"===u[0],(h=!r(s,l))||f){if(m=!h,v=!f)for(g=x.length-1;g>=0&&(d=x[g],!(x[g].level<p));g--)if(d.single===y&&x[g].level===p){d=x[g],y?(b[d.token].content=i(b[d.token].content,d.pos,e.options.quotes[2]),n.content=i(n.content,u.index,e.options.quotes[3])):(b[d.token].content=i(b[d.token].content,d.pos,e.options.quotes[0]),n.content=i(n.content,u.index,e.options.quotes[1])),x.length=g;continue e}m?x.push({token:t,pos:u.index,single:y,level:p}):v&&y&&(n.content=i(n.content,u.index,"’"))}else y&&(n.content=i(n.content,u.index,"’"))}}},function(e,t,n){"use strict";var r=n(1129),i=n(489),o=/^<([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/,a=/^<([a-zA-Z.\-]{1,25}):([^<>\x00-\x20]*)>/;e.exports=function(e,t){var n,s,u,l,c,p=e.pos;return 60===e.src.charCodeAt(p)&&(n=e.src.slice(p),!(n.indexOf(">")<0)&&((s=n.match(a))?!(r.indexOf(s[1].toLowerCase())<0)&&(l=s[0].slice(1,-1),c=i(l),!!e.parser.validateLink(l)&&(t||(e.push({type:"link_open",href:c,level:e.level}),e.push({type:"text",content:l,level:e.level+1}),e.push({type:"link_close",level:e.level})),e.pos+=s[0].length,!0)):!!(u=n.match(o))&&(l=u[0].slice(1,-1),c=i("mailto:"+l),!!e.parser.validateLink(c)&&(t||(e.push({type:"link_open",href:c,level:e.level}),e.push({type:"text",content:l,level:e.level+1}),e.push({type:"link_close",level:e.level})),e.pos+=u[0].length,!0))))}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s=e.pos;if(96!==e.src.charCodeAt(s))return!1;for(n=s,s++,r=e.posMax;s<r&&96===e.src.charCodeAt(s);)s++;for(i=e.src.slice(n,s),o=a=s;-1!==(o=e.src.indexOf("`",a));){for(a=o+1;a<r&&96===e.src.charCodeAt(a);)a++;if(a-o===i.length)return t||e.push({type:"code",content:e.src.slice(s,o).replace(/[ \n]+/g," ").trim(),block:!1,level:e.level}),e.pos=a,!0}return t||(e.pending+=i),e.pos+=i.length,!0}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s=e.posMax,u=e.pos;if(126!==e.src.charCodeAt(u))return!1;if(t)return!1;if(u+4>=s)return!1;if(126!==e.src.charCodeAt(u+1))return!1;if(e.level>=e.options.maxNesting)return!1;if(o=u>0?e.src.charCodeAt(u-1):-1,a=e.src.charCodeAt(u+2),126===o)return!1;if(126===a)return!1;if(32===a||10===a)return!1;for(r=u+2;r<s&&126===e.src.charCodeAt(r);)r++;if(r>u+3)return e.pos+=r-u,t||(e.pending+=e.src.slice(u,r)),!0;for(e.pos=u+2,i=1;e.pos+1<s;){if(126===e.src.charCodeAt(e.pos)&&126===e.src.charCodeAt(e.pos+1)&&(o=e.src.charCodeAt(e.pos-1),126!==(a=e.pos+2<s?e.src.charCodeAt(e.pos+2):-1)&&126!==o&&(32!==o&&10!==o?i--:32!==a&&10!==a&&i++,i<=0))){n=!0;break}e.parser.skipToken(e)}return n?(e.posMax=e.pos,e.pos=u+2,t||(e.push({type:"del_open",level:e.level++}),e.parser.tokenize(e),e.push({type:"del_close",level:--e.level})),e.pos=e.posMax+2,e.posMax=s,!0):(e.pos=u,!1)}},function(e,t,n){"use strict";function r(e){return e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122}function i(e,t){var n,i,o,a=t,s=!0,u=!0,l=e.posMax,c=e.src.charCodeAt(t);for(n=t>0?e.src.charCodeAt(t-1):-1;a<l&&e.src.charCodeAt(a)===c;)a++;return a>=l&&(s=!1),o=a-t,o>=4?s=u=!1:(i=a<l?e.src.charCodeAt(a):-1,32!==i&&10!==i||(s=!1),32!==n&&10!==n||(u=!1),95===c&&(r(n)&&(s=!1),r(i)&&(u=!1))),{can_open:s,can_close:u,delims:o}}e.exports=function(e,t){var n,r,o,a,s,u,l,c=e.posMax,p=e.pos,f=e.src.charCodeAt(p);if(95!==f&&42!==f)return!1;if(t)return!1;if(l=i(e,p),n=l.delims,!l.can_open)return e.pos+=n,t||(e.pending+=e.src.slice(p,e.pos)),!0;if(e.level>=e.options.maxNesting)return!1;for(e.pos=p+n,u=[n];e.pos<c;)if(e.src.charCodeAt(e.pos)!==f)e.parser.skipToken(e);else{if(l=i(e,e.pos),r=l.delims,l.can_close){for(a=u.pop(),s=r;a!==s;){if(s<a){u.push(a-s);break}if(s-=a,0===u.length)break;e.pos+=a,a=u.pop()}if(0===u.length){n=a,o=!0;break}e.pos+=r;continue}l.can_open&&u.push(r),e.pos+=r}return o?(e.posMax=e.pos,e.pos=p+n,t||(2!==n&&3!==n||e.push({type:"strong_open",level:e.level++}),1!==n&&3!==n||e.push({type:"em_open",level:e.level++}),e.parser.tokenize(e),1!==n&&3!==n||e.push({type:"em_close",level:--e.level}),2!==n&&3!==n||e.push({type:"strong_close",level:--e.level})),e.pos=e.posMax+n,e.posMax=c,!0):(e.pos=p,!1)}},function(e,t,n){"use strict";var r=n(488),i=n(26).has,o=n(26).isValidEntityCode,a=n(26).fromCodePoint,s=/^&#((?:x[a-f0-9]{1,8}|[0-9]{1,8}));/i,u=/^&([a-z][a-z0-9]{1,31});/i;e.exports=function(e,t){var n,l,c=e.pos,p=e.posMax;if(38!==e.src.charCodeAt(c))return!1;if(c+1<p)if(35===e.src.charCodeAt(c+1)){if(l=e.src.slice(c).match(s))return t||(n="x"===l[1][0].toLowerCase()?parseInt(l[1].slice(1),16):parseInt(l[1],10),e.pending+=a(o(n)?n:65533)),e.pos+=l[0].length,!0}else if((l=e.src.slice(c).match(u))&&i(r,l[1]))return t||(e.pending+=r[l[1]]),e.pos+=l[0].length,!0;return t||(e.pending+="&"),e.pos++,!0}},function(e,t,n){"use strict";for(var r=[],i=0;i<256;i++)r.push(0);"\\!\"#$%&'()*+,./:;<=>?@[]^_`{|}~-".split("").forEach(function(e){r[e.charCodeAt(0)]=1}),e.exports=function(e,t){var n,i=e.pos,o=e.posMax;if(92!==e.src.charCodeAt(i))return!1;if(++i<o){if((n=e.src.charCodeAt(i))<256&&0!==r[n])return t||(e.pending+=e.src[i]),e.pos+=2,!0;if(10===n){for(t||e.push({type:"hardbreak",level:e.level}),i++;i<o&&32===e.src.charCodeAt(i);)i++;return e.pos=i,!0}}return t||(e.pending+="\\"),e.pos++,!0}},function(e,t,n){"use strict";var r=n(165);e.exports=function(e,t){var n,i,o,a,s=e.posMax,u=e.pos;return!(u+2>=s)&&(94===e.src.charCodeAt(u)&&(91===e.src.charCodeAt(u+1)&&(!(e.level>=e.options.maxNesting)&&(n=u+2,!((i=r(e,u+1))<0)&&(t||(e.env.footnotes||(e.env.footnotes={}),e.env.footnotes.list||(e.env.footnotes.list=[]),o=e.env.footnotes.list.length,e.pos=n,e.posMax=i,e.push({type:"footnote_ref",id:o,level:e.level}),e.linkLevel++,a=e.tokens.length,e.parser.tokenize(e),e.env.footnotes.list[o]={tokens:e.tokens.splice(a)},e.linkLevel--),e.pos=i+1,e.posMax=s,!0)))))}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a=e.posMax,s=e.pos;if(s+3>a)return!1;if(!e.env.footnotes||!e.env.footnotes.refs)return!1;if(91!==e.src.charCodeAt(s))return!1;if(94!==e.src.charCodeAt(s+1))return!1;if(e.level>=e.options.maxNesting)return!1;for(r=s+2;r<a;r++){if(32===e.src.charCodeAt(r))return!1;if(10===e.src.charCodeAt(r))return!1;if(93===e.src.charCodeAt(r))break}return r!==s+2&&(!(r>=a)&&(r++,n=e.src.slice(s+2,r-1),void 0!==e.env.footnotes.refs[":"+n]&&(t||(e.env.footnotes.list||(e.env.footnotes.list=[]),e.env.footnotes.refs[":"+n]<0?(i=e.env.footnotes.list.length,e.env.footnotes.list[i]={label:n,count:0},e.env.footnotes.refs[":"+n]=i):i=e.env.footnotes.refs[":"+n],o=e.env.footnotes.list[i].count,e.env.footnotes.list[i].count++,e.push({type:"footnote_ref",id:i,subId:o,level:e.level})),e.pos=r,e.posMax=a,!0)))}},function(e,t,n){"use strict";function r(e){var t=32|e;return t>=97&&t<=122}var i=n(1128).HTML_TAG_RE;e.exports=function(e,t){var n,o,a,s=e.pos;return!!e.options.html&&(a=e.posMax,!(60!==e.src.charCodeAt(s)||s+2>=a)&&(!(33!==(n=e.src.charCodeAt(s+1))&&63!==n&&47!==n&&!r(n))&&(!!(o=e.src.slice(s).match(i))&&(t||e.push({type:"htmltag",content:e.src.slice(s,s+o[0].length),level:e.level}),e.pos+=o[0].length,!0))))}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s=e.posMax,u=e.pos;if(43!==e.src.charCodeAt(u))return!1;if(t)return!1;if(u+4>=s)return!1;if(43!==e.src.charCodeAt(u+1))return!1;if(e.level>=e.options.maxNesting)return!1;if(o=u>0?e.src.charCodeAt(u-1):-1,a=e.src.charCodeAt(u+2),43===o)return!1;if(43===a)return!1;if(32===a||10===a)return!1;for(r=u+2;r<s&&43===e.src.charCodeAt(r);)r++;if(r!==u+2)return e.pos+=r-u,t||(e.pending+=e.src.slice(u,r)),!0;for(e.pos=u+2,i=1;e.pos+1<s;){if(43===e.src.charCodeAt(e.pos)&&43===e.src.charCodeAt(e.pos+1)&&(o=e.src.charCodeAt(e.pos-1),43!==(a=e.pos+2<s?e.src.charCodeAt(e.pos+2):-1)&&43!==o&&(32!==o&&10!==o?i--:32!==a&&10!==a&&i++,i<=0))){n=!0;break}e.parser.skipToken(e)}return n?(e.posMax=e.pos,e.pos=u+2,t||(e.push({type:"ins_open",level:e.level++}),e.parser.tokenize(e),e.push({type:"ins_close",level:--e.level})),e.pos=e.posMax+2,e.posMax=s,!0):(e.pos=u,!1)}},function(e,t,n){"use strict";var r=n(165),i=n(491),o=n(492),a=n(490);e.exports=function(e,t){var n,s,u,l,c,p,f,h,d=!1,m=e.pos,v=e.posMax,g=e.pos,y=e.src.charCodeAt(g);if(33===y&&(d=!0,y=e.src.charCodeAt(++g)),91!==y)return!1;if(e.level>=e.options.maxNesting)return!1;if(n=g+1,(s=r(e,g))<0)return!1;if((p=s+1)<v&&40===e.src.charCodeAt(p)){for(p++;p<v&&(32===(h=e.src.charCodeAt(p))||10===h);p++);if(p>=v)return!1;for(g=p,i(e,p)?(l=e.linkContent,p=e.pos):l="",g=p;p<v&&(32===(h=e.src.charCodeAt(p))||10===h);p++);if(p<v&&g!==p&&o(e,p))for(c=e.linkContent,p=e.pos;p<v&&(32===(h=e.src.charCodeAt(p))||10===h);p++);else c="";if(p>=v||41!==e.src.charCodeAt(p))return e.pos=m,!1;p++}else{if(e.linkLevel>0)return!1;for(;p<v&&(32===(h=e.src.charCodeAt(p))||10===h);p++);if(p<v&&91===e.src.charCodeAt(p)&&(g=p+1,p=r(e,p),p>=0?u=e.src.slice(g,p++):p=g-1),u||(void 0===u&&(p=s+1),u=e.src.slice(n,s)),!(f=e.env.references[a(u)]))return e.pos=m,!1;l=f.href,c=f.title}return t||(e.pos=n,e.posMax=s,d?e.push({type:"image",src:l,title:c,alt:e.src.substr(n,s-n),level:e.level}):(e.push({type:"link_open",href:l,title:c,level:e.level++}),e.linkLevel++,e.parser.tokenize(e),e.linkLevel--,e.push({type:"link_close",level:--e.level}))),e.pos=p,e.posMax=v,!0}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s=e.posMax,u=e.pos;if(61!==e.src.charCodeAt(u))return!1;if(t)return!1;if(u+4>=s)return!1;if(61!==e.src.charCodeAt(u+1))return!1;if(e.level>=e.options.maxNesting)return!1;if(o=u>0?e.src.charCodeAt(u-1):-1,a=e.src.charCodeAt(u+2),61===o)return!1;if(61===a)return!1;if(32===a||10===a)return!1;for(r=u+2;r<s&&61===e.src.charCodeAt(r);)r++;if(r!==u+2)return e.pos+=r-u,t||(e.pending+=e.src.slice(u,r)),!0;for(e.pos=u+2,i=1;e.pos+1<s;){if(61===e.src.charCodeAt(e.pos)&&61===e.src.charCodeAt(e.pos+1)&&(o=e.src.charCodeAt(e.pos-1),61!==(a=e.pos+2<s?e.src.charCodeAt(e.pos+2):-1)&&61!==o&&(32!==o&&10!==o?i--:32!==a&&10!==a&&i++,i<=0))){n=!0;break}e.parser.skipToken(e)}return n?(e.posMax=e.pos,e.pos=u+2,t||(e.push({type:"mark_open",level:e.level++}),e.parser.tokenize(e),e.push({type:"mark_close",level:--e.level})),e.pos=e.posMax+2,e.posMax=s,!0):(e.pos=u,!1)}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i=e.pos;if(10!==e.src.charCodeAt(i))return!1;if(n=e.pending.length-1,r=e.posMax,!t)if(n>=0&&32===e.pending.charCodeAt(n))if(n>=1&&32===e.pending.charCodeAt(n-1)){for(var o=n-2;o>=0;o--)if(32!==e.pending.charCodeAt(o)){e.pending=e.pending.substring(0,o+1);break}e.push({type:"hardbreak",level:e.level})}else e.pending=e.pending.slice(0,-1),e.push({type:"softbreak",level:e.level});else e.push({type:"softbreak",level:e.level});for(i++;i<r&&32===e.src.charCodeAt(i);)i++;return e.pos=i,!0}},function(e,t,n){"use strict";var r=/\\([ \\!"#$%&'()*+,.\/:;<=>?@[\]^_`{|}~-])/g;e.exports=function(e,t){var n,i,o=e.posMax,a=e.pos;if(126!==e.src.charCodeAt(a))return!1;if(t)return!1;if(a+2>=o)return!1;if(e.level>=e.options.maxNesting)return!1;for(e.pos=a+1;e.pos<o;){if(126===e.src.charCodeAt(e.pos)){n=!0;break}e.parser.skipToken(e)}return n&&a+1!==e.pos?(i=e.src.slice(a+1,e.pos),i.match(/(^|[^\\])(\\\\)*\s/)?(e.pos=a,!1):(e.posMax=e.pos,e.pos=a+1,t||e.push({type:"sub",level:e.level,content:i.replace(r,"$1")}),e.pos=e.posMax+1,e.posMax=o,!0)):(e.pos=a,!1)}},function(e,t,n){"use strict";var r=/\\([ \\!"#$%&'()*+,.\/:;<=>?@[\]^_`{|}~-])/g;e.exports=function(e,t){var n,i,o=e.posMax,a=e.pos;if(94!==e.src.charCodeAt(a))return!1;if(t)return!1;if(a+2>=o)return!1;if(e.level>=e.options.maxNesting)return!1;for(e.pos=a+1;e.pos<o;){if(94===e.src.charCodeAt(e.pos)){n=!0;break}e.parser.skipToken(e)}return n&&a+1!==e.pos?(i=e.src.slice(a+1,e.pos),i.match(/(^|[^\\])(\\\\)*\s/)?(e.pos=a,!1):(e.posMax=e.pos,e.pos=a+1,t||e.push({type:"sup",level:e.level,content:i.replace(r,"$1")}),e.pos=e.posMax+1,e.posMax=o,!0)):(e.pos=a,!1)}},function(e,t,n){"use strict";function r(e){switch(e){case 10:case 92:case 96:case 42:case 95:case 94:case 91:case 93:case 33:case 38:case 60:case 62:case 123:case 125:case 36:case 37:case 64:case 126:case 43:case 61:case 58:return!0;default:return!1}}e.exports=function(e,t){for(var n=e.pos;n<e.posMax&&!r(e.src.charCodeAt(n));)n++;return n!==e.pos&&(t||(e.pending+=e.src.slice(e.pos,n)),e.pos=n,!0)}},function(e,t,n){"use strict";function r(e,t){if("string"!=typeof e)throw new TypeError("expected a string");if(1===t)return e;if(2===t)return e+e;var n=e.length*t;if(i!==e||void 0===i)i=e,o="";else if(o.length>=n)return o.substr(0,n);for(;n>o.length&&t>1;)1&t&&(o+=e),t>>=1,e+=e;return o+=e,o=o.substr(0,n)}/*!
-+ * repeat-string <https://github.com/jonschlinkert/repeat-string>
-+ *
-+ * Copyright (c) 2014-2015, Jon Schlinkert.
-+ * Licensed under the MIT License.
-+ */
-+var i,o="";e.exports=r},function(e,t,n){"use strict";e.exports=function(e,t){if(t=t.split(":")[0],!(e=+e))return!1;switch(t){case"http":case"ws":return 80!==e;case"https":case"wss":return 443!==e;case"ftp":return 21!==e;case"gopher":return 70!==e;case"file":return!1}return 0!==e}},function(e,t,n){"use strict";function r(e,t){e&&Object.keys(e).forEach(function(n){t(e[n],n)})}function i(e,t){return{}.hasOwnProperty.call(e,t)}function o(e,t){var n=[];return r(e,function(e){t(e)&&n.push(e)}),n}function a(e,t,n){function g(e,t){var n=this;this.tag=e,this.attribs=t||{},this.tagPosition=E.length,this.text="",this.updateParentNodeText=function(){if(P.length){P[P.length-1].text+=n.text}}}function y(e){return"string"!=typeof e&&(e+=""),e.replace(/\&/g,"&amp;").replace(/</g,"&lt;").replace(/\>/g,"&gt;").replace(/\"/g,"&quot;")}function _(e,n){n=n.replace(/[\x00-\x20]+/g,""),n=n.replace(/<\!\-\-.*?\-\-\>/g,"");var r=n.match(/^([a-zA-Z]+)\:/);if(!r)return!!n.match(/^[\/\\]{2}/)&&!t.allowProtocolRelative;var o=r[1].toLowerCase();return i(t.allowedSchemesByTag,e)?-1===t.allowedSchemesByTag[e].indexOf(o):!t.allowedSchemes||-1===t.allowedSchemes.indexOf(o)}function b(e,t){if(!t)return e;var n,r=c(e),i=e.nodes[0];return n=t[i.selector]&&t["*"]?p(c(t[i.selector]),t["*"],function(e,t){if(Array.isArray(e))return e.concat(t)}):t[i.selector]||t["*"],n&&(r.nodes[0].nodes=i.nodes.reduce(w(n),[])),r}function x(e){return e.nodes[0].nodes.reduce(function(e,t){return e.push(t.prop+":"+t.value+";"),e},[]).join("")}function w(e){return function(t,n){if(e.hasOwnProperty(n.prop)){e[n.prop].some(function(e){return e.test(n.value)})&&t.push(n)}return t}}function k(e,t){return t?(e=e.split(/\s+/),e.filter(function(e){return-1!==t.indexOf(e)}).join(" ")):e}var E="";t?(t=u(a.defaults,t),t.parser?t.parser=u(v,t.parser):t.parser=v):(t=a.defaults,t.parser=v);var S,C,A=t.nonTextTags||["script","style","textarea"];t.allowedAttributes&&(S={},C={},r(t.allowedAttributes,function(e,t){S[t]=[];var n=[];e.forEach(function(e){e.indexOf("*")>=0?n.push(l(e).replace(/\\\*/g,".*")):S[t].push(e)}),C[t]=new RegExp("^("+n.join("|")+")$")}));var D={};r(t.allowedClasses,function(e,t){S&&(i(S,t)||(S[t]=[]),S[t].push("class")),D[t]=e});var O,M={};r(t.transformTags,function(e,t){var n;"function"==typeof e?n=e:"string"==typeof e&&(n=a.simpleTransform(e)),"*"===t?O=n:M[t]=n});var T=0,P=[],I={},R={},j=!1,F=0,N=new s.Parser({onopentag:function(e,n){if(j)return void F++;var a=new g(e,n);P.push(a);var s,u=!1,l=!!a.text;i(M,e)&&(s=M[e](e,n),a.attribs=n=s.attribs,void 0!==s.text&&(a.innerText=s.text),e!==s.tagName&&(a.name=e=s.tagName,R[T]=s.tagName)),O&&(s=O(e,n),a.attribs=n=s.attribs,e!==s.tagName&&(a.name=e=s.tagName,R[T]=s.tagName)),t.allowedTags&&-1===t.allowedTags.indexOf(e)&&(u=!0,-1!==A.indexOf(e)&&(j=!0,F=1),I[T]=!0),T++,u||(E+="<"+e,(!S||i(S,e)||S["*"])&&r(n,function(n,s){if(!m.test(s))return void delete a.attribs[s];var u;if(!S||i(S,e)&&-1!==S[e].indexOf(s)||S["*"]&&-1!==S["*"].indexOf(s)||i(C,e)&&C[e].test(s)||C["*"]&&C["*"].test(s)){if(("href"===s||"src"===s)&&_(e,n))return void delete a.attribs[s];if("iframe"===e&&"src"===s){if("//"===n.substring(0,2)){n="https:".concat(n)}try{if(u=d.parse(n),t.allowedIframeHostnames){if(!t.allowedIframeHostnames.find(function(e){return e===u.hostname}))return void delete a.attribs[s]}}catch(e){return void delete a.attribs[s]}}if("srcset"===s)try{if(u=f.parse(n),r(u,function(e){_("srcset",e.url)&&(e.evil=!0)}),u=o(u,function(e){return!e.evil}),!u.length)return void delete a.attribs[s];n=f.stringify(o(u,function(e){return!e.evil})),a.attribs[s]=n}catch(e){return void delete a.attribs[s]}if("class"===s&&(n=k(n,D[e]),!n.length))return void delete a.attribs[s];if("style"===s)try{if(n=x(b(h.parse(e+" {"+n+"}"),t.allowedStyles)),0===n.length)return void delete a.attribs[s]}catch(e){return void delete a.attribs[s]}E+=" "+s,n.length&&(E+='="'+y(n)+'"')}else delete a.attribs[s]}),-1!==t.selfClosing.indexOf(e)?E+=" />":(E+=">",!a.innerText||l||t.textFilter||(E+=a.innerText)))},ontext:function(e){if(!j){var n,r=P[P.length-1];if(r&&(n=r.tag,e=void 0!==r.innerText?r.innerText:e),"script"===n||"style"===n)E+=e;else{var i=y(e);t.textFilter?E+=t.textFilter(i):E+=i}if(P.length){P[P.length-1].text+=e}}},onclosetag:function(e){if(j){if(--F)return;j=!1}var n=P.pop();if(n){if(j=!1,T--,I[T])return delete I[T],void n.updateParentNodeText();if(R[T]&&(e=R[T],delete R[T]),t.exclusiveFilter&&t.exclusiveFilter(n))return void(E=E.substr(0,n.tagPosition));n.updateParentNodeText(),-1===t.selfClosing.indexOf(e)&&(E+="</"+e+">")}}},t.parser);return N.write(e),N.end(),E}var s=n(116),u=n(1200),l=n(825),c=n(824),p=n(827),f=n(1181),h=n(982),d=n(497);e.exports=a;var m=/^[^\0\t\n\f\r \/<=>]+$/,v={decodeEntities:!0};a.defaults={allowedTags:["h3","h4","h5","h6","blockquote","p","a","ul","ol","nl","li","b","i","strong","em","strike","code","hr","br","div","table","thead","caption","tbody","tr","th","td","pre","iframe"],allowedAttributes:{a:["href","name","target"],img:["src"]},selfClosing:["img","br","hr","area","base","basefont","input","link","meta"],allowedSchemes:["http","https","ftp","mailto"],allowedSchemesByTag:{},allowProtocolRelative:!0},a.simpleTransform=function(e,t,n){return n=void 0===n||n,t=t||{},function(r,i){var o;if(n)for(o in t)i[o]=t[o];else i=t;return{tagName:e,attribs:i}}}},function(e,t,n){(function(e,t){!function(e,n){"use strict";function r(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n<t.length;n++)t[n]=arguments[n+1];var r={callback:e,args:t};return l[u]=r,s(u),u++}function i(e){delete l[e]}function o(e){var t=e.callback,r=e.args;switch(r.length){case 0:t();break;case 1:t(r[0]);break;case 2:t(r[0],r[1]);break;case 3:t(r[0],r[1],r[2]);break;default:t.apply(n,r)}}function a(e){if(c)setTimeout(a,0,e);else{var t=l[e];if(t){c=!0;try{o(t)}finally{i(e),c=!1}}}}if(!e.setImmediate){var s,u=1,l={},c=!1,p=e.document,f=Object.getPrototypeOf&&Object.getPrototypeOf(e);f=f&&f.setTimeout?f:e,"[object process]"==={}.toString.call(e.process)?function(){s=function(e){t.nextTick(function(){a(e)})}}():function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?function(){var t="setImmediate$"+Math.random()+"$",n=function(n){n.source===e&&"string"==typeof n.data&&0===n.data.indexOf(t)&&a(+n.data.slice(t.length))};e.addEventListener?e.addEventListener("message",n,!1):e.attachEvent("onmessage",n),s=function(n){e.postMessage(t+n,"*")}}():e.MessageChannel?function(){var e=new MessageChannel;e.port1.onmessage=function(e){a(e.data)},s=function(t){e.port2.postMessage(t)}}():p&&"onreadystatechange"in p.createElement("script")?function(){var e=p.documentElement;s=function(t){var n=p.createElement("script");n.onreadystatechange=function(){a(t),n.onreadystatechange=null,e.removeChild(n),n=null},e.appendChild(n)}}():function(){s=function(e){setTimeout(a,0,e)}}(),f.setImmediate=r,f.clearImmediate=i}}("undefined"==typeof self?void 0===e?this:e:self)}).call(t,n(17),n(33))},function(e,t,n){"use strict";function r(e){return e.sort().filter(function(t,n){return JSON.stringify(t)!==JSON.stringify(e[n-1])})}var i=n(978),o=n(507),a=/^\d+$/;t.parse=function(e){return r(e.split(",").map(function(e){var t={};return e.trim().split(/\s+/).forEach(function(e,n){if(0===n)return t.url=e;var r=e.substring(0,e.length-1),o=e[e.length-1],s=parseInt(r,10),u=parseFloat(r);if("w"===o&&a.test(r))t.width=s;else if("h"===o&&a.test(r))t.height=s;else{if("x"!==o||i(u))throw new Error("Invalid srcset descriptor: "+e+".");t.density=u}}),t}))},t.stringify=function(e){return o(e.map(function(e){if(!e.url)throw new Error("URL is required.");var t=[e.url];return e.width&&t.push(e.width+"w"),e.height&&t.push(e.height+"h"),e.density&&t.push(e.density+"x"),t.join(" ")})).join(", ")}},function(e,t,n){e.exports=n(1183)},function(e,t,n){"use strict";(function(e,r){Object.defineProperty(t,"__esModule",{value:!0});var i,o=n(1184),a=function(e){return e&&e.__esModule?e:{default:e}}(o);i="undefined"!=typeof self?self:"undefined"!=typeof window?window:void 0!==e?e:r;var s=(0,a.default)(i);t.default=s}).call(t,n(17),n(72)(e))},function(e,t,n){"use strict";function r(e){var t,n=e.Symbol;return"function"==typeof n?n.observable?t=n.observable:(t=n("observable"),n.observable=t):t="@@observable",t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r},function(e,t,n){"use strict";e.exports=2147483647},function(e,t,n){"use strict";var r=n(65),i=n(1185);e.exports=function(e){if((e=r(e))>i)throw new TypeError(e+" exceeds maximum possible timeout");return e}},function(e,t,n){"use strict";(function(t){function r(e){e=e||t.location||{};var n,r={},i=typeof e;if("blob:"===e.protocol)r=new a(unescape(e.pathname),{});else if("string"===i){r=new a(e,{});for(n in d)delete r[n]}else if("object"===i){for(n in e)n in d||(r[n]=e[n]);void 0===r.slashes&&(r.slashes=f.test(e.href))}return r}function i(e){var t=p.exec(e);return{protocol:t[1]?t[1].toLowerCase():"",slashes:!!t[2],rest:t[3]}}function o(e,t){for(var n=(t||"/").split("/").slice(0,-1).concat(e.split("/")),r=n.length,i=n[r-1],o=!1,a=0;r--;)"."===n[r]?n.splice(r,1):".."===n[r]?(n.splice(r,1),a++):a&&(0===r&&(o=!0),n.splice(r,1),a--);return o&&n.unshift(""),"."!==i&&".."!==i||n.push(""),n.join("/")}function a(e,t,n){if(!(this instanceof a))return new a(e,t,n);var s,u,p,f,d,m,v=h.slice(),g=typeof t,y=this,_=0;for("object"!==g&&"string"!==g&&(n=t,t=null),n&&"function"!=typeof n&&(n=c.parse),t=r(t),u=i(e||""),s=!u.protocol&&!u.slashes,y.slashes=u.slashes||s&&t.slashes,y.protocol=u.protocol||t.protocol||"",e=u.rest,u.slashes||(v[2]=[/(.*)/,"pathname"]);_<v.length;_++)f=v[_],p=f[0],m=f[1],p!==p?y[m]=e:"string"==typeof p?~(d=e.indexOf(p))&&("number"==typeof f[2]?(y[m]=e.slice(0,d),e=e.slice(d+f[2])):(y[m]=e.slice(d),e=e.slice(0,d))):(d=p.exec(e))&&(y[m]=d[1],e=e.slice(0,d.index)),y[m]=y[m]||(s&&f[3]?t[m]||"":""),f[4]&&(y[m]=y[m].toLowerCase());n&&(y.query=n(y.query)),s&&t.slashes&&"/"!==y.pathname.charAt(0)&&(""!==y.pathname||""!==t.pathname)&&(y.pathname=o(y.pathname,t.pathname)),l(y.port,y.protocol)||(y.host=y.hostname,y.port=""),y.username=y.password="",y.auth&&(f=y.auth.split(":"),y.username=f[0]||"",y.password=f[1]||""),y.origin=y.protocol&&y.host&&"file:"!==y.protocol?y.protocol+"//"+y.host:"null",y.href=y.toString()}function s(e,t,n){var r=this;switch(e){case"query":"string"==typeof t&&t.length&&(t=(n||c.parse)(t)),r[e]=t;break;case"port":r[e]=t,l(t,r.protocol)?t&&(r.host=r.hostname+":"+t):(r.host=r.hostname,r[e]="");break;case"hostname":r[e]=t,r.port&&(t+=":"+r.port),r.host=t;break;case"host":r[e]=t,/:\d+$/.test(t)?(t=t.split(":"),r.port=t.pop(),r.hostname=t.join(":")):(r.hostname=t,r.port="");break;case"protocol":r.protocol=t.toLowerCase(),r.slashes=!n;break;case"pathname":case"hash":if(t){var i="pathname"===e?"/":"#";r[e]=t.charAt(0)!==i?i+t:t}else r[e]=t;break;default:r[e]=t}for(var o=0;o<h.length;o++){var a=h[o];a[4]&&(r[a[1]]=r[a[1]].toLowerCase())}return r.origin=r.protocol&&r.host&&"file:"!==r.protocol?r.protocol+"//"+r.host:"null",r.href=r.toString(),r}function u(e){e&&"function"==typeof e||(e=c.stringify);var t,n=this,r=n.protocol;r&&":"!==r.charAt(r.length-1)&&(r+=":");var i=r+(n.slashes?"//":"");return n.username&&(i+=n.username,n.password&&(i+=":"+n.password),i+="@"),i+=n.host+n.pathname,t="object"==typeof n.query?e(n.query):n.query,t&&(i+="?"!==t.charAt(0)?"?"+t:t),n.hash&&(i+=n.hash),i}var l=n(1178),c=n(1005),p=/^([a-z][a-z0-9.+-]*:)?(\/\/)?([\S\s]*)/i,f=/^[A-Za-z][A-Za-z0-9+-.]*:\/\//,h=[["#","hash"],["?","query"],["/","pathname"],["@","auth",1],[NaN,"host",void 0,1,1],[/:(\d+)$/,"port",void 0,1],[NaN,"hostname",void 0,1,1]],d={hash:1,query:1};a.prototype={set:s,toString:u},a.extractProtocol=i,a.location=r,a.qs=c,e.exports=a}).call(t,n(17))},function(e,t,n){"use strict";e.exports={isString:function(e){return"string"==typeof e},isObject:function(e){return"object"==typeof e&&null!==e},isNull:function(e){return null===e},isNullOrUndefined:function(e){return null==e}}},function(e,t){e.exports=function(e){for(var t=[],n=0;n<e.length;n++){var r=e.charCodeAt(n);if(r>=55296&&r<=56319&&n+1<e.length){var i=e.charCodeAt(n+1);if(i>=56320&&i<=57343){var o=1024*(r-55296)+i-56320+65536;t.push(240+Math.floor(o/64/64/64),128+Math.floor(o/64/64)%64,128+Math.floor(o/64)%64,128+o%64),n+=1;continue}}r>=2048?t.push(224+Math.floor(r/64/64),128+Math.floor(r/64)%64,128+r%64):r>=128?t.push(192+Math.floor(r/64),128+r%64):t.push(r)}return t}},function(e,t){!function(){function e(e,t){function n(e,t){return r(e,new RegExp(a.source,"g"),t)}function r(e,t,n){if(!i(e))return n;var r=0,o=0;do{var a=t.exec(e);if(null===a)break;if(!(o<n))break;r+=a[0].length,o++}while(null!==a);return r>=e.length?-1:r}function i(e){return s.test(e)}function o(e,n){void 0==e&&(e=["[^]"]),void 0==n&&(n="g");var r=[];return t.forEach(function(e){r.push(e.source)}),r.push(a.source),r=r.concat(e),new RegExp(r.join("|"),n)}e.findCharIndex=function(e,t){if(t>=e.length)return-1;if(!i(e))return t;for(var n=o(),r=0;null!==n.exec(e)&&!(n.lastIndex>t);)r++;return r},e.findByteIndex=function(e,t){return t>=this.length(e)?-1:r(e,o(),t)},e.charAt=function(e,t){var n=this.findByteIndex(e,t);if(n<0||n>=e.length)return"";var r=e.slice(n,n+8),i=s.exec(r);return null===i?r[0]:i[0]},e.charCodeAt=function(e,t){var r=n(e,t);if(r<0)return NaN;var i=e.charCodeAt(r);if(55296<=i&&i<=56319){return 1024*(i-55296)+(e.charCodeAt(r+1)-56320)+65536}return i},e.fromCharCode=function(e){return e>65535?(e-=65536,String.fromCharCode(55296+(e>>10),56320+(1023&e))):String.fromCharCode(e)},e.indexOf=function(e,t,n){void 0!==n&&null!==n||(n=0);var r=this.findByteIndex(e,n),i=e.indexOf(t,r);return i<0?-1:this.findCharIndex(e,i)},e.lastIndexOf=function(e,t,n){var r;if(void 0===n||null===n)r=e.lastIndexOf(t);else{var i=this.findByteIndex(e,n);r=e.lastIndexOf(t,i)}return r<0?-1:this.findCharIndex(e,r)},e.slice=function(e,t,n){var r,i=this.findByteIndex(e,t);return i<0&&(i=e.length),void 0===n||null===n?r=e.length:(r=this.findByteIndex(e,n))<0&&(r=e.length),e.slice(i,r)},e.substr=function(e,t,n){return t<0&&(t=this.length(e)+t),void 0===n||null===n?this.slice(e,t):this.slice(e,t,t+n)},e.substring=e.slice,e.length=function(e){return this.findCharIndex(e,e.length-1)+1},e.stringToCodePoints=function(e){for(var t=[],n=0;n<e.length&&(codePoint=this.charCodeAt(e,n),codePoint);n++)t.push(codePoint);return t},e.codePointsToString=function(e){for(var t=[],n=0;n<e.length;n++)t.push(this.fromCharCode(e[n]));return t.join("")},e.stringToBytes=function(e){for(var t=[],n=0;n<e.length;n++){for(var r=e.charCodeAt(n),i=[];r>0;)i.push(255&r),r>>=8;1==i.length&&i.push(0),t=t.concat(i.reverse())}return t},e.bytesToString=function(e){for(var t=[],n=0;n<e.length;n+=2){var r=e[n],i=e[n+1],o=r<<8|i;t.push(String.fromCharCode(o))}return t.join("")},e.stringToCharArray=function(e){var t=[],n=o();do{var r=n.exec(e);if(null===r)break;t.push(r[0])}while(null!==r);return t};var a=/[\uD800-\uDBFF][\uDC00-\uDFFF]/,s=o([],"")}var n;void 0!==t&&null!==t?n=t:"undefined"!=typeof window&&null!==window&&(void 0!==window.UtfString&&null!==window.UtfString||(window.UtfString={}),n=window.UtfString);var r=/\uD83C[\uDDE6-\uDDFF]\uD83C[\uDDE6-\uDDFF]/;n.visual={},e(n,[]),e(n.visual,[r])}()},function(e,t,n){(function(t){function n(e,t){function n(){if(!i){if(r("throwDeprecation"))throw new Error(t);r("traceDeprecation")?console.trace(t):console.warn(t),i=!0}return e.apply(this,arguments)}if(r("noDeprecation"))return e;var i=!1;return n}function r(e){try{if(!t.localStorage)return!1}catch(e){return!1}var n=t.localStorage[e];return null!=n&&"true"===String(n).toLowerCase()}e.exports=n}).call(t,n(17))},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},function(e,t){e.exports=function(e){return e&&"object"==typeof e&&"function"==typeof e.copy&&"function"==typeof e.fill&&"function"==typeof e.readUInt8}},function(e,t,n){(function(e,r){function i(e,n){var r={seen:[],stylize:a};return arguments.length>=3&&(r.depth=arguments[2]),arguments.length>=4&&(r.colors=arguments[3]),m(n)?r.showHidden=n:n&&t._extend(r,n),x(r.showHidden)&&(r.showHidden=!1),x(r.depth)&&(r.depth=2),x(r.colors)&&(r.colors=!1),x(r.customInspect)&&(r.customInspect=!0),r.colors&&(r.stylize=o),u(r,e,r.depth)}function o(e,t){var n=i.styles[t];return n?"["+i.colors[n][0]+"m"+e+"["+i.colors[n][1]+"m":e}function a(e,t){return e}function s(e){var t={};return e.forEach(function(e,n){t[e]=!0}),t}function u(e,n,r){if(e.customInspect&&n&&C(n.inspect)&&n.inspect!==t.inspect&&(!n.constructor||n.constructor.prototype!==n)){var i=n.inspect(r,e);return _(i)||(i=u(e,i,r)),i}var o=l(e,n);if(o)return o;var a=Object.keys(n),m=s(a);if(e.showHidden&&(a=Object.getOwnPropertyNames(n)),S(n)&&(a.indexOf("message")>=0||a.indexOf("description")>=0))return c(n);if(0===a.length){if(C(n)){var v=n.name?": "+n.name:"";return e.stylize("[Function"+v+"]","special")}if(w(n))return e.stylize(RegExp.prototype.toString.call(n),"regexp");if(E(n))return e.stylize(Date.prototype.toString.call(n),"date");if(S(n))return c(n)}var g="",y=!1,b=["{","}"];if(d(n)&&(y=!0,b=["[","]"]),C(n)){g=" [Function"+(n.name?": "+n.name:"")+"]"}if(w(n)&&(g=" "+RegExp.prototype.toString.call(n)),E(n)&&(g=" "+Date.prototype.toUTCString.call(n)),S(n)&&(g=" "+c(n)),0===a.length&&(!y||0==n.length))return b[0]+g+b[1];if(r<0)return w(n)?e.stylize(RegExp.prototype.toString.call(n),"regexp"):e.stylize("[Object]","special");e.seen.push(n);var x;return x=y?p(e,n,r,m,a):a.map(function(t){return f(e,n,r,m,t,y)}),e.seen.pop(),h(x,g,b)}function l(e,t){if(x(t))return e.stylize("undefined","undefined");if(_(t)){var n="'"+JSON.stringify(t).replace(/^"|"$/g,"").replace(/'/g,"\\'").replace(/\\"/g,'"')+"'";return e.stylize(n,"string")}return y(t)?e.stylize(""+t,"number"):m(t)?e.stylize(""+t,"boolean"):v(t)?e.stylize("null","null"):void 0}function c(e){return"["+Error.prototype.toString.call(e)+"]"}function p(e,t,n,r,i){for(var o=[],a=0,s=t.length;a<s;++a)T(t,String(a))?o.push(f(e,t,n,r,String(a),!0)):o.push("");return i.forEach(function(i){i.match(/^\d+$/)||o.push(f(e,t,n,r,i,!0))}),o}function f(e,t,n,r,i,o){var a,s,l;if(l=Object.getOwnPropertyDescriptor(t,i)||{value:t[i]},l.get?s=l.set?e.stylize("[Getter/Setter]","special"):e.stylize("[Getter]","special"):l.set&&(s=e.stylize("[Setter]","special")),T(r,i)||(a="["+i+"]"),s||(e.seen.indexOf(l.value)<0?(s=v(n)?u(e,l.value,null):u(e,l.value,n-1),s.indexOf("\n")>-1&&(s=o?s.split("\n").map(function(e){return"  "+e}).join("\n").substr(2):"\n"+s.split("\n").map(function(e){return"   "+e}).join("\n"))):s=e.stylize("[Circular]","special")),x(a)){if(o&&i.match(/^\d+$/))return s;a=JSON.stringify(""+i),a.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)?(a=a.substr(1,a.length-2),a=e.stylize(a,"name")):(a=a.replace(/'/g,"\\'").replace(/\\"/g,'"').replace(/(^"|"$)/g,"'"),a=e.stylize(a,"string"))}return a+": "+s}function h(e,t,n){var r=0;return e.reduce(function(e,t){return r++,t.indexOf("\n")>=0&&r++,e+t.replace(/\u001b\[\d\d?m/g,"").length+1},0)>60?n[0]+(""===t?"":t+"\n ")+" "+e.join(",\n  ")+" "+n[1]:n[0]+t+" "+e.join(", ")+" "+n[1]}function d(e){return Array.isArray(e)}function m(e){return"boolean"==typeof e}function v(e){return null===e}function g(e){return null==e}function y(e){return"number"==typeof e}function _(e){return"string"==typeof e}function b(e){return"symbol"==typeof e}function x(e){return void 0===e}function w(e){return k(e)&&"[object RegExp]"===D(e)}function k(e){return"object"==typeof e&&null!==e}function E(e){return k(e)&&"[object Date]"===D(e)}function S(e){return k(e)&&("[object Error]"===D(e)||e instanceof Error)}function C(e){return"function"==typeof e}function A(e){return null===e||"boolean"==typeof e||"number"==typeof e||"string"==typeof e||"symbol"==typeof e||void 0===e}function D(e){return Object.prototype.toString.call(e)}function O(e){return e<10?"0"+e.toString(10):e.toString(10)}function M(){var e=new Date,t=[O(e.getHours()),O(e.getMinutes()),O(e.getSeconds())].join(":");return[e.getDate(),j[e.getMonth()],t].join(" ")}function T(e,t){return Object.prototype.hasOwnProperty.call(e,t)}var P=/%[sdj%]/g;t.format=function(e){if(!_(e)){for(var t=[],n=0;n<arguments.length;n++)t.push(i(arguments[n]));return t.join(" ")}for(var n=1,r=arguments,o=r.length,a=String(e).replace(P,function(e){if("%%"===e)return"%";if(n>=o)return e;switch(e){case"%s":return String(r[n++]);case"%d":return Number(r[n++]);case"%j":try{return JSON.stringify(r[n++])}catch(e){return"[Circular]"}default:return e}}),s=r[n];n<o;s=r[++n])v(s)||!k(s)?a+=" "+s:a+=" "+i(s);return a},t.deprecate=function(n,i){function o(){if(!a){if(r.throwDeprecation)throw new Error(i);r.traceDeprecation?console.trace(i):console.error(i),a=!0}return n.apply(this,arguments)}if(x(e.process))return function(){return t.deprecate(n,i).apply(this,arguments)};if(!0===r.noDeprecation)return n;var a=!1;return o};var I,R={};t.debuglog=function(e){if(x(I)&&(I=n.i({NODE_ENV:"production",WEBPACK_INLINE_STYLES:!1}).NODE_DEBUG||""),e=e.toUpperCase(),!R[e])if(new RegExp("\\b"+e+"\\b","i").test(I)){var i=r.pid;R[e]=function(){var n=t.format.apply(t,arguments);console.error("%s %d: %s",e,i,n)}}else R[e]=function(){};return R[e]},t.inspect=i,i.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]},i.styles={special:"cyan",number:"yellow",boolean:"yellow",undefined:"grey",null:"bold",string:"green",date:"magenta",regexp:"red"},t.isArray=d,t.isBoolean=m,t.isNull=v,t.isNullOrUndefined=g,t.isNumber=y,t.isString=_,t.isSymbol=b,t.isUndefined=x,t.isRegExp=w,t.isObject=k,t.isDate=E,t.isError=S,t.isFunction=C,t.isPrimitive=A,t.isBuffer=n(1193);var j=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];t.log=function(){console.log("%s - %s",M(),t.format.apply(t,arguments))},t.inherits=n(1192),t._extend=function(e,t){if(!t||!k(t))return e;for(var n=Object.keys(t),r=n.length;r--;)e[n[r]]=t[n[r]];return e}}).call(t,n(17),n(33))},function(e,t){e.exports=function(){throw new Error("define cannot be used indirect")}},function(e,t,n){"use strict";function r(e){return a(e).map(function(e){return{value:e,type:i(e)}})}function i(e){return u(e)?"ClosingTag":c(e)?"OpeningTag":l(e)?"SelfClosingTag":"Text"}var o=n(1177),a=function(e){return e.split(/(<\/?[^>]+>)/g).filter(function(e){return""!==e.trim()})},s=function(e){return/<[^>!]+>/.test(e)},u=function(e){return/<\/+[^>]+>/.test(e)},l=function(e){return/<[^>]+\/>/.test(e)},c=function(e){return s(e)&&!u(e)&&!l(e)};e.exports=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.indentor,i=t.textNodesOnSameLine,a=0,s=[];n=n||"    ";var u=r(e).map(function(e,t,r){var u=e.value,l=e.type;"ClosingTag"===l&&a--;var c=o(n,a),p=c+u;if("OpeningTag"===l&&a++,i){var f=r[t-1],h=r[t-2];"ClosingTag"===l&&"Text"===f.type&&"OpeningTag"===h.type&&(p=""+c+h.value+f.value+u,s.push(t-2,t-1))}return p});return s.forEach(function(e){return u[e]=null}),u.filter(function(e){return!!e}).join("\n")}},function(e,t){function n(e){return e&&e.replace?e.replace(/([&"<>'])/g,function(e,t){return r[t]}):e}var r={"&":"&amp;",'"':"&quot;","'":"&apos;","<":"&lt;",">":"&gt;"};e.exports=n},function(e,t,n){(function(t){function r(e,n){function r(e){m?t.nextTick(e):e()}function i(e,t){if(void 0!==t&&(f+=t),e&&!h&&(l=l||new c,h=!0),e&&h){var n=f;r(function(){l.emit("data",n)}),f=""}}function o(e,t){s(i,a(e,d,d?1:0),t)}function u(){if(l){var e=f;r(function(){l.emit("data",e),l.emit("end"),l.readable=!1,l.emit("close")})}}"object"!=typeof n&&(n={indent:n});var l=n.stream?new c:null,f="",h=!1,d=n.indent?!0===n.indent?p:n.indent:"",m=!0;return r(function(){m=!1}),n.declaration&&function(e){var t=e.encoding||"UTF-8",n={version:"1.0",encoding:t};e.standalone&&(n.standalone=e.standalone),o({"?xml":{_attr:n}}),f=f.replace("/>","?>")}(n.declaration),e&&e.forEach?e.forEach(function(t,n){var r;n+1===e.length&&(r=u),o(t,r)}):o(e,u),l?(l.readable=!0,l):f}function i(){var e=Array.prototype.slice.call(arguments),t={_elem:a(e)};return t.push=function(e){if(!this.append)throw new Error("not assigned to a parent!");var t=this,n=this._elem.indent;s(this.append,a(e,n,this._elem.icount+(n?1:0)),function(){t.append(!0)})},t.close=function(e){void 0!==e&&this.push(e),this.end&&this.end()},t}function o(e,t){return new Array(t||0).join(e||"")}function a(e,t,n){function r(e){Object.keys(e).forEach(function(t){f.push(u(t,e[t]))})}n=n||0;var i,s=o(t,n),c=e;if("object"==typeof e){if(i=Object.keys(e)[0],(c=e[i])&&c._elem)return c._elem.name=i,c._elem.icount=n,c._elem.indent=t,c._elem.indents=s,c._elem.interrupt=c,c._elem}var p,f=[],h=[];switch(typeof c){case"object":if(null===c)break;c._attr&&r(c._attr),c._cdata&&h.push(("<![CDATA["+c._cdata).replace(/\]\]>/g,"]]]]><![CDATA[>")+"]]>"),c.forEach&&(p=!1,h.push(""),c.forEach(function(e){if("object"==typeof e){"_attr"==Object.keys(e)[0]?r(e._attr):h.push(a(e,t,n+1))}else h.pop(),p=!0,h.push(l(e))}),p||h.push(""));break;default:h.push(l(c))}return{name:i,interrupt:!1,attributes:f,content:h,icount:n,indents:s,indent:t}}function s(e,t,n){function r(){for(;t.content.length;){var r=t.content.shift();if(void 0!==r){if(i(r))return;s(e,r)}}e(!1,(o>1?t.indents:"")+(t.name?"</"+t.name+">":"")+(t.indent&&!n?"\n":"")),n&&n()}function i(t){return!!t.interrupt&&(t.interrupt.append=e,t.interrupt.end=r,t.interrupt=!1,e(!0),!0)}if("object"!=typeof t)return e(!1,t);var o=t.interrupt?1:t.content.length;if(e(!1,t.indents+(t.name?"<"+t.name:"")+(t.attributes.length?" "+t.attributes.join(" "):"")+(o?t.name?">":"":t.name?"/>":"")+(t.indent&&o>1?"\n":"")),!o)return e(!1,t.indent?"\n":"");i(t)||r()}function u(e,t){return e+'="'+l(t)+'"'}var l=n(1197),c=n(493).Stream,p="    ";e.exports=r,e.exports.element=e.exports.Element=i}).call(t,n(33))},function(e,t){function n(e,t,n){return r.yubl(t((n||r.yufull)(e)))}t._getPrivFilters=function(){function e(e){var t=e.split(k,2);return!t[0]||2!==t.length&&e.length===t[0].length?null:t[0]}function t(e,t,n,r){function i(e,n,i,a){return n?(n=Number(n[0]<="9"?n:"0"+n),r?A(n):128===n?"€":130===n?"‚":131===n?"ƒ":132===n?"„":133===n?"…":134===n?"†":135===n?"‡":136===n?"ˆ":137===n?"‰":138===n?"Š":139===n?"‹":140===n?"Œ":142===n?"Ž":145===n?"‘":146===n?"’":147===n?"“":148===n?"”":149===n?"•":150===n?"–":151===n?"—":152===n?"˜":153===n?"™":154===n?"š":155===n?"›":156===n?"œ":158===n?"ž":159===n?"Ÿ":n>=55296&&n<=57343||13===n?"�":o.frCoPt(n)):t[i||a]||e}return t=t||m,n=n||d,void 0===e?"undefined":null===e?"null":e.toString().replace(c,"�").replace(n,i)}function n(e){return"\\"+e.charCodeAt(0).toString(16).toLowerCase()+" "}function r(e){return e.replace(_,function(e){return"-x-"+e})}function i(n){n=o.yufull(t(n));var r=e(n);return r&&w[r.toLowerCase()]?"##"+n:n}var o,a=/</g,s=/"/g,u=/'/g,l=/&/g,c=/\x00/g,p=/(?:^$|[\x00\x09-\x0D "'`=<>])/g,f=/[&<>"'`]/g,h=/(?:\x00|^-*!?>|--!?>|--?!?$|\]>|\]$)/g,d=/&(?:#([xX][0-9A-Fa-f]+|\d+);?|(Tab|NewLine|colon|semi|lpar|rpar|apos|sol|comma|excl|ast|midast|ensp|emsp|thinsp);|(nbsp|amp|AMP|lt|LT|gt|GT|quot|QUOT);?)/g,m={Tab:"\t",NewLine:"\n",colon:":",semi:";",lpar:"(",rpar:")",apos:"'",sol:"/",comma:",",excl:"!",ast:"*",midast:"*",ensp:" ",emsp:" ",thinsp:" ",nbsp:" ",amp:"&",lt:"<",gt:">",quot:'"',QUOT:'"'},v=/^(?:(?!-*expression)#?[-\w]+|[+-]?(?:\d+|\d*\.\d+)(?:r?em|ex|ch|cm|mm|in|px|pt|pc|%|vh|vw|vmin|vmax)?|!important|)$/i,g=/[\x00-\x1F\x7F\[\]{}\\"]/g,y=/[\x00-\x1F\x7F\[\]{}\\']/g,_=/url[\(\u207D\u208D]+/g,b=/['\(\)]/g,x=/\/\/%5[Bb]([A-Fa-f0-9:]+)%5[Dd]/,w={javascript:1,data:1,vbscript:1,mhtml:1,"x-schema":1},k=/(?::|&#[xX]0*3[aA];?|&#0*58;?|&colon;)/,E=/(?:^[\x00-\x20]+|[\t\n\r\x00]+)/g,S={Tab:"\t",NewLine:"\n"},C=function(e,t,n){return void 0===e?"undefined":null===e?"null":e.toString().replace(t,n)},A=String.fromCodePoint||function(e){return 0===arguments.length?"":e<=65535?String.fromCharCode(e):(e-=65536,String.fromCharCode(55296+(e>>10),e%1024+56320))};return o={frCoPt:function(e){return void 0===e||null===e?"":!isFinite(e=Number(e))||e<=0||e>1114111||e>=1&&e<=8||e>=14&&e<=31||e>=127&&e<=159||e>=64976&&e<=65007||11===e||65535==(65535&e)||65534==(65535&e)?"�":A(e)},d:t,yup:function(n){return n=e(n.replace(c,"")),n?t(n,S,null,!0).replace(E,"").toLowerCase():null},y:function(e){return C(e,f,function(e){return"&"===e?"&amp;":"<"===e?"&lt;":">"===e?"&gt;":'"'===e?"&quot;":"'"===e?"&#39;":"&#96;"})},ya:function(e){return C(e,l,"&amp;")},yd:function(e){return C(e,a,"&lt;")},yc:function(e){return C(e,h,function(e){return"\0"===e?"�":"--!"===e||"--"===e||"-"===e||"]"===e?e+" ":e.slice(0,-1)+" >"})},yavd:function(e){return C(e,s,"&quot;")},yavs:function(e){return C(e,u,"&#39;")},yavu:function(e){return C(e,p,function(e){return"\t"===e?"&#9;":"\n"===e?"&#10;":"\v"===e?"&#11;":"\f"===e?"&#12;":"\r"===e?"&#13;":" "===e?"&#32;":"="===e?"&#61;":"<"===e?"&lt;":">"===e?"&gt;":'"'===e?"&quot;":"'"===e?"&#39;":"`"===e?"&#96;":"�"})},yu:encodeURI,yuc:encodeURIComponent,yubl:function(e){return w[o.yup(e)]?"x-"+e:e},yufull:function(e){return o.yu(e).replace(x,function(e,t){return"//["+t+"]"})},yublf:function(e){return o.yubl(o.yufull(e))},yceu:function(e){return e=t(e),v.test(e)?e:";-x:'"+r(e.replace(y,n))+"';-v:"},yced:function(e){return r(t(e).replace(g,n))},yces:function(e){return r(t(e).replace(y,n))},yceuu:function(e){return i(e).replace(b,function(e){return"'"===e?"\\27 ":"("===e?"%28":"%29"})},yceud:function(e){return i(e)},yceus:function(e){return i(e).replace(u,"\\27 ")}}};var r=t._privFilters=t._getPrivFilters();t.inHTMLData=r.yd,t.inHTMLComment=r.yc,t.inSingleQuotedAttr=r.yavs,t.inDoubleQuotedAttr=r.yavd,t.inUnQuotedAttr=r.yavu,t.uriInSingleQuotedAttr=function(e){return n(e,r.yavs)},t.uriInDoubleQuotedAttr=function(e){return n(e,r.yavd)},t.uriInUnQuotedAttr=function(e){return n(e,r.yavu)},t.uriInHTMLData=r.yufull,t.uriInHTMLComment=function(e){return r.yc(r.yufull(e))},t.uriPathInSingleQuotedAttr=function(e){return n(e,r.yavs,r.yu)},t.uriPathInDoubleQuotedAttr=function(e){return n(e,r.yavd,r.yu)},t.uriPathInUnQuotedAttr=function(e){return n(e,r.yavu,r.yu)},t.uriPathInHTMLData=r.yu,t.uriPathInHTMLComment=function(e){return r.yc(r.yu(e))},t.uriQueryInSingleQuotedAttr=t.uriPathInSingleQuotedAttr,t.uriQueryInDoubleQuotedAttr=t.uriPathInDoubleQuotedAttr,t.uriQueryInUnQuotedAttr=t.uriPathInUnQuotedAttr,t.uriQueryInHTMLData=t.uriPathInHTMLData,t.uriQueryInHTMLComment=t.uriPathInHTMLComment,t.uriComponentInSingleQuotedAttr=function(e){return r.yavs(r.yuc(e))},t.uriComponentInDoubleQuotedAttr=function(e){return r.yavd(r.yuc(e))},t.uriComponentInUnQuotedAttr=function(e){return r.yavu(r.yuc(e))},t.uriComponentInHTMLData=r.yuc,t.uriComponentInHTMLComment=function(e){return r.yc(r.yuc(e))},t.uriFragmentInSingleQuotedAttr=function(e){return r.yubl(r.yavs(r.yuc(e)))},t.uriFragmentInDoubleQuotedAttr=function(e){return r.yubl(r.yavd(r.yuc(e)))},t.uriFragmentInUnQuotedAttr=function(e){return r.yubl(r.yavu(r.yuc(e)))},t.uriFragmentInHTMLData=t.uriComponentInHTMLData,t.uriFragmentInHTMLComment=t.uriComponentInHTMLComment},function(e,t){function n(){for(var e={},t=0;t<arguments.length;t++){var n=arguments[t];for(var i in n)r.call(n,i)&&(e[i]=n[i])}return e}e.exports=n;var r=Object.prototype.hasOwnProperty},function(e,t,n){(function(){var e,t,r,i,o,a=[].slice;o=n(61),e=n(1202),i=n(1205),t=n(1204),r=n(266),this.make_dumper=function(n,s,u,l){var c;return null==n&&(n=e.Emitter),null==s&&(s=i.Serializer),null==u&&(u=t.Representer),null==l&&(l=r.Resolver),c=[n,s,u,l],function(){function e(e,n){var r,i,o;for(null==n&&(n={}),c[0].call(this,e,n),o=c.slice(1),r=0,i=o.length;r<i;r++)t=o[r],t.call(this,n)}var t;return o.extend.apply(o,[e.prototype].concat(a.call(function(){var e,n,r;for(r=[],e=0,n=c.length;e<n;e++)t=c[e],r.push(t.prototype);return r}()))),e}()},this.Dumper=this.make_dumper()}).call(this)},function(e,t,n){(function(){var e,r,i,o,a=function(e,t){function n(){this.constructor=e}for(var r in t)s.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},s={}.hasOwnProperty,u=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};i=n(127),o=n(61),r=n(45).YAMLError,this.EmitterError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return a(t,e),t}(r),this.Emitter=function(){function n(e,t){var n;this.stream=e,this.encoding=null,this.states=[],this.state=this.expect_stream_start,this.events=[],this.event=null,this.indents=[],this.indent=null,this.flow_level=0,this.root_context=!1,this.sequence_context=!1,this.mapping_context=!1,this.simple_key_context=!1,this.line=0,this.column=0,this.whitespace=!0,this.indentation=!0,this.open_ended=!1,this.canonical=t.canonical,this.allow_unicode=t.allow_unicode,null==this.canonical&&(this.canonical=!1),null==this.allow_unicode&&(this.allow_unicode=!0),this.best_indent=1<t.indent&&t.indent<10?t.indent:2,this.best_width=t.width>2*this.indent?t.width:80,this.best_line_break="\r"===(n=t.line_break)||"\n"===n||"\r\n"===n?t.line_break:"\n",this.tag_prefixes=null,this.prepared_anchor=null,this.prepared_tag=null,this.analysis=null,this.style=null}var r,a,l;return r="\0 \t\r\n…\u2028\u2029",a={"!":"!","tag:yaml.org,2002:":"!!"},l={"\0":"0","":"a","\b":"b","\t":"t","\n":"n","\v":"v","\f":"f","\r":"r","":"e",'"':'"',"\\":"\\","…":"N"," ":"_","\u2028":"L","\u2029":"P"},n.prototype.dispose=function(){return this.states=[],this.state=null},n.prototype.emit=function(e){var t;for(this.events.push(e),t=[];!this.need_more_events();)this.event=this.events.shift(),this.state(),t.push(this.event=null);return t},n.prototype.need_more_events=function(){var e;return 0===this.events.length||(e=this.events[0],e instanceof i.DocumentStartEvent?this.need_events(1):e instanceof i.SequenceStartEvent?this.need_events(2):e instanceof i.MappingStartEvent&&this.need_events(3))},n.prototype.need_events=function(e){var t,n,r,o,a;for(o=0,a=this.events.slice(1),n=0,r=a.length;n<r;n++)if(t=a[n],t instanceof i.DocumentStartEvent||t instanceof i.CollectionStartEvent?o++:t instanceof i.DocumentEndEvent||t instanceof i.CollectionEndEvent?o--:t instanceof i.StreamEndEvent&&(o=-1),o<0)return!1;return this.events.length<e+1},n.prototype.increase_indent=function(e){return null==e&&(e={}),this.indents.push(this.indent),null==this.indent?this.indent=e.flow?this.best_indent:0:e.indentless?void 0:this.indent+=this.best_indent},n.prototype.expect_stream_start=function(){return this.event instanceof i.StreamStartEvent?(!this.event.encoding||"encoding"in this.stream||(this.encoding=this.event.encoding),this.write_stream_start(),this.state=this.expect_first_document_start):this.error("expected StreamStartEvent, but got",this.event)},n.prototype.expect_nothing=function(){return this.error("expected nothing, but got",this.event)},n.prototype.expect_first_document_start=function(){return this.expect_document_start(!0)},n.prototype.expect_document_start=function(e){var t,n,r,u,l,c,p;if(null==e&&(e=!1),this.event instanceof i.DocumentStartEvent){if((this.event.version||this.event.tags)&&this.open_ended&&(this.write_indicator("...",!0),this.write_indent()),this.event.version&&this.write_version_directive(this.prepare_version(this.event.version)),this.tag_prefixes=o.clone(a),this.event.tags)for(p=function(){var e,t;e=this.event.tags,t=[];for(u in e)s.call(e,u)&&t.push(u);return t}.call(this).sort(),r=0,l=p.length;r<l;r++)n=p[r],c=this.event.tags[n],this.tag_prefixes[c]=n,this.write_tag_directive(this.prepare_tag_handle(n),this.prepare_tag_prefix(c));return t=!e||this.event.explicit||this.canonical||this.event.version||this.event.tags||this.check_empty_document(),t&&(this.write_indent(),this.write_indicator("---",!0),this.canonical&&this.write_indent()),this.state=this.expect_document_root}return this.event instanceof i.StreamEndEvent?(this.open_ended&&(this.write_indicator("...",!0),this.write_indent()),this.write_stream_end(),this.state=this.expect_nothing):this.error("expected DocumentStartEvent, but got",this.event)},n.prototype.expect_document_end=function(){return this.event instanceof i.DocumentEndEvent?(this.write_indent(),this.event.explicit&&(this.write_indicator("...",!0),this.write_indent()),this.flush_stream(),this.state=this.expect_document_start):this.error("expected DocumentEndEvent, but got",this.event)},n.prototype.expect_document_root=function(){return this.states.push(this.expect_document_end),this.expect_node({root:!0})},n.prototype.expect_node=function(e){return null==e&&(e={}),this.root_context=!!e.root,this.sequence_context=!!e.sequence,this.mapping_context=!!e.mapping,this.simple_key_context=!!e.simple_key,this.event instanceof i.AliasEvent?this.expect_alias():this.event instanceof i.ScalarEvent||this.event instanceof i.CollectionStartEvent?(this.process_anchor("&"),this.process_tag(),this.event instanceof i.ScalarEvent?this.expect_scalar():this.event instanceof i.SequenceStartEvent?this.flow_level||this.canonical||this.event.flow_style||this.check_empty_sequence()?this.expect_flow_sequence():this.expect_block_sequence():this.event instanceof i.MappingStartEvent?this.flow_level||this.canonical||this.event.flow_style||this.check_empty_mapping()?this.expect_flow_mapping():this.expect_block_mapping():void 0):this.error("expected NodeEvent, but got",this.event)},n.prototype.expect_alias=function(){return this.event.anchor||this.error("anchor is not specified for alias"),this.process_anchor("*"),this.state=this.states.pop()},n.prototype.expect_scalar=function(){return this.increase_indent({flow:!0}),this.process_scalar(),this.indent=this.indents.pop(),this.state=this.states.pop()},n.prototype.expect_flow_sequence=function(){return this.write_indicator("[",!0,{whitespace:!0}),this.flow_level++,this.increase_indent({flow:!0}),this.state=this.expect_first_flow_sequence_item},n.prototype.expect_first_flow_sequence_item=function(){return this.event instanceof i.SequenceEndEvent?(this.indent=this.indents.pop(),this.flow_level--,this.write_indicator("]",!1),this.state=this.states.pop()):((this.canonical||this.column>this.best_width)&&this.write_indent(),this.states.push(this.expect_flow_sequence_item),this.expect_node({sequence:!0}))},n.prototype.expect_flow_sequence_item=function(){return this.event instanceof i.SequenceEndEvent?(this.indent=this.indents.pop(),this.flow_level--,this.canonical&&(this.write_indicator(",",!1),this.write_indent()),this.write_indicator("]",!1),this.state=this.states.pop()):(this.write_indicator(",",!1),(this.canonical||this.column>this.best_width)&&this.write_indent(),this.states.push(this.expect_flow_sequence_item),this.expect_node({sequence:!0}))},n.prototype.expect_flow_mapping=function(){return this.write_indicator("{",!0,{whitespace:!0}),this.flow_level++,this.increase_indent({flow:!0}),this.state=this.expect_first_flow_mapping_key},n.prototype.expect_first_flow_mapping_key=function(){return this.event instanceof i.MappingEndEvent?(this.indent=this.indents.pop(),this.flow_level--,this.write_indicator("}",!1),this.state=this.states.pop()):((this.canonical||this.column>this.best_width)&&this.write_indent(),!this.canonical&&this.check_simple_key()?(this.states.push(this.expect_flow_mapping_simple_value),this.expect_node({mapping:!0,simple_key:!0})):(this.write_indicator("?",!0),this.states.push(this.expect_flow_mapping_value),this.expect_node({mapping:!0})))},n.prototype.expect_flow_mapping_key=function(){return this.event instanceof i.MappingEndEvent?(this.indent=this.indents.pop(),this.flow_level--,this.canonical&&(this.write_indicator(",",!1),this.write_indent()),this.write_indicator("}",!1),this.state=this.states.pop()):(this.write_indicator(",",!1),(this.canonical||this.column>this.best_width)&&this.write_indent(),!this.canonical&&this.check_simple_key()?(this.states.push(this.expect_flow_mapping_simple_value),this.expect_node({mapping:!0,simple_key:!0})):(this.write_indicator("?",!0),this.states.push(this.expect_flow_mapping_value),this.expect_node({mapping:!0})))},n.prototype.expect_flow_mapping_simple_value=function(){return this.write_indicator(":",!1),this.states.push(this.expect_flow_mapping_key),this.expect_node({mapping:!0})},n.prototype.expect_flow_mapping_value=function(){return(this.canonical||this.column>this.best_width)&&this.write_indent(),this.write_indicator(":",!0),this.states.push(this.expect_flow_mapping_key),this.expect_node({mapping:!0})},n.prototype.expect_block_sequence=function(){var e;return e=this.mapping_context&&!this.indentation,this.increase_indent({indentless:e}),this.state=this.expect_first_block_sequence_item},n.prototype.expect_first_block_sequence_item=function(){return this.expect_block_sequence_item(!0)},n.prototype.expect_block_sequence_item=function(e){return null==e&&(e=!1),!e&&this.event instanceof i.SequenceEndEvent?(this.indent=this.indents.pop(),this.state=this.states.pop()):(this.write_indent(),this.write_indicator("-",!0,{indentation:!0}),this.states.push(this.expect_block_sequence_item),this.expect_node({sequence:!0}))},n.prototype.expect_block_mapping=function(){return this.increase_indent(),this.state=this.expect_first_block_mapping_key},n.prototype.expect_first_block_mapping_key=function(){return this.expect_block_mapping_key(!0)},n.prototype.expect_block_mapping_key=function(e){return null==e&&(e=!1),!e&&this.event instanceof i.MappingEndEvent?(this.indent=this.indents.pop(),this.state=this.states.pop()):(this.write_indent(),this.check_simple_key()?(this.states.push(this.expect_block_mapping_simple_value),this.expect_node({mapping:!0,simple_key:!0})):(this.write_indicator("?",!0,{indentation:!0}),this.states.push(this.expect_block_mapping_value),this.expect_node({mapping:!0})))},n.prototype.expect_block_mapping_simple_value=function(){return this.write_indicator(":",!1),this.states.push(this.expect_block_mapping_key),this.expect_node({mapping:!0})},n.prototype.expect_block_mapping_value=function(){return this.write_indent(),this.write_indicator(":",!0,{indentation:!0}),this.states.push(this.expect_block_mapping_key),this.expect_node({mapping:!0})},n.prototype.check_empty_document=function(){var e;return this.event instanceof i.DocumentStartEvent&&0!==this.events.length&&((e=this.events[0])instanceof i.ScalarEvent&&null==e.anchor&&null==e.tag&&e.implicit&&""===e.value)},n.prototype.check_empty_sequence=function(){return this.event instanceof i.SequenceStartEvent&&this.events[0]instanceof i.SequenceEndEvent},n.prototype.check_empty_mapping=function(){return this.event instanceof i.MappingStartEvent&&this.events[0]instanceof i.MappingEndEvent},n.prototype.check_simple_key=function(){var e;return e=0,this.event instanceof i.NodeEvent&&null!=this.event.anchor&&(null==this.prepared_anchor&&(this.prepared_anchor=this.prepare_anchor(this.event.anchor)),e+=this.prepared_anchor.length),null!=this.event.tag&&(this.event instanceof i.ScalarEvent||this.event instanceof i.CollectionStartEvent)&&(null==this.prepared_tag&&(this.prepared_tag=this.prepare_tag(this.event.tag)),e+=this.prepared_tag.length),this.event instanceof i.ScalarEvent&&(null==this.analysis&&(this.analysis=this.analyze_scalar(this.event.value)),e+=this.analysis.scalar.length),e<128&&(this.event instanceof i.AliasEvent||this.event instanceof i.ScalarEvent&&!this.analysis.empty&&!this.analysis.multiline||this.check_empty_sequence()||this.check_empty_mapping())},n.prototype.process_anchor=function(e){return null==this.event.anchor?void(this.prepared_anchor=null):(null==this.prepared_anchor&&(this.prepared_anchor=this.prepare_anchor(this.event.anchor)),this.prepared_anchor&&this.write_indicator(""+e+this.prepared_anchor,!0),this.prepared_anchor=null)},n.prototype.process_tag=function(){var e;if(e=this.event.tag,this.event instanceof i.ScalarEvent){if(null==this.style&&(this.style=this.choose_scalar_style()),(!this.canonical||null==e)&&(""===this.style&&this.event.implicit[0]||""!==this.style&&this.event.implicit[1]))return void(this.prepared_tag=null);this.event.implicit[0]&&null==e&&(e="!",this.prepared_tag=null)}else if((!this.canonical||null==e)&&this.event.implicit)return void(this.prepared_tag=null);return null==e&&this.error("tag is not specified"),null==this.prepared_tag&&(this.prepared_tag=this.prepare_tag(e)),this.write_indicator(this.prepared_tag,!0),this.prepared_tag=null},n.prototype.process_scalar=function(){var e;switch(null==this.analysis&&(this.analysis=this.analyze_scalar(this.event.value)),null==this.style&&(this.style=this.choose_scalar_style()),e=!this.simple_key_context,this.style){case'"':this.write_double_quoted(this.analysis.scalar,e);break;case"'":this.write_single_quoted(this.analysis.scalar,e);break;case">":this.write_folded(this.analysis.scalar);break;case"|":this.write_literal(this.analysis.scalar);break;default:this.write_plain(this.analysis.scalar,e)}return this.analysis=null,this.style=null},n.prototype.choose_scalar_style=function(){var e;return null==this.analysis&&(this.analysis=this.analyze_scalar(this.event.value)),'"'===this.event.style||this.canonical?'"':this.event.style||!this.event.implicit[0]||this.simple_key_context&&(this.analysis.empty||this.analysis.multiline)||!(this.flow_level&&this.analysis.allow_flow_plain||!this.flow_level&&this.analysis.allow_block_plain)?this.event.style&&(e=this.event.style,u.call("|>",e)>=0)&&!this.flow_level&&!this.simple_key_context&&this.analysis.allow_block?this.event.style:this.event.style&&"'"!==this.event.style||!this.analysis.allow_single_quoted||this.simple_key_context&&this.analysis.multiline?'"':"'":""},n.prototype.prepare_version=function(e){var t,n,r;return t=e[0],n=e[1],r=t+"."+n,1===t?r:this.error("unsupported YAML version",r)},n.prototype.prepare_tag_handle=function(e){var t,n,r,i;for(e||this.error("tag handle must not be empty"),"!"===e[0]&&"!"===e.slice(-1)||this.error("tag handle must start and end with '!':",e),i=e.slice(1,-1),n=0,r=i.length;n<r;n++)"0"<=(t=i[n])&&t<="9"||"A"<=t&&t<="Z"||"a"<=t&&t<="z"||u.call("-_",t)>=0||this.error("invalid character '"+t+"' in the tag handle:",e);return e},n.prototype.prepare_tag_prefix=function(e){var t,n,r,i;for(e||this.error("tag prefix must not be empty"),n=[],i=0,r=+("!"===e[0]);r<e.length;)t=e[r],"0"<=t&&t<="9"||"A"<=t&&t<="Z"||"a"<=t&&t<="z"||u.call("-;/?!:@&=+$,_.~*'()[]",t)>=0?r++:(i<r&&n.push(e.slice(i,r)),i=r+=1,n.push(t));return i<r&&n.push(e.slice(i,r)),n.join("")},n.prototype.prepare_tag=function(e){var t,n,r,i,o,a,l,c,p,f,h,d;if(e||this.error("tag must not be empty"),"!"===e)return e;for(i=null,h=e,p=function(){var e,t;e=this.tag_prefixes,t=[];for(a in e)s.call(e,a)&&t.push(a);return t}.call(this).sort(),o=0,l=p.length;o<l;o++)c=p[o],0===e.indexOf(c)&&("!"===c||c.length<e.length)&&(i=this.tag_prefixes[c],h=e.slice(c.length));for(n=[],f=r=0;r<h.length;)t=h[r],"0"<=t&&t<="9"||"A"<=t&&t<="Z"||"a"<=t&&t<="z"||u.call("-;/?!:@&=+$,_.~*'()[]",t)>=0||"!"===t&&"!"!==i?r++:(f<r&&n.push(h.slice(f,r)),f=r+=1,n.push(t));return f<r&&n.push(h.slice(f,r)),d=n.join(""),i?""+i+d:"!<"+d+">"},n.prototype.prepare_anchor=function(e){var t,n,r;for(e||this.error("anchor must not be empty"),n=0,r=e.length;n<r;n++)"0"<=(t=e[n])&&t<="9"||"A"<=t&&t<="Z"||"a"<=t&&t<="z"||u.call("-_",t)>=0||this.error("invalid character '"+t+"' in the anchor:",e);return e},n.prototype.analyze_scalar=function(t){var n,i,o,a,s,l,c,p,f,h,d,m,v,g,y,_,b,x,w,k,E,S,C,A,D;for(t||new e(t,!0,!1,!1,!0,!0,!0,!1),l=!1,f=!1,_=!1,C=!1,!1,g=!1,v=!1,D=!1,A=!1,c=!1,S=!1,0!==t.indexOf("---")&&0!==t.indexOf("...")||(l=!0,f=!0),b=!0,h=1===t.length||(k=t[1],u.call("\0 \t\r\n…\u2028\u2029",k)>=0),w=!1,x=!1,m=0,m=d=0,y=t.length;d<y;m=++d)p=t[m],0===m?u.call("#,[]{}&*!|>'\"%@`",p)>=0||"-"===p&&h?(f=!0,l=!0):u.call("?:",p)>=0&&(f=!0,h&&(l=!0)):u.call(",?[]{}",p)>=0?f=!0:":"===p?(f=!0,h&&(l=!0)):"#"===p&&b&&(f=!0,l=!0),u.call("\n…\u2028\u2029",p)>=0&&(_=!0),"\n"===p||" "<=p&&p<="~"||("\ufeff"!==p&&("…"===p||" "<=p&&p<="퟿"||""<=p&&p<="�")?(!0,this.allow_unicode||(C=!0)):C=!0)," "===p?(0===m&&(g=!0),m===t.length-1&&(D=!0),x&&(c=!0),x=!1,w=!0):u.call("\n…\u2028\u2029",p)>=0?(0===m&&(v=!0),m===t.length-1&&(A=!0),w&&(S=!0),x=!0,w=!1):(x=!1,w=!1),b=u.call(r,p)>=0,h=m+2>=t.length||(E=t[m+2],u.call(r,E)>=0);return a=!0,i=!0,s=!0,o=!0,n=!0,(g||v||D||A)&&(a=i=!1),D&&(n=!1),c&&(a=i=s=!1),(S||C)&&(a=i=s=n=!1),_&&(a=i=!1),f&&(a=!1),l&&(i=!1),new e(t,!1,_,a,i,s,o,n)},n.prototype.write_stream_start=function(){if(this.encoding&&0===this.encoding.indexOf("utf-16"))return this.stream.write("\ufeff",this.encoding)},n.prototype.write_stream_end=function(){return this.flush_stream()},n.prototype.write_indicator=function(e,t,n){var r;return null==n&&(n={}),r=this.whitespace||!t?e:" "+e,this.whitespace=!!n.whitespace,this.indentation&&(this.indentation=!!n.indentation),this.column+=r.length,this.open_ended=!1,this.stream.write(r,this.encoding)},n.prototype.write_indent=function(){var e,t,n;if(t=null!=(n=this.indent)?n:0,(!this.indentation||this.column>t||this.column===t&&!this.whitespace)&&this.write_line_break(),this.column<t)return this.whitespace=!0,e=new Array(t-this.column+1).join(" "),this.column=t,this.stream.write(e,this.encoding)},n.prototype.write_line_break=function(e){return this.whitespace=!0,this.indentation=!0,this.line+=1,this.column=0,this.stream.write(null!=e?e:this.best_line_break,this.encoding)},n.prototype.write_version_directive=function(e){return this.stream.write("%YAML "+e,this.encoding),this.write_line_break()},n.prototype.write_tag_directive=function(e,t){return this.stream.write("%TAG "+e+" "+t,this.encoding),this.write_line_break()},n.prototype.write_single_quoted=function(e,t){var n,r,i,o,a,s,l,c,p,f;for(null==t&&(t=!0),this.write_indicator("'",!0),p=!1,r=!1,f=a=0;a<=e.length;){if(i=e[a],p)null!=i&&" "===i||(f+1===a&&this.column>this.best_width&&t&&0!==f&&a!==e.length?this.write_indent():(o=e.slice(f,a),this.column+=o.length,this.stream.write(o,this.encoding)),f=a);else if(r){if(null==i||u.call("\n…\u2028\u2029",i)<0){for("\n"===e[f]&&this.write_line_break(),c=e.slice(f,a),s=0,l=c.length;s<l;s++)n=c[s],"\n"===n?this.write_line_break():this.write_line_break(n);this.write_indent(),f=a}}else(null==i||u.call(" \n…\u2028\u2029",i)>=0||"'"===i)&&f<a&&(o=e.slice(f,a),this.column+=o.length,this.stream.write(o,this.encoding),f=a);"'"===i&&(this.column+=2,this.stream.write("''",this.encoding),f=a+1),null!=i&&(p=" "===i,r=u.call("\n…\u2028\u2029",i)>=0),a++}return this.write_indicator("'",!1)},n.prototype.write_double_quoted=function(e,t){var n,r,i,a;for(null==t&&(t=!0),this.write_indicator('"',!0),a=i=0;i<=e.length;)n=e[i],(null==n||u.call('"\\…\u2028\u2029\ufeff',n)>=0||!(" "<=n&&n<="~"||this.allow_unicode&&(" "<=n&&n<="퟿"||""<=n&&n<="�")))&&(a<i&&(r=e.slice(a,i),this.column+=r.length,this.stream.write(r,this.encoding),a=i),null!=n&&(r=n in l?"\\"+l[n]:n<="ÿ"?"\\x"+o.pad_left(o.to_hex(n),"0",2):n<="￿"?"\\u"+o.pad_left(o.to_hex(n),"0",4):"\\U"+o.pad_left(o.to_hex(n),"0",16),this.column+=r.length,this.stream.write(r,this.encoding),a=i+1)),t&&0<i&&i<e.length-1&&(" "===n||a>=i)&&this.column+(i-a)>this.best_width&&(r=e.slice(a,i)+"\\",a<i&&(a=i),this.column+=r.length,this.stream.write(r,this.encoding),this.write_indent(),this.whitespace=!1,this.indentation=!1," "===e[a]&&(r="\\",this.column+=r.length,this.stream.write(r,this.encoding))),i++;return this.write_indicator('"',!1)},n.prototype.write_folded=function(e){var t,n,r,i,o,a,s,l,c,p,f,h,d;for(a=this.determine_block_hints(e),this.write_indicator(">"+a,!0),"+"===a.slice(-1)&&(this.open_ended=!0),this.write_line_break(),l=!0,n=!0,h=!1,d=o=0,f=[];o<=e.length;){if(r=e[o],n){if(null==r||u.call("\n…\u2028\u2029",r)<0){for(l||null==r||" "===r||"\n"!==e[d]||this.write_line_break(),l=" "===r,p=e.slice(d,o),s=0,c=p.length;s<c;s++)t=p[s],"\n"===t?this.write_line_break():this.write_line_break(t);null!=r&&this.write_indent(),d=o}}else h?" "!==r&&(d+1===o&&this.column>this.best_width?this.write_indent():(i=e.slice(d,o),this.column+=i.length,this.stream.write(i,this.encoding)),d=o):(null==r||u.call(" \n…\u2028\u2029",r)>=0)&&(i=e.slice(d,o),this.column+=i.length,this.stream.write(i,this.encoding),null==r&&this.write_line_break(),d=o);null!=r&&(n=u.call("\n…\u2028\u2029",r)>=0,h=" "===r),f.push(o++)}return f},n.prototype.write_literal=function(e){var t,n,r,i,o,a,s,l,c,p,f;for(a=this.determine_block_hints(e),this.write_indicator("|"+a,!0),"+"===a.slice(-1)&&(this.open_ended=!0),this.write_line_break(),n=!0,f=o=0,p=[];o<=e.length;){if(r=e[o],n){if(null==r||u.call("\n…\u2028\u2029",r)<0){for(c=e.slice(f,o),s=0,l=c.length;s<l;s++)t=c[s],"\n"===t?this.write_line_break():this.write_line_break(t);null!=r&&this.write_indent(),f=o}}else(null==r||u.call("\n…\u2028\u2029",r)>=0)&&(i=e.slice(f,o),this.stream.write(i,this.encoding),null==r&&this.write_line_break(),f=o);null!=r&&(n=u.call("\n…\u2028\u2029",r)>=0),p.push(o++)}return p},n.prototype.write_plain=function(e,t){var n,r,i,o,a,s,l,c,p,f,h;if(null==t&&(t=!0),e){for(this.root_context&&(this.open_ended=!0),this.whitespace||(o=" ",this.column+=o.length,this.stream.write(o,this.encoding)),this.whitespace=!1,this.indentation=!1,f=!1,r=!1,h=a=0,p=[];a<=e.length;){if(i=e[a],f)" "!==i&&(h+1===a&&this.column>this.best_width&&t?(this.write_indent(),this.whitespace=!1,this.indentation=!1):(o=e.slice(h,a),this.column+=o.length,this.stream.write(o,this.encoding)),h=a);else if(r){if(u.call("\n…\u2028\u2029",i)<0){for("\n"===e[h]&&this.write_line_break(),c=e.slice(h,a),s=0,l=c.length;s<l;s++)n=c[s],"\n"===n?this.write_line_break():this.write_line_break(n);this.write_indent(),this.whitespace=!1,this.indentation=!1,h=a}}else(null==i||u.call(" \n…\u2028\u2029",i)>=0)&&(o=e.slice(h,a),this.column+=o.length,this.stream.write(o,this.encoding),h=a);null!=i&&(f=" "===i,r=u.call("\n…\u2028\u2029",i)>=0),p.push(a++)}return p}},n.prototype.determine_block_hints=function(e){var t,n,r,i,o;return n="",t=e[0],r=e.length-2,o=e[r++],i=e[r++],u.call(" \n…\u2028\u2029",t)>=0&&(n+=this.best_indent),u.call("\n…\u2028\u2029",i)<0?n+="-":(1===e.length||u.call("\n…\u2028\u2029",o)>=0)&&(n+="+"),n},n.prototype.flush_stream=function(){var e;return"function"==typeof(e=this.stream).flush?e.flush():void 0},n.prototype.error=function(e,n){var r,i;throw n&&(n=null!=(r=null!=n&&null!=(i=n.constructor)?i.name:void 0)?r:o.inspect(n)),new t.EmitterError(e+(n?" "+n:""))},n}(),e=function(){function e(e,t,n,r,i,o,a,s){this.scalar=e,this.empty=t,this.multiline=n,this.allow_flow_plain=r,this.allow_block_plain=i,this.allow_single_quoted=o,this.allow_double_quoted=a,this.allow_block=s}return e}()}).call(this)},function(e,t,n){(function(){var e,t,r,i,o,a,s,u=[].slice;s=n(61),i=n(501),a=n(502),r=n(500),e=n(498),o=n(266),t=n(499),this.make_loader=function(n,l,c,p,f,h){var d;return null==n&&(n=i.Reader),null==l&&(l=a.Scanner),null==c&&(c=r.Parser),null==p&&(p=e.Composer),null==f&&(f=o.Resolver),null==h&&(h=t.Constructor),d=[n,l,c,p,f,h],function(){function e(e){var n,r,i;for(d[0].call(this,e),i=d.slice(1),n=0,r=i.length;n<r;n++)t=i[n],t.call(this)}var t;return s.extend.apply(s,[e.prototype].concat(u.call(function(){var e,n,r;for(r=[],e=0,n=d.length;e<n;e++)t=d[e],r.push(t.prototype);return r}()))),e}()},this.Loader=this.make_loader()}).call(this)},function(e,t,n){(function(){var e,r,i=function(e,t){function n(){this.constructor=e}for(var r in t)o.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},o={}.hasOwnProperty;r=n(94),e=n(45).YAMLError,this.RepresenterError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return i(t,e),t}(e),this.BaseRepresenter=function(){function e(e){var t;t=null!=e?e:{},this.default_style=t.default_style,this.default_flow_style=t.default_flow_style,this.represented_objects={},this.object_keeper=[],this.alias_key=null}return e.prototype.yaml_representers_types=[],e.prototype.yaml_representers_handlers=[],e.prototype.yaml_multi_representers_types=[],e.prototype.yaml_multi_representers_handlers=[],e.add_representer=function(e,t){return this.prototype.hasOwnProperty("yaml_representers_types")||(this.prototype.yaml_representers_types=[].concat(this.prototype.yaml_representers_types)),this.prototype.hasOwnProperty("yaml_representers_handlers")||(this.prototype.yaml_representers_handlers=[].concat(this.prototype.yaml_representers_handlers)),this.prototype.yaml_representers_types.push(e),this.prototype.yaml_representers_handlers.push(t)},e.add_multi_representer=function(e,t){return this.prototype.hasOwnProperty("yaml_multi_representers_types")||(this.prototype.yaml_multi_representers_types=[].concat(this.prototype.yaml_multi_representers_types)),this.prototype.hasOwnProperty("yaml_multi_representers_handlers")||(this.prototype.yaml_multi_representers_handlers=[].concat(this.prototype.yaml_multi_representers_handlers)),this.prototype.yaml_multi_representers_types.push(e),this.prototype.yaml_multi_representers_handlers.push(t)},e.prototype.represent=function(e){var t;return t=this.represent_data(e),this.serialize(t),this.represented_objects={},this.object_keeper=[],this.alias_key=null},e.prototype.represent_data=function(e){var t,n,i,o,a,s,u;if(this.ignore_aliases(e))this.alias_key=null;else if(-1!==(n=this.object_keeper.indexOf(e))){if(this.alias_key=n,this.alias_key in this.represented_objects)return this.represented_objects[this.alias_key]}else this.alias_key=this.object_keeper.length,this.object_keeper.push(e);if(s=null,t=null===e?"null":typeof e,"object"===t&&(t=e.constructor),-1!==(n=this.yaml_representers_types.lastIndexOf(t))&&(s=this.yaml_representers_handlers[n]),null==s)for(a=this.yaml_multi_representers_types,n=i=0,o=a.length;i<o;n=++i)if(u=a[n],e instanceof u){s=this.yaml_multi_representers_handlers[n];break}return null==s&&(-1!==(n=this.yaml_multi_representers_types.lastIndexOf(void 0))?s=this.yaml_multi_representers_handlers[n]:-1!==(n=this.yaml_representers_types.lastIndexOf(void 0))&&(s=this.yaml_representers_handlers[n])),null!=s?s.call(this,e):new r.ScalarNode(null,""+e)},e.prototype.represent_scalar=function(e,t,n){var i;return null==n&&(n=this.default_style),i=new r.ScalarNode(e,t,null,null,n),null!=this.alias_key&&(this.represented_objects[this.alias_key]=i),i},e.prototype.represent_sequence=function(e,t,n){var i,o,a,s,u,l,c,p;for(p=[],u=new r.SequenceNode(e,p,null,null,n),null!=this.alias_key&&(this.represented_objects[this.alias_key]=u),i=!0,a=0,s=t.length;a<s;a++)o=t[a],l=this.represent_data(o),l instanceof r.ScalarNode||l.style||(i=!1),p.push(l);return null==n&&(u.flow_style=null!=(c=this.default_flow_style)?c:i),u},e.prototype.represent_mapping=function(e,t,n){var i,a,s,u,l,c,p,f;f=[],u=new r.MappingNode(e,f,n),this.alias_key&&(this.represented_objects[this.alias_key]=u),i=!0;for(a in t)o.call(t,a)&&(s=t[a],l=this.represent_data(a),c=this.represent_data(s),l instanceof r.ScalarNode||l.style||(i=!1),c instanceof r.ScalarNode||c.style||(i=!1),f.push([l,c]));return n||(u.flow_style=null!=(p=this.default_flow_style)?p:i),u},e.prototype.ignore_aliases=function(e){return!1},e}(),this.Representer=function(e){function n(){return n.__super__.constructor.apply(this,arguments)}return i(n,e),n.prototype.represent_boolean=function(e){return this.represent_scalar("tag:yaml.org,2002:bool",e?"true":"false")},n.prototype.represent_null=function(e){return this.represent_scalar("tag:yaml.org,2002:null","null")},n.prototype.represent_number=function(e){var t,n;return t="tag:yaml.org,2002:"+(e%1==0?"int":"float"),n=e!==e?".nan":Infinity===e?".inf":-Infinity===e?"-.inf":e.toString(),this.represent_scalar(t,n)},n.prototype.represent_string=function(e){return this.represent_scalar("tag:yaml.org,2002:str",e)},n.prototype.represent_array=function(e){return this.represent_sequence("tag:yaml.org,2002:seq",e)},n.prototype.represent_date=function(e){return this.represent_scalar("tag:yaml.org,2002:timestamp",e.toISOString())},n.prototype.represent_object=function(e){return this.represent_mapping("tag:yaml.org,2002:map",e)},n.prototype.represent_undefined=function(e){throw new t.RepresenterError("cannot represent an onbject: "+e)},n.prototype.ignore_aliases=function(e){var t;return null==e||("boolean"==(t=typeof e)||"number"===t||"string"===t)},n}(this.BaseRepresenter),this.Representer.add_representer("boolean",this.Representer.prototype.represent_boolean),this.Representer.add_representer("null",this.Representer.prototype.represent_null),this.Representer.add_representer("number",this.Representer.prototype.represent_number),this.Representer.add_representer("string",this.Representer.prototype.represent_string),this.Representer.add_representer(Array,this.Representer.prototype.represent_array),this.Representer.add_representer(Date,this.Representer.prototype.represent_date),this.Representer.add_representer(Object,this.Representer.prototype.represent_object),this.Representer.add_representer(null,this.Representer.prototype.represent_undefined)}).call(this)},function(e,t,n){(function(){var e,t,r,i,o=function(e,t){function n(){this.constructor=e}for(var r in t)a.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},a={}.hasOwnProperty;t=n(127),r=n(94),i=n(61),e=n(45).YAMLError,this.SerializerError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return o(t,e),t}(e),this.Serializer=function(){function e(e){var t;t=null!=e?e:{},this.encoding=t.encoding,this.explicit_start=t.explicit_start,this.explicit_end=t.explicit_end,this.version=t.version,this.tags=t.tags,this.serialized_nodes={},this.anchors={},this.last_anchor_id=0,this.closed=null}return e.prototype.open=function(){if(null===this.closed)return this.emit(new t.StreamStartEvent(this.encoding)),this.closed=!1;throw this.closed?new SerializerError("serializer is closed"):new SerializerError("serializer is already open")},e.prototype.close=function(){if(null===this.closed)throw new SerializerError("serializer is not opened");if(!this.closed)return this.emit(new t.StreamEndEvent),this.closed=!0},e.prototype.serialize=function(e){if(null===this.closed)throw new SerializerError("serializer is not opened");if(this.closed)throw new SerializerError("serializer is closed");return null!=e&&(this.emit(new t.DocumentStartEvent(void 0,void 0,this.explicit_start,this.version,this.tags)),this.anchor_node(e),this.serialize_node(e),this.emit(new t.DocumentEndEvent(void 0,void 0,this.explicit_end))),this.serialized_nodes={},this.anchors={},this.last_anchor_id=0},e.prototype.anchor_node=function(e){var t,n,i,o,a,s,u,l,c,p,f,h,d,m;if(e.unique_id in this.anchors)return null!=(t=this.anchors)[l=e.unique_id]?t[l]:t[l]=this.generate_anchor(e);if(this.anchors[e.unique_id]=null,e instanceof r.SequenceNode){for(c=e.value,h=[],n=0,s=c.length;n<s;n++)i=c[n],h.push(this.anchor_node(i));return h}if(e instanceof r.MappingNode){for(p=e.value,d=[],o=0,u=p.length;o<u;o++)f=p[o],a=f[0],m=f[1],this.anchor_node(a),d.push(this.anchor_node(m));return d}},e.prototype.generate_anchor=function(e){return"id"+i.pad_left(++this.last_anchor_id,"0",4)},e.prototype.serialize_node=function(e,n,i){var o,a,s,u,l,c,p,f,h,d,m,v,g,y;if(o=this.anchors[e.unique_id],e.unique_id in this.serialized_nodes)return this.emit(new t.AliasEvent(o));if(this.serialized_nodes[e.unique_id]=!0,this.descend_resolver(n,i),e instanceof r.ScalarNode)s=this.resolve(r.ScalarNode,e.value,[!0,!1]),a=this.resolve(r.ScalarNode,e.value,[!1,!0]),l=[e.tag===s,e.tag===a],this.emit(new t.ScalarEvent(o,e.tag,l,e.value,void 0,void 0,e.style));else if(e instanceof r.SequenceNode){for(l=e.tag===this.resolve(r.SequenceNode,e.value,!0),this.emit(new t.SequenceStartEvent(o,e.tag,l,void 0,void 0,e.flow_style)),m=e.value,i=u=0,h=m.length;u<h;i=++u)c=m[i],this.serialize_node(c,e,i);this.emit(new t.SequenceEndEvent)}else if(e instanceof r.MappingNode){for(l=e.tag===this.resolve(r.MappingNode,e.value,!0),this.emit(new t.MappingStartEvent(o,e.tag,l,void 0,void 0,e.flow_style)),v=e.value,p=0,d=v.length;p<d;p++)g=v[p],f=g[0],y=g[1],this.serialize_node(f,e,null),this.serialize_node(y,e,f);this.emit(new t.MappingEndEvent)}return this.ascend_resolver()},e}()}).call(this)},function(e,t,n){(function(){var e,r,i;this.composer=n(498),this.constructor=n(499),e=this.dumper=n(1201),this.errors=n(45),this.events=n(127),r=this.loader=n(1203),this.nodes=n(94),this.parser=n(500),this.reader=n(501),this.resolver=n(266),this.scanner=n(502),this.tokens=n(267),i=n(61),this.scan=function(e,t){var n,i;for(null==t&&(t=r.Loader),n=new t(e),i=[];n.check_token();)i.push(n.get_token());return i},this.parse=function(e,t){var n,i;for(null==t&&(t=r.Loader),n=new t(e),i=[];n.check_event();)i.push(n.get_event());return i},this.compose=function(e,t){var n;return null==t&&(t=r.Loader),n=new t(e),n.get_single_node()},this.compose_all=function(e,t){var n,i;for(null==t&&(t=r.Loader),n=new t(e),i=[];n.check_node();)i.push(n.get_node());return i},this.load=function(e,t){var n;return null==t&&(t=r.Loader),n=new t(e),n.get_single_data()},this.load_all=function(e,t){var n,i;for(null==t&&(t=r.Loader),n=new t(e),i=[];n.check_data();)i.push(n.get_data());return i},this.emit=function(t,n,r,o){var a,s,u,l,c;null==r&&(r=e.Dumper),null==o&&(o={}),s=n||new i.StringStream,a=new r(s,o);try{for(l=0,c=t.length;l<c;l++)u=t[l],a.emit(u)}finally{a.dispose()}return n||s.string},this.serialize=function(n,r,i,o){return null==i&&(i=e.Dumper),null==o&&(o={}),t.serialize_all([n],r,i,o)},this.serialize_all=function(t,n,r,o){var a,s,u,l,c;null==r&&(r=e.Dumper),null==o&&(o={}),s=n||new i.StringStream,a=new r(s,o);try{for(a.open(),u=0,l=t.length;u<l;u++)c=t[u],a.serialize(c);a.close()}finally{a.dispose()}return n||s.string},this.dump=function(n,r,i,o){return null==i&&(i=e.Dumper),null==o&&(o={}),t.dump_all([n],r,i,o)},this.dump_all=function(t,n,r,o){var a,s,u,l,c;null==r&&(r=e.Dumper),null==o&&(o={}),s=n||new i.StringStream,a=new r(s,o);try{for(a.open(),l=0,c=t.length;l<c;l++)u=t[l],a.represent(u);a.close()}finally{a.dispose()}return n||s.string}}).call(this)},function(e,t,n){var r,i,o;!function(n,a){i=[],r=a(),void 0!==(o="function"==typeof r?r.apply(t,i):r)&&(e.exports=o)}(0,function(){"use strict";var e=function(e){return"getComputedStyle"in window&&"smooth"===window.getComputedStyle(e)["scroll-behavior"]};if("undefined"==typeof window||!("document"in window))return{};var t=function(t,n,r){n=n||999,r||0===r||(r=9);var i,o=function(e){i=e},a=function(){clearTimeout(i),o(0)},s=function(e){return Math.max(0,t.getTopOf(e)-r)},u=function(r,i,s){if(a(),0===i||i&&i<0||e(t.body))t.toY(r),s&&s();else{var u=t.getY(),l=Math.max(0,r)-u,c=(new Date).getTime();i=i||Math.min(Math.abs(l),n),function e(){o(setTimeout(function(){var n=Math.min(1,((new Date).getTime()-c)/i),r=Math.max(0,Math.floor(u+l*(n<.5?2*n*n:n*(4-2*n)-1)));t.toY(r),n<1&&t.getHeight()+r<t.body.scrollHeight?e():(setTimeout(a,99),s&&s())},9))}()}},l=function(e,t,n){u(s(e),t,n)},c=function(e,n,i){var o=e.getBoundingClientRect().height,a=t.getTopOf(e)+o,c=t.getHeight(),p=t.getY(),f=p+c;s(e)<p||o+r>c?l(e,n,i):a+r>f?u(a-c+r,n,i):i&&i()},p=function(e,n,r,i){u(Math.max(0,t.getTopOf(e)-t.getHeight()/2+(r||e.getBoundingClientRect().height/2)),n,i)};return{setup:function(e,t){return(0===e||e)&&(n=e),(0===t||t)&&(r=t),{defaultDuration:n,edgeOffset:r}},to:l,toY:u,intoView:c,center:p,stop:a,moving:function(){return!!i},getY:t.getY,getTopOf:t.getTopOf}},n=document.documentElement,r=function(){return window.scrollY||n.scrollTop},i=t({body:document.scrollingElement||document.body,toY:function(e){window.scrollTo(0,e)},getY:r,getHeight:function(){return window.innerHeight||n.clientHeight},getTopOf:function(e){return e.getBoundingClientRect().top+r()-n.offsetTop}});if(i.createScroller=function(e,r,i){return t({body:e,toY:function(t){e.scrollTop=t},getY:function(){return e.scrollTop},getHeight:function(){return Math.min(e.clientHeight,window.innerHeight||n.clientHeight)},getTopOf:function(e){return e.offsetTop}},r,i)},"addEventListener"in window&&!window.noZensmooth&&!e(document.body)){var o="scrollRestoration"in history;o&&(history.scrollRestoration="auto"),window.addEventListener("load",function(){o&&(setTimeout(function(){history.scrollRestoration="manual"},9),window.addEventListener("popstate",function(e){e.state&&"zenscrollY"in e.state&&i.toY(e.state.zenscrollY)},!1)),window.location.hash&&setTimeout(function(){var e=i.setup().edgeOffset;if(e){var t=document.getElementById(window.location.href.split("#")[1]);if(t){var n=Math.max(0,i.getTopOf(t)-e),r=i.getY()-n;0<=r&&r<9&&window.scrollTo(0,n)}}},9)},!1);var a=new RegExp("(^|\\s)noZensmooth(\\s|$)");window.addEventListener("click",function(e){for(var t=e.target;t&&"A"!==t.tagName;)t=t.parentNode;if(!(!t||1!==e.which||e.shiftKey||e.metaKey||e.ctrlKey||e.altKey)){if(o)try{history.replaceState({zenscrollY:i.getY()},"")}catch(e){}var n=t.getAttribute("href")||"";if(0===n.indexOf("#")&&!a.test(t.className)){var r=0,s=document.getElementById(n.substring(1));if("#"!==n){if(!s)return;r=i.getTopOf(s)}e.preventDefault();var u=function(){window.location=n},l=i.setup().edgeOffset;l&&(r=Math.max(0,r-l),u=function(){history.pushState(null,"",n)}),i.toY(r,null,u)}}},!1)}return i})},function(e,t,n){function r(e){return n(i(e))}function i(e){var t=o[e];if(!(t+1))throw new Error("Cannot find module '"+e+"'.");return t}var o={"./all.js":271,"./ast/ast.js":272,"./ast/index.js":273,"./ast/jump-to-path.jsx":274,"./auth/actions.js":168,"./auth/index.js":275,"./auth/reducers.js":276,"./auth/selectors.js":277,"./auth/spec-wrap-actions.js":278,"./configs/actions.js":169,"./configs/index.js":279,"./configs/reducers.js":280,"./configs/selectors.js":281,"./deep-linking/helpers.js":282,"./deep-linking/index.js":283,"./deep-linking/layout-wrap-actions.js":284,"./deep-linking/spec-wrap-actions.js":285,"./download-url.js":286,"./err/actions.js":128,"./err/error-transformers/hook.js":287,"./err/error-transformers/transformers/not-of-type.js":288,"./err/error-transformers/transformers/parameter-oneof.js":289,"./err/error-transformers/transformers/strip-instance.js":290,"./err/index.js":291,"./err/reducers.js":292,"./err/selectors.js":293,"./layout/actions.js":170,"./layout/index.js":294,"./layout/reducers.js":295,"./layout/selectors.js":296,"./logs/index.js":297,"./oas3/actions.js":171,"./oas3/auth-extensions/wrap-selectors.js":298,"./oas3/components/callbacks.jsx":299,"./oas3/components/http-auth.jsx":300,"./oas3/components/index.js":301,"./oas3/components/operation-link.jsx":302,"./oas3/components/operation-servers.jsx":303,"./oas3/components/request-body-editor.jsx":304,"./oas3/components/request-body.jsx":305,"./oas3/components/servers.jsx":306,"./oas3/helpers.js":34,"./oas3/index.js":307,"./oas3/reducers.js":308,"./oas3/selectors.js":309,"./oas3/spec-extensions/selectors.js":310,"./oas3/spec-extensions/wrap-selectors.js":311,"./oas3/wrap-components/auth-item.jsx":312,"./oas3/wrap-components/index.js":313,"./oas3/wrap-components/markdown.js":314,"./oas3/wrap-components/model.jsx":315,"./oas3/wrap-components/online-validator-badge.js":316,"./oas3/wrap-components/parameters.jsx":317,"./oas3/wrap-components/version-stamp.jsx":318,"./samples/fn.js":172,"./samples/index.js":319,"./spec/actions.js":173,"./spec/index.js":320,"./spec/reducers.js":321,"./spec/selectors.js":322,"./spec/wrap-actions.js":323,"./split-pane-mode/components/split-pane-mode.jsx":324,"./split-pane-mode/index.js":325,"./swagger-js/index.js":326,"./util/index.js":327,"./view/index.js":328,"./view/root-injects.js":329};r.keys=function(){return Object.keys(o)},r.resolve=i,e.exports=r,r.id=1208},function(e,t){},function(e,t){},function(e,t){},function(e,t){},function(e,t,n){n(505),e.exports=n(504)}])});
-+//# sourceMappingURL=swagger-ui-bundle.js.map
-diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-standalone-preset.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-standalone-preset.js
-deleted file mode 100644
-index b24fd08faf2..00000000000
---- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-standalone-preset.js
-+++ /dev/null
-@@ -1,13 +0,0 @@
--!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.SwaggerUIStandalonePreset=e():t.SwaggerUIStandalonePreset=e()}(this,function(){return function(t){function e(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,e),i.l=!0,i.exports}var n={};return e.m=t,e.c=n,e.i=function(t){return t},e.d=function(t,n,r){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:r})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="/dist",e(e.s=275)}([function(t,e,n){"use strict";function r(t){var e={};return null!==t&&Object.keys(t).forEach(function(n){t[n].forEach(function(t){e[String(t)]=n})}),e}function i(t,e){if(e=e||{},Object.keys(e).forEach(function(e){if(-1===s.indexOf(e))throw new o('Unknown option "'+e+'" is met in definition of "'+t+'" YAML type.')}),this.tag=t,this.kind=e.kind||null,this.resolve=e.resolve||function(){return!0},this.construct=e.construct||function(t){return t},this.instanceOf=e.instanceOf||null,this.predicate=e.predicate||null,this.represent=e.represent||null,this.defaultStyle=e.defaultStyle||null,this.styleAliases=r(e.styleAliases||null),-1===a.indexOf(this.kind))throw new o('Unknown kind "'+this.kind+'" is specified for "'+t+'" YAML type.')}var o=n(33),s=["kind","resolve","construct","instanceOf","predicate","represent","defaultStyle","styleAliases"],a=["scalar","sequence","mapping"];t.exports=i},function(t,e,n){var r=n(103)("wks"),i=n(70),o=n(4).Symbol,s="function"==typeof o;(t.exports=function(t){return r[t]||(r[t]=s&&o[t]||(s?o:i)("Symbol."+t))}).store=r},function(t,e,n){var r=n(4),i=n(13),o=n(14),s=n(22),a=n(40),u=function(t,e,n){var c,h,l,p,f=t&u.F,d=t&u.G,m=t&u.S,y=t&u.P,v=t&u.B,x=d?r:m?r[e]||(r[e]={}):(r[e]||{}).prototype,g=d?i:i[e]||(i[e]={}),D=g.prototype||(g.prototype={});d&&(n=e);for(c in n)h=!f&&x&&void 0!==x[c],l=(h?x:n)[c],p=v&&h?a(l,r):y&&"function"==typeof l?a(Function.call,l):l,x&&s(x,c,l,t&u.U),g[c]!=l&&o(g,c,p),y&&D[c]!=l&&(D[c]=l)};r.core=i,u.F=1,u.G=2,u.S=4,u.P=8,u.B=16,u.W=32,u.U=64,u.R=128,t.exports=u},function(t,e,n){var r=n(2),i=n(29),o=n(8),s=/"/g,a=function(t,e,n,r){var i=String(o(t)),a="<"+e;return""!==n&&(a+=" "+n+'="'+String(r).replace(s,"&quot;")+'"'),a+">"+i+"</"+e+">"};t.exports=function(t,e){var n={};n[t]=e(a),r(r.P+r.F*i(function(){var e=""[t]('"');return e!==e.toLowerCase()||e.split('"').length>3}),"String",n)}},function(t,e){var n=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(t,e){var n=t.exports={version:"2.5.3"};"number"==typeof __e&&(__e=n)},function(t,e){var n=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(t,e,n){var r=n(58)("wks"),i=n(38),o=n(6).Symbol,s="function"==typeof o;(t.exports=function(t){return r[t]||(r[t]=s&&o[t]||(s?o:i)("Symbol."+t))}).store=r},function(t,e){t.exports=function(t){if(void 0==t)throw TypeError("Can't call method on  "+t);return t}},function(t,e,n){t.exports=!n(26)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(t,e){var n={}.hasOwnProperty;t.exports=function(t,e){return n.call(t,e)}},function(t,e,n){var r=n(16),i=n(83),o=n(60),s=Object.defineProperty;e.f=n(9)?Object.defineProperty:function(t,e,n){if(r(t),e=o(e,!0),r(n),i)try{return s(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(t[e]=n.value),t}},function(t,e,n){var r=n(21);t.exports=function(t){if(!r(t))throw TypeError(t+" is not an object!");return t}},function(t,e){var n=t.exports={version:"2.5.3"};"number"==typeof __e&&(__e=n)},function(t,e,n){var r=n(42),i=n(102);t.exports=n(28)?function(t,e,n){return r.f(t,e,i(1,n))}:function(t,e,n){return t[e]=n,t}},function(t,e,n){"use strict";function r(t,e,n,r,o,s,a,u){if(i(e),!t){var c;if(void 0===e)c=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var h=[n,r,o,s,a,u],l=0;c=new Error(e.replace(/%s/g,function(){return h[l++]})),c.name="Invariant Violation"}throw c.framesToPop=1,c}}var i=function(t){};t.exports=r},function(t,e,n){var r=n(19);t.exports=function(t){if(!r(t))throw TypeError(t+" is not an object!");return t}},function(t,e,n){var r=n(6),i=n(5),o=n(81),s=n(18),a=function(t,e,n){var u,c,h,l=t&a.F,p=t&a.G,f=t&a.S,d=t&a.P,m=t&a.B,y=t&a.W,v=p?i:i[e]||(i[e]={}),x=v.prototype,g=p?r:f?r[e]:(r[e]||{}).prototype;p&&(n=e);for(u in n)(c=!l&&g&&void 0!==g[u])&&u in v||(h=c?g[u]:n[u],v[u]=p&&"function"!=typeof g[u]?n[u]:m&&c?o(h,r):y&&g[u]==h?function(t){var e=function(e,n,r){if(this instanceof t){switch(arguments.length){case 0:return new t;case 1:return new t(e);case 2:return new t(e,n)}return new t(e,n,r)}return t.apply(this,arguments)};return e.prototype=t.prototype,e}(h):d&&"function"==typeof h?o(Function.call,h):h,d&&((v.virtual||(v.virtual={}))[u]=h,t&a.R&&x&&!x[u]&&s(x,u,h)))};a.F=1,a.G=2,a.S=4,a.P=8,a.B=16,a.W=32,a.U=64,a.R=128,t.exports=a},function(t,e,n){var r=n(11),i=n(37);t.exports=n(9)?function(t,e,n){return r.f(t,e,i(1,n))}:function(t,e,n){return t[e]=n,t}},function(t,e){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,e,n){var r=n(151),i=n(50);t.exports=function(t){return r(i(t))}},function(t,e){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,e,n){var r=n(4),i=n(14),o=n(30),s=n(70)("src"),a=Function.toString,u=(""+a).split("toString");n(13).inspectSource=function(t){return a.call(t)},(t.exports=function(t,e,n,a){var c="function"==typeof n;c&&(o(n,"name")||i(n,"name",e)),t[e]!==n&&(c&&(o(n,s)||i(n,s,t[e]?""+t[e]:u.join(String(e)))),t===r?t[e]=n:a?t[e]?t[e]=n:i(t,e,n):(delete t[e],i(t,e,n)))})(Function.prototype,"toString",function(){return"function"==typeof this&&this[s]||a.call(this)})},function(t,e,n){"use strict";function r(t){return void 0===t||null===t}function i(t){return"object"==typeof t&&null!==t}function o(t){return Array.isArray(t)?t:r(t)?[]:[t]}function s(t,e){var n,r,i,o;if(e)for(o=Object.keys(e),n=0,r=o.length;n<r;n+=1)i=o[n],t[i]=e[i];return t}function a(t,e){var n,r="";for(n=0;n<e;n+=1)r+=t;return r}function u(t){return 0===t&&Number.NEGATIVE_INFINITY===1/t}t.exports.isNothing=r,t.exports.isObject=i,t.exports.toArray=o,t.exports.repeat=a,t.exports.isNegativeZero=u,t.exports.extend=s},function(t,e,n){"use strict";function r(t,e,n){var i=[];return t.include.forEach(function(t){n=r(t,e,n)}),t[e].forEach(function(t){n.forEach(function(e,n){e.tag===t.tag&&e.kind===t.kind&&i.push(n)}),n.push(t)}),n.filter(function(t,e){return-1===i.indexOf(e)})}function i(){function t(t){r[t.kind][t.tag]=r.fallback[t.tag]=t}var e,n,r={scalar:{},sequence:{},mapping:{},fallback:{}};for(e=0,n=arguments.length;e<n;e+=1)arguments[e].forEach(t);return r}function o(t){this.include=t.include||[],this.implicit=t.implicit||[],this.explicit=t.explicit||[],this.implicit.forEach(function(t){if(t.loadKind&&"scalar"!==t.loadKind)throw new a("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.")}),this.compiledImplicit=r(this,"implicit",[]),this.compiledExplicit=r(this,"explicit",[]),this.compiledTypeMap=i(this.compiledImplicit,this.compiledExplicit)}var s=n(23),a=n(33),u=n(0);o.DEFAULT=null,o.create=function(){var t,e;switch(arguments.length){case 1:t=o.DEFAULT,e=arguments[0];break;case 2:t=arguments[0],e=arguments[1];break;default:throw new a("Wrong number of arguments for Schema.create function")}if(t=s.toArray(t),e=s.toArray(e),!t.every(function(t){return t instanceof o}))throw new a("Specified list of super schemas (or a single Schema object) contains a non-Schema object.");if(!e.every(function(t){return t instanceof u}))throw new a("Specified list of YAML types (or a single Type object) contains a non-Type object.");return new o({include:t,explicit:e})},t.exports=o},function(t,e,n){"use strict";function r(t){return void 0!==t.ref}function i(t){return void 0!==t.key}var o=n(35),s=n(115),a=(n(46),n(118),Object.prototype.hasOwnProperty),u=n(116),c={key:!0,ref:!0,__self:!0,__source:!0},h=function(t,e,n,r,i,o,s){var a={$$typeof:u,type:t,key:e,ref:n,props:s,_owner:o};return a};h.createElement=function(t,e,n){var o,u={},l=null,p=null;if(null!=e){r(e)&&(p=e.ref),i(e)&&(l=""+e.key),void 0===e.__self?null:e.__self,void 0===e.__source?null:e.__source;for(o in e)a.call(e,o)&&!c.hasOwnProperty(o)&&(u[o]=e[o])}var f=arguments.length-2;if(1===f)u.children=n;else if(f>1){for(var d=Array(f),m=0;m<f;m++)d[m]=arguments[m+2];u.children=d}if(t&&t.defaultProps){var y=t.defaultProps;for(o in y)void 0===u[o]&&(u[o]=y[o])}return h(t,l,p,0,0,s.current,u)},h.createFactory=function(t){var e=h.createElement.bind(null,t);return e.type=t,e},h.cloneAndReplaceKey=function(t,e){return h(t.type,e,t.ref,t._self,t._source,t._owner,t.props)},h.cloneElement=function(t,e,n){var u,l=o({},t.props),p=t.key,f=t.ref,d=(t._self,t._source,t._owner);if(null!=e){r(e)&&(f=e.ref,d=s.current),i(e)&&(p=""+e.key);var m;t.type&&t.type.defaultProps&&(m=t.type.defaultProps);for(u in e)a.call(e,u)&&!c.hasOwnProperty(u)&&(void 0===e[u]&&void 0!==m?l[u]=m[u]:l[u]=e[u])}var y=arguments.length-2;if(1===y)l.children=n;else if(y>1){for(var v=Array(y),x=0;x<y;x++)v[x]=arguments[x+2];l.children=v}return h(t.type,p,f,0,0,d,l)},h.isValidElement=function(t){return"object"==typeof t&&null!==t&&t.$$typeof===u},t.exports=h},function(t,e){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,e){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},function(t,e,n){t.exports=!n(29)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(t,e){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,e){var n={}.hasOwnProperty;t.exports=function(t,e){return n.call(t,e)}},function(t,e){t.exports={}},function(t,e,n){var r=n(43),i=Math.min;t.exports=function(t){return t>0?i(r(t),9007199254740991):0}},function(t,e,n){"use strict";function r(t,e){Error.call(this),this.name="YAMLException",this.reason=t,this.mark=e,this.message=(this.reason||"(unknown reason)")+(this.mark?" "+this.mark.toString():""),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=(new Error).stack||""}r.prototype=Object.create(Error.prototype),r.prototype.constructor=r,r.prototype.toString=function(t){var e=this.name+": ";return e+=this.reason||"(unknown reason)",!t&&this.mark&&(e+=" "+this.mark.toString()),e},t.exports=r},function(t,e,n){"use strict";var r=n(24);t.exports=new r({include:[n(110)],implicit:[n(255),n(248)],explicit:[n(240),n(250),n(251),n(253)]})},function(t,e,n){"use strict";function r(t){if(null===t||void 0===t)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(t)}/*
--object-assign
--(c) Sindre Sorhus
--@license MIT
--*/
--var i=Object.getOwnPropertySymbols,o=Object.prototype.hasOwnProperty,s=Object.prototype.propertyIsEnumerable;t.exports=function(){try{if(!Object.assign)return!1;var t=new String("abc");if(t[5]="de","5"===Object.getOwnPropertyNames(t)[0])return!1;for(var e={},n=0;n<10;n++)e["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(e).map(function(t){return e[t]}).join(""))return!1;var r={};return"abcdefghijklmnopqrst".split("").forEach(function(t){r[t]=t}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},r)).join("")}catch(t){return!1}}()?Object.assign:function(t,e){for(var n,a,u=r(t),c=1;c<arguments.length;c++){n=Object(arguments[c]);for(var h in n)o.call(n,h)&&(u[h]=n[h]);if(i){a=i(n);for(var l=0;l<a.length;l++)s.call(n,a[l])&&(u[a[l]]=n[a[l]])}}return u}},function(t,e){t.exports={}},function(t,e){t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},function(t,e){var n=0,r=Math.random();t.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++n+r).toString(36))}},function(t,e){t.exports=function(t){if("function"!=typeof t)throw TypeError(t+" is not a function!");return t}},function(t,e,n){var r=n(39);t.exports=function(t,e,n){if(r(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,i){return t.call(e,n,r,i)}}return function(){return t.apply(e,arguments)}}},function(t,e,n){"use strict";var r=n(14),i=n(22),o=n(29),s=n(8),a=n(1);t.exports=function(t,e,n){var u=a(t),c=n(s,u,""[t]),h=c[0],l=c[1];o(function(){var e={};return e[u]=function(){return 7},7!=""[t](e)})&&(i(String.prototype,t,h),r(RegExp.prototype,u,2==e?function(t,e){return l.call(t,this,e)}:function(t){return l.call(t,this)}))}},function(t,e,n){var r=n(12),i=n(178),o=n(197),s=Object.defineProperty;e.f=n(28)?Object.defineProperty:function(t,e,n){if(r(t),e=o(e,!0),r(n),i)try{return s(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(t[e]=n.value),t}},function(t,e){var n=Math.ceil,r=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?r:n)(t)}},function(t,e,n){var r=n(180),i=n(8);t.exports=function(t){return r(i(t))}},function(t,e,n){"use strict";function r(t){return function(){return t}}var i=function(){};i.thatReturns=r,i.thatReturnsFalse=r(!1),i.thatReturnsTrue=r(!0),i.thatReturnsNull=r(null),i.thatReturnsThis=function(){return this},i.thatReturnsArgument=function(t){return t},t.exports=i},function(t,e,n){"use strict";var r=n(45),i=r;t.exports=i},function(t,e,n){"use strict";var r=n(24);t.exports=r.DEFAULT=new r({include:[n(34)],explicit:[n(246),n(245),n(244)]})},function(t,e,n){"use strict";function r(t){for(var e=arguments.length-1,n="Minified React error #"+t+"; visit http://facebook.github.io/react/docs/error-decoder.html?invariant="+t,r=0;r<e;r++)n+="&args[]="+encodeURIComponent(arguments[r+1]);n+=" for the full message or use the non-minified dev environment for full errors and additional helpful warnings.";var i=new Error(n);throw i.name="Invariant Violation",i.framesToPop=1,i}t.exports=r},function(t,e){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},function(t,e){t.exports=function(t){if(void 0==t)throw TypeError("Can't call method on  "+t);return t}},function(t,e){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(t,e){t.exports=!0},function(t,e,n){var r=n(16),i=n(156),o=n(51),s=n(57)("IE_PROTO"),a=function(){},u=function(){var t,e=n(82)("iframe"),r=o.length;for(e.style.display="none",n(150).appendChild(e),e.src="javascript:",t=e.contentWindow.document,t.open(),t.write("<script>document.F=Object<\/script>"),t.close(),u=t.F;r--;)delete u.prototype[o[r]];return u()};t.exports=Object.create||function(t,e){var n;return null!==t?(a.prototype=r(t),n=new a,a.prototype=null,n[s]=t):n=u(),void 0===e?n:i(n,e)}},function(t,e,n){var r=n(89),i=n(51);t.exports=Object.keys||function(t){return r(t,i)}},function(t,e){e.f={}.propertyIsEnumerable},function(t,e,n){var r=n(11).f,i=n(10),o=n(7)("toStringTag");t.exports=function(t,e,n){t&&!i(t=n?t:t.prototype,o)&&r(t,o,{configurable:!0,value:e})}},function(t,e,n){var r=n(58)("keys"),i=n(38);t.exports=function(t){return r[t]||(r[t]=i(t))}},function(t,e,n){var r=n(6),i=r["__core-js_shared__"]||(r["__core-js_shared__"]={});t.exports=function(t){return i[t]||(i[t]={})}},function(t,e){var n=Math.ceil,r=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?r:n)(t)}},function(t,e,n){var r=n(19);t.exports=function(t,e){if(!r(t))return t;var n,i;if(e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;if("function"==typeof(n=t.valueOf)&&!r(i=n.call(t)))return i;if(!e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;throw TypeError("Can't convert object to primitive value")}},function(t,e,n){var r=n(6),i=n(5),o=n(52),s=n(62),a=n(11).f;t.exports=function(t){var e=i.Symbol||(i.Symbol=o?{}:r.Symbol||{});"_"==t.charAt(0)||t in e||a(e,t,{value:s.f(t)})}},function(t,e,n){e.f=n(7)},function(t,e,n){var r=n(27),i=n(1)("toStringTag"),o="Arguments"==r(function(){return arguments}()),s=function(t,e){try{return t[e]}catch(t){}};t.exports=function(t){var e,n,a;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=s(e=Object(t),i))?n:o?r(e):"Object"==(a=r(e))&&"function"==typeof e.callee?"Arguments":a}},function(t,e,n){var r=n(21),i=n(4).document,o=r(i)&&r(i.createElement);t.exports=function(t){return o?i.createElement(t):{}}},function(t,e,n){var r=n(1)("match");t.exports=function(t){var e=/./;try{"/./"[t](e)}catch(n){try{return e[r]=!1,!"/./"[t](e)}catch(t){}}return!0}},function(t,e,n){"use strict";function r(t){var e,n;this.promise=new t(function(t,r){if(void 0!==e||void 0!==n)throw TypeError("Bad Promise constructor");e=t,n=r}),this.resolve=i(e),this.reject=i(n)}var i=n(39);t.exports.f=function(t){return new r(t)}},function(t,e,n){var r=n(42).f,i=n(30),o=n(1)("toStringTag");t.exports=function(t,e,n){t&&!i(t=n?t:t.prototype,o)&&r(t,o,{configurable:!0,value:e})}},function(t,e,n){var r=n(103)("keys"),i=n(70);t.exports=function(t){return r[t]||(r[t]=i(t))}},function(t,e,n){var r=n(96),i=n(8);t.exports=function(t,e,n){if(r(e))throw TypeError("String#"+n+" doesn't accept regex!");return String(i(t))}},function(t,e){var n=0,r=Math.random();t.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++n+r).toString(36))}},function(t,e,n){"use strict";var r=n(24);t.exports=new r({explicit:[n(254),n(252),n(247)]})},function(t,e,n){"use strict";function r(t,e){return{type:a,payload:(0,s.default)({},t,e)}}function i(t){return{type:u,payload:t}}Object.defineProperty(e,"__esModule",{value:!0}),e.TOGGLE_CONFIGS=e.UPDATE_CONFIGS=void 0;var o=n(77),s=function(t){return t&&t.__esModule?t:{default:t}}(o);e.update=r,e.toggle=i;var a=e.UPDATE_CONFIGS="configs_update",u=e.TOGGLE_CONFIGS="configs_toggle"},function(t,e,n){t.exports={default:n(140),__esModule:!0}},function(t,e,n){t.exports={default:n(141),__esModule:!0}},function(t,e,n){"use strict";e.__esModule=!0,e.default=function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}},function(t,e,n){"use strict";e.__esModule=!0;var r=n(73),i=function(t){return t&&t.__esModule?t:{default:t}}(r);e.default=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),(0,i.default)(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}()},function(t,e,n){"use strict";e.__esModule=!0;var r=n(73),i=function(t){return t&&t.__esModule?t:{default:t}}(r);e.default=function(t,e,n){return e in t?(0,i.default)(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}e.__esModule=!0;var i=n(131),o=r(i),s=n(130),a=r(s),u=n(80),c=r(u);e.default=function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+(void 0===e?"undefined":(0,c.default)(e)));t.prototype=(0,a.default)(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(o.default?(0,o.default)(t,e):t.__proto__=e)}},function(t,e,n){"use strict";e.__esModule=!0;var r=n(80),i=function(t){return t&&t.__esModule?t:{default:t}}(r);e.default=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!==(void 0===e?"undefined":(0,i.default)(e))&&"function"!=typeof e?t:e}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}e.__esModule=!0;var i=n(133),o=r(i),s=n(132),a=r(s),u="function"==typeof a.default&&"symbol"==typeof o.default?function(t){return typeof t}:function(t){return t&&"function"==typeof a.default&&t.constructor===a.default&&t!==a.default.prototype?"symbol":typeof t};e.default="function"==typeof a.default&&"symbol"===u(o.default)?function(t){return void 0===t?"undefined":u(t)}:function(t){return t&&"function"==typeof a.default&&t.constructor===a.default&&t!==a.default.prototype?"symbol":void 0===t?"undefined":u(t)}},function(t,e,n){var r=n(145);t.exports=function(t,e,n){if(r(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,i){return t.call(e,n,r,i)}}return function(){return t.apply(e,arguments)}}},function(t,e,n){var r=n(19),i=n(6).document,o=r(i)&&r(i.createElement);t.exports=function(t){return o?i.createElement(t):{}}},function(t,e,n){t.exports=!n(9)&&!n(26)(function(){return 7!=Object.defineProperty(n(82)("div"),"a",{get:function(){return 7}}).a})},function(t,e,n){"use strict";var r=n(52),i=n(17),o=n(90),s=n(18),a=n(10),u=n(36),c=n(153),h=n(56),l=n(88),p=n(7)("iterator"),f=!([].keys&&"next"in[].keys()),d=function(){return this};t.exports=function(t,e,n,m,y,v,x){c(n,e,m);var g,D,E,A=function(t){if(!f&&t in _)return _[t];switch(t){case"keys":case"values":return function(){return new n(this,t)}}return function(){return new n(this,t)}},S=e+" Iterator",w="values"==y,C=!1,_=t.prototype,b=_[p]||_["@@iterator"]||y&&_[y],F=!f&&b||A(y),k=y?w?A("entries"):F:void 0,I="Array"==e?_.entries||b:b;if(I&&(E=l(I.call(new t)))!==Object.prototype&&E.next&&(h(E,S,!0),r||a(E,p)||s(E,p,d)),w&&b&&"values"!==b.name&&(C=!0,F=function(){return b.call(this)}),r&&!x||!f&&!C&&_[p]||s(_,p,F),u[e]=F,u[S]=d,y)if(g={values:w?F:A("values"),keys:v?F:A("keys"),entries:k},x)for(D in g)D in _||o(_,D,g[D]);else i(i.P+i.F*(f||C),e,g);return g}},function(t,e,n){var r=n(55),i=n(37),o=n(20),s=n(60),a=n(10),u=n(83),c=Object.getOwnPropertyDescriptor;e.f=n(9)?c:function(t,e){if(t=o(t),e=s(e,!0),u)try{return c(t,e)}catch(t){}if(a(t,e))return i(!r.f.call(t,e),t[e])}},function(t,e,n){var r=n(89),i=n(51).concat("length","prototype");e.f=Object.getOwnPropertyNames||function(t){return r(t,i)}},function(t,e){e.f=Object.getOwnPropertySymbols},function(t,e,n){var r=n(10),i=n(91),o=n(57)("IE_PROTO"),s=Object.prototype;t.exports=Object.getPrototypeOf||function(t){return t=i(t),r(t,o)?t[o]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?s:null}},function(t,e,n){var r=n(10),i=n(20),o=n(147)(!1),s=n(57)("IE_PROTO");t.exports=function(t,e){var n,a=i(t),u=0,c=[];for(n in a)n!=s&&r(a,n)&&c.push(n);for(;e.length>u;)r(a,n=e[u++])&&(~o(c,n)||c.push(n));return c}},function(t,e,n){t.exports=n(18)},function(t,e,n){var r=n(50);t.exports=function(t){return Object(r(t))}},function(t,e,n){"use strict";var r=n(160)(!0);n(84)(String,"String",function(t){this._t=String(t),this._i=0},function(){var t,e=this._t,n=this._i;return n>=e.length?{value:void 0,done:!0}:(t=r(e,n),this._i+=t.length,{value:t,done:!1})})},function(t,e,n){n(165);for(var r=n(6),i=n(18),o=n(36),s=n(7)("toStringTag"),a="CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,TextTrackList,TouchList".split(","),u=0;u<a.length;u++){var c=a[u],h=r[c],l=h&&h.prototype;l&&!l[s]&&i(l,s,c),o[c]=o.Array}},function(t,e){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(t,e,n){var r=n(4).document;t.exports=r&&r.documentElement},function(t,e,n){var r=n(21),i=n(27),o=n(1)("match");t.exports=function(t){var e;return r(t)&&(void 0!==(e=t[o])?!!e:"RegExp"==i(t))}},function(t,e,n){"use strict";var r=n(98),i=n(2),o=n(22),s=n(14),a=n(30),u=n(31),c=n(183),h=n(67),l=n(189),p=n(1)("iterator"),f=!([].keys&&"next"in[].keys()),d=function(){return this};t.exports=function(t,e,n,m,y,v,x){c(n,e,m);var g,D,E,A=function(t){if(!f&&t in _)return _[t];switch(t){case"keys":case"values":return function(){return new n(this,t)}}return function(){return new n(this,t)}},S=e+" Iterator",w="values"==y,C=!1,_=t.prototype,b=_[p]||_["@@iterator"]||y&&_[y],F=!f&&b||A(y),k=y?w?A("entries"):F:void 0,I="Array"==e?_.entries||b:b;if(I&&(E=l(I.call(new t)))!==Object.prototype&&E.next&&(h(E,S,!0),r||a(E,p)||s(E,p,d)),w&&b&&"values"!==b.name&&(C=!0,F=function(){return b.call(this)}),r&&!x||!f&&!C&&_[p]||s(_,p,F),u[e]=F,u[S]=d,y)if(g={values:w?F:A("values"),keys:v?F:A("keys"),entries:k},x)for(D in g)D in _||o(_,D,g[D]);else i(i.P+i.F*(f||C),e,g);return g}},function(t,e){t.exports=!1},function(t,e,n){var r=n(190),i=n(94);t.exports=Object.keys||function(t){return r(t,i)}},function(t,e){t.exports=function(t){try{return{e:!1,v:t()}}catch(t){return{e:!0,v:t}}}},function(t,e,n){var r=n(12),i=n(21),o=n(66);t.exports=function(t,e){if(r(t),i(e)&&e.constructor===t)return e;var n=o.f(t);return(0,n.resolve)(e),n.promise}},function(t,e){t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},function(t,e,n){var r=n(4),i=r["__core-js_shared__"]||(r["__core-js_shared__"]={});t.exports=function(t){return i[t]||(i[t]={})}},function(t,e,n){var r=n(12),i=n(39),o=n(1)("species");t.exports=function(t,e){var n,s=r(t).constructor;return void 0===s||void 0==(n=r(s)[o])?e:i(n)}},function(t,e,n){var r=n(43),i=n(8);t.exports=function(t){return function(e,n){var o,s,a=String(i(e)),u=r(n),c=a.length;return u<0||u>=c?t?"":void 0:(o=a.charCodeAt(u),o<55296||o>56319||u+1===c||(s=a.charCodeAt(u+1))<56320||s>57343?t?a.charAt(u):o:t?a.slice(u,u+2):s-56320+(o-55296<<10)+65536)}}},function(t,e,n){var r,i,o,s=n(40),a=n(179),u=n(95),c=n(64),h=n(4),l=h.process,p=h.setImmediate,f=h.clearImmediate,d=h.MessageChannel,m=h.Dispatch,y=0,v={},x=function(){var t=+this;if(v.hasOwnProperty(t)){var e=v[t];delete v[t],e()}},g=function(t){x.call(t.data)};p&&f||(p=function(t){for(var e=[],n=1;arguments.length>n;)e.push(arguments[n++]);return v[++y]=function(){a("function"==typeof t?t:Function(t),e)},r(y),y},f=function(t){delete v[t]},"process"==n(27)(l)?r=function(t){l.nextTick(s(x,t,1))}:m&&m.now?r=function(t){m.now(s(x,t,1))}:d?(i=new d,o=i.port2,i.port1.onmessage=g,r=s(o.postMessage,o,1)):h.addEventListener&&"function"==typeof postMessage&&!h.importScripts?(r=function(t){h.postMessage(t+"","*")},h.addEventListener("message",g,!1)):r="onreadystatechange"in c("script")?function(t){u.appendChild(c("script")).onreadystatechange=function(){u.removeChild(this),x.call(t)}}:function(t){setTimeout(s(x,t,1),0)}),t.exports={set:p,clear:f}},function(t,e,n){var r=n(43),i=Math.max,o=Math.min;t.exports=function(t,e){return t=r(t),t<0?i(t+e,0):o(t,e)}},function(t,e,n){"use strict";var r=n(105)(!0);n(97)(String,"String",function(t){this._t=String(t),this._i=0},function(){var t,e=this._t,n=this._i;return n>=e.length?{value:void 0,done:!0}:(t=r(e,n),this._i+=t.length,{value:t,done:!1})})},function(t,e,n){"use strict";var r={};t.exports=r},function(t,e,n){"use strict";var r=n(24);t.exports=new r({include:[n(111)]})},function(t,e,n){"use strict";var r=n(24);t.exports=new r({include:[n(71)],implicit:[n(249),n(241),n(243),n(242)]})},function(t,e,n){t.exports=n(258)()},function(t,e,n){"use strict";t.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},function(t,e,n){"use strict";function r(t,e,n){this.props=t,this.context=e,this.refs=c,this.updater=n||u}function i(t,e,n){this.props=t,this.context=e,this.refs=c,this.updater=n||u}function o(){}var s=n(48),a=n(35),u=n(117),c=(n(118),n(109));n(15),n(270);r.prototype.isReactComponent={},r.prototype.setState=function(t,e){"object"!=typeof t&&"function"!=typeof t&&null!=t&&s("85"),this.updater.enqueueSetState(this,t),e&&this.updater.enqueueCallback(this,e,"setState")},r.prototype.forceUpdate=function(t){this.updater.enqueueForceUpdate(this),t&&this.updater.enqueueCallback(this,t,"forceUpdate")};o.prototype=r.prototype,i.prototype=new o,i.prototype.constructor=i,a(i.prototype,r.prototype),i.prototype.isPureReactComponent=!0,t.exports={Component:r,PureComponent:i}},function(t,e,n){"use strict";var r={current:null};t.exports=r},function(t,e,n){"use strict";var r="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103;t.exports=r},function(t,e,n){"use strict";var r=(n(46),{isMounted:function(t){return!1},enqueueCallback:function(t,e){},enqueueForceUpdate:function(t){},enqueueReplaceState:function(t,e){},enqueueSetState:function(t,e){}});t.exports=r},function(t,e,n){"use strict";var r=!1;t.exports=r},function(t,e,n){"use strict";t.exports=n(263)},function(t,e,n){"use strict";var r=n(125);void 0===function(t){return t&&t.__esModule?t:{default:t}}(r).default.Promise&&n(137),String.prototype.startsWith||n(136)},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}var i=n(128),o=r(i),s=n(126),a=r(s),u=n(122),c=r(u),h=[a.default,c.default,function(){return{components:{StandaloneLayout:o.default}}}];t.exports=h},function(t,e,n){"use strict";function r(t){if(t&&t.__esModule)return t;var e={};if(null!=t)for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e.default=t,e}function i(t){return t&&t.__esModule?t:{default:t}}function o(){return{statePlugins:{spec:{actions:v,selectors:x},configs:{reducers:m.default,actions:l,selectors:f}}}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=o;var s=n(235),a=i(s),u=n(260),c=i(u),h=n(72),l=r(h),p=n(124),f=r(p),d=n(123),m=i(d),y=function(t,e){try{return a.default.safeLoad(t)}catch(t){return e&&e.errActions.newThrownErr(new Error(t)),{}}},v={downloadConfig:function(t){return function(e){return(0,e.fn.fetch)(t)}},getConfigByUrl:function(t,e){return function(n){function r(n){n instanceof Error||n.status>=400?(i.updateLoadingStatus("failedConfig"),i.updateLoadingStatus("failedConfig"),i.updateUrl(""),console.error(n.statusText+" "+t),e(null)):e(y(n.text))}var i=n.specActions;if(t)return i.downloadConfig(t).then(r,r)}}},x={getLocalConfig:function(){return y(c.default)}}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r,i=n(77),o=function(t){return t&&t.__esModule?t:{default:t}}(i),s=n(233),a=n(72);e.default=(r={},(0,o.default)(r,a.UPDATE_CONFIGS,function(t,e){return t.merge((0,s.fromJS)(e.payload))}),(0,o.default)(r,a.TOGGLE_CONFIGS,function(t,e){var n=e.payload,r=t.get(n);return t.set(n,!r)}),r)},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});e.get=function(t,e){return t.getIn(Array.isArray(e)?e:[e])}},function(t,e,n){"use strict";var r=n(129),i=function(t){return t&&t.__esModule?t:{default:t}}(r);t.exports=function(){var t={location:{},history:{},open:function(){},close:function(){},File:function(){}};if("undefined"==typeof window)return t;try{t=window;var e=["File","Blob","FormData"],n=!0,r=!1,o=void 0;try{for(var s,a=(0,i.default)(e);!(n=(s=a.next()).done);n=!0){var u=s.value;u in window&&(t[u]=window[u])}}catch(t){r=!0,o=t}finally{try{!n&&a.return&&a.return()}finally{if(r)throw o}}}catch(t){console.error(t)}return t}()},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){return{components:{Topbar:i.default}}};var r=n(127),i=function(t){return t&&t.__esModule?t:{default:t}}(r)},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var i=n(74),o=r(i),s=n(75),a=r(s),u=n(76),c=r(u),h=n(79),l=r(h),p=n(78),f=r(p),d=n(119),m=r(d),y=n(112),v=r(y),x=n(273),g=r(x),D=function(t){function e(t,n){(0,a.default)(this,e);var r=(0,l.default)(this,(e.__proto__||(0,o.default)(e)).call(this,t,n));return r.onUrlChange=function(t){var e=t.target.value;r.setState({url:e})},r.loadSpec=function(t){r.props.specActions.updateUrl(t),r.props.specActions.download(t)},r.onUrlSelect=function(t){var e=t.target.value||t.target.href;r.loadSpec(e),r.setSelectedUrl(e),t.preventDefault()},r.downloadUrl=function(t){r.loadSpec(r.state.url),t.preventDefault()},r.setSelectedUrl=function(t){var e=r.props.getConfigs(),n=e.urls||[];n&&n.length&&t&&n.forEach(function(e,n){e.url===t&&r.setState({selectedIndex:n})})},r.onFilterChange=function(t){var e=t.target.value;r.props.layoutActions.updateFilter(e)},r.state={url:t.specSelectors.url(),selectedIndex:0},r}return(0,f.default)(e,t),(0,c.default)(e,[{key:"componentWillReceiveProps",value:function(t){this.setState({url:t.specSelectors.url()})}},{key:"componentWillMount",value:function(){var t=this,e=this.props.getConfigs(),n=e.urls||[];if(n&&n.length){var r=e["urls.primaryName"];r&&n.forEach(function(e,n){e.name===r&&t.setState({selectedIndex:n})})}}},{key:"componentDidMount",value:function(){var t=this.props.getConfigs().urls||[];t&&t.length&&this.loadSpec(t[this.state.selectedIndex].url)}},{key:"render",value:function(){var t=this.props,e=t.getComponent,n=t.specSelectors,r=t.getConfigs,i=e("Button"),o=e("Link"),s="loading"===n.loadingStatus(),a="failed"===n.loadingStatus(),u={};a&&(u.color="red"),s&&(u.color="#aaa");var c=r(),h=c.urls,l=[],p=null;if(h){var f=[];h.forEach(function(t,e){f.push(m.default.createElement("option",{key:e,value:t.url},t.name))}),l.push(m.default.createElement("label",{className:"select-label",htmlFor:"select"},m.default.createElement("span",null,"Select a spec"),m.default.createElement("select",{id:"select",disabled:s,onChange:this.onUrlSelect,value:h[this.state.selectedIndex].url},f)))}else p=this.downloadUrl,l.push(m.default.createElement("input",{className:"download-url-input",type:"text",onChange:this.onUrlChange,value:this.state.url,disabled:s,style:u})),l.push(m.default.createElement(i,{className:"download-url-button",onClick:this.downloadUrl},"Explore"));return m.default.createElement("div",{className:"topbar"},m.default.createElement("div",{className:"wrapper"},m.default.createElement("div",{className:"topbar-wrapper"},m.default.createElement(o,{href:"#"},m.default.createElement("img",{height:"30",width:"30",src:g.default,alt:"Swagger UI"}),m.default.createElement("span",null,"swagger")),m.default.createElement("form",{className:"download-url-wrapper",onSubmit:p},l.map(function(t,e){return(0,d.cloneElement)(t,{key:e})})))))}}]),e}(m.default.Component);D.propTypes={layoutActions:v.default.object.isRequired},e.default=D,D.propTypes={specSelectors:v.default.object.isRequired,specActions:v.default.object.isRequired,getComponent:v.default.func.isRequired,getConfigs:v.default.func.isRequired}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var i=n(74),o=r(i),s=n(75),a=r(s),u=n(76),c=r(u),h=n(79),l=r(h),p=n(78),f=r(p),d=n(119),m=r(d),y=n(112),v=r(y),x=function(t){function e(){return(0,a.default)(this,e),(0,l.default)(this,(e.__proto__||(0,o.default)(e)).apply(this,arguments))}return(0,f.default)(e,t),(0,c.default)(e,[{key:"render",value:function(){var t=this.props,e=t.getComponent,n=t.specSelectors,r=t.errSelectors,i=e("Container"),o=e("Row"),s=e("Col"),a=e("Topbar",!0),u=e("BaseLayout",!0),c=e("onlineValidatorBadge",!0),h=n.loadingStatus(),l=r.lastError(),p=l?l.get("message"):"";return m.default.createElement(i,{className:"swagger-ui"},a?m.default.createElement(a,null):null,"loading"===h&&m.default.createElement("div",{className:"info"},m.default.createElement("div",{className:"loading-container"},m.default.createElement("div",{className:"loading"}))),"failed"===h&&m.default.createElement("div",{className:"info"},m.default.createElement("div",{className:"loading-container"},m.default.createElement("h4",{className:"title"},"Failed to load API definition."),m.default.createElement("p",null,p))),"failedConfig"===h&&m.default.createElement("div",{className:"info",style:{maxWidth:"880px",marginLeft:"auto",marginRight:"auto",textAlign:"center"}},m.default.createElement("div",{className:"loading-container"},m.default.createElement("h4",{className:"title"},"Failed to load remote configuration."),m.default.createElement("p",null,p))),!h||"success"===h&&m.default.createElement(u,null),m.default.createElement(o,null,m.default.createElement(s,null,m.default.createElement(c,null))))}}]),e}(m.default.Component);x.propTypes={errSelectors:v.default.object.isRequired,errActions:v.default.object.isRequired,specActions:v.default.object.isRequired,specSelectors:v.default.object.isRequired,layoutSelectors:v.default.object.isRequired,layoutActions:v.default.object.isRequired,getComponent:v.default.func.isRequired},e.default=x},function(t,e,n){t.exports={default:n(138),__esModule:!0}},function(t,e,n){t.exports={default:n(139),__esModule:!0}},function(t,e,n){t.exports={default:n(142),__esModule:!0}},function(t,e,n){t.exports={default:n(143),__esModule:!0}},function(t,e,n){t.exports={default:n(144),__esModule:!0}},function(t,e,n){"use strict";function r(t){var e=t.length;if(e%4>0)throw new Error("Invalid string. Length must be a multiple of 4");return"="===t[e-2]?2:"="===t[e-1]?1:0}function i(t){return 3*t.length/4-r(t)}function o(t){var e,n,i,o,s,a=t.length;o=r(t),s=new l(3*a/4-o),n=o>0?a-4:a;var u=0;for(e=0;e<n;e+=4)i=h[t.charCodeAt(e)]<<18|h[t.charCodeAt(e+1)]<<12|h[t.charCodeAt(e+2)]<<6|h[t.charCodeAt(e+3)],s[u++]=i>>16&255,s[u++]=i>>8&255,s[u++]=255&i;return 2===o?(i=h[t.charCodeAt(e)]<<2|h[t.charCodeAt(e+1)]>>4,s[u++]=255&i):1===o&&(i=h[t.charCodeAt(e)]<<10|h[t.charCodeAt(e+1)]<<4|h[t.charCodeAt(e+2)]>>2,s[u++]=i>>8&255,s[u++]=255&i),s}function s(t){return c[t>>18&63]+c[t>>12&63]+c[t>>6&63]+c[63&t]}function a(t,e,n){for(var r,i=[],o=e;o<n;o+=3)r=(t[o]<<16)+(t[o+1]<<8)+t[o+2],i.push(s(r));return i.join("")}function u(t){for(var e,n=t.length,r=n%3,i="",o=[],s=0,u=n-r;s<u;s+=16383)o.push(a(t,s,s+16383>u?u:s+16383));return 1===r?(e=t[n-1],i+=c[e>>2],i+=c[e<<4&63],i+="=="):2===r&&(e=(t[n-2]<<8)+t[n-1],i+=c[e>>10],i+=c[e>>4&63],i+=c[e<<2&63],i+="="),o.push(i),o.join("")}e.byteLength=i,e.toByteArray=o,e.fromByteArray=u;for(var c=[],h=[],l="undefined"!=typeof Uint8Array?Uint8Array:Array,p="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",f=0,d=p.length;f<d;++f)c[f]=p[f],h[p.charCodeAt(f)]=f;h["-".charCodeAt(0)]=62,h["_".charCodeAt(0)]=63},function(t,e,n){"use strict";(function(t){function r(){return o.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function i(t,e){if(r()<e)throw new RangeError("Invalid typed array length");return o.TYPED_ARRAY_SUPPORT?(t=new Uint8Array(e),t.__proto__=o.prototype):(null===t&&(t=new o(e)),t.length=e),t}function o(t,e,n){if(!(o.TYPED_ARRAY_SUPPORT||this instanceof o))return new o(t,e,n);if("number"==typeof t){if("string"==typeof e)throw new Error("If encoding is specified then the first argument must be a string");return c(this,t)}return s(this,t,e,n)}function s(t,e,n,r){if("number"==typeof e)throw new TypeError('"value" argument must not be a number');return"undefined"!=typeof ArrayBuffer&&e instanceof ArrayBuffer?p(t,e,n,r):"string"==typeof e?h(t,e,n):f(t,e)}function a(t){if("number"!=typeof t)throw new TypeError('"size" argument must be a number');if(t<0)throw new RangeError('"size" argument must not be negative')}function u(t,e,n,r){return a(e),e<=0?i(t,e):void 0!==n?"string"==typeof r?i(t,e).fill(n,r):i(t,e).fill(n):i(t,e)}function c(t,e){if(a(e),t=i(t,e<0?0:0|d(e)),!o.TYPED_ARRAY_SUPPORT)for(var n=0;n<e;++n)t[n]=0;return t}function h(t,e,n){if("string"==typeof n&&""!==n||(n="utf8"),!o.isEncoding(n))throw new TypeError('"encoding" must be a valid string encoding');var r=0|y(e,n);t=i(t,r);var s=t.write(e,n);return s!==r&&(t=t.slice(0,s)),t}function l(t,e){var n=e.length<0?0:0|d(e.length);t=i(t,n);for(var r=0;r<n;r+=1)t[r]=255&e[r];return t}function p(t,e,n,r){if(e.byteLength,n<0||e.byteLength<n)throw new RangeError("'offset' is out of bounds");if(e.byteLength<n+(r||0))throw new RangeError("'length' is out of bounds");return e=void 0===n&&void 0===r?new Uint8Array(e):void 0===r?new Uint8Array(e,n):new Uint8Array(e,n,r),o.TYPED_ARRAY_SUPPORT?(t=e,t.__proto__=o.prototype):t=l(t,e),t}function f(t,e){if(o.isBuffer(e)){var n=0|d(e.length);return t=i(t,n),0===t.length?t:(e.copy(t,0,0,n),t)}if(e){if("undefined"!=typeof ArrayBuffer&&e.buffer instanceof ArrayBuffer||"length"in e)return"number"!=typeof e.length||H(e.length)?i(t,0):l(t,e);if("Buffer"===e.type&&Z(e.data))return l(t,e.data)}throw new TypeError("First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.")}function d(t){if(t>=r())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+r().toString(16)+" bytes");return 0|t}function m(t){return+t!=t&&(t=0),o.alloc(+t)}function y(t,e){if(o.isBuffer(t))return t.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(t)||t instanceof ArrayBuffer))return t.byteLength;"string"!=typeof t&&(t=""+t);var n=t.length;if(0===n)return 0;for(var r=!1;;)switch(e){case"ascii":case"latin1":case"binary":return n;case"utf8":case"utf-8":case void 0:return q(t).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*n;case"hex":return n>>>1;case"base64":return W(t).length;default:if(r)return q(t).length;e=(""+e).toLowerCase(),r=!0}}function v(t,e,n){var r=!1;if((void 0===e||e<0)&&(e=0),e>this.length)return"";if((void 0===n||n>this.length)&&(n=this.length),n<=0)return"";if(n>>>=0,e>>>=0,n<=e)return"";for(t||(t="utf8");;)switch(t){case"hex":return B(this,e,n);case"utf8":case"utf-8":return F(this,e,n);case"ascii":return I(this,e,n);case"latin1":case"binary":return T(this,e,n);case"base64":return b(this,e,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return M(this,e,n);default:if(r)throw new TypeError("Unknown encoding: "+t);t=(t+"").toLowerCase(),r=!0}}function x(t,e,n){var r=t[e];t[e]=t[n],t[n]=r}function g(t,e,n,r,i){if(0===t.length)return-1;if("string"==typeof n?(r=n,n=0):n>2147483647?n=2147483647:n<-2147483648&&(n=-2147483648),n=+n,isNaN(n)&&(n=i?0:t.length-1),n<0&&(n=t.length+n),n>=t.length){if(i)return-1;n=t.length-1}else if(n<0){if(!i)return-1;n=0}if("string"==typeof e&&(e=o.from(e,r)),o.isBuffer(e))return 0===e.length?-1:D(t,e,n,r,i);if("number"==typeof e)return e&=255,o.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?i?Uint8Array.prototype.indexOf.call(t,e,n):Uint8Array.prototype.lastIndexOf.call(t,e,n):D(t,[e],n,r,i);throw new TypeError("val must be string, number or Buffer")}function D(t,e,n,r,i){function o(t,e){return 1===s?t[e]:t.readUInt16BE(e*s)}var s=1,a=t.length,u=e.length;if(void 0!==r&&("ucs2"===(r=String(r).toLowerCase())||"ucs-2"===r||"utf16le"===r||"utf-16le"===r)){if(t.length<2||e.length<2)return-1;s=2,a/=2,u/=2,n/=2}var c;if(i){var h=-1;for(c=n;c<a;c++)if(o(t,c)===o(e,-1===h?0:c-h)){if(-1===h&&(h=c),c-h+1===u)return h*s}else-1!==h&&(c-=c-h),h=-1}else for(n+u>a&&(n=a-u),c=n;c>=0;c--){for(var l=!0,p=0;p<u;p++)if(o(t,c+p)!==o(e,p)){l=!1;break}if(l)return c}return-1}function E(t,e,n,r){n=Number(n)||0;var i=t.length-n;r?(r=Number(r))>i&&(r=i):r=i;var o=e.length;if(o%2!=0)throw new TypeError("Invalid hex string");r>o/2&&(r=o/2);for(var s=0;s<r;++s){var a=parseInt(e.substr(2*s,2),16);if(isNaN(a))return s;t[n+s]=a}return s}function A(t,e,n,r){return G(q(e,t.length-n),t,n,r)}function S(t,e,n,r){return G(K(e),t,n,r)}function w(t,e,n,r){return S(t,e,n,r)}function C(t,e,n,r){return G(W(e),t,n,r)}function _(t,e,n,r){return G(Y(e,t.length-n),t,n,r)}function b(t,e,n){return 0===e&&n===t.length?V.fromByteArray(t):V.fromByteArray(t.slice(e,n))}function F(t,e,n){n=Math.min(t.length,n);for(var r=[],i=e;i<n;){var o=t[i],s=null,a=o>239?4:o>223?3:o>191?2:1;if(i+a<=n){var u,c,h,l;switch(a){case 1:o<128&&(s=o);break;case 2:u=t[i+1],128==(192&u)&&(l=(31&o)<<6|63&u)>127&&(s=l);break;case 3:u=t[i+1],c=t[i+2],128==(192&u)&&128==(192&c)&&(l=(15&o)<<12|(63&u)<<6|63&c)>2047&&(l<55296||l>57343)&&(s=l);break;case 4:u=t[i+1],c=t[i+2],h=t[i+3],128==(192&u)&&128==(192&c)&&128==(192&h)&&(l=(15&o)<<18|(63&u)<<12|(63&c)<<6|63&h)>65535&&l<1114112&&(s=l)}}null===s?(s=65533,a=1):s>65535&&(s-=65536,r.push(s>>>10&1023|55296),s=56320|1023&s),r.push(s),i+=a}return k(r)}function k(t){var e=t.length;if(e<=Q)return String.fromCharCode.apply(String,t);for(var n="",r=0;r<e;)n+=String.fromCharCode.apply(String,t.slice(r,r+=Q));return n}function I(t,e,n){var r="";n=Math.min(t.length,n);for(var i=e;i<n;++i)r+=String.fromCharCode(127&t[i]);return r}function T(t,e,n){var r="";n=Math.min(t.length,n);for(var i=e;i<n;++i)r+=String.fromCharCode(t[i]);return r}function B(t,e,n){var r=t.length;(!e||e<0)&&(e=0),(!n||n<0||n>r)&&(n=r);for(var i="",o=e;o<n;++o)i+=X(t[o]);return i}function M(t,e,n){for(var r=t.slice(e,n),i="",o=0;o<r.length;o+=2)i+=String.fromCharCode(r[o]+256*r[o+1]);return i}function P(t,e,n){if(t%1!=0||t<0)throw new RangeError("offset is not uint");if(t+e>n)throw new RangeError("Trying to access beyond buffer length")}function N(t,e,n,r,i,s){if(!o.isBuffer(t))throw new TypeError('"buffer" argument must be a Buffer instance');if(e>i||e<s)throw new RangeError('"value" argument is out of bounds');if(n+r>t.length)throw new RangeError("Index out of range")}function O(t,e,n,r){e<0&&(e=65535+e+1);for(var i=0,o=Math.min(t.length-n,2);i<o;++i)t[n+i]=(e&255<<8*(r?i:1-i))>>>8*(r?i:1-i)}function R(t,e,n,r){e<0&&(e=4294967295+e+1);for(var i=0,o=Math.min(t.length-n,4);i<o;++i)t[n+i]=e>>>8*(r?i:3-i)&255}function U(t,e,n,r,i,o){if(n+r>t.length)throw new RangeError("Index out of range");if(n<0)throw new RangeError("Index out of range")}function j(t,e,n,r,i){return i||U(t,e,n,4,3.4028234663852886e38,-3.4028234663852886e38),$.write(t,e,n,r,23,4),n+4}function L(t,e,n,r,i){return i||U(t,e,n,8,1.7976931348623157e308,-1.7976931348623157e308),$.write(t,e,n,r,52,8),n+8}function z(t){if(t=J(t).replace(tt,""),t.length<2)return"";for(;t.length%4!=0;)t+="=";return t}function J(t){return t.trim?t.trim():t.replace(/^\s+|\s+$/g,"")}function X(t){return t<16?"0"+t.toString(16):t.toString(16)}function q(t,e){e=e||1/0;for(var n,r=t.length,i=null,o=[],s=0;s<r;++s){if((n=t.charCodeAt(s))>55295&&n<57344){if(!i){if(n>56319){(e-=3)>-1&&o.push(239,191,189);continue}if(s+1===r){(e-=3)>-1&&o.push(239,191,189);continue}i=n;continue}if(n<56320){(e-=3)>-1&&o.push(239,191,189),i=n;continue}n=65536+(i-55296<<10|n-56320)}else i&&(e-=3)>-1&&o.push(239,191,189);if(i=null,n<128){if((e-=1)<0)break;o.push(n)}else if(n<2048){if((e-=2)<0)break;o.push(n>>6|192,63&n|128)}else if(n<65536){if((e-=3)<0)break;o.push(n>>12|224,n>>6&63|128,63&n|128)}else{if(!(n<1114112))throw new Error("Invalid code point");if((e-=4)<0)break;o.push(n>>18|240,n>>12&63|128,n>>6&63|128,63&n|128)}}return o}function K(t){for(var e=[],n=0;n<t.length;++n)e.push(255&t.charCodeAt(n));return e}function Y(t,e){for(var n,r,i,o=[],s=0;s<t.length&&!((e-=2)<0);++s)n=t.charCodeAt(s),r=n>>8,i=n%256,o.push(i),o.push(r);return o}function W(t){return V.toByteArray(z(t))}function G(t,e,n,r){for(var i=0;i<r&&!(i+n>=e.length||i>=t.length);++i)e[i+n]=t[i];return i}function H(t){return t!==t}/*!
-- * The buffer module from node.js, for the browser.
-- *
-- * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
-- * @license  MIT
-- */
--var V=n(134),$=n(232),Z=n(234);e.Buffer=o,e.SlowBuffer=m,e.INSPECT_MAX_BYTES=50,o.TYPED_ARRAY_SUPPORT=void 0!==t.TYPED_ARRAY_SUPPORT?t.TYPED_ARRAY_SUPPORT:function(){try{var t=new Uint8Array(1);return t.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}},42===t.foo()&&"function"==typeof t.subarray&&0===t.subarray(1,1).byteLength}catch(t){return!1}}(),e.kMaxLength=r(),o.poolSize=8192,o._augment=function(t){return t.__proto__=o.prototype,t},o.from=function(t,e,n){return s(null,t,e,n)},o.TYPED_ARRAY_SUPPORT&&(o.prototype.__proto__=Uint8Array.prototype,o.__proto__=Uint8Array,"undefined"!=typeof Symbol&&Symbol.species&&o[Symbol.species]===o&&Object.defineProperty(o,Symbol.species,{value:null,configurable:!0})),o.alloc=function(t,e,n){return u(null,t,e,n)},o.allocUnsafe=function(t){return c(null,t)},o.allocUnsafeSlow=function(t){return c(null,t)},o.isBuffer=function(t){return!(null==t||!t._isBuffer)},o.compare=function(t,e){if(!o.isBuffer(t)||!o.isBuffer(e))throw new TypeError("Arguments must be Buffers");if(t===e)return 0;for(var n=t.length,r=e.length,i=0,s=Math.min(n,r);i<s;++i)if(t[i]!==e[i]){n=t[i],r=e[i];break}return n<r?-1:r<n?1:0},o.isEncoding=function(t){switch(String(t).toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"latin1":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return!0;default:return!1}},o.concat=function(t,e){if(!Z(t))throw new TypeError('"list" argument must be an Array of Buffers');if(0===t.length)return o.alloc(0);var n;if(void 0===e)for(e=0,n=0;n<t.length;++n)e+=t[n].length;var r=o.allocUnsafe(e),i=0;for(n=0;n<t.length;++n){var s=t[n];if(!o.isBuffer(s))throw new TypeError('"list" argument must be an Array of Buffers');s.copy(r,i),i+=s.length}return r},o.byteLength=y,o.prototype._isBuffer=!0,o.prototype.swap16=function(){var t=this.length;if(t%2!=0)throw new RangeError("Buffer size must be a multiple of 16-bits");for(var e=0;e<t;e+=2)x(this,e,e+1);return this},o.prototype.swap32=function(){var t=this.length;if(t%4!=0)throw new RangeError("Buffer size must be a multiple of 32-bits");for(var e=0;e<t;e+=4)x(this,e,e+3),x(this,e+1,e+2);return this},o.prototype.swap64=function(){var t=this.length;if(t%8!=0)throw new RangeError("Buffer size must be a multiple of 64-bits");for(var e=0;e<t;e+=8)x(this,e,e+7),x(this,e+1,e+6),x(this,e+2,e+5),x(this,e+3,e+4);return this},o.prototype.toString=function(){var t=0|this.length;return 0===t?"":0===arguments.length?F(this,0,t):v.apply(this,arguments)},o.prototype.equals=function(t){if(!o.isBuffer(t))throw new TypeError("Argument must be a Buffer");return this===t||0===o.compare(this,t)},o.prototype.inspect=function(){var t="",n=e.INSPECT_MAX_BYTES;return this.length>0&&(t=this.toString("hex",0,n).match(/.{2}/g).join(" "),this.length>n&&(t+=" ... ")),"<Buffer "+t+">"},o.prototype.compare=function(t,e,n,r,i){if(!o.isBuffer(t))throw new TypeError("Argument must be a Buffer");if(void 0===e&&(e=0),void 0===n&&(n=t?t.length:0),void 0===r&&(r=0),void 0===i&&(i=this.length),e<0||n>t.length||r<0||i>this.length)throw new RangeError("out of range index");if(r>=i&&e>=n)return 0;if(r>=i)return-1;if(e>=n)return 1;if(e>>>=0,n>>>=0,r>>>=0,i>>>=0,this===t)return 0;for(var s=i-r,a=n-e,u=Math.min(s,a),c=this.slice(r,i),h=t.slice(e,n),l=0;l<u;++l)if(c[l]!==h[l]){s=c[l],a=h[l];break}return s<a?-1:a<s?1:0},o.prototype.includes=function(t,e,n){return-1!==this.indexOf(t,e,n)},o.prototype.indexOf=function(t,e,n){return g(this,t,e,n,!0)},o.prototype.lastIndexOf=function(t,e,n){return g(this,t,e,n,!1)},o.prototype.write=function(t,e,n,r){if(void 0===e)r="utf8",n=this.length,e=0;else if(void 0===n&&"string"==typeof e)r=e,n=this.length,e=0;else{if(!isFinite(e))throw new Error("Buffer.write(string, encoding, offset[, length]) is no longer supported");e|=0,isFinite(n)?(n|=0,void 0===r&&(r="utf8")):(r=n,n=void 0)}var i=this.length-e;if((void 0===n||n>i)&&(n=i),t.length>0&&(n<0||e<0)||e>this.length)throw new RangeError("Attempt to write outside buffer bounds");r||(r="utf8");for(var o=!1;;)switch(r){case"hex":return E(this,t,e,n);case"utf8":case"utf-8":return A(this,t,e,n);case"ascii":return S(this,t,e,n);case"latin1":case"binary":return w(this,t,e,n);case"base64":return C(this,t,e,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return _(this,t,e,n);default:if(o)throw new TypeError("Unknown encoding: "+r);r=(""+r).toLowerCase(),o=!0}},o.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var Q=4096;o.prototype.slice=function(t,e){var n=this.length;t=~~t,e=void 0===e?n:~~e,t<0?(t+=n)<0&&(t=0):t>n&&(t=n),e<0?(e+=n)<0&&(e=0):e>n&&(e=n),e<t&&(e=t);var r;if(o.TYPED_ARRAY_SUPPORT)r=this.subarray(t,e),r.__proto__=o.prototype;else{var i=e-t;r=new o(i,void 0);for(var s=0;s<i;++s)r[s]=this[s+t]}return r},o.prototype.readUIntLE=function(t,e,n){t|=0,e|=0,n||P(t,e,this.length);for(var r=this[t],i=1,o=0;++o<e&&(i*=256);)r+=this[t+o]*i;return r},o.prototype.readUIntBE=function(t,e,n){t|=0,e|=0,n||P(t,e,this.length);for(var r=this[t+--e],i=1;e>0&&(i*=256);)r+=this[t+--e]*i;return r},o.prototype.readUInt8=function(t,e){return e||P(t,1,this.length),this[t]},o.prototype.readUInt16LE=function(t,e){return e||P(t,2,this.length),this[t]|this[t+1]<<8},o.prototype.readUInt16BE=function(t,e){return e||P(t,2,this.length),this[t]<<8|this[t+1]},o.prototype.readUInt32LE=function(t,e){return e||P(t,4,this.length),(this[t]|this[t+1]<<8|this[t+2]<<16)+16777216*this[t+3]},o.prototype.readUInt32BE=function(t,e){return e||P(t,4,this.length),16777216*this[t]+(this[t+1]<<16|this[t+2]<<8|this[t+3])},o.prototype.readIntLE=function(t,e,n){t|=0,e|=0,n||P(t,e,this.length);for(var r=this[t],i=1,o=0;++o<e&&(i*=256);)r+=this[t+o]*i;return i*=128,r>=i&&(r-=Math.pow(2,8*e)),r},o.prototype.readIntBE=function(t,e,n){t|=0,e|=0,n||P(t,e,this.length);for(var r=e,i=1,o=this[t+--r];r>0&&(i*=256);)o+=this[t+--r]*i;return i*=128,o>=i&&(o-=Math.pow(2,8*e)),o},o.prototype.readInt8=function(t,e){return e||P(t,1,this.length),128&this[t]?-1*(255-this[t]+1):this[t]},o.prototype.readInt16LE=function(t,e){e||P(t,2,this.length);var n=this[t]|this[t+1]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt16BE=function(t,e){e||P(t,2,this.length);var n=this[t+1]|this[t]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt32LE=function(t,e){return e||P(t,4,this.length),this[t]|this[t+1]<<8|this[t+2]<<16|this[t+3]<<24},o.prototype.readInt32BE=function(t,e){return e||P(t,4,this.length),this[t]<<24|this[t+1]<<16|this[t+2]<<8|this[t+3]},o.prototype.readFloatLE=function(t,e){return e||P(t,4,this.length),$.read(this,t,!0,23,4)},o.prototype.readFloatBE=function(t,e){return e||P(t,4,this.length),$.read(this,t,!1,23,4)},o.prototype.readDoubleLE=function(t,e){return e||P(t,8,this.length),$.read(this,t,!0,52,8)},o.prototype.readDoubleBE=function(t,e){return e||P(t,8,this.length),$.read(this,t,!1,52,8)},o.prototype.writeUIntLE=function(t,e,n,r){if(t=+t,e|=0,n|=0,!r){N(this,t,e,n,Math.pow(2,8*n)-1,0)}var i=1,o=0;for(this[e]=255&t;++o<n&&(i*=256);)this[e+o]=t/i&255;return e+n},o.prototype.writeUIntBE=function(t,e,n,r){if(t=+t,e|=0,n|=0,!r){N(this,t,e,n,Math.pow(2,8*n)-1,0)}var i=n-1,o=1;for(this[e+i]=255&t;--i>=0&&(o*=256);)this[e+i]=t/o&255;return e+n},o.prototype.writeUInt8=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,1,255,0),o.TYPED_ARRAY_SUPPORT||(t=Math.floor(t)),this[e]=255&t,e+1},o.prototype.writeUInt16LE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8):O(this,t,e,!0),e+2},o.prototype.writeUInt16BE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>8,this[e+1]=255&t):O(this,t,e,!1),e+2},o.prototype.writeUInt32LE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[e+3]=t>>>24,this[e+2]=t>>>16,this[e+1]=t>>>8,this[e]=255&t):R(this,t,e,!0),e+4},o.prototype.writeUInt32BE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>24,this[e+1]=t>>>16,this[e+2]=t>>>8,this[e+3]=255&t):R(this,t,e,!1),e+4},o.prototype.writeIntLE=function(t,e,n,r){if(t=+t,e|=0,!r){var i=Math.pow(2,8*n-1);N(this,t,e,n,i-1,-i)}var o=0,s=1,a=0;for(this[e]=255&t;++o<n&&(s*=256);)t<0&&0===a&&0!==this[e+o-1]&&(a=1),this[e+o]=(t/s>>0)-a&255;return e+n},o.prototype.writeIntBE=function(t,e,n,r){if(t=+t,e|=0,!r){var i=Math.pow(2,8*n-1);N(this,t,e,n,i-1,-i)}var o=n-1,s=1,a=0;for(this[e+o]=255&t;--o>=0&&(s*=256);)t<0&&0===a&&0!==this[e+o+1]&&(a=1),this[e+o]=(t/s>>0)-a&255;return e+n},o.prototype.writeInt8=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,1,127,-128),o.TYPED_ARRAY_SUPPORT||(t=Math.floor(t)),t<0&&(t=255+t+1),this[e]=255&t,e+1},o.prototype.writeInt16LE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8):O(this,t,e,!0),e+2},o.prototype.writeInt16BE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>8,this[e+1]=255&t):O(this,t,e,!1),e+2},o.prototype.writeInt32LE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,4,2147483647,-2147483648),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8,this[e+2]=t>>>16,this[e+3]=t>>>24):R(this,t,e,!0),e+4},o.prototype.writeInt32BE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,4,2147483647,-2147483648),t<0&&(t=4294967295+t+1),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>24,this[e+1]=t>>>16,this[e+2]=t>>>8,this[e+3]=255&t):R(this,t,e,!1),e+4},o.prototype.writeFloatLE=function(t,e,n){return j(this,t,e,!0,n)},o.prototype.writeFloatBE=function(t,e,n){return j(this,t,e,!1,n)},o.prototype.writeDoubleLE=function(t,e,n){return L(this,t,e,!0,n)},o.prototype.writeDoubleBE=function(t,e,n){return L(this,t,e,!1,n)},o.prototype.copy=function(t,e,n,r){if(n||(n=0),r||0===r||(r=this.length),e>=t.length&&(e=t.length),e||(e=0),r>0&&r<n&&(r=n),r===n)return 0;if(0===t.length||0===this.length)return 0;if(e<0)throw new RangeError("targetStart out of bounds");if(n<0||n>=this.length)throw new RangeError("sourceStart out of bounds");if(r<0)throw new RangeError("sourceEnd out of bounds");r>this.length&&(r=this.length),t.length-e<r-n&&(r=t.length-e+n);var i,s=r-n;if(this===t&&n<e&&e<r)for(i=s-1;i>=0;--i)t[i+e]=this[i+n];else if(s<1e3||!o.TYPED_ARRAY_SUPPORT)for(i=0;i<s;++i)t[i+e]=this[i+n];else Uint8Array.prototype.set.call(t,this.subarray(n,n+s),e);return s},o.prototype.fill=function(t,e,n,r){if("string"==typeof t){if("string"==typeof e?(r=e,e=0,n=this.length):"string"==typeof n&&(r=n,n=this.length),1===t.length){var i=t.charCodeAt(0);i<256&&(t=i)}if(void 0!==r&&"string"!=typeof r)throw new TypeError("encoding must be a string");if("string"==typeof r&&!o.isEncoding(r))throw new TypeError("Unknown encoding: "+r)}else"number"==typeof t&&(t&=255);if(e<0||this.length<e||this.length<n)throw new RangeError("Out of range index");if(n<=e)return this;e>>>=0,n=void 0===n?this.length:n>>>0,t||(t=0);var s;if("number"==typeof t)for(s=e;s<n;++s)this[s]=t;else{var a=o.isBuffer(t)?t:q(new o(t,r).toString()),u=a.length;for(s=0;s<n-e;++s)this[s+e]=a[s%u]}return this};var tt=/[^+\/0-9A-Za-z-_]/g}).call(e,n(274))},function(t,e,n){n(215),n(219),n(226),n(108),n(210),n(211),n(216),n(220),n(222),n(206),n(207),n(208),n(209),n(212),n(213),n(214),n(217),n(218),n(221),n(223),n(224),n(225),n(202),n(203),n(204),n(205),t.exports=n(13).String},function(t,e,n){n(200),n(108),n(229),n(201),n(227),n(228),t.exports=n(13).Promise},function(t,e,n){n(93),n(92),t.exports=n(164)},function(t,e,n){n(166);var r=n(5).Object;t.exports=function(t,e){return r.create(t,e)}},function(t,e,n){n(167);var r=n(5).Object;t.exports=function(t,e,n){return r.defineProperty(t,e,n)}},function(t,e,n){n(168),t.exports=n(5).Object.getPrototypeOf},function(t,e,n){n(169),t.exports=n(5).Object.setPrototypeOf},function(t,e,n){n(171),n(170),n(172),n(173),t.exports=n(5).Symbol},function(t,e,n){n(92),n(93),t.exports=n(62).f("iterator")},function(t,e){t.exports=function(t){if("function"!=typeof t)throw TypeError(t+" is not a function!");return t}},function(t,e){t.exports=function(){}},function(t,e,n){var r=n(20),i=n(162),o=n(161);t.exports=function(t){return function(e,n,s){var a,u=r(e),c=i(u.length),h=o(s,c);if(t&&n!=n){for(;c>h;)if((a=u[h++])!=a)return!0}else for(;c>h;h++)if((t||h in u)&&u[h]===n)return t||h||0;return!t&&-1}}},function(t,e,n){var r=n(49),i=n(7)("toStringTag"),o="Arguments"==r(function(){return arguments}()),s=function(t,e){try{return t[e]}catch(t){}};t.exports=function(t){var e,n,a;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=s(e=Object(t),i))?n:o?r(e):"Object"==(a=r(e))&&"function"==typeof e.callee?"Arguments":a}},function(t,e,n){var r=n(54),i=n(87),o=n(55);t.exports=function(t){var e=r(t),n=i.f;if(n)for(var s,a=n(t),u=o.f,c=0;a.length>c;)u.call(t,s=a[c++])&&e.push(s);return e}},function(t,e,n){var r=n(6).document;t.exports=r&&r.documentElement},function(t,e,n){var r=n(49);t.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==r(t)?t.split(""):Object(t)}},function(t,e,n){var r=n(49);t.exports=Array.isArray||function(t){return"Array"==r(t)}},function(t,e,n){"use strict";var r=n(53),i=n(37),o=n(56),s={};n(18)(s,n(7)("iterator"),function(){return this}),t.exports=function(t,e,n){t.prototype=r(s,{next:i(1,n)}),o(t,e+" Iterator")}},function(t,e){t.exports=function(t,e){return{value:e,done:!!t}}},function(t,e,n){var r=n(38)("meta"),i=n(19),o=n(10),s=n(11).f,a=0,u=Object.isExtensible||function(){return!0},c=!n(26)(function(){return u(Object.preventExtensions({}))}),h=function(t){s(t,r,{value:{i:"O"+ ++a,w:{}}})},l=function(t,e){if(!i(t))return"symbol"==typeof t?t:("string"==typeof t?"S":"P")+t;if(!o(t,r)){if(!u(t))return"F";if(!e)return"E";h(t)}return t[r].i},p=function(t,e){if(!o(t,r)){if(!u(t))return!0;if(!e)return!1;h(t)}return t[r].w},f=function(t){return c&&d.NEED&&u(t)&&!o(t,r)&&h(t),t},d=t.exports={KEY:r,NEED:!1,fastKey:l,getWeak:p,onFreeze:f}},function(t,e,n){var r=n(11),i=n(16),o=n(54);t.exports=n(9)?Object.defineProperties:function(t,e){i(t);for(var n,s=o(e),a=s.length,u=0;a>u;)r.f(t,n=s[u++],e[n]);return t}},function(t,e,n){var r=n(20),i=n(86).f,o={}.toString,s="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],a=function(t){try{return i(t)}catch(t){return s.slice()}};t.exports.f=function(t){return s&&"[object Window]"==o.call(t)?a(t):i(r(t))}},function(t,e,n){var r=n(17),i=n(5),o=n(26);t.exports=function(t,e){var n=(i.Object||{})[t]||Object[t],s={};s[t]=e(n),r(r.S+r.F*o(function(){n(1)}),"Object",s)}},function(t,e,n){var r=n(19),i=n(16),o=function(t,e){if(i(t),!r(e)&&null!==e)throw TypeError(e+": can't set as prototype!")};t.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(t,e,r){try{r=n(81)(Function.call,n(85).f(Object.prototype,"__proto__").set,2),r(t,[]),e=!(t instanceof Array)}catch(t){e=!0}return function(t,n){return o(t,n),e?t.__proto__=n:r(t,n),t}}({},!1):void 0),check:o}},function(t,e,n){var r=n(59),i=n(50);t.exports=function(t){return function(e,n){var o,s,a=String(i(e)),u=r(n),c=a.length;return u<0||u>=c?t?"":void 0:(o=a.charCodeAt(u),o<55296||o>56319||u+1===c||(s=a.charCodeAt(u+1))<56320||s>57343?t?a.charAt(u):o:t?a.slice(u,u+2):s-56320+(o-55296<<10)+65536)}}},function(t,e,n){var r=n(59),i=Math.max,o=Math.min;t.exports=function(t,e){return t=r(t),t<0?i(t+e,0):o(t,e)}},function(t,e,n){var r=n(59),i=Math.min;t.exports=function(t){return t>0?i(r(t),9007199254740991):0}},function(t,e,n){var r=n(148),i=n(7)("iterator"),o=n(36);t.exports=n(5).getIteratorMethod=function(t){if(void 0!=t)return t[i]||t["@@iterator"]||o[r(t)]}},function(t,e,n){var r=n(16),i=n(163);t.exports=n(5).getIterator=function(t){var e=i(t);if("function"!=typeof e)throw TypeError(t+" is not iterable!");return r(e.call(t))}},function(t,e,n){"use strict";var r=n(146),i=n(154),o=n(36),s=n(20);t.exports=n(84)(Array,"Array",function(t,e){this._t=s(t),this._i=0,this._k=e},function(){var t=this._t,e=this._k,n=this._i++;return!t||n>=t.length?(this._t=void 0,i(1)):"keys"==e?i(0,n):"values"==e?i(0,t[n]):i(0,[n,t[n]])},"values"),o.Arguments=o.Array,r("keys"),r("values"),r("entries")},function(t,e,n){var r=n(17);r(r.S,"Object",{create:n(53)})},function(t,e,n){var r=n(17);r(r.S+r.F*!n(9),"Object",{defineProperty:n(11).f})},function(t,e,n){var r=n(91),i=n(88);n(158)("getPrototypeOf",function(){return function(t){return i(r(t))}})},function(t,e,n){var r=n(17);r(r.S,"Object",{setPrototypeOf:n(159).set})},function(t,e){},function(t,e,n){"use strict";var r=n(6),i=n(10),o=n(9),s=n(17),a=n(90),u=n(155).KEY,c=n(26),h=n(58),l=n(56),p=n(38),f=n(7),d=n(62),m=n(61),y=n(149),v=n(152),x=n(16),g=n(19),D=n(20),E=n(60),A=n(37),S=n(53),w=n(157),C=n(85),_=n(11),b=n(54),F=C.f,k=_.f,I=w.f,T=r.Symbol,B=r.JSON,M=B&&B.stringify,P=f("_hidden"),N=f("toPrimitive"),O={}.propertyIsEnumerable,R=h("symbol-registry"),U=h("symbols"),j=h("op-symbols"),L=Object.prototype,z="function"==typeof T,J=r.QObject,X=!J||!J.prototype||!J.prototype.findChild,q=o&&c(function(){return 7!=S(k({},"a",{get:function(){return k(this,"a",{value:7}).a}})).a})?function(t,e,n){var r=F(L,e);r&&delete L[e],k(t,e,n),r&&t!==L&&k(L,e,r)}:k,K=function(t){var e=U[t]=S(T.prototype);return e._k=t,e},Y=z&&"symbol"==typeof T.iterator?function(t){return"symbol"==typeof t}:function(t){return t instanceof T},W=function(t,e,n){return t===L&&W(j,e,n),x(t),e=E(e,!0),x(n),i(U,e)?(n.enumerable?(i(t,P)&&t[P][e]&&(t[P][e]=!1),n=S(n,{enumerable:A(0,!1)})):(i(t,P)||k(t,P,A(1,{})),t[P][e]=!0),q(t,e,n)):k(t,e,n)},G=function(t,e){x(t);for(var n,r=y(e=D(e)),i=0,o=r.length;o>i;)W(t,n=r[i++],e[n]);return t},H=function(t,e){return void 0===e?S(t):G(S(t),e)},V=function(t){var e=O.call(this,t=E(t,!0));return!(this===L&&i(U,t)&&!i(j,t))&&(!(e||!i(this,t)||!i(U,t)||i(this,P)&&this[P][t])||e)},$=function(t,e){if(t=D(t),e=E(e,!0),t!==L||!i(U,e)||i(j,e)){var n=F(t,e);return!n||!i(U,e)||i(t,P)&&t[P][e]||(n.enumerable=!0),n}},Z=function(t){for(var e,n=I(D(t)),r=[],o=0;n.length>o;)i(U,e=n[o++])||e==P||e==u||r.push(e);return r},Q=function(t){for(var e,n=t===L,r=I(n?j:D(t)),o=[],s=0;r.length>s;)!i(U,e=r[s++])||n&&!i(L,e)||o.push(U[e]);return o};z||(T=function(){if(this instanceof T)throw TypeError("Symbol is not a constructor!");var t=p(arguments.length>0?arguments[0]:void 0),e=function(n){this===L&&e.call(j,n),i(this,P)&&i(this[P],t)&&(this[P][t]=!1),q(this,t,A(1,n))};return o&&X&&q(L,t,{configurable:!0,set:e}),K(t)},a(T.prototype,"toString",function(){return this._k}),C.f=$,_.f=W,n(86).f=w.f=Z,n(55).f=V,n(87).f=Q,o&&!n(52)&&a(L,"propertyIsEnumerable",V,!0),d.f=function(t){return K(f(t))}),s(s.G+s.W+s.F*!z,{Symbol:T});for(var tt="hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","),et=0;tt.length>et;)f(tt[et++]);for(var nt=b(f.store),rt=0;nt.length>rt;)m(nt[rt++]);s(s.S+s.F*!z,"Symbol",{for:function(t){return i(R,t+="")?R[t]:R[t]=T(t)},keyFor:function(t){if(!Y(t))throw TypeError(t+" is not a symbol!");for(var e in R)if(R[e]===t)return e},useSetter:function(){X=!0},useSimple:function(){X=!1}}),s(s.S+s.F*!z,"Object",{create:H,defineProperty:W,defineProperties:G,getOwnPropertyDescriptor:$,getOwnPropertyNames:Z,getOwnPropertySymbols:Q}),B&&s(s.S+s.F*(!z||c(function(){var t=T();return"[null]"!=M([t])||"{}"!=M({a:t})||"{}"!=M(Object(t))})),"JSON",{stringify:function(t){for(var e,n,r=[t],i=1;arguments.length>i;)r.push(arguments[i++]);if(n=e=r[1],(g(e)||void 0!==t)&&!Y(t))return v(e)||(e=function(t,e){if("function"==typeof n&&(e=n.call(this,t,e)),!Y(e))return e}),r[1]=e,M.apply(B,r)}}),T.prototype[N]||n(18)(T.prototype,N,T.prototype.valueOf),l(T,"Symbol"),l(Math,"Math",!0),l(r.JSON,"JSON",!0)},function(t,e,n){n(61)("asyncIterator")},function(t,e,n){n(61)("observable")},function(t,e,n){var r=n(1)("unscopables"),i=Array.prototype;void 0==i[r]&&n(14)(i,r,{}),t.exports=function(t){i[r][t]=!0}},function(t,e){t.exports=function(t,e,n,r){if(!(t instanceof e)||void 0!==r&&r in t)throw TypeError(n+": incorrect invocation!");return t}},function(t,e,n){var r=n(44),i=n(32),o=n(107);t.exports=function(t){return function(e,n,s){var a,u=r(e),c=i(u.length),h=o(s,c);if(t&&n!=n){for(;c>h;)if((a=u[h++])!=a)return!0}else for(;c>h;h++)if((t||h in u)&&u[h]===n)return t||h||0;return!t&&-1}}},function(t,e,n){var r=n(40),i=n(182),o=n(181),s=n(12),a=n(32),u=n(198),c={},h={},e=t.exports=function(t,e,n,l,p){var f,d,m,y,v=p?function(){return t}:u(t),x=r(n,l,e?2:1),g=0;if("function"!=typeof v)throw TypeError(t+" is not iterable!");if(o(v)){for(f=a(t.length);f>g;g++)if((y=e?x(s(d=t[g])[0],d[1]):x(t[g]))===c||y===h)return y}else for(m=v.call(t);!(d=m.next()).done;)if((y=i(m,x,d.value,e))===c||y===h)return y};e.BREAK=c,e.RETURN=h},function(t,e,n){t.exports=!n(28)&&!n(29)(function(){return 7!=Object.defineProperty(n(64)("div"),"a",{get:function(){return 7}}).a})},function(t,e){t.exports=function(t,e,n){var r=void 0===n;switch(e.length){case 0:return r?t():t.call(n);case 1:return r?t(e[0]):t.call(n,e[0]);case 2:return r?t(e[0],e[1]):t.call(n,e[0],e[1]);case 3:return r?t(e[0],e[1],e[2]):t.call(n,e[0],e[1],e[2]);case 4:return r?t(e[0],e[1],e[2],e[3]):t.call(n,e[0],e[1],e[2],e[3])}return t.apply(n,e)}},function(t,e,n){var r=n(27);t.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==r(t)?t.split(""):Object(t)}},function(t,e,n){var r=n(31),i=n(1)("iterator"),o=Array.prototype;t.exports=function(t){return void 0!==t&&(r.Array===t||o[i]===t)}},function(t,e,n){var r=n(12);t.exports=function(t,e,n,i){try{return i?e(r(n)[0],n[1]):e(n)}catch(e){var o=t.return;throw void 0!==o&&r(o.call(t)),e}}},function(t,e,n){"use strict";var r=n(187),i=n(102),o=n(67),s={};n(14)(s,n(1)("iterator"),function(){return this}),t.exports=function(t,e,n){t.prototype=r(s,{next:i(1,n)}),o(t,e+" Iterator")}},function(t,e,n){var r=n(1)("iterator"),i=!1;try{var o=[7][r]();o.return=function(){i=!0},Array.from(o,function(){throw 2})}catch(t){}t.exports=function(t,e){if(!e&&!i)return!1;var n=!1;try{var o=[7],s=o[r]();s.next=function(){return{done:n=!0}},o[r]=function(){return s},t(o)}catch(t){}return n}},function(t,e){t.exports=function(t,e){return{value:e,done:!!t}}},function(t,e,n){var r=n(4),i=n(106).set,o=r.MutationObserver||r.WebKitMutationObserver,s=r.process,a=r.Promise,u="process"==n(27)(s);t.exports=function(){var t,e,n,c=function(){var r,i;for(u&&(r=s.domain)&&r.exit();t;){i=t.fn,t=t.next;try{i()}catch(r){throw t?n():e=void 0,r}}e=void 0,r&&r.enter()};if(u)n=function(){s.nextTick(c)};else if(!o||r.navigator&&r.navigator.standalone)if(a&&a.resolve){var h=a.resolve();n=function(){h.then(c)}}else n=function(){i.call(r,c)};else{var l=!0,p=document.createTextNode("");new o(c).observe(p,{characterData:!0}),n=function(){p.data=l=!l}}return function(r){var i={fn:r,next:void 0};e&&(e.next=i),t||(t=i,n()),e=i}}},function(t,e,n){var r=n(12),i=n(188),o=n(94),s=n(68)("IE_PROTO"),a=function(){},u=function(){var t,e=n(64)("iframe"),r=o.length;for(e.style.display="none",n(95).appendChild(e),e.src="javascript:",t=e.contentWindow.document,t.open(),t.write("<script>document.F=Object<\/script>"),t.close(),u=t.F;r--;)delete u.prototype[o[r]];return u()};t.exports=Object.create||function(t,e){var n;return null!==t?(a.prototype=r(t),n=new a,a.prototype=null,n[s]=t):n=u(),void 0===e?n:i(n,e)}},function(t,e,n){var r=n(42),i=n(12),o=n(99);t.exports=n(28)?Object.defineProperties:function(t,e){i(t);for(var n,s=o(e),a=s.length,u=0;a>u;)r.f(t,n=s[u++],e[n]);return t}},function(t,e,n){var r=n(30),i=n(196),o=n(68)("IE_PROTO"),s=Object.prototype;t.exports=Object.getPrototypeOf||function(t){return t=i(t),r(t,o)?t[o]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?s:null}},function(t,e,n){var r=n(30),i=n(44),o=n(176)(!1),s=n(68)("IE_PROTO");t.exports=function(t,e){var n,a=i(t),u=0,c=[];for(n in a)n!=s&&r(a,n)&&c.push(n);for(;e.length>u;)r(a,n=e[u++])&&(~o(c,n)||c.push(n));return c}},function(t,e,n){var r=n(22);t.exports=function(t,e,n){for(var i in e)r(t,i,e[i],n);return t}},function(t,e,n){"use strict";var r=n(4),i=n(42),o=n(28),s=n(1)("species");t.exports=function(t){var e=r[t];o&&e&&!e[s]&&i.f(e,s,{configurable:!0,get:function(){return this}})}},function(t,e,n){"use strict";var r=n(43),i=n(8);t.exports=function(t){var e=String(i(this)),n="",o=r(t);if(o<0||o==1/0)throw RangeError("Count can't be negative");for(;o>0;(o>>>=1)&&(e+=e))1&o&&(n+=e);return n}},function(t,e,n){var r=n(2),i=n(8),o=n(29),s=n(195),a="["+s+"]",u="​…",c=RegExp("^"+a+a+"*"),h=RegExp(a+a+"*$"),l=function(t,e,n){var i={},a=o(function(){return!!s[t]()||u[t]()!=u}),c=i[t]=a?e(p):s[t];n&&(i[n]=c),r(r.P+r.F*a,"String",i)},p=l.trim=function(t,e){return t=String(i(t)),1&e&&(t=t.replace(c,"")),2&e&&(t=t.replace(h,"")),t};t.exports=l},function(t,e){t.exports="\t\n\v\f\r   ᠎             　\u2028\u2029\ufeff"},function(t,e,n){var r=n(8);t.exports=function(t){return Object(r(t))}},function(t,e,n){var r=n(21);t.exports=function(t,e){if(!r(t))return t;var n,i;if(e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;if("function"==typeof(n=t.valueOf)&&!r(i=n.call(t)))return i;if(!e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;throw TypeError("Can't convert object to primitive value")}},function(t,e,n){var r=n(63),i=n(1)("iterator"),o=n(31);t.exports=n(13).getIteratorMethod=function(t){if(void 0!=t)return t[i]||t["@@iterator"]||o[r(t)]}},function(t,e,n){"use strict";var r=n(174),i=n(185),o=n(31),s=n(44);t.exports=n(97)(Array,"Array",function(t,e){this._t=s(t),this._i=0,this._k=e},function(){var t=this._t,e=this._k,n=this._i++;return!t||n>=t.length?(this._t=void 0,i(1)):"keys"==e?i(0,n):"values"==e?i(0,t[n]):i(0,[n,t[n]])},"values"),o.Arguments=o.Array,r("keys"),r("values"),r("entries")},function(t,e,n){"use strict";var r=n(63),i={};i[n(1)("toStringTag")]="z",i+""!="[object z]"&&n(22)(Object.prototype,"toString",function(){return"[object "+r(this)+"]"},!0)},function(t,e,n){"use strict";var r,i,o,s,a=n(98),u=n(4),c=n(40),h=n(63),l=n(2),p=n(21),f=n(39),d=n(175),m=n(177),y=n(104),v=n(106).set,x=n(186)(),g=n(66),D=n(100),E=n(101),A=u.TypeError,S=u.process,w=u.Promise,C="process"==h(S),_=function(){},b=i=g.f,F=!!function(){try{var t=w.resolve(1),e=(t.constructor={})[n(1)("species")]=function(t){t(_,_)};return(C||"function"==typeof PromiseRejectionEvent)&&t.then(_)instanceof e}catch(t){}}(),k=function(t){var e;return!(!p(t)||"function"!=typeof(e=t.then))&&e},I=function(t,e){if(!t._n){t._n=!0;var n=t._c;x(function(){for(var r=t._v,i=1==t._s,o=0;n.length>o;)!function(e){var n,o,s=i?e.ok:e.fail,a=e.resolve,u=e.reject,c=e.domain;try{s?(i||(2==t._h&&M(t),t._h=1),!0===s?n=r:(c&&c.enter(),n=s(r),c&&c.exit()),n===e.promise?u(A("Promise-chain cycle")):(o=k(n))?o.call(n,a,u):a(n)):u(r)}catch(t){u(t)}}(n[o++]);t._c=[],t._n=!1,e&&!t._h&&T(t)})}},T=function(t){v.call(u,function(){var e,n,r,i=t._v,o=B(t);if(o&&(e=D(function(){C?S.emit("unhandledRejection",i,t):(n=u.onunhandledrejection)?n({promise:t,reason:i}):(r=u.console)&&r.error&&r.error("Unhandled promise rejection",i)}),t._h=C||B(t)?2:1),t._a=void 0,o&&e.e)throw e.v})},B=function(t){return 1!==t._h&&0===(t._a||t._c).length},M=function(t){v.call(u,function(){var e;C?S.emit("rejectionHandled",t):(e=u.onrejectionhandled)&&e({promise:t,reason:t._v})})},P=function(t){var e=this;e._d||(e._d=!0,e=e._w||e,e._v=t,e._s=2,e._a||(e._a=e._c.slice()),I(e,!0))},N=function(t){var e,n=this;if(!n._d){n._d=!0,n=n._w||n;try{if(n===t)throw A("Promise can't be resolved itself");(e=k(t))?x(function(){var r={_w:n,_d:!1};try{e.call(t,c(N,r,1),c(P,r,1))}catch(t){P.call(r,t)}}):(n._v=t,n._s=1,I(n,!1))}catch(t){P.call({_w:n,_d:!1},t)}}};F||(w=function(t){d(this,w,"Promise","_h"),f(t),r.call(this);try{t(c(N,this,1),c(P,this,1))}catch(t){P.call(this,t)}},r=function(t){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1},r.prototype=n(191)(w.prototype,{then:function(t,e){var n=b(y(this,w));return n.ok="function"!=typeof t||t,n.fail="function"==typeof e&&e,n.domain=C?S.domain:void 0,this._c.push(n),this._a&&this._a.push(n),this._s&&I(this,!1),n.promise},catch:function(t){return this.then(void 0,t)}}),o=function(){var t=new r;this.promise=t,this.resolve=c(N,t,1),this.reject=c(P,t,1)},g.f=b=function(t){return t===w||t===s?new o(t):i(t)}),l(l.G+l.W+l.F*!F,{Promise:w}),n(67)(w,"Promise"),n(192)("Promise"),s=n(13).Promise,l(l.S+l.F*!F,"Promise",{reject:function(t){var e=b(this);return(0,e.reject)(t),e.promise}}),l(l.S+l.F*(a||!F),"Promise",{resolve:function(t){return E(a&&this===s?w:this,t)}}),l(l.S+l.F*!(F&&n(184)(function(t){w.all(t).catch(_)})),"Promise",{all:function(t){var e=this,n=b(e),r=n.resolve,i=n.reject,o=D(function(){var n=[],o=0,s=1;m(t,!1,function(t){var a=o++,u=!1;n.push(void 0),s++,e.resolve(t).then(function(t){u||(u=!0,n[a]=t,--s||r(n))},i)}),--s||r(n)});return o.e&&i(o.v),n.promise},race:function(t){var e=this,n=b(e),r=n.reject,i=D(function(){m(t,!1,function(t){e.resolve(t).then(n.resolve,r)})});return i.e&&r(i.v),n.promise}})},function(t,e,n){n(41)("match",1,function(t,e,n){return[function(n){"use strict";var r=t(this),i=void 0==n?void 0:n[e];return void 0!==i?i.call(n,r):new RegExp(n)[e](String(r))},n]})},function(t,e,n){n(41)("replace",2,function(t,e,n){return[function(r,i){"use strict";var o=t(this),s=void 0==r?void 0:r[e];return void 0!==s?s.call(r,o,i):n.call(String(o),r,i)},n]})},function(t,e,n){n(41)("search",1,function(t,e,n){return[function(n){"use strict";var r=t(this),i=void 0==n?void 0:n[e];return void 0!==i?i.call(n,r):new RegExp(n)[e](String(r))},n]})},function(t,e,n){n(41)("split",2,function(t,e,r){"use strict";var i=n(96),o=r,s=[].push,a="length";if("c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1)[a]||2!="ab".split(/(?:ab)*/)[a]||4!=".".split(/(.?)(.?)/)[a]||".".split(/()()/)[a]>1||"".split(/.?/)[a]){var u=void 0===/()??/.exec("")[1];r=function(t,e){var n=String(this);if(void 0===t&&0===e)return[];if(!i(t))return o.call(n,t,e);var r,c,h,l,p,f=[],d=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),m=0,y=void 0===e?4294967295:e>>>0,v=new RegExp(t.source,d+"g");for(u||(r=new RegExp("^"+v.source+"$(?!\\s)",d));(c=v.exec(n))&&!((h=c.index+c[0][a])>m&&(f.push(n.slice(m,c.index)),!u&&c[a]>1&&c[0].replace(r,function(){for(p=1;p<arguments[a]-2;p++)void 0===arguments[p]&&(c[p]=void 0)}),c[a]>1&&c.index<n[a]&&s.apply(f,c.slice(1)),l=c[0][a],m=h,f[a]>=y));)v.lastIndex===c.index&&v.lastIndex++;return m===n[a]?!l&&v.test("")||f.push(""):f.push(n.slice(m)),f[a]>y?f.slice(0,y):f}}else"0".split(void 0,0)[a]&&(r=function(t,e){return void 0===t&&0===e?[]:o.call(this,t,e)});return[function(n,i){var o=t(this),s=void 0==n?void 0:n[e];return void 0!==s?s.call(n,o,i):r.call(String(o),n,i)},r]})},function(t,e,n){"use strict";n(3)("anchor",function(t){return function(e){return t(this,"a","name",e)}})},function(t,e,n){"use strict";n(3)("big",function(t){return function(){return t(this,"big","","")}})},function(t,e,n){"use strict";n(3)("blink",function(t){return function(){return t(this,"blink","","")}})},function(t,e,n){"use strict";n(3)("bold",function(t){return function(){return t(this,"b","","")}})},function(t,e,n){"use strict";var r=n(2),i=n(105)(!1);r(r.P,"String",{codePointAt:function(t){return i(this,t)}})},function(t,e,n){"use strict";var r=n(2),i=n(32),o=n(69),s="".endsWith;r(r.P+r.F*n(65)("endsWith"),"String",{endsWith:function(t){var e=o(this,t,"endsWith"),n=arguments.length>1?arguments[1]:void 0,r=i(e.length),a=void 0===n?r:Math.min(i(n),r),u=String(t);return s?s.call(e,u,a):e.slice(a-u.length,a)===u}})},function(t,e,n){"use strict";n(3)("fixed",function(t){return function(){return t(this,"tt","","")}})},function(t,e,n){"use strict";n(3)("fontcolor",function(t){return function(e){return t(this,"font","color",e)}})},function(t,e,n){"use strict";n(3)("fontsize",function(t){return function(e){return t(this,"font","size",e)}})},function(t,e,n){var r=n(2),i=n(107),o=String.fromCharCode,s=String.fromCodePoint;r(r.S+r.F*(!!s&&1!=s.length),"String",{fromCodePoint:function(t){for(var e,n=[],r=arguments.length,s=0;r>s;){if(e=+arguments[s++],i(e,1114111)!==e)throw RangeError(e+" is not a valid code point");n.push(e<65536?o(e):o(55296+((e-=65536)>>10),e%1024+56320))}return n.join("")}})},function(t,e,n){"use strict";var r=n(2),i=n(69);r(r.P+r.F*n(65)("includes"),"String",{includes:function(t){return!!~i(this,t,"includes").indexOf(t,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){"use strict";n(3)("italics",function(t){return function(){return t(this,"i","","")}})},function(t,e,n){"use strict";n(3)("link",function(t){return function(e){return t(this,"a","href",e)}})},function(t,e,n){var r=n(2),i=n(44),o=n(32);r(r.S,"String",{raw:function(t){for(var e=i(t.raw),n=o(e.length),r=arguments.length,s=[],a=0;n>a;)s.push(String(e[a++])),a<r&&s.push(String(arguments[a]));return s.join("")}})},function(t,e,n){var r=n(2);r(r.P,"String",{repeat:n(193)})},function(t,e,n){"use strict";n(3)("small",function(t){return function(){return t(this,"small","","")}})},function(t,e,n){"use strict";var r=n(2),i=n(32),o=n(69),s="".startsWith;r(r.P+r.F*n(65)("startsWith"),"String",{startsWith:function(t){var e=o(this,t,"startsWith"),n=i(Math.min(arguments.length>1?arguments[1]:void 0,e.length)),r=String(t);return s?s.call(e,r,n):e.slice(n,n+r.length)===r}})},function(t,e,n){"use strict";n(3)("strike",function(t){return function(){return t(this,"strike","","")}})},function(t,e,n){"use strict";n(3)("sub",function(t){return function(){return t(this,"sub","","")}})},function(t,e,n){"use strict";n(3)("sup",function(t){return function(){return t(this,"sup","","")}})},function(t,e,n){"use strict";n(194)("trim",function(t){return function(){return t(this,3)}})},function(t,e,n){"use strict";var r=n(2),i=n(13),o=n(4),s=n(104),a=n(101);r(r.P+r.R,"Promise",{finally:function(t){var e=s(this,i.Promise||o.Promise),n="function"==typeof t;return this.then(n?function(n){return a(e,t()).then(function(){return n})}:t,n?function(n){return a(e,t()).then(function(){throw n})}:t)}})},function(t,e,n){"use strict";var r=n(2),i=n(66),o=n(100);r(r.S,"Promise",{try:function(t){var e=i.f(this),n=o(t);return(n.e?e.reject:e.resolve)(n.v),e.promise}})},function(t,e,n){for(var r=n(199),i=n(99),o=n(22),s=n(4),a=n(14),u=n(31),c=n(1),h=c("iterator"),l=c("toStringTag"),p=u.Array,f={CSSRuleList:!0,CSSStyleDeclaration:!1,CSSValueList:!1,ClientRectList:!1,DOMRectList:!1,DOMStringList:!1,DOMTokenList:!0,DataTransferItemList:!1,FileList:!1,HTMLAllCollection:!1,HTMLCollection:!1,HTMLFormElement:!1,HTMLSelectElement:!1,MediaList:!0,MimeTypeArray:!1,NamedNodeMap:!1,NodeList:!0,PaintRequestList:!1,Plugin:!1,PluginArray:!1,SVGLengthList:!1,SVGNumberList:!1,SVGPathSegList:!1,SVGPointList:!1,SVGStringList:!1,SVGTransformList:!1,SourceBufferList:!1,StyleSheetList:!0,TextTrackCueList:!1,TextTrackList:!1,TouchList:!1},d=i(f),m=0;m<d.length;m++){var y,v=d[m],x=f[v],g=s[v],D=g&&g.prototype;if(D&&(D[h]||a(D,h,p),D[l]||a(D,l,v),u[v]=p,x))for(y in r)D[y]||o(D,y,r[y],!0)}},function(t,e,n){"use strict";function r(t){return t}function i(t,e,n){function i(t,e){var n=x.hasOwnProperty(e)?x[e]:null;A.hasOwnProperty(e)&&a("OVERRIDE_BASE"===n,"ReactClassInterface: You are attempting to override `%s` from your class specification. Ensure that your method names do not overlap with React methods.",e),t&&a("DEFINE_MANY"===n||"DEFINE_MANY_MERGED"===n,"ReactClassInterface: You are attempting to define `%s` on your component more than once. This conflict may be due to a mixin.",e)}function c(t,n){if(n){a("function"!=typeof n,"ReactClass: You're attempting to use a component class or function as a mixin. Instead, just use a regular object."),a(!e(n),"ReactClass: You're attempting to use a component as a mixin. Instead, just use a regular object.");var r=t.prototype,o=r.__reactAutoBindPairs;n.hasOwnProperty(u)&&g.mixins(t,n.mixins);for(var s in n)if(n.hasOwnProperty(s)&&s!==u){var c=n[s],h=r.hasOwnProperty(s);if(i(h,s),g.hasOwnProperty(s))g[s](t,c);else{var l=x.hasOwnProperty(s),d="function"==typeof c,m=d&&!l&&!h&&!1!==n.autobind;if(m)o.push(s,c),r[s]=c;else if(h){var y=x[s];a(l&&("DEFINE_MANY_MERGED"===y||"DEFINE_MANY"===y),"ReactClass: Unexpected spec policy %s for key %s when mixing in component specs.",y,s),"DEFINE_MANY_MERGED"===y?r[s]=p(r[s],c):"DEFINE_MANY"===y&&(r[s]=f(r[s],c))}else r[s]=c}}}else;}function h(t,e){if(e)for(var n in e){var r=e[n];if(e.hasOwnProperty(n)){var i=n in g;a(!i,'ReactClass: You are attempting to define a reserved property, `%s`, that shouldn\'t be on the "statics" key. Define it as an instance property instead; it will still be accessible on the constructor.',n);var o=n in t;a(!o,"ReactClass: You are attempting to define `%s` on your component more than once. This conflict may be due to a mixin.",n),t[n]=r}}}function l(t,e){a(t&&e&&"object"==typeof t&&"object"==typeof e,"mergeIntoWithNoDuplicateKeys(): Cannot merge non-objects.");for(var n in e)e.hasOwnProperty(n)&&(a(void 0===t[n],"mergeIntoWithNoDuplicateKeys(): Tried to merge two objects with the same key: `%s`. This conflict may be due to a mixin; in particular, this may be caused by two getInitialState() or getDefaultProps() methods returning objects with clashing keys.",n),t[n]=e[n]);return t}function p(t,e){return function(){var n=t.apply(this,arguments),r=e.apply(this,arguments);if(null==n)return r;if(null==r)return n;var i={};return l(i,n),l(i,r),i}}function f(t,e){return function(){t.apply(this,arguments),e.apply(this,arguments)}}function d(t,e){var n=e.bind(t);return n}function m(t){for(var e=t.__reactAutoBindPairs,n=0;n<e.length;n+=2){var r=e[n],i=e[n+1];t[r]=d(t,i)}}function y(t){var e=r(function(t,r,i){this.__reactAutoBindPairs.length&&m(this),this.props=t,this.context=r,this.refs=s,this.updater=i||n,this.state=null;var o=this.getInitialState?this.getInitialState():null;a("object"==typeof o&&!Array.isArray(o),"%s.getInitialState(): must return an object or null",e.displayName||"ReactCompositeComponent"),this.state=o});e.prototype=new S,e.prototype.constructor=e,e.prototype.__reactAutoBindPairs=[],v.forEach(c.bind(null,e)),c(e,D),c(e,t),c(e,E),e.getDefaultProps&&(e.defaultProps=e.getDefaultProps()),a(e.prototype.render,"createClass(...): Class specification must implement a `render` method.");for(var i in x)e.prototype[i]||(e.prototype[i]=null);return e}var v=[],x={mixins:"DEFINE_MANY",statics:"DEFINE_MANY",propTypes:"DEFINE_MANY",contextTypes:"DEFINE_MANY",childContextTypes:"DEFINE_MANY",getDefaultProps:"DEFINE_MANY_MERGED",getInitialState:"DEFINE_MANY_MERGED",getChildContext:"DEFINE_MANY_MERGED",render:"DEFINE_ONCE",componentWillMount:"DEFINE_MANY",componentDidMount:"DEFINE_MANY",componentWillReceiveProps:"DEFINE_MANY",shouldComponentUpdate:"DEFINE_ONCE",componentWillUpdate:"DEFINE_MANY",componentDidUpdate:"DEFINE_MANY",componentWillUnmount:"DEFINE_MANY",updateComponent:"OVERRIDE_BASE"},g={displayName:function(t,e){t.displayName=e},mixins:function(t,e){if(e)for(var n=0;n<e.length;n++)c(t,e[n])},childContextTypes:function(t,e){t.childContextTypes=o({},t.childContextTypes,e)},contextTypes:function(t,e){t.contextTypes=o({},t.contextTypes,e)},getDefaultProps:function(t,e){t.getDefaultProps?t.getDefaultProps=p(t.getDefaultProps,e):t.getDefaultProps=e},propTypes:function(t,e){t.propTypes=o({},t.propTypes,e)},statics:function(t,e){h(t,e)},autobind:function(){}},D={componentDidMount:function(){this.__isMounted=!0}},E={componentWillUnmount:function(){this.__isMounted=!1}},A={replaceState:function(t,e){this.updater.enqueueReplaceState(this,t,e)},isMounted:function(){return!!this.__isMounted}},S=function(){};return o(S.prototype,t.prototype,A),y}var o=n(35),s=n(109),a=n(15),u="mixins";t.exports=i},function(t,e,n){!function(e,n){t.exports=n()}(0,function(){return function(t){function e(r){if(n[r])return n[r].exports;var i=n[r]={exports:{},id:r,loaded:!1};return t[r].call(i.exports,i,i.exports,e),i.loaded=!0,i.exports}var n={};return e.m=t,e.c=n,e.p="",e(0)}([function(t,e,n){"use strict";function r(t,e,n){var r=null,i=function(t,e){n&&n(t,e),r&&r.visit(t,e)},o="function"==typeof n?i:null,s=!1;if(e){s="boolean"==typeof e.comment&&e.comment;var h="boolean"==typeof e.attachComment&&e.attachComment;(s||h)&&(r=new a.CommentHandler,r.attach=h,e.comment=!0,o=i)}var l=!1;e&&"string"==typeof e.sourceType&&(l="module"===e.sourceType);var p;p=e&&"boolean"==typeof e.jsx&&e.jsx?new u.JSXParser(t,e,o):new c.Parser(t,e,o);var f=l?p.parseModule():p.parseScript(),d=f;return s&&r&&(d.comments=r.comments),p.config.tokens&&(d.tokens=p.tokens),p.config.tolerant&&(d.errors=p.errorHandler.errors),d}function i(t,e,n){var i=e||{};return i.sourceType="module",r(t,i,n)}function o(t,e,n){var i=e||{};return i.sourceType="script",r(t,i,n)}function s(t,e,n){var r,i=new h.Tokenizer(t,e);r=[];try{for(;;){var o=i.getNextToken();if(!o)break;n&&(o=n(o)),r.push(o)}}catch(t){i.errorHandler.tolerate(t)}return i.errorHandler.tolerant&&(r.errors=i.errors()),r}Object.defineProperty(e,"__esModule",{value:!0});var a=n(1),u=n(3),c=n(8),h=n(15);e.parse=r,e.parseModule=i,e.parseScript=o,e.tokenize=s;var l=n(2);e.Syntax=l.Syntax,e.version="4.0.0"},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(2),i=function(){function t(){this.attach=!1,this.comments=[],this.stack=[],this.leading=[],this.trailing=[]}return t.prototype.insertInnerComments=function(t,e){if(t.type===r.Syntax.BlockStatement&&0===t.body.length){for(var n=[],i=this.leading.length-1;i>=0;--i){var o=this.leading[i];e.end.offset>=o.start&&(n.unshift(o.comment),this.leading.splice(i,1),this.trailing.splice(i,1))}n.length&&(t.innerComments=n)}},t.prototype.findTrailingComments=function(t){var e=[];if(this.trailing.length>0){for(var n=this.trailing.length-1;n>=0;--n){var r=this.trailing[n];r.start>=t.end.offset&&e.unshift(r.comment)}return this.trailing.length=0,e}var i=this.stack[this.stack.length-1];if(i&&i.node.trailingComments){var o=i.node.trailingComments[0];o&&o.range[0]>=t.end.offset&&(e=i.node.trailingComments,delete i.node.trailingComments)}return e},t.prototype.findLeadingComments=function(t){for(var e,n=[];this.stack.length>0;){var r=this.stack[this.stack.length-1];if(!(r&&r.start>=t.start.offset))break;e=r.node,this.stack.pop()}if(e){for(var i=e.leadingComments?e.leadingComments.length:0,o=i-1;o>=0;--o){var s=e.leadingComments[o];s.range[1]<=t.start.offset&&(n.unshift(s),e.leadingComments.splice(o,1))}return e.leadingComments&&0===e.leadingComments.length&&delete e.leadingComments,n}for(var o=this.leading.length-1;o>=0;--o){var r=this.leading[o];r.start<=t.start.offset&&(n.unshift(r.comment),this.leading.splice(o,1))}return n},t.prototype.visitNode=function(t,e){if(!(t.type===r.Syntax.Program&&t.body.length>0)){this.insertInnerComments(t,e);var n=this.findTrailingComments(e),i=this.findLeadingComments(e);i.length>0&&(t.leadingComments=i),n.length>0&&(t.trailingComments=n),this.stack.push({node:t,start:e.start.offset})}},t.prototype.visitComment=function(t,e){var n="L"===t.type[0]?"Line":"Block",r={type:n,value:t.value};if(t.range&&(r.range=t.range),t.loc&&(r.loc=t.loc),this.comments.push(r),this.attach){var i={comment:{type:n,value:t.value,range:[e.start.offset,e.end.offset]},start:e.start.offset};t.loc&&(i.comment.loc=t.loc),t.type=n,this.leading.push(i),this.trailing.push(i)}},t.prototype.visit=function(t,e){"LineComment"===t.type?this.visitComment(t,e):"BlockComment"===t.type?this.visitComment(t,e):this.attach&&this.visitNode(t,e)},t}();e.CommentHandler=i},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.Syntax={AssignmentExpression:"AssignmentExpression",AssignmentPattern:"AssignmentPattern",ArrayExpression:"ArrayExpression",ArrayPattern:"ArrayPattern",ArrowFunctionExpression:"ArrowFunctionExpression",AwaitExpression:"AwaitExpression",BlockStatement:"BlockStatement",BinaryExpression:"BinaryExpression",BreakStatement:"BreakStatement",CallExpression:"CallExpression",CatchClause:"CatchClause",ClassBody:"ClassBody",ClassDeclaration:"ClassDeclaration",ClassExpression:"ClassExpression",ConditionalExpression:"ConditionalExpression",ContinueStatement:"ContinueStatement",DoWhileStatement:"DoWhileStatement",DebuggerStatement:"DebuggerStatement",EmptyStatement:"EmptyStatement",ExportAllDeclaration:"ExportAllDeclaration",ExportDefaultDeclaration:"ExportDefaultDeclaration",ExportNamedDeclaration:"ExportNamedDeclaration",ExportSpecifier:"ExportSpecifier",ExpressionStatement:"ExpressionStatement",ForStatement:"ForStatement",ForOfStatement:"ForOfStatement",ForInStatement:"ForInStatement",FunctionDeclaration:"FunctionDeclaration",FunctionExpression:"FunctionExpression",Identifier:"Identifier",IfStatement:"IfStatement",ImportDeclaration:"ImportDeclaration",ImportDefaultSpecifier:"ImportDefaultSpecifier",ImportNamespaceSpecifier:"ImportNamespaceSpecifier",ImportSpecifier:"ImportSpecifier",Literal:"Literal",LabeledStatement:"LabeledStatement",LogicalExpression:"LogicalExpression",MemberExpression:"MemberExpression",MetaProperty:"MetaProperty",MethodDefinition:"MethodDefinition",NewExpression:"NewExpression",ObjectExpression:"ObjectExpression",ObjectPattern:"ObjectPattern",Program:"Program",Property:"Property",RestElement:"RestElement",ReturnStatement:"ReturnStatement",SequenceExpression:"SequenceExpression",SpreadElement:"SpreadElement",Super:"Super",SwitchCase:"SwitchCase",SwitchStatement:"SwitchStatement",TaggedTemplateExpression:"TaggedTemplateExpression",TemplateElement:"TemplateElement",TemplateLiteral:"TemplateLiteral",ThisExpression:"ThisExpression",ThrowStatement:"ThrowStatement",TryStatement:"TryStatement",UnaryExpression:"UnaryExpression",UpdateExpression:"UpdateExpression",VariableDeclaration:"VariableDeclaration",VariableDeclarator:"VariableDeclarator",WhileStatement:"WhileStatement",WithStatement:"WithStatement",YieldExpression:"YieldExpression"}},function(t,e,n){"use strict";function r(t){var e;switch(t.type){case a.JSXSyntax.JSXIdentifier:e=t.name;break;case a.JSXSyntax.JSXNamespacedName:var n=t;e=r(n.namespace)+":"+r(n.name);break;case a.JSXSyntax.JSXMemberExpression:var i=t;e=r(i.object)+"."+r(i.property)}return e}var i=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(4),s=n(5),a=n(6),u=n(7),c=n(8),h=n(13),l=n(14);h.TokenName[100]="JSXIdentifier",h.TokenName[101]="JSXText";var p=function(t){function e(e,n,r){return t.call(this,e,n,r)||this}return i(e,t),e.prototype.parsePrimaryExpression=function(){return this.match("<")?this.parseJSXRoot():t.prototype.parsePrimaryExpression.call(this)},e.prototype.startJSX=function(){this.scanner.index=this.startMarker.index,this.scanner.lineNumber=this.startMarker.line,this.scanner.lineStart=this.startMarker.index-this.startMarker.column},e.prototype.finishJSX=function(){this.nextToken()},e.prototype.reenterJSX=function(){this.startJSX(),this.expectJSX("}"),this.config.tokens&&this.tokens.pop()},e.prototype.createJSXNode=function(){return this.collectComments(),{index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}},e.prototype.createJSXChildNode=function(){return{index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}},e.prototype.scanXHTMLEntity=function(t){for(var e="&",n=!0,r=!1,i=!1,s=!1;!this.scanner.eof()&&n&&!r;){var a=this.scanner.source[this.scanner.index];if(a===t)break;if(r=";"===a,e+=a,++this.scanner.index,!r)switch(e.length){case 2:i="#"===a;break;case 3:i&&(s="x"===a,n=s||o.Character.isDecimalDigit(a.charCodeAt(0)),i=i&&!s);break;default:n=n&&!(i&&!o.Character.isDecimalDigit(a.charCodeAt(0))),n=n&&!(s&&!o.Character.isHexDigit(a.charCodeAt(0)))}}if(n&&r&&e.length>2){var u=e.substr(1,e.length-2);i&&u.length>1?e=String.fromCharCode(parseInt(u.substr(1),10)):s&&u.length>2?e=String.fromCharCode(parseInt("0"+u.substr(1),16)):i||s||!l.XHTMLEntities[u]||(e=l.XHTMLEntities[u])}return e},e.prototype.lexJSX=function(){var t=this.scanner.source.charCodeAt(this.scanner.index);if(60===t||62===t||47===t||58===t||61===t||123===t||125===t){var e=this.scanner.source[this.scanner.index++];return{type:7,value:e,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:this.scanner.index-1,end:this.scanner.index}}if(34===t||39===t){for(var n=this.scanner.index,r=this.scanner.source[this.scanner.index++],i="";!this.scanner.eof();){var s=this.scanner.source[this.scanner.index++];if(s===r)break;i+="&"===s?this.scanXHTMLEntity(r):s}return{type:8,value:i,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}if(46===t){var a=this.scanner.source.charCodeAt(this.scanner.index+1),u=this.scanner.source.charCodeAt(this.scanner.index+2),e=46===a&&46===u?"...":".",n=this.scanner.index;return this.scanner.index+=e.length,{type:7,value:e,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}if(96===t)return{type:10,value:"",lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:this.scanner.index,end:this.scanner.index};if(o.Character.isIdentifierStart(t)&&92!==t){var n=this.scanner.index;for(++this.scanner.index;!this.scanner.eof();){var s=this.scanner.source.charCodeAt(this.scanner.index);if(o.Character.isIdentifierPart(s)&&92!==s)++this.scanner.index;else{if(45!==s)break;++this.scanner.index}}return{type:100,value:this.scanner.source.slice(n,this.scanner.index),lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}return this.scanner.lex()},e.prototype.nextJSXToken=function(){this.collectComments(),this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart;var t=this.lexJSX();return this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.config.tokens&&this.tokens.push(this.convertToken(t)),t},e.prototype.nextJSXText=function(){this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart;for(var t=this.scanner.index,e="";!this.scanner.eof();){var n=this.scanner.source[this.scanner.index];if("{"===n||"<"===n)break;++this.scanner.index,e+=n,o.Character.isLineTerminator(n.charCodeAt(0))&&(++this.scanner.lineNumber,"\r"===n&&"\n"===this.scanner.source[this.scanner.index]&&++this.scanner.index,this.scanner.lineStart=this.scanner.index)}this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart;var r={type:101,value:e,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:t,end:this.scanner.index};return e.length>0&&this.config.tokens&&this.tokens.push(this.convertToken(r)),r},e.prototype.peekJSXToken=function(){var t=this.scanner.saveState();this.scanner.scanComments();var e=this.lexJSX();return this.scanner.restoreState(t),e},e.prototype.expectJSX=function(t){var e=this.nextJSXToken();7===e.type&&e.value===t||this.throwUnexpectedToken(e)},e.prototype.matchJSX=function(t){var e=this.peekJSXToken();return 7===e.type&&e.value===t},e.prototype.parseJSXIdentifier=function(){var t=this.createJSXNode(),e=this.nextJSXToken();return 100!==e.type&&this.throwUnexpectedToken(e),this.finalize(t,new s.JSXIdentifier(e.value))},e.prototype.parseJSXElementName=function(){var t=this.createJSXNode(),e=this.parseJSXIdentifier();if(this.matchJSX(":")){var n=e;this.expectJSX(":");var r=this.parseJSXIdentifier();e=this.finalize(t,new s.JSXNamespacedName(n,r))}else if(this.matchJSX("."))for(;this.matchJSX(".");){var i=e;this.expectJSX(".");var o=this.parseJSXIdentifier();e=this.finalize(t,new s.JSXMemberExpression(i,o))}return e},e.prototype.parseJSXAttributeName=function(){var t,e=this.createJSXNode(),n=this.parseJSXIdentifier();if(this.matchJSX(":")){var r=n;this.expectJSX(":");var i=this.parseJSXIdentifier();t=this.finalize(e,new s.JSXNamespacedName(r,i))}else t=n;return t},e.prototype.parseJSXStringLiteralAttribute=function(){var t=this.createJSXNode(),e=this.nextJSXToken();8!==e.type&&this.throwUnexpectedToken(e);var n=this.getTokenRaw(e);return this.finalize(t,new u.Literal(e.value,n))},e.prototype.parseJSXExpressionAttribute=function(){var t=this.createJSXNode();this.expectJSX("{"),this.finishJSX(),this.match("}")&&this.tolerateError("JSX attributes must only be assigned a non-empty expression");var e=this.parseAssignmentExpression();return this.reenterJSX(),this.finalize(t,new s.JSXExpressionContainer(e))},e.prototype.parseJSXAttributeValue=function(){return this.matchJSX("{")?this.parseJSXExpressionAttribute():this.matchJSX("<")?this.parseJSXElement():this.parseJSXStringLiteralAttribute()},e.prototype.parseJSXNameValueAttribute=function(){var t=this.createJSXNode(),e=this.parseJSXAttributeName(),n=null;return this.matchJSX("=")&&(this.expectJSX("="),n=this.parseJSXAttributeValue()),this.finalize(t,new s.JSXAttribute(e,n))},e.prototype.parseJSXSpreadAttribute=function(){var t=this.createJSXNode();this.expectJSX("{"),this.expectJSX("..."),this.finishJSX();var e=this.parseAssignmentExpression();return this.reenterJSX(),this.finalize(t,new s.JSXSpreadAttribute(e))},e.prototype.parseJSXAttributes=function(){for(var t=[];!this.matchJSX("/")&&!this.matchJSX(">");){var e=this.matchJSX("{")?this.parseJSXSpreadAttribute():this.parseJSXNameValueAttribute();t.push(e)}return t},e.prototype.parseJSXOpeningElement=function(){var t=this.createJSXNode();this.expectJSX("<");var e=this.parseJSXElementName(),n=this.parseJSXAttributes(),r=this.matchJSX("/");return r&&this.expectJSX("/"),this.expectJSX(">"),this.finalize(t,new s.JSXOpeningElement(e,r,n))},e.prototype.parseJSXBoundaryElement=function(){var t=this.createJSXNode();if(this.expectJSX("<"),this.matchJSX("/")){this.expectJSX("/");var e=this.parseJSXElementName();return this.expectJSX(">"),this.finalize(t,new s.JSXClosingElement(e))}var n=this.parseJSXElementName(),r=this.parseJSXAttributes(),i=this.matchJSX("/");return i&&this.expectJSX("/"),this.expectJSX(">"),this.finalize(t,new s.JSXOpeningElement(n,i,r))},e.prototype.parseJSXEmptyExpression=function(){var t=this.createJSXChildNode();return this.collectComments(),this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.finalize(t,new s.JSXEmptyExpression)},e.prototype.parseJSXExpressionContainer=function(){var t=this.createJSXNode();this.expectJSX("{");var e;return this.matchJSX("}")?(e=this.parseJSXEmptyExpression(),this.expectJSX("}")):(this.finishJSX(),e=this.parseAssignmentExpression(),this.reenterJSX()),this.finalize(t,new s.JSXExpressionContainer(e))},e.prototype.parseJSXChildren=function(){for(var t=[];!this.scanner.eof();){var e=this.createJSXChildNode(),n=this.nextJSXText();if(n.start<n.end){var r=this.getTokenRaw(n),i=this.finalize(e,new s.JSXText(n.value,r));t.push(i)}if("{"!==this.scanner.source[this.scanner.index])break;var o=this.parseJSXExpressionContainer();t.push(o)}return t},e.prototype.parseComplexJSXElement=function(t){for(var e=[];!this.scanner.eof();){t.children=t.children.concat(this.parseJSXChildren());var n=this.createJSXChildNode(),i=this.parseJSXBoundaryElement();if(i.type===a.JSXSyntax.JSXOpeningElement){var o=i;if(o.selfClosing){var u=this.finalize(n,new s.JSXElement(o,[],null));t.children.push(u)}else e.push(t),t={node:n,opening:o,closing:null,children:[]}}if(i.type===a.JSXSyntax.JSXClosingElement){t.closing=i;var c=r(t.opening.name);if(c!==r(t.closing.name)&&this.tolerateError("Expected corresponding JSX closing tag for %0",c),!(e.length>0))break;var u=this.finalize(t.node,new s.JSXElement(t.opening,t.children,t.closing));t=e[e.length-1],t.children.push(u),e.pop()}}return t},e.prototype.parseJSXElement=function(){var t=this.createJSXNode(),e=this.parseJSXOpeningElement(),n=[],r=null;if(!e.selfClosing){var i=this.parseComplexJSXElement({node:t,opening:e,closing:r,children:n});n=i.children,r=i.closing}return this.finalize(t,new s.JSXElement(e,n,r))},e.prototype.parseJSXRoot=function(){this.config.tokens&&this.tokens.pop(),this.startJSX();var t=this.parseJSXElement();return this.finishJSX(),t},e.prototype.isStartOfExpression=function(){return t.prototype.isStartOfExpression.call(this)||this.match("<")},e}(c.Parser);e.JSXParser=p},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n={NonAsciiIdentifierStart:/[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]/,NonAsciiIdentifierPart:/[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B4\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/};e.Character={fromCodePoint:function(t){return t<65536?String.fromCharCode(t):String.fromCharCode(55296+(t-65536>>10))+String.fromCharCode(56320+(t-65536&1023))},isWhiteSpace:function(t){return 32===t||9===t||11===t||12===t||160===t||t>=5760&&[5760,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8239,8287,12288,65279].indexOf(t)>=0},isLineTerminator:function(t){return 10===t||13===t||8232===t||8233===t},isIdentifierStart:function(t){return 36===t||95===t||t>=65&&t<=90||t>=97&&t<=122||92===t||t>=128&&n.NonAsciiIdentifierStart.test(e.Character.fromCodePoint(t))},isIdentifierPart:function(t){return 36===t||95===t||t>=65&&t<=90||t>=97&&t<=122||t>=48&&t<=57||92===t||t>=128&&n.NonAsciiIdentifierPart.test(e.Character.fromCodePoint(t))},isDecimalDigit:function(t){return t>=48&&t<=57},isHexDigit:function(t){return t>=48&&t<=57||t>=65&&t<=70||t>=97&&t<=102},isOctalDigit:function(t){return t>=48&&t<=55}}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(6),i=function(){function t(t){this.type=r.JSXSyntax.JSXClosingElement,this.name=t}return t}();e.JSXClosingElement=i;var o=function(){function t(t,e,n){this.type=r.JSXSyntax.JSXElement,this.openingElement=t,this.children=e,this.closingElement=n}return t}();e.JSXElement=o;var s=function(){function t(){this.type=r.JSXSyntax.JSXEmptyExpression}return t}();e.JSXEmptyExpression=s;var a=function(){function t(t){this.type=r.JSXSyntax.JSXExpressionContainer,this.expression=t}return t}();e.JSXExpressionContainer=a;var u=function(){function t(t){this.type=r.JSXSyntax.JSXIdentifier,this.name=t}return t}();e.JSXIdentifier=u;var c=function(){function t(t,e){this.type=r.JSXSyntax.JSXMemberExpression,this.object=t,this.property=e}return t}();e.JSXMemberExpression=c;var h=function(){function t(t,e){this.type=r.JSXSyntax.JSXAttribute,this.name=t,this.value=e}return t}();e.JSXAttribute=h;var l=function(){function t(t,e){this.type=r.JSXSyntax.JSXNamespacedName,this.namespace=t,this.name=e}return t}();e.JSXNamespacedName=l;var p=function(){function t(t,e,n){this.type=r.JSXSyntax.JSXOpeningElement,this.name=t,this.selfClosing=e,this.attributes=n}return t}();e.JSXOpeningElement=p;var f=function(){function t(t){this.type=r.JSXSyntax.JSXSpreadAttribute,this.argument=t}return t}();e.JSXSpreadAttribute=f;var d=function(){function t(t,e){this.type=r.JSXSyntax.JSXText,this.value=t,this.raw=e}return t}();e.JSXText=d},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.JSXSyntax={JSXAttribute:"JSXAttribute",JSXClosingElement:"JSXClosingElement",JSXElement:"JSXElement",JSXEmptyExpression:"JSXEmptyExpression",JSXExpressionContainer:"JSXExpressionContainer",JSXIdentifier:"JSXIdentifier",JSXMemberExpression:"JSXMemberExpression",JSXNamespacedName:"JSXNamespacedName",JSXOpeningElement:"JSXOpeningElement",JSXSpreadAttribute:"JSXSpreadAttribute",JSXText:"JSXText"}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(2),i=function(){function t(t){this.type=r.Syntax.ArrayExpression,this.elements=t}return t}();e.ArrayExpression=i;var o=function(){function t(t){this.type=r.Syntax.ArrayPattern,this.elements=t}return t}();e.ArrayPattern=o;var s=function(){function t(t,e,n){this.type=r.Syntax.ArrowFunctionExpression,this.id=null,this.params=t,this.body=e,this.generator=!1,this.expression=n,this.async=!1}return t}();e.ArrowFunctionExpression=s;var a=function(){function t(t,e,n){this.type=r.Syntax.AssignmentExpression,this.operator=t,this.left=e,this.right=n}return t}();e.AssignmentExpression=a;var u=function(){function t(t,e){this.type=r.Syntax.AssignmentPattern,this.left=t,this.right=e}return t}();e.AssignmentPattern=u;var c=function(){function t(t,e,n){this.type=r.Syntax.ArrowFunctionExpression,this.id=null,this.params=t,this.body=e,this.generator=!1,this.expression=n,this.async=!0}return t}();e.AsyncArrowFunctionExpression=c;var h=function(){function t(t,e,n){this.type=r.Syntax.FunctionDeclaration,this.id=t,this.params=e,this.body=n,this.generator=!1,this.expression=!1,this.async=!0}return t}();e.AsyncFunctionDeclaration=h;var l=function(){function t(t,e,n){this.type=r.Syntax.FunctionExpression,this.id=t,this.params=e,this.body=n,this.generator=!1,this.expression=!1,this.async=!0}return t}();e.AsyncFunctionExpression=l;var p=function(){function t(t){this.type=r.Syntax.AwaitExpression,this.argument=t}return t}();e.AwaitExpression=p;var f=function(){function t(t,e,n){var i="||"===t||"&&"===t;this.type=i?r.Syntax.LogicalExpression:r.Syntax.BinaryExpression,this.operator=t,this.left=e,this.right=n}return t}();e.BinaryExpression=f;var d=function(){function t(t){this.type=r.Syntax.BlockStatement,this.body=t}return t}();e.BlockStatement=d;var m=function(){function t(t){this.type=r.Syntax.BreakStatement,this.label=t}return t}();e.BreakStatement=m;var y=function(){function t(t,e){this.type=r.Syntax.CallExpression,this.callee=t,this.arguments=e}return t}();e.CallExpression=y;var v=function(){function t(t,e){this.type=r.Syntax.CatchClause,this.param=t,this.body=e}return t}();e.CatchClause=v;var x=function(){function t(t){this.type=r.Syntax.ClassBody,this.body=t}return t}();e.ClassBody=x;var g=function(){function t(t,e,n){this.type=r.Syntax.ClassDeclaration,this.id=t,this.superClass=e,this.body=n}return t}();e.ClassDeclaration=g;var D=function(){function t(t,e,n){this.type=r.Syntax.ClassExpression,this.id=t,this.superClass=e,this.body=n}return t}();e.ClassExpression=D;var E=function(){function t(t,e){this.type=r.Syntax.MemberExpression,this.computed=!0,this.object=t,this.property=e}return t}();e.ComputedMemberExpression=E;var A=function(){function t(t,e,n){this.type=r.Syntax.ConditionalExpression,this.test=t,this.consequent=e,this.alternate=n}return t}();e.ConditionalExpression=A;var S=function(){function t(t){this.type=r.Syntax.ContinueStatement,this.label=t}return t}();e.ContinueStatement=S;var w=function(){function t(){this.type=r.Syntax.DebuggerStatement}return t}();e.DebuggerStatement=w;var C=function(){function t(t,e){this.type=r.Syntax.ExpressionStatement,this.expression=t,this.directive=e}return t}();e.Directive=C;var _=function(){function t(t,e){this.type=r.Syntax.DoWhileStatement,this.body=t,this.test=e}return t}();e.DoWhileStatement=_;var b=function(){function t(){this.type=r.Syntax.EmptyStatement}return t}();e.EmptyStatement=b;var F=function(){function t(t){this.type=r.Syntax.ExportAllDeclaration,this.source=t}return t}();e.ExportAllDeclaration=F;var k=function(){function t(t){this.type=r.Syntax.ExportDefaultDeclaration,this.declaration=t}return t}();e.ExportDefaultDeclaration=k;var I=function(){function t(t,e,n){this.type=r.Syntax.ExportNamedDeclaration,this.declaration=t,this.specifiers=e,this.source=n}return t}();e.ExportNamedDeclaration=I;var T=function(){function t(t,e){this.type=r.Syntax.ExportSpecifier,this.exported=e,this.local=t}return t}();e.ExportSpecifier=T;var B=function(){function t(t){this.type=r.Syntax.ExpressionStatement,this.expression=t}return t}();e.ExpressionStatement=B;var M=function(){function t(t,e,n){this.type=r.Syntax.ForInStatement,this.left=t,this.right=e,this.body=n,this.each=!1}return t}();e.ForInStatement=M;var P=function(){function t(t,e,n){this.type=r.Syntax.ForOfStatement,this.left=t,this.right=e,this.body=n}return t}();e.ForOfStatement=P;var N=function(){function t(t,e,n,i){this.type=r.Syntax.ForStatement,this.init=t,this.test=e,this.update=n,this.body=i}return t}();e.ForStatement=N;var O=function(){function t(t,e,n,i){this.type=r.Syntax.FunctionDeclaration,this.id=t,this.params=e,this.body=n,this.generator=i,this.expression=!1,this.async=!1}return t}();e.FunctionDeclaration=O;var R=function(){function t(t,e,n,i){this.type=r.Syntax.FunctionExpression,this.id=t,this.params=e,this.body=n,this.generator=i,this.expression=!1,this.async=!1}return t}();e.FunctionExpression=R;var U=function(){function t(t){this.type=r.Syntax.Identifier,this.name=t}return t}();e.Identifier=U;var j=function(){function t(t,e,n){this.type=r.Syntax.IfStatement,this.test=t,this.consequent=e,this.alternate=n}return t}();e.IfStatement=j;var L=function(){function t(t,e){this.type=r.Syntax.ImportDeclaration,this.specifiers=t,this.source=e}return t}();e.ImportDeclaration=L;var z=function(){function t(t){this.type=r.Syntax.ImportDefaultSpecifier,this.local=t}return t}();e.ImportDefaultSpecifier=z;var J=function(){function t(t){this.type=r.Syntax.ImportNamespaceSpecifier,this.local=t}return t}();e.ImportNamespaceSpecifier=J;var X=function(){function t(t,e){this.type=r.Syntax.ImportSpecifier,this.local=t,this.imported=e}return t}();e.ImportSpecifier=X;var q=function(){function t(t,e){this.type=r.Syntax.LabeledStatement,this.label=t,this.body=e}return t}();e.LabeledStatement=q;var K=function(){function t(t,e){this.type=r.Syntax.Literal,this.value=t,this.raw=e}return t}();e.Literal=K;var Y=function(){function t(t,e){this.type=r.Syntax.MetaProperty,this.meta=t,this.property=e}return t}();e.MetaProperty=Y;var W=function(){function t(t,e,n,i,o){this.type=r.Syntax.MethodDefinition,this.key=t,this.computed=e,this.value=n,this.kind=i,this.static=o}return t}();e.MethodDefinition=W;var G=function(){function t(t){this.type=r.Syntax.Program,this.body=t,this.sourceType="module"}return t}();e.Module=G;var H=function(){function t(t,e){this.type=r.Syntax.NewExpression,this.callee=t,this.arguments=e}return t}();e.NewExpression=H;var V=function(){function t(t){this.type=r.Syntax.ObjectExpression,this.properties=t}return t}();e.ObjectExpression=V;var $=function(){function t(t){this.type=r.Syntax.ObjectPattern,this.properties=t}return t}();e.ObjectPattern=$;var Z=function(){function t(t,e,n,i,o,s){this.type=r.Syntax.Property,this.key=e,this.computed=n,this.value=i,this.kind=t,this.method=o,this.shorthand=s}return t}();e.Property=Z;var Q=function(){function t(t,e,n,i){this.type=r.Syntax.Literal,this.value=t,this.raw=e,this.regex={pattern:n,flags:i}}return t}();e.RegexLiteral=Q;var tt=function(){function t(t){this.type=r.Syntax.RestElement,this.argument=t}return t}();e.RestElement=tt;var et=function(){function t(t){this.type=r.Syntax.ReturnStatement,this.argument=t}return t}();e.ReturnStatement=et;var nt=function(){function t(t){this.type=r.Syntax.Program,this.body=t,this.sourceType="script"}return t}();e.Script=nt;var rt=function(){function t(t){this.type=r.Syntax.SequenceExpression,this.expressions=t}return t}();e.SequenceExpression=rt;var it=function(){function t(t){this.type=r.Syntax.SpreadElement,this.argument=t}return t}();e.SpreadElement=it;var ot=function(){function t(t,e){this.type=r.Syntax.MemberExpression,this.computed=!1,this.object=t,this.property=e}return t}();e.StaticMemberExpression=ot;var st=function(){function t(){this.type=r.Syntax.Super}return t}();e.Super=st;var at=function(){function t(t,e){this.type=r.Syntax.SwitchCase,this.test=t,this.consequent=e}return t}();e.SwitchCase=at;var ut=function(){function t(t,e){this.type=r.Syntax.SwitchStatement,this.discriminant=t,this.cases=e}return t}();e.SwitchStatement=ut;var ct=function(){function t(t,e){this.type=r.Syntax.TaggedTemplateExpression,this.tag=t,this.quasi=e}return t}();e.TaggedTemplateExpression=ct;var ht=function(){function t(t,e){this.type=r.Syntax.TemplateElement,this.value=t,this.tail=e}return t}();e.TemplateElement=ht;var lt=function(){function t(t,e){this.type=r.Syntax.TemplateLiteral,this.quasis=t,this.expressions=e}return t}();e.TemplateLiteral=lt;var pt=function(){function t(){this.type=r.Syntax.ThisExpression}return t}();e.ThisExpression=pt;var ft=function(){function t(t){this.type=r.Syntax.ThrowStatement,this.argument=t}return t}();e.ThrowStatement=ft;var dt=function(){function t(t,e,n){this.type=r.Syntax.TryStatement,this.block=t,this.handler=e,this.finalizer=n}return t}();e.TryStatement=dt;var mt=function(){function t(t,e){this.type=r.Syntax.UnaryExpression,this.operator=t,this.argument=e,this.prefix=!0}return t}();e.UnaryExpression=mt;var yt=function(){function t(t,e,n){this.type=r.Syntax.UpdateExpression,this.operator=t,this.argument=e,this.prefix=n}return t}();e.UpdateExpression=yt;var vt=function(){function t(t,e){this.type=r.Syntax.VariableDeclaration,this.declarations=t,this.kind=e}return t}();e.VariableDeclaration=vt;var xt=function(){function t(t,e){this.type=r.Syntax.VariableDeclarator,this.id=t,this.init=e}return t}();e.VariableDeclarator=xt;var gt=function(){function t(t,e){this.type=r.Syntax.WhileStatement,this.test=t,this.body=e}return t}();e.WhileStatement=gt;var Dt=function(){function t(t,e){this.type=r.Syntax.WithStatement,this.object=t,this.body=e}return t}();e.WithStatement=Dt;var Et=function(){function t(t,e){this.type=r.Syntax.YieldExpression,this.argument=t,this.delegate=e}return t}();e.YieldExpression=Et},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(9),i=n(10),o=n(11),s=n(7),a=n(12),u=n(2),c=n(13),h=function(){function t(t,e,n){void 0===e&&(e={}),this.config={range:"boolean"==typeof e.range&&e.range,loc:"boolean"==typeof e.loc&&e.loc,source:null,tokens:"boolean"==typeof e.tokens&&e.tokens,comment:"boolean"==typeof e.comment&&e.comment,tolerant:"boolean"==typeof e.tolerant&&e.tolerant},this.config.loc&&e.source&&null!==e.source&&(this.config.source=String(e.source)),this.delegate=n,this.errorHandler=new i.ErrorHandler,this.errorHandler.tolerant=this.config.tolerant,this.scanner=new a.Scanner(t,this.errorHandler),this.scanner.trackComment=this.config.comment,this.operatorPrecedence={")":0,";":0,",":0,"=":0,"]":0,"||":1,"&&":2,"|":3,"^":4,"&":5,"==":6,"!=":6,"===":6,"!==":6,"<":7,">":7,"<=":7,">=":7,"<<":8,">>":8,">>>":8,"+":9,"-":9,"*":11,"/":11,"%":11},this.lookahead={type:2,value:"",lineNumber:this.scanner.lineNumber,lineStart:0,start:0,end:0},this.hasLineTerminator=!1,this.context={isModule:!1,await:!1,allowIn:!0,allowStrictDirective:!0,allowYield:!0,firstCoverInitializedNameError:null,isAssignmentTarget:!1,isBindingElement:!1,inFunctionBody:!1,inIteration:!1,inSwitch:!1,labelSet:{},strict:!1},this.tokens=[],this.startMarker={index:0,line:this.scanner.lineNumber,column:0},this.lastMarker={index:0,line:this.scanner.lineNumber,column:0},this.nextToken(),this.lastMarker={index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}}return t.prototype.throwError=function(t){for(var e=[],n=1;n<arguments.length;n++)e[n-1]=arguments[n];var i=Array.prototype.slice.call(arguments,1),o=t.replace(/%(\d)/g,function(t,e){return r.assert(e<i.length,"Message reference must be in range"),i[e]}),s=this.lastMarker.index,a=this.lastMarker.line,u=this.lastMarker.column+1;throw this.errorHandler.createError(s,a,u,o)},t.prototype.tolerateError=function(t){for(var e=[],n=1;n<arguments.length;n++)e[n-1]=arguments[n];var i=Array.prototype.slice.call(arguments,1),o=t.replace(/%(\d)/g,function(t,e){return r.assert(e<i.length,"Message reference must be in range"),i[e]}),s=this.lastMarker.index,a=this.scanner.lineNumber,u=this.lastMarker.column+1;this.errorHandler.tolerateError(s,a,u,o)},t.prototype.unexpectedTokenError=function(t,e){var n,r=e||o.Messages.UnexpectedToken;if(t?(e||(r=2===t.type?o.Messages.UnexpectedEOS:3===t.type?o.Messages.UnexpectedIdentifier:6===t.type?o.Messages.UnexpectedNumber:8===t.type?o.Messages.UnexpectedString:10===t.type?o.Messages.UnexpectedTemplate:o.Messages.UnexpectedToken,4===t.type&&(this.scanner.isFutureReservedWord(t.value)?r=o.Messages.UnexpectedReserved:this.context.strict&&this.scanner.isStrictModeReservedWord(t.value)&&(r=o.Messages.StrictReservedWord))),n=t.value):n="ILLEGAL",r=r.replace("%0",n),t&&"number"==typeof t.lineNumber){var i=t.start,s=t.lineNumber,a=this.lastMarker.index-this.lastMarker.column,u=t.start-a+1;return this.errorHandler.createError(i,s,u,r)}var i=this.lastMarker.index,s=this.lastMarker.line,u=this.lastMarker.column+1;return this.errorHandler.createError(i,s,u,r)},t.prototype.throwUnexpectedToken=function(t,e){throw this.unexpectedTokenError(t,e)},t.prototype.tolerateUnexpectedToken=function(t,e){this.errorHandler.tolerate(this.unexpectedTokenError(t,e))},t.prototype.collectComments=function(){if(this.config.comment){var t=this.scanner.scanComments();if(t.length>0&&this.delegate)for(var e=0;e<t.length;++e){var n=t[e],r=void 0;r={type:n.multiLine?"BlockComment":"LineComment",value:this.scanner.source.slice(n.slice[0],n.slice[1])},this.config.range&&(r.range=n.range),this.config.loc&&(r.loc=n.loc);var i={start:{line:n.loc.start.line,column:n.loc.start.column,offset:n.range[0]},end:{line:n.loc.end.line,column:n.loc.end.column,offset:n.range[1]}};this.delegate(r,i)}}else this.scanner.scanComments()},t.prototype.getTokenRaw=function(t){return this.scanner.source.slice(t.start,t.end)},t.prototype.convertToken=function(t){var e={type:c.TokenName[t.type],value:this.getTokenRaw(t)};if(this.config.range&&(e.range=[t.start,t.end]),this.config.loc&&(e.loc={start:{line:this.startMarker.line,column:this.startMarker.column},end:{line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}}),9===t.type){var n=t.pattern,r=t.flags;e.regex={pattern:n,flags:r}}return e},t.prototype.nextToken=function(){var t=this.lookahead;this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.collectComments(),this.scanner.index!==this.startMarker.index&&(this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart);var e=this.scanner.lex();return this.hasLineTerminator=t.lineNumber!==e.lineNumber,e&&this.context.strict&&3===e.type&&this.scanner.isStrictModeReservedWord(e.value)&&(e.type=4),this.lookahead=e,this.config.tokens&&2!==e.type&&this.tokens.push(this.convertToken(e)),t},t.prototype.nextRegexToken=function(){this.collectComments();var t=this.scanner.scanRegExp();return this.config.tokens&&(this.tokens.pop(),this.tokens.push(this.convertToken(t))),this.lookahead=t,this.nextToken(),t},t.prototype.createNode=function(){return{index:this.startMarker.index,line:this.startMarker.line,column:this.startMarker.column}},t.prototype.startNode=function(t){return{index:t.start,line:t.lineNumber,column:t.start-t.lineStart}},t.prototype.finalize=function(t,e){if(this.config.range&&(e.range=[t.index,this.lastMarker.index]),this.config.loc&&(e.loc={start:{line:t.line,column:t.column},end:{line:this.lastMarker.line,column:this.lastMarker.column}},this.config.source&&(e.loc.source=this.config.source)),this.delegate){var n={start:{line:t.line,column:t.column,offset:t.index},end:{line:this.lastMarker.line,column:this.lastMarker.column,offset:this.lastMarker.index}};this.delegate(e,n)}return e},t.prototype.expect=function(t){var e=this.nextToken();7===e.type&&e.value===t||this.throwUnexpectedToken(e)},t.prototype.expectCommaSeparator=function(){if(this.config.tolerant){var t=this.lookahead;7===t.type&&","===t.value?this.nextToken():7===t.type&&";"===t.value?(this.nextToken(),this.tolerateUnexpectedToken(t)):this.tolerateUnexpectedToken(t,o.Messages.UnexpectedToken)}else this.expect(",")},t.prototype.expectKeyword=function(t){var e=this.nextToken();4===e.type&&e.value===t||this.throwUnexpectedToken(e)},t.prototype.match=function(t){return 7===this.lookahead.type&&this.lookahead.value===t},t.prototype.matchKeyword=function(t){return 4===this.lookahead.type&&this.lookahead.value===t},t.prototype.matchContextualKeyword=function(t){return 3===this.lookahead.type&&this.lookahead.value===t},t.prototype.matchAssign=function(){if(7!==this.lookahead.type)return!1;var t=this.lookahead.value;return"="===t||"*="===t||"**="===t||"/="===t||"%="===t||"+="===t||"-="===t||"<<="===t||">>="===t||">>>="===t||"&="===t||"^="===t||"|="===t},t.prototype.isolateCoverGrammar=function(t){var e=this.context.isBindingElement,n=this.context.isAssignmentTarget,r=this.context.firstCoverInitializedNameError;this.context.isBindingElement=!0,this.context.isAssignmentTarget=!0,this.context.firstCoverInitializedNameError=null;var i=t.call(this);return null!==this.context.firstCoverInitializedNameError&&this.throwUnexpectedToken(this.context.firstCoverInitializedNameError),this.context.isBindingElement=e,this.context.isAssignmentTarget=n,this.context.firstCoverInitializedNameError=r,i},t.prototype.inheritCoverGrammar=function(t){var e=this.context.isBindingElement,n=this.context.isAssignmentTarget,r=this.context.firstCoverInitializedNameError;this.context.isBindingElement=!0,this.context.isAssignmentTarget=!0,this.context.firstCoverInitializedNameError=null;var i=t.call(this);return this.context.isBindingElement=this.context.isBindingElement&&e,this.context.isAssignmentTarget=this.context.isAssignmentTarget&&n,this.context.firstCoverInitializedNameError=r||this.context.firstCoverInitializedNameError,i},t.prototype.consumeSemicolon=function(){this.match(";")?this.nextToken():this.hasLineTerminator||(2===this.lookahead.type||this.match("}")||this.throwUnexpectedToken(this.lookahead),this.lastMarker.index=this.startMarker.index,this.lastMarker.line=this.startMarker.line,this.lastMarker.column=this.startMarker.column)},t.prototype.parsePrimaryExpression=function(){var t,e,n,r=this.createNode();switch(this.lookahead.type){case 3:(this.context.isModule||this.context.await)&&"await"===this.lookahead.value&&this.tolerateUnexpectedToken(this.lookahead),t=this.matchAsyncFunction()?this.parseFunctionExpression():this.finalize(r,new s.Identifier(this.nextToken().value));break;case 6:case 8:this.context.strict&&this.lookahead.octal&&this.tolerateUnexpectedToken(this.lookahead,o.Messages.StrictOctalLiteral),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,e=this.nextToken(),n=this.getTokenRaw(e),t=this.finalize(r,new s.Literal(e.value,n));break;case 1:this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,e=this.nextToken(),n=this.getTokenRaw(e),t=this.finalize(r,new s.Literal("true"===e.value,n));break;case 5:this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,e=this.nextToken(),n=this.getTokenRaw(e),t=this.finalize(r,new s.Literal(null,n));break;case 10:t=this.parseTemplateLiteral();break;case 7:switch(this.lookahead.value){case"(":this.context.isBindingElement=!1,t=this.inheritCoverGrammar(this.parseGroupExpression);break;case"[":t=this.inheritCoverGrammar(this.parseArrayInitializer);break;case"{":t=this.inheritCoverGrammar(this.parseObjectInitializer);break;case"/":case"/=":this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.scanner.index=this.startMarker.index,e=this.nextRegexToken(),n=this.getTokenRaw(e),t=this.finalize(r,new s.RegexLiteral(e.regex,n,e.pattern,e.flags));break;default:t=this.throwUnexpectedToken(this.nextToken())}break;case 4:!this.context.strict&&this.context.allowYield&&this.matchKeyword("yield")?t=this.parseIdentifierName():!this.context.strict&&this.matchKeyword("let")?t=this.finalize(r,new s.Identifier(this.nextToken().value)):(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.matchKeyword("function")?t=this.parseFunctionExpression():this.matchKeyword("this")?(this.nextToken(),t=this.finalize(r,new s.ThisExpression)):t=this.matchKeyword("class")?this.parseClassExpression():this.throwUnexpectedToken(this.nextToken()));break;default:t=this.throwUnexpectedToken(this.nextToken())}return t},t.prototype.parseSpreadElement=function(){var t=this.createNode();this.expect("...");var e=this.inheritCoverGrammar(this.parseAssignmentExpression);return this.finalize(t,new s.SpreadElement(e))},t.prototype.parseArrayInitializer=function(){var t=this.createNode(),e=[];for(this.expect("[");!this.match("]");)if(this.match(","))this.nextToken(),e.push(null);else if(this.match("...")){var n=this.parseSpreadElement();this.match("]")||(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.expect(",")),e.push(n)}else e.push(this.inheritCoverGrammar(this.parseAssignmentExpression)),this.match("]")||this.expect(",");return this.expect("]"),this.finalize(t,new s.ArrayExpression(e))},t.prototype.parsePropertyMethod=function(t){this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var e=this.context.strict,n=this.context.allowStrictDirective;this.context.allowStrictDirective=t.simple;var r=this.isolateCoverGrammar(this.parseFunctionSourceElements);return this.context.strict&&t.firstRestricted&&this.tolerateUnexpectedToken(t.firstRestricted,t.message),this.context.strict&&t.stricted&&this.tolerateUnexpectedToken(t.stricted,t.message),this.context.strict=e,this.context.allowStrictDirective=n,r},t.prototype.parsePropertyMethodFunction=function(){var t=this.createNode(),e=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters(),r=this.parsePropertyMethod(n);return this.context.allowYield=e,this.finalize(t,new s.FunctionExpression(null,n.params,r,!1))},t.prototype.parsePropertyMethodAsyncFunction=function(){var t=this.createNode(),e=this.context.allowYield,n=this.context.await;this.context.allowYield=!1,this.context.await=!0;var r=this.parseFormalParameters(),i=this.parsePropertyMethod(r);return this.context.allowYield=e,this.context.await=n,this.finalize(t,new s.AsyncFunctionExpression(null,r.params,i))},t.prototype.parseObjectPropertyKey=function(){var t,e=this.createNode(),n=this.nextToken();switch(n.type){case 8:case 6:this.context.strict&&n.octal&&this.tolerateUnexpectedToken(n,o.Messages.StrictOctalLiteral);var r=this.getTokenRaw(n);t=this.finalize(e,new s.Literal(n.value,r));break;case 3:case 1:case 5:case 4:t=this.finalize(e,new s.Identifier(n.value));break;case 7:"["===n.value?(t=this.isolateCoverGrammar(this.parseAssignmentExpression),this.expect("]")):t=this.throwUnexpectedToken(n);break;default:t=this.throwUnexpectedToken(n)}return t},t.prototype.isPropertyKey=function(t,e){return t.type===u.Syntax.Identifier&&t.name===e||t.type===u.Syntax.Literal&&t.value===e},t.prototype.parseObjectProperty=function(t){var e,n=this.createNode(),r=this.lookahead,i=null,a=null,u=!1,c=!1,h=!1,l=!1;if(3===r.type){var p=r.value;this.nextToken(),u=this.match("["),l=!(this.hasLineTerminator||"async"!==p||this.match(":")||this.match("(")||this.match("*")),i=l?this.parseObjectPropertyKey():this.finalize(n,new s.Identifier(p))}else this.match("*")?this.nextToken():(u=this.match("["),i=this.parseObjectPropertyKey());var f=this.qualifiedPropertyName(this.lookahead);if(3===r.type&&!l&&"get"===r.value&&f)e="get",u=this.match("["),i=this.parseObjectPropertyKey(),this.context.allowYield=!1,a=this.parseGetterMethod();else if(3===r.type&&!l&&"set"===r.value&&f)e="set",u=this.match("["),i=this.parseObjectPropertyKey(),a=this.parseSetterMethod();else if(7===r.type&&"*"===r.value&&f)e="init",u=this.match("["),i=this.parseObjectPropertyKey(),a=this.parseGeneratorMethod(),c=!0;else if(i||this.throwUnexpectedToken(this.lookahead),e="init",this.match(":")&&!l)!u&&this.isPropertyKey(i,"__proto__")&&(t.value&&this.tolerateError(o.Messages.DuplicateProtoProperty),t.value=!0),this.nextToken(),a=this.inheritCoverGrammar(this.parseAssignmentExpression);else if(this.match("("))a=l?this.parsePropertyMethodAsyncFunction():this.parsePropertyMethodFunction(),c=!0;else if(3===r.type){var p=this.finalize(n,new s.Identifier(r.value));if(this.match("=")){this.context.firstCoverInitializedNameError=this.lookahead,this.nextToken(),h=!0;var d=this.isolateCoverGrammar(this.parseAssignmentExpression);a=this.finalize(n,new s.AssignmentPattern(p,d))}else h=!0,a=p}else this.throwUnexpectedToken(this.nextToken());return this.finalize(n,new s.Property(e,i,u,a,c,h))},t.prototype.parseObjectInitializer=function(){var t=this.createNode();this.expect("{");for(var e=[],n={value:!1};!this.match("}");)e.push(this.parseObjectProperty(n)),this.match("}")||this.expectCommaSeparator();return this.expect("}"),this.finalize(t,new s.ObjectExpression(e))},t.prototype.parseTemplateHead=function(){r.assert(this.lookahead.head,"Template literal must start with a template head");var t=this.createNode(),e=this.nextToken(),n=e.value,i=e.cooked;return this.finalize(t,new s.TemplateElement({raw:n,cooked:i},e.tail))},t.prototype.parseTemplateElement=function(){10!==this.lookahead.type&&this.throwUnexpectedToken();var t=this.createNode(),e=this.nextToken(),n=e.value,r=e.cooked;return this.finalize(t,new s.TemplateElement({raw:n,cooked:r},e.tail))},t.prototype.parseTemplateLiteral=function(){var t=this.createNode(),e=[],n=[],r=this.parseTemplateHead();for(n.push(r);!r.tail;)e.push(this.parseExpression()),r=this.parseTemplateElement(),n.push(r);return this.finalize(t,new s.TemplateLiteral(n,e))},t.prototype.reinterpretExpressionAsPattern=function(t){switch(t.type){case u.Syntax.Identifier:case u.Syntax.MemberExpression:case u.Syntax.RestElement:case u.Syntax.AssignmentPattern:break;case u.Syntax.SpreadElement:t.type=u.Syntax.RestElement,this.reinterpretExpressionAsPattern(t.argument);break;case u.Syntax.ArrayExpression:t.type=u.Syntax.ArrayPattern;for(var e=0;e<t.elements.length;e++)null!==t.elements[e]&&this.reinterpretExpressionAsPattern(t.elements[e]);break;case u.Syntax.ObjectExpression:t.type=u.Syntax.ObjectPattern;for(var e=0;e<t.properties.length;e++)this.reinterpretExpressionAsPattern(t.properties[e].value);break;case u.Syntax.AssignmentExpression:t.type=u.Syntax.AssignmentPattern,delete t.operator,this.reinterpretExpressionAsPattern(t.left)}},t.prototype.parseGroupExpression=function(){var t;if(this.expect("("),this.match(")"))this.nextToken(),this.match("=>")||this.expect("=>"),t={type:"ArrowParameterPlaceHolder",params:[],async:!1};else{var e=this.lookahead,n=[];if(this.match("..."))t=this.parseRestElement(n),this.expect(")"),this.match("=>")||this.expect("=>"),t={type:"ArrowParameterPlaceHolder",params:[t],async:!1};else{var r=!1;if(this.context.isBindingElement=!0,t=this.inheritCoverGrammar(this.parseAssignmentExpression),this.match(",")){var i=[];for(this.context.isAssignmentTarget=!1,i.push(t);2!==this.lookahead.type&&this.match(",");){if(this.nextToken(),this.match(")")){this.nextToken();for(var o=0;o<i.length;o++)this.reinterpretExpressionAsPattern(i[o]);r=!0,t={type:"ArrowParameterPlaceHolder",params:i,async:!1}}else if(this.match("...")){this.context.isBindingElement||this.throwUnexpectedToken(this.lookahead),i.push(this.parseRestElement(n)),this.expect(")"),this.match("=>")||this.expect("=>"),this.context.isBindingElement=!1;for(var o=0;o<i.length;o++)this.reinterpretExpressionAsPattern(i[o]);r=!0,t={type:"ArrowParameterPlaceHolder",params:i,async:!1}}else i.push(this.inheritCoverGrammar(this.parseAssignmentExpression));if(r)break}r||(t=this.finalize(this.startNode(e),new s.SequenceExpression(i)))}if(!r){if(this.expect(")"),this.match("=>")&&(t.type===u.Syntax.Identifier&&"yield"===t.name&&(r=!0,t={type:"ArrowParameterPlaceHolder",params:[t],async:!1}),!r)){if(this.context.isBindingElement||this.throwUnexpectedToken(this.lookahead),t.type===u.Syntax.SequenceExpression)for(var o=0;o<t.expressions.length;o++)this.reinterpretExpressionAsPattern(t.expressions[o]);else this.reinterpretExpressionAsPattern(t);t={type:"ArrowParameterPlaceHolder",params:t.type===u.Syntax.SequenceExpression?t.expressions:[t],async:!1}}this.context.isBindingElement=!1}}}return t},t.prototype.parseArguments=function(){this.expect("(");var t=[];if(!this.match(")"))for(;;){var e=this.match("...")?this.parseSpreadElement():this.isolateCoverGrammar(this.parseAssignmentExpression);if(t.push(e),this.match(")"))break;if(this.expectCommaSeparator(),this.match(")"))break}return this.expect(")"),t},t.prototype.isIdentifierName=function(t){return 3===t.type||4===t.type||1===t.type||5===t.type},t.prototype.parseIdentifierName=function(){var t=this.createNode(),e=this.nextToken();return this.isIdentifierName(e)||this.throwUnexpectedToken(e),this.finalize(t,new s.Identifier(e.value))},t.prototype.parseNewExpression=function(){var t=this.createNode(),e=this.parseIdentifierName();r.assert("new"===e.name,"New expression must start with `new`");var n;if(this.match("."))if(this.nextToken(),3===this.lookahead.type&&this.context.inFunctionBody&&"target"===this.lookahead.value){var i=this.parseIdentifierName();n=new s.MetaProperty(e,i)}else this.throwUnexpectedToken(this.lookahead);else{var o=this.isolateCoverGrammar(this.parseLeftHandSideExpression),a=this.match("(")?this.parseArguments():[];n=new s.NewExpression(o,a),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}return this.finalize(t,n)},t.prototype.parseAsyncArgument=function(){var t=this.parseAssignmentExpression();return this.context.firstCoverInitializedNameError=null,t},t.prototype.parseAsyncArguments=function(){this.expect("(");var t=[];if(!this.match(")"))for(;;){var e=this.match("...")?this.parseSpreadElement():this.isolateCoverGrammar(this.parseAsyncArgument);if(t.push(e),this.match(")"))break;if(this.expectCommaSeparator(),this.match(")"))break}return this.expect(")"),t},t.prototype.parseLeftHandSideExpressionAllowCall=function(){var t=this.lookahead,e=this.matchContextualKeyword("async"),n=this.context.allowIn;this.context.allowIn=!0;var r;for(this.matchKeyword("super")&&this.context.inFunctionBody?(r=this.createNode(),this.nextToken(),r=this.finalize(r,new s.Super),this.match("(")||this.match(".")||this.match("[")||this.throwUnexpectedToken(this.lookahead)):r=this.inheritCoverGrammar(this.matchKeyword("new")?this.parseNewExpression:this.parsePrimaryExpression);;)if(this.match(".")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect(".");var i=this.parseIdentifierName();r=this.finalize(this.startNode(t),new s.StaticMemberExpression(r,i))}else if(this.match("(")){var o=e&&t.lineNumber===this.lookahead.lineNumber;this.context.isBindingElement=!1,this.context.isAssignmentTarget=!1;var a=o?this.parseAsyncArguments():this.parseArguments();if(r=this.finalize(this.startNode(t),new s.CallExpression(r,a)),o&&this.match("=>")){for(var u=0;u<a.length;++u)this.reinterpretExpressionAsPattern(a[u]);r={type:"ArrowParameterPlaceHolder",params:a,async:!0}}}else if(this.match("[")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect("[");var i=this.isolateCoverGrammar(this.parseExpression);this.expect("]"),r=this.finalize(this.startNode(t),new s.ComputedMemberExpression(r,i))}else{if(10!==this.lookahead.type||!this.lookahead.head)break;var c=this.parseTemplateLiteral();r=this.finalize(this.startNode(t),new s.TaggedTemplateExpression(r,c))}return this.context.allowIn=n,r},t.prototype.parseSuper=function(){var t=this.createNode();return this.expectKeyword("super"),this.match("[")||this.match(".")||this.throwUnexpectedToken(this.lookahead),this.finalize(t,new s.Super)},t.prototype.parseLeftHandSideExpression=function(){r.assert(this.context.allowIn,"callee of new expression always allow in keyword.");for(var t=this.startNode(this.lookahead),e=this.matchKeyword("super")&&this.context.inFunctionBody?this.parseSuper():this.inheritCoverGrammar(this.matchKeyword("new")?this.parseNewExpression:this.parsePrimaryExpression);;)if(this.match("[")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect("[");var n=this.isolateCoverGrammar(this.parseExpression);this.expect("]"),e=this.finalize(t,new s.ComputedMemberExpression(e,n))}else if(this.match(".")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect(".");var n=this.parseIdentifierName();e=this.finalize(t,new s.StaticMemberExpression(e,n))}else{if(10!==this.lookahead.type||!this.lookahead.head)break;var i=this.parseTemplateLiteral();e=this.finalize(t,new s.TaggedTemplateExpression(e,i))}return e},t.prototype.parseUpdateExpression=function(){var t,e=this.lookahead;if(this.match("++")||this.match("--")){var n=this.startNode(e),r=this.nextToken();t=this.inheritCoverGrammar(this.parseUnaryExpression),this.context.strict&&t.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(t.name)&&this.tolerateError(o.Messages.StrictLHSPrefix),this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment);var i=!0;t=this.finalize(n,new s.UpdateExpression(r.value,t,i)),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}else if(t=this.inheritCoverGrammar(this.parseLeftHandSideExpressionAllowCall),!this.hasLineTerminator&&7===this.lookahead.type&&(this.match("++")||this.match("--"))){this.context.strict&&t.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(t.name)&&this.tolerateError(o.Messages.StrictLHSPostfix),this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var a=this.nextToken().value,i=!1;t=this.finalize(this.startNode(e),new s.UpdateExpression(a,t,i))}return t},t.prototype.parseAwaitExpression=function(){var t=this.createNode();this.nextToken();var e=this.parseUnaryExpression();return this.finalize(t,new s.AwaitExpression(e))},t.prototype.parseUnaryExpression=function(){var t;if(this.match("+")||this.match("-")||this.match("~")||this.match("!")||this.matchKeyword("delete")||this.matchKeyword("void")||this.matchKeyword("typeof")){var e=this.startNode(this.lookahead),n=this.nextToken();t=this.inheritCoverGrammar(this.parseUnaryExpression),t=this.finalize(e,new s.UnaryExpression(n.value,t)),this.context.strict&&"delete"===t.operator&&t.argument.type===u.Syntax.Identifier&&this.tolerateError(o.Messages.StrictDelete),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}else t=this.context.await&&this.matchContextualKeyword("await")?this.parseAwaitExpression():this.parseUpdateExpression();return t},t.prototype.parseExponentiationExpression=function(){var t=this.lookahead,e=this.inheritCoverGrammar(this.parseUnaryExpression);if(e.type!==u.Syntax.UnaryExpression&&this.match("**")){this.nextToken(),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var n=e,r=this.isolateCoverGrammar(this.parseExponentiationExpression);e=this.finalize(this.startNode(t),new s.BinaryExpression("**",n,r))}return e},t.prototype.binaryPrecedence=function(t){var e=t.value;return 7===t.type?this.operatorPrecedence[e]||0:4===t.type&&("instanceof"===e||this.context.allowIn&&"in"===e)?7:0},t.prototype.parseBinaryExpression=function(){var t=this.lookahead,e=this.inheritCoverGrammar(this.parseExponentiationExpression),n=this.lookahead,r=this.binaryPrecedence(n);if(r>0){this.nextToken(),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;for(var i=[t,this.lookahead],o=e,a=this.isolateCoverGrammar(this.parseExponentiationExpression),u=[o,n.value,a],c=[r];;){if((r=this.binaryPrecedence(this.lookahead))<=0)break;for(;u.length>2&&r<=c[c.length-1];){a=u.pop();var h=u.pop();c.pop(),o=u.pop(),i.pop();var l=this.startNode(i[i.length-1]);u.push(this.finalize(l,new s.BinaryExpression(h,o,a)))}u.push(this.nextToken().value),c.push(r),i.push(this.lookahead),u.push(this.isolateCoverGrammar(this.parseExponentiationExpression))}var p=u.length-1;for(e=u[p],i.pop();p>1;){var l=this.startNode(i.pop()),h=u[p-1];e=this.finalize(l,new s.BinaryExpression(h,u[p-2],e)),p-=2}}return e},t.prototype.parseConditionalExpression=function(){var t=this.lookahead,e=this.inheritCoverGrammar(this.parseBinaryExpression);if(this.match("?")){this.nextToken();var n=this.context.allowIn;this.context.allowIn=!0;var r=this.isolateCoverGrammar(this.parseAssignmentExpression);this.context.allowIn=n,this.expect(":");var i=this.isolateCoverGrammar(this.parseAssignmentExpression);e=this.finalize(this.startNode(t),new s.ConditionalExpression(e,r,i)),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}return e},t.prototype.checkPatternParam=function(t,e){switch(e.type){case u.Syntax.Identifier:this.validateParam(t,e,e.name);break;case u.Syntax.RestElement:this.checkPatternParam(t,e.argument);break;case u.Syntax.AssignmentPattern:this.checkPatternParam(t,e.left);break;case u.Syntax.ArrayPattern:for(var n=0;n<e.elements.length;n++)null!==e.elements[n]&&this.checkPatternParam(t,e.elements[n]);break;case u.Syntax.ObjectPattern:for(var n=0;n<e.properties.length;n++)this.checkPatternParam(t,e.properties[n].value)}t.simple=t.simple&&e instanceof s.Identifier},t.prototype.reinterpretAsCoverFormalsList=function(t){var e,n=[t],r=!1;switch(t.type){case u.Syntax.Identifier:break;case"ArrowParameterPlaceHolder":n=t.params,r=t.async;break;default:return null}e={simple:!0,paramSet:{}};for(var i=0;i<n.length;++i){var s=n[i];s.type===u.Syntax.AssignmentPattern?s.right.type===u.Syntax.YieldExpression&&(s.right.argument&&this.throwUnexpectedToken(this.lookahead),s.right.type=u.Syntax.Identifier,s.right.name="yield",delete s.right.argument,delete s.right.delegate):r&&s.type===u.Syntax.Identifier&&"await"===s.name&&this.throwUnexpectedToken(this.lookahead),this.checkPatternParam(e,s),n[i]=s}if(this.context.strict||!this.context.allowYield)for(var i=0;i<n.length;++i){var s=n[i];s.type===u.Syntax.YieldExpression&&this.throwUnexpectedToken(this.lookahead)}if(e.message===o.Messages.StrictParamDupe){var a=this.context.strict?e.stricted:e.firstRestricted;this.throwUnexpectedToken(a,e.message)}return{simple:e.simple,params:n,stricted:e.stricted,firstRestricted:e.firstRestricted,message:e.message}},t.prototype.parseAssignmentExpression=function(){var t;if(!this.context.allowYield&&this.matchKeyword("yield"))t=this.parseYieldExpression();else{var e=this.lookahead,n=e;if(t=this.parseConditionalExpression(),3===n.type&&n.lineNumber===this.lookahead.lineNumber&&"async"===n.value&&(3===this.lookahead.type||this.matchKeyword("yield"))){var r=this.parsePrimaryExpression();this.reinterpretExpressionAsPattern(r),t={type:"ArrowParameterPlaceHolder",params:[r],async:!0}}if("ArrowParameterPlaceHolder"===t.type||this.match("=>")){this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var i=t.async,a=this.reinterpretAsCoverFormalsList(t);if(a){this.hasLineTerminator&&this.tolerateUnexpectedToken(this.lookahead),this.context.firstCoverInitializedNameError=null;var c=this.context.strict,h=this.context.allowStrictDirective;this.context.allowStrictDirective=a.simple;var l=this.context.allowYield,p=this.context.await;this.context.allowYield=!0,this.context.await=i;var f=this.startNode(e);this.expect("=>");var d=void 0;if(this.match("{")){var m=this.context.allowIn;this.context.allowIn=!0,d=this.parseFunctionSourceElements(),this.context.allowIn=m}else d=this.isolateCoverGrammar(this.parseAssignmentExpression);var y=d.type!==u.Syntax.BlockStatement;this.context.strict&&a.firstRestricted&&this.throwUnexpectedToken(a.firstRestricted,a.message),this.context.strict&&a.stricted&&this.tolerateUnexpectedToken(a.stricted,a.message),t=i?this.finalize(f,new s.AsyncArrowFunctionExpression(a.params,d,y)):this.finalize(f,new s.ArrowFunctionExpression(a.params,d,y)),this.context.strict=c,this.context.allowStrictDirective=h,this.context.allowYield=l,this.context.await=p}}else if(this.matchAssign()){if(this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment),this.context.strict&&t.type===u.Syntax.Identifier){var v=t;this.scanner.isRestrictedWord(v.name)&&this.tolerateUnexpectedToken(n,o.Messages.StrictLHSAssignment),this.scanner.isStrictModeReservedWord(v.name)&&this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord)}this.match("=")?this.reinterpretExpressionAsPattern(t):(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1),n=this.nextToken();var x=n.value,g=this.isolateCoverGrammar(this.parseAssignmentExpression);t=this.finalize(this.startNode(e),new s.AssignmentExpression(x,t,g)),this.context.firstCoverInitializedNameError=null}}return t},t.prototype.parseExpression=function(){var t=this.lookahead,e=this.isolateCoverGrammar(this.parseAssignmentExpression);if(this.match(",")){var n=[];for(n.push(e);2!==this.lookahead.type&&this.match(",");)this.nextToken(),n.push(this.isolateCoverGrammar(this.parseAssignmentExpression));e=this.finalize(this.startNode(t),new s.SequenceExpression(n))}return e},t.prototype.parseStatementListItem=function(){var t;if(this.context.isAssignmentTarget=!0,this.context.isBindingElement=!0,4===this.lookahead.type)switch(this.lookahead.value){case"export":this.context.isModule||this.tolerateUnexpectedToken(this.lookahead,o.Messages.IllegalExportDeclaration),t=this.parseExportDeclaration();break;case"import":this.context.isModule||this.tolerateUnexpectedToken(this.lookahead,o.Messages.IllegalImportDeclaration),t=this.parseImportDeclaration();break;case"const":t=this.parseLexicalDeclaration({inFor:!1});break;case"function":t=this.parseFunctionDeclaration();break;case"class":t=this.parseClassDeclaration();break;case"let":t=this.isLexicalDeclaration()?this.parseLexicalDeclaration({inFor:!1}):this.parseStatement();break;default:t=this.parseStatement()}else t=this.parseStatement();return t},t.prototype.parseBlock=function(){var t=this.createNode();this.expect("{");for(var e=[];;){if(this.match("}"))break;e.push(this.parseStatementListItem())}return this.expect("}"),this.finalize(t,new s.BlockStatement(e))},t.prototype.parseLexicalBinding=function(t,e){var n=this.createNode(),r=[],i=this.parsePattern(r,t);this.context.strict&&i.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(i.name)&&this.tolerateError(o.Messages.StrictVarName);var a=null;return"const"===t?this.matchKeyword("in")||this.matchContextualKeyword("of")||(this.match("=")?(this.nextToken(),a=this.isolateCoverGrammar(this.parseAssignmentExpression)):this.throwError(o.Messages.DeclarationMissingInitializer,"const")):(!e.inFor&&i.type!==u.Syntax.Identifier||this.match("="))&&(this.expect("="),a=this.isolateCoverGrammar(this.parseAssignmentExpression)),this.finalize(n,new s.VariableDeclarator(i,a))},t.prototype.parseBindingList=function(t,e){for(var n=[this.parseLexicalBinding(t,e)];this.match(",");)this.nextToken(),n.push(this.parseLexicalBinding(t,e));return n},t.prototype.isLexicalDeclaration=function(){var t=this.scanner.saveState();this.scanner.scanComments();var e=this.scanner.lex();return this.scanner.restoreState(t),3===e.type||7===e.type&&"["===e.value||7===e.type&&"{"===e.value||4===e.type&&"let"===e.value||4===e.type&&"yield"===e.value},t.prototype.parseLexicalDeclaration=function(t){var e=this.createNode(),n=this.nextToken().value;r.assert("let"===n||"const"===n,"Lexical declaration must be either let or const");var i=this.parseBindingList(n,t);return this.consumeSemicolon(),this.finalize(e,new s.VariableDeclaration(i,n))},t.prototype.parseBindingRestElement=function(t,e){var n=this.createNode();this.expect("...");var r=this.parsePattern(t,e);return this.finalize(n,new s.RestElement(r))},t.prototype.parseArrayPattern=function(t,e){var n=this.createNode();this.expect("[");for(var r=[];!this.match("]");)if(this.match(","))this.nextToken(),r.push(null);else{if(this.match("...")){r.push(this.parseBindingRestElement(t,e));break}r.push(this.parsePatternWithDefault(t,e)),this.match("]")||this.expect(",")}return this.expect("]"),this.finalize(n,new s.ArrayPattern(r))},t.prototype.parsePropertyPattern=function(t,e){var n,r,i=this.createNode(),o=!1,a=!1;if(3===this.lookahead.type){var u=this.lookahead;n=this.parseVariableIdentifier();var c=this.finalize(i,new s.Identifier(u.value));if(this.match("=")){t.push(u),a=!0,this.nextToken();var h=this.parseAssignmentExpression();r=this.finalize(this.startNode(u),new s.AssignmentPattern(c,h))}else this.match(":")?(this.expect(":"),r=this.parsePatternWithDefault(t,e)):(t.push(u),a=!0,r=c)}else o=this.match("["),n=this.parseObjectPropertyKey(),this.expect(":"),r=this.parsePatternWithDefault(t,e);return this.finalize(i,new s.Property("init",n,o,r,!1,a))},t.prototype.parseObjectPattern=function(t,e){var n=this.createNode(),r=[];for(this.expect("{");!this.match("}");)r.push(this.parsePropertyPattern(t,e)),this.match("}")||this.expect(",");return this.expect("}"),this.finalize(n,new s.ObjectPattern(r))},t.prototype.parsePattern=function(t,e){var n;return this.match("[")?n=this.parseArrayPattern(t,e):this.match("{")?n=this.parseObjectPattern(t,e):(!this.matchKeyword("let")||"const"!==e&&"let"!==e||this.tolerateUnexpectedToken(this.lookahead,o.Messages.LetInLexicalBinding),t.push(this.lookahead),n=this.parseVariableIdentifier(e)),n},t.prototype.parsePatternWithDefault=function(t,e){var n=this.lookahead,r=this.parsePattern(t,e);if(this.match("=")){this.nextToken();var i=this.context.allowYield;this.context.allowYield=!0;var o=this.isolateCoverGrammar(this.parseAssignmentExpression);this.context.allowYield=i,r=this.finalize(this.startNode(n),new s.AssignmentPattern(r,o))}return r},t.prototype.parseVariableIdentifier=function(t){var e=this.createNode(),n=this.nextToken();return 4===n.type&&"yield"===n.value?this.context.strict?this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord):this.context.allowYield||this.throwUnexpectedToken(n):3!==n.type?this.context.strict&&4===n.type&&this.scanner.isStrictModeReservedWord(n.value)?this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord):(this.context.strict||"let"!==n.value||"var"!==t)&&this.throwUnexpectedToken(n):(this.context.isModule||this.context.await)&&3===n.type&&"await"===n.value&&this.tolerateUnexpectedToken(n),this.finalize(e,new s.Identifier(n.value))},t.prototype.parseVariableDeclaration=function(t){var e=this.createNode(),n=[],r=this.parsePattern(n,"var");this.context.strict&&r.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(r.name)&&this.tolerateError(o.Messages.StrictVarName);var i=null;return this.match("=")?(this.nextToken(),i=this.isolateCoverGrammar(this.parseAssignmentExpression)):r.type===u.Syntax.Identifier||t.inFor||this.expect("="),this.finalize(e,new s.VariableDeclarator(r,i))},t.prototype.parseVariableDeclarationList=function(t){var e={inFor:t.inFor},n=[];for(n.push(this.parseVariableDeclaration(e));this.match(",");)this.nextToken(),n.push(this.parseVariableDeclaration(e));return n},t.prototype.parseVariableStatement=function(){var t=this.createNode();this.expectKeyword("var");var e=this.parseVariableDeclarationList({inFor:!1});return this.consumeSemicolon(),this.finalize(t,new s.VariableDeclaration(e,"var"))},t.prototype.parseEmptyStatement=function(){var t=this.createNode();return this.expect(";"),this.finalize(t,new s.EmptyStatement)},t.prototype.parseExpressionStatement=function(){var t=this.createNode(),e=this.parseExpression();return this.consumeSemicolon(),this.finalize(t,new s.ExpressionStatement(e))},t.prototype.parseIfClause=function(){return this.context.strict&&this.matchKeyword("function")&&this.tolerateError(o.Messages.StrictFunction),this.parseStatement()},t.prototype.parseIfStatement=function(){var t,e=this.createNode(),n=null;this.expectKeyword("if"),this.expect("(");var r=this.parseExpression();return!this.match(")")&&this.config.tolerant?(this.tolerateUnexpectedToken(this.nextToken()),t=this.finalize(this.createNode(),new s.EmptyStatement)):(this.expect(")"),t=this.parseIfClause(),this.matchKeyword("else")&&(this.nextToken(),n=this.parseIfClause())),this.finalize(e,new s.IfStatement(r,t,n))},t.prototype.parseDoWhileStatement=function(){var t=this.createNode();this.expectKeyword("do");var e=this.context.inIteration;this.context.inIteration=!0;var n=this.parseStatement();this.context.inIteration=e,this.expectKeyword("while"),this.expect("(");var r=this.parseExpression();return!this.match(")")&&this.config.tolerant?this.tolerateUnexpectedToken(this.nextToken()):(this.expect(")"),this.match(";")&&this.nextToken()),this.finalize(t,new s.DoWhileStatement(n,r))},t.prototype.parseWhileStatement=function(){var t,e=this.createNode();this.expectKeyword("while"),this.expect("(");var n=this.parseExpression();if(!this.match(")")&&this.config.tolerant)this.tolerateUnexpectedToken(this.nextToken()),t=this.finalize(this.createNode(),new s.EmptyStatement);else{this.expect(")");var r=this.context.inIteration;this.context.inIteration=!0,t=this.parseStatement(),this.context.inIteration=r}return this.finalize(e,new s.WhileStatement(n,t))},t.prototype.parseForStatement=function(){var t,e,n=null,r=null,i=null,a=!0,c=this.createNode();if(this.expectKeyword("for"),this.expect("("),this.match(";"))this.nextToken();else if(this.matchKeyword("var")){n=this.createNode(),this.nextToken();var h=this.context.allowIn;this.context.allowIn=!1;var l=this.parseVariableDeclarationList({inFor:!0});if(this.context.allowIn=h,1===l.length&&this.matchKeyword("in")){var p=l[0];p.init&&(p.id.type===u.Syntax.ArrayPattern||p.id.type===u.Syntax.ObjectPattern||this.context.strict)&&this.tolerateError(o.Messages.ForInOfLoopInitializer,"for-in"),n=this.finalize(n,new s.VariableDeclaration(l,"var")),this.nextToken(),t=n,e=this.parseExpression(),n=null}else 1===l.length&&null===l[0].init&&this.matchContextualKeyword("of")?(n=this.finalize(n,new s.VariableDeclaration(l,"var")),this.nextToken(),t=n,e=this.parseAssignmentExpression(),n=null,a=!1):(n=this.finalize(n,new s.VariableDeclaration(l,"var")),this.expect(";"))}else if(this.matchKeyword("const")||this.matchKeyword("let")){n=this.createNode();var f=this.nextToken().value;if(this.context.strict||"in"!==this.lookahead.value){var h=this.context.allowIn;this.context.allowIn=!1;var l=this.parseBindingList(f,{inFor:!0});this.context.allowIn=h,1===l.length&&null===l[0].init&&this.matchKeyword("in")?(n=this.finalize(n,new s.VariableDeclaration(l,f)),this.nextToken(),t=n,e=this.parseExpression(),n=null):1===l.length&&null===l[0].init&&this.matchContextualKeyword("of")?(n=this.finalize(n,new s.VariableDeclaration(l,f)),this.nextToken(),t=n,e=this.parseAssignmentExpression(),n=null,a=!1):(this.consumeSemicolon(),n=this.finalize(n,new s.VariableDeclaration(l,f)))}else n=this.finalize(n,new s.Identifier(f)),this.nextToken(),t=n,e=this.parseExpression(),n=null}else{var d=this.lookahead,h=this.context.allowIn;if(this.context.allowIn=!1,n=this.inheritCoverGrammar(this.parseAssignmentExpression),this.context.allowIn=h,this.matchKeyword("in"))this.context.isAssignmentTarget&&n.type!==u.Syntax.AssignmentExpression||this.tolerateError(o.Messages.InvalidLHSInForIn),this.nextToken(),this.reinterpretExpressionAsPattern(n),t=n,e=this.parseExpression(),n=null;else if(this.matchContextualKeyword("of"))this.context.isAssignmentTarget&&n.type!==u.Syntax.AssignmentExpression||this.tolerateError(o.Messages.InvalidLHSInForLoop),this.nextToken(),this.reinterpretExpressionAsPattern(n),t=n,e=this.parseAssignmentExpression(),n=null,a=!1;else{if(this.match(",")){for(var m=[n];this.match(",");)this.nextToken(),m.push(this.isolateCoverGrammar(this.parseAssignmentExpression));n=this.finalize(this.startNode(d),new s.SequenceExpression(m))}this.expect(";")}}void 0===t&&(this.match(";")||(r=this.parseExpression()),this.expect(";"),this.match(")")||(i=this.parseExpression()));var y;if(!this.match(")")&&this.config.tolerant)this.tolerateUnexpectedToken(this.nextToken()),y=this.finalize(this.createNode(),new s.EmptyStatement);else{this.expect(")");var v=this.context.inIteration;this.context.inIteration=!0,y=this.isolateCoverGrammar(this.parseStatement),this.context.inIteration=v}return void 0===t?this.finalize(c,new s.ForStatement(n,r,i,y)):a?this.finalize(c,new s.ForInStatement(t,e,y)):this.finalize(c,new s.ForOfStatement(t,e,y))},t.prototype.parseContinueStatement=function(){var t=this.createNode();this.expectKeyword("continue");var e=null;if(3===this.lookahead.type&&!this.hasLineTerminator){var n=this.parseVariableIdentifier();e=n;var r="$"+n.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,r)||this.throwError(o.Messages.UnknownLabel,n.name)}return this.consumeSemicolon(),null!==e||this.context.inIteration||this.throwError(o.Messages.IllegalContinue),this.finalize(t,new s.ContinueStatement(e))},t.prototype.parseBreakStatement=function(){var t=this.createNode();this.expectKeyword("break");var e=null;if(3===this.lookahead.type&&!this.hasLineTerminator){var n=this.parseVariableIdentifier(),r="$"+n.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,r)||this.throwError(o.Messages.UnknownLabel,n.name),e=n}return this.consumeSemicolon(),null!==e||this.context.inIteration||this.context.inSwitch||this.throwError(o.Messages.IllegalBreak),this.finalize(t,new s.BreakStatement(e))},t.prototype.parseReturnStatement=function(){this.context.inFunctionBody||this.tolerateError(o.Messages.IllegalReturn);var t=this.createNode();this.expectKeyword("return");var e=!this.match(";")&&!this.match("}")&&!this.hasLineTerminator&&2!==this.lookahead.type,n=e?this.parseExpression():null;return this.consumeSemicolon(),this.finalize(t,new s.ReturnStatement(n))},t.prototype.parseWithStatement=function(){this.context.strict&&this.tolerateError(o.Messages.StrictModeWith);var t,e=this.createNode();this.expectKeyword("with"),this.expect("(");var n=this.parseExpression();return!this.match(")")&&this.config.tolerant?(this.tolerateUnexpectedToken(this.nextToken()),t=this.finalize(this.createNode(),new s.EmptyStatement)):(this.expect(")"),t=this.parseStatement()),this.finalize(e,new s.WithStatement(n,t))},t.prototype.parseSwitchCase=function(){var t,e=this.createNode();this.matchKeyword("default")?(this.nextToken(),t=null):(this.expectKeyword("case"),t=this.parseExpression()),this.expect(":");for(var n=[];;){if(this.match("}")||this.matchKeyword("default")||this.matchKeyword("case"))break;n.push(this.parseStatementListItem())}return this.finalize(e,new s.SwitchCase(t,n))},t.prototype.parseSwitchStatement=function(){var t=this.createNode();this.expectKeyword("switch"),this.expect("(");var e=this.parseExpression();this.expect(")");var n=this.context.inSwitch;this.context.inSwitch=!0;var r=[],i=!1;for(this.expect("{");;){if(this.match("}"))break;var a=this.parseSwitchCase();null===a.test&&(i&&this.throwError(o.Messages.MultipleDefaultsInSwitch),i=!0),r.push(a)}return this.expect("}"),this.context.inSwitch=n,this.finalize(t,new s.SwitchStatement(e,r))},t.prototype.parseLabelledStatement=function(){var t,e=this.createNode(),n=this.parseExpression();if(n.type===u.Syntax.Identifier&&this.match(":")){this.nextToken();var r=n,i="$"+r.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,i)&&this.throwError(o.Messages.Redeclaration,"Label",r.name),this.context.labelSet[i]=!0;var a=void 0;if(this.matchKeyword("class"))this.tolerateUnexpectedToken(this.lookahead),a=this.parseClassDeclaration();else if(this.matchKeyword("function")){var c=this.lookahead,h=this.parseFunctionDeclaration();this.context.strict?this.tolerateUnexpectedToken(c,o.Messages.StrictFunction):h.generator&&this.tolerateUnexpectedToken(c,o.Messages.GeneratorInLegacyContext),a=h}else a=this.parseStatement();delete this.context.labelSet[i],t=new s.LabeledStatement(r,a)}else this.consumeSemicolon(),t=new s.ExpressionStatement(n);return this.finalize(e,t)},t.prototype.parseThrowStatement=function(){var t=this.createNode();this.expectKeyword("throw"),this.hasLineTerminator&&this.throwError(o.Messages.NewlineAfterThrow);var e=this.parseExpression();return this.consumeSemicolon(),this.finalize(t,new s.ThrowStatement(e))},t.prototype.parseCatchClause=function(){var t=this.createNode();this.expectKeyword("catch"),this.expect("("),this.match(")")&&this.throwUnexpectedToken(this.lookahead);for(var e=[],n=this.parsePattern(e),r={},i=0;i<e.length;i++){var a="$"+e[i].value;Object.prototype.hasOwnProperty.call(r,a)&&this.tolerateError(o.Messages.DuplicateBinding,e[i].value),r[a]=!0}this.context.strict&&n.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(n.name)&&this.tolerateError(o.Messages.StrictCatchVariable),this.expect(")");var c=this.parseBlock();return this.finalize(t,new s.CatchClause(n,c))},t.prototype.parseFinallyClause=function(){return this.expectKeyword("finally"),this.parseBlock()},t.prototype.parseTryStatement=function(){var t=this.createNode();this.expectKeyword("try");var e=this.parseBlock(),n=this.matchKeyword("catch")?this.parseCatchClause():null,r=this.matchKeyword("finally")?this.parseFinallyClause():null;return n||r||this.throwError(o.Messages.NoCatchOrFinally),this.finalize(t,new s.TryStatement(e,n,r))},t.prototype.parseDebuggerStatement=function(){var t=this.createNode();return this.expectKeyword("debugger"),this.consumeSemicolon(),this.finalize(t,new s.DebuggerStatement)},t.prototype.parseStatement=function(){var t;switch(this.lookahead.type){case 1:case 5:case 6:case 8:case 10:case 9:t=this.parseExpressionStatement();break;case 7:var e=this.lookahead.value;t="{"===e?this.parseBlock():"("===e?this.parseExpressionStatement():";"===e?this.parseEmptyStatement():this.parseExpressionStatement();break;case 3:t=this.matchAsyncFunction()?this.parseFunctionDeclaration():this.parseLabelledStatement();break;case 4:switch(this.lookahead.value){case"break":t=this.parseBreakStatement();break;case"continue":t=this.parseContinueStatement();break;case"debugger":t=this.parseDebuggerStatement();break;case"do":t=this.parseDoWhileStatement();break;case"for":t=this.parseForStatement();break;case"function":t=this.parseFunctionDeclaration();break;case"if":t=this.parseIfStatement();break;case"return":t=this.parseReturnStatement();break;case"switch":t=this.parseSwitchStatement();break;case"throw":t=this.parseThrowStatement();break;case"try":t=this.parseTryStatement();break;case"var":t=this.parseVariableStatement();break;case"while":t=this.parseWhileStatement();break;case"with":t=this.parseWithStatement();break;default:t=this.parseExpressionStatement()}break;default:t=this.throwUnexpectedToken(this.lookahead)}return t},t.prototype.parseFunctionSourceElements=function(){var t=this.createNode();this.expect("{");var e=this.parseDirectivePrologues(),n=this.context.labelSet,r=this.context.inIteration,i=this.context.inSwitch,o=this.context.inFunctionBody;for(this.context.labelSet={},this.context.inIteration=!1,this.context.inSwitch=!1,this.context.inFunctionBody=!0;2!==this.lookahead.type&&!this.match("}");)e.push(this.parseStatementListItem());return this.expect("}"),this.context.labelSet=n,this.context.inIteration=r,this.context.inSwitch=i,this.context.inFunctionBody=o,this.finalize(t,new s.BlockStatement(e))},t.prototype.validateParam=function(t,e,n){var r="$"+n;this.context.strict?(this.scanner.isRestrictedWord(n)&&(t.stricted=e,t.message=o.Messages.StrictParamName),Object.prototype.hasOwnProperty.call(t.paramSet,r)&&(t.stricted=e,t.message=o.Messages.StrictParamDupe)):t.firstRestricted||(this.scanner.isRestrictedWord(n)?(t.firstRestricted=e,t.message=o.Messages.StrictParamName):this.scanner.isStrictModeReservedWord(n)?(t.firstRestricted=e,t.message=o.Messages.StrictReservedWord):Object.prototype.hasOwnProperty.call(t.paramSet,r)&&(t.stricted=e,t.message=o.Messages.StrictParamDupe)),"function"==typeof Object.defineProperty?Object.defineProperty(t.paramSet,r,{value:!0,enumerable:!0,writable:!0,configurable:!0}):t.paramSet[r]=!0},t.prototype.parseRestElement=function(t){var e=this.createNode();this.expect("...");var n=this.parsePattern(t);return this.match("=")&&this.throwError(o.Messages.DefaultRestParameter),this.match(")")||this.throwError(o.Messages.ParameterAfterRestParameter),this.finalize(e,new s.RestElement(n))},t.prototype.parseFormalParameter=function(t){for(var e=[],n=this.match("...")?this.parseRestElement(e):this.parsePatternWithDefault(e),r=0;r<e.length;r++)this.validateParam(t,e[r],e[r].value);t.simple=t.simple&&n instanceof s.Identifier,t.params.push(n)},t.prototype.parseFormalParameters=function(t){var e;if(e={simple:!0,params:[],firstRestricted:t},this.expect("("),!this.match(")"))for(e.paramSet={};2!==this.lookahead.type&&(this.parseFormalParameter(e),!this.match(")"))&&(this.expect(","),!this.match(")")););return this.expect(")"),{simple:e.simple,params:e.params,stricted:e.stricted,firstRestricted:e.firstRestricted,message:e.message}},t.prototype.matchAsyncFunction=function(){var t=this.matchContextualKeyword("async");if(t){var e=this.scanner.saveState();this.scanner.scanComments();var n=this.scanner.lex();this.scanner.restoreState(e),t=e.lineNumber===n.lineNumber&&4===n.type&&"function"===n.value}return t},t.prototype.parseFunctionDeclaration=function(t){var e=this.createNode(),n=this.matchContextualKeyword("async");n&&this.nextToken(),this.expectKeyword("function");var r=!n&&this.match("*");r&&this.nextToken();var i,a=null,u=null;if(!t||!this.match("(")){var c=this.lookahead;a=this.parseVariableIdentifier(),this.context.strict?this.scanner.isRestrictedWord(c.value)&&this.tolerateUnexpectedToken(c,o.Messages.StrictFunctionName):this.scanner.isRestrictedWord(c.value)?(u=c,i=o.Messages.StrictFunctionName):this.scanner.isStrictModeReservedWord(c.value)&&(u=c,i=o.Messages.StrictReservedWord)}var h=this.context.await,l=this.context.allowYield;this.context.await=n,this.context.allowYield=!r;var p=this.parseFormalParameters(u),f=p.params,d=p.stricted;u=p.firstRestricted,p.message&&(i=p.message);var m=this.context.strict,y=this.context.allowStrictDirective;this.context.allowStrictDirective=p.simple;var v=this.parseFunctionSourceElements();return this.context.strict&&u&&this.throwUnexpectedToken(u,i),this.context.strict&&d&&this.tolerateUnexpectedToken(d,i),this.context.strict=m,this.context.allowStrictDirective=y,this.context.await=h,this.context.allowYield=l,n?this.finalize(e,new s.AsyncFunctionDeclaration(a,f,v)):this.finalize(e,new s.FunctionDeclaration(a,f,v,r))},t.prototype.parseFunctionExpression=function(){var t=this.createNode(),e=this.matchContextualKeyword("async");e&&this.nextToken(),this.expectKeyword("function");var n=!e&&this.match("*");n&&this.nextToken();var r,i,a=null,u=this.context.await,c=this.context.allowYield;if(this.context.await=e,this.context.allowYield=!n,!this.match("(")){var h=this.lookahead;a=this.context.strict||n||!this.matchKeyword("yield")?this.parseVariableIdentifier():this.parseIdentifierName(),this.context.strict?this.scanner.isRestrictedWord(h.value)&&this.tolerateUnexpectedToken(h,o.Messages.StrictFunctionName):this.scanner.isRestrictedWord(h.value)?(i=h,r=o.Messages.StrictFunctionName):this.scanner.isStrictModeReservedWord(h.value)&&(i=h,r=o.Messages.StrictReservedWord)}var l=this.parseFormalParameters(i),p=l.params,f=l.stricted;i=l.firstRestricted,l.message&&(r=l.message);var d=this.context.strict,m=this.context.allowStrictDirective;this.context.allowStrictDirective=l.simple;var y=this.parseFunctionSourceElements();return this.context.strict&&i&&this.throwUnexpectedToken(i,r),this.context.strict&&f&&this.tolerateUnexpectedToken(f,r),this.context.strict=d,this.context.allowStrictDirective=m,this.context.await=u,this.context.allowYield=c,e?this.finalize(t,new s.AsyncFunctionExpression(a,p,y)):this.finalize(t,new s.FunctionExpression(a,p,y,n))},t.prototype.parseDirective=function(){var t=this.lookahead,e=this.createNode(),n=this.parseExpression(),r=n.type===u.Syntax.Literal?this.getTokenRaw(t).slice(1,-1):null;return this.consumeSemicolon(),this.finalize(e,r?new s.Directive(n,r):new s.ExpressionStatement(n))},t.prototype.parseDirectivePrologues=function(){for(var t=null,e=[];;){var n=this.lookahead;if(8!==n.type)break;var r=this.parseDirective();e.push(r);var i=r.directive;if("string"!=typeof i)break;"use strict"===i?(this.context.strict=!0,t&&this.tolerateUnexpectedToken(t,o.Messages.StrictOctalLiteral),this.context.allowStrictDirective||this.tolerateUnexpectedToken(n,o.Messages.IllegalLanguageModeDirective)):!t&&n.octal&&(t=n)}return e},t.prototype.qualifiedPropertyName=function(t){switch(t.type){case 3:case 8:case 1:case 5:case 6:case 4:return!0;case 7:return"["===t.value}return!1},t.prototype.parseGetterMethod=function(){var t=this.createNode(),e=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters();n.params.length>0&&this.tolerateError(o.Messages.BadGetterArity);var r=this.parsePropertyMethod(n);return this.context.allowYield=e,this.finalize(t,new s.FunctionExpression(null,n.params,r,!1))},t.prototype.parseSetterMethod=function(){var t=this.createNode(),e=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters();1!==n.params.length?this.tolerateError(o.Messages.BadSetterArity):n.params[0]instanceof s.RestElement&&this.tolerateError(o.Messages.BadSetterRestParameter);var r=this.parsePropertyMethod(n);return this.context.allowYield=e,this.finalize(t,new s.FunctionExpression(null,n.params,r,!1))},t.prototype.parseGeneratorMethod=function(){var t=this.createNode(),e=this.context.allowYield;this.context.allowYield=!0;var n=this.parseFormalParameters();this.context.allowYield=!1;var r=this.parsePropertyMethod(n);return this.context.allowYield=e,this.finalize(t,new s.FunctionExpression(null,n.params,r,!0))},t.prototype.isStartOfExpression=function(){var t=!0,e=this.lookahead.value;switch(this.lookahead.type){case 7:t="["===e||"("===e||"{"===e||"+"===e||"-"===e||"!"===e||"~"===e||"++"===e||"--"===e||"/"===e||"/="===e;break;case 4:t="class"===e||"delete"===e||"function"===e||"let"===e||"new"===e||"super"===e||"this"===e||"typeof"===e||"void"===e||"yield"===e}return t},t.prototype.parseYieldExpression=function(){var t=this.createNode();this.expectKeyword("yield");var e=null,n=!1;if(!this.hasLineTerminator){var r=this.context.allowYield;this.context.allowYield=!1,n=this.match("*"),n?(this.nextToken(),e=this.parseAssignmentExpression()):this.isStartOfExpression()&&(e=this.parseAssignmentExpression()),this.context.allowYield=r}return this.finalize(t,new s.YieldExpression(e,n))},t.prototype.parseClassElement=function(t){var e=this.lookahead,n=this.createNode(),r="",i=null,a=null,u=!1,c=!1,h=!1,l=!1;if(this.match("*"))this.nextToken();else{u=this.match("["),i=this.parseObjectPropertyKey();if("static"===i.name&&(this.qualifiedPropertyName(this.lookahead)||this.match("*"))&&(e=this.lookahead,h=!0,u=this.match("["),this.match("*")?this.nextToken():i=this.parseObjectPropertyKey()),3===e.type&&!this.hasLineTerminator&&"async"===e.value){var p=this.lookahead.value;":"!==p&&"("!==p&&"*"!==p&&(l=!0,e=this.lookahead,i=this.parseObjectPropertyKey(),3===e.type&&("get"===e.value||"set"===e.value?this.tolerateUnexpectedToken(e):"constructor"===e.value&&this.tolerateUnexpectedToken(e,o.Messages.ConstructorIsAsync)))}}var f=this.qualifiedPropertyName(this.lookahead);return 3===e.type?"get"===e.value&&f?(r="get",u=this.match("["),i=this.parseObjectPropertyKey(),this.context.allowYield=!1,a=this.parseGetterMethod()):"set"===e.value&&f&&(r="set",u=this.match("["),i=this.parseObjectPropertyKey(),a=this.parseSetterMethod()):7===e.type&&"*"===e.value&&f&&(r="init",u=this.match("["),i=this.parseObjectPropertyKey(),a=this.parseGeneratorMethod(),c=!0),!r&&i&&this.match("(")&&(r="init",a=l?this.parsePropertyMethodAsyncFunction():this.parsePropertyMethodFunction(),c=!0),r||this.throwUnexpectedToken(this.lookahead),"init"===r&&(r="method"),u||(h&&this.isPropertyKey(i,"prototype")&&this.throwUnexpectedToken(e,o.Messages.StaticPrototype),!h&&this.isPropertyKey(i,"constructor")&&(("method"!==r||!c||a&&a.generator)&&this.throwUnexpectedToken(e,o.Messages.ConstructorSpecialMethod),t.value?this.throwUnexpectedToken(e,o.Messages.DuplicateConstructor):t.value=!0,r="constructor")),this.finalize(n,new s.MethodDefinition(i,u,a,r,h))},t.prototype.parseClassElementList=function(){var t=[],e={value:!1};for(this.expect("{");!this.match("}");)this.match(";")?this.nextToken():t.push(this.parseClassElement(e));return this.expect("}"),t},t.prototype.parseClassBody=function(){var t=this.createNode(),e=this.parseClassElementList();return this.finalize(t,new s.ClassBody(e))},t.prototype.parseClassDeclaration=function(t){var e=this.createNode(),n=this.context.strict;this.context.strict=!0,this.expectKeyword("class");var r=t&&3!==this.lookahead.type?null:this.parseVariableIdentifier(),i=null;this.matchKeyword("extends")&&(this.nextToken(),i=this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall));var o=this.parseClassBody();return this.context.strict=n,this.finalize(e,new s.ClassDeclaration(r,i,o))},t.prototype.parseClassExpression=function(){var t=this.createNode(),e=this.context.strict;this.context.strict=!0,this.expectKeyword("class");var n=3===this.lookahead.type?this.parseVariableIdentifier():null,r=null;this.matchKeyword("extends")&&(this.nextToken(),r=this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall));var i=this.parseClassBody();return this.context.strict=e,this.finalize(t,new s.ClassExpression(n,r,i))},t.prototype.parseModule=function(){this.context.strict=!0,this.context.isModule=!0;for(var t=this.createNode(),e=this.parseDirectivePrologues();2!==this.lookahead.type;)e.push(this.parseStatementListItem());return this.finalize(t,new s.Module(e))},t.prototype.parseScript=function(){for(var t=this.createNode(),e=this.parseDirectivePrologues();2!==this.lookahead.type;)e.push(this.parseStatementListItem());return this.finalize(t,new s.Script(e))},t.prototype.parseModuleSpecifier=function(){var t=this.createNode();8!==this.lookahead.type&&this.throwError(o.Messages.InvalidModuleSpecifier);var e=this.nextToken(),n=this.getTokenRaw(e);return this.finalize(t,new s.Literal(e.value,n))},t.prototype.parseImportSpecifier=function(){var t,e,n=this.createNode();return 3===this.lookahead.type?(t=this.parseVariableIdentifier(),e=t,this.matchContextualKeyword("as")&&(this.nextToken(),e=this.parseVariableIdentifier())):(t=this.parseIdentifierName(),e=t,this.matchContextualKeyword("as")?(this.nextToken(),e=this.parseVariableIdentifier()):this.throwUnexpectedToken(this.nextToken())),this.finalize(n,new s.ImportSpecifier(e,t))},t.prototype.parseNamedImports=function(){this.expect("{");for(var t=[];!this.match("}");)t.push(this.parseImportSpecifier()),this.match("}")||this.expect(",");return this.expect("}"),t},t.prototype.parseImportDefaultSpecifier=function(){var t=this.createNode(),e=this.parseIdentifierName();return this.finalize(t,new s.ImportDefaultSpecifier(e))},t.prototype.parseImportNamespaceSpecifier=function(){var t=this.createNode();this.expect("*"),this.matchContextualKeyword("as")||this.throwError(o.Messages.NoAsAfterImportNamespace),this.nextToken();var e=this.parseIdentifierName();return this.finalize(t,new s.ImportNamespaceSpecifier(e))},t.prototype.parseImportDeclaration=function(){this.context.inFunctionBody&&this.throwError(o.Messages.IllegalImportDeclaration);var t=this.createNode();this.expectKeyword("import");var e,n=[];if(8===this.lookahead.type)e=this.parseModuleSpecifier();else{if(this.match("{")?n=n.concat(this.parseNamedImports()):this.match("*")?n.push(this.parseImportNamespaceSpecifier()):this.isIdentifierName(this.lookahead)&&!this.matchKeyword("default")?(n.push(this.parseImportDefaultSpecifier()),this.match(",")&&(this.nextToken(),this.match("*")?n.push(this.parseImportNamespaceSpecifier()):this.match("{")?n=n.concat(this.parseNamedImports()):this.throwUnexpectedToken(this.lookahead))):this.throwUnexpectedToken(this.nextToken()),!this.matchContextualKeyword("from")){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}this.nextToken(),e=this.parseModuleSpecifier()}return this.consumeSemicolon(),this.finalize(t,new s.ImportDeclaration(n,e))},t.prototype.parseExportSpecifier=function(){var t=this.createNode(),e=this.parseIdentifierName(),n=e;return this.matchContextualKeyword("as")&&(this.nextToken(),n=this.parseIdentifierName()),this.finalize(t,new s.ExportSpecifier(e,n))},t.prototype.parseExportDeclaration=function(){this.context.inFunctionBody&&this.throwError(o.Messages.IllegalExportDeclaration);var t=this.createNode();this.expectKeyword("export");var e;if(this.matchKeyword("default"))if(this.nextToken(),this.matchKeyword("function")){var n=this.parseFunctionDeclaration(!0);e=this.finalize(t,new s.ExportDefaultDeclaration(n))}else if(this.matchKeyword("class")){var n=this.parseClassDeclaration(!0);e=this.finalize(t,new s.ExportDefaultDeclaration(n))}else if(this.matchContextualKeyword("async")){var n=this.matchAsyncFunction()?this.parseFunctionDeclaration(!0):this.parseAssignmentExpression();e=this.finalize(t,new s.ExportDefaultDeclaration(n))}else{this.matchContextualKeyword("from")&&this.throwError(o.Messages.UnexpectedToken,this.lookahead.value);var n=this.match("{")?this.parseObjectInitializer():this.match("[")?this.parseArrayInitializer():this.parseAssignmentExpression();this.consumeSemicolon(),e=this.finalize(t,new s.ExportDefaultDeclaration(n))}else if(this.match("*")){if(this.nextToken(),!this.matchContextualKeyword("from")){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}this.nextToken();var i=this.parseModuleSpecifier();this.consumeSemicolon(),e=this.finalize(t,new s.ExportAllDeclaration(i))}else if(4===this.lookahead.type){var n=void 0;switch(this.lookahead.value){case"let":case"const":n=this.parseLexicalDeclaration({inFor:!1});break;case"var":case"class":case"function":n=this.parseStatementListItem();break;default:this.throwUnexpectedToken(this.lookahead)}e=this.finalize(t,new s.ExportNamedDeclaration(n,[],null))}else if(this.matchAsyncFunction()){var n=this.parseFunctionDeclaration();e=this.finalize(t,new s.ExportNamedDeclaration(n,[],null))}else{var a=[],u=null,c=!1;for(this.expect("{");!this.match("}");)c=c||this.matchKeyword("default"),a.push(this.parseExportSpecifier()),this.match("}")||this.expect(",");if(this.expect("}"),this.matchContextualKeyword("from"))this.nextToken(),u=this.parseModuleSpecifier(),this.consumeSemicolon();else if(c){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}else this.consumeSemicolon();e=this.finalize(t,new s.ExportNamedDeclaration(null,a,u))}return e},t}();e.Parser=h},function(t,e){"use strict";function n(t,e){if(!t)throw new Error("ASSERT: "+e)}Object.defineProperty(e,"__esModule",{value:!0}),e.assert=n},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=function(){function t(){this.errors=[],this.tolerant=!1}return t.prototype.recordError=function(t){this.errors.push(t)},t.prototype.tolerate=function(t){if(!this.tolerant)throw t;this.recordError(t)},t.prototype.constructError=function(t,e){var n=new Error(t);try{throw n}catch(t){Object.create&&Object.defineProperty&&(n=Object.create(t),Object.defineProperty(n,"column",{value:e}))}return n},t.prototype.createError=function(t,e,n,r){var i="Line "+e+": "+r,o=this.constructError(i,n);return o.index=t,o.lineNumber=e,o.description=r,o},t.prototype.throwError=function(t,e,n,r){throw this.createError(t,e,n,r)},t.prototype.tolerateError=function(t,e,n,r){var i=this.createError(t,e,n,r);if(!this.tolerant)throw i;this.recordError(i)},t}();e.ErrorHandler=n},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.Messages={BadGetterArity:"Getter must not have any formal parameters",BadSetterArity:"Setter must have exactly one formal parameter",BadSetterRestParameter:"Setter function argument must not be a rest parameter",ConstructorIsAsync:"Class constructor may not be an async method",ConstructorSpecialMethod:"Class constructor may not be an accessor",DeclarationMissingInitializer:"Missing initializer in %0 declaration",DefaultRestParameter:"Unexpected token =",DuplicateBinding:"Duplicate binding %0",DuplicateConstructor:"A class may only have one constructor",DuplicateProtoProperty:"Duplicate __proto__ fields are not allowed in object literals",ForInOfLoopInitializer:"%0 loop variable declaration may not have an initializer",GeneratorInLegacyContext:"Generator declarations are not allowed in legacy contexts",IllegalBreak:"Illegal break statement",IllegalContinue:"Illegal continue statement",IllegalExportDeclaration:"Unexpected token",IllegalImportDeclaration:"Unexpected token",IllegalLanguageModeDirective:"Illegal 'use strict' directive in function with non-simple parameter list",IllegalReturn:"Illegal return statement",InvalidEscapedReservedWord:"Keyword must not contain escaped characters",InvalidHexEscapeSequence:"Invalid hexadecimal escape sequence",InvalidLHSInAssignment:"Invalid left-hand side in assignment",InvalidLHSInForIn:"Invalid left-hand side in for-in",InvalidLHSInForLoop:"Invalid left-hand side in for-loop",InvalidModuleSpecifier:"Unexpected token",InvalidRegExp:"Invalid regular expression",LetInLexicalBinding:"let is disallowed as a lexically bound name",MissingFromClause:"Unexpected token",MultipleDefaultsInSwitch:"More than one default clause in switch statement",NewlineAfterThrow:"Illegal newline after throw",NoAsAfterImportNamespace:"Unexpected token",NoCatchOrFinally:"Missing catch or finally after try",ParameterAfterRestParameter:"Rest parameter must be last formal parameter",Redeclaration:"%0 '%1' has already been declared",StaticPrototype:"Classes may not have static property named prototype",StrictCatchVariable:"Catch variable may not be eval or arguments in strict mode",StrictDelete:"Delete of an unqualified identifier in strict mode.",StrictFunction:"In strict mode code, functions can only be declared at top level or inside a block",StrictFunctionName:"Function name may not be eval or arguments in strict mode",StrictLHSAssignment:"Assignment to eval or arguments is not allowed in strict mode",StrictLHSPostfix:"Postfix increment/decrement may not have eval or arguments operand in strict mode",StrictLHSPrefix:"Prefix increment/decrement may not have eval or arguments operand in strict mode",StrictModeWith:"Strict mode code may not include a with statement",StrictOctalLiteral:"Octal literals are not allowed in strict mode.",StrictParamDupe:"Strict mode function may not have duplicate parameter names",StrictParamName:"Parameter name eval or arguments is not allowed in strict mode",StrictReservedWord:"Use of future reserved word in strict mode",StrictVarName:"Variable name may not be eval or arguments in strict mode",TemplateOctalLiteral:"Octal literals are not allowed in template strings.",UnexpectedEOS:"Unexpected end of input",UnexpectedIdentifier:"Unexpected identifier",UnexpectedNumber:"Unexpected number",UnexpectedReserved:"Unexpected reserved word",UnexpectedString:"Unexpected string",UnexpectedTemplate:"Unexpected quasi %0",UnexpectedToken:"Unexpected token %0",UnexpectedTokenIllegal:"Unexpected token ILLEGAL",UnknownLabel:"Undefined label '%0'",UnterminatedRegExp:"Invalid regular expression: missing /"}},function(t,e,n){"use strict";function r(t){return"0123456789abcdef".indexOf(t.toLowerCase())}function i(t){return"01234567".indexOf(t)}Object.defineProperty(e,"__esModule",{value:!0});var o=n(9),s=n(4),a=n(11),u=function(){function t(t,e){this.source=t,this.errorHandler=e,this.trackComment=!1,this.length=t.length,this.index=0,this.lineNumber=t.length>0?1:0,this.lineStart=0,this.curlyStack=[]}return t.prototype.saveState=function(){return{index:this.index,lineNumber:this.lineNumber,lineStart:this.lineStart}},t.prototype.restoreState=function(t){this.index=t.index,this.lineNumber=t.lineNumber,this.lineStart=t.lineStart},t.prototype.eof=function(){return this.index>=this.length},t.prototype.throwUnexpectedToken=function(t){return void 0===t&&(t=a.Messages.UnexpectedTokenIllegal),this.errorHandler.throwError(this.index,this.lineNumber,this.index-this.lineStart+1,t)},t.prototype.tolerateUnexpectedToken=function(t){void 0===t&&(t=a.Messages.UnexpectedTokenIllegal),this.errorHandler.tolerateError(this.index,this.lineNumber,this.index-this.lineStart+1,t)},t.prototype.skipSingleLineComment=function(t){var e,n,r=[];for(this.trackComment&&(r=[],e=this.index-t,n={start:{line:this.lineNumber,column:this.index-this.lineStart-t},end:{}});!this.eof();){var i=this.source.charCodeAt(this.index);if(++this.index,s.Character.isLineTerminator(i)){if(this.trackComment){n.end={line:this.lineNumber,column:this.index-this.lineStart-1};var o={multiLine:!1,slice:[e+t,this.index-1],range:[e,this.index-1],loc:n};r.push(o)}return 13===i&&10===this.source.charCodeAt(this.index)&&++this.index,++this.lineNumber,this.lineStart=this.index,r}}if(this.trackComment){n.end={line:this.lineNumber,column:this.index-this.lineStart};var o={multiLine:!1,slice:[e+t,this.index],range:[e,this.index],loc:n};r.push(o)}return r},t.prototype.skipMultiLineComment=function(){var t,e,n=[];for(this.trackComment&&(n=[],t=this.index-2,e={start:{line:this.lineNumber,column:this.index-this.lineStart-2},end:{}});!this.eof();){var r=this.source.charCodeAt(this.index);if(s.Character.isLineTerminator(r))13===r&&10===this.source.charCodeAt(this.index+1)&&++this.index,++this.lineNumber,++this.index,this.lineStart=this.index;else if(42===r){if(47===this.source.charCodeAt(this.index+1)){if(this.index+=2,this.trackComment){e.end={line:this.lineNumber,column:this.index-this.lineStart};var i={multiLine:!0,slice:[t+2,this.index-2],range:[t,this.index],loc:e};n.push(i)}return n}++this.index}else++this.index}if(this.trackComment){e.end={line:this.lineNumber,column:this.index-this.lineStart};var i={multiLine:!0,slice:[t+2,this.index],range:[t,this.index],loc:e};n.push(i)}return this.tolerateUnexpectedToken(),n},t.prototype.scanComments=function(){var t;this.trackComment&&(t=[]);for(var e=0===this.index;!this.eof();){var n=this.source.charCodeAt(this.index);if(s.Character.isWhiteSpace(n))++this.index;else if(s.Character.isLineTerminator(n))++this.index,13===n&&10===this.source.charCodeAt(this.index)&&++this.index,++this.lineNumber,this.lineStart=this.index,e=!0;else if(47===n)if(47===(n=this.source.charCodeAt(this.index+1))){this.index+=2;var r=this.skipSingleLineComment(2);this.trackComment&&(t=t.concat(r)),e=!0}else{if(42!==n)break;this.index+=2;var r=this.skipMultiLineComment();this.trackComment&&(t=t.concat(r))}else if(e&&45===n){if(45!==this.source.charCodeAt(this.index+1)||62!==this.source.charCodeAt(this.index+2))break;this.index+=3;var r=this.skipSingleLineComment(3);this.trackComment&&(t=t.concat(r))}else{if(60!==n)break;if("!--"!==this.source.slice(this.index+1,this.index+4))break;this.index+=4;var r=this.skipSingleLineComment(4);this.trackComment&&(t=t.concat(r))}}return t},t.prototype.isFutureReservedWord=function(t){switch(t){case"enum":case"export":case"import":case"super":return!0;default:return!1}},t.prototype.isStrictModeReservedWord=function(t){switch(t){case"implements":case"interface":case"package":case"private":case"protected":case"public":case"static":case"yield":case"let":return!0;default:return!1}},t.prototype.isRestrictedWord=function(t){return"eval"===t||"arguments"===t},t.prototype.isKeyword=function(t){switch(t.length){case 2:return"if"===t||"in"===t||"do"===t;case 3:return"var"===t||"for"===t||"new"===t||"try"===t||"let"===t;case 4:return"this"===t||"else"===t||"case"===t||"void"===t||"with"===t||"enum"===t;case 5:return"while"===t||"break"===t||"catch"===t||"throw"===t||"const"===t||"yield"===t||"class"===t||"super"===t;case 6:return"return"===t||"typeof"===t||"delete"===t||"switch"===t||"export"===t||"import"===t;case 7:return"default"===t||"finally"===t||"extends"===t;case 8:return"function"===t||"continue"===t||"debugger"===t;case 10:return"instanceof"===t;default:return!1}},t.prototype.codePointAt=function(t){var e=this.source.charCodeAt(t);if(e>=55296&&e<=56319){var n=this.source.charCodeAt(t+1);if(n>=56320&&n<=57343){e=1024*(e-55296)+n-56320+65536}}return e},t.prototype.scanHexEscape=function(t){for(var e="u"===t?4:2,n=0,i=0;i<e;++i){if(this.eof()||!s.Character.isHexDigit(this.source.charCodeAt(this.index)))return null;n=16*n+r(this.source[this.index++])}return String.fromCharCode(n)},t.prototype.scanUnicodeCodePointEscape=function(){var t=this.source[this.index],e=0;for("}"===t&&this.throwUnexpectedToken();!this.eof()&&(t=this.source[this.index++],s.Character.isHexDigit(t.charCodeAt(0)));)e=16*e+r(t);return(e>1114111||"}"!==t)&&this.throwUnexpectedToken(),s.Character.fromCodePoint(e)},t.prototype.getIdentifier=function(){for(var t=this.index++;!this.eof();){var e=this.source.charCodeAt(this.index);if(92===e)return this.index=t,this.getComplexIdentifier();if(e>=55296&&e<57343)return this.index=t,this.getComplexIdentifier();if(!s.Character.isIdentifierPart(e))break;++this.index}return this.source.slice(t,this.index)},t.prototype.getComplexIdentifier=function(){var t=this.codePointAt(this.index),e=s.Character.fromCodePoint(t);this.index+=e.length;var n;for(92===t&&(117!==this.source.charCodeAt(this.index)&&this.throwUnexpectedToken(),++this.index,"{"===this.source[this.index]?(++this.index,n=this.scanUnicodeCodePointEscape()):null!==(n=this.scanHexEscape("u"))&&"\\"!==n&&s.Character.isIdentifierStart(n.charCodeAt(0))||this.throwUnexpectedToken(),e=n);!this.eof()&&(t=this.codePointAt(this.index),s.Character.isIdentifierPart(t));)n=s.Character.fromCodePoint(t),e+=n,this.index+=n.length,92===t&&(e=e.substr(0,e.length-1),117!==this.source.charCodeAt(this.index)&&this.throwUnexpectedToken(),++this.index,"{"===this.source[this.index]?(++this.index,n=this.scanUnicodeCodePointEscape()):null!==(n=this.scanHexEscape("u"))&&"\\"!==n&&s.Character.isIdentifierPart(n.charCodeAt(0))||this.throwUnexpectedToken(),e+=n);return e},t.prototype.octalToDecimal=function(t){var e="0"!==t,n=i(t);return!this.eof()&&s.Character.isOctalDigit(this.source.charCodeAt(this.index))&&(e=!0,n=8*n+i(this.source[this.index++]),"0123".indexOf(t)>=0&&!this.eof()&&s.Character.isOctalDigit(this.source.charCodeAt(this.index))&&(n=8*n+i(this.source[this.index++]))),{code:n,octal:e}},t.prototype.scanIdentifier=function(){var t,e=this.index,n=92===this.source.charCodeAt(e)?this.getComplexIdentifier():this.getIdentifier();if(3!==(t=1===n.length?3:this.isKeyword(n)?4:"null"===n?5:"true"===n||"false"===n?1:3)&&e+n.length!==this.index){var r=this.index;this.index=e,this.tolerateUnexpectedToken(a.Messages.InvalidEscapedReservedWord),this.index=r}return{type:t,value:n,lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},t.prototype.scanPunctuator=function(){var t=this.index,e=this.source[this.index];switch(e){case"(":case"{":"{"===e&&this.curlyStack.push("{"),++this.index;break;case".":++this.index,"."===this.source[this.index]&&"."===this.source[this.index+1]&&(this.index+=2,e="...");break;case"}":++this.index,this.curlyStack.pop();break;case")":case";":case",":case"[":case"]":case":":case"?":case"~":++this.index;break;default:e=this.source.substr(this.index,4),">>>="===e?this.index+=4:(e=e.substr(0,3),"==="===e||"!=="===e||">>>"===e||"<<="===e||">>="===e||"**="===e?this.index+=3:(e=e.substr(0,2),"&&"===e||"||"===e||"=="===e||"!="===e||"+="===e||"-="===e||"*="===e||"/="===e||"++"===e||"--"===e||"<<"===e||">>"===e||"&="===e||"|="===e||"^="===e||"%="===e||"<="===e||">="===e||"=>"===e||"**"===e?this.index+=2:(e=this.source[this.index],"<>=!+-*%&|^/".indexOf(e)>=0&&++this.index)))}return this.index===t&&this.throwUnexpectedToken(),{type:7,value:e,lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanHexLiteral=function(t){for(var e="";!this.eof()&&s.Character.isHexDigit(this.source.charCodeAt(this.index));)e+=this.source[this.index++];return 0===e.length&&this.throwUnexpectedToken(),s.Character.isIdentifierStart(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(),{type:6,value:parseInt("0x"+e,16),lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanBinaryLiteral=function(t){for(var e,n="";!this.eof()&&("0"===(e=this.source[this.index])||"1"===e);)n+=this.source[this.index++];return 0===n.length&&this.throwUnexpectedToken(),this.eof()||(e=this.source.charCodeAt(this.index),(s.Character.isIdentifierStart(e)||s.Character.isDecimalDigit(e))&&this.throwUnexpectedToken()),{type:6,value:parseInt(n,2),lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanOctalLiteral=function(t,e){var n="",r=!1;for(s.Character.isOctalDigit(t.charCodeAt(0))?(r=!0,n="0"+this.source[this.index++]):++this.index;!this.eof()&&s.Character.isOctalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];return r||0!==n.length||this.throwUnexpectedToken(),(s.Character.isIdentifierStart(this.source.charCodeAt(this.index))||s.Character.isDecimalDigit(this.source.charCodeAt(this.index)))&&this.throwUnexpectedToken(),{type:6,value:parseInt(n,8),octal:r,lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},t.prototype.isImplicitOctalLiteral=function(){for(var t=this.index+1;t<this.length;++t){var e=this.source[t];if("8"===e||"9"===e)return!1;if(!s.Character.isOctalDigit(e.charCodeAt(0)))return!0}return!0},t.prototype.scanNumericLiteral=function(){var t=this.index,e=this.source[t];o.assert(s.Character.isDecimalDigit(e.charCodeAt(0))||"."===e,"Numeric literal must start with a decimal digit or a decimal point");var n="";if("."!==e){if(n=this.source[this.index++],e=this.source[this.index],"0"===n){if("x"===e||"X"===e)return++this.index,this.scanHexLiteral(t);if("b"===e||"B"===e)return++this.index,this.scanBinaryLiteral(t);if("o"===e||"O"===e)return this.scanOctalLiteral(e,t);if(e&&s.Character.isOctalDigit(e.charCodeAt(0))&&this.isImplicitOctalLiteral())return this.scanOctalLiteral(e,t)}for(;s.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];e=this.source[this.index]}if("."===e){for(n+=this.source[this.index++];s.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];e=this.source[this.index]}if("e"===e||"E"===e)if(n+=this.source[this.index++],e=this.source[this.index],"+"!==e&&"-"!==e||(n+=this.source[this.index++]),s.Character.isDecimalDigit(this.source.charCodeAt(this.index)))for(;s.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];else this.throwUnexpectedToken();return s.Character.isIdentifierStart(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(),{type:6,value:parseFloat(n),lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanStringLiteral=function(){var t=this.index,e=this.source[t];o.assert("'"===e||'"'===e,"String literal must starts with a quote"),++this.index;for(var n=!1,r="";!this.eof();){var i=this.source[this.index++];if(i===e){e="";break}if("\\"===i)if((i=this.source[this.index++])&&s.Character.isLineTerminator(i.charCodeAt(0)))++this.lineNumber,"\r"===i&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index;else switch(i){case"u":if("{"===this.source[this.index])++this.index,r+=this.scanUnicodeCodePointEscape();else{var u=this.scanHexEscape(i);null===u&&this.throwUnexpectedToken(),r+=u}break;case"x":var c=this.scanHexEscape(i);null===c&&this.throwUnexpectedToken(a.Messages.InvalidHexEscapeSequence),r+=c;break;case"n":r+="\n";break;case"r":r+="\r";break;case"t":r+="\t";break;case"b":r+="\b";break;case"f":r+="\f";break;case"v":r+="\v";break;case"8":case"9":r+=i,this.tolerateUnexpectedToken();break;default:if(i&&s.Character.isOctalDigit(i.charCodeAt(0))){var h=this.octalToDecimal(i);n=h.octal||n,r+=String.fromCharCode(h.code)}else r+=i}else{if(s.Character.isLineTerminator(i.charCodeAt(0)))break;r+=i}}return""!==e&&(this.index=t,this.throwUnexpectedToken()),{type:8,value:r,octal:n,lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanTemplate=function(){var t="",e=!1,n=this.index,r="`"===this.source[n],i=!1,o=2;for(++this.index;!this.eof();){var u=this.source[this.index++];if("`"===u){o=1,i=!0,e=!0;break}if("$"===u){if("{"===this.source[this.index]){this.curlyStack.push("${"),++this.index,e=!0;break}t+=u}else if("\\"===u)if(u=this.source[this.index++],s.Character.isLineTerminator(u.charCodeAt(0)))++this.lineNumber,"\r"===u&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index;else switch(u){case"n":t+="\n";break;case"r":t+="\r";break;case"t":t+="\t";break;case"u":if("{"===this.source[this.index])++this.index,t+=this.scanUnicodeCodePointEscape();else{var c=this.index,h=this.scanHexEscape(u);null!==h?t+=h:(this.index=c,t+=u)}break;case"x":var l=this.scanHexEscape(u);null===l&&this.throwUnexpectedToken(a.Messages.InvalidHexEscapeSequence),t+=l;break;case"b":t+="\b";break;case"f":t+="\f";break;case"v":t+="\v";break;default:"0"===u?(s.Character.isDecimalDigit(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(a.Messages.TemplateOctalLiteral),t+="\0"):s.Character.isOctalDigit(u.charCodeAt(0))?this.throwUnexpectedToken(a.Messages.TemplateOctalLiteral):t+=u}else s.Character.isLineTerminator(u.charCodeAt(0))?(++this.lineNumber,"\r"===u&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index,t+="\n"):t+=u}return e||this.throwUnexpectedToken(),r||this.curlyStack.pop(),{type:10,value:this.source.slice(n+1,this.index-o),cooked:t,head:r,tail:i,lineNumber:this.lineNumber,lineStart:this.lineStart,start:n,end:this.index}},t.prototype.testRegExp=function(t,e){var n=t,r=this;e.indexOf("u")>=0&&(n=n.replace(/\\u\{([0-9a-fA-F]+)\}|\\u([a-fA-F0-9]{4})/g,function(t,e,n){var i=parseInt(e||n,16);return i>1114111&&r.throwUnexpectedToken(a.Messages.InvalidRegExp),i<=65535?String.fromCharCode(i):"￿"}).replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,"￿"));try{RegExp(n)}catch(t){this.throwUnexpectedToken(a.Messages.InvalidRegExp)}try{return new RegExp(t,e)}catch(t){return null}},t.prototype.scanRegExpBody=function(){var t=this.source[this.index];o.assert("/"===t,"Regular expression literal must start with a slash");for(var e=this.source[this.index++],n=!1,r=!1;!this.eof();)if(t=this.source[this.index++],e+=t,"\\"===t)t=this.source[this.index++],s.Character.isLineTerminator(t.charCodeAt(0))&&this.throwUnexpectedToken(a.Messages.UnterminatedRegExp),e+=t;else if(s.Character.isLineTerminator(t.charCodeAt(0)))this.throwUnexpectedToken(a.Messages.UnterminatedRegExp);else if(n)"]"===t&&(n=!1);else{if("/"===t){r=!0;break}"["===t&&(n=!0)}return r||this.throwUnexpectedToken(a.Messages.UnterminatedRegExp),e.substr(1,e.length-2)},t.prototype.scanRegExpFlags=function(){for(var t="",e="";!this.eof();){var n=this.source[this.index];if(!s.Character.isIdentifierPart(n.charCodeAt(0)))break;if(++this.index,"\\"!==n||this.eof())e+=n,t+=n;else if("u"===(n=this.source[this.index])){++this.index;var r=this.index,i=this.scanHexEscape("u");if(null!==i)for(e+=i,t+="\\u";r<this.index;++r)t+=this.source[r];else this.index=r,e+="u",t+="\\u";this.tolerateUnexpectedToken()}else t+="\\",this.tolerateUnexpectedToken()}return e},t.prototype.scanRegExp=function(){var t=this.index,e=this.scanRegExpBody(),n=this.scanRegExpFlags();return{type:9,value:"",pattern:e,flags:n,regex:this.testRegExp(e,n),lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.lex=function(){if(this.eof())return{type:2,value:"",lineNumber:this.lineNumber,lineStart:this.lineStart,start:this.index,end:this.index};var t=this.source.charCodeAt(this.index);return s.Character.isIdentifierStart(t)?this.scanIdentifier():40===t||41===t||59===t?this.scanPunctuator():39===t||34===t?this.scanStringLiteral():46===t?s.Character.isDecimalDigit(this.source.charCodeAt(this.index+1))?this.scanNumericLiteral():this.scanPunctuator():s.Character.isDecimalDigit(t)?this.scanNumericLiteral():96===t||125===t&&"${"===this.curlyStack[this.curlyStack.length-1]?this.scanTemplate():t>=55296&&t<57343&&s.Character.isIdentifierStart(this.codePointAt(this.index))?this.scanIdentifier():this.scanPunctuator()},t}();e.Scanner=u},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.TokenName={},e.TokenName[1]="Boolean",e.TokenName[2]="<end>",e.TokenName[3]="Identifier",e.TokenName[4]="Keyword",e.TokenName[5]="Null",e.TokenName[6]="Numeric",e.TokenName[7]="Punctuator",e.TokenName[8]="String",e.TokenName[9]="RegularExpression",e.TokenName[10]="Template"},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.XHTMLEntities={quot:'"',amp:"&",apos:"'",gt:">",nbsp:" ",iexcl:"¡",cent:"¢",pound:"£",curren:"¤",yen:"¥",brvbar:"¦",sect:"§",uml:"¨",copy:"©",ordf:"ª",laquo:"«",not:"¬",shy:"­",reg:"®",macr:"¯",deg:"°",plusmn:"±",sup2:"²",sup3:"³",acute:"´",micro:"µ",para:"¶",middot:"·",cedil:"¸",sup1:"¹",ordm:"º",raquo:"»",frac14:"¼",frac12:"½",frac34:"¾",iquest:"¿",Agrave:"À",Aacute:"Á",Acirc:"Â",Atilde:"Ã",Auml:"Ä",Aring:"Å",AElig:"Æ",Ccedil:"Ç",Egrave:"È",Eacute:"É",Ecirc:"Ê",Euml:"Ë",Igrave:"Ì",Iacute:"Í",Icirc:"Î",Iuml:"Ï",ETH:"Ð",Ntilde:"Ñ",Ograve:"Ò",Oacute:"Ó",Ocirc:"Ô",Otilde:"Õ",Ouml:"Ö",times:"×",Oslash:"Ø",Ugrave:"Ù",Uacute:"Ú",Ucirc:"Û",Uuml:"Ü",Yacute:"Ý",THORN:"Þ",szlig:"ß",agrave:"à",aacute:"á",acirc:"â",atilde:"ã",auml:"ä",aring:"å",aelig:"æ",ccedil:"ç",egrave:"è",eacute:"é",ecirc:"ê",euml:"ë",igrave:"ì",iacute:"í",icirc:"î",iuml:"ï",eth:"ð",ntilde:"ñ",ograve:"ò",oacute:"ó",ocirc:"ô",otilde:"õ",ouml:"ö",divide:"÷",oslash:"ø",ugrave:"ù",uacute:"ú",ucirc:"û",uuml:"ü",yacute:"ý",thorn:"þ",yuml:"ÿ",OElig:"Œ",oelig:"œ",Scaron:"Š",scaron:"š",Yuml:"Ÿ",fnof:"ƒ",circ:"ˆ",tilde:"˜",Alpha:"Α",Beta:"Β",Gamma:"Γ",Delta:"Δ",Epsilon:"Ε",Zeta:"Ζ",Eta:"Η",Theta:"Θ",Iota:"Ι",Kappa:"Κ",Lambda:"Λ",Mu:"Μ",Nu:"Ν",Xi:"Ξ",Omicron:"Ο",Pi:"Π",Rho:"Ρ",Sigma:"Σ",Tau:"Τ",Upsilon:"Υ",Phi:"Φ",Chi:"Χ",Psi:"Ψ",Omega:"Ω",alpha:"α",beta:"β",gamma:"γ",delta:"δ",epsilon:"ε",zeta:"ζ",eta:"η",theta:"θ",iota:"ι",kappa:"κ",lambda:"λ",mu:"μ",nu:"ν",xi:"ξ",omicron:"ο",pi:"π",rho:"ρ",sigmaf:"ς",sigma:"σ",tau:"τ",upsilon:"υ",phi:"φ",chi:"χ",psi:"ψ",omega:"ω",thetasym:"ϑ",upsih:"ϒ",piv:"ϖ",ensp:" ",emsp:" ",thinsp:" ",zwnj:"‌",zwj:"‍",lrm:"‎",rlm:"‏",ndash:"–",mdash:"—",lsquo:"‘",rsquo:"’",sbquo:"‚",ldquo:"“",rdquo:"”",bdquo:"„",dagger:"†",Dagger:"‡",bull:"•",hellip:"…",permil:"‰",prime:"′",Prime:"″",lsaquo:"‹",rsaquo:"›",oline:"‾",frasl:"⁄",euro:"€",image:"ℑ",weierp:"℘",real:"ℜ",trade:"™",alefsym:"ℵ",larr:"←",uarr:"↑",rarr:"→",darr:"↓",harr:"↔",crarr:"↵",lArr:"⇐",uArr:"⇑",rArr:"⇒",dArr:"⇓",hArr:"⇔",forall:"∀",part:"∂",exist:"∃",empty:"∅",nabla:"∇",isin:"∈",notin:"∉",ni:"∋",prod:"∏",sum:"∑",minus:"−",lowast:"∗",radic:"√",prop:"∝",infin:"∞",ang:"∠",and:"∧",or:"∨",cap:"∩",cup:"∪",int:"∫",there4:"∴",sim:"∼",cong:"≅",asymp:"≈",ne:"≠",equiv:"≡",le:"≤",ge:"≥",sub:"⊂",sup:"⊃",nsub:"⊄",sube:"⊆",supe:"⊇",oplus:"⊕",otimes:"⊗",perp:"⊥",sdot:"⋅",lceil:"⌈",rceil:"⌉",lfloor:"⌊",rfloor:"⌋",loz:"◊",spades:"♠",clubs:"♣",hearts:"♥",diams:"♦",lang:"⟨",rang:"⟩"}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(10),i=n(12),o=n(13),s=function(){function t(){this.values=[],this.curly=this.paren=-1}return t.prototype.beforeFunctionExpression=function(t){return["(","{","[","in","typeof","instanceof","new","return","case","delete","throw","void","=","+=","-=","*=","**=","/=","%=","<<=",">>=",">>>=","&=","|=","^=",",","+","-","*","**","/","%","++","--","<<",">>",">>>","&","|","^","!","~","&&","||","?",":","===","==",">=","<=","<",">","!=","!=="].indexOf(t)>=0},t.prototype.isRegexStart=function(){var t=this.values[this.values.length-1],e=null!==t;switch(t){case"this":case"]":e=!1;break;case")":var n=this.values[this.paren-1];e="if"===n||"while"===n||"for"===n||"with"===n;break;case"}":if(e=!1,"function"===this.values[this.curly-3]){var r=this.values[this.curly-4];e=!!r&&!this.beforeFunctionExpression(r)}else if("function"===this.values[this.curly-4]){var r=this.values[this.curly-5];e=!r||!this.beforeFunctionExpression(r)}}return e},t.prototype.push=function(t){7===t.type||4===t.type?("{"===t.value?this.curly=this.values.length:"("===t.value&&(this.paren=this.values.length),this.values.push(t.value)):this.values.push(null)},t}(),a=function(){function t(t,e){this.errorHandler=new r.ErrorHandler,this.errorHandler.tolerant=!!e&&("boolean"==typeof e.tolerant&&e.tolerant),this.scanner=new i.Scanner(t,this.errorHandler),this.scanner.trackComment=!!e&&("boolean"==typeof e.comment&&e.comment),this.trackRange=!!e&&("boolean"==typeof e.range&&e.range),this.trackLoc=!!e&&("boolean"==typeof e.loc&&e.loc),this.buffer=[],this.reader=new s}return t.prototype.errors=function(){return this.errorHandler.errors},t.prototype.getNextToken=function(){if(0===this.buffer.length){var t=this.scanner.scanComments();if(this.scanner.trackComment)for(var e=0;e<t.length;++e){var n=t[e],r=this.scanner.source.slice(n.slice[0],n.slice[1]),i={type:n.multiLine?"BlockComment":"LineComment",value:r};this.trackRange&&(i.range=n.range),this.trackLoc&&(i.loc=n.loc),this.buffer.push(i)}if(!this.scanner.eof()){var s=void 0;this.trackLoc&&(s={start:{line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart},end:{}});var a="/"===this.scanner.source[this.scanner.index]&&this.reader.isRegexStart(),u=a?this.scanner.scanRegExp():this.scanner.lex();this.reader.push(u);var c={type:o.TokenName[u.type],value:this.scanner.source.slice(u.start,u.end)};if(this.trackRange&&(c.range=[u.start,u.end]),this.trackLoc&&(s.end={line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart},c.loc=s),9===u.type){var h=u.pattern,l=u.flags;c.regex={pattern:h,flags:l}}this.buffer.push(c)}}return this.buffer.shift()},t}();e.Tokenizer=a}])})},function(t,e){e.read=function(t,e,n,r,i){var o,s,a=8*i-r-1,u=(1<<a)-1,c=u>>1,h=-7,l=n?i-1:0,p=n?-1:1,f=t[e+l];for(l+=p,o=f&(1<<-h)-1,f>>=-h,h+=a;h>0;o=256*o+t[e+l],l+=p,h-=8);for(s=o&(1<<-h)-1,o>>=-h,h+=r;h>0;s=256*s+t[e+l],l+=p,h-=8);if(0===o)o=1-c;else{if(o===u)return s?NaN:1/0*(f?-1:1);s+=Math.pow(2,r),o-=c}return(f?-1:1)*s*Math.pow(2,o-r)},e.write=function(t,e,n,r,i,o){var s,a,u,c=8*o-i-1,h=(1<<c)-1,l=h>>1,p=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,f=r?0:o-1,d=r?1:-1,m=e<0||0===e&&1/e<0?1:0;for(e=Math.abs(e),isNaN(e)||e===1/0?(a=isNaN(e)?1:0,s=h):(s=Math.floor(Math.log(e)/Math.LN2),e*(u=Math.pow(2,-s))<1&&(s--,u*=2),e+=s+l>=1?p/u:p*Math.pow(2,1-l),e*u>=2&&(s++,u/=2),s+l>=h?(a=0,s=h):s+l>=1?(a=(e*u-1)*Math.pow(2,i),s+=l):(a=e*Math.pow(2,l-1)*Math.pow(2,i),s=0));i>=8;t[n+f]=255&a,f+=d,a/=256,i-=8);for(s=s<<i|a,c+=i;c>0;t[n+f]=255&s,f+=d,s/=256,c-=8);t[n+f-d]|=128*m}},function(t,e,n){!function(e,n){t.exports=n()}(0,function(){"use strict";function t(t,e){e&&(t.prototype=Object.create(e.prototype)),t.prototype.constructor=t}function e(t){return o(t)?t:k(t)}function n(t){return s(t)?t:I(t)}function r(t){return a(t)?t:T(t)}function i(t){return o(t)&&!u(t)?t:B(t)}function o(t){return!(!t||!t[cn])}function s(t){return!(!t||!t[hn])}function a(t){return!(!t||!t[ln])}function u(t){return s(t)||a(t)}function c(t){return!(!t||!t[pn])}function h(t){return t.value=!1,t}function l(t){t&&(t.value=!0)}function p(){}function f(t,e){e=e||0;for(var n=Math.max(0,t.length-e),r=new Array(n),i=0;i<n;i++)r[i]=t[i+e];return r}function d(t){return void 0===t.size&&(t.size=t.__iterate(y)),t.size}function m(t,e){if("number"!=typeof e){var n=e>>>0;if(""+n!==e||4294967295===n)return NaN;e=n}return e<0?d(t)+e:e}function y(){return!0}function v(t,e,n){return(0===t||void 0!==n&&t<=-n)&&(void 0===e||void 0!==n&&e>=n)}function x(t,e){return D(t,e,0)}function g(t,e){return D(t,e,e)}function D(t,e,n){return void 0===t?n:t<0?Math.max(0,e+t):void 0===e?t:Math.min(e,t)}function E(t){this.next=t}function A(t,e,n,r){var i=0===t?e:1===t?n:[e,n];return r?r.value=i:r={value:i,done:!1},r}function S(){return{value:void 0,done:!0}}function w(t){return!!b(t)}function C(t){return t&&"function"==typeof t.next}function _(t){var e=b(t);return e&&e.call(t)}function b(t){var e=t&&(An&&t[An]||t[Sn]);if("function"==typeof e)return e}function F(t){return t&&"number"==typeof t.length}function k(t){return null===t||void 0===t?U():o(t)?t.toSeq():z(t)}function I(t){return null===t||void 0===t?U().toKeyedSeq():o(t)?s(t)?t.toSeq():t.fromEntrySeq():j(t)}function T(t){return null===t||void 0===t?U():o(t)?s(t)?t.entrySeq():t.toIndexedSeq():L(t)}function B(t){return(null===t||void 0===t?U():o(t)?s(t)?t.entrySeq():t:L(t)).toSetSeq()}function M(t){this._array=t,this.size=t.length}function P(t){var e=Object.keys(t);this._object=t,this._keys=e,this.size=e.length}function N(t){this._iterable=t,this.size=t.length||t.size}function O(t){this._iterator=t,this._iteratorCache=[]}function R(t){return!(!t||!t[Cn])}function U(){return _n||(_n=new M([]))}function j(t){var e=Array.isArray(t)?new M(t).fromEntrySeq():C(t)?new O(t).fromEntrySeq():w(t)?new N(t).fromEntrySeq():"object"==typeof t?new P(t):void 0;if(!e)throw new TypeError("Expected Array or iterable object of [k, v] entries, or keyed object: "+t);return e}function L(t){var e=J(t);if(!e)throw new TypeError("Expected Array or iterable object of values: "+t);return e}function z(t){var e=J(t)||"object"==typeof t&&new P(t);if(!e)throw new TypeError("Expected Array or iterable object of values, or keyed object: "+t);return e}function J(t){return F(t)?new M(t):C(t)?new O(t):w(t)?new N(t):void 0}function X(t,e,n,r){var i=t._cache;if(i){for(var o=i.length-1,s=0;s<=o;s++){var a=i[n?o-s:s];if(!1===e(a[1],r?a[0]:s,t))return s+1}return s}return t.__iterateUncached(e,n)}function q(t,e,n,r){var i=t._cache;if(i){var o=i.length-1,s=0;return new E(function(){var t=i[n?o-s:s];return s++>o?S():A(e,r?t[0]:s-1,t[1])})}return t.__iteratorUncached(e,n)}function K(t,e){return e?Y(e,t,"",{"":t}):W(t)}function Y(t,e,n,r){return Array.isArray(e)?t.call(r,n,T(e).map(function(n,r){return Y(t,n,r,e)})):G(e)?t.call(r,n,I(e).map(function(n,r){return Y(t,n,r,e)})):e}function W(t){return Array.isArray(t)?T(t).map(W).toList():G(t)?I(t).map(W).toMap():t}function G(t){return t&&(t.constructor===Object||void 0===t.constructor)}function H(t,e){if(t===e||t!==t&&e!==e)return!0;if(!t||!e)return!1;if("function"==typeof t.valueOf&&"function"==typeof e.valueOf){if(t=t.valueOf(),e=e.valueOf(),t===e||t!==t&&e!==e)return!0;if(!t||!e)return!1}return!("function"!=typeof t.equals||"function"!=typeof e.equals||!t.equals(e))}function V(t,e){if(t===e)return!0;if(!o(e)||void 0!==t.size&&void 0!==e.size&&t.size!==e.size||void 0!==t.__hash&&void 0!==e.__hash&&t.__hash!==e.__hash||s(t)!==s(e)||a(t)!==a(e)||c(t)!==c(e))return!1;if(0===t.size&&0===e.size)return!0;var n=!u(t);if(c(t)){var r=t.entries();return e.every(function(t,e){var i=r.next().value;return i&&H(i[1],t)&&(n||H(i[0],e))})&&r.next().done}var i=!1;if(void 0===t.size)if(void 0===e.size)"function"==typeof t.cacheResult&&t.cacheResult();else{i=!0;var h=t;t=e,e=h}var l=!0,p=e.__iterate(function(e,r){if(n?!t.has(e):i?!H(e,t.get(r,yn)):!H(t.get(r,yn),e))return l=!1,!1});return l&&t.size===p}function $(t,e){if(!(this instanceof $))return new $(t,e);if(this._value=t,this.size=void 0===e?1/0:Math.max(0,e),0===this.size){if(bn)return bn;bn=this}}function Z(t,e){if(!t)throw new Error(e)}function Q(t,e,n){if(!(this instanceof Q))return new Q(t,e,n);if(Z(0!==n,"Cannot step a Range by 0"),t=t||0,void 0===e&&(e=1/0),n=void 0===n?1:Math.abs(n),e<t&&(n=-n),this._start=t,this._end=e,this._step=n,this.size=Math.max(0,Math.ceil((e-t)/n-1)+1),0===this.size){if(Fn)return Fn;Fn=this}}function tt(){throw TypeError("Abstract")}function et(){}function nt(){}function rt(){}function it(t){return t>>>1&1073741824|3221225471&t}function ot(t){if(!1===t||null===t||void 0===t)return 0;if("function"==typeof t.valueOf&&(!1===(t=t.valueOf())||null===t||void 0===t))return 0;if(!0===t)return 1;var e=typeof t;if("number"===e){if(t!==t||t===1/0)return 0;var n=0|t;for(n!==t&&(n^=4294967295*t);t>4294967295;)t/=4294967295,n^=t;return it(n)}if("string"===e)return t.length>On?st(t):at(t);if("function"==typeof t.hashCode)return t.hashCode();if("object"===e)return ut(t);if("function"==typeof t.toString)return at(t.toString());throw new Error("Value type "+e+" cannot be hashed.")}function st(t){var e=jn[t];return void 0===e&&(e=at(t),Un===Rn&&(Un=0,jn={}),Un++,jn[t]=e),e}function at(t){for(var e=0,n=0;n<t.length;n++)e=31*e+t.charCodeAt(n)|0;return it(e)}function ut(t){var e;if(Mn&&void 0!==(e=kn.get(t)))return e;if(void 0!==(e=t[Nn]))return e;if(!Bn){if(void 0!==(e=t.propertyIsEnumerable&&t.propertyIsEnumerable[Nn]))return e;if(void 0!==(e=ct(t)))return e}if(e=++Pn,1073741824&Pn&&(Pn=0),Mn)kn.set(t,e);else{if(void 0!==Tn&&!1===Tn(t))throw new Error("Non-extensible objects are not allowed as keys.");if(Bn)Object.defineProperty(t,Nn,{enumerable:!1,configurable:!1,writable:!1,value:e});else if(void 0!==t.propertyIsEnumerable&&t.propertyIsEnumerable===t.constructor.prototype.propertyIsEnumerable)t.propertyIsEnumerable=function(){return this.constructor.prototype.propertyIsEnumerable.apply(this,arguments)},t.propertyIsEnumerable[Nn]=e;else{if(void 0===t.nodeType)throw new Error("Unable to set a non-enumerable property on object.");t[Nn]=e}}return e}function ct(t){if(t&&t.nodeType>0)switch(t.nodeType){case 1:return t.uniqueID;case 9:return t.documentElement&&t.documentElement.uniqueID}}function ht(t){Z(t!==1/0,"Cannot perform this action with an infinite size.")}function lt(t){return null===t||void 0===t?At():pt(t)&&!c(t)?t:At().withMutations(function(e){var r=n(t);ht(r.size),r.forEach(function(t,n){return e.set(n,t)})})}function pt(t){return!(!t||!t[Ln])}function ft(t,e){this.ownerID=t,this.entries=e}function dt(t,e,n){this.ownerID=t,this.bitmap=e,this.nodes=n}function mt(t,e,n){this.ownerID=t,this.count=e,this.nodes=n}function yt(t,e,n){this.ownerID=t,this.keyHash=e,this.entries=n}function vt(t,e,n){this.ownerID=t,this.keyHash=e,this.entry=n}function xt(t,e,n){this._type=e,this._reverse=n,this._stack=t._root&&Dt(t._root)}function gt(t,e){return A(t,e[0],e[1])}function Dt(t,e){return{node:t,index:0,__prev:e}}function Et(t,e,n,r){var i=Object.create(zn);return i.size=t,i._root=e,i.__ownerID=n,i.__hash=r,i.__altered=!1,i}function At(){return Jn||(Jn=Et(0))}function St(t,e,n){var r,i;if(t._root){var o=h(vn),s=h(xn);if(r=wt(t._root,t.__ownerID,0,void 0,e,n,o,s),!s.value)return t;i=t.size+(o.value?n===yn?-1:1:0)}else{if(n===yn)return t;i=1,r=new ft(t.__ownerID,[[e,n]])}return t.__ownerID?(t.size=i,t._root=r,t.__hash=void 0,t.__altered=!0,t):r?Et(i,r):At()}function wt(t,e,n,r,i,o,s,a){return t?t.update(e,n,r,i,o,s,a):o===yn?t:(l(a),l(s),new vt(e,r,[i,o]))}function Ct(t){return t.constructor===vt||t.constructor===yt}function _t(t,e,n,r,i){if(t.keyHash===r)return new yt(e,r,[t.entry,i]);var o,s=(0===n?t.keyHash:t.keyHash>>>n)&mn,a=(0===n?r:r>>>n)&mn;return new dt(e,1<<s|1<<a,s===a?[_t(t,e,n+fn,r,i)]:(o=new vt(e,r,i),s<a?[t,o]:[o,t]))}function bt(t,e,n,r){t||(t=new p);for(var i=new vt(t,ot(n),[n,r]),o=0;o<e.length;o++){var s=e[o];i=i.update(t,0,void 0,s[0],s[1])}return i}function Ft(t,e,n,r){for(var i=0,o=0,s=new Array(n),a=0,u=1,c=e.length;a<c;a++,u<<=1){var h=e[a];void 0!==h&&a!==r&&(i|=u,s[o++]=h)}return new dt(t,i,s)}function kt(t,e,n,r,i){for(var o=0,s=new Array(dn),a=0;0!==n;a++,n>>>=1)s[a]=1&n?e[o++]:void 0;return s[r]=i,new mt(t,o+1,s)}function It(t,e,r){for(var i=[],s=0;s<r.length;s++){var a=r[s],u=n(a);o(a)||(u=u.map(function(t){return K(t)})),i.push(u)}return Mt(t,e,i)}function Tt(t,e,n){return t&&t.mergeDeep&&o(e)?t.mergeDeep(e):H(t,e)?t:e}function Bt(t){return function(e,n,r){if(e&&e.mergeDeepWith&&o(n))return e.mergeDeepWith(t,n);var i=t(e,n,r);return H(e,i)?e:i}}function Mt(t,e,n){return n=n.filter(function(t){return 0!==t.size}),0===n.length?t:0!==t.size||t.__ownerID||1!==n.length?t.withMutations(function(t){for(var r=e?function(n,r){t.update(r,yn,function(t){return t===yn?n:e(t,n,r)})}:function(e,n){t.set(n,e)},i=0;i<n.length;i++)n[i].forEach(r)}):t.constructor(n[0])}function Pt(t,e,n,r){var i=t===yn,o=e.next();if(o.done){var s=i?n:t,a=r(s);return a===s?t:a}Z(i||t&&t.set,"invalid keyPath");var u=o.value,c=i?yn:t.get(u,yn),h=Pt(c,e,n,r);return h===c?t:h===yn?t.remove(u):(i?At():t).set(u,h)}function Nt(t){return t-=t>>1&1431655765,t=(858993459&t)+(t>>2&858993459),t=t+(t>>4)&252645135,t+=t>>8,127&(t+=t>>16)}function Ot(t,e,n,r){var i=r?t:f(t);return i[e]=n,i}function Rt(t,e,n,r){var i=t.length+1;if(r&&e+1===i)return t[e]=n,t;for(var o=new Array(i),s=0,a=0;a<i;a++)a===e?(o[a]=n,s=-1):o[a]=t[a+s];return o}function Ut(t,e,n){var r=t.length-1;if(n&&e===r)return t.pop(),t;for(var i=new Array(r),o=0,s=0;s<r;s++)s===e&&(o=1),i[s]=t[s+o];return i}function jt(t){var e=qt();if(null===t||void 0===t)return e;if(Lt(t))return t;var n=r(t),i=n.size;return 0===i?e:(ht(i),i>0&&i<dn?Xt(0,i,fn,null,new zt(n.toArray())):e.withMutations(function(t){t.setSize(i),n.forEach(function(e,n){return t.set(n,e)})}))}function Lt(t){return!(!t||!t[Yn])}function zt(t,e){this.array=t,this.ownerID=e}function Jt(t,e){function n(t,e,n){return 0===e?r(t,n):i(t,e,n)}function r(t,n){var r=n===a?u&&u.array:t&&t.array,i=n>o?0:o-n,c=s-n;return c>dn&&(c=dn),function(){if(i===c)return Hn;var t=e?--c:i++;return r&&r[t]}}function i(t,r,i){var a,u=t&&t.array,c=i>o?0:o-i>>r,h=1+(s-i>>r);return h>dn&&(h=dn),function(){for(;;){if(a){var t=a();if(t!==Hn)return t;a=null}if(c===h)return Hn;var o=e?--h:c++;a=n(u&&u[o],r-fn,i+(o<<r))}}}var o=t._origin,s=t._capacity,a=$t(s),u=t._tail;return n(t._root,t._level,0)}function Xt(t,e,n,r,i,o,s){var a=Object.create(Wn);return a.size=e-t,a._origin=t,a._capacity=e,a._level=n,a._root=r,a._tail=i,a.__ownerID=o,a.__hash=s,a.__altered=!1,a}function qt(){return Gn||(Gn=Xt(0,0,fn))}function Kt(t,e,n){if((e=m(t,e))!==e)return t;if(e>=t.size||e<0)return t.withMutations(function(t){e<0?Ht(t,e).set(0,n):Ht(t,0,e+1).set(e,n)});e+=t._origin;var r=t._tail,i=t._root,o=h(xn);return e>=$t(t._capacity)?r=Yt(r,t.__ownerID,0,e,n,o):i=Yt(i,t.__ownerID,t._level,e,n,o),o.value?t.__ownerID?(t._root=i,t._tail=r,t.__hash=void 0,t.__altered=!0,t):Xt(t._origin,t._capacity,t._level,i,r):t}function Yt(t,e,n,r,i,o){var s=r>>>n&mn,a=t&&s<t.array.length;if(!a&&void 0===i)return t;var u;if(n>0){var c=t&&t.array[s],h=Yt(c,e,n-fn,r,i,o);return h===c?t:(u=Wt(t,e),u.array[s]=h,u)}return a&&t.array[s]===i?t:(l(o),u=Wt(t,e),void 0===i&&s===u.array.length-1?u.array.pop():u.array[s]=i,u)}function Wt(t,e){return e&&t&&e===t.ownerID?t:new zt(t?t.array.slice():[],e)}function Gt(t,e){if(e>=$t(t._capacity))return t._tail;if(e<1<<t._level+fn){for(var n=t._root,r=t._level;n&&r>0;)n=n.array[e>>>r&mn],r-=fn;return n}}function Ht(t,e,n){void 0!==e&&(e|=0),void 0!==n&&(n|=0);var r=t.__ownerID||new p,i=t._origin,o=t._capacity,s=i+e,a=void 0===n?o:n<0?o+n:i+n;if(s===i&&a===o)return t;if(s>=a)return t.clear();for(var u=t._level,c=t._root,h=0;s+h<0;)c=new zt(c&&c.array.length?[void 0,c]:[],r),u+=fn,h+=1<<u;h&&(s+=h,i+=h,a+=h,o+=h);for(var l=$t(o),f=$t(a);f>=1<<u+fn;)c=new zt(c&&c.array.length?[c]:[],r),u+=fn;var d=t._tail,m=f<l?Gt(t,a-1):f>l?new zt([],r):d;if(d&&f>l&&s<o&&d.array.length){c=Wt(c,r);for(var y=c,v=u;v>fn;v-=fn){var x=l>>>v&mn;y=y.array[x]=Wt(y.array[x],r)}y.array[l>>>fn&mn]=d}if(a<o&&(m=m&&m.removeAfter(r,0,a)),s>=f)s-=f,a-=f,u=fn,c=null,m=m&&m.removeBefore(r,0,s);else if(s>i||f<l){for(h=0;c;){var g=s>>>u&mn;if(g!==f>>>u&mn)break;g&&(h+=(1<<u)*g),u-=fn,c=c.array[g]}c&&s>i&&(c=c.removeBefore(r,u,s-h)),c&&f<l&&(c=c.removeAfter(r,u,f-h)),h&&(s-=h,a-=h)}return t.__ownerID?(t.size=a-s,t._origin=s,t._capacity=a,t._level=u,t._root=c,t._tail=m,t.__hash=void 0,t.__altered=!0,t):Xt(s,a,u,c,m)}function Vt(t,e,n){for(var i=[],s=0,a=0;a<n.length;a++){var u=n[a],c=r(u);c.size>s&&(s=c.size),o(u)||(c=c.map(function(t){return K(t)})),i.push(c)}return s>t.size&&(t=t.setSize(s)),Mt(t,e,i)}function $t(t){return t<dn?0:t-1>>>fn<<fn}function Zt(t){return null===t||void 0===t?ee():Qt(t)?t:ee().withMutations(function(e){var r=n(t);ht(r.size),r.forEach(function(t,n){return e.set(n,t)})})}function Qt(t){return pt(t)&&c(t)}function te(t,e,n,r){var i=Object.create(Zt.prototype);return i.size=t?t.size:0,i._map=t,i._list=e,i.__ownerID=n,i.__hash=r,i}function ee(){return Vn||(Vn=te(At(),qt()))}function ne(t,e,n){var r,i,o=t._map,s=t._list,a=o.get(e),u=void 0!==a;if(n===yn){if(!u)return t;s.size>=dn&&s.size>=2*o.size?(i=s.filter(function(t,e){return void 0!==t&&a!==e}),r=i.toKeyedSeq().map(function(t){return t[0]}).flip().toMap(),t.__ownerID&&(r.__ownerID=i.__ownerID=t.__ownerID)):(r=o.remove(e),i=a===s.size-1?s.pop():s.set(a,void 0))}else if(u){if(n===s.get(a)[1])return t;r=o,i=s.set(a,[e,n])}else r=o.set(e,s.size),i=s.set(s.size,[e,n]);return t.__ownerID?(t.size=r.size,t._map=r,t._list=i,t.__hash=void 0,t):te(r,i)}function re(t,e){this._iter=t,this._useKeys=e,this.size=t.size}function ie(t){this._iter=t,this.size=t.size}function oe(t){this._iter=t,this.size=t.size}function se(t){this._iter=t,this.size=t.size}function ae(t){var e=Fe(t);return e._iter=t,e.size=t.size,e.flip=function(){return t},e.reverse=function(){var e=t.reverse.apply(this);return e.flip=function(){return t.reverse()},e},e.has=function(e){return t.includes(e)},e.includes=function(e){return t.has(e)},e.cacheResult=ke,e.__iterateUncached=function(e,n){var r=this;return t.__iterate(function(t,n){return!1!==e(n,t,r)},n)},e.__iteratorUncached=function(e,n){if(e===En){var r=t.__iterator(e,n);return new E(function(){var t=r.next();if(!t.done){var e=t.value[0];t.value[0]=t.value[1],t.value[1]=e}return t})}return t.__iterator(e===Dn?gn:Dn,n)},e}function ue(t,e,n){var r=Fe(t);return r.size=t.size,r.has=function(e){return t.has(e)},r.get=function(r,i){var o=t.get(r,yn);return o===yn?i:e.call(n,o,r,t)},r.__iterateUncached=function(r,i){var o=this;return t.__iterate(function(t,i,s){return!1!==r(e.call(n,t,i,s),i,o)},i)},r.__iteratorUncached=function(r,i){var o=t.__iterator(En,i);return new E(function(){var i=o.next();if(i.done)return i;var s=i.value,a=s[0];return A(r,a,e.call(n,s[1],a,t),i)})},r}function ce(t,e){var n=Fe(t);return n._iter=t,n.size=t.size,n.reverse=function(){return t},t.flip&&(n.flip=function(){var e=ae(t);return e.reverse=function(){return t.flip()},e}),n.get=function(n,r){return t.get(e?n:-1-n,r)},n.has=function(n){return t.has(e?n:-1-n)},n.includes=function(e){return t.includes(e)},n.cacheResult=ke,n.__iterate=function(e,n){var r=this;return t.__iterate(function(t,n){return e(t,n,r)},!n)},n.__iterator=function(e,n){return t.__iterator(e,!n)},n}function he(t,e,n,r){var i=Fe(t);return r&&(i.has=function(r){var i=t.get(r,yn);return i!==yn&&!!e.call(n,i,r,t)},i.get=function(r,i){var o=t.get(r,yn);return o!==yn&&e.call(n,o,r,t)?o:i}),i.__iterateUncached=function(i,o){var s=this,a=0;return t.__iterate(function(t,o,u){if(e.call(n,t,o,u))return a++,i(t,r?o:a-1,s)},o),a},i.__iteratorUncached=function(i,o){var s=t.__iterator(En,o),a=0;return new E(function(){for(;;){var o=s.next();if(o.done)return o;var u=o.value,c=u[0],h=u[1];if(e.call(n,h,c,t))return A(i,r?c:a++,h,o)}})},i}function le(t,e,n){var r=lt().asMutable();return t.__iterate(function(i,o){r.update(e.call(n,i,o,t),0,function(t){return t+1})}),r.asImmutable()}function pe(t,e,n){var r=s(t),i=(c(t)?Zt():lt()).asMutable();t.__iterate(function(o,s){i.update(e.call(n,o,s,t),function(t){return t=t||[],t.push(r?[s,o]:o),t})});var o=be(t);return i.map(function(e){return we(t,o(e))})}function fe(t,e,n,r){var i=t.size;if(void 0!==e&&(e|=0),void 0!==n&&(n===1/0?n=i:n|=0),v(e,n,i))return t;var o=x(e,i),s=g(n,i);if(o!==o||s!==s)return fe(t.toSeq().cacheResult(),e,n,r);var a,u=s-o;u===u&&(a=u<0?0:u);var c=Fe(t);return c.size=0===a?a:t.size&&a||void 0,!r&&R(t)&&a>=0&&(c.get=function(e,n){return e=m(this,e),e>=0&&e<a?t.get(e+o,n):n}),c.__iterateUncached=function(e,n){var i=this;if(0===a)return 0;if(n)return this.cacheResult().__iterate(e,n);var s=0,u=!0,c=0;return t.__iterate(function(t,n){if(!u||!(u=s++<o))return c++,!1!==e(t,r?n:c-1,i)&&c!==a}),c},c.__iteratorUncached=function(e,n){if(0!==a&&n)return this.cacheResult().__iterator(e,n);var i=0!==a&&t.__iterator(e,n),s=0,u=0;return new E(function(){for(;s++<o;)i.next();if(++u>a)return S();var t=i.next();return r||e===Dn?t:e===gn?A(e,u-1,void 0,t):A(e,u-1,t.value[1],t)})},c}function de(t,e,n){var r=Fe(t);return r.__iterateUncached=function(r,i){var o=this;if(i)return this.cacheResult().__iterate(r,i);var s=0;return t.__iterate(function(t,i,a){return e.call(n,t,i,a)&&++s&&r(t,i,o)}),s},r.__iteratorUncached=function(r,i){var o=this;if(i)return this.cacheResult().__iterator(r,i);var s=t.__iterator(En,i),a=!0;return new E(function(){if(!a)return S();var t=s.next();if(t.done)return t;var i=t.value,u=i[0],c=i[1];return e.call(n,c,u,o)?r===En?t:A(r,u,c,t):(a=!1,S())})},r}function me(t,e,n,r){var i=Fe(t);return i.__iterateUncached=function(i,o){var s=this;if(o)return this.cacheResult().__iterate(i,o);var a=!0,u=0;return t.__iterate(function(t,o,c){if(!a||!(a=e.call(n,t,o,c)))return u++,i(t,r?o:u-1,s)}),u},i.__iteratorUncached=function(i,o){var s=this;if(o)return this.cacheResult().__iterator(i,o);var a=t.__iterator(En,o),u=!0,c=0;return new E(function(){var t,o,h;do{if(t=a.next(),t.done)return r||i===Dn?t:i===gn?A(i,c++,void 0,t):A(i,c++,t.value[1],t);var l=t.value;o=l[0],h=l[1],u&&(u=e.call(n,h,o,s))}while(u);return i===En?t:A(i,o,h,t)})},i}function ye(t,e){var r=s(t),i=[t].concat(e).map(function(t){return o(t)?r&&(t=n(t)):t=r?j(t):L(Array.isArray(t)?t:[t]),t}).filter(function(t){return 0!==t.size});if(0===i.length)return t;if(1===i.length){var u=i[0];if(u===t||r&&s(u)||a(t)&&a(u))return u}var c=new M(i);return r?c=c.toKeyedSeq():a(t)||(c=c.toSetSeq()),c=c.flatten(!0),c.size=i.reduce(function(t,e){if(void 0!==t){var n=e.size;if(void 0!==n)return t+n}},0),c}function ve(t,e,n){var r=Fe(t);return r.__iterateUncached=function(r,i){function s(t,c){var h=this;t.__iterate(function(t,i){return(!e||c<e)&&o(t)?s(t,c+1):!1===r(t,n?i:a++,h)&&(u=!0),!u},i)}var a=0,u=!1;return s(t,0),a},r.__iteratorUncached=function(r,i){var s=t.__iterator(r,i),a=[],u=0;return new E(function(){for(;s;){var t=s.next();if(!1===t.done){var c=t.value;if(r===En&&(c=c[1]),e&&!(a.length<e)||!o(c))return n?t:A(r,u++,c,t);a.push(s),s=c.__iterator(r,i)}else s=a.pop()}return S()})},r}function xe(t,e,n){var r=be(t);return t.toSeq().map(function(i,o){return r(e.call(n,i,o,t))}).flatten(!0)}function ge(t,e){var n=Fe(t);return n.size=t.size&&2*t.size-1,n.__iterateUncached=function(n,r){var i=this,o=0;return t.__iterate(function(t,r){return(!o||!1!==n(e,o++,i))&&!1!==n(t,o++,i)},r),o},n.__iteratorUncached=function(n,r){var i,o=t.__iterator(Dn,r),s=0;return new E(function(){return(!i||s%2)&&(i=o.next(),i.done)?i:s%2?A(n,s++,e):A(n,s++,i.value,i)})},n}function De(t,e,n){e||(e=Ie);var r=s(t),i=0,o=t.toSeq().map(function(e,r){return[r,e,i++,n?n(e,r,t):e]}).toArray();return o.sort(function(t,n){return e(t[3],n[3])||t[2]-n[2]}).forEach(r?function(t,e){o[e].length=2}:function(t,e){o[e]=t[1]}),r?I(o):a(t)?T(o):B(o)}function Ee(t,e,n){if(e||(e=Ie),n){var r=t.toSeq().map(function(e,r){return[e,n(e,r,t)]}).reduce(function(t,n){return Ae(e,t[1],n[1])?n:t});return r&&r[0]}return t.reduce(function(t,n){return Ae(e,t,n)?n:t})}function Ae(t,e,n){var r=t(n,e);return 0===r&&n!==e&&(void 0===n||null===n||n!==n)||r>0}function Se(t,n,r){var i=Fe(t);return i.size=new M(r).map(function(t){return t.size}).min(),i.__iterate=function(t,e){for(var n,r=this.__iterator(Dn,e),i=0;!(n=r.next()).done&&!1!==t(n.value,i++,this););return i},i.__iteratorUncached=function(t,i){var o=r.map(function(t){return t=e(t),_(i?t.reverse():t)}),s=0,a=!1;return new E(function(){var e;return a||(e=o.map(function(t){return t.next()}),a=e.some(function(t){return t.done})),a?S():A(t,s++,n.apply(null,e.map(function(t){return t.value})))})},i}function we(t,e){return R(t)?e:t.constructor(e)}function Ce(t){if(t!==Object(t))throw new TypeError("Expected [K, V] tuple: "+t)}function _e(t){return ht(t.size),d(t)}function be(t){return s(t)?n:a(t)?r:i}function Fe(t){return Object.create((s(t)?I:a(t)?T:B).prototype)}function ke(){return this._iter.cacheResult?(this._iter.cacheResult(),this.size=this._iter.size,this):k.prototype.cacheResult.call(this)}function Ie(t,e){return t>e?1:t<e?-1:0}function Te(t){var n=_(t);if(!n){if(!F(t))throw new TypeError("Expected iterable or array-like: "+t);n=_(e(t))}return n}function Be(t,e){var n,r=function(o){if(o instanceof r)return o;if(!(this instanceof r))return new r(o);if(!n){n=!0;var s=Object.keys(t);Ne(i,s),i.size=s.length,i._name=e,i._keys=s,i._defaultValues=t}this._map=lt(o)},i=r.prototype=Object.create($n);return i.constructor=r,r}function Me(t,e,n){var r=Object.create(Object.getPrototypeOf(t));return r._map=e,r.__ownerID=n,r}function Pe(t){return t._name||t.constructor.name||"Record"}function Ne(t,e){try{e.forEach(Oe.bind(void 0,t))}catch(t){}}function Oe(t,e){Object.defineProperty(t,e,{get:function(){return this.get(e)},set:function(t){Z(this.__ownerID,"Cannot set on an immutable record."),this.set(e,t)}})}function Re(t){return null===t||void 0===t?ze():Ue(t)&&!c(t)?t:ze().withMutations(function(e){var n=i(t);ht(n.size),n.forEach(function(t){return e.add(t)})})}function Ue(t){return!(!t||!t[Zn])}function je(t,e){return t.__ownerID?(t.size=e.size,t._map=e,t):e===t._map?t:0===e.size?t.__empty():t.__make(e)}function Le(t,e){var n=Object.create(Qn);return n.size=t?t.size:0,n._map=t,n.__ownerID=e,n}function ze(){return tr||(tr=Le(At()))}function Je(t){return null===t||void 0===t?Ke():Xe(t)?t:Ke().withMutations(function(e){var n=i(t);ht(n.size),n.forEach(function(t){return e.add(t)})})}function Xe(t){return Ue(t)&&c(t)}function qe(t,e){var n=Object.create(er);return n.size=t?t.size:0,n._map=t,n.__ownerID=e,n}function Ke(){return nr||(nr=qe(ee()))}function Ye(t){return null===t||void 0===t?He():We(t)?t:He().unshiftAll(t)}function We(t){return!(!t||!t[rr])}function Ge(t,e,n,r){var i=Object.create(ir);return i.size=t,i._head=e,i.__ownerID=n,i.__hash=r,i.__altered=!1,i}function He(){return or||(or=Ge(0))}function Ve(t,e){var n=function(n){t.prototype[n]=e[n]};return Object.keys(e).forEach(n),Object.getOwnPropertySymbols&&Object.getOwnPropertySymbols(e).forEach(n),t}function $e(t,e){return e}function Ze(t,e){return[e,t]}function Qe(t){return function(){return!t.apply(this,arguments)}}function tn(t){return function(){return-t.apply(this,arguments)}}function en(t){return"string"==typeof t?JSON.stringify(t):String(t)}function nn(){return f(arguments)}function rn(t,e){return t<e?1:t>e?-1:0}function on(t){if(t.size===1/0)return 0;var e=c(t),n=s(t),r=e?1:0;return sn(t.__iterate(n?e?function(t,e){r=31*r+an(ot(t),ot(e))|0}:function(t,e){r=r+an(ot(t),ot(e))|0}:e?function(t){r=31*r+ot(t)|0}:function(t){r=r+ot(t)|0}),r)}function sn(t,e){return e=In(e,3432918353),e=In(e<<15|e>>>-15,461845907),e=In(e<<13|e>>>-13,5),e=(e+3864292196|0)^t,e=In(e^e>>>16,2246822507),e=In(e^e>>>13,3266489909),e=it(e^e>>>16)}function an(t,e){return t^e+2654435769+(t<<6)+(t>>2)|0}var un=Array.prototype.slice;t(n,e),t(r,e),t(i,e),e.isIterable=o,e.isKeyed=s,e.isIndexed=a,e.isAssociative=u,e.isOrdered=c,e.Keyed=n,e.Indexed=r,e.Set=i;var cn="@@__IMMUTABLE_ITERABLE__@@",hn="@@__IMMUTABLE_KEYED__@@",ln="@@__IMMUTABLE_INDEXED__@@",pn="@@__IMMUTABLE_ORDERED__@@",fn=5,dn=1<<fn,mn=dn-1,yn={},vn={value:!1},xn={value:!1},gn=0,Dn=1,En=2,An="function"==typeof Symbol&&Symbol.iterator,Sn="@@iterator",wn=An||Sn;E.prototype.toString=function(){return"[Iterator]"},E.KEYS=gn,E.VALUES=Dn,E.ENTRIES=En,E.prototype.inspect=E.prototype.toSource=function(){return this.toString()},E.prototype[wn]=function(){return this},t(k,e),k.of=function(){return k(arguments)},k.prototype.toSeq=function(){return this},k.prototype.toString=function(){return this.__toString("Seq {","}")},k.prototype.cacheResult=function(){return!this._cache&&this.__iterateUncached&&(this._cache=this.entrySeq().toArray(),this.size=this._cache.length),this},k.prototype.__iterate=function(t,e){return X(this,t,e,!0)},k.prototype.__iterator=function(t,e){return q(this,t,e,!0)},t(I,k),I.prototype.toKeyedSeq=function(){return this},t(T,k),T.of=function(){return T(arguments)},T.prototype.toIndexedSeq=function(){return this},T.prototype.toString=function(){return this.__toString("Seq [","]")},T.prototype.__iterate=function(t,e){return X(this,t,e,!1)},T.prototype.__iterator=function(t,e){return q(this,t,e,!1)},t(B,k),B.of=function(){return B(arguments)},B.prototype.toSetSeq=function(){return this},k.isSeq=R,k.Keyed=I,k.Set=B,k.Indexed=T;var Cn="@@__IMMUTABLE_SEQ__@@";k.prototype[Cn]=!0,t(M,T),M.prototype.get=function(t,e){return this.has(t)?this._array[m(this,t)]:e},M.prototype.__iterate=function(t,e){for(var n=this._array,r=n.length-1,i=0;i<=r;i++)if(!1===t(n[e?r-i:i],i,this))return i+1;return i},M.prototype.__iterator=function(t,e){var n=this._array,r=n.length-1,i=0;return new E(function(){return i>r?S():A(t,i,n[e?r-i++:i++])})},t(P,I),P.prototype.get=function(t,e){return void 0===e||this.has(t)?this._object[t]:e},P.prototype.has=function(t){return this._object.hasOwnProperty(t)},P.prototype.__iterate=function(t,e){for(var n=this._object,r=this._keys,i=r.length-1,o=0;o<=i;o++){var s=r[e?i-o:o];if(!1===t(n[s],s,this))return o+1}return o},P.prototype.__iterator=function(t,e){var n=this._object,r=this._keys,i=r.length-1,o=0;return new E(function(){var s=r[e?i-o:o];return o++>i?S():A(t,s,n[s])})},P.prototype[pn]=!0,t(N,T),N.prototype.__iterateUncached=function(t,e){if(e)return this.cacheResult().__iterate(t,e);var n=this._iterable,r=_(n),i=0;if(C(r))for(var o;!(o=r.next()).done&&!1!==t(o.value,i++,this););return i},N.prototype.__iteratorUncached=function(t,e){if(e)return this.cacheResult().__iterator(t,e);var n=this._iterable,r=_(n);if(!C(r))return new E(S);var i=0;return new E(function(){var e=r.next();return e.done?e:A(t,i++,e.value)})},t(O,T),O.prototype.__iterateUncached=function(t,e){if(e)return this.cacheResult().__iterate(t,e);for(var n=this._iterator,r=this._iteratorCache,i=0;i<r.length;)if(!1===t(r[i],i++,this))return i;for(var o;!(o=n.next()).done;){var s=o.value;if(r[i]=s,!1===t(s,i++,this))break}return i},O.prototype.__iteratorUncached=function(t,e){if(e)return this.cacheResult().__iterator(t,e);var n=this._iterator,r=this._iteratorCache,i=0;return new E(function(){if(i>=r.length){var e=n.next();if(e.done)return e;r[i]=e.value}return A(t,i,r[i++])})};var _n;t($,T),$.prototype.toString=function(){return 0===this.size?"Repeat []":"Repeat [ "+this._value+" "+this.size+" times ]"},$.prototype.get=function(t,e){return this.has(t)?this._value:e},$.prototype.includes=function(t){return H(this._value,t)},$.prototype.slice=function(t,e){var n=this.size;return v(t,e,n)?this:new $(this._value,g(e,n)-x(t,n))},$.prototype.reverse=function(){return this},$.prototype.indexOf=function(t){return H(this._value,t)?0:-1},$.prototype.lastIndexOf=function(t){return H(this._value,t)?this.size:-1},$.prototype.__iterate=function(t,e){for(var n=0;n<this.size;n++)if(!1===t(this._value,n,this))return n+1;return n},$.prototype.__iterator=function(t,e){var n=this,r=0;return new E(function(){return r<n.size?A(t,r++,n._value):S()})},$.prototype.equals=function(t){return t instanceof $?H(this._value,t._value):V(t)};var bn;t(Q,T),Q.prototype.toString=function(){return 0===this.size?"Range []":"Range [ "+this._start+"..."+this._end+(1!==this._step?" by "+this._step:"")+" ]"},Q.prototype.get=function(t,e){return this.has(t)?this._start+m(this,t)*this._step:e},Q.prototype.includes=function(t){var e=(t-this._start)/this._step;return e>=0&&e<this.size&&e===Math.floor(e)},Q.prototype.slice=function(t,e){return v(t,e,this.size)?this:(t=x(t,this.size),e=g(e,this.size),e<=t?new Q(0,0):new Q(this.get(t,this._end),this.get(e,this._end),this._step))},Q.prototype.indexOf=function(t){var e=t-this._start;if(e%this._step==0){var n=e/this._step;if(n>=0&&n<this.size)return n}return-1},Q.prototype.lastIndexOf=function(t){return this.indexOf(t)},Q.prototype.__iterate=function(t,e){for(var n=this.size-1,r=this._step,i=e?this._start+n*r:this._start,o=0;o<=n;o++){if(!1===t(i,o,this))return o+1;i+=e?-r:r}return o},Q.prototype.__iterator=function(t,e){var n=this.size-1,r=this._step,i=e?this._start+n*r:this._start,o=0;return new E(function(){var s=i;return i+=e?-r:r,o>n?S():A(t,o++,s)})},Q.prototype.equals=function(t){return t instanceof Q?this._start===t._start&&this._end===t._end&&this._step===t._step:V(this,t)};var Fn;t(tt,e),t(et,tt),t(nt,tt),t(rt,tt),tt.Keyed=et,tt.Indexed=nt,tt.Set=rt;var kn,In="function"==typeof Math.imul&&-2===Math.imul(4294967295,2)?Math.imul:function(t,e){t|=0,e|=0;var n=65535&t,r=65535&e;return n*r+((t>>>16)*r+n*(e>>>16)<<16>>>0)|0},Tn=Object.isExtensible,Bn=function(){try{return Object.defineProperty({},"@",{}),!0}catch(t){return!1}}(),Mn="function"==typeof WeakMap;Mn&&(kn=new WeakMap);var Pn=0,Nn="__immutablehash__";"function"==typeof Symbol&&(Nn=Symbol(Nn));var On=16,Rn=255,Un=0,jn={};t(lt,et),lt.of=function(){var t=un.call(arguments,0);return At().withMutations(function(e){for(var n=0;n<t.length;n+=2){if(n+1>=t.length)throw new Error("Missing value for key: "+t[n]);e.set(t[n],t[n+1])}})},lt.prototype.toString=function(){return this.__toString("Map {","}")},lt.prototype.get=function(t,e){return this._root?this._root.get(0,void 0,t,e):e},lt.prototype.set=function(t,e){return St(this,t,e)},lt.prototype.setIn=function(t,e){return this.updateIn(t,yn,function(){return e})},lt.prototype.remove=function(t){return St(this,t,yn)},lt.prototype.deleteIn=function(t){return this.updateIn(t,function(){return yn})},lt.prototype.update=function(t,e,n){return 1===arguments.length?t(this):this.updateIn([t],e,n)},lt.prototype.updateIn=function(t,e,n){n||(n=e,e=void 0);var r=Pt(this,Te(t),e,n);return r===yn?void 0:r},lt.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._root=null,this.__hash=void 0,this.__altered=!0,this):At()},lt.prototype.merge=function(){return It(this,void 0,arguments)},lt.prototype.mergeWith=function(t){return It(this,t,un.call(arguments,1))},lt.prototype.mergeIn=function(t){var e=un.call(arguments,1);return this.updateIn(t,At(),function(t){return"function"==typeof t.merge?t.merge.apply(t,e):e[e.length-1]})},lt.prototype.mergeDeep=function(){return It(this,Tt,arguments)},lt.prototype.mergeDeepWith=function(t){var e=un.call(arguments,1);return It(this,Bt(t),e)},lt.prototype.mergeDeepIn=function(t){var e=un.call(arguments,1);return this.updateIn(t,At(),function(t){return"function"==typeof t.mergeDeep?t.mergeDeep.apply(t,e):e[e.length-1]})},lt.prototype.sort=function(t){return Zt(De(this,t))},lt.prototype.sortBy=function(t,e){return Zt(De(this,e,t))},lt.prototype.withMutations=function(t){var e=this.asMutable();return t(e),e.wasAltered()?e.__ensureOwner(this.__ownerID):this},lt.prototype.asMutable=function(){return this.__ownerID?this:this.__ensureOwner(new p)},lt.prototype.asImmutable=function(){return this.__ensureOwner()},lt.prototype.wasAltered=function(){return this.__altered},lt.prototype.__iterator=function(t,e){return new xt(this,t,e)},lt.prototype.__iterate=function(t,e){var n=this,r=0;return this._root&&this._root.iterate(function(e){return r++,t(e[1],e[0],n)},e),r},lt.prototype.__ensureOwner=function(t){return t===this.__ownerID?this:t?Et(this.size,this._root,t,this.__hash):(this.__ownerID=t,this.__altered=!1,this)},lt.isMap=pt;var Ln="@@__IMMUTABLE_MAP__@@",zn=lt.prototype;zn[Ln]=!0,zn.delete=zn.remove,zn.removeIn=zn.deleteIn,ft.prototype.get=function(t,e,n,r){for(var i=this.entries,o=0,s=i.length;o<s;o++)if(H(n,i[o][0]))return i[o][1];return r},ft.prototype.update=function(t,e,n,r,i,o,s){for(var a=i===yn,u=this.entries,c=0,h=u.length;c<h&&!H(r,u[c][0]);c++);var p=c<h;if(p?u[c][1]===i:a)return this;if(l(s),(a||!p)&&l(o),!a||1!==u.length){if(!p&&!a&&u.length>=Xn)return bt(t,u,r,i);var d=t&&t===this.ownerID,m=d?u:f(u);return p?a?c===h-1?m.pop():m[c]=m.pop():m[c]=[r,i]:m.push([r,i]),d?(this.entries=m,this):new ft(t,m)}},dt.prototype.get=function(t,e,n,r){void 0===e&&(e=ot(n));var i=1<<((0===t?e:e>>>t)&mn),o=this.bitmap;return 0==(o&i)?r:this.nodes[Nt(o&i-1)].get(t+fn,e,n,r)},dt.prototype.update=function(t,e,n,r,i,o,s){void 0===n&&(n=ot(r));var a=(0===e?n:n>>>e)&mn,u=1<<a,c=this.bitmap,h=0!=(c&u);if(!h&&i===yn)return this;var l=Nt(c&u-1),p=this.nodes,f=h?p[l]:void 0,d=wt(f,t,e+fn,n,r,i,o,s);if(d===f)return this;if(!h&&d&&p.length>=qn)return kt(t,p,c,a,d);if(h&&!d&&2===p.length&&Ct(p[1^l]))return p[1^l];if(h&&d&&1===p.length&&Ct(d))return d;var m=t&&t===this.ownerID,y=h?d?c:c^u:c|u,v=h?d?Ot(p,l,d,m):Ut(p,l,m):Rt(p,l,d,m);return m?(this.bitmap=y,this.nodes=v,this):new dt(t,y,v)},mt.prototype.get=function(t,e,n,r){void 0===e&&(e=ot(n));var i=(0===t?e:e>>>t)&mn,o=this.nodes[i];return o?o.get(t+fn,e,n,r):r},mt.prototype.update=function(t,e,n,r,i,o,s){void 0===n&&(n=ot(r));var a=(0===e?n:n>>>e)&mn,u=i===yn,c=this.nodes,h=c[a];if(u&&!h)return this;var l=wt(h,t,e+fn,n,r,i,o,s);if(l===h)return this;var p=this.count;if(h){if(!l&&--p<Kn)return Ft(t,c,p,a)}else p++;var f=t&&t===this.ownerID,d=Ot(c,a,l,f);return f?(this.count=p,this.nodes=d,this):new mt(t,p,d)},yt.prototype.get=function(t,e,n,r){for(var i=this.entries,o=0,s=i.length;o<s;o++)if(H(n,i[o][0]))return i[o][1];return r},yt.prototype.update=function(t,e,n,r,i,o,s){void 0===n&&(n=ot(r));var a=i===yn;if(n!==this.keyHash)return a?this:(l(s),l(o),_t(this,t,e,n,[r,i]));for(var u=this.entries,c=0,h=u.length;c<h&&!H(r,u[c][0]);c++);var p=c<h;if(p?u[c][1]===i:a)return this;if(l(s),(a||!p)&&l(o),a&&2===h)return new vt(t,this.keyHash,u[1^c]);var d=t&&t===this.ownerID,m=d?u:f(u);return p?a?c===h-1?m.pop():m[c]=m.pop():m[c]=[r,i]:m.push([r,i]),d?(this.entries=m,this):new yt(t,this.keyHash,m)},vt.prototype.get=function(t,e,n,r){return H(n,this.entry[0])?this.entry[1]:r},vt.prototype.update=function(t,e,n,r,i,o,s){var a=i===yn,u=H(r,this.entry[0]);return(u?i===this.entry[1]:a)?this:(l(s),a?void l(o):u?t&&t===this.ownerID?(this.entry[1]=i,this):new vt(t,this.keyHash,[r,i]):(l(o),_t(this,t,e,ot(r),[r,i])))},ft.prototype.iterate=yt.prototype.iterate=function(t,e){for(var n=this.entries,r=0,i=n.length-1;r<=i;r++)if(!1===t(n[e?i-r:r]))return!1},dt.prototype.iterate=mt.prototype.iterate=function(t,e){for(var n=this.nodes,r=0,i=n.length-1;r<=i;r++){var o=n[e?i-r:r];if(o&&!1===o.iterate(t,e))return!1}},vt.prototype.iterate=function(t,e){return t(this.entry)},t(xt,E),xt.prototype.next=function(){for(var t=this._type,e=this._stack;e;){var n,r=e.node,i=e.index++;if(r.entry){if(0===i)return gt(t,r.entry)}else if(r.entries){if(n=r.entries.length-1,i<=n)return gt(t,r.entries[this._reverse?n-i:i])}else if(n=r.nodes.length-1,i<=n){var o=r.nodes[this._reverse?n-i:i];if(o){if(o.entry)return gt(t,o.entry);e=this._stack=Dt(o,e)}continue}e=this._stack=this._stack.__prev}return S()};var Jn,Xn=dn/4,qn=dn/2,Kn=dn/4;t(jt,nt),jt.of=function(){return this(arguments)},jt.prototype.toString=function(){return this.__toString("List [","]")},jt.prototype.get=function(t,e){if((t=m(this,t))>=0&&t<this.size){t+=this._origin;var n=Gt(this,t);return n&&n.array[t&mn]}return e},jt.prototype.set=function(t,e){return Kt(this,t,e)},jt.prototype.remove=function(t){return this.has(t)?0===t?this.shift():t===this.size-1?this.pop():this.splice(t,1):this},jt.prototype.insert=function(t,e){return this.splice(t,0,e)},jt.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=this._origin=this._capacity=0,this._level=fn,this._root=this._tail=null,this.__hash=void 0,this.__altered=!0,this):qt()},jt.prototype.push=function(){var t=arguments,e=this.size;return this.withMutations(function(n){Ht(n,0,e+t.length);for(var r=0;r<t.length;r++)n.set(e+r,t[r])})},jt.prototype.pop=function(){return Ht(this,0,-1)},jt.prototype.unshift=function(){var t=arguments;return this.withMutations(function(e){Ht(e,-t.length);for(var n=0;n<t.length;n++)e.set(n,t[n])})},jt.prototype.shift=function(){return Ht(this,1)},jt.prototype.merge=function(){return Vt(this,void 0,arguments)},jt.prototype.mergeWith=function(t){return Vt(this,t,un.call(arguments,1))},jt.prototype.mergeDeep=function(){return Vt(this,Tt,arguments)},jt.prototype.mergeDeepWith=function(t){var e=un.call(arguments,1);return Vt(this,Bt(t),e)},jt.prototype.setSize=function(t){return Ht(this,0,t)},jt.prototype.slice=function(t,e){var n=this.size;return v(t,e,n)?this:Ht(this,x(t,n),g(e,n))},jt.prototype.__iterator=function(t,e){var n=0,r=Jt(this,e);return new E(function(){var e=r();return e===Hn?S():A(t,n++,e)})},jt.prototype.__iterate=function(t,e){for(var n,r=0,i=Jt(this,e);(n=i())!==Hn&&!1!==t(n,r++,this););return r},jt.prototype.__ensureOwner=function(t){return t===this.__ownerID?this:t?Xt(this._origin,this._capacity,this._level,this._root,this._tail,t,this.__hash):(this.__ownerID=t,this)},jt.isList=Lt;var Yn="@@__IMMUTABLE_LIST__@@",Wn=jt.prototype;Wn[Yn]=!0,Wn.delete=Wn.remove,Wn.setIn=zn.setIn,Wn.deleteIn=Wn.removeIn=zn.removeIn,Wn.update=zn.update,Wn.updateIn=zn.updateIn,Wn.mergeIn=zn.mergeIn,Wn.mergeDeepIn=zn.mergeDeepIn,Wn.withMutations=zn.withMutations,Wn.asMutable=zn.asMutable,Wn.asImmutable=zn.asImmutable,Wn.wasAltered=zn.wasAltered,zt.prototype.removeBefore=function(t,e,n){if(n===e?1<<e:0===this.array.length)return this;var r=n>>>e&mn;if(r>=this.array.length)return new zt([],t);var i,o=0===r;if(e>0){var s=this.array[r];if((i=s&&s.removeBefore(t,e-fn,n))===s&&o)return this}if(o&&!i)return this;var a=Wt(this,t);if(!o)for(var u=0;u<r;u++)a.array[u]=void 0;return i&&(a.array[r]=i),a},zt.prototype.removeAfter=function(t,e,n){if(n===(e?1<<e:0)||0===this.array.length)return this;var r=n-1>>>e&mn;if(r>=this.array.length)return this;var i;if(e>0){var o=this.array[r];if((i=o&&o.removeAfter(t,e-fn,n))===o&&r===this.array.length-1)return this}var s=Wt(this,t);return s.array.splice(r+1),i&&(s.array[r]=i),s};var Gn,Hn={};t(Zt,lt),Zt.of=function(){return this(arguments)},Zt.prototype.toString=function(){return this.__toString("OrderedMap {","}")},Zt.prototype.get=function(t,e){var n=this._map.get(t);return void 0!==n?this._list.get(n)[1]:e},Zt.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._map.clear(),this._list.clear(),this):ee()},Zt.prototype.set=function(t,e){return ne(this,t,e)},Zt.prototype.remove=function(t){return ne(this,t,yn)},Zt.prototype.wasAltered=function(){return this._map.wasAltered()||this._list.wasAltered()},Zt.prototype.__iterate=function(t,e){var n=this;return this._list.__iterate(function(e){return e&&t(e[1],e[0],n)},e)},Zt.prototype.__iterator=function(t,e){return this._list.fromEntrySeq().__iterator(t,e)},Zt.prototype.__ensureOwner=function(t){if(t===this.__ownerID)return this;var e=this._map.__ensureOwner(t),n=this._list.__ensureOwner(t);return t?te(e,n,t,this.__hash):(this.__ownerID=t,this._map=e,this._list=n,this)},Zt.isOrderedMap=Qt,Zt.prototype[pn]=!0,Zt.prototype.delete=Zt.prototype.remove;var Vn;t(re,I),re.prototype.get=function(t,e){return this._iter.get(t,e)},re.prototype.has=function(t){return this._iter.has(t)},re.prototype.valueSeq=function(){return this._iter.valueSeq()},re.prototype.reverse=function(){var t=this,e=ce(this,!0);return this._useKeys||(e.valueSeq=function(){return t._iter.toSeq().reverse()}),e},re.prototype.map=function(t,e){var n=this,r=ue(this,t,e);return this._useKeys||(r.valueSeq=function(){return n._iter.toSeq().map(t,e)}),r},re.prototype.__iterate=function(t,e){var n,r=this;return this._iter.__iterate(this._useKeys?function(e,n){return t(e,n,r)}:(n=e?_e(this):0,function(i){return t(i,e?--n:n++,r)}),e)},re.prototype.__iterator=function(t,e){if(this._useKeys)return this._iter.__iterator(t,e);var n=this._iter.__iterator(Dn,e),r=e?_e(this):0;return new E(function(){var i=n.next();return i.done?i:A(t,e?--r:r++,i.value,i)})},re.prototype[pn]=!0,t(ie,T),ie.prototype.includes=function(t){return this._iter.includes(t)},ie.prototype.__iterate=function(t,e){var n=this,r=0;return this._iter.__iterate(function(e){return t(e,r++,n)},e)},ie.prototype.__iterator=function(t,e){var n=this._iter.__iterator(Dn,e),r=0;return new E(function(){var e=n.next();return e.done?e:A(t,r++,e.value,e)})},t(oe,B),oe.prototype.has=function(t){return this._iter.includes(t)},oe.prototype.__iterate=function(t,e){var n=this;return this._iter.__iterate(function(e){return t(e,e,n)},e)},oe.prototype.__iterator=function(t,e){var n=this._iter.__iterator(Dn,e);return new E(function(){var e=n.next();return e.done?e:A(t,e.value,e.value,e)})},t(se,I),se.prototype.entrySeq=function(){return this._iter.toSeq()},se.prototype.__iterate=function(t,e){var n=this;return this._iter.__iterate(function(e){if(e){Ce(e);var r=o(e);return t(r?e.get(1):e[1],r?e.get(0):e[0],n)}},e)},se.prototype.__iterator=function(t,e){var n=this._iter.__iterator(Dn,e);return new E(function(){for(;;){var e=n.next();if(e.done)return e;var r=e.value;if(r){Ce(r);var i=o(r);return A(t,i?r.get(0):r[0],i?r.get(1):r[1],e)}}})},ie.prototype.cacheResult=re.prototype.cacheResult=oe.prototype.cacheResult=se.prototype.cacheResult=ke,t(Be,et),Be.prototype.toString=function(){return this.__toString(Pe(this)+" {","}")},Be.prototype.has=function(t){return this._defaultValues.hasOwnProperty(t)},Be.prototype.get=function(t,e){if(!this.has(t))return e;var n=this._defaultValues[t];return this._map?this._map.get(t,n):n},Be.prototype.clear=function(){if(this.__ownerID)return this._map&&this._map.clear(),this;var t=this.constructor;return t._empty||(t._empty=Me(this,At()))},Be.prototype.set=function(t,e){if(!this.has(t))throw new Error('Cannot set unknown key "'+t+'" on '+Pe(this));if(this._map&&!this._map.has(t)){if(e===this._defaultValues[t])return this}var n=this._map&&this._map.set(t,e);return this.__ownerID||n===this._map?this:Me(this,n)},Be.prototype.remove=function(t){if(!this.has(t))return this;var e=this._map&&this._map.remove(t);return this.__ownerID||e===this._map?this:Me(this,e)},Be.prototype.wasAltered=function(){return this._map.wasAltered()},Be.prototype.__iterator=function(t,e){var r=this;return n(this._defaultValues).map(function(t,e){return r.get(e)}).__iterator(t,e)},Be.prototype.__iterate=function(t,e){var r=this;return n(this._defaultValues).map(function(t,e){return r.get(e)}).__iterate(t,e)},Be.prototype.__ensureOwner=function(t){if(t===this.__ownerID)return this;var e=this._map&&this._map.__ensureOwner(t);return t?Me(this,e,t):(this.__ownerID=t,this._map=e,this)};var $n=Be.prototype;$n.delete=$n.remove,$n.deleteIn=$n.removeIn=zn.removeIn,$n.merge=zn.merge,$n.mergeWith=zn.mergeWith,$n.mergeIn=zn.mergeIn,$n.mergeDeep=zn.mergeDeep,$n.mergeDeepWith=zn.mergeDeepWith,$n.mergeDeepIn=zn.mergeDeepIn,$n.setIn=zn.setIn,$n.update=zn.update,$n.updateIn=zn.updateIn,$n.withMutations=zn.withMutations,$n.asMutable=zn.asMutable,$n.asImmutable=zn.asImmutable,t(Re,rt),Re.of=function(){return this(arguments)},Re.fromKeys=function(t){return this(n(t).keySeq())},Re.prototype.toString=function(){return this.__toString("Set {","}")},Re.prototype.has=function(t){return this._map.has(t)},Re.prototype.add=function(t){return je(this,this._map.set(t,!0))},Re.prototype.remove=function(t){return je(this,this._map.remove(t))},Re.prototype.clear=function(){return je(this,this._map.clear())},Re.prototype.union=function(){var t=un.call(arguments,0);return t=t.filter(function(t){return 0!==t.size}),0===t.length?this:0!==this.size||this.__ownerID||1!==t.length?this.withMutations(function(e){for(var n=0;n<t.length;n++)i(t[n]).forEach(function(t){return e.add(t)})}):this.constructor(t[0])},Re.prototype.intersect=function(){var t=un.call(arguments,0);if(0===t.length)return this;t=t.map(function(t){return i(t)});var e=this;return this.withMutations(function(n){e.forEach(function(e){t.every(function(t){return t.includes(e)})||n.remove(e)})})},Re.prototype.subtract=function(){var t=un.call(arguments,0);if(0===t.length)return this;t=t.map(function(t){return i(t)});var e=this;return this.withMutations(function(n){e.forEach(function(e){t.some(function(t){return t.includes(e)})&&n.remove(e)})})},Re.prototype.merge=function(){return this.union.apply(this,arguments)},Re.prototype.mergeWith=function(t){var e=un.call(arguments,1);return this.union.apply(this,e)},Re.prototype.sort=function(t){return Je(De(this,t))},Re.prototype.sortBy=function(t,e){return Je(De(this,e,t))},Re.prototype.wasAltered=function(){return this._map.wasAltered()},Re.prototype.__iterate=function(t,e){var n=this;return this._map.__iterate(function(e,r){return t(r,r,n)},e)},Re.prototype.__iterator=function(t,e){return this._map.map(function(t,e){return e}).__iterator(t,e)},Re.prototype.__ensureOwner=function(t){if(t===this.__ownerID)return this;var e=this._map.__ensureOwner(t);return t?this.__make(e,t):(this.__ownerID=t,this._map=e,this)},Re.isSet=Ue;var Zn="@@__IMMUTABLE_SET__@@",Qn=Re.prototype;Qn[Zn]=!0,Qn.delete=Qn.remove,Qn.mergeDeep=Qn.merge,Qn.mergeDeepWith=Qn.mergeWith,Qn.withMutations=zn.withMutations,Qn.asMutable=zn.asMutable,Qn.asImmutable=zn.asImmutable,Qn.__empty=ze,Qn.__make=Le;var tr;t(Je,Re),Je.of=function(){return this(arguments)},Je.fromKeys=function(t){return this(n(t).keySeq())},Je.prototype.toString=function(){return this.__toString("OrderedSet {","}")},Je.isOrderedSet=Xe;var er=Je.prototype;er[pn]=!0,er.__empty=Ke,er.__make=qe;var nr;t(Ye,nt),Ye.of=function(){return this(arguments)},Ye.prototype.toString=function(){return this.__toString("Stack [","]")},Ye.prototype.get=function(t,e){var n=this._head;for(t=m(this,t);n&&t--;)n=n.next;return n?n.value:e},Ye.prototype.peek=function(){return this._head&&this._head.value},Ye.prototype.push=function(){if(0===arguments.length)return this;for(var t=this.size+arguments.length,e=this._head,n=arguments.length-1;n>=0;n--)e={value:arguments[n],next:e};return this.__ownerID?(this.size=t,this._head=e,this.__hash=void 0,this.__altered=!0,this):Ge(t,e)},Ye.prototype.pushAll=function(t){if(t=r(t),0===t.size)return this;ht(t.size);var e=this.size,n=this._head;return t.reverse().forEach(function(t){e++,n={value:t,next:n}}),this.__ownerID?(this.size=e,this._head=n,this.__hash=void 0,this.__altered=!0,this):Ge(e,n)},Ye.prototype.pop=function(){return this.slice(1)},Ye.prototype.unshift=function(){return this.push.apply(this,arguments)},Ye.prototype.unshiftAll=function(t){return this.pushAll(t)},Ye.prototype.shift=function(){return this.pop.apply(this,arguments)},Ye.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._head=void 0,this.__hash=void 0,this.__altered=!0,this):He()},Ye.prototype.slice=function(t,e){if(v(t,e,this.size))return this;var n=x(t,this.size);if(g(e,this.size)!==this.size)return nt.prototype.slice.call(this,t,e);for(var r=this.size-n,i=this._head;n--;)i=i.next;return this.__ownerID?(this.size=r,this._head=i,this.__hash=void 0,this.__altered=!0,this):Ge(r,i)},Ye.prototype.__ensureOwner=function(t){return t===this.__ownerID?this:t?Ge(this.size,this._head,t,this.__hash):(this.__ownerID=t,this.__altered=!1,this)},Ye.prototype.__iterate=function(t,e){if(e)return this.reverse().__iterate(t);for(var n=0,r=this._head;r&&!1!==t(r.value,n++,this);)r=r.next;return n},Ye.prototype.__iterator=function(t,e){if(e)return this.reverse().__iterator(t);var n=0,r=this._head;return new E(function(){if(r){var e=r.value;return r=r.next,A(t,n++,e)}return S()})},Ye.isStack=We;var rr="@@__IMMUTABLE_STACK__@@",ir=Ye.prototype;ir[rr]=!0,ir.withMutations=zn.withMutations,ir.asMutable=zn.asMutable,ir.asImmutable=zn.asImmutable,ir.wasAltered=zn.wasAltered;var or;e.Iterator=E,Ve(e,{toArray:function(){ht(this.size);var t=new Array(this.size||0);return this.valueSeq().__iterate(function(e,n){t[n]=e}),t},toIndexedSeq:function(){return new ie(this)},toJS:function(){return this.toSeq().map(function(t){return t&&"function"==typeof t.toJS?t.toJS():t}).__toJS()},toJSON:function(){return this.toSeq().map(function(t){return t&&"function"==typeof t.toJSON?t.toJSON():t}).__toJS()},toKeyedSeq:function(){return new re(this,!0)},toMap:function(){return lt(this.toKeyedSeq())},toObject:function(){ht(this.size);var t={};return this.__iterate(function(e,n){t[n]=e}),t},toOrderedMap:function(){return Zt(this.toKeyedSeq())},toOrderedSet:function(){return Je(s(this)?this.valueSeq():this)},toSet:function(){return Re(s(this)?this.valueSeq():this)},toSetSeq:function(){return new oe(this)},toSeq:function(){return a(this)?this.toIndexedSeq():s(this)?this.toKeyedSeq():this.toSetSeq()},toStack:function(){return Ye(s(this)?this.valueSeq():this)},toList:function(){return jt(s(this)?this.valueSeq():this)},toString:function(){return"[Iterable]"},__toString:function(t,e){return 0===this.size?t+e:t+" "+this.toSeq().map(this.__toStringMapper).join(", ")+" "+e},concat:function(){return we(this,ye(this,un.call(arguments,0)))},includes:function(t){return this.some(function(e){return H(e,t)})},entries:function(){return this.__iterator(En)},every:function(t,e){ht(this.size);var n=!0;return this.__iterate(function(r,i,o){if(!t.call(e,r,i,o))return n=!1,!1}),n},filter:function(t,e){return we(this,he(this,t,e,!0))},find:function(t,e,n){var r=this.findEntry(t,e);return r?r[1]:n},forEach:function(t,e){return ht(this.size),this.__iterate(e?t.bind(e):t)},join:function(t){ht(this.size),t=void 0!==t?""+t:",";var e="",n=!0;return this.__iterate(function(r){n?n=!1:e+=t,e+=null!==r&&void 0!==r?r.toString():""}),e},keys:function(){return this.__iterator(gn)},map:function(t,e){return we(this,ue(this,t,e))},reduce:function(t,e,n){ht(this.size);var r,i;return arguments.length<2?i=!0:r=e,this.__iterate(function(e,o,s){i?(i=!1,r=e):r=t.call(n,r,e,o,s)}),r},reduceRight:function(t,e,n){var r=this.toKeyedSeq().reverse();return r.reduce.apply(r,arguments)},reverse:function(){return we(this,ce(this,!0))},slice:function(t,e){return we(this,fe(this,t,e,!0))},some:function(t,e){return!this.every(Qe(t),e)},sort:function(t){return we(this,De(this,t))},values:function(){return this.__iterator(Dn)},butLast:function(){return this.slice(0,-1)},isEmpty:function(){return void 0!==this.size?0===this.size:!this.some(function(){return!0})},count:function(t,e){return d(t?this.toSeq().filter(t,e):this)},countBy:function(t,e){return le(this,t,e)},equals:function(t){return V(this,t)},entrySeq:function(){var t=this;if(t._cache)return new M(t._cache);var e=t.toSeq().map(Ze).toIndexedSeq();return e.fromEntrySeq=function(){return t.toSeq()},e},filterNot:function(t,e){return this.filter(Qe(t),e)},findEntry:function(t,e,n){var r=n;return this.__iterate(function(n,i,o){if(t.call(e,n,i,o))return r=[i,n],!1}),r},findKey:function(t,e){var n=this.findEntry(t,e);return n&&n[0]},findLast:function(t,e,n){return this.toKeyedSeq().reverse().find(t,e,n)},findLastEntry:function(t,e,n){return this.toKeyedSeq().reverse().findEntry(t,e,n)},findLastKey:function(t,e){return this.toKeyedSeq().reverse().findKey(t,e)},first:function(){return this.find(y)},flatMap:function(t,e){return we(this,xe(this,t,e))},flatten:function(t){return we(this,ve(this,t,!0))},fromEntrySeq:function(){return new se(this)},get:function(t,e){return this.find(function(e,n){return H(n,t)},void 0,e)},getIn:function(t,e){for(var n,r=this,i=Te(t);!(n=i.next()).done;){var o=n.value;if((r=r&&r.get?r.get(o,yn):yn)===yn)return e}return r},groupBy:function(t,e){return pe(this,t,e)},has:function(t){return this.get(t,yn)!==yn},hasIn:function(t){return this.getIn(t,yn)!==yn},isSubset:function(t){return t="function"==typeof t.includes?t:e(t),this.every(function(e){return t.includes(e)})},isSuperset:function(t){return t="function"==typeof t.isSubset?t:e(t),t.isSubset(this)},keyOf:function(t){return this.findKey(function(e){return H(e,t)})},keySeq:function(){return this.toSeq().map($e).toIndexedSeq()},last:function(){return this.toSeq().reverse().first()},lastKeyOf:function(t){return this.toKeyedSeq().reverse().keyOf(t)},max:function(t){return Ee(this,t)},maxBy:function(t,e){return Ee(this,e,t)},min:function(t){return Ee(this,t?tn(t):rn)},minBy:function(t,e){return Ee(this,e?tn(e):rn,t)},rest:function(){return this.slice(1)},skip:function(t){return this.slice(Math.max(0,t))},skipLast:function(t){return we(this,this.toSeq().reverse().skip(t).reverse())},skipWhile:function(t,e){return we(this,me(this,t,e,!0))},skipUntil:function(t,e){return this.skipWhile(Qe(t),e)},sortBy:function(t,e){return we(this,De(this,e,t))},take:function(t){return this.slice(0,Math.max(0,t))},takeLast:function(t){return we(this,this.toSeq().reverse().take(t).reverse())},takeWhile:function(t,e){return we(this,de(this,t,e))},takeUntil:function(t,e){return this.takeWhile(Qe(t),e)},valueSeq:function(){return this.toIndexedSeq()},hashCode:function(){return this.__hash||(this.__hash=on(this))}});var sr=e.prototype;sr[cn]=!0,sr[wn]=sr.values,sr.__toJS=sr.toArray,sr.__toStringMapper=en,sr.inspect=sr.toSource=function(){return this.toString()},sr.chain=sr.flatMap,sr.contains=sr.includes,Ve(n,{flip:function(){return we(this,ae(this))},mapEntries:function(t,e){var n=this,r=0;return we(this,this.toSeq().map(function(i,o){return t.call(e,[o,i],r++,n)}).fromEntrySeq())},mapKeys:function(t,e){var n=this;return we(this,this.toSeq().flip().map(function(r,i){return t.call(e,r,i,n)}).flip())}});var ar=n.prototype;return ar[hn]=!0,ar[wn]=sr.entries,ar.__toJS=sr.toObject,ar.__toStringMapper=function(t,e){return JSON.stringify(e)+": "+en(t)},Ve(r,{toKeyedSeq:function(){return new re(this,!1)},filter:function(t,e){return we(this,he(this,t,e,!1))},findIndex:function(t,e){var n=this.findEntry(t,e);return n?n[0]:-1},indexOf:function(t){var e=this.keyOf(t);return void 0===e?-1:e},lastIndexOf:function(t){var e=this.lastKeyOf(t);return void 0===e?-1:e},reverse:function(){return we(this,ce(this,!1))},slice:function(t,e){return we(this,fe(this,t,e,!1))},splice:function(t,e){var n=arguments.length;if(e=Math.max(0|e,0),0===n||2===n&&!e)return this;t=x(t,t<0?this.count():this.size);var r=this.slice(0,t);return we(this,1===n?r:r.concat(f(arguments,2),this.slice(t+e)))},findLastIndex:function(t,e){var n=this.findLastEntry(t,e);return n?n[0]:-1},first:function(){return this.get(0)},flatten:function(t){return we(this,ve(this,t,!1))},get:function(t,e){return t=m(this,t),t<0||this.size===1/0||void 0!==this.size&&t>this.size?e:this.find(function(e,n){return n===t},void 0,e)},has:function(t){return(t=m(this,t))>=0&&(void 0!==this.size?this.size===1/0||t<this.size:-1!==this.indexOf(t))},interpose:function(t){return we(this,ge(this,t))},interleave:function(){var t=[this].concat(f(arguments)),e=Se(this.toSeq(),T.of,t),n=e.flatten(!0);return e.size&&(n.size=e.size*t.length),we(this,n)},keySeq:function(){return Q(0,this.size)},last:function(){return this.get(-1)},skipWhile:function(t,e){return we(this,me(this,t,e,!1))},zip:function(){return we(this,Se(this,nn,[this].concat(f(arguments))))},zipWith:function(t){var e=f(arguments);return e[0]=this,we(this,Se(this,t,e))}}),r.prototype[ln]=!0,r.prototype[pn]=!0,Ve(i,{get:function(t,e){return this.has(t)?t:e},includes:function(t){return this.has(t)},keySeq:function(){return this.valueSeq()}}),i.prototype.has=sr.includes,i.prototype.contains=i.prototype.includes,Ve(I,n.prototype),Ve(T,r.prototype),Ve(B,i.prototype),Ve(et,n.prototype),Ve(nt,r.prototype),Ve(rt,i.prototype),{Iterable:e,Seq:k,Collection:tt,Map:lt,OrderedMap:Zt,List:jt,Stack:Ye,Set:Re,OrderedSet:Je,Record:Be,Range:Q,Repeat:$,is:H,fromJS:K}})},function(t,e){var n={}.toString;t.exports=Array.isArray||function(t){return"[object Array]"==n.call(t)}},function(t,e,n){"use strict";var r=n(236);t.exports=r},function(t,e,n){"use strict";function r(t){return function(){throw new Error("Function "+t+" is deprecated and cannot be used.")}}var i=n(238),o=n(237);t.exports.Type=n(0),t.exports.Schema=n(24),t.exports.FAILSAFE_SCHEMA=n(71),t.exports.JSON_SCHEMA=n(111),t.exports.CORE_SCHEMA=n(110),t.exports.DEFAULT_SAFE_SCHEMA=n(34),t.exports.DEFAULT_FULL_SCHEMA=n(47),t.exports.load=i.load,t.exports.loadAll=i.loadAll,t.exports.safeLoad=i.safeLoad,t.exports.safeLoadAll=i.safeLoadAll,t.exports.dump=o.dump,t.exports.safeDump=o.safeDump,t.exports.YAMLException=n(33),t.exports.MINIMAL_SCHEMA=n(71),t.exports.SAFE_SCHEMA=n(34),t.exports.DEFAULT_SCHEMA=n(47),t.exports.scan=r("scan"),t.exports.parse=r("parse"),t.exports.compose=r("compose"),t.exports.addConstructor=r("addConstructor")},function(t,e,n){"use strict";function r(t,e){var n,r,i,o,s,a,u;if(null===e)return{};for(n={},r=Object.keys(e),i=0,o=r.length;i<o;i+=1)s=r[i],a=String(e[s]),"!!"===s.slice(0,2)&&(s="tag:yaml.org,2002:"+s.slice(2)),u=t.compiledTypeMap.fallback[s],u&&N.call(u.styleAliases,a)&&(a=u.styleAliases[a]),n[s]=a;return n}function i(t){var e,n,r;if(e=t.toString(16).toUpperCase(),t<=255)n="x",r=2;else if(t<=65535)n="u",r=4;else{if(!(t<=4294967295))throw new T("code point within a string may not be greater than 0xFFFFFFFF");n="U",r=8}return"\\"+n+I.repeat("0",r-e.length)+e}function o(t){this.schema=t.schema||B,this.indent=Math.max(1,t.indent||2),this.skipInvalid=t.skipInvalid||!1,this.flowLevel=I.isNothing(t.flowLevel)?-1:t.flowLevel,this.styleMap=r(this.schema,t.styles||null),this.sortKeys=t.sortKeys||!1,this.lineWidth=t.lineWidth||80,this.noRefs=t.noRefs||!1,this.noCompatMode=t.noCompatMode||!1,this.condenseFlow=t.condenseFlow||!1,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function s(t,e){for(var n,r=I.repeat(" ",e),i=0,o=-1,s="",a=t.length;i<a;)o=t.indexOf("\n",i),-1===o?(n=t.slice(i),i=a):(n=t.slice(i,o+1),i=o+1),n.length&&"\n"!==n&&(s+=r),s+=n;return s}function a(t,e){return"\n"+I.repeat(" ",t.indent*e)}function u(t,e){var n,r,i;for(n=0,r=t.implicitTypes.length;n<r;n+=1)if(i=t.implicitTypes[n],i.resolve(e))return!0;return!1}function c(t){return t===U||t===O}function h(t){return 32<=t&&t<=126||161<=t&&t<=55295&&8232!==t&&8233!==t||57344<=t&&t<=65533&&65279!==t||65536<=t&&t<=1114111}function l(t){return h(t)&&65279!==t&&t!==Y&&t!==Z&&t!==Q&&t!==et&&t!==rt&&t!==G&&t!==z}function p(t){return h(t)&&65279!==t&&!c(t)&&t!==W&&t!==V&&t!==G&&t!==Y&&t!==Z&&t!==Q&&t!==et&&t!==rt&&t!==z&&t!==X&&t!==K&&t!==j&&t!==nt&&t!==H&&t!==q&&t!==L&&t!==J&&t!==$&&t!==tt}function f(t,e,n,r,i){var o,s,a=!1,u=!1,f=-1!==r,d=-1,m=p(t.charCodeAt(0))&&!c(t.charCodeAt(t.length-1));if(e)for(o=0;o<t.length;o++){if(s=t.charCodeAt(o),!h(s))return ht;m=m&&l(s)}else{for(o=0;o<t.length;o++){if((s=t.charCodeAt(o))===R)a=!0,f&&(u=u||o-d-1>r&&" "!==t[d+1],d=o);else if(!h(s))return ht;m=m&&l(s)}u=u||f&&o-d-1>r&&" "!==t[d+1]}return a||u?" "===t[0]&&n>9?ht:u?ct:ut:m&&!i(t)?st:at}function d(t,e,n,r){t.dump=function(){function i(e){return u(t,e)}if(0===e.length)return"''";if(!t.noCompatMode&&-1!==ot.indexOf(e))return"'"+e+"'";var o=t.indent*Math.max(1,n),a=-1===t.lineWidth?-1:Math.max(Math.min(t.lineWidth,40),t.lineWidth-o),c=r||t.flowLevel>-1&&n>=t.flowLevel;switch(f(e,c,t.indent,a,i)){case st:return e;case at:return"'"+e.replace(/'/g,"''")+"'";case ut:return"|"+m(e,t.indent)+y(s(e,o));case ct:return">"+m(e,t.indent)+y(s(v(e,a),o));case ht:return'"'+g(e)+'"';default:throw new T("impossible error: invalid scalar style")}}()}function m(t,e){var n=" "===t[0]?String(e):"",r="\n"===t[t.length-1];return n+(!r||"\n"!==t[t.length-2]&&"\n"!==t?r?"":"-":"+")+"\n"}function y(t){return"\n"===t[t.length-1]?t.slice(0,-1):t}function v(t,e){for(var n,r,i=/(\n+)([^\n]*)/g,o=function(){var n=t.indexOf("\n");return n=-1!==n?n:t.length,i.lastIndex=n,x(t.slice(0,n),e)}(),s="\n"===t[0]||" "===t[0];r=i.exec(t);){var a=r[1],u=r[2];n=" "===u[0],o+=a+(s||n||""===u?"":"\n")+x(u,e),s=n}return o}function x(t,e){if(""===t||" "===t[0])return t;for(var n,r,i=/ [^ ]/g,o=0,s=0,a=0,u="";n=i.exec(t);)a=n.index,a-o>e&&(r=s>o?s:a,u+="\n"+t.slice(o,r),o=r+1),s=a;return u+="\n",t.length-o>e&&s>o?u+=t.slice(o,s)+"\n"+t.slice(s+1):u+=t.slice(o),u.slice(1)}function g(t){for(var e,n,r,o="",s=0;s<t.length;s++)e=t.charCodeAt(s),e>=55296&&e<=56319&&(n=t.charCodeAt(s+1))>=56320&&n<=57343?(o+=i(1024*(e-55296)+n-56320+65536),s++):(r=it[e],o+=!r&&h(e)?t[s]:r||i(e));return o}function D(t,e,n){var r,i,o="",s=t.tag;for(r=0,i=n.length;r<i;r+=1)C(t,e,n[r],!1,!1)&&(0!==r&&(o+=","+(t.condenseFlow?"":" ")),o+=t.dump);t.tag=s,t.dump="["+o+"]"}function E(t,e,n,r){var i,o,s="",u=t.tag;for(i=0,o=n.length;i<o;i+=1)C(t,e+1,n[i],!0,!0)&&(r&&0===i||(s+=a(t,e)),t.dump&&R===t.dump.charCodeAt(0)?s+="-":s+="- ",s+=t.dump);t.tag=u,t.dump=s||"[]"}function A(t,e,n){var r,i,o,s,a,u="",c=t.tag,h=Object.keys(n);for(r=0,i=h.length;r<i;r+=1)a=t.condenseFlow?'"':"",0!==r&&(a+=", "),o=h[r],s=n[o],C(t,e,o,!1,!1)&&(t.dump.length>1024&&(a+="? "),a+=t.dump+(t.condenseFlow?'"':"")+":"+(t.condenseFlow?"":" "),C(t,e,s,!1,!1)&&(a+=t.dump,u+=a));t.tag=c,t.dump="{"+u+"}"}function S(t,e,n,r){var i,o,s,u,c,h,l="",p=t.tag,f=Object.keys(n);if(!0===t.sortKeys)f.sort();else if("function"==typeof t.sortKeys)f.sort(t.sortKeys);else if(t.sortKeys)throw new T("sortKeys must be a boolean or a function");for(i=0,o=f.length;i<o;i+=1)h="",r&&0===i||(h+=a(t,e)),s=f[i],u=n[s],C(t,e+1,s,!0,!0,!0)&&(c=null!==t.tag&&"?"!==t.tag||t.dump&&t.dump.length>1024,c&&(t.dump&&R===t.dump.charCodeAt(0)?h+="?":h+="? "),h+=t.dump,c&&(h+=a(t,e)),C(t,e+1,u,!0,c)&&(t.dump&&R===t.dump.charCodeAt(0)?h+=":":h+=": ",h+=t.dump,l+=h));t.tag=p,t.dump=l||"{}"}function w(t,e,n){var r,i,o,s,a,u;for(i=n?t.explicitTypes:t.implicitTypes,o=0,s=i.length;o<s;o+=1)if(a=i[o],(a.instanceOf||a.predicate)&&(!a.instanceOf||"object"==typeof e&&e instanceof a.instanceOf)&&(!a.predicate||a.predicate(e))){if(t.tag=n?a.tag:"?",a.represent){if(u=t.styleMap[a.tag]||a.defaultStyle,"[object Function]"===P.call(a.represent))r=a.represent(e,u);else{if(!N.call(a.represent,u))throw new T("!<"+a.tag+'> tag resolver accepts not "'+u+'" style');r=a.represent[u](e,u)}t.dump=r}return!0}return!1}function C(t,e,n,r,i,o){t.tag=null,t.dump=n,w(t,n,!1)||w(t,n,!0);var s=P.call(t.dump);r&&(r=t.flowLevel<0||t.flowLevel>e);var a,u,c="[object Object]"===s||"[object Array]"===s;if(c&&(a=t.duplicates.indexOf(n),u=-1!==a),(null!==t.tag&&"?"!==t.tag||u||2!==t.indent&&e>0)&&(i=!1),u&&t.usedDuplicates[a])t.dump="*ref_"+a;else{if(c&&u&&!t.usedDuplicates[a]&&(t.usedDuplicates[a]=!0),"[object Object]"===s)r&&0!==Object.keys(t.dump).length?(S(t,e,t.dump,i),u&&(t.dump="&ref_"+a+t.dump)):(A(t,e,t.dump),u&&(t.dump="&ref_"+a+" "+t.dump));else if("[object Array]"===s)r&&0!==t.dump.length?(E(t,e,t.dump,i),u&&(t.dump="&ref_"+a+t.dump)):(D(t,e,t.dump),u&&(t.dump="&ref_"+a+" "+t.dump));else{if("[object String]"!==s){if(t.skipInvalid)return!1;throw new T("unacceptable kind of an object to dump "+s)}"?"!==t.tag&&d(t,t.dump,e,o)}null!==t.tag&&"?"!==t.tag&&(t.dump="!<"+t.tag+"> "+t.dump)}return!0}function _(t,e){var n,r,i=[],o=[];for(b(t,i,o),n=0,r=o.length;n<r;n+=1)e.duplicates.push(i[o[n]]);e.usedDuplicates=new Array(r)}function b(t,e,n){var r,i,o;if(null!==t&&"object"==typeof t)if(-1!==(i=e.indexOf(t)))-1===n.indexOf(i)&&n.push(i);else if(e.push(t),Array.isArray(t))for(i=0,o=t.length;i<o;i+=1)b(t[i],e,n);else for(r=Object.keys(t),i=0,o=r.length;i<o;i+=1)b(t[r[i]],e,n)}function F(t,e){e=e||{};var n=new o(e);return n.noRefs||_(t,n),C(n,0,t,!0,!0)?n.dump+"\n":""}function k(t,e){return F(t,I.extend({schema:M},e))}var I=n(23),T=n(33),B=n(47),M=n(34),P=Object.prototype.toString,N=Object.prototype.hasOwnProperty,O=9,R=10,U=32,j=33,L=34,z=35,J=37,X=38,q=39,K=42,Y=44,W=45,G=58,H=62,V=63,$=64,Z=91,Q=93,tt=96,et=123,nt=124,rt=125,it={};it[0]="\\0",it[7]="\\a",it[8]="\\b",it[9]="\\t",it[10]="\\n",it[11]="\\v",it[12]="\\f",it[13]="\\r",it[27]="\\e",it[34]='\\"',it[92]="\\\\",it[133]="\\N",it[160]="\\_",it[8232]="\\L",it[8233]="\\P";var ot=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"],st=1,at=2,ut=3,ct=4,ht=5;t.exports.dump=F,t.exports.safeDump=k},function(t,e,n){"use strict";function r(t){return 10===t||13===t}function i(t){return 9===t||32===t}function o(t){return 9===t||32===t||10===t||13===t}function s(t){return 44===t||91===t||93===t||123===t||125===t}function a(t){var e;return 48<=t&&t<=57?t-48:(e=32|t,97<=e&&e<=102?e-97+10:-1)}function u(t){return 120===t?2:117===t?4:85===t?8:0}function c(t){return 48<=t&&t<=57?t-48:-1}function h(t){return 48===t?"\0":97===t?"":98===t?"\b":116===t?"\t":9===t?"\t":110===t?"\n":118===t?"\v":102===t?"\f":114===t?"\r":101===t?"":32===t?" ":34===t?'"':47===t?"/":92===t?"\\":78===t?"…":95===t?" ":76===t?"\u2028":80===t?"\u2029":""}function l(t){return t<=65535?String.fromCharCode(t):String.fromCharCode(55296+(t-65536>>10),56320+(t-65536&1023))}function p(t,e){this.input=t,this.filename=e.filename||null,this.schema=e.schema||q,this.onWarning=e.onWarning||null,this.legacy=e.legacy||!1,this.json=e.json||!1,this.listener=e.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=t.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.documents=[]}function f(t,e){return new z(e,new J(t.filename,t.input,t.position,t.line,t.position-t.lineStart))}function d(t,e){throw f(t,e)}function m(t,e){t.onWarning&&t.onWarning.call(null,f(t,e))}function y(t,e,n,r){var i,o,s,a;if(e<n){if(a=t.input.slice(e,n),r)for(i=0,o=a.length;i<o;i+=1)9===(s=a.charCodeAt(i))||32<=s&&s<=1114111||d(t,"expected valid JSON character");else Q.test(a)&&d(t,"the stream contains non-printable characters");t.result+=a}}function v(t,e,n,r){var i,o,s,a;for(L.isObject(n)||d(t,"cannot merge mappings; the provided source object is unacceptable"),i=Object.keys(n),s=0,a=i.length;s<a;s+=1)o=i[s],K.call(e,o)||(e[o]=n[o],r[o]=!0)}function x(t,e,n,r,i,o,s,a){var u,c;if(i=String(i),null===e&&(e={}),"tag:yaml.org,2002:merge"===r)if(Array.isArray(o))for(u=0,c=o.length;u<c;u+=1)v(t,e,o[u],n);else v(t,e,o,n);else t.json||K.call(n,i)||!K.call(e,i)||(t.line=s||t.line,t.position=a||t.position,d(t,"duplicated mapping key")),e[i]=o,delete n[i];return e}function g(t){var e;e=t.input.charCodeAt(t.position),10===e?t.position++:13===e?(t.position++,10===t.input.charCodeAt(t.position)&&t.position++):d(t,"a line break is expected"),t.line+=1,t.lineStart=t.position}function D(t,e,n){for(var o=0,s=t.input.charCodeAt(t.position);0!==s;){for(;i(s);)s=t.input.charCodeAt(++t.position);if(e&&35===s)do{s=t.input.charCodeAt(++t.position)}while(10!==s&&13!==s&&0!==s);if(!r(s))break;for(g(t),s=t.input.charCodeAt(t.position),o++,t.lineIndent=0;32===s;)t.lineIndent++,s=t.input.charCodeAt(++t.position)}return-1!==n&&0!==o&&t.lineIndent<n&&m(t,"deficient indentation"),o}function E(t){var e,n=t.position;return!(45!==(e=t.input.charCodeAt(n))&&46!==e||e!==t.input.charCodeAt(n+1)||e!==t.input.charCodeAt(n+2)||(n+=3,0!==(e=t.input.charCodeAt(n))&&!o(e)))}function A(t,e){1===e?t.result+=" ":e>1&&(t.result+=L.repeat("\n",e-1))}function S(t,e,n){var a,u,c,h,l,p,f,d,m,v=t.kind,x=t.result;if(m=t.input.charCodeAt(t.position),o(m)||s(m)||35===m||38===m||42===m||33===m||124===m||62===m||39===m||34===m||37===m||64===m||96===m)return!1;if((63===m||45===m)&&(u=t.input.charCodeAt(t.position+1),o(u)||n&&s(u)))return!1;for(t.kind="scalar",t.result="",c=h=t.position,l=!1;0!==m;){if(58===m){if(u=t.input.charCodeAt(t.position+1),o(u)||n&&s(u))break}else if(35===m){if(a=t.input.charCodeAt(t.position-1),o(a))break}else{if(t.position===t.lineStart&&E(t)||n&&s(m))break;if(r(m)){if(p=t.line,f=t.lineStart,d=t.lineIndent,D(t,!1,-1),t.lineIndent>=e){l=!0,m=t.input.charCodeAt(t.position);continue}t.position=h,t.line=p,t.lineStart=f,t.lineIndent=d;break}}l&&(y(t,c,h,!1),A(t,t.line-p),c=h=t.position,l=!1),i(m)||(h=t.position+1),m=t.input.charCodeAt(++t.position)}return y(t,c,h,!1),!!t.result||(t.kind=v,t.result=x,!1)}function w(t,e){var n,i,o;if(39!==(n=t.input.charCodeAt(t.position)))return!1;for(t.kind="scalar",t.result="",t.position++,i=o=t.position;0!==(n=t.input.charCodeAt(t.position));)if(39===n){if(y(t,i,t.position,!0),39!==(n=t.input.charCodeAt(++t.position)))return!0;i=t.position,t.position++,o=t.position}else r(n)?(y(t,i,o,!0),A(t,D(t,!1,e)),i=o=t.position):t.position===t.lineStart&&E(t)?d(t,"unexpected end of the document within a single quoted scalar"):(t.position++,o=t.position);d(t,"unexpected end of the stream within a single quoted scalar")}function C(t,e){var n,i,o,s,c,h;if(34!==(h=t.input.charCodeAt(t.position)))return!1;for(t.kind="scalar",t.result="",t.position++,n=i=t.position;0!==(h=t.input.charCodeAt(t.position));){if(34===h)return y(t,n,t.position,!0),t.position++,!0;if(92===h){if(y(t,n,t.position,!0),h=t.input.charCodeAt(++t.position),r(h))D(t,!1,e);else if(h<256&&it[h])t.result+=ot[h],t.position++;else if((c=u(h))>0){for(o=c,s=0;o>0;o--)h=t.input.charCodeAt(++t.position),(c=a(h))>=0?s=(s<<4)+c:d(t,"expected hexadecimal character");t.result+=l(s),t.position++}else d(t,"unknown escape sequence");n=i=t.position}else r(h)?(y(t,n,i,!0),A(t,D(t,!1,e)),n=i=t.position):t.position===t.lineStart&&E(t)?d(t,"unexpected end of the document within a double quoted scalar"):(t.position++,i=t.position)}d(t,"unexpected end of the stream within a double quoted scalar")}function _(t,e){var n,r,i,s,a,u,c,h,l,p,f,m=!0,y=t.tag,v=t.anchor,g={};if(91===(f=t.input.charCodeAt(t.position)))s=93,c=!1,r=[];else{if(123!==f)return!1;s=125,c=!0,r={}}for(null!==t.anchor&&(t.anchorMap[t.anchor]=r),f=t.input.charCodeAt(++t.position);0!==f;){if(D(t,!0,e),(f=t.input.charCodeAt(t.position))===s)return t.position++,t.tag=y,t.anchor=v,t.kind=c?"mapping":"sequence",t.result=r,!0;m||d(t,"missed comma between flow collection entries"),l=h=p=null,a=u=!1,63===f&&(i=t.input.charCodeAt(t.position+1),o(i)&&(a=u=!0,t.position++,D(t,!0,e))),n=t.line,M(t,e,Y,!1,!0),l=t.tag,h=t.result,D(t,!0,e),f=t.input.charCodeAt(t.position),!u&&t.line!==n||58!==f||(a=!0,f=t.input.charCodeAt(++t.position),D(t,!0,e),M(t,e,Y,!1,!0),p=t.result),c?x(t,r,g,l,h,p):a?r.push(x(t,null,g,l,h,p)):r.push(h),D(t,!0,e),f=t.input.charCodeAt(t.position),44===f?(m=!0,f=t.input.charCodeAt(++t.position)):m=!1}d(t,"unexpected end of the stream within a flow collection")}function b(t,e){var n,o,s,a,u=V,h=!1,l=!1,p=e,f=0,m=!1;if(124===(a=t.input.charCodeAt(t.position)))o=!1;else{if(62!==a)return!1;o=!0}for(t.kind="scalar",t.result="";0!==a;)if(43===(a=t.input.charCodeAt(++t.position))||45===a)V===u?u=43===a?Z:$:d(t,"repeat of a chomping mode identifier");else{if(!((s=c(a))>=0))break;0===s?d(t,"bad explicit indentation width of a block scalar; it cannot be less than one"):l?d(t,"repeat of an indentation width identifier"):(p=e+s-1,l=!0)}if(i(a)){do{a=t.input.charCodeAt(++t.position)}while(i(a));if(35===a)do{a=t.input.charCodeAt(++t.position)}while(!r(a)&&0!==a)}for(;0!==a;){for(g(t),t.lineIndent=0,a=t.input.charCodeAt(t.position);(!l||t.lineIndent<p)&&32===a;)t.lineIndent++,a=t.input.charCodeAt(++t.position);if(!l&&t.lineIndent>p&&(p=t.lineIndent),r(a))f++;else{if(t.lineIndent<p){u===Z?t.result+=L.repeat("\n",h?1+f:f):u===V&&h&&(t.result+="\n");break}for(o?i(a)?(m=!0,t.result+=L.repeat("\n",h?1+f:f)):m?(m=!1,t.result+=L.repeat("\n",f+1)):0===f?h&&(t.result+=" "):t.result+=L.repeat("\n",f):t.result+=L.repeat("\n",h?1+f:f),h=!0,l=!0,f=0,n=t.position;!r(a)&&0!==a;)a=t.input.charCodeAt(++t.position);y(t,n,t.position,!1)}}return!0}function F(t,e){var n,r,i,s=t.tag,a=t.anchor,u=[],c=!1;for(null!==t.anchor&&(t.anchorMap[t.anchor]=u),i=t.input.charCodeAt(t.position);0!==i&&45===i&&(r=t.input.charCodeAt(t.position+1),o(r));)if(c=!0,t.position++,D(t,!0,-1)&&t.lineIndent<=e)u.push(null),i=t.input.charCodeAt(t.position);else if(n=t.line,M(t,e,G,!1,!0),u.push(t.result),D(t,!0,-1),i=t.input.charCodeAt(t.position),(t.line===n||t.lineIndent>e)&&0!==i)d(t,"bad indentation of a sequence entry");else if(t.lineIndent<e)break;return!!c&&(t.tag=s,t.anchor=a,t.kind="sequence",t.result=u,!0)}function k(t,e,n){var r,s,a,u,c,h=t.tag,l=t.anchor,p={},f={},m=null,y=null,v=null,g=!1,E=!1;for(null!==t.anchor&&(t.anchorMap[t.anchor]=p),c=t.input.charCodeAt(t.position);0!==c;){if(r=t.input.charCodeAt(t.position+1),a=t.line,u=t.position,63!==c&&58!==c||!o(r)){if(!M(t,n,W,!1,!0))break;if(t.line===a){for(c=t.input.charCodeAt(t.position);i(c);)c=t.input.charCodeAt(++t.position);if(58===c)c=t.input.charCodeAt(++t.position),o(c)||d(t,"a whitespace character is expected after the key-value separator within a block mapping"),g&&(x(t,p,f,m,y,null),m=y=v=null),E=!0,g=!1,s=!1,m=t.tag,y=t.result;else{if(!E)return t.tag=h,t.anchor=l,!0;d(t,"can not read an implicit mapping pair; a colon is missed")}}else{if(!E)return t.tag=h,t.anchor=l,!0;d(t,"can not read a block mapping entry; a multiline key may not be an implicit key")}}else 63===c?(g&&(x(t,p,f,m,y,null),m=y=v=null),E=!0,g=!0,s=!0):g?(g=!1,s=!0):d(t,"incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"),t.position+=1,c=r;if((t.line===a||t.lineIndent>e)&&(M(t,e,H,!0,s)&&(g?y=t.result:v=t.result),g||(x(t,p,f,m,y,v,a,u),m=y=v=null),D(t,!0,-1),c=t.input.charCodeAt(t.position)),t.lineIndent>e&&0!==c)d(t,"bad indentation of a mapping entry");else if(t.lineIndent<e)break}return g&&x(t,p,f,m,y,null),E&&(t.tag=h,t.anchor=l,t.kind="mapping",t.result=p),E}function I(t){var e,n,r,i,s=!1,a=!1;if(33!==(i=t.input.charCodeAt(t.position)))return!1;if(null!==t.tag&&d(t,"duplication of a tag property"),i=t.input.charCodeAt(++t.position),60===i?(s=!0,i=t.input.charCodeAt(++t.position)):33===i?(a=!0,n="!!",i=t.input.charCodeAt(++t.position)):n="!",e=t.position,s){do{i=t.input.charCodeAt(++t.position)}while(0!==i&&62!==i);t.position<t.length?(r=t.input.slice(e,t.position),i=t.input.charCodeAt(++t.position)):d(t,"unexpected end of the stream within a verbatim tag")}else{for(;0!==i&&!o(i);)33===i&&(a?d(t,"tag suffix cannot contain exclamation marks"):(n=t.input.slice(e-1,t.position+1),nt.test(n)||d(t,"named tag handle cannot contain such characters"),a=!0,e=t.position+1)),i=t.input.charCodeAt(++t.position);r=t.input.slice(e,t.position),et.test(r)&&d(t,"tag suffix cannot contain flow indicator characters")}return r&&!rt.test(r)&&d(t,"tag name cannot contain such characters: "+r),s?t.tag=r:K.call(t.tagMap,n)?t.tag=t.tagMap[n]+r:"!"===n?t.tag="!"+r:"!!"===n?t.tag="tag:yaml.org,2002:"+r:d(t,'undeclared tag handle "'+n+'"'),!0}function T(t){var e,n;if(38!==(n=t.input.charCodeAt(t.position)))return!1;for(null!==t.anchor&&d(t,"duplication of an anchor property"),n=t.input.charCodeAt(++t.position),e=t.position;0!==n&&!o(n)&&!s(n);)n=t.input.charCodeAt(++t.position);return t.position===e&&d(t,"name of an anchor node must contain at least one character"),t.anchor=t.input.slice(e,t.position),!0}function B(t){var e,n,r;if(42!==(r=t.input.charCodeAt(t.position)))return!1;for(r=t.input.charCodeAt(++t.position),e=t.position;0!==r&&!o(r)&&!s(r);)r=t.input.charCodeAt(++t.position);return t.position===e&&d(t,"name of an alias node must contain at least one character"),n=t.input.slice(e,t.position),t.anchorMap.hasOwnProperty(n)||d(t,'unidentified alias "'+n+'"'),t.result=t.anchorMap[n],D(t,!0,-1),!0}function M(t,e,n,r,i){var o,s,a,u,c,h,l,p,f=1,m=!1,y=!1;if(null!==t.listener&&t.listener("open",t),t.tag=null,t.anchor=null,t.kind=null,t.result=null,o=s=a=H===n||G===n,r&&D(t,!0,-1)&&(m=!0,t.lineIndent>e?f=1:t.lineIndent===e?f=0:t.lineIndent<e&&(f=-1)),1===f)for(;I(t)||T(t);)D(t,!0,-1)?(m=!0,a=o,t.lineIndent>e?f=1:t.lineIndent===e?f=0:t.lineIndent<e&&(f=-1)):a=!1;if(a&&(a=m||i),1!==f&&H!==n||(l=Y===n||W===n?e:e+1,p=t.position-t.lineStart,1===f?a&&(F(t,p)||k(t,p,l))||_(t,l)?y=!0:(s&&b(t,l)||w(t,l)||C(t,l)?y=!0:B(t)?(y=!0,null===t.tag&&null===t.anchor||d(t,"alias node should not have any properties")):S(t,l,Y===n)&&(y=!0,null===t.tag&&(t.tag="?")),null!==t.anchor&&(t.anchorMap[t.anchor]=t.result)):0===f&&(y=a&&F(t,p))),null!==t.tag&&"!"!==t.tag)if("?"===t.tag){for(u=0,c=t.implicitTypes.length;u<c;u+=1)if(h=t.implicitTypes[u],h.resolve(t.result)){t.result=h.construct(t.result),t.tag=h.tag,null!==t.anchor&&(t.anchorMap[t.anchor]=t.result);break}}else K.call(t.typeMap[t.kind||"fallback"],t.tag)?(h=t.typeMap[t.kind||"fallback"][t.tag],null!==t.result&&h.kind!==t.kind&&d(t,"unacceptable node kind for !<"+t.tag+'> tag; it should be "'+h.kind+'", not "'+t.kind+'"'),h.resolve(t.result)?(t.result=h.construct(t.result),null!==t.anchor&&(t.anchorMap[t.anchor]=t.result)):d(t,"cannot resolve a node with !<"+t.tag+"> explicit tag")):d(t,"unknown tag !<"+t.tag+">");return null!==t.listener&&t.listener("close",t),null!==t.tag||null!==t.anchor||y}function P(t){var e,n,s,a,u=t.position,c=!1;for(t.version=null,t.checkLineBreaks=t.legacy,t.tagMap={},t.anchorMap={};0!==(a=t.input.charCodeAt(t.position))&&(D(t,!0,-1),a=t.input.charCodeAt(t.position),!(t.lineIndent>0||37!==a));){for(c=!0,a=t.input.charCodeAt(++t.position),e=t.position;0!==a&&!o(a);)a=t.input.charCodeAt(++t.position);for(n=t.input.slice(e,t.position),s=[],n.length<1&&d(t,"directive name must not be less than one character in length");0!==a;){for(;i(a);)a=t.input.charCodeAt(++t.position);if(35===a){do{a=t.input.charCodeAt(++t.position)}while(0!==a&&!r(a));break}if(r(a))break;for(e=t.position;0!==a&&!o(a);)a=t.input.charCodeAt(++t.position);s.push(t.input.slice(e,t.position))}0!==a&&g(t),K.call(at,n)?at[n](t,n,s):m(t,'unknown document directive "'+n+'"')}if(D(t,!0,-1),0===t.lineIndent&&45===t.input.charCodeAt(t.position)&&45===t.input.charCodeAt(t.position+1)&&45===t.input.charCodeAt(t.position+2)?(t.position+=3,D(t,!0,-1)):c&&d(t,"directives end mark is expected"),M(t,t.lineIndent-1,H,!1,!0),D(t,!0,-1),t.checkLineBreaks&&tt.test(t.input.slice(u,t.position))&&m(t,"non-ASCII line breaks are interpreted as content"),t.documents.push(t.result),t.position===t.lineStart&&E(t))return void(46===t.input.charCodeAt(t.position)&&(t.position+=3,D(t,!0,-1)));t.position<t.length-1&&d(t,"end of the stream or a document separator is expected")}function N(t,e){t=String(t),e=e||{},0!==t.length&&(10!==t.charCodeAt(t.length-1)&&13!==t.charCodeAt(t.length-1)&&(t+="\n"),65279===t.charCodeAt(0)&&(t=t.slice(1)));var n=new p(t,e);for(n.input+="\0";32===n.input.charCodeAt(n.position);)n.lineIndent+=1,n.position+=1;for(;n.position<n.length-1;)P(n);return n.documents}function O(t,e,n){var r,i,o=N(t,n);if("function"!=typeof e)return o;for(r=0,i=o.length;r<i;r+=1)e(o[r])}function R(t,e){var n=N(t,e);if(0!==n.length){if(1===n.length)return n[0];throw new z("expected a single document in the stream, but found more")}}function U(t,e,n){if("function"!=typeof e)return O(t,L.extend({schema:X},n));O(t,e,L.extend({schema:X},n))}function j(t,e){return R(t,L.extend({schema:X},e))}for(var L=n(23),z=n(33),J=n(239),X=n(34),q=n(47),K=Object.prototype.hasOwnProperty,Y=1,W=2,G=3,H=4,V=1,$=2,Z=3,Q=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,tt=/[\x85\u2028\u2029]/,et=/[,\[\]\{\}]/,nt=/^(?:!|!!|![a-z\-]+!)$/i,rt=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i,it=new Array(256),ot=new Array(256),st=0;st<256;st++)it[st]=h(st)?1:0,ot[st]=h(st);var at={YAML:function(t,e,n){var r,i,o;null!==t.version&&d(t,"duplication of %YAML directive"),1!==n.length&&d(t,"YAML directive accepts exactly one argument"),r=/^([0-9]+)\.([0-9]+)$/.exec(n[0]),null===r&&d(t,"ill-formed argument of the YAML directive"),i=parseInt(r[1],10),o=parseInt(r[2],10),1!==i&&d(t,"unacceptable YAML version of the document"),t.version=n[0],t.checkLineBreaks=o<2,1!==o&&2!==o&&m(t,"unsupported YAML version of the document")},TAG:function(t,e,n){var r,i;2!==n.length&&d(t,"TAG directive accepts exactly two arguments"),r=n[0],i=n[1],nt.test(r)||d(t,"ill-formed tag handle (first argument) of the TAG directive"),K.call(t.tagMap,r)&&d(t,'there is a previously declared suffix for "'+r+'" tag handle'),rt.test(i)||d(t,"ill-formed tag prefix (second argument) of the TAG directive"),t.tagMap[r]=i}};t.exports.loadAll=O,t.exports.load=R,t.exports.safeLoadAll=U,t.exports.safeLoad=j},function(t,e,n){"use strict";function r(t,e,n,r,i){this.name=t,this.buffer=e,this.position=n,this.line=r,this.column=i}var i=n(23);r.prototype.getSnippet=function(t,e){var n,r,o,s,a;if(!this.buffer)return null;for(t=t||4,e=e||75,n="",r=this.position;r>0&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(r-1));)if(r-=1,this.position-r>e/2-1){n=" ... ",r+=5;break}for(o="",s=this.position;s<this.buffer.length&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(s));)if((s+=1)-this.position>e/2-1){o=" ... ",s-=5;break}return a=this.buffer.slice(r,s),i.repeat(" ",t)+n+a+o+"\n"+i.repeat(" ",t+this.position-r+n.length)+"^"},r.prototype.toString=function(t){var e,n="";return this.name&&(n+='in "'+this.name+'" '),n+="at line "+(this.line+1)+", column "+(this.column+1),t||(e=this.getSnippet())&&(n+=":\n"+e),n},t.exports=r},function(t,e,n){"use strict";function r(t){if(null===t)return!1;var e,n,r=0,i=t.length,o=c;for(n=0;n<i;n++)if(!((e=o.indexOf(t.charAt(n)))>64)){if(e<0)return!1;r+=6}return r%8==0}function i(t){var e,n,r=t.replace(/[\r\n=]/g,""),i=r.length,o=c,s=0,u=[];for(e=0;e<i;e++)e%4==0&&e&&(u.push(s>>16&255),u.push(s>>8&255),u.push(255&s)),s=s<<6|o.indexOf(r.charAt(e));return n=i%4*6,0===n?(u.push(s>>16&255),u.push(s>>8&255),u.push(255&s)):18===n?(u.push(s>>10&255),u.push(s>>2&255)):12===n&&u.push(s>>4&255),a?a.from?a.from(u):new a(u):u}function o(t){var e,n,r="",i=0,o=t.length,s=c;for(e=0;e<o;e++)e%3==0&&e&&(r+=s[i>>18&63],r+=s[i>>12&63],r+=s[i>>6&63],r+=s[63&i]),i=(i<<8)+t[e];return n=o%3,0===n?(r+=s[i>>18&63],r+=s[i>>12&63],r+=s[i>>6&63],r+=s[63&i]):2===n?(r+=s[i>>10&63],r+=s[i>>4&63],r+=s[i<<2&63],r+=s[64]):1===n&&(r+=s[i>>2&63],r+=s[i<<4&63],r+=s[64],r+=s[64]),r}function s(t){return a&&a.isBuffer(t)}var a;try{a=n(135).Buffer}catch(t){}var u=n(0),c="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r";t.exports=new u("tag:yaml.org,2002:binary",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o})},function(t,e,n){"use strict";function r(t){if(null===t)return!1;var e=t.length;return 4===e&&("true"===t||"True"===t||"TRUE"===t)||5===e&&("false"===t||"False"===t||"FALSE"===t)}function i(t){return"true"===t||"True"===t||"TRUE"===t}function o(t){return"[object Boolean]"===Object.prototype.toString.call(t)}var s=n(0);t.exports=new s("tag:yaml.org,2002:bool",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:{lowercase:function(t){return t?"true":"false"},uppercase:function(t){return t?"TRUE":"FALSE"},camelcase:function(t){return t?"True":"False"}},defaultStyle:"lowercase"})},function(t,e,n){"use strict";function r(t){return null!==t&&!(!c.test(t)||"_"===t[t.length-1])}function i(t){var e,n,r,i;return e=t.replace(/_/g,"").toLowerCase(),n="-"===e[0]?-1:1,i=[],"+-".indexOf(e[0])>=0&&(e=e.slice(1)),".inf"===e?1===n?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:".nan"===e?NaN:e.indexOf(":")>=0?(e.split(":").forEach(function(t){i.unshift(parseFloat(t,10))}),e=0,r=1,i.forEach(function(t){e+=t*r,r*=60}),n*e):n*parseFloat(e,10)}function o(t,e){var n;if(isNaN(t))switch(e){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===t)switch(e){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===t)switch(e){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(a.isNegativeZero(t))return"-0.0";return n=t.toString(10),h.test(n)?n.replace("e",".e"):n}function s(t){return"[object Number]"===Object.prototype.toString.call(t)&&(t%1!=0||a.isNegativeZero(t))}var a=n(23),u=n(0),c=new RegExp("^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$"),h=/^[-+]?[0-9]+e/;t.exports=new u("tag:yaml.org,2002:float",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o,defaultStyle:"lowercase"})},function(t,e,n){"use strict";function r(t){return 48<=t&&t<=57||65<=t&&t<=70||97<=t&&t<=102}function i(t){return 48<=t&&t<=55}function o(t){return 48<=t&&t<=57}function s(t){if(null===t)return!1;var e,n=t.length,s=0,a=!1;if(!n)return!1;if(e=t[s],"-"!==e&&"+"!==e||(e=t[++s]),"0"===e){if(s+1===n)return!0;if("b"===(e=t[++s])){for(s++;s<n;s++)if("_"!==(e=t[s])){if("0"!==e&&"1"!==e)return!1;a=!0}return a&&"_"!==e}if("x"===e){for(s++;s<n;s++)if("_"!==(e=t[s])){if(!r(t.charCodeAt(s)))return!1;a=!0}return a&&"_"!==e}for(;s<n;s++)if("_"!==(e=t[s])){if(!i(t.charCodeAt(s)))return!1;a=!0}return a&&"_"!==e}if("_"===e)return!1;for(;s<n;s++)if("_"!==(e=t[s])){if(":"===e)break;if(!o(t.charCodeAt(s)))return!1;a=!0}return!(!a||"_"===e)&&(":"!==e||/^(:[0-5]?[0-9])+$/.test(t.slice(s)))}function a(t){var e,n,r=t,i=1,o=[];return-1!==r.indexOf("_")&&(r=r.replace(/_/g,"")),e=r[0],"-"!==e&&"+"!==e||("-"===e&&(i=-1),r=r.slice(1),e=r[0]),"0"===r?0:"0"===e?"b"===r[1]?i*parseInt(r.slice(2),2):"x"===r[1]?i*parseInt(r,16):i*parseInt(r,8):-1!==r.indexOf(":")?(r.split(":").forEach(function(t){o.unshift(parseInt(t,10))}),r=0,n=1,o.forEach(function(t){r+=t*n,n*=60}),i*r):i*parseInt(r,10)}function u(t){return"[object Number]"===Object.prototype.toString.call(t)&&t%1==0&&!c.isNegativeZero(t)}var c=n(23),h=n(0);t.exports=new h("tag:yaml.org,2002:int",{kind:"scalar",resolve:s,construct:a,predicate:u,represent:{binary:function(t){return"0b"+t.toString(2)},octal:function(t){return"0"+t.toString(8)},decimal:function(t){return t.toString(10)},hexadecimal:function(t){return"0x"+t.toString(16).toUpperCase()}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}})},function(t,e,n){"use strict";function r(t){if(null===t)return!1;try{var e="("+t+")",n=a.parse(e,{range:!0});return"Program"===n.type&&1===n.body.length&&"ExpressionStatement"===n.body[0].type&&"FunctionExpression"===n.body[0].expression.type}catch(t){return!1}}function i(t){var e,n="("+t+")",r=a.parse(n,{range:!0}),i=[];if("Program"!==r.type||1!==r.body.length||"ExpressionStatement"!==r.body[0].type||"FunctionExpression"!==r.body[0].expression.type)throw new Error("Failed to resolve function");return r.body[0].expression.params.forEach(function(t){i.push(t.name)}),e=r.body[0].expression.body.range,new Function(i,n.slice(e[0]+1,e[1]-1))}function o(t){return t.toString()}function s(t){return"[object Function]"===Object.prototype.toString.call(t)}var a;try{a=n(231)}catch(t){"undefined"!=typeof window&&(a=window.esprima)}var u=n(0);t.exports=new u("tag:yaml.org,2002:js/function",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o})},function(t,e,n){"use strict";function r(t){if(null===t)return!1;if(0===t.length)return!1;var e=t,n=/\/([gim]*)$/.exec(t),r="";if("/"===e[0]){if(n&&(r=n[1]),r.length>3)return!1;if("/"!==e[e.length-r.length-1])return!1}return!0}function i(t){var e=t,n=/\/([gim]*)$/.exec(t),r="";return"/"===e[0]&&(n&&(r=n[1]),e=e.slice(1,e.length-r.length-1)),new RegExp(e,r)}function o(t){var e="/"+t.source+"/";return t.global&&(e+="g"),t.multiline&&(e+="m"),t.ignoreCase&&(e+="i"),e}function s(t){return"[object RegExp]"===Object.prototype.toString.call(t)}var a=n(0);t.exports=new a("tag:yaml.org,2002:js/regexp",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o})},function(t,e,n){"use strict";function r(){return!0}function i(){}function o(){return""}function s(t){return void 0===t}var a=n(0);t.exports=new a("tag:yaml.org,2002:js/undefined",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o})},function(t,e,n){"use strict";var r=n(0);t.exports=new r("tag:yaml.org,2002:map",{kind:"mapping",construct:function(t){return null!==t?t:{}}})},function(t,e,n){"use strict";function r(t){return"<<"===t||null===t}var i=n(0);t.exports=new i("tag:yaml.org,2002:merge",{kind:"scalar",resolve:r})},function(t,e,n){"use strict";function r(t){if(null===t)return!0;var e=t.length;return 1===e&&"~"===t||4===e&&("null"===t||"Null"===t||"NULL"===t)}function i(){return null}function o(t){return null===t}var s=n(0);t.exports=new s("tag:yaml.org,2002:null",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"}},defaultStyle:"lowercase"})},function(t,e,n){"use strict";function r(t){if(null===t)return!0;var e,n,r,i,o,u=[],c=t;for(e=0,n=c.length;e<n;e+=1){if(r=c[e],o=!1,"[object Object]"!==a.call(r))return!1;for(i in r)if(s.call(r,i)){if(o)return!1;o=!0}if(!o)return!1;if(-1!==u.indexOf(i))return!1;u.push(i)}return!0}function i(t){return null!==t?t:[]}var o=n(0),s=Object.prototype.hasOwnProperty,a=Object.prototype.toString;t.exports=new o("tag:yaml.org,2002:omap",{kind:"sequence",resolve:r,construct:i})},function(t,e,n){"use strict";function r(t){if(null===t)return!0;var e,n,r,i,o,a=t;for(o=new Array(a.length),e=0,n=a.length;e<n;e+=1){if(r=a[e],"[object Object]"!==s.call(r))return!1;if(i=Object.keys(r),1!==i.length)return!1;o[e]=[i[0],r[i[0]]]}return!0}function i(t){if(null===t)return[];var e,n,r,i,o,s=t;for(o=new Array(s.length),e=0,n=s.length;e<n;e+=1)r=s[e],i=Object.keys(r),o[e]=[i[0],r[i[0]]];return o}var o=n(0),s=Object.prototype.toString;t.exports=new o("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:r,construct:i})},function(t,e,n){"use strict";var r=n(0);t.exports=new r("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(t){return null!==t?t:[]}})},function(t,e,n){"use strict";function r(t){if(null===t)return!0;var e,n=t;for(e in n)if(s.call(n,e)&&null!==n[e])return!1;return!0}function i(t){return null!==t?t:{}}var o=n(0),s=Object.prototype.hasOwnProperty;t.exports=new o("tag:yaml.org,2002:set",{kind:"mapping",resolve:r,construct:i})},function(t,e,n){"use strict";var r=n(0);t.exports=new r("tag:yaml.org,2002:str",{kind:"scalar",construct:function(t){return null!==t?t:""}})},function(t,e,n){"use strict";function r(t){return null!==t&&(null!==a.exec(t)||null!==u.exec(t))}function i(t){var e,n,r,i,o,s,c,h,l,p,f=0,d=null;if(e=a.exec(t),null===e&&(e=u.exec(t)),null===e)throw new Error("Date resolve error");if(n=+e[1],r=+e[2]-1,i=+e[3],!e[4])return new Date(Date.UTC(n,r,i));if(o=+e[4],s=+e[5],c=+e[6],e[7]){for(f=e[7].slice(0,3);f.length<3;)f+="0";f=+f}return e[9]&&(h=+e[10],l=+(e[11]||0),d=6e4*(60*h+l),"-"===e[9]&&(d=-d)),p=new Date(Date.UTC(n,r,i,o,s,c,f)),d&&p.setTime(p.getTime()-d),p}function o(t){return t.toISOString()}var s=n(0),a=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),u=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");t.exports=new s("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:r,construct:i,instanceOf:Date,represent:o})},function(t,e,n){"use strict";function r(t,e,n,r,i){}t.exports=r},function(t,e,n){"use strict";var r=n(259);t.exports=function(t){return r(t,!1)}},function(t,e,n){"use strict";var r=n(45),i=n(15),o=n(113);t.exports=function(){function t(t,e,n,r,s,a){a!==o&&i(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types")}function e(){return t}t.isRequired=t;var n={array:t,bool:t,func:t,number:t,object:t,string:t,symbol:t,any:t,arrayOf:e,element:t,instanceOf:e,node:t,objectOf:e,oneOf:e,oneOfType:e,shape:e,exact:e};return n.checkPropTypes=r,n.PropTypes=n,n}},function(t,e,n){"use strict";var r=n(45),i=n(15),o=n(46),s=n(35),a=n(113),u=n(256);t.exports=function(t,e){function n(t){var e=t&&(_&&t[_]||t[b]);if("function"==typeof e)return e}function c(t,e){return t===e?0!==t||1/t==1/e:t!==t&&e!==e}function h(t){this.message=t,this.stack=""}function l(t){function n(n,r,o,s,u,c,l){if(s=s||F,c=c||o,l!==a)if(e)i(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use `PropTypes.checkPropTypes()` to call them. Read more at http://fb.me/use-check-prop-types");else;return null==r[o]?n?new h(null===r[o]?"The "+u+" `"+c+"` is marked as required in `"+s+"`, but its value is `null`.":"The "+u+" `"+c+"` is marked as required in `"+s+"`, but its value is `undefined`."):null:t(r,o,s,u,c)}var r=n.bind(null,!1);return r.isRequired=n.bind(null,!0),r}function p(t){function e(e,n,r,i,o,s){var a=e[n];if(A(a)!==t)return new h("Invalid "+i+" `"+o+"` of type `"+S(a)+"` supplied to `"+r+"`, expected `"+t+"`.");return null}return l(e)}function f(t){function e(e,n,r,i,o){if("function"!=typeof t)return new h("Property `"+o+"` of component `"+r+"` has invalid PropType notation inside arrayOf.");var s=e[n];if(!Array.isArray(s)){return new h("Invalid "+i+" `"+o+"` of type `"+A(s)+"` supplied to `"+r+"`, expected an array.")}for(var u=0;u<s.length;u++){var c=t(s,u,r,i,o+"["+u+"]",a);if(c instanceof Error)return c}return null}return l(e)}function d(t){function e(e,n,r,i,o){if(!(e[n]instanceof t)){var s=t.name||F;return new h("Invalid "+i+" `"+o+"` of type `"+C(e[n])+"` supplied to `"+r+"`, expected instance of `"+s+"`.")}return null}return l(e)}function m(t){function e(e,n,r,i,o){for(var s=e[n],a=0;a<t.length;a++)if(c(s,t[a]))return null;return new h("Invalid "+i+" `"+o+"` of value `"+s+"` supplied to `"+r+"`, expected one of "+JSON.stringify(t)+".")}return Array.isArray(t)?l(e):r.thatReturnsNull}function y(t){function e(e,n,r,i,o){if("function"!=typeof t)return new h("Property `"+o+"` of component `"+r+"` has invalid PropType notation inside objectOf.");var s=e[n],u=A(s);if("object"!==u)return new h("Invalid "+i+" `"+o+"` of type `"+u+"` supplied to `"+r+"`, expected an object.");for(var c in s)if(s.hasOwnProperty(c)){var l=t(s,c,r,i,o+"."+c,a);if(l instanceof Error)return l}return null}return l(e)}function v(t){function e(e,n,r,i,o){for(var s=0;s<t.length;s++){if(null==(0,t[s])(e,n,r,i,o,a))return null}return new h("Invalid "+i+" `"+o+"` supplied to `"+r+"`.")}if(!Array.isArray(t))return r.thatReturnsNull;for(var n=0;n<t.length;n++){var i=t[n];if("function"!=typeof i)return o(!1,"Invalid argument supplied to oneOfType. Expected an array of check functions, but received %s at index %s.",w(i),n),r.thatReturnsNull}return l(e)}function x(t){function e(e,n,r,i,o){var s=e[n],u=A(s);if("object"!==u)return new h("Invalid "+i+" `"+o+"` of type `"+u+"` supplied to `"+r+"`, expected `object`.");for(var c in t){var l=t[c];if(l){var p=l(s,c,r,i,o+"."+c,a);if(p)return p}}return null}return l(e)}function g(t){function e(e,n,r,i,o){var u=e[n],c=A(u);if("object"!==c)return new h("Invalid "+i+" `"+o+"` of type `"+c+"` supplied to `"+r+"`, expected `object`.");var l=s({},e[n],t);for(var p in l){var f=t[p];if(!f)return new h("Invalid "+i+" `"+o+"` key `"+p+"` supplied to `"+r+"`.\nBad object: "+JSON.stringify(e[n],null,"  ")+"\nValid keys: "+JSON.stringify(Object.keys(t),null,"  "));var d=f(u,p,r,i,o+"."+p,a);if(d)return d}return null}return l(e)}function D(e){switch(typeof e){case"number":case"string":case"undefined":return!0;case"boolean":return!e;case"object":if(Array.isArray(e))return e.every(D);if(null===e||t(e))return!0;var r=n(e);if(!r)return!1;var i,o=r.call(e);if(r!==e.entries){for(;!(i=o.next()).done;)if(!D(i.value))return!1}else for(;!(i=o.next()).done;){var s=i.value;if(s&&!D(s[1]))return!1}return!0;default:return!1}}function E(t,e){return"symbol"===t||("Symbol"===e["@@toStringTag"]||"function"==typeof Symbol&&e instanceof Symbol)}function A(t){var e=typeof t;return Array.isArray(t)?"array":t instanceof RegExp?"object":E(e,t)?"symbol":e}function S(t){if(void 0===t||null===t)return""+t;var e=A(t);if("object"===e){if(t instanceof Date)return"date";if(t instanceof RegExp)return"regexp"}return e}function w(t){var e=S(t);switch(e){case"array":case"object":return"an "+e;case"boolean":case"date":case"regexp":return"a "+e;default:return e}}function C(t){return t.constructor&&t.constructor.name?t.constructor.name:F}var _="function"==typeof Symbol&&Symbol.iterator,b="@@iterator",F="<<anonymous>>",k={array:p("array"),bool:p("boolean"),func:p("function"),number:p("number"),object:p("object"),string:p("string"),symbol:p("symbol"),any:function(){return l(r.thatReturnsNull)}(),arrayOf:f,element:function(){function e(e,n,r,i,o){var s=e[n];if(!t(s)){return new h("Invalid "+i+" `"+o+"` of type `"+A(s)+"` supplied to `"+r+"`, expected a single ReactElement.")}return null}return l(e)}(),instanceOf:d,node:function(){function t(t,e,n,r,i){return D(t[e])?null:new h("Invalid "+r+" `"+i+"` supplied to `"+n+"`, expected a ReactNode.")}return l(t)}(),objectOf:y,oneOf:m,oneOfType:v,shape:x,exact:g};return h.prototype=Error.prototype,k.checkPropTypes=u,k.PropTypes=k,k}},function(t,e){t.exports='---\nurl: "http://petstore.swagger.io/v2/swagger.json"\ndom_id: "#swagger-ui"\nvalidatorUrl: "https://online.swagger.io/validator"\noauth2RedirectUrl: "http://localhost:3200/oauth2-redirect.html"\n'},function(t,e,n){"use strict";function r(t){var e={"=":"=0",":":"=2"};return"$"+(""+t).replace(/[=:]/g,function(t){return e[t]})}function i(t){var e=/(=0|=2)/g,n={"=0":"=","=2":":"};return(""+("."===t[0]&&"$"===t[1]?t.substring(2):t.substring(1))).replace(e,function(t){return n[t]})}var o={escape:r,unescape:i};t.exports=o},function(t,e,n){"use strict";var r=n(48),i=(n(15),function(t){var e=this;if(e.instancePool.length){var n=e.instancePool.pop();return e.call(n,t),n}return new e(t)}),o=function(t,e){var n=this;if(n.instancePool.length){var r=n.instancePool.pop();return n.call(r,t,e),r}return new n(t,e)},s=function(t,e,n){var r=this;if(r.instancePool.length){var i=r.instancePool.pop();return r.call(i,t,e,n),i}return new r(t,e,n)},a=function(t,e,n,r){var i=this;if(i.instancePool.length){var o=i.instancePool.pop();return i.call(o,t,e,n,r),o}return new i(t,e,n,r)},u=function(t){var e=this;t instanceof e||r("25"),t.destructor(),e.instancePool.length<e.poolSize&&e.instancePool.push(t)},c=i,h=function(t,e){var n=t;return n.instancePool=[],n.getPooled=e||c,n.poolSize||(n.poolSize=10),n.release=u,n},l={addPoolingTo:h,oneArgumentPooler:i,twoArgumentPooler:o,threeArgumentPooler:s,fourArgumentPooler:a};t.exports=l},function(t,e,n){"use strict";var r=n(35),i=n(114),o=n(264),s=n(265),a=n(25),u=n(266),c=n(267),h=n(268),l=n(271),p=a.createElement,f=a.createFactory,d=a.cloneElement,m=r,y=function(t){return t},v={Children:{map:o.map,forEach:o.forEach,count:o.count,toArray:o.toArray,only:l},Component:i.Component,PureComponent:i.PureComponent,createElement:p,cloneElement:d,isValidElement:a.isValidElement,PropTypes:u,createClass:h,createFactory:f,createMixin:y,DOM:s,version:c,__spread:m};t.exports=v},function(t,e,n){"use strict";function r(t){return(""+t).replace(D,"$&/")}function i(t,e){this.func=t,this.context=e,this.count=0}function o(t,e,n){var r=t.func,i=t.context;r.call(i,e,t.count++)}function s(t,e,n){if(null==t)return t;var r=i.getPooled(e,n);v(t,o,r),i.release(r)}function a(t,e,n,r){this.result=t,this.keyPrefix=e,this.func=n,this.context=r,this.count=0}function u(t,e,n){var i=t.result,o=t.keyPrefix,s=t.func,a=t.context,u=s.call(a,e,t.count++);Array.isArray(u)?c(u,i,n,y.thatReturnsArgument):null!=u&&(m.isValidElement(u)&&(u=m.cloneAndReplaceKey(u,o+(!u.key||e&&e.key===u.key?"":r(u.key)+"/")+n)),i.push(u))}function c(t,e,n,i,o){var s="";null!=n&&(s=r(n)+"/");var c=a.getPooled(e,s,i,o);v(t,u,c),a.release(c)}function h(t,e,n){if(null==t)return t;var r=[];return c(t,r,null,e,n),r}function l(t,e,n){return null}function p(t,e){return v(t,l,null)}function f(t){var e=[];return c(t,e,null,y.thatReturnsArgument),e}var d=n(262),m=n(25),y=n(45),v=n(272),x=d.twoArgumentPooler,g=d.fourArgumentPooler,D=/\/+/g;i.prototype.destructor=function(){this.func=null,this.context=null,this.count=0},d.addPoolingTo(i,x),a.prototype.destructor=function(){this.result=null,this.keyPrefix=null,this.func=null,this.context=null,this.count=0},d.addPoolingTo(a,g);var E={forEach:s,map:h,mapIntoWithKeyPrefixInternal:c,count:p,toArray:f};t.exports=E},function(t,e,n){"use strict";var r=n(25),i=r.createFactory,o={a:i("a"),abbr:i("abbr"),address:i("address"),area:i("area"),article:i("article"),aside:i("aside"),audio:i("audio"),b:i("b"),base:i("base"),bdi:i("bdi"),bdo:i("bdo"),big:i("big"),blockquote:i("blockquote"),body:i("body"),br:i("br"),button:i("button"),canvas:i("canvas"),caption:i("caption"),cite:i("cite"),code:i("code"),col:i("col"),colgroup:i("colgroup"),data:i("data"),datalist:i("datalist"),dd:i("dd"),del:i("del"),details:i("details"),dfn:i("dfn"),dialog:i("dialog"),div:i("div"),dl:i("dl"),dt:i("dt"),em:i("em"),embed:i("embed"),fieldset:i("fieldset"),figcaption:i("figcaption"),figure:i("figure"),footer:i("footer"),form:i("form"),h1:i("h1"),h2:i("h2"),h3:i("h3"),h4:i("h4"),h5:i("h5"),h6:i("h6"),head:i("head"),header:i("header"),hgroup:i("hgroup"),hr:i("hr"),html:i("html"),i:i("i"),iframe:i("iframe"),img:i("img"),input:i("input"),ins:i("ins"),kbd:i("kbd"),keygen:i("keygen"),label:i("label"),legend:i("legend"),li:i("li"),link:i("link"),main:i("main"),map:i("map"),mark:i("mark"),menu:i("menu"),menuitem:i("menuitem"),meta:i("meta"),meter:i("meter"),nav:i("nav"),noscript:i("noscript"),object:i("object"),ol:i("ol"),optgroup:i("optgroup"),option:i("option"),output:i("output"),p:i("p"),param:i("param"),picture:i("picture"),pre:i("pre"),progress:i("progress"),q:i("q"),rp:i("rp"),rt:i("rt"),ruby:i("ruby"),s:i("s"),samp:i("samp"),script:i("script"),section:i("section"),select:i("select"),small:i("small"),source:i("source"),span:i("span"),strong:i("strong"),style:i("style"),sub:i("sub"),summary:i("summary"),sup:i("sup"),table:i("table"),tbody:i("tbody"),td:i("td"),textarea:i("textarea"),tfoot:i("tfoot"),th:i("th"),thead:i("thead"),time:i("time"),title:i("title"),tr:i("tr"),track:i("track"),u:i("u"),ul:i("ul"),var:i("var"),video:i("video"),wbr:i("wbr"),circle:i("circle"),clipPath:i("clipPath"),defs:i("defs"),ellipse:i("ellipse"),g:i("g"),image:i("image"),line:i("line"),linearGradient:i("linearGradient"),mask:i("mask"),path:i("path"),pattern:i("pattern"),polygon:i("polygon"),polyline:i("polyline"),radialGradient:i("radialGradient"),rect:i("rect"),stop:i("stop"),svg:i("svg"),text:i("text"),tspan:i("tspan")};t.exports=o},function(t,e,n){"use strict";var r=n(25),i=r.isValidElement,o=n(257);t.exports=o(i)},function(t,e,n){"use strict";t.exports="15.6.2"},function(t,e,n){"use strict";var r=n(114),i=r.Component,o=n(25),s=o.isValidElement,a=n(117),u=n(230);t.exports=u(i,s,a)},function(t,e,n){"use strict";function r(t){var e=t&&(i&&t[i]||t[o]);if("function"==typeof e)return e}var i="function"==typeof Symbol&&Symbol.iterator,o="@@iterator";t.exports=r},function(t,e,n){"use strict";var r=function(){};t.exports=r},function(t,e,n){"use strict";function r(t){return o.isValidElement(t)||i("143"),t}var i=n(48),o=n(25);n(15);t.exports=r},function(t,e,n){"use strict";function r(t,e){return t&&"object"==typeof t&&null!=t.key?c.escape(t.key):e.toString(36)}function i(t,e,n,o){var p=typeof t;if("undefined"!==p&&"boolean"!==p||(t=null),null===t||"string"===p||"number"===p||"object"===p&&t.$$typeof===a)return n(o,t,""===e?h+r(t,0):e),1;var f,d,m=0,y=""===e?h:e+l;if(Array.isArray(t))for(var v=0;v<t.length;v++)f=t[v],d=y+r(f,v),m+=i(f,d,n,o);else{var x=u(t);if(x){var g,D=x.call(t);if(x!==t.entries)for(var E=0;!(g=D.next()).done;)f=g.value,d=y+r(f,E++),m+=i(f,d,n,o);else for(;!(g=D.next()).done;){var A=g.value;A&&(f=A[1],d=y+c.escape(A[0])+l+r(f,0),m+=i(f,d,n,o))}}else if("object"===p){var S="",w=String(t);s("31","[object Object]"===w?"object with keys {"+Object.keys(t).join(", ")+"}":w,S)}}return m}function o(t,e,n){return null==t?0:i(t,"",e,n)}var s=n(48),a=(n(115),n(116)),u=n(269),c=(n(15),n(261)),h=(n(46),"."),l=":";t.exports=o},function(t,e){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAMAAAAM7l6QAAAAYFBMVEUAAABUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwB0lzB/n0BfhxBpjyC0x4////+qv4CJp1D09++ft3C/z5/K16/U379UfwDf58/q79+Ur2D2RCk9AAAAHXRSTlMAEEAwn9//z3Agv4/vYID/////////////////UMeji1kAAAD8SURBVHgBlZMFAoQwDATRxbXB7f+vPKnlXAZn6k2cf3A9z/PfOC8IIYni5FmmABM8FMhwT17c9hnhiZL1CwvEL1tmPD0qSKq6gaStW/kMXanVmAVRDUlH1OvuuTINo6k90Sxf8qsOtF6g4ff1osP3OnMcV7d4pzdIUtu1oA4V0DZoKmxmlEYvtDUjjS3tmKmqB+pYy8pD1VPf7jPE0I40HHcaBwnue6fGzgyS5tXIU96PV7rkDWHNLV0DK4FkoKmFpN5oUnvi8KoeA2/JXsmXQuokx0siR1G8tLkN6eB9sLwJp/yymcyaP/TrP+RPmbMMixcJVgTR1aUZ93oGXsgXQAaG6EwAAAAASUVORK5CYII="},function(t,e){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(t){"object"==typeof window&&(n=window)}t.exports=n},function(t,e,n){n(120),t.exports=n(121)}])});
--//# sourceMappingURL=swagger-ui-standalone-preset.js.map
-\ No newline at end of file
-diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-standalone-preset.min.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-standalone-preset.min.js
-new file mode 100644
-index 00000000000..cd5a1d08599
---- /dev/null
-+++ b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-standalone-preset.min.js
-@@ -0,0 +1,13 @@
-+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.SwaggerUIStandalonePreset=e():t.SwaggerUIStandalonePreset=e()}(this,function(){return function(t){function e(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,e),i.l=!0,i.exports}var n={};return e.m=t,e.c=n,e.i=function(t){return t},e.d=function(t,n,r){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:r})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="/dist",e(e.s=275)}([function(t,e,n){"use strict";function r(t){var e={};return null!==t&&Object.keys(t).forEach(function(n){t[n].forEach(function(t){e[String(t)]=n})}),e}function i(t,e){if(e=e||{},Object.keys(e).forEach(function(e){if(-1===s.indexOf(e))throw new o('Unknown option "'+e+'" is met in definition of "'+t+'" YAML type.')}),this.tag=t,this.kind=e.kind||null,this.resolve=e.resolve||function(){return!0},this.construct=e.construct||function(t){return t},this.instanceOf=e.instanceOf||null,this.predicate=e.predicate||null,this.represent=e.represent||null,this.defaultStyle=e.defaultStyle||null,this.styleAliases=r(e.styleAliases||null),-1===a.indexOf(this.kind))throw new o('Unknown kind "'+this.kind+'" is specified for "'+t+'" YAML type.')}var o=n(33),s=["kind","resolve","construct","instanceOf","predicate","represent","defaultStyle","styleAliases"],a=["scalar","sequence","mapping"];t.exports=i},function(t,e,n){var r=n(103)("wks"),i=n(70),o=n(4).Symbol,s="function"==typeof o;(t.exports=function(t){return r[t]||(r[t]=s&&o[t]||(s?o:i)("Symbol."+t))}).store=r},function(t,e,n){var r=n(4),i=n(13),o=n(14),s=n(22),a=n(40),u=function(t,e,n){var c,h,l,p,f=t&u.F,d=t&u.G,m=t&u.S,y=t&u.P,v=t&u.B,x=d?r:m?r[e]||(r[e]={}):(r[e]||{}).prototype,g=d?i:i[e]||(i[e]={}),D=g.prototype||(g.prototype={});d&&(n=e);for(c in n)h=!f&&x&&void 0!==x[c],l=(h?x:n)[c],p=v&&h?a(l,r):y&&"function"==typeof l?a(Function.call,l):l,x&&s(x,c,l,t&u.U),g[c]!=l&&o(g,c,p),y&&D[c]!=l&&(D[c]=l)};r.core=i,u.F=1,u.G=2,u.S=4,u.P=8,u.B=16,u.W=32,u.U=64,u.R=128,t.exports=u},function(t,e,n){var r=n(2),i=n(29),o=n(8),s=/"/g,a=function(t,e,n,r){var i=String(o(t)),a="<"+e;return""!==n&&(a+=" "+n+'="'+String(r).replace(s,"&quot;")+'"'),a+">"+i+"</"+e+">"};t.exports=function(t,e){var n={};n[t]=e(a),r(r.P+r.F*i(function(){var e=""[t]('"');return e!==e.toLowerCase()||e.split('"').length>3}),"String",n)}},function(t,e){var n=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(t,e){var n=t.exports={version:"2.5.3"};"number"==typeof __e&&(__e=n)},function(t,e){var n=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(t,e,n){var r=n(58)("wks"),i=n(38),o=n(6).Symbol,s="function"==typeof o;(t.exports=function(t){return r[t]||(r[t]=s&&o[t]||(s?o:i)("Symbol."+t))}).store=r},function(t,e){t.exports=function(t){if(void 0==t)throw TypeError("Can't call method on  "+t);return t}},function(t,e,n){t.exports=!n(26)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(t,e){var n={}.hasOwnProperty;t.exports=function(t,e){return n.call(t,e)}},function(t,e,n){var r=n(16),i=n(83),o=n(60),s=Object.defineProperty;e.f=n(9)?Object.defineProperty:function(t,e,n){if(r(t),e=o(e,!0),r(n),i)try{return s(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(t[e]=n.value),t}},function(t,e,n){var r=n(21);t.exports=function(t){if(!r(t))throw TypeError(t+" is not an object!");return t}},function(t,e){var n=t.exports={version:"2.5.3"};"number"==typeof __e&&(__e=n)},function(t,e,n){var r=n(42),i=n(102);t.exports=n(28)?function(t,e,n){return r.f(t,e,i(1,n))}:function(t,e,n){return t[e]=n,t}},function(t,e,n){"use strict";function r(t,e,n,r,o,s,a,u){if(i(e),!t){var c;if(void 0===e)c=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var h=[n,r,o,s,a,u],l=0;c=new Error(e.replace(/%s/g,function(){return h[l++]})),c.name="Invariant Violation"}throw c.framesToPop=1,c}}var i=function(t){};t.exports=r},function(t,e,n){var r=n(19);t.exports=function(t){if(!r(t))throw TypeError(t+" is not an object!");return t}},function(t,e,n){var r=n(6),i=n(5),o=n(81),s=n(18),a=function(t,e,n){var u,c,h,l=t&a.F,p=t&a.G,f=t&a.S,d=t&a.P,m=t&a.B,y=t&a.W,v=p?i:i[e]||(i[e]={}),x=v.prototype,g=p?r:f?r[e]:(r[e]||{}).prototype;p&&(n=e);for(u in n)(c=!l&&g&&void 0!==g[u])&&u in v||(h=c?g[u]:n[u],v[u]=p&&"function"!=typeof g[u]?n[u]:m&&c?o(h,r):y&&g[u]==h?function(t){var e=function(e,n,r){if(this instanceof t){switch(arguments.length){case 0:return new t;case 1:return new t(e);case 2:return new t(e,n)}return new t(e,n,r)}return t.apply(this,arguments)};return e.prototype=t.prototype,e}(h):d&&"function"==typeof h?o(Function.call,h):h,d&&((v.virtual||(v.virtual={}))[u]=h,t&a.R&&x&&!x[u]&&s(x,u,h)))};a.F=1,a.G=2,a.S=4,a.P=8,a.B=16,a.W=32,a.U=64,a.R=128,t.exports=a},function(t,e,n){var r=n(11),i=n(37);t.exports=n(9)?function(t,e,n){return r.f(t,e,i(1,n))}:function(t,e,n){return t[e]=n,t}},function(t,e){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,e,n){var r=n(151),i=n(50);t.exports=function(t){return r(i(t))}},function(t,e){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,e,n){var r=n(4),i=n(14),o=n(30),s=n(70)("src"),a=Function.toString,u=(""+a).split("toString");n(13).inspectSource=function(t){return a.call(t)},(t.exports=function(t,e,n,a){var c="function"==typeof n;c&&(o(n,"name")||i(n,"name",e)),t[e]!==n&&(c&&(o(n,s)||i(n,s,t[e]?""+t[e]:u.join(String(e)))),t===r?t[e]=n:a?t[e]?t[e]=n:i(t,e,n):(delete t[e],i(t,e,n)))})(Function.prototype,"toString",function(){return"function"==typeof this&&this[s]||a.call(this)})},function(t,e,n){"use strict";function r(t){return void 0===t||null===t}function i(t){return"object"==typeof t&&null!==t}function o(t){return Array.isArray(t)?t:r(t)?[]:[t]}function s(t,e){var n,r,i,o;if(e)for(o=Object.keys(e),n=0,r=o.length;n<r;n+=1)i=o[n],t[i]=e[i];return t}function a(t,e){var n,r="";for(n=0;n<e;n+=1)r+=t;return r}function u(t){return 0===t&&Number.NEGATIVE_INFINITY===1/t}t.exports.isNothing=r,t.exports.isObject=i,t.exports.toArray=o,t.exports.repeat=a,t.exports.isNegativeZero=u,t.exports.extend=s},function(t,e,n){"use strict";function r(t,e,n){var i=[];return t.include.forEach(function(t){n=r(t,e,n)}),t[e].forEach(function(t){n.forEach(function(e,n){e.tag===t.tag&&e.kind===t.kind&&i.push(n)}),n.push(t)}),n.filter(function(t,e){return-1===i.indexOf(e)})}function i(){function t(t){r[t.kind][t.tag]=r.fallback[t.tag]=t}var e,n,r={scalar:{},sequence:{},mapping:{},fallback:{}};for(e=0,n=arguments.length;e<n;e+=1)arguments[e].forEach(t);return r}function o(t){this.include=t.include||[],this.implicit=t.implicit||[],this.explicit=t.explicit||[],this.implicit.forEach(function(t){if(t.loadKind&&"scalar"!==t.loadKind)throw new a("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.")}),this.compiledImplicit=r(this,"implicit",[]),this.compiledExplicit=r(this,"explicit",[]),this.compiledTypeMap=i(this.compiledImplicit,this.compiledExplicit)}var s=n(23),a=n(33),u=n(0);o.DEFAULT=null,o.create=function(){var t,e;switch(arguments.length){case 1:t=o.DEFAULT,e=arguments[0];break;case 2:t=arguments[0],e=arguments[1];break;default:throw new a("Wrong number of arguments for Schema.create function")}if(t=s.toArray(t),e=s.toArray(e),!t.every(function(t){return t instanceof o}))throw new a("Specified list of super schemas (or a single Schema object) contains a non-Schema object.");if(!e.every(function(t){return t instanceof u}))throw new a("Specified list of YAML types (or a single Type object) contains a non-Type object.");return new o({include:t,explicit:e})},t.exports=o},function(t,e,n){"use strict";function r(t){return void 0!==t.ref}function i(t){return void 0!==t.key}var o=n(35),s=n(115),a=(n(46),n(118),Object.prototype.hasOwnProperty),u=n(116),c={key:!0,ref:!0,__self:!0,__source:!0},h=function(t,e,n,r,i,o,s){var a={$$typeof:u,type:t,key:e,ref:n,props:s,_owner:o};return a};h.createElement=function(t,e,n){var o,u={},l=null,p=null;if(null!=e){r(e)&&(p=e.ref),i(e)&&(l=""+e.key),void 0===e.__self?null:e.__self,void 0===e.__source?null:e.__source;for(o in e)a.call(e,o)&&!c.hasOwnProperty(o)&&(u[o]=e[o])}var f=arguments.length-2;if(1===f)u.children=n;else if(f>1){for(var d=Array(f),m=0;m<f;m++)d[m]=arguments[m+2];u.children=d}if(t&&t.defaultProps){var y=t.defaultProps;for(o in y)void 0===u[o]&&(u[o]=y[o])}return h(t,l,p,0,0,s.current,u)},h.createFactory=function(t){var e=h.createElement.bind(null,t);return e.type=t,e},h.cloneAndReplaceKey=function(t,e){return h(t.type,e,t.ref,t._self,t._source,t._owner,t.props)},h.cloneElement=function(t,e,n){var u,l=o({},t.props),p=t.key,f=t.ref,d=(t._self,t._source,t._owner);if(null!=e){r(e)&&(f=e.ref,d=s.current),i(e)&&(p=""+e.key);var m;t.type&&t.type.defaultProps&&(m=t.type.defaultProps);for(u in e)a.call(e,u)&&!c.hasOwnProperty(u)&&(void 0===e[u]&&void 0!==m?l[u]=m[u]:l[u]=e[u])}var y=arguments.length-2;if(1===y)l.children=n;else if(y>1){for(var v=Array(y),x=0;x<y;x++)v[x]=arguments[x+2];l.children=v}return h(t.type,p,f,0,0,d,l)},h.isValidElement=function(t){return"object"==typeof t&&null!==t&&t.$$typeof===u},t.exports=h},function(t,e){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,e){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},function(t,e,n){t.exports=!n(29)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(t,e){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,e){var n={}.hasOwnProperty;t.exports=function(t,e){return n.call(t,e)}},function(t,e){t.exports={}},function(t,e,n){var r=n(43),i=Math.min;t.exports=function(t){return t>0?i(r(t),9007199254740991):0}},function(t,e,n){"use strict";function r(t,e){Error.call(this),this.name="YAMLException",this.reason=t,this.mark=e,this.message=(this.reason||"(unknown reason)")+(this.mark?" "+this.mark.toString():""),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=(new Error).stack||""}r.prototype=Object.create(Error.prototype),r.prototype.constructor=r,r.prototype.toString=function(t){var e=this.name+": ";return e+=this.reason||"(unknown reason)",!t&&this.mark&&(e+=" "+this.mark.toString()),e},t.exports=r},function(t,e,n){"use strict";var r=n(24);t.exports=new r({include:[n(110)],implicit:[n(255),n(248)],explicit:[n(240),n(250),n(251),n(253)]})},function(t,e,n){"use strict";function r(t){if(null===t||void 0===t)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(t)}/*
-+object-assign
-+(c) Sindre Sorhus
-+@license MIT
-+*/
-+var i=Object.getOwnPropertySymbols,o=Object.prototype.hasOwnProperty,s=Object.prototype.propertyIsEnumerable;t.exports=function(){try{if(!Object.assign)return!1;var t=new String("abc");if(t[5]="de","5"===Object.getOwnPropertyNames(t)[0])return!1;for(var e={},n=0;n<10;n++)e["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(e).map(function(t){return e[t]}).join(""))return!1;var r={};return"abcdefghijklmnopqrst".split("").forEach(function(t){r[t]=t}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},r)).join("")}catch(t){return!1}}()?Object.assign:function(t,e){for(var n,a,u=r(t),c=1;c<arguments.length;c++){n=Object(arguments[c]);for(var h in n)o.call(n,h)&&(u[h]=n[h]);if(i){a=i(n);for(var l=0;l<a.length;l++)s.call(n,a[l])&&(u[a[l]]=n[a[l]])}}return u}},function(t,e){t.exports={}},function(t,e){t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},function(t,e){var n=0,r=Math.random();t.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++n+r).toString(36))}},function(t,e){t.exports=function(t){if("function"!=typeof t)throw TypeError(t+" is not a function!");return t}},function(t,e,n){var r=n(39);t.exports=function(t,e,n){if(r(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,i){return t.call(e,n,r,i)}}return function(){return t.apply(e,arguments)}}},function(t,e,n){"use strict";var r=n(14),i=n(22),o=n(29),s=n(8),a=n(1);t.exports=function(t,e,n){var u=a(t),c=n(s,u,""[t]),h=c[0],l=c[1];o(function(){var e={};return e[u]=function(){return 7},7!=""[t](e)})&&(i(String.prototype,t,h),r(RegExp.prototype,u,2==e?function(t,e){return l.call(t,this,e)}:function(t){return l.call(t,this)}))}},function(t,e,n){var r=n(12),i=n(178),o=n(197),s=Object.defineProperty;e.f=n(28)?Object.defineProperty:function(t,e,n){if(r(t),e=o(e,!0),r(n),i)try{return s(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(t[e]=n.value),t}},function(t,e){var n=Math.ceil,r=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?r:n)(t)}},function(t,e,n){var r=n(180),i=n(8);t.exports=function(t){return r(i(t))}},function(t,e,n){"use strict";function r(t){return function(){return t}}var i=function(){};i.thatReturns=r,i.thatReturnsFalse=r(!1),i.thatReturnsTrue=r(!0),i.thatReturnsNull=r(null),i.thatReturnsThis=function(){return this},i.thatReturnsArgument=function(t){return t},t.exports=i},function(t,e,n){"use strict";var r=n(45),i=r;t.exports=i},function(t,e,n){"use strict";var r=n(24);t.exports=r.DEFAULT=new r({include:[n(34)],explicit:[n(246),n(245),n(244)]})},function(t,e,n){"use strict";function r(t){for(var e=arguments.length-1,n="Minified React error #"+t+"; visit http://facebook.github.io/react/docs/error-decoder.html?invariant="+t,r=0;r<e;r++)n+="&args[]="+encodeURIComponent(arguments[r+1]);n+=" for the full message or use the non-minified dev environment for full errors and additional helpful warnings.";var i=new Error(n);throw i.name="Invariant Violation",i.framesToPop=1,i}t.exports=r},function(t,e){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},function(t,e){t.exports=function(t){if(void 0==t)throw TypeError("Can't call method on  "+t);return t}},function(t,e){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(t,e){t.exports=!0},function(t,e,n){var r=n(16),i=n(156),o=n(51),s=n(57)("IE_PROTO"),a=function(){},u=function(){var t,e=n(82)("iframe"),r=o.length;for(e.style.display="none",n(150).appendChild(e),e.src="javascript:",t=e.contentWindow.document,t.open(),t.write("<script>document.F=Object<\/script>"),t.close(),u=t.F;r--;)delete u.prototype[o[r]];return u()};t.exports=Object.create||function(t,e){var n;return null!==t?(a.prototype=r(t),n=new a,a.prototype=null,n[s]=t):n=u(),void 0===e?n:i(n,e)}},function(t,e,n){var r=n(89),i=n(51);t.exports=Object.keys||function(t){return r(t,i)}},function(t,e){e.f={}.propertyIsEnumerable},function(t,e,n){var r=n(11).f,i=n(10),o=n(7)("toStringTag");t.exports=function(t,e,n){t&&!i(t=n?t:t.prototype,o)&&r(t,o,{configurable:!0,value:e})}},function(t,e,n){var r=n(58)("keys"),i=n(38);t.exports=function(t){return r[t]||(r[t]=i(t))}},function(t,e,n){var r=n(6),i=r["__core-js_shared__"]||(r["__core-js_shared__"]={});t.exports=function(t){return i[t]||(i[t]={})}},function(t,e){var n=Math.ceil,r=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?r:n)(t)}},function(t,e,n){var r=n(19);t.exports=function(t,e){if(!r(t))return t;var n,i;if(e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;if("function"==typeof(n=t.valueOf)&&!r(i=n.call(t)))return i;if(!e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;throw TypeError("Can't convert object to primitive value")}},function(t,e,n){var r=n(6),i=n(5),o=n(52),s=n(62),a=n(11).f;t.exports=function(t){var e=i.Symbol||(i.Symbol=o?{}:r.Symbol||{});"_"==t.charAt(0)||t in e||a(e,t,{value:s.f(t)})}},function(t,e,n){e.f=n(7)},function(t,e,n){var r=n(27),i=n(1)("toStringTag"),o="Arguments"==r(function(){return arguments}()),s=function(t,e){try{return t[e]}catch(t){}};t.exports=function(t){var e,n,a;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=s(e=Object(t),i))?n:o?r(e):"Object"==(a=r(e))&&"function"==typeof e.callee?"Arguments":a}},function(t,e,n){var r=n(21),i=n(4).document,o=r(i)&&r(i.createElement);t.exports=function(t){return o?i.createElement(t):{}}},function(t,e,n){var r=n(1)("match");t.exports=function(t){var e=/./;try{"/./"[t](e)}catch(n){try{return e[r]=!1,!"/./"[t](e)}catch(t){}}return!0}},function(t,e,n){"use strict";function r(t){var e,n;this.promise=new t(function(t,r){if(void 0!==e||void 0!==n)throw TypeError("Bad Promise constructor");e=t,n=r}),this.resolve=i(e),this.reject=i(n)}var i=n(39);t.exports.f=function(t){return new r(t)}},function(t,e,n){var r=n(42).f,i=n(30),o=n(1)("toStringTag");t.exports=function(t,e,n){t&&!i(t=n?t:t.prototype,o)&&r(t,o,{configurable:!0,value:e})}},function(t,e,n){var r=n(103)("keys"),i=n(70);t.exports=function(t){return r[t]||(r[t]=i(t))}},function(t,e,n){var r=n(96),i=n(8);t.exports=function(t,e,n){if(r(e))throw TypeError("String#"+n+" doesn't accept regex!");return String(i(t))}},function(t,e){var n=0,r=Math.random();t.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++n+r).toString(36))}},function(t,e,n){"use strict";var r=n(24);t.exports=new r({explicit:[n(254),n(252),n(247)]})},function(t,e,n){"use strict";function r(t,e){return{type:a,payload:(0,s.default)({},t,e)}}function i(t){return{type:u,payload:t}}Object.defineProperty(e,"__esModule",{value:!0}),e.TOGGLE_CONFIGS=e.UPDATE_CONFIGS=void 0;var o=n(77),s=function(t){return t&&t.__esModule?t:{default:t}}(o);e.update=r,e.toggle=i;var a=e.UPDATE_CONFIGS="configs_update",u=e.TOGGLE_CONFIGS="configs_toggle"},function(t,e,n){t.exports={default:n(140),__esModule:!0}},function(t,e,n){t.exports={default:n(141),__esModule:!0}},function(t,e,n){"use strict";e.__esModule=!0,e.default=function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}},function(t,e,n){"use strict";e.__esModule=!0;var r=n(73),i=function(t){return t&&t.__esModule?t:{default:t}}(r);e.default=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),(0,i.default)(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}()},function(t,e,n){"use strict";e.__esModule=!0;var r=n(73),i=function(t){return t&&t.__esModule?t:{default:t}}(r);e.default=function(t,e,n){return e in t?(0,i.default)(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}e.__esModule=!0;var i=n(131),o=r(i),s=n(130),a=r(s),u=n(80),c=r(u);e.default=function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+(void 0===e?"undefined":(0,c.default)(e)));t.prototype=(0,a.default)(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(o.default?(0,o.default)(t,e):t.__proto__=e)}},function(t,e,n){"use strict";e.__esModule=!0;var r=n(80),i=function(t){return t&&t.__esModule?t:{default:t}}(r);e.default=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!==(void 0===e?"undefined":(0,i.default)(e))&&"function"!=typeof e?t:e}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}e.__esModule=!0;var i=n(133),o=r(i),s=n(132),a=r(s),u="function"==typeof a.default&&"symbol"==typeof o.default?function(t){return typeof t}:function(t){return t&&"function"==typeof a.default&&t.constructor===a.default&&t!==a.default.prototype?"symbol":typeof t};e.default="function"==typeof a.default&&"symbol"===u(o.default)?function(t){return void 0===t?"undefined":u(t)}:function(t){return t&&"function"==typeof a.default&&t.constructor===a.default&&t!==a.default.prototype?"symbol":void 0===t?"undefined":u(t)}},function(t,e,n){var r=n(145);t.exports=function(t,e,n){if(r(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,i){return t.call(e,n,r,i)}}return function(){return t.apply(e,arguments)}}},function(t,e,n){var r=n(19),i=n(6).document,o=r(i)&&r(i.createElement);t.exports=function(t){return o?i.createElement(t):{}}},function(t,e,n){t.exports=!n(9)&&!n(26)(function(){return 7!=Object.defineProperty(n(82)("div"),"a",{get:function(){return 7}}).a})},function(t,e,n){"use strict";var r=n(52),i=n(17),o=n(90),s=n(18),a=n(10),u=n(36),c=n(153),h=n(56),l=n(88),p=n(7)("iterator"),f=!([].keys&&"next"in[].keys()),d=function(){return this};t.exports=function(t,e,n,m,y,v,x){c(n,e,m);var g,D,E,A=function(t){if(!f&&t in _)return _[t];switch(t){case"keys":case"values":return function(){return new n(this,t)}}return function(){return new n(this,t)}},S=e+" Iterator",w="values"==y,C=!1,_=t.prototype,b=_[p]||_["@@iterator"]||y&&_[y],F=!f&&b||A(y),k=y?w?A("entries"):F:void 0,I="Array"==e?_.entries||b:b;if(I&&(E=l(I.call(new t)))!==Object.prototype&&E.next&&(h(E,S,!0),r||a(E,p)||s(E,p,d)),w&&b&&"values"!==b.name&&(C=!0,F=function(){return b.call(this)}),r&&!x||!f&&!C&&_[p]||s(_,p,F),u[e]=F,u[S]=d,y)if(g={values:w?F:A("values"),keys:v?F:A("keys"),entries:k},x)for(D in g)D in _||o(_,D,g[D]);else i(i.P+i.F*(f||C),e,g);return g}},function(t,e,n){var r=n(55),i=n(37),o=n(20),s=n(60),a=n(10),u=n(83),c=Object.getOwnPropertyDescriptor;e.f=n(9)?c:function(t,e){if(t=o(t),e=s(e,!0),u)try{return c(t,e)}catch(t){}if(a(t,e))return i(!r.f.call(t,e),t[e])}},function(t,e,n){var r=n(89),i=n(51).concat("length","prototype");e.f=Object.getOwnPropertyNames||function(t){return r(t,i)}},function(t,e){e.f=Object.getOwnPropertySymbols},function(t,e,n){var r=n(10),i=n(91),o=n(57)("IE_PROTO"),s=Object.prototype;t.exports=Object.getPrototypeOf||function(t){return t=i(t),r(t,o)?t[o]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?s:null}},function(t,e,n){var r=n(10),i=n(20),o=n(147)(!1),s=n(57)("IE_PROTO");t.exports=function(t,e){var n,a=i(t),u=0,c=[];for(n in a)n!=s&&r(a,n)&&c.push(n);for(;e.length>u;)r(a,n=e[u++])&&(~o(c,n)||c.push(n));return c}},function(t,e,n){t.exports=n(18)},function(t,e,n){var r=n(50);t.exports=function(t){return Object(r(t))}},function(t,e,n){"use strict";var r=n(160)(!0);n(84)(String,"String",function(t){this._t=String(t),this._i=0},function(){var t,e=this._t,n=this._i;return n>=e.length?{value:void 0,done:!0}:(t=r(e,n),this._i+=t.length,{value:t,done:!1})})},function(t,e,n){n(165);for(var r=n(6),i=n(18),o=n(36),s=n(7)("toStringTag"),a="CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,TextTrackList,TouchList".split(","),u=0;u<a.length;u++){var c=a[u],h=r[c],l=h&&h.prototype;l&&!l[s]&&i(l,s,c),o[c]=o.Array}},function(t,e){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(t,e,n){var r=n(4).document;t.exports=r&&r.documentElement},function(t,e,n){var r=n(21),i=n(27),o=n(1)("match");t.exports=function(t){var e;return r(t)&&(void 0!==(e=t[o])?!!e:"RegExp"==i(t))}},function(t,e,n){"use strict";var r=n(98),i=n(2),o=n(22),s=n(14),a=n(30),u=n(31),c=n(183),h=n(67),l=n(189),p=n(1)("iterator"),f=!([].keys&&"next"in[].keys()),d=function(){return this};t.exports=function(t,e,n,m,y,v,x){c(n,e,m);var g,D,E,A=function(t){if(!f&&t in _)return _[t];switch(t){case"keys":case"values":return function(){return new n(this,t)}}return function(){return new n(this,t)}},S=e+" Iterator",w="values"==y,C=!1,_=t.prototype,b=_[p]||_["@@iterator"]||y&&_[y],F=!f&&b||A(y),k=y?w?A("entries"):F:void 0,I="Array"==e?_.entries||b:b;if(I&&(E=l(I.call(new t)))!==Object.prototype&&E.next&&(h(E,S,!0),r||a(E,p)||s(E,p,d)),w&&b&&"values"!==b.name&&(C=!0,F=function(){return b.call(this)}),r&&!x||!f&&!C&&_[p]||s(_,p,F),u[e]=F,u[S]=d,y)if(g={values:w?F:A("values"),keys:v?F:A("keys"),entries:k},x)for(D in g)D in _||o(_,D,g[D]);else i(i.P+i.F*(f||C),e,g);return g}},function(t,e){t.exports=!1},function(t,e,n){var r=n(190),i=n(94);t.exports=Object.keys||function(t){return r(t,i)}},function(t,e){t.exports=function(t){try{return{e:!1,v:t()}}catch(t){return{e:!0,v:t}}}},function(t,e,n){var r=n(12),i=n(21),o=n(66);t.exports=function(t,e){if(r(t),i(e)&&e.constructor===t)return e;var n=o.f(t);return(0,n.resolve)(e),n.promise}},function(t,e){t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},function(t,e,n){var r=n(4),i=r["__core-js_shared__"]||(r["__core-js_shared__"]={});t.exports=function(t){return i[t]||(i[t]={})}},function(t,e,n){var r=n(12),i=n(39),o=n(1)("species");t.exports=function(t,e){var n,s=r(t).constructor;return void 0===s||void 0==(n=r(s)[o])?e:i(n)}},function(t,e,n){var r=n(43),i=n(8);t.exports=function(t){return function(e,n){var o,s,a=String(i(e)),u=r(n),c=a.length;return u<0||u>=c?t?"":void 0:(o=a.charCodeAt(u),o<55296||o>56319||u+1===c||(s=a.charCodeAt(u+1))<56320||s>57343?t?a.charAt(u):o:t?a.slice(u,u+2):s-56320+(o-55296<<10)+65536)}}},function(t,e,n){var r,i,o,s=n(40),a=n(179),u=n(95),c=n(64),h=n(4),l=h.process,p=h.setImmediate,f=h.clearImmediate,d=h.MessageChannel,m=h.Dispatch,y=0,v={},x=function(){var t=+this;if(v.hasOwnProperty(t)){var e=v[t];delete v[t],e()}},g=function(t){x.call(t.data)};p&&f||(p=function(t){for(var e=[],n=1;arguments.length>n;)e.push(arguments[n++]);return v[++y]=function(){a("function"==typeof t?t:Function(t),e)},r(y),y},f=function(t){delete v[t]},"process"==n(27)(l)?r=function(t){l.nextTick(s(x,t,1))}:m&&m.now?r=function(t){m.now(s(x,t,1))}:d?(i=new d,o=i.port2,i.port1.onmessage=g,r=s(o.postMessage,o,1)):h.addEventListener&&"function"==typeof postMessage&&!h.importScripts?(r=function(t){h.postMessage(t+"","*")},h.addEventListener("message",g,!1)):r="onreadystatechange"in c("script")?function(t){u.appendChild(c("script")).onreadystatechange=function(){u.removeChild(this),x.call(t)}}:function(t){setTimeout(s(x,t,1),0)}),t.exports={set:p,clear:f}},function(t,e,n){var r=n(43),i=Math.max,o=Math.min;t.exports=function(t,e){return t=r(t),t<0?i(t+e,0):o(t,e)}},function(t,e,n){"use strict";var r=n(105)(!0);n(97)(String,"String",function(t){this._t=String(t),this._i=0},function(){var t,e=this._t,n=this._i;return n>=e.length?{value:void 0,done:!0}:(t=r(e,n),this._i+=t.length,{value:t,done:!1})})},function(t,e,n){"use strict";var r={};t.exports=r},function(t,e,n){"use strict";var r=n(24);t.exports=new r({include:[n(111)]})},function(t,e,n){"use strict";var r=n(24);t.exports=new r({include:[n(71)],implicit:[n(249),n(241),n(243),n(242)]})},function(t,e,n){t.exports=n(258)()},function(t,e,n){"use strict";t.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},function(t,e,n){"use strict";function r(t,e,n){this.props=t,this.context=e,this.refs=c,this.updater=n||u}function i(t,e,n){this.props=t,this.context=e,this.refs=c,this.updater=n||u}function o(){}var s=n(48),a=n(35),u=n(117),c=(n(118),n(109));n(15),n(270);r.prototype.isReactComponent={},r.prototype.setState=function(t,e){"object"!=typeof t&&"function"!=typeof t&&null!=t&&s("85"),this.updater.enqueueSetState(this,t),e&&this.updater.enqueueCallback(this,e,"setState")},r.prototype.forceUpdate=function(t){this.updater.enqueueForceUpdate(this),t&&this.updater.enqueueCallback(this,t,"forceUpdate")};o.prototype=r.prototype,i.prototype=new o,i.prototype.constructor=i,a(i.prototype,r.prototype),i.prototype.isPureReactComponent=!0,t.exports={Component:r,PureComponent:i}},function(t,e,n){"use strict";var r={current:null};t.exports=r},function(t,e,n){"use strict";var r="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103;t.exports=r},function(t,e,n){"use strict";var r=(n(46),{isMounted:function(t){return!1},enqueueCallback:function(t,e){},enqueueForceUpdate:function(t){},enqueueReplaceState:function(t,e){},enqueueSetState:function(t,e){}});t.exports=r},function(t,e,n){"use strict";var r=!1;t.exports=r},function(t,e,n){"use strict";t.exports=n(263)},function(t,e,n){"use strict";var r=n(125);void 0===function(t){return t&&t.__esModule?t:{default:t}}(r).default.Promise&&n(137),String.prototype.startsWith||n(136)},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}var i=n(128),o=r(i),s=n(126),a=r(s),u=n(122),c=r(u),h=[a.default,c.default,function(){return{components:{StandaloneLayout:o.default}}}];t.exports=h},function(t,e,n){"use strict";function r(t){if(t&&t.__esModule)return t;var e={};if(null!=t)for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e.default=t,e}function i(t){return t&&t.__esModule?t:{default:t}}function o(){return{statePlugins:{spec:{actions:v,selectors:x},configs:{reducers:m.default,actions:l,selectors:f}}}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=o;var s=n(235),a=i(s),u=n(260),c=i(u),h=n(72),l=r(h),p=n(124),f=r(p),d=n(123),m=i(d),y=function(t,e){try{return a.default.safeLoad(t)}catch(t){return e&&e.errActions.newThrownErr(new Error(t)),{}}},v={downloadConfig:function(t){return function(e){return(0,e.fn.fetch)(t)}},getConfigByUrl:function(t,e){return function(n){function r(n){n instanceof Error||n.status>=400?(i.updateLoadingStatus("failedConfig"),i.updateLoadingStatus("failedConfig"),i.updateUrl(""),console.error(n.statusText+" "+t),e(null)):e(y(n.text))}var i=n.specActions;if(t)return i.downloadConfig(t).then(r,r)}}},x={getLocalConfig:function(){return y(c.default)}}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r,i=n(77),o=function(t){return t&&t.__esModule?t:{default:t}}(i),s=n(233),a=n(72);e.default=(r={},(0,o.default)(r,a.UPDATE_CONFIGS,function(t,e){return t.merge((0,s.fromJS)(e.payload))}),(0,o.default)(r,a.TOGGLE_CONFIGS,function(t,e){var n=e.payload,r=t.get(n);return t.set(n,!r)}),r)},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});e.get=function(t,e){return t.getIn(Array.isArray(e)?e:[e])}},function(t,e,n){"use strict";var r=n(129),i=function(t){return t&&t.__esModule?t:{default:t}}(r);t.exports=function(){var t={location:{},history:{},open:function(){},close:function(){},File:function(){}};if("undefined"==typeof window)return t;try{t=window;var e=["File","Blob","FormData"],n=!0,r=!1,o=void 0;try{for(var s,a=(0,i.default)(e);!(n=(s=a.next()).done);n=!0){var u=s.value;u in window&&(t[u]=window[u])}}catch(t){r=!0,o=t}finally{try{!n&&a.return&&a.return()}finally{if(r)throw o}}}catch(t){console.error(t)}return t}()},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){return{components:{Topbar:i.default}}};var r=n(127),i=function(t){return t&&t.__esModule?t:{default:t}}(r)},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var i=n(74),o=r(i),s=n(75),a=r(s),u=n(76),c=r(u),h=n(79),l=r(h),p=n(78),f=r(p),d=n(119),m=r(d),y=n(112),v=r(y),x=n(273),g=r(x),D=function(t){function e(t,n){(0,a.default)(this,e);var r=(0,l.default)(this,(e.__proto__||(0,o.default)(e)).call(this,t,n));return r.onUrlChange=function(t){var e=t.target.value;r.setState({url:e})},r.loadSpec=function(t){r.props.specActions.updateUrl(t),r.props.specActions.download(t)},r.onUrlSelect=function(t){var e=t.target.value||t.target.href;r.loadSpec(e),r.setSelectedUrl(e),t.preventDefault()},r.downloadUrl=function(t){r.loadSpec(r.state.url),t.preventDefault()},r.setSelectedUrl=function(t){var e=r.props.getConfigs(),n=e.urls||[];n&&n.length&&t&&n.forEach(function(e,n){e.url===t&&r.setState({selectedIndex:n})})},r.onFilterChange=function(t){var e=t.target.value;r.props.layoutActions.updateFilter(e)},r.state={url:t.specSelectors.url(),selectedIndex:0},r}return(0,f.default)(e,t),(0,c.default)(e,[{key:"componentWillReceiveProps",value:function(t){this.setState({url:t.specSelectors.url()})}},{key:"componentWillMount",value:function(){var t=this,e=this.props.getConfigs(),n=e.urls||[];if(n&&n.length){var r=e["urls.primaryName"];r&&n.forEach(function(e,n){e.name===r&&t.setState({selectedIndex:n})})}}},{key:"componentDidMount",value:function(){var t=this.props.getConfigs().urls||[];t&&t.length&&this.loadSpec(t[this.state.selectedIndex].url)}},{key:"render",value:function(){var t=this.props,e=t.getComponent,n=t.specSelectors,r=t.getConfigs,i=e("Button"),o=e("Link"),s="loading"===n.loadingStatus(),a="failed"===n.loadingStatus(),u={};a&&(u.color="red"),s&&(u.color="#aaa");var c=r(),h=c.urls,l=[],p=null;if(h){var f=[];h.forEach(function(t,e){f.push(m.default.createElement("option",{key:e,value:t.url},t.name))}),l.push(m.default.createElement("label",{className:"select-label",htmlFor:"select"},m.default.createElement("span",null,"Select a spec"),m.default.createElement("select",{id:"select",disabled:s,onChange:this.onUrlSelect,value:h[this.state.selectedIndex].url},f)))}else p=this.downloadUrl,l.push(m.default.createElement("input",{className:"download-url-input",type:"text",onChange:this.onUrlChange,value:this.state.url,disabled:s,style:u})),l.push(m.default.createElement(i,{className:"download-url-button",onClick:this.downloadUrl},"Explore"));return m.default.createElement("div",{className:"topbar"},m.default.createElement("div",{className:"wrapper"},m.default.createElement("div",{className:"topbar-wrapper"},m.default.createElement(o,{href:"#"},m.default.createElement("img",{height:"30",width:"30",src:g.default,alt:"Swagger UI"}),m.default.createElement("span",null,"swagger")),m.default.createElement("form",{className:"download-url-wrapper",onSubmit:p},l.map(function(t,e){return(0,d.cloneElement)(t,{key:e})})))))}}]),e}(m.default.Component);D.propTypes={layoutActions:v.default.object.isRequired},e.default=D,D.propTypes={specSelectors:v.default.object.isRequired,specActions:v.default.object.isRequired,getComponent:v.default.func.isRequired,getConfigs:v.default.func.isRequired}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var i=n(74),o=r(i),s=n(75),a=r(s),u=n(76),c=r(u),h=n(79),l=r(h),p=n(78),f=r(p),d=n(119),m=r(d),y=n(112),v=r(y),x=function(t){function e(){return(0,a.default)(this,e),(0,l.default)(this,(e.__proto__||(0,o.default)(e)).apply(this,arguments))}return(0,f.default)(e,t),(0,c.default)(e,[{key:"render",value:function(){var t=this.props,e=t.getComponent,n=t.specSelectors,r=t.errSelectors,i=e("Container"),o=e("Row"),s=e("Col"),a=e("Topbar",!0),u=e("BaseLayout",!0),c=e("onlineValidatorBadge",!0),h=n.loadingStatus(),l=r.lastError(),p=l?l.get("message"):"";return m.default.createElement(i,{className:"swagger-ui"},a?m.default.createElement(a,null):null,"loading"===h&&m.default.createElement("div",{className:"info"},m.default.createElement("div",{className:"loading-container"},m.default.createElement("div",{className:"loading"}))),"failed"===h&&m.default.createElement("div",{className:"info"},m.default.createElement("div",{className:"loading-container"},m.default.createElement("h4",{className:"title"},"Failed to load API definition."),m.default.createElement("p",null,p))),"failedConfig"===h&&m.default.createElement("div",{className:"info",style:{maxWidth:"880px",marginLeft:"auto",marginRight:"auto",textAlign:"center"}},m.default.createElement("div",{className:"loading-container"},m.default.createElement("h4",{className:"title"},"Failed to load remote configuration."),m.default.createElement("p",null,p))),!h||"success"===h&&m.default.createElement(u,null),m.default.createElement(o,null,m.default.createElement(s,null,m.default.createElement(c,null))))}}]),e}(m.default.Component);x.propTypes={errSelectors:v.default.object.isRequired,errActions:v.default.object.isRequired,specActions:v.default.object.isRequired,specSelectors:v.default.object.isRequired,layoutSelectors:v.default.object.isRequired,layoutActions:v.default.object.isRequired,getComponent:v.default.func.isRequired},e.default=x},function(t,e,n){t.exports={default:n(138),__esModule:!0}},function(t,e,n){t.exports={default:n(139),__esModule:!0}},function(t,e,n){t.exports={default:n(142),__esModule:!0}},function(t,e,n){t.exports={default:n(143),__esModule:!0}},function(t,e,n){t.exports={default:n(144),__esModule:!0}},function(t,e,n){"use strict";function r(t){var e=t.length;if(e%4>0)throw new Error("Invalid string. Length must be a multiple of 4");return"="===t[e-2]?2:"="===t[e-1]?1:0}function i(t){return 3*t.length/4-r(t)}function o(t){var e,n,i,o,s,a=t.length;o=r(t),s=new l(3*a/4-o),n=o>0?a-4:a;var u=0;for(e=0;e<n;e+=4)i=h[t.charCodeAt(e)]<<18|h[t.charCodeAt(e+1)]<<12|h[t.charCodeAt(e+2)]<<6|h[t.charCodeAt(e+3)],s[u++]=i>>16&255,s[u++]=i>>8&255,s[u++]=255&i;return 2===o?(i=h[t.charCodeAt(e)]<<2|h[t.charCodeAt(e+1)]>>4,s[u++]=255&i):1===o&&(i=h[t.charCodeAt(e)]<<10|h[t.charCodeAt(e+1)]<<4|h[t.charCodeAt(e+2)]>>2,s[u++]=i>>8&255,s[u++]=255&i),s}function s(t){return c[t>>18&63]+c[t>>12&63]+c[t>>6&63]+c[63&t]}function a(t,e,n){for(var r,i=[],o=e;o<n;o+=3)r=(t[o]<<16)+(t[o+1]<<8)+t[o+2],i.push(s(r));return i.join("")}function u(t){for(var e,n=t.length,r=n%3,i="",o=[],s=0,u=n-r;s<u;s+=16383)o.push(a(t,s,s+16383>u?u:s+16383));return 1===r?(e=t[n-1],i+=c[e>>2],i+=c[e<<4&63],i+="=="):2===r&&(e=(t[n-2]<<8)+t[n-1],i+=c[e>>10],i+=c[e>>4&63],i+=c[e<<2&63],i+="="),o.push(i),o.join("")}e.byteLength=i,e.toByteArray=o,e.fromByteArray=u;for(var c=[],h=[],l="undefined"!=typeof Uint8Array?Uint8Array:Array,p="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",f=0,d=p.length;f<d;++f)c[f]=p[f],h[p.charCodeAt(f)]=f;h["-".charCodeAt(0)]=62,h["_".charCodeAt(0)]=63},function(t,e,n){"use strict";(function(t){function r(){return o.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function i(t,e){if(r()<e)throw new RangeError("Invalid typed array length");return o.TYPED_ARRAY_SUPPORT?(t=new Uint8Array(e),t.__proto__=o.prototype):(null===t&&(t=new o(e)),t.length=e),t}function o(t,e,n){if(!(o.TYPED_ARRAY_SUPPORT||this instanceof o))return new o(t,e,n);if("number"==typeof t){if("string"==typeof e)throw new Error("If encoding is specified then the first argument must be a string");return c(this,t)}return s(this,t,e,n)}function s(t,e,n,r){if("number"==typeof e)throw new TypeError('"value" argument must not be a number');return"undefined"!=typeof ArrayBuffer&&e instanceof ArrayBuffer?p(t,e,n,r):"string"==typeof e?h(t,e,n):f(t,e)}function a(t){if("number"!=typeof t)throw new TypeError('"size" argument must be a number');if(t<0)throw new RangeError('"size" argument must not be negative')}function u(t,e,n,r){return a(e),e<=0?i(t,e):void 0!==n?"string"==typeof r?i(t,e).fill(n,r):i(t,e).fill(n):i(t,e)}function c(t,e){if(a(e),t=i(t,e<0?0:0|d(e)),!o.TYPED_ARRAY_SUPPORT)for(var n=0;n<e;++n)t[n]=0;return t}function h(t,e,n){if("string"==typeof n&&""!==n||(n="utf8"),!o.isEncoding(n))throw new TypeError('"encoding" must be a valid string encoding');var r=0|y(e,n);t=i(t,r);var s=t.write(e,n);return s!==r&&(t=t.slice(0,s)),t}function l(t,e){var n=e.length<0?0:0|d(e.length);t=i(t,n);for(var r=0;r<n;r+=1)t[r]=255&e[r];return t}function p(t,e,n,r){if(e.byteLength,n<0||e.byteLength<n)throw new RangeError("'offset' is out of bounds");if(e.byteLength<n+(r||0))throw new RangeError("'length' is out of bounds");return e=void 0===n&&void 0===r?new Uint8Array(e):void 0===r?new Uint8Array(e,n):new Uint8Array(e,n,r),o.TYPED_ARRAY_SUPPORT?(t=e,t.__proto__=o.prototype):t=l(t,e),t}function f(t,e){if(o.isBuffer(e)){var n=0|d(e.length);return t=i(t,n),0===t.length?t:(e.copy(t,0,0,n),t)}if(e){if("undefined"!=typeof ArrayBuffer&&e.buffer instanceof ArrayBuffer||"length"in e)return"number"!=typeof e.length||H(e.length)?i(t,0):l(t,e);if("Buffer"===e.type&&Z(e.data))return l(t,e.data)}throw new TypeError("First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.")}function d(t){if(t>=r())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+r().toString(16)+" bytes");return 0|t}function m(t){return+t!=t&&(t=0),o.alloc(+t)}function y(t,e){if(o.isBuffer(t))return t.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(t)||t instanceof ArrayBuffer))return t.byteLength;"string"!=typeof t&&(t=""+t);var n=t.length;if(0===n)return 0;for(var r=!1;;)switch(e){case"ascii":case"latin1":case"binary":return n;case"utf8":case"utf-8":case void 0:return q(t).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*n;case"hex":return n>>>1;case"base64":return W(t).length;default:if(r)return q(t).length;e=(""+e).toLowerCase(),r=!0}}function v(t,e,n){var r=!1;if((void 0===e||e<0)&&(e=0),e>this.length)return"";if((void 0===n||n>this.length)&&(n=this.length),n<=0)return"";if(n>>>=0,e>>>=0,n<=e)return"";for(t||(t="utf8");;)switch(t){case"hex":return B(this,e,n);case"utf8":case"utf-8":return F(this,e,n);case"ascii":return I(this,e,n);case"latin1":case"binary":return T(this,e,n);case"base64":return b(this,e,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return M(this,e,n);default:if(r)throw new TypeError("Unknown encoding: "+t);t=(t+"").toLowerCase(),r=!0}}function x(t,e,n){var r=t[e];t[e]=t[n],t[n]=r}function g(t,e,n,r,i){if(0===t.length)return-1;if("string"==typeof n?(r=n,n=0):n>2147483647?n=2147483647:n<-2147483648&&(n=-2147483648),n=+n,isNaN(n)&&(n=i?0:t.length-1),n<0&&(n=t.length+n),n>=t.length){if(i)return-1;n=t.length-1}else if(n<0){if(!i)return-1;n=0}if("string"==typeof e&&(e=o.from(e,r)),o.isBuffer(e))return 0===e.length?-1:D(t,e,n,r,i);if("number"==typeof e)return e&=255,o.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?i?Uint8Array.prototype.indexOf.call(t,e,n):Uint8Array.prototype.lastIndexOf.call(t,e,n):D(t,[e],n,r,i);throw new TypeError("val must be string, number or Buffer")}function D(t,e,n,r,i){function o(t,e){return 1===s?t[e]:t.readUInt16BE(e*s)}var s=1,a=t.length,u=e.length;if(void 0!==r&&("ucs2"===(r=String(r).toLowerCase())||"ucs-2"===r||"utf16le"===r||"utf-16le"===r)){if(t.length<2||e.length<2)return-1;s=2,a/=2,u/=2,n/=2}var c;if(i){var h=-1;for(c=n;c<a;c++)if(o(t,c)===o(e,-1===h?0:c-h)){if(-1===h&&(h=c),c-h+1===u)return h*s}else-1!==h&&(c-=c-h),h=-1}else for(n+u>a&&(n=a-u),c=n;c>=0;c--){for(var l=!0,p=0;p<u;p++)if(o(t,c+p)!==o(e,p)){l=!1;break}if(l)return c}return-1}function E(t,e,n,r){n=Number(n)||0;var i=t.length-n;r?(r=Number(r))>i&&(r=i):r=i;var o=e.length;if(o%2!=0)throw new TypeError("Invalid hex string");r>o/2&&(r=o/2);for(var s=0;s<r;++s){var a=parseInt(e.substr(2*s,2),16);if(isNaN(a))return s;t[n+s]=a}return s}function A(t,e,n,r){return G(q(e,t.length-n),t,n,r)}function S(t,e,n,r){return G(K(e),t,n,r)}function w(t,e,n,r){return S(t,e,n,r)}function C(t,e,n,r){return G(W(e),t,n,r)}function _(t,e,n,r){return G(Y(e,t.length-n),t,n,r)}function b(t,e,n){return 0===e&&n===t.length?V.fromByteArray(t):V.fromByteArray(t.slice(e,n))}function F(t,e,n){n=Math.min(t.length,n);for(var r=[],i=e;i<n;){var o=t[i],s=null,a=o>239?4:o>223?3:o>191?2:1;if(i+a<=n){var u,c,h,l;switch(a){case 1:o<128&&(s=o);break;case 2:u=t[i+1],128==(192&u)&&(l=(31&o)<<6|63&u)>127&&(s=l);break;case 3:u=t[i+1],c=t[i+2],128==(192&u)&&128==(192&c)&&(l=(15&o)<<12|(63&u)<<6|63&c)>2047&&(l<55296||l>57343)&&(s=l);break;case 4:u=t[i+1],c=t[i+2],h=t[i+3],128==(192&u)&&128==(192&c)&&128==(192&h)&&(l=(15&o)<<18|(63&u)<<12|(63&c)<<6|63&h)>65535&&l<1114112&&(s=l)}}null===s?(s=65533,a=1):s>65535&&(s-=65536,r.push(s>>>10&1023|55296),s=56320|1023&s),r.push(s),i+=a}return k(r)}function k(t){var e=t.length;if(e<=Q)return String.fromCharCode.apply(String,t);for(var n="",r=0;r<e;)n+=String.fromCharCode.apply(String,t.slice(r,r+=Q));return n}function I(t,e,n){var r="";n=Math.min(t.length,n);for(var i=e;i<n;++i)r+=String.fromCharCode(127&t[i]);return r}function T(t,e,n){var r="";n=Math.min(t.length,n);for(var i=e;i<n;++i)r+=String.fromCharCode(t[i]);return r}function B(t,e,n){var r=t.length;(!e||e<0)&&(e=0),(!n||n<0||n>r)&&(n=r);for(var i="",o=e;o<n;++o)i+=X(t[o]);return i}function M(t,e,n){for(var r=t.slice(e,n),i="",o=0;o<r.length;o+=2)i+=String.fromCharCode(r[o]+256*r[o+1]);return i}function P(t,e,n){if(t%1!=0||t<0)throw new RangeError("offset is not uint");if(t+e>n)throw new RangeError("Trying to access beyond buffer length")}function N(t,e,n,r,i,s){if(!o.isBuffer(t))throw new TypeError('"buffer" argument must be a Buffer instance');if(e>i||e<s)throw new RangeError('"value" argument is out of bounds');if(n+r>t.length)throw new RangeError("Index out of range")}function O(t,e,n,r){e<0&&(e=65535+e+1);for(var i=0,o=Math.min(t.length-n,2);i<o;++i)t[n+i]=(e&255<<8*(r?i:1-i))>>>8*(r?i:1-i)}function R(t,e,n,r){e<0&&(e=4294967295+e+1);for(var i=0,o=Math.min(t.length-n,4);i<o;++i)t[n+i]=e>>>8*(r?i:3-i)&255}function U(t,e,n,r,i,o){if(n+r>t.length)throw new RangeError("Index out of range");if(n<0)throw new RangeError("Index out of range")}function j(t,e,n,r,i){return i||U(t,e,n,4,3.4028234663852886e38,-3.4028234663852886e38),$.write(t,e,n,r,23,4),n+4}function L(t,e,n,r,i){return i||U(t,e,n,8,1.7976931348623157e308,-1.7976931348623157e308),$.write(t,e,n,r,52,8),n+8}function z(t){if(t=J(t).replace(tt,""),t.length<2)return"";for(;t.length%4!=0;)t+="=";return t}function J(t){return t.trim?t.trim():t.replace(/^\s+|\s+$/g,"")}function X(t){return t<16?"0"+t.toString(16):t.toString(16)}function q(t,e){e=e||1/0;for(var n,r=t.length,i=null,o=[],s=0;s<r;++s){if((n=t.charCodeAt(s))>55295&&n<57344){if(!i){if(n>56319){(e-=3)>-1&&o.push(239,191,189);continue}if(s+1===r){(e-=3)>-1&&o.push(239,191,189);continue}i=n;continue}if(n<56320){(e-=3)>-1&&o.push(239,191,189),i=n;continue}n=65536+(i-55296<<10|n-56320)}else i&&(e-=3)>-1&&o.push(239,191,189);if(i=null,n<128){if((e-=1)<0)break;o.push(n)}else if(n<2048){if((e-=2)<0)break;o.push(n>>6|192,63&n|128)}else if(n<65536){if((e-=3)<0)break;o.push(n>>12|224,n>>6&63|128,63&n|128)}else{if(!(n<1114112))throw new Error("Invalid code point");if((e-=4)<0)break;o.push(n>>18|240,n>>12&63|128,n>>6&63|128,63&n|128)}}return o}function K(t){for(var e=[],n=0;n<t.length;++n)e.push(255&t.charCodeAt(n));return e}function Y(t,e){for(var n,r,i,o=[],s=0;s<t.length&&!((e-=2)<0);++s)n=t.charCodeAt(s),r=n>>8,i=n%256,o.push(i),o.push(r);return o}function W(t){return V.toByteArray(z(t))}function G(t,e,n,r){for(var i=0;i<r&&!(i+n>=e.length||i>=t.length);++i)e[i+n]=t[i];return i}function H(t){return t!==t}/*!
-+ * The buffer module from node.js, for the browser.
-+ *
-+ * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
-+ * @license  MIT
-+ */
-+var V=n(134),$=n(232),Z=n(234);e.Buffer=o,e.SlowBuffer=m,e.INSPECT_MAX_BYTES=50,o.TYPED_ARRAY_SUPPORT=void 0!==t.TYPED_ARRAY_SUPPORT?t.TYPED_ARRAY_SUPPORT:function(){try{var t=new Uint8Array(1);return t.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}},42===t.foo()&&"function"==typeof t.subarray&&0===t.subarray(1,1).byteLength}catch(t){return!1}}(),e.kMaxLength=r(),o.poolSize=8192,o._augment=function(t){return t.__proto__=o.prototype,t},o.from=function(t,e,n){return s(null,t,e,n)},o.TYPED_ARRAY_SUPPORT&&(o.prototype.__proto__=Uint8Array.prototype,o.__proto__=Uint8Array,"undefined"!=typeof Symbol&&Symbol.species&&o[Symbol.species]===o&&Object.defineProperty(o,Symbol.species,{value:null,configurable:!0})),o.alloc=function(t,e,n){return u(null,t,e,n)},o.allocUnsafe=function(t){return c(null,t)},o.allocUnsafeSlow=function(t){return c(null,t)},o.isBuffer=function(t){return!(null==t||!t._isBuffer)},o.compare=function(t,e){if(!o.isBuffer(t)||!o.isBuffer(e))throw new TypeError("Arguments must be Buffers");if(t===e)return 0;for(var n=t.length,r=e.length,i=0,s=Math.min(n,r);i<s;++i)if(t[i]!==e[i]){n=t[i],r=e[i];break}return n<r?-1:r<n?1:0},o.isEncoding=function(t){switch(String(t).toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"latin1":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return!0;default:return!1}},o.concat=function(t,e){if(!Z(t))throw new TypeError('"list" argument must be an Array of Buffers');if(0===t.length)return o.alloc(0);var n;if(void 0===e)for(e=0,n=0;n<t.length;++n)e+=t[n].length;var r=o.allocUnsafe(e),i=0;for(n=0;n<t.length;++n){var s=t[n];if(!o.isBuffer(s))throw new TypeError('"list" argument must be an Array of Buffers');s.copy(r,i),i+=s.length}return r},o.byteLength=y,o.prototype._isBuffer=!0,o.prototype.swap16=function(){var t=this.length;if(t%2!=0)throw new RangeError("Buffer size must be a multiple of 16-bits");for(var e=0;e<t;e+=2)x(this,e,e+1);return this},o.prototype.swap32=function(){var t=this.length;if(t%4!=0)throw new RangeError("Buffer size must be a multiple of 32-bits");for(var e=0;e<t;e+=4)x(this,e,e+3),x(this,e+1,e+2);return this},o.prototype.swap64=function(){var t=this.length;if(t%8!=0)throw new RangeError("Buffer size must be a multiple of 64-bits");for(var e=0;e<t;e+=8)x(this,e,e+7),x(this,e+1,e+6),x(this,e+2,e+5),x(this,e+3,e+4);return this},o.prototype.toString=function(){var t=0|this.length;return 0===t?"":0===arguments.length?F(this,0,t):v.apply(this,arguments)},o.prototype.equals=function(t){if(!o.isBuffer(t))throw new TypeError("Argument must be a Buffer");return this===t||0===o.compare(this,t)},o.prototype.inspect=function(){var t="",n=e.INSPECT_MAX_BYTES;return this.length>0&&(t=this.toString("hex",0,n).match(/.{2}/g).join(" "),this.length>n&&(t+=" ... ")),"<Buffer "+t+">"},o.prototype.compare=function(t,e,n,r,i){if(!o.isBuffer(t))throw new TypeError("Argument must be a Buffer");if(void 0===e&&(e=0),void 0===n&&(n=t?t.length:0),void 0===r&&(r=0),void 0===i&&(i=this.length),e<0||n>t.length||r<0||i>this.length)throw new RangeError("out of range index");if(r>=i&&e>=n)return 0;if(r>=i)return-1;if(e>=n)return 1;if(e>>>=0,n>>>=0,r>>>=0,i>>>=0,this===t)return 0;for(var s=i-r,a=n-e,u=Math.min(s,a),c=this.slice(r,i),h=t.slice(e,n),l=0;l<u;++l)if(c[l]!==h[l]){s=c[l],a=h[l];break}return s<a?-1:a<s?1:0},o.prototype.includes=function(t,e,n){return-1!==this.indexOf(t,e,n)},o.prototype.indexOf=function(t,e,n){return g(this,t,e,n,!0)},o.prototype.lastIndexOf=function(t,e,n){return g(this,t,e,n,!1)},o.prototype.write=function(t,e,n,r){if(void 0===e)r="utf8",n=this.length,e=0;else if(void 0===n&&"string"==typeof e)r=e,n=this.length,e=0;else{if(!isFinite(e))throw new Error("Buffer.write(string, encoding, offset[, length]) is no longer supported");e|=0,isFinite(n)?(n|=0,void 0===r&&(r="utf8")):(r=n,n=void 0)}var i=this.length-e;if((void 0===n||n>i)&&(n=i),t.length>0&&(n<0||e<0)||e>this.length)throw new RangeError("Attempt to write outside buffer bounds");r||(r="utf8");for(var o=!1;;)switch(r){case"hex":return E(this,t,e,n);case"utf8":case"utf-8":return A(this,t,e,n);case"ascii":return S(this,t,e,n);case"latin1":case"binary":return w(this,t,e,n);case"base64":return C(this,t,e,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return _(this,t,e,n);default:if(o)throw new TypeError("Unknown encoding: "+r);r=(""+r).toLowerCase(),o=!0}},o.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var Q=4096;o.prototype.slice=function(t,e){var n=this.length;t=~~t,e=void 0===e?n:~~e,t<0?(t+=n)<0&&(t=0):t>n&&(t=n),e<0?(e+=n)<0&&(e=0):e>n&&(e=n),e<t&&(e=t);var r;if(o.TYPED_ARRAY_SUPPORT)r=this.subarray(t,e),r.__proto__=o.prototype;else{var i=e-t;r=new o(i,void 0);for(var s=0;s<i;++s)r[s]=this[s+t]}return r},o.prototype.readUIntLE=function(t,e,n){t|=0,e|=0,n||P(t,e,this.length);for(var r=this[t],i=1,o=0;++o<e&&(i*=256);)r+=this[t+o]*i;return r},o.prototype.readUIntBE=function(t,e,n){t|=0,e|=0,n||P(t,e,this.length);for(var r=this[t+--e],i=1;e>0&&(i*=256);)r+=this[t+--e]*i;return r},o.prototype.readUInt8=function(t,e){return e||P(t,1,this.length),this[t]},o.prototype.readUInt16LE=function(t,e){return e||P(t,2,this.length),this[t]|this[t+1]<<8},o.prototype.readUInt16BE=function(t,e){return e||P(t,2,this.length),this[t]<<8|this[t+1]},o.prototype.readUInt32LE=function(t,e){return e||P(t,4,this.length),(this[t]|this[t+1]<<8|this[t+2]<<16)+16777216*this[t+3]},o.prototype.readUInt32BE=function(t,e){return e||P(t,4,this.length),16777216*this[t]+(this[t+1]<<16|this[t+2]<<8|this[t+3])},o.prototype.readIntLE=function(t,e,n){t|=0,e|=0,n||P(t,e,this.length);for(var r=this[t],i=1,o=0;++o<e&&(i*=256);)r+=this[t+o]*i;return i*=128,r>=i&&(r-=Math.pow(2,8*e)),r},o.prototype.readIntBE=function(t,e,n){t|=0,e|=0,n||P(t,e,this.length);for(var r=e,i=1,o=this[t+--r];r>0&&(i*=256);)o+=this[t+--r]*i;return i*=128,o>=i&&(o-=Math.pow(2,8*e)),o},o.prototype.readInt8=function(t,e){return e||P(t,1,this.length),128&this[t]?-1*(255-this[t]+1):this[t]},o.prototype.readInt16LE=function(t,e){e||P(t,2,this.length);var n=this[t]|this[t+1]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt16BE=function(t,e){e||P(t,2,this.length);var n=this[t+1]|this[t]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt32LE=function(t,e){return e||P(t,4,this.length),this[t]|this[t+1]<<8|this[t+2]<<16|this[t+3]<<24},o.prototype.readInt32BE=function(t,e){return e||P(t,4,this.length),this[t]<<24|this[t+1]<<16|this[t+2]<<8|this[t+3]},o.prototype.readFloatLE=function(t,e){return e||P(t,4,this.length),$.read(this,t,!0,23,4)},o.prototype.readFloatBE=function(t,e){return e||P(t,4,this.length),$.read(this,t,!1,23,4)},o.prototype.readDoubleLE=function(t,e){return e||P(t,8,this.length),$.read(this,t,!0,52,8)},o.prototype.readDoubleBE=function(t,e){return e||P(t,8,this.length),$.read(this,t,!1,52,8)},o.prototype.writeUIntLE=function(t,e,n,r){if(t=+t,e|=0,n|=0,!r){N(this,t,e,n,Math.pow(2,8*n)-1,0)}var i=1,o=0;for(this[e]=255&t;++o<n&&(i*=256);)this[e+o]=t/i&255;return e+n},o.prototype.writeUIntBE=function(t,e,n,r){if(t=+t,e|=0,n|=0,!r){N(this,t,e,n,Math.pow(2,8*n)-1,0)}var i=n-1,o=1;for(this[e+i]=255&t;--i>=0&&(o*=256);)this[e+i]=t/o&255;return e+n},o.prototype.writeUInt8=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,1,255,0),o.TYPED_ARRAY_SUPPORT||(t=Math.floor(t)),this[e]=255&t,e+1},o.prototype.writeUInt16LE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8):O(this,t,e,!0),e+2},o.prototype.writeUInt16BE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>8,this[e+1]=255&t):O(this,t,e,!1),e+2},o.prototype.writeUInt32LE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[e+3]=t>>>24,this[e+2]=t>>>16,this[e+1]=t>>>8,this[e]=255&t):R(this,t,e,!0),e+4},o.prototype.writeUInt32BE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>24,this[e+1]=t>>>16,this[e+2]=t>>>8,this[e+3]=255&t):R(this,t,e,!1),e+4},o.prototype.writeIntLE=function(t,e,n,r){if(t=+t,e|=0,!r){var i=Math.pow(2,8*n-1);N(this,t,e,n,i-1,-i)}var o=0,s=1,a=0;for(this[e]=255&t;++o<n&&(s*=256);)t<0&&0===a&&0!==this[e+o-1]&&(a=1),this[e+o]=(t/s>>0)-a&255;return e+n},o.prototype.writeIntBE=function(t,e,n,r){if(t=+t,e|=0,!r){var i=Math.pow(2,8*n-1);N(this,t,e,n,i-1,-i)}var o=n-1,s=1,a=0;for(this[e+o]=255&t;--o>=0&&(s*=256);)t<0&&0===a&&0!==this[e+o+1]&&(a=1),this[e+o]=(t/s>>0)-a&255;return e+n},o.prototype.writeInt8=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,1,127,-128),o.TYPED_ARRAY_SUPPORT||(t=Math.floor(t)),t<0&&(t=255+t+1),this[e]=255&t,e+1},o.prototype.writeInt16LE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8):O(this,t,e,!0),e+2},o.prototype.writeInt16BE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>8,this[e+1]=255&t):O(this,t,e,!1),e+2},o.prototype.writeInt32LE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,4,2147483647,-2147483648),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8,this[e+2]=t>>>16,this[e+3]=t>>>24):R(this,t,e,!0),e+4},o.prototype.writeInt32BE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,4,2147483647,-2147483648),t<0&&(t=4294967295+t+1),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>24,this[e+1]=t>>>16,this[e+2]=t>>>8,this[e+3]=255&t):R(this,t,e,!1),e+4},o.prototype.writeFloatLE=function(t,e,n){return j(this,t,e,!0,n)},o.prototype.writeFloatBE=function(t,e,n){return j(this,t,e,!1,n)},o.prototype.writeDoubleLE=function(t,e,n){return L(this,t,e,!0,n)},o.prototype.writeDoubleBE=function(t,e,n){return L(this,t,e,!1,n)},o.prototype.copy=function(t,e,n,r){if(n||(n=0),r||0===r||(r=this.length),e>=t.length&&(e=t.length),e||(e=0),r>0&&r<n&&(r=n),r===n)return 0;if(0===t.length||0===this.length)return 0;if(e<0)throw new RangeError("targetStart out of bounds");if(n<0||n>=this.length)throw new RangeError("sourceStart out of bounds");if(r<0)throw new RangeError("sourceEnd out of bounds");r>this.length&&(r=this.length),t.length-e<r-n&&(r=t.length-e+n);var i,s=r-n;if(this===t&&n<e&&e<r)for(i=s-1;i>=0;--i)t[i+e]=this[i+n];else if(s<1e3||!o.TYPED_ARRAY_SUPPORT)for(i=0;i<s;++i)t[i+e]=this[i+n];else Uint8Array.prototype.set.call(t,this.subarray(n,n+s),e);return s},o.prototype.fill=function(t,e,n,r){if("string"==typeof t){if("string"==typeof e?(r=e,e=0,n=this.length):"string"==typeof n&&(r=n,n=this.length),1===t.length){var i=t.charCodeAt(0);i<256&&(t=i)}if(void 0!==r&&"string"!=typeof r)throw new TypeError("encoding must be a string");if("string"==typeof r&&!o.isEncoding(r))throw new TypeError("Unknown encoding: "+r)}else"number"==typeof t&&(t&=255);if(e<0||this.length<e||this.length<n)throw new RangeError("Out of range index");if(n<=e)return this;e>>>=0,n=void 0===n?this.length:n>>>0,t||(t=0);var s;if("number"==typeof t)for(s=e;s<n;++s)this[s]=t;else{var a=o.isBuffer(t)?t:q(new o(t,r).toString()),u=a.length;for(s=0;s<n-e;++s)this[s+e]=a[s%u]}return this};var tt=/[^+\/0-9A-Za-z-_]/g}).call(e,n(274))},function(t,e,n){n(215),n(219),n(226),n(108),n(210),n(211),n(216),n(220),n(222),n(206),n(207),n(208),n(209),n(212),n(213),n(214),n(217),n(218),n(221),n(223),n(224),n(225),n(202),n(203),n(204),n(205),t.exports=n(13).String},function(t,e,n){n(200),n(108),n(229),n(201),n(227),n(228),t.exports=n(13).Promise},function(t,e,n){n(93),n(92),t.exports=n(164)},function(t,e,n){n(166);var r=n(5).Object;t.exports=function(t,e){return r.create(t,e)}},function(t,e,n){n(167);var r=n(5).Object;t.exports=function(t,e,n){return r.defineProperty(t,e,n)}},function(t,e,n){n(168),t.exports=n(5).Object.getPrototypeOf},function(t,e,n){n(169),t.exports=n(5).Object.setPrototypeOf},function(t,e,n){n(171),n(170),n(172),n(173),t.exports=n(5).Symbol},function(t,e,n){n(92),n(93),t.exports=n(62).f("iterator")},function(t,e){t.exports=function(t){if("function"!=typeof t)throw TypeError(t+" is not a function!");return t}},function(t,e){t.exports=function(){}},function(t,e,n){var r=n(20),i=n(162),o=n(161);t.exports=function(t){return function(e,n,s){var a,u=r(e),c=i(u.length),h=o(s,c);if(t&&n!=n){for(;c>h;)if((a=u[h++])!=a)return!0}else for(;c>h;h++)if((t||h in u)&&u[h]===n)return t||h||0;return!t&&-1}}},function(t,e,n){var r=n(49),i=n(7)("toStringTag"),o="Arguments"==r(function(){return arguments}()),s=function(t,e){try{return t[e]}catch(t){}};t.exports=function(t){var e,n,a;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=s(e=Object(t),i))?n:o?r(e):"Object"==(a=r(e))&&"function"==typeof e.callee?"Arguments":a}},function(t,e,n){var r=n(54),i=n(87),o=n(55);t.exports=function(t){var e=r(t),n=i.f;if(n)for(var s,a=n(t),u=o.f,c=0;a.length>c;)u.call(t,s=a[c++])&&e.push(s);return e}},function(t,e,n){var r=n(6).document;t.exports=r&&r.documentElement},function(t,e,n){var r=n(49);t.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==r(t)?t.split(""):Object(t)}},function(t,e,n){var r=n(49);t.exports=Array.isArray||function(t){return"Array"==r(t)}},function(t,e,n){"use strict";var r=n(53),i=n(37),o=n(56),s={};n(18)(s,n(7)("iterator"),function(){return this}),t.exports=function(t,e,n){t.prototype=r(s,{next:i(1,n)}),o(t,e+" Iterator")}},function(t,e){t.exports=function(t,e){return{value:e,done:!!t}}},function(t,e,n){var r=n(38)("meta"),i=n(19),o=n(10),s=n(11).f,a=0,u=Object.isExtensible||function(){return!0},c=!n(26)(function(){return u(Object.preventExtensions({}))}),h=function(t){s(t,r,{value:{i:"O"+ ++a,w:{}}})},l=function(t,e){if(!i(t))return"symbol"==typeof t?t:("string"==typeof t?"S":"P")+t;if(!o(t,r)){if(!u(t))return"F";if(!e)return"E";h(t)}return t[r].i},p=function(t,e){if(!o(t,r)){if(!u(t))return!0;if(!e)return!1;h(t)}return t[r].w},f=function(t){return c&&d.NEED&&u(t)&&!o(t,r)&&h(t),t},d=t.exports={KEY:r,NEED:!1,fastKey:l,getWeak:p,onFreeze:f}},function(t,e,n){var r=n(11),i=n(16),o=n(54);t.exports=n(9)?Object.defineProperties:function(t,e){i(t);for(var n,s=o(e),a=s.length,u=0;a>u;)r.f(t,n=s[u++],e[n]);return t}},function(t,e,n){var r=n(20),i=n(86).f,o={}.toString,s="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],a=function(t){try{return i(t)}catch(t){return s.slice()}};t.exports.f=function(t){return s&&"[object Window]"==o.call(t)?a(t):i(r(t))}},function(t,e,n){var r=n(17),i=n(5),o=n(26);t.exports=function(t,e){var n=(i.Object||{})[t]||Object[t],s={};s[t]=e(n),r(r.S+r.F*o(function(){n(1)}),"Object",s)}},function(t,e,n){var r=n(19),i=n(16),o=function(t,e){if(i(t),!r(e)&&null!==e)throw TypeError(e+": can't set as prototype!")};t.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(t,e,r){try{r=n(81)(Function.call,n(85).f(Object.prototype,"__proto__").set,2),r(t,[]),e=!(t instanceof Array)}catch(t){e=!0}return function(t,n){return o(t,n),e?t.__proto__=n:r(t,n),t}}({},!1):void 0),check:o}},function(t,e,n){var r=n(59),i=n(50);t.exports=function(t){return function(e,n){var o,s,a=String(i(e)),u=r(n),c=a.length;return u<0||u>=c?t?"":void 0:(o=a.charCodeAt(u),o<55296||o>56319||u+1===c||(s=a.charCodeAt(u+1))<56320||s>57343?t?a.charAt(u):o:t?a.slice(u,u+2):s-56320+(o-55296<<10)+65536)}}},function(t,e,n){var r=n(59),i=Math.max,o=Math.min;t.exports=function(t,e){return t=r(t),t<0?i(t+e,0):o(t,e)}},function(t,e,n){var r=n(59),i=Math.min;t.exports=function(t){return t>0?i(r(t),9007199254740991):0}},function(t,e,n){var r=n(148),i=n(7)("iterator"),o=n(36);t.exports=n(5).getIteratorMethod=function(t){if(void 0!=t)return t[i]||t["@@iterator"]||o[r(t)]}},function(t,e,n){var r=n(16),i=n(163);t.exports=n(5).getIterator=function(t){var e=i(t);if("function"!=typeof e)throw TypeError(t+" is not iterable!");return r(e.call(t))}},function(t,e,n){"use strict";var r=n(146),i=n(154),o=n(36),s=n(20);t.exports=n(84)(Array,"Array",function(t,e){this._t=s(t),this._i=0,this._k=e},function(){var t=this._t,e=this._k,n=this._i++;return!t||n>=t.length?(this._t=void 0,i(1)):"keys"==e?i(0,n):"values"==e?i(0,t[n]):i(0,[n,t[n]])},"values"),o.Arguments=o.Array,r("keys"),r("values"),r("entries")},function(t,e,n){var r=n(17);r(r.S,"Object",{create:n(53)})},function(t,e,n){var r=n(17);r(r.S+r.F*!n(9),"Object",{defineProperty:n(11).f})},function(t,e,n){var r=n(91),i=n(88);n(158)("getPrototypeOf",function(){return function(t){return i(r(t))}})},function(t,e,n){var r=n(17);r(r.S,"Object",{setPrototypeOf:n(159).set})},function(t,e){},function(t,e,n){"use strict";var r=n(6),i=n(10),o=n(9),s=n(17),a=n(90),u=n(155).KEY,c=n(26),h=n(58),l=n(56),p=n(38),f=n(7),d=n(62),m=n(61),y=n(149),v=n(152),x=n(16),g=n(19),D=n(20),E=n(60),A=n(37),S=n(53),w=n(157),C=n(85),_=n(11),b=n(54),F=C.f,k=_.f,I=w.f,T=r.Symbol,B=r.JSON,M=B&&B.stringify,P=f("_hidden"),N=f("toPrimitive"),O={}.propertyIsEnumerable,R=h("symbol-registry"),U=h("symbols"),j=h("op-symbols"),L=Object.prototype,z="function"==typeof T,J=r.QObject,X=!J||!J.prototype||!J.prototype.findChild,q=o&&c(function(){return 7!=S(k({},"a",{get:function(){return k(this,"a",{value:7}).a}})).a})?function(t,e,n){var r=F(L,e);r&&delete L[e],k(t,e,n),r&&t!==L&&k(L,e,r)}:k,K=function(t){var e=U[t]=S(T.prototype);return e._k=t,e},Y=z&&"symbol"==typeof T.iterator?function(t){return"symbol"==typeof t}:function(t){return t instanceof T},W=function(t,e,n){return t===L&&W(j,e,n),x(t),e=E(e,!0),x(n),i(U,e)?(n.enumerable?(i(t,P)&&t[P][e]&&(t[P][e]=!1),n=S(n,{enumerable:A(0,!1)})):(i(t,P)||k(t,P,A(1,{})),t[P][e]=!0),q(t,e,n)):k(t,e,n)},G=function(t,e){x(t);for(var n,r=y(e=D(e)),i=0,o=r.length;o>i;)W(t,n=r[i++],e[n]);return t},H=function(t,e){return void 0===e?S(t):G(S(t),e)},V=function(t){var e=O.call(this,t=E(t,!0));return!(this===L&&i(U,t)&&!i(j,t))&&(!(e||!i(this,t)||!i(U,t)||i(this,P)&&this[P][t])||e)},$=function(t,e){if(t=D(t),e=E(e,!0),t!==L||!i(U,e)||i(j,e)){var n=F(t,e);return!n||!i(U,e)||i(t,P)&&t[P][e]||(n.enumerable=!0),n}},Z=function(t){for(var e,n=I(D(t)),r=[],o=0;n.length>o;)i(U,e=n[o++])||e==P||e==u||r.push(e);return r},Q=function(t){for(var e,n=t===L,r=I(n?j:D(t)),o=[],s=0;r.length>s;)!i(U,e=r[s++])||n&&!i(L,e)||o.push(U[e]);return o};z||(T=function(){if(this instanceof T)throw TypeError("Symbol is not a constructor!");var t=p(arguments.length>0?arguments[0]:void 0),e=function(n){this===L&&e.call(j,n),i(this,P)&&i(this[P],t)&&(this[P][t]=!1),q(this,t,A(1,n))};return o&&X&&q(L,t,{configurable:!0,set:e}),K(t)},a(T.prototype,"toString",function(){return this._k}),C.f=$,_.f=W,n(86).f=w.f=Z,n(55).f=V,n(87).f=Q,o&&!n(52)&&a(L,"propertyIsEnumerable",V,!0),d.f=function(t){return K(f(t))}),s(s.G+s.W+s.F*!z,{Symbol:T});for(var tt="hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","),et=0;tt.length>et;)f(tt[et++]);for(var nt=b(f.store),rt=0;nt.length>rt;)m(nt[rt++]);s(s.S+s.F*!z,"Symbol",{for:function(t){return i(R,t+="")?R[t]:R[t]=T(t)},keyFor:function(t){if(!Y(t))throw TypeError(t+" is not a symbol!");for(var e in R)if(R[e]===t)return e},useSetter:function(){X=!0},useSimple:function(){X=!1}}),s(s.S+s.F*!z,"Object",{create:H,defineProperty:W,defineProperties:G,getOwnPropertyDescriptor:$,getOwnPropertyNames:Z,getOwnPropertySymbols:Q}),B&&s(s.S+s.F*(!z||c(function(){var t=T();return"[null]"!=M([t])||"{}"!=M({a:t})||"{}"!=M(Object(t))})),"JSON",{stringify:function(t){for(var e,n,r=[t],i=1;arguments.length>i;)r.push(arguments[i++]);if(n=e=r[1],(g(e)||void 0!==t)&&!Y(t))return v(e)||(e=function(t,e){if("function"==typeof n&&(e=n.call(this,t,e)),!Y(e))return e}),r[1]=e,M.apply(B,r)}}),T.prototype[N]||n(18)(T.prototype,N,T.prototype.valueOf),l(T,"Symbol"),l(Math,"Math",!0),l(r.JSON,"JSON",!0)},function(t,e,n){n(61)("asyncIterator")},function(t,e,n){n(61)("observable")},function(t,e,n){var r=n(1)("unscopables"),i=Array.prototype;void 0==i[r]&&n(14)(i,r,{}),t.exports=function(t){i[r][t]=!0}},function(t,e){t.exports=function(t,e,n,r){if(!(t instanceof e)||void 0!==r&&r in t)throw TypeError(n+": incorrect invocation!");return t}},function(t,e,n){var r=n(44),i=n(32),o=n(107);t.exports=function(t){return function(e,n,s){var a,u=r(e),c=i(u.length),h=o(s,c);if(t&&n!=n){for(;c>h;)if((a=u[h++])!=a)return!0}else for(;c>h;h++)if((t||h in u)&&u[h]===n)return t||h||0;return!t&&-1}}},function(t,e,n){var r=n(40),i=n(182),o=n(181),s=n(12),a=n(32),u=n(198),c={},h={},e=t.exports=function(t,e,n,l,p){var f,d,m,y,v=p?function(){return t}:u(t),x=r(n,l,e?2:1),g=0;if("function"!=typeof v)throw TypeError(t+" is not iterable!");if(o(v)){for(f=a(t.length);f>g;g++)if((y=e?x(s(d=t[g])[0],d[1]):x(t[g]))===c||y===h)return y}else for(m=v.call(t);!(d=m.next()).done;)if((y=i(m,x,d.value,e))===c||y===h)return y};e.BREAK=c,e.RETURN=h},function(t,e,n){t.exports=!n(28)&&!n(29)(function(){return 7!=Object.defineProperty(n(64)("div"),"a",{get:function(){return 7}}).a})},function(t,e){t.exports=function(t,e,n){var r=void 0===n;switch(e.length){case 0:return r?t():t.call(n);case 1:return r?t(e[0]):t.call(n,e[0]);case 2:return r?t(e[0],e[1]):t.call(n,e[0],e[1]);case 3:return r?t(e[0],e[1],e[2]):t.call(n,e[0],e[1],e[2]);case 4:return r?t(e[0],e[1],e[2],e[3]):t.call(n,e[0],e[1],e[2],e[3])}return t.apply(n,e)}},function(t,e,n){var r=n(27);t.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==r(t)?t.split(""):Object(t)}},function(t,e,n){var r=n(31),i=n(1)("iterator"),o=Array.prototype;t.exports=function(t){return void 0!==t&&(r.Array===t||o[i]===t)}},function(t,e,n){var r=n(12);t.exports=function(t,e,n,i){try{return i?e(r(n)[0],n[1]):e(n)}catch(e){var o=t.return;throw void 0!==o&&r(o.call(t)),e}}},function(t,e,n){"use strict";var r=n(187),i=n(102),o=n(67),s={};n(14)(s,n(1)("iterator"),function(){return this}),t.exports=function(t,e,n){t.prototype=r(s,{next:i(1,n)}),o(t,e+" Iterator")}},function(t,e,n){var r=n(1)("iterator"),i=!1;try{var o=[7][r]();o.return=function(){i=!0},Array.from(o,function(){throw 2})}catch(t){}t.exports=function(t,e){if(!e&&!i)return!1;var n=!1;try{var o=[7],s=o[r]();s.next=function(){return{done:n=!0}},o[r]=function(){return s},t(o)}catch(t){}return n}},function(t,e){t.exports=function(t,e){return{value:e,done:!!t}}},function(t,e,n){var r=n(4),i=n(106).set,o=r.MutationObserver||r.WebKitMutationObserver,s=r.process,a=r.Promise,u="process"==n(27)(s);t.exports=function(){var t,e,n,c=function(){var r,i;for(u&&(r=s.domain)&&r.exit();t;){i=t.fn,t=t.next;try{i()}catch(r){throw t?n():e=void 0,r}}e=void 0,r&&r.enter()};if(u)n=function(){s.nextTick(c)};else if(!o||r.navigator&&r.navigator.standalone)if(a&&a.resolve){var h=a.resolve();n=function(){h.then(c)}}else n=function(){i.call(r,c)};else{var l=!0,p=document.createTextNode("");new o(c).observe(p,{characterData:!0}),n=function(){p.data=l=!l}}return function(r){var i={fn:r,next:void 0};e&&(e.next=i),t||(t=i,n()),e=i}}},function(t,e,n){var r=n(12),i=n(188),o=n(94),s=n(68)("IE_PROTO"),a=function(){},u=function(){var t,e=n(64)("iframe"),r=o.length;for(e.style.display="none",n(95).appendChild(e),e.src="javascript:",t=e.contentWindow.document,t.open(),t.write("<script>document.F=Object<\/script>"),t.close(),u=t.F;r--;)delete u.prototype[o[r]];return u()};t.exports=Object.create||function(t,e){var n;return null!==t?(a.prototype=r(t),n=new a,a.prototype=null,n[s]=t):n=u(),void 0===e?n:i(n,e)}},function(t,e,n){var r=n(42),i=n(12),o=n(99);t.exports=n(28)?Object.defineProperties:function(t,e){i(t);for(var n,s=o(e),a=s.length,u=0;a>u;)r.f(t,n=s[u++],e[n]);return t}},function(t,e,n){var r=n(30),i=n(196),o=n(68)("IE_PROTO"),s=Object.prototype;t.exports=Object.getPrototypeOf||function(t){return t=i(t),r(t,o)?t[o]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?s:null}},function(t,e,n){var r=n(30),i=n(44),o=n(176)(!1),s=n(68)("IE_PROTO");t.exports=function(t,e){var n,a=i(t),u=0,c=[];for(n in a)n!=s&&r(a,n)&&c.push(n);for(;e.length>u;)r(a,n=e[u++])&&(~o(c,n)||c.push(n));return c}},function(t,e,n){var r=n(22);t.exports=function(t,e,n){for(var i in e)r(t,i,e[i],n);return t}},function(t,e,n){"use strict";var r=n(4),i=n(42),o=n(28),s=n(1)("species");t.exports=function(t){var e=r[t];o&&e&&!e[s]&&i.f(e,s,{configurable:!0,get:function(){return this}})}},function(t,e,n){"use strict";var r=n(43),i=n(8);t.exports=function(t){var e=String(i(this)),n="",o=r(t);if(o<0||o==1/0)throw RangeError("Count can't be negative");for(;o>0;(o>>>=1)&&(e+=e))1&o&&(n+=e);return n}},function(t,e,n){var r=n(2),i=n(8),o=n(29),s=n(195),a="["+s+"]",u="​…",c=RegExp("^"+a+a+"*"),h=RegExp(a+a+"*$"),l=function(t,e,n){var i={},a=o(function(){return!!s[t]()||u[t]()!=u}),c=i[t]=a?e(p):s[t];n&&(i[n]=c),r(r.P+r.F*a,"String",i)},p=l.trim=function(t,e){return t=String(i(t)),1&e&&(t=t.replace(c,"")),2&e&&(t=t.replace(h,"")),t};t.exports=l},function(t,e){t.exports="\t\n\v\f\r   ᠎             　\u2028\u2029\ufeff"},function(t,e,n){var r=n(8);t.exports=function(t){return Object(r(t))}},function(t,e,n){var r=n(21);t.exports=function(t,e){if(!r(t))return t;var n,i;if(e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;if("function"==typeof(n=t.valueOf)&&!r(i=n.call(t)))return i;if(!e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;throw TypeError("Can't convert object to primitive value")}},function(t,e,n){var r=n(63),i=n(1)("iterator"),o=n(31);t.exports=n(13).getIteratorMethod=function(t){if(void 0!=t)return t[i]||t["@@iterator"]||o[r(t)]}},function(t,e,n){"use strict";var r=n(174),i=n(185),o=n(31),s=n(44);t.exports=n(97)(Array,"Array",function(t,e){this._t=s(t),this._i=0,this._k=e},function(){var t=this._t,e=this._k,n=this._i++;return!t||n>=t.length?(this._t=void 0,i(1)):"keys"==e?i(0,n):"values"==e?i(0,t[n]):i(0,[n,t[n]])},"values"),o.Arguments=o.Array,r("keys"),r("values"),r("entries")},function(t,e,n){"use strict";var r=n(63),i={};i[n(1)("toStringTag")]="z",i+""!="[object z]"&&n(22)(Object.prototype,"toString",function(){return"[object "+r(this)+"]"},!0)},function(t,e,n){"use strict";var r,i,o,s,a=n(98),u=n(4),c=n(40),h=n(63),l=n(2),p=n(21),f=n(39),d=n(175),m=n(177),y=n(104),v=n(106).set,x=n(186)(),g=n(66),D=n(100),E=n(101),A=u.TypeError,S=u.process,w=u.Promise,C="process"==h(S),_=function(){},b=i=g.f,F=!!function(){try{var t=w.resolve(1),e=(t.constructor={})[n(1)("species")]=function(t){t(_,_)};return(C||"function"==typeof PromiseRejectionEvent)&&t.then(_)instanceof e}catch(t){}}(),k=function(t){var e;return!(!p(t)||"function"!=typeof(e=t.then))&&e},I=function(t,e){if(!t._n){t._n=!0;var n=t._c;x(function(){for(var r=t._v,i=1==t._s,o=0;n.length>o;)!function(e){var n,o,s=i?e.ok:e.fail,a=e.resolve,u=e.reject,c=e.domain;try{s?(i||(2==t._h&&M(t),t._h=1),!0===s?n=r:(c&&c.enter(),n=s(r),c&&c.exit()),n===e.promise?u(A("Promise-chain cycle")):(o=k(n))?o.call(n,a,u):a(n)):u(r)}catch(t){u(t)}}(n[o++]);t._c=[],t._n=!1,e&&!t._h&&T(t)})}},T=function(t){v.call(u,function(){var e,n,r,i=t._v,o=B(t);if(o&&(e=D(function(){C?S.emit("unhandledRejection",i,t):(n=u.onunhandledrejection)?n({promise:t,reason:i}):(r=u.console)&&r.error&&r.error("Unhandled promise rejection",i)}),t._h=C||B(t)?2:1),t._a=void 0,o&&e.e)throw e.v})},B=function(t){return 1!==t._h&&0===(t._a||t._c).length},M=function(t){v.call(u,function(){var e;C?S.emit("rejectionHandled",t):(e=u.onrejectionhandled)&&e({promise:t,reason:t._v})})},P=function(t){var e=this;e._d||(e._d=!0,e=e._w||e,e._v=t,e._s=2,e._a||(e._a=e._c.slice()),I(e,!0))},N=function(t){var e,n=this;if(!n._d){n._d=!0,n=n._w||n;try{if(n===t)throw A("Promise can't be resolved itself");(e=k(t))?x(function(){var r={_w:n,_d:!1};try{e.call(t,c(N,r,1),c(P,r,1))}catch(t){P.call(r,t)}}):(n._v=t,n._s=1,I(n,!1))}catch(t){P.call({_w:n,_d:!1},t)}}};F||(w=function(t){d(this,w,"Promise","_h"),f(t),r.call(this);try{t(c(N,this,1),c(P,this,1))}catch(t){P.call(this,t)}},r=function(t){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1},r.prototype=n(191)(w.prototype,{then:function(t,e){var n=b(y(this,w));return n.ok="function"!=typeof t||t,n.fail="function"==typeof e&&e,n.domain=C?S.domain:void 0,this._c.push(n),this._a&&this._a.push(n),this._s&&I(this,!1),n.promise},catch:function(t){return this.then(void 0,t)}}),o=function(){var t=new r;this.promise=t,this.resolve=c(N,t,1),this.reject=c(P,t,1)},g.f=b=function(t){return t===w||t===s?new o(t):i(t)}),l(l.G+l.W+l.F*!F,{Promise:w}),n(67)(w,"Promise"),n(192)("Promise"),s=n(13).Promise,l(l.S+l.F*!F,"Promise",{reject:function(t){var e=b(this);return(0,e.reject)(t),e.promise}}),l(l.S+l.F*(a||!F),"Promise",{resolve:function(t){return E(a&&this===s?w:this,t)}}),l(l.S+l.F*!(F&&n(184)(function(t){w.all(t).catch(_)})),"Promise",{all:function(t){var e=this,n=b(e),r=n.resolve,i=n.reject,o=D(function(){var n=[],o=0,s=1;m(t,!1,function(t){var a=o++,u=!1;n.push(void 0),s++,e.resolve(t).then(function(t){u||(u=!0,n[a]=t,--s||r(n))},i)}),--s||r(n)});return o.e&&i(o.v),n.promise},race:function(t){var e=this,n=b(e),r=n.reject,i=D(function(){m(t,!1,function(t){e.resolve(t).then(n.resolve,r)})});return i.e&&r(i.v),n.promise}})},function(t,e,n){n(41)("match",1,function(t,e,n){return[function(n){"use strict";var r=t(this),i=void 0==n?void 0:n[e];return void 0!==i?i.call(n,r):new RegExp(n)[e](String(r))},n]})},function(t,e,n){n(41)("replace",2,function(t,e,n){return[function(r,i){"use strict";var o=t(this),s=void 0==r?void 0:r[e];return void 0!==s?s.call(r,o,i):n.call(String(o),r,i)},n]})},function(t,e,n){n(41)("search",1,function(t,e,n){return[function(n){"use strict";var r=t(this),i=void 0==n?void 0:n[e];return void 0!==i?i.call(n,r):new RegExp(n)[e](String(r))},n]})},function(t,e,n){n(41)("split",2,function(t,e,r){"use strict";var i=n(96),o=r,s=[].push,a="length";if("c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1)[a]||2!="ab".split(/(?:ab)*/)[a]||4!=".".split(/(.?)(.?)/)[a]||".".split(/()()/)[a]>1||"".split(/.?/)[a]){var u=void 0===/()??/.exec("")[1];r=function(t,e){var n=String(this);if(void 0===t&&0===e)return[];if(!i(t))return o.call(n,t,e);var r,c,h,l,p,f=[],d=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),m=0,y=void 0===e?4294967295:e>>>0,v=new RegExp(t.source,d+"g");for(u||(r=new RegExp("^"+v.source+"$(?!\\s)",d));(c=v.exec(n))&&!((h=c.index+c[0][a])>m&&(f.push(n.slice(m,c.index)),!u&&c[a]>1&&c[0].replace(r,function(){for(p=1;p<arguments[a]-2;p++)void 0===arguments[p]&&(c[p]=void 0)}),c[a]>1&&c.index<n[a]&&s.apply(f,c.slice(1)),l=c[0][a],m=h,f[a]>=y));)v.lastIndex===c.index&&v.lastIndex++;return m===n[a]?!l&&v.test("")||f.push(""):f.push(n.slice(m)),f[a]>y?f.slice(0,y):f}}else"0".split(void 0,0)[a]&&(r=function(t,e){return void 0===t&&0===e?[]:o.call(this,t,e)});return[function(n,i){var o=t(this),s=void 0==n?void 0:n[e];return void 0!==s?s.call(n,o,i):r.call(String(o),n,i)},r]})},function(t,e,n){"use strict";n(3)("anchor",function(t){return function(e){return t(this,"a","name",e)}})},function(t,e,n){"use strict";n(3)("big",function(t){return function(){return t(this,"big","","")}})},function(t,e,n){"use strict";n(3)("blink",function(t){return function(){return t(this,"blink","","")}})},function(t,e,n){"use strict";n(3)("bold",function(t){return function(){return t(this,"b","","")}})},function(t,e,n){"use strict";var r=n(2),i=n(105)(!1);r(r.P,"String",{codePointAt:function(t){return i(this,t)}})},function(t,e,n){"use strict";var r=n(2),i=n(32),o=n(69),s="".endsWith;r(r.P+r.F*n(65)("endsWith"),"String",{endsWith:function(t){var e=o(this,t,"endsWith"),n=arguments.length>1?arguments[1]:void 0,r=i(e.length),a=void 0===n?r:Math.min(i(n),r),u=String(t);return s?s.call(e,u,a):e.slice(a-u.length,a)===u}})},function(t,e,n){"use strict";n(3)("fixed",function(t){return function(){return t(this,"tt","","")}})},function(t,e,n){"use strict";n(3)("fontcolor",function(t){return function(e){return t(this,"font","color",e)}})},function(t,e,n){"use strict";n(3)("fontsize",function(t){return function(e){return t(this,"font","size",e)}})},function(t,e,n){var r=n(2),i=n(107),o=String.fromCharCode,s=String.fromCodePoint;r(r.S+r.F*(!!s&&1!=s.length),"String",{fromCodePoint:function(t){for(var e,n=[],r=arguments.length,s=0;r>s;){if(e=+arguments[s++],i(e,1114111)!==e)throw RangeError(e+" is not a valid code point");n.push(e<65536?o(e):o(55296+((e-=65536)>>10),e%1024+56320))}return n.join("")}})},function(t,e,n){"use strict";var r=n(2),i=n(69);r(r.P+r.F*n(65)("includes"),"String",{includes:function(t){return!!~i(this,t,"includes").indexOf(t,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){"use strict";n(3)("italics",function(t){return function(){return t(this,"i","","")}})},function(t,e,n){"use strict";n(3)("link",function(t){return function(e){return t(this,"a","href",e)}})},function(t,e,n){var r=n(2),i=n(44),o=n(32);r(r.S,"String",{raw:function(t){for(var e=i(t.raw),n=o(e.length),r=arguments.length,s=[],a=0;n>a;)s.push(String(e[a++])),a<r&&s.push(String(arguments[a]));return s.join("")}})},function(t,e,n){var r=n(2);r(r.P,"String",{repeat:n(193)})},function(t,e,n){"use strict";n(3)("small",function(t){return function(){return t(this,"small","","")}})},function(t,e,n){"use strict";var r=n(2),i=n(32),o=n(69),s="".startsWith;r(r.P+r.F*n(65)("startsWith"),"String",{startsWith:function(t){var e=o(this,t,"startsWith"),n=i(Math.min(arguments.length>1?arguments[1]:void 0,e.length)),r=String(t);return s?s.call(e,r,n):e.slice(n,n+r.length)===r}})},function(t,e,n){"use strict";n(3)("strike",function(t){return function(){return t(this,"strike","","")}})},function(t,e,n){"use strict";n(3)("sub",function(t){return function(){return t(this,"sub","","")}})},function(t,e,n){"use strict";n(3)("sup",function(t){return function(){return t(this,"sup","","")}})},function(t,e,n){"use strict";n(194)("trim",function(t){return function(){return t(this,3)}})},function(t,e,n){"use strict";var r=n(2),i=n(13),o=n(4),s=n(104),a=n(101);r(r.P+r.R,"Promise",{finally:function(t){var e=s(this,i.Promise||o.Promise),n="function"==typeof t;return this.then(n?function(n){return a(e,t()).then(function(){return n})}:t,n?function(n){return a(e,t()).then(function(){throw n})}:t)}})},function(t,e,n){"use strict";var r=n(2),i=n(66),o=n(100);r(r.S,"Promise",{try:function(t){var e=i.f(this),n=o(t);return(n.e?e.reject:e.resolve)(n.v),e.promise}})},function(t,e,n){for(var r=n(199),i=n(99),o=n(22),s=n(4),a=n(14),u=n(31),c=n(1),h=c("iterator"),l=c("toStringTag"),p=u.Array,f={CSSRuleList:!0,CSSStyleDeclaration:!1,CSSValueList:!1,ClientRectList:!1,DOMRectList:!1,DOMStringList:!1,DOMTokenList:!0,DataTransferItemList:!1,FileList:!1,HTMLAllCollection:!1,HTMLCollection:!1,HTMLFormElement:!1,HTMLSelectElement:!1,MediaList:!0,MimeTypeArray:!1,NamedNodeMap:!1,NodeList:!0,PaintRequestList:!1,Plugin:!1,PluginArray:!1,SVGLengthList:!1,SVGNumberList:!1,SVGPathSegList:!1,SVGPointList:!1,SVGStringList:!1,SVGTransformList:!1,SourceBufferList:!1,StyleSheetList:!0,TextTrackCueList:!1,TextTrackList:!1,TouchList:!1},d=i(f),m=0;m<d.length;m++){var y,v=d[m],x=f[v],g=s[v],D=g&&g.prototype;if(D&&(D[h]||a(D,h,p),D[l]||a(D,l,v),u[v]=p,x))for(y in r)D[y]||o(D,y,r[y],!0)}},function(t,e,n){"use strict";function r(t){return t}function i(t,e,n){function i(t,e){var n=x.hasOwnProperty(e)?x[e]:null;A.hasOwnProperty(e)&&a("OVERRIDE_BASE"===n,"ReactClassInterface: You are attempting to override `%s` from your class specification. Ensure that your method names do not overlap with React methods.",e),t&&a("DEFINE_MANY"===n||"DEFINE_MANY_MERGED"===n,"ReactClassInterface: You are attempting to define `%s` on your component more than once. This conflict may be due to a mixin.",e)}function c(t,n){if(n){a("function"!=typeof n,"ReactClass: You're attempting to use a component class or function as a mixin. Instead, just use a regular object."),a(!e(n),"ReactClass: You're attempting to use a component as a mixin. Instead, just use a regular object.");var r=t.prototype,o=r.__reactAutoBindPairs;n.hasOwnProperty(u)&&g.mixins(t,n.mixins);for(var s in n)if(n.hasOwnProperty(s)&&s!==u){var c=n[s],h=r.hasOwnProperty(s);if(i(h,s),g.hasOwnProperty(s))g[s](t,c);else{var l=x.hasOwnProperty(s),d="function"==typeof c,m=d&&!l&&!h&&!1!==n.autobind;if(m)o.push(s,c),r[s]=c;else if(h){var y=x[s];a(l&&("DEFINE_MANY_MERGED"===y||"DEFINE_MANY"===y),"ReactClass: Unexpected spec policy %s for key %s when mixing in component specs.",y,s),"DEFINE_MANY_MERGED"===y?r[s]=p(r[s],c):"DEFINE_MANY"===y&&(r[s]=f(r[s],c))}else r[s]=c}}}else;}function h(t,e){if(e)for(var n in e){var r=e[n];if(e.hasOwnProperty(n)){var i=n in g;a(!i,'ReactClass: You are attempting to define a reserved property, `%s`, that shouldn\'t be on the "statics" key. Define it as an instance property instead; it will still be accessible on the constructor.',n);var o=n in t;a(!o,"ReactClass: You are attempting to define `%s` on your component more than once. This conflict may be due to a mixin.",n),t[n]=r}}}function l(t,e){a(t&&e&&"object"==typeof t&&"object"==typeof e,"mergeIntoWithNoDuplicateKeys(): Cannot merge non-objects.");for(var n in e)e.hasOwnProperty(n)&&(a(void 0===t[n],"mergeIntoWithNoDuplicateKeys(): Tried to merge two objects with the same key: `%s`. This conflict may be due to a mixin; in particular, this may be caused by two getInitialState() or getDefaultProps() methods returning objects with clashing keys.",n),t[n]=e[n]);return t}function p(t,e){return function(){var n=t.apply(this,arguments),r=e.apply(this,arguments);if(null==n)return r;if(null==r)return n;var i={};return l(i,n),l(i,r),i}}function f(t,e){return function(){t.apply(this,arguments),e.apply(this,arguments)}}function d(t,e){var n=e.bind(t);return n}function m(t){for(var e=t.__reactAutoBindPairs,n=0;n<e.length;n+=2){var r=e[n],i=e[n+1];t[r]=d(t,i)}}function y(t){var e=r(function(t,r,i){this.__reactAutoBindPairs.length&&m(this),this.props=t,this.context=r,this.refs=s,this.updater=i||n,this.state=null;var o=this.getInitialState?this.getInitialState():null;a("object"==typeof o&&!Array.isArray(o),"%s.getInitialState(): must return an object or null",e.displayName||"ReactCompositeComponent"),this.state=o});e.prototype=new S,e.prototype.constructor=e,e.prototype.__reactAutoBindPairs=[],v.forEach(c.bind(null,e)),c(e,D),c(e,t),c(e,E),e.getDefaultProps&&(e.defaultProps=e.getDefaultProps()),a(e.prototype.render,"createClass(...): Class specification must implement a `render` method.");for(var i in x)e.prototype[i]||(e.prototype[i]=null);return e}var v=[],x={mixins:"DEFINE_MANY",statics:"DEFINE_MANY",propTypes:"DEFINE_MANY",contextTypes:"DEFINE_MANY",childContextTypes:"DEFINE_MANY",getDefaultProps:"DEFINE_MANY_MERGED",getInitialState:"DEFINE_MANY_MERGED",getChildContext:"DEFINE_MANY_MERGED",render:"DEFINE_ONCE",componentWillMount:"DEFINE_MANY",componentDidMount:"DEFINE_MANY",componentWillReceiveProps:"DEFINE_MANY",shouldComponentUpdate:"DEFINE_ONCE",componentWillUpdate:"DEFINE_MANY",componentDidUpdate:"DEFINE_MANY",componentWillUnmount:"DEFINE_MANY",updateComponent:"OVERRIDE_BASE"},g={displayName:function(t,e){t.displayName=e},mixins:function(t,e){if(e)for(var n=0;n<e.length;n++)c(t,e[n])},childContextTypes:function(t,e){t.childContextTypes=o({},t.childContextTypes,e)},contextTypes:function(t,e){t.contextTypes=o({},t.contextTypes,e)},getDefaultProps:function(t,e){t.getDefaultProps?t.getDefaultProps=p(t.getDefaultProps,e):t.getDefaultProps=e},propTypes:function(t,e){t.propTypes=o({},t.propTypes,e)},statics:function(t,e){h(t,e)},autobind:function(){}},D={componentDidMount:function(){this.__isMounted=!0}},E={componentWillUnmount:function(){this.__isMounted=!1}},A={replaceState:function(t,e){this.updater.enqueueReplaceState(this,t,e)},isMounted:function(){return!!this.__isMounted}},S=function(){};return o(S.prototype,t.prototype,A),y}var o=n(35),s=n(109),a=n(15),u="mixins";t.exports=i},function(t,e,n){!function(e,n){t.exports=n()}(0,function(){return function(t){function e(r){if(n[r])return n[r].exports;var i=n[r]={exports:{},id:r,loaded:!1};return t[r].call(i.exports,i,i.exports,e),i.loaded=!0,i.exports}var n={};return e.m=t,e.c=n,e.p="",e(0)}([function(t,e,n){"use strict";function r(t,e,n){var r=null,i=function(t,e){n&&n(t,e),r&&r.visit(t,e)},o="function"==typeof n?i:null,s=!1;if(e){s="boolean"==typeof e.comment&&e.comment;var h="boolean"==typeof e.attachComment&&e.attachComment;(s||h)&&(r=new a.CommentHandler,r.attach=h,e.comment=!0,o=i)}var l=!1;e&&"string"==typeof e.sourceType&&(l="module"===e.sourceType);var p;p=e&&"boolean"==typeof e.jsx&&e.jsx?new u.JSXParser(t,e,o):new c.Parser(t,e,o);var f=l?p.parseModule():p.parseScript(),d=f;return s&&r&&(d.comments=r.comments),p.config.tokens&&(d.tokens=p.tokens),p.config.tolerant&&(d.errors=p.errorHandler.errors),d}function i(t,e,n){var i=e||{};return i.sourceType="module",r(t,i,n)}function o(t,e,n){var i=e||{};return i.sourceType="script",r(t,i,n)}function s(t,e,n){var r,i=new h.Tokenizer(t,e);r=[];try{for(;;){var o=i.getNextToken();if(!o)break;n&&(o=n(o)),r.push(o)}}catch(t){i.errorHandler.tolerate(t)}return i.errorHandler.tolerant&&(r.errors=i.errors()),r}Object.defineProperty(e,"__esModule",{value:!0});var a=n(1),u=n(3),c=n(8),h=n(15);e.parse=r,e.parseModule=i,e.parseScript=o,e.tokenize=s;var l=n(2);e.Syntax=l.Syntax,e.version="4.0.0"},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(2),i=function(){function t(){this.attach=!1,this.comments=[],this.stack=[],this.leading=[],this.trailing=[]}return t.prototype.insertInnerComments=function(t,e){if(t.type===r.Syntax.BlockStatement&&0===t.body.length){for(var n=[],i=this.leading.length-1;i>=0;--i){var o=this.leading[i];e.end.offset>=o.start&&(n.unshift(o.comment),this.leading.splice(i,1),this.trailing.splice(i,1))}n.length&&(t.innerComments=n)}},t.prototype.findTrailingComments=function(t){var e=[];if(this.trailing.length>0){for(var n=this.trailing.length-1;n>=0;--n){var r=this.trailing[n];r.start>=t.end.offset&&e.unshift(r.comment)}return this.trailing.length=0,e}var i=this.stack[this.stack.length-1];if(i&&i.node.trailingComments){var o=i.node.trailingComments[0];o&&o.range[0]>=t.end.offset&&(e=i.node.trailingComments,delete i.node.trailingComments)}return e},t.prototype.findLeadingComments=function(t){for(var e,n=[];this.stack.length>0;){var r=this.stack[this.stack.length-1];if(!(r&&r.start>=t.start.offset))break;e=r.node,this.stack.pop()}if(e){for(var i=e.leadingComments?e.leadingComments.length:0,o=i-1;o>=0;--o){var s=e.leadingComments[o];s.range[1]<=t.start.offset&&(n.unshift(s),e.leadingComments.splice(o,1))}return e.leadingComments&&0===e.leadingComments.length&&delete e.leadingComments,n}for(var o=this.leading.length-1;o>=0;--o){var r=this.leading[o];r.start<=t.start.offset&&(n.unshift(r.comment),this.leading.splice(o,1))}return n},t.prototype.visitNode=function(t,e){if(!(t.type===r.Syntax.Program&&t.body.length>0)){this.insertInnerComments(t,e);var n=this.findTrailingComments(e),i=this.findLeadingComments(e);i.length>0&&(t.leadingComments=i),n.length>0&&(t.trailingComments=n),this.stack.push({node:t,start:e.start.offset})}},t.prototype.visitComment=function(t,e){var n="L"===t.type[0]?"Line":"Block",r={type:n,value:t.value};if(t.range&&(r.range=t.range),t.loc&&(r.loc=t.loc),this.comments.push(r),this.attach){var i={comment:{type:n,value:t.value,range:[e.start.offset,e.end.offset]},start:e.start.offset};t.loc&&(i.comment.loc=t.loc),t.type=n,this.leading.push(i),this.trailing.push(i)}},t.prototype.visit=function(t,e){"LineComment"===t.type?this.visitComment(t,e):"BlockComment"===t.type?this.visitComment(t,e):this.attach&&this.visitNode(t,e)},t}();e.CommentHandler=i},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.Syntax={AssignmentExpression:"AssignmentExpression",AssignmentPattern:"AssignmentPattern",ArrayExpression:"ArrayExpression",ArrayPattern:"ArrayPattern",ArrowFunctionExpression:"ArrowFunctionExpression",AwaitExpression:"AwaitExpression",BlockStatement:"BlockStatement",BinaryExpression:"BinaryExpression",BreakStatement:"BreakStatement",CallExpression:"CallExpression",CatchClause:"CatchClause",ClassBody:"ClassBody",ClassDeclaration:"ClassDeclaration",ClassExpression:"ClassExpression",ConditionalExpression:"ConditionalExpression",ContinueStatement:"ContinueStatement",DoWhileStatement:"DoWhileStatement",DebuggerStatement:"DebuggerStatement",EmptyStatement:"EmptyStatement",ExportAllDeclaration:"ExportAllDeclaration",ExportDefaultDeclaration:"ExportDefaultDeclaration",ExportNamedDeclaration:"ExportNamedDeclaration",ExportSpecifier:"ExportSpecifier",ExpressionStatement:"ExpressionStatement",ForStatement:"ForStatement",ForOfStatement:"ForOfStatement",ForInStatement:"ForInStatement",FunctionDeclaration:"FunctionDeclaration",FunctionExpression:"FunctionExpression",Identifier:"Identifier",IfStatement:"IfStatement",ImportDeclaration:"ImportDeclaration",ImportDefaultSpecifier:"ImportDefaultSpecifier",ImportNamespaceSpecifier:"ImportNamespaceSpecifier",ImportSpecifier:"ImportSpecifier",Literal:"Literal",LabeledStatement:"LabeledStatement",LogicalExpression:"LogicalExpression",MemberExpression:"MemberExpression",MetaProperty:"MetaProperty",MethodDefinition:"MethodDefinition",NewExpression:"NewExpression",ObjectExpression:"ObjectExpression",ObjectPattern:"ObjectPattern",Program:"Program",Property:"Property",RestElement:"RestElement",ReturnStatement:"ReturnStatement",SequenceExpression:"SequenceExpression",SpreadElement:"SpreadElement",Super:"Super",SwitchCase:"SwitchCase",SwitchStatement:"SwitchStatement",TaggedTemplateExpression:"TaggedTemplateExpression",TemplateElement:"TemplateElement",TemplateLiteral:"TemplateLiteral",ThisExpression:"ThisExpression",ThrowStatement:"ThrowStatement",TryStatement:"TryStatement",UnaryExpression:"UnaryExpression",UpdateExpression:"UpdateExpression",VariableDeclaration:"VariableDeclaration",VariableDeclarator:"VariableDeclarator",WhileStatement:"WhileStatement",WithStatement:"WithStatement",YieldExpression:"YieldExpression"}},function(t,e,n){"use strict";function r(t){var e;switch(t.type){case a.JSXSyntax.JSXIdentifier:e=t.name;break;case a.JSXSyntax.JSXNamespacedName:var n=t;e=r(n.namespace)+":"+r(n.name);break;case a.JSXSyntax.JSXMemberExpression:var i=t;e=r(i.object)+"."+r(i.property)}return e}var i=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(4),s=n(5),a=n(6),u=n(7),c=n(8),h=n(13),l=n(14);h.TokenName[100]="JSXIdentifier",h.TokenName[101]="JSXText";var p=function(t){function e(e,n,r){return t.call(this,e,n,r)||this}return i(e,t),e.prototype.parsePrimaryExpression=function(){return this.match("<")?this.parseJSXRoot():t.prototype.parsePrimaryExpression.call(this)},e.prototype.startJSX=function(){this.scanner.index=this.startMarker.index,this.scanner.lineNumber=this.startMarker.line,this.scanner.lineStart=this.startMarker.index-this.startMarker.column},e.prototype.finishJSX=function(){this.nextToken()},e.prototype.reenterJSX=function(){this.startJSX(),this.expectJSX("}"),this.config.tokens&&this.tokens.pop()},e.prototype.createJSXNode=function(){return this.collectComments(),{index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}},e.prototype.createJSXChildNode=function(){return{index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}},e.prototype.scanXHTMLEntity=function(t){for(var e="&",n=!0,r=!1,i=!1,s=!1;!this.scanner.eof()&&n&&!r;){var a=this.scanner.source[this.scanner.index];if(a===t)break;if(r=";"===a,e+=a,++this.scanner.index,!r)switch(e.length){case 2:i="#"===a;break;case 3:i&&(s="x"===a,n=s||o.Character.isDecimalDigit(a.charCodeAt(0)),i=i&&!s);break;default:n=n&&!(i&&!o.Character.isDecimalDigit(a.charCodeAt(0))),n=n&&!(s&&!o.Character.isHexDigit(a.charCodeAt(0)))}}if(n&&r&&e.length>2){var u=e.substr(1,e.length-2);i&&u.length>1?e=String.fromCharCode(parseInt(u.substr(1),10)):s&&u.length>2?e=String.fromCharCode(parseInt("0"+u.substr(1),16)):i||s||!l.XHTMLEntities[u]||(e=l.XHTMLEntities[u])}return e},e.prototype.lexJSX=function(){var t=this.scanner.source.charCodeAt(this.scanner.index);if(60===t||62===t||47===t||58===t||61===t||123===t||125===t){var e=this.scanner.source[this.scanner.index++];return{type:7,value:e,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:this.scanner.index-1,end:this.scanner.index}}if(34===t||39===t){for(var n=this.scanner.index,r=this.scanner.source[this.scanner.index++],i="";!this.scanner.eof();){var s=this.scanner.source[this.scanner.index++];if(s===r)break;i+="&"===s?this.scanXHTMLEntity(r):s}return{type:8,value:i,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}if(46===t){var a=this.scanner.source.charCodeAt(this.scanner.index+1),u=this.scanner.source.charCodeAt(this.scanner.index+2),e=46===a&&46===u?"...":".",n=this.scanner.index;return this.scanner.index+=e.length,{type:7,value:e,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}if(96===t)return{type:10,value:"",lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:this.scanner.index,end:this.scanner.index};if(o.Character.isIdentifierStart(t)&&92!==t){var n=this.scanner.index;for(++this.scanner.index;!this.scanner.eof();){var s=this.scanner.source.charCodeAt(this.scanner.index);if(o.Character.isIdentifierPart(s)&&92!==s)++this.scanner.index;else{if(45!==s)break;++this.scanner.index}}return{type:100,value:this.scanner.source.slice(n,this.scanner.index),lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}return this.scanner.lex()},e.prototype.nextJSXToken=function(){this.collectComments(),this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart;var t=this.lexJSX();return this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.config.tokens&&this.tokens.push(this.convertToken(t)),t},e.prototype.nextJSXText=function(){this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart;for(var t=this.scanner.index,e="";!this.scanner.eof();){var n=this.scanner.source[this.scanner.index];if("{"===n||"<"===n)break;++this.scanner.index,e+=n,o.Character.isLineTerminator(n.charCodeAt(0))&&(++this.scanner.lineNumber,"\r"===n&&"\n"===this.scanner.source[this.scanner.index]&&++this.scanner.index,this.scanner.lineStart=this.scanner.index)}this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart;var r={type:101,value:e,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:t,end:this.scanner.index};return e.length>0&&this.config.tokens&&this.tokens.push(this.convertToken(r)),r},e.prototype.peekJSXToken=function(){var t=this.scanner.saveState();this.scanner.scanComments();var e=this.lexJSX();return this.scanner.restoreState(t),e},e.prototype.expectJSX=function(t){var e=this.nextJSXToken();7===e.type&&e.value===t||this.throwUnexpectedToken(e)},e.prototype.matchJSX=function(t){var e=this.peekJSXToken();return 7===e.type&&e.value===t},e.prototype.parseJSXIdentifier=function(){var t=this.createJSXNode(),e=this.nextJSXToken();return 100!==e.type&&this.throwUnexpectedToken(e),this.finalize(t,new s.JSXIdentifier(e.value))},e.prototype.parseJSXElementName=function(){var t=this.createJSXNode(),e=this.parseJSXIdentifier();if(this.matchJSX(":")){var n=e;this.expectJSX(":");var r=this.parseJSXIdentifier();e=this.finalize(t,new s.JSXNamespacedName(n,r))}else if(this.matchJSX("."))for(;this.matchJSX(".");){var i=e;this.expectJSX(".");var o=this.parseJSXIdentifier();e=this.finalize(t,new s.JSXMemberExpression(i,o))}return e},e.prototype.parseJSXAttributeName=function(){var t,e=this.createJSXNode(),n=this.parseJSXIdentifier();if(this.matchJSX(":")){var r=n;this.expectJSX(":");var i=this.parseJSXIdentifier();t=this.finalize(e,new s.JSXNamespacedName(r,i))}else t=n;return t},e.prototype.parseJSXStringLiteralAttribute=function(){var t=this.createJSXNode(),e=this.nextJSXToken();8!==e.type&&this.throwUnexpectedToken(e);var n=this.getTokenRaw(e);return this.finalize(t,new u.Literal(e.value,n))},e.prototype.parseJSXExpressionAttribute=function(){var t=this.createJSXNode();this.expectJSX("{"),this.finishJSX(),this.match("}")&&this.tolerateError("JSX attributes must only be assigned a non-empty expression");var e=this.parseAssignmentExpression();return this.reenterJSX(),this.finalize(t,new s.JSXExpressionContainer(e))},e.prototype.parseJSXAttributeValue=function(){return this.matchJSX("{")?this.parseJSXExpressionAttribute():this.matchJSX("<")?this.parseJSXElement():this.parseJSXStringLiteralAttribute()},e.prototype.parseJSXNameValueAttribute=function(){var t=this.createJSXNode(),e=this.parseJSXAttributeName(),n=null;return this.matchJSX("=")&&(this.expectJSX("="),n=this.parseJSXAttributeValue()),this.finalize(t,new s.JSXAttribute(e,n))},e.prototype.parseJSXSpreadAttribute=function(){var t=this.createJSXNode();this.expectJSX("{"),this.expectJSX("..."),this.finishJSX();var e=this.parseAssignmentExpression();return this.reenterJSX(),this.finalize(t,new s.JSXSpreadAttribute(e))},e.prototype.parseJSXAttributes=function(){for(var t=[];!this.matchJSX("/")&&!this.matchJSX(">");){var e=this.matchJSX("{")?this.parseJSXSpreadAttribute():this.parseJSXNameValueAttribute();t.push(e)}return t},e.prototype.parseJSXOpeningElement=function(){var t=this.createJSXNode();this.expectJSX("<");var e=this.parseJSXElementName(),n=this.parseJSXAttributes(),r=this.matchJSX("/");return r&&this.expectJSX("/"),this.expectJSX(">"),this.finalize(t,new s.JSXOpeningElement(e,r,n))},e.prototype.parseJSXBoundaryElement=function(){var t=this.createJSXNode();if(this.expectJSX("<"),this.matchJSX("/")){this.expectJSX("/");var e=this.parseJSXElementName();return this.expectJSX(">"),this.finalize(t,new s.JSXClosingElement(e))}var n=this.parseJSXElementName(),r=this.parseJSXAttributes(),i=this.matchJSX("/");return i&&this.expectJSX("/"),this.expectJSX(">"),this.finalize(t,new s.JSXOpeningElement(n,i,r))},e.prototype.parseJSXEmptyExpression=function(){var t=this.createJSXChildNode();return this.collectComments(),this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.finalize(t,new s.JSXEmptyExpression)},e.prototype.parseJSXExpressionContainer=function(){var t=this.createJSXNode();this.expectJSX("{");var e;return this.matchJSX("}")?(e=this.parseJSXEmptyExpression(),this.expectJSX("}")):(this.finishJSX(),e=this.parseAssignmentExpression(),this.reenterJSX()),this.finalize(t,new s.JSXExpressionContainer(e))},e.prototype.parseJSXChildren=function(){for(var t=[];!this.scanner.eof();){var e=this.createJSXChildNode(),n=this.nextJSXText();if(n.start<n.end){var r=this.getTokenRaw(n),i=this.finalize(e,new s.JSXText(n.value,r));t.push(i)}if("{"!==this.scanner.source[this.scanner.index])break;var o=this.parseJSXExpressionContainer();t.push(o)}return t},e.prototype.parseComplexJSXElement=function(t){for(var e=[];!this.scanner.eof();){t.children=t.children.concat(this.parseJSXChildren());var n=this.createJSXChildNode(),i=this.parseJSXBoundaryElement();if(i.type===a.JSXSyntax.JSXOpeningElement){var o=i;if(o.selfClosing){var u=this.finalize(n,new s.JSXElement(o,[],null));t.children.push(u)}else e.push(t),t={node:n,opening:o,closing:null,children:[]}}if(i.type===a.JSXSyntax.JSXClosingElement){t.closing=i;var c=r(t.opening.name);if(c!==r(t.closing.name)&&this.tolerateError("Expected corresponding JSX closing tag for %0",c),!(e.length>0))break;var u=this.finalize(t.node,new s.JSXElement(t.opening,t.children,t.closing));t=e[e.length-1],t.children.push(u),e.pop()}}return t},e.prototype.parseJSXElement=function(){var t=this.createJSXNode(),e=this.parseJSXOpeningElement(),n=[],r=null;if(!e.selfClosing){var i=this.parseComplexJSXElement({node:t,opening:e,closing:r,children:n});n=i.children,r=i.closing}return this.finalize(t,new s.JSXElement(e,n,r))},e.prototype.parseJSXRoot=function(){this.config.tokens&&this.tokens.pop(),this.startJSX();var t=this.parseJSXElement();return this.finishJSX(),t},e.prototype.isStartOfExpression=function(){return t.prototype.isStartOfExpression.call(this)||this.match("<")},e}(c.Parser);e.JSXParser=p},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n={NonAsciiIdentifierStart:/[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]/,NonAsciiIdentifierPart:/[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B4\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/};e.Character={fromCodePoint:function(t){return t<65536?String.fromCharCode(t):String.fromCharCode(55296+(t-65536>>10))+String.fromCharCode(56320+(t-65536&1023))},isWhiteSpace:function(t){return 32===t||9===t||11===t||12===t||160===t||t>=5760&&[5760,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8239,8287,12288,65279].indexOf(t)>=0},isLineTerminator:function(t){return 10===t||13===t||8232===t||8233===t},isIdentifierStart:function(t){return 36===t||95===t||t>=65&&t<=90||t>=97&&t<=122||92===t||t>=128&&n.NonAsciiIdentifierStart.test(e.Character.fromCodePoint(t))},isIdentifierPart:function(t){return 36===t||95===t||t>=65&&t<=90||t>=97&&t<=122||t>=48&&t<=57||92===t||t>=128&&n.NonAsciiIdentifierPart.test(e.Character.fromCodePoint(t))},isDecimalDigit:function(t){return t>=48&&t<=57},isHexDigit:function(t){return t>=48&&t<=57||t>=65&&t<=70||t>=97&&t<=102},isOctalDigit:function(t){return t>=48&&t<=55}}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(6),i=function(){function t(t){this.type=r.JSXSyntax.JSXClosingElement,this.name=t}return t}();e.JSXClosingElement=i;var o=function(){function t(t,e,n){this.type=r.JSXSyntax.JSXElement,this.openingElement=t,this.children=e,this.closingElement=n}return t}();e.JSXElement=o;var s=function(){function t(){this.type=r.JSXSyntax.JSXEmptyExpression}return t}();e.JSXEmptyExpression=s;var a=function(){function t(t){this.type=r.JSXSyntax.JSXExpressionContainer,this.expression=t}return t}();e.JSXExpressionContainer=a;var u=function(){function t(t){this.type=r.JSXSyntax.JSXIdentifier,this.name=t}return t}();e.JSXIdentifier=u;var c=function(){function t(t,e){this.type=r.JSXSyntax.JSXMemberExpression,this.object=t,this.property=e}return t}();e.JSXMemberExpression=c;var h=function(){function t(t,e){this.type=r.JSXSyntax.JSXAttribute,this.name=t,this.value=e}return t}();e.JSXAttribute=h;var l=function(){function t(t,e){this.type=r.JSXSyntax.JSXNamespacedName,this.namespace=t,this.name=e}return t}();e.JSXNamespacedName=l;var p=function(){function t(t,e,n){this.type=r.JSXSyntax.JSXOpeningElement,this.name=t,this.selfClosing=e,this.attributes=n}return t}();e.JSXOpeningElement=p;var f=function(){function t(t){this.type=r.JSXSyntax.JSXSpreadAttribute,this.argument=t}return t}();e.JSXSpreadAttribute=f;var d=function(){function t(t,e){this.type=r.JSXSyntax.JSXText,this.value=t,this.raw=e}return t}();e.JSXText=d},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.JSXSyntax={JSXAttribute:"JSXAttribute",JSXClosingElement:"JSXClosingElement",JSXElement:"JSXElement",JSXEmptyExpression:"JSXEmptyExpression",JSXExpressionContainer:"JSXExpressionContainer",JSXIdentifier:"JSXIdentifier",JSXMemberExpression:"JSXMemberExpression",JSXNamespacedName:"JSXNamespacedName",JSXOpeningElement:"JSXOpeningElement",JSXSpreadAttribute:"JSXSpreadAttribute",JSXText:"JSXText"}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(2),i=function(){function t(t){this.type=r.Syntax.ArrayExpression,this.elements=t}return t}();e.ArrayExpression=i;var o=function(){function t(t){this.type=r.Syntax.ArrayPattern,this.elements=t}return t}();e.ArrayPattern=o;var s=function(){function t(t,e,n){this.type=r.Syntax.ArrowFunctionExpression,this.id=null,this.params=t,this.body=e,this.generator=!1,this.expression=n,this.async=!1}return t}();e.ArrowFunctionExpression=s;var a=function(){function t(t,e,n){this.type=r.Syntax.AssignmentExpression,this.operator=t,this.left=e,this.right=n}return t}();e.AssignmentExpression=a;var u=function(){function t(t,e){this.type=r.Syntax.AssignmentPattern,this.left=t,this.right=e}return t}();e.AssignmentPattern=u;var c=function(){function t(t,e,n){this.type=r.Syntax.ArrowFunctionExpression,this.id=null,this.params=t,this.body=e,this.generator=!1,this.expression=n,this.async=!0}return t}();e.AsyncArrowFunctionExpression=c;var h=function(){function t(t,e,n){this.type=r.Syntax.FunctionDeclaration,this.id=t,this.params=e,this.body=n,this.generator=!1,this.expression=!1,this.async=!0}return t}();e.AsyncFunctionDeclaration=h;var l=function(){function t(t,e,n){this.type=r.Syntax.FunctionExpression,this.id=t,this.params=e,this.body=n,this.generator=!1,this.expression=!1,this.async=!0}return t}();e.AsyncFunctionExpression=l;var p=function(){function t(t){this.type=r.Syntax.AwaitExpression,this.argument=t}return t}();e.AwaitExpression=p;var f=function(){function t(t,e,n){var i="||"===t||"&&"===t;this.type=i?r.Syntax.LogicalExpression:r.Syntax.BinaryExpression,this.operator=t,this.left=e,this.right=n}return t}();e.BinaryExpression=f;var d=function(){function t(t){this.type=r.Syntax.BlockStatement,this.body=t}return t}();e.BlockStatement=d;var m=function(){function t(t){this.type=r.Syntax.BreakStatement,this.label=t}return t}();e.BreakStatement=m;var y=function(){function t(t,e){this.type=r.Syntax.CallExpression,this.callee=t,this.arguments=e}return t}();e.CallExpression=y;var v=function(){function t(t,e){this.type=r.Syntax.CatchClause,this.param=t,this.body=e}return t}();e.CatchClause=v;var x=function(){function t(t){this.type=r.Syntax.ClassBody,this.body=t}return t}();e.ClassBody=x;var g=function(){function t(t,e,n){this.type=r.Syntax.ClassDeclaration,this.id=t,this.superClass=e,this.body=n}return t}();e.ClassDeclaration=g;var D=function(){function t(t,e,n){this.type=r.Syntax.ClassExpression,this.id=t,this.superClass=e,this.body=n}return t}();e.ClassExpression=D;var E=function(){function t(t,e){this.type=r.Syntax.MemberExpression,this.computed=!0,this.object=t,this.property=e}return t}();e.ComputedMemberExpression=E;var A=function(){function t(t,e,n){this.type=r.Syntax.ConditionalExpression,this.test=t,this.consequent=e,this.alternate=n}return t}();e.ConditionalExpression=A;var S=function(){function t(t){this.type=r.Syntax.ContinueStatement,this.label=t}return t}();e.ContinueStatement=S;var w=function(){function t(){this.type=r.Syntax.DebuggerStatement}return t}();e.DebuggerStatement=w;var C=function(){function t(t,e){this.type=r.Syntax.ExpressionStatement,this.expression=t,this.directive=e}return t}();e.Directive=C;var _=function(){function t(t,e){this.type=r.Syntax.DoWhileStatement,this.body=t,this.test=e}return t}();e.DoWhileStatement=_;var b=function(){function t(){this.type=r.Syntax.EmptyStatement}return t}();e.EmptyStatement=b;var F=function(){function t(t){this.type=r.Syntax.ExportAllDeclaration,this.source=t}return t}();e.ExportAllDeclaration=F;var k=function(){function t(t){this.type=r.Syntax.ExportDefaultDeclaration,this.declaration=t}return t}();e.ExportDefaultDeclaration=k;var I=function(){function t(t,e,n){this.type=r.Syntax.ExportNamedDeclaration,this.declaration=t,this.specifiers=e,this.source=n}return t}();e.ExportNamedDeclaration=I;var T=function(){function t(t,e){this.type=r.Syntax.ExportSpecifier,this.exported=e,this.local=t}return t}();e.ExportSpecifier=T;var B=function(){function t(t){this.type=r.Syntax.ExpressionStatement,this.expression=t}return t}();e.ExpressionStatement=B;var M=function(){function t(t,e,n){this.type=r.Syntax.ForInStatement,this.left=t,this.right=e,this.body=n,this.each=!1}return t}();e.ForInStatement=M;var P=function(){function t(t,e,n){this.type=r.Syntax.ForOfStatement,this.left=t,this.right=e,this.body=n}return t}();e.ForOfStatement=P;var N=function(){function t(t,e,n,i){this.type=r.Syntax.ForStatement,this.init=t,this.test=e,this.update=n,this.body=i}return t}();e.ForStatement=N;var O=function(){function t(t,e,n,i){this.type=r.Syntax.FunctionDeclaration,this.id=t,this.params=e,this.body=n,this.generator=i,this.expression=!1,this.async=!1}return t}();e.FunctionDeclaration=O;var R=function(){function t(t,e,n,i){this.type=r.Syntax.FunctionExpression,this.id=t,this.params=e,this.body=n,this.generator=i,this.expression=!1,this.async=!1}return t}();e.FunctionExpression=R;var U=function(){function t(t){this.type=r.Syntax.Identifier,this.name=t}return t}();e.Identifier=U;var j=function(){function t(t,e,n){this.type=r.Syntax.IfStatement,this.test=t,this.consequent=e,this.alternate=n}return t}();e.IfStatement=j;var L=function(){function t(t,e){this.type=r.Syntax.ImportDeclaration,this.specifiers=t,this.source=e}return t}();e.ImportDeclaration=L;var z=function(){function t(t){this.type=r.Syntax.ImportDefaultSpecifier,this.local=t}return t}();e.ImportDefaultSpecifier=z;var J=function(){function t(t){this.type=r.Syntax.ImportNamespaceSpecifier,this.local=t}return t}();e.ImportNamespaceSpecifier=J;var X=function(){function t(t,e){this.type=r.Syntax.ImportSpecifier,this.local=t,this.imported=e}return t}();e.ImportSpecifier=X;var q=function(){function t(t,e){this.type=r.Syntax.LabeledStatement,this.label=t,this.body=e}return t}();e.LabeledStatement=q;var K=function(){function t(t,e){this.type=r.Syntax.Literal,this.value=t,this.raw=e}return t}();e.Literal=K;var Y=function(){function t(t,e){this.type=r.Syntax.MetaProperty,this.meta=t,this.property=e}return t}();e.MetaProperty=Y;var W=function(){function t(t,e,n,i,o){this.type=r.Syntax.MethodDefinition,this.key=t,this.computed=e,this.value=n,this.kind=i,this.static=o}return t}();e.MethodDefinition=W;var G=function(){function t(t){this.type=r.Syntax.Program,this.body=t,this.sourceType="module"}return t}();e.Module=G;var H=function(){function t(t,e){this.type=r.Syntax.NewExpression,this.callee=t,this.arguments=e}return t}();e.NewExpression=H;var V=function(){function t(t){this.type=r.Syntax.ObjectExpression,this.properties=t}return t}();e.ObjectExpression=V;var $=function(){function t(t){this.type=r.Syntax.ObjectPattern,this.properties=t}return t}();e.ObjectPattern=$;var Z=function(){function t(t,e,n,i,o,s){this.type=r.Syntax.Property,this.key=e,this.computed=n,this.value=i,this.kind=t,this.method=o,this.shorthand=s}return t}();e.Property=Z;var Q=function(){function t(t,e,n,i){this.type=r.Syntax.Literal,this.value=t,this.raw=e,this.regex={pattern:n,flags:i}}return t}();e.RegexLiteral=Q;var tt=function(){function t(t){this.type=r.Syntax.RestElement,this.argument=t}return t}();e.RestElement=tt;var et=function(){function t(t){this.type=r.Syntax.ReturnStatement,this.argument=t}return t}();e.ReturnStatement=et;var nt=function(){function t(t){this.type=r.Syntax.Program,this.body=t,this.sourceType="script"}return t}();e.Script=nt;var rt=function(){function t(t){this.type=r.Syntax.SequenceExpression,this.expressions=t}return t}();e.SequenceExpression=rt;var it=function(){function t(t){this.type=r.Syntax.SpreadElement,this.argument=t}return t}();e.SpreadElement=it;var ot=function(){function t(t,e){this.type=r.Syntax.MemberExpression,this.computed=!1,this.object=t,this.property=e}return t}();e.StaticMemberExpression=ot;var st=function(){function t(){this.type=r.Syntax.Super}return t}();e.Super=st;var at=function(){function t(t,e){this.type=r.Syntax.SwitchCase,this.test=t,this.consequent=e}return t}();e.SwitchCase=at;var ut=function(){function t(t,e){this.type=r.Syntax.SwitchStatement,this.discriminant=t,this.cases=e}return t}();e.SwitchStatement=ut;var ct=function(){function t(t,e){this.type=r.Syntax.TaggedTemplateExpression,this.tag=t,this.quasi=e}return t}();e.TaggedTemplateExpression=ct;var ht=function(){function t(t,e){this.type=r.Syntax.TemplateElement,this.value=t,this.tail=e}return t}();e.TemplateElement=ht;var lt=function(){function t(t,e){this.type=r.Syntax.TemplateLiteral,this.quasis=t,this.expressions=e}return t}();e.TemplateLiteral=lt;var pt=function(){function t(){this.type=r.Syntax.ThisExpression}return t}();e.ThisExpression=pt;var ft=function(){function t(t){this.type=r.Syntax.ThrowStatement,this.argument=t}return t}();e.ThrowStatement=ft;var dt=function(){function t(t,e,n){this.type=r.Syntax.TryStatement,this.block=t,this.handler=e,this.finalizer=n}return t}();e.TryStatement=dt;var mt=function(){function t(t,e){this.type=r.Syntax.UnaryExpression,this.operator=t,this.argument=e,this.prefix=!0}return t}();e.UnaryExpression=mt;var yt=function(){function t(t,e,n){this.type=r.Syntax.UpdateExpression,this.operator=t,this.argument=e,this.prefix=n}return t}();e.UpdateExpression=yt;var vt=function(){function t(t,e){this.type=r.Syntax.VariableDeclaration,this.declarations=t,this.kind=e}return t}();e.VariableDeclaration=vt;var xt=function(){function t(t,e){this.type=r.Syntax.VariableDeclarator,this.id=t,this.init=e}return t}();e.VariableDeclarator=xt;var gt=function(){function t(t,e){this.type=r.Syntax.WhileStatement,this.test=t,this.body=e}return t}();e.WhileStatement=gt;var Dt=function(){function t(t,e){this.type=r.Syntax.WithStatement,this.object=t,this.body=e}return t}();e.WithStatement=Dt;var Et=function(){function t(t,e){this.type=r.Syntax.YieldExpression,this.argument=t,this.delegate=e}return t}();e.YieldExpression=Et},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(9),i=n(10),o=n(11),s=n(7),a=n(12),u=n(2),c=n(13),h=function(){function t(t,e,n){void 0===e&&(e={}),this.config={range:"boolean"==typeof e.range&&e.range,loc:"boolean"==typeof e.loc&&e.loc,source:null,tokens:"boolean"==typeof e.tokens&&e.tokens,comment:"boolean"==typeof e.comment&&e.comment,tolerant:"boolean"==typeof e.tolerant&&e.tolerant},this.config.loc&&e.source&&null!==e.source&&(this.config.source=String(e.source)),this.delegate=n,this.errorHandler=new i.ErrorHandler,this.errorHandler.tolerant=this.config.tolerant,this.scanner=new a.Scanner(t,this.errorHandler),this.scanner.trackComment=this.config.comment,this.operatorPrecedence={")":0,";":0,",":0,"=":0,"]":0,"||":1,"&&":2,"|":3,"^":4,"&":5,"==":6,"!=":6,"===":6,"!==":6,"<":7,">":7,"<=":7,">=":7,"<<":8,">>":8,">>>":8,"+":9,"-":9,"*":11,"/":11,"%":11},this.lookahead={type:2,value:"",lineNumber:this.scanner.lineNumber,lineStart:0,start:0,end:0},this.hasLineTerminator=!1,this.context={isModule:!1,await:!1,allowIn:!0,allowStrictDirective:!0,allowYield:!0,firstCoverInitializedNameError:null,isAssignmentTarget:!1,isBindingElement:!1,inFunctionBody:!1,inIteration:!1,inSwitch:!1,labelSet:{},strict:!1},this.tokens=[],this.startMarker={index:0,line:this.scanner.lineNumber,column:0},this.lastMarker={index:0,line:this.scanner.lineNumber,column:0},this.nextToken(),this.lastMarker={index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}}return t.prototype.throwError=function(t){for(var e=[],n=1;n<arguments.length;n++)e[n-1]=arguments[n];var i=Array.prototype.slice.call(arguments,1),o=t.replace(/%(\d)/g,function(t,e){return r.assert(e<i.length,"Message reference must be in range"),i[e]}),s=this.lastMarker.index,a=this.lastMarker.line,u=this.lastMarker.column+1;throw this.errorHandler.createError(s,a,u,o)},t.prototype.tolerateError=function(t){for(var e=[],n=1;n<arguments.length;n++)e[n-1]=arguments[n];var i=Array.prototype.slice.call(arguments,1),o=t.replace(/%(\d)/g,function(t,e){return r.assert(e<i.length,"Message reference must be in range"),i[e]}),s=this.lastMarker.index,a=this.scanner.lineNumber,u=this.lastMarker.column+1;this.errorHandler.tolerateError(s,a,u,o)},t.prototype.unexpectedTokenError=function(t,e){var n,r=e||o.Messages.UnexpectedToken;if(t?(e||(r=2===t.type?o.Messages.UnexpectedEOS:3===t.type?o.Messages.UnexpectedIdentifier:6===t.type?o.Messages.UnexpectedNumber:8===t.type?o.Messages.UnexpectedString:10===t.type?o.Messages.UnexpectedTemplate:o.Messages.UnexpectedToken,4===t.type&&(this.scanner.isFutureReservedWord(t.value)?r=o.Messages.UnexpectedReserved:this.context.strict&&this.scanner.isStrictModeReservedWord(t.value)&&(r=o.Messages.StrictReservedWord))),n=t.value):n="ILLEGAL",r=r.replace("%0",n),t&&"number"==typeof t.lineNumber){var i=t.start,s=t.lineNumber,a=this.lastMarker.index-this.lastMarker.column,u=t.start-a+1;return this.errorHandler.createError(i,s,u,r)}var i=this.lastMarker.index,s=this.lastMarker.line,u=this.lastMarker.column+1;return this.errorHandler.createError(i,s,u,r)},t.prototype.throwUnexpectedToken=function(t,e){throw this.unexpectedTokenError(t,e)},t.prototype.tolerateUnexpectedToken=function(t,e){this.errorHandler.tolerate(this.unexpectedTokenError(t,e))},t.prototype.collectComments=function(){if(this.config.comment){var t=this.scanner.scanComments();if(t.length>0&&this.delegate)for(var e=0;e<t.length;++e){var n=t[e],r=void 0;r={type:n.multiLine?"BlockComment":"LineComment",value:this.scanner.source.slice(n.slice[0],n.slice[1])},this.config.range&&(r.range=n.range),this.config.loc&&(r.loc=n.loc);var i={start:{line:n.loc.start.line,column:n.loc.start.column,offset:n.range[0]},end:{line:n.loc.end.line,column:n.loc.end.column,offset:n.range[1]}};this.delegate(r,i)}}else this.scanner.scanComments()},t.prototype.getTokenRaw=function(t){return this.scanner.source.slice(t.start,t.end)},t.prototype.convertToken=function(t){var e={type:c.TokenName[t.type],value:this.getTokenRaw(t)};if(this.config.range&&(e.range=[t.start,t.end]),this.config.loc&&(e.loc={start:{line:this.startMarker.line,column:this.startMarker.column},end:{line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}}),9===t.type){var n=t.pattern,r=t.flags;e.regex={pattern:n,flags:r}}return e},t.prototype.nextToken=function(){var t=this.lookahead;this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.collectComments(),this.scanner.index!==this.startMarker.index&&(this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart);var e=this.scanner.lex();return this.hasLineTerminator=t.lineNumber!==e.lineNumber,e&&this.context.strict&&3===e.type&&this.scanner.isStrictModeReservedWord(e.value)&&(e.type=4),this.lookahead=e,this.config.tokens&&2!==e.type&&this.tokens.push(this.convertToken(e)),t},t.prototype.nextRegexToken=function(){this.collectComments();var t=this.scanner.scanRegExp();return this.config.tokens&&(this.tokens.pop(),this.tokens.push(this.convertToken(t))),this.lookahead=t,this.nextToken(),t},t.prototype.createNode=function(){return{index:this.startMarker.index,line:this.startMarker.line,column:this.startMarker.column}},t.prototype.startNode=function(t){return{index:t.start,line:t.lineNumber,column:t.start-t.lineStart}},t.prototype.finalize=function(t,e){if(this.config.range&&(e.range=[t.index,this.lastMarker.index]),this.config.loc&&(e.loc={start:{line:t.line,column:t.column},end:{line:this.lastMarker.line,column:this.lastMarker.column}},this.config.source&&(e.loc.source=this.config.source)),this.delegate){var n={start:{line:t.line,column:t.column,offset:t.index},end:{line:this.lastMarker.line,column:this.lastMarker.column,offset:this.lastMarker.index}};this.delegate(e,n)}return e},t.prototype.expect=function(t){var e=this.nextToken();7===e.type&&e.value===t||this.throwUnexpectedToken(e)},t.prototype.expectCommaSeparator=function(){if(this.config.tolerant){var t=this.lookahead;7===t.type&&","===t.value?this.nextToken():7===t.type&&";"===t.value?(this.nextToken(),this.tolerateUnexpectedToken(t)):this.tolerateUnexpectedToken(t,o.Messages.UnexpectedToken)}else this.expect(",")},t.prototype.expectKeyword=function(t){var e=this.nextToken();4===e.type&&e.value===t||this.throwUnexpectedToken(e)},t.prototype.match=function(t){return 7===this.lookahead.type&&this.lookahead.value===t},t.prototype.matchKeyword=function(t){return 4===this.lookahead.type&&this.lookahead.value===t},t.prototype.matchContextualKeyword=function(t){return 3===this.lookahead.type&&this.lookahead.value===t},t.prototype.matchAssign=function(){if(7!==this.lookahead.type)return!1;var t=this.lookahead.value;return"="===t||"*="===t||"**="===t||"/="===t||"%="===t||"+="===t||"-="===t||"<<="===t||">>="===t||">>>="===t||"&="===t||"^="===t||"|="===t},t.prototype.isolateCoverGrammar=function(t){var e=this.context.isBindingElement,n=this.context.isAssignmentTarget,r=this.context.firstCoverInitializedNameError;this.context.isBindingElement=!0,this.context.isAssignmentTarget=!0,this.context.firstCoverInitializedNameError=null;var i=t.call(this);return null!==this.context.firstCoverInitializedNameError&&this.throwUnexpectedToken(this.context.firstCoverInitializedNameError),this.context.isBindingElement=e,this.context.isAssignmentTarget=n,this.context.firstCoverInitializedNameError=r,i},t.prototype.inheritCoverGrammar=function(t){var e=this.context.isBindingElement,n=this.context.isAssignmentTarget,r=this.context.firstCoverInitializedNameError;this.context.isBindingElement=!0,this.context.isAssignmentTarget=!0,this.context.firstCoverInitializedNameError=null;var i=t.call(this);return this.context.isBindingElement=this.context.isBindingElement&&e,this.context.isAssignmentTarget=this.context.isAssignmentTarget&&n,this.context.firstCoverInitializedNameError=r||this.context.firstCoverInitializedNameError,i},t.prototype.consumeSemicolon=function(){this.match(";")?this.nextToken():this.hasLineTerminator||(2===this.lookahead.type||this.match("}")||this.throwUnexpectedToken(this.lookahead),this.lastMarker.index=this.startMarker.index,this.lastMarker.line=this.startMarker.line,this.lastMarker.column=this.startMarker.column)},t.prototype.parsePrimaryExpression=function(){var t,e,n,r=this.createNode();switch(this.lookahead.type){case 3:(this.context.isModule||this.context.await)&&"await"===this.lookahead.value&&this.tolerateUnexpectedToken(this.lookahead),t=this.matchAsyncFunction()?this.parseFunctionExpression():this.finalize(r,new s.Identifier(this.nextToken().value));break;case 6:case 8:this.context.strict&&this.lookahead.octal&&this.tolerateUnexpectedToken(this.lookahead,o.Messages.StrictOctalLiteral),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,e=this.nextToken(),n=this.getTokenRaw(e),t=this.finalize(r,new s.Literal(e.value,n));break;case 1:this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,e=this.nextToken(),n=this.getTokenRaw(e),t=this.finalize(r,new s.Literal("true"===e.value,n));break;case 5:this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,e=this.nextToken(),n=this.getTokenRaw(e),t=this.finalize(r,new s.Literal(null,n));break;case 10:t=this.parseTemplateLiteral();break;case 7:switch(this.lookahead.value){case"(":this.context.isBindingElement=!1,t=this.inheritCoverGrammar(this.parseGroupExpression);break;case"[":t=this.inheritCoverGrammar(this.parseArrayInitializer);break;case"{":t=this.inheritCoverGrammar(this.parseObjectInitializer);break;case"/":case"/=":this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.scanner.index=this.startMarker.index,e=this.nextRegexToken(),n=this.getTokenRaw(e),t=this.finalize(r,new s.RegexLiteral(e.regex,n,e.pattern,e.flags));break;default:t=this.throwUnexpectedToken(this.nextToken())}break;case 4:!this.context.strict&&this.context.allowYield&&this.matchKeyword("yield")?t=this.parseIdentifierName():!this.context.strict&&this.matchKeyword("let")?t=this.finalize(r,new s.Identifier(this.nextToken().value)):(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.matchKeyword("function")?t=this.parseFunctionExpression():this.matchKeyword("this")?(this.nextToken(),t=this.finalize(r,new s.ThisExpression)):t=this.matchKeyword("class")?this.parseClassExpression():this.throwUnexpectedToken(this.nextToken()));break;default:t=this.throwUnexpectedToken(this.nextToken())}return t},t.prototype.parseSpreadElement=function(){var t=this.createNode();this.expect("...");var e=this.inheritCoverGrammar(this.parseAssignmentExpression);return this.finalize(t,new s.SpreadElement(e))},t.prototype.parseArrayInitializer=function(){var t=this.createNode(),e=[];for(this.expect("[");!this.match("]");)if(this.match(","))this.nextToken(),e.push(null);else if(this.match("...")){var n=this.parseSpreadElement();this.match("]")||(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.expect(",")),e.push(n)}else e.push(this.inheritCoverGrammar(this.parseAssignmentExpression)),this.match("]")||this.expect(",");return this.expect("]"),this.finalize(t,new s.ArrayExpression(e))},t.prototype.parsePropertyMethod=function(t){this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var e=this.context.strict,n=this.context.allowStrictDirective;this.context.allowStrictDirective=t.simple;var r=this.isolateCoverGrammar(this.parseFunctionSourceElements);return this.context.strict&&t.firstRestricted&&this.tolerateUnexpectedToken(t.firstRestricted,t.message),this.context.strict&&t.stricted&&this.tolerateUnexpectedToken(t.stricted,t.message),this.context.strict=e,this.context.allowStrictDirective=n,r},t.prototype.parsePropertyMethodFunction=function(){var t=this.createNode(),e=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters(),r=this.parsePropertyMethod(n);return this.context.allowYield=e,this.finalize(t,new s.FunctionExpression(null,n.params,r,!1))},t.prototype.parsePropertyMethodAsyncFunction=function(){var t=this.createNode(),e=this.context.allowYield,n=this.context.await;this.context.allowYield=!1,this.context.await=!0;var r=this.parseFormalParameters(),i=this.parsePropertyMethod(r);return this.context.allowYield=e,this.context.await=n,this.finalize(t,new s.AsyncFunctionExpression(null,r.params,i))},t.prototype.parseObjectPropertyKey=function(){var t,e=this.createNode(),n=this.nextToken();switch(n.type){case 8:case 6:this.context.strict&&n.octal&&this.tolerateUnexpectedToken(n,o.Messages.StrictOctalLiteral);var r=this.getTokenRaw(n);t=this.finalize(e,new s.Literal(n.value,r));break;case 3:case 1:case 5:case 4:t=this.finalize(e,new s.Identifier(n.value));break;case 7:"["===n.value?(t=this.isolateCoverGrammar(this.parseAssignmentExpression),this.expect("]")):t=this.throwUnexpectedToken(n);break;default:t=this.throwUnexpectedToken(n)}return t},t.prototype.isPropertyKey=function(t,e){return t.type===u.Syntax.Identifier&&t.name===e||t.type===u.Syntax.Literal&&t.value===e},t.prototype.parseObjectProperty=function(t){var e,n=this.createNode(),r=this.lookahead,i=null,a=null,u=!1,c=!1,h=!1,l=!1;if(3===r.type){var p=r.value;this.nextToken(),u=this.match("["),l=!(this.hasLineTerminator||"async"!==p||this.match(":")||this.match("(")||this.match("*")),i=l?this.parseObjectPropertyKey():this.finalize(n,new s.Identifier(p))}else this.match("*")?this.nextToken():(u=this.match("["),i=this.parseObjectPropertyKey());var f=this.qualifiedPropertyName(this.lookahead);if(3===r.type&&!l&&"get"===r.value&&f)e="get",u=this.match("["),i=this.parseObjectPropertyKey(),this.context.allowYield=!1,a=this.parseGetterMethod();else if(3===r.type&&!l&&"set"===r.value&&f)e="set",u=this.match("["),i=this.parseObjectPropertyKey(),a=this.parseSetterMethod();else if(7===r.type&&"*"===r.value&&f)e="init",u=this.match("["),i=this.parseObjectPropertyKey(),a=this.parseGeneratorMethod(),c=!0;else if(i||this.throwUnexpectedToken(this.lookahead),e="init",this.match(":")&&!l)!u&&this.isPropertyKey(i,"__proto__")&&(t.value&&this.tolerateError(o.Messages.DuplicateProtoProperty),t.value=!0),this.nextToken(),a=this.inheritCoverGrammar(this.parseAssignmentExpression);else if(this.match("("))a=l?this.parsePropertyMethodAsyncFunction():this.parsePropertyMethodFunction(),c=!0;else if(3===r.type){var p=this.finalize(n,new s.Identifier(r.value));if(this.match("=")){this.context.firstCoverInitializedNameError=this.lookahead,this.nextToken(),h=!0;var d=this.isolateCoverGrammar(this.parseAssignmentExpression);a=this.finalize(n,new s.AssignmentPattern(p,d))}else h=!0,a=p}else this.throwUnexpectedToken(this.nextToken());return this.finalize(n,new s.Property(e,i,u,a,c,h))},t.prototype.parseObjectInitializer=function(){var t=this.createNode();this.expect("{");for(var e=[],n={value:!1};!this.match("}");)e.push(this.parseObjectProperty(n)),this.match("}")||this.expectCommaSeparator();return this.expect("}"),this.finalize(t,new s.ObjectExpression(e))},t.prototype.parseTemplateHead=function(){r.assert(this.lookahead.head,"Template literal must start with a template head");var t=this.createNode(),e=this.nextToken(),n=e.value,i=e.cooked;return this.finalize(t,new s.TemplateElement({raw:n,cooked:i},e.tail))},t.prototype.parseTemplateElement=function(){10!==this.lookahead.type&&this.throwUnexpectedToken();var t=this.createNode(),e=this.nextToken(),n=e.value,r=e.cooked;return this.finalize(t,new s.TemplateElement({raw:n,cooked:r},e.tail))},t.prototype.parseTemplateLiteral=function(){var t=this.createNode(),e=[],n=[],r=this.parseTemplateHead();for(n.push(r);!r.tail;)e.push(this.parseExpression()),r=this.parseTemplateElement(),n.push(r);return this.finalize(t,new s.TemplateLiteral(n,e))},t.prototype.reinterpretExpressionAsPattern=function(t){switch(t.type){case u.Syntax.Identifier:case u.Syntax.MemberExpression:case u.Syntax.RestElement:case u.Syntax.AssignmentPattern:break;case u.Syntax.SpreadElement:t.type=u.Syntax.RestElement,this.reinterpretExpressionAsPattern(t.argument);break;case u.Syntax.ArrayExpression:t.type=u.Syntax.ArrayPattern;for(var e=0;e<t.elements.length;e++)null!==t.elements[e]&&this.reinterpretExpressionAsPattern(t.elements[e]);break;case u.Syntax.ObjectExpression:t.type=u.Syntax.ObjectPattern;for(var e=0;e<t.properties.length;e++)this.reinterpretExpressionAsPattern(t.properties[e].value);break;case u.Syntax.AssignmentExpression:t.type=u.Syntax.AssignmentPattern,delete t.operator,this.reinterpretExpressionAsPattern(t.left)}},t.prototype.parseGroupExpression=function(){var t;if(this.expect("("),this.match(")"))this.nextToken(),this.match("=>")||this.expect("=>"),t={type:"ArrowParameterPlaceHolder",params:[],async:!1};else{var e=this.lookahead,n=[];if(this.match("..."))t=this.parseRestElement(n),this.expect(")"),this.match("=>")||this.expect("=>"),t={type:"ArrowParameterPlaceHolder",params:[t],async:!1};else{var r=!1;if(this.context.isBindingElement=!0,t=this.inheritCoverGrammar(this.parseAssignmentExpression),this.match(",")){var i=[];for(this.context.isAssignmentTarget=!1,i.push(t);2!==this.lookahead.type&&this.match(",");){if(this.nextToken(),this.match(")")){this.nextToken();for(var o=0;o<i.length;o++)this.reinterpretExpressionAsPattern(i[o]);r=!0,t={type:"ArrowParameterPlaceHolder",params:i,async:!1}}else if(this.match("...")){this.context.isBindingElement||this.throwUnexpectedToken(this.lookahead),i.push(this.parseRestElement(n)),this.expect(")"),this.match("=>")||this.expect("=>"),this.context.isBindingElement=!1;for(var o=0;o<i.length;o++)this.reinterpretExpressionAsPattern(i[o]);r=!0,t={type:"ArrowParameterPlaceHolder",params:i,async:!1}}else i.push(this.inheritCoverGrammar(this.parseAssignmentExpression));if(r)break}r||(t=this.finalize(this.startNode(e),new s.SequenceExpression(i)))}if(!r){if(this.expect(")"),this.match("=>")&&(t.type===u.Syntax.Identifier&&"yield"===t.name&&(r=!0,t={type:"ArrowParameterPlaceHolder",params:[t],async:!1}),!r)){if(this.context.isBindingElement||this.throwUnexpectedToken(this.lookahead),t.type===u.Syntax.SequenceExpression)for(var o=0;o<t.expressions.length;o++)this.reinterpretExpressionAsPattern(t.expressions[o]);else this.reinterpretExpressionAsPattern(t);t={type:"ArrowParameterPlaceHolder",params:t.type===u.Syntax.SequenceExpression?t.expressions:[t],async:!1}}this.context.isBindingElement=!1}}}return t},t.prototype.parseArguments=function(){this.expect("(");var t=[];if(!this.match(")"))for(;;){var e=this.match("...")?this.parseSpreadElement():this.isolateCoverGrammar(this.parseAssignmentExpression);if(t.push(e),this.match(")"))break;if(this.expectCommaSeparator(),this.match(")"))break}return this.expect(")"),t},t.prototype.isIdentifierName=function(t){return 3===t.type||4===t.type||1===t.type||5===t.type},t.prototype.parseIdentifierName=function(){var t=this.createNode(),e=this.nextToken();return this.isIdentifierName(e)||this.throwUnexpectedToken(e),this.finalize(t,new s.Identifier(e.value))},t.prototype.parseNewExpression=function(){var t=this.createNode(),e=this.parseIdentifierName();r.assert("new"===e.name,"New expression must start with `new`");var n;if(this.match("."))if(this.nextToken(),3===this.lookahead.type&&this.context.inFunctionBody&&"target"===this.lookahead.value){var i=this.parseIdentifierName();n=new s.MetaProperty(e,i)}else this.throwUnexpectedToken(this.lookahead);else{var o=this.isolateCoverGrammar(this.parseLeftHandSideExpression),a=this.match("(")?this.parseArguments():[];n=new s.NewExpression(o,a),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}return this.finalize(t,n)},t.prototype.parseAsyncArgument=function(){var t=this.parseAssignmentExpression();return this.context.firstCoverInitializedNameError=null,t},t.prototype.parseAsyncArguments=function(){this.expect("(");var t=[];if(!this.match(")"))for(;;){var e=this.match("...")?this.parseSpreadElement():this.isolateCoverGrammar(this.parseAsyncArgument);if(t.push(e),this.match(")"))break;if(this.expectCommaSeparator(),this.match(")"))break}return this.expect(")"),t},t.prototype.parseLeftHandSideExpressionAllowCall=function(){var t=this.lookahead,e=this.matchContextualKeyword("async"),n=this.context.allowIn;this.context.allowIn=!0;var r;for(this.matchKeyword("super")&&this.context.inFunctionBody?(r=this.createNode(),this.nextToken(),r=this.finalize(r,new s.Super),this.match("(")||this.match(".")||this.match("[")||this.throwUnexpectedToken(this.lookahead)):r=this.inheritCoverGrammar(this.matchKeyword("new")?this.parseNewExpression:this.parsePrimaryExpression);;)if(this.match(".")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect(".");var i=this.parseIdentifierName();r=this.finalize(this.startNode(t),new s.StaticMemberExpression(r,i))}else if(this.match("(")){var o=e&&t.lineNumber===this.lookahead.lineNumber;this.context.isBindingElement=!1,this.context.isAssignmentTarget=!1;var a=o?this.parseAsyncArguments():this.parseArguments();if(r=this.finalize(this.startNode(t),new s.CallExpression(r,a)),o&&this.match("=>")){for(var u=0;u<a.length;++u)this.reinterpretExpressionAsPattern(a[u]);r={type:"ArrowParameterPlaceHolder",params:a,async:!0}}}else if(this.match("[")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect("[");var i=this.isolateCoverGrammar(this.parseExpression);this.expect("]"),r=this.finalize(this.startNode(t),new s.ComputedMemberExpression(r,i))}else{if(10!==this.lookahead.type||!this.lookahead.head)break;var c=this.parseTemplateLiteral();r=this.finalize(this.startNode(t),new s.TaggedTemplateExpression(r,c))}return this.context.allowIn=n,r},t.prototype.parseSuper=function(){var t=this.createNode();return this.expectKeyword("super"),this.match("[")||this.match(".")||this.throwUnexpectedToken(this.lookahead),this.finalize(t,new s.Super)},t.prototype.parseLeftHandSideExpression=function(){r.assert(this.context.allowIn,"callee of new expression always allow in keyword.");for(var t=this.startNode(this.lookahead),e=this.matchKeyword("super")&&this.context.inFunctionBody?this.parseSuper():this.inheritCoverGrammar(this.matchKeyword("new")?this.parseNewExpression:this.parsePrimaryExpression);;)if(this.match("[")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect("[");var n=this.isolateCoverGrammar(this.parseExpression);this.expect("]"),e=this.finalize(t,new s.ComputedMemberExpression(e,n))}else if(this.match(".")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect(".");var n=this.parseIdentifierName();e=this.finalize(t,new s.StaticMemberExpression(e,n))}else{if(10!==this.lookahead.type||!this.lookahead.head)break;var i=this.parseTemplateLiteral();e=this.finalize(t,new s.TaggedTemplateExpression(e,i))}return e},t.prototype.parseUpdateExpression=function(){var t,e=this.lookahead;if(this.match("++")||this.match("--")){var n=this.startNode(e),r=this.nextToken();t=this.inheritCoverGrammar(this.parseUnaryExpression),this.context.strict&&t.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(t.name)&&this.tolerateError(o.Messages.StrictLHSPrefix),this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment);var i=!0;t=this.finalize(n,new s.UpdateExpression(r.value,t,i)),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}else if(t=this.inheritCoverGrammar(this.parseLeftHandSideExpressionAllowCall),!this.hasLineTerminator&&7===this.lookahead.type&&(this.match("++")||this.match("--"))){this.context.strict&&t.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(t.name)&&this.tolerateError(o.Messages.StrictLHSPostfix),this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var a=this.nextToken().value,i=!1;t=this.finalize(this.startNode(e),new s.UpdateExpression(a,t,i))}return t},t.prototype.parseAwaitExpression=function(){var t=this.createNode();this.nextToken();var e=this.parseUnaryExpression();return this.finalize(t,new s.AwaitExpression(e))},t.prototype.parseUnaryExpression=function(){var t;if(this.match("+")||this.match("-")||this.match("~")||this.match("!")||this.matchKeyword("delete")||this.matchKeyword("void")||this.matchKeyword("typeof")){var e=this.startNode(this.lookahead),n=this.nextToken();t=this.inheritCoverGrammar(this.parseUnaryExpression),t=this.finalize(e,new s.UnaryExpression(n.value,t)),this.context.strict&&"delete"===t.operator&&t.argument.type===u.Syntax.Identifier&&this.tolerateError(o.Messages.StrictDelete),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}else t=this.context.await&&this.matchContextualKeyword("await")?this.parseAwaitExpression():this.parseUpdateExpression();return t},t.prototype.parseExponentiationExpression=function(){var t=this.lookahead,e=this.inheritCoverGrammar(this.parseUnaryExpression);if(e.type!==u.Syntax.UnaryExpression&&this.match("**")){this.nextToken(),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var n=e,r=this.isolateCoverGrammar(this.parseExponentiationExpression);e=this.finalize(this.startNode(t),new s.BinaryExpression("**",n,r))}return e},t.prototype.binaryPrecedence=function(t){var e=t.value;return 7===t.type?this.operatorPrecedence[e]||0:4===t.type&&("instanceof"===e||this.context.allowIn&&"in"===e)?7:0},t.prototype.parseBinaryExpression=function(){var t=this.lookahead,e=this.inheritCoverGrammar(this.parseExponentiationExpression),n=this.lookahead,r=this.binaryPrecedence(n);if(r>0){this.nextToken(),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;for(var i=[t,this.lookahead],o=e,a=this.isolateCoverGrammar(this.parseExponentiationExpression),u=[o,n.value,a],c=[r];;){if((r=this.binaryPrecedence(this.lookahead))<=0)break;for(;u.length>2&&r<=c[c.length-1];){a=u.pop();var h=u.pop();c.pop(),o=u.pop(),i.pop();var l=this.startNode(i[i.length-1]);u.push(this.finalize(l,new s.BinaryExpression(h,o,a)))}u.push(this.nextToken().value),c.push(r),i.push(this.lookahead),u.push(this.isolateCoverGrammar(this.parseExponentiationExpression))}var p=u.length-1;for(e=u[p],i.pop();p>1;){var l=this.startNode(i.pop()),h=u[p-1];e=this.finalize(l,new s.BinaryExpression(h,u[p-2],e)),p-=2}}return e},t.prototype.parseConditionalExpression=function(){var t=this.lookahead,e=this.inheritCoverGrammar(this.parseBinaryExpression);if(this.match("?")){this.nextToken();var n=this.context.allowIn;this.context.allowIn=!0;var r=this.isolateCoverGrammar(this.parseAssignmentExpression);this.context.allowIn=n,this.expect(":");var i=this.isolateCoverGrammar(this.parseAssignmentExpression);e=this.finalize(this.startNode(t),new s.ConditionalExpression(e,r,i)),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}return e},t.prototype.checkPatternParam=function(t,e){switch(e.type){case u.Syntax.Identifier:this.validateParam(t,e,e.name);break;case u.Syntax.RestElement:this.checkPatternParam(t,e.argument);break;case u.Syntax.AssignmentPattern:this.checkPatternParam(t,e.left);break;case u.Syntax.ArrayPattern:for(var n=0;n<e.elements.length;n++)null!==e.elements[n]&&this.checkPatternParam(t,e.elements[n]);break;case u.Syntax.ObjectPattern:for(var n=0;n<e.properties.length;n++)this.checkPatternParam(t,e.properties[n].value)}t.simple=t.simple&&e instanceof s.Identifier},t.prototype.reinterpretAsCoverFormalsList=function(t){var e,n=[t],r=!1;switch(t.type){case u.Syntax.Identifier:break;case"ArrowParameterPlaceHolder":n=t.params,r=t.async;break;default:return null}e={simple:!0,paramSet:{}};for(var i=0;i<n.length;++i){var s=n[i];s.type===u.Syntax.AssignmentPattern?s.right.type===u.Syntax.YieldExpression&&(s.right.argument&&this.throwUnexpectedToken(this.lookahead),s.right.type=u.Syntax.Identifier,s.right.name="yield",delete s.right.argument,delete s.right.delegate):r&&s.type===u.Syntax.Identifier&&"await"===s.name&&this.throwUnexpectedToken(this.lookahead),this.checkPatternParam(e,s),n[i]=s}if(this.context.strict||!this.context.allowYield)for(var i=0;i<n.length;++i){var s=n[i];s.type===u.Syntax.YieldExpression&&this.throwUnexpectedToken(this.lookahead)}if(e.message===o.Messages.StrictParamDupe){var a=this.context.strict?e.stricted:e.firstRestricted;this.throwUnexpectedToken(a,e.message)}return{simple:e.simple,params:n,stricted:e.stricted,firstRestricted:e.firstRestricted,message:e.message}},t.prototype.parseAssignmentExpression=function(){var t;if(!this.context.allowYield&&this.matchKeyword("yield"))t=this.parseYieldExpression();else{var e=this.lookahead,n=e;if(t=this.parseConditionalExpression(),3===n.type&&n.lineNumber===this.lookahead.lineNumber&&"async"===n.value&&(3===this.lookahead.type||this.matchKeyword("yield"))){var r=this.parsePrimaryExpression();this.reinterpretExpressionAsPattern(r),t={type:"ArrowParameterPlaceHolder",params:[r],async:!0}}if("ArrowParameterPlaceHolder"===t.type||this.match("=>")){this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var i=t.async,a=this.reinterpretAsCoverFormalsList(t);if(a){this.hasLineTerminator&&this.tolerateUnexpectedToken(this.lookahead),this.context.firstCoverInitializedNameError=null;var c=this.context.strict,h=this.context.allowStrictDirective;this.context.allowStrictDirective=a.simple;var l=this.context.allowYield,p=this.context.await;this.context.allowYield=!0,this.context.await=i;var f=this.startNode(e);this.expect("=>");var d=void 0;if(this.match("{")){var m=this.context.allowIn;this.context.allowIn=!0,d=this.parseFunctionSourceElements(),this.context.allowIn=m}else d=this.isolateCoverGrammar(this.parseAssignmentExpression);var y=d.type!==u.Syntax.BlockStatement;this.context.strict&&a.firstRestricted&&this.throwUnexpectedToken(a.firstRestricted,a.message),this.context.strict&&a.stricted&&this.tolerateUnexpectedToken(a.stricted,a.message),t=i?this.finalize(f,new s.AsyncArrowFunctionExpression(a.params,d,y)):this.finalize(f,new s.ArrowFunctionExpression(a.params,d,y)),this.context.strict=c,this.context.allowStrictDirective=h,this.context.allowYield=l,this.context.await=p}}else if(this.matchAssign()){if(this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment),this.context.strict&&t.type===u.Syntax.Identifier){var v=t;this.scanner.isRestrictedWord(v.name)&&this.tolerateUnexpectedToken(n,o.Messages.StrictLHSAssignment),this.scanner.isStrictModeReservedWord(v.name)&&this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord)}this.match("=")?this.reinterpretExpressionAsPattern(t):(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1),n=this.nextToken();var x=n.value,g=this.isolateCoverGrammar(this.parseAssignmentExpression);t=this.finalize(this.startNode(e),new s.AssignmentExpression(x,t,g)),this.context.firstCoverInitializedNameError=null}}return t},t.prototype.parseExpression=function(){var t=this.lookahead,e=this.isolateCoverGrammar(this.parseAssignmentExpression);if(this.match(",")){var n=[];for(n.push(e);2!==this.lookahead.type&&this.match(",");)this.nextToken(),n.push(this.isolateCoverGrammar(this.parseAssignmentExpression));e=this.finalize(this.startNode(t),new s.SequenceExpression(n))}return e},t.prototype.parseStatementListItem=function(){var t;if(this.context.isAssignmentTarget=!0,this.context.isBindingElement=!0,4===this.lookahead.type)switch(this.lookahead.value){case"export":this.context.isModule||this.tolerateUnexpectedToken(this.lookahead,o.Messages.IllegalExportDeclaration),t=this.parseExportDeclaration();break;case"import":this.context.isModule||this.tolerateUnexpectedToken(this.lookahead,o.Messages.IllegalImportDeclaration),t=this.parseImportDeclaration();break;case"const":t=this.parseLexicalDeclaration({inFor:!1});break;case"function":t=this.parseFunctionDeclaration();break;case"class":t=this.parseClassDeclaration();break;case"let":t=this.isLexicalDeclaration()?this.parseLexicalDeclaration({inFor:!1}):this.parseStatement();break;default:t=this.parseStatement()}else t=this.parseStatement();return t},t.prototype.parseBlock=function(){var t=this.createNode();this.expect("{");for(var e=[];;){if(this.match("}"))break;e.push(this.parseStatementListItem())}return this.expect("}"),this.finalize(t,new s.BlockStatement(e))},t.prototype.parseLexicalBinding=function(t,e){var n=this.createNode(),r=[],i=this.parsePattern(r,t);this.context.strict&&i.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(i.name)&&this.tolerateError(o.Messages.StrictVarName);var a=null;return"const"===t?this.matchKeyword("in")||this.matchContextualKeyword("of")||(this.match("=")?(this.nextToken(),a=this.isolateCoverGrammar(this.parseAssignmentExpression)):this.throwError(o.Messages.DeclarationMissingInitializer,"const")):(!e.inFor&&i.type!==u.Syntax.Identifier||this.match("="))&&(this.expect("="),a=this.isolateCoverGrammar(this.parseAssignmentExpression)),this.finalize(n,new s.VariableDeclarator(i,a))},t.prototype.parseBindingList=function(t,e){for(var n=[this.parseLexicalBinding(t,e)];this.match(",");)this.nextToken(),n.push(this.parseLexicalBinding(t,e));return n},t.prototype.isLexicalDeclaration=function(){var t=this.scanner.saveState();this.scanner.scanComments();var e=this.scanner.lex();return this.scanner.restoreState(t),3===e.type||7===e.type&&"["===e.value||7===e.type&&"{"===e.value||4===e.type&&"let"===e.value||4===e.type&&"yield"===e.value},t.prototype.parseLexicalDeclaration=function(t){var e=this.createNode(),n=this.nextToken().value;r.assert("let"===n||"const"===n,"Lexical declaration must be either let or const");var i=this.parseBindingList(n,t);return this.consumeSemicolon(),this.finalize(e,new s.VariableDeclaration(i,n))},t.prototype.parseBindingRestElement=function(t,e){var n=this.createNode();this.expect("...");var r=this.parsePattern(t,e);return this.finalize(n,new s.RestElement(r))},t.prototype.parseArrayPattern=function(t,e){var n=this.createNode();this.expect("[");for(var r=[];!this.match("]");)if(this.match(","))this.nextToken(),r.push(null);else{if(this.match("...")){r.push(this.parseBindingRestElement(t,e));break}r.push(this.parsePatternWithDefault(t,e)),this.match("]")||this.expect(",")}return this.expect("]"),this.finalize(n,new s.ArrayPattern(r))},t.prototype.parsePropertyPattern=function(t,e){var n,r,i=this.createNode(),o=!1,a=!1;if(3===this.lookahead.type){var u=this.lookahead;n=this.parseVariableIdentifier();var c=this.finalize(i,new s.Identifier(u.value));if(this.match("=")){t.push(u),a=!0,this.nextToken();var h=this.parseAssignmentExpression();r=this.finalize(this.startNode(u),new s.AssignmentPattern(c,h))}else this.match(":")?(this.expect(":"),r=this.parsePatternWithDefault(t,e)):(t.push(u),a=!0,r=c)}else o=this.match("["),n=this.parseObjectPropertyKey(),this.expect(":"),r=this.parsePatternWithDefault(t,e);return this.finalize(i,new s.Property("init",n,o,r,!1,a))},t.prototype.parseObjectPattern=function(t,e){var n=this.createNode(),r=[];for(this.expect("{");!this.match("}");)r.push(this.parsePropertyPattern(t,e)),this.match("}")||this.expect(",");return this.expect("}"),this.finalize(n,new s.ObjectPattern(r))},t.prototype.parsePattern=function(t,e){var n;return this.match("[")?n=this.parseArrayPattern(t,e):this.match("{")?n=this.parseObjectPattern(t,e):(!this.matchKeyword("let")||"const"!==e&&"let"!==e||this.tolerateUnexpectedToken(this.lookahead,o.Messages.LetInLexicalBinding),t.push(this.lookahead),n=this.parseVariableIdentifier(e)),n},t.prototype.parsePatternWithDefault=function(t,e){var n=this.lookahead,r=this.parsePattern(t,e);if(this.match("=")){this.nextToken();var i=this.context.allowYield;this.context.allowYield=!0;var o=this.isolateCoverGrammar(this.parseAssignmentExpression);this.context.allowYield=i,r=this.finalize(this.startNode(n),new s.AssignmentPattern(r,o))}return r},t.prototype.parseVariableIdentifier=function(t){var e=this.createNode(),n=this.nextToken();return 4===n.type&&"yield"===n.value?this.context.strict?this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord):this.context.allowYield||this.throwUnexpectedToken(n):3!==n.type?this.context.strict&&4===n.type&&this.scanner.isStrictModeReservedWord(n.value)?this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord):(this.context.strict||"let"!==n.value||"var"!==t)&&this.throwUnexpectedToken(n):(this.context.isModule||this.context.await)&&3===n.type&&"await"===n.value&&this.tolerateUnexpectedToken(n),this.finalize(e,new s.Identifier(n.value))},t.prototype.parseVariableDeclaration=function(t){var e=this.createNode(),n=[],r=this.parsePattern(n,"var");this.context.strict&&r.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(r.name)&&this.tolerateError(o.Messages.StrictVarName);var i=null;return this.match("=")?(this.nextToken(),i=this.isolateCoverGrammar(this.parseAssignmentExpression)):r.type===u.Syntax.Identifier||t.inFor||this.expect("="),this.finalize(e,new s.VariableDeclarator(r,i))},t.prototype.parseVariableDeclarationList=function(t){var e={inFor:t.inFor},n=[];for(n.push(this.parseVariableDeclaration(e));this.match(",");)this.nextToken(),n.push(this.parseVariableDeclaration(e));return n},t.prototype.parseVariableStatement=function(){var t=this.createNode();this.expectKeyword("var");var e=this.parseVariableDeclarationList({inFor:!1});return this.consumeSemicolon(),this.finalize(t,new s.VariableDeclaration(e,"var"))},t.prototype.parseEmptyStatement=function(){var t=this.createNode();return this.expect(";"),this.finalize(t,new s.EmptyStatement)},t.prototype.parseExpressionStatement=function(){var t=this.createNode(),e=this.parseExpression();return this.consumeSemicolon(),this.finalize(t,new s.ExpressionStatement(e))},t.prototype.parseIfClause=function(){return this.context.strict&&this.matchKeyword("function")&&this.tolerateError(o.Messages.StrictFunction),this.parseStatement()},t.prototype.parseIfStatement=function(){var t,e=this.createNode(),n=null;this.expectKeyword("if"),this.expect("(");var r=this.parseExpression();return!this.match(")")&&this.config.tolerant?(this.tolerateUnexpectedToken(this.nextToken()),t=this.finalize(this.createNode(),new s.EmptyStatement)):(this.expect(")"),t=this.parseIfClause(),this.matchKeyword("else")&&(this.nextToken(),n=this.parseIfClause())),this.finalize(e,new s.IfStatement(r,t,n))},t.prototype.parseDoWhileStatement=function(){var t=this.createNode();this.expectKeyword("do");var e=this.context.inIteration;this.context.inIteration=!0;var n=this.parseStatement();this.context.inIteration=e,this.expectKeyword("while"),this.expect("(");var r=this.parseExpression();return!this.match(")")&&this.config.tolerant?this.tolerateUnexpectedToken(this.nextToken()):(this.expect(")"),this.match(";")&&this.nextToken()),this.finalize(t,new s.DoWhileStatement(n,r))},t.prototype.parseWhileStatement=function(){var t,e=this.createNode();this.expectKeyword("while"),this.expect("(");var n=this.parseExpression();if(!this.match(")")&&this.config.tolerant)this.tolerateUnexpectedToken(this.nextToken()),t=this.finalize(this.createNode(),new s.EmptyStatement);else{this.expect(")");var r=this.context.inIteration;this.context.inIteration=!0,t=this.parseStatement(),this.context.inIteration=r}return this.finalize(e,new s.WhileStatement(n,t))},t.prototype.parseForStatement=function(){var t,e,n=null,r=null,i=null,a=!0,c=this.createNode();if(this.expectKeyword("for"),this.expect("("),this.match(";"))this.nextToken();else if(this.matchKeyword("var")){n=this.createNode(),this.nextToken();var h=this.context.allowIn;this.context.allowIn=!1;var l=this.parseVariableDeclarationList({inFor:!0});if(this.context.allowIn=h,1===l.length&&this.matchKeyword("in")){var p=l[0];p.init&&(p.id.type===u.Syntax.ArrayPattern||p.id.type===u.Syntax.ObjectPattern||this.context.strict)&&this.tolerateError(o.Messages.ForInOfLoopInitializer,"for-in"),n=this.finalize(n,new s.VariableDeclaration(l,"var")),this.nextToken(),t=n,e=this.parseExpression(),n=null}else 1===l.length&&null===l[0].init&&this.matchContextualKeyword("of")?(n=this.finalize(n,new s.VariableDeclaration(l,"var")),this.nextToken(),t=n,e=this.parseAssignmentExpression(),n=null,a=!1):(n=this.finalize(n,new s.VariableDeclaration(l,"var")),this.expect(";"))}else if(this.matchKeyword("const")||this.matchKeyword("let")){n=this.createNode();var f=this.nextToken().value;if(this.context.strict||"in"!==this.lookahead.value){var h=this.context.allowIn;this.context.allowIn=!1;var l=this.parseBindingList(f,{inFor:!0});this.context.allowIn=h,1===l.length&&null===l[0].init&&this.matchKeyword("in")?(n=this.finalize(n,new s.VariableDeclaration(l,f)),this.nextToken(),t=n,e=this.parseExpression(),n=null):1===l.length&&null===l[0].init&&this.matchContextualKeyword("of")?(n=this.finalize(n,new s.VariableDeclaration(l,f)),this.nextToken(),t=n,e=this.parseAssignmentExpression(),n=null,a=!1):(this.consumeSemicolon(),n=this.finalize(n,new s.VariableDeclaration(l,f)))}else n=this.finalize(n,new s.Identifier(f)),this.nextToken(),t=n,e=this.parseExpression(),n=null}else{var d=this.lookahead,h=this.context.allowIn;if(this.context.allowIn=!1,n=this.inheritCoverGrammar(this.parseAssignmentExpression),this.context.allowIn=h,this.matchKeyword("in"))this.context.isAssignmentTarget&&n.type!==u.Syntax.AssignmentExpression||this.tolerateError(o.Messages.InvalidLHSInForIn),this.nextToken(),this.reinterpretExpressionAsPattern(n),t=n,e=this.parseExpression(),n=null;else if(this.matchContextualKeyword("of"))this.context.isAssignmentTarget&&n.type!==u.Syntax.AssignmentExpression||this.tolerateError(o.Messages.InvalidLHSInForLoop),this.nextToken(),this.reinterpretExpressionAsPattern(n),t=n,e=this.parseAssignmentExpression(),n=null,a=!1;else{if(this.match(",")){for(var m=[n];this.match(",");)this.nextToken(),m.push(this.isolateCoverGrammar(this.parseAssignmentExpression));n=this.finalize(this.startNode(d),new s.SequenceExpression(m))}this.expect(";")}}void 0===t&&(this.match(";")||(r=this.parseExpression()),this.expect(";"),this.match(")")||(i=this.parseExpression()));var y;if(!this.match(")")&&this.config.tolerant)this.tolerateUnexpectedToken(this.nextToken()),y=this.finalize(this.createNode(),new s.EmptyStatement);else{this.expect(")");var v=this.context.inIteration;this.context.inIteration=!0,y=this.isolateCoverGrammar(this.parseStatement),this.context.inIteration=v}return void 0===t?this.finalize(c,new s.ForStatement(n,r,i,y)):a?this.finalize(c,new s.ForInStatement(t,e,y)):this.finalize(c,new s.ForOfStatement(t,e,y))},t.prototype.parseContinueStatement=function(){var t=this.createNode();this.expectKeyword("continue");var e=null;if(3===this.lookahead.type&&!this.hasLineTerminator){var n=this.parseVariableIdentifier();e=n;var r="$"+n.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,r)||this.throwError(o.Messages.UnknownLabel,n.name)}return this.consumeSemicolon(),null!==e||this.context.inIteration||this.throwError(o.Messages.IllegalContinue),this.finalize(t,new s.ContinueStatement(e))},t.prototype.parseBreakStatement=function(){var t=this.createNode();this.expectKeyword("break");var e=null;if(3===this.lookahead.type&&!this.hasLineTerminator){var n=this.parseVariableIdentifier(),r="$"+n.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,r)||this.throwError(o.Messages.UnknownLabel,n.name),e=n}return this.consumeSemicolon(),null!==e||this.context.inIteration||this.context.inSwitch||this.throwError(o.Messages.IllegalBreak),this.finalize(t,new s.BreakStatement(e))},t.prototype.parseReturnStatement=function(){this.context.inFunctionBody||this.tolerateError(o.Messages.IllegalReturn);var t=this.createNode();this.expectKeyword("return");var e=!this.match(";")&&!this.match("}")&&!this.hasLineTerminator&&2!==this.lookahead.type,n=e?this.parseExpression():null;return this.consumeSemicolon(),this.finalize(t,new s.ReturnStatement(n))},t.prototype.parseWithStatement=function(){this.context.strict&&this.tolerateError(o.Messages.StrictModeWith);var t,e=this.createNode();this.expectKeyword("with"),this.expect("(");var n=this.parseExpression();return!this.match(")")&&this.config.tolerant?(this.tolerateUnexpectedToken(this.nextToken()),t=this.finalize(this.createNode(),new s.EmptyStatement)):(this.expect(")"),t=this.parseStatement()),this.finalize(e,new s.WithStatement(n,t))},t.prototype.parseSwitchCase=function(){var t,e=this.createNode();this.matchKeyword("default")?(this.nextToken(),t=null):(this.expectKeyword("case"),t=this.parseExpression()),this.expect(":");for(var n=[];;){if(this.match("}")||this.matchKeyword("default")||this.matchKeyword("case"))break;n.push(this.parseStatementListItem())}return this.finalize(e,new s.SwitchCase(t,n))},t.prototype.parseSwitchStatement=function(){var t=this.createNode();this.expectKeyword("switch"),this.expect("(");var e=this.parseExpression();this.expect(")");var n=this.context.inSwitch;this.context.inSwitch=!0;var r=[],i=!1;for(this.expect("{");;){if(this.match("}"))break;var a=this.parseSwitchCase();null===a.test&&(i&&this.throwError(o.Messages.MultipleDefaultsInSwitch),i=!0),r.push(a)}return this.expect("}"),this.context.inSwitch=n,this.finalize(t,new s.SwitchStatement(e,r))},t.prototype.parseLabelledStatement=function(){var t,e=this.createNode(),n=this.parseExpression();if(n.type===u.Syntax.Identifier&&this.match(":")){this.nextToken();var r=n,i="$"+r.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,i)&&this.throwError(o.Messages.Redeclaration,"Label",r.name),this.context.labelSet[i]=!0;var a=void 0;if(this.matchKeyword("class"))this.tolerateUnexpectedToken(this.lookahead),a=this.parseClassDeclaration();else if(this.matchKeyword("function")){var c=this.lookahead,h=this.parseFunctionDeclaration();this.context.strict?this.tolerateUnexpectedToken(c,o.Messages.StrictFunction):h.generator&&this.tolerateUnexpectedToken(c,o.Messages.GeneratorInLegacyContext),a=h}else a=this.parseStatement();delete this.context.labelSet[i],t=new s.LabeledStatement(r,a)}else this.consumeSemicolon(),t=new s.ExpressionStatement(n);return this.finalize(e,t)},t.prototype.parseThrowStatement=function(){var t=this.createNode();this.expectKeyword("throw"),this.hasLineTerminator&&this.throwError(o.Messages.NewlineAfterThrow);var e=this.parseExpression();return this.consumeSemicolon(),this.finalize(t,new s.ThrowStatement(e))},t.prototype.parseCatchClause=function(){var t=this.createNode();this.expectKeyword("catch"),this.expect("("),this.match(")")&&this.throwUnexpectedToken(this.lookahead);for(var e=[],n=this.parsePattern(e),r={},i=0;i<e.length;i++){var a="$"+e[i].value;Object.prototype.hasOwnProperty.call(r,a)&&this.tolerateError(o.Messages.DuplicateBinding,e[i].value),r[a]=!0}this.context.strict&&n.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(n.name)&&this.tolerateError(o.Messages.StrictCatchVariable),this.expect(")");var c=this.parseBlock();return this.finalize(t,new s.CatchClause(n,c))},t.prototype.parseFinallyClause=function(){return this.expectKeyword("finally"),this.parseBlock()},t.prototype.parseTryStatement=function(){var t=this.createNode();this.expectKeyword("try");var e=this.parseBlock(),n=this.matchKeyword("catch")?this.parseCatchClause():null,r=this.matchKeyword("finally")?this.parseFinallyClause():null;return n||r||this.throwError(o.Messages.NoCatchOrFinally),this.finalize(t,new s.TryStatement(e,n,r))},t.prototype.parseDebuggerStatement=function(){var t=this.createNode();return this.expectKeyword("debugger"),this.consumeSemicolon(),this.finalize(t,new s.DebuggerStatement)},t.prototype.parseStatement=function(){var t;switch(this.lookahead.type){case 1:case 5:case 6:case 8:case 10:case 9:t=this.parseExpressionStatement();break;case 7:var e=this.lookahead.value;t="{"===e?this.parseBlock():"("===e?this.parseExpressionStatement():";"===e?this.parseEmptyStatement():this.parseExpressionStatement();break;case 3:t=this.matchAsyncFunction()?this.parseFunctionDeclaration():this.parseLabelledStatement();break;case 4:switch(this.lookahead.value){case"break":t=this.parseBreakStatement();break;case"continue":t=this.parseContinueStatement();break;case"debugger":t=this.parseDebuggerStatement();break;case"do":t=this.parseDoWhileStatement();break;case"for":t=this.parseForStatement();break;case"function":t=this.parseFunctionDeclaration();break;case"if":t=this.parseIfStatement();break;case"return":t=this.parseReturnStatement();break;case"switch":t=this.parseSwitchStatement();break;case"throw":t=this.parseThrowStatement();break;case"try":t=this.parseTryStatement();break;case"var":t=this.parseVariableStatement();break;case"while":t=this.parseWhileStatement();break;case"with":t=this.parseWithStatement();break;default:t=this.parseExpressionStatement()}break;default:t=this.throwUnexpectedToken(this.lookahead)}return t},t.prototype.parseFunctionSourceElements=function(){var t=this.createNode();this.expect("{");var e=this.parseDirectivePrologues(),n=this.context.labelSet,r=this.context.inIteration,i=this.context.inSwitch,o=this.context.inFunctionBody;for(this.context.labelSet={},this.context.inIteration=!1,this.context.inSwitch=!1,this.context.inFunctionBody=!0;2!==this.lookahead.type&&!this.match("}");)e.push(this.parseStatementListItem());return this.expect("}"),this.context.labelSet=n,this.context.inIteration=r,this.context.inSwitch=i,this.context.inFunctionBody=o,this.finalize(t,new s.BlockStatement(e))},t.prototype.validateParam=function(t,e,n){var r="$"+n;this.context.strict?(this.scanner.isRestrictedWord(n)&&(t.stricted=e,t.message=o.Messages.StrictParamName),Object.prototype.hasOwnProperty.call(t.paramSet,r)&&(t.stricted=e,t.message=o.Messages.StrictParamDupe)):t.firstRestricted||(this.scanner.isRestrictedWord(n)?(t.firstRestricted=e,t.message=o.Messages.StrictParamName):this.scanner.isStrictModeReservedWord(n)?(t.firstRestricted=e,t.message=o.Messages.StrictReservedWord):Object.prototype.hasOwnProperty.call(t.paramSet,r)&&(t.stricted=e,t.message=o.Messages.StrictParamDupe)),"function"==typeof Object.defineProperty?Object.defineProperty(t.paramSet,r,{value:!0,enumerable:!0,writable:!0,configurable:!0}):t.paramSet[r]=!0},t.prototype.parseRestElement=function(t){var e=this.createNode();this.expect("...");var n=this.parsePattern(t);return this.match("=")&&this.throwError(o.Messages.DefaultRestParameter),this.match(")")||this.throwError(o.Messages.ParameterAfterRestParameter),this.finalize(e,new s.RestElement(n))},t.prototype.parseFormalParameter=function(t){for(var e=[],n=this.match("...")?this.parseRestElement(e):this.parsePatternWithDefault(e),r=0;r<e.length;r++)this.validateParam(t,e[r],e[r].value);t.simple=t.simple&&n instanceof s.Identifier,t.params.push(n)},t.prototype.parseFormalParameters=function(t){var e;if(e={simple:!0,params:[],firstRestricted:t},this.expect("("),!this.match(")"))for(e.paramSet={};2!==this.lookahead.type&&(this.parseFormalParameter(e),!this.match(")"))&&(this.expect(","),!this.match(")")););return this.expect(")"),{simple:e.simple,params:e.params,stricted:e.stricted,firstRestricted:e.firstRestricted,message:e.message}},t.prototype.matchAsyncFunction=function(){var t=this.matchContextualKeyword("async");if(t){var e=this.scanner.saveState();this.scanner.scanComments();var n=this.scanner.lex();this.scanner.restoreState(e),t=e.lineNumber===n.lineNumber&&4===n.type&&"function"===n.value}return t},t.prototype.parseFunctionDeclaration=function(t){var e=this.createNode(),n=this.matchContextualKeyword("async");n&&this.nextToken(),this.expectKeyword("function");var r=!n&&this.match("*");r&&this.nextToken();var i,a=null,u=null;if(!t||!this.match("(")){var c=this.lookahead;a=this.parseVariableIdentifier(),this.context.strict?this.scanner.isRestrictedWord(c.value)&&this.tolerateUnexpectedToken(c,o.Messages.StrictFunctionName):this.scanner.isRestrictedWord(c.value)?(u=c,i=o.Messages.StrictFunctionName):this.scanner.isStrictModeReservedWord(c.value)&&(u=c,i=o.Messages.StrictReservedWord)}var h=this.context.await,l=this.context.allowYield;this.context.await=n,this.context.allowYield=!r;var p=this.parseFormalParameters(u),f=p.params,d=p.stricted;u=p.firstRestricted,p.message&&(i=p.message);var m=this.context.strict,y=this.context.allowStrictDirective;this.context.allowStrictDirective=p.simple;var v=this.parseFunctionSourceElements();return this.context.strict&&u&&this.throwUnexpectedToken(u,i),this.context.strict&&d&&this.tolerateUnexpectedToken(d,i),this.context.strict=m,this.context.allowStrictDirective=y,this.context.await=h,this.context.allowYield=l,n?this.finalize(e,new s.AsyncFunctionDeclaration(a,f,v)):this.finalize(e,new s.FunctionDeclaration(a,f,v,r))},t.prototype.parseFunctionExpression=function(){var t=this.createNode(),e=this.matchContextualKeyword("async");e&&this.nextToken(),this.expectKeyword("function");var n=!e&&this.match("*");n&&this.nextToken();var r,i,a=null,u=this.context.await,c=this.context.allowYield;if(this.context.await=e,this.context.allowYield=!n,!this.match("(")){var h=this.lookahead;a=this.context.strict||n||!this.matchKeyword("yield")?this.parseVariableIdentifier():this.parseIdentifierName(),this.context.strict?this.scanner.isRestrictedWord(h.value)&&this.tolerateUnexpectedToken(h,o.Messages.StrictFunctionName):this.scanner.isRestrictedWord(h.value)?(i=h,r=o.Messages.StrictFunctionName):this.scanner.isStrictModeReservedWord(h.value)&&(i=h,r=o.Messages.StrictReservedWord)}var l=this.parseFormalParameters(i),p=l.params,f=l.stricted;i=l.firstRestricted,l.message&&(r=l.message);var d=this.context.strict,m=this.context.allowStrictDirective;this.context.allowStrictDirective=l.simple;var y=this.parseFunctionSourceElements();return this.context.strict&&i&&this.throwUnexpectedToken(i,r),this.context.strict&&f&&this.tolerateUnexpectedToken(f,r),this.context.strict=d,this.context.allowStrictDirective=m,this.context.await=u,this.context.allowYield=c,e?this.finalize(t,new s.AsyncFunctionExpression(a,p,y)):this.finalize(t,new s.FunctionExpression(a,p,y,n))},t.prototype.parseDirective=function(){var t=this.lookahead,e=this.createNode(),n=this.parseExpression(),r=n.type===u.Syntax.Literal?this.getTokenRaw(t).slice(1,-1):null;return this.consumeSemicolon(),this.finalize(e,r?new s.Directive(n,r):new s.ExpressionStatement(n))},t.prototype.parseDirectivePrologues=function(){for(var t=null,e=[];;){var n=this.lookahead;if(8!==n.type)break;var r=this.parseDirective();e.push(r);var i=r.directive;if("string"!=typeof i)break;"use strict"===i?(this.context.strict=!0,t&&this.tolerateUnexpectedToken(t,o.Messages.StrictOctalLiteral),this.context.allowStrictDirective||this.tolerateUnexpectedToken(n,o.Messages.IllegalLanguageModeDirective)):!t&&n.octal&&(t=n)}return e},t.prototype.qualifiedPropertyName=function(t){switch(t.type){case 3:case 8:case 1:case 5:case 6:case 4:return!0;case 7:return"["===t.value}return!1},t.prototype.parseGetterMethod=function(){var t=this.createNode(),e=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters();n.params.length>0&&this.tolerateError(o.Messages.BadGetterArity);var r=this.parsePropertyMethod(n);return this.context.allowYield=e,this.finalize(t,new s.FunctionExpression(null,n.params,r,!1))},t.prototype.parseSetterMethod=function(){var t=this.createNode(),e=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters();1!==n.params.length?this.tolerateError(o.Messages.BadSetterArity):n.params[0]instanceof s.RestElement&&this.tolerateError(o.Messages.BadSetterRestParameter);var r=this.parsePropertyMethod(n);return this.context.allowYield=e,this.finalize(t,new s.FunctionExpression(null,n.params,r,!1))},t.prototype.parseGeneratorMethod=function(){var t=this.createNode(),e=this.context.allowYield;this.context.allowYield=!0;var n=this.parseFormalParameters();this.context.allowYield=!1;var r=this.parsePropertyMethod(n);return this.context.allowYield=e,this.finalize(t,new s.FunctionExpression(null,n.params,r,!0))},t.prototype.isStartOfExpression=function(){var t=!0,e=this.lookahead.value;switch(this.lookahead.type){case 7:t="["===e||"("===e||"{"===e||"+"===e||"-"===e||"!"===e||"~"===e||"++"===e||"--"===e||"/"===e||"/="===e;break;case 4:t="class"===e||"delete"===e||"function"===e||"let"===e||"new"===e||"super"===e||"this"===e||"typeof"===e||"void"===e||"yield"===e}return t},t.prototype.parseYieldExpression=function(){var t=this.createNode();this.expectKeyword("yield");var e=null,n=!1;if(!this.hasLineTerminator){var r=this.context.allowYield;this.context.allowYield=!1,n=this.match("*"),n?(this.nextToken(),e=this.parseAssignmentExpression()):this.isStartOfExpression()&&(e=this.parseAssignmentExpression()),this.context.allowYield=r}return this.finalize(t,new s.YieldExpression(e,n))},t.prototype.parseClassElement=function(t){var e=this.lookahead,n=this.createNode(),r="",i=null,a=null,u=!1,c=!1,h=!1,l=!1;if(this.match("*"))this.nextToken();else{u=this.match("["),i=this.parseObjectPropertyKey();if("static"===i.name&&(this.qualifiedPropertyName(this.lookahead)||this.match("*"))&&(e=this.lookahead,h=!0,u=this.match("["),this.match("*")?this.nextToken():i=this.parseObjectPropertyKey()),3===e.type&&!this.hasLineTerminator&&"async"===e.value){var p=this.lookahead.value;":"!==p&&"("!==p&&"*"!==p&&(l=!0,e=this.lookahead,i=this.parseObjectPropertyKey(),3===e.type&&("get"===e.value||"set"===e.value?this.tolerateUnexpectedToken(e):"constructor"===e.value&&this.tolerateUnexpectedToken(e,o.Messages.ConstructorIsAsync)))}}var f=this.qualifiedPropertyName(this.lookahead);return 3===e.type?"get"===e.value&&f?(r="get",u=this.match("["),i=this.parseObjectPropertyKey(),this.context.allowYield=!1,a=this.parseGetterMethod()):"set"===e.value&&f&&(r="set",u=this.match("["),i=this.parseObjectPropertyKey(),a=this.parseSetterMethod()):7===e.type&&"*"===e.value&&f&&(r="init",u=this.match("["),i=this.parseObjectPropertyKey(),a=this.parseGeneratorMethod(),c=!0),!r&&i&&this.match("(")&&(r="init",a=l?this.parsePropertyMethodAsyncFunction():this.parsePropertyMethodFunction(),c=!0),r||this.throwUnexpectedToken(this.lookahead),"init"===r&&(r="method"),u||(h&&this.isPropertyKey(i,"prototype")&&this.throwUnexpectedToken(e,o.Messages.StaticPrototype),!h&&this.isPropertyKey(i,"constructor")&&(("method"!==r||!c||a&&a.generator)&&this.throwUnexpectedToken(e,o.Messages.ConstructorSpecialMethod),t.value?this.throwUnexpectedToken(e,o.Messages.DuplicateConstructor):t.value=!0,r="constructor")),this.finalize(n,new s.MethodDefinition(i,u,a,r,h))},t.prototype.parseClassElementList=function(){var t=[],e={value:!1};for(this.expect("{");!this.match("}");)this.match(";")?this.nextToken():t.push(this.parseClassElement(e));return this.expect("}"),t},t.prototype.parseClassBody=function(){var t=this.createNode(),e=this.parseClassElementList();return this.finalize(t,new s.ClassBody(e))},t.prototype.parseClassDeclaration=function(t){var e=this.createNode(),n=this.context.strict;this.context.strict=!0,this.expectKeyword("class");var r=t&&3!==this.lookahead.type?null:this.parseVariableIdentifier(),i=null;this.matchKeyword("extends")&&(this.nextToken(),i=this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall));var o=this.parseClassBody();return this.context.strict=n,this.finalize(e,new s.ClassDeclaration(r,i,o))},t.prototype.parseClassExpression=function(){var t=this.createNode(),e=this.context.strict;this.context.strict=!0,this.expectKeyword("class");var n=3===this.lookahead.type?this.parseVariableIdentifier():null,r=null;this.matchKeyword("extends")&&(this.nextToken(),r=this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall));var i=this.parseClassBody();return this.context.strict=e,this.finalize(t,new s.ClassExpression(n,r,i))},t.prototype.parseModule=function(){this.context.strict=!0,this.context.isModule=!0;for(var t=this.createNode(),e=this.parseDirectivePrologues();2!==this.lookahead.type;)e.push(this.parseStatementListItem());return this.finalize(t,new s.Module(e))},t.prototype.parseScript=function(){for(var t=this.createNode(),e=this.parseDirectivePrologues();2!==this.lookahead.type;)e.push(this.parseStatementListItem());return this.finalize(t,new s.Script(e))},t.prototype.parseModuleSpecifier=function(){var t=this.createNode();8!==this.lookahead.type&&this.throwError(o.Messages.InvalidModuleSpecifier);var e=this.nextToken(),n=this.getTokenRaw(e);return this.finalize(t,new s.Literal(e.value,n))},t.prototype.parseImportSpecifier=function(){var t,e,n=this.createNode();return 3===this.lookahead.type?(t=this.parseVariableIdentifier(),e=t,this.matchContextualKeyword("as")&&(this.nextToken(),e=this.parseVariableIdentifier())):(t=this.parseIdentifierName(),e=t,this.matchContextualKeyword("as")?(this.nextToken(),e=this.parseVariableIdentifier()):this.throwUnexpectedToken(this.nextToken())),this.finalize(n,new s.ImportSpecifier(e,t))},t.prototype.parseNamedImports=function(){this.expect("{");for(var t=[];!this.match("}");)t.push(this.parseImportSpecifier()),this.match("}")||this.expect(",");return this.expect("}"),t},t.prototype.parseImportDefaultSpecifier=function(){var t=this.createNode(),e=this.parseIdentifierName();return this.finalize(t,new s.ImportDefaultSpecifier(e))},t.prototype.parseImportNamespaceSpecifier=function(){var t=this.createNode();this.expect("*"),this.matchContextualKeyword("as")||this.throwError(o.Messages.NoAsAfterImportNamespace),this.nextToken();var e=this.parseIdentifierName();return this.finalize(t,new s.ImportNamespaceSpecifier(e))},t.prototype.parseImportDeclaration=function(){this.context.inFunctionBody&&this.throwError(o.Messages.IllegalImportDeclaration);var t=this.createNode();this.expectKeyword("import");var e,n=[];if(8===this.lookahead.type)e=this.parseModuleSpecifier();else{if(this.match("{")?n=n.concat(this.parseNamedImports()):this.match("*")?n.push(this.parseImportNamespaceSpecifier()):this.isIdentifierName(this.lookahead)&&!this.matchKeyword("default")?(n.push(this.parseImportDefaultSpecifier()),this.match(",")&&(this.nextToken(),this.match("*")?n.push(this.parseImportNamespaceSpecifier()):this.match("{")?n=n.concat(this.parseNamedImports()):this.throwUnexpectedToken(this.lookahead))):this.throwUnexpectedToken(this.nextToken()),!this.matchContextualKeyword("from")){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}this.nextToken(),e=this.parseModuleSpecifier()}return this.consumeSemicolon(),this.finalize(t,new s.ImportDeclaration(n,e))},t.prototype.parseExportSpecifier=function(){var t=this.createNode(),e=this.parseIdentifierName(),n=e;return this.matchContextualKeyword("as")&&(this.nextToken(),n=this.parseIdentifierName()),this.finalize(t,new s.ExportSpecifier(e,n))},t.prototype.parseExportDeclaration=function(){this.context.inFunctionBody&&this.throwError(o.Messages.IllegalExportDeclaration);var t=this.createNode();this.expectKeyword("export");var e;if(this.matchKeyword("default"))if(this.nextToken(),this.matchKeyword("function")){var n=this.parseFunctionDeclaration(!0);e=this.finalize(t,new s.ExportDefaultDeclaration(n))}else if(this.matchKeyword("class")){var n=this.parseClassDeclaration(!0);e=this.finalize(t,new s.ExportDefaultDeclaration(n))}else if(this.matchContextualKeyword("async")){var n=this.matchAsyncFunction()?this.parseFunctionDeclaration(!0):this.parseAssignmentExpression();e=this.finalize(t,new s.ExportDefaultDeclaration(n))}else{this.matchContextualKeyword("from")&&this.throwError(o.Messages.UnexpectedToken,this.lookahead.value);var n=this.match("{")?this.parseObjectInitializer():this.match("[")?this.parseArrayInitializer():this.parseAssignmentExpression();this.consumeSemicolon(),e=this.finalize(t,new s.ExportDefaultDeclaration(n))}else if(this.match("*")){if(this.nextToken(),!this.matchContextualKeyword("from")){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}this.nextToken();var i=this.parseModuleSpecifier();this.consumeSemicolon(),e=this.finalize(t,new s.ExportAllDeclaration(i))}else if(4===this.lookahead.type){var n=void 0;switch(this.lookahead.value){case"let":case"const":n=this.parseLexicalDeclaration({inFor:!1});break;case"var":case"class":case"function":n=this.parseStatementListItem();break;default:this.throwUnexpectedToken(this.lookahead)}e=this.finalize(t,new s.ExportNamedDeclaration(n,[],null))}else if(this.matchAsyncFunction()){var n=this.parseFunctionDeclaration();e=this.finalize(t,new s.ExportNamedDeclaration(n,[],null))}else{var a=[],u=null,c=!1;for(this.expect("{");!this.match("}");)c=c||this.matchKeyword("default"),a.push(this.parseExportSpecifier()),this.match("}")||this.expect(",");if(this.expect("}"),this.matchContextualKeyword("from"))this.nextToken(),u=this.parseModuleSpecifier(),this.consumeSemicolon();else if(c){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}else this.consumeSemicolon();e=this.finalize(t,new s.ExportNamedDeclaration(null,a,u))}return e},t}();e.Parser=h},function(t,e){"use strict";function n(t,e){if(!t)throw new Error("ASSERT: "+e)}Object.defineProperty(e,"__esModule",{value:!0}),e.assert=n},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=function(){function t(){this.errors=[],this.tolerant=!1}return t.prototype.recordError=function(t){this.errors.push(t)},t.prototype.tolerate=function(t){if(!this.tolerant)throw t;this.recordError(t)},t.prototype.constructError=function(t,e){var n=new Error(t);try{throw n}catch(t){Object.create&&Object.defineProperty&&(n=Object.create(t),Object.defineProperty(n,"column",{value:e}))}return n},t.prototype.createError=function(t,e,n,r){var i="Line "+e+": "+r,o=this.constructError(i,n);return o.index=t,o.lineNumber=e,o.description=r,o},t.prototype.throwError=function(t,e,n,r){throw this.createError(t,e,n,r)},t.prototype.tolerateError=function(t,e,n,r){var i=this.createError(t,e,n,r);if(!this.tolerant)throw i;this.recordError(i)},t}();e.ErrorHandler=n},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.Messages={BadGetterArity:"Getter must not have any formal parameters",BadSetterArity:"Setter must have exactly one formal parameter",BadSetterRestParameter:"Setter function argument must not be a rest parameter",ConstructorIsAsync:"Class constructor may not be an async method",ConstructorSpecialMethod:"Class constructor may not be an accessor",DeclarationMissingInitializer:"Missing initializer in %0 declaration",DefaultRestParameter:"Unexpected token =",DuplicateBinding:"Duplicate binding %0",DuplicateConstructor:"A class may only have one constructor",DuplicateProtoProperty:"Duplicate __proto__ fields are not allowed in object literals",ForInOfLoopInitializer:"%0 loop variable declaration may not have an initializer",GeneratorInLegacyContext:"Generator declarations are not allowed in legacy contexts",IllegalBreak:"Illegal break statement",IllegalContinue:"Illegal continue statement",IllegalExportDeclaration:"Unexpected token",IllegalImportDeclaration:"Unexpected token",IllegalLanguageModeDirective:"Illegal 'use strict' directive in function with non-simple parameter list",IllegalReturn:"Illegal return statement",InvalidEscapedReservedWord:"Keyword must not contain escaped characters",InvalidHexEscapeSequence:"Invalid hexadecimal escape sequence",InvalidLHSInAssignment:"Invalid left-hand side in assignment",InvalidLHSInForIn:"Invalid left-hand side in for-in",InvalidLHSInForLoop:"Invalid left-hand side in for-loop",InvalidModuleSpecifier:"Unexpected token",InvalidRegExp:"Invalid regular expression",LetInLexicalBinding:"let is disallowed as a lexically bound name",MissingFromClause:"Unexpected token",MultipleDefaultsInSwitch:"More than one default clause in switch statement",NewlineAfterThrow:"Illegal newline after throw",NoAsAfterImportNamespace:"Unexpected token",NoCatchOrFinally:"Missing catch or finally after try",ParameterAfterRestParameter:"Rest parameter must be last formal parameter",Redeclaration:"%0 '%1' has already been declared",StaticPrototype:"Classes may not have static property named prototype",StrictCatchVariable:"Catch variable may not be eval or arguments in strict mode",StrictDelete:"Delete of an unqualified identifier in strict mode.",StrictFunction:"In strict mode code, functions can only be declared at top level or inside a block",StrictFunctionName:"Function name may not be eval or arguments in strict mode",StrictLHSAssignment:"Assignment to eval or arguments is not allowed in strict mode",StrictLHSPostfix:"Postfix increment/decrement may not have eval or arguments operand in strict mode",StrictLHSPrefix:"Prefix increment/decrement may not have eval or arguments operand in strict mode",StrictModeWith:"Strict mode code may not include a with statement",StrictOctalLiteral:"Octal literals are not allowed in strict mode.",StrictParamDupe:"Strict mode function may not have duplicate parameter names",StrictParamName:"Parameter name eval or arguments is not allowed in strict mode",StrictReservedWord:"Use of future reserved word in strict mode",StrictVarName:"Variable name may not be eval or arguments in strict mode",TemplateOctalLiteral:"Octal literals are not allowed in template strings.",UnexpectedEOS:"Unexpected end of input",UnexpectedIdentifier:"Unexpected identifier",UnexpectedNumber:"Unexpected number",UnexpectedReserved:"Unexpected reserved word",UnexpectedString:"Unexpected string",UnexpectedTemplate:"Unexpected quasi %0",UnexpectedToken:"Unexpected token %0",UnexpectedTokenIllegal:"Unexpected token ILLEGAL",UnknownLabel:"Undefined label '%0'",UnterminatedRegExp:"Invalid regular expression: missing /"}},function(t,e,n){"use strict";function r(t){return"0123456789abcdef".indexOf(t.toLowerCase())}function i(t){return"01234567".indexOf(t)}Object.defineProperty(e,"__esModule",{value:!0});var o=n(9),s=n(4),a=n(11),u=function(){function t(t,e){this.source=t,this.errorHandler=e,this.trackComment=!1,this.length=t.length,this.index=0,this.lineNumber=t.length>0?1:0,this.lineStart=0,this.curlyStack=[]}return t.prototype.saveState=function(){return{index:this.index,lineNumber:this.lineNumber,lineStart:this.lineStart}},t.prototype.restoreState=function(t){this.index=t.index,this.lineNumber=t.lineNumber,this.lineStart=t.lineStart},t.prototype.eof=function(){return this.index>=this.length},t.prototype.throwUnexpectedToken=function(t){return void 0===t&&(t=a.Messages.UnexpectedTokenIllegal),this.errorHandler.throwError(this.index,this.lineNumber,this.index-this.lineStart+1,t)},t.prototype.tolerateUnexpectedToken=function(t){void 0===t&&(t=a.Messages.UnexpectedTokenIllegal),this.errorHandler.tolerateError(this.index,this.lineNumber,this.index-this.lineStart+1,t)},t.prototype.skipSingleLineComment=function(t){var e,n,r=[];for(this.trackComment&&(r=[],e=this.index-t,n={start:{line:this.lineNumber,column:this.index-this.lineStart-t},end:{}});!this.eof();){var i=this.source.charCodeAt(this.index);if(++this.index,s.Character.isLineTerminator(i)){if(this.trackComment){n.end={line:this.lineNumber,column:this.index-this.lineStart-1};var o={multiLine:!1,slice:[e+t,this.index-1],range:[e,this.index-1],loc:n};r.push(o)}return 13===i&&10===this.source.charCodeAt(this.index)&&++this.index,++this.lineNumber,this.lineStart=this.index,r}}if(this.trackComment){n.end={line:this.lineNumber,column:this.index-this.lineStart};var o={multiLine:!1,slice:[e+t,this.index],range:[e,this.index],loc:n};r.push(o)}return r},t.prototype.skipMultiLineComment=function(){var t,e,n=[];for(this.trackComment&&(n=[],t=this.index-2,e={start:{line:this.lineNumber,column:this.index-this.lineStart-2},end:{}});!this.eof();){var r=this.source.charCodeAt(this.index);if(s.Character.isLineTerminator(r))13===r&&10===this.source.charCodeAt(this.index+1)&&++this.index,++this.lineNumber,++this.index,this.lineStart=this.index;else if(42===r){if(47===this.source.charCodeAt(this.index+1)){if(this.index+=2,this.trackComment){e.end={line:this.lineNumber,column:this.index-this.lineStart};var i={multiLine:!0,slice:[t+2,this.index-2],range:[t,this.index],loc:e};n.push(i)}return n}++this.index}else++this.index}if(this.trackComment){e.end={line:this.lineNumber,column:this.index-this.lineStart};var i={multiLine:!0,slice:[t+2,this.index],range:[t,this.index],loc:e};n.push(i)}return this.tolerateUnexpectedToken(),n},t.prototype.scanComments=function(){var t;this.trackComment&&(t=[]);for(var e=0===this.index;!this.eof();){var n=this.source.charCodeAt(this.index);if(s.Character.isWhiteSpace(n))++this.index;else if(s.Character.isLineTerminator(n))++this.index,13===n&&10===this.source.charCodeAt(this.index)&&++this.index,++this.lineNumber,this.lineStart=this.index,e=!0;else if(47===n)if(47===(n=this.source.charCodeAt(this.index+1))){this.index+=2;var r=this.skipSingleLineComment(2);this.trackComment&&(t=t.concat(r)),e=!0}else{if(42!==n)break;this.index+=2;var r=this.skipMultiLineComment();this.trackComment&&(t=t.concat(r))}else if(e&&45===n){if(45!==this.source.charCodeAt(this.index+1)||62!==this.source.charCodeAt(this.index+2))break;this.index+=3;var r=this.skipSingleLineComment(3);this.trackComment&&(t=t.concat(r))}else{if(60!==n)break;if("!--"!==this.source.slice(this.index+1,this.index+4))break;this.index+=4;var r=this.skipSingleLineComment(4);this.trackComment&&(t=t.concat(r))}}return t},t.prototype.isFutureReservedWord=function(t){switch(t){case"enum":case"export":case"import":case"super":return!0;default:return!1}},t.prototype.isStrictModeReservedWord=function(t){switch(t){case"implements":case"interface":case"package":case"private":case"protected":case"public":case"static":case"yield":case"let":return!0;default:return!1}},t.prototype.isRestrictedWord=function(t){return"eval"===t||"arguments"===t},t.prototype.isKeyword=function(t){switch(t.length){case 2:return"if"===t||"in"===t||"do"===t;case 3:return"var"===t||"for"===t||"new"===t||"try"===t||"let"===t;case 4:return"this"===t||"else"===t||"case"===t||"void"===t||"with"===t||"enum"===t;case 5:return"while"===t||"break"===t||"catch"===t||"throw"===t||"const"===t||"yield"===t||"class"===t||"super"===t;case 6:return"return"===t||"typeof"===t||"delete"===t||"switch"===t||"export"===t||"import"===t;case 7:return"default"===t||"finally"===t||"extends"===t;case 8:return"function"===t||"continue"===t||"debugger"===t;case 10:return"instanceof"===t;default:return!1}},t.prototype.codePointAt=function(t){var e=this.source.charCodeAt(t);if(e>=55296&&e<=56319){var n=this.source.charCodeAt(t+1);if(n>=56320&&n<=57343){e=1024*(e-55296)+n-56320+65536}}return e},t.prototype.scanHexEscape=function(t){for(var e="u"===t?4:2,n=0,i=0;i<e;++i){if(this.eof()||!s.Character.isHexDigit(this.source.charCodeAt(this.index)))return null;n=16*n+r(this.source[this.index++])}return String.fromCharCode(n)},t.prototype.scanUnicodeCodePointEscape=function(){var t=this.source[this.index],e=0;for("}"===t&&this.throwUnexpectedToken();!this.eof()&&(t=this.source[this.index++],s.Character.isHexDigit(t.charCodeAt(0)));)e=16*e+r(t);return(e>1114111||"}"!==t)&&this.throwUnexpectedToken(),s.Character.fromCodePoint(e)},t.prototype.getIdentifier=function(){for(var t=this.index++;!this.eof();){var e=this.source.charCodeAt(this.index);if(92===e)return this.index=t,this.getComplexIdentifier();if(e>=55296&&e<57343)return this.index=t,this.getComplexIdentifier();if(!s.Character.isIdentifierPart(e))break;++this.index}return this.source.slice(t,this.index)},t.prototype.getComplexIdentifier=function(){var t=this.codePointAt(this.index),e=s.Character.fromCodePoint(t);this.index+=e.length;var n;for(92===t&&(117!==this.source.charCodeAt(this.index)&&this.throwUnexpectedToken(),++this.index,"{"===this.source[this.index]?(++this.index,n=this.scanUnicodeCodePointEscape()):null!==(n=this.scanHexEscape("u"))&&"\\"!==n&&s.Character.isIdentifierStart(n.charCodeAt(0))||this.throwUnexpectedToken(),e=n);!this.eof()&&(t=this.codePointAt(this.index),s.Character.isIdentifierPart(t));)n=s.Character.fromCodePoint(t),e+=n,this.index+=n.length,92===t&&(e=e.substr(0,e.length-1),117!==this.source.charCodeAt(this.index)&&this.throwUnexpectedToken(),++this.index,"{"===this.source[this.index]?(++this.index,n=this.scanUnicodeCodePointEscape()):null!==(n=this.scanHexEscape("u"))&&"\\"!==n&&s.Character.isIdentifierPart(n.charCodeAt(0))||this.throwUnexpectedToken(),e+=n);return e},t.prototype.octalToDecimal=function(t){var e="0"!==t,n=i(t);return!this.eof()&&s.Character.isOctalDigit(this.source.charCodeAt(this.index))&&(e=!0,n=8*n+i(this.source[this.index++]),"0123".indexOf(t)>=0&&!this.eof()&&s.Character.isOctalDigit(this.source.charCodeAt(this.index))&&(n=8*n+i(this.source[this.index++]))),{code:n,octal:e}},t.prototype.scanIdentifier=function(){var t,e=this.index,n=92===this.source.charCodeAt(e)?this.getComplexIdentifier():this.getIdentifier();if(3!==(t=1===n.length?3:this.isKeyword(n)?4:"null"===n?5:"true"===n||"false"===n?1:3)&&e+n.length!==this.index){var r=this.index;this.index=e,this.tolerateUnexpectedToken(a.Messages.InvalidEscapedReservedWord),this.index=r}return{type:t,value:n,lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},t.prototype.scanPunctuator=function(){var t=this.index,e=this.source[this.index];switch(e){case"(":case"{":"{"===e&&this.curlyStack.push("{"),++this.index;break;case".":++this.index,"."===this.source[this.index]&&"."===this.source[this.index+1]&&(this.index+=2,e="...");break;case"}":++this.index,this.curlyStack.pop();break;case")":case";":case",":case"[":case"]":case":":case"?":case"~":++this.index;break;default:e=this.source.substr(this.index,4),">>>="===e?this.index+=4:(e=e.substr(0,3),"==="===e||"!=="===e||">>>"===e||"<<="===e||">>="===e||"**="===e?this.index+=3:(e=e.substr(0,2),"&&"===e||"||"===e||"=="===e||"!="===e||"+="===e||"-="===e||"*="===e||"/="===e||"++"===e||"--"===e||"<<"===e||">>"===e||"&="===e||"|="===e||"^="===e||"%="===e||"<="===e||">="===e||"=>"===e||"**"===e?this.index+=2:(e=this.source[this.index],"<>=!+-*%&|^/".indexOf(e)>=0&&++this.index)))}return this.index===t&&this.throwUnexpectedToken(),{type:7,value:e,lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanHexLiteral=function(t){for(var e="";!this.eof()&&s.Character.isHexDigit(this.source.charCodeAt(this.index));)e+=this.source[this.index++];return 0===e.length&&this.throwUnexpectedToken(),s.Character.isIdentifierStart(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(),{type:6,value:parseInt("0x"+e,16),lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanBinaryLiteral=function(t){for(var e,n="";!this.eof()&&("0"===(e=this.source[this.index])||"1"===e);)n+=this.source[this.index++];return 0===n.length&&this.throwUnexpectedToken(),this.eof()||(e=this.source.charCodeAt(this.index),(s.Character.isIdentifierStart(e)||s.Character.isDecimalDigit(e))&&this.throwUnexpectedToken()),{type:6,value:parseInt(n,2),lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanOctalLiteral=function(t,e){var n="",r=!1;for(s.Character.isOctalDigit(t.charCodeAt(0))?(r=!0,n="0"+this.source[this.index++]):++this.index;!this.eof()&&s.Character.isOctalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];return r||0!==n.length||this.throwUnexpectedToken(),(s.Character.isIdentifierStart(this.source.charCodeAt(this.index))||s.Character.isDecimalDigit(this.source.charCodeAt(this.index)))&&this.throwUnexpectedToken(),{type:6,value:parseInt(n,8),octal:r,lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},t.prototype.isImplicitOctalLiteral=function(){for(var t=this.index+1;t<this.length;++t){var e=this.source[t];if("8"===e||"9"===e)return!1;if(!s.Character.isOctalDigit(e.charCodeAt(0)))return!0}return!0},t.prototype.scanNumericLiteral=function(){var t=this.index,e=this.source[t];o.assert(s.Character.isDecimalDigit(e.charCodeAt(0))||"."===e,"Numeric literal must start with a decimal digit or a decimal point");var n="";if("."!==e){if(n=this.source[this.index++],e=this.source[this.index],"0"===n){if("x"===e||"X"===e)return++this.index,this.scanHexLiteral(t);if("b"===e||"B"===e)return++this.index,this.scanBinaryLiteral(t);if("o"===e||"O"===e)return this.scanOctalLiteral(e,t);if(e&&s.Character.isOctalDigit(e.charCodeAt(0))&&this.isImplicitOctalLiteral())return this.scanOctalLiteral(e,t)}for(;s.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];e=this.source[this.index]}if("."===e){for(n+=this.source[this.index++];s.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];e=this.source[this.index]}if("e"===e||"E"===e)if(n+=this.source[this.index++],e=this.source[this.index],"+"!==e&&"-"!==e||(n+=this.source[this.index++]),s.Character.isDecimalDigit(this.source.charCodeAt(this.index)))for(;s.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];else this.throwUnexpectedToken();return s.Character.isIdentifierStart(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(),{type:6,value:parseFloat(n),lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanStringLiteral=function(){var t=this.index,e=this.source[t];o.assert("'"===e||'"'===e,"String literal must starts with a quote"),++this.index;for(var n=!1,r="";!this.eof();){var i=this.source[this.index++];if(i===e){e="";break}if("\\"===i)if((i=this.source[this.index++])&&s.Character.isLineTerminator(i.charCodeAt(0)))++this.lineNumber,"\r"===i&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index;else switch(i){case"u":if("{"===this.source[this.index])++this.index,r+=this.scanUnicodeCodePointEscape();else{var u=this.scanHexEscape(i);null===u&&this.throwUnexpectedToken(),r+=u}break;case"x":var c=this.scanHexEscape(i);null===c&&this.throwUnexpectedToken(a.Messages.InvalidHexEscapeSequence),r+=c;break;case"n":r+="\n";break;case"r":r+="\r";break;case"t":r+="\t";break;case"b":r+="\b";break;case"f":r+="\f";break;case"v":r+="\v";break;case"8":case"9":r+=i,this.tolerateUnexpectedToken();break;default:if(i&&s.Character.isOctalDigit(i.charCodeAt(0))){var h=this.octalToDecimal(i);n=h.octal||n,r+=String.fromCharCode(h.code)}else r+=i}else{if(s.Character.isLineTerminator(i.charCodeAt(0)))break;r+=i}}return""!==e&&(this.index=t,this.throwUnexpectedToken()),{type:8,value:r,octal:n,lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanTemplate=function(){var t="",e=!1,n=this.index,r="`"===this.source[n],i=!1,o=2;for(++this.index;!this.eof();){var u=this.source[this.index++];if("`"===u){o=1,i=!0,e=!0;break}if("$"===u){if("{"===this.source[this.index]){this.curlyStack.push("${"),++this.index,e=!0;break}t+=u}else if("\\"===u)if(u=this.source[this.index++],s.Character.isLineTerminator(u.charCodeAt(0)))++this.lineNumber,"\r"===u&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index;else switch(u){case"n":t+="\n";break;case"r":t+="\r";break;case"t":t+="\t";break;case"u":if("{"===this.source[this.index])++this.index,t+=this.scanUnicodeCodePointEscape();else{var c=this.index,h=this.scanHexEscape(u);null!==h?t+=h:(this.index=c,t+=u)}break;case"x":var l=this.scanHexEscape(u);null===l&&this.throwUnexpectedToken(a.Messages.InvalidHexEscapeSequence),t+=l;break;case"b":t+="\b";break;case"f":t+="\f";break;case"v":t+="\v";break;default:"0"===u?(s.Character.isDecimalDigit(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(a.Messages.TemplateOctalLiteral),t+="\0"):s.Character.isOctalDigit(u.charCodeAt(0))?this.throwUnexpectedToken(a.Messages.TemplateOctalLiteral):t+=u}else s.Character.isLineTerminator(u.charCodeAt(0))?(++this.lineNumber,"\r"===u&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index,t+="\n"):t+=u}return e||this.throwUnexpectedToken(),r||this.curlyStack.pop(),{type:10,value:this.source.slice(n+1,this.index-o),cooked:t,head:r,tail:i,lineNumber:this.lineNumber,lineStart:this.lineStart,start:n,end:this.index}},t.prototype.testRegExp=function(t,e){var n=t,r=this;e.indexOf("u")>=0&&(n=n.replace(/\\u\{([0-9a-fA-F]+)\}|\\u([a-fA-F0-9]{4})/g,function(t,e,n){var i=parseInt(e||n,16);return i>1114111&&r.throwUnexpectedToken(a.Messages.InvalidRegExp),i<=65535?String.fromCharCode(i):"￿"}).replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,"￿"));try{RegExp(n)}catch(t){this.throwUnexpectedToken(a.Messages.InvalidRegExp)}try{return new RegExp(t,e)}catch(t){return null}},t.prototype.scanRegExpBody=function(){var t=this.source[this.index];o.assert("/"===t,"Regular expression literal must start with a slash");for(var e=this.source[this.index++],n=!1,r=!1;!this.eof();)if(t=this.source[this.index++],e+=t,"\\"===t)t=this.source[this.index++],s.Character.isLineTerminator(t.charCodeAt(0))&&this.throwUnexpectedToken(a.Messages.UnterminatedRegExp),e+=t;else if(s.Character.isLineTerminator(t.charCodeAt(0)))this.throwUnexpectedToken(a.Messages.UnterminatedRegExp);else if(n)"]"===t&&(n=!1);else{if("/"===t){r=!0;break}"["===t&&(n=!0)}return r||this.throwUnexpectedToken(a.Messages.UnterminatedRegExp),e.substr(1,e.length-2)},t.prototype.scanRegExpFlags=function(){for(var t="",e="";!this.eof();){var n=this.source[this.index];if(!s.Character.isIdentifierPart(n.charCodeAt(0)))break;if(++this.index,"\\"!==n||this.eof())e+=n,t+=n;else if("u"===(n=this.source[this.index])){++this.index;var r=this.index,i=this.scanHexEscape("u");if(null!==i)for(e+=i,t+="\\u";r<this.index;++r)t+=this.source[r];else this.index=r,e+="u",t+="\\u";this.tolerateUnexpectedToken()}else t+="\\",this.tolerateUnexpectedToken()}return e},t.prototype.scanRegExp=function(){var t=this.index,e=this.scanRegExpBody(),n=this.scanRegExpFlags();return{type:9,value:"",pattern:e,flags:n,regex:this.testRegExp(e,n),lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.lex=function(){if(this.eof())return{type:2,value:"",lineNumber:this.lineNumber,lineStart:this.lineStart,start:this.index,end:this.index};var t=this.source.charCodeAt(this.index);return s.Character.isIdentifierStart(t)?this.scanIdentifier():40===t||41===t||59===t?this.scanPunctuator():39===t||34===t?this.scanStringLiteral():46===t?s.Character.isDecimalDigit(this.source.charCodeAt(this.index+1))?this.scanNumericLiteral():this.scanPunctuator():s.Character.isDecimalDigit(t)?this.scanNumericLiteral():96===t||125===t&&"${"===this.curlyStack[this.curlyStack.length-1]?this.scanTemplate():t>=55296&&t<57343&&s.Character.isIdentifierStart(this.codePointAt(this.index))?this.scanIdentifier():this.scanPunctuator()},t}();e.Scanner=u},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.TokenName={},e.TokenName[1]="Boolean",e.TokenName[2]="<end>",e.TokenName[3]="Identifier",e.TokenName[4]="Keyword",e.TokenName[5]="Null",e.TokenName[6]="Numeric",e.TokenName[7]="Punctuator",e.TokenName[8]="String",e.TokenName[9]="RegularExpression",e.TokenName[10]="Template"},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.XHTMLEntities={quot:'"',amp:"&",apos:"'",gt:">",nbsp:" ",iexcl:"¡",cent:"¢",pound:"£",curren:"¤",yen:"¥",brvbar:"¦",sect:"§",uml:"¨",copy:"©",ordf:"ª",laquo:"«",not:"¬",shy:"­",reg:"®",macr:"¯",deg:"°",plusmn:"±",sup2:"²",sup3:"³",acute:"´",micro:"µ",para:"¶",middot:"·",cedil:"¸",sup1:"¹",ordm:"º",raquo:"»",frac14:"¼",frac12:"½",frac34:"¾",iquest:"¿",Agrave:"À",Aacute:"Á",Acirc:"Â",Atilde:"Ã",Auml:"Ä",Aring:"Å",AElig:"Æ",Ccedil:"Ç",Egrave:"È",Eacute:"É",Ecirc:"Ê",Euml:"Ë",Igrave:"Ì",Iacute:"Í",Icirc:"Î",Iuml:"Ï",ETH:"Ð",Ntilde:"Ñ",Ograve:"Ò",Oacute:"Ó",Ocirc:"Ô",Otilde:"Õ",Ouml:"Ö",times:"×",Oslash:"Ø",Ugrave:"Ù",Uacute:"Ú",Ucirc:"Û",Uuml:"Ü",Yacute:"Ý",THORN:"Þ",szlig:"ß",agrave:"à",aacute:"á",acirc:"â",atilde:"ã",auml:"ä",aring:"å",aelig:"æ",ccedil:"ç",egrave:"è",eacute:"é",ecirc:"ê",euml:"ë",igrave:"ì",iacute:"í",icirc:"î",iuml:"ï",eth:"ð",ntilde:"ñ",ograve:"ò",oacute:"ó",ocirc:"ô",otilde:"õ",ouml:"ö",divide:"÷",oslash:"ø",ugrave:"ù",uacute:"ú",ucirc:"û",uuml:"ü",yacute:"ý",thorn:"þ",yuml:"ÿ",OElig:"Œ",oelig:"œ",Scaron:"Š",scaron:"š",Yuml:"Ÿ",fnof:"ƒ",circ:"ˆ",tilde:"˜",Alpha:"Α",Beta:"Β",Gamma:"Γ",Delta:"Δ",Epsilon:"Ε",Zeta:"Ζ",Eta:"Η",Theta:"Θ",Iota:"Ι",Kappa:"Κ",Lambda:"Λ",Mu:"Μ",Nu:"Ν",Xi:"Ξ",Omicron:"Ο",Pi:"Π",Rho:"Ρ",Sigma:"Σ",Tau:"Τ",Upsilon:"Υ",Phi:"Φ",Chi:"Χ",Psi:"Ψ",Omega:"Ω",alpha:"α",beta:"β",gamma:"γ",delta:"δ",epsilon:"ε",zeta:"ζ",eta:"η",theta:"θ",iota:"ι",kappa:"κ",lambda:"λ",mu:"μ",nu:"ν",xi:"ξ",omicron:"ο",pi:"π",rho:"ρ",sigmaf:"ς",sigma:"σ",tau:"τ",upsilon:"υ",phi:"φ",chi:"χ",psi:"ψ",omega:"ω",thetasym:"ϑ",upsih:"ϒ",piv:"ϖ",ensp:" ",emsp:" ",thinsp:" ",zwnj:"‌",zwj:"‍",lrm:"‎",rlm:"‏",ndash:"–",mdash:"—",lsquo:"‘",rsquo:"’",sbquo:"‚",ldquo:"“",rdquo:"”",bdquo:"„",dagger:"†",Dagger:"‡",bull:"•",hellip:"…",permil:"‰",prime:"′",Prime:"″",lsaquo:"‹",rsaquo:"›",oline:"‾",frasl:"⁄",euro:"€",image:"ℑ",weierp:"℘",real:"ℜ",trade:"™",alefsym:"ℵ",larr:"←",uarr:"↑",rarr:"→",darr:"↓",harr:"↔",crarr:"↵",lArr:"⇐",uArr:"⇑",rArr:"⇒",dArr:"⇓",hArr:"⇔",forall:"∀",part:"∂",exist:"∃",empty:"∅",nabla:"∇",isin:"∈",notin:"∉",ni:"∋",prod:"∏",sum:"∑",minus:"−",lowast:"∗",radic:"√",prop:"∝",infin:"∞",ang:"∠",and:"∧",or:"∨",cap:"∩",cup:"∪",int:"∫",there4:"∴",sim:"∼",cong:"≅",asymp:"≈",ne:"≠",equiv:"≡",le:"≤",ge:"≥",sub:"⊂",sup:"⊃",nsub:"⊄",sube:"⊆",supe:"⊇",oplus:"⊕",otimes:"⊗",perp:"⊥",sdot:"⋅",lceil:"⌈",rceil:"⌉",lfloor:"⌊",rfloor:"⌋",loz:"◊",spades:"♠",clubs:"♣",hearts:"♥",diams:"♦",lang:"⟨",rang:"⟩"}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(10),i=n(12),o=n(13),s=function(){function t(){this.values=[],this.curly=this.paren=-1}return t.prototype.beforeFunctionExpression=function(t){return["(","{","[","in","typeof","instanceof","new","return","case","delete","throw","void","=","+=","-=","*=","**=","/=","%=","<<=",">>=",">>>=","&=","|=","^=",",","+","-","*","**","/","%","++","--","<<",">>",">>>","&","|","^","!","~","&&","||","?",":","===","==",">=","<=","<",">","!=","!=="].indexOf(t)>=0},t.prototype.isRegexStart=function(){var t=this.values[this.values.length-1],e=null!==t;switch(t){case"this":case"]":e=!1;break;case")":var n=this.values[this.paren-1];e="if"===n||"while"===n||"for"===n||"with"===n;break;case"}":if(e=!1,"function"===this.values[this.curly-3]){var r=this.values[this.curly-4];e=!!r&&!this.beforeFunctionExpression(r)}else if("function"===this.values[this.curly-4]){var r=this.values[this.curly-5];e=!r||!this.beforeFunctionExpression(r)}}return e},t.prototype.push=function(t){7===t.type||4===t.type?("{"===t.value?this.curly=this.values.length:"("===t.value&&(this.paren=this.values.length),this.values.push(t.value)):this.values.push(null)},t}(),a=function(){function t(t,e){this.errorHandler=new r.ErrorHandler,this.errorHandler.tolerant=!!e&&("boolean"==typeof e.tolerant&&e.tolerant),this.scanner=new i.Scanner(t,this.errorHandler),this.scanner.trackComment=!!e&&("boolean"==typeof e.comment&&e.comment),this.trackRange=!!e&&("boolean"==typeof e.range&&e.range),this.trackLoc=!!e&&("boolean"==typeof e.loc&&e.loc),this.buffer=[],this.reader=new s}return t.prototype.errors=function(){return this.errorHandler.errors},t.prototype.getNextToken=function(){if(0===this.buffer.length){var t=this.scanner.scanComments();if(this.scanner.trackComment)for(var e=0;e<t.length;++e){var n=t[e],r=this.scanner.source.slice(n.slice[0],n.slice[1]),i={type:n.multiLine?"BlockComment":"LineComment",value:r};this.trackRange&&(i.range=n.range),this.trackLoc&&(i.loc=n.loc),this.buffer.push(i)}if(!this.scanner.eof()){var s=void 0;this.trackLoc&&(s={start:{line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart},end:{}});var a="/"===this.scanner.source[this.scanner.index]&&this.reader.isRegexStart(),u=a?this.scanner.scanRegExp():this.scanner.lex();this.reader.push(u);var c={type:o.TokenName[u.type],value:this.scanner.source.slice(u.start,u.end)};if(this.trackRange&&(c.range=[u.start,u.end]),this.trackLoc&&(s.end={line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart},c.loc=s),9===u.type){var h=u.pattern,l=u.flags;c.regex={pattern:h,flags:l}}this.buffer.push(c)}}return this.buffer.shift()},t}();e.Tokenizer=a}])})},function(t,e){e.read=function(t,e,n,r,i){var o,s,a=8*i-r-1,u=(1<<a)-1,c=u>>1,h=-7,l=n?i-1:0,p=n?-1:1,f=t[e+l];for(l+=p,o=f&(1<<-h)-1,f>>=-h,h+=a;h>0;o=256*o+t[e+l],l+=p,h-=8);for(s=o&(1<<-h)-1,o>>=-h,h+=r;h>0;s=256*s+t[e+l],l+=p,h-=8);if(0===o)o=1-c;else{if(o===u)return s?NaN:1/0*(f?-1:1);s+=Math.pow(2,r),o-=c}return(f?-1:1)*s*Math.pow(2,o-r)},e.write=function(t,e,n,r,i,o){var s,a,u,c=8*o-i-1,h=(1<<c)-1,l=h>>1,p=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,f=r?0:o-1,d=r?1:-1,m=e<0||0===e&&1/e<0?1:0;for(e=Math.abs(e),isNaN(e)||e===1/0?(a=isNaN(e)?1:0,s=h):(s=Math.floor(Math.log(e)/Math.LN2),e*(u=Math.pow(2,-s))<1&&(s--,u*=2),e+=s+l>=1?p/u:p*Math.pow(2,1-l),e*u>=2&&(s++,u/=2),s+l>=h?(a=0,s=h):s+l>=1?(a=(e*u-1)*Math.pow(2,i),s+=l):(a=e*Math.pow(2,l-1)*Math.pow(2,i),s=0));i>=8;t[n+f]=255&a,f+=d,a/=256,i-=8);for(s=s<<i|a,c+=i;c>0;t[n+f]=255&s,f+=d,s/=256,c-=8);t[n+f-d]|=128*m}},function(t,e,n){!function(e,n){t.exports=n()}(0,function(){"use strict";function t(t,e){e&&(t.prototype=Object.create(e.prototype)),t.prototype.constructor=t}function e(t){return o(t)?t:k(t)}function n(t){return s(t)?t:I(t)}function r(t){return a(t)?t:T(t)}function i(t){return o(t)&&!u(t)?t:B(t)}function o(t){return!(!t||!t[cn])}function s(t){return!(!t||!t[hn])}function a(t){return!(!t||!t[ln])}function u(t){return s(t)||a(t)}function c(t){return!(!t||!t[pn])}function h(t){return t.value=!1,t}function l(t){t&&(t.value=!0)}function p(){}function f(t,e){e=e||0;for(var n=Math.max(0,t.length-e),r=new Array(n),i=0;i<n;i++)r[i]=t[i+e];return r}function d(t){return void 0===t.size&&(t.size=t.__iterate(y)),t.size}function m(t,e){if("number"!=typeof e){var n=e>>>0;if(""+n!==e||4294967295===n)return NaN;e=n}return e<0?d(t)+e:e}function y(){return!0}function v(t,e,n){return(0===t||void 0!==n&&t<=-n)&&(void 0===e||void 0!==n&&e>=n)}function x(t,e){return D(t,e,0)}function g(t,e){return D(t,e,e)}function D(t,e,n){return void 0===t?n:t<0?Math.max(0,e+t):void 0===e?t:Math.min(e,t)}function E(t){this.next=t}function A(t,e,n,r){var i=0===t?e:1===t?n:[e,n];return r?r.value=i:r={value:i,done:!1},r}function S(){return{value:void 0,done:!0}}function w(t){return!!b(t)}function C(t){return t&&"function"==typeof t.next}function _(t){var e=b(t);return e&&e.call(t)}function b(t){var e=t&&(An&&t[An]||t[Sn]);if("function"==typeof e)return e}function F(t){return t&&"number"==typeof t.length}function k(t){return null===t||void 0===t?U():o(t)?t.toSeq():z(t)}function I(t){return null===t||void 0===t?U().toKeyedSeq():o(t)?s(t)?t.toSeq():t.fromEntrySeq():j(t)}function T(t){return null===t||void 0===t?U():o(t)?s(t)?t.entrySeq():t.toIndexedSeq():L(t)}function B(t){return(null===t||void 0===t?U():o(t)?s(t)?t.entrySeq():t:L(t)).toSetSeq()}function M(t){this._array=t,this.size=t.length}function P(t){var e=Object.keys(t);this._object=t,this._keys=e,this.size=e.length}function N(t){this._iterable=t,this.size=t.length||t.size}function O(t){this._iterator=t,this._iteratorCache=[]}function R(t){return!(!t||!t[Cn])}function U(){return _n||(_n=new M([]))}function j(t){var e=Array.isArray(t)?new M(t).fromEntrySeq():C(t)?new O(t).fromEntrySeq():w(t)?new N(t).fromEntrySeq():"object"==typeof t?new P(t):void 0;if(!e)throw new TypeError("Expected Array or iterable object of [k, v] entries, or keyed object: "+t);return e}function L(t){var e=J(t);if(!e)throw new TypeError("Expected Array or iterable object of values: "+t);return e}function z(t){var e=J(t)||"object"==typeof t&&new P(t);if(!e)throw new TypeError("Expected Array or iterable object of values, or keyed object: "+t);return e}function J(t){return F(t)?new M(t):C(t)?new O(t):w(t)?new N(t):void 0}function X(t,e,n,r){var i=t._cache;if(i){for(var o=i.length-1,s=0;s<=o;s++){var a=i[n?o-s:s];if(!1===e(a[1],r?a[0]:s,t))return s+1}return s}return t.__iterateUncached(e,n)}function q(t,e,n,r){var i=t._cache;if(i){var o=i.length-1,s=0;return new E(function(){var t=i[n?o-s:s];return s++>o?S():A(e,r?t[0]:s-1,t[1])})}return t.__iteratorUncached(e,n)}function K(t,e){return e?Y(e,t,"",{"":t}):W(t)}function Y(t,e,n,r){return Array.isArray(e)?t.call(r,n,T(e).map(function(n,r){return Y(t,n,r,e)})):G(e)?t.call(r,n,I(e).map(function(n,r){return Y(t,n,r,e)})):e}function W(t){return Array.isArray(t)?T(t).map(W).toList():G(t)?I(t).map(W).toMap():t}function G(t){return t&&(t.constructor===Object||void 0===t.constructor)}function H(t,e){if(t===e||t!==t&&e!==e)return!0;if(!t||!e)return!1;if("function"==typeof t.valueOf&&"function"==typeof e.valueOf){if(t=t.valueOf(),e=e.valueOf(),t===e||t!==t&&e!==e)return!0;if(!t||!e)return!1}return!("function"!=typeof t.equals||"function"!=typeof e.equals||!t.equals(e))}function V(t,e){if(t===e)return!0;if(!o(e)||void 0!==t.size&&void 0!==e.size&&t.size!==e.size||void 0!==t.__hash&&void 0!==e.__hash&&t.__hash!==e.__hash||s(t)!==s(e)||a(t)!==a(e)||c(t)!==c(e))return!1;if(0===t.size&&0===e.size)return!0;var n=!u(t);if(c(t)){var r=t.entries();return e.every(function(t,e){var i=r.next().value;return i&&H(i[1],t)&&(n||H(i[0],e))})&&r.next().done}var i=!1;if(void 0===t.size)if(void 0===e.size)"function"==typeof t.cacheResult&&t.cacheResult();else{i=!0;var h=t;t=e,e=h}var l=!0,p=e.__iterate(function(e,r){if(n?!t.has(e):i?!H(e,t.get(r,yn)):!H(t.get(r,yn),e))return l=!1,!1});return l&&t.size===p}function $(t,e){if(!(this instanceof $))return new $(t,e);if(this._value=t,this.size=void 0===e?1/0:Math.max(0,e),0===this.size){if(bn)return bn;bn=this}}function Z(t,e){if(!t)throw new Error(e)}function Q(t,e,n){if(!(this instanceof Q))return new Q(t,e,n);if(Z(0!==n,"Cannot step a Range by 0"),t=t||0,void 0===e&&(e=1/0),n=void 0===n?1:Math.abs(n),e<t&&(n=-n),this._start=t,this._end=e,this._step=n,this.size=Math.max(0,Math.ceil((e-t)/n-1)+1),0===this.size){if(Fn)return Fn;Fn=this}}function tt(){throw TypeError("Abstract")}function et(){}function nt(){}function rt(){}function it(t){return t>>>1&1073741824|3221225471&t}function ot(t){if(!1===t||null===t||void 0===t)return 0;if("function"==typeof t.valueOf&&(!1===(t=t.valueOf())||null===t||void 0===t))return 0;if(!0===t)return 1;var e=typeof t;if("number"===e){if(t!==t||t===1/0)return 0;var n=0|t;for(n!==t&&(n^=4294967295*t);t>4294967295;)t/=4294967295,n^=t;return it(n)}if("string"===e)return t.length>On?st(t):at(t);if("function"==typeof t.hashCode)return t.hashCode();if("object"===e)return ut(t);if("function"==typeof t.toString)return at(t.toString());throw new Error("Value type "+e+" cannot be hashed.")}function st(t){var e=jn[t];return void 0===e&&(e=at(t),Un===Rn&&(Un=0,jn={}),Un++,jn[t]=e),e}function at(t){for(var e=0,n=0;n<t.length;n++)e=31*e+t.charCodeAt(n)|0;return it(e)}function ut(t){var e;if(Mn&&void 0!==(e=kn.get(t)))return e;if(void 0!==(e=t[Nn]))return e;if(!Bn){if(void 0!==(e=t.propertyIsEnumerable&&t.propertyIsEnumerable[Nn]))return e;if(void 0!==(e=ct(t)))return e}if(e=++Pn,1073741824&Pn&&(Pn=0),Mn)kn.set(t,e);else{if(void 0!==Tn&&!1===Tn(t))throw new Error("Non-extensible objects are not allowed as keys.");if(Bn)Object.defineProperty(t,Nn,{enumerable:!1,configurable:!1,writable:!1,value:e});else if(void 0!==t.propertyIsEnumerable&&t.propertyIsEnumerable===t.constructor.prototype.propertyIsEnumerable)t.propertyIsEnumerable=function(){return this.constructor.prototype.propertyIsEnumerable.apply(this,arguments)},t.propertyIsEnumerable[Nn]=e;else{if(void 0===t.nodeType)throw new Error("Unable to set a non-enumerable property on object.");t[Nn]=e}}return e}function ct(t){if(t&&t.nodeType>0)switch(t.nodeType){case 1:return t.uniqueID;case 9:return t.documentElement&&t.documentElement.uniqueID}}function ht(t){Z(t!==1/0,"Cannot perform this action with an infinite size.")}function lt(t){return null===t||void 0===t?At():pt(t)&&!c(t)?t:At().withMutations(function(e){var r=n(t);ht(r.size),r.forEach(function(t,n){return e.set(n,t)})})}function pt(t){return!(!t||!t[Ln])}function ft(t,e){this.ownerID=t,this.entries=e}function dt(t,e,n){this.ownerID=t,this.bitmap=e,this.nodes=n}function mt(t,e,n){this.ownerID=t,this.count=e,this.nodes=n}function yt(t,e,n){this.ownerID=t,this.keyHash=e,this.entries=n}function vt(t,e,n){this.ownerID=t,this.keyHash=e,this.entry=n}function xt(t,e,n){this._type=e,this._reverse=n,this._stack=t._root&&Dt(t._root)}function gt(t,e){return A(t,e[0],e[1])}function Dt(t,e){return{node:t,index:0,__prev:e}}function Et(t,e,n,r){var i=Object.create(zn);return i.size=t,i._root=e,i.__ownerID=n,i.__hash=r,i.__altered=!1,i}function At(){return Jn||(Jn=Et(0))}function St(t,e,n){var r,i;if(t._root){var o=h(vn),s=h(xn);if(r=wt(t._root,t.__ownerID,0,void 0,e,n,o,s),!s.value)return t;i=t.size+(o.value?n===yn?-1:1:0)}else{if(n===yn)return t;i=1,r=new ft(t.__ownerID,[[e,n]])}return t.__ownerID?(t.size=i,t._root=r,t.__hash=void 0,t.__altered=!0,t):r?Et(i,r):At()}function wt(t,e,n,r,i,o,s,a){return t?t.update(e,n,r,i,o,s,a):o===yn?t:(l(a),l(s),new vt(e,r,[i,o]))}function Ct(t){return t.constructor===vt||t.constructor===yt}function _t(t,e,n,r,i){if(t.keyHash===r)return new yt(e,r,[t.entry,i]);var o,s=(0===n?t.keyHash:t.keyHash>>>n)&mn,a=(0===n?r:r>>>n)&mn;return new dt(e,1<<s|1<<a,s===a?[_t(t,e,n+fn,r,i)]:(o=new vt(e,r,i),s<a?[t,o]:[o,t]))}function bt(t,e,n,r){t||(t=new p);for(var i=new vt(t,ot(n),[n,r]),o=0;o<e.length;o++){var s=e[o];i=i.update(t,0,void 0,s[0],s[1])}return i}function Ft(t,e,n,r){for(var i=0,o=0,s=new Array(n),a=0,u=1,c=e.length;a<c;a++,u<<=1){var h=e[a];void 0!==h&&a!==r&&(i|=u,s[o++]=h)}return new dt(t,i,s)}function kt(t,e,n,r,i){for(var o=0,s=new Array(dn),a=0;0!==n;a++,n>>>=1)s[a]=1&n?e[o++]:void 0;return s[r]=i,new mt(t,o+1,s)}function It(t,e,r){for(var i=[],s=0;s<r.length;s++){var a=r[s],u=n(a);o(a)||(u=u.map(function(t){return K(t)})),i.push(u)}return Mt(t,e,i)}function Tt(t,e,n){return t&&t.mergeDeep&&o(e)?t.mergeDeep(e):H(t,e)?t:e}function Bt(t){return function(e,n,r){if(e&&e.mergeDeepWith&&o(n))return e.mergeDeepWith(t,n);var i=t(e,n,r);return H(e,i)?e:i}}function Mt(t,e,n){return n=n.filter(function(t){return 0!==t.size}),0===n.length?t:0!==t.size||t.__ownerID||1!==n.length?t.withMutations(function(t){for(var r=e?function(n,r){t.update(r,yn,function(t){return t===yn?n:e(t,n,r)})}:function(e,n){t.set(n,e)},i=0;i<n.length;i++)n[i].forEach(r)}):t.constructor(n[0])}function Pt(t,e,n,r){var i=t===yn,o=e.next();if(o.done){var s=i?n:t,a=r(s);return a===s?t:a}Z(i||t&&t.set,"invalid keyPath");var u=o.value,c=i?yn:t.get(u,yn),h=Pt(c,e,n,r);return h===c?t:h===yn?t.remove(u):(i?At():t).set(u,h)}function Nt(t){return t-=t>>1&1431655765,t=(858993459&t)+(t>>2&858993459),t=t+(t>>4)&252645135,t+=t>>8,127&(t+=t>>16)}function Ot(t,e,n,r){var i=r?t:f(t);return i[e]=n,i}function Rt(t,e,n,r){var i=t.length+1;if(r&&e+1===i)return t[e]=n,t;for(var o=new Array(i),s=0,a=0;a<i;a++)a===e?(o[a]=n,s=-1):o[a]=t[a+s];return o}function Ut(t,e,n){var r=t.length-1;if(n&&e===r)return t.pop(),t;for(var i=new Array(r),o=0,s=0;s<r;s++)s===e&&(o=1),i[s]=t[s+o];return i}function jt(t){var e=qt();if(null===t||void 0===t)return e;if(Lt(t))return t;var n=r(t),i=n.size;return 0===i?e:(ht(i),i>0&&i<dn?Xt(0,i,fn,null,new zt(n.toArray())):e.withMutations(function(t){t.setSize(i),n.forEach(function(e,n){return t.set(n,e)})}))}function Lt(t){return!(!t||!t[Yn])}function zt(t,e){this.array=t,this.ownerID=e}function Jt(t,e){function n(t,e,n){return 0===e?r(t,n):i(t,e,n)}function r(t,n){var r=n===a?u&&u.array:t&&t.array,i=n>o?0:o-n,c=s-n;return c>dn&&(c=dn),function(){if(i===c)return Hn;var t=e?--c:i++;return r&&r[t]}}function i(t,r,i){var a,u=t&&t.array,c=i>o?0:o-i>>r,h=1+(s-i>>r);return h>dn&&(h=dn),function(){for(;;){if(a){var t=a();if(t!==Hn)return t;a=null}if(c===h)return Hn;var o=e?--h:c++;a=n(u&&u[o],r-fn,i+(o<<r))}}}var o=t._origin,s=t._capacity,a=$t(s),u=t._tail;return n(t._root,t._level,0)}function Xt(t,e,n,r,i,o,s){var a=Object.create(Wn);return a.size=e-t,a._origin=t,a._capacity=e,a._level=n,a._root=r,a._tail=i,a.__ownerID=o,a.__hash=s,a.__altered=!1,a}function qt(){return Gn||(Gn=Xt(0,0,fn))}function Kt(t,e,n){if((e=m(t,e))!==e)return t;if(e>=t.size||e<0)return t.withMutations(function(t){e<0?Ht(t,e).set(0,n):Ht(t,0,e+1).set(e,n)});e+=t._origin;var r=t._tail,i=t._root,o=h(xn);return e>=$t(t._capacity)?r=Yt(r,t.__ownerID,0,e,n,o):i=Yt(i,t.__ownerID,t._level,e,n,o),o.value?t.__ownerID?(t._root=i,t._tail=r,t.__hash=void 0,t.__altered=!0,t):Xt(t._origin,t._capacity,t._level,i,r):t}function Yt(t,e,n,r,i,o){var s=r>>>n&mn,a=t&&s<t.array.length;if(!a&&void 0===i)return t;var u;if(n>0){var c=t&&t.array[s],h=Yt(c,e,n-fn,r,i,o);return h===c?t:(u=Wt(t,e),u.array[s]=h,u)}return a&&t.array[s]===i?t:(l(o),u=Wt(t,e),void 0===i&&s===u.array.length-1?u.array.pop():u.array[s]=i,u)}function Wt(t,e){return e&&t&&e===t.ownerID?t:new zt(t?t.array.slice():[],e)}function Gt(t,e){if(e>=$t(t._capacity))return t._tail;if(e<1<<t._level+fn){for(var n=t._root,r=t._level;n&&r>0;)n=n.array[e>>>r&mn],r-=fn;return n}}function Ht(t,e,n){void 0!==e&&(e|=0),void 0!==n&&(n|=0);var r=t.__ownerID||new p,i=t._origin,o=t._capacity,s=i+e,a=void 0===n?o:n<0?o+n:i+n;if(s===i&&a===o)return t;if(s>=a)return t.clear();for(var u=t._level,c=t._root,h=0;s+h<0;)c=new zt(c&&c.array.length?[void 0,c]:[],r),u+=fn,h+=1<<u;h&&(s+=h,i+=h,a+=h,o+=h);for(var l=$t(o),f=$t(a);f>=1<<u+fn;)c=new zt(c&&c.array.length?[c]:[],r),u+=fn;var d=t._tail,m=f<l?Gt(t,a-1):f>l?new zt([],r):d;if(d&&f>l&&s<o&&d.array.length){c=Wt(c,r);for(var y=c,v=u;v>fn;v-=fn){var x=l>>>v&mn;y=y.array[x]=Wt(y.array[x],r)}y.array[l>>>fn&mn]=d}if(a<o&&(m=m&&m.removeAfter(r,0,a)),s>=f)s-=f,a-=f,u=fn,c=null,m=m&&m.removeBefore(r,0,s);else if(s>i||f<l){for(h=0;c;){var g=s>>>u&mn;if(g!==f>>>u&mn)break;g&&(h+=(1<<u)*g),u-=fn,c=c.array[g]}c&&s>i&&(c=c.removeBefore(r,u,s-h)),c&&f<l&&(c=c.removeAfter(r,u,f-h)),h&&(s-=h,a-=h)}return t.__ownerID?(t.size=a-s,t._origin=s,t._capacity=a,t._level=u,t._root=c,t._tail=m,t.__hash=void 0,t.__altered=!0,t):Xt(s,a,u,c,m)}function Vt(t,e,n){for(var i=[],s=0,a=0;a<n.length;a++){var u=n[a],c=r(u);c.size>s&&(s=c.size),o(u)||(c=c.map(function(t){return K(t)})),i.push(c)}return s>t.size&&(t=t.setSize(s)),Mt(t,e,i)}function $t(t){return t<dn?0:t-1>>>fn<<fn}function Zt(t){return null===t||void 0===t?ee():Qt(t)?t:ee().withMutations(function(e){var r=n(t);ht(r.size),r.forEach(function(t,n){return e.set(n,t)})})}function Qt(t){return pt(t)&&c(t)}function te(t,e,n,r){var i=Object.create(Zt.prototype);return i.size=t?t.size:0,i._map=t,i._list=e,i.__ownerID=n,i.__hash=r,i}function ee(){return Vn||(Vn=te(At(),qt()))}function ne(t,e,n){var r,i,o=t._map,s=t._list,a=o.get(e),u=void 0!==a;if(n===yn){if(!u)return t;s.size>=dn&&s.size>=2*o.size?(i=s.filter(function(t,e){return void 0!==t&&a!==e}),r=i.toKeyedSeq().map(function(t){return t[0]}).flip().toMap(),t.__ownerID&&(r.__ownerID=i.__ownerID=t.__ownerID)):(r=o.remove(e),i=a===s.size-1?s.pop():s.set(a,void 0))}else if(u){if(n===s.get(a)[1])return t;r=o,i=s.set(a,[e,n])}else r=o.set(e,s.size),i=s.set(s.size,[e,n]);return t.__ownerID?(t.size=r.size,t._map=r,t._list=i,t.__hash=void 0,t):te(r,i)}function re(t,e){this._iter=t,this._useKeys=e,this.size=t.size}function ie(t){this._iter=t,this.size=t.size}function oe(t){this._iter=t,this.size=t.size}function se(t){this._iter=t,this.size=t.size}function ae(t){var e=Fe(t);return e._iter=t,e.size=t.size,e.flip=function(){return t},e.reverse=function(){var e=t.reverse.apply(this);return e.flip=function(){return t.reverse()},e},e.has=function(e){return t.includes(e)},e.includes=function(e){return t.has(e)},e.cacheResult=ke,e.__iterateUncached=function(e,n){var r=this;return t.__iterate(function(t,n){return!1!==e(n,t,r)},n)},e.__iteratorUncached=function(e,n){if(e===En){var r=t.__iterator(e,n);return new E(function(){var t=r.next();if(!t.done){var e=t.value[0];t.value[0]=t.value[1],t.value[1]=e}return t})}return t.__iterator(e===Dn?gn:Dn,n)},e}function ue(t,e,n){var r=Fe(t);return r.size=t.size,r.has=function(e){return t.has(e)},r.get=function(r,i){var o=t.get(r,yn);return o===yn?i:e.call(n,o,r,t)},r.__iterateUncached=function(r,i){var o=this;return t.__iterate(function(t,i,s){return!1!==r(e.call(n,t,i,s),i,o)},i)},r.__iteratorUncached=function(r,i){var o=t.__iterator(En,i);return new E(function(){var i=o.next();if(i.done)return i;var s=i.value,a=s[0];return A(r,a,e.call(n,s[1],a,t),i)})},r}function ce(t,e){var n=Fe(t);return n._iter=t,n.size=t.size,n.reverse=function(){return t},t.flip&&(n.flip=function(){var e=ae(t);return e.reverse=function(){return t.flip()},e}),n.get=function(n,r){return t.get(e?n:-1-n,r)},n.has=function(n){return t.has(e?n:-1-n)},n.includes=function(e){return t.includes(e)},n.cacheResult=ke,n.__iterate=function(e,n){var r=this;return t.__iterate(function(t,n){return e(t,n,r)},!n)},n.__iterator=function(e,n){return t.__iterator(e,!n)},n}function he(t,e,n,r){var i=Fe(t);return r&&(i.has=function(r){var i=t.get(r,yn);return i!==yn&&!!e.call(n,i,r,t)},i.get=function(r,i){var o=t.get(r,yn);return o!==yn&&e.call(n,o,r,t)?o:i}),i.__iterateUncached=function(i,o){var s=this,a=0;return t.__iterate(function(t,o,u){if(e.call(n,t,o,u))return a++,i(t,r?o:a-1,s)},o),a},i.__iteratorUncached=function(i,o){var s=t.__iterator(En,o),a=0;return new E(function(){for(;;){var o=s.next();if(o.done)return o;var u=o.value,c=u[0],h=u[1];if(e.call(n,h,c,t))return A(i,r?c:a++,h,o)}})},i}function le(t,e,n){var r=lt().asMutable();return t.__iterate(function(i,o){r.update(e.call(n,i,o,t),0,function(t){return t+1})}),r.asImmutable()}function pe(t,e,n){var r=s(t),i=(c(t)?Zt():lt()).asMutable();t.__iterate(function(o,s){i.update(e.call(n,o,s,t),function(t){return t=t||[],t.push(r?[s,o]:o),t})});var o=be(t);return i.map(function(e){return we(t,o(e))})}function fe(t,e,n,r){var i=t.size;if(void 0!==e&&(e|=0),void 0!==n&&(n===1/0?n=i:n|=0),v(e,n,i))return t;var o=x(e,i),s=g(n,i);if(o!==o||s!==s)return fe(t.toSeq().cacheResult(),e,n,r);var a,u=s-o;u===u&&(a=u<0?0:u);var c=Fe(t);return c.size=0===a?a:t.size&&a||void 0,!r&&R(t)&&a>=0&&(c.get=function(e,n){return e=m(this,e),e>=0&&e<a?t.get(e+o,n):n}),c.__iterateUncached=function(e,n){var i=this;if(0===a)return 0;if(n)return this.cacheResult().__iterate(e,n);var s=0,u=!0,c=0;return t.__iterate(function(t,n){if(!u||!(u=s++<o))return c++,!1!==e(t,r?n:c-1,i)&&c!==a}),c},c.__iteratorUncached=function(e,n){if(0!==a&&n)return this.cacheResult().__iterator(e,n);var i=0!==a&&t.__iterator(e,n),s=0,u=0;return new E(function(){for(;s++<o;)i.next();if(++u>a)return S();var t=i.next();return r||e===Dn?t:e===gn?A(e,u-1,void 0,t):A(e,u-1,t.value[1],t)})},c}function de(t,e,n){var r=Fe(t);return r.__iterateUncached=function(r,i){var o=this;if(i)return this.cacheResult().__iterate(r,i);var s=0;return t.__iterate(function(t,i,a){return e.call(n,t,i,a)&&++s&&r(t,i,o)}),s},r.__iteratorUncached=function(r,i){var o=this;if(i)return this.cacheResult().__iterator(r,i);var s=t.__iterator(En,i),a=!0;return new E(function(){if(!a)return S();var t=s.next();if(t.done)return t;var i=t.value,u=i[0],c=i[1];return e.call(n,c,u,o)?r===En?t:A(r,u,c,t):(a=!1,S())})},r}function me(t,e,n,r){var i=Fe(t);return i.__iterateUncached=function(i,o){var s=this;if(o)return this.cacheResult().__iterate(i,o);var a=!0,u=0;return t.__iterate(function(t,o,c){if(!a||!(a=e.call(n,t,o,c)))return u++,i(t,r?o:u-1,s)}),u},i.__iteratorUncached=function(i,o){var s=this;if(o)return this.cacheResult().__iterator(i,o);var a=t.__iterator(En,o),u=!0,c=0;return new E(function(){var t,o,h;do{if(t=a.next(),t.done)return r||i===Dn?t:i===gn?A(i,c++,void 0,t):A(i,c++,t.value[1],t);var l=t.value;o=l[0],h=l[1],u&&(u=e.call(n,h,o,s))}while(u);return i===En?t:A(i,o,h,t)})},i}function ye(t,e){var r=s(t),i=[t].concat(e).map(function(t){return o(t)?r&&(t=n(t)):t=r?j(t):L(Array.isArray(t)?t:[t]),t}).filter(function(t){return 0!==t.size});if(0===i.length)return t;if(1===i.length){var u=i[0];if(u===t||r&&s(u)||a(t)&&a(u))return u}var c=new M(i);return r?c=c.toKeyedSeq():a(t)||(c=c.toSetSeq()),c=c.flatten(!0),c.size=i.reduce(function(t,e){if(void 0!==t){var n=e.size;if(void 0!==n)return t+n}},0),c}function ve(t,e,n){var r=Fe(t);return r.__iterateUncached=function(r,i){function s(t,c){var h=this;t.__iterate(function(t,i){return(!e||c<e)&&o(t)?s(t,c+1):!1===r(t,n?i:a++,h)&&(u=!0),!u},i)}var a=0,u=!1;return s(t,0),a},r.__iteratorUncached=function(r,i){var s=t.__iterator(r,i),a=[],u=0;return new E(function(){for(;s;){var t=s.next();if(!1===t.done){var c=t.value;if(r===En&&(c=c[1]),e&&!(a.length<e)||!o(c))return n?t:A(r,u++,c,t);a.push(s),s=c.__iterator(r,i)}else s=a.pop()}return S()})},r}function xe(t,e,n){var r=be(t);return t.toSeq().map(function(i,o){return r(e.call(n,i,o,t))}).flatten(!0)}function ge(t,e){var n=Fe(t);return n.size=t.size&&2*t.size-1,n.__iterateUncached=function(n,r){var i=this,o=0;return t.__iterate(function(t,r){return(!o||!1!==n(e,o++,i))&&!1!==n(t,o++,i)},r),o},n.__iteratorUncached=function(n,r){var i,o=t.__iterator(Dn,r),s=0;return new E(function(){return(!i||s%2)&&(i=o.next(),i.done)?i:s%2?A(n,s++,e):A(n,s++,i.value,i)})},n}function De(t,e,n){e||(e=Ie);var r=s(t),i=0,o=t.toSeq().map(function(e,r){return[r,e,i++,n?n(e,r,t):e]}).toArray();return o.sort(function(t,n){return e(t[3],n[3])||t[2]-n[2]}).forEach(r?function(t,e){o[e].length=2}:function(t,e){o[e]=t[1]}),r?I(o):a(t)?T(o):B(o)}function Ee(t,e,n){if(e||(e=Ie),n){var r=t.toSeq().map(function(e,r){return[e,n(e,r,t)]}).reduce(function(t,n){return Ae(e,t[1],n[1])?n:t});return r&&r[0]}return t.reduce(function(t,n){return Ae(e,t,n)?n:t})}function Ae(t,e,n){var r=t(n,e);return 0===r&&n!==e&&(void 0===n||null===n||n!==n)||r>0}function Se(t,n,r){var i=Fe(t);return i.size=new M(r).map(function(t){return t.size}).min(),i.__iterate=function(t,e){for(var n,r=this.__iterator(Dn,e),i=0;!(n=r.next()).done&&!1!==t(n.value,i++,this););return i},i.__iteratorUncached=function(t,i){var o=r.map(function(t){return t=e(t),_(i?t.reverse():t)}),s=0,a=!1;return new E(function(){var e;return a||(e=o.map(function(t){return t.next()}),a=e.some(function(t){return t.done})),a?S():A(t,s++,n.apply(null,e.map(function(t){return t.value})))})},i}function we(t,e){return R(t)?e:t.constructor(e)}function Ce(t){if(t!==Object(t))throw new TypeError("Expected [K, V] tuple: "+t)}function _e(t){return ht(t.size),d(t)}function be(t){return s(t)?n:a(t)?r:i}function Fe(t){return Object.create((s(t)?I:a(t)?T:B).prototype)}function ke(){return this._iter.cacheResult?(this._iter.cacheResult(),this.size=this._iter.size,this):k.prototype.cacheResult.call(this)}function Ie(t,e){return t>e?1:t<e?-1:0}function Te(t){var n=_(t);if(!n){if(!F(t))throw new TypeError("Expected iterable or array-like: "+t);n=_(e(t))}return n}function Be(t,e){var n,r=function(o){if(o instanceof r)return o;if(!(this instanceof r))return new r(o);if(!n){n=!0;var s=Object.keys(t);Ne(i,s),i.size=s.length,i._name=e,i._keys=s,i._defaultValues=t}this._map=lt(o)},i=r.prototype=Object.create($n);return i.constructor=r,r}function Me(t,e,n){var r=Object.create(Object.getPrototypeOf(t));return r._map=e,r.__ownerID=n,r}function Pe(t){return t._name||t.constructor.name||"Record"}function Ne(t,e){try{e.forEach(Oe.bind(void 0,t))}catch(t){}}function Oe(t,e){Object.defineProperty(t,e,{get:function(){return this.get(e)},set:function(t){Z(this.__ownerID,"Cannot set on an immutable record."),this.set(e,t)}})}function Re(t){return null===t||void 0===t?ze():Ue(t)&&!c(t)?t:ze().withMutations(function(e){var n=i(t);ht(n.size),n.forEach(function(t){return e.add(t)})})}function Ue(t){return!(!t||!t[Zn])}function je(t,e){return t.__ownerID?(t.size=e.size,t._map=e,t):e===t._map?t:0===e.size?t.__empty():t.__make(e)}function Le(t,e){var n=Object.create(Qn);return n.size=t?t.size:0,n._map=t,n.__ownerID=e,n}function ze(){return tr||(tr=Le(At()))}function Je(t){return null===t||void 0===t?Ke():Xe(t)?t:Ke().withMutations(function(e){var n=i(t);ht(n.size),n.forEach(function(t){return e.add(t)})})}function Xe(t){return Ue(t)&&c(t)}function qe(t,e){var n=Object.create(er);return n.size=t?t.size:0,n._map=t,n.__ownerID=e,n}function Ke(){return nr||(nr=qe(ee()))}function Ye(t){return null===t||void 0===t?He():We(t)?t:He().unshiftAll(t)}function We(t){return!(!t||!t[rr])}function Ge(t,e,n,r){var i=Object.create(ir);return i.size=t,i._head=e,i.__ownerID=n,i.__hash=r,i.__altered=!1,i}function He(){return or||(or=Ge(0))}function Ve(t,e){var n=function(n){t.prototype[n]=e[n]};return Object.keys(e).forEach(n),Object.getOwnPropertySymbols&&Object.getOwnPropertySymbols(e).forEach(n),t}function $e(t,e){return e}function Ze(t,e){return[e,t]}function Qe(t){return function(){return!t.apply(this,arguments)}}function tn(t){return function(){return-t.apply(this,arguments)}}function en(t){return"string"==typeof t?JSON.stringify(t):String(t)}function nn(){return f(arguments)}function rn(t,e){return t<e?1:t>e?-1:0}function on(t){if(t.size===1/0)return 0;var e=c(t),n=s(t),r=e?1:0;return sn(t.__iterate(n?e?function(t,e){r=31*r+an(ot(t),ot(e))|0}:function(t,e){r=r+an(ot(t),ot(e))|0}:e?function(t){r=31*r+ot(t)|0}:function(t){r=r+ot(t)|0}),r)}function sn(t,e){return e=In(e,3432918353),e=In(e<<15|e>>>-15,461845907),e=In(e<<13|e>>>-13,5),e=(e+3864292196|0)^t,e=In(e^e>>>16,2246822507),e=In(e^e>>>13,3266489909),e=it(e^e>>>16)}function an(t,e){return t^e+2654435769+(t<<6)+(t>>2)|0}var un=Array.prototype.slice;t(n,e),t(r,e),t(i,e),e.isIterable=o,e.isKeyed=s,e.isIndexed=a,e.isAssociative=u,e.isOrdered=c,e.Keyed=n,e.Indexed=r,e.Set=i;var cn="@@__IMMUTABLE_ITERABLE__@@",hn="@@__IMMUTABLE_KEYED__@@",ln="@@__IMMUTABLE_INDEXED__@@",pn="@@__IMMUTABLE_ORDERED__@@",fn=5,dn=1<<fn,mn=dn-1,yn={},vn={value:!1},xn={value:!1},gn=0,Dn=1,En=2,An="function"==typeof Symbol&&Symbol.iterator,Sn="@@iterator",wn=An||Sn;E.prototype.toString=function(){return"[Iterator]"},E.KEYS=gn,E.VALUES=Dn,E.ENTRIES=En,E.prototype.inspect=E.prototype.toSource=function(){return this.toString()},E.prototype[wn]=function(){return this},t(k,e),k.of=function(){return k(arguments)},k.prototype.toSeq=function(){return this},k.prototype.toString=function(){return this.__toString("Seq {","}")},k.prototype.cacheResult=function(){return!this._cache&&this.__iterateUncached&&(this._cache=this.entrySeq().toArray(),this.size=this._cache.length),this},k.prototype.__iterate=function(t,e){return X(this,t,e,!0)},k.prototype.__iterator=function(t,e){return q(this,t,e,!0)},t(I,k),I.prototype.toKeyedSeq=function(){return this},t(T,k),T.of=function(){return T(arguments)},T.prototype.toIndexedSeq=function(){return this},T.prototype.toString=function(){return this.__toString("Seq [","]")},T.prototype.__iterate=function(t,e){return X(this,t,e,!1)},T.prototype.__iterator=function(t,e){return q(this,t,e,!1)},t(B,k),B.of=function(){return B(arguments)},B.prototype.toSetSeq=function(){return this},k.isSeq=R,k.Keyed=I,k.Set=B,k.Indexed=T;var Cn="@@__IMMUTABLE_SEQ__@@";k.prototype[Cn]=!0,t(M,T),M.prototype.get=function(t,e){return this.has(t)?this._array[m(this,t)]:e},M.prototype.__iterate=function(t,e){for(var n=this._array,r=n.length-1,i=0;i<=r;i++)if(!1===t(n[e?r-i:i],i,this))return i+1;return i},M.prototype.__iterator=function(t,e){var n=this._array,r=n.length-1,i=0;return new E(function(){return i>r?S():A(t,i,n[e?r-i++:i++])})},t(P,I),P.prototype.get=function(t,e){return void 0===e||this.has(t)?this._object[t]:e},P.prototype.has=function(t){return this._object.hasOwnProperty(t)},P.prototype.__iterate=function(t,e){for(var n=this._object,r=this._keys,i=r.length-1,o=0;o<=i;o++){var s=r[e?i-o:o];if(!1===t(n[s],s,this))return o+1}return o},P.prototype.__iterator=function(t,e){var n=this._object,r=this._keys,i=r.length-1,o=0;return new E(function(){var s=r[e?i-o:o];return o++>i?S():A(t,s,n[s])})},P.prototype[pn]=!0,t(N,T),N.prototype.__iterateUncached=function(t,e){if(e)return this.cacheResult().__iterate(t,e);var n=this._iterable,r=_(n),i=0;if(C(r))for(var o;!(o=r.next()).done&&!1!==t(o.value,i++,this););return i},N.prototype.__iteratorUncached=function(t,e){if(e)return this.cacheResult().__iterator(t,e);var n=this._iterable,r=_(n);if(!C(r))return new E(S);var i=0;return new E(function(){var e=r.next();return e.done?e:A(t,i++,e.value)})},t(O,T),O.prototype.__iterateUncached=function(t,e){if(e)return this.cacheResult().__iterate(t,e);for(var n=this._iterator,r=this._iteratorCache,i=0;i<r.length;)if(!1===t(r[i],i++,this))return i;for(var o;!(o=n.next()).done;){var s=o.value;if(r[i]=s,!1===t(s,i++,this))break}return i},O.prototype.__iteratorUncached=function(t,e){if(e)return this.cacheResult().__iterator(t,e);var n=this._iterator,r=this._iteratorCache,i=0;return new E(function(){if(i>=r.length){var e=n.next();if(e.done)return e;r[i]=e.value}return A(t,i,r[i++])})};var _n;t($,T),$.prototype.toString=function(){return 0===this.size?"Repeat []":"Repeat [ "+this._value+" "+this.size+" times ]"},$.prototype.get=function(t,e){return this.has(t)?this._value:e},$.prototype.includes=function(t){return H(this._value,t)},$.prototype.slice=function(t,e){var n=this.size;return v(t,e,n)?this:new $(this._value,g(e,n)-x(t,n))},$.prototype.reverse=function(){return this},$.prototype.indexOf=function(t){return H(this._value,t)?0:-1},$.prototype.lastIndexOf=function(t){return H(this._value,t)?this.size:-1},$.prototype.__iterate=function(t,e){for(var n=0;n<this.size;n++)if(!1===t(this._value,n,this))return n+1;return n},$.prototype.__iterator=function(t,e){var n=this,r=0;return new E(function(){return r<n.size?A(t,r++,n._value):S()})},$.prototype.equals=function(t){return t instanceof $?H(this._value,t._value):V(t)};var bn;t(Q,T),Q.prototype.toString=function(){return 0===this.size?"Range []":"Range [ "+this._start+"..."+this._end+(1!==this._step?" by "+this._step:"")+" ]"},Q.prototype.get=function(t,e){return this.has(t)?this._start+m(this,t)*this._step:e},Q.prototype.includes=function(t){var e=(t-this._start)/this._step;return e>=0&&e<this.size&&e===Math.floor(e)},Q.prototype.slice=function(t,e){return v(t,e,this.size)?this:(t=x(t,this.size),e=g(e,this.size),e<=t?new Q(0,0):new Q(this.get(t,this._end),this.get(e,this._end),this._step))},Q.prototype.indexOf=function(t){var e=t-this._start;if(e%this._step==0){var n=e/this._step;if(n>=0&&n<this.size)return n}return-1},Q.prototype.lastIndexOf=function(t){return this.indexOf(t)},Q.prototype.__iterate=function(t,e){for(var n=this.size-1,r=this._step,i=e?this._start+n*r:this._start,o=0;o<=n;o++){if(!1===t(i,o,this))return o+1;i+=e?-r:r}return o},Q.prototype.__iterator=function(t,e){var n=this.size-1,r=this._step,i=e?this._start+n*r:this._start,o=0;return new E(function(){var s=i;return i+=e?-r:r,o>n?S():A(t,o++,s)})},Q.prototype.equals=function(t){return t instanceof Q?this._start===t._start&&this._end===t._end&&this._step===t._step:V(this,t)};var Fn;t(tt,e),t(et,tt),t(nt,tt),t(rt,tt),tt.Keyed=et,tt.Indexed=nt,tt.Set=rt;var kn,In="function"==typeof Math.imul&&-2===Math.imul(4294967295,2)?Math.imul:function(t,e){t|=0,e|=0;var n=65535&t,r=65535&e;return n*r+((t>>>16)*r+n*(e>>>16)<<16>>>0)|0},Tn=Object.isExtensible,Bn=function(){try{return Object.defineProperty({},"@",{}),!0}catch(t){return!1}}(),Mn="function"==typeof WeakMap;Mn&&(kn=new WeakMap);var Pn=0,Nn="__immutablehash__";"function"==typeof Symbol&&(Nn=Symbol(Nn));var On=16,Rn=255,Un=0,jn={};t(lt,et),lt.of=function(){var t=un.call(arguments,0);return At().withMutations(function(e){for(var n=0;n<t.length;n+=2){if(n+1>=t.length)throw new Error("Missing value for key: "+t[n]);e.set(t[n],t[n+1])}})},lt.prototype.toString=function(){return this.__toString("Map {","}")},lt.prototype.get=function(t,e){return this._root?this._root.get(0,void 0,t,e):e},lt.prototype.set=function(t,e){return St(this,t,e)},lt.prototype.setIn=function(t,e){return this.updateIn(t,yn,function(){return e})},lt.prototype.remove=function(t){return St(this,t,yn)},lt.prototype.deleteIn=function(t){return this.updateIn(t,function(){return yn})},lt.prototype.update=function(t,e,n){return 1===arguments.length?t(this):this.updateIn([t],e,n)},lt.prototype.updateIn=function(t,e,n){n||(n=e,e=void 0);var r=Pt(this,Te(t),e,n);return r===yn?void 0:r},lt.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._root=null,this.__hash=void 0,this.__altered=!0,this):At()},lt.prototype.merge=function(){return It(this,void 0,arguments)},lt.prototype.mergeWith=function(t){return It(this,t,un.call(arguments,1))},lt.prototype.mergeIn=function(t){var e=un.call(arguments,1);return this.updateIn(t,At(),function(t){return"function"==typeof t.merge?t.merge.apply(t,e):e[e.length-1]})},lt.prototype.mergeDeep=function(){return It(this,Tt,arguments)},lt.prototype.mergeDeepWith=function(t){var e=un.call(arguments,1);return It(this,Bt(t),e)},lt.prototype.mergeDeepIn=function(t){var e=un.call(arguments,1);return this.updateIn(t,At(),function(t){return"function"==typeof t.mergeDeep?t.mergeDeep.apply(t,e):e[e.length-1]})},lt.prototype.sort=function(t){return Zt(De(this,t))},lt.prototype.sortBy=function(t,e){return Zt(De(this,e,t))},lt.prototype.withMutations=function(t){var e=this.asMutable();return t(e),e.wasAltered()?e.__ensureOwner(this.__ownerID):this},lt.prototype.asMutable=function(){return this.__ownerID?this:this.__ensureOwner(new p)},lt.prototype.asImmutable=function(){return this.__ensureOwner()},lt.prototype.wasAltered=function(){return this.__altered},lt.prototype.__iterator=function(t,e){return new xt(this,t,e)},lt.prototype.__iterate=function(t,e){var n=this,r=0;return this._root&&this._root.iterate(function(e){return r++,t(e[1],e[0],n)},e),r},lt.prototype.__ensureOwner=function(t){return t===this.__ownerID?this:t?Et(this.size,this._root,t,this.__hash):(this.__ownerID=t,this.__altered=!1,this)},lt.isMap=pt;var Ln="@@__IMMUTABLE_MAP__@@",zn=lt.prototype;zn[Ln]=!0,zn.delete=zn.remove,zn.removeIn=zn.deleteIn,ft.prototype.get=function(t,e,n,r){for(var i=this.entries,o=0,s=i.length;o<s;o++)if(H(n,i[o][0]))return i[o][1];return r},ft.prototype.update=function(t,e,n,r,i,o,s){for(var a=i===yn,u=this.entries,c=0,h=u.length;c<h&&!H(r,u[c][0]);c++);var p=c<h;if(p?u[c][1]===i:a)return this;if(l(s),(a||!p)&&l(o),!a||1!==u.length){if(!p&&!a&&u.length>=Xn)return bt(t,u,r,i);var d=t&&t===this.ownerID,m=d?u:f(u);return p?a?c===h-1?m.pop():m[c]=m.pop():m[c]=[r,i]:m.push([r,i]),d?(this.entries=m,this):new ft(t,m)}},dt.prototype.get=function(t,e,n,r){void 0===e&&(e=ot(n));var i=1<<((0===t?e:e>>>t)&mn),o=this.bitmap;return 0==(o&i)?r:this.nodes[Nt(o&i-1)].get(t+fn,e,n,r)},dt.prototype.update=function(t,e,n,r,i,o,s){void 0===n&&(n=ot(r));var a=(0===e?n:n>>>e)&mn,u=1<<a,c=this.bitmap,h=0!=(c&u);if(!h&&i===yn)return this;var l=Nt(c&u-1),p=this.nodes,f=h?p[l]:void 0,d=wt(f,t,e+fn,n,r,i,o,s);if(d===f)return this;if(!h&&d&&p.length>=qn)return kt(t,p,c,a,d);if(h&&!d&&2===p.length&&Ct(p[1^l]))return p[1^l];if(h&&d&&1===p.length&&Ct(d))return d;var m=t&&t===this.ownerID,y=h?d?c:c^u:c|u,v=h?d?Ot(p,l,d,m):Ut(p,l,m):Rt(p,l,d,m);return m?(this.bitmap=y,this.nodes=v,this):new dt(t,y,v)},mt.prototype.get=function(t,e,n,r){void 0===e&&(e=ot(n));var i=(0===t?e:e>>>t)&mn,o=this.nodes[i];return o?o.get(t+fn,e,n,r):r},mt.prototype.update=function(t,e,n,r,i,o,s){void 0===n&&(n=ot(r));var a=(0===e?n:n>>>e)&mn,u=i===yn,c=this.nodes,h=c[a];if(u&&!h)return this;var l=wt(h,t,e+fn,n,r,i,o,s);if(l===h)return this;var p=this.count;if(h){if(!l&&--p<Kn)return Ft(t,c,p,a)}else p++;var f=t&&t===this.ownerID,d=Ot(c,a,l,f);return f?(this.count=p,this.nodes=d,this):new mt(t,p,d)},yt.prototype.get=function(t,e,n,r){for(var i=this.entries,o=0,s=i.length;o<s;o++)if(H(n,i[o][0]))return i[o][1];return r},yt.prototype.update=function(t,e,n,r,i,o,s){void 0===n&&(n=ot(r));var a=i===yn;if(n!==this.keyHash)return a?this:(l(s),l(o),_t(this,t,e,n,[r,i]));for(var u=this.entries,c=0,h=u.length;c<h&&!H(r,u[c][0]);c++);var p=c<h;if(p?u[c][1]===i:a)return this;if(l(s),(a||!p)&&l(o),a&&2===h)return new vt(t,this.keyHash,u[1^c]);var d=t&&t===this.ownerID,m=d?u:f(u);return p?a?c===h-1?m.pop():m[c]=m.pop():m[c]=[r,i]:m.push([r,i]),d?(this.entries=m,this):new yt(t,this.keyHash,m)},vt.prototype.get=function(t,e,n,r){return H(n,this.entry[0])?this.entry[1]:r},vt.prototype.update=function(t,e,n,r,i,o,s){var a=i===yn,u=H(r,this.entry[0]);return(u?i===this.entry[1]:a)?this:(l(s),a?void l(o):u?t&&t===this.ownerID?(this.entry[1]=i,this):new vt(t,this.keyHash,[r,i]):(l(o),_t(this,t,e,ot(r),[r,i])))},ft.prototype.iterate=yt.prototype.iterate=function(t,e){for(var n=this.entries,r=0,i=n.length-1;r<=i;r++)if(!1===t(n[e?i-r:r]))return!1},dt.prototype.iterate=mt.prototype.iterate=function(t,e){for(var n=this.nodes,r=0,i=n.length-1;r<=i;r++){var o=n[e?i-r:r];if(o&&!1===o.iterate(t,e))return!1}},vt.prototype.iterate=function(t,e){return t(this.entry)},t(xt,E),xt.prototype.next=function(){for(var t=this._type,e=this._stack;e;){var n,r=e.node,i=e.index++;if(r.entry){if(0===i)return gt(t,r.entry)}else if(r.entries){if(n=r.entries.length-1,i<=n)return gt(t,r.entries[this._reverse?n-i:i])}else if(n=r.nodes.length-1,i<=n){var o=r.nodes[this._reverse?n-i:i];if(o){if(o.entry)return gt(t,o.entry);e=this._stack=Dt(o,e)}continue}e=this._stack=this._stack.__prev}return S()};var Jn,Xn=dn/4,qn=dn/2,Kn=dn/4;t(jt,nt),jt.of=function(){return this(arguments)},jt.prototype.toString=function(){return this.__toString("List [","]")},jt.prototype.get=function(t,e){if((t=m(this,t))>=0&&t<this.size){t+=this._origin;var n=Gt(this,t);return n&&n.array[t&mn]}return e},jt.prototype.set=function(t,e){return Kt(this,t,e)},jt.prototype.remove=function(t){return this.has(t)?0===t?this.shift():t===this.size-1?this.pop():this.splice(t,1):this},jt.prototype.insert=function(t,e){return this.splice(t,0,e)},jt.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=this._origin=this._capacity=0,this._level=fn,this._root=this._tail=null,this.__hash=void 0,this.__altered=!0,this):qt()},jt.prototype.push=function(){var t=arguments,e=this.size;return this.withMutations(function(n){Ht(n,0,e+t.length);for(var r=0;r<t.length;r++)n.set(e+r,t[r])})},jt.prototype.pop=function(){return Ht(this,0,-1)},jt.prototype.unshift=function(){var t=arguments;return this.withMutations(function(e){Ht(e,-t.length);for(var n=0;n<t.length;n++)e.set(n,t[n])})},jt.prototype.shift=function(){return Ht(this,1)},jt.prototype.merge=function(){return Vt(this,void 0,arguments)},jt.prototype.mergeWith=function(t){return Vt(this,t,un.call(arguments,1))},jt.prototype.mergeDeep=function(){return Vt(this,Tt,arguments)},jt.prototype.mergeDeepWith=function(t){var e=un.call(arguments,1);return Vt(this,Bt(t),e)},jt.prototype.setSize=function(t){return Ht(this,0,t)},jt.prototype.slice=function(t,e){var n=this.size;return v(t,e,n)?this:Ht(this,x(t,n),g(e,n))},jt.prototype.__iterator=function(t,e){var n=0,r=Jt(this,e);return new E(function(){var e=r();return e===Hn?S():A(t,n++,e)})},jt.prototype.__iterate=function(t,e){for(var n,r=0,i=Jt(this,e);(n=i())!==Hn&&!1!==t(n,r++,this););return r},jt.prototype.__ensureOwner=function(t){return t===this.__ownerID?this:t?Xt(this._origin,this._capacity,this._level,this._root,this._tail,t,this.__hash):(this.__ownerID=t,this)},jt.isList=Lt;var Yn="@@__IMMUTABLE_LIST__@@",Wn=jt.prototype;Wn[Yn]=!0,Wn.delete=Wn.remove,Wn.setIn=zn.setIn,Wn.deleteIn=Wn.removeIn=zn.removeIn,Wn.update=zn.update,Wn.updateIn=zn.updateIn,Wn.mergeIn=zn.mergeIn,Wn.mergeDeepIn=zn.mergeDeepIn,Wn.withMutations=zn.withMutations,Wn.asMutable=zn.asMutable,Wn.asImmutable=zn.asImmutable,Wn.wasAltered=zn.wasAltered,zt.prototype.removeBefore=function(t,e,n){if(n===e?1<<e:0===this.array.length)return this;var r=n>>>e&mn;if(r>=this.array.length)return new zt([],t);var i,o=0===r;if(e>0){var s=this.array[r];if((i=s&&s.removeBefore(t,e-fn,n))===s&&o)return this}if(o&&!i)return this;var a=Wt(this,t);if(!o)for(var u=0;u<r;u++)a.array[u]=void 0;return i&&(a.array[r]=i),a},zt.prototype.removeAfter=function(t,e,n){if(n===(e?1<<e:0)||0===this.array.length)return this;var r=n-1>>>e&mn;if(r>=this.array.length)return this;var i;if(e>0){var o=this.array[r];if((i=o&&o.removeAfter(t,e-fn,n))===o&&r===this.array.length-1)return this}var s=Wt(this,t);return s.array.splice(r+1),i&&(s.array[r]=i),s};var Gn,Hn={};t(Zt,lt),Zt.of=function(){return this(arguments)},Zt.prototype.toString=function(){return this.__toString("OrderedMap {","}")},Zt.prototype.get=function(t,e){var n=this._map.get(t);return void 0!==n?this._list.get(n)[1]:e},Zt.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._map.clear(),this._list.clear(),this):ee()},Zt.prototype.set=function(t,e){return ne(this,t,e)},Zt.prototype.remove=function(t){return ne(this,t,yn)},Zt.prototype.wasAltered=function(){return this._map.wasAltered()||this._list.wasAltered()},Zt.prototype.__iterate=function(t,e){var n=this;return this._list.__iterate(function(e){return e&&t(e[1],e[0],n)},e)},Zt.prototype.__iterator=function(t,e){return this._list.fromEntrySeq().__iterator(t,e)},Zt.prototype.__ensureOwner=function(t){if(t===this.__ownerID)return this;var e=this._map.__ensureOwner(t),n=this._list.__ensureOwner(t);return t?te(e,n,t,this.__hash):(this.__ownerID=t,this._map=e,this._list=n,this)},Zt.isOrderedMap=Qt,Zt.prototype[pn]=!0,Zt.prototype.delete=Zt.prototype.remove;var Vn;t(re,I),re.prototype.get=function(t,e){return this._iter.get(t,e)},re.prototype.has=function(t){return this._iter.has(t)},re.prototype.valueSeq=function(){return this._iter.valueSeq()},re.prototype.reverse=function(){var t=this,e=ce(this,!0);return this._useKeys||(e.valueSeq=function(){return t._iter.toSeq().reverse()}),e},re.prototype.map=function(t,e){var n=this,r=ue(this,t,e);return this._useKeys||(r.valueSeq=function(){return n._iter.toSeq().map(t,e)}),r},re.prototype.__iterate=function(t,e){var n,r=this;return this._iter.__iterate(this._useKeys?function(e,n){return t(e,n,r)}:(n=e?_e(this):0,function(i){return t(i,e?--n:n++,r)}),e)},re.prototype.__iterator=function(t,e){if(this._useKeys)return this._iter.__iterator(t,e);var n=this._iter.__iterator(Dn,e),r=e?_e(this):0;return new E(function(){var i=n.next();return i.done?i:A(t,e?--r:r++,i.value,i)})},re.prototype[pn]=!0,t(ie,T),ie.prototype.includes=function(t){return this._iter.includes(t)},ie.prototype.__iterate=function(t,e){var n=this,r=0;return this._iter.__iterate(function(e){return t(e,r++,n)},e)},ie.prototype.__iterator=function(t,e){var n=this._iter.__iterator(Dn,e),r=0;return new E(function(){var e=n.next();return e.done?e:A(t,r++,e.value,e)})},t(oe,B),oe.prototype.has=function(t){return this._iter.includes(t)},oe.prototype.__iterate=function(t,e){var n=this;return this._iter.__iterate(function(e){return t(e,e,n)},e)},oe.prototype.__iterator=function(t,e){var n=this._iter.__iterator(Dn,e);return new E(function(){var e=n.next();return e.done?e:A(t,e.value,e.value,e)})},t(se,I),se.prototype.entrySeq=function(){return this._iter.toSeq()},se.prototype.__iterate=function(t,e){var n=this;return this._iter.__iterate(function(e){if(e){Ce(e);var r=o(e);return t(r?e.get(1):e[1],r?e.get(0):e[0],n)}},e)},se.prototype.__iterator=function(t,e){var n=this._iter.__iterator(Dn,e);return new E(function(){for(;;){var e=n.next();if(e.done)return e;var r=e.value;if(r){Ce(r);var i=o(r);return A(t,i?r.get(0):r[0],i?r.get(1):r[1],e)}}})},ie.prototype.cacheResult=re.prototype.cacheResult=oe.prototype.cacheResult=se.prototype.cacheResult=ke,t(Be,et),Be.prototype.toString=function(){return this.__toString(Pe(this)+" {","}")},Be.prototype.has=function(t){return this._defaultValues.hasOwnProperty(t)},Be.prototype.get=function(t,e){if(!this.has(t))return e;var n=this._defaultValues[t];return this._map?this._map.get(t,n):n},Be.prototype.clear=function(){if(this.__ownerID)return this._map&&this._map.clear(),this;var t=this.constructor;return t._empty||(t._empty=Me(this,At()))},Be.prototype.set=function(t,e){if(!this.has(t))throw new Error('Cannot set unknown key "'+t+'" on '+Pe(this));if(this._map&&!this._map.has(t)){if(e===this._defaultValues[t])return this}var n=this._map&&this._map.set(t,e);return this.__ownerID||n===this._map?this:Me(this,n)},Be.prototype.remove=function(t){if(!this.has(t))return this;var e=this._map&&this._map.remove(t);return this.__ownerID||e===this._map?this:Me(this,e)},Be.prototype.wasAltered=function(){return this._map.wasAltered()},Be.prototype.__iterator=function(t,e){var r=this;return n(this._defaultValues).map(function(t,e){return r.get(e)}).__iterator(t,e)},Be.prototype.__iterate=function(t,e){var r=this;return n(this._defaultValues).map(function(t,e){return r.get(e)}).__iterate(t,e)},Be.prototype.__ensureOwner=function(t){if(t===this.__ownerID)return this;var e=this._map&&this._map.__ensureOwner(t);return t?Me(this,e,t):(this.__ownerID=t,this._map=e,this)};var $n=Be.prototype;$n.delete=$n.remove,$n.deleteIn=$n.removeIn=zn.removeIn,$n.merge=zn.merge,$n.mergeWith=zn.mergeWith,$n.mergeIn=zn.mergeIn,$n.mergeDeep=zn.mergeDeep,$n.mergeDeepWith=zn.mergeDeepWith,$n.mergeDeepIn=zn.mergeDeepIn,$n.setIn=zn.setIn,$n.update=zn.update,$n.updateIn=zn.updateIn,$n.withMutations=zn.withMutations,$n.asMutable=zn.asMutable,$n.asImmutable=zn.asImmutable,t(Re,rt),Re.of=function(){return this(arguments)},Re.fromKeys=function(t){return this(n(t).keySeq())},Re.prototype.toString=function(){return this.__toString("Set {","}")},Re.prototype.has=function(t){return this._map.has(t)},Re.prototype.add=function(t){return je(this,this._map.set(t,!0))},Re.prototype.remove=function(t){return je(this,this._map.remove(t))},Re.prototype.clear=function(){return je(this,this._map.clear())},Re.prototype.union=function(){var t=un.call(arguments,0);return t=t.filter(function(t){return 0!==t.size}),0===t.length?this:0!==this.size||this.__ownerID||1!==t.length?this.withMutations(function(e){for(var n=0;n<t.length;n++)i(t[n]).forEach(function(t){return e.add(t)})}):this.constructor(t[0])},Re.prototype.intersect=function(){var t=un.call(arguments,0);if(0===t.length)return this;t=t.map(function(t){return i(t)});var e=this;return this.withMutations(function(n){e.forEach(function(e){t.every(function(t){return t.includes(e)})||n.remove(e)})})},Re.prototype.subtract=function(){var t=un.call(arguments,0);if(0===t.length)return this;t=t.map(function(t){return i(t)});var e=this;return this.withMutations(function(n){e.forEach(function(e){t.some(function(t){return t.includes(e)})&&n.remove(e)})})},Re.prototype.merge=function(){return this.union.apply(this,arguments)},Re.prototype.mergeWith=function(t){var e=un.call(arguments,1);return this.union.apply(this,e)},Re.prototype.sort=function(t){return Je(De(this,t))},Re.prototype.sortBy=function(t,e){return Je(De(this,e,t))},Re.prototype.wasAltered=function(){return this._map.wasAltered()},Re.prototype.__iterate=function(t,e){var n=this;return this._map.__iterate(function(e,r){return t(r,r,n)},e)},Re.prototype.__iterator=function(t,e){return this._map.map(function(t,e){return e}).__iterator(t,e)},Re.prototype.__ensureOwner=function(t){if(t===this.__ownerID)return this;var e=this._map.__ensureOwner(t);return t?this.__make(e,t):(this.__ownerID=t,this._map=e,this)},Re.isSet=Ue;var Zn="@@__IMMUTABLE_SET__@@",Qn=Re.prototype;Qn[Zn]=!0,Qn.delete=Qn.remove,Qn.mergeDeep=Qn.merge,Qn.mergeDeepWith=Qn.mergeWith,Qn.withMutations=zn.withMutations,Qn.asMutable=zn.asMutable,Qn.asImmutable=zn.asImmutable,Qn.__empty=ze,Qn.__make=Le;var tr;t(Je,Re),Je.of=function(){return this(arguments)},Je.fromKeys=function(t){return this(n(t).keySeq())},Je.prototype.toString=function(){return this.__toString("OrderedSet {","}")},Je.isOrderedSet=Xe;var er=Je.prototype;er[pn]=!0,er.__empty=Ke,er.__make=qe;var nr;t(Ye,nt),Ye.of=function(){return this(arguments)},Ye.prototype.toString=function(){return this.__toString("Stack [","]")},Ye.prototype.get=function(t,e){var n=this._head;for(t=m(this,t);n&&t--;)n=n.next;return n?n.value:e},Ye.prototype.peek=function(){return this._head&&this._head.value},Ye.prototype.push=function(){if(0===arguments.length)return this;for(var t=this.size+arguments.length,e=this._head,n=arguments.length-1;n>=0;n--)e={value:arguments[n],next:e};return this.__ownerID?(this.size=t,this._head=e,this.__hash=void 0,this.__altered=!0,this):Ge(t,e)},Ye.prototype.pushAll=function(t){if(t=r(t),0===t.size)return this;ht(t.size);var e=this.size,n=this._head;return t.reverse().forEach(function(t){e++,n={value:t,next:n}}),this.__ownerID?(this.size=e,this._head=n,this.__hash=void 0,this.__altered=!0,this):Ge(e,n)},Ye.prototype.pop=function(){return this.slice(1)},Ye.prototype.unshift=function(){return this.push.apply(this,arguments)},Ye.prototype.unshiftAll=function(t){return this.pushAll(t)},Ye.prototype.shift=function(){return this.pop.apply(this,arguments)},Ye.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._head=void 0,this.__hash=void 0,this.__altered=!0,this):He()},Ye.prototype.slice=function(t,e){if(v(t,e,this.size))return this;var n=x(t,this.size);if(g(e,this.size)!==this.size)return nt.prototype.slice.call(this,t,e);for(var r=this.size-n,i=this._head;n--;)i=i.next;return this.__ownerID?(this.size=r,this._head=i,this.__hash=void 0,this.__altered=!0,this):Ge(r,i)},Ye.prototype.__ensureOwner=function(t){return t===this.__ownerID?this:t?Ge(this.size,this._head,t,this.__hash):(this.__ownerID=t,this.__altered=!1,this)},Ye.prototype.__iterate=function(t,e){if(e)return this.reverse().__iterate(t);for(var n=0,r=this._head;r&&!1!==t(r.value,n++,this);)r=r.next;return n},Ye.prototype.__iterator=function(t,e){if(e)return this.reverse().__iterator(t);var n=0,r=this._head;return new E(function(){if(r){var e=r.value;return r=r.next,A(t,n++,e)}return S()})},Ye.isStack=We;var rr="@@__IMMUTABLE_STACK__@@",ir=Ye.prototype;ir[rr]=!0,ir.withMutations=zn.withMutations,ir.asMutable=zn.asMutable,ir.asImmutable=zn.asImmutable,ir.wasAltered=zn.wasAltered;var or;e.Iterator=E,Ve(e,{toArray:function(){ht(this.size);var t=new Array(this.size||0);return this.valueSeq().__iterate(function(e,n){t[n]=e}),t},toIndexedSeq:function(){return new ie(this)},toJS:function(){return this.toSeq().map(function(t){return t&&"function"==typeof t.toJS?t.toJS():t}).__toJS()},toJSON:function(){return this.toSeq().map(function(t){return t&&"function"==typeof t.toJSON?t.toJSON():t}).__toJS()},toKeyedSeq:function(){return new re(this,!0)},toMap:function(){return lt(this.toKeyedSeq())},toObject:function(){ht(this.size);var t={};return this.__iterate(function(e,n){t[n]=e}),t},toOrderedMap:function(){return Zt(this.toKeyedSeq())},toOrderedSet:function(){return Je(s(this)?this.valueSeq():this)},toSet:function(){return Re(s(this)?this.valueSeq():this)},toSetSeq:function(){return new oe(this)},toSeq:function(){return a(this)?this.toIndexedSeq():s(this)?this.toKeyedSeq():this.toSetSeq()},toStack:function(){return Ye(s(this)?this.valueSeq():this)},toList:function(){return jt(s(this)?this.valueSeq():this)},toString:function(){return"[Iterable]"},__toString:function(t,e){return 0===this.size?t+e:t+" "+this.toSeq().map(this.__toStringMapper).join(", ")+" "+e},concat:function(){return we(this,ye(this,un.call(arguments,0)))},includes:function(t){return this.some(function(e){return H(e,t)})},entries:function(){return this.__iterator(En)},every:function(t,e){ht(this.size);var n=!0;return this.__iterate(function(r,i,o){if(!t.call(e,r,i,o))return n=!1,!1}),n},filter:function(t,e){return we(this,he(this,t,e,!0))},find:function(t,e,n){var r=this.findEntry(t,e);return r?r[1]:n},forEach:function(t,e){return ht(this.size),this.__iterate(e?t.bind(e):t)},join:function(t){ht(this.size),t=void 0!==t?""+t:",";var e="",n=!0;return this.__iterate(function(r){n?n=!1:e+=t,e+=null!==r&&void 0!==r?r.toString():""}),e},keys:function(){return this.__iterator(gn)},map:function(t,e){return we(this,ue(this,t,e))},reduce:function(t,e,n){ht(this.size);var r,i;return arguments.length<2?i=!0:r=e,this.__iterate(function(e,o,s){i?(i=!1,r=e):r=t.call(n,r,e,o,s)}),r},reduceRight:function(t,e,n){var r=this.toKeyedSeq().reverse();return r.reduce.apply(r,arguments)},reverse:function(){return we(this,ce(this,!0))},slice:function(t,e){return we(this,fe(this,t,e,!0))},some:function(t,e){return!this.every(Qe(t),e)},sort:function(t){return we(this,De(this,t))},values:function(){return this.__iterator(Dn)},butLast:function(){return this.slice(0,-1)},isEmpty:function(){return void 0!==this.size?0===this.size:!this.some(function(){return!0})},count:function(t,e){return d(t?this.toSeq().filter(t,e):this)},countBy:function(t,e){return le(this,t,e)},equals:function(t){return V(this,t)},entrySeq:function(){var t=this;if(t._cache)return new M(t._cache);var e=t.toSeq().map(Ze).toIndexedSeq();return e.fromEntrySeq=function(){return t.toSeq()},e},filterNot:function(t,e){return this.filter(Qe(t),e)},findEntry:function(t,e,n){var r=n;return this.__iterate(function(n,i,o){if(t.call(e,n,i,o))return r=[i,n],!1}),r},findKey:function(t,e){var n=this.findEntry(t,e);return n&&n[0]},findLast:function(t,e,n){return this.toKeyedSeq().reverse().find(t,e,n)},findLastEntry:function(t,e,n){return this.toKeyedSeq().reverse().findEntry(t,e,n)},findLastKey:function(t,e){return this.toKeyedSeq().reverse().findKey(t,e)},first:function(){return this.find(y)},flatMap:function(t,e){return we(this,xe(this,t,e))},flatten:function(t){return we(this,ve(this,t,!0))},fromEntrySeq:function(){return new se(this)},get:function(t,e){return this.find(function(e,n){return H(n,t)},void 0,e)},getIn:function(t,e){for(var n,r=this,i=Te(t);!(n=i.next()).done;){var o=n.value;if((r=r&&r.get?r.get(o,yn):yn)===yn)return e}return r},groupBy:function(t,e){return pe(this,t,e)},has:function(t){return this.get(t,yn)!==yn},hasIn:function(t){return this.getIn(t,yn)!==yn},isSubset:function(t){return t="function"==typeof t.includes?t:e(t),this.every(function(e){return t.includes(e)})},isSuperset:function(t){return t="function"==typeof t.isSubset?t:e(t),t.isSubset(this)},keyOf:function(t){return this.findKey(function(e){return H(e,t)})},keySeq:function(){return this.toSeq().map($e).toIndexedSeq()},last:function(){return this.toSeq().reverse().first()},lastKeyOf:function(t){return this.toKeyedSeq().reverse().keyOf(t)},max:function(t){return Ee(this,t)},maxBy:function(t,e){return Ee(this,e,t)},min:function(t){return Ee(this,t?tn(t):rn)},minBy:function(t,e){return Ee(this,e?tn(e):rn,t)},rest:function(){return this.slice(1)},skip:function(t){return this.slice(Math.max(0,t))},skipLast:function(t){return we(this,this.toSeq().reverse().skip(t).reverse())},skipWhile:function(t,e){return we(this,me(this,t,e,!0))},skipUntil:function(t,e){return this.skipWhile(Qe(t),e)},sortBy:function(t,e){return we(this,De(this,e,t))},take:function(t){return this.slice(0,Math.max(0,t))},takeLast:function(t){return we(this,this.toSeq().reverse().take(t).reverse())},takeWhile:function(t,e){return we(this,de(this,t,e))},takeUntil:function(t,e){return this.takeWhile(Qe(t),e)},valueSeq:function(){return this.toIndexedSeq()},hashCode:function(){return this.__hash||(this.__hash=on(this))}});var sr=e.prototype;sr[cn]=!0,sr[wn]=sr.values,sr.__toJS=sr.toArray,sr.__toStringMapper=en,sr.inspect=sr.toSource=function(){return this.toString()},sr.chain=sr.flatMap,sr.contains=sr.includes,Ve(n,{flip:function(){return we(this,ae(this))},mapEntries:function(t,e){var n=this,r=0;return we(this,this.toSeq().map(function(i,o){return t.call(e,[o,i],r++,n)}).fromEntrySeq())},mapKeys:function(t,e){var n=this;return we(this,this.toSeq().flip().map(function(r,i){return t.call(e,r,i,n)}).flip())}});var ar=n.prototype;return ar[hn]=!0,ar[wn]=sr.entries,ar.__toJS=sr.toObject,ar.__toStringMapper=function(t,e){return JSON.stringify(e)+": "+en(t)},Ve(r,{toKeyedSeq:function(){return new re(this,!1)},filter:function(t,e){return we(this,he(this,t,e,!1))},findIndex:function(t,e){var n=this.findEntry(t,e);return n?n[0]:-1},indexOf:function(t){var e=this.keyOf(t);return void 0===e?-1:e},lastIndexOf:function(t){var e=this.lastKeyOf(t);return void 0===e?-1:e},reverse:function(){return we(this,ce(this,!1))},slice:function(t,e){return we(this,fe(this,t,e,!1))},splice:function(t,e){var n=arguments.length;if(e=Math.max(0|e,0),0===n||2===n&&!e)return this;t=x(t,t<0?this.count():this.size);var r=this.slice(0,t);return we(this,1===n?r:r.concat(f(arguments,2),this.slice(t+e)))},findLastIndex:function(t,e){var n=this.findLastEntry(t,e);return n?n[0]:-1},first:function(){return this.get(0)},flatten:function(t){return we(this,ve(this,t,!1))},get:function(t,e){return t=m(this,t),t<0||this.size===1/0||void 0!==this.size&&t>this.size?e:this.find(function(e,n){return n===t},void 0,e)},has:function(t){return(t=m(this,t))>=0&&(void 0!==this.size?this.size===1/0||t<this.size:-1!==this.indexOf(t))},interpose:function(t){return we(this,ge(this,t))},interleave:function(){var t=[this].concat(f(arguments)),e=Se(this.toSeq(),T.of,t),n=e.flatten(!0);return e.size&&(n.size=e.size*t.length),we(this,n)},keySeq:function(){return Q(0,this.size)},last:function(){return this.get(-1)},skipWhile:function(t,e){return we(this,me(this,t,e,!1))},zip:function(){return we(this,Se(this,nn,[this].concat(f(arguments))))},zipWith:function(t){var e=f(arguments);return e[0]=this,we(this,Se(this,t,e))}}),r.prototype[ln]=!0,r.prototype[pn]=!0,Ve(i,{get:function(t,e){return this.has(t)?t:e},includes:function(t){return this.has(t)},keySeq:function(){return this.valueSeq()}}),i.prototype.has=sr.includes,i.prototype.contains=i.prototype.includes,Ve(I,n.prototype),Ve(T,r.prototype),Ve(B,i.prototype),Ve(et,n.prototype),Ve(nt,r.prototype),Ve(rt,i.prototype),{Iterable:e,Seq:k,Collection:tt,Map:lt,OrderedMap:Zt,List:jt,Stack:Ye,Set:Re,OrderedSet:Je,Record:Be,Range:Q,Repeat:$,is:H,fromJS:K}})},function(t,e){var n={}.toString;t.exports=Array.isArray||function(t){return"[object Array]"==n.call(t)}},function(t,e,n){"use strict";var r=n(236);t.exports=r},function(t,e,n){"use strict";function r(t){return function(){throw new Error("Function "+t+" is deprecated and cannot be used.")}}var i=n(238),o=n(237);t.exports.Type=n(0),t.exports.Schema=n(24),t.exports.FAILSAFE_SCHEMA=n(71),t.exports.JSON_SCHEMA=n(111),t.exports.CORE_SCHEMA=n(110),t.exports.DEFAULT_SAFE_SCHEMA=n(34),t.exports.DEFAULT_FULL_SCHEMA=n(47),t.exports.load=i.load,t.exports.loadAll=i.loadAll,t.exports.safeLoad=i.safeLoad,t.exports.safeLoadAll=i.safeLoadAll,t.exports.dump=o.dump,t.exports.safeDump=o.safeDump,t.exports.YAMLException=n(33),t.exports.MINIMAL_SCHEMA=n(71),t.exports.SAFE_SCHEMA=n(34),t.exports.DEFAULT_SCHEMA=n(47),t.exports.scan=r("scan"),t.exports.parse=r("parse"),t.exports.compose=r("compose"),t.exports.addConstructor=r("addConstructor")},function(t,e,n){"use strict";function r(t,e){var n,r,i,o,s,a,u;if(null===e)return{};for(n={},r=Object.keys(e),i=0,o=r.length;i<o;i+=1)s=r[i],a=String(e[s]),"!!"===s.slice(0,2)&&(s="tag:yaml.org,2002:"+s.slice(2)),u=t.compiledTypeMap.fallback[s],u&&N.call(u.styleAliases,a)&&(a=u.styleAliases[a]),n[s]=a;return n}function i(t){var e,n,r;if(e=t.toString(16).toUpperCase(),t<=255)n="x",r=2;else if(t<=65535)n="u",r=4;else{if(!(t<=4294967295))throw new T("code point within a string may not be greater than 0xFFFFFFFF");n="U",r=8}return"\\"+n+I.repeat("0",r-e.length)+e}function o(t){this.schema=t.schema||B,this.indent=Math.max(1,t.indent||2),this.skipInvalid=t.skipInvalid||!1,this.flowLevel=I.isNothing(t.flowLevel)?-1:t.flowLevel,this.styleMap=r(this.schema,t.styles||null),this.sortKeys=t.sortKeys||!1,this.lineWidth=t.lineWidth||80,this.noRefs=t.noRefs||!1,this.noCompatMode=t.noCompatMode||!1,this.condenseFlow=t.condenseFlow||!1,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function s(t,e){for(var n,r=I.repeat(" ",e),i=0,o=-1,s="",a=t.length;i<a;)o=t.indexOf("\n",i),-1===o?(n=t.slice(i),i=a):(n=t.slice(i,o+1),i=o+1),n.length&&"\n"!==n&&(s+=r),s+=n;return s}function a(t,e){return"\n"+I.repeat(" ",t.indent*e)}function u(t,e){var n,r,i;for(n=0,r=t.implicitTypes.length;n<r;n+=1)if(i=t.implicitTypes[n],i.resolve(e))return!0;return!1}function c(t){return t===U||t===O}function h(t){return 32<=t&&t<=126||161<=t&&t<=55295&&8232!==t&&8233!==t||57344<=t&&t<=65533&&65279!==t||65536<=t&&t<=1114111}function l(t){return h(t)&&65279!==t&&t!==Y&&t!==Z&&t!==Q&&t!==et&&t!==rt&&t!==G&&t!==z}function p(t){return h(t)&&65279!==t&&!c(t)&&t!==W&&t!==V&&t!==G&&t!==Y&&t!==Z&&t!==Q&&t!==et&&t!==rt&&t!==z&&t!==X&&t!==K&&t!==j&&t!==nt&&t!==H&&t!==q&&t!==L&&t!==J&&t!==$&&t!==tt}function f(t,e,n,r,i){var o,s,a=!1,u=!1,f=-1!==r,d=-1,m=p(t.charCodeAt(0))&&!c(t.charCodeAt(t.length-1));if(e)for(o=0;o<t.length;o++){if(s=t.charCodeAt(o),!h(s))return ht;m=m&&l(s)}else{for(o=0;o<t.length;o++){if((s=t.charCodeAt(o))===R)a=!0,f&&(u=u||o-d-1>r&&" "!==t[d+1],d=o);else if(!h(s))return ht;m=m&&l(s)}u=u||f&&o-d-1>r&&" "!==t[d+1]}return a||u?" "===t[0]&&n>9?ht:u?ct:ut:m&&!i(t)?st:at}function d(t,e,n,r){t.dump=function(){function i(e){return u(t,e)}if(0===e.length)return"''";if(!t.noCompatMode&&-1!==ot.indexOf(e))return"'"+e+"'";var o=t.indent*Math.max(1,n),a=-1===t.lineWidth?-1:Math.max(Math.min(t.lineWidth,40),t.lineWidth-o),c=r||t.flowLevel>-1&&n>=t.flowLevel;switch(f(e,c,t.indent,a,i)){case st:return e;case at:return"'"+e.replace(/'/g,"''")+"'";case ut:return"|"+m(e,t.indent)+y(s(e,o));case ct:return">"+m(e,t.indent)+y(s(v(e,a),o));case ht:return'"'+g(e)+'"';default:throw new T("impossible error: invalid scalar style")}}()}function m(t,e){var n=" "===t[0]?String(e):"",r="\n"===t[t.length-1];return n+(!r||"\n"!==t[t.length-2]&&"\n"!==t?r?"":"-":"+")+"\n"}function y(t){return"\n"===t[t.length-1]?t.slice(0,-1):t}function v(t,e){for(var n,r,i=/(\n+)([^\n]*)/g,o=function(){var n=t.indexOf("\n");return n=-1!==n?n:t.length,i.lastIndex=n,x(t.slice(0,n),e)}(),s="\n"===t[0]||" "===t[0];r=i.exec(t);){var a=r[1],u=r[2];n=" "===u[0],o+=a+(s||n||""===u?"":"\n")+x(u,e),s=n}return o}function x(t,e){if(""===t||" "===t[0])return t;for(var n,r,i=/ [^ ]/g,o=0,s=0,a=0,u="";n=i.exec(t);)a=n.index,a-o>e&&(r=s>o?s:a,u+="\n"+t.slice(o,r),o=r+1),s=a;return u+="\n",t.length-o>e&&s>o?u+=t.slice(o,s)+"\n"+t.slice(s+1):u+=t.slice(o),u.slice(1)}function g(t){for(var e,n,r,o="",s=0;s<t.length;s++)e=t.charCodeAt(s),e>=55296&&e<=56319&&(n=t.charCodeAt(s+1))>=56320&&n<=57343?(o+=i(1024*(e-55296)+n-56320+65536),s++):(r=it[e],o+=!r&&h(e)?t[s]:r||i(e));return o}function D(t,e,n){var r,i,o="",s=t.tag;for(r=0,i=n.length;r<i;r+=1)C(t,e,n[r],!1,!1)&&(0!==r&&(o+=","+(t.condenseFlow?"":" ")),o+=t.dump);t.tag=s,t.dump="["+o+"]"}function E(t,e,n,r){var i,o,s="",u=t.tag;for(i=0,o=n.length;i<o;i+=1)C(t,e+1,n[i],!0,!0)&&(r&&0===i||(s+=a(t,e)),t.dump&&R===t.dump.charCodeAt(0)?s+="-":s+="- ",s+=t.dump);t.tag=u,t.dump=s||"[]"}function A(t,e,n){var r,i,o,s,a,u="",c=t.tag,h=Object.keys(n);for(r=0,i=h.length;r<i;r+=1)a=t.condenseFlow?'"':"",0!==r&&(a+=", "),o=h[r],s=n[o],C(t,e,o,!1,!1)&&(t.dump.length>1024&&(a+="? "),a+=t.dump+(t.condenseFlow?'"':"")+":"+(t.condenseFlow?"":" "),C(t,e,s,!1,!1)&&(a+=t.dump,u+=a));t.tag=c,t.dump="{"+u+"}"}function S(t,e,n,r){var i,o,s,u,c,h,l="",p=t.tag,f=Object.keys(n);if(!0===t.sortKeys)f.sort();else if("function"==typeof t.sortKeys)f.sort(t.sortKeys);else if(t.sortKeys)throw new T("sortKeys must be a boolean or a function");for(i=0,o=f.length;i<o;i+=1)h="",r&&0===i||(h+=a(t,e)),s=f[i],u=n[s],C(t,e+1,s,!0,!0,!0)&&(c=null!==t.tag&&"?"!==t.tag||t.dump&&t.dump.length>1024,c&&(t.dump&&R===t.dump.charCodeAt(0)?h+="?":h+="? "),h+=t.dump,c&&(h+=a(t,e)),C(t,e+1,u,!0,c)&&(t.dump&&R===t.dump.charCodeAt(0)?h+=":":h+=": ",h+=t.dump,l+=h));t.tag=p,t.dump=l||"{}"}function w(t,e,n){var r,i,o,s,a,u;for(i=n?t.explicitTypes:t.implicitTypes,o=0,s=i.length;o<s;o+=1)if(a=i[o],(a.instanceOf||a.predicate)&&(!a.instanceOf||"object"==typeof e&&e instanceof a.instanceOf)&&(!a.predicate||a.predicate(e))){if(t.tag=n?a.tag:"?",a.represent){if(u=t.styleMap[a.tag]||a.defaultStyle,"[object Function]"===P.call(a.represent))r=a.represent(e,u);else{if(!N.call(a.represent,u))throw new T("!<"+a.tag+'> tag resolver accepts not "'+u+'" style');r=a.represent[u](e,u)}t.dump=r}return!0}return!1}function C(t,e,n,r,i,o){t.tag=null,t.dump=n,w(t,n,!1)||w(t,n,!0);var s=P.call(t.dump);r&&(r=t.flowLevel<0||t.flowLevel>e);var a,u,c="[object Object]"===s||"[object Array]"===s;if(c&&(a=t.duplicates.indexOf(n),u=-1!==a),(null!==t.tag&&"?"!==t.tag||u||2!==t.indent&&e>0)&&(i=!1),u&&t.usedDuplicates[a])t.dump="*ref_"+a;else{if(c&&u&&!t.usedDuplicates[a]&&(t.usedDuplicates[a]=!0),"[object Object]"===s)r&&0!==Object.keys(t.dump).length?(S(t,e,t.dump,i),u&&(t.dump="&ref_"+a+t.dump)):(A(t,e,t.dump),u&&(t.dump="&ref_"+a+" "+t.dump));else if("[object Array]"===s)r&&0!==t.dump.length?(E(t,e,t.dump,i),u&&(t.dump="&ref_"+a+t.dump)):(D(t,e,t.dump),u&&(t.dump="&ref_"+a+" "+t.dump));else{if("[object String]"!==s){if(t.skipInvalid)return!1;throw new T("unacceptable kind of an object to dump "+s)}"?"!==t.tag&&d(t,t.dump,e,o)}null!==t.tag&&"?"!==t.tag&&(t.dump="!<"+t.tag+"> "+t.dump)}return!0}function _(t,e){var n,r,i=[],o=[];for(b(t,i,o),n=0,r=o.length;n<r;n+=1)e.duplicates.push(i[o[n]]);e.usedDuplicates=new Array(r)}function b(t,e,n){var r,i,o;if(null!==t&&"object"==typeof t)if(-1!==(i=e.indexOf(t)))-1===n.indexOf(i)&&n.push(i);else if(e.push(t),Array.isArray(t))for(i=0,o=t.length;i<o;i+=1)b(t[i],e,n);else for(r=Object.keys(t),i=0,o=r.length;i<o;i+=1)b(t[r[i]],e,n)}function F(t,e){e=e||{};var n=new o(e);return n.noRefs||_(t,n),C(n,0,t,!0,!0)?n.dump+"\n":""}function k(t,e){return F(t,I.extend({schema:M},e))}var I=n(23),T=n(33),B=n(47),M=n(34),P=Object.prototype.toString,N=Object.prototype.hasOwnProperty,O=9,R=10,U=32,j=33,L=34,z=35,J=37,X=38,q=39,K=42,Y=44,W=45,G=58,H=62,V=63,$=64,Z=91,Q=93,tt=96,et=123,nt=124,rt=125,it={};it[0]="\\0",it[7]="\\a",it[8]="\\b",it[9]="\\t",it[10]="\\n",it[11]="\\v",it[12]="\\f",it[13]="\\r",it[27]="\\e",it[34]='\\"',it[92]="\\\\",it[133]="\\N",it[160]="\\_",it[8232]="\\L",it[8233]="\\P";var ot=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"],st=1,at=2,ut=3,ct=4,ht=5;t.exports.dump=F,t.exports.safeDump=k},function(t,e,n){"use strict";function r(t){return 10===t||13===t}function i(t){return 9===t||32===t}function o(t){return 9===t||32===t||10===t||13===t}function s(t){return 44===t||91===t||93===t||123===t||125===t}function a(t){var e;return 48<=t&&t<=57?t-48:(e=32|t,97<=e&&e<=102?e-97+10:-1)}function u(t){return 120===t?2:117===t?4:85===t?8:0}function c(t){return 48<=t&&t<=57?t-48:-1}function h(t){return 48===t?"\0":97===t?"":98===t?"\b":116===t?"\t":9===t?"\t":110===t?"\n":118===t?"\v":102===t?"\f":114===t?"\r":101===t?"":32===t?" ":34===t?'"':47===t?"/":92===t?"\\":78===t?"…":95===t?" ":76===t?"\u2028":80===t?"\u2029":""}function l(t){return t<=65535?String.fromCharCode(t):String.fromCharCode(55296+(t-65536>>10),56320+(t-65536&1023))}function p(t,e){this.input=t,this.filename=e.filename||null,this.schema=e.schema||q,this.onWarning=e.onWarning||null,this.legacy=e.legacy||!1,this.json=e.json||!1,this.listener=e.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=t.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.documents=[]}function f(t,e){return new z(e,new J(t.filename,t.input,t.position,t.line,t.position-t.lineStart))}function d(t,e){throw f(t,e)}function m(t,e){t.onWarning&&t.onWarning.call(null,f(t,e))}function y(t,e,n,r){var i,o,s,a;if(e<n){if(a=t.input.slice(e,n),r)for(i=0,o=a.length;i<o;i+=1)9===(s=a.charCodeAt(i))||32<=s&&s<=1114111||d(t,"expected valid JSON character");else Q.test(a)&&d(t,"the stream contains non-printable characters");t.result+=a}}function v(t,e,n,r){var i,o,s,a;for(L.isObject(n)||d(t,"cannot merge mappings; the provided source object is unacceptable"),i=Object.keys(n),s=0,a=i.length;s<a;s+=1)o=i[s],K.call(e,o)||(e[o]=n[o],r[o]=!0)}function x(t,e,n,r,i,o,s,a){var u,c;if(i=String(i),null===e&&(e={}),"tag:yaml.org,2002:merge"===r)if(Array.isArray(o))for(u=0,c=o.length;u<c;u+=1)v(t,e,o[u],n);else v(t,e,o,n);else t.json||K.call(n,i)||!K.call(e,i)||(t.line=s||t.line,t.position=a||t.position,d(t,"duplicated mapping key")),e[i]=o,delete n[i];return e}function g(t){var e;e=t.input.charCodeAt(t.position),10===e?t.position++:13===e?(t.position++,10===t.input.charCodeAt(t.position)&&t.position++):d(t,"a line break is expected"),t.line+=1,t.lineStart=t.position}function D(t,e,n){for(var o=0,s=t.input.charCodeAt(t.position);0!==s;){for(;i(s);)s=t.input.charCodeAt(++t.position);if(e&&35===s)do{s=t.input.charCodeAt(++t.position)}while(10!==s&&13!==s&&0!==s);if(!r(s))break;for(g(t),s=t.input.charCodeAt(t.position),o++,t.lineIndent=0;32===s;)t.lineIndent++,s=t.input.charCodeAt(++t.position)}return-1!==n&&0!==o&&t.lineIndent<n&&m(t,"deficient indentation"),o}function E(t){var e,n=t.position;return!(45!==(e=t.input.charCodeAt(n))&&46!==e||e!==t.input.charCodeAt(n+1)||e!==t.input.charCodeAt(n+2)||(n+=3,0!==(e=t.input.charCodeAt(n))&&!o(e)))}function A(t,e){1===e?t.result+=" ":e>1&&(t.result+=L.repeat("\n",e-1))}function S(t,e,n){var a,u,c,h,l,p,f,d,m,v=t.kind,x=t.result;if(m=t.input.charCodeAt(t.position),o(m)||s(m)||35===m||38===m||42===m||33===m||124===m||62===m||39===m||34===m||37===m||64===m||96===m)return!1;if((63===m||45===m)&&(u=t.input.charCodeAt(t.position+1),o(u)||n&&s(u)))return!1;for(t.kind="scalar",t.result="",c=h=t.position,l=!1;0!==m;){if(58===m){if(u=t.input.charCodeAt(t.position+1),o(u)||n&&s(u))break}else if(35===m){if(a=t.input.charCodeAt(t.position-1),o(a))break}else{if(t.position===t.lineStart&&E(t)||n&&s(m))break;if(r(m)){if(p=t.line,f=t.lineStart,d=t.lineIndent,D(t,!1,-1),t.lineIndent>=e){l=!0,m=t.input.charCodeAt(t.position);continue}t.position=h,t.line=p,t.lineStart=f,t.lineIndent=d;break}}l&&(y(t,c,h,!1),A(t,t.line-p),c=h=t.position,l=!1),i(m)||(h=t.position+1),m=t.input.charCodeAt(++t.position)}return y(t,c,h,!1),!!t.result||(t.kind=v,t.result=x,!1)}function w(t,e){var n,i,o;if(39!==(n=t.input.charCodeAt(t.position)))return!1;for(t.kind="scalar",t.result="",t.position++,i=o=t.position;0!==(n=t.input.charCodeAt(t.position));)if(39===n){if(y(t,i,t.position,!0),39!==(n=t.input.charCodeAt(++t.position)))return!0;i=t.position,t.position++,o=t.position}else r(n)?(y(t,i,o,!0),A(t,D(t,!1,e)),i=o=t.position):t.position===t.lineStart&&E(t)?d(t,"unexpected end of the document within a single quoted scalar"):(t.position++,o=t.position);d(t,"unexpected end of the stream within a single quoted scalar")}function C(t,e){var n,i,o,s,c,h;if(34!==(h=t.input.charCodeAt(t.position)))return!1;for(t.kind="scalar",t.result="",t.position++,n=i=t.position;0!==(h=t.input.charCodeAt(t.position));){if(34===h)return y(t,n,t.position,!0),t.position++,!0;if(92===h){if(y(t,n,t.position,!0),h=t.input.charCodeAt(++t.position),r(h))D(t,!1,e);else if(h<256&&it[h])t.result+=ot[h],t.position++;else if((c=u(h))>0){for(o=c,s=0;o>0;o--)h=t.input.charCodeAt(++t.position),(c=a(h))>=0?s=(s<<4)+c:d(t,"expected hexadecimal character");t.result+=l(s),t.position++}else d(t,"unknown escape sequence");n=i=t.position}else r(h)?(y(t,n,i,!0),A(t,D(t,!1,e)),n=i=t.position):t.position===t.lineStart&&E(t)?d(t,"unexpected end of the document within a double quoted scalar"):(t.position++,i=t.position)}d(t,"unexpected end of the stream within a double quoted scalar")}function _(t,e){var n,r,i,s,a,u,c,h,l,p,f,m=!0,y=t.tag,v=t.anchor,g={};if(91===(f=t.input.charCodeAt(t.position)))s=93,c=!1,r=[];else{if(123!==f)return!1;s=125,c=!0,r={}}for(null!==t.anchor&&(t.anchorMap[t.anchor]=r),f=t.input.charCodeAt(++t.position);0!==f;){if(D(t,!0,e),(f=t.input.charCodeAt(t.position))===s)return t.position++,t.tag=y,t.anchor=v,t.kind=c?"mapping":"sequence",t.result=r,!0;m||d(t,"missed comma between flow collection entries"),l=h=p=null,a=u=!1,63===f&&(i=t.input.charCodeAt(t.position+1),o(i)&&(a=u=!0,t.position++,D(t,!0,e))),n=t.line,M(t,e,Y,!1,!0),l=t.tag,h=t.result,D(t,!0,e),f=t.input.charCodeAt(t.position),!u&&t.line!==n||58!==f||(a=!0,f=t.input.charCodeAt(++t.position),D(t,!0,e),M(t,e,Y,!1,!0),p=t.result),c?x(t,r,g,l,h,p):a?r.push(x(t,null,g,l,h,p)):r.push(h),D(t,!0,e),f=t.input.charCodeAt(t.position),44===f?(m=!0,f=t.input.charCodeAt(++t.position)):m=!1}d(t,"unexpected end of the stream within a flow collection")}function b(t,e){var n,o,s,a,u=V,h=!1,l=!1,p=e,f=0,m=!1;if(124===(a=t.input.charCodeAt(t.position)))o=!1;else{if(62!==a)return!1;o=!0}for(t.kind="scalar",t.result="";0!==a;)if(43===(a=t.input.charCodeAt(++t.position))||45===a)V===u?u=43===a?Z:$:d(t,"repeat of a chomping mode identifier");else{if(!((s=c(a))>=0))break;0===s?d(t,"bad explicit indentation width of a block scalar; it cannot be less than one"):l?d(t,"repeat of an indentation width identifier"):(p=e+s-1,l=!0)}if(i(a)){do{a=t.input.charCodeAt(++t.position)}while(i(a));if(35===a)do{a=t.input.charCodeAt(++t.position)}while(!r(a)&&0!==a)}for(;0!==a;){for(g(t),t.lineIndent=0,a=t.input.charCodeAt(t.position);(!l||t.lineIndent<p)&&32===a;)t.lineIndent++,a=t.input.charCodeAt(++t.position);if(!l&&t.lineIndent>p&&(p=t.lineIndent),r(a))f++;else{if(t.lineIndent<p){u===Z?t.result+=L.repeat("\n",h?1+f:f):u===V&&h&&(t.result+="\n");break}for(o?i(a)?(m=!0,t.result+=L.repeat("\n",h?1+f:f)):m?(m=!1,t.result+=L.repeat("\n",f+1)):0===f?h&&(t.result+=" "):t.result+=L.repeat("\n",f):t.result+=L.repeat("\n",h?1+f:f),h=!0,l=!0,f=0,n=t.position;!r(a)&&0!==a;)a=t.input.charCodeAt(++t.position);y(t,n,t.position,!1)}}return!0}function F(t,e){var n,r,i,s=t.tag,a=t.anchor,u=[],c=!1;for(null!==t.anchor&&(t.anchorMap[t.anchor]=u),i=t.input.charCodeAt(t.position);0!==i&&45===i&&(r=t.input.charCodeAt(t.position+1),o(r));)if(c=!0,t.position++,D(t,!0,-1)&&t.lineIndent<=e)u.push(null),i=t.input.charCodeAt(t.position);else if(n=t.line,M(t,e,G,!1,!0),u.push(t.result),D(t,!0,-1),i=t.input.charCodeAt(t.position),(t.line===n||t.lineIndent>e)&&0!==i)d(t,"bad indentation of a sequence entry");else if(t.lineIndent<e)break;return!!c&&(t.tag=s,t.anchor=a,t.kind="sequence",t.result=u,!0)}function k(t,e,n){var r,s,a,u,c,h=t.tag,l=t.anchor,p={},f={},m=null,y=null,v=null,g=!1,E=!1;for(null!==t.anchor&&(t.anchorMap[t.anchor]=p),c=t.input.charCodeAt(t.position);0!==c;){if(r=t.input.charCodeAt(t.position+1),a=t.line,u=t.position,63!==c&&58!==c||!o(r)){if(!M(t,n,W,!1,!0))break;if(t.line===a){for(c=t.input.charCodeAt(t.position);i(c);)c=t.input.charCodeAt(++t.position);if(58===c)c=t.input.charCodeAt(++t.position),o(c)||d(t,"a whitespace character is expected after the key-value separator within a block mapping"),g&&(x(t,p,f,m,y,null),m=y=v=null),E=!0,g=!1,s=!1,m=t.tag,y=t.result;else{if(!E)return t.tag=h,t.anchor=l,!0;d(t,"can not read an implicit mapping pair; a colon is missed")}}else{if(!E)return t.tag=h,t.anchor=l,!0;d(t,"can not read a block mapping entry; a multiline key may not be an implicit key")}}else 63===c?(g&&(x(t,p,f,m,y,null),m=y=v=null),E=!0,g=!0,s=!0):g?(g=!1,s=!0):d(t,"incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"),t.position+=1,c=r;if((t.line===a||t.lineIndent>e)&&(M(t,e,H,!0,s)&&(g?y=t.result:v=t.result),g||(x(t,p,f,m,y,v,a,u),m=y=v=null),D(t,!0,-1),c=t.input.charCodeAt(t.position)),t.lineIndent>e&&0!==c)d(t,"bad indentation of a mapping entry");else if(t.lineIndent<e)break}return g&&x(t,p,f,m,y,null),E&&(t.tag=h,t.anchor=l,t.kind="mapping",t.result=p),E}function I(t){var e,n,r,i,s=!1,a=!1;if(33!==(i=t.input.charCodeAt(t.position)))return!1;if(null!==t.tag&&d(t,"duplication of a tag property"),i=t.input.charCodeAt(++t.position),60===i?(s=!0,i=t.input.charCodeAt(++t.position)):33===i?(a=!0,n="!!",i=t.input.charCodeAt(++t.position)):n="!",e=t.position,s){do{i=t.input.charCodeAt(++t.position)}while(0!==i&&62!==i);t.position<t.length?(r=t.input.slice(e,t.position),i=t.input.charCodeAt(++t.position)):d(t,"unexpected end of the stream within a verbatim tag")}else{for(;0!==i&&!o(i);)33===i&&(a?d(t,"tag suffix cannot contain exclamation marks"):(n=t.input.slice(e-1,t.position+1),nt.test(n)||d(t,"named tag handle cannot contain such characters"),a=!0,e=t.position+1)),i=t.input.charCodeAt(++t.position);r=t.input.slice(e,t.position),et.test(r)&&d(t,"tag suffix cannot contain flow indicator characters")}return r&&!rt.test(r)&&d(t,"tag name cannot contain such characters: "+r),s?t.tag=r:K.call(t.tagMap,n)?t.tag=t.tagMap[n]+r:"!"===n?t.tag="!"+r:"!!"===n?t.tag="tag:yaml.org,2002:"+r:d(t,'undeclared tag handle "'+n+'"'),!0}function T(t){var e,n;if(38!==(n=t.input.charCodeAt(t.position)))return!1;for(null!==t.anchor&&d(t,"duplication of an anchor property"),n=t.input.charCodeAt(++t.position),e=t.position;0!==n&&!o(n)&&!s(n);)n=t.input.charCodeAt(++t.position);return t.position===e&&d(t,"name of an anchor node must contain at least one character"),t.anchor=t.input.slice(e,t.position),!0}function B(t){var e,n,r;if(42!==(r=t.input.charCodeAt(t.position)))return!1;for(r=t.input.charCodeAt(++t.position),e=t.position;0!==r&&!o(r)&&!s(r);)r=t.input.charCodeAt(++t.position);return t.position===e&&d(t,"name of an alias node must contain at least one character"),n=t.input.slice(e,t.position),t.anchorMap.hasOwnProperty(n)||d(t,'unidentified alias "'+n+'"'),t.result=t.anchorMap[n],D(t,!0,-1),!0}function M(t,e,n,r,i){var o,s,a,u,c,h,l,p,f=1,m=!1,y=!1;if(null!==t.listener&&t.listener("open",t),t.tag=null,t.anchor=null,t.kind=null,t.result=null,o=s=a=H===n||G===n,r&&D(t,!0,-1)&&(m=!0,t.lineIndent>e?f=1:t.lineIndent===e?f=0:t.lineIndent<e&&(f=-1)),1===f)for(;I(t)||T(t);)D(t,!0,-1)?(m=!0,a=o,t.lineIndent>e?f=1:t.lineIndent===e?f=0:t.lineIndent<e&&(f=-1)):a=!1;if(a&&(a=m||i),1!==f&&H!==n||(l=Y===n||W===n?e:e+1,p=t.position-t.lineStart,1===f?a&&(F(t,p)||k(t,p,l))||_(t,l)?y=!0:(s&&b(t,l)||w(t,l)||C(t,l)?y=!0:B(t)?(y=!0,null===t.tag&&null===t.anchor||d(t,"alias node should not have any properties")):S(t,l,Y===n)&&(y=!0,null===t.tag&&(t.tag="?")),null!==t.anchor&&(t.anchorMap[t.anchor]=t.result)):0===f&&(y=a&&F(t,p))),null!==t.tag&&"!"!==t.tag)if("?"===t.tag){for(u=0,c=t.implicitTypes.length;u<c;u+=1)if(h=t.implicitTypes[u],h.resolve(t.result)){t.result=h.construct(t.result),t.tag=h.tag,null!==t.anchor&&(t.anchorMap[t.anchor]=t.result);break}}else K.call(t.typeMap[t.kind||"fallback"],t.tag)?(h=t.typeMap[t.kind||"fallback"][t.tag],null!==t.result&&h.kind!==t.kind&&d(t,"unacceptable node kind for !<"+t.tag+'> tag; it should be "'+h.kind+'", not "'+t.kind+'"'),h.resolve(t.result)?(t.result=h.construct(t.result),null!==t.anchor&&(t.anchorMap[t.anchor]=t.result)):d(t,"cannot resolve a node with !<"+t.tag+"> explicit tag")):d(t,"unknown tag !<"+t.tag+">");return null!==t.listener&&t.listener("close",t),null!==t.tag||null!==t.anchor||y}function P(t){var e,n,s,a,u=t.position,c=!1;for(t.version=null,t.checkLineBreaks=t.legacy,t.tagMap={},t.anchorMap={};0!==(a=t.input.charCodeAt(t.position))&&(D(t,!0,-1),a=t.input.charCodeAt(t.position),!(t.lineIndent>0||37!==a));){for(c=!0,a=t.input.charCodeAt(++t.position),e=t.position;0!==a&&!o(a);)a=t.input.charCodeAt(++t.position);for(n=t.input.slice(e,t.position),s=[],n.length<1&&d(t,"directive name must not be less than one character in length");0!==a;){for(;i(a);)a=t.input.charCodeAt(++t.position);if(35===a){do{a=t.input.charCodeAt(++t.position)}while(0!==a&&!r(a));break}if(r(a))break;for(e=t.position;0!==a&&!o(a);)a=t.input.charCodeAt(++t.position);s.push(t.input.slice(e,t.position))}0!==a&&g(t),K.call(at,n)?at[n](t,n,s):m(t,'unknown document directive "'+n+'"')}if(D(t,!0,-1),0===t.lineIndent&&45===t.input.charCodeAt(t.position)&&45===t.input.charCodeAt(t.position+1)&&45===t.input.charCodeAt(t.position+2)?(t.position+=3,D(t,!0,-1)):c&&d(t,"directives end mark is expected"),M(t,t.lineIndent-1,H,!1,!0),D(t,!0,-1),t.checkLineBreaks&&tt.test(t.input.slice(u,t.position))&&m(t,"non-ASCII line breaks are interpreted as content"),t.documents.push(t.result),t.position===t.lineStart&&E(t))return void(46===t.input.charCodeAt(t.position)&&(t.position+=3,D(t,!0,-1)));t.position<t.length-1&&d(t,"end of the stream or a document separator is expected")}function N(t,e){t=String(t),e=e||{},0!==t.length&&(10!==t.charCodeAt(t.length-1)&&13!==t.charCodeAt(t.length-1)&&(t+="\n"),65279===t.charCodeAt(0)&&(t=t.slice(1)));var n=new p(t,e);for(n.input+="\0";32===n.input.charCodeAt(n.position);)n.lineIndent+=1,n.position+=1;for(;n.position<n.length-1;)P(n);return n.documents}function O(t,e,n){var r,i,o=N(t,n);if("function"!=typeof e)return o;for(r=0,i=o.length;r<i;r+=1)e(o[r])}function R(t,e){var n=N(t,e);if(0!==n.length){if(1===n.length)return n[0];throw new z("expected a single document in the stream, but found more")}}function U(t,e,n){if("function"!=typeof e)return O(t,L.extend({schema:X},n));O(t,e,L.extend({schema:X},n))}function j(t,e){return R(t,L.extend({schema:X},e))}for(var L=n(23),z=n(33),J=n(239),X=n(34),q=n(47),K=Object.prototype.hasOwnProperty,Y=1,W=2,G=3,H=4,V=1,$=2,Z=3,Q=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,tt=/[\x85\u2028\u2029]/,et=/[,\[\]\{\}]/,nt=/^(?:!|!!|![a-z\-]+!)$/i,rt=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i,it=new Array(256),ot=new Array(256),st=0;st<256;st++)it[st]=h(st)?1:0,ot[st]=h(st);var at={YAML:function(t,e,n){var r,i,o;null!==t.version&&d(t,"duplication of %YAML directive"),1!==n.length&&d(t,"YAML directive accepts exactly one argument"),r=/^([0-9]+)\.([0-9]+)$/.exec(n[0]),null===r&&d(t,"ill-formed argument of the YAML directive"),i=parseInt(r[1],10),o=parseInt(r[2],10),1!==i&&d(t,"unacceptable YAML version of the document"),t.version=n[0],t.checkLineBreaks=o<2,1!==o&&2!==o&&m(t,"unsupported YAML version of the document")},TAG:function(t,e,n){var r,i;2!==n.length&&d(t,"TAG directive accepts exactly two arguments"),r=n[0],i=n[1],nt.test(r)||d(t,"ill-formed tag handle (first argument) of the TAG directive"),K.call(t.tagMap,r)&&d(t,'there is a previously declared suffix for "'+r+'" tag handle'),rt.test(i)||d(t,"ill-formed tag prefix (second argument) of the TAG directive"),t.tagMap[r]=i}};t.exports.loadAll=O,t.exports.load=R,t.exports.safeLoadAll=U,t.exports.safeLoad=j},function(t,e,n){"use strict";function r(t,e,n,r,i){this.name=t,this.buffer=e,this.position=n,this.line=r,this.column=i}var i=n(23);r.prototype.getSnippet=function(t,e){var n,r,o,s,a;if(!this.buffer)return null;for(t=t||4,e=e||75,n="",r=this.position;r>0&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(r-1));)if(r-=1,this.position-r>e/2-1){n=" ... ",r+=5;break}for(o="",s=this.position;s<this.buffer.length&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(s));)if((s+=1)-this.position>e/2-1){o=" ... ",s-=5;break}return a=this.buffer.slice(r,s),i.repeat(" ",t)+n+a+o+"\n"+i.repeat(" ",t+this.position-r+n.length)+"^"},r.prototype.toString=function(t){var e,n="";return this.name&&(n+='in "'+this.name+'" '),n+="at line "+(this.line+1)+", column "+(this.column+1),t||(e=this.getSnippet())&&(n+=":\n"+e),n},t.exports=r},function(t,e,n){"use strict";function r(t){if(null===t)return!1;var e,n,r=0,i=t.length,o=c;for(n=0;n<i;n++)if(!((e=o.indexOf(t.charAt(n)))>64)){if(e<0)return!1;r+=6}return r%8==0}function i(t){var e,n,r=t.replace(/[\r\n=]/g,""),i=r.length,o=c,s=0,u=[];for(e=0;e<i;e++)e%4==0&&e&&(u.push(s>>16&255),u.push(s>>8&255),u.push(255&s)),s=s<<6|o.indexOf(r.charAt(e));return n=i%4*6,0===n?(u.push(s>>16&255),u.push(s>>8&255),u.push(255&s)):18===n?(u.push(s>>10&255),u.push(s>>2&255)):12===n&&u.push(s>>4&255),a?a.from?a.from(u):new a(u):u}function o(t){var e,n,r="",i=0,o=t.length,s=c;for(e=0;e<o;e++)e%3==0&&e&&(r+=s[i>>18&63],r+=s[i>>12&63],r+=s[i>>6&63],r+=s[63&i]),i=(i<<8)+t[e];return n=o%3,0===n?(r+=s[i>>18&63],r+=s[i>>12&63],r+=s[i>>6&63],r+=s[63&i]):2===n?(r+=s[i>>10&63],r+=s[i>>4&63],r+=s[i<<2&63],r+=s[64]):1===n&&(r+=s[i>>2&63],r+=s[i<<4&63],r+=s[64],r+=s[64]),r}function s(t){return a&&a.isBuffer(t)}var a;try{a=n(135).Buffer}catch(t){}var u=n(0),c="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r";t.exports=new u("tag:yaml.org,2002:binary",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o})},function(t,e,n){"use strict";function r(t){if(null===t)return!1;var e=t.length;return 4===e&&("true"===t||"True"===t||"TRUE"===t)||5===e&&("false"===t||"False"===t||"FALSE"===t)}function i(t){return"true"===t||"True"===t||"TRUE"===t}function o(t){return"[object Boolean]"===Object.prototype.toString.call(t)}var s=n(0);t.exports=new s("tag:yaml.org,2002:bool",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:{lowercase:function(t){return t?"true":"false"},uppercase:function(t){return t?"TRUE":"FALSE"},camelcase:function(t){return t?"True":"False"}},defaultStyle:"lowercase"})},function(t,e,n){"use strict";function r(t){return null!==t&&!(!c.test(t)||"_"===t[t.length-1])}function i(t){var e,n,r,i;return e=t.replace(/_/g,"").toLowerCase(),n="-"===e[0]?-1:1,i=[],"+-".indexOf(e[0])>=0&&(e=e.slice(1)),".inf"===e?1===n?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:".nan"===e?NaN:e.indexOf(":")>=0?(e.split(":").forEach(function(t){i.unshift(parseFloat(t,10))}),e=0,r=1,i.forEach(function(t){e+=t*r,r*=60}),n*e):n*parseFloat(e,10)}function o(t,e){var n;if(isNaN(t))switch(e){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===t)switch(e){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===t)switch(e){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(a.isNegativeZero(t))return"-0.0";return n=t.toString(10),h.test(n)?n.replace("e",".e"):n}function s(t){return"[object Number]"===Object.prototype.toString.call(t)&&(t%1!=0||a.isNegativeZero(t))}var a=n(23),u=n(0),c=new RegExp("^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$"),h=/^[-+]?[0-9]+e/;t.exports=new u("tag:yaml.org,2002:float",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o,defaultStyle:"lowercase"})},function(t,e,n){"use strict";function r(t){return 48<=t&&t<=57||65<=t&&t<=70||97<=t&&t<=102}function i(t){return 48<=t&&t<=55}function o(t){return 48<=t&&t<=57}function s(t){if(null===t)return!1;var e,n=t.length,s=0,a=!1;if(!n)return!1;if(e=t[s],"-"!==e&&"+"!==e||(e=t[++s]),"0"===e){if(s+1===n)return!0;if("b"===(e=t[++s])){for(s++;s<n;s++)if("_"!==(e=t[s])){if("0"!==e&&"1"!==e)return!1;a=!0}return a&&"_"!==e}if("x"===e){for(s++;s<n;s++)if("_"!==(e=t[s])){if(!r(t.charCodeAt(s)))return!1;a=!0}return a&&"_"!==e}for(;s<n;s++)if("_"!==(e=t[s])){if(!i(t.charCodeAt(s)))return!1;a=!0}return a&&"_"!==e}if("_"===e)return!1;for(;s<n;s++)if("_"!==(e=t[s])){if(":"===e)break;if(!o(t.charCodeAt(s)))return!1;a=!0}return!(!a||"_"===e)&&(":"!==e||/^(:[0-5]?[0-9])+$/.test(t.slice(s)))}function a(t){var e,n,r=t,i=1,o=[];return-1!==r.indexOf("_")&&(r=r.replace(/_/g,"")),e=r[0],"-"!==e&&"+"!==e||("-"===e&&(i=-1),r=r.slice(1),e=r[0]),"0"===r?0:"0"===e?"b"===r[1]?i*parseInt(r.slice(2),2):"x"===r[1]?i*parseInt(r,16):i*parseInt(r,8):-1!==r.indexOf(":")?(r.split(":").forEach(function(t){o.unshift(parseInt(t,10))}),r=0,n=1,o.forEach(function(t){r+=t*n,n*=60}),i*r):i*parseInt(r,10)}function u(t){return"[object Number]"===Object.prototype.toString.call(t)&&t%1==0&&!c.isNegativeZero(t)}var c=n(23),h=n(0);t.exports=new h("tag:yaml.org,2002:int",{kind:"scalar",resolve:s,construct:a,predicate:u,represent:{binary:function(t){return"0b"+t.toString(2)},octal:function(t){return"0"+t.toString(8)},decimal:function(t){return t.toString(10)},hexadecimal:function(t){return"0x"+t.toString(16).toUpperCase()}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}})},function(t,e,n){"use strict";function r(t){if(null===t)return!1;try{var e="("+t+")",n=a.parse(e,{range:!0});return"Program"===n.type&&1===n.body.length&&"ExpressionStatement"===n.body[0].type&&"FunctionExpression"===n.body[0].expression.type}catch(t){return!1}}function i(t){var e,n="("+t+")",r=a.parse(n,{range:!0}),i=[];if("Program"!==r.type||1!==r.body.length||"ExpressionStatement"!==r.body[0].type||"FunctionExpression"!==r.body[0].expression.type)throw new Error("Failed to resolve function");return r.body[0].expression.params.forEach(function(t){i.push(t.name)}),e=r.body[0].expression.body.range,new Function(i,n.slice(e[0]+1,e[1]-1))}function o(t){return t.toString()}function s(t){return"[object Function]"===Object.prototype.toString.call(t)}var a;try{a=n(231)}catch(t){"undefined"!=typeof window&&(a=window.esprima)}var u=n(0);t.exports=new u("tag:yaml.org,2002:js/function",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o})},function(t,e,n){"use strict";function r(t){if(null===t)return!1;if(0===t.length)return!1;var e=t,n=/\/([gim]*)$/.exec(t),r="";if("/"===e[0]){if(n&&(r=n[1]),r.length>3)return!1;if("/"!==e[e.length-r.length-1])return!1}return!0}function i(t){var e=t,n=/\/([gim]*)$/.exec(t),r="";return"/"===e[0]&&(n&&(r=n[1]),e=e.slice(1,e.length-r.length-1)),new RegExp(e,r)}function o(t){var e="/"+t.source+"/";return t.global&&(e+="g"),t.multiline&&(e+="m"),t.ignoreCase&&(e+="i"),e}function s(t){return"[object RegExp]"===Object.prototype.toString.call(t)}var a=n(0);t.exports=new a("tag:yaml.org,2002:js/regexp",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o})},function(t,e,n){"use strict";function r(){return!0}function i(){}function o(){return""}function s(t){return void 0===t}var a=n(0);t.exports=new a("tag:yaml.org,2002:js/undefined",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o})},function(t,e,n){"use strict";var r=n(0);t.exports=new r("tag:yaml.org,2002:map",{kind:"mapping",construct:function(t){return null!==t?t:{}}})},function(t,e,n){"use strict";function r(t){return"<<"===t||null===t}var i=n(0);t.exports=new i("tag:yaml.org,2002:merge",{kind:"scalar",resolve:r})},function(t,e,n){"use strict";function r(t){if(null===t)return!0;var e=t.length;return 1===e&&"~"===t||4===e&&("null"===t||"Null"===t||"NULL"===t)}function i(){return null}function o(t){return null===t}var s=n(0);t.exports=new s("tag:yaml.org,2002:null",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"}},defaultStyle:"lowercase"})},function(t,e,n){"use strict";function r(t){if(null===t)return!0;var e,n,r,i,o,u=[],c=t;for(e=0,n=c.length;e<n;e+=1){if(r=c[e],o=!1,"[object Object]"!==a.call(r))return!1;for(i in r)if(s.call(r,i)){if(o)return!1;o=!0}if(!o)return!1;if(-1!==u.indexOf(i))return!1;u.push(i)}return!0}function i(t){return null!==t?t:[]}var o=n(0),s=Object.prototype.hasOwnProperty,a=Object.prototype.toString;t.exports=new o("tag:yaml.org,2002:omap",{kind:"sequence",resolve:r,construct:i})},function(t,e,n){"use strict";function r(t){if(null===t)return!0;var e,n,r,i,o,a=t;for(o=new Array(a.length),e=0,n=a.length;e<n;e+=1){if(r=a[e],"[object Object]"!==s.call(r))return!1;if(i=Object.keys(r),1!==i.length)return!1;o[e]=[i[0],r[i[0]]]}return!0}function i(t){if(null===t)return[];var e,n,r,i,o,s=t;for(o=new Array(s.length),e=0,n=s.length;e<n;e+=1)r=s[e],i=Object.keys(r),o[e]=[i[0],r[i[0]]];return o}var o=n(0),s=Object.prototype.toString;t.exports=new o("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:r,construct:i})},function(t,e,n){"use strict";var r=n(0);t.exports=new r("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(t){return null!==t?t:[]}})},function(t,e,n){"use strict";function r(t){if(null===t)return!0;var e,n=t;for(e in n)if(s.call(n,e)&&null!==n[e])return!1;return!0}function i(t){return null!==t?t:{}}var o=n(0),s=Object.prototype.hasOwnProperty;t.exports=new o("tag:yaml.org,2002:set",{kind:"mapping",resolve:r,construct:i})},function(t,e,n){"use strict";var r=n(0);t.exports=new r("tag:yaml.org,2002:str",{kind:"scalar",construct:function(t){return null!==t?t:""}})},function(t,e,n){"use strict";function r(t){return null!==t&&(null!==a.exec(t)||null!==u.exec(t))}function i(t){var e,n,r,i,o,s,c,h,l,p,f=0,d=null;if(e=a.exec(t),null===e&&(e=u.exec(t)),null===e)throw new Error("Date resolve error");if(n=+e[1],r=+e[2]-1,i=+e[3],!e[4])return new Date(Date.UTC(n,r,i));if(o=+e[4],s=+e[5],c=+e[6],e[7]){for(f=e[7].slice(0,3);f.length<3;)f+="0";f=+f}return e[9]&&(h=+e[10],l=+(e[11]||0),d=6e4*(60*h+l),"-"===e[9]&&(d=-d)),p=new Date(Date.UTC(n,r,i,o,s,c,f)),d&&p.setTime(p.getTime()-d),p}function o(t){return t.toISOString()}var s=n(0),a=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),u=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");t.exports=new s("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:r,construct:i,instanceOf:Date,represent:o})},function(t,e,n){"use strict";function r(t,e,n,r,i){}t.exports=r},function(t,e,n){"use strict";var r=n(259);t.exports=function(t){return r(t,!1)}},function(t,e,n){"use strict";var r=n(45),i=n(15),o=n(113);t.exports=function(){function t(t,e,n,r,s,a){a!==o&&i(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types")}function e(){return t}t.isRequired=t;var n={array:t,bool:t,func:t,number:t,object:t,string:t,symbol:t,any:t,arrayOf:e,element:t,instanceOf:e,node:t,objectOf:e,oneOf:e,oneOfType:e,shape:e,exact:e};return n.checkPropTypes=r,n.PropTypes=n,n}},function(t,e,n){"use strict";var r=n(45),i=n(15),o=n(46),s=n(35),a=n(113),u=n(256);t.exports=function(t,e){function n(t){var e=t&&(_&&t[_]||t[b]);if("function"==typeof e)return e}function c(t,e){return t===e?0!==t||1/t==1/e:t!==t&&e!==e}function h(t){this.message=t,this.stack=""}function l(t){function n(n,r,o,s,u,c,l){if(s=s||F,c=c||o,l!==a)if(e)i(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use `PropTypes.checkPropTypes()` to call them. Read more at http://fb.me/use-check-prop-types");else;return null==r[o]?n?new h(null===r[o]?"The "+u+" `"+c+"` is marked as required in `"+s+"`, but its value is `null`.":"The "+u+" `"+c+"` is marked as required in `"+s+"`, but its value is `undefined`."):null:t(r,o,s,u,c)}var r=n.bind(null,!1);return r.isRequired=n.bind(null,!0),r}function p(t){function e(e,n,r,i,o,s){var a=e[n];if(A(a)!==t)return new h("Invalid "+i+" `"+o+"` of type `"+S(a)+"` supplied to `"+r+"`, expected `"+t+"`.");return null}return l(e)}function f(t){function e(e,n,r,i,o){if("function"!=typeof t)return new h("Property `"+o+"` of component `"+r+"` has invalid PropType notation inside arrayOf.");var s=e[n];if(!Array.isArray(s)){return new h("Invalid "+i+" `"+o+"` of type `"+A(s)+"` supplied to `"+r+"`, expected an array.")}for(var u=0;u<s.length;u++){var c=t(s,u,r,i,o+"["+u+"]",a);if(c instanceof Error)return c}return null}return l(e)}function d(t){function e(e,n,r,i,o){if(!(e[n]instanceof t)){var s=t.name||F;return new h("Invalid "+i+" `"+o+"` of type `"+C(e[n])+"` supplied to `"+r+"`, expected instance of `"+s+"`.")}return null}return l(e)}function m(t){function e(e,n,r,i,o){for(var s=e[n],a=0;a<t.length;a++)if(c(s,t[a]))return null;return new h("Invalid "+i+" `"+o+"` of value `"+s+"` supplied to `"+r+"`, expected one of "+JSON.stringify(t)+".")}return Array.isArray(t)?l(e):r.thatReturnsNull}function y(t){function e(e,n,r,i,o){if("function"!=typeof t)return new h("Property `"+o+"` of component `"+r+"` has invalid PropType notation inside objectOf.");var s=e[n],u=A(s);if("object"!==u)return new h("Invalid "+i+" `"+o+"` of type `"+u+"` supplied to `"+r+"`, expected an object.");for(var c in s)if(s.hasOwnProperty(c)){var l=t(s,c,r,i,o+"."+c,a);if(l instanceof Error)return l}return null}return l(e)}function v(t){function e(e,n,r,i,o){for(var s=0;s<t.length;s++){if(null==(0,t[s])(e,n,r,i,o,a))return null}return new h("Invalid "+i+" `"+o+"` supplied to `"+r+"`.")}if(!Array.isArray(t))return r.thatReturnsNull;for(var n=0;n<t.length;n++){var i=t[n];if("function"!=typeof i)return o(!1,"Invalid argument supplied to oneOfType. Expected an array of check functions, but received %s at index %s.",w(i),n),r.thatReturnsNull}return l(e)}function x(t){function e(e,n,r,i,o){var s=e[n],u=A(s);if("object"!==u)return new h("Invalid "+i+" `"+o+"` of type `"+u+"` supplied to `"+r+"`, expected `object`.");for(var c in t){var l=t[c];if(l){var p=l(s,c,r,i,o+"."+c,a);if(p)return p}}return null}return l(e)}function g(t){function e(e,n,r,i,o){var u=e[n],c=A(u);if("object"!==c)return new h("Invalid "+i+" `"+o+"` of type `"+c+"` supplied to `"+r+"`, expected `object`.");var l=s({},e[n],t);for(var p in l){var f=t[p];if(!f)return new h("Invalid "+i+" `"+o+"` key `"+p+"` supplied to `"+r+"`.\nBad object: "+JSON.stringify(e[n],null,"  ")+"\nValid keys: "+JSON.stringify(Object.keys(t),null,"  "));var d=f(u,p,r,i,o+"."+p,a);if(d)return d}return null}return l(e)}function D(e){switch(typeof e){case"number":case"string":case"undefined":return!0;case"boolean":return!e;case"object":if(Array.isArray(e))return e.every(D);if(null===e||t(e))return!0;var r=n(e);if(!r)return!1;var i,o=r.call(e);if(r!==e.entries){for(;!(i=o.next()).done;)if(!D(i.value))return!1}else for(;!(i=o.next()).done;){var s=i.value;if(s&&!D(s[1]))return!1}return!0;default:return!1}}function E(t,e){return"symbol"===t||("Symbol"===e["@@toStringTag"]||"function"==typeof Symbol&&e instanceof Symbol)}function A(t){var e=typeof t;return Array.isArray(t)?"array":t instanceof RegExp?"object":E(e,t)?"symbol":e}function S(t){if(void 0===t||null===t)return""+t;var e=A(t);if("object"===e){if(t instanceof Date)return"date";if(t instanceof RegExp)return"regexp"}return e}function w(t){var e=S(t);switch(e){case"array":case"object":return"an "+e;case"boolean":case"date":case"regexp":return"a "+e;default:return e}}function C(t){return t.constructor&&t.constructor.name?t.constructor.name:F}var _="function"==typeof Symbol&&Symbol.iterator,b="@@iterator",F="<<anonymous>>",k={array:p("array"),bool:p("boolean"),func:p("function"),number:p("number"),object:p("object"),string:p("string"),symbol:p("symbol"),any:function(){return l(r.thatReturnsNull)}(),arrayOf:f,element:function(){function e(e,n,r,i,o){var s=e[n];if(!t(s)){return new h("Invalid "+i+" `"+o+"` of type `"+A(s)+"` supplied to `"+r+"`, expected a single ReactElement.")}return null}return l(e)}(),instanceOf:d,node:function(){function t(t,e,n,r,i){return D(t[e])?null:new h("Invalid "+r+" `"+i+"` supplied to `"+n+"`, expected a ReactNode.")}return l(t)}(),objectOf:y,oneOf:m,oneOfType:v,shape:x,exact:g};return h.prototype=Error.prototype,k.checkPropTypes=u,k.PropTypes=k,k}},function(t,e){t.exports='---\nurl: "http://petstore.swagger.io/v2/swagger.json"\ndom_id: "#swagger-ui"\nvalidatorUrl: "https://online.swagger.io/validator"\noauth2RedirectUrl: "http://localhost:3200/oauth2-redirect.html"\n'},function(t,e,n){"use strict";function r(t){var e={"=":"=0",":":"=2"};return"$"+(""+t).replace(/[=:]/g,function(t){return e[t]})}function i(t){var e=/(=0|=2)/g,n={"=0":"=","=2":":"};return(""+("."===t[0]&&"$"===t[1]?t.substring(2):t.substring(1))).replace(e,function(t){return n[t]})}var o={escape:r,unescape:i};t.exports=o},function(t,e,n){"use strict";var r=n(48),i=(n(15),function(t){var e=this;if(e.instancePool.length){var n=e.instancePool.pop();return e.call(n,t),n}return new e(t)}),o=function(t,e){var n=this;if(n.instancePool.length){var r=n.instancePool.pop();return n.call(r,t,e),r}return new n(t,e)},s=function(t,e,n){var r=this;if(r.instancePool.length){var i=r.instancePool.pop();return r.call(i,t,e,n),i}return new r(t,e,n)},a=function(t,e,n,r){var i=this;if(i.instancePool.length){var o=i.instancePool.pop();return i.call(o,t,e,n,r),o}return new i(t,e,n,r)},u=function(t){var e=this;t instanceof e||r("25"),t.destructor(),e.instancePool.length<e.poolSize&&e.instancePool.push(t)},c=i,h=function(t,e){var n=t;return n.instancePool=[],n.getPooled=e||c,n.poolSize||(n.poolSize=10),n.release=u,n},l={addPoolingTo:h,oneArgumentPooler:i,twoArgumentPooler:o,threeArgumentPooler:s,fourArgumentPooler:a};t.exports=l},function(t,e,n){"use strict";var r=n(35),i=n(114),o=n(264),s=n(265),a=n(25),u=n(266),c=n(267),h=n(268),l=n(271),p=a.createElement,f=a.createFactory,d=a.cloneElement,m=r,y=function(t){return t},v={Children:{map:o.map,forEach:o.forEach,count:o.count,toArray:o.toArray,only:l},Component:i.Component,PureComponent:i.PureComponent,createElement:p,cloneElement:d,isValidElement:a.isValidElement,PropTypes:u,createClass:h,createFactory:f,createMixin:y,DOM:s,version:c,__spread:m};t.exports=v},function(t,e,n){"use strict";function r(t){return(""+t).replace(D,"$&/")}function i(t,e){this.func=t,this.context=e,this.count=0}function o(t,e,n){var r=t.func,i=t.context;r.call(i,e,t.count++)}function s(t,e,n){if(null==t)return t;var r=i.getPooled(e,n);v(t,o,r),i.release(r)}function a(t,e,n,r){this.result=t,this.keyPrefix=e,this.func=n,this.context=r,this.count=0}function u(t,e,n){var i=t.result,o=t.keyPrefix,s=t.func,a=t.context,u=s.call(a,e,t.count++);Array.isArray(u)?c(u,i,n,y.thatReturnsArgument):null!=u&&(m.isValidElement(u)&&(u=m.cloneAndReplaceKey(u,o+(!u.key||e&&e.key===u.key?"":r(u.key)+"/")+n)),i.push(u))}function c(t,e,n,i,o){var s="";null!=n&&(s=r(n)+"/");var c=a.getPooled(e,s,i,o);v(t,u,c),a.release(c)}function h(t,e,n){if(null==t)return t;var r=[];return c(t,r,null,e,n),r}function l(t,e,n){return null}function p(t,e){return v(t,l,null)}function f(t){var e=[];return c(t,e,null,y.thatReturnsArgument),e}var d=n(262),m=n(25),y=n(45),v=n(272),x=d.twoArgumentPooler,g=d.fourArgumentPooler,D=/\/+/g;i.prototype.destructor=function(){this.func=null,this.context=null,this.count=0},d.addPoolingTo(i,x),a.prototype.destructor=function(){this.result=null,this.keyPrefix=null,this.func=null,this.context=null,this.count=0},d.addPoolingTo(a,g);var E={forEach:s,map:h,mapIntoWithKeyPrefixInternal:c,count:p,toArray:f};t.exports=E},function(t,e,n){"use strict";var r=n(25),i=r.createFactory,o={a:i("a"),abbr:i("abbr"),address:i("address"),area:i("area"),article:i("article"),aside:i("aside"),audio:i("audio"),b:i("b"),base:i("base"),bdi:i("bdi"),bdo:i("bdo"),big:i("big"),blockquote:i("blockquote"),body:i("body"),br:i("br"),button:i("button"),canvas:i("canvas"),caption:i("caption"),cite:i("cite"),code:i("code"),col:i("col"),colgroup:i("colgroup"),data:i("data"),datalist:i("datalist"),dd:i("dd"),del:i("del"),details:i("details"),dfn:i("dfn"),dialog:i("dialog"),div:i("div"),dl:i("dl"),dt:i("dt"),em:i("em"),embed:i("embed"),fieldset:i("fieldset"),figcaption:i("figcaption"),figure:i("figure"),footer:i("footer"),form:i("form"),h1:i("h1"),h2:i("h2"),h3:i("h3"),h4:i("h4"),h5:i("h5"),h6:i("h6"),head:i("head"),header:i("header"),hgroup:i("hgroup"),hr:i("hr"),html:i("html"),i:i("i"),iframe:i("iframe"),img:i("img"),input:i("input"),ins:i("ins"),kbd:i("kbd"),keygen:i("keygen"),label:i("label"),legend:i("legend"),li:i("li"),link:i("link"),main:i("main"),map:i("map"),mark:i("mark"),menu:i("menu"),menuitem:i("menuitem"),meta:i("meta"),meter:i("meter"),nav:i("nav"),noscript:i("noscript"),object:i("object"),ol:i("ol"),optgroup:i("optgroup"),option:i("option"),output:i("output"),p:i("p"),param:i("param"),picture:i("picture"),pre:i("pre"),progress:i("progress"),q:i("q"),rp:i("rp"),rt:i("rt"),ruby:i("ruby"),s:i("s"),samp:i("samp"),script:i("script"),section:i("section"),select:i("select"),small:i("small"),source:i("source"),span:i("span"),strong:i("strong"),style:i("style"),sub:i("sub"),summary:i("summary"),sup:i("sup"),table:i("table"),tbody:i("tbody"),td:i("td"),textarea:i("textarea"),tfoot:i("tfoot"),th:i("th"),thead:i("thead"),time:i("time"),title:i("title"),tr:i("tr"),track:i("track"),u:i("u"),ul:i("ul"),var:i("var"),video:i("video"),wbr:i("wbr"),circle:i("circle"),clipPath:i("clipPath"),defs:i("defs"),ellipse:i("ellipse"),g:i("g"),image:i("image"),line:i("line"),linearGradient:i("linearGradient"),mask:i("mask"),path:i("path"),pattern:i("pattern"),polygon:i("polygon"),polyline:i("polyline"),radialGradient:i("radialGradient"),rect:i("rect"),stop:i("stop"),svg:i("svg"),text:i("text"),tspan:i("tspan")};t.exports=o},function(t,e,n){"use strict";var r=n(25),i=r.isValidElement,o=n(257);t.exports=o(i)},function(t,e,n){"use strict";t.exports="15.6.2"},function(t,e,n){"use strict";var r=n(114),i=r.Component,o=n(25),s=o.isValidElement,a=n(117),u=n(230);t.exports=u(i,s,a)},function(t,e,n){"use strict";function r(t){var e=t&&(i&&t[i]||t[o]);if("function"==typeof e)return e}var i="function"==typeof Symbol&&Symbol.iterator,o="@@iterator";t.exports=r},function(t,e,n){"use strict";var r=function(){};t.exports=r},function(t,e,n){"use strict";function r(t){return o.isValidElement(t)||i("143"),t}var i=n(48),o=n(25);n(15);t.exports=r},function(t,e,n){"use strict";function r(t,e){return t&&"object"==typeof t&&null!=t.key?c.escape(t.key):e.toString(36)}function i(t,e,n,o){var p=typeof t;if("undefined"!==p&&"boolean"!==p||(t=null),null===t||"string"===p||"number"===p||"object"===p&&t.$$typeof===a)return n(o,t,""===e?h+r(t,0):e),1;var f,d,m=0,y=""===e?h:e+l;if(Array.isArray(t))for(var v=0;v<t.length;v++)f=t[v],d=y+r(f,v),m+=i(f,d,n,o);else{var x=u(t);if(x){var g,D=x.call(t);if(x!==t.entries)for(var E=0;!(g=D.next()).done;)f=g.value,d=y+r(f,E++),m+=i(f,d,n,o);else for(;!(g=D.next()).done;){var A=g.value;A&&(f=A[1],d=y+c.escape(A[0])+l+r(f,0),m+=i(f,d,n,o))}}else if("object"===p){var S="",w=String(t);s("31","[object Object]"===w?"object with keys {"+Object.keys(t).join(", ")+"}":w,S)}}return m}function o(t,e,n){return null==t?0:i(t,"",e,n)}var s=n(48),a=(n(115),n(116)),u=n(269),c=(n(15),n(261)),h=(n(46),"."),l=":";t.exports=o},function(t,e){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAMAAAAM7l6QAAAAYFBMVEUAAABUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwB0lzB/n0BfhxBpjyC0x4////+qv4CJp1D09++ft3C/z5/K16/U379UfwDf58/q79+Ur2D2RCk9AAAAHXRSTlMAEEAwn9//z3Agv4/vYID/////////////////UMeji1kAAAD8SURBVHgBlZMFAoQwDATRxbXB7f+vPKnlXAZn6k2cf3A9z/PfOC8IIYni5FmmABM8FMhwT17c9hnhiZL1CwvEL1tmPD0qSKq6gaStW/kMXanVmAVRDUlH1OvuuTINo6k90Sxf8qsOtF6g4ff1osP3OnMcV7d4pzdIUtu1oA4V0DZoKmxmlEYvtDUjjS3tmKmqB+pYy8pD1VPf7jPE0I40HHcaBwnue6fGzgyS5tXIU96PV7rkDWHNLV0DK4FkoKmFpN5oUnvi8KoeA2/JXsmXQuokx0siR1G8tLkN6eB9sLwJp/yymcyaP/TrP+RPmbMMixcJVgTR1aUZ93oGXsgXQAaG6EwAAAAASUVORK5CYII="},function(t,e){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(t){"object"==typeof window&&(n=window)}t.exports=n},function(t,e,n){n(120),t.exports=n(121)}])});
-+//# sourceMappingURL=swagger-ui-standalone-preset.js.map
-diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
-index 6550bc6ce79..0848f566f67 100644
---- a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
-+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
-@@ -47,6 +47,16 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
-      */
-     const MEDIA_CALLBACK_ACTION = 'swatches/ajax/media';
- 
-+    /**
-+     * Name of swatch image for json config
-+     */
-+    const SWATCH_IMAGE_NAME = 'swatchImage';
-+
-+    /**
-+     * Name of swatch thumbnail for json config
-+     */
-+    const SWATCH_THUMBNAIL_NAME = 'swatchThumb';
-+
-     /**
-      * @var Product
-      */
-@@ -172,6 +182,9 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
-                     $attributeDataArray
-                 );
-             }
-+            if (isset($attributeDataArray['additional_data'])) {
-+                $config[$attributeId]['additional_data'] = $attributeDataArray['additional_data'];
-+            }
-         }
- 
-         return $this->jsonEncoder->encode($config);
-@@ -179,6 +192,7 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
- 
-     /**
-      * Get number of swatches from config to show on product listing.
-+     *
-      * Other swatches can be shown after click button 'Show more'
-      *
-      * @return string
-@@ -218,6 +232,8 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
-     }
- 
-     /**
-+     * Get swatch attributes data.
-+     *
-      * @return array
-      */
-     protected function getSwatchAttributesData()
-@@ -226,6 +242,8 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
-     }
- 
-     /**
-+     * Init isProductHasSwatchAttribute.
-+     *
-      * @deprecated 100.1.5 Method isProductHasSwatchAttribute() is used instead of this.
-      *
-      * @codeCoverageIgnore
-@@ -354,6 +372,8 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
-     }
- 
-     /**
-+     * Get swatch product image.
-+     *
-      * @param Product $childProduct
-      * @param string $imageType
-      * @return string
-@@ -374,6 +394,8 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
-     }
- 
-     /**
-+     * Check if product have image.
-+     *
-      * @param Product $product
-      * @param string $imageType
-      * @return bool
-@@ -384,6 +406,8 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
-     }
- 
-     /**
-+     * Get configurable options ids.
-+     *
-      * @param array $attributeData
-      * @return array
-      * @since 100.0.3
-@@ -443,8 +467,8 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
-     }
- 
-     /**
-+     * @inheritDoc
-      * @deprecated 100.1.5 Now is used _toHtml() directly
--     * @return string
-      */
-     protected function getHtmlOutput()
-     {
-@@ -452,6 +476,8 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
-     }
- 
-     /**
-+     * Get media callback url.
-+     *
-      * @return string
-      */
-     public function getMediaCallback()
-@@ -473,4 +499,22 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
-             return [];
-         }
-     }
-+
-+    /**
-+     * Get Swatch image size config data.
-+     *
-+     * @return string
-+     */
-+    public function getJsonSwatchSizeConfig()
-+    {
-+        $imageConfig = $this->swatchMediaHelper->getImageConfig();
-+        $sizeConfig = [];
-+
-+        $sizeConfig[self::SWATCH_IMAGE_NAME]['width'] = $imageConfig[Swatch::SWATCH_IMAGE_NAME]['width'];
-+        $sizeConfig[self::SWATCH_IMAGE_NAME]['height'] = $imageConfig[Swatch::SWATCH_IMAGE_NAME]['height'];
-+        $sizeConfig[self::SWATCH_THUMBNAIL_NAME]['height'] = $imageConfig[Swatch::SWATCH_THUMBNAIL_NAME]['height'];
-+        $sizeConfig[self::SWATCH_THUMBNAIL_NAME]['width'] = $imageConfig[Swatch::SWATCH_THUMBNAIL_NAME]['width'];
-+
-+        return $this->jsonEncoder->encode($sizeConfig);
-+    }
- }
-diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
-index e13373fb725..2e4980c2fbf 100644
---- a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
-+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
-@@ -8,7 +8,8 @@ namespace Magento\Swatches\Block\Product\Renderer\Listing;
- use Magento\Catalog\Block\Product\Context;
- use Magento\Catalog\Helper\Product as CatalogProduct;
- use Magento\Catalog\Model\Product;
--use Magento\Catalog\Model\Product\Image\UrlBuilder;
-+use Magento\Catalog\Model\Layer\Resolver;
-+use Magento\Catalog\Model\Layer\Category as CategoryLayer;
- use Magento\ConfigurableProduct\Helper\Data;
- use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
- use Magento\Customer\Helper\Session\CurrentCustomer;
-@@ -39,6 +40,11 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
-      */
-     private $variationPrices;
- 
-+    /**
-+     * @var \Magento\Catalog\Model\Layer\Resolver
-+     */
-+    private $layerResolver;
-+
-     /**
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      * @param Context $context
-@@ -55,6 +61,7 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
-      * @param SwatchAttributesProvider|null $swatchAttributesProvider
-      * @param \Magento\Framework\Locale\Format|null $localeFormat
-      * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices|null $variationPrices
-+     * @param Resolver $layerResolver
-      */
-     public function __construct(
-         Context $context,
-@@ -70,7 +77,8 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
-         array $data = [],
-         SwatchAttributesProvider $swatchAttributesProvider = null,
-         \Magento\Framework\Locale\Format $localeFormat = null,
--        \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices $variationPrices = null
-+        \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices $variationPrices = null,
-+        Resolver $layerResolver = null
-     ) {
-         parent::__construct(
-             $context,
-@@ -92,10 +100,11 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
-         $this->variationPrices = $variationPrices ?: ObjectManager::getInstance()->get(
-             \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices::class
-         );
-+        $this->layerResolver = $layerResolver ?: ObjectManager::getInstance()->get(Resolver::class);
-     }
- 
-     /**
--     * @return string
-+     * @inheritdoc
-      */
-     protected function getRendererTemplate()
-     {
-@@ -121,7 +130,7 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
-     }
- 
-     /**
--     * @return array
-+     * @inheritdoc
-      */
-     protected function getSwatchAttributesData()
-     {
-@@ -183,6 +192,7 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
-      * Add images to result json config in case of Layered Navigation is used
-      *
-      * @return array
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      * @since 100.2.0
-      */
-     protected function _getAdditionalConfig()
-@@ -247,4 +257,16 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
- 
-         return $layeredAttributes;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getCacheKeyInfo()
-+    {
-+        $cacheKeyInfo = parent::getCacheKeyInfo();
-+        /** @var CategoryLayer $catalogLayer */
-+        $catalogLayer = $this->layerResolver->get();
-+        $cacheKeyInfo[] = $catalogLayer->getStateKey();
-+        return $cacheKeyInfo;
-+    }
- }
-diff --git a/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php b/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
-index 383c97a166d..72d27152d63 100644
---- a/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
-+++ b/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
-@@ -16,6 +16,8 @@ use Magento\Swatches\Model\Swatch;
- class Save
- {
-     /**
-+     * Performs the conversion of the frontend input value.
-+     *
-      * @param Attribute\Save $subject
-      * @param RequestInterface $request
-      * @return array
-@@ -26,15 +28,6 @@ class Save
-         $data = $request->getPostValue();
- 
-         if (isset($data['frontend_input'])) {
--            //Data is serialized to overcome issues caused by max_input_vars value if it's modification is unavailable.
--            //See subject controller code and comments for more info.
--            if (isset($data['serialized_swatch_values'])
--                && in_array($data['frontend_input'], ['swatch_visual', 'swatch_text'])
--            ) {
--                $data['serialized_options'] = $data['serialized_swatch_values'];
--                unset($data['serialized_swatch_values']);
--            }
--
-             switch ($data['frontend_input']) {
-                 case 'swatch_visual':
-                     $data[Swatch::SWATCH_INPUT_TYPE_KEY] = Swatch::SWATCH_INPUT_TYPE_VISUAL;
-diff --git a/app/code/Magento/Swatches/Controller/Ajax/Media.php b/app/code/Magento/Swatches/Controller/Ajax/Media.php
-index 079ba8f8971..2d20b9a9a4b 100644
---- a/app/code/Magento/Swatches/Controller/Ajax/Media.php
-+++ b/app/code/Magento/Swatches/Controller/Ajax/Media.php
-@@ -12,7 +12,7 @@ use Magento\Framework\Controller\ResultFactory;
- /**
-  * Class Media
-  */
--class Media extends \Magento\Framework\App\Action\Action
-+class Media extends \Magento\Framework\App\Action\Action implements \Magento\Framework\App\Action\HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Catalog\Model\Product Factory
-@@ -24,18 +24,26 @@ class Media extends \Magento\Framework\App\Action\Action
-      */
-     private $swatchHelper;
- 
-+    /**
-+     * @var \Magento\PageCache\Model\Config
-+     */
-+    protected $config;
-+
-     /**
-      * @param Context $context
-      * @param \Magento\Catalog\Model\ProductFactory $productModelFactory
-      * @param \Magento\Swatches\Helper\Data $swatchHelper
-+     * @param \Magento\PageCache\Model\Config $config
-      */
-     public function __construct(
-         Context $context,
-         \Magento\Catalog\Model\ProductFactory $productModelFactory,
--        \Magento\Swatches\Helper\Data $swatchHelper
-+        \Magento\Swatches\Helper\Data $swatchHelper,
-+        \Magento\PageCache\Model\Config $config
-     ) {
-         $this->productModelFactory = $productModelFactory;
-         $this->swatchHelper = $swatchHelper;
-+        $this->config = $config;
- 
-         parent::__construct($context);
-     }
-@@ -44,18 +52,28 @@ class Media extends \Magento\Framework\App\Action\Action
-      * Get product media for specified configurable product variation
-      *
-      * @return string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function execute()
-     {
-         $productMedia = [];
-+
-+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
-+
-+        /** @var \Magento\Framework\App\ResponseInterface $response */
-+        $response = $this->getResponse();
-+
-         if ($productId = (int)$this->getRequest()->getParam('product_id')) {
-+            $product = $this->productModelFactory->create()->load($productId);
-             $productMedia = $this->swatchHelper->getProductMediaGallery(
--                $this->productModelFactory->create()->load($productId)
-+                $product
-             );
-+            $resultJson->setHeader('X-Magento-Tags', implode(',', $product->getIdentities()));
-+
-+            $response->setPublicHeaders($this->config->getTtl());
-         }
- 
--        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
--        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
-         $resultJson->setData($productMedia);
-         return $resultJson;
-     }
-diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
-index 38879178235..f9a600925b2 100644
---- a/app/code/Magento/Swatches/Helper/Data.php
-+++ b/app/code/Magento/Swatches/Helper/Data.php
-@@ -5,9 +5,9 @@
-  */
- namespace Magento\Swatches\Helper;
- 
-+use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
- use Magento\Catalog\Api\Data\ProductInterface as Product;
- use Magento\Catalog\Api\ProductRepositoryInterface;
--use Magento\Catalog\Helper\Image;
- use Magento\Catalog\Model\Product as ModelProduct;
- use Magento\Catalog\Model\Product\Image\UrlBuilder;
- use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-@@ -132,6 +132,8 @@ class Data
-     }
- 
-     /**
-+     * Assemble Additional Data for Eav Attribute
-+     *
-      * @param Attribute $attribute
-      * @return $this
-      */
-@@ -181,6 +183,8 @@ class Data
-     }
- 
-     /**
-+     * Load first variation
-+     *
-      * @param string $attributeCode swatch_image|image
-      * @param ModelProduct $configurableProduct
-      * @param array $requiredAttributes
-@@ -204,6 +208,8 @@ class Data
-     }
- 
-     /**
-+     * Load first variation with swatch image
-+     *
-      * @param Product $configurableProduct
-      * @param array $requiredAttributes
-      * @return bool|Product
-@@ -214,6 +220,8 @@ class Data
-     }
- 
-     /**
-+     * Load first variation with image
-+     *
-      * @param Product $configurableProduct
-      * @param array $requiredAttributes
-      * @return bool|Product
-@@ -246,18 +254,15 @@ class Data
-         $this->addFilterByParent($productCollection, $parentId);
- 
-         $configurableAttributes = $this->getAttributesFromConfigurable($parentProduct);
--        $allAttributesArray = [];
-+
-+        $resultAttributesToFilter = [];
-         foreach ($configurableAttributes as $attribute) {
--            if (!empty($attribute['default_value'])) {
--                $allAttributesArray[$attribute['attribute_code']] = $attribute['default_value'];
-+            $attributeCode = $attribute->getData('attribute_code');
-+            if (array_key_exists($attributeCode, $attributes)) {
-+                $resultAttributesToFilter[$attributeCode] = $attributes[$attributeCode];
-             }
-         }
- 
--        $resultAttributesToFilter = array_merge(
--            $attributes,
--            array_diff_key($allAttributesArray, $attributes)
--        );
--
-         $this->addFilterByAttributes($productCollection, $resultAttributesToFilter);
- 
-         $variationProduct = $productCollection->getFirstItem();
-@@ -269,6 +274,8 @@ class Data
-     }
- 
-     /**
-+     * Add filter by attribute
-+     *
-      * @param ProductCollection $productCollection
-      * @param array $attributes
-      * @return void
-@@ -281,6 +288,8 @@ class Data
-     }
- 
-     /**
-+     * Add filter by parent
-+     *
-      * @param ProductCollection $productCollection
-      * @param integer $parentId
-      * @return void
-@@ -299,6 +308,7 @@ class Data
- 
-     /**
-      * Method getting full media gallery for current Product
-+     *
-      * Array structure: [
-      *  ['image'] => 'http://url/pub/media/catalog/product/2/0/blabla.jpg',
-      *  ['mediaGallery'] => [
-@@ -307,38 +317,68 @@ class Data
-      *      ...,
-      *      ]
-      * ]
-+     *
-      * @param ModelProduct $product
-+     *
-      * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
--    public function getProductMediaGallery(ModelProduct $product)
-+    public function getProductMediaGallery(ModelProduct $product): array
-     {
-         $baseImage = null;
-         $gallery = [];
- 
-         $mediaGallery = $product->getMediaGalleryEntries();
-+        /** @var ProductAttributeMediaGalleryEntryInterface $mediaEntry */
-         foreach ($mediaGallery as $mediaEntry) {
-             if ($mediaEntry->isDisabled()) {
-                 continue;
-             }
--
--            if (in_array('image', $mediaEntry->getTypes(), true) || !$baseImage) {
--                $baseImage = $mediaEntry->getFile();
-+            if (!$baseImage || $this->isMainImage($mediaEntry)) {
-+                $baseImage = $mediaEntry;
-             }
- 
--            $gallery[$mediaEntry->getId()] = $this->getAllSizeImages($mediaEntry->getFile());
-+            $gallery[$mediaEntry->getId()] = $this->collectImageData($mediaEntry);
-         }
- 
-         if (!$baseImage) {
-             return [];
-         }
- 
--        $resultGallery = $this->getAllSizeImages($baseImage);
-+        $resultGallery = $this->collectImageData($baseImage);
-         $resultGallery['gallery'] = $gallery;
- 
-         return $resultGallery;
-     }
- 
-     /**
-+     * Checks if image is main image in gallery
-+     *
-+     * @param ProductAttributeMediaGalleryEntryInterface $mediaEntry
-+     * @return bool
-+     */
-+    private function isMainImage(ProductAttributeMediaGalleryEntryInterface $mediaEntry): bool
-+    {
-+        return in_array('image', $mediaEntry->getTypes(), true);
-+    }
-+
-+    /**
-+     * Returns image data for swatches
-+     *
-+     * @param ProductAttributeMediaGalleryEntryInterface $mediaEntry
-+     * @return array
-+     */
-+    private function collectImageData(ProductAttributeMediaGalleryEntryInterface $mediaEntry): array
-+    {
-+        $image = $this->getAllSizeImages($mediaEntry->getFile());
-+        $image[ProductAttributeMediaGalleryEntryInterface::POSITION] =  $mediaEntry->getPosition();
-+        $image['isMain'] =$this->isMainImage($mediaEntry);
-+        return $image;
-+    }
-+
-+    /**
-+     * Get all size images
-+     *
-      * @param string $imageFile
-      * @return array
-      */
-@@ -476,6 +516,8 @@ class Data
-     }
- 
-     /**
-+     * Add fallback options
-+     *
-      * @param array $fallbackValues
-      * @param array $swatches
-      * @return array
-@@ -488,6 +530,8 @@ class Data
-                 && $swatches[$optionId]['type'] === $optionsArray[$currentStoreId]['type']
-             ) {
-                 $swatches[$optionId] = $optionsArray[$currentStoreId];
-+            } elseif (isset($optionsArray[$currentStoreId])) {
-+                $swatches[$optionId] = $optionsArray[$currentStoreId];
-             } elseif (isset($optionsArray[self::DEFAULT_STORE_ID])) {
-                 $swatches[$optionId] = $optionsArray[self::DEFAULT_STORE_ID];
-             }
-diff --git a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
-index 599406f4552..ebbb1775aa7 100644
---- a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
-+++ b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
-@@ -9,6 +9,7 @@ use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Exception\InputException;
- use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Swatches\Model\ResourceModel\Swatch as SwatchResource;
- use Magento\Swatches\Model\Swatch;
- 
- /**
-@@ -18,6 +19,11 @@ class EavAttribute
- {
-     const DEFAULT_STORE_ID = 0;
- 
-+    /**
-+     * @var SwatchResource
-+     */
-+    private $swatchResource;
-+
-     /**
-      * Base option title used for string operations to detect is option already exists or new
-      */
-@@ -64,17 +70,20 @@ class EavAttribute
-      * @param \Magento\Swatches\Model\SwatchFactory $swatchFactory
-      * @param \Magento\Swatches\Helper\Data $swatchHelper
-      * @param Json|null $serializer
-+     * @param SwatchResource|null $swatchResource
-      */
-     public function __construct(
-         \Magento\Swatches\Model\ResourceModel\Swatch\CollectionFactory $collectionFactory,
-         \Magento\Swatches\Model\SwatchFactory $swatchFactory,
-         \Magento\Swatches\Helper\Data $swatchHelper,
--        Json $serializer = null
-+        Json $serializer = null,
-+        SwatchResource $swatchResource = null
-     ) {
-         $this->swatchCollectionFactory = $collectionFactory;
-         $this->swatchFactory = $swatchFactory;
-         $this->swatchHelper = $swatchHelper;
-         $this->serializer = $serializer ?: ObjectManager::getInstance()->create(Json::class);
-+        $this->swatchResource = $swatchResource ?: ObjectManager::getInstance()->create(SwatchResource::class);
-     }
- 
-     /**
-@@ -148,6 +157,7 @@ class EavAttribute
-      * Prepare attribute for conversion from any swatch type to dropdown
-      *
-      * @param Attribute $attribute
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      * @return void
-      */
-     protected function convertSwatchToDropdown(Attribute $attribute)
-@@ -157,6 +167,8 @@ class EavAttribute
-             if (!empty($additionalData)) {
-                 $additionalData = $this->serializer->unserialize($additionalData);
-                 if (is_array($additionalData) && isset($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY])) {
-+                    $option = $attribute->getOption() ?: [];
-+                    $this->cleanEavAttributeOptionSwatchValues($option);
-                     unset($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY]);
-                     $attribute->setData('additional_data', $this->serializer->serialize($additionalData));
-                 }
-@@ -235,6 +247,8 @@ class EavAttribute
-     {
-         if ($this->swatchHelper->isVisualSwatch($attribute)) {
-             $this->processVisualSwatch($attribute);
-+            $attributeOptions = $attribute->getOptiontext() ?: [];
-+            $this->cleanTextSwatchValuesAfterSwitch($attributeOptions);
-         } elseif ($this->swatchHelper->isTextSwatch($attribute)) {
-             $this->processTextualSwatch($attribute);
-         }
-@@ -267,6 +281,33 @@ class EavAttribute
-         }
-     }
- 
-+    /**
-+     * Clean swatch option values after switching to the dropdown type.
-+     *
-+     * @param array $attributeOptions
-+     * @param int|null  $swatchType
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function cleanEavAttributeOptionSwatchValues(array $attributeOptions, int $swatchType = null)
-+    {
-+        if (count($attributeOptions) && isset($attributeOptions['value'])) {
-+            $optionsIDs = array_keys($attributeOptions['value']);
-+
-+            $this->swatchResource->clearSwatchOptionByOptionIdAndType($optionsIDs, $swatchType);
-+        }
-+    }
-+
-+    /**
-+     * Cleaning the text type of swatch option values after switching.
-+     *
-+     * @param array $attributeOptions
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function cleanTextSwatchValuesAfterSwitch(array $attributeOptions)
-+    {
-+        $this->cleanEavAttributeOptionSwatchValues($attributeOptions, Swatch::SWATCH_TYPE_TEXTUAL);
-+    }
-+
-     /**
-      * @param string $value
-      * @return int
-@@ -432,7 +473,7 @@ class EavAttribute
-             $options = $attribute->getData('optiontext');
-         }
-         if ($options && !$this->isOptionsValid($options, $attribute)) {
--            throw new InputException(__('Admin is a required field in the each row'));
-+            throw new InputException(__('Admin is a required field in each row'));
-         }
-         return true;
-     }
-diff --git a/app/code/Magento/Swatches/Model/Plugin/ProductImage.php b/app/code/Magento/Swatches/Model/Plugin/ProductImage.php
-index afdd43a77cb..24f15185341 100644
---- a/app/code/Magento/Swatches/Model/Plugin/ProductImage.php
-+++ b/app/code/Magento/Swatches/Model/Plugin/ProductImage.php
-@@ -78,7 +78,7 @@ class ProductImage
-             && ($location == self::CATEGORY_PAGE_GRID_LOCATION || $location == self::CATEGORY_PAGE_LIST_LOCATION)) {
-             $request = $this->request->getParams();
-             if (is_array($request)) {
--                $filterArray = $this->getFilterArray($request);
-+                $filterArray = $this->getFilterArray($request, $product);
-                 if (!empty($filterArray)) {
-                     $product = $this->loadSimpleVariation($product, $filterArray);
-                 }
-@@ -108,16 +108,17 @@ class ProductImage
-      * Get filters from request
-      *
-      * @param array $request
-+     * @param \Magento\Catalog\Model\Product $product
-      * @return array
-      */
--    private function getFilterArray(array $request)
-+    private function getFilterArray(array $request, Product $product)
-     {
-         $filterArray = [];
--        $attributeCodes = $this->eavConfig->getEntityAttributeCodes(Product::ENTITY);
-+        $attributes = $this->eavConfig->getEntityAttributes(Product::ENTITY, $product);
-         foreach ($request as $code => $value) {
--            if (in_array($code, $attributeCodes)) {
--                $attribute = $this->eavConfig->getAttribute(Product::ENTITY, $code);
--                if ($attribute->getId() && $this->canReplaceImageWithSwatch($attribute)) {
-+            if (isset($attributes[$code])) {
-+                $attribute = $attributes[$code];
-+                if ($this->canReplaceImageWithSwatch($attribute)) {
-                     $filterArray[$code] = $value;
-                 }
-             }
-diff --git a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
-index 22eb1d4c7ee..9ad62265be2 100644
---- a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
-+++ b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
-@@ -7,8 +7,9 @@
- namespace Magento\Swatches\Model\ResourceModel;
- 
- /**
-- * @codeCoverageIgnore
-  * Swatch Resource Model
-+ *
-+ * @codeCoverageIgnore
-  * @api
-  * @since 100.0.2
-  */
-@@ -25,8 +26,10 @@ class Swatch extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     }
- 
-     /**
--     * @param string $defaultValue
-+     * Update default swatch option value.
-+     *
-      * @param integer $id
-+     * @param string $defaultValue
-      * @return void
-      */
-     public function saveDefaultSwatchOption($id, $defaultValue)
-@@ -37,4 +40,24 @@ class Swatch extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-             $this->getConnection()->update($this->getTable('eav_attribute'), $bind, $where);
-         }
-     }
-+
-+    /**
-+     * Cleaned swatch option values when switching to dropdown input type.
-+     *
-+     * @param array $optionIDs
-+     * @param int $type
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function clearSwatchOptionByOptionIdAndType($optionIDs, $type = null)
-+    {
-+        if (count($optionIDs)) {
-+            foreach ($optionIDs as $optionId) {
-+                $where = ['option_id = ?' => $optionId];
-+                if ($type !== null) {
-+                    $where['type = ?'] = $type;
-+                }
-+                $this->getConnection()->delete($this->getMainTable(), $where);
-+            }
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php b/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php
-index cfef5ab499e..3ef202af95a 100644
---- a/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php
-+++ b/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php
-@@ -6,7 +6,7 @@
- namespace Magento\Swatches\Observer;
- 
- use Magento\Config\Model\Config\Source;
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\Framework\Event\Observer as EventObserver;
- use Magento\Framework\Event\ObserverInterface;
- 
-@@ -21,21 +21,23 @@ class AddFieldsToAttributeObserver implements ObserverInterface
-     protected $yesNo;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-     /**
--     * @param Manager $moduleManager
-+     * @param ModuleManagerInterface $moduleManager
-      * @param Source\Yesno $yesNo
-      */
--    public function __construct(Manager $moduleManager, Source\Yesno $yesNo)
-+    public function __construct(ModuleManagerInterface $moduleManager, Source\Yesno $yesNo)
-     {
-         $this->moduleManager = $moduleManager;
-         $this->yesNo = $yesNo;
-     }
- 
-     /**
-+     * Execute.
-+     *
-      * @param \Magento\Framework\Event\Observer $observer
-      * @return void
-      */
-diff --git a/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php b/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php
-index 3a517bd8351..ca75da33216 100644
---- a/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php
-+++ b/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php
-@@ -6,7 +6,7 @@
- namespace Magento\Swatches\Observer;
- 
- use Magento\Config\Model\Config\Source;
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\Framework\Event\Observer as EventObserver;
- use Magento\Framework\Event\ObserverInterface;
- 
-@@ -16,19 +16,21 @@ use Magento\Framework\Event\ObserverInterface;
- class AddSwatchAttributeTypeObserver implements ObserverInterface
- {
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-     /**
--     * @param Manager $moduleManager
-+     * @param ModuleManagerInterface $moduleManager
-      */
--    public function __construct(Manager $moduleManager)
-+    public function __construct(ModuleManagerInterface $moduleManager)
-     {
-         $this->moduleManager = $moduleManager;
-     }
- 
-     /**
-+     * Execute.
-+     *
-      * @param \Magento\Framework\Event\Observer $observer
-      * @return void
-      */
-diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml
-index 09137a7003b..2c91bba75fe 100644
---- a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml
-+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
- 
-     <actionGroup name="AddVisualSwatchToProductActionGroup">
-         <arguments>
-@@ -62,4 +62,21 @@
-         <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
-     </actionGroup>
- 
-+    <actionGroup name="AddVisualSwatchToProductWithStorefrontConfigActionGroup" extends="AddVisualSwatchToProductActionGroup">
-+        <arguments>
-+            <argument name="attribute" defaultValue="visualSwatchAttribute"/>
-+            <argument name="option1" defaultValue="visualSwatchOption1"/>
-+            <argument name="option2" defaultValue="visualSwatchOption2"/>
-+        </arguments>
-+
-+        <!-- Go to Storefront Properties tab -->
-+        <click selector="{{AdminNewAttributePanel.storefrontPropertiesTab}}" stepKey="goToStorefrontPropertiesTab" after="fillDefaultStoreLabel2"/>
-+        <waitForElementVisible selector="{{AdminNewAttributePanel.storefrontPropertiesTitle}}" stepKey="waitTabLoad" after="goToStorefrontPropertiesTab"/>
-+        <selectOption selector="{{AdminNewAttributePanel.useInSearch}}" stepKey="switchOnUsInSearch" userInput="Yes" after="waitTabLoad"/>
-+        <selectOption selector="{{AdminNewAttributePanel.visibleInAdvancedSearch}}" stepKey="switchOnVisibleInAdvancedSearch" userInput="Yes" after="switchOnUsInSearch"/>
-+        <selectOption selector="{{AdminNewAttributePanel.comparableOnStorefront}}" stepKey="switchOnComparableOnStorefront" userInput="Yes" after="switchOnVisibleInAdvancedSearch"/>
-+        <selectOption selector="{{AdminNewAttributePanel.useInLayeredNavigation}}" stepKey="selectUseInLayer" userInput="Filterable (with results)" after="switchOnComparableOnStorefront"/>
-+        <selectOption selector="{{AdminNewAttributePanel.visibleOnCatalogPagesOnStorefront}}" stepKey="switchOnVisibleOnCatalogPagesOnStorefront" userInput="Yes" after="selectUseInLayer"/>
-+        <selectOption selector="{{AdminNewAttributePanel.useInProductListing}}" stepKey="switchOnUsedInProductListing" userInput="Yes" after="switchOnVisibleOnCatalogPagesOnStorefront"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/ColorPickerActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/ColorPickerActionGroup.xml
-index f8cfa3071ce..6f991274a01 100644
---- a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/ColorPickerActionGroup.xml
-+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/ColorPickerActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="setColorPickerByHex">
-         <arguments>
-             <argument name="nthColorPicker" type="string" defaultValue="1"/>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml
-index 0e70bdcc702..d7ee6dabce7 100644
---- a/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml
-+++ b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml
-@@ -7,9 +7,10 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="visualSwatchAttribute" type="SwatchAttribute">
-         <data key="default_label" unique="suffix">VisualSwatchAttr</data>
-         <data key="input_type">Visual Swatch</data>
-+        <data key="attribute_code" unique="suffix">visual_swatch_attr</data>
-     </entity>
- </entities>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Data/SwatchOptionData.xml b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchOptionData.xml
-index 76bfbe8e1b8..4608d1a9190 100644
---- a/app/code/Magento/Swatches/Test/Mftf/Data/SwatchOptionData.xml
-+++ b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchOptionData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="visualSwatchOption1" type="SwatchOption">
-         <data key="admin_label" unique="suffix">VisualOpt1</data>
-         <data key="default_label" unique="suffix">VisualOpt1</data>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/AdminColorPickerSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/AdminColorPickerSection.xml
-index 772b724b664..50d56d64bb6 100644
---- a/app/code/Magento/Swatches/Test/Mftf/Section/AdminColorPickerSection.xml
-+++ b/app/code/Magento/Swatches/Test/Mftf/Section/AdminColorPickerSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminColorPickerSection">
-         <element name="hexByIndex" type="input" selector="//div[@class='colorpicker'][{{var}}]/div[@class='colorpicker_hex']/input" parameterized="true"/>
-         <element name="submitByIndex" type="button" selector="//div[@class='colorpicker'][{{var}}]/div[@class='colorpicker_submit']" parameterized="true"/>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/AdminManageSwatchSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/AdminManageSwatchSection.xml
-index 39db9f92837..c3ef0a7324b 100644
---- a/app/code/Magento/Swatches/Test/Mftf/Section/AdminManageSwatchSection.xml
-+++ b/app/code/Magento/Swatches/Test/Mftf/Section/AdminManageSwatchSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminManageSwatchSection">
-         <element name="adminInputByIndex" type="input" selector="optionvisual[value][option_{{var}}][0]" parameterized="true"/>
-         <element name="addSwatch" type="button" selector="#add_new_swatch_visual_option_button" timeout="30"/>
-@@ -15,10 +15,13 @@
-         <element name="addSwatchText" type="button" selector="#add_new_swatch_text_option_button"/>
-         <element name="swatchTextByIndex" type="input" selector="input[name='swatchtext[value][option_{{index}}][0]']" parameterized="true"/>
-         <element name="nthSwatchText" type="input" selector="#swatch-text-options-panel table tbody tr:nth-of-type({{var}}) td:nth-of-type(3) input" parameterized="true"/>
-+        <element name="nthIsDefault" type="input" selector="(//input[@name='defaultvisual[]'])[{{var}}]" parameterized="true"/>
-         <element name="nthSwatchAdminDescription" type="input" selector="#swatch-text-options-panel table tbody tr:nth-of-type({{var}}) td:nth-of-type(4) input" parameterized="true"/>
-         <!-- Selector for Admin Description input where the index is zero-based -->
-         <element name="swatchAdminDescriptionByIndex" type="input" selector="input[name='optiontext[value][option_{{index}}][0]']" parameterized="true"/>
-         <element name="nthChooseColor" type="button" selector="#swatch-visual-options-panel table tbody tr:nth-of-type({{var}}) .swatch_row_name.colorpicker_handler" parameterized="true"/>
-+        <element name="nthUploadFile" type="button" selector="#swatch-visual-options-panel table tbody tr:nth-of-type({{var}}) .swatch_row_name.btn_choose_file_upload" parameterized="true"/>
-         <element name="nthDelete" type="button" selector="#swatch-visual-options-panel table tbody tr:nth-of-type({{var}}) button.delete-option" parameterized="true"/>
-+        <element name="deleteBtn" type="button" selector="#manage-options-panel:nth-of-type({{var}}) button.delete-option" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/AdminNewAttributePanelSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/AdminNewAttributePanelSection.xml
-index 36c2056a457..adefce91827 100644
---- a/app/code/Magento/Swatches/Test/Mftf/Section/AdminNewAttributePanelSection.xml
-+++ b/app/code/Magento/Swatches/Test/Mftf/Section/AdminNewAttributePanelSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminNewAttributePanel">
-         <element name="addVisualSwatchOption" type="button" selector="button#add_new_swatch_visual_option_button"/>
-         <element name="addTextSwatchOption" type="button" selector="button#add_new_swatch_text_option_button"/>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategorySidebarSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
-new file mode 100644
-index 00000000000..43746fc08a0
---- /dev/null
-+++ b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCategorySidebarSection">
-+        <element name="layeredFilterBlock" type="block" selector="#layered-filter-block"/>
-+        <element name="filterOptionTitle" type="button" selector="//div[@class='filter-options-title'][text() = '{{var}}']" parameterized="true" timeout="30"/>
-+        <element name="attributeNthOption" type="button" selector="div.{{attributeLabel}} a:nth-of-type({{n}}) div" parameterized="true" timeout="30"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-index 68c1d292587..4290ddbbd8d 100644
---- a/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-+++ b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-@@ -7,12 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductInfoMainSection">
--        <element name="swatchOptionByLabel" type="button" selector="div.swatch-option[option-label={{opt}}]" parameterized="true"/>
-+        <element name="swatchOptionByLabel" type="button" selector="div.swatch-option[option-label='{{opt}}']" parameterized="true"/>
-         <element name="nthSwatchOption" type="button" selector="div.swatch-option:nth-of-type({{var}})" parameterized="true"/>
-         <element name="selectedSwatchValue" type="text" selector="//div[contains(@class, 'swatch-attribute') and contains(., '{{attr}}')]//span[contains(@class, 'swatch-attribute-selected-option')]" parameterized="true"/>
-         <element name="swatchAttributeOptions" type="text" selector="div.swatch-attribute-options"/>
-         <element name="nthSwatchOptionText" type="button" selector="div.swatch-option.text:nth-of-type({{n}})" parameterized="true"/>
-+        <element name="productSwatch" type="button" selector="//div[@class='swatch-option'][@aria-label='{{var1}}']" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateImageSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateImageSwatchTest.xml
-new file mode 100644
-index 00000000000..0e294153e88
---- /dev/null
-+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateImageSwatchTest.xml
-@@ -0,0 +1,167 @@
-+<?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="AdminCreateImageSwatchTest">
-+        <annotations>
-+            <features value="Swatches"/>
-+            <stories value="Create/configure swatches"/>
-+            <title value="Admin can create product attribute with image swatch"/>
-+            <description value="Admin can create product attribute with image swatch"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3077"/>
-+            <group value="Swatches"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Begin creating a new product attribute of type "Image Swatch" -->
-+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
-+        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
-+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
-+
-+        <!-- Select visual swatch -->
-+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="swatch_visual" stepKey="selectInputType"/>
-+
-+        <!-- This hack is because the same <input type="file"> is re-purposed used for all uploads. -->
-+        <executeJS function="HTMLInputElement.prototype.click = function() { if(this.type !== 'file') HTMLElement.prototype.click.call(this); };" stepKey="disableClick"/>
-+
-+        <!-- Set swatch image #1 -->
-+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch1"/>
-+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch1">
-+            <argument name="index" value="0"/>
-+        </actionGroup>
-+        <click selector="{{AdminManageSwatchSection.nthUploadFile('1')}}" stepKey="clickUploadFile1"/>
-+        <attachFile selector="input[name='datafile']" userInput="adobe-thumb.jpg" stepKey="attachFile1"/>
-+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('0')}}" userInput="adobe-thumb" stepKey="fillAdmin1"/>
-+
-+        <!-- Set swatch image #2 -->
-+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch2"/>
-+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch2">
-+            <argument name="index" value="1"/>
-+        </actionGroup>
-+        <click selector="{{AdminManageSwatchSection.nthUploadFile('2')}}" stepKey="clickUploadFile2"/>
-+        <attachFile selector="input[name='datafile']" userInput="adobe-small.jpg" stepKey="attachFile2"/>
-+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('1')}}" userInput="adobe-small" stepKey="fillAdmin2"/>
-+
-+        <!-- Set swatch image #3 -->
-+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch3"/>
-+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch3">
-+            <argument name="index" value="2"/>
-+        </actionGroup>
-+        <click selector="{{AdminManageSwatchSection.nthUploadFile('3')}}" stepKey="clickUploadFile3"/>
-+        <attachFile selector="input[name='datafile']" userInput="adobe-base.jpg" stepKey="attachFile3"/>
-+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('2')}}" userInput="adobe-base" stepKey="fillAdmin3"/>
-+
-+        <!-- Set scope -->
-+        <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
-+        <selectOption selector="{{AttributePropertiesSection.Scope}}" userInput="1" stepKey="selectGlobalScope"/>
-+
-+        <scrollToTopOfPage stepKey="scrollToTabs"/>
-+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStorefrontPropertiesTab"/>
-+        <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.UseInProductListing}}" stepKey="waitForTabSwitch"/>
-+        <selectOption selector="{{AdvancedAttributePropertiesSection.UseInProductListing}}" userInput="Yes" stepKey="useInProductListing"/>
-+
-+        <!-- Save the new product attribute -->
-+        <click selector="{{AttributePropertiesSection.SaveAndEdit}}" stepKey="clickSaveAndEdit1"/>
-+        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccess"/>
-+
-+        <!-- Verify after round trip to the server -->
-+        <grabAttributeFrom selector="{{AdminManageSwatchSection.nthSwatch('1')}}" userInput="style" stepKey="grabSwatch1"/>
-+        <assertContains stepKey="assertSwatch1">
-+            <expectedResult type="string">adobe-thumb</expectedResult>
-+            <actualResult type="string">{$grabSwatch1}</actualResult>
-+        </assertContains>
-+        <grabAttributeFrom selector="{{AdminManageSwatchSection.nthSwatch('2')}}" userInput="style" stepKey="grabSwatch2"/>
-+        <assertContains stepKey="assertSwatch2">
-+            <expectedResult type="string">adobe-small</expectedResult>
-+            <actualResult type="string">{$grabSwatch2}</actualResult>
-+        </assertContains>
-+        <grabAttributeFrom selector="{{AdminManageSwatchSection.nthSwatch('3')}}" userInput="style" stepKey="grabSwatch3"/>
-+        <assertContains stepKey="assertSwatch3">
-+            <expectedResult type="string">adobe-base</expectedResult>
-+            <actualResult type="string">{$grabSwatch3}</actualResult>
-+        </assertContains>
-+
-+        <!-- Create a configurable product to verify the storefront with -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad time="30" stepKey="waitForProductGrid"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateConfigurableProduct">
-+            <argument name="product" value="BaseConfigurableProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="BaseConfigurableProduct"/>
-+        </actionGroup>
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Create configurations based off the Image Swatch we created earlier -->
-+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
-+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillFilterAttributeCodeField"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
-+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="1" stepKey="enterAttributeQuantity"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
-+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
-+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
-+
-+        <!-- Go to the product page and see text swatch options -->
-+        <amOnPage url="{{BaseConfigurableProduct.sku}}.html" stepKey="amOnProductPage"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+
-+        <!-- Verify the storefront -->
-+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('1')}}" userInput="style" stepKey="grabSwatch4"/>
-+        <assertContains stepKey="assertSwatch4">
-+            <expectedResult type="string">adobe-thumb</expectedResult>
-+            <actualResult type="string">{$grabSwatch4}</actualResult>
-+        </assertContains>
-+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('2')}}" userInput="style" stepKey="grabSwatch5"/>
-+        <assertContains stepKey="assertSwatch5">
-+            <expectedResult type="string">adobe-small</expectedResult>
-+            <actualResult type="string">{$grabSwatch5}</actualResult>
-+        </assertContains>
-+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('3')}}" userInput="style" stepKey="grabSwatch6"/>
-+        <assertContains stepKey="assertSwatch6">
-+            <expectedResult type="string">adobe-base</expectedResult>
-+            <actualResult type="string">{$grabSwatch6}</actualResult>
-+        </assertContains>
-+
-+        <!-- Go to the product listing page and see text swatch options -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryPageStorefront"/>
-+        <waitForPageLoad stepKey="waitForProductListingPage"/>
-+
-+        <!-- Verify the storefront -->
-+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('1')}}" userInput="style" stepKey="grabSwatch7"/>
-+        <assertContains stepKey="assertSwatch7">
-+            <expectedResult type="string">adobe-thumb</expectedResult>
-+            <actualResult type="string">{$grabSwatch7}</actualResult>
-+        </assertContains>
-+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('2')}}" userInput="style" stepKey="grabSwatch8"/>
-+        <assertContains stepKey="assertSwatch8">
-+            <expectedResult type="string">adobe-small</expectedResult>
-+            <actualResult type="string">{$grabSwatch8}</actualResult>
-+        </assertContains>
-+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('3')}}" userInput="style" stepKey="grabSwatch9"/>
-+        <assertContains stepKey="assertSwatch9">
-+            <expectedResult type="string">adobe-base</expectedResult>
-+            <actualResult type="string">{$grabSwatch9}</actualResult>
-+        </assertContains>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml
-index 0c26c6a8174..3ef347b7aca 100644
---- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml
-+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateTextSwatchTest">
-         <annotations>
-             <features value="Swatches"/>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml
-index 67750ac931f..90e94466351 100644
---- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml
-+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminCreateVisualSwatchTest">
-         <annotations>
-             <features value="Swatches"/>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml
-new file mode 100644
-index 00000000000..b03f7718759
---- /dev/null
-+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml
-@@ -0,0 +1,112 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * 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="AdminCreateVisualSwatchWithNonValidOptionsTest">
-+        <annotations>
-+            <features value="Swatches"/>
-+            <stories value="Create/configure swatches product attribute"/>
-+            <title value="Admin should be able to create swatch product attribute"/>
-+            <description value="Admin should be able to create swatch product attribute"/>
-+            <severity value="BLOCKER"/>
-+            <testCaseId value="MC-4140"/>
-+            <group value="Swatches"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <!-- Remove attribute -->
-+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
-+                <argument name="ProductAttribute" value="visualSwatchAttribute"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+
-+        <!-- Set attribute properties -->
-+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}"
-+                   userInput="{{visualSwatchAttribute.default_label}}" stepKey="fillDefaultLabel"/>
-+        <selectOption selector="{{AttributePropertiesSection.InputType}}"
-+                      userInput="{{visualSwatchAttribute.input_type}}" stepKey="fillInputType"/>
-+
-+        <!-- Set advanced attribute properties -->
-+        <click selector="{{AdvancedAttributePropertiesSection.AdvancedAttributePropertiesSectionToggle}}"
-+               stepKey="showAdvancedAttributePropertiesSection"/>
-+        <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.AttributeCode}}"
-+                               stepKey="waitForSlideOut"/>
-+        <fillField selector="{{AdvancedAttributePropertiesSection.AttributeCode}}"
-+                   userInput="{{visualSwatchAttribute.attribute_code}}"
-+                   stepKey="fillAttributeCode"/>
-+
-+        <!-- Add new swatch option without label -->
-+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch1"/>
-+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch1">
-+            <argument name="index" value="0"/>
-+        </actionGroup>
-+        <click selector="{{AdminManageSwatchSection.nthChooseColor('1')}}" stepKey="clickChooseColor1"/>
-+        <actionGroup ref="setColorPickerByHex" stepKey="fillHex1">
-+            <argument name="nthColorPicker" value="1"/>
-+            <argument name="hexColor" value="ff0000"/>
-+        </actionGroup>
-+
-+        <!-- Save the new product attribute -->
-+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave1"/>
-+        <waitForElementVisible selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="waitForError"/>
-+
-+        <!-- Fill options data -->
-+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('0')}}"
-+                   userInput="red" stepKey="fillAdmin1"/>
-+
-+        <!-- Add 2 additional new swatch options -->
-+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch2"/>
-+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch2">
-+            <argument name="index" value="1"/>
-+        </actionGroup>
-+        <click selector="{{AdminManageSwatchSection.nthChooseColor('2')}}" stepKey="clickChooseColor2"/>
-+        <actionGroup ref="setColorPickerByHex" stepKey="fillHex2">
-+            <argument name="nthColorPicker" value="2"/>
-+            <argument name="hexColor" value="00ff00"/>
-+        </actionGroup>
-+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('1')}}"
-+                   userInput="green" stepKey="fillAdmin2"/>
-+
-+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch3"/>
-+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch3">
-+            <argument name="index" value="2"/>
-+        </actionGroup>
-+        <click selector="{{AdminManageSwatchSection.nthChooseColor('3')}}" stepKey="clickChooseColor3"/>
-+        <actionGroup ref="setColorPickerByHex" stepKey="fillHex3">
-+            <argument name="nthColorPicker" value="3"/>
-+            <argument name="hexColor" value="0000ff"/>
-+        </actionGroup>
-+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('2')}}"
-+                   userInput="blue" stepKey="fillAdmin3"/>
-+
-+        <!-- Mark second option as default -->
-+        <click selector="{{AdminManageSwatchSection.nthIsDefault('2')}}" stepKey="setSecondOptionAsDefault"/>
-+
-+        <!-- Go to Storefront Properties tab -->
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="goToStorefrontPropertiesTab"/>
-+        <waitForElementVisible selector="{{StorefrontPropertiesSection.PageTitle}}" stepKey="waitTabLoad"/>
-+
-+        <!-- Save the new product attribute -->
-+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave2"/>
-+        <waitForPageLoad stepKey="waitForGridPageLoad"/>
-+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}"
-+                               stepKey="waitForSuccessMessage"/>
-+
-+        <actionGroup ref="navigateToCreatedProductAttribute" stepKey="navigateToAttribute">
-+            <argument name="ProductAttribute" value="visualSwatchAttribute"/>
-+        </actionGroup>
-+        <!-- Check attribute data -->
-+        <seeCheckboxIsChecked selector="{{AdminManageSwatchSection.nthIsDefault('2')}}" stepKey="CheckDefaultOption"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminWatermarkUploadTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminWatermarkUploadTest.xml
-new file mode 100644
-index 00000000000..e9df186bae5
---- /dev/null
-+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminWatermarkUploadTest.xml
-@@ -0,0 +1,16 @@
-+<?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="AdminWatermarkUploadTest">
-+        <waitForElement selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Swatch Image')}}" stepKey="waitForInputVisible4" after="waitForPreviewImage3"/>
-+        <attachFile selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Swatch Image')}}" userInput="adobe-small.jpg" stepKey="attachFile4" after="waitForInputVisible4"/>
-+        <waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Swatch Image')}}" stepKey="waitForPreviewImage4" after="attachFile4"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontDisplayAllCharactersOnTextSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontDisplayAllCharactersOnTextSwatchTest.xml
-new file mode 100644
-index 00000000000..470421776cf
---- /dev/null
-+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontDisplayAllCharactersOnTextSwatchTest.xml
-@@ -0,0 +1,69 @@
-+<?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="StorefrontDisplayAllCharactersOnTextSwatchTest" extends="StorefrontFilterByTextSwatchTest">
-+        <annotations>
-+            <features value="Swatches"/>
-+            <stories value="Create/configure swatches and check the display characters length"/>
-+            <title value="Admin can create product attribute with text swatch and view the display characters  in full"/>
-+            <description value="Admin can create product attribute with text swatch and check the display characters in full"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MC-5975"/>
-+            <group value="Swatches"/>
-+        </annotations>
-+
-+        <!-- Create swatch #3 -->
-+        <click selector="{{AdminManageSwatchSection.addSwatchText}}" stepKey="clickAddSwatch2" after="fillDescription1"/>
-+        <fillField selector="{{AdminManageSwatchSection.swatchTextByIndex('2')}}" userInput="1234567890123456789012341234" stepKey="fillSwatch2" after="clickAddSwatch2"/>
-+        <fillField selector="{{AdminManageSwatchSection.swatchAdminDescriptionByIndex('2')}}" userInput="1234567890123456789012341234GreenD" stepKey="fillDescription2" after="fillSwatch2"/>
-+
-+        <!-- Create swatch #4 -->
-+        <click selector="{{AdminManageSwatchSection.addSwatchText}}" stepKey="clickAddSwatch3" after="fillDescription2"/>
-+        <fillField selector="{{AdminManageSwatchSection.swatchTextByIndex('3')}}" userInput="123456789012345678901" stepKey="fillSwatch3" after="clickAddSwatch3"/>
-+        <fillField selector="{{AdminManageSwatchSection.swatchAdminDescriptionByIndex('3')}}" userInput="123456789012345678901BrownD" stepKey="fillDescription3" after="fillSwatch3"/>
-+
-+        <see selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '3')}}" userInput="123456789012345678901" stepKey="seeGreen" after="seeBlue"/>
-+        <see selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '4')}}" userInput="123456789012345678901" stepKey="seeBrown" after="seeGreen"/>
-+
-+        <!-- Go to the category page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage2"/>
-+        <waitForPageLoad stepKey="waitForCategoryPage2"/>
-+
-+        <!-- Verify swatch2 is present and shown in full display text characters on storefront in the layered navigation -->
-+        <see selector="{{StorefrontCategorySidebarSection.layeredFilterBlock}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeInLayeredNav2"/>
-+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle(ProductAttributeFrontendLabel.label)}}" stepKey="expandAttribute2"/>
-+        <click selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '2')}}" stepKey="filterBySwatch2"/>
-+
-+        <!-- Go to the category page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage3"/>
-+        <waitForPageLoad stepKey="waitForCategoryPage3"/>
-+
-+        <!-- Verify swatch3 is present and shown in full display text characters on storefront in the layered navigation -->
-+        <see selector="{{StorefrontCategorySidebarSection.layeredFilterBlock}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeInLayeredNav3"/>
-+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle(ProductAttributeFrontendLabel.label)}}" stepKey="expandAttribute3"/>
-+        <click selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '3')}}" stepKey="filterBySwatch3"/>
-+
-+        <!-- Go to the category page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage4"/>
-+        <waitForPageLoad stepKey="waitForCategoryPage4"/>
-+
-+        <!-- Verify swatch4 is present and shown in full display text characters on storefront in the layered navigation -->
-+        <see selector="{{StorefrontCategorySidebarSection.layeredFilterBlock}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeInLayeredNav4"/>
-+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle(ProductAttributeFrontendLabel.label)}}" stepKey="expandAttribute4"/>
-+        <click selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '4')}}" stepKey="filterBySwatch4"/>
-+
-+        <!-- Deletes the created configurable product-->
-+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteConfigurableProduct">
-+            <argument name="product" value="BaseConfigurableProduct"/>
-+        </actionGroup>
-+
-+    </test>
-+
-+</tests>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
-new file mode 100644
-index 00000000000..b1ae06428c0
---- /dev/null
-+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
-@@ -0,0 +1,155 @@
-+<?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="StorefrontFilterByImageSwatchTest">
-+        <annotations>
-+            <features value="Swatches"/>
-+            <stories value="View swatches in product listing"/>
-+            <title value="Customers can filter products using image swatches"/>
-+            <description value="Customers can filter products using image swatches"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3461"/>
-+            <group value="Swatches"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-+        </after>
-+
-+        <!-- Begin creating a new product attribute -->
-+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
-+        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
-+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
-+
-+        <!-- Select visual swatch -->
-+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="swatch_visual" stepKey="selectInputType"/>
-+
-+        <!-- Set Update Product Preview Image to Yes-->
-+        <selectOption selector="{{AttributePropertiesSection.UpdateProductPreviewImage}}" userInput="Yes" stepKey="setUpdateProductPreviewImage"/>
-+
-+        <!-- This hack is because the same <input type="file"> is re-purposed used for all uploads. -->
-+        <executeJS function="HTMLInputElement.prototype.click = function() { if(this.type !== 'file') HTMLElement.prototype.click.call(this); };" stepKey="disableClick"/>
-+
-+        <!-- Set swatch #1 image using file upload -->
-+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch1"/>
-+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch1">
-+            <argument name="index" value="0"/>
-+        </actionGroup>
-+        <click selector="{{AdminManageSwatchSection.nthUploadFile('1')}}" stepKey="clickUploadFile1"/>
-+        <attachFile selector="input[name='datafile']" userInput="adobe-thumb.jpg" stepKey="attachFile1"/>
-+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('0')}}" userInput="adobe-thumb" stepKey="fillAdmin1"/>
-+
-+        <!-- Set swatch #2 image using the file upload -->
-+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch2"/>
-+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch2">
-+            <argument name="index" value="1"/>
-+        </actionGroup>
-+        <click selector="{{AdminManageSwatchSection.nthUploadFile('2')}}" stepKey="clickUploadFile2"/>
-+        <attachFile selector="input[name='datafile']" userInput="adobe-small.jpg" stepKey="attachFile2"/>
-+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('1')}}" userInput="adobe-small" stepKey="fillAdmin2"/>
-+
-+        <!-- Set scope to global -->
-+        <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
-+        <selectOption selector="{{AttributePropertiesSection.Scope}}" userInput="1" stepKey="selectGlobalScope"/>
-+
-+        <!-- Set Use In Layered Navigation -->
-+        <scrollToTopOfPage stepKey="scrollToTop1"/>
-+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="goToStorefrontProperties"/>
-+        <selectOption selector="{{AttributePropertiesSection.useInLayeredNavigation}}" userInput="1" stepKey="selectUseInLayeredNavigation"/>
-+
-+        <!-- Save the new attribute -->
-+        <click selector="{{AttributePropertiesSection.SaveAndEdit}}" stepKey="clickSaveAndEdit1"/>
-+        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccess"/>
-+
-+        <!-- Create a configurable product to verify the storefront with -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad time="30" stepKey="waitForProductGrid"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateConfigurableProduct">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+        <!-- Add image to configurable product -->
-+        <actionGroup ref="addProductImage" stepKey="addFirstImageForProductConfigurable">
-+            <argument name="image" value="MagentoLogo"/>
-+        </actionGroup>
-+        <!-- Add image to configurable product -->
-+        <actionGroup ref="addProductImage" stepKey="addSecondImageForProductConfigurable">
-+            <argument name="image" value="TestImageNew"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Create configurations based off the visual swatch we created earlier -->
-+        <actionGroup ref="createConfigurationsForAttributeWithImages" stepKey="createConfigurations">
-+            <argument name="attributeCode" value="{{ProductAttributeFrontendLabel.label}}"/>
-+            <argument name="image" value="TestImageAdobe"/>
-+        </actionGroup>
-+
-+        <!-- Go to the category page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPage"/>
-+
-+        <!-- Verify swatches are present in the layered navigation -->
-+        <see selector="{{StorefrontCategorySidebarSection.layeredFilterBlock}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeInLayeredNav"/>
-+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle(ProductAttributeFrontendLabel.label)}}" stepKey="expandAttribute"/>
-+        <grabAttributeFrom selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '1')}}" userInput="style" stepKey="grabSwatch1"/>
-+        <grabAttributeFrom selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '2')}}" userInput="style" stepKey="grabSwatch2"/>
-+        <assertContains stepKey="assertSwatch1">
-+            <expectedResult type="string">adobe-thumb</expectedResult>
-+            <actualResult type="string">{$grabSwatch1}</actualResult>
-+        </assertContains>
-+        <assertContains stepKey="assertSwatch2">
-+            <expectedResult type="string">adobe-small</expectedResult>
-+            <actualResult type="string">{$grabSwatch2}</actualResult>
-+        </assertContains>
-+
-+        <!-- Click a swatch and expect to see the configurable product, not see the simple product -->
-+        <click selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '1')}}" stepKey="filterBySwatch1"/>
-+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{ApiConfigurableProduct.name}}" stepKey="seeConfigurableProduct"/>
-+        <dontSee selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="$$createSimpleProduct.name$$" stepKey="dontSeeSimpleProduct"/>
-+
-+        <!-- Assert configurable product in storefront product page -->
-+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+        </actionGroup>
-+
-+        <!-- Assert configurable product image in storefront product page -->
-+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="image" value="MagentoLogo"/>
-+        </actionGroup>
-+
-+        <!-- Assert configurable product image in storefront product page -->
-+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductSecondImageStorefrontProductPage">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="image" value="TestImageNew"/>
-+        </actionGroup>
-+
-+        <!-- Click a swatch and expect to see the image from the swatch from the configurable product -->
-+        <click selector="{{StorefrontProductInfoMainSection.swatchOptionByLabel('adobe-thumb')}}" stepKey="clickSwatchOption"/>
-+
-+        <!-- Assert swatch option image for configurable product image in storefront product page -->
-+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertSwatchImageStorefrontProductPage">
-+            <argument name="product" value="ApiConfigurableProduct"/>
-+            <argument name="image" value="TestImageAdobe"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
-new file mode 100644
-index 00000000000..28df5ffd534
---- /dev/null
-+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
-@@ -0,0 +1,100 @@
-+<?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="StorefrontFilterByTextSwatchTest">
-+        <annotations>
-+            <features value="Swatches"/>
-+            <stories value="View swatches in product listing"/>
-+            <title value="Customers can filter products using text swatches"/>
-+            <description value="Customers can filter products using text swatches"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3462"/>
-+            <group value="Swatches"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-+        </after>
-+
-+        <!-- Begin creating a new product attribute -->
-+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
-+        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
-+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
-+
-+        <!-- Select text swatch -->
-+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="swatch_text" stepKey="selectInputType"/>
-+
-+        <!-- Create swatch #1 -->
-+        <click selector="{{AdminManageSwatchSection.addSwatchText}}" stepKey="clickAddSwatch0"/>
-+        <fillField selector="{{AdminManageSwatchSection.swatchTextByIndex('0')}}" userInput="red" stepKey="fillSwatch0"/>
-+        <fillField selector="{{AdminManageSwatchSection.swatchAdminDescriptionByIndex('0')}}" userInput="Something red." stepKey="fillDescription0"/>
-+
-+        <!-- Create swatch #2 -->
-+        <click selector="{{AdminManageSwatchSection.addSwatchText}}" stepKey="clickAddSwatch1"/>
-+        <fillField selector="{{AdminManageSwatchSection.swatchTextByIndex('1')}}" userInput="blue" stepKey="fillSwatch1"/>
-+        <fillField selector="{{AdminManageSwatchSection.swatchAdminDescriptionByIndex('1')}}" userInput="Something blue." stepKey="fillDescription1"/>
-+
-+        <!-- Set scope to global -->
-+        <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
-+        <selectOption selector="{{AttributePropertiesSection.Scope}}" userInput="1" stepKey="selectGlobalScope"/>
-+
-+        <!-- Set Use In Layered Navigation -->
-+        <scrollToTopOfPage stepKey="scrollToTop1"/>
-+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="goToStorefrontProperties"/>
-+        <selectOption selector="{{AttributePropertiesSection.useInLayeredNavigation}}" userInput="1" stepKey="selectUseInLayeredNavigation"/>
-+
-+        <!-- Workaround: click on the main tab again to ensure the values are saved, otherwise the swatches do not get saved -->
-+        <scrollToTopOfPage stepKey="scrollToTop2"/>
-+        <click selector="{{AttributePropertiesSection.propertiesTab}}" stepKey="goBackToPropertiesTab"/>
-+
-+        <!-- Save the new attribute -->
-+        <click selector="{{AttributePropertiesSection.SaveAndEdit}}" stepKey="clickSaveAndEdit1"/>
-+        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccess"/>
-+
-+        <!-- Create a configurable product to verify the storefront with -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad stepKey="waitForProductGrid"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateConfigurableProduct">
-+            <argument name="product" value="BaseConfigurableProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="BaseConfigurableProduct"/>
-+        </actionGroup>
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Create configurations based off the text swatch we created earlier -->
-+        <actionGroup ref="createConfigurationsForAttribute" stepKey="createConfigurations">
-+            <argument name="attributeCode" value="{{ProductAttributeFrontendLabel.label}}"/>
-+        </actionGroup>
-+
-+        <!-- Go to the category page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPage"/>
-+
-+        <!-- Verify swatches are present in the layered navigation -->
-+        <see selector="{{StorefrontCategorySidebarSection.layeredFilterBlock}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeInLayeredNav"/>
-+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle(ProductAttributeFrontendLabel.label)}}" stepKey="expandAttribute"/>
-+        <see selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '1')}}" userInput="red" stepKey="seeRed"/>
-+        <see selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '2')}}" userInput="blue" stepKey="seeBlue"/>
-+
-+        <!-- Click a swatch and expect to see the configurable product, not see the simple product -->
-+        <click selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '1')}}" stepKey="filterBySwatch1"/>
-+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{BaseConfigurableProduct.name}}" stepKey="seeConfigurableProduct"/>
-+        <dontSee selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="$$createSimpleProduct.name$$" stepKey="dontSeeSimpleProduct"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
-new file mode 100644
-index 00000000000..d12cb0433fe
---- /dev/null
-+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
-@@ -0,0 +1,120 @@
-+<?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="StorefrontFilterByVisualSwatchTest">
-+        <annotations>
-+            <features value="Swatches"/>
-+            <stories value="View swatches in product listing"/>
-+            <title value="Customers can filter products using visual swatches"/>
-+            <description value="Customers can filter products using visual swatches "/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-3082"/>
-+            <group value="Swatches"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-+        </after>
-+
-+        <!-- Begin creating a new product attribute -->
-+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
-+        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
-+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
-+
-+        <!-- Select visual swatch -->
-+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="swatch_visual" stepKey="selectInputType"/>
-+
-+        <!-- Set swatch #1 using the color picker -->
-+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch1"/>
-+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch1">
-+            <argument name="index" value="0"/>
-+        </actionGroup>
-+        <click selector="{{AdminManageSwatchSection.nthChooseColor('1')}}" stepKey="clickChooseColor1"/>
-+        <actionGroup ref="setColorPickerByHex" stepKey="fillHex1">
-+            <argument name="nthColorPicker" value="1"/>
-+            <argument name="hexColor" value="e74c3c"/>
-+        </actionGroup>
-+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('0')}}" userInput="red" stepKey="fillAdmin1"/>
-+
-+        <!-- Set swatch #2 using the color picker -->
-+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch2"/>
-+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch2">
-+            <argument name="index" value="1"/>
-+        </actionGroup>
-+        <click selector="{{AdminManageSwatchSection.nthChooseColor('2')}}" stepKey="clickChooseColor2"/>
-+        <actionGroup ref="setColorPickerByHex" stepKey="fillHex2">
-+            <argument name="nthColorPicker" value="2"/>
-+            <argument name="hexColor" value="3498db"/>
-+        </actionGroup>
-+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('1')}}" userInput="blue" stepKey="fillAdmin2"/>
-+
-+        <!-- Set scope to global -->
-+        <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
-+        <selectOption selector="{{AttributePropertiesSection.Scope}}" userInput="1" stepKey="selectGlobalScope"/>
-+
-+        <!-- Set Use In Layered Navigation -->
-+        <scrollToTopOfPage stepKey="scrollToTop1"/>
-+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="goToStorefrontProperties"/>
-+        <selectOption selector="{{AttributePropertiesSection.useInLayeredNavigation}}" userInput="1" stepKey="selectUseInLayeredNavigation"/>
-+
-+        <!-- Save the new attribute -->
-+        <click selector="{{AttributePropertiesSection.SaveAndEdit}}" stepKey="clickSaveAndEdit1"/>
-+        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccess"/>
-+
-+        <!-- Create a configurable product to verify the storefront with -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-+        <waitForPageLoad time="30" stepKey="waitForProductGrid"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateConfigurableProduct">
-+            <argument name="product" value="BaseConfigurableProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="BaseConfigurableProduct"/>
-+        </actionGroup>
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
-+
-+        <!-- Create configurations based off the visual watch we created earlier -->
-+        <actionGroup ref="createConfigurationsForAttribute" stepKey="createConfigurations">
-+            <argument name="attributeCode" value="{{ProductAttributeFrontendLabel.label}}"/>
-+        </actionGroup>
-+
-+        <!-- Go to the category page -->
-+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPage"/>
-+
-+        <!-- Verify swatches are present in the layered navigation -->
-+        <see selector="{{StorefrontCategorySidebarSection.layeredFilterBlock}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeInLayeredNav"/>
-+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle(ProductAttributeFrontendLabel.label)}}" stepKey="expandAttribute"/>
-+        <grabAttributeFrom selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '1')}}" userInput="style" stepKey="grabSwatch1"/>
-+        <grabAttributeFrom selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '2')}}" userInput="style" stepKey="grabSwatch2"/>
-+        <assertContains stepKey="assertSwatch1">
-+            <expectedResult type="string">rgb(231, 77, 60)</expectedResult>
-+            <actualResult type="string">{$grabSwatch1}</actualResult>
-+        </assertContains>
-+        <assertContains stepKey="assertSwatch2">
-+            <expectedResult type="string">rgb(52, 152, 219)</expectedResult>
-+            <actualResult type="string">{$grabSwatch2}</actualResult>
-+        </assertContains>
-+
-+        <!-- Click a swatch and expect to see the configurable product, not see the simple product -->
-+        <click selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '1')}}" stepKey="filterBySwatch1"/>
-+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{BaseConfigurableProduct.name}}" stepKey="seeConfigurableProduct"/>
-+        <dontSee selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="$$createSimpleProduct.name$$" stepKey="dontSeeSimpleProduct"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
-new file mode 100644
-index 00000000000..323b10507fe
---- /dev/null
-+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
-@@ -0,0 +1,94 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <test name="StorefrontSwatchAttributesDisplayInWidgetCMSTest">
-+        <annotations>
-+            <features value="ConfigurableProduct"/>
-+            <stories value="Swatches"/>
-+            <title value="Swatch Attribute is not displayed in the Widget CMS"/>
-+            <description value="Swatch Attribute is not displayed in the Widget CMS"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-96469"/>
-+            <useCaseId value="MAGETWO-96406"/>
-+            <group value="ConfigurableProduct"/>
-+            <skip>
-+                <issueId value="MQE-1424" />
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
-+            <createData entity="NewRootCategory" stepKey="createRootCategory"/>
-+        </before>
-+
-+        <after>
-+            <!--delete created configurable product-->
-+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-+                <argument name="product" value="BaseConfigurableProduct"/>
-+            </actionGroup>
-+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-+            <waitForPageLoad stepKey="waitForAdminProductGridLoad"/>
-+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
-+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteAttribute">
-+                <argument name="ProductAttribute" value="visualSwatchAttribute"/>
-+            </actionGroup>
-+            <!--delete root category-->
-+            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
-+            <waitForPageLoad time="30" stepKey="waitForPageCategoryLoad"/>
-+            <click selector="{{AdminCategorySidebarTreeSection.categoryInTree('$$createRootCategory.name$$')}}" stepKey="clickOnDefaultRootCategory"/>
-+            <waitForPageLoad stepKey="waitForPageDefaultCategoryEditLoad" />
-+            <seeElement selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="assertDeleteButtonIsPresent1"/>
-+            <click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="DeleteDefaultRootCategory"/>
-+            <waitForElementVisible selector="{{AdminCategoryModalSection.ok}}" stepKey="waitForModalDeleteDefaultRootCategory" />
-+            <click selector="{{AdminCategoryModalSection.ok}}" stepKey="acceptModal1"/>
-+            <waitForElementVisible selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="waitForPageReloadAfterDeleteDefaultCategory"/>
-+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
-+            <!--logout-->
-+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-+        </after>
-+        <!--Login-->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdmin"/>
-+         <!--Create a configurable swatch product via the UI -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
-+        <waitForPageLoad stepKey="waitForProductPage"/>
-+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
-+            <argument name="product" value="BaseConfigurableProduct"/>
-+        </actionGroup>
-+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
-+            <argument name="product" value="BaseConfigurableProduct"/>
-+        </actionGroup>
-+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createRootCategory.name$$]" stepKey="searchAndSelectCategory"/>
-+        <!--Add swatch attribute to configurable product-->
-+        <actionGroup ref="AddVisualSwatchToProductWithStorefrontConfigActionGroup" stepKey="addSwatchToProduct"/>
-+
-+        <!--Create CMS page-->
-+        <actionGroup ref="CreateNewPageWithWidget" stepKey="createCMSPageWithWidget">
-+            <argument name="category" value="$$createRootCategory.name$$"/>
-+            <argument name="condition" value="Category"/>
-+            <argument name="widgetType" value="Catalog Products List"/>
-+        </actionGroup>
-+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickToExpandSEOSection"/>
-+        <scrollTo selector="{{CmsNewPagePageSeoSection.urlKey}}" stepKey="scrollToUrlKey"/>
-+        <grabValueFrom selector="{{CmsNewPagePageSeoSection.urlKey}}"  stepKey="grabTextFromUrlKey"/>
-+        <actionGroup ref="logout" stepKey="logout"/>
-+
-+        <!--Open Storefront page for the new created page-->
-+        <amOnPage url="{{StorefrontHomePage.url}}$grabTextFromUrlKey" stepKey="gotToCreatedCmsPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productSwatch(visualSwatchOption1.default_label)}}" stepKey="assertAddedWidgetS"/>
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productSwatch(visualSwatchOption2.default_label)}}" stepKey="assertAddedWidgetM"/>
-+
-+        <!--Login to delete CMS page-->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <actionGroup ref="DeletePageByUrlKeyActionGroup" stepKey="deletePage">
-+            <argument name="UrlKey" value="$grabTextFromUrlKey"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
-index cc6699e9891..7ef030ef8df 100644
---- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
-+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontSwatchProductWithFileCustomOptionTest">
-         <annotations>
-             <features value="ConfigurableProduct"/>
-diff --git a/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php b/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php
-index 7a110c63da7..5a11e2787bc 100644
---- a/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php
-+++ b/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php
-@@ -20,6 +20,9 @@ class MediaTest extends \PHPUnit\Framework\TestCase
-     /** @var \Magento\Catalog\Model\ProductFactory|\PHPUnit_Framework_MockObject_MockObject */
-     private $productModelFactoryMock;
- 
-+    /** @var \Magento\PageCache\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
-+    private $config;
-+
-     /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
-     private $productMock;
- 
-@@ -29,6 +32,9 @@ class MediaTest extends \PHPUnit\Framework\TestCase
-     /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
-     private $requestMock;
- 
-+    /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    private $responseMock;
-+
-     /** @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject */
-     private $resultFactory;
- 
-@@ -57,11 +63,20 @@ class MediaTest extends \PHPUnit\Framework\TestCase
-             \Magento\Catalog\Model\ProductFactory::class,
-             ['create']
-         );
-+        $this->config = $this->createMock(\Magento\PageCache\Model\Config::class);
-+        $this->config->method('getTtl')->willReturn(1);
-+
-         $this->productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
-         $this->contextMock = $this->createMock(\Magento\Framework\App\Action\Context::class);
- 
-         $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
-         $this->contextMock->method('getRequest')->willReturn($this->requestMock);
-+        $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\ResponseInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['setPublicHeaders'])
-+            ->getMockForAbstractClass();
-+        $this->responseMock->method('setPublicHeaders')->willReturnSelf();
-+        $this->contextMock->method('getResponse')->willReturn($this->responseMock);
-         $this->resultFactory = $this->createPartialMock(\Magento\Framework\Controller\ResultFactory::class, ['create']);
-         $this->contextMock->method('getResultFactory')->willReturn($this->resultFactory);
- 
-@@ -73,7 +88,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
-             [
-                 'context' => $this->contextMock,
-                 'swatchHelper' => $this->swatchHelperMock,
--                'productModelFactory' => $this->productModelFactoryMock
-+                'productModelFactory' => $this->productModelFactoryMock,
-+                'config' => $this->config
-             ]
-         );
-     }
-@@ -86,6 +102,10 @@ class MediaTest extends \PHPUnit\Framework\TestCase
-             ->method('load')
-             ->with(59)
-             ->willReturn($this->productMock);
-+        $this->productMock
-+            ->expects($this->once())
-+            ->method('getIdentities')
-+            ->willReturn(['tags']);
- 
-         $this->productModelFactoryMock
-             ->expects($this->once())
-diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php
-index 21df8c79550..317ea771072 100644
---- a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php
-+++ b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php
-@@ -191,7 +191,7 @@ class EavAttributeTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Magento\Framework\Exception\InputException
--     * @expectedExceptionMessage Admin is a required field in the each row
-+     * @expectedExceptionMessage Admin is a required field in each row
-      */
-     public function testBeforeSaveWithFailedValidation()
-     {
-diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductImageTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductImageTest.php
-index 895a08062d9..11a33b4d040 100644
---- a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductImageTest.php
-+++ b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductImageTest.php
-@@ -77,7 +77,11 @@ class ProductImageTest extends \PHPUnit\Framework\TestCase
-             ->method('getParams')
-             ->willReturn($expected['getParams']);
- 
--        $this->getFilterArray($expected);
-+        $this->eavConfigMock
-+            ->method('getEntityAttributes')
-+            ->with('catalog_product')
-+            ->willReturn(['color' => $this->attributeMock]);
-+
-         $this->canReplaceImageWithSwatch($expected);
-         $this->swatchesHelperMock
-             ->expects($this->exactly($expected['loadVariationByFallback_count']))
-@@ -158,7 +162,6 @@ class ProductImageTest extends \PHPUnit\Framework\TestCase
-                 [
-                     'page_handle' => 'category_page_grid',
-                     'getParams' => ['color' => 31],
--                    'attribute_codes_array' => ['color'],
-                     'attribute_code' => 'color',
-                     'getId_count' => 1,
-                     'getId' => 332,
-@@ -177,7 +180,6 @@ class ProductImageTest extends \PHPUnit\Framework\TestCase
-                 [
-                     'page_handle' => 'category_page_grid',
-                     'getParams' => ['color' => 31],
--                    'attribute_codes_array' => ['color'],
-                     'attribute_code' => 'color',
-                     'getId_count' => 1,
-                     'getId' => 332,
-@@ -196,7 +198,6 @@ class ProductImageTest extends \PHPUnit\Framework\TestCase
-                 [
-                     'page_handle' => 'category_page_grid',
-                     'getParams' => ['color' => 31],
--                    'attribute_codes_array' => ['color'],
-                     'attribute_code' => 'color',
-                     'getId_count' => 1,
-                     'getId' => 332,
-diff --git a/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributesProviderTest.php b/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributesProviderTest.php
-index b87fd84ce89..e9f5b580204 100644
---- a/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributesProviderTest.php
-+++ b/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributesProviderTest.php
-@@ -3,10 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Swatches\Test\Unit\Model;
- 
- use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
--use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Swatches\Model\SwatchAttributeCodes;
- use Magento\Swatches\Model\SwatchAttributesProvider;
-@@ -35,26 +35,26 @@ class SwatchAttributesProviderTest extends \PHPUnit\Framework\TestCase
-     private $productMock;
- 
-     /**
--     * @var SwatchAttributeType|\PHPUnit_Framework_MockObject_MockObject
-+     * @var SwatchAttributeType | \PHPUnit_Framework_MockObject_MockObject
-      */
--    private $swatchTypeCheckerMock;
-+    private $swatchTypeChecker;
- 
-     protected function setUp()
-     {
-         $this->typeConfigurable = $this->createPartialMock(
-             Configurable::class,
--            ['getConfigurableAttributes', 'getCodes']
-+            ['getConfigurableAttributes', 'getCodes', 'getProductAttribute']
-         );
- 
-         $this->swatchAttributeCodes = $this->createMock(SwatchAttributeCodes::class);
- 
-         $this->productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getId', 'getTypeId']);
--        $this->swatchTypeCheckerMock = $this->createMock(SwatchAttributeType::class);
-+        $this->swatchTypeChecker = $this->createMock(SwatchAttributeType::class);
- 
-         $this->swatchAttributeProvider = (new ObjectManager($this))->getObject(SwatchAttributesProvider::class, [
-             'typeConfigurable' => $this->typeConfigurable,
-             'swatchAttributeCodes' => $this->swatchAttributeCodes,
--            'swatchTypeChecker' => $this->swatchTypeCheckerMock,
-+            'swatchTypeChecker' => $this->swatchTypeChecker,
-         ]);
-     }
- 
-@@ -64,8 +64,9 @@ class SwatchAttributesProviderTest extends \PHPUnit\Framework\TestCase
-         $this->productMock->method('getTypeId')
-             ->willReturn(Configurable::TYPE_CODE);
- 
--        $productAttributeMock = $this->getMockBuilder(Attribute::class)
-+        $attributeMock =  $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
-             ->disableOriginalConstructor()
-+            ->setMethods(['setStoreId', 'getData', 'setData', 'getSource', 'hasData'])
-             ->getMock();
- 
-         $configAttributeMock = $this->createPartialMock(
-@@ -78,7 +79,7 @@ class SwatchAttributesProviderTest extends \PHPUnit\Framework\TestCase
- 
-         $configAttributeMock
-             ->method('getProductAttribute')
--            ->willReturn($productAttributeMock);
-+            ->willReturn($attributeMock);
- 
-         $this->typeConfigurable
-             ->method('getConfigurableAttributes')
-@@ -90,12 +91,10 @@ class SwatchAttributesProviderTest extends \PHPUnit\Framework\TestCase
-             ->method('getCodes')
-             ->willReturn($swatchAttributes);
- 
--        $this->swatchTypeCheckerMock->expects($this->once())->method('isSwatchAttribute')->willReturn(true);
-+        $this->swatchTypeChecker->expects($this->once())->method('isSwatchAttribute')->willReturn(true);
-+
-         $result = $this->swatchAttributeProvider->provide($this->productMock);
- 
--        $this->assertEquals(
--            [1 => $productAttributeMock],
--            $result
--        );
-+        $this->assertEquals([1 => $attributeMock], $result);
-     }
- }
-diff --git a/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php b/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php
-index 45c68036626..f8ba5c20250 100644
---- a/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php
-+++ b/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php
-@@ -10,7 +10,7 @@ namespace Magento\Swatches\Test\Unit\Observer;
-  */
- class AddFieldsToAttributeObserverTest extends \PHPUnit\Framework\TestCase
- {
--    /** @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-     protected $moduleManagerMock;
- 
-     /** @var \Magento\Config\Model\Config\Source\Yesno|\PHPUnit_Framework_MockObject_MockObject */
-diff --git a/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php b/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php
-index f78797d93cb..24afa1045e5 100644
---- a/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php
-+++ b/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php
-@@ -10,7 +10,7 @@ namespace Magento\Swatches\Test\Unit\Observer;
-  */
- class AddSwatchAttributeTypeObserverTest extends \PHPUnit\Framework\TestCase
- {
--    /** @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject */
-+    /** @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-     protected $moduleManagerMock;
- 
-     /** @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject */
-diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json
-index 0940003b6a7..09d3e05008a 100644
---- a/app/code/Magento/Swatches/composer.json
-+++ b/app/code/Magento/Swatches/composer.json
-@@ -13,6 +13,7 @@
-         "magento/module-configurable-product": "*",
-         "magento/module-customer": "*",
-         "magento/module-eav": "*",
-+        "magento/module-page-cache": "*",
-         "magento/module-media-storage": "*",
-         "magento/module-store": "*",
-         "magento/module-theme": "*"
-diff --git a/app/code/Magento/Swatches/etc/db_schema.xml b/app/code/Magento/Swatches/etc/db_schema.xml
-index c960f27b0fb..3dafbc38764 100644
---- a/app/code/Magento/Swatches/etc/db_schema.xml
-+++ b/app/code/Magento/Swatches/etc/db_schema.xml
-@@ -20,20 +20,20 @@
-         <column xsi:type="smallint" name="type" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Swatch type: 0 - text, 1 - visual color, 2 - visual image"/>
-         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Swatch Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="swatch_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="EAV_ATTRIBUTE_OPTION_SWATCH_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_OPTION_SWATCH_STORE_ID_STORE_STORE_ID"
-                     table="eav_attribute_option_swatch" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="EAV_ATTR_OPT_SWATCH_OPT_ID_EAV_ATTR_OPT_OPT_ID"
-+        <constraint xsi:type="foreign" referenceId="EAV_ATTR_OPT_SWATCH_OPT_ID_EAV_ATTR_OPT_OPT_ID"
-                     table="eav_attribute_option_swatch" column="option_id" referenceTable="eav_attribute_option"
-                     referenceColumn="option_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="EAV_ATTRIBUTE_OPTION_SWATCH_STORE_ID_OPTION_ID">
-+        <constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_OPTION_SWATCH_STORE_ID_OPTION_ID">
-             <column name="store_id"/>
-             <column name="option_id"/>
-         </constraint>
--        <index name="EAV_ATTRIBUTE_OPTION_SWATCH_SWATCH_ID" indexType="btree">
-+        <index referenceId="EAV_ATTRIBUTE_OPTION_SWATCH_SWATCH_ID" indexType="btree">
-             <column name="swatch_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Swatches/i18n/de_DE.csv b/app/code/Magento/Swatches/i18n/de_DE.csv
-deleted file mode 100644
-index f0aa34bbef2..00000000000
---- a/app/code/Magento/Swatches/i18n/de_DE.csv
-+++ /dev/null
-@@ -1,2 +0,0 @@
--"Swatch","Swatch"
--"Swatches per Product","Swatches per Product"
-diff --git a/app/code/Magento/Swatches/i18n/en_US.csv b/app/code/Magento/Swatches/i18n/en_US.csv
-index 9fe2ec70675..f35e9a0a46d 100644
---- a/app/code/Magento/Swatches/i18n/en_US.csv
-+++ b/app/code/Magento/Swatches/i18n/en_US.csv
-@@ -1,4 +1,4 @@
--"Admin is a required field in the each row","Admin is a required field in the each row"
-+"Admin is a required field in each row","Admin is a required field in each row"
- "Update Product Preview Image","Update Product Preview Image"
- "Filtering by this attribute will update the product image on catalog page","Filtering by this attribute will update the product image on catalog page"
- "Use Product Image for Swatch if Possible","Use Product Image for Swatch if Possible"
-diff --git a/app/code/Magento/Swatches/i18n/es_ES.csv b/app/code/Magento/Swatches/i18n/es_ES.csv
-deleted file mode 100644
-index f0aa34bbef2..00000000000
---- a/app/code/Magento/Swatches/i18n/es_ES.csv
-+++ /dev/null
-@@ -1,2 +0,0 @@
--"Swatch","Swatch"
--"Swatches per Product","Swatches per Product"
-diff --git a/app/code/Magento/Swatches/i18n/fr_FR.csv b/app/code/Magento/Swatches/i18n/fr_FR.csv
-deleted file mode 100644
-index f0aa34bbef2..00000000000
---- a/app/code/Magento/Swatches/i18n/fr_FR.csv
-+++ /dev/null
-@@ -1,2 +0,0 @@
--"Swatch","Swatch"
--"Swatches per Product","Swatches per Product"
-diff --git a/app/code/Magento/Swatches/i18n/nl_NL.csv b/app/code/Magento/Swatches/i18n/nl_NL.csv
-deleted file mode 100644
-index f0aa34bbef2..00000000000
---- a/app/code/Magento/Swatches/i18n/nl_NL.csv
-+++ /dev/null
-@@ -1,2 +0,0 @@
--"Swatch","Swatch"
--"Swatches per Product","Swatches per Product"
-diff --git a/app/code/Magento/Swatches/i18n/pt_BR.csv b/app/code/Magento/Swatches/i18n/pt_BR.csv
-deleted file mode 100644
-index f0aa34bbef2..00000000000
---- a/app/code/Magento/Swatches/i18n/pt_BR.csv
-+++ /dev/null
-@@ -1,2 +0,0 @@
--"Swatch","Swatch"
--"Swatches per Product","Swatches per Product"
-diff --git a/app/code/Magento/Swatches/i18n/zh_Hans_CN.csv b/app/code/Magento/Swatches/i18n/zh_Hans_CN.csv
-deleted file mode 100644
-index f0aa34bbef2..00000000000
---- a/app/code/Magento/Swatches/i18n/zh_Hans_CN.csv
-+++ /dev/null
-@@ -1,2 +0,0 @@
--"Swatch","Swatch"
--"Swatches per Product","Swatches per Product"
-diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml
-index e63e9f4b2ad..7e62814556b 100644
---- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml
-+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml
-@@ -4,14 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <script type="text/x-magento-init">
-     {
-         "*": {
-             "swatchesProductAttributes": {
--                "hiddenFields": <?= /* @escapeNotVerified */ json_encode($this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields()) ?>
-+                "hiddenFields": <?= /* @noEscape */ json_encode($this->helper(Magento\Catalog\Helper\Data::class)->getAttributeHiddenFields()) ?>
-             }
-         }
-     }
-diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
-index 8d4400b3d04..d436dc8d1ef 100644
---- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
-+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Text */
- 
- $stores = $block->getStoresSortedBySortOrder();
-@@ -20,9 +18,8 @@ $stores = $block->getStoresSortedBySortOrder();
-             <tr id="swatch-text-options-table">
-                 <th class="col-draggable"></th>
-                 <th class="col-default"><span><?= $block->escapeHtml(__('Is Default')) ?></span></th>
--                <?php foreach ($stores as $_store): ?>
--                    <th class="col-swatch col-<%- data.id %>
--                        <?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> _required<?php endif; ?>"
-+                <?php foreach ($stores as $_store) : ?>
-+                    <th class="col-swatch col-swatch-min-width col-<%- data.id %><?= ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) ? ' _required' : '' ?>"
-                         colspan="2">
-                         <span><?= $block->escapeHtml($_store->getName()) ?></span>
-                     </th>
-@@ -41,7 +38,7 @@ $stores = $block->getStoresSortedBySortOrder();
-             </tr>
-             <tr>
-                 <th colspan="<?= (int)$colTotal ?>" class="col-actions-add">
--                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-+                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) : ?>
-                         <button id="add_new_swatch_text_option_button"
-                                 title="<?= $block->escapeHtml(__('Add Swatch')) ?>"
-                                 type="button" class="action- scalable add">
-@@ -57,44 +54,44 @@ $stores = $block->getStoresSortedBySortOrder();
-     <script id="swatch-text-row-template" type="text/x-magento-template">
-         <tr>
-             <td class="col-draggable">
--                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
-+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) : ?>
-                     <div data-role="draggable-handle"
-                          class="draggable-handle"
--                         title="<?= $block->escapeHtml(__('Sort Option')) ?>"></div>
-+                         title="<?= $block->escapeHtmlAttr(__('Sort Option')) ?>"></div>
-                 <?php endif; ?>
-                 <input data-role="order" type="hidden" name="optiontext[order][<%- data.id %>]"
-                        value="<%- data.sort_order %>"
--                    <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>
-+                    <?= ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) ? ' disabled="disabled"' : '' ?>
-                 />
-             </td>
-             <td class="col-default">
-                 <input class="input-radio"
-                        type="<%- data.intype %>"
-                        name="defaulttext[]"
--                       value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
-+                       value="<%- data.id %>" <%- data.checked %><?= ($block->getReadOnly()) ? ' disabled="disabled"' : '' ?>/>
-             </td>
--            <?php foreach ($stores as $_store): ?>
-+            <?php foreach ($stores as $_store) : ?>
-                 <?php $storeId = (int)$_store->getId(); ?>
--                <td class="col-swatch col-<%- data.id %>">
-+                <td class="col-swatch col-swatch-min-width col-<%- data.id %>">
-                     <input class="input-text
-                         swatch-text-field-<?= /* @noEscape */ $storeId ?>
--                        <?php if ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>"
-+                        <?= ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID) ? ' required-option required-unique' : '' ?>"
-                            name="swatchtext[value][<%- data.id %>][<?= /* @noEscape */ $storeId ?>]"
-                            type="text" value="<%- data.swatch<?= /* @noEscape */ $storeId ?> %>"
--                           placeholder="<?= $block->escapeHtml(__("Swatch")) ?>"/>
-+                           placeholder="<?= $block->escapeHtmlAttr(__("Swatch")) ?>"/>
-                 </td>
--                <td class="swatch-col-<%- data.id %>">
-+                <td class="col-swatch-min-width swatch-col-<%- data.id %>">
-                     <input name="optiontext[value][<%- data.id %>][<?= /* @noEscape */ $storeId ?>]"
-                            value="<%- data.store<?= /* @noEscape */ $storeId ?> %>"
--                           class="input-text<?php if ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>"
--                           type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>
--                           placeholder="<?= $block->escapeHtml(__("Description")) ?>"/>
-+                           class="input-text<?= ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID) ? ' required-option' : '' ?>"
-+                           type="text" <?= ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) ? ' disabled="disabled"' : ''?>
-+                           placeholder="<?= $block->escapeHtmlAttr(__("Description")) ?>"/>
-                 </td>
-             <?php endforeach; ?>
-             <td id="delete_button_swatch_container_<%- data.id %>" class="col-delete">
-                 <input type="hidden" class="delete-flag" name="optiontext[delete][<%- data.id %>]" value="" />
--                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
--                    <button title="<?= $block->escapeHtml(__('Delete')) ?>" type="button"
-+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) : ?>
-+                    <button title="<?= $block->escapeHtmlAttr(__('Delete')) ?>" type="button"
-                             class="action- scalable delete delete-option">
-                         <span><?= $block->escapeHtml(__('Delete')) ?></span>
-                     </button>
-@@ -105,10 +102,10 @@ $stores = $block->getStoresSortedBySortOrder();
-     <script type="text/x-magento-init">
-         {
-             "*": {
--                "Magento_Swatches/js/text": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?> ,
-+                "Magento_Swatches/js/text": <?= /* @noEscape */ $block->getJsonConfig() ?> ,
-                 "Magento_Catalog/catalog/product/attribute/unique-validate": {
-                     "element": "required-text-swatch-unique",
--                    "message": "<?= $block->escapeHtml(__("The value of Admin must be unique.")) ?>"
-+                    "message": "<?= $block->escapeJs($block->escapeHtml(__("The value of Admin must be unique."))) ?>"
-                 }
-             }
-         }
-diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
-index 5b971d9a99a..b7b1ab5fc53 100644
---- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
-+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
-@@ -4,15 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Visual */
- 
- $stores = $block->getStoresSortedBySortOrder();
- ?>
- <fieldset class="admin__fieldset fieldset">
-     <legend class="legend">
--        <span><?= $block->escapeHtml( __('Manage Swatch (Values of Your Attribute)')) ?></span>
-+        <span><?= $block->escapeHtml(__('Manage Swatch (Values of Your Attribute)')) ?></span>
-     </legend><br />
-     <div class="admin__control-table-wrapper" id="swatch-visual-options-panel">
-         <table class="data-table clearfix" cellspacing="0">
-@@ -21,13 +19,12 @@ $stores = $block->getStoresSortedBySortOrder();
-                 <th class="col-draggable"></th>
-                 <th class="col-default"><span><?= $block->escapeHtml(__('Is Default')) ?></span></th>
-                 <th><span><?= $block->escapeHtml(__('Swatch')) ?></span></th>
--                <?php foreach ($stores as $_store): ?>
--                    <th<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> class="_required"<?php endif; ?>>
-+                <?php foreach ($stores as $_store) : ?>
-+                    <th<?= ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) ? ' class="_required"' : '' ?>
-                         <span><?= $block->escapeHtml($_store->getName()) ?></span>
-                     </th>
--                <?php endforeach;
--                $colTotal = count($stores) * 2 + 3;
--                ?>
-+                <?php endforeach; ?>
-+                <?php $colTotal = count($stores) * 2 + 3; ?>
-                 <th class="col-delete">&nbsp;</th>
-             </tr>
-             </thead>
-@@ -41,7 +38,7 @@ $stores = $block->getStoresSortedBySortOrder();
-             </tr>
-             <tr>
-                 <th colspan="<?= (int)$colTotal ?>" class="col-actions-add">
--                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
-+                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) : ?>
-                         <button id="add_new_swatch_visual_option_button"
-                                 title="<?= $block->escapeHtml(__('Add Swatch')) ?>"
-                                 type="button" class="action- scalable add">
-@@ -57,14 +54,14 @@ $stores = $block->getStoresSortedBySortOrder();
-     <script id="swatch-visual-row-template" type="text/x-magento-template">
-         <tr>
-             <td class="col-draggable">
--                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
-+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) : ?>
-                     <div data-role="draggable-handle" class="draggable-handle"
-                          title="<?= $block->escapeHtml(__('Sort Option')) ?>"></div>
-                 <?php endif; ?>
--                <input data-role="order" type="hidden" name="optionvisual[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>/>
-+                <input data-role="order" type="hidden" name="optionvisual[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?= ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) ? ' disabled="disabled"' : '' ?>/>
-             </td>
-             <td class="col-default">
--                <input class="input-radio" type="<%- data.intype %>" name="defaultvisual[]" value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
-+                <input class="input-radio" type="<%- data.intype %>" name="defaultvisual[]" value="<%- data.id %>" <%- data.checked %><?= ($block->getReadOnly()) ? ' disabled="disabled"' : '' ?>/>
-             </td>
-             <td class="swatches-visual-col col-default <%- data.empty_class %>">
-                 <?php //@todo add logic getting swatch value from db */ ?>
-@@ -88,17 +85,17 @@ $stores = $block->getStoresSortedBySortOrder();
-                     </div>
-                 </div>
-             </td>
--            <?php foreach ($stores as $_store): ?>
-+            <?php foreach ($stores as $_store) : ?>
-                 <td class="swatch-col-<%- data.id %>">
-                     <input name="optionvisual[value][<%- data.id %>][<?= (int)$_store->getId() ?>]"
-                            value="<%- data.store<?= (int) $_store->getId() ?> %>"
--                           class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>"
--                           type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>/>
-+                           class="input-text<?= ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) ? ' required-option required-unique' : '' ?>"
-+                           type="text" <?= ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) ? ' disabled="disabled"' : '' ?>/>
-                 </td>
-             <?php endforeach; ?>
-             <td id="delete_button_swatch_container_<%- data.id %>" class="col-delete">
-                 <input type="hidden" class="delete-flag" name="optionvisual[delete][<%- data.id %>]" value="" />
--                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) : ?>
-                     <button title="<?= $block->escapeHtml(__('Delete')) ?>" type="button"
-                             class="action- scalable delete delete-option">
-                         <span><?= $block->escapeHtml(__('Delete')) ?></span>
-diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
-index 9cbda396b26..adb13e7f24c 100644
---- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
-+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
-@@ -4,12 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\AttributeValues */
- ?>
--<div data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName() ?>'">
--    <h2 class="steps-wizard-title"><?= /* @escapeNotVerified */  __('Step 2: Attribute Values') ?></h2>
-+<div data-bind="scope: '<?= $block->escapeHtmlAttr($block->getComponentName()) ?>'">
-+    <h2 class="steps-wizard-title"><?= $block->escapeHtml(__('Step 2: Attribute Values')) ?></h2>
-     <div class="steps-wizard-info">
-         <span><?= $block->escapeHtml(__('Select from the following attribute values for this product. Each unique combination of values creates a unique product SKU.')) ?></span>
-     </div>
-@@ -25,7 +23,7 @@
-                     <div class="attribute-entity-title" data-bind="text: label"></div>
-                     <div class="attribute-options-block">
-                         (<span class="attribute-length" data-bind="text: $data.options().length"></span>
--                        <?= /* @escapeNotVerified */  __('Options') ?>)
-+                        <?= $block->escapeHtml(__('Options')) ?>)
-                     </div>
-                 </div>
- 
-@@ -34,19 +32,19 @@
-                             class="action-select-all action-tertiary"
-                             data-bind="click: $parent.selectAllAttributes"
-                             title="<?= $block->escapeHtml(__('Select All')) ?>">
--                        <span><?= /* @escapeNotVerified */  __('Select All') ?></span>
-+                        <span><?= $block->escapeHtml(__('Select All')) ?></span>
-                     </button>
-                     <button type="button"
-                             class="action-deselect-all action-tertiary"
-                             data-bind="click: $parent.deSelectAllAttributes"
-                             title="<?= $block->escapeHtml(__('Deselect All')) ?>">
--                        <span><?= /* @escapeNotVerified */  __('Deselect All') ?></span>
-+                        <span><?=$block->escapeHtml(__('Deselect All')) ?></span>
-                     </button>
-                     <button type="button"
-                             class="action-remove-all action-tertiary"
-                             data-bind="click: $parent.removeAttribute.bind($parent)"
-                             title="<?= $block->escapeHtml(__('Remove Attribute')) ?>">
--                        <span><?= /* @escapeNotVerified */  __('Remove Attribute') ?></span>
-+                        <span><?= $block->escapeHtml(__('Remove Attribute')) ?></span>
-                     </button>
-                 </div>
-             </div>
-@@ -74,14 +72,14 @@
-                                     title="<?= $block->escapeHtml(__('Save Option')) ?>"
-                                     data-action="save"
-                                     data-bind="click: $parents[1].saveOption.bind($parent)">
--                                <span><?= /* @escapeNotVerified */  __('Save Option') ?></span>
-+                                <span><?= $block->escapeHtml(__('Save Option')) ?></span>
-                             </button>
-                             <button type="button"
-                                     class="action-remove"
-                                     title="<?= $block->escapeHtml(__('Remove Option')) ?>"
-                                     data-action="remove"
-                                     data-bind="click: $parents[1].removeOption.bind($parent)">
--                                <span><?= /* @escapeNotVerified */  __('Remove Option') ?></span>
-+                                <span><?= $block->escapeHtml(__('Remove Option')) ?></span>
-                             </button>
-                         </div>
-                     </li>
-@@ -91,7 +89,7 @@
-                     type="button"
-                     data-action="addOption"
-                     data-bind="click: $parent.createOption, visible: canCreateOption">
--                <span><?= /* @escapeNotVerified */  __('Create New Value') ?></span>
-+                <span><?= $block->escapeHtml(__('Create New Value')) ?></span>
-             </button>
-         </div>
-     </div>
-@@ -101,11 +99,11 @@
-         "*": {
-             "Magento_Ui/js/core/app": {
-                 "components": {
--                    "<?= /* @escapeNotVerified */  $block->getComponentName() ?>": {
-+                    "<?= $block->escapeJs($block->getComponentName()) ?>": {
-                         "component": "Magento_ConfigurableProduct/js/variations/steps/attributes_values",
--                        "appendTo": "<?= /* @escapeNotVerified */  $block->getParentComponentName() ?>",
--                        "optionsUrl": "<?= /* @escapeNotVerified */  $block->getUrl('catalog/product_attribute/getAttributes') ?>",
--                        "createOptionsUrl": "<?= /* @escapeNotVerified */  $block->getUrl('catalog/product_attribute/createOptions') ?>"
-+                        "appendTo": "<?= $block->escapeJs($block->getParentComponentName()) ?>",
-+                        "optionsUrl": "<?= $block->escapeJs($block->escapeUrl($block->getUrl('catalog/product_attribute/getAttributes'))) ?>",
-+                        "createOptionsUrl": "<?= $block->escapeJs($block->escapeUrl($block->getUrl('catalog/product_attribute/createOptions'))) ?>"
-                     }
-                 }
-             }
-diff --git a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml
-index 1c58243be32..b38e8ecc6e2 100644
---- a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml
-+++ b/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml
-@@ -13,7 +13,7 @@
-                     <level>2</level>
-                     <label translate="true">Swatch Image</label>
-                 </settings>
--                <field name="watermark_swatch_image_image" formElement="fileUploader">
-+                <field name="watermark_swatch_image_image" formElement="imageUploader">
-                     <settings>
-                         <label translate="true">Image</label>
-                         <componentType>imageUploader</componentType>
-diff --git a/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css b/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
-index d170ed0345a..b0ea10b1ed9 100644
---- a/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
-+++ b/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
-@@ -149,6 +149,26 @@
-     width: 50px;
- }
- 
-+.col-swatch-min-width {
-+    min-width: 65px;
-+}
-+
-+[class^=swatch-col],
-+[class^=col-]:not(.col-draggable):not(.col-default) {
-+    min-width: 150px;
-+}
-+
-+#swatch-visual-options-panel,
-+#swatch-text-options-panel,
-+#manage-options-panel {
-+    overflow: auto;
-+    width: 100%;
-+}
-+
-+.data-table .col-swatch-min-width input[type="text"] {
-+    padding: inherit;
-+}
-+
- .swatches-visual-col.unavailable:after {
-     content: '';
-     position: absolute;
-diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js b/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
-index 01411523108..f795f99e811 100644
---- a/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
-+++ b/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
-@@ -16,7 +16,8 @@ define([
-     'use strict';
- 
-     return function (optionConfig) {
--        var swatchProductAttributes = {
-+        var activePanelClass = 'selected-type-options',
-+            swatchProductAttributes = {
-                 frontendInput: $('#frontend_input'),
-                 isFilterable: $('#is_filterable'),
-                 isFilterableInSearch: $('#is_filterable_in_search'),
-@@ -45,7 +46,7 @@ define([
-                 get tabsFront() {
-                     return this.attrTabsFront.length ? this.attrTabsFront.closest('li') : $('#front_fieldset-wrapper');
-                 },
--                selectFields: ['select', 'multiselect', 'price', 'swatch_text', 'swatch_visual'],
-+                selectFields: ['boolean', 'select', 'multiselect', 'price', 'swatch_text', 'swatch_visual'],
- 
-                 /**
-                  * @this {swatchProductAttributes}
-@@ -338,6 +339,7 @@ define([
-                  */
-                 _showPanel: function (el) {
-                     el.closest('.fieldset').show();
-+                    el.addClass(activePanelClass);
-                     this._render(el.attr('id'));
-                 },
- 
-@@ -347,6 +349,7 @@ define([
-                  */
-                 _hidePanel: function (el) {
-                     el.closest('.fieldset').hide();
-+                    el.removeClass(activePanelClass);
-                 },
- 
-                 /**
-@@ -414,7 +417,11 @@ define([
-             };
- 
-         $(function () {
--            var editForm = $('#edit_form');
-+            var editForm = $('#edit_form'),
-+                swatchVisualPanel = $('#swatch-visual-options-panel'),
-+                swatchTextPanel = $('#swatch-text-options-panel'),
-+                tableBody = $(),
-+                activePanel = $();
- 
-             $('#frontend_input').bind('change', function () {
-                 swatchProductAttributes.bindAttributeInputType();
-@@ -425,37 +432,41 @@ define([
- 
-             swatchProductAttributes.bindAttributeInputType();
- 
--            // @todo: refactor collapsable component
-+            // @todo: refactor collapsible component
-             $('.attribute-popup .collapse, [data-role="advanced_fieldset-content"]')
-                 .collapsable()
-                 .collapse('hide');
- 
--            editForm.on('submit', function () {
--                var activePanel,
--                    swatchValues = [],
--                    swatchVisualPanel = $('#swatch-visual-options-panel'),
--                    swatchTextPanel = $('#swatch-text-options-panel');
-+            editForm.on('beforeSubmit', function () {
-+                var optionContainer, optionsValues;
- 
--                activePanel = swatchTextPanel.is(':visible') ? swatchTextPanel : swatchVisualPanel;
-+                activePanel = swatchTextPanel.hasClass(activePanelClass) ? swatchTextPanel : swatchVisualPanel;
-+                optionContainer = activePanel.find('table tbody');
- 
--                activePanel
--                    .find('table input')
--                    .each(function () {
--                        swatchValues.push(this.name + '=' + $(this).val());
--                    });
-+                if (activePanel.hasClass(activePanelClass)) {
-+                    optionsValues = $.map(
-+                        optionContainer.find('tr'),
-+                        function (row) {
-+                            return $(row).find('input, select, textarea').serialize();
-+                        }
-+                    );
-+                    $('<input>')
-+                        .attr({
-+                            type: 'hidden',
-+                            name: 'serialized_options'
-+                        })
-+                        .val(JSON.stringify(optionsValues))
-+                        .prependTo(editForm);
-+                }
- 
--                $('<input>')
--                    .attr({
--                        type: 'hidden',
--                        name: 'serialized_swatch_values'
--                    })
--                    .val(JSON.stringify(swatchValues))
--                    .prependTo(editForm);
--
--                [swatchVisualPanel, swatchTextPanel].forEach(function (el) {
--                    $(el).find('table')
--                        .replaceWith($('<div>').text($.mage.__('Sending swatch values as package.')));
--                });
-+                tableBody = optionContainer.detach();
-+            });
-+
-+            editForm.on('afterValidate.error highlight.validate', function () {
-+                if (activePanel.hasClass(activePanelClass)) {
-+                    activePanel.find('table').append(tableBody);
-+                    $('input[name="serialized_options"]').remove();
-+                }
-             });
-         });
- 
-diff --git a/app/code/Magento/Swatches/view/frontend/layout/catalog_widget_product_list.xml b/app/code/Magento/Swatches/view/frontend/layout/catalog_widget_product_list.xml
-new file mode 100644
-index 00000000000..91798cbd994
---- /dev/null
-+++ b/app/code/Magento/Swatches/view/frontend/layout/catalog_widget_product_list.xml
-@@ -0,0 +1,12 @@
-+<!--
-+  ~ Copyright © Magento, Inc. All rights reserved.
-+  ~ See COPYING.txt for license details.
-+  -->
-+
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+    <body>
-+        <referenceBlock name="category.product.type.widget.details.renderers">
-+            <block class="Magento\Swatches\Block\Product\Renderer\Listing\Configurable" name="category.product.type.details.renderers.configurable" as="configurable" template="Magento_Swatches::product/listing/renderer.phtml" ifconfig="catalog/frontend/show_swatches_in_product_list"/>
-+        </referenceBlock>
-+    </body>
-+</page>
-\ No newline at end of file
-diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
-index 3492f83fd18..93c19c8068f 100644
---- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
-+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
-@@ -4,72 +4,71 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable PSR2.ControlStructures.SwitchDeclaration
-+// phpcs:disable Generic.WhiteSpace.ScopeIndent
- 
- /** @var $block \Magento\Swatches\Block\LayeredNavigation\RenderLayered */
- ?>
- <?php $swatchData = $block->getSwatchData(); ?>
--<div class="swatch-attribute swatch-layered <?= /* @escapeNotVerified */ $swatchData['attribute_code'] ?>"
--     attribute-code="<?= /* @escapeNotVerified */ $swatchData['attribute_code'] ?>"
--     attribute-id="<?= /* @escapeNotVerified */ $swatchData['attribute_id'] ?>">
-+<div class="swatch-attribute swatch-layered <?= $block->escapeHtmlAttr($swatchData['attribute_code']) ?>"
-+     attribute-code="<?= $block->escapeHtmlAttr($swatchData['attribute_code']) ?>"
-+     attribute-id="<?= $block->escapeHtmlAttr($swatchData['attribute_id']) ?>">
-     <div class="swatch-attribute-options clearfix">
--        <?php foreach ($swatchData['options'] as $option => $label): ?>
--            <a href="<?= /* @escapeNotVerified */ $label['link'] ?>"
--               aria-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
-+        <?php foreach ($swatchData['options'] as $option => $label) : ?>
-+            <a href="<?= $block->escapeUrl($label['link']) ?>"
-+               aria-label="<?= $block->escapeHtmlAttr($label['label']) ?>"
-                class="swatch-option-link-layered">
--                <?php if (isset($swatchData['swatches'][$option]['type'])) { ?>
-+                <?php if (isset($swatchData['swatches'][$option]['type'])) : ?>
-                     <?php switch ($swatchData['swatches'][$option]['type']) {
-                         case '3':
-                             ?>
--                            <div class="swatch-option <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
-+                            <div class="swatch-option <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
-                                  tabindex="-1"
-                                  option-type="3"
--                                 option-id="<?= /* @escapeNotVerified */ $option ?>"
--                                 option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
-+                                 option-id="<?= $block->escapeHtmlAttr($option) ?>"
-+                                 option-label="<?= $block->escapeHtmlAttr($label['label']) ?>"
-                                  option-tooltip-thumb=""
-                                  option-tooltip-value=""
-                                 ></div>
--                            <?php    break;
-+                            <?php break;
-                         case '2':
-                             ?>
--                            <?php $swatchThumbPath = $block->getSwatchPath('swatch_thumb',
--                            $swatchData['swatches'][$option]['value']); ?>
--                            <?php $swatchImagePath = $block->getSwatchPath('swatch_image',
--                            $swatchData['swatches'][$option]['value']); ?>
--                            <div class="swatch-option image <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
-+                            <?php $swatchThumbPath = $block->getSwatchPath('swatch_thumb', $swatchData['swatches'][$option]['value']); ?>
-+                            <?php $swatchImagePath = $block->getSwatchPath('swatch_image', $swatchData['swatches'][$option]['value']); ?>
-+                            <div class="swatch-option image <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
-                                  tabindex="-1"
-                                  option-type="2"
--                                 option-id="<?= /* @escapeNotVerified */ $option ?>"
--                                 option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
--                                 option-tooltip-thumb="<?= /* @escapeNotVerified */ $swatchThumbPath ?>"
-+                                 option-id="<?= $block->escapeHtmlAttr($option) ?>"
-+                                 option-label="<?= $block->escapeHtmlAttr($label['label']) ?>"
-+                                 option-tooltip-thumb="<?= $block->escapeUrl($swatchThumbPath) ?>"
-                                  option-tooltip-value=""
--                                 style="background: url(<?= /* @escapeNotVerified */ $swatchImagePath ?>) no-repeat center; background-size: initial;"></div>
--                            <?php    break;
-+                                 style="background: url(<?= $block->escapeUrl($swatchImagePath) ?>) no-repeat center; background-size: initial;"></div>
-+                            <?php break;
-                         case '1':
-                             ?>
--                            <div class="swatch-option color <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
-+                            <div class="swatch-option color <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
-                                  tabindex="-1"
-                                  option-type="1"
--                                 option-id="<?= /* @escapeNotVerified */ $option ?>"
--                                 option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
-+                                 option-id="<?= $block->escapeHtmlAttr($option) ?>"
-+                                 option-label="<?= $block->escapeHtmlAttr($label['label']) ?>"
-                                  option-tooltip-thumb=""
--                                 option-tooltip-value="<?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?>"
--                                 style="background: <?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?> no-repeat center; background-size: initial;"></div>
--                            <?php    break;
-+                                 option-tooltip-value="<?= $block->escapeHtmlAttr($swatchData['swatches'][$option]['value']) ?>"
-+                                 style="background: <?= $block->escapeHtmlAttr($swatchData['swatches'][$option]['value']) ?> no-repeat center; background-size: initial;"></div>
-+                            <?php break;
-                         case '0':
-                         default:
-                             ?>
--                                <div class="swatch-option text <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
--                                     tabindex="-1"
--                                     option-type="0"
--                                     option-id="<?= /* @escapeNotVerified */ $option ?>"
--                                     option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
--                                     option-tooltip-thumb=""
--                                     option-tooltip-value=""
--                                    ><?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?></div>
--                            <?php    break;
-+                            <div class="swatch-option text <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
-+                                 tabindex="-1"
-+                                 option-type="0"
-+                                 option-id="<?= $block->escapeHtmlAttr($option) ?>"
-+                                 option-label="<?= $block->escapeHtmlAttr($label['label']) ?>"
-+                                 option-tooltip-thumb=""
-+                                 option-tooltip-value=""
-+                                ><?= $block->escapeHtml($swatchData['swatches'][$option]['value']) ?></div>
-+                        <?php break;
-                     } ?>
--                <?php } ?>
-+                <?php endif; ?>
-             </a>
-         <?php endforeach; ?>
-     </div>
-@@ -77,7 +76,7 @@
- 
- <script>
-     require(["jquery", "jquery/ui", "Magento_Swatches/js/swatch-renderer"], function ($) {
--        $('.swatch-layered.<?= /* @escapeNotVerified */ $swatchData['attribute_code'] ?>')
-+        $('.swatch-layered.<?= $block->escapeJs($swatchData['attribute_code']) ?>')
-             .find('[option-type="1"], [option-type="2"], [option-type="0"], [option-type="3"]')
-             .SwatchRendererTooltip();
-     });
-diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
-index e65345b38d9..777277a15d8 100644
---- a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
-+++ b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
-@@ -8,20 +8,21 @@
- /** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */
- $productId = $block->getProduct()->getId();
- ?>
--<div class="swatch-opt-<?= /* @escapeNotVerified */ $productId ?>"
--     data-role="swatch-option-<?= /* @escapeNotVerified */ $productId ?>"></div>
-+<div class="swatch-opt-<?= $block->escapeHtmlAttr($productId) ?>"
-+     data-role="swatch-option-<?= $block->escapeHtmlAttr($productId) ?>"></div>
- 
- <script type="text/x-magento-init">
-     {
--        "[data-role=swatch-option-<?= /* @escapeNotVerified */ $productId ?>]": {
-+        "[data-role=swatch-option-<?= $block->escapeJs($productId) ?>]": {
-             "Magento_Swatches/js/swatch-renderer": {
-                 "selectorProduct": ".product-item-details",
-                 "onlySwatches": true,
-                 "enableControlLabel": false,
--                "numberToShow": <?= /* @escapeNotVerified */ $block->getNumberSwatchesPerProduct(); ?>,
--                "jsonConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig(); ?>,
--                "jsonSwatchConfig": <?= /* @escapeNotVerified */ $block->getJsonSwatchConfig(); ?>,
--                "mediaCallback": "<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>"
-+                "numberToShow": <?=  $block->escapeJs($block->getNumberSwatchesPerProduct()) ?>,
-+                "jsonConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
-+                "jsonSwatchConfig": <?= /* @noEscape */ $block->getJsonSwatchConfig() ?>,
-+                "mediaCallback": "<?= $block->escapeJs($block->escapeUrl($block->getMediaCallback())) ?>",
-+                "jsonSwatchImageSizeConfig": <?= /* @noEscape */ $block->getJsonSwatchSizeConfig() ?>
-             }
-         }
-     }
-@@ -29,11 +30,11 @@ $productId = $block->getProduct()->getId();
- 
- <script type="text/x-magento-init">
-     {
--        "[data-role=priceBox][data-price-box=product-id-<?= /* @escapeNotVerified */ $productId ?>]": {
-+        "[data-role=priceBox][data-price-box=product-id-<?= $block->escapeJs($productId) ?>]": {
-             "priceBox": {
-                 "priceConfig": {
--                    "priceFormat": <?= /* @escapeNotVerified */ $block->getPriceFormatJson(); ?>,
--                    "prices": <?= /* @escapeNotVerified */ $block->getPricesJson(); ?>
-+                    "priceFormat": <?= /* @noEscape */ $block->getPriceFormatJson(); ?>,
-+                    "prices": <?= /* @noEscape */ $block->getPricesJson(); ?>
-                 }
-             }
-         }
-diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
-index b044e692313..c85a6908413 100644
---- a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
-+++ b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
-@@ -3,8 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
--//"swatchRenderer": {
- ?>
- <?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Configurable */ ?>
- <div class="swatch-opt" data-role="swatch-options"></div>
-@@ -13,12 +11,11 @@
-     {
-         "[data-role=swatch-options]": {
-             "Magento_Swatches/js/swatch-renderer": {
--                "jsonConfig": <?= /* @escapeNotVerified */ $swatchOptions = $block->getJsonConfig() ?>,
--                "jsonSwatchConfig": <?php /* @escapeNotVerified */
--                    echo $swatchOptions = $block->getJsonSwatchConfig(); ?>,
--                "mediaCallback": "<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>",
--                "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
--                    'Magento_ConfigurableProduct') ?: 'replace'; ?>"
-+                "jsonConfig": <?= /* @noEscape */ $swatchOptions = $block->getJsonConfig() ?>,
-+                "jsonSwatchConfig": <?= /* @noEscape */ $swatchOptions = $block->getJsonSwatchConfig() ?>,
-+                "mediaCallback": "<?= $block->escapeJs($block->escapeUrl($block->getMediaCallback())) ?>",
-+                "gallerySwitchStrategy": "<?= $block->escapeJs($block->getVar('gallery_switch_strategy', 'Magento_ConfigurableProduct')) ?: 'replace'; ?>",
-+                "jsonSwatchImageSizeConfig": <?= /* @noEscape */ $block->getJsonSwatchSizeConfig() ?>
-             }
-         },
-         "*" : {
-diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
-index 4a57bf796aa..6e028ec53c1 100644
---- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
-+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
-@@ -67,6 +67,8 @@ define([
-      *  - option-label (string)
-      *  - option-tooltip-thumb
-      *  - option-tooltip-value
-+     *  - thumb-width
-+     *  - thumb-height
-      */
-     $.widget('mage.SwatchRendererTooltip', {
-         options: {
-@@ -86,6 +88,8 @@ define([
-                 label = $this.attr('option-label'),
-                 thumb = $this.attr('option-tooltip-thumb'),
-                 value = $this.attr('option-tooltip-value'),
-+                width = $this.attr('thumb-width'),
-+                height = $this.attr('thumb-height'),
-                 $image,
-                 $title,
-                 $corner;
-@@ -115,7 +119,9 @@ define([
-                                 // Image
-                                 $image.css({
-                                     'background': 'url("' + thumb + '") no-repeat center', //Background case
--                                    'background-size': 'initial'
-+                                    'background-size': 'initial',
-+                                    'width': width + 'px',
-+                                    'height': height + 'px'
-                                 });
-                                 $image.show();
-                             } else if (type === 1) {
-@@ -400,7 +406,7 @@ define([
-                 if ($widget.options.enableControlLabel) {
-                     label +=
-                         '<span id="' + controlLabelId + '" class="' + classes.attributeLabelClass + '">' +
--                            item.label +
-+                        $('<i></i>').text(item.label).html() +
-                         '</span>' +
-                         '<span class="' + classes.attributeSelectedOptionLabelClass + '"></span>';
-                 }
-@@ -408,7 +414,7 @@ define([
-                 if ($widget.inProductList) {
-                     $widget.productForm.append(input);
-                     input = '';
--                    listLabel = 'aria-label="' + item.label + '"';
-+                    listLabel = 'aria-label="' + $('<i></i>').text(item.label).html() + '"';
-                 } else {
-                     listLabel = 'aria-labelledby="' + controlLabelId + '"';
-                 }
-@@ -476,6 +482,7 @@ define([
-         _RenderSwatchOptions: function (config, controlId) {
-             var optionConfig = this.options.jsonSwatchConfig[config.id],
-                 optionClass = this.options.classes.optionClass,
-+                sizeConfig = this.options.jsonSwatchImageSizeConfig,
-                 moreLimit = parseInt(this.options.numberToShow, 10),
-                 moreClass = this.options.classes.moreButton,
-                 moreText = this.options.moreButtonText,
-@@ -486,13 +493,17 @@ define([
-                 return '';
-             }
- 
--            $.each(config.options, function () {
-+            $.each(config.options, function (index) {
-                 var id,
-                     type,
-                     value,
-                     thumb,
-                     label,
--                    attr;
-+                    width,
-+                    height,
-+                    attr,
-+                    swatchImageWidth,
-+                    swatchImageHeight;
- 
-                 if (!optionConfig.hasOwnProperty(this.id)) {
-                     return '';
-@@ -500,16 +511,20 @@ define([
- 
-                 // Add more button
-                 if (moreLimit === countAttributes++) {
--                    html += '<a href="#" class="' + moreClass + '">' + moreText + '</a>';
-+                    html += '<a href="#" class="' + moreClass + '"><span>' + moreText + '</span></a>';
-                 }
- 
-                 id = this.id;
-                 type = parseInt(optionConfig[id].type, 10);
--                value = optionConfig[id].hasOwnProperty('value') ? optionConfig[id].value : '';
-+                value = optionConfig[id].hasOwnProperty('value') ?
-+                    $('<i></i>').text(optionConfig[id].value).html() : '';
-                 thumb = optionConfig[id].hasOwnProperty('thumb') ? optionConfig[id].thumb : '';
--                label = this.label ? this.label : '';
-+                width = _.has(sizeConfig, 'swatchThumb') ? sizeConfig.swatchThumb.width : 110;
-+                height = _.has(sizeConfig, 'swatchThumb') ? sizeConfig.swatchThumb.height : 90;
-+                label = this.label ? $('<i></i>').text(this.label).html() : '';
-                 attr =
-                     ' id="' + controlId + '-item-' + id + '"' +
-+                    ' index="' + index + '"' +
-                     ' aria-checked="false"' +
-                     ' aria-describedby="' + controlId + '"' +
-                     ' tabindex="0"' +
-@@ -519,7 +534,12 @@ define([
-                     ' aria-label="' + label + '"' +
-                     ' option-tooltip-thumb="' + thumb + '"' +
-                     ' option-tooltip-value="' + value + '"' +
--                    ' role="option"';
-+                    ' role="option"' +
-+                    ' thumb-width="' + width + '"' +
-+                    ' thumb-height="' + height + '"';
-+
-+                swatchImageWidth = _.has(sizeConfig, 'swatchImage') ? sizeConfig.swatchImage.width : 30;
-+                swatchImageHeight = _.has(sizeConfig, 'swatchImage') ? sizeConfig.swatchImage.height : 20;
- 
-                 if (!this.hasOwnProperty('products') || this.products.length <= 0) {
-                     attr += ' option-empty="true"';
-@@ -538,7 +558,8 @@ define([
-                 } else if (type === 2) {
-                     // Image
-                     html += '<div class="' + optionClass + ' image" ' + attr +
--                        ' style="background: url(' + value + ') no-repeat center; background-size: initial;">' + '' +
-+                        ' style="background: url(' + value + ') no-repeat center; background-size: initial;width:' +
-+                        swatchImageWidth + 'px; height:' + swatchImageHeight + 'px">' + '' +
-                         '</div>';
-                 } else if (type === 3) {
-                     // Clear
-@@ -665,11 +686,21 @@ define([
-                 if (!images) {
-                     images = this.options.mediaGalleryInitial;
-                 }
--
--                this.updateBaseImage(images, $main, !this.inProductList);
-+                this.updateBaseImage(this._sortImages(images), $main, !this.inProductList);
-             }
-         },
- 
-+        /**
-+         * Sorting images array
-+         *
-+         * @private
-+         */
-+        _sortImages: function (images) {
-+            return _.sortBy(images, function (image) {
-+                return parseInt(image.position, 10);
-+            });
-+        },
-+
-         /**
-          * Event for swatch options
-          *
-@@ -682,7 +713,8 @@ define([
-                 $wrapper = $this.parents('.' + $widget.options.classes.attributeOptionsWrapper),
-                 $label = $parent.find('.' + $widget.options.classes.attributeSelectedOptionLabelClass),
-                 attributeId = $parent.attr('attribute-id'),
--                $input = $parent.find('.' + $widget.options.classes.attributeInput);
-+                $input = $parent.find('.' + $widget.options.classes.attributeInput),
-+                checkAdditionalData = JSON.parse(this.options.jsonSwatchConfig[attributeId]['additional_data']);
- 
-             if ($widget.inProductList) {
-                 $input = $widget.productForm.find(
-@@ -716,7 +748,16 @@ define([
-                 $widget._UpdatePrice();
-             }
- 
--            $widget._loadMedia();
-+            $(document).trigger('updateMsrpPriceBlock',
-+                [
-+                    parseInt($this.attr('index'), 10) + 1,
-+                    $widget.options.jsonConfig.optionPrices
-+                ]);
-+
-+            if (checkAdditionalData['update_product_preview_image'] === '1') {
-+                $widget._loadMedia();
-+            }
-+
-             $input.trigger('change');
-         },
- 
-@@ -888,7 +929,8 @@ define([
-                 $productPrice = $product.find(this.options.selectorProductPrice),
-                 options = _.object(_.keys($widget.optionsMap), {}),
-                 result,
--                tierPriceHtml;
-+                tierPriceHtml,
-+                isShow;
- 
-             $widget.element.find('.' + $widget.options.classes.attributeClass + '[option-selected]').each(function () {
-                 var attributeId = $(this).attr('attribute-id');
-@@ -905,11 +947,9 @@ define([
-                 }
-             );
- 
--            if (typeof result != 'undefined' && result.oldPrice.amount !== result.finalPrice.amount) {
--                $(this.options.slyOldPriceSelector).show();
--            } else {
--                $(this.options.slyOldPriceSelector).hide();
--            }
-+            isShow = typeof result != 'undefined' && result.oldPrice.amount !== result.finalPrice.amount;
-+
-+            $product.find(this.options.slyOldPriceSelector)[isShow ? 'show' : 'hide']();
- 
-             if (typeof result != 'undefined' && result.tierPrices.length) {
-                 if (this.options.tierPriceTemplate) {
-@@ -954,13 +994,29 @@ define([
-          * @private
-          */
-         _getPrices: function (newPrices, displayPrices) {
--            var $widget = this;
-+            var $widget = this,
-+                optionPriceDiff = 0,
-+                allowedProduct, optionPrices, basePrice, optionFinalPrice;
- 
-             if (_.isEmpty(newPrices)) {
--                newPrices = $widget.options.jsonConfig.prices;
-+                allowedProduct = this._getAllowedProductWithMinPrice(this._CalcProducts());
-+                optionPrices = this.options.jsonConfig.optionPrices;
-+                basePrice = parseFloat(this.options.jsonConfig.prices.basePrice.amount);
-+
-+                if (!_.isEmpty(allowedProduct)) {
-+                    optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
-+                    optionPriceDiff = optionFinalPrice - basePrice;
-+                }
-+
-+                if (optionPriceDiff !== 0) {
-+                    newPrices  = this.options.jsonConfig.optionPrices[allowedProduct];
-+                } else {
-+                    newPrices = $widget.options.jsonConfig.prices;
-+                }
-             }
- 
-             _.each(displayPrices, function (price, code) {
-+
-                 if (newPrices[code]) {
-                     displayPrices[code].amount = newPrices[code].amount - displayPrices[code].amount;
-                 }
-@@ -969,6 +1025,30 @@ define([
-             return displayPrices;
-         },
- 
-+        /**
-+         * Get product with minimum price from selected options.
-+         *
-+         * @param {Array} allowedProducts
-+         * @returns {String}
-+         * @private
-+         */
-+        _getAllowedProductWithMinPrice: function (allowedProducts) {
-+            var optionPrices = this.options.jsonConfig.optionPrices,
-+                product = {},
-+                optionFinalPrice, optionMinPrice;
-+
-+            _.each(allowedProducts, function (allowedProduct) {
-+                optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
-+
-+                if (_.isEmpty(product) || optionFinalPrice < optionMinPrice) {
-+                    optionMinPrice = optionFinalPrice;
-+                    product = allowedProduct;
-+                }
-+            }, this);
-+
-+            return product;
-+        },
-+
-         /**
-          * Gets all product media and change current to the needed one
-          *
-@@ -1015,12 +1095,14 @@ define([
-                 mediaCallData.isAjax = true;
-                 $widget._XhrKiller();
-                 $widget._EnableProductMediaLoader($this);
--                $widget.xhr = $.get(
--                    $widget.options.mediaCallback,
--                    mediaCallData,
--                    mediaSuccessCallback,
--                    'json'
--                ).done(function () {
-+                $widget.xhr = $.ajax({
-+                    url: $widget.options.mediaCallback,
-+                    cache: true,
-+                    type: 'GET',
-+                    dataType: 'json',
-+                    data: mediaCallData,
-+                    success: mediaSuccessCallback
-+                }).done(function () {
-                     $widget._XhrKiller();
-                 });
-             }
-@@ -1145,8 +1227,8 @@ define([
-         updateBaseImage: function (images, context, isInProductView) {
-             var justAnImage = images[0],
-                 initialImages = this.options.mediaGalleryInitial,
--                gallery = context.find(this.options.mediaGallerySelector).data('gallery'),
-                 imagesToUpdate,
-+                gallery = context.find(this.options.mediaGallerySelector).data('gallery'),
-                 isInitial;
- 
-             if (isInProductView) {
-@@ -1158,7 +1240,15 @@ define([
-                 }
- 
-                 imagesToUpdate = this._setImageIndex(imagesToUpdate);
--                gallery.updateData(imagesToUpdate);
-+
-+                if (!_.isUndefined(gallery)) {
-+                    gallery.updateData(imagesToUpdate);
-+                } else {
-+                    context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
-+                        loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
-+                        loadedGallery.updateData(imagesToUpdate);
-+                    }.bind(this));
-+                }
- 
-                 if (isInitial) {
-                     $(this.options.mediaGallerySelector).AddFotoramaVideoEvents();
-@@ -1168,9 +1258,7 @@ define([
-                         dataMergeStrategy: this.options.gallerySwitchStrategy
-                     });
-                 }
--
-                 gallery.first();
--
-             } else if (justAnImage && justAnImage.img) {
-                 context.find('.product-image-photo').attr('src', justAnImage.img);
-             }
-diff --git a/app/code/Magento/Tax/Api/TaxClassRepositoryInterface.php b/app/code/Magento/Tax/Api/TaxClassRepositoryInterface.php
-index d8b251f3c8c..f841f9c047b 100644
---- a/app/code/Magento/Tax/Api/TaxClassRepositoryInterface.php
-+++ b/app/code/Magento/Tax/Api/TaxClassRepositoryInterface.php
-@@ -27,7 +27,7 @@ interface TaxClassRepositoryInterface
-      * Retrieve tax classes which match a specific criteria.
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#TaxClassRepositoryInterface to
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#TaxClassRepositoryInterface to
-      * determine which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-diff --git a/app/code/Magento/Tax/Api/TaxRateRepositoryInterface.php b/app/code/Magento/Tax/Api/TaxRateRepositoryInterface.php
-index 252bc0fc715..c0f5ccd95ba 100644
---- a/app/code/Magento/Tax/Api/TaxRateRepositoryInterface.php
-+++ b/app/code/Magento/Tax/Api/TaxRateRepositoryInterface.php
-@@ -47,7 +47,7 @@ interface TaxRateRepositoryInterface
-      * Search TaxRates
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#TaxRateRepositoryInterface to
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#TaxRateRepositoryInterface to
-      * determine which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-diff --git a/app/code/Magento/Tax/Api/TaxRuleRepositoryInterface.php b/app/code/Magento/Tax/Api/TaxRuleRepositoryInterface.php
-index 1d69f932573..5e045d94de4 100644
---- a/app/code/Magento/Tax/Api/TaxRuleRepositoryInterface.php
-+++ b/app/code/Magento/Tax/Api/TaxRuleRepositoryInterface.php
-@@ -55,7 +55,7 @@ interface TaxRuleRepositoryInterface
-      * Search TaxRules
-      *
-      * This call returns an array of objects, but detailed information about each object’s attributes might not be
--     * included. See http://devdocs.magento.com/codelinks/attributes.html#TaxRuleRepositoryInterface to
-+     * included. See https://devdocs.magento.com/codelinks/attributes.html#TaxRuleRepositoryInterface to
-      * determine which call to use to get detailed information about all attributes for an object.
-      *
-      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
-index 450203486f3..f25b2c1cf50 100644
---- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
-+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
-@@ -15,6 +15,8 @@ use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Tax\Controller\RegistryConstants;
- 
- /**
-+ * Tax rate form.
-+ *
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @since 100.0.2
-@@ -108,7 +110,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-     }
- 
-     /**
--     * @return void
-+     * @inheritdoc
-      */
-     protected function _construct()
-     {
-@@ -117,6 +119,8 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-     }
- 
-     /**
-+     * Prepare form before rendering HTML.
-+     *
-      * @return $this
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-@@ -130,8 +134,9 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-             if ($taxRateId) {
-                 $taxRateDataObject = $this->_taxRateRepository->get($taxRateId);
-             }
-+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-         } catch (NoSuchEntityException $e) {
--            /* tax rate not found */
-+            //tax rate not found//
-         }
- 
-         $sessionFormValues = (array)$this->_coreRegistry->registry(RegistryConstants::CURRENT_TAX_RATE_FORM_DATA);
-@@ -176,7 +181,10 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-         }
- 
-         $legend = $this->getShowLegend() ? __('Tax Rate Information') : '';
--        $fieldset = $form->addFieldset('base_fieldset', ['legend' => $legend, 'class' => 'form-inline']);
-+        $fieldset = $form->addFieldset(
-+            'base_fieldset',
-+            ['legend' => $legend, 'class' => 'admin__scope-old form-inline']
-+        );
- 
-         if (isset($formData['tax_calculation_rate_id']) && $formData['tax_calculation_rate_id'] > 0) {
-             $fieldset->addField(
-diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
-index 4eaaa3be8a8..87e9d9e0060 100644
---- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
-+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
-@@ -11,6 +11,9 @@
-  */
- namespace Magento\Tax\Block\Adminhtml\Rate\Toolbar;
- 
-+/**
-+ * Rate toolbar block
-+ */
- class Save extends \Magento\Backend\Block\Template implements \Magento\Backend\Block\Widget\ContainerInterface
- {
-     /**
-@@ -46,6 +49,8 @@ class Save extends \Magento\Backend\Block\Template implements \Magento\Backend\B
-     }
- 
-     /**
-+     * Init model
-+     *
-      * @return void
-      */
-     protected function _construct()
-@@ -97,6 +102,8 @@ class Save extends \Magento\Backend\Block\Template implements \Magento\Backend\B
-     }
- 
-     /**
-+     * Prepare layout
-+     *
-      * @return $this
-      */
-     protected function _prepareLayout()
-@@ -115,7 +122,7 @@ class Save extends \Magento\Backend\Block\Template implements \Magento\Backend\B
-             ['label' => __('Reset'), 'onclick' => 'window.location.reload()', 'class' => 'reset']
-         );
- 
--        $rate = intval($this->getRequest()->getParam('rate'));
-+        $rate = (int)$this->getRequest()->getParam('rate');
-         if ($rate) {
-             $this->buttonList->add(
-                 'delete',
-diff --git a/app/code/Magento/Tax/Block/Checkout/Discount.php b/app/code/Magento/Tax/Block/Checkout/Discount.php
-index c474c7a6580..70dac7c96c5 100644
---- a/app/code/Magento/Tax/Block/Checkout/Discount.php
-+++ b/app/code/Magento/Tax/Block/Checkout/Discount.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Tax\Block\Checkout;
- 
-+use Magento\Sales\Model\ConfigInterface;
-+
- /**
-  * Subtotal Total Row Renderer
-  */
-@@ -19,7 +21,7 @@ class Discount extends \Magento\Checkout\Block\Total\DefaultTotal
-      * @param \Magento\Framework\View\Element\Template\Context $context
-      * @param \Magento\Customer\Model\Session $customerSession
-      * @param \Magento\Checkout\Model\Session $checkoutSession
--     * @param \Magento\Sales\Model\Config $salesConfig
-+     * @param ConfigInterface $salesConfig
-      * @param \Magento\Tax\Model\Config $taxConfig
-      * @param array $layoutProcessors
-      * @param array $data
-@@ -28,7 +30,7 @@ class Discount extends \Magento\Checkout\Block\Total\DefaultTotal
-         \Magento\Framework\View\Element\Template\Context $context,
-         \Magento\Customer\Model\Session $customerSession,
-         \Magento\Checkout\Model\Session $checkoutSession,
--        \Magento\Sales\Model\Config $salesConfig,
-+        ConfigInterface $salesConfig,
-         \Magento\Tax\Model\Config $taxConfig,
-         array $layoutProcessors = [],
-         array $data = []
-@@ -39,6 +41,8 @@ class Discount extends \Magento\Checkout\Block\Total\DefaultTotal
-     }
- 
-     /**
-+     * Get display including and excluding tax config
-+     *
-      * @return bool
-      */
-     public function displayBoth()
-diff --git a/app/code/Magento/Tax/Block/Checkout/Grandtotal.php b/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
-index 77af1ad99ea..607eef2f3bc 100644
---- a/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
-+++ b/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Tax\Block\Checkout;
- 
-+use Magento\Sales\Model\ConfigInterface;
-+
- /**
-  * Subtotal Total Row Renderer
-  */
-@@ -26,7 +28,7 @@ class Grandtotal extends \Magento\Checkout\Block\Total\DefaultTotal
-      * @param \Magento\Framework\View\Element\Template\Context $context
-      * @param \Magento\Customer\Model\Session $customerSession
-      * @param \Magento\Checkout\Model\Session $checkoutSession
--     * @param \Magento\Sales\Model\Config $salesConfig
-+     * @param ConfigInterface $salesConfig
-      * @param \Magento\Tax\Model\Config $taxConfig
-      * @param array $layoutProcessors
-      * @param array $data
-@@ -35,7 +37,7 @@ class Grandtotal extends \Magento\Checkout\Block\Total\DefaultTotal
-         \Magento\Framework\View\Element\Template\Context $context,
-         \Magento\Customer\Model\Session $customerSession,
-         \Magento\Checkout\Model\Session $checkoutSession,
--        \Magento\Sales\Model\Config $salesConfig,
-+        ConfigInterface $salesConfig,
-         \Magento\Tax\Model\Config $taxConfig,
-         array $layoutProcessors = [],
-         array $data = []
-diff --git a/app/code/Magento/Tax/Block/Checkout/Shipping.php b/app/code/Magento/Tax/Block/Checkout/Shipping.php
-index 299c586fd22..45c6e425747 100644
---- a/app/code/Magento/Tax/Block/Checkout/Shipping.php
-+++ b/app/code/Magento/Tax/Block/Checkout/Shipping.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Tax\Block\Checkout;
- 
-+use Magento\Sales\Model\ConfigInterface;
-+
- /**
-  * Subtotal Total Row Renderer
-  */
-@@ -26,7 +28,7 @@ class Shipping extends \Magento\Checkout\Block\Total\DefaultTotal
-      * @param \Magento\Framework\View\Element\Template\Context $context
-      * @param \Magento\Customer\Model\Session $customerSession
-      * @param \Magento\Checkout\Model\Session $checkoutSession
--     * @param \Magento\Sales\Model\Config $salesConfig
-+     * @param ConfigInterface $salesConfig
-      * @param \Magento\Tax\Model\Config $taxConfig
-      * @param array $layoutProcessors
-      * @param array $data
-@@ -35,7 +37,7 @@ class Shipping extends \Magento\Checkout\Block\Total\DefaultTotal
-         \Magento\Framework\View\Element\Template\Context $context,
-         \Magento\Customer\Model\Session $customerSession,
-         \Magento\Checkout\Model\Session $checkoutSession,
--        \Magento\Sales\Model\Config $salesConfig,
-+        ConfigInterface $salesConfig,
-         \Magento\Tax\Model\Config $taxConfig,
-         array $layoutProcessors = [],
-         array $data = []
-diff --git a/app/code/Magento/Tax/Block/Checkout/Subtotal.php b/app/code/Magento/Tax/Block/Checkout/Subtotal.php
-index 22da0795415..23f9223ba51 100644
---- a/app/code/Magento/Tax/Block/Checkout/Subtotal.php
-+++ b/app/code/Magento/Tax/Block/Checkout/Subtotal.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Tax\Block\Checkout;
- 
-+use Magento\Sales\Model\ConfigInterface;
-+
- /**
-  * Subtotal Total Row Renderer
-  */
-@@ -26,7 +28,7 @@ class Subtotal extends \Magento\Checkout\Block\Total\DefaultTotal
-      * @param \Magento\Framework\View\Element\Template\Context $context
-      * @param \Magento\Customer\Model\Session $customerSession
-      * @param \Magento\Checkout\Model\Session $checkoutSession
--     * @param \Magento\Sales\Model\Config $salesConfig
-+     * @param ConfigInterface $salesConfig
-      * @param \Magento\Tax\Model\Config $taxConfig
-      * @param array $layoutProcessors
-      * @param array $data
-@@ -35,7 +37,7 @@ class Subtotal extends \Magento\Checkout\Block\Total\DefaultTotal
-         \Magento\Framework\View\Element\Template\Context $context,
-         \Magento\Customer\Model\Session $customerSession,
-         \Magento\Checkout\Model\Session $checkoutSession,
--        \Magento\Sales\Model\Config $salesConfig,
-+        ConfigInterface $salesConfig,
-         \Magento\Tax\Model\Config $taxConfig,
-         array $layoutProcessors = [],
-         array $data = []
-@@ -46,6 +48,8 @@ class Subtotal extends \Magento\Checkout\Block\Total\DefaultTotal
-     }
- 
-     /**
-+     * Get display including and excluding tax config
-+     *
-      * @return bool
-      */
-     public function displayBoth()
-diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php
-index f6cd0fff9c9..572eaa55abb 100644
---- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php
-+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php
-@@ -6,10 +6,42 @@
-  */
- namespace Magento\Tax\Controller\Adminhtml\Rate;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\Backend\App\Action\Context;
-+use Magento\Framework\Registry;
-+use Magento\Tax\Model\Calculation\Rate\Converter;
-+use Magento\Tax\Api\TaxRateRepositoryInterface;
-+use Magento\Framework\Escaper;
- use Magento\Framework\Controller\ResultFactory;
- 
--class AjaxSave extends \Magento\Tax\Controller\Adminhtml\Rate
-+/**
-+ * Tax Rate AjaxSave Controller
-+ */
-+class AjaxSave extends \Magento\Tax\Controller\Adminhtml\Rate implements HttpPostActionInterface
- {
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-+    /**
-+     * @param Context $context
-+     * @param Registry $coreRegistry
-+     * @param Converter $taxRateConverter
-+     * @param TaxRateRepositoryInterface $taxRateRepository
-+     * @param Escaper $escaper
-+     */
-+    public function __construct(
-+        Context $context,
-+        Registry $coreRegistry,
-+        Converter $taxRateConverter,
-+        TaxRateRepositoryInterface $taxRateRepository,
-+        Escaper $escaper
-+    ) {
-+        $this->escaper = $escaper;
-+        parent::__construct($context, $coreRegistry, $taxRateConverter, $taxRateRepository);
-+    }
-+
-     /**
-      * Save Tax Rate via AJAX
-      *
-@@ -27,7 +59,7 @@ class AjaxSave extends \Magento\Tax\Controller\Adminhtml\Rate
-                 'success' => true,
-                 'error_message' => '',
-                 'tax_calculation_rate_id' => $taxRate->getId(),
--                'code' =>  htmlspecialchars($taxRate->getCode()),
-+                'code' =>  $this->escaper->escapeHtml($taxRate->getCode()),
-             ];
-         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-             $responseContent = [
-diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php
-index b91eef7b6f7..565af0e0bf9 100644
---- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php
-+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Tax\Controller\Adminhtml\Rate;
- 
--class Index extends \Magento\Tax\Controller\Adminhtml\Rate
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Tax\Controller\Adminhtml\Rate implements HttpGetActionInterface
- {
-     /**
-      * Show Main Grid
-diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php
-index 71b6d7bf393..1e46f0ea3d2 100644
---- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php
-+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Tax\Controller\Adminhtml\Rule;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Delete extends \Magento\Tax\Controller\Adminhtml\Rule
-+class Delete extends \Magento\Tax\Controller\Adminhtml\Rule implements HttpPostActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Redirect
-diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php
-index dc0f5188025..740d7e8afe6 100644
---- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php
-+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php
-@@ -6,9 +6,10 @@
-  */
- namespace Magento\Tax\Controller\Adminhtml\Rule;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Edit extends \Magento\Tax\Controller\Adminhtml\Rule
-+class Edit extends \Magento\Tax\Controller\Adminhtml\Rule implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect
-diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php
-index ddf6099a4f8..fd774777e3e 100644
---- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php
-+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Tax\Controller\Adminhtml\Rule;
- 
--class Index extends \Magento\Tax\Controller\Adminhtml\Rule
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Tax\Controller\Adminhtml\Rule implements HttpGetActionInterface
- {
-     /**
-      * @return \Magento\Backend\Model\View\Result\Page
-diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
-index 1a531858797..0e950460a26 100644
---- a/app/code/Magento/Tax/Helper/Data.php
-+++ b/app/code/Magento/Tax/Helper/Data.php
-@@ -733,7 +733,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-             $orderItemId = $orderItem->getId();
-             $orderItemTax = $orderItem->getTaxAmount();
-             $itemTax = $item->getTaxAmount();
--            if (!$itemTax || !floatval($orderItemTax)) {
-+            if (!$itemTax || !(float)$orderItemTax) {
-                 continue;
-             }
-             //An invoiced item or credit memo item can have a different qty than its order item qty
-@@ -761,7 +761,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-         $shippingTaxAmount = $salesItem->getShippingTaxAmount();
-         $originalShippingTaxAmount = $order->getShippingTaxAmount();
-         if ($shippingTaxAmount && $originalShippingTaxAmount &&
--            $shippingTaxAmount != 0 && floatval($originalShippingTaxAmount)
-+            $shippingTaxAmount != 0 && (float)$originalShippingTaxAmount
-         ) {
-             //An invoice or credit memo can have a different qty than its order
-             $shippingRatio = $shippingTaxAmount / $originalShippingTaxAmount;
-diff --git a/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php b/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php
-index 299d4db5e0d..bba9bc3f3eb 100644
---- a/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php
-+++ b/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php
-@@ -34,7 +34,7 @@ class ContextPlugin
-     /**
-      * Module manager
-      *
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     private $moduleManager;
- 
-@@ -50,7 +50,7 @@ class ContextPlugin
-      * @param \Magento\Framework\App\Http\Context $httpContext
-      * @param \Magento\Tax\Model\Calculation\Proxy $calculation
-      * @param \Magento\Tax\Helper\Data $taxHelper
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\PageCache\Model\Config $cacheConfig
-      */
-     public function __construct(
-@@ -58,7 +58,7 @@ class ContextPlugin
-         \Magento\Framework\App\Http\Context $httpContext,
-         \Magento\Tax\Model\Calculation\Proxy $calculation,
-         \Magento\Tax\Helper\Data $taxHelper,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\PageCache\Model\Config $cacheConfig
-     ) {
-         $this->customerSession = $customerSession;
-@@ -70,6 +70,8 @@ class ContextPlugin
-     }
- 
-     /**
-+     * Before dispatch.
-+     *
-      * @param \Magento\Framework\App\ActionInterface $subject
-      * @param \Magento\Framework\App\RequestInterface $request
-      * @return mixed
-diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
-index bad64260cf5..939facd02c0 100644
---- a/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
-+++ b/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
-@@ -7,6 +7,9 @@ namespace Magento\Tax\Model\Calculation;
- 
- use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
- 
-+/**
-+ * Abstract aggregate calculator.
-+ */
- abstract class AbstractAggregateCalculator extends AbstractCalculator
- {
-     /**
-@@ -106,11 +109,12 @@ abstract class AbstractAggregateCalculator extends AbstractCalculator
-         $rowTaxes = [];
-         $rowTaxesBeforeDiscount = [];
-         $appliedTaxes = [];
-+        $rowTotalForTaxCalculation = $this->getPriceForTaxCalculation($item, $price) * $quantity;
-         //Apply each tax rate separately
-         foreach ($appliedRates as $appliedRate) {
-             $taxId = $appliedRate['id'];
-             $taxRate = $appliedRate['percent'];
--            $rowTaxPerRate = $this->calculationTool->calcTaxAmount($rowTotal, $taxRate, false, false);
-+            $rowTaxPerRate = $this->calculationTool->calcTaxAmount($rowTotalForTaxCalculation, $taxRate, false, false);
-             $deltaRoundingType = self::KEY_REGULAR_DELTA_ROUNDING;
-             if ($applyTaxAfterDiscount) {
-                 $deltaRoundingType = self::KEY_TAX_BEFORE_DISCOUNT_DELTA_ROUNDING;
-@@ -121,7 +125,10 @@ abstract class AbstractAggregateCalculator extends AbstractCalculator
-             //Handle discount
-             if ($applyTaxAfterDiscount) {
-                 //TODO: handle originalDiscountAmount
--                $taxableAmount = max($rowTotal - $discountAmount, 0);
-+                $taxableAmount = max($rowTotalForTaxCalculation - $discountAmount, 0);
-+                if ($taxableAmount && !$applyTaxAfterDiscount) {
-+                    $taxableAmount = $rowTotalForTaxCalculation;
-+                }
-                 $rowTaxAfterDiscount = $this->calculationTool->calcTaxAmount(
-                     $taxableAmount,
-                     $taxRate,
-@@ -168,6 +175,26 @@ abstract class AbstractAggregateCalculator extends AbstractCalculator
-             ->setAppliedTaxes($appliedTaxes);
-     }
- 
-+    /**
-+     * Get price for tax calculation.
-+     *
-+     * @param QuoteDetailsItemInterface $item
-+     * @param float $price
-+     * @return float
-+     */
-+    private function getPriceForTaxCalculation(QuoteDetailsItemInterface $item, float $price)
-+    {
-+        if ($item->getExtensionAttributes() && $item->getExtensionAttributes()->getPriceForTaxCalculation()) {
-+            $priceForTaxCalculation = $this->calculationTool->round(
-+                $item->getExtensionAttributes()->getPriceForTaxCalculation()
-+            );
-+        } else {
-+            $priceForTaxCalculation = $price;
-+        }
-+
-+        return $priceForTaxCalculation;
-+    }
-+
-     /**
-      * Round amount
-      *
-diff --git a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php
-index ebf699db552..60cb6fe2898 100644
---- a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php
-+++ b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php
-@@ -11,6 +11,9 @@
-  */
- namespace Magento\Tax\Model\ResourceModel\Report\Tax;
- 
-+/**
-+ * Class for tax report resource model with aggregation by created at
-+ */
- class Createdat extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport
- {
-     /**
-@@ -84,7 +87,7 @@ class Createdat extends \Magento\Reports\Model\ResourceModel\Report\AbstractRepo
-                 'order_status' => 'e.status',
-                 'percent' => 'MAX(tax.' . $connection->quoteIdentifier('percent') . ')',
-                 'orders_count' => 'COUNT(DISTINCT e.entity_id)',
--                'tax_base_amount_sum' => 'SUM(tax.base_amount * e.base_to_global_rate)',
-+                'tax_base_amount_sum' => 'SUM(tax.base_real_amount * e.base_to_global_rate)',
-             ];
- 
-             $select = $connection->select()->from(
-diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
-index 0901e1b7bc7..77b3cfa3a08 100644
---- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
-+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
-@@ -15,12 +15,17 @@ use Magento\Quote\Model\Quote\Address\Total\AbstractTotal;
- use Magento\Quote\Model\Quote\Item\AbstractItem;
- use Magento\Store\Model\Store;
- use Magento\Tax\Api\Data\QuoteDetailsInterfaceFactory;
-+use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
- use Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory;
- use Magento\Tax\Api\Data\TaxClassKeyInterface;
- use Magento\Tax\Api\Data\TaxDetailsInterface;
- use Magento\Tax\Api\Data\TaxDetailsItemInterface;
- use Magento\Tax\Api\Data\QuoteDetailsInterface;
- use Magento\Quote\Api\Data\ShippingAssignmentInterface;
-+use Magento\Tax\Helper\Data as TaxHelper;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterface;
-+use Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterfaceFactory;
- 
- /**
-  * Tax totals calculation model
-@@ -129,6 +134,16 @@ class CommonTaxCollector extends AbstractTotal
-      */
-     protected $quoteDetailsItemDataObjectFactory;
- 
-+    /**
-+     * @var TaxHelper
-+     */
-+    private $taxHelper;
-+
-+    /**
-+     * @var QuoteDetailsItemExtensionInterfaceFactory
-+     */
-+    private $quoteDetailsItemExtensionFactory;
-+
-     /**
-      * Class constructor
-      *
-@@ -139,6 +154,8 @@ class CommonTaxCollector extends AbstractTotal
-      * @param \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory
-      * @param CustomerAddressFactory $customerAddressFactory
-      * @param CustomerAddressRegionFactory $customerAddressRegionFactory
-+     * @param TaxHelper|null $taxHelper
-+     * @param QuoteDetailsItemExtensionInterfaceFactory|null $quoteDetailsItemExtensionInterfaceFactory
-      */
-     public function __construct(
-         \Magento\Tax\Model\Config $taxConfig,
-@@ -147,7 +164,9 @@ class CommonTaxCollector extends AbstractTotal
-         \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory $quoteDetailsItemDataObjectFactory,
-         \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory,
-         CustomerAddressFactory $customerAddressFactory,
--        CustomerAddressRegionFactory $customerAddressRegionFactory
-+        CustomerAddressRegionFactory $customerAddressRegionFactory,
-+        TaxHelper $taxHelper = null,
-+        QuoteDetailsItemExtensionInterfaceFactory $quoteDetailsItemExtensionInterfaceFactory = null
-     ) {
-         $this->taxCalculationService = $taxCalculationService;
-         $this->quoteDetailsDataObjectFactory = $quoteDetailsDataObjectFactory;
-@@ -156,6 +175,9 @@ class CommonTaxCollector extends AbstractTotal
-         $this->quoteDetailsItemDataObjectFactory = $quoteDetailsItemDataObjectFactory;
-         $this->customerAddressFactory = $customerAddressFactory;
-         $this->customerAddressRegionFactory = $customerAddressRegionFactory;
-+        $this->taxHelper = $taxHelper ?: ObjectManager::getInstance()->get(TaxHelper::class);
-+        $this->quoteDetailsItemExtensionFactory = $quoteDetailsItemExtensionInterfaceFactory ?:
-+            ObjectManager::getInstance()->get(QuoteDetailsItemExtensionInterfaceFactory::class);
-     }
- 
-     /**
-@@ -186,7 +208,7 @@ class CommonTaxCollector extends AbstractTotal
-      * @param bool $priceIncludesTax
-      * @param bool $useBaseCurrency
-      * @param string $parentCode
--     * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface
-+     * @return QuoteDetailsItemInterface
-      */
-     public function mapItem(
-         \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory $itemDataObjectFactory,
-@@ -199,7 +221,7 @@ class CommonTaxCollector extends AbstractTotal
-             $sequence = 'sequence-' . $this->getNextIncrement();
-             $item->setTaxCalculationItemId($sequence);
-         }
--        /** @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface $itemDataObject */
-+        /** @var QuoteDetailsItemInterface $itemDataObject */
-         $itemDataObject = $itemDataObjectFactory->create();
-         $itemDataObject->setCode($item->getTaxCalculationItemId())
-             ->setQuantity($item->getQty())
-@@ -215,12 +237,28 @@ class CommonTaxCollector extends AbstractTotal
-             if (!$item->getBaseTaxCalculationPrice()) {
-                 $item->setBaseTaxCalculationPrice($item->getBaseCalculationPriceOriginal());
-             }
-+
-+            if ($this->taxHelper->applyTaxOnOriginalPrice()) {
-+                $baseTaxCalculationPrice = $item->getBaseOriginalPrice();
-+            } else {
-+                $baseTaxCalculationPrice = $item->getBaseCalculationPriceOriginal();
-+            }
-+            $this->setPriceForTaxCalculation($itemDataObject, (float)$baseTaxCalculationPrice);
-+
-             $itemDataObject->setUnitPrice($item->getBaseTaxCalculationPrice())
-                 ->setDiscountAmount($item->getBaseDiscountAmount());
-         } else {
-             if (!$item->getTaxCalculationPrice()) {
-                 $item->setTaxCalculationPrice($item->getCalculationPriceOriginal());
-             }
-+
-+            if ($this->taxHelper->applyTaxOnOriginalPrice()) {
-+                $taxCalculationPrice = $item->getOriginalPrice();
-+            } else {
-+                $taxCalculationPrice = $item->getCalculationPriceOriginal();
-+            }
-+            $this->setPriceForTaxCalculation($itemDataObject, (float)$taxCalculationPrice);
-+
-             $itemDataObject->setUnitPrice($item->getTaxCalculationPrice())
-                 ->setDiscountAmount($item->getDiscountAmount());
-         }
-@@ -230,6 +268,23 @@ class CommonTaxCollector extends AbstractTotal
-         return $itemDataObject;
-     }
- 
-+    /**
-+     * Set price for tax calculation.
-+     *
-+     * @param QuoteDetailsItemInterface $quoteDetailsItem
-+     * @param float $taxCalculationPrice
-+     * @return void
-+     */
-+    private function setPriceForTaxCalculation(QuoteDetailsItemInterface $quoteDetailsItem, float $taxCalculationPrice)
-+    {
-+        $extensionAttributes = $quoteDetailsItem->getExtensionAttributes();
-+        if (!$extensionAttributes) {
-+            $extensionAttributes = $this->quoteDetailsItemExtensionFactory->create();
-+        }
-+        $extensionAttributes->setPriceForTaxCalculation($taxCalculationPrice);
-+        $quoteDetailsItem->setExtensionAttributes($extensionAttributes);
-+    }
-+
-     /**
-      * Map item extra taxables
-      *
-@@ -237,7 +292,7 @@ class CommonTaxCollector extends AbstractTotal
-      * @param AbstractItem $item
-      * @param bool $priceIncludesTax
-      * @param bool $useBaseCurrency
--     * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface[]
-+     * @return QuoteDetailsItemInterface[]
-      */
-     public function mapItemExtraTaxables(
-         \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory $itemDataObjectFactory,
-@@ -260,7 +315,7 @@ class CommonTaxCollector extends AbstractTotal
-             } else {
-                 $unitPrice = $extraTaxable[self::KEY_ASSOCIATED_TAXABLE_UNIT_PRICE];
-             }
--            /** @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface $itemDataObject */
-+            /** @var QuoteDetailsItemInterface $itemDataObject */
-             $itemDataObject = $itemDataObjectFactory->create();
-             $itemDataObject->setCode($extraTaxable[self::KEY_ASSOCIATED_TAXABLE_CODE])
-                 ->setType($extraTaxable[self::KEY_ASSOCIATED_TAXABLE_TYPE])
-@@ -283,9 +338,9 @@ class CommonTaxCollector extends AbstractTotal
-      * Add quote items
-      *
-      * @param ShippingAssignmentInterface $shippingAssignment
--     * @param bool $useBaseCurrency
-      * @param bool $priceIncludesTax
--     * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface[]
-+     * @param bool $useBaseCurrency
-+     * @return QuoteDetailsItemInterface[]
-      */
-     public function mapItems(
-         ShippingAssignmentInterface $shippingAssignment,
-@@ -293,7 +348,7 @@ class CommonTaxCollector extends AbstractTotal
-         $useBaseCurrency
-     ) {
-         $items = $shippingAssignment->getItems();
--        if (!count($items)) {
-+        if (empty($items)) {
-             return [];
-         }
- 
-@@ -361,10 +416,12 @@ class CommonTaxCollector extends AbstractTotal
-     }
- 
-     /**
-+     * Get shipping data object.
-+     *
-      * @param ShippingAssignmentInterface $shippingAssignment
-      * @param QuoteAddress\Total $total
-      * @param bool $useBaseCurrency
--     * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface
-+     * @return QuoteDetailsItemInterface
-      */
-     public function getShippingDataObject(
-         ShippingAssignmentInterface $shippingAssignment,
-@@ -379,7 +436,7 @@ class CommonTaxCollector extends AbstractTotal
-             $total->setBaseShippingTaxCalculationAmount($total->getBaseShippingAmount());
-         }
-         if ($total->getShippingTaxCalculationAmount() !== null) {
--            /** @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface $itemDataObject */
-+            /** @var QuoteDetailsItemInterface $itemDataObject */
-             $itemDataObject = $this->quoteDetailsItemDataObjectFactory->create()
-                 ->setType(self::ITEM_TYPE_SHIPPING)
-                 ->setCode(self::ITEM_CODE_SHIPPING)
-@@ -414,14 +471,14 @@ class CommonTaxCollector extends AbstractTotal
-      * Populate QuoteDetails object from quote address object
-      *
-      * @param ShippingAssignmentInterface $shippingAssignment
--     * @param \Magento\Tax\Api\Data\QuoteDetailsItemInterface[] $itemDataObjects
-+     * @param QuoteDetailsItemInterface[] $itemDataObjects
-      * @return \Magento\Tax\Api\Data\QuoteDetailsInterface
-      */
-     protected function prepareQuoteDetails(ShippingAssignmentInterface $shippingAssignment, $itemDataObjects)
-     {
-         $items = $shippingAssignment->getItems();
-         $address = $shippingAssignment->getShipping()->getAddress();
--        if (!count($items)) {
-+        if (empty($items)) {
-             return $this->quoteDetailsDataObjectFactory->create();
-         }
- 
-@@ -543,6 +600,7 @@ class CommonTaxCollector extends AbstractTotal
-      * Process applied taxes for items and quote
-      *
-      * @param QuoteAddress\Total $total
-+     * @param ShippingAssignmentInterface $shippingAssignment
-      * @param array $itemsByType
-      * @return $this
-      */
-@@ -630,6 +688,9 @@ class CommonTaxCollector extends AbstractTotal
-     {
-         //The price should be base price
-         $quoteItem->setPrice($baseItemTaxDetails->getPrice());
-+        if ($quoteItem->getCustomPrice() && $this->taxHelper->applyTaxOnCustomPrice()) {
-+            $quoteItem->setCustomPrice($baseItemTaxDetails->getPrice());
-+        }
-         $quoteItem->setConvertedPrice($itemTaxDetails->getPrice());
-         $quoteItem->setPriceInclTax($itemTaxDetails->getPriceInclTax());
-         $quoteItem->setRowTotal($itemTaxDetails->getRowTotal());
-@@ -846,8 +907,9 @@ class CommonTaxCollector extends AbstractTotal
-     }
- 
-     /**
--     * Increment and return counter. This function is intended to be used to generate temporary
--     * id for an item.
-+     * Increment and return counter.
-+     *
-+     * This function is intended to be used to generate temporary id for an item.
-      *
-      * @return int
-      */
-diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
-index 4aea7ab4c5a..52061fd5d38 100755
---- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
-+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
-@@ -265,7 +265,7 @@ class Tax extends CommonTaxCollector
-     {
-         $extraTaxableDetails = [];
-         foreach ($itemsByType as $itemType => $itemTaxDetails) {
--            if ($itemType != self::ITEM_TYPE_PRODUCT and $itemType != self::ITEM_TYPE_SHIPPING) {
-+            if ($itemType != self::ITEM_TYPE_PRODUCT && $itemType != self::ITEM_TYPE_SHIPPING) {
-                 foreach ($itemTaxDetails as $itemCode => $itemTaxDetail) {
-                     /** @var \Magento\Tax\Api\Data\TaxDetailsInterface $taxDetails */
-                     $taxDetails = $itemTaxDetail[self::KEY_ITEM];
-@@ -408,6 +408,7 @@ class Tax extends CommonTaxCollector
- 
-     /**
-      * Process model configuration array.
-+     *
-      * This method can be used for changing totals collect sort order
-      *
-      * @param   array $config
-diff --git a/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php b/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php
-index 025a16a1aea..ef84eac32e9 100644
---- a/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php
-+++ b/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php
-@@ -8,11 +8,14 @@ namespace Magento\Tax\Observer;
- use Magento\Customer\Model\Address;
- use Magento\Framework\Event\Observer;
- use Magento\Framework\Event\ObserverInterface;
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\PageCache\Model\Config;
- use Magento\Tax\Api\TaxAddressManagerInterface;
- use Magento\Tax\Helper\Data;
- 
-+/**
-+ * After address save observer.
-+ */
- class AfterAddressSaveObserver implements ObserverInterface
- {
-     /**
-@@ -23,7 +26,7 @@ class AfterAddressSaveObserver implements ObserverInterface
-     /**
-      * Module manager
-      *
--     * @var Manager
-+     * @var ModuleManagerInterface
-      */
-     private $moduleManager;
- 
-@@ -43,13 +46,13 @@ class AfterAddressSaveObserver implements ObserverInterface
- 
-     /**
-      * @param Data $taxHelper
--     * @param Manager $moduleManager
-+     * @param ModuleManagerInterface $moduleManager
-      * @param Config $cacheConfig
-      * @param TaxAddressManagerInterface $addressManager
-      */
-     public function __construct(
-         Data $taxHelper,
--        Manager $moduleManager,
-+        ModuleManagerInterface $moduleManager,
-         Config $cacheConfig,
-         TaxAddressManagerInterface $addressManager
-     ) {
-@@ -60,6 +63,8 @@ class AfterAddressSaveObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Execute.
-+     *
-      * @param Observer $observer
-      * @return void
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-diff --git a/app/code/Magento/Tax/Observer/CustomerLoggedInObserver.php b/app/code/Magento/Tax/Observer/CustomerLoggedInObserver.php
-index eda7898e9a1..00b3a9f9e09 100644
---- a/app/code/Magento/Tax/Observer/CustomerLoggedInObserver.php
-+++ b/app/code/Magento/Tax/Observer/CustomerLoggedInObserver.php
-@@ -9,11 +9,15 @@ use Magento\Customer\Api\GroupRepositoryInterface;
- use Magento\Customer\Model\Session;
- use Magento\Framework\Event\Observer;
- use Magento\Framework\Event\ObserverInterface;
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\PageCache\Model\Config;
- use Magento\Tax\Api\TaxAddressManagerInterface;
- use Magento\Tax\Helper\Data;
- 
-+/**
-+ * Customer logged in observer
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ */
- class CustomerLoggedInObserver implements ObserverInterface
- {
-     /**
-@@ -29,7 +33,7 @@ class CustomerLoggedInObserver implements ObserverInterface
-     /**
-      * Module manager
-      *
--     * @var Manager
-+     * @var ModuleManagerInterface
-      */
-     private $moduleManager;
- 
-@@ -56,7 +60,7 @@ class CustomerLoggedInObserver implements ObserverInterface
-      * @param GroupRepositoryInterface $groupRepository
-      * @param Session $customerSession
-      * @param Data $taxHelper
--     * @param Manager $moduleManager
-+     * @param ModuleManagerInterface $moduleManager
-      * @param Config $cacheConfig
-      * @param TaxAddressManagerInterface $addressManager
-      */
-@@ -64,7 +68,7 @@ class CustomerLoggedInObserver implements ObserverInterface
-         GroupRepositoryInterface $groupRepository,
-         Session $customerSession,
-         Data $taxHelper,
--        Manager $moduleManager,
-+        ModuleManagerInterface $moduleManager,
-         Config $cacheConfig,
-         TaxAddressManagerInterface $addressManager
-     ) {
-@@ -77,6 +81,8 @@ class CustomerLoggedInObserver implements ObserverInterface
-     }
- 
-     /**
-+     * Execute.
-+     *
-      * @param Observer $observer
-      * @return void
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-diff --git a/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php b/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
-index 87f65ef311a..208833733ae 100644
---- a/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
-+++ b/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
-@@ -6,6 +6,10 @@
- 
- namespace Magento\Tax\Plugin\Checkout\CustomerData;
- 
-+/**
-+ * Process quote items price, considering tax configuration.
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ */
- class Cart
- {
-     /**
-@@ -68,6 +72,16 @@ class Cart
-                     $this->itemPriceRenderer->setItem($item);
-                     $this->itemPriceRenderer->setTemplate('checkout/cart/item/price/sidebar.phtml');
-                     $result['items'][$key]['product_price']=$this->itemPriceRenderer->toHtml();
-+                    if ($this->itemPriceRenderer->displayPriceExclTax()) {
-+                        $result['items'][$key]['product_price_value'] = $item->getCalculationPrice();
-+                    } elseif ($this->itemPriceRenderer->displayPriceInclTax()) {
-+                        $result['items'][$key]['product_price_value'] = $item->getPriceInclTax();
-+                    } elseif ($this->itemPriceRenderer->displayBothPrices()) {
-+                        //unset product price value in case price already has been set as scalar value.
-+                        unset($result['items'][$key]['product_price_value']);
-+                        $result['items'][$key]['product_price_value']['incl_tax'] = $item->getPriceInclTax();
-+                        $result['items'][$key]['product_price_value']['excl_tax'] = $item->getCalculationPrice();
-+                    }
-                 }
-             }
-         }
-diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCreateTaxRuleActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCreateTaxRuleActionGroup.xml
-new file mode 100644
-index 00000000000..fe24af478ff
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCreateTaxRuleActionGroup.xml
-@@ -0,0 +1,28 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateTaxRuleActionGroup">
-+        <arguments>
-+            <argument name="taxRate" type="entity"/>
-+            <argument name="taxRule" type="entity"/>
-+        </arguments>
-+        <!-- Create Tax Rule -->
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-+        <waitForPageLoad stepKey="waitForTaxRatePage"/>
-+        <click selector="{{AdminGridMainControls.add}}" stepKey="addNewTaxRate"/>
-+        <fillField selector="{{AdminTaxRulesSection.ruleName}}" userInput="{{taxRule.code}}" stepKey="fillRuleName"/>
-+        <click selector="{{AdminTaxRulesSection.selectTaxRate(taxRate.code)}}" stepKey="selectTaxRate"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
-+        <fillField userInput="{{taxRule.priority}}" selector="{{AdminTaxRuleFormSection.priority}}" stepKey="fillPriority"/>
-+        <fillField userInput="{{taxRule.position}}" selector="{{AdminTaxRuleFormSection.sortOrder}}" stepKey="fillPosition"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSave"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCustomerTaxClassActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCustomerTaxClassActionGroup.xml
-new file mode 100644
-index 00000000000..04d497b4b52
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCustomerTaxClassActionGroup.xml
-@@ -0,0 +1,42 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Add Customer Tax Class-->
-+    <actionGroup name="addCustomerTaxClass">
-+        <arguments>
-+            <argument name="customerTaxClassName" type="string"/>
-+        </arguments>
-+        <!--Click Additional Settings-->
-+        <click stepKey="clickAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
-+        <!--Click Product Add New Tax Class Button-->
-+        <click stepKey="clickCustomerAddNewTaxClassBtn" selector="{{AdminTaxRulesSection.customerAddNewTaxClass}}"/>
-+        <!--Fill field-->
-+        <fillField stepKey="fillCustomerNewTaxClass" selector="{{AdminTaxRulesSection.fieldCustomerNewTaxClass}}" userInput="{{customerTaxClassName}}"/>
-+        <!-- Save Product tax rate -->
-+        <click stepKey="saveProdTaxRate" selector="{{AdminTaxRulesSection.saveCustomerNewTaxClass}}"/>
-+    </actionGroup>
-+
-+    <!--Delete Product Tax Class-->
-+    <actionGroup name="deleteCustomerTaxClass">
-+        <arguments>
-+            <argument name="taxClassName" type="string"/>
-+        </arguments>
-+        <!-- Go to tax rule page -->
-+        <amOnPage url="{{AdminNewTaxRulePage.url}}" stepKey="goToNewTaxRulePage"/>
-+        <waitForPageLoad stepKey="waitForTaxRatePage"/>
-+        <click stepKey="clickAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
-+        <scrollTo stepKey="scrollToAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
-+        <moveMouseOver stepKey="hoverDeleteElement" selector="{{AdminTaxRulesSection.deleteTaxClassName(taxClassName)}}"/>
-+        <click stepKey="deleteFirstTaxClass" selector="{{AdminTaxRulesSection.deleteTaxClass(taxClassName)}}"/>
-+        <waitForElementVisible selector="{{AdminTaxRulesSection.popUpDialogOK}}" stepKey="waitForElementBecomeVisible"/>
-+        <click stepKey="acceptPopUpDialog" selector="{{AdminTaxRulesSection.popUpDialogOK}}"/>
-+        <waitForPageLoad stepKey="waitForProductTaxClassDeleted"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRuleActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRuleActionGroup.xml
-new file mode 100644
-index 00000000000..f6b2b7a4785
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRuleActionGroup.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminDeleteTaxRule">
-+        <arguments>
-+            <argument name="taxRuleCode" type="string" />
-+        </arguments>
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleGridPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1" />
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{taxRuleCode}}" stepKey="fillTaxRuleCode"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSearch" />
-+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-+        <waitForPageLoad stepKey="waitForPageLoad" />
-+        <click selector="{{AdminTaxRuleFormSection.deleteRule}}" stepKey="clickDeleteRule"/>
-+        <click selector="{{AdminTaxRuleFormSection.ok}}" stepKey="clickOk"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
-index 6d6e5cea0fd..3986ede9acf 100644
---- a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Change the tax configuration to display in cart and checkout flow -->
-     <actionGroup name="editTaxConfigurationByUI">
-         <!-- navigate to the tax configuration page -->
-@@ -15,13 +15,19 @@
-         <waitForPageLoad stepKey="waitForTaxConfigLoad"/>
- 
-         <!-- change the default state to California -->
--        <conditionalClick stepKey="clickCalculationSettings" selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="{{AdminConfigureTaxSection.systemValueDefaultState}}" visible="false" />
-+        <scrollTo selector="#tax_defaults-head" x="0" y="-80" stepKey="scrollToTaxDefaults" />
-+        <!-- conditionalClick twice to fix some flaky behavior -->
-+        <conditionalClick stepKey="clickCalculationSettings" selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="#tax_defaults" visible="false" />
-+        <conditionalClick stepKey="clickCalculationSettingsAgain" selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="#tax_defaults" visible="false" />
-         <uncheckOption stepKey="clickDefaultState" selector="{{AdminConfigureTaxSection.systemValueDefaultState}}"/>
-         <selectOption stepKey="selectDefaultState" selector="{{AdminConfigureTaxSection.dropdownDefaultState}}" userInput="California"/>
-         <fillField stepKey="fillDefaultPostCode" selector="{{AdminConfigureTaxSection.defaultPostCode}}" userInput="*"/>
- 
-         <!-- change the options for shopping cart display to show tax -->
--        <conditionalClick stepKey="clickShoppingCartDisplaySettings" selector="{{AdminConfigureTaxSection.shoppingCartDisplay}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalCart}}" visible="false"/>
-+        <scrollTo selector="#tax_cart_display-head" x="0" y="-80" stepKey="scrollToTaxShoppingCartDisplay" />
-+        <!-- conditionalClick twice to fix some flaky behavior -->
-+        <conditionalClick stepKey="clickShoppingCartDisplaySettings" selector="{{AdminConfigureTaxSection.shoppingCartDisplay}}" dependentSelector="#tax_cart_display" visible="false"/>
-+        <conditionalClick stepKey="clickShoppingCartDisplaySettingsAgain" selector="{{AdminConfigureTaxSection.shoppingCartDisplay}}" dependentSelector="#tax_cart_display" visible="false"/>
-         <uncheckOption stepKey="clickTaxTotalCart" selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalCart}}"/>
-         <selectOption stepKey="selectTaxTotalCart" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalCart}}" userInput="Yes"/>
-         <uncheckOption stepKey="clickDisplayTaxSummaryCart" selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummaryCart}}"/>
-@@ -30,7 +36,10 @@
-         <selectOption stepKey="selectDisplayZeroTaxCart" selector="{{AdminConfigureTaxSection.dropdownDisplayZeroTaxCart}}" userInput="Yes"/>
- 
-         <!-- change the options for orders, invoices, credit memos display to show tax -->
--        <conditionalClick stepKey="clickOrdersInvoicesCreditSales" selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}" visible="false"/>
-+        <scrollTo selector="#tax_sales_display-head" x="0" y="-80" stepKey="scrollToTaxSalesDisplay" />
-+        <!-- conditionalClick twice to fix some flaky behavior -->
-+        <conditionalClick stepKey="clickOrdersInvoicesCreditSales" selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="#tax_sales_display" visible="false"/>
-+        <conditionalClick stepKey="clickOrdersInvoicesCreditSalesAgain" selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="#tax_sales_display" visible="false"/>
-         <uncheckOption stepKey="clickTaxTotalSales" selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}"/>
-         <selectOption stepKey="selectTaxTotalSales" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalSales}}" userInput="Yes"/>
-         <uncheckOption stepKey="clickDisplayTaxSummarySales" selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummarySales}}"/>
-@@ -51,13 +60,17 @@
-         <waitForPageLoad stepKey="waitForTaxConfigLoad"/>
- 
-         <!-- change the default state to none -->
-+        <!-- conditionalClick twice to fix some flaky behavior -->
-         <conditionalClick stepKey="clickCalculationSettings" selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="{{AdminConfigureTaxSection.systemValueDefaultState}}" visible="false" />
-+        <conditionalClick stepKey="clickCalculationSettingsAgain" selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="{{AdminConfigureTaxSection.systemValueDefaultState}}" visible="false" />
-         <checkOption stepKey="clickDefaultState" selector="{{AdminConfigureTaxSection.systemValueDefaultState}}"/>
-         <selectOption stepKey="selectDefaultState" selector="{{AdminConfigureTaxSection.dropdownDefaultState}}" userInput="California"/>
-         <fillField stepKey="fillDefaultPostCode" selector="{{AdminConfigureTaxSection.defaultPostCode}}" userInput=""/>
- 
-         <!-- change the options for shopping cart display to not show tax -->
-+        <!-- conditionalClick twice to fix some flaky behavior -->
-         <conditionalClick stepKey="clickShoppingCartDisplaySettings" selector="{{AdminConfigureTaxSection.shoppingCartDisplay}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalCart}}" visible="false"/>
-+        <conditionalClick stepKey="clickShoppingCartDisplaySettingsAgain" selector="{{AdminConfigureTaxSection.shoppingCartDisplay}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalCart}}" visible="false"/>
-         <checkOption stepKey="clickTaxTotalCart" selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalCart}}"/>
-         <selectOption stepKey="selectTaxTotalCart" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalCart}}" userInput="Yes"/>
-         <checkOption stepKey="clickDisplayTaxSummaryCart" selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummaryCart}}"/>
-@@ -66,7 +79,9 @@
-         <selectOption stepKey="selectDisplayZeroTaxCart" selector="{{AdminConfigureTaxSection.dropdownDisplayZeroTaxCart}}" userInput="Yes"/>
- 
-         <!-- change the options for orders, invoices, credit memos display to not show tax -->
-+        <!-- conditionalClick twice to fix some flaky behavior -->
-         <conditionalClick stepKey="clickOrdersInvoicesCreditSales" selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}" visible="false"/>
-+        <conditionalClick stepKey="clickOrdersInvoicesCreditSalesAgain" selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}" visible="false"/>
-         <checkOption stepKey="clickTaxTotalSales" selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}"/>
-         <selectOption stepKey="selectTaxTotalSales" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalSales}}" userInput="Yes"/>
-         <checkOption stepKey="clickDisplayTaxSummarySales" selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummarySales}}"/>
-@@ -80,6 +95,13 @@
-         <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration."/>
-     </actionGroup>
- 
-+    <actionGroup name="addCustomTaxRate" extends="addNewTaxRateNoZip">
-+        <remove keyForRemoval="fillZipCode"/>
-+        <remove keyForRemoval="fillRate"/>
-+        <fillField stepKey="fillZipCode" selector="{{AdminTaxRulesSection.zipCode}}" userInput="US-NY-*-Rate 2" after="fillTaxIdentifier"/>
-+        <fillField stepKey="fillRate" selector="{{AdminTaxRulesSection.rate}}" userInput="0" after="selectCountry"/>
-+    </actionGroup>
-+
-     <!-- Action group to add a tax rate when on a tax rule configuration page -->
-     <!-- Must already be on a tax rule configuration page or a new tax rule page -->
-     <actionGroup name="addNewTaxRateNoZip">
-@@ -100,4 +122,99 @@
-         <!-- Save the tax rate -->
-         <click stepKey="saveTaxRate" selector="{{AdminTaxRulesSection.save}}"/>
-     </actionGroup>
-+
-+    <!--Set Tax Class for Shipping-->
-+    <actionGroup name="changeShippingTaxClass">
-+        <!--Select Configuration menu from Store-->
-+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
-+        <waitForPageLoad stepKey="waitForConfiguration"/>
-+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
-+        <waitForPageLoad stepKey="waitForSales"/>
-+        <!--Double click the same to fix flaky issue with redirection to Dashboard-->
-+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
-+        <waitForPageLoad stepKey="waitForConfiguration1"/>
-+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
-+        <waitForPageLoad stepKey="waitForSales1" time="5"/>
-+        <!--Change default tax class for Shipping on Taxable Goods-->
-+        <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />
-+        <waitForPageLoad stepKey="waitForPaymentMethods"/>
-+        <click selector="{{AdminConfigureTaxSection.salesTax}}" stepKey="clickOnTax"/>
-+        <waitForPageLoad stepKey="waitForTax"/>
-+        <seeInCurrentUrl url="{{AdminTaxConfigurationPage.url}}" stepKey="adminTaxConfiguration"/>
-+        <seeElement selector="{{AdminConfigureTaxSection.taxClasses}}" stepKey="taxClassSectionC"/>
-+        <click selector="{{AdminConfigureTaxSection.taxClasses}}" stepKey="openTaxClassSection"/>
-+        <click selector="{{AdminConfigureTaxSection.taxShippingClassSystem}}" stepKey="uncheckSystemValue"/>
-+        <selectOption selector="{{AdminConfigureTaxSection.taxClassShipping}}" userInput="Taxable Goods" stepKey="setTaxClassForShipping"/>
-+        <!-- Save the settings -->
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <click stepKey="saveTaxOptions" selector="{{AdminCategoryMainActionsSection.SaveButton}}"/>
-+        <waitForPageLoad stepKey="waitForTaxSaved"/>
-+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration."/>
-+    </actionGroup>
-+
-+    <actionGroup name="setDefaultShippingTaxClass">
-+        <!--Select Configuration menu from Store-->
-+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
-+        <waitForPageLoad stepKey="waitForConfiguration"/>
-+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
-+        <waitForPageLoad stepKey="waitForSales"/>
-+        <!--Double click the same to fix flaky issue with redirection to Dashboard-->
-+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
-+        <waitForPageLoad stepKey="waitForConfiguration1"/>
-+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
-+        <waitForPageLoad stepKey="waitForSales1"/>
-+        <!--Change default tax class for Shipping on Taxable Goods-->
-+        <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />
-+        <waitForPageLoad stepKey="waitForPaymentMethods"/>
-+        <click selector="{{AdminConfigureTaxSection.salesTax}}" stepKey="clickOnTax"/>
-+        <waitForPageLoad stepKey="waitForTax"/>
-+        <seeElement selector="{{AdminConfigureTaxSection.taxClasses}}" stepKey="taxClassSectionC"/>
-+        <click selector="{{AdminConfigureTaxSection.taxShippingClassSystem}}" stepKey="checkSystemDefaultValue"/>
-+        <click selector="{{AdminConfigureTaxSection.taxClasses}}" stepKey="closeTaxClassSection"/>
-+        <!-- Save the settings -->
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <click stepKey="saveTaxOptions" selector="{{AdminCategoryMainActionsSection.SaveButton}}"/>
-+        <waitForPageLoad stepKey="waitForTaxSaved"/>
-+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration."/>
-+    </actionGroup>
-+
-+    <!--Add Product Tax Class-->
-+    <actionGroup name="addProductTaxClass">
-+        <arguments>
-+            <argument name="prodTaxClassName" type="string"/>
-+        </arguments>
-+        <!--Click Additional Settings-->
-+        <click stepKey="clickAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
-+        <!--Click Product Add New Tax Class Button-->
-+        <click stepKey="clickProdAddNewTaxClassBtn" selector="{{AdminTaxRulesSection.productAddNewTaxClass}}"/>
-+        <!--Fill field-->
-+        <fillField stepKey="fillProdNewTaxClass" selector="{{AdminTaxRulesSection.fieldProdNewTaxClass}}" userInput="{{prodTaxClassName}}"/>
-+        <!-- Save Product tax rate -->
-+        <click stepKey="saveProdTaxRate" selector="{{AdminTaxRulesSection.saveProdNewTaxClass}}"/>
-+    </actionGroup>
-+
-+    <!--Add New Tax Rule -->
-+    <actionGroup name="addNewTaxRuleActionGroup">
-+        <!-- Go to tax rule page -->
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-+        <waitForPageLoad stepKey="waitForTaxRatePage"/>
-+        <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
-+    </actionGroup>
-+
-+    <!--Delete Product Tax Class-->
-+    <actionGroup name="deleteProductTaxClass">
-+        <arguments>
-+            <argument name="taxClassName" type="string"/>
-+        </arguments>
-+        <!-- Go to tax rule page -->
-+        <amOnPage url="{{AdminNewTaxRulePage.url}}" stepKey="goToNewTaxRulePage"/>
-+        <waitForPageLoad stepKey="waitForTaxRatePage"/>
-+        <click stepKey="clickAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
-+        <scrollTo stepKey="scrollToAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
-+        <moveMouseOver stepKey="hoverDeleteElement" selector="{{AdminTaxRulesSection.deleteTaxClassName(taxClassName)}}"/>
-+        <click stepKey="deleteFirstTaxClass" selector="{{AdminTaxRulesSection.deleteTaxClass(taxClassName)}}"/>
-+        <waitForElementVisible selector="{{AdminTaxRulesSection.popUpDialogOK}}" stepKey="waitForElementBecomeVisible"/>
-+        <click stepKey="acceptPopUpDialog" selector="{{AdminTaxRulesSection.popUpDialogOK}}"/>
-+        <waitForPageLoad stepKey="waitForProductTaxClassDeleted"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Tax/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..2bed9b0d079
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuStoresTaxesTaxRules">
-+        <data key="pageTitle">Tax Rules</data>
-+        <data key="title">Tax Rules</data>
-+        <data key="dataUiId">magento-tax-sales-tax-rules</data>
-+    </entity>
-+    <entity name="AdminMenuStoresTaxZonesAndRates">
-+        <data key="pageTitle">Tax Zones and Rates</data>
-+        <data key="title">Tax Zones and Rates</data>
-+        <data key="dataUiId">magento-tax-sales-tax-rates</data>
-+    </entity>
-+    <entity name="AdminMenuSystemDataTransferImportAndExportTaxRates">
-+        <data key="pageTitle">Import and Export Tax Rates</data>
-+        <data key="title">Import/Export Tax Rates</data>
-+        <data key="dataUiId">magento-taximportexport-system-convert-tax</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxClassData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxClassData.xml
-new file mode 100644
-index 00000000000..0edf2d6cac1
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxClassData.xml
-@@ -0,0 +1,29 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="defaultTaxClass" type="taxClass">
-+        <data key="class_name" unique="suffix">Tax Class </data>
-+    </entity>
-+    <entity name="customerTaxClass" type="taxClass">
-+        <data key="class_name" unique="suffix">Customer Tax Class </data>
-+        <data key="class_type">CUSTOMER</data>
-+    </entity>
-+    <entity name="productTaxClass" type="taxClass">
-+        <data key="class_name" unique="suffix">Product Tax Class </data>
-+        <data key="class_type">PRODUCT</data>
-+    </entity>
-+    <entity name="retailCustomerTaxClass">
-+        <data key="class_name">Retail Customer</data>
-+        <data key="class_type">CUSTOMER</data>
-+    </entity>
-+    <entity name="taxableGoodsTaxClass">
-+        <data key="class_name">Taxable Goods</data>
-+        <data key="class_type">PRODUCT</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
-index e786616119c..27c89162b5c 100644
---- a/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
-@@ -7,7 +7,19 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="SimpleTaxUK" type="tax">
-+        <data key="state">California</data>
-+        <data key="country">United Kingdom</data>
-+        <data key="zip">*</data>
-+        <data key="rate">50</data>
-+    </entity>
-+    <entity name="SimpleTaxUKZeroRate" type="tax">
-+        <data key="state">California</data>
-+        <data key="country">United Kingdom</data>
-+        <data key="zip">*</data>
-+        <data key="rate">0</data>
-+    </entity>
-     <entity name="SimpleTaxNY" type="tax">
-         <data key="state">New York</data>
-         <data key="country">United States</data>
-@@ -26,4 +38,16 @@
-         <data key="zip">*</data>
-         <data key="rate">0</data>
-     </entity>
-+    <entity name="SimpleTaxWithZipCode" type="tax">
-+        <data key="state">Texas</data>
-+        <data key="country">United States</data>
-+        <data key="zip">78729</data>
-+        <data key="rate">7.25</data>
-+    </entity>
-+    <entity name="SimpleSecondTaxWithZipCode" type="tax">
-+        <data key="state">Texas</data>
-+        <data key="country">United States</data>
-+        <data key="zip">78729</data>
-+        <data key="rate">0.125</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml
-index d7c88c1d282..4edf005c2fc 100644
---- a/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <!-- Default Tax Destination Calculation -->
-     <entity name="CountryUS" type="country">
-         <data key="value">US</data>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRateData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRateData.xml
-new file mode 100644
-index 00000000000..a497a1776b5
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRateData.xml
-@@ -0,0 +1,120 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="SimpleTaxRate" type="taxRate">
-+        <data key="code" unique="suffix">TaxRate</data>
-+    </entity>
-+    <entity name="defaultTaxRate" type="taxRate">
-+        <data key="code" unique="suffix">Tax Rate </data>
-+        <data key="tax_country_id">US</data>
-+        <data key="tax_region_id">12</data>
-+        <data key="tax_postcode">*</data>
-+        <data key="zip_is_range">0</data>
-+        <data key="rate">10</data>
-+    </entity>
-+    <entity name="US_CA_Rate_1" type="taxRate">
-+        <data key="id">1</data>
-+        <data key="code">US-CA-*-Rate 1</data>
-+        <data key="tax_country_id">US</data>
-+        <data key="tax_postcode">*</data>
-+        <data key="rate">8.2500</data>
-+    </entity>
-+    <entity name="US_NY_Rate_1" type="taxRate">
-+        <data key="code">US-NY-*-Rate 1</data>
-+        <data key="tax_country_id">US</data>
-+        <data key="tax_postcode">*</data>
-+        <data key="rate">8.3750</data>
-+        <data key="id">2</data>
-+    </entity>
-+    <entity name="taxRate_US_NY_8_1" type="taxRate">
-+        <data key="code" unique="suffix">US-NY-*-</data>
-+        <data key="tax_country_id">US</data>
-+        <data key="tax_region_id">43</data>
-+        <data key="tax_postcode">*</data>
-+        <data key="rate">8.1</data>
-+    </entity>
-+    <entity name="taxRateCustomRateUS" type="taxRate">
-+        <data key="code" unique="suffix">Tax Rate </data>
-+        <data key="tax_country_id">US</data>
-+        <data key="tax_country">United States</data>
-+        <data key="tax_region_id">12</data>
-+        <data key="tax_region">California</data>
-+        <data key="tax_postcode">90001</data>
-+        <data key="zip_is_range">0</data>
-+        <data key="rate">100.0000</data>
-+    </entity>
-+    <entity name="defaultTaxRateWithZipRange" type="taxRate">
-+        <data key="code" unique="suffix">Tax Rate </data>
-+        <data key="tax_country_id">US</data>
-+        <data key="tax_country">United States</data>
-+        <data key="tax_region_id">12</data>
-+        <data key="tax_region">California</data>
-+        <data key="zip_is_range">1</data>
-+        <data key="zip_from">90001</data>
-+        <data key="zip_to">96162</data>
-+        <data key="rate">15.05</data>
-+    </entity>
-+    <entity name="TaxRateWithFixedZipUtah" type="taxRate">
-+        <data key="code" unique="suffix">Tax Rate </data>
-+        <data key="tax_country_id">US</data>
-+        <data key="tax_country">United States</data>
-+        <data key="tax_region_id">58</data>
-+        <data key="tax_region">Utah</data>
-+        <data key="zip_is_range">0</data>
-+        <data key="tax_postcode">84001</data>
-+        <data key="rate">20</data>
-+    </entity>
-+    <entity name="defaultTaxRateWithLargeRate" type="taxRate">
-+        <data key="code" unique="suffix">TaxRate</data>
-+        <data key="tax_country_id">GB</data>
-+        <data key="tax_country">United Kingdom</data>
-+        <data key="tax_postcode">*</data>
-+        <data key="zip_is_range">0</data>
-+        <data key="rate">777</data>
-+    </entity>
-+    <entity name="taxRateCustomRateCanada" type="taxRate">
-+        <data key="code" unique="suffix">TaxRate</data>
-+        <data key="tax_country_id">CA</data>
-+        <data key="tax_country">Canada</data>
-+        <data key="tax_region_id">*</data>
-+        <data key="tax_postcode">180</data>
-+        <data key="zip_is_range">0</data>
-+        <data key="rate">25</data>
-+    </entity>
-+    <entity name="taxRateCustomRateUK" type="taxRate">
-+        <data key="code" unique="suffix">TaxRate</data>
-+        <data key="tax_country_id">GB</data>
-+        <data key="tax_country">United Kingdom</data>
-+        <data key="zip_is_range">1</data>
-+        <data key="zip_from">1</data>
-+        <data key="zip_to">7800935</data>
-+        <data key="rate">12.99</data>
-+    </entity>
-+    <entity name="taxRateCustomRateFrance" type="taxRate">
-+        <data key="code" unique="suffix">TaxRate</data>
-+        <data key="tax_country_id">FR</data>
-+        <data key="tax_country">France</data>
-+        <data key="tax_region_id">277</data>
-+        <data key="tax_region">Val-d'Oise</data>
-+        <data key="tax_postcode">*</data>
-+        <data key="zip_is_range">0</data>
-+        <data key="rate">0.1</data>
-+    </entity>
-+    <entity name="taxRateForPensylvannia" extends="defaultTaxRate">
-+        <data key="tax_region_id">51</data>
-+        <data key="rate">6</data>
-+    </entity>
-+    <entity name="USFullTaxRate" type="taxRate">
-+        <data key="code" unique="suffix">Tax Rate</data>
-+        <data key="tax_country_id">US</data>
-+        <data key="tax_postcode">*</data>
-+        <data key="zip_is_range">0</data>
-+        <data key="rate">10</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRegionData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRegionData.xml
-index c27225a3398..353bc0a4894 100644
---- a/app/code/Magento/Tax/Test/Mftf/Data/TaxRegionData.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRegionData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="Region_NY" type="region">
-         <data key="value">43</data>
-     </entity>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
-index 16c89174542..fde43cd10e3 100644
---- a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
-@@ -6,7 +6,21 @@
-   */
- -->
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="defaultTaxRule" type="taxRule">
-+        <data key="code" unique="suffix">TaxIdentifier</data>
-+        <data key="position">1</data>
-+        <data key="priority">1</data>
-+        <array key="customer_tax_class_ids">
-+            <item>3</item>
-+        </array>
-+        <array key="product_tax_class_ids">
-+            <item>2</item>
-+        </array>
-+        <array key="tax_rate_ids">
-+            <item>1</item>
-+        </array>
-+    </entity>
-     <entity name="SimpleTaxRule" type="taxRule">
-         <data key="code" unique="suffix">TaxRule</data>
-         <data key="position">0</data>
-@@ -23,4 +37,90 @@
-         </array>
-         <data key="calculate_subtotal">true</data>
-     </entity>
-+    <entity name="taxRuleWithCustomPriorityPosition" type="taxRule">
-+        <data key="code" unique="suffix">TaxRule</data>
-+        <data key="position">1</data>
-+        <data key="priority">1</data>
-+        <array key="customer_tax_class_ids">
-+            <item>3</item>
-+        </array>
-+        <array key="product_tax_class_ids">
-+            <item>2</item>
-+        </array>
-+        <array key="tax_rate_ids">
-+            <item>1</item>
-+            <item>2</item>
-+        </array>
-+        <data key="calculate_subtotal">true</data>
-+    </entity>
-+    <entity name="taxRuleWithCustomPriority" type="taxRule">
-+        <data key="code" unique="suffix">TaxRule</data>
-+        <data key="position">0</data>
-+        <data key="priority">1</data>
-+        <array key="customer_tax_class_ids">
-+            <item>3</item>
-+        </array>
-+        <array key="product_tax_class_ids">
-+            <item>2</item>
-+        </array>
-+        <array key="tax_rate_ids">
-+            <item>1</item>
-+            <item>2</item>
-+        </array>
-+        <data key="calculate_subtotal">true</data>
-+    </entity>
-+    <entity name="taxRuleWithCustomPosition" type="taxRule">
-+        <data key="code" unique="suffix">TaxRule</data>
-+        <data key="position">1</data>
-+        <data key="priority">0</data>
-+        <array key="customer_tax_class_ids">
-+            <item>3</item>
-+        </array>
-+        <array key="product_tax_class_ids">
-+            <item>2</item>
-+        </array>
-+        <array key="tax_rate_ids">
-+            <item>1</item>
-+            <item>2</item>
-+        </array>
-+        <data key="calculate_subtotal">true</data>
-+    </entity>
-+    <entity name="taxRuleWithUpdatePriorityPosition" type="taxRule">
-+        <data key="code" unique="suffix">TaxRule</data>
-+        <data key="position">2</data>
-+        <data key="priority">2</data>
-+        <array key="customer_tax_class_ids">
-+            <item>3</item>
-+        </array>
-+        <array key="product_tax_class_ids">
-+            <item>2</item>
-+        </array>
-+        <array key="tax_rate_ids">
-+            <item>1</item>
-+            <item>2</item>
-+        </array>
-+        <data key="calculate_subtotal">true</data>
-+    </entity>
-+    <entity name="taxRuleWithCustomTaxClasses" type="taxRule">
-+        <data key="code" unique="suffix">TaxRule</data>
-+        <data key="position">0</data>
-+        <data key="priority">0</data>
-+        <array key="customer_tax_class_ids">
-+            <item>3</item>
-+        </array>
-+        <array key="product_tax_class_ids">
-+            <item>2</item>
-+        </array>
-+        <array key="tax_rate_ids">
-+            <item>1</item>
-+            <item>2</item>
-+        </array>
-+        <data key="calculate_subtotal">true</data>
-+    </entity>
-+    <entity name="TaxRule" type="taxRule">
-+        <data key="name" unique="suffix">TaxName</data>
-+    </entity>
-+    <entity name="TaxRuleZeroRate" type="taxRule">
-+        <data key="name" unique="suffix">TaxNameZeroRate</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_class-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_class-meta.xml
-new file mode 100644
-index 00000000000..c2e5aac8ce6
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_class-meta.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CreateTaxClass" dataType="taxClass" type="create" auth="adminOauth" url="/V1/taxClasses" method="POST" returnRegex="/\d+/">
-+        <contentType>application/json</contentType>
-+        <object dataType="taxClass" key="taxClass">
-+            <field key="id">integer</field>
-+            <field key="class_id">integer</field>
-+            <field key="class_name" required="true">string</field>
-+            <field key="class_type">string</field>
-+        </object>
-+    </operation>
-+    <operation name="GetTaxClass" dataType="taxClass" type="get" auth="adminOauth" url="/V1/taxClasses/{return}" method="GET">
-+        <contentType>application/json</contentType>
-+    </operation>
-+    <operation name="DeleteTaxClass" dataType="taxClass" type="delete" auth="adminOauth" url="/V1/taxClasses/{return}" method="DELETE">
-+        <contentType>application/json</contentType>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml
-index 137c2e48c11..7383e9c5802 100644
---- a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateTaxConfigDefaultsTaxDestination" dataType="tax_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/tax/" method="POST">
-         <object key="groups" dataType="tax_config_state">
-             <object key="defaults" dataType="tax_config_state">
-diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rate-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rate-meta.xml
-new file mode 100644
-index 00000000000..3f192920c5c
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rate-meta.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CreateTaxRate" dataType="taxRate" type="create" auth="adminOauth" url="/V1/taxRates" method="POST">
-+        <contentType>application/json</contentType>
-+        <object key="taxRate" dataType="taxRate">
-+            <field key="id">integer</field>
-+            <field key="tax_country_id">string</field>
-+            <field key="tax_region_id">integer</field>
-+            <field key="tax_postcode">string</field>
-+            <field key="zip_is_range">integer</field>
-+            <field key="zip_from">integer</field>
-+            <field key="zip_to">integer</field>
-+            <field key="rate">integer</field>
-+            <field key="code">string</field>
-+        </object>
-+    </operation>
-+    <operation name="DeleteTaxRate" dataType="taxRate" type="delete" auth="adminOauth" url="/V1/taxRates/{id}" method="DELETE">
-+        <contentType>application/json</contentType>
-+    </operation>
-+</operations>
-\ No newline at end of file
-diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rule-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rule-meta.xml
-index f9886303fd3..c5b78151991 100644
---- a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rule-meta.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rule-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateTaxRule" dataType="taxRule" type="create" auth="adminOauth" url="/V1/taxRules" method="POST">
-         <contentType>application/json</contentType>
-         <object key="rule" dataType="taxRule">
-diff --git a/app/code/Magento/Tax/Test/Mftf/Page/AdminEditTaxRatePage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminEditTaxRatePage.xml
-new file mode 100644
-index 00000000000..26152d5497a
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminEditTaxRatePage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminEditTaxRatePage" url="tax/rate/edit/rate/{{var1}}/" module="Magento_Tax" area="admin" parameterized="true">
-+        <section name="AdminTaxRateFormSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Page/AdminEditTaxRulePage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminEditTaxRulePage.xml
-new file mode 100644
-index 00000000000..c0e4958619c
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminEditTaxRulePage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminEditTaxRulePage" url="tax/rule/edit/rule/{{var}}/" module="Magento_Tax" area="admin" parameterized="true">
-+        <section name="AdminTaxRulesSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Page/AdminNewTaxRulePage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminNewTaxRulePage.xml
-index cf7fcf041c1..6aedc001428 100644
---- a/app/code/Magento/Tax/Test/Mftf/Page/AdminNewTaxRulePage.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminNewTaxRulePage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminNewTaxRulePage" url="tax/rule/new/" module="Magento_Tax" area="admin">
-         <section name="AdminTaxRulesSection"/>
-     </page>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxConfigurationPage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxConfigurationPage.xml
-index d18e300983b..a9d14de18de 100644
---- a/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxConfigurationPage.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxConfigurationPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminTaxConfigurationPage" url="admin/system_config/edit/section/tax/" area="admin" module="Magento_Tax">
-         <section name="AdminConfigureTaxSection"/>
-     </page>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRateGridPage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRateGridPage.xml
-index 6073766a816..716c3991104 100644
---- a/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRateGridPage.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRateGridPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminTaxRateGridPage" url="tax/rate/" area="admin" module="Magento_Tax">
-         <section name="AdminSecondaryGridSection"/>
-     </page>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRuleGridPage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRuleGridPage.xml
-index 8c75237a203..3c8326e95d9 100644
---- a/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRuleGridPage.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRuleGridPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminTaxRuleGridPage" url="tax/rule" area="admin" module="Magento_Tax">
-         <section name="AdminSecondaryGridSection"/>
-         <section name="AdminGridMainControls"/>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
-index af33b6b4ad5..e69bfbaebbf 100644
---- a/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
-@@ -7,10 +7,15 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminConfigureTaxSection">
-         <!-- on page /admin/admin/system_config/edit/section/tax/ -->
-+        <element name="salesTax" type="button" selector="//a[contains(@class, 'admin__page-nav-link item-nav')]/span[text()='Tax']"/>
-         <element name="taxClasses" type="block" selector="#tax_classes-head" timeout="30"/>
-+        <element name="taxShippingClassSystem" type="checkbox" selector="#tax_classes_shipping_tax_class_inherit"/>
-+        <element name="taxClassShipping" type="select" selector="#tax_classes_shipping_tax_class"/>
-+        <element name="taxClassProduct" type="select" selector="#tax_classes_default_product_tax_class"/>
-+        <element name="taxClassCustomer" type="select" selector="#tax_classes_default_customer_tax_class"/>
- 
-         <element name="taxCalculationSettings" type="block" selector="#tax_calculation-head" timeout="30"/>
-         <element name="taxCalculationSettingsOpened" type="block" selector="#tax_calculation-head.open" timeout="30"/>
-@@ -23,6 +28,8 @@
-         <element name="taxCalculationPrices" type="select" selector="#tax_calculation_price_includes_tax"/>
-         <element name="taxCalculationPricesDisabled" type="select" selector="#tax_calculation_price_includes_tax[disabled='disabled']"/>
-         <element name="taxCalculationPricesInherit" type="checkbox" selector="#tax_calculation_price_includes_tax_inherit"/>
-+        <element name="taxCalculationApplyTaxOn" type="select" selector="#tax_calculation_apply_tax_on"/>
-+        <element name="taxCalculationApplyTaxOnInherit" type="checkbox" selector="#tax_calculation_apply_tax_on_inherit"/>
- 
-         <element name="defaultDestination" type="block" selector="#tax_defaults-head" timeout="30"/>
-         <element name="systemValueDefaultState" type="checkbox" selector="#row_tax_defaults_region input[type='checkbox']"/>
-@@ -35,6 +42,7 @@
-         <element name="taxDisplayProductPricesDisabled" type="select" selector="#tax_display_type[disabled='disabled']"/>
-         <element name="taxDisplayProductPricesInherit" type="checkbox" selector="#tax_display_type_inherit"/>
- 
-+        <element name="taxSalesDisplay" type="block" selector=".config.admin__collapsible-block#tax_sales_display" timeout="30"/>
-         <element name="shoppingCartDisplay" type="block" selector="#tax_cart_display-head" timeout="30"/>
-         <element name="systemValueIncludeTaxTotalCart" type="checkbox" selector="#row_tax_cart_display_grandtotal input[type='checkbox']"/>
-         <element name="dropdownIncludeTaxTotalCart" type="checkbox" selector="#row_tax_cart_display_grandtotal select"/>
-@@ -51,5 +59,10 @@
-         <element name="systemValueDisplayZeroTaxSales" type="checkbox" selector="#row_tax_sales_display_zero_tax input[type='checkbox']"/>
-         <element name="dropdownDisplayZeroTaxSales" type="checkbox" selector="#row_tax_sales_display_zero_tax select"/>
-         <element name="fixedProductTaxes" type="block" selector="#tax_weee-head" timeout="30"/>
-+
-+        <element name="taxClassesCondition" type="block" selector="//a[@id='tax_classes-head' and @class='open']" timeout="30"/>
-+        <element name="useSystemValue" type="checkbox" selector="#tax_classes_default_product_tax_class_inherit"/>
-+        <element name="productTaxClass" type="select" selector="#tax_classes_default_product_tax_class"/>
-+        <element name="save" type="button" selector="#save"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminProductTaxClassSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminProductTaxClassSection.xml
-new file mode 100644
-index 00000000000..f32caf88f21
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminProductTaxClassSection.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminProductTaxClassSection">
-+        <element name="additionalSettings" type="text" selector="#details-summarybase_fieldset"/>
-+        <element name="additionalSettingsCond" type="text" selector="//summary[@id='details-summarybase_fieldset' and @aria-expanded='true']"/>
-+        <element name="productTaxClass" type="button" selector="//div[contains(@class, 'field-tax_product_class')]//span[text()='Add New Tax Class']"/>
-+        <element name="TaxClassName" type="block" selector="//div[contains(@class, 'field-tax_product_class')]//input[@class='mselect-input']"/>
-+        <element name="confirm" type="button" selector="//div[contains(@class, 'field-tax_product_class')]//span[@class='mselect-save']"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRateFormSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRateFormSection.xml
-new file mode 100644
-index 00000000000..b2efe5c47b0
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRateFormSection.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminTaxRateFormSection">
-+        <element name="taxIdentifier" type="input" selector="#code" />
-+        <element name="deleteRate" type="button" selector="#delete" timeout="30"/>
-+        <element name="ok" type="button" selector="button.action-primary.action-accept" timeout="30"/>
-+        <element name="save" type="button" selector="#save" timeout="30"/>
-+        <element name="country" type="select" selector="#tax_country_id"/>
-+        <element name="state" type="select" selector="#tax_region_id"/>
-+        <element name="rate" type="text" selector="#rate"/>
-+        <element name="zipRange" type="checkbox" selector="#zip_is_range"/>
-+        <element name="rangeFrom" type="text" selector="#zip_from"/>
-+        <element name="rangeTo" type="text" selector="#zip_to"/>
-+        <element name="zipCode" type="input" selector="#tax_postcode"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRateGridSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRateGridSection.xml
-new file mode 100644
-index 00000000000..ba9da182d73
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRateGridSection.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminTaxRateGridSection">
-+        <element name="grid" type="block" selector="#tax_rate_grid"/>
-+        <element name="add" type="button" selector="#add" timeout="30"/>
-+        <element name="search" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
-+        <element name="filterByTaxIdentifier" type="input" selector="#tax_rate_grid_filter_code"/>
-+        <element name="filterByCountry" type="input" selector="#tax_rate_grid_filter_tax_country_id"/>
-+        <element name="filterByPostCode" type="input" selector="#tax_rate_grid_filter_tax_postcode"/>
-+        <element name="nthRow" type="block" selector="tr[data-role='row']:nth-of-type({{var}})" parameterized="true" timeout="30"/>
-+        <element name="emptyText" type="text" selector=".empty-text"/>
-+    </section>
-+</sections>
-\ No newline at end of file
-diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxReportsSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxReportsSection.xml
-new file mode 100644
-index 00000000000..80101687e17
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxReportsSection.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+    <section name="AdminTaxReportsSection">
-+        <element name="refreshStatistics" type="button" selector="//a[contains(text(),'here')]"/>
-+        <element name="fromDate" type="input" selector="#sales_report_from"/>
-+        <element name="toDate" type="input" selector="//*[@id='sales_report_to']/following-sibling::button"/>
-+        <element name="goTodayButton" type="input" selector="//button[contains(text(),'Go Today')]"/>
-+        <element name="showReportButton" type="button" selector="#filter_form_submit"/>
-+        <element name="taxRuleAmount" type="textarea" selector="//*[contains(text(),'{{var1}}')]/following-sibling::td[contains(@class, 'col-tax-amount')]" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleFormSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleFormSection.xml
-new file mode 100644
-index 00000000000..c77d3ad0d94
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleFormSection.xml
-@@ -0,0 +1,29 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminTaxRuleFormSection">
-+        <element name="fieldTaxRate" type="block" selector="div.field-tax_rate"/>
-+        <element name="taxIdentifier" type="input" selector="input.admin__control-text admin__action-multiselect-search" timeout="30"/>
-+        <element name="code" type="input" selector="#code"/>
-+        <element name="taxRateSearch" type="input" selector="input[data-role='advanced-select-text']"/>
-+        <element name="taxRateSelected" type="input" selector="//span[contains(., '{{taxRateCode}}') and preceding-sibling::input[contains(@class, 'mselect-checked')]]" parameterized="true" />
-+        <element name="taxRateOption" type="multiselect" selector="//*[@data-ui-id='tax-rate-form-fieldset-element-form-field-tax-rate']//span[.='{{taxRateCode}}']" parameterized="true" />
-+        <element name="save" type="button" selector="#save" timeout="30"/>
-+        <element name="deleteRule" type="button" selector="#delete" timeout="30"/>
-+        <element name="ok" type="button" selector="button.action-primary.action-accept" timeout="30"/>
-+        <element name="additionalSettings" type="button" selector="#details-summarybase_fieldset" timeout="30"/>
-+        <element name="customerTaxClassOption" type="checkbox" selector="//*[@id='tax_customer_class']/..//span[.='{{taxCustomerClass}}']" parameterized="true"/>
-+        <element name="productTaxClassOption" type="checkbox" selector="//*[@id='tax_product_class']/..//span[.='{{taxProductClass}}']" parameterized="true"/>
-+        <element name="customerTaxClassSelected" type="checkbox" selector="//*[@id='tax_customer_class']/..//span[.='{{taxCustomerClass}}' and preceding-sibling::input[contains(@class, 'mselect-checked')]]" parameterized="true"/>
-+        <element name="productTaxClassSelected" type="checkbox" selector="//*[@id='tax_product_class']/..//span[.='{{taxProductClass}}' and preceding-sibling::input[contains(@class, 'mselect-checked')]]" parameterized="true"/>
-+        <element name="priority" type="text" selector="#priority"/>
-+        <element name="sortOrder" type="text" selector="#position"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleGridSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleGridSection.xml
-new file mode 100644
-index 00000000000..dfcaba83291
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleGridSection.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminTaxRuleGridSection">
-+        <element name="add" type="button" selector="#add" timeout="30"/>
-+        <element name="search" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
-+        <element name="code" type="input" selector="#taxRuleGrid_filter_code"/>
-+        <element name="taxRate" type="input" selector="#taxRuleGrid_filter_tax_rates_codes"/>
-+        <element name="nthRow" type="block" selector="tr[data-role='row']:nth-of-type({{var}})" parameterized="true" timeout="30"/>
-+        <element name="successMessage" type="text" selector="#messages"/>
-+        <element name="emptyText" type="text" selector="td.empty-text"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml
-index f7b72263c12..7f721d4079c 100644
---- a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml
-@@ -7,9 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminTaxRulesSection">
-         <!-- on page /admin/tax/rule/new/ -->
-+        <element name="customerAddNewTaxClass" type="button" selector="//*[@id='tax_customer_class']/following-sibling::section//*[contains(text(),'Add New Tax Class')]"/>
-+        <element name="fieldCustomerNewTaxClass" type="input" selector="//*[@id='tax_customer_class']/following-sibling::section//input[@class='mselect-input']"/>
-+        <element name="saveCustomerNewTaxClass" type="button" selector="//*[@id='tax_customer_class']/following-sibling::section//span[@class='mselect-save']"/>
-+        <element name="defaultCustomerTaxClass" type="button" selector="//*[@id='tax_customer_class']/following-sibling::section//div[@class='mselect-items-wrapper']/div[1]"/>
-         <element name="ruleName" type="input" selector="#anchor-content #code"/>
-         <element name="addNewTaxRate" type="block" selector="//*[text()='Add New Tax Rate']" timeout="30"/>
-         <element name="taxIdentifier" type="input" selector="aside #code"/>
-@@ -19,5 +23,17 @@
-         <element name="country" type="select" selector="#tax_country_id"/>
-         <element name="rate" type="input" selector="#rate"/>
-         <element name="save" type="button" selector=".action-save" timeout="30"/>
-+        <element name="saveRule" type="button" selector="#save" timeout="30"/>
-+        <element name="additionalSettings" type="button" selector="#details-summarybase_fieldset"/>
-+        <element name="productAddNewTaxClass" type="button" selector="//*[@id='tax_product_class']/following-sibling::section//*[contains(text(),'Add New Tax Class')]"/>
-+        <element name="fieldProdNewTaxClass" type="input" selector="//*[@id='tax_product_class']/following-sibling::section//input[@class='mselect-input']"/>
-+        <element name="saveProdNewTaxClass" type="button" selector="//*[@id='tax_product_class']/following-sibling::section//span[@class='mselect-save']"/>
-+        <element name="defaultTaxClass" type="button" selector="//*[@id='tax_product_class']/following-sibling::section//div[@class='mselect-items-wrapper']/div[1]"/>
-+        <element name="deleteTaxClassName" type="button" selector="//span[contains(text(),'{{var1}}')]" parameterized="true"/>
-+        <element name="deleteTaxClass" type="button" selector="//span[contains(text(),'{{var1}}')]/../..//*[@class='mselect-delete']" parameterized="true"/>
-+        <element name="popUpDialogOK" type="button" selector="//*[@class='modal-footer']//*[contains(text(),'OK')]"/>
-+        <element name="taxRateMultiSelectItems" type="block" selector=".mselect-list-item"/>
-+        <element name="taxRateNumber" type="button" selector="//div[@data-ui-id='tax-rate-form-fieldset-element-form-field-tax-rate']//div[@class='mselect-items-wrapper']//label[{{var}}]" parameterized="true"/>
-+        <element name="selectTaxRate" type="input" selector="//span[text()='{{taxCode}}']" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Tax/Test/Mftf/Section/CheckoutCartSummarySection.xml
-index b47e8b85e52..b89a77b8ad2 100644
---- a/app/code/Magento/Tax/Test/Mftf/Section/CheckoutCartSummarySection.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Section/CheckoutCartSummarySection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CheckoutCartSummarySection">
-         <element name="taxAmount" type="text" selector="[data-th='Tax']>span"/>
-         <element name="taxSummary" type="text" selector=".totals-tax-summary"/>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml
-new file mode 100644
-index 00000000000..e632f6265f4
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml
-@@ -0,0 +1,57 @@
-+<?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="AdminCreateDefaultsTaxRuleTest">
-+        <annotations>
-+            <stories value="Create tax rule"/>
-+            <title value="Create tax rule, defaults"/>
-+            <description value="Test log in to Create Tax Rule and Create Defaults Tax Rule"/>
-+            <testCaseId value="MC-5323"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule">
-+                <argument name="taxRuleCode" value="{{SimpleTaxRule.code}}" />
-+            </actionGroup>
-+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
-+        </after>
-+
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
-+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
-+        <!-- Create a tax rule with defaults -->
-+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
-+        <wait stepKey="waitForSearch" time="5" />
-+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$initialTaxRate.code$$)}}" stepKey="selectNeededItem"  />
-+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="saveTaxRule" />
-+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="assertTaxRuleSuccessMessage" />
-+
-+        <!-- Verify we see created tax rule with defaults(from the above step) on the tax rule grid page -->
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSearch" />
-+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+
-+        <!-- Verify we see created tax rule with defaults on the tax rule form page -->
-+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleField" />
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$initialTaxRate.code$$)}}" stepKey="seeTaxRateSelected"  />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
-new file mode 100644
-index 00000000000..b63ca195315
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
-@@ -0,0 +1,77 @@
-+<?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="AdminCreateTaxRateAllPostCodesTest">
-+        <annotations>
-+            <stories value="Create tax rate"/>
-+            <title value="Create tax rate, all postcodes"/>
-+            <description value="Tests log into Create tax rate and create all postcodes"/>
-+            <testCaseId value="MC-5318"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
-+            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
-+            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
-+            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-+            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
-+            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
-+        <!-- Create a tax rate with * for postcodes -->
-+        <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
-+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillRuleName"/>
-+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="*" stepKey="fillPostCode"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="Australia" stepKey="selectCountry1"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="20" stepKey="fillRate"/>
-+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
-+
-+        <!-- Verify the tax rate grid page shows the tax rate we just created -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
-+        <selectOption selector="{{AdminTaxRateGridSection.filterByCountry}}" userInput="Australia" stepKey="fillCountryFilter"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByPostCode}}" userInput="*" stepKey="fillPostCodeFilter"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
-+        <see selector="{{AdminTaxRateGridSection.grid}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeRuleName"/>
-+        <see selector="{{AdminTaxRateGridSection.grid}}" userInput="Australia" stepKey="seeCountry"/>
-+        <see selector="{{AdminTaxRateGridSection.grid}}" userInput="*" stepKey="seePostCode"/>
-+
-+        <!-- Go to the tax rate edit page for our new tax rate -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex3"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex3"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter2"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-+
-+        <!-- Verify we see expected values on the tax rate edit page -->
-+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeRuleName2"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="*" stepKey="seeZipCode"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="Australia" stepKey="seeCountry2"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="20" stepKey="seeRate"/>
-+
-+        <!-- Go to the tax rule grid page and verify our tax rate can be used in the rule -->
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex"/>
-+        <click selector="{{AdminGridMainControls.add}}" stepKey="clickAddNewTaxRule"/>
-+        <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
-new file mode 100644
-index 00000000000..cb79de19ce2
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
-@@ -0,0 +1,68 @@
-+<?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="AdminCreateTaxRateLargeRateTest">
-+        <annotations>
-+            <stories value="Create tax rate"/>
-+            <title value="Create tax rate, large rate"/>
-+            <description value="Test log in to Create Tax Rate and Create Large Rate"/>
-+            <testCaseId value="MC-5322"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
-+            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
-+            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
-+            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-+            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
-+            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
-+        <!-- Create a tax rate for large postcodes -->
-+        <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
-+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillRuleName"/>
-+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="*" stepKey="fillPostCode"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="France" stepKey="selectCountry1"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="Val-d'Oise" stepKey="selectState" />
-+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="999" stepKey="fillRate"/>
-+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
-+
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex3"/>
-+        <!-- Create a tax rate for large postcodes and verify we see expected values on the tax rate grid page -->
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField2"/>
-+        <selectOption selector="{{AdminTaxRateGridSection.filterByCountry}}" userInput="France" stepKey="selectCountry2" />
-+        <fillField selector="{{AdminTaxRateGridSection.filterByPostCode}}" userInput="*" stepKey="seeTaxPostCode1"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow3"/>
-+        <!-- Verify we see expected values on the tax rate form page -->
-+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxIdentifierField2"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="*" stepKey="seeZipCode"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="France" stepKey="seeCountry2"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="Val-d'Oise" stepKey="seeState"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="999" stepKey="seeRate"/>
-+
-+        <!-- Verify we see expected values on the tax rule form page -->
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex4"/>
-+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
-+        <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
-new file mode 100644
-index 00000000000..696d6c4c877
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
-@@ -0,0 +1,66 @@
-+<?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="AdminCreateTaxRateSpecificPostcodeTest">
-+        <annotations>
-+            <stories value="Create tax rate"/>
-+            <title value="Create tax rate, specific postcode"/>
-+            <description value="Test log in to Create Tax Rate and Create specific Postcode"/>
-+            <testCaseId value="MC-5320"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
-+            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
-+            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
-+            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-+            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
-+            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-+        <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
-+        <!-- Create a tax rate with specific postcode -->
-+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField1"/>
-+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="180" stepKey="fillTaxPostCode"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="Canada" stepKey="selectCountry" />
-+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="*" stepKey="selectState" />
-+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput='25' stepKey="seeRate"/>
-+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
-+
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
-+        <!-- Verify the tax rate grid page shows the specific postcode we just created -->
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField2"/>
-+        <selectOption selector="{{AdminTaxRateGridSection.filterByCountry}}" userInput="Canada" stepKey="fillCountryFilter"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByPostCode}}" userInput="180" stepKey="fillPostCodeFilter"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+        <!-- Verify we see expected values on the tax rate form page -->
-+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxIdentifierField2"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="180" stepKey="seePostCode"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.country}}" userInput="Canada" stepKey="seeCountry2"/>
-+
-+        <!-- Verify we see expected values on the tax rule form page -->
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex4"/>
-+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
-+        <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
-new file mode 100644
-index 00000000000..c6c5e318cc7
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
-@@ -0,0 +1,69 @@
-+<?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="AdminCreateTaxRateWiderZipCodeRangeTest">
-+        <annotations>
-+            <stories value="Create tax rate"/>
-+            <title value="Create tax rate, wider zip code range"/>
-+            <description value="Test log in to Create Tax Rate and Create Wider Zip Code Range"/>
-+            <testCaseId value="MC-5321"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
-+            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
-+            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
-+            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-+            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
-+            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
-+        <!-- Create a tax rate with range from 1-7800935 for zipCodes -->
-+        <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
-+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillRuleName"/>
-+        <checkOption selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="checkZipRange" />
-+        <fillField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="1" stepKey="fillZipFrom"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="7800935" stepKey="fillZipTo"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="United Kingdom" stepKey="selectCountry1"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="7.75" stepKey="seeRate"/>
-+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
-+
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex3"/>
-+        <!-- Create a tax rate for zipCodeRange and verify we see expected values on the tax rate grid page -->
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField2"/>
-+        <selectOption selector="{{AdminTaxRateGridSection.filterByCountry}}" userInput="United Kingdom" stepKey="selectCountry2" />
-+        <fillField selector="{{AdminTaxRateGridSection.filterByPostCode}}" userInput="1-7800935" stepKey="seeTaxPostCode1"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+        <!-- Verify we see expected values on the tax rate form page -->
-+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxIdentifierField2"/>
-+        <seeCheckboxIsChecked selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="clickZipRange"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="1" stepKey="seeTaxPostCode2"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="7800935" stepKey="seeTaxPostCode3"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="United Kingdom" stepKey="seeCountry2"/>
-+
-+        <!-- Verify we see expected values on the tax rule form page -->
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex4"/>
-+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
-+        <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
-new file mode 100644
-index 00000000000..f75fa716e9d
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
-@@ -0,0 +1,71 @@
-+<?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="AdminCreateTaxRateZipCodeRangeTest">
-+        <annotations>
-+            <stories value="Create tax rate"/>
-+            <title value="Create tax rate, zip code range"/>
-+            <description value="Test log in to Create Tax Rate and Create Zip Code Range"/>
-+            <testCaseId value="MC-5319"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
-+            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
-+            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
-+            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
-+            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
-+        <!-- Create a tax rate with range from 90001-96162 for zipCodes -->
-+        <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
-+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillRuleName"/>
-+        <checkOption selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="checkZipRange" />
-+        <fillField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="90001" stepKey="fillZipFrom"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="96162" stepKey="fillZipTo"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="United States" stepKey="selectCountry1"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="California" stepKey="selectState" />
-+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput='15.5' stepKey="seeRate"/>
-+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
-+
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex3"/>
-+        <!-- Create a tax rate for zipCodeRange and verify we see expected values on the tax rate grid page -->
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField2"/>
-+        <selectOption selector="{{AdminTaxRateGridSection.filterByCountry}}" userInput="United States" stepKey="selectCountry2" />
-+        <fillField selector="{{AdminTaxRateGridSection.filterByPostCode}}" userInput="90001-96162" stepKey="seeTaxPostCode1"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow3"/>
-+        <!-- Verify we see expected values on the tax rate form page -->
-+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxIdentifierField2"/>
-+        <seeCheckboxIsChecked selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="clickZipRange"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="90001" stepKey="seeTaxPostCode2"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="96162" stepKey="seeTaxPostCode3"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="California" stepKey="seeState"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="United States" stepKey="seeCountry2"/>
-+
-+        <!-- Verify we see expected values on the tax rule form page -->
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex4"/>
-+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
-+        <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml
-new file mode 100644
-index 00000000000..03b12c8f280
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml
-@@ -0,0 +1,93 @@
-+<?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="AdminCreateTaxRuleWithCustomerAndProductTaxClassTest">
-+        <annotations>
-+            <stories value="Create tax rule"/>
-+            <title value="Create tax rule, with customer and product tax class"/>
-+            <description value="Test log in to Tax Rule and Create tax rule with customer and product tax class"/>
-+            <testCaseId value="MC-5324"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
-+            <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
-+            <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
-+            <getData entity="customerTaxClass" stepKey="customerTaxClass">
-+                <requiredEntity createDataKey="createCustomerTaxClass"/>
-+            </getData>
-+            <getData entity="productTaxClass" stepKey="productTaxClass">
-+                <requiredEntity createDataKey="createProductTaxClass"/>
-+            </getData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule">
-+                <argument name="taxRuleCode" value="{{SimpleTaxRule.code}}" />
-+            </actionGroup>
-+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate"/>
-+            <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
-+            <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
-+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
-+
-+        <!-- Create a tax rule with customer and product class -->
-+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
-+        <wait stepKey="waitForSearch" time="5" />
-+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$initialTaxRate.code$$)}}" stepKey="clickSelectNeededItem"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_CA_Rate_1.code}}" stepKey="fillTaxRateSearch1"/>
-+        <wait stepKey="waitForSearch2" time="5" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.taxRateOption(US_CA_Rate_1.code)}}" dependentSelector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" visible="false" stepKey="clickSelectNeededItem1"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_NY_Rate_1.code}}" stepKey="fillTaxRateSearch2"/>
-+        <wait stepKey="waitForSearch3" time="5" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.taxRateOption(US_NY_Rate_1.code)}}" dependentSelector="{{AdminTaxRuleFormSection.taxRateSelected(US_NY_Rate_1.code)}}" visible="false" stepKey="clickSelectNeededItem2"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
-+        <wait stepKey="waitForAdditionalSettings" time="5" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
-+        <click selector="{{AdminTaxRuleFormSection.customerTaxClassOption($$customerTaxClass.class_name$$)}}" stepKey="clickSelectCustomerTaxClass"/>
-+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.priority}}" userInput="{{taxRuleWithCustomPriorityPosition.priority}}" stepKey="fillPriority"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.sortOrder}}" userInput="{{taxRuleWithCustomPriorityPosition.position}}" stepKey="fillSortOrder"/>
-+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
-+
-+        <!-- Verify we see created tax rule with customer and product class(from the above step) on the tax rule grid page -->
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
-+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+
-+        <!-- Verify we see created tax rule with customer and product class on the tax rule form page -->
-+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$initialTaxRate.code$$)}}" stepKey="seeTaxRateSelected"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" stepKey="seeSelectNeededItem1"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected(US_NY_Rate_1.code)}}" stepKey="seeSelectNeededItem2"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected($$customerTaxClass.class_name$$)}}" stepKey="seeCustomerTaxClass"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" stepKey="seeRetailCustomerTaxClass" />
-+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected($$productTaxClass.class_name$$)}}" stepKey="seeProductTaxClass"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" stepKey="seeTaxableGoodsTaxClass" />
-+        <seeInField selector="{{AdminTaxRuleFormSection.priority}}" userInput="{{taxRuleWithCustomPriorityPosition.priority}}" stepKey="seePriority"/>
-+        <seeInField selector="{{AdminTaxRuleFormSection.sortOrder}}" userInput="{{taxRuleWithCustomPriorityPosition.position}}" stepKey="seeSortOrder"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml
-new file mode 100644
-index 00000000000..abff31803a1
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml
-@@ -0,0 +1,87 @@
-+<?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="AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest">
-+        <annotations>
-+            <stories value="Create tax rule"/>
-+            <title value="Test log in to Create Tax Rule and Create Tax Rule with New and Existing Tax Rate, Customer Tax Class, Product Tax Class"/>
-+            <description value="Test log in to Create tax rule and Create tax rule with New and Existing Tax Rate, Customer Tax Class, Product Tax Class"/>
-+            <testCaseId value="MC-5327"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="taxRate_US_NY_8_1" stepKey="TaxRateWithCustomRate"/>
-+            <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
-+            <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
-+            <getData entity="customerTaxClass" stepKey="customerTaxClass">
-+                <requiredEntity createDataKey="createCustomerTaxClass"/>
-+            </getData>
-+            <getData entity="productTaxClass" stepKey="productTaxClass">
-+                <requiredEntity createDataKey="createProductTaxClass"/>
-+            </getData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule">
-+                <argument name="taxRuleCode" value="{{SimpleTaxRule.code}}" />
-+            </actionGroup>
-+            <deleteData stepKey="deleteTaxRate" createDataKey="TaxRateWithCustomRate"/>
-+            <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
-+            <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
-+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
-+
-+        <!-- Create a tax rule with new and existing tax rate, customer tax class, product tax class -->
-+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$TaxRateWithCustomRate.code$$" stepKey="fillTaxRateSearch"/>
-+        <wait stepKey="waitForSearch" time="5" />
-+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$TaxRateWithCustomRate.code$$)}}" stepKey="clickSelectNeededItem"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_CA_Rate_1.code}}" stepKey="fillTaxRateSearch1"/>
-+        <wait stepKey="waitForSearch2" time="5" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.taxRateOption(US_CA_Rate_1.code)}}" dependentSelector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" visible="false" stepKey="clickSelectNeededItem1"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
-+        <click selector="{{AdminTaxRuleFormSection.customerTaxClassOption($$customerTaxClass.class_name$$)}}" stepKey="clickSelectCustomerTaxClass"/>
-+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
-+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
-+
-+        <!-- Verify we see created tax rule with new and existing tax rate, customer tax class, product tax class(from the above step) on the tax rule grid page -->
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
-+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+
-+        <!-- Verify we see created tax rule with new and existing tax rate, customer tax class, product tax class on the tax rule form page -->
-+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$TaxRateWithCustomRate.code$$" stepKey="fillTaxRateSearch3"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$TaxRateWithCustomRate.code$$)}}" stepKey="seeTaxRateSelected"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_CA_Rate_1.code}}" stepKey="fillTaxRateSearch4"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" stepKey="seeSelectNeededItem1"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected($$customerTaxClass.class_name$$)}}" stepKey="seeCustomerTaxClass"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" stepKey="seeRetailCustomerTaxClass" />
-+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected($$productTaxClass.class_name$$)}}" stepKey="seeProductTaxClass"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" stepKey="seeTaxableGoodsTaxClass" />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml
-new file mode 100644
-index 00000000000..6e9b81743dd
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml
-@@ -0,0 +1,90 @@
-+<?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="AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest">
-+        <annotations>
-+            <stories value="Create tax rule"/>
-+            <title value="Creating tax rule with new tax classes and tax rate"/>
-+            <description value="Test log in to Create Tax Rule and Create tax rule with New Tax Classes and Tax Rate"/>
-+            <testCaseId value="MC-5325"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
-+            <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
-+            <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
-+            <getData entity="customerTaxClass" stepKey="customerTaxClass">
-+                <requiredEntity createDataKey="createCustomerTaxClass"/>
-+            </getData>
-+            <getData entity="productTaxClass" stepKey="productTaxClass">
-+                <requiredEntity createDataKey="createProductTaxClass"/>
-+            </getData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule">
-+                <argument name="taxRuleCode" value="{{SimpleTaxRule.code}}" />
-+            </actionGroup>
-+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate"/>
-+            <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
-+            <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
-+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
-+
-+        <!-- Create a tax rule with new tax classes and tax rate -->
-+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
-+        <wait stepKey="waitForSearch" time="5" />
-+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$initialTaxRate.code$$)}}" stepKey="clickSelectNeededItem"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_CA_Rate_1.code}}" stepKey="fillTaxRateSearch1"/>
-+        <wait stepKey="waitForSearch2" time="5" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.taxRateOption(US_CA_Rate_1.code)}}" dependentSelector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" visible="false" stepKey="clickSelectNeededItem1"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_NY_Rate_1.code}}" stepKey="fillTaxRateSearch2"/>
-+        <wait stepKey="waitForSearch3" time="5" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.taxRateOption(US_NY_Rate_1.code)}}" dependentSelector="{{AdminTaxRuleFormSection.taxRateSelected(US_NY_Rate_1.code)}}" visible="false" stepKey="clickSelectNeededItem2"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
-+        <click selector="{{AdminTaxRuleFormSection.customerTaxClassOption($$customerTaxClass.class_name$$)}}" stepKey="clickSelectCustomerTaxClass"/>
-+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.sortOrder}}" userInput="{{taxRuleWithCustomPosition.position}}" stepKey="fillSortOrder"/>
-+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
-+
-+        <!-- Verify we see created tax rule with new tax classes and tax rate(from the above step) on the tax rule grid page -->
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
-+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+
-+        <!-- Verify we see created tax rule with new tax classes and tax rate on the tax rule form page -->
-+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$initialTaxRate.code$$)}}" stepKey="seeTaxRateSelected"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" stepKey="seeSelectNeededItem1"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected(US_NY_Rate_1.code)}}" stepKey="seeSelectNeededItem2"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected($$customerTaxClass.class_name$$)}}" stepKey="seeCustomerTaxClass"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" stepKey="seeRetailCustomerTaxClass" />
-+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" stepKey="seeTaxableGoodsTaxClass" />
-+        <seeInField selector="{{AdminTaxRuleFormSection.sortOrder}}" userInput="{{taxRuleWithCustomPosition.position}}" stepKey="seeSortOrder"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml
-new file mode 100644
-index 00000000000..6a9bf30811f
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml
-@@ -0,0 +1,88 @@
-+<?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="AdminCreateTaxRuleWithZipRangeTest">
-+        <annotations>
-+            <stories value="Create tax rule"/>
-+            <title value="Create tax rule, with zip range"/>
-+            <description value="Test log in to Create Tax Rule and Create tax rule with Zip Range"/>
-+            <testCaseId value="MC-5326"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="defaultTaxRateWithZipRange" stepKey="taxRateWithZipRange"/>
-+            <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
-+            <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
-+            <getData entity="customerTaxClass" stepKey="customerTaxClass">
-+                <requiredEntity createDataKey="createCustomerTaxClass"/>
-+            </getData>
-+            <getData entity="productTaxClass" stepKey="productTaxClass">
-+                <requiredEntity createDataKey="createProductTaxClass"/>
-+            </getData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule">
-+                <argument name="taxRuleCode" value="{{SimpleTaxRule.code}}" />
-+            </actionGroup>
-+            <deleteData stepKey="deleteTaxRate" createDataKey="taxRateWithZipRange"/>
-+            <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
-+            <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
-+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
-+
-+        <!-- Create a tax rule with new tax classes and tax rate -->
-+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$taxRateWithZipRange.code$$" stepKey="fillTaxRateSearch"/>
-+        <wait stepKey="waitForSearch" time="5" />
-+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$taxRateWithZipRange.code$$)}}" stepKey="clickSelectNeededItem"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_CA_Rate_1.code}}" stepKey="fillTaxRateSearch1"/>
-+        <wait stepKey="waitForSearch2" time="5" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.taxRateOption(US_CA_Rate_1.code)}}" dependentSelector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" visible="false" stepKey="clickSelectNeededItem1"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
-+        <wait stepKey="waitForAdditionalSettings" time="5" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
-+        <click selector="{{AdminTaxRuleFormSection.customerTaxClassOption($$customerTaxClass.class_name$$)}}" stepKey="clickSelectCustomerTaxClass"/>
-+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.priority}}" userInput="{{taxRuleWithCustomPriority.priority}}" stepKey="fillPriority"/>
-+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
-+
-+        <!-- Verify we see created tax rule with zip range(from the above step) on the tax rule grid page -->
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
-+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+
-+        <!-- Verify we see created tax rule with zip range on the tax rule form page -->
-+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$taxRateWithZipRange.code$$)}}" stepKey="seeTaxRateSelected"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" stepKey="seeSelectNeededItem1"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected($$customerTaxClass.class_name$$)}}" stepKey="seeCustomerTaxClass"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" stepKey="seeRetailCustomerTaxClass" />
-+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected($$productTaxClass.class_name$$)}}" stepKey="seeProductTaxClass"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" stepKey="seeTaxableGoodsTaxClass" />
-+        <seeInField selector="{{AdminTaxRuleFormSection.priority}}" userInput="{{taxRuleWithCustomPriority.priority}}" stepKey="seePriority"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml
-new file mode 100644
-index 00000000000..e446c80669c
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml
-@@ -0,0 +1,81 @@
-+<?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="AdminDeleteTaxRuleTest">
-+        <annotations>
-+            <stories value="Delete tax rule"/>
-+            <title value="Delete tax rule"/>
-+            <description value="Test log in to tax rule and Delete tax rule"/>
-+            <testCaseId value="MC-5823"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="defaultTaxRule" stepKey="initialTaxRule"/>
-+            <createData entity="ApiSimplePrice100Qty100v2" stepKey="simpleProduct"/>
-+            <createData entity="Simple_US_Utah_Customer" stepKey="customer" />
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteSimpleProduct" createDataKey="simpleProduct" />
-+            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
-+        </after>
-+
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch1"/>
-+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+
-+        <!-- Delete values on the tax rule form page -->
-+        <click selector="{{AdminTaxRuleFormSection.deleteRule}}" stepKey="clickDeleteRule"/>
-+        <click selector="{{AdminTaxRuleFormSection.ok}}" stepKey="clickOk"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleDeleted" />
-+
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminMessagesSection.success}}" userInput="The tax rule has been deleted." stepKey="seeAssertTaxRuleDeleteMessage"/>
-+
-+        <!-- Confirm Deleted Tax Rule(from the above step) on the tax rule grid page -->
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex2"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch2"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
-+        <see selector="{{AdminTaxRuleGridSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeAssertTaxRuleNotFound"/>
-+
-+        <!-- Verify customer don't tax on the store front product page -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$customer$$" />
-+        </actionGroup>
-+        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPageOnStorefront"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
-+            <argument name="product" value="$$simpleProduct$$" />
-+            <argument name="productCount" value="1" />
-+        </actionGroup>
-+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openShoppingCart" />
-+        <actionGroup ref="FillShippingZipForm" stepKey="fillShippingZipForm">
-+            <argument name="address" value="US_Address_Utah" />
-+        </actionGroup>
-+        <scrollTo selector="{{StorefrontProductPageSection.orderTotal}}" x="0" y="-80" stepKey="scrollToOrderTotal"/>
-+        <waitForElementVisible selector="{{StorefrontProductPageSection.subTotal}}" time="30" stepKey="waitSubtotalAppears"/>
-+        <see selector="{{StorefrontProductPageSection.subTotal}}" userInput="$100.00" stepKey="seeSubTotal"/>
-+        <waitForElementVisible selector="{{StorefrontProductPageSection.shipping}}" time="30" stepKey="waitShippingAppears"/>
-+        <see selector="{{StorefrontProductPageSection.shipping}}" userInput="$5.00" stepKey="seeShipping"/>
-+        <dontSee selector="{{StorefrontProductPageSection.tax}}" stepKey="dontSeeAssertTaxAmount" />
-+        <see selector="{{StorefrontProductPageSection.orderTotal}}" userInput="$105.00" stepKey="seeAssertOrderTotal"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxRulesNavigateMenuTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxRulesNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..1277d6e5f9f
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxRulesNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminStoresTaxRulesNavigateMenuTest">
-+        <annotations>
-+            <features value="Tax"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin stores tax rules navigate menu test"/>
-+            <description value="Admin should be able to navigate to Stores > Tax Rules"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14175"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresTaxRulesPage">
-+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuStoresTaxesTaxRules.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuStoresTaxesTaxRules.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxZonesAndRatesNavigateMenuTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxZonesAndRatesNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..e0a4d5d9a40
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxZonesAndRatesNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminStoresTaxZonesAndRatesNavigateMenuTest">
-+        <annotations>
-+            <features value="Tax"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin stores tax  zones and rates navigate menu test"/>
-+            <description value="Admin should be able to navigate to Stores > Tax Zones and Rates"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14176"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresTaxZonesAndRatesPage">
-+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuStoresTaxZonesAndRates.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuStoresTaxZonesAndRates.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminSystemImportExportTaxRatesNavigateMenuTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminSystemImportExportTaxRatesNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..a84ae61d663
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminSystemImportExportTaxRatesNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSystemImportExportTaxRatesNavigateMenuTest">
-+        <annotations>
-+            <features value="Tax"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin system import export tax rates navigate menu test"/>
-+            <description value="Admin should be able to navigate to System > Import/Export Tax Rates"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14177"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemImportExportTaxRatesPage">
-+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSystemDataTransferImportAndExportTaxRates.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSystemDataTransferImportAndExportTaxRates.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxCalcWithApplyTaxOnSettingTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxCalcWithApplyTaxOnSettingTest.xml
-new file mode 100644
-index 00000000000..d249af983f7
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxCalcWithApplyTaxOnSettingTest.xml
-@@ -0,0 +1,80 @@
-+<?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="AdminTaxCalcWithApplyTaxOnSettingTest">
-+        <annotations>
-+            <features value="Tax"/>
-+            <stories value="Tax calculation"/>
-+            <title value="Tax calculation process following 'Apply Tax On' setting"/>
-+            <description value="Tax calculation process following 'Apply Tax On' setting"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-11026"/>
-+            <useCaseId value="MC-4316"/>
-+            <group value="Tax"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="taxRateForPensylvannia" stepKey="initialTaxRate"/>
-+            <createData entity="defaultTaxRule" stepKey="createTaxRule"/>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiSimpleProductWithCustomPrice" stepKey="createProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="SetTaxClassForShipping" stepKey="setTaxClass"/>
-+            <actionGroup ref="SetTaxApplyOnSetting" stepKey="setApplyTaxOnSetting">
-+                <argument name="userInput" value="Original price only"/>
-+            </actionGroup>
-+            <amOnPage url="{{AdminEditTaxRulePage.url($$createTaxRule.id$$)}}" stepKey="navigateToEditTaxRulePage"/>
-+            <waitForPageLoad stepKey="waitEditTaxRulePageToLoad"/>
-+            <click selector="{{AdminTaxRulesSection.taxRateNumber('1')}}" stepKey="clickonTaxRate"/>
-+            <click selector="{{AdminTaxRulesSection.deleteTaxClassName($$initialTaxRate.code$$)}}" stepKey="checkTaxRate"/>
-+            <click selector="{{AdminTaxRulesSection.saveRule}}" stepKey="saveChanges"/>
-+            <waitForPageLoad stepKey="waitTaxRulesToBeSaved"/>
-+            <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rule." stepKey="seeSuccessMessage2"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
-+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
-+            <actionGroup ref="DisableTaxApplyOnOriginalPrice" stepKey="setApplyTaxOffSetting">
-+                <argument name="userInput" value="Custom price if available"/>
-+            </actionGroup>
-+            <actionGroup ref="ResetTaxClassForShipping" stepKey="resetTaxClassForShipping"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <actionGroup ref="navigateToNewOrderPageNewCustomerSingleStore" stepKey="gotoNewOrderCreationPage"/>
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder">
-+            <argument name="product" value="$$createProduct$$"></argument>
-+        </actionGroup>
-+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillEmailField"/>
-+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress">
-+            <argument name="customer" value="Simple_US_Customer"/>
-+            <argument name="address" value="US_Address_CA"/>
-+        </actionGroup>
-+        <scrollTo selector="{{AdminOrderFormAccountSection.email}}" stepKey="scrollToEmailField"/>
-+        <waitForElementVisible selector="{{AdminOrderFormAccountSection.email}}" stepKey="waitEmailFieldToBeVisible"/>
-+        <click selector="{{AdminOrderFormShippingAddressSection.SameAsBilling}}" stepKey="uncheckSameAsBillingAddressCheckbox"/>
-+        <waitForPageLoad stepKey="waitSectionToReload"/>
-+        <selectOption selector="{{AdminOrderFormShippingAddressSection.State}}" stepKey="switchOnVisibleInAdvancedSearch" userInput="Pennsylvania"/>
-+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="getShippingMethods"/>
-+        <waitForPageLoad stepKey="waitForApplyingShippingMethods"/>
-+        <grabTextFrom selector="{{AdminOrderFormTotalSection.subtotalRow('3')}}" stepKey="grabTaxCost"/>
-+        <assertEquals expected='$6.00' expectedType="string" actual="($grabTaxCost)" stepKey="assertTax"/>
-+        <scrollTo selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="scrollToSubmitButton"/>
-+        <waitForElementVisible selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="waitElementToBeVisble"/>
-+        <click selector="{{AdminOrderFormItemsSection.customPriceCheckbox}}" stepKey="clickOnCustomPriceCheckbox"/>
-+        <fillField selector="{{AdminOrderFormItemsSection.customPriceField}}" userInput="{{SimpleProductNameWithDoubleQuote.price}}" stepKey="changePrice"/>
-+        <click selector="{{AdminOrderFormItemsSection.updateItemsAndQuantities}}" stepKey="updateItemsAndQunatities"/>
-+        <assertEquals expected='$6.00' expectedType="string" actual="($grabTaxCost)" stepKey="assertTaxAfterCustomPrice"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml
-new file mode 100644
-index 00000000000..628d189823a
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml
-@@ -0,0 +1,225 @@
-+<?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="AdminTaxReportGridTest">
-+        <annotations>
-+            <features value="Tax"/>
-+            <stories value="MAGETWO-91521: Reports / Sales / Tax report show incorrect amount"/>
-+            <title value="Checking Tax Report grid"/>
-+            <description value="Tax Report Grid displays Tax amount in rows 'Total' and 'Subtotal' is a sum of all tax amounts"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94338"/>
-+            <group value="Tax"/>
-+            <skip>
-+                <issueId value="MAGETWO-96193"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!-- Go to tax rule page -->
-+            <actionGroup ref="addNewTaxRuleActionGroup" stepKey="addFirstTaxRuleActionGroup"/>
-+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="TaxRule1"/>
-+
-+            <!-- Add NY and CA tax rules -->
-+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
-+                <argument name="taxCode" value="SimpleTaxWithZipCode"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="addProductTaxClass" stepKey="addProductTaxClass">
-+                <argument name="prodTaxClassName" value="TaxClasses1"/>
-+            </actionGroup>
-+
-+            <click stepKey="disableDefaultProdTaxClass" selector="{{AdminTaxRulesSection.defaultTaxClass}}"/>
-+            <waitForPageLoad stepKey="waitForTaxRulePage"/>
-+            <click stepKey="clickSave" selector="{{AdminTaxRulesSection.saveRule}}"/>
-+            <waitForPageLoad stepKey="waitForNewTaxRuleCreated"/>
-+
-+            <!-- Go to tax rule page to create second Tax Rule-->
-+            <actionGroup ref="addNewTaxRuleActionGroup" stepKey="addSecondTaxRuleActionGroup"/>
-+            <fillField stepKey="fillSecondRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="TaxRule2"/>
-+
-+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
-+                <argument name="taxCode" value="SimpleSecondTaxWithZipCode"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="addProductTaxClass" stepKey="addSecondProductTaxClass">
-+                <argument name="prodTaxClassName" value="TaxClasses2"/>
-+            </actionGroup>
-+
-+            <click stepKey="disableSecondProdTaxClass" selector="{{AdminTaxRulesSection.defaultTaxClass}}"/>
-+            <waitForPageLoad stepKey="waitForTaxRulePage2"/>
-+            <click stepKey="clickSaveBtn" selector="{{AdminTaxRulesSection.saveRule}}"/>
-+            <waitForPageLoad stepKey="waitForSecondTaxRuleCreated"/>
-+
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="firstProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+
-+            <createData entity="_defaultProduct" stepKey="secondProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+
-+        <!--Open Created products. In Tax Class select new created Product Tax classes.-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
-+        <waitForPageLoad stepKey="wait1"/>
-+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGrid"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
-+            <argument name="product" value="$$firstProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openFirstProductForEdit"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" stepKey="selectTexClassForFirstProduct" userInput="TaxClasses1"/>
-+        <!-- Save the second product -->
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveFirstProduct"/>
-+        <waitForPageLoad stepKey="waitForFirstProductSaved"/>
-+
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="againGoToProductIndex"/>
-+        <waitForPageLoad stepKey="wait2"/>
-+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetSecondProductGrid"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterSecondProductGridBySku">
-+            <argument name="product" value="$$secondProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openSecondProductForEdit"/>
-+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" stepKey="selectTexClassForSecondProduct" userInput="TaxClasses2"/>
-+        <!-- Save the second product -->
-+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveSecondProduct"/>
-+        <waitForPageLoad stepKey="waitForSecondProductSaved"/>
-+
-+        <!--Create an order with these 2 products in that zip code.-->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
-+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
-+        <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
-+        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
-+        <waitForPageLoad stepKey="waitForPage" time="60"/>
-+        <!--Check if order can be submitted without the required fields including email address-->
-+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="seeNewOrderPageTitle"/>
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addFirstProductToOrder" after="scrollToTopOfOrderFormPage">
-+            <argument name="product" value="$$firstProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSecondProductToOrder" after="addFirstProductToOrder">
-+            <argument name="product" value="$$secondProduct$$"/>
-+        </actionGroup>
-+
-+        <!--Fill customer group and customer email-->
-+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup" after="addSecondProductToOrder"/>
-+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail" after="selectCustomerGroup"/>
-+
-+        <!--Fill customer address information-->
-+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="fillCustomerEmail">
-+            <argument name="customer" value="Simple_US_Customer"/>
-+            <argument name="address" value="US_Address_TX"/>
-+        </actionGroup>
-+
-+        <!-- Select shipping -->
-+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping" after="fillCustomerAddress"/>
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="SelectCheckMoneyPaymentMethod" after="selectFlatRateShipping" stepKey="selectCheckMoneyPayment"/>
-+        <!--Submit Order and verify information-->
-+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" after="selectCheckMoneyPayment" stepKey="clickSubmitOrder"/>
-+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage" after="clickSubmitOrder"/>
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage" after="seeViewOrderPage"/>
-+
-+        <!--Create Invoice and Shipment for this Order.-->
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
-+        <waitForPageLoad stepKey="waitForInvoicePageOpened"/>
-+
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+
-+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
-+        <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl" after="clickShipAction"/>
-+        <!--Submit Shipment-->
-+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment" after="seeOrderShipmentUrl"/>
-+        <waitForPageLoad stepKey="waitForShipmentSaved"/>
-+
-+        <!--Go to "Reports" -> "Sales" -> "Tax"-->
-+        <amOnPage url="/admin/reports/report_sales/tax/" stepKey="navigateToReportsTaxPage"/>
-+        <waitForPageLoad stepKey="waitForReportsTaxPageLoad"/>
-+
-+        <!--click "here" to refresh last day's statistics -->
-+        <click stepKey="clickRefrashStatisticsHere" selector="{{AdminTaxReportsSection.refreshStatistics}}"/>
-+        <waitForPageLoad stepKey="waitForRefresh"/>
-+
-+        <!--Select Dates-->
-+        <fillField selector="{{AdminTaxReportsSection.fromDate}}" userInput="05/16/2018" stepKey="fillDateFrom"/>
-+        <click selector="{{AdminTaxReportsSection.toDate}}" stepKey="clickDateTo"/>
-+        <click selector="{{AdminTaxReportsSection.goTodayButton}}" stepKey="clickGoTodayDate"/>
-+        <!--Click "Show report" in the upper right corner.-->
-+        <click selector="{{AdminTaxReportsSection.showReportButton}}" stepKey="clickShowReportButton"/>
-+        <waitForPageLoad time="60" stepKey="waitForReload"/>
-+        <!--Tax Report Grid displays Tax amount in rows. "Total" and "Subtotal" is a sum of all tax amounts-->
-+        <grabTextFrom selector="{{AdminTaxReportsSection.taxRuleAmount('Texas-0.125')}}" stepKey="amountOfFirstTaxRate"/>
-+        <grabTextFrom selector="{{AdminTaxReportsSection.taxRuleAmount('Texas-7.25')}}" stepKey="amountOfSecondTaxRate"/>
-+        <grabTextFrom selector="{{AdminTaxReportsSection.taxRuleAmount('Subtotal')}}" stepKey="amountOfSubtotalTaxRate"/>
-+        <assertEquals stepKey="assertSubtotalFirstField">
-+            <expectedResult type="string">$0.15</expectedResult>
-+            <actualResult type="variable">amountOfFirstTaxRate</actualResult>
-+        </assertEquals>
-+
-+        <assertEquals stepKey="assertSubtotalSecondField">
-+            <expectedResult type="string">$8.92</expectedResult>
-+            <actualResult type="variable">amountOfSecondTaxRate</actualResult>
-+        </assertEquals>
-+
-+        <assertEquals stepKey="assertSubtotalField">
-+            <expectedResult type="string">$9.07</expectedResult>
-+            <actualResult type="variable">amountOfSubtotalTaxRate</actualResult>
-+        </assertEquals>
-+
-+        <after>
-+            <!-- Go to the tax rule page and delete the row we created-->
-+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-+            <waitForPageLoad stepKey="waitForRulesPage"/>
-+
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
-+                <argument name="name" value="TaxRule1"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteSecondRule">
-+                <argument name="name" value="TaxRule2"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <!-- Go to the tax rate page -->
-+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-+            <waitForPageLoad stepKey="waitForRatesPage"/>
-+
-+            <!-- Delete the two tax rates that were created -->
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
-+                <argument name="name" value="{{SimpleTaxWithZipCode.state}}-{{SimpleTaxWithZipCode.rate}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
-+                <argument name="name" value="{{SimpleSecondTaxWithZipCode.state}}-{{SimpleSecondTaxWithZipCode.rate}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-+            </actionGroup>
-+
-+            <deleteData createDataKey="firstProduct" stepKey="deleteFirstProduct"/>
-+            <deleteData createDataKey="secondProduct" stepKey="deleteSecondProduct"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+            <actionGroup ref="deleteProductTaxClass" stepKey="deleteFirstProductTaxClass">
-+                <argument name="taxClassName" value="TaxClasses1"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="deleteProductTaxClass" stepKey="deleteSecondProductTaxClass">
-+                <argument name="taxClassName" value="TaxClasses2"/>
-+            </actionGroup>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-+         </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateDefaultTaxRuleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateDefaultTaxRuleTest.xml
-new file mode 100644
-index 00000000000..03905425440
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateDefaultTaxRuleTest.xml
-@@ -0,0 +1,84 @@
-+<?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="AdminUpdateDefaultTaxRuleTest">
-+        <annotations>
-+            <stories value="Update tax rule"/>
-+            <title value="Update tax rule, tax rule default"/>
-+            <description value="Test log in to Update tax rule and Update default tax rule"/>
-+            <testCaseId value="MC-5819"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+            <before>
-+                <createData entity="defaultTaxRule" stepKey="initialTaxRule"/>
-+                <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
-+                <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
-+                <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
-+                <getData entity="customerTaxClass" stepKey="customerTaxClass">
-+                    <requiredEntity createDataKey="createCustomerTaxClass"/>
-+                </getData>
-+                <getData entity="productTaxClass" stepKey="productTaxClass">
-+                    <requiredEntity createDataKey="createProductTaxClass"/>
-+                </getData>
-+                <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            </before>
-+            <after>
-+                <deleteData stepKey="deleteTaxRule" createDataKey="initialTaxRule" />
-+                <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
-+                <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
-+                <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
-+            </after>
-+
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch1"/>
-+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+
-+        <!-- Update tax rule with default -->
-+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
-+        <wait stepKey="waitForSearch" time="5" />
-+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$initialTaxRate.code$$)}}" stepKey="clickSelectNeededItem"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
-+        <wait stepKey="waitForAdditionalSettings" time="5" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
-+        <click selector="{{AdminTaxRuleFormSection.customerTaxClassOption($$customerTaxClass.class_name$$)}}" stepKey="clickSelectCustomerTaxClass"/>
-+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.priority}}" userInput="{{taxRuleWithUpdatePriorityPosition.priority}}" stepKey="fillPriority"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.sortOrder}}" userInput="{{taxRuleWithUpdatePriorityPosition.position}}" stepKey="fillPosition"/>
-+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
-+
-+        <!-- Verify we see updated tax rule with default(from the above step) on the tax rule grid page -->
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
-+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+
-+        <!-- Verify we see updated tax rule with default on the tax rule form page -->
-+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$initialTaxRate.code$$)}}" stepKey="seeTaxRateSelected"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected($$customerTaxClass.class_name$$)}}" stepKey="seeCustomerTaxClass"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected($$productTaxClass.class_name$$)}}" stepKey="seeProductTaxClass"/>
-+        <seeInField selector="{{AdminTaxRuleFormSection.priority}}" userInput="{{taxRuleWithUpdatePriorityPosition.priority}}" stepKey="seePriority"/>
-+        <seeInField selector="{{AdminTaxRuleFormSection.sortOrder}}" userInput="{{taxRuleWithUpdatePriorityPosition.position}}" stepKey="seePosition"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithCustomClassesTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithCustomClassesTest.xml
-new file mode 100644
-index 00000000000..0e87f268f88
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithCustomClassesTest.xml
-@@ -0,0 +1,81 @@
-+<?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="AdminUpdateTaxRuleWithCustomClassesTest">
-+        <annotations>
-+            <stories value="Update tax rule"/>
-+            <title value="Update tax rule, tax rule with custom classes"/>
-+            <description value="Test log in to Update tax rule and Update tax rule with custom classes"/>
-+            <testCaseId value="MC-5820"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="defaultTaxRule" stepKey="initialTaxRule"/>
-+            <createData entity="defaultTaxRateWithZipRange" stepKey="taxRateWithZipRange"/>
-+            <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
-+            <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
-+            <getData entity="customerTaxClass" stepKey="customerTaxClass">
-+                <requiredEntity createDataKey="createCustomerTaxClass"/>
-+            </getData>
-+            <getData entity="productTaxClass" stepKey="productTaxClass">
-+                <requiredEntity createDataKey="createProductTaxClass"/>
-+            </getData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteTaxRule" createDataKey="initialTaxRule" />
-+            <deleteData stepKey="deleteTaxRate" createDataKey="taxRateWithZipRange" />
-+            <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
-+            <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
-+        </after>
-+
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch1"/>
-+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+
-+        <!-- Update tax rule with custom classes -->
-+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$taxRateWithZipRange.code$$" stepKey="fillTaxRateSearch"/>
-+        <wait stepKey="waitForSearch" time="5" />
-+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$taxRateWithZipRange.code$$)}}" stepKey="clickSelectNeededItem"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
-+        <wait stepKey="waitForAdditionalSettings" time="5" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
-+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
-+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
-+
-+        <!-- Verify we see updated tax rule with default(from the above step) on the tax rule grid page -->
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
-+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+
-+        <!-- Verify we see updated tax rule with default on the tax rule form page -->
-+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$taxRateWithZipRange.code$$)}}" stepKey="seeTaxRateSelected"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected($$productTaxClass.class_name$$)}}" stepKey="seeProductTaxClass"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" stepKey="seeRetailCustomerTaxClass" />
-+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" stepKey="seeTaxableGoodsTaxClass" />
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml
-new file mode 100644
-index 00000000000..9c63a362c7e
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml
-@@ -0,0 +1,108 @@
-+<?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="AdminUpdateTaxRuleWithFixedZipUtahTest">
-+        <annotations>
-+            <stories value="Update tax rule"/>
-+            <title value="Update tax rule, fixed zip Utah"/>
-+            <description value="Test log in to Update tax rule and Update tax rule with fixed zip Utah"/>
-+            <testCaseId value="MC-5821"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="defaultTaxRule" stepKey="initialTaxRule"/>
-+            <createData entity="TaxRateWithFixedZipUtah" stepKey="taxRateWithFixedZipUtah"/>
-+            <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
-+            <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
-+            <getData entity="customerTaxClass" stepKey="customerTaxClass">
-+                <requiredEntity createDataKey="createCustomerTaxClass"/>
-+            </getData>
-+            <getData entity="productTaxClass" stepKey="productTaxClass">
-+                <requiredEntity createDataKey="createProductTaxClass"/>
-+            </getData>
-+            <createData entity="ApiSimplePrice100Qty100v2" stepKey="simpleProduct"/>
-+            <createData entity="Simple_US_Utah_Customer" stepKey="customer" />
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteTaxRule" createDataKey="initialTaxRule" />
-+            <deleteData stepKey="deleteTaxRate" createDataKey="taxRateWithFixedZipUtah" />
-+            <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
-+            <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
-+            <deleteData stepKey="deleteSimpleProduct" createDataKey="simpleProduct" />
-+            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
-+        </after>
-+
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch1"/>
-+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+
-+        <!-- Update tax rule with fixed zip Utah -->
-+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$taxRateWithFixedZipUtah.code$$" stepKey="fillTaxRateSearch"/>
-+        <wait stepKey="waitForSearch" time="5" />
-+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$taxRateWithFixedZipUtah.code$$)}}" stepKey="clickSelectNeededItem"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
-+        <wait stepKey="waitForAdditionalSettings" time="5" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
-+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
-+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
-+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
-+        <!-- Verify we see success message -->
-+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
-+
-+        <!-- Verify we see updated tax rule with fixed zip Utah(from the above step) on the tax rule grid page -->
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
-+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
-+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+
-+        <!-- Verify we see updated tax rule with fixed zip Utah on the tax rule form page -->
-+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$taxRateWithFixedZipUtah.code$$)}}" stepKey="seeTaxRateSelected"/>
-+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
-+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
-+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected($$productTaxClass.class_name$$)}}" stepKey="seeProductTaxClass"/>
-+
-+        <!-- Verify if tax rule is applied on the store front product page -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-+            <argument name="Customer" value="$$customer$$" />
-+        </actionGroup>
-+        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.custom_attributes[url_key]$$)}}" stepKey="goProductPageOnStorefront"/>
-+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
-+            <argument name="product" value="$$simpleProduct$$" />
-+            <argument name="productCount" value="1" />
-+        </actionGroup>
-+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openShoppingCart" />
-+        <actionGroup ref="FillShippingZipForm" stepKey="fillShippingZipForm">
-+            <argument name="address" value="US_Address_Utah" />
-+        </actionGroup>
-+        <scrollTo selector="{{StorefrontProductPageSection.orderTotal}}" x="0" y="-80" stepKey="scrollToOrderTotal"/>
-+        <waitForElementVisible selector="{{StorefrontProductPageSection.shipping}}" time="30" stepKey="waitForShipping"/>
-+        <see selector="{{StorefrontProductPageSection.shipping}}" userInput="$5.00" stepKey="seeShipping"/>
-+        <waitForElementVisible selector="{{StorefrontProductPageSection.tax}}" time="30" stepKey="waitForTax"/>
-+        <see selector="{{StorefrontProductPageSection.tax}}" userInput="$20.00" stepKey="seeAssertTaxAmount" />
-+        <waitForElementVisible selector="{{StorefrontProductPageSection.orderTotal}}" time="30" stepKey="waitForOrderTotal"/>
-+        <see selector="{{StorefrontProductPageSection.orderTotal}}" userInput="$125.00" stepKey="seeAssertGrandTotal"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/CheckCreditMemoTotalsTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/CheckCreditMemoTotalsTest.xml
-new file mode 100644
-index 00000000000..38cc687ff53
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/CheckCreditMemoTotalsTest.xml
-@@ -0,0 +1,148 @@
-+<?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="CheckCreditMemoTotalsTest">
-+        <annotations>
-+            <features value="Tax"/>
-+            <stories value="MAGETWO-91769 - Credit Memo - Wrong tax calculation! #10982"/>
-+            <title value="Checking Credit memo Totals"/>
-+            <description value="Checking Credit memo Totals"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-95175"/>
-+            <group value="creditMemo"/>
-+            <group value="tax"/>
-+            <skip>
-+                <issueId value="MC-17140"/>
-+            </skip>
-+        </annotations>
-+        <before>
-+            <!--Create category and product-->
-+            <createData entity="_defaultCategory" stepKey="createCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <!--Create customer-->
-+            <createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/>
-+            <!--Login as admin-->
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+            <!--Create tax rule and tax rate-->
-+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
-+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
-+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
-+            <actionGroup ref="addCustomTaxRate" stepKey="addCustomTaxRate">
-+                <argument name="taxCode" value="SimpleTaxNY"/>
-+            </actionGroup>
-+            <click stepKey="expandAdditionalSettings" selector="{{AdminProductTaxClassSection.additionalSettings}}"/>
-+            <waitForPageLoad stepKey="waitForPageLoad"/>
-+            <click selector="{{AdminProductTaxClassSection.productTaxClass}}" stepKey="ClickToAddTaxClass"/>
-+            <fillField selector="{{AdminProductTaxClassSection.TaxClassName}}" userInput="NewTaxClass" stepKey="setName"/>
-+            <click selector="{{AdminProductTaxClassSection.confirm}}" stepKey="ClickToDone"/>
-+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
-+            <waitForPageLoad stepKey="waitForTaxRatePage1"/>
-+            <see userInput="You saved the tax rule." stepKey="VerifyRuleSaved"/>
-+            <!--Search and edit product to add new created tax rule-->
-+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
-+                <argument name="product" value="$$createSimpleProduct$$"/>
-+            </actionGroup>
-+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="OpenEditProductOnBackend">
-+                <argument name="product" value="$$createSimpleProduct$$"/>
-+            </actionGroup>
-+            <waitForPageLoad stepKey="waitForPageLoad2"/>
-+            <selectOption selector="{{AdminProductFormActionSection.selectTaxClass}}" userInput="NewTaxClass" stepKey="SetNewTaxClass" />
-+            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
-+            <!--Set configs-->
-+            <amOnPage url="{{AdminTaxConfigurationPage.url}}" stepKey="goToTaxConfigPage"/>
-+            <conditionalClick stepKey="clickOrdersInvoicesCreditSales" selector="{{AdminConfigureTaxSection.taxClasses}}" dependentSelector="{{AdminConfigureTaxSection.taxClassesCondition}}" visible="false"/>
-+            <click selector="{{AdminConfigureTaxSection.useSystemValue}}" stepKey="UncheckUseSystemValue"/>
-+            <selectOption selector="{{AdminConfigureTaxSection.productTaxClass}}" userInput="NewTaxClass" stepKey="selectClass"/>
-+            <click selector="{{AdminConfigureTaxSection.save}}" stepKey="saveConfig"/>
-+            <!--flash cache-->
-+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-+        </before>
-+        <after>
-+            <!--Delete category and product-->
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <!--Delete customer-->
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <!-- Reset admin order filter -->
-+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
-+            <!--Roll Back configuration-->
-+            <amOnPage url="{{AdminTaxConfigurationPage.url}}" stepKey="goToTaxConfigPage"/>
-+            <conditionalClick stepKey="clickOrdersInvoicesCreditSales" selector="{{AdminConfigureTaxSection.taxClasses}}" dependentSelector="{{AdminConfigureTaxSection.taxClassesCondition}}" visible="false"/>
-+            <selectOption selector="{{AdminConfigureTaxSection.productTaxClass}}" userInput="Taxable Goods" stepKey="selectClass"/>
-+            <click selector="{{AdminConfigureTaxSection.save}}" stepKey="saveConfig"/>
-+            <!-- Go to the tax rule page and delete the row we created-->
-+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-+            <waitForPageLoad stepKey="waitForRulesPage"/>
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
-+                <argument name="name" value="SampleRule"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-+            </actionGroup>
-+            <!-- Go to the tax rate page -->
-+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-+            <waitForPageLoad stepKey="waitForRatesPage"/>
-+            <!-- Delete tax rate that were created -->
-+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
-+                <argument name="name" value="{{SimpleTaxNY.state}}"/>
-+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-+            </actionGroup>
-+            <actionGroup ref="deleteProductTaxClass" stepKey="deleteFirstProductTaxClass">
-+                <argument name="taxClassName" value="NewTaxClass"/>
-+            </actionGroup>
-+            <!--logout-->
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!--Create new order-->
-+        <actionGroup stepKey="CreateNewOrder" ref="navigateToNewOrderPageExistingCustomer">
-+            <argument name="customer" value="Simple_US_Customer_NY"/>
-+        </actionGroup>
-+        <!--Add product to order-->
-+        <click stepKey="clickToAddProduct" selector="{{AdminOrderFormItemsSection.addProducts}}"/>
-+        <waitForPageLoad stepKey="waitForProductsOpened"/>
-+        <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectProduct"/>
-+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
-+        <waitForPageLoad stepKey="waitForPageLoad3"/>
-+        <!--Set shipping method-->
-+        <actionGroup stepKey="orderSelectFlatRateShipping" ref="orderSelectFlatRateShipping"/>
-+        <!--Submit order-->
-+        <click stepKey="SubmitOrder" selector="{{AdminOrderFormActionSection.SubmitOrder}}"/>
-+        <waitForPageLoad stepKey="waitForPageLoad4"/>
-+        <grabTextFrom stepKey="getOrderId" selector="|Order # (\d+)|"/>
-+        <!--Open new created order-->
-+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-+        <waitForPageLoad stepKey="waitForPageLoad5"/>
-+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
-+            <argument name="orderId" value="$getOrderId"/>
-+        </actionGroup>
-+        <!--Create order invoice-->
-+        <click selector="{{AdminDataGridTableSection.rowViewAction('1')}}" stepKey="clickCreatedOrderInGrid"/>
-+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage"/>
-+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
-+        <see selector="{{AdminInvoiceOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderProcessing"/>
-+        <!--Create Credit Memo-->
-+        <click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreditMemoAction"/>
-+        <fillField selector="{{AdminCreditMemoTotalSection.refundShipping}}" userInput="0" stepKey="setRefundShipping"/>
-+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoInPageTitle"/>
-+        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
-+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the credit memo." stepKey="seeCreditMemoSuccess"/>
-+        <click selector="{{AdminCreditMemoTotalSection.creditMemoItem}}" stepKey="goToCreatedCreditMemo"/>
-+        <waitForPageLoad stepKey="waitForPageLoad6"/>
-+        <!--View created memo and verify tax for product-->
-+        <click selector="{{AdminCreditMemoTotalSection.viewMemo}}" stepKey="ViewMemo"/>
-+        <waitForPageLoad stepKey="waitForPageLoad7"/>
-+        <grabTextFrom selector="{{AdminCreditMemoTotalSection.grandTotal}}" stepKey="getGrandTotal"/>
-+        <assertEquals expected='$123.00' expectedType="string" actual="($getGrandTotal)" stepKey="assertGrandTotalValue"/>
-+
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
-new file mode 100644
-index 00000000000..5f855f5bb75
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
-@@ -0,0 +1,55 @@
-+<?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="DeleteTaxRateEntityTest">
-+        <annotations>
-+            <stories value="Delete Tax Rate"/>
-+            <title value="Delete tax rate"/>
-+            <description value="Test log in to Tax Rate and Delete Tax Rate"/>
-+            <testCaseId value="MC-5801"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+
-+        <!-- Search the tax rate on tax grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+
-+        <!-- Delete values on the tax rate form page -->
-+        <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
-+        <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You Deleted the tax rate." stepKey="seeSuccess1"/>
-+
-+        <!-- Confirm Deleted TaxIdentifier(from the above step) on the tax rate grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{defaultTaxRate.code}}" stepKey="fillTaxIdentifierField3"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
-+        <see selector="{{AdminTaxRateGridSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeSuccess"/>
-+
-+        <!-- Confirm Deleted TaxIdentifier on the tax rule grid page -->
-+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex3"/>
-+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
-+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
-+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
-+        <wait stepKey="waitForSearch" time="5" />
-+        <dontSee selector="{{AdminTaxRuleFormSection.fieldTaxRate}}" userInput="$$initialTaxRate.code$$" stepKey="dontSeeInTaxRuleForm"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
-index fdd6d18dae9..aa44593400a 100644
---- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
-@@ -7,10 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest">
-         <annotations>
--            <features value="Tax information in shopping cart for Customer with default addresses (physical quote)"/>
-+            <features value="Tax"/>
-+            <stories value="Shopping cart taxes"/>
-             <title value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (physical quote)"/>
-             <description value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (physical quote)"/>
-             <severity value="CRITICAL"/>
-@@ -62,6 +63,7 @@
-             <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
-         </before>
-         <after>
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-             <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
-             <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
-             <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
-@@ -87,9 +89,13 @@
-         <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-         <!--  Step 4: Open Estimate Shipping and Tax section -->
-         <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
--        <see selector="{{CheckoutCartSummarySection.country}}" userInput="$$createCustomer.country_id$$" stepKey="checkCustomerCountry" />
--        <see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="$$createCustomer.state$$" stepKey="checkCustomerRegion" />
--        <see selector="{{CheckoutCartSummarySection.postcode}}" userInput="$$createCustomer.postcode$$" stepKey="checkCustomerPostcode" />
-+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCustomerCountry" />
-+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkCustomerRegion" />
-+        <grabValueFrom  selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
-+        <assertEquals  message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
-+            <expectedResult type="string">{{US_Address_CA.postcode}}</expectedResult>
-+            <actualResult type="variable">grabTextPostCode</actualResult>
-+        </assertEquals>
-         <see selector="{{CheckoutCartSummarySection.amountFPT}}" userInput="$10" stepKey="checkFPTAmountCA" />
-         <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.83" stepKey="checkTaxAmountCA" />
-         <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
-index c27af9a6f63..ac090fd4fe9 100644
---- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
-@@ -7,10 +7,11 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest">
-         <annotations>
--            <features value="Tax information in shopping cart for Customer with default addresses (virtual quote)"/>
-+            <features value="Tax"/>
-+            <stories value="Shopping cart taxes"/>
-             <title value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (virtual quote)"/>
-             <description value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (virtual quote)"/>
-             <severity value="CRITICAL"/>
-@@ -37,6 +38,7 @@
-             <createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/>
-         </before>
-         <after>
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-             <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
-             <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
-             <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
-@@ -59,9 +61,13 @@
-         <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-         <!--  Step 4: Open Estimate Shipping and Tax section -->
-         <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
--        <see selector="{{CheckoutCartSummarySection.country}}" userInput="$$createCustomer.country_id$$" stepKey="checkCustomerCountry" />
--        <see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="$$createCustomer.state$$" stepKey="checkCustomerRegion" />
--        <see selector="{{CheckoutCartSummarySection.postcode}}" userInput="$$createCustomer.postcode$$" stepKey="checkCustomerPostcode" />
-+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_NY.country}}" stepKey="checkCustomerCountry" />
-+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_NY.state}}" stepKey="checkCustomerRegion" />
-+        <grabValueFrom  selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
-+        <assertEquals  message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
-+            <expectedResult type="string">{{US_Address_NY.postcode}}</expectedResult>
-+            <actualResult type="variable">grabTextPostCode</actualResult>
-+        </assertEquals>
-         <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
-         <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="expandTaxSummary"/>
-         <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-NY-*-Rate 1 (8.375%)" stepKey="checkRateNY" />
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml
-index 891e8f4e796..bce9d895e31 100644
---- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml
-@@ -7,16 +7,15 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest">
-         <annotations>
--            <features value="Tax information in shopping cart for Guest (physical quote)"/>
-+            <features value="Tax"/>
-+            <stories value="Shopping cart taxes"/>
-             <title value="Tax information are updating/recalculating on fly in shopping cart for Guest (physical quote)"/>
-             <description value="Tax information are updating/recalculating on fly in shopping cart for Guest (physical quote)"/>
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-41930"/>
--            <!--Skip because of issue MAGETWO-90966 on 4 step-->
--            <group value="skip"/>
-             <group value="checkout"/>
-             <group value="tax"/>
-         </annotations>
-@@ -85,6 +84,8 @@
-         <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-         <!--  Step 4: Open Estimate Shipping and Tax section -->
-         <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
-+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUSCountry"/>
-+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="California" stepKey="selectCaliforniaRegion"/>
-         <see selector="{{CheckoutCartSummarySection.amountFPT}}" userInput="$10" stepKey="checkFPTAmountCA" />
-         <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.83" stepKey="checkTaxAmountCA" />
-         <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml
-index 9f33c1a8b15..74233bbff4a 100644
---- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml
-@@ -7,16 +7,15 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest">
-         <annotations>
--            <features value="Tax information in shopping cart for Guest (virtual quote)"/>
-+            <features value="Tax"/>
-+            <stories value="Shopping cart taxes"/>
-             <title value="Tax information are updating/recalculating on fly in shopping cart for Guest (virtual quote)"/>
-             <description value="Tax information are updating/recalculating on fly in shopping cart for Guest (virtual quote)"/>
-             <severity value="CRITICAL"/>
-             <testCaseId value="MAGETWO-41931"/>
--            <!--Skip because of issue MAGETWO-90966 on 4 step-->
--            <group value="skip"/>
-             <group value="checkout"/>
-             <group value="tax"/>
-          </annotations>
-@@ -57,6 +56,8 @@
-         <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
-         <!--  Step 4: Open Estimate Shipping and Tax section -->
-         <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
-+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUSCountry"/>
-+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="California" stepKey="selectCaliforniaRegion"/>
-         <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
-         <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$3.30" stepKey="checkTaxAmountCA" />
-         <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary"/>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
-index 362af79d8de..345777f0aa0 100644
---- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontTaxQuoteCartLoggedInSimple">
-         <annotations>
-             <features value="Tax"/>
-@@ -17,6 +17,9 @@
-             <severity value="CRITICAL"/>
-             <testCaseId value="MC-295"/>
-             <group value="Tax"/>
-+            <skip>
-+                <issueId value="MC-16684"/>
-+            </skip>
-         </annotations>
-         <before>
-             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-@@ -75,7 +78,7 @@
-                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-             </actionGroup>
- 
--            <!-- Ensure tax wont be shown in the cart -->
-+            <!-- Ensure tax won't be shown in the cart -->
-             <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
- 
-             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-@@ -92,8 +95,10 @@
-         <!-- Assert that taxes are applied correctly for NY -->
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
-         <waitForPageLoad stepKey="waitForCart"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
- 
-         <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-+        <waitForText userInput="$5.00" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" time="30" stepKey="waitForCorrectShippingAmount"/>
-         <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
-         <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
-         <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
-@@ -191,7 +196,7 @@
-                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-             </actionGroup>
- 
--            <!-- Ensure tax wont be shown in the cart -->
-+            <!-- Ensure tax won't be shown in the cart -->
-             <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
- 
-             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-@@ -208,6 +213,7 @@
-         <!-- Assert that taxes are applied correctly for NY -->
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
-         <waitForPageLoad stepKey="waitForCart"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
- 
-         <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-         <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.37"/>
-@@ -297,7 +303,7 @@
-                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-             </actionGroup>
- 
--            <!-- Ensure tax wont be shown in the cart -->
-+            <!-- Ensure tax won't be shown in the cart -->
-             <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
- 
-             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-@@ -314,8 +320,12 @@
-         <!-- Assert that taxes are applied correctly for CA -->
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
-         <waitForPageLoad stepKey="waitForCart"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
- 
-         <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
-+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUSCountry"/>
-+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="California" stepKey="selectCaliforniaRegion"/>
-         <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.15"/>
-         <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
-         <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
-@@ -403,7 +413,7 @@
-                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-             </actionGroup>
- 
--            <!-- Ensure tax wont be shown in the cart -->
-+            <!-- Ensure tax won't be shown in the cart -->
-             <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
- 
-             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-@@ -420,9 +430,13 @@
-         <!-- Assert that taxes are applied correctly for NY -->
-         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
-         <waitForPageLoad stepKey="waitForCart"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
- 
-         <!-- Assert that taxes are applied correctly for CA -->
-         <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
-+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUSCountry"/>
-+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="California" stepKey="selectCaliforniaRegion"/>
-         <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
-         <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
-         <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
-index 3e85ecc7832..e7bf08257ea 100644
---- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontTaxQuoteCheckoutGuestVirtual">
-         <annotations>
-             <features value="Tax"/>
-@@ -66,7 +66,7 @@
-                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-             </actionGroup>
- 
--            <!-- Ensure tax wont be shown in the cart -->
-+            <!-- Ensure tax won't be shown in the cart -->
-             <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
- 
-             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-@@ -92,9 +92,10 @@
-         <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
- 
-         <!-- Change the address -->
--        <actionGroup ref="GuestCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
-+        <actionGroup ref="GuestCheckoutSelectPaymentAndFillNewBillingAddressActionGroup" stepKey="changeAddress">
-             <argument name="customerVar" value="Simple_US_Customer_NY"/>
-             <argument name="customerAddressVar" value="US_Address_NY"/>
-+            <argument name="paymentMethod" value="Check / Money order"/>
-         </actionGroup>
-         <click stepKey="saveAddress" selector="{{CheckoutShippingSection.updateAddress}}"/>
- 
-@@ -178,7 +179,7 @@
-                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-             </actionGroup>
- 
--            <!-- Ensure tax wont be shown in the cart -->
-+            <!-- Ensure tax won't be shown in the cart -->
-             <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
- 
-             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-@@ -289,7 +290,7 @@
-                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-             </actionGroup>
- 
--            <!-- Ensure tax wont be shown in the cart -->
-+            <!-- Ensure tax won't be shown in the cart -->
-             <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
- 
-             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-@@ -312,6 +313,9 @@
-             <argument name="Address" value="US_Address_CA"/>
-         </actionGroup>
-         <click stepKey="clickNext" selector="{{CheckoutShippingSection.next}}"/>
-+        <waitForPageLoad stepKey="waitForAddressToLoad"/>
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
-         <see stepKey="seeAddress" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxCA.state}}"/>
-         <see stepKey="seeShipTo" selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{SimpleTaxCA.state}}"/>
- 
-@@ -329,6 +333,9 @@
-             <argument name="Address" value="US_Address_NY"/>
-         </actionGroup>
-         <click stepKey="clickNext2" selector="{{CheckoutShippingSection.next}}"/>
-+        <waitForPageLoad stepKey="waitForShippingToLoad"/>
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
-         <see stepKey="seeShipTo2" selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{SimpleTaxNY.state}}"/>
- 
-         <!-- Assert that taxes are applied correctly for NY -->
-@@ -407,7 +414,7 @@
-                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-             </actionGroup>
- 
--            <!-- Ensure tax wont be shown in the cart -->
-+            <!-- Ensure tax won't be shown in the cart -->
-             <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
- 
-             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-@@ -424,6 +431,8 @@
-         <!-- Assert that taxes are applied correctly for NY -->
-         <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
-         <waitForPageLoad stepKey="waitForShippingSection"/>
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
-         <see stepKey="seeAddress" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxNY.state}}"/>
- 
-         <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-@@ -445,6 +454,8 @@
-         <click stepKey="saveAddress" selector="{{CheckoutShippingSection.updateAddress}}"/>
- 
-         <waitForPageLoad stepKey="waitForAddressSaved"/>
-+        <!-- Checkout select Check/Money Order payment -->
-+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
-         <see stepKey="seeAddress2" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxCA.state}}"/>
- 
-         <!-- Assert that taxes are applied correctly for CA -->
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
-new file mode 100644
-index 00000000000..2ed31c2e204
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
-@@ -0,0 +1,61 @@
-+<?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="Update01TaxRateEntityTest">
-+        <annotations>
-+            <stories value="Update Tax Rate"/>
-+            <title value="Update tax rate, 0.1 rate"/>
-+            <description value="Test log in to Tax Rate and Update 0.1 Rate"/>
-+            <testCaseId value="MC-5333"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
-+        </after>
-+
-+        <!-- Search the tax rate on tax grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+
-+        <!-- Update 0.1 tax rate on the tax rate form page -->
-+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateFrance.code}}" stepKey="fillTaxIdentifierField2"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateFrance.tax_country_id}}" stepKey="selectCountry1"/>
-+        <wait time="10" stepKey="waitForRegionsLoaded" />
-+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateFrance.tax_region_id}}" stepKey="selectState"/>
-+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateFrance.tax_postcode}}" stepKey="fillPostCode"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateFrance.rate}}" stepKey="fillRate1"/>
-+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
-+
-+        <!-- Verify we see updated 0.1 tax rate(from the above step) on the tax rate grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex4"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCustomRateFrance.code}}" stepKey="fillTaxIdentifierField3"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+        <!-- Verify we see updated 0.1 tax rate on the tax rate form page -->
-+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateFrance.code}}" stepKey="seeRTaxIdentifier"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateFrance.tax_country}}" stepKey="seeCountry2"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateFrance.tax_region}}" stepKey="seeState2"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateFrance.tax_postcode}}" stepKey="seeZipCode"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateFrance.rate}}" stepKey="seeRate2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/Update100TaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/Update100TaxRateEntityTest.xml
-new file mode 100644
-index 00000000000..27a7f2c5172
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/Update100TaxRateEntityTest.xml
-@@ -0,0 +1,60 @@
-+<?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="Update100TaxRateEntityTest">
-+        <annotations>
-+            <stories value="Update Tax Rate"/>
-+            <title value="Update tax rate, 100 rate"/>
-+            <description value="Test log in to Tax Rate and Update 100 Rate"/>
-+            <testCaseId value="MC-5328"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
-+        </after>
-+
-+        <!-- Search the tax rate on tax grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+
-+        <!-- Update values on the tax rate form page -->
-+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateUS.code}}" stepKey="fillTaxIdentifierField2"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateUS.tax_country_id}}" stepKey="selectCountry1"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateUS.tax_region_id}}" stepKey="selectState"/>
-+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateUS.tax_postcode}}" stepKey="fillPostCode"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateUS.rate}}" stepKey="fillRate1"/>
-+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
-+
-+        <!-- Verify we see updated TaxIdentifier(from the above step) on the tax rate grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex4"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCustomRateUS.code}}" stepKey="fillTaxIdentifierField3"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+        <!-- Verify we see updated values on the tax rate form page -->
-+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateUS.code}}" stepKey="seeRTaxIdentifier"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateUS.tax_country}}" stepKey="seeCountry2"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateUS.tax_region}}" stepKey="seeState2"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateUS.tax_postcode}}" stepKey="seeZipCode"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateUS.rate}}" stepKey="seeRate2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/Update1299TaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/Update1299TaxRateEntityTest.xml
-new file mode 100644
-index 00000000000..aa46a5fdae0
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/Update1299TaxRateEntityTest.xml
-@@ -0,0 +1,62 @@
-+<?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="Update1299TaxRateEntityTest">
-+        <annotations>
-+            <stories value="Update Tax Rate"/>
-+            <title value="Update tax rate, 12.99 rate"/>
-+            <description value="Test log in to Tax Rate and Update 12.99 Rate"/>
-+            <testCaseId value="MC-5332"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
-+        </after>
-+
-+        <!-- Search the tax identifier on tax grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode1"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+
-+        <!-- Update 12.99 tax rate on the tax rate form page -->
-+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateUK.code}}" stepKey="fillTaxIdentifierField1"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateUK.tax_country_id}}" stepKey="selectCountry1"/>
-+        <checkOption selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="checkZipRange"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="{{taxRateCustomRateUK.zip_from}}" stepKey="fillZipFrom"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="{{taxRateCustomRateUK.zip_to}}"  stepKey="fillZipTo"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateUK.rate}}" stepKey="fillRate1"/>
-+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
-+
-+        <!-- Verify we see updated tax rate(from the above step) on the tax rate grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCustomRateUK.code}}" stepKey="fillTaxIdentifierField2"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+        <!-- Verify we see updated tax rate on the tax rate form page -->
-+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateUK.code}}" stepKey="seeRTaxIdentifier"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateUK.tax_country}}" stepKey="seeCountry2"/>
-+        <seeCheckboxIsChecked selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="seeZipRange"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="{{taxRateCustomRateUK.zip_from}}" stepKey="seeZipFrom"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="{{taxRateCustomRateUK.zip_to}}" stepKey="seeZipTo"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateUK.rate}}" stepKey="seeRate"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/UpdateAnyRegionTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/UpdateAnyRegionTaxRateEntityTest.xml
-new file mode 100644
-index 00000000000..d7b25da6c14
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/UpdateAnyRegionTaxRateEntityTest.xml
-@@ -0,0 +1,60 @@
-+<?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="UpdateAnyRegionTaxRateEntityTest">
-+        <annotations>
-+            <stories value="Update Tax Rate"/>
-+            <title value="Update tax rate, any region"/>
-+            <description value="Test log in to Tax Rate and Update Any Region"/>
-+            <testCaseId value="MC-5331"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
-+        </after>
-+
-+        <!-- Search the tax rate on tax grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+
-+        <!-- Update any region tax rate on the tax rate form page -->
-+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateCanada.code}}" stepKey="fillTaxIdentifierField2"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateCanada.tax_country_id}}" stepKey="selectCountry1"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateCanada.tax_region_id}}" stepKey="selectState"/>
-+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateCanada.tax_postcode}}" stepKey="fillPostCode"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateCanada.rate}}" stepKey="fillRate1"/>
-+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
-+
-+        <!-- Verify we see updated any region tax rate(from the above step) on the tax rate grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCustomRateCanada.code}}" stepKey="fillTaxIdentifierField3"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+        <!-- Verify we see updated any region tax rate on the tax rate form page -->
-+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateCanada.code}}" stepKey="seeRTaxIdentifier"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateCanada.tax_country}}" stepKey="seeCountry2"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateCanada.tax_region_id}}" stepKey="seeState2"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateCanada.tax_postcode}}" stepKey="seeZipCode"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateCanada.rate}}" stepKey="seeRate2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/UpdateDecimalTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/UpdateDecimalTaxRateEntityTest.xml
-new file mode 100644
-index 00000000000..30024521969
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/UpdateDecimalTaxRateEntityTest.xml
-@@ -0,0 +1,64 @@
-+<?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="UpdateDecimalTaxRateEntityTest">
-+        <annotations>
-+            <stories value="Update Tax Rate"/>
-+            <title value="Update tax rate, decimal rate"/>
-+            <description value="Test log in to Tax Rate and Update Decimal Tax Rate"/>
-+            <testCaseId value="MC-5329"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
-+        </after>
-+
-+        <!-- Search the tax rate on tax grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+
-+        <!-- Update decimal tax rate on the tax rate form page -->
-+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{defaultTaxRateWithZipRange.code}}" stepKey="fillTaxIdentifierField2"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{defaultTaxRateWithZipRange.tax_country_id}}" stepKey="selectCountry1"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="{{defaultTaxRateWithZipRange.tax_region_id}}" stepKey="selectState"/>
-+        <checkOption selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="checkZipRange"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="{{defaultTaxRateWithZipRange.zip_from}}" stepKey="fillZipFrom"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="{{defaultTaxRateWithZipRange.zip_to}}"  stepKey="fillZipTo"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{defaultTaxRateWithZipRange.rate}}" stepKey="fillRate1"/>
-+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
-+
-+        <!-- Verify we see updated tax rate(from the above step) on the tax rate grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{defaultTaxRateWithZipRange.code}}" stepKey="fillTaxIdentifierField3"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+        <!-- Verify we see updated tax rate on the tax rate form page -->
-+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{defaultTaxRateWithZipRange.code}}" stepKey="seeRTaxIdentifier"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{defaultTaxRateWithZipRange.tax_country}}" stepKey="seeCountry2"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="{{defaultTaxRateWithZipRange.tax_region}}" stepKey="seeState2"/>
-+        <seeCheckboxIsChecked selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="seeZipRange"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="{{defaultTaxRateWithZipRange.zip_from}}" stepKey="seeTaxPostCode2"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="{{defaultTaxRateWithZipRange.zip_to}}" stepKey="seeTaxPostCode3"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{defaultTaxRateWithZipRange.rate}}" stepKey="seeRate2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Mftf/Test/UpdateLargeTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/UpdateLargeTaxRateEntityTest.xml
-new file mode 100644
-index 00000000000..6c81a6aeb3f
---- /dev/null
-+++ b/app/code/Magento/Tax/Test/Mftf/Test/UpdateLargeTaxRateEntityTest.xml
-@@ -0,0 +1,58 @@
-+<?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="UpdateLargeTaxRateEntityTest">
-+        <annotations>
-+            <stories value="Update Tax Rate"/>
-+            <title value="Update tax rate, large rate"/>
-+            <description value="Test log in to Tax Rate and Update Large Rate"/>
-+            <testCaseId value="MC-5330"/>
-+            <severity value="CRITICAL"/>
-+            <group value="tax"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
-+        </after>
-+
-+        <!-- Search the tax rate on tax grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-+
-+        <!-- Update large tax rate on the tax rate form page -->
-+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{defaultTaxRateWithLargeRate.code}}" stepKey="fillTaxIdentifierField2"/>
-+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{defaultTaxRateWithLargeRate.tax_country_id}}" stepKey="selectCountry1"/>
-+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{defaultTaxRateWithLargeRate.tax_postcode}}" stepKey="fillPostCode"/>
-+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{defaultTaxRateWithLargeRate.rate}}" stepKey="fillRate1"/>
-+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
-+
-+        <!-- Verify we see updated large tax rate(from the above step) on the tax rate grid page -->
-+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex4"/>
-+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
-+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{defaultTaxRateWithLargeRate.code}}" stepKey="fillTaxIdentifierField3"/>
-+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
-+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
-+        <!-- Verify we see updated large tax rate on the tax rate form page -->
-+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{defaultTaxRateWithLargeRate.code}}" stepKey="seeRTaxIdentifier"/>
-+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{defaultTaxRateWithLargeRate.tax_country}}" stepKey="seeCountry2"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{defaultTaxRateWithLargeRate.tax_postcode}}" stepKey="seeZipCode"/>
-+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{defaultTaxRateWithLargeRate.rate}}" stepKey="seeRate2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php b/app/code/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php
-index 9a85ba0a908..020baa0c30e 100644
---- a/app/code/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php
-+++ b/app/code/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Tax\Test\Unit\App\Action;
- 
-+/**
-+ * Context plugin test
-+ */
- class ContextPluginTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -35,7 +38,7 @@ class ContextPluginTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Module manager
-      *
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     private $moduleManagerMock;
- 
-@@ -78,13 +81,15 @@ class ContextPluginTest extends \PHPUnit\Framework\TestCase
- 
-         $this->customerSessionMock = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
-             ->disableOriginalConstructor()
--            ->setMethods([
-+            ->setMethods(
-+                [
-                 'getDefaultTaxBillingAddress', 'getDefaultTaxShippingAddress', 'getCustomerTaxClassId',
-                 'getWebsiteId', 'isLoggedIn'
--            ])
-+                ]
-+            )
-             ->getMock();
- 
--        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
-+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
-index bf49f3d4791..77da6950fec 100644
---- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
-+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
-@@ -252,7 +252,7 @@ class RateRepositoryTest extends \PHPUnit\Framework\TestCase
-         foreach ($taxRateData as $key => $value) {
-             // convert key from snake case to upper case
-             $taxRateMock->expects($this->any())
--                ->method('get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key))))
-+                ->method('get' . str_replace('_', '', ucwords($key, '_')))
-                 ->will($this->returnValue($value));
-         }
- 
-diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
-index cbd7ed46e38..2a7eeb27ee0 100644
---- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
-+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
-@@ -9,6 +9,7 @@ namespace Magento\Tax\Test\Unit\Model\Calculation;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Tax\Model\Calculation\RowBaseCalculator;
- use Magento\Tax\Model\Calculation\TotalBaseCalculator;
-+use Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterface;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -66,6 +67,11 @@ class RowBaseAndTotalBaseCalculatorTestCase extends \PHPUnit\Framework\TestCase
-      */
-     protected $taxDetailsItem;
- 
-+    /**
-+     * @var \Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $quoteDetailsItemExtension;
-+
-     /**
-      * initialize all mocks
-      *
-@@ -101,7 +107,14 @@ class RowBaseAndTotalBaseCalculatorTestCase extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->mockItem = $this->getMockBuilder(\Magento\Tax\Api\Data\QuoteDetailsItemInterface::class)->getMock();
-+        $this->mockItem = $this->getMockBuilder(\Magento\Tax\Api\Data\QuoteDetailsItemInterface::class)
-+            ->disableOriginalConstructor()->setMethods(['getExtensionAttributes', 'getUnitPrice'])
-+            ->getMockForAbstractClass();
-+        $this->quoteDetailsItemExtension = $this->getMockBuilder(QuoteDetailsItemExtensionInterface::class)
-+            ->disableOriginalConstructor()->setMethods(['getPriceForTaxCalculation'])
-+            ->getMockForAbstractClass();
-+        $this->mockItem->expects($this->any())->method('getExtensionAttributes')
-+            ->willReturn($this->quoteDetailsItemExtension);
- 
-         $this->appliedTaxDataObjectFactory = $this->createPartialMock(
-             \Magento\Tax\Api\Data\AppliedTaxInterfaceFactory::class,
-diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
-index 9325ec10dc6..50d45ad662b 100644
---- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
-+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
-@@ -3,79 +3,106 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Tax\Test\Unit\Model\Sales\Total\Quote;
- 
--/**
-- * Test class for \Magento\Tax\Model\Sales\Total\Quote\Tax
-- */
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Tax\Helper\Data as TaxHelper;
-+use Magento\Tax\Api\Data\TaxDetailsItemInterface;
-+use Magento\Quote\Model\Quote\Item as QuoteItem;
-+use Magento\Store\Model\Store;
-+use Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector;
-+use Magento\Tax\Model\Config;
-+use Magento\Quote\Model\Quote\Address as QuoteAddress;
-+use Magento\Quote\Model\Quote;
-+use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
-+use Magento\Tax\Api\Data\TaxClassKeyInterface;
-+use Magento\Tax\Model\Sales\Quote\ItemDetails;
-+use Magento\Tax\Model\TaxClass\Key as TaxClassKey;
-+use Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory;
-+use Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory;
-+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
-+use Magento\Quote\Api\Data\ShippingInterface;
-+use Magento\Quote\Model\Quote\Address\Total as QuoteAddressTotal;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
- 
- /**
-+ * Common tax collector test
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class CommonTaxCollectorTest extends \PHPUnit\Framework\TestCase
-+class CommonTaxCollectorTest extends TestCase
- {
-     /**
--     * @var \Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector
-+     * @var CommonTaxCollector
-      */
-     private $commonTaxCollector;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Tax\Model\Config
-+     * @var MockObject|Config
-      */
-     private $taxConfig;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\Quote\Address
-+     * @var MockObject|QuoteAddress
-      */
-     private $address;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\Quote
-+     * @var MockObject|Quote
-      */
-     private $quote;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\Store
-+     * @var MockObject|Store
-      */
-     private $store;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|
-+     * @var MockObject
-      */
-     protected $taxClassKeyDataObjectFactoryMock;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|
-+     * @var MockObject
-      */
-     protected $quoteDetailsItemDataObjectFactoryMock;
- 
-     /**
--     * @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface
-+     * @var QuoteDetailsItemInterface
-      */
-     protected $quoteDetailsItemDataObject;
- 
-     /**
--     * @var \Magento\Tax\Api\Data\TaxClassKeyInterface
-+     * @var TaxClassKeyInterface
-      */
-     protected $taxClassKeyDataObject;
- 
-+    /**
-+     * @var TaxHelper
-+     */
-+    private $taxHelper;
-+
-+    /**
-+     * {@inheritdoc}
-+     */
-     protected function setUp()
-     {
-         $objectManager = new ObjectManager($this);
- 
--        $this->taxConfig = $this->getMockBuilder(\Magento\Tax\Model\Config::class)
-+        $this->taxConfig = $this->getMockBuilder(Config::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['getShippingTaxClass', 'shippingPriceIncludesTax'])
-+            ->setMethods(['getShippingTaxClass', 'shippingPriceIncludesTax', 'discountTax'])
-             ->getMock();
- 
--        $this->store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-+        $this->store = $this->getMockBuilder(Store::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['__wakeup'])
-             ->getMock();
- 
--        $this->quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
-+        $this->quote = $this->getMockBuilder(Quote::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['__wakeup', 'getStore'])
-             ->getMock();
-@@ -84,7 +111,7 @@ class CommonTaxCollectorTest extends \PHPUnit\Framework\TestCase
-             ->method('getStore')
-             ->will($this->returnValue($this->store));
- 
--        $this->address = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address::class)
-+        $this->address = $this->getMockBuilder(QuoteAddress::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-@@ -92,35 +119,41 @@ class CommonTaxCollectorTest extends \PHPUnit\Framework\TestCase
-             ->method('getQuote')
-             ->will($this->returnValue($this->quote));
-         $methods = ['create'];
--        $this->quoteDetailsItemDataObject = $objectManager->getObject(
--            \Magento\Tax\Model\Sales\Quote\ItemDetails::class
--        );
--        $this->taxClassKeyDataObject = $objectManager->getObject(\Magento\Tax\Model\TaxClass\Key::class);
-+        $this->quoteDetailsItemDataObject = $objectManager->getObject(ItemDetails::class);
-+        $this->taxClassKeyDataObject = $objectManager->getObject(TaxClassKey::class);
-         $this->quoteDetailsItemDataObjectFactoryMock
--            = $this->createPartialMock(\Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory::class, $methods);
-+            = $this->createPartialMock(QuoteDetailsItemInterfaceFactory::class, $methods);
-         $this->quoteDetailsItemDataObjectFactoryMock->expects($this->any())
-             ->method('create')
-             ->willReturn($this->quoteDetailsItemDataObject);
-         $this->taxClassKeyDataObjectFactoryMock =
--            $this->createPartialMock(\Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory::class, $methods);
-+            $this->createPartialMock(TaxClassKeyInterfaceFactory::class, $methods);
-         $this->taxClassKeyDataObjectFactoryMock->expects($this->any())
-             ->method('create')
-             ->willReturn($this->taxClassKeyDataObject);
-+        $this->taxHelper = $this->getMockBuilder(TaxHelper::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-         $this->commonTaxCollector = $objectManager->getObject(
--            \Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector::class,
-+            CommonTaxCollector::class,
-             [
-                 'taxConfig' => $this->taxConfig,
-                 'quoteDetailsItemDataObjectFactory' => $this->quoteDetailsItemDataObjectFactoryMock,
--                'taxClassKeyDataObjectFactory' => $this->taxClassKeyDataObjectFactoryMock
-+                'taxClassKeyDataObjectFactory' => $this->taxClassKeyDataObjectFactoryMock,
-+                'taxHelper' => $this->taxHelper,
-             ]
-         );
-     }
- 
-     /**
-+     * Test for GetShippingDataObject
-+     *
-      * @param array $addressData
-      * @param bool $useBaseCurrency
-      * @param string $shippingTaxClass
-      * @param bool $shippingPriceInclTax
-+     *
-+     * @return void
-      * @dataProvider getShippingDataObjectDataProvider
-      */
-     public function testGetShippingDataObject(
-@@ -128,8 +161,8 @@ class CommonTaxCollectorTest extends \PHPUnit\Framework\TestCase
-         $useBaseCurrency,
-         $shippingTaxClass,
-         $shippingPriceInclTax
--    ) {
--        $shippingAssignmentMock = $this->createMock(\Magento\Quote\Api\Data\ShippingAssignmentInterface::class);
-+    ): void {
-+        $shippingAssignmentMock = $this->createMock(ShippingAssignmentInterface::class);
-         $methods = [
-             'getShippingDiscountAmount',
-             'getShippingTaxCalculationAmount',
-@@ -139,8 +172,10 @@ class CommonTaxCollectorTest extends \PHPUnit\Framework\TestCase
-             'getBaseShippingAmount',
-             'getBaseShippingDiscountAmount'
-         ];
--        $totalsMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address\Total::class, $methods);
--        $shippingMock = $this->createMock(\Magento\Quote\Api\Data\ShippingInterface::class);
-+        /** @var MockObject|QuoteAddressTotal $totalsMock */
-+        $totalsMock = $this->createPartialMock(QuoteAddressTotal::class, $methods);
-+        $shippingMock = $this->createMock(ShippingInterface::class);
-+        /** @var MockObject|ShippingAssignmentInterface $shippingAssignmentMock */
-         $shippingAssignmentMock->expects($this->once())->method('getShipping')->willReturn($shippingMock);
-         $shippingMock->expects($this->once())->method('getAddress')->willReturn($this->address);
-         $baseShippingAmount = $addressData['base_shipping_amount'];
-@@ -184,9 +219,44 @@ class CommonTaxCollectorTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Update item tax info
-+     *
-+     * @return void
-+     */
-+    public function testUpdateItemTaxInfo(): void
-+    {
-+        /** @var MockObject|QuoteItem $quoteItem */
-+        $quoteItem = $this->getMockBuilder(QuoteItem::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getPrice', 'setPrice', 'getCustomPrice', 'setCustomPrice'])
-+            ->getMock();
-+        $this->taxHelper->method('applyTaxOnCustomPrice')->willReturn(true);
-+        $quoteItem->method('getCustomPrice')->willReturn(true);
-+        /** @var MockObject|TaxDetailsItemInterface $itemTaxDetails */
-+        $itemTaxDetails = $this->getMockBuilder(TaxDetailsItemInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        /** @var MockObject|TaxDetailsItemInterface $baseItemTaxDetails */
-+        $baseItemTaxDetails = $this->getMockBuilder(TaxDetailsItemInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $quoteItem->expects($this->once())->method('setCustomPrice');
-+
-+        $this->commonTaxCollector->updateItemTaxInfo(
-+            $quoteItem,
-+            $itemTaxDetails,
-+            $baseItemTaxDetails,
-+            $this->store
-+        );
-+    }
-+
-+    /**
-+     * Data for testGetShippingDataObject
-+     *
-      * @return array
-      */
--    public function getShippingDataObjectDataProvider()
-+    public function getShippingDataObjectDataProvider(): array
-     {
-         $data = [
-             'free_shipping' => [
-diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php
-index 77e25d6f145..2bfebc984bb 100644
---- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php
-+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php
-@@ -133,7 +133,7 @@ class ShippingTest extends \PHPUnit\Framework\TestCase
-         $getterValueMap = [];
-         $methods = ['__wakeup'];
-         foreach ($objectState as $key => $value) {
--            $getterName = 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
-+            $getterName = 'get' . str_replace('_', '', ucwords($key, '_'));
-             $getterValueMap[$getterName] = $value;
-             $methods[] = $getterName;
-         }
-diff --git a/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php b/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
-index 96b4b81ae28..2e957e528e2 100644
---- a/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
-+++ b/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
-@@ -6,7 +6,7 @@
- namespace Magento\Tax\Test\Unit\Observer;
- 
- use Magento\Framework\Event\Observer;
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\PageCache\Model\Config;
- use Magento\Tax\Api\TaxAddressManagerInterface;
-@@ -31,7 +31,7 @@ class AfterAddressSaveObserverTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Module manager
-      *
--     * @var Manager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $moduleManagerMock;
- 
-@@ -65,7 +65,7 @@ class AfterAddressSaveObserverTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(['getCustomerAddress'])
-             ->getMock();
- 
--        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
-+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-diff --git a/app/code/Magento/Tax/Test/Unit/Observer/CustomerLoggedInObserverTest.php b/app/code/Magento/Tax/Test/Unit/Observer/CustomerLoggedInObserverTest.php
-index 9e15e529288..facbb6733b5 100644
---- a/app/code/Magento/Tax/Test/Unit/Observer/CustomerLoggedInObserverTest.php
-+++ b/app/code/Magento/Tax/Test/Unit/Observer/CustomerLoggedInObserverTest.php
-@@ -8,6 +8,9 @@ namespace Magento\Tax\Test\Unit\Observer;
- use Magento\Tax\Api\TaxAddressManagerInterface;
- use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
-+/**
-+ * Customer logged in observer test
-+ */
- class CustomerLoggedInObserverTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -28,7 +31,7 @@ class CustomerLoggedInObserverTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Module manager
-      *
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     private $moduleManagerMock;
- 
-@@ -59,9 +62,11 @@ class CustomerLoggedInObserverTest extends \PHPUnit\Framework\TestCase
-         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->observerMock = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
-             ->disableOriginalConstructor()
--            ->setMethods([
-+            ->setMethods(
-+                [
-                 'getCustomerAddress', 'getData'
--            ])
-+                ]
-+            )
-             ->getMock();
- 
-         $this->groupRepositoryMock = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\GroupRepository::class)
-@@ -70,12 +75,14 @@ class CustomerLoggedInObserverTest extends \PHPUnit\Framework\TestCase
- 
-         $this->customerSessionMock = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
-             ->disableOriginalConstructor()
--            ->setMethods([
-+            ->setMethods(
-+                [
-                 'setCustomerTaxClassId', 'setDefaultTaxBillingAddress', 'setDefaultTaxShippingAddress', 'setWebsiteId'
--            ])
-+                ]
-+            )
-             ->getMock();
- 
--        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
-+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-diff --git a/app/code/Magento/Tax/etc/adminhtml/system.xml b/app/code/Magento/Tax/etc/adminhtml/system.xml
-index c03a8aa44bf..7fc1744b8e2 100644
---- a/app/code/Magento/Tax/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Tax/etc/adminhtml/system.xml
-@@ -62,7 +62,7 @@
-                     <backend_model>Magento\Tax\Model\Config\Notification</backend_model>
-                     <comment>Warning: To apply the discount on prices including tax and apply the tax after discount, set Catalog Prices to “Including Tax”.</comment>
-                 </field>
--                <field id="apply_tax_on" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-+                <field id="apply_tax_on" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Apply Tax On</label>
-                     <source_model>Magento\Tax\Model\Config\Source\Apply\On</source_model>
-                 </field>
-diff --git a/app/code/Magento/Tax/etc/config.xml b/app/code/Magento/Tax/etc/config.xml
-index 0b837944a36..afe7bd78611 100644
---- a/app/code/Magento/Tax/etc/config.xml
-+++ b/app/code/Magento/Tax/etc/config.xml
-@@ -49,7 +49,7 @@
-                 <zero_tax>0</zero_tax>
-             </sales_display>
-             <notification>
--                <info_url>http://docs.magento.com/m2/ce/user_guide/tax/warning-messages.html</info_url>
-+                <info_url>https://docs.magento.com/m2/ce/user_guide/tax/warning-messages.html</info_url>
-             </notification>
-         </tax>
-     </default>
-diff --git a/app/code/Magento/Tax/etc/db_schema.xml b/app/code/Magento/Tax/etc/db_schema.xml
-index 6cc4041f75a..f5227a9ef3a 100644
---- a/app/code/Magento/Tax/etc/db_schema.xml
-+++ b/app/code/Magento/Tax/etc/db_schema.xml
-@@ -13,7 +13,7 @@
-         <column xsi:type="varchar" name="class_name" nullable="false" length="255" comment="Class Name"/>
-         <column xsi:type="varchar" name="class_type" nullable="false" length="8" default="CUSTOMER"
-                 comment="Class Type"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="class_id"/>
-         </constraint>
-     </table>
-@@ -27,14 +27,14 @@
-                 comment="Position"/>
-         <column xsi:type="int" name="calculate_subtotal" padding="11" unsigned="false" nullable="false" identity="false"
-                 comment="Calculate off subtotal option"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="tax_calculation_rule_id"/>
-         </constraint>
--        <index name="TAX_CALCULATION_RULE_PRIORITY_POSITION" indexType="btree">
-+        <index referenceId="TAX_CALCULATION_RULE_PRIORITY_POSITION" indexType="btree">
-             <column name="priority"/>
-             <column name="position"/>
-         </index>
--        <index name="TAX_CALCULATION_RULE_CODE" indexType="btree">
-+        <index referenceId="TAX_CALCULATION_RULE_CODE" indexType="btree">
-             <column name="code"/>
-         </index>
-     </table>
-@@ -54,18 +54,18 @@
-                 comment="Zip From"/>
-         <column xsi:type="int" name="zip_to" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="Zip To"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="tax_calculation_rate_id"/>
-         </constraint>
--        <index name="TAX_CALCULATION_RATE_TAX_COUNTRY_ID_TAX_REGION_ID_TAX_POSTCODE" indexType="btree">
-+        <index referenceId="TAX_CALCULATION_RATE_TAX_COUNTRY_ID_TAX_REGION_ID_TAX_POSTCODE" indexType="btree">
-             <column name="tax_country_id"/>
-             <column name="tax_region_id"/>
-             <column name="tax_postcode"/>
-         </index>
--        <index name="TAX_CALCULATION_RATE_CODE" indexType="btree">
-+        <index referenceId="TAX_CALCULATION_RATE_CODE" indexType="btree">
-             <column name="code"/>
-         </index>
--        <index name="IDX_CA799F1E2CB843495F601E56C84A626D" indexType="btree">
-+        <index referenceId="IDX_CA799F1E2CB843495F601E56C84A626D" indexType="btree">
-             <column name="tax_calculation_rate_id"/>
-             <column name="tax_country_id"/>
-             <column name="tax_region_id"/>
-@@ -84,31 +84,31 @@
-                 identity="false" comment="Customer Tax Class Id"/>
-         <column xsi:type="smallint" name="product_tax_class_id" padding="6" unsigned="false" nullable="false"
-                 identity="false" comment="Product Tax Class Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="tax_calculation_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="TAX_CALCULATION_PRODUCT_TAX_CLASS_ID_TAX_CLASS_CLASS_ID"
-+        <constraint xsi:type="foreign" referenceId="TAX_CALCULATION_PRODUCT_TAX_CLASS_ID_TAX_CLASS_CLASS_ID"
-                     table="tax_calculation" column="product_tax_class_id" referenceTable="tax_class"
-                     referenceColumn="class_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="TAX_CALCULATION_CUSTOMER_TAX_CLASS_ID_TAX_CLASS_CLASS_ID"
-+        <constraint xsi:type="foreign" referenceId="TAX_CALCULATION_CUSTOMER_TAX_CLASS_ID_TAX_CLASS_CLASS_ID"
-                     table="tax_calculation" column="customer_tax_class_id" referenceTable="tax_class"
-                     referenceColumn="class_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="TAX_CALC_TAX_CALC_RATE_ID_TAX_CALC_RATE_TAX_CALC_RATE_ID"
-+        <constraint xsi:type="foreign" referenceId="TAX_CALC_TAX_CALC_RATE_ID_TAX_CALC_RATE_TAX_CALC_RATE_ID"
-                     table="tax_calculation" column="tax_calculation_rate_id" referenceTable="tax_calculation_rate"
-                     referenceColumn="tax_calculation_rate_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="TAX_CALC_TAX_CALC_RULE_ID_TAX_CALC_RULE_TAX_CALC_RULE_ID"
-+        <constraint xsi:type="foreign" referenceId="TAX_CALC_TAX_CALC_RULE_ID_TAX_CALC_RULE_TAX_CALC_RULE_ID"
-                     table="tax_calculation" column="tax_calculation_rule_id" referenceTable="tax_calculation_rule"
-                     referenceColumn="tax_calculation_rule_id" onDelete="CASCADE"/>
--        <index name="TAX_CALCULATION_TAX_CALCULATION_RULE_ID" indexType="btree">
-+        <index referenceId="TAX_CALCULATION_TAX_CALCULATION_RULE_ID" indexType="btree">
-             <column name="tax_calculation_rule_id"/>
-         </index>
--        <index name="TAX_CALCULATION_CUSTOMER_TAX_CLASS_ID" indexType="btree">
-+        <index referenceId="TAX_CALCULATION_CUSTOMER_TAX_CLASS_ID" indexType="btree">
-             <column name="customer_tax_class_id"/>
-         </index>
--        <index name="TAX_CALCULATION_PRODUCT_TAX_CLASS_ID" indexType="btree">
-+        <index referenceId="TAX_CALCULATION_PRODUCT_TAX_CLASS_ID" indexType="btree">
-             <column name="product_tax_class_id"/>
-         </index>
--        <index name="TAX_CALC_TAX_CALC_RATE_ID_CSTR_TAX_CLASS_ID_PRD_TAX_CLASS_ID" indexType="btree">
-+        <index referenceId="TAX_CALC_TAX_CALC_RATE_ID_CSTR_TAX_CLASS_ID_PRD_TAX_CLASS_ID" indexType="btree">
-             <column name="tax_calculation_rate_id"/>
-             <column name="customer_tax_class_id"/>
-             <column name="product_tax_class_id"/>
-@@ -122,24 +122,24 @@
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Store Id"/>
-         <column xsi:type="varchar" name="value" nullable="false" length="255" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="tax_calculation_rate_title_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="TAX_CALCULATION_RATE_TITLE_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="TAX_CALCULATION_RATE_TITLE_STORE_ID_STORE_STORE_ID"
-                     table="tax_calculation_rate_title" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="FK_37FB965F786AD5897BB3AE90470C42AB" table="tax_calculation_rate_title"
-+        <constraint xsi:type="foreign" referenceId="FK_37FB965F786AD5897BB3AE90470C42AB" table="tax_calculation_rate_title"
-                     column="tax_calculation_rate_id" referenceTable="tax_calculation_rate"
-                     referenceColumn="tax_calculation_rate_id" onDelete="CASCADE"/>
--        <index name="TAX_CALCULATION_RATE_TITLE_TAX_CALCULATION_RATE_ID_STORE_ID" indexType="btree">
-+        <index referenceId="TAX_CALCULATION_RATE_TITLE_TAX_CALCULATION_RATE_ID_STORE_ID" indexType="btree">
-             <column name="tax_calculation_rate_id"/>
-             <column name="store_id"/>
-         </index>
--        <index name="TAX_CALCULATION_RATE_TITLE_STORE_ID" indexType="btree">
-+        <index referenceId="TAX_CALCULATION_RATE_TITLE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
--    <table name="tax_order_aggregated_created" resource="default" engine="innodb" comment="Tax Order Aggregation">
-+    <table name="tax_order_aggregated_created" resource="sales" engine="innodb" comment="Tax Order Aggregation">
-         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
-         <column xsi:type="date" name="period" comment="Period"/>
-         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-@@ -151,24 +151,24 @@
-                 default="0" comment="Orders Count"/>
-         <column xsi:type="float" name="tax_base_amount_sum" unsigned="false" nullable="true"
-                 comment="Tax Base Amount Sum"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="TAX_ORDER_AGGREGATED_CREATED_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="TAX_ORDER_AGGREGATED_CREATED_STORE_ID_STORE_STORE_ID"
-                     table="tax_order_aggregated_created" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="TAX_ORDER_AGGRED_CREATED_PERIOD_STORE_ID_CODE_PERCENT_ORDER_STS">
-+        <constraint xsi:type="unique" referenceId="TAX_ORDER_AGGRED_CREATED_PERIOD_STORE_ID_CODE_PERCENT_ORDER_STS">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="code"/>
-             <column name="percent"/>
-             <column name="order_status"/>
-         </constraint>
--        <index name="TAX_ORDER_AGGREGATED_CREATED_STORE_ID" indexType="btree">
-+        <index referenceId="TAX_ORDER_AGGREGATED_CREATED_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
--    <table name="tax_order_aggregated_updated" resource="default" engine="innodb"
-+    <table name="tax_order_aggregated_updated" resource="sales" engine="innodb"
-            comment="Tax Order Aggregated Updated">
-         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
-         <column xsi:type="date" name="period" comment="Period"/>
-@@ -181,20 +181,20 @@
-                 default="0" comment="Orders Count"/>
-         <column xsi:type="float" name="tax_base_amount_sum" unsigned="false" nullable="true"
-                 comment="Tax Base Amount Sum"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="TAX_ORDER_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID"
-+        <constraint xsi:type="foreign" referenceId="TAX_ORDER_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID"
-                     table="tax_order_aggregated_updated" column="store_id" referenceTable="store"
-                     referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="TAX_ORDER_AGGRED_UPDATED_PERIOD_STORE_ID_CODE_PERCENT_ORDER_STS">
-+        <constraint xsi:type="unique" referenceId="TAX_ORDER_AGGRED_UPDATED_PERIOD_STORE_ID_CODE_PERCENT_ORDER_STS">
-             <column name="period"/>
-             <column name="store_id"/>
-             <column name="code"/>
-             <column name="percent"/>
-             <column name="order_status"/>
-         </constraint>
--        <index name="TAX_ORDER_AGGREGATED_UPDATED_STORE_ID" indexType="btree">
-+        <index referenceId="TAX_ORDER_AGGREGATED_UPDATED_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Tax/etc/di.xml b/app/code/Magento/Tax/etc/di.xml
-index 096f8359fad..3b46b0f9e25 100644
---- a/app/code/Magento/Tax/etc/di.xml
-+++ b/app/code/Magento/Tax/etc/di.xml
-@@ -143,6 +143,7 @@
-         <arguments>
-             <argument name="fieldMapping" xsi:type="array">
-                 <item name="id" xsi:type="string">tax_calculation_rule_id</item>
-+                <item name="code" xsi:type="string">main_table.code</item>
-                 <item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
-                 <item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
-                 <item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>
-@@ -154,6 +155,7 @@
-         <arguments>
-             <argument name="fieldMapping" xsi:type="array">
-                 <item name="id" xsi:type="string">tax_calculation_rule_id</item>
-+                <item name="code" xsi:type="string">main_table.code</item>
-                 <item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
-                 <item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
-                 <item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>
-diff --git a/app/code/Magento/Tax/etc/extension_attributes.xml b/app/code/Magento/Tax/etc/extension_attributes.xml
-index 90a5e6d2ece..41af1df836d 100644
---- a/app/code/Magento/Tax/etc/extension_attributes.xml
-+++ b/app/code/Magento/Tax/etc/extension_attributes.xml
-@@ -20,4 +20,7 @@
-     <extension_attributes for="Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface">
-         <attribute code="tax_adjustments" type="Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface" />
-     </extension_attributes>
-+    <extension_attributes for="Magento\Tax\Api\Data\QuoteDetailsItemInterface">
-+        <attribute code="price_for_tax_calculation" type="float" />
-+    </extension_attributes>
- </config>
-diff --git a/app/code/Magento/Tax/etc/sales.xml b/app/code/Magento/Tax/etc/sales.xml
-index 64d29ece898..15afd499bce 100644
---- a/app/code/Magento/Tax/etc/sales.xml
-+++ b/app/code/Magento/Tax/etc/sales.xml
-@@ -9,7 +9,7 @@
-     <section name="quote">
-         <group name="totals">
-             <item name="tax_subtotal" instance="Magento\Tax\Model\Sales\Total\Quote\Subtotal" sort_order="200"/>
--            <item name="tax_shipping" instance="Magento\Tax\Model\Sales\Total\Quote\Shipping" sort_order="300"/>
-+            <item name="tax_shipping" instance="Magento\Tax\Model\Sales\Total\Quote\Shipping" sort_order="375"/>
-             <item name="tax" instance="Magento\Tax\Model\Sales\Total\Quote\Tax" sort_order="450">
-                 <renderer name="adminhtml" instance="Magento\Sales\Block\Adminhtml\Order\Create\Totals\Tax"/>
-                 <renderer name="frontend" instance="Magento\Tax\Block\Checkout\Tax"/>
-diff --git a/app/code/Magento/Tax/i18n/en_US.csv b/app/code/Magento/Tax/i18n/en_US.csv
-index e6d89deb769..836221e2ec9 100644
---- a/app/code/Magento/Tax/i18n/en_US.csv
-+++ b/app/code/Magento/Tax/i18n/en_US.csv
-@@ -178,3 +178,4 @@ Rate,Rate
- "Your credit card will be charged for","Your credit card will be charged for"
- "An error occurred while loading tax rates.","An error occurred while loading tax rates."
- "You will be charged for","You will be charged for"
-+"Not yet calculated", "Not yet calculated"
-diff --git a/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_block.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_block.xml
-index 463994262b7..5c50b306411 100644
---- a/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_block.xml
-+++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.tax.rate.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">tax_rate_grid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Tax\Model\TaxRateCollection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Tax\Model\TaxRateCollection</argument>
-                     <argument name="default_sort" xsi:type="string">region_name</argument>
-                     <argument name="default_dir" xsi:type="string">ASC</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-diff --git a/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_block.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_block.xml
-index 5e42b835c03..07afd05e63f 100644
---- a/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_block.xml
-+++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.tax.rule.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">taxRuleGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Tax\Model\TaxRuleCollection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Tax\Model\TaxRuleCollection</argument>
-                     <argument name="default_sort" xsi:type="string">tax_rule_id</argument>
-                     <argument name="default_dir" xsi:type="string">ASC</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
-deleted file mode 100644
-index 18e86549a1f..00000000000
---- a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
-+++ /dev/null
-@@ -1,20 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--?>
--<div data-mage-init='{"floatingHeader": {}}' class="page-actions">
--    <?= $block->getBackButtonHtml() ?>
--    <?= $block->getResetButtonHtml() ?>
--    <?= $block->getDeleteButtonHtml() ?>
--    <?= $block->getSaveButtonHtml() ?>
--</div>
--<?= $block->getRenameFormHtml() ?>
--<script type="text/x-magento-init">
--    {
--        "#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>": {
--            "Magento_Tax/js/page/validate": {}
--        }
--    }
--</script>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
-index 5e914fdc5a5..4d680dc072e 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
-@@ -4,30 +4,28 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
- /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
- 
- $_item = $block->getItem();
- ?>
--
--<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
-+<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()) : ?>
-     <div class="price-excl-tax">
--        <?php if ($block->displayBothPrices()): ?>
--            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
-+        <?php if ($block->displayBothPrices()) : ?>
-+            <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
-         <?php endif; ?>
--        <?= /* @escapeNotVerified */ $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
-+        <?= /* @noEscape */ $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
-     </div>
- <?php endif; ?>
--<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
-+<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()) : ?>
-     <div class="price-incl-tax">
--        <?php if ($block->displayBothPrices()): ?>
--            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
-+        <?php if ($block->displayBothPrices()) : ?>
-+            <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
-         <?php endif; ?>
--        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
--        <?php $_baseIncl = $this->helper('Magento\Checkout\Helper\Data')->getBaseSubtotalInclTax($_item); ?>
--        <?= /* @escapeNotVerified */ $block->displayPrices($_baseIncl, $_incl) ?>
-+        <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
-+        <?php $_baseIncl = $this->helper(\Magento\Checkout\Helper\Data::class)->getBaseSubtotalInclTax($_item); ?>
-+        <?= /* @noEscape */ $block->displayPrices($_baseIncl, $_incl) ?>
-     </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
-index 501ec61d348..f8a32492a56 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
-@@ -13,4 +10,4 @@
- $_item = $block->getItem();
- ?>
- 
--<?= /* @escapeNotVerified */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
-+<?= /* @noEscape */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
-index 82d82192d45..817a6264e5e 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
- /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
-@@ -13,24 +12,24 @@
- $_item = $block->getItem();
- ?>
- 
--<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-+<?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices() || $this->helper(\Magento\Tax\Helper\Data::class)->displaySalesPriceExclTax()) : ?>
-     <div class="price-excl-tax">
--        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
--            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
-+        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices()) : ?>
-+            <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
-         <?php endif; ?>
- 
--        <?= /* @escapeNotVerified */ $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
-+        <?= /* @noEscape */ $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
-     </div>
- <?php endif; ?>
--<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-+<?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices() || $this->helper(\Magento\Tax\Helper\Data::class)->displaySalesPriceInclTax()) : ?>
-     <div class="price-incl-tax">
--        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
--            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
-+        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices()) : ?>
-+            <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
-         <?php endif; ?>
--        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
--        <?php $_baseIncl = $this->helper('Magento\Checkout\Helper\Data')->getBasePriceInclTax($_item); ?>
-+        <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getPriceInclTax($_item); ?>
-+        <?php $_baseIncl = $this->helper(\Magento\Checkout\Helper\Data::class)->getBasePriceInclTax($_item); ?>
- 
--        <?= /* @escapeNotVerified */ $block->displayPrices($_baseIncl, $_incl) ?>
-+        <?= /* @noEscape */ $block->displayPrices($_baseIncl, $_incl) ?>
- 
-     </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
-index 17f7f39529a..eeaf7695420 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
- /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
-@@ -13,17 +12,17 @@
- $_item = $block->getItem();
- ?>
- 
--<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices($block->getStore())): ?>
--        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
-+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices($block->getStore())) : ?>
-+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotal()) ?>
-+    <?= /* @noEscape */ $block->formatPrice($_item->getRowTotal()) ?>
- <?php endif; ?>
- 
--<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
-+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
--    <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
-+    <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
-+    <?= /* @noEscape */ $block->formatPrice($_incl) ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
-index 860b4662fd3..462a1a65f97 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
-@@ -13,19 +10,19 @@
- $_item = $block->getItem();
- ?>
- 
--<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
-     <?php $_rowTotalWithoutDiscount = $_item->getRowTotal() - $_item->getTotalDiscountAmount(); ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
-+    <?= /* @noEscape */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
- <?php endif; ?>
- 
- 
--<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices($block->getStore())): ?>
--        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
-+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices($block->getStore())) : ?>
-+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
-     <?php endif; ?>
-     <?php $_incl = $block->getTotalAmount($_item); ?>
--    <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
-+    <?= /* @noEscape */ $block->formatPrice($_incl) ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
-index 2846307979d..066b6a04fde 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
- /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
-@@ -13,18 +12,18 @@
- $_item = $block->getItem();
- ?>
- 
--<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
-+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?= /* @escapeNotVerified */ $block->formatPrice($_item->getCalculationPrice()) ?>
-+    <?= /* @noEscape */ $block->formatPrice($_item->getCalculationPrice()) ?>
- <?php endif; ?>
- 
- 
--<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
-+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
--    <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
-+    <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getPriceInclTax($_item); ?>
-+    <?= /* @noEscape */ $block->formatPrice($_incl) ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
-index 30b5e954da5..304020c3af2 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div class="entry-edit form-inline">
-     <?= $block->getFormHtml() ?>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
-index 16c23624c38..fec108d5394 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <script>
- require([
-@@ -13,7 +12,7 @@ require([
-     "mage/adminhtml/form"
- ], function(jQuery){
- 
--    var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', <?= /* @escapeNotVerified */ $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>, 'disable');
-+    var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>, 'disable');
-     updater.disableRegionValidation();
- 
-     (function ($) {
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
-index 682968e3447..7dd6f6cee8c 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
-@@ -3,21 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <fieldset id="tax-rate-titles-table" class="admin__fieldset">
-     <?php $_labels = $block->getTitles() ?>
--    <?php foreach ($block->getStores() as $_store): ?>
-+    <?php foreach ($block->getStores() as $_store) : ?>
-         <div class="admin__field">
--            <label class="admin__field-label"><span><?= /* @escapeNotVerified */ $_store->getName() ?></span></label>
-+            <label class="admin__field-label">
-+                <span><?= $block->escapeHtml($_store->getName()) ?></span>
-+            </label>
-             <div class="admin__field-control">
-                 <input
--                    class="admin__control-text<?php if ($_store->getId() == 0): ?> required-entry<?php endif; ?>"
-+                    class="admin__control-text<?php if ($_store->getId() == 0) : ?> required-entry<?php endif; ?>"
-                     type="text"
--                    name="title[<?= /* @escapeNotVerified */ $_store->getId() ?>]"
--                    value="<?= /* @escapeNotVerified */ $_labels[$_store->getId()] ?>" />
-+                    name="title[<?= (int) $_store->getId() ?>]"
-+                    value="<?= $block->escapeHtmlAttr($_labels[(int) $_store->getId()]) ?>" />
-             </div>
-         </div>
-     <?php endforeach; ?>
-@@ -25,8 +24,8 @@
-     <div class="messages">
-         <div class="message message-notice">
-             <div>
--                <strong><?= /* @escapeNotVerified */ __('Note:') ?></strong>
--                <?= /* @escapeNotVerified */ __('Leave this field empty if you wish to use the tax identifier.') ?>
-+                <strong><?= $block->escapeHtml(__('Note:')) ?></strong>
-+                <?= $block->escapeHtml(__('Leave this field empty if you wish to use the tax identifier.')) ?>
-             </div>
-         </div>
-     </div>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
-index fced077015f..81bdd874ead 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Tax\Block\Adminhtml\Rule\Edit\Form */
- ?>
- <script>
-@@ -78,7 +76,7 @@ require([
-             $.ajax({
-                 type: "POST",
-                 data: {id:id},
--                url: '<?= /* @escapeNotVerified */ $block->getTaxRateLoadUrl() ?>',
-+                url: '<?= $block->escapeJs($block->escapeUrl($block->getTaxRateLoadUrl())) ?>',
-                 success: function(result, status) {
-                     $('body').trigger('processStop');
-                     if (result.success) {
-@@ -95,14 +93,14 @@ require([
-                             });
-                         else
-                             alert({
--                                content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
-+                                content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
-                             });
-                     }
-                 },
-                 error: function () {
-                     $('body').trigger('processStop');
-                     alert({
--                        content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
-+                        content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
-                     });
-                 },
-                 dataType: "json"
-@@ -113,9 +111,9 @@ require([
-             var options = {
-                 mselectContainer: '#tax_rate + section.mselect-list',
-                 toggleAddButton:false,
--                addText: '<?= /* @escapeNotVerified */ __('Add New Tax Rate') ?>',
-+                addText: '<?= $block->escapeJs($block->escapeHtml(__('Add New Tax Rate'))) ?>',
-                 parse: null,
--                nextPageUrl: '<?php echo $block->escapeHtml($block->getTaxRatesPageUrl())?>',
-+                nextPageUrl: '<?= $block->escapeHtml($block->getTaxRatesPageUrl()) ?>',
-                 selectedValues: this.settings.selected_values,
-                 mselectInputSubmitCallback: function (value, options) {
-                     var select = $('#tax_rate');
-@@ -138,7 +136,7 @@ require([
-             var taxRate = $('#tax_rate'),
-                 taxRateField = taxRate.parent(),
-                 taxRateForm = $('#tax-rate-form'),
--                taxRateFormElement = $('#<?= /* @escapeNotVerified */ \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID ?>');
-+                taxRateFormElement = $('#<?= /* @noEscape */ \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID ?>');
- 
-             if (!this.isEntityEditable) {
-                 // Override default layout of editable multiselect
-@@ -162,7 +160,7 @@ require([
-             taxRateField.find('.mselect-list')
-                     .on('click.mselect-edit', '.mselect-edit', this.edit)
-                     .on("click.mselect-delete", ".mselect-delete", function () {
--                        if (!confirm('<?= /* @escapeNotVerified */ __('Do you really want to delete this tax rate?') ?>')) {
-+                        if (!confirm('<?= $block->escapeJs(__('Do you really want to delete this tax rate?')) ?>')) {
-                             return;
-                         }
- 
-@@ -178,7 +176,7 @@ require([
-                                 form_key: $('input[name="form_key"]').val()
-                             },
-                             dataType: 'json',
--                            url: '<?= /* @escapeNotVerified */ $block->getTaxRateDeleteUrl() ?>',
-+                            url: '<?= $block->escapeJs($block->escapeUrl($block->getTaxRateDeleteUrl())) ?>',
-                             success: function(result, status) {
-                                 $('body').trigger('processStop');
-                                 if (result.success) {
-@@ -196,14 +194,14 @@ require([
-                                         });
-                                     else
-                                         alert({
--                                            content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
-+                                            content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
-                                         });
-                                 }
-                             },
-                             error: function () {
-                                 $('body').trigger('processStop');
-                                 alert({
--                                    content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
-+                                    content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
-                                 });
-                             }
-                         };
-@@ -224,15 +222,15 @@ require([
-             taxRateFormElement.mage('form').mage('validation');
- 
-             taxRateForm.dialogRates({
--                title: '<?= /* @escapeNotVerified */ __('Tax Rate') ?>',
-+                title: '<?= $block->escapeJs($block->escapeHtml(__('Tax Rate'))) ?>',
-                 type: 'slide',
--                id: '<?= /* @escapeNotVerified */ $block->getJsId() ?>',
-+                id: '<?= /* @noEscape */ $block->getJsId() ?>',
-                 modalClass: 'tax-rate-popup',
-                 closed: function () {
-                     taxRateFormElement.data('validation').clearError();
-                 },
-                 buttons: [{
--                    text: '<?= /* @escapeNotVerified */ __('Save') ?>',
-+                    text: '<?= $block->escapeJs($block->escapeHtml(__('Save'))) ?>',
-                     'class': 'action-save action-primary',
-                     click: function() {
-                         this.updateItemRate();
-@@ -252,7 +250,7 @@ require([
-                             type: 'POST',
-                             data: itemRateData,
-                             dataType: 'json',
--                            url: '<?= /* @escapeNotVerified */ $block->getTaxRateSaveUrl() ?>',
-+                            url: '<?= $block->escapeJs($block->escapeUrl($block->getTaxRateSaveUrl())) ?>',
-                             success: function(result, status) {
-                                 $('body').trigger('processStop');
-                                 if (result.success) {
-@@ -277,14 +275,14 @@ require([
-                                         });
-                                     else
-                                         alert({
--                                            content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
-+                                            content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
-                                         });
-                                 }
-                             },
-                             error: function () {
-                                 $('body').trigger('processStop');
-                                 alert({
--                                    content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
-+                                    content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
-                                 });
-                             }
-                         };
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
-index c0d185c36b0..f09af05303f 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
-@@ -10,8 +10,7 @@
-     <div class="grid-loader"></div>
- </div>
- 
--<div class="form-inline" id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none">
-+<div class="form-inline" id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>" style="display:none">
-     <?= $block->getFormHtml() ?>
-     <?= $block->getChildHtml('form_after') ?>
- </div>
--
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
-index ed7e543989e..d5017f83aff 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
-@@ -3,9 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+// @deprecated
- ?>
- <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
--    <button type="button" onclick="window.location.href='<?= /* @escapeNotVerified */ $createUrl ?>'">
--        <?= /* @escapeNotVerified */ __('Add New Class') ?>
-+    <button type="button" onclick="window.location.href='<?= $block->escapeUrl($createUrl) ?>'">
-+        <?= $block->escapeHtml(__('Add New Class')) ?>
-     </button>
- </div>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
-index e0255d52e4d..fa9fcb8fbcf 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
-@@ -3,22 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// @deprecated
- ?>
- <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-     <?= $block->getBackButtonHtml() ?>
-     <?= $block->getResetButtonHtml() ?>
-     <?= $block->getSaveButtonHtml() ?>
- </div>
--<?php if ($form): ?>
--<?= $form->toHtml() ?>
--<script>
--require(['jquery', "mage/mage"], function(jQuery){
-+<?php if ($form) : ?>
-+    <?= $form->toHtml() ?>
-+    <script>
-+    require(['jquery', "mage/mage"], function(jQuery){
- 
--    jQuery('#<?= /* @escapeNotVerified */ $form->getForm()->getId() ?>').mage('form').mage('validation');
-+        jQuery('#<?= $block->escapeJs($form->getForm()->getId()) ?>').mage('form').mage('validation');
- 
--});
--</script>
-+    });
-+    </script>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
-index 902c6932f0a..c0928f4723b 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml('grid') ?>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
-index 3128b82b69e..58c79bbfe97 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
-@@ -3,48 +3,44 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?php if ($form): ?>
--<?= $form->toHtml() ?>
--
--<script>
--require([
--    "jquery",
--    "mage/mage"
--], function($){
-+<?php if ($form) : ?>
-+    <?= $form->toHtml() ?>
-+    <script>
-+    require([
-+        "jquery",
-+        "mage/mage"
-+    ], function($){
- 
--    $('#<?= /* @escapeNotVerified */ $form->getForm()->getId() ?>').mage('form').mage('validation');
-+        $('#<?= $block->escapeJs($form->getForm()->getId()) ?>').mage('form').mage('validation');
- 
--    $(document).ready(function () {
--        'use strict';
-+        $(document).ready(function () {
-+            'use strict';
- 
--        $('.field-zip_from').addClass('ignore-validate');
--        $('.field-zip_to').addClass('ignore-validate');
-+            $('.field-zip_from').addClass('ignore-validate');
-+            $('.field-zip_to').addClass('ignore-validate');
- 
--        $('#zip_is_range').on('change.zipRange', function(){
-+            $('#zip_is_range').on('change.zipRange', function(){
- 
--            var elem = $(this),
--                zipFrom =$('.field-zip_from'),
--                zipTo =$('.field-zip_to'),
--                zipCode =$('.field-tax_postcode');
-+                var elem = $(this),
-+                    zipFrom =$('.field-zip_from'),
-+                    zipTo =$('.field-zip_to'),
-+                    zipCode =$('.field-tax_postcode');
- 
--            if (elem.is(':checked')) {
--                zipCode.addClass('hidden').addClass('ignore-validate');
--                zipFrom.removeClass('hidden').removeClass('ignore-validate');
--                zipTo.removeClass('hidden').removeClass('ignore-validate');
-+                if (elem.is(':checked')) {
-+                    zipCode.addClass('hidden').addClass('ignore-validate');
-+                    zipFrom.removeClass('hidden').removeClass('ignore-validate');
-+                    zipTo.removeClass('hidden').removeClass('ignore-validate');
- 
--            } else {
--                zipCode.removeClass('hidden').removeClass('ignore-validate');
--                zipFrom.addClass('hidden').addClass('ignore-validate');
--                zipTo.addClass('hidden').addClass('ignore-validate');
--            }
-+                } else {
-+                    zipCode.removeClass('hidden').removeClass('ignore-validate');
-+                    zipFrom.addClass('hidden').addClass('ignore-validate');
-+                    zipTo.addClass('hidden').addClass('ignore-validate');
-+                }
- 
-+            });
-         });
--    });
- 
--});
--</script>
-+    });
-+    </script>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
-index b3d8a01e1ef..e21dbb099ff 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
-@@ -3,9 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+// @deprecated
- ?>
- <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
--    <button type="button" onclick="window.location.href='<?= /* @escapeNotVerified */ $createUrl ?>'">
--        <?= /* @escapeNotVerified */ __('Add New Tax Rule') ?>
-+    <button type="button" onclick="window.location.href='<?= $block->escapeUrl($createUrl) ?>'">
-+        <?= $block->escapeHtml(__('Add New Tax Rule')) ?>
-     </button>
- </div>
-diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
-index 10c0e796ea4..10251e2805f 100644
---- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
-+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
-@@ -3,9 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
-+// @deprecated
- ?>
- <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-     <?= $block->getBackButtonHtml() ?>
-@@ -13,13 +11,13 @@
-     <?= $block->getSaveButtonHtml() ?>
-     <?= $block->getDeleteButtonHtml() ?>
- </div>
--<?php if ($form): ?>
--<?= $form->toHtml() ?>
--<script>
--require(['jquery', "mage/mage"], function(jQuery){
-+<?php if ($form) : ?>
-+    <?= $form->toHtml() ?>
-+    <script>
-+    require(['jquery', "mage/mage"], function(jQuery){
- 
--    jQuery('#<?= /* @escapeNotVerified */ $form->getForm()->getId() ?>').mage('form').mage('validation');
-+        jQuery('#<?= $block->escapeJs($form->getForm()->getId()) ?>').mage('form').mage('validation');
- 
--});
--</script>
-+    });
-+    </script>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js b/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
-deleted file mode 100644
-index a49f199ba56..00000000000
---- a/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
-+++ /dev/null
-@@ -1,15 +0,0 @@
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--define([
--    'jquery',
--    'mage/mage'
--], function (jQuery) {
--    'use strict';
--
--    return function (data, element) {
--        jQuery(element).mage('form').mage('validation');
--    };
--});
-diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
-index c6d3d51ff22..e87d1c9eb96 100644
---- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
-+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
-@@ -3,18 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php /** @var \Magento\Tax\Pricing\Render\Adjustment $block */ ?>
- 
--<?php if ($block->displayBothPrices()): ?>
--    <span id="<?= /* @escapeNotVerified */ $block->buildIdWithPrefix('price-excluding-tax-') ?>"
--          data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>"
--          data-price-amount="<?= /* @escapeNotVerified */ $block->getRawAmount() ?>"
-+<?php if ($block->displayBothPrices()) : ?>
-+    <span id="<?= $block->escapeHtmlAttr($block->buildIdWithPrefix('price-excluding-tax-')) ?>"
-+          data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>"
-+          data-price-amount="<?= /* @noEscape */ $block->getRawAmount() ?>"
-           data-price-type="basePrice"
-           class="price-wrapper price-excluding-tax">
--        <span class="price"><?= /* @escapeNotVerified */ $block->getDisplayAmountExclTax() ?></span></span>
-+        <span class="price"><?= /* @noEscape */ $block->getDisplayAmountExclTax() ?></span></span>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
-index 999af81186f..41430c0fbcf 100644
---- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
-+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
-@@ -3,19 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php /** @var \Magento\Tax\Pricing\Render\Adjustment $block */ ?>
--<?php if ($block->displayPriceIncludingTax()): ?>
--    <?= /* @escapeNotVerified */ $block->getDisplayAmount() ?>
--<?php elseif ($block->displayPriceExcludingTax()): ?>
--    <?= /* @escapeNotVerified */ $block->getDisplayAmountExclTax() ?>
--<?php elseif ($block->displayBothPrices()): ?>
--    <?= /* @escapeNotVerified */ $block->getDisplayAmount() ?>
--    <?php if ($block->getDisplayAmountExclTax() !== $block->getDisplayAmount()): ?>
--        (+<?= /* @escapeNotVerified */ $block->getDisplayAmountExclTax() ?> Excl. Tax)
-+<?php if ($block->displayPriceIncludingTax()) : ?>
-+    <?= /* @noEscape */ $block->getDisplayAmount() ?>
-+<?php elseif ($block->displayPriceExcludingTax()) : ?>
-+    <?= /* @noEscape */ $block->getDisplayAmountExclTax() ?>
-+<?php elseif ($block->displayBothPrices()) : ?>
-+    <?= /* @noEscape */ $block->getDisplayAmount() ?>
-+    <?php if ($block->getDisplayAmountExclTax() !== $block->getDisplayAmount()) : ?>
-+        (+<?= /* @noEscape */ $block->getDisplayAmountExclTax() ?> <?= $block->escapeHtml(__('Excl. Tax')) ?>)
-     <?php endif; ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/base/web/js/price/adjustment.js b/app/code/Magento/Tax/view/base/web/js/price/adjustment.js
-index 9af15f84562..a17d130d928 100644
---- a/app/code/Magento/Tax/view/base/web/js/price/adjustment.js
-+++ b/app/code/Magento/Tax/view/base/web/js/price/adjustment.js
-@@ -62,7 +62,7 @@ define([
-         },
- 
-         /**
--         * Set price taax type.
-+         * Set price tax type.
-          *
-          * @param {String} priceType
-          * @return {Object}
-diff --git a/app/code/Magento/Tax/view/frontend/layout/sales_email_item_price.xml b/app/code/Magento/Tax/view/frontend/layout/sales_email_item_price.xml
-index 0fe801a71b9..5dc1e5c7231 100644
---- a/app/code/Magento/Tax/view/frontend/layout/sales_email_item_price.xml
-+++ b/app/code/Magento/Tax/view/frontend/layout/sales_email_item_price.xml
-@@ -5,7 +5,8 @@
-  * See COPYING.txt for license details.
-  */
- -->
--<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceBlock name="items">
-             <block class="Magento\Tax\Block\Item\Price\Renderer" name="item_price" template="Magento_Tax::email/items/price/row.phtml">
-@@ -16,3 +17,10 @@
-         </referenceBlock>
-     </body>
- </page>
-+
-+
-+
-+
-+
-+
-+
-diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
-index 9395bd47ca3..74db5c24aec 100644
---- a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
-+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
-@@ -4,19 +4,19 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Tax\Block\Item\Price\Renderer */
- ?>
- <?php $_item = $block->getItem() ?>
--    <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
--        <span class="price-wrapper price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
-+    <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
-+        <span class="price-wrapper price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-             <?php $_incl = $_item->getPriceInclTax(); ?>
--            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
-+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($_incl) ?>
-         </span>
-     <?php endif; ?>
--    <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
--        <span class="price-wrapper price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>">
--            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
-+    <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
-+        <span class="price-wrapper price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
-+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()) ?>
-         </span>
-     <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
-index 5bcbde0e24c..df177b61805 100644
---- a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
-+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
-@@ -4,37 +4,41 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /**
-  * @var $block \Magento\Tax\Block\Checkout\Grandtotal
-  */
- ?>
--<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0):?>
--<tr class="grand totals excl">
--    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
--        <strong><?= /* @escapeNotVerified */ __('Grand Total Excl. Tax') ?></strong>
--    </th>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?>">
--        <strong><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotalExclTax()) ?></strong>
--    </td>
--</tr>
--<?= /* @escapeNotVerified */ $block->renderTotals('taxes', $block->getColspan()) ?>
--<tr class="grand totals incl">
--    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
--        <strong><?= /* @escapeNotVerified */ __('Grand Total Incl. Tax') ?></strong>
--    </th>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?>">
--        <strong><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
--    </td>
--</tr>
--<?php else:?>
--<tr class="grand totals">
--    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
--        <strong><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></strong>
--    </th>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
--        <strong><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
--    </td>
--</tr>
--<?php endif;?>
-+<?php
-+$style = $block->escapeHtmlAttr($block->getStyle());
-+$colspan = (int) $block->getColspan();
-+?>
-+<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0) : ?>
-+    <tr class="grand totals excl">
-+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-+            <strong><?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?></strong>
-+        </th>
-+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Excl. Tax')) ?>">
-+            <strong><?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotalExclTax()) ?></strong>
-+        </td>
-+    </tr>
-+    <?= /* @noEscape */ $block->renderTotals('taxes', $colspan) ?>
-+    <tr class="grand totals incl">
-+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-+            <strong><?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?></strong>
-+        </th>
-+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Incl. Tax')) ?>">
-+            <strong><?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?></strong>
-+        </td>
-+    </tr>
-+<?php else : ?>
-+    <tr class="grand totals">
-+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-+            <strong><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></strong>
-+        </th>
-+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-+            <strong><?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?></strong>
-+        </td>
-+    </tr>
-+<?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
-index 203dd720412..3f5a55e5fa3 100644
---- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
-+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
-@@ -4,48 +4,52 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /**
-  * @var $block \Magento\Tax\Block\Checkout\Shipping
-  * @see \Magento\Tax\Block\Checkout\Shipping
-  */
- ?>
--<?php if ($block->displayShipping()):?>
--    <?php if ($block->displayBoth()):?>
-+<?php if ($block->displayShipping()) : ?>
-+    <?php
-+        $style = $block->escapeHtmlAttr($block->getStyle());
-+        $colspan = (int) $block->getColspan();
-+    ?>
-+    <?php if ($block->displayBoth()) : ?>
-     <tr class="totals shipping excl">
--        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
--            <?= /* @escapeNotVerified */ $block->getExcludeTaxLabel() ?>
-+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-+            <?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>
-         </th>
--        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>">
--            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
-+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getExcludeTaxLabel()) ?>">
-+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingExcludeTax()) ?>
-         </td>
-     </tr>
-     <tr class="totals shipping incl">
--        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
--            <?= /* @escapeNotVerified */ $block->getIncludeTaxLabel() ?>
-+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-+            <?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>
-         </th>
--        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>">
--            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
-+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getIncludeTaxLabel()) ?>">
-+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingIncludeTax()) ?>
-         </td>
-     </tr>
-     <?php elseif ($block->displayIncludeTax()) : ?>
-     <tr class="totals shipping incl">
--        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
--            <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
-+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-+            <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-         </th>
--        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
--            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
-+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingIncludeTax()) ?>
-         </td>
-     </tr>
--    <?php else:?>
-+    <?php else : ?>
-     <tr class="totals shipping excl">
--        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-         </th>
--        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
--            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
-+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingExcludeTax()) ?>
-         </td>
-     </tr>
--    <?php endif;?>
-+    <?php endif; ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
-index 2aedc852213..6c91f8cec2d 100644
---- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
-+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
-@@ -3,25 +3,22 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php /** @var $block \Magento\Tax\Block\Checkout\Shipping\Price */ ?>
- 
- <?php $_excl = $block->getShippingPriceExclTax(); ?>
- <?php $_incl = $block->getShippingPriceInclTax(); ?>
--<?php if ($block->displayShippingPriceExclTax()): ?>
--    <span class="price"><?= /* @escapeNotVerified */ $_excl ?></span>
--<?php else: ?>
--<?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
--    <span class="price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
--<?php endif; ?>
--    <span class="price"><?= /* @escapeNotVerified */ $_incl ?></span>
--<?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
--    </span>
--<?php endif; ?>
-+<?php if ($block->displayShippingPriceExclTax()) : ?>
-+    <span class="price"><?= /* @noEscape */ $_excl ?></span>
-+<?php else : ?>
-+    <?php if ($block->displayShippingBothPrices() && $_incl != $_excl) : ?>
-+        <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-+    <?php endif; ?>
-+    <span class="price"><?= /* @noEscape */ $_incl ?></span>
-+    <?php if ($block->displayShippingBothPrices() && $_incl != $_excl) : ?>
-+        </span>
-+    <?php endif; ?>
- <?php endif; ?>
--<?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
--    <span class="price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>"><span class="price"><?= /* @escapeNotVerified */ $_excl ?></span></span>
-+<?php if ($block->displayShippingBothPrices() && $_incl != $_excl) : ?>
-+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>"><span class="price"><?= /* @noEscape */ $_excl ?></span></span>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
-index d295ba7bc7b..010a7b8dcfe 100644
---- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
-+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
-@@ -4,37 +4,41 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /**
-  * @var $block \Magento\Tax\Block\Checkout\Subtotal
-  * @see \Magento\Tax\Block\Checkout\Subtotal
-  */
- ?>
--<?php if ($block->displayBoth()):?>
-+<?php
-+$style = $block->escapeHtmlAttr($block->getStyle());
-+$colspan = (int) $block->getColspan();
-+?>
-+<?php if ($block->displayBoth()) : ?>
- <tr class="totals sub excl">
--    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
--        <?= /* @escapeNotVerified */ __('Subtotal (Excl. Tax)') ?>
-+    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-+        <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
-     </th>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>">
--        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueExclTax()) ?>
-+    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Excl. Tax)')) ?>">
-+        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValueExclTax()) ?>
-     </td>
- </tr>
- <tr class="totals sub incl">
--    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
--        <?= /* @escapeNotVerified */ __('Subtotal (Incl. Tax)') ?>
-+    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-+        <?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
-     </th>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>">
--        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueInclTax()) ?>
-+    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Incl. Tax)')) ?>">
-+        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValueInclTax()) ?>
-     </td>
- </tr>
- <?php else : ?>
- <tr class="totals sub">
--    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
--        <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
-+    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-+        <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-     </th>
--    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
--        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?>
-+    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-+        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?>
-     </td>
- </tr>
--<?php endif;?>
-+<?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
-index 50fa6c425c2..0329db406fa 100644
---- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
-+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /**
-  * @var $block \Magento\Tax\Block\Checkout\Tax
-@@ -13,56 +13,52 @@
- ?>
- <?php
-     $_value = $block->getTotal()->getValue();
--    $_style = $block->getTotal()->getStyle();
--?>
--<?php global $taxIter; $taxIter++; ?>
-+    $_style = $block->escapeHtmlAttr($block->getTotal()->getStyle());
- 
--<?php
-     $attributes = 'class="totals-tax"';
--    if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value != 0) {
--        $attributes = 'class="totals-tax-summary" data-mage-init=\'{"toggleAdvanced": {"selectorsToggleClass": "shown", "baseToggleClass": "expanded", "toggleContainers": ".totals-tax-details"}}\'';
--    }
-+
-+if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() && $_value != 0) {
-+    $attributes = 'class="totals-tax-summary" data-mage-init=\'{"toggleAdvanced": {"selectorsToggleClass": "shown", "baseToggleClass": "expanded", "toggleContainers": ".totals-tax-details"}}\'';
-+}
- ?>
- 
--<tr <?= /* @escapeNotVerified */ $attributes ?>>
--    <th style="<?= /* @escapeNotVerified */ $_style ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
--        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
--            <span class="detailed"><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></span>
--        <?php else: ?>
--            <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
--        <?php endif;?>
-+<tr <?= /* @noEscape */ $attributes ?>>
-+    <th style="<?= /* @noEscape */ $_style ?>" class="mark" colspan="<?= (int) $block->getColspan() ?>" scope="row">
-+        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
-+            <span class="detailed"><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></span>
-+        <?php else : ?>
-+            <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-+        <?php endif; ?>
-     </th>
--    <td style="<?= /* @escapeNotVerified */ $_style ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
--        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_value) ?>
-+    <td style="<?= /* @noEscape */ $_style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-+        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($_value) ?>
-     </td>
- </tr>
- 
--<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value != 0): ?>
--    <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
--        <?php if (isset($info['hidden']) && $info['hidden']) {
--            continue;
--        } ?>
-+<?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() && $_value != 0) : ?>
-+    <?php foreach ($block->getTotal()->getFullInfo() as $info) : ?>
-+        <?php if (isset($info['hidden']) && $info['hidden']) { continue; } ?>
-         <?php $percent = $info['percent']; ?>
-         <?php $amount = $info['amount']; ?>
-         <?php $rates = $info['rates']; ?>
-         <?php $isFirst = 1; ?>
- 
--        <?php foreach ($rates as $rate): ?>
--            <tr class="totals-tax-details details-<?= /* @escapeNotVerified */ $taxIter ?>">
--                <th class="mark" style="<?= /* @escapeNotVerified */ $_style ?>" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-+        <?php foreach ($rates as $rate) : ?>
-+            <tr class="totals-tax-details">
-+                <th class="mark" style="<?= /* @noEscape */ $_style ?>" colspan="<?= (int) $block->getColspan() ?>" scope="row">
-                     <?= $block->escapeHtml($rate['title']) ?>
--                    <?php if (!is_null($rate['percent'])): ?>
--                        (<?= (float)$rate['percent'] ?>%)
-+                    <?php if ($rate['percent'] !== null) : ?>
-+                        (<?= (float) $rate['percent'] ?>%)
-                     <?php endif; ?>
-                 </th>
--                <?php if ($isFirst): ?>
--                    <td style="<?= /* @escapeNotVerified */ $_style ?>" class="amount" rowspan="<?= count($rates) ?>"
--                       data-th="<?= $block->escapeHtml($rate['title']) ?><?php if (!is_null($rate['percent'])): ?>(<?= (float)$rate['percent'] ?>%)<?php endif; ?>">
--                        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount) ?>
-+                <?php if ($isFirst) : ?>
-+                    <td style="<?= /* @noEscape */ $_style ?>" class="amount" rowspan="<?= count($rates) ?>"
-+                       data-th="<?= $block->escapeHtmlAttr($rate['title']) ?><?php if ($rate['percent'] !== null) : ?>(<?= (float) $rate['percent'] ?>%)<?php endif; ?>">
-+                        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($amount) ?>
-                     </td>
-                 <?php endif; ?>
-             </tr>
-             <?php $isFirst = 0; ?>
-         <?php endforeach; ?>
-     <?php endforeach; ?>
--<?php endif;?>
-+<?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
-index bd6841268d5..991fbf9c5c8 100644
---- a/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
-+++ b/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
- /** @var \Magento\Tax\Block\Item\Price\Renderer $block */
-@@ -15,18 +14,18 @@ $_item = $block->getItem();
- $_order = $_item->getOrder();
- ?>
- 
--<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <span class="label"><?= /* @escapeNotVerified */  __('Excl. Tax') ?>:</span>
-+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?= /* @escapeNotVerified */  $_order->formatPrice($_item->getRowTotal()) ?>
-+    <?= /* @noEscape */ $_order->formatPrice($_item->getRowTotal()) ?>
- <?php endif; ?>
- 
- 
--<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <br /><span class="label"><?= /* @escapeNotVerified */  __('Incl. Tax') ?>:</span>
-+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
--    <?= /* @escapeNotVerified */  $_order->formatPrice($_incl) ?>
-+    <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
-+    <?= /* @noEscape */ $_order->formatPrice($_incl) ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
-index 856909cbb42..12aa494f74e 100644
---- a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
-+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
-@@ -4,24 +4,22 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Tax\Block\Item\Price\Renderer */
- 
- $_item = $block->getItem();
- ?>
--<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()): ?>
--    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
-+<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()) : ?>
-+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-         <span class="cart-price">
--            <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotalInclTax()) ?>
-+            <?= /* @noEscape */ $block->formatPrice($_item->getRowTotalInclTax()) ?>
-         </span>
-     </span>
- <?php endif; ?>
- 
--<?php if (($block->displayPriceExclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()): ?>
--    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-+<?php if (($block->displayPriceExclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()) : ?>
-+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
-         <span class="cart-price">
--            <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotal()) ?>
-+            <?= /* @noEscape */ $block->formatPrice($_item->getRowTotal()) ?>
-         </span>
-     </span>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
-index f0066d90241..3356c2514c2 100644
---- a/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
-+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
-@@ -4,10 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Tax\Block\Item\Price\Renderer $block */
- $_item = $block->getItem();
- ?>
- <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
--<?= /* @escapeNotVerified */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
-+<?= /* @noEscape */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
-diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
-index 5fd1fed49c3..e5fd756e2f3 100644
---- a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
-+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
-@@ -4,26 +4,23 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $block \Magento\Tax\Block\Item\Price\Renderer */
- 
- $_item = $block->getItem();
- ?>
--
--<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
--    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
-+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
-+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-         <?php $_incl = $_item->getPriceInclTax(); ?>
-         <span class="cart-price">
--            <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
-+            <?= /* @noEscape */ $block->formatPrice($_incl) ?>
-         </span>
-     </span>
- <?php endif; ?>
- 
--<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
--    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
-+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
-         <span class="cart-price">
--            <?= /* @escapeNotVerified */ $block->formatPrice($block->getItemDisplayPriceExclTax()) ?>
-+            <?= /* @noEscape */ $block->formatPrice($block->getItemDisplayPriceExclTax()) ?>
-         </span>
-     </span>
- <?php endif; ?>
-diff --git a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
-index b329f00973b..6115ed5ee93 100644
---- a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
-+++ b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
-@@ -4,54 +4,55 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
-+// phpcs:disable Squiz.PHP.GlobalKeyword.NotAllowed
- ?>
- <?php
-     $_order  = $block->getOrder();
-     $_source = $block->getSource();
--    $_fullInfo = $this->helper('Magento\Tax\Helper\Data')->getCalculatedTaxes($_source);
--    global $taxIter; $taxIter++;
-+    $_fullInfo = $this->helper(\Magento\Tax\Helper\Data::class)->getCalculatedTaxes($_source);
-+    global $taxIter;
-+    $taxIter++;
- ?>
- 
--<?php if ($_fullInfo && $block->displayFullSummary()): ?>
--        <?php foreach ($_fullInfo as $info): ?>
-+<?php if ($_fullInfo && $block->displayFullSummary()) : ?>
-+        <?php foreach ($_fullInfo as $info) : ?>
-             <?php
-                 $percent    = $info['percent'];
-                 $amount     = $info['tax_amount'];
-                 $baseAmount = $info['base_tax_amount'];
-                 $title      = $info['title'];
-             ?>
--            <tr class="totals tax details details-<?= /* @escapeNotVerified */ $taxIter ?> <?= ($block->getIsPlaneMode()) ? ' plane' : '' ?>">
--                <td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?>>
-+            <tr class="totals tax details details-<?= (int) $taxIter ?><?= ($block->getIsPlaneMode()) ? ' plane' : '' ?>">
-+                <td <?= /* @noEscape */ $block->getLabelProperties() ?>>
-                     <?= $block->escapeHtml($title) ?>
--                    <?php if (!is_null($percent)): ?>
--                        (<?= (float)$percent ?>%)
-+                    <?php if ($percent !== null) : ?>
-+                        (<?= (float) $percent ?>%)
-                     <?php endif; ?>
-                     <br />
-                 </td>
--                <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?> rowspan="1">
--                    <?= /* @escapeNotVerified */ $_order->formatPrice($amount) ?>
-+                <td <?= /* @noEscape */ $block->getValueProperties() ?> rowspan="1">
-+                    <?= /* @noEscape */ $_order->formatPrice($amount) ?>
-                 </td>
-             </tr>
-         <?php endforeach; ?>
--<?php endif;?>
-+<?php endif; ?>
- 
--<?php if ($block->displayFullSummary() && $_fullInfo && !$block->getIsPlaneMode()): ?>
-+<?php if ($block->displayFullSummary() && $_fullInfo && !$block->getIsPlaneMode()) : ?>
- <tr class="totals-tax-summary">
--<?php elseif ($block->displayFullSummary() && $_fullInfo && $block->getIsPlaneMode()): ?>
-+<?php elseif ($block->displayFullSummary() && $_fullInfo && $block->getIsPlaneMode()) : ?>
- <tr class="totals-tax-summary plane">
--<?php else: ?>
-+<?php else : ?>
- <tr class="totals-tax">
- <?php endif; ?>
--    <th <?= /* @escapeNotVerified */ $block->getLabelProperties() ?> scope="row">
--        <?php if ($block->displayFullSummary()): ?>
--            <div class="detailed"><?= /* @escapeNotVerified */ __('Tax') ?></div>
--        <?php else: ?>
--            <?= /* @escapeNotVerified */ __('Tax') ?>
--        <?php endif;?>
-+    <th <?= /* @noEscape */ $block->getLabelProperties() ?> scope="row">
-+        <?php if ($block->displayFullSummary()) : ?>
-+            <div class="detailed"><?= $block->escapeHtml(__('Tax')) ?></div>
-+        <?php else : ?>
-+            <?= $block->escapeHtml(__('Tax')) ?>
-+        <?php endif; ?>
-     </th>
--    <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtml(__('Tax')) ?>">
--        <?= /* @escapeNotVerified */ $_order->formatPrice($_source->getTaxAmount()) ?>
-+    <td <?= /* @noEscape */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtmlAttr(__('Tax')) ?>">
-+        <?= /* @noEscape */ $_order->formatPrice($_source->getTaxAmount()) ?>
-     </td>
- </tr>
-diff --git a/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js b/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
-index c86c3b4d1ab..2b1f387f5c8 100644
---- a/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
-+++ b/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
-@@ -11,18 +11,22 @@ define([
-     'ko',
-     'Magento_Checkout/js/view/summary/abstract-total',
-     'Magento_Checkout/js/model/quote',
--    'Magento_Checkout/js/model/totals'
--], function (ko, Component, quote, totals) {
-+    'Magento_Checkout/js/model/totals',
-+    'mage/translate',
-+    'underscore'
-+], function (ko, Component, quote, totals, $t, _) {
-     'use strict';
- 
-     var isTaxDisplayedInGrandTotal = window.checkoutConfig.includeTaxInGrandTotal,
-         isFullTaxSummaryDisplayed = window.checkoutConfig.isFullTaxSummaryDisplayed,
--        isZeroTaxDisplayed = window.checkoutConfig.isZeroTaxDisplayed;
-+        isZeroTaxDisplayed = window.checkoutConfig.isZeroTaxDisplayed,
-+        taxAmount = 0,
-+        rates = 0;
- 
-     return Component.extend({
-         defaults: {
-             isTaxDisplayedInGrandTotal: isTaxDisplayedInGrandTotal,
--            notCalculatedMessage: 'Not yet calculated',
-+            notCalculatedMessage: $t('Not yet calculated'),
-             template: 'Magento_Tax/checkout/summary/tax'
-         },
-         totals: quote.getTotals(),
-@@ -97,6 +101,33 @@ define([
-             return this.getFormattedPrice(amount);
-         },
- 
-+        /**
-+         * @param {*} parent
-+         * @param {*} percentage
-+         * @return {*|String}
-+         */
-+        getTaxAmount: function (parent, percentage) {
-+            var totalPercentage = 0;
-+
-+            taxAmount = parent.amount;
-+            rates = parent.rates;
-+            _.each(rates, function (rate) {
-+                totalPercentage += parseFloat(rate.percent);
-+            });
-+
-+            return this.getFormattedPrice(this.getPercentAmount(taxAmount, totalPercentage, percentage));
-+        },
-+
-+        /**
-+         * @param {*} amount
-+         * @param {*} totalPercentage
-+         * @param {*} percentage
-+         * @return {*|String}
-+         */
-+        getPercentAmount: function (amount, totalPercentage, percentage) {
-+            return parseFloat(amount * percentage / totalPercentage);
-+        },
-+
-         /**
-          * @return {Array}
-          */
-diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html
-index 9c45e73db6f..45c468096ab 100644
---- a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html
-+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html
-@@ -32,18 +32,16 @@
-             <!-- ko if: !percent -->
-                 <th class="mark" scope="row" colspan="1" data-bind="text: title"></th>
-             <!-- /ko -->
--            <!-- ko if: $index() == 0 -->
--                <td class="amount" rowspan="1">
--                    <!-- ko if: $parents[1].isCalculated() -->
--                    <span class="price"
--                          data-bind="text: $parents[1].formatPrice($parents[0].amount), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
--                    <!-- /ko -->
--                    <!-- ko ifnot: $parents[1].isCalculated() -->
--                    <span class="not-calculated"
--                          data-bind="text: $parents[1].formatPrice($parents[0].amount), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
--                    <!-- /ko -->
--                </td>
--            <!-- /ko -->
-+            <td class="amount" rowspan="1">
-+                <!-- ko if: $parents[1].isCalculated() -->
-+                <span class="price"
-+                      data-bind="text: $parents[1].getTaxAmount($parents[0], percent), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
-+                <!-- /ko -->
-+                <!-- ko ifnot: $parents[1].isCalculated() -->
-+                <span class="not-calculated"
-+                      data-bind="text: $parents[1].getTaxAmount($parents[0], percent), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
-+                <!-- /ko -->
-+            </td>
-         </tr>
-         <!-- /ko -->
-     <!-- /ko -->
-diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
-index 0f2e3251bcf..5f1ac86e38f 100644
---- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
-+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
-@@ -43,18 +43,16 @@
-             <!-- ko if: !percent -->
-                 <th class="mark" scope="row" data-bind="text: title"></th>
-             <!-- /ko -->
--            <!-- ko if: $index() == 0 -->
--                <td class="amount">
--                    <!-- ko if: $parents[1].isCalculated() -->
--                    <span class="price"
--                          data-bind="text: $parents[1].formatPrice($parents[0].amount), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
--                    <!-- /ko -->
--                    <!-- ko ifnot: $parents[1].isCalculated() -->
--                    <span class="not-calculated"
--                          data-bind="text: $parents[1].formatPrice($parents[0].amount), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
--                    <!-- /ko -->
--                </td>
--            <!-- /ko -->
-+            <td class="amount">
-+                <!-- ko if: $parents[1].isCalculated() -->
-+                <span class="price"
-+                      data-bind="text: $parents[1].getTaxAmount($parents[0], percent), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
-+                <!-- /ko -->
-+                <!-- ko ifnot: $parents[1].isCalculated() -->
-+                <span class="not-calculated"
-+                      data-bind="text: $parents[1].getTaxAmount($parents[0], percent), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
-+                <!-- /ko -->
-+            </td>
-         </tr>
-         <!-- /ko -->
-     <!-- /ko -->
-diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php
-index 929c9db01a2..4264f5c3b77 100644
---- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php
-+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php
-@@ -5,9 +5,10 @@
-  */
- namespace Magento\TaxImportExport\Controller\Adminhtml\Rate;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\Controller\ResultFactory;
- 
--class ImportExport extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
-+class ImportExport extends \Magento\TaxImportExport\Controller\Adminhtml\Rate implements HttpGetActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/TaxImportExport/etc/acl.xml b/app/code/Magento/TaxImportExport/etc/acl.xml
-index 35c811e8441..7a7ac167432 100644
---- a/app/code/Magento/TaxImportExport/etc/acl.xml
-+++ b/app/code/Magento/TaxImportExport/etc/acl.xml
-@@ -11,7 +11,7 @@
-             <resource id="Magento_Backend::admin">
-                 <resource id="Magento_Backend::system">
-                     <resource id="Magento_Backend::convert">
--                        <resource id="Magento_TaxImportExport::import_export" title="Import/Export Tax Rates" sortOrder="30" />
-+                        <resource id="Magento_TaxImportExport::import_export" title="Import/Export Tax Rates" translate="title" sortOrder="30" />
-                     </resource>
-                 </resource>
-             </resource>
-diff --git a/app/code/Magento/TaxImportExport/i18n/en_US.csv b/app/code/Magento/TaxImportExport/i18n/en_US.csv
-index 40db8846b54..95f94dcfd3b 100644
---- a/app/code/Magento/TaxImportExport/i18n/en_US.csv
-+++ b/app/code/Magento/TaxImportExport/i18n/en_US.csv
-@@ -17,3 +17,4 @@ Rate,Rate
- "Export Tax Rates","Export Tax Rates"
- CSV,CSV
- "Excel XML","Excel XML"
-+"Import/Export Tax Rates","Import/Export Tax Rates"
-diff --git a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
-index f1d41e0c969..7473612252b 100644
---- a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
-+++ b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
-@@ -4,24 +4,30 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+/** @var $block \Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport */
- ?>
- <div class="import-export-tax-rates">
--    <?php if (!$block->getIsReadonly()): ?>
-+    <?php if (!$block->getIsReadonly()) :?>
-     <div class="import-tax-rates">
--        <?php if ($block->getUseContainer()): ?>
--        <form id="import-form" class="admin__fieldset" action="<?= /* @escapeNotVerified */ $block->getUrl('tax/rate/importPost') ?>" method="post" enctype="multipart/form-data">
-+        <?php if ($block->getUseContainer()) :?>
-+        <form id="import-form"
-+              class="admin__fieldset"
-+              action="<?= $block->escapeUrl($block->getUrl('tax/rate/importPost')) ?>"
-+              method="post"
-+              enctype="multipart/form-data">
-         <?php endif; ?>
-             <?= $block->getBlockHtml('formkey') ?>
-             <div class="fieldset admin__field">
--                <label for="import_rates_file" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Import Tax Rates') ?></span></label>
-+                <label for="import_rates_file" class="admin__field-label"><span><?= $block->escapeHtml(__('Import Tax Rates')) ?></span></label>
-                 <div class="admin__field-control">
--                    <input type="file" id="import_rates_file" name="import_rates_file" class="input-file required-entry"/>
-+                    <input type="file"
-+                           id="import_rates_file"
-+                           name="import_rates_file"
-+                           class="input-file required-entry"/>
-                     <?= $block->getButtonHtml(__('Import Tax Rates'), '', 'import-submit') ?>
-                 </div>
-             </div>
--        <?php if ($block->getUseContainer()): ?>
-+        <?php if ($block->getUseContainer()) :?>
-         </form>
-         <?php endif; ?>
-         <script>
-@@ -44,18 +50,22 @@ require(['jquery', "mage/mage", "loadingPopup"], function(jQuery){
- </script>
-     </div>
-     <?php endif; ?>
--    <div class="export-tax-rates <?php if ($block->getIsReadonly()): ?>box-left<?php else: ?>box-right<?php endif; ?>">
--        <?php if ($block->getUseContainer()): ?>
--        <form id="export_form" class="admin__fieldset" action="<?= /* @escapeNotVerified */ $block->getUrl('tax/rate/exportPost') ?>" method="post" enctype="multipart/form-data">
-+    <div class="export-tax-rates <?= ($block->getIsReadonly()) ? 'box-left' : 'box-right' ?>">
-+        <?php if ($block->getUseContainer()) :?>
-+        <form id="export_form"
-+              class="admin__fieldset"
-+              action="<?= $block->escapeUrl($block->getUrl('tax/rate/exportPost')) ?>"
-+              method="post"
-+              enctype="multipart/form-data">
-         <?php endif; ?>
-             <?= $block->getBlockHtml('formkey') ?>
-             <div class="fieldset admin__field">
--                <span class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Export Tax Rates') ?></span></span>
-+                <span class="admin__field-label"><span><?= $block->escapeHtml(__('Export Tax Rates')) ?></span></span>
-                 <div class="admin__field-control">
-                     <?= $block->getButtonHtml(__('Export Tax Rates'), "this.form.submit()") ?>
-                 </div>
-             </div>
--        <?php if ($block->getUseContainer()): ?>
-+        <?php if ($block->getUseContainer()) :?>
-         </form>
-         <?php endif; ?>
-     </div>
-diff --git a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExportHeader.phtml b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExportHeader.phtml
-index 223b3e9888e..75f04eae821 100644
---- a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExportHeader.phtml
-+++ b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExportHeader.phtml
-@@ -2,4 +2,4 @@
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-- */;
-+ */
-diff --git a/app/code/Magento/Theme/Block/Html/Header/CriticalCss.php b/app/code/Magento/Theme/Block/Html/Header/CriticalCss.php
-new file mode 100644
-index 00000000000..34c7c301ba8
---- /dev/null
-+++ b/app/code/Magento/Theme/Block/Html/Header/CriticalCss.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Theme\Block\Html\Header;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\View\Element\Block\ArgumentInterface;
-+use Magento\Framework\View\Asset\Repository;
-+use Magento\Framework\View\Asset\File\NotFoundException;
-+
-+/**
-+ * This ViewModel will add inline critical css in case dev/css/use_css_critical_path is enabled.
-+ */
-+class CriticalCss implements ArgumentInterface
-+{
-+    /**
-+     * @var Repository
-+     */
-+    private $assetRepo;
-+
-+    /**
-+     * @var $filePath
-+     */
-+    private $filePath;
-+
-+    /**
-+     * @param Repository $assetRepo
-+     * @param string $filePath
-+     */
-+    public function __construct(
-+        Repository $assetRepo,
-+        string $filePath = ''
-+    ) {
-+        $this->assetRepo = $assetRepo;
-+        $this->filePath = $filePath;
-+    }
-+
-+    /**
-+     * Returns critical css data as string.
-+     *
-+     * @return bool|string
-+     */
-+    public function getCriticalCssData()
-+    {
-+        try {
-+            $asset = $this->assetRepo->createAsset($this->filePath, ['_secure' => 'false']);
-+            $content = $asset->getContent();
-+        } catch (LocalizedException | NotFoundException $e) {
-+            $content = '';
-+        }
-+
-+        return $content;
-+    }
-+}
-diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php
-index 0a0e71f44ba..b51f624c203 100644
---- a/app/code/Magento/Theme/Block/Html/Header/Logo.php
-+++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php
-@@ -43,6 +43,10 @@ class Logo extends \Magento\Framework\View\Element\Template
-     /**
-      * Check if current url is url for home page
-      *
-+     * @deprecated This function is no longer used. It was previously used by
-+     * Magento/Theme/view/frontend/templates/html/header/logo.phtml
-+     * to check if the logo should be clickable on the homepage.
-+     *
-      * @return bool
-      */
-     public function isHomePage()
-diff --git a/app/code/Magento/Theme/Block/Html/Pager.php b/app/code/Magento/Theme/Block/Html/Pager.php
-index d4cfe544f47..ad3f4aad676 100644
---- a/app/code/Magento/Theme/Block/Html/Pager.php
-+++ b/app/code/Magento/Theme/Block/Html/Pager.php
-@@ -184,6 +184,8 @@ class Pager extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Returns data collection
-+     *
-      * @return \Magento\Framework\Data\Collection
-      */
-     public function getCollection()
-@@ -192,7 +194,10 @@ class Pager extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Set page variable name
-+     *
-      * @param string $varName
-+     *
-      * @return $this
-      */
-     public function setPageVarName($varName)
-@@ -202,6 +207,8 @@ class Pager extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get page variable name
-+     *
-      * @return string
-      */
-     public function getPageVarName()
-@@ -210,7 +217,10 @@ class Pager extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Set show per page param
-+     *
-      * @param bool $varName
-+     *
-      * @return $this
-      */
-     public function setShowPerPage($varName)
-@@ -220,6 +230,8 @@ class Pager extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Is show per page
-+     *
-      * @return bool
-      */
-     public function isShowPerPage()
-@@ -234,6 +246,7 @@ class Pager extends \Magento\Framework\View\Element\Template
-      * Set the name for pager limit data
-      *
-      * @param string $varName
-+     *
-      * @return $this
-      */
-     public function setLimitVarName($varName)
-@@ -275,6 +288,8 @@ class Pager extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get first number
-+     *
-      * @return int
-      */
-     public function getFirstNum()
-@@ -284,6 +299,8 @@ class Pager extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get last number
-+     *
-      * @return int
-      */
-     public function getLastNum()
-@@ -333,7 +350,10 @@ class Pager extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Is limit current
-+     *
-      * @param int $limit
-+     *
-      * @return bool
-      */
-     public function isLimitCurrent($limit)
-@@ -342,7 +362,10 @@ class Pager extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Is page current
-+     *
-      * @param int $page
-+     *
-      * @return bool
-      */
-     public function isPageCurrent($page)
-@@ -351,6 +374,8 @@ class Pager extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get pages
-+     *
-      * @return array
-      */
-     public function getPages()
-@@ -377,6 +402,8 @@ class Pager extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get first page url
-+     *
-      * @return string
-      */
-     public function getFirstPageUrl()
-@@ -418,6 +445,7 @@ class Pager extends \Magento\Framework\View\Element\Template
-      * Retrieve page URL
-      *
-      * @param string $page
-+     *
-      * @return string
-      */
-     public function getPageUrl($page)
-@@ -426,7 +454,10 @@ class Pager extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get limit url
-+     *
-      * @param int $limit
-+     *
-      * @return string
-      */
-     public function getLimitUrl($limit)
-@@ -438,6 +469,7 @@ class Pager extends \Magento\Framework\View\Element\Template
-      * Retrieve page URL by defined parameters
-      *
-      * @param array $params
-+     *
-      * @return string
-      */
-     public function getPagerUrl($params = [])
-@@ -453,6 +485,8 @@ class Pager extends \Magento\Framework\View\Element\Template
-     }
- 
-     /**
-+     * Get path
-+     *
-      * @return string
-      */
-     protected function getPath()
-@@ -580,7 +614,7 @@ class Pager extends \Magento\Framework\View\Element\Template
-      */
-     public function setFrameLength($frame)
-     {
--        $frame = abs(intval($frame));
-+        $frame = abs((int)$frame);
-         if ($frame == 0) {
-             $frame = $this->_frameLength;
-         }
-@@ -600,7 +634,7 @@ class Pager extends \Magento\Framework\View\Element\Template
-      */
-     public function setJump($jump)
-     {
--        $jump = abs(intval($jump));
-+        $jump = abs((int)$jump);
-         if ($this->getJump() != $jump) {
-             $this->_setFrameInitialized(false);
-             $this->_jump = $jump;
-diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php
-index 0dca0f8606a..fe5fe686e48 100644
---- a/app/code/Magento/Theme/Block/Html/Topmenu.php
-+++ b/app/code/Magento/Theme/Block/Html/Topmenu.php
-@@ -5,9 +5,12 @@
-  */
- namespace Magento\Theme\Block\Html;
- 
-+use Magento\Backend\Model\Menu;
- use Magento\Framework\Data\Tree\Node;
-+use Magento\Framework\Data\Tree\Node\Collection;
- use Magento\Framework\Data\Tree\NodeFactory;
- use Magento\Framework\Data\TreeFactory;
-+use Magento\Framework\DataObject;
- use Magento\Framework\DataObject\IdentityInterface;
- use Magento\Framework\View\Element\Template;
- 
-@@ -29,7 +32,7 @@ class Topmenu extends Template implements IdentityInterface
-     /**
-      * Top menu data tree
-      *
--     * @var \Magento\Framework\Data\Tree\Node
-+     * @var Node
-      */
-     protected $_menu;
- 
-@@ -71,6 +74,16 @@ class Topmenu extends Template implements IdentityInterface
-         return parent::getCacheLifetime() ?: 3600;
-     }
- 
-+    /**
-+     * Get cache key informative items
-+     *
-+     * @return array
-+     */
-+    public function getCacheKeyInfo()
-+    {
-+        return array_merge(parent::getCacheKeyInfo(), $this->getIdentities());
-+    }
-+
-     /**
-      * Get top menu html
-      *
-@@ -89,28 +102,35 @@ class Topmenu extends Template implements IdentityInterface
-         $this->getMenu()->setOutermostClass($outermostClass);
-         $this->getMenu()->setChildrenWrapClass($childrenWrapClass);
- 
--        $html = $this->_getHtml($this->getMenu(), $childrenWrapClass, $limit);
-+        $transportObject = new DataObject(
-+            [
-+                'html' => $this->_getHtml(
-+                    $this->getMenu(),
-+                    $childrenWrapClass,
-+                    $limit
-+                )
-+            ]
-+        );
- 
--        $transportObject = new \Magento\Framework\DataObject(['html' => $html]);
-         $this->_eventManager->dispatch(
-             'page_block_html_topmenu_gethtml_after',
-             ['menu' => $this->getMenu(), 'transportObject' => $transportObject]
-         );
--        $html = $transportObject->getHtml();
--        return $html;
-+
-+        return $transportObject->getHtml();
-     }
- 
-     /**
-      * Count All Subnavigation Items
-      *
--     * @param \Magento\Backend\Model\Menu $items
-+     * @param Menu $items
-      * @return int
-      */
-     protected function _countItems($items)
-     {
-         $total = $items->count();
-         foreach ($items as $item) {
--            /** @var $item \Magento\Backend\Model\Menu\Item */
-+            /** @var $item Menu\Item */
-             if ($item->hasChildren()) {
-                 $total += $this->_countItems($item->getChildren());
-             }
-@@ -121,7 +141,7 @@ class Topmenu extends Template implements IdentityInterface
-     /**
-      * Building Array with Column Brake Stops
-      *
--     * @param \Magento\Backend\Model\Menu $items
-+     * @param Menu $items
-      * @param int $limit
-      * @return array|void
-      *
-@@ -164,7 +184,7 @@ class Topmenu extends Template implements IdentityInterface
-     /**
-      * Add sub menu HTML code for current menu item
-      *
--     * @param \Magento\Framework\Data\Tree\Node $child
-+     * @param Node $child
-      * @param string $childLevel
-      * @param string $childrenWrapClass
-      * @param int $limit
-@@ -192,17 +212,14 @@ class Topmenu extends Template implements IdentityInterface
-     /**
-      * Recursively generates top menu html from data that is specified in $menuTree
-      *
--     * @param \Magento\Framework\Data\Tree\Node $menuTree
-+     * @param Node $menuTree
-      * @param string $childrenWrapClass
-      * @param int $limit
-      * @param array $colBrakes
-      * @return string
--     *
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-     protected function _getHtml(
--        \Magento\Framework\Data\Tree\Node $menuTree,
-+        Node $menuTree,
-         $childrenWrapClass,
-         $limit,
-         array $colBrakes = []
-@@ -210,41 +227,31 @@ class Topmenu extends Template implements IdentityInterface
-         $html = '';
- 
-         $children = $menuTree->getChildren();
--        $parentLevel = $menuTree->getLevel();
--        $childLevel = $parentLevel === null ? 0 : $parentLevel + 1;
-+        $childLevel = $this->getChildLevel($menuTree->getLevel());
-+        $this->removeChildrenWithoutActiveParent($children, $childLevel);
- 
-         $counter = 1;
--        $itemPosition = 1;
-         $childrenCount = $children->count();
- 
-         $parentPositionClass = $menuTree->getPositionClass();
-         $itemPositionClassPrefix = $parentPositionClass ? $parentPositionClass . '-' : 'nav-';
- 
--        /** @var \Magento\Framework\Data\Tree\Node $child */
-+        /** @var Node $child */
-         foreach ($children as $child) {
--            if ($childLevel === 0 && $child->getData('is_parent_active') === false) {
--                continue;
--            }
-             $child->setLevel($childLevel);
--            $child->setIsFirst($counter == 1);
--            $child->setIsLast($counter == $childrenCount);
-+            $child->setIsFirst($counter === 1);
-+            $child->setIsLast($counter === $childrenCount);
-             $child->setPositionClass($itemPositionClassPrefix . $counter);
- 
-             $outermostClassCode = '';
-             $outermostClass = $menuTree->getOutermostClass();
- 
--            if ($childLevel == 0 && $outermostClass) {
-+            if ($childLevel === 0 && $outermostClass) {
-                 $outermostClassCode = ' class="' . $outermostClass . '" ';
--                $currentClass = $child->getClass();
--
--                if (empty($currentClass)) {
--                    $child->setClass($outermostClass);
--                } else {
--                    $child->setClass($currentClass . ' ' . $outermostClass);
--                }
-+                $this->setCurrentClass($child, $outermostClass);
-             }
- 
--            if (is_array($colBrakes) && count($colBrakes) && $colBrakes[$counter]['colbrake']) {
-+            if ($this->shouldAddNewColumn($colBrakes, $counter)) {
-                 $html .= '</ul></li><li class="column"><ul>';
-             }
- 
-@@ -257,11 +264,10 @@ class Topmenu extends Template implements IdentityInterface
-                 $childrenWrapClass,
-                 $limit
-             ) . '</li>';
--            $itemPosition++;
-             $counter++;
-         }
- 
--        if (is_array($colBrakes) && count($colBrakes) && $limit) {
-+        if (is_array($colBrakes) && !empty($colBrakes) && $limit) {
-             $html = '<li class="column"><ul>' . $html . '</ul></li>';
-         }
- 
-@@ -271,14 +277,13 @@ class Topmenu extends Template implements IdentityInterface
-     /**
-      * Generates string with all attributes that should be present in menu item element
-      *
--     * @param \Magento\Framework\Data\Tree\Node $item
-+     * @param Node $item
-      * @return string
-      */
--    protected function _getRenderedMenuItemAttributes(\Magento\Framework\Data\Tree\Node $item)
-+    protected function _getRenderedMenuItemAttributes(Node $item)
-     {
-         $html = '';
--        $attributes = $this->_getMenuItemAttributes($item);
--        foreach ($attributes as $attributeName => $attributeValue) {
-+        foreach ($this->_getMenuItemAttributes($item) as $attributeName => $attributeValue) {
-             $html .= ' ' . $attributeName . '="' . str_replace('"', '\"', $attributeValue) . '"';
-         }
-         return $html;
-@@ -287,27 +292,26 @@ class Topmenu extends Template implements IdentityInterface
-     /**
-      * Returns array of menu item's attributes
-      *
--     * @param \Magento\Framework\Data\Tree\Node $item
-+     * @param Node $item
-      * @return array
-      */
--    protected function _getMenuItemAttributes(\Magento\Framework\Data\Tree\Node $item)
-+    protected function _getMenuItemAttributes(Node $item)
-     {
--        $menuItemClasses = $this->_getMenuItemClasses($item);
--        return ['class' => implode(' ', $menuItemClasses)];
-+        return ['class' => implode(' ', $this->_getMenuItemClasses($item))];
-     }
- 
-     /**
-      * Returns array of menu item's classes
-      *
--     * @param \Magento\Framework\Data\Tree\Node $item
-+     * @param Node $item
-      * @return array
-      */
--    protected function _getMenuItemClasses(\Magento\Framework\Data\Tree\Node $item)
-+    protected function _getMenuItemClasses(Node $item)
-     {
--        $classes = [];
--
--        $classes[] = 'level' . $item->getLevel();
--        $classes[] = $item->getPositionClass();
-+        $classes = [
-+            'level' . $item->getLevel(),
-+            $item->getPositionClass(),
-+        ];
- 
-         if ($item->getIsCategory()) {
-             $classes[] = 'category-item';
-@@ -361,19 +365,6 @@ class Topmenu extends Template implements IdentityInterface
-         return $this->identities;
-     }
- 
--    /**
--     * Get cache key informative items
--     *
--     * @return array
--     * @since 100.1.0
--     */
--    public function getCacheKeyInfo()
--    {
--        $keyInfo = parent::getCacheKeyInfo();
--        $keyInfo[] = $this->getUrl('*/*/*', ['_current' => true, '_query' => '']);
--        return $keyInfo;
--    }
--
-     /**
-      * Get tags array for saving cache
-      *
-@@ -388,7 +379,7 @@ class Topmenu extends Template implements IdentityInterface
-     /**
-      * Get menu object.
-      *
--     * Creates \Magento\Framework\Data\Tree\Node root node object.
-+     * Creates Tree root node object.
-      * The creation logic was moved from class constructor into separate method.
-      *
-      * @return Node
-@@ -407,4 +398,61 @@ class Topmenu extends Template implements IdentityInterface
-         }
-         return $this->_menu;
-     }
-+
-+    /**
-+     * Remove children from collection when the parent is not active
-+     *
-+     * @param Collection $children
-+     * @param int $childLevel
-+     * @return void
-+     */
-+    private function removeChildrenWithoutActiveParent(Collection $children, int $childLevel): void
-+    {
-+        /** @var Node $child */
-+        foreach ($children as $child) {
-+            if ($childLevel === 0 && $child->getData('is_parent_active') === false) {
-+                $children->delete($child);
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Retrieve child level based on parent level
-+     *
-+     * @param int $parentLevel
-+     *
-+     * @return int
-+     */
-+    private function getChildLevel($parentLevel): int
-+    {
-+        return $parentLevel === null ? 0 : $parentLevel + 1;
-+    }
-+
-+    /**
-+     * Check if new column should be added.
-+     *
-+     * @param array $colBrakes
-+     * @param int $counter
-+     * @return bool
-+     */
-+    private function shouldAddNewColumn(array $colBrakes, int $counter): bool
-+    {
-+        return count($colBrakes) && $colBrakes[$counter]['colbrake'];
-+    }
-+
-+    /**
-+     * Set current class.
-+     *
-+     * @param Node $child
-+     * @param string $outermostClass
-+     */
-+    private function setCurrentClass(Node $child, string $outermostClass): void
-+    {
-+        $currentClass = $child->getClass();
-+        if (empty($currentClass)) {
-+            $child->setClass($outermostClass);
-+        } else {
-+            $child->setClass($currentClass . ' ' . $outermostClass);
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php
-index d51fd658075..1a136cca4d6 100644
---- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php
-+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php
-@@ -6,11 +6,13 @@
-  */
- namespace Magento\Theme\Controller\Adminhtml\System\Design\Theme;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
- /**
-  * Class Index
-  * @deprecated 100.2.0
-  */
--class Index extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
-+class Index extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme implements HttpGetActionInterface
- {
-     /**
-      * Index action
-diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
-index e87e70e21b9..89636ad3de5 100644
---- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
-+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
-@@ -4,19 +4,21 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Theme\Controller\Adminhtml\System\Design\Theme;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+
- /**
-  * Class UploadJs
-  * @deprecated
-  */
--class UploadJs extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
-+class UploadJs extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme implements HttpGetActionInterface
- {
-     /**
-      * Upload js file
-      *
-      * @return void
--     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function execute()
-     {
-@@ -50,6 +52,7 @@ class UploadJs extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
-                 \Magento\Framework\View\Design\Theme\Customization\File\Js::TYPE
-             );
-             $result = ['error' => false, 'files' => $customization->generateFileInfo($customJsFiles)];
-+            // phpcs:disable Magento2.Exceptions.ThrowCatch
-         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-             $result = ['error' => true, 'message' => $e->getMessage()];
-         } catch (\Exception $e) {
-diff --git a/app/code/Magento/Theme/Controller/Result/AsyncCssPlugin.php b/app/code/Magento/Theme/Controller/Result/AsyncCssPlugin.php
-new file mode 100644
-index 00000000000..a3f054d7c8d
---- /dev/null
-+++ b/app/code/Magento/Theme/Controller/Result/AsyncCssPlugin.php
-@@ -0,0 +1,79 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Theme\Controller\Result;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Framework\App\Response\Http;
-+
-+/**
-+ * Plugin for asynchronous CSS loading.
-+ */
-+class AsyncCssPlugin
-+{
-+    private const XML_PATH_USE_CSS_CRITICAL_PATH = 'dev/css/use_css_critical_path';
-+
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @param ScopeConfigInterface $scopeConfig
-+     */
-+    public function __construct(ScopeConfigInterface $scopeConfig)
-+    {
-+        $this->scopeConfig = $scopeConfig;
-+    }
-+
-+    /**
-+     * Load CSS asynchronously if it is enabled in configuration.
-+     *
-+     * @param Http $subject
-+     * @return void
-+     */
-+    public function beforeSendResponse(Http $subject): void
-+    {
-+        $content = $subject->getContent();
-+
-+        if (\is_string($content) && strpos($content, '</body') !== false && $this->scopeConfig->isSetFlag(
-+            self::XML_PATH_USE_CSS_CRITICAL_PATH,
-+            ScopeInterface::SCOPE_STORE
-+        )) {
-+            $cssMatches = [];
-+            // add link rel preload to style sheets
-+            $content = preg_replace_callback(
-+                '@<link\b.*?rel=("|\')stylesheet\1.*?/>@',
-+                function ($matches) use (&$cssMatches) {
-+                    $cssMatches[] = $matches[0];
-+                    preg_match('@href=("|\')(.*?)\1@', $matches[0], $hrefAttribute);
-+                    $href = $hrefAttribute[2];
-+                    if (preg_match('@media=("|\')(.*?)\1@', $matches[0], $mediaAttribute)) {
-+                        $media = $mediaAttribute[2];
-+                    }
-+                    $media = $media ?? 'all';
-+                    $loadCssAsync = sprintf(
-+                        '<link rel="preload" as="style" media="%s" .
-+                         onload="this.onload=null;this.rel=\'stylesheet\'"' .
-+                        'href="%s">',
-+                        $media,
-+                        $href
-+                    );
-+
-+                    return $loadCssAsync;
-+                },
-+                $content
-+            );
-+
-+            if (!empty($cssMatches)) {
-+                $content = str_replace('</body', implode("\n", $cssMatches) . "\n</body", $content);
-+                $subject->setContent($content);
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
-new file mode 100644
-index 00000000000..ff5f02a0de5
---- /dev/null
-+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
-@@ -0,0 +1,65 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Theme\Controller\Result;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Framework\App\Response\Http;
-+
-+/**
-+ * Plugin for putting all js to footer.
-+ */
-+class JsFooterPlugin
-+{
-+    private const XML_PATH_DEV_MOVE_JS_TO_BOTTOM = 'dev/js/move_inline_to_bottom';
-+
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @param ScopeConfigInterface $scopeConfig
-+     */
-+    public function __construct(ScopeConfigInterface $scopeConfig)
-+    {
-+        $this->scopeConfig = $scopeConfig;
-+    }
-+
-+    /**
-+     * Put all javascript to footer before sending the response.
-+     *
-+     * @param Http $subject
-+     * @return void
-+     */
-+    public function beforeSendResponse(Http $subject)
-+    {
-+        $content = $subject->getContent();
-+        $script = [];
-+        if (strpos($content, '</body') !== false) {
-+            if ($this->scopeConfig->isSetFlag(
-+                self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM,
-+                ScopeInterface::SCOPE_STORE
-+            )
-+            ) {
-+                $pattern = '#<script[^>]*+(?<!text/x-magento-template.)>.*?</script>#is';
-+                $content = preg_replace_callback(
-+                    $pattern,
-+                    function ($matchPart) use (&$script) {
-+                        $script[] = $matchPart[0];
-+                        return '';
-+                    },
-+                    $content
-+                );
-+                $subject->setContent(
-+                    str_replace('</body', implode("\n", $script) . "\n</body", $content)
-+                );
-+            }
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
-index b37628e54aa..a9aaaedb726 100644
---- a/app/code/Magento/Theme/Model/Design/Backend/File.php
-+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Theme\Model\Design\Backend;
- 
- use Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface;
-@@ -20,8 +21,11 @@ use Magento\Framework\Registry;
- use Magento\Framework\UrlInterface;
- use Magento\MediaStorage\Model\File\UploaderFactory;
- use Magento\Theme\Model\Design\Config\FileUploader\FileProcessor;
-+use Magento\MediaStorage\Helper\File\Storage\Database;
- 
- /**
-+ * File Backend
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class File extends BackendFile
-@@ -36,6 +40,11 @@ class File extends BackendFile
-      */
-     private $mime;
- 
-+    /**
-+     * @var Database
-+     */
-+    private $databaseHelper;
-+
-     /**
-      * @param Context $context
-      * @param Registry $registry
-@@ -48,6 +57,7 @@ class File extends BackendFile
-      * @param AbstractResource|null $resource
-      * @param AbstractDb|null $resourceCollection
-      * @param array $data
-+     * @param Database $databaseHelper
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -61,7 +71,8 @@ class File extends BackendFile
-         UrlInterface $urlBuilder,
-         AbstractResource $resource = null,
-         AbstractDb $resourceCollection = null,
--        array $data = []
-+        array $data = [],
-+        Database $databaseHelper = null
-     ) {
-         parent::__construct(
-             $context,
-@@ -76,6 +87,7 @@ class File extends BackendFile
-             $data
-         );
-         $this->urlBuilder = $urlBuilder;
-+        $this->databaseHelper = $databaseHelper ?: ObjectManager::getInstance()->get(Database::class);
-     }
- 
-     /**
-@@ -88,41 +100,33 @@ class File extends BackendFile
-     {
-         $values = $this->getValue();
-         $value = reset($values) ?: [];
--        if (!isset($value['file'])) {
-+
-+        // Need to check name when it is uploaded in the media gallary
-+        $file = $value['file'] ?? $value['name'] ?? null;
-+        if (!isset($file)) {
-             throw new LocalizedException(
-                 __('%1 does not contain field \'file\'', $this->getData('field_config/field'))
-             );
-         }
-         if (isset($value['exists'])) {
--            $this->setValue($value['file']);
-+            $this->setValue($file);
-             return $this;
-         }
--
--        $filename = basename($value['file']);
--        $result = $this->_mediaDirectory->copyFile(
--            $this->getTmpMediaPath($filename),
--            $this->_getUploadDir() . '/' . $filename
--        );
--        if ($result) {
--            $this->_mediaDirectory->delete($this->getTmpMediaPath($filename));
--            if ($this->_addWhetherScopeInfo()) {
--                $filename = $this->_prependScopeInfo($filename);
--            }
--            $this->setValue($filename);
--        } else {
--            $this->unsValue();
--        }
-+      
-+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
-+        $this->updateMediaDirectory(basename($file), $value['url']);
- 
-         return $this;
-     }
- 
-     /**
--     * @return array
-+     * @inheritDoc
-      */
-     public function afterLoad()
-     {
-         $value = $this->getValue();
-         if ($value && !is_array($value)) {
-+            //phpcs:ignore Magento2.Functions.DiscouragedFunction
-             $fileName = $this->_getUploadDir() . '/' . basename($value);
-             $fileInfo = null;
-             if ($this->_mediaDirectory->isExist($fileName)) {
-@@ -133,6 +137,7 @@ class File extends BackendFile
-                         'url' => $url,
-                         'file' => $value,
-                         'size' => is_array($stat) ? $stat['size'] : 0,
-+                        //phpcs:ignore Magento2.Functions.DiscouragedFunction
-                         'name' => basename($value),
-                         'type' => $this->getMimeType($fileName),
-                         'exists' => true,
-@@ -166,6 +171,8 @@ class File extends BackendFile
-     }
- 
-     /**
-+     * Get Value
-+     *
-      * @return array
-      */
-     public function getValue()
-@@ -231,4 +238,53 @@ class File extends BackendFile
-         }
-         return $this->mime;
-     }
-+
-+    /**
-+     * Get Relative Media Path
-+     *
-+     * @param string $path
-+     * @return string
-+     */
-+    private function getRelativeMediaPath(string $path): string
-+    {
-+        return preg_replace('/\/(pub\/)?media\//', '', $path);
-+    }
-+
-+    /**
-+     * Move file to the correct media directory
-+     *
-+     * @param string $filename
-+     * @param string $url
-+     * @throws LocalizedException
-+     */
-+    private function updateMediaDirectory(string $filename, string $url)
-+    {
-+        $relativeMediaPath = $this->getRelativeMediaPath($url);
-+        $tmpMediaPath = $this->getTmpMediaPath($filename);
-+        $mediaPath = $this->_mediaDirectory->isFile($relativeMediaPath) ? $relativeMediaPath : $tmpMediaPath;
-+        $destinationMediaPath = $this->_getUploadDir() . '/' . $filename;
-+
-+        $result = $mediaPath === $destinationMediaPath;
-+        if (!$result) {
-+            $result = $this->_mediaDirectory->copyFile(
-+                $mediaPath,
-+                $destinationMediaPath
-+            );
-+            $this->databaseHelper->renameFile(
-+                $mediaPath,
-+                $destinationMediaPath
-+            );
-+        }
-+        if ($result) {
-+            if ($mediaPath === $tmpMediaPath) {
-+                $this->_mediaDirectory->delete($mediaPath);
-+            }
-+            if ($this->_addWhetherScopeInfo()) {
-+                $filename = $this->_prependScopeInfo($filename);
-+            }
-+            $this->setValue($filename);
-+        } else {
-+            $this->unsValue();
-+        }
-+    }
- }
-diff --git a/app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php b/app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php
-index ecf5bcbea6d..901dbf7d88f 100644
---- a/app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php
-+++ b/app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php
-@@ -18,6 +18,8 @@ use Magento\Framework\UrlInterface;
- use Magento\Store\Model\StoreManagerInterface;
- 
- /**
-+ * Design file processor.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class FileProcessor
-@@ -79,8 +81,8 @@ class FileProcessor
-      * Save file to temp media directory
-      *
-      * @param  string $fileId
-+     *
-      * @return array
--     * @throws LocalizedException
-      */
-     public function saveToTmp($fileId)
-     {
-diff --git a/app/code/Magento/Theme/Model/Design/Config/Validator.php b/app/code/Magento/Theme/Model/Design/Config/Validator.php
-index 994eeba317a..1279d9d9ccd 100644
---- a/app/code/Magento/Theme/Model/Design/Config/Validator.php
-+++ b/app/code/Magento/Theme/Model/Design/Config/Validator.php
-@@ -80,7 +80,7 @@ class Validator
-                                 ["templateName" => $name]
-                             )
-                         );
--                    };
-+                    }
-                 }
-             }
-         }
-diff --git a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
-index 98fa12ab987..13b8aa23073 100644
---- a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
-+++ b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
-@@ -27,6 +27,11 @@ class Builder implements \Magento\Framework\View\Model\PageLayout\Config\Builder
-      */
-     protected $themeCollection;
- 
-+    /**
-+     * @var array
-+     */
-+    private $configFiles = [];
-+
-     /**
-      * @param \Magento\Framework\View\PageLayout\ConfigFactory $configFactory
-      * @param \Magento\Framework\View\PageLayout\File\Collector\Aggregated $fileCollector
-@@ -44,7 +49,7 @@ class Builder implements \Magento\Framework\View\Model\PageLayout\Config\Builder
-     }
- 
-     /**
--     * @return \Magento\Framework\View\PageLayout\Config
-+     * @inheritdoc
-      */
-     public function getPageLayoutsConfig()
-     {
-@@ -52,15 +57,20 @@ class Builder implements \Magento\Framework\View\Model\PageLayout\Config\Builder
-     }
- 
-     /**
-+     * Retrieve configuration files.
-+     *
-      * @return array
-      */
-     protected function getConfigFiles()
-     {
--        $configFiles = [];
--        foreach ($this->themeCollection->loadRegisteredThemes() as $theme) {
--            $configFiles = array_merge($configFiles, $this->fileCollector->getFilesContent($theme, 'layouts.xml'));
-+        if (!$this->configFiles) {
-+            $configFiles = [];
-+            foreach ($this->themeCollection->loadRegisteredThemes() as $theme) {
-+                $configFiles[] = $this->fileCollector->getFilesContent($theme, 'layouts.xml');
-+            }
-+            $this->configFiles = array_merge(...$configFiles);
-         }
- 
--        return $configFiles;
-+        return $this->configFiles;
-     }
- }
-diff --git a/app/code/Magento/Theme/Model/ResourceModel/Design.php b/app/code/Magento/Theme/Model/ResourceModel/Design.php
-index c36640b98ef..6711f4a2117 100644
---- a/app/code/Magento/Theme/Model/ResourceModel/Design.php
-+++ b/app/code/Magento/Theme/Model/ResourceModel/Design.php
-@@ -46,7 +46,7 @@ class Design extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      * Perform actions before object save
-      *
-      * @param \Magento\Framework\Model\AbstractModel $object
--     * @return $this
-+     * @return void
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
-@@ -152,7 +152,6 @@ class Design extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-             $dateConditions = [];
-         }
- 
--        $condition = '';
-         if (!empty($dateConditions)) {
-             $condition = '(' . implode(') OR (', $dateConditions) . ')';
-             $select->where($condition);
-diff --git a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
-index 82206b8eb1c..0519460c024 100644
---- a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
-+++ b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
-@@ -4,13 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Theme wysiwyg storage model
-- */
- namespace Magento\Theme\Model\Wysiwyg;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
- 
-+/**
-+ * Theme wysiwyg storage model
-+ */
- class Storage
- {
-     /**
-@@ -105,7 +105,7 @@ class Storage
-      * Upload file
-      *
-      * @param string $targetPath
--     * @return bool
-+     * @return array
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function uploadFile($targetPath)
-@@ -127,14 +127,6 @@ class Storage
- 
-         $this->_createThumbnail($targetPath . '/' . $uploader->getUploadedFileName());
- 
--        $result['cookie'] = [
--            'name' => $this->_helper->getSession()->getName(),
--            'value' => $this->_helper->getSession()->getSessionId(),
--            'lifetime' => $this->_helper->getSession()->getCookieLifetime(),
--            'path' => $this->_helper->getSession()->getCookiePath(),
--            'domain' => $this->_helper->getSession()->getCookieDomain()
--        ];
--
-         return $result;
-     }
- 
-@@ -274,7 +266,7 @@ class Storage
-             if (self::TYPE_IMAGE == $storageType) {
-                 $requestParams['file'] = $fileName;
-                 $file['thumbnailParams'] = $requestParams;
--
-+                //phpcs:ignore Generic.PHP.NoSilencedErrors
-                 $size = @getimagesize($path);
-                 if (is_array($size)) {
-                     $file['width'] = $size[0];
-diff --git a/app/code/Magento/Theme/Test/Mftf/ActionGroup/NavigateToFaviconMediaFolderActionGroup.xml b/app/code/Magento/Theme/Test/Mftf/ActionGroup/NavigateToFaviconMediaFolderActionGroup.xml
-new file mode 100644
-index 00000000000..6b986865743
---- /dev/null
-+++ b/app/code/Magento/Theme/Test/Mftf/ActionGroup/NavigateToFaviconMediaFolderActionGroup.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="NavigateToFaviconMediaFolderActionGroup">
-+        <arguments>
-+            <argument name="StoreFolder" type="string"/>
-+        </arguments>
-+        <conditionalClick selector="{{MediaGallerySection.StorageRootArrow}}" dependentSelector="{{MediaGallerySection.checkIfArrowExpand}}" stepKey="clickArrowIfClosed" visible="true"/>
-+        <waitForElement selector="{{AdminDesignConfigSection.faviconArrow}}" stepKey="waitForFaviconFolder"/>
-+        <conditionalClick selector="{{AdminDesignConfigSection.faviconArrow}}" dependentSelector="{{AdminDesignConfigSection.checkIfFaviconArrowExpand}}" stepKey="clickFaviconArrowIfClosed" visible="true"/>
-+        <waitForElement selector="{{AdminDesignConfigSection.storesArrow}}" stepKey="waitForStoresFolder"/>
-+        <conditionalClick selector="{{AdminDesignConfigSection.storesArrow}}" dependentSelector="{{AdminDesignConfigSection.checkIfStoresArrowExpand}}" stepKey="clickStoresArrowIfClosed" visible="true"/>
-+        <waitForElement selector="{{StoreFolder}}" stepKey="waitForStoreFolder"/>
-+        <click selector="{{StoreFolder}}" stepKey="clickOnCreatedFolder"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Theme/Test/Mftf/ActionGroup/StorefrontClickOnHeaderLogoActionGroup.xml b/app/code/Magento/Theme/Test/Mftf/ActionGroup/StorefrontClickOnHeaderLogoActionGroup.xml
-new file mode 100644
-index 00000000000..cd4117a4cfa
---- /dev/null
-+++ b/app/code/Magento/Theme/Test/Mftf/ActionGroup/StorefrontClickOnHeaderLogoActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="StorefrontClickOnHeaderLogoActionGroup">
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
-+        <waitForPageLoad stepKey="waitForHomePageLoaded"/>
-+        <click selector="{{StorefrontHeaderSection.logoLink}}" stepKey="clickOnLogo"/>
-+        <waitForPageLoad stepKey="waitForHomePageLoadedAfterClickOnLogo"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Theme/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Theme/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..e8266510625
---- /dev/null
-+++ b/app/code/Magento/Theme/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuContentDesignThemes">
-+        <data key="pageTitle">Themes</data>
-+        <data key="title">Themes</data>
-+        <data key="dataUiId">magento-theme-system-design-theme</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Theme/Test/Mftf/Data/DesignData.xml b/app/code/Magento/Theme/Test/Mftf/Data/DesignData.xml
-index 988d71bc408..ec28e8ed7a9 100644
---- a/app/code/Magento/Theme/Test/Mftf/Data/DesignData.xml
-+++ b/app/code/Magento/Theme/Test/Mftf/Data/DesignData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="Layout" type="page_layout">
-         <data key="1column">1 column</data>
-     </entity>
-diff --git a/app/code/Magento/Theme/Test/Mftf/Page/DesignConfigPage.xml b/app/code/Magento/Theme/Test/Mftf/Page/DesignConfigPage.xml
-new file mode 100644
-index 00000000000..7a802aee73e
---- /dev/null
-+++ b/app/code/Magento/Theme/Test/Mftf/Page/DesignConfigPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="DesignConfigPage" url="theme/design_config/" area="admin" module="Magento_Theme">
-+        <section name="AdminDesignConfigSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Theme/Test/Mftf/Page/ThemesPage.xml b/app/code/Magento/Theme/Test/Mftf/Page/ThemesPage.xml
-index e0f0d2db706..ab7b436cb3a 100644
---- a/app/code/Magento/Theme/Test/Mftf/Page/ThemesPage.xml
-+++ b/app/code/Magento/Theme/Test/Mftf/Page/ThemesPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="ThemesPageIndex" url="admin/system_design_theme/" area="admin" module="Magento_Theme">
-         <section name="AdminThemeSection"/>
-     </page>
-diff --git a/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
-new file mode 100644
-index 00000000000..c2652f33f76
---- /dev/null
-+++ b/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
-@@ -0,0 +1,35 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminDesignConfigSection">
-+        <element name="scopeRow" type="button" selector="//*[contains(@class,'data-row')][{{arg1}}]//*[contains(@class,'action-menu-item')]" parameterized="true"/>
-+        <element name="watermarkSectionHeader" type="text" selector="[data-index='watermark']"/>
-+        <element name="watermarkSection" type="text" selector="[data-index='watermark'] .admin__fieldset-wrapper-content"/>
-+        <element name="imageUploadInputByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader')]//input" parameterized="true"/>
-+        <element name="imageUploadPreviewByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader-preview')]//img" parameterized="true"/>
-+        <element name="addSelectedFromMediaGallery" type="input" selector="//button[contains(@title,'Add Selected')]"/>
-+        <element name="htmlHeaderSection" type="text" selector="[data-index='head']"/>
-+        <element name="selectFromGalleryByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader')]//label[contains(text(), 'Select from Gallery')]" parameterized="true"/>
-+        <element name="imageUploadFromMediaGallery" type="input" selector="//input[contains(@class,'fileupload')]" />
-+        <element name="saveConfiguration" type="input" selector="//button[contains(@title, 'Save Configuration')]" />
-+        <element name="successNotification" type="text" selector="//div[contains(@data-ui-id, 'messages-message-success')]" />
-+        <element name="useDefaultByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader')]//span[contains(text(), 'Use Default Value')]" parameterized="true" />
-+        <element name="logoSectionHeader" type="text" selector="[data-index='email']"/>
-+        <element name="logoSection" type="text" selector="[data-index='email'] .admin__fieldset-wrapper-content"/>
-+        <element name="logoUpload" type ="input" selector="[name='email_logo']" />
-+        <element name="logoWrapperOpen" type ="text" selector="[data-index='email'] [data-state-collapsible ='closed']"/>
-+        <element name="logoPreview" type ="text" selector="[alt ='magento-logo.png']"/>
-+        <element name="faviconArrow" type="button" selector="#ZmF2aWNvbg-- > .jstree-icon" />
-+        <element name="checkIfFaviconArrowExpand" type="button" selector="//li[@id='ZmF2aWNvbg--' and contains(@class,'jstree-closed')]" />
-+        <element name="storesArrow" type="button" selector="#ZmF2aWNvbi9zdG9yZXM- > .jstree-icon" />
-+        <element name="checkIfStoresArrowExpand" type="button" selector="//li[@id='ZmF2aWNvbi9zdG9yZXM-' and contains(@class,'jstree-closed')]" />
-+        <element name="storeLink" type="button" selector="#ZmF2aWNvbi9zdG9yZXMvMQ-- > a"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml
-index 67a5146fd8b..219ca742036 100644
---- a/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml
-+++ b/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminThemeSection">
-         <!--All rows in a specific Column e.g. {{Section.rowsInColumn('columnName')}}-->
-         <element name="allRowsInColumn" type="text" selector="//tr/td[contains(@class, '{{column}}')]" parameterized="true"/>
-diff --git a/app/code/Magento/Theme/Test/Mftf/Section/StorefrontFooterSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontFooterSection.xml
-deleted file mode 100644
-index a9db1cbb9c7..00000000000
---- a/app/code/Magento/Theme/Test/Mftf/Section/StorefrontFooterSection.xml
-+++ /dev/null
-@@ -1,13 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="StorefrontFooterSection">
--    </section>
--</sections>
-diff --git a/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml
-new file mode 100644
-index 00000000000..e2f0a01fc73
---- /dev/null
-+++ b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontHeaderSection">
-+        <element name="welcomeMessage" type="text" selector=".greet.welcome"/>
-+        <element name="logoLink" type="button" selector=".header .logo"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Theme/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontMessagesSection.xml
-index 9b0b9c7a053..a7bc36f1e62 100644
---- a/app/code/Magento/Theme/Test/Mftf/Section/StorefrontMessagesSection.xml
-+++ b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontMessagesSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontMessagesSection">
-         <element name="message" type="text"
-                  selector="//main//div[contains(@class, 'messages')]//div[contains(@class, 'message')]/div[contains(text(), '{{var1}}')]"
-diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesNavigateMenuTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..8e7bfd71b07
---- /dev/null
-+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminContentThemesNavigateMenuTest">
-+        <annotations>
-+            <features value="Theme"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin content themes navigate menu test"/>
-+            <description value="Admin should be able to navigate to Content > Themes"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14112"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentThemesPage">
-+            <argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuContentDesignThemes.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuContentDesignThemes.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml
-new file mode 100644
-index 00000000000..f46328ac151
---- /dev/null
-+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml
-@@ -0,0 +1,78 @@
-+<?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="AdminDesignConfigMediaGalleryImageUploadTest">
-+        <annotations>
-+            <features value="Content"/>
-+            <stories value="Content"/>
-+            <title value="MC-5784: Image fields using imageUploader UIComponent cannot use gallery image"/>
-+            <description value="Admin should be able to use Image Uploader to add Gallery Images"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-13832"/>
-+            <group value="Content"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-+        </after>
-+        <!--Edit Store View-->
-+        <comment userInput="Edit Store View" stepKey="editStoreViewComment"/>
-+        <amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage" />
-+        <waitForPageLoad stepKey="waitForPageload1"/>
-+        <click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView"/>
-+        <waitForPageLoad stepKey="waitForPageload2"/>
-+        <scrollTo selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="scrollToHtmlHeadSection"/>
-+        <click selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="openHtmlHeadSection"/>
-+        <!--Upload Image-->
-+        <comment userInput="Upload Image" stepKey="uploadImageComment"/>
-+        <click selector="{{AdminDesignConfigSection.selectFromGalleryByFieldsetName('Head')}}" stepKey="openMediaGallery"/>
-+        <actionGroup ref="VerifyMediaGalleryStorageActions" stepKey="verifyMediaGalleryStorageBtn"/>
-+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
-+            <argument name="FolderName" value="Storage Root"/>
-+        </actionGroup>
-+        <actionGroup ref="attachImage" stepKey="selectImageFromMediaStorage">
-+            <argument name="Image" value="ImageUpload3"/>
-+        </actionGroup>
-+        <actionGroup ref="saveImage" stepKey="insertImage"/>
-+        <click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration"/>
-+        <waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification"/>
-+        <waitForPageLoad stepKey="waitForPageloadSuccess"/>
-+        <!--Edit Store View-->
-+        <comment userInput="Edit Store View" stepKey="editStoreViewComment2"/>
-+        <click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView2"/>
-+        <waitForPageLoad stepKey="waitForPageload3"/>
-+        <scrollTo selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="scrollToHtmlHeadSection2"/>
-+        <click selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="openHtmlHeadSection2"/>
-+        <!--Save Default Configuration-->
-+        <comment userInput="Save Default Configuration" stepKey="saveDefaultConfigurationComment"/>
-+        <click selector="{{AdminDesignConfigSection.useDefaultByFieldsetName('Head')}}" stepKey="clickUseDefault"/>
-+        <waitForElementVisible selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="waitForWrapperToClose2"/>
-+        <click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration2"/>
-+        <waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification2"/>
-+        <waitForPageLoad stepKey="waitForPageloadSuccess2"/>
-+        <!--Delete Image: will be in both root and favicon-->
-+        <comment userInput="Delete Image" stepKey="deleteImageComment"/>
-+        <actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
-+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder2">
-+            <argument name="FolderName" value="Storage Root"/>
-+        </actionGroup>
-+        <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
-+            <argument name="Image" value="ImageUpload3"/>
-+        </actionGroup>
-+        <actionGroup ref="NavigateToFaviconMediaFolderActionGroup" stepKey="navigateToFolder3">
-+            <argument name="StoreFolder" value="{{AdminDesignConfigSection.storeLink}}"/>
-+        </actionGroup>
-+        <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage2">
-+            <argument name="Image" value="ImageUpload3"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminWatermarkUploadTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminWatermarkUploadTest.xml
-new file mode 100644
-index 00000000000..a667f40ad32
---- /dev/null
-+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminWatermarkUploadTest.xml
-@@ -0,0 +1,46 @@
-+<?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="AdminWatermarkUploadTest">
-+        <annotations>
-+            <features value="Watermark"/>
-+            <stories value="Watermark"/>
-+            <title value="MAGETWO-95934: Can't upload Watermark Image"/>
-+            <description value="Watermark images should be able to be uploaded in the admin"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MC-5796"/>
-+            <group value="Watermark"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-+        </after>
-+        <amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage" />
-+        <waitForPageLoad stepKey="waitForPageload1"/>
-+        <click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView"/>
-+        <waitForPageLoad stepKey="waitForPageload2"/>
-+        <scrollTo selector="{{AdminDesignConfigSection.watermarkSectionHeader}}" stepKey="scrollToWatermarkSection"/>
-+        <click selector="{{AdminDesignConfigSection.watermarkSectionHeader}}" stepKey="openWatermarkSection"/>
-+
-+        <waitForElement selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Base')}}" stepKey="waitForInputVisible1"/>
-+        <attachFile selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Base')}}" userInput="adobe-base.jpg" stepKey="attachFile1"/>
-+        <waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Base')}}" stepKey="waitForPreviewImage"/>
-+
-+        <waitForElement selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Thumbnail')}}" stepKey="waitForInputVisible2"/>
-+        <attachFile selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Thumbnail')}}" userInput="adobe-thumb.jpg" stepKey="attachFile2"/>
-+        <waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Thumbnail')}}" stepKey="waitForPreviewImage2"/>
-+
-+        <waitForElement selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Small')}}" stepKey="waitForInputVisible3"/>
-+        <attachFile selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Small')}}" userInput="adobe-small.jpg" stepKey="attachFile3"/>
-+        <waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Small')}}" stepKey="waitForPreviewImage3"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Theme/Test/Mftf/Test/ThemeTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/ThemeTest.xml
-index 2ae24934a48..67213934a6c 100644
---- a/app/code/Magento/Theme/Test/Mftf/Test/ThemeTest.xml
-+++ b/app/code/Magento/Theme/Test/Mftf/Test/ThemeTest.xml
-@@ -7,15 +7,16 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="ThemeTest">
-         <annotations>
--            <features value="Theme Test"/>
-+            <features value="Theme"/>
-+            <stories value="Themes"/>
-             <title value="Magento Rush theme should not be available in Themes grid"/>
-             <description value="Magento Rush theme should not be available in Themes grid"/>
-             <severity value="MAJOR"/>
-             <testCaseId value="MAGETWO-91409"/>
--            <group value="theme"/>
-+            <group value="Theme"/>
-         </annotations>
-         <after>
-             <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-diff --git a/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php b/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
-index 91c3ce47fc8..023c7414927 100644
---- a/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
-+++ b/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
-@@ -189,7 +189,6 @@ HTML;
-         $treeFactory = $this->createMock(\Magento\Framework\Data\TreeFactory::class);
- 
-         $topmenu =  new Topmenu($this->context, $nodeFactory, $treeFactory);
--        $this->urlBuilder->expects($this->once())->method('getUrl')->with('*/*/*')->willReturn('123');
-         $this->urlBuilder->expects($this->once())->method('getBaseUrl')->willReturn('baseUrl');
-         $store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-             ->disableOriginalConstructor()
-@@ -199,7 +198,7 @@ HTML;
-         $this->storeManager->expects($this->once())->method('getStore')->willReturn($store);
- 
-         $this->assertEquals(
--            ['BLOCK_TPL', '321', null, 'base_url' => 'baseUrl', 'template' => null, '123'],
-+            ['BLOCK_TPL', '321', null, 'base_url' => 'baseUrl', 'template' => null],
-             $topmenu->getCacheKeyInfo()
-         );
-     }
-diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
-index b49b3cb7976..94a6ab0ec56 100644
---- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
-+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
-@@ -28,6 +28,11 @@ class FileTest extends \PHPUnit\Framework\TestCase
-      */
-     private $mime;
- 
-+    /**
-+     * @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $databaseHelper;
-+
-     public function setUp()
-     {
-         $context = $this->getMockObject(\Magento\Framework\Model\Context::class);
-@@ -55,6 +60,17 @@ class FileTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        $this->databaseHelper = $this->getMockBuilder(\Magento\MediaStorage\Helper\File\Storage\Database::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $abstractResource = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\AbstractResource::class)
-+            ->getMockForAbstractClass();
-+
-+        $abstractDb = $this->getMockBuilder(\Magento\Framework\Data\Collection\AbstractDb::class)
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+
-         $this->fileBackend = new File(
-             $context,
-             $registry,
-@@ -63,7 +79,11 @@ class FileTest extends \PHPUnit\Framework\TestCase
-             $uploaderFactory,
-             $requestData,
-             $filesystem,
--            $this->urlBuilder
-+            $this->urlBuilder,
-+            $abstractResource,
-+            $abstractDb,
-+            [],
-+            $this->databaseHelper
-         );
- 
-         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-@@ -196,6 +216,11 @@ class FileTest extends \PHPUnit\Framework\TestCase
-             ]
-         );
- 
-+        $this->databaseHelper->expects($this->once())
-+            ->method('renameFile')
-+            ->with($expectedTmpMediaPath, '/' . $expectedFileName)
-+            ->willReturn(true);
-+
-         $this->mediaDirectory->expects($this->once())
-             ->method('copyFile')
-             ->with($expectedTmpMediaPath, '/' . $expectedFileName)
-diff --git a/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php b/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
-index e5d69cbc820..8429be84cae 100644
---- a/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
-+++ b/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
-@@ -83,7 +83,7 @@ class BuilderTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->themeCollection->expects($this->any())
-+        $this->themeCollection->expects($this->once())
-             ->method('loadRegisteredThemes')
-             ->willReturn([$theme1, $theme2]);
- 
-diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php
-index 5cb265d3d62..c06e2626034 100644
---- a/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php
-+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php
-@@ -10,7 +10,6 @@ use \Magento\Theme\Model\Theme\Source\Theme;
- class ThemeTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @true
-      * @return void
-      * @covers \Magento\Theme\Model\Theme\Source\Theme::__construct
-      * @covers \Magento\Theme\Model\Theme\Source\Theme::getAllOptions
-diff --git a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
-index 0951f7b50f2..ddd6ebc43ce 100644
---- a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
-+++ b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
-@@ -152,8 +152,7 @@ class StorageTest extends \PHPUnit\Framework\TestCase
-         $this->_helperStorage->expects($this->any())->method('getSession')->will($this->returnValue($session));
- 
-         $expectedResult = [
--            'not_empty',
--            'cookie' => ['name' => null, 'value' => null, 'lifetime' => null, 'path' => null, 'domain' => null],
-+            'not_empty'
-         ];
- 
-         $this->assertEquals($expectedResult, $this->_storageModel->uploadFile($this->_storageRoot));
-diff --git a/app/code/Magento/Theme/etc/adminhtml/system.xml b/app/code/Magento/Theme/etc/adminhtml/system.xml
-new file mode 100644
-index 00000000000..db92aee16c2
---- /dev/null
-+++ b/app/code/Magento/Theme/etc/adminhtml/system.xml
-@@ -0,0 +1,22 @@
-+<?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_Config:etc/system_file.xsd">
-+    <system>
-+        <section id="dev">
-+            <group id="css">
-+                <field id="use_css_critical_path" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                    <label>Use CSS critical path</label>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                    <comment>
-+                        <![CDATA[<strong style="color:red">Warning!</strong> Be sure that you have critical.css file for your theme. Other CSS files will be loaded asynchronously.]]>
-+                    </comment>
-+                </field>
-+            </group>
-+        </section>
-+    </system>
-+</config>
-diff --git a/app/code/Magento/Theme/etc/config.xml b/app/code/Magento/Theme/etc/config.xml
-index a6984b449d9..3e26204d778 100644
---- a/app/code/Magento/Theme/etc/config.xml
-+++ b/app/code/Magento/Theme/etc/config.xml
-@@ -46,6 +46,7 @@ Disallow: /*SID=
-             </header>
-             <footer translate="copyright">
-                 <copyright>Copyright &#169; 2013-present Magento, Inc. All rights reserved.</copyright>
-+                <report_bugs>1</report_bugs>
-             </footer>
-         </design>
-         <theme>
-@@ -65,6 +66,12 @@ Disallow: /*SID=
-             <static>
-                 <sign>1</sign>
-             </static>
-+            <js>
-+                <move_inline_to_bottom>0</move_inline_to_bottom>
-+            </js>
-+            <css>
-+                <use_css_critical_path>0</use_css_critical_path>
-+            </css>
-         </dev>
-     </default>
- </config>
-diff --git a/app/code/Magento/Theme/etc/db_schema.xml b/app/code/Magento/Theme/etc/db_schema.xml
-index ee1185e6e57..7f3a3fc6079 100644
---- a/app/code/Magento/Theme/etc/db_schema.xml
-+++ b/app/code/Magento/Theme/etc/db_schema.xml
-@@ -20,7 +20,7 @@
-         <column xsi:type="smallint" name="type" padding="6" unsigned="false" nullable="false" identity="false"
-                 comment="Theme type: 0:physical, 1:virtual, 2:staging"/>
-         <column xsi:type="text" name="code" nullable="true" comment="Full theme code, including package"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="theme_id"/>
-         </constraint>
-     </table>
-@@ -35,10 +35,10 @@
-         <column xsi:type="smallint" name="sort_order" padding="6" unsigned="false" nullable="false" identity="false"
-                 default="0" comment="Sort Order"/>
-         <column xsi:type="boolean" name="is_temporary" nullable="false" default="false" comment="Is Temporary File"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="theme_files_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="THEME_FILE_THEME_ID_THEME_THEME_ID" table="theme_file" column="theme_id"
-+        <constraint xsi:type="foreign" referenceId="THEME_FILE_THEME_ID_THEME_THEME_ID" table="theme_file" column="theme_id"
-                     referenceTable="theme" referenceColumn="theme_id" onDelete="CASCADE"/>
-     </table>
-     <table name="design_change" resource="default" engine="innodb" comment="Design Changes">
-@@ -49,12 +49,12 @@
-         <column xsi:type="varchar" name="design" nullable="true" length="255" comment="Design"/>
-         <column xsi:type="date" name="date_from" comment="First Date of Design Activity"/>
-         <column xsi:type="date" name="date_to" comment="Last Date of Design Activity"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="design_change_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="DESIGN_CHANGE_STORE_ID_STORE_STORE_ID" table="design_change"
-+        <constraint xsi:type="foreign" referenceId="DESIGN_CHANGE_STORE_ID_STORE_STORE_ID" table="design_change"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <index name="DESIGN_CHANGE_STORE_ID" indexType="btree">
-+        <index referenceId="DESIGN_CHANGE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
-index 5ff82ce2db6..62f51e74b60 100644
---- a/app/code/Magento/Theme/etc/di.xml
-+++ b/app/code/Magento/Theme/etc/di.xml
-@@ -214,6 +214,10 @@
-                     <item name="path" xsi:type="string">design/footer/absolute_footer</item>
-                     <item name="fieldset" xsi:type="string">other_settings/footer</item>
-                 </item>
-+                <item name="footer_report_bugs" xsi:type="array">
-+                    <item name="path" xsi:type="string">design/footer/report_bugs</item>
-+                    <item name="fieldset" xsi:type="string">other_settings/footer</item>
-+                </item>
-                 <item name="default_robots" xsi:type="array">
-                     <item name="path" xsi:type="string">design/search_engine_robots/default_robots</item>
-                     <item name="fieldset" xsi:type="string">other_settings/search_engine_robots</item>
-@@ -269,7 +273,7 @@
-     <type name="Magento\Config\App\Config\Source\DumpConfigSourceAggregated">
-         <plugin name="designConfigTheme" type="Magento\Theme\Model\Design\Config\Plugin\Dump" sortOrder="50"/>
-     </type>
--    <type name="\Magento\Theme\Model\Design\Config\Plugin\Dump">
-+    <type name="Magento\Theme\Model\Design\Config\Plugin\Dump">
-         <arguments>
-             <argument name="themeList" xsi:type="object">Magento\Theme\Model\ResourceModel\Theme\Collection</argument>
-         </arguments>
-diff --git a/app/code/Magento/Theme/etc/frontend/di.xml b/app/code/Magento/Theme/etc/frontend/di.xml
-index 7db2783cd8d..310f4a717c2 100644
---- a/app/code/Magento/Theme/etc/frontend/di.xml
-+++ b/app/code/Magento/Theme/etc/frontend/di.xml
-@@ -26,4 +26,13 @@
-     <type name="Magento\Framework\Controller\ResultInterface">
-         <plugin name="result-messages" type="Magento\Theme\Controller\Result\MessagePlugin"/>
-     </type>
-+    <type name="Magento\Framework\App\Response\Http">
-+        <plugin name="result-js-footer" type="Magento\Theme\Controller\Result\JsFooterPlugin"/>
-+        <plugin name="asyncCssLoad" type="Magento\Theme\Controller\Result\AsyncCssPlugin"/>
-+    </type>
-+    <type name="Magento\Theme\Block\Html\Header\CriticalCss">
-+        <arguments>
-+            <argument name="filePath" xsi:type="string">css/critical.css</argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Theme/i18n/en_US.csv b/app/code/Magento/Theme/i18n/en_US.csv
-index db641b5da1f..40b219a15e0 100644
---- a/app/code/Magento/Theme/i18n/en_US.csv
-+++ b/app/code/Magento/Theme/i18n/en_US.csv
-@@ -96,6 +96,7 @@ Phrase,Phrase
- testMessage,testMessage
- Edit,Edit
- "We found no files.","We found no files."
-+"thumbnail","thumbnail"
- "Browse Files","Browse Files"
- Scope:,Scope:
- Remove,Remove
-@@ -188,3 +189,4 @@ Settings,Settings
- ID,ID
- View,View
- Action,Action
-+"Display Report Bugs Link","Display Report Bugs Link"
-diff --git a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_block.xml b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_block.xml
-index bb8fbd44629..e19460d56a8 100644
---- a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_block.xml
-+++ b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="theme.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">theme_grid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Theme\Model\ResourceModel\Theme\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Theme\Model\ResourceModel\Theme\Grid\Collection</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-                     <argument name="use_ajax" xsi:type="string">1</argument>
-                     <argument name="grid_url" xsi:type="url" path="*/*/grid">
-diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
-index 4ce0d766ee3..b129498d0d4 100644
---- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
-+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
-@@ -3,8 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--?>
--<?php
-+
- /**
-  * Wysiwyg Images content template
-  *
-diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
-index e5f0efd7917..6b350cd6254 100644
---- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
-+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
-@@ -4,25 +4,21 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
--
--<?php
- /** @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Files */
- ?>
- 
--<?php if ($block->getFilesCount() > 0): ?>
--    <?php foreach ($block->getFiles() as $file): ?>
--        <div class="filecnt file-font" id="<?= /* @escapeNotVerified */ $file['id'] ?>">
-+<?php if ($block->getFilesCount() > 0) : ?>
-+    <?php foreach ($block->getFiles() as $file) : ?>
-+        <div class="filecnt file-font" id="<?= $block->escapeHtmlAttr($file['id']) ?>">
-             <p class="nm">
--                <?= /* @escapeNotVerified */ $file['text'] ?>
--                <?php if (isset($file['thumbnailParams'])): ?>
--                    <img src="<?= /* @escapeNotVerified */ $block->getUrl('*/*/previewImage', $file['thumbnailParams']) ?>">
-+                <?= $block->escapeHtml($file['text']) ?>
-+                <?php if (isset($file['thumbnailParams'])) : ?>
-+                    <img src="<?= $block->escapeUrl($block->getUrl('*/*/previewImage', $file['thumbnailParams'])) ?>"
-+                         alt="<?= $block->escapeHtmlAttr(__('thumbnail')) ?>">
-                 <?php endif; ?>
-             </p>
-         </div>
-     <?php endforeach; ?>
--<?php else: ?>
--    <?= /* @escapeNotVerified */ __('We found no files.') ?>
-+<?php else : ?>
-+    <?= $block->escapeHtml(__('We found no files.')) ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
-index 722ade94d97..67c9084b275 100644
---- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
-+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
-@@ -4,17 +4,14 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--?>
--<?php
- /** @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Uploader */
- ?>
- 
- <div id="<?= $block->getHtmlId() ?>" class="uploader">
-     <span class="fileinput-button form-buttons">
--        <span><?= /* @escapeNotVerified */ __('Browse Files') ?></span>
--        <input id="fileupload" type="file" name="<?= /* @escapeNotVerified */ $block->getConfig()->getFileField() ?>"
--            data-url="<?= /* @escapeNotVerified */ $block->getConfig()->getUrl() ?>" multiple>
-+        <span><?= $block->escapeHtml(__('Browse Files')) ?></span>
-+        <input id="fileupload" type="file" name="<?= $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>"
-+            data-url="<?= $block->escapeUrl($block->getConfig()->getUrl()) ?>" multiple>
-     </span>
-     <div class="clear"></div>
-     <script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template">
-@@ -44,7 +41,7 @@ require([
-             form_key: FORM_KEY
-         },
-         sequentialUploads: true,
--        maxFileSize: <?= /* @escapeNotVerified */ $block->getFileSizeService()->getMaxFileSize() ?> ,
-+        maxFileSize: <?= $block->escapeJs($block->getFileSizeService()->getMaxFileSize()) ?> ,
-         add: function (e, data) {
-             var progressTmpl = mageTemplate('#<?= $block->getHtmlId() ?>-template'),
-                 fileSize,
-diff --git a/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml b/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
-index 7bd5c70f0bf..639eb749d3e 100644
---- a/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
-+++ b/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
-@@ -4,12 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var $block \Magento\Theme\Block\Adminhtml\Design\Config\Edit\Scope */
- ?>
- 
- <div class="store-view">
--    <span class="store-switcher-label"><?= /* @escapeNotVerified */ __('Scope:') ?></span>
--    <span class="store-switcher-value"><?= /* @escapeNotVerified */ $block->getScopeTitle() ?></span>
-+    <span class="store-switcher-label"><?= $block->escapeHtml(__('Scope:')) ?></span>
-+    <span class="store-switcher-value"><?= $block->escapeHtml($block->getScopeTitle()) ?></span>
- </div>
-diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
-index 1c1a7ea204b..902daf98182 100644
---- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
-+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
-@@ -3,10 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+/** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css */
- ?>
- 
--<?php /** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css */ ?>
--
- <?= $block->getFormHtml() ?>
- 
- <script>
-@@ -20,7 +19,7 @@ require([
-     $( '#css_file_uploader' ).fileupload({
-         dataType: 'json',
-         replaceFileInput: false,
--        url : '<?= /* @escapeNotVerified */ $block->getUrl('*/system_design_theme/uploadcss') ?>',
-+        url : '<?= $block->escapeJs($block->escapeUrl($block->getUrl('*/system_design_theme/uploadcss'))) ?>',
-         acceptFileTypes: /(.|\/)(css)$/i,
- 
-         /**
-diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
-index 992bd73bf0b..b50f68cd935 100644
---- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
-+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
-@@ -4,9 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-+/** @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset */
- ?>
--<?php /** @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset */ ?>
- 
- <div id="js-file-uploader" class="uploader">
- </div>
-@@ -32,7 +32,7 @@
-                 id="remove_js_files_<%- data.id %>"
-                 name="js_removed_files[]"
-                 value="<%- data.id %>" />
--            <label for="remove_js_files_<%- data.id %>"><?= /* @escapeNotVerified */ __('Remove') ?></label>
-+            <label for="remove_js_files_<%- data.id %>"><?= $block->escapeHtml(__('Remove')) ?></label>
-         </div>
-     </div>
- 
-@@ -60,7 +60,9 @@ jQuery(function($) {
-     });
-     $('body').trigger(
-         'refreshJsList',
--        {jsList: <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getJsFiles()) ?>}
-+        {
-+            jsList: <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getJsFiles()) ?>
-+        }
-     );
- });
- 
-diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
-index b13e1320d0b..1b4633d0965 100644
---- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
-+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
-@@ -3,8 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+/** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Js */
- ?>
--<?php /** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Js */ ?>
- <?= $block->getFormHtml() ?>
- 
- <script>
-@@ -21,7 +22,7 @@ require([
-         dataType: 'json',
-         replaceFileInput: false,
-         sequentialUploads: true,
--        url: '<?= /* @escapeNotVerified */ $block->getJsUploadUrl() ?>',
-+        url: '<?= $block->escapeJs($block->escapeUrl($block->getJsUploadUrl())) ?>',
- 
-         /**
-          * Add data
-diff --git a/app/code/Magento/Theme/view/adminhtml/templates/title.phtml b/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
-index e3a85b64586..6cefec065c1 100644
---- a/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
-+++ b/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
-@@ -4,17 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\Theme\Block\Html\Title
-  */
--$titleId = ($block->getTitleId()) ? ' id="' . $block->getTitleId() . '"' : '';
-+$titleIdHtml = ($block->getTitleId()) ? ' id="' . $block->escapeHtmlAttr($block->getTitleId()) . '"' : '';
- $titleClass = ($block->getTitleClass()) ? ' ' . $block->getTitleClass() : '';
--$title = $block->escapeHtml($block->getPageTitle());
-+$title = $block->getPageTitle();
- ?>
- 
--<div class="page-title-wrapper<?= /* @escapeNotVerified */ $titleClass ?>">
--    <h1 class="page-title"<?= /* @escapeNotVerified */ $titleId ?>><?= /* @escapeNotVerified */ $title ?></h1>
-+<div class="page-title-wrapper<?= $block->escapeHtmlAttr($titleClass) ?>">
-+    <h1 class="page-title"<?= /* @noEscape */ $titleIdHtml ?>><?= $block->escapeHtml($title) ?></h1>
-     <?= $block->getChildHtml() ?>
- </div>
-diff --git a/app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml
-index 48adca3b1a1..bc1f36222dd 100644
---- a/app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml
-+++ b/app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml
-@@ -54,7 +54,7 @@
-                 <collapsible>true</collapsible>
-                 <label translate="true">HTML Head</label>
-             </settings>
--            <field name="head_shortcut_icon" formElement="fileUploader">
-+            <field name="head_shortcut_icon" formElement="imageUploader">
-                 <settings>
-                     <notice translate="true">Not all browsers support all these formats!</notice>
-                     <label translate="true">Favicon Icon</label>
-@@ -151,7 +151,7 @@
-                 <collapsible>true</collapsible>
-                 <label translate="true">Header</label>
-             </settings>
--            <field name="header_logo_src" formElement="fileUploader">
-+            <field name="header_logo_src" formElement="imageUploader">
-                 <settings>
-                     <label translate="true">Logo Image</label>
-                     <componentType>imageUploader</componentType>
-@@ -233,6 +233,20 @@
-                     <dataScope>footer_copyright</dataScope>
-                 </settings>
-             </field>
-+            <field name="footer_report_bugs" formElement="select">
-+                <settings>
-+                    <dataType>text</dataType>
-+                    <label translate="true">Display Report Bugs Link</label>
-+                    <dataScope>footer_report_bugs</dataScope>
-+                </settings>
-+                <formElements>
-+                    <select>
-+                        <settings>
-+                            <options class="Magento\Config\Model\Config\Source\Yesno"/>
-+                        </settings>
-+                    </select>
-+                </formElements>
-+            </field>
-         </fieldset>
-         <fieldset name="search_engine_robots" sortOrder="120">
-             <settings>
-diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
-index fdc08b9adf6..52e9270952a 100644
---- a/app/code/Magento/Theme/view/base/requirejs-config.js
-+++ b/app/code/Magento/Theme/view/base/requirejs-config.js
-@@ -52,6 +52,9 @@ var config = {
-         'mixins': {
-             'jquery/jstree/jquery.jstree': {
-                 'mage/backend/jstree-mixin': true
-+            },
-+            'jquery': {
-+                'jquery/patches/jquery': true
-             }
-         },
-         'text': {
-diff --git a/app/code/Magento/Theme/view/base/templates/root.phtml b/app/code/Magento/Theme/view/base/templates/root.phtml
-index 4923ce9ded7..16948d097ab 100644
---- a/app/code/Magento/Theme/view/base/templates/root.phtml
-+++ b/app/code/Magento/Theme/view/base/templates/root.phtml
-@@ -3,18 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <!doctype html>
--<html <?= /* @escapeNotVerified */ $htmlAttributes ?>>
--    <head <?= /* @escapeNotVerified */ $headAttributes ?>>
--        <?= /* @escapeNotVerified */ $requireJs ?>
--        <?= /* @escapeNotVerified */ $headContent ?>
--        <?= /* @escapeNotVerified */ $headAdditional ?>
-+<html <?= /* @noEscape */ $htmlAttributes ?>>
-+    <head <?= /* @noEscape */ $headAttributes ?>>
-+        <?= /* @noEscape */ $requireJs ?>
-+        <?= /* @noEscape */ $headContent ?>
-+        <?= /* @noEscape */ $headAdditional ?>
-     </head>
--    <body data-container="body" data-mage-init='{"loaderAjax": {}, "loader": { "icon": "<?= /* @escapeNotVerified */ $loaderIcon ?>"}}' <?= /* @escapeNotVerified */ $bodyAttributes ?>>
--        <?= /* @escapeNotVerified */ $layoutContent ?>
-+    <body data-container="body"
-+          data-mage-init='{"loaderAjax": {}, "loader": { "icon": "<?= /* @noEscape */ $loaderIcon ?>"}}'
-+        <?= /* @noEscape */ $bodyAttributes ?>>
-+        <?= /* @noEscape */ $layoutContent ?>
-     </body>
- </html>
-diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
-index 716341f5a64..07d344cb365 100644
---- a/app/code/Magento/Theme/view/frontend/layout/default.xml
-+++ b/app/code/Magento/Theme/view/frontend/layout/default.xml
-@@ -39,7 +39,11 @@
-                             <argument name="label" translate="true" xsi:type="string">Skip to Content</argument>
-                         </arguments>
-                     </block>
--                    <block class="Magento\Store\Block\Switcher" name="store_language" as="store_language" template="Magento_Store::switch/languages.phtml"/>
-+                    <block class="Magento\Store\Block\Switcher" name="store_language" as="store_language" template="Magento_Store::switch/languages.phtml">
-+                        <arguments>
-+                            <argument name="view_model" xsi:type="object">Magento\Store\ViewModel\SwitcherUrlProvider</argument>
-+                        </arguments>
-+                    </block>
-                     <block class="Magento\Customer\Block\Account\Navigation" name="top.links">
-                         <arguments>
-                             <argument name="css_class" xsi:type="string">header links</argument>
-@@ -82,6 +86,7 @@
-                     <block class="Magento\Store\Block\Switcher" name="store.settings.language" template="Magento_Store::switch/languages.phtml">
-                         <arguments>
-                             <argument name="id_modifier" xsi:type="string">nav</argument>
-+                            <argument name="view_model" xsi:type="object">Magento\Store\ViewModel\SwitcherUrlProvider</argument>
-                         </arguments>
-                     </block>
-                     <block class="Magento\Directory\Block\Currency" name="store.settings.currency" template="Magento_Directory::currency.phtml">
-@@ -102,7 +107,9 @@
-             </container>
-         </referenceContainer>
-         <referenceContainer name="main">
--            <container name="content.top" label="Main Content Top"/>
-+            <container name="content.top" label="Main Content Top">
-+                <block name="main_css_preloader" as="main_css_preloader" template="Magento_Theme::html/main_css_preloader.phtml" ifconfig="dev/css/use_css_critical_path"/>
-+            </container>
-             <container name="content" label="Main Content Area"/>
-             <container name="content.aside" label="Main Content Aside"/>
-             <container name="content.bottom" label="Main Content Bottom"/>
-@@ -119,7 +126,7 @@
-                     </arguments>
-                 </block>
-                 <block class="Magento\Theme\Block\Html\Footer" name="copyright" template="Magento_Theme::html/copyright.phtml"/>
--                <block class="Magento\Framework\View\Element\Template" name="report.bugs" template="Magento_Theme::html/bugreport.phtml" />
-+                <block class="Magento\Framework\View\Element\Template" name="report.bugs" template="Magento_Theme::html/bugreport.phtml" ifconfig="design/footer/report_bugs"/>
-             </container>
-         </referenceContainer>
-         <referenceContainer name="before.body.end">
-diff --git a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
-index 38cfe25c16f..ab4dabfa6d1 100644
---- a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
-+++ b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
-@@ -13,6 +13,14 @@
-         <script src="mage/polyfill.js"/>
-     </head>
-     <body>
-+        <referenceBlock name="head.additional">
-+            <block name="critical_css_block" as="critical_css" template="Magento_Theme::html/header/criticalCss.phtml" ifconfig="dev/css/use_css_critical_path">
-+                <arguments>
-+                    <argument name="criticalCssViewModel" xsi:type="object">Magento\Theme\Block\Html\Header\CriticalCss</argument>
-+                </arguments>
-+            </block>
-+            <block name="css_rel_preload_script" ifconfig="dev/css/use_css_critical_path" template="Magento_Theme::js/css_rel_preload.phtml"/>
-+        </referenceBlock>
-         <referenceContainer name="after.body.start">
-             <block class="Magento\Framework\View\Element\Js\Components" name="head.components" as="components" template="Magento_Theme::js/components.phtml" before="-"/>
-         </referenceContainer>
-diff --git a/app/code/Magento/Theme/view/frontend/requirejs-config.js b/app/code/Magento/Theme/view/frontend/requirejs-config.js
-index bf38d3cbaae..aacec30edf1 100644
---- a/app/code/Magento/Theme/view/frontend/requirejs-config.js
-+++ b/app/code/Magento/Theme/view/frontend/requirejs-config.js
-@@ -28,7 +28,8 @@ var config = {
-             'popupWindow':            'mage/popup-window',
-             'validation':             'mage/validation/validation',
-             'welcome':                'Magento_Theme/js/view/welcome',
--            'breadcrumbs':            'Magento_Theme/js/view/breadcrumbs'
-+            'breadcrumbs':            'Magento_Theme/js/view/breadcrumbs',
-+            'criticalCssLoader':      'Magento_Theme/js/view/critical-css-loader'
-         }
-     },
-     paths: {
-@@ -44,6 +45,9 @@ var config = {
-         mixins: {
-             'Magento_Theme/js/view/breadcrumbs': {
-                 'Magento_Theme/js/view/add-home-breadcrumb': true
-+            },
-+            'jquery/jquery-ui': {
-+                'jquery/patches/jquery-ui': true
-             }
-         }
-     }
-diff --git a/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml b/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
-index 0df0fcfbc5e..fb11be34a61 100644
---- a/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
-@@ -3,19 +3,22 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div class="block block-banner">
-     <div class="block-content">
--        <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http'): ?>
--            <a href="<?= /* @escapeNotVerified */ $block->getLinkUrl() ?>" title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>">
--        <?php elseif ($block->getLinkUrl()): ?>
--            <a href="<?= /* @escapeNotVerified */ $block->getUrl($block->getLinkUrl()) ?>" title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>">
-+        <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http') : ?>
-+            <a href="<?= $block->escapeUrl($block->getLinkUrl()) ?>"
-+               title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
-+        <?php elseif ($block->getLinkUrl()) : ?>
-+            <a href="<?= $block->escapeUrl($block->getUrl($block->getLinkUrl())) ?>"
-+               title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
-         <?php endif; ?>
--            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl($block->getImgSrc()) ?>"<?php if (!$block->getLinkUrl()): ?> title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>"<?php endif; ?> alt="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>" />
--        <?php if ($block->getLinkUrl()): ?>
-+            <img src="<?= $block->escapeUrl($block->getViewFileUrl($block->getImgSrc())) ?>"
-+                <?php if (!$block->getLinkUrl()) : ?>
-+                    title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>"
-+                <?php endif; ?>
-+                 alt="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>" />
-+        <?php if ($block->getLinkUrl()) : ?>
-         </a>
-         <?php endif ?>
-     </div>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml b/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
-index 0df0fcfbc5e..fb11be34a61 100644
---- a/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
-@@ -3,19 +3,22 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div class="block block-banner">
-     <div class="block-content">
--        <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http'): ?>
--            <a href="<?= /* @escapeNotVerified */ $block->getLinkUrl() ?>" title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>">
--        <?php elseif ($block->getLinkUrl()): ?>
--            <a href="<?= /* @escapeNotVerified */ $block->getUrl($block->getLinkUrl()) ?>" title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>">
-+        <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http') : ?>
-+            <a href="<?= $block->escapeUrl($block->getLinkUrl()) ?>"
-+               title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
-+        <?php elseif ($block->getLinkUrl()) : ?>
-+            <a href="<?= $block->escapeUrl($block->getUrl($block->getLinkUrl())) ?>"
-+               title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
-         <?php endif; ?>
--            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl($block->getImgSrc()) ?>"<?php if (!$block->getLinkUrl()): ?> title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>"<?php endif; ?> alt="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>" />
--        <?php if ($block->getLinkUrl()): ?>
-+            <img src="<?= $block->escapeUrl($block->getViewFileUrl($block->getImgSrc())) ?>"
-+                <?php if (!$block->getLinkUrl()) : ?>
-+                    title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>"
-+                <?php endif; ?>
-+                 alt="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>" />
-+        <?php if ($block->getLinkUrl()) : ?>
-         </a>
-         <?php endif ?>
-     </div>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml b/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml
-index 708f0e0ef19..76f237064a9 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml
-@@ -4,4 +4,4 @@
-  * See COPYING.txt for license details.
-  */
- ?>
--<?= /* @escapeNotVerified */ $block->getMiscellaneousHtml();
-+<?= /* @noEscape */ $block->getMiscellaneousHtml();
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/block.phtml b/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
-index 8b28a8cd4e3..e8021e2defe 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
-@@ -3,13 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<div class="block <?= /* @escapeNotVerified */ $block->getBlockCss() ?>">
--    <div class="block-title <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-title"><strong><?= /* @escapeNotVerified */ $block->getBlockTitle() ?></strong></div>
--    <div class="block-content <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-content">
-+<div class="block <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>">
-+    <div class="block-title <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>-title">
-+        <strong><?= $block->escapeHtml($block->getBlockTitle()) ?></strong>
-+    </div>
-+    <div class="block-content <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>-content">
-         <?= $block->getChildHtml() ?>
-     </div>
- </div>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml b/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
-index 710c622ce26..ce8e0fd7509 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
-@@ -3,20 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php if ($crumbs && is_array($crumbs)) : ?>
- <div class="breadcrumbs">
-     <ul class="items">
-         <?php foreach ($crumbs as $crumbName => $crumbInfo) : ?>
--            <li class="item <?= /* @escapeNotVerified */ $crumbName ?>">
-+            <li class="item <?= $block->escapeHtmlAttr($crumbName) ?>">
-             <?php if ($crumbInfo['link']) : ?>
--                <a href="<?= /* @escapeNotVerified */ $crumbInfo['link'] ?>" title="<?= $block->escapeHtml($crumbInfo['title']) ?>"><?= $block->escapeHtml($crumbInfo['label']) ?></a>
-+                <a href="<?= $block->escapeUrl($crumbInfo['link']) ?>"
-+                   title="<?= $block->escapeHtml($crumbInfo['title']) ?>">
-+                    <?= $block->escapeHtml($crumbInfo['label']) ?>
-+                </a>
-             <?php elseif ($crumbInfo['last']) : ?>
-                 <strong><?= $block->escapeHtml($crumbInfo['label']) ?></strong>
--            <?php else: ?>
-+            <?php else : ?>
-                 <?= $block->escapeHtml($crumbInfo['label']) ?>
-             <?php endif; ?>
-             </li>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
-index f147b708594..2adbb28b9c5 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
-@@ -5,9 +5,9 @@
-  */
- ?>
- <small class="bugs">
--    <span><?= /* @escapeNotVerified */ __('Help Us Keep Magento Healthy') ?></span>
-+    <span><?= $block->escapeHtml(__('Help Us Keep Magento Healthy')) ?></span>
-     <a href="http://www.magentocommerce.com/bug-tracking"
--       target="_blank" title="<?= /* @escapeNotVerified */ __('Report All Bugs') ?>">
--        <?= /* @escapeNotVerified */ __('Report All Bugs') ?>
-+       target="_blank" title="<?= $block->escapeHtmlAttr(__('Report All Bugs')) ?>">
-+        <?= $block->escapeHtml(__('Report All Bugs')) ?>
-     </a>
- </small>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml b/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
-index c3ad4a89399..1976870a574 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
-@@ -3,16 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
--<div class="block <?= /* @escapeNotVerified */ $block->getBlockCss() ?>">
--    <div class="title <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-title" data-mage-init='{"toggleAdvanced": {"toggleContainers": "#<?= /* @escapeNotVerified */ $block->getBlockCss() ?>", "selectorsToggleClass": "active"}}'>
--        <strong><?= /* @escapeNotVerified */ __($block->getBlockTitle()) ?></strong>
-+<div class="block <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>">
-+    <div class="title <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>-title"
-+         data-mage-init='{"toggleAdvanced": {"toggleContainers": "#<?= $block->escapeHtmlAttr($block->getBlockCss()) ?>", "selectorsToggleClass": "active"}}'>
-+        <strong>
-+            <?= $block->escapeHtml(__($block->getBlockTitle())) ?>
-+        </strong>
-     </div>
--    <div class="content <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-content" id="<?= /* @escapeNotVerified */ $block->getBlockCss() ?>">
-+    <div class="content <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>-content"
-+         id="<?= $block->escapeHtmlAttr($block->getBlockCss()) ?>">
-         <?= $block->getChildHtml() ?>
-     </div>
- </div>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/container.phtml b/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
-index bad5acc209b..4ca5983081a 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?= $block->getChildHtml() ?>
-+<?= $block->getChildHtml();
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml b/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml
-index af2e43d51fa..672ff32734f 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml
-@@ -5,5 +5,5 @@
-  */
- ?>
- <small class="copyright">
--    <span><?= /* @escapeNotVerified */ $block->getCopyright() ?></span>
-+    <span><?= $block->escapeHtml($block->getCopyright()) ?></span>
- </small>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml b/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
-index 093663e3bb7..d7fbc2979ea 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
-@@ -3,17 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div class="footer-container">
-     <div class="footer">
-         <?= $block->getChildHtml() ?>
--        <p class="bugs"><?= /* @escapeNotVerified */ __('Help Us Keep Magento Healthy') ?> - <a
-+        <p class="bugs"><?= $block->escapeHtml(__('Help Us Keep Magento Healthy')) ?> - <a
-             href="http://www.magentocommerce.com/bug-tracking"
--            target="_blank"><strong><?= /* @escapeNotVerified */ __('Report All Bugs') ?></strong></a>
-+            target="_blank"><strong><?= $block->escapeHtml(__('Report All Bugs')) ?></strong></a>
-         </p>
--        <address><?= /* @escapeNotVerified */ $block->getCopyright() ?></address>
-+        <address><?= $block->escapeHtml($block->getCopyright()) ?></address>
-     </div>
- </div>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
-index 4395cab651d..cbefb82f23e 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
-@@ -4,42 +4,37 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var \Magento\Theme\Block\Html\Header $block
-  */
- $welcomeMessage = $block->getWelcome();
- ?>
--<?php switch ($block->getShowPart()):
--    case 'welcome': ?>
--        <li class="greet welcome" data-bind="scope: 'customer'">
--            <!-- ko if: customer().fullname  -->
--            <span data-bind="text: new String('<?= $block->escapeHtml(__('Welcome, %1!', '%1')) ?>').replace('%1', customer().fullname)">
--            </span>
--            <!-- /ko -->
--            <!-- ko ifnot: customer().fullname  -->
--            <span data-bind='html:"<?= $block->escapeHtml($welcomeMessage) ?>"'></span>
--            <?= $block->getBlockHtml('header.additional') ?>
--            <!-- /ko -->
--        </li>
--        <script type="text/x-magento-init">
--        {
--            "*": {
--                "Magento_Ui/js/core/app": {
--                    "components": {
--                        "customer": {
--                            "component": "Magento_Customer/js/view/customer"
--                        }
-+<?php if ($block->getShowPart() == 'welcome') : ?>
-+    <li class="greet welcome" data-bind="scope: 'customer'">
-+        <!-- ko if: customer().fullname  -->
-+        <span class="logged-in"
-+              data-bind="text: new String('<?= $block->escapeHtml(__('Welcome, %1!', '%1')) ?>').replace('%1', customer().fullname)">
-+        </span>
-+        <!-- /ko -->
-+        <!-- ko ifnot: customer().fullname  -->
-+        <span class="not-logged-in"
-+              data-bind='html:"<?= $block->escapeHtml($welcomeMessage) ?>"'></span>
-+        <?= $block->getBlockHtml('header.additional') ?>
-+        <!-- /ko -->
-+    </li>
-+    <script type="text/x-magento-init">
-+    {
-+        "*": {
-+            "Magento_Ui/js/core/app": {
-+                "components": {
-+                    "customer": {
-+                        "component": "Magento_Customer/js/view/customer"
-                     }
-                 }
-             }
-         }
--        </script>
--    <?php break; ?>
--
--    <?php case 'other': ?>
--        <?= $block->getChildHtml() ?>
--    <?php break; ?>
--
--<?php endswitch; ?>
-+    }
-+    </script>
-+<?php elseif ($block->getShowPart() == 'other') :?>
-+    <?= $block->getChildHtml() ?>
-+<?php endif ?>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header/criticalCss.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header/criticalCss.phtml
-new file mode 100644
-index 00000000000..1a191f5649a
---- /dev/null
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/header/criticalCss.phtml
-@@ -0,0 +1,15 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/**
-+ * @var \Magento\Theme\Block\Html\Header\CriticalCss $criticalCssViewModel
-+ */
-+?>
-+<?php $criticalCssViewModel = $block->getData('criticalCssViewModel'); ?>
-+
-+<style type="text/css" data-type="criticalCss">
-+    <?= /* @noEscape */ $criticalCssViewModel->getCriticalCssData() ?>
-+</style>
-\ No newline at end of file
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
-index 17f8d7c70f5..99beea5681f 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
-@@ -4,27 +4,21 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var \Magento\Theme\Block\Html\Header\Logo $block
-  */
-+$storeName = $block->getThemeName() ? $block->getThemeName() : $block->getLogoAlt()
- ?>
--<?php $storeName = $block->getThemeName() ? $block->getThemeName() : $block->getLogoAlt();?>
--<span data-action="toggle-nav" class="action nav-toggle"><span><?= /* @escapeNotVerified */ __('Toggle Nav') ?></span></span>
--<?php if ($block->isHomePage()):?>
--    <strong class="logo">
--<?php else: ?>
--    <a class="logo" href="<?= $block->getUrl('') ?>" title="<?= /* @escapeNotVerified */ $storeName ?>">
--<?php endif ?>
--        <img src="<?= /* @escapeNotVerified */ $block->getLogoSrc() ?>"
--             title="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
--             alt="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
--             <?= $block->getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '' ?>
--             <?= $block->getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '' ?>
--        />
--<?php if ($block->isHomePage()):?>
--    </strong>
--<?php else:?>
--    </a>
--<?php endif?>
-+<span data-action="toggle-nav" class="action nav-toggle"><span><?= $block->escapeHtml(__('Toggle Nav')) ?></span></span>
-+<a
-+    class="logo"
-+    href="<?= $block->escapeUrl($block->getUrl('')) ?>"
-+    title="<?= $block->escapeHtmlAttr($storeName) ?>"
-+    aria-label="store logo">
-+    <img src="<?= $block->escapeUrl($block->getLogoSrc()) ?>"
-+         title="<?= $block->escapeHtmlAttr($block->getLogoAlt()) ?>"
-+         alt="<?= $block->escapeHtmlAttr($block->getLogoAlt()) ?>"
-+            <?= $block->getLogoWidth() ? 'width="' . $block->escapeHtmlAttr($block->getLogoWidth()) . '"' : '' ?>
-+            <?= $block->getLogoHeight() ? 'height="' . $block->escapeHtmlAttr($block->getLogoHeight()) . '"' : '' ?>
-+    />
-+</a>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml b/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml
-new file mode 100644
-index 00000000000..2c1c7db75b1
---- /dev/null
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml
-@@ -0,0 +1,13 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+?>
-+<div data-role="main-css-loader" class="loading-mask">
-+    <div class="loader">
-+        <img src="<?= $block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')); ?>"
-+             alt="<?= $block->escapeHtml(__('Loading...')); ?>"
-+             style="position: absolute;">
-+    </div>
-+</div>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
-index 720ee440079..1414c21c6e9 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
-@@ -4,32 +4,28 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
--<?php
- /**
-  * @var $block \Magento\Theme\Block\Html\Notices
-  */
- ?>
--<?php if ($block->displayNoscriptNotice()): ?>
-+<?php if ($block->displayNoscriptNotice()) : ?>
-     <noscript>
-         <div class="message global noscript">
-             <div class="content">
-                 <p>
--                    <strong><?= /* @escapeNotVerified */ __('JavaScript seems to be disabled in your browser.') ?></strong>
--                    <span><?= /* @escapeNotVerified */ __('For the best experience on our site, be sure to turn on Javascript in your browser.') ?></span>
-+                    <strong><?= $block->escapeHtml(__('JavaScript seems to be disabled in your browser.')) ?></strong>
-+                    <span><?= $block->escapeHtml(__('For the best experience on our site, be sure to turn on Javascript in your browser.')) ?></span>
-                 </p>
-             </div>
-         </div>
-     </noscript>
- <?php endif; ?>
--<?php if ($block->displayNoLocalStorageNotice()): ?>
-+<?php if ($block->displayNoLocalStorageNotice()) : ?>
-     <div class="notice global site local_storage" style="display: none;">
-         <div class="content">
-             <p>
--                <strong><?= /* @escapeNotVerified */ __('Local Storage seems to be disabled in your browser.') ?></strong><br />
--                <?= /* @escapeNotVerified */ __('For the best experience on our site, be sure to turn on Local Storage in your browser.') ?>
-+                <strong><?= $block->escapeHtml(__('Local Storage seems to be disabled in your browser.')) ?></strong><br />
-+                <?= $block->escapeHtml(__('For the best experience on our site, be sure to turn on Local Storage in your browser.')) ?>
-             </p>
-         </div>
-     </div>
-@@ -51,10 +47,10 @@ require(['jquery'], function(jQuery){
- });
- </script>
- <?php endif; ?>
--<?php if ($block->displayDemoNotice()): ?>
-+<?php if ($block->displayDemoNotice()) : ?>
-     <div class="message global demo">
-         <div class="content">
--            <p><?= /* @escapeNotVerified */ __('This is a demo store. No orders will be fulfilled.') ?></p>
-+            <p><?= $block->escapeHtml(__('This is a demo store. No orders will be fulfilled.')) ?></p>
-         </div>
-     </div>
- <?php endif; ?>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
-index 69edfa081df..bd50fa39d40 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
-@@ -4,108 +4,110 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
--<?php
- /**
-  * Pager template
-  *
-  * @see \Magento\Theme\Block\Html\Pager
-  */
- ?>
--<?php if ($block->getCollection()->getSize()): ?>
-+<?php if ($block->getCollection()->getSize()) : ?>
- 
--    <?php if ($block->getUseContainer()): ?>
-+    <?php if ($block->getUseContainer()) : ?>
-     <div class="pager">
-     <?php endif ?>
- 
--        <?php if ($block->getShowAmounts()): ?>
-+        <?php if ($block->getShowAmounts()) : ?>
-         <p class="toolbar-amount">
-             <span class="toolbar-number">
--            <?php if ($block->getLastPageNum()>1): ?>
--                <?= /* @escapeNotVerified */ __('Items %1 to %2 of %3 total', $block->getFirstNum(), $block->getLastNum(), $block->getTotalNum()) ?>
--            <?php elseif ($block->getTotalNum() == 1): ?>
--                <?= /* @escapeNotVerified */ __('%1 Item', $block->getTotalNum()) ?>
--            <?php else: ?>
--                <?= /* @escapeNotVerified */ __('%1 Item(s)', $block->getTotalNum()) ?>
-+            <?php if ($block->getLastPageNum()>1) : ?>
-+                <?= $block->escapeHtml(__('Items %1 to %2 of %3 total', $block->getFirstNum(), $block->getLastNum(), $block->getTotalNum())) ?>
-+            <?php elseif ($block->getTotalNum() == 1) : ?>
-+                <?= $block->escapeHtml(__('%1 Item', $block->getTotalNum())) ?>
-+            <?php else : ?>
-+                <?= $block->escapeHtml(__('%1 Item(s)', $block->getTotalNum())) ?>
-             <?php endif; ?>
-             </span>
-         </p>
-         <?php endif ?>
- 
--        <?php if ($block->getLastPageNum()>1): ?>
-+        <?php if ($block->getLastPageNum()>1) : ?>
-         <div class="pages">
--            <strong class="label pages-label" id="paging-label"><?= /* @escapeNotVerified */ __('Page') ?></strong>
-+            <strong class="label pages-label" id="paging-label"><?= $block->escapeHtml(__('Page')) ?></strong>
-             <ul class="items pages-items" aria-labelledby="paging-label">
--            <?php if (!$block->isFirstPage()): ?>
-+            <?php if (!$block->isFirstPage()) : ?>
-                 <li class="item pages-item-previous">
-                     <?php $text = $block->getAnchorTextForPrevious() ? $block->getAnchorTextForPrevious() : '';?>
--                    <a class="<?= /* @escapeNotVerified */ $text ? 'link ' : 'action ' ?> previous" href="<?= /* @escapeNotVerified */ $block->getPreviousPageUrl() ?>" title="<?= /* @escapeNotVerified */ $text ? $text : __('Previous') ?>">
--                        <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
--                        <span><?= /* @escapeNotVerified */ $text ? $text : __('Previous') ?></span>
-+                    <a class="<?= $block->escapeHtmlAttr($text ? 'link ' : 'action ') ?> previous"
-+                       href="<?= $block->escapeUrl($block->getPreviousPageUrl()) ?>"
-+                       title="<?= $block->escapeHtmlAttr($text ? $text : __('Previous')) ?>">
-+                        <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
-+                        <span><?= $block->escapeHtml($text ? $text : __('Previous')) ?></span>
-                     </a>
-                 </li>
-             <?php endif;?>
- 
--            <?php if ($block->canShowFirst()): ?>
-+            <?php if ($block->canShowFirst()) : ?>
-                 <li class="item">
--                    <a class="page first" href="<?= /* @escapeNotVerified */ $block->getFirstPageUrl() ?>">
--                        <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
-+                    <a class="page first" href="<?= $block->escapeUrl($block->getFirstPageUrl()) ?>">
-+                        <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
-                         <span>1</span>
-                     </a>
-                 </li>
-             <?php endif;?>
- 
--            <?php if ($block->canShowPreviousJump()): ?>
-+            <?php if ($block->canShowPreviousJump()) : ?>
-                 <li class="item">
--                    <a class="page previous jump" title="" href="<?= /* @escapeNotVerified */ $block->getPreviousJumpUrl() ?>">
-+                    <a class="page previous jump"
-+                       title=""
-+                       href="<?= $block->escapeUrl($block->getPreviousJumpUrl()) ?>">
-                         <span>...</span>
-                     </a>
-                 </li>
-             <?php endif;?>
- 
--            <?php foreach ($block->getFramePages() as $_page): ?>
--                <?php if ($block->isPageCurrent($_page)): ?>
-+            <?php foreach ($block->getFramePages() as $_page) : ?>
-+                <?php if ($block->isPageCurrent($_page)) : ?>
-                     <li class="item current">
-                         <strong class="page">
--                            <span class="label"><?= /* @escapeNotVerified */ __('You\'re currently reading page') ?></span>
--                            <span><?= /* @escapeNotVerified */ $_page ?></span>
-+                            <span class="label"><?= $block->escapeHtml(__('You\'re currently reading page')) ?></span>
-+                            <span><?= $block->escapeHtml($_page) ?></span>
-                         </strong>
-                     </li>
--                <?php else: ?>
-+                <?php else : ?>
-                     <li class="item">
--                        <a href="<?= /* @escapeNotVerified */ $block->getPageUrl($_page) ?>" class="page">
--                            <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
--                            <span><?= /* @escapeNotVerified */ $_page ?></span>
-+                        <a href="<?= $block->escapeUrl($block->getPageUrl($_page)) ?>" class="page">
-+                            <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
-+                            <span><?= $block->escapeHtml($_page) ?></span>
-                         </a>
-                     </li>
-                 <?php endif;?>
-             <?php endforeach;?>
- 
--            <?php if ($block->canShowNextJump()): ?>
-+            <?php if ($block->canShowNextJump()) : ?>
-                 <li class="item">
--                    <a class="page next jump" title="" href="<?= /* @escapeNotVerified */ $block->getNextJumpUrl() ?>">
-+                    <a class="page next jump" title="" href="<?= $block->escapeUrl($block->getNextJumpUrl()) ?>">
-                         <span>...</span>
-                     </a>
-                 </li>
-             <?php endif;?>
- 
--            <?php if ($block->canShowLast()): ?>
-+            <?php if ($block->canShowLast()) : ?>
-               <li class="item">
--                  <a class="page last" href="<?= /* @escapeNotVerified */ $block->getLastPageUrl() ?>">
--                      <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
--                      <span><?= /* @escapeNotVerified */ $block->getLastPageNum() ?></span>
-+                  <a class="page last" href="<?= $block->escapeUrl($block->getLastPageUrl()) ?>">
-+                      <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
-+                      <span><?= $block->escapeHtml($block->getLastPageNum()) ?></span>
-                   </a>
-               </li>
-             <?php endif;?>
- 
--            <?php if (!$block->isLastPage()): ?>
-+            <?php if (!$block->isLastPage()) : ?>
-                 <li class="item pages-item-next">
-                     <?php $text = $block->getAnchorTextForNext() ? $block->getAnchorTextForNext() : '';?>
--                    <a class="<?= /* @escapeNotVerified */ $text ? 'link ' : 'action ' ?> next" href="<?= /* @escapeNotVerified */ $block->getNextPageUrl() ?>" title="<?= /* @escapeNotVerified */ $text ? $text : __('Next') ?>">
--                        <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
--                        <span><?= /* @escapeNotVerified */ $text ? $text : __('Next') ?></span>
-+                    <a class="<?= /* @noEscape */ $text ? 'link ' : 'action ' ?> next"
-+                       href="<?= $block->escapeUrl($block->getNextPageUrl()) ?>"
-+                       title="<?= $block->escapeHtmlAttr($text ? $text : __('Next')) ?>">
-+                        <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
-+                        <span><?= $block->escapeHtml($text ? $text : __('Next')) ?></span>
-                     </a>
-                 </li>
-             <?php endif;?>
-@@ -113,22 +115,23 @@
-         </div>
-         <?php endif; ?>
- 
--    <?php if ($block->isShowPerPage()): ?>
-+    <?php if ($block->isShowPerPage()) : ?>
-         <div class="limiter">
--            <strong class="limiter-label"><?= /* @escapeNotVerified */ __('Show') ?></strong>
-+            <strong class="limiter-label"><?= $block->escapeHtml(__('Show')) ?></strong>
-             <select id="limiter" data-mage-init='{"redirectUrl": {"event":"change"}}' class="limiter-options">
--                <?php foreach ($block->getAvailableLimit() as $_key => $_limit): ?>
--                    <option value="<?= /* @escapeNotVerified */ $block->getLimitUrl($_key) ?>"<?php if ($block->isLimitCurrent($_key)): ?>
-+                <?php foreach ($block->getAvailableLimit() as $_key => $_limit) : ?>
-+                    <option value="<?= $block->escapeHtmlAttr($block->getLimitUrl($_key)) ?>"
-+                        <?php if ($block->isLimitCurrent($_key)) : ?>
-                         selected="selected"<?php endif ?>>
--                        <?= /* @escapeNotVerified */ $_limit ?>
-+                        <?= $block->escapeHtml($_limit) ?>
-                     </option>
-                 <?php endforeach; ?>
-             </select>
--            <span class="limiter-text"><?= /* @escapeNotVerified */ __('per page') ?></span>
-+            <span class="limiter-text"><?= $block->escapeHtml(__('per page')) ?></span>
-         </div>
-     <?php endif ?>
- 
--    <?php if ($block->getUseContainer()): ?>
-+    <?php if ($block->getUseContainer()) : ?>
-     </div>
-     <?php endif ?>
- 
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
-index 0c31164f445..602749ba04d 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
-@@ -4,36 +4,40 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
--<?php
--
- /**
--*  General template for displaying group of blocks devided into sections
--*/
-+ *  General template for displaying group of blocks divided into sections
-+ */
- 
- $group = $block->getGroupName();
- $groupCss = $block->getGroupCss();
- $groupBehavior = $block->getGroupBehaviour() ? $block->getGroupBehaviour() : '{"tabs":{"openedState":"active"}}';
- ?>
--<?php if ($detailedInfoGroup = $block->getGroupChildNames($group, 'getChildHtml')):?>
--    <div class="sections <?= /* @escapeNotVerified */ $groupCss ?>">
-+<?php if ($detailedInfoGroup = $block->getGroupChildNames($group, 'getChildHtml')) :?>
-+    <div class="sections <?= $block->escapeHtmlAttr($groupCss) ?>">
-         <?php $layout = $block->getLayout(); ?>
--        <div class="section-items <?= /* @escapeNotVerified */ $groupCss ?>-items" data-mage-init='<?= /* @escapeNotVerified */ $groupBehavior ?>'>
--            <?php foreach ($detailedInfoGroup as $name):?>
-+        <div class="section-items <?= $block->escapeHtmlAttr($groupCss) ?>-items"
-+             data-mage-init='<?= $block->escapeHtmlAttr($groupBehavior) ?>'>
-+            <?php foreach ($detailedInfoGroup as $name) :?>
-                 <?php
-                     $html = $layout->renderElement($name);
--                    if (!trim($html) && ($block->getUseForce() != true)) {
--                        continue;
--                    }
-+                if (!trim($html) && ($block->getUseForce() != true)) {
-+                    continue;
-+                }
-                     $alias = $layout->getElementAlias($name);
-                     $label = $block->getChildData($alias, 'title');
-                 ?>
--                <div class="section-item-title <?= /* @escapeNotVerified */ $groupCss ?>-item-title" data-role="collapsible">
--                    <a class="<?= /* @escapeNotVerified */ $groupCss ?>-item-switch" data-toggle="switch" href="#<?= /* @escapeNotVerified */ $alias ?>"><?= /* @escapeNotVerified */ $label ?></a>
-+                <div class="section-item-title <?= $block->escapeHtmlAttr($groupCss) ?>-item-title"
-+                     data-role="collapsible">
-+                    <a class="<?= $block->escapeHtmlAttr($groupCss) ?>-item-switch"
-+                       data-toggle="switch" href="#<?= $block->escapeHtmlAttr($alias) ?>">
-+                        <?= /* @noEscape */ $label ?>
-+                    </a>
-+                </div>
-+                <div class="section-item-content <?= $block->escapeHtmlAttr($groupCss) ?>-item-content"
-+                     id="<?= $block->escapeHtmlAttr($alias) ?>"
-+                     data-role="content">
-+                    <?= /* @noEscape */ $html ?>
-                 </div>
--                <div class="section-item-content <?= /* @escapeNotVerified */ $groupCss ?>-item-content" id="<?= /* @escapeNotVerified */ $alias ?>" data-role="content"><?= /* @escapeNotVerified */ $html ?></div>
-             <?php endforeach;?>
-         </div>
-     </div>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml b/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
-index 198943530f9..82ea40ef342 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
-@@ -4,8 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- $target = $block->getTarget();
- $label = $block->getLabel();
- ?>
--<a class="action skip <?= /* @escapeNotVerified */ $target ?>" href="#<?= /* @escapeNotVerified */ $target ?>"><span><?= /* @escapeNotVerified */ $label ?></span></a>
-+<a class="action skip <?= $block->escapeHtmlAttr($target) ?>"
-+   href="#<?= $block->escapeHtmlAttr($target) ?>">
-+    <span>
-+        <?= $block->escapeHtml($label) ?>
-+    </span>
-+</a>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml b/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
-index 8a7f35183f3..9c85e06afdc 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- $target_id = $block->getTargetId();
- ?>
--<a id="<?= /* @escapeNotVerified */ $target_id ?>" tabindex="-1"></a>
-+<a id="<?= $block->escapeHtmlAttr($target_id) ?>" tabindex="-1"></a>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
-index 69ff4c8909f..c4961448323 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
-@@ -4,26 +4,27 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\Theme\Block\Html\Title
-  */
- $cssClass = $block->getCssClass() ? ' ' . $block->getCssClass() : '';
--$title = '';
-+$titleHtml = '';
- if (trim($block->getPageHeading())) {
--    $title = '<span class="base" data-ui-id="page-title-wrapper" ' .  $block->getAddBaseAttribute() . '>'
--        . $block->escapeHtml($block->getPageHeading()) . '</span>';
-+    $titleHtml = '<span class="base" data-ui-id="page-title-wrapper" '
-+        . $block->getAddBaseAttribute()
-+        . '>'
-+        . $block->escapeHtml($block->getPageHeading())
-+        . '</span>';
- }
- ?>
--<?php if ($title): ?>
--<div class="page-title-wrapper<?= /* @escapeNotVerified */ $cssClass ?>">
-+<?php if ($titleHtml) : ?>
-+<div class="page-title-wrapper<?= $block->escapeHtmlAttr($cssClass) ?>">
-     <h1 class="page-title"
--        <?php if ($block->getId()): ?> id="<?= /* @escapeNotVerified */ $block->getId() ?>" <?php endif; ?>
--        <?php if ($block->getAddBaseAttributeAria()): ?>
--            aria-labelledby="<?= /* @escapeNotVerified */ $block->getAddBaseAttributeAria() ?>"
-+        <?php if ($block->getId()) : ?> id="<?= $block->escapeHtmlAttr($block->getId()) ?>" <?php endif; ?>
-+        <?php if ($block->getAddBaseAttributeAria()) : ?>
-+            aria-labelledby="<?= $block->escapeHtmlAttr($block->getAddBaseAttributeAria()) ?>"
-         <?php endif; ?>>
--        <?= /* @escapeNotVerified */ $title ?>
-+        <?= /* @noEscape */ $titleHtml ?>
-     </h1>
-     <?= $block->getChildHtml() ?>
- </div>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml b/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
-index 129fd755637..5c9748deeea 100644
---- a/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
-@@ -4,22 +4,19 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
--<?php
- /**
-  * Top menu for store
-  *
-  * @var $block \Magento\Theme\Block\Html\Topmenu
-  */
-+
-+$columnsLimit = $block->getColumnsLimit() ?: 0;
-+$_menuHtml = $block->getHtml('level-top', 'submenu', $columnsLimit)
- ?>
--<?php $columnsLimit = $block->getColumnsLimit() ?: 0; ?>
--<?php $_menu = $block->getHtml('level-top', 'submenu', $columnsLimit) ?>
- 
- <nav class="navigation" data-action="navigation">
-     <ul data-mage-init='{"menu":{"responsive":true, "expanded":true, "position":{"my":"left top","at":"left bottom"}}}'>
--        <?= /* @escapeNotVerified */ $_menu ?>
--        <?= /* @escapeNotVerified */ $block->getChildHtml() ?>
-+        <?= /* @noEscape */ $_menuHtml?>
-+        <?= $block->getChildHtml() ?>
-     </ul>
- </nav>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml b/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
-index 7d18ed17303..e0a3169f4a8 100644
---- a/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
-@@ -3,8 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--?>
--<?php
-+
- /**
-  * Calendar localization script. Should be put into page header.
-  *
-@@ -21,20 +20,20 @@ require([
- //<![CDATA[
-     $.extend(true, $, {
-         calendarConfig: {
--            dayNames: <?= /* @escapeNotVerified */ $days['wide'] ?>,
--            dayNamesMin: <?= /* @escapeNotVerified */ $days['abbreviated'] ?>,
--            monthNames: <?= /* @escapeNotVerified */ $months['wide'] ?>,
--            monthNamesShort: <?= /* @escapeNotVerified */ $months['abbreviated'] ?>,
--            infoTitle: "<?= /* @escapeNotVerified */ __('About the calendar') ?>",
--            firstDay: <?= /* @escapeNotVerified */ $firstDay ?>,
--            closeText: "<?= /* @escapeNotVerified */ __('Close') ?>",
--            currentText: "<?= /* @escapeNotVerified */ __('Go Today') ?>",
--            prevText: "<?= /* @escapeNotVerified */ __('Previous') ?>",
--            nextText: "<?= /* @escapeNotVerified */ __('Next') ?>",
--            weekHeader: "<?= /* @escapeNotVerified */ __('WK') ?>",
--            timeText: "<?= /* @escapeNotVerified */ __('Time') ?>",
--            hourText: "<?= /* @escapeNotVerified */ __('Hour') ?>",
--            minuteText: "<?= /* @escapeNotVerified */ __('Minute') ?>",
-+            dayNames: <?= /* @noEscape */ $days['wide'] ?>,
-+            dayNamesMin: <?= /* @noEscape */ $days['abbreviated'] ?>,
-+            monthNames: <?= /* @noEscape */ $months['wide'] ?>,
-+            monthNamesShort: <?= /* @noEscape */ $months['abbreviated'] ?>,
-+            infoTitle: "<?= $block->escapeJs(__('About the calendar')) ?>",
-+            firstDay: <?= (int)$firstDay ?>,
-+            closeText: "<?= $block->escapeJs(__('Close')) ?>",
-+            currentText: "<?= $block->escapeJs(__('Go Today')) ?>",
-+            prevText: "<?= $block->escapeJs(__('Previous')) ?>",
-+            nextText: "<?= $block->escapeJs(__('Next')) ?>",
-+            weekHeader: "<?= $block->escapeJs(__('WK')) ?>",
-+            timeText: "<?= $block->escapeJs(__('Time')) ?>",
-+            hourText: "<?= $block->escapeJs(__('Hour')) ?>",
-+            minuteText: "<?= $block->escapeJs(__('Minute')) ?>",
-             dateFormat: $.datepicker.RFC_2822,
-             showOn: "button",
-             showAnim: "",
-@@ -51,7 +50,7 @@ require([
-         }
-     });
- 
--    enUS = <?= /* @escapeNotVerified */ $enUS ?>; // en_US locale reference
-+    enUS = <?= /* @noEscape */ $enUS ?>; // en_US locale reference
- //]]>
- 
- });
-diff --git a/app/code/Magento/Theme/view/frontend/templates/js/components.phtml b/app/code/Magento/Theme/view/frontend/templates/js/components.phtml
-index bad5acc209b..4ca5983081a 100644
---- a/app/code/Magento/Theme/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/js/components.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
--<?= $block->getChildHtml() ?>
-+<?= $block->getChildHtml();
-diff --git a/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml b/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
-index 72d93003c1a..7ecfd18d0d3 100644
---- a/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
-@@ -3,8 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--?>
--<?php
-+
- /**
-  * Cookie settings initialization script
-  *
-@@ -17,10 +16,10 @@
-         "*": {
-             "mage/cookies": {
-                 "expires": null,
--                "path": "<?= /* @escapeNotVerified */ $block->getPath() ?>",
--                "domain": "<?= /* @escapeNotVerified */ $block->getDomain() ?>",
-+                "path": "<?= $block->escapeJs($block->getPath()) ?>",
-+                "domain": "<?= $block->escapeJs($block->getDomain()) ?>",
-                 "secure": false,
--                "lifetime": "<?= /* @escapeNotVerified */ $block->getLifetime() ?>"
-+                "lifetime": "<?= $block->escapeJs($block->getLifetime()) ?>"
-             }
-         }
-     }
-diff --git a/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml b/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml
-new file mode 100644
-index 00000000000..d90d528ffc6
---- /dev/null
-+++ b/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+?>
-+<script>
-+    /*! loadCSS rel=preload polyfill. [c]2017 Filament Group, Inc. MIT License */
-+    !function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){var e=t.media||"all";function a(){t.media=e}t.addEventListener?t.addEventListener("load",a):t.attachEvent&&t.attachEvent("onload",a),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(a,3e3)},e.poly=function(){if(!e.support())for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||"style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||(o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);t.addEventListener?t.addEventListener("load",function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}("undefined"!=typeof global?global:this);
-+</script>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/link.phtml b/app/code/Magento/Theme/view/frontend/templates/link.phtml
-index 9fdcbcb3670..32f5447aa0a 100644
---- a/app/code/Magento/Theme/view/frontend/templates/link.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/link.phtml
-@@ -4,16 +4,14 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /**
-  * @var $block \Magento\Framework\View\Element\Html\Link
-  */
- ?>
--<?php if (!$block->getIsDisabled()): ?>
-+<?php if (!$block->getIsDisabled()) : ?>
- <li>
--    <a href="<?= $block->escapeHtml($block->getHref()) ?>"
--        <?php if ($title = $block->getTitle()):?> title="<?= $block->escapeHtml(__($title)) ?>"<?php endif;?>>
-+    <a href="<?= $block->escapeUrl($block->getHref()) ?>"
-+        <?php if ($title = $block->getTitle()) : ?> title="<?= $block->escapeHtmlAttr(__($title)) ?>"<?php endif;?>>
-         <?= $block->escapeHtml(__($block->getLabel())) ?>
-     </a>
- </li>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
-index 2a4b07ee639..ad998c56b96 100644
---- a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
-@@ -7,6 +7,6 @@
- <script>
-     var BASE_URL = '<?= $block->escapeUrl($block->getBaseUrl()) ?>';
-     var require = {
--        "baseUrl": "<?= /* @escapeNotVerified */ $block->getViewFileUrl('/') ?>"
-+        "baseUrl": "<?= $block->escapeUrl($block->getViewFileUrl('/')) ?>"
-     };
- </script>
-diff --git a/app/code/Magento/Theme/view/frontend/templates/template.phtml b/app/code/Magento/Theme/view/frontend/templates/template.phtml
-index ba3d1c939cb..7884c3e08f5 100644
---- a/app/code/Magento/Theme/view/frontend/templates/template.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/template.phtml
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- /** @var $block \Magento\Framework\View\Element\Template */
- ?>
- <?= $block->getChildHtml('', false);
-diff --git a/app/code/Magento/Theme/view/frontend/templates/text.phtml b/app/code/Magento/Theme/view/frontend/templates/text.phtml
-index 4c4b38132c8..d4032908a44 100644
---- a/app/code/Magento/Theme/view/frontend/templates/text.phtml
-+++ b/app/code/Magento/Theme/view/frontend/templates/text.phtml
-@@ -4,12 +4,18 @@
-  * See COPYING.txt for license details.
-  */
- 
--$attributes = $block->getCssClass() ? ' class="' . $block->getCssClass() . '"' : '';
-+$attributes = $block->getCssClass() ? ' class="' . $block->escapeHtmlAttr($block->getCssClass()) . '"' : '';
- $attr = $block->getAttributes();
- if (!empty($attr)) {
-     foreach ($block->getAttributes() as $attribute => $value) {
--        $attributes .= ' ' . $attribute . '="' . $value . '"';
-+        $attributes .= ' ' . $block->escapeHtml($attribute) . '="' . $block->escapeHtmlAttr($value) . '"';
-     }
--};
--echo
--    '<' . $block->getTag() . $attributes . '>' . $block->getText() . '</' . $block->getTag() . '>';
-+}
-+/* @noEscape */ echo '<'
-+    . $block->escapeHtml($block->getTag())
-+    . $attributes
-+    . '>'
-+    . $block->escapeHtml($block->getText())
-+    . '</'
-+    . $block->escapeHtml($block->getTag())
-+    . '>';
-diff --git a/app/code/Magento/ThemeGraphQl/README.md b/app/code/Magento/ThemeGraphQl/README.md
-new file mode 100644
-index 00000000000..2b3d54d9b57
---- /dev/null
-+++ b/app/code/Magento/ThemeGraphQl/README.md
-@@ -0,0 +1,4 @@
-+# ThemeGraphQl
-+
-+**ThemeGraphQl** provides type information for the GraphQl module
-+to generate theme fields information endpoints.
-diff --git a/app/code/Magento/ThemeGraphQl/composer.json b/app/code/Magento/ThemeGraphQl/composer.json
-new file mode 100644
-index 00000000000..e3aac55aea3
---- /dev/null
-+++ b/app/code/Magento/ThemeGraphQl/composer.json
-@@ -0,0 +1,24 @@
-+{
-+    "name": "magento/module-theme-graph-ql",
-+    "description": "N/A",
-+    "type": "magento2-module",
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*"
-+    },
-+    "suggest": {
-+        "magento/module-store-graph-ql": "*"
-+    },
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\ThemeGraphQl\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/ThemeGraphQl/etc/graphql/di.xml b/app/code/Magento/ThemeGraphQl/etc/graphql/di.xml
-new file mode 100644
-index 00000000000..9f55e522bf5
---- /dev/null
-+++ b/app/code/Magento/ThemeGraphQl/etc/graphql/di.xml
-@@ -0,0 +1,30 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
-+        <arguments>
-+            <argument name="extendedConfigData" xsi:type="array">
-+                <item name="head_shortcut_icon" xsi:type="string">design/head/shortcut_icon</item>
-+                <item name="default_title" xsi:type="string">design/head/default_title</item>
-+                <item name="title_prefix" xsi:type="string">design/head/title_prefix</item>
-+                <item name="title_suffix" xsi:type="string">design/head/title_suffix</item>
-+                <item name="default_description" xsi:type="string">design/head/default_description</item>
-+                <item name="default_keywords" xsi:type="string">design/head/default_keywords</item>
-+                <item name="head_includes" xsi:type="string">design/head/includes</item>
-+                <item name="demonotice" xsi:type="string">design/head/demonotice</item>
-+                <item name="header_logo_src" xsi:type="string">design/header/logo_src</item>
-+                <item name="logo_width" xsi:type="string">design/header/logo_width</item>
-+                <item name="logo_height" xsi:type="string">design/header/logo_height</item>
-+                <item name="logo_alt" xsi:type="string">design/header/logo_alt</item>
-+                <item name="welcome" xsi:type="string">design/header/welcome</item>
-+                <item name="absolute_footer" xsi:type="string">design/footer/absolute_footer</item>
-+                <item name="copyright" xsi:type="string">design/footer/copyright</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/app/code/Magento/ThemeGraphQl/etc/module.xml b/app/code/Magento/ThemeGraphQl/etc/module.xml
-new file mode 100644
-index 00000000000..0e10b776af9
---- /dev/null
-+++ b/app/code/Magento/ThemeGraphQl/etc/module.xml
-@@ -0,0 +1,10 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_ThemeGraphQl"/>
-+</config>
-diff --git a/app/code/Magento/ThemeGraphQl/etc/schema.graphqls b/app/code/Magento/ThemeGraphQl/etc/schema.graphqls
-new file mode 100644
-index 00000000000..325fcc8bd98
---- /dev/null
-+++ b/app/code/Magento/ThemeGraphQl/etc/schema.graphqls
-@@ -0,0 +1,19 @@
-+# Copyright © Magento, Inc. All rights reserved.
-+# See COPYING.txt for license details.
-+type StoreConfig @doc(description: "The type contains information about a store config") {
-+    head_shortcut_icon : String @doc(description: "Favicon Icon")
-+    default_title : String @doc(description: "Default Page Title")
-+    title_prefix : String @doc(description: "Page Title Prefix")
-+    title_suffix : String @doc(description: "Page Title Suffix")
-+    default_description : String @doc(description: "Default Meta Description")
-+    default_keywords : String @doc(description: "Default Meta Keywords")
-+    head_includes : String @doc(description: "Scripts and Style Sheets")
-+    demonotice : Int @doc(description: "Display Demo Store Notice")
-+    header_logo_src : String @doc(description: "Logo Image")
-+    logo_width : Int @doc(description: "Logo Attribute Width")
-+    logo_height : Int @doc(description: "Logo Attribute Height")
-+    welcome : String @doc(description: "Welcome Text")
-+    logo_alt : String @doc(description: "Logo Image Alt")
-+    absolute_footer : String @doc(description: "Footer Miscellaneous HTML")
-+    copyright : String @doc(description: "Copyright")
-+}
-diff --git a/app/code/Magento/ThemeGraphQl/registration.php b/app/code/Magento/ThemeGraphQl/registration.php
-new file mode 100644
-index 00000000000..e320fbc9868
---- /dev/null
-+++ b/app/code/Magento/ThemeGraphQl/registration.php
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_ThemeGraphQl', __DIR__);
-diff --git a/app/code/Magento/Tinymce3/Model/Config/Gallery/Config.php b/app/code/Magento/Tinymce3/Model/Config/Gallery/Config.php
-new file mode 100644
-index 00000000000..d11a3fa6e8a
---- /dev/null
-+++ b/app/code/Magento/Tinymce3/Model/Config/Gallery/Config.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Tinymce3\Model\Config\Gallery;
-+
-+/**
-+ * Class Config adds information about required configurations to display media gallery of tinymce3 editor
-+ *
-+ * @deprecated use \Magento\Cms\Model\Wysiwyg\DefaultConfigProvider instead
-+ */
-+class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
-+{
-+    /**
-+     * @var \Magento\Backend\Model\UrlInterface
-+     */
-+    private $backendUrl;
-+
-+    /**
-+     * @param \Magento\Backend\Model\UrlInterface $backendUrl
-+     */
-+    public function __construct(
-+        \Magento\Backend\Model\UrlInterface $backendUrl
-+    ) {
-+        $this->backendUrl = $backendUrl;
-+    }
-+
-+    /**
-+     * Returns media gallery config
-+     *
-+     * @param \Magento\Framework\DataObject $config
-+     * @return \Magento\Framework\DataObject
-+     */
-+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
-+    {
-+        $config->addData(
-+            [
-+                'add_images' => true,
-+                'files_browser_window_url' => $this->backendUrl->getUrl('cms/wysiwyg_images/index'),
-+            ]
-+        );
-+
-+        return $config;
-+    }
-+}
-diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection.xml b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection.xml
-index 83296abf61d..76c0a9e1fe7 100644
---- a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection.xml
-+++ b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection.xml
-@@ -7,12 +7,13 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="ProductWYSIWYGSection">
-         <element name="Tinymce3MSG" type="button" selector=".admin__field-error"/>
-     </section>
-     <section name="TinyMCESection">
-         <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
-+        <element name="InsertImageBtnTinyMCE3" type="button" selector="#cms_page_form_content_image"/>
-     </section>
-     <section name="NewsletterWYSIWYGSection">
-         <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
-diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
-index 0806011e8ff..e15886e026c 100644
---- a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
-+++ b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="AdminSwitchWYSIWYGOptionsTest">
-         <annotations>
-             <features value="Cms"/>
-@@ -16,10 +16,7 @@
-             <title value="Admin should able to switch between versions of TinyMCE"/>
-             <description value="Admin should able to switch between versions of TinyMCE"/>
-             <severity value="CRITICAL"/>
--            <testCaseId value="MAGETWO-82936"/>
--            <skip>
--                <issueId value="MAGETWO-89417"/>
--            </skip>
-+            <testCaseId value="MC-6114"/>
-         </annotations>
-         <before>
-             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-diff --git a/app/code/Magento/Tinymce3/composer.json b/app/code/Magento/Tinymce3/composer.json
-index 946bfe13f34..9ea4c7b2f18 100644
---- a/app/code/Magento/Tinymce3/composer.json
-+++ b/app/code/Magento/Tinymce3/composer.json
-@@ -4,9 +4,12 @@
-     "require": {
-         "php": "~7.1.3||~7.2.0",
-         "magento/framework": "*",
-+        "magento/module-backend": "*",
-         "magento/module-ui": "*",
-         "magento/module-variable": "*",
--        "magento/module-widget": "*"
-+        "magento/module-widget": "*",
-+        "magento/module-cms": "*"
-+
-     },
-     "suggest": {
-         "magento/module-cms": "*"
-diff --git a/app/code/Magento/Tinymce3/etc/adminhtml/di.xml b/app/code/Magento/Tinymce3/etc/adminhtml/di.xml
-index bf1ec774829..53ab66c7ef2 100644
---- a/app/code/Magento/Tinymce3/etc/adminhtml/di.xml
-+++ b/app/code/Magento/Tinymce3/etc/adminhtml/di.xml
-@@ -22,7 +22,7 @@
-                 <item name="Magento_Tinymce3/tinymce3Adapter" xsi:type="string">Magento\Tinymce3\Model\Config\Widget\Config</item>
-             </argument>
-             <argument name="galleryConfigProvider" xsi:type="array">
--                <item name="Magento_Tinymce3/tinymce3Adapter" xsi:type="string">Magento\Cms\Model\WysiwygDefaultConfig</item>
-+                <item name="Magento_Tinymce3/tinymce3Adapter" xsi:type="string">Magento\Tinymce3\Model\Config\Gallery\Config</item>
-             </argument>
-         </arguments>
-     </type>
-diff --git a/app/code/Magento/Tinymce3/view/base/requirejs-config.js b/app/code/Magento/Tinymce3/view/base/requirejs-config.js
-index b9b43ab3896..f96cf7d4f72 100644
---- a/app/code/Magento/Tinymce3/view/base/requirejs-config.js
-+++ b/app/code/Magento/Tinymce3/view/base/requirejs-config.js
-@@ -5,11 +5,13 @@
- 
- var config = {
-     shim: {
--        'tinymceDeprecated': {
-+        'Magento_Tinymce3/tiny_mce/tiny_mce_src': {
-             'exports': 'tinymce'
-         }
-     },
--    paths: {
--        'tinymceDeprecated': 'Magento_Tinymce3/tiny_mce/tiny_mce_src'
-+    map: {
-+        '*': {
-+            'tinymceDeprecated': 'Magento_Tinymce3/tiny_mce/tiny_mce_src'
-+        }
-     }
- };
-diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/ControlManager.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/ControlManager.js
-index 51fa3115258..784042988c0 100644
---- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/ControlManager.js
-+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/ControlManager.js
-@@ -45,7 +45,7 @@
- 		},
- 
- 		/**
--		 * Returns a control by id or undefined it it wasn't found.
-+		 * Returns a control by id or undefined it wasn't found.
- 		 *
- 		 * @method get
- 		 * @param {String} id Control instance name.
-diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
-index 5f05d3f3015..b7266779d3a 100644
---- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
-+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
-@@ -1856,7 +1856,7 @@
- 				}
- 			};
- 
--			// Applies formatting to the caret postion
-+			// Applies formatting to the caret position
- 			function applyCaretFormat() {
- 				var rng, caretContainer, textNode, offset, bookmark, container, text;
- 
-@@ -1970,7 +1970,7 @@
- 					node.appendChild(dom.doc.createTextNode(invisibleChar));
- 					node = node.firstChild;
- 
--					// Insert caret container after the formated node
-+					// Insert caret container after the formatted node
- 					dom.insertAfter(caretContainer, formatNode);
- 
- 					// Move selection to text node
-diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Styles.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Styles.js
-index edf1e13a4e3..60c5565d72a 100644
---- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Styles.js
-+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Styles.js
-@@ -79,7 +79,7 @@ tinymce.html.Styles = function(settings, schema) {
- 			function compress(prefix, suffix) {
- 				var top, right, bottom, left;
- 
--				// Get values and check it it needs compressing
-+				// Get values and check it needs compressing
- 				top = styles[prefix + '-top' + suffix];
- 				if (!top)
- 					return;
-diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Writer.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Writer.js
-index 2abfac6478a..f37607f7327 100644
---- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Writer.js
-+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Writer.js
-@@ -110,7 +110,7 @@ tinymce.html.Writer = function(settings) {
- 		 *
- 		 * @method text
- 		 * @param {String} text String to write out.
--		 * @param {Boolean} raw Optional raw state if true the contents wont get encoded.
-+		 * @param {Boolean} raw Optional raw state if true the contents won't get encoded.
- 		 */
- 		text: function(text, raw) {
- 			if (text.length > 0)
-diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/autosave/editor_plugin_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/autosave/editor_plugin_src.js
-index e215f078c4b..c147e4d8f87 100644
---- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/autosave/editor_plugin_src.js
-+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/autosave/editor_plugin_src.js
-@@ -20,14 +20,14 @@
-  * 1. localStorage - A new feature of HTML 5, localStorage can store megabytes of data per domain
-  * on the client computer. Data stored in the localStorage area has no expiration date, so we must
-  * manage expiring the data ourselves.  localStorage is fully supported by IE8, and it is supposed
-- * to be working in Firefox 3 and Safari 3.2, but in reality is flaky in those browsers.  As
-+ * to be working in Firefox 3 and Safari 3.2, but in reality it is flaky in those browsers.  As
-  * HTML 5 gets wider support, the AutoSave plugin will use it automatically. In Windows Vista/7,
-  * localStorage is stored in the following folder:
-  * C:\Users\[username]\AppData\Local\Microsoft\Internet Explorer\DOMStore\[tempFolder]
-  * 
-  * 2. sessionStorage - A new feature of HTML 5, sessionStorage works similarly to localStorage,
-  * except it is designed to expire after a certain amount of time.  Because the specification
-- * around expiration date/time is very loosely-described, it is preferrable to use locaStorage and
-+ * around expiration date/time is very loosely-described, it is preferable to use locaStorage and
-  * manage the expiration ourselves.  sessionStorage has similar storage characteristics to
-  * localStorage, although it seems to have better support by Firefox 3 at the moment.  (That will
-  * certainly change as Firefox continues getting better at HTML 5 adoption.)
-diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/example/editor_plugin_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/example/editor_plugin_src.js
-index edc1e776e55..bd805e63702 100644
---- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/example/editor_plugin_src.js
-+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/example/editor_plugin_src.js
-@@ -49,7 +49,7 @@
- 		},
- 
- 		/**
--		 * Creates control instances based in the incomming name. This method is normally not
-+		 * Creates control instances based in the incoming name. This method is normally not
- 		 * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons
- 		 * but you sometimes need to create more complex controls like listboxes, split buttons etc then this
- 		 * method can be used to create those.
-diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/themes/advanced/js/source_editor.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/themes/advanced/js/source_editor.js
-index 9cf6b1a29cd..e90ee4d9962 100644
---- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/themes/advanced/js/source_editor.js
-+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/themes/advanced/js/source_editor.js
-@@ -10,8 +10,9 @@ function onLoadInit() {
- 	tinyMCEPopup.resizeToInnerSize();
- 
- 	// Remove Gecko spellchecking
--	if (tinymce.isGecko)
--		document.body.spellcheck = tinyMCEPopup.editor.getParam("gecko_spellcheck");
-+	if (tinymce.isGecko) {
-+		document.body.spellcheck = tinyMCEPopup.editor.getParam("gecko_spellcheck", false);
-+	}
- 
- 	document.getElementById('htmlSource').value = tinyMCEPopup.editor.getContent({source_view : true});
- 
-diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
-index 2daf1620a91..60dd358414b 100644
---- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
-+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
-@@ -1731,7 +1731,7 @@ tinymce.html.Styles = function(settings, schema) {
- 			function compress(prefix, suffix) {
- 				var top, right, bottom, left;
- 
--				// Get values and check it it needs compressing
-+				// Get values and check it needs compressing
- 				top = styles[prefix + '-top' + suffix];
- 				if (!top)
- 					return;
-@@ -15682,7 +15682,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
- 				}
- 			};
- 
--			// Applies formatting to the caret postion
-+			// Applies formatting to the caret position
- 			function applyCaretFormat() {
- 				var rng, caretContainer, textNode, offset, bookmark, container, text;
- 
-@@ -15796,7 +15796,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
- 					node.appendChild(dom.doc.createTextNode(invisibleChar));
- 					node = node.firstChild;
- 
--					// Insert caret container after the formated node
-+					// Insert caret container after the formatted node
- 					dom.insertAfter(caretContainer, formatNode);
- 
- 					// Move selection to text node
-diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
-index 44b3010b0ad..ed0b7cb0e50 100644
---- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
-+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
-@@ -1483,7 +1483,7 @@ tinymce.html.Styles = function(settings, schema) {
- 			function compress(prefix, suffix) {
- 				var top, right, bottom, left;
- 
--				// Get values and check it it needs compressing
-+				// Get values and check it needs compressing
- 				top = styles[prefix + '-top' + suffix];
- 				if (!top)
- 					return;
-@@ -16532,7 +16532,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
- 				}
- 			};
- 			
--			// Applies formatting to the caret postion
-+			// Applies formatting to the caret position
- 			function applyCaretFormat() {
- 				var rng, caretContainer, textNode, offset, bookmark, container, text;
- 
-@@ -16646,7 +16646,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
- 					node.appendChild(dom.doc.createTextNode(invisibleChar));
- 					node = node.firstChild;
- 
--					// Insert caret container after the formated node
-+					// Insert caret container after the formatted node
- 					dom.insertAfter(caretContainer, formatNode);
- 
- 					// Move selection to text node
-diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
-index 46ba27e60f4..1c53062dd96 100644
---- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
-+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
-@@ -1456,7 +1456,7 @@ tinymce.html.Styles = function(settings, schema) {
- 			function compress(prefix, suffix) {
- 				var top, right, bottom, left;
- 
--				// Get values and check it it needs compressing
-+				// Get values and check it needs compressing
- 				top = styles[prefix + '-top' + suffix];
- 				if (!top)
- 					return;
-@@ -16506,7 +16506,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
- 				}
- 			};
- 
--			// Applies formatting to the caret postion
-+			// Applies formatting to the caret position
- 			function applyCaretFormat() {
- 				var rng, caretContainer, textNode, offset, bookmark, container, text;
- 
-@@ -16620,7 +16620,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
- 					node.appendChild(dom.doc.createTextNode(invisibleChar));
- 					node = node.firstChild;
- 
--					// Insert caret container after the formated node
-+					// Insert caret container after the formatted node
- 					dom.insertAfter(caretContainer, formatNode);
- 
- 					// Move selection to text node
-diff --git a/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js b/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
-index 7c587c1c876..bb3300baf98 100644
---- a/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
-+++ b/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
-@@ -37,7 +37,15 @@ define([
-             this.config = config;
-             this.schema = config.schema || html5Schema;
- 
--            _.bindAll(this, 'beforeSetContent', 'saveContent', 'onChangeContent', 'openFileBrowser', 'updateTextArea');
-+            _.bindAll(
-+                this,
-+                'beforeSetContent',
-+                'saveContent',
-+                'onChangeContent',
-+                'openFileBrowser',
-+                'updateTextArea',
-+                'removeEvents'
-+            );
- 
-             varienGlobalEvents.attachEventHandler('tinymceChange', this.onChangeContent);
-             varienGlobalEvents.attachEventHandler('tinymceBeforeSetContent', this.beforeSetContent);
-@@ -72,6 +80,17 @@ define([
-             tinyMCE3.init(this.getSettings(mode));
-         },
- 
-+        /**
-+         * Remove events from instance.
-+         *
-+         * @param {String} wysiwygId
-+         */
-+        removeEvents: function (wysiwygId) {
-+            var editor = tinyMceEditors.get(wysiwygId);
-+
-+            varienGlobalEvents.removeEventHandler('tinymceChange', editor.onChangeContent);
-+        },
-+
-         /**
-          * @param {*} mode
-          * @return {Object}
-diff --git a/app/code/Magento/Translation/Block/Js.php b/app/code/Magento/Translation/Block/Js.php
-index 86bb416524d..db26feb8067 100644
---- a/app/code/Magento/Translation/Block/Js.php
-+++ b/app/code/Magento/Translation/Block/Js.php
-@@ -8,9 +8,10 @@ namespace Magento\Translation\Block;
- 
- use Magento\Framework\View\Element\Template;
- use Magento\Translation\Model\Js\Config;
--use Magento\Framework\Escaper;
- 
- /**
-+ * JS translation block
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -54,7 +55,7 @@ class Js extends Template
-     }
- 
-     /**
--     * gets current js-translation.json timestamp
-+     * Gets current js-translation.json timestamp
-      *
-      * @return string
-      */
-@@ -64,6 +65,8 @@ class Js extends Template
-     }
- 
-     /**
-+     * Get translation file path
-+     *
-      * @return string
-      */
-     public function getTranslationFilePath()
-diff --git a/app/code/Magento/Translation/Model/Inline/Parser.php b/app/code/Magento/Translation/Model/Inline/Parser.php
-index e0b2ce40405..c3f34770d88 100644
---- a/app/code/Magento/Translation/Model/Inline/Parser.php
-+++ b/app/code/Magento/Translation/Model/Inline/Parser.php
-@@ -6,9 +6,17 @@
- 
- namespace Magento\Translation\Model\Inline;
- 
-+use Magento\Translation\Model\ResourceModel\StringUtilsFactory;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Framework\App\State;
-+use Magento\Framework\App\Cache\TypeListInterface;
-+use Magento\Framework\Translate\InlineInterface;
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Translation\Model\Inline\CacheManager;
-+
- /**
-- * This class is responsible for parsing content and applying necessary html element
-- * wrapping and client scripts for inline translation.
-+ * Parse content, applying necessary html element wrapping and client scripts for inline translation.
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
-@@ -19,6 +27,11 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-      */
-     const DATA_TRANSLATE = 'data-translate';
- 
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * Response body or JSON content string
-      *
-@@ -97,7 +110,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-     protected $_resourceFactory;
- 
-     /**
--     * @var \Magento\Store\Model\StoreManagerInterface
-+     * @var StoreManagerInterface
-      */
-     protected $_storeManager;
- 
-@@ -107,22 +120,22 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-     protected $_inputFilter;
- 
-     /**
--     * @var \Magento\Framework\App\State
-+     * @var State
-      */
-     protected $_appState;
- 
-     /**
--     * @var \Magento\Framework\Translate\InlineInterface
-+     * @var InlineInterface
-      */
-     protected $_translateInline;
- 
-     /**
--     * @var \Magento\Framework\App\Cache\TypeListInterface
-+     * @var TypeListInterface
-      */
-     protected $_appCache;
- 
-     /**
--     * @var \Magento\Translation\Model\Inline\CacheManager
-+     * @var CacheManager
-      */
-     private $cacheManager;
- 
-@@ -132,15 +145,17 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-     private $relatedCacheTypes;
- 
-     /**
--     * @return \Magento\Translation\Model\Inline\CacheManager
-+     * Return cache manager
-+     *
-+     * @return CacheManager
-      *
-      * @deprecated 100.1.0
-      */
-     private function getCacheManger()
-     {
--        if (!$this->cacheManager instanceof \Magento\Translation\Model\Inline\CacheManager) {
--            $this->cacheManager = \Magento\Framework\App\ObjectManager::getInstance()->get(
--                \Magento\Translation\Model\Inline\CacheManager::class
-+        if (!$this->cacheManager instanceof CacheManager) {
-+            $this->cacheManager = ObjectManager::getInstance()->get(
-+                CacheManager::class
-             );
-         }
-         return $this->cacheManager;
-@@ -149,22 +164,24 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-     /**
-      * Initialize base inline translation model
-      *
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
--     * @param \Magento\Translation\Model\ResourceModel\StringUtilsFactory $resource
-+     * @param StringUtilsFactory $resource
-+     * @param StoreManagerInterface $storeManager
-      * @param \Zend_Filter_Interface $inputFilter
--     * @param \Magento\Framework\App\State $appState
--     * @param \Magento\Framework\App\Cache\TypeListInterface $appCache
--     * @param \Magento\Framework\Translate\InlineInterface $translateInline
-+     * @param State $appState
-+     * @param TypeListInterface $appCache
-+     * @param InlineInterface $translateInline
-      * @param array $relatedCacheTypes
-+     * @param Escaper|null $escaper
-      */
-     public function __construct(
--        \Magento\Translation\Model\ResourceModel\StringUtilsFactory $resource,
--        \Magento\Store\Model\StoreManagerInterface $storeManager,
-+        StringUtilsFactory $resource,
-+        StoreManagerInterface $storeManager,
-         \Zend_Filter_Interface $inputFilter,
--        \Magento\Framework\App\State $appState,
--        \Magento\Framework\App\Cache\TypeListInterface $appCache,
--        \Magento\Framework\Translate\InlineInterface $translateInline,
--        array $relatedCacheTypes = []
-+        State $appState,
-+        TypeListInterface $appCache,
-+        InlineInterface $translateInline,
-+        array $relatedCacheTypes = [],
-+        Escaper $escaper = null
-     ) {
-         $this->_resourceFactory = $resource;
-         $this->_storeManager = $storeManager;
-@@ -173,6 +190,9 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-         $this->_appCache = $appCache;
-         $this->_translateInline = $translateInline;
-         $this->relatedCacheTypes = $relatedCacheTypes;
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-     }
- 
-     /**
-@@ -236,8 +256,8 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-     /**
-      * Apply input filter to values of translation parameters
-      *
--     * @param array &$translateParams
--     * @param array $fieldNames Names of fields values of which are to be filtered
-+     * @param array $translateParams
-+     * @param array $fieldNames
-      * @return void
-      */
-     protected function _filterTranslationParams(array &$translateParams, array $fieldNames)
-@@ -344,7 +364,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-     {
-         $specialTags = $tagHtml . '<span class="translate-inline-' . $tagName . '" ' . $this->_getHtmlAttribute(
-             self::DATA_TRANSLATE,
--            '[' . htmlspecialchars(join(',', $trArr)) . ']'
-+            '[' . $this->escaper->escapeHtml(join(',', $trArr)) . ']'
-         );
-         $additionalAttr = $this->_getAdditionalHtmlAttribute($tagName);
-         if ($additionalAttr !== null) {
-@@ -360,7 +380,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-      * Format translation for simple tags.  Added translate mode attribute for vde requests.
-      *
-      * @param string $tagHtml
--     * @param string  $tagName
-+     * @param string $tagName
-      * @param array $trArr
-      * @return string
-      */
-@@ -372,7 +392,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-             strlen($tagName) + 1
-         ) . ' ' . $this->_getHtmlAttribute(
-             self::DATA_TRANSLATE,
--            htmlspecialchars('[' . join(',', $trArr) . ']')
-+            $this->escaper->escapeHtml('[' . join(',', $trArr) . ']')
-         );
-         $additionalAttr = $this->_getAdditionalHtmlAttribute($tagName);
-         if ($additionalAttr !== null) {
-@@ -386,12 +406,12 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-      * Get translate data by regexp
-      *
-      * @param string $regexp
--     * @param string &$text
--     * @param string|array $locationCallback
-+     * @param string $text
-+     * @param callable $locationCallback
-      * @param array $options
-      * @return array
-      */
--    private function _getTranslateData($regexp, &$text, $locationCallback, $options = [])
-+    private function _getTranslateData(string $regexp, string &$text, callable $locationCallback, array $options = [])
-     {
-         $trArr = [];
-         $next = 0;
-@@ -401,7 +421,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-                     'shown' => htmlspecialchars_decode($matches[1][0]),
-                     'translated' => htmlspecialchars_decode($matches[2][0]),
-                     'original' => htmlspecialchars_decode($matches[3][0]),
--                    'location' => htmlspecialchars_decode(call_user_func($locationCallback, $matches, $options)),
-+                    'location' => htmlspecialchars_decode($locationCallback($matches, $options)),
-                 ]
-             );
-             $text = substr_replace($text, $matches[1][0], $matches[0][1], strlen($matches[0][0]));
-@@ -446,7 +466,8 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-                     $tagHtml = str_replace($matches[0], '', $tagHtml);
-                     $trAttr = ' ' . $this->_getHtmlAttribute(
-                         self::DATA_TRANSLATE,
--                        '[' . htmlspecialchars($matches[1]) . ',' . str_replace("\"", "'", join(',', $trArr)) . ']'
-+                        '[' . $this->escaper->escapeHtml($matches[1]) . ',' .
-+                        str_replace("\"", "'", join(',', $trArr)) . ']'
-                     );
-                 } else {
-                     $trAttr = ' ' . $this->_getHtmlAttribute(
-@@ -512,19 +533,31 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-      */
-     private function _specialTags()
-     {
--        $this->_translateTags($this->_content, $this->_allowedTagsGlobal, '_applySpecialTagsFormat');
--        $this->_translateTags($this->_content, $this->_allowedTagsSimple, '_applySimpleTagsFormat');
-+        $this->_translateTags(
-+            $this->_content,
-+            $this->_allowedTagsGlobal,
-+            function ($tagHtml, $tagName, $trArr) {
-+                return $this->_applySpecialTagsFormat($tagHtml, $tagName, $trArr);
-+            }
-+        );
-+        $this->_translateTags(
-+            $this->_content,
-+            $this->_allowedTagsSimple,
-+            function ($tagHtml, $tagName, $trArr) {
-+                return $this->_applySimpleTagsFormat($tagHtml, $tagName, $trArr);
-+            }
-+        );
-     }
- 
-     /**
-      * Prepare simple tags
-      *
--     * @param string &$content
-+     * @param string $content
-      * @param array $tagsList
--     * @param string|array $formatCallback
-+     * @param callable $formatCallback
-      * @return void
-      */
--    private function _translateTags(&$content, $tagsList, $formatCallback)
-+    private function _translateTags(string &$content, array $tagsList, callable $formatCallback)
-     {
-         $nextTag = 0;
-         $tagRegExpBody = '#<(body)(/?>| \s*[^>]*+/?>)#iSU';
-@@ -575,10 +608,10 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-                     if (array_key_exists($tagName, $this->_allowedTagsGlobal)
-                         && $tagBodyOpenStartPosition > $tagMatch[0][1]
-                     ) {
--                        $tagHtmlHead = call_user_func([$this, $formatCallback], $tagHtml, $tagName, $trArr);
-+                        $tagHtmlHead = $formatCallback($tagHtml, $tagName, $trArr);
-                         $headTranslateTags .= substr($tagHtmlHead, strlen($tagHtml));
-                     } else {
--                        $tagHtml = call_user_func([$this, $formatCallback], $tagHtml, $tagName, $trArr);
-+                        $tagHtml = $formatCallback($tagHtml, $tagName, $trArr);
-                     }
-                 }
- 
-@@ -649,7 +682,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
-             );
- 
-             $spanHtml = $this->_getDataTranslateSpan(
--                '[' . htmlspecialchars($translateProperties) . ']',
-+                '[' . $this->escaper->escapeHtmlAttr($translateProperties) . ']',
-                 $matches[1][0]
-             );
-             $this->_content = substr_replace($this->_content, $spanHtml, $matches[0][1], strlen($matches[0][0]));
-diff --git a/app/code/Magento/Translation/Model/Js/PreProcessor.php b/app/code/Magento/Translation/Model/Js/PreProcessor.php
-index e85d0226276..a96cdf5e325 100644
---- a/app/code/Magento/Translation/Model/Js/PreProcessor.php
-+++ b/app/code/Magento/Translation/Model/Js/PreProcessor.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Translation\Model\Js;
- 
- use Magento\Framework\App\AreaList;
-@@ -92,6 +94,6 @@ class PreProcessor implements PreProcessorInterface
-      */
-     protected function replaceCallback($matches)
-     {
--        return '"' . __($matches[1]) . '"';
-+        return '\'' . __($matches['translate']) . '\'';
-     }
- }
-diff --git a/app/code/Magento/Translation/Model/Json/PreProcessor.php b/app/code/Magento/Translation/Model/Json/PreProcessor.php
-index 5d46c3c8b06..c178a324cb4 100644
---- a/app/code/Magento/Translation/Model/Json/PreProcessor.php
-+++ b/app/code/Magento/Translation/Model/Json/PreProcessor.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\Translation\Model\Json;
- 
-+use Magento\Framework\App\Area;
- use Magento\Framework\App\AreaList;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\TranslateInterface;
-@@ -13,6 +14,7 @@ use Magento\Framework\View\Asset\File\FallbackContext;
- use Magento\Framework\View\Asset\PreProcessor\Chain;
- use Magento\Framework\View\Asset\PreProcessorInterface;
- use Magento\Framework\View\DesignInterface;
-+use Magento\Backend\App\Area\FrontNameResolver;
- use Magento\Translation\Model\Js\Config;
- use Magento\Translation\Model\Js\DataProviderInterface;
- 
-@@ -83,7 +85,7 @@ class PreProcessor implements PreProcessorInterface
-             $context = $chain->getAsset()->getContext();
- 
-             $themePath = '*/*';
--            $areaCode = \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE;
-+            $areaCode = FrontNameResolver::AREA_CODE;
- 
-             if ($context instanceof FallbackContext) {
-                 $themePath = $context->getThemePath();
-@@ -92,8 +94,10 @@ class PreProcessor implements PreProcessorInterface
-                 $this->viewDesign->setDesignTheme($themePath, $areaCode);
-             }
- 
--            $area = $this->areaList->getArea($areaCode);
--            $area->load(\Magento\Framework\App\Area::PART_TRANSLATE);
-+            if ($areaCode !== FrontNameResolver::AREA_CODE) {
-+                $area = $this->areaList->getArea($areaCode);
-+                $area->load(Area::PART_TRANSLATE);
-+            }
- 
-             $this->translate->setLocale($context->getLocale())->loadData($areaCode, true);
- 
-diff --git a/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php b/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php
-index 4be4e055a7d..be7656fbf61 100644
---- a/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php
-+++ b/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php
-@@ -5,8 +5,19 @@
-  */
- namespace Magento\Translation\Model\ResourceModel;
- 
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\ObjectManager;
-+
-+/**
-+ * String translation utilities
-+ */
- class StringUtils extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- {
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * @var \Magento\Framework\Locale\ResolverInterface
-      */
-@@ -28,17 +39,22 @@ class StringUtils extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
-      * @param string $connectionName
-      * @param string|null $scope
-+     * @param Escaper|null $escaper
-      */
-     public function __construct(
-         \Magento\Framework\Model\ResourceModel\Db\Context $context,
-         \Magento\Framework\Locale\ResolverInterface $localeResolver,
-         \Magento\Framework\App\ScopeResolverInterface $scopeResolver,
-         $connectionName = null,
--        $scope = null
-+        $scope = null,
-+        Escaper $escaper = null
-     ) {
-         $this->_localeResolver = $localeResolver;
-         $this->scopeResolver = $scopeResolver;
-         $this->scope = $scope;
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-         parent::__construct($context, $connectionName);
-     }
- 
-@@ -211,7 +227,7 @@ class StringUtils extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-         $string = htmlspecialchars_decode($string);
-         $connection = $this->getConnection();
-         $table = $this->getMainTable();
--        $translate = htmlspecialchars($translate, ENT_QUOTES);
-+        $translate = $this->escaper->escapeHtml($translate);
- 
-         if ($locale === null) {
-             $locale = $this->_localeResolver->getLocale();
-diff --git a/app/code/Magento/Translation/Test/Unit/Model/Js/PreProcessorTest.php b/app/code/Magento/Translation/Test/Unit/Model/Js/PreProcessorTest.php
-deleted file mode 100644
-index 713086f2988..00000000000
---- a/app/code/Magento/Translation/Test/Unit/Model/Js/PreProcessorTest.php
-+++ /dev/null
-@@ -1,85 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Translation\Test\Unit\Model\Js;
--
--use Magento\Translation\Model\Js\PreProcessor;
--use Magento\Translation\Model\Js\Config;
--use Magento\Framework\App\AreaList;
--use Magento\Framework\TranslateInterface;
--
--class PreProcessorTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var PreProcessor
--     */
--    protected $model;
--
--    /**
--     * @var Config|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $configMock;
--
--    /**
--     * @var AreaList|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $areaListMock;
--
--    /**
--     * @var TranslateInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $translateMock;
--
--    protected function setUp()
--    {
--        $this->configMock = $this->createMock(\Magento\Translation\Model\Js\Config::class);
--        $this->areaListMock = $this->createMock(\Magento\Framework\App\AreaList::class);
--        $this->translateMock = $this->getMockForAbstractClass(\Magento\Framework\TranslateInterface::class);
--        $this->model = new PreProcessor($this->configMock, $this->areaListMock, $this->translateMock);
--    }
--
--    public function testGetData()
--    {
--        $asset = $this->createMock(\Magento\Framework\View\Asset\File::class);
--        $chain = $this->createMock(\Magento\Framework\View\Asset\PreProcessor\Chain::class);
--        $context = $this->createMock(\Magento\Framework\View\Asset\File\FallbackContext::class);
--        $originalContent = 'content$.mage.__("hello1")content';
--        $translatedContent = 'content"hello1"content';
--        $patterns = ['~\$\.mage\.__\([\'|\"](.+?)[\'|\"]\)~'];
--        $areaCode = 'adminhtml';
--        $area = $this->createMock(\Magento\Framework\App\Area::class);
--
--        $chain->expects($this->once())
--            ->method('getAsset')
--            ->willReturn($asset);
--        $asset->expects($this->once())
--            ->method('getContext')
--            ->willReturn($context);
--        $context->expects($this->once())
--            ->method('getAreaCode')
--            ->willReturn($areaCode);
--
--        $this->configMock->expects($this->once())
--            ->method('isEmbeddedStrategy')
--            ->willReturn(true);
--        $chain->expects($this->once())
--            ->method('getContent')
--            ->willReturn($originalContent);
--        $this->configMock->expects($this->once())
--            ->method('getPatterns')
--            ->willReturn($patterns);
--
--        $this->areaListMock->expects($this->once())
--            ->method('getArea')
--            ->with($areaCode)
--            ->willReturn($area);
--
--        $chain->expects($this->once())
--            ->method('setContent')
--            ->with($translatedContent);
--
--        $this->model->process($chain);
--    }
--}
-diff --git a/app/code/Magento/Translation/Test/Unit/Model/Json/PreProcessorTest.php b/app/code/Magento/Translation/Test/Unit/Model/Json/PreProcessorTest.php
-index d9340e03dc9..cbeeefed6be 100644
---- a/app/code/Magento/Translation/Test/Unit/Model/Json/PreProcessorTest.php
-+++ b/app/code/Magento/Translation/Test/Unit/Model/Json/PreProcessorTest.php
-@@ -8,39 +8,43 @@ namespace Magento\Translation\Test\Unit\Model\Json;
- use Magento\Translation\Model\Js\Config;
- use Magento\Translation\Model\Js\DataProvider;
- use Magento\Translation\Model\Json\PreProcessor;
-+use Magento\Backend\App\Area\FrontNameResolver;
- 
- class PreProcessorTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-      * @var PreProcessor
-      */
--    protected $model;
-+    private $model;
- 
-     /**
-      * @var Config|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $configMock;
-+    private $configMock;
- 
-     /**
-      * @var DataProvider|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $dataProviderMock;
-+    private $dataProviderMock;
- 
-     /**
-      * @var \Magento\Framework\App\AreaList|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $areaListMock;
-+    private $areaListMock;
- 
-     /**
-      * @var \Magento\Framework\TranslateInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $translateMock;
-+    private $translateMock;
- 
-     /**
-      * @var \Magento\Framework\View\DesignInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $designMock;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->configMock = $this->createMock(\Magento\Translation\Model\Js\Config::class);
-@@ -57,7 +61,14 @@ class PreProcessorTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testGetData()
-+    /**
-+     * Test 'process' method.
-+     *
-+     * @param array $data
-+     * @param array $expects
-+     * @dataProvider processDataProvider
-+     */
-+    public function testProcess(array $data, array $expects)
-     {
-         $chain = $this->createMock(\Magento\Framework\View\Asset\PreProcessor\Chain::class);
-         $asset = $this->createMock(\Magento\Framework\View\Asset\File::class);
-@@ -66,8 +77,10 @@ class PreProcessorTest extends \PHPUnit\Framework\TestCase
-         $targetPath = 'path/js-translation.json';
-         $themePath = '*/*';
-         $dictionary = ['hello' => 'bonjour'];
--        $areaCode = 'adminhtml';
-+        $areaCode = $data['area_code'];
-+
-         $area = $this->createMock(\Magento\Framework\App\Area::class);
-+        $area->expects($expects['area_load'])->method('load')->willReturnSelf();
- 
-         $chain->expects($this->once())
-             ->method('getTargetAssetPath')
-@@ -93,7 +106,7 @@ class PreProcessorTest extends \PHPUnit\Framework\TestCase
- 
-         $this->designMock->expects($this->once())->method('setDesignTheme')->with($themePath, $areaCode);
- 
--        $this->areaListMock->expects($this->once())
-+        $this->areaListMock->expects($expects['areaList_getArea'])
-             ->method('getArea')
-             ->with($areaCode)
-             ->willReturn($area);
-@@ -114,4 +127,33 @@ class PreProcessorTest extends \PHPUnit\Framework\TestCase
- 
-         $this->model->process($chain);
-     }
-+
-+    /**
-+     * Data provider for 'process' method test.
-+     *
-+     * @return array
-+     */
-+    public function processDataProvider()
-+    {
-+        return [
-+            [
-+                [
-+                    'area_code' => FrontNameResolver::AREA_CODE
-+                ],
-+                [
-+                    'areaList_getArea' => $this->never(),
-+                    'area_load' => $this->never(),
-+                ]
-+            ],
-+            [
-+                [
-+                    'area_code' => 'frontend'
-+                ],
-+                [
-+                    'areaList_getArea' => $this->once(),
-+                    'area_load' => $this->once(),
-+                ]
-+            ],
-+        ];
-+    }
- }
-diff --git a/app/code/Magento/Translation/etc/adminhtml/system.xml b/app/code/Magento/Translation/etc/adminhtml/system.xml
-index 8c3cdc5c399..ab854f8a4db 100644
---- a/app/code/Magento/Translation/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Translation/etc/adminhtml/system.xml
-@@ -9,7 +9,7 @@
-     <system>
-         <section id="dev">
-             <group id="js">
--                <field id="translate_strategy" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-+                <field id="translate_strategy" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                     <label>Translation Strategy</label>
-                     <source_model>Magento\Translation\Model\Js\Config\Source\Strategy</source_model>
-                     <comment>Please put your store into maintenance mode and redeploy static files after changing strategy</comment>
-diff --git a/app/code/Magento/Translation/etc/db_schema.xml b/app/code/Magento/Translation/etc/db_schema.xml
-index 523ef3a1279..a0d08467acf 100644
---- a/app/code/Magento/Translation/etc/db_schema.xml
-+++ b/app/code/Magento/Translation/etc/db_schema.xml
-@@ -18,12 +18,12 @@
-         <column xsi:type="varchar" name="locale" nullable="false" length="20" default="en_US" comment="Locale"/>
-         <column xsi:type="bigint" name="crc_string" padding="20" unsigned="false" nullable="false" identity="false"
-                 default="1591228201" comment="Translation String CRC32 Hash"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="key_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="TRANSLATION_STORE_ID_STORE_STORE_ID" table="translation" column="store_id"
-+        <constraint xsi:type="foreign" referenceId="TRANSLATION_STORE_ID_STORE_STORE_ID" table="translation" column="store_id"
-                     referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="TRANSLATION_STORE_ID_LOCALE_CRC_STRING_STRING">
-+        <constraint xsi:type="unique" referenceId="TRANSLATION_STORE_ID_LOCALE_CRC_STRING_STRING">
-             <column name="store_id"/>
-             <column name="locale"/>
-             <column name="crc_string"/>
-diff --git a/app/code/Magento/Translation/etc/di.xml b/app/code/Magento/Translation/etc/di.xml
-index 6d3ca03953c..93ca7c7b6b7 100644
---- a/app/code/Magento/Translation/etc/di.xml
-+++ b/app/code/Magento/Translation/etc/di.xml
-@@ -65,8 +65,8 @@
-             <argument name="patterns" xsi:type="array">
-                 <item name="i18n_translation" xsi:type="string"><![CDATA[~i18n\:\s*(["'])(.*?)(?<!\\)\1~]]></item>
-                 <item name="translate_wrapping" xsi:type="string"><![CDATA[~translate\=("')([^\'].*?)\'\"~]]></item>
--                <item name="mage_translation_widget" xsi:type="string"><![CDATA[~(?:\$|jQuery)\.mage\.__\((?s)[^'"]*?(['"])(.+?)(?<!\\)\1(?s).*?\)~]]></item>
--                <item name="mage_translation_static" xsi:type="string"><![CDATA[~\$t\((?s)[^'"]*?(["'])(.+?)\1(?s).*?\)~]]></item>
-+                <item name="mage_translation_widget" xsi:type="string"><![CDATA[~(?s)(?:\$|jQuery)\.mage\.__\(\s*(['"])(?<translate>.+?)(?<!\\)\1\s*(*SKIP)\)\s*(?s)~]]></item>
-+                <item name="mage_translation_static" xsi:type="string"><![CDATA[~(?s)\$t\(\s*(['"])(?<translate>.+?)(?<!\\)\1\s*(*SKIP)\)(?s)~]]></item>
-                 <item name="translate_args" xsi:type="string"><![CDATA[~translate args\=("|'|"')([^\'].*?)('"|'|")~]]></item>
-             </argument>
-         </arguments>
-diff --git a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
-index 0d6582d0b21..6b6327a5679 100644
---- a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
-+++ b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Framework\View\Element\Template $block */
- ?>
- <link rel="stylesheet" type="text/css" href="<?= $block->escapeUrl($block->getViewFileUrl('prototype/windows/themes/default.css')) ?>"/>
-diff --git a/app/code/Magento/Translation/view/base/templates/translate.phtml b/app/code/Magento/Translation/view/base/templates/translate.phtml
-index c8366037e22..445c3e88830 100644
---- a/app/code/Magento/Translation/view/base/templates/translate.phtml
-+++ b/app/code/Magento/Translation/view/base/templates/translate.phtml
-@@ -4,24 +4,53 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Translation\Block\Js $block */
- ?>
--<?php if ($block->dictionaryEnabled()): ?>
-+<?php if ($block->dictionaryEnabled()) : ?>
-+    <script>
-+        require.config({
-+            deps: [
-+                'jquery',
-+                'mage/translate',
-+                'jquery/jquery-storageapi'
-+            ],
-+            callback: function ($) {
-+                'use strict';
-+
-+                var dependencies = [],
-+                    versionObj;
-+
-+                $.initNamespaceStorage('mage-translation-storage');
-+                $.initNamespaceStorage('mage-translation-file-version');
-+                versionObj = $.localStorage.get('mage-translation-file-version');
-+
-+                <?php $version = $block->getTranslationFileVersion(); ?>
-+
-+                if (versionObj.version !== '<?= $block->escapeJs($version) ?>') {
-+                    dependencies.push(
-+                        'text!<?= /* @noEscape */ Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME ?>'
-+                    );
- 
--<?php
--  $version = $block->getTranslationFileVersion();
--  $fileName = Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME;
--?>
--    <script type="text/x-magento-init">
--        {
--            "*": {
--                "mage/translate-init": {
--                    "dictionaryFile": "text!<?= $block->escapeJs($fileName); ?>",
--                    "version": "<?= $block->escapeJs($version) ?>"
-                 }
-+
-+                require.config({
-+                    deps: dependencies,
-+                    callback: function (string) {
-+                        if (typeof string === 'string') {
-+                            $.mage.translate.add(JSON.parse(string));
-+                            $.localStorage.set('mage-translation-storage', string);
-+                            $.localStorage.set(
-+                                'mage-translation-file-version',
-+                                {
-+                                    version: '<?= $block->escapeJs($version) ?>'
-+                                }
-+                            );
-+                        } else {
-+                            $.mage.translate.add($.localStorage.get('mage-translation-storage'));
-+                        }
-+                    }
-+                });
-             }
--        }
-+        });
-     </script>
- <?php endif; ?>
-diff --git a/app/code/Magento/Translation/view/frontend/requirejs-config.js b/app/code/Magento/Translation/view/frontend/requirejs-config.js
-index 47ccaf5a33e..b4b3ce0f8c5 100644
---- a/app/code/Magento/Translation/view/frontend/requirejs-config.js
-+++ b/app/code/Magento/Translation/view/frontend/requirejs-config.js
-@@ -7,7 +7,8 @@ var config = {
-     map: {
-         '*': {
-             editTrigger: 'mage/edit-trigger',
--            addClass: 'Magento_Translation/add-class'
-+            addClass: 'Magento_Translation/js/add-class',
-+            'Magento_Translation/add-class': 'Magento_Translation/js/add-class'
-         }
-     },
-     deps: [
-diff --git a/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml b/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
-index 5b082d32c40..bec7dca9359 100644
---- a/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
-+++ b/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Framework\View\Element\Template $block */
- ?>
- <link rel="stylesheet" type="text/css" href="<?= $block->escapeUrl($block->getViewFileUrl('prototype/windows/themes/default.css')) ?>"/>
-diff --git a/app/code/Magento/Translation/view/frontend/web/add-class.js b/app/code/Magento/Translation/view/frontend/web/js/add-class.js
-similarity index 100%
-rename from app/code/Magento/Translation/view/frontend/web/add-class.js
-rename to app/code/Magento/Translation/view/frontend/web/js/add-class.js
-diff --git a/app/code/Magento/Ui/Block/Wrapper.php b/app/code/Magento/Ui/Block/Wrapper.php
-index b99d584c99a..bab9fd7bb78 100644
---- a/app/code/Magento/Ui/Block/Wrapper.php
-+++ b/app/code/Magento/Ui/Block/Wrapper.php
-@@ -10,8 +10,7 @@ use Magento\Framework\View\Element\UiComponentInterface;
- use Magento\Ui\Model\UiComponentGenerator;
- 
- /**
-- * This block is wrapper for UI component, this done in order to save compatability with old
-- * widgets mechanism
-+ * This block is wrapper for UI component, this done in order to save compatibility with old widgets mechanism
-  */
- class Wrapper extends \Magento\Framework\View\Element\Template
- {
-diff --git a/app/code/Magento/Ui/Component/Filters/Type/Input.php b/app/code/Magento/Ui/Component/Filters/Type/Input.php
-index 9cc060ae581..1fc132700c8 100644
---- a/app/code/Magento/Ui/Component/Filters/Type/Input.php
-+++ b/app/code/Magento/Ui/Component/Filters/Type/Input.php
-@@ -29,7 +29,7 @@ class Input extends AbstractFilter
-      *
-      * @return void
-      */
--    public function prepare()
-+    public function prepare(): void
-     {
-         $this->wrappedComponent = $this->uiComponentFactory->create(
-             $this->getName(),
-@@ -62,12 +62,12 @@ class Input extends AbstractFilter
-      *
-      * @return void
-      */
--    protected function applyFilter()
-+    protected function applyFilter(): void
-     {
-         if (isset($this->filterData[$this->getName()])) {
-             $value = str_replace(['%', '_'], ['\%', '\_'], $this->filterData[$this->getName()]);
- 
--            if (!empty($value)) {
-+            if ($value || $value === '0') {
-                 $filter = $this->filterBuilder->setConditionType('like')
-                     ->setField($this->getName())
-                     ->setValue(sprintf('%%%s%%', $value))
-diff --git a/app/code/Magento/Ui/Component/Filters/Type/Search.php b/app/code/Magento/Ui/Component/Filters/Type/Search.php
-index da323e953be..afa3c775dae 100644
---- a/app/code/Magento/Ui/Component/Filters/Type/Search.php
-+++ b/app/code/Magento/Ui/Component/Filters/Type/Search.php
-@@ -6,6 +6,8 @@
- namespace Magento\Ui\Component\Filters\Type;
- 
- /**
-+ * Class Search
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -34,7 +36,7 @@ class Search extends \Magento\Ui\Component\Filters\Type\AbstractFilter
-     {
-         $value = $this->getContext()->getRequestParam('search');
- 
--        if ($value) {
-+        if ((string)$value !== '') {
-             $filter = $this->filterBuilder->setConditionType('fulltext')
-                 ->setField($this->getName())
-                 ->setValue($value)
-diff --git a/app/code/Magento/Ui/Component/Form.php b/app/code/Magento/Ui/Component/Form.php
-index 4033abba820..dc6e7b5ca06 100644
---- a/app/code/Magento/Ui/Component/Form.php
-+++ b/app/code/Magento/Ui/Component/Form.php
-@@ -10,6 +10,7 @@ use Magento\Framework\View\Element\UiComponent\ContextInterface;
- use Magento\Framework\View\Element\UiComponentInterface;
- 
- /**
-+ * Ui component Form
-  * @api
-  * @since 100.0.2
-  */
-@@ -53,14 +54,15 @@ class Form extends AbstractComponent
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDataSourceData()
-     {
-         $dataSource = [];
- 
-         $id = $this->getContext()->getRequestParam($this->getContext()->getDataProvider()->getRequestFieldName(), null);
--        $filter = $this->filterBuilder->setField($this->getContext()->getDataProvider()->getPrimaryFieldName())
-+        $idFieldName = $this->getContext()->getDataProvider()->getPrimaryFieldName();
-+        $filter = $this->filterBuilder->setField($idFieldName)
-             ->setValue($id)
-             ->create();
-         $this->getContext()->getDataProvider()
-@@ -74,7 +76,7 @@ class Form extends AbstractComponent
-             ];
-         } elseif (isset($data['items'])) {
-             foreach ($data['items'] as $item) {
--                if ($item[$item['id_field_name']] == $id) {
-+                if ($item[$idFieldName] == $id) {
-                     $dataSource = ['data' => ['general' => $item]];
-                 }
-             }
-diff --git a/app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php b/app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php
-index 09583f65bf1..b01b2937151 100644
---- a/app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php
-+++ b/app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php
-@@ -9,6 +9,9 @@ use Magento\Framework\Data\OptionSourceInterface;
- use Magento\Framework\View\Element\UiComponent\ContextInterface;
- 
- /**
-+ * Base abstract form element.
-+ *
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  * @since 100.1.0
-  */
-@@ -59,7 +62,7 @@ abstract class AbstractOptionsField extends AbstractElement
-             if (empty($config['rawOptions'])) {
-                 $options = $this->convertOptionsValueToString($options);
-             }
--            $config['options'] = array_values(array_merge_recursive($config['options'], $options));
-+            $config['options'] = array_values(array_replace_recursive($config['options'], $options));
-         }
-         $this->setData('config', (array)$config);
-         parent::prepare();
-@@ -84,11 +87,14 @@ abstract class AbstractOptionsField extends AbstractElement
-      */
-     protected function convertOptionsValueToString(array $options)
-     {
--        array_walk($options, function (&$value) {
--            if (isset($value['value']) && is_scalar($value['value'])) {
--                $value['value'] = (string)$value['value'];
-+        array_walk(
-+            $options,
-+            static function (&$value) {
-+                if (isset($value['value']) && is_scalar($value['value'])) {
-+                    $value['value'] = (string)$value['value'];
-+                }
-             }
--        });
-+        );
-         return $options;
-     }
- }
-diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php
-index c2460fd8385..d4b1937bd06 100644
---- a/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php
-+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php
-@@ -31,14 +31,16 @@ class Media extends AbstractDataType
-     {
-         if ($this->getData('config/uploaderConfig/url')) {
-             $url = $this->getContext()->getUrl($this->getData('config/uploaderConfig/url'), ['_secure' => true]);
-+            $updateConfig = [
-+                'uploaderConfig' => ['url' => $url]
-+            ];
-+            if (!isset($this->getConfiguration()['dataScope'])) {
-+                $updateConfig['dataScope'] = $this->getName();
-+            }
-             $data = array_replace_recursive(
-                 $this->getData(),
-                 [
--                    'config' => [
--                        'uploaderConfig' => [
--                            'url' => $url
--                        ],
--                    ],
-+                    'config' => $updateConfig,
-                 ]
-             );
-             $this->setData($data);
-diff --git a/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php b/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php
-index c79dfb3f5cf..d39d2dc3cd9 100644
---- a/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php
-+++ b/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php
-@@ -13,6 +13,8 @@ use Magento\Framework\View\Element\UiComponent\ContextInterface;
- use Magento\Ui\Component\Wysiwyg\ConfigInterface;
- 
- /**
-+ * WYSIWYG form element
-+ *
-  * @api
-  * @since 100.1.0
-  */
-@@ -50,8 +52,9 @@ class Wysiwyg extends AbstractElement
-     ) {
-         $wysiwygConfigData = isset($config['wysiwygConfigData']) ? $config['wysiwygConfigData'] : [];
-         $this->form = $formFactory->create();
-+        $wysiwygId = $context->getNamespace() . '_' . $data['name'];
-         $this->editor = $this->form->addField(
--            $context->getNamespace() . '_' . $data['name'],
-+            $wysiwygId,
-             \Magento\Framework\Data\Form\Element\Editor::class,
-             [
-                 'force_load' => true,
-@@ -62,6 +65,7 @@ class Wysiwyg extends AbstractElement
-             ]
-         );
-         $data['config']['content'] = $this->editor->getElementHtml();
-+        $data['config']['wysiwygId'] = $wysiwygId;
- 
-         parent::__construct($context, $components, $data);
-     }
-diff --git a/app/code/Magento/Ui/Component/Form/Fieldset.php b/app/code/Magento/Ui/Component/Form/Fieldset.php
-index 745068ca0fa..2525d0a4923 100644
---- a/app/code/Magento/Ui/Component/Form/Fieldset.php
-+++ b/app/code/Magento/Ui/Component/Form/Fieldset.php
-@@ -5,13 +5,11 @@
-  */
- namespace Magento\Ui\Component\Form;
- 
--use Magento\Ui\Component\Container;
- use Magento\Ui\Component\AbstractComponent;
--use Magento\Framework\View\Element\UiComponentFactory;
--use Magento\Framework\View\Element\UiComponentInterface;
--use Magento\Framework\View\Element\UiComponent\ContextInterface;
- 
- /**
-+ * Fieldset UI Component.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-diff --git a/app/code/Magento/Ui/Component/Layout/Tabs.php b/app/code/Magento/Ui/Component/Layout/Tabs.php
-index 8ceac716ae2..0d176d72416 100644
---- a/app/code/Magento/Ui/Component/Layout/Tabs.php
-+++ b/app/code/Magento/Ui/Component/Layout/Tabs.php
-@@ -5,18 +5,17 @@
-  */
- namespace Magento\Ui\Component\Layout;
- 
--use Magento\Framework\View\Element\Template;
- use Magento\Framework\View\Element\UiComponent\BlockWrapperInterface;
- use Magento\Framework\View\Element\UiComponent\DataSourceInterface;
--use Magento\Framework\View\Element\UiComponent\LayoutInterface;
- use Magento\Framework\View\Element\UiComponentFactory;
- use Magento\Framework\View\Element\UiComponentInterface;
-+use Magento\Framework\View\Element\ComponentVisibilityInterface;
- use Magento\Ui\Component\Layout\Tabs\TabInterface;
- 
- /**
-  * Class Tabs
-  */
--class Tabs extends \Magento\Framework\View\Layout\Generic implements LayoutInterface
-+class Tabs extends \Magento\Framework\View\Layout\Generic
- {
-     /**
-      * @var string
-@@ -89,58 +88,15 @@ class Tabs extends \Magento\Framework\View\Layout\Generic implements LayoutInter
-                 $this->addWrappedBlock($childComponent, $childrenAreas);
-                 continue;
-             }
-+            if ($childComponent instanceof ComponentVisibilityInterface && !$childComponent->isComponentVisible()) {
-+                continue;
-+            }
- 
-             $name = $childComponent->getName();
-             $config = $childComponent->getData('config');
-             $collectedComponents[$name] = true;
--            if (isset($config['is_collection']) && $config['is_collection'] === true) {
--                $label = $childComponent->getData('config/label');
--                $this->component->getContext()->addComponentDefinition(
--                    'collection',
--                    [
--                        'component' => 'Magento_Ui/js/form/components/collection',
--                        'extends' => $this->namespace
--                    ]
--                );
--
--                /**
--                 * @var UiComponentInterface $childComponent
--                 * @var array $structure
--                 */
--                list($childComponent, $structure) = $this->prepareChildComponents($childComponent, $name);
--
--                $childrenStructure = $structure[$name]['children'];
--
--                $structure[$name]['children'] = [
--                    $name . '_collection' => [
--                        'type' => 'collection',
--                        'config' => [
--                            'active' => 1,
--                            'removeLabel' => __('Remove %1', $label),
--                            'addLabel' => __('Add New %1', $label),
--                            'removeMessage' => $childComponent->getData('config/removeMessage'),
--                            'itemTemplate' => 'item_template',
--                        ],
--                        'children' => [
--                            'item_template' => ['type' => $this->namespace,
--                                'isTemplate' => true,
--                                'component' => 'Magento_Ui/js/form/components/collection/item',
--                                'childType' => 'group',
--                                'config' => [
--                                    'label' => __('New %1', $label),
--                                ],
--                                'children' => $childrenStructure
--                            ]
--                        ]
--                    ]
--                ];
--            } else {
--                /**
--                 * @var UiComponentInterface $childComponent
--                 * @var array $structure
--                 */
--                list($childComponent, $structure) = $this->prepareChildComponents($childComponent, $name);
--            }
-+
-+            [$childComponent, $structure] = $this->buildChildComponentStructure($config, $childComponent);
- 
-             $tabComponent = $this->createTabComponent($childComponent, $name);
- 
-@@ -168,6 +124,67 @@ class Tabs extends \Magento\Framework\View\Layout\Generic implements LayoutInter
-         $topNode = $this->structure;
-     }
- 
-+    /**
-+     * Build child components structure of the tab
-+     *
-+     * @param array $config
-+     * @param UiComponentInterface $childComponent
-+     * @return array
-+     */
-+    private function buildChildComponentStructure(array $config, $childComponent): array
-+    {
-+        $name = $childComponent->getName();
-+        if (isset($config['is_collection']) && $config['is_collection'] === true) {
-+            $label = $childComponent->getData('config/label');
-+            $this->component->getContext()->addComponentDefinition(
-+                'collection',
-+                [
-+                    'component' => 'Magento_Ui/js/form/components/collection',
-+                    'extends' => $this->namespace
-+                ]
-+            );
-+            /**
-+             * @var UiComponentInterface $childComponent
-+             * @var array $structure
-+             */
-+            [$childComponent, $structure] = $this->prepareChildComponents($childComponent, $name);
-+
-+            $childrenStructure = $structure[$name]['children'];
-+
-+            $structure[$name]['children'] = [
-+                $name . '_collection' => [
-+                    'type' => 'collection',
-+                    'config' => [
-+                        'active' => 1,
-+                        'removeLabel' => __('Remove %1', $label),
-+                        'addLabel' => __('Add New %1', $label),
-+                        'removeMessage' => $childComponent->getData('config/removeMessage'),
-+                        'itemTemplate' => 'item_template',
-+                    ],
-+                    'children' => [
-+                        'item_template' => ['type' => $this->namespace,
-+                            'isTemplate' => true,
-+                            'component' => 'Magento_Ui/js/form/components/collection/item',
-+                            'childType' => 'group',
-+                            'config' => [
-+                                'label' => __('New %1', $label),
-+                            ],
-+                            'children' => $childrenStructure
-+                        ]
-+                    ]
-+                ]
-+            ];
-+        } else {
-+            /**
-+             * @var UiComponentInterface $childComponent
-+             * @var array $structure
-+             */
-+            [$childComponent, $structure] = $this->prepareChildComponents($childComponent, $name);
-+        }
-+
-+        return [$childComponent, $structure];
-+    }
-+
-     /**
-      * Add wrapped layout block
-      *
-diff --git a/app/code/Magento/Ui/Component/Listing/Columns/Date.php b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
-index 1c9916a9414..1ca82ae321e 100644
---- a/app/code/Magento/Ui/Component/Listing/Columns/Date.php
-+++ b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
-@@ -3,14 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Ui\Component\Listing\Columns;
- 
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Locale\Bundle\DataBundle;
-+use Magento\Framework\Locale\ResolverInterface;
- use Magento\Framework\Stdlib\BooleanUtils;
- use Magento\Framework\View\Element\UiComponent\ContextInterface;
- use Magento\Framework\View\Element\UiComponentFactory;
- use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
- 
- /**
-+ * Date format column
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -26,6 +32,21 @@ class Date extends Column
-      */
-     private $booleanUtils;
- 
-+    /**
-+     * @var ResolverInterface
-+     */
-+    private $localeResolver;
-+
-+    /**
-+     * @var string
-+     */
-+    private $locale;
-+
-+    /**
-+     * @var DataBundle
-+     */
-+    private $dataBundle;
-+
-     /**
-      * @param ContextInterface $context
-      * @param UiComponentFactory $uiComponentFactory
-@@ -33,6 +54,8 @@ class Date extends Column
-      * @param BooleanUtils $booleanUtils
-      * @param array $components
-      * @param array $data
-+     * @param ResolverInterface|null $localeResolver
-+     * @param DataBundle|null $dataBundle
-      */
-     public function __construct(
-         ContextInterface $context,
-@@ -40,13 +63,60 @@ class Date extends Column
-         TimezoneInterface $timezone,
-         BooleanUtils $booleanUtils,
-         array $components = [],
--        array $data = []
-+        array $data = [],
-+        ResolverInterface $localeResolver = null,
-+        DataBundle $dataBundle = null
-     ) {
-         $this->timezone = $timezone;
-         $this->booleanUtils = $booleanUtils;
-+        $this->localeResolver = $localeResolver ?? ObjectManager::getInstance()->get(ResolverInterface::class);
-+        $this->locale = $this->localeResolver->getLocale();
-+        $this->dataBundle = $dataBundle ?? ObjectManager::getInstance()->get(DataBundle::class);
-         parent::__construct($context, $uiComponentFactory, $components, $data);
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-+    public function prepare()
-+    {
-+        $config = $this->getData('config');
-+        $config['filter'] = [
-+            'filterType' => 'dateRange',
-+            'templates' => [
-+                'date' => [
-+                    'options' => [
-+                        'dateFormat' => $this->timezone->getDateFormatWithLongYear()
-+                    ]
-+                ]
-+            ]
-+        ];
-+
-+        $localeData = $this->dataBundle->get($this->locale);
-+        /** @var \ResourceBundle $monthsData */
-+        $monthsData = $localeData['calendar']['gregorian']['monthNames'];
-+        $months = array_values(iterator_to_array($monthsData['format']['wide']));
-+        $monthsShort = array_values(
-+            iterator_to_array(
-+                null !== $monthsData->get('format')->get('abbreviated')
-+                    ? $monthsData['format']['abbreviated']
-+                    : $monthsData['format']['wide']
-+            )
-+        );
-+
-+        $config['storeLocale'] = $this->locale;
-+        $config['calendarConfig'] = [
-+            'months' => $months,
-+            'monthsShort' => $monthsShort,
-+        ];
-+        if (!isset($config['dateFormat'])) {
-+            $config['dateFormat'] = $this->timezone->getDateTimeFormat(\IntlDateFormatter::MEDIUM);
-+        }
-+        $this->setData('config', $config);
-+
-+        parent::prepare();
-+    }
-+
-     /**
-      * @inheritdoc
-      */
-@@ -55,7 +125,7 @@ class Date extends Column
-         if (isset($dataSource['data']['items'])) {
-             foreach ($dataSource['data']['items'] as & $item) {
-                 if (isset($item[$this->getData('name')])
--                   && $item[$this->getData('name')] !== "0000-00-00 00:00:00"
-+                    && $item[$this->getData('name')] !== "0000-00-00 00:00:00"
-                 ) {
-                     $date = $this->timezone->date(new \DateTime($item[$this->getData('name')]));
-                     $timezone = isset($this->getConfiguration()['timezone'])
-diff --git a/app/code/Magento/Ui/Component/MassAction.php b/app/code/Magento/Ui/Component/MassAction.php
-index ea39e19a65f..4cca8d4c012 100644
---- a/app/code/Magento/Ui/Component/MassAction.php
-+++ b/app/code/Magento/Ui/Component/MassAction.php
-@@ -6,6 +6,8 @@
- namespace Magento\Ui\Component;
- 
- /**
-+ * Mass action UI component.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -21,7 +23,12 @@ class MassAction extends AbstractComponent
-         $config = $this->getConfiguration();
- 
-         foreach ($this->getChildComponents() as $actionComponent) {
--            $config['actions'][] = $actionComponent->getConfiguration();
-+            $componentConfig = $actionComponent->getConfiguration();
-+            $disabledAction = $componentConfig['actionDisable'] ?? false;
-+            if ($disabledAction) {
-+                continue;
-+            }
-+            $config['actions'][] = $componentConfig;
-         }
- 
-         $origConfig = $this->getConfiguration();
-diff --git a/app/code/Magento/Ui/Component/MassAction/Filter.php b/app/code/Magento/Ui/Component/MassAction/Filter.php
-index a8ed5d901d8..c512c82d694 100644
---- a/app/code/Magento/Ui/Component/MassAction/Filter.php
-+++ b/app/code/Magento/Ui/Component/MassAction/Filter.php
-@@ -7,14 +7,16 @@
- namespace Magento\Ui\Component\MassAction;
- 
- use Magento\Framework\Api\FilterBuilder;
--use Magento\Framework\Exception\LocalizedException;
--use Magento\Framework\View\Element\UiComponentFactory;
- use Magento\Framework\App\RequestInterface;
--use Magento\Framework\View\Element\UiComponentInterface;
- use Magento\Framework\Data\Collection\AbstractDb;
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
-+use Magento\Framework\View\Element\UiComponentFactory;
-+use Magento\Framework\View\Element\UiComponentInterface;
- 
- /**
-+ * Filter component.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -100,9 +102,13 @@ class Filter
-             }
-         }
- 
-+        $filterIds = $this->getFilterIds();
-+        if (\is_array($selected)) {
-+            $filterIds = array_unique(array_merge($filterIds, $selected));
-+        }
-         $collection->addFieldToFilter(
-             $collection->getIdFieldName(),
--            ['in' => $this->getFilterIds()]
-+            ['in' => $filterIds]
-         );
- 
-         return $collection;
-diff --git a/app/code/Magento/Ui/Component/Paging.php b/app/code/Magento/Ui/Component/Paging.php
-index ae83bfc3916..57d0ec53777 100644
---- a/app/code/Magento/Ui/Component/Paging.php
-+++ b/app/code/Magento/Ui/Component/Paging.php
-@@ -3,9 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Ui\Component;
- 
- /**
-+ * Class Paging
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -13,6 +16,41 @@ class Paging extends AbstractComponent
- {
-     const NAME = 'paging';
- 
-+    /**
-+     * Default paging options
-+     *
-+     * @var array
-+     */
-+    private $defaultOptions = [
-+        '20' => [
-+            'value' => 20,
-+            'label' => 20
-+        ],
-+        '30' => [
-+            'value' => 30,
-+            'label' => 30
-+        ],
-+        '50' => [
-+            'value' => 50,
-+            'label' => 50
-+        ],
-+        '100' => [
-+            'value' => 100,
-+            'label' => 100
-+        ],
-+        '200' => [
-+            'value' => 200,
-+            'label' => 200
-+        ],
-+    ];
-+
-+    /**
-+     * Default page size
-+     *
-+     * @var int
-+     */
-+    private $defaultPageSize = 20;
-+
-     /**
-      * Default component data
-      *
-@@ -20,29 +58,6 @@ class Paging extends AbstractComponent
-      */
-     protected $_data = [
-         'config' => [
--            'options' => [
--                '20' => [
--                    'value' => 20,
--                    'label' => 20
--                ],
--                '30' => [
--                    'value' => 30,
--                    'label' => 30
--                ],
--                '50' => [
--                    'value' => 50,
--                    'label' => 50
--                ],
--                '100' => [
--                    'value' => 100,
--                    'label' => 100
--                ],
--                '200' => [
--                    'value' => 200,
--                    'label' => 200
--                ],
--            ],
--            'pageSize' => 20,
-             'current' => 1
-         ]
-     ];
-@@ -65,13 +80,13 @@ class Paging extends AbstractComponent
-     public function prepare()
-     {
-         $this->prepareOptions();
-+        $this->preparePageSize();
-         $paging = $this->getContext()->getRequestParam('paging');
-         if (!isset($paging['notLimits'])) {
-             $this->getContext()
-                 ->getDataProvider()
-                 ->setLimit($this->getOffset($paging), $this->getSize($paging));
-         }
--
-         parent::prepare();
-     }
- 
-@@ -83,12 +98,26 @@ class Paging extends AbstractComponent
-     protected function prepareOptions()
-     {
-         $config = $this->getData('config');
--        if (isset($config['options'])) {
--            $config['options'] = array_values($config['options']);
--            foreach ($config['options'] as &$item) {
--                $item['value'] = (int) $item['value'];
--            }
--            unset($item);
-+        if (!isset($config['options'])) {
-+            $config['options'] = $this->defaultOptions;
-+        }
-+        foreach ($config['options'] as &$item) {
-+            $item['value'] = (int)$item['value'];
-+        }
-+        unset($item);
-+        $this->setData('config', $config);
-+    }
-+
-+    /**
-+     * Prepare page size
-+     *
-+     * @return void
-+     */
-+    private function preparePageSize()
-+    {
-+        $config = $this->getData('config');
-+        if (!isset($config['pageSize'])) {
-+            $config['pageSize'] = $this->defaultPageSize;
-             $this->setData('config', $config);
-         }
-     }
-@@ -102,7 +131,7 @@ class Paging extends AbstractComponent
-     protected function getOffset($paging)
-     {
-         $defaultPage = $this->getData('config/current') ?: 1;
--        return (int) (isset($paging['current']) ? $paging['current'] : $defaultPage);
-+        return (int)(isset($paging['current']) ? $paging['current'] : $defaultPage);
-     }
- 
-     /**
-@@ -113,7 +142,6 @@ class Paging extends AbstractComponent
-      */
-     protected function getSize($paging)
-     {
--        $defaultLimit = $this->getData('config/pageSize') ?: 20;
--        return (int) (isset($paging['pageSize']) ? $paging['pageSize'] : $defaultLimit);
-+        return (int)(isset($paging['pageSize']) ? $paging['pageSize'] : $this->getData('config/pageSize'));
-     }
- }
-diff --git a/app/code/Magento/Ui/Component/Wysiwyg/Config.php b/app/code/Magento/Ui/Component/Wysiwyg/Config.php
-index 48014a0160c..d88a2559278 100644
---- a/app/code/Magento/Ui/Component/Wysiwyg/Config.php
-+++ b/app/code/Magento/Ui/Component/Wysiwyg/Config.php
-@@ -13,7 +13,7 @@ class Config implements ConfigInterface
-     /**
-      * Return WYSIWYG configuration
-      *
--     * @return \Magento\Framework\DataObject
-+     * @return array
-      */
-     public function getConfig()
-     {
-diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
-index 60d374fbf26..b45880c1ce7 100644
---- a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
-+++ b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Ui\Controller\Adminhtml\Bookmark;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Authorization\Model\UserContextInterface;
- use Magento\Backend\App\Action\Context;
- use Magento\Framework\Json\DecoderInterface;
-@@ -20,7 +21,7 @@ use Magento\Ui\Controller\Adminhtml\AbstractAction;
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Save extends AbstractAction
-+class Save extends AbstractAction implements HttpPostActionInterface
- {
-     /**
-      * Identifier for current bookmark
-diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
-index fb99cef8e53..b06c655939b 100644
---- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
-+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
-@@ -14,6 +14,11 @@ use Psr\Log\LoggerInterface;
- use Magento\Framework\Escaper;
- use Magento\Framework\Controller\Result\JsonFactory;
- 
-+/**
-+ * Render a component.
-+ *
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-+ */
- class Render extends AbstractAction
- {
-     /**
-@@ -81,6 +86,18 @@ class Render extends AbstractAction
- 
-                 $contentType = $this->contentTypeResolver->resolve($component->getContext());
-                 $this->getResponse()->setHeader('Content-Type', $contentType, true);
-+            } else {
-+                /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-+                $resultJson = $this->resultJsonFactory->create();
-+                $resultJson->setStatusHeader(
-+                    \Zend\Http\Response::STATUS_CODE_403,
-+                    \Zend\Http\AbstractMessage::VERSION_11,
-+                    'Forbidden'
-+                );
-+                return $resultJson->setData([
-+                        'error' => $this->escaper->escapeHtml('Forbidden'),
-+                        'errorcode' => 403
-+                ]);
-             }
-         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-             $this->logger->critical($e);
-diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php
-index cc028a45545..6ea14448c4a 100644
---- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php
-+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php
-@@ -5,16 +5,42 @@
-  */
- namespace Magento\Ui\Controller\Adminhtml\Index\Render;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\View\Element\Template;
- use Magento\Ui\Component\Control\ActionPool;
- use Magento\Ui\Component\Wrapper\UiComponent;
- use Magento\Ui\Controller\Adminhtml\AbstractAction;
-+use Magento\Backend\App\Action\Context;
-+use Magento\Framework\View\Element\UiComponentFactory;
-+use Magento\Framework\View\Element\UiComponent\ContextFactory;
-+use Magento\Framework\App\ObjectManager;
- 
- /**
-  * Class Handle
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Handle extends AbstractAction
-+class Handle extends AbstractAction implements HttpGetActionInterface
- {
-+    /**
-+     * @var ContextFactory
-+     */
-+    private $contextFactory;
-+
-+    /**
-+     * @param Context $context
-+     * @param UiComponentFactory $factory
-+     * @param ContextFactory|null $contextFactory
-+     */
-+    public function __construct(
-+        Context $context,
-+        UiComponentFactory $factory,
-+        ContextFactory $contextFactory = null
-+    ) {
-+        parent::__construct($context, $factory);
-+        $this->contextFactory = $contextFactory
-+            ?: ObjectManager::getInstance()->get(ContextFactory::class);
-+    }
-+
-     /**
-      * Render UI component by namespace in handle context
-      *
-@@ -22,20 +48,50 @@ class Handle extends AbstractAction
-      */
-     public function execute()
-     {
-+        $response = '';
-         $handle = $this->_request->getParam('handle');
-         $namespace = $this->_request->getParam('namespace');
-         $buttons = $this->_request->getParam('buttons', false);
--
-         $this->_view->loadLayout(['default', $handle], true, true, false);
-+        $layout = $this->_view->getLayout();
-+        $context = $this->contextFactory->create(
-+            [
-+                'namespace' => $namespace,
-+                'pageLayout' => $layout
-+            ]
-+        );
- 
--        $uiComponent = $this->_view->getLayout()->getBlock($namespace);
--        $response = $uiComponent instanceof UiComponent ? $uiComponent->toHtml() : '';
-+        $component = $this->factory->create($namespace, null, ['context' => $context]);
-+        if ($this->validateAclResource($component->getContext()->getDataProvider()->getConfigData())) {
-+            $uiComponent = $layout->getBlock($namespace);
-+            $response = $uiComponent instanceof UiComponent ? $uiComponent->toHtml() : '';
-+        }
- 
-         if ($buttons) {
--            $actionsToolbar = $this->_view->getLayout()->getBlock(ActionPool::ACTIONS_PAGE_TOOLBAR);
-+            $actionsToolbar = $layout->getBlock(ActionPool::ACTIONS_PAGE_TOOLBAR);
-             $response .= $actionsToolbar instanceof Template ? $actionsToolbar->toHtml() : '';
-         }
- 
-         $this->_response->appendBody($response);
-     }
-+
-+    /**
-+     * Optionally validate ACL resource of components with a DataSource/DataProvider
-+     *
-+     * @param mixed $dataProviderConfigData
-+     * @return bool
-+     */
-+    private function validateAclResource($dataProviderConfigData)
-+    {
-+        if (isset($dataProviderConfigData['aclResource'])
-+            && !$this->_authorization->isAllowed($dataProviderConfigData['aclResource'])
-+        ) {
-+            if (!$this->_request->isAjax()) {
-+                $this->_redirect('admin/denied');
-+            }
-+            return false;
-+        }
-+
-+        return true;
-+    }
- }
-diff --git a/app/code/Magento/Ui/DataProvider/Modifier/Pool.php b/app/code/Magento/Ui/DataProvider/Modifier/Pool.php
-index 34a24499834..882f97d57e9 100644
---- a/app/code/Magento/Ui/DataProvider/Modifier/Pool.php
-+++ b/app/code/Magento/Ui/DataProvider/Modifier/Pool.php
-@@ -88,14 +88,7 @@ class Pool implements \Magento\Ui\DataProvider\Modifier\PoolInterface
-     protected function sort(array $data)
-     {
-         usort($data, function (array $a, array $b) {
--            $a['sortOrder'] = $this->getSortOrder($a);
--            $b['sortOrder'] = $this->getSortOrder($b);
--
--            if ($a['sortOrder'] == $b['sortOrder']) {
--                return 0;
--            }
--
--            return ($a['sortOrder'] < $b['sortOrder']) ? -1 : 1;
-+            return $this->getSortOrder($a) <=> $this->getSortOrder($b);
-         });
- 
-         return $data;
-diff --git a/app/code/Magento/Ui/Model/Export/MetadataProvider.php b/app/code/Magento/Ui/Model/Export/MetadataProvider.php
-index 54d856e8a61..603e102fa30 100644
---- a/app/code/Magento/Ui/Model/Export/MetadataProvider.php
-+++ b/app/code/Magento/Ui/Model/Export/MetadataProvider.php
-@@ -60,7 +60,7 @@ class MetadataProvider
-         Filter $filter,
-         TimezoneInterface $localeDate,
-         ResolverInterface $localeResolver,
--        $dateFormat = 'M j, Y H:i:s A',
-+        $dateFormat = 'M j, Y h:i:s A',
-         array $data = []
-     ) {
-         $this->filter = $filter;
-diff --git a/app/code/Magento/Ui/Model/UiComponentGenerator.php b/app/code/Magento/Ui/Model/UiComponentGenerator.php
-index f699cff7aa5..ce51c4241e8 100644
---- a/app/code/Magento/Ui/Model/UiComponentGenerator.php
-+++ b/app/code/Magento/Ui/Model/UiComponentGenerator.php
-@@ -32,7 +32,6 @@ class UiComponentGenerator
-      * UiComponentGenerator constructor.
-      * @param ContextFactory $contextFactory
-      * @param UiComponentFactory $uiComponentFactory
--     * @param array $data
-      */
-     public function __construct(
-         ContextFactory $contextFactory,
-@@ -48,6 +47,7 @@ class UiComponentGenerator
-      * @param string $name
-      * @param \Magento\Framework\View\LayoutInterface $layout
-      * @return UiComponentInterface
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function generateUiComponent($name, \Magento\Framework\View\LayoutInterface $layout)
-     {
-diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
-index e249a64861d..d16b1eaad7f 100644
---- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
-+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Ui\TemplateEngine\Xhtml;
- 
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Serialize\Serializer\JsonHexTag;
- use Magento\Framework\View\Layout\Generator\Structure;
- use Magento\Framework\View\Element\UiComponentInterface;
- use Magento\Framework\View\TemplateEngine\Xhtml\Template;
-@@ -42,25 +44,33 @@ class Result implements ResultInterface
-      */
-     protected $logger;
- 
-+    /**
-+     * @var JsonHexTag
-+     */
-+    private $jsonSerializer;
-+
-     /**
-      * @param Template $template
-      * @param CompilerInterface $compiler
-      * @param UiComponentInterface $component
-      * @param Structure $structure
-      * @param LoggerInterface $logger
-+     * @param JsonHexTag $jsonSerializer
-      */
-     public function __construct(
-         Template $template,
-         CompilerInterface $compiler,
-         UiComponentInterface $component,
-         Structure $structure,
--        LoggerInterface $logger
-+        LoggerInterface $logger,
-+        JsonHexTag $jsonSerializer = null
-     ) {
-         $this->template = $template;
-         $this->compiler = $compiler;
-         $this->component = $component;
-         $this->structure = $structure;
-         $this->logger = $logger;
-+        $this->jsonSerializer = $jsonSerializer ?? ObjectManager::getInstance()->get(JsonHexTag::class);
-     }
- 
-     /**
-@@ -81,7 +91,7 @@ class Result implements ResultInterface
-     public function appendLayoutConfiguration()
-     {
-         $layoutConfiguration = $this->wrapContent(
--            json_encode($this->structure->generate($this->component), JSON_HEX_TAG)
-+            $this->jsonSerializer->serialize($this->structure->generate($this->component))
-         );
-         $this->template->append($layoutConfiguration);
-     }
-@@ -105,7 +115,7 @@ class Result implements ResultInterface
-             $this->compiler->compile($templateRootElement, $this->component, $this->component);
-             $this->appendLayoutConfiguration();
-             $result = $this->compiler->postprocessing($this->template->__toString());
--        } catch (\Exception $e) {
-+        } catch (\Throwable $e) {
-             $this->logger->critical($e->getMessage());
-             $result = $e->getMessage();
-         }
-diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickSearchInGridActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickSearchInGridActionGroup.xml
-new file mode 100644
-index 00000000000..29e299115d2
---- /dev/null
-+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickSearchInGridActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminClickSearchInGridActionGroup">
-+        <click selector="{{AdminGridFilterControls.applyFilters}}" stepKey="clickSearch"/>
-+        <waitForPageLoad stepKey="waitForSearchResult"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml
-index 127647e6e9b..1942c02ace5 100644
---- a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml
-+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Search grid with keyword search-->
-     <actionGroup name="searchAdminDataGridByKeyword">
-         <arguments>
-diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
-index 9239f296aaf..fbb543a6cab 100644
---- a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
-+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="adminDataGridSelectPerPage">
-         <arguments>
-             <argument name="perPage" type="string"/>
-@@ -23,8 +23,23 @@
-         </arguments>
-         <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown"/>
-         <click selector="{{AdminDataGridPaginationSection.perPageOption('Custom')}}" stepKey="selectCustomPerPage"/>
-+        <waitForElementVisible selector="{{AdminDataGridPaginationSection.perPageInput}}" time="30" stepKey="waitForInputVisible"/>
-         <fillField selector="{{AdminDataGridPaginationSection.perPageInput}}" userInput="{{perPage}}" stepKey="fillCustomPerPage"/>
-         <click selector="{{AdminDataGridPaginationSection.perPageApplyInput}}" stepKey="applyCustomPerPage"/>
-         <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
-+        <seeInField selector="{{AdminDataGridPaginationSection.perPageDropDownValue}}" userInput="{{perPage}}" stepKey="seePerPageValueInDropDown"/>
-+    </actionGroup>
-+
-+    <actionGroup name="adminDataGridDeleteCustomPerPage">
-+        <arguments>
-+            <argument name="perPage"/>
-+        </arguments>
-+        <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown1"/>
-+        <click selector="{{AdminDataGridPaginationSection.perPageEditCustomValue(perPage)}}" stepKey="clickToEditCustomPerPage"/>
-+        <waitForElementVisible selector="{{AdminDataGridPaginationSection.perPageDeleteCustomValue(perPage)}}" time="30" stepKey="waitForDeleteButtonVisible"/>
-+        <click selector="{{AdminDataGridPaginationSection.perPageDeleteCustomValue(perPage)}}" stepKey="clickToDeleteCustomPerPage"/>
-+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
-+        <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown"/>
-+        <dontSeeElement selector="{{AdminDataGridPaginationSection.perPageDropDownItem(perPage)}}" stepKey="dontSeeDropDownItem"/>
-     </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminFillInputFilterFieldActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminFillInputFilterFieldActionGroup.xml
-new file mode 100644
-index 00000000000..cc63e5ac730
---- /dev/null
-+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminFillInputFilterFieldActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminFillInputFilterFieldActionGroup">
-+        <arguments>
-+            <argument name="filterInputName" type="string"/>
-+            <argument name="filterValue" type="string"/>
-+        </arguments>
-+        <fillField selector="{{AdminDataGridFilterSection.inputFieldByNameAttrInGrid(filterInputName)}}" userInput="{{filterValue}}" stepKey="fillFilterInputField" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterApplyActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterApplyActionGroup.xml
-new file mode 100644
-index 00000000000..9f0b7da28ff
---- /dev/null
-+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterApplyActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminGridFilterApplyActionGroup">
-+        <click selector="{{AdminDataGridFilterSection.apply}}" stepKey="applyFilters" />
-+        <waitForPageLoad stepKey="waitForFiltersReset" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterFillInputFieldActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterFillInputFieldActionGroup.xml
-new file mode 100644
-index 00000000000..7cf05ab8c18
---- /dev/null
-+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterFillInputFieldActionGroup.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminGridFilterFillInputFieldActionGroup">
-+        <arguments>
-+            <argument name="filterInputName" type="string"/>
-+            <argument name="filterValue" type="string"/>
-+        </arguments>
-+
-+        <conditionalClick selector="{{AdminDataGridFilterSection.filterExpand}}" dependentSelector="{{AdminDataGridFilterSection.filterForm}}" visible="false" stepKey="openFiltersFormIfNecessary" />
-+        <waitForElementVisible selector="{{AdminDataGridFilterSection.filterForm}}" stepKey="waitForFormVisible" />
-+        <fillField userInput="{{filterValue}}" selector="{{AdminDataGridFilterSection.inputFieldByNameAttr(filterInputName)}}" stepKey="fillFilterInputField" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterResetActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterResetActionGroup.xml
-new file mode 100644
-index 00000000000..8430975a119
---- /dev/null
-+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterResetActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminGridFilterResetActionGroup">
-+        <scrollToTopOfPage stepKey="scrollToTop" />
-+        <conditionalClick selector="{{AdminDataGridFilterSection.clear}}" dependentSelector="{{AdminDataGridFilterSection.clear}}" visible="true" stepKey="clearExistingFilters" />
-+        <waitForPageLoad stepKey="waitForFiltersReset" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml
-index 023e20b7025..85f02e42345 100644
---- a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml
-+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml
-@@ -7,14 +7,14 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AdminGridFilterSearchResultsByInput">
-         <arguments>
-             <argument name="selector"/>
-             <argument name="value" type="string"/>
-         </arguments>
- 
--        <conditionalClick selector="{{AdminGridFilterControls.clearAll}}" dependentSelector="(//*[contains(@class, 'admin__data-grid-header')][contains(@data-bind, 'afterRender: \$data.setToolbarNode')]//*[contains(@class, 'admin__data-grid-filters-current')][contains(@class, '_show')])[1]" visible="true" stepKey="clearTheFiltersIfPresent"/>
-+        <conditionalClick selector="{{AdminGridFilterControls.clearAll}}" dependentSelector="{{AdminGridFilterControls.clearAll}}" visible="true" stepKey="clearTheFiltersIfPresent"/>
-         <waitForPageLoad stepKey="waitForPageLoad" time="5"/>
- 
-         <click selector="{{AdminGridFilterControls.filters}}" stepKey="clickOnFilters1"/>
-diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminSaveAndCloseActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminSaveAndCloseActionGroup.xml
-index 133b81a5d60..20c8927d491 100644
---- a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminSaveAndCloseActionGroup.xml
-+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminSaveAndCloseActionGroup.xml
-@@ -7,10 +7,16 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AdminFormSaveAndClose">
-         <click selector="{{AdminProductFormActionSection.saveArrow}}" stepKey="openSaveDropDown"/>
-         <click selector="{{AdminProductFormActionSection.saveAndClose}}" stepKey="clickOnSaveAndClose"/>
-         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
-     </actionGroup>
-+    <actionGroup name="AdminFormSaveAndDuplicate">
-+        <click selector="{{AdminProductFormActionSection.saveArrow}}" stepKey="openSaveDropDown"/>
-+        <click selector="{{AdminProductFormActionSection.saveAndDuplicate}}" stepKey="clickOnSaveAndDuplicate"/>
-+        <see selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveSuccess" userInput="You saved the product."/>
-+        <see selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertDuplicateSuccess" userInput="You duplicated the product."/>
-+        </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridFilterSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridFilterSection.xml
-new file mode 100644
-index 00000000000..ad8182c62ae
---- /dev/null
-+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridFilterSection.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminDataGridFilterSection">
-+        <element name="filterForm" type="block" selector="[data-part='filter-form']" />
-+        <element name="filterExpand" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//button[@data-action='grid-filter-expand']" />
-+        <element name="inputFieldByNameAttr" type="input" selector="//*[@data-part='filter-form']//input[@name='{{inputNameAttr}}']" parameterized="true" />
-+        <element name="inputFieldByNameAttrInGrid" type="input" selector="//*[@data-role='filter-form']//input[@name='{{inputNameAttr}}']" parameterized="true"/>
-+        <element name="apply" type="button" selector="//*[@data-part='filter-form']//button[@data-action='grid-filter-apply']" />
-+        <element name="clear" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" />
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
-index e5766300b0e..4ee38e30f98 100644
---- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
-+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminDataGridHeaderSection">
-         <!--Search by keyword element-->
-         <element name="search" type="input" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] input[placeholder='Search by keyword']"/>
-@@ -25,5 +25,7 @@
-         <!--Visible columns management-->
-         <element name="columnsToggle" type="button" selector="div.admin__data-grid-action-columns button[data-bind='toggleCollapsible']" timeout="30"/>
-         <element name="columnCheckbox" type="checkbox" selector="//div[contains(@class,'admin__data-grid-action-columns')]//div[contains(@class, 'admin__field-option')]//label[text() = '{{column}}']/preceding-sibling::input" parameterized="true"/>
-+        <element name="perPage" type="select" selector="#product_attributes_listing.product_attributes_listing.listing_top.listing_paging_sizes"/>
-+        <element name="attributeName" type="input" selector="//div[text()='{{arg}}']/../preceding-sibling::td//input" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
-index ff4097aa762..13383676117 100644
---- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
-+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
-@@ -7,15 +7,19 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminDataGridPaginationSection">
-         <element name="perPageDropdown" type="select" selector=".admin__data-grid-pager-wrap .selectmenu"/>
-         <element name="perPageOption" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//button[text()='{{var1}}']" parameterized="true"/>
--        <element name="perPageInput" type="input" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//input"/>
--        <element name="perPageApplyInput" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//button"/>
-+        <element name="perPageInput" type="input" selector="//div[contains(@class, 'admin__data-grid-pager-wrap')]//div[contains(@class, 'selectmenu-items _active')]//li[contains(@class, '_edit')]//div[contains(@class, 'selectmenu-item-edit')]//input"/>
-+        <element name="perPageApplyInput" type="button" selector="//div[contains(@class, 'admin__data-grid-pager-wrap')]//div[contains(@class, 'selectmenu-items _active')]//li[@class='_edit']//div[contains(@class, 'selectmenu-item-edit')]//button"/>
-+        <element name="perPageDropDownItem" type="button" selector="//*[contains(@class, 'selectmenu-items _active')]//button[contains(@class, 'selectmenu-item-action') and text()='{{dropDownItem}}']" timeout="30" parameterized="true"/>
-+        <element name="perPageEditCustomValue" type="button" selector="//div[contains(@class, 'selectmenu-items _active')]//div[contains(@class, 'selectmenu-item')]//button[text()='{{perPageCustomValue}}']/following-sibling::button[contains(@class, 'action-edit')]" parameterized="true"/>
-+        <element name="perPageDeleteCustomValue" type="button" selector="//div[contains(@class, 'selectmenu-items _active')]//div[contains(@class, 'selectmenu-item')]//button[text()='{{perPageCustomValue}}']/parent::div/preceding-sibling::div/button[contains(@class, 'action-delete')]" parameterized="true"/>
-         <element name="nextPage" type="button" selector="div.admin__data-grid-pager > button.action-next" timeout="30"/>
-         <element name="previousPage" type="button" selector="div.admin__data-grid-pager > button.action-previous" timeout="30"/>
-         <element name="currentPage" type="input" selector="div.admin__data-grid-pager > input[data-ui-id='current-page-input']"/>
-         <element name="totalPages" type="text" selector="div.admin__data-grid-pager > label"/>
-+        <element name="perPageDropDownValue" type="input" selector=".selectmenu-value input" timeout="30"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
-index ea0f7e64a84..e0f8408a1c3 100644
---- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
-+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
-@@ -7,9 +7,9 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminDataGridTableSection">
--        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
-+        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)" timeout="60"/>
-         <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
-         <element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{col}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
-         <element name="rowCheckbox" type="checkbox" selector="table.data-grid tbody > tr:nth-of-type({{row}}) td.data-grid-checkbox-cell input" parameterized="true"/>
-@@ -18,5 +18,8 @@
-         <!--Specific cell e.g. {{Section.gridCell('1', 'Name')}}-->
-         <element name="gridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
-         <element name="rowViewAction" type="button" selector=".data-grid tbody > tr:nth-of-type({{row}}) .action-menu-item" parameterized="true" timeout="30"/>
-+        <element name="dataGridEmpty" type="block" selector=".data-grid-tr-no-data td"/>
-+        <element name="rowTemplateStrict" type="block" selector="//tbody/tr[td[*[text()[normalize-space()='{{text}}']]]]" parameterized="true" />
-+        <element name="rowTemplate" type="block" selector="//tbody/tr[td[*[contains(.,normalize-space('{{text}}'))]]]" parameterized="true" timeout="30" />
-     </section>
- </sections>
-diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection.xml
-index 2bf65a682d2..978a09db82b 100644
---- a/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection.xml
-+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <!-- TODO: Search, Notifications, Admin Menu -->
-     <section name="AdminGridMainControls">
-         <element name="add" type="button" selector="#add" timeout="30"/>
-diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml
-index d3e94eb24df..3d4efa13ce3 100644
---- a/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml
-+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml
-@@ -7,9 +7,11 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminMessagesSection">
-         <element name="successMessage" type="text" selector=".message-success"/>
-         <element name="errorMessage" type="text" selector=".message.message-error.error"/>
-+        <element name="warningMessage" type="text" selector=".message-warning"/>
-+        <element name="noticeMessage" type="text" selector=".message-notice"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Ui/Test/Mftf/Section/ModalConfirmationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/ModalConfirmationSection.xml
-index 8c3dd505f66..4bf84d9ee63 100644
---- a/app/code/Magento/Ui/Test/Mftf/Section/ModalConfirmationSection.xml
-+++ b/app/code/Magento/Ui/Test/Mftf/Section/ModalConfirmationSection.xml
-@@ -7,8 +7,9 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="ModalConfirmationSection">
-+        <element name="modalContent" type="text" selector="aside.confirm div.modal-content"/>
-         <element name="CancelButton" type="button" selector="//footer[@class='modal-footer']/button[contains(@class, 'action-dismiss')]"/>
-         <element name="OkButton" type="button" selector="//footer[@class='modal-footer']/button[contains(@class, 'action-accept')]"/>
-     </section>
-diff --git a/app/code/Magento/Ui/Test/Mftf/Test/AdminGridFilterDeleteAndVerifyErrorMessageTest.xml b/app/code/Magento/Ui/Test/Mftf/Test/AdminGridFilterDeleteAndVerifyErrorMessageTest.xml
-new file mode 100644
-index 00000000000..e2c3b157c10
---- /dev/null
-+++ b/app/code/Magento/Ui/Test/Mftf/Test/AdminGridFilterDeleteAndVerifyErrorMessageTest.xml
-@@ -0,0 +1,81 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<!-- Test XML Example -->
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-+    <test name="AdminGridFilterDeleteAndVerifyErrorMessageTest">
-+        <annotations>
-+            <stories value="Delete Grid Filter"/>
-+            <title value="Grid Filter Delete and Verify Error Message"/>
-+            <description value="Test log in to uI and Delete Grid Filter Test"/>
-+            <testCaseId value="MC-14272"/>
-+            <severity value="CRITICAL"/>
-+            <group value="uI"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <magentoCLI command="config:set system/backup/functionality_enabled 1" stepKey="setEnableBackupToYes"/>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <createData entity="NewRootCategory" stepKey="rootCategory"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct">
-+                <requiredEntity createDataKey="rootCategory" />
-+            </createData>
-+
-+            <!--Create website-->
-+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
-+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
-+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
-+            </actionGroup>
-+            <!-- Create second store -->
-+            <actionGroup ref="CreateCustomStore" stepKey="createCustomStore">
-+                <argument name="website" value="{{customWebsite.name}}"/>
-+                <argument name="store" value="{{customStoreGroup.name}}"/>
-+                <argument name="rootCategory" value="$$rootCategory.name$$"/>
-+            </actionGroup>
-+            <!-- Create second store view -->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
-+                <argument name="StoreGroup" value="customStoreGroup"/>
-+                <argument name="customStore" value="customStoreEN"/>
-+            </actionGroup>
-+        </before>
-+        <after>
-+            <magentoCLI command="config:set system/backup/functionality_enabled 0" stepKey="setEnableBackupToNo"/>
-+            <deleteData stepKey="deleteRootCategory" createDataKey="rootCategory"/>
-+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Filter created simple product in grid and add category and website created in create data-->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProduct">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowOfCreatedSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+        <actionGroup ref="AddWebsiteToProductActionGroup" stepKey="updateSimpleProductAddingWebsiteCreated">
-+            <argument name="website" value="{{customWebsite.name}}"/>
-+        </actionGroup>
-+
-+        <!--Search updated simple product(from above step) in the grid by StoreView and Name-->
-+        <actionGroup ref="FilterProductInGridByStoreViewAndNameActionGroup" stepKey="searchCreatedSimpleProductInGrid">
-+            <argument name="storeView" value="{{customStoreEN.name}}"/>
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!--Go to stores and delete website created in create data-->
-+        <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-+            <argument name="websiteName" value="{{customWebsite.name}}"/>
-+        </actionGroup>
-+
-+        <!--Go to grid page and verify AssertErrorMessage-->
-+        <actionGroup ref="AssertErrorMessageAfterDeletingWebsiteActionGroup" stepKey="verifyErrorMessage">
-+            <argument name="errorMessage" value="Something went wrong with processing the default view and we have restored the filter to its original state."/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Ui/Test/Unit/Component/Control/ButtonTest.php b/app/code/Magento/Ui/Test/Unit/Component/Control/ButtonTest.php
-index bc7c3ac677e..97c77c158c1 100644
---- a/app/code/Magento/Ui/Test/Unit/Component/Control/ButtonTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Component/Control/ButtonTest.php
-@@ -10,6 +10,9 @@ use Magento\Framework\UrlInterface;
- use Magento\Framework\View\Element\Template\Context;
- use Magento\Ui\Component\Control\Button;
- 
-+/**
-+ * Class ButtonTest
-+ */
- class ButtonTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -55,7 +58,7 @@ class ButtonTest extends \PHPUnit\Framework\TestCase
-     public function testGetAttributesHtml()
-     {
-         $expected = 'type="button" class="action- scalable classValue disabled" '
--            . 'onclick="location.href = \'url2\';" disabled="disabled" data-attributeKey="attributeValue" ';
-+            . 'onclick="location.href = &#039;url2&#039;;" disabled="disabled" data-attributeKey="attributeValue" ';
-         $this->button->setDisabled(true);
-         $this->button->setData('url', 'url2');
-         $this->button->setData('class', 'classValue');
-diff --git a/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php b/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php
-index f91401e43ea..50d82b19d10 100644
---- a/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php
-@@ -66,7 +66,8 @@ class FilterModifierTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @return void
--     * @assertException \Magento\Framework\Exception\LocalizedException
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Condition type "not_allowed" is not allowed
-      */
-     public function testApplyFilterModifierWithNotAllowedCondition()
-     {
-@@ -78,7 +79,7 @@ class FilterModifierTest extends \PHPUnit\Framework\TestCase
-                 ]
-             ]);
-         $this->dataProvider->expects($this->never())->method('addFilter');
--        $this->unit->applyFilterModifier($this->dataProvider, 'test');
-+        $this->unit->applyFilterModifier($this->dataProvider, 'filter');
-     }
- 
-     /**
-diff --git a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php
-index d814fdcd153..32524e2331b 100644
---- a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php
-@@ -6,7 +6,6 @@
- namespace Magento\Ui\Test\Unit\Component\Filters\Type;
- 
- use Magento\Framework\View\Element\UiComponent\ContextInterface;
--use Magento\Framework\View\Element\UiComponent\ContextInterface as UiContext;
- use Magento\Framework\View\Element\UiComponentFactory;
- use Magento\Framework\View\Element\UiComponentInterface;
- use Magento\Ui\Component\Filters\Type\Input;
-@@ -37,18 +36,18 @@ class InputTest extends \PHPUnit\Framework\TestCase
-     protected $filterModifierMock;
- 
-     /**
--     * Set up
-+     * @inheritdoc
-      */
-     protected function setUp()
-     {
-         $this->contextMock = $this->getMockForAbstractClass(
--            \Magento\Framework\View\Element\UiComponent\ContextInterface::class,
-+            ContextInterface::class,
-             [],
-             '',
-             false
-         );
-         $this->uiComponentFactory = $this->createPartialMock(
--            \Magento\Framework\View\Element\UiComponentFactory::class,
-+            UiComponentFactory::class,
-             ['create']
-         );
-         $this->filterBuilderMock = $this->createMock(\Magento\Framework\Api\FilterBuilder::class);
-@@ -63,7 +62,7 @@ class InputTest extends \PHPUnit\Framework\TestCase
-      *
-      * @return void
-      */
--    public function testGetComponentName()
-+    public function testGetComponentName(): void
-     {
-         $this->contextMock->expects($this->never())->method('getProcessor');
-         $date = new Input(
-@@ -86,7 +85,7 @@ class InputTest extends \PHPUnit\Framework\TestCase
-      * @dataProvider getPrepareDataProvider
-      * @return void
-      */
--    public function testPrepare($name, $filterData, $expectedCondition)
-+    public function testPrepare(string $name, array $filterData, ?array $expectedCondition): void
-     {
-         $processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
-             ->disableOriginalConstructor()
-@@ -94,7 +93,7 @@ class InputTest extends \PHPUnit\Framework\TestCase
-         $this->contextMock->expects($this->atLeastOnce())->method('getProcessor')->willReturn($processor);
-         /** @var UiComponentInterface $uiComponent */
-         $uiComponent = $this->getMockForAbstractClass(
--            \Magento\Framework\View\Element\UiComponentInterface::class,
-+            UiComponentInterface::class,
-             [],
-             '',
-             false
-@@ -169,7 +168,7 @@ class InputTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @return array
-      */
--    public function getPrepareDataProvider()
-+    public function getPrepareDataProvider(): array
-     {
-         return [
-             [
-@@ -177,6 +176,16 @@ class InputTest extends \PHPUnit\Framework\TestCase
-                 ['test_date' => ''],
-                 null,
-             ],
-+            [
-+                'test_date',
-+                ['test_date' => null],
-+                null,
-+            ],
-+            [
-+                'test_date',
-+                ['test_date' => '0'],
-+                ['like' => '%0%'],
-+            ],
-             [
-                 'test_date',
-                 ['test_date' => 'some_value'],
-diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php
-index 6f45c192d6c..2cb35c7b85d 100644
---- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php
-@@ -13,13 +13,16 @@ use Magento\Ui\Component\Form\Element\ActionDelete;
- class ActionDeleteTest extends AbstractElementTest
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function getModelName()
-     {
-         return ActionDelete::class;
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-     public function testGetComponentName()
-     {
-         $this->assertSame(ActionDelete::NAME, $this->getModel()->getComponentName());
-diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php
-index 025f4a15824..3f00fa6c7ff 100644
---- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php
-@@ -15,13 +15,16 @@ use Magento\Ui\Component\Form\Element\CheckboxSet;
- class CheckboxSetTest extends AbstractElementTest
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function getModelName()
-     {
-         return CheckboxSet::class;
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-     public function testGetComponentName()
-     {
-         $this->assertSame(CheckboxSet::NAME, $this->getModel()->getComponentName());
-diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/MediaTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/MediaTest.php
-index 7af173cf2a9..9653ecd7ded 100644
---- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/MediaTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/MediaTest.php
-@@ -21,6 +21,9 @@ class MediaTest extends \PHPUnit\Framework\TestCase
-     /** @var Media */
-     protected $media;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     public function setUp()
-     {
-         $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
-@@ -29,8 +32,13 @@ class MediaTest extends \PHPUnit\Framework\TestCase
-             ->getMockForAbstractClass();
- 
-         $this->media = new Media($this->context);
-+    }
-+
-+    public function testPrepareWithoutDataScope()
-+    {
-         $this->media->setData(
-             [
-+                'name' => 'test_name',
-                 'config' => [
-                     'uploaderConfig' => [
-                         'url' => 'module/actionPath/path'
-@@ -38,19 +46,54 @@ class MediaTest extends \PHPUnit\Framework\TestCase
-                 ],
-             ]
-         );
-+        $url = 'http://magento2.com/module/actionPath/path/key/34523456234523trdg';
-+        $expectedConfig = [
-+            'uploaderConfig' => ['url' => $url],
-+            'dataScope' => 'test_name'
-+        ];
-+
-+        $this->processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->context->expects($this->atLeastOnce())->method('getProcessor')->willReturn($this->processor);
-+        $this->context->expects($this->once())
-+            ->method('getUrl')
-+            ->with('module/actionPath/path', ['_secure' => true])
-+            ->willReturn($url);
-+        $this->media->prepare();
-+        $configuration = $this->media->getConfiguration();
-+        $this->assertEquals($expectedConfig, $configuration);
-     }
- 
--    public function testPrepare()
-+    public function testPrepareWithDataScope()
-     {
-+        $this->media->setData(
-+            [
-+                'name' => 'test_name',
-+                'config' => [
-+                    'dataScope' => 'other_data_scope',
-+                    'uploaderConfig' => [
-+                        'url' => 'module/actionPath/path'
-+                    ],
-+                ],
-+            ]
-+        );
-+        $url = 'http://magento2.com/module/actionPath/path/key/34523456234523trdg';
-+        $expectedConfig = [
-+            'uploaderConfig' => ['url' => $url],
-+            'dataScope' => 'other_data_scope'
-+        ];
-+
-         $this->processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->context->expects($this->atLeastOnce())->method('getProcessor')->willReturn($this->processor);
--        $url = 'http://magento2.com/module/actionPath/path/key/34523456234523trdg';
-         $this->context->expects($this->once())
-             ->method('getUrl')
-             ->with('module/actionPath/path', ['_secure' => true])
-             ->willReturn($url);
-         $this->media->prepare();
-+        $configuration = $this->media->getConfiguration();
-+        $this->assertEquals($expectedConfig, $configuration);
-     }
- }
-diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php
-index cb91fbb945b..f37ca38a8d9 100644
---- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php
-@@ -15,13 +15,16 @@ use Magento\Ui\Component\Form\Element\MultiSelect;
- class MultiSelectTest extends AbstractElementTest
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function getModelName()
-     {
-         return MultiSelect::class;
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-     public function testGetComponentName()
-     {
-         $this->contextMock->expects($this->never())->method('getProcessor');
-diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php
-index 0e0fef60df6..67150e3c8fd 100644
---- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php
-@@ -15,13 +15,16 @@ use Magento\Ui\Component\Form\Element\RadioSet;
- class RadioSetTest extends AbstractElementTest
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function getModelName()
-     {
-         return RadioSet::class;
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-     public function testGetComponentName()
-     {
-         $this->assertSame(RadioSet::NAME, $this->getModel()->getComponentName());
-diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php
-index c6952626810..d4677192cc0 100644
---- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php
-@@ -15,13 +15,16 @@ use Magento\Ui\Component\Form\Element\Select;
- class SelectTest extends AbstractElementTest
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function getModelName()
-     {
-         return Select::class;
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-     public function testGetComponentName()
-     {
-         $this->assertSame(Select::NAME, $this->getModel()->getComponentName());
-diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
-index b345989ba05..4bfd952a6c5 100644
---- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
-@@ -85,13 +85,16 @@ class WysiwygTest extends AbstractElementTest
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function getModelName()
-     {
-         return Wysiwyg::class;
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-     public function testGetComponentName()
-     {
-         $this->assertSame(Wysiwyg::NAME, $this->getModel()->getComponentName());
-diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/FieldsetTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/FieldsetTest.php
-new file mode 100644
-index 00000000000..d2435075808
---- /dev/null
-+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/FieldsetTest.php
-@@ -0,0 +1,58 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Ui\Test\Unit\Component\Form;
-+
-+use Magento\Ui\Component\Form\Fieldset;
-+use Magento\Framework\View\Element\UiComponent\ContextInterface;
-+
-+/**
-+ * Class FieldTest
-+ *
-+ * Test for class \Magento\Ui\Component\Form\Fieldset
-+ */
-+class FieldsetTest extends \PHPUnit\Framework\TestCase
-+{
-+    const NAME = 'fieldset';
-+
-+    /**
-+     * @var Fieldset
-+     */
-+    protected $fieldset;
-+
-+    /**
-+     * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $context;
-+
-+    /**
-+     * Set up
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
-+            ->getMockForAbstractClass();
-+
-+        $this->fieldset = new Fieldset(
-+            $this->context,
-+            [],
-+            []
-+        );
-+    }
-+
-+    /**
-+     * Run test for getComponentName() method
-+     *
-+     * @return void
-+     *
-+     */
-+    public function testGetComponentName()
-+    {
-+        $this->assertEquals(self::NAME, $this->fieldset->getComponentName());
-+    }
-+}
-diff --git a/app/code/Magento/Ui/Test/Unit/Component/FormTest.php b/app/code/Magento/Ui/Test/Unit/Component/FormTest.php
-index 6951583291d..6df69c7d0e4 100644
---- a/app/code/Magento/Ui/Test/Unit/Component/FormTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Component/FormTest.php
-@@ -9,7 +9,6 @@ use Magento\Framework\Api\Filter;
- use Magento\Framework\Api\FilterBuilder;
- use Magento\Framework\View\Element\UiComponent\ContextInterface;
- use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
--use Magento\Framework\View\Element\UiComponent\Processor;
- use Magento\Ui\Component\Form;
- 
- class FormTest extends \PHPUnit\Framework\TestCase
-@@ -215,4 +214,65 @@ class FormTest extends \PHPUnit\Framework\TestCase
- 
-         $this->assertEquals($dataSource, $this->model->getDataSourceData());
-     }
-+
-+    public function testGetDataSourceDataWithAbstractDataProvider()
-+    {
-+        $requestFieldName = 'request_id';
-+        $primaryFieldName = 'primary_id';
-+        $fieldId = 44;
-+        $row = ['key' => 'value', $primaryFieldName => $fieldId];
-+        $data = [
-+            'items' => [$row],
-+        ];
-+        $dataSource = [
-+            'data' => [
-+                'general' => $row
-+            ],
-+        ];
-+
-+        /** @var DataProviderInterface|\PHPUnit_Framework_MockObject_MockObject $dataProviderMock */
-+        $dataProviderMock =
-+            $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface::class)
-+                ->getMock();
-+        $dataProviderMock->expects($this->once())
-+            ->method('getRequestFieldName')
-+            ->willReturn($requestFieldName);
-+        $dataProviderMock->expects($this->once())
-+            ->method('getPrimaryFieldName')
-+            ->willReturn($primaryFieldName);
-+
-+        $this->contextMock->expects($this->any())
-+            ->method('getDataProvider')
-+            ->willReturn($dataProviderMock);
-+        $this->contextMock->expects($this->once())
-+            ->method('getRequestParam')
-+            ->with($requestFieldName)
-+            ->willReturn($fieldId);
-+
-+        /** @var Filter|\PHPUnit_Framework_MockObject_MockObject $filterMock */
-+        $filterMock = $this->getMockBuilder(\Magento\Framework\Api\Filter::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->filterBuilderMock->expects($this->once())
-+            ->method('setField')
-+            ->with($primaryFieldName)
-+            ->willReturnSelf();
-+        $this->filterBuilderMock->expects($this->once())
-+            ->method('setValue')
-+            ->with($fieldId)
-+            ->willReturnSelf();
-+        $this->filterBuilderMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($filterMock);
-+
-+        $dataProviderMock->expects($this->once())
-+            ->method('addFilter')
-+            ->with($filterMock);
-+        $dataProviderMock->expects($this->once())
-+            ->method('getData')
-+            ->willReturn($data);
-+
-+        $this->assertEquals($dataSource, $this->model->getDataSourceData());
-+    }
- }
-diff --git a/app/code/Magento/Ui/Test/Unit/Component/PagingTest.php b/app/code/Magento/Ui/Test/Unit/Component/PagingTest.php
-index 44dca689eef..97df719ef14 100644
---- a/app/code/Magento/Ui/Test/Unit/Component/PagingTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Component/PagingTest.php
-@@ -81,31 +81,11 @@ class PagingTest extends \PHPUnit\Framework\TestCase
-             ],
-             'config' => [
-                 'options' => [
--                    [
--                        'value' => 20,
--                        'label' => 20
--                    ],
--                    [
--                        'value' => 30,
--                        'label' => 30
--                    ],
--                    [
--                        'value' => 50,
--                        'label' => 50
--                    ],
--                    [
--                        'value' => 100,
--                        'label' => 100
--                    ],
--                    [
--                        'value' => 200,
--                        'label' => 200
--                    ],
--                    [
-+                    'options1' => [
-                         'value' => 20,
-                         'label' => 'options1'
-                     ],
--                    [
-+                    'options2' => [
-                         'value' => 40,
-                         'label' => 'options2'
-                     ],
-diff --git a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php
-index 31d5b421013..d31537458f2 100644
---- a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php
-@@ -6,7 +6,11 @@
- namespace Magento\Ui\Test\Unit\Controller\Adminhtml\Index\Render;
- 
- use Magento\Ui\Controller\Adminhtml\Index\Render\Handle;
-+use Magento\Framework\View\Element\UiComponent\ContextInterface;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class HandleTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -27,22 +31,42 @@ class HandleTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @var \PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $componentFactoryMock;
-+    protected $viewMock;
-+
-+    /**
-+     * @var Handle
-+     */
-+    protected $controller;
-+
-+    /**
-+     * @var \Magento\Framework\AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $authorizationMock;
- 
-     /**
-      * @var \PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $viewMock;
-+    private $uiComponentContextMock;
- 
-     /**
--     * @var Handle
-+     * @var \Magento\Framework\View\Element\UiComponentInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $controller;
-+    private $uiComponentMock;
-+
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $uiFactoryMock;
-+
-+    /**
-+     * @var \Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface|
-+     *      \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $dataProviderMock;
- 
-     public function setUp()
-     {
-         $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
--        $this->componentFactoryMock = $this->createMock(\Magento\Framework\View\Element\UiComponentFactory::class);
- 
-         $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
-         $this->contextMock->expects($this->atLeastOnce())->method('getRequest')->willReturn($this->requestMock);
-@@ -52,8 +76,37 @@ class HandleTest extends \PHPUnit\Framework\TestCase
- 
-         $this->viewMock = $this->createMock(\Magento\Framework\App\ViewInterface::class);
-         $this->contextMock->expects($this->atLeastOnce())->method('getView')->willReturn($this->viewMock);
--
--        $this->controller = new Handle($this->contextMock, $this->componentFactoryMock);
-+        $this->authorizationMock = $this->getMockBuilder(\Magento\Framework\AuthorizationInterface::class)
-+            ->getMockForAbstractClass();
-+        $this->authorizationMock->expects($this->any())
-+            ->method('isAllowed')
-+            ->willReturn(true);
-+        $this->uiComponentContextMock = $this->getMockForAbstractClass(
-+            ContextInterface::class
-+        );
-+        $this->uiComponentMock = $this->getMockForAbstractClass(
-+            \Magento\Framework\View\Element\UiComponentInterface::class
-+        );
-+        $this->dataProviderMock = $this->getMockForAbstractClass(
-+            \Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface::class
-+        );
-+        $this->uiComponentContextMock->expects($this->once())
-+            ->method('getDataProvider')
-+            ->willReturn($this->dataProviderMock);
-+        $this->uiFactoryMock = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->uiComponentMock->expects($this->any())
-+            ->method('getContext')
-+            ->willReturn($this->uiComponentContextMock);
-+        $this->uiFactoryMock->expects($this->any())
-+            ->method('create')
-+            ->willReturn($this->uiComponentMock);
-+        $this->dataProviderMock->expects($this->once())
-+            ->method('getConfigData')
-+            ->willReturn([]);
-+        $contextMock = $this->createMock(\Magento\Framework\View\Element\UiComponent\ContextFactory::class);
-+        $this->controller = new Handle($this->contextMock, $this->uiFactoryMock, $contextMock);
-     }
- 
-     public function testExecuteNoButtons()
-@@ -83,7 +136,7 @@ class HandleTest extends \PHPUnit\Framework\TestCase
-             ->with(['default', $result], true, true, false);
- 
-         $layoutMock = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
--        $this->viewMock->expects($this->exactly(2))->method('getLayout')->willReturn($layoutMock);
-+        $this->viewMock->expects($this->once())->method('getLayout')->willReturn($layoutMock);
- 
-         $layoutMock->expects($this->exactly(2))->method('getBlock');
- 
-diff --git a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
-index 05b35fb017b..2bba8686490 100644
---- a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
-@@ -3,12 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Ui\Test\Unit\Controller\Adminhtml\Index;
- 
-+use Magento\Framework\Controller\Result\Json;
-+use Magento\Framework\Escaper;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Framework\View\Element\UiComponent\ContextInterface;
- use Magento\Ui\Controller\Adminhtml\Index\Render;
- use Magento\Ui\Model\UiComponentTypeResolver;
--use Magento\Framework\View\Element\UiComponent\ContextInterface;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Zend\Http\AbstractMessage;
-+use Zend\Http\Response;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -97,6 +102,11 @@ class RenderTest extends \PHPUnit\Framework\TestCase
-      */
-     private $loggerMock;
- 
-+    /**
-+     * @var Escaper|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $escaperMock;
-+
-     protected function setUp()
-     {
-         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-@@ -170,6 +180,10 @@ class RenderTest extends \PHPUnit\Framework\TestCase
-         $this->uiComponentTypeResolverMock = $this->getMockBuilder(UiComponentTypeResolver::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-+        $this->escaperMock = $this->createMock(Escaper::class);
-+        $this->escaperMock->expects($this->any())
-+            ->method('escapeHtml')
-+            ->willReturnArgument(0);
- 
-         $this->objectManagerHelper = new ObjectManagerHelper($this);
- 
-@@ -181,6 +195,7 @@ class RenderTest extends \PHPUnit\Framework\TestCase
-                 'contentTypeResolver' => $this->uiComponentTypeResolverMock,
-                 'resultJsonFactory' => $this->resultJsonFactoryMock,
-                 'logger' => $this->loggerMock,
-+                'escaper' => $this->escaperMock,
-             ]
-         );
-     }
-@@ -201,7 +216,7 @@ class RenderTest extends \PHPUnit\Framework\TestCase
-             ->method('appendBody')
-             ->willThrowException(new \Exception('exception'));
- 
--        $jsonResultMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
-+        $jsonResultMock = $this->getMockBuilder(Json::class)
-             ->disableOriginalConstructor()
-             ->setMethods(['setData'])
-             ->getMock();
-@@ -290,6 +305,34 @@ class RenderTest extends \PHPUnit\Framework\TestCase
-         $name = 'test-name';
-         $renderedData = '<html>data</html>';
- 
-+        if (false === $isAllowed) {
-+            $jsonResultMock = $this->getMockBuilder(Json::class)
-+                ->disableOriginalConstructor()
-+                ->setMethods(['setStatusHeader', 'setData'])
-+                ->getMock();
-+
-+            $jsonResultMock->expects($this->at(0))
-+                ->method('setStatusHeader')
-+                ->with(
-+                    Response::STATUS_CODE_403,
-+                    AbstractMessage::VERSION_11,
-+                    'Forbidden'
-+                )
-+                ->willReturnSelf();
-+
-+            $jsonResultMock->expects($this->at(1))
-+                ->method('setData')
-+                ->with([
-+                    'error' => 'Forbidden',
-+                    'errorcode' => 403
-+                ])
-+                ->willReturnSelf();
-+
-+            $this->resultJsonFactoryMock->expects($this->any())
-+                ->method('create')
-+                ->willReturn($jsonResultMock);
-+        }
-+
-         $this->requestMock->expects($this->any())
-             ->method('getParam')
-             ->with('namespace')
-diff --git a/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php b/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php
-index aae4fafbdac..80cf7666eee 100644
---- a/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php
-+++ b/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php
-@@ -6,6 +6,8 @@
- namespace Magento\Ui\Test\Unit\Model\Export;
- 
- use Magento\Framework\Api\Search\DocumentInterface;
-+use Magento\Framework\Locale\ResolverInterface;
-+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
- use Magento\Framework\View\Element\UiComponentInterface;
- use Magento\Ui\Component\Listing\Columns;
- use Magento\Ui\Component\Listing\Columns\Column;
-@@ -13,29 +15,60 @@ use Magento\Ui\Component\MassAction\Filter;
- use Magento\Ui\Model\Export\MetadataProvider;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class MetadataProviderTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-      * @var MetadataProvider
-      */
--    protected $model;
-+    private $model;
- 
-     /**
-      * @var Filter | \PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $filter;
-+    private $filter;
-+
-+    /**
-+     * @var TimezoneInterface | \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $localeDate;
-+
-+    /**
-+     * @var ResolverInterface | \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $localeResolver;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->filter = $this->getMockBuilder(\Magento\Ui\Component\MassAction\Filter::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-+        $this->localeDate = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->localeResolver = $this->getMockBuilder(\Magento\Framework\Locale\ResolverInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->localeResolver->expects($this->any())
-+            ->method('getLocale')
-+            ->willReturn(null);
-+
-         $objectManager = new ObjectManager($this);
-         $this->model = $objectManager->getObject(
-             \Magento\Ui\Model\Export\MetadataProvider::class,
-             [
-                 'filter' => $this->filter,
-+                'localeDate' => $this->localeDate,
-+                'localeResolver' => $this->localeResolver,
-+                'data' => ['component_name' => ['field']],
-             ]
-         );
-     }
-@@ -347,4 +380,55 @@ class MetadataProviderTest extends \PHPUnit\Framework\TestCase
-             ],
-         ];
-     }
-+
-+    /**
-+     * Test for convertDate function
-+     *
-+     * @param string $fieldValue
-+     * @param string $expected
-+     * @dataProvider convertDateProvider
-+     * @covers       \Magento\Ui\Model\Export\MetadataProvider::convertDate()
-+     */
-+    public function testConvertDate($fieldValue, $expected)
-+    {
-+        $componentName = 'component_name';
-+        /** @var DocumentInterface|\PHPUnit_Framework_MockObject_MockObject $document */
-+        $document = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $document->expects($this->once())
-+            ->method('getData')
-+            ->with('field')
-+            ->willReturn($fieldValue);
-+
-+        $this->localeDate->expects($this->once())
-+            ->method('date')
-+            ->willReturn(new \DateTime($fieldValue, new \DateTimeZone('UTC')));
-+
-+        $document->expects($this->once())
-+            ->method('setData')
-+            ->with('field', $expected);
-+
-+        $this->model->convertDate($document, $componentName);
-+    }
-+
-+    /**
-+     * Data provider for testConvertDate
-+     *
-+     * @return array
-+     */
-+    public function convertDateProvider()
-+    {
-+        return [
-+            [
-+                'fieldValue' => '@1534505233',
-+                'expected' => 'Aug 17, 2018 11:27:13 AM',
-+            ],
-+            [
-+                'fieldValue' => '@1534530000',
-+                'expected' => 'Aug 17, 2018 06:20:00 PM',
-+            ],
-+        ];
-+    }
- }
-diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
-index 296332e3835..d0d93abc6b1 100644
---- a/app/code/Magento/Ui/composer.json
-+++ b/app/code/Magento/Ui/composer.json
-@@ -11,7 +11,8 @@
-         "magento/module-backend": "*",
-         "magento/module-eav": "*",
-         "magento/module-store": "*",
--        "magento/module-user": "*"
-+        "magento/module-user": "*",
-+        "magento/module-cms": "*"
-     },
-     "suggest": {
-         "magento/module-config": "*"
-diff --git a/app/code/Magento/Ui/etc/db_schema.xml b/app/code/Magento/Ui/etc/db_schema.xml
-index d07329df9eb..13a384024f1 100644
---- a/app/code/Magento/Ui/etc/db_schema.xml
-+++ b/app/code/Magento/Ui/etc/db_schema.xml
-@@ -18,14 +18,14 @@
-                 comment="Mark current bookmark per user and identifier"/>
-         <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Bookmark title"/>
-         <column xsi:type="longtext" name="config" nullable="true" comment="Bookmark config"/>
--        <column xsi:type="datetime" name="created_at" on_update="false" nullable="false" comment="Bookmark created at"/>
--        <column xsi:type="datetime" name="updated_at" on_update="false" nullable="false" comment="Bookmark updated at"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <column xsi:type="datetime" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP" comment="Bookmark created at"/>
-+        <column xsi:type="datetime" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP" comment="Bookmark updated at"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="bookmark_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="UI_BOOKMARK_USER_ID_ADMIN_USER_USER_ID" table="ui_bookmark"
-+        <constraint xsi:type="foreign" referenceId="UI_BOOKMARK_USER_ID_ADMIN_USER_USER_ID" table="ui_bookmark"
-                     column="user_id" referenceTable="admin_user" referenceColumn="user_id" onDelete="CASCADE"/>
--        <index name="UI_BOOKMARK_USER_ID_NAMESPACE_IDENTIFIER" indexType="btree">
-+        <index referenceId="UI_BOOKMARK_USER_ID_NAMESPACE_IDENTIFIER" indexType="btree">
-             <column name="user_id"/>
-             <column name="namespace"/>
-             <column name="identifier"/>
-diff --git a/app/code/Magento/Ui/i18n/de_DE.csv b/app/code/Magento/Ui/i18n/de_DE.csv
-deleted file mode 100644
-index 2efac126b85..00000000000
---- a/app/code/Magento/Ui/i18n/de_DE.csv
-+++ /dev/null
-@@ -1,4 +0,0 @@
--"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
--"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
--"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
--"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
-diff --git a/app/code/Magento/Ui/i18n/en_US.csv b/app/code/Magento/Ui/i18n/en_US.csv
-index 106526f66e7..1ce2692886a 100644
---- a/app/code/Magento/Ui/i18n/en_US.csv
-+++ b/app/code/Magento/Ui/i18n/en_US.csv
-@@ -58,6 +58,7 @@ Keyword,Keyword
- "Letters, numbers, spaces or underscores only please","Letters, numbers, spaces or underscores only please"
- "Letters only please","Letters only please"
- "No white space please","No white space please"
-+"No marginal white space please","No marginal white space please"
- "Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx","Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx"
- "A positive or negative non-decimal number please","A positive or negative non-decimal number please"
- "The specified vehicle identification number (VIN) is invalid.","The specified vehicle identification number (VIN) is invalid."
-@@ -77,6 +78,7 @@ Keyword,Keyword
- "Empty Value.","Empty Value."
- "Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field.","Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field."
- "Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.","Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter."
-+"Attribute code ""%1"" is invalid. Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.","Attribute code ""%1"" is invalid. Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter."
- "Please use only letters (a-z or A-Z), numbers (0-9), spaces and ""#"" in this field.","Please use only letters (a-z or A-Z), numbers (0-9), spaces and ""#"" in this field."
- "Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890."
- "Please enter a valid fax number (Ex: 123-456-7890).","Please enter a valid fax number (Ex: 123-456-7890)."
-@@ -180,7 +182,7 @@ CSV,CSV
- "Please enter a valid value from list","Please enter a valid value from list"
- "Please enter valid SKU key.","Please enter valid SKU key."
- "Please enter a valid number.","Please enter a valid number."
--"Admin is a required field in the each row.","Admin is a required field in the each row."
-+"Admin is a required field in each row.","Admin is a required field in each row."
- "Please fix this field.","Please fix this field."
- "Please enter a valid date (ISO).","Please enter a valid date (ISO)."
- "Please enter only digits.","Please enter only digits."
-@@ -189,4 +191,5 @@ CSV,CSV
- "Please enter at least {0} characters.","Please enter at least {0} characters."
- "Please enter a value between {0} and {1} characters long.","Please enter a value between {0} and {1} characters long."
- "Please enter a value between {0} and {1}.","Please enter a value between {0} and {1}."
--"was not uploaded","was not uploaded"
-\ No newline at end of file
-+"was not uploaded","was not uploaded"
-+"The file upload field is disabled.","The file upload field is disabled."
-diff --git a/app/code/Magento/Ui/i18n/es_ES.csv b/app/code/Magento/Ui/i18n/es_ES.csv
-deleted file mode 100644
-index 2efac126b85..00000000000
---- a/app/code/Magento/Ui/i18n/es_ES.csv
-+++ /dev/null
-@@ -1,4 +0,0 @@
--"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
--"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
--"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
--"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
-diff --git a/app/code/Magento/Ui/i18n/fr_FR.csv b/app/code/Magento/Ui/i18n/fr_FR.csv
-deleted file mode 100644
-index 2efac126b85..00000000000
---- a/app/code/Magento/Ui/i18n/fr_FR.csv
-+++ /dev/null
-@@ -1,4 +0,0 @@
--"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
--"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
--"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
--"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
-diff --git a/app/code/Magento/Ui/i18n/nl_NL.csv b/app/code/Magento/Ui/i18n/nl_NL.csv
-deleted file mode 100644
-index 2efac126b85..00000000000
---- a/app/code/Magento/Ui/i18n/nl_NL.csv
-+++ /dev/null
-@@ -1,4 +0,0 @@
--"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
--"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
--"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
--"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
-diff --git a/app/code/Magento/Ui/i18n/pt_BR.csv b/app/code/Magento/Ui/i18n/pt_BR.csv
-deleted file mode 100644
-index 2efac126b85..00000000000
---- a/app/code/Magento/Ui/i18n/pt_BR.csv
-+++ /dev/null
-@@ -1,4 +0,0 @@
--"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
--"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
--"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
--"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
-diff --git a/app/code/Magento/Ui/i18n/zh_Hans_CN.csv b/app/code/Magento/Ui/i18n/zh_Hans_CN.csv
-deleted file mode 100644
-index 2efac126b85..00000000000
---- a/app/code/Magento/Ui/i18n/zh_Hans_CN.csv
-+++ /dev/null
-@@ -1,4 +0,0 @@
--"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
--"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
--"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
--"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
-diff --git a/app/code/Magento/Ui/view/base/requirejs-config.js b/app/code/Magento/Ui/view/base/requirejs-config.js
-index e91fe309dd1..cdbbd03c93a 100644
---- a/app/code/Magento/Ui/view/base/requirejs-config.js
-+++ b/app/code/Magento/Ui/view/base/requirejs-config.js
-@@ -5,14 +5,12 @@
- 
- var config = {
-     shim: {
--        'tinymce4': {
--            'exports': 'tinymce'
-+        'tiny_mce_4/tinymce.min': {
-+            exports: 'tinyMCE'
-         }
-     },
-     paths: {
--        'ui/template': 'Magento_Ui/templates',
--        'tinymce4': 'tiny_mce_4/tinymce.min',
--        'wysiwygAdapter': 'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter'
-+        'ui/template': 'Magento_Ui/templates'
-     },
-     map: {
-         '*': {
-@@ -24,7 +22,9 @@ var config = {
-             uiRegistry:     'Magento_Ui/js/lib/registry/registry',
-             consoleLogger:  'Magento_Ui/js/lib/logger/console-logger',
-             uiLayout:       'Magento_Ui/js/core/renderer/layout',
--            buttonAdapter:  'Magento_Ui/js/form/button-adapter'
-+            buttonAdapter:  'Magento_Ui/js/form/button-adapter',
-+            tinymce4:       'tiny_mce_4/tinymce.min',
-+            wysiwygAdapter: 'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter'
-         }
-     }
- };
-diff --git a/app/code/Magento/Ui/view/base/templates/control/button/default.phtml b/app/code/Magento/Ui/view/base/templates/control/button/default.phtml
-index 0307af4f749..856bdd67a5b 100644
---- a/app/code/Magento/Ui/view/base/templates/control/button/default.phtml
-+++ b/app/code/Magento/Ui/view/base/templates/control/button/default.phtml
-@@ -4,16 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
--<?php
- /**
-  * @var $block \Magento\Ui\Component\Control\Button
-  */
- ?>
- <?= $block->getBeforeHtml() ?>
--<button <?= /* @escapeNotVerified */ $block->getAttributesHtml(), $block->getUiId() ?>>
--    <span><?= /* @escapeNotVerified */ $block->getLabel() ?></span>
-+<button <?= /* @noEscape */ $block->getAttributesHtml(), /* @noEscape */ $block->getUiId() ?>>
-+    <span><?= $block->escapeHtml($block->getLabel()) ?></span>
- </button>
- <?= $block->getAfterHtml() ?>
-diff --git a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
-index 757b1d3a4e4..08230184d5a 100644
---- a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
-+++ b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
-@@ -4,10 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
--<?php
- /** @var $block \Magento\Ui\Component\Control\SplitButton */
- ?>
- 
-@@ -15,21 +11,21 @@
-     <button <?= $block->getButtonAttributesHtml() ?>>
-         <span><?= $block->escapeHtml($block->getLabel()) ?></span>
-     </button>
--    <?php if ($block->hasSplit()): ?>
-+    <?php if ($block->hasSplit()) : ?>
-         <button <?= $block->getToggleAttributesHtml() ?>>
--            <span><?= /* @escapeNotVerified */ __('Select'); ?></span>
-+            <span><?= $block->escapeHtml(__('Select')) ?></span>
-         </button>
- 
--        <?php if (!$block->getDisabled()): ?>
--            <ul class="dropdown-menu" <?= /* @escapeNotVerified */ $block->getUiId("dropdown-menu") ?>>
--                <?php foreach ($block->getOptions() as $key => $option): ?>
-+        <?php if (!$block->getDisabled()) : ?>
-+            <ul class="dropdown-menu" <?= /* @noEscape */ $block->getUiId("dropdown-menu") ?>>
-+                <?php foreach ($block->getOptions() as $key => $option) : ?>
-                 <li>
-                     <span <?= $block->getOptionAttributesHtml($key, $option) ?>>
-                         <?= $block->escapeHtml($option['label']) ?>
-                     </span>
--                    <?php if (isset($option['hint'])): ?>
--                    <div class="tooltip" <?= /* @escapeNotVerified */ $block->getUiId('item', $key, 'tooltip') ?>>
--                        <a href="<?= $block->escapeHtml($option['hint']['href']) ?>" class="help">
-+                    <?php if (isset($option['hint'])) : ?>
-+                    <div class="tooltip" <?= /* @noEscape */ $block->getUiId('item', $key, 'tooltip') ?>>
-+                        <a href="<?= $block->escapeUrl($option['hint']['href']) ?>" class="help">
-                             <?= $block->escapeHtml($option['hint']['label']) ?>
-                         </a>
-                     </div>
-@@ -46,4 +42,4 @@
-             "Magento_Ui/js/grid/controls/button/split": {}
-         }
-     }
--</script>
-\ No newline at end of file
-+</script>
-diff --git a/app/code/Magento/Ui/view/base/templates/form/default.phtml b/app/code/Magento/Ui/view/base/templates/form/default.phtml
-index 97f8ec52ca0..bb14cd4171f 100644
---- a/app/code/Magento/Ui/view/base/templates/form/default.phtml
-+++ b/app/code/Magento/Ui/view/base/templates/form/default.phtml
-@@ -4,17 +4,18 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /**
-  * @var \Magento\Ui\Component\Form $block
-  */
--/* @escapeNotVerified */ echo $block->renderChildComponent('before_form');
- ?>
--<div data-role="spinner" data-component="<?= /* @escapeNotVerified */ $block->getName() ?>.areas" class="admin__data-grid-loading-mask">
-+<?=/* @noEscape */ $block->renderChildComponent('before_form') ?>
-+<div data-role="spinner"
-+     data-component="<?= $block->escapeHtmlAttr($block->getName()) ?>.areas"
-+     class="admin__data-grid-loading-mask">
-     <div class="grid-loader"></div>
- </div>
--<div data-bind="scope: '<?= /* @escapeNotVerified */ $block->getName() ?>.areas'" class="entry-edit form-inline">
-+<div data-bind="scope: '<?= $block->escapeHtmlAttr($block->getName()) ?>.areas'"
-+     class="entry-edit form-inline">
-     <!-- ko template: getTemplate() --><!-- /ko -->
- </div>
--<?php
--echo $block->renderChildComponent('after_form');
-+<?= /* @noEscape */ $block->renderChildComponent('after_form') ?>
-diff --git a/app/code/Magento/Ui/view/base/templates/label/default.phtml b/app/code/Magento/Ui/view/base/templates/label/default.phtml
-index db434adf92e..cb334a3e3f3 100644
---- a/app/code/Magento/Ui/view/base/templates/label/default.phtml
-+++ b/app/code/Magento/Ui/view/base/templates/label/default.phtml
-@@ -5,5 +5,5 @@
-  */
- ?>
- <span>
--    <?= /* @escapeNotVerified */ $block->getData('label') ?>
-+    <?= $block->escapeHtml($block->getData('label')) ?>
- </span>
-diff --git a/app/code/Magento/Ui/view/base/templates/layout/tabs/default.phtml b/app/code/Magento/Ui/view/base/templates/layout/tabs/default.phtml
-index 58e9ed5d050..9192c86847c 100644
---- a/app/code/Magento/Ui/view/base/templates/layout/tabs/default.phtml
-+++ b/app/code/Magento/Ui/view/base/templates/layout/tabs/default.phtml
-@@ -3,10 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- /**
-  * @var \Magento\Ui\Component\Layout\Tabs $block
-  */
- ?>
--<div data-bind="scope: '<?= /* @escapeNotVerified */ $block->getDataScope() ?>.sections' " class="ui-tabs">
-+<div data-bind="scope: '<?= $block->escapeHtmlAttr($block->getDataScope()) ?>.sections' " class="ui-tabs">
-     <!-- ko template: getTemplate() --><!-- /ko -->
- </div>
-diff --git a/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml b/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml
-index b81e0bcc8f2..202834c8312 100644
---- a/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml
-+++ b/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml
-@@ -3,10 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- /**
-  * @var \Magento\Ui\Component\Layout\Tabs\Nav $block
-  */
- ?>
--<div data-bind="scope: '<?= /* @escapeNotVerified */ $block->getDataScope() ?>.sections' " class="ui-tabs">
-+<div data-bind="scope: '<?= $block->escapeHtmlAttr($block->getDataScope()) ?>.sections' " class="ui-tabs">
-     <!-- ko template: getTemplate() --><!-- /ko -->
- </div>
-diff --git a/app/code/Magento/Ui/view/base/templates/logger.phtml b/app/code/Magento/Ui/view/base/templates/logger.phtml
-index d064704ab6a..7466781a606 100644
---- a/app/code/Magento/Ui/view/base/templates/logger.phtml
-+++ b/app/code/Magento/Ui/view/base/templates/logger.phtml
-@@ -3,13 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
-+
-+/** @var $block \Magento\Ui\Block\Logger */
- ?>
--<?php /** @var $block \Magento\Ui\Block\Logger */ ?>
--<?php if ($block->isLoggingEnabled()): ?>
-+<?php if ($block->isLoggingEnabled()) : ?>
-     <script>
-         window.onerror = function(msg, url, line) {
--            var key = "<?= /* @escapeNotVerified */ $block->getSessionStorageKey() ?>";
-+            var key = "<?= $block->escapeJs($block->getSessionStorageKey()) ?>";
-             var errors = {};
-             if (sessionStorage.getItem(key)) {
-                 errors = JSON.parse(sessionStorage.getItem(key));
-diff --git a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
-index 05a537b9a65..3513cf4c0ed 100644
---- a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
-+++ b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
-@@ -4,54 +4,56 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
- /** @var $block \Magento\Ui\Block\Component\StepsWizard */
- ?>
--<div data-role="steps-wizard-main" class="steps-wizard <?= /* @noEscape */ $block->getData('config/dataScope') ?>" data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName() ?>'">
-+<div data-role="steps-wizard-main"
-+     class="steps-wizard <?= /* @noEscape */ $block->getData('config/dataScope') ?>"
-+     data-bind="scope: '<?= $block->escapeHtmlAttr($block->getComponentName()) ?>'">
-     <div data-role="messages" class="messages"></div>
- 
-     <div data-role="steps-wizard-controls" class="steps-wizard-navigation">
-         <ul class="nav-bar">
--            <?php foreach ($block->getSteps() as $step) { ?>
--                <li data-role="collapsible" data-bind="css: { 'active': selectedStep() == '<?= /* @escapeNotVerified */  $step->getComponentName() ?>'}">
--                    <a href="#<?= /* @escapeNotVerified */  $step->getComponentName() ?>"
-+            <?php foreach ($block->getSteps() as $step) : ?>
-+                <li data-role="collapsible"
-+                    data-bind="css: { 'active': selectedStep() == '<?= $block->escapeHtmlAttr($step->getComponentName()) ?>'}">
-+                    <a href="#<?= $block->escapeHtmlAttr($step->getComponentName()) ?>"
-                        data-bind="click: showSpecificStep">
--                        <?= /* @escapeNotVerified */  $step->getCaption() ?>
-+                        <?= $block->escapeHtml($step->getCaption()) ?>
-                     </a>
-                 </li>
--            <?php } ?>
-+            <?php endforeach; ?>
-         </ul>
-         <div class="nav-bar-outer-actions">
-             <div class="action-wrap" data-role="closeBtn">
-                 <button type="button"
-                         class="action-cancel action-tertiary" data-bind="click: close">
--                    <span><?= /* @escapeNotVerified */  __('Cancel') ?></span>
-+                    <span><?= $block->escapeHtml(__('Cancel')) ?></span>
-                 </button>
-             </div>
-             <div class="action-wrap action-wrap-prev" data-role="step-wizard-prev">
-                 <button type="button"
-                         class="action-default action-back-step"
-                         data-bind="click: back, css: { 'disabled': disabled}">
--                    <span><?= /* @escapeNotVerified */  __('Back') ?></span>
-+                    <span><?= $block->escapeHtml(__('Back')) ?></span>
-                 </button>
-             </div>
-             <div class="action-wrap action-wrap-next" data-role="step-wizard-next">
-                 <button type="button"
-                         class="action-default action-primary action-next-step" data-bind="click: next">
--                    <span><?= /* @escapeNotVerified */  __('Next') ?></span>
-+                    <span><?= $block->escapeHtml(__('Next')) ?></span>
-                 </button>
-             </div>
-         </div>
-     </div>
-     <div data-role="steps-wizard-tab">
--        <?php foreach ($block->getSteps() as $step) { ?>
-+        <?php foreach ($block->getSteps() as $step) : ?>
-             <div data-bind="visible: selectedStep() == $element.id, css: {'no-display':false}"
--                 class="content no-display" id="<?= /* @escapeNotVerified */ $step->getComponentName() ?>"
-+                 class="content no-display" id="<?= $block->escapeHtmlAttr($step->getComponentName()) ?>"
-                  data-role="content">
--                <?= /* @escapeNotVerified */  $step->getContent() ?>
-+                <?= /* @noEscape */ $step->getContent() ?>
-             </div>
--        <?php } ?>
-+        <?php endforeach; ?>
-     </div>
- </div>
- 
-@@ -60,10 +62,10 @@
-         "*": {
-             "Magento_Ui/js/core/app": {
-                 "components": {
--                        "<?= /* @escapeNotVerified */  $block->getComponentName() ?>": {
-+                        "<?= $block->escapeJs($block->getComponentName()) ?>": {
-                             "component": "Magento_Ui/js/lib/step-wizard",
--                            "initData": <?= /* @escapeNotVerified */  $this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getInitData()) ?>,
--                            "stepsNames": <?= /* @escapeNotVerified */  $this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getStepComponents()) ?>,
-+                            "initData": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getInitData()) ?>,
-+                            "stepsNames": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getStepComponents()) ?>,
-                             "modalClass": "<?= /* @noEscape */ $block->getData('config/dataScope') ?>"
-                         }
-                     }
-diff --git a/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml b/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml
-index a4473adc099..a7c279c4316 100644
---- a/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml
-+++ b/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml
-@@ -1,20 +1,17 @@
- <?php
--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var Magento\Ui\Block\Wysiwyg\ActiveEditor $block */
--
- ?>
--
- <script>
-     require.config({
--        paths: {
--            wysiwygAdapter: '<?php /* @noEscape */ echo $block->getWysiwygAdapterPath(); ?>'
-+        map: {
-+            '*': {
-+                wysiwygAdapter: '<?= /* @noEscape */ $block->getWysiwygAdapterPath() ?>'
-+            }
-         }
-     });
- </script>
-diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
-index ccd702c23ea..8f82b98112f 100644
---- a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
-+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
-@@ -14,6 +14,7 @@
-                     <item name="label" type="string" translate="true" xsi:type="xpath">settings/label</item>
-                     <item name="type" type="string" xsi:type="xpath">settings/type</item>
-                     <item name="url" type="url" xsi:type="converter">settings/url</item>
-+                    <item name="actionDisable" type="boolean" xsi:type="xpath">settings/actionDisable</item>
-                     <item name="confirm" xsi:type="array">
-                         <item name="title" type="string" translate="true" xsi:type="xpath">settings/confirm/title</item>
-                         <item name="message" type="string" translate="true" xsi:type="xpath">settings/confirm/message</item>
-diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
-index 75374a82f1d..f0a5f357f8a 100755
---- a/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
-+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
-@@ -258,7 +258,7 @@
-     <exportButton class="Magento\Ui\Component\ExportButton" component="Magento_Ui/js/grid/export" displayArea="dataGridActions">
-         <settings>
-             <options>
--                <option name="cvs" xsi:type="array">
-+                <option name="csv" xsi:type="array">
-                     <item name="value" xsi:type="string">csv</item>
-                     <item name="label" xsi:type="string" translate="true">CSV</item>
-                     <item name="url" xsi:type="string">mui/export/gridToCsv</item>
-diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/action.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/action.xsd
-index b10ee00818e..4dc97910935 100644
---- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/action.xsd
-+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/action.xsd
-@@ -49,6 +49,13 @@
-                                                         </xs:documentation>
-                                                     </xs:annotation>
-                                                 </xs:element>
-+                                                <xs:element name="actionDisable" type="xs:boolean">
-+                                                    <xs:annotation>
-+                                                        <xs:documentation>
-+                                                            Disable and remove this action.
-+                                                        </xs:documentation>
-+                                                    </xs:annotation>
-+                                                </xs:element>
-                                             </xs:choice>
-                                             <xs:attribute name="name" use="required"/>
-                                         </xs:complexType>
-@@ -82,6 +89,13 @@
-                     </xs:documentation>
-                 </xs:annotation>
-             </xs:element>
-+            <xs:element name="actionDisable" type="xs:boolean">
-+                <xs:annotation>
-+                    <xs:documentation>
-+                        Disable and remove this action.
-+                    </xs:documentation>
-+                </xs:annotation>
-+            </xs:element>
-             <xs:element name="confirm" type="confirmType">
-                 <xs:annotation>
-                     <xs:documentation>
-diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd
-index cbf69e60469..ff4d530b5bf 100644
---- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd
-+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd
-@@ -476,6 +476,13 @@
-                                     </xs:documentation>
-                                 </xs:annotation>
-                             </xs:element>
-+                            <xs:element name="aclResource" type="xs:string" minOccurs="0" maxOccurs="1">
-+                                <xs:annotation>
-+                                    <xs:documentation>
-+                                        ACL Resource used to validate access to UI Component data
-+                                    </xs:documentation>
-+                                </xs:annotation>
-+                            </xs:element>
-                             <xs:element ref="param"/>
-                         </xs:choice>
-                         <xs:attribute name="name" type="xs:string" use="required">
-diff --git a/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js b/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js
-index fe312738469..ac1de4631e9 100644
---- a/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js
-+++ b/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js
-@@ -224,7 +224,7 @@ define([
-          */
-         build: function (parent, node, name) {
-             var defaults    = parent && parent.childDefaults || {},
--                children    = node.children,
-+                children    = this.filterDisabledChildren(node.children),
-                 type        = getNodeType(parent, node),
-                 dataScope   = getDataScope(parent, node),
-                 component,
-@@ -294,6 +294,35 @@ define([
-             return node;
-         },
- 
-+        /**
-+         * Filter out all disabled components.
-+         *
-+         * @param {Object} children
-+         * @returns {*}
-+         */
-+        filterDisabledChildren: function (children) {
-+            var cIds;
-+
-+            //cleanup children config.componentDisabled = true
-+            if (children && typeof children === 'object') {
-+                cIds = Object.keys(children);
-+
-+                if (cIds) {
-+                    _.each(cIds, function (cId) {
-+                        if (typeof children[cId] === 'object' &&
-+                            children[cId].hasOwnProperty('config') &&
-+                            typeof children[cId].config === 'object' &&
-+                            children[cId].config.hasOwnProperty('componentDisabled') &&
-+                            children[cId].config.componentDisabled === true) {
-+                            delete children[cId];
-+                        }
-+                    });
-+                }
-+            }
-+
-+            return children;
-+        },
-+
-         /**
-          * Init component.
-          *
-diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
-index dee9ba7acc1..583e97b7e94 100644
---- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
-+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
-@@ -15,8 +15,7 @@ define([
- ], function (ko, $, _, Element) {
-     'use strict';
- 
--    var transformProp,
--        isTouchDevice = typeof document.ontouchstart !== 'undefined';
-+    var transformProp;
- 
-     /**
-      * Get element context
-@@ -110,11 +109,7 @@ define([
-          * @param {Object} data - element data
-          */
-         initListeners: function (elem, data) {
--            if (isTouchDevice) {
--                $(elem).on('touchstart', this.mousedownHandler.bind(this, data, elem));
--            } else {
--                $(elem).on('mousedown', this.mousedownHandler.bind(this, data, elem));
--            }
-+            $(elem).on('mousedown touchstart', this.mousedownHandler.bind(this, data, elem));
-         },
- 
-         /**
-@@ -131,26 +126,20 @@ define([
-                 $table = $(elem).parents('table').eq(0),
-                 $tableWrapper = $table.parent();
- 
-+            this.disableScroll();
-             $(recordNode).addClass(this.draggableElementClass);
-             $(originRecord).addClass(this.draggableElementClass);
-             this.step = this.step === 'auto' ? originRecord.height() / 2 : this.step;
-             drEl.originRow = originRecord;
-             drEl.instance = recordNode = this.processingStyles(recordNode, elem);
-             drEl.instanceCtx = this.getRecord(originRecord[0]);
--            drEl.eventMousedownY = isTouchDevice ? event.originalEvent.touches[0].pageY : event.pageY;
-+            drEl.eventMousedownY = this.getPageY(event);
-             drEl.minYpos =
-                 $table.offset().top - originRecord.offset().top + $table.children('thead').outerHeight();
-             drEl.maxYpos = drEl.minYpos + $table.children('tbody').outerHeight() - originRecord.outerHeight();
-             $tableWrapper.append(recordNode);
--
--            if (isTouchDevice) {
--                this.body.bind('touchmove', this.mousemoveHandler);
--                this.body.bind('touchend', this.mouseupHandler);
--            } else {
--                this.body.bind('mousemove', this.mousemoveHandler);
--                this.body.bind('mouseup', this.mouseupHandler);
--            }
--
-+            this.body.bind('mousemove touchmove', this.mousemoveHandler);
-+            this.body.bind('mouseup touchend', this.mouseupHandler);
-         },
- 
-         /**
-@@ -160,16 +149,13 @@ define([
-          */
-         mousemoveHandler: function (event) {
-             var depEl = this.draggableElement,
--                pageY = isTouchDevice ? event.originalEvent.touches[0].pageY : event.pageY,
-+                pageY = this.getPageY(event),
-                 positionY = pageY - depEl.eventMousedownY,
-                 processingPositionY = positionY + 'px',
-                 processingMaxYpos = depEl.maxYpos + 'px',
-                 processingMinYpos = depEl.minYpos + 'px',
-                 depElement = this.getDepElement(depEl.instance, positionY, depEl.originRow);
- 
--            event.stopPropagation();
--            event.preventDefault();
--
-             if (depElement) {
-                 depEl.depElement ? depEl.depElement.elem.removeClass(depEl.depElement.className) : false;
-                 depEl.depElement = depElement;
-@@ -194,9 +180,10 @@ define([
-         mouseupHandler: function (event) {
-             var depElementCtx,
-                 drEl = this.draggableElement,
--                pageY = isTouchDevice ? event.originalEvent.touches[0].pageY : event.pageY,
-+                pageY = this.getPageY(event),
-                 positionY = pageY - drEl.eventMousedownY;
- 
-+            this.enableScroll();
-             drEl.depElement = this.getDepElement(drEl.instance, positionY, this.draggableElement.originRow);
- 
-             drEl.instance.remove();
-@@ -212,13 +199,8 @@ define([
- 
-             drEl.originRow.removeClass(this.draggableElementClass);
- 
--            if (isTouchDevice) {
--                this.body.unbind('touchmove', this.mousemoveHandler);
--                this.body.unbind('touchend', this.mouseupHandler);
--            } else {
--                this.body.unbind('mousemove', this.mousemoveHandler);
--                this.body.unbind('mouseup', this.mouseupHandler);
--            }
-+            this.body.unbind('mousemove touchmove', this.mousemoveHandler);
-+            this.body.unbind('mouseup touchend', this.mouseupHandler);
- 
-             this.draggableElement = {};
-         },
-@@ -402,6 +384,55 @@ define([
-                 index = _.isFunction(ctx.$index) ? ctx.$index() : ctx.$index;
- 
-             return this.recordsCache()[index];
-+        },
-+
-+        /**
-+         * Get correct page Y
-+         *
-+         * @param {Object} event - current event
-+         * @returns {integer}
-+         */
-+        getPageY: function (event) {
-+            var pageY;
-+
-+            if (event.type.indexOf('touch') >= 0) {
-+                if (event.originalEvent.touches[0]) {
-+                    pageY = event.originalEvent.touches[0].pageY;
-+                } else {
-+                    pageY = event.originalEvent.changedTouches[0].pageY;
-+                }
-+            } else {
-+                pageY = event.pageY;
-+            }
-+
-+            return pageY;
-+        },
-+
-+        /**
-+         * Disable page scrolling
-+         */
-+        disableScroll: function () {
-+            document.body.addEventListener('touchmove', this.preventDefault, {
-+                passive: false
-+            });
-+        },
-+
-+        /**
-+         * Enable page scrolling
-+         */
-+        enableScroll: function () {
-+            document.body.removeEventListener('touchmove', this.preventDefault, {
-+                passive: false
-+            });
-+        },
-+
-+        /**
-+         * Prevent default function
-+         *
-+         * @param {Object} event - event object
-+         */
-+        preventDefault: function (event) {
-+            event.preventDefault();
-         }
- 
-     });
-diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js
-index dc6f8d930a1..17b2d1db4eb 100644
---- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js
-+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js
-@@ -33,6 +33,15 @@ define([
-             }
-         },
- 
-+        /**
-+         * @inheritdoc
-+         */
-+        initialize: function () {
-+            this.setToInsertData = _.debounce(this.setToInsertData, 200);
-+
-+            return this._super();
-+        },
-+
-         /**
-          * Calls 'initObservable' of parent
-          *
-diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
-index 1d52fc78d7a..cbbfbdb127a 100644
---- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
-+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
-@@ -543,6 +543,7 @@ define([
-                     data = this.createHeaderTemplate(cell.config);
-                     cell.config.labelVisible = false;
-                     _.extend(data, {
-+                        defaultLabelVisible: data.visible(),
-                         label: cell.config.label,
-                         name: cell.name,
-                         required: !!cell.config.validation,
-diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
-index 54309ca0685..9a9d4789047 100644
---- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
-+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
-@@ -25,7 +25,7 @@ define([
-             },
-             listens: {
-                 position: 'initPosition',
--                elems: 'setColumnVisibileListener'
-+                elems: 'setColumnVisibleListener'
-             },
-             links: {
-                 position: '${ $.name }.${ $.positionProvider }:value'
-@@ -123,7 +123,7 @@ define([
-         /**
-          * Set column visibility listener
-          */
--        setColumnVisibileListener: function () {
-+        setColumnVisibleListener: function () {
-             var elem = _.find(this.elems(), function (curElem) {
-                 return !curElem.hasOwnProperty('visibleListener');
-             });
-@@ -245,7 +245,7 @@ define([
-                 label = _.findWhere(this.parentComponent().labels(), {
-                     name: index
-                 });
--                label.visible() !== state ? label.visible(state) : false;
-+                label.defaultLabelVisible && label.visible(state);
-             } else {
-                 elems[curElem].visible(state);
-             }
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/area.js b/app/code/Magento/Ui/view/base/web/js/form/components/area.js
-index 5967b8c57b5..741e6d30650 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/components/area.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/components/area.js
-@@ -44,7 +44,7 @@ define([
- 
-         /**
-          * Calls parent's initElement method.
--         * Assignes callbacks on various events of incoming element.
-+         * Assigns callbacks on various events of incoming element.
-          * @param  {Object} elem
-          * @return {Object} - reference to instance
-          */
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/button.js b/app/code/Magento/Ui/view/base/web/js/form/components/button.js
-index df85af5824d..bfc2eb2b885 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/components/button.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/components/button.js
-@@ -45,7 +45,8 @@ define([
-                 .observe([
-                     'visible',
-                     'disabled',
--                    'title'
-+                    'title',
-+                    'childError'
-                 ]);
-         },
- 
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/collection.js b/app/code/Magento/Ui/view/base/web/js/form/components/collection.js
-index 2c12486ceb5..c31963e9862 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/components/collection.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/components/collection.js
-@@ -91,7 +91,7 @@ define([
-         },
- 
-         /**
--         * Returnes true if current set of items differ from initial one,
-+         * Returns true if current set of items differ from initial one,
-          * or if some child has been changed.
-          *
-          * @returns {Boolean}
-@@ -153,6 +153,7 @@ define([
-          * Creates function that removes element
-          * from collection using '_removeChild' method.
-          * @param  {Object} elem - Element that should be removed.
-+         * @deprecated Not used anymore
-          */
-         removeAddress: function (elem) {
-             var self = this;
-@@ -169,7 +170,7 @@ define([
-         },
- 
-         /**
--         * Removes elememt from both collection and data storage,
-+         * Removes element from both collection and data storage,
-          * activates first element if removed one was active,
-          * triggers 'update' event.
-          *
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js b/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js
-index c2a65371471..045c25ab791 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js
-@@ -19,7 +19,7 @@ define([
-     };
- 
-     /**
--     * Parses incoming data and returnes result merged with default preview config
-+     * Parses incoming data and returns result merged with default preview config
-      *
-      * @param  {Object|String} data
-      * @return {Object}
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
-index 6d33386fa1f..9ee387e0e6a 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
-@@ -68,7 +68,7 @@ define([
- 
-         /**
-          * Calls parent's initElement method.
--         * Assignes callbacks on various events of incoming element.
-+         * Assigns callbacks on various events of incoming element.
-          *
-          * @param  {Object} elem
-          * @return {Object} - reference to instance
-@@ -162,6 +162,10 @@ define([
-             }
- 
-             this.error(hasErrors || message);
-+
-+            if (hasErrors || message) {
-+                this.open();
-+            }
-         },
- 
-         /**
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/insert.js b/app/code/Magento/Ui/view/base/web/js/form/components/insert.js
-index 26ad9fbfec0..d8cbcc9cc17 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/components/insert.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/components/insert.js
-@@ -237,10 +237,21 @@ define([
-          * @param {*} data
-          */
-         onRender: function (data) {
-+            var resp;
-+
-             this.loading(false);
--            this.set('content', data);
--            this.isRendered = true;
--            this.startRender = false;
-+
-+            try {
-+                resp = JSON.parse(data);
-+
-+                if (resp.ajaxExpired) {
-+                    window.location.href = resp.ajaxRedirect;
-+                }
-+            } catch (e) {
-+                this.set('content', data);
-+                this.isRendered = true;
-+                this.startRender = false;
-+            }
-         },
- 
-         /**
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
-index 5d79ac77218..c7fab7da456 100755
---- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
-@@ -57,6 +57,9 @@ define([
-                 '${ $.provider }:${ $.customScope ? $.customScope + "." : ""}data.validate': 'validate',
-                 'isUseDefault': 'toggleUseDefault'
-             },
-+            ignoreTmpls: {
-+                value: true
-+            },
- 
-             links: {
-                 value: '${ $.provider }:${ $.dataScope }'
-@@ -293,7 +296,7 @@ define([
-                 this.validation[rule] = options;
-             }
- 
--            changed = utils.compare(rules, this.validation).equal;
-+            changed = !utils.compare(rules, this.validation).equal;
- 
-             if (changed) {
-                 this.required(!!rules['required-entry']);
-@@ -405,6 +408,7 @@ define([
-                 isValid = this.disabled() || !this.visible() || result.passed;
- 
-             this.error(message);
-+            this.error.valueHasMutated();
-             this.bubble('error', message);
- 
-             //TODO: Implement proper result propagation for form
-@@ -450,6 +454,10 @@ define([
-          */
-         toggleUseDefault: function (state) {
-             this.disabled(state);
-+
-+            if (this.source && this.hasService()) {
-+                this.source.set('data.use_default.' + this.index, Number(state));
-+            }
-         },
- 
-         /**
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/checkbox-set.js b/app/code/Magento/Ui/view/base/web/js/form/element/checkbox-set.js
-index d0c8c13edff..254585a6249 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/element/checkbox-set.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/element/checkbox-set.js
-@@ -124,7 +124,7 @@ define([
-         },
- 
-         /**
--         * Returns option object assoctiated with provided value.
-+         * Returns option object associated with provided value.
-          *
-          * @param {String} value
-          * @returns {Object}
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/country.js b/app/code/Magento/Ui/view/base/web/js/form/element/country.js
-index f64a80bf535..c75301018e1 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/element/country.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/element/country.js
-@@ -49,7 +49,7 @@ define([
- 
-             if (!this.value()) {
-                 defaultCountry = _.filter(result, function (item) {
--                    return item['is_default'] && item['is_default'].includes(value);
-+                    return item['is_default'] && _.contains(item['is_default'], value);
-                 });
- 
-                 if (defaultCountry.length) {
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
-index a5eb7d5d1f5..ac28271e90a 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/element/date.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
-@@ -114,18 +114,18 @@ define([
-          * @param {String} value
-          */
-         onValueChange: function (value) {
--            var dateFormat,
--                shiftedValue;
-+            var shiftedValue;
- 
-             if (value) {
-                 if (this.options.showsTime) {
-                     shiftedValue = moment.tz(value, 'UTC').tz(this.storeTimeZone);
-                 } else {
--                    dateFormat = this.shiftedValue() ? this.outputDateFormat : this.inputDateFormat;
--
--                    shiftedValue = moment(value, dateFormat);
-+                    shiftedValue = moment(value, this.outputDateFormat);
-                 }
- 
-+                if (!shiftedValue.isValid()) {
-+                    shiftedValue = moment(value, this.inputDateFormat);
-+                }
-                 shiftedValue = shiftedValue.format(this.pickerDateTimeFormat);
-             } else {
-                 shiftedValue = '';
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
-index 6492d0821fc..f28569caa00 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
-@@ -16,7 +16,8 @@ define([
-     'Magento_Ui/js/form/element/abstract',
-     'mage/backend/notification',
-     'mage/translate',
--    'jquery/file-uploader'
-+    'jquery/file-uploader',
-+    'mage/adminhtml/tools'
- ], function ($, _, utils, uiAlert, validator, Element, notification, $t) {
-     'use strict';
- 
-@@ -324,7 +325,7 @@ define([
- 
-         /**
-          * Handler which is invoked when files are choosed for upload.
--         * May be used for implementation of aditional validation rules,
-+         * May be used for implementation of additional validation rules,
-          * e.g. total files and a total size rules.
-          *
-          * @param {Event} e - Event object.
-@@ -348,6 +349,12 @@ define([
-                 allowed  = this.isFileAllowed(file),
-                 target   = $(e.target);
- 
-+            if (this.disabled()) {
-+                this.notifyError($t('The file upload field is disabled.'));
-+
-+                return;
-+            }
-+
-             if (allowed.passed) {
-                 target.on('fileuploadsend', function (event, postData) {
-                     postData.data.append('param_name', this.paramName);
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
-index 0ae09f14fa9..b490ac557e7 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
-@@ -11,8 +11,7 @@ define([
-     'Magento_Ui/js/modal/alert',
-     'Magento_Ui/js/lib/validation/validator',
-     'Magento_Ui/js/form/element/file-uploader',
--    'mage/adminhtml/browser',
--    'mage/adminhtml/tools'
-+    'mage/adminhtml/browser'
- ], function ($, _, utils, uiAlert, validator, Element, browser) {
-     'use strict';
- 
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
-index 911574a0fb4..0eaacdc3256 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
-@@ -20,13 +20,33 @@ define([
-             }
-         },
- 
-+        /**
-+         * Initializes observable properties of instance
-+         *
-+         * @returns {Abstract} Chainable.
-+         */
-+        initObservable: function () {
-+            this._super();
-+
-+            /**
-+             * equalityComparer function
-+             *
-+             * @returns boolean.
-+             */
-+            this.value.equalityComparer = function (oldValue, newValue) {
-+                return !oldValue && !newValue || oldValue === newValue;
-+            };
-+
-+            return this;
-+        },
-+
-         /**
-          * @param {String} value
-          */
-         update: function (value) {
-             var country = registry.get(this.parentName + '.' + 'country_id'),
-                 options = country.indexedOptions,
--                option;
-+                option = null;
- 
-             if (!value) {
-                 return;
-@@ -34,6 +54,10 @@ define([
- 
-             option = options[value];
- 
-+            if (!option) {
-+                return;
-+            }
-+
-             if (option['is_zipcode_optional']) {
-                 this.error(false);
-                 this.validation = _.omit(this.validation, 'required-entry');
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/region.js b/app/code/Magento/Ui/view/base/web/js/form/element/region.js
-index 45d38b339b5..f6eafcf4928 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/element/region.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/element/region.js
-@@ -78,13 +78,12 @@ define([
-          * @param {String} field
-          */
-         filter: function (value, field) {
--            var country = registry.get(this.parentName + '.' + 'country_id'),
--                option;
-+            var superFn = this._super;
- 
--            if (country) {
--                option = country.indexedOptions[value];
-+            registry.get(this.parentName + '.' + 'country_id', function (country) {
-+                var option = country.indexedOptions[value];
- 
--                this._super(value, field);
-+                superFn.call(this, value, field);
- 
-                 if (option && option['is_region_visible'] === false) {
-                     // hide select and corresponding text input field if region must not be shown for selected country
-@@ -94,7 +93,7 @@ define([
-                         this.toggleInput(false);
-                     }
-                 }
--            }
-+            }.bind(this));
-         }
-     });
- });
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/single-checkbox-use-config.js b/app/code/Magento/Ui/view/base/web/js/form/element/single-checkbox-use-config.js
-index b20b2c31ee1..3ee7ddd1e73 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/element/single-checkbox-use-config.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/element/single-checkbox-use-config.js
-@@ -36,6 +36,10 @@ define([
-          */
-         toggleElement: function () {
-             this.disabled(this.isUseDefault() || this.isUseConfig());
-+
-+            if (this.source) {
-+                this.source.set('data.use_default.' + this.index, Number(this.isUseDefault()));
-+            }
-         }
-     });
- });
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
-index dba0992c5ba..4479cff5135 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
-@@ -131,6 +131,7 @@ define([
-     return Abstract.extend({
-         defaults: {
-             options: [],
-+            total: 0,
-             listVisible: false,
-             value: [],
-             filterOptions: false,
-@@ -153,6 +154,7 @@ define([
-             labelsDecoration: false,
-             disableLabel: false,
-             filterRateLimit: 500,
-+            filterRateLimitMethod: 'notifyAtFixedRate',
-             closeBtnLabel: $t('Done'),
-             optgroupTmpl: 'ui/grid/filters/elements/ui-select-optgroup',
-             quantityPlaceholder: $t('options'),
-@@ -180,6 +182,7 @@ define([
-             debounce: 300,
-             missingValuePlaceholder: $t('Entity with ID: %s doesn\'t exist'),
-             isDisplayMissingValuePlaceholder: false,
-+            currentSearchKey: '',
-             listens: {
-                 listVisible: 'cleanHoveredElement',
-                 filterInputValue: 'filterOptionsList',
-@@ -330,7 +333,10 @@ define([
-             ]);
- 
-             this.filterInputValue.extend({
--                rateLimit: this.filterRateLimit
-+                rateLimit: {
-+                    timeout: this.filterRateLimit,
-+                    method: this.filterRateLimitMethod
-+                }
-             });
- 
-             return this;
-@@ -460,7 +466,7 @@ define([
-             }
- 
-             if (this.searchOptions) {
--                return _.debounce(this.loadOptions.bind(this, value), this.debounce)();
-+                return this.loadOptions(value);
-             }
- 
-             this.cleanHoveredElement();
-@@ -547,11 +553,21 @@ define([
-         _setItemsQuantity: function (data) {
-             if (this.showFilteredQuantity) {
-                 data || parseInt(data, 10) === 0 ?
--                    this.itemsQuantity(data + ' ' + this.quantityPlaceholder) :
-+                    this.itemsQuantity(this.getItemsPlaceholder(data)) :
-                     this.itemsQuantity('');
-             }
-         },
- 
-+        /**
-+         * Return formatted items placeholder.
-+         *
-+         * @param {Object} data - option data
-+         * @returns {String}
-+         */
-+        getItemsPlaceholder: function (data) {
-+            return data + ' ' + this.quantityPlaceholder;
-+        },
-+
-         /**
-          * Remove element from selected array
-          */
-@@ -1234,13 +1250,11 @@ define([
-          * @param {Number} page
-          */
-         processRequest: function (searchKey, page) {
--            var total = 0,
--                existingOptions = this.options();
--
-             this.loading(true);
-+            this.currentSearchKey = searchKey;
-             $.ajax({
-                 url: this.searchUrl,
--                type: 'post',
-+                type: 'get',
-                 dataType: 'json',
-                 context: this,
-                 data: {
-@@ -1248,27 +1262,39 @@ define([
-                     page: page,
-                     limit: this.pageLimit
-                 },
-+                success: $.proxy(this.success, this),
-+                error: $.proxy(this.error, this),
-+                beforeSend: $.proxy(this.beforeSend, this),
-+                complete: $.proxy(this.complete, this, searchKey, page)
-+            });
-+        },
- 
--                /** @param {Object} response */
--                success: function (response) {
--                    _.each(response.options, function (opt) {
--                        existingOptions.push(opt);
--                    });
--                    total = response.total;
--                    this.options(existingOptions);
--                },
--
--                /** set empty array if error occurs */
--                error: function () {
--                    this.options([]);
--                },
-+        /** @param {Object} response */
-+        success: function (response) {
-+            var existingOptions = this.options();
- 
--                /** cache options and stop loading*/
--                complete: function () {
--                    this.setCachedSearchResults(searchKey, this.options(), page, total);
--                    this.afterLoadOptions(searchKey, page, total);
--                }
-+            _.each(response.options, function (opt) {
-+                existingOptions.push(opt);
-             });
-+
-+            this.total = response.total;
-+            this.options(existingOptions);
-+        },
-+
-+        /** add actions before ajax request */
-+        beforeSend: function () {
-+
-+        },
-+
-+        /** set empty array if error occurs */
-+        error: function () {
-+            this.options([]);
-+        },
-+
-+        /** cache options and stop loading*/
-+        complete: function (searchKey, page) {
-+            this.setCachedSearchResults(searchKey, this.options(), page, this.total);
-+            this.afterLoadOptions(searchKey, page, this.total);
-         },
- 
-         /**
-@@ -1279,9 +1305,9 @@ define([
-          * @param {Number} total
-          */
-         afterLoadOptions: function (searchKey, page, total) {
--            this._setItemsQuantity(total);
--            this.lastSearchPage = page;
-             this.lastSearchKey = searchKey;
-+            this.lastSearchPage = page;
-+            this._setItemsQuantity(total);
-             this.loading(false);
-         }
-     });
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
-index de899fd8f2e..ce19899cd12 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
-@@ -18,9 +18,10 @@ define([
-     'use strict';
- 
-     return Abstract.extend({
-+        currentWysiwyg: undefined,
-         defaults: {
-             elementSelector: 'textarea',
--            value: '',
-+            suffixRegExpPattern: '${ $.wysiwygUniqueSuffix }',
-             $wysiwygEditorButton: '',
-             links: {
-                 value: '${ $.provider }:${ $.dataScope }'
-@@ -53,6 +54,10 @@ define([
- 
-             // disable editor completely after initialization is field is disabled
-             varienGlobalEvents.attachEventHandler('wysiwygEditorInitialized', function () {
-+                if (!_.isUndefined(window.tinyMceEditors)) {
-+                    this.currentWysiwyg = window.tinyMceEditors[this.wysiwygId];
-+                }
-+
-                 if (this.disabled()) {
-                     this.setDisabled(true);
-                 }
-@@ -61,6 +66,34 @@ define([
-             return this;
-         },
- 
-+        /** @inheritdoc */
-+        initConfig: function (config) {
-+            var pattern = config.suffixRegExpPattern || this.constructor.defaults.suffixRegExpPattern;
-+
-+            pattern = pattern.replace(/\$/g, '\\$&');
-+            config.content = config.content.replace(new RegExp(pattern, 'g'), this.getUniqueSuffix(config));
-+            this._super();
-+
-+            return this;
-+        },
-+
-+        /**
-+         * Build unique id based on name, underscore separated.
-+         *
-+         * @param {Object} config
-+         */
-+        getUniqueSuffix: function (config) {
-+            return config.name.replace(/(\.|-)/g, '_');
-+        },
-+
-+        /**
-+         * @inheritdoc
-+         */
-+        destroy: function () {
-+            this._super();
-+            wysiwyg.removeEvents(this.wysiwygId);
-+        },
-+
-         /**
-          *
-          * @returns {exports}
-@@ -108,14 +141,9 @@ define([
-             }
- 
-             /* eslint-disable no-undef */
--            if (typeof wysiwyg !== 'undefined' && wysiwyg.activeEditor()) {
--                if (wysiwyg && disabled) {
--                    wysiwyg.setEnabledStatus(false);
--                    wysiwyg.getPluginButtons().prop('disabled', 'disabled');
--                } else if (wysiwyg) {
--                    wysiwyg.setEnabledStatus(true);
--                    wysiwyg.getPluginButtons().removeProp('disabled');
--                }
-+            if (!_.isUndefined(this.currentWysiwyg) && this.currentWysiwyg.activeEditor()) {
-+                this.currentWysiwyg.setEnabledStatus(!disabled);
-+                this.currentWysiwyg.getPluginButtons().prop('disabled', disabled);
-             }
-         }
-     });
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/form.js b/app/code/Magento/Ui/view/base/web/js/form/form.js
-index ea6c57f63bd..3692108675b 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/form.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/form.js
-@@ -339,6 +339,7 @@ define([
-          */
-         reset: function () {
-             this.source.trigger('data.reset');
-+            $('[data-bind*=datepicker]').val('');
-         },
- 
-         /**
-diff --git a/app/code/Magento/Ui/view/base/web/js/form/provider.js b/app/code/Magento/Ui/view/base/web/js/form/provider.js
-index d070e23c708..49765f589bd 100644
---- a/app/code/Magento/Ui/view/base/web/js/form/provider.js
-+++ b/app/code/Magento/Ui/view/base/web/js/form/provider.js
-@@ -82,7 +82,7 @@ define([
-         },
- 
-         /**
--         *  Set data to provder based on current data.
-+         *  Set data to provider based on current data.
-          *
-          * @param {Object} oldData
-          * @param {Object} newData
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js
-index be7a1a13fbd..c75f7797cf0 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js
-@@ -11,8 +11,9 @@ define([
-     'mageUtils',
-     'uiRegistry',
-     './column',
--    'Magento_Ui/js/modal/confirm'
--], function (_, utils, registry, Column, confirm) {
-+    'Magento_Ui/js/modal/confirm',
-+    'mage/dataPost'
-+], function (_, utils, registry, Column, confirm, dataPost) {
-     'use strict';
- 
-     return Column.extend({
-@@ -267,7 +268,14 @@ define([
-          * @param {Object} action - Action's data.
-          */
-         defaultCallback: function (actionIndex, recordId, action) {
--            window.location.href = action.href;
-+            if (action.post) {
-+                dataPost().postData({
-+                    action: action.href,
-+                    data: {}
-+                });
-+            } else {
-+                window.location.href = action.href;
-+            }
-         },
- 
-         /**
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/date.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/date.js
-index 81c0cc1ccdb..3f9c5b20d62 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/columns/date.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/date.js
-@@ -15,7 +15,8 @@ define([
- 
-     return Column.extend({
-         defaults: {
--            dateFormat: 'MMM d, YYYY h:mm:ss A'
-+            dateFormat: 'MMM d, YYYY h:mm:ss A',
-+            calendarConfig: []
-         },
- 
-         /**
-@@ -26,7 +27,7 @@ define([
-         initConfig: function () {
-             this._super();
- 
--            this.dateFormat = utils.normalizeDate(this.dateFormat);
-+            this.dateFormat = utils.normalizeDate(this.dateFormat ? this.dateFormat : this.options.dateFormat);
- 
-             return this;
-         },
-@@ -37,7 +38,12 @@ define([
-          * @returns {String} Formatted date.
-          */
-         getLabel: function (value, format) {
--            var date = moment(this._super());
-+            var date;
-+
-+            if (this.storeLocale !== undefined) {
-+                moment.locale(this.storeLocale, utils.extend({}, this.calendarConfig));
-+            }
-+            date = moment(this._super());
- 
-             date = date.isValid() && value[this.index] ?
-                 date.format(format || this.dateFormat) :
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/expandable.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/expandable.js
-index 8bbe5971490..b694f240312 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/columns/expandable.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/expandable.js
-@@ -67,7 +67,11 @@ define([
-                 }
-             });
- 
--            return labels.sort();
-+            return labels.sort(
-+                function (labelFirst, labelSecond) {
-+                    return labelFirst.toLowerCase().localeCompare(labelSecond.toLowerCase());
-+                }
-+            );
-         },
- 
-         /**
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/controls/bookmarks/bookmarks.js b/app/code/Magento/Ui/view/base/web/js/grid/controls/bookmarks/bookmarks.js
-index 076465351cd..cfcd37a65b8 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/controls/bookmarks/bookmarks.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/controls/bookmarks/bookmarks.js
-@@ -382,7 +382,7 @@ define([
-          * Checks if specified view is in editing state.
-          *
-          * @param {String} index - Index of a view to be checked.
--         * @returns {Bollean}
-+         * @returns {Boolean}
-          */
-         isEditing: function (index) {
-             return this.editing === index;
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/data-storage.js b/app/code/Magento/Ui/view/base/web/js/grid/data-storage.js
-index dad67da3ea8..547cdab16cd 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/data-storage.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/data-storage.js
-@@ -199,7 +199,7 @@ define([
-         },
- 
-         /**
--         * Caches requests object with provdided parameters
-+         * Caches requests object with provided parameters
-          * and data object associated with it.
-          *
-          * @param {Object} data - Data associated with request.
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/dnd.js b/app/code/Magento/Ui/view/base/web/js/grid/dnd.js
-index 5a71fca673e..660e3cb3bd2 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/dnd.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/dnd.js
-@@ -406,7 +406,7 @@ define([
-          *
-          * @param {Number} x - X coordinate of a grabbed point.
-          * @param {Number} y - Y coordinate of a grabbed point.
--         * @param {HTMLElement} elem - Grabbed elemenet.
-+         * @param {HTMLElement} elem - Grabbed element.
-          */
-         grab: function (x, y, elem) {
-             this.initDrag = true;
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js
-index f68a6f97d96..ca82ff81d3b 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js
-@@ -54,7 +54,7 @@ define([
- 
-         /**
-          * Proxy save method which might invoke
--         * data valiation prior to its' saving.
-+         * data validation prior to its' saving.
-          *
-          * @param {Object} data - Data to be processed.
-          * @returns {jQueryPromise}
-@@ -128,7 +128,7 @@ define([
-         /**
-          * Handles ajax success callback.
-          *
--         * @param {jQueryPromise} promise - Promise to be resoloved.
-+         * @param {jQueryPromise} promise - Promise to be resolved.
-          * @param {*} data - See 'jquery' ajax success callback.
-          */
-         onSuccess: function (promise, data) {
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
-index 589aed4c983..ece49cc8fe2 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
-@@ -164,7 +164,7 @@ define([
-         },
- 
-         /**
--         * Adds listeners on a new recrod.
-+         * Adds listeners on a new record.
-          *
-          * @param {Record} record
-          * @returns {Editor} Chainable.
-@@ -208,7 +208,7 @@ define([
-         },
- 
-         /**
--         * Starts editing of a specfied record. If records'
-+         * Starts editing of a specified record. If records'
-          * instance doesn't exist, than it will be created.
-          *
-          * @param {(Number|String)} id - See 'getId' method.
-@@ -357,7 +357,7 @@ define([
- 
-         /**
-          * Resets specific records' data
--         * to the data present in asscotiated row.
-+         * to the data present in associated row.
-          *
-          * @param {(Number|String)} id - See 'getId' method.
-          * @param {Boolean} [isIndex=false] - See 'getId' method.
-@@ -401,9 +401,9 @@ define([
-         },
- 
-         /**
--         * Disables editing of specfied fields.
-+         * Disables editing of specified fields.
-          *
--         * @param {Array} fields - An array of fields indeces to be disabled.
-+         * @param {Array} fields - An array of fields indexes to be disabled.
-          * @returns {Editor} Chainable.
-          */
-         disableFields: function (fields) {
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
-index 18b38361131..9b8998368c5 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
-@@ -50,6 +50,9 @@ define([
-                     }
-                 }
-             },
-+            ignoreTmpls: {
-+                data: true
-+            },
-             listens: {
-                 elems: 'updateFields',
-                 data: 'updateState'
-@@ -138,7 +141,7 @@ define([
-         },
- 
-         /**
--         * Creates fields for the specfied columns.
-+         * Creates fields for the specified columns.
-          *
-          * @param {Array} columns - An array of column instances.
-          * @returns {Record} Chainable.
-@@ -261,7 +264,7 @@ define([
-         /**
-          * Validates all of the available fields.
-          *
--         * @returns {Array} An array with validatation results.
-+         * @returns {Array} An array with validation results.
-          */
-         validate: function () {
-             return this.elems.map('validate');
-@@ -277,7 +280,7 @@ define([
-         },
- 
-         /**
--         * Counts total errors ammount accros all fields.
-+         * Counts total errors amount across all fields.
-          *
-          * @returns {Number}
-          */
-@@ -303,7 +306,7 @@ define([
-         },
- 
-         /**
--         * Updates 'fields' array filling it with available edtiors
-+         * Updates 'fields' array filling it with available editors
-          * or with column instances if associated field is not present.
-          *
-          * @returns {Record} Chainable.
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/massactions.js b/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
-index 48c04458ff4..a1884c20da2 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
-@@ -95,7 +95,7 @@ define([
-         },
- 
-         /**
--         * Adds new action. If action with a specfied identifier
-+         * Adds new action. If action with a specified identifier
-          * already exists, than the original one will be overrided.
-          *
-          * @param {Object} action - Action object.
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
-index abd79e797e4..534d292809e 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
-@@ -19,7 +19,8 @@ define([
-         defaults: {
-             template: 'ui/grid/paging/paging',
-             totalTmpl: 'ui/grid/paging-total',
--            pageSize: 20,
-+            totalRecords: 0,
-+            pages: 1,
-             current: 1,
-             selectProvider: 'ns = ${ $.ns }, index = ids',
- 
-@@ -33,9 +34,9 @@ define([
-             },
- 
-             imports: {
--                pageSize: '${ $.sizesConfig.name }:value',
-                 totalSelected: '${ $.selectProvider }:totalSelected',
--                totalRecords: '${ $.provider }:data.totalRecords'
-+                totalRecords: '${ $.provider }:data.totalRecords',
-+                filters: '${ $.provider }:params.filters'
-             },
- 
-             exports: {
-@@ -43,6 +44,16 @@ define([
-                 current: '${ $.provider }:params.paging.current'
-             },
- 
-+            links: {
-+                options: '${ $.sizesConfig.name }:options',
-+                pageSize: '${ $.sizesConfig.name }:value'
-+            },
-+
-+            statefull: {
-+                pageSize: true,
-+                current: true
-+            },
-+
-             listens: {
-                 'pages': 'onPagesChange',
-                 'pageSize': 'onPageSizeChange',
-@@ -173,7 +184,9 @@ define([
-          * @returns {Paging} Chainable.
-          */
-         goFirst: function () {
--            this.current = 1;
-+            if (!_.isUndefined(this.filters)) {
-+                this.current = 1;
-+            }
- 
-             return this;
-         },
-@@ -219,14 +232,12 @@ define([
-         /**
-          * Calculates new page cursor based on the
-          * previous and current page size values.
--         *
--         * @returns {Number} Updated cursor value.
-          */
-         updateCursor: function () {
--            var cursor  = this.current - 1,
--                size    = this.pageSize,
--                oldSize = this.previousSize,
--                delta   = cursor * (oldSize  - size) / size;
-+            var cursor = this.current - 1,
-+                size = this.pageSize,
-+                oldSize = _.isUndefined(this.previousSize) ? this.pageSize : this.previousSize,
-+                delta = cursor * (oldSize - size) / size;
- 
-             delta = size > oldSize ?
-                 Math.ceil(delta) :
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/paging/sizes.js b/app/code/Magento/Ui/view/base/web/js/grid/paging/sizes.js
-index 4941eabbc4e..3af5c196173 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/paging/sizes.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/paging/sizes.js
-@@ -17,31 +17,8 @@ define([
-     return Element.extend({
-         defaults: {
-             template: 'ui/grid/paging/sizes',
--            value: 20,
-             minSize: 1,
-             maxSize: 999,
--            options: {
--                '20': {
--                    value: 20,
--                    label: 20
--                },
--                '30': {
--                    value: 30,
--                    label: 30
--                },
--                '50': {
--                    value: 50,
--                    label: 50
--                },
--                '100': {
--                    value: 100,
--                    label: 100
--                },
--                '200': {
--                    value: 200,
--                    label: 200
--                }
--            },
-             statefull: {
-                 options: true,
-                 value: true
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/resize.js b/app/code/Magento/Ui/view/base/web/js/grid/resize.js
-index 50781c9afd8..792c997f060 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/resize.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/resize.js
-@@ -624,7 +624,7 @@ define([
-         },
- 
-         /**
--         * Generate index that will indentify context
-+         * Generate index that will identify context
-          *
-          * @param {Object} ctx
-          * @return {String}
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/search/search.js b/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
-index fa445a2577a..ce53b23b79e 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
-@@ -11,14 +11,15 @@ define([
-     'uiLayout',
-     'mage/translate',
-     'mageUtils',
--    'uiElement'
--], function (_, layout, $t, utils, Element) {
-+    'uiElement',
-+    'jquery'
-+], function (_, layout, $t, utils, Element, $) {
-     'use strict';
- 
-     return Element.extend({
-         defaults: {
-             template: 'ui/grid/search/search',
--            placeholder: $t('Search by keyword'),
-+            placeholder: 'Search by keyword',
-             label: $t('Keyword'),
-             value: '',
-             previews: [],
-@@ -29,11 +30,13 @@ define([
-             tracks: {
-                 value: true,
-                 previews: true,
--                inputValue: true
-+                inputValue: true,
-+                focused: true
-             },
-             imports: {
-                 inputValue: 'value',
--                updatePreview: 'value'
-+                updatePreview: 'value',
-+                focused: false
-             },
-             exports: {
-                 value: '${ $.provider }:params.search'
-@@ -88,6 +91,18 @@ define([
-             return this;
-         },
- 
-+        /**
-+         * Click To ScrollTop.
-+         */
-+        scrollTo: function ($data) {
-+            $('html, body').animate({
-+                scrollTop: 0
-+            }, 'slow', function () {
-+                $data.focused = false;
-+                $data.focused = true;
-+            });
-+        },
-+
-         /**
-          * Resets input value to the last applied state.
-          *
-@@ -102,7 +117,7 @@ define([
-         /**
-          * Applies search query.
-          *
--         * @param {String} [value=inputValue] - If not specfied, then
-+         * @param {String} [value=inputValue] - If not specified, then
-          *      value of the input field will be used.
-          * @returns {Search} Chainable.
-          */
-diff --git a/app/code/Magento/Ui/view/base/web/js/grid/toolbar.js b/app/code/Magento/Ui/view/base/web/js/grid/toolbar.js
-index 8a17e3ed46f..4f3f7128930 100644
---- a/app/code/Magento/Ui/view/base/web/js/grid/toolbar.js
-+++ b/app/code/Magento/Ui/view/base/web/js/grid/toolbar.js
-@@ -271,7 +271,10 @@ define([
-          */
-         show: function () {
-             this.visible = true;
--
-+            //Check admin grid button has addedr not
-+            if ($('.page-main-actions').length === 0) {
-+                this.$sticky.style.top = 0;
-+            }
-             this.$sticky.style.display = '';
-             this.$toolbar.style.visibility = 'hidden';
- 
-@@ -557,7 +560,7 @@ define([
-         },
- 
-         /**
--         * Handles changes of windows' top scroll postion.
-+         * Handles changes of windows' top scroll position.
-          */
-         onWindowScrollTop: function () {
-             this.updateTableOffset()
-diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js b/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
-index 607d217837f..0491390d2b6 100644
---- a/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
-+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
-@@ -15,7 +15,7 @@ define([
-     'use strict';
- 
-     /**
--     * Removes non plain object items from the specfied array.
-+     * Removes non plain object items from the specified array.
-      *
-      * @param {Array} container - Array whose value should be filtered.
-      * @returns {Array}
-@@ -310,7 +310,7 @@ define([
-          * @private
-          *
-          * @param {Array} args - An array of arguments to pass to the next delegation call.
--         * @returns {Array} An array of delegation resutls.
-+         * @returns {Array} An array of delegation results.
-          */
-         _delegate: function (args) {
-             var result;
-diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js b/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
-index 34ceced2c68..adeb510ab3e 100644
---- a/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
-+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
-@@ -51,7 +51,7 @@ define([
-             },
- 
-             /**
--             * Retrieves specfied item.
-+             * Retrieves specified item.
-              *
-              * @param {String} key - Key of the property to be retrieved.
-              */
-@@ -60,7 +60,7 @@ define([
-             },
- 
-             /**
--             * Removes specfied item.
-+             * Removes specified item.
-              *
-              * @param {String} key - Key of the property to be removed.
-              */
-@@ -79,7 +79,7 @@ define([
- 
-     /**
-      * Extracts and parses data stored in localStorage by the
--     * key specified in 'root' varaible.
-+     * key specified in 'root' variable.
-      *
-      * @returns {Object}
-      */
-@@ -114,8 +114,8 @@ define([
-          *
-          * @param {String} path - Path to the property.
-          *
--         * @example Retrieveing data.
--         *      localStoarge =>
-+         * @example Retrieving data.
-+         *      localStorage =>
-          *          'appData' => '
-          *              "one": {"two": "three"}
-          *          '
-@@ -139,7 +139,7 @@ define([
-          *
-          * @example Setting data.
-          *      storage.set('one.two', 'four');
--         *      => localStoarge =>
-+         *      => localStorage =>
-          *          'appData' => '
-          *              "one": {"two": "four"}
-          *          '
-@@ -159,7 +159,7 @@ define([
-          *
-          * @example Removing data.
-          *      storage.remove('one.two', 'four');
--         *      => localStoarge =>
-+         *      => localStorage =>
-          *          'appData' => '
-          *              "one": {}
-          *          '
-diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js
-index 4518db598b4..83d43d2691b 100644
---- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js
-+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js
-@@ -26,7 +26,7 @@ define(function (require) {
-         mageInit:       require('./mage-init'),
-         keyboard:       require('./keyboard'),
-         optgroup:       require('./optgroup'),
--        aferRender:     require('./after-render'),
-+        afterRender:     require('./after-render'),
-         autoselect:     require('./autoselect'),
-         datepicker:     require('./datepicker'),
-         outerClick:     require('./outer_click'),
-diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/datepicker.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/datepicker.js
-index 5adfd9b6d6a..2fab8c219c0 100644
---- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/datepicker.js
-+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/datepicker.js
-@@ -41,7 +41,6 @@ define([
- 
-             if (typeof config === 'object') {
-                 observable = config.storage;
--
-                 _.extend(options, config.options);
-             } else {
-                 observable = config;
-@@ -49,21 +48,53 @@ define([
- 
-             $(el).calendar(options);
- 
--            observable() && $(el).datepicker(
--                'setDate',
--                moment(
-+            ko.utils.registerEventHandler(el, 'change', function () {
-+                observable(this.value);
-+            });
-+        },
-+
-+        /**
-+         * Update calendar widget on element and stores it's value to observable property.
-+         * Datepicker binding takes either observable property or object
-+         *  { storage: {ko.observable}, options: {Object} }.
-+         * @param {HTMLElement} element - Element, that binding is applied to
-+         * @param {Function} valueAccessor - Function that returns value, passed to binding
-+         */
-+        update: function (element, valueAccessor) {
-+            var config = valueAccessor(),
-+                observable,
-+                options = {},
-+                newVal;
-+
-+            _.extend(options, defaults);
-+
-+            if (typeof config === 'object') {
-+                observable = config.storage;
-+                _.extend(options, config.options);
-+            } else {
-+                observable = config;
-+            }
-+
-+            if (_.isEmpty(observable())) {
-+                if ($(element).datepicker('getDate')) {
-+                    $(element).datepicker('setDate', null);
-+                    $(element).blur();
-+                }
-+            } else {
-+                newVal = moment(
-                     observable(),
-                     utils.convertToMomentFormat(
-                         options.dateFormat + (options.showsTime ? ' ' + options.timeFormat : '')
-                     )
--                ).toDate()
--            );
-+                ).toDate();
- 
--            $(el).blur();
--
--            ko.utils.registerEventHandler(el, 'change', function () {
--                observable(this.value);
--            });
-+                if ($(element).datepicker('getDate') == null ||
-+                    newVal.valueOf() !== $(element).datepicker('getDate').valueOf()
-+                ) {
-+                    $(element).datepicker('setDate', newVal);
-+                    $(element).blur();
-+                }
-+            }
-         }
-     };
- });
-diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/outer_click.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/outer_click.js
-index cc9dc5e0a22..98e86de2322 100644
---- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/outer_click.js
-+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/outer_click.js
-@@ -42,7 +42,7 @@ define([
-     /**
-      * Document click handler which in case if event target is not
-      * a descendant of provided container element,
--     * invokes specfied in configuration callback.
-+     * invokes specified in configuration callback.
-      *
-      * @param {HTMLElement} container
-      * @param {Object} config
-diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js
-index a332b595bdf..6b3c437b905 100644
---- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js
-+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js
-@@ -109,7 +109,7 @@ define([
-     wrapper.extend(ko, {
- 
-         /**
--         * Extends kncokouts' 'applyBindings'
-+         * Extends knockouts' 'applyBindings'
-          * to track nodes associated with model.
-          *
-          * @param {Function} orig - Original 'applyBindings' method.
-@@ -136,7 +136,7 @@ define([
-         },
- 
-         /**
--         * Extends kncokouts' cleanNode
-+         * Extends knockouts' cleanNode
-          * to track nodes associated with model.
-          *
-          * @param {Function} orig - Original 'cleanNode' method.
-diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/observable_source.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/observable_source.js
-index 98ffd83b564..916666d70d1 100644
---- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/observable_source.js
-+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/observable_source.js
-@@ -29,7 +29,7 @@ define([
-          * Else, writes into it.
-          * @param  {String} key - key to write to or to read from
-          * @param  {*} value
--         * @return {*} - if 1 arg provided, returnes _data[key] property
-+         * @return {*} - if 1 arg provided, Returns _data[key] property
-          */
-         data: function (key, value) {
-             if (arguments.length === 1) {
-diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/renderer.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/renderer.js
-index 2e0c53373f8..2cfd9616192 100644
---- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/renderer.js
-+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/renderer.js
-@@ -519,7 +519,7 @@ define([
-         },
- 
-         /**
--         * Custom 'render' attrobute handler function. Wraps child elements
-+         * Custom 'render' attribute handler function. Wraps child elements
-          * of a node with knockout's 'ko template:' comment tag.
-          *
-          * @param {HTMLElement} node - Element to be processed.
-diff --git a/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js b/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js
-index fe83f600132..bf7ae0cdc3e 100644
---- a/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js
-+++ b/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js
-@@ -42,14 +42,14 @@ define([], function () {
-      * Method that creates object of messages
-      * @param {String} requested - log message that showing that request for class is started
-      * @param {String} loaded - log message that show when requested class is loaded
--     * @param {String} failded - log message that show when requested class is failed
-+     * @param {String} failed - log message that show when requested class is failed
-      * @returns {Object}
-      */
--    LogUtils.prototype.createMessages = function (requested, loaded, failded) {
-+    LogUtils.prototype.createMessages = function (requested, loaded, failed) {
-         return {
-             requested: requested || '',
-             loaded: loaded || '',
--            failed: failded || ''
-+            failed: failed || ''
-         };
-     };
- 
-@@ -57,14 +57,14 @@ define([], function () {
-      * Method that creates object of log levels
-      * @param {String} requested - log message that showing that request for class is started
-      * @param {String} loaded - log message that show when requested class is loaded
--     * @param {String} failded - log message that show when requested class is failed
-+     * @param {String} failed - log message that show when requested class is failed
-      * @returns {Object}
-      */
--    LogUtils.prototype.createLevels = function (requested, loaded, failded) {
-+    LogUtils.prototype.createLevels = function (requested, loaded, failed) {
-         return {
-             requested: requested || 'info',
-             loaded: loaded || 'info',
--            failed: failded || 'warn'
-+            failed: failed || 'warn'
-         };
-     };
- 
-diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
-index e52791deaf2..6f0dd01f332 100644
---- a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
-+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
-@@ -73,13 +73,13 @@ define([
-         ],
-         'max-words': [
-             function (value, params) {
--                return utils.stripHtml(value).match(/\b\w+\b/g).length < params;
-+                return utils.isEmpty(value) || utils.stripHtml(value).match(/\b\w+\b/g).length < params;
-             },
-             $.mage.__('Please enter {0} words or less.')
-         ],
-         'min-words': [
-             function (value, params) {
--                return utils.stripHtml(value).match(/\b\w+\b/g).length >= params;
-+                return utils.isEmpty(value) || utils.stripHtml(value).match(/\b\w+\b/g).length >= params;
-             },
-             $.mage.__('Please enter at least {0} words.')
-         ],
-@@ -87,49 +87,59 @@ define([
-             function (value, params) {
-                 var match = utils.stripHtml(value).match(/\b\w+\b/g) || [];
- 
--                return match.length >= params[0] &&
-+                return utils.isEmpty(value) || match.length >= params[0] &&
-                     match.length <= params[1];
-             },
-             $.mage.__('Please enter between {0} and {1} words.')
-         ],
-         'letters-with-basic-punc': [
-             function (value) {
--                return /^[a-z\-.,()\u0027\u0022\s]+$/i.test(value);
-+                return utils.isEmpty(value) || /^[a-z\-.,()\u0027\u0022\s]+$/i.test(value);
-             },
-             $.mage.__('Letters or punctuation only please')
-         ],
-         'alphanumeric': [
-             function (value) {
--                return /^\w+$/i.test(value);
-+                return utils.isEmpty(value) || /^\w+$/i.test(value);
-             },
-             $.mage.__('Letters, numbers, spaces or underscores only please')
-         ],
-         'letters-only': [
-             function (value) {
--                return /^[a-z]+$/i.test(value);
-+                return utils.isEmpty(value) || /^[a-z]+$/i.test(value);
-             },
-             $.mage.__('Letters only please')
-         ],
-         'no-whitespace': [
-             function (value) {
--                return /^\S+$/i.test(value);
-+                return utils.isEmpty(value) || /^\S+$/i.test(value);
-             },
-             $.mage.__('No white space please')
-         ],
-+        'no-marginal-whitespace': [
-+            function (value) {
-+                return !/^\s+|\s+$/i.test(value);
-+            },
-+            $.mage.__('No marginal white space please')
-+        ],
-         'zip-range': [
-             function (value) {
--                return /^90[2-5]-\d{2}-\d{4}$/.test(value);
-+                return utils.isEmpty(value) || /^90[2-5]-\d{2}-\d{4}$/.test(value);
-             },
-             $.mage.__('Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx')
-         ],
-         'integer': [
-             function (value) {
--                return /^-?\d+$/.test(value);
-+                return utils.isEmpty(value) || /^-?\d+$/.test(value);
-             },
-             $.mage.__('A positive or negative non-decimal number please')
-         ],
-         'vinUS': [
-             function (value) {
-+                if (utils.isEmpty(value)) {
-+                    return true;
-+                }
-+
-                 if (value.length !== 17) {
-                     return false;
-                 }
-@@ -215,13 +225,13 @@ define([
-         ],
-         'time': [
-             function (value) {
--                return /^([01]\d|2[0-3])(:[0-5]\d){0,2}$/.test(value);
-+                return utils.isEmpty(value) || /^([01]\d|2[0-3])(:[0-5]\d){0,2}$/.test(value);
-             },
-             $.mage.__('Please enter a valid time, between 00:00 and 23:59')
-         ],
-         'time12h': [
-             function (value) {
--                return /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\ [AP]M))$/i.test(value);
-+                return utils.isEmpty(value) || /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\s[AP]M))$/i.test(value);
-             },
-             $.mage.__('Please enter a valid time, between 00:00 am and 12:00 pm')
-         ],
-@@ -229,19 +239,21 @@ define([
-             function (value) {
-                 value = value.replace(/\s+/g, '');
- 
--                return value.length > 9 && value.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
-+                return utils.isEmpty(value) || value.length > 9 &&
-+                    value.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
-             },
-             $.mage.__('Please specify a valid phone number')
-         ],
-         'phoneUK': [
-             function (value) {
--                return value.length > 9 && value.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/);
-+                return utils.isEmpty(value) || value.length > 9 &&
-+                    value.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/);
-             },
-             $.mage.__('Please specify a valid phone number')
-         ],
-         'mobileUK': [
-             function (value) {
--                return value.length > 9 && value.match(/^((0|\+44)7\d{3}\s?\d{6})$/);
-+                return utils.isEmpty(value) || value.length > 9 && value.match(/^((0|\+44)7\d{3}\s?\d{6})$/);
-             },
-             $.mage.__('Please specify a valid mobile number')
-         ],
-@@ -253,13 +265,13 @@ define([
-         ],
-         'email2': [
-             function (value) {
--                return /^((([a-z]|\d|[!#\$%&\u0027\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&\u0027\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\u0022)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\u0022)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value);//eslint-disable-line max-len
-+                return utils.isEmpty(value) || /^((([a-z]|\d|[!#\$%&\u0027\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&\u0027\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\u0022)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\u0022)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value);//eslint-disable-line max-len
-             },
-             $.validator.messages.email
-         ],
-         'url2': [
-             function (value) {
--                return /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);//eslint-disable-line max-len
-+                return utils.isEmpty(value) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);//eslint-disable-line max-len
-             },
-             $.validator.messages.url
-         ],
-@@ -267,6 +279,10 @@ define([
-             function (value, param) {
-                 var validTypes;
- 
-+                if (utils.isEmpty(value)) {
-+                    return true;
-+                }
-+
-                 if (/[^0-9-]+/.test(value)) {
-                     return false;
-                 }
-@@ -351,19 +367,19 @@ define([
-         ],
-         'ipv4': [
-             function (value) {
--                return /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(value);//eslint-disable-line max-len
-+                return utils.isEmpty(value) || /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(value);//eslint-disable-line max-len
-             },
-             $.mage.__('Please enter a valid IP v4 address.')
-         ],
-         'ipv6': [
-             function (value) {
--                return /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);//eslint-disable-line max-len
-+                return utils.isEmpty(value) || /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);//eslint-disable-line max-len
-             },
-             $.mage.__('Please enter a valid IP v6 address.')
-         ],
-         'pattern': [
-             function (value, param) {
--                return new RegExp(param).test(value);
-+                return utils.isEmpty(value) || new RegExp(param).test(value);
-             },
-             $.mage.__('Invalid format.')
-         ],
-@@ -676,6 +692,24 @@ define([
-             },
-             $.mage.__('The value is not within the specified range.')
-         ],
-+        'validate-positive-percent-decimal': [
-+            function (value) {
-+                var numValue;
-+
-+                if (utils.isEmptyNoTrim(value) || !/^\s*-?\d*(\.\d*)?\s*$/.test(value)) {
-+                    return false;
-+                }
-+
-+                numValue = utils.parseNumber(value);
-+
-+                if (isNaN(numValue)) {
-+                    return false;
-+                }
-+
-+                return utils.isBetween(numValue, 0.01, 100);
-+            },
-+            $.mage.__('Please enter a valid percentage discount value greater than 0.')
-+        ],
-         'validate-digits': [
-             function (value) {
-                 return utils.isEmptyNoTrim(value) || !/[^\d]/.test(value);
-@@ -747,7 +781,7 @@ define([
-             function (value) {
-                 return utils.isEmptyNoTrim(value) || /^[a-z]+[a-z0-9_]+$/.test(value);
-             },
--            $.mage.__('Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.')//eslint-disable-line max-len
-+            $.mage.__('Please use only lowercase letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.')//eslint-disable-line max-len
-         ],
-         'validate-alphanum': [
-             function (value) {
-@@ -769,6 +803,14 @@ define([
-             },
-             $.mage.__('Please enter a valid date.')
-         ],
-+        'validate-date-range': [
-+            function (value, params) {
-+                var fromDate = $('input[name*="' + params + '"]').val();
-+
-+                return moment.utc(value).unix() >= moment.utc(fromDate).unix() || isNaN(moment.utc(value).unix());
-+            },
-+            $.mage.__('Make sure the To Date is later than or the same as the From Date.')
-+        ],
-         'validate-identifier': [
-             function (value) {
-                 return utils.isEmptyNoTrim(value) || /^[a-z0-9][a-z0-9_\/-]+(\.[a-z0-9_-]+)?$/.test(value);
-@@ -845,7 +887,7 @@ define([
-                     return validateCreditCard(value);
-                 }
- 
--                return false;
-+                return true;
-             },
-             $.mage.__('Please enter a valid credit card number.')
-         ],
-@@ -886,10 +928,14 @@ define([
-         ],
-         'validate-per-page-value-list': [
-             function (value) {
--                var isValid = !utils.isEmpty(value),
-+                var isValid = true,
-                     values = value.split(','),
-                     i;
- 
-+                if (utils.isEmpty(value)) {
-+                    return isValid;
-+                }
-+
-                 for (i = 0; i < values.length; i++) {
-                     if (!/^[0-9]+$/.test(values[i])) {
-                         isValid = false;
-diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
-index 31362644d41..407984c7881 100644
---- a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
-+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
-@@ -48,6 +48,10 @@ define([
-                 params :
-                 [params];
- 
-+            if (typeof message === 'function') {
-+                message = message.call(rule);
-+            }
-+
-             message = params.reduce(function (msg, param, idx) {
-                 return msg.replace(new RegExp('\\{' + idx + '\\}', 'g'), param);
-             }, message);
-@@ -60,7 +64,7 @@ define([
-     }
- 
-     /**
--     * Validates provied value by a specfied set of rules.
-+     * Validates provided value by a specified set of rules.
-      *
-      * @param {(String|Object)} rules - One or many validation rules.
-      * @param {*} value - Value to be checked.
-diff --git a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/bindings.js b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/bindings.js
-index f6afdf78463..48515b668f8 100644
---- a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/bindings.js
-+++ b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/bindings.js
-@@ -88,8 +88,8 @@ define([
-     };
- 
-     /**
--     * Adds specfied bindings to each DOM elemenet in
--     * collection and evalutes them with provided context.
-+     * Adds specified bindings to each DOM element in
-+     * collection and evaluates them with provided context.
-      *
-      * @param {(Object|Function)} data - Either bindings object or a function
-      *      which returns bindings data for each element in collection.
-diff --git a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
-index 4590af4f2d6..f8e752fb77a 100644
---- a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
-+++ b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
-@@ -12,7 +12,8 @@ define([
- 
-     var counter = 1,
-         watchers,
--        globalObserver;
-+        globalObserver,
-+        disabledNodes = [];
- 
-     watchers = {
-         selectors: {},
-@@ -140,7 +141,7 @@ define([
-     }
- 
-     /**
--     * Calls handlers assocoiated with an added node.
-+     * Calls handlers associated with an added node.
-      * Adds listeners for the node removal.
-      *
-      * @param {HTMLElement} node - Added node.
-@@ -162,7 +163,7 @@ define([
-     }
- 
-     /**
--     * Calls handlers assocoiated with a removed node.
-+     * Calls handlers associated with a removed node.
-      *
-      * @param {HTMLElement} node - Removed node.
-      */
-@@ -238,11 +239,58 @@ define([
-         };
-     }
- 
-+    /**
-+     * Verify if the DOM node is a child of a defined disabled node, if so we shouldn't observe provided mutation.
-+     *
-+     * @param {Object} mutation - a single mutation
-+     * @returns {Boolean}
-+     */
-+    function shouldObserveMutation(mutation) {
-+        var isDisabled;
-+
-+        if (disabledNodes.length > 0) {
-+            // Iterate through the disabled nodes and determine if this mutation is occurring inside one of them
-+            isDisabled = _.find(disabledNodes, function (node) {
-+                return node === mutation.target || $.contains(node, mutation.target);
-+            });
-+
-+            // If we find a matching node we should not observe the mutation
-+            return !isDisabled;
-+        }
-+
-+        return true;
-+    }
-+
-+    /**
-+     * Should we observe these mutations? Check the first and last mutation to determine if this is a disabled mutation,
-+     * we check both the first and last in case one has been removed from the DOM during the process of the mutation.
-+     *
-+     * @param {Array} mutations - An array of mutation records.
-+     * @returns {Boolean}
-+     */
-+    function shouldObserveMutations(mutations) {
-+        var firstMutation,
-+            lastMutation;
-+
-+        if (mutations.length > 0) {
-+            firstMutation = mutations[0];
-+            lastMutation = mutations[mutations.length - 1];
-+
-+            return shouldObserveMutation(firstMutation) && shouldObserveMutation(lastMutation);
-+        }
-+
-+        return true;
-+    }
-+
-     globalObserver = new MutationObserver(function (mutations) {
--        var changes = formChangesLists(mutations);
-+        var changes;
-+
-+        if (shouldObserveMutations(mutations)) {
-+            changes = formChangesLists(mutations);
- 
--        changes.removed.forEach(processRemoved);
--        changes.added.forEach(processAdded);
-+            changes.removed.forEach(processRemoved);
-+            changes.added.forEach(processAdded);
-+        }
-     });
- 
-     globalObserver.observe(document.body, {
-@@ -251,6 +299,16 @@ define([
-     });
- 
-     return {
-+        /**
-+         * Disable a node from being observed by the mutations, you may want to disable specific aspects of the
-+         * application which are heavy on DOM changes. The observer running on some actions could cause significant
-+         * delays and degrade the performance of that specific part of the application exponentially.
-+         *
-+         * @param {HTMLElement} node - a HTML node within the document
-+         */
-+        disableNode: function (node) {
-+            disabledNodes.push(node);
-+        },
- 
-         /**
-          * Adds listener for the appearance of nodes that matches provided
-diff --git a/app/code/Magento/Ui/view/base/web/js/modal/alert.js b/app/code/Magento/Ui/view/base/web/js/modal/alert.js
-index 911d0e02578..b63294e3d87 100644
---- a/app/code/Magento/Ui/view/base/web/js/modal/alert.js
-+++ b/app/code/Magento/Ui/view/base/web/js/modal/alert.js
-@@ -39,11 +39,18 @@ define([
-             }]
-         },
- 
-+        /**
-+         * Create widget.
-+         */
-+        _create: function () {
-+            this.options.actions.always();
-+            this._super();
-+        },
-+
-         /**
-          * Close modal window.
-          */
-         closeModal: function () {
--            this.options.actions.always();
-             this.element.bind('alertclosed', _.bind(this._remove, this));
- 
-             return this._super();
-diff --git a/app/code/Magento/Ui/view/base/web/js/modal/modal.js b/app/code/Magento/Ui/view/base/web/js/modal/modal.js
-index f016b0dbefd..c81274337f4 100644
---- a/app/code/Magento/Ui/view/base/web/js/modal/modal.js
-+++ b/app/code/Magento/Ui/view/base/web/js/modal/modal.js
-@@ -363,14 +363,7 @@ define([
-             this.modal.data('active', false);
- 
-             if (this.overlay) {
--                // In cases when one modal is closed but there is another modal open (e.g. admin notifications)
--                // to avoid collisions between overlay and modal zIndexes
--                // overlay zIndex is set to be less than modal one
--                if (this._getVisibleCount() === 1) {
--                    this.overlay.zIndex(this.prevOverlayIndex - 1);
--                } else {
--                    this.overlay.zIndex(this.prevOverlayIndex);
--                }
-+                this.overlay.zIndex(this.prevOverlayIndex - 1);
-             }
-         },
- 
-diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
-index 1a21e1b2f1c..6da4f82fa8b 100644
---- a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
-@@ -41,7 +41,7 @@
-                     <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
-                     <td if="elem.template"
-                         css="$parent.setClasses(elem)"
--                        visible="elem.visible"
-+                        visible="elem.visible() && elem.formElement !== 'hidden'"
-                         disable="elem.disabled"
-                         template="elem.template"/>
-                     <!-- /ko -->
-diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
-index d0b12549bd6..e5d73a62b32 100644
---- a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
-@@ -58,7 +58,7 @@
- 
-                     <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
-                     <td if="elem.template"
--                        visible="elem.visible"
-+                        visible="elem.visible() && elem.formElement !== 'hidden'"
-                         disable="elem.disabled"
-                         css="$parent.setClasses(elem)"
-                         template="elem.template"
-diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/button.html b/app/code/Magento/Ui/view/base/web/templates/form/element/button.html
-index a8b6c3a8589..766df35f576 100644
---- a/app/code/Magento/Ui/view/base/web/templates/form/element/button.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/button.html
-@@ -11,3 +11,15 @@
-         attr="'data-index': index">
-     <span text="title"/>
- </button>
-+
-+<if args="childError">
-+    <strong class="_error">
-+        <span class="admin__page-nav-item-messages">
-+            <span class="admin__page-nav-item-message _error">
-+                <span class="admin__page-nav-item-message-icon"></span>
-+                <span class="admin__page-nav-item-message-tooltip"
-+                      data-bind="i18n: 'This element contains invalid data. Please resolve this before saving.'">This element contains invalid data. Please resolve this before saving.</span>
-+            </span>
-+        </span>
-+    </strong>
-+</if>
-diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/helper/service.html b/app/code/Magento/Ui/view/base/web/templates/form/element/helper/service.html
-index 46f0a2df524..195104b3672 100644
---- a/app/code/Magento/Ui/view/base/web/templates/form/element/helper/service.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/helper/service.html
-@@ -10,7 +10,6 @@
-            attr="
-                 id: $data.uid + '_default',
-                 name: 'use_default[' + $data.index + ']',
--                'data-form-part': $data.ns
-            "
-            ko-checked="isUseDefault"
-            ko-disabled="$data.serviceDisabled">
-diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
-index a92b85cb474..cf4e2243b58 100644
---- a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
-@@ -6,7 +6,7 @@
- -->
- 
- <div class="admin__field" visible="visible" css="$data.additionalClasses">
--    <label class="admin__field-label" if="$data.label" attr="for: uid">
-+    <label class="admin__field-label" if="$data.label" attr="for: uid" visible="$data.labelVisible">
-         <span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
-     </label>
- 
-diff --git a/app/code/Magento/Ui/view/base/web/templates/form/field.html b/app/code/Magento/Ui/view/base/web/templates/form/field.html
-index 24ed194d666..6a095b4da14 100644
---- a/app/code/Magento/Ui/view/base/web/templates/form/field.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/form/field.html
-@@ -8,9 +8,11 @@
-      visible="visible"
-      css="$data.additionalClasses"
-      attr="'data-index': index">
--    <span class="admin__field-label" if="$data.label" visible="$data.labelVisible">
--        <label translate="label" attr="'data-config-scope': $data.scopeLabel, for: uid" />
--    </span>
-+    <div class="admin__field-label" visible="$data.labelVisible">
-+        <label if="$data.label"  attr="for: uid">
-+            <span translate="label" attr="'data-config-scope': $data.scopeLabel" />
-+        </label>
-+    </div>
-     <div class="admin__field-control"
-          css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
-         <render args="elementTmpl" ifnot="hasAddons()"/>
-diff --git a/app/code/Magento/Ui/view/base/web/templates/form/insert.html b/app/code/Magento/Ui/view/base/web/templates/form/insert.html
-index e19b2784e6b..e590b5e2ade 100644
---- a/app/code/Magento/Ui/view/base/web/templates/form/insert.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/form/insert.html
-@@ -6,9 +6,6 @@
- -->
- 
- <div data-bind="bindHtml: content,
--        attr: {
--            class: element.cssclass ? element.cssclass : 'admin__scope-old'
--        },
-         visible: visible,
-         css: contentSelector"></div>
- 
-diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
-index 3ef64fd4b53..36a3232c3e6 100644
---- a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
-@@ -6,7 +6,7 @@
- -->
- <div class="admin__action-dropdown-wrap admin__data-grid-action-bookmarks" collapsible>
-     <button class="admin__action-dropdown" type="button" toggleCollapsible>
--        <span class="admin__action-dropdown-text" text="activeView.label"/>
-+        <span class="admin__action-dropdown-text" translate="activeView.label"/>
-     </button>
-     <ul class="admin__action-dropdown-menu">
-         <repeat args="foreach: viewsArray, item: '$view'">
-diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
-index b52669e2cd2..521ce9fc806 100644
---- a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
-@@ -30,7 +30,7 @@
- </div>
- 
- <div class="action-dropdown-menu-item">
--    <a href="" class="action-dropdown-menu-link" text="$view().label" click="applyView.bind($data, $view().index)" closeCollapsible/>
-+    <a href="" class="action-dropdown-menu-link" translate="$view().label" click="applyView.bind($data, $view().index)" closeCollapsible/>
- 
-     <div class="action-dropdown-menu-item-actions" if="$view().editable">
-         <button class="action-edit" type="button" attr="title: $t('Edit bookmark')" click="editView.bind($data, $view().index)">
-diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select-optgroup.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select-optgroup.html
-index 56244422a6b..1ad0e7505ec 100644
---- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select-optgroup.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select-optgroup.html
-@@ -19,7 +19,7 @@
-                 css: {
-                     _selected: $parent.root.isSelected(option.value),
-                     _hover: $parent.root.isHovered(option, $element),
--                    _expended: $parent.root.getLevelVisibility($data),
-+                    _expended: $parent.root.getLevelVisibility($data) || $data.visible,
-                     _unclickable: $parent.root.isLabelDecoration($data),
-                     _last: $parent.root.addLastElement($data),
-                     '_with-checkbox': $parent.root.showCheckbox
-diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
-index bf3e2df8a82..b9425c020c0 100644
---- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
-@@ -36,7 +36,7 @@
-             class="action-select admin__action-multiselect"
-             data-role="advanced-select"
-             data-bind="
--            css: {_active: multiselectFocus},
-+            css: {_active: listVisible},
-             click: function(data, event) {
-                 toggleListVisible(data, event)
-             }
-@@ -73,7 +73,7 @@
-             class="action-select admin__action-multiselect"
-             data-role="advanced-select"
-             data-bind="
--            css: {_active: multiselectFocus},
-+            css: {_active: listVisible},
-             click: function(data, event) {
-                 toggleListVisible(data, event)
-             }
-@@ -160,7 +160,7 @@
-                         css: {
-                             _selected: $parent.isSelectedValue(option),
-                             _hover: $parent.isHovered(option, $element),
--                            _expended: $parent.getLevelVisibility($data),
-+                            _expended: $parent.getLevelVisibility($data) && $parent.showLevels($data),
-                             _unclickable: $parent.isLabelDecoration($data),
-                             _last: $parent.addLastElement($data),
-                             '_with-checkbox': $parent.showCheckbox
-@@ -174,6 +174,7 @@
-                     <div class="admin__action-multiselect-dropdown"
-                          data-bind="
-                             click: function(event){
-+                                $parent.showLevels($data);
-                                 $parent.openChildLevel($data, $element, event);
-                             },
-                             clickBubble: false
-diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html b/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
-index 39d996e05c3..fcad729a95f 100644
---- a/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
-@@ -5,16 +5,18 @@
-  */
- -->
- <div class="data-grid-search-control-wrap">
--    <label class="data-grid-search-label" attr="title: $t('Search'), for: index">
-+    <label class="data-grid-search-label" attr="title: $t('Search'), for: index" data-bind="click: scrollTo">
-         <span translate="'Search'"/>
-     </label>
-     <input class="admin__control-text data-grid-search-control" type="text"
-             data-bind="
-+                i18n: placeholder,
-                 attr: {
-                     id: index,
--                    placeholder: placeholder
-+                    placeholder: $t(placeholder)
-                 },
-                 textInput: inputValue,
-+                hasFocus: focused,
-                 keyboard: {
-                     13: apply.bind($data, false),
-                     27: cancel
-diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
-index c5d87a4b16c..610d78e00b8 100644
---- a/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
-@@ -6,7 +6,7 @@
- -->
- <ul class="action-submenu" each="data: action.actions, as: 'action'" css="_active: action.visible">
-     <li css="_visible: $data.visible">
--        <span class="action-menu-item" text="label" click="$parent.applyAction.bind($parent, type)"/>
-+        <span class="action-menu-item" translate="label" click="$parent.applyAction.bind($parent, type)"/>
-         <render args="name: $parent.submenuTemplate, data: $parent" if="$data.actions"/>
-     </li>
- </ul>
-diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
-index 1aeb48b7c76..d11d4aa2437 100644
---- a/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
-+++ b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
-@@ -11,7 +11,7 @@
-     <div class="action-menu-items">
-         <ul class="action-menu" each="data: actions, as: 'action'" css="_active: opened">
-             <li css="_visible: $data.visible, _parent: $data.actions">
--                <span class="action-menu-item" text="label" click="$parent.applyAction.bind($parent, type)"/>
-+                <span class="action-menu-item" translate="label" click="$parent.applyAction.bind($parent, type)"/>
-                 <render args="name: $parent.submenuTemplate, data: $parent" if="$data.actions"/>
-             </li>
-         </ul>
-diff --git a/app/code/Magento/Ui/view/frontend/web/js/model/messages.js b/app/code/Magento/Ui/view/frontend/web/js/model/messages.js
-index b970b223615..fb9a20c054d 100644
---- a/app/code/Magento/Ui/view/frontend/web/js/model/messages.js
-+++ b/app/code/Magento/Ui/view/frontend/web/js/model/messages.js
-@@ -55,7 +55,7 @@ define([
-                 return messageObj.parameters.shift();
-             });
-             this.clear();
--            this.errorMessages.push(message);
-+            type.push(message);
- 
-             return true;
-         },
-diff --git a/app/code/Magento/Ui/view/frontend/web/templates/form/element/helper/tooltip.html b/app/code/Magento/Ui/view/frontend/web/templates/form/element/helper/tooltip.html
-index 3d4f9eefe5a..f8d1cbbcad5 100644
---- a/app/code/Magento/Ui/view/frontend/web/templates/form/element/helper/tooltip.html
-+++ b/app/code/Magento/Ui/view/frontend/web/templates/form/element/helper/tooltip.html
-@@ -13,14 +13,20 @@
-        data-bind="attr: {href: tooltip.link}, mageInit: {'dropdown':{'activeClass': '_active'}}"></a>
-      <!-- /ko -->
- 
-+     <span id="tooltip-label" class="label"><!-- ko i18n: 'Tooltip' --><!-- /ko --></span>
-      <!-- ko if: (!tooltip.link)-->
--     <span class="field-tooltip-action action-help"
--        tabindex="0"
--        data-toggle="dropdown"
--        data-bind="mageInit: {'dropdown':{'activeClass': '_active'}}"></span>
-+         <span
-+             id="tooltip"
-+             class="field-tooltip-action action-help"
-+             tabindex="0"
-+             data-toggle="dropdown"
-+             data-bind="mageInit: {'dropdown':{'activeClass': '_active', 'parent': '.field-tooltip.toggle'}}"
-+             aria-labelledby="tooltip-label"
-+         >
-+         </span>
-      <!-- /ko -->
- 
--    <div class="field-tooltip-content"
-+     <div class="field-tooltip-content"
-          data-target="dropdown" translate="tooltip.description">
-     </div>
- </div>
-diff --git a/app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html b/app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html
-new file mode 100644
-index 00000000000..226ad2915bb
---- /dev/null
-+++ b/app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html
-@@ -0,0 +1,37 @@
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+
-+<div class="field-control" css="'_with-tooltip': $data.tooltip">
-+    <div class="file-uploader" data-role="drop-zone" css="_loading: isLoading">
-+        <div class="file-uploader-area">
-+            <input type="file" afterRender="onElementRender" attr="id: uid, name: inputName, multiple: isMultipleFiles"
-+                   disable="disabled"/>
-+            <label class="file-uploader-button action-default" attr="for: uid" translate="'Upload'"/>
-+
-+            <span class="file-uploader-spinner"/>
-+            <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
-+        </div>
-+
-+        <render args="tooltipTpl" if="$data.tooltip"/>
-+
-+        <div class="field-note" if="$data.notice" attr="id: noticeId">
-+            <span html="notice"/>
-+        </div>
-+
-+        <each args="data: value, as: '$file'" render="$parent.getPreviewTmpl($file)"/>
-+
-+        <div if="isMultipleFiles" class="file-uploader-summary">
-+            <label attr="for: uid"
-+                   class="file-uploader-placeholder"
-+                   css="'placeholder-' + placeholderType">
-+                    <span class="file-uploader-placeholder-text"
-+                          translate="'Click here or drag and drop to add files.'"/>
-+            </label>
-+        </div>
-+    </div>
-+    <render args="$data.service.template" if="$data.hasService()"/>
-+</div>
-diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
-index e2b9d4694ab..5320aeb5bcc 100644
---- a/app/code/Magento/Ups/Model/Carrier.php
-+++ b/app/code/Magento/Ups/Model/Carrier.php
-@@ -3,9 +3,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Ups\Model;
- 
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Async\CallbackDeferred;
-+use Magento\Framework\Async\ProxyDeferredFactory;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\HTTP\AsyncClient\HttpResponseDeferredInterface;
-+use Magento\Framework\HTTP\AsyncClient\Request;
-+use Magento\Framework\HTTP\AsyncClientInterface;
- use Magento\Framework\HTTP\ClientFactory;
- use Magento\Framework\Xml\Security;
- use Magento\Quote\Model\Quote\Address\RateRequest;
-@@ -15,6 +24,7 @@ use Magento\Shipping\Model\Carrier\CarrierInterface;
- use Magento\Shipping\Model\Rate\Result;
- use Magento\Shipping\Model\Simplexml\Element;
- use Magento\Ups\Helper\Config;
-+use Magento\Shipping\Model\Shipment\Request as Shipment;
- 
- /**
-  * UPS shipping implementation
-@@ -77,7 +87,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
-      *
-      * @var string
-      */
--    protected $_defaultCgiGatewayUrl = 'http://www.ups.com:80/using/services/rave/qcostcgi.cgi';
-+    protected $_defaultCgiGatewayUrl = 'https://www.ups.com/using/services/rave/qcostcgi.cgi';
- 
-     /**
-      * Test urls for shipment
-@@ -129,9 +139,14 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
-     ];
- 
-     /**
--     * @var ClientFactory
-+     * @var AsyncClientInterface
-      */
--    private $httpClientFactory;
-+    private $asyncHttpClient;
-+
-+    /**
-+     * @var ProxyDeferredFactory
-+     */
-+    private $deferredProxyFactory;
- 
-     /**
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-@@ -153,8 +168,11 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
-      * @param Config $configHelper
-      * @param ClientFactory $httpClientFactory
-      * @param array $data
-+     * @param AsyncClientInterface|null $asyncHttpClient
-+     * @param ProxyDeferredFactory|null $proxyDeferredFactory
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-@@ -175,7 +193,9 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
-         \Magento\Framework\Locale\FormatInterface $localeFormat,
-         Config $configHelper,
-         ClientFactory $httpClientFactory,
--        array $data = []
-+        array $data = [],
-+        ?AsyncClientInterface $asyncHttpClient = null,
-+        ?ProxyDeferredFactory $proxyDeferredFactory
-     ) {
-         parent::__construct(
-             $scopeConfig,
-@@ -195,16 +215,18 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
-             $stockRegistry,
-             $data
-         );
--        $this->httpClientFactory = $httpClientFactory;
-         $this->_localeFormat = $localeFormat;
-         $this->configHelper = $configHelper;
-+        $this->asyncHttpClient = $asyncHttpClient ?? ObjectManager::getInstance()->get(AsyncClientInterface::class);
-+        $this->deferredProxyFactory = $proxyDeferredFactory
-+            ?? ObjectManager::getInstance()->get(ProxyDeferredFactory::class);
-     }
- 
-     /**
-      * Collect and get rates/errors
-      *
-      * @param RateRequest $request
--     * @return  Result|Error|bool
-+     * @return Result|Error|bool
-      */
-     public function collectRates(RateRequest $request)
-     {
-@@ -214,10 +236,19 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
-         }
- 
-         $this->setRequest($request);
--        $this->_result = $this->_getQuotes();
--        $this->_updateFreeMethodQuote($request);
--
--        return $this->getResult();
-+        //To use the correct result in the callback.
-+        $this->_result = $result = $this->_getQuotes();
-+
-+        return $this->deferredProxyFactory->createFor(
-+            Result::class,
-+            new CallbackDeferred(
-+                function () use ($request, $result) {
-+                    $this->_result = $result;
-+                    $this->_updateFreeMethodQuote($request);
-+                    return $this->getResult();
-+                }
-+            )
-+        );
-     }
- 
-     /**
-@@ -332,6 +363,14 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
-             $destCountry = self::GUAM_COUNTRY_ID;
-         }
- 
-+        // For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country
-+        if ($destCountry === 'ES' &&
-+            ($request->getDestRegionCode() === 'Las Palmas'
-+                || $request->getDestRegionCode() === 'Santa Cruz de Tenerife')
-+        ) {
-+            $destCountry = 'IC';
-+        }
-+
-         $country = $this->_countryFactory->create()->load($destCountry);
-         $rowRequest->setDestCountry($country->getData('iso2_code') ?: $destCountry);
- 
-@@ -446,7 +485,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
-     {
-         $rowRequest = $this->_rawRequest;
-         if (self::USA_COUNTRY_ID == $rowRequest->getDestCountry()) {
--            $destPostal = substr($rowRequest->getDestPostal(), 0, 5);
-+            $destPostal = substr((string)$rowRequest->getDestPostal(), 0, 5);
-         } else {
-             $destPostal = $rowRequest->getDestPostal();
-         }
-@@ -464,7 +503,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
-             '47_rate_chart' => $rowRequest->getPickup(),
-             '48_container' => $rowRequest->getContainer(),
-             '49_residential' => $rowRequest->getDestType(),
--            'weight_std' => strtolower($rowRequest->getUnitMeasure()),
-+            'weight_std' => strtolower((string)$rowRequest->getUnitMeasure()),
-         ];
-         $params['47_rate_chart'] = $params['47_rate_chart']['label'];
- 
-@@ -528,7 +567,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
-         $priceArr = [];
-         if (strlen(trim($response)) > 0) {
-             $rRows = explode("\n", $response);
--            $allowedMethods = explode(",", $this->getConfigData('allowed_methods'));
-+            $allowedMethods = explode(",", (string)$this->getConfigData('allowed_methods'));
-             foreach ($rRows as $rRow) {
-                 $row = explode('%', $rRow);
-                 switch (substr($row[0], -1)) {
-@@ -600,11 +639,10 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
- 
-         $this->setXMLAccessRequest();
-         $xmlRequest = $this->_xmlAccessRequest;
--        $debugData['accessRequest'] = $this->filterDebugData($xmlRequest);
- 
-         $rowRequest = $this->_rawRequest;
-         if (self::USA_COUNTRY_ID == $rowRequest->getDestCountry()) {
--            $destPostal = substr($rowRequest->getDestPostal(), 0, 5);
-+            $destPostal = substr((string)$rowRequest->getDestPostal(), 0, 5);
-         } else {
-             $destPostal = $rowRequest->getDestPostal();
-         }
-@@ -630,7 +668,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
-             $serviceCode = null;
-         } else {
-             $params['10_action'] = 'Rate';
--            $serviceCode = $rowRequest->getProduct() ? $rowRequest->getProduct() : '';
-+            $serviceCode = $rowRequest->getProduct() ? $rowRequest->getProduct() : null;
-         }
-         $serviceDescription = $serviceCode ? $this->getShipmentByCode($serviceCode) : '';
- 
-@@ -664,8 +702,8 @@ XMLRequest;
-       <Shipper>
- XMLRequest;
- 
--        if ($this->getConfigFlag('negotiated_active') && ($shipper = $this->getConfigData('shipper_number'))) {
--            $xmlParams .= "<ShipperNumber>{$shipper}</ShipperNumber>";
-+        if ($this->getConfigFlag('negotiated_active') && ($shipperNumber = $this->getConfigData('shipper_number'))) {
-+            $xmlParams .= "<ShipperNumber>{$shipperNumber}</ShipperNumber>";
-         }
- 
-         if ($rowRequest->getIsReturn()) {
-@@ -688,6 +726,7 @@ XMLRequest;
-           <StateProvinceCode>{$shipperStateProvince}</StateProvinceCode>
-       </Address>
-     </Shipper>
-+    
-     <ShipTo>
-       <Address>
-           <PostalCode>{$params['19_destPostal']}</PostalCode>
-@@ -703,8 +742,7 @@ XMLRequest;
-         $xmlParams .= <<<XMLRequest
-       </Address>
-     </ShipTo>
--
--
-+    
-     <ShipFrom>
-       <Address>
-           <PostalCode>{$params['15_origPostal']}</PostalCode>
-@@ -714,9 +752,13 @@ XMLRequest;
-     </ShipFrom>
- 
-     <Package>
--      <PackagingType><Code>{$params['48_container']}</Code></PackagingType>
-+      <PackagingType>
-+        <Code>{$params['48_container']}</Code>
-+      </PackagingType>
-       <PackageWeight>
--         <UnitOfMeasurement><Code>{$rowRequest->getUnitMeasure()}</Code></UnitOfMeasurement>
-+        <UnitOfMeasurement>
-+          <Code>{$rowRequest->getUnitMeasure()}</Code>
-+        </UnitOfMeasurement>
-         <Weight>{$params['23_weight']}</Weight>
-       </PackageWeight>
-     </Package>
-@@ -730,29 +772,30 @@ XMLRequest;
-         }
- 
-         $xmlParams .= <<<XMLRequest
--  </Shipment>
--</RatingServiceSelectionRequest>
-+      </Shipment>
-+    </RatingServiceSelectionRequest>
- XMLRequest;
- 
-         $xmlRequest .= $xmlParams;
- 
--        $xmlResponse = $this->_getCachedQuotes($xmlRequest);
--        if ($xmlResponse === null) {
--            $debugData['request'] = $xmlParams;
--            try {
--                $client = $this->httpClientFactory->create();
--                $client->post($url, $xmlRequest);
--                $xmlResponse = $client->getBody();
--                $debugData['result'] = $xmlResponse;
--                $this->_setCachedQuotes($xmlRequest, $xmlResponse);
--            } catch (\Throwable $e) {
--                $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
--                $xmlResponse = '';
--            }
--            $this->_debug($debugData);
--        }
-+        $httpResponse = $this->asyncHttpClient->request(
-+            new Request($url, Request::METHOD_POST, ['Content-Type' => 'application/xml'], $xmlRequest)
-+        );
- 
--        return $this->_parseXmlResponse($xmlResponse);
-+        return $this->deferredProxyFactory->createFor(
-+            Result::class,
-+            new CallbackDeferred(
-+                function () use ($httpResponse) {
-+                    if ($httpResponse->get()->getStatusCode() >= 400) {
-+                        $xmlResponse = '';
-+                    } else {
-+                        $xmlResponse = $httpResponse->get()->getBody();
-+                    }
-+
-+                    return $this->_parseXmlResponse($xmlResponse);
-+                }
-+            )
-+        );
-     }
- 
-     /**
-@@ -820,76 +863,15 @@ XMLRequest;
- 
-                 $allowedCurrencies = $this->_currencyFactory->create()->getConfigAllowCurrencies();
-                 foreach ($arr as $shipElement) {
--                    $code = (string)$shipElement->Service->Code;
--                    if (in_array($code, $allowedMethods)) {
--                        //The location of tax information is in a different place
--                        // depending on whether we are using negotiated rates or not
--                        if ($negotiatedActive) {
--                            $includeTaxesArr = $xml->getXpath(
--                                "//RatingServiceSelectionResponse/RatedShipment/NegotiatedRates"
--                                . "/NetSummaryCharges/TotalChargesWithTaxes"
--                            );
--                            $includeTaxesActive = $this->getConfigFlag('include_taxes') && !empty($includeTaxesArr);
--                            if ($includeTaxesActive) {
--                                $cost = $shipElement->NegotiatedRates
--                                    ->NetSummaryCharges
--                                    ->TotalChargesWithTaxes
--                                    ->MonetaryValue;
--
--                                $responseCurrencyCode = $this->mapCurrencyCode(
--                                    (string)$shipElement->NegotiatedRates
--                                        ->NetSummaryCharges
--                                        ->TotalChargesWithTaxes
--                                        ->CurrencyCode
--                                );
--                            } else {
--                                $cost = $shipElement->NegotiatedRates->NetSummaryCharges->GrandTotal->MonetaryValue;
--                                $responseCurrencyCode = $this->mapCurrencyCode(
--                                    (string)$shipElement->NegotiatedRates->NetSummaryCharges->GrandTotal->CurrencyCode
--                                );
--                            }
--                        } else {
--                            $includeTaxesArr = $xml->getXpath(
--                                "//RatingServiceSelectionResponse/RatedShipment/TotalChargesWithTaxes"
--                            );
--                            $includeTaxesActive = $this->getConfigFlag('include_taxes') && !empty($includeTaxesArr);
--                            if ($includeTaxesActive) {
--                                $cost = $shipElement->TotalChargesWithTaxes->MonetaryValue;
--                                $responseCurrencyCode = $this->mapCurrencyCode(
--                                    (string)$shipElement->TotalChargesWithTaxes->CurrencyCode
--                                );
--                            } else {
--                                $cost = $shipElement->TotalCharges->MonetaryValue;
--                                $responseCurrencyCode = $this->mapCurrencyCode(
--                                    (string)$shipElement->TotalCharges->CurrencyCode
--                                );
--                            }
--                        }
--
--                        //convert price with Origin country currency code to base currency code
--                        $successConversion = true;
--                        if ($responseCurrencyCode) {
--                            if (in_array($responseCurrencyCode, $allowedCurrencies)) {
--                                $cost = (double)$cost * $this->_getBaseCurrencyRate($responseCurrencyCode);
--                            } else {
--                                $errorTitle = __(
--                                    'We can\'t convert a rate from "%1-%2".',
--                                    $responseCurrencyCode,
--                                    $this->_request->getPackageCurrency()->getCode()
--                                );
--                                $error = $this->_rateErrorFactory->create();
--                                $error->setCarrier('ups');
--                                $error->setCarrierTitle($this->getConfigData('title'));
--                                $error->setErrorMessage($errorTitle);
--                                $successConversion = false;
--                            }
--                        }
--
--                        if ($successConversion) {
--                            $costArr[$code] = $cost;
--                            $priceArr[$code] = $this->getMethodPrice(floatval($cost), $code);
--                        }
--                    }
-+                    $this->processShippingRateForItem(
-+                        $shipElement,
-+                        $allowedMethods,
-+                        $allowedCurrencies,
-+                        $costArr,
-+                        $priceArr,
-+                        $negotiatedActive,
-+                        $xml
-+                    );
-                 }
-             } else {
-                 $arr = $xml->getXpath("//RatingServiceSelectionResponse/Response/Error/ErrorDescription/text()");
-@@ -907,10 +889,13 @@ XMLRequest;
-             $error = $this->_rateErrorFactory->create();
-             $error->setCarrier('ups');
-             $error->setCarrierTitle($this->getConfigData('title'));
-+            if ($this->getConfigData('specificerrmsg') !== '') {
-+                $errorTitle = $this->getConfigData('specificerrmsg');
-+            }
-             if (!isset($errorTitle)) {
-                 $errorTitle = __('Cannot retrieve shipping rates');
-             }
--            $error->setErrorMessage($this->getConfigData('specificerrmsg'));
-+            $error->setErrorMessage($errorTitle);
-             $result->append($error);
-         } else {
-             foreach ($priceArr as $method => $price) {
-@@ -929,6 +914,99 @@ XMLRequest;
-         return $result;
-     }
- 
-+    /**
-+     * Processing rate for ship element
-+     *
-+     * @param \Magento\Framework\Simplexml\Element $shipElement
-+     * @param array $allowedMethods
-+     * @param array $allowedCurrencies
-+     * @param array $costArr
-+     * @param array $priceArr
-+     * @param bool $negotiatedActive
-+     * @param \Magento\Framework\Simplexml\Config $xml
-+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-+     */
-+    private function processShippingRateForItem(
-+        \Magento\Framework\Simplexml\Element $shipElement,
-+        array $allowedMethods,
-+        array $allowedCurrencies,
-+        array &$costArr,
-+        array &$priceArr,
-+        bool $negotiatedActive,
-+        \Magento\Framework\Simplexml\Config $xml
-+    ): void {
-+        $code = (string)$shipElement->Service->Code;
-+        if (in_array($code, $allowedMethods)) {
-+            //The location of tax information is in a different place
-+            // depending on whether we are using negotiated rates or not
-+            if ($negotiatedActive) {
-+                $includeTaxesArr = $xml->getXpath(
-+                    "//RatingServiceSelectionResponse/RatedShipment/NegotiatedRates"
-+                    . "/NetSummaryCharges/TotalChargesWithTaxes"
-+                );
-+                $includeTaxesActive = $this->getConfigFlag('include_taxes') && !empty($includeTaxesArr);
-+                if ($includeTaxesActive) {
-+                    $cost = $shipElement->NegotiatedRates
-+                        ->NetSummaryCharges
-+                        ->TotalChargesWithTaxes
-+                        ->MonetaryValue;
-+
-+                    $responseCurrencyCode = $this->mapCurrencyCode(
-+                        (string)$shipElement->NegotiatedRates
-+                            ->NetSummaryCharges
-+                            ->TotalChargesWithTaxes
-+                            ->CurrencyCode
-+                    );
-+                } else {
-+                    $cost = $shipElement->NegotiatedRates->NetSummaryCharges->GrandTotal->MonetaryValue;
-+                    $responseCurrencyCode = $this->mapCurrencyCode(
-+                        (string)$shipElement->NegotiatedRates->NetSummaryCharges->GrandTotal->CurrencyCode
-+                    );
-+                }
-+            } else {
-+                $includeTaxesArr = $xml->getXpath(
-+                    "//RatingServiceSelectionResponse/RatedShipment/TotalChargesWithTaxes"
-+                );
-+                $includeTaxesActive = $this->getConfigFlag('include_taxes') && !empty($includeTaxesArr);
-+                if ($includeTaxesActive) {
-+                    $cost = $shipElement->TotalChargesWithTaxes->MonetaryValue;
-+                    $responseCurrencyCode = $this->mapCurrencyCode(
-+                        (string)$shipElement->TotalChargesWithTaxes->CurrencyCode
-+                    );
-+                } else {
-+                    $cost = $shipElement->TotalCharges->MonetaryValue;
-+                    $responseCurrencyCode = $this->mapCurrencyCode(
-+                        (string)$shipElement->TotalCharges->CurrencyCode
-+                    );
-+                }
-+            }
-+
-+            //convert price with Origin country currency code to base currency code
-+            $successConversion = true;
-+            if ($responseCurrencyCode) {
-+                if (in_array($responseCurrencyCode, $allowedCurrencies)) {
-+                    $cost = (double)$cost * $this->_getBaseCurrencyRate($responseCurrencyCode);
-+                } else {
-+                    $errorTitle = __(
-+                        'We can\'t convert a rate from "%1-%2".',
-+                        $responseCurrencyCode,
-+                        $this->_request->getPackageCurrency()->getCode()
-+                    );
-+                    $error = $this->_rateErrorFactory->create();
-+                    $error->setCarrier('ups');
-+                    $error->setCarrierTitle($this->getConfigData('title'));
-+                    $error->setErrorMessage($errorTitle);
-+                    $successConversion = false;
-+                }
-+            }
-+
-+            if ($successConversion) {
-+                $costArr[$code] = $cost;
-+                $priceArr[$code] = $this->getMethodPrice((float)$cost, $code);
-+            }
-+        }
-+    }
-+
-     /**
-      * Get tracking
-      *
-@@ -1012,33 +1090,41 @@ XMLAuth;
-     {
-         $url = $this->getConfigData('tracking_xml_url');
- 
-+        /** @var HttpResponseDeferredInterface[] $trackingResponses */
-+        $trackingResponses = [];
-         foreach ($trackings as $tracking) {
-             /**
--             * RequestOption==>'activity' or '1' to request all activities
-+             * RequestOption==>'1' to request all activities
-              */
-             $xmlRequest = <<<XMLAuth
- <?xml version="1.0" ?>
- <TrackRequest xml:lang="en-US">
-     <Request>
-         <RequestAction>Track</RequestAction>
--        <RequestOption>activity</RequestOption>
-+        <RequestOption>1</RequestOption>
-     </Request>
-     <TrackingNumber>$tracking</TrackingNumber>
-     <IncludeFreight>01</IncludeFreight>
- </TrackRequest>
- XMLAuth;
--            $debugData['request'] = $this->filterDebugData($this->_xmlAccessRequest) . $xmlRequest;
--            try {
--                $client = $this->httpClientFactory->create();
--                $client->post($url, $this->_xmlAccessRequest . $xmlRequest);
--                $xmlResponse = $client->getBody();
--                $debugData['result'] = $xmlResponse;
--            } catch (\Throwable $e) {
--                $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
-+
-+            $trackingResponses[] = $this->asyncHttpClient->request(
-+                new Request(
-+                    $url,
-+                    Request::METHOD_POST,
-+                    ['Content-Type' => 'application/xml'],
-+                    $this->_xmlAccessRequest . $xmlRequest
-+                )
-+            );
-+        }
-+        foreach ($trackingResponses as $response) {
-+            $httpResponse = $response->get();
-+            if ($httpResponse->getStatusCode() >= 400) {
-                 $xmlResponse = '';
-+            } else {
-+                $xmlResponse = $httpResponse->getBody();
-             }
- 
--            $this->_debug($debugData);
-             $this->_parseXmlTrackingResponse($tracking, $xmlResponse);
-         }
- 
-@@ -1085,54 +1171,7 @@ XMLAuth;
-                 if ($activityTags) {
-                     $index = 1;
-                     foreach ($activityTags as $activityTag) {
--                        $addArr = [];
--                        if (isset($activityTag->ActivityLocation->Address->City)) {
--                            $addArr[] = (string)$activityTag->ActivityLocation->Address->City;
--                        }
--                        if (isset($activityTag->ActivityLocation->Address->StateProvinceCode)) {
--                            $addArr[] = (string)$activityTag->ActivityLocation->Address->StateProvinceCode;
--                        }
--                        if (isset($activityTag->ActivityLocation->Address->CountryCode)) {
--                            $addArr[] = (string)$activityTag->ActivityLocation->Address->CountryCode;
--                        }
--                        $dateArr = [];
--                        $date = (string)$activityTag->Date;
--                        //YYYYMMDD
--                        $dateArr[] = substr($date, 0, 4);
--                        $dateArr[] = substr($date, 4, 2);
--                        $dateArr[] = substr($date, -2, 2);
--
--                        $timeArr = [];
--                        $time = (string)$activityTag->Time;
--                        //HHMMSS
--                        $timeArr[] = substr($time, 0, 2);
--                        $timeArr[] = substr($time, 2, 2);
--                        $timeArr[] = substr($time, -2, 2);
--
--                        if ($index === 1) {
--                            $resultArr['status'] = (string)$activityTag->Status->StatusType->Description;
--                            $resultArr['deliverydate'] = implode('-', $dateArr);
--                            //YYYY-MM-DD
--                            $resultArr['deliverytime'] = implode(':', $timeArr);
--                            //HH:MM:SS
--                            $resultArr['deliverylocation'] = (string)$activityTag->ActivityLocation->Description;
--                            $resultArr['signedby'] = (string)$activityTag->ActivityLocation->SignedForByName;
--                            if ($addArr) {
--                                $resultArr['deliveryto'] = implode(', ', $addArr);
--                            }
--                        } else {
--                            $tempArr = [];
--                            $tempArr['activity'] = (string)$activityTag->Status->StatusType->Description;
--                            $tempArr['deliverydate'] = implode('-', $dateArr);
--                            //YYYY-MM-DD
--                            $tempArr['deliverytime'] = implode(':', $timeArr);
--                            //HH:MM:SS
--                            if ($addArr) {
--                                $tempArr['deliverylocation'] = implode(', ', $addArr);
--                            }
--                            $packageProgress[] = $tempArr;
--                        }
--                        $index++;
-+                        $this->processActivityTagInfo($activityTag, $index, $resultArr, $packageProgress);
-                     }
-                     $resultArr['progressdetail'] = $packageProgress;
-                 }
-@@ -1165,6 +1204,70 @@ XMLAuth;
-         return $this->_result;
-     }
- 
-+    /**
-+     * Process tracking info from activity tag
-+     *
-+     * @param \Magento\Framework\Simplexml\Element $activityTag
-+     * @param int $index
-+     * @param array $resultArr
-+     * @param array $packageProgress
-+     */
-+    private function processActivityTagInfo(
-+        \Magento\Framework\Simplexml\Element $activityTag,
-+        int &$index,
-+        array &$resultArr,
-+        array &$packageProgress
-+    ) {
-+        $addressArr = [];
-+        if (isset($activityTag->ActivityLocation->Address->City)) {
-+            $addressArr[] = (string)$activityTag->ActivityLocation->Address->City;
-+        }
-+        if (isset($activityTag->ActivityLocation->Address->StateProvinceCode)) {
-+            $addressArr[] = (string)$activityTag->ActivityLocation->Address->StateProvinceCode;
-+        }
-+        if (isset($activityTag->ActivityLocation->Address->CountryCode)) {
-+            $addressArr[] = (string)$activityTag->ActivityLocation->Address->CountryCode;
-+        }
-+        $dateArr = [];
-+        $date = (string)$activityTag->Date;
-+        //YYYYMMDD
-+        $dateArr[] = substr($date, 0, 4);
-+        $dateArr[] = substr($date, 4, 2);
-+        $dateArr[] = substr($date, -2, 2);
-+
-+        $timeArr = [];
-+        $time = (string)$activityTag->Time;
-+        //HHMMSS
-+        $timeArr[] = substr($time, 0, 2);
-+        $timeArr[] = substr($time, 2, 2);
-+        $timeArr[] = substr($time, -2, 2);
-+
-+        if ($index === 1) {
-+            $resultArr['status'] = (string)$activityTag->Status->StatusType->Description;
-+            $resultArr['deliverydate'] = implode('-', $dateArr);
-+            //YYYY-MM-DD
-+            $resultArr['deliverytime'] = implode(':', $timeArr);
-+            //HH:MM:SS
-+            $resultArr['deliverylocation'] = (string)$activityTag->ActivityLocation->Description;
-+            $resultArr['signedby'] = (string)$activityTag->ActivityLocation->SignedForByName;
-+            if ($addressArr) {
-+                $resultArr['deliveryto'] = implode(', ', $addressArr);
-+            }
-+        } else {
-+            $tempArr = [];
-+            $tempArr['activity'] = (string)$activityTag->Status->StatusType->Description;
-+            $tempArr['deliverydate'] = implode('-', $dateArr);
-+            //YYYY-MM-DD
-+            $tempArr['deliverytime'] = implode(':', $timeArr);
-+            //HH:MM:SS
-+            if ($addressArr) {
-+                $tempArr['deliverylocation'] = implode(', ', $addressArr);
-+            }
-+            $packageProgress[] = $tempArr;
-+        }
-+        $index++;
-+    }
-+
-     /**
-      * Get tracking response
-      *
-@@ -1277,7 +1380,7 @@ XMLAuth;
-             $shipperPart->addChild('PhoneNumber', $request->getShipperContactPhoneNumber());
- 
-             $addressPart = $shipperPart->addChild('Address');
--            $addressPart->addChild('AddressLine1', $request->getShipperAddressStreet());
-+            $addressPart->addChild('AddressLine1', $request->getShipperAddressStreet1());
-             $addressPart->addChild('AddressLine2', $request->getShipperAddressStreet2());
-             $addressPart->addChild('City', $request->getShipperAddressCity());
-             $addressPart->addChild('CountryCode', $request->getShipperAddressCountryCode());
-@@ -1428,6 +1531,8 @@ XMLAuth;
-      *
-      * @param Element $shipmentConfirmResponse
-      * @return \Magento\Framework\DataObject
-+     * @deprecated New asynchronous methods introduced.
-+     * @see requestToShipment
-      */
-     protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
-     {
-@@ -1440,9 +1545,15 @@ XMLAuth;
-         $debugData = ['request' => $this->filterDebugData($this->_xmlAccessRequest) . $xmlRequest->asXML()];
- 
-         try {
--            $client = $this->httpClientFactory->create();
--            $client->post($this->getShipAcceptUrl(), $this->_xmlAccessRequest . $xmlRequest->asXML());
--            $xmlResponse = $client->getBody();
-+            $deferredResponse = $this->asyncHttpClient->request(
-+                new Request(
-+                    $this->getShipAcceptUrl(),
-+                    Request::METHOD_POST,
-+                    ['Content-Type' => 'application/xml'],
-+                    $this->_xmlAccessRequest . $xmlRequest->asXML()
-+                )
-+            );
-+            $xmlResponse = $deferredResponse->get()->getBody();
-             $debugData['result'] = $xmlResponse;
-             $this->_setCachedQuotes($xmlRequest, $xmlResponse);
-         } catch (\Throwable $e) {
-@@ -1463,6 +1574,7 @@ XMLAuth;
-             $shippingLabelContent = (string)$response->ShipmentResults->PackageResults->LabelImage->GraphicImage;
-             $trackingNumber = (string)$response->ShipmentResults->PackageResults->TrackingNumber;
- 
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             $result->setShippingLabelContent(base64_decode($shippingLabelContent));
-             $result->setTrackingNumber($trackingNumber);
-         }
-@@ -1488,13 +1600,127 @@ XMLAuth;
-         return $url;
-     }
- 
-+    /**
-+     * Request quotes for given packages.
-+     *
-+     * @param DataObject[] $packages
-+     * @return string[] Quote IDs.
-+     * @throws LocalizedException
-+     * @throws \RuntimeException
-+     */
-+    private function requestQuotes(array $packages): array
-+    {
-+        /** @var HttpResponseDeferredInterface[] $quotesRequests */
-+        $quotesRequests = [];
-+        //Getting quotes
-+        foreach ($packages as $package) {
-+            $this->_prepareShipmentRequest($package);
-+            $rawXmlRequest = $this->_formShipmentRequest($package);
-+            $this->setXMLAccessRequest();
-+            $xmlRequest = $this->_xmlAccessRequest . $rawXmlRequest;
-+            $quotesRequests[] = $this->asyncHttpClient->request(
-+                new Request(
-+                    $this->getShipConfirmUrl(),
-+                    Request::METHOD_POST,
-+                    ['Content-Type' => 'application/xml'],
-+                    $xmlRequest
-+                )
-+            );
-+        }
-+        $ids = [];
-+        //Processing quote responses
-+        foreach ($quotesRequests as $quotesRequest) {
-+            $httpResponse = $quotesRequest->get();
-+            if ($httpResponse->getStatusCode() >= 400) {
-+                throw new LocalizedException(__('Failed to get the quote'));
-+            }
-+            try {
-+                /** @var Element $response */
-+                $response = $this->_xmlElFactory->create(['data' => $httpResponse->getBody()]);
-+            } catch (\Throwable $e) {
-+                throw new \RuntimeException($e->getMessage());
-+            }
-+            if (isset($response->Response->Error)
-+                && in_array($response->Response->Error->ErrorSeverity, ['Hard', 'Transient'])
-+            ) {
-+                throw new \RuntimeException((string)$response->Response->Error->ErrorDescription);
-+            }
-+
-+            $ids[] = $response->ShipmentDigest;
-+        }
-+
-+        return $ids;
-+    }
-+
-+    /**
-+     * Request UPS to ship items based on quotes.
-+     *
-+     * @param string[] $quoteIds
-+     * @return DataObject[]
-+     * @throws LocalizedException
-+     * @throws \RuntimeException
-+     */
-+    private function requestShipments(array $quoteIds): array
-+    {
-+        /** @var HttpResponseDeferredInterface[] $shippingRequests */
-+        $shippingRequests = [];
-+        foreach ($quoteIds as $quoteId) {
-+            /** @var Element $xmlRequest */
-+            $xmlRequest = $this->_xmlElFactory->create(
-+                ['data' => '<?xml version = "1.0" ?><ShipmentAcceptRequest/>']
-+            );
-+            $request = $xmlRequest->addChild('Request');
-+            $request->addChild('RequestAction', 'ShipAccept');
-+            $xmlRequest->addChild('ShipmentDigest', $quoteId);
-+
-+            $shippingRequests[] = $this->asyncHttpClient->request(
-+                new Request(
-+                    $this->getShipAcceptUrl(),
-+                    Request::METHOD_POST,
-+                    ['Content-Type' => 'application/xml'],
-+                    $this->_xmlAccessRequest . $xmlRequest->asXml()
-+                )
-+            );
-+        }
-+        //Processing shipment requests
-+        /** @var DataObject[] $results */
-+        $results = [];
-+        foreach ($shippingRequests as $shippingRequest) {
-+            $result = new DataObject();
-+            $httpResponse = $shippingRequest->get();
-+            if ($httpResponse->getStatusCode() >= 400) {
-+                throw new LocalizedException(__('Failed to send the package'));
-+            }
-+            try {
-+                /** @var Element $response */
-+                $response = $this->_xmlElFactory->create(['data' => $httpResponse->getBody()]);
-+            } catch (\Throwable $e) {
-+                throw new \RuntimeException($e->getMessage());
-+            }
-+            if (isset($response->Error)) {
-+                throw new \RuntimeException((string)$response->Error->ErrorDescription);
-+            } else {
-+                $shippingLabelContent = (string)$response->ShipmentResults->PackageResults->LabelImage->GraphicImage;
-+                $trackingNumber = (string)$response->ShipmentResults->PackageResults->TrackingNumber;
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+                $result->setLabelContent(base64_decode($shippingLabelContent));
-+                $result->setTrackingNumber($trackingNumber);
-+            }
-+            $results[] = $result;
-+        }
-+
-+        return $results;
-+    }
-+
-     /**
-      * Do shipment request to carrier web service, obtain Print Shipping Labels and process errors in response
-      *
--     * @param \Magento\Framework\DataObject $request
--     * @return \Magento\Framework\DataObject
-+     * @param DataObject $request
-+     * @return DataObject
-+     * @deprecated New asynchronous methods introduced.
-+     * @see requestToShipment
-      */
--    protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
-+    protected function _doShipmentRequest(DataObject $request)
-     {
-         $this->_prepareShipmentRequest($request);
-         $result = new \Magento\Framework\DataObject();
-@@ -1506,10 +1732,16 @@ XMLAuth;
-         if ($xmlResponse === null) {
-             $debugData['request'] = $this->filterDebugData($this->_xmlAccessRequest) . $rawXmlRequest;
-             $url = $this->getShipConfirmUrl();
--            $client = $this->httpClientFactory->create();
-             try {
--                $client->post($url, $xmlRequest);
--                $xmlResponse = $client->getBody();
-+                $deferredResponse = $this->asyncHttpClient->request(
-+                    new Request(
-+                        $url,
-+                        Request::METHOD_POST,
-+                        ['Content-Type' => 'application/xml'],
-+                        $xmlRequest
-+                    )
-+                );
-+                $xmlResponse = $deferredResponse->get()->getBody();
-                 $debugData['result'] = $xmlResponse;
-                 $this->_setCachedQuotes($xmlRequest, $xmlResponse);
-             } catch (\Throwable $e) {
-@@ -1562,6 +1794,54 @@ XMLAuth;
-         return $url;
-     }
- 
-+    /**
-+     * @inheritDoc
-+     */
-+    public function requestToShipment($request)
-+    {
-+        $packages = $request->getPackages();
-+        if (!is_array($packages) || !$packages) {
-+            throw new LocalizedException(__('No packages for request'));
-+        }
-+        if ($request->getStoreId() != null) {
-+            $this->setStore($request->getStoreId());
-+        }
-+        /** @var Shipment[] $packageRequests */
-+        $packageRequests = [];
-+        //Preparing packages info.
-+        foreach ($packages as $packageId => $package) {
-+            $request->setPackageId($packageId);
-+            $request->setPackagingType($package['params']['container']);
-+            $request->setPackageWeight($package['params']['weight']);
-+            $request->setPackageParams(new DataObject($package['params']));
-+            $request->setPackageItems($package['items']);
-+            $packageRequests[] = clone $request;
-+        }
-+
-+        // phpcs:disable
-+        try {
-+            $quoteIds = $this->requestQuotes($packageRequests);
-+            $labels = $this->requestShipments($quoteIds);
-+        } catch (LocalizedException $exception) {
-+            return new DataObject(['errors' => [$exception->getMessage()]]);
-+        } catch (\RuntimeException $exception) {
-+            return new DataObject(['errors' => __('Failed to send items')]);
-+        }
-+        // phpcs:enable
-+
-+        return new DataObject(['info' => $labels]);
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function returnOfShipment($request)
-+    {
-+        $request->setIsReturn(true);
-+
-+        return $this->requestToShipment($request);
-+    }
-+
-     /**
-      * Return container types of carrier
-      *
-@@ -1693,6 +1973,7 @@ XMLAuth;
- 
-     /**
-      * Get delivery confirmation level based on origin/destination
-+     *
-      * Return null if delivery confirmation is not acceptable
-      *
-      * @param string|null $countyDestination
-diff --git a/app/code/Magento/Ups/Test/Mftf/Data/ShippingMethodsData.xml b/app/code/Magento/Ups/Test/Mftf/Data/ShippingMethodsData.xml
-new file mode 100644
-index 00000000000..d4156d4f335
---- /dev/null
-+++ b/app/code/Magento/Ups/Test/Mftf/Data/ShippingMethodsData.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="ShippingMethodsUpsTypeSetDefault" type="shipping_methods_ups_type_config">
-+        <requiredEntity type="ups_type_inherit">ShippingMethodsUpsTypeDefault</requiredEntity>
-+    </entity>
-+    <entity name="ShippingMethodsUpsTypeDefault" type="ups_type_inherit">
-+        <data key="inherit">true</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Ups/Test/Mftf/Metadata/shipping_methods_ups_type_config-meta.xml b/app/code/Magento/Ups/Test/Mftf/Metadata/shipping_methods_ups_type_config-meta.xml
-new file mode 100644
-index 00000000000..d642b792328
---- /dev/null
-+++ b/app/code/Magento/Ups/Test/Mftf/Metadata/shipping_methods_ups_type_config-meta.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="ShippingMethodsUpsTypeConfig" dataType="shipping_methods_ups_type_config" type="create" auth="adminFormKey" url="admin/system_config/save/section/carriers/" method="POST">
-+        <object key="groups" dataType="shipping_methods_ups_type_config">
-+            <object key="ups" dataType="shipping_methods_ups_type_config">
-+                <object key="fields" dataType="shipping_methods_ups_type_config">
-+                    <object key="type" dataType="ups_type_inherit">
-+                        <field key="inherit">boolean</field>
-+                    </object>
-+                </object>
-+            </object>
-+        </object>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/Ups/Test/Mftf/Page/AdminShippingMethodsConfigPage.xml b/app/code/Magento/Ups/Test/Mftf/Page/AdminShippingMethodsConfigPage.xml
-new file mode 100644
-index 00000000000..ebc44aace6d
---- /dev/null
-+++ b/app/code/Magento/Ups/Test/Mftf/Page/AdminShippingMethodsConfigPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminShippingMethodsConfigPage" url="admin/system_config/edit/section/carriers/" area="admin" module="Magento_Ups">
-+        <section name="AdminShippingMethodsUpsSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Ups/Test/Mftf/Section/AdminShippingMethodsUpsSection.xml b/app/code/Magento/Ups/Test/Mftf/Section/AdminShippingMethodsUpsSection.xml
-new file mode 100644
-index 00000000000..4107f17dbc1
---- /dev/null
-+++ b/app/code/Magento/Ups/Test/Mftf/Section/AdminShippingMethodsUpsSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminShippingMethodsUpsSection">
-+        <element name="carriersUpsTab" type="button" selector="#carriers_ups-head"/>
-+        <element name="carriersUpsType" type="select" selector="#carriers_ups_type"/>
-+        <element name="selectedUpsType" type="text" selector="#carriers_ups_type option[selected]"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Ups/Test/Mftf/Test/DefaultConfigForUPSTypeTest.xml b/app/code/Magento/Ups/Test/Mftf/Test/DefaultConfigForUPSTypeTest.xml
-new file mode 100644
-index 00000000000..9caa32609c4
---- /dev/null
-+++ b/app/code/Magento/Ups/Test/Mftf/Test/DefaultConfigForUPSTypeTest.xml
-@@ -0,0 +1,47 @@
-+<?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="DefaultConfigForUPSTypeTest">
-+        <annotations>
-+            <features value="Ups"/>
-+            <stories value="UPS configuration"/>
-+            <title value="Default Configuration for UPS Type"/>
-+            <stories value="UPS"/>
-+            <description value="Default Configuration for UPS Type"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-99012"/>
-+            <useCaseId value="MAGETWO-98947"/>
-+            <group value="ups"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <!--Collapse UPS tab and logout-->
-+            <comment userInput="Collapse UPS tab and logout" stepKey="collapseTabAndLogout"/>
-+            <click selector="{{AdminShippingMethodsUpsSection.carriersUpsTab}}" stepKey="collapseTab"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <!-- Set shipping methods UPS type to default -->
-+        <comment userInput="Set shipping methods UPS type to default" stepKey="setToDefaultShippingMethodsUpsType"/>
-+        <createData entity="ShippingMethodsUpsTypeSetDefault" stepKey="setShippingMethodsUpsTypeToDefault"/>
-+        <!-- Navigate to Stores -> Configuration -> Sales -> Shipping Methods Page -->
-+        <comment userInput="Navigate to Stores -> Configuration -> Sales -> Shipping Methods Page" stepKey="goToAdminShippingMethodsPage"/>
-+        <amOnPage url="{{AdminShippingMethodsConfigPage.url}}" stepKey="navigateToAdminShippingMethodsPage"/>
-+        <waitForPageLoad stepKey="waitPageToLoad"/>
-+        <!-- Expand 'UPS' tab -->
-+        <comment userInput="Expand UPS tab" stepKey="expandUpsTab"/>
-+        <conditionalClick selector="{{AdminShippingMethodsUpsSection.carriersUpsTab}}" dependentSelector="{{AdminShippingMethodsUpsSection.carriersUpsType}}" visible="false" stepKey="expandTab"/>
-+        <waitForElementVisible selector="{{AdminShippingMethodsUpsSection.carriersUpsType}}" stepKey="waitTabToExpand"/>
-+        <!-- Assert that selected UPS type by default is 'United Parcel Service XML' -->
-+        <comment userInput="Check that selected UPS type by default is 'United Parcel Service XML'" stepKey="assertDefUpsType"/>
-+        <grabTextFrom selector="{{AdminShippingMethodsUpsSection.selectedUpsType}}" stepKey="grabSelectedOptionText"/>
-+        <assertEquals expected='United Parcel Service XML' expectedType="string" actual="($grabSelectedOptionText)" stepKey="assertDefaultUpsType"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Ups/Test/Unit/Model/CarrierCollectRatesOptionsTest.php b/app/code/Magento/Ups/Test/Unit/Model/CarrierCollectRatesOptionsTest.php
-deleted file mode 100644
-index 28717cbe87a..00000000000
---- a/app/code/Magento/Ups/Test/Unit/Model/CarrierCollectRatesOptionsTest.php
-+++ /dev/null
-@@ -1,341 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\Ups\Test\Unit\Model;
--
--use PHPUnit_Framework_MockObject_MockObject as MockObject;
--use Magento\Ups\Model\Carrier;
--use Magento\Framework\App\Config\ScopeConfigInterface;
--use Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory as RateResultErrorFactory;
--use Psr\Log\LoggerInterface;
--use Magento\Framework\Xml\Security;
--use Magento\Shipping\Model\Simplexml\ElementFactory;
--use Magento\Shipping\Model\Rate\ResultFactory as RateResultFactory;
--use Magento\Quote\Model\Quote\Address\RateResult\MethodFactory;
--use Magento\Quote\Model\Quote\Address\RateResult\Method;
--use Magento\Shipping\Model\Rate\Result as RateResult;
--use Magento\Framework\Pricing\PriceCurrencyInterface;
--use Magento\Shipping\Model\Tracking\ResultFactory as TrackResultFactory;
--use Magento\Shipping\Model\Tracking\Result\ErrorFactory as TrackingResultErrorFactory;
--use Magento\Shipping\Model\Tracking\Result\StatusFactory;
--use Magento\Directory\Model\RegionFactory;
--use Magento\Directory\Model\Country;
--use Magento\Directory\Model\CountryFactory;
--use Magento\Directory\Model\CurrencyFactory;
--use Magento\Directory\Model\Currency;
--use Magento\Directory\Helper\Data;
--use Magento\CatalogInventory\Model\StockRegistry;
--use Magento\Framework\Locale\FormatInterface;
--use Magento\Ups\Helper\Config;
--use Magento\Quote\Model\Quote\Address\RateRequest;
--use Magento\Framework\HTTP\ClientFactory;
--use Magento\Framework\HTTP\ClientInterface;
--
--/**
-- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-- */
--class CarrierCollectRatesOptionsTest extends \PHPUnit\Framework\TestCase
--{
--
--    /**
--     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
--     */
--    private $objectManager;
--
--    /**
--     * @var \Magento\Quote\Model\Quote\Address\RateRequest;
--     */
--    private $rateRequest;
--
--    /**
--     * @var string;
--     */
--    private $allowed_methods;
--
--    /**
--     * @var int;
--     */
--    private $negotiatedactive;
--
--    /**
--     * @var int;
--     */
--    private $include_taxes;
--
--    /**
--     * @var ClientInterface|MockObject
--     */
--    private $httpClient;
--
--    /**
--     * set up test environment
--     *
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    protected function setUp()
--    {
--        
--        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--        
--        $scopeMock = $this->getMockBuilder(ScopeConfigInterface::class)
--                    ->disableOriginalConstructor()
--                    ->getMock();
--
--        $scopeMock->expects($this->any())
--           ->method('getValue')
--           ->willReturnCallback([$this, 'scopeConfigGetValue']);
--        $scopeMock->expects($this->any())
--           ->method('isSetFlag')
--           ->willReturnCallback([$this, 'scopeConfigisSetFlag']);
--
--        $errorFactoryMock = $this->getMockBuilder(RateResultErrorFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $loggerInterfaceMock = $this->getMockBuilder(LoggerInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $securityMock = $this->getMockBuilder(Security::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $elementFactoryMock = $this->getMockBuilder(ElementFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $rateResultMock = $this->getMockBuilder(RateResult::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getError'])
--            ->getMock();
--
--        $rateFactoryMock = $this->getMockBuilder(RateResultFactory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--
--        $rateFactoryMock->expects($this->any())
--            ->method('create')
--            ->willReturn($rateResultMock);
--
--        $httpClientFactory = $this->getMockBuilder(ClientFactory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--        $this->httpClient = $this->getMockForAbstractClass(ClientInterface::class);
--        $httpClientFactory->method('create')
--            ->willReturn($this->httpClient);
--
--        $priceInterfaceMock = $this->getMockBuilder(PriceCurrencyInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        
--        $rateMethodMock = $this->getMockBuilder(Method::class)
--            ->setConstructorArgs(['priceCurrency' => $priceInterfaceMock])
--            ->setMethods(null)
--            ->getMock();
--
--        $methodFactoryMock = $this->getMockBuilder(MethodFactory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--
--        $methodFactoryMock->expects($this->any())
--            ->method('create')
--            ->willReturn($rateMethodMock);
--
--        $resultFactoryMock = $this->getMockBuilder(TrackResultFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $trErrorFactoryMock = $this->getMockBuilder(TrackingResultErrorFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $statusFactoryMock = $this->getMockBuilder(StatusFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $regionFactoryMock = $this->getMockBuilder(RegionFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $countryMock = $this->getMockBuilder(Country::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['load', 'getData'])
--            ->getMock();
--            
--        $countryMock->expects($this->any())
--            ->method('load')
--            ->willReturnSelf();
--            
--        $countryFactoryMock = $this->getMockBuilder(CountryFactory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--            
--        $countryFactoryMock->expects($this->any())
--            ->method('create')
--            ->willReturn($countryMock);
--
--        $allowCurrencies = ['GBP'];
--        $baseCurrencies = ['GBP'];
--        $currencyRates = ['GBP' => ['GBP' => 1]];
--        $currencyFactoryMock = $this->getMockBuilder(CurrencyFactory::class)
--             ->disableOriginalConstructor()
--             ->setMethods(['create'])
--             ->getMock();
--        $currencyMock = $this->getMockBuilder(Currency::class)
--             ->disableOriginalConstructor()
--             ->setMethods(['getConfigAllowCurrencies', 'getConfigBaseCurrencies', 'getCurrencyRates'])
--             ->getMock();
--        $currencyFactoryMock->expects($this->once())
--             ->method('create')
--             ->willReturn($currencyMock);
--        $currencyMock->expects($this->any())
--             ->method('getConfigAllowCurrencies')
--             ->willReturn($allowCurrencies);
--        $currencyMock->expects($this->any())
--             ->method('getConfigBaseCurrencies')
--             ->willReturn($baseCurrencies);
--        $currencyMock->expects($this->any())
--             ->method('getCurrencyRates')
--             ->with($baseCurrencies, $allowCurrencies)
--             ->willReturn($currencyRates);
--
--        $dataMock = $this->getMockBuilder(Data::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $stockRegistryMock = $this->getMockBuilder(StockRegistry::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--            
--        $formatInterfaceMock = $this->getMockBuilder(FormatInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $configHelperMock = $this->getMockBuilder(Config::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->model = $this->getMockBuilder(Carrier::class)
--            ->setMethods(['_getCachedQuotes', 'canCollectRates', '_updateFreeMethodQuote', '_getBaseCurrencyRate'])
--            ->setConstructorArgs(
--                [
--                    'scopeConfig' => $scopeMock,
--                    'rateErrorFactory' => $errorFactoryMock,
--                    'logger' => $loggerInterfaceMock,
--                    'xmlSecurity' => $securityMock,
--                    'xmlElFactory' => $elementFactoryMock,
--                    'rateFactory' => $rateFactoryMock,
--                    'rateMethodFactory' => $methodFactoryMock,
--                    'trackFactory' => $resultFactoryMock,
--                    'trackErrorFactory' => $trErrorFactoryMock,
--                    'trackStatusFactory' => $statusFactoryMock,
--                    'regionFactory' => $regionFactoryMock,
--                    'countryFactory' => $countryFactoryMock,
--                    'currencyFactory' => $currencyFactoryMock,
--                    'directoryData' => $dataMock,
--                    'stockRegistry' => $stockRegistryMock,
--                    'localeFormat' => $formatInterfaceMock,
--                    'configHelper' => $configHelperMock,
--                    'httpClientFactory' => $httpClientFactory,
--                    'data' => [],
--                ]
--            )
--            ->getMock();
--        
--        $this->model->expects($this->any())
--             ->method('canCollectRates')
--             ->willReturn(true);
--             
--        $this->model->expects($this->any())
--             ->method('_getBaseCurrencyRate')
--             ->willReturn(1.00);
--
--        $this->rateRequest = $this->objectManager->getObject(RateRequest::class);
--    }
--
--    /**
--     * Callback function, emulates getValue function
--     * @param $path
--     * @return null|string
--     */
--    public function scopeConfigGetValue($path)
--    {
--        $pathMap = [
--            'carriers/ups/type' => 'UPS_XML',
--            'carriers/ups/shipper_number' => '12345',
--            'carriers/ups/allowed_methods' => $this->allowed_methods,
--        ];
--
--        return isset($pathMap[$path]) ? $pathMap[$path] : null;
--    }
--
--    /**
--     * Callback function, emulates isSetFlag function
--     * @param $path
--     * @return bool
--     */
--    public function scopeConfigisSetFlag($path)
--    {
--        $pathMap = [
--            'carriers/ups/negotiated_active' => $this->negotiatedactive,
--            'carriers/ups/include_taxes' => $this->include_taxes,
--        ];
--       
--        if (isset($pathMap[$path])) {
--            if ($pathMap[$path]) {
--                 return(true);
--            }
--        }
--        return(false);
--    }
--    
--    /**
--     * @param int $neg
--     * @param int $tax
--     * @param string $file
--     * @param string $method
--     * @param float $expectedprice
--     * @dataProvider collectRatesDataProvider
--     */
--    public function testCollectRates($neg, $tax, $file, $method, $expectedprice)
--    {
--        $this->negotiatedactive = $neg;
--        $this->include_taxes = $tax;
--        $this->allowed_methods = $method;
--
--        $response = file_get_contents(__DIR__ . $file);
--        $this->model->expects($this->any())
--             ->method('_getCachedQuotes')
--             ->willReturn($response);
--  
--        $rates = $this->model->collectRates($this->rateRequest)->getAllRates();
--        $this->assertEquals($expectedprice, $rates[0]->getData('cost'));
--        $this->assertEquals($method, $rates[0]->getData('method'));
--    }
--
--    /**
--     * Get list of rates variations
--     * @return array
--     */
--    public function collectRatesDataProvider()
--    {
--        return [
--            [0, 0, '/_files/ups_rates_response_option1.xml', '11', 6.45 ],
--            [0, 0, '/_files/ups_rates_response_option2.xml', '65', 29.59 ],
--            [0, 1, '/_files/ups_rates_response_option3.xml', '11', 7.74 ],
--            [0, 1, '/_files/ups_rates_response_option4.xml', '65', 29.59 ],
--            [1, 0, '/_files/ups_rates_response_option5.xml', '11', 9.35 ],
--            [1, 0, '/_files/ups_rates_response_option6.xml', '65', 41.61 ],
--            [1, 1, '/_files/ups_rates_response_option7.xml', '11', 11.22 ],
--            [1, 1, '/_files/ups_rates_response_option8.xml', '65', 41.61 ],
--        ];
--    }
--}
-diff --git a/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php
-index d98ce3f406e..0d33087a0f3 100644
---- a/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php
-+++ b/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php
-@@ -260,17 +260,6 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($this->error, $this->model->collectRates($request));
-     }
- 
--    public function testCollectRatesFail()
--    {
--        $this->scope->method('isSetFlag')
--            ->willReturn(true);
--
--        $request = new RateRequest();
--        $request->setPackageWeight(1);
--
--        $this->assertSame($this->rate, $this->model->collectRates($request));
--    }
--
-     /**
-      * @param string $data
-      * @param array $maskFields
-@@ -350,13 +339,15 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-     {
-         /** @var RateRequest $request */
-         $request = $this->helper->getObject(RateRequest::class);
--        $request->setData([
--            'orig_country' => 'USA',
--            'orig_region_code' => 'CA',
--            'orig_post_code' => 90230,
--            'orig_city' => 'Culver City',
--            'dest_country_id' => $countryCode,
--        ]);
-+        $request->setData(
-+            [
-+                'orig_country' => 'USA',
-+                'orig_region_code' => 'CA',
-+                'orig_post_code' => 90230,
-+                'orig_city' => 'Culver City',
-+                'dest_country_id' => $countryCode,
-+            ]
-+        );
- 
-         $this->country->expects($this->at(1))
-             ->method('load')
-@@ -382,34 +373,6 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
--    /**
--     * Checks a case when UPS processes request to create shipment.
--     *
--     * @return void
--     */
--    public function testRequestToShipment()
--    {
--        // the same tracking number is specified in the fixtures XML file.
--        $trackingNumber = '1Z207W886698856557';
--        $packages = $this->getPackages();
--        $request = new DataObject(['packages' => $packages]);
--        $shipmentResponse = simplexml_load_file(__DIR__ . '/../Fixtures/ShipmentConfirmResponse.xml');
--        $acceptResponse = simplexml_load_file(__DIR__ . '/../Fixtures/ShipmentAcceptResponse.xml');
--
--        $this->httpClient->method('getBody')
--            ->willReturnOnConsecutiveCalls($shipmentResponse->asXML(), $acceptResponse->asXML());
--
--        $this->logger->expects($this->atLeastOnce())
--            ->method('debug')
--            ->with($this->stringContains('<UserId>****</UserId>'));
--
--        $result = $this->model->requestToShipment($request);
--        $this->assertEmpty($result->getErrors());
--
--        $info = $result->getInfo()[0];
--        $this->assertEquals($trackingNumber, $info['tracking_number'], 'Tracking Number must match.');
--    }
--
-     /**
-      * Creates mock for XML factory.
-      *
-@@ -436,34 +399,6 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-         return $xmlElFactory;
-     }
- 
--    /**
--     * @return array
--     */
--    private function getPackages(): array
--    {
--        $packages = [
--            'package' => [
--                'params' => [
--                    'width' => '3',
--                    'length' => '3',
--                    'height' => '3',
--                    'dimension_units' => 'INCH',
--                    'weight_units' => 'POUND',
--                    'weight' => '0.454000000001',
--                    'customs_value' => '10.00',
--                    'container' => 'Small Express Box',
--                ],
--                'items' => [
--                    'item1' => [
--                        'name' => 'item_name',
--                    ],
--                ],
--            ],
--        ];
--
--        return $packages;
--    }
--
-     /**
-      * Creates mocks for http client factory and client.
-      *
-diff --git a/app/code/Magento/Ups/etc/adminhtml/system.xml b/app/code/Magento/Ups/etc/adminhtml/system.xml
-index f427c596012..8b9dc30a018 100644
---- a/app/code/Magento/Ups/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Ups/etc/adminhtml/system.xml
-@@ -13,6 +13,9 @@
-                 <field id="access_license_number" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
-                     <label>Access License Number</label>
-                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-+                    <depends>
-+                        <field id="carriers/ups/active">1</field>
-+                    </depends>
-                 </field>
-                 <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Enabled for Checkout</label>
-@@ -84,6 +87,9 @@
-                 <field id="password" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
-                     <label>Password</label>
-                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-+                    <depends>
-+                        <field id="carriers/ups/active">1</field>
-+                    </depends>
-                 </field>
-                 <field id="pickup" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Pickup Method</label>
-@@ -113,6 +119,9 @@
-                 <field id="username" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
-                     <label>User ID</label>
-                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-+                    <depends>
-+                        <field id="carriers/ups/active">1</field>
-+                    </depends>
-                 </field>
-                 <field id="negotiated_active" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Enable Negotiated Rates</label>
-diff --git a/app/code/Magento/Ups/etc/config.xml b/app/code/Magento/Ups/etc/config.xml
-index 0f92ae4dad1..73b10dd5ff4 100644
---- a/app/code/Magento/Ups/etc/config.xml
-+++ b/app/code/Magento/Ups/etc/config.xml
-@@ -19,13 +19,13 @@
-                 <cutoff_cost />
-                 <dest_type>RES</dest_type>
-                 <free_method>GND</free_method>
--                <gateway_url>http://www.ups.com/using/services/rave/qcostcgi.cgi</gateway_url>
-+                <gateway_url>https://www.ups.com/using/services/rave/qcostcgi.cgi</gateway_url>
-                 <gateway_xml_url>https://onlinetools.ups.com/ups.app/xml/Rate</gateway_xml_url>
-                 <handling>0</handling>
-                 <model>Magento\Ups\Model\Carrier</model>
-                 <pickup>CC</pickup>
-                 <title>United Parcel Service</title>
--                <tracking_xml_url>https://www.ups.com/ups.app/xml/Track</tracking_xml_url>
-+                <tracking_xml_url>https://onlinetools.ups.com/ups.app/xml/Track</tracking_xml_url>
-                 <unit_of_measure>LBS</unit_of_measure>
-                 <username backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-                 <password backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-@@ -37,7 +37,7 @@
-                 <negotiated_active>0</negotiated_active>
-                 <include_taxes>0</include_taxes>
-                 <mode_xml>1</mode_xml>
--                <type>UPS</type>
-+                <type>UPS_XML</type>
-                 <is_account_live>0</is_account_live>
-                 <active_rma>0</active_rma>
-                 <is_online>1</is_online>
-diff --git a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
-index 411bec20cde..9a270372966 100644
---- a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
-+++ b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var $upsModel \Magento\Ups\Helper\Config */
- /** @var $block \Magento\Ups\Block\Backend\System\CarrierConfig */
- $upsCarrierConfig = $block->getCarrierConfig();
-@@ -87,7 +85,7 @@ require(["prototype"], function(){
-             this.storedOriginShipment = '<?= /* @noEscape */ $storedOriginShipment ?>';
-             this.storedFreeShipment = '<?= /* @noEscape */ $storedFreeShipment ?>';
-             this.storedUpsType = '<?= /* @noEscape */ $storedUpsType ?>';
--            <?php /** @var $jsonHelper \Magento\Framework\Json\Helper\Data */ $jsonHelper = $this->helper('Magento\Framework\Json\Helper\Data'); ?>
-+            <?php /** @var $jsonHelper \Magento\Framework\Json\Helper\Data */ $jsonHelper = $this->helper(\Magento\Framework\Json\Helper\Data::class); ?>
-             this.storedAllowedMethods = <?= /* @noEscape */ $jsonHelper->jsonEncode($storedAllowedMethods) ?>;
-             this.originShipmentObj = <?= /* @noEscape */ $jsonHelper->jsonEncode($orShipArr) ?>;
-             this.originShipmentObj['default'] = <?= /* @noEscape */ $jsonHelper->jsonEncode($defShipArr) ?>;
-diff --git a/app/code/Magento/UrlRewrite/Block/Edit.php b/app/code/Magento/UrlRewrite/Block/Edit.php
-index 115c5db43a7..c8716f6c80f 100644
---- a/app/code/Magento/UrlRewrite/Block/Edit.php
-+++ b/app/code/Magento/UrlRewrite/Block/Edit.php
-@@ -173,7 +173,7 @@ class Edit extends \Magento\Backend\Block\Widget\Container
-                             ['id' => $this->getUrlRewrite()->getId()]
-                         )
-                     )
--                    . ')',
-+                    . ', {data: {}})',
-                 'class' => 'scalable delete',
-                 'level' => -1
-             ]
-@@ -243,7 +243,7 @@ class Edit extends \Magento\Backend\Block\Widget\Container
-      * Since buttons are set as children, we remove them as children after generating them
-      * not to duplicate them in future
-      *
--     * @param string $area
-+     * @param string|null $area
-      * @return string
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php
-index 480efa82357..7240dfc36f1 100644
---- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php
-+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php
-@@ -6,7 +6,11 @@
-  */
- namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
- 
--class CmsPageGrid extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+use Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite as RewriteAction;
-+
-+class CmsPageGrid extends RewriteAction implements HttpPostActionInterface, HttpGetActionInterface
- {
-     /**
-      * Ajax CMS pages grid action
-diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php
-index f8f7b145e28..dc49776a1ac 100644
---- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php
-+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
- 
--class Delete extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+
-+class Delete extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpPostActionInterface
- {
-     /**
-      * URL rewrite delete action
-diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php
-index b7ff9221300..e2161f4ffd9 100644
---- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php
-+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
- 
--class Edit extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Edit extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpGetActionInterface
- {
-     /**#@+
-      * Modes
-diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php
-index 066377ff7bd..4f3a1e7849e 100644
---- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php
-+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
- 
--class Index extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpGetActionInterface
- {
-     /**
-      * Show URL rewrites index page
-diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php
-index 6325fe162d9..c508e85d87c 100644
---- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php
-+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php
-@@ -7,11 +7,12 @@
- 
- namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\UrlRewrite\Model\UrlFinderInterface;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
- 
--class Save extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
-+class Save extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator
-diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/app/code/Magento/UrlRewrite/Controller/Router.php
-index ce432f24365..47718ba3631 100644
---- a/app/code/Magento/UrlRewrite/Controller/Router.php
-+++ b/app/code/Magento/UrlRewrite/Controller/Router.php
-@@ -43,7 +43,7 @@ class Router implements \Magento\Framework\App\RouterInterface
-     protected $response;
- 
-     /**
--     * @var \Magento\UrlRewrite\Model\UrlFinderInterface
-+     * @var UrlFinderInterface
-      */
-     protected $urlFinder;
- 
-@@ -72,13 +72,12 @@ class Router implements \Magento\Framework\App\RouterInterface
-      * Match corresponding URL Rewrite and modify request.
-      *
-      * @param RequestInterface|HttpRequest $request
--     *
-      * @return ActionInterface|null
-      */
-     public function match(RequestInterface $request)
-     {
-         $rewrite = $this->getRewrite(
--            $request->getPathInfo(),
-+            $this->getNormalizedPathInfo($request),
-             $this->storeManager->getStore()->getId()
-         );
- 
-@@ -104,6 +103,8 @@ class Router implements \Magento\Framework\App\RouterInterface
-     }
- 
-     /**
-+     * Process redirect
-+     *
-      * @param RequestInterface $request
-      * @param UrlRewrite $rewrite
-      *
-@@ -121,6 +122,8 @@ class Router implements \Magento\Framework\App\RouterInterface
-     }
- 
-     /**
-+     * Redirect to target URL
-+     *
-      * @param RequestInterface|HttpRequest $request
-      * @param string $url
-      * @param int $code
-@@ -135,15 +138,45 @@ class Router implements \Magento\Framework\App\RouterInterface
-     }
- 
-     /**
-+     * Find rewrite based on request data
-+     *
-      * @param string $requestPath
-      * @param int $storeId
-      * @return UrlRewrite|null
-      */
-     protected function getRewrite($requestPath, $storeId)
-     {
--        return $this->urlFinder->findOneByData([
--            UrlRewrite::REQUEST_PATH => ltrim($requestPath, '/'),
--            UrlRewrite::STORE_ID => $storeId,
--        ]);
-+        return $this->urlFinder->findOneByData(
-+            [
-+                UrlRewrite::REQUEST_PATH => ltrim($requestPath, '/'),
-+                UrlRewrite::STORE_ID => $storeId,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Get normalized request path
-+     *
-+     * @param RequestInterface|HttpRequest $request
-+     * @return string
-+     */
-+    private function getNormalizedPathInfo(RequestInterface $request): string
-+    {
-+        $path = $request->getPathInfo();
-+        /**
-+         * If request contains query params then we need to trim a slash in end of the path.
-+         * For example:
-+         * the original request is: http://my-host.com/category-url-key.html/?color=black
-+         * where the original path is: category-url-key.html/
-+         * and the result path will be: category-url-key.html
-+         *
-+         * It need to except a redirect like this:
-+         * http://my-host.com/category-url-key.html/?color=black => http://my-host.com/category-url-key.html
-+         */
-+        if (!empty($path) && $request->getQuery()->count()) {
-+            $path = rtrim($path, '/');
-+        }
-+
-+        return (string)$path;
-     }
- }
-diff --git a/app/code/Magento/UrlRewrite/Model/CompositeUrlFinder.php b/app/code/Magento/UrlRewrite/Model/CompositeUrlFinder.php
-new file mode 100644
-index 00000000000..b463a41af84
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Model/CompositeUrlFinder.php
-@@ -0,0 +1,116 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\UrlRewrite\Model;
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\UrlRewrite\Model\MergeDataProviderFactory;
-+
-+/**
-+ * Class CompositeUrlFinder
-+ */
-+class CompositeUrlFinder implements UrlFinderInterface
-+{
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var array
-+     */
-+    private $children = [];
-+
-+    /**
-+     * @var MergeDataProviderFactory
-+     */
-+    private $mergeDataProviderFactory;
-+
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $config;
-+
-+    /**
-+     * @param array $children
-+     * @param ObjectManagerInterface $objectManager
-+     * @param MergeDataProviderFactory $mergeDataProviderFactory
-+     * @param ScopeConfigInterface $config
-+     */
-+    public function __construct(
-+        array $children,
-+        ObjectManagerInterface $objectManager,
-+        MergeDataProviderFactory $mergeDataProviderFactory,
-+        ScopeConfigInterface $config
-+    ) {
-+        $this->children = $children;
-+        $this->objectManager = $objectManager;
-+        $this->mergeDataProviderFactory = $mergeDataProviderFactory;
-+        $this->config = $config;
-+    }
-+
-+    /**
-+     * Check config value of generate_category_product_rewrites
-+     *
-+     * @return bool
-+     */
-+    private function isCategoryRewritesEnabled(): bool
-+    {
-+        return (bool)$this->config->getValue('catalog/seo/generate_category_product_rewrites');
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function findAllByData(array $data)
-+    {
-+        $isDynamicRewrites = !$this->isCategoryRewritesEnabled();
-+
-+        $mergeDataProvider = $this->mergeDataProviderFactory->create();
-+        foreach ($this->getChildren() as $child) {
-+            $urlFinder = $this->objectManager->get($child['class']);
-+            $rewrites = $urlFinder->findAllByData($data);
-+            if (!$isDynamicRewrites) {
-+                return $rewrites;
-+            }
-+            $mergeDataProvider->merge($rewrites);
-+        }
-+        return $mergeDataProvider->getData();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function findOneByData(array $data)
-+    {
-+        foreach ($this->getChildren() as $child) {
-+            $urlFinder = $this->objectManager->get($child['class']);
-+            $rewrite = $urlFinder->findOneByData($data);
-+            if (!empty($rewrite)) {
-+                return $rewrite;
-+            }
-+        }
-+        return null;
-+    }
-+
-+    /**
-+     * Get children in sorted order
-+     *
-+     * @return array
-+     */
-+    private function getChildren(): array
-+    {
-+        uasort(
-+            $this->children,
-+            function ($first, $second) {
-+                return (int)$first['sortOrder'] <=> (int)$second['sortOrder'];
-+            }
-+        );
-+        return $this->children;
-+    }
-+}
-diff --git a/app/code/Magento/UrlRewrite/Model/Exception/UrlAlreadyExistsException.php b/app/code/Magento/UrlRewrite/Model/Exception/UrlAlreadyExistsException.php
-index c7e83819f25..906ba1f6254 100644
---- a/app/code/Magento/UrlRewrite/Model/Exception/UrlAlreadyExistsException.php
-+++ b/app/code/Magento/UrlRewrite/Model/Exception/UrlAlreadyExistsException.php
-@@ -8,10 +8,12 @@ namespace Magento\UrlRewrite\Model\Exception;
- use Magento\Framework\Phrase;
- 
- /**
-+ * Exception for already created url.
-+ *
-  * @api
-  * @since 100.2.0
-  */
--class UrlAlreadyExistsException extends \Magento\Framework\Exception\LocalizedException
-+class UrlAlreadyExistsException extends \Magento\Framework\Exception\AlreadyExistsException
- {
-     /**
-      * @var array
-@@ -34,6 +36,8 @@ class UrlAlreadyExistsException extends \Magento\Framework\Exception\LocalizedEx
-     }
- 
-     /**
-+     * Get URLs
-+     *
-      * @return array
-      * @since 100.2.0
-      */
-diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
-index f4aa61b145f..2ac1bdd7121 100644
---- a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
-+++ b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
-@@ -87,7 +87,7 @@ class DbStorage extends AbstractStorage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function doFindAllByData(array $data)
-     {
-@@ -95,7 +95,7 @@ class DbStorage extends AbstractStorage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function doFindOneByData(array $data)
-     {
-@@ -105,42 +105,18 @@ class DbStorage extends AbstractStorage
-             $result = null;
- 
-             $requestPath = $data[UrlRewrite::REQUEST_PATH];
--
--            $data[UrlRewrite::REQUEST_PATH] = [
-+            $decodedRequestPath = urldecode($requestPath);
-+            $data[UrlRewrite::REQUEST_PATH] = array_unique([
-                 rtrim($requestPath, '/'),
-                 rtrim($requestPath, '/') . '/',
--            ];
-+                rtrim($decodedRequestPath, '/'),
-+                rtrim($decodedRequestPath, '/') . '/',
-+            ]);
- 
-             $resultsFromDb = $this->connection->fetchAll($this->prepareSelect($data));
--
--            if (count($resultsFromDb) === 1) {
--                $resultFromDb = current($resultsFromDb);
--                $redirectTypes = [OptionProvider::TEMPORARY, OptionProvider::PERMANENT];
--
--                // If request path matches the DB value or it's redirect - we can return result from DB
--                $canReturnResultFromDb = ($resultFromDb[UrlRewrite::REQUEST_PATH] === $requestPath
--                    || in_array((int)$resultFromDb[UrlRewrite::REDIRECT_TYPE], $redirectTypes, true));
--
--                // Otherwise return 301 redirect to request path from DB results
--                $result = $canReturnResultFromDb ? $resultFromDb : [
--                    UrlRewrite::ENTITY_TYPE => 'custom',
--                    UrlRewrite::ENTITY_ID => '0',
--                    UrlRewrite::REQUEST_PATH => $requestPath,
--                    UrlRewrite::TARGET_PATH => $resultFromDb[UrlRewrite::REQUEST_PATH],
--                    UrlRewrite::REDIRECT_TYPE => OptionProvider::PERMANENT,
--                    UrlRewrite::STORE_ID => $resultFromDb[UrlRewrite::STORE_ID],
--                    UrlRewrite::DESCRIPTION => null,
--                    UrlRewrite::IS_AUTOGENERATED => '0',
--                    UrlRewrite::METADATA => null,
--                ];
--            } else {
--                // If we have 2 results - return the row that matches request path
--                foreach ($resultsFromDb as $resultFromDb) {
--                    if ($resultFromDb[UrlRewrite::REQUEST_PATH] === $requestPath) {
--                        $result = $resultFromDb;
--                        break;
--                    }
--                }
-+            if ($resultsFromDb) {
-+                $urlRewrite = $this->extractMostRelevantUrlRewrite($requestPath, $resultsFromDb);
-+                $result = $this->prepareUrlRewrite($requestPath, $urlRewrite);
-             }
- 
-             return $result;
-@@ -149,6 +125,75 @@ class DbStorage extends AbstractStorage
-         return $this->connection->fetchRow($this->prepareSelect($data));
-     }
- 
-+    /**
-+     * Extract most relevant url rewrite from url rewrites list
-+     *
-+     * @param string $requestPath
-+     * @param array $urlRewrites
-+     * @return array|null
-+     */
-+    private function extractMostRelevantUrlRewrite(string $requestPath, array $urlRewrites): ?array
-+    {
-+        $prioritizedUrlRewrites = [];
-+        foreach ($urlRewrites as $urlRewrite) {
-+            switch (true) {
-+                case $urlRewrite[UrlRewrite::REQUEST_PATH] === $requestPath:
-+                    $priority = 1;
-+                    break;
-+                case $urlRewrite[UrlRewrite::REQUEST_PATH] === urldecode($requestPath):
-+                    $priority = 2;
-+                    break;
-+                case rtrim($urlRewrite[UrlRewrite::REQUEST_PATH], '/') === rtrim($requestPath, '/'):
-+                    $priority = 3;
-+                    break;
-+                case rtrim($urlRewrite[UrlRewrite::REQUEST_PATH], '/') === rtrim(urldecode($requestPath), '/'):
-+                    $priority = 4;
-+                    break;
-+                default:
-+                    $priority = 5;
-+                    break;
-+            }
-+            $prioritizedUrlRewrites[$priority] = $urlRewrite;
-+        }
-+        ksort($prioritizedUrlRewrites);
-+
-+        return array_shift($prioritizedUrlRewrites);
-+    }
-+
-+    /**
-+     * Prepare url rewrite
-+     *
-+     * If request path matches the DB value or it's redirect - we can return result from DB
-+     * Otherwise return 301 redirect to request path from DB results
-+     *
-+     * @param string $requestPath
-+     * @param array $urlRewrite
-+     * @return array
-+     */
-+    private function prepareUrlRewrite(string $requestPath, array $urlRewrite): array
-+    {
-+        $redirectTypes = [OptionProvider::TEMPORARY, OptionProvider::PERMANENT];
-+        $canReturnResultFromDb = (
-+            in_array($urlRewrite[UrlRewrite::REQUEST_PATH], [$requestPath, urldecode($requestPath)], true)
-+            || in_array((int) $urlRewrite[UrlRewrite::REDIRECT_TYPE], $redirectTypes, true)
-+        );
-+        if (!$canReturnResultFromDb) {
-+            $urlRewrite = [
-+                UrlRewrite::ENTITY_TYPE => 'custom',
-+                UrlRewrite::ENTITY_ID => '0',
-+                UrlRewrite::REQUEST_PATH => $requestPath,
-+                UrlRewrite::TARGET_PATH => $urlRewrite[UrlRewrite::REQUEST_PATH],
-+                UrlRewrite::REDIRECT_TYPE => OptionProvider::PERMANENT,
-+                UrlRewrite::STORE_ID => $urlRewrite[UrlRewrite::STORE_ID],
-+                UrlRewrite::DESCRIPTION => null,
-+                UrlRewrite::IS_AUTOGENERATED => '0',
-+                UrlRewrite::METADATA => null,
-+            ];
-+        }
-+
-+        return $urlRewrite;
-+    }
-+
-     /**
-      * Delete old URLs from DB.
-      *
-@@ -161,26 +206,22 @@ class DbStorage extends AbstractStorage
-         $oldUrlsSelect->from(
-             $this->resource->getTableName(self::TABLE_NAME)
-         );
--        /** @var UrlRewrite $url */
--        foreach ($urls as $url) {
--            $oldUrlsSelect->orWhere(
--                $this->connection->quoteIdentifier(
--                    UrlRewrite::ENTITY_TYPE
--                ) . ' = ?',
--                $url->getEntityType()
--            );
--            $oldUrlsSelect->where(
--                $this->connection->quoteIdentifier(
--                    UrlRewrite::ENTITY_ID
--                ) . ' = ?',
--                $url->getEntityId()
--            );
--            $oldUrlsSelect->where(
--                $this->connection->quoteIdentifier(
--                    UrlRewrite::STORE_ID
--                ) . ' = ?',
--                $url->getStoreId()
--            );
-+
-+        $uniqueEntities = $this->prepareUniqueEntities($urls);
-+        foreach ($uniqueEntities as $storeId => $entityTypes) {
-+            foreach ($entityTypes as $entityType => $entities) {
-+                $oldUrlsSelect->orWhere(
-+                    $this->connection->quoteIdentifier(
-+                        UrlRewrite::STORE_ID
-+                    ) . ' = ' . $this->connection->quote($storeId, 'INTEGER') .
-+                    ' AND ' . $this->connection->quoteIdentifier(
-+                        UrlRewrite::ENTITY_ID
-+                    ) . ' IN (' . $this->connection->quote($entities, 'INTEGER') . ')' .
-+                    ' AND ' . $this->connection->quoteIdentifier(
-+                        UrlRewrite::ENTITY_TYPE
-+                    ) . ' = ' . $this->connection->quote($entityType)
-+                );
-+            }
-         }
- 
-         // prevent query locking in a case when nothing to delete
-@@ -198,6 +239,28 @@ class DbStorage extends AbstractStorage
-         }
-     }
- 
-+    /**
-+     * Prepare array with unique entities
-+     *
-+     * @param UrlRewrite[] $urls
-+     * @return array
-+     */
-+    private function prepareUniqueEntities(array $urls): array
-+    {
-+        $uniqueEntities = [];
-+        /** @var UrlRewrite $url */
-+        foreach ($urls as $url) {
-+            $entityIds = (!empty($uniqueEntities[$url->getStoreId()][$url->getEntityType()])) ?
-+                $uniqueEntities[$url->getStoreId()][$url->getEntityType()] : [];
-+
-+            if (!\in_array($url->getEntityId(), $entityIds)) {
-+                $entityIds[] = $url->getEntityId();
-+            }
-+            $uniqueEntities[$url->getStoreId()][$url->getEntityType()] = $entityIds;
-+        }
-+        return $uniqueEntities;
-+    }
-+
-     /**
-      * @inheritDoc
-      */
-@@ -289,7 +352,7 @@ class DbStorage extends AbstractStorage
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function deleteByData(array $data)
-     {
-diff --git a/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php b/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
-index 2ce00d53588..16e9c37ee4e 100644
---- a/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
-+++ b/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
-@@ -40,6 +40,8 @@ class RewriteUrl implements StoreSwitcherInterface
-     }
- 
-     /**
-+     * Switch to another store.
-+     *
-      * @param StoreInterface $fromStore
-      * @param StoreInterface $targetStore
-      * @param string $redirectUrl
-@@ -61,22 +63,59 @@ class RewriteUrl implements StoreSwitcherInterface
-         }
- 
-         $oldStoreId = $fromStore->getId();
--        $oldRewrite = $this->urlFinder->findOneByData([
--            UrlRewrite::REQUEST_PATH => $urlPath,
--            UrlRewrite::STORE_ID => $oldStoreId,
--        ]);
-+        $oldRewrite = $this->urlFinder->findOneByData(
-+            [
-+                UrlRewrite::REQUEST_PATH => $urlPath,
-+                UrlRewrite::STORE_ID => $oldStoreId,
-+            ]
-+        );
-         if ($oldRewrite) {
-+            $targetUrl = $targetStore->getBaseUrl();
-             // look for url rewrite match on the target store
--            $currentRewrite = $this->urlFinder->findOneByData([
--                UrlRewrite::REQUEST_PATH => $urlPath,
--                UrlRewrite::STORE_ID => $targetStore->getId(),
--            ]);
--            if (null === $currentRewrite) {
-+            $currentRewrite = $this->findCurrentRewrite($oldRewrite, $targetStore);
-+            if ($currentRewrite) {
-+                $targetUrl .= $currentRewrite->getRequestPath();
-+            }
-+        } else {
-+            $existingRewrite = $this->urlFinder->findOneByData([UrlRewrite::REQUEST_PATH => $urlPath]);
-+            $currentRewrite = $this->urlFinder->findOneByData(
-+                [
-+                    UrlRewrite::REQUEST_PATH => $urlPath,
-+                    UrlRewrite::STORE_ID => $targetStore->getId(),
-+                ]
-+            );
-+
-+            if ($existingRewrite && !$currentRewrite) {
-                 /** @var \Magento\Framework\App\Response\Http $response */
-                 $targetUrl = $targetStore->getBaseUrl();
-             }
-         }
--
-         return $targetUrl;
-     }
-+
-+    /**
-+     * Look for url rewrite match on the target store
-+     *
-+     * @param UrlRewrite $oldRewrite
-+     * @param StoreInterface $targetStore
-+     * @return UrlRewrite|null
-+     */
-+    private function findCurrentRewrite(UrlRewrite $oldRewrite, StoreInterface $targetStore)
-+    {
-+        $currentRewrite = $this->urlFinder->findOneByData(
-+            [
-+                UrlRewrite::TARGET_PATH => $oldRewrite->getTargetPath(),
-+                UrlRewrite::STORE_ID => $targetStore->getId(),
-+            ]
-+        );
-+        if (!$currentRewrite) {
-+            $currentRewrite = $this->urlFinder->findOneByData(
-+                [
-+                    UrlRewrite::REQUEST_PATH => $oldRewrite->getTargetPath(),
-+                    UrlRewrite::STORE_ID => $targetStore->getId(),
-+                ]
-+            );
-+        }
-+        return $currentRewrite;
-+    }
- }
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
-new file mode 100644
-index 00000000000..50b83641e19
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
-@@ -0,0 +1,111 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminAddUrlRewrite">
-+        <arguments>
-+            <argument name="category" type="string"/>
-+            <argument name="customUrlRewriteValue" type="string"/>
-+            <argument name="storeValue" type="string"/>
-+            <argument name="requestPath" type="string"/>
-+            <argument name="redirectTypeValue" type="string"/>
-+            <argument name="description" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminUrlRewriteEditPage.url}}" stepKey="openUrlRewriteEditPage"/>
-+        <waitForPageLoad stepKey="waitForUrlRewriteEditPageToLoad"/>
-+        <click selector="{{AdminUrlRewriteEditSection.createCustomUrlRewrite}}" stepKey="clickOnCustonUrlRewrite"/>
-+        <click selector="{{AdminUrlRewriteEditSection.createCustomUrlRewriteValue('customUrlRewriteValue')}}" stepKey="selectForCategory"/>
-+        <waitForPageLoad stepKey="waitForCategoryEditSectionToLoad"/>
-+        <click selector="{{AdminUrlRewriteEditSection.categoryInTree($$category.name$$)}}"  stepKey="selectCategoryInTree"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <click selector="{{AdminUrlRewriteEditSection.store}}" stepKey="clickOnStore"/>
-+        <click selector="{{AdminUrlRewriteEditSection.storeValue('storeValue')}}" stepKey="clickOnStoreValue"/>
-+        <fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{requestPath}}" stepKey="fillRequestPath"/>
-+        <click selector="{{AdminUrlRewriteEditSection.redirectType}}" stepKey="selectRedirectType"/>
-+        <click selector="{{AdminUrlRewriteEditSection.redirectTypeValue('redirectTypeValue')}}" stepKey="clickOnRedirectTypeValue"/>
-+        <fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{description}}" stepKey="fillDescription"/>
-+        <click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.successMessage}}" stepKey="seeSuccessSaveMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AdminAddUrlRewriteForProduct">
-+        <arguments>
-+            <argument name="storeValue" type="string"/>
-+            <argument name="requestPath" type="string"/>
-+            <argument name="redirectTypeValue" type="string"/>
-+            <argument name="description" type="string"/>
-+        </arguments>
-+        <waitForElementVisible selector="{{AdminUrlRewriteProductSection.skipCategoryButton}}" stepKey="waitForSkipCategoryButton"/>
-+        <click selector="{{AdminUrlRewriteProductSection.skipCategoryButton}}" stepKey="clickOnSkipCategoryButton"/>
-+        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
-+        <click selector="{{AdminUrlRewriteEditSection.store}}" stepKey="clickOnStore"/>
-+        <click selector="{{AdminUrlRewriteEditSection.storeValue('storeValue')}}" stepKey="clickOnStoreValue"/>
-+        <fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{requestPath}}" stepKey="fillRequestPath"/>
-+        <click selector="{{AdminUrlRewriteEditSection.redirectType}}" stepKey="selectRedirectType"/>
-+        <click selector="{{AdminUrlRewriteEditSection.redirectTypeValue('redirectTypeValue')}}" stepKey="clickOnRedirectTypeValue"/>
-+        <fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{description}}" stepKey="fillDescription"/>
-+        <click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.successMessage}}" stepKey="seeSuccessSaveMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AdminAddCustomUrlRewrite">
-+        <arguments>
-+            <argument name="customUrlRewriteValue" type="string"/>
-+            <argument name="storeValue" type="string"/>
-+            <argument name="requestPath" type="string"/>
-+            <argument name="targetPath" type="string"/>
-+            <argument name="redirectTypeValue" type="string"/>
-+            <argument name="description" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminUrlRewriteEditPage.url}}" stepKey="openUrlRewriteEditPage"/>
-+        <waitForPageLoad stepKey="waitForUrlRewriteEditPageToLoad" after="openUrlRewriteEditPage"/>
-+        <click selector="{{AdminUrlRewriteEditSection.createCustomUrlRewrite}}" stepKey="clickOnCustonUrlRewrite"/>
-+        <click selector="{{AdminUrlRewriteEditSection.createCustomUrlRewriteValue('customUrlRewriteValue')}}" stepKey="selectCustom"/>
-+        <click selector="{{AdminUrlRewriteEditSection.store}}" stepKey="clickOnStore"/>
-+        <click selector="{{AdminUrlRewriteEditSection.storeValue('storeValue')}}" stepKey="clickOnStoreValue"/>
-+        <fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{requestPath}}" stepKey="fillRequestPath"/>
-+        <fillField selector="{{AdminUrlRewriteEditSection.targetPath}}" userInput="{{targetPath}}" stepKey="fillTargetPath"/>
-+        <click selector="{{AdminUrlRewriteEditSection.redirectType}}" stepKey="selectRedirectType"/>
-+        <click selector="{{AdminUrlRewriteEditSection.redirectTypeValue('redirectTypeValue')}}" stepKey="selectRedirectTypeValue"/>
-+        <fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{description}}" stepKey="fillDescription"/>
-+        <click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.successMessage}}" stepKey="seeSuccessSaveMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AdminUpdateUrlRewrite">
-+        <arguments>
-+            <argument name="storeValue" type="string"/>
-+            <argument name="requestPath" type="string"/>
-+            <argument name="redirectTypeValue" type="string"/>
-+            <argument name="description" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminUrlRewriteEditSection.store}}" stepKey="clickOnStore"/>
-+        <click selector="{{AdminUrlRewriteEditSection.storeValue(storeValue)}}" stepKey="clickOnStoreValue"/>
-+        <fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{requestPath}}" stepKey="fillRequestPath"/>
-+        <click selector="{{AdminUrlRewriteEditSection.redirectType}}" stepKey="selectRedirectType"/>
-+        <click selector="{{AdminUrlRewriteEditSection.redirectTypeValue(redirectTypeValue)}}" stepKey="selectRedirectTypeValue"/>
-+        <fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{description}}" stepKey="fillDescription"/>
-+        <click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.successMessage}}" stepKey="seeSuccessSaveMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AdminUpdateCustomUrlRewrite">
-+        <arguments>
-+            <argument name="storeValue" type="string"/>
-+            <argument name="requestPath" type="string"/>
-+            <argument name="targetPath" type="string"/>
-+            <argument name="redirectTypeValue" type="string"/>
-+            <argument name="description" type="string"/>
-+        </arguments>
-+        <click selector="{{AdminUrlRewriteEditSection.store}}" stepKey="clickOnStore"/>
-+        <click selector="{{AdminUrlRewriteEditSection.storeValue('storeValue')}}" stepKey="clickOnStoreValue"/>
-+        <fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{requestPath}}" stepKey="fillRequestPath"/>
-+        <fillField selector="{{AdminUrlRewriteEditSection.targetPath}}" userInput="{{targetPath}}" stepKey="fillTargetPath"/>
-+        <selectOption selector="{{AdminUrlRewriteEditSection.redirectType}}" userInput="{{redirectTypeValue}}" stepKey="selectRedirectTypeValue"/>
-+        <fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{description}}" stepKey="fillDescription"/>
-+        <click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.successMessage}}" stepKey="seeSuccessSaveMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteGridActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteGridActionGroup.xml
-new file mode 100644
-index 00000000000..1a9248ef367
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteGridActionGroup.xml
-@@ -0,0 +1,97 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSearchByRequestPath">
-+        <arguments>
-+            <argument name="redirectPath" type="string"/>
-+            <argument name="redirectType" type="string"/>
-+            <argument name="targetPath" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteEditPage"/>
-+        <waitForPageLoad stepKey="waitForUrlRewriteEditPageToLoad"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{redirectPath}}" stepKey="fillRedirectPathFilter"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{redirectPath}}" stepKey="seeTheRedirectPathForOldUrl"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="{{targetPath}}" stepKey="seeTheTargetPath" />
-+        <see selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="{{redirectType}}" stepKey="seeTheRedirectTypeForOldUrl" />
-+    </actionGroup>
-+    <actionGroup name="AdminSearchUrlRewriteProductBySku">
-+        <arguments>
-+            <argument name="productSku" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminUrlRewriteProductPage.url}}" stepKey="openUrlRewriteProductPage"/>
-+        <waitForPageLoad stepKey="waitForUrlRewriteProductPageToLoad"/>
-+        <click selector="{{AdminUrlRewriteProductSection.resetFilter}}" stepKey="clickOnResetFilter"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <fillField selector="{{AdminUrlRewriteProductSection.skuFilter}}" userInput="{{productSku}}" stepKey="fillProductSkuFilter"/>
-+        <click selector="{{AdminUrlRewriteProductSection.searchFilter}}" stepKey="clickOnSearchFilter"/>
-+        <waitForPageLoad stepKey="waitForProductToLoad"/>
-+        <click selector="{{AdminUrlRewriteProductSection.productRow}}" stepKey="clickOnFirstRow"/>
-+        <waitForPageLoad stepKey="waitForProductCategoryPageToLoad"/>
-+    </actionGroup>
-+    <actionGroup name="AdminSearchDeletedUrlRewrite">
-+        <arguments>
-+            <argument name="requestPath" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteEditPage"/>
-+        <waitForPageLoad stepKey="waitForUrlRewriteEditPageToLoad"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{requestPath}}" stepKey="fillRedirectPathFilter"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.emptyRecords}}" userInput="We couldn't find any records." stepKey="seeEmptyRecordMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AdminDeleteUrlRewrite">
-+        <arguments>
-+            <argument name="requestPath" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteEditPage"/>
-+        <waitForPageLoad stepKey="waitForUrlRewriteEditPageToLoad"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{requestPath}}" stepKey="fillRedirectPathFilter"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.editButton('1')}}" stepKey="clickOnEditButton"/>
-+        <waitForPageLoad stepKey="waitForEditPageToLoad"/>
-+        <click selector="{{AdminUrlRewriteEditSection.deleteButton}}" stepKey="clickOnDeleteButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
-+        <waitForElementVisible selector="{{AdminUrlRewriteEditSection.okButton}}" stepKey="waitForOkButtonToVisible"/>
-+        <click selector="{{AdminUrlRewriteEditSection.okButton}}" stepKey="clickOnOkButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.successMessage}}" userInput="You deleted the URL rewrite." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+    <actionGroup name="AssertPageByUrlRewriteIsNotFound">
-+        <arguments>
-+            <argument name="requestPath" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{requestPath}}" stepKey="amOnPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
-+        <see userInput="Whoops, our bad..." stepKey="seeWhoops"/>
-+    </actionGroup>
-+    <actionGroup name="AdminSearchAndSelectUrlRewriteInGrid">
-+        <arguments>
-+            <argument name="requestPath" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteEditPage"/>
-+        <waitForPageLoad stepKey="waitForUrlRewriteEditPageToLoad"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{requestPath}}" stepKey="fillRedirectPathFilter"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
-+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-+        <click selector="{{AdminUrlRewriteIndexSection.editButton('1')}}" stepKey="clickOnEditButton"/>
-+        <waitForPageLoad stepKey="waitForEditPageToLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/StorefrontUrlRewriteRedirectActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/StorefrontUrlRewriteRedirectActionGroup.xml
-new file mode 100644
-index 00000000000..a299e1689d6
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/StorefrontUrlRewriteRedirectActionGroup.xml
-@@ -0,0 +1,32 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertStorefrontUrlRewriteRedirect">
-+        <arguments>
-+            <argument name="category" type="string"/>
-+            <argument name="newRequestPath" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{newRequestPath}}" stepKey="openCategoryInStorefront"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(category)}}" stepKey="seeCategoryOnStoreNavigationBar"/>
-+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(category)}}" stepKey="seeCategoryInTitle"/>
-+    </actionGroup>
-+    <actionGroup name="AssertStorefrontProductRedirect">
-+        <arguments>
-+            <argument name="productName" type="string"/>
-+            <argument name="productSku" type="string"/>
-+            <argument name="productRequestPath" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{productRequestPath}}" stepKey="openCategoryInStorefront"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{productName}}" stepKey="seeProductNameInStoreFrontPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{productSku}}" stepKey="seeProductSkuInStoreFrontPage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..66eb3c9ba9f
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuMarketingSEOAndSearchURLRewrites">
-+        <data key="pageTitle">URL Rewrites</data>
-+        <data key="title">URL Rewrites</data>
-+        <data key="dataUiId">magento-urlrewrite-urlrewrite</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml
-new file mode 100644
-index 00000000000..3692e82072a
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml
-@@ -0,0 +1,47 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="defaultUrlRewrite" type="urlRewrite">
-+        <data key="request_path" unique="prefix">test-test-test.html</data>
-+        <data key="target_path">http://www.example.com/</data>
-+        <data key="redirect_type">302</data>
-+        <data key="redirect_type_label">Temporary (302)</data>
-+        <data key="store_id">1</data>
-+        <data key="store">Default Store View</data>
-+        <data key="description">End To End Test</data>
-+    </entity>
-+    <entity name="updateUrlRewrite" type="urlRewrite">
-+        <data key="request_path" unique="prefix">test-aspx-test.aspx</data>
-+        <data key="target_path">http://www.example.com/</data>
-+        <data key="redirect_type">302</data>
-+        <data key="redirect_type_label">Temporary (302)</data>
-+        <data key="store_id">1</data>
-+        <data key="store">Default Store View</data>
-+        <data key="description">Update Url Rewrite</data>
-+    </entity>
-+    <entity name="customPermanentUrlRewrite" type="urlRewrite">
-+        <data key="request_path" unique="prefix">wishlist</data>
-+        <data key="target_path">https://marketplace.magento.com/</data>
-+        <data key="redirect_type">301</data>
-+        <data key="redirect_type_label">Permanent (301)</data>
-+        <data key="store_id">1</data>
-+        <data key="store">Default Store View</data>
-+        <data key="description">test_description_relative path</data>
-+    </entity>
-+    <entity name="customTemporaryUrlRewrite" type="urlRewrite">
-+        <data key="request_path" unique="prefix">wishlist</data>
-+        <data key="target_path">https://marketplace.magento.com/</data>
-+        <data key="redirect_type">302</data>
-+        <data key="redirect_type_label">Temporary (302)</data>
-+        <data key="store_id">1</data>
-+        <data key="store">Default Store View</data>
-+        <data key="description">test_description_relative path</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Metadata/url_rewrite-meta.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Metadata/url_rewrite-meta.xml
-new file mode 100644
-index 00000000000..0738b17d6e0
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Metadata/url_rewrite-meta.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CreateUrlRewrite" dataType="urlRewrite" type="create" auth="adminFormKey" url="/admin/url_rewrite/save/" method="POST" successRegex="/messages-message-success/">
-+        <field key="store_id">integer</field>
-+        <field key="redirect_type">integer</field>
-+        <field key="request_path">string</field>
-+        <field key="target_path">string</field>
-+        <field key="description">string</field>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteEditPage.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteEditPage.xml
-new file mode 100644
-index 00000000000..b43e0e05ad5
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteEditPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminUrlRewriteEditPage" url="admin/url_rewrite/edit/id/{{url_rewrite_id}}/" area="admin" module="Magento_UrlRewrite">
-+        <section name="AdminUrlRewriteEditSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteIndexPage.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteIndexPage.xml
-new file mode 100644
-index 00000000000..c7c450a00a0
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteIndexPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminUrlRewriteIndexPage" url="admin/url_rewrite/index/" area="admin" module="Magento_UrlRewrite">
-+        <section name="AdminUrlRewriteIndexSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteProductPage.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteProductPage.xml
-new file mode 100644
-index 00000000000..645396bc778
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteProductPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminUrlRewriteProductPage" url="admin/url_rewrite/edit/product" area="admin" module="Magento_UrlRewrite">
-+        <section name="AdminUrlRewriteProductSection"/>
-+    </page>
-+</pages>
-\ No newline at end of file
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteEditSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteEditSection.xml
-new file mode 100644
-index 00000000000..52939607f53
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteEditSection.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminUrlRewriteEditSection">
-+        <element name="createCustomUrlRewrite" type="select" selector="//select[@id='entity-type-selector']" />
-+        <element name="createCustomUrlRewriteValue" type="text" selector="//select[@id='entity-type-selector']/option[contains(.,'{{var}}')]" parameterized="true"/>
-+        <element name="store" type="select" selector="//select[@id='store_id']"/>
-+        <element name="storeValue" type="select" selector="//select[@id='store_id']//option[contains(., '{{var}}')]" parameterized="true" />
-+        <element name="requestPath" type="input" selector="//input[@id='request_path']"/>
-+        <element name="targetPath" type="input" selector="//input[@id='target_path']"/>
-+        <element name="redirectType" type="select" selector="//select[@id='redirect_type']"/>
-+        <element name="redirectTypeValue" type="select" selector="//select[@id='redirect_type']//option[contains(., '{{Var}}')]" parameterized="true"/>
-+        <element name="description" type="input" selector="#description"/>
-+        <element name="categoryInTree" type="text" selector="//li[contains(@class,'active-category jstree-open')]/a[contains(., '{{categoryName}}')]" parameterized="true"/>
-+        <element name="saveButton" type="button" selector="#save" timeout="30"/>
-+        <element name="deleteButton" type="button" selector="#delete" timeout="30"/>
-+        <element name="okButton" type="button" selector="//button[@class='action-primary action-accept']" timeout="30"/>
-+        <element name="requestPathField" type="input" selector="#request_path"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
-new file mode 100644
-index 00000000000..7b789845fe2
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminUrlRewriteIndexSection">
-+        <element name="requestPathFilter" type="input" selector="#urlrewriteGrid_filter_request_path"/>
-+        <element name="requestPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='request_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
-+        <element name="targetPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='target_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
-+        <element name="searchButton" type="button" selector="//button[@data-ui-id='widget-button-1']" timeout="30"/>
-+        <element name="resetButton" type="button" selector="button[data-ui-id='widget-button-0']" timeout="30"/>
-+        <element name="emptyRecordMessage" type="text" selector="//*[@class='empty-text']"/>
-+        <element name="targetPathColumn" type="text" selector="//tr[@data-role='row'][{{var1}}]/td[@data-column='target_path']" parameterized="true"/>
-+        <element name="redirectTypeColumn" type="text" selector="//tr[@data-role='row'][{{var1}}]/td[@data-column='redirect_type']" parameterized="true"/>
-+        <element name="requestPathColumn" type="text" selector="//tr[@data-role='row'][{{var1}}]/td[@data-column='request_path']" parameterized="true"/>
-+        <element name="emptyRecords" type="text" selector="//td[@class='empty-text']"/>
-+        <element name="successMessage" type="text" selector="#messages"/>
-+        <element name="editButton" type="text" selector="//tr[@data-role='row'][{{rowNumber}}]/td/a[contains(.,'Edit')]" parameterized="true"/>
-+        <element name="storeView" type="text" selector="//tr[@data-role='row'][{{var1}}]/td[@data-column='store_id']" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteProductSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteProductSection.xml
-new file mode 100644
-index 00000000000..3650ec56d13
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteProductSection.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminUrlRewriteProductSection">
-+        <element name="skuFilter" type="input" selector="//input[@name='sku']"/>
-+        <element name="resetFilter" type="button" selector="//button[@data-action='grid-filter-reset']" timeout="30"/>
-+        <element name="searchFilter" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
-+        <element name="productRow" type="text" selector="//tbody/tr/td[contains(@class,'col-sku')]"/>
-+        <element name="skipCategoryButton" type="button" selector="//button[@class='action-default scalable save']" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminAutoUpdateURLRewriteWhenCategoryIsDeletedTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminAutoUpdateURLRewriteWhenCategoryIsDeletedTest.xml
-new file mode 100644
-index 00000000000..52d313b21f3
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminAutoUpdateURLRewriteWhenCategoryIsDeletedTest.xml
-@@ -0,0 +1,73 @@
-+<?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="AdminAutoUpdateURLRewriteWhenCategoryIsDeletedTest">
-+        <annotations>
-+            <stories value="Create Product UrlRewrite"/>
-+            <title value="Create product URL rewrite, autoupdate if subcategory deleted"/>
-+            <description value="Login as admin,verify UrlRewrite auto update when subcategory is deleted  "/>
-+            <testCaseId value="MC-5342"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+            <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Filter and Select the created Product -->
-+        <actionGroup ref="AdminSearchUrlRewriteProductBySku" stepKey="searchProduct">
-+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
-+        </actionGroup>
-+
-+        <!-- Update the Store, RequestPath, RedirectType and Description -->
-+        <actionGroup ref="AdminAddUrlRewriteForProduct" stepKey="addUrlRewriteForProduct">
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{_defaultProduct.urlKey}}.html"/>
-+            <argument name="redirectTypeValue" value="Temporary (302)"/>
-+            <argument name="description" value="End To End Test"/>
-+        </actionGroup>
-+
-+        <!-- Delete Category -->
-+        <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+
-+        <!--Filter Product in product page and get the Product ID -->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterProduct">
-+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!-- Assert Redirect path, Target Path and Redirect type in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
-+            <argument name="redirectPath" value="$$createSimpleProduct.name$$.html" />
-+            <argument name="redirectType" value="No" />
-+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
-+        </actionGroup>
-+
-+        <!-- Assert Redirect path, Target Path and Redirect type in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath1">
-+            <argument name="redirectPath" value="{{_defaultProduct.urlKey}}.html" />
-+            <argument name="redirectType" value="Temporary (302)"/>
-+            <argument name="targetPath" value="$$createSimpleProduct.name$$.html"/>
-+        </actionGroup>
-+
-+        <!--Assert Category Url Redirect is not present -->
-+        <actionGroup ref="AdminSearchDeletedUrlRewrite" stepKey="searchDeletedCategory">
-+            <argument name="requestPath" value="$$createCategory.name$$.html"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
-new file mode 100644
-index 00000000000..44fad061d76
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
-@@ -0,0 +1,255 @@
-+<?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="AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest">
-+        <annotations>
-+            <features value="Url Rewrite"/>
-+            <stories value="Url Rewrites for Multiple Storeviews"/>
-+            <title value="Url Rewrites Correctly Generated for Multiple Storeviews During Product Import"/>
-+            <description value="Check Url Rewrites Correctly Generated for Multiple Storeviews During Product Import."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-12656"/>
-+            <group value="urlRewrite"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" 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>
-+            <createData entity="ApiCategory" stepKey="createCategory">
-+                <field key="name">category-admin</field>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <actionGroup ref="deleteProductByName" stepKey="deleteImportedProduct">
-+                <argument name="sku" value="productformagetwo68980"/>
-+                <argument name="name" value="productformagetwo68980"/>
-+            </actionGroup>
-+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFiltersIfSet"/>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
-+                <argument name="customStore" value="customStoreENNotUnique"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewNl">
-+                <argument name="customStore" value="customStoreNLNotUnique"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="switchCategoryStoreView" 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="ChangeSeoUrlKeyForSubCategory" stepKey="changeSeoUrlKeyENStoreView">
-+            <argument name="value" value="category-english"/>
-+        </actionGroup>
-+        <actionGroup ref="switchCategoryStoreView" 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="ChangeSeoUrlKeyForSubCategory" 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="{{AdminMessagesSection.notice}}" userInput="Checked rows: 3, checked entities: 1, invalid rows: 0, total errors: 0" stepKey="assertNotice"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="File is valid! To start import process press &quot;Import&quot; button" stepKey="assertSuccessMessage"/>
-+        <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage1"/>
-+        <see selector="{{AdminMessagesSection.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"/>
-+
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-english.html" stepKey="inputCategoryUrlForENStoreView"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-english.html')}}" stepKey="seeUrlInRequestPathColumn"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn"/>
-+
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-dutch.html" stepKey="inputCategoryUrlForNLStoreView"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton1"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-dutch.html')}}" stepKey="seeUrlInRequestPathColumn1"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn1"/>
-+
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="productformagetwo68980-english.html" stepKey="inputProductUrlForENStoreView"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton2"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn2"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue('catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn2"/>
-+
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreView1"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton3"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn3"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue('catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn3"/>
-+
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-english/productformagetwo68980-english.html" stepKey="inputProductUrlForENStoreView2"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton4"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-english/productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn4"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn4"/>
-+
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-dutch/productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreView3"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton5"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-dutch/productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn5"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn5"/>
-+    </test>
-+    <test name="AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTestWithConfigurationTurnedOff">
-+        <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"/>
-+
-+            <actionGroup ref="LoginAsAdmin" 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>
-+            <createData entity="ApiCategory" stepKey="createCategory">
-+                <field key="name">category-admin</field>
-+            </createData>
-+
-+            <!-- 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="deleteProductByName" stepKey="deleteImportedProduct">
-+                <argument name="sku" value="productformagetwo68980"/>
-+                <argument name="name" value="productformagetwo68980"/>
-+            </actionGroup>
-+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFiltersIfSet"/>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
-+                <argument name="customStore" value="customStoreENNotUnique"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewNl">
-+                <argument name="customStore" value="customStoreNLNotUnique"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" 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="switchCategoryStoreView" 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="ChangeSeoUrlKeyForSubCategory" stepKey="changeSeoUrlKeyENStoreView">
-+            <argument name="value" value="category-english"/>
-+        </actionGroup>
-+        <actionGroup ref="switchCategoryStoreView" 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="ChangeSeoUrlKeyForSubCategory" 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="{{AdminMessagesSection.notice}}" userInput="Checked rows: 3, checked entities: 1, invalid rows: 0, total errors: 0" stepKey="assertNotice"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="File is valid! To start import process press &quot;Import&quot; button" stepKey="assertSuccessMessage"/>
-+        <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage1"/>
-+        <see selector="{{AdminMessagesSection.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"/>
-+
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-english.html" stepKey="inputCategoryUrlForENStoreView"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-english.html')}}" stepKey="seeUrlInRequestPathColumn"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn"/>
-+
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-dutch.html" stepKey="inputCategoryUrlForNLStoreView"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton1"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-dutch.html')}}" stepKey="seeUrlInRequestPathColumn1"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn1"/>
-+
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="productformagetwo68980-english.html" stepKey="inputProductUrlForENStoreView"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton2"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn2"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue('catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn2"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-english/productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn4"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn4"/>
-+
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreView1"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton3"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn3"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue('catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn3"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-dutch/productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn5"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(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>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategoryTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategoryTest.xml
-new file mode 100644
-index 00000000000..52dce4d67f6
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategoryTest.xml
-@@ -0,0 +1,82 @@
-+<?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="AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategoryTest">
-+        <annotations>
-+            <features value="Url Rewrite"/>
-+            <stories value="Update url rewrites"/>
-+            <title value="Check url rewrites in catalog categories after changing url key"/>
-+            <description value="Check url rewrites in catalog categories after changing url key for store view and moving category"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-5352"/>
-+            <group value="url_rewrite"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <!-- Create two sub-categories in default category with simple products -->
-+            <createData entity="_defaultCategory" stepKey="createFirstCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createFirstSimpleProduct">
-+                <requiredEntity createDataKey="createFirstCategory"/>
-+            </createData>
-+            <createData entity="_defaultCategory" stepKey="createSecondCategory"/>
-+            <createData entity="_defaultProduct" stepKey="createSecondSimpleProduct">
-+                <requiredEntity createDataKey="createSecondCategory"/>
-+            </createData>
-+
-+            <!-- Log in to backend -->
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+
-+            <!--Create additional Store View in Main Website Store -->
-+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createFirstCategory" stepKey="deleteFirstCategory"/>
-+            <deleteData createDataKey="createSecondCategory" stepKey="deleteSecondCategory"/>
-+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
-+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
-+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- On the categories editing page change store view to created additional view -->
-+        <actionGroup ref="switchCategoryStoreView" stepKey="switchStoreView">
-+            <argument name="Store" value="customStore.name"/>
-+            <argument name="CatName" value="$$createFirstCategory.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Change url key for category for first category; save -->
-+        <actionGroup ref="ChangeSeoUrlKeyForSubCategory" stepKey="changeUrlKey">
-+            <argument name="value" value="{{SimpleRootSubCategory.url_key}}"/>
-+        </actionGroup>
-+
-+        <!-- Change store view to "All store views" for first category -->
-+        <actionGroup ref="switchCategoryToAllStoreView" stepKey="switchToAllStoreViewProduct">
-+            <argument name="CatName" value="$$createFirstCategory.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Move first category inside second category -->
-+        <actionGroup ref="MoveCategoryActionGroup" stepKey="moveFirstCategoryToSecondCategory">
-+            <argument name="childCategory" value="$$createFirstCategory.name$$"/>
-+            <argument name="parentCategory" value="$$createSecondCategory.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Switch default store view on store view created below for first category -->
-+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
-+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="storefrontSwitchStoreView">
-+            <argument name="storeView" value="customStore"/>
-+        </actionGroup>
-+
-+        <!-- Assert category url with custom store view -->
-+        <amOnPage url="{{StorefrontHomePage.url}}$$createSecondCategory.name$$/{{SimpleRootSubCategory.url_key}}.html" stepKey="amOnCategoryPage"/>
-+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-+        <dontSee userInput="$$createSecondSimpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
-+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddNoRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddNoRedirectTest.xml
-new file mode 100644
-index 00000000000..a7a7c0c73d8
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddNoRedirectTest.xml
-@@ -0,0 +1,52 @@
-+<?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="AdminCreateCategoryUrlRewriteAndAddNoRedirectTest">
-+        <annotations>
-+            <stories value="Create category URL rewrite"/>
-+            <title value="Create category URL rewrite, with no redirect"/>
-+            <description value="Login as admin and create category UrlRewrite with No redirect"/>
-+            <testCaseId value="MC-5335"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="_defaultCategory" stepKey="category"/>
-+       </before>
-+        <after>
-+            <deleteData createDataKey="category" stepKey="deleteRootCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Url Rewrite Index Page and update the Custom Url Rewrite, Store, Request Path, Redirect Type and Description -->
-+        <actionGroup ref="AdminAddUrlRewrite" stepKey="addUrlRewrite">
-+            <argument name="category" value="$$category.name$$"/>
-+            <argument name="customUrlRewriteValue" value="For Category'"/>
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="newrequestpath.html"/>
-+            <argument name="redirectTypeValue" value="No"/>
-+            <argument name="description" value="End To End Test"/>
-+        </actionGroup>
-+
-+        <!-- Get Category ID -->
-+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="getCategoryId">
-+            <argument name="category" value="$$category.name$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!-- Assert Redirect path, Target Path and Redirect type in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
-+            <argument name="redirectPath" value="newrequestpath.html" />
-+            <argument name="redirectType" value="No" />
-+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddPermanentRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddPermanentRedirectTest.xml
-new file mode 100644
-index 00000000000..974550bb922
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddPermanentRedirectTest.xml
-@@ -0,0 +1,52 @@
-+<?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="AdminCreateCategoryUrlRewriteAndAddPermanentRedirectTest">
-+        <annotations>
-+            <stories value="Create category URL rewrite"/>
-+            <title value="Create category URL rewrite, add permanent redirect for category"/>
-+            <description value="Login as admin and create category UrlRewrite with Permanent redirect"/>
-+            <testCaseId value="MC-5334"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="_defaultCategory" stepKey="category"/>
-+       </before>
-+        <after>
-+            <deleteData createDataKey="category" stepKey="deleteRootCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Url Rewrite Index Page and update the Custom Url Rewrite, Store, Request Path, Redirect Type and Description -->
-+        <actionGroup ref="AdminAddUrlRewrite" stepKey="addUrlRewrite">
-+            <argument name="category" value="$$category.name$$"/>
-+            <argument name="customUrlRewriteValue" value="For Category'"/>
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="newrequestpath.html"/>
-+            <argument name="redirectTypeValue" value="Permanent (301)"/>
-+            <argument name="description" value="End To End Test"/>
-+        </actionGroup>
-+
-+        <!-- Assert Redirect path, Target Path and Redirect type in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
-+            <argument name="redirectPath" value="newrequestpath.html" />
-+            <argument name="redirectType" value="Permanent (301)" />
-+            <argument name="targetPath" value="$$category.name_lwr$$.html"/>
-+        </actionGroup>
-+
-+        <!--Assert Updated path directs to the category storefront -->
-+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="openStorefrontUrlRedirectPath">
-+            <argument name="category" value="$$category.name$$"/>
-+            <argument name="newRequestPath" value="newrequestpath.html"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml
-new file mode 100644
-index 00000000000..c64019ea38a
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml
-@@ -0,0 +1,52 @@
-+<?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="AdminCreateCategoryUrlRewriteAndAddTemporaryRedirectTest">
-+        <annotations>
-+            <stories value="Create category URL rewrite"/>
-+            <title value="Create category URL rewrite, with temporary redirect"/>
-+            <description value="Login as admin and create category UrlRewrite with Temporary redirect"/>
-+            <testCaseId value="MC-5336"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+            <createData entity="_defaultCategory" stepKey="category"/>
-+       </before>
-+        <after>
-+            <deleteData createDataKey="category" stepKey="deleteRootCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open Url Rewrite Index Page and update the Custom Url Rewrite, Store, Request Path, Redirect Type and Description -->
-+        <actionGroup ref="AdminAddUrlRewrite" stepKey="addUrlRewrite">
-+            <argument name="category" value="$$category.name$$"/>
-+            <argument name="customUrlRewriteValue" value="For Category'"/>
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="newrequestpath.html"/>
-+            <argument name="redirectTypeValue" value="Temporary (302)"/>
-+            <argument name="description" value="End To End Test"/>
-+        </actionGroup>
-+
-+        <!-- Assert Redirect path, Target Path and Redirect type in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
-+            <argument name="redirectPath" value="newrequestpath.html" />
-+            <argument name="redirectType" value="Temporary (302)" />
-+            <argument name="targetPath" value="$$category.name_lwr$$.html"/>
-+        </actionGroup>
-+
-+        <!--Assert Updated path directs to the category storefront -->
-+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="openStorefrontUrlRedirectPath">
-+            <argument name="category" value="$$category.name$$"/>
-+            <argument name="newRequestPath" value="newrequestpath.html"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCustomCMSPageUrlRewriteAndAddPermanentRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCustomCMSPageUrlRewriteAndAddPermanentRedirectTest.xml
-new file mode 100644
-index 00000000000..358aa58aba0
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCustomCMSPageUrlRewriteAndAddPermanentRedirectTest.xml
-@@ -0,0 +1,86 @@
-+<?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="AdminCreateCustomCMSPageUrlRewriteAndAddPermanentRedirectTest">
-+        <annotations>
-+            <stories value="Create custom URL rewrite"/>
-+            <title value="Create custom URL rewrite, CMS permanent"/>
-+            <description value="Login as Admin and create custom CMS page UrlRewrite and add Permanent redirect type "/>
-+            <testCaseId value="MC-5345"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="simpleCmsPage" stepKey="createCMSPage"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
-+            <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
-+                <argument name="requestPath" value="{{defaultCmsPage.title}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open CMS Edit Page and Get the CMS ID -->
-+        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
-+            <argument name="CMSPage" value="$$createCMSPage$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="cmsId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!-- Open UrlRewrite Edit page and update the fields and fill the created CMS Page Target Path -->
-+        <actionGroup ref="AdminAddCustomUrlRewrite" stepKey="addCustomUrlRewrite">
-+            <argument name="customUrlRewriteValue" value="Custom"/>
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{defaultCmsPage.title}}"/>
-+            <argument name="redirectTypeValue" value="Permanent (301)"/>
-+            <argument name="targetPath" value="cms/page/view/page_id/{$cmsId}"/>
-+            <argument name="description" value="Created New CMS Page."/>
-+        </actionGroup>
-+
-+        <!-- Assert updated CMS page Url Rewrite in Grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
-+            <argument name="redirectPath" value="{{defaultCmsPage.title}}" />
-+            <argument name="redirectType" value="Permanent (301)" />
-+            <argument name="targetPath" value="cms/page/view/page_id/{$cmsId}"/>
-+        </actionGroup>
-+
-+        <!--  Assert initial CMS page Url Rewrite in Grid-->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath1">
-+            <argument name="redirectPath" value="$$createCMSPage.identifier$$" />
-+            <argument name="redirectType" value="No"/>
-+            <argument name="targetPath" value="cms/page/view/page_id/{$cmsId}"/>
-+        </actionGroup>
-+
-+        <!-- Assert Updated Request Path redirects to the CMS Page on Store Front -->
-+        <actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToTheStoreFront">
-+            <argument name="page" value="{{defaultCmsPage.title}}"/>
-+        </actionGroup>
-+
-+        <!-- Assert updated CMS redirect in Store Front -->
-+        <actionGroup ref="AssertStoreFrontCMSPage" stepKey="assertCMSPage">
-+            <argument name="cmsTitle"  value="$$createCMSPage.title$$"/>
-+            <argument name="cmsContent" value="$$createCMSPage.content$$"/>
-+            <argument name="cmsContentHeading" value="$$createCMSPage.content_heading$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert initial request path directs to the CMS Page on Store Front -->
-+        <actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToTheStoreFront1">
-+            <argument name="page" value="$$createCMSPage.identifier$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert initial CMS redirect in Store Front   -->
-+        <actionGroup ref="AssertStoreFrontCMSPage" stepKey="assertCMSPage1">
-+            <argument name="cmsTitle"  value="$$createCMSPage.title$$"/>
-+            <argument name="cmsContent" value="$$createCMSPage.content$$"/>
-+            <argument name="cmsContentHeading" value="$$createCMSPage.content_heading$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCustomCMSPageUrlRewriteAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCustomCMSPageUrlRewriteAndAddTemporaryRedirectTest.xml
-new file mode 100644
-index 00000000000..e6ee9b48405
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCustomCMSPageUrlRewriteAndAddTemporaryRedirectTest.xml
-@@ -0,0 +1,86 @@
-+<?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="AdminCreateCustomCMSPageUrlRewriteAndAddTemporaryRedirectTest">
-+        <annotations>
-+            <stories value="Create custom URL rewrite"/>
-+            <title value="Create custom URL rewrite, CMS temporary"/>
-+            <description value="Login as Admin and create custom CMS page UrlRewrite and add Temporary redirect type "/>
-+            <testCaseId value="MC-5346"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="simpleCmsPage" stepKey="createCMSPage"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
-+            <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
-+                <argument name="requestPath" value="{{defaultCmsPage.title}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Open CMS Edit Page and Get the CMS ID -->
-+        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
-+            <argument name="CMSPage" value="$$createCMSPage$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="cmsId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!-- Open UrlRewrite Edit page and update the fields and fill the created CMS Page Target Path -->
-+        <actionGroup ref="AdminAddCustomUrlRewrite" stepKey="addCustomUrlRewrite">
-+            <argument name="customUrlRewriteValue" value="Custom"/>
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{defaultCmsPage.title}}"/>
-+            <argument name="redirectTypeValue" value="Temporary (302)"/>
-+            <argument name="targetPath" value="cms/page/view/page_id/{$cmsId}"/>
-+            <argument name="description" value="Created New CMS Page."/>
-+        </actionGroup>
-+
-+        <!-- Assert updated CMS page Url Rewrite in Grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
-+            <argument name="redirectPath" value="{{defaultCmsPage.title}}" />
-+            <argument name="redirectType" value="Temporary (302)" />
-+            <argument name="targetPath" value="cms/page/view/page_id/{$cmsId}"/>
-+        </actionGroup>
-+
-+        <!-- Assert initial CMS page Url Rewrite in Grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath1">
-+            <argument name="redirectPath" value="$$createCMSPage.identifier$$" />
-+            <argument name="redirectType" value="No"/>
-+            <argument name="targetPath" value="cms/page/view/page_id/{$cmsId}"/>
-+        </actionGroup>
-+
-+        <!-- Assert Updated Request Path redirects to the CMS Page on Store Front -->
-+        <actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToTheStoreFront">
-+            <argument name="page" value="{{defaultCmsPage.title}}"/>
-+        </actionGroup>
-+
-+        <!--Assert updated CMS redirect in Store Front-->
-+        <actionGroup ref="AssertStoreFrontCMSPage" stepKey="assertCMSPage">
-+            <argument name="cmsTitle"  value="$$createCMSPage.title$$"/>
-+            <argument name="cmsContent" value="$$createCMSPage.content$$"/>
-+            <argument name="cmsContentHeading" value="$$createCMSPage.content_heading$$"/>
-+        </actionGroup>
-+
-+        <!-- Assert initial request path directs to the CMS Page on Store Front -->
-+        <actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToTheStoreFront1">
-+            <argument name="page" value="$$createCMSPage.identifier$$"/>
-+        </actionGroup>
-+
-+        <!--Assert initial CMS redirect in Store Front-->
-+        <actionGroup ref="AssertStoreFrontCMSPage" stepKey="assertCMSPage1">
-+            <argument name="cmsTitle"  value="$$createCMSPage.title$$"/>
-+            <argument name="cmsContent" value="$$createCMSPage.content$$"/>
-+            <argument name="cmsContentHeading" value="$$createCMSPage.content_heading$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCustomCategoryUrlRewriteAndAddPermanentRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCustomCategoryUrlRewriteAndAddPermanentRedirectTest.xml
-new file mode 100644
-index 00000000000..b123bc14cb1
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCustomCategoryUrlRewriteAndAddPermanentRedirectTest.xml
-@@ -0,0 +1,74 @@
-+<?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="AdminCreateCustomCategoryUrlRewriteAndAddPermanentRedirectTest">
-+        <annotations>
-+            <stories value="Create custom URL rewrite"/>
-+            <title value="Create custom URL rewrite, permanent"/>
-+            <description value="Login as Admin and create custom UrlRewrite and add redirect type permenent"/>
-+            <testCaseId value="MC-5343"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="category"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
-+                <argument name="requestPath" value="{{FirstLevelSubCat.name}}.html"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Open Category Page and Get Category ID -->
-+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="getCategoryId">
-+            <argument name="category"  value="$$category.name$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!-- Open UrlRewrite Edit page and update the fields and fill the created category Target Path  -->
-+        <actionGroup ref="AdminAddCustomUrlRewrite" stepKey="addCustomUrlRewrite">
-+            <argument name="customUrlRewriteValue" value="Custom"/>
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{FirstLevelSubCat.name}}.html"/>
-+            <argument name="redirectTypeValue" value="Permanent (301)"/>
-+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
-+            <argument name="description" value="End To End Test"/>
-+        </actionGroup>
-+
-+        <!-- Assert updated category Url Rewrite in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByCategoryRequestPath">
-+            <argument name="redirectPath" value="$$category.name$$.html" />
-+            <argument name="redirectType" value="No" />
-+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
-+        </actionGroup>
-+
-+        <!--Assert initial category Url Rewrite in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByNewRequestPath">
-+            <argument name="redirectPath" value="{{FirstLevelSubCat.name}}.html" />
-+            <argument name="redirectType" value="Permanent (301)" />
-+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
-+        </actionGroup>
-+
-+        <!-- Assert updated Category redirect in Store Front -->
-+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront">
-+            <argument name="category" value="$$category.name$$"/>
-+            <argument name="newRequestPath" value="{{FirstLevelSubCat.name}}.html"/>
-+        </actionGroup>
-+
-+        <!-- Assert initial Category redirect in Store Front -->
-+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront1">
-+            <argument name="category" value="$$category.name$$"/>
-+            <argument name="newRequestPath" value="catalog/category/view/id/{$categoryId}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCustomProductUrlRewriteAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCustomProductUrlRewriteAndAddTemporaryRedirectTest.xml
-new file mode 100644
-index 00000000000..711d5389b01
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCustomProductUrlRewriteAndAddTemporaryRedirectTest.xml
-@@ -0,0 +1,76 @@
-+<?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="AdminCreateCustomProductUrlRewriteAndAddTemporaryRedirectTest">
-+        <annotations>
-+            <stories value="Create custom URL rewrite"/>
-+            <title value="Create custom URL rewrite, temporary"/>
-+            <description value="Login as Admin and create custom product UrlRewrite and add Temporary redirect type "/>
-+            <testCaseId value="MC-5344"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
-+                <argument name="requestPath" value="{{_defaultProduct.name}}.html"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Filter Product in product page and get the Product ID -->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterProduct">
-+            <argument name="productSku" value="$$createProduct.sku$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!-- Open UrlRewrite Edit page and update the fields and fill the created product Target Path  -->
-+        <actionGroup ref="AdminAddCustomUrlRewrite" stepKey="addCustomUrlRewrite">
-+            <argument name="customUrlRewriteValue" value="Custom"/>
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{_defaultProduct.name}}.html"/>
-+            <argument name="redirectTypeValue" value="Temporary (302)"/>
-+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
-+            <argument name="description" value="End To End Test"/>
-+        </actionGroup>
-+
-+        <!--Assert updated product Url Rewrite in Grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
-+            <argument name="redirectPath" value="{{_defaultProduct.name}}.html" />
-+            <argument name="redirectType" value="Temporary (302)" />
-+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
-+        </actionGroup>
-+
-+        <!-- Assert initial product Url rewrite in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath1">
-+            <argument name="redirectPath" value="$$createProduct.name$$.html" />
-+            <argument name="redirectType" value="No"/>
-+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
-+        </actionGroup>
-+
-+        <!-- Assert updated product redirect in Store Front-->
-+        <actionGroup ref="AssertStorefrontProductRedirect" stepKey="verifyProductInStoreFront">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+            <argument name="productSku" value="$$createProduct.sku$$"/>
-+            <argument name="productRequestPath" value="{{_defaultProduct.name}}.html"/>
-+        </actionGroup>
-+
-+        <!-- Assert initial product redirect in Store Front-->
-+        <actionGroup ref="AssertStorefrontProductRedirect" stepKey="verifyProductInStoreFront1">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+            <argument name="productSku" value="$$createProduct.sku$$"/>
-+            <argument name="productRequestPath" value="$$createProduct.name$$.html"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteAndAddNoRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteAndAddNoRedirectTest.xml
-new file mode 100644
-index 00000000000..f8d297c92a1
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteAndAddNoRedirectTest.xml
-@@ -0,0 +1,62 @@
-+<?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="AdminCreateProductUrLRewriteAndAddNoRedirectTest">
-+        <annotations>
-+            <stories value="Create Product UrlRewrite"/>
-+            <title value="Create product URL rewrite, with no redirect"/>
-+            <description value="Login as admin, create product UrlRewrite and add No redirect  "/>
-+            <testCaseId value="MC-5339"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Filter and Select the created Product -->
-+        <actionGroup ref="AdminSearchUrlRewriteProductBySku" stepKey="searchProduct">
-+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
-+        </actionGroup>
-+
-+        <!-- Update the Store, RequestPath, RedirectType and Description -->
-+        <actionGroup ref="AdminAddUrlRewriteForProduct" stepKey="addUrlRewrite">
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{_defaultProduct.urlKey}}.html"/>
-+            <argument name="redirectTypeValue" value="No"/>
-+            <argument name="description" value="End To End Test"/>
-+        </actionGroup>
-+
-+        <!--Filter Product in product page and get the Product ID -->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterProduct">
-+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!--Assert Product Redirect -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
-+            <argument name="redirectPath" value="{{_defaultProduct.urlKey}}.html" />
-+            <argument name="redirectType" value="No" />
-+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
-+        </actionGroup>
-+
-+        <!-- Assert Redirect path, Target Path and Redirect type in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath1">
-+            <argument name="redirectPath" value="$$createSimpleProduct.name$$.html" />
-+            <argument name="redirectType" value="No" />
-+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteWithCategoryAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteWithCategoryAndAddTemporaryRedirectTest.xml
-new file mode 100644
-index 00000000000..ae18ab33ba6
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteWithCategoryAndAddTemporaryRedirectTest.xml
-@@ -0,0 +1,79 @@
-+<?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="AdminCreateProductURLRewriteWithCategoryAndAddTemporaryRedirectTest">
-+        <annotations>
-+            <stories value="Create Product UrlRewrite"/>
-+            <title value="Create product URL rewrite, add temporary redirect for product"/>
-+            <description value="Login as admin, create product with category and UrlRewrite and add temporary redirect  "/>
-+            <testCaseId value="MC-5338"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Filter and Select the created Product -->
-+        <actionGroup ref="AdminSearchUrlRewriteProductBySku" stepKey="searchProduct">
-+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
-+        </actionGroup>
-+
-+        <!-- Update the Store, RequestPath, RedirectType and Description -->
-+        <actionGroup ref="AdminAddUrlRewriteForProduct" stepKey="addUrlRewrite">
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{FirstLevelSubCat.name_lwr}}/{{_defaultProduct.urlKey}}.html"/>
-+            <argument name="redirectTypeValue" value="Temporary (302)"/>
-+            <argument name="description" value="End To End Test"/>
-+        </actionGroup>
-+
-+        <!--Assert Product Redirect -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
-+            <argument name="redirectPath" value="{{FirstLevelSubCat.name_lwr}}/{{_defaultProduct.urlKey}}.html" />
-+            <argument name="redirectType" value="Temporary (302)" />
-+            <argument name="targetPath" value="$$createSimpleProduct.name$$.html"/>
-+        </actionGroup>
-+
-+        <!--Filter Product in product page and get the Product ID -->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterProduct">
-+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!-- Assert Redirect path, Target Path and Redirect type in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath1">
-+            <argument name="redirectPath" value="$$createSimpleProduct.name$$.html" />
-+            <argument name="redirectType" value="No" />
-+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
-+        </actionGroup>
-+
-+        <!-- Open Category Page and Get Category ID -->
-+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="getCategoryId">
-+            <argument name="category" value="$$createCategory.name$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!-- Assert Redirect path, Target Path and Redirect type in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath2">
-+            <argument name="redirectPath" value="$$createCategory.name$$.html" />
-+            <argument name="redirectType" value="No" />
-+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductUrLRewriteAndAddPermanentRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductUrLRewriteAndAddPermanentRedirectTest.xml
-new file mode 100644
-index 00000000000..66c586d4fe8
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductUrLRewriteAndAddPermanentRedirectTest.xml
-@@ -0,0 +1,62 @@
-+<?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="AdminCreateProductUrLRewriteAndAddPermanentRedirectTest">
-+        <annotations>
-+            <stories value="Create Product UrlRewrite"/>
-+            <title value="Create product URL rewrite, with permanent redirect"/>
-+            <description value="Login as admin, create product UrlRewrite and add Permanent redirect"/>
-+            <testCaseId value="MC-5341"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Filter and Select the created Product -->
-+        <actionGroup ref="AdminSearchUrlRewriteProductBySku" stepKey="searchProduct">
-+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
-+        </actionGroup>
-+
-+        <!-- Update the Store, RequestPath, RedirectType and Description -->
-+        <actionGroup ref="AdminAddUrlRewriteForProduct" stepKey="addUrlRewrite">
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{_defaultProduct.urlKey}}.html"/>
-+            <argument name="redirectTypeValue" value="Permanent (301)"/>
-+            <argument name="description" value="End To End Test"/>
-+        </actionGroup>
-+
-+        <!--Filter Product in product page and get the Product ID -->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterProduct">
-+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
-+
-+
-+        <!--Assert Product Redirect -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
-+            <argument name="redirectPath" value="{{_defaultProduct.urlKey}}.html" />
-+            <argument name="redirectType" value="Permanent (301)" />
-+            <argument name="targetPath" value="$$createSimpleProduct.name$$.html"/>
-+        </actionGroup>
-+
-+        <!-- Assert Redirect Path, Target Path and Redirect type in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath1">
-+            <argument name="redirectPath" value="$$createSimpleProduct.name$$.html" />
-+            <argument name="redirectType" value="No" />
-+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductUrLRewriteAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductUrLRewriteAndAddTemporaryRedirectTest.xml
-new file mode 100644
-index 00000000000..2d797a12bed
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductUrLRewriteAndAddTemporaryRedirectTest.xml
-@@ -0,0 +1,62 @@
-+<?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="AdminCreateProductUrLRewriteAndAddTemporaryRedirectTest">
-+        <annotations>
-+            <stories value="Create Product UrlRewrite"/>
-+            <title value="Create product URL rewrite, with temporary redirect"/>
-+            <description value="Login as admin, create product UrlRewrite and add Temporary redirect"/>
-+            <testCaseId value="MC-5340"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Filter and Select the created Product -->
-+        <actionGroup ref="AdminSearchUrlRewriteProductBySku" stepKey="searchProduct">
-+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
-+        </actionGroup>
-+
-+        <!-- Update the Store, RequestPath, RedirectType and Description -->
-+        <actionGroup ref="AdminAddUrlRewriteForProduct" stepKey="addUrlRewrite">
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{_defaultProduct.urlKey}}.html"/>
-+            <argument name="redirectTypeValue" value="Temporary (302)"/>
-+            <argument name="description" value="End To End Test"/>
-+        </actionGroup>
-+
-+        <!--Filter Product in product page and get the Product ID -->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterProduct">
-+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!--Assert Product Redirect -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
-+            <argument name="redirectPath" value="{{_defaultProduct.urlKey}}.html" />
-+            <argument name="redirectType" value="Temporary (302)" />
-+            <argument name="targetPath" value="$$createSimpleProduct.name$$.html"/>
-+        </actionGroup>
-+
-+        <!-- Assert Redirect Path, Target Path and Redirect type in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath1">
-+            <argument name="redirectPath" value="$$createSimpleProduct.name$$.html" />
-+            <argument name="redirectType" value="No" />
-+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml
-new file mode 100644
-index 00000000000..8712edb69e4
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml
-@@ -0,0 +1,116 @@
-+<?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="AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest">
-+        <annotations>
-+            <stories value="Create product with several websites"/>
-+            <title value="Create product with several websites and check URL Rewrites"/>
-+            <description value="Test log in to Create product and Create product with several websites and check URL Rewrites"/>
-+            <testCaseId value="MC-5359"/>
-+            <severity value="CRITICAL"/>
-+            <group value="urlRewrite"/>
-+            <group value="mtf_migrated"/>
-+            <skip>
-+                <issueId value="MC-17181"/>
-+            </skip>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="NewRootCategory" stepKey="rootCategory"/>
-+            <createData entity="SimpleRootSubCategory" stepKey="category">
-+                <requiredEntity createDataKey="rootCategory"/>
-+            </createData>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct"/>
-+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteStore1">
-+                <argument name="storeGroupName" value="customStore.name"/>
-+            </actionGroup>
-+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteStore2">
-+                <argument name="storeGroupName" value="customStoreGroup.name"/>
-+            </actionGroup>
-+            <deleteData stepKey="deleteRootCategory" createDataKey="rootCategory"/>
-+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create first store -->
-+        <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
-+            <argument name="website" value="{{_defaultWebsite.name}}"/>
-+            <argument name="storeGroupName" value="{{customStore.name}}"/>
-+            <argument name="storeGroupCode" value="{{customStore.code}}"/>
-+        </actionGroup>
-+        <!-- Create first store view -->
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
-+            <argument name="StoreGroup" value="customStore"/>
-+            <argument name="customStore" value="storeViewData"/>
-+        </actionGroup>
-+
-+        <!-- Create second store -->
-+        <actionGroup ref="CreateCustomStore" stepKey="createCustomStore">
-+            <argument name="website" value="{{_defaultWebsite.name}}"/>
-+            <argument name="store" value="{{customStoreGroup.name}}"/>
-+            <argument name="rootCategory" value="$$rootCategory.name$$"/>
-+        </actionGroup>
-+        <!-- Create second store view -->
-+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
-+            <argument name="StoreGroup" value="customStoreGroup"/>
-+            <argument name="customStore" value="customStoreEN"/>
-+        </actionGroup>
-+
-+        <!-- Create simple product with categories created in create data -->
-+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openProductCatalogPage"/>
-+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-+        <actionGroup ref="filterProductGridBySku" stepKey="filterProduct">
-+            <argument name="product" value="$$createProduct$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowOfCreatedSimpleProduct"/>
-+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
-+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$rootCategory.name$$" stepKey="fillSearchForInitialCategory"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$rootCategory.name$$)}}" stepKey="unselectInitialCategory"/>
-+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$category.name$$" stepKey="fillSearchCategory"/>
-+        <click selector="{{AdminProductFormSection.selectCategory($$category.name$$)}}" stepKey="clickOnCategory"/>
-+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-+        <waitForPageLoad stepKey="waitForSimpleProductSaved"/>
-+        <!-- Verify customer see success message -->
-+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-+
-+        <!-- Grab category Id -->
-+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="grabCategoryId">
-+            <argument name="category" value="$$category.name$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
-+        <!-- Open Url Rewrite page and verify new Redirect Path, RedirectType and Target Path for the grabbed category Id -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchPath">
-+            <argument name="redirectPath" value="$$category.name$$.html"/>
-+            <argument name="redirectType" value="No"/>
-+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
-+        </actionGroup>
-+        <see selector="{{AdminUrlRewriteIndexSection.storeView('1')}}" userInput="{{customStoreGroup.name}}" stepKey="seeStoreValueForCategoryId"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.storeView('1')}}" userInput="{{customStoreEN.name}}" stepKey="seeStoreViewValueForCategoryId"/>
-+
-+        <!-- Grab product Id -->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="grabProductId">
-+            <argument name="productSku" value="$$createProduct.sku$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
-+        <!-- Open Url Rewrite page and verify new Redirect Path, RedirectType and Target Path for the grabbed product Id -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchPath1">
-+            <argument name="redirectPath" value="$$createProduct.name$$.html"/>
-+            <argument name="redirectType" value="No"/>
-+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
-+        </actionGroup>
-+        <see selector="{{AdminUrlRewriteIndexSection.storeView('1')}}" userInput="{{customStore.name}}" stepKey="seeStoreValueForProductId"/>
-+        <see selector="{{AdminUrlRewriteIndexSection.storeView('1')}}" userInput="{{storeViewData.name}}" stepKey="seeStoreViewValueForProductId"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCustomUrlRewriteTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCustomUrlRewriteTest.xml
-new file mode 100644
-index 00000000000..cf459310297
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCustomUrlRewriteTest.xml
-@@ -0,0 +1,44 @@
-+<?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="AdminDeleteCustomUrlRewriteTest">
-+        <annotations>
-+            <stories value="Delete custom URL rewrite"/>
-+            <title value="Delete custom URL rewrite"/>
-+            <description value="Test log in to URL rewrite and Delete custom URL rewrite"/>
-+            <testCaseId value="MC-5350"/>
-+            <severity value="CRITICAL"/>
-+            <group value="urlRewrite"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="defaultUrlRewrite" stepKey="urlRewrite" />
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Delete created custom url rewrite and verify AssertUrlRewriteDeletedMessage-->
-+        <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteUrlRewrite">
-+            <argument name="requestPath" value="$$urlRewrite.request_path$$"/>
-+        </actionGroup>
-+
-+        <!--Search and verify AssertUrlRewriteNotInGrid-->
-+        <actionGroup ref="AdminSearchDeletedUrlRewrite" stepKey="searchDeletedUrlRewriteInGrid">
-+            <argument name="requestPath" value="$$urlRewrite.request_path$$"/>
-+        </actionGroup>
-+
-+        <!--Verify AssertPageByUrlRewriteIsNotFound-->
-+        <actionGroup ref="AssertPageByUrlRewriteIsNotFound" stepKey="amOnPage">
-+            <argument name="requestPath" value="$$urlRewrite.request_path$$"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminGenerateUrlRewritesForProductInCategoriesSwitchOffTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminGenerateUrlRewritesForProductInCategoriesSwitchOffTest.xml
-new file mode 100644
-index 00000000000..884c7778786
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminGenerateUrlRewritesForProductInCategoriesSwitchOffTest.xml
-@@ -0,0 +1,73 @@
-+<?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="AdminGenerateUrlRewritesForProductInCategoriesSwitchOffTest">
-+        <annotations>
-+            <features value="Url Rewrite"/>
-+            <stories value="Url Rewrites cleared in case of switching configuration off"/>
-+            <title value="Clear Url Rewrites after configuration turned off"/>
-+            <description value="Check Url Rewrites for product in categories is correctly cleared after configuration turned off"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16330"/>
-+            <group value="urlRewrite"/>
-+        </annotations>
-+
-+        <before>
-+            <!-- Set the configuration for Generate "category/product" URL Rewrites-->
-+            <comment userInput="Enable config to generate category/product URL Rewrites" stepKey="commentEnableConfig" />
-+            <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="enableGenerateUrlRewrite"/>
-+            <!--Flush cache-->
-+            <magentoCLI command="cache:flush" stepKey="cleanCache1"/>
-+
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-+
-+            <!-- Set the configuration for Generate "category/product" URL Rewrites-->
-+            <comment userInput="Enable config to generate category/product URL Rewrites" stepKey="commentEnableConfig" />
-+            <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="enableGenerateUrlRewrite"/>
-+            <!--Flush cache-->
-+            <magentoCLI command="cache:flush" stepKey="cleanCache1"/>
-+
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- 1. Open Marketing - SEO & Search - URL Rewrites -->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="amOnUrlRewriteIndexPage"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="inputProductName"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue1"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($createCategory.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue2"/>
-+
-+        <!-- 2. Set the configuration for Generate "category/product" URL Rewrites to No-->
-+        <amOnPage url="{{CatalogConfigPage.url}}" stepKey="amOnCatalogConfigPage"/>
-+        <conditionalClick selector="{{CatalogSection.seo}}" dependentSelector="{{CatalogSection.CheckIfSeoTabExpand}}" visible="true" stepKey="expandSeoTab" />
-+        <waitForElementVisible  selector="{{CatalogSection.GenerateUrlRewrites}}" stepKey="GenerateUrlRewritesSelect"/>
-+        <selectOption userInput="0" selector="{{CatalogSection.GenerateUrlRewrites}}" stepKey="selectUrlGenerationNo" />
-+        <waitForElementVisible selector="{{GenerateUrlRewritesConfirm.title}}" stepKey="waitForConfirmModal"/>
-+        <click selector="{{GenerateUrlRewritesConfirm.ok}}" stepKey="confirmSwitchingGenerationOff"/>
-+        <click selector="{{CatalogSection.save}}" stepKey="saveConfig" />
-+        <waitForPageLoad stepKey="waitForSavingSystemConfiguration"/>
-+
-+        <!-- 3. Flush cache-->
-+        <magentoCLI command="cache:flush" stepKey="cleanCache"/>
-+
-+        <!-- 4. Open Marketing - SEO & Search - URL Rewrites -->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="amOnUrlRewriteIndexPage2"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="inputProductName2"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton2"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue1"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($createCategory.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="dontSeeValue2"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminMarketingUrlRewritesNavigateMenuTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminMarketingUrlRewritesNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..443307b427b
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminMarketingUrlRewritesNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminMarketingUrlRewritesNavigateMenuTest">
-+        <annotations>
-+            <features value="UrlRewrite"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin marketing url rewrites navigate menu test"/>
-+            <description value="Admin should be able to navigate to Marketing > URL Rewrites"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14202"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingURLRewritesPage">
-+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuMarketingSEOAndSearchURLRewrites.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuMarketingSEOAndSearchURLRewrites.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddAspxRequestPathTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddAspxRequestPathTest.xml
-new file mode 100644
-index 00000000000..07275350522
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddAspxRequestPathTest.xml
-@@ -0,0 +1,61 @@
-+<?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="AdminUpdateCategoryUrlRewriteAndAddAspxRequestPathTest">
-+        <annotations>
-+            <stories value="Update URL rewrite"/>
-+            <title value="Update Category URL Rewrites, aspx request path"/>
-+            <description value="Login as Admin, update category UrlRewrite, add aspx request path and Temporary redirect type "/>
-+            <testCaseId value="MC-5358"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="category"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search and Select Edit option for created category in grid -->
-+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="editUrlRewrite">
-+            <argument name="requestPath" value="$$category.custom_attributes[url_key]$$.html"/>
-+        </actionGroup>
-+
-+        <!-- Open UrlRewrite Edit page and update the fields  -->
-+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateCategoryUrlRewrite">
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{defaultUrlRewrite.request_path}}"/>
-+            <argument name="redirectTypeValue" value="Temporary (302)"/>
-+            <argument name="description" value="Update Category Url Rewrite"/>
-+        </actionGroup>
-+
-+        <!-- Open Category Page and Get Category ID -->
-+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="getCategoryId">
-+            <argument name="category"  value="$$category.name$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!--Assert category Url Rewrite in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByNewRequestPath">
-+            <argument name="redirectPath" value="{{defaultUrlRewrite.request_path}}" />
-+            <argument name="redirectType" value="Temporary (302)" />
-+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
-+        </actionGroup>
-+
-+        <!-- Assert category redirect in Store Front -->
-+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront">
-+            <argument name="category" value="$$category.name$$"/>
-+            <argument name="newRequestPath" value="{{defaultUrlRewrite.request_path}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddNoRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddNoRedirectTest.xml
-new file mode 100644
-index 00000000000..80b9dbe41bf
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddNoRedirectTest.xml
-@@ -0,0 +1,61 @@
-+<?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="AdminUpdateCategoryUrlRewriteAndAddNoRedirectTest">
-+        <annotations>
-+            <stories value="Update URL rewrite"/>
-+            <title value="Update Category URL Rewrites, no redirect type"/>
-+            <description value="Login as Admin and update category Url Rewrite and add redirect type No"/>
-+            <testCaseId value="MC-5355"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="category"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search and Select Edit option for created category in grid -->
-+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="editUrlRewrite">
-+            <argument name="requestPath" value="$$category.custom_attributes[url_key]$$.html"/>
-+        </actionGroup>
-+
-+        <!-- Open UrlRewrite Edit page and update the fields  -->
-+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateCategoryUrlRewrite">
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{defaultUrlRewrite.request_path}}"/>
-+            <argument name="redirectTypeValue" value="No"/>
-+            <argument name="description" value="Update Category Url Rewrite"/>
-+        </actionGroup>
-+
-+        <!-- Open Category Page and Get Category ID -->
-+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="getCategoryId">
-+            <argument name="category"  value="$$category.name$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!-- Assert category Url Rewrite in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByNewRequestPath">
-+            <argument name="redirectPath" value="{{defaultUrlRewrite.request_path}}" />
-+            <argument name="redirectType" value="No" />
-+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
-+        </actionGroup>
-+
-+        <!-- Assert Category redirect in Store Front -->
-+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront">
-+            <argument name="category" value="$$category.name$$"/>
-+            <argument name="newRequestPath" value="{{defaultUrlRewrite.request_path}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddPermanentRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddPermanentRedirectTest.xml
-new file mode 100644
-index 00000000000..be9fd1d83c8
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddPermanentRedirectTest.xml
-@@ -0,0 +1,61 @@
-+<?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="AdminUpdateCategoryUrlRewriteAndAddPermanentRedirectTest">
-+        <annotations>
-+            <stories value="Update URL rewrite"/>
-+            <title value="Update Category URL Rewrites, permanent"/>
-+            <description value="Login as Admin and update category UrlRewrite and add Permanent redirect type"/>
-+            <testCaseId value="MC-5357"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="category"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search and Select Edit option for created category in grid -->
-+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="editUrlRewrite">
-+            <argument name="requestPath" value="$$category.custom_attributes[url_key]$$.html"/>
-+        </actionGroup>
-+
-+        <!-- Open UrlRewrite Edit page and update the fields  -->
-+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateCategoryUrlRewrite">
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{defaultUrlRewrite.request_path}}"/>
-+            <argument name="redirectTypeValue" value="Permanent (301)"/>
-+            <argument name="description" value="Update Category Url Rewrite"/>
-+        </actionGroup>
-+
-+        <!-- Open Category Page and Get Category ID -->
-+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="getCategoryId">
-+            <argument name="category"  value="$$category.name$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!--Assert category Url Rewrite in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByNewRequestPath">
-+            <argument name="redirectPath" value="{{defaultUrlRewrite.request_path}}" />
-+            <argument name="redirectType" value="Permanent (301)" />
-+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
-+        </actionGroup>
-+
-+        <!-- Assert category redirect in Store Front -->
-+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront">
-+            <argument name="category" value="$$category.name$$"/>
-+            <argument name="newRequestPath" value="{{defaultUrlRewrite.request_path}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml
-new file mode 100644
-index 00000000000..7e1b9acbc47
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml
-@@ -0,0 +1,61 @@
-+<?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="AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest">
-+        <annotations>
-+            <stories value="Update URL rewrite"/>
-+            <title value="Update Category URL Rewrites, Temporary redirect type"/>
-+            <description value="Login as Admin and update category UrlRewrite and add Temporary redirect type"/>
-+            <testCaseId value="MC-5356"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="category"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search and Select Edit option for created category in grid -->
-+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="editUrlRewrite">
-+            <argument name="requestPath" value="$$category.custom_attributes[url_key]$$.html"/>
-+        </actionGroup>
-+
-+        <!-- Open UrlRewrite Edit page and update the fields  -->
-+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateCategoryUrlRewrite">
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{updateUrlRewrite.request_path}}"/>
-+            <argument name="redirectTypeValue" value="Temporary (302)"/>
-+            <argument name="description" value="Update Category Url Rewrite"/>
-+        </actionGroup>
-+
-+        <!-- Open Category Page and Get Category ID -->
-+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="getCategoryId">
-+            <argument name="category"  value="$$category.name$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!--Assert category Url Rewrite in grid -->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByNewRequestPath">
-+            <argument name="redirectPath" value="{{updateUrlRewrite.request_path}}" />
-+            <argument name="redirectType" value="Temporary (302)" />
-+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
-+        </actionGroup>
-+
-+        <!-- Assert category redirect in Store Front -->
-+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront">
-+            <argument name="category" value="$$category.name$$"/>
-+            <argument name="newRequestPath" value="{{updateUrlRewrite.request_path}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesPermanentTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesPermanentTest.xml
-new file mode 100644
-index 00000000000..8339eb63abe
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesPermanentTest.xml
-@@ -0,0 +1,58 @@
-+<?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="AdminUpdateCustomURLRewritesPermanentTest">
-+        <annotations>
-+            <stories value="Update Custom URL Rewrites"/>
-+            <title value="Update Custom URL Rewrites, permanent"/>
-+            <description value="Test log in to URL Rewrites and Update Custom URL Rewrites, permanent"/>
-+            <testCaseId value="MC-5353"/>
-+            <severity value="CRITICAL"/>
-+            <group value="urlRewrite"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="defaultUrlRewrite" stepKey="urlRewrite"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
-+                <argument name="requestPath" value="{{customPermanentUrlRewrite.request_path}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Search default custom url rewrite in grid-->
-+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="searchUrlRewrite">
-+            <argument name="requestPath" value="$$urlRewrite.request_path$$"/>
-+        </actionGroup>
-+
-+        <!--Update default custom url rewrite as per requirement and verify AssertUrlRewriteSaveMessage-->
-+        <actionGroup ref="AdminUpdateCustomUrlRewrite" stepKey="updateUrlRewrite">
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{customPermanentUrlRewrite.request_path}}"/>
-+            <argument name="targetPath" value="{{customPermanentUrlRewrite.target_path}}"/>
-+            <argument name="redirectTypeValue" value="{{customPermanentUrlRewrite.redirect_type_label}}"/>
-+            <argument name="description" value="{{customPermanentUrlRewrite.description}}"/>
-+        </actionGroup>
-+
-+        <!--Search and verify updated AssertUrlRewriteInGrid-->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="verifyUpdatedUrlRewriteInGrid">
-+            <argument name="redirectPath" value="{{customPermanentUrlRewrite.request_path}}"/>
-+            <argument name="redirectType" value="{{customPermanentUrlRewrite.redirect_type_label}}"/>
-+            <argument name="targetPath" value="{{customPermanentUrlRewrite.target_path}}"/>
-+        </actionGroup>
-+
-+        <!--AssertUrlRewriteSuccessOutsideRedirect-->
-+        <amOnPage url="{{StorefrontHomePage.url}}{{customPermanentUrlRewrite.request_path}}" stepKey="amOnStorefrontPage"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <seeInCurrentUrl url="{{customPermanentUrlRewrite.target_path}}" stepKey="seeAssertUrlRewrite"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesTemporaryTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesTemporaryTest.xml
-new file mode 100644
-index 00000000000..07d578cbbec
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesTemporaryTest.xml
-@@ -0,0 +1,68 @@
-+<?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="AdminUpdateCustomURLRewritesTemporaryTest">
-+        <annotations>
-+            <stories value="Update Custom URL Rewrites"/>
-+            <title value="Update Custom URL Rewrites, temporary"/>
-+            <description value="Test log in to URL Rewrites and Update Custom URL Rewrites, temporary"/>
-+            <testCaseId value="MC-5354"/>
-+            <severity value="CRITICAL"/>
-+            <group value="urlRewrite"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="defaultUrlRewrite" stepKey="urlRewrite"/>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
-+                <argument name="requestPath" value="{{customTemporaryUrlRewrite.request_path}}"/>
-+            </actionGroup>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Filter Product in product page and get the Product ID -->
-+        <actionGroup ref="filterAndSelectProduct" stepKey="filterProduct">
-+            <argument name="productSku" value="$$createProduct.sku$$"/>
-+        </actionGroup>
-+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
-+
-+        <!--Search default custom url rewrite in grid-->
-+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="searchUrlRewrite">
-+            <argument name="requestPath" value="$$urlRewrite.request_path$$"/>
-+        </actionGroup>
-+
-+        <!--Update default custom url rewrite as per requirement and verify AssertUrlRewriteSaveMessage-->
-+        <actionGroup ref="AdminUpdateCustomUrlRewrite" stepKey="updateUrlRewrite">
-+            <argument name="storeValue" value="Default Store View"/>
-+            <argument name="requestPath" value="{{customTemporaryUrlRewrite.request_path}}"/>
-+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
-+            <argument name="redirectTypeValue" value="{{customTemporaryUrlRewrite.redirect_type_label}}"/>
-+            <argument name="description" value="{{customTemporaryUrlRewrite.description}}"/>
-+        </actionGroup>
-+
-+        <!--Search and verify AssertUrlRewriteInGrid-->
-+        <actionGroup ref="AdminSearchByRequestPath" stepKey="verifyUpdatedUrlRewriteInGrid">
-+            <argument name="redirectPath" value="{{customTemporaryUrlRewrite.request_path}}"/>
-+            <argument name="redirectType" value="{{customTemporaryUrlRewrite.redirect_type_label}}"/>
-+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
-+        </actionGroup>
-+
-+        <!-- AssertUrlRewriteCustomSearchRedirect-->
-+        <actionGroup ref="AssertStorefrontProductRedirect" stepKey="verifyProductInStoreFrontPage">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+            <argument name="productSku" value="$$createProduct.sku$$"/>
-+            <argument name="productRequestPath" value="$$createProduct.name$$.html"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.xml
-new file mode 100644
-index 00000000000..ea370d84195
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.xml
-@@ -0,0 +1,49 @@
-+<?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="AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest">
-+        <annotations>
-+            <stories value="URL Rewrite"/>
-+            <title value="Update Product URL Rewrites"/>
-+            <description value="Login as Admin and update product UrlRewrite and add Temporary redirect type "/>
-+            <testCaseId value="MC-5351"/>
-+            <severity value="CRITICAL"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="defaultSimpleProduct" stepKey="createProduct"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Search and Select Edit option for created product in grid -->
-+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="editUrlRewrite">
-+            <argument name="requestPath" value="$$createProduct.name$$"/>
-+        </actionGroup>
-+
-+        <!-- Open UrlRewrite Edit page and update the fields  -->
-+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateCategoryUrlRewrite">
-+            <argument name="storeValue" value="{{updateUrlRewrite.store}}"/>
-+            <argument name="requestPath" value="{{updateUrlRewrite.request_path}}"/>
-+            <argument name="redirectTypeValue" value="{{updateUrlRewrite.redirect_type_label}}"/>
-+            <argument name="description" value="{{updateUrlRewrite.description}}"/>
-+        </actionGroup>
-+
-+        <!-- Assert product Url Rewrite in StoreFront -->
-+        <actionGroup ref="AssertStorefrontProductRedirect" stepKey="assertProductUrlRewriteInStoreFront">
-+            <argument name="productName" value="$$createProduct.name$$"/>
-+            <argument name="productSku" value="$$createProduct.sku$$"/>
-+            <argument name="productRequestPath" value="{{updateUrlRewrite.request_path}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest.xml
-new file mode 100644
-index 00000000000..b708b635991
---- /dev/null
-+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest.xml
-@@ -0,0 +1,281 @@
-+<?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="AdminUrlRewritesForProductInAnchorCategoriesTest">
-+        <annotations>
-+            <features value="Url Rewrite"/>
-+            <stories value="Url-rewrites for product in anchor categories"/>
-+            <title value="Url-rewrites for product in anchor categories"/>
-+            <description value="For a product with category that has parent anchor categories, the rewrites is created when the category/product is saved."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16568"/>
-+            <group value="urlRewrite"/>
-+        </annotations>
-+
-+        <!-- Preconditions-->
-+        <!-- Create 3 categories -->
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="simpleSubCategory1"/>
-+            <createData entity="SubCategoryWithParent" stepKey="simpleSubCategory2">
-+                <requiredEntity createDataKey="simpleSubCategory1"/>
-+            </createData>
-+            <createData entity="SubCategoryWithParent" stepKey="simpleSubCategory3">
-+                <requiredEntity createDataKey="simpleSubCategory2"/>
-+            </createData>
-+        <!-- Create Simple product 1 and assign it to Category 3 -->
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="simpleSubCategory3"/>
-+            </createData>
-+            <!-- Set the configuration for Generate "category/product" URL Rewrites-->
-+            <comment userInput="Enable config to generate category/product URL Rewrites " stepKey="commentEnableConfig" />
-+            <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="enableGenerateUrlRewrite"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="simpleSubCategory1" stepKey="deletesimpleSubCategory1"/>
-+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-+        </after>
-+        <!-- Steps -->
-+        <!-- 1. Log in to Admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <!-- 2. Open Marketing - SEO & Search - URL Rewrites -->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="amOnUrlRewriteIndexPage"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="inputProductName"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue1"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue2"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue3"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$simpleSubCategory3.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue4"/>
-+
-+        <!-- 3. Edit Category 1 for DEFAULT Store View: -->
-+        <actionGroup ref="switchCategoryStoreView" stepKey="switchStoreView">
-+            <argument name="Store" value="_defaultStore.name"/>
-+            <argument name="CatName" value="$$simpleSubCategory1.name$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection2"/>
-+        <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyDefaultValueCheckbox}}"  stepKey="uncheckRedirect2"/>
-+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="$simpleSubCategory1.custom_attributes[url_key]$-new" stepKey="changeURLKey"/>
-+        <checkOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}"  stepKey="checkUrlKeyRedirect"/>
-+        <!-- 4. Save Category 1 -->
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessageAfterSaved"/>
-+
-+        <!-- 5. Open Marketing - SEO & Search - URL Rewrites -->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="amOnUrlRewriteIndexPage2"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="inputProductName2"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton2"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue1"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue2"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue3"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$simpleSubCategory3.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue4"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$-new/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue5"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$-new/$simpleSubCategory2.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue6"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$-new/$simpleSubCategory2.custom_attributes[url_key]$/$simpleSubCategory3.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue7"/>
-+    </test>
-+
-+    <test name="AdminUrlRewritesForProductInAnchorCategoriesTestWithConfigurationTurnedOff">
-+        <annotations>
-+            <features value="Url Rewrite"/>
-+            <stories value="Url-rewrites for product in anchor categories"/>
-+            <title value="Url-rewrites for product in anchor categories with configuration turned off"/>
-+            <description value="For a product with category that has parent anchor categories, the rewrites is created when the category/product is saved."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-6844"/>
-+            <group value="urlRewrite"/>
-+        </annotations>
-+
-+        <!-- Preconditions-->
-+        <!-- Create 3 categories -->
-+        <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="SimpleSubCategory" stepKey="simpleSubCategory1"/>
-+            <createData entity="SubCategoryWithParent" stepKey="simpleSubCategory2">
-+                <requiredEntity createDataKey="simpleSubCategory1"/>
-+            </createData>
-+            <createData entity="SubCategoryWithParent" stepKey="simpleSubCategory3">
-+                <requiredEntity createDataKey="simpleSubCategory2"/>
-+            </createData>
-+            <!-- Create Simple product 1 and assign it to Category 3 -->
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="simpleSubCategory3"/>
-+            </createData>
-+            <!-- 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="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="simpleSubCategory1" stepKey="deletesimpleSubCategory1"/>
-+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-+            <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="resetConfigurationSetting"/>
-+            <!--Flush cache-->
-+            <magentoCLI command="cache:flush" stepKey="cleanCache2"/>
-+        </after>
-+        <!-- Steps -->
-+        <!-- 1. Log in to Admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <!-- 2. Open Marketing - SEO & Search - URL Rewrites -->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="amOnUrlRewriteIndexPage"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="inputProductName"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue1"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue2"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue3"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$simpleSubCategory3.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue4"/>
-+
-+        <!-- 3. Edit Category 1 for DEFAULT Store View: -->
-+        <actionGroup ref="switchCategoryStoreView" stepKey="switchStoreView">
-+            <argument name="Store" value="_defaultStore.name"/>
-+            <argument name="CatName" value="$$simpleSubCategory1.name$$"/>
-+        </actionGroup>
-+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection2"/>
-+        <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyDefaultValueCheckbox}}"  stepKey="uncheckRedirect2"/>
-+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="$simpleSubCategory1.custom_attributes[url_key]$-new" stepKey="changeURLKey"/>
-+        <checkOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}"  stepKey="checkUrlKeyRedirect"/>
-+        <!-- 4. Save Category 1 -->
-+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
-+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessageAfterSaved"/>
-+
-+        <!-- 5. Open Marketing - SEO & Search - URL Rewrites -->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="amOnUrlRewriteIndexPage2"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="inputProductName2"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton2"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue1"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue2"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue3"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$simpleSubCategory3.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue4"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$-new/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue5"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$-new/$simpleSubCategory2.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue6"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$-new/$simpleSubCategory2.custom_attributes[url_key]$/$simpleSubCategory3.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue7"/>
-+
-+        <amOnPage url="/$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="navigateToProductPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProductName"/>
-+
-+        <amOnPage url="/$simpleSubCategory1.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="navigateToProductPage2"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProductName2"/>
-+        <amOnPage url="/$simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="navigateToProductPage3"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProductName3"/>
-+        <amOnPage url="/$simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$simpleSubCategory3.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="navigateToProductPage4"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProductName4"/>
-+
-+        <amOnPage url="/$simpleSubCategory1.custom_attributes[url_key]$-new/$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="navigateToProductPage5"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProductName5"/>
-+        <amOnPage url="/$simpleSubCategory1.custom_attributes[url_key]$-new/$simpleSubCategory2.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="navigateToProductPage6"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProductName6"/>
-+        <amOnPage url="/$simpleSubCategory1.custom_attributes[url_key]$-new/$simpleSubCategory2.custom_attributes[url_key]$/$simpleSubCategory3.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="navigateToProductPage7"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProductName7"/>
-+    </test>
-+
-+    <test name="AdminUrlRewritesForProductInAnchorCategoriesTestAllStoreView" extends="AdminUrlRewritesForProductInAnchorCategoriesTest">
-+        <annotations>
-+            <features value="Url Rewrite"/>
-+            <stories value="Url-rewrites for product in anchor categories for all store views"/>
-+            <title value="Url-rewrites for product in anchor categories for all store views"/>
-+            <description value="Verify that Saving category do not delete UrlRewrites for subcategories and all products in them."/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-16681"/>
-+            <group value="urlRewrite"/>
-+        </annotations>
-+        <before>
-+            <remove keyForRemoval="createSimpleProduct"/>
-+            <!-- Create Simple product 1 and assign it to all the threee categories above -->
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct" after="simpleSubCategory3">
-+                <requiredEntity createDataKey="simpleSubCategory1"/>
-+                <requiredEntity createDataKey="simpleSubCategory2"/>
-+                <requiredEntity createDataKey="simpleSubCategory3"/>
-+            </createData>
-+        </before>
-+        <remove keyForRemoval="switchStoreView"/>
-+        <!-- 3. Edit Category 1 for All store view: -->
-+        <actionGroup ref="navigateToCreatedCategory" stepKey="goToCategoryPage" after="seeValue4">
-+            <argument name="Category" value="$$simpleSubCategory1$$"/>
-+        </actionGroup>
-+        <remove keyForRemoval="uncheckRedirect2"/>
-+    </test>
-+
-+    <test name="AdminUrlRewritesForProductInAnchorCategoriesTestAllStoreViewWithConfigurationTurnedOff" extends="AdminUrlRewritesForProductInAnchorCategoriesTestWithConfigurationTurnedOff">
-+        <annotations>
-+            <features value="Url Rewrite"/>
-+            <stories value="Url-rewrites for product in anchor categories for all store views"/>
-+            <title value="Url-rewrites for product in anchor categories for all store views with configuration turned off"/>
-+            <description value="Url-rewrites for product in anchor categories for all store views with configuration turned off"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-6964"/>
-+            <group value="urlRewrite"/>
-+        </annotations>
-+        <before>
-+            <remove keyForRemoval="createSimpleProduct"/>
-+            <!-- Create Simple product 1 and assign it to all the threee categories above -->
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct" after="simpleSubCategory3">
-+                <requiredEntity createDataKey="simpleSubCategory1"/>
-+                <requiredEntity createDataKey="simpleSubCategory2"/>
-+                <requiredEntity createDataKey="simpleSubCategory3"/>
-+            </createData>
-+        </before>
-+        <remove keyForRemoval="switchStoreView"/>
-+        <!-- 3. Edit Category 1 for All store view: -->
-+        <actionGroup ref="navigateToCreatedCategory" stepKey="goToCategoryPage" after="seeValue4">
-+            <argument name="Category" value="$$simpleSubCategory1$$"/>
-+        </actionGroup>
-+        <remove keyForRemoval="uncheckRedirect2"/>
-+    </test>
-+
-+    <test name="AdminUrlRewritesForProductsWithConfigurationTurnedOff">
-+        <annotations>
-+            <features value="Url Rewrite"/>
-+            <stories value="No Url-rewrites for product if configuration to generate url rewrite for Generate 'category/product' URL Rewrites is enabled "/>
-+            <title value="No auto generated of request path for simple product when assigned to subCategory"/>
-+            <description value="No auto generated of request path when SEO configuration to Generate url rewrite for Generate 'category/product' URL Rewrites is set to No"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-94803"/>
-+            <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="SimpleSubCategory" stepKey="simpleSubCategory1"/>
-+            <!-- Create Simple product 1 and assign it to Category 1 -->
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="simpleSubCategory1"/>
-+            </createData>
-+            <!-- 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="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+            <deleteData createDataKey="simpleSubCategory1" stepKey="deletesimpleSubCategory1"/>
-+            <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="resetConfigurationSetting"/>
-+            <!--Flush cache-->
-+            <magentoCLI command="cache:flush" stepKey="cleanCache2"/>
-+        </after>
-+        <!-- 1. Log in to Admin -->
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        <!-- 2. Open Marketing - SEO & Search - URL Rewrites -->
-+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="amOnUrlRewriteIndexPage"/>
-+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="inputProductName5"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton5"/>
-+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeProducturl"/>
-+        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="dontSeeCategoryProducturlKey"/>
-+        <amOnPage url="/$simpleSubCategory1.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="navigateToProductPage"/>
-+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProductName"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
-index 642ca0f9af6..6eea8b962bf 100644
---- a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
-+++ b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
-@@ -3,63 +3,91 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- namespace Magento\UrlRewrite\Test\Unit\Controller;
- 
- use Magento\Framework\App\Action\Forward;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Framework\UrlInterface;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
- use Magento\Store\Model\Store;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use Zend\Stdlib\ParametersInterface;
- 
- /**
-+ * Test class for UrlRewrite Controller Router
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class RouterTest extends \PHPUnit\Framework\TestCase
- {
--    /** @var \Magento\UrlRewrite\Controller\Router */
--    protected $router;
-+    /**
-+     * @var \Magento\UrlRewrite\Controller\Router
-+     */
-+    private $router;
- 
--    /** @var \Magento\Framework\App\ActionFactory|\PHPUnit_Framework_MockObject_MockObject */
--    protected $actionFactory;
-+    /**
-+     * @var \Magento\Framework\App\ActionFactory|MockObject
-+     */
-+    private $actionFactory;
- 
--    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $url;
-+    /**
-+     * @var UrlInterface|MockObject
-+     */
-+    private $url;
- 
--    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $storeManager;
-+    /**
-+     * @var \Magento\Store\Model\StoreManagerInterface|MockObject
-+     */
-+    private $storeManager;
- 
--    /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */
--    protected $store;
-+    /**
-+     * @var Store|MockObject
-+     */
-+    private $store;
- 
--    /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $response;
-+    /**
-+     * @var \Magento\Framework\App\ResponseInterface|MockObject
-+     */
-+    private $response;
- 
--    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $request;
-+    /**
-+     * @var \Magento\Framework\App\RequestInterface|MockObject
-+     */
-+    private $request;
- 
--    /** @var \Magento\UrlRewrite\Model\UrlFinderInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $urlFinder;
-+    /**
-+     * @var ParametersInterface|MockObject
-+     */
-+    private $requestQuery;
- 
-     /**
--     * @return void
-+     * @var \Magento\UrlRewrite\Model\UrlFinderInterface|MockObject
-+     */
-+    private $urlFinder;
-+
-+    /**
-+     * @inheritDoc
-      */
-     protected function setUp()
-     {
-+        $objectManager = new ObjectManager($this);
-         $this->actionFactory = $this->createMock(\Magento\Framework\App\ActionFactory::class);
--        $this->url = $this->createMock(\Magento\Framework\UrlInterface::class);
-+        $this->url = $this->createMock(UrlInterface::class);
-         $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-         $this->response = $this->createPartialMock(
-             \Magento\Framework\App\ResponseInterface::class,
-             ['setRedirect', 'sendResponse']
-         );
-+        $this->requestQuery = $this->createMock(ParametersInterface::class);
-         $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-             ->disableOriginalConstructor()->getMock();
-+        $this->request->method('getQuery')->willReturn($this->requestQuery);
-         $this->urlFinder = $this->createMock(\Magento\UrlRewrite\Model\UrlFinderInterface::class);
-         $this->store = $this->getMockBuilder(
--            \Magento\Store\Model\Store::class
-+            Store::class
-         )->disableOriginalConstructor()->getMock();
- 
--        $this->router = (new ObjectManager($this))->getObject(
-+        $this->router = $objectManager->getObject(
-             \Magento\UrlRewrite\Controller\Router::class,
-             [
-                 'actionFactory' => $this->actionFactory,
-@@ -139,15 +167,17 @@ class RouterTest extends \PHPUnit\Framework\TestCase
-         $this->urlFinder
-             ->expects($this->any())
-             ->method('findOneByData')
--            ->willReturnMap([
-+            ->willReturnMap(
-                 [
-                     [
--                        UrlRewrite::REQUEST_PATH => $initialRequestPath,
--                        UrlRewrite::STORE_ID     => $currentStoreId,
--                    ],
--                    $urlRewrite,
-+                        [
-+                            UrlRewrite::REQUEST_PATH => $initialRequestPath,
-+                            UrlRewrite::STORE_ID     => $currentStoreId,
-+                        ],
-+                        $urlRewrite,
-+                    ]
-                 ]
--            ]);
-+            );
-         $this->actionFactory
-             ->expects($this->once())
-             ->method('create')
-@@ -163,17 +193,17 @@ class RouterTest extends \PHPUnit\Framework\TestCase
-         $this->request->expects($this->any())->method('getPathInfo')->will($this->returnValue('request-path'));
-         $this->request->expects($this->any())->method('getParam')->with('___from_store')
-             ->will($this->returnValue('old-store'));
--        $oldStore = $this->getMockBuilder(\Magento\Store\Model\Store::class)->disableOriginalConstructor()->getMock();
-+        $oldStore = $this->getMockBuilder(Store::class)->disableOriginalConstructor()->getMock();
-         $this->storeManager->expects($this->any())->method('getStore')
-             ->will($this->returnValueMap([['old-store', $oldStore], [null, $this->store]]));
-         $oldStore->expects($this->any())->method('getId')->will($this->returnValue('old-store-id'));
-         $this->store->expects($this->any())->method('getId')->will($this->returnValue('current-store-id'));
--        $oldUrlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
-+        $oldUrlRewrite = $this->getMockBuilder(UrlRewrite::class)
-             ->disableOriginalConstructor()->getMock();
-         $oldUrlRewrite->expects($this->any())->method('getEntityType')->will($this->returnValue('entity-type'));
-         $oldUrlRewrite->expects($this->any())->method('getEntityId')->will($this->returnValue('entity-id'));
-         $oldUrlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('request-path'));
--        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
-+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
-             ->disableOriginalConstructor()->getMock();
-         $urlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('request-path'));
- 
-@@ -188,36 +218,38 @@ class RouterTest extends \PHPUnit\Framework\TestCase
-         $this->request->expects($this->any())->method('getPathInfo')->will($this->returnValue('request-path'));
-         $this->request->expects($this->any())->method('getParam')->with('___from_store')
-             ->will($this->returnValue('old-store'));
--        $oldStore = $this->getMockBuilder(\Magento\Store\Model\Store::class)->disableOriginalConstructor()->getMock();
-+        $oldStore = $this->getMockBuilder(Store::class)->disableOriginalConstructor()->getMock();
-         $this->storeManager->expects($this->any())->method('getStore')
-             ->will($this->returnValueMap([['old-store', $oldStore], [null, $this->store]]));
-         $oldStore->expects($this->any())->method('getId')->will($this->returnValue('old-store-id'));
-         $this->store->expects($this->any())->method('getId')->will($this->returnValue('current-store-id'));
--        $oldUrlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
-+        $oldUrlRewrite = $this->getMockBuilder(UrlRewrite::class)
-             ->disableOriginalConstructor()->getMock();
-         $oldUrlRewrite->expects($this->any())->method('getEntityType')->will($this->returnValue('entity-type'));
-         $oldUrlRewrite->expects($this->any())->method('getEntityId')->will($this->returnValue('entity-id'));
-         $oldUrlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('old-request-path'));
--        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
-+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
-             ->disableOriginalConstructor()->getMock();
-         $urlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('old-request-path'));
- 
-         $this->urlFinder->expects($this->any())->method('findOneByData')->will(
--            $this->returnValueMap([
--                [
--                    [UrlRewrite::REQUEST_PATH => 'request-path', UrlRewrite::STORE_ID => 'old-store-id'],
--                    $oldUrlRewrite,
--                ],
-+            $this->returnValueMap(
-                 [
-                     [
--                        UrlRewrite::ENTITY_TYPE => 'entity-type',
--                        UrlRewrite::ENTITY_ID => 'entity-id',
--                        UrlRewrite::STORE_ID => 'current-store-id',
--                        UrlRewrite::IS_AUTOGENERATED => 1,
-+                        [UrlRewrite::REQUEST_PATH => 'request-path', UrlRewrite::STORE_ID => 'old-store-id'],
-+                        $oldUrlRewrite,
-                     ],
--                    $urlRewrite
--                ],
--            ])
-+                    [
-+                        [
-+                            UrlRewrite::ENTITY_TYPE => 'entity-type',
-+                            UrlRewrite::ENTITY_ID => 'entity-id',
-+                            UrlRewrite::STORE_ID => 'current-store-id',
-+                            UrlRewrite::IS_AUTOGENERATED => 1,
-+                        ],
-+                        $urlRewrite
-+                    ],
-+                ]
-+            )
-         );
- 
-         $this->assertNull($this->router->match($this->request));
-@@ -229,7 +261,7 @@ class RouterTest extends \PHPUnit\Framework\TestCase
-     public function testMatchWithRedirect()
-     {
-         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
--        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
-+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
-             ->disableOriginalConstructor()->getMock();
-         $urlRewrite->expects($this->any())->method('getRedirectType')->will($this->returnValue('redirect-code'));
-         $urlRewrite->expects($this->any())->method('getTargetPath')->will($this->returnValue('target-path'));
-@@ -251,7 +283,7 @@ class RouterTest extends \PHPUnit\Framework\TestCase
-     public function testMatchWithCustomInternalRedirect()
-     {
-         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
--        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
-+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
-             ->disableOriginalConstructor()->getMock();
-         $urlRewrite->expects($this->any())->method('getEntityType')->will($this->returnValue('custom'));
-         $urlRewrite->expects($this->any())->method('getRedirectType')->will($this->returnValue('redirect-code'));
-@@ -273,7 +305,7 @@ class RouterTest extends \PHPUnit\Framework\TestCase
-     public function testMatchWithCustomExternalRedirect($targetPath)
-     {
-         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
--        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
-+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
-             ->disableOriginalConstructor()->getMock();
-         $urlRewrite->expects($this->any())->method('getEntityType')->will($this->returnValue('custom'));
-         $urlRewrite->expects($this->any())->method('getRedirectType')->will($this->returnValue('redirect-code'));
-@@ -305,7 +337,7 @@ class RouterTest extends \PHPUnit\Framework\TestCase
-     public function testMatch()
-     {
-         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
--        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
-+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
-             ->disableOriginalConstructor()->getMock();
-         $urlRewrite->expects($this->any())->method('getRedirectType')->will($this->returnValue(0));
-         $urlRewrite->expects($this->any())->method('getTargetPath')->will($this->returnValue('target-path'));
-@@ -313,10 +345,60 @@ class RouterTest extends \PHPUnit\Framework\TestCase
-         $this->urlFinder->expects($this->any())->method('findOneByData')->will($this->returnValue($urlRewrite));
-         $this->request->expects($this->once())->method('setPathInfo')->with('/target-path');
-         $this->request->expects($this->once())->method('setAlias')
--            ->with(\Magento\Framework\UrlInterface::REWRITE_REQUEST_PATH_ALIAS, 'request-path');
-+            ->with(UrlInterface::REWRITE_REQUEST_PATH_ALIAS, 'request-path');
-         $this->actionFactory->expects($this->once())->method('create')
-             ->with(\Magento\Framework\App\Action\Forward::class);
- 
-         $this->router->match($this->request);
-     }
-+
-+    /**
-+     * Test to match corresponding URL Rewrite on request with query params
-+     *
-+     * @param string $originalRequestPath
-+     * @param string $requestPath
-+     * @param int $countOfQueryParams
-+     * @dataProvider matchWithQueryParamsDataProvider
-+     */
-+    public function testMatchWithQueryParams(string $originalRequestPath, string $requestPath, int $countOfQueryParams)
-+    {
-+        $targetPath = 'target-path';
-+
-+        $this->storeManager->method('getStore')->willReturn($this->store);
-+        $urlRewrite = $this->createMock(UrlRewrite::class);
-+        $urlRewrite->method('getRedirectType')->willReturn(0);
-+        $urlRewrite->method('getTargetPath')->willReturn($targetPath);
-+        $urlRewrite->method('getRequestPath')->willReturn($requestPath);
-+        $this->urlFinder->method('findOneByData')
-+            ->with([UrlRewrite::REQUEST_PATH => $requestPath, UrlRewrite::STORE_ID => $this->store->getId()])
-+            ->willReturn($urlRewrite);
-+
-+        $this->requestQuery->method('count')->willReturn($countOfQueryParams);
-+        $this->request->method('getPathInfo')
-+            ->willReturn($originalRequestPath);
-+        $this->request->expects($this->once())
-+            ->method('setPathInfo')
-+            ->with('/' . $targetPath);
-+        $this->request->expects($this->once())
-+            ->method('setAlias')
-+            ->with(UrlInterface::REWRITE_REQUEST_PATH_ALIAS, $requestPath);
-+        $this->actionFactory->expects($this->once())
-+            ->method('create')
-+            ->with(Forward::class);
-+
-+        $this->router->match($this->request);
-+    }
-+
-+    /**
-+     * Data provider for Test to match corresponding URL Rewrite on request with query params
-+     *
-+     * @return array
-+     */
-+    public function matchWithQueryParamsDataProvider(): array
-+    {
-+        return [
-+            ['/category.html/', 'category.html/', 0],
-+            ['/category.html/', 'category.html', 1],
-+        ];
-+    }
- }
-diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
-index b96a8ef6374..697ce33be0f 100644
---- a/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
-+++ b/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
-@@ -445,7 +445,6 @@ class DbStorageTest extends \PHPUnit\Framework\TestCase
-         $urlSecond = $this->createMock(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class);
- 
-         // delete
--
-         $urlFirst->expects($this->any())
-             ->method('getEntityType')
-             ->willReturn('product');
-@@ -479,10 +478,6 @@ class DbStorageTest extends \PHPUnit\Framework\TestCase
-             ->with(DbStorage::TABLE_NAME)
-             ->will($this->returnValue('table_name'));
- 
--        $this->connectionMock->expects($this->any())
--            ->method('query')
--            ->with('sql delete query');
--
-         // insert
- 
-         $urlFirst->expects($this->any())
-@@ -497,10 +492,6 @@ class DbStorageTest extends \PHPUnit\Framework\TestCase
-             ->with(DbStorage::TABLE_NAME)
-             ->will($this->returnValue('table_name'));
- 
--        $this->connectionMock->expects($this->once())
--            ->method('insertMultiple')
--            ->with('table_name', [['row1'], ['row2']]);
--
-         $this->storage->replace([$urlFirst, $urlSecond]);
-     }
- 
-diff --git a/app/code/Magento/UrlRewrite/etc/adminhtml/menu.xml b/app/code/Magento/UrlRewrite/etc/adminhtml/menu.xml
-index 615e17dbb7a..66ae94dac1a 100644
---- a/app/code/Magento/UrlRewrite/etc/adminhtml/menu.xml
-+++ b/app/code/Magento/UrlRewrite/etc/adminhtml/menu.xml
-@@ -7,8 +7,6 @@
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
-     <menu>
--        <add id="Magento_UrlRewrite::urlrewrite" title="URL Rewrites" translate="title" module="Magento_UrlRewrite"
--             sortOrder="20" parent="Magento_Backend::marketing_seo"
--             action="adminhtml/url_rewrite/index" resource="Magento_UrlRewrite::urlrewrite"/>
-+        <add id="Magento_UrlRewrite::urlrewrite" title="URL Rewrites" translate="title" module="Magento_UrlRewrite" sortOrder="20" parent="Magento_Backend::marketing_seo" action="adminhtml/url_rewrite/index" resource="Magento_UrlRewrite::urlrewrite"/>
-     </menu>
- </config>
-diff --git a/app/code/Magento/UrlRewrite/etc/db_schema.xml b/app/code/Magento/UrlRewrite/etc/db_schema.xml
-index af328873dee..6e001487320 100644
---- a/app/code/Magento/UrlRewrite/etc/db_schema.xml
-+++ b/app/code/Magento/UrlRewrite/etc/db_schema.xml
-@@ -23,17 +23,17 @@
-         <column xsi:type="smallint" name="is_autogenerated" padding="5" unsigned="true" nullable="false"
-                 identity="false" default="0" comment="Is rewrite generated automatically flag"/>
-         <column xsi:type="varchar" name="metadata" nullable="true" length="255" comment="Meta data for url rewrite"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="url_rewrite_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="URL_REWRITE_REQUEST_PATH_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="URL_REWRITE_REQUEST_PATH_STORE_ID">
-             <column name="request_path"/>
-             <column name="store_id"/>
-         </constraint>
--        <index name="URL_REWRITE_TARGET_PATH" indexType="btree">
-+        <index referenceId="URL_REWRITE_TARGET_PATH" indexType="btree">
-             <column name="target_path"/>
-         </index>
--        <index name="URL_REWRITE_STORE_ID_ENTITY_ID" indexType="btree">
-+        <index referenceId="URL_REWRITE_STORE_ID_ENTITY_ID" indexType="btree">
-             <column name="store_id"/>
-             <column name="entity_id"/>
-         </index>
-diff --git a/app/code/Magento/UrlRewrite/etc/di.xml b/app/code/Magento/UrlRewrite/etc/di.xml
-index 26055efbd2b..e09c48ff891 100644
---- a/app/code/Magento/UrlRewrite/etc/di.xml
-+++ b/app/code/Magento/UrlRewrite/etc/di.xml
-@@ -16,4 +16,14 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\UrlRewrite\Model\CompositeUrlFinder">
-+        <arguments>
-+            <argument name="children" xsi:type="array">
-+                <item name="default" xsi:type="array">
-+                    <item name="class" xsi:type="string">Magento\UrlRewrite\Model\Storage\DbStorage</item>
-+                    <item name="sortOrder" xsi:type="number">10</item>
-+                </item>
-+            </argument>
-+        </arguments>
-+    </type>
- </config>
-diff --git a/app/code/Magento/UrlRewrite/etc/frontend/di.xml b/app/code/Magento/UrlRewrite/etc/frontend/di.xml
-index bc5b6aa767f..3978b0ee977 100644
---- a/app/code/Magento/UrlRewrite/etc/frontend/di.xml
-+++ b/app/code/Magento/UrlRewrite/etc/frontend/di.xml
-@@ -17,4 +17,5 @@
-             </argument>
-         </arguments>
-     </type>
-+    <preference for="Magento\UrlRewrite\Model\UrlFinderInterface" type="Magento\UrlRewrite\Model\CompositeUrlFinder"/>
- </config>
-diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
-index 7d8151d2703..012409a8b6a 100644
---- a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
-+++ b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
-@@ -12,8 +12,10 @@
-                 <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.url_rewrite.grid" as="grid">
-                     <arguments>
-                         <argument name="id" xsi:type="string">urlrewriteGrid</argument>
--                        <argument name="dataSource" xsi:type="object">Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection</argument>
-+                        <argument name="dataSource" xsi:type="object" shared="false">Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection</argument>
-                         <argument name="default_sort" xsi:type="string">url_rewrite_id</argument>
-+                        <!-- Add below argument to save session parameter in URL rewrite grid -->
-+                        <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-                     </arguments>
-                     <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="adminhtml.url_rewrite.grid.columnSet">
-                         <arguments>
-diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
-index baff22b342b..bccffcef878 100644
---- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
-+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
-@@ -4,31 +4,28 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\UrlRewrite\Block\Catalog\Category\Tree $block */
- ?>
-     <fieldset class="admin__fieldset" data-ui-id="category-selector">
-         <legend class="admin__legend"><span><?= $block->escapeHtml(__('Select Category')) ?></span></legend>
-         <div class="content content-category-tree">
-             <input type="hidden" name="categories" id="product_categories" value=""/>
--            <?php if ($block->getRoot()): ?>
-+            <?php if ($block->getRoot()) : ?>
-                 <div class="jstree-default"></div>
-             <?php endif; ?>
-         </div>
-     </fieldset>
--<?php if ($block->getRoot()): ?>
-+<?php if ($block->getRoot()) : ?>
-     <script type="text/x-magento-init">
-     {
-         ".jstree-default": {
-             "categoryTree": {
--                "data": <?php /* @noEscape */
--        echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getTreeArray()); ?>,
--                "url": "<?php /* @noEscape */
--        echo $block->escapeUrl($block->getLoadTreeUrl()); ?>"
-+                "data": <?= /* @noEscape */
-+                $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getTreeArray()); ?>,
-+                "url": "<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl())); ?>"
-             }
-         }
-     }
- 
-     </script>
--<?php endif; ?>
-\ No newline at end of file
-+<?php endif; ?>
-diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
-index 3ff25a7c845..eb0595033ec 100644
---- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
-+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
-@@ -4,12 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\UrlRewrite\Block\Edit $block */
- ?>
- <?= $block->getChildHtml() ?>
--<?php if ($block->getChildBlock('form')): ?>
-+<?php if ($block->getChildBlock('form')) : ?>
- <script type="text/x-magento-init">
-     {
-         "#edit_form": {
-diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
-index 1cc0203d8fb..84abf64af97 100644
---- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
-+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\UrlRewrite\Block\Selector $block */
- ?>
- <div class="form-inline">
-@@ -16,8 +14,8 @@
-             </label>
-             <div class="admin__field-control control">
-                 <select data-role="entity-type-selector" class="admin__control-select select" onchange="window.location = this.value;" id="entity-type-selector">
--                <?php foreach ($block->getModes() as $mode => $label): ?>
--                    <option <?php /* noEscape */ echo $block->isMode($mode) ? 'selected="selected" ' : '' ?>value="<?= $block->escapeUrl($block->getModeUrl($mode)) ?>"><?= $block->escapeHtml($label) ?></option>
-+                <?php foreach ($block->getModes() as $mode => $label) : ?>
-+                    <option <?= /* @noEscape */ $block->isMode($mode) ? 'selected="selected" ' : '' ?>value="<?= $block->escapeUrl($block->getModeUrl($mode)) ?>"><?= $block->escapeHtml($label) ?></option>
-                 <?php endforeach; ?>
-                 </select>
-             </div>
-diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
-new file mode 100644
-index 00000000000..6e6c915959a
---- /dev/null
-+++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
-@@ -0,0 +1,158 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\UrlRewriteGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\UrlRewrite\Model\UrlFinderInterface;
-+use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocatorInterface;
-+
-+/**
-+ * UrlRewrite field resolver, used for GraphQL request processing.
-+ */
-+class EntityUrl implements ResolverInterface
-+{
-+    /**
-+     * @var UrlFinderInterface
-+     */
-+    private $urlFinder;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var CustomUrlLocatorInterface
-+     */
-+    private $customUrlLocator;
-+
-+    /**
-+     * @param UrlFinderInterface $urlFinder
-+     * @param StoreManagerInterface $storeManager
-+     * @param CustomUrlLocatorInterface $customUrlLocator
-+     */
-+    public function __construct(
-+        UrlFinderInterface $urlFinder,
-+        StoreManagerInterface $storeManager,
-+        CustomUrlLocatorInterface $customUrlLocator
-+    ) {
-+        $this->urlFinder = $urlFinder;
-+        $this->storeManager = $storeManager;
-+        $this->customUrlLocator = $customUrlLocator;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (!isset($args['url']) || empty(trim($args['url']))) {
-+            throw new GraphQlInputException(__('"url" argument should be specified and not empty'));
-+        }
-+
-+        $result = null;
-+        $url = $args['url'];
-+        if (substr($url, 0, 1) === '/' && $url !== '/') {
-+            $url = ltrim($url, '/');
-+        }
-+        $customUrl = $this->customUrlLocator->locateUrl($url);
-+        $url = $customUrl ?: $url;
-+        $urlRewrite = $this->findCanonicalUrl($url);
-+        if ($urlRewrite) {
-+            if (!$urlRewrite->getEntityId()) {
-+                throw new GraphQlNoSuchEntityException(
-+                    __('No such entity found with matching URL key: %url', ['url' => $url])
-+                );
-+            }
-+            $result = [
-+                'id' => $urlRewrite->getEntityId(),
-+                'canonical_url' => $urlRewrite->getTargetPath(),
-+                'relative_url' => $urlRewrite->getTargetPath(),
-+                'type' => $this->sanitizeType($urlRewrite->getEntityType())
-+            ];
-+        }
-+        return $result;
-+    }
-+
-+    /**
-+     * Find the canonical url passing through all redirects if any
-+     *
-+     * @param string $requestPath
-+     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|null
-+     */
-+    private function findCanonicalUrl(string $requestPath) : ?\Magento\UrlRewrite\Service\V1\Data\UrlRewrite
-+    {
-+        $urlRewrite = $this->findUrlFromRequestPath($requestPath);
-+        if ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
-+            while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
-+                $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath());
-+            }
-+        }
-+        if (!$urlRewrite) {
-+            $urlRewrite = $this->findUrlFromTargetPath($requestPath);
-+        }
-+        if ($urlRewrite && !$urlRewrite->getEntityId() && !$urlRewrite->getIsAutogenerated()) {
-+            $urlRewrite = $this->findUrlFromTargetPath($urlRewrite->getTargetPath());
-+        }
-+
-+        return $urlRewrite;
-+    }
-+
-+    /**
-+     * Find a url from a request url on the current store
-+     *
-+     * @param string $requestPath
-+     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|null
-+     */
-+    private function findUrlFromRequestPath(string $requestPath) : ?\Magento\UrlRewrite\Service\V1\Data\UrlRewrite
-+    {
-+        return $this->urlFinder->findOneByData(
-+            [
-+                'request_path' => $requestPath,
-+                'store_id' => $this->storeManager->getStore()->getId()
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Find a url from a target url on the current store
-+     *
-+     * @param string $targetPath
-+     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|null
-+     */
-+    private function findUrlFromTargetPath(string $targetPath) : ?\Magento\UrlRewrite\Service\V1\Data\UrlRewrite
-+    {
-+        return $this->urlFinder->findOneByData(
-+            [
-+                'target_path' => $targetPath,
-+                'store_id' => $this->storeManager->getStore()->getId()
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Sanitize the type to fit schema specifications
-+     *
-+     * @param string $type
-+     * @return string
-+     */
-+    private function sanitizeType(string $type) : string
-+    {
-+        return strtoupper(str_replace('-', '_', $type));
-+    }
-+}
-diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php
-index 3f07edc6019..fb7bbd634d1 100644
---- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php
-+++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php
-@@ -7,17 +7,16 @@ declare(strict_types=1);
- 
- namespace Magento\UrlRewriteGraphQl\Model\Resolver;
- 
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
--use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Framework\Model\AbstractModel;
- use Magento\UrlRewrite\Model\UrlFinderInterface;
--use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocatorInterface;
-+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite as UrlRewriteDTO;
- 
- /**
-- * UrlRewrite field resolver, used for GraphQL request processing.
-+ * Returns URL rewrites list for the specified product
-  */
- class UrlRewrite implements ResolverInterface
- {
-@@ -26,41 +25,17 @@ class UrlRewrite implements ResolverInterface
-      */
-     private $urlFinder;
- 
--    /**
--     * @var StoreManagerInterface
--     */
--    private $storeManager;
--
--    /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--    
--    /**
--     * @var CustomUrlLocatorInterface
--     */
--    private $customUrlLocator;
--
-     /**
-      * @param UrlFinderInterface $urlFinder
--     * @param StoreManagerInterface $storeManager
--     * @param ValueFactory $valueFactory
--     * @param CustomUrlLocatorInterface $customUrlLocator
-      */
-     public function __construct(
--        UrlFinderInterface $urlFinder,
--        StoreManagerInterface $storeManager,
--        ValueFactory $valueFactory,
--        CustomUrlLocatorInterface $customUrlLocator
-+        UrlFinderInterface $urlFinder
-     ) {
-         $this->urlFinder = $urlFinder;
--        $this->storeManager = $storeManager;
--        $this->valueFactory = $valueFactory;
--        $this->customUrlLocator = $customUrlLocator;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -68,94 +43,51 @@ class UrlRewrite implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ) : Value {
--        $result = function () {
--            return null;
--        };
--        
--        if (isset($args['url'])) {
--            $url = $args['url'];
--            if (substr($url, 0, 1) === '/' && $url !== '/') {
--                $url = ltrim($url, '/');
--            }
--            $customUrl = $this->customUrlLocator->locateUrl($url);
--            $url = $customUrl ?: $url;
--            $urlRewrite = $this->findCanonicalUrl($url);
--            if ($urlRewrite) {
--                $urlRewriteReturnArray = [
--                    'id' => $urlRewrite->getEntityId(),
--                    'canonical_url' => $urlRewrite->getTargetPath(),
--                    'type' => $this->sanitizeType($urlRewrite->getEntityType())
--                ];
--                $result = function () use ($urlRewriteReturnArray) {
--                    return $urlRewriteReturnArray;
--                };
--            }
-+    ): array {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('"model" value should be specified'));
-         }
--        return $this->valueFactory->create($result);
--    }
- 
--    /**
--     * Find the canonical url passing through all redirects if any
--     *
--     * @param string $requestPath
--     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|null
--     */
--    private function findCanonicalUrl(string $requestPath) : ?\Magento\UrlRewrite\Service\V1\Data\UrlRewrite
--    {
--        $urlRewrite = $this->findUrlFromRequestPath($requestPath);
--        if ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
--            while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
--                $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath());
-+        /** @var AbstractModel $entity */
-+        $entity = $value['model'];
-+        $entityId = $entity->getEntityId();
-+
-+        $urlRewriteCollection = $this->urlFinder->findAllByData([UrlRewriteDTO::ENTITY_ID => $entityId]);
-+        $urlRewrites = [];
-+
-+        /** @var UrlRewriteDTO $urlRewrite */
-+        foreach ($urlRewriteCollection as $urlRewrite) {
-+            if ($urlRewrite->getRedirectType() !== 0) {
-+                continue;
-             }
-+
-+            $urlRewrites[] = [
-+                'url' => $urlRewrite->getRequestPath(),
-+                'parameters' => $this->getUrlParameters($urlRewrite->getTargetPath())
-+            ];
-         }
--        if (!$urlRewrite) {
--            $urlRewrite = $this->findUrlFromTargetPath($requestPath);
--        }
--        
--        return $urlRewrite;
--    }
- 
--    /**
--     * Find a url from a request url on the current store
--     *
--     * @param string $requestPath
--     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|null
--     */
--    private function findUrlFromRequestPath(string $requestPath) : ?\Magento\UrlRewrite\Service\V1\Data\UrlRewrite
--    {
--        return $this->urlFinder->findOneByData(
--            [
--                'request_path' => $requestPath,
--                'store_id' => $this->storeManager->getStore()->getId()
--            ]
--        );
-+        return $urlRewrites;
-     }
- 
-     /**
--     * Find a url from a target url on the current store
-+     * Parses target path and extracts parameters
-      *
-      * @param string $targetPath
--     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|null
-+     * @return array
-      */
--    private function findUrlFromTargetPath(string $targetPath) : ?\Magento\UrlRewrite\Service\V1\Data\UrlRewrite
-+    private function getUrlParameters(string $targetPath): array
-     {
--        return $this->urlFinder->findOneByData(
--            [
--                'target_path' => $targetPath,
--                'store_id' => $this->storeManager->getStore()->getId()
--            ]
--        );
--    }
-+        $urlParameters = [];
-+        $targetPathParts = explode('/', trim($targetPath, '/'));
- 
--    /**
--     * Sanitize the type to fit schema specifications
--     *
--     * @param string $type
--     * @return string
--     */
--    private function sanitizeType(string $type) : string
--    {
--        return strtoupper(str_replace('-', '_', $type));
-+        for ($i = 3; ($i < sizeof($targetPathParts) - 1); $i += 2) {
-+            $urlParameters[] = [
-+                'name' => $targetPathParts[$i],
-+                'value' => $targetPathParts[$i + 1]
-+            ];
-+        }
-+
-+        return $urlParameters;
-     }
- }
-diff --git a/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls b/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls
-index 38f1d9c6563..e9033880704 100644
---- a/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls
-+++ b/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls
-@@ -1,15 +1,26 @@
- # Copyright © Magento, Inc. All rights reserved.
- # See COPYING.txt for license details.
- 
--type EntityUrl @doc(description: "EntityUrl is an output object containing the `id`, `canonical_url`, and `type` attributes") {
-+type Query {
-+    urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\EntityUrl") @doc(description: "The urlResolver query returns the relative URL for a specified product, category or CMS page") @cache(cacheable: false)
-+}
-+
-+type EntityUrl @doc(description: "EntityUrl is an output object containing the `id`, `relative_url`, and `type` attributes") {
-     id: Int @doc(description: "The ID assigned to the object associated with the specified url. This could be a product ID, category ID, or page ID.")
--    canonical_url: String @doc(description: "The internal relative URL. If the specified  url is a redirect, the query returns the redirected URL, not the original.")
-+    canonical_url: String @deprecated(reason: "The canonical_url field is deprecated, use relative_url instead.")
-+    relative_url: String @doc(description: "The internal relative URL. If the specified  url is a redirect, the query returns the redirected URL, not the original.")
-     type: UrlRewriteEntityTypeEnum @doc(description: "One of PRODUCT, CATEGORY, or CMS_PAGE.")
- }
- 
--type Query {
--    urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\UrlRewrite") @doc(description: "The urlResolver query returns the canonical URL for a specified product, category or CMS page")
-+enum UrlRewriteEntityTypeEnum {
- }
- 
--enum UrlRewriteEntityTypeEnum {
-+type UrlRewrite @doc(description: "The object contains URL rewrite details") {
-+    url: String @doc(description: "Request URL")
-+    parameters: [HttpQueryParameter] @doc(description: "Request parameters")
-+}
-+
-+type HttpQueryParameter @doc(description: "The object details of target path parameters") {
-+    name: String @doc(description: "Parameter name")
-+    value: String @doc(description: "Parameter value")
- }
-diff --git a/app/code/Magento/User/Block/Buttons.php b/app/code/Magento/User/Block/Buttons.php
-index b411f1c0cf8..f580c5cd72b 100644
---- a/app/code/Magento/User/Block/Buttons.php
-+++ b/app/code/Magento/User/Block/Buttons.php
-@@ -6,6 +6,8 @@
- namespace Magento\User\Block;
- 
- /**
-+ * Buttons block
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -33,6 +35,8 @@ class Buttons extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Prepare layout
-+     *
-      * @return $this
-      */
-     protected function _prepareLayout()
-@@ -53,7 +57,7 @@ class Buttons extends \Magento\Backend\Block\Template
-             ['label' => __('Reset'), 'onclick' => 'window.location.reload()', 'class' => 'reset']
-         );
- 
--        if (intval($this->getRequest()->getParam('rid'))) {
-+        if ((int)$this->getRequest()->getParam('rid')) {
-             $this->getToolbar()->addChild(
-                 'deleteButton',
-                 \Magento\Backend\Block\Widget\Button::class,
-@@ -85,6 +89,8 @@ class Buttons extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get back button html
-+     *
-      * @return string
-      */
-     public function getBackButtonHtml()
-@@ -93,6 +99,8 @@ class Buttons extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get reset button html
-+     *
-      * @return string
-      */
-     public function getResetButtonHtml()
-@@ -101,6 +109,8 @@ class Buttons extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get save button html
-+     *
-      * @return string
-      */
-     public function getSaveButtonHtml()
-@@ -109,17 +119,21 @@ class Buttons extends \Magento\Backend\Block\Template
-     }
- 
-     /**
-+     * Get delete button html
-+     *
-      * @return string|void
-      */
-     public function getDeleteButtonHtml()
-     {
--        if (intval($this->getRequest()->getParam('rid')) == 0) {
-+        if ((int)$this->getRequest()->getParam('rid') == 0) {
-             return;
-         }
-         return $this->getChildHtml('deleteButton');
-     }
- 
-     /**
-+     * Get user
-+     *
-      * @return mixed
-      */
-     public function getUser()
-diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php
-index c0e78fae2c2..565b312325d 100644
---- a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php
-+++ b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php
-@@ -6,8 +6,10 @@
-  */
- namespace Magento\User\Controller\Adminhtml\Auth;
- 
--use Magento\Security\Model\SecurityManager;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Security\Model\SecurityManager;
- use Magento\Backend\App\Action\Context;
- use Magento\User\Model\UserFactory;
- use Magento\User\Model\ResourceModel\User\CollectionFactory;
-@@ -16,14 +18,25 @@ use Magento\Security\Model\PasswordResetRequestEvent;
- use Magento\Framework\Exception\SecurityViolationException;
- use Magento\User\Controller\Adminhtml\Auth;
- use Magento\Backend\Helper\Data;
-+use Magento\User\Model\Spi\NotificatorInterface;
- 
--class Forgotpassword extends Auth
-+/**
-+ * Initiate forgot-password process.
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class Forgotpassword extends Auth implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @var SecurityManager
-      */
-     protected $securityManager;
- 
-+    /**
-+     * @var NotificatorInterface
-+     */
-+    private $notificator;
-+
-     /**
-      * User model factory
-      *
-@@ -41,13 +54,16 @@ class Forgotpassword extends Auth
-      * @param UserFactory $userFactory
-      * @param SecurityManager $securityManager
-      * @param CollectionFactory $userCollectionFactory
-+     * @param Data $backendDataHelper
-+     * @param NotificatorInterface|null $notificator
-      */
-     public function __construct(
-         Context $context,
-         UserFactory $userFactory,
-         SecurityManager $securityManager,
-         CollectionFactory $userCollectionFactory = null,
--        Data $backendDataHelper = null
-+        Data $backendDataHelper = null,
-+        ?NotificatorInterface $notificator = null
-     ) {
-         parent::__construct($context, $userFactory);
-         $this->securityManager = $securityManager;
-@@ -55,6 +71,8 @@ class Forgotpassword extends Auth
-                 ObjectManager::getInstance()->get(CollectionFactory::class);
-         $this->backendDataHelper = $backendDataHelper ?:
-                 ObjectManager::getInstance()->get(Data::class);
-+        $this->notificator = $notificator
-+            ?? ObjectManager::getInstance()->get(NotificatorInterface::class);
-     }
- 
-     /**
-@@ -96,7 +114,7 @@ class Forgotpassword extends Auth
-                                 $newPassResetToken = $this->backendDataHelper->generateResetPasswordLinkToken();
-                                 $user->changeResetPasswordLinkToken($newPassResetToken);
-                                 $user->save();
--                                $user->sendPasswordResetConfirmationEmail();
-+                                $this->notificator->sendForgotPassword($user);
-                             }
-                             break;
-                         }
-diff --git a/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php b/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php
-index 7c0e31076ca..e3e1e3def39 100644
---- a/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php
-+++ b/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php
-@@ -6,10 +6,12 @@
-  */
- namespace Magento\User\Controller\Adminhtml\Locks;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
- /**
-  * Locks Index action
-  */
--class Index extends \Magento\User\Controller\Adminhtml\Locks
-+class Index extends \Magento\User\Controller\Adminhtml\Locks implements HttpGetActionInterface
- {
-     /**
-      * Render page with grid
-diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Index.php b/app/code/Magento/User/Controller/Adminhtml/User/Index.php
-index 7f79dd47737..bc4157c144a 100644
---- a/app/code/Magento/User/Controller/Adminhtml/User/Index.php
-+++ b/app/code/Magento/User/Controller/Adminhtml/User/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\User\Controller\Adminhtml\User;
- 
--class Index extends \Magento\User\Controller\Adminhtml\User
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\User\Controller\Adminhtml\User implements HttpGetActionInterface
- {
-     /**
-      * @return void
-diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php
-index e1853be17a1..8d468d45f1a 100644
---- a/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php
-+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\User\Controller\Adminhtml\User\Role;
- 
--class Index extends \Magento\User\Controller\Adminhtml\User\Role
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\User\Controller\Adminhtml\User\Role implements HttpGetActionInterface
- {
-     /**
-      * Show grid with roles existing in systems
-diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php
-index 4d97b62cd8b..ad8c87b617d 100644
---- a/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php
-+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php
-@@ -6,7 +6,11 @@
-  */
- namespace Magento\User\Controller\Adminhtml\User\Role;
- 
--class RoleGrid extends \Magento\User\Controller\Adminhtml\User\Role
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\User\Controller\Adminhtml\User\Role as RoleAction;
-+
-+class RoleGrid extends RoleAction implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * Action for ajax request from grid
-diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
-index 9dfe34e4353..97ecb778b8c 100644
---- a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
-+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
-@@ -7,16 +7,20 @@
- 
- namespace Magento\User\Controller\Adminhtml\User\Role;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
- use Magento\Authorization\Model\UserContextInterface;
- use Magento\Framework\Controller\ResultFactory;
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Exception\State\UserLockedException;
- use Magento\Security\Model\SecurityCookie;
- 
- /**
-+ * Save role controller
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role
-+class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role implements HttpPostActionInterface
- {
-     /**
-      * Session keys for Info form data
-@@ -58,9 +62,8 @@ class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role
-     {
-         if (!($this->securityCookie instanceof SecurityCookie)) {
-             return \Magento\Framework\App\ObjectManager::getInstance()->get(SecurityCookie::class);
--        } else {
--            return $this->securityCookie;
-         }
-+        return $this->securityCookie;
-     }
- 
-     /**
-@@ -75,10 +78,8 @@ class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role
- 
-         $rid = $this->getRequest()->getParam('role_id', false);
-         $resource = $this->getRequest()->getParam('resource', false);
--        $roleUsers = $this->getRequest()->getParam('in_role_user', null);
--        parse_str($roleUsers, $roleUsers);
--        $roleUsers = array_keys($roleUsers);
--
-+        $oldRoleUsers = $this->parseRequestVariable('in_role_user_old');
-+        $roleUsers = $this->parseRequestVariable('in_role_user');
-         $isAll = $this->getRequest()->getParam('all');
-         if ($isAll) {
-             $resource = [$this->_objectManager->get(\Magento\Framework\Acl\RootResource::class)->getId()];
-@@ -104,13 +105,9 @@ class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role
-             $role->save();
- 
-             $this->_rulesFactory->create()->setRoleId($role->getId())->setResources($resource)->saveRel();
--
--            $this->processPreviousUsers($role);
--
--            foreach ($roleUsers as $nRuid) {
--                $this->_addUserToRole($nRuid, $role->getId());
--            }
--            $this->messageManager->addSuccess(__('You saved the role.'));
-+            $this->processPreviousUsers($role, $oldRoleUsers);
-+            $this->processCurrentUsers($role, $roleUsers);
-+            $this->messageManager->addSuccessMessage(__('You saved the role.'));
-         } catch (UserLockedException $e) {
-             $this->_auth->logout();
-             $this->getSecurityCookie()->setLogoutReasonCookie(
-@@ -118,14 +115,14 @@ class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role
-             );
-             return $resultRedirect->setPath('*');
-         } catch (\Magento\Framework\Exception\AuthenticationException $e) {
--            $this->messageManager->addError(
-+            $this->messageManager->addErrorMessage(
-                 __('The password entered for the current user is invalid. Verify the password and try again.')
-             );
-             return $this->saveDataToSessionAndRedirect($role, $this->getRequest()->getPostValue(), $resultRedirect);
-         } catch (\Magento\Framework\Exception\LocalizedException $e) {
--            $this->messageManager->addError($e->getMessage());
-+            $this->messageManager->addErrorMessage($e->getMessage());
-         } catch (\Exception $e) {
--            $this->messageManager->addError(__('An error occurred while saving this role.'));
-+            $this->messageManager->addErrorMessage(__('An error occurred while saving this role.'));
-         }
- 
-         return $resultRedirect->setPath('*/*/');
-@@ -150,16 +147,29 @@ class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role
-     }
- 
-     /**
-+     * Parse request value from string
-+     *
-+     * @param string $paramName
-+     * @return array
-+     */
-+    private function parseRequestVariable($paramName): array
-+    {
-+        $value = $this->getRequest()->getParam($paramName, null);
-+        parse_str($value, $value);
-+        $value = array_keys($value);
-+        return $value;
-+    }
-+
-+    /**
-+     * Process previous users
-+     *
-      * @param \Magento\Authorization\Model\Role $role
-+     * @param array $oldRoleUsers
-      * @return $this
-      * @throws \Exception
-      */
--    protected function processPreviousUsers(\Magento\Authorization\Model\Role $role)
-+    protected function processPreviousUsers(\Magento\Authorization\Model\Role $role, array $oldRoleUsers): self
-     {
--        $oldRoleUsers = $this->getRequest()->getParam('in_role_user_old');
--        parse_str($oldRoleUsers, $oldRoleUsers);
--        $oldRoleUsers = array_keys($oldRoleUsers);
--
-         foreach ($oldRoleUsers as $oUid) {
-             $this->_deleteUserFromRole($oUid, $role->getId());
-         }
-@@ -167,12 +177,33 @@ class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role
-         return $this;
-     }
- 
-+    /**
-+     * Processes users to be assigned to roles
-+     *
-+     * @param \Magento\Authorization\Model\Role $role
-+     * @param array $roleUsers
-+     * @return $this
-+     */
-+    private function processCurrentUsers(\Magento\Authorization\Model\Role $role, array $roleUsers): self
-+    {
-+        foreach ($roleUsers as $nRuid) {
-+            try {
-+                $this->_addUserToRole($nRuid, $role->getId());
-+            } catch (LocalizedException $e) {
-+                $this->messageManager->addErrorMessage($e->getMessage());
-+            }
-+        }
-+
-+        return $this;
-+    }
-+
-     /**
-      * Assign user to role
-      *
-      * @param int $userId
-      * @param int $roleId
-      * @return bool
-+     * @throws LocalizedException
-      */
-     protected function _addUserToRole($userId, $roleId)
-     {
-@@ -206,6 +237,8 @@ class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role
-     }
- 
-     /**
-+     * Save data to session and redirect
-+     *
-      * @param \Magento\Authorization\Model\Role $role
-      * @param array $data
-      * @param \Magento\Backend\Model\View\Result\Redirect $resultRedirect
-diff --git a/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php
-index 2bfbadd3a0d..e171f0a8c2b 100644
---- a/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php
-+++ b/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php
-@@ -6,7 +6,11 @@
-  */
- namespace Magento\User\Controller\Adminhtml\User;
- 
--class RoleGrid extends \Magento\User\Controller\Adminhtml\User
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\User\Controller\Adminhtml\User as UserAction;
-+
-+class RoleGrid extends UserAction implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * @return void
-diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
-index 4b984b761c1..521c09f7b77 100644
---- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php
-+++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
-@@ -6,14 +6,18 @@
- 
- namespace Magento\User\Controller\Adminhtml\User;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\Exception\AuthenticationException;
- use Magento\Framework\Exception\State\UserLockedException;
- use Magento\Security\Model\SecurityCookie;
-+use Magento\User\Model\Spi\NotificationExceptionInterface;
- 
- /**
-+ * Save admin user.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Save extends \Magento\User\Controller\Adminhtml\User
-+class Save extends \Magento\User\Controller\Adminhtml\User implements HttpPostActionInterface
- {
-     /**
-      * @var SecurityCookie
-@@ -36,7 +40,7 @@ class Save extends \Magento\User\Controller\Adminhtml\User
-     }
- 
-     /**
--     * @return void
-+     * @inheritDoc
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-@@ -44,10 +48,14 @@ class Save extends \Magento\User\Controller\Adminhtml\User
-     {
-         $userId = (int)$this->getRequest()->getParam('user_id');
-         $data = $this->getRequest()->getPostValue();
-+        if (array_key_exists('form_key', $data)) {
-+            unset($data['form_key']);
-+        }
-         if (!$data) {
-             $this->_redirect('adminhtml/*/');
-             return;
-         }
-+
-         /** @var $model \Magento\User\Model\User */
-         $model = $this->_userFactory->create()->load($userId);
-         if ($userId && $model->isObjectNew()) {
-@@ -87,17 +95,19 @@ class Save extends \Magento\User\Controller\Adminhtml\User
-             $currentUser->performIdentityCheck($data[$currentUserPasswordField]);
-             $model->save();
- 
--            $model->sendNotificationEmailsIfRequired();
--
-             $this->messageManager->addSuccess(__('You saved the user.'));
-             $this->_getSession()->setUserData(false);
-             $this->_redirect('adminhtml/*/');
-+
-+            $model->sendNotificationEmailsIfRequired();
-         } catch (UserLockedException $e) {
-             $this->_auth->logout();
-             $this->getSecurityCookie()->setLogoutReasonCookie(
-                 \Magento\Security\Model\AdminSessionsManager::LOGOUT_REASON_USER_LOCKED
-             );
-             $this->_redirect('adminhtml/*/');
-+        } catch (NotificationExceptionInterface $exception) {
-+            $this->messageManager->addErrorMessage($exception->getMessage());
-         } catch (\Magento\Framework\Exception\AuthenticationException $e) {
-             $this->messageManager->addError(
-                 __('The password entered for the current user is invalid. Verify the password and try again.')
-@@ -116,6 +126,8 @@ class Save extends \Magento\User\Controller\Adminhtml\User
-     }
- 
-     /**
-+     * Redirect to Edit form.
-+     *
-      * @param \Magento\User\Model\User $model
-      * @param array $data
-      * @return void
-diff --git a/app/code/Magento/User/Model/Notificator.php b/app/code/Magento/User/Model/Notificator.php
-new file mode 100644
-index 00000000000..3a5522db4c5
---- /dev/null
-+++ b/app/code/Magento/User/Model/Notificator.php
-@@ -0,0 +1,194 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\User\Model;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\MailException;
-+use Magento\Store\Model\Store;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\User\Api\Data\UserInterface;
-+use Magento\User\Model\Spi\NotificatorInterface;
-+use Magento\Backend\App\ConfigInterface;
-+use Magento\Framework\Mail\Template\TransportBuilder;
-+use Magento\Framework\App\DeploymentConfig;
-+use Magento\Backend\App\Area\FrontNameResolver;
-+use Magento\Email\Model\BackendTemplate;
-+
-+/**
-+ * @inheritDoc
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class Notificator implements NotificatorInterface
-+{
-+    /**
-+     * @var TransportBuilder
-+     */
-+    private $transportBuilder;
-+
-+    /**
-+     * @var ConfigInterface
-+     */
-+    private $config;
-+
-+    /**
-+     * @var DeploymentConfig
-+     */
-+    private $deployConfig;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @param TransportBuilder $transportBuilder
-+     * @param ConfigInterface $config
-+     * @param DeploymentConfig $deployConfig
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(
-+        TransportBuilder $transportBuilder,
-+        ConfigInterface $config,
-+        DeploymentConfig $deployConfig,
-+        StoreManagerInterface $storeManager
-+    ) {
-+        $this->transportBuilder = $transportBuilder;
-+        $this->config = $config;
-+        $this->deployConfig = $deployConfig;
-+        $this->storeManager = $storeManager;
-+    }
-+
-+    /**
-+     * Send a notification.
-+     *
-+     * @param string $templateConfigId
-+     * @param array $templateVars
-+     * @param string $toEmail
-+     * @param string $toName
-+     * @throws MailException
-+     *
-+     * @return void
-+     */
-+    private function sendNotification(
-+        string $templateConfigId,
-+        array $templateVars,
-+        string $toEmail,
-+        string $toName
-+    ): void {
-+        $transport = $this->transportBuilder
-+            ->setTemplateIdentifier($this->config->getValue($templateConfigId))
-+            ->setTemplateModel(BackendTemplate::class)
-+            ->setTemplateOptions([
-+                'area' => FrontNameResolver::AREA_CODE,
-+                'store' => Store::DEFAULT_STORE_ID
-+            ])
-+            ->setTemplateVars($templateVars)
-+            ->setFrom(
-+                $this->config->getValue('admin/emails/forgot_email_identity')
-+            )
-+            ->addTo($toEmail, $toName)
-+            ->getTransport();
-+        $transport->sendMessage();
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function sendForgotPassword(UserInterface $user): void
-+    {
-+        try {
-+            $this->sendNotification(
-+                'admin/emails/forgot_email_template',
-+                [
-+                    'user' => $user,
-+                    'store' => $this->storeManager->getStore(
-+                        Store::DEFAULT_STORE_ID
-+                    )
-+                ],
-+                $user->getEmail(),
-+                $user->getFirstName().' '.$user->getLastName()
-+            );
-+        } catch (LocalizedException $exception) {
-+            throw new NotificatorException(
-+                __($exception->getMessage()),
-+                $exception
-+            );
-+        }
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function sendCreated(UserInterface $user): void
-+    {
-+        $toEmails = [];
-+        $generalEmail = $this->config->getValue(
-+            'trans_email/ident_general/email'
-+        );
-+        if ($generalEmail) {
-+            $toEmails[] = $generalEmail;
-+        }
-+        if ($adminEmail = $this->deployConfig->get('user_admin_email')) {
-+            $toEmails[] = $adminEmail;
-+        }
-+
-+        try {
-+            foreach ($toEmails as $toEmail) {
-+                $this->sendNotification(
-+                    'admin/emails/new_user_notification_template',
-+                    [
-+                        'user' => $user,
-+                        'store' => $this->storeManager->getStore(
-+                            Store::DEFAULT_STORE_ID
-+                        )
-+                    ],
-+                    $toEmail,
-+                    __('Administrator')->getText()
-+                );
-+            }
-+        } catch (LocalizedException $exception) {
-+            throw new NotificatorException(
-+                __($exception->getMessage()),
-+                $exception
-+            );
-+        }
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function sendUpdated(UserInterface $user, array $changed): void
-+    {
-+        $email = $user->getEmail();
-+        if ($user instanceof User) {
-+            $email = $user->getOrigData('email');
-+        }
-+
-+        try {
-+            $this->sendNotification(
-+                'admin/emails/user_notification_template',
-+                [
-+                    'user' => $user,
-+                    'store' => $this->storeManager->getStore(
-+                        Store::DEFAULT_STORE_ID
-+                    ),
-+                    'changes' => implode(', ', $changed)
-+                ],
-+                $email,
-+                $user->getFirstName().' '.$user->getLastName()
-+            );
-+        } catch (LocalizedException $exception) {
-+            throw new NotificatorException(
-+                __($exception->getMessage()),
-+                $exception
-+            );
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/User/Model/NotificatorException.php b/app/code/Magento/User/Model/NotificatorException.php
-new file mode 100644
-index 00000000000..5b581879814
---- /dev/null
-+++ b/app/code/Magento/User/Model/NotificatorException.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\User\Model;
-+
-+use Magento\Framework\Exception\MailException;
-+use Magento\User\Model\Spi\NotificationExceptionInterface;
-+
-+/**
-+ * When notificator cannot send an email.
-+ */
-+class NotificatorException extends MailException implements NotificationExceptionInterface
-+{
-+
-+}
-diff --git a/app/code/Magento/User/Model/Spi/NotificationExceptionInterface.php b/app/code/Magento/User/Model/Spi/NotificationExceptionInterface.php
-new file mode 100644
-index 00000000000..47af7cbe6dd
---- /dev/null
-+++ b/app/code/Magento/User/Model/Spi/NotificationExceptionInterface.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\User\Model\Spi;
-+
-+/**
-+ * When a notification cannot be sent.
-+ */
-+interface NotificationExceptionInterface extends \Throwable
-+{
-+
-+}
-diff --git a/app/code/Magento/User/Model/Spi/NotificatorInterface.php b/app/code/Magento/User/Model/Spi/NotificatorInterface.php
-new file mode 100644
-index 00000000000..f5e8ee68e7e
---- /dev/null
-+++ b/app/code/Magento/User/Model/Spi/NotificatorInterface.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\User\Model\Spi;
-+
-+use Magento\User\Api\Data\UserInterface;
-+
-+/**
-+ * Use to send out notifications about user related events.
-+ */
-+interface NotificatorInterface
-+{
-+    /**
-+     * Send notification when a user requests password reset.
-+     *
-+     * @param UserInterface $user User that requested password reset.
-+     * @throws NotificationExceptionInterface
-+     *
-+     * @return void
-+     */
-+    public function sendForgotPassword(UserInterface $user): void;
-+
-+    /**
-+     * Send a notification when a new user is created.
-+     *
-+     * @param UserInterface $user The new user.
-+     * @throws NotificationExceptionInterface
-+     *
-+     * @return void
-+     */
-+    public function sendCreated(UserInterface $user): void;
-+
-+    /**
-+     * Send a notification when a user is updated.
-+     *
-+     * @param UserInterface $user The user updated.
-+     * @param string[] $changed List of changed properties.
-+     * @throws NotificationExceptionInterface
-+     *
-+     * @return void
-+     */
-+    public function sendUpdated(UserInterface $user, array $changed): void;
-+}
-diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
-index 29618c981a2..d8040b0bbaa 100644
---- a/app/code/Magento/User/Model/User.php
-+++ b/app/code/Magento/User/Model/User.php
-@@ -6,14 +6,15 @@
- 
- namespace Magento\User\Model;
- 
--use Magento\Backend\App\Area\FrontNameResolver;
- use Magento\Backend\Model\Auth\Credential\StorageInterface;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Model\AbstractModel;
- use Magento\Framework\Exception\AuthenticationException;
- use Magento\Framework\Serialize\Serializer\Json;
--use Magento\Store\Model\Store;
- use Magento\User\Api\Data\UserInterface;
-+use Magento\User\Model\Spi\NotificationExceptionInterface;
-+use Magento\User\Model\Spi\NotificatorInterface;
-+use Magento\Framework\App\DeploymentConfig;
- 
- /**
-  * Admin user model
-@@ -37,12 +38,21 @@ use Magento\User\Api\Data\UserInterface;
- class User extends AbstractModel implements StorageInterface, UserInterface
- {
-     /**
--     * Configuration paths for email templates and identities
-+     * @deprecated
-+     * @see \Magento\User\Model\Spi\NotificatorInterface
-      */
-     const XML_PATH_FORGOT_EMAIL_TEMPLATE = 'admin/emails/forgot_email_template';
- 
-+    /**
-+     * @deprecated
-+     * @see \Magento\User\Model\Spi\NotificatorInterface
-+     */
-     const XML_PATH_FORGOT_EMAIL_IDENTITY = 'admin/emails/forgot_email_identity';
- 
-+    /**
-+     * @deprecated
-+     * @see \Magento\User\Model\Spi\NotificatorInterface
-+     */
-     const XML_PATH_USER_NOTIFICATION_TEMPLATE = 'admin/emails/user_notification_template';
- 
-     /** @deprecated */
-@@ -105,12 +115,12 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     protected $_encryptor;
- 
-     /**
--     * @var \Magento\Framework\Mail\Template\TransportBuilder
-+     * @deprecated
-      */
-     protected $_transportBuilder;
- 
-     /**
--     * @var \Magento\Store\Model\StoreManagerInterface
-+     * @deprecated
-      */
-     protected $_storeManager;
- 
-@@ -124,6 +134,16 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-      */
-     private $serializer;
- 
-+    /**
-+     * @var NotificatorInterface
-+     */
-+    private $notificator;
-+
-+    /**
-+     * @deprecated
-+     */
-+    private $deploymentConfig;
-+
-     /**
-      * @param \Magento\Framework\Model\Context $context
-      * @param \Magento\Framework\Registry $registry
-@@ -139,6 +159,8 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-      * @param array $data
-      * @param Json $serializer
-+     * @param DeploymentConfig|null $deploymentConfig
-+     * @param NotificatorInterface|null $notificator
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -155,7 +177,9 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-         array $data = [],
--        Json $serializer = null
-+        Json $serializer = null,
-+        DeploymentConfig $deploymentConfig = null,
-+        ?NotificatorInterface $notificator = null
-     ) {
-         $this->_encryptor = $encryptor;
-         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
-@@ -166,7 +190,12 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-         $this->_transportBuilder = $transportBuilder;
-         $this->_storeManager = $storeManager;
-         $this->validationRules = $validationRules;
--        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
-+        $this->serializer = $serializer
-+            ?: ObjectManager::getInstance()->get(Json::class);
-+        $this->deploymentConfig = $deploymentConfig
-+            ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
-+        $this->notificator = $notificator
-+            ?: ObjectManager::getInstance()->get(NotificatorInterface::class);
-     }
- 
-     /**
-@@ -180,10 +209,17 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
-+     * Removing dependencies and leaving only entity's properties.
-+     *
-      * @return string[]
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $properties = parent::__sleep();
-         return array_diff(
-             $properties,
-@@ -196,16 +232,27 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-                 '_encryptor',
-                 '_transportBuilder',
-                 '_storeManager',
--                '_validatorBeforeSave'
-+                '_validatorBeforeSave',
-+                'validationRules',
-+                'serializer',
-+                'deploymentConfig',
-+                'notificator'
-             ]
-         );
-     }
- 
-     /**
-+     * Restoring required objects after serialization.
-+     *
-      * @return void
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
-         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         $this->serializer = $objectManager->get(Json::class);
-@@ -218,6 +265,9 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-         $this->_encryptor = $objectManager->get(\Magento\Framework\Encryption\EncryptorInterface::class);
-         $this->_transportBuilder = $objectManager->get(\Magento\Framework\Mail\Template\TransportBuilder::class);
-         $this->_storeManager = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
-+        $this->validationRules = $objectManager->get(UserValidationRules::class);
-+        $this->deploymentConfig = $objectManager->get(DeploymentConfig::class);
-+        $this->notificator = $objectManager->get(NotificatorInterface::class);
-     }
- 
-     /**
-@@ -236,7 +286,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-         }
- 
-         if ($this->getIsActive() !== null) {
--            $data['is_active'] = intval($this->getIsActive());
-+            $data['is_active'] = (int)$this->getIsActive();
-         }
- 
-         $this->addData($data);
-@@ -366,6 +416,10 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-      */
-     public function getRole()
-     {
-+        if ($this->getData('extracted_role')) {
-+            $this->_role = $this->getData('extracted_role');
-+            $this->unsetData('extracted_role');
-+        }
-         if (null === $this->_role) {
-             $this->_role = $this->_roleFactory->create();
-             $roles = $this->getRoles();
-@@ -388,7 +442,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * Check if such combination role/user exists
-+     * Check if such combination role/user exists.
-      *
-      * @return bool
-      */
-@@ -399,28 +453,24 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * Send email with reset password confirmation link
-+     * Send email with reset password confirmation link.
-+     *
-+     * @deprecated
-+     * @see NotificatorInterface::sendForgotPassword()
-      *
-      * @return $this
-      */
-     public function sendPasswordResetConfirmationEmail()
-     {
--        $templateId = $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_TEMPLATE);
--        $transport = $this->_transportBuilder->setTemplateIdentifier($templateId)
--            ->setTemplateModel(\Magento\Email\Model\BackendTemplate::class)
--            ->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
--            ->setTemplateVars(['user' => $this, 'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)])
--            ->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))
--            ->addTo($this->getEmail(), $this->getName())
--            ->getTransport();
-+        $this->notificator->sendForgotPassword($this);
- 
--        $transport->sendMessage();
-         return $this;
-     }
- 
-     /**
-      * Send email to when password is resetting
-      *
-+     * @throws NotificationExceptionInterface
-      * @return $this
-      * @deprecated 100.1.0
-      */
-@@ -431,20 +481,20 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * Check changes and send notification emails
-+     * Check changes and send notification emails.
-      *
-+     * @throws NotificationExceptionInterface
-      * @return $this
-      * @since 100.1.0
-      */
-     public function sendNotificationEmailsIfRequired()
-     {
--        $changes = $this->createChangesDescriptionString();
--
--        if ($changes) {
--            if ($this->getEmail() != $this->getOrigData('email') && $this->getOrigData('email')) {
--                $this->sendUserNotificationEmail($changes, $this->getOrigData('email'));
--            }
--            $this->sendUserNotificationEmail($changes);
-+        if ($this->isObjectNew()) {
-+            //Notification about a new user.
-+            $this->notificator->sendCreated($this);
-+        } elseif ($changes = $this->createChangesDescriptionString()) {
-+            //User changed.
-+            $this->notificator->sendUpdated($this, explode(', ', $changes));
-         }
- 
-         return $this;
-@@ -478,35 +528,21 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * Send user notification email
-+     * Send user notification email.
-      *
-      * @param string $changes
-      * @param string $email
-+     * @throws NotificationExceptionInterface
-      * @return $this
-      * @since 100.1.0
-+     * @deprecated
-+     * @see NotificatorInterface::sendUpdated()
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     protected function sendUserNotificationEmail($changes, $email = null)
-     {
--        if ($email === null) {
--            $email = $this->getEmail();
--        }
-+        $this->notificator->sendUpdated($this, explode(', ', $changes));
- 
--        $transport = $this->_transportBuilder
--            ->setTemplateIdentifier($this->_config->getValue(self::XML_PATH_USER_NOTIFICATION_TEMPLATE))
--            ->setTemplateModel(\Magento\Email\Model\BackendTemplate::class)
--            ->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
--            ->setTemplateVars(
--                [
--                    'user' => $this,
--                    'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID),
--                    'changes' => $changes
--                ]
--            )
--            ->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))
--            ->addTo($email, $this->getName())
--            ->getTransport();
--
--        $transport->sendMessage();
-         return $this;
-     }
- 
-@@ -738,7 +774,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function getFirstName()
-     {
-@@ -746,7 +782,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function setFirstName($firstName)
-     {
-@@ -754,7 +790,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function getLastName()
-     {
-@@ -762,7 +798,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function setLastName($lastName)
-     {
-@@ -770,7 +806,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function getEmail()
-     {
-@@ -778,7 +814,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function setEmail($email)
-     {
-@@ -786,7 +822,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function getUserName()
-     {
-@@ -794,7 +830,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function setUserName($userName)
-     {
-@@ -802,7 +838,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function getPassword()
-     {
-@@ -810,7 +846,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function setPassword($password)
-     {
-@@ -818,7 +854,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function getCreated()
-     {
-@@ -826,7 +862,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function setCreated($created)
-     {
-@@ -834,7 +870,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function getModified()
-     {
-@@ -842,7 +878,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function setModified($modified)
-     {
-@@ -850,7 +886,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function getIsActive()
-     {
-@@ -858,7 +894,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function setIsActive($isActive)
-     {
-@@ -866,7 +902,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function getInterfaceLocale()
-     {
-@@ -874,7 +910,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritDoc
-      */
-     public function setInterfaceLocale($interfaceLocale)
-     {
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminClickSaveButtonOnUserFormActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminClickSaveButtonOnUserFormActionGroup.xml
-new file mode 100644
-index 00000000000..e1edb16aba6
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminClickSaveButtonOnUserFormActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminClickSaveButtonOnUserFormActionGroup">
-+        <click selector="{{AdminNewUserFormSection.save}}" stepKey="saveNewUser"/>
-+        <waitForPageLoad stepKey="waitForSaveResultLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminClickSaveButtonOnUserRoleFormActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminClickSaveButtonOnUserRoleFormActionGroup.xml
-new file mode 100644
-index 00000000000..70724e00feb
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminClickSaveButtonOnUserRoleFormActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminClickSaveButtonOnUserRoleFormActionGroup">
-+        <click selector="{{AdminCreateRoleSection.save}}" stepKey="saveRole"/>
-+        <waitForPageLoad stepKey="waitForSaveResultLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml
-new file mode 100644
-index 00000000000..22ce7a54a63
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml
-@@ -0,0 +1,65 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateRoleActionGroup">
-+        <arguments>
-+            <argument name="restrictedRole"/>
-+            <argument name="User"/>
-+        </arguments>
-+        <amOnPage url="{{AdminEditRolePage.url}}" stepKey="navigateToNewRole"/>
-+        <waitForPageLoad stepKey="waitForPageLoad1"/>
-+        <fillField selector="{{AdminEditRoleInfoSection.roleName}}" userInput="{{User.name}}" stepKey="fillRoleName" />
-+        <fillField selector="{{AdminEditRoleInfoSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterPassword" />
-+        <click selector="{{AdminEditRoleInfoSection.roleResourcesTab}}" stepKey="clickRoleResourcesTab" />
-+        <waitForElementVisible selector="{{AdminEditRoleResourcesSection.roleScopes}}"  stepKey="waitForScopeSelection" />
-+        <selectOption selector="{{AdminEditRoleResourcesSection.resourceAccess}}" userInput="0" stepKey="selectResourceAccessCustom"/>
-+        <waitForElementVisible stepKey="waitForElementVisible" selector="{{AdminEditRoleInfoSection.blockName('restrictedRole')}}" time="30"/>
-+        <click stepKey="clickContentBlockCheckbox" selector="{{AdminEditRoleInfoSection.blockName('restrictedRole')}}"/>
-+        <click selector="{{AdminEditRoleInfoSection.saveButton}}" stepKey="clickSaveRoleButton" />
-+        <waitForPageLoad stepKey="waitForPageLoad2" />
-+    </actionGroup>
-+    <actionGroup name="AdminFillUserRoleRequiredData" extends="AdminCreateRoleActionGroup">
-+        <remove keyForRemoval="clickRoleResourcesTab"/>
-+        <remove keyForRemoval="waitForScopeSelection"/>
-+        <remove keyForRemoval="selectResourceAccessCustom"/>
-+        <remove keyForRemoval="waitForElementVisible"/>
-+        <remove keyForRemoval="clickContentBlockCheckbox"/>
-+        <remove keyForRemoval="clickSaveRoleButton"/>
-+        <remove keyForRemoval="waitForPageLoad2"/>
-+    </actionGroup>
-+    <actionGroup name="AdminAddRestrictedRole" extends="AdminCreateRoleActionGroup">
-+        <remove keyForRemoval="navigateToNewRole"/>
-+        <remove keyForRemoval="waitForPageLoad1"/>
-+        <remove keyForRemoval="fillRoleName"/>
-+        <remove keyForRemoval="enterPassword"/>
-+        <remove keyForRemoval="clickRoleResourcesTab"/>
-+        <remove keyForRemoval="waitForScopeSelection"/>
-+        <remove keyForRemoval="clickSaveRoleButton"/>
-+        <remove keyForRemoval="waitForPageLoad2"/>
-+        <scrollTo selector="{{AdminEditRoleInfoSection.blockName('restrictedRole')}}"  x="0" y="-100" stepKey="scrollToResourceElement" after="selectResourceAccessCustom"/>
-+    </actionGroup>
-+    <!--Create new role-->
-+    <actionGroup name="AdminCreateRole">
-+        <arguments>
-+            <argument name="role" type="string" defaultValue=""/>
-+            <argument name="resource" type="string" defaultValue="All"/>
-+            <argument name="scope" type="string" defaultValue="Custom"/>
-+            <argument name="websites" type="string" defaultValue="Main Website"/>
-+        </arguments>
-+        <click selector="{{AdminCreateRoleSection.create}}" stepKey="clickToAddNewRole"/>
-+        <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="setRoleName"/>
-+        <fillField stepKey="setPassword" selector="{{AdminCreateRoleSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
-+        <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
-+        <waitForPageLoad stepKey="waitForRoleResourcePage" time="5"/>
-+        <click stepKey="checkSales" selector="//a[text()='Sales']"/>
-+        <click selector="{{AdminCreateRoleSection.save}}" stepKey="clickToSaveRole"/>
-+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
-+        <see userInput="You saved the role." stepKey="seeSuccessMessage" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
-index e8aff30ff8d..d550d855fcd 100644
---- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
-@@ -6,29 +6,53 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <actionGroup name="AdminCreateUserActionGroup">
-         <arguments>
-             <argument name="role"/>
--            <argument name="User" defaultValue="admin2"/>
-+            <argument name="User" defaultValue="newAdmin"/>
-         </arguments>
--        <amOnPage url="{{AdminEditUserPage.url}}" stepKey="navigateToNewUser"/>
--        <waitForPageLoad stepKey="waitForPageLoad1" />
--        <fillField selector="{{AdminEditUserSection.usernameTextField}}" userInput="{{admin2.username}}" stepKey="enterUserName" />
--        <fillField selector="{{AdminEditUserSection.firstNameTextField}}" userInput="{{admin2.firstName}}" stepKey="enterFirstName" />
--        <fillField selector="{{AdminEditUserSection.lastNameTextField}}" userInput="{{admin2.lastName}}" stepKey="enterLastName" />
--        <fillField selector="{{AdminEditUserSection.emailTextField}}" userInput="{{admin2.username}}@magento.com" stepKey="enterEmail" />
--        <fillField selector="{{AdminEditUserSection.passwordTextField}}" userInput="{{admin2.password}}" stepKey="enterPassword" />
--        <fillField selector="{{AdminEditUserSection.pwConfirmationTextField}}" userInput="{{admin2.password}}" stepKey="confirmPassword" />
-+        <amOnPage url="{{AdminUsersPage.url}}" stepKey="amOnAdminUsersPage"/>
-+        <waitForPageLoad stepKey="waitForAdminUserPageLoad"/>
-+        <click selector="{{AdminCreateUserSection.create}}" stepKey="clickToCreateNewUser"/>
-+        <fillField selector="{{AdminEditUserSection.usernameTextField}}" userInput="{{User.username}}" stepKey="enterUserName" />
-+        <fillField selector="{{AdminEditUserSection.firstNameTextField}}" userInput="{{User.firstName}}" stepKey="enterFirstName" />
-+        <fillField selector="{{AdminEditUserSection.lastNameTextField}}" userInput="{{User.lastName}}" stepKey="enterLastName" />
-+        <fillField selector="{{AdminEditUserSection.emailTextField}}" userInput="{{User.username}}@magento.com" stepKey="enterEmail" />
-+        <fillField selector="{{AdminEditUserSection.passwordTextField}}" userInput="{{User.password}}" stepKey="enterPassword" />
-+        <fillField selector="{{AdminEditUserSection.pwConfirmationTextField}}" userInput="{{User.password}}" stepKey="confirmPassword" />
-         <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
-         <scrollToTopOfPage stepKey="scrollToTopOfPage" />
-         <click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRole" />
--        <fillField selector="{{AdminEditUserRoleSection.roleNameFilterTextField}}" userInput="{{role.name}}" stepKey="filterRole" />
--        <click selector="{{AdminEditUserRoleSection.searchButton}}" stepKey="clickSearch" />
-+        <fillField selector="{{AdminEditUserSection.roleNameFilterTextField}}" userInput="{{role.name}}" stepKey="filterRole" />
-+        <click selector="{{AdminEditUserSection.searchButton}}" stepKey="clickSearch" />
-         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
--        <click selector="{{AdminEditUserRoleSection.searchResultFirstRow}}" stepKey="selectRole" />
-+        <click selector="{{AdminEditUserSection.searchResultFirstRow}}" stepKey="selectRole" />
-         <click selector="{{AdminEditUserSection.saveButton}}" stepKey="clickSaveUser" />
-         <waitForPageLoad stepKey="waitForPageLoad2" />
-         <see userInput="You saved the user." stepKey="seeSuccessMessage" />
-     </actionGroup>
-+
-+    <!--Create new user with role-->
-+    <actionGroup name="AdminCreateUserWithRoleActionGroup">
-+        <arguments>
-+            <argument name="role"/>
-+            <argument name="user" defaultValue="newAdmin"/>
-+        </arguments>
-+        <amOnPage url="{{AdminNewUserPage.url}}" stepKey="navigateToNewUser"/>
-+        <waitForPageLoad stepKey="waitForUsersPage" />
-+        <fillField selector="{{AdminCreateUserSection.usernameTextField}}" userInput="{{user.username}}" stepKey="enterUserName" />
-+        <fillField selector="{{AdminCreateUserSection.firstNameTextField}}" userInput="{{user.firstName}}" stepKey="enterFirstName" />
-+        <fillField selector="{{AdminCreateUserSection.lastNameTextField}}" userInput="{{user.lastName}}" stepKey="enterLastName" />
-+        <fillField selector="{{AdminCreateUserSection.emailTextField}}" userInput="{{user.username}}@magento.com" stepKey="enterEmail" />
-+        <fillField selector="{{AdminCreateUserSection.passwordTextField}}" userInput="{{user.password}}" stepKey="enterPassword" />
-+        <fillField selector="{{AdminCreateUserSection.pwConfirmationTextField}}" userInput="{{user.password}}" stepKey="confirmPassword" />
-+        <fillField selector="{{AdminCreateUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage" />
-+        <click stepKey="clickUserRole" selector="{{AdminCreateUserSection.userRoleTab}}"/>
-+        <click stepKey="chooseRole" selector="{{AdminStoreSection.createdRoleInUserPage(role.name)}}"/>
-+        <click selector="{{AdminCreateUserSection.saveButton}}" stepKey="clickSaveUser" />
-+        <waitForPageLoad stepKey="waitForSaveTheUser" />
-+        <see userInput="You saved the user." stepKey="seeSuccessMessage" />
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml
-new file mode 100644
-index 00000000000..8a1abc1ca16
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml
-@@ -0,0 +1,38 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminDeleteCreatedUserActionGroup">
-+        <arguments>
-+            <argument name="user"/>
-+        </arguments>
-+        <amOnPage stepKey="amOnAdminUsersPage" url="{{AdminUsersPage.url}}"/>
-+        <click stepKey="openTheUser" selector="{{AdminDeleteUserSection.role(user.username)}}"/>
-+        <waitForPageLoad stepKey="waitForSingleUserPageToLoad" />
-+        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
-+        <waitForPageLoad stepKey="waitForConfirmationPopup"/>
-+        <click stepKey="clickToConfirm" selector="{{AdminDeleteUserSection.confirm}}"/>
-+        <see stepKey="seeDeleteMessageForUser" userInput="You deleted the user."/>
-+    </actionGroup>
-+    <!--Delete User-->
-+    <actionGroup name="AdminDeleteNewUserActionGroup">
-+        <arguments>
-+            <argument name="userName" type="string" defaultValue="John"/>
-+        </arguments>
-+        <click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser(userName)}}"/>
-+        <fillField stepKey="typeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
-+        <waitForPageLoad stepKey="waitForDeletePopupOpen" time="5"/>
-+        <click stepKey="clickToConfirm" selector="{{AdminDeleteUserSection.confirm}}"/>
-+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
-+        <see userInput="You deleted the user." stepKey="seeSuccessMessage" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
-new file mode 100644
-index 00000000000..9b7342e531b
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
-@@ -0,0 +1,43 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminDeleteUserActionGroup">
-+        <arguments>
-+            <argument name="user"/>
-+        </arguments>
-+        <amOnPage stepKey="amOnAdminUsersPage" url="{{AdminUsersPage.url}}"/>
-+        <waitForPageLoad stepKey="waitForAdminUserPageLoad"/>
-+        <click stepKey="openTheUser" selector="{{AdminDeleteUserSection.role(user.name)}}"/>
-+        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
-+        <scrollToTopOfPage stepKey="scrollToTop"/>
-+        <click stepKey="clickToDeleteRole" selector="{{AdminDeleteUserSection.delete}}"/>
-+        <waitForElementVisible stepKey="wait" selector="{{AdminDeleteRoleSection.confirm}}" time="30"/>
-+        <click stepKey="clickToConfirm" selector="{{AdminDeleteUserSection.confirm}}"/>
-+        <waitForPageLoad stepKey="waitForPageLoad"/>
-+        <see stepKey="seeDeleteMessageForUser" userInput="You deleted the user."/>
-+    </actionGroup>
-+    <actionGroup name="AdminDeleteCustomUserActionGroup">
-+        <arguments>
-+            <argument name="user"/>
-+        </arguments>
-+        <amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToUserGrid" />
-+        <fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{user.username}}" stepKey="enterUserName" />
-+        <click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearch" />
-+        <waitForPageLoad stepKey="waitForGridToLoad"/>
-+        <see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{user.username}}" stepKey="seeUser" />
-+        <click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="openUserEdit"/>
-+        <waitForPageLoad stepKey="waitForUserEditPageLoad"/>
-+        <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterThePassword" />
-+        <click selector="{{AdminMainActionsSection.delete}}" stepKey="deleteUser"/>
-+        <waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForConfirmModal"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
-+        <waitForPageLoad stepKey="waitForSave" />
-+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the user." stepKey="seeUserDeleteMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserRoleActionGroup.xml
-new file mode 100644
-index 00000000000..d2c881b7719
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserRoleActionGroup.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminDeleteUserRoleActionGroup">
-+        <arguments>
-+            <argument name="roleName" type="string"/>
-+        </arguments>
-+        <amOnPage url="{{AdminRolesPage.url}}" stepKey="navigateToUserRolesGrid" />
-+        <fillField selector="{{AdminRoleGridSection.roleNameFilterTextField}}" userInput="{{roleName}}" stepKey="enterRoleName" />
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearch" />
-+        <see selector="{{AdminDataGridTableSection.row('1')}}" userInput="{{roleName}}" stepKey="seeUserRole" />
-+        <click selector="{{AdminDataGridTableSection.row('1')}}" stepKey="openRoleEditPage"/>
-+        <waitForPageLoad stepKey="waitForRoleEditPageLoad"/>
-+        <fillField selector="{{AdminEditRoleInfoSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterThePassword" />
-+        <click selector="{{AdminEditRoleInfoSection.deleteButton}}" stepKey="deleteUserRole"/>
-+        <waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForConfirmModal"/>
-+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
-+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitSuccessMessage"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the role." stepKey="seeUserRoleDeleteMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillForgotPasswordFormActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillForgotPasswordFormActionGroup.xml
-new file mode 100644
-index 00000000000..01be51e72ec
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillForgotPasswordFormActionGroup.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminFillForgotPasswordFormActionGroup">
-+        <arguments>
-+            <argument name="email" type="string"/>
-+        </arguments>
-+
-+        <fillField selector="{{AdminForgotPasswordFormSection.email}}" userInput="{{email}}" stepKey="fillAdminEmail"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillNewUserFormRequiredFieldsActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillNewUserFormRequiredFieldsActionGroup.xml
-new file mode 100644
-index 00000000000..87bf1e00393
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillNewUserFormRequiredFieldsActionGroup.xml
-@@ -0,0 +1,31 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminFillNewUserFormRequiredFieldsActionGroup">
-+        <arguments>
-+            <argument name="user" type="entity" />
-+        </arguments>
-+        <fillField selector="{{AdminNewUserFormSection.username}}" userInput="{{user.username}}" stepKey="fillUser"/>
-+        <fillField selector="{{AdminNewUserFormSection.firstname}}" userInput="{{user.firstname}}" stepKey="fillFirstName"/>
-+        <fillField selector="{{AdminNewUserFormSection.lastname}}" userInput="{{user.lastname}}" stepKey="fillLastName"/>
-+        <fillField selector="{{AdminNewUserFormSection.email}}" userInput="{{user.email}}" stepKey="fillEmail"/>
-+        <fillField selector="{{AdminNewUserFormSection.password}}" userInput="{{user.password}}" stepKey="fillPassword"/>
-+        <fillField selector="{{AdminNewUserFormSection.passwordConfirmation}}" userInput="{{user.password_confirmation}}" stepKey="fillPasswordConfirmation"/>
-+        <fillField selector="{{AdminNewUserFormSection.currentPassword}}" userInput="{{user.current_password}}" stepKey="fillCurrentUserPassword"/>
-+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+        <click selector="{{AdminNewUserFormSection.userRoleTab}}" stepKey="openUserRoleTab"/>
-+        <waitForPageLoad stepKey="waitForUserRoleTabOpened" />
-+        <click selector="{{AdminNewUserFormSection.resetFilter}}" stepKey="resetGridFilter" />
-+        <waitForPageLoad stepKey="waitForFiltersReset" />
-+        <fillField userInput="{{user.role}}" selector="{{AdminNewUserFormSection.roleFilterField}}" stepKey="fillRoleFilterField" />
-+        <click selector="{{AdminNewUserFormSection.search}}" stepKey="clickSearchButton" />
-+        <waitForPageLoad stepKey="waitForFiltersApplied" />
-+        <checkOption selector="{{AdminNewUserFormSection.roleRadiobutton(user.role)}}" stepKey="assignRole"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillUserRoleFormActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillUserRoleFormActionGroup.xml
-new file mode 100644
-index 00000000000..e1e7b26c87b
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillUserRoleFormActionGroup.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminFillUserRoleFormActionGroup">
-+        <arguments>
-+            <argument name="role" type="entity" />
-+            <argument name="currentAdminPassword" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" />
-+        </arguments>
-+
-+        <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="fillRoleName"/>
-+        <fillField selector="{{AdminCreateRoleSection.password}}" userInput="{{currentAdminPassword}}" stepKey="fillCurrentUserPassword"/>
-+
-+        <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
-+        <waitForPageLoad stepKey="waitForRoleResourceTab" />
-+        
-+        <selectOption userInput="{{role.resourceAccess}}" selector="{{AdminCreateRoleSection.resourceAccess}}" stepKey="selectResourceAccess" />
-+        <performOn stepKey="checkNeededResources" selector="{{AdminCreateRoleSection.resourceTree}}" function="function($I,$userRoles={{role.resources}}){foreach($userRoles as $userRole){$I->conditionalClick('//li[@data-id=\'' . $userRole . '\']//*[@class=\'jstree-checkbox\']','//li[@data-id=\'' . $userRole . '\' and contains(@class, \'jstree-checked\')]',false);}}" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenCreateRolePageActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenCreateRolePageActionGroup.xml
-new file mode 100644
-index 00000000000..4581449a321
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenCreateRolePageActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenCreateRolePageActionGroup">
-+        <amOnPage url="{{AdminEditRolePage.url}}" stepKey="amOnNewAdminRolePage"/>
-+        <waitForPageLoad stepKey="waitForNewAdminRolePageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenForgotPasswordPageActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenForgotPasswordPageActionGroup.xml
-new file mode 100644
-index 00000000000..fa17c5a7f8b
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenForgotPasswordPageActionGroup.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenForgotPasswordPageActionGroup">
-+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
-+        <waitForPageLoad stepKey="waitForAdminLoginPage"/>
-+        <click stepKey="clickForgotPasswordLink" selector="{{AdminLoginFormSection.forgotPasswordLink}}"/>
-+        <waitForPageLoad stepKey="waitForAdminForgotPasswordPage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenNewUserPageActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenNewUserPageActionGroup.xml
-new file mode 100644
-index 00000000000..67aef9379fa
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenNewUserPageActionGroup.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminOpenNewUserPageActionGroup">
-+        <amOnPage url="{{AdminNewUserPage.url}}" stepKey="amOnNewAdminUserPage"/>
-+        <waitForPageLoad stepKey="waitForNewAdminUserPageLoad"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminSubmitForgotPasswordFormActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminSubmitForgotPasswordFormActionGroup.xml
-new file mode 100644
-index 00000000000..198bc713093
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminSubmitForgotPasswordFormActionGroup.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminSubmitForgotPasswordFormActionGroup">
-+        <click selector="{{AdminForgotPasswordFormSection.retrievePasswordButton}}" stepKey="clickOnRetrievePasswordButton"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
-new file mode 100644
-index 00000000000..79c3b046943
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <!--Login New User-->
-+    <actionGroup name="LoginNewUser">
-+        <arguments>
-+            <argument name="user" defaultValue="NewAdmin"/>
-+        </arguments>
-+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}" stepKey="navigateToAdmin"/>
-+        <fillField userInput="{{user.username}}" selector="{{LoginFormSection.username}}" stepKey="fillUsername"/>
-+        <fillField userInput="{{user.password}}" selector="{{LoginFormSection.password}}" stepKey="fillPassword"/>
-+        <click selector="{{LoginFormSection.signIn}}" stepKey="clickLogin"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminUserSaveMessageActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminUserSaveMessageActionGroup.xml
-new file mode 100644
-index 00000000000..db4f0a89348
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminUserSaveMessageActionGroup.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AssertAdminUserSaveMessageActionGroup">
-+        <arguments>
-+            <argument name="message" type="string" defaultValue="You saved the user." />
-+            <argument name="messageType" type="string" defaultValue="success" />
-+        </arguments>
-+        <waitForElementVisible selector="{{AdminUserFormMessagesSection.messageByType(messageType)}}" stepKey="waitForMessage" />
-+        <see userInput="{{message}}" selector="{{AdminUserFormMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" />
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/User/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/User/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..e8b7d2aa8e0
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,31 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuSystemPermissionsAllUsers">
-+        <data key="pageTitle">Users</data>
-+        <data key="title">All Users</data>
-+        <data key="dataUiId">magento-user-system-acl-users</data>
-+    </entity>
-+    <entity name="AdminMenuSystemPermissionsLockedUsers">
-+        <data key="pageTitle">Locked Users</data>
-+        <data key="title">Locked Users</data>
-+        <data key="dataUiId">magento-user-system-acl-locks</data>
-+    </entity>
-+    <entity name="AdminMenuSystemOtherSettingsManageEncryptionKey">
-+        <data key="pageTitle">Encryption Key</data>
-+        <data key="title">Manage Encryption Key</data>
-+        <data key="dataUiId">magento-encryptionkey-system-crypt-key</data>
-+    </entity>
-+    <entity name="AdminMenuSystemPermissionsUserRoles">
-+        <data key="pageTitle">Roles</data>
-+        <data key="title">User Roles</data>
-+        <data key="dataUiId">magento-user-system-acl-roles</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/User/Test/Mftf/Data/UserData.xml b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
-index 93bf0ccfa43..e665736ae28 100644
---- a/app/code/Magento/User/Test/Mftf/Data/UserData.xml
-+++ b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
-@@ -7,7 +7,49 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="DefaultAdminUser" type="user">
-+        <data key="username">{{_ENV.MAGENTO_ADMIN_USERNAME}}</data>
-+        <data key="password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
-+    </entity>
-+    <entity name="AdminUserWrongCredentials">
-+        <data key="username" unique="suffix">username_</data>
-+        <data key="password" unique="suffix">password_</data>
-+    </entity>
-+    <entity name="NewAdminUser" type="user">
-+        <data key="username" unique="suffix">admin</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="email" unique="prefix">admin@example.com</data>
-+        <data key="password">123123q</data>
-+        <data key="password_confirmation">123123q</data>
-+        <data key="interface_local">en_US</data>
-+        <data key="interface_local_label">English (United States)</data>
-+        <data key="is_active">true</data>
-+        <data key="is_active_label">Active</data>
-+        <data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
-+        <data key="role">Administrators</data>
-+        <array key="roles">
-+            <item>1</item>
-+        </array>
-+    </entity>
-+    <entity name="NewAdminUserWrongCurrentPassword" type="user">
-+        <data key="username" unique="suffix">admin</data>
-+        <data key="firstname">John</data>
-+        <data key="lastname">Doe</data>
-+        <data key="email" unique="prefix">admin@example.com</data>
-+        <data key="password">123123q</data>
-+        <data key="password_confirmation">123123q</data>
-+        <data key="interface_local">en_US</data>
-+        <data key="interface_local_label">English (United States)</data>
-+        <data key="is_active">true</data>
-+        <data key="is_active_label">Active</data>
-+        <data key="current_password" unique="suffix">password_</data>
-+        <data key="role">Administrators</data>
-+        <array key="roles">
-+            <item>1</item>
-+        </array>
-+    </entity>
-     <entity name="admin" type="user">
-         <data key="email">admin@magento.com</data>
-         <data key="password">admin123</data>
-@@ -18,4 +60,18 @@
-         <data key="lastName">Smith</data>
-         <data key="password">admin123</data>
-     </entity>
-+    <entity name="Admin3" type="user">
-+        <data key="username" unique="suffix">admin3</data>
-+        <data key="firstname">admin3</data>
-+        <data key="lastname">admin3</data>
-+        <data key="email" unique="prefix">admin3WebUser@example.com</data>
-+        <data key="password">123123q</data>
-+        <data key="password_confirmation">123123q</data>
-+        <data key="interface_local">en_US</data>
-+        <data key="is_active">true</data>
-+        <data key="current_password">123123q</data>
-+        <array key="roles">
-+            <item>1</item>
-+        </array>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml b/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
-index 39eea63356b..1c18ca13b97 100644
---- a/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
-+++ b/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
-@@ -7,10 +7,21 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="adminRole" type="role">
-         <data key="name" unique="suffix">adminRole</data>
-         <data key="scope">1</data>
-         <data key="access">1</data>
-     </entity>
-+
-+    <entity name="roleAdministrator" type="role">
-+        <data key="name" unique="suffix">Administrator </data>
-+        <data key="resourceAccess">All</data>
-+        <data key="resources">[]</data>
-+    </entity>
-+    <entity name="roleSales" type="role">
-+        <data key="name" unique="suffix">Role Sales </data>
-+        <data key="resourceAccess">Custom</data>
-+        <data key="resources">['Magento_Sales::sales','Magento_Sales::sales_operation','Magento_Sales::actions','Magento_Sales::sales_order','Magento_Sales::create','Magento_Sales::actions_view','Magento_Sales::email','Magento_Sales::reorder','Magento_Sales::actions_edit','Magento_Sales::cancel','Magento_Sales::review_payment','Magento_Sales::capture','Magento_Sales::invoice','Magento_Sales::creditmemo','Magento_Sales::hold','Magento_Sales::unhold','Magento_Sales::ship','Magento_Sales::comment','Magento_Sales::emails','Magento_Backend::system','Magento_Backend::system_other_settings','Magento_AdminNotification::adminnotification','Magento_AdminNotification::show_list']</data>
-+    </entity>
- </entities>
-diff --git a/app/code/Magento/User/Test/Mftf/Metadata/user-meta.xml b/app/code/Magento/User/Test/Mftf/Metadata/user-meta.xml
-new file mode 100644
-index 00000000000..1ee29be6b3d
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Metadata/user-meta.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CreateUser" dataType="user" type="create"
-+               auth="adminFormKey" url="/admin/user/save/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
-+        <contentType>application/x-www-form-urlencoded</contentType>
-+        <field key="username">string</field>
-+        <field key="firstname">string</field>
-+        <field key="lastname">string</field>
-+        <field key="email">string</field>
-+        <field key="password">string</field>
-+        <field key="password_confirmation">string</field>
-+        <field key="interface_locale">string</field>
-+        <field key="is_active">boolean</field>
-+        <field key="current_password">string</field>
-+        <array key="roles">
-+            <value>string</value>
-+        </array>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/User/Test/Mftf/Metadata/user_role-meta.xml b/app/code/Magento/User/Test/Mftf/Metadata/user_role-meta.xml
-new file mode 100644
-index 00000000000..9d0132453c7
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Metadata/user_role-meta.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-+    <operation name="CreateUserRole" dataType="user_role" type="create"
-+               auth="adminFormKey" url="/admin/user_role/saverole/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
-+        <contentType>application/x-www-form-urlencoded</contentType>
-+        <field key="rolename">string</field>
-+        <field key="current_password">string</field>
-+        <array key="resource">
-+            <value>string</value>
-+        </array>
-+    </operation>
-+</operations>
-diff --git a/app/code/Magento/User/Test/Mftf/Page/AdminEditRolePage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminEditRolePage.xml
-index 8c71a815a33..5b94553e398 100644
---- a/app/code/Magento/User/Test/Mftf/Page/AdminEditRolePage.xml
-+++ b/app/code/Magento/User/Test/Mftf/Page/AdminEditRolePage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminEditRolePage" url="admin/user_role/editrole" module="Magento_User" area="admin">
-         <section name="AdminEditRoleInfoSection"/>
-     </page>
-diff --git a/app/code/Magento/User/Test/Mftf/Page/AdminEditUserPage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminEditUserPage.xml
-index 7f6751c6f9e..ae965fa1c48 100644
---- a/app/code/Magento/User/Test/Mftf/Page/AdminEditUserPage.xml
-+++ b/app/code/Magento/User/Test/Mftf/Page/AdminEditUserPage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminEditUserPage" url="admin/user/new" area="admin" module="Magento_User">
-         <section name="AdminEditUserSection"/>
-         <section name="AdminEditUserRoleSection"/>
-diff --git a/app/code/Magento/User/Test/Mftf/Page/AdminNewUserPage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminNewUserPage.xml
-new file mode 100644
-index 00000000000..6de09457934
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Page/AdminNewUserPage.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminNewUserPage" url="admin/user/new" area="admin" module="Magento_User">
-+        <section name="AdminNewUserFormSection" />
-+        <section name="AdminNewUserFormMessagesSection" />
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/User/Test/Mftf/Page/AdminRolesPage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminRolesPage.xml
-index 87cf0625670..e3b0c55f99c 100644
---- a/app/code/Magento/User/Test/Mftf/Page/AdminRolesPage.xml
-+++ b/app/code/Magento/User/Test/Mftf/Page/AdminRolesPage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminRolesPage" url="admin/user_role/" module="Magento_User" area="admin">
-         <section name="AdminRoleGridSection"/>
-     </page>
-diff --git a/app/code/Magento/User/Test/Mftf/Page/AdminUsersPage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminUsersPage.xml
-index 2075cba2bdc..ceb05ec7bd9 100644
---- a/app/code/Magento/User/Test/Mftf/Page/AdminUsersPage.xml
-+++ b/app/code/Magento/User/Test/Mftf/Page/AdminUsersPage.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminUsersPage" url="admin/user/" area="admin" module="Magento_User">
-         <section name="AdminUserGridSection"/>
-     </page>
-diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
-new file mode 100644
-index 00000000000..7c5268b1786
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
-@@ -0,0 +1,29 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminCreateRoleSection">
-+        <element name="create" type="button" selector="#add"/>
-+        <element name="name" type="button" selector="#role_name"/>
-+        <element name="password" type="input" selector="#current_password"/>
-+        <element name="resourceAccess" type="select" selector="[data-ui-id='adminhtml-user-editroles-tab-content-account'] [name='all']"/>
-+        <element name="resourceTree" type="block" selector="[data-ui-id='adminhtml-user-editroles-tab-content-account'] [data-role='resource-tree']"/>
-+
-+        <element name="roleResources" type="button" selector="#role_info_tabs_account"/>
-+        <element name="roleResource" type="button" selector="#gws_is_all"/>
-+        <element name="resourceValue" type="button" selector="//*[text()='{{arg1}}']" parameterized="true"/>
-+        <element name="roleScope" type="button" selector="#all"/>
-+        <element name="scopeValue" type="button" selector="//select[@id='all']/*[text()='{{arg2}}']" parameterized="true"/>
-+        <element name="website" type="checkbox" selector="//*[contains(text(), '{{arg3}}')]" parameterized="true"/>
-+        <element name="save" type="button" selector="//button[@title='Save Role']"/>
-+        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
-+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
-new file mode 100644
-index 00000000000..1b55d09d059
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminDeleteRoleSection">
-+        <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
-+        <element name="current_pass" type="button" selector="#current_password"/>
-+        <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
-+        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
-index feb7b3e3bba..57659e1aff0 100644
---- a/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
-+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminEditRoleInfoSection">
-         <element name="roleName" type="input" selector="#role_name"/>
-         <element name="password" type="input" selector="#current_password"/>
-@@ -17,5 +17,6 @@
-         <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
-         <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
-         <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
-+        <element name="blockName" type="checkbox" selector="//*[text()='{{var}}']//*[@class='jstree-checkbox']" parameterized="true"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleResourcesSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleResourcesSection.xml
-new file mode 100644
-index 00000000000..48873bd9d15
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleResourcesSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminEditRoleResourcesSection">
-+        <element name="resourceAccess" type="select" selector="#all"/>
-+        <element name="resources" type="checkbox" selector="#role_info_tabs_account"/>
-+        <element name="storeName" type="checkbox" selector="//label[contains(text(),'{{var1}}')]" parameterized="true"/>
-+        <element name="reportsCheckbox" type="text" selector="//li[@data-id='Magento_Reports::report']//a[text()='Reports']"/>
-+        <element name="userRoles" type="text" selector="//span[contains(text(), 'User Roles')]"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserRoleSection.xml
-index dc12205a84d..8f6f2352ff0 100644
---- a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserRoleSection.xml
-+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserRoleSection.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminEditUserRoleSection">
-         <element name="usernameTextField" type="input" selector="#user_username"/>
-         <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
-diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
-index 1406758b861..64068a0a5ef 100644
---- a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
-+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
-@@ -5,8 +5,12 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminEditUserSection">
-+        <element name="system" type="input" selector="#menu-magento-backend-system"/>
-+        <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
-+        <element name="create" type="input" selector="#add"/>
-         <element name="usernameTextField" type="input" selector="#user_username"/>
-         <element name="firstNameTextField" type="input" selector="#user_firstname"/>
-         <element name="lastNameTextField" type="input" selector="#user_lastname"/>
-diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminNewUserFormSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminNewUserFormSection.xml
-new file mode 100644
-index 00000000000..9b030b216ce
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Section/AdminNewUserFormSection.xml
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminNewUserFormSection">
-+        <element name="save" type="button" selector=".page-main-actions #save"/>
-+
-+        <element name="userInfoTab" type="button" selector="#page_tabs_main_section"/>
-+        <element name="username" type="input" selector="#page_tabs_main_section_content input[name='username']"/>
-+        <element name="firstname" type="input" selector="#page_tabs_main_section_content input[name='firstname']"/>
-+        <element name="lastname" type="input" selector="#page_tabs_main_section_content input[name='lastname']"/>
-+        <element name="email" type="input" selector="#page_tabs_main_section_content input[name='email']"/>
-+        <element name="password" type="input" selector="#page_tabs_main_section_content input[name='password']"/>
-+        <element name="passwordConfirmation" type="input" selector="#page_tabs_main_section_content input[name='password_confirmation']"/>
-+        <element name="interfaceLocale" type="select" selector="#page_tabs_main_section_content select[name='interface_locale']"/>
-+        <element name="currentPassword" type="input" selector="#page_tabs_main_section_content input[name='current_password']"/>
-+
-+        <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
-+        <element name="search" type="button" selector="#page_tabs_roles_section_content #permissionsUserRolesGrid [data-action='grid-filter-apply']" />
-+        <element name="resetFilter" type="button" selector="#page_tabs_roles_section_content #permissionsUserRolesGrid [data-action='grid-filter-reset']" />
-+        <element name="roleFilterField" type="input" selector="#page_tabs_roles_section_content #permissionsUserRolesGrid input[name='role_name']" />
-+        <element name="roleRadiobutton" type="radio" selector="//table[@id='permissionsUserRolesGrid_table']//tr[./td[contains(@class, 'col-role_name') and contains(., '{{roleName}}')]]//input[@name='roles[]']" parameterized="true"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml
-index 1e1f3457995..8413081237f 100644
---- a/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml
-+++ b/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminRoleGridSection">
-         <element name="idFilterTextField" type="input" selector="#roleGrid_filter_role_id"/>
-         <element name="roleNameFilterTextField" type="input" selector="#roleGrid_filter_role_name"/>
-@@ -14,4 +14,11 @@
-         <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
-         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-     </section>
-+
-+    <section name="AdminDeleteRoleSection">
-+        <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
-+        <element name="current_pass" type="button" selector="#current_password"/>
-+        <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
-+        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
-+    </section>
- </sections>
-diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminUserFormMessagesSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminUserFormMessagesSection.xml
-new file mode 100644
-index 00000000000..ec4f4d8bf3a
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Section/AdminUserFormMessagesSection.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminUserFormMessagesSection">
-+        <element name="messageByType" type="block" selector="#messages .message-{{messageType}}" parameterized="true" />
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml
-index b6d2645ac73..32e834615a2 100644
---- a/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml
-+++ b/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml
-@@ -5,7 +5,7 @@
-   * See COPYING.txt for license details.
-   */
- -->
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminUserGridSection">
-         <element name="usernameFilterTextField" type="input" selector="#permissionsUserGrid_filter_username"/>
-         <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-@@ -14,4 +14,11 @@
-         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-         <element name="successMessage" type="text" selector=".message-success"/>
-     </section>
-+
-+    <section name="AdminDeleteUserSection">
-+        <element name="theUser" selector="//td[contains(text(), '{{userName}}')]" type="button" parameterized="true"/>
-+        <element name="password" selector="#user_current_password" type="input"/>
-+        <element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
-+        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
-+    </section>
- </sections>
-diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminResetUserPasswordFailedTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminResetUserPasswordFailedTest.xml
-new file mode 100644
-index 00000000000..e8cbaeaf6fe
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Test/AdminResetUserPasswordFailedTest.xml
-@@ -0,0 +1,45 @@
-+<?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="AdminResetUserPasswordFailedTest">
-+        <annotations>
-+            <features value="User"/>
-+            <stories value="Password Reset procedure for Admin Panel"/>
-+            <title value="Admin user should not be able to trigger the password reset procedure twice"/>
-+            <description value="Admin user should not be able to trigger the password reset procedure twice"/>
-+            <testCaseId value="MC-14389"/>
-+            <severity value="CRITICAL"/>
-+            <group value="security"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+
-+        <!-- First attempt to reset password -->
-+        <actionGroup ref="AdminOpenForgotPasswordPageActionGroup" stepKey="openAdminForgotPasswordPage1"/>
-+        <actionGroup ref="AdminFillForgotPasswordFormActionGroup" stepKey="fillAdminForgotPasswordForm1">
-+            <argument name="email" value="customer@example.com"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminSubmitForgotPasswordFormActionGroup" stepKey="submitAdminForgotPasswordForm1"/>
-+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeSuccessMessage">
-+            <argument name="messageType" value="success"/>
-+            <argument name="message" value="We'll email you a link to reset your password."/>
-+        </actionGroup>
-+
-+        <!-- Second attempt to reset password -->
-+        <actionGroup ref="AdminOpenForgotPasswordPageActionGroup" stepKey="openAdminForgotPasswordPage2"/>
-+        <actionGroup ref="AdminFillForgotPasswordFormActionGroup" stepKey="fillAdminForgotPasswordForm2">
-+            <argument name="email" value="customer@example.com"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminSubmitForgotPasswordFormActionGroup" stepKey="submitAdminForgotPasswordForm2"/>
-+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeErrorMessage">
-+            <argument name="messageType" value="error"/>
-+            <argument name="message" value="We received too many requests for password resets. Please wait and try again later or contact hello@example.com."/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminSystemAllUsersNavigateMenuTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminSystemAllUsersNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..b899320403d
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Test/AdminSystemAllUsersNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSystemAllUsersNavigateMenuTest">
-+        <annotations>
-+            <features value="User"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin system all users navigate menu test"/>
-+            <description value="Admin should be able to navigate to System > All Users"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14123"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemAllUsersPage">
-+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSystemPermissionsAllUsers.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSystemPermissionsAllUsers.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminSystemLockedUsersNavigateMenuTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminSystemLockedUsersNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..aea46f32731
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Test/AdminSystemLockedUsersNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSystemLockedUsersNavigateMenuTest">
-+        <annotations>
-+            <features value="User"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin system locked users navigate menu test"/>
-+            <description value="Admin should be able to navigate to System > Locked Users"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14121"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemLockedUsersPage">
-+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSystemPermissionsLockedUsers.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSystemPermissionsLockedUsers.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminSystemManageEncryptionKeyNavigateMenuTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminSystemManageEncryptionKeyNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..f8013a54058
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Test/AdminSystemManageEncryptionKeyNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSystemManageEncryptionKeyNavigateMenuTest">
-+        <annotations>
-+            <features value="User"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin system manage encryption key navigate menu test"/>
-+            <description value="Admin should be able to navigate to System > Manage Encryption Key"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14122"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToManageEncryptionKeyPage">
-+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSystemOtherSettingsManageEncryptionKey.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSystemOtherSettingsManageEncryptionKey.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminSystemUserRolesNavigateMenuTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminSystemUserRolesNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..c4052a7f421
---- /dev/null
-+++ b/app/code/Magento/User/Test/Mftf/Test/AdminSystemUserRolesNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSystemUserRolesNavigateMenuTest">
-+        <annotations>
-+            <features value="User"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin system user roles navigate menu test"/>
-+            <description value="Admin should be able to navigate to System > User Roles"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14124"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemUserRolesPage">
-+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSystemPermissionsUserRoles.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSystemPermissionsUserRoles.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/User/Test/Unit/Model/Authorization/AdminSessionUserContextTest.php b/app/code/Magento/User/Test/Unit/Model/Authorization/AdminSessionUserContextTest.php
-deleted file mode 100644
-index 23681c4b8da..00000000000
---- a/app/code/Magento/User/Test/Unit/Model/Authorization/AdminSessionUserContextTest.php
-+++ /dev/null
-@@ -1,89 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\User\Test\Unit\Model\Authorization;
--
--use Magento\Authorization\Model\UserContextInterface;
--
--/**
-- * Tests Magento\User\Model\Authorization\AdminSessionUserContext
-- */
--class AdminSessionUserContextTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
--     */
--    protected $objectManager;
--
--    /**
--     * @var \Magento\User\Model\Authorization\AdminSessionUserContext
--     */
--    protected $adminSessionUserContext;
--
--    /**
--     * @var \Magento\Backend\Model\Auth\Session
--     */
--    protected $adminSession;
--
--    protected function setUp()
--    {
--        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--
--        $this->adminSession = $this->getMockBuilder(\Magento\Backend\Model\Auth\Session::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['hasUser', 'getUser', 'getId'])
--            ->getMock();
--
--        $this->adminSessionUserContext = $this->objectManager->getObject(
--            \Magento\User\Model\Authorization\AdminSessionUserContext::class,
--            ['adminSession' => $this->adminSession]
--        );
--    }
--
--    public function testGetUserIdExist()
--    {
--        $userId = 1;
--
--        $this->setupUserId($userId);
--
--        $this->assertEquals($userId, $this->adminSessionUserContext->getUserId());
--    }
--
--    public function testGetUserIdDoesNotExist()
--    {
--        $userId = null;
--
--        $this->setupUserId($userId);
--
--        $this->assertEquals($userId, $this->adminSessionUserContext->getUserId());
--    }
--
--    public function testGetUserType()
--    {
--        $this->assertEquals(UserContextInterface::USER_TYPE_ADMIN, $this->adminSessionUserContext->getUserType());
--    }
--
--    /**
--     * @param int|null $userId
--     * @return void
--     */
--    public function setupUserId($userId)
--    {
--        $this->adminSession->expects($this->once())
--            ->method('hasUser')
--            ->will($this->returnValue($userId));
--
--        if ($userId) {
--            $this->adminSession->expects($this->once())
--                ->method('getUser')
--                ->will($this->returnSelf());
--
--            $this->adminSession->expects($this->once())
--                ->method('getId')
--                ->will($this->returnValue($userId));
--        }
--    }
--}
-diff --git a/app/code/Magento/User/Test/Unit/Model/UserTest.php b/app/code/Magento/User/Test/Unit/Model/UserTest.php
-index 4bc5db138c7..ab06c8754b2 100644
---- a/app/code/Magento/User/Test/Unit/Model/UserTest.php
-+++ b/app/code/Magento/User/Test/Unit/Model/UserTest.php
-@@ -6,7 +6,9 @@
- 
- namespace Magento\User\Test\Unit\Model;
- 
--use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\User\Helper\Data as UserHelper;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\User\Model\User;
- 
- /**
-  * Test class for \Magento\User\Model\User testing
-@@ -16,55 +18,11 @@ use Magento\Framework\Serialize\Serializer\Json;
-  */
- class UserTest extends \PHPUnit\Framework\TestCase
- {
--    /** @var \Magento\User\Model\User */
--    protected $model;
-+    /** @var User */
-+    private $model;
- 
--    /** @var \Magento\User\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
--    protected $userDataMock;
--
--    /** @var \Magento\Framework\Mail\Template\TransportBuilder|\PHPUnit_Framework_MockObject_MockObject */
--    protected $transportBuilderMock;
--
--    /** @var \Magento\Framework\Model\Context|\PHPUnit_Framework_MockObject_MockObject */
--    protected $contextMock;
--
--    /** @var \Magento\User\Model\ResourceModel\User|\PHPUnit_Framework_MockObject_MockObject */
--    protected $resourceMock;
--
--    /** @var \Magento\Framework\Data\Collection\AbstractDb|\PHPUnit_Framework_MockObject_MockObject */
--    protected $collectionMock;
--
--    /** @var \Magento\Framework\Mail\TransportInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $transportMock;
--
--    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $storeManagerMock;
--
--    /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */
--    protected $storeMock;
--
--    /** @var \Magento\Backend\App\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $configMock;
--
--    /** @var \Magento\Framework\Encryption\EncryptorInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $encryptorMock;
--
--    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    protected $eventManagerMock;
--
--    /** @var \Magento\Framework\Validator\DataObjectFactory|\PHPUnit_Framework_MockObject_MockObject */
--    protected $validatorObjectFactoryMock;
--
--    /** @var \Magento\User\Model\UserValidationRules|\PHPUnit_Framework_MockObject_MockObject */
--    protected $validationRulesMock;
--
--    /** @var \Magento\Authorization\Model\RoleFactory|\PHPUnit_Framework_MockObject_MockObject */
--    protected $roleFactoryMock;
--
--    /**
--     * @var Json|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $serializer;
-+    /** @var UserHelper|\PHPUnit_Framework_MockObject_MockObject */
-+    private $userDataMock;
- 
-     /**
-      * Set required values
-@@ -72,552 +30,35 @@ class UserTest extends \PHPUnit\Framework\TestCase
-      */
-     protected function setUp()
-     {
--        $this->userDataMock = $this->getMockBuilder(\Magento\User\Helper\Data::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->contextMock = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->resourceMock = $this->getMockBuilder(\Magento\User\Model\ResourceModel\User::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->collectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection\AbstractDb::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMockForAbstractClass();
--        $coreRegistry = $this->getMockBuilder(\Magento\Framework\Registry::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->eventManagerMock = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['dispatch'])
--            ->getMockForAbstractClass();
--        $this->validatorObjectFactoryMock = $this->getMockBuilder(\Magento\Framework\Validator\DataObjectFactory::class)
--            ->disableOriginalConstructor()->setMethods(['create'])
--            ->getMock();
--        $this->roleFactoryMock = $this->getMockBuilder(\Magento\Authorization\Model\RoleFactory::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create'])
--            ->getMock();
--        $this->transportMock = $this->getMockBuilder(\Magento\Framework\Mail\TransportInterface::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->transportBuilderMock = $this->getMockBuilder(\Magento\Framework\Mail\Template\TransportBuilder::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--
--        $this->configMock = $this->getMockBuilder(\Magento\Backend\App\ConfigInterface::class)
-+        $this->userDataMock = $this->getMockBuilder(UserHelper::class)
-             ->disableOriginalConstructor()
-             ->setMethods([])
-             ->getMock();
- 
--        $this->validationRulesMock = $this->getMockBuilder(\Magento\User\Model\UserValidationRules::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--
--        $this->encryptorMock = $this->getMockBuilder(\Magento\Framework\Encryption\EncryptorInterface::class)
--            ->setMethods(['validateHash'])
--            ->getMockForAbstractClass();
--
--        $this->serializer = $this->createPartialMock(Json::class, ['serialize', 'unserialize']);
--
--        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $objectManagerHelper = new ObjectManager($this);
-         $this->model = $objectManagerHelper->getObject(
--            \Magento\User\Model\User::class,
-+            User::class,
-             [
--                'eventManager' => $this->eventManagerMock,
-                 'userData' => $this->userDataMock,
--                'registry' => $coreRegistry,
--                'resource' => $this->resourceMock,
--                'resourceCollection' => $this->collectionMock,
--                'validatorObjectFactory' => $this->validatorObjectFactoryMock,
--                'roleFactory' => $this->roleFactoryMock,
--                'transportBuilder' => $this->transportBuilderMock,
--                'storeManager' => $this->storeManagerMock,
--                'validationRules' => $this->validationRulesMock,
--                'config' => $this->configMock,
--                'encryptor' => $this->encryptorMock,
--                'serializer' => $this->serializer
-             ]
-         );
-     }
- 
--    /**
--     * @return void
--     */
--    public function testSendNotificationEmailsIfRequired()
--    {
--        $storeId = 0;
--        $email = 'test1@example.com';
--        $origEmail = 'test2@example.com';
--
--        $password = '1234567';
--        $origPassword = '123456789';
--
--        $username = 'admin1';
--        $origUsername = 'admin2';
--
--        $firstName = 'Foo';
--        $lastName = 'Bar';
--
--        $changes = __('email') . ', ' . __('password') . ', ' . __('username');
--
--        $this->model->setEmail($email);
--        $this->model->setOrigData('email', $origEmail);
--
--        $this->model->setPassword($password);
--        $this->model->setOrigData('password', $origPassword);
--
--        $this->model->setUserName($username);
--        $this->model->setOrigData('username', $origUsername);
--
--        $this->model->setFirstName($firstName);
--        $this->model->setLastName($lastName);
--
--        $this->configMock->expects($this->exactly(4))
--            ->method('getValue')
--            ->withConsecutive(
--                [\Magento\User\Model\User::XML_PATH_USER_NOTIFICATION_TEMPLATE],
--                [\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_IDENTITY],
--                [\Magento\User\Model\User::XML_PATH_USER_NOTIFICATION_TEMPLATE],
--                [\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_IDENTITY]
--            )->willReturnOnConsecutiveCalls(
--                'templateId',
--                'sender',
--                'templateId',
--                'sender'
--            );
--
--        $this->transportBuilderMock->expects($this->exactly(2))
--            ->method('setTemplateModel')
--            ->with($this->equalTo(\Magento\Email\Model\BackendTemplate::class))
--            ->willReturnSelf();
--        $this->transportBuilderMock->expects($this->exactly(2))
--            ->method('setTemplateOptions')
--            ->willReturnSelf();
--        $this->transportBuilderMock->expects($this->exactly(2))
--            ->method('setTemplateVars')
--            ->with(['user' => $this->model, 'store' => $this->storeMock, 'changes' => $changes])
--            ->willReturnSelf();
--        $this->transportBuilderMock->expects($this->exactly(2))
--            ->method('addTo')
--            ->withConsecutive(
--                $this->equalTo($email),
--                $this->equalTo($firstName . ' ' . $lastName),
--                $this->equalTo($origEmail),
--                $this->equalTo($firstName . ' ' . $lastName)
--            )
--            ->willReturnSelf();
--        $this->transportBuilderMock->expects($this->exactly(2))
--            ->method('setFrom')
--            ->with('sender')
--            ->willReturnSelf();
--        $this->transportBuilderMock->expects($this->exactly(2))
--            ->method('setTemplateIdentifier')
--            ->with('templateId')
--            ->willReturnSelf();
--        $this->transportBuilderMock->expects($this->exactly(2))
--            ->method('getTransport')
--            ->willReturn($this->transportMock);
--        $this->transportMock->expects($this->exactly(2))->method('sendMessage');
--
--        $this->storeManagerMock->expects($this->exactly(2))
--            ->method('getStore')
--            ->with($storeId)
--            ->willReturn($this->storeMock);
--
--        $this->assertInstanceOf(\Magento\User\Model\User::class, $this->model->sendNotificationEmailsIfRequired());
--    }
--
--    /**
--     * @return void
--     */
--    public function testSendPasswordResetConfirmationEmail()
--    {
--        $storeId = 0;
--        $email = 'test@example.com';
--        $firstName = 'Foo';
--        $lastName = 'Bar';
--
--        $this->model->setEmail($email);
--        $this->model->setFirstName($firstName);
--        $this->model->setLastName($lastName);
--
--        $this->configMock->expects($this->at(0))
--            ->method('getValue')
--            ->with(\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_TEMPLATE)
--            ->willReturn('templateId');
--        $this->configMock->expects($this->at(1))
--            ->method('getValue')
--            ->with(\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_IDENTITY)
--            ->willReturn('sender');
--        $this->transportBuilderMock->expects($this->once())
--            ->method('setTemplateModel')
--            ->with($this->equalTo(\Magento\Email\Model\BackendTemplate::class))
--            ->willReturnSelf();
--        $this->transportBuilderMock->expects($this->once())
--            ->method('setTemplateOptions')
--            ->willReturnSelf();
--        $this->transportBuilderMock->expects($this->once())
--            ->method('setTemplateVars')
--            ->with(['user' => $this->model, 'store' => $this->storeMock])
--            ->willReturnSelf();
--        $this->transportBuilderMock->expects($this->once())
--            ->method('addTo')
--            ->with($this->equalTo($email), $this->equalTo($firstName . ' ' . $lastName))
--            ->willReturnSelf();
--        $this->transportBuilderMock->expects($this->once())
--            ->method('setFrom')
--            ->with('sender')
--            ->willReturnSelf();
--        $this->transportBuilderMock->expects($this->once())
--            ->method('setTemplateIdentifier')
--            ->with('templateId')
--            ->willReturnSelf();
--        $this->transportBuilderMock->expects($this->once())
--            ->method('getTransport')
--            ->willReturn($this->transportMock);
--        $this->transportMock->expects($this->once())->method('sendMessage');
--
--        $this->storeManagerMock->expects($this->once())
--            ->method('getStore')
--            ->with($storeId)
--            ->willReturn($this->storeMock);
--
--        $this->assertInstanceOf(\Magento\User\Model\User::class, $this->model->sendPasswordResetConfirmationEmail());
--    }
--
--    /**
--     * @return void
--     */
--    public function testVerifyIdentity()
--    {
--        $password = 'password';
--        $this->encryptorMock
--            ->expects($this->once())
--            ->method('validateHash')
--            ->with($password, $this->model->getPassword())
--            ->willReturn(true);
--        $this->model->setIsActive(true);
--        $this->resourceMock->expects($this->once())->method('hasAssigned2Role')->willReturn(true);
--        $this->assertTrue(
--            $this->model->verifyIdentity($password),
--            'Identity verification failed while should have passed.'
--        );
--    }
--
--    /**
--     * @return void
--     */
--    public function testVerifyIdentityFailure()
--    {
--        $password = 'password';
--        $this->encryptorMock
--            ->expects($this->once())
--            ->method('validateHash')
--            ->with($password, $this->model->getPassword())
--            ->willReturn(false);
--        $this->assertFalse(
--            $this->model->verifyIdentity($password),
--            'Identity verification passed while should have failed.'
--        );
--    }
--
--    /**
--     * @return void
--     */
--    public function testVerifyIdentityInactiveRecord()
--    {
--        $password = 'password';
--        $this->encryptorMock
--            ->expects($this->once())
--            ->method('validateHash')
--            ->with($password, $this->model->getPassword())
--            ->willReturn(true);
--        $this->model->setIsActive(false);
--        $this->expectException(\Magento\Framework\Exception\AuthenticationException::class);
--        $this->expectExceptionMessage('The account sign-in was incorrect or your account is disabled temporarily. '
--            . 'Please wait and try again later.');
--        $this->model->verifyIdentity($password);
--    }
--
--    /**
--     * @return void
--     */
--    public function testVerifyIdentityNoAssignedRoles()
--    {
--        $password = 'password';
--        $this->encryptorMock
--            ->expects($this->once())
--            ->method('validateHash')
--            ->with($password, $this->model->getPassword())
--            ->willReturn(true);
--        $this->model->setIsActive(true);
--        $this->resourceMock->expects($this->once())->method('hasAssigned2Role')->willReturn(false);
--        $this->expectException(\Magento\Framework\Exception\AuthenticationException::class);
--        $this->expectExceptionMessage('More permissions are needed to access this.');
--        $this->model->verifyIdentity($password);
--    }
--
--    /**
--     * @return void
--     */
--    public function testSleep()
--    {
--        $excludedProperties = [
--            '_eventManager',
--            '_cacheManager',
--            '_registry',
--            '_appState',
--            '_userData',
--            '_config',
--            '_validatorObject',
--            '_roleFactory',
--            '_encryptor',
--            '_transportBuilder',
--            '_storeManager',
--            '_validatorBeforeSave'
--        ];
--        $actualResult = $this->model->__sleep();
--        $this->assertNotEmpty($actualResult);
--        $expectedResult = array_intersect($actualResult, $excludedProperties);
--        $this->assertEmpty($expectedResult);
--    }
--
--    /**
--     * @return void
--     */
--    public function testBeforeSave()
--    {
--        $this->eventManagerMock->expects($this->any())->method('dispatch');
--        $this->model->setIsActive(1);
--        $actualData = $this->model->beforeSave()->getData();
--        $this->assertArrayHasKey('extra', $actualData);
--        $this->assertArrayHasKey('password', $actualData);
--        $this->assertArrayHasKey('is_active', $actualData);
--    }
--
--    /**
--     * @return void
--     */
--    public function testValidateOk()
--    {
--        /** @var $validatorMock \Magento\Framework\Validator\DataObject|\PHPUnit_Framework_MockObject_MockObject */
--        $validatorMock = $this->getMockBuilder(\Magento\Framework\Validator\DataObject::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->validatorObjectFactoryMock->expects($this->once())->method('create')->willReturn($validatorMock);
--        $this->validationRulesMock->expects($this->once())
--            ->method('addUserInfoRules')
--            ->with($validatorMock);
--        $validatorMock->expects($this->once())->method('isValid')->willReturn(true);
--        $this->assertTrue($this->model->validate());
--    }
--
--    /**
--     * @return void
--     */
--    public function testValidateInvalid()
--    {
--        $messages = ['Invalid username'];
--        /** @var $validatorMock \Magento\Framework\Validator\DataObject|\PHPUnit_Framework_MockObject_MockObject */
--        $validatorMock = $this->getMockBuilder(\Magento\Framework\Validator\DataObject::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->validatorObjectFactoryMock->expects($this->once())->method('create')->willReturn($validatorMock);
--        $this->validationRulesMock->expects($this->once())
--            ->method('addUserInfoRules')
--            ->with($validatorMock);
--        $validatorMock->expects($this->once())->method('isValid')->willReturn(false);
--        $validatorMock->expects($this->once())->method('getMessages')->willReturn($messages);
--        $this->assertEquals($messages, $this->model->validate());
--    }
--
--    /**
--     * @return void
--     */
--    public function testSaveExtra()
--    {
--        $data = [1, 2, 3];
--        $this->resourceMock->expects($this->once())
--            ->method('saveExtra')
--            ->with($this->model, json_encode($data));
--
--        $this->serializer->expects($this->once())
--            ->method('serialize')
--            ->with($data)
--            ->will($this->returnValue(json_encode($data)));
--
--        $this->assertInstanceOf(\Magento\User\Model\User::class, $this->model->saveExtra($data));
--    }
--
--    /**
--     * @return void
--     */
--    public function testGetRoles()
--    {
--        $this->resourceMock->expects($this->once())->method('getRoles')->with($this->model)->willReturn([]);
--        $this->assertInternalType('array', $this->model->getRoles());
--    }
--
--    /**
--     * @return void
--     */
--    public function testGetRole()
--    {
--        $roles = ['role'];
--        $roleMock = $this->getMockBuilder(\Magento\Authorization\Model\Role::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->roleFactoryMock->expects($this->once())->method('create')->willReturn($roleMock);
--        $this->resourceMock->expects($this->once())->method('getRoles')->with($this->model)->willReturn($roles);
--        $roleMock->expects($this->once())->method('load')->with($roles[0]);
--        $this->assertInstanceOf(\Magento\Authorization\Model\Role::class, $this->model->getRole());
--    }
--
--    /**
--     * @return void
--     */
--    public function testDeleteFromRole()
--    {
--        $this->resourceMock->expects($this->once())->method('deleteFromRole')->with($this->model);
--        $this->assertInstanceOf(\Magento\User\Model\User::class, $this->model->deleteFromRole());
--    }
--
--    /**
--     * @return void
--     */
--    public function testRoleUserExistsTrue()
--    {
--        $result = ['role'];
--        $this->resourceMock->expects($this->once())->method('roleUserExists')->with($this->model)->willReturn($result);
--        $this->assertTrue($this->model->roleUserExists());
--    }
--
--    /**
--     * @return void
--     */
--    public function testRoleUserExistsFalse()
--    {
--        $result = [];
--        $this->resourceMock->expects($this->once())->method('roleUserExists')->with($this->model)->willReturn($result);
--        $this->assertFalse($this->model->roleUserExists());
--    }
--
--    /**
--     * @return void
--     */
--    public function testGetAclRole()
--    {
--        $roles = ['role'];
--        $result = 1;
--        $roleMock = $this->getMockBuilder(\Magento\Authorization\Model\Role::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->roleFactoryMock->expects($this->once())->method('create')->willReturn($roleMock);
--        $this->resourceMock->expects($this->once())->method('getRoles')->with($this->model)->willReturn($roles);
--        $roleMock->expects($this->once())->method('load')->with($roles[0]);
--        $roleMock->expects($this->once())->method('getId')->willReturn($result);
--        $this->assertEquals($result, $this->model->getAclRole());
--    }
--
--    /**
--     * @dataProvider authenticateDataProvider
--     * @param string $usernameIn
--     * @param string $usernameOut
--     * @param bool $expectedResult
--     * @return void
--     */
--    public function testAuthenticate($usernameIn, $usernameOut, $expectedResult)
--    {
--        $password = 'password';
--        $config = 'config';
--
--        $data = ['id' => 1, 'is_active' => 1, 'username' => $usernameOut];
--
--        $this->configMock->expects($this->once())
--            ->method('isSetFlag')
--            ->with('admin/security/use_case_sensitive_login')
--            ->willReturn($config);
--        $this->eventManagerMock->expects($this->any())->method('dispatch');
--
--        $this->resourceMock->expects($this->any())->method('loadByUsername')->willReturn($data);
--        $this->model->setIdFieldName('id');
--
--        $this->encryptorMock->expects($this->any())->method('validateHash')->willReturn(true);
--        $this->resourceMock->expects($this->any())->method('hasAssigned2Role')->willReturn(true);
--        $this->assertEquals($expectedResult, $this->model->authenticate($usernameIn, $password));
--    }
--
--    /**
--     * @return array
--     */
--    public function authenticateDataProvider()
--    {
--        return [
--            'success' => [
--                'usernameIn' => 'username',
--                'usernameOut' => 'username',
--                'expectedResult' => true
--            ],
--            'failedUsername' => [
--                'usernameIn' => 'username1',
--                'usernameOut' => 'username2',
--                'expectedResult' => false
--            ]
--        ];
--    }
--
--    /**
--     * @expectedException \Magento\Framework\Exception\LocalizedException
--     * @return void
--     */
--    public function testAuthenticateException()
--    {
--        $username = 'username';
--        $password = 'password';
--        $config = 'config';
--
--        $this->configMock->expects($this->once())
--            ->method('isSetFlag')
--            ->with('admin/security/use_case_sensitive_login')
--            ->willReturn($config);
--
--        $this->eventManagerMock->expects($this->any())->method('dispatch');
--        $this->resourceMock->expects($this->once())
--            ->method('loadByUsername')
--            ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__()));
--        $this->model->authenticate($username, $password);
--    }
--
-     /**
-      * @return void
-      */
-     public function testChangeResetPasswordLinkToken()
-     {
-         $token = '1';
--        $this->assertInstanceOf(\Magento\User\Model\User::class, $this->model->changeResetPasswordLinkToken($token));
-+        $this->assertInstanceOf(
-+            User::class,
-+            $this->model->changeResetPasswordLinkToken($token)
-+        );
-         $this->assertEquals($token, $this->model->getRpToken());
--        $this->assertInternalType('string', $this->model->getRpTokenCreatedAt());
-+        $this->assertInternalType(
-+            'string',
-+            $this->model->getRpTokenCreatedAt()
-+        );
-     }
- 
-     /**
-@@ -640,168 +81,4 @@ class UserTest extends \PHPUnit\Framework\TestCase
-         $this->userDataMock->expects($this->once())->method('getResetPasswordLinkExpirationPeriod')->willReturn(0);
-         $this->assertTrue($this->model->isResetPasswordLinkTokenExpired());
-     }
--
--    /**
--     * @return void
--     */
--    public function testIsResetPasswordLinkTokenExpiredIsNotExpiredToken()
--    {
--        $this->model->setRpToken('1');
--        $this->model->setRpTokenCreatedAt(
--            (new \DateTime())->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT)
--        );
--        $this->userDataMock->expects($this->once())->method('getResetPasswordLinkExpirationPeriod')->willReturn(1);
--        $this->assertFalse($this->model->isResetPasswordLinkTokenExpired());
--    }
--
--    public function testCheckPasswordChangeEqualToCurrent()
--    {
--        /** @var $validatorMock \Magento\Framework\Validator\DataObject|\PHPUnit_Framework_MockObject_MockObject */
--        $validatorMock = $this->getMockBuilder(\Magento\Framework\Validator\DataObject::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->validatorObjectFactoryMock->expects($this->once())->method('create')->willReturn($validatorMock);
--        $this->validationRulesMock->expects($this->once())
--            ->method('addUserInfoRules')
--            ->with($validatorMock);
--        $validatorMock->expects($this->once())->method('isValid')->willReturn(true);
--
--        $newPassword = "NEWmYn3wpassw0rd";
--        $oldPassword = "OLDmYn3wpassw0rd";
--        $this->model->setPassword($newPassword)
--            ->setId(1)
--            ->setOrigData('password', $oldPassword);
--        $this->encryptorMock->expects($this->once())
--            ->method('isValidHash')
--            ->with($newPassword, $oldPassword)
--            ->willReturn(true);
--        $result = $this->model->validate();
--        $this->assertInternalType('array', $result);
--        $this->assertCount(1, $result);
--        $this->assertContains("Sorry, but this password has already been used.", (string)$result[0]);
--    }
--
--    public function testCheckPasswordChangeEqualToPrevious()
--    {
--        /** @var $validatorMock \Magento\Framework\Validator\DataObject|\PHPUnit_Framework_MockObject_MockObject */
--        $validatorMock = $this->getMockBuilder(\Magento\Framework\Validator\DataObject::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->validatorObjectFactoryMock->expects($this->once())->method('create')->willReturn($validatorMock);
--        $this->validationRulesMock->expects($this->once())
--            ->method('addUserInfoRules')
--            ->with($validatorMock);
--        $validatorMock->expects($this->once())->method('isValid')->willReturn(true);
--
--        $newPassword = "NEWmYn3wpassw0rd";
--        $newPasswordHash = "new password hash";
--        $oldPassword = "OLDmYn3wpassw0rd";
--        $this->model->setPassword($newPassword)
--            ->setId(1)
--            ->setOrigData('password', $oldPassword);
--        $this->encryptorMock->expects($this->atLeastOnce())
--            ->method('isValidHash')
--            ->will($this->onConsecutiveCalls(false, true));
--
--        $this->resourceMock->expects($this->once())->method('getOldPasswords')->willReturn(['hash1', $newPasswordHash]);
--
--        $result = $this->model->validate();
--        $this->assertInternalType('array', $result);
--        $this->assertCount(1, $result);
--        $this->assertContains("Sorry, but this password has already been used.", (string)$result[0]);
--    }
--
--    public function testCheckPasswordChangeValid()
--    {
--        /** @var $validatorMock \Magento\Framework\Validator\DataObject|\PHPUnit_Framework_MockObject_MockObject */
--        $validatorMock = $this->getMockBuilder(\Magento\Framework\Validator\DataObject::class)
--            ->disableOriginalConstructor()
--            ->setMethods([])
--            ->getMock();
--        $this->validatorObjectFactoryMock->expects($this->once())->method('create')->willReturn($validatorMock);
--        $this->validationRulesMock->expects($this->once())
--            ->method('addUserInfoRules')
--            ->with($validatorMock);
--        $validatorMock->expects($this->once())->method('isValid')->willReturn(true);
--
--        $newPassword = "NEWmYn3wpassw0rd";
--        $oldPassword = "OLDmYn3wpassw0rd";
--        $this->model->setPassword($newPassword)
--            ->setId(1)
--            ->setOrigData('password', $oldPassword);
--        $this->encryptorMock->expects($this->atLeastOnce())
--            ->method('isValidHash')
--            ->will($this->onConsecutiveCalls(false, false, false));
--
--        $this->resourceMock->expects($this->once())->method('getOldPasswords')->willReturn(['hash1', 'hash2']);
--
--        $result = $this->model->validate();
--        $this->assertTrue($result);
--    }
--
--    /**
--     * Test for performIdentityCheck method
--     *
--     * @param bool $verifyIdentityResult
--     * @param bool $lockExpires
--     * @dataProvider dataProviderPerformIdentityCheck
--     */
--    public function testPerformIdentityCheck($verifyIdentityResult, $lockExpires)
--    {
--        $password = 'qwerty1';
--        $userName = 'John Doe';
--
--        $this->encryptorMock
--            ->expects($this->once())
--            ->method('validateHash')
--            ->with($password, $this->model->getPassword())
--            ->willReturn($verifyIdentityResult);
--        $this->model->setIsActive(true);
--        $this->resourceMock->expects($this->any())->method('hasAssigned2Role')->willReturn(true);
--
--        $this->model->setUserName($userName);
--        $this->model->setLockExpires($lockExpires);
--
--        $this->eventManagerMock->expects($this->any())
--            ->method('dispatch')
--            ->with(
--                'admin_user_authenticate_after',
--                [
--                    'username' => $userName,
--                    'password' => $password,
--                    'user' => $this->model,
--                    'result' => $verifyIdentityResult
--                ]
--            )
--            ->willReturnSelf();
--
--        if ($lockExpires) {
--            $this->expectException(\Magento\Framework\Exception\State\UserLockedException::class);
--            $this->expectExceptionMessage((string)__('Your account is temporarily disabled. Please try again later.'));
--        }
--
--        if (!$lockExpires && !$verifyIdentityResult) {
--            $this->expectException(\Magento\Framework\Exception\AuthenticationException::class);
--            $this->expectExceptionMessage(
--                (string)__('The password entered for the current user is invalid. Verify the password and try again.')
--            );
--        }
--
--        $this->model->performIdentityCheck($password);
--    }
--
--    /**
--     * @return array
--     */
--    public function dataProviderPerformIdentityCheck()
--    {
--        return [
--            ['verifyIdentityResult' => true, 'lockExpires' => false],
--            ['verifyIdentityResult' => false, 'lockExpires' => false],
--            ['verifyIdentityResult' => true, 'lockExpires' => true],
--            ['verifyIdentityResult' => false, 'lockExpires' => true]
--        ];
--    }
- }
-diff --git a/app/code/Magento/User/ViewModel/JsonSerializer.php b/app/code/Magento/User/ViewModel/JsonSerializer.php
-new file mode 100644
-index 00000000000..3cd234d9c41
---- /dev/null
-+++ b/app/code/Magento/User/ViewModel/JsonSerializer.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\User\ViewModel;
-+
-+/**
-+ * JsonSerializer
-+ */
-+class JsonSerializer implements \Magento\Framework\View\Element\Block\ArgumentInterface
-+{
-+
-+    /**
-+     * @var \Magento\Framework\Serialize\Serializer\Json
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @param \Magento\Framework\Serialize\Serializer\Json $serializer
-+     */
-+    public function __construct(\Magento\Framework\Serialize\Serializer\Json $serializer)
-+    {
-+        $this->serializer = $serializer;
-+    }
-+
-+    /**
-+     * Returns serialized version of data
-+     *
-+     * @param array $data
-+     * @return string
-+     */
-+    public function serialize(array $data): string
-+    {
-+        return $this->serializer->serialize($data);
-+    }
-+}
-diff --git a/app/code/Magento/User/etc/config.xml b/app/code/Magento/User/etc/config.xml
-index f6a3924b5a2..c1f51bcbece 100644
---- a/app/code/Magento/User/etc/config.xml
-+++ b/app/code/Magento/User/etc/config.xml
-@@ -10,6 +10,7 @@
-         <admin>
-             <emails>
-                 <forgot_email_template>admin_emails_forgot_email_template</forgot_email_template>
-+                <new_user_notification_template>admin_emails_new_user_notification_template</new_user_notification_template>
-                 <forgot_email_identity>general</forgot_email_identity>
-                 <user_notification_template>admin_emails_user_notification_template</user_notification_template>
-             </emails>
-diff --git a/app/code/Magento/User/etc/db_schema.xml b/app/code/Magento/User/etc/db_schema.xml
-index df9b39a2788..c3356a96b94 100644
---- a/app/code/Magento/User/etc/db_schema.xml
-+++ b/app/code/Magento/User/etc/db_schema.xml
-@@ -37,10 +37,10 @@
-         <column xsi:type="timestamp" name="first_failure" on_update="false" nullable="true" comment="First Failure"/>
-         <column xsi:type="timestamp" name="lock_expires" on_update="false" nullable="true"
-                 comment="Expiration Lock Dates"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="user_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="ADMIN_USER_USERNAME">
-+        <constraint xsi:type="unique" referenceId="ADMIN_USER_USERNAME">
-             <column name="username"/>
-         </constraint>
-     </table>
-@@ -54,12 +54,12 @@
-                 comment="Deprecated"/>
-         <column xsi:type="int" name="last_updated" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Last Updated"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="password_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="ADMIN_PASSWORDS_USER_ID_ADMIN_USER_USER_ID" table="admin_passwords"
-+        <constraint xsi:type="foreign" referenceId="ADMIN_PASSWORDS_USER_ID_ADMIN_USER_USER_ID" table="admin_passwords"
-                     column="user_id" referenceTable="admin_user" referenceColumn="user_id" onDelete="CASCADE"/>
--        <index name="ADMIN_PASSWORDS_USER_ID" indexType="btree">
-+        <index referenceId="ADMIN_PASSWORDS_USER_ID" indexType="btree">
-             <column name="user_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/User/etc/di.xml b/app/code/Magento/User/etc/di.xml
-index b92549b54da..8fc85bc19e5 100644
---- a/app/code/Magento/User/etc/di.xml
-+++ b/app/code/Magento/User/etc/di.xml
-@@ -17,4 +17,5 @@
-             </argument>
-         </arguments>
-     </type>
-+    <preference for="Magento\User\Model\Spi\NotificatorInterface" type="Magento\User\Model\Notificator" />
- </config>
-diff --git a/app/code/Magento/User/etc/email_templates.xml b/app/code/Magento/User/etc/email_templates.xml
-index b998f304c24..637c2b799f3 100644
---- a/app/code/Magento/User/etc/email_templates.xml
-+++ b/app/code/Magento/User/etc/email_templates.xml
-@@ -8,4 +8,10 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd">
-     <template id="admin_emails_forgot_email_template" label="Forgot Admin Password" file="password_reset_confirmation.html" type="text" module="Magento_User" area="adminhtml"/>
-     <template id="admin_emails_user_notification_template" label="User Notification" file="user_notification.html" type="text" module="Magento_User" area="adminhtml"/>
-+    <template id="admin_emails_new_user_notification_template"
-+              label="New User Notification"
-+              file="new_user_notification.html"
-+              type="text"
-+              module="Magento_User"
-+              area="adminhtml"/>
- </config>
-diff --git a/app/code/Magento/User/etc/module.xml b/app/code/Magento/User/etc/module.xml
-index ad4c972ae79..42be2fec021 100644
---- a/app/code/Magento/User/etc/module.xml
-+++ b/app/code/Magento/User/etc/module.xml
-@@ -9,6 +9,7 @@
-     <module name="Magento_User" >
-         <sequence>
-             <module name="Magento_Backend"/>
-+            <module name="Magento_Config"/>
-         </sequence>
-     </module>
- </config>
-diff --git a/app/code/Magento/User/view/adminhtml/email/new_user_notification.html b/app/code/Magento/User/view/adminhtml/email/new_user_notification.html
-new file mode 100644
-index 00000000000..891faf5fb8c
---- /dev/null
-+++ b/app/code/Magento/User/view/adminhtml/email/new_user_notification.html
-@@ -0,0 +1,18 @@
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<!--@subject {{trans "New admin user '%user_name' created" user_name=$user.name}} @-->
-+<!--@vars {
-+"var store.getFrontendName()|escape":"Store Name"
-+} @-->
-+
-+{{trans "Hello,"}}
-+
-+{{trans "A new admin account was created for %first_name, %last_name using %email." first_name=$user.first_name last_name=$user.last_name email=$user.email}}
-+{{trans "If you have not authorized this action, please contact us immediately at %store_email" store_email=$store_email |escape}}{{depend store_phone}} {{trans "or call us at %store_phone" store_phone=$store_phone |escape}}{{/depend}}.
-+
-+{{trans "Thanks,"}}
-+{{var store.getFrontendName()}}
-diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_locks_block.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_locks_block.xml
-index 13cfbfe8593..d195ac93c16 100644
---- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_locks_block.xml
-+++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_locks_block.xml
-@@ -12,7 +12,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.locks.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">lockedAdminsGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\User\Model\ResourceModel\User\Locked\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\User\Model\ResourceModel\User\Locked\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">user_id</argument>
-                     <argument name="use_ajax" xsi:type="string">1</argument>
-                     <argument name="grid_url" xsi:type="url" path="*/*/grid">
-diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_grid_block.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_grid_block.xml
-index a4bc9aa5ed4..db19f7b17ae 100644
---- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_grid_block.xml
-+++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_grid_block.xml
-@@ -11,11 +11,12 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.user.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">permissionsUserGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\User\Model\ResourceModel\User\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\User\Model\ResourceModel\User\Collection</argument>
-                     <argument name="use_ajax" xsi:type="string">1</argument>
-                     <argument name="default_sort" xsi:type="string">username</argument>
-                     <argument name="default_dir" xsi:type="string">asc</argument>
-                     <argument name="grid_url" xsi:type="url" path="*/*/roleGrid"/>
-+                    <argument name="save_parameters_in_session" xsi:type="boolean">true</argument>
-                 </arguments>
-                 <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="permission.user.grid.columnSet">
-                     <arguments>
-@@ -35,6 +36,7 @@
-                             <argument name="index" xsi:type="string">user_id</argument>
-                             <argument name="column_css_class" xsi:type="string">col-id</argument>
-                             <argument name="header_css_class" xsi:type="string">col-id</argument>
-+                            <argument name="filter_index" xsi:type="string">main_table.user_id</argument>
-                         </arguments>
-                     </block>
-                     <block class="Magento\Backend\Block\Widget\Grid\Column" name="permission.user.grid.columnSet.username" as="username">
-diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_editrole.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_editrole.xml
-index 5eb830cac59..45718e1ab67 100644
---- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_editrole.xml
-+++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_editrole.xml
-@@ -9,7 +9,11 @@
-     <body>
-         <referenceContainer name="left">
-             <block class="Magento\User\Block\Role\Edit" name="adminhtml.user.editroles">
--                <block class="Magento\User\Block\Role\Tab\Edit" name="adminhtml.user.tab.rolesedit"/>
-+                <block class="Magento\User\Block\Role\Tab\Edit" name="adminhtml.user.tab.rolesedit">
-+                    <arguments>
-+                        <argument name="json_serializer" xsi:type="object">Magento\User\ViewModel\JsonSerializer</argument>
-+                    </arguments>
-+                </block>
-                 <action method="addTabAfter">
-                     <argument name="name" xsi:type="string">account</argument>
-                     <argument name="block" xsi:type="string">adminhtml.user.tab.rolesedit</argument>
-diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_grid_block.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_grid_block.xml
-index 6d7ce67e235..f2d699b6cc0 100644
---- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_grid_block.xml
-+++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_grid_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.role.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">roleGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Authorization\Model\ResourceModel\Role\Grid\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Authorization\Model\ResourceModel\Role\Grid\Collection</argument>
-                     <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-                     <argument name="default_sort" xsi:type="string">role_id</argument>
-                     <argument name="default_dir" xsi:type="string">asc</argument>
-diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
-index bc37eb57a12..263bc2bcf96 100644
---- a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
-+++ b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
-@@ -3,29 +3,32 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <form method="post" action="" id="login-form" data-mage-init='{"form": {}, "validation": {}}'>
-     <fieldset class="admin__fieldset">
--        <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Password Help') ?></span></legend><br/>
--        <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
--        <p class="admin__field-info"><?= /* @escapeNotVerified */ __('Enter your email address.  You will receive an email with a link to reset your password.') ?></p>
-+        <legend class="admin__legend"><span><?= $block->escapeHtml(__('Password Help')) ?></span></legend><br/>
-+        <input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
-+        <p class="admin__field-info"><?= $block->escapeHtml(
-+            __('Enter your email address.  You will receive an email with a link to reset your password.')
-+        ) ?></p>
-         <div class="admin__field _required field-email">
--            <label for="email" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Email address') ?></span></label>
-+            <label for="email" class="admin__field-label"><span><?= $block->escapeHtml(__('Email address')) ?></span></label>
-             <div class="admin__field-control">
--                <input type="text" id="email" name="email" value="" data-validate="{required:true, 'validate-email':true}" class="admin__control-text" />
-+                <input type="text" id="email" name="email" value=""
-+                       data-validate="{required:true, 'validate-email':true}" class="admin__control-text" />
-             </div>
-         </div>
-         <?= $block->getChildHtml('form.additional.info') ?>
-         <div class="form-actions">
-             <div class="actions">
--                <button class="action-retrieve action-primary" type="submit"><span><?= /* @escapeNotVerified */ __('Retrieve Password') ?></span></button>
-+                <button class="action-retrieve action-primary" type="submit">
-+                    <span><?= $block->escapeHtml(__('Retrieve Password')) ?></span>
-+                </button>
-             </div>
-             <div class="links">
--                <a class="action-back" href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml', ['_nosecret' => true]) ?>">
--                    <?= /* @escapeNotVerified */ __('Back to Sign in') ?>
-+                <a class="action-back"
-+                   href="<?= $block->escapeUrl($block->getUrl('adminhtml', ['_nosecret' => true])) ?>">
-+                    <?= $block->escapeHtml(__('Back to Sign in')) ?>
-                 </a>
-             </div>
-         </div>
-diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml
-index 9015ccc75d5..a348a49b7e8 100644
---- a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml
-+++ b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml
-@@ -3,10 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <div class="links">
--<a class="action-forgotpassword" href="<?= /* @escapeNotVerified */ $this->helper('Magento\Backend\Helper\Data')->getUrl('adminhtml/auth/forgotpassword', ['_nosecret' => true]) ?>"><?= /* @escapeNotVerified */ __('Forgot your password?') ?></a>
-+<a class="action-forgotpassword"
-+   href="<?= $block->escapeUrl($block->getUrl('adminhtml/auth/forgotpassword', ['_nosecret' => true])) ?>">
-+    <?= $block->escapeHtml(__('Forgot your password?')) ?>
-+</a>
- </div>
-diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
-index cd5abcbc1fe..b66ceaa0c70 100644
---- a/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
-+++ b/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
-@@ -3,33 +3,40 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
--<form method="post" data-mage-init='{"form": {}, "validation": {}}' action="<?= /* @escapeNotVerified */ $block->getUrl('*/auth/resetpasswordpost', ['_query' => ['id' => $block->getUserId(), 'token' => $block->getResetPasswordLinkToken()]]) ?>" id="reset-password-form" autocomplete="off">
-+<form method="post" data-mage-init='{"form": {}, "validation": {}}'
-+      action="<?= $block->escapeUrl(
-+          $block->getUrl(
-+              '*/auth/resetpasswordpost',
-+              ['_query' => ['id' => $block->getUserId(), 'token' => $block->getResetPasswordLinkToken()]]
-+          )
-+      ) ?>" id="reset-password-form" autocomplete="off">
-     <fieldset class="admin__fieldset">
--        <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Reset a Password') ?></span></legend><br />
--        <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
-+        <legend class="admin__legend"><span><?= $block->escapeHtml(__('Reset a Password')) ?></span></legend><br />
-+        <input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
-         <div class="admin__field _required field-password">
--            <label class="admin__field-label" for="password"><span><?= /* @escapeNotVerified */ __('New Password') ?></span></label>
-+            <label class="admin__field-label" for="password"><span><?= $block->escapeHtml(__('New Password')) ?></span></label>
-             <div class="admin__field-control">
--                <input type="password" class="admin__control-text" data-validate="{required:true, 'validate-admin-password':true}" name="password" id="password" placeholder="new password" autocomplete="off" />
-+                <input type="password" class="admin__control-text"
-+                       data-validate="{required:true, 'validate-admin-password':true}" name="password" id="password"
-+                       placeholder="new password" autocomplete="off" />
-             </div>
-         </div>
-         <div class="admin__field _required field-confirmation">
--            <label class="admin__field-label" for="confirmation"><span><?= /* @escapeNotVerified */ __('Confirm New Password') ?></span></label>
-+            <label class="admin__field-label" for="confirmation"><span><?= $block->escapeHtml(__('Confirm New Password')) ?></span></label>
-             <div class="admin__field-control">
--                <input type="password" class="admin__control-text" data-validate="{required:true, 'validate-cpassword':true}" name="confirmation" id="confirmation" placeholder="confirm new password" autocomplete="off" />
-+                <input type="password" class="admin__control-text"
-+                       data-validate="{required:true, 'validate-cpassword':true}" name="confirmation" id="confirmation"
-+                       placeholder="confirm new password" autocomplete="off" />
-             </div>
-         </div>
-         <div class="form-actions">
-             <div class="actions">
--                <button type="submit" title="<?= /* @escapeNotVerified */ __('Reset Password') ?>" class="action-reset action-primary"><span><?= /* @escapeNotVerified */ __('Reset Password') ?></span></button>
-+                <button type="submit" title="<?= $block->escapeHtml(__('Reset Password')) ?>" class="action-reset action-primary"><span><?= $block->escapeHtml(__('Reset Password')) ?></span></button>
-             </div>
-             <div class="links">
--                <a class="action-back" href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml', ['_nosecret' => true]) ?>"><?= /* @escapeNotVerified */ __('Back to Sign in') ?></a>
-+                <a class="action-back" href="<?= $block->escapeUrl($block->getUrl('adminhtml', ['_nosecret' => true])) ?>"><?= $block->escapeHtml(__('Back to Sign in')) ?></a>
-             </div>
-         </div>
-     </fieldset>
-diff --git a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
-index 25d8e4331a3..edee167dc1b 100644
---- a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
-+++ b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
-@@ -4,11 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
--?>
--
--<?php
- /** @var $block \Magento\User\Block\Role\Tab\Edit */
- ?>
- 
-@@ -16,32 +11,41 @@
- 
- <fieldset class="fieldset form-inline entry-edit">
-     <legend class="legend">
--        <span><?= /* @escapeNotVerified */ __('Roles Resources') ?></span>
-+        <span><?= $block->escapeHtml(__('Roles Resources')) ?></span>
-     </legend><br />
- 
-     <div class="field">
--        <label class="label" for="all"><span><?= /* @escapeNotVerified */ __('Resource Access') ?></span></label>
-+        <label class="label" for="all"><span><?= $block->escapeHtml(__('Resource Access')) ?></span></label>
- 
-         <div class="control">
--            <select id="all" name="all" onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
--                <option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>><?= /* @escapeNotVerified */ __('Custom') ?></option>
--                <option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>><?= /* @escapeNotVerified */ __('All') ?></option>
-+            <select id="all" name="all"
-+                    onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
-+                <option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>>
-+                    <?= $block->escapeHtml(__('Custom')) ?>
-+                </option>
-+                <option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>>
-+                    <?= $block->escapeHtml(__('All')) ?>
-+                </option>
-             </select>
-         </div>
-     </div>
- 
--    <div class="field<?php if ($block->isEverythingAllowed()):?> no-display<?php endif?>" data-role="tree-resources-container">
--        <label class="label"><span><?= /* @escapeNotVerified */ __('Resources') ?></span></label>
-+    <div class="field
-+        <?php if ($block->isEverythingAllowed()) :?>
-+            no-display
-+        <?php endif ?>"
-+         data-role="tree-resources-container">
-+        <label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
- 
-         <div class="control">
--            <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?php
--            echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([
--                'rolesTree' => [
--                    "treeInitData" => $block->getTree(),
--                    "treeInitSelectedData" => $block->getSelectedResources(),
--                ],
--            ]));
--            ?>'></div>
-+            <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?= /* @noEscape */
-+                $block->getJsonSerializer()->serialize([
-+                    'rolesTree' => [
-+                        "treeInitData" => $block->getTree(),
-+                        "treeInitSelectedData" => $block->getSelectedResources(),
-+                    ],
-+                ]); ?>'>
-+            </div>
-         </div>
-     </div>
- </fieldset>
-diff --git a/app/code/Magento/User/view/adminhtml/templates/role/info.phtml b/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
-index 69f2627cd56..6cf1bb37354 100644
---- a/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
-+++ b/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- ?>
--<form action="<?= /* @escapeNotVerified */ $block->getUrl('*/*/saverole') ?>" method="post" id="role-edit-form">
-+<form action="<?= $block->escapeUrl($block->getUrl('*/*/saverole')) ?>" method="post" id="role-edit-form">
-     <?= $block->getBlockHtml('formkey') ?>
- </form>
- <script>
-diff --git a/app/code/Magento/User/view/adminhtml/templates/role/users.phtml b/app/code/Magento/User/view/adminhtml/templates/role/users.phtml
-index d30e658512f..a62570d4e8c 100644
---- a/app/code/Magento/User/view/adminhtml/templates/role/users.phtml
-+++ b/app/code/Magento/User/view/adminhtml/templates/role/users.phtml
-@@ -5,7 +5,7 @@
-  */
- ?>
- <fieldset class="fieldset">
--    <legend class="legend"><span><?= /* @escapeNotVerified */ __('Role Users') ?></span></legend>
-+    <legend class="legend"><span><?= $block->escapeHtml(__('Role Users')) ?></span></legend>
-     <br />
-     <?= $block->getGridHtml() ?>
- </fieldset>
-diff --git a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
-index 964d925a5f2..5505d34322f 100644
---- a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
-+++ b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
-@@ -3,8 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <script>
- require([
-@@ -16,8 +14,8 @@ require([
- ], function(jQuery, confirm, _){
- <!--
- <?php $myBlock = $block->getLayout()->getBlock('roleUsersGrid'); ?>
--<?php if (is_object($myBlock) && $myBlock->getJsObjectName()): ?>
--    var checkBoxes = $H(<?= /* @escapeNotVerified */ $myBlock->getUsers(true) ?>);
-+<?php if (is_object($myBlock) && $myBlock->getJsObjectName()) : ?>
-+    var checkBoxes = $H(<?= /* @noEscape */ $myBlock->getUsers(true) ?>);
-     var warning = false;
-     if (checkBoxes.size() > 0) {
-         warning = true;
-@@ -46,7 +44,7 @@ require([
- 
-                 if (checked) {
-                     confirm({
--                        content: "<?= /* @escapeNotVerified */ __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>",
-+                        content: "<?= $myBlock->escapeHtml(__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')) ?>",
-                         actions: {
-                             confirm: function () {
-                                 checkbox[0].checked = false;
-@@ -95,7 +93,7 @@ require([
-         if (!allCheckbox.checked && _.size(checkBoxes._object) > 0) {
-             allCheckbox.checked = true;
-             confirm({
--                content: "<?= /* @escapeNotVerified */ __('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') ?>",
-+                content: "<?= $myBlock->escapeHtml(__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?')) ?>",
-                 actions: {
-                     confirm: function () {
-                         allCheckbox.checked = false;
-@@ -108,25 +106,25 @@ require([
-         }
-     }
-     function markCheckboxes(value) {
--        <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.rows.each(function(row)
-+        <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.rows.each(function(row)
-         {
-             $(row).getElementsByClassName('checkbox')[0].checked = value;
--            roleUsersRowInit(<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>, row);
-+            roleUsersRowInit(<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>, row);
-         });
-     }
-     function onLoad() {
--        if (typeof <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?> !== 'undefined') {
--            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
-+        if (typeof <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?> !== 'undefined') {
-+            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
-             rowClickCallback = roleUsersRowClick;
--            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
-+            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
-             initRowCallback = roleUsersRowInit;
--            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
-+            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
-             checkboxCheckCallback = registerUserRole;
--            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
-+            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
-             checkCheckboxes = massSelectUsers;
--            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
-+            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
-             rows.each(function (row) {
--                roleUsersRowInit(<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>, row)
-+                roleUsersRowInit(<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>, row)
-             });
-             $('in_role_user_old').value = $('in_role_user').value;
-         } else {
-diff --git a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
-index 11ac72e6e38..92a97e825ea 100644
---- a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
-+++ b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <script>
- require([
-@@ -14,10 +11,10 @@ require([
- ], function(){
- 
- <?php $myBlock = $block->getLayout()->getBlock('user.roles.grid'); ?>
--<?php if (is_object($myBlock) && $myBlock->getJsObjectName()): ?>
-+<?php if (is_object($myBlock) && $myBlock->getJsObjectName()) : ?>
-     var radioBoxes = $H({});
-     var warning = false;
--    var userRoles = $H(<?= /* @escapeNotVerified */ $myBlock->getSelectedRoles(true) ?>);
-+    var userRoles = $H(<?= /* @noEscape */ $myBlock->getSelectedRoles(true) ?>);
-     if (userRoles.size() > 0) warning = true;
-     $('user_user_roles').value = userRoles.toQueryString();
- 
-@@ -40,7 +37,7 @@ require([
-             if(checkbox[0] && !checkbox[0].checked){
-                 var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
-                 if (checked && warning && radioBoxes.size() > 0) {
--                    if ( !confirm("<?= /* @escapeNotVerified */ __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
-+                    if ( !confirm("<?= $myBlock->escapeHtml(__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')) ?>") ) {
-                         checkbox[0].checked = false;
-                         for(i in radioBoxes) {
-                             if( radioBoxes[i].status == 1) {
-@@ -51,7 +48,7 @@ require([
-                     }
-                     warning = false;
-                 }
--                <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.setCheckboxChecked(checkbox[0], checked);
-+                <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.setCheckboxChecked(checkbox[0], checked);
-             }
-         }
-     }
-@@ -63,17 +60,19 @@ require([
-         }
-     }
- 
--<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.rowClickCallback = roleRowClick;
--<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.initRowCallback = rolesRowInit;
--<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.checkboxCheckCallback = registerUserRole;
--<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.rows.each(function(row){rolesRowInit(<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>, row)});
-+    <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.rowClickCallback = roleRowClick;
-+    <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.initRowCallback = rolesRowInit;
-+    <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.checkboxCheckCallback = registerUserRole;
-+    <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.rows.each(function(row){
-+        rolesRowInit(<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>, row)
-+    });
- <?php endif; ?>
- 
- });
- </script>
- 
- <?php $editBlock = $block->getLayout()->getBlock('adminhtml.user.edit'); ?>
--<?php if (is_object($editBlock)): ?>
-+<?php if (is_object($editBlock)) : ?>
-     <script type="text/x-magento-init">
-         {
-             "[data-role=delete-user]" : {
-diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
-index 1e8faf3cc96..7136a403003 100644
---- a/app/code/Magento/Usps/Model/Carrier.php
-+++ b/app/code/Magento/Usps/Model/Carrier.php
-@@ -7,6 +7,10 @@
- namespace Magento\Usps\Model;
- 
- use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Async\CallbackDeferred;
-+use Magento\Framework\Async\ProxyDeferredFactory;
-+use Magento\Framework\HTTP\AsyncClient\Request;
-+use Magento\Framework\HTTP\AsyncClientInterface;
- use Magento\Framework\Xml\Security;
- use Magento\Quote\Model\Quote\Address\RateRequest;
- use Magento\Shipping\Helper\Carrier as CarrierHelper;
-@@ -118,6 +122,8 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
- 
-     /**
-      * @var \Magento\Framework\HTTP\ZendClientFactory
-+     * @deprecated Use asynchronous client.
-+     * @see $httpClient
-      */
-     protected $_httpClientFactory;
- 
-@@ -133,6 +139,16 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-      */
-     private $dataHelper;
- 
-+    /**
-+     * @var AsyncClientInterface
-+     */
-+    private $httpClient;
-+
-+    /**
-+     * @var ProxyDeferredFactory
-+     */
-+    private $proxyDeferredFactory;
-+
-     /**
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-      * @param \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
-@@ -153,6 +169,8 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
-      * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
-      * @param array $data
-+     * @param AsyncClientInterface|null $httpClient
-+     * @param ProxyDeferredFactory|null $proxyDeferredFactory
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -175,7 +193,9 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-         CarrierHelper $carrierHelper,
-         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
-         \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory,
--        array $data = []
-+        array $data = [],
-+        ?AsyncClientInterface $httpClient = null,
-+        ?ProxyDeferredFactory $proxyDeferredFactory = null
-     ) {
-         $this->_carrierHelper = $carrierHelper;
-         $this->_productCollectionFactory = $productCollectionFactory;
-@@ -198,6 +218,9 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-             $stockRegistry,
-             $data
-         );
-+        $this->httpClient = $httpClient ?? ObjectManager::getInstance()->get(AsyncClientInterface::class);
-+        $this->proxyDeferredFactory = $proxyDeferredFactory
-+            ?? ObjectManager::getInstance()->get(ProxyDeferredFactory::class);
-     }
- 
-     /**
-@@ -213,10 +236,20 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-         }
- 
-         $this->setRequest($request);
--        $this->_result = $this->_getQuotes();
--        $this->_updateFreeMethodQuote($request);
-+        //Saving current result to use the right one in the callback.
-+        $this->_result = $result = $this->_getQuotes();
-+
-+        return $this->proxyDeferredFactory->createFor(
-+            Result::class,
-+            new CallbackDeferred(
-+                function () use ($request, $result) {
-+                    $this->_result = $result;
-+                    $this->_updateFreeMethodQuote($request);
- 
--        return $this->getResult();
-+                    return $this->getResult();
-+                }
-+            )
-+        );
-     }
- 
-     /**
-@@ -366,6 +399,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
- 
-     /**
-      * @inheritdoc
-+     *
-      * Starting from 23.02.2018 USPS doesn't allow to create free shipping labels via their API.
-      */
-     public function isShippingLabelsAvailable()
-@@ -448,7 +482,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-                 $package->addChild('FirstClassMailType', 'PARCEL');
-             }
-             $package->addChild('ZipOrigination', $r->getOrigPostal());
--            //only 5 chars avaialble
-+            //only 5 chars available
-             $package->addChild('ZipDestination', substr($r->getDestPostal(), 0, 5));
-             $package->addChild('Pounds', $r->getWeightPounds());
-             $package->addChild('Ounces', $r->getWeightOunces());
-@@ -508,26 +542,32 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-         $responseBody = $this->_getCachedQuotes($request);
-         if ($responseBody === null) {
-             $debugData = ['request' => $this->filterDebugData($request)];
--            try {
--                $url = $this->getConfigData('gateway_url');
--                if (!$url) {
--                    $url = $this->_defaultGatewayUrl;
--                }
--                $client = $this->_httpClientFactory->create();
--                $client->setUri($url);
--                $client->setConfig(['maxredirects' => 0, 'timeout' => 30]);
--                $client->setParameterGet('API', $api);
--                $client->setParameterGet('XML', $request);
--                $response = $client->request();
--                $responseBody = $response->getBody();
--
--                $debugData['result'] = $responseBody;
--                $this->_setCachedQuotes($request, $responseBody);
--            } catch (\Exception $e) {
--                $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
--                $responseBody = '';
-+            $url = $this->getConfigData('gateway_url');
-+            if (!$url) {
-+                $url = $this->_defaultGatewayUrl;
-             }
--            $this->_debug($debugData);
-+            $deferredResponse = $this->httpClient->request(
-+                new Request(
-+                    $url . '?API=' . urlencode($api) . '&XML=' . urlencode($request),
-+                    Request::METHOD_GET,
-+                    [],
-+                    null
-+                )
-+            );
-+
-+            return $this->proxyDeferredFactory->createFor(
-+                Result::class,
-+                new CallbackDeferred(
-+                    function () use ($deferredResponse, $request, $debugData) {
-+                        $responseBody = $deferredResponse->get()->getBody();
-+                        $debugData['result'] = $responseBody;
-+                        $this->_setCachedQuotes($request, $responseBody);
-+                        $this->_debug($debugData);
-+
-+                        return $this->_parseXmlResponse($responseBody);
-+                    }
-+                )
-+            );
-         }
- 
-         return $this->_parseXmlResponse($responseBody);
-@@ -547,63 +587,59 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-         $r = $this->_rawRequest;
-         $costArr = [];
-         $priceArr = [];
--        if (strlen(trim($response)) > 0) {
--            if (strpos(trim($response), '<?xml') === 0) {
--                if (strpos($response, '<?xml version="1.0"?>') !== false) {
--                    $response = str_replace(
--                        '<?xml version="1.0"?>',
--                        '<?xml version="1.0" encoding="ISO-8859-1"?>',
--                        $response
--                    );
--                }
--                $xml = $this->parseXml($response);
-+        if (strlen(trim($response)) > 0 && strpos(trim($response), '<?xml') === 0) {
-+            if (strpos($response, '<?xml version="1.0"?>') !== false) {
-+                $response = str_replace(
-+                    '<?xml version="1.0"?>',
-+                    '<?xml version="1.0" encoding="ISO-8859-1"?>',
-+                    $response
-+                );
-+            }
-+            $xml = $this->parseXml($response);
- 
--                if (is_object($xml)) {
--                    $allowedMethods = explode(',', $this->getConfigData('allowed_methods'));
--                    $serviceCodeToActualNameMap = [];
-+            if (is_object($xml) && is_object($xml->Package)) {
-+                $allowedMethods = explode(',', $this->getConfigData('allowed_methods'));
-+                $serviceCodeToActualNameMap = [];
-+                $isUS = $this->_isUSCountry($r->getDestCountryId());
-+
-+                if ($isUS && is_object($xml->Package->Postage)) {
-                     /**
-                      * US Rates
-                      */
--                    if ($this->_isUSCountry($r->getDestCountryId())) {
--                        if (is_object($xml->Package) && is_object($xml->Package->Postage)) {
--                            foreach ($xml->Package->Postage as $postage) {
--                                $serviceName = $this->_filterServiceName((string)$postage->MailService);
--                                $_serviceCode = $this->getCode('method_to_code', $serviceName);
--                                $serviceCode = $_serviceCode ? $_serviceCode : (string)$postage->attributes()->CLASSID;
--                                $serviceCodeToActualNameMap[$serviceCode] = $serviceName;
--                                if (in_array($serviceCode, $allowedMethods)) {
--                                    $costArr[$serviceCode] = (string)$postage->Rate;
--                                    $priceArr[$serviceCode] = $this->getMethodPrice(
--                                        (string)$postage->Rate,
--                                        $serviceCode
--                                    );
--                                }
--                            }
--                            asort($priceArr);
-+                    foreach ($xml->Package->Postage as $postage) {
-+                        $serviceName = $this->_filterServiceName((string)$postage->MailService);
-+                        $_serviceCode = $this->getCode('method_to_code', $serviceName);
-+                        $serviceCode = $_serviceCode ? $_serviceCode : (string)$postage->attributes()->CLASSID;
-+                        $serviceCodeToActualNameMap[$serviceCode] = $serviceName;
-+                        if (in_array($serviceCode, $allowedMethods)) {
-+                            $costArr[$serviceCode] = (string)$postage->Rate;
-+                            $priceArr[$serviceCode] = $this->getMethodPrice(
-+                                (string)$postage->Rate,
-+                                $serviceCode
-+                            );
-                         }
--                    } else {
--                        /*
--                         * International Rates
--                         */
--                        if (is_object($xml->Package) && is_object($xml->Package->Service)) {
--                            foreach ($xml->Package->Service as $service) {
--                                $serviceName = $this->_filterServiceName((string)$service->SvcDescription);
--                                $serviceCode = 'INT_' . (string)$service->attributes()->ID;
--                                $serviceCodeToActualNameMap[$serviceCode] = $serviceName;
--                                if (!$this->isServiceAvailable($service)) {
--                                    continue;
--                                }
--                                if (in_array($serviceCode, $allowedMethods)) {
--                                    $costArr[$serviceCode] = (string)$service->Postage;
--                                    $priceArr[$serviceCode] = $this->getMethodPrice(
--                                        (string)$service->Postage,
--                                        $serviceCode
--                                    );
--                                }
--                            }
--                            asort($priceArr);
-+                    }
-+                    asort($priceArr);
-+                } elseif (!$isUS && is_object($xml->Package->Service)) {
-+                    /*
-+                     * International Rates
-+                     */
-+                    foreach ($xml->Package->Service as $service) {
-+                        $serviceName = $this->_filterServiceName((string)$service->SvcDescription);
-+                        $serviceCode = 'INT_' . (string)$service->attributes()->ID;
-+                        $serviceCodeToActualNameMap[$serviceCode] = $serviceName;
-+                        if (!$this->isServiceAvailable($service)) {
-+                            continue;
-+                        }
-+                        if (in_array($serviceCode, $allowedMethods)) {
-+                            $costArr[$serviceCode] = (string)$service->Postage;
-+                            $priceArr[$serviceCode] = $this->getMethodPrice(
-+                                (string)$service->Postage,
-+                                $serviceCode
-+                            );
-                         }
-                     }
-+                    asort($priceArr);
-                 }
-             }
-         }
-@@ -1038,23 +1074,20 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-             $request = $xml->asXML();
-             $debugData = ['request' => $this->filterDebugData($request)];
- 
--            try {
--                $url = $this->getConfigData('gateway_url');
--                if (!$url) {
--                    $url = $this->_defaultGatewayUrl;
--                }
--                $client = $this->_httpClientFactory->create();
--                $client->setUri($url);
--                $client->setConfig(['maxredirects' => 0, 'timeout' => 30]);
--                $client->setParameterGet('API', $api);
--                $client->setParameterGet('XML', $request);
--                $response = $client->request();
--                $responseBody = $response->getBody();
--                $debugData['result'] = $responseBody;
--            } catch (\Exception $e) {
--                $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
--                $responseBody = '';
-+            $url = $this->getConfigData('gateway_url');
-+            if (!$url) {
-+                $url = $this->_defaultGatewayUrl;
-             }
-+            $responseDeferred = $this->httpClient->request(
-+                new Request(
-+                    $url . '?API=' . urlencode($api) . '&XML=' . urlencode($request),
-+                    Request::METHOD_GET,
-+                    [],
-+                    null
-+                )
-+            );
-+            $responseBody = $responseDeferred->get()->getBody();
-+            $debugData['result'] = $responseBody;
- 
-             $this->_debug($debugData);
-             $this->_parseXmlTrackingResponse($tracking, $responseBody);
-@@ -1167,6 +1200,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
- 
-     /**
-      * Return USPS county name by country ISO 3166-1-alpha-2 code
-+     *
-      * Return false for unknown countries
-      *
-      * @param string $countryId
-@@ -1246,7 +1280,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-             'FO' => 'Faroe Islands',
-             'FR' => 'France',
-             'GA' => 'Gabon',
--            'GB' => 'Great Britain and Northern Ireland',
-+            'GB' => 'United Kingdom of Great Britain and Northern Ireland',
-             'GD' => 'Grenada',
-             'GE' => 'Georgia, Republic of',
-             'GF' => 'French Guiana',
-@@ -1364,7 +1398,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-             'ST' => 'Sao Tome and Principe',
-             'SV' => 'El Salvador',
-             'SY' => 'Syrian Arab Republic',
--            'SZ' => 'Swaziland',
-+            'SZ' => 'Eswatini',
-             'TC' => 'Turks and Caicos Islands',
-             'TD' => 'Chad',
-             'TG' => 'Togo',
-@@ -1415,11 +1449,13 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-      */
-     protected function _filterServiceName($name)
-     {
-+        // phpcs:disable Magento2.Functions.DiscouragedFunction
-         $name = (string)preg_replace(
-             ['~<[^/!][^>]+>.*</[^>]+>~sU', '~\<!--.*--\>~isU', '~<[^>]+>~is'],
-             '',
-             html_entity_decode($name)
-         );
-+        // phpcs:enable Magento2.Functions.DiscouragedFunction
-         $name = str_replace('*', '', $name);
- 
-         return $name;
-@@ -1530,7 +1566,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-                 $serviceType = 'Library Mail';
-                 break;
-             default:
--                throw new \Exception(__('Service type does not match'));
-+                throw new \InvalidArgumentException(__('Service type does not match'));
-         }
-         $packageParams = $request->getPackageParams();
-         $packageWeight = $request->getPackageWeight();
-@@ -1926,12 +1962,15 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-                 $result->setErrors($debugData['result']['error']);
-             } else {
-                 if ($recipientUSCountry && $service == 'Priority Express') {
-+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                     $labelContent = base64_decode((string)$response->EMLabel);
-                     $trackingNumber = (string)$response->EMConfirmationNumber;
-                 } elseif ($recipientUSCountry) {
-+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                     $labelContent = base64_decode((string)$response->SignatureConfirmationLabel);
-                     $trackingNumber = (string)$response->SignatureConfirmationNumber;
-                 } else {
-+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                     $labelContent = base64_decode((string)$response->LabelImage);
-                     $trackingNumber = (string)$response->BarcodeNumber;
-                 }
-@@ -2119,6 +2158,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
-             }
-             $data = $xml->asXML();
-         } catch (\Exception $e) {
-+            return '*Failed to read XML*';
-         }
- 
-         return $data;
-diff --git a/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php
-index 57b0544182c..cc29c5cffad 100644
---- a/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php
-+++ b/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php
-@@ -144,51 +144,6 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-         $this->assertFalse($this->carrier->getCode('test_code'));
-     }
- 
--    public function testCollectRates()
--    {
--        $expectedRequest = '<?xml version="1.0" encoding="UTF-8"?><RateV4Request USERID="213MAGEN6752">'
--            . '<Revision>2</Revision><Package ID="0"><Service>ALL</Service><ZipOrigination/>'
--            . '<ZipDestination>90032</ZipDestination><Pounds>4</Pounds><Ounces>4.2512000000</Ounces>'
--            . '<Container>VARIABLE</Container><Size>REGULAR</Size><Machinable/></Package></RateV4Request>';
--        $expectedXml = new \SimpleXMLElement($expectedRequest);
--
--        $this->scope->method('isSetFlag')
--            ->willReturn(true);
--
--        $this->httpClient->expects(self::exactly(2))
--            ->method('setParameterGet')
--            ->withConsecutive(
--                ['API', 'RateV4'],
--                ['XML', self::equalTo($expectedXml->asXML())]
--            );
--
--        $this->httpResponse->method('getBody')
--            ->willReturn(file_get_contents(__DIR__ . '/_files/success_usps_response_rates.xml'));
--
--        $data = require __DIR__ . '/_files/rates_request_data.php';
--        $request = $this->objectManager->getObject(RateRequest::class, ['data' => $data[0]]);
--
--        self::assertNotEmpty($this->carrier->collectRates($request)->getAllRates());
--    }
--
--    public function testCollectRatesWithUnavailableService()
--    {
--        $expectedCount = 5;
--
--        $this->scope->expects($this->once())
--            ->method('isSetFlag')
--            ->willReturn(true);
--
--        $this->httpResponse->expects($this->once())
--            ->method('getBody')
--            ->willReturn(file_get_contents(__DIR__ . '/_files/response_rates.xml'));
--
--        $data = require __DIR__ . '/_files/rates_request_data.php';
--        $request = $this->objectManager->getObject(RateRequest::class, ['data' => $data[1]]);
--        $rates = $this->carrier->collectRates($request)->getAllRates();
--        $this->assertEquals($expectedCount, count($rates));
--    }
--
-     public function testReturnOfShipment()
-     {
-         $this->httpResponse->method('getBody')
-@@ -277,24 +232,6 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($this->error, $this->carrier->collectRates($request));
-     }
- 
--    public function testCollectRatesFail()
--    {
--        $this->scope->method('isSetFlag')
--            ->willReturn(true);
--        $this->scope->expects($this->atLeastOnce())
--            ->method('getValue')
--            ->willReturnMap(
--                [
--                    ['carriers/usps/userid' => 123],
--                    ['carriers/usps/container' => 11],
--                ]
--            );
--        $request = new RateRequest();
--        $request->setPackageWeight(1);
--
--        $this->assertNotEmpty($this->carrier->collectRates($request));
--    }
--
-     /**
-      * @param string $data
-      * @param array $maskFields
-diff --git a/app/code/Magento/Usps/Test/Unit/Model/_files/rates_request_data.php b/app/code/Magento/Usps/Test/Unit/Model/_files/rates_request_data.php
-deleted file mode 100644
-index 8fa7ab219eb..00000000000
---- a/app/code/Magento/Usps/Test/Unit/Model/_files/rates_request_data.php
-+++ /dev/null
-@@ -1,65 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--return [
--    [
--        'dest_country_id' => 'US',
--        'dest_region_id' => '12',
--        'dest_region_code' => 'CA',
--        'dest_street' => 'main st1',
--        'dest_city' => 'Los Angeles',
--        'dest_postcode' => '90032',
--        'package_value' => '5',
--        'package_value_with_discount' => '5',
--        'package_weight' => '4.2657',
--        'package_qty' => '1',
--        'package_physical_value' => '5',
--        'free_method_weight' => '5',
--        'store_id' => '1',
--        'website_id' => '1',
--        'free_shipping' => '0',
--        'limit_carrier' => 'null',
--        'base_subtotal_incl_tax' => '5',
--        'orig_country_id' => 'US',
--        'country_id' => 'US',
--        'region_id' => '12',
--        'city' => 'Culver City',
--        'postcode' => '90034',
--        'usps_userid' => '213MAGEN6752',
--        'usps_container' => 'VARIABLE',
--        'usps_size' => 'REGULAR',
--        'girth' => null,
--        'height' => null,
--        'length' => null,
--        'width' => null,
--    ], [
--        'dest_country_id' => 'CA',
--        'dest_postcode' => 'M5V 3G5',
--        'dest_country_name' => 'Canada',
--        'package_value' => '3.2568',
--        'package_value_with_discount' => '5',
--        'package_weight' => '5',
--        'package_qty' => '1',
--        'package_physical_value' => '5',
--        'free_method_weight' => '5',
--        'store_id' => '1',
--        'website_id' => '1',
--        'free_shipping' => '0',
--        'limit_carrier' => 'null',
--        'base_subtotal_incl_tax' => '5',
--        'orig_country_id' => 'US',
--        'country_id' => 'US',
--        'region_id' => '12',
--        'city' => 'Culver City',
--        'postcode' => '90034',
--        'usps_userid' => '213MAGEN6752',
--        'usps_container' => 'VARIABLE',
--        'usps_size' => 'REGULAR',
--        'girth' => null,
--        'height' => null,
--        'length' => null,
--        'width' => null,
--    ]
--];
-diff --git a/app/code/Magento/Usps/Test/Unit/Model/_files/response_rates.xml b/app/code/Magento/Usps/Test/Unit/Model/_files/response_rates.xml
-deleted file mode 100644
-index a03837c6365..00000000000
---- a/app/code/Magento/Usps/Test/Unit/Model/_files/response_rates.xml
-+++ /dev/null
-@@ -1,77 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<IntlRateV2Response>
--    <Package>
--        <Service ID="12">
--            <Pounds>3</Pounds>
--            <Ounces>0</Ounces>
--            <Postage>80.45</Postage>
--            <ExtraServices>
--                <ExtraService>
--                    <Available>True</Available>
--                </ExtraService>
--            </ExtraServices>
--            <SvcDescription>USPS GXG&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Envelopes</SvcDescription>
--        </Service>
--        <Service ID="1">
--            <Pounds>3</Pounds>
--            <Ounces>0</Ounces>
--            <Postage>54.25</Postage>
--            <ExtraServices>
--                <ExtraService>
--                    <Available>True</Available>
--                </ExtraService>
--            </ExtraServices>
--            <SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</SvcDescription>
--        </Service>
--        <Service ID="10">
--            <Pounds>3</Pounds>
--            <Ounces>0</Ounces>
--            <Postage>41.50</Postage>
--            <ExtraServices>
--                <ExtraService>
--                    <ServiceID>1</ServiceID>
--                    <Available>True</Available>
--                </ExtraService>
--            </ExtraServices>
--            <SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Flat Rate Envelope</SvcDescription>
--        </Service>
--        <Service ID="11">
--            <Pounds>3</Pounds>
--            <Ounces>0</Ounces>
--            <Postage>59.95</Postage>
--            <ExtraServices>
--                <ExtraService>
--                    <Available>True</Available>
--                </ExtraService>
--                <ExtraService>
--                    <Available>True</Available>
--                </ExtraService>
--            </ExtraServices>
--            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Large Flat Rate Box</SvcDescription>
--        </Service>
--        <Service ID="15">
--            <Pounds>3</Pounds>
--            <Ounces>0</Ounces>
--            <Postage>24.50</Postage>
--            <ExtraServices>
--                <ExtraService>
--                    <Available>False</Available>
--                </ExtraService>
--                <ExtraService>
--                    <Available>True</Available>
--                </ExtraService>
--            </ExtraServices>
--            <SvcDescription>First-Class Package International Service&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</SvcDescription>
--        </Service>
--        <Service ID="2">
--            <Pounds>3</Pounds>
--            <Ounces>0</Ounces>
--            <Postage>0.00</Postage>
--            <ExtraServices>
--                <ExtraService>
--                    <Available>False</Available>
--                </ExtraService>
--            </ExtraServices>
--        </Service>
--    </Package>
--</IntlRateV2Response>
-\ No newline at end of file
-diff --git a/app/code/Magento/Usps/Test/Unit/Model/_files/success_usps_response_rates.xml b/app/code/Magento/Usps/Test/Unit/Model/_files/success_usps_response_rates.xml
-deleted file mode 100644
-index b6759058e17..00000000000
---- a/app/code/Magento/Usps/Test/Unit/Model/_files/success_usps_response_rates.xml
-+++ /dev/null
-@@ -1,153 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
---->
--<RateV4Response>
--   <Package ID="0">
--      <ZipOrigination>90034</ZipOrigination>
--      <ZipDestination>90032</ZipDestination>
--      <Pounds>5</Pounds>
--      <Ounces>0</Ounces>
--      <Size>REGULAR</Size>
--      <Machinable>TRUE</Machinable>
--      <Zone>1</Zone>
--      <Postage CLASSID="3">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</MailService>
--         <Rate>24.85</Rate>
--      </Postage>
--      <Postage CLASSID="2">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Hold For Pickup</MailService>
--         <Rate>24.85</Rate>
--      </Postage>
--      <Postage CLASSID="23">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Sunday/Holiday Delivery</MailService>
--         <Rate>37.35</Rate>
--      </Postage>
--      <Postage CLASSID="55">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Flat Rate Boxes</MailService>
--         <Rate>39.95</Rate>
--      </Postage>
--      <Postage CLASSID="56">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Flat Rate Boxes Hold For Pickup</MailService>
--         <Rate>39.95</Rate>
--      </Postage>
--      <Postage CLASSID="57">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Sunday/Holiday Delivery Flat Rate Boxes</MailService>
--         <Rate>52.45</Rate>
--      </Postage>
--      <Postage CLASSID="13">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Flat Rate Envelope</MailService>
--         <Rate>19.95</Rate>
--      </Postage>
--      <Postage CLASSID="27">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Flat Rate Envelope Hold For Pickup</MailService>
--         <Rate>19.95</Rate>
--      </Postage>
--      <Postage CLASSID="25">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Sunday/Holiday Delivery Flat Rate Envelope</MailService>
--         <Rate>32.45</Rate>
--      </Postage>
--      <Postage CLASSID="30">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Legal Flat Rate Envelope</MailService>
--         <Rate>19.95</Rate>
--      </Postage>
--      <Postage CLASSID="31">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Legal Flat Rate Envelope Hold For Pickup</MailService>
--         <Rate>19.95</Rate>
--      </Postage>
--      <Postage CLASSID="32">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Sunday/Holiday Delivery Legal Flat Rate Envelope</MailService>
--         <Rate>32.45</Rate>
--      </Postage>
--      <Postage CLASSID="62">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Padded Flat Rate Envelope</MailService>
--         <Rate>19.95</Rate>
--      </Postage>
--      <Postage CLASSID="63">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Padded Flat Rate Envelope Hold For Pickup</MailService>
--         <Rate>19.95</Rate>
--      </Postage>
--      <Postage CLASSID="64">
--         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Sunday/Holiday Delivery Padded Flat Rate Envelope</MailService>
--         <Rate>32.45</Rate>
--      </Postage>
--      <Postage CLASSID="1">
--         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</MailService>
--         <Rate>8.85</Rate>
--      </Postage>
--      <Postage CLASSID="22">
--         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Large Flat Rate Box</MailService>
--         <Rate>16.85</Rate>
--      </Postage>
--      <Postage CLASSID="17">
--         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Medium Flat Rate Box</MailService>
--         <Rate>12.35</Rate>
--      </Postage>
--      <Postage CLASSID="28">
--         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Small Flat Rate Box</MailService>
--         <Rate>5.80</Rate>
--      </Postage>
--      <Postage CLASSID="16">
--         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Flat Rate Envelope</MailService>
--         <Rate>5.60</Rate>
--      </Postage>
--      <Postage CLASSID="44">
--         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Legal Flat Rate Envelope</MailService>
--         <Rate>5.75</Rate>
--      </Postage>
--      <Postage CLASSID="29">
--         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Padded Flat Rate Envelope</MailService>
--         <Rate>5.95</Rate>
--      </Postage>
--      <Postage CLASSID="38">
--         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Gift Card Flat Rate Envelope</MailService>
--         <Rate>5.60</Rate>
--      </Postage>
--      <Postage CLASSID="42">
--         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Small Flat Rate Envelope</MailService>
--         <Rate>5.60</Rate>
--      </Postage>
--      <Postage CLASSID="40">
--         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
--         Window Flat Rate Envelope</MailService>
--         <Rate>5.60</Rate>
--      </Postage>
--      <Postage CLASSID="4">
--         <MailService>Retail Ground&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt;</MailService>
--         <Rate>8.85</Rate>
--      </Postage>
--      <Postage CLASSID="6">
--         <MailService>Media Mail&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt;</MailService>
--         <Rate>4.33</Rate>
--      </Postage>
--      <Postage CLASSID="7">
--         <MailService>Library Mail</MailService>
--         <Rate>4.12</Rate>
--      </Postage>
--   </Package>
--</RateV4Response>
-diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php
-index f70cb31eb54..71cb76a67d1 100644
---- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php
-+++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php
-@@ -6,12 +6,14 @@
-  */
- namespace Magento\Variable\Controller\Adminhtml\System\Variable;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
- /**
-  * Display Variables list page
-  * @api
-  * @since 100.0.2
-  */
--class Index extends \Magento\Variable\Controller\Adminhtml\System\Variable
-+class Index extends \Magento\Variable\Controller\Adminhtml\System\Variable implements HttpGetActionInterface
- {
-     /**
-      * Index Action
-diff --git a/app/code/Magento/Variable/Model/Source/Variables.php b/app/code/Magento/Variable/Model/Source/Variables.php
-index 38c2f92d255..e878a3172be 100644
---- a/app/code/Magento/Variable/Model/Source/Variables.php
-+++ b/app/code/Magento/Variable/Model/Source/Variables.php
-@@ -23,6 +23,16 @@ class Variables implements \Magento\Framework\Option\ArrayInterface
-      */
-     private $configVariables = [];
- 
-+    /**
-+     * @var array
-+     */
-+    private $configPaths = [];
-+
-+    /**
-+     * @var \Magento\Config\Model\Config\Structure\SearchInterface
-+     */
-+    private $configStructure;
-+
-     /**
-      * Constructor.
-      *
-@@ -33,25 +43,8 @@ class Variables implements \Magento\Framework\Option\ArrayInterface
-         \Magento\Config\Model\Config\Structure\SearchInterface $configStructure,
-         array $configPaths = []
-     ) {
--        foreach ($configPaths as $groupPath => $groupElements) {
--            $groupPathElements = explode('/', $groupPath);
--            $path = [];
--            $labels = [];
--            foreach ($groupPathElements as $groupPathElement) {
--                $path[] = $groupPathElement;
--                $labels[] = __(
--                    $configStructure->getElementByConfigPath(implode('/', $path))->getLabel()
--                );
--            }
--            $this->configVariables[$groupPath]['label'] = implode(' / ', $labels);
--            foreach (array_keys($groupElements) as $elementPath) {
--                $this->configVariables[$groupPath]['elements'][] = [
--                    'value' => $elementPath,
--                    'label' => __($configStructure->getElementByConfigPath($elementPath)->getLabel()),
--                ];
--            }
--        }
--        $this->configVariables;
-+        $this->configStructure = $configStructure;
-+        $this->configPaths = $configPaths;
-     }
- 
-     /**
-@@ -64,7 +57,7 @@ class Variables implements \Magento\Framework\Option\ArrayInterface
-     {
-         $optionArray = [];
-         if ($withGroup) {
--            foreach ($this->configVariables as $configVariableGroup) {
-+            foreach ($this->getConfigVariables() as $configVariableGroup) {
-                 $group = [
-                     'label' => $configVariableGroup['label']
-                 ];
-@@ -79,7 +72,7 @@ class Variables implements \Magento\Framework\Option\ArrayInterface
-                 $optionArray[] = $group;
-             }
-         } else {
--            foreach ($this->configVariables as $configVariableGroup) {
-+            foreach ($this->getConfigVariables() as $configVariableGroup) {
-                 foreach ($configVariableGroup['elements'] as $element) {
-                     $optionArray[] = [
-                         'value' => '{{config path="' . $element['value'] . '"}}',
-@@ -110,7 +103,7 @@ class Variables implements \Magento\Framework\Option\ArrayInterface
-     private function getFlatConfigVars()
-     {
-         $result = [];
--        foreach ($this->configVariables as $configVariableGroup) {
-+        foreach ($this->getConfigVariables() as $configVariableGroup) {
-             foreach ($configVariableGroup['elements'] as $element) {
-                 $element['group_label'] = $configVariableGroup['label'];
-                 $result[] = $element;
-@@ -118,4 +111,35 @@ class Variables implements \Magento\Framework\Option\ArrayInterface
-         }
-         return $result;
-     }
-+
-+    /**
-+     * Merge config with user defined data
-+     *
-+     * @return array
-+     */
-+    private function getConfigVariables()
-+    {
-+        if (empty($this->configVariables)) {
-+            foreach ($this->configPaths as $groupPath => $groupElements) {
-+                $groupPathElements = explode('/', $groupPath);
-+                $path = [];
-+                $labels = [];
-+                foreach ($groupPathElements as $groupPathElement) {
-+                    $path[] = $groupPathElement;
-+                    $labels[] = __(
-+                        $this->configStructure->getElementByConfigPath(implode('/', $path))->getLabel()
-+                    );
-+                }
-+                $this->configVariables[$groupPath]['label'] = implode(' / ', $labels);
-+                foreach (array_keys($groupElements) as $elementPath) {
-+                    $this->configVariables[$groupPath]['elements'][] = [
-+                        'value' => $elementPath,
-+                        'label' => __($this->configStructure->getElementByConfigPath($elementPath)->getLabel()),
-+                    ];
-+                }
-+            }
-+        }
-+
-+        return $this->configVariables;
-+    }
- }
-diff --git a/app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml b/app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml
-index 0df617c876d..610676b3504 100644
---- a/app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml
-+++ b/app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml
-@@ -7,7 +7,7 @@
-         -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
- <actionGroup name="CreateCustomVariableActionGroup">
-     <amOnPage url="admin/admin/system_variable/new/" stepKey="goToNewCustomVarialePage" />
-     <waitForPageLoad stepKey="waitForPageLoad" />
-diff --git a/app/code/Magento/Variable/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Variable/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..e0942397674
---- /dev/null
-+++ b/app/code/Magento/Variable/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+        <!--
-+         /**
-+          * Copyright © Magento, Inc. All rights reserved.
-+          * See COPYING.txt for license details.
-+          */
-+        -->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+<entity name="AdminMenuSystemOtherSettingsCustomVariables">
-+    <data key="pageTitle">Custom Variables</data>
-+    <data key="title">Custom Variables</data>
-+    <data key="dataUiId">magento-variable-system-variable</data>
-+</entity>
-+</entities>
-diff --git a/app/code/Magento/Variable/Test/Mftf/Data/VariableData.xml b/app/code/Magento/Variable/Test/Mftf/Data/VariableData.xml
-index 9038030b30c..7b7fd768f0a 100644
---- a/app/code/Magento/Variable/Test/Mftf/Data/VariableData.xml
-+++ b/app/code/Magento/Variable/Test/Mftf/Data/VariableData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="_defaultVariable" type="cms_page">
-         <data key="city"> Austin </data>
-     </entity>
-diff --git a/app/code/Magento/Variable/Test/Mftf/Test/AdminSystemCustomVariablesNavigateMenuTest.xml b/app/code/Magento/Variable/Test/Mftf/Test/AdminSystemCustomVariablesNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..74446cf6013
---- /dev/null
-+++ b/app/code/Magento/Variable/Test/Mftf/Test/AdminSystemCustomVariablesNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminSystemCustomVariablesNavigateMenuTest">
-+        <annotations>
-+            <features value="Variable"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin system custom variables navigate menu test"/>
-+            <description value="Admin should be able to navigate to System > Custom Variables"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14126"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemCustomVariablesPage">
-+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuSystemOtherSettingsCustomVariables.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuSystemOtherSettingsCustomVariables.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Variable/composer.json b/app/code/Magento/Variable/composer.json
-index 017fd312bbd..bacbf15729d 100644
---- a/app/code/Magento/Variable/composer.json
-+++ b/app/code/Magento/Variable/composer.json
-@@ -9,7 +9,8 @@
-         "magento/framework": "*",
-         "magento/module-backend": "*",
-         "magento/module-store": "*",
--        "magento/module-config": "*"
-+        "magento/module-config": "*",
-+        "magento/module-ui": "*"
-     },
-     "type": "magento2-module",
-     "license": [
-diff --git a/app/code/Magento/Variable/etc/db_schema.xml b/app/code/Magento/Variable/etc/db_schema.xml
-index d89bdb7e710..239e3b49983 100644
---- a/app/code/Magento/Variable/etc/db_schema.xml
-+++ b/app/code/Magento/Variable/etc/db_schema.xml
-@@ -12,10 +12,10 @@
-                 comment="Variable Id"/>
-         <column xsi:type="varchar" name="code" nullable="true" length="255" comment="Variable Code"/>
-         <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Variable Name"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="variable_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="VARIABLE_CODE">
-+        <constraint xsi:type="unique" referenceId="VARIABLE_CODE">
-             <column name="code"/>
-         </constraint>
-     </table>
-@@ -28,18 +28,18 @@
-                 default="0" comment="Store Id"/>
-         <column xsi:type="text" name="plain_value" nullable="true" comment="Plain Text Value"/>
-         <column xsi:type="text" name="html_value" nullable="true" comment="Html Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="unique" name="VARIABLE_VALUE_VARIABLE_ID_STORE_ID">
-+        <constraint xsi:type="unique" referenceId="VARIABLE_VALUE_VARIABLE_ID_STORE_ID">
-             <column name="variable_id"/>
-             <column name="store_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="VARIABLE_VALUE_STORE_ID_STORE_STORE_ID" table="variable_value"
-+        <constraint xsi:type="foreign" referenceId="VARIABLE_VALUE_STORE_ID_STORE_STORE_ID" table="variable_value"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="VARIABLE_VALUE_VARIABLE_ID_VARIABLE_VARIABLE_ID" table="variable_value"
-+        <constraint xsi:type="foreign" referenceId="VARIABLE_VALUE_VARIABLE_ID_VARIABLE_VARIABLE_ID" table="variable_value"
-                     column="variable_id" referenceTable="variable" referenceColumn="variable_id" onDelete="CASCADE"/>
--        <index name="VARIABLE_VALUE_STORE_ID" indexType="btree">
-+        <index referenceId="VARIABLE_VALUE_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Variable/etc/di.xml b/app/code/Magento/Variable/etc/di.xml
-index f0a24e89ef8..41759e1f158 100644
---- a/app/code/Magento/Variable/etc/di.xml
-+++ b/app/code/Magento/Variable/etc/di.xml
-@@ -42,6 +42,7 @@
-                     <item name="general/store_information/merchant_vat_number" xsi:type="string">1</item>
-                 </item>
-             </argument>
-+            <argument name="configStructure" xsi:type="object">Magento\Config\Model\Config\Structure\Proxy</argument>
-         </arguments>
-     </type>
--</config>
-\ No newline at end of file
-+</config>
-diff --git a/app/code/Magento/Variable/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml b/app/code/Magento/Variable/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml
-index d934e46117f..edee7fcca82 100644
---- a/app/code/Magento/Variable/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml
-+++ b/app/code/Magento/Variable/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml
-@@ -11,7 +11,7 @@
-             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.variable.grid" as="grid">
-                 <arguments>
-                     <argument name="id" xsi:type="string">customVariablesGrid</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Variable\Model\ResourceModel\Variable\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Variable\Model\ResourceModel\Variable\Collection</argument>
-                     <argument name="default_sort" xsi:type="string">variable_id</argument>
-                     <argument name="default_dir" xsi:type="string">ASC</argument>
-                 </arguments>
-diff --git a/app/code/Magento/Variable/view/adminhtml/web/variables.js b/app/code/Magento/Variable/view/adminhtml/web/variables.js
-index 47f027f2710..bf8bfbc570c 100644
---- a/app/code/Magento/Variable/view/adminhtml/web/variables.js
-+++ b/app/code/Magento/Variable/view/adminhtml/web/variables.js
-@@ -16,7 +16,8 @@ define([
-     'Magento_Variable/js/custom-directive-generator',
-     'Magento_Ui/js/lib/spinner',
-     'jquery/ui',
--    'prototype'
-+    'prototype',
-+    'mage/adminhtml/tools'
- ], function (jQuery, notification, $t, wysiwyg, registry, mageApply, utils, configGenerator, customGenerator, loader) {
-     'use strict';
- 
-diff --git a/app/code/Magento/Vault/Api/PaymentTokenManagementInterface.php b/app/code/Magento/Vault/Api/PaymentTokenManagementInterface.php
-index 045ba3efac1..ef654ffa11f 100644
---- a/app/code/Magento/Vault/Api/PaymentTokenManagementInterface.php
-+++ b/app/code/Magento/Vault/Api/PaymentTokenManagementInterface.php
-@@ -20,7 +20,7 @@ interface PaymentTokenManagementInterface
-      * Lists payment tokens that match specified search criteria.
-      *
-      * @param int $customerId Customer ID.
--     * @return \Magento\Vault\Api\Data\PaymentTokenSearchResultsInterface Payment token search result interface.
-+     * @return \Magento\Vault\Api\Data\PaymentTokenSearchResultsInterface[] Payment token search result interface.
-      * @since 100.1.0
-      */
-     public function getListByCustomerId($customerId);
-@@ -56,6 +56,8 @@ interface PaymentTokenManagementInterface
-     public function getByPublicHash($hash, $customerId);
- 
-     /**
-+     * Save token with payment link
-+     *
-      * @param PaymentTokenInterface $token
-      * @param OrderPaymentInterface $payment
-      * @return bool
-diff --git a/app/code/Magento/Vault/Model/PaymentTokenRepository.php b/app/code/Magento/Vault/Model/PaymentTokenRepository.php
-index 8539d351582..2ccd6181b9b 100644
---- a/app/code/Magento/Vault/Model/PaymentTokenRepository.php
-+++ b/app/code/Magento/Vault/Model/PaymentTokenRepository.php
-@@ -58,13 +58,15 @@ class PaymentTokenRepository implements PaymentTokenRepositoryInterface
-     private $collectionProcessor;
- 
-     /**
--     * @param \Magento\Vault\Model\ResourceModel\PaymentToken $resourceModel
-+     * PaymentTokenRepository constructor.
-+     *
-+     * @param PaymentTokenResourceModel $resourceModel
-      * @param PaymentTokenFactory $paymentTokenFactory
-      * @param FilterBuilder $filterBuilder
-      * @param SearchCriteriaBuilder $searchCriteriaBuilder
-      * @param PaymentTokenSearchResultsInterfaceFactory $searchResultsFactory
-      * @param CollectionFactory $collectionFactory
--     * @param CollectionProcessorInterface | null $collectionProcessor
-+     * @param CollectionProcessorInterface|null $collectionProcessor
-      */
-     public function __construct(
-         PaymentTokenResourceModel $resourceModel,
-@@ -99,7 +101,7 @@ class PaymentTokenRepository implements PaymentTokenRepositoryInterface
-         $searchResults = $this->searchResultsFactory->create();
-         $searchResults->setSearchCriteria($searchCriteria);
-         $searchResults->setItems($collection->getItems());
--
-+        $searchResults->setTotalCount($collection->getSize());
-         return $searchResults;
-     }
- 
-@@ -140,7 +142,7 @@ class PaymentTokenRepository implements PaymentTokenRepositoryInterface
-     /**
-      * Performs persist operations for a specified payment token.
-      *
--     * @param \Magento\Vault\Api\Data\PaymentTokenInterface $entity The payment token.
-+     * @param \Magento\Vault\Api\Data\PaymentTokenInterface $paymentToken The payment token.
-      * @return \Magento\Vault\Api\Data\PaymentTokenInterface Saved payment token data.
-      */
-     public function save(Data\PaymentTokenInterface $paymentToken)
-diff --git a/app/code/Magento/Vault/Observer/AfterPaymentSaveObserver.php b/app/code/Magento/Vault/Observer/AfterPaymentSaveObserver.php
-index 49d34091b13..14b7cc6c726 100644
---- a/app/code/Magento/Vault/Observer/AfterPaymentSaveObserver.php
-+++ b/app/code/Magento/Vault/Observer/AfterPaymentSaveObserver.php
-@@ -77,11 +77,9 @@ class AfterPaymentSaveObserver implements ObserverInterface
-         $paymentToken->setPaymentMethodCode($payment->getMethod());
- 
-         $additionalInformation = $payment->getAdditionalInformation();
--        if (isset($additionalInformation[VaultConfigProvider::IS_ACTIVE_CODE])) {
--            $paymentToken->setIsVisible(
--                (bool) (int) $additionalInformation[VaultConfigProvider::IS_ACTIVE_CODE]
--            );
--        }
-+        $paymentToken->setIsVisible(
-+            (bool) (int) ($additionalInformation[VaultConfigProvider::IS_ACTIVE_CODE] ?? 0)
-+        );
- 
-         $paymentToken->setPublicHash($this->generatePublicHash($paymentToken));
- 
-@@ -115,7 +113,7 @@ class AfterPaymentSaveObserver implements ObserverInterface
-     /**
-      * Reads Payment token from Order Payment
-      *
--     * @param OrderPaymentExtensionInterface | null $extensionAttributes
-+     * @param OrderPaymentExtensionInterface|null $extensionAttributes
-      * @return PaymentTokenInterface | null
-      */
-     protected function getPaymentToken(OrderPaymentExtensionInterface $extensionAttributes = null)
-diff --git a/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php b/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php
-index 09c17d1e58d..2ae16e18603 100644
---- a/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php
-+++ b/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Vault\Test\Unit\Observer;
- 
- use Magento\Framework\App\DeploymentConfig;
-@@ -15,9 +16,13 @@ use Magento\Sales\Model\Order;
- use Magento\Sales\Model\Order\Payment;
- use Magento\Vault\Model\PaymentToken;
- use Magento\Vault\Model\PaymentTokenManagement;
-+use Magento\Vault\Model\Ui\VaultConfigProvider;
- use Magento\Vault\Observer\AfterPaymentSaveObserver;
- use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
-+/**
-+ * Tests for AfterPaymentSaveObserver.
-+ */
- class AfterPaymentSaveObserverTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -93,7 +98,7 @@ class AfterPaymentSaveObserverTest extends \PHPUnit\Framework\TestCase
- 
-         // Sales Order Payment Model
-         $this->salesOrderPaymentMock = $this->getMockBuilder(Payment::class)
--            ->setMethods(null)
-+            ->setMethods(['getAdditionalInformation'])
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->salesOrderPaymentMock->setOrder($this->salesOrderMock);
-@@ -122,9 +127,10 @@ class AfterPaymentSaveObserverTest extends \PHPUnit\Framework\TestCase
-      * @param string $token
-      * @param bool $isActive
-      * @param string $method
-+     * @param array $additionalInfo
-      * @dataProvider positiveCaseDataProvider
-      */
--    public function testPositiveCase($customerId, $createdAt, $token, $isActive, $method)
-+    public function testPositiveCase($customerId, $createdAt, $token, $isActive, $method, $additionalInfo)
-     {
-         $this->paymentTokenMock->setGatewayToken($token);
-         $this->paymentTokenMock->setCustomerId($customerId);
-@@ -136,6 +142,8 @@ class AfterPaymentSaveObserverTest extends \PHPUnit\Framework\TestCase
-             ->method('getVaultPaymentToken')
-             ->willReturn($this->paymentTokenMock);
- 
-+        $this->salesOrderPaymentMock->method('getAdditionalInformation')->willReturn($additionalInfo);
-+
-         if (!empty($token)) {
-             $this->paymentTokenManagementMock->expects($this->once())
-                 ->method('saveTokenWithPaymentLink')
-@@ -158,6 +166,10 @@ class AfterPaymentSaveObserverTest extends \PHPUnit\Framework\TestCase
-         static::assertEquals($token, $paymentToken->getGatewayToken());
-         static::assertEquals($isActive, $paymentToken->getIsActive());
-         static::assertEquals($createdAt, $paymentToken->getCreatedAt());
-+        static::assertEquals(
-+            $additionalInfo[VaultConfigProvider::IS_ACTIVE_CODE] ?? false,
-+            $paymentToken->getIsVisible()
-+        );
-     }
- 
-     /**
-@@ -171,14 +183,32 @@ class AfterPaymentSaveObserverTest extends \PHPUnit\Framework\TestCase
-                 '10\20\2015',
-                 'asdfg',
-                 true,
--                'paypal'
-+                'paypal',
-+                [],
-+            ],
-+            [
-+                1,
-+                '10\20\2015',
-+                'asdfg',
-+                true,
-+                'paypal',
-+                [VaultConfigProvider::IS_ACTIVE_CODE => true],
-+            ],
-+            [
-+                1,
-+                '10\20\2015',
-+                'asdfg',
-+                true,
-+                'paypal',
-+                [VaultConfigProvider::IS_ACTIVE_CODE => false],
-             ],
-             [
-                 null,
-                 null,
-                 null,
-                 false,
--                null
-+                null,
-+                [],
-             ],
-         ];
-     }
-diff --git a/app/code/Magento/Vault/etc/db_schema.xml b/app/code/Magento/Vault/etc/db_schema.xml
-index ed1f2adba21..8a7c8dc4aa9 100644
---- a/app/code/Magento/Vault/etc/db_schema.xml
-+++ b/app/code/Magento/Vault/etc/db_schema.xml
-@@ -9,7 +9,7 @@
-         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-     <table name="vault_payment_token" resource="default" engine="innodb" comment="Vault tokens of payment">
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
--                comment="Entity Id"/>
-+                comment="Entity ID"/>
-         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
-                 comment="Customer Id"/>
-         <column xsi:type="varchar" name="public_hash" nullable="false" length="128"
-@@ -24,18 +24,18 @@
-         <column xsi:type="text" name="details" nullable="true" comment="Details"/>
-         <column xsi:type="boolean" name="is_active" nullable="false" default="true"/>
-         <column xsi:type="boolean" name="is_visible" nullable="false" default="true"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="VAULT_PAYMENT_TOKEN_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="VAULT_PAYMENT_TOKEN_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
-                     table="vault_payment_token" column="customer_id" referenceTable="customer_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="VAULT_PAYMENT_TOKEN_PAYMENT_METHOD_CODE_CSTR_ID_GATEWAY_TOKEN">
-+        <constraint xsi:type="unique" referenceId="VAULT_PAYMENT_TOKEN_PAYMENT_METHOD_CODE_CSTR_ID_GATEWAY_TOKEN">
-             <column name="payment_method_code"/>
-             <column name="customer_id"/>
-             <column name="gateway_token"/>
-         </constraint>
--        <constraint xsi:type="unique" name="VAULT_PAYMENT_TOKEN_PUBLIC_HASH">
-+        <constraint xsi:type="unique" referenceId="VAULT_PAYMENT_TOKEN_PUBLIC_HASH">
-             <column name="public_hash"/>
-         </constraint>
-     </table>
-@@ -45,14 +45,14 @@
-                 comment="Order payment Id"/>
-         <column xsi:type="int" name="payment_token_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 comment="Payment token Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="order_payment_id"/>
-             <column name="payment_token_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="FK_CF37B9D854256534BE23C818F6291CA2"
-+        <constraint xsi:type="foreign" referenceId="FK_CF37B9D854256534BE23C818F6291CA2"
-                     table="vault_payment_token_order_payment_link" column="order_payment_id"
-                     referenceTable="sales_order_payment" referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="FK_4ED894655446D385894580BECA993862"
-+        <constraint xsi:type="foreign" referenceId="FK_4ED894655446D385894580BECA993862"
-                     table="vault_payment_token_order_payment_link" column="payment_token_id"
-                     referenceTable="vault_payment_token" referenceColumn="entity_id" onDelete="CASCADE"/>
-     </table>
-diff --git a/app/code/Magento/Vault/view/adminhtml/templates/form/vault.phtml b/app/code/Magento/Vault/view/adminhtml/templates/form/vault.phtml
-index ddaf678c576..fb0666cde97 100644
---- a/app/code/Magento/Vault/view/adminhtml/templates/form/vault.phtml
-+++ b/app/code/Magento/Vault/view/adminhtml/templates/form/vault.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var Magento\Vault\Block\Form $block */
- $code = $block->escapeHtml($block->getMethodCode());
- ?>
-diff --git a/app/code/Magento/Vault/view/frontend/layout/customer_account.xml b/app/code/Magento/Vault/view/frontend/layout/customer_account.xml
-index 071bf39ca32..73ce9247fef 100644
---- a/app/code/Magento/Vault/view/frontend/layout/customer_account.xml
-+++ b/app/code/Magento/Vault/view/frontend/layout/customer_account.xml
-@@ -5,10 +5,14 @@
-  * See COPYING.txt for license details.
-  */
- -->
--<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
-         <referenceBlock name="customer_account_navigation">
--            <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-my-credit-cards-link">
-+            <block class="Magento\Customer\Block\Account\SortLinkInterface"
-+                   name="customer-account-navigation-my-credit-cards-link"
-+                   ifconfig="payment/braintree/active"
-+            >
-                 <arguments>
-                     <argument name="path" xsi:type="string">vault/cards/listaction</argument>
-                     <argument name="label" xsi:type="string" translate="true">Stored Payment Methods</argument>
-diff --git a/app/code/Magento/Vault/view/frontend/templates/cards_list.phtml b/app/code/Magento/Vault/view/frontend/templates/cards_list.phtml
-index 9fd9e304523..275a7b447d3 100644
---- a/app/code/Magento/Vault/view/frontend/templates/cards_list.phtml
-+++ b/app/code/Magento/Vault/view/frontend/templates/cards_list.phtml
-@@ -4,19 +4,18 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /** @var \Magento\Vault\Block\Customer\CreditCards $block */
- $tokens = $block->getPaymentTokens();
- ?>
--<?php if (count($tokens) !== 0): ?>
-+<?php if (count($tokens) !== 0) : ?>
-     <div class="table-wrapper my-credit-cards">
-         <table class="data table table-credit-cards" id="my-orders-table">
--            <caption class="table-caption"><?= /* @noEscape */ __('Stored Payment Methods') ?></caption>
-+            <caption class="table-caption"><?= $block->escapeHtml(__('Stored Payment Methods')) ?></caption>
-             <thead>
-             <tr>
--                <th scope="col" class="col card-number"><?= /* @noEscape */ __('Card Number') ?></th>
--                <th scope="col" class="col expire"><?= /* @noEscape */ __('Expiration Date') ?></th>
--                <th scope="col" class="col card-type"><?= /* @noEscape */ __('Type') ?></th>
-+                <th scope="col" class="col card-number"><?= $block->escapeHtml(__('Card Number')) ?></th>
-+                <th scope="col" class="col expire"><?= $block->escapeHtml(__('Expiration Date')) ?></th>
-+                <th scope="col" class="col card-type"><?= $block->escapeHtml(__('Type')) ?></th>
-                 <th scope="col" class="col actions">&nbsp;</th>
-             </tr>
-             </thead>
-@@ -30,6 +29,6 @@ $tokens = $block->getPaymentTokens();
-         </table>
-     </div>
- 
--<?php elseif (!$block->isExistsCustomerTokens()): ?>
--    <div class="message info empty"><span><?= /* @noEscape */ __('You have no stored payment methods.') ?></span></div>
-+<?php elseif (!$block->isExistsCustomerTokens()) : ?>
-+    <div class="message info empty"><span><?= $block->escapeHtml(__('You have no stored payment methods.')) ?></span></div>
- <?php endif ?>
-diff --git a/app/code/Magento/Vault/view/frontend/templates/token_list.phtml b/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
-index 17d648ebaf2..84345d82867 100644
---- a/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
-+++ b/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
-@@ -4,11 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
- /** @var \Magento\Vault\Block\Customer\AccountTokens $block */
- $tokens = $block->getPaymentTokens();
- ?>
--<?php if (count($tokens) !== 0): ?>
-+<?php if (count($tokens) !== 0) : ?>
-     <div class="table-wrapper my-credit-cards">
-         <table class="data table table-credit-cards" id="token-list-table">
-             <thead>
-@@ -18,7 +17,7 @@ $tokens = $block->getPaymentTokens();
-             </tr>
-             </thead>
-             <tbody>
--            <?php foreach($tokens as $token): ?>
-+            <?php foreach ($tokens as $token) : ?>
-                 <?= /* @noEscape */ $block->renderTokenHtml($token) ?>
-             <?php endforeach; ?>
-             </tbody>
-diff --git a/app/code/Magento/Vault/view/frontend/web/template/payment/form.html b/app/code/Magento/Vault/view/frontend/web/template/payment/form.html
-index 0ef330cd301..5f32281686a 100644
---- a/app/code/Magento/Vault/view/frontend/web/template/payment/form.html
-+++ b/app/code/Magento/Vault/view/frontend/web/template/payment/form.html
-@@ -19,7 +19,8 @@
-             <img data-bind="attr: {
-             'src': getIcons(getCardType()).url,
-             'width': getIcons(getCardType()).width,
--            'height': getIcons(getCardType()).height
-+            'height': getIcons(getCardType()).height,
-+            'alt': getIcons(getCardType()).title
-             }" class="payment-icon">
-             <span translate="'ending'"></span>
-             <span text="getMaskedCard()"></span>
-@@ -32,6 +33,11 @@
- 
-     <div class="payment-method-content">
-         <each args="getRegion('messages')" render=""></each>
-+        <div class="payment-method-billing-address">
-+            <each args="data: $parent.getRegion(getBillingAddressFormName()), as: '$item'">
-+                <render args="$item.getTemplate()"/>
-+            </each>
-+        </div>
-         <div class="checkout-agreements-block">
-             <!-- ko foreach: $parent.getRegion('before-place-order') -->
-             <!-- ko template: getTemplate() --><!-- /ko -->
-diff --git a/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php b/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php
-new file mode 100644
-index 00000000000..8dc42cebe8d
---- /dev/null
-+++ b/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\VaultGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+use Magento\Vault\Api\PaymentTokenManagementInterface;
-+use Magento\Vault\Api\PaymentTokenRepositoryInterface;
-+
-+/**
-+ * Delete Payment Token resolver, used for GraphQL mutation processing.
-+ */
-+class DeletePaymentToken implements ResolverInterface
-+{
-+    /**
-+     * @var PaymentTokenManagementInterface
-+     */
-+    private $paymentTokenManagement;
-+
-+    /**
-+     * @var PaymentTokenRepositoryInterface
-+     */
-+    private $paymentTokenRepository;
-+
-+    /**
-+     * @param PaymentTokenManagementInterface $paymentTokenManagement
-+     * @param PaymentTokenRepositoryInterface $paymentTokenRepository
-+     */
-+    public function __construct(
-+        PaymentTokenManagementInterface $paymentTokenManagement,
-+        PaymentTokenRepositoryInterface $paymentTokenRepository
-+    ) {
-+        $this->paymentTokenManagement = $paymentTokenManagement;
-+        $this->paymentTokenRepository = $paymentTokenRepository;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        /** @var ContextInterface $context */
-+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-+        }
-+
-+        if (!isset($args['public_hash'])) {
-+            throw new GraphQlInputException(__('Specify the "public_hash" value.'));
-+        }
-+
-+        $token = $this->paymentTokenManagement->getByPublicHash($args['public_hash'], $context->getUserId());
-+        if (!$token) {
-+            throw new GraphQlNoSuchEntityException(
-+                __('Could not find a token using public hash: %1', $args['public_hash'])
-+            );
-+        }
-+
-+        return ['result' => $this->paymentTokenRepository->delete($token)];
-+    }
-+}
-diff --git a/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php b/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php
-new file mode 100644
-index 00000000000..a3afeb05b16
---- /dev/null
-+++ b/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php
-@@ -0,0 +1,64 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\VaultGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\GraphQl\Model\Query\ContextInterface;
-+use Magento\Vault\Model\PaymentTokenManagement;
-+
-+/**
-+ * Customers Payment Tokens resolver, used for GraphQL request processing.
-+ */
-+class PaymentTokens implements ResolverInterface
-+{
-+    /**
-+     * @var PaymentTokenManagement
-+     */
-+    private $paymentTokenManagement;
-+
-+    /**
-+     * @param PaymentTokenManagement $paymentTokenManagement
-+     */
-+    public function __construct(
-+        PaymentTokenManagement $paymentTokenManagement
-+    ) {
-+        $this->paymentTokenManagement = $paymentTokenManagement;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        /** @var ContextInterface $context */
-+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
-+        }
-+
-+        $tokens = $this->paymentTokenManagement->getVisibleAvailableTokens($context->getUserId());
-+        $result = [];
-+
-+        foreach ($tokens as $token) {
-+            $result[] = [
-+                'public_hash' => $token->getPublicHash(),
-+                'payment_method_code' => $token->getPaymentMethodCode(),
-+                'type' => $token->getType(),
-+                'details' => $token->getTokenDetails(),
-+            ];
-+        }
-+        return ['items' => $result];
-+    }
-+}
-diff --git a/app/code/Magento/VaultGraphQl/README.md b/app/code/Magento/VaultGraphQl/README.md
-new file mode 100644
-index 00000000000..afcb1d83f27
---- /dev/null
-+++ b/app/code/Magento/VaultGraphQl/README.md
-@@ -0,0 +1,5 @@
-+# VaultGraphQl
-+
-+**VaultGraphQl** provides type and resolver information for the GraphQl module
-+to generate Vault (stored payment information) information endpoints. This module also
-+provides mutations for modifying a payment token.
-diff --git a/app/code/Magento/VaultGraphQl/composer.json b/app/code/Magento/VaultGraphQl/composer.json
-new file mode 100644
-index 00000000000..2f9fe6dc041
---- /dev/null
-+++ b/app/code/Magento/VaultGraphQl/composer.json
-@@ -0,0 +1,23 @@
-+{
-+    "name": "magento/module-vault-graph-ql",
-+    "description": "N/A",
-+    "type": "magento2-module",
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-vault": "*",
-+        "magento/module-graph-ql": "*"
-+    },
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\VaultGraphQl\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/VaultGraphQl/etc/module.xml b/app/code/Magento/VaultGraphQl/etc/module.xml
-new file mode 100644
-index 00000000000..f821d9fa670
---- /dev/null
-+++ b/app/code/Magento/VaultGraphQl/etc/module.xml
-@@ -0,0 +1,10 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_VaultGraphQl"/>
-+</config>
-diff --git a/app/code/Magento/VaultGraphQl/etc/schema.graphqls b/app/code/Magento/VaultGraphQl/etc/schema.graphqls
-new file mode 100644
-index 00000000000..64484fe9e81
---- /dev/null
-+++ b/app/code/Magento/VaultGraphQl/etc/schema.graphqls
-@@ -0,0 +1,31 @@
-+# Copyright © Magento, Inc. All rights reserved.
-+# See COPYING.txt for license details.
-+
-+type Mutation {
-+    deletePaymentToken(public_hash: String!): DeletePaymentTokenOutput @resolver(class: "\\Magento\\VaultGraphQl\\Model\\Resolver\\DeletePaymentToken") @doc(description:"Delete a customer payment token")
-+}
-+
-+type DeletePaymentTokenOutput {
-+    result: Boolean!
-+    customerPaymentTokens: CustomerPaymentTokens @resolver(class: "\\Magento\\VaultGraphQl\\Model\\Resolver\\PaymentTokens")
-+}
-+
-+type Query {
-+    customerPaymentTokens: CustomerPaymentTokens @doc(description: "Return a list of customer payment tokens") @resolver(class: "\\Magento\\VaultGraphQl\\Model\\Resolver\\PaymentTokens") @cache(cacheable: false)
-+}
-+
-+type CustomerPaymentTokens @resolver(class: "\\Magento\\VaultGraphQl\\Model\\Resolver\\PaymentTokens") {
-+    items: [PaymentToken]! @doc(description: "An array of payment tokens")
-+}
-+
-+type PaymentToken @doc(description: "The stored payment method available to the customer") {
-+    public_hash: String! @doc(description: "The public hash of the token")
-+    payment_method_code: String! @doc(description: "The payment method code associated with the token")
-+    type: PaymentTokenTypeEnum!
-+    details: String @doc(description: "Stored account details")
-+}
-+
-+enum PaymentTokenTypeEnum @doc(description: "The list of available payment token types") {
-+    card
-+    account
-+}
-diff --git a/app/code/Magento/VaultGraphQl/registration.php b/app/code/Magento/VaultGraphQl/registration.php
-new file mode 100644
-index 00000000000..3f48c00f070
---- /dev/null
-+++ b/app/code/Magento/VaultGraphQl/registration.php
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_VaultGraphQl', __DIR__);
-diff --git a/app/code/Magento/Version/Controller/Index/Index.php b/app/code/Magento/Version/Controller/Index/Index.php
-index c5d02cd9a1f..0db9b5f80d4 100644
---- a/app/code/Magento/Version/Controller/Index/Index.php
-+++ b/app/code/Magento/Version/Controller/Index/Index.php
-@@ -6,6 +6,7 @@
-  */
- namespace Magento\Version\Controller\Index;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
- use Magento\Framework\App\Action\Action;
- use Magento\Framework\App\Action\Context;
- use Magento\Framework\App\ProductMetadataInterface;
-@@ -13,7 +14,7 @@ use Magento\Framework\App\ProductMetadataInterface;
- /**
-  * Magento Version controller
-  */
--class Index extends Action
-+class Index extends Action implements HttpGetActionInterface
- {
-     /**
-      * @var ProductMetadataInterface
-diff --git a/app/code/Magento/Webapi/Controller/PathProcessor.php b/app/code/Magento/Webapi/Controller/PathProcessor.php
-index 5e8c23aa155..f32c93fb0c7 100644
---- a/app/code/Magento/Webapi/Controller/PathProcessor.php
-+++ b/app/code/Magento/Webapi/Controller/PathProcessor.php
-@@ -1,13 +1,17 @@
- <?php
--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Webapi\Controller;
- 
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Exception\NoSuchEntityException;
- 
-+/**
-+ * Class PathProcessor
-+ */
- class PathProcessor
- {
-     /**  Store code alias to indicate that all stores should be affected by action */
-@@ -18,12 +22,23 @@ class PathProcessor
-      */
-     private $storeManager;
- 
-+    /**
-+     * @var \Magento\Framework\Locale\ResolverInterface
-+     */
-+    private $localeResolver;
-+
-     /**
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-+     * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-      */
--    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
--    {
-+    public function __construct(
-+        \Magento\Store\Model\StoreManagerInterface $storeManager,
-+        \Magento\Framework\Locale\ResolverInterface $localeResolver = null
-+    ) {
-         $this->storeManager = $storeManager;
-+        $this->localeResolver = $localeResolver ?: ObjectManager::getInstance()->get(
-+            \Magento\Framework\Locale\ResolverInterface::class
-+        );
-     }
- 
-     /**
-@@ -50,13 +65,15 @@ class PathProcessor
-     public function process($pathInfo)
-     {
-         $pathParts = $this->stripPathBeforeStorecode($pathInfo);
--        $storeCode = $pathParts[0];
-+        $storeCode = current($pathParts);
-         $stores = $this->storeManager->getStores(false, true);
-         if (isset($stores[$storeCode])) {
-             $this->storeManager->setCurrentStore($storeCode);
-+            $this->localeResolver->emulate($this->storeManager->getStore()->getId());
-             $path = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
-         } elseif ($storeCode === self::ALL_STORE_CODE) {
-             $this->storeManager->setCurrentStore(\Magento\Store\Model\Store::ADMIN_CODE);
-+            $this->localeResolver->emulate($this->storeManager->getStore()->getId());
-             $path = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
-         } else {
-             $path = '/' . implode('/', $pathParts);
-diff --git a/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php b/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php
-index 1d8ccc127ce..d1a3c0c0f08 100644
---- a/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php
-+++ b/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php
-@@ -197,7 +197,7 @@ class ParamsOverrider
-             $index = array_search($serviceMethodParamName, array_column($methodParams, 'name'));
-             if ($index !== false) {
-                 $paramObjectType = $methodParams[$index][MethodsMap::METHOD_META_TYPE];
--                $setter = 'set' . ucfirst(SimpleDataObjectConverter::snakeCaseToCamelCase($objectProperty));
-+                $setter = 'set' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($objectProperty);
-                 if (array_key_exists(
-                     $setter,
-                     $this->getMethodsMap()->getMethodsMap($paramObjectType)
-diff --git a/app/code/Magento/Webapi/Model/Config/ClassReflector.php b/app/code/Magento/Webapi/Model/Config/ClassReflector.php
-index 7ce94c9bc6e..6748319f9f4 100644
---- a/app/code/Magento/Webapi/Model/Config/ClassReflector.php
-+++ b/app/code/Magento/Webapi/Model/Config/ClassReflector.php
-@@ -129,8 +129,8 @@ class ClassReflector
-         $docBlock = $methodReflection->getDocBlock();
-         if (!$docBlock) {
-             throw new \LogicException(
--                'The docBlock of the method '.
--                $method->getDeclaringClass()->getName() . '::' .  $method->getName() . ' is empty.'
-+                'The docBlock of the method ' .
-+                $method->getDeclaringClass()->getName() . '::' . $method->getName() . ' is empty.'
-             );
-         }
-         return $this->_typeProcessor->getDescription($docBlock);
-diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
-index 855f455120d..847def6e892 100644
---- a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
-+++ b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
-@@ -41,6 +41,11 @@ class Generator extends AbstractSchemaGenerator
-     /** Array signifier */
-     const ARRAY_SIGNIFIER = '[0]';
- 
-+    /**
-+     * Wrapper node for XML requests
-+     */
-+    private const XML_SCHEMA_PARAMWRAPPER = 'request';
-+
-     /**
-      * Swagger factory instance.
-      *
-@@ -134,7 +139,7 @@ class Generator extends AbstractSchemaGenerator
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function generateSchema($requestedServiceMetadata, $requestScheme, $requestHost, $endpointUrl)
-     {
-@@ -193,6 +198,32 @@ class Generator extends AbstractSchemaGenerator
-         ];
-     }
- 
-+    /**
-+     * List out consumes data type
-+     *
-+     * @return array
-+     */
-+    private function getConsumableDatatypes()
-+    {
-+        return [
-+            'application/json',
-+            'application/xml',
-+        ];
-+    }
-+
-+    /**
-+     * List out produces data type
-+     *
-+     * @return array
-+     */
-+    private function getProducibleDatatypes()
-+    {
-+        return [
-+            'application/json',
-+            'application/xml',
-+        ];
-+    }
-+
-     /**
-      * Generate path info based on method data
-      *
-@@ -212,6 +243,8 @@ class Generator extends AbstractSchemaGenerator
-             'tags' => [$tagName],
-             'description' => $methodData['documentation'],
-             'operationId' => $operationId,
-+            'consumes' => $this->getConsumableDatatypes(),
-+            'produces' => $this->getProducibleDatatypes(),
-         ];
- 
-         $parameters = $this->generateMethodParameters($httpMethodData, $operationId);
-@@ -602,7 +635,7 @@ class Generator extends AbstractSchemaGenerator
-     /**
-      * Get the CamelCased type name in 'hyphen-separated-lowercase-words' format
-      *
--     * e.g. test-module5-v1-entity-all-soap-and-rest
-+     * E.g. test-module5-v1-entity-all-soap-and-rest
-      *
-      * @param string $typeName
-      * @return string
-@@ -842,6 +875,17 @@ class Generator extends AbstractSchemaGenerator
-             $description
-         );
-         $bodySchema['type'] = 'object';
-+
-+        /*
-+         * Make sure we have a proper XML wrapper for request parameters for the XML format.
-+         */
-+        if (!isset($bodySchema['xml']) || !is_array($bodySchema['xml'])) {
-+            $bodySchema['xml'] = [];
-+        }
-+        if (!isset($bodySchema['xml']['name']) || empty($bodySchema['xml']['name'])) {
-+            $bodySchema['xml']['name'] = self::XML_SCHEMA_PARAMWRAPPER;
-+        }
-+
-         return $bodySchema;
-     }
- 
-diff --git a/app/code/Magento/Webapi/Model/Soap/Fault.php b/app/code/Magento/Webapi/Model/Soap/Fault.php
-index 74b1b41ee1b..102dcbe6a66 100644
---- a/app/code/Magento/Webapi/Model/Soap/Fault.php
-+++ b/app/code/Magento/Webapi/Model/Soap/Fault.php
-@@ -8,7 +8,12 @@
- namespace Magento\Webapi\Model\Soap;
- 
- use Magento\Framework\App\State;
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\ObjectManager;
- 
-+/**
-+ * Webapi Fault Model for Soap.
-+ */
- class Fault
- {
-     const FAULT_REASON_INTERNAL = 'Internal Error.';
-@@ -39,6 +44,11 @@ class Fault
-     const NODE_DETAIL_WRAPPER = 'GenericFault';
-     /**#@-*/
- 
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * @var string
-      */
-@@ -108,13 +118,15 @@ class Fault
-      * @param \Magento\Framework\Webapi\Exception $exception
-      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-      * @param State $appState
-+     * @param Escaper|null $escaper
-      */
-     public function __construct(
-         \Magento\Framework\App\RequestInterface $request,
-         Server $soapServer,
-         \Magento\Framework\Webapi\Exception $exception,
-         \Magento\Framework\Locale\ResolverInterface $localeResolver,
--        State $appState
-+        State $appState,
-+        Escaper $escaper = null
-     ) {
-         $this->_soapFaultCode = $exception->getOriginator();
-         $this->_parameters = $exception->getDetails();
-@@ -125,6 +137,9 @@ class Fault
-         $this->_soapServer = $soapServer;
-         $this->_localeResolver = $localeResolver;
-         $this->appState = $appState;
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-     }
- 
-     /**
-@@ -210,6 +225,8 @@ class Fault
-     }
- 
-     /**
-+     * Retrieve message
-+     *
-      * @return string
-      */
-     public function getMessage()
-@@ -286,14 +303,15 @@ FAULT_MESSAGE;
-     {
-         $detailsXml = '';
-         foreach ($details as $detailNode => $detailValue) {
--            $detailNode = htmlspecialchars($detailNode);
-+            $detailNode = $this->escaper->escapeHtml($detailNode);
-             if (is_numeric($detailNode)) {
-                 continue;
-             }
-             switch ($detailNode) {
-                 case self::NODE_DETAIL_TRACE:
-                     if (is_string($detailValue) || is_numeric($detailValue)) {
--                        $detailsXml .= "<m:{$detailNode}>" . htmlspecialchars($detailValue) . "</m:{$detailNode}>";
-+                        $detailsXml .= "<m:{$detailNode}>" . $this->escaper->escapeHtml($detailValue) .
-+                            "</m:{$detailNode}>";
-                     }
-                     break;
-                 case self::NODE_DETAIL_PARAMETERS:
-@@ -331,7 +349,7 @@ FAULT_MESSAGE;
-                     $parameterName++;
-                 }
-                 $paramsXml .= "<m:$parameterNode><m:$keyNode>$parameterName</m:$keyNode><m:$valueNode>"
--                    . htmlspecialchars($parameterValue) . "</m:$valueNode></m:$parameterNode>";
-+                    . $this->escaper->escapeHtml($parameterValue) . "</m:$valueNode></m:$parameterNode>";
-             }
-         }
-         if (!empty($paramsXml)) {
-diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php
-index c213c72b518..e587756eec7 100644
---- a/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php
-+++ b/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php
-@@ -8,11 +8,17 @@ namespace Magento\Webapi\Test\Unit\Controller;
- 
- use Magento\Store\Model\Store;
- 
-+/**
-+ * Test for Magento\Webapi\Controller\PathProcessor class.
-+ */
- class PathProcessorTest extends \PHPUnit\Framework\TestCase
- {
-     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Store\Model\StoreManagerInterface */
-     private $storeManagerMock;
- 
-+    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Locale\ResolverInterface */
-+    private $localeResolverMock;
-+
-     /** @var \Magento\Webapi\Controller\PathProcessor */
-     private $model;
- 
-@@ -24,13 +30,22 @@ class PathProcessorTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
--        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->storeManagerMock->expects($this->once())
--            ->method('getStores')
--            ->willReturn([$this->arbitraryStoreCode => 'store object', 'default' => 'default store object']);
--        $this->model = new \Magento\Webapi\Controller\PathProcessor($this->storeManagerMock);
-+        $store = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
-+        $store->method('getId')->willReturn(2);
-+
-+        $this->storeManagerMock = $this->createConfiguredMock(
-+            \Magento\Store\Model\StoreManagerInterface::class,
-+            [
-+                'getStores' => [$this->arbitraryStoreCode => 'store object', 'default' => 'default store object'],
-+                'getStore'  => $store,
-+            ]
-+        );
-+        $this->storeManagerMock->expects($this->once())->method('getStores');
-+
-+        $this->localeResolverMock = $this->createMock(\Magento\Framework\Locale\ResolverInterface::class);
-+        $this->localeResolverMock->method('emulate')->with(2);
-+
-+        $this->model = new \Magento\Webapi\Controller\PathProcessor($this->storeManagerMock, $this->localeResolverMock);
-     }
- 
-     /**
-@@ -47,6 +62,10 @@ class PathProcessorTest extends \PHPUnit\Framework\TestCase
-         $this->storeManagerMock->expects($this->exactly($setCurrentStoreCallCtr))
-             ->method('setCurrentStore')
-             ->with($storeCodeSet);
-+        if ($setCurrentStoreCallCtr > 0) {
-+            $this->localeResolverMock->expects($this->once())
-+                ->method('emulate');
-+        }
-         $result = $this->model->process($inPath);
-         $this->assertSame($this->endpointPath, $result);
-     }
-@@ -60,7 +79,7 @@ class PathProcessorTest extends \PHPUnit\Framework\TestCase
-             'All store code' => ['all', Store::ADMIN_CODE],
-             'Default store code' => ['', 'default', 0],
-             'Arbitrary store code' => [$this->arbitraryStoreCode, $this->arbitraryStoreCode],
--            'Explicit default store code' => ['default', 'default']
-+            'Explicit default store code' => ['default', 'default'],
-         ];
-     }
- }
-diff --git a/app/code/Magento/Webapi/Test/Unit/Model/Rest/Swagger/GeneratorTest.php b/app/code/Magento/Webapi/Test/Unit/Model/Rest/Swagger/GeneratorTest.php
-index 66b59babb71..172db875c6c 100644
---- a/app/code/Magento/Webapi/Test/Unit/Model/Rest/Swagger/GeneratorTest.php
-+++ b/app/code/Magento/Webapi/Test/Unit/Model/Rest/Swagger/GeneratorTest.php
-@@ -223,7 +223,7 @@ class GeneratorTest extends \PHPUnit\Framework\TestCase
-                     ]
-                 ],
-                 // @codingStandardsIgnoreStart
--                '{"swagger":"2.0","info":{"version":"","title":""},"host":"magento.host","basePath":"/rest/default","schemes":["http://"],"tags":[{"name":"testModule5AllSoapAndRestV2","description":"AllSoapAndRestInterface"}],"paths":{"/V1/testModule5":{"post":{"tags":["testModule5AllSoapAndRestV2"],"description":"Add new item.","operationId":"' . self::OPERATION_NAME . 'Post","parameters":[{"name":"operationNamePostBody","in":"body","schema":{"required":["item"],"properties":{"item":{"$ref":"#/definitions/test-module5-v2-entity-all-soap-and-rest"}},"type":"object"}}],"responses":{"200":{"description":"200 Success.","schema":{"$ref":"#/definitions/test-module5-v2-entity-all-soap-and-rest"}},"401":{"description":"401 Unauthorized","schema":{"$ref":"#/definitions/error-response"}},"500":{"description":"Internal Server error","schema":{"$ref":"#/definitions/error-response"}},"default":{"description":"Unexpected error","schema":{"$ref":"#/definitions/error-response"}}}}}},"definitions":{"error-response":{"type":"object","properties":{"message":{"type":"string","description":"Error message"},"errors":{"$ref":"#/definitions/error-errors"},"code":{"type":"integer","description":"Error code"},"parameters":{"$ref":"#/definitions/error-parameters"},"trace":{"type":"string","description":"Stack trace"}},"required":["message"]},"error-errors":{"type":"array","description":"Errors list","items":{"$ref":"#/definitions/error-errors-item"}},"error-errors-item":{"type":"object","description":"Error details","properties":{"message":{"type":"string","description":"Error message"},"parameters":{"$ref":"#/definitions/error-parameters"}}},"error-parameters":{"type":"array","description":"Error parameters list","items":{"$ref":"#/definitions/error-parameters-item"}},"error-parameters-item":{"type":"object","description":"Error parameters item","properties":{"resources":{"type":"string","description":"ACL resource"},"fieldName":{"type":"string","description":"Missing or invalid field name"},"fieldValue":{"type":"string","description":"Incorrect field value"}}},"test-module5-v2-entity-all-soap-and-rest":{"type":"object","description":"Some Data Object","properties":{"price":{"type":"integer"}},"required":["price"]}}}'
-+                '{"swagger":"2.0","info":{"version":"","title":""},"host":"magento.host","basePath":"/rest/default","schemes":["http://"],"tags":[{"name":"testModule5AllSoapAndRestV2","description":"AllSoapAndRestInterface"}],"paths":{"/V1/testModule5":{"post":{"tags":["testModule5AllSoapAndRestV2"],"description":"Add new item.","operationId":"operationNamePost","consumes":["application/json","application/xml"],"produces":["application/json","application/xml"],"parameters":[{"name":"operationNamePostBody","in":"body","schema":{"required":["item"],"properties":{"item":{"$ref":"#/definitions/test-module5-v2-entity-all-soap-and-rest"}},"type":"object","xml":{"name":"request"}}}],"responses":{"200":{"description":"200 Success.","schema":{"$ref":"#/definitions/test-module5-v2-entity-all-soap-and-rest"}},"401":{"description":"401 Unauthorized","schema":{"$ref":"#/definitions/error-response"}},"500":{"description":"Internal Server error","schema":{"$ref":"#/definitions/error-response"}},"default":{"description":"Unexpected error","schema":{"$ref":"#/definitions/error-response"}}}}}},"definitions":{"error-response":{"type":"object","properties":{"message":{"type":"string","description":"Error message"},"errors":{"$ref":"#/definitions/error-errors"},"code":{"type":"integer","description":"Error code"},"parameters":{"$ref":"#/definitions/error-parameters"},"trace":{"type":"string","description":"Stack trace"}},"required":["message"]},"error-errors":{"type":"array","description":"Errors list","items":{"$ref":"#/definitions/error-errors-item"}},"error-errors-item":{"type":"object","description":"Error details","properties":{"message":{"type":"string","description":"Error message"},"parameters":{"$ref":"#/definitions/error-parameters"}}},"error-parameters":{"type":"array","description":"Error parameters list","items":{"$ref":"#/definitions/error-parameters-item"}},"error-parameters-item":{"type":"object","description":"Error parameters item","properties":{"resources":{"type":"string","description":"ACL resource"},"fieldName":{"type":"string","description":"Missing or invalid field name"},"fieldValue":{"type":"string","description":"Incorrect field value"}}},"test-module5-v2-entity-all-soap-and-rest":{"type":"object","description":"Some Data Object","properties":{"price":{"type":"integer"}},"required":["price"]}}}'
-                 // @codingStandardsIgnoreEnd
-             ],
-             [
-@@ -271,7 +271,7 @@ class GeneratorTest extends \PHPUnit\Framework\TestCase
-                     ]
-                 ],
-                 // @codingStandardsIgnoreStart
--                '{"swagger":"2.0","info":{"version":"","title":""},"host":"magento.host","basePath":"/rest/default","schemes":["http://"],"tags":[{"name":"testModule5AllSoapAndRestV2","description":"AllSoapAndRestInterface"}],"paths":{"/V1/testModule5":{"get":{"tags":["testModule5AllSoapAndRestV2"],"description":"Retrieve existing item.","operationId":"' . self::OPERATION_NAME . 'Get","responses":{"200":{"description":"200 Success.","schema":{"$ref":"#/definitions/test-module5-v2-entity-all-soap-and-rest"}},"401":{"description":"401 Unauthorized","schema":{"$ref":"#/definitions/error-response"}},"500":{"description":"Internal Server error","schema":{"$ref":"#/definitions/error-response"}},"default":{"description":"Unexpected error","schema":{"$ref":"#/definitions/error-response"}}}}}},"definitions":{"error-response":{"type":"object","properties":{"message":{"type":"string","description":"Error message"},"errors":{"$ref":"#/definitions/error-errors"},"code":{"type":"integer","description":"Error code"},"parameters":{"$ref":"#/definitions/error-parameters"},"trace":{"type":"string","description":"Stack trace"}},"required":["message"]},"error-errors":{"type":"array","description":"Errors list","items":{"$ref":"#/definitions/error-errors-item"}},"error-errors-item":{"type":"object","description":"Error details","properties":{"message":{"type":"string","description":"Error message"},"parameters":{"$ref":"#/definitions/error-parameters"}}},"error-parameters":{"type":"array","description":"Error parameters list","items":{"$ref":"#/definitions/error-parameters-item"}},"error-parameters-item":{"type":"object","description":"Error parameters item","properties":{"resources":{"type":"string","description":"ACL resource"},"fieldName":{"type":"string","description":"Missing or invalid field name"},"fieldValue":{"type":"string","description":"Incorrect field value"}}},"test-module5-v2-entity-all-soap-and-rest":{"type":"object","description":"Some Data Object","properties":{"price":{"type":"integer"}},"required":["price"]}}}'
-+                '{"swagger":"2.0","info":{"version":"","title":""},"host":"magento.host","basePath":"/rest/default","schemes":["http://"],"tags":[{"name":"testModule5AllSoapAndRestV2","description":"AllSoapAndRestInterface"}],"paths":{"/V1/testModule5":{"get":{"tags":["testModule5AllSoapAndRestV2"],"description":"Retrieve existing item.","operationId":"operationNameGet","consumes":["application/json","application/xml"],"produces":["application/json","application/xml"],"responses":{"200":{"description":"200 Success.","schema":{"$ref":"#/definitions/test-module5-v2-entity-all-soap-and-rest"}},"401":{"description":"401 Unauthorized","schema":{"$ref":"#/definitions/error-response"}},"500":{"description":"Internal Server error","schema":{"$ref":"#/definitions/error-response"}},"default":{"description":"Unexpected error","schema":{"$ref":"#/definitions/error-response"}}}}}},"definitions":{"error-response":{"type":"object","properties":{"message":{"type":"string","description":"Error message"},"errors":{"$ref":"#/definitions/error-errors"},"code":{"type":"integer","description":"Error code"},"parameters":{"$ref":"#/definitions/error-parameters"},"trace":{"type":"string","description":"Stack trace"}},"required":["message"]},"error-errors":{"type":"array","description":"Errors list","items":{"$ref":"#/definitions/error-errors-item"}},"error-errors-item":{"type":"object","description":"Error details","properties":{"message":{"type":"string","description":"Error message"},"parameters":{"$ref":"#/definitions/error-parameters"}}},"error-parameters":{"type":"array","description":"Error parameters list","items":{"$ref":"#/definitions/error-parameters-item"}},"error-parameters-item":{"type":"object","description":"Error parameters item","properties":{"resources":{"type":"string","description":"ACL resource"},"fieldName":{"type":"string","description":"Missing or invalid field name"},"fieldValue":{"type":"string","description":"Incorrect field value"}}},"test-module5-v2-entity-all-soap-and-rest":{"type":"object","description":"Some Data Object","properties":{"price":{"type":"integer"}},"required":["price"]}}}'
-                 // @codingStandardsIgnoreEnd
-             ],
-         ];
-diff --git a/app/code/Magento/Webapi/view/adminhtml/layout/adminhtml_integration_edit.xml b/app/code/Magento/Webapi/view/adminhtml/layout/adminhtml_integration_edit.xml
-index 31b3bbf13be..c9c69b4267e 100644
---- a/app/code/Magento/Webapi/view/adminhtml/layout/adminhtml_integration_edit.xml
-+++ b/app/code/Magento/Webapi/view/adminhtml/layout/adminhtml_integration_edit.xml
-@@ -9,7 +9,11 @@
-     <update handle="editor"/>
-     <body>
-         <referenceBlock name="integration_edit_tabs">
--            <block class="Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Webapi" name="integration_edit_tab_webapi" template="Magento_Integration::resourcetree.phtml"/>
-+            <block class="Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Webapi" name="integration_edit_tab_webapi" template="Magento_Integration::resourcetree.phtml">
-+                <arguments>
-+                    <argument name="json_serializer" xsi:type="object">Magento\Integration\ViewModel\JsonSerializer</argument>
-+                </arguments>
-+            </block>
-             <action method="addTabAfter">
-                 <argument name="name" xsi:type="string">api_section</argument>
-                 <argument name="block" xsi:type="string">integration_edit_tab_webapi</argument>
-diff --git a/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Communication.php b/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Communication.php
-index 39e7fa418a3..2a6cac09c22 100644
---- a/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Communication.php
-+++ b/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Communication.php
-@@ -67,7 +67,8 @@ class Communication implements \Magento\Framework\Config\ReaderInterface
-                         CommunicationConfig::HANDLER_TYPE   => $serviceClass,
-                         CommunicationConfig::HANDLER_METHOD => $serviceMethod,
-                     ],
--                ]
-+                ],
-+                false
-             );
-             $rewriteTopicParams = [
-                 CommunicationConfig::TOPIC_IS_SYNCHRONOUS => false,
-diff --git a/app/code/Magento/WebapiAsync/Controller/Rest/Asynchronous/InputParamsResolver.php b/app/code/Magento/WebapiAsync/Controller/Rest/Asynchronous/InputParamsResolver.php
-index e6df38c563e..93bddd09fae 100644
---- a/app/code/Magento/WebapiAsync/Controller/Rest/Asynchronous/InputParamsResolver.php
-+++ b/app/code/Magento/WebapiAsync/Controller/Rest/Asynchronous/InputParamsResolver.php
-@@ -80,12 +80,14 @@ class InputParamsResolver
- 
-     /**
-      * Process and resolve input parameters
-+     *
-      * Return array with validated input params
-      * or throw \Exception if at least one request entity params is not valid
-      *
-      * @return array
-      * @throws \Magento\Framework\Exception\InputException if no value is provided for required parameters
-      * @throws \Magento\Framework\Webapi\Exception
-+     * @throws \Magento\Framework\Exception\AuthorizationException
-      */
-     public function resolve()
-     {
-@@ -95,6 +97,13 @@ class InputParamsResolver
-         $this->requestValidator->validate();
-         $webapiResolvedParams = [];
-         $inputData = $this->request->getRequestData();
-+
-+        $httpMethod = $this->request->getHttpMethod();
-+        if ($httpMethod == \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE) {
-+            $requestBodyParams = $this->request->getBodyParams();
-+            $inputData = array_merge($requestBodyParams, $inputData);
-+        }
-+
-         foreach ($inputData as $key => $singleEntityParams) {
-             $webapiResolvedParams[$key] = $this->resolveBulkItemParams($singleEntityParams);
-         }
-@@ -103,6 +112,8 @@ class InputParamsResolver
-     }
- 
-     /**
-+     * Returns route.
-+     *
-      * @return \Magento\Webapi\Controller\Rest\Router\Route
-      */
-     public function getRoute()
-@@ -111,6 +122,8 @@ class InputParamsResolver
-     }
- 
-     /**
-+     * Resolve parameters for service
-+     *
-      * Convert the input array from key-value format to a list of parameters
-      * suitable for the specified class / method.
-      *
-diff --git a/app/code/Magento/WebapiAsync/Model/Config.php b/app/code/Magento/WebapiAsync/Model/Config.php
-index 92343027adc..16c24643ba3 100644
---- a/app/code/Magento/WebapiAsync/Model/Config.php
-+++ b/app/code/Magento/WebapiAsync/Model/Config.php
-@@ -15,6 +15,9 @@ use Magento\Framework\Serialize\SerializerInterface;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Webapi\Model\Config\Converter;
- 
-+/**
-+ * Class for accessing to Webapi_Async configuration.
-+ */
- class Config implements \Magento\AsynchronousOperations\Model\ConfigInterface
- {
-     /**
-@@ -55,7 +58,7 @@ class Config implements \Magento\AsynchronousOperations\Model\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getServices()
-     {
-@@ -73,26 +76,30 @@ class Config implements \Magento\AsynchronousOperations\Model\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getTopicName($routeUrl, $httpMethod)
-     {
-         $services = $this->getServices();
--        $topicName = $this->generateTopicNameByRouteData(
-+        $lookupKey = $this->generateLookupKeyByRouteData(
-             $routeUrl,
-             $httpMethod
-         );
- 
--        if (array_key_exists($topicName, $services) === false) {
-+        if (array_key_exists($lookupKey, $services) === false) {
-             throw new LocalizedException(
--                __('WebapiAsync config for "%topicName" does not exist.', ['topicName' => $topicName])
-+                __('WebapiAsync config for "%lookupKey" does not exist.', ['lookupKey' => $lookupKey])
-             );
-         }
- 
--        return $services[$topicName][self::SERVICE_PARAM_KEY_TOPIC];
-+        return $services[$lookupKey][self::SERVICE_PARAM_KEY_TOPIC];
-     }
- 
-     /**
-+     * Generate topic data for all defined services
-+     *
-+     * Topic data is indexed by a lookup key that is derived from route data
-+     *
-      * @return array
-      */
-     private function generateTopicsDataFromWebapiConfig()
-@@ -105,11 +112,18 @@ class Config implements \Magento\AsynchronousOperations\Model\ConfigInterface
-                     $serviceInterface = $httpMethodData[Converter::KEY_SERVICE][Converter::KEY_SERVICE_CLASS];
-                     $serviceMethod = $httpMethodData[Converter::KEY_SERVICE][Converter::KEY_SERVICE_METHOD];
- 
--                    $topicName = $this->generateTopicNameByRouteData(
-+                    $lookupKey = $this->generateLookupKeyByRouteData(
-                         $routeUrl,
-                         $httpMethod
-                     );
--                    $services[$topicName] = [
-+
-+                    $topicName = $this->generateTopicNameFromService(
-+                        $serviceInterface,
-+                        $serviceMethod,
-+                        $httpMethod
-+                    );
-+
-+                    $services[$lookupKey] = [
-                         self::SERVICE_PARAM_KEY_INTERFACE => $serviceInterface,
-                         self::SERVICE_PARAM_KEY_METHOD    => $serviceMethod,
-                         self::SERVICE_PARAM_KEY_TOPIC     => $topicName,
-@@ -122,7 +136,7 @@ class Config implements \Magento\AsynchronousOperations\Model\ConfigInterface
-     }
- 
-     /**
--     * Generate topic name based on service type and method name.
-+     * Generate lookup key name based on route and method
-      *
-      * Perform the following conversion:
-      * self::TOPIC_PREFIX + /V1/products + POST => async.V1.products.POST
-@@ -131,19 +145,39 @@ class Config implements \Magento\AsynchronousOperations\Model\ConfigInterface
-      * @param string $httpMethod
-      * @return string
-      */
--    private function generateTopicNameByRouteData($routeUrl, $httpMethod)
-+    private function generateLookupKeyByRouteData($routeUrl, $httpMethod)
-     {
--        return self::TOPIC_PREFIX . $this->generateTopicName($routeUrl, $httpMethod, '/', false);
-+        return self::TOPIC_PREFIX . $this->generateKey($routeUrl, $httpMethod, '/', false);
-     }
- 
-     /**
-+     * Generate topic name based on service type and method name.
-+     *
-+     * Perform the following conversion:
-+     * self::TOPIC_PREFIX + Magento\Catalog\Api\ProductRepositoryInterface + save + POST
-+     *   => async.magento.catalog.api.productrepositoryinterface.save.POST
-+     *
-+     * @param string $serviceInterface
-+     * @param string $serviceMethod
-+     * @param string $httpMethod
-+     * @return string
-+     */
-+    private function generateTopicNameFromService($serviceInterface, $serviceMethod, $httpMethod)
-+    {
-+        $typeName = strtolower(sprintf('%s.%s', $serviceInterface, $serviceMethod));
-+        return strtolower(self::TOPIC_PREFIX . $this->generateKey($typeName, $httpMethod, '\\', false));
-+    }
-+
-+    /**
-+     * Join and simplify input type and method into a string that can be used as an array key
-+     *
-      * @param string $typeName
-      * @param string $methodName
-      * @param string $delimiter
-      * @param bool $lcfirst
-      * @return string
-      */
--    private function generateTopicName($typeName, $methodName, $delimiter = '\\', $lcfirst = true)
-+    private function generateKey($typeName, $methodName, $delimiter = '\\', $lcfirst = true)
-     {
-         $parts = explode($delimiter, ltrim($typeName, $delimiter));
-         foreach ($parts as &$part) {
-diff --git a/app/code/Magento/WebapiAsync/Plugin/Cache/Webapi.php b/app/code/Magento/WebapiAsync/Plugin/Cache/Webapi.php
-new file mode 100644
-index 00000000000..ecc929b2048
---- /dev/null
-+++ b/app/code/Magento/WebapiAsync/Plugin/Cache/Webapi.php
-@@ -0,0 +1,106 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\WebapiAsync\Plugin\Cache;
-+
-+use Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor;
-+use Magento\Framework\Webapi\Rest\Request;
-+
-+/**
-+ * Class Webapi
-+ */
-+class Webapi
-+{
-+    /**
-+     * Cache key for Async Routes
-+     */
-+    const ASYNC_ROUTES_CONFIG_CACHE_ID = 'async-routes-services-config';
-+
-+    /**
-+     * @var AsynchronousSchemaRequestProcessor
-+     */
-+    private $asynchronousSchemaRequestProcessor;
-+
-+    /**
-+     * @var \Magento\Framework\Webapi\Rest\Request
-+     */
-+    private $request;
-+
-+    /**
-+     * ServiceMetadata constructor.
-+     *
-+     * @param Request $request
-+     * @param AsynchronousSchemaRequestProcessor $asynchronousSchemaRequestProcessor
-+     */
-+    public function __construct(
-+        \Magento\Framework\Webapi\Rest\Request $request,
-+        AsynchronousSchemaRequestProcessor $asynchronousSchemaRequestProcessor
-+    ) {
-+        $this->request = $request;
-+        $this->asynchronousSchemaRequestProcessor = $asynchronousSchemaRequestProcessor;
-+    }
-+
-+    /**
-+     * Change identifier in case if Async request before cache load
-+     *
-+     * @param \Magento\Webapi\Model\Cache\Type\Webapi $subject
-+     * @param string $identifier
-+     * @return null|string
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function beforeLoad(\Magento\Webapi\Model\Cache\Type\Webapi $subject, $identifier)
-+    {
-+        if ($this->asynchronousSchemaRequestProcessor->canProcess($this->request)
-+            && $identifier === \Magento\Webapi\Model\ServiceMetadata::ROUTES_CONFIG_CACHE_ID) {
-+            return self::ASYNC_ROUTES_CONFIG_CACHE_ID;
-+        }
-+        return null;
-+    }
-+
-+    /**
-+     * Change identifier in case if Async request before cache save
-+     *
-+     * @param \Magento\Webapi\Model\Cache\Type\Webapi $subject
-+     * @param string $data
-+     * @param string $identifier
-+     * @param array $tags
-+     * @param int|bool|null $lifeTime
-+     * @return array|null
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function beforeSave(
-+        \Magento\Webapi\Model\Cache\Type\Webapi $subject,
-+        $data,
-+        $identifier,
-+        array $tags = [],
-+        $lifeTime = null
-+    ) {
-+        if ($this->asynchronousSchemaRequestProcessor->canProcess($this->request)
-+            && $identifier === \Magento\Webapi\Model\ServiceMetadata::ROUTES_CONFIG_CACHE_ID) {
-+            return [$data, self::ASYNC_ROUTES_CONFIG_CACHE_ID, $tags, $lifeTime];
-+        }
-+        return null;
-+    }
-+
-+    /**
-+     * Change identifier in case if Async request before remove cache
-+     *
-+     * @param \Magento\Webapi\Model\Cache\Type\Webapi $subject
-+     * @param string $identifier
-+     * @return null|string
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function beforeRemove(\Magento\Webapi\Model\Cache\Type\Webapi $subject, $identifier)
-+    {
-+        if ($this->asynchronousSchemaRequestProcessor->canProcess($this->request)
-+            && $identifier === \Magento\Webapi\Model\ServiceMetadata::ROUTES_CONFIG_CACHE_ID) {
-+            return self::ASYNC_ROUTES_CONFIG_CACHE_ID;
-+        }
-+        return null;
-+    }
-+}
-diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Controller/PathProcessorTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Controller/PathProcessorTest.php
-index e5453f75745..570df6afd3c 100644
---- a/app/code/Magento/WebapiAsync/Test/Unit/Controller/PathProcessorTest.php
-+++ b/app/code/Magento/WebapiAsync/Test/Unit/Controller/PathProcessorTest.php
-@@ -10,11 +10,17 @@ namespace Magento\WebapiAsync\Test\Unit\Controller;
- 
- use Magento\Store\Model\Store;
- 
-+/**
-+ * Test for Magento\Webapi\Controller\PathProcessor class.
-+ */
- class PathProcessorTest extends \PHPUnit\Framework\TestCase
- {
-     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Store\Model\StoreManagerInterface */
-     private $storeManagerMock;
- 
-+    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Locale\ResolverInterface */
-+    private $localeResolverMock;
-+
-     /** @var \Magento\Webapi\Controller\PathProcessor */
-     private $model;
- 
-@@ -26,16 +32,22 @@ class PathProcessorTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
--        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
--           ->disableOriginalConstructor()
--           ->getMock();
--        $this->storeManagerMock->expects($this->once())
--           ->method('getStores')
--           ->willReturn([
--               $this->arbitraryStoreCode => 'store object',
--               'default' => 'default store object',
--           ]);
--        $this->model = new \Magento\Webapi\Controller\PathProcessor($this->storeManagerMock);
-+        $store = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
-+        $store->method('getId')->willReturn(2);
-+
-+        $this->storeManagerMock = $this->createConfiguredMock(
-+            \Magento\Store\Model\StoreManagerInterface::class,
-+            [
-+                'getStores' => [$this->arbitraryStoreCode => 'store object', 'default' => 'default store object'],
-+                'getStore'  => $store,
-+            ]
-+        );
-+        $this->storeManagerMock->expects($this->once())->method('getStores');
-+
-+        $this->localeResolverMock = $this->createMock(\Magento\Framework\Locale\ResolverInterface::class);
-+        $this->localeResolverMock->method('emulate')->with(2);
-+
-+        $this->model = new \Magento\Webapi\Controller\PathProcessor($this->storeManagerMock, $this->localeResolverMock);
-     }
- 
-     /**
-diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php
-new file mode 100644
-index 00000000000..47b75b20573
---- /dev/null
-+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php
-@@ -0,0 +1,91 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\WebapiAsync\Test\Unit\Model;
-+
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Webapi\Model\Cache\Type\Webapi;
-+use Magento\Webapi\Model\Config as WebapiConfig;
-+use Magento\WebapiAsync\Model\Config;
-+use Magento\Webapi\Model\Config\Converter;
-+
-+class ConfigTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    /**
-+     * @var Webapi|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $webapiCacheMock;
-+
-+    /**
-+     * @var WebapiConfig|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $configMock;
-+
-+    /**
-+     * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $serializerMock;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+
-+        $this->webapiCacheMock = $this->createMock(\Magento\Webapi\Model\Cache\Type\Webapi::class);
-+        $this->configMock = $this->createMock(WebapiConfig::class);
-+        $this->serializerMock = $this->createMock(SerializerInterface::class);
-+
-+        $this->config = $objectManager->getObject(
-+            Config::class,
-+            [
-+                'cache' => $this->webapiCacheMock,
-+                'webApiConfig' => $this->configMock,
-+                'serializer' => $this->serializerMock
-+            ]
-+        );
-+    }
-+
-+    public function testGetServicesSetsTopicFromServiceContractName()
-+    {
-+        $services = [
-+            Converter::KEY_ROUTES => [
-+                '/V1/products' => [
-+                    'POST' => [
-+                        'service' => [
-+                            'class' => \Magento\Catalog\Api\ProductRepositoryInterface::class,
-+                            'method' => 'save',
-+                        ]
-+                    ]
-+                ]
-+            ]
-+        ];
-+        $this->configMock->expects($this->once())
-+            ->method('getServices')
-+            ->willReturn($services);
-+
-+        /* example of what $this->config->getServices() returns
-+        $result = [
-+            'async.V1.products.POST' => [
-+                'interface' => 'Magento\Catalog\Api\ProductRepositoryInterface',
-+                'method' => 'save',
-+                'topic' => 'async.magento.catalog.api.productrepositoryinterface.save.post',
-+            ]
-+        ];
-+        */
-+        $result = $this->config->getServices();
-+
-+        $expectedTopic = 'async.magento.catalog.api.productrepositoryinterface.save.post';
-+        $lookupKey = 'async.V1.products.POST';
-+        $this->assertArrayHasKey($lookupKey, $result);
-+        $this->assertEquals($result[$lookupKey]['topic'], $expectedTopic);
-+    }
-+}
-diff --git a/app/code/Magento/WebapiAsync/etc/di.xml b/app/code/Magento/WebapiAsync/etc/di.xml
-index 83f1d6a78f2..7411ec0561d 100755
---- a/app/code/Magento/WebapiAsync/etc/di.xml
-+++ b/app/code/Magento/WebapiAsync/etc/di.xml
-@@ -10,6 +10,9 @@
-     <type name="Magento\Webapi\Model\ServiceMetadata">
-         <plugin name="webapiServiceMetadataAsync" type="Magento\WebapiAsync\Plugin\ServiceMetadata" />
-     </type>
-+    <type name="Magento\Webapi\Model\Cache\Type\Webapi">
-+        <plugin name="webapiCacheAsync" type="Magento\WebapiAsync\Plugin\Cache\Webapi" />
-+    </type>
-     <virtualType name="Magento\WebapiAsync\Model\VirtualType\Rest\Config" type="Magento\Webapi\Model\Rest\Config">
-         <arguments>
-             <argument name="config" xsi:type="object">Magento\WebapiAsync\Model\BulkServiceConfig</argument>
-diff --git a/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml b/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml
-index c38ea402718..d6f40f5ac20 100644
---- a/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml
-+++ b/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml
-@@ -8,7 +8,7 @@
-         <section id="webapi" type="text" sortOrder="102" showInDefault="1" showInWebsite="1" showInStore="1">
-             <group id="webapisecurity" translate="label" type="text" sortOrder="250" showInDefault="1" showInWebsite="0" showInStore="0">
-                 <label>Web API Security</label>
--                <field id="allow_insecure" translate="label" type="select comment" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
-+                <field id="allow_insecure" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
-                     <label>Allow Anonymous Guest Access</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                     <comment>This feature applies only to CMS, Catalog and Store APIs. Please consult your developers for details on potential security risks.</comment>
-diff --git a/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php b/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php
-index 8363365372f..5d5426660d8 100644
---- a/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php
-+++ b/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php
-@@ -33,7 +33,7 @@ class ContextPlugin
-     protected $weeeHelper;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManager;
- 
-@@ -63,7 +63,7 @@ class ContextPlugin
-      * @param \Magento\Weee\Model\Tax $weeeTax
-      * @param \Magento\Tax\Helper\Data $taxHelper
-      * @param \Magento\Weee\Helper\Data $weeeHelper
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\PageCache\Model\Config $cacheConfig
-      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-@@ -74,7 +74,7 @@ class ContextPlugin
-         \Magento\Weee\Model\Tax $weeeTax,
-         \Magento\Tax\Helper\Data $taxHelper,
-         \Magento\Weee\Helper\Data $weeeHelper,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\PageCache\Model\Config $cacheConfig,
-         \Magento\Store\Model\StoreManagerInterface $storeManager,
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-@@ -91,6 +91,8 @@ class ContextPlugin
-     }
- 
-     /**
-+     * Before dispatch.
-+     *
-      * @param \Magento\Framework\App\ActionInterface $subject
-      * @param \Magento\Framework\App\RequestInterface $request
-      * @return void
-@@ -159,6 +161,8 @@ class ContextPlugin
-     }
- 
-     /**
-+     * Get wee tax region.
-+     *
-      * @param string $basedOn
-      * @return array
-      */
-diff --git a/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php b/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php
-index fa71e812817..2b8c74581d9 100644
---- a/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php
-+++ b/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php
-@@ -36,6 +36,7 @@ class Weee extends \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
-     /**
-      * Check if weee total amount should be included
-      *
-+     * Example:
-      * array(
-      *  $index => array(
-      *      'amount'   => $amount,
-@@ -43,6 +44,7 @@ class Weee extends \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
-      *      'font_size'=> $font_size
-      *  )
-      * )
-+     *
-      * @return array
-      */
-     public function getTotalsForDisplay()
-@@ -70,4 +72,17 @@ class Weee extends \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
- 
-         return $totals;
-     }
-+    
-+    /**
-+     * Check if we can display Weee total information in PDF
-+     *
-+     * @return bool
-+     */
-+    public function canDisplay()
-+    {
-+        $items = $this->getSource()->getAllItems();
-+        $store = $this->getSource()->getStore();
-+        $amount = $this->_weeeData->getTotalAmounts($items, $store);
-+        return $this->getDisplayZero() === 'true' || $amount != 0;
-+    }
- }
-diff --git a/app/code/Magento/Weee/Observer/AfterAddressSave.php b/app/code/Magento/Weee/Observer/AfterAddressSave.php
-index 1644ce43f86..9acea506adf 100644
---- a/app/code/Magento/Weee/Observer/AfterAddressSave.php
-+++ b/app/code/Magento/Weee/Observer/AfterAddressSave.php
-@@ -8,11 +8,14 @@ namespace Magento\Weee\Observer;
- use Magento\Customer\Model\Address;
- use Magento\Framework\Event\Observer;
- use Magento\Framework\Event\ObserverInterface;
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\PageCache\Model\Config;
- use Magento\Tax\Api\TaxAddressManagerInterface;
- use Magento\Weee\Helper\Data;
- 
-+/**
-+ * @inheritDoc
-+ */
- class AfterAddressSave implements ObserverInterface
- {
-     /**
-@@ -23,7 +26,7 @@ class AfterAddressSave implements ObserverInterface
-     /**
-      * Module manager
-      *
--     * @var Manager
-+     * @var ModuleManagerInterface
-      */
-     private $moduleManager;
- 
-@@ -43,13 +46,13 @@ class AfterAddressSave implements ObserverInterface
- 
-     /**
-      * @param Data $weeeHelper
--     * @param Manager $moduleManager
-+     * @param ModuleManagerInterface $moduleManager
-      * @param Config $cacheConfig
-      * @param TaxAddressManagerInterface $addressManager
-      */
-     public function __construct(
-         Data $weeeHelper,
--        Manager $moduleManager,
-+        ModuleManagerInterface $moduleManager,
-         Config $cacheConfig,
-         TaxAddressManagerInterface $addressManager
-     ) {
-@@ -60,6 +63,8 @@ class AfterAddressSave implements ObserverInterface
-     }
- 
-     /**
-+     * Execute.
-+     *
-      * @param Observer $observer
-      * @return void
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-diff --git a/app/code/Magento/Weee/Observer/CustomerLoggedIn.php b/app/code/Magento/Weee/Observer/CustomerLoggedIn.php
-index 8a498d628da..95299d96cab 100644
---- a/app/code/Magento/Weee/Observer/CustomerLoggedIn.php
-+++ b/app/code/Magento/Weee/Observer/CustomerLoggedIn.php
-@@ -8,12 +8,15 @@ namespace Magento\Weee\Observer;
- use Magento\Customer\Model\Session;
- use Magento\Framework\Event\Observer;
- use Magento\Framework\Event\ObserverInterface;
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\PageCache\Model\Config;
- use Magento\Tax\Api\TaxAddressManagerInterface;
- use Magento\Weee\Helper\Data;
- use Magento\Tax\Helper\Data as TaxHelper;
- 
-+/**
-+ * Customer logged in.
-+ */
- class CustomerLoggedIn implements ObserverInterface
- {
-     /**
-@@ -49,13 +52,13 @@ class CustomerLoggedIn implements ObserverInterface
- 
-     /**
-      * @param Data $weeeHelper
--     * @param Manager $moduleManager
-+     * @param ModuleManagerInterface $moduleManager
-      * @param Config $cacheConfig
-      * @param TaxAddressManagerInterface $addressManager
-      */
-     public function __construct(
-         Data $weeeHelper,
--        Manager $moduleManager,
-+        ModuleManagerInterface $moduleManager,
-         Config $cacheConfig,
-         TaxAddressManagerInterface $addressManager
-     ) {
-@@ -66,6 +69,8 @@ class CustomerLoggedIn implements ObserverInterface
-     }
- 
-     /**
-+     * Execute.
-+     *
-      * @param Observer $observer
-      * @return void
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-diff --git a/app/code/Magento/Weee/Plugin/Catalog/Controller/Adminhtml/Product/Initialization/Helper/ProcessTaxAttribute.php b/app/code/Magento/Weee/Plugin/Catalog/Controller/Adminhtml/Product/Initialization/Helper/ProcessTaxAttribute.php
-new file mode 100644
-index 00000000000..4aa941cd137
---- /dev/null
-+++ b/app/code/Magento/Weee/Plugin/Catalog/Controller/Adminhtml/Product/Initialization/Helper/ProcessTaxAttribute.php
-@@ -0,0 +1,60 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Weee\Plugin\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
-+
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
-+use Magento\Framework\App\RequestInterface;
-+
-+/**
-+ * Handles product tax attributes data initialization.
-+ */
-+class ProcessTaxAttribute
-+{
-+    /**
-+     * @var RequestInterface
-+     */
-+    private $request;
-+
-+    /**
-+     * @param RequestInterface $request
-+     */
-+    public function __construct(RequestInterface $request)
-+    {
-+        $this->request = $request;
-+    }
-+
-+    /**
-+     * Handles product tax attributes data initialization.
-+     *
-+     * @param Helper $subject
-+     * @param Product $result
-+     * @param Product $product
-+     * @param array $productData
-+     * @return Product
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function afterInitializeFromData(
-+        Helper $subject,
-+        Product $result,
-+        Product $product,
-+        array $productData
-+    ): Product {
-+        $attributes = $result->getAttributes();
-+        if (!empty($attributes)) {
-+            foreach ($attributes as $attribute) {
-+                if ($attribute->getFrontendInput() == 'weee' && !isset($productData[$attribute->getAttributeCode()])) {
-+                    $result->setData($attribute->getAttributeCode(), []);
-+                }
-+            }
-+        }
-+
-+        return $result;
-+    }
-+}
-diff --git a/app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml b/app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml
-index c41eb7c02a5..39deec3d81b 100644
---- a/app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml
-+++ b/app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!--Navigate to create product page from product grid page-->
-     <actionGroup name="AdminProductAddFPTValueActionGroup">
-         <arguments>
-diff --git a/app/code/Magento/Weee/Test/Mftf/Data/FixedProductAttributeData.xml b/app/code/Magento/Weee/Test/Mftf/Data/FixedProductAttributeData.xml
-index e981dae483f..b8b45d84242 100644
---- a/app/code/Magento/Weee/Test/Mftf/Data/FixedProductAttributeData.xml
-+++ b/app/code/Magento/Weee/Test/Mftf/Data/FixedProductAttributeData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="productFPTAttribute" type="ProductAttribute">
-         <data key="attribute_code" unique="suffix">attribute</data>
-         <data key="is_unique">true</data>
-diff --git a/app/code/Magento/Weee/Test/Mftf/Data/WeeeConfigData.xml b/app/code/Magento/Weee/Test/Mftf/Data/WeeeConfigData.xml
-index 120dd10eee3..e44c1bb51e4 100644
---- a/app/code/Magento/Weee/Test/Mftf/Data/WeeeConfigData.xml
-+++ b/app/code/Magento/Weee/Test/Mftf/Data/WeeeConfigData.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <!-- Fixed Product Taxes Enable-->
-     <entity name="WeeeConfigEnable" type="weee_config">
-         <requiredEntity type="enableFPT">EnableFPT</requiredEntity>
-diff --git a/app/code/Magento/Weee/Test/Mftf/Metadata/weee_config-meta.xml b/app/code/Magento/Weee/Test/Mftf/Metadata/weee_config-meta.xml
-index 2e2b71c30ef..56153067658 100644
---- a/app/code/Magento/Weee/Test/Mftf/Metadata/weee_config-meta.xml
-+++ b/app/code/Magento/Weee/Test/Mftf/Metadata/weee_config-meta.xml
-@@ -6,7 +6,7 @@
-   */
- -->
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="WeeeConfigEnable" dataType="weee_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/tax/" method="POST">
-         <object key="groups" dataType="weee_config">
-             <object key="weee" dataType="weee_config">
-diff --git a/app/code/Magento/Weee/Test/Mftf/Page/AdminProductEditPage.xml b/app/code/Magento/Weee/Test/Mftf/Page/AdminProductEditPage.xml
-index fa3663ee719..793b763f0fc 100644
---- a/app/code/Magento/Weee/Test/Mftf/Page/AdminProductEditPage.xml
-+++ b/app/code/Magento/Weee/Test/Mftf/Page/AdminProductEditPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="AdminProductEditPage" url="catalog/product/edit/id/{{product_id}}/" area="admin" module="Magento_Catalog">
-         <section name="AdminProductAddFPTValueSection"/>
-     </page>
-diff --git a/app/code/Magento/Weee/Test/Mftf/Section/AdminProductAddFPTValueSection.xml b/app/code/Magento/Weee/Test/Mftf/Section/AdminProductAddFPTValueSection.xml
-index 40a9a97f314..ebf9f410471 100644
---- a/app/code/Magento/Weee/Test/Mftf/Section/AdminProductAddFPTValueSection.xml
-+++ b/app/code/Magento/Weee/Test/Mftf/Section/AdminProductAddFPTValueSection.xml
-@@ -7,9 +7,10 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="AdminProductAddFPTValueSection">
-         <element name="addFPT" type="button" selector="[data-index='{{FPTAttributeCode}}'] [data-action='add_new_row']" parameterized="true"/>
-+        <element name="removeRowByIndex" type="button" selector="[data-index='{{FPTAttributeCode}}'] [data-action='remove_row']:nth-of-type({{rowIndex}})" parameterized="true"/>
-         <element name="selectCountryForFPT" type="select" selector="(//select[contains(@name, 'product[{{FPTAttributeCode}}]') and contains(@name, '[country]')])[last()]" parameterized="true"/>
-         <element name="selectStateForFPT" type="select" selector="(//select[contains(@name, 'product[{{FPTAttributeCode}}]') and contains(@name, '[state]')])[last()]" parameterized="true"/>
-         <element name="setTaxValueForFPT" type="text" selector="(//input[contains(@name, 'product[{{FPTAttributeCode}}]') and contains(@name, '[value]')])[last()]" parameterized="true"/>
-diff --git a/app/code/Magento/Weee/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Weee/Test/Mftf/Section/CheckoutCartSummarySection.xml
-index 9b6541b9354..2f8ed312f15 100644
---- a/app/code/Magento/Weee/Test/Mftf/Section/CheckoutCartSummarySection.xml
-+++ b/app/code/Magento/Weee/Test/Mftf/Section/CheckoutCartSummarySection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="CheckoutCartSummarySection">
-         <element name="amountFPT" type="text" selector=".totals td[data-th='FPT'] .price"/>
-     </section>
-diff --git a/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml b/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml
-new file mode 100644
-index 00000000000..3aeed3095dc
---- /dev/null
-+++ b/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml
-@@ -0,0 +1,63 @@
-+<?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="AdminRemoveProductWeeeAttributeOptionTest">
-+        <annotations>
-+            <stories value="Weee attribute options can be removed in product page"/>
-+            <title value="Weee attribute options can be removed in product page"/>
-+            <description value="Weee attribute options can be removed in product page"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-95033"/>
-+            <group value="weee"/>
-+        </annotations>
-+        <before>
-+            <createData entity="productFPTAttribute" stepKey="createProductFPTAttribute"/>
-+            <createData entity="AddToDefaultSet" stepKey="addFPTToAttributeSet">
-+                <requiredEntity createDataKey="createProductFPTAttribute"/>
-+            </createData>
-+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProductInitial">
-+                <argument name="product" value="$$createSimpleProduct$$"/>
-+            </actionGroup>
-+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductInitial">
-+                <argument name="product" value="$$createSimpleProduct$$"/>
-+            </actionGroup>
-+            <actionGroup ref="AdminProductAddFPTValueActionGroup" stepKey="addWeeeAttributeValue">
-+                <argument name="FPTAttributeCode" value="$$createProductFPTAttribute.attribute_code$$"/>
-+                <argument name="stateForFPT" value="California"/>
-+                <argument name="valueForFPT" value="10"/>
-+            </actionGroup>
-+            <actionGroup ref="saveProductForm" stepKey="saveProductInitial"/>
-+        </before>
-+        <after>
-+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductListing"/>
-+            <waitForPageLoad stepKey="waitForProductListingPageLoad"/>
-+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+            <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+        </after>
-+
-+        <!--  Test Steps  -->
-+        <!--  Step 1: Open created product edit page  -->
-+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
-+            <argument name="product" value="$$createSimpleProduct$$"/>
-+        </actionGroup>
-+        <!--  Step 2: Remove weee attribute options  -->
-+        <click selector="{{AdminProductAddFPTValueSection.removeRowByIndex('$$createProductFPTAttribute.attribute_code$$','1')}}" stepKey="removeAttributeOption"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+        <!--  Assert weee attribute options are empty -->
-+        <dontSeeElement selector="{{AdminProductAddFPTValueSection.removeRowByIndex('$$createProductFPTAttribute.attribute_code$$','1')}}" stepKey="dontSeeOptions"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php b/app/code/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php
-index 5500350e243..b720f42378f 100644
---- a/app/code/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php
-+++ b/app/code/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php
-@@ -39,7 +39,7 @@ class ContextPluginTest extends \PHPUnit\Framework\TestCase
-     protected $taxCalculationMock;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $moduleManagerMock;
- 
-@@ -85,13 +85,15 @@ class ContextPluginTest extends \PHPUnit\Framework\TestCase
- 
-         $this->customerSessionMock = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
-             ->disableOriginalConstructor()
--            ->setMethods([
-+            ->setMethods(
-+                [
-                 'getDefaultTaxBillingAddress', 'getDefaultTaxShippingAddress', 'getCustomerTaxClassId',
-                 'getWebsiteId', 'isLoggedIn'
--            ])
-+                ]
-+            )
-             ->getMock();
- 
--        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
-+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-diff --git a/app/code/Magento/Weee/Test/Unit/Observer/AddPaymentWeeeItemTest.php b/app/code/Magento/Weee/Test/Unit/Observer/AddPaymentWeeeItemTest.php
-new file mode 100644
-index 00000000000..dd0547354cf
---- /dev/null
-+++ b/app/code/Magento/Weee/Test/Unit/Observer/AddPaymentWeeeItemTest.php
-@@ -0,0 +1,154 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Weee\Test\Unit\Observer;
-+
-+use Magento\Framework\Event;
-+use Magento\Framework\Event\Observer;
-+use Magento\Payment\Model\Cart;
-+use Magento\Payment\Model\Cart\SalesModel\SalesModelInterface;
-+use Magento\Quote\Model\Quote\Item;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Store\Model\Store;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Weee\Helper\Data;
-+use Magento\Weee\Observer\AddPaymentWeeeItem;
-+use PHPUnit\Framework\TestCase;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+
-+/**
-+ * Class AddPaymentWeeeItemTest
-+ */
-+class AddPaymentWeeeItemTest extends TestCase
-+{
-+    /**
-+     * Testable object
-+     *
-+     * @var AddPaymentWeeeItem
-+     */
-+    private $observer;
-+
-+    /**
-+     * @var Data|MockObject
-+     */
-+    private $weeeHelperMock;
-+
-+    /**
-+     * @var StoreManagerInterface|MockObject
-+     */
-+    private $storeManagerMock;
-+
-+    /**
-+     * Set Up
-+     */
-+    protected function setUp()
-+    {
-+        $this->weeeHelperMock = $this->createMock(Data::class);
-+        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
-+
-+        $this->observer = new AddPaymentWeeeItem(
-+            $this->weeeHelperMock,
-+            $this->storeManagerMock
-+        );
-+    }
-+
-+    /**
-+     * Test execute
-+     *
-+     * @dataProvider dataProvider
-+     * @param bool $isEnabled
-+     * @param bool $includeInSubtotal
-+     * @return void
-+     */
-+    public function testExecute(bool $isEnabled, bool $includeInSubtotal): void
-+    {
-+        /** @var Observer|MockObject $observerMock */
-+        $observerMock = $this->createMock(Observer::class);
-+        $cartModelMock = $this->createMock(Cart::class);
-+        $salesModelMock = $this->createMock(SalesModelInterface::class);
-+        $itemMock = $this->createPartialMock(Item::class, ['getOriginalItem']);
-+        $originalItemMock = $this->createPartialMock(Item::class, ['getParentItem']);
-+        $parentItemMock = $this->createMock(Item::class);
-+        $eventMock = $this->getMockBuilder(Event::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getCart'])
-+            ->getMock();
-+
-+        $asCustomItem = $this->prepareShouldBeAddedAsCustomItem($isEnabled, $includeInSubtotal);
-+        $toBeCalled = 1;
-+        if (!$asCustomItem) {
-+            $toBeCalled = 0;
-+        }
-+
-+        $eventMock->expects($this->exactly($toBeCalled))
-+            ->method('getCart')
-+            ->willReturn($cartModelMock);
-+        $observerMock->expects($this->exactly($toBeCalled))
-+            ->method('getEvent')
-+            ->willReturn($eventMock);
-+        $itemMock->expects($this->exactly($toBeCalled))
-+            ->method('getOriginalItem')
-+            ->willReturn($originalItemMock);
-+        $originalItemMock->expects($this->exactly($toBeCalled))
-+            ->method('getParentItem')
-+            ->willReturn($parentItemMock);
-+        $salesModelMock->expects($this->exactly($toBeCalled))
-+            ->method('getAllItems')
-+            ->willReturn([$itemMock]);
-+        $cartModelMock->expects($this->exactly($toBeCalled))
-+            ->method('getSalesModel')
-+            ->willReturn($salesModelMock);
-+
-+        $this->observer->execute($observerMock);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProvider(): array
-+    {
-+        return [
-+            [true, false],
-+            [true, true],
-+            [false, true],
-+            [false, false],
-+        ];
-+    }
-+
-+    /**
-+     * Prepare if FPT should be added to payment cart as custom item or not.
-+     *
-+     * @param bool $isEnabled
-+     * @param bool $includeInSubtotal
-+     * @return bool
-+     */
-+    private function prepareShouldBeAddedAsCustomItem(bool $isEnabled, bool $includeInSubtotal): bool
-+    {
-+        $storeMock = $this->getMockBuilder(StoreInterface::class)
-+            ->setMethods(['getId'])
-+            ->getMockForAbstractClass();
-+        $storeMock->expects($this->once())
-+            ->method('getId')
-+            ->willReturn(Store::DEFAULT_STORE_ID);
-+        $this->storeManagerMock->expects($this->once())
-+            ->method('getStore')
-+            ->willReturn($storeMock);
-+        $this->weeeHelperMock->expects($this->once())
-+            ->method('isEnabled')
-+            ->with(Store::DEFAULT_STORE_ID)
-+            ->willReturn($isEnabled);
-+
-+        if ($isEnabled) {
-+            $this->weeeHelperMock->expects($this->once())
-+                ->method('includeInSubtotal')
-+                ->with(Store::DEFAULT_STORE_ID)
-+                ->willReturn($includeInSubtotal);
-+        }
-+
-+        return $isEnabled && !$includeInSubtotal;
-+    }
-+}
-diff --git a/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php b/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
-index 6d363847bf9..a7b88f57271 100644
---- a/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
-+++ b/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
-@@ -9,6 +9,9 @@ use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Tax\Api\TaxAddressManagerInterface;
- use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
-+/**
-+ * After address save test.
-+ */
- class AfterAddressSaveTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -24,7 +27,7 @@ class AfterAddressSaveTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Module manager
-      *
--     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $moduleManagerMock;
- 
-@@ -58,7 +61,7 @@ class AfterAddressSaveTest extends \PHPUnit\Framework\TestCase
-             ->setMethods(['getCustomerAddress'])
-             ->getMock();
- 
--        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
-+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-diff --git a/app/code/Magento/Weee/Test/Unit/Observer/CustomerLoggedInTest.php b/app/code/Magento/Weee/Test/Unit/Observer/CustomerLoggedInTest.php
-index aaca1c237aa..06d1dbedcfd 100644
---- a/app/code/Magento/Weee/Test/Unit/Observer/CustomerLoggedInTest.php
-+++ b/app/code/Magento/Weee/Test/Unit/Observer/CustomerLoggedInTest.php
-@@ -8,6 +8,9 @@ namespace Magento\Weee\Test\Unit\Observer;
- use Magento\Tax\Api\TaxAddressManagerInterface;
- use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
-+/**
-+ * Customer logged in test
-+ */
- class CustomerLoggedInTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -18,7 +21,7 @@ class CustomerLoggedInTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Module manager
-      *
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     private $moduleManagerMock;
- 
-@@ -49,12 +52,14 @@ class CustomerLoggedInTest extends \PHPUnit\Framework\TestCase
-         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->observerMock = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
-             ->disableOriginalConstructor()
--            ->setMethods([
-+            ->setMethods(
-+                [
-                 'getCustomerAddress', 'getData'
--            ])
-+                ]
-+            )
-             ->getMock();
- 
--        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
-+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-diff --git a/app/code/Magento/Weee/Test/Unit/Observer/SetWeeeRendererInFormObserverTest.php b/app/code/Magento/Weee/Test/Unit/Observer/SetWeeeRendererInFormObserverTest.php
-new file mode 100644
-index 00000000000..188b42cb379
---- /dev/null
-+++ b/app/code/Magento/Weee/Test/Unit/Observer/SetWeeeRendererInFormObserverTest.php
-@@ -0,0 +1,88 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Weee\Test\Unit\Observer;
-+
-+use Magento\Framework\Data\Form;
-+use Magento\Framework\Event;
-+use Magento\Framework\Event\Observer;
-+use Magento\Framework\View\LayoutInterface;
-+use Magento\Weee\Model\Tax;
-+use Magento\Weee\Observer\SetWeeeRendererInFormObserver;
-+use PHPUnit\Framework\TestCase;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+
-+/**
-+ * Class AddPaymentWeeeItemTest
-+ */
-+class SetWeeeRendererInFormObserverTest extends TestCase
-+{
-+    /**
-+     * Testable object
-+     *
-+     * @var SetWeeeRendererInFormObserver
-+     */
-+    private $observer;
-+
-+    /**
-+     * @var LayoutInterface|MockObject
-+     */
-+    private $layoutMock;
-+
-+    /**
-+     * @var Tax|MockObject
-+     */
-+    private $taxModelMock;
-+
-+    /**
-+     * Set Up
-+     */
-+    protected function setUp()
-+    {
-+        $this->layoutMock = $this->createMock(LayoutInterface::class);
-+        $this->taxModelMock = $this->createMock(Tax::class);
-+        $this->observer = new SetWeeeRendererInFormObserver(
-+            $this->layoutMock,
-+            $this->taxModelMock
-+        );
-+    }
-+
-+    /**
-+     * Test assigning a custom renderer for product create/edit form weee attribute element
-+     *
-+     * @return void
-+     */
-+    public function testExecute(): void
-+    {
-+        $attributes = new \ArrayIterator(['element_code_1', 'element_code_2']);
-+        /** @var Event|MockObject $eventMock */
-+        $eventMock = $this->getMockBuilder(Event::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getForm'])
-+            ->getMock();
-+
-+        /** @var Observer|MockObject $observerMock */
-+        $observerMock = $this->createMock(Observer::class);
-+        /** @var Form|MockObject $formMock */
-+        $formMock = $this->createMock(Form::class);
-+
-+        $eventMock->expects($this->once())
-+            ->method('getForm')
-+            ->willReturn($formMock);
-+        $observerMock->expects($this->once())
-+            ->method('getEvent')
-+            ->willReturn($eventMock);
-+        $this->taxModelMock->expects($this->once())
-+            ->method('getWeeeAttributeCodes')
-+            ->willReturn($attributes);
-+        $formMock->expects($this->exactly($attributes->count()))
-+            ->method('getElement')
-+            ->willReturnSelf();
-+
-+        $this->observer->execute($observerMock);
-+    }
-+}
-diff --git a/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Weee.php b/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Weee.php
-index c96a7a02003..d05b8c21689 100644
---- a/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Weee.php
-+++ b/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Weee.php
-@@ -85,7 +85,7 @@ class Weee extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function modifyData(array $data)
-     {
-@@ -93,7 +93,7 @@ class Weee extends AbstractModifier
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function modifyMeta(array $meta)
-     {
-@@ -155,6 +155,7 @@ class Weee extends AbstractModifier
-                         'dndConfig' => [
-                             'enabled' => false,
-                         ],
-+                        'required' => (bool)$attributeConfig['arguments']['data']['config']['required'],
-                     ],
-                 ],
-             ],
-@@ -180,6 +181,7 @@ class Weee extends AbstractModifier
-                                         'component' => 'Magento_Weee/js/fpt-group',
-                                         'visible' => true,
-                                         'label' => __('Country/State'),
-+                                        'showLabel' => false,
-                                     ],
-                                 ],
-                             ],
-@@ -197,6 +199,7 @@ class Weee extends AbstractModifier
-                                                 'validation' => [
-                                                     'required-entry' => true,
-                                                 ],
-+                                                'showLabel' => false,
-                                             ],
-                                         ],
-                                     ],
-@@ -216,6 +219,7 @@ class Weee extends AbstractModifier
-                                                 ],
-                                                 'caption' => '*',
-                                                 'visible' => true,
-+                                                'showLabel' => false,
-                                             ],
-                                         ],
-                                     ],
-@@ -233,6 +237,7 @@ class Weee extends AbstractModifier
-                                                 'validation' => [
-                                                     'validate-fpt-group' => true
-                                                 ],
-+                                                'showLabel' => false,
-                                             ],
-                                         ],
-                                     ],
-@@ -252,6 +257,7 @@ class Weee extends AbstractModifier
-                                         'validation' => [
-                                             'required-entry' => true
-                                         ],
-+                                        'showLabel' => false,
-                                     ],
-                                 ],
-                             ],
-@@ -267,6 +273,7 @@ class Weee extends AbstractModifier
-                                         'label' => __('Website'),
-                                         'visible' => $this->websiteManager->isMultiWebsites(),
-                                         'options' => $this->websiteManager->getWebsites($product, $eavAttribute),
-+                                        'showLabel' => false,
-                                     ],
-                                 ],
-                             ],
-diff --git a/app/code/Magento/Weee/etc/adminhtml/system.xml b/app/code/Magento/Weee/etc/adminhtml/system.xml
-index ae02b27d10c..d3e9efb8f0b 100644
---- a/app/code/Magento/Weee/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Weee/etc/adminhtml/system.xml
-@@ -44,6 +44,7 @@
-             <group id="totals_sort">
-                 <field id="weee" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                     <label>Fixed Product Tax</label>
-+                    <validate>required-number validate-number</validate>
-                 </field>
-             </group>
-         </section>
-diff --git a/app/code/Magento/Weee/etc/db_schema.xml b/app/code/Magento/Weee/etc/db_schema.xml
-index 96c3be9740e..1b071682470 100644
---- a/app/code/Magento/Weee/etc/db_schema.xml
-+++ b/app/code/Magento/Weee/etc/db_schema.xml
-@@ -13,7 +13,7 @@
-         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Website Id"/>
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
--                default="0" comment="Entity Id"/>
-+                default="0" comment="Entity ID"/>
-         <column xsi:type="varchar" name="country" nullable="true" length="2" comment="Country"/>
-         <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
-                 comment="Value"/>
-@@ -21,30 +21,30 @@
-                 comment="State"/>
-         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
-                 comment="Attribute Id"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="value_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="WEEE_TAX_COUNTRY_DIRECTORY_COUNTRY_COUNTRY_ID" table="weee_tax"
-+        <constraint xsi:type="foreign" referenceId="WEEE_TAX_COUNTRY_DIRECTORY_COUNTRY_COUNTRY_ID" table="weee_tax"
-                     column="country" referenceTable="directory_country" referenceColumn="country_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="WEEE_TAX_ENTITY_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID" table="weee_tax"
-+        <constraint xsi:type="foreign" referenceId="WEEE_TAX_ENTITY_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID" table="weee_tax"
-                     column="entity_id" referenceTable="catalog_product_entity" referenceColumn="entity_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="WEEE_TAX_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID" table="weee_tax"
-+        <constraint xsi:type="foreign" referenceId="WEEE_TAX_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID" table="weee_tax"
-                     column="website_id" referenceTable="store_website" referenceColumn="website_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="WEEE_TAX_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID" table="weee_tax"
-+        <constraint xsi:type="foreign" referenceId="WEEE_TAX_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID" table="weee_tax"
-                     column="attribute_id" referenceTable="eav_attribute" referenceColumn="attribute_id"
-                     onDelete="CASCADE"/>
--        <index name="WEEE_TAX_WEBSITE_ID" indexType="btree">
-+        <index referenceId="WEEE_TAX_WEBSITE_ID" indexType="btree">
-             <column name="website_id"/>
-         </index>
--        <index name="WEEE_TAX_ENTITY_ID" indexType="btree">
-+        <index referenceId="WEEE_TAX_ENTITY_ID" indexType="btree">
-             <column name="entity_id"/>
-         </index>
--        <index name="WEEE_TAX_COUNTRY" indexType="btree">
-+        <index referenceId="WEEE_TAX_COUNTRY" indexType="btree">
-             <column name="country"/>
-         </index>
--        <index name="WEEE_TAX_ATTRIBUTE_ID" indexType="btree">
-+        <index referenceId="WEEE_TAX_ATTRIBUTE_ID" indexType="btree">
-             <column name="attribute_id"/>
-         </index>
-     </table>
-diff --git a/app/code/Magento/Weee/etc/di.xml b/app/code/Magento/Weee/etc/di.xml
-index e52aebd3af8..8b433163cad 100644
---- a/app/code/Magento/Weee/etc/di.xml
-+++ b/app/code/Magento/Weee/etc/di.xml
-@@ -78,4 +78,7 @@
-             </argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper">
-+        <plugin name="weeeAttributeOptionsProcess" type="Magento\Weee\Plugin\Catalog\Controller\Adminhtml\Product\Initialization\Helper\ProcessTaxAttribute"/>
-+    </type>
- </config>
-diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
-index ea35eff438c..0d8365ff4bd 100644
---- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
-+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
-@@ -4,64 +4,63 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
- /** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
- 
- /** @var $_weeeHelper \Magento\Weee\Helper\Data */
--$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
-+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
- 
- $_item = $block->getItem();
- ?>
- 
--<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
-+<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()) : ?>
-     <div class="price-excl-tax">
--        <?php if ($block->displayBothPrices()): ?>
--            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
-+        <?php if ($block->displayBothPrices()) : ?>
-+            <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
-         <?php endif; ?>
- 
-         <?= $block->getRowPriceExclTaxHtml() ?>
- 
--        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
--            <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-+            <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-                 <small>
--                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_row_amount'], $tax['row_amount']) ?></span>
-+                    <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                        <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_row_amount'], $tax['row_amount']) ?></span>
-                     <?php endforeach; ?>
-                 </small>
-             <?php endif; ?>
- 
--            <?php if ($block->displayFinalPrice()): ?>
-+            <?php if ($block->displayFinalPrice()) : ?>
-                 <br />
--                <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
-+                <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
-                     <?= $block->getFinalRowPriceExclTaxHtml() ?>
-                 </span>
-             <?php endif; ?>
-         <?php endif; ?>
-     </div>
- <?php endif; ?>
--<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
-+<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()) : ?>
-     <div class="price-incl-tax">
--        <?php if ($block->displayBothPrices()): ?>
--            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
-+        <?php if ($block->displayBothPrices()) : ?>
-+            <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
-         <?php endif; ?>
-         <?= $block->getRowPriceInclTaxHtml() ?>
- 
--        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-             <br />
--            <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+            <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-                 <small>
--                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']) ?></span>
-+                    <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                        <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']) ?></span>
-                     <?php endforeach; ?>
-                 </small>
-             <?php endif; ?>
- 
--            <?php if ($block->displayFinalPrice()): ?>
-+            <?php if ($block->displayFinalPrice()) : ?>
-                 <br />
--                <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
-+                <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
-                     <?= $block->getFinalRowPriceInclTaxHtml() ?>
-                 </span>
-             <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
-index fa55009fb5b..b0f29e2f03d 100644
---- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
-+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
-@@ -13,4 +10,4 @@
- $_item = $block->getItem();
- ?>
- 
--<?= /* @escapeNotVerified */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
-+<?= /* @noEscape */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
-diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
-index 13eca4afd2e..8dbaff2e2a6 100644
---- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
-+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
-@@ -4,65 +4,64 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
- /** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
- 
- /** @var $_weeeHelper \Magento\Weee\Helper\Data */
--$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
-+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
- 
- $_item = $block->getItem();
- ?>
- 
--<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
-+<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()) : ?>
-     <div class="price-excl-tax">
--        <?php if ($block->displayBothPrices()): ?>
--            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
-+        <?php if ($block->displayBothPrices()) : ?>
-+            <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
-         <?php endif; ?>
- 
-         <?= $block->getUnitPriceExclTaxHtml() ?>
- 
--        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-             <br />
--            <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+            <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-                 <small>
--                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_amount'], $tax['amount']) ?></span>
-+                    <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                        <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_amount'], $tax['amount']) ?></span>
-                     <?php endforeach; ?>
-                 </small>
-             <?php endif; ?>
- 
--            <?php if ($block->displayFinalPrice()): ?>
-+            <?php if ($block->displayFinalPrice()) : ?>
-                 <br />
--                <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
-+                <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
-                     <?= $block->getFinalUnitPriceExclTaxHtml() ?>
-                 </span>
-             <?php endif; ?>
-         <?php endif; ?>
-     </div>
- <?php endif; ?>
--<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
-+<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()) : ?>
-     <div class="price-incl-tax">
--        <?php if ($block->displayBothPrices()): ?>
--            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
-+        <?php if ($block->displayBothPrices()) : ?>
-+            <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
-         <?php endif; ?>
-         <?= $block->getUnitPriceInclTaxHtml() ?>
- 
--        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-             <br />
--            <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+            <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-                 <small>
--                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']) ?></span>
-+                    <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                        <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']) ?></span>
-                     <?php endforeach; ?>
-                 </small>
-             <?php endif; ?>
- 
--            <?php if ($block->displayFinalPrice()): ?>
-+            <?php if ($block->displayFinalPrice()) : ?>
-                 <br />
--                <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
-+                <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
-                     <?= $block->getFinalUnitPriceInclTaxHtml() ?>
-                 </span>
-             <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
-index d9bd79e65a1..769e9e68e3a 100644
---- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
-+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
- /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
-@@ -13,50 +12,50 @@
- $_item = $block->getItem();
- ?>
- 
--<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
-+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
-+    <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
- 
- 
--    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-         <br />
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-             <small>
--                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
-+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                    <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
-                 <?php endforeach; ?>
-             </small>
-         <?php endif; ?>
- 
--        <?php if ($block->displayFinalPrice()): ?>
-+        <?php if ($block->displayFinalPrice()) : ?>
-             <br />
--            <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
--                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
-+            <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
-+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
-             </span>
-         <?php endif; ?>
-     <?php endif; ?>
- <?php endif; ?>
- 
--<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
-+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
--    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-+    <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
-+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-         <br />
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-             <small>
--                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
-+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                    <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
-                 <?php endforeach; ?>
-             </small>
-         <?php endif; ?>
- 
--        <?php if ($block->displayFinalPrice()): ?>
--            <span class="nobr"><?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>:<br />
--                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
-+        <?php if ($block->displayFinalPrice()) : ?>
-+            <span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
-+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
-             </span>
-         <?php endif; ?>
-     <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
-index bda7b807c60..fceca17acf6 100644
---- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
-+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
-@@ -4,63 +4,61 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
- /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
--
--$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
-+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
- $_item = $block->getItem();
- ?>
- 
--<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
-     <?php $_rowTotalWithoutDiscount = $block->getRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount(); ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
-+    <?= /* @noEscape */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
- 
- 
--    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-         <br />
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-             <small>
--                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
-+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                    <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
-                 <?php endforeach; ?>
-             </small>
-         <?php endif; ?>
- 
--        <?php if ($block->displayFinalPrice()): ?>
-+        <?php if ($block->displayFinalPrice()) : ?>
-             <br />
--            <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
--                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount()) ?>
-+            <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
-+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount()) ?>
-             </span>
-         <?php endif; ?>
-     <?php endif; ?>
- <?php endif; ?>
- 
- 
--<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
-+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
-     <?php endif; ?>
-     <?php $_incl = $block->getTotalAmount($_item); ?>
--    <?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_incl)) ?>
--    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-+    <?= /* @noEscape */ $block->formatPrice(max(0, $_incl)) ?>
-+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-         <br />
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-             <small>
--                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
-+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                    <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
-                 <?php endforeach; ?>
-             </small>
-         <?php endif; ?>
- 
--        <?php if ($block->displayFinalPrice()): ?>
--            <span class="nobr"><?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>:<br />
--                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax() - $_item->getTotalDiscountAmount()) ?>
-+        <?php if ($block->displayFinalPrice()) : ?>
-+            <span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
-+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax() - $_item->getTotalDiscountAmount()) ?>
-             </span>
-         <?php endif; ?>
-     <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
-index d56e0fc3ebb..362c88ecedd 100644
---- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
-+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
-@@ -4,8 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
- /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
-@@ -13,51 +12,51 @@
- $_item = $block->getItem();
- ?>
- 
--<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
-+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
-+    <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
- 
--    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-         <br />
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-             <small>
--                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?></span><br />
-+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                    <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?></span><br />
-                 <?php endforeach; ?>
-             </small>
-         <?php endif; ?>
- 
--        <?php if ($block->displayFinalPrice()): ?>
-+        <?php if ($block->displayFinalPrice()) : ?>
-             <br />
--            <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
--                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
-+            <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
-+                <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
-             </span>
-         <?php endif; ?>
-     <?php endif; ?>
- <?php endif; ?>
- 
- 
--<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
-+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
-+    <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
- 
--    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-         <br />
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-             <small>
--                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span><br />
-+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                    <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span><br />
-                 <?php endforeach; ?>
-             </small>
-         <?php endif; ?>
- 
--        <?php if ($block->displayFinalPrice()): ?>
--            <span class="nobr"><?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>:<br />
--                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
-+        <?php if ($block->displayFinalPrice()) : ?>
-+            <span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
-+                <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
-             </span>
-         <?php endif; ?>
-     <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
-index 01ecaca435d..1b772316408 100644
---- a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
-+++ b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
-@@ -4,32 +4,31 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
- /** @var $block \Magento\Weee\Block\Renderer\Weee\Tax */
- $data = ['fptAttribute' => [
--    'region' => $this->helper('Magento\Framework\Json\Helper\Data')->jsonDecode(
--        $this->helper('Magento\Directory\Helper\Data')->getRegionJson()
-+    'region' => $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode(
-+        $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson()
-     ),
-     'itemsData' => $block->getValues(),
-     'bundlePriceType' => '#price_type',
- ]];
- ?>
--<div id="attribute-<?= $block->getElement()->getHtmlId() ?>-container" class="field"
--     data-attribute-code="<?= $block->getElement()->getHtmlId() ?>"
--     data-mage-init="<?= $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data)) ?>">
--    <label class="label"><span><?= /* @escapeNotVerified */ $block->getElement()->getLabel() ?></span></label>
-+<div id="attribute-<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>-container" class="field"
-+     data-attribute-code="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>"
-+     data-mage-init="<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($data) ?>">
-+    <label class="label"><span><?= $block->escapeHtml($block->getElement()->getLabel()) ?></span></label>
- 
-     <div class="control">
-         <table class="data-table">
-             <thead>
-                 <tr>
--                    <th class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none;"<?php endif; ?>><?= /* @escapeNotVerified */ __('Website') ?></th>
--                    <th class="col-country required"><?= /* @escapeNotVerified */ __('Country/State') ?></th>
--                    <th class="col-tax required"><?= /* @escapeNotVerified */ __('Tax') ?></th>
--                    <th class="col-action"><?= /* @escapeNotVerified */ __('Action') ?></th>
-+                    <th class="col-website" <?php if (!$block->isMultiWebsites()) : ?>style="display: none;"<?php endif; ?>><?= $block->escapeHtml(__('Website')) ?></th>
-+                    <th class="col-country required"><?= $block->escapeHtml(__('Country/State')) ?></th>
-+                    <th class="col-tax required"><?= $block->escapeHtml(__('Tax')) ?></th>
-+                    <th class="col-action"><?= $block->escapeHtml(__('Action')) ?></th>
-                 </tr>
-             </thead>
-             <tfoot>
-@@ -44,41 +43,45 @@ $data = ['fptAttribute' => [
-             Hidden field below with attribute code id is necessary for jQuery validation plugin.
-             Validation message will be displayed after this field.
-         -->
--        <input type="hidden" name="<?= $block->getElement()->getHtmlId() ?>" id="<?= $block->getElement()->getHtmlId() ?>" disabled="disabled">
-+        <input type="hidden" name="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>" id="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>" disabled="disabled">
-     </div>
- 
-     <script data-role="row-template" type="text/x-magento-template">
--        <tr id="<?= $block->getElement()->getHtmlId() ?>_weee_tax_row_<%- data.index %>" data-role="fpt-item-row">
--            <td class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none"<?php endif; ?>>
--                <select id="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_website"
--                        name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][website_id]"
--                        class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> website required-entry" data-role="select-website">
--                    <?php foreach ($block->getWebsites() as $_websiteId => $_info): ?>
--                    <option value="<?= /* @escapeNotVerified */ $_websiteId ?>"><?= /* @escapeNotVerified */ $_info['name'] ?><?php if (!empty($_info['currency'])): ?>[<?= /* @escapeNotVerified */ $_info['currency'] ?>]<?php endif; ?></option>
-+        <?php
-+            $elementName = $block->escapeHtmlAttr($block->getElement()->getName());
-+            $elementClass = $block->escapeHtmlAttr($block->getElement()->getClass());
-+        ?>
-+        <tr id="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>_weee_tax_row_<%- data.index %>" data-role="fpt-item-row">
-+            <td class="col-website" <?php if (!$block->isMultiWebsites()) : ?>style="display: none"<?php endif; ?>>
-+                <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_website"
-+                        name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][website_id]"
-+                        class="<?= /* @noEscape */ $elementClass ?> website required-entry" data-role="select-website">
-+                    <?php foreach ($block->getWebsites() as $_websiteId => $_info) : ?>
-+                    <option value="<?= /* @noEscape */ $_websiteId ?>"><?= $block->escapeHtml($_info['name']) ?><?php if (!empty($_info['currency'])) : ?>[<?= /* @noEscape */ $_info['currency'] ?>]<?php endif; ?></option>
-                     <?php endforeach ?>
-                 </select>
-             </td>
-             <td class="col-country">
--                <select id="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_country"
--                        name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][country]"
--                        class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> country required-entry" data-role="select-country">
--                    <?php foreach ($block->getCountries() as $_country): ?>
--                    <option value="<?= /* @escapeNotVerified */ $_country['value'] ?>"><?= /* @escapeNotVerified */ htmlspecialchars($_country['label']) ?></option>
-+                <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_country"
-+                        name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][country]"
-+                        class="<?= /* @noEscape */ $elementClass ?> country required-entry" data-role="select-country">
-+                    <?php foreach ($block->getCountries() as $_country) : ?>
-+                    <option value="<?= $block->escapeHtmlAttr($_country['value']) ?>"><?= $block->escapeHtml($_country['label']) ?></option>
-                     <?php endforeach ?>
-                 </select>
--                <select id="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_state"
--                        name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][state]"
--                        class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> state" disabled="" data-role="select-state">
-+                <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_state"
-+                        name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][state]"
-+                        class="<?= /* @noEscape */ $elementClass ?> state" disabled="" data-role="select-state">
-                     <option value="0">*</option>
-                 </select>
-             </td>
-             <td class="col-tax">
--                <input name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][price]"
--                       class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> required-entry validate-greater-than-zero"
-+                <input name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][price]"
-+                       class="<?= /* @noEscape */ $elementClass ?> required-entry validate-greater-than-zero"
-                        type="text" value="<%- data.value %>"/>
-             </td>
-             <td class="col-action">
--                <input name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][delete]" class="delete" type="hidden" value="" data-role="delete-fpt-item"/>
-+                <input name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][delete]" class="delete" type="hidden" value="" data-role="delete-fpt-item"/>
-                 <?= $block->getChildHtml('delete_button') ?>
-             </td>
-         </tr>
-diff --git a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
-index c05d48cab6a..a2b5ad4f196 100644
---- a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
-+++ b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- 
- <?php
-@@ -18,34 +15,37 @@ $taxDisplay = $block->getTaxDisplayConfig();
- $priceDisplay = $block->isPriceIncludesTax();
- ?>
- 
--<?php if ($block->showInclDescr() || $block->showExclDescrIncl()): // incl. + weee ||  excl. + weee + final ?>
--    <?php foreach ($block->getWeeeTaxAttributes() as $weeeTaxAttribute): ?>
--        <?php if ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_INCLUDING_TAX): ?>
-+<?php if ($block->showInclDescr() || $block->showExclDescrIncl()) : // incl. + weee ||  excl. + weee + final ?>
-+    <?php foreach ($block->getWeeeTaxAttributes() as $weeeTaxAttribute) : ?>
-+        <?php
-+            $attributeName = $block->escapeHtmlAttr($block->renderWeeeTaxAttributeName($weeeTaxAttribute));
-+        ?>
-+        <?php if ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_INCLUDING_TAX) : ?>
-             <span class="weee"
-                   data-price-type="weee"
--                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) ?>">
--                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
--        <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_EXCLUDING_TAX): ?>
-+                  data-label="<?= /* @noEscape */ $attributeName ?>">
-+                            <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
-+        <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_EXCLUDING_TAX) : ?>
-             <span class="weee"
-                   data-price-type="weee"
--                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) ?>">
--                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
--        <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_BOTH): ?>
-+                  data-label="<?= /* @noEscape */ $attributeName ?>">
-+                            <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
-+        <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_BOTH) : ?>
-             <span class="weee"
-                   data-price-type="weee"
--                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' Incl. Tax' ?>">
--                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
-+                  data-label="<?= /* @noEscape */ $attributeName . ' ' . $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-+                            <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
-             <span class="weee"
-                   data-price-type="weee"
--                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' Excl. Tax' ?>">
--                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
-+                  data-label="<?= /* @noEscape */ $attributeName . ' ' . $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
-+                            <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
-         <?php endif; ?>
-     <?php endforeach; ?>
- <?php endif; ?>
- 
--<?php if ($block->showExclDescrIncl()): // excl. + weee + final ?>
-+<?php if ($block->showExclDescrIncl()) : // excl. + weee + final ?>
-     <span class="price-final price-final_price"
-           data-price-type="weeePrice"
--          data-price-amount="<?= /* @escapeNotVerified */ $block->getRawFinalAmount() ?>"
--          data-label="<?= /* @escapeNotVerified */ __('Final Price') ?>"><?= /* @escapeNotVerified */ $block->getFinalAmount() ?></span>
-+          data-price-amount="<?= /* @noEscape */ $block->getRawFinalAmount() ?>"
-+          data-label="<?= $block->escapeHtmlAttr(__('Final Price')) ?>"><?= /* @noEscape */ $block->getFinalAmount() ?></span>
- <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/frontend/requirejs-config.js b/app/code/Magento/Weee/view/frontend/requirejs-config.js
-index 49dfb6b9d46..94c59da6521 100644
---- a/app/code/Magento/Weee/view/frontend/requirejs-config.js
-+++ b/app/code/Magento/Weee/view/frontend/requirejs-config.js
-@@ -6,7 +6,8 @@
- var config = {
-     map: {
-         '*': {
--            'taxToggle': 'Magento_Weee/tax-toggle'
-+            'taxToggle': 'Magento_Weee/js/tax-toggle',
-+            'Magento_Weee/tax-toggle': 'Magento_Weee/js/tax-toggle'
-         }
-     }
- };
-diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
-index 9c7a77c54a3..0cd1ca80579 100644
---- a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
-+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
-@@ -4,7 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
- 
-@@ -15,30 +15,30 @@ $originalZone = $block->getZone();
- $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
- ?>
- 
--<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
--    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
--    <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
-+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-         <span class="minicart-tax-total">
--    <?php else: ?>
-+    <?php else : ?>
-         <span class="minicart-price">
-     <?php endif; ?>
--        <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
-+        <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
-         </span>
- 
--    <?php if ($block->displayPriceWithWeeeDetails()): ?>
--        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-             <span class="minicart-tax-info">
--            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
--                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
--                    <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
-+            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
-+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
-+                    <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
-                 </span>
-             <?php endforeach; ?>
-             </span>
- 
--            <?php if ($block->displayFinalPrice()): ?>
-+            <?php if ($block->displayFinalPrice()) : ?>
-                 <span class="minicart-tax-total">
--                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
--                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
-+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
-+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
-                     </span>
-                 </span>
-             <?php endif; ?>
-@@ -47,30 +47,30 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
-     </span>
- <?php endif; ?>
- 
--<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
--    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
--    <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
-+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
-+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-         <span class="minicart-tax-total">
--    <?php else: ?>
-+    <?php else : ?>
-         <span class="minicart-price">
-     <?php endif; ?>
--        <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
-+        <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
-         </span>
- 
--    <?php if ($block->displayPriceWithWeeeDetails()): ?>
--        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-             <span class="minicart-tax-info">
--            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
--                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
--                    <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?>
-+            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
-+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
-+                    <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
-                 </span>
-             <?php endforeach; ?>
-             </span>
- 
--            <?php if ($block->displayFinalPrice()): ?>
-+            <?php if ($block->displayFinalPrice()) : ?>
-                 <span class="minicart-tax-total">
--                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
--                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
-+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
-+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
-                     </span>
-                 </span>
-             <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
-index bc63a5eff64..15abae5c889 100644
---- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
-+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
-@@ -4,33 +4,33 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
- 
- $_item = $block->getItem();
- ?>
--<?php if ($block->displayPriceWithWeeeDetails()): ?>
--    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
--<?php else: ?>
-+<?php if ($block->displayPriceWithWeeeDetails()) : ?>
-+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
-+<?php else : ?>
-     <span class="cart-price">
- <?php endif; ?>
--<?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
-+<?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
-     </span>
- 
--<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
--    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display: none;">
--    <?php if ($block->displayPriceWithWeeeDetails()): ?>
--        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--            <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?></span>
-+<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-+    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $_item->getId() ?>" style="display: none;">
-+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-+        <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+            <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span>
-         <?php endforeach; ?>
-     <?php endif; ?>
-     </span>
- 
--    <?php if ($block->displayFinalPrice()): ?>
--        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
--            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total') ?>">
--                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
-+    <?php if ($block->displayFinalPrice()) : ?>
-+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
-+            <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
-+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
-             </span>
-         </span>
-     <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
-index a85904e197b..b848698b8b8 100644
---- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
-+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
-@@ -4,36 +4,36 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
- 
- $_item = $block->getItem();
- /** @var $_weeeHelper \Magento\Weee\Helper\Data */
--$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
-+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
- ?>
- <?php $_incl = $_item->getRowTotalInclTax(); ?>
--<?php if ($block->displayPriceWithWeeeDetails()): ?>
--    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
--<?php else: ?>
-+<?php if ($block->displayPriceWithWeeeDetails()) : ?>
-+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
-+<?php else : ?>
-     <span class="cart-price">
- <?php endif; ?>
--<?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
-+<?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
-     </span>
- 
--<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
--    <span class="cart-tax-info" id="subtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display: none;">
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
--            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span>
-+<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-+    <span class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $_item->getId() ?>" style="display: none;">
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-+            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span>
-             <?php endforeach; ?>
-         <?php endif; ?>
-     </span>
- 
--    <?php if ($block->displayFinalPrice()): ?>
--        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
--            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>">
--                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
-+    <?php if ($block->displayFinalPrice()) : ?>
-+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
-+            <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
-+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
-             </span>
-         </span>
-     <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
-index dc1d22ff3b0..a485de90c87 100644
---- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
-+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
-@@ -4,34 +4,33 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
- 
- $_item = $block->getItem();
- ?>
--<?php if ($block->displayPriceWithWeeeDetails()): ?>
--    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
--<?php else: ?>
-+<?php if ($block->displayPriceWithWeeeDetails()) : ?>
-+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
-+<?php else : ?>
-     <span class="cart-price">
- <?php endif; ?>
- 
--<?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
-+<?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
-     </span>
--
--<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
--    <span class="cart-tax-info" id="eunit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display:none;">
--    <?php if ($block->displayPriceWithWeeeDetails()): ?>
--        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--            <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?></span>
-+<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-+    <span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $_item->getId() ?>" style="display:none;">
-+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-+        <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+            <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?></span>
-         <?php endforeach; ?>
-     <?php endif; ?>
-     </span>
- 
--    <?php if ($block->displayFinalPrice()): ?>
--        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
--            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total') ?>">
--                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
-+    <?php if ($block->displayFinalPrice()) : ?>
-+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
-+            <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
-+                <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
-             </span>
-         </span>
-     <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
-index 3b7c2f530d3..0dada610e18 100644
---- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
-+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
-@@ -4,37 +4,37 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
- 
- $_item = $block->getItem();
- /** @var $_weeeHelper \Magento\Weee\Helper\Data */
--$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
-+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
- ?>
- <?php $_incl = $_item->getPriceInclTax(); ?>
--<?php if ($block->displayPriceWithWeeeDetails()): ?>
--    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
--<?php else: ?>
-+<?php if ($block->displayPriceWithWeeeDetails()) : ?>
-+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
-+<?php else : ?>
-     <span class="cart-price">
- <?php endif; ?>
- 
--<?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
-+<?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
-     </span>
- 
--<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
--    <span class="cart-tax-info" id="unit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display: none;">
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
--            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span>
-+<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-+    <span class="cart-tax-info" id="unit-item-tax-details<?= (int) $_item->getId() ?>" style="display: none;">
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-+            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span>
-             <?php endforeach; ?>
-         <?php endif; ?>
-     </span>
- 
--    <?php if ($block->displayFinalPrice()): ?>
--        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
--            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>">
--                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
-+    <?php if ($block->displayFinalPrice()) : ?>
-+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
-+            <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
-+                <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
-             </span>
-         </span>
-     <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
-index bd0eefd9d2b..edcf73d2f95 100644
---- a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
-+++ b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
-@@ -4,61 +4,60 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- ?>
- <?php
- /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
- 
- /** @var $_weeeHelper \Magento\Weee\Helper\Data */
--$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
-+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
- 
- $_item = $block->getItem();
- /** @var \Magento\Sales\Model\Order $_order */
- $_order = $_item->getOrder();
- ?>
- 
--<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <span class="label"><?= /* @escapeNotVerified */  __('Excl. Tax') ?>:</span>
-+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <span class="label"><?=  $block->escapeHtml(__('Excl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?= /* @escapeNotVerified */  $_order->formatPrice($block->getRowDisplayPriceExclTax()) ?>
-+    <?= /* @noEscape */  $_order->formatPrice($block->getRowDisplayPriceExclTax()) ?>
- 
--    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-         <br />
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-             <small>
--                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                    <span class="nobr"><?= /* @escapeNotVerified */  $tax['title'] ?>: <?= /* @escapeNotVerified */  $_order->formatPrice($tax['row_amount'], true, true) ?></span><br />
-+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                    <span class="nobr"><?=  $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */  $_order->formatPrice($tax['row_amount'], true, true) ?></span><br />
-                 <?php endforeach; ?>
-             </small>
-         <?php endif; ?>
- 
--        <?php if ($block->displayFinalPrice()): ?>
-+        <?php if ($block->displayFinalPrice()) : ?>
-             <br />
--            <span class="nobr"><?= /* @escapeNotVerified */  __('Total') ?>:<br /> <?= /* @escapeNotVerified */  $_order->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?></span>
-+            <span class="nobr"><?=  $block->escapeHtml(__('Total')) ?>:<br /> <?= /* @noEscape */  $_order->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?></span>
-         <?php endif; ?>
-     <?php endif; ?>
- <?php endif; ?>
- 
- 
--<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
--    <?php if ($block->displayBothPrices()): ?>
--        <br /><span class="label"><?= /* @escapeNotVerified */  __('Incl. Tax') ?>:</span>
-+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
-+    <?php if ($block->displayBothPrices()) : ?>
-+        <br /><span class="label"><?=  $block->escapeHtml(__('Incl. Tax')) ?>:</span>
-     <?php endif; ?>
--    <?= /* @escapeNotVerified */  $_order->formatPrice($block->getRowDisplayPriceInclTax()) ?>
--    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-+    <?= /* @noEscape */  $_order->formatPrice($block->getRowDisplayPriceInclTax()) ?>
-+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-         <br />
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-             <small>
--                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
--                    <span class="nobr"><?= /* @escapeNotVerified */  $tax['title'] ?>: <?= /* @escapeNotVerified */  $_order->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
-+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-+                    <span class="nobr"><?=  $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */  $_order->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
-                 <?php endforeach; ?>
-             </small>
-         <?php endif; ?>
- 
--        <?php if ($block->displayFinalPrice()): ?>
--            <span class="nobr"><?= /* @escapeNotVerified */  __('Total Incl. Tax') ?>:<br /> <?= /* @escapeNotVerified */  $_order->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?></span>
-+        <?php if ($block->displayFinalPrice()) : ?>
-+            <span class="nobr"><?=  $block->escapeHtml(__('Total Incl. Tax')) ?>:<br /> <?= /* @noEscape */  $_order->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?></span>
-         <?php endif; ?>
-     <?php endif; ?>
- <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
-index dc128902ef4..37aa8528714 100644
---- a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
-+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
-@@ -4,37 +4,37 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
- 
- $item = $block->getItem();
- ?>
--<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$item->getNoSubtotal()): ?>
--    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$item->getNoSubtotal()) : ?>
-+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-             <span class="cart-tax-total"
--                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
--        <?php else: ?>
-+                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
-+        <?php else : ?>
-             <span class="cart-price">
-         <?php endif; ?>
--            <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
-+            <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
-             </span>
- 
--        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
--            <div class="cart-tax-info" id="subtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>" style="display: none;">
--                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
--                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
--                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
-+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-+            <div class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $item->getId() ?>" style="display: none;">
-+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
-+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
-+                        <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
-                     </span>
-                 <?php endforeach; ?>
-             </div>
- 
--            <?php if ($block->displayFinalPrice()): ?>
-+            <?php if ($block->displayFinalPrice()) : ?>
-                 <span class="cart-tax-total"
--                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
--                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
--                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
-+                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
-+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
-+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
-                     </span>
-                 </span>
-             <?php endif; ?>
-@@ -42,32 +42,32 @@ $item = $block->getItem();
-     </span>
- <?php endif; ?>
- 
--<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
--    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
-+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-             <span class="cart-tax-total"
--                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
--        <?php else: ?>
-+                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
-+        <?php else : ?>
-             <span class="cart-price">
-         <?php endif; ?>
--                <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
-+                <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
-             </span>
- 
--        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
--            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"
-+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-+            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $item->getId() ?>"
-                 style="display: none;">
--                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
--                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
--                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?>
-+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
-+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
-+                        <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?>
-                     </span>
-                 <?php endforeach; ?>
-             </span>
- 
--            <?php if ($block->displayFinalPrice()): ?>
-+            <?php if ($block->displayFinalPrice()) : ?>
-                 <span class="cart-tax-total"
--                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
--                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
--                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
-+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
-+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
-+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
-                     </span>
-                 </span>
-             <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
-index 03c050e0a0b..46d16ad13ea 100644
---- a/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
-+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
-@@ -4,10 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
- $_item = $block->getItem();
- ?>
- <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
--<?= /* @escapeNotVerified */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
-+<?= /* @noEscape */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
-diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
-index 575a0dd6c9a..4e62409ad00 100644
---- a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
-+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
-@@ -4,37 +4,37 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
-+// phpcs:disable Magento2.Templates.ThisInTemplate
- 
- /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
- 
- $item = $block->getItem();
- ?>
--<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
--    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
-+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-             <span class="cart-tax-total"
--                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
--        <?php else: ?>
-+                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $item->getId() ?>"}}'>
-+        <?php else : ?>
-             <span class="cart-price">
-         <?php endif; ?>
--            <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
-+            <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
-             </span>
- 
--        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
--            <span class="cart-tax-info" id="unit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>" style="display: none;">
--                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
--                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
--                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
-+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-+            <span class="cart-tax-info" id="unit-item-tax-details<?= (int) $item->getId() ?>" style="display: none;">
-+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
-+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
-+                        <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
-                     </span>
-                 <?php endforeach; ?>
-             </span>
- 
--            <?php if ($block->displayFinalPrice()): ?>
-+            <?php if ($block->displayFinalPrice()) : ?>
-                 <span class="cart-tax-total"
--                    data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
--                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
--                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
-+                    data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $item->getId() ?>"}}'>
-+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
-+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
-                     </span>
-                 </span>
-             <?php endif; ?>
-@@ -42,32 +42,32 @@ $item = $block->getItem();
-     </span>
- <?php endif; ?>
- 
--<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
--    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
--        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
-+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
-+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-             <span class="cart-tax-total"
--                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
--        <?php else: ?>
-+                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $item->getId() ?>"}}'>
-+        <?php else : ?>
-             <span class="cart-price">
-         <?php endif; ?>
--                <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
-+                <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
-             </span>
- 
--        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
--            <span class="cart-tax-info" id="eunit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"
-+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-+            <span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $item->getId() ?>"
-                 style="display: none;">
--                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
--                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
--                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?>
-+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
-+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
-+                        <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
-                     </span>
-                 <?php endforeach; ?>
-             </span>
- 
--            <?php if ($block->displayFinalPrice()): ?>
-+            <?php if ($block->displayFinalPrice()) : ?>
-                 <span class="cart-tax-total"
--                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
--                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
--                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
-+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $item->getId() ?>"}}'>
-+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
-+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
-                     </span>
-                 </span>
-             <?php endif; ?>
-diff --git a/app/code/Magento/Weee/view/frontend/web/tax-toggle.js b/app/code/Magento/Weee/view/frontend/web/js/tax-toggle.js
-similarity index 100%
-rename from app/code/Magento/Weee/view/frontend/web/tax-toggle.js
-rename to app/code/Magento/Weee/view/frontend/web/js/tax-toggle.js
-diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget.php b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
-index e4854415d75..dad318f163b 100644
---- a/app/code/Magento/Widget/Block/Adminhtml/Widget.php
-+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
-@@ -15,7 +15,7 @@ namespace Magento\Widget\Block\Adminhtml;
- class Widget extends \Magento\Backend\Block\Widget\Form\Container
- {
-     /**
--     * @return void
-+     * @inheritdoc
-      */
-     protected function _construct()
-     {
-@@ -40,13 +40,16 @@ class Widget extends \Magento\Backend\Block\Widget\Form\Container
-         $this->buttonList->update('reset', 'label', __('Cancel'));
-         $this->buttonList->update('reset', 'onclick', 'wWidget.closeModal()');
- 
--        $this->_formScripts[] = 'require(["mage/adminhtml/wysiwyg/widget"],'
--            . ' function(){wWidget = new WysiwygWidget.Widget('
--            . '"widget_options_form", "select_widget_type", "widget_options", "'
--            . $this->getUrl(
--                'adminhtml/*/loadOptions'
--            ) . '", "' . $this->getRequest()->getParam(
--                'widget_target_id'
--            ) . '");});';
-+        $this->_formScripts[] = <<<EOJS
-+require(['mage/adminhtml/wysiwyg/widget'], function() {
-+    wWidget = new WysiwygWidget.Widget(
-+        'widget_options_form',
-+        'select_widget_type',
-+        'widget_options',
-+        '{$this->getUrl('adminhtml/*/loadOptions')}',
-+        '{$this->escapeJs($this->getRequest()->getParam('widget_target_id'))}'
-+    );
-+});
-+EOJS;
-     }
- }
-diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Catalog/Category/Chooser.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Catalog/Category/Chooser.php
-index 7e6ba878603..230598a7e26 100644
---- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Catalog/Category/Chooser.php
-+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Catalog/Category/Chooser.php
-@@ -3,14 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+namespace Magento\Widget\Block\Adminhtml\Widget\Catalog\Category;
- 
- /**
-  * Category chooser for widget's layout updates
-- *
-- * @author     Magento Core Team <core@magentocommerce.com>
-  */
--namespace Magento\Widget\Block\Adminhtml\Widget\Catalog\Category;
--
- class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser
- {
-     /**
-@@ -18,7 +15,7 @@ class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser
-      *
-      * @param \Magento\Framework\Data\Tree\Node|array $node
-      * @param int $level
--     * @return string
-+     * @return array
-      */
-     protected function _getNodeJson($node, $level = 0)
-     {
-diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
-index d813e944373..45b3056eac6 100644
---- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
-+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
-@@ -11,6 +11,9 @@
-  */
- namespace Magento\Widget\Block\Adminhtml\Widget;
- 
-+/**
-+ * Chooser widget block.
-+ */
- class Chooser extends \Magento\Backend\Block\Template
- {
-     /**
-@@ -180,7 +183,7 @@ class Chooser extends \Magento\Backend\Block\Template
-             <label class="widget-option-label" id="' .
-             $chooserId .
-             'label">' .
--            ($this->getLabel() ? $this->getLabel() : __(
-+            ($this->getLabel() ? $this->escapeHtml($this->getLabel()) : __(
-                 'Not Selected'
-             )) .
-             '</label>
-diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php
-index 82f5fd92c15..04447219464 100644
---- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php
-+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php
-@@ -11,6 +11,9 @@
-  */
- namespace Magento\Widget\Block\Adminhtml\Widget;
- 
-+/**
-+ * Widget Form Block class
-+ */
- class Form extends \Magento\Backend\Block\Widget\Form\Generic
- {
-     /**
-@@ -47,8 +50,13 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
-         $form = $this->_formFactory->create();
- 
-         // Add messages container to fieldset
--        $fieldset = $form->addFieldset('base_fieldset', ['legend' => '<div data-role="messages"></div>',
--            'comment' => __('Inserting a widget does not create a widget instance.')]);
-+        $fieldset = $form->addFieldset(
-+            'base_fieldset',
-+            [
-+                'before_element_html' => '<div data-role="messages"></div>',
-+                'comment' => __('Inserting a widget does not create a widget instance.'),
-+            ]
-+        );
- 
-         $fieldset->addField(
-             'select_widget_type',
-diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
-index cc2af4996d5..32bae10c801 100644
---- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
-+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
-@@ -91,7 +91,7 @@ class Options extends \Magento\Backend\Block\Widget\Form\Generic
-         if ($this->_getData('main_fieldset') instanceof \Magento\Framework\Data\Form\Element\Fieldset) {
-             return $this->_getData('main_fieldset');
-         }
--        $mainFieldsetHtmlId = 'options_fieldset' . md5($this->getWidgetType());
-+        $mainFieldsetHtmlId = 'options_fieldset' . hash('sha256', $this->getWidgetType());
-         $this->setMainFieldsetHtmlId($mainFieldsetHtmlId);
-         $fieldset = $this->getForm()->addFieldset(
-             $mainFieldsetHtmlId,
-@@ -141,7 +141,6 @@ class Options extends \Magento\Backend\Block\Widget\Form\Generic
-     {
-         $form = $this->getForm();
-         $fieldset = $this->getMainFieldset();
--        //$form->getElement('options_fieldset');
- 
-         // prepare element data with values (either from request of from default values)
-         $fieldName = $parameter->getKey();
-@@ -166,9 +165,13 @@ class Options extends \Magento\Backend\Block\Widget\Form\Generic
- 
-         if (is_array($data['value'])) {
-             foreach ($data['value'] as &$value) {
--                $value = html_entity_decode($value);
-+                if (is_string($value)) {
-+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+                    $value = html_entity_decode($value);
-+                }
-             }
-         } else {
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             $data['value'] = html_entity_decode($data['value']);
-         }
- 
-diff --git a/app/code/Magento/Widget/Block/BlockInterface.php b/app/code/Magento/Widget/Block/BlockInterface.php
-index ddf810f433f..4f795d949b8 100644
---- a/app/code/Magento/Widget/Block/BlockInterface.php
-+++ b/app/code/Magento/Widget/Block/BlockInterface.php
-@@ -19,6 +19,7 @@ interface BlockInterface
- {
-     /**
-      * Add data to the widget.
-+     *
-      * Retains previous data in the widget.
-      *
-      * @param array $arr
-@@ -35,7 +36,7 @@ interface BlockInterface
-      *
-      * @param string|array $key
-      * @param mixed $value
--     * @return \Magento\Framework\DataObject
-+     * @return $this
-      */
-     public function setData($key, $value = null);
- }
-diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php
-index d9ef20aa90e..0b9431f717e 100644
---- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php
-+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Widget\Controller\Adminhtml\Widget;
- 
--class BuildWidget extends \Magento\Backend\App\Action
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class BuildWidget extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php
-index 61e44fe00db..e7454faf925 100644
---- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php
-+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Widget\Controller\Adminhtml\Widget;
- 
--class Index extends \Magento\Backend\App\Action
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class Index extends \Magento\Backend\App\Action implements HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php
-index 40ade57f6a9..50f3addaf7c 100644
---- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php
-+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Widget\Controller\Adminhtml\Widget\Instance;
- 
--class Index extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
-+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-+
-+class Index extends \Magento\Widget\Controller\Adminhtml\Widget\Instance implements HttpGetActionInterface
- {
-     /**
-      * Widget Instances Grid
-diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
-index b5d31dc10be..dc137365498 100644
---- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
-+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
-@@ -6,7 +6,9 @@
-  */
- namespace Magento\Widget\Controller\Adminhtml\Widget\Instance;
- 
--class Save extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-+
-+class Save extends \Magento\Widget\Controller\Adminhtml\Widget\Instance implements HttpPostActionInterface
- {
-     /**
-      * Save action
-diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php
-index 054019079eb..03d9d103113 100644
---- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php
-+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php
-@@ -6,9 +6,11 @@
-  */
- namespace Magento\Widget\Controller\Adminhtml\Widget;
- 
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
- use Magento\Framework\App\ObjectManager;
- 
--class LoadOptions extends \Magento\Backend\App\Action
-+class LoadOptions extends \Magento\Backend\App\Action implements HttpGetActionInterface, HttpPostActionInterface
- {
-     /**
-      * Authorization level of a basic admin session
-diff --git a/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php b/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php
-index d7e3bf94f54..6c0aef9e671 100644
---- a/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php
-+++ b/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php
-@@ -51,7 +51,9 @@ class Update extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-      * @param string $handle
-      * @param \Magento\Framework\View\Design\ThemeInterface $theme
-      * @param \Magento\Framework\App\ScopeInterface $store
-+     *
-      * @return string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function fetchUpdatesByHandle(
-         $handle,
-@@ -69,14 +71,16 @@ class Update extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-                 $this->layoutUpdateCache[$cacheKey][$layout['handle']] .= $layout['xml'];
-             }
-         }
--        return isset($this->layoutUpdateCache[$cacheKey][$handle]) ? $this->layoutUpdateCache[$cacheKey][$handle] : '';
-+        return $this->layoutUpdateCache[$cacheKey][$handle] ?? '';
-     }
- 
-     /**
-      * Get select to fetch updates by handle
-      *
-      * @param bool $loadAllUpdates
-+     *
-      * @return \Magento\Framework\DB\Select
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function _getFetchUpdatesByHandleSelect($loadAllUpdates = false)
-     {
-diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
-index 7c3e8e467e0..c79334f67a9 100644
---- a/app/code/Magento/Widget/Model/Template/Filter.php
-+++ b/app/code/Magento/Widget/Model/Template/Filter.php
-@@ -91,6 +91,10 @@ class Filter extends \Magento\Cms\Model\Template\Filter
-             $name = $params['name'];
-         }
- 
-+        if (isset($this->_storeId) && !isset($params['store_id'])) {
-+            $params['store_id'] = $this->_storeId;
-+        }
-+
-         // validate required parameter type or id
-         if (!empty($params['type'])) {
-             $type = $params['type'];
-diff --git a/app/code/Magento/Widget/Model/Widget.php b/app/code/Magento/Widget/Model/Widget.php
-index 085e6ec3b2d..d07e84186b2 100644
---- a/app/code/Magento/Widget/Model/Widget.php
-+++ b/app/code/Magento/Widget/Model/Widget.php
-@@ -84,6 +84,8 @@ class Widget
-     }
- 
-     /**
-+     * Get math random
-+     *
-      * @return \Magento\Framework\Math\Random
-      *
-      * @deprecated 100.1.0
-@@ -149,8 +151,8 @@ class Widget
-         $widget = $this->getAsCanonicalArray($widget);
- 
-         // Save all nodes to object data
--        $object->setType($type);
-         $object->setData($widget);
-+        $object->setType($type);
- 
-         // Correct widget parameters and convert its data to objects
-         $newParams = $this->prepareWidgetParameters($object);
-@@ -246,17 +248,13 @@ class Widget
-         $result = $widgets;
- 
-         // filter widgets by params
--        if (is_array($filters) && count($filters) > 0) {
-+        if (is_array($filters) && !empty($filters)) {
-             foreach ($widgets as $code => $widget) {
--                try {
--                    foreach ($filters as $field => $value) {
--                        if (!isset($widget[$field]) || (string)$widget[$field] != $value) {
--                            throw new \Exception();
--                        }
-+                foreach ($filters as $field => $value) {
-+                    if (!isset($widget[$field]) || (string)$widget[$field] != $value) {
-+                        unset($result[$code]);
-+                        break;
-                     }
--                } catch (\Exception $e) {
--                    unset($result[$code]);
--                    continue;
-                 }
-             }
-         }
-@@ -315,14 +313,12 @@ class Widget
-                 }
-             }
-             if (isset($value)) {
--                $directive .= sprintf(' %s="%s"', $name, $this->escaper->escapeQuote($value));
-+                $directive .= sprintf(' %s="%s"', $name, $this->escaper->escapeHtmlAttr($value, false));
-             }
-         }
- 
-         $directive .= $this->getWidgetPageVarName($params);
- 
--        $directive .= sprintf(' type_name="%s"', $widget['name']);
--
-         $directive .= '}}';
- 
-         if ($asIs) {
-@@ -339,6 +335,8 @@ class Widget
-     }
- 
-     /**
-+     * Get widget page varname
-+     *
-      * @param array $params
-      * @return string
-      * @throws \Magento\Framework\Exception\LocalizedException
-diff --git a/app/code/Magento/Widget/Model/Widget/Config.php b/app/code/Magento/Widget/Model/Widget/Config.php
-index 4f81ef33f47..00b055b35a6 100644
---- a/app/code/Magento/Widget/Model/Widget/Config.php
-+++ b/app/code/Magento/Widget/Model/Widget/Config.php
-@@ -120,6 +120,7 @@ class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
- 
-     /**
-      * Return url to error image
-+     *
-      * @return string
-      */
-     public function getErrorImageUrl()
-@@ -129,6 +130,7 @@ class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
- 
-     /**
-      * Return url to wysiwyg plugin
-+     *
-      * @return string
-      */
-     public function getWysiwygJsPluginSrc()
-@@ -157,7 +159,7 @@ class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
-             }
-         }
- 
--        if (count($skipped) > 0) {
-+        if (!empty($skipped)) {
-             $params['skip_widgets'] = $this->encodeWidgetsToQuery($skipped);
-         }
-         return $this->_backendUrl->getUrl('adminhtml/widget/index', $params);
-@@ -189,6 +191,8 @@ class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
-     }
- 
-     /**
-+     * Get available widgets.
-+     *
-      * @param \Magento\Framework\DataObject $config Editor element config
-      * @return array
-      */
-@@ -202,7 +206,7 @@ class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
-                 if (is_array($skipped) && in_array($widget['type'], $skipped)) {
-                     continue;
-                 }
--                $result[] = $widget['name']->getText();
-+                $result[$widget['type']] = $widget['name']->getText();
-             }
-         }
- 
-diff --git a/app/code/Magento/Widget/Model/Widget/Instance.php b/app/code/Magento/Widget/Model/Widget/Instance.php
-index afe7ef3766f..4ca126e659e 100644
---- a/app/code/Magento/Widget/Model/Widget/Instance.php
-+++ b/app/code/Magento/Widget/Model/Widget/Instance.php
-@@ -15,7 +15,7 @@ use Magento\Framework\Serialize\Serializer\Json;
-  * @method string getTitle()
-  * @method \Magento\Widget\Model\Widget\Instance setTitle(string $value)
-  * @method \Magento\Widget\Model\Widget\Instance setStoreIds(string $value)
-- * @method \Magento\Widget\Model\Widget\Instance setWidgetParameters(string $value)
-+ * @method \Magento\Widget\Model\Widget\Instance setWidgetParameters(string|array $value)
-  * @method int getSortOrder()
-  * @method \Magento\Widget\Model\Widget\Instance setSortOrder(int $value)
-  * @method \Magento\Widget\Model\Widget\Instance setThemeId(int $value)
-@@ -340,6 +340,7 @@ class Instance extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * Setter
-+     *
-      * Prepare widget type
-      *
-      * @param string $type
-@@ -353,6 +354,7 @@ class Instance extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * Getter
-+     *
-      * Prepare widget type
-      *
-      * @return string
-@@ -364,6 +366,7 @@ class Instance extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * Getter.
-+     *
-      * If not set return default
-      *
-      * @return string
-@@ -379,6 +382,7 @@ class Instance extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * Getter
-+     *
-      * Explode to array if string setted
-      *
-      * @return array
-@@ -393,6 +397,7 @@ class Instance extends \Magento\Framework\Model\AbstractModel
- 
-     /**
-      * Getter
-+     *
-      * Unserialize if serialized string setted
-      *
-      * @return array
-diff --git a/app/code/Magento/Widget/Setup/LayoutUpdateConverter.php b/app/code/Magento/Widget/Setup/LayoutUpdateConverter.php
-index 54c364dcc49..423d72236ae 100644
---- a/app/code/Magento/Widget/Setup/LayoutUpdateConverter.php
-+++ b/app/code/Magento/Widget/Setup/LayoutUpdateConverter.php
-@@ -8,6 +8,8 @@ namespace Magento\Widget\Setup;
- use Magento\Framework\Serialize\Serializer\Json;
- use Magento\Framework\Serialize\Serializer\Serialize;
- use Magento\Framework\Data\Wysiwyg\Normalizer;
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\DB\DataConverter\DataConversionException;
- use Magento\Framework\DB\DataConverter\SerializedToJson;
- 
-@@ -16,6 +18,11 @@ use Magento\Framework\DB\DataConverter\SerializedToJson;
-  */
- class LayoutUpdateConverter extends SerializedToJson
- {
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * @var Normalizer
-      */
-@@ -27,13 +34,18 @@ class LayoutUpdateConverter extends SerializedToJson
-      * @param Serialize $serialize
-      * @param Json $json
-      * @param Normalizer $normalizer
-+     * @param Escaper|null $escaper
-      */
-     public function __construct(
-         Serialize $serialize,
-         Json $json,
--        Normalizer $normalizer
-+        Normalizer $normalizer,
-+        Escaper $escaper = null
-     ) {
-         $this->normalizer = $normalizer;
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-         parent::__construct($serialize, $json);
-     }
- 
-@@ -85,7 +97,7 @@ class LayoutUpdateConverter extends SerializedToJson
-      */
-     protected function encodeJson($value)
-     {
--        return htmlspecialchars(
-+        return $this->escaper->escapeHtml(
-             $this->normalizer->replaceReservedCharacters(parent::encodeJson($value))
-         );
-     }
-diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateAndSaveWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateAndSaveWidgetActionGroup.xml
-new file mode 100644
-index 00000000000..2f144894111
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateAndSaveWidgetActionGroup.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateAndSaveWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
-+    </actionGroup>
-+</actionGroups>
-\ No newline at end of file
-diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
-new file mode 100644
-index 00000000000..969ab58b048
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
-@@ -0,0 +1,81 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+   <actionGroup name="AdminCreateWidgetActionGroup">
-+       <arguments>
-+           <argument name="widget"/>
-+       </arguments>
-+       <amOnPage url="{{AdminNewWidgetPage.url}}" stepKey="amOnAdminNewWidgetPage"/>
-+       <selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widget.type}}" stepKey="setWidgetType"/>
-+       <selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widget.design_theme}}" stepKey="setWidgetDesignTheme"/>
-+       <click selector="{{AdminNewWidgetSection.continue}}" stepKey="clickContinue"/>
-+       <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widget.name}}" stepKey="fillTitle"/>
-+       <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" userInput="{{widget.store_ids[0]}}" stepKey="setWidgetStoreIds"/>
-+       <click selector="{{AdminNewWidgetSection.addLayoutUpdate}}" stepKey="clickAddLayoutUpdate"/>
-+       <selectOption selector="{{AdminNewWidgetSection.selectDisplayOn}}" userInput="{{widget.display_on}}" stepKey="setDisplayOn"/>
-+       <waitForAjaxLoad stepKey="waitForLoad"/>
-+       <selectOption selector="{{AdminNewWidgetSection.selectContainer}}" userInput="{{widget.container}}" stepKey="setContainer"/>
-+       <waitForAjaxLoad stepKey="waitForPageLoad"/>
-+       <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-+       <click selector="{{AdminNewWidgetSection.widgetOptions}}" stepKey="clickWidgetOptions"/>
-+   </actionGroup>
-+
-+   <!--Create Product List Widget-->
-+   <actionGroup name="AdminCreateProductsListWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
-+       <click selector="{{AdminNewWidgetSection.addNewCondition}}" stepKey="clickAddNewCondition"/>
-+       <selectOption selector="{{AdminNewWidgetSection.selectCondition}}" userInput="{{widget.condition}}" stepKey="selectCondition"/>
-+       <waitForElement selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="waitRuleParameter"/>
-+       <click selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="clickRuleParameter"/>
-+       <click selector="{{AdminNewWidgetSection.openChooser}}" stepKey="clickChooser"/>
-+       <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
-+       <click selector="{{AdminNewWidgetSection.selectAll}}" stepKey="clickSelectAll"/>
-+       <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="clickApplyRuleParameter"/>
-+       <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
-+       <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
-+   </actionGroup>
-+
-+   <!--Create Dynamic Block Rotate Widget-->
-+   <actionGroup name="AdminCreateDynamicBlocksRotatorWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
-+       <selectOption selector="{{AdminNewWidgetSection.displayMode}}" userInput="{{widget.display_mode}}" stepKey="selectDisplayMode"/>
-+       <selectOption selector="{{AdminNewWidgetSection.restrictTypes}}" userInput="{{widget.restrict_type}}" stepKey="selectRestrictType"/>
-+       <click selector="{{AdminNewWidgetSection.saveAndContinue}}" stepKey="clickSaveWidget"/>
-+       <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
-+   </actionGroup>
-+
-+   <actionGroup name="AdminDeleteWidgetActionGroup">
-+       <arguments>
-+           <argument name="widget"/>
-+       </arguments>
-+       <amOnPage url="{{AdminWidgetsPage.url}}" stepKey="amOnAdmin"/>
-+       <waitForPageLoad stepKey="waitWidgetsLoad"/>
-+       <fillField selector="{{AdminWidgetsSection.widgetTitleSearch}}" userInput="{{widget.name}}" stepKey="fillTitle"/>
-+       <click selector="{{AdminWidgetsSection.searchButton}}" stepKey="clickContinue"/>
-+       <click selector="{{AdminWidgetsSection.searchResult}}" stepKey="clickSearchResult"/>
-+       <waitForPageLoad stepKey="waitForResultLoad"/>
-+       <click selector="{{AdminMainActionsSection.delete}}" stepKey="clickDelete"/>
-+       <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
-+       <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
-+       <waitForPageLoad stepKey="waitForDeleteLoad"/>
-+       <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been deleted" stepKey="seeSuccess"/>
-+   </actionGroup>
-+    <actionGroup name="AdminCreateProductLinkWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
-+        <arguments>
-+            <argument name="product"/>
-+        </arguments>
-+        <selectOption selector="{{AdminNewWidgetSection.selectTemplate}}" userInput="{{widget.template}}" after="waitForPageLoad" stepKey="setTemplate"/>
-+        <waitForAjaxLoad after="setTemplate" stepKey="waitForPageLoad2"/>
-+        <click selector="{{AdminNewWidgetSection.selectProduct}}" after="clickWidgetOptions" stepKey="clickSelectProduct"/>
-+        <fillField selector="{{AdminNewWidgetSelectProductPopupSection.filterBySku}}" userInput="{{product.sku}}" after="clickSelectProduct" stepKey="fillProductNameInFilter"/>
-+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" after="fillProductNameInFilter" stepKey="applyFilter"/>
-+        <click selector="{{AdminNewWidgetSelectProductPopupSection.firstRow}}" after="applyFilter" stepKey="selectProduct"/>
-+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
-+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminWidgetActionGroup.xml
-new file mode 100644
-index 00000000000..c303b7cc8e9
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminWidgetActionGroup.xml
-@@ -0,0 +1,44 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-+    <actionGroup name="AdminCreateWidgetWithBlockActionGroup">
-+    <arguments>
-+        <argument name="widget"/>
-+        <argument name="block" type="string"/>
-+    </arguments>
-+        <amOnPage url="{{AdminNewWidgetPage.url}}" stepKey="createWidgetPage"/>
-+        <selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widget.type}}" stepKey="selectWidgetType"/>
-+        <selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widget.designTheme}}" stepKey="selectWidgetDesignTheme"/>
-+        <click selector="{{AdminNewWidgetSection.continue}}" stepKey="continue"/>
-+        <waitForElement selector="{{AdminNewWidgetSection.widgetTitle}}" time="30" stepKey="waitForElement"/>
-+        <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widget.name}}" stepKey="fillWidgetTitle"/>
-+        <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" userInput="{{widget.store_id}}" stepKey="selectWidgetStoreView"/>
-+        <click selector="{{AdminNewWidgetSection.addLayoutUpdate}}" stepKey="clickAddLayoutUpdate"/>
-+        <waitForPageLoad stepKey="waitForLoad1"/>
-+        <scrollTo selector="{{AdminNewWidgetSection.selectDisplayOn}}" stepKey="scrollToElement" />
-+        <selectOption selector="{{AdminNewWidgetSection.selectDisplayOn}}" userInput="{{widget.display}}" stepKey="selectWidgetDisplayOn"/>
-+        <waitForElement selector="{{AdminNewWidgetSection.selectContainer}}" time="30" stepKey="waitForContainer"/>
-+        <selectOption selector="{{AdminNewWidgetSection.selectContainer}}" userInput="{{widget.container}}" stepKey="selectWidgetContainer"/>
-+        <scrollToTopOfPage stepKey="scrollToAddresses"/>
-+        <waitForAjaxLoad stepKey="waitForAjaxLoad1"/>
-+        <click selector="{{AdminNewWidgetSection.widgetOptions}}" stepKey="goToWidgetOptions"/>
-+        <waitForElement selector="{{AdminNewWidgetSection.widgetSelectBlock}}" time="60" stepKey="waitForSelectBlock"/>
-+        <click selector="{{AdminNewWidgetSection.widgetSelectBlock}}" stepKey="openSelectBlock"/>
-+        <waitForPageLoad stepKey="waitForLoadBlocks"/>
-+        <selectOption selector="{{AdminNewWidgetSection.blockStatus}}" userInput="Disable" stepKey="chooseStatus"/>
-+        <fillField selector="{{AdminNewWidgetSection.selectBlockTitle}}" userInput="{{block}}" stepKey="fillBlockTitle"/>
-+        <click selector="{{AdminNewWidgetSection.searchBlock}}" stepKey="searchBlock"/>
-+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
-+        <click selector="{{AdminNewWidgetSection.searchedBlock}}" stepKey="clickSearchedBlock"/>
-+        <waitForPageLoad stepKey="wait"/>
-+        <click selector="{{AdminNewWidgetSection.saveWidget}}" stepKey="saveWidget"/>
-+        <waitForPageLoad stepKey="waitForSaving"/>
-+        <see userInput="The widget instance has been saved." stepKey="seeSuccessMessage"/>
-+    </actionGroup>
-+</actionGroups>
-diff --git a/app/code/Magento/Widget/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Widget/Test/Mftf/Data/AdminMenuData.xml
-new file mode 100644
-index 00000000000..8fa652b8f73
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/Data/AdminMenuData.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="AdminMenuContentElementsWidgets">
-+        <data key="pageTitle">Widgets</data>
-+        <data key="title">Widgets</data>
-+        <data key="dataUiId">magento-widget-cms-widget-instance</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Widget/Test/Mftf/Data/WidgetData.xml b/app/code/Magento/Widget/Test/Mftf/Data/WidgetData.xml
-new file mode 100644
-index 00000000000..4c6e98aafd7
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/Data/WidgetData.xml
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="WidgetWithBlock" type="widget">
-+        <data key="type">CMS Static Block</data>
-+        <data key="designTheme">Magento Luma</data>
-+        <data key="name" unique="suffix">testName</data>
-+        <data key="store_id">All Store Views</data>
-+        <data key="display">All Pages</data>
-+        <data key="container">Page Top</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
-new file mode 100644
-index 00000000000..ffd2d025548
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
-@@ -0,0 +1,46 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-+    <entity name="ProductsListWidget" type="widget">
-+        <data key="type">Catalog Products List</data>
-+        <data key="design_theme">Magento Luma</data>
-+        <data key="name" unique="suffix">TestWidget</data>
-+        <array key="store_ids">
-+            <item>All Store Views</item>
-+        </array>
-+        <data key="condition">SKU</data>
-+        <data key="display_on">All Pages</data>
-+        <data key="container">Main Content Area</data>
-+    </entity>
-+    <entity name="DynamicBlocksRotatorWidget" type="widget">
-+        <data key="type">Dynamic Blocks Rotator</data>
-+        <data key="design_theme">Magento Luma</data>
-+        <data key="name" unique="suffix">TestBannerWidget</data>
-+        <array key="store_ids">
-+            <item>All Store Views</item>
-+        </array>
-+        <data key="condition">SKU</data>
-+        <data key="display_on">All Pages</data>
-+        <data key="container">Main Content Area</data>
-+        <data key="display_mode">Cart Price Rule Related</data>
-+        <data key="restrict_type">Header</data>
-+    </entity>
-+    <entity name="DefaultOrderBySKUWidget" type="widget">
-+        <data key="type">Order by SKU</data>
-+        <data key="design_theme">Magento Luma</data>
-+        <data key="name" unique="suffix">Test Widget</data>
-+        <array key="store_ids">
-+            <item>All Store Views</item>
-+        </array>
-+        <data key="sort_order">0</data>
-+        <data key="display_on">All Pages</data>
-+        <data key="container">Sidebar Main</data>
-+    </entity>
-+</entities>
-diff --git a/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml b/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
-new file mode 100644
-index 00000000000..d495a36f68d
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminNewWidgetPage" url="admin/widget_instance/new/" area="admin" module="Magento_Widget">
-+        <section name="AdminNewWidgetSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Widget/Test/Mftf/Page/AdminWidgetsPage.xml b/app/code/Magento/Widget/Test/Mftf/Page/AdminWidgetsPage.xml
-new file mode 100644
-index 00000000000..46209f9e5f0
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/Page/AdminWidgetsPage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="AdminWidgetsPage" url="admin/widget_instance/" area="admin" module="Magento_Widget">
-+        <section name="AdminWidgetsSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
-new file mode 100644
-index 00000000000..eebd6c10b50
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
-@@ -0,0 +1,39 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminNewWidgetSection">
-+        <element name="widgetType" type="select" selector="#code"/>
-+        <element name="widgetDesignTheme" type="select" selector="#theme_id"/>
-+        <element name="continue" type="button" selector="#continue_button"/>
-+        <element name="widgetTitle" type="input" selector="#title"/>
-+        <element name="widgetStoreIds" type="select" selector="#store_ids"/>
-+        <element name="addLayoutUpdate" type="button" selector=".action-default.scalable.action-add"/>
-+        <element name="selectDisplayOn" type="select" selector="#widget_instance[0][page_group]"/>
-+        <element name="selectContainer" type="select" selector="#all_pages_0>table>tbody>tr>td:nth-child(1)>div>div>select"/>
-+        <element name="selectTemplate" type="select" selector=".widget-layout-updates .block_template_container .select"/>
-+        <element name="widgetOptions" type="select" selector="#widget_instace_tabs_properties_section"/>
-+        <element name="addNewCondition" type="select" selector=".rule-param.rule-param-new-child"/>
-+        <element name="selectCondition" type="input" selector="#conditions__1__new_child"/>
-+        <element name="ruleParameter" type="select" selector="#conditions__1__children>li:nth-child(1)>span:nth-child(4)>a"/>
-+        <element name="setRuleParameter" type="input" selector="#conditions__1--1__value"/>
-+        <element name="applyParameter" type="button" selector=".rule-param-apply"/>
-+        <element name="openChooser" type="button" selector=".rule-chooser-trigger"/>
-+        <element name="selectAll" type="checkbox" selector=".admin__control-checkbox"/>
-+        <element name="widgetSelectBlock" type="button" selector="//button[@class='action-default scalable btn-chooser']"/>
-+        <element name="selectBlockTitle" type="input" selector="//input[@name='chooser_title']"/>
-+        <element name="searchBlock" type="button" selector="//div[@class='admin__filter-actions']/button[@title='Search']"/>
-+        <element name="blockStatus" type="select" selector="//select[@name='chooser_is_active']"/>
-+        <element name="searchedBlock" type="button" selector="//*[@class='magento-message']//tbody/tr/td[1]"/>
-+        <element name="saveWidget" type="select" selector="#save"/>
-+        <element name="displayMode" type="select" selector="select[id*='display_mode']"/>
-+        <element name="restrictTypes" type="select" selector="select[id*='types']"/>
-+        <element name="saveAndContinue" type="button" selector="#save_and_edit_button" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminWidgetsSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminWidgetsSection.xml
-new file mode 100644
-index 00000000000..f3282362d9a
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminWidgetsSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="AdminWidgetsSection">
-+        <element name="widgetTitleSearch" type="input" selector="#widgetInstanceGrid_filter_title"/>
-+        <element name="searchButton" type="button" selector=".action-default.scalable.action-secondary"/>
-+        <element name="searchResult" type="text" selector="#widgetInstanceGrid_table>tbody>tr:nth-child(1)"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml
-new file mode 100644
-index 00000000000..0e2f6cec73a
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontWidgetsSection">
-+        <element name="widgetProductsGrid" type="block" selector=".block.widget.block-products-list.grid"/>
-+        <element name="widgetProductName" type="text" selector=".product-item-name"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Widget/Test/Mftf/Test/AdminContentWidgetsNavigateMenuTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/AdminContentWidgetsNavigateMenuTest.xml
-new file mode 100644
-index 00000000000..f5af024ec1d
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/Test/AdminContentWidgetsNavigateMenuTest.xml
-@@ -0,0 +1,36 @@
-+<?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="AdminContentWidgetsNavigateMenuTest">
-+        <annotations>
-+            <features value="Widget"/>
-+            <stories value="Menu Navigation"/>
-+            <title value="Admin content widgets navigate menu test"/>
-+            <description value="Admin should be able to navigate to Content > Widgets"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MC-14147"/>
-+            <group value="menu"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-+        </before>
-+        <after>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentWidgetsPage">
-+            <argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
-+            <argument name="submenuUiId" value="{{AdminMenuContentElementsWidgets.dataUiId}}"/>
-+        </actionGroup>
-+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-+            <argument name="title" value="{{AdminMenuContentElementsWidgets.pageTitle}}"/>
-+        </actionGroup>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Widget/Test/Mftf/Test/NewProductsListWidgetTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/NewProductsListWidgetTest.xml
-new file mode 100644
-index 00000000000..2c4e2e70fec
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/Test/NewProductsListWidgetTest.xml
-@@ -0,0 +1,52 @@
-+<?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">
-+
-+    <!-- This test exists to serve as a base for extension for other tests -->
-+    <test name="NewProductsListWidgetTest">
-+        <annotations>
-+            <group value="WYSIWYGDisabled"/>
-+            <features value="Widget"/>
-+            <stories value="New products list widget"/>
-+            <title value="Admin should be able to set products as new so that they show up in the Catalog New Products List Widget"/>
-+            <description value="Admin should be able to set products as new so that they show up in the Catalog New Products List Widget"/>
-+            <severity value="MAJOR"/>
-+            <group value="Widget"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-+        </before>
-+
-+        <after>
-+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
-+        </after>
-+
-+        <!-- Create a CMS page containing the New Products widget -->
-+
-+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnCmsList"/>
-+        <waitForPageLoad stepKey="waitForCmsList"/>
-+        <click selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="clickAddNewPageButton"/>
-+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_newDefaultCmsPage.title}}" stepKey="fillPageTitle"/>
-+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="expandContentSection"/>
-+        <waitForPageLoad stepKey="waitForContentSection"/>
-+        <click selector="{{CmsWYSIWYGSection.InsertWidgetBtn}}" stepKey="clickInsertWidgetButton"/>
-+        <waitForPageLoad stepKey="waitForSlideOut"/>
-+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog New Products List" stepKey="selectWidgetType"/>
-+        <waitForPageLoad stepKey="waitForWidgetOptions"/>
-+        <selectOption selector="{{WidgetSection.DisplayType}}" userInput="New products" stepKey="selectDisplayType"/>
-+        <fillField selector="{{WidgetSection.NoOfProductToDisplay}}" userInput="100" stepKey="fillNoOfProductToDisplay"/>
-+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget"/>
-+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="expandSeoSection"/>
-+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_newDefaultCmsPage.identifier}}" stepKey="fillPageUrlKey"/>
-+        <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSaveCmsPage"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml
-new file mode 100644
-index 00000000000..4407991ff5a
---- /dev/null
-+++ b/app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml
-@@ -0,0 +1,68 @@
-+<?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="ProductsListWidgetTest">
-+        <annotations>
-+            <features value="Widget"/>
-+            <stories value="Products list widget"/>
-+            <title value="Admin should be able to set Products List Widget"/>
-+            <description value="Admin should be able to set Products List Widget"/>
-+            <severity value="CRITICAL"/>
-+            <testCaseId value="MAGETWO-97041"/>
-+            <group value="Widget"/>
-+            <group value="WYSIWYGDisabled"/>
-+        </annotations>
-+        <before>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
-+                <requiredEntity createDataKey="createCategory"/>
-+            </createData>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-+        </before>
-+        <after>
-+            <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-+        </after>
-+        <!-- Create a CMS page containing the Products List widget -->
-+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnCmsList"/>
-+        <waitForPageLoad stepKey="waitForCmsList"/>
-+        <click selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="clickAddNewPageButton"/>
-+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_newDefaultCmsPage.title}}" stepKey="fillPageTitle"/>
-+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="expandContentSection"/>
-+        <waitForPageLoad stepKey="waitForContentSection"/>
-+        <click selector="{{CmsWYSIWYGSection.InsertWidgetBtn}}" stepKey="clickInsertWidgetButton"/>
-+        <waitForPageLoad stepKey="waitForSlideOut"/>
-+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Products List" stepKey="selectWidgetType"/>
-+        <waitForPageLoad stepKey="waitForWidgetOptions"/>
-+        <click selector="{{AdminNewWidgetSection.addNewCondition}}" stepKey="clickAddNewCondition"/>
-+        <selectOption selector="{{AdminNewWidgetSection.selectCondition}}" userInput="Magento\CatalogWidget\Model\Rule\Condition\Product|category_ids" stepKey="selectCondition"/>
-+        <waitForElement selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="waitRuleParameter"/>
-+        <click selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="clickRuleParameter"/>
-+        <click selector="{{AdminNewWidgetSection.openChooser}}" stepKey="clickChooser"/>
-+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
-+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="clickCategoryToEditInitial"/>
-+        <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="clickApplyRuleParameter"/>
-+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget"/>
-+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}"  stepKey="expandSplitBtn"/>
-+        <click selector="{{CmsNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveAndClose"/>
-+        <waitForPageLoad stepKey="waitForCmsList2"/>
-+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-+        <!-- Verify CMS page on storefront -->
-+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.select(_newDefaultCmsPage.title)}}" stepKey="waitForCMSPageListItem" />
-+        <click selector="{{CmsPagesPageActionsSection.select(_newDefaultCmsPage.title)}}" stepKey="clickSelect" />
-+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.edit(_newDefaultCmsPage.title)}}" stepKey="waitForEditLink" />
-+        <click selector="{{CmsPagesPageActionsSection.preview(_newDefaultCmsPage.title)}}" stepKey="clickEdit" />
-+        <waitForPageLoad stepKey="waitForCMSPage"/>
-+        <seeInTitle userInput="{{_newDefaultCmsPage.title}}" stepKey="seePageTitle"/>
-+        <see userInput="{{_newDefaultCmsPage.title}}" stepKey="seeProduct"/>
-+    </test>
-+</tests>
-\ No newline at end of file
-diff --git a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
-index b85a458ed41..850a3fbe832 100644
---- a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
-+++ b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
-@@ -32,6 +32,9 @@ class WidgetTest extends \PHPUnit\Framework\TestCase
-      */
-     private $conditionsHelper;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->dataStorageMock = $this->getMockBuilder(\Magento\Widget\Model\Config\Data::class)
-@@ -55,6 +58,9 @@ class WidgetTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * Unit test for getWidget
-+     */
-     public function testGetWidgets()
-     {
-         $expected = ['val1', 'val2'];
-@@ -65,6 +71,9 @@ class WidgetTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($expected, $result);
-     }
- 
-+    /**
-+     * Unit test for getWidgetsWithFilter
-+     */
-     public function testGetWidgetsWithFilter()
-     {
-         $configFile = __DIR__ . '/_files/mappedConfigArrayAll.php';
-@@ -78,6 +87,9 @@ class WidgetTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($expected, $result);
-     }
- 
-+    /**
-+     * Unit test for getWidgetsWithUnknownFilter
-+     */
-     public function testGetWidgetsWithUnknownFilter()
-     {
-         $configFile = __DIR__ . '/_files/mappedConfigArrayAll.php';
-@@ -90,6 +102,9 @@ class WidgetTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($expected, $result);
-     }
- 
-+    /**
-+     * Unit test for getWidgetByClassType
-+     */
-     public function testGetWidgetByClassType()
-     {
-         $widgetOne = ['@' => ['type' => 'type1']];
-@@ -101,6 +116,9 @@ class WidgetTest extends \PHPUnit\Framework\TestCase
-         $this->assertNull($this->widget->getWidgetByClassType('type2'));
-     }
- 
-+    /**
-+     * Unit test for getConfigAsObject
-+     */
-     public function testGetConfigAsObject()
-     {
-         $configFile = __DIR__ . '/_files/mappedConfigArrayAll.php';
-@@ -135,6 +153,9 @@ class WidgetTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($supportedContainersExpected, $resultObject->getSupportedContainers());
-     }
- 
-+    /**
-+     * Unit test for getConfigAsObjectWidgetNoFound
-+     */
-     public function testGetConfigAsObjectWidgetNoFound()
-     {
-         $this->dataStorageMock->expects($this->once())
-@@ -146,6 +167,9 @@ class WidgetTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame([], $resultObject->getData());
-     }
- 
-+    /**
-+     * Unit test for getWidgetDeclaration
-+     */
-     public function testGetWidgetDeclaration()
-     {
-         $mathRandomMock = $this->createPartialMock(\Magento\Framework\Math\Random::class, ['getRandomString']);
-@@ -175,7 +199,7 @@ class WidgetTest extends \PHPUnit\Framework\TestCase
-         $this->conditionsHelper->expects($this->once())->method('encode')->with($conditions)
-             ->willReturn('encoded-conditions-string');
-         $this->escaperMock->expects($this->atLeastOnce())
--            ->method('escapeQuote')
-+            ->method('escapeHtmlAttr')
-             ->willReturnMap([
-                 ['my "widget"', false, 'my &quot;widget&quot;'],
-                 ['1', false, '1'],
-@@ -200,9 +224,11 @@ class WidgetTest extends \PHPUnit\Framework\TestCase
-         $this->assertContains('title="my &quot;widget&quot;"', $result);
-         $this->assertContains('conditions_encoded="encoded-conditions-string"', $result);
-         $this->assertContains('page_var_name="pasdf"', $result);
--        $this->assertContains('type_name=""}}', $result);
-     }
- 
-+    /**
-+     * Unit test for getWidgetDeclarationWithZeroValueParam
-+     */
-     public function testGetWidgetDeclarationWithZeroValueParam()
-     {
-         $mathRandomMock = $this->createPartialMock(\Magento\Framework\Math\Random::class, ['getRandomString']);
-@@ -248,7 +274,6 @@ class WidgetTest extends \PHPUnit\Framework\TestCase
-         );
-         $this->assertContains('{{widget type="Magento\CatalogWidget\Block\Product\ProductsList"', $result);
-         $this->assertContains('page_var_name="pasdf"', $result);
--        $this->assertContains('type_name=""}}', $result);
-         $this->assertContains('products_count=""', $result);
-     }
- }
-diff --git a/app/code/Magento/Widget/etc/db_schema.xml b/app/code/Magento/Widget/etc/db_schema.xml
-index 149bb27fcdb..a82e6aae202 100644
---- a/app/code/Magento/Widget/etc/db_schema.xml
-+++ b/app/code/Magento/Widget/etc/db_schema.xml
-@@ -14,10 +14,10 @@
-                 comment="Widget code for template directive"/>
-         <column xsi:type="varchar" name="widget_type" nullable="true" length="255" comment="Widget Type"/>
-         <column xsi:type="text" name="parameters" nullable="true" comment="Parameters"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="widget_id"/>
-         </constraint>
--        <index name="WIDGET_WIDGET_CODE" indexType="btree">
-+        <index referenceId="WIDGET_WIDGET_CODE" indexType="btree">
-             <column name="widget_code"/>
-         </index>
-     </table>
-@@ -32,10 +32,10 @@
-         <column xsi:type="text" name="widget_parameters" nullable="true" comment="Widget parameters"/>
-         <column xsi:type="smallint" name="sort_order" padding="5" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Sort order"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="instance_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="WIDGET_INSTANCE_THEME_ID_THEME_THEME_ID" table="widget_instance"
-+        <constraint xsi:type="foreign" referenceId="WIDGET_INSTANCE_THEME_ID_THEME_THEME_ID" table="widget_instance"
-                     column="theme_id" referenceTable="theme" referenceColumn="theme_id" onDelete="CASCADE"/>
-     </table>
-     <table name="widget_instance_page" resource="default" engine="innodb" comment="Instance of Widget on Page">
-@@ -49,13 +49,13 @@
-         <column xsi:type="varchar" name="page_for" nullable="true" length="25" comment="For instance entities"/>
-         <column xsi:type="text" name="entities" nullable="true" comment="Catalog entities (comma separated)"/>
-         <column xsi:type="varchar" name="page_template" nullable="true" length="255" comment="Path to widget template"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="page_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="WIDGET_INSTANCE_PAGE_INSTANCE_ID_WIDGET_INSTANCE_INSTANCE_ID"
-+        <constraint xsi:type="foreign" referenceId="WIDGET_INSTANCE_PAGE_INSTANCE_ID_WIDGET_INSTANCE_INSTANCE_ID"
-                     table="widget_instance_page" column="instance_id" referenceTable="widget_instance"
-                     referenceColumn="instance_id" onDelete="CASCADE"/>
--        <index name="WIDGET_INSTANCE_PAGE_INSTANCE_ID" indexType="btree">
-+        <index referenceId="WIDGET_INSTANCE_PAGE_INSTANCE_ID" indexType="btree">
-             <column name="instance_id"/>
-         </index>
-     </table>
-@@ -64,17 +64,17 @@
-                 comment="Page Id"/>
-         <column xsi:type="int" name="layout_update_id" padding="10" unsigned="true" nullable="false" identity="false"
-                 default="0" comment="Layout Update Id"/>
--        <constraint xsi:type="foreign" name="WIDGET_INSTANCE_PAGE_LAYOUT_PAGE_ID_WIDGET_INSTANCE_PAGE_PAGE_ID"
-+        <constraint xsi:type="foreign" referenceId="WIDGET_INSTANCE_PAGE_LAYOUT_PAGE_ID_WIDGET_INSTANCE_PAGE_PAGE_ID"
-                     table="widget_instance_page_layout" column="page_id" referenceTable="widget_instance_page"
-                     referenceColumn="page_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="WIDGET_INSTANCE_PAGE_LYT_LYT_UPDATE_ID_LYT_UPDATE_LYT_UPDATE_ID"
-+        <constraint xsi:type="foreign" referenceId="WIDGET_INSTANCE_PAGE_LYT_LYT_UPDATE_ID_LYT_UPDATE_LYT_UPDATE_ID"
-                     table="widget_instance_page_layout" column="layout_update_id" referenceTable="layout_update"
-                     referenceColumn="layout_update_id" onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="WIDGET_INSTANCE_PAGE_LAYOUT_LAYOUT_UPDATE_ID_PAGE_ID">
-+        <constraint xsi:type="unique" referenceId="WIDGET_INSTANCE_PAGE_LAYOUT_LAYOUT_UPDATE_ID_PAGE_ID">
-             <column name="layout_update_id"/>
-             <column name="page_id"/>
-         </constraint>
--        <index name="WIDGET_INSTANCE_PAGE_LAYOUT_PAGE_ID" indexType="btree">
-+        <index referenceId="WIDGET_INSTANCE_PAGE_LAYOUT_PAGE_ID" indexType="btree">
-             <column name="page_id"/>
-         </index>
-     </table>
-@@ -87,10 +87,10 @@
-                 default="0" comment="Sort Order"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="true" default="0"
-                 comment="Last Update Timestamp"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="layout_update_id"/>
-         </constraint>
--        <index name="LAYOUT_UPDATE_HANDLE" indexType="btree">
-+        <index referenceId="LAYOUT_UPDATE_HANDLE" indexType="btree">
-             <column name="handle"/>
-         </index>
-     </table>
-@@ -105,20 +105,20 @@
-                 default="0" comment="Layout Update Id"/>
-         <column xsi:type="boolean" name="is_temporary" nullable="false" default="false"
-                 comment="Defines whether Layout Update is Temporary"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="layout_link_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="LAYOUT_LINK_LAYOUT_UPDATE_ID_LAYOUT_UPDATE_LAYOUT_UPDATE_ID"
-+        <constraint xsi:type="foreign" referenceId="LAYOUT_LINK_LAYOUT_UPDATE_ID_LAYOUT_UPDATE_LAYOUT_UPDATE_ID"
-                     table="layout_link" column="layout_update_id" referenceTable="layout_update"
-                     referenceColumn="layout_update_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="LAYOUT_LINK_STORE_ID_STORE_STORE_ID" table="layout_link" column="store_id"
-+        <constraint xsi:type="foreign" referenceId="LAYOUT_LINK_STORE_ID_STORE_STORE_ID" table="layout_link" column="store_id"
-                     referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="LAYOUT_LINK_THEME_ID_THEME_THEME_ID" table="layout_link" column="theme_id"
-+        <constraint xsi:type="foreign" referenceId="LAYOUT_LINK_THEME_ID_THEME_THEME_ID" table="layout_link" column="theme_id"
-                     referenceTable="theme" referenceColumn="theme_id" onDelete="CASCADE"/>
--        <index name="LAYOUT_LINK_LAYOUT_UPDATE_ID" indexType="btree">
-+        <index referenceId="LAYOUT_LINK_LAYOUT_UPDATE_ID" indexType="btree">
-             <column name="layout_update_id"/>
-         </index>
--        <index name="LAYOUT_LINK_STORE_ID_THEME_ID_LAYOUT_UPDATE_ID_IS_TEMPORARY" indexType="btree">
-+        <index referenceId="LAYOUT_LINK_STORE_ID_THEME_ID_LAYOUT_UPDATE_ID_IS_TEMPORARY" indexType="btree">
-             <column name="store_id"/>
-             <column name="theme_id"/>
-             <column name="layout_update_id"/>
-diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml
-index 934b0ca1a85..8ca3fab413b 100644
---- a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml
-+++ b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml
-@@ -13,7 +13,7 @@
-                     <argument name="id" xsi:type="string">widgetInstanceGrid</argument>
-                     <argument name="default_sort" xsi:type="string">instance_id</argument>
-                     <argument name="default_dir" xsi:type="string">ASC</argument>
--                    <argument name="dataSource" xsi:type="object">Magento\Widget\Model\ResourceModel\Widget\Instance\Collection</argument>
-+                    <argument name="dataSource" xsi:type="object" shared="false">Magento\Widget\Model\ResourceModel\Widget\Instance\Collection</argument>
-                 </arguments>
-                 <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="adminhtml.widget.instance.grid.columnSet" as="grid.columnSet">
-                     <arguments>
-diff --git a/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml b/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
-index b6c19f29065..72de9550654 100644
---- a/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
-+++ b/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser $block */
- ?>
- 
-@@ -43,7 +41,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
-         this.setRootNode(root);
- 
-         if (firstLoad) {
--            <?php if ($block->getNodeClickListener()): ?>
-+            <?php if ($block->getNodeClickListener()) : ?>
-                 this.addListener('click', <?= /* @noEscape */ $block->getNodeClickListener() ?>.createDelegate(this));
-             <?php endif; ?>
-         }
-diff --git a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
-index a0a0fc040a2..c45ef65f4f2 100644
---- a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
-+++ b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Main\Layout $block */
- 
- ?>
-@@ -34,11 +32,11 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
-         '<label for="widget_instance[<%- data.id %>][page_group]">Display on <span class="required">*</span></label>'+
-         '<?= $block->getDisplayOnSelectHtml() ?>'+
-         '<div class="actions">'+
--        <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getRemoveLayoutButtonHtml()) ?> +
-+        <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getRemoveLayoutButtonHtml()) ?> +
-         '</div>'+
-     '</div>'+
-     '<div class="fieldset-wrapper-content">'+
--<?php foreach ($block->getDisplayOnContainers() as $container): ?>
-+<?php foreach ($block->getDisplayOnContainers() as $container) : ?>
-     '<div class="no-display <?= $block->escapeJs($container['code']) ?> group_container" id="<?= $block->escapeJs($container['name']) ?>_<%- data.id %>">'+
-         '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>]" />'+
-         '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][page_id]" value="<%- data.page_id %>" />'+
-@@ -304,11 +302,6 @@ var WidgetInstance = {
-     },
-     displayPageGroup : function(container, additional) {
-         container = $(container);
--        if (!container) {
--//            if (activePageGroupId = this.activePageGroups.get(container.up('div.page_group_container').id)) {
--//                this.hideBlockContainer(activePageGroupId);
--//            }
--        }
-         if (!additional) {
-             additional = {};
-         }
-@@ -486,7 +479,7 @@ var WidgetInstance = {
- window.WidgetInstance = WidgetInstance;
- 
- jQuery(function(){
--    <?php foreach ($block->getPageGroups() as $pageGroup): ?>
-+    <?php foreach ($block->getPageGroups() as $pageGroup) : ?>
-         WidgetInstance.addPageGroup(<?= /* @noEscape */ $pageGroup ?>);
-     <?php endforeach; ?>
-     Event.observe(document, 'product:changed', function(event){
-diff --git a/app/code/Magento/Wishlist/Block/AbstractBlock.php b/app/code/Magento/Wishlist/Block/AbstractBlock.php
-index 8b4a8df1bf9..981a0da1d24 100644
---- a/app/code/Magento/Wishlist/Block/AbstractBlock.php
-+++ b/app/code/Magento/Wishlist/Block/AbstractBlock.php
-@@ -228,12 +228,24 @@ abstract class AbstractBlock extends \Magento\Catalog\Block\Product\AbstractProd
-     }
- 
-     /**
--     * Retrieve formated Date
-+     * Retrieve formatted Date
-      *
-      * @param string $date
-+     * @deprecated
-      * @return string
-      */
-     public function getFormatedDate($date)
-+    {
-+        return $this->getFormattedDate($date);
-+    }
-+
-+    /**
-+     * Retrieve formatted Date
-+     *
-+     * @param string $date
-+     * @return string
-+     */
-+    public function getFormattedDate($date)
-     {
-         return $this->formatDate($date, \IntlDateFormatter::MEDIUM);
-     }
-diff --git a/app/code/Magento/Wishlist/Block/Cart/Item/Renderer/Actions/MoveToWishlist.php b/app/code/Magento/Wishlist/Block/Cart/Item/Renderer/Actions/MoveToWishlist.php
-index 823849ed410..eba1f7da727 100644
---- a/app/code/Magento/Wishlist/Block/Cart/Item/Renderer/Actions/MoveToWishlist.php
-+++ b/app/code/Magento/Wishlist/Block/Cart/Item/Renderer/Actions/MoveToWishlist.php
-@@ -10,6 +10,8 @@ use Magento\Framework\View\Element\Template;
- use Magento\Wishlist\Helper\Data;
- 
- /**
-+ * Class MoveToWishlist
-+ *
-  * @api
-  * @since 100.0.2
-  */
-diff --git a/app/code/Magento/Wishlist/Block/Customer/Sharing.php b/app/code/Magento/Wishlist/Block/Customer/Sharing.php
-index 6fbf5a23dca..40fd00d6143 100644
---- a/app/code/Magento/Wishlist/Block/Customer/Sharing.php
-+++ b/app/code/Magento/Wishlist/Block/Customer/Sharing.php
-@@ -11,9 +11,14 @@
-  */
- namespace Magento\Wishlist\Block\Customer;
- 
-+use Magento\Captcha\Block\Captcha;
-+
- /**
-+ * Class Sharing
-+ *
-  * @api
-  * @since 100.0.2
-+ * @package Magento\Wishlist\Block\Customer
-  */
- class Sharing extends \Magento\Framework\View\Element\Template
- {
-@@ -60,6 +65,20 @@ class Sharing extends \Magento\Framework\View\Element\Template
-      */
-     protected function _prepareLayout()
-     {
-+        if (!$this->getChildBlock('captcha')) {
-+            $this->addChild(
-+                'captcha',
-+                Captcha::class,
-+                [
-+                    'cacheable' => false,
-+                    'after' => '-',
-+                    'form_id' => 'share_wishlist_form',
-+                    'image_width' => 230,
-+                    'image_height' => 230
-+                ]
-+            );
-+        }
-+
-         $this->pageConfig->getTitle()->set(__('Wish List Sharing'));
-     }
- 
-diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
-index 2b1b6d44b42..d02f2229401 100644
---- a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
-+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
-@@ -5,13 +5,13 @@
-  */
- 
- /**
-- * Wishlist block customer items
-- *
-  * @author     Magento Core Team <core@magentocommerce.com>
-  */
- namespace Magento\Wishlist\Block\Customer;
- 
- /**
-+ * Wishlist block customer items.
-+ *
-  * @api
-  * @since 100.0.2
-  */
-@@ -29,6 +29,11 @@ class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
-      */
-     protected $_helperPool;
- 
-+    /**
-+     * @var  \Magento\Wishlist\Model\ResourceModel\Item\Collection
-+     */
-+    protected $_collection;
-+
-     /**
-      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-      */
-@@ -78,14 +83,64 @@ class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
-     }
- 
-     /**
--     * Preparing global layout
-+     * Paginate Wishlist Product Items collection
-      *
-      * @return void
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-+     */
-+    private function paginateCollection()
-+    {
-+        $page = $this->getRequest()->getParam("p", 1);
-+        $limit = $this->getRequest()->getParam("limit", 10);
-+        $this->_collection
-+            ->setPageSize($limit)
-+            ->setCurPage($page);
-+    }
-+
-+    /**
-+     * Retrieve Wishlist Product Items collection
-+     *
-+     * @return \Magento\Wishlist\Model\ResourceModel\Item\Collection
-+     */
-+    public function getWishlistItems()
-+    {
-+        if ($this->_collection === null) {
-+            $this->_collection = $this->_createWishlistItemCollection();
-+            $this->_prepareCollection($this->_collection);
-+            $this->paginateCollection();
-+        }
-+        return $this->_collection;
-+    }
-+
-+    /**
-+     * Preparing global layout
-+     *
-+     * @return $this
-      */
-     protected function _prepareLayout()
-     {
-         parent::_prepareLayout();
-         $this->pageConfig->getTitle()->set(__('My Wish List'));
-+        $this->getChildBlock('wishlist_item_pager')
-+            ->setUseContainer(
-+                true
-+            )->setShowAmounts(
-+                true
-+            )->setFrameLength(
-+                $this->_scopeConfig->getValue(
-+                    'design/pagination/pagination_frame',
-+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+                )
-+            )->setJump(
-+                $this->_scopeConfig->getValue(
-+                    'design/pagination/pagination_frame_skip',
-+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+                )
-+            )->setLimit(
-+                $this->getLimit()
-+            )
-+            ->setCollection($this->getWishlistItems());
-+        return $this;
-     }
- 
-     /**
-@@ -198,6 +253,7 @@ class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
- 
-     /**
-      * Get add all to cart params for POST request
-+     *
-      * @return string
-      */
-     public function getAddAllToCartParams()
-@@ -209,7 +265,7 @@ class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
-     }
- 
-     /**
--     * @return string
-+     * @inheritdoc
-      */
-     protected function _toHtml()
-     {
-diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
-index cafb6a52914..40882ae00da 100644
---- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
-+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
-@@ -5,14 +5,15 @@
-  */
- 
- /**
-- * Wishlist for item column in customer wishlist
-- *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
- namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
- 
- /**
-+ * Model for item column in customer wishlist.
-+ *
-  * @api
-+ * @deprecated
-  * @since 100.0.2
-  */
- class Actions extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
-diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
-index b043a8d4b68..5625dd5aabb 100644
---- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
-+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
-@@ -6,6 +6,12 @@
- 
- namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
- 
-+use Magento\Catalog\Block\Product\View;
-+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter;
-+use Magento\Catalog\Model\Product\Image\UrlBuilder;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\View\ConfigInterface;
-+
- /**
-  * Wishlist block customer item cart column
-  *
-@@ -14,6 +20,31 @@ namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
-  */
- class Cart extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
- {
-+    /**
-+     * @var View
-+     */
-+    private $productView;
-+
-+    /**
-+     * @param \Magento\Catalog\Block\Product\Context $context
-+     * @param \Magento\Framework\App\Http\Context $httpContext
-+     * @param array $data
-+     * @param ConfigInterface|null $config
-+     * @param UrlBuilder|null $urlBuilder
-+     * @param View|null $productView
-+     */
-+    public function __construct(
-+        \Magento\Catalog\Block\Product\Context $context,
-+        \Magento\Framework\App\Http\Context $httpContext,
-+        array $data = [],
-+        ?ConfigInterface $config = null,
-+        ?UrlBuilder $urlBuilder = null,
-+        ?View $productView = null
-+    ) {
-+        $this->productView = $productView ?: ObjectManager::getInstance()->get(View::class);
-+        parent::__construct($context, $httpContext, $data, $config, $urlBuilder);
-+    }
-+
-     /**
-      * Returns qty to show visually to user
-      *
-@@ -23,7 +54,9 @@ class Cart extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
-     public function getAddToCartQty(\Magento\Wishlist\Model\Item $item)
-     {
-         $qty = $item->getQty();
--        return $qty ? $qty : 1;
-+        $qty = $qty < $this->productView->getProductDefaultQty($this->getProductItem())
-+                ? $this->productView->getProductDefaultQty($this->getProductItem()) : $qty;
-+        return $qty ?: 1;
-     }
- 
-     /**
-diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
-index 2d75956858a..53f67626e95 100644
---- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
-+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
-@@ -5,14 +5,15 @@
-  */
- 
- /**
-- * Wishlist block customer item cart column
-- *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
- namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
- 
- /**
-+ * Wishlist block customer item cart column.
-+ *
-  * @api
-+ * @deprecated
-  * @since 100.0.2
-  */
- class Comment extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
-diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
-index 53ca78c6352..c4c78696169 100644
---- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
-+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
-@@ -5,14 +5,15 @@
-  */
- 
- /**
-- * Edit item in customer wishlist table
-- *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
- namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
- 
- /**
-+ * Edit item in customer wishlist table.
-+ *
-  * @api
-+ * @deprecated
-  * @since 100.0.2
-  */
- class Edit extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
-diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
-index 33fb0f7325c..b7eaf53fc23 100644
---- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
-+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
-@@ -5,14 +5,15 @@
-  */
- 
- /**
-- * Wishlist block customer item cart column
-- *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
- namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
- 
- /**
-+ * Wishlist block customer item cart column.
-+ *
-  * @api
-+ * @deprecated
-  * @since 100.0.2
-  */
- class Info extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
-diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
-index 57703b9300d..09f5014edea 100644
---- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
-+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
-@@ -5,14 +5,15 @@
-  */
- 
- /**
-- * Delete item column in customer wishlist table
-- *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
- namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
- 
- /**
-+ * Delete item column in customer wishlist table
-+ *
-  * @api
-+ * @deprecated
-  * @since 100.0.2
-  */
- class Remove extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
-diff --git a/app/code/Magento/Wishlist/Controller/Index/Allcart.php b/app/code/Magento/Wishlist/Controller/Index/Allcart.php
-index 8463a00c866..958e0f49ca1 100644
---- a/app/code/Magento/Wishlist/Controller/Index/Allcart.php
-+++ b/app/code/Magento/Wishlist/Controller/Index/Allcart.php
-@@ -5,14 +5,17 @@
-  */
- namespace Magento\Wishlist\Controller\Index;
- 
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Data\Form\FormKey\Validator;
--use Magento\Framework\App\Action;
- use Magento\Framework\App\Action\Context;
- use Magento\Wishlist\Controller\WishlistProviderInterface;
- use Magento\Wishlist\Model\ItemCarrier;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Allcart extends \Magento\Wishlist\Controller\AbstractIndex
-+/**
-+ * Action Add All to Cart
-+ */
-+class Allcart extends \Magento\Wishlist\Controller\AbstractIndex implements HttpPostActionInterface
- {
-     /**
-      * @var WishlistProviderInterface
-diff --git a/app/code/Magento/Wishlist/Controller/Index/Cart.php b/app/code/Magento/Wishlist/Controller/Index/Cart.php
-index 0e826d83a52..da37609d688 100644
---- a/app/code/Magento/Wishlist/Controller/Index/Cart.php
-+++ b/app/code/Magento/Wishlist/Controller/Index/Cart.php
-@@ -3,16 +3,19 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Wishlist\Controller\Index;
- 
--use Magento\Framework\App\Action;
- use Magento\Catalog\Model\Product\Exception as ProductException;
-+use Magento\Framework\App\Action;
- use Magento\Framework\Controller\ResultFactory;
- 
- /**
-+ * Add wishlist item to shopping cart and remove from wishlist controller.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Cart extends \Magento\Wishlist\Controller\AbstractIndex
-+class Cart extends \Magento\Wishlist\Controller\AbstractIndex implements Action\HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Wishlist\Controller\WishlistProviderInterface
-@@ -195,12 +198,12 @@ class Cart extends \Magento\Wishlist\Controller\AbstractIndex
-                 }
-             }
-         } catch (ProductException $e) {
--            $this->messageManager->addError(__('This product(s) is out of stock.'));
-+            $this->messageManager->addErrorMessage(__('This product(s) is out of stock.'));
-         } catch (\Magento\Framework\Exception\LocalizedException $e) {
--            $this->messageManager->addNotice($e->getMessage());
-+            $this->messageManager->addNoticeMessage($e->getMessage());
-             $redirectUrl = $configureUrl;
-         } catch (\Exception $e) {
--            $this->messageManager->addException($e, __('We can\'t add the item to the cart right now.'));
-+            $this->messageManager->addExceptionMessage($e, __('We can\'t add the item to the cart right now.'));
-         }
- 
-         $this->helper->calculate();
-diff --git a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
-index e43a03e72d8..742b2a91e93 100644
---- a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
-+++ b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
-@@ -3,15 +3,21 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Wishlist\Controller\Index;
- 
- use Magento\Framework\App\Action;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Framework\Serialize\Serializer\Json;
- 
--class DownloadCustomOption extends \Magento\Wishlist\Controller\AbstractIndex
-+/**
-+ * Class DownloadCustomOption. Represents request-flow logic for option's file download
-+ */
-+class DownloadCustomOption extends \Magento\Wishlist\Controller\AbstractIndex implements HttpGetActionInterface
- {
-     /**
-      * @var \Magento\Framework\App\Response\Http\FileFactory
-@@ -26,6 +32,8 @@ class DownloadCustomOption extends \Magento\Wishlist\Controller\AbstractIndex
-     private $json;
- 
-     /**
-+     * Constructor method
-+     *
-      * @param Action\Context $context
-      * @param \Magento\Framework\App\Response\Http\FileFactory $fileResponseFactory
-      * @param Json|null $json
-@@ -45,7 +53,6 @@ class DownloadCustomOption extends \Magento\Wishlist\Controller\AbstractIndex
-      *
-      * @return \Magento\Framework\Controller\Result\Forward
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     public function execute()
-     {
-@@ -92,7 +99,8 @@ class DownloadCustomOption extends \Magento\Wishlist\Controller\AbstractIndex
-                 $this->_fileResponseFactory->create(
-                     $info['title'],
-                     ['value' => $info['quote_path'], 'type' => 'filename'],
--                    DirectoryList::ROOT
-+                    DirectoryList::ROOT,
-+                    $info['type']
-                 );
-             }
-         } catch (\Exception $e) {
-diff --git a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
-index 49396004427..52d0951f167 100644
---- a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
-+++ b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
-@@ -8,7 +8,6 @@ namespace Magento\Wishlist\Controller\Index;
- 
- use Magento\Checkout\Helper\Cart as CartHelper;
- use Magento\Checkout\Model\Cart as CheckoutCart;
--use Magento\Customer\Model\Session;
- use Magento\Framework\App\Action;
- use Magento\Framework\Data\Form\FormKey\Validator;
- use Magento\Framework\Escaper;
-@@ -19,9 +18,11 @@ use Magento\Wishlist\Controller\WishlistProviderInterface;
- use Magento\Wishlist\Helper\Data as WishlistHelper;
- 
- /**
-+ * Add cart item to wishlist and remove from cart controller.
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Fromcart extends \Magento\Wishlist\Controller\AbstractIndex
-+class Fromcart extends \Magento\Wishlist\Controller\AbstractIndex implements Action\HttpPostActionInterface
- {
-     /**
-      * @var WishlistProviderInterface
-diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
-index c2389af6a22..5d867ac7475 100644
---- a/app/code/Magento/Wishlist/Controller/Index/Send.php
-+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
-@@ -8,17 +8,35 @@ namespace Magento\Wishlist\Controller\Index;
- 
- use Magento\Framework\App\Action;
- use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\ResponseInterface;
- use Magento\Framework\Exception\NotFoundException;
- use Magento\Framework\Session\Generic as WishlistSession;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Framework\View\Result\Layout as ResultLayout;
-+use Magento\Captcha\Helper\Data as CaptchaHelper;
-+use Magento\Captcha\Observer\CaptchaStringResolver;
-+use Magento\Framework\Escaper;
-+use Magento\Framework\Controller\Result\Redirect;
-+use Magento\Framework\Controller\ResultInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Captcha\Model\DefaultModel as CaptchaModel;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Customer\Model\Customer;
- 
- /**
-+ * Class Send
-+ *
-+ * @package Magento\Wishlist\Controller\Index
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class Send extends \Magento\Wishlist\Controller\AbstractIndex
-+class Send extends \Magento\Wishlist\Controller\AbstractIndex implements Action\HttpPostActionInterface
- {
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * @var \Magento\Customer\Helper\View
-      */
-@@ -69,6 +87,16 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
-      */
-     protected $storeManager;
- 
-+    /**
-+     * @var CaptchaHelper
-+     */
-+    private $captchaHelper;
-+
-+    /**
-+     * @var CaptchaStringResolver
-+     */
-+    private $captchaStringResolver;
-+
-     /**
-      * @param Action\Context $context
-      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
-@@ -81,6 +109,9 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
-      * @param WishlistSession $wishlistSession
-      * @param ScopeConfigInterface $scopeConfig
-      * @param StoreManagerInterface $storeManager
-+     * @param CaptchaHelper|null $captchaHelper
-+     * @param CaptchaStringResolver|null $captchaStringResolver
-+     * @param Escaper|null $escaper
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -94,7 +125,10 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
-         \Magento\Customer\Helper\View $customerHelperView,
-         WishlistSession $wishlistSession,
-         ScopeConfigInterface $scopeConfig,
--        StoreManagerInterface $storeManager
-+        StoreManagerInterface $storeManager,
-+        ?CaptchaHelper $captchaHelper = null,
-+        ?CaptchaStringResolver $captchaStringResolver = null,
-+        Escaper $escaper = null
-     ) {
-         $this->_formKeyValidator = $formKeyValidator;
-         $this->_customerSession = $customerSession;
-@@ -106,6 +140,12 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
-         $this->wishlistSession = $wishlistSession;
-         $this->scopeConfig = $scopeConfig;
-         $this->storeManager = $storeManager;
-+        $this->captchaHelper = $captchaHelper ?: ObjectManager::getInstance()->get(CaptchaHelper::class);
-+        $this->captchaStringResolver = $captchaStringResolver ?
-+            : ObjectManager::getInstance()->get(CaptchaStringResolver::class);
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-         parent::__construct($context);
-     }
- 
-@@ -114,6 +154,7 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
-      *
-      * @return \Magento\Framework\Controller\Result\Redirect
-      * @throws NotFoundException
-+     * @throws \Zend_Validate_Exception
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-@@ -122,11 +163,25 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
-     {
-         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
-         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-+        $captchaForName = 'share_wishlist_form';
-+        /** @var CaptchaModel $captchaModel */
-+        $captchaModel = $this->captchaHelper->getCaptcha($captchaForName);
-+
-         if (!$this->_formKeyValidator->validate($this->getRequest())) {
-             $resultRedirect->setPath('*/*/');
-             return $resultRedirect;
-         }
- 
-+        $isCorrectCaptcha = $this->validateCaptcha($captchaModel, $captchaForName);
-+
-+        $this->logCaptchaAttempt($captchaModel);
-+
-+        if (!$isCorrectCaptcha) {
-+            $this->messageManager->addErrorMessage(__('Incorrect CAPTCHA'));
-+            $resultRedirect->setPath('*/*/share');
-+            return $resultRedirect;
-+        }
-+
-         $wishlist = $this->wishlistProvider->getWishlist();
-         if (!$wishlist) {
-             throw new NotFoundException(__('Page not found.'));
-@@ -144,7 +199,7 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
-         if (strlen($message) > $textLimit) {
-             $error = __('Message length must not exceed %1 symbols', $textLimit);
-         } else {
--            $message = nl2br(htmlspecialchars($message));
-+            $message = nl2br($this->escaper->escapeHtml($message));
-             if (empty($emails)) {
-                 $error = __('Please enter an email address.');
-             } else {
-@@ -288,4 +343,46 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
-             ->getBlock('wishlist.email.items')
-             ->toHtml();
-     }
-+
-+    /**
-+     * Log customer action attempts
-+     *
-+     * @param CaptchaModel $captchaModel
-+     * @return void
-+     */
-+    private function logCaptchaAttempt(CaptchaModel $captchaModel): void
-+    {
-+        /** @var  Customer $customer */
-+        $customer = $this->_customerSession->getCustomer();
-+        $email = '';
-+
-+        if ($customer->getId()) {
-+            $email = $customer->getEmail();
-+        }
-+
-+        $captchaModel->logAttempt($email);
-+    }
-+
-+    /**
-+     * Captcha validate logic
-+     *
-+     * @param CaptchaModel $captchaModel
-+     * @param string $captchaFormName
-+     * @return bool
-+     */
-+    private function validateCaptcha(CaptchaModel $captchaModel, string $captchaFormName) : bool
-+    {
-+        if ($captchaModel->isRequired()) {
-+            $word = $this->captchaStringResolver->resolve(
-+                $this->getRequest(),
-+                $captchaFormName
-+            );
-+
-+            if (!$captchaModel->isCorrect($word)) {
-+                return false;
-+            }
-+        }
-+
-+        return true;
-+    }
- }
-diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
-old mode 100644
-new mode 100755
-index a79e4aa95ff..b56aa4b5b3c
---- a/app/code/Magento/Wishlist/Controller/Index/Update.php
-+++ b/app/code/Magento/Wishlist/Controller/Index/Update.php
-@@ -6,10 +6,14 @@
- namespace Magento\Wishlist\Controller\Index;
- 
- use Magento\Framework\App\Action;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
- use Magento\Framework\Exception\NotFoundException;
- use Magento\Framework\Controller\ResultFactory;
- 
--class Update extends \Magento\Wishlist\Controller\AbstractIndex
-+/**
-+ * Class Update
-+ */
-+class Update extends \Magento\Wishlist\Controller\AbstractIndex implements HttpPostActionInterface
- {
-     /**
-      * @var \Magento\Wishlist\Controller\WishlistProviderInterface
-@@ -83,8 +87,6 @@ class Update extends \Magento\Wishlist\Controller\AbstractIndex
-                 )->defaultCommentString()
-                 ) {
-                     $description = '';
--                } elseif (!strlen($description)) {
--                    $description = $item->getDescription();
-                 }
- 
-                 $qty = null;
-@@ -111,6 +113,9 @@ class Update extends \Magento\Wishlist\Controller\AbstractIndex
-                 }
-                 try {
-                     $item->setDescription($description)->setQty($qty)->save();
-+                    $this->messageManager->addSuccessMessage(
-+                        __('%1 has been updated in your Wish List.', $item->getProduct()->getName())
-+                    );
-                     $updatedItems++;
-                 } catch (\Exception $e) {
-                     $this->messageManager->addError(
-diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
-index f4c1aa9662b..6c1ebd87b4e 100644
---- a/app/code/Magento/Wishlist/Helper/Data.php
-+++ b/app/code/Magento/Wishlist/Helper/Data.php
-@@ -6,6 +6,8 @@
- namespace Magento\Wishlist\Helper;
- 
- use Magento\Framework\App\ActionInterface;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Escaper;
- use Magento\Wishlist\Controller\WishlistProviderInterface;
- 
- /**
-@@ -13,6 +15,7 @@ use Magento\Wishlist\Controller\WishlistProviderInterface;
-  *
-  * @author     Magento Core Team <core@magentocommerce.com>
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  *
-  * @api
-  * @since 100.0.2
-@@ -99,6 +102,11 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     protected $productRepository;
- 
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * @param \Magento\Framework\App\Helper\Context $context
-      * @param \Magento\Framework\Registry $coreRegistry
-@@ -129,6 +137,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-         $this->_customerViewHelper = $customerViewHelper;
-         $this->wishlistProvider = $wishlistProvider;
-         $this->productRepository = $productRepository;
-+        $this->escaper = ObjectManager::getInstance()->get(Escaper::class);
-         parent::__construct($context);
-     }
- 
-@@ -171,7 +180,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     public function getCustomer()
-     {
-         if (!$this->_currentCustomer && $this->_customerSession->isLoggedIn()) {
--            $this->_currentCustomer = $this->_customerSession->getCustomerDataObject();
-+            $this->_currentCustomer = $this->_customerSession->getCustomerData();
-         }
-         return $this->_currentCustomer;
-     }
-@@ -195,6 +204,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
- 
-     /**
-      * Retrieve wishlist item count (include config settings)
-+     *
-      * Used in top link menu only
-      *
-      * @return int
-@@ -321,10 +331,10 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     {
-         $productId = null;
-         if ($item instanceof \Magento\Catalog\Model\Product) {
--            $productId = $item->getEntityId();
-+            $productId = (int) $item->getEntityId();
-         }
-         if ($item instanceof \Magento\Wishlist\Model\Item) {
--            $productId = $item->getProductId();
-+            $productId = (int) $item->getProductId();
-         }
- 
-         $url = $this->_getUrlStore($item)->getUrl('wishlist/index/add');
-@@ -332,7 +342,10 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-             $params['product'] = $productId;
-         }
- 
--        return $this->_postDataHelper->getPostData($url, $params);
-+        return $this->_postDataHelper->getPostData(
-+            $this->escaper->escapeUrl($url),
-+            $params
-+        );
-     }
- 
-     /**
-@@ -354,7 +367,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      *
-      * @param \Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
-      *
--     * @return  string|false
-+     * @return string|false
-      */
-     public function getUpdateParams($item)
-     {
-@@ -381,7 +394,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      * Retrieve params for adding item to shopping cart
-      *
-      * @param string|\Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
--     * @return  string
-+     * @return string
-      */
-     public function getAddToCartUrl($item)
-     {
-@@ -427,7 +440,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      * Retrieve URL for adding item to shopping cart from shared wishlist
-      *
-      * @param string|\Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
--     * @return  string
-+     * @return string
-      */
-     public function getSharedAddToCartUrl($item)
-     {
-@@ -450,6 +463,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-     }
- 
-     /**
-+     * Get cart URL parameters
-+     *
-      * @param string|\Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
-      * @return array
-      */
-@@ -486,14 +501,14 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-      */
-     public function isAllow()
-     {
--        if ($this->_moduleManager->isOutputEnabled($this->_getModuleName()) && $this->scopeConfig->getValue(
-+        $isOutputEnabled  = $this->_moduleManager->isOutputEnabled($this->_getModuleName());
-+
-+        $isWishlistActive = $this->scopeConfig->getValue(
-             'wishlist/general/active',
-             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--        )
--        ) {
--            return true;
--        }
--        return false;
-+        );
-+
-+        return $isOutputEnabled && $isWishlistActive;
-     }
- 
-     /**
-@@ -576,7 +591,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
-             ) {
-                 $count = $collection->getItemsQty();
-             } else {
--                $count = $collection->getSize();
-+                $count = $collection->count();
-             }
-             $this->_customerSession->setWishlistDisplayType(
-                 $this->scopeConfig->getValue(
-diff --git a/app/code/Magento/Wishlist/Helper/Rss.php b/app/code/Magento/Wishlist/Helper/Rss.php
-index 14ca52e92ad..b4f761f03dd 100644
---- a/app/code/Magento/Wishlist/Helper/Rss.php
-+++ b/app/code/Magento/Wishlist/Helper/Rss.php
-@@ -7,6 +7,8 @@
- namespace Magento\Wishlist\Helper;
- 
- /**
-+ * Wishlist rss helper
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  *
-  * @api
-@@ -104,7 +106,7 @@ class Rss extends \Magento\Wishlist\Helper\Data
-         if ($this->_customer === null) {
-             $params = $this->urlDecoder->decode($this->_getRequest()->getParam('data'));
-             $data   = explode(',', $params);
--            $customerId    = abs(intval($data[0]));
-+            $customerId    = abs((int)$data[0]);
-             if ($customerId && ($customerId == $this->_customerSession->getCustomerId())) {
-                 $this->_customer = $this->_customerRepository->getById($customerId);
-             } else {
-diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
-index 225026f31a9..61d444f786c 100644
---- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
-+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
-@@ -6,7 +6,11 @@
- namespace Magento\Wishlist\Model\ResourceModel\Item;
- 
- use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
-+use Magento\CatalogInventory\Model\Stock;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\Sales\Model\ConfigInterface;
- 
- /**
-  * Wishlist item collection
-@@ -144,6 +148,16 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-      */
-     protected $metadataPool;
- 
-+    /**
-+     * @var TableMaintainer
-+     */
-+    private $tableMaintainer;
-+
-+    /**
-+     * @var ConfigInterface
-+     */
-+    private $salesConfig;
-+
-     /**
-      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
-      * @param \Psr\Log\LoggerInterface $logger
-@@ -163,6 +177,8 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-      * @param \Magento\Wishlist\Model\ResourceModel\Item $resource
-      * @param \Magento\Framework\App\State $appState
-      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-+     * @param TableMaintainer|null $tableMaintainer
-+     * @param  ConfigInterface|null $salesConfig
-      *
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-@@ -184,7 +200,9 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-         \Magento\Catalog\Model\Entity\AttributeFactory $catalogAttrFactory,
-         \Magento\Wishlist\Model\ResourceModel\Item $resource,
-         \Magento\Framework\App\State $appState,
--        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null
-+        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
-+        TableMaintainer $tableMaintainer = null,
-+        ConfigInterface $salesConfig = null
-     ) {
-         $this->stockConfiguration = $stockConfiguration;
-         $this->_adminhtmlSales = $adminhtmlSales;
-@@ -199,6 +217,8 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-         $this->_catalogAttrFactory = $catalogAttrFactory;
-         $this->_appState = $appState;
-         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
-+        $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
-+        $this->salesConfig = $salesConfig ?: ObjectManager::getInstance()->get(ConfigInterface::class);
-     }
- 
-     /**
-@@ -307,6 +327,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
- 
-         $checkInStock = $this->_productInStock && !$this->stockConfiguration->isShowOutOfStock();
- 
-+        /** @var \Magento\Wishlist\Model\Item $item */
-         foreach ($this as $item) {
-             $product = $productCollection->getItemById($item->getProductId());
-             if ($product) {
-@@ -320,7 +341,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-                     $item->setPrice($product->getPrice());
-                 }
-             } else {
--                $item->isDeleted(true);
-+                $this->removeItemByKey($item->getId());
-             }
-         }
- 
-@@ -329,6 +350,53 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-         return $this;
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _renderFiltersBefore()
-+    {
-+        parent::_renderFiltersBefore();
-+
-+        $mainTableName = 'main_table';
-+        $connection = $this->getConnection();
-+
-+        if ($this->_productInStock && !$this->stockConfiguration->isShowOutOfStock()) {
-+            $inStockConditions = [
-+                "stockItem.product_id =  {$mainTableName}.product_id",
-+                $connection->quoteInto('stockItem.stock_status = ?', Stock::STOCK_IN_STOCK),
-+            ];
-+            $this->getSelect()->join(
-+                ['stockItem' => $this->getTable('cataloginventory_stock_status')],
-+                join(' AND ', $inStockConditions),
-+                []
-+            );
-+        }
-+
-+        if ($this->_productVisible) {
-+            $rootCategoryId = $this->_storeManager->getStore()->getRootCategoryId();
-+            $visibleInSiteIds = $this->_productVisibility->getVisibleInSiteIds();
-+            $visibilityConditions = [
-+                "cat_index.product_id = {$mainTableName}.product_id",
-+                $connection->quoteInto('cat_index.category_id = ?', $rootCategoryId),
-+                $connection->quoteInto('cat_index.visibility IN (?)', $visibleInSiteIds)
-+            ];
-+            $this->getSelect()->join(
-+                ['cat_index' => $this->tableMaintainer->getMainTable($this->_storeManager->getStore()->getId())],
-+                join(' AND ', $visibilityConditions),
-+                []
-+            );
-+        }
-+
-+        if ($this->_productSalable) {
-+            $availableProductTypes = $this->salesConfig->getAvailableProductTypes();
-+            $this->getSelect()->join(
-+                ['cat_prod' => $this->getTable('catalog_product_entity')],
-+                $this->getConnection()->quoteInto('cat_prod.type_id IN (?)', $availableProductTypes),
-+                []
-+            );
-+        }
-+    }
-+
-     /**
-      * Add filter by wishlist object
-      *
-@@ -418,6 +486,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
- 
-     /**
-      * Set Salable Filter.
-+     *
-      * This filter apply Salable Product Types Filter to product collection.
-      *
-      * @param bool $flag
-@@ -431,6 +500,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
- 
-     /**
-      * Set In Stock Filter.
-+     *
-      * This filter remove items with no salable product.
-      *
-      * @param bool $flag
-@@ -478,7 +548,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
- 
-         if (isset($constraints['to'])) {
-             $firstDay = new \DateTime();
--            $firstDay->modify('-' . $gmtOffset . ' second')->modify('-' . (intval($constraints['to']) + 1) . ' day');
-+            $firstDay->modify('-' . $gmtOffset . ' second')->modify('-' . ((int)($constraints['to']) + 1) . ' day');
-             $filter['from'] = $firstDay;
-         }
- 
-@@ -567,6 +637,8 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
-     }
- 
-     /**
-+     * After load data
-+     *
-      * @return $this
-      */
-     protected function _afterLoadData()
-diff --git a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
-index 75df3027ad9..ff59e0cdd7b 100644
---- a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
-+++ b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
-@@ -7,9 +7,11 @@
- namespace Magento\Wishlist\Model\Rss;
- 
- use Magento\Framework\App\Rss\DataProviderInterface;
-+use Magento\Store\Model\ScopeInterface;
- 
- /**
-  * Wishlist RSS model
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Wishlist implements DataProviderInterface
-@@ -70,6 +72,8 @@ class Wishlist implements DataProviderInterface
-     protected $customerFactory;
- 
-     /**
-+     * Wishlist constructor.
-+     *
-      * @param \Magento\Wishlist\Helper\Rss $wishlistHelper
-      * @param \Magento\Wishlist\Block\Customer\Wishlist $wishlistBlock
-      * @param \Magento\Catalog\Helper\Output $outputHelper
-@@ -114,16 +118,15 @@ class Wishlist implements DataProviderInterface
-      */
-     public function isAllowed()
-     {
--        return (bool)$this->scopeConfig->getValue(
--            'rss/wishlist/active',
--            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
--        );
-+        return $this->scopeConfig->isSetFlag('rss/wishlist/active', ScopeInterface::SCOPE_STORE)
-+            && $this->getWishlist()->getCustomerId() === $this->wishlistHelper->getCustomer()->getId();
-     }
- 
-     /**
-      * Get RSS feed items
-      *
-      * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getRssData()
-     {
-@@ -180,8 +183,8 @@ class Wishlist implements DataProviderInterface
-             }
-         } else {
-             $data = [
--                'title' => __('We cannot retrieve the Wish List.'),
--                'description' => __('We cannot retrieve the Wish List.'),
-+                'title' => __('We cannot retrieve the Wish List.')->render(),
-+                'description' => __('We cannot retrieve the Wish List.')->render(),
-                 'link' => $this->urlBuilder->getUrl(),
-                 'charset' => 'UTF-8',
-             ];
-@@ -191,14 +194,18 @@ class Wishlist implements DataProviderInterface
-     }
- 
-     /**
-+     * GetCacheKey
-+     *
-      * @return string
-      */
-     public function getCacheKey()
-     {
--        return 'rss_wishlist_data';
-+        return 'rss_wishlist_data_' . $this->getWishlist()->getId();
-     }
- 
-     /**
-+     * Get Cache Lifetime
-+     *
-      * @return int
-      */
-     public function getCacheLifetime()
-@@ -215,7 +222,7 @@ class Wishlist implements DataProviderInterface
-     {
-         $customerId = $this->getWishlist()->getCustomerId();
-         $customer = $this->customerFactory->create()->load($customerId);
--        $title = __('%1\'s Wishlist', $customer->getName());
-+        $title = __('%1\'s Wishlist', $customer->getName())->render();
-         $newUrl = $this->urlBuilder->getUrl(
-             'wishlist/shared/index',
-             ['code' => $this->getWishlist()->getSharingCode()]
-@@ -264,7 +271,7 @@ class Wishlist implements DataProviderInterface
-     }
- 
-     /**
--     * @return array
-+     * @inheritdoc
-      */
-     public function getFeeds()
-     {
-@@ -272,7 +279,7 @@ class Wishlist implements DataProviderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isAuthRequired()
-     {
-diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
-index ec0021c4949..9797ab58b07 100644
---- a/app/code/Magento/Wishlist/Model/Wishlist.php
-+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
-@@ -380,6 +380,7 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
- 
-     /**
-      * Adds new product to wishlist.
-+     *
-      * Returns new item or string on error.
-      *
-      * @param int|\Magento\Catalog\Model\Product $product
-@@ -581,7 +582,7 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
-      */
-     public function getItemsCount()
-     {
--        return $this->getItemCollection()->getSize();
-+        return $this->getItemCollection()->count();
-     }
- 
-     /**
-diff --git a/app/code/Magento/Wishlist/Setup/Patch/Data/ConvertSerializedData.php b/app/code/Magento/Wishlist/Setup/Patch/Data/ConvertSerializedData.php
-index 76f27756d82..0e809c47039 100644
---- a/app/code/Magento/Wishlist/Setup/Patch/Data/ConvertSerializedData.php
-+++ b/app/code/Magento/Wishlist/Setup/Patch/Data/ConvertSerializedData.php
-@@ -3,20 +3,17 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- namespace Magento\Wishlist\Setup\Patch\Data;
- 
--use Magento\Framework\DB\FieldDataConverterFactory;
- use Magento\Framework\DB\DataConverter\SerializedToJson;
--use Magento\Framework\DB\Select\QueryModifierFactory;
-+use Magento\Framework\DB\FieldDataConverterFactory;
- use Magento\Framework\DB\Query\Generator as QueryGenerator;
--use Magento\Framework\App\ResourceConnection;
-+use Magento\Framework\DB\Select\QueryModifierFactory;
- use Magento\Framework\Setup\Patch\DataPatchInterface;
- use Magento\Framework\Setup\Patch\PatchVersionInterface;
- 
- /**
-- * Class ConvertSerializedData
-- * @package Magento\Wishlist\Setup\Patch
-+ * Convert serialized wishlist item data.
-  */
- class ConvertSerializedData implements DataPatchInterface, PatchVersionInterface
- {
-@@ -60,7 +57,7 @@ class ConvertSerializedData implements DataPatchInterface, PatchVersionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function apply()
-     {
-@@ -68,7 +65,7 @@ class ConvertSerializedData implements DataPatchInterface, PatchVersionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getDependencies()
-     {
-@@ -76,7 +73,7 @@ class ConvertSerializedData implements DataPatchInterface, PatchVersionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public static function getVersion()
-     {
-@@ -84,13 +81,19 @@ class ConvertSerializedData implements DataPatchInterface, PatchVersionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAliases()
-     {
-         return [];
-     }
--    
-+
-+    /**
-+     * Convert serialized whishlist item data.
-+     *
-+     * @throws \Magento\Framework\DB\FieldDataConversionException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-     private function convertSerializedData()
-     {
-         $connection = $this->moduleDataSetup->getConnection();
-diff --git a/app/code/Magento/Wishlist/Setup/Patch/Schema/AddProductIdConstraint.php b/app/code/Magento/Wishlist/Setup/Patch/Schema/AddProductIdConstraint.php
-new file mode 100644
-index 00000000000..5c65fce10cc
---- /dev/null
-+++ b/app/code/Magento/Wishlist/Setup/Patch/Schema/AddProductIdConstraint.php
-@@ -0,0 +1,79 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Wishlist\Setup\Patch\Schema;
-+
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+use Magento\Framework\Setup\Patch\SchemaPatchInterface;
-+use Magento\Framework\Setup\SchemaSetupInterface;
-+
-+/**
-+ * Class AddProductIdConstraint
-+ */
-+class AddProductIdConstraint implements SchemaPatchInterface
-+{
-+    /**
-+     * @var SchemaSetupInterface
-+     */
-+    private $schemaSetup;
-+
-+    /**
-+     * @param SchemaSetupInterface $schemaSetup
-+     */
-+    public function __construct(
-+        SchemaSetupInterface $schemaSetup
-+    ) {
-+        $this->schemaSetup = $schemaSetup;
-+    }
-+
-+    /**
-+     * Run code inside patch.
-+     *
-+     * @return void
-+     */
-+    public function apply()
-+    {
-+        $this->schemaSetup->startSetup();
-+
-+        $this->schemaSetup->getConnection()->addForeignKey(
-+            $this->schemaSetup->getConnection()->getForeignKeyName(
-+                $this->schemaSetup->getTable('wishlist_item_option'),
-+                'product_id',
-+                $this->schemaSetup->getTable('catalog_product_entity'),
-+                'entity_id'
-+            ),
-+            $this->schemaSetup->getTable('wishlist_item_option'),
-+            'product_id',
-+            $this->schemaSetup->getTable('catalog_product_entity'),
-+            'entity_id',
-+            AdapterInterface::FK_ACTION_CASCADE,
-+            true
-+        );
-+
-+        $this->schemaSetup->endSetup();
-+    }
-+
-+    /**
-+     * Get array of patches that have to be executed prior to this.
-+     *
-+     * @return string[]
-+     */
-+    public static function getDependencies()
-+    {
-+        return [];
-+    }
-+
-+    /**
-+     * Get aliases (previous names) for the patch.
-+     *
-+     * @return string[]
-+     */
-+    public function getAliases()
-+    {
-+        return [];
-+    }
-+}
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
-index edd1af41964..55e146b09ee 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-     <!-- Add Product to wishlist from the category page and check message -->
-     <actionGroup name="StorefrontCustomerAddCategoryProductToWishlistActionGroup">
-         <arguments>
-@@ -25,9 +25,10 @@
-         <arguments>
-             <argument name="productVar"/>
-         </arguments>
-+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.productAddToWishlist}}" stepKey="WaitForWishList"/>
-         <click selector="{{StorefrontProductInfoMainSection.productAddToWishlist}}" stepKey="addProductToWishlistClickAddToWishlist" />
-         <waitForElement selector="{{StorefrontCustomerWishlistSection.successMsg}}" time="30" stepKey="addProductToWishlistWaitForSuccessMessage"/>
--        <see selector="{{StorefrontCustomerWishlistSection.successMsg}}" userInput="{{productVar.name}} has been added to your Wish List." stepKey="addProductToWishlistSeeProductNameAddedToWishlist"/>
-+        <see selector="{{StorefrontCustomerWishlistSection.successMsg}}" userInput="{{productVar.name}} has been added to your Wish List. Click here to continue shopping." stepKey="addProductToWishlistSeeProductNameAddedToWishlist"/>
-         <seeCurrentUrlMatches regex="~/wishlist_id/\d+/$~" stepKey="seeCurrentUrlMatches"/>
-     </actionGroup>
- 
-@@ -73,4 +74,33 @@
-         <waitForElement selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="AddProductToCartFromWishlistUsingSidebarWaitForSuccessMessage"/>
-         <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="AddProductToCartFromWishlistUsingSidebarSeeProductNameAddedToCartFromWishlist"/>
-     </actionGroup>
-+
-+    <actionGroup name="StorefrontCustomerEditProductInWishlist">
-+        <arguments>
-+            <argument name="product"/>
-+            <argument name="description" type="string"/>
-+            <argument name="quantity" type="string"/>
-+        </arguments>
-+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName(product.name)}}" stepKey="mouseOverOnProduct"/>
-+        <fillField selector="{{StorefrontCustomerWishlistProductSection.ProductDescription(product.name)}}" userInput="{{description}}" stepKey="fillDescription"/>
-+        <fillField selector="{{StorefrontCustomerWishlistProductSection.ProductQuantity(product.name)}}" userInput="{{quantity}}" stepKey="fillQuantity"/>
-+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductAddAllToCart}}" stepKey="mouseOver"/>
-+        <click selector="{{StorefrontCustomerWishlistProductSection.ProductUpdateWishList}}" stepKey="submitUpdateWishlist"/>
-+        <see selector="{{StorefrontCustomerWishlistProductSection.ProductSuccessUpdateMessage}}" userInput="{{product.name}} has been updated in your Wish List." stepKey="successMessage"/>
-+    </actionGroup>
-+
-+    <!-- Share wishlist -->
-+    <actionGroup name="StorefrontCustomerShareWishlistActionGroup">
-+        <click selector="{{StorefrontCustomerWishlistProductSection.productShareWishList}}" stepKey="clickMyWishListButton"/>
-+        <fillField userInput="{{Wishlist.shareInfo_emails}}" selector="{{StorefrontCustomerWishlistShareSection.ProductShareWishlistEmail}}" stepKey="fillEmailsForShare"/>
-+        <fillField userInput="{{Wishlist.shareInfo_message}}" selector="{{StorefrontCustomerWishlistShareSection.ProductShareWishlistTextMessage}}" stepKey="fillShareMessage"/>
-+        <click selector="{{StorefrontCustomerWishlistShareSection.ProductShareWishlistButton}}" stepKey="sendWishlist"/>
-+        <see selector="{{StorefrontCustomerWishlistProductSection.productSuccessShareMessage}}" userInput="Your wish list has been shared." stepKey="successMessage"/>
-+    </actionGroup>
-+
-+    <!-- Check that wishlist is empty -->
-+    <actionGroup name="StorefrontAssertCustomerWishlistIsEmpty">
-+        <dontSeeElement selector="{{StorefrontCustomerWishlistProductSection.pager}}" stepKey="checkThatPagerIsAbsent"/>
-+        <see selector="{{StorefrontCustomerWishlistProductSection.wishlistEmpty}}" userInput="You have no items in your wish list." stepKey="checkNoItemsMessage"/>
-+    </actionGroup>
- </actionGroups>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Data/WishlistData.xml b/app/code/Magento/Wishlist/Test/Mftf/Data/WishlistData.xml
-index 93fb9a5689e..a8220ad0cfc 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Data/WishlistData.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Data/WishlistData.xml
-@@ -6,11 +6,13 @@
-   */
- -->
- 
--<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-     <entity name="Wishlist" type="wishlist">
-         <data key="id">null</data>
-         <var key="product" entityType="product" entityKey="id"/>
-         <var key="customer_email" entityType="customer" entityKey="email"/>
-         <var key="customer_password" entityType="customer" entityKey="password"/>
-+        <data key="shareInfo_emails">JohnDoe123456789@example.com,JohnDoe987654321@example.com,JohnDoe123456abc@example.com</data>
-+        <data key="shareInfo_message">Sharing message.</data>
-     </entity>
- </entities>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Metadata/wishlist-meta.xml b/app/code/Magento/Wishlist/Test/Mftf/Metadata/wishlist-meta.xml
-index 37f2bbe6a29..423367c9a3b 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Metadata/wishlist-meta.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Metadata/wishlist-meta.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
-     <operation name="CreateWishlist" dataType="wishlist" type="create"
-                auth="customerFormKey" url="/wishlist/index/add/" method="POST" successRegex="" returnRegex="~\/wishlist_id\/(\d*?)\/~" >
-         <contentType>application/x-www-form-urlencoded</contentType>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Page/StorefrontCustomerWishlistPage.xml b/app/code/Magento/Wishlist/Test/Mftf/Page/StorefrontCustomerWishlistPage.xml
-index cf2db7efab6..986d1e59ad0 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Page/StorefrontCustomerWishlistPage.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Page/StorefrontCustomerWishlistPage.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-     <page name="StorefrontCustomerWishlistPage" url="/wishlist/" area="storefront" module="Magento_Wishlist">
-         <section name="StorefrontCustomerWishlistSection" />
-     </page>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Page/StorefrontCustomerWishlistSharePage.xml b/app/code/Magento/Wishlist/Test/Mftf/Page/StorefrontCustomerWishlistSharePage.xml
-new file mode 100644
-index 00000000000..6d6151648c5
---- /dev/null
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Page/StorefrontCustomerWishlistSharePage.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-+    <page name="StorefrontCustomerWishlistSharePage" url="/wishlist/index/share/wishlist_id/{{wishlistId}}/" area="storefront" module="Magento_Wishlist">
-+        <section name="StorefrontCustomerWishlistShareSection"/>
-+    </page>
-+</pages>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCategoryProductSection.xml
-index 20d72a07046..07f8b91661d 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCategoryProductSection.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCategoryProductSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCategoryProductSection">
-         <element name="ProductAddToWishlistByNumber" type="text" selector="//main//li[{{var1}}]//a[contains(@class, 'towishlist')]" parameterized="true"/>
-         <element name="ProductAddToWishlistByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'towishlist')]" parameterized="true"/>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
-index 8115e591aa9..0b6c2f1191c 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCustomerWishlistProductSection">
-         <element name="ProductTitleByName" type="button" selector="//main//li//a[contains(text(), '{{var1}}')]" parameterized="true"/>
-         <element name="ProductPriceByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//span[@class='price']" parameterized="true"/>
-@@ -15,5 +15,14 @@
-         <element name="ProductInfoByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//div[@class='product-item-info']" parameterized="true"/>
-         <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//button[contains(@class, 'action tocart primary')]" parameterized="true"/>
-         <element name="ProductImageByImageName" type="text" selector="//main//li//a//img[contains(@src, '{{var1}}')]" parameterized="true"/>
-+        <element name="ProductDescription" type="input" selector="//a[contains(text(), '{{productName}}')]/ancestor::div[@class='product-item-info']//textarea[@class='product-item-comment']" parameterized="true"/>
-+        <element name="ProductQuantity" type="input" selector="//a[contains(text(), '{{productName}}')]/ancestor::div[@class='product-item-info']//input[@class='input-text qty']" parameterized="true"/>
-+        <element name="ProductUpdateWishList" type="button" selector=".column.main .actions-toolbar .action.update" timeout="30"/>
-+        <element name="ProductAddAllToCart" type="button" selector=".column.main .actions-toolbar .action.tocart" timeout="30"/>
-+        <element name="productShareWishList" type="button" selector="button.action.share" timeout="30" />
-+        <element name="ProductSuccessUpdateMessage" type="text" selector="//div[1]/div[2]/div/div/div"/>
-+        <element name="productSuccessShareMessage" type="text" selector="div.message-success"/>
-+        <element name="pager" type="block" selector=".toolbar .pager"/>
-+        <element name="wishlistEmpty" type="block" selector=".form-wishlist-items .message.info.empty"/>
-     </section>
- </sections>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
-index 747ad958adb..c208bfc41dc 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCustomerWishlistSection">
-         <element name="pageTitle" type="text" selector="h1.page-title"/>
-         <element name="successMsg" type="text" selector="div.message-success.success.message"/>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistShareSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistShareSection.xml
-new file mode 100644
-index 00000000000..76b99ba56a3
---- /dev/null
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistShareSection.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+
-+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-+    <section name="StorefrontCustomerWishlistShareSection">
-+        <element name="ProductShareWishlistEmail" type="input" selector="#email_address"/>
-+        <element name="ProductShareWishlistTextMessage" type="input" selector="#message"/>
-+        <element name="ProductShareWishlistButton" type="button" selector=".action.submit.primary" timeout="30"/>
-+    </section>
-+</sections>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml
-index dfff8b91e89..ba226837c5f 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontCustomerWishlistSidebarSection">
-         <element name="ProductTitleByName" type="button" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']" parameterized="true"/>
-         <element name="ProductPriceByName" type="text" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']//ancestor::ol//span[@class='price']" parameterized="true"/>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-index ea2dfcbedaa..e77c4890740 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-     <section name="StorefrontProductInfoMainSection">
-         <element name="productAddToWishlist" type="button" selector="a.action.towishlist"/>
-     </section>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
-new file mode 100644
-index 00000000000..4e6a062c799
---- /dev/null
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
-@@ -0,0 +1,72 @@
-+<?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="ConfProdAddToCartWishListWithUnselectedAttrTest">
-+        <annotations>
-+            <stories value="Wishlist"/>
-+            <group value="wishlist"/>
-+            <title value="Adding configurable product to Cart from Wish List with unselected attributes"/>
-+            <description value="Verify adding configurable product to Cart from Wish List when attributes is unselected"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MAGETWO-95897"/>
-+            <useCaseId value="MAGETWO-95837"/>
-+        </annotations>
-+
-+        <before>
-+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-+            <createData entity="ApiCategory" stepKey="createCategory"/>
-+            <!--Create Configurable product-->
-+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
-+                <argument name="product" value="_defaultProduct"/>
-+                <argument name="category" value="$$createCategory$$"/>
-+            </actionGroup>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-+            <!-- Delete the first simple product -->
-+            <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
-+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
-+            </actionGroup>
-+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
-+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+
-+        <!--Login as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <waitForPageLoad stepKey="waitForLogin"/>
-+
-+        <!--Go To Created Product Page-->
-+        <amOnPage stepKey="goToCreatedProductPage" url="{{_defaultProduct.urlKey}}.html"/>
-+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
-+
-+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="checkDropDownProductOption"/>
-+        <selectOption userInput="{{colorProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
-+        <selectOption userInput="{{colorProductAttribute2.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption2"/>
-+        <click selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="clickDropDownProductOption"/>
-+
-+        <!--Click Add to Wish List link-->
-+        <click selector="{{StorefrontProductPageSection.addToWishlist}}" stepKey="addFirstPnroductToWishlist"/>
-+
-+        <waitForPageLoad stepKey="waitForLoading"/>
-+
-+        <!--Click "Add All to Cart" button-->
-+        <click selector="{{StorefrontCustomerWishlistProductSection.ProductAddAllToCart}}" stepKey="addAllToCart"/>
-+        <waitForElementVisible stepKey="waitForErrorAppears" selector="{{StorefrontMessagesSection.error}}"/>
-+
-+        <!--Assert Correct Error Message-->
-+        <see userInput="You need to choose options for your item for" stepKey="assertCorrectErrorMessage"/>
-+        <dontSee userInput="1 product(s) have been added to shopping cart" stepKey="dontSeeSuccessMessage"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
-index 95beae99138..6b951c89208 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
-@@ -6,7 +6,8 @@
-   */
- -->
- 
--<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="ConfigurableProductChildImageShouldBeShownOnWishListTest">
-         <annotations>
-             <features value="Wishlist"/>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-index 194737788eb..7eb42d1fbfe 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CLoggedInUserTest">
-         <!-- Step 5: Add products to wishlist -->
-         <comment userInput="Start of adding products to wishlist" stepKey="startOfAddingProductsToWishlist" after="endOfComparingProducts" />
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
-index 0a4d241b0e4..ede63322235 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
-@@ -6,13 +6,19 @@
-   */
- -->
- 
--<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontAddMultipleStoreProductsToWishlistTest">
-         <annotations>
-             <features value="Wishlist"/>
-+            <stories value="Adding to wishlist"/>
-             <title value="Customer should be able to add products to wishlist from different stores"/>
-             <description value="All products added to wishlist should be visible on any store. Even if product visibility was set to 'Not Visible Individually' for this store"/>
-             <group value="wishlist"/>
-+            <severity value="AVERAGE"/>
-+            <testCaseId value="MAGETWO-95678"/>
-+            <skip>
-+                <issueId value="MC-13867"/>
-+            </skip>
-         </annotations>
-         <before>
-             <createData entity="customStoreGroup" stepKey="storeGroup"/>
-@@ -83,15 +89,12 @@
-         <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
-         <click selector="{{StorefrontFooterSection.storeLink($$storeGroup.group[name]$$)}}" stepKey="SelectSecondStoreToSwitchOn"/>
-         <!-- Verify that both products are visible in wishlist on both stores -->
--        <see userInput="$$product.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}" stepKey="seeProduct1InWishlist"/>
-         <amOnPage url="$$secondProduct.name$$.html" stepKey="navigateToProductPageOnSecondStore"/>
-         <see userInput="$$secondProduct.name$$" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertSecondProductNameTitle"/>
-         <click selector="{{StorefrontProductPageSection.addToWishlist}}" stepKey="addSecondProductToWishlist"/>
--        <see userInput="$$product.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}" stepKey="seeProduct1InWishlistOnSecondStore"/>
-         <see userInput="$$secondProduct.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}" stepKey="seeProduct2InWishlistOnSecondStore"/>
-         <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnSecondStore"/>
-         <click selector="{{StorefrontFooterSection.storeLink('Main Website Store')}}" stepKey="SelectDefaultStoreToSwitchOn"/>
-         <see userInput="$$product.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}" stepKey="seeProduct1InWishlistOnDefaultStore"/>
--        <see userInput="$$secondProduct.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}" stepKey="seeProduct2InWishlistOnDefaultStore"/>
-     </test>
- </tests>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml
-index b20ba3a153f..16a18dd27b1 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml
-@@ -6,12 +6,15 @@
-   */
- -->
- 
--<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontAddProductsToCartFromWishlistUsingSidebarTest">
-         <annotations>
-+            <features value="Wishlist"/>
-+            <stories value="Add to wishlist"/>
-             <title value="Add products from the wishlist to the cart using the sidebar."/>
-             <description value="Products added to the cart from wishlist and a customer remains on the same page."/>
-             <group value="wishlist"/>
-+            <severity value="AVERAGE"/>
-         </annotations>
-         <before>
-             <createData entity="SimpleSubCategory" stepKey="categoryFirst"/>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
-index cbed63db36d..0001bd9d6db 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
-@@ -6,16 +6,19 @@
-   */
- -->
- 
--<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontDeletePersistedWishlistTest">
-         <annotations>
-             <features value="Wishlist"/>
-             <stories value="Delete a persist wishlist for a customer"/>
-             <title value="Customer should be able to delete a persistent wishlist"/>
-             <description value="Customer should be able to delete a persistent wishlist"/>
-+            <severity value="AVERAGE"/>
-             <group value="wishlist"/>
--            <!-- MQE-1145 -->
--            <group value="skip"/>
-+            <testCaseId value="MC-4110"/>
-+            <skip>
-+                <issueId value="MQE-1145"/>
-+            </skip>
-         </annotations>
-         <before>
-             <createData stepKey="category" entity="SimpleSubCategory"/>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml
-index f6deb803967..e3382dc41d2 100644
---- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml
-@@ -6,12 +6,15 @@
-   */
- -->
- 
--<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="StorefrontRemoveProductsFromWishlistUsingSidebarTest">
-         <annotations>
-+            <features value="Wishlist"/>
-+            <stories value="Remove from wishlist"/>
-             <title value="Remove products from the wishlist using the sidebar."/>
-             <description value="Products removed from wishlist and a customer remains on the same page."/>
-             <group value="wishlist"/>
-+            <severity value="AVERAGE"/>
-         </annotations>
-         <before>
-             <createData entity="SimpleSubCategory" stepKey="categoryFirst"/>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistEntityTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistEntityTest.xml
-new file mode 100644
-index 00000000000..87c5ed95094
---- /dev/null
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistEntityTest.xml
-@@ -0,0 +1,54 @@
-+<?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="StorefrontShareWishlistEntityTest">
-+        <annotations>
-+            <features value="Wishlist"/>
-+            <stories value="Customer wishlist"/>
-+            <title value="Customer should be able to share a persistent wishlist"/>
-+            <description value="Customer should be able to share a persistent wishlist"/>
-+            <severity value="AVERAGE"/>
-+            <group value="wishlist"/>
-+            <testCaseId value="MC-13976"/>
-+            <group value="wishlist"/>
-+            <group value="mtf_migrated"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="category"/>
-+            <createData entity="SimpleProduct" stepKey="product">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="Simple_US_Customer" stepKey="customer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="product" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-+        </after>
-+
-+        <!-- Sign in as customer -->
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-+            <argument name="Customer" value="$$customer$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openProductFromCategory">
-+            <argument name="category" value="$$category$$"/>
-+            <argument name="product" value="$$product$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addToWishlistProduct">
-+            <argument name="productVar" value="$$product$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontCustomerShareWishlistActionGroup" stepKey="shareWishlist"/>
-+
-+        <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
-new file mode 100644
-index 00000000000..e482449f623
---- /dev/null
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
-@@ -0,0 +1,58 @@
-+<?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="StorefrontUpdateWishlistTest">
-+        <annotations>
-+            <title value="Displaying of message after Wish List update"/>
-+            <stories value="MAGETWO-91666: Wishlist update does not return a success message"/>
-+            <description value="Displaying of message after Wish List update"/>
-+            <severity value="MAJOR"/>
-+            <testCaseId value="MAGETWO-94296"/>
-+            <group value="Wishlist"/>
-+        </annotations>
-+
-+        <before>
-+            <createData entity="SimpleSubCategory" stepKey="category"/>
-+            <createData entity="SimpleProduct" stepKey="product">
-+                <requiredEntity createDataKey="category"/>
-+            </createData>
-+            <createData entity="Simple_US_Customer" stepKey="customer"/>
-+        </before>
-+
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-+            <argument name="Customer" value="$$customer$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openProductFromCategory">
-+            <argument name="category" value="$$category$$"/>
-+            <argument name="product" value="$$product$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addProductToWishlist">
-+            <argument name="productVar" value="$$product$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontCustomerCheckProductInWishlist" stepKey="checkProductInWishlist">
-+            <argument name="productVar" value="$$product$$"/>
-+        </actionGroup>
-+
-+        <actionGroup ref="StorefrontCustomerEditProductInWishlist" stepKey="updateProductInWishlist">
-+            <argument name="product" value="$$product$$"/>
-+            <argument name="description" value="some text"/>
-+            <argument name="quantity" value="2"/>
-+        </actionGroup>
-+
-+        <after>
-+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-+            <deleteData createDataKey="product" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-+        </after>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/WishListWithDisabledProductTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/WishListWithDisabledProductTest.xml
-new file mode 100644
-index 00000000000..af216c139e7
---- /dev/null
-+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/WishListWithDisabledProductTest.xml
-@@ -0,0 +1,50 @@
-+<?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="WishListWithDisabledProductTest">
-+        <annotations>
-+            <title value="Wish List should not include disabled products"/>
-+            <stories value="Customer wishlist"/>
-+            <description value="Wish List should not include disabled products and pager should be absent"/>
-+            <severity value="MAJOR"/>
-+            <useCaseId value="MAGETWO-99228"/>
-+            <testCaseId value="MC-16050"/>
-+            <group value="wishlist"/>
-+        </annotations>
-+        <before>
-+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-+        </before>
-+        <after>
-+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-+            <actionGroup ref="logout" stepKey="logout"/>
-+        </after>
-+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-+            <argument name="Customer" value="$$createCustomer$$"/>
-+        </actionGroup>
-+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProductPage"/>
-+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addProductToWishlist">
-+            <argument name="productVar" value="$$createProduct$$"/>
-+        </actionGroup>
-+        <actionGroup ref="StorefrontCustomerCheckProductInWishlist" stepKey="checkProductInWishlist">
-+            <argument name="productVar" value="$$createProduct$$"/>
-+        </actionGroup>
-+        <openNewTab stepKey="openNewTab"/>
-+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
-+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="goToProductEditPage"/>
-+        <actionGroup ref="AdminSetProductDisabled" stepKey="disableProduct"/>
-+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-+        <closeTab stepKey="closeSecondTab"/>
-+        <reloadPage stepKey="refreshPage"/>
-+        <actionGroup ref="StorefrontAssertCustomerWishlistIsEmpty" stepKey="checkProductIsAbsentInWishlistIsEmpty"/>
-+    </test>
-+</tests>
-diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
-index d89f6e43e07..e9061f1f3d5 100644
---- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
-+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
-@@ -735,7 +735,7 @@ class CartTest extends \PHPUnit\Framework\TestCase
-             ->willThrowException(new ProductException(__('Test Phrase')));
- 
-         $this->messageManagerMock->expects($this->once())
--            ->method('addError')
-+            ->method('addErrorMessage')
-             ->with('This product(s) is out of stock.', null)
-             ->willReturnSelf();
- 
-@@ -901,7 +901,7 @@ class CartTest extends \PHPUnit\Framework\TestCase
-             ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('message')));
- 
-         $this->messageManagerMock->expects($this->once())
--            ->method('addNotice')
-+            ->method('addNoticeMessage')
-             ->with('message', null)
-             ->willReturnSelf();
- 
-@@ -1073,7 +1073,7 @@ class CartTest extends \PHPUnit\Framework\TestCase
-             ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('message')));
- 
-         $this->messageManagerMock->expects($this->once())
--            ->method('addNotice')
-+            ->method('addNoticeMessage')
-             ->with('message', null)
-             ->willReturnSelf();
- 
-diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/DownloadCustomOptionTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/DownloadCustomOptionTest.php
-deleted file mode 100644
-index 6fefe18cf89..00000000000
---- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/DownloadCustomOptionTest.php
-+++ /dev/null
-@@ -1,154 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Wishlist\Test\Unit\Controller\Index;
--
--class DownloadCustomOptionTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \Magento\Wishlist\Controller\Index\DownloadCustomOption
--     */
--    protected $model;
--
--    /**
--     * @var \Magento\Framework\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $contextMock;
--
--    /**
--     * @var \Magento\Framework\App\Response\Http\FileFactory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $fileResponseFactoryMock;
--
--    /**
--     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $requestMock;
--
--    /**
--     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $objectManagerMock;
--
--    /**
--     * @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $resultFactoryMock;
--
--    /**
--     * @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $jsonMock;
--
--    protected function setUp()
--    {
--        $this->fileResponseFactoryMock = $this->getMockBuilder(\Magento\Framework\App\Response\Http\FileFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->jsonMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['create', 'get', 'configure'])
--            ->getMock();
--
--        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->contextMock = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->contextMock->expects($this->any())
--            ->method('getObjectManager')
--            ->willReturn($this->objectManagerMock);
--        $this->contextMock->expects($this->any())
--            ->method('getRequest')
--            ->willReturn($this->requestMock);
--        $this->contextMock->expects($this->any())
--            ->method('getResultFactory')
--            ->willReturn($this->resultFactoryMock);
--
--        $this->model = new \Magento\Wishlist\Controller\Index\DownloadCustomOption(
--            $this->contextMock,
--            $this->fileResponseFactoryMock,
--            $this->jsonMock
--        );
--    }
--
--    public function testExecute()
--    {
--        $data = [
--            'number' => 42,
--            'string' => 'string_value',
--            'boolean' => true,
--            'collection' => [1, 2, 3],
--            'secret_key' => 999
--        ];
--        $serialized_data = json_encode($data);
--
--        $optionMock = $this->getMockBuilder(\Magento\Wishlist\Model\Item\Option::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getProductId', 'load', 'getId', 'getValue'])
--            ->getMock();
--        $optionMock->expects($this->any())
--            ->method('load')
--            ->willReturnSelf();
--        $optionMock->expects($this->any())
--            ->method('getId')
--            ->willReturn(true);
--        $optionMock->expects($this->any())
--            ->method('getProductId')
--            ->willReturn('some_value');
--        $optionMock->expects($this->any())
--            ->method('getValue')
--            ->willReturn($serialized_data);
--
--        $productOptionMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getProductId', 'load', 'getId', 'getType'])
--            ->getMock();
--        $productOptionMock->expects($this->any())
--            ->method('load')
--            ->willReturnSelf();
--        $productOptionMock->expects($this->any())
--            ->method('getId')
--            ->willReturn(true);
--        $productOptionMock->expects($this->any())
--            ->method('getProductId')
--            ->willReturn('some_value');
--        $productOptionMock->expects($this->any())
--            ->method('getType')
--            ->willReturn('file');
--
--        $this->objectManagerMock->expects($this->any())
--            ->method('create')
--            ->willReturnMap(
--                [
--                    [\Magento\Wishlist\Model\Item\Option::class, [], $optionMock],
--                    [\Magento\Catalog\Model\Product\Option::class, [], $productOptionMock]
--                ]
--            );
--
--        $this->requestMock->expects($this->any())
--            ->method('getParam')
--            ->willReturn(1);
--
--        $this->jsonMock->expects($this->once())
--            ->method('unserialize')
--            ->willReturnCallback(function ($value) {
--                return json_decode($value, true);
--            });
--
--        $this->assertEquals(null, $this->model->execute());
--    }
--}
-diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php
-index a8c0fbb951c..47148f78781 100644
---- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php
-+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php
-@@ -5,32 +5,24 @@
-  */
- namespace Magento\Wishlist\Test\Unit\Controller\Index;
- 
--use Magento\Customer\Helper\View as CustomerViewHelper;
- use Magento\Customer\Model\Data\Customer as CustomerData;
--use Magento\Customer\Model\Session as CustomerSession;
- use Magento\Framework\App\Action\Context as ActionContext;
--use Magento\Framework\App\Area;
--use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\RequestInterface;
- use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
- use Magento\Framework\Controller\ResultFactory;
- use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
- use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
--use Magento\Framework\Mail\Template\TransportBuilder;
- use Magento\Framework\Mail\TransportInterface;
- use Magento\Framework\Message\ManagerInterface;
--use Magento\Framework\Session\Generic as WishlistSession;
--use Magento\Framework\Translate\Inline\StateInterface as TranslateInlineStateInterface;
- use Magento\Framework\UrlInterface;
--use Magento\Framework\View\Layout;
- use Magento\Framework\View\Result\Layout as ResultLayout;
--use Magento\Store\Model\ScopeInterface;
- use Magento\Store\Model\Store;
--use Magento\Store\Model\StoreManagerInterface;
- use Magento\Wishlist\Controller\Index\Send;
- use Magento\Wishlist\Controller\WishlistProviderInterface;
--use Magento\Wishlist\Model\Config as WishlistConfig;
--use Magento\Wishlist\Model\Wishlist;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Captcha\Helper\Data as CaptchaHelper;
-+use Magento\Captcha\Model\DefaultModel as CaptchaModel;
-+use Magento\Customer\Model\Session;
- 
- /**
-  * @SuppressWarnings(PHPMD.TooManyFields)
-@@ -47,36 +39,12 @@ class SendTest extends \PHPUnit\Framework\TestCase
-     /** @var  FormKeyValidator |\PHPUnit_Framework_MockObject_MockObject */
-     protected $formKeyValidator;
- 
--    /** @var  CustomerSession |\PHPUnit_Framework_MockObject_MockObject */
--    protected $customerSession;
--
-     /** @var  WishlistProviderInterface |\PHPUnit_Framework_MockObject_MockObject */
-     protected $wishlistProvider;
- 
--    /** @var  WishlistConfig |\PHPUnit_Framework_MockObject_MockObject */
--    protected $wishlistConfig;
--
--    /** @var  TransportBuilder |\PHPUnit_Framework_MockObject_MockObject */
--    protected $transportBuilder;
--
--    /** @var  TranslateInlineStateInterface |\PHPUnit_Framework_MockObject_MockObject */
--    protected $inlineTranslation;
--
--    /** @var  CustomerViewHelper |\PHPUnit_Framework_MockObject_MockObject */
--    protected $customerViewHelper;
--
--    /** @var  WishlistSession |\PHPUnit_Framework_MockObject_MockObject */
--    protected $wishlistSession;
--
--    /** @var  ScopeConfigInterface |\PHPUnit_Framework_MockObject_MockObject */
--    protected $scopeConfig;
--
-     /** @var  Store |\PHPUnit_Framework_MockObject_MockObject */
-     protected $store;
- 
--    /** @var  StoreManagerInterface |\PHPUnit_Framework_MockObject_MockObject */
--    protected $storeManager;
--
-     /** @var  ResultFactory |\PHPUnit_Framework_MockObject_MockObject */
-     protected $resultFactory;
- 
-@@ -86,15 +54,9 @@ class SendTest extends \PHPUnit\Framework\TestCase
-     /** @var  ResultLayout |\PHPUnit_Framework_MockObject_MockObject */
-     protected $resultLayout;
- 
--    /** @var  Layout |\PHPUnit_Framework_MockObject_MockObject */
--    protected $layout;
--
-     /** @var  RequestInterface |\PHPUnit_Framework_MockObject_MockObject */
-     protected $request;
- 
--    /** @var  Wishlist |\PHPUnit_Framework_MockObject_MockObject */
--    protected $wishlist;
--
-     /** @var  ManagerInterface |\PHPUnit_Framework_MockObject_MockObject */
-     protected $messageManager;
- 
-@@ -110,6 +72,15 @@ class SendTest extends \PHPUnit\Framework\TestCase
-     /** @var  EventManagerInterface |\PHPUnit_Framework_MockObject_MockObject */
-     protected $eventManager;
- 
-+    /** @var  CaptchaHelper |\PHPUnit_Framework_MockObject_MockObject */
-+    protected $captchaHelper;
-+
-+    /** @var CaptchaModel |\PHPUnit_Framework_MockObject_MockObject */
-+    protected $captchaModel;
-+
-+    /** @var Session |\PHPUnit_Framework_MockObject_MockObject */
-+    protected $customerSession;
-+
-     /**
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-@@ -136,7 +107,7 @@ class SendTest extends \PHPUnit\Framework\TestCase
-         $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
-             ->setMethods([
-                 'getPost',
--                'getPostValue',
-+                'getPostValue'
-             ])
-             ->getMockForAbstractClass();
- 
-@@ -172,90 +143,72 @@ class SendTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->wishlistProvider = $this->getMockBuilder(\Magento\Wishlist\Controller\WishlistProviderInterface::class)
--            ->getMockForAbstractClass();
--
--        $this->wishlistConfig = $this->getMockBuilder(\Magento\Wishlist\Model\Config::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->transportBuilder = $this->getMockBuilder(\Magento\Framework\Mail\Template\TransportBuilder::class)
-+        $customerMock = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
-             ->disableOriginalConstructor()
-+            ->setMethods([
-+                'getEmail',
-+                'getId'
-+            ])
-             ->getMock();
- 
--        $this->inlineTranslation = $this->getMockBuilder(\Magento\Framework\Translate\Inline\StateInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
-+        $customerMock->expects($this->any())
-+            ->method('getEmail')
-+            ->willReturn('expamle@mail.com');
- 
--        $this->customerViewHelper = $this->getMockBuilder(\Magento\Customer\Helper\View::class)
--            ->disableOriginalConstructor()
--            ->getMock();
-+        $customerMock->expects($this->any())
-+            ->method('getId')
-+            ->willReturn(false);
- 
--        $this->wishlistSession = $this->getMockBuilder(\Magento\Framework\Session\Generic::class)
-+        $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['setSharingForm'])
-+            ->setMethods([
-+                'getCustomer',
-+                'getData'
-+            ])
-             ->getMock();
- 
--        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
-+        $this->customerSession->expects($this->any())
-+            ->method('getCustomer')
-+            ->willReturn($customerMock);
- 
--        $this->store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getStoreId'])
--            ->getMock();
-+        $this->customerSession->expects($this->any())
-+            ->method('getData')
-+            ->willReturn(false);
- 
--        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->storeManager->expects($this->any())
--            ->method('getStore')
--            ->willReturn($this->store);
-+        $this->wishlistProvider = $this->getMockBuilder(\Magento\Wishlist\Controller\WishlistProviderInterface::class)
-+            ->getMockForAbstractClass();
- 
--        $this->wishlist = $this->getMockBuilder(\Magento\Wishlist\Model\Wishlist::class)
-+        $this->captchaHelper = $this->getMockBuilder(CaptchaHelper::class)
-             ->disableOriginalConstructor()
-             ->setMethods([
--                'getShared',
--                'setShared',
--                'getId',
--                'getSharingCode',
--                'save',
--                'isSalable',
-+                'getCaptcha'
-             ])
-             ->getMock();
- 
--        $this->customerData = $this->getMockBuilder(\Magento\Customer\Model\Data\Customer::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->layout = $this->getMockBuilder(\Magento\Framework\View\Layout::class)
-+        $this->captchaModel = $this->getMockBuilder(CaptchaModel::class)
-             ->disableOriginalConstructor()
-             ->setMethods([
--                'getBlock',
--                'setWishlistId',
--                'toHtml',
-+                'isRequired',
-+                'logAttempt'
-             ])
-             ->getMock();
- 
--        $this->transport = $this->getMockBuilder(\Magento\Framework\Mail\TransportInterface::class)
--            ->getMockForAbstractClass();
-+        $objectHelper = new ObjectManager($this);
-+
-+        $this->captchaHelper->expects($this->once())->method('getCaptcha')
-+            ->willReturn($this->captchaModel);
-+        $this->captchaModel->expects($this->any())->method('isRequired')
-+            ->willReturn(false);
- 
--        $this->model = new Send(
--            $this->context,
--            $this->formKeyValidator,
--            $this->customerSession,
--            $this->wishlistProvider,
--            $this->wishlistConfig,
--            $this->transportBuilder,
--            $this->inlineTranslation,
--            $this->customerViewHelper,
--            $this->wishlistSession,
--            $this->scopeConfig,
--            $this->storeManager
-+        $this->model = $objectHelper->getObject(
-+            Send::class,
-+            [
-+                'context' => $this->context,
-+                'formKeyValidator' => $this->formKeyValidator,
-+                'wishlistProvider' => $this->wishlistProvider,
-+                'captchaHelper' => $this->captchaHelper,
-+                '_customerSession' => $this->customerSession
-+            ]
-         );
-     }
- 
-@@ -291,409 +244,4 @@ class SendTest extends \PHPUnit\Framework\TestCase
- 
-         $this->model->execute();
-     }
--
--    /**
--     * @param string $text
--     * @param int $textLimit
--     * @param string $emails
--     * @param int $emailsLimit
--     * @param int $shared
--     * @param string $postValue
--     * @param string $errorMessage
--     *
--     * @dataProvider dataProviderExecuteWithError
--     */
--    public function testExecuteWithError(
--        $text,
--        $textLimit,
--        $emails,
--        $emailsLimit,
--        $shared,
--        $postValue,
--        $errorMessage
--    ) {
--        $this->formKeyValidator->expects($this->once())
--            ->method('validate')
--            ->with($this->request)
--            ->willReturn(true);
--
--        $this->wishlist->expects($this->once())
--            ->method('getShared')
--            ->willReturn($shared);
--
--        $this->wishlistProvider->expects($this->once())
--            ->method('getWishlist')
--            ->willReturn($this->wishlist);
--
--        $this->wishlistConfig->expects($this->once())
--            ->method('getSharingEmailLimit')
--            ->willReturn($emailsLimit);
--        $this->wishlistConfig->expects($this->once())
--            ->method('getSharingTextLimit')
--            ->willReturn($textLimit);
--
--        $this->request->expects($this->exactly(2))
--            ->method('getPost')
--            ->willReturnMap([
--                ['emails', $emails],
--                ['message', $text],
--            ]);
--        $this->request->expects($this->once())
--            ->method('getPostValue')
--            ->willReturn($postValue);
--
--        $this->messageManager->expects($this->once())
--            ->method('addError')
--            ->with($errorMessage)
--            ->willReturnSelf();
--
--        $this->wishlistSession->expects($this->any())
--            ->method('setSharingForm')
--            ->with($postValue)
--            ->willReturnSelf();
--
--        $this->resultRedirect->expects($this->once())
--            ->method('setPath')
--            ->with('*/*/share')
--            ->willReturnSelf();
--
--        $this->assertEquals($this->resultRedirect, $this->model->execute());
--    }
--
--    /**
--     * 1. Text
--     * 2. Text limit
--     * 3. Emails
--     * 4. Emails limit
--     * 5. Shared wishlists counter
--     * 6. POST value
--     * 7. Error message (RESULT)
--     *
--     * @return array
--     */
--    public function dataProviderExecuteWithError()
--    {
--        return [
--            ['test text', 1, 'user1@example.com', 1, 0, '', 'Message length must not exceed 1 symbols'],
--            ['test text', 100, null, 1, 0, '', 'Please enter an email address.'],
--            ['test text', 100, '', 1, 0, '', 'Please enter an email address.'],
--            ['test text', 100, 'user1@example.com', 1, 1, '', 'This wish list can be shared 0 more times.'],
--            [
--                'test text',
--                100,
--                'u1@example.com, u2@example.com',
--                3,
--                2,
--                '',
--                'This wish list can be shared 1 more times.'
--            ],
--            ['test text', 100, 'wrongEmailAddress', 1, 0, '', 'Please enter a valid email address.'],
--            ['test text', 100, 'user1@example.com, wrongEmailAddress', 2, 0, '', 'Please enter a valid email address.'],
--            ['test text', 100, 'wrongEmailAddress, user2@example.com', 2, 0, '', 'Please enter a valid email address.'],
--        ];
--    }
--
--    /**
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function testExecuteWithException()
--    {
--        $text = 'test text';
--        $textLimit = 100;
--        $emails = 'user1@example.com';
--        $emailsLimit = 1;
--        $shared = 0;
--        $customerName = 'user1 user1';
--        $wishlistId = 1;
--        $rssLink = 'rss link';
--        $sharingCode = 'sharing code';
--        $exceptionMessage = 'test exception message';
--        $postValue = '';
--
--        $this->formKeyValidator->expects($this->once())
--            ->method('validate')
--            ->with($this->request)
--            ->willReturn(true);
--
--        $this->wishlist->expects($this->exactly(2))
--            ->method('getShared')
--            ->willReturn($shared);
--        $this->wishlist->expects($this->once())
--            ->method('setShared')
--            ->with($shared)
--            ->willReturnSelf();
--        $this->wishlist->expects($this->once())
--            ->method('getId')
--            ->willReturn($wishlistId);
--        $this->wishlist->expects($this->once())
--            ->method('getSharingCode')
--            ->willReturn($sharingCode);
--        $this->wishlist->expects($this->once())
--            ->method('save')
--            ->willReturnSelf();
--
--        $this->wishlistProvider->expects($this->once())
--            ->method('getWishlist')
--            ->willReturn($this->wishlist);
--
--        $this->wishlistConfig->expects($this->once())
--            ->method('getSharingEmailLimit')
--            ->willReturn($emailsLimit);
--        $this->wishlistConfig->expects($this->once())
--            ->method('getSharingTextLimit')
--            ->willReturn($textLimit);
--
--        $this->request->expects($this->exactly(2))
--            ->method('getPost')
--            ->willReturnMap([
--                ['emails', $emails],
--                ['message', $text],
--            ]);
--        $this->request->expects($this->exactly(2))
--            ->method('getParam')
--            ->with('rss_url')
--            ->willReturn(true);
--        $this->request->expects($this->once())
--            ->method('getPostValue')
--            ->willReturn($postValue);
--
--        $this->layout->expects($this->once())
--            ->method('getBlock')
--            ->with('wishlist.email.rss')
--            ->willReturnSelf();
--        $this->layout->expects($this->once())
--            ->method('setWishlistId')
--            ->with($wishlistId)
--            ->willReturnSelf();
--        $this->layout->expects($this->once())
--            ->method('toHtml')
--            ->willReturn($rssLink);
--
--        $this->resultLayout->expects($this->exactly(2))
--            ->method('addHandle')
--            ->willReturnMap([
--                ['wishlist_email_rss', null],
--                ['wishlist_email_items', null],
--            ]);
--        $this->resultLayout->expects($this->once())
--            ->method('getLayout')
--            ->willReturn($this->layout);
--
--        $this->inlineTranslation->expects($this->once())
--            ->method('suspend')
--            ->willReturnSelf();
--        $this->inlineTranslation->expects($this->once())
--            ->method('resume')
--            ->willReturnSelf();
--
--        $this->customerSession->expects($this->once())
--            ->method('getCustomerDataObject')
--            ->willReturn($this->customerData);
--
--        $this->customerViewHelper->expects($this->once())
--            ->method('getCustomerName')
--            ->with($this->customerData)
--            ->willReturn($customerName);
--
--        // Throw Exception
--        $this->transportBuilder->expects($this->once())
--            ->method('setTemplateIdentifier')
--            ->willThrowException(new \Exception($exceptionMessage));
--
--        $this->messageManager->expects($this->once())
--            ->method('addError')
--            ->with($exceptionMessage)
--            ->willReturnSelf();
--
--        $this->wishlistSession->expects($this->any())
--            ->method('setSharingForm')
--            ->with($postValue)
--            ->willReturnSelf();
--
--        $this->resultRedirect->expects($this->once())
--            ->method('setPath')
--            ->with('*/*/share')
--            ->willReturnSelf();
--
--        $this->assertEquals($this->resultRedirect, $this->model->execute());
--    }
--
--    /**
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function testExecute()
--    {
--        $text = 'text';
--        $textLimit = 100;
--        $emails = 'user1@example.com';
--        $emailsLimit = 1;
--        $shared = 0;
--        $customerName = 'user1 user1';
--        $wishlistId = 1;
--        $sharingCode = 'sharing code';
--        $templateIdentifier = 'template identifier';
--        $storeId = 1;
--        $viewOnSiteLink = 'view on site link';
--        $from = 'user0@example.com';
--
--        $this->formKeyValidator->expects($this->once())
--            ->method('validate')
--            ->with($this->request)
--            ->willReturn(true);
--
--        $this->wishlist->expects($this->exactly(2))
--            ->method('getShared')
--            ->willReturn($shared);
--        $this->wishlist->expects($this->once())
--            ->method('setShared')
--            ->with(++$shared)
--            ->willReturnSelf();
--        $this->wishlist->expects($this->exactly(2))
--            ->method('getId')
--            ->willReturn($wishlistId);
--        $this->wishlist->expects($this->once())
--            ->method('getSharingCode')
--            ->willReturn($sharingCode);
--        $this->wishlist->expects($this->once())
--            ->method('save')
--            ->willReturnSelf();
--        $this->wishlist->expects($this->once())
--            ->method('isSalable')
--            ->willReturn(true);
--
--        $this->wishlistProvider->expects($this->once())
--            ->method('getWishlist')
--            ->willReturn($this->wishlist);
--
--        $this->wishlistConfig->expects($this->once())
--            ->method('getSharingEmailLimit')
--            ->willReturn($emailsLimit);
--        $this->wishlistConfig->expects($this->once())
--            ->method('getSharingTextLimit')
--            ->willReturn($textLimit);
--
--        $this->request->expects($this->exactly(2))
--            ->method('getPost')
--            ->willReturnMap([
--                ['emails', $emails],
--                ['message', $text],
--            ]);
--        $this->request->expects($this->exactly(2))
--            ->method('getParam')
--            ->with('rss_url')
--            ->willReturn(true);
--
--        $this->layout->expects($this->exactly(2))
--            ->method('getBlock')
--            ->willReturnMap([
--                ['wishlist.email.rss', $this->layout],
--                ['wishlist.email.items', $this->layout],
--            ]);
--
--        $this->layout->expects($this->once())
--            ->method('setWishlistId')
--            ->with($wishlistId)
--            ->willReturnSelf();
--        $this->layout->expects($this->exactly(2))
--            ->method('toHtml')
--            ->willReturn($text);
--
--        $this->resultLayout->expects($this->exactly(2))
--            ->method('addHandle')
--            ->willReturnMap([
--                ['wishlist_email_rss', null],
--                ['wishlist_email_items', null],
--            ]);
--        $this->resultLayout->expects($this->exactly(2))
--            ->method('getLayout')
--            ->willReturn($this->layout);
--
--        $this->inlineTranslation->expects($this->once())
--            ->method('suspend')
--            ->willReturnSelf();
--        $this->inlineTranslation->expects($this->once())
--            ->method('resume')
--            ->willReturnSelf();
--
--        $this->customerSession->expects($this->once())
--            ->method('getCustomerDataObject')
--            ->willReturn($this->customerData);
--
--        $this->customerViewHelper->expects($this->once())
--            ->method('getCustomerName')
--            ->with($this->customerData)
--            ->willReturn($customerName);
--
--        $this->scopeConfig->expects($this->exactly(2))
--            ->method('getValue')
--            ->willReturnMap([
--                ['wishlist/email/email_template', ScopeInterface::SCOPE_STORE, null, $templateIdentifier],
--                ['wishlist/email/email_identity', ScopeInterface::SCOPE_STORE, null, $from],
--            ]);
--
--        $this->store->expects($this->once())
--            ->method('getStoreId')
--            ->willReturn($storeId);
--
--        $this->url->expects($this->once())
--            ->method('getUrl')
--            ->with('*/shared/index', ['code' => $sharingCode])
--            ->willReturn($viewOnSiteLink);
--
--        $this->transportBuilder->expects($this->once())
--            ->method('setTemplateIdentifier')
--            ->with($templateIdentifier)
--            ->willReturnSelf();
--        $this->transportBuilder->expects($this->once())
--            ->method('setTemplateOptions')
--            ->with([
--                'area' => Area::AREA_FRONTEND,
--                'store' => $storeId,
--            ])
--            ->willReturnSelf();
--        $this->transportBuilder->expects($this->once())
--            ->method('setTemplateVars')
--            ->with([
--                'customer' => $this->customerData,
--                'customerName' => $customerName,
--                'salable' => 'yes',
--                'items' => $text,
--                'viewOnSiteLink' => $viewOnSiteLink,
--                'message' => $text . $text,
--                'store' => $this->store,
--            ])
--            ->willReturnSelf();
--        $this->transportBuilder->expects($this->once())
--            ->method('setFrom')
--            ->with($from)
--            ->willReturnSelf();
--        $this->transportBuilder->expects($this->once())
--            ->method('addTo')
--            ->with($emails)
--            ->willReturnSelf();
--        $this->transportBuilder->expects($this->once())
--            ->method('getTransport')
--            ->willReturn($this->transport);
--
--        $this->transport->expects($this->once())
--            ->method('sendMessage')
--            ->willReturnSelf();
--
--        $this->eventManager->expects($this->once())
--            ->method('dispatch')
--            ->with('wishlist_share', ['wishlist' => $this->wishlist])
--            ->willReturnSelf();
--
--        $this->messageManager->expects($this->once())
--            ->method('addSuccess')
--            ->with(__('Your wish list has been shared.'))
--            ->willReturnSelf();
--
--        $this->resultRedirect->expects($this->once())
--            ->method('setPath')
--            ->with('*/*', ['wishlist_id' => $wishlistId])
--            ->willReturnSelf();
--
--        $this->assertEquals($this->resultRedirect, $this->model->execute());
--    }
- }
-diff --git a/app/code/Magento/Wishlist/Test/Unit/Helper/RssTest.php b/app/code/Magento/Wishlist/Test/Unit/Helper/RssTest.php
-index d0397be83fa..b55766d77fe 100644
---- a/app/code/Magento/Wishlist/Test/Unit/Helper/RssTest.php
-+++ b/app/code/Magento/Wishlist/Test/Unit/Helper/RssTest.php
-@@ -46,7 +46,7 @@ class RssTest extends \PHPUnit\Framework\TestCase
-     protected $customerRepositoryMock;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $moduleManagerMock;
- 
-@@ -80,7 +80,7 @@ class RssTest extends \PHPUnit\Framework\TestCase
-         $this->customerRepositoryMock = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
-             ->getMock();
- 
--        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
-+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
-diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
-new file mode 100644
-index 00000000000..fb0113eb6ae
---- /dev/null
-+++ b/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
-@@ -0,0 +1,177 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Wishlist\Test\Unit\Model\Product;
-+
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\ResourceModel\Product\Collection;
-+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+use Magento\Wishlist\Model\Product\AttributeValueProvider;
-+use PHPUnit\Framework\TestCase;
-+use PHPUnit_Framework_MockObject_MockObject;
-+
-+/**
-+ * AttributeValueProviderTest
-+ */
-+class AttributeValueProviderTest extends TestCase
-+{
-+    /**
-+     * @var AttributeValueProvider|PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $attributeValueProvider;
-+
-+    /**
-+     * @var CollectionFactory|PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $productCollectionFactoryMock;
-+
-+    /**
-+     * @var Product|PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $productMock;
-+
-+    /**
-+     * @var AdapterInterface|PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $connectionMock;
-+
-+    /**
-+     * Set Up
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->productCollectionFactoryMock = $this->createPartialMock(
-+            CollectionFactory::class,
-+            ['create']
-+        );
-+        $this->attributeValueProvider = new AttributeValueProvider(
-+            $this->productCollectionFactoryMock
-+        );
-+    }
-+
-+    /**
-+     * Get attribute text when the flat table is disabled
-+     *
-+     * @param int $productId
-+     * @param string $attributeCode
-+     * @param string $attributeText
-+     * @return void
-+     * @dataProvider attributeDataProvider
-+     */
-+    public function testGetAttributeTextWhenFlatIsDisabled(int $productId, string $attributeCode, string $attributeText)
-+    {
-+        $this->productMock = $this->getMockBuilder(Product::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getData'])
-+            ->getMock();
-+
-+        $this->productMock->expects($this->any())
-+            ->method('getData')
-+            ->with($attributeCode)
-+            ->willReturn($attributeText);
-+
-+        $productCollection = $this->getMockBuilder(Collection::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods([
-+                'addIdFilter', 'addStoreFilter', 'addAttributeToSelect', 'isEnabledFlat', 'getFirstItem'
-+            ])->getMock();
-+
-+        $productCollection->expects($this->any())
-+            ->method('addIdFilter')
-+            ->willReturnSelf();
-+        $productCollection->expects($this->any())
-+            ->method('addStoreFilter')
-+            ->willReturnSelf();
-+        $productCollection->expects($this->any())
-+            ->method('addAttributeToSelect')
-+            ->willReturnSelf();
-+        $productCollection->expects($this->any())
-+            ->method('isEnabledFlat')
-+            ->willReturn(false);
-+        $productCollection->expects($this->any())
-+            ->method('getFirstItem')
-+            ->willReturn($this->productMock);
-+
-+        $this->productCollectionFactoryMock->expects($this->atLeastOnce())
-+            ->method('create')
-+            ->willReturn($productCollection);
-+
-+        $actual = $this->attributeValueProvider->getRawAttributeValue($productId, $attributeCode);
-+
-+        $this->assertEquals($attributeText, $actual);
-+    }
-+
-+    /**
-+     * Get attribute text when the flat table is enabled
-+     *
-+     * @dataProvider attributeDataProvider
-+     * @param int $productId
-+     * @param string $attributeCode
-+     * @param string $attributeText
-+     * @return void
-+     */
-+    public function testGetAttributeTextWhenFlatIsEnabled(int $productId, string $attributeCode, string $attributeText)
-+    {
-+        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)->getMockForAbstractClass();
-+        $this->connectionMock->expects($this->any())
-+            ->method('fetchRow')
-+            ->willReturn([
-+                $attributeCode => $attributeText
-+            ]);
-+        $this->productMock = $this->getMockBuilder(Product::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getData'])
-+            ->getMock();
-+        $this->productMock->expects($this->any())
-+            ->method('getData')
-+            ->with($attributeCode)
-+            ->willReturn($attributeText);
-+
-+        $productCollection = $this->getMockBuilder(Collection::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods([
-+                'addIdFilter', 'addStoreFilter', 'addAttributeToSelect', 'isEnabledFlat', 'getConnection'
-+            ])->getMock();
-+
-+        $productCollection->expects($this->any())
-+            ->method('addIdFilter')
-+            ->willReturnSelf();
-+        $productCollection->expects($this->any())
-+            ->method('addStoreFilter')
-+            ->willReturnSelf();
-+        $productCollection->expects($this->any())
-+            ->method('addAttributeToSelect')
-+            ->willReturnSelf();
-+        $productCollection->expects($this->any())
-+            ->method('isEnabledFlat')
-+            ->willReturn(true);
-+        $productCollection->expects($this->any())
-+            ->method('getConnection')
-+            ->willReturn($this->connectionMock);
-+
-+        $this->productCollectionFactoryMock->expects($this->atLeastOnce())
-+            ->method('create')
-+            ->willReturn($productCollection);
-+
-+        $actual = $this->attributeValueProvider->getRawAttributeValue($productId, $attributeCode);
-+
-+        $this->assertEquals($attributeText, $actual);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function attributeDataProvider(): array
-+    {
-+        return [
-+            [1, 'attribute_code', 'Attribute Text']
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
-index 98d36dea28a..fc43baa0a67 100644
---- a/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
-+++ b/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
-@@ -278,15 +278,35 @@ class WishlistTest extends \PHPUnit\Framework\TestCase
- 
-     public function testIsAllowed()
-     {
--        $this->scopeConfig->expects($this->once())->method('getValue')
-+        $customerId = 1;
-+        $customerServiceMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-+        $wishlist = $this->getMockBuilder(\Magento\Wishlist\Model\Wishlist::class)->setMethods(
-+            ['getId', '__wakeup', 'getCustomerId', 'getItemCollection', 'getSharingCode']
-+        )->disableOriginalConstructor()->getMock();
-+        $wishlist->expects($this->once())->method('getCustomerId')->willReturn($customerId);
-+        $this->wishlistHelperMock->expects($this->any())->method('getWishlist')
-+            ->will($this->returnValue($wishlist));
-+        $this->wishlistHelperMock->expects($this->any())
-+            ->method('getCustomer')
-+            ->will($this->returnValue($customerServiceMock));
-+        $customerServiceMock->expects($this->once())->method('getId')->willReturn($customerId);
-+        $this->scopeConfig->expects($this->once())->method('isSetFlag')
-             ->with('rss/wishlist/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
-             ->will($this->returnValue(true));
-+
-         $this->assertTrue($this->model->isAllowed());
-     }
- 
-     public function testGetCacheKey()
-     {
--        $this->assertEquals('rss_wishlist_data', $this->model->getCacheKey());
-+        $wishlistId = 1;
-+        $wishlist = $this->getMockBuilder(\Magento\Wishlist\Model\Wishlist::class)->setMethods(
-+            ['getId', '__wakeup', 'getCustomerId', 'getItemCollection', 'getSharingCode']
-+        )->disableOriginalConstructor()->getMock();
-+        $wishlist->expects($this->once())->method('getId')->willReturn($wishlistId);
-+        $this->wishlistHelperMock->expects($this->any())->method('getWishlist')
-+            ->will($this->returnValue($wishlist));
-+        $this->assertEquals('rss_wishlist_data_1', $this->model->getCacheKey());
-     }
- 
-     public function testGetCacheLifetime()
-diff --git a/app/code/Magento/Wishlist/Test/Unit/Plugin/Ui/DataProvider/WishlistSettingsTest.php b/app/code/Magento/Wishlist/Test/Unit/Plugin/Ui/DataProvider/WishlistSettingsTest.php
-new file mode 100644
-index 00000000000..aa3b956e121
---- /dev/null
-+++ b/app/code/Magento/Wishlist/Test/Unit/Plugin/Ui/DataProvider/WishlistSettingsTest.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Wishlist\Test\Unit\Plugin\Ui\DataProvider;
-+
-+use Magento\Catalog\Ui\DataProvider\Product\Listing\DataProvider;
-+use Magento\Wishlist\Helper\Data;
-+use Magento\Wishlist\Plugin\Ui\DataProvider\WishlistSettings;
-+
-+/**
-+ * Covers \Magento\Wishlist\Plugin\Ui\DataProvider\WishlistSettings
-+ */
-+class WishlistSettingsTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Testable Object
-+     *
-+     * @var WishlistSettings
-+     */
-+    private $wishlistSettings;
-+
-+    /**
-+     * @var Data|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $helperMock;
-+
-+    /**
-+     * Set Up
-+     *
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $this->helperMock = $this->createMock(Data::class);
-+        $this->wishlistSettings = new WishlistSettings($this->helperMock);
-+    }
-+
-+    /**
-+     * Test afterGetData method
-+     *
-+     * @return void
-+     */
-+    public function testAfterGetData()
-+    {
-+        /** @var DataProvider|\PHPUnit_Framework_MockObject_MockObject $subjectMock */
-+        $subjectMock = $this->createMock(DataProvider::class);
-+        $result = [];
-+        $isAllow = true;
-+        $this->helperMock->expects($this->once())->method('isAllow')->willReturn(true);
-+
-+        $expected = ['allowWishlist' => $isAllow];
-+        $actual = $this->wishlistSettings->afterGetData($subjectMock, $result);
-+        self::assertEquals($expected, $actual);
-+    }
-+}
-diff --git a/app/code/Magento/Wishlist/ViewModel/AllowedQuantity.php b/app/code/Magento/Wishlist/ViewModel/AllowedQuantity.php
-new file mode 100644
-index 00000000000..5e4c6b39f3c
---- /dev/null
-+++ b/app/code/Magento/Wishlist/ViewModel/AllowedQuantity.php
-@@ -0,0 +1,80 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Wishlist\ViewModel;
-+
-+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter;
-+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
-+use Magento\CatalogInventory\Model\StockRegistry;
-+use Magento\Framework\View\Element\Block\ArgumentInterface;
-+
-+/**
-+ * ViewModel for Wishlist Cart Block
-+ */
-+class AllowedQuantity implements ArgumentInterface
-+{
-+    /**
-+     * @var StockRegistry
-+     */
-+    private $stockRegistry;
-+
-+    /**
-+     * @var ItemInterface
-+     */
-+    private $item;
-+
-+    /**
-+     * @param StockRegistry $stockRegistry
-+     */
-+    public function __construct(StockRegistry $stockRegistry)
-+    {
-+        $this->stockRegistry = $stockRegistry;
-+    }
-+
-+    /**
-+     * Set product configuration item
-+     *
-+     * @param ItemInterface $item
-+     * @return self
-+     */
-+    public function setItem(ItemInterface $item): self
-+    {
-+        $this->item = $item;
-+        return $this;
-+    }
-+
-+    /**
-+     * Get product configuration item
-+     *
-+     * @return ItemInterface
-+     */
-+    public function getItem(): ItemInterface
-+    {
-+        return $this->item;
-+    }
-+
-+    /**
-+     * Get min and max qty for wishlist form.
-+     *
-+     * @return array
-+     */
-+    public function getMinMaxQty(): array
-+    {
-+        $product = $this->getItem()->getProduct();
-+        $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
-+        $params = [];
-+
-+        $params['minAllowed'] = (float)$stockItem->getMinSaleQty();
-+        if ($stockItem->getMaxSaleQty()) {
-+            $params['maxAllowed'] = (float)$stockItem->getMaxSaleQty();
-+        } else {
-+            $params['maxAllowed'] = (float)StockDataFilter::MAX_QTY_VALUE;
-+        }
-+
-+        return $params;
-+    }
-+}
-diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
-index ce43f6faae2..c9c74c8859e 100644
---- a/app/code/Magento/Wishlist/composer.json
-+++ b/app/code/Magento/Wishlist/composer.json
-@@ -15,7 +15,9 @@
-         "magento/module-rss": "*",
-         "magento/module-sales": "*",
-         "magento/module-store": "*",
--        "magento/module-ui": "*"
-+        "magento/module-theme": "*",
-+        "magento/module-ui": "*",
-+        "magento/module-captcha": "*"
-     },
-     "suggest": {
-         "magento/module-configurable-product": "*",
-diff --git a/app/code/Magento/Wishlist/etc/adminhtml/system.xml b/app/code/Magento/Wishlist/etc/adminhtml/system.xml
-index 50ea4b01fe1..1e26a1195a7 100644
---- a/app/code/Magento/Wishlist/etc/adminhtml/system.xml
-+++ b/app/code/Magento/Wishlist/etc/adminhtml/system.xml
-@@ -39,6 +39,10 @@
-                     <label>Enabled</label>
-                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                 </field>
-+                <field id="show_in_sidebar" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-+                    <label>Show in Sidebar</label>
-+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-+                </field>
-             </group>
-             <group id="wishlist_link" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0">
-                 <label>My Wish List Link</label>
-diff --git a/app/code/Magento/Wishlist/etc/config.xml b/app/code/Magento/Wishlist/etc/config.xml
-index 1fec2d1baf9..dd88e63bc90 100644
---- a/app/code/Magento/Wishlist/etc/config.xml
-+++ b/app/code/Magento/Wishlist/etc/config.xml
-@@ -10,6 +10,7 @@
-         <wishlist>
-             <general>
-                 <active>1</active>
-+                <show_in_sidebar>1</show_in_sidebar>
-             </general>
-             <email>
-                 <email_identity>general</email_identity>
-@@ -18,5 +19,21 @@
-                 <text_limit>255</text_limit>
-             </email>
-         </wishlist>
-+        <captcha translate="label">
-+            <frontend>
-+                <areas>
-+                    <share_wishlist_form>
-+                        <label>Share Wishlist Form</label>
-+                    </share_wishlist_form>
-+                </areas>
-+            </frontend>
-+        </captcha>
-+        <customer>
-+            <captcha>
-+                <shown_to_logged_in_user>
-+                    <share_wishlist_form>1</share_wishlist_form>
-+                </shown_to_logged_in_user>
-+            </captcha>
-+        </customer>
-     </default>
- </config>
-diff --git a/app/code/Magento/Wishlist/etc/db_schema.xml b/app/code/Magento/Wishlist/etc/db_schema.xml
-index 73fcb7ce0ca..8a02f411ad0 100644
---- a/app/code/Magento/Wishlist/etc/db_schema.xml
-+++ b/app/code/Magento/Wishlist/etc/db_schema.xml
-@@ -16,16 +16,16 @@
-                 default="0" comment="Sharing flag (0 or 1)"/>
-         <column xsi:type="varchar" name="sharing_code" nullable="true" length="32" comment="Sharing encrypted code"/>
-         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Last updated date"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="wishlist_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="WISHLIST_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID" table="wishlist"
-+        <constraint xsi:type="foreign" referenceId="WISHLIST_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID" table="wishlist"
-                     column="customer_id" referenceTable="customer_entity" referenceColumn="entity_id"
-                     onDelete="CASCADE"/>
--        <constraint xsi:type="unique" name="WISHLIST_CUSTOMER_ID">
-+        <constraint xsi:type="unique" referenceId="WISHLIST_CUSTOMER_ID">
-             <column name="customer_id"/>
-         </constraint>
--        <index name="WISHLIST_SHARED" indexType="btree">
-+        <index referenceId="WISHLIST_SHARED" indexType="btree">
-             <column name="shared"/>
-         </index>
-     </table>
-@@ -42,23 +42,23 @@
-         <column xsi:type="text" name="description" nullable="true" comment="Short description of wish list item"/>
-         <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="false"
-                 comment="Qty"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="wishlist_item_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="WISHLIST_ITEM_WISHLIST_ID_WISHLIST_WISHLIST_ID" table="wishlist_item"
-+        <constraint xsi:type="foreign" referenceId="WISHLIST_ITEM_WISHLIST_ID_WISHLIST_WISHLIST_ID" table="wishlist_item"
-                     column="wishlist_id" referenceTable="wishlist" referenceColumn="wishlist_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="WISHLIST_ITEM_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-+        <constraint xsi:type="foreign" referenceId="WISHLIST_ITEM_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-                     table="wishlist_item" column="product_id" referenceTable="catalog_product_entity"
-                     referenceColumn="entity_id" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="WISHLIST_ITEM_STORE_ID_STORE_STORE_ID" table="wishlist_item"
-+        <constraint xsi:type="foreign" referenceId="WISHLIST_ITEM_STORE_ID_STORE_STORE_ID" table="wishlist_item"
-                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
--        <index name="WISHLIST_ITEM_WISHLIST_ID" indexType="btree">
-+        <index referenceId="WISHLIST_ITEM_WISHLIST_ID" indexType="btree">
-             <column name="wishlist_id"/>
-         </index>
--        <index name="WISHLIST_ITEM_PRODUCT_ID" indexType="btree">
-+        <index referenceId="WISHLIST_ITEM_PRODUCT_ID" indexType="btree">
-             <column name="product_id"/>
-         </index>
--        <index name="WISHLIST_ITEM_STORE_ID" indexType="btree">
-+        <index referenceId="WISHLIST_ITEM_STORE_ID" indexType="btree">
-             <column name="store_id"/>
-         </index>
-     </table>
-@@ -71,10 +71,10 @@
-                 comment="Product Id"/>
-         <column xsi:type="varchar" name="code" nullable="false" length="255" comment="Code"/>
-         <column xsi:type="text" name="value" nullable="true" comment="Value"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="option_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="FK_A014B30B04B72DD0EAB3EECD779728D6" table="wishlist_item_option"
-+        <constraint xsi:type="foreign" referenceId="FK_A014B30B04B72DD0EAB3EECD779728D6" table="wishlist_item_option"
-                     column="wishlist_item_id" referenceTable="wishlist_item" referenceColumn="wishlist_item_id"
-                     onDelete="CASCADE"/>
-     </table>
-diff --git a/app/code/Magento/Wishlist/etc/db_schema_whitelist.json b/app/code/Magento/Wishlist/etc/db_schema_whitelist.json
-index beaab64280a..36a294f26e1 100644
---- a/app/code/Magento/Wishlist/etc/db_schema_whitelist.json
-+++ b/app/code/Magento/Wishlist/etc/db_schema_whitelist.json
-@@ -35,8 +35,7 @@
-             "PRIMARY": true,
-             "WISHLIST_ITEM_WISHLIST_ID_WISHLIST_WISHLIST_ID": true,
-             "WISHLIST_ITEM_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID": true,
--            "WISHLIST_ITEM_STORE_ID_STORE_STORE_ID": true,
--            "WISHLIST_ITEM_PRODUCT_ID_SEQUENCE_PRODUCT_SEQUENCE_VALUE": true
-+            "WISHLIST_ITEM_STORE_ID_STORE_STORE_ID": true
-         }
-     },
-     "wishlist_item_option": {
-@@ -49,7 +48,8 @@
-         },
-         "constraint": {
-             "PRIMARY": true,
--            "FK_A014B30B04B72DD0EAB3EECD779728D6": true
-+            "FK_A014B30B04B72DD0EAB3EECD779728D6": true,
-+            "WISHLIST_ITEM_OPTION_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID": true
-         }
-     }
- }
-\ No newline at end of file
-diff --git a/app/code/Magento/Wishlist/etc/module.xml b/app/code/Magento/Wishlist/etc/module.xml
-index c5ece20d795..ab48ee89b74 100644
---- a/app/code/Magento/Wishlist/etc/module.xml
-+++ b/app/code/Magento/Wishlist/etc/module.xml
-@@ -10,6 +10,7 @@
-         <sequence>
-             <module name="Magento_Customer"/>
-             <module name="Magento_Catalog"/>
-+            <module name="Magento_Captcha"/>
-         </sequence>
-     </module>
- </config>
-diff --git a/app/code/Magento/Wishlist/i18n/en_US.csv b/app/code/Magento/Wishlist/i18n/en_US.csv
-index a1d33cbd574..a9acce448c8 100644
---- a/app/code/Magento/Wishlist/i18n/en_US.csv
-+++ b/app/code/Magento/Wishlist/i18n/en_US.csv
-@@ -118,4 +118,5 @@ Action,Action
- Configure,Configure
- Delete,Delete
- "Product Details and Comment","Product Details and Comment"
--"You must login or register to add items to your wishlist.","You must login or register to add items to your wishlist."
-\ No newline at end of file
-+"You must login or register to add items to your wishlist.","You must login or register to add items to your wishlist."
-+"Show in Sidebar","Show in Sidebar"
-diff --git a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
-index 95b78660339..e364087405e 100644
---- a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
-+++ b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
-@@ -9,7 +9,7 @@
-     <container name="root">
-         <block class="Magento\Backend\Block\Widget\Grid" name="customer.wishlist.edit.tab">
-             <arguments>
--                <argument name="dataSource" xsi:type="object">Magento\Wishlist\Model\ResourceModel\Item\Collection\Grid</argument>
-+                <argument name="dataSource" xsi:type="object" shared="false">Magento\Wishlist\Model\ResourceModel\Item\Collection\Grid</argument>
-                 <argument name="id" xsi:type="string">wishlistGrid</argument>
-                 <argument name="use_ajax" xsi:type="string">true</argument>
-                 <argument name="default_sort" xsi:type="string">added_at</argument>
-diff --git a/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml b/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml
-index a2c27193f98..e6c0608f4b4 100644
---- a/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml
-+++ b/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Framework\View\Element\Template $block */
- ?>
- <script>
-diff --git a/app/code/Magento/Wishlist/view/frontend/layout/default.xml b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
-index f655c7034fe..c4f0d01707b 100644
---- a/app/code/Magento/Wishlist/view/frontend/layout/default.xml
-+++ b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
-@@ -18,7 +18,7 @@
-             </block>
-         </referenceBlock>
-         <referenceContainer name="sidebar.additional">
--            <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" template="Magento_Wishlist::sidebar.phtml"/>
-+            <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" template="Magento_Wishlist::sidebar.phtml" ifconfig="wishlist/general/show_in_sidebar"/>
-         </referenceContainer>
-     </body>
- </page>
-diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
-index 243a0606242..d4c3cc7fadd 100644
---- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
-+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
-@@ -13,10 +13,12 @@
-         </referenceBlock>
-         <referenceContainer name="content">
-             <block class="Magento\Wishlist\Block\Customer\Wishlist" name="customer.wishlist" template="Magento_Wishlist::view.phtml" cacheable="false">
-+                <block class="Magento\Theme\Block\Html\Pager" name="wishlist_item_pager"/>
-                 <block class="Magento\Wishlist\Block\Rss\Link" name="wishlist.rss.link" template="Magento_Wishlist::rss/wishlist.phtml"/>
-                 <block class="Magento\Wishlist\Block\Customer\Wishlist\Items" name="customer.wishlist.items" as="items" template="Magento_Wishlist::item/list.phtml" cacheable="false">
-                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Image" name="customer.wishlist.item.image" template="Magento_Wishlist::item/column/image.phtml" cacheable="false"/>
-                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Info" name="customer.wishlist.item.name" template="Magento_Wishlist::item/column/name.phtml" cacheable="false"/>
-+                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.review" template="Magento_Wishlist::item/column/review.phtml" cacheable="false"/>
-                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart" name="customer.wishlist.item.price" template="Magento_Wishlist::item/column/price.phtml" cacheable="false">
-                         <block class="Magento\Catalog\Pricing\Render" name="product.price.render.wishlist">
-                             <arguments>
-@@ -39,6 +41,7 @@
-                         </block>
-                         <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart" name="customer.wishlist.item.cart" template="Magento_Wishlist::item/column/cart.phtml" cacheable="false">
-                             <arguments>
-+                                <argument name="allowedQuantityViewModel" xsi:type="object">Magento\Wishlist\ViewModel\AllowedQuantity</argument>
-                                 <argument name="title" translate="true" xsi:type="string">Add to Cart</argument>
-                             </arguments>
-                         </block>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml b/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml
-index fc54a907587..0ec1febaf2f 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml
-@@ -4,11 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Customer\Wishlist\Button $block */
- ?>
--<?php if ($block->getWishlist()->getItemsCount() && $block->getWishlist()->getShared() < $block->getConfig()->getSharingEmailLimit()): ?>
-+<?php if ($block->getWishlist()->getItemsCount() && $block->getWishlist()->getShared() < $block->getConfig()->getSharingEmailLimit()) : ?>
-     <button type="submit" name="save_and_share" title="<?= $block->escapeHtmlAttr(__('Share Wish List')) ?>" class="action share">
-         <span><?= $block->escapeHtml(__('Share Wish List')) ?></span>
-     </button>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml b/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml
-index 6f901cac1a6..30d6c85ab64 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml
-@@ -4,12 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Customer\Wishlist\Button $block */
- ?>
- 
--<?php if ($block->getWishlist()->getItemsCount() && $block->getWishlist()->isSalable()): ?>
-+<?php if ($block->getWishlist()->getItemsCount() && $block->getWishlist()->isSalable()) : ?>
-     <button type="button" data-role="all-tocart" title="<?= $block->escapeHtmlAttr(__('Add All to Cart')) ?>" class="action tocart">
-         <span><?= $block->escapeHtml(__('Add All to Cart')) ?></span>
-     </button>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml b/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml
-index d19a5c2968f..6d8e13eeca5 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml
-@@ -4,12 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Customer\Wishlist\Button $block */
- ?>
- 
--<?php if ($block->getWishlist()->getItemsCount()): ?>
-+<?php if ($block->getWishlist()->getItemsCount()) : ?>
-     <button type="submit" name="do" title="<?= $block->escapeHtmlAttr(__('Update Wish List')) ?>" class="action update">
-         <span><?= $block->escapeHtml(__('Update Wish List')) ?></span>
-     </button>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml
-index 65225c47102..99732791e10 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml
-@@ -4,11 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Cart\Item\Renderer\Actions\MoveToWishlist $block */
- ?>
--<?php if ($block->isAllowInCart() && $block->isProductVisibleInSiteVisibility()): ?>
-+<?php if ($block->isAllowInCart() && $block->isProductVisibleInSiteVisibility()) : ?>
-     <a href="#"
-        data-post='<?= /* @noEscape */ $block->getMoveFromCartParams() ?>'
-        class="use-ajax action towishlist action-towishlist">
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/list/addto/wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/list/addto/wishlist.phtml
-index b09118e0483..2427f883c2b 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/list/addto/wishlist.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/list/addto/wishlist.phtml
-@@ -4,11 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var Magento\Wishlist\Block\Catalog\Product\ProductList\Item\AddTo\Wishlist $block */
- ?>
--<?php if ($block->getWishlistHelper()->isAllow()): ?>
-+<?php if ($block->getWishlistHelper()->isAllow()) : ?>
-     <a href="#"
-        class="action towishlist"
-        title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>"
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/view/addto/wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/view/addto/wishlist.phtml
-index 1959694776e..a0c680ea24e 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/view/addto/wishlist.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/view/addto/wishlist.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Catalog\Product\View\AddTo\Wishlist $block */
- ?>
- <?php if ($block->isWishListAllowed()) : ?>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml b/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml
-index 0bc333ad6f5..449d4c43c5a 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var \Magento\Wishlist\Block\Share\Email\Items $block */
- ?>
- <?php $l = $block->getWishlistItemsCount() ?>
-@@ -13,45 +11,45 @@
-     <table>
-         <tr>
-             <?php $i = 0;
--            foreach ($block->getWishlistItems() as $item): $i++ ?>
--            <?php /* @var $item \Magento\Wishlist\Model\Item */ ?>
--            <?php /* @var $_product \Magento\Catalog\Model\Product */ ?>
--            <?php $_product = $item->getProduct(); ?>
--            <td class="col product">
--                <p>
--                    <a href="<?= $block->escapeUrl($block->getProductUrl($_product)) ?>">
--                        <?= /* @noEscape */ $block->getImage($_product, 'product_small_image')->toHtml() ?>
--                    </a>
--                </p>
-+            foreach ($block->getWishlistItems() as $item) : $i++ ?>
-+                <?php /* @var $item \Magento\Wishlist\Model\Item */ ?>
-+                <?php /* @var $_product \Magento\Catalog\Model\Product */ ?>
-+                <?php $_product = $item->getProduct(); ?>
-+                <td class="col product">
-+                    <p>
-+                        <a href="<?= $block->escapeUrl($block->getProductUrl($_product)) ?>">
-+                            <?= /* @noEscape */ $block->getImage($_product, 'product_small_image')->toHtml() ?>
-+                        </a>
-+                    </p>
- 
--                <p>
--                    <a href="<?= $block->escapeUrl($block->getProductUrl($_product)) ?>">
--                        <strong><?= $block->escapeHtml($_product->getName()) ?></strong>
--                    </a>
--                </p>
--                <?php if ($block->hasDescription($item)): ?>
-                     <p>
--                        <strong><?= $block->escapeHtml(__('Comment')) ?>:</strong>
--                        <br/><?= /* @noEscape */  $block->getEscapedDescription($item) ?>
-+                        <a href="<?= $block->escapeUrl($block->getProductUrl($_product)) ?>">
-+                            <strong><?= $block->escapeHtml($_product->getName()) ?></strong>
-+                        </a>
-                     </p>
--                <?php endif; ?>
--                <p>
--                    <a href="<?= $block->escapeUrl($block->getProductUrl($_product)) ?>">
--                        <?= $block->escapeHtml(__('View Product')) ?>
--                    </a>
--                </p>
--            </td>
--            <?php if ($i % 3 != 0): ?>
--                <td></td>
--            <?php else: ?>
--        </tr>
--        <tr>
--            <td colspan="5">&nbsp;</td>
--        </tr>
--            <?php if ($i < $l): ?>
-+                    <?php if ($block->hasDescription($item)) : ?>
-+                        <p>
-+                            <strong><?= $block->escapeHtml(__('Comment')) ?>:</strong>
-+                            <br/><?= /* @noEscape */  $block->getEscapedDescription($item) ?>
-+                        </p>
-+                    <?php endif; ?>
-+                    <p>
-+                        <a href="<?= $block->escapeUrl($block->getProductUrl($_product)) ?>">
-+                            <?= $block->escapeHtml(__('View Product')) ?>
-+                        </a>
-+                    </p>
-+                </td>
-+                <?php if ($i % 3 != 0) : ?>
-+                    <td></td>
-+                <?php else : ?>
-+            </tr>
-             <tr>
--            <?php endif ?>
--            <?php endif ?>
-+                <td colspan="5">&nbsp;</td>
-+            </tr>
-+                    <?php if ($i < $l) : ?>
-+                    <tr>
-+                    <?php endif ?>
-+                <?php endif ?>
-             <?php endforeach ?>
-     </table>
- </div>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
-index 0b50df8c59f..ce6ac6f2b26 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
-@@ -4,14 +4,12 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Actions $block */
- ?>
- <?php $children = $block->getChildNames(); ?>
--<?php if ($children): ?>
-+<?php if ($children) : ?>
-     <div class="<?= $block->escapeHtmlAttr($block->getCssClass()) ?>">
--        <?php foreach ($children as $childName):?>
-+        <?php foreach ($children as $childName) : ?>
-             <?= /* @noEscape */ $block->getLayout()->renderElement($childName, false) ?>
-         <?php endforeach;?>
-     </div>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
-index 9ea0d1a8232..294cd7f0ab7 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
-@@ -4,29 +4,30 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart $block */
- 
- /** @var \Magento\Wishlist\Model\Item $item */
- $item = $block->getItem();
- $product = $item->getProduct();
-+/** @var \Magento\Wishlist\ViewModel\AllowedQuantity $viewModel */
-+$viewModel = $block->getData('allowedQuantityViewModel');
-+$allowedQty = $viewModel->setItem($item)->getMinMaxQty();
- ?>
--<?php foreach ($block->getChildNames() as $childName): ?>
-+<?php foreach ($block->getChildNames() as $childName) : ?>
-     <?= /* @noEscape */ $block->getLayout()->renderElement($childName, false) ?>
- <?php endforeach;?>
- <div class="box-tocart">
-     <fieldset class="fieldset">
--    <?php if ($item->canHaveQty() && $product->isVisibleInSiteVisibility()): ?>
-+    <?php if ($item->canHaveQty() && $product->isVisibleInSiteVisibility()) : ?>
-         <div class="field qty">
-             <label class="label" for="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]"><span><?= $block->escapeHtml(__('Qty')) ?></span></label>
-             <div class="control">
--                <input type="number" data-role="qty" id="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true}"
--               name="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" value="<?= /* @noEscape */ (int)($block->getAddToCartQty($item) * 1) ?>">
-+                <input type="number" data-role="qty" id="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true, 'validate-item-quantity':{'minAllowed':<?= /* @noEscape */ $allowedQty['minAllowed'] ?>,'maxAllowed':<?= /* @noEscape */ $allowedQty['maxAllowed'] ?>}}"
-+               name="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" value="<?= /* @noEscape */ (int)($block->getAddToCartQty($item) * 1) ?>" <?= $product->isSaleable() ? '' : 'disabled="disabled"' ?>>
-             </div>
-         </div>
-     <?php endif; ?>
--    <?php if ($product->isSaleable()): ?>
-+    <?php if ($product->isSaleable()) : ?>
-     <div class="product-item-actions">
-         <div class="actions-primary">
-             <button type="button" data-role="tocart" data-post='<?= /* @noEscape */ $block->getItemAddToCartParams($item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>" data-item-id="<?= $block->escapeHtmlAttr($item->getId()) ?>" class="action tocart primary">
-@@ -34,12 +35,12 @@ $product = $item->getProduct();
-             </button>
-         </div>
-     </div>
--    <?php else: ?>
--        <?php if ($product->getIsSalable()): ?>
-+    <?php else : ?>
-+        <?php if ($product->getIsSalable()) : ?>
-             <p class="available stock" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-                 <span><?= $block->escapeHtml(__('In stock')) ?></span>
-             </p>
--        <?php else: ?>
-+        <?php else : ?>
-             <p class="unavailable stock" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-                 <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
-             </p>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
-index 17e2404ee23..0f1c696088b 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Comment $block  */
- 
- /* @var \Magento\Wishlist\Model\Item $item */
-@@ -17,6 +15,6 @@ $item = $block->getItem();
-         <span><?= $block->escapeHtml(__('Comment')) ?></span>
-     </label>
-     <div class="control">
--        <textarea id="product-item-comment-<?= $block->escapeHtmlAttr($item->getWishlistItemId()) ?>" placeholder="<?= /* @noEscape */ $this->helper('Magento\Wishlist\Helper\Data')->defaultCommentString() ?>" name="description[<?= $block->escapeHtmlAttr($item->getWishlistItemId()) ?>]" title="<?= $block->escapeHtmlAttr(__('Comment')) ?>" class="product-item-comment"><?= ($block->escapeHtml($item->getDescription())) ?></textarea>
-+        <textarea id="product-item-comment-<?= $block->escapeHtmlAttr($item->getWishlistItemId()) ?>" placeholder="<?= /* @noEscape */ $this->helper(\Magento\Wishlist\Helper\Data::class)->defaultCommentString() ?>" name="description[<?= $block->escapeHtmlAttr($item->getWishlistItemId()) ?>]" title="<?= $block->escapeHtmlAttr(__('Comment')) ?>" class="product-item-comment" <?= $item->getProduct()->isSaleable() ? '' : 'disabled="disabled"' ?>><?= ($block->escapeHtml($item->getDescription())) ?></textarea>
-     </div>
- </div>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
-index 1898ef6fc0d..a6fa5d4fccd 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Edit $block */
- 
- /** @var \Magento\Wishlist\Model\Item $item */
-@@ -13,7 +11,7 @@ $item = $block->getItem();
- $product = $item->getProduct();
- ?>
- 
--<?php if ($product->isVisibleInSiteVisibility()): ?>
-+<?php if ($product->isVisibleInSiteVisibility()) : ?>
-     <a class="action edit" href="<?= $block->escapeUrl($block->getItemConfigureUrl($item)) ?>">
-         <span><?= $block->escapeHtml(__('Edit')) ?></span>
-     </a>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
-index 2eb4664991e..0053c1d2148 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Image $block */
- 
- /** @var \Magento\Wishlist\Model\Item $item */
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
-index 265f4635a6b..2626e7745d5 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Info $block */
- 
- /** @var \Magento\Wishlist\Model\Item $item */
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml
-index 34770f8fe12..c602707f102 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml
-@@ -4,11 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart $block */
- ?>
- 
--<?php foreach ($block->getChildNames() as $childName): ?>
-+<?php foreach ($block->getChildNames() as $childName) : ?>
-     <?= /* @noEscape */ $block->getLayout()->renderElement($childName, false) ?>
- <?php endforeach;?>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
-index 57ae439d999..938b6293117 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Remove $block */
- ?>
- 
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml
-new file mode 100644
-index 00000000000..9120cc9fa68
---- /dev/null
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
-+$product = $block->getItem()->getProduct();
-+?>
-+<?= $block->getReviewsSummaryHtml($product, 'short') ?>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
-index a60a68e99f3..3b2e742af8b 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
-@@ -4,19 +4,17 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Item\configure $block */
- ?>
- 
- <div class="product-addto-links" data-role="add-to-links">
--    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-+    <?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow()) : ?>
-         <a href="#" data-post='<?= /* @noEscape */ $block->getUpdateParams() ?>' class="action towishlist updated" data-action="add-to-wishlist">
-             <span><?= $block->escapeHtml(__('Update Wish List')) ?></span>
-         </a>
-     <?php endif; ?>
-     <?php $_product = $block->getProduct(); ?>
--    <?php $_compareUrl = $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddUrl($_product); ?>
-+    <?php $_compareUrl = $this->helper(\Magento\Catalog\Helper\Product\Compare::class)->getAddUrl($_product); ?>
-     <?php if ($_compareUrl) : ?>
-         <a href="<?= $block->escapeUrl($_compareUrl) ?>" class="action tocompare">
-             <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
-@@ -26,7 +24,7 @@
- <script type="text/x-magento-init">
-     {
-         "body": {
--            "addToWishlist": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions()) ?>
-+            "addToWishlist": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getWishlistOptions()) ?>
-         }
-     }
- </script>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto/wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto/wishlist.phtml
-index 5b1d39681d9..05d4eaaa251 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto/wishlist.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto/wishlist.phtml
-@@ -4,11 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Item\Configure $block */
- ?>
--<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-+<?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow()) : ?>
-     <a href="#" data-post='<?= /* @noEscape */ $block->getUpdateParams() ?>' class="action towishlist updated" data-action="add-to-wishlist">
-         <span><?= $block->escapeHtml(__('Update Wish List')) ?></span>
-     </a>
-@@ -16,7 +14,7 @@
- <script type="text/x-magento-init">
-     {
-         "body": {
--            "addToWishlist": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions()) ?>
-+            "addToWishlist": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getWishlistOptions()) ?>
-         }
-     }
- </script>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
-index ef02768c46a..f11c9ac9a5c 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
-@@ -3,9 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?php
- /** @var \Magento\Wishlist\Block\Customer\Wishlist\Items $block */
-@@ -13,25 +10,25 @@ $columns = $block->getColumns();
- ?>
- 
- <div class="products-grid wishlist">
--    <?php if (count($block->getItems())): ?>
-+    <?php if (count($block->getItems())) : ?>
-     <ol class="product-items">
--        <?php foreach ($block->getItems() as $item): ?>
-+        <?php foreach ($block->getItems() as $item) : ?>
-             <li data-row="product-item" class="product-item" id="item_<?= $block->escapeHtmlAttr($item->getId()) ?>">
-                 <div class="product-item-info" data-container="product-grid">
--                    <?php foreach ($columns as $column): ?>
-+                    <?php foreach ($columns as $column) : ?>
-                         <?= $column->setItem($item)->toHtml();?>
-                     <?php endforeach; ?>
-                 </div>
-             </li>
-         <?php endforeach; ?>
-     </ol>
--    <?php else: ?>
-+    <?php else : ?>
-         <div class="message info empty">
-             <span><?= $block->escapeHtml(__('This Wish List has no Items')) ?></span>
-         </div>
-     <?php endif; ?>
- </div>
- 
--<?php foreach ($columns as $column): ?>
-+<?php foreach ($columns as $column) : ?>
-     <?= $column->getAdditionalHtml() ?>
- <?php endforeach; ?>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml b/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml
-index bad5acc209b..5902a9f25cc 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml
-@@ -3,8 +3,5 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
--
- ?>
- <?= $block->getChildHtml() ?>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/link.phtml b/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
-index 7f77dd0195a..e3ef3cf4f00 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var \Magento\Wishlist\Block\Link $block */
- ?>
- <li class="link wishlist" data-bind="scope: 'wishlist'">
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml b/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml
-index 342af0a4744..5abb0dd8e01 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml
-@@ -3,7 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
-+
- /** @var \Magento\Framework\View\Element\Template $block */
- ?>
- 
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/messages/removeWishlistItemSuccessMessage.phtml b/app/code/Magento/Wishlist/view/frontend/templates/messages/removeWishlistItemSuccessMessage.phtml
-index 1196b8fec4a..0f222598b53 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/messages/removeWishlistItemSuccessMessage.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/messages/removeWishlistItemSuccessMessage.phtml
-@@ -3,7 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--// @codingStandardsIgnoreFile
-+
- /** @var \Magento\Framework\View\Element\Template $block */
- ?>
- 
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/options_list.phtml b/app/code/Magento/Wishlist/view/frontend/templates/options_list.phtml
-index 9f7670e34f8..9e9cf1b64ad 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/options_list.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/options_list.phtml
-@@ -4,29 +4,27 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Options $block */
- ?>
- 
- <?php $options = $block->getOptionList(); ?>
--<?php if ($options): ?>
-+<?php if ($options) : ?>
- <div class="tooltip wrapper product-item-tooltip">
--  <span class="action details tooltip toggle"><?= $block->escapeHtml(__('See Details')) ?></span>
--  <div class="tooltip content">
--      <strong class="subtitle"><?= $block->escapeHtml(__('Options Details')) ?></strong>
--      <dl>
--          <?php foreach ($options as $option): ?>
--          <dt class="label"><?= $block->escapeHtml($option['label']) ?></dt>
--          <dd class="values">
--              <?php if (is_array($option['value'])): ?>
--              <?= /* @noEscape */ nl2br(implode("\n", $option['value'])) ?>
--              <?php else: ?>
--              <?= /* @noEscape */ $option['value'] ?>
--              <?php endif; ?>
--          </dd>
--          <?php endforeach; ?>
--      </dl>
--  </div>
-+    <span class="action details tooltip toggle"><?= $block->escapeHtml(__('See Details')) ?></span>
-+    <div class="tooltip content">
-+        <strong class="subtitle"><?= $block->escapeHtml(__('Options Details')) ?></strong>
-+        <dl>
-+            <?php foreach ($options as $option) : ?>
-+            <dt class="label"><?= $block->escapeHtml($option['label']) ?></dt>
-+            <dd class="values">
-+                <?php if (is_array($option['value'])) : ?>
-+                    <?= /* @noEscape */ nl2br(implode("\n", $option['value'])) ?>
-+                <?php else : ?>
-+                    <?= /* @noEscape */ $option['value'] ?>
-+                <?php endif; ?>
-+            </dd>
-+            <?php endforeach; ?>
-+        </dl>
-+    </div>
- </div>
- <?php endif ?>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml b/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
-index 7794b9027e9..4a97173fde3 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
-@@ -4,13 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /* @var \Magento\Wishlist\Block\Rss\EmailLink $block */
- ?>
--<?php if ($block->getLink()): ?>
-+<?php if ($block->getLink()) : ?>
- <p style="font-size:12px; line-height:16px; margin:0 0 16px;">
--    <?= $block->escapeHtml(__("RSS link to %1's wishlist", $this->helper('Magento\Wishlist\Helper\Data')->getCustomerName())) ?>
-+    <?= $block->escapeHtml(__("RSS link to %1's wishlist", $this->helper(\Magento\Wishlist\Helper\Data::class)->getCustomerName())) ?>
-     <br />
-     <a href="<?= $block->escapeUrl($block->getLink()) ?>"><?= $block->escapeUrl($block->getLink()) ?></a>
- </p>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/rss/wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/rss/wishlist.phtml
-index 04e7903b53b..d9cca05d667 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/rss/wishlist.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/rss/wishlist.phtml
-@@ -4,11 +4,9 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Rss\Link $block */
- ?>
--<?php if ($block->isRssAllowed() && $block->getLink() && $this->helper('Magento\Wishlist\Helper\Data')->getWishlist()->getItemsCount()): ?>
-+<?php if ($block->isRssAllowed() && $block->getLink() && $this->helper(\Magento\Wishlist\Helper\Data::class)->getWishlist()->getItemsCount()) : ?>
-     <a href="<?= $block->escapeUrl($block->getLink()) ?>" class="action rss wishlist">
-         <span><?= $block->escapeHtml(__('RSS Feed')) ?></span>
-     </a>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml b/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
-index e34c431d004..0fcaa6c853f 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
-@@ -4,12 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Share\Wishlist $block */
- ?>
- 
--<?php if ($block->hasWishlistItems()): ?>
-+<?php if ($block->hasWishlistItems()) : ?>
-     <form class="form shared wishlist" action="<?= $block->escapeUrl($block->getUrl('wishlist/index/update')) ?>" method="post">
-         <div class="wishlist table-wrapper">
-             <table class="table data wishlist" id="wishlist-table">
-@@ -22,7 +20,7 @@
-                 </tr>
-                 </thead>
-                 <tbody>
--                <?php foreach ($block->getWishlistItems() as $item): ?>
-+                <?php foreach ($block->getWishlistItems() as $item) : ?>
-                     <?php
-                     $product = $item->getProduct();
-                     $isVisibleProduct = $product->isVisibleInSiteVisibility();
-@@ -37,8 +35,8 @@
-                                     <?= $block->escapeHtml($product->getName()) ?>
-                                 </a>
-                             </strong>
--                            <?php
--                                echo $block->getProductPriceHtml(
-+                            <?=
-+                                $block->getProductPriceHtml(
-                                     $product,
-                                     'wishlist_configured_price',
-                                     \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-@@ -49,8 +47,8 @@
-                         </td>
-                         <td data-th="<?= $block->escapeHtmlAttr(__('Comment')) ?>" class="col comment"><?= /* @noEscape */ $block->getEscapedDescription($item) ?></td>
-                         <td data-th="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>" class="col actions" data-role="add-to-links">
--                            <?php if ($product->isSaleable()): ?>
--                                <?php if ($isVisibleProduct): ?>
-+                            <?php if ($product->isSaleable()) : ?>
-+                                <?php if ($isVisibleProduct) : ?>
-                                     <button type="button"
-                                             title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
-                                             data-post='<?= /* @noEscape */ $block->getSharedItemAddToCartUrl($item) ?>'
-@@ -70,7 +68,7 @@
-         </div>
- 
-         <div class="actions-toolbar">
--            <?php if ($block->isSaleable()):?>
-+            <?php if ($block->isSaleable()) : ?>
-                 <div class="primary">
-                     <button type="button"
-                             title="<?= $block->escapeHtmlAttr(__('Add All to Cart')) ?>"
-@@ -87,6 +85,6 @@
-             </div>
-         </div>
-     </form>
--<?php else: ?>
-+<?php else : ?>
-     <div class="message info empty"><div><?= $block->escapeHtml(__('Wish List is empty now.')) ?></div></div>
- <?php endif ?>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
-index 430ebd384c8..6591b480e73 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Customer\Sharing $block */
- ?>
- <form class="form wishlist share"
-@@ -29,7 +27,7 @@
-                 <textarea id="message" name="message" cols="60" rows="5"><?= /* @noEscape */ $block->getEnteredData('message') ?></textarea>
-             </div>
-         </div>
--        <?php if ($this->helper('Magento\Wishlist\Helper\Rss')->isRssAllow()): ?>
-+        <?php if ($this->helper(\Magento\Wishlist\Helper\Rss::class)->isRssAllow()) : ?>
-             <div class="field choice rss">
-                 <input type="checkbox" name="rss_url" id="rss_url" value="1" title="<?= $block->escapeHtmlAttr(__('Check here to link an RSS feed to your Wish List.')) ?>" class="checkbox">
-                 <label class="label" for="rss_url">
-@@ -40,6 +38,7 @@
-             </div>
-         <?php endif; ?>
-     </fieldset>
-+    <?= $block->getChildHtml('captcha'); ?>
-     <div class="actions-toolbar">
-         <div class="primary">
-             <button type="submit" title="<?= $block->escapeHtmlAttr(__('Share Wish List')) ?>" class="action submit primary">
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
-index 84b607adb63..6e678a89163 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
-@@ -4,12 +4,10 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Customer\Sidebar $block */
- ?>
- <?php
--$wishlistHelper = $this->helper('Magento\Wishlist\Helper\Data');
-+$wishlistHelper = $this->helper(\Magento\Wishlist\Helper\Data::class);
- ?>
- <?php if ($wishlistHelper->isAllow()) : ?>
-     <div class="block block-wishlist" data-bind="scope: 'wishlist'">
-@@ -61,7 +59,7 @@ $wishlistHelper = $this->helper('Magento\Wishlist\Helper\Data');
-                 <div class="actions-toolbar no-display" data-bind="css: {'no-display': null}">
-                     <div class="primary">
-                         <a class="action details"
--                           href="<?= $block->escapeUrl($this->helper('Magento\Wishlist\Helper\Data')->getListUrl()) ?>"
-+                           href="<?= $block->escapeUrl($this->helper(\Magento\Wishlist\Helper\Data::class)->getListUrl()) ?>"
-                            title="<?= $block->escapeHtmlAttr(__('Go to Wish List')) ?>"><span><?= $block->escapeHtml(__('Go to Wish List')) ?></span></a>
-                     </div>
-                 </div>
-diff --git a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
-index 8b2e1b1c9d8..81bb5bd1950 100644
---- a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
-+++ b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
-@@ -4,12 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--// @codingStandardsIgnoreFile
--
- /** @var \Magento\Wishlist\Block\Customer\Wishlist $block */
- ?>
- 
--<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-+<?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow()) : ?>
-+    <div class="toolbar wishlist-toolbar"><?= $block->getChildHtml('wishlist_item_pager'); ?></div>
-     <?= ($block->getChildHtml('wishlist.rss.link')) ?>
-     <form class="form-wishlist-items" id="wishlist-view-form"
-           data-mage-init='{"wishlist":{
-@@ -18,11 +17,11 @@
-           "commentString":""},
-           "validation": {}}' action="<?= $block->escapeUrl($block->getUrl('wishlist/index/update', ['wishlist_id' => $block->getWishlistInstance()->getId()])) ?>" method="post">
-         <?= $block->getChildHtml('top') ?>
--        <?php if ($block->hasWishlistItems()): ?>
-+        <?php if ($block->hasWishlistItems()) : ?>
-             <?= $block->getBlockHtml('formkey') ?>
-             <?php $block->getChildBlock('items')->setItems($block->getWishlistItems()); ?>
-             <?= $block->getChildHtml('items') ?>
--        <?php else: ?>
-+        <?php else : ?>
-             <div class="message info empty"><span><?= $block->escapeHtml(__('You have no items in your wish list.')) ?></span></div>
-         <?php endif ?>
-         <?= $block->getChildHtml('bottom') ?>
-@@ -51,5 +50,6 @@
-           <input name="entity" value="<%- data.entity %>">
-           <% } %>
-       </form>
--  </script>
-+    </script>
-+    <div class="toolbar wishlist-toolbar"><br><?= $block->getChildHtml('wishlist_item_pager'); ?></div>
- <?php endif ?>
-diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
-index 7ce93431726..b38c5c2cda3 100644
---- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
-+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
-@@ -162,18 +162,12 @@ define([
-                 $.each(elementValue, function (key, option) {
-                     data[elementName + '[' + option + ']'] = option;
-                 });
-+            } else if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
-+                elementName = elementName.substring(0, elementName.length - 2);
-+
-+                data[elementName + '[' + elementValue + ']'] = elementValue;
-             } else {
--                if (elementValue) { //eslint-disable-line no-lonely-if
--                    if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
--                        elementName = elementName.substring(0, elementName.length - 2);
--
--                        if (elementValue) { //eslint-disable-line max-depth
--                            data[elementName + '[' + elementValue + ']'] = elementValue;
--                        }
--                    } else {
--                        data[elementName] = elementValue;
--                    }
--                }
-+                data[elementName] = elementValue;
-             }
- 
-             return data;
-diff --git a/app/code/Magento/WishlistAnalytics/README.md b/app/code/Magento/WishlistAnalytics/README.md
-index 999fc835626..1ad88959829 100644
---- a/app/code/Magento/WishlistAnalytics/README.md
-+++ b/app/code/Magento/WishlistAnalytics/README.md
-@@ -1,3 +1,3 @@
- # Magento_WishlistAnalytics module
- 
--The Magento_WishlistAnalytics module configures data definitions for a data collection related to the Wishlist module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
-+The Magento_WishlistAnalytics module configures data definitions for a data collection related to the Wishlist module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
-diff --git a/app/code/Magento/WishlistAnalytics/composer.json b/app/code/Magento/WishlistAnalytics/composer.json
-index fc69afe2907..747f2a4baaa 100644
---- a/app/code/Magento/WishlistAnalytics/composer.json
-+++ b/app/code/Magento/WishlistAnalytics/composer.json
-@@ -4,7 +4,8 @@
-     "require": {
-         "php": "~7.1.3||~7.2.0",
-         "magento/framework": "*",
--        "magento/module-wishlist": "*"
-+        "magento/module-wishlist": "*",
-+        "magento/module-analytics": "*"
-     },
-     "type": "magento2-module",
-     "license": [
-diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php
-new file mode 100644
-index 00000000000..65c8498fc89
---- /dev/null
-+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\WishlistGraphQl\Model\Resolver;
-+
-+use Magento\CatalogGraphQl\Model\ProductDataProvider;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Wishlist\Model\Item;
-+
-+/**
-+ * Fetches the Product data according to the GraphQL schema
-+ */
-+class ProductResolver implements ResolverInterface
-+{
-+    /**
-+     * @var ProductDataProvider
-+     */
-+    private $productDataProvider;
-+
-+    /**
-+     * @param ProductDataProvider $productDataProvider
-+     */
-+    public function __construct(ProductDataProvider $productDataProvider)
-+    {
-+        $this->productDataProvider = $productDataProvider;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('Missing key "model" in Wishlist Item value data'));
-+        }
-+        /** @var Item $wishlistItem */
-+        $wishlistItem = $value['model'];
-+
-+        return $this->productDataProvider->getProductDataById((int)$wishlistItem->getProductId());
-+    }
-+}
-diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItemsResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItemsResolver.php
-new file mode 100644
-index 00000000000..dfbbf6543f6
---- /dev/null
-+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItemsResolver.php
-@@ -0,0 +1,97 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\WishlistGraphQl\Model\Resolver;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Wishlist\Model\ResourceModel\Item\Collection as WishlistItemCollection;
-+use Magento\Wishlist\Model\ResourceModel\Item\CollectionFactory as WishlistItemCollectionFactory;
-+use Magento\Wishlist\Model\Item;
-+use Magento\Wishlist\Model\Wishlist;
-+
-+/**
-+ * Fetches the Wishlist Items data according to the GraphQL schema
-+ */
-+class WishlistItemsResolver implements ResolverInterface
-+{
-+    /**
-+     * @var WishlistItemCollectionFactory
-+     */
-+    private $wishlistItemCollectionFactory;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @param WishlistItemCollectionFactory $wishlistItemCollectionFactory
-+     * @param StoreManagerInterface $storeManager
-+     */
-+    public function __construct(
-+        WishlistItemCollectionFactory $wishlistItemCollectionFactory,
-+        StoreManagerInterface $storeManager
-+    ) {
-+        $this->wishlistItemCollectionFactory = $wishlistItemCollectionFactory;
-+        $this->storeManager = $storeManager;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        if (!isset($value['model'])) {
-+            throw new LocalizedException(__('Missing key "model" in Wishlist value data'));
-+        }
-+        /** @var Wishlist $wishlist */
-+        $wishlist = $value['model'];
-+
-+        $wishlistItems = $this->getWishListItems($wishlist);
-+
-+        $data = [];
-+        foreach ($wishlistItems as $wishlistItem) {
-+            $data[] = [
-+                'id' => $wishlistItem->getId(),
-+                'qty' => $wishlistItem->getData('qty'),
-+                'description' => $wishlistItem->getDescription(),
-+                'added_at' => $wishlistItem->getAddedAt(),
-+                'model' => $wishlistItem,
-+            ];
-+        }
-+        return $data;
-+    }
-+
-+    /**
-+     * Get wishlist items
-+     *
-+     * @param Wishlist $wishlist
-+     * @return Item[]
-+     */
-+    private function getWishListItems(Wishlist $wishlist): array
-+    {
-+        /** @var WishlistItemCollection $wishlistItemCollection */
-+        $wishlistItemCollection = $this->wishlistItemCollectionFactory->create();
-+        $wishlistItemCollection
-+            ->addWishlistFilter($wishlist)
-+            ->addStoreFilter(array_map(function (StoreInterface $store) {
-+                return $store->getId();
-+            }, $this->storeManager->getStores()))
-+            ->setVisibilityFilter();
-+        return $wishlistItemCollection->getItems();
-+    }
-+}
-diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
-new file mode 100644
-index 00000000000..792928ab61a
---- /dev/null
-+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\WishlistGraphQl\Model\Resolver;
-+
-+use Magento\Framework\GraphQl\Config\Element\Field;
-+use Magento\Framework\GraphQl\Query\ResolverInterface;
-+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-+use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResourceModel;
-+use Magento\Wishlist\Model\Wishlist;
-+use Magento\Wishlist\Model\WishlistFactory;
-+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-+
-+/**
-+ * Fetches the Wishlist data according to the GraphQL schema
-+ */
-+class WishlistResolver implements ResolverInterface
-+{
-+    /**
-+     * @var WishlistResourceModel
-+     */
-+    private $wishlistResource;
-+
-+    /**
-+     * @var WishlistFactory
-+     */
-+    private $wishlistFactory;
-+
-+    /**
-+     * @param WishlistResourceModel $wishlistResource
-+     * @param WishlistFactory $wishlistFactory
-+     */
-+    public function __construct(WishlistResourceModel $wishlistResource, WishlistFactory $wishlistFactory)
-+    {
-+        $this->wishlistResource = $wishlistResource;
-+        $this->wishlistFactory = $wishlistFactory;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function resolve(
-+        Field $field,
-+        $context,
-+        ResolveInfo $info,
-+        array $value = null,
-+        array $args = null
-+    ) {
-+        $customerId = $context->getUserId();
-+
-+        /* Guest checking */
-+        if (!$customerId && 0 === $customerId) {
-+            throw new GraphQlAuthorizationException(__('The current user cannot perform operations on wishlist'));
-+        }
-+        /** @var Wishlist $wishlist */
-+        $wishlist = $this->wishlistFactory->create();
-+        $this->wishlistResource->load($wishlist, $customerId, 'customer_id');
-+
-+        if (null === $wishlist->getId()) {
-+            return [];
-+        }
-+
-+        return [
-+            'sharing_code' => $wishlist->getSharingCode(),
-+            'updated_at' => $wishlist->getUpdatedAt(),
-+            'items_count' => $wishlist->getItemsCount(),
-+            'name' => $wishlist->getName(),
-+            'model' => $wishlist,
-+        ];
-+    }
-+}
-diff --git a/app/code/Magento/WishlistGraphQl/README.md b/app/code/Magento/WishlistGraphQl/README.md
-new file mode 100644
-index 00000000000..9121593e6a7
---- /dev/null
-+++ b/app/code/Magento/WishlistGraphQl/README.md
-@@ -0,0 +1,4 @@
-+# WishlistGraphQl
-+
-+**WishlistGraphQl** provides type information for the GraphQl module
-+to generate wishlist fields.
-diff --git a/app/code/Magento/WishlistGraphQl/composer.json b/app/code/Magento/WishlistGraphQl/composer.json
-new file mode 100644
-index 00000000000..630ee97acc2
---- /dev/null
-+++ b/app/code/Magento/WishlistGraphQl/composer.json
-@@ -0,0 +1,24 @@
-+{
-+    "name": "magento/module-wishlist-graph-ql",
-+    "description": "N/A",
-+    "type": "magento2-module",
-+    "require": {
-+        "php": "~7.1.3||~7.2.0",
-+        "magento/framework": "*",
-+        "magento/module-catalog-graph-ql": "*",
-+        "magento/module-wishlist": "*",
-+        "magento/module-store": "*"
-+    },
-+    "license": [
-+        "OSL-3.0",
-+        "AFL-3.0"
-+    ],
-+    "autoload": {
-+        "files": [
-+            "registration.php"
-+        ],
-+        "psr-4": {
-+            "Magento\\WishlistGraphQl\\": ""
-+        }
-+    }
-+}
-diff --git a/app/code/Magento/WishlistGraphQl/etc/module.xml b/app/code/Magento/WishlistGraphQl/etc/module.xml
-new file mode 100644
-index 00000000000..337623cc85a
---- /dev/null
-+++ b/app/code/Magento/WishlistGraphQl/etc/module.xml
-@@ -0,0 +1,10 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_WishlistGraphQl" />
-+</config>
-diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
-new file mode 100644
-index 00000000000..2aa5f03a787
---- /dev/null
-+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
-@@ -0,0 +1,22 @@
-+# Copyright © Magento, Inc. All rights reserved.
-+# See COPYING.txt for license details.
-+
-+type Query {
-+    wishlist: WishlistOutput @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistResolver") @doc(description: "The wishlist query returns the contents of a customer's wish list") @cache(cacheable: false)
-+}
-+
-+type WishlistOutput {
-+    items: [WishlistItem] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItemsResolver") @doc(description: "An array of items in the customer's wish list"),
-+    items_count: Int @doc(description: "The number of items in the wish list"),
-+    name: String @doc(description: "When multiple wish lists are enabled, the name the customer assigns to the wishlist"),
-+    sharing_code: String @doc(description: "An encrypted code that Magento uses to link to the wish list"),
-+    updated_at: String @doc(description: "The time of the last modification to the wish list")
-+}
-+
-+type WishlistItem {
-+    id: Int @doc(description: "The wish list item ID")
-+    qty: Float @doc(description: "The quantity of this wish list item"),
-+    description: String @doc(description: "The customer's comment about this item"),
-+    added_at: String @doc(description: "The time when the customer added the item to the wish list"),
-+    product: ProductInterface @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\ProductResolver")
-+}
-\ No newline at end of file
-diff --git a/app/code/Magento/WishlistGraphQl/registration.php b/app/code/Magento/WishlistGraphQl/registration.php
-new file mode 100644
-index 00000000000..c5d468421f9
---- /dev/null
-+++ b/app/code/Magento/WishlistGraphQl/registration.php
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_WishlistGraphQl', __DIR__);
-diff --git a/app/design/adminhtml/Magento/backend/Magento_AdminNotification/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_AdminNotification/web/css/source/_module.less
-index c1b684aef35..afd91ed3dbd 100644
---- a/app/design/adminhtml/Magento/backend/Magento_AdminNotification/web/css/source/_module.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_AdminNotification/web/css/source/_module.less
-@@ -83,7 +83,7 @@
- 
- .message-system-short-wrapper {
-     overflow: hidden;
--    padding: 0 1.5rem 0 @indent__l;
-+    padding: 0 1.5rem 0 1rem;
- }
- 
- .message-system-collapsible {
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less
-index 2958708e51d..0244775fad0 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less
-@@ -25,7 +25,7 @@
-     border-top: @footer__border-width solid @footer__border-color;
-     color: @footer__color;
-     margin-top: auto;
--    padding: 2.6rem 2rem 6rem 3rem;
-+    padding: 2.6rem 3rem 6rem;
- 
-     a {
-         .lib-link(
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
-index ba281083260..d0b17b3439d 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
-@@ -15,9 +15,9 @@
- 
- @menu__background-color: @color-very-dark-grayish-orange;
- 
--@menu-logo__padding-bottom: 2.2rem;
-+@menu-logo__padding-bottom: 1.7rem;
- @menu-logo__outer-size: @menu-logo__padding-top + @menu-logo-img__height + @menu-logo__padding-bottom;
--@menu-logo__padding-top: 1.2rem;
-+@menu-logo__padding-top: 1.7rem; 
- @menu-logo-img__height: 4.1rem;
- @menu-logo-img__width: 3.5rem;
- 
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_headings-group.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_headings-group.less
-index 832c66b7988..bf7ee7850f9 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_headings-group.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_headings-group.less
-@@ -42,4 +42,5 @@
-     color: @page-title__color;
-     font-size: @page-title__font-size;
-     margin-bottom: 0;
-+    word-break: break-all;
- }
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_notifications.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_notifications.less
-index c9c97930297..40ebb6f3c45 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_notifications.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_notifications.less
-@@ -97,9 +97,11 @@
-         display: inline-block;
-         font-size: @notifications__font-size;
-         font-weight: @font-weight__bold;
-+        height: 18px;
-         left: 50%;
-         margin-left: .3em;
-         margin-top: -1.1em;
-+        min-width: 18px;
-         padding: .3em .5em;
-         position: absolute;
-         top: 50%;
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less
-index 5e65faec60d..2d3c6140d58 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less
-@@ -86,6 +86,8 @@
-         position: absolute;
-         right: 0;
-         top: 100%;
-+        word-break: break-word;
-+        word-wrap: break-word;
-         z-index: 2;
- 
-         &:after {
-@@ -153,7 +155,7 @@
-     background-color: transparent;
-     border: 1px solid transparent;
-     font-size: @search-global-input__font-size;
--    height: @search-global-input__height;
-+    height: @search-global-input__height + .2;
-     padding: @search-global-input__padding-top @search-global-input__padding-side @search-global-input__padding-bottom;
-     position: absolute;
-     right: 0;
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
-index 07050c1e511..8499ecaa48c 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
-@@ -44,7 +44,10 @@
- 
- .page-actions {
-     @_page-action__indent: 1.3rem;
--    float: right;
-+
-+    &.floating-header {
-+        &:extend(.page-actions-buttons all);
-+    }
- 
-     .page-main-actions & {
-         &._fixed {
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
-index 6420738c6fb..bdc986e918c 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
-@@ -105,11 +105,16 @@
- //
- 
- .admin__collapsible-block-wrapper {
-+    .admin__collapsible-title[aria-expanded='true'] {
-+        &:before {
-+            content: @icon-expand-close__content;
-+        }
-+    } 
-+    
-     .__collapsible-block-wrapper-pattern();
-     .admin__collapsible-title {
-         .__collapsible-title-pattern();
-     }
--
-     &.opened,
-     &._show {
-         > .fieldset-wrapper-title {
-@@ -127,6 +132,21 @@
-                 }
-             }
-         }
-+
-+        td.admin__collapsible-block-wrapper {
-+            .admin__collapsible-title {
-+                &:before {
-+                    content: @icon-expand-open__content;
-+                }
-+            }
-+            &._show {
-+                .admin__collapsible-title {
-+                    &:before {
-+                        content: @icon-expand-close__content;
-+                    } 
-+                }
-+            }
-+        }
-     }
- 
-     &.fieldset-wrapper {
-@@ -147,6 +167,14 @@
-     &.collapsible-block-wrapper-last {
-         border-bottom: 0;
-     }
-+
-+    .admin__dynamic-rows.admin__control-collapsible {   
-+        td {
-+            &.admin__collapsible-block-wrapper {
-+                border-bottom: none;
-+            }
-+        }
-+    }
- }
- 
- .admin__collapsible-content {
-@@ -322,7 +350,7 @@
-             }
- 
-             .value {
--                padding-right: 4rem;
-+                padding-right: 2rem;
-             }
-         }
- 
-@@ -472,6 +500,8 @@
-             width: 44%;
- 
-             &.with-tooltip {
-+                font-size: 0;
-+
-                 .tooltip {
-                     bottom: 0;
-                     float: right;
-@@ -481,6 +511,11 @@
-                     right: 0;
-                     top: 0;
-                 }
-+      
-+                .time-separator {
-+                    font-size: 14px;
-+                    padding-left: 5px;
-+                } 
- 
-                 .tooltip-content {
-                     background: @color-very-dark-gray-black2;
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less
-index 42b3ecfb711..070ee634750 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less
-@@ -203,7 +203,7 @@
-     font-weight: @font-weight__heavier;
-     line-height: @line-height__s;
-     margin: 0 0 -1px;
--    padding: @admin__page-nav-link__padding;
-+    padding: 2rem 0 2rem 1rem;
-     transition: @admin__page-nav-transition;
-     word-wrap: break-word;
- }
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less
-index c0c94eaaf35..cd73d4955d1 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less
-@@ -37,8 +37,8 @@
- .store-scope {
-     .admin__legend {
-         .admin__field-tooltip {
--            margin-left: -@indent__base;
--            margin-top: -.2rem;
-+            margin-left: 0;
-+            margin-top: .5rem;
-         }
-     }
- }
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less
-index 80bebb22a90..c4bb1a027e4 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less
-@@ -7,13 +7,13 @@
- //  Main elements -> Actions bar -> Store Switcher
- //  _____________________________________________
- 
--//  ToDo UI: Consist old styles, should be changed with new design
-+//  ToDo UI:  Consist old styles, should be changed with new design
- 
- .store-switcher {
--    color: @text__color; // ToDo UI: Delete with admin scope
-+    color: @text__color;
-     float: left;
-     font-size: round(@font-size__base - .1rem, 1);
--    margin-top: .7rem;
-+    margin-top: .59rem;
- 
-     .admin__action-dropdown {
-         background-color: @page-main-actions__background-color;
-@@ -47,8 +47,8 @@
-             width: 7px;
-         }
-         &::-webkit-scrollbar-thumb {
--            border-radius: 4px;
-             background-color: rgba(0, 0, 0, .5);
-+            border-radius: 4px;
-         }
- 
-         li {
-@@ -235,11 +235,11 @@
- .store-view {
-     &:not(.store-switcher) {
-         float: left;
-+        margin-top: 1.10rem;
-     }
- 
-     .store-switcher-label {
-         display: inline-block;
--        margin-top: @indent__s;
-     }
- }
- 
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png b/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png
-index d9395c938cb..0cca183e08d 100644
-Binary files a/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png and b/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png differ
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
-index 33559502540..ffbbaeb0841 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
-@@ -15,6 +15,14 @@
-     }
- }
- 
-+.catalog-category-edit {
-+    .admin__grid-control {
-+        .admin__grid-control-value {
-+            display: none;
-+        }
-+    }  
-+}
-+
- .product-composite-configure-inner {
-     .admin__control-text {
-         &.qty {
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less
-index a80cc9a5163..c8f2530df22 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less
-@@ -3,14 +3,77 @@
- //  * See COPYING.txt for license details.
- //  */
- 
--//  General rule hides group legend and shows first field label instead
--//  in app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
--//  This must be reset for Customer Address page
--.address-item-edit-content {
-+.customer_form_areas_address_address_customer_address_update_modal_update_customer_address_form_loader {
-     .admin__field {
--        legend {
--            &.admin__field-label {
--                opacity: 1;
-+        .admin__field {
-+            .admin__field-label {
-+                background: none;
-+            }
-+        }
-+    }
-+}
-+
-+.customer-address-form {
-+
-+    *,
-+    *:after,
-+    *:before {
-+        -moz-box-sizing: border-box;
-+        -webkit-box-sizing: border-box;
-+        box-sizing: border-box;
-+    }
-+
-+    address {
-+        font-style: normal;
-+    }
-+
-+    .customer-default-address-wrapper {
-+        align-items: flex-start;
-+        display: flex;
-+        float: left;
-+        position: relative;
-+        width: 50%;
-+
-+        .action-additional {
-+            margin: 2px 0 0 2px;
-+        }
-+    }
-+
-+    .edit-default-billing-address-button,
-+    .edit-default-shipping-address-button {
-+        position: absolute;
-+    }
-+
-+    .edit-default-billing-address-button {
-+        left: 210px;
-+    }
-+
-+    .edit-default-shipping-address-button {
-+        left: 230px;
-+    }
-+
-+    .customer_form_areas_address_address_customer_address_listing {
-+        clear: both;
-+    }
-+
-+    .add-new-address-button {
-+        clear: both;
-+        float: right;
-+        margin-bottom: 30px;
-+        position: relative;
-+    }
-+
-+    .address-information {
-+        float: left;
-+        margin-bottom: 20px;
-+
-+        address {
-+            float: left;
-+
-+            .address_caption {
-+                font-size: 18px;
-+                font-weight: bold;
-+                margin-bottom: 16px;
-             }
-         }
-     }
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less
-index 17be2ca7060..08606402f7a 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less
-@@ -34,7 +34,7 @@
-         .admin__field-control {
-             direction: rtl;
-             display: inline-block;
--            margin: -4px 0 0;
-+            margin: -1px 0 0;
-             unicode-bidi: bidi-override;
-             vertical-align: top;
-             width: 125px;
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less
-index c405707ee7b..16c84047b52 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less
-@@ -7,13 +7,21 @@
-     .rma-request-details,
-     .rma-wrapper .order-shipping-address {
-         float: left;
--        #mix-grid .width(6,12);
-+        /**
-+         * @codingStandardsIgnoreStart
-+         */
-+        #mix-grid .width(6, 12);
-+        //@codingStandardsIgnoreEnd
-     }
- 
-     .rma-confirmation,
--    .rma-wrapper .order-return-address {
-+    .rma-wrapper .order-return-address, .rma-wrapper .order-shipping-method {
-         float: right;
--        #mix-grid .width(6,12);
-+        /**
-+        * @codingStandardsIgnoreStart
-+        */
-+        #mix-grid .width(6, 12);
-+        //@codingStandardsIgnoreEnd
-     }
- }
- 
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
-index 984556816b0..ffa5ee96395 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
-@@ -94,6 +94,14 @@
-         margin: 0;
-         padding: 0;
-     }
-+     .admin__data-grid-pager-wrap{
-+         .selectmenu {
-+             margin-bottom: 10px;
-+         }
-+     }
-+   .data-grid-search-control-wrap {
-+        margin-bottom: 10px;
-+    }
- }
- 
- //
-@@ -300,38 +308,4 @@
-     }
- }
- 
--//  ToDo UI: review the collapsible block
--//.order-subtotal {
--//    .summary-collapse {
--//        cursor: pointer;
--//        display: inline-block;
--//        &:before {
--//            @iconsize: 16px;
--//
--//            -webkit-font-smoothing: antialiased;
--//            background: #f2ebde;
--//            border-radius: 2px;
--//            border: 1px solid #ada89e;
--//            color: #816063;
--//            content: '+';
--//            display: inline-block;
--//            font-size: @iconsize;
--//            font-style: normal;
--//            font-weight: normal;
--//            height: @iconsize;
--//            line-height: @iconsize;
--//            margin-right: 7px;
--//            overflow: hidden;
--//            speak: none;
--//            text-indent: 0;
--//            vertical-align: top;
--//            width: @iconsize;
--//        }
--//        &:hover:before {
--//            background: #cac3b4;
--//        }
--//    }
--//    &.show-details .summary-collapse:before {
--//        content: '\e03a';
--//    }
--//}
-+//  ToDo: MAGETWO-32299 UI: review the collapsible block
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less
-index e14bcbcddd4..f66e94940c5 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less
-@@ -27,3 +27,19 @@
-         width: 50%;
-     }
- }
-+
-+.page-create-order {
-+    .order-details {
-+        &:not(.order-details-existing-customer) {
-+            .order-account-information {
-+                .field-email {
-+                    margin-left: -30px;
-+                }
-+
-+                .field-group_id {
-+                    margin-right: 30px;
-+                }
-+            }
-+        }
-+    }
-+}
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-comments.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-comments.less
-index 2f6aec0315e..5bcf4d4953c 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-comments.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-comments.less
-@@ -49,7 +49,7 @@
-     margin: 0 0 @order-create-sidebar__margin;
-     .lib-typography(
-     @_font-size: 1.9rem,
--    @_color: @color-brown-darkie,
-+    @_color: @color-brown-darker,
-     @_font-weight: @font-weight__semibold,
-     @_line-height: @line-height__s,
-     @_font-family: false,
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
-index 1e40fe1fa34..029594625ed 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
-@@ -9,6 +9,7 @@
- 
- .admin__payment-method-wrapper {
-     margin: 0;
-+    width: calc(50% - @indent__l);
-     .admin__field {
-         margin-left: 0;
-         &:first-child {
-@@ -34,6 +35,7 @@
-     margin: 0;
- }
- 
-+.order-billing-method-summary,
- .order-shipping-method-summary {
-     padding-top: @field-option__padding-top;
- }
-@@ -43,6 +45,7 @@
-     position: relative;
- }
- 
-+.order-billing-method-summary,
- .order-shipping-method-summary,
- .order-shipping-method-info {
-     .action-default {
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less b/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less
-index 3e1f4e75031..ae13c479cea 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less
-@@ -16,7 +16,7 @@
- @staging-preview-header__font-size: 1.3rem;
- 
- @staging-preview-header-item__active__background-color: @color-brownie-almost;
--@staging-preview-header-item-actions__border-color: @color-darkie-gray;
-+@staging-preview-header-item-actions__border-color: @color-darker-gray;
- 
- @staging-preview-form-element__background-color: @color-very-dark-brownie;
- @staging-preview-form-element__border-color: @color-lighter-grayish-almost;
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
-index d55608ade4a..946d11db2d1 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
-@@ -392,6 +392,7 @@ body._in-resize {
-         overflow: hidden;
-         padding: 0;
-         vertical-align: top;
-+        vertical-align: middle;
-         width: @control-checkbox-radio__size + @data-grid-checkbox-cell-inner__padding-horizontal * 2;
- 
-         &:hover {
-@@ -1074,8 +1075,10 @@ body._in-resize {
-     }
- 
-     .data-grid-checkbox-cell-inner {
--        margin: @data-grid-checkbox-cell-inner__padding-top @data-grid-checkbox-cell-inner__padding-horizontal .9rem;
-+        display: unset;
-+        margin: 0 @data-grid-checkbox-cell-inner__padding-horizontal 0;
-         padding: 0;
-+        text-align: center;
-     }
- 
-     //  Content Hierarchy specific
-diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
-index 6e03e1d0ceb..e37e08f3b66 100644
---- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
-@@ -99,7 +99,7 @@
-     }
- 
-     .action-menu {
--        max-height: 3.85rem * @data-grid-search-control-action-menu-item__quantity; // ToDo UI: change static item height
-+        max-height: 3.85rem * @data-grid-search-control-action-menu-item__quantity; // @todo: change static item height
-         overflow-y: auto;
-         z-index: @data-grid-search-menu__z-index;
-     }
-@@ -354,6 +354,7 @@
- 
- .admin__current-filters-list-wrap {
-     width: 100%;
-+    word-break: break-all;
- }
- 
- .admin__current-filters-list {
-diff --git a/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
-index 1cd867efdd1..152dd4050ad 100644
---- a/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
-+++ b/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
-@@ -68,18 +68,27 @@
- 
-             a {
-                 color: @color-gray85;
-+                cursor: move;
-                 display: block;
-                 float: left;
-                 text-decoration: none;
-             }
- 
-             a:last-child {
-+                cursor: pointer;
-                 float: right;
-             }
-         }
- 
-         .info-block {
-             height: 100px;
-+            > span {
-+                display: inline-block;
-+                overflow: hidden;
-+                text-overflow: ellipsis;
-+                white-space: nowrap;
-+                width: 100%;
-+            }
-         }
- 
-         .controlbar-bottom {
-diff --git a/app/design/adminhtml/Magento/backend/etc/view.xml b/app/design/adminhtml/Magento/backend/etc/view.xml
-index f10f7789b08..18c2d8f1b17 100644
---- a/app/design/adminhtml/Magento/backend/etc/view.xml
-+++ b/app/design/adminhtml/Magento/backend/etc/view.xml
-@@ -23,6 +23,8 @@
-         </images>
-     </media>
-     <exclude>
-+        <item type="file">Lib::mage/captcha.js</item>
-+        <item type="file">Lib::mage/captcha.min.js</item>
-         <item type="file">Lib::mage/common.js</item>
-         <item type="file">Lib::mage/cookies.js</item>
-         <item type="file">Lib::mage/dataPost.js</item>
-diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
-index c535047e376..8b26177a05c 100644
---- a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
-+++ b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
-@@ -10,7 +10,7 @@
- @tooltip__background-color: @color-white;
- @tooltip__border-color: @color-gray68;
- @tooltip__border-radius: 0;
--@tooltip__color: @color-brown-darkie;
-+@tooltip__color: @color-brown-darker;
- @tooltip__max-width: 31rem;
- @tooltip__opacity: .9;
- @tooltip__shadow-color: @color-gray80;
-@@ -93,7 +93,7 @@
-     }
- }
- 
--//  ToDo UI: Only right tooltip arrow is styled, if we will neeed more need to add another ones
-+//  ToDo UI: Only right tooltip arrow is styled, if we will need more need to add another ones
- 
- .tooltip {
-     &.top {
-diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less
-index 39d7be029f8..be137863818 100644
---- a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less
-+++ b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less
-@@ -28,7 +28,7 @@
- @color-green-apple: #79a22e;
- @color-green-islamic: #090;
- @color-dark-brownie: #41362f;
--@color-brown-darkie: #41362f;
-+@color-brown-darker: #41362f;
- @color-phoenix-down: #e04f00;
- @color-phoenix: #eb5202;
- @color-phoenix-almost-rise: #ef672f;
-diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_common.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_common.less
-index 2b33d1fa542..b71c94f2917 100644
---- a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_common.less
-+++ b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_common.less
-@@ -19,6 +19,12 @@
-     padding-top: @main__indent-top;
- }
- 
-+.menu-wrapper {
-+    .logo-static {
-+        pointer-events: none;
-+    }
-+}
-+
- //
- //  Header
- //  _____________________________________________
-diff --git a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_extension-manager.less b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_extension-manager.less
-index 911ef55f3f2..30500569c82 100644
---- a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_extension-manager.less
-+++ b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_extension-manager.less
-@@ -15,7 +15,7 @@
- 
- @extension-manager-title__background-color: @color-white-fog;
- @extension-manager-title__border-color: @color-gray89;
--@extension-manager-title__color: @color-brown-darkie;
-+@extension-manager-title__color: @color-brown-darker;
- 
- @extension-manager-button__border-color: @color-gray68;
- 
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less b/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less
-index 475d3914a5f..5658214a769 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less
-@@ -45,13 +45,13 @@
-     }
- 
-     .ui-tabs-anchor {
--        color: @color-brown-darkie;
-+        color: @color-brown-darker;
-         display: block;
-         padding: 1.5rem 1.8rem 1.3rem;
-         text-decoration: none;
- 
-         &:hover { // ToDo UI: should be deleted with old styles
--            color: @color-brown-darkie;
-+            color: @color-brown-darker;
-             text-decoration: none;
-         }
-     }
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_typography.less b/app/design/adminhtml/Magento/backend/web/css/source/_typography.less
-index 54726d2d34b..1f7d7f879c4 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/_typography.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/_typography.less
-@@ -71,7 +71,7 @@ h1 {
- 
-     .lib-typography(
-         @_font-size: 2.8rem,
--        @_color: @color-brown-darkie,
-+        @_color: @color-brown-darker,
-         @_font-weight: @font-weight__regular,
-         @_line-height: @line-height__s,
-         @_font-family: false,
-@@ -84,7 +84,7 @@ h2 {
- 
-     .lib-typography(
-         @_font-size: 2rem,
--        @_color: @color-brown-darkie,
-+        @_color: @color-brown-darker,
-         @_font-weight: @font-weight__regular,
-         @_line-height: @line-height__s,
-         @_font-family: false,
-@@ -97,7 +97,7 @@ h3 {
- 
-     .lib-typography(
-         @_font-size: 1.7rem,
--        @_color: @color-brown-darkie,
-+        @_color: @color-brown-darker,
-         @_font-weight: @font-weight__semibold,
-         @_line-height: @line-height__s,
-         @_font-family: false,
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less
-index cd089232412..d1fe33c4fe7 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less
-@@ -234,6 +234,7 @@
-         border: 0;
-         display: inline;
-         margin: 0;
-+        width: 6rem;
- 
-         body._keyfocus &:focus {
-             box-shadow: none;
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
-index 7b99d4f136d..61bd94cf3f4 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
-@@ -179,7 +179,7 @@
- .admin__action-multiselect-search-label {
-     display: block;
-     font-size: 1.5rem;
--    height: 1em;
-+    height: 1.3em;
-     overflow: hidden;
-     position: absolute;
-     right: 2.2rem;
-@@ -199,8 +199,8 @@
- 
- .admin__action-multiselect-empty-area {
-     color: @color-gray65-almost;
--    padding-top: 20px;
-     padding-bottom: 20px;
-+    padding-top: 20px;
-     text-align: center;
-     vertical-align: middle;
- }
-@@ -338,7 +338,7 @@
-             border-top: @action-multiselect-tree-lines;
-             height: 1px;
-             top: @action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2;
--            width: @action-multiselect-tree-menu-item__margin-left + @action-multiselect-menu-item__padding;
-+            width: @action-multiselect-tree-menu-item__margin-left;
-         }
- 
-         //  Vertical dotted line
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
-index 1cc61bef5da..1c45fe6946b 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
-@@ -7,6 +7,14 @@
- //  Actions -> Action select
- //  _____________________________________________
- 
-+//
-+//  Variables
-+//  _____________________________________________
-+
-+@_dropdown__padding-right: @action__height;
-+@_triangle__height: @button-marker-triangle__height;
-+@_triangle__width: @button-marker-triangle__width;
-+
- //  Action select have the same visual styles and functionality as native <select>
- .action-select-wrap {
-     @_action-select__border-color: @button__border-color;
-@@ -18,9 +26,9 @@
- 
-     .action-select {
-         .action-toggle-triangle(
--        @_dropdown__padding-right: @_action-select-toggle__size;
--        @_triangle__height: @button-marker-triangle__height;
--        @_triangle__width: @button-marker-triangle__width;
-+        @_dropdown__padding-right;
-+        @_triangle__height;
-+        @_triangle__width;
-         );
-         .lib-text-overflow-ellipsis();
- 
-@@ -108,12 +116,9 @@
-             min-width: 100%;
-             position: static;
- 
--            ._parent._visible {
--                position: relative;
--            }
--
-             .action-submenu {
-                 position: absolute;
-+                right: -100%;
-             }
-         }
-     }
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less
-index 88962a1019a..84d9cb15308 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less
-@@ -44,6 +44,7 @@
-     margin: 0 @indent__xs 15px 0;
-     overflow: hidden;
-     padding: 3px;
-+    text-overflow: ellipsis;
-     width: 100px;
- 
-     &.selected {
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less
-index 9a88d5e3593..ec276449263 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less
-@@ -48,7 +48,7 @@
- 
- @data-grid-file-uploader-menu-button__width: 2rem;
- 
--@data-grid-file-uploader-upload-icon__color: @color-darkie-gray;
-+@data-grid-file-uploader-upload-icon__color: @color-darker-gray;
- @data-grid-file-uploader-upload-icon__hover__color: @color-very-dark-gray;
- @data-grid-file-uploader-upload-icon__line-height: 48px;
- 
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
-index de24bf89620..15cd2958858 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
-@@ -76,7 +76,8 @@
-         position: absolute;
-         speak: none;
-         text-shadow: none;
--        top: 1.3rem;
-+        top: 50%;
-+        margin-top: -1.25rem;
-         width: auto;
-     }
- }
-@@ -110,7 +111,7 @@
-         content: @alert-icon__error__content;
-         font-size: @alert-icon__error__font-size;
-         left: 2.2rem;
--        margin-top: 0.5rem;
-+        margin-top: -1.1rem;
-     }
- }
- 
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
-index 95d7f8f65fd..efc747e4d71 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
-@@ -146,13 +146,13 @@
-     }
- 
-     .action-close {
--        padding: @modal-popup__padding;
-+        padding: @modal-popup__padding - 2;
- 
-         &:active,
-         &:focus {
-             background: transparent;
--            padding-right: @modal-popup__padding + (@modal-action-close__font-size - @modal-action-close__active__font-size) / 2;
--            padding-top: @modal-popup__padding + (@modal-action-close__font-size - @modal-action-close__active__font-size) / 2;
-+            padding-right: @modal-popup__padding - 2;
-+            padding-top: @modal-popup__padding - 2;
-         }
-     }
- }
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
-index d1d1ff98916..bcdc96b6c17 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
-@@ -264,7 +264,7 @@
-             }
-         }
- 
--        #contents-uploader {
-+        .contents-uploader {
-             margin: 0 0 @indent__base;
-         }
- 
-@@ -299,6 +299,7 @@
-             margin: 0 @indent__xs 15px 0;
-             overflow: hidden;
-             padding: 3px;
-+            text-overflow: ellipsis;
-             width: 100px;
- 
-             &.selected {
-@@ -310,7 +311,7 @@
-             }
-         }
- 
--        #contents-uploader {
-+        .contents-uploader {
-             &:extend(.abs-clearfix all);
-         }
- 
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
-index bb51abaa0f1..4c32405f2c9 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
-@@ -75,9 +75,9 @@
- 
-     max-width: 100%;
-     min-width: 8.5rem;
--    padding-bottom: @field-control__padding-bottom - .1rem;
-+    padding-bottom: @field-control__padding-bottom;
-     padding-right: 4.4rem; // Distance between select switch and inner text
--    padding-top: @field-control__padding-top - .1rem;
-+    padding-top: @field-control__padding-top;
-     transition: @smooth__border-color;
- 
-     &:hover {
-@@ -85,7 +85,7 @@
-         cursor: pointer;
-     }
- 
--    &:focus {
-+    &:active {
-         background-image+: url('../images/arrows-bg.svg');
-         background-position+: ~'calc(100% - 12px)' 13px;
- 
-@@ -202,7 +202,6 @@ option:empty {
- 
- .admin__control-textarea {
-     &:extend(.abs-form-control-pattern all);
--    height: 8.48rem;
-     line-height: 1.18;
-     padding-top: .8rem;
-     resize: vertical;
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less
-index 63f78940d40..9ba5458fd36 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less
-@@ -49,20 +49,6 @@
-                 display: none;
-             }
-         }
--
--        &.required,
--        &._required {
--            > .admin__field-label {
--                span {
--                    padding-left: 1.5rem;
--
--                    &:after {
--                        left: 0;
--                        margin-left: @temp_gutter; // @todo ui: update after finalizing Form Grid mixing css/source/forms/_temp.less:10
--                    }
--                }
--            }
--        }
-     }
- }
- 
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
-index 8f0d4c33a8e..66c9086c15a 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
-@@ -59,7 +59,11 @@
- }
- 
- .abs-field-no-label {
-+    /**
-+     *@codingStandardsIgnoreStart
-+     */
-     #mix-grid .return_length(@field-label-grid__column, @field-grid__columns, '+');
-+    //@codingStandardsIgnoreEnd
-     margin-left: @_length;
- }
- 
-@@ -77,7 +81,7 @@
-     min-width: 0;
-     padding: 0;
- 
--    //  Filedset section
-+    //  Fieldset section
-     .fieldset-wrapper {
-         &.admin__fieldset-section {
-             > .fieldset-wrapper-title {
-@@ -117,6 +121,9 @@
- 
-         > .admin__field-control {
-             #mix-grid .column(@field-control-grid__column, @field-grid__columns);
-+            input[type="checkbox"] {
-+                margin-top: @indent__s;
-+            }
-         }
- 
-         > .admin__field-label {
-@@ -143,6 +150,22 @@
-                 }
-             }
-         }
-+
-+        &.field-currently_used_for {
-+            > .admin__field-control {
-+                .admin__field {
-+                    margin-top: 8px;
-+                }
-+            } 
-+        }
-+    }
-+    &.composite-bundle {
-+        .admin__field-control {
-+            padding-top: 7px;
-+        }
-+        .admin__field-option {
-+            padding-top: 0;
-+        }
-     }
- }
- 
-@@ -166,6 +189,13 @@
-     .admin__control-text,
-     .admin__control-textarea {
-         width: 100%;
-+        &.disabled {
-+            background-color: #e9e9e9;
-+            border-color: #adadad;
-+            color: #303030;
-+            cursor: not-allowed;
-+            opacity: .5;
-+        }
-     }
- }
- 
-@@ -210,7 +240,7 @@
-             overflow: hidden;
-         }
- 
--        label {
-+        span {
-             display: inline-block;
-             line-height: @field-label__line-height;
-             vertical-align: middle;
-@@ -228,7 +258,7 @@
- 
-     .required > &, // ToDo UI: change classes 'required' to '_required'.
-     ._required > & {
--        > span {
-+        span {
-             &:after {
-                 color: @validation__color;
-                 content: '*';
-@@ -277,6 +307,12 @@
-     .admin__fieldset > & {
-         margin-bottom: 3rem;
-         position: relative;
-+        
-+        &.field-import_file {
-+            .input-file {
-+                margin-top: 6px;
-+            }
-+        }
-     }
- 
-     //  Hide group legend and show first field label instead
-@@ -506,16 +542,14 @@
-     & > .admin__field {
-         &:first-child {
-             position: static;
--
-             & > .admin__field-label {
-                 #mix-grid .column(@field-label-grid__column, @field-grid__columns);
--                background: @color-white;
-                 cursor: pointer;
-                 left: 0;
-                 position: absolute;
-                 top: 0;
- 
--                label {
-+                span {
-                     &:before {
-                         display: block;
-                     }
-@@ -530,7 +564,7 @@
-         }
- 
-         & > .admin__field-label {
--            label {
-+            span {
-                 &:before {
-                     display: none;
-                 }
-@@ -625,10 +659,11 @@
-         &.admin__field {
-             > .admin__field-control {
-                 &:extend(.abs-field-size-small all);
--                float: left;
-                 position: relative;
-+                display: inline-block;
-             }
-         }
-+        
- 
-         + .admin__field:last-child {
-             width: auto;
-@@ -661,9 +696,12 @@
-                 margin: 0;
-                 opacity: 1;
-                 position: static;
--                text-align: left;
-+                width: 100%;
-             }
-         }
-+        & > .admin__field-label { 
-+            text-align: left;
-+        }
- 
-         &:nth-child(n + 2) {
-             &:not(.admin__field-option):not(.admin__field-group-show-label):not(.admin__field-date) {
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
-index df031bebeb2..71f57b765ff 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
-@@ -11,7 +11,7 @@
- .admin__fieldset-wrapper-title {
-     &:extend(.abs-clearfix all);
-     border-bottom: 1px solid @color-gray80;
--    line-height: 1.2;
-+    line-height: 1.4;
-     margin-bottom: 0;
-     padding: 14px 0 16px;
- 
-@@ -162,7 +162,7 @@
-             @_icon-font-line-height: 16px,
-             @_icon-font-text-hide: true,
-             @_icon-font-position: after,
--            @_icon-font-color: @color-brown-darkie
-+            @_icon-font-color: @color-brown-darker
-         );
- 
-         span {
-@@ -175,7 +175,7 @@
-             z-index: 2;
- 
-             &:after {
--                color: darken(@color-brown-darkie, 20%);
-+                color: darken(@color-brown-darker, 20%);
-             }
- 
-             //  @Todo ui - testing solution to show action hint without title attribute
-@@ -253,7 +253,7 @@ label.mage-error {
- 
-         .captcha-reload {
-             float: right;
--            vertical-align: middle;
-+            margin-top: 15px;
-         }
-     }
- }
-@@ -470,8 +470,6 @@ label.mage-error {
-     }
- 
-     .admin__data-grid-header-row {
--        &:extend(.abs-cleafix);
--
-         .action-select-multiselect {
-             -webkit-appearance: menulist-button;
-             appearance: menulist-button;
-@@ -552,7 +550,7 @@ label.mage-error {
-         }
- 
-         .admin__control-select-placeholder {
--            color: @color-darkie-gray;
-+            color: @color-darker-gray;
-             font-weight: @font-weight__bold;
-         }
-     }
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
-index a9035a9a7e4..697d11fb57d 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
-@@ -118,7 +118,7 @@
-         }
- 
-         &._fit {
--            width: 1px;
-+            width: auto;
-         }
-     }
- 
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less
-old mode 100644
-new mode 100755
-index 8184a5c4bb2..befd27fa57d
---- a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less
-@@ -22,7 +22,7 @@
- @field-tooltip-content__width: 32rem;
- @field-tooltip-content__z-index: 1;
- 
--@field-tooltip-action__margin-left: 2rem;
-+@field-tooltip-action__margin-left: 0;
- 
- //
- //  Form Fields
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/variables/_colors.less b/app/design/adminhtml/Magento/backend/web/css/source/variables/_colors.less
-index b477384096b..ad57d7b4711 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/variables/_colors.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/variables/_colors.less
-@@ -8,7 +8,7 @@
- //  _____________________________________________
- 
- @color-brown-dark: #4a3f39;
--@color-brown-darkie: #41362f;
-+@color-brown-darker: #41362f;
- @color-very-dark-gray-black: #303030;
- @color-very-dark-gray-black2: #35302c;
- @color-very-dark-grayish-orange: #373330;
-@@ -23,7 +23,7 @@
- @color-brownie-vanilla: #736963;
- @color-dark-gray0: #7f7c7a;
- @color-dark-gray: #808080;
--@color-darkie-gray: #8a837f;
-+@color-darker-gray: #8a837f;
- @color-gray65: #a6a6a6;
- @color-gray65-almost: #a79d95;
- @color-gray65-lighten: #aaa6a0;
-@@ -73,5 +73,5 @@
- 
- @primary__color: @color-phoenix;
- @success__color: @color-green-apple;
--@text__color: @color-brown-darkie;
-+@text__color: @color-brown-darker;
- @border__color: @color-gray89;
-diff --git a/app/design/adminhtml/Magento/backend/web/css/source/variables/_data-grid.less b/app/design/adminhtml/Magento/backend/web/css/source/variables/_data-grid.less
-index 69393a62200..40831684adc 100644
---- a/app/design/adminhtml/Magento/backend/web/css/source/variables/_data-grid.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/source/variables/_data-grid.less
-@@ -30,7 +30,7 @@
- @data-grid-td__odd__update__active__background-color: darken(@data-grid-td__update__active__background-color, 10%);
- @data-grid-td__odd__update__upcoming__background-color: darken(@data-grid-td__update__upcoming__background-color, 10%);
- 
--@data-grid-th__border-color: @color-darkie-gray;
-+@data-grid-th__border-color: @color-darker-gray;
- @data-grid-th__border-style: solid;
- @data-grid-th__background-color: @color-brownie;
- @data-grid-th__color: @color-white;
-diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
-index 74098f127eb..a1fe748ad5f 100644
---- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
-+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
-@@ -783,7 +783,7 @@
-         box-sizing: border-box;
-         border: 1px solid #adadad;
-         border-radius: 1px;
--        padding: 4px;
-+        padding: .6rem 1rem .6rem;
-         color: #303030;
-         background-color: @color-white;
-         font-weight: 500;
-@@ -820,7 +820,7 @@
- 
-             padding-right: 44px;
- 
--            &:focus {
-+            &:active {
-                 background-image+: url('../images/arrows-bg.svg');
-                 background-position+: ~'calc(100% - 12px)' 13px;
- 
-@@ -1188,7 +1188,7 @@
-     }
- 
-     //
--    //  Collapsable fieldset-wrapper
-+    //  collapsible fieldset-wrapper
-     //  --------------------------------------
- 
-     // Fieldset styles in another fieldset
-@@ -1366,7 +1366,7 @@
-         font-size: 14px;
-         font-weight: 600;
-         line-height: 3.2rem;
--        padding: 0 30px 0 0;
-+        padding: 0 30px 0 30px;
-         white-space: nowrap;
-         word-wrap: break-word;
- 
-@@ -2544,6 +2544,8 @@
-     .order-summary:after,
-     .order-methods:before,
-     .order-methods:after,
-+    .payment-methods:before,
-+    .payment-methods:after,
-     .grid-actions:before,
-     .grid-actions:after,
-     .fieldset-wrapper-title:before,
-@@ -2559,6 +2561,7 @@
-     .order-addresses:after,
-     .order-summary:after,
-     .order-methods:after,
-+    .payment-methods:after,
-     .grid-actions:after,
-     .fieldset-wrapper-title:after {
-         clear: both;
-@@ -2735,7 +2738,8 @@
-     //  ---------------------------------------------
- 
-     #widget_instace_tabs_properties_section_content .widget-option-label {
--        margin-top: 6px;
-+        margin-top: 7px;
-+        display: inline-block;
-     }
- 
-     //
-@@ -2898,6 +2902,7 @@
-         .style28();
-     }
- 
-+    #order-billing-method-summary a,
-     #order-shipping-method-summary a {
-         .style3();
-     }
-@@ -2936,7 +2941,8 @@
-         margin: 0 0 0 20px;
-     }
- 
--    #order-data .order-methods ul {
-+    #order-data .order-methods ul,
-+    #order-data .payment-methods ul {
-         list-style: none;
-         margin: 0;
-         padding: 0;
-@@ -3840,6 +3846,26 @@
- 
-     .rule-param-edit .element {
-         display: inline;
-+        position: relative;
-+    }
-+
-+    .rule-param-edit .element input.input-date,
-+    .rule-param-edit .element input.input-date[readonly] {
-+        background-color: @color-white;
-+        min-width: 140px;
-+        width: 140px !important;
-+        cursor: pointer;
-+        text-align: center;
-+        opacity: 1;
-+        margin-right: 10px;
-+        padding-right: 40px;
-+
-+        + .ui-datepicker-trigger {
-+            position: absolute;
-+            width: 140px;
-+            text-align: right;
-+            left: 0;
-+        }
-     }
- 
-     .rule-param-edit .element .addafter {
-diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
-index a2511e27e9f..8e3b89dcf7e 100644
---- a/app/design/adminhtml/Magento/backend/web/js/theme.js
-+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
-@@ -599,7 +599,7 @@ define('js/theme', [
- ], function ($, keyboardHandler) {
-     'use strict';
- 
--    /* @TODO refactor collapsable as widget and avoid logic binding with such a general selectors */
-+    /* @TODO refactor collapsible as widget and avoid logic binding with such a general selectors */
-     $('.collapse').collapsable();
- 
-     $.each($('.entry-edit'), function (i, entry) {
-diff --git a/app/design/frontend/Magento/blank/Magento_Banner/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_Banner/web/css/source/_widgets.less
-index 80ac77e42fc..c961d49c5b5 100644
---- a/app/design/frontend/Magento/blank/Magento_Banner/web/css/source/_widgets.less
-+++ b/app/design/frontend/Magento/blank/Magento_Banner/web/css/source/_widgets.less
-@@ -8,7 +8,6 @@
- //  _____________________________________________
- 
- & when (@media-common = true) {
--
-     .block-banners,
-     .block-banners-inline {
-         &:extend(.abs-margin-for-blocks-and-widgets);
-@@ -22,7 +21,7 @@
-         }
- 
-         .banner-item-content {
--            .lib-css(margin-bottom, @indent__base);
-+            margin-bottom: @indent__base;
- 
-             img {
-                 display: block;
-diff --git a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less
-index b70bab6f320..8c1ec09afec 100644
---- a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less
-@@ -9,9 +9,9 @@
- 
- @braintree-input-border__color: @color-gray76;
- 
--@braintree-error__color: @color-red10;
--@braintree-focus__color: @color-blue2;
--@braintree-success__color: @color-dark-green1;
-+@braintree-error__color: @message-error__color;
-+@braintree-focus__color: @theme__color__primary-alt;
-+@braintree-success__color: @message-success__color;
- 
- @braintree-paypal-icon__height: 16px;
- @braintree-paypal-icon__width: 16px;
-diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
-index 08a9b619779..299c1388320 100644
---- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
-@@ -488,6 +488,7 @@
- 
-         .product-items-names {
-             .product-item {
-+                display: flex;
-                 margin-bottom: @indent__s;
-             }
- 
-@@ -506,17 +507,6 @@
-             min-height: inherit;
-         }
-     }
--
--    //
--    //  Category page 1 column layout
--    //  ---------------------------------------------
--
--    .catalog-category-view.page-layout-1column {
--        .column.main {
--            min-height: inherit;
--        }
--    }
--
- }
- 
- //
-diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
-index 42b1bf2d0cc..7181606090c 100644
---- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
-+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
-@@ -23,6 +23,15 @@
-     }
- 
-     .block.widget {
-+        .products-grid .product-item {
-+            margin-left: 2%;
-+            width: calc(~'(100% - 2%)/2');
-+
-+            &:nth-child(2n + 1) {
-+                margin-left: 0;
-+            }
-+        }
-+
-         .product-item-info {
-             width: auto;
-         }
-@@ -60,6 +69,15 @@
-     .page-layout-3columns .block.widget .products-grid .product-item {
-         width: 100%/3;
-     }
-+
-+    .page-layout-1column .block.widget .products-grid .product-item {
-+        margin-left: 2%;
-+        width: calc(~'(100% - 4%)/3');
-+
-+        &:nth-child(3n + 1) {
-+            margin-left: 0;
-+        }
-+    }
- }
- 
- //
-@@ -82,7 +100,16 @@
-     }
- 
-     .page-layout-1column .block.widget .products-grid .product-item {
--        width: 100%/4;
-+        margin-left: 2%;
-+        width: calc(~'(100% - 6%)/4');
-+
-+        &:nth-child(3n + 1) {
-+            margin-left: 2%;
-+        }
-+
-+        &:nth-child(4n + 1) {
-+            margin-left: 0;
-+        }
-     }
- 
-     .page-layout-3columns .block.widget .products-grid .product-item {
-@@ -96,11 +123,11 @@
-     }
- 
-     .page-layout-1column .block.widget .products-grid .product-item {
--        margin-left: calc(~'(100% - 5 * (100%/6)) / 4');
--        width: 100%/6;
-+        margin-left: 2%;
-+        width: calc(~'(100% - 8%)/5');
- 
-         &:nth-child(4n + 1) {
--            margin-left: calc(~'(100% - 5 * (100%/6)) / 4');
-+            margin-left: 2%;
-         }
- 
-         &:nth-child(5n + 1) {
-diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
-index 8b727b0d9c2..50a5e635153 100644
---- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
-+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
-@@ -29,15 +29,23 @@
- 
-     .product {
-         &-items {
-+            font-size: 0;
-             &:extend(.abs-reset-list all);
-         }
- 
-         &-item {
-+            font-size: 1.4rem;
-             vertical-align: top;
- 
-             .products-grid & {
-                 display: inline-block;
--                width: 100%/2;
-+                margin-left: 2%;
-+                padding: 0;
-+                width: calc(~'(100% - 2%) / 2');
-+            }
-+
-+            &:nth-child(2n + 1) {
-+                margin-left: 0;
-             }
- 
-             &:extend(.abs-add-box-sizing all);
-@@ -63,14 +71,26 @@
-             }
- 
-             &-actions {
--                display: none;
-+                font-size: 0;
-+
-+                > * {
-+                    font-size: 1.4rem;
-+                }
- 
-                 .actions-secondary {
-+                    display: inline-block;
-+                    font-size: 1.4rem;
-+                    vertical-align: middle;
-+                    white-space: nowrap;
-                     > button.action {
-                         .lib-button-reset();
-                     }
- 
-                     > .action {
-+                        line-height: 35px;
-+                        text-align: center;
-+                        width: 35px;
-+
-                         &:extend(.abs-actions-addto-gridlist all);
-                         &:before {
-                             margin: 0;
-@@ -81,6 +101,11 @@
-                         }
-                     }
-                 }
-+
-+                .actions-primary {
-+                    display: inline-block;
-+                    vertical-align: middle;
-+                }
-             }
- 
-             &-description {
-@@ -95,7 +120,6 @@
-                 .reviews-actions {
-                     font-size: @font-size__s;
-                     margin-top: 5px;
--                    text-transform: lowercase;
-                 }
-             }
- 
-@@ -192,19 +216,6 @@
-         }
-     }
- 
--    .column.main {
--        .product {
--            &-items {
--                margin-left: -@indent__base;
--            }
--
--            &-item {
--                padding-left: @indent__base;
--            }
--        }
--
--    }
--
-     .price-container {
-         .price {
-             .lib-font-size(14);
-@@ -303,18 +314,10 @@
-                 }
- 
-                 .actions-primary + .actions-secondary {
--                    display: table-cell;
--                    padding-left: 5px;
--                    white-space: nowrap;
--                    width: 50%;
-                     > * {
-                         white-space: normal;
-                     }
-                 }
--
--                .actions-primary {
--                    display: table-cell;
--                }
-             }
-         }
-     }
-@@ -330,7 +333,13 @@
-     .page-products.page-layout-3columns {
-         .products-grid {
-             .product-item {
--                width: 100%/3;
-+                margin-left: 2%;
-+                padding: 0;
-+                width: calc(~'(100% - 4%) / 3');
-+
-+                &:nth-child(3n + 1) {
-+                    margin-left: 0;
-+                }
-             }
-         }
-     }
-@@ -344,7 +353,13 @@
-     .page-products {
-         .products-grid {
-             .product-item {
--                width: 100%/3;
-+                margin-left: 2%;
-+                padding: 0;
-+                width: calc(~'(100% - 4%) / 3');
-+
-+                &:nth-child(3n + 1) {
-+                    margin-left: 0;
-+                }
-             }
-         }
-     }
-@@ -395,9 +410,13 @@
-             }
- 
-             .product-item {
--                margin-left: calc(~'(100% - 4 * 23.233%) / 3');
-+                margin-left: 2%;
-                 padding: 0;
--                width: 23.233%;
-+                width: calc(~'(100% - 6%) / 4');
-+
-+                &:nth-child(3n + 1) {
-+                    margin-left: 2%;
-+                }
- 
-                 &:nth-child(4n + 1) {
-                     margin-left: 0;
-diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less
-index aceccb06d47..8e7f36389c4 100644
---- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less
-+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less
-@@ -4,14 +4,17 @@
- //  */
- 
- //
--//  Common
--//  _____________________________________________
-+//  Variables
-+//  ---------------------------------------------
- 
- @toolbar-mode-icon-font-size: 24px;
- @toolbar-element-background: @panel__background-color;
- 
--& when (@media-common = true) {
-+//
-+//  Common
-+//  _____________________________________________
- 
-+& when (@media-common = true) {
-     .page-products {
-         .columns {
-             position: relative;
-@@ -62,6 +65,11 @@
-         .products.wrapper ~ .toolbar & {
-             display: none;
-         }
-+
-+        .sorter-action {
-+            position: relative;
-+            top: -2px;
-+        }
-     }
- 
-     .sorter-options {
-@@ -72,12 +80,12 @@
-     .sorter-action {
-         vertical-align: top;
-         .lib-icon-font(
--        @icon-arrow-up,
--        @_icon-font-size: 28px,
--        @_icon-font-line-height: 32px,
--        @_icon-font-color: @header-icons-color,
--        @_icon-font-color-hover: @header-icons-color-hover,
--        @_icon-font-text-hide: true
-+            @icon-arrow-up,
-+            @_icon-font-size: 28px,
-+            @_icon-font-line-height: 32px,
-+            @_icon-font-color: @header-icons-color,
-+            @_icon-font-color-hover: @header-icons-color-hover,
-+            @_icon-font-text-hide: true
-         );
-     }
- 
-@@ -99,7 +107,7 @@
-     }
- 
-     .limiter-label {
--        font-weight: 400;
-+        font-weight: @font-weight__regular;
-     }
- 
-     .limiter {
-@@ -176,11 +184,11 @@
-         }
- 
-         .lib-icon-font(
--        @icon-grid,
--        @_icon-font-size: @toolbar-mode-icon-font-size,
--        @_icon-font-text-hide: true,
--        @_icon-font-color: @text__color__muted,
--        @_icon-font-color-hover: @text__color__muted
-+            @icon-grid,
-+            @_icon-font-size: @toolbar-mode-icon-font-size,
-+            @_icon-font-text-hide: true,
-+            @_icon-font-color: @text__color__muted,
-+            @_icon-font-color-hover: @text__color__muted
-         );
-     }
- 
-diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
-index 7bd27106b67..65f3eeef63b 100644
---- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
-+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
-@@ -107,7 +107,7 @@
-         @_toggle-selector: ~'.action.showcart',
-         @_options-selector: ~'.block-minicart',
-         @_dropdown-list-width: 320px,
--        @_dropdown-list-position-right: 0px,
-+        @_dropdown-list-position-right: 0,
-         @_dropdown-list-pointer-position: right,
-         @_dropdown-list-pointer-position-left-right: 26px,
-         @_dropdown-list-z-index: 101,   
-@@ -148,10 +148,10 @@
-         .action {
-             &.close {
-                 .lib-button-icon(
--                @icon-remove,
--                @_icon-font-size: 32px,
--                @_icon-font-line-height: 32px,
--                @_icon-font-text-hide: true
-+                    @icon-remove,
-+                    @_icon-font-size: 32px,
-+                    @_icon-font-line-height: 32px,
-+                    @_icon-font-text-hide: true
-                 );
-                 .lib-button-reset();
-                 height: 40px;
-@@ -254,12 +254,12 @@
- 
-             .toggle {
-                 .lib-icon-font(
--                @_icon-font-content: @icon-down,
--                @_icon-font-size: 28px,
--                @_icon-font-line-height: 16px,
--                @_icon-font-text-hide: false,
--                @_icon-font-position: after,
--                @_icon-font-display: block
-+                    @_icon-font-content: @icon-down,
-+                    @_icon-font-size: 28px,
-+                    @_icon-font-line-height: 16px,
-+                    @_icon-font-text-hide: false,
-+                    @_icon-font-position: after,
-+                    @_icon-font-display: block
-                 );
-                 cursor: pointer;
-                 position: relative;
-@@ -274,8 +274,8 @@
-             &.active {
-                 > .toggle {
-                     .lib-icon-font-symbol(
--                    @_icon-font-content: @icon-up,
--                    @_icon-font-position: after
-+                        @_icon-font-content: @icon-up,
-+                        @_icon-font-position: after
-                     );
-                 }
-             }
-@@ -304,6 +304,7 @@
- 
-             .weee[data-label] {
-                 .lib-font-size(11);
-+                
-                 .label {
-                     &:extend(.abs-no-display all);
-                 }
-@@ -317,12 +318,12 @@
-         .product.options {
-             .tooltip.toggle {
-                 .lib-icon-font(
--                @icon-down,
--                @_icon-font-size: 28px,
--                @_icon-font-line-height: 28px,
--                @_icon-font-text-hide: true,
--                @_icon-font-margin: -3px 0 0 7px,
--                @_icon-font-position: after
-+                    @icon-down,
-+                    @_icon-font-size: 28px,
-+                    @_icon-font-line-height: 28px,
-+                    @_icon-font-text-hide: true,
-+                    @_icon-font-margin: -3px 0 0 7px,
-+                    @_icon-font-position: after
-                 );
- 
-                 .details {
-@@ -341,7 +342,7 @@
-         .item-qty {
-             margin-right: @indent__s;
-             text-align: center;
--            width: 40px;
-+            width: 45px;
-         }
- 
-         .update-cart-item {
-@@ -357,19 +358,19 @@
-             &.edit,
-             &.delete {
-                 .lib-icon-font(
--                @icon-settings,
--                @_icon-font-size: 28px,
--                @_icon-font-line-height: 28px,
--                @_icon-font-text-hide: true,
--                @_icon-font-color: @color-gray19,
--                @_icon-font-color-hover: @color-gray19,
--                @_icon-font-color-active: @color-gray19
-+                    @icon-settings,
-+                    @_icon-font-size: 28px,
-+                    @_icon-font-line-height: 28px,
-+                    @_icon-font-text-hide: true,
-+                    @_icon-font-color: @color-gray19,
-+                    @_icon-font-color-hover: @color-gray19,
-+                    @_icon-font-color-active: @color-gray19
-                 );
-             }
- 
-             &.delete {
-                 .lib-icon-font-symbol(
--                @_icon-font-content: @icon-trash
-+                    @_icon-font-content: @icon-trash
-                 );
-             }
-         }
-@@ -399,6 +400,7 @@
- .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-     .minicart-wrapper {
-         margin-left: 13px;
-+        
-         .block-minicart {
-             right: -15px;
-             width: 390px;
-diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less
-index 4479c070a4e..8dec680b587 100644
---- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less
-+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less
-@@ -55,31 +55,3 @@
-         }
-     }
- }
--
--//
--//  Desktop
--//  _____________________________________________
--
--.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
--    //  ToDo UI: remove with global blank theme .field.required update
--    .opc-wrapper {
--        .fieldset {
--            > .field {
--                &.required,
--                &._required {
--                    position: relative;
--
--                    > label {
--                        padding-right: 25px;
--
--                        &:after {
--                            margin-left: @indent__s;
--                            position: absolute;
--                            top: 9px;
--                        }
--                    }
--                }
--            }
--        }
--    }
--}
-diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
-index 43c2ad50c7a..3394e8a4b50 100644
---- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
-+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
-@@ -118,6 +118,10 @@
- 
-             .product {
-                 position: relative;
-+                .item-options {
-+                    &:extend(.abs-product-options-list all);
-+                    &:extend(.abs-add-clearfix all);
-+                }
-             }
-         }
- 
-diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
-index 3ce46a73a11..4d04b6e0b96 100644
---- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
-+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
-@@ -137,6 +137,7 @@
-                 }
-             }
- 
-+            .captcha,
-             .number {
-                 .input-text {
-                     width: 225px;
-diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
-index 5f8134193c6..35445b0989e 100644
---- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
-+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
-@@ -209,6 +209,13 @@
-             .fieldset {
-                 > .field {
-                     margin: 0 0 @indent__base;
-+                    
-+                    &.choice {
-+                        &:before {
-+                            padding: 0;
-+                            width: 0;
-+                        }
-+                    }
- 
-                     &.type {
-                         .control {
-diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
-index 301517c6d0c..4792cb7b179 100644
---- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
-+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
-@@ -16,7 +16,7 @@
- @checkout-progress-bar-item__color: @primary__color;
- @checkout-progress-bar-item__margin: @indent__s;
- @checkout-progress-bar-item__width: 185px;
--@checkout-progress-bar-item__active__background-color: @color-orange-red1;
-+@checkout-progress-bar-item__active__background-color: @active__color;
- @checkout-progress-bar-item__complete__color: @link__color;
- 
- @checkout-progress-bar-item-element__height: @checkout-progress-bar-item-element__width;
-diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less
-index 0a463a95e31..af6127fd2ca 100644
---- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less
-+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less
-@@ -22,7 +22,7 @@
- @checkout-shipping-item__width: 100%/3;
- @checkout-shipping-item-tablet__width: 100%/2;
- @checkout-shipping-item-mobile__width: 100%;
--@checkout-shipping-item__active__border-color: @color-orange-red1;
-+@checkout-shipping-item__active__border-color: @active__color;
- 
- @checkout-shipping-item-icon__selected__height: 27px;
- @checkout-shipping-item-icon__selected__width: 29px;
-@@ -98,11 +98,6 @@
-                     text-align: center;
-                     top: 0;
-                 }
--
--                .action-select-shipping-item {
--                    &:extend(.abs-no-display-s all);
--                    visibility: hidden;
--                }
-             }
-         }
- 
-diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_sidebar-shipping-information.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_sidebar-shipping-information.less
-index b54c0a264a0..0f2a7abcbaa 100644
---- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_sidebar-shipping-information.less
-+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_sidebar-shipping-information.less
-@@ -67,3 +67,11 @@
-         }
-     }
- }
-+
-+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
-+    .opc-block-shipping-information {
-+        .shipping-information-title {
-+            font-size: 2.3rem;
-+        }
-+    }
-+}
-diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
-index 273f626ec03..423923d5e64 100644
---- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
-+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
-@@ -55,6 +55,10 @@
-             }
-         }
- 
-+        .label {
-+            .lib-visually-hidden();
-+        }
-+
-         .field-tooltip-action {
-             .lib-icon-font(
-                 @checkout-tooltip-icon__content,
-@@ -65,6 +69,10 @@
-                 @_icon-font-color-active: false
-             );
- 
-+            &:before { 
-+                padding-left : 1px;  
-+            }
-+
-             &:focus {
-                 ._keyfocus & {
-                     .lib-css(z-index, @checkout-tooltip__hover__z-index);
-@@ -137,10 +145,42 @@
-     }
- }
- 
--.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-+.media-width(@extremum, @break) when (@extremum = 'max') and (@break >= @screen__m) {
-     .field-tooltip {
-         .field-tooltip-content {
-+            .lib-css(right, @checkout-tooltip-content-mobile__right);
-+            .lib-css(top, @checkout-tooltip-content-mobile__top);
-+            left: auto;
-             &:extend(.abs-checkout-tooltip-content-position-top-mobile all);
-         }
-     }
- }
-+
-+//
-+//  Tablet
-+//  _____________________________________________
-+
-+@media only screen and (max-width: @screen__m) {
-+    .field-tooltip .field-tooltip-content {
-+        left: auto;
-+        right: -10px;
-+        top: 40px;
-+    }
-+    .field-tooltip .field-tooltip-content::before,
-+    .field-tooltip .field-tooltip-content::after {
-+        border: 10px solid transparent;
-+        height: 0;
-+        left: auto;
-+        margin-top: -21px;
-+        right: 10px;
-+        top: 0;
-+        width: 0;
-+    }
-+    .field-tooltip .field-tooltip-content::before {
-+        .lib-css(border-bottom-color, @checkout-tooltip-content__border-color);
-+    }
-+    .field-tooltip .field-tooltip-content::after {
-+        .lib-css(border-bottom-color, @checkout-tooltip-content__background-color);
-+        top: 1px;
-+    }
-+}
-diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
-index 3ffaeb82cdc..213b8131815 100644
---- a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
-@@ -11,7 +11,7 @@
- @account-nav-color: false;
- 
- @account-nav-current-border: 3px solid transparent;
--@account-nav-current-border-color: @color-orange-red1;
-+@account-nav-current-border-color: @active__color;
- @account-nav-current-color: false;
- @account-nav-current-font-weight: @font-weight__semibold;
- 
-@@ -65,7 +65,7 @@
-     }
- 
-     .form-address-edit {
--        #region_id {
-+        .region_id {
-             display: none;
-         }
- 
-@@ -165,7 +165,7 @@
- 
-     //  Checkout address (create shipping address)
-     .field.street {
--        .field.additional {
-+        .field {
-             .label {
-                 &:extend(.abs-visually-hidden all);
-             }
-@@ -367,8 +367,8 @@
-     }
- 
-     .account {
--        .page.messages {
--            margin-bottom: @indent__xl;
-+        .messages {
-+            margin-bottom: 0;
-         }
- 
-         .toolbar {
-@@ -388,6 +388,17 @@
-             position: relative;
-         }
-     }
-+
-+    .form.search.advanced {
-+        .field.price {
-+            .with-addon {
-+                .input-text {
-+                    flex-basis: auto;
-+                    width: 100%;
-+                }
-+            }
-+        }
-+    }
- }
- 
- //
-@@ -421,7 +432,7 @@
- 
-             > .field {
-                 > .control {
--                    width: 55%;
-+                    width: 80%;
-                 }
-             }
-         }
-@@ -451,7 +462,9 @@
-     .form.password.reset,
-     .form.send.confirmation,
-     .form.password.forget,
--    .form.create.account {
-+    .form.create.account,
-+    .form.search.advanced,
-+    .form.form-orders-search {
-         min-width: 600px;
-         width: 50%;
-     }
-diff --git a/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less
-index f0dd8a957e9..6e2069c6e88 100644
---- a/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less
-@@ -55,6 +55,10 @@
-         }
-     }
- 
-+    .map-fallback-price {
-+        display: none;
-+    }
-+
-     .map-old-price {
-         text-decoration: none;
- 
-diff --git a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
-index 6baa2432ff0..c572c983d80 100644
---- a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
-@@ -35,12 +35,19 @@
-             .items {
-                 text-align: left;
-                 .item {
-+                    > span {
-+                        display: block;
-+                        padding: 5px 5px 5px 23px;
-+                    }
-                     &:last-child {
-                         &:hover {
-                             .lib-css(background, @dropdown-list-item__hover);
-                         }
-                     }
-                 }
-+                li {
-+                    padding: 0;
-+                }
-             }
- 
-             .table-comparison &,
-@@ -178,7 +185,7 @@
-         }
- 
-         .form-wishlist-search {
--            .lib-css(margin-bottom, @indent__l*2);
-+            margin-bottom: @indent__l * 2;
-             max-width: 500px;
- 
-             .fieldset {
-@@ -209,8 +216,9 @@
- 
-     .block-wishlist-info-items {
-         .block-title {
--            .lib-css(margin-bottom, @indent__base);
-             .lib-font-size(22);
-+            margin-bottom: @indent__base;
-+            
-             > strong {
-                 font-weight: @font-weight__light;
-             }
-@@ -342,7 +350,7 @@
-         .product {
-             &-item {
-                 &-checkbox {
--                    left: 20px;
-+                    left: 0;
-                     position: absolute;
-                     top: 20px;
-                 }
-@@ -381,16 +389,16 @@
- .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-     .wishlist {
-         &.window.popup {
-+            .field {
-+                .lib-form-field-type-revert(@_type: block);
-+            }
-+
-             bottom: auto;
-             .lib-css(top, @desktop-popup-position-top);
-             .lib-css(left, @desktop-popup-position-left);
-             .lib-css(margin-left, @desktop-popup-margin-left);
-             .lib-css(width, @desktop-popup-width);
-             right: auto;
--
--            .field {
--                .lib-form-field-type-revert(@_type: block);
--            }
-         }
-     }
- 
-diff --git a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less
-index 66dbb30cb67..46f9661d828 100644
---- a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less
-@@ -47,7 +47,7 @@
-                     }
- 
-                     .error-block {
--                        color: @color-red10;
-+                        color: @error__color;
- 
-                         .error-label {
-                             font-weight: @font-weight__bold;
-@@ -113,14 +113,6 @@
-                     }
-                 }
-             }
--
--            .cart-price {
--                &:extend(.abs-checkout-cart-price all);
--            }
--
--            .product-item-name {
--                &:extend(.abs-checkout-product-name all);
--            }
-         }
- 
-         &:not(.address) {
-@@ -230,7 +222,7 @@
-             }
- 
-             .error-description {
--                color: @color-red10;
-+                color: @error__color;
-                 font-weight: @font-weight__regular;
-                 margin-bottom: @indent__s;
-                 margin-top: -@indent__s;
-diff --git a/app/design/frontend/Magento/blank/Magento_Review/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Review/web/css/source/_module.less
-index 7d5b79bc5a0..69ec01d71e1 100644
---- a/app/design/frontend/Magento/blank/Magento_Review/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/blank/Magento_Review/web/css/source/_module.less
-@@ -15,9 +15,9 @@
- //  _____________________________________________
- 
- & when (@media-common = true) {
--
-     .rating-summary {
-         .lib-rating-summary();
-+        
-         .rating-result {
-             margin-left: -5px;
-         }
-@@ -165,10 +165,10 @@
- 
-         .review-details {
-             .customer-review-rating {
--                .lib-css(margin-bottom, @indent__base);
-+                margin-bottom: @indent__base;
- 
-                 .item {
--                    .lib-css(margin-bottom, @indent__s);
-+                    margin-bottom: @indent__s;
- 
-                     &:last-child {
-                         margin-bottom: 0;
-@@ -178,12 +178,12 @@
- 
-             .review-title {
-                 .lib-heading(h3);
--                .lib-css(font-weight, @font-weight__semibold);
--                .lib-css(margin-bottom, @indent__base);
-+                font-weight: @font-weight__semibold;
-+                margin-bottom: @indent__base;
-             }
- 
-             .review-content {
--                .lib-css(margin-bottom, @indent__base);
-+                margin-bottom: @indent__base;
-             }
-         }
- 
-@@ -271,7 +271,7 @@
- 
-         &-field-rating {
-             .control {
--                margin-bottom: 1.2*@indent__xl;
-+                margin-bottom: 1.2 * @indent__xl;
-                 margin-top: @indent__s;
-             }
-         }
-diff --git a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less
-index 215d7d8b322..b189d4e08ba 100644
---- a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less
-+++ b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less
-@@ -68,8 +68,10 @@
- }
- 
- //  Remove address and phone number link color on iOS
--.address-details a {
--    &:extend(.no-link a);
-+.email-non-inline() {
-+    .address-details a {
-+        &:extend(.no-link a);
-+    }
- }
- 
- .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__xs) {
-diff --git a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less
-index 3847393a2f0..298ccbf58e6 100644
---- a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less
-@@ -294,6 +294,14 @@
-             }
-         }
-     }
-+    .order-items.table-wrapper {
-+        .col.price,
-+        .col.qty,
-+        .col.subtotal,
-+        .col.msrp {
-+            text-align: left;
-+        }
-+    }
- }
- 
- .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
-index b5d60459714..c67b9c7d751 100644
---- a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
-@@ -18,7 +18,7 @@
- 
- @swatch-option__selected__border: @swatch-option__hover__border;
- @swatch-option__selected__color: @swatch-option__hover__color;
--@swatch-option__selected__outline: 2px solid @color-orange-red1;
-+@swatch-option__selected__outline: 2px solid @active__color;
- 
- @swatch-option__disabled__background: @color-red10;
- 
-@@ -26,7 +26,7 @@
- @swatch-option-text__background: @swatch-option__background;
- @swatch-option-text__color: #686868;
- 
--@swatch-option-text__selected__background-color: @color-white !important;
-+@swatch-option-text__selected__background-color: @color-white;
- 
- //  Size and Manufacturer attributes
- @attr-swatch-option__background: @swatch-option__background;
-@@ -38,7 +38,7 @@
- 
- //  Image and Color swatch
- @img-color-swatch-option__hover__border: @swatch-option__hover__border;
--@img-color-swatch-option__hover__outline: 2px solid #e00;
-+@img-color-swatch-option__hover__outline: 2px solid darken(@active__color, 12%);
- 
- //  Tooltip
- @swatch-option-tooltip__background: @color-white;
-@@ -54,7 +54,7 @@
- @swatch-option-tooltip-layered-title__color: @swatch-option-tooltip-title__color;
- 
- //  Layered Features
--@swatch-option-link-layered__focus__box-shadow: 0 0 3px 1px @color-sky-blue1;
-+@swatch-option-link-layered__focus__box-shadow: 0 0 3px 1px @focus__color;
- 
- //
- //  Common
-@@ -89,17 +89,21 @@
-             }
- 
-             &-options {
--                margin-top: @indent__s;
-+                margin: @indent__s 0;
-+
-+                &:focus {
-+                    box-shadow: none;
-+                }
- 
-                 .swatch-option-tooltip-layered .title {
-                     .lib-css(color, @swatch-option-tooltip-layered-title__color);
--                    width: 100%;
--                    height: 20px;
--                    position: absolute;
-                     bottom: -5px;
-+                    height: 20px;
-                     left: 0;
--                    text-align: center;
-                     margin-bottom: @indent__s;
-+                    position: absolute;
-+                    text-align: center;
-+                    width: 100%;
-                 }
-             }
- 
-@@ -110,7 +114,7 @@
-                     .lib-css(color, @attr-swatch-option__color);
- 
-                     &.selected {
--                        .lib-css(blackground, @attr-swatch-option__selected__background);
-+                        .lib-css(background, @attr-swatch-option__selected__background);
-                         .lib-css(border, @attr-swatch-option__selected__border);
-                         .lib-css(color, @attr-swatch-option__selected__color);  
-                     }
-@@ -124,7 +128,7 @@
-             float: left;
-             height: 20px;
-             margin: 0 @indent__s @indent__xs 0;
--            max-width: 90px;
-+            max-width: 100%;
-             min-width: 30px;
-             overflow: hidden;
-             padding: 1px 2px;
-@@ -132,18 +136,22 @@
-             text-align: center;
-             text-overflow: ellipsis;
- 
-+            &:focus {
-+                box-shadow: @focus__box-shadow;
-+            }
-+
-             &.text {
-                 .lib-css(background, @swatch-option-text__background);
-                 .lib-css(color, @swatch-option-text__color);
-                 font-size: @font-size__s;
-                 font-weight: @font-weight__bold;
-                 line-height: 20px;
--                padding: 4px 8px;
--                min-width: 22px;
-                 margin-right: 7px;
-+                min-width: 22px;
-+                padding: 4px 8px;
- 
-                 &.selected {
--                    .lib-css(background-color, @swatch-option-text__selected__background-color);
-+                    .lib-css(background-color, @swatch-option-text__selected__background-color) !important;
-                 }
-             }
- 
-@@ -214,7 +222,6 @@
-                 .lib-css(color, @swatch-option-tooltip__color);
-                 display: none;
-                 max-height: 100%;
--                max-width: 140px;
-                 min-height: 20px;
-                 min-width: 20px;
-                 padding: @indent__xs;
-@@ -279,7 +286,6 @@
-                     .lib-css(color, @swatch-option-tooltip-title__color);
-                     display: block;
-                     max-height: 200px;
--                    max-width: 140px;
-                     min-height: 20px;
-                     overflow: hidden;
-                     text-align: center;
-diff --git a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less
-index f1e1529d982..b314bcf5b34 100644
---- a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less
-@@ -52,6 +52,16 @@
-         .lib-css(background-color, @page__background-color);
-     }
- 
-+    .page-wrapper {
-+        .lib-vendor-prefix-display(flex);
-+        .lib-vendor-prefix-flex-direction(column);
-+        min-height: 100vh; // Stretch content area for sticky footer
-+    }
-+
-+    .page-main {
-+        .lib-vendor-prefix-flex-grow(1);
-+    }
-+
-     //
-     //  Header
-     //  ---------------------------------------------
-@@ -279,27 +289,13 @@
- //  _____________________________________________
- 
- .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
--
--    html,
--    body {
--        height: 100%; // Stretch screen area for sticky footer
--    }
--
-     .page-wrapper {
--        .lib-vendor-prefix-display(flex);
--        .lib-vendor-prefix-flex-direction(column);
--        min-height: 100%; // Stretch content area for sticky footer
--
-         > .breadcrumbs,
-         > .top-container,
-         > .widget {
-             box-sizing: border-box;
-             width: 100%;
-         }
--
--        .ie11 & {
--            height: 100%;
--        }
-     }
- 
-     .navigation ul {
-diff --git a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
-index 0e8350261e0..9cd0439c139 100644
---- a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
-@@ -8,6 +8,24 @@
- //  _____________________________________________
- 
- & when (@media-common = true) {
-+    .toolbar {
-+        &.wishlist-toolbar {
-+            .limiter {
-+                float: right;
-+            }
-+            .main .pages {
-+                display: inline-block;
-+                position: relative;
-+                z-index: 0;
-+            }
-+            .toolbar-amount,
-+            .limiter {
-+                display: inline-block;
-+                z-index: 1;
-+            }
-+        }
-+    }
-+
-     .form.wishlist.items {
-         .actions-toolbar {
-             &:extend(.abs-reset-left-margin all);
-@@ -177,10 +195,10 @@
- .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-     .products-grid.wishlist {
-         margin-bottom: @indent__l;
--        margin-right: -@indent__s;
-+        margin-right: 0;
-         .product {
-             &-item {
--                padding: @indent__base @indent__s @indent__base @indent__base;
-+                padding: @indent__base 0 @indent__base 0;
-                 position: relative;
- 
-                 &-photo {
-@@ -194,6 +212,7 @@
- 
-                 &-actions {
-                     display: block;
-+                    float: left;
- 
-                     .action {
-                         margin-right: 15px;
-diff --git a/app/design/frontend/Magento/blank/etc/view.xml b/app/design/frontend/Magento/blank/etc/view.xml
-index 572632b6683..e742ce0a21c 100644
---- a/app/design/frontend/Magento/blank/etc/view.xml
-+++ b/app/design/frontend/Magento/blank/etc/view.xml
-@@ -250,7 +250,7 @@
-         <var name="product_list_image_size">166</var>           <!-- New Product image size used in product list -->
-         <var name="product_zoom_image_size">370</var>           <!-- New Product image size used for zooming -->
- 
--        <var name="product_image_white_borders">0</var>
-+        <var name="product_image_white_borders">1</var>
-     </vars>
-     <vars module="Magento_Bundle">
-         <var name="product_summary_image_size">58</var>         <!-- New Product image size used for summary block-->
-diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less
-index 6df78859a1a..74dfd48d87a 100644
---- a/app/design/frontend/Magento/blank/web/css/source/_extends.less
-+++ b/app/design/frontend/Magento/blank/web/css/source/_extends.less
-@@ -162,7 +162,7 @@
- & when (@media-common = true) {
-     .abs-login-block-title {
-         strong {
--            font-weight: 500;
-+            font-weight: @font-weight__heavier;
-         }
- 
-         .lib-font-size(18);
-@@ -178,11 +178,11 @@
- 
- & when (@media-common = true) {
-     .abs-block-title {
-+        margin-bottom: 15px;
-+        
-         > strong {
-             .lib-heading(h3);
-         }
--
--        margin-bottom: 15px;
-     }
- }
- 
-@@ -194,6 +194,7 @@
-     .abs-account-blocks {
-         .block-title {
-             &:extend(.abs-block-title all);
-+            
-             > .action {
-                 margin-left: 15px;
-             }
-@@ -208,7 +209,7 @@
-             }
- 
-             > .action {
--                font-weight: 400;
-+                font-weight: @font-weight__regular;
-                 margin-left: @indent__s;
-             }
-         }
-@@ -232,10 +233,10 @@
- & when (@media-common = true) {
-     .abs-dropdown-simple {
-         .lib-dropdown(
--        @_dropdown-list-item-padding: 5px 5px 5px 23px,
--        @_dropdown-list-min-width: 200px,
--        @_icon-font-margin: 0 0 0 5px,
--        @_icon-font-vertical-align: middle
-+            @_dropdown-list-item-padding: 5px 5px 5px 23px,
-+            @_dropdown-list-min-width: 200px,
-+            @_icon-font-margin: 0 0 0 5px,
-+            @_icon-font-vertical-align: middle
-         );
-     }
- }
-@@ -252,7 +253,7 @@
- }
- 
- //
--//  Marging for blocks & widgets
-+//  Margin for blocks & widgets
- //  ---------------------------------------------
- 
- & when (@media-common = true) {
-@@ -268,13 +269,13 @@
- & when (@media-common = true) {
-     .abs-remove-button-for-blocks {
-         .lib-icon-font(
--        @icon-remove,
--        @_icon-font-size: 26px,
--        @_icon-font-line-height: 15px,
--        @_icon-font-text-hide: true,
--        @_icon-font-color: @color-gray19,
--        @_icon-font-color-hover: @color-gray19,
--        @_icon-font-color-active: @color-gray19
-+            @icon-remove,
-+            @_icon-font-size: 26px,
-+            @_icon-font-line-height: 15px,
-+            @_icon-font-text-hide: true,
-+            @_icon-font-color: @color-gray19,
-+            @_icon-font-color-hover: @color-gray19,
-+            @_icon-font-color-active: @color-gray19
-         );
-     }
- }
-@@ -289,14 +290,14 @@
- 
-         > a {
-             .lib-link(
--            @_link-color: @product-name-link__color,
--            @_link-text-decoration: @product-name-link__text-decoration,
--            @_link-color-visited: @product-name-link__color__visited,
--            @_link-text-decoration-visited: @product-name-link__text-decoration__visited,
--            @_link-color-hover: @product-name-link__color__hover,
--            @_link-text-decoration-hover: @product-name-link__text-decoration__hover,
--            @_link-color-active: @product-name-link__color__active,
--            @_link-text-decoration-active: @product-name-link__text-decoration__active
-+                @_link-color: @product-name-link__color,
-+                @_link-text-decoration: @product-name-link__text-decoration,
-+                @_link-color-visited: @product-name-link__color__visited,
-+                @_link-text-decoration-visited: @product-name-link__text-decoration__visited,
-+                @_link-color-hover: @product-name-link__color__hover,
-+                @_link-text-decoration-hover: @product-name-link__text-decoration__hover,
-+                @_link-color-active: @product-name-link__color__active,
-+                @_link-text-decoration-active: @product-name-link__text-decoration__active
-             );
-         }
-     }
-@@ -613,11 +614,11 @@
- & when (@media-common = true) {
-     .abs-navigation-icon {
-         .lib-icon-font(
--        @_icon-font-content: @icon-down,
--        @_icon-font-size: 34px,
--        @_icon-font-line-height: 1.2,
--        @_icon-font-position: after,
--        @_icon-font-display: block
-+            @_icon-font-content: @icon-down,
-+            @_icon-font-size: 34px,
-+            @_icon-font-line-height: 1.2,
-+            @_icon-font-position: after,
-+            @_icon-font-display: block
-         );
- 
-         &:after {
-@@ -635,8 +636,8 @@
- & when (@media-common = true) {
-     .abs-split-button {
-         .lib-dropdown-split(
--        @_options-selector : ~'.items',
--        @_dropdown-split-button-border-radius-fix: true
-+            @_options-selector : ~'.items',
-+            @_dropdown-split-button-border-radius-fix: true
-         );
-         vertical-align: middle;
-     }
-@@ -654,13 +655,13 @@
- 
-     .abs-actions-addto-gridlist {
-         .lib-icon-font(
--        @_icon-font-content: '',
--        @_icon-font-size: 29px,
--        @_icon-font-color: @addto-color,
--        @_icon-font-color-hover: @addto-hover-color,
--        @_icon-font-text-hide: true,
--        @_icon-font-vertical-align: middle,
--        @_icon-font-line-height: 24px
-+            @_icon-font-content: '',
-+            @_icon-font-size: 29px,
-+            @_icon-font-color: @addto-color,
-+            @_icon-font-color-hover: @addto-hover-color,
-+            @_icon-font-text-hide: true,
-+            @_icon-font-vertical-align: middle,
-+            @_icon-font-line-height: 24px
-         );
-     }
- }
-@@ -762,11 +763,11 @@
-         padding-right: 12px;
-         position: relative;
-         .lib-icon-font(
--        @icon-down,
--        @_icon-font-size: 26px,
--        @_icon-font-line-height: 10px,
--        @_icon-font-margin: 3px 0 0 0,
--        @_icon-font-position: after
-+            @icon-down,
-+            @_icon-font-size: 26px,
-+            @_icon-font-line-height: 10px,
-+            @_icon-font-margin: 3px 0 0 0,
-+            @_icon-font-position: after
-         );
- 
-         &:after {
-@@ -777,16 +778,16 @@
- 
-         &-expanded {
-             .lib-icon-font-symbol(
--            @_icon-font-content: @icon-up,
--            @_icon-font-position: after
-+                @_icon-font-content: @icon-up,
-+                @_icon-font-position: after
-             );
-         }
-     }
- 
-     .abs-tax-total-expanded {
-         .lib-icon-font-symbol(
--        @_icon-font-content: @icon-up,
--        @_icon-font-position: after
-+            @_icon-font-content: @icon-up,
-+            @_icon-font-position: after
-         );
-     }
- }
-@@ -803,20 +804,6 @@
-     }
- }
- 
--//
--//  Checkout order review price
--//  ---------------------------------------------
--
--.abs-checkout-cart-price {
--}
--
--//
--//  Checkout order product name
--//  ---------------------------------------------
--
--.abs-checkout-product-name {
--}
--
- //
- //  Checkout order review
- //  ---------------------------------------------
-@@ -881,10 +868,10 @@
- & when (@media-common = true) {
-     .abs-icon-add {
-         .lib-icon-font(
--        @_icon-font-content: @icon-expand,
--        @_icon-font-size: 10px,
--        @_icon-font-line-height: 10px,
--        @_icon-font-vertical-align: middle
-+            @_icon-font-content: @icon-expand,
-+            @_icon-font-size: 10px,
-+            @_icon-font-line-height: 10px,
-+            @_icon-font-vertical-align: middle
-         );
-     }
- }
-@@ -892,12 +879,12 @@
- .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-     .abs-icon-add-mobile {
-         .lib-icon-font(
--        @_icon-font-content: @icon-expand,
--        @_icon-font-size: 10px,
--        @_icon-font-line-height: 10px,
--        @_icon-font-vertical-align: middle,
--        @_icon-font-margin: 0 5px 0 0,
--        @_icon-font-display: block
-+            @_icon-font-content: @icon-expand,
-+            @_icon-font-size: 10px,
-+            @_icon-font-line-height: 10px,
-+            @_icon-font-vertical-align: middle,
-+            @_icon-font-margin: 0 5px 0 0,
-+            @_icon-font-display: block
-         );
-     }
- }
-@@ -938,11 +925,11 @@
-         position: relative;
- 
-         .lib-icon-font(
--        @_icon-font-content: @icon-down,
--        @_icon-font-size: 28px,
--        @_icon-font-text-hide: false,
--        @_icon-font-position: after,
--        @_icon-font-display: block
-+            @_icon-font-content: @icon-down,
-+            @_icon-font-size: 28px,
-+            @_icon-font-text-hide: false,
-+            @_icon-font-position: after,
-+            @_icon-font-display: block
-         );
- 
-         &:after {
-@@ -1082,12 +1069,12 @@
-                 font-weight: @font-weight__bold;
-                 .lib-link-as-button();
-                 .lib-button(
--                @_button-padding: 7px 15px 7px 0,
--                @_button-icon-use: true,
--                @_button-font-content: @icon-prev,
--                @_button-icon-font-size: 32px,
--                @_button-icon-font-line-height: 16px,
--                @_button-icon-font-position: before
-+                    @_button-padding: 7px 15px 7px 0,
-+                    @_button-icon-use: true,
-+                    @_button-font-content: @icon-prev,
-+                    @_button-icon-font-size: 32px,
-+                    @_button-icon-font-line-height: 16px,
-+                    @_button-icon-font-position: before
-                 );
- 
-                 &:active {
-@@ -1097,9 +1084,9 @@
- 
-             &.update {
-                 .lib-button-icon(
--                @icon-update,
--                @_icon-font-size: 32px,
--                @_icon-font-line-height: 16px
-+                    @icon-update,
-+                    @_icon-font-size: 32px,
-+                    @_icon-font-line-height: 16px
-                 );
-                 padding-left: @indent__xs;
-             }
-@@ -1174,7 +1161,7 @@
- 
- & when (@media-common = true) {
-     .abs-field-date-input {
--        .lib-css(margin-right, @indent__s);
-+        margin-right: @indent__s;
-         width: calc(~'100% -' @icon-calendar__font-size + @indent__s);
-     }
- }
-@@ -1189,7 +1176,7 @@
-         position: relative;
- 
-         input {
--            .lib-css(margin-right, @indent__s);
-+            margin-right: @indent__s;
-             width: calc(~'100% -' @checkout-tooltip-icon__font-size + @indent__s + @indent__xs);
-         }
-     }
-@@ -1207,12 +1194,12 @@
-     &:before,
-     &:after {
-         .lib-arrow(
--        @_position: top,
--        @_size: @checkout-tooltip-icon-arrow__font-size,
--        @_color: @checkout-tooltip-content__background-color
-+            @_position: top,
-+            @_size: @checkout-tooltip-icon-arrow__font-size,
-+            @_color: @checkout-tooltip-content__background-color
-         );
-         .lib-css(margin-top, @checkout-tooltip-icon-arrow__left);
--        .lib-css(right, @indent__s);
-+        right: @indent__s;
-         left: auto;
-         top: 0;
-     }
-@@ -1248,11 +1235,11 @@
-         .lib-css(border-bottom, @checkout-step-title__border);
-         .lib-css(padding-bottom, @checkout-step-title__padding);
-         .lib-typography(
--        @_font-size: @checkout-step-title__font-size,
--        @_font-weight: @checkout-step-title__font-weight,
--        @_font-family: false,
--        @_font-style: false,
--        @_line-height: false
-+            @_font-size: @checkout-step-title__font-size,
-+            @_font-weight: @checkout-step-title__font-weight,
-+            @_font-family: false,
-+            @_font-style: false,
-+            @_line-height: false
-         );
-     }
- }
-@@ -1313,11 +1300,11 @@
- 
-                 .amount .price {
-                     .lib-icon-font(
--                    @icon-down,
--                    @_icon-font-size: 30px,
--                    @_icon-font-text-hide: true,
--                    @_icon-font-position: after,
--                    @_icon-font-display: block
-+                        @icon-down,
-+                        @_icon-font-size: 30px,
-+                        @_icon-font-text-hide: true,
-+                        @_icon-font-position: after,
-+                        @_icon-font-display: block
-                     );
-                     padding-right: @indent__m;
-                     position: relative;
-@@ -1337,16 +1324,16 @@
- 
-                     .amount .price {
-                         .lib-icon-font-symbol(
--                        @_icon-font-content: @icon-up,
--                        @_icon-font-position: after
-+                            @_icon-font-content: @icon-up,
-+                            @_icon-font-position: after
-                         );
-                     }
-                 }
-             }
- 
-             &-details {
--                display: none;
-                 .lib-css(border-bottom, @border-width__base solid @border-color__base);
-+                display: none;
- 
-                 &.shown {
-                     display: table-row;
-@@ -1371,10 +1358,10 @@
-             cursor: pointer;
-             font-weight: @font-weight__semibold;
-             .lib-icon-font(
--            @_icon-font-content: @icon-down,
--            @_icon-font-size: 30px,
--            @_icon-font-position: after,
--            @_icon-font-display: block
-+                @_icon-font-content: @icon-down,
-+                @_icon-font-size: 30px,
-+                @_icon-font-position: after,
-+                @_icon-font-display: block
-             );
-             margin-bottom: 0;
-             overflow: hidden;
-@@ -1402,8 +1389,8 @@
-         &.active {
-             > .title {
-                 .lib-icon-font-symbol(
--                @_icon-font-content: @icon-up,
--                @_icon-font-position: after
-+                    @_icon-font-content: @icon-up,
-+                    @_icon-font-position: after
-                 );
-             }
- 
-diff --git a/app/design/frontend/Magento/blank/web/css/source/_forms.less b/app/design/frontend/Magento/blank/web/css/source/_forms.less
-index 94b993b53b5..26f5ff89e99 100644
---- a/app/design/frontend/Magento/blank/web/css/source/_forms.less
-+++ b/app/design/frontend/Magento/blank/web/css/source/_forms.less
-@@ -18,7 +18,7 @@
-     .fieldset {
-         .lib-form-fieldset();
-         &:last-child {
--            margin-bottom: 0;
-+            margin-bottom: @indent__base;
-         }
- 
-         > .field,
-@@ -101,6 +101,18 @@
-         .lib-form-validation-note();
-     }
- 
-+    .product-options-wrapper {
-+        .date {
-+            &.required {
-+                div[for*='options'] {
-+                    &.mage-error {
-+                        display: none !important;
-+                    }
-+                }
-+            }
-+        }
-+    }
-+
-     .field .tooltip {
-         .lib-tooltip(right);
-         .tooltip-content {
-diff --git a/app/design/frontend/Magento/blank/web/css/source/_layout.less b/app/design/frontend/Magento/blank/web/css/source/_layout.less
-index a81a3fa8d1f..62195b5566f 100644
---- a/app/design/frontend/Magento/blank/web/css/source/_layout.less
-+++ b/app/design/frontend/Magento/blank/web/css/source/_layout.less
-@@ -18,7 +18,7 @@
-         .column.main {
-             &:extend(.abs-add-box-sizing all);
-             .lib-css(padding-bottom, @indent__xl);
--            .lib-vendor-prefix-flex-basis(100%);
-+            .lib-vendor-prefix-flex-basis(auto);
-             .lib-vendor-prefix-flex-grow(1);
-             .lib-vendor-prefix-order(1);
-             width: 100%;
-@@ -94,10 +94,6 @@
- 
-     .page-main {
-         width: 100%;
--
--        .lib-vendor-prefix-flex-grow(1);
--        .lib-vendor-prefix-flex-shrink(0);
--        .lib-vendor-prefix-flex-basis(auto);
-     }
- 
-     .columns {
-diff --git a/app/design/frontend/Magento/blank/web/css/source/_loaders.less b/app/design/frontend/Magento/blank/web/css/source/_loaders.less
-index 5fcba9653ef..ed062c38244 100644
---- a/app/design/frontend/Magento/blank/web/css/source/_loaders.less
-+++ b/app/design/frontend/Magento/blank/web/css/source/_loaders.less
-@@ -42,4 +42,8 @@
-     ._block-content-loading {
-         position: relative;
-     }
-+
-+    [data-role='main-css-loader'] {
-+        display: none;
-+    }
- }
-diff --git a/app/design/frontend/Magento/blank/web/css/source/_navigation.less b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
-index 4499886ef0f..21b73157797 100644
---- a/app/design/frontend/Magento/blank/web/css/source/_navigation.less
-+++ b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
-@@ -131,12 +131,18 @@
-                 );
-             }
-         }
--
-         .switcher-dropdown {
-             .lib-list-reset-styles();
-+            display: none;
-             padding: @indent__s 0;
-         }
--
-+        .switcher-options {
-+            &.active {
-+                .switcher-dropdown {
-+                    display: block;
-+                }
-+            }
-+        } 
-         .header.links {
-             .lib-list-reset-styles();
-             border-bottom: 1px solid @color-gray82;
-@@ -207,7 +213,7 @@
-         }
- 
-         .nav-toggle {
--            &:after{
-+            &:after {
-                 background: rgba(0, 0, 0, @overlay__opacity);
-                 content: '';
-                 display: block;
-diff --git a/app/design/frontend/Magento/blank/web/css/source/_sections.less b/app/design/frontend/Magento/blank/web/css/source/_sections.less
-index f0a3518c92a..1eee47bda81 100644
---- a/app/design/frontend/Magento/blank/web/css/source/_sections.less
-+++ b/app/design/frontend/Magento/blank/web/css/source/_sections.less
-@@ -31,8 +31,19 @@
- .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-     .product.data.items {
-         .lib-data-accordion();
-+
-         .data.item {
-             display: block;
-         }
-+
-+        .item.title {
-+            > .switch {
-+                padding: 1px 15px 1px;
-+            }
-+        }
-+
-+        > .item.content {
-+            padding: 10px 15px 30px;
-+        }
-     }
- }
-diff --git a/app/design/frontend/Magento/blank/web/css/source/_tooltips.less b/app/design/frontend/Magento/blank/web/css/source/_tooltips.less
-index 1194d043133..89e3ec236c1 100644
---- a/app/design/frontend/Magento/blank/web/css/source/_tooltips.less
-+++ b/app/design/frontend/Magento/blank/web/css/source/_tooltips.less
-@@ -11,9 +11,9 @@
- 
-     .tooltip.wrapper {
-         .lib-tooltip(
--        @_tooltip-position: bottom,
--        @_tooltip-selector-content: ~'.tooltip.content',
--        @_tooltip-selector-toggle: ~'tooltip.toggle'
-+            @_tooltip-position: bottom,
-+            @_tooltip-selector-content: ~'.tooltip.content',
-+            @_tooltip-selector-toggle: ~'.tooltip.toggle'
-         );
- 
-         .tooltip.content {
-diff --git a/app/design/frontend/Magento/blank/web/css/source/_typography.less b/app/design/frontend/Magento/blank/web/css/source/_typography.less
-index 8ce76fad979..6807c0f692a 100644
---- a/app/design/frontend/Magento/blank/web/css/source/_typography.less
-+++ b/app/design/frontend/Magento/blank/web/css/source/_typography.less
-@@ -12,28 +12,32 @@
-         @family-name: @font-family-name__base,
-         @font-path: '@{baseDir}fonts/opensans/light/opensans-300',
-         @font-weight: 300,
--        @font-style: normal
-+        @font-style: normal,
-+        @font-display: swap
-     );
- 
-     .lib-font-face(
-         @family-name: @font-family-name__base,
-         @font-path: '@{baseDir}fonts/opensans/regular/opensans-400',
-         @font-weight: 400,
--        @font-style: normal
-+        @font-style: normal,
-+        @font-display: swap
-     );
- 
-     .lib-font-face(
-         @family-name: @font-family-name__base,
-         @font-path: '@{baseDir}fonts/opensans/semibold/opensans-600',
-         @font-weight: 600,
--        @font-style: normal
-+        @font-style: normal,
-+        @font-display: swap
-     );
- 
-     .lib-font-face(
-         @family-name: @font-family-name__base,
-         @font-path: '@{baseDir}fonts/opensans/bold/opensans-700',
-         @font-weight: 700,
--        @font-style: normal
-+        @font-style: normal,
-+        @font-display: swap
-     );
- }
- 
-diff --git a/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less
-index 5cdb1444094..764a63bd880 100644
---- a/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less
-+++ b/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less
-@@ -148,10 +148,9 @@
-             }
-         }
-     }
--}
- 
--.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-     .modal-popup {
-+        pointer-events: auto;
-         &.modal-slide {
-             .modal-inner-wrap[class] {
-                 .lib-css(background-color, @modal-slide-mobile__background-color);
-diff --git a/app/design/frontend/Magento/blank/web/images/logo.svg b/app/design/frontend/Magento/blank/web/images/logo.svg
-index 013d6e7c5a1..0f29d4e3eef 100644
---- a/app/design/frontend/Magento/blank/web/images/logo.svg
-+++ b/app/design/frontend/Magento/blank/web/images/logo.svg
-@@ -1 +1 @@
--<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="55.139px" viewBox="0 0 189 55.139" width="189px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 189 55.139"><path d="m23.333 0l-23.333 14.135v26.865l6.06 3.568v-26.865l17.278-10.504 17.292 10.488 0.074 0.042-0.008 26.798 6.001-3.527v-26.865l-23.364-14.135zm3.088 16.538v31.407l-3.088 1.889-3.091-1.896v-31.376l-8.003 4.928v26.86l11.094 6.789 11.189-6.837v-26.829l-8.101-4.935z" fill="#ED7402"/><path d="m12.239 21.491l8.003 4.886v-9.814l-8.003 4.928zm14.182-4.953v9.902l8.101-4.967-8.101-4.935zm20.276-2.403l-23.364-14.135-23.333 14.135 6.06 3.568 17.278-10.504 17.365 10.53 5.994-3.594z" fill="#F8B97F"/><path d="m82.328 39.984l-1.608-20.54-8.156 20.651h-2.656l-8.156-20.651-1.571 20.541h-3.293l2.058-25.814h4.34l8.043 21.174 8.044-21.174h4.301l2.021 25.814h-3.367z" fill="#131108"/><path d="m99.91 39.984l-0.375-2.396c-1.421 1.458-3.366 2.769-6.284 2.769-3.218 0-5.237-1.945-5.237-4.977 0-4.452 3.815-6.209 11.261-6.996v-0.748c0-2.244-1.348-3.03-3.406-3.03-2.17 0-4.227 0.673-6.172 1.533l-0.449-2.88c2.133-0.861 4.153-1.496 6.922-1.496 4.339 0 6.436 1.757 6.436 5.723v12.498h-2.7zm-0.635-9.055c-6.586 0.636-7.97 2.432-7.97 4.266 0 1.457 0.973 2.394 2.657 2.394 1.945 0 3.815-0.974 5.312-2.508v-4.152h0.001z" fill="#131108"/><path d="m121.72 21.876l0.485 2.992-3.404 0.336c0.486 0.824 0.712 1.76 0.712 2.769 0 3.817-3.219 6.134-6.848 6.134-0.449 0-0.898-0.037-1.348-0.111-0.523 0.338-0.897 0.75-0.897 1.085 0 0.636 0.634 0.787 3.777 1.349l1.272 0.223c3.778 0.673 6.135 1.871 6.135 4.639 0 3.741-4.078 5.5-8.715 5.5-4.64 0-8.343-1.458-8.343-4.6 0-1.834 1.271-3.256 3.777-4.603-0.784-0.562-1.121-1.198-1.121-1.872 0-0.861 0.672-1.722 1.87-2.432-1.982-0.973-3.33-2.879-3.33-5.312 0-3.852 3.217-6.208 6.846-6.208 1.795 0 3.368 0.522 4.604 1.496l4.53-1.385zm-13.99 20.052c0 1.424 1.834 2.471 5.312 2.471 3.48 0 5.424-1.197 5.424-2.693 0-1.086-0.822-1.832-3.365-2.282l-2.134-0.375c-0.972-0.187-1.495-0.299-2.207-0.448-2.1 1.045-3.03 2.094-3.03 3.327zm4.86-17.733c-2.244 0-3.629 1.722-3.629 3.891 0 2.058 1.421 3.665 3.629 3.665 2.283 0 3.704-1.682 3.704-3.815 0.01-2.132-1.49-3.741-3.7-3.741z" fill="#131108"/><path d="m137.58 31.416h-12.122c0.112 4.15 2.094 6.098 5.2 6.098 2.583 0 4.453-1.009 6.397-2.544l0.484 2.994c-1.907 1.497-4.188 2.394-7.143 2.394-4.642 0-8.271-2.807-8.271-9.354 0-5.724 3.368-9.239 7.856-9.239 5.199 0 7.595 4.002 7.595 8.94v0.711zm-7.63-7.033c-2.059 0-3.817 1.459-4.34 4.526h8.604c-0.41-2.881-1.68-4.526-4.26-4.526z" fill="#131108"/><path d="m151.61 39.984v-12.16c0-1.832-0.786-3.067-2.73-3.067-1.759 0-3.555 1.161-5.163 2.88v12.347h-3.329v-17.846h2.655l0.412 2.582c1.683-1.533 3.78-2.955 6.321-2.955 3.369 0 5.166 2.019 5.166 5.236v12.983h-3.33z" fill="#131108"/><path d="m164.78 40.284c-3.143 0-5.199-1.124-5.199-4.716v-10.624h-2.694v-2.806h2.694v-5.949l3.255-0.485v6.434h3.853l0.449 2.806h-4.302v10.025c0 1.461 0.599 2.357 2.47 2.357 0.598 0 1.121-0.035 1.531-0.112l0.45 2.843c-0.57 0.112-1.35 0.227-2.51 0.227z" fill="#131108"/><path d="m175.82 40.357c-4.752 0-8.194-3.403-8.194-9.278 0-5.874 3.442-9.314 8.194-9.314 4.787 0 8.305 3.44 8.305 9.314 0 5.875-3.52 9.278-8.3 9.278zm0-15.788c-3.217 0-4.826 2.769-4.826 6.51 0 3.668 1.683 6.511 4.826 6.511 3.291 0 4.938-2.77 4.938-6.511-0.01-3.666-1.73-6.51-4.94-6.51z" fill="#131108"/><path d="m186.48 24.81c-1.338 0-2.268-0.929-2.268-2.318 0-1.379 0.95-2.328 2.268-2.328 1.34 0 2.27 0.939 2.27 2.328 0 1.378-0.95 2.318-2.27 2.318zm0-4.376c-1.078 0-1.938 0.739-1.938 2.058 0 1.31 0.859 2.049 1.938 2.049 1.09 0 1.949-0.739 1.949-2.049 0-1.319-0.87-2.058-1.95-2.058zm0.67 3.297l-0.768-1.099h-0.249v1.059h-0.44v-2.568h0.779c0.54 0 0.898 0.27 0.898 0.75 0 0.37-0.201 0.609-0.52 0.709l0.74 1.049-0.44 0.1zm-0.68-2.209h-0.34v0.759h0.319c0.29 0 0.471-0.12 0.471-0.379 0-0.25-0.16-0.38-0.45-0.38z" fill="#131108"/></svg>
-\ No newline at end of file
-+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.073 50"><style>.st0{fill:#f26322}.st1{fill:#4d4d4d}</style><path class="st0" d="M21.432 0L0 12.373v24.713l6.117 3.533-.041-24.713 15.315-8.842 15.313 8.842v24.706l6.118-3.526V12.35z"/><path class="st0" d="M24.47 40.618l-3.058 1.772-3.071-1.759V15.906l-6.116 3.532.01 24.712 9.172 5.298 9.18-5.298V19.438l-6.117-3.532z"/><path class="st1" d="M56.838 12.522l8.415 21.258h.068l8.21-21.258h3.203V36.88h-2.215V15.656h-.068c-.114.386-.239.772-.374 1.158-.115.318-.246.67-.393 1.055-.147.387-.278.75-.391 1.09l-7.052 17.919h-2.01L57.11 18.96a19.913 19.913 0 0 1-.408-1.039 43.558 43.558 0 0 1-.375-1.073 68.067 68.067 0 0 0-.408-1.192h-.069v21.223h-2.112V12.522h3.1zM83.17 36.982a5.205 5.205 0 0 1-1.823-.92 4.327 4.327 0 0 1-1.209-1.533 4.881 4.881 0 0 1-.443-2.145 5.018 5.018 0 0 1 .579-2.556 4.472 4.472 0 0 1 1.568-1.584 7.927 7.927 0 0 1 2.299-.903 24.732 24.732 0 0 1 2.811-.477 36 36 0 0 0 2.198-.29 6.689 6.689 0 0 0 1.465-.392c.329-.123.614-.343.817-.63.187-.325.276-.698.256-1.073v-.34a3.212 3.212 0 0 0-1.09-2.674 4.93 4.93 0 0 0-3.134-.87c-3.135 0-4.781 1.306-4.941 3.918h-2.077a5.748 5.748 0 0 1 1.891-4.089 7.5 7.5 0 0 1 5.127-1.533 7.335 7.335 0 0 1 4.564 1.278 4.923 4.923 0 0 1 1.67 4.173v9.573c-.034.402.069.804.29 1.141.219.251.536.394.868.392.12-.001.24-.012.358-.034.124-.022.266-.057.425-.102h.103v1.533c-.188.077-.382.14-.58.188-.28.062-.566.091-.852.086a2.694 2.694 0 0 1-1.839-.597 2.575 2.575 0 0 1-.75-1.891v-.374h-.102c-.277.372-.578.725-.903 1.056-.38.385-.81.717-1.278.988a7.14 7.14 0 0 1-1.737.715 8.443 8.443 0 0 1-2.249.272 8.186 8.186 0 0 1-2.282-.306m5.195-1.857a5.971 5.971 0 0 0 1.857-1.175 4.767 4.767 0 0 0 1.499-3.441V27.34a7.295 7.295 0 0 1-2.061.732 33.21 33.21 0 0 1-2.504.426c-.749.114-1.441.233-2.077.358a5.237 5.237 0 0 0-1.652.596 3.055 3.055 0 0 0-1.108 1.107 3.579 3.579 0 0 0-.408 1.824c-.018.53.093 1.056.324 1.533.201.392.493.73.851.987a3.35 3.35 0 0 0 1.244.529c.493.104.995.155 1.499.153a6.555 6.555 0 0 0 2.536-.46M99.35 41.734a4.687 4.687 0 0 1-2.009-3.287h2.043c.14.966.763 1.794 1.652 2.197a7.522 7.522 0 0 0 3.288.664 5.688 5.688 0 0 0 4.173-1.345 4.997 4.997 0 0 0 1.345-3.697v-2.793h-.102a7.293 7.293 0 0 1-2.283 2.282 6.297 6.297 0 0 1-3.304.784 7.375 7.375 0 0 1-3.135-.647 6.921 6.921 0 0 1-2.385-1.806 8.095 8.095 0 0 1-1.516-2.777 11.429 11.429 0 0 1-.528-3.56 10.89 10.89 0 0 1 .613-3.799 8.483 8.483 0 0 1 1.636-2.777 6.75 6.75 0 0 1 2.402-1.703 7.45 7.45 0 0 1 2.913-.58 6.234 6.234 0 0 1 3.372.835 6.938 6.938 0 0 1 2.215 2.265h.102v-2.725h2.078v16.931a6.78 6.78 0 0 1-1.636 4.735 7.751 7.751 0 0 1-5.893 2.112 8.337 8.337 0 0 1-5.041-1.309m9.232-8.908a8.565 8.565 0 0 0 1.397-5.11 11.22 11.22 0 0 0-.34-2.862 6.239 6.239 0 0 0-1.056-2.231 4.828 4.828 0 0 0-1.789-1.448 5.772 5.772 0 0 0-2.503-.511 4.782 4.782 0 0 0-4.071 1.941 8.464 8.464 0 0 0-1.448 5.179c-.008.936.107 1.87.34 2.777a6.64 6.64 0 0 0 1.022 2.214 4.81 4.81 0 0 0 1.703 1.465 5.208 5.208 0 0 0 2.42.528 4.967 4.967 0 0 0 4.325-1.942M119.244 36.624a7.19 7.19 0 0 1-2.572-1.941 8.66 8.66 0 0 1-1.583-2.93 11.839 11.839 0 0 1-.546-3.662 11.179 11.179 0 0 1 .58-3.663 9.138 9.138 0 0 1 1.617-2.929 7.307 7.307 0 0 1 2.522-1.942 7.684 7.684 0 0 1 3.321-.698 7.275 7.275 0 0 1 3.56.8 6.678 6.678 0 0 1 2.351 2.146 8.806 8.806 0 0 1 1.278 3.083 16.87 16.87 0 0 1 .374 3.577h-13.422c.013.941.157 1.875.426 2.777a6.968 6.968 0 0 0 1.124 2.231 5.108 5.108 0 0 0 1.857 1.499 5.948 5.948 0 0 0 2.623.546 4.985 4.985 0 0 0 3.424-1.074 5.875 5.875 0 0 0 1.719-2.878h2.044a7.51 7.51 0 0 1-2.385 4.19 7.072 7.072 0 0 1-4.803 1.567 8.386 8.386 0 0 1-3.509-.699m8.312-12.264a5.986 5.986 0 0 0-.988-1.976 4.525 4.525 0 0 0-1.635-1.311 5.362 5.362 0 0 0-2.351-.478 5.623 5.623 0 0 0-2.368.478 5.064 5.064 0 0 0-1.754 1.311 6.566 6.566 0 0 0-1.141 1.96 9.615 9.615 0 0 0-.562 2.453h11.174a9.268 9.268 0 0 0-.375-2.437M134.879 19.267v2.691h.068a7.237 7.237 0 0 1 2.333-2.197 6.798 6.798 0 0 1 3.561-.868 5.834 5.834 0 0 1 4.037 1.413 5.174 5.174 0 0 1 1.584 4.071V36.88h-2.112V24.581a3.716 3.716 0 0 0-1.073-2.947 4.334 4.334 0 0 0-2.948-.937 5.896 5.896 0 0 0-2.111.375 5.558 5.558 0 0 0-1.738 1.039 4.717 4.717 0 0 0-1.601 3.593V36.88h-2.112V19.267h2.112zM151.912 36.284a2.934 2.934 0 0 1-.92-2.436V21.005h-2.657v-1.738h2.657v-5.416h2.112v5.416h3.271v1.738h-3.271v12.502a1.65 1.65 0 0 0 .426 1.312c.371.265.823.391 1.277.357.258-.001.515-.029.766-.085.215-.043.426-.106.63-.188h.103v1.806a5.907 5.907 0 0 1-1.942.306 3.819 3.819 0 0 1-2.452-.731M162.625 36.624a7.368 7.368 0 0 1-2.571-1.942 8.732 8.732 0 0 1-1.618-2.929 12.217 12.217 0 0 1 0-7.324 8.744 8.744 0 0 1 1.618-2.93 7.386 7.386 0 0 1 2.571-1.942 8.106 8.106 0 0 1 3.424-.698 7.989 7.989 0 0 1 3.406.698 7.424 7.424 0 0 1 2.556 1.942 8.504 8.504 0 0 1 1.601 2.93 12.57 12.57 0 0 1 0 7.324 8.5 8.5 0 0 1-1.601 2.929 7.415 7.415 0 0 1-2.556 1.942 7.959 7.959 0 0 1-3.406.698 8.075 8.075 0 0 1-3.424-.698m6.013-1.652a5.308 5.308 0 0 0 1.873-1.601 7.215 7.215 0 0 0 1.124-2.385 11.348 11.348 0 0 0 0-5.792 7.215 7.215 0 0 0-1.124-2.385 5.289 5.289 0 0 0-1.873-1.601 6.109 6.109 0 0 0-5.195 0 5.497 5.497 0 0 0-1.874 1.601 7.046 7.046 0 0 0-1.141 2.385 11.392 11.392 0 0 0 0 5.792c.227.86.614 1.669 1.141 2.385a5.817 5.817 0 0 0 7.069 1.601M176.856 22.191a2.128 2.128 0 0 1-2.213-2.265 2.216 2.216 0 1 1 4.431 0 2.146 2.146 0 0 1-2.218 2.265m0-4.277a1.845 1.845 0 0 0-1.892 2.012 1.9 1.9 0 1 0 3.797 0 1.854 1.854 0 0 0-1.905-2.012m.653 3.222l-.751-1.073h-.243v1.035h-.43v-2.509h.763c.526 0 .877.264.877.732a.681.681 0 0 1-.508.693l.724 1.025-.432.097zm-.661-2.157h-.333v.741h.312c.283 0 .46-.117.46-.371.001-.244-.158-.37-.439-.37"/></svg>
-diff --git a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
-index 43ae23bab78..45a01269bef 100644
---- a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
-@@ -58,6 +58,7 @@
-             .field.choice {
-                 input {
-                     float: left;
-+                    margin-top: 4px;
-                 }
- 
-                 .label {
-@@ -253,7 +254,7 @@
-             .box-tocart {
-                 .action.primary {
-                     margin-right: 1%;
--                    width: 49%;
-+                    width: auto;
-                 }
-             }
- 
-diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
-index 501a1d2918d..3b4da1d1ae6 100644
---- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
-@@ -294,6 +294,12 @@
-     }
- 
-     .product-options-wrapper {
-+        .fieldset {
-+            &:focus {
-+                box-shadow: none;
-+            }
-+        }
-+
-         .fieldset-product-options-inner {
-             .legend {
-                 .lib-css(font-weight, @font-weight__semibold);
-@@ -391,6 +397,7 @@
- 
-     .box-tocart {
-         &:extend(.abs-box-tocart all);
-+        
-         .field.qty {
-         }
- 
-@@ -534,6 +541,15 @@
-             }
-         }
- 
-+        .block-compare {
-+            .action {
-+                &.delete {
-+                    &:extend(.abs-remove-button-for-blocks all);
-+                    right: initial;
-+                }
-+            }
-+        }
-+
-         .action.tocart {
-             border-radius: 0;
-         }
-@@ -563,6 +579,7 @@
- 
-         .product-items-names {
-             .product-item {
-+                display: flex;
-                 margin-bottom: @indent__s;
-             }
- 
-@@ -975,6 +992,15 @@
-     [class*='block-compare'] {
-         display: none;
-     }
-+    .catalog-product_compare-index {
-+        .columns {
-+            .column {
-+                &.main {
-+                    flex-basis: inherit;
-+                }
-+            }
-+        }
-+    }
- }
- 
- //
-diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
-index d0382d34d39..92945d61e43 100644
---- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
-+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
-@@ -18,7 +18,7 @@
- @product-name-link__text-decoration__visited: @link__hover__text-decoration;
- 
- @product-item__hover__background-color: @color-white;
--@product-item__hover__box-shadow: 3px 3px 4px 0 rgba(0, 0, 0, .3);
-+@product-item__hover__box-shadow: 3px 4px 4px 0 rgba(0, 0, 0, .3);
- 
- @product-price__muted__color: @color-gray40;
- 
-@@ -34,15 +34,22 @@
- 
-     .product {
-         &-items {
-+            .lib-inline-block-space-container();
-             &:extend(.abs-reset-list all);
-         }
- 
-         &-item {
-+            .lib-inline-block-space-item();
-             vertical-align: top;
- 
-             .products-grid & {
-                 display: inline-block;
--                width: 100%/2;
-+                margin-left: 2%;
-+                width: calc(~'(100% - 2%)/2');
-+            }
-+
-+            &:nth-child(2n + 1) {
-+                margin-left: 0;
-             }
- 
-             &:extend(.abs-add-box-sizing all);
-@@ -68,9 +75,17 @@
-             }
- 
-             &-actions {
--                display: none;
-+                font-size: 0;
-+
-+                > * {
-+                    font-size: 1.4rem;
-+                }
- 
-                 .actions-secondary {
-+                    display: inline-block;
-+                    font-size: 1.4rem;
-+                    vertical-align: middle;
-+
-                     > button.action {
-                         .lib-button-reset();
-                     }
-@@ -80,12 +95,20 @@
-                         &:before {
-                             margin: 0;
-                         }
-+                        line-height: 35px;
-+                        text-align: center;
-+                        width: 35px;
- 
-                         span {
-                             &:extend(.abs-visually-hidden all);
-                         }
-                     }
-                 }
-+
-+                .actions-primary {
-+                    display: inline-block;
-+                    vertical-align: middle;
-+                }
-             }
- 
-             &-description {
-@@ -100,7 +123,6 @@
-                 .reviews-actions {
-                     font-size: @font-size__s;
-                     margin-top: 5px;
--                    text-transform: lowercase;
-                 }
-             }
- 
-@@ -292,7 +314,7 @@
-             border: 1px solid @color-gray-light2;
-             border-top: none;
-             left: 0;
--            margin: 9px 0 0 -1px;
-+            margin: 10px 0 0 -1px;
-             padding: 0 9px 9px;
-             position: absolute;
-             right: -1px;
-@@ -308,13 +330,13 @@
-         }
- 
-         .actions-primary + .actions-secondary {
--            display: table-cell;
--            padding-left: 10px;
-+            display: inline-block;
-             vertical-align: middle;
--            width: 50%;
- 
-             > .action {
--                margin-right: 10px;
-+                line-height: 35px;
-+                text-align: center;
-+                width: 35px;
- 
-                 &:last-child {
-                     margin-right: 0;
-@@ -323,7 +345,7 @@
-         }
- 
-         .actions-primary {
--            display: table-cell;
-+            display: inline-block;
-         }
-     }
- 
-@@ -375,10 +397,24 @@
-     .page-products.page-layout-3columns {
-         .products-grid {
-             .product-item {
--                width: 100%/3;
-+                margin-left: 0;
-+                width: calc(~'(100% - 4%) / 3');
-+
-+                &:nth-child(3n + 1) {
-+                    margin-left: 0;
-+                }
-             }
-         }
-     }
-+
-+    .block.widget .products-grid .product-item,
-+    .page-layout-1column .block.widget .products-grid .product-item,
-+    .page-layout-3columns .block.widget .products-grid .product-item {
-+        .product-item-inner {
-+            box-shadow: 3px 6px 4px 0 rgba(0, 0, 0, .3);
-+            margin: 9px 0 0 -1px;
-+        }
-+    }
- }
- 
- //
-@@ -389,7 +425,12 @@
-     .page-products {
-         .products-grid {
-             .product-item {
--                width: 100%/3;
-+                margin-left: 2%;
-+                width: calc(~'(100% - 4%) / 3');
-+
-+                &:nth-child(3n + 1) {
-+                    margin-left: 0;
-+                }
-             }
-         }
-     }
-@@ -442,9 +483,13 @@
-             }
- 
-             .product-item {
--                margin-left: calc(~'(100% - 4 * 24.439%) / 3');
-+                margin-left: 2%;
-                 padding: 5px;
--                width: 24.439%;
-+                width: calc(~'(100% - 6%)/4');
-+
-+                &:nth-child(3n + 1) {
-+                    margin-left: 2%;
-+                }
- 
-                 &:nth-child(4n + 1) {
-                     margin-left: 0;
-diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less
-index 0997b973912..b587c169f67 100644
---- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less
-+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less
-@@ -38,7 +38,10 @@
-             .lib-css(box-shadow, @button__shadow);
-             border-radius: 3px;
-         }
--
-+        .sorter-action {
-+            position: relative;
-+            top: -2px;
-+        }
-         &-amount {
-             left: 0;
-             line-height: @toolbar-mode-icon-font-size + 2;
-@@ -81,7 +84,7 @@
- 
-         .page-products & {
-             position: absolute;
--            right: @indent__s;
-+            right: 0;
-             top: 0;
-             z-index: 1;
-         }
-diff --git a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
-index f785dd74d90..31859a46d3e 100644
---- a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
-@@ -18,6 +18,20 @@
- //  _____________________________________________
- 
- & when (@media-common = true) {
-+    
-+    .search {
-+        .fieldset {
-+            .control {
-+                .addon {
-+                    input {
-+                        flex-basis: auto;
-+                        width: 100%;
-+                    }
-+                }
-+            }
-+        }
-+    }
-+    
-     .block-search {
-         margin-bottom: 0;
- 
-@@ -199,7 +213,7 @@
- //  Mobile
- //  _____________________________________________
- 
--.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
-+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-     .block-search {
-         margin-top: @indent__s;
-     }
-diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
-index 9e3a28be4c9..460a961830b 100644
---- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
-+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
-@@ -97,6 +97,7 @@
-                 .field {
-                     .radio {
-                         float: left;
-+                        margin-top: 4px;
-                     }
- 
-                     .radio {
-@@ -145,12 +146,6 @@
-         }
- 
-         &:extend(.abs-adjustment-incl-excl-tax all);
--
--        .action {
--            &.multicheckout {
--                color: @color-blue2;
--            }
--        }
-     }
- 
-     //  Totals block
-@@ -215,7 +210,7 @@
-                         height: 36px;
-                         margin-top: -7px;
-                         text-align: center;
--                        width: 45px;
-+                        width: 60px;
-                     }
-                 }
- 
-@@ -497,6 +492,17 @@
-             }
-         }
-     }
-+
-+    .cart.table-wrapper,
-+    .order-items.table-wrapper {
-+        .col.price,
-+        .col.qty,
-+        .col.subtotal,
-+        .col.msrp {
-+            text-align: left;
-+        }
-+    }
-+
- }
- 
- //
-@@ -521,6 +527,18 @@
- //  Desktop
- //  _____________________________________________
- 
-+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
-+    .cart-container {
-+        .block.crosssell {
-+            .products-grid {
-+                .product-item-actions {
-+                    margin: 0 0 @indent__s;
-+                }
-+            }
-+        }
-+    }
-+}
-+
- .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-     .checkout-cart-index {
-         .page-main {
-@@ -626,12 +644,9 @@
-                     width: 1%;
-                 }
- 
--                &-item-details {
--                    padding-bottom: 35px;
--                }
--
-                 &-item-details {
-                     display: table-cell;
-+                    padding-bottom: 35px;
-                     vertical-align: top;
-                     white-space: normal;
-                     width: 99%;
-@@ -697,6 +712,9 @@
-                     position: static;
-                 }
-             }
-+            &.discount {
-+                width: auto;
-+            }
-         }
-     }
- 
-diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
-index 03e4bfff3ba..af94dd7b97b 100644
---- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
-+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
-@@ -63,6 +63,13 @@
-             }
-         }
- 
-+        dl {
-+            &.product.options.list {
-+                display: inline-block;
-+                vertical-align: top;
-+            }
-+        }
-+
-         .text {
-             &.empty {
-                 text-align: center;
-@@ -107,23 +114,23 @@
- 
-     .minicart-wrapper {
-         .lib-dropdown(
--        @_toggle-selector: ~'.action.showcart',
--        @_options-selector: ~'.block-minicart',
--        @_dropdown-list-width: 320px,
--        @_dropdown-list-position-right: 0px,
--        @_dropdown-list-pointer-position: right,
--        @_dropdown-list-pointer-position-left-right: 26px,
--        @_dropdown-list-z-index: 101,              
--        @_dropdown-toggle-icon-content: @icon-cart,
--        @_dropdown-toggle-active-icon-content: @icon-cart,
--        @_dropdown-list-item-padding: false,
--        @_dropdown-list-item-hover: false,
--        @_icon-font-position: before,
--        @_icon-font-size: 22px,
--        @_icon-font-line-height: 28px,
--        @_icon-font-color: @minicart-icons-color,
--        @_icon-font-color-hover: @minicart-icons-color-hover,
--        @_icon-font-color-active: @minicart-icons-color
-+            @_toggle-selector: ~'.action.showcart',
-+            @_options-selector: ~'.block-minicart',
-+            @_dropdown-list-width: 320px,
-+            @_dropdown-list-position-right: -10px,
-+            @_dropdown-list-pointer-position: right,
-+            @_dropdown-list-pointer-position-left-right: 12px,
-+            @_dropdown-list-z-index: 101,              
-+            @_dropdown-toggle-icon-content: @icon-cart,
-+            @_dropdown-toggle-active-icon-content: @icon-cart,
-+            @_dropdown-list-item-padding: false,
-+            @_dropdown-list-item-hover: false,
-+            @_icon-font-position: before,
-+            @_icon-font-size: 22px,
-+            @_icon-font-line-height: 28px,
-+            @_icon-font-color: @minicart-icons-color,
-+            @_icon-font-color-hover: @minicart-icons-color-hover,
-+            @_icon-font-color-active: @minicart-icons-color
-         );
-         float: right;
- 
-@@ -153,17 +160,17 @@
- 
-         .action {
-             &.close {
--                height: 40px;
-+                height: 30px;
-                 position: absolute;
-                 right: 0;
-                 top: 0;
--                width: 40px;
-+                width: 25px;
-                 .lib-button-reset();
-                 .lib-button-icon(
-                     @icon-remove,
-                     @_icon-font-color: @minicart-icons-color,
--                    @_icon-font-size: 16px,
--                    @_icon-font-line-height: 16px,
-+                    @_icon-font-size: 14px,
-+                    @_icon-font-line-height: 14px,
-                     @_icon-font-text-hide: true
-                 );
-             }
-@@ -226,6 +233,7 @@
- 
-     .minicart-items {
-         .lib-list-reset-styles();
-+        
-         .product-item {
-             padding: @indent__base 0;
- 
-@@ -287,6 +295,15 @@
-             .details-qty {
-                 margin-top: @indent__s;
-             }
-+
-+            .product {
-+                .options {
-+                    &.list {
-+                        &:extend(.abs-product-options-list all);
-+                        &:extend(.abs-add-clearfix all);
-+                    }
-+                }
-+            }
-         }
- 
-         .product {
-@@ -297,13 +314,14 @@
- 
-             .toggle {
-                 &:extend(.abs-toggling-title all);
-+                border: 0;
-+                padding: 0 @indent__xl @indent__xs 0;
-+                
-                 &:after {
-                     .lib-css(color, @color-gray56);
-                     margin: 0 0 0 @indent__xs;
-                     position: static;
-                 }
--                border: 0;
--                padding: 0 @indent__xl @indent__xs 0;
-             }
- 
-             .active {
-@@ -323,14 +341,15 @@
-                 .toggle {
-                     &.tooltip {
-                         .lib-icon-font(
--                        @icon-down,
--                        @_icon-font-size: 12px,
--                        @_icon-font-line-height: 12px,
--                        @_icon-font-text-hide: true,
--                        @_icon-font-margin: -3px 0 0 7px,
--                        @_icon-font-position: after
-+                            @icon-down,
-+                            @_icon-font-size: 12px,
-+                            @_icon-font-line-height: 12px,
-+                            @_icon-font-text-hide: true,
-+                            @_icon-font-margin: -3px 0 0 7px,
-+                            @_icon-font-position: after
-                         );
-                     }
-+                    
-                     > span {
-                         &:extend(.abs-visually-hidden-reset all);
-                     }
-@@ -352,7 +371,7 @@
-         .item-qty {
-             margin-right: @indent__s;
-             text-align: center;
--            width: 40px;
-+            width: 60px;
-         }
- 
-         .update-cart-item {
-@@ -368,19 +387,19 @@
-             &.edit,
-             &.delete {
-                 .lib-icon-font(
--                @icon-edit,
--                @_icon-font-size: 18px,
--                @_icon-font-line-height: 20px,
--                @_icon-font-text-hide: true,
--                @_icon-font-color: @minicart-icons-color,
--                @_icon-font-color-hover: @primary__color,
--                @_icon-font-color-active: @minicart-icons-color
-+                    @icon-edit,
-+                    @_icon-font-size: 18px,
-+                    @_icon-font-line-height: 20px,
-+                    @_icon-font-text-hide: true,
-+                    @_icon-font-color: @minicart-icons-color,
-+                    @_icon-font-color-hover: @primary__color,
-+                    @_icon-font-color-active: @minicart-icons-color
-                 );
-             }
- 
-             &.delete {
-                 .lib-icon-font-symbol(
--                @_icon-font-content: @icon-trash
-+                    @_icon-font-content: @icon-trash
-                 );
-             }
-         }
-@@ -397,7 +416,7 @@
-     }
- }
- 
--.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
-+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-     .minicart-wrapper {
-         margin-top: @indent__s;
-     }
-@@ -412,7 +431,6 @@
-         margin-left: 13px;
- 
-         .block-minicart {
--            right: -15px;
-             width: 390px;
-         }
-     }
-diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
-index 0df0cace338..a2daf0da247 100644
---- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
-+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
-@@ -7,6 +7,8 @@
- //  Variables
- //  _____________________________________________
- 
-+@import 'fields/_file-uploader.less';
-+
- @checkout-wrapper__margin: @indent__base;
- @checkout-wrapper__columns: 16;
- 
-@@ -48,6 +50,7 @@
-         .step-title {
-             &:extend(.abs-checkout-title all);
-             .lib-css(border-bottom, @checkout-step-title__border);
-+            margin-bottom: 15px;
-         }
- 
-         .step-content {
-@@ -73,6 +76,36 @@
-             display: none;
-         }
-     }
-+
-+    .abs-discount-code {
-+        .actions-toolbar {
-+            display: table-cell;
-+            vertical-align: top;
-+            width: 1%;
-+
-+            .primary { 
-+                float: left;
-+                .action {   
-+                    &:extend(.abs-revert-to-action-secondary all);
-+                    border-bottom-left-radius: 0;
-+                    border-top-left-radius: 0;
-+                    margin: 0 0 0 -2px; 
-+                    white-space: nowrap;
-+                    width: auto; 
-+                }
-+            }
-+        }
-+        .form-discount {   
-+            display: table;
-+            width: 100%;
-+            
-+            > .field {
-+                > .label {
-+                    display: none; 
-+                }
-+            }
-+        }
-+    }
- }
- 
- //
-diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
-index 5ecc4d4713b..920e68994c6 100644
---- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
-+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
-@@ -118,6 +118,10 @@
- 
-             .product {
-                 position: relative;
-+                .item-options {
-+                    &:extend(.abs-product-options-list all);
-+                    &:extend(.abs-add-clearfix all);
-+                }
-             }
-         }
- 
-@@ -137,6 +141,10 @@
-         }
- 
-         .product-item {
-+            .product-item-details {
-+                &:extend(.abs-add-clearfix all);
-+            }
-+
-             .product-item-inner {
-                 display: table;
-                 margin: 0 0 @indent__s;
-@@ -144,14 +152,14 @@
-             }
- 
-             .product-item-name-block {
--                display: table-cell;
-+                display: block;
-                 padding-right: @indent__xs;
-                 text-align: left;
-             }
- 
-             .subtotal {
--                display: table-cell;
--                text-align: right;
-+                display: block;
-+                text-align: left;
-             }
- 
-             .price {
-@@ -166,6 +174,10 @@
-                     }
-                 }
-             }
-+
-+            .message {
-+                margin-top: 10px;
-+            }
-         }
- 
-         .actions-toolbar {
-@@ -219,3 +231,27 @@
-         }
-     }
- }
-+
-+//
-+//  Tablet
-+//  _____________________________________________
-+
-+@media only screen and (max-width: @screen__m) {
-+    .opc-block-summary {
-+        .product-item {
-+            .product-item-inner {
-+                display: block;
-+            }
-+
-+            .product-item-name-block {
-+                display: block;
-+                text-align: left;
-+            }
-+
-+            .subtotal {
-+                display: block;
-+                text-align: left;
-+            }
-+        }
-+    }
-+}
-diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
-index 0b27454b206..8490deb8a38 100644
---- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
-+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
-@@ -69,6 +69,17 @@
- 
-         .payment-option-content {
-             .lib-css(padding, 0 0 @indent__base @checkout-payment-option-content__padding__xl);
-+
-+            &:extend(.abs-discount-code all);
-+          
-+            .primary {
-+                .action {
-+                    &.action-apply {
-+                        margin-right: 0;
-+                    }
-+                }
-+            }
-+
-         }
- 
-         .payment-option-inner {
-@@ -136,6 +147,7 @@
-                 }
-             }
- 
-+            .captcha,
-             .number {
-                 .input-text {
-                     width: 225px;
-diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
-index dd9db0e7153..eb9c0690536 100644
---- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
-+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
-@@ -63,10 +63,13 @@
-                     }
-                 }
-             }
--            
-+            /**
-+             * @codingStandardsIgnoreStart
-+             */
-             #po_number {
-                 margin-bottom: 20px;
-             }
-+            //  @codingStandardsIgnoreEnd
-         }
- 
-         .payment-method-title {
-@@ -116,7 +119,8 @@
-             margin: 0 0 @indent__base;
- 
-             .primary {
--                .action-update {
-+                .action-update {                    
-+                    margin-bottom: 20px;
-                     margin-right: 0;
-                 }
-             }
-diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
-index e2378eeeef0..ad1ac36237c 100644
---- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
-+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
-@@ -18,7 +18,7 @@
- @checkout-progress-bar-item__transition: background .3s;
- @checkout-progress-bar-item__width: 185px;
- 
--@checkout-progress-bar-item__active__background-color: @color-orange-red1;
-+@checkout-progress-bar-item__active__background-color: @active__color;
- @checkout-progress-bar-item__active__color: @primary__color;
- @checkout-progress-bar-item__active__font-weight: @font-weight__semibold;
- @checkout-progress-bar-item__complete__color: @link__color;
-@@ -32,7 +32,7 @@
- @checkout-progress-bar-item-element-inner__color: @primary__color;
- @checkout-progress-bar-item-element-inner__height: @checkout-progress-bar-item-element-inner__width;
- @checkout-progress-bar-item-element-inner__width: @checkout-progress-bar-item-element__width - ( @checkout-progress-bar-item-element-outer-radius__width*2 );
--@checkout-progress-bar-item-element-inner__active__border-color: @color-orange-red1;
-+@checkout-progress-bar-item-element-inner__active__border-color: @active__color;
- @checkout-progress-bar-item-element-inner__active__content: @icon-checkmark;
- 
- @checkout-progress-bar-item-element-outer-radius__width: 6px;
-diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less
-index d0ce87beb6a..d0edf245dc5 100644
---- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less
-+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less
-@@ -22,7 +22,7 @@
- @checkout-shipping-item__width: 100%/3;
- @checkout-shipping-item-tablet__width: 100%/2;
- @checkout-shipping-item-mobile__width: 100%;
--@checkout-shipping-item__active__border-color: @color-orange-red1;
-+@checkout-shipping-item__active__border-color: @active__color;
- 
- @checkout-shipping-item-icon__selected__height: 27px;
- @checkout-shipping-item-icon__selected__width: 29px;
-diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
-new file mode 100644
-index 00000000000..7b06186ef9a
---- /dev/null
-+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
-@@ -0,0 +1,450 @@
-+// /**
-+//  * Copyright © Magento, Inc. All rights reserved.
-+//  * See COPYING.txt for license details.
-+//  */
-+
-+//
-+//  Components -> Single File Uploader
-+//  _____________________________________________
-+
-+//
-+//  Variables
-+//  ---------------------------------------------
-+
-+@icon-delete__content: '\e604';
-+@icon-file__content: '\e626';
-+
-+
-+@file-uploader-preview__border-color: @color-lighter-grayish;
-+@file-uploader-preview__background-color: @color-white;
-+@file-uploader-preview-focus__color: @color-blue2;
-+
-+@file-uploader-document-icon__color: @color-gray80;
-+@file-uploader-document-icon__size: 7rem;
-+@file-uploader-document-icon__z-index: @data-grid-file-uploader-image__z-index + 1;
-+
-+@file-uploader-video-icon__color: @color-gray80;
-+@file-uploader-video-icon__size: 4rem;
-+@file-uploader-video-icon__z-index: @data-grid-file-uploader-image__z-index + 1;
-+
-+@file-uploader-placeholder-icon__color: @color-gray80;
-+@file-uploader-placeholder-icon__z-index: @data-grid-file-uploader-image__z-index + 1;
-+
-+@file-uploader-delete-icon__color: @color-brownie;
-+@file-uploader-delete-icon__hover__color: @color-brownie-vanilla;
-+@file-uploader-delete-icon__font-size: 1.6rem;
-+
-+@file-uploader-muted-text__color: @color-gray62;
-+
-+@file-uploader-preview__width: 150px;
-+@file-uploader-preview__height: @file-uploader-preview__width;
-+@file-uploader-preview__opacity: .7;
-+
-+@file-uploader-spinner-dimensions: 15px;
-+
-+@file-uploader-dragover__background: @color-gray83;
-+@file-uploader-dragover-focus__color: @color-blue2;
-+
-+//  Grid uploader
-+
-+@data-grid-file-uploader-image__size: 5rem;
-+@data-grid-file-uploader-image__z-index: 1;
-+
-+@data-grid-file-uploader-menu-button__width: 2rem;
-+
-+@data-grid-file-uploader-upload-icon__color: @color-darkie-gray;
-+@data-grid-file-uploader-upload-icon__hover__color: @color-very-dark-gray;
-+@data-grid-file-uploader-upload-icon__line-height: 48px;
-+
-+@data-grid-file-uploader-wrapper__size: @data-grid-file-uploader-image__size + 2rem;
-+
-+//
-+//  Single file uploader
-+//  ---------------------------------------------
-+
-+.file-uploader-area {
-+    position: relative;
-+
-+    input[type='file'] {
-+        cursor: pointer;
-+        opacity: 0;
-+        overflow: hidden;
-+        position: absolute;
-+        visibility: hidden;
-+        width: 0;
-+
-+        &:focus {
-+            + .file-uploader-button {
-+                box-shadow: 0 0 0 1px @file-uploader-preview-focus__color;
-+            }
-+        }
-+
-+        &:disabled {
-+            + .file-uploader-button {
-+                cursor: default;
-+                opacity: .5;
-+                pointer-events: none;
-+            }
-+        }
-+    }
-+}
-+
-+.file-uploader-summary {
-+    display: inline-block;
-+    vertical-align: top;
-+}
-+
-+.file-uploader-button {
-+    background: @color-gray-darken0;
-+    border: 1px solid @color-gray_light;
-+    box-sizing: border-box;
-+    color: @color-black_dark;
-+    cursor: pointer;
-+    display: inline-block;
-+    font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-+    font-size: 1.4rem;
-+    font-weight: 600;
-+    line-height: 1.6rem;
-+    margin: 0;
-+    padding: 7px 15px;
-+    vertical-align: middle;
-+
-+    &._is-dragover {
-+        background: @file-uploader-dragover__background;
-+        border: 1px solid @file-uploader-preview-focus__color;
-+    }
-+}
-+
-+.file-uploader-spinner {
-+    background-image: url('@{baseDir}images/loader-1.gif');
-+    background-position: 50%;
-+    background-repeat: no-repeat;
-+    background-size: @file-uploader-spinner-dimensions;
-+    display: none;
-+    height: 30px;
-+    margin-left: @indent__s;
-+    vertical-align: top;
-+    width: @file-uploader-spinner-dimensions;
-+}
-+
-+.file-uploader-preview {
-+    .action-remove {
-+        &:extend(.abs-action-reset all);
-+        .lib-icon-font (
-+                @icon-delete__content,
-+            @_icon-font: @icons__font-name,
-+            @_icon-font-size: @file-uploader-delete-icon__font-size,
-+            @_icon-font-color: @file-uploader-delete-icon__color,
-+            @_icon-font-color-hover: @file-uploader-delete-icon__hover__color,
-+            @_icon-font-text-hide: true,
-+            @_icon-font-display: block
-+        );
-+        bottom: 4px;
-+        cursor: pointer;
-+        display: block;
-+        height: 27px;
-+        left: 6px;
-+        padding: 2px;
-+        position: absolute;
-+        text-decoration: none;
-+        width: 25px;
-+        z-index: 2;
-+    }
-+
-+    &:hover {
-+        .preview-image img,
-+        .preview-link:before {
-+            opacity: @file-uploader-preview__opacity;
-+        }
-+    }
-+
-+    .preview-link {
-+        display: block;
-+        height: 100%;
-+    }
-+
-+    .preview-image img {
-+        bottom: 0;
-+        left: 0;
-+        margin: auto;
-+        max-height: 100%;
-+        max-width: 100%;
-+        position: absolute;
-+        right: 0;
-+        top: 0;
-+        z-index: 1;
-+    }
-+
-+    .preview-video {
-+        .lib-icon-font(
-+                @icon-file__content,
-+            @_icon-font: @icons__font-name,
-+            @_icon-font-size: @file-uploader-video-icon__size,
-+            @_icon-font-color: @file-uploader-video-icon__color,
-+            @_icon-font-color-hover: @file-uploader-video-icon__color
-+        );
-+
-+        &:before {
-+            left: 0;
-+            margin-top: -@file-uploader-video-icon__size / 2;
-+            position: absolute;
-+            right: 0;
-+            top: 50%;
-+            z-index: @file-uploader-video-icon__z-index;
-+        }
-+    }
-+
-+    .preview-document {
-+        .lib-icon-font(
-+                @icon-file__content,
-+            @_icon-font: @icons__font-name,
-+            @_icon-font-size: @file-uploader-document-icon__size,
-+            @_icon-font-color: @file-uploader-document-icon__color,
-+            @_icon-font-color-hover: @file-uploader-document-icon__color
-+        );
-+
-+        &:before {
-+            left: 0;
-+            margin-top: -@file-uploader-document-icon__size / 2;
-+            position: absolute;
-+            right: 0;
-+            top: 50%;
-+            z-index: @file-uploader-document-icon__z-index;
-+        }
-+    }
-+}
-+
-+.file-uploader-preview,
-+.file-uploader-placeholder {
-+    background: @file-uploader-preview__background-color;
-+    border: 1px solid @file-uploader-preview__border-color;
-+    box-sizing: border-box;
-+    cursor: pointer;
-+    display: block;
-+    height: @file-uploader-preview__height;
-+    line-height: 1;
-+    margin: @indent__s @indent__m @indent__s 0;
-+    overflow: hidden;
-+    position: relative;
-+    width: @file-uploader-preview__width;
-+}
-+
-+.file-uploader {
-+    &._loading {
-+        .file-uploader-spinner {
-+            display: inline-block;
-+        }
-+    }
-+
-+    .admin__field-note,
-+    .admin__field-error {
-+        margin-bottom: @indent__s;
-+    }
-+
-+    .file-uploader-filename {
-+        .lib-text-overflow();
-+        max-width: @file-uploader-preview__width;
-+        word-break: break-all;
-+
-+        &:first-child {
-+            margin-bottom: @indent__s;
-+        }
-+    }
-+
-+    .file-uploader-meta {
-+        color: @file-uploader-muted-text__color;
-+    }
-+
-+    .admin__field-fallback-reset {
-+        margin-left: @indent__s;
-+    }
-+
-+    ._keyfocus & .action-remove {
-+        &:focus {
-+            box-shadow: 0 0 0 1px @file-uploader-preview-focus__color;
-+        }
-+    }
-+}
-+
-+//  Placeholder for multiple uploader
-+.file-uploader-placeholder {
-+    &.placeholder-document {
-+        .lib-icon-font(
-+                @icon-file__content,
-+            @_icon-font: @icons__font-name,
-+            @_icon-font-size: 5rem,
-+            @_icon-font-color: @file-uploader-placeholder-icon__color,
-+            @_icon-font-color-hover: @file-uploader-placeholder-icon__color
-+        );
-+
-+        &:before {
-+            left: 0;
-+            position: absolute;
-+            right: 0;
-+            top: 20px;
-+            z-index: @file-uploader-placeholder-icon__z-index;
-+        }
-+    }
-+
-+    &.placeholder-image {
-+        .lib-icon-font(
-+                @icon-file__content,
-+            @_icon-font: @icons__font-name,
-+            @_icon-font-size: 5rem,
-+            @_icon-font-color: @file-uploader-placeholder-icon__color,
-+            @_icon-font-color-hover: @file-uploader-placeholder-icon__color
-+        );
-+
-+        &:before {
-+            left: 0;
-+            position: absolute;
-+            right: 0;
-+            top: 20px;
-+            z-index: @file-uploader-placeholder-icon__z-index;
-+        }
-+    }
-+
-+    &.placeholder-video {
-+        .lib-icon-font(
-+                @icon-file__content,
-+            @_icon-font: @icons__font-name,
-+            @_icon-font-size: 3rem,
-+            @_icon-font-color: @file-uploader-placeholder-icon__color,
-+            @_icon-font-color-hover: @file-uploader-placeholder-icon__color
-+        );
-+
-+        &:before {
-+            left: 0;
-+            position: absolute;
-+            right: 0;
-+            top: 30px;
-+            z-index: @file-uploader-placeholder-icon__z-index;
-+        }
-+    }
-+}
-+
-+.file-uploader-placeholder-text {
-+    bottom: 0;
-+    color: @color-blue-dodger;
-+    font-size: 1.1rem;
-+    left: 0;
-+    line-height: @line-height__base;
-+    margin-bottom: 15%;
-+    padding: 0 @indent__base;
-+    position: absolute;
-+    right: 0;
-+    text-align: center;
-+}
-+
-+//
-+//  Grid image uploader
-+//  ---------------------------------------------
-+
-+.data-grid-file-uploader {
-+    min-width: @data-grid-file-uploader-wrapper__size;
-+
-+    &._loading {
-+        .file-uploader-spinner {
-+            display: block;
-+        }
-+
-+        .file-uploader-button {
-+            &:before {
-+                display: none;
-+            }
-+        }
-+    }
-+
-+    .file-uploader-image {
-+        background: transparent;
-+        bottom: 0;
-+        left: 0;
-+        margin: auto;
-+        max-height: 100%;
-+        max-width: 100%;
-+        position: absolute;
-+        right: 0;
-+        top: 0;
-+        z-index: @data-grid-file-uploader-image__z-index;
-+
-+        + .file-uploader-area {
-+            .file-uploader-button {
-+                &:before {
-+                    display: none;
-+                }
-+            }
-+        }
-+    }
-+
-+    .file-uploader-area {
-+        z-index: @data-grid-file-uploader-image__z-index + 1;
-+    }
-+
-+    .file-uploader-spinner {
-+        height: 100%;
-+        margin: 0;
-+        position: absolute;
-+        top: 0;
-+        width: 100%;
-+    }
-+
-+    .file-uploader-button {
-+        display: block;
-+        height: @data-grid-file-uploader-upload-icon__line-height;
-+        text-align: center;
-+
-+        .lib-icon-font (
-+                @icon-file__content,
-+            @_icon-font: @icons__font-name,
-+            @_icon-font-size: 1.3rem,
-+            @_icon-font-line-height: @data-grid-file-uploader-upload-icon__line-height,
-+            @_icon-font-color: @data-grid-file-uploader-upload-icon__color,
-+            @_icon-font-color-hover: @data-grid-file-uploader-upload-icon__hover__color,
-+            @_icon-font-text-hide: true,
-+            @_icon-font-display: block
-+        );
-+    }
-+
-+    .action-select-wrap {
-+        float: left;
-+
-+        .action-select {
-+            border: 1px solid @file-uploader-preview__border-color;
-+            display: block;
-+            height: @data-grid-file-uploader-image__size;
-+            margin-left: -1px;
-+            padding: 0;
-+            width: @data-grid-file-uploader-menu-button__width;
-+
-+            &:after {
-+                border-color: @data-grid-file-uploader-upload-icon__color transparent transparent transparent;
-+                left: 50%;
-+                margin: 0 0 0 -5px;
-+            }
-+
-+            &:hover {
-+                &:after {
-+                    border-color: @data-grid-file-uploader-upload-icon__hover__color transparent transparent transparent;
-+                }
-+            }
-+
-+            > span {
-+                display: none;
-+            }
-+        }
-+
-+        .action-menu {
-+            left: 4rem;
-+            right: auto;
-+            z-index: @data-grid-file-uploader-image__z-index + 1;
-+        }
-+    }
-+}
-+
-+.data-grid-file-uploader-inner {
-+    border: 1px solid @file-uploader-preview__border-color;
-+    float: left;
-+    height: @data-grid-file-uploader-image__size;
-+    position: relative;
-+    width: @data-grid-file-uploader-image__size;
-+}
-diff --git a/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml b/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
-index 5ef5dcac113..21f22459e1a 100644
---- a/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
-+++ b/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
-@@ -7,52 +7,12 @@
- -->
- <page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <body>
--        <referenceContainer name="sidebar.main">
--            <block class="Magento\Framework\View\Element\Template" name="customer_account_navigation_block" template="Magento_Theme::html/collapsible.phtml" before="-">
--                <arguments>
--                    <argument name="block_title" translate="true" xsi:type="string">My Account</argument>
--                    <argument name="block_css" xsi:type="string">block-collapsible-nav</argument>
--                </arguments>
--                <block class="Magento\Customer\Block\Account\Navigation" name="customer_account_navigation" before="-">
--                    <arguments>
--                        <argument name="css_class" xsi:type="string">nav items</argument>
--                    </arguments>
--                    <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-link">
--                        <arguments>
--                            <argument name="label" xsi:type="string" translate="true">My Account</argument>
--                            <argument name="path" xsi:type="string">customer/account</argument>
--                            <argument name="sortOrder" xsi:type="number">250</argument>
--                        </arguments>
--                    </block>
--                    <block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-1"
--                           template="Magento_Customer::account/navigation-delimiter.phtml">
--                        <arguments>
--                            <argument name="sortOrder" xsi:type="number">200</argument>
--                        </arguments>
--                    </block>
--                    <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-address-link">
--                        <arguments>
--                            <argument name="label" xsi:type="string" translate="true">Address Book</argument>
--                            <argument name="path" xsi:type="string">customer/address</argument>
--                            <argument name="sortOrder" xsi:type="number">190</argument>
--                        </arguments>
--                    </block>
--                    <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-edit-link">
--                        <arguments>
--                            <argument name="label" xsi:type="string" translate="true">Account Information</argument>
--                            <argument name="path" xsi:type="string">customer/account/edit</argument>
--                            <argument name="sortOrder" xsi:type="number">180</argument>
--                        </arguments>
--                    </block>
--                    <block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-2"
--                           template="Magento_Customer::account/navigation-delimiter.phtml">
--                        <arguments>
--                            <argument name="sortOrder" xsi:type="number">130</argument>
--                        </arguments>
--                    </block>
--                </block>
--            </block>
--        </referenceContainer>
-+        <referenceBlock name="sidebar.main.account_nav">
-+            <arguments>
-+                <argument name="block_title" translate="true" xsi:type="string">My Account</argument>
-+                <argument name="block_css" xsi:type="string">block-collapsible-nav</argument>
-+            </arguments>
-+        </referenceBlock>
-         <move element="page.main.title" destination="content.top" before="-"/>
-     </body>
- </page>
-diff --git a/app/design/frontend/Magento/luma/Magento_Customer/layout/default.xml b/app/design/frontend/Magento/luma/Magento_Customer/layout/default.xml
-index 1f8c162ef92..4b08bf28ece 100644
---- a/app/design/frontend/Magento/luma/Magento_Customer/layout/default.xml
-+++ b/app/design/frontend/Magento/luma/Magento_Customer/layout/default.xml
-@@ -15,11 +15,6 @@
-                 </arguments>
-             </block>
-         </referenceBlock>
--        <block class="Magento\Theme\Block\Html\Header" name="header" as="header">
--            <arguments>
--                <argument name="show_part" xsi:type="string">welcome</argument>
--            </arguments>
--        </block>
-         <move element="header" destination="header.links" before="-"/>
-         <move element="register-link" destination="header.links"/>
-         <move element="top.links" destination="customer"/>
-diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
-index d7ae6c3b28f..6adf4b5b2f8 100755
---- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
-@@ -70,7 +70,7 @@
-     }
- 
-     .form-address-edit {
--        #region_id {
-+        .region_id {
-             display: none;
-         }
- 
-@@ -161,6 +161,7 @@
-         .table-wrapper {
-             .lib-css(margin-bottom, @indent__base);
-             border-bottom: 1px solid @account-table-border-bottom-color;
-+            overflow-x: auto;
- 
-             &:last-child {
-                 margin-bottom: 0;
-@@ -199,7 +200,7 @@
- 
-     //  Checkout address (create shipping address)
-     .field.street {
--        .field.additional {
-+        .field {
-             .label {
-                 &:extend(.abs-visually-hidden all);
-             }
-@@ -334,13 +335,17 @@
-         }
-     }
- 
--    .order-products-toolbar {
-+    .order-products-toolbar,
-+    .customer-addresses-toolbar {
-         position: relative;
- 
-         .toolbar-amount {
-             position: relative;
-             text-align: center;
-         }
-+        .pages {
-+            position: relative;
-+        }
-     }
- }
- 
-@@ -371,7 +376,7 @@
-         .fieldset {
-             > .field {
-                 > .control {
--                    width: 55%;
-+                    width: 80%;
-                 }
-             }
-         }
-@@ -402,7 +407,9 @@
-     .form.password.reset,
-     .form.send.confirmation,
-     .form.password.forget,
--    .form.create.account {
-+    .form.create.account,
-+    .form.search.advanced,
-+    .form.form-orders-search {
-         min-width: 600px;
-         width: 50%;
-     }
-@@ -417,6 +424,12 @@
-         .column.main {
-             width: 77.7%;
-         }
-+
-+        .sidebar-main {
-+            .block {
-+                margin-bottom: 0;
-+            }
-+        }
-     }
- 
-     .account {
-@@ -528,11 +541,18 @@
-         .column.main,
-         .sidebar-additional {
-             margin: 0;
-+            padding: 0;
-         }
- 
-         .data.table {
-             &:extend(.abs-table-striped-mobile all);
-         }
-+
-+        .sidebar-main {
-+            .account-nav {
-+                margin-bottom: 0;
-+            }
-+        }
-     }
- }
- 
-@@ -550,8 +570,8 @@
-     }
- 
-     .account {
--        .page.messages {
--            margin-bottom: @indent__xl;
-+        .messages {
-+            margin-bottom: 0;
-         }
- 
-         .column.main {
-@@ -589,4 +609,15 @@
-             position: relative;
-         }
-     }
-+
-+    .form.search.advanced {
-+        .field.price {
-+            .with-addon {
-+                .input-text {
-+                    flex-basis: auto;
-+                    width: 100%;
-+                }
-+            }
-+        }
-+    }
- }
-diff --git a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
-index 388ec32b4fc..ff377a4b88a 100644
---- a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
-@@ -12,7 +12,7 @@
- @gift-item-block__border-color: @color-gray-light5;
- @gift-item-block__border-width: @border-width__base;
- 
--@gift-item-block-title__color: @color-blue1;
-+@gift-item-block-title__color: @link__color;
- @gift-item-block-title-icon__content: @icon-down;
- @gift-item-block-title-icon__active__content: @icon-up;
- @gift-item-block-title-icon__color: @color-gray52;
-@@ -60,8 +60,8 @@
-     }
- 
-     .gift-summary {
--        position: relative;
-         margin-top: @indent__s;
-+        position: relative;
- 
-         .actions-toolbar {
-             > .secondary {
-@@ -246,6 +246,9 @@
-     .gift-messages-order {
-         margin-bottom: @indent__m;
-     }
-+    .gift-message-summary {
-+        padding-right: 7rem;
-+    }
- }
- 
- //
-@@ -282,10 +285,6 @@
-         }
-     }
- 
--    .gift-message-summary {
--        padding-right: 7rem;
--    }
--
-     //
-     //  In-table block
-     //  ---------------------------------------------
-diff --git a/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
-index 088372808aa..e9c40f63862 100644
---- a/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
-@@ -70,6 +70,10 @@
-                 clear: left;
-             }
-         }
-+
-+        .box-tocart {
-+            margin-top: @indent__s;
-+        }
-     }
- }
- 
-@@ -133,9 +137,18 @@
- }
- 
- .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
--    .table-wrapper.grouped {
--        .lib-css(margin-left, -@layout__width-xs-indent);
--        .lib-css(margin-right, -@layout__width-xs-indent);
-+    .product-add-form {
-+        .table-wrapper.grouped {
-+            .lib-css(margin-left, -@layout__width-xs-indent);
-+            .lib-css(margin-right, -@layout__width-xs-indent);
-+            .table.data.grouped {
-+                tr {
-+                    td {
-+                        padding: 5px 10px 5px 15px;
-+                    }
-+                }
-+            }
-+        }
-     }
- }
- 
-diff --git a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/state.phtml b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/state.phtml
-index 6e73b6706f1..7ebecb4c99f 100644
---- a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/state.phtml
-+++ b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/state.phtml
-@@ -20,30 +20,30 @@
-             role="heading"
-             aria-level="2"
-             data-role="title"
--            data-count="<?= count($_filters) ?>"><?= /* @escapeNotVerified */ __('Now Shopping by') ?></strong>
-+            data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $block->escapeHtml(__('Now Shopping by')) ?></strong>
-     <ol class="items">
-         <?php foreach ($_filters as $_filter): ?>
-             <li class="item">
-                 <span class="filter-label"><?= $block->escapeHtml(__($_filter->getName())) ?></span>
--                <span class="filter-value"><?= /* @escapeNotVerified */ $block->stripTags($_filter->getLabel()) ?></span>
-+                <span class="filter-value"><?= $block->escapeHtml($block->stripTags($_filter->getLabel())) ?></span>
-                 <?php
-                 $clearLinkUrl = $_filter->getClearLinkUrl();
--                $currentFilterName = $block->escapeHtml(__($_filter->getName())) . " " . $block->stripTags($_filter->getLabel());
-+                $currentFilterName = $block->escapeHtmlAttr(__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel()));
-                 if ($clearLinkUrl):
-                     ?>
--                    <a class="action previous" href="<?= /* @escapeNotVerified */ $_filter->getRemoveUrl() ?>"
--                       title="<?= /* @escapeNotVerified */ __('Previous') ?>">
--                        <span><?= /* @escapeNotVerified */ __('Previous') ?></span>
-+                    <a class="action previous" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
-+                       title="<?= $block->escapeHtmlAttr(__('Previous')) ?>">
-+                        <span><?= $block->escapeHtml(__('Previous')) ?></span>
-                     </a>
-                     <a class="action remove"
--                       title="<?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>"
--                       href="<?= /* @escapeNotVerified */ $clearLinkUrl ?>">
-+                       title="<?= $block->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
-+                       href="<?= $block->escapeUrl($clearLinkUrl) ?>">
-                         <span><?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
-                     </a>
-                 <?php else: ?>
--                    <a class="action remove" href="<?= /* @escapeNotVerified */ $_filter->getRemoveUrl() ?>"
--                       title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Remove')) . " " . $currentFilterName ?>">
--                        <span><?= /* @escapeNotVerified */ __('Remove This Item') ?></span>
-+                    <a class="action remove" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
-+                       title="<?= /* @noEscape */ $block->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
-+                        <span><?= $block->escapeHtml(__('Remove This Item')) ?></span>
-                     </a>
-                 <?php endif; ?>
-             </li>
-diff --git a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/view.phtml b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/view.phtml
-index 1f09aa7510e..9bdb2d42529 100644
---- a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/view.phtml
-+++ b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/view.phtml
-@@ -3,8 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
--// @codingStandardsIgnoreFile
- ?>
- <?php
- /**
-@@ -14,36 +12,61 @@
-  */
- ?>
- 
--<?php if ($block->canShowBlock()): ?>
--    <div class="block filter" id="layered-filter-block" data-mage-init='{"collapsible":{"openedState": "active", "collapsible": true, "active": false, "collateral": { "openedState": "filter-active", "element": "body" } }}'>
-+<?php if ($block->canShowBlock()) : ?>
-+    <div class="block filter" id="layered-filter-block" data-mage-init='
-+    {
-+        "collapsible":
-+        {
-+            "openedState": "active",
-+            "collapsible": true,
-+            "active": false,
-+            "collateral":
-+            {
-+                "openedState": "filter-active",
-+                "element": "body"
-+            }
-+        }
-+    }'>
-         <?php $filtered = count($block->getLayer()->getState()->getFilters()) ?>
--        <div class="block-title filter-title" data-count="<?= /* @escapeNotVerified */ $filtered ?>">
--            <strong data-role="title"><?= /* @escapeNotVerified */ __('Shop By') ?></strong>
-+        <div class="block-title filter-title" data-count="<?= /* @noEscape */ $filtered ?>">
-+            <strong data-role="title"><?= $block->escapeHtml(__('Shop By')); ?></strong>
-         </div>
-         <div class="block-content filter-content">
-             <?= $block->getChildHtml('state') ?>
- 
--            <?php if ($block->getLayer()->getState()->getFilters()): ?>
-+            <?php if ($block->getLayer()->getState()->getFilters()) : ?>
-                 <div class="block-actions filter-actions">
--                    <a href="<?= /* @escapeNotVerified */ $block->getClearUrl() ?>" class="action clear filter-clear"><span><?= /* @escapeNotVerified */ __('Clear All') ?></span></a>
-+                    <a href="<?= $block->escapeUrl($block->getClearUrl()) ?>" class="action clear filter-clear">
-+                        <span><?= $block->escapeHtml(__('Clear All')) ?></span>
-+                    </a>
-                 </div>
-             <?php endif; ?>
-             <?php $wrapOptions = false; ?>
--            <?php foreach ($block->getFilters() as $filter): ?>
--                <?php if ($filter->getItemsCount()): ?>
--                    <?php if (!$wrapOptions): ?>
--                        <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= /* @escapeNotVerified */ __('Shopping Options') ?></strong>
--                        <div class="filter-options" id="narrow-by-list" data-role="content" data-mage-init='{"accordion":{"openedState": "active", "collapsible": true, "active": false, "multipleCollapsible": false}}'>
--                    <?php  $wrapOptions = true; endif; ?>
-+            <?php foreach ($block->getFilters() as $filter) : ?>
-+                <?php if ($filter->getItemsCount()) : ?>
-+                    <?php if (!$wrapOptions) : ?>
-+                        <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= $block->escapeHtml(__('Shopping Options')) ?></strong>
-+                        <div class="filter-options" id="narrow-by-list" data-role="content" data-mage-init='
-+                        {
-+                            "accordion":
-+                            {
-+                                "openedState": "active",
-+                                "collapsible": true,
-+                                "active": false,
-+                                "multipleCollapsible": false
-+                            }
-+                        }'>
-+                        <?php $wrapOptions = true;
-+                        endif; ?>
-                     <div data-role="collapsible" class="filter-options-item">
--                        <div data-role="title" class="filter-options-title"><?= /* @escapeNotVerified */ __($filter->getName()) ?></div>
--                        <div data-role="content" class="filter-options-content"><?= /* @escapeNotVerified */ $block->getChildBlock('renderer')->render($filter) ?></div>
-+                        <div data-role="title" class="filter-options-title"><?= $block->escapeHtml(__($filter->getName())) ?></div>
-+                        <div data-role="content" class="filter-options-content"><?= /* @noEscape */ $block->getChildBlock('renderer')->render($filter) ?></div>
-                     </div>
-                 <?php endif; ?>
-             <?php endforeach; ?>
--            <?php if ($wrapOptions): ?>
-+            <?php if ($wrapOptions) : ?>
-                 </div>
--            <?php else: ?>
-+            <?php else : ?>
-                 <script>
-                     require([
-                         'jquery'
-diff --git a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less
-index 48461892fa6..423ccc07555 100644
---- a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less
-@@ -32,7 +32,7 @@
- 
-                 &[data-count]:after {
-                     .lib-css(color, @color-white);
--                    background: @color-orange-red1;
-+                    background: @theme__color__secondary;
-                     border-radius: 2px;
-                     content: attr(data-count);
-                     display: inline-block;
-@@ -364,10 +364,10 @@
-                 content: '';
-                 display: block;
-                 height: 40px;
--                left: -15px;
-+                left: 0;
-                 margin-top: -60px;
-                 position: relative;
--                width: 100px;
-+                width: 75px;
-                 z-index: 99;
-             }
-         }
-diff --git a/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less
-index 112184b45fe..475361c56af 100644
---- a/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less
-@@ -74,6 +74,10 @@
-         }
-     }
- 
-+    .map-fallback-price {
-+        display: none;
-+    }
-+
-     .map-old-price,
-     .product-item .map-old-price,
-     .product-info-price .map-show-info {
-diff --git a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
-index da284eab8f4..7ed4a9e64e9 100644
---- a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
-@@ -40,6 +40,18 @@
-             .items {
-                 padding: 6px 0;
-                 text-align: left;
-+                
-+                .item {
-+                    > span {
-+                        display: block;
-+                        padding: 5px 5px 5px 23px;
-+                    }
-+
-+                }
-+                
-+                li {
-+                    padding: 0;
-+                }
-             }
- 
-             > .action {
-@@ -105,6 +117,7 @@
-                     &.split,
-                     &.toggle {
-                         .lib-css(color, @link__color);
-+                        
-                         &:before {
-                             display: none;
-                         }
-@@ -125,6 +138,7 @@
- 
-         &.overlay {
-             .lib-window-overlay();
-+            
-             &.active {
-                 display: block;
-             }
-@@ -244,7 +258,7 @@
-         }
- 
-         .form-wishlist-search {
--            .lib-css(margin-bottom, @indent__l*2);
-+            margin-bottom: @indent__l * 2;
-             max-width: 500px;
- 
-             .fieldset {
-@@ -271,7 +285,7 @@
- 
-     .block-wishlist-info-items {
-         .block-title {
--            .lib-css(margin-bottom, @indent__base);
-+            margin-bottom: @indent__base;
-             .lib-font-size(22px);
- 
-             > strong {
-@@ -342,6 +356,7 @@
-             //  Select wish list
-             &-select {
-                 margin: 0 -@layout__width-xs-indent 20px;
-+                
-                 .wishlist-name {
-                     .lib-font-size(16);
-                     &:extend(.abs-toggling-title-mobile all);
-@@ -414,7 +429,7 @@
-         .product {
-             &-item {
-                 &-checkbox {
--                    left: 20px;
-+                    left: 0;
-                     position: absolute;
-                     top: 20px;
-                 }
-diff --git a/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
-index 7662c60734a..a94e2cae46b 100644
---- a/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
-@@ -48,7 +48,7 @@
-                     }
- 
-                     .error-block {
--                        color: @color-red10;
-+                        color: @error__color;
- 
-                         .error-label {
-                             font-weight: @font-weight__bold;
-@@ -230,7 +230,7 @@
-             }
- 
-             .error-description {
--                color: @color-red10;
-+                color: @error__color;
-                 font-weight: @font-weight__regular;
-                 margin-bottom: @indent__s;
-                 margin-top: -@indent__s;
-@@ -345,6 +345,22 @@
- 
-             .data.table {
-                 &:extend(.abs-checkout-order-review all);
-+                &.table-order-review {
-+                    > tbody {
-+                        > tr {
-+                            > td {
-+                                &.col {
-+                                    &.subtotal {
-+                                        border-bottom: none;
-+                                    }
-+                                    &.qty {
-+                                        text-align: center;
-+                                    }
-+                                }
-+                            }
-+                        }
-+                    }
-+                }
-             }
-         }
- 
-@@ -374,7 +390,7 @@
-                 text-align: right;
- 
-                 .action {
--                    margin-left: @indent__s;
-+                    margin-left: 0;
- 
-                     &.back {
-                         display: block;
-@@ -496,4 +512,12 @@
-             margin-left: @indent__xl;
-         }
-     }
-+    
-+    .multicheckout { 
-+        .actions-toolbar {
-+            > .primary {
-+                margin-right: 0;
-+            }
-+        }
-+    }
- }
-diff --git a/app/design/frontend/Magento/luma/Magento_Newsletter/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Newsletter/web/css/source/_module.less
-index 9ccd6c190ec..d7ee1319c9a 100644
---- a/app/design/frontend/Magento/luma/Magento_Newsletter/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_Newsletter/web/css/source/_module.less
-@@ -81,3 +81,24 @@
-         width: 34%;
-     }
- }
-+
-+//
-+//  Mobile
-+//  _____________________________________________
-+
-+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-+    .block {
-+        &.newsletter {
-+            input {
-+                font-size: 12px;
-+                padding-left: 30px;
-+            }
-+
-+            .field {
-+                .control:before {
-+                    font-size: 13px;
-+                }
-+            }
-+        }
-+    }
-+}
-diff --git a/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
-index da78406f922..4b5e03f8013 100644
---- a/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
-@@ -14,7 +14,6 @@
- //  _____________________________________________
- 
- & when (@media-common = true) {
--
-     .data.switch .counter {
-         .lib-css(color, @text__color__muted);
- 
-@@ -118,13 +117,13 @@
- 
-             strong {
-                 display: block;
--                font-weight: 600;
-+                font-weight: @font-weight__semibold;
-             }
-         }
- 
-         .fieldset &-field-ratings {
-             > .label {
--                font-weight: 600;
-+                font-weight: @font-weight__semibold;
-                 margin-bottom: @indent__s;
-                 padding: 0;
-             }
-@@ -140,11 +139,11 @@
- 
-         &-field-rating {
-             .label {
--                font-weight: 600;
-+                font-weight: @font-weight__semibold;
-             }
- 
-             .control {
--                margin-bottom: 1.2*@indent__xl;
-+                margin-bottom: 1.2 * @indent__xl;
-                 margin-top: @indent__s;
-             }
-         }
-@@ -181,7 +180,7 @@
-             display: inline;
- 
-             .review-details-value {
--                font-weight: 400;
-+                font-weight: @font-weight__regular;
-             }
-         }
- 
-@@ -298,6 +297,9 @@
-             a:not(:last-child) {
-                 margin-right: 30px;
-             }
-+            .action.add {
-+                white-space: nowrap;
-+            }
-         }
-     }
- 
-@@ -341,7 +343,7 @@
-     .block-reviews-dashboard {
-         .items {
-             .item {
--                .lib-css(margin-bottom, @indent__base);
-+                margin-bottom: @indent__base;
- 
-                 &:last-child {
-                     margin-bottom: 0;
-@@ -353,14 +355,15 @@
-             display: inline-block;
- 
-             &:not(:last-child) {
--                .lib-css(margin-bottom, @indent__xs);
-+                margin-bottom: @indent__xs;
-             }
-         }
- 
-         .rating-summary {
-             .label {
--                .lib-css(font-weight, @font-weight__semibold);
--                .lib-css(margin-right, @indent__s);
-+                font-weight: @font-weight__semibold;
-+                margin-right: @indent__s;
-+                vertical-align: middle;
-             }
-         }
-     }
-@@ -368,7 +371,7 @@
-     .table-reviews,
-     .block-reviews-dashboard {
-         .product-name {
--            .lib-css(font-weight, @font-weight__regular);
-+            font-weight: @font-weight__regular;
-         }
-     }
- 
-@@ -416,6 +419,7 @@
-         .product-details {
-             &:extend(.abs-add-clearfix all);
-             &:extend(.abs-margin-for-blocks-and-widgets all);
-+            
-             .rating-average-label {
-                 &:extend(.abs-visually-hidden all);
-             }
-@@ -436,9 +440,10 @@
-             }
- 
-             .customer-review-rating {
--                .lib-css(margin-bottom, @indent__base);
-+                margin-bottom: @indent__base;
-+                
-                 .item {
--                    .lib-css(margin-bottom, @indent__s);
-+                    margin-bottom: @indent__s;
- 
-                     &:last-child {
-                         margin-bottom: 0;
-@@ -450,13 +455,13 @@
- 
-             .review-title {
-                 .lib-heading(h3);
--                .lib-css(font-weight, @font-weight__semibold);
--                .lib-css(margin-bottom, @indent__base);
-+                font-weight: @font-weight__semibold;
-+                margin-bottom: @indent__base;
-             }
- 
-             .review-content {
-                 margin: 0;
--                .lib-css(margin-bottom, @indent__base);
-+                margin-bottom: @indent__base;
-             }
- 
-             .review-date {
-@@ -473,13 +478,13 @@
- .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
-     .customer-review {
-         .product-name {
--            .lib-css(margin-bottom, @indent__xs);
-+            margin-bottom: @indent__xs;
-         }
- 
-         .product-reviews-summary {
-             .rating-summary {
-                 display: block;
--                .lib-css(margin-bottom, @indent__xs);
-+                margin-bottom: @indent__xs;
-             }
-         }
-     }
-diff --git a/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
-index 7c96827c5f6..e8adcc2f0e4 100644
---- a/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
-@@ -40,6 +40,14 @@
-         &:extend(.abs-status all);
-     }
- 
-+    .table-wrapper.table-returns {
-+        .returns-details {
-+            &.hidden {
-+                display: none;
-+            }
-+        }
-+    }
-+
-     .block-returns-comments {
-         .returns-comments {
-             dt,
-diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html
-index a7b9b330ab9..269e46d7520 100644
---- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html
-+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html
-@@ -11,7 +11,7 @@
- "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
- "var order.getCustomerName()":"Customer Name",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status"
-+"var order.getFrontendStatusLabel()":"Order Status"
- } @-->
- {{template config_path="design/email/header_template"}}
- 
-@@ -24,7 +24,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
-             </p>
-diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
-index 36279eb2600..c8bdae7b08f 100644
---- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
-+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
-@@ -10,7 +10,7 @@
- "var creditmemo.increment_id":"Credit Memo Id",
- "var billing.getName()":"Guest Customer Name",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status"
-+"var order.getFrontendStatusLabel()":"Order Status"
- } @-->
- {{template config_path="design/email/header_template"}}
- 
-@@ -23,7 +23,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-             </p>
-             <p>
-diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html
-index a739c9f54b0..8ec54f1e64d 100644
---- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html
-+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html
-@@ -11,7 +11,7 @@
- "var comment":"Invoice Comment",
- "var invoice.increment_id":"Invoice Id",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status"
-+"var order.getFrontendStatusLabel()":"Order Status"
- } @-->
- {{template config_path="design/email/header_template"}}
- 
-@@ -24,7 +24,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
-             </p>
-diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
-index a56ee6da9fa..6028db7b977 100644
---- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
-+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
-@@ -10,7 +10,7 @@
- "var comment":"Invoice Comment",
- "var invoice.increment_id":"Invoice Id",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status"
-+"var order.getFrontendStatusLabel()":"Order Status"
- } @-->
- {{template config_path="design/email/header_template"}}
- 
-@@ -23,7 +23,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-             </p>
-             <p>
-diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html
-index 3e4bf8df2f1..fa16ac2196b 100644
---- a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html
-+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html
-@@ -10,7 +10,7 @@
- "var order.getCustomerName()":"Customer Name",
- "var comment":"Order Comment",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status"
-+"var order.getFrontendStatusLabel()":"Order Status"
- } @-->
- {{template config_path="design/email/header_template"}}
- 
-@@ -23,7 +23,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
-             </p>
-diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
-index 1075608db43..8ead615fe01 100644
---- a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
-+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
-@@ -9,7 +9,7 @@
- "var billing.getName()":"Guest Customer Name",
- "var comment":"Order Comment",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status"
-+"var order.getFrontendStatusLabel()":"Order Status"
- } @-->
- {{template config_path="design/email/header_template"}}
- 
-@@ -22,7 +22,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-             </p>
-             <p>
-diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
-index 8c4084fcaf4..e467aa843e2 100644
---- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
-+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
-@@ -51,7 +51,7 @@
-                 </tr>
-             </table>
-             {{/depend}}
--            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
-+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
-             <table class="order-details">
-                 <tr>
-                     <td class="address-details">
-diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
-index 68f1886986c..385110f8f03 100644
---- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
-+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
-@@ -49,7 +49,7 @@
-                 </tr>
-             </table>
-             {{/depend}}
--            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
-+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
-             <table class="order-details">
-                 <tr>
-                     <td class="address-details">
-diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html
-index 37bf92b866c..4f9b7286f3a 100644
---- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html
-+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html
-@@ -10,7 +10,7 @@
- "var order.getCustomerName()":"Customer Name",
- "var comment":"Order Comment",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status",
-+"var order.getFrontendStatusLabel()":"Order Status",
- "var shipment.increment_id":"Shipment Id"
- } @-->
- {{template config_path="design/email/header_template"}}
-@@ -24,7 +24,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
-             </p>
-diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
-index 95481994986..3ef26463ea7 100644
---- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
-+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
-@@ -9,7 +9,7 @@
- "var billing.getName()":"Guest Customer Name",
- "var comment":"Order Comment",
- "var order.increment_id":"Order Id",
--"var order.getStatusLabel()":"Order Status",
-+"var order.getFrontendStatusLabel()":"Order Status",
- "var shipment.increment_id":"Shipment Id"
- } @-->
- {{template config_path="design/email/header_template"}}
-@@ -23,7 +23,7 @@
-                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
- 
-                     increment_id=$order.increment_id
--                    order_status=$order.getStatusLabel()
-+                    order_status=$order.getFrontendStatusLabel()
-                 |raw}}
-             </p>
-             <p>
-diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less
-index 3f19d1020ba..31c128e07e3 100644
---- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less
-+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less
-@@ -76,8 +76,10 @@
- }
- 
- //  Remove address and phone number link color on iOS
--.address-details a {
--    &:extend(.no-link a);
-+.email-non-inline() {
-+    .address-details a {
-+        &:extend(.no-link a);
-+    }
- }
- 
- .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__xs) {
-diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
-index a0f734b05cb..cc6aba6f356 100644
---- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
-@@ -97,7 +97,7 @@
-                     }
- 
-                     &.options {
--                        padding: 0 0 15px;
-+                        padding: 10px 10px 15px;
-                     }
-                 }
- 
-@@ -343,16 +343,22 @@
-         }
- 
-         .product-item-name {
--            display: inline-block;
-+            float: left;
-+            width: calc(100% - 20px);
-+        }
-+        .product-item::after {
-+            clear: both;
-+            content: '';
-+            display: table;
-         }
--
-         .product-item {
-             .label {
-                 &:extend(.abs-visually-hidden all);
-             }
- 
-             .field.item {
--                display: inline-block;
-+                float: left;
-+                width: 20px;
-             }
-         }
-     }
-@@ -392,6 +398,17 @@
-         &.orders-recent {
-             &:extend(.abs-account-table-margin-mobile all);
-             &:extend(.abs-no-border-top all);
-+            .table-order-items {
-+                &.table {
-+                    tbody {
-+                        > tr {
-+                            > td.col {
-+                                padding-left: 0;
-+                            }
-+                        }
-+                    }
-+                }
-+            }
-         }
-     }
- 
-@@ -555,13 +572,13 @@
-             margin: 0 @tab-control__margin-right 0 0;
- 
-             a {
--                padding: @tab-control__padding-top @tab-control__padding-right;
-+                padding: @tab-control__padding-top @indent__base;
-             }
- 
-             strong {
-                 border-bottom: 0;
-                 margin-bottom: -1px;
--                padding: @tab-control__padding-top @tab-control__padding-right @tab-control__padding-bottom + 1 @tab-control__padding-left;
-+                padding: @tab-control__padding-top @indent__base @tab-control__padding-bottom + 1 @indent__base;
-             }
-         }
-     }
-@@ -612,10 +629,6 @@
-         padding: 25px;
- 
-         .col {
--            &.name {
--                padding-left: 0;
--            }
--
-             &.price {
-                 text-align: center;
-             }
-@@ -691,3 +704,19 @@
-         }
-     }
- }
-+
-+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) { 
-+    .order-links {
-+        .item {
-+            margin: 0 @tab-control__margin-right 0 0;
-+
-+            a {
-+                padding: @tab-control__padding-top @tab-control__padding-right;
-+            }
-+
-+            strong {
-+                padding: @tab-control__padding-top @tab-control__padding-right @tab-control__padding-bottom + 1 @tab-control__padding-left;
-+            }
-+        }
-+    }
-+}
-diff --git a/app/design/frontend/Magento/luma/Magento_SendFriend/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_SendFriend/web/css/source/_module.less
-index baf5468b184..3435736a54a 100644
---- a/app/design/frontend/Magento/luma/Magento_SendFriend/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_SendFriend/web/css/source/_module.less
-@@ -10,6 +10,14 @@
- & when (@media-common = true) {
-     .form.send.friend {
-         &:extend(.abs-add-fields all);
-+        
-+        .fieldset {
-+            .field {
-+                .control {
-+                    width: 100%;
-+                }  
-+            }
-+        } 
-     }
- 
-     .product-social-links .action.mailto.friend {
-@@ -44,3 +52,18 @@
-         }
-     }
- }
-+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { 
-+    .form.send.friend {
-+        .fieldset {
-+            padding-bottom: @indent__xs;
-+        } 
-+        
-+        .action {
-+            &.remove {
-+                margin-left: 0;
-+                right: 0;
-+                top: 100%;
-+            }
-+        }
-+    }
-+}
-diff --git a/app/design/frontend/Magento/luma/Magento_Theme/layout/default_head_blocks.xml b/app/design/frontend/Magento/luma/Magento_Theme/layout/default_head_blocks.xml
-index 2dfb1d3ee6b..e6021fd2750 100644
---- a/app/design/frontend/Magento/luma/Magento_Theme/layout/default_head_blocks.xml
-+++ b/app/design/frontend/Magento/luma/Magento_Theme/layout/default_head_blocks.xml
-@@ -7,6 +7,11 @@
- -->
- <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-     <head>
--        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no"/>
-+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
-+        <font src="fonts/opensans/light/opensans-300.woff2"/>
-+        <font src="fonts/opensans/regular/opensans-400.woff2"/>
-+        <font src="fonts/opensans/semibold/opensans-600.woff2"/>
-+        <font src="fonts/opensans/bold/opensans-700.woff2"/>
-+        <font src="fonts/Luma-Icons.woff2"/>
-     </head>
- </page>
-diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
-index af6cfa8605f..b841f2206e1 100644
---- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
-@@ -67,6 +67,24 @@
-         .lib-css(background-color, @page__background-color);
-     }
- 
-+    .page-wrapper {
-+        .lib-vendor-prefix-display(flex);
-+        .lib-vendor-prefix-flex-direction(column);
-+        min-height: 100vh; // Stretch content area for sticky footer
-+    }
-+
-+    .page-main {
-+        .lib-vendor-prefix-flex-grow(1);
-+    }
-+
-+    .page-main {
-+        > .page-title-wrapper {
-+            .page-title {
-+                hyphens: auto;
-+            }
-+        }
-+    }
-+
-     //
-     //  Header
-     //  ---------------------------------------------
-@@ -94,6 +112,10 @@
-                 font-size: @font-size__base;
-                 margin: 0 0 0 15px;
- 
-+                &.customer-welcome {
-+                    margin: 0 0 0 5px;
-+                }
-+
-                 > a {
-                     .lib-link(
-                     @_link-color: @header-panel__text-color,
-@@ -134,6 +156,12 @@
-         }
-     }
- 
-+    .page-print {
-+        .nav-toggle {
-+            display: none;
-+        }
-+    }
-+
-     .page-main {
-         > .page-title-wrapper {
-             .page-title + .action {
-@@ -302,11 +330,27 @@
-             }
-         }
-     }
-+    .page-header {
-+        .switcher {
-+            .options {
-+                ul.dropdown {
-+                    right: 0;
-+                    &:before {
-+                        left: auto;
-+                        right: 10px;
-+                    }
-+                    &:after {
-+                        left: auto;
-+                        right: 9px;
-+                    }
-+                }
-+            }
-+        }
-+    }
- 
-     //
-     //  Widgets
-     //  ---------------------------------------------
--
-     .sidebar {
-         .widget.block:not(:last-child),
-         .widget:not(:last-child) {
-@@ -411,15 +455,9 @@
-             }
-         }
-     }
--    .page-footer,
--    .copyright {
--        bottom: 0;
--        position: absolute;
--        width: 100%;
--    }
- }
- 
--.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
-+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-     .logo {
-         margin-bottom: 13px;
-         margin-top: 4px;
-@@ -432,7 +470,7 @@
- 
- .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-     .cms-page-view .page-main {
--        padding-top: 41px;
-+        padding-top: 0;
-         position: relative;
-     }
- }
-@@ -614,10 +652,7 @@
-     }
- 
-     .page-wrapper {
--        .lib-vendor-prefix-display(flex);
--        .lib-vendor-prefix-flex-direction(column);
-         margin: 0;
--        min-height: 100%; // Stretch content area for sticky footer
-         position: relative;
-         transition: margin .3s ease-out 0s;
- 
-@@ -627,10 +662,6 @@
-             box-sizing: border-box;
-             width: 100%;
-         }
--
--        .ie11 & {
--            height: 100%;
--        }
-     }
- 
-     .page-footer {
-diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
-index 6455921a71a..85e8aeb0b51 100644
---- a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
-+++ b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
-@@ -8,6 +8,24 @@
- //  _____________________________________________
- 
- & when (@media-common = true) {
-+    .toolbar {
-+        &.wishlist-toolbar {
-+            .limiter {
-+                float: right;
-+            }
-+            .main .pages {
-+                display: inline-block;
-+                position: relative;
-+                z-index: 0;
-+            }
-+            .toolbar-amount,
-+            .limiter {
-+                display: inline-block;
-+                z-index: 1;
-+            }
-+        }
-+    }
-+
-     .form.wishlist.items {
-         .actions-toolbar {
-             &:extend(.abs-reset-left-margin all);
-@@ -164,6 +182,30 @@
-             }
-         }
-     }
-+    .products-grid.wishlist {
-+        .product-item-actions { 
-+            .action {
-+                &.edit,
-+                &.delete {
-+                    .lib-icon-font(
-+                    @icon-edit,
-+                    @_icon-font-size: 18px,
-+                    @_icon-font-line-height: 20px,
-+                    @_icon-font-text-hide: true,
-+                    @_icon-font-color: @minicart-icons-color,
-+                    @_icon-font-color-hover: @primary__color,
-+                    @_icon-font-color-active: @minicart-icons-color
-+                    );
-+                }
-+
-+                &.delete {
-+                    .lib-icon-font-symbol(
-+                    @_icon-font-content: @icon-trash
-+                    );
-+                }
-+            }
-+        }
-+    }
- }
- 
- //
-@@ -185,11 +227,11 @@
- .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-     .products-grid.wishlist {
-         margin-bottom: @indent__l;
--        margin-right: -@indent__s;
-+        margin-right: 0;
- 
-         .product {
-             &-item {
--                padding: @indent__base @indent__s @indent__base @indent__base;
-+                padding: @indent__base 0 @indent__base 0;
-                 position: relative;
- 
-                 &-photo {
-@@ -203,6 +245,7 @@
- 
-                 &-actions {
-                     display: block;
-+                    float: left;
- 
-                     .action {
-                         margin-right: 15px;
-@@ -210,15 +253,7 @@
-                         &:last-child {
-                             margin-right: 0;
-                         }
--
--                        &.edit {
--                            float: left;
--                        }
--
--                        &.delete {
--                            float: right;
--                        }
--
-+                        
-                         &.edit,
-                         &.delete {
-                             margin-top: 7px;
-@@ -277,6 +312,9 @@
-             @_icon-font-color-hover: @primary__color,
-             @_icon-font-color-active: @minicart-icons-color
-             );
-+            &:before {
-+                overflow: visible;
-+            }
-         }
-     }
- }
-@@ -357,9 +395,7 @@
-             width: auto;
-         }
-     }
--}
- 
--.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-     .wishlist-index-index {
-         .product-item-inner {
-             @_shadow: 3px 4px 4px 0 rgba(0, 0, 0, .3);
-diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml
-index 55d43272caa..7aa2e51481b 100644
---- a/app/design/frontend/Magento/luma/etc/view.xml
-+++ b/app/design/frontend/Magento/luma/etc/view.xml
-@@ -256,7 +256,7 @@
-         <var name="product_list_image_size">166</var>           <!-- New Product image size used in product list -->
-         <var name="product_zoom_image_size">370</var>           <!-- New Product image size used for zooming -->
- 
--        <var name="product_image_white_borders">0</var>
-+        <var name="product_image_white_borders">1</var>
-     </vars>
-     <vars module="Magento_Bundle">
-         <var name="product_summary_image_size">58</var>         <!-- New Product image size used for summary block-->
-diff --git a/app/design/frontend/Magento/luma/web/css/critical.css b/app/design/frontend/Magento/luma/web/css/critical.css
-new file mode 100644
-index 00000000000..922a1eefa89
---- /dev/null
-+++ b/app/design/frontend/Magento/luma/web/css/critical.css
-@@ -0,0 +1 @@
-+body{margin:0}.page-main{flex-grow:1}.product-image-wrapper{display:block;height:0;overflow:hidden;position:relative;z-index:1}.product-image-wrapper .product-image-photo{bottom:0;display:block;height:auto;left:0;margin:auto;max-width:100%;position:absolute;right:0;top:0}.product-image-container{display:inline-block}.modal-popup{position:fixed}.page-wrapper{display:flex;flex-direction:column;min-height:100vh}.action.skip:not(:focus),.block.newsletter .label,.minicart-wrapper .action.showcart .counter-label,.minicart-wrapper .action.showcart .text,.page-header .switcher .label,.product-item-actions .actions-secondary>.action span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.alink,a{color:#006bb4;text-decoration:none}.page-header .panel.wrapper{background-color:#6e716e;color:#fff}.header.panel>.header.links{list-style:none none;float:right;font-size:0;margin-right:20px}.header.panel>.header.links>li{font-size:14px;margin:0 0 0 15px}.block-search .action.search,.block-search .block-title,.block-search .nested,.block.newsletter .title,.breadcrumbs .item,.nav-toggle,.no-display,.page-footer .switcher .options ul.dropdown,.page-header .switcher .options ul.dropdown{display:none}.block-search .label>span{height:1px;overflow:hidden;position:absolute}.logo{float:left;margin:0 0 10px 40px}.minicart-wrapper{float:right}.page-footer{margin-top:25px}.footer.content{border-top:1px solid #cecece;padding-top:20px}.block.newsletter .actions{display:table-cell;vertical-align:top;width:1%}.block-banners .banner-items,.block-banners-inline .banner-items,.block-event .slider-panel .slider,.footer.content ul,.product-items{margin:0;padding:0;list-style:none none}.copyright{background-color:#6e716e;color:#fff;box-sizing:border-box;display:block;padding:10px;text-align:center}.modal-popup,.modal-slide{visibility:hidden;opacity:0}input[type=email],input[type=number],input[type=password],input[type=search],input[type=text],input[type=url]{background:#fff;background-clip:padding-box;border:1px solid #c2c2c2;border-radius:1px;font-size:14px;height:32px;line-height:1.42857143;padding:0 9px;vertical-align:baseline;width:100%;box-sizing:border-box}.action.primary{background:#1979c3;border:1px solid #1979c3;color:#fff;font-weight:600;padding:7px 15px}.block.newsletter .form.subscribe{display:table}.footer.content .links a{color:#575757}.load.indicator{background-color:rgba(255,255,255,.7);z-index:9999;bottom:0;left:0;position:fixed;right:0;top:0;position:absolute}.load.indicator:before{background:transparent url(../images/loader-2.gif) no-repeat 50% 50%;border-radius:5px;height:160px;width:160px;bottom:0;box-sizing:border-box;content:'';left:0;margin:auto;position:absolute;right:0;top:0}.load.indicator>span{display:none}.loading-mask{bottom:0;left:0;margin:auto;position:fixed;right:0;top:0;z-index:100;background:rgba(255,255,255,.5)}.loading-mask .loader>img{bottom:0;left:0;margin:auto;position:fixed;right:0;top:0;z-index:100}.loading-mask .loader>p{display:none}body>.loading-mask{z-index:9999}._block-content-loading{position:relative}@media (min-width:768px),print{body,html{height:100%}.page-header{border:0;margin-bottom:0}.nav-sections-item-title,.section-item-content .switcher-currency,ul.header.links li.customer-welcome,ul.level0.submenu{display:none}.abs-add-clearfix-desktop:after,.abs-add-clearfix-desktop:before,.account .column.main .block.block-order-details-view:after,.account .column.main .block.block-order-details-view:before,.account .column.main .block:not(.widget) .block-content:after,.account .column.main .block:not(.widget) .block-content:before,.account .page-title-wrapper:after,.account .page-title-wrapper:before,.block-addresses-list .items.addresses:after,.block-addresses-list .items.addresses:before,.block-cart-failed .block-content:after,.block-cart-failed .block-content:before,.block-giftregistry-shared .item-options:after,.block-giftregistry-shared .item-options:before,.block-wishlist-management:after,.block-wishlist-management:before,.cart-container:after,.cart-container:before,.data.table .gift-wrapping .content:after,.data.table .gift-wrapping .content:before,.data.table .gift-wrapping .nested:after,.data.table .gift-wrapping .nested:before,.header.content:after,.header.content:before,.login-container:after,.login-container:before,.magento-rma-guest-returns .column.main .block.block-order-details-view:after,.magento-rma-guest-returns .column.main .block.block-order-details-view:before,.order-links:after,.order-links:before,.order-review-form:after,.order-review-form:before,.page-header .header.panel:after,.page-header .header.panel:before,.paypal-review .block-content:after,.paypal-review .block-content:before,.paypal-review-discount:after,.paypal-review-discount:before,.sales-guest-view .column.main .block.block-order-details-view:after,.sales-guest-view .column.main .block.block-order-details-view:before,[class^=sales-guest-] .column.main .block.block-order-details-view:after,[class^=sales-guest-] .column.main .block.block-order-details-view:before{content:'';display:table}.abs-add-clearfix-desktop:after,.account .column.main .block.block-order-details-view:after,.account .column.main .block:not(.widget) .block-content:after,.account .page-title-wrapper:after,.block-addresses-list .items.addresses:after,.block-cart-failed .block-content:after,.block-giftregistry-shared .item-options:after,.block-wishlist-management:after,.cart-container:after,.data.table .gift-wrapping .content:after,.data.table .gift-wrapping .nested:after,.header.content:after,.login-container:after,.magento-rma-guest-returns .column.main .block.block-order-details-view:after,.order-links:after,.order-review-form:after,.page-header .header.panel:after,.paypal-review .block-content:after,.paypal-review-discount:after,.sales-guest-view .column.main .block.block-order-details-view:after,[class^=sales-guest-] .column.main .block.block-order-details-view:after{clear:both}.block.category.event,.breadcrumbs,.footer.content,.header.content,.navigation,.page-header .header.panel,.page-main,.page-wrapper>.page-bottom,.page-wrapper>.widget,.top-container{box-sizing:border-box;margin-left:auto;margin-right:auto;max-width:1280px;padding-left:20px;padding-right:20px;width:auto}.panel.header{padding:10px 20px}.page-header .switcher{float:right;margin-left:15px;margin-right:-6px}.header.panel>.header.links>li>a{color:#fff}.header.content{padding:30px 20px 0}.logo{margin:-8px auto 25px 0}.minicart-wrapper{margin-left:13px}.compare.wrapper{list-style:none none}.nav-sections{margin-bottom:25px}.nav-sections-item-content>.navigation{display:block}.navigation{background:#f0f0f0;font-weight:700;height:inherit;left:auto;overflow:inherit;padding:0;position:relative;top:0;width:100%;z-index:3}.navigation ul{margin-top:0;margin-bottom:0;padding:0 8px;position:relative}.navigation .level0{margin:0 10px 0 0;display:inline-block}.navigation .level0>.level-top{color:#575757;line-height:47px;padding:0 12px}.page-main{width:100%}.page-footer{background:#f4f4f4;padding-bottom:25px}.footer.content .links{display:inline-block;padding-right:50px;vertical-align:top}.footer.content ul{padding-right:50px}.footer.content .links li{border:none;font-size:14px;margin:0 0 8px;padding:0}.footer.content .block{float:right}.block.newsletter{width:34%}}@media only screen and (max-width:767px){.compare.wrapper,.panel.wrapper,[class*=block-compare]{display:none}.footer.content .links>li{background:#f4f4f4;font-size:1.6rem;border-top:1px solid #cecece;margin:0 -15px;padding:0 15px}.page-header .header.panel,.page-main{padding-left:15px;padding-right:15px}.header.content{padding-top:10px}.nav-sections-items:after,.nav-sections-items:before{content:'';display:table}.nav-sections-items:after{clear:both}.nav-sections{width:100vw;position:fixed;left:-100vw}}
-diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
-index 7c9f5b7a65a..66732d7f68e 100644
---- a/app/design/frontend/Magento/luma/web/css/source/_extends.less
-+++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less
-@@ -277,7 +277,7 @@
- }
- 
- //
--//  Marging for blocks & widgets
-+//  Margin for blocks & widgets
- //  ---------------------------------------------
- 
- & when (@media-common = true) {
-@@ -1506,6 +1506,10 @@
-             position: relative;
-             z-index: 1;
-         }
-+        .limiter {
-+            display: inline-block;
-+            float: right;
-+        }
- 
-         .toolbar-amount {
-             .lib-css(line-height, @pager__line-height);
-@@ -1528,6 +1532,7 @@
-     .abs-block-items-counter {
-         .lib-css(color, @block-items__counter__color);
-         .lib-font-size(12px);
-+        vertical-align: middle;
-         white-space: nowrap;
- 
-         &:before {
-@@ -1551,6 +1556,7 @@
-         strong {
-             font-size: @font-size__l;
-             font-weight: @font-weight__light;
-+            vertical-align: middle;
-         }
-     }
- }
-@@ -1859,7 +1865,7 @@
- 
-             > .title {
-                 strong {
--                    color: @color-blue1;
-+                    color: @link__color;
-                     font-weight: @font-weight__regular;
-                 }
-             }
-@@ -1909,6 +1915,7 @@
-             display: table-cell;
-         }
-     }
-+
- }
- 
- .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-diff --git a/app/design/frontend/Magento/luma/web/css/source/_forms.less b/app/design/frontend/Magento/luma/web/css/source/_forms.less
-index 0c7150c1855..8533318a12d 100644
---- a/app/design/frontend/Magento/luma/web/css/source/_forms.less
-+++ b/app/design/frontend/Magento/luma/web/css/source/_forms.less
-@@ -20,7 +20,7 @@
-         .lib-form-fieldset();
- 
-         &:last-child {
--            margin-bottom: 0;
-+            margin-bottom: @indent__base;
-         }
- 
-         > .field,
-@@ -104,6 +104,10 @@
-         .select-styling();
-     }
- 
-+    select.admin__control-multiselect {
-+        height: auto;
-+    }
-+
-     .field-error,
-     div.mage-error[generated] {
-         margin-top: 7px;
-@@ -113,6 +117,18 @@
-         .lib-form-validation-note();
-     }
- 
-+    .product-options-wrapper {
-+        .date {
-+            &.required {
-+                div[for*='options'] {
-+                    &.mage-error {
-+                        display: none !important;
-+                    }
-+                }
-+            }
-+        }
-+    }
-+
-     //  TEMP
- 
-     .field .tooltip {
-diff --git a/app/design/frontend/Magento/luma/web/css/source/_sections.less b/app/design/frontend/Magento/luma/web/css/source/_sections.less
-index 73665fd22da..95769c4f4b6 100644
---- a/app/design/frontend/Magento/luma/web/css/source/_sections.less
-+++ b/app/design/frontend/Magento/luma/web/css/source/_sections.less
-@@ -19,16 +19,16 @@
-             a {
-                 position: relative;
-                 .lib-icon-font(
--                @_icon-font-content: @icon-down,
--                @_icon-font-size: @font-size__base,
--                @_icon-font-line-height: @icon-font__line-height,
--                @_icon-font-color: @icon-font__color,
--                @_icon-font-color-hover: @icon-font__color-hover,
--                @_icon-font-color-active: @icon-font__color-active,
--                @_icon-font-margin: @icon-font__margin,
--                @_icon-font-vertical-align: @icon-font__vertical-align,
--                @_icon-font-position: after,
--                @_icon-font-display: false
-+                    @_icon-font-content: @icon-down,
-+                    @_icon-font-size: @font-size__base,
-+                    @_icon-font-line-height: @icon-font__line-height,
-+                    @_icon-font-color: @icon-font__color,
-+                    @_icon-font-color-hover: @icon-font__color-hover,
-+                    @_icon-font-color-active: @icon-font__color-active,
-+                    @_icon-font-margin: @icon-font__margin,
-+                    @_icon-font-vertical-align: @icon-font__vertical-align,
-+                    @_icon-font-position: after,
-+                    @_icon-font-display: false
-                 );
- 
-                 &:after {
-@@ -75,3 +75,17 @@
-         }
-     }
- }
-+
-+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-+    .product.data.items {
-+        .item.title {
-+            > .switch {
-+                padding: 1px 15px 1px;
-+            }
-+        }
-+
-+        > .item.content {
-+            padding: 10px 15px 30px;
-+        }
-+    }
-+}
-diff --git a/app/design/frontend/Magento/luma/web/css/source/_theme.less b/app/design/frontend/Magento/luma/web/css/source/_theme.less
-index 957e622d6a0..114fb7b8172 100644
---- a/app/design/frontend/Magento/luma/web/css/source/_theme.less
-+++ b/app/design/frontend/Magento/luma/web/css/source/_theme.less
-@@ -28,7 +28,7 @@
- @h3__margin-top: @indent__base;
- 
- //  Links
--@link__color: @color-blue2;
-+@link__color: @theme__color__primary-alt;
- 
- //  Focus
- @focus__color: @color-blue3;
-@@ -60,14 +60,9 @@
- 
- @navigation__background: @color-gray94;
- @navigation-level0-item__active__color: @primary__color;
--@navigation-level0-item__active__border-color: @active__color;
--@navigation-desktop-level0-item__active__border-color: @active__color;
- 
--@submenu-desktop-item__active__border-color: @active__color;
--@submenu-item__active__border-color: @active__color;
- @submenu-item__active__color: @navigation-level0-item__active__color;
- 
--
- //  Desktop navigation
- @navigation-desktop-level0-item__line-height: 47px;
- @submenu-desktop__font-weight: @font-weight__regular;
-@@ -225,7 +220,6 @@
- 
- @rating-icon__font-size: 16px;
- @rating-icon__letter-spacing: 2px;
--@rating-icon__active__color: @active__color;
- 
- //
- //  Dropdowns
-@@ -252,7 +246,7 @@
- @breadcrumbs-icon__font-margin: 0 @indent__s;
- 
- @breadcrumbs-current__color: @color-gray-middle5;
--@breadcrumbs-link__color: @color-blue2;
-+@breadcrumbs-link__color: @link__color;
- @breadcrumbs-link__visited__color: @breadcrumbs-link__color;
- @breadcrumbs-link__hover__color: @breadcrumbs-link__color;
- @breadcrumbs-link__active__color: @breadcrumbs-link__color;
-diff --git a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
-index ae68fc81acd..855700806fd 100644
---- a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
-+++ b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
-@@ -58,7 +58,7 @@
- 
-     .modal-custom {
-         .action-close {
--            .lib-css(margin, @indent__m);
-+            .lib-css(margin, 15px);
-         }
-     }
- 
-@@ -82,7 +82,8 @@
- 
-     .modal-slide {
-         .action-close {
--            padding: @modal-slide-action-close__padding;
-+            margin: 15px;
-+            padding: 0;
-         }
- 
-         .page-main-actions {
-@@ -147,10 +148,9 @@
-             }
-         }
-     }
--}
- 
--.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-     .modal-popup {
-+        pointer-events: auto;
-         &.modal-slide {
-             .modal-inner-wrap[class] {
-                 .lib-css(background-color, @modal-slide-mobile__background-color);
-diff --git a/app/etc/db_schema.xml b/app/etc/db_schema.xml
-index be13c28ee02..d7af9091b23 100644
---- a/app/etc/db_schema.xml
-+++ b/app/etc/db_schema.xml
-@@ -10,7 +10,7 @@
-     <table name="patch_list" resource="default" comment="List of data/schema patches">
-         <column xsi:type="int" name="patch_id" identity="true" comment="Patch Auto Increment" />
-         <column xsi:type="varchar" name="patch_name" length="1024" nullable="false" comment="Patch Class Name" />
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="patch_id" />
-         </constraint>
-     </table>
-diff --git a/app/etc/di.xml b/app/etc/di.xml
-index 5bc25e6cb85..afe8f36b7de 100755
---- a/app/etc/di.xml
-+++ b/app/etc/di.xml
-@@ -28,6 +28,7 @@
-     <preference for="Magento\Framework\App\CacheInterface" type="Magento\Framework\App\Cache\Proxy" />
-     <preference for="Magento\Framework\App\Cache\StateInterface" type="Magento\Framework\App\Cache\State" />
-     <preference for="Magento\Framework\App\Cache\TypeListInterface" type="Magento\Framework\App\Cache\TypeList" />
-+    <preference for="Magento\Framework\App\ObjectManager\ConfigWriterInterface" type="Magento\Framework\App\ObjectManager\ConfigWriter\Filesystem" />
-     <preference for="Magento\Store\Model\StoreManagerInterface" type="Magento\Store\Model\StoreManager" />
-     <preference for="Magento\Framework\View\DesignInterface" type="Magento\Theme\Model\View\Design\Proxy" />
-     <preference for="Magento\Framework\View\Design\ThemeInterface" type="Magento\Theme\Model\Theme" />
-@@ -37,6 +38,7 @@
-     <preference for="Magento\Framework\Locale\ListsInterface" type="Magento\Framework\Locale\TranslatedLists" />
-     <preference for="Magento\Framework\Locale\AvailableLocalesInterface" type="Magento\Framework\Locale\Deployed\Codes" />
-     <preference for="Magento\Framework\Locale\OptionInterface" type="Magento\Framework\Locale\Deployed\Options" />
-+    <preference for="Magento\Framework\Lock\LockManagerInterface" type="Magento\Framework\Lock\Proxy" />
-     <preference for="Magento\Framework\Api\AttributeTypeResolverInterface" type="Magento\Framework\Reflection\AttributeTypeResolver" />
-     <preference for="Magento\Framework\Api\Search\SearchResultInterface" type="Magento\Framework\Api\Search\SearchResult" />
-     <preference for="Magento\Framework\Api\Search\SearchCriteriaInterface" type="Magento\Framework\Api\Search\SearchCriteria"/>
-@@ -63,6 +65,7 @@
-     <preference for="Magento\Framework\Config\CacheInterface" type="Magento\Framework\App\Cache\Type\Config" />
-     <preference for="Magento\Framework\Config\ValidationStateInterface" type="Magento\Framework\App\Arguments\ValidationState" />
-     <preference for="Magento\Framework\Module\ModuleListInterface" type="Magento\Framework\Module\ModuleList" />
-+    <preference for="Magento\Framework\Module\ModuleManagerInterface" type="Magento\Framework\Module\Manager" />
-     <preference for="Magento\Framework\Component\ComponentRegistrarInterface" type="Magento\Framework\Component\ComponentRegistrar"/>
-     <preference for="Magento\Framework\Event\ConfigInterface" type="Magento\Framework\Event\Config" />
-     <preference for="Magento\Framework\Event\InvokerInterface" type="Magento\Framework\Event\Invoker\InvokerDefault" />
-@@ -87,6 +90,7 @@
-     <preference for="Magento\Framework\View\Design\Theme\CustomizationInterface" type="Magento\Framework\View\Design\Theme\Customization" />
-     <preference for="Magento\Framework\View\Asset\ConfigInterface" type="Magento\Framework\View\Asset\Config" />
-     <preference for="Magento\Framework\Image\Adapter\ConfigInterface" type="Magento\Framework\Image\Adapter\Config" />
-+    <preference for="Magento\Framework\Image\Adapter\UploadConfigInterface" type="Magento\Framework\Image\Adapter\Config" />
-     <preference for="Magento\Framework\View\Design\Theme\Image\PathInterface" type="Magento\Theme\Model\Theme\Image\Path" />
-     <preference for="Magento\Framework\Session\Config\ConfigInterface" type="Magento\Framework\Session\Config" />
-     <preference for="Magento\Framework\Session\SidResolverInterface" type="Magento\Framework\Session\SidResolver\Proxy" />
-@@ -144,6 +148,7 @@
-     <preference for="Magento\Framework\Locale\FormatInterface" type="Magento\Framework\Locale\Format" />
-     <preference for="Magento\Framework\Locale\ResolverInterface" type="Magento\Framework\Locale\Resolver" />
-     <preference for="Magento\Framework\Stdlib\DateTime\TimezoneInterface" type="Magento\Framework\Stdlib\DateTime\Timezone" />
-+    <preference for="Magento\Framework\Stdlib\DateTime\Timezone\LocalizedDateToUtcConverterInterface" type="Magento\Framework\Stdlib\DateTime\Timezone\LocalizedDateToUtcConverter" />
-     <preference for="Magento\Framework\Communication\ConfigInterface" type="Magento\Framework\Communication\Config" />
-     <preference for="Magento\Framework\Module\ResourceInterface" type="Magento\Framework\Module\ModuleResource" />
-     <preference for="Magento\Framework\Pricing\Amount\AmountInterface" type="Magento\Framework\Pricing\Amount\Base" />
-@@ -204,9 +209,8 @@
-     <preference for="Magento\Framework\MessageQueue\ExchangeFactoryInterface" type="Magento\Framework\MessageQueue\ExchangeFactory" />
-     <preference for="Magento\Framework\MessageQueue\Bulk\ExchangeFactoryInterface" type="Magento\Framework\MessageQueue\Bulk\ExchangeFactory" />
-     <preference for="Magento\Framework\MessageQueue\QueueFactoryInterface" type="Magento\Framework\MessageQueue\QueueFactory" />
--    <preference for="Magento\Framework\App\Request\ValidatorInterface"
--                type="Magento\Framework\App\Request\CsrfValidator" />
-     <preference for="Magento\Framework\Search\Request\IndexScopeResolverInterface" type="Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver"/>
-+    <preference for="Magento\Framework\HTTP\ClientInterface" type="Magento\Framework\HTTP\Client\Curl" />
-     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
-     <type name="Magento\Framework\Acl\Data\Cache">
-         <arguments>
-@@ -412,6 +416,11 @@
-             <argument name="cacheId" xsi:type="string">interception</argument>
-         </arguments>
-     </type>
-+    <type name="Magento\Framework\Interception\Config\CacheManager">
-+        <arguments>
-+            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
-+        </arguments>
-+    </type>
-     <type name="Magento\Framework\Interception\PluginList\PluginList">
-         <arguments>
-             <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
-@@ -752,6 +761,7 @@
-                 <item name="extensionInterface" xsi:type="string">\Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceGenerator</item>
-                 <item name="extension" xsi:type="string">\Magento\Framework\Api\Code\Generator\ExtensionAttributesGenerator</item>
-                 <item name="remote" xsi:type="string">\Magento\Framework\MessageQueue\Code\Generator\RemoteServiceGenerator</item>
-+                <item name="proxyDeferred" xsi:type="string">\Magento\Framework\Async\Code\Generator\ProxyDeferredGenerator</item>
-             </argument>
-         </arguments>
-     </type>
-@@ -1484,6 +1494,27 @@
-             </argument>
-         </arguments>
-     </type>
-+    <virtualType name="Magento\Framework\Setup\Declaration\Schema\Config\SchemaLocator" type="Magento\Framework\Config\SchemaLocator">
-+        <arguments>
-+            <argument name="realPath" xsi:type="string">urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd</argument>
-+        </arguments>
-+    </virtualType>
-+    <virtualType name="Magento\Framework\Setup\Declaration\Schema\FileSystem\XmlReader" type="Magento\Framework\Config\Reader\Filesystem">
-+        <arguments>
-+            <argument name="fileResolver" xsi:type="object">Magento\Framework\Config\FileResolverByModule</argument>
-+            <argument name="converter" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Config\Converter</argument>
-+            <argument name="schemaLocator" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Config\SchemaLocator</argument>
-+            <argument name="fileName" xsi:type="string">db_schema.xml</argument>
-+            <argument name="idAttributes" xsi:type="array">
-+                <item name="/schema/table" xsi:type="string">name</item>
-+                <item name="/schema/table/column" xsi:type="string">name</item>
-+                <item name="/schema/table/constraint" xsi:type="string">referenceId</item>
-+                <item name="/schema/table/index" xsi:type="string">referenceId</item>
-+                <item name="/schema/table/index/column" xsi:type="string">name</item>
-+                <item name="/schema/table/constraint/column" xsi:type="string">name</item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-     <type name="Magento\Framework\Setup\Declaration\Schema\OperationsExecutor">
-         <arguments>
-             <argument name="operations" xsi:type="array">
-@@ -1693,4 +1724,51 @@
-             <argument name="scopeType" xsi:type="const">Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT</argument>
-         </arguments>
-     </type>
-+    <virtualType name="CsrfRequestValidator" type="Magento\Framework\App\Request\CsrfValidator" />
-+    <virtualType name="RequestValidator" type="Magento\Framework\App\Request\CompositeValidator">
-+        <arguments>
-+            <argument name="validators" xsi:type="array">
-+                <item name="csrf_validator" xsi:type="object">CsrfRequestValidator</item>
-+                <item name="http_method_validator" xsi:type="object">
-+                    Magento\Framework\App\Request\HttpMethodValidator
-+                </item>
-+            </argument>
-+        </arguments>
-+    </virtualType>
-+    <preference for="Magento\Framework\App\Request\ValidatorInterface" type="RequestValidator" />
-+    <type name="Magento\Framework\App\Request\HttpMethodMap">
-+        <arguments>
-+            <argument name="map" xsi:type="array">
-+                <item name="OPTIONS" xsi:type="string">\Magento\Framework\App\Action\HttpOptionsActionInterface</item>
-+                <item name="GET" xsi:type="string">\Magento\Framework\App\Action\HttpGetActionInterface</item>
-+                <item name="HEAD" xsi:type="string">\Magento\Framework\App\Action\HttpGetActionInterface</item>
-+                <item name="POST" xsi:type="string">\Magento\Framework\App\Action\HttpPostActionInterface</item>
-+                <item name="PUT" xsi:type="string">\Magento\Framework\App\Action\HttpPutActionInterface</item>
-+                <item name="PATCH" xsi:type="string">\Magento\Framework\App\Action\HttpPatchActionInterface</item>
-+                <item name="DELETE" xsi:type="string">\Magento\Framework\App\Action\HttpDeleteActionInterface</item>
-+                <item name="CONNECT" xsi:type="string">\Magento\Framework\App\Action\HttpConnectActionInterface</item>
-+                <item name="PROPFIND" xsi:type="string">\Magento\Framework\App\Action\HttpPropfindActionInterface</item>
-+                <item name="TRACE" xsi:type="string">\Magento\Framework\App\Action\HttpTraceActionInterface</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Framework\App\ScopeResolverPool">
-+        <arguments>
-+            <argument name="scopeResolvers" xsi:type="array">
-+                <item name="default" xsi:type="object">Magento\Framework\App\ScopeResolver</item>
-+            </argument>
-+        </arguments>
-+    </type>
-+    <type name="Magento\Framework\Cache\LockGuardedCacheLoader">
-+        <arguments>
-+            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
-+            <argument name="lockTimeout" xsi:type="number">10000</argument>
-+            <argument name="delayTimeout" xsi:type="number">20</argument>
-+        </arguments>
-+    </type>
-+    <preference for="Magento\Framework\HTTP\AsyncClientInterface" type="Magento\Framework\HTTP\AsyncClient\GuzzleAsyncClient" />
-+    <preference for="Magento\Framework\MessageQueue\PoisonPill\PoisonPillCompareInterface" type="Magento\Framework\MessageQueue\PoisonPill\PoisonPillCompare"/>
-+    <preference for="Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface" type="Magento\Framework\MessageQueue\PoisonPill\PoisonPillPut"/>
-+    <preference for="Magento\Framework\MessageQueue\PoisonPill\PoisonPillReadInterface" type="Magento\Framework\MessageQueue\PoisonPill\PoisonPillRead"/>
-+    <preference for="Magento\Framework\MessageQueue\CallbackInvokerInterface" type="Magento\Framework\MessageQueue\CallbackInvoker"/>
- </config>
-diff --git a/app/functions.php b/app/functions.php
-index 0b5fa4de410..4b00d01819f 100644
---- a/app/functions.php
-+++ b/app/functions.php
-@@ -6,17 +6,22 @@
- 
- /**
-  * Create value-object \Magento\Framework\Phrase
-- *
-+ * @deprecated The global function __() is now loaded via Magento Framework, the below require is only
-+ *             for backwards compatibility reasons and this file will be removed in a future version
-+ * @see        Magento\Framework\Phrase\__.php
-+ * @SuppressWarnings(PHPMD.ShortMethodName)
-  * @return \Magento\Framework\Phrase
-  */
--function __()
--{
--    $argc = func_get_args();
-+if (!function_exists('__')) {
-+    function __()
-+    {
-+        $argc = func_get_args();
- 
--    $text = array_shift($argc);
--    if (!empty($argc) && is_array($argc[0])) {
--        $argc = $argc[0];
--    }
-+        $text = array_shift($argc);
-+        if (!empty($argc) && is_array($argc[0])) {
-+            $argc = $argc[0];
-+        }
- 
--    return new \Magento\Framework\Phrase($text, $argc);
-+        return new \Magento\Framework\Phrase($text, $argc);
-+    }
- }
-diff --git a/auth.json.sample b/auth.json.sample
-index 81c8fd220ea..be1c70cfe1e 100644
---- a/auth.json.sample
-+++ b/auth.json.sample
-@@ -1,8 +1,8 @@
- {
--   "http-basic": {
--      "repo.magento.com": {
--         "username": "<public-key>",
--         "password": "<private-key>"
--      }
--   }
-+    "http-basic": {
-+        "repo.magento.com": {
-+            "username": "<public-key>",
-+            "password": "<private-key>"
-+        }
-+    }
- }
-diff --git a/composer.json b/composer.json
-index 0cf49466f87..4f235d4622c 100644
---- a/composer.json
-+++ b/composer.json
-@@ -12,6 +12,7 @@
-     },
-     "require": {
-         "php": "~7.1.3||~7.2.0",
-+        "ext-bcmath": "*",
-         "ext-ctype": "*",
-         "ext-curl": "*",
-         "ext-dom": "*",
-@@ -27,15 +28,14 @@
-         "ext-spl": "*",
-         "ext-xsl": "*",
-         "ext-zip": "*",
--        "ext-bcmath": "*",
-         "lib-libxml": "*",
--        "braintree/braintree_php": "3.34.0",
-+        "braintree/braintree_php": "3.35.0",
-         "colinmollenhour/cache-backend-file": "~1.4.1",
--        "colinmollenhour/cache-backend-redis": "1.10.5",
-+        "colinmollenhour/cache-backend-redis": "1.10.6",
-         "colinmollenhour/credis": "1.10.0",
-         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
-         "composer/composer": "^1.6",
--        "elasticsearch/elasticsearch": "~2.0|~5.1",
-+        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1",
-         "magento/composer": "~1.4.0",
-         "magento/magento-composer-installer": ">=0.1.11",
-         "magento/zendframework1": "~1.14.1",
-@@ -44,15 +44,15 @@
-         "paragonie/sodium_compat": "^1.6",
-         "pelago/emogrifier": "^2.0.0",
-         "php-amqplib/php-amqplib": "~2.7.0",
--        "phpseclib/mcrypt_compat": "1.0.5",
-+        "phpseclib/mcrypt_compat": "1.0.8",
-         "phpseclib/phpseclib": "2.0.*",
--        "ramsey/uuid": "~3.7.3",
-+        "ramsey/uuid": "~3.8.0",
-         "symfony/console": "~4.1.0",
-         "symfony/event-dispatcher": "~4.1.0",
-         "symfony/process": "~4.1.0",
-         "tedivm/jshrink": "~1.3.0",
-         "tubalmartin/cssmin": "4.1.1",
--        "webonyx/graphql-php": "^0.11.1",
-+        "webonyx/graphql-php": "^0.12.6",
-         "zendframework/zend-captcha": "^2.7.1",
-         "zendframework/zend-code": "~3.3.0",
-         "zendframework/zend-config": "^2.6.0",
-@@ -79,27 +79,37 @@
-         "zendframework/zend-text": "^2.6.0",
-         "zendframework/zend-uri": "^2.5.1",
-         "zendframework/zend-validator": "^2.6.0",
--        "zendframework/zend-view": "~2.10.0"
-+        "zendframework/zend-view": "~2.10.0",
-+        "guzzlehttp/guzzle": "^6.3.3"
-     },
-     "require-dev": {
--        "magento/magento2-functional-testing-framework": "2.3.4",
--        "friendsofphp/php-cs-fixer": "~2.12.0",
-+        "allure-framework/allure-phpunit": "~1.2.0",
-+        "friendsofphp/php-cs-fixer": "~2.13.0",
-         "lusitanian/oauth": "~0.8.10",
-+        "magento/magento-coding-standard": "~1.0.0",
-+        "magento/magento2-functional-testing-framework": "~2.4.1",
-         "pdepend/pdepend": "2.5.2",
-         "phpmd/phpmd": "@stable",
-         "phpunit/phpunit": "~6.5.0",
-         "sebastian/phpcpd": "~3.0.0",
--        "squizlabs/php_codesniffer": "3.3.0"
-+        "squizlabs/php_codesniffer": "3.3.1"
-+    },
-+    "suggest": {
-+        "ext-pcntl": "Need for run processes in parallel mode"
-     },
-     "replace": {
-         "magento/module-marketplace": "*",
-         "magento/module-admin-notification": "*",
-         "magento/module-advanced-pricing-import-export": "*",
-         "magento/module-amqp": "*",
-+        "magento/module-amqp-store": "*",
-         "magento/module-analytics": "*",
-         "magento/module-asynchronous-operations": "*",
-         "magento/module-authorization": "*",
-         "magento/module-authorizenet": "*",
-+        "magento/module-authorizenet-acceptjs": "*",
-+        "magento/module-authorizenet-cardinal": "*",
-+        "magento/module-authorizenet-graph-ql": "*",
-         "magento/module-advanced-search": "*",
-         "magento/module-backend": "*",
-         "magento/module-backup": "*",
-@@ -109,10 +119,12 @@
-         "magento/module-bundle-import-export": "*",
-         "magento/module-cache-invalidate": "*",
-         "magento/module-captcha": "*",
-+        "magento/module-cardinal-commerce": "*",
-         "magento/module-catalog": "*",
-         "magento/module-catalog-analytics": "*",
-         "magento/module-catalog-import-export": "*",
-         "magento/module-catalog-inventory": "*",
-+        "magento/module-catalog-inventory-graph-ql": "*",
-         "magento/module-catalog-rule": "*",
-         "magento/module-catalog-rule-configurable": "*",
-         "magento/module-catalog-search": "*",
-@@ -120,6 +132,7 @@
-         "magento/module-catalog-widget": "*",
-         "magento/module-checkout": "*",
-         "magento/module-checkout-agreements": "*",
-+        "magento/module-checkout-agreements-graph-ql": "*",
-         "magento/module-cms": "*",
-         "magento/module-cms-url-rewrite": "*",
-         "magento/module-config": "*",
-@@ -137,11 +150,13 @@
-         "magento/module-developer": "*",
-         "magento/module-dhl": "*",
-         "magento/module-directory": "*",
-+        "magento/module-directory-graph-ql": "*",
-         "magento/module-downloadable": "*",
-         "magento/module-downloadable-graph-ql": "*",
-         "magento/module-downloadable-import-export": "*",
-         "magento/module-eav": "*",
-         "magento/module-elasticsearch": "*",
-+        "magento/module-elasticsearch-6": "*",
-         "magento/module-email": "*",
-         "magento/module-encryption-key": "*",
-         "magento/module-fedex": "*",
-@@ -150,6 +165,7 @@
-         "magento/module-google-analytics": "*",
-         "magento/module-google-optimizer": "*",
-         "magento/module-graph-ql": "*",
-+        "magento/module-graph-ql-cache": "*",
-         "magento/module-catalog-graph-ql": "*",
-         "magento/module-catalog-url-rewrite-graph-ql": "*",
-         "magento/module-configurable-product-graph-ql": "*",
-@@ -160,8 +176,10 @@
-         "magento/module-url-rewrite-graph-ql": "*",
-         "magento/module-cms-url-rewrite-graph-ql": "*",
-         "magento/module-weee-graph-ql": "*",
-+        "magento/module-cms-graph-ql": "*",
-         "magento/module-grouped-import-export": "*",
-         "magento/module-grouped-product": "*",
-+        "magento/module-grouped-catalog-inventory": "*",
-         "magento/module-grouped-product-graph-ql": "*",
-         "magento/module-import-export": "*",
-         "magento/module-indexer": "*",
-@@ -171,6 +189,8 @@
-         "magento/module-media-storage": "*",
-         "magento/module-message-queue": "*",
-         "magento/module-msrp": "*",
-+        "magento/module-msrp-configurable-product": "*",
-+        "magento/module-msrp-grouped-product": "*",
-         "magento/module-multishipping": "*",
-         "magento/module-mysql-mq": "*",
-         "magento/module-new-relic-reporting": "*",
-@@ -180,11 +200,15 @@
-         "magento/module-page-cache": "*",
-         "magento/module-payment": "*",
-         "magento/module-paypal": "*",
-+        "magento/module-paypal-captcha": "*",
-+        "magento/module-paypal-graph-ql": "*",
-         "magento/module-persistent": "*",
-         "magento/module-product-alert": "*",
-         "magento/module-product-video": "*",
-         "magento/module-quote": "*",
-         "magento/module-quote-analytics": "*",
-+        "magento/module-quote-graph-ql": "*",
-+        "magento/module-related-product-graph-ql": "*",
-         "magento/module-release-notification": "*",
-         "magento/module-reports": "*",
-         "magento/module-require-js": "*",
-@@ -195,6 +219,7 @@
-         "magento/module-rule": "*",
-         "magento/module-sales": "*",
-         "magento/module-sales-analytics": "*",
-+        "magento/module-sales-graph-ql": "*",
-         "magento/module-sales-inventory": "*",
-         "magento/module-sales-rule": "*",
-         "magento/module-sales-sequence": "*",
-@@ -202,6 +227,7 @@
-         "magento/module-search": "*",
-         "magento/module-security": "*",
-         "magento/module-send-friend": "*",
-+        "magento/module-send-friend-graph-ql": "*",
-         "magento/module-shipping": "*",
-         "magento/module-signifyd": "*",
-         "magento/module-sitemap": "*",
-@@ -215,6 +241,7 @@
-         "magento/module-tax": "*",
-         "magento/module-tax-import-export": "*",
-         "magento/module-theme": "*",
-+        "magento/module-theme-graph-ql": "*",
-         "magento/module-translation": "*",
-         "magento/module-ui": "*",
-         "magento/module-ups": "*",
-@@ -223,6 +250,7 @@
-         "magento/module-usps": "*",
-         "magento/module-variable": "*",
-         "magento/module-vault": "*",
-+        "magento/module-vault-graph-ql": "*",
-         "magento/module-version": "*",
-         "magento/module-webapi": "*",
-         "magento/module-webapi-async": "*",
-@@ -230,6 +258,7 @@
-         "magento/module-weee": "*",
-         "magento/module-widget": "*",
-         "magento/module-wishlist": "*",
-+        "magento/module-wishlist-graph-ql": "*",
-         "magento/module-wishlist-analytics": "*",
-         "magento/theme-adminhtml-backend": "*",
-         "magento/theme-frontend-blank": "*",
-@@ -253,6 +282,9 @@
-         "tinymce/tinymce": "3.4.7",
-         "magento/module-tinymce-3": "*"
-     },
-+    "conflict": {
-+        "gene/bluefoot": "*"
-+    },
-     "extra": {
-         "component_paths": {
-             "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js",
-diff --git a/composer.lock b/composer.lock
-index 014c8eca557..413e700c87b 100644
---- a/composer.lock
-+++ b/composer.lock
-@@ -4,20 +4,20 @@
-         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-         "This file is @generated automatically"
-     ],
--    "content-hash": "da340950d3c725fcf2e01e73c48683d4",
-+    "content-hash": "ad16b0301a9bb01887ee4504b5f6a842",
-     "packages": [
-         {
-             "name": "braintree/braintree_php",
--            "version": "3.34.0",
-+            "version": "3.35.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/braintree/braintree_php.git",
--                "reference": "fd55c466d0d0088c67705d7ba0b3876d9767bfda"
-+                "reference": "6c4388199ce379432804a5c18b88585157ef2ed7"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/braintree/braintree_php/zipball/fd55c466d0d0088c67705d7ba0b3876d9767bfda",
--                "reference": "fd55c466d0d0088c67705d7ba0b3876d9767bfda",
-+                "url": "https://api.github.com/repos/braintree/braintree_php/zipball/6c4388199ce379432804a5c18b88585157ef2ed7",
-+                "reference": "6c4388199ce379432804a5c18b88585157ef2ed7",
-                 "shasum": ""
-             },
-             "require": {
-@@ -51,20 +51,20 @@
-                 }
-             ],
-             "description": "Braintree PHP Client Library",
--            "time": "2018-05-21T18:14:47+00:00"
-+            "time": "2018-07-26T14:37:38+00:00"
-         },
-         {
-             "name": "colinmollenhour/cache-backend-file",
--            "version": "v1.4.4",
-+            "version": "v1.4.5",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git",
--                "reference": "184171cc79933a828c3f9b1a1054724cea22a216"
-+                "reference": "03c7d4c0f43b2de1b559a3527d18ff697d306544"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/184171cc79933a828c3f9b1a1054724cea22a216",
--                "reference": "184171cc79933a828c3f9b1a1054724cea22a216",
-+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/03c7d4c0f43b2de1b559a3527d18ff697d306544",
-+                "reference": "03c7d4c0f43b2de1b559a3527d18ff697d306544",
-                 "shasum": ""
-             },
-             "type": "magento-module",
-@@ -84,20 +84,20 @@
-             ],
-             "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
-             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
--            "time": "2018-04-05T15:28:43+00:00"
-+            "time": "2019-04-18T21:54:31+00:00"
-         },
-         {
-             "name": "colinmollenhour/cache-backend-redis",
--            "version": "1.10.5",
-+            "version": "1.10.6",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git",
--                "reference": "91d949e28d939e607484a4bbf9307cff5afa689b"
-+                "reference": "cc941a5f4cc017e11d3eab9061811ba9583ed6bf"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/91d949e28d939e607484a4bbf9307cff5afa689b",
--                "reference": "91d949e28d939e607484a4bbf9307cff5afa689b",
-+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/cc941a5f4cc017e11d3eab9061811ba9583ed6bf",
-+                "reference": "cc941a5f4cc017e11d3eab9061811ba9583ed6bf",
-                 "shasum": ""
-             },
-             "require": {
-@@ -120,7 +120,7 @@
-             ],
-             "description": "Zend_Cache backend using Redis with full support for tags.",
-             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
--            "time": "2018-05-15T16:02:25+00:00"
-+            "time": "2018-09-24T16:02:07+00:00"
-         },
-         {
-             "name": "colinmollenhour/credis",
-@@ -164,21 +164,21 @@
-         },
-         {
-             "name": "colinmollenhour/php-redis-session-abstract",
--            "version": "v1.4.0",
-+            "version": "v1.4.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
--                "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc"
-+                "reference": "4949ca28b86037abb44984c77bab9d0a4e075643"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
--                "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
-+                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4949ca28b86037abb44984c77bab9d0a4e075643",
-+                "reference": "4949ca28b86037abb44984c77bab9d0a4e075643",
-                 "shasum": ""
-             },
-             "require": {
-                 "colinmollenhour/credis": "~1.6",
--                "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0"
-+                "php": "^5.5 || ^7.0"
-             },
-             "type": "library",
-             "autoload": {
-@@ -197,20 +197,20 @@
-             ],
-             "description": "A Redis-based session handler with optimistic locking",
-             "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
--            "time": "2018-03-29T15:54:15+00:00"
-+            "time": "2019-03-18T14:43:14+00:00"
-         },
-         {
-             "name": "composer/ca-bundle",
--            "version": "1.1.2",
-+            "version": "1.1.4",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/composer/ca-bundle.git",
--                "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0"
-+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/46afded9720f40b9dc63542af4e3e43a1177acb0",
--                "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0",
-+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
-+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
-                 "shasum": ""
-             },
-             "require": {
-@@ -253,20 +253,20 @@
-                 "ssl",
-                 "tls"
-             ],
--            "time": "2018-08-08T08:57:40+00:00"
-+            "time": "2019-01-28T09:30:10+00:00"
-         },
-         {
-             "name": "composer/composer",
--            "version": "1.7.2",
-+            "version": "1.8.6",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/composer/composer.git",
--                "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2"
-+                "reference": "19b5f66a0e233eb944f134df34091fe1c5dfcc11"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/composer/composer/zipball/576aab9b5abb2ed11a1c52353a759363216a4ad2",
--                "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2",
-+                "url": "https://api.github.com/repos/composer/composer/zipball/19b5f66a0e233eb944f134df34091fe1c5dfcc11",
-+                "reference": "19b5f66a0e233eb944f134df34091fe1c5dfcc11",
-                 "shasum": ""
-             },
-             "require": {
-@@ -302,7 +302,7 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.7-dev"
-+                    "dev-master": "1.8-dev"
-                 }
-             },
-             "autoload": {
-@@ -333,20 +333,20 @@
-                 "dependency",
-                 "package"
-             ],
--            "time": "2018-08-16T14:57:12+00:00"
-+            "time": "2019-06-11T13:03:06+00:00"
-         },
-         {
-             "name": "composer/semver",
--            "version": "1.4.2",
-+            "version": "1.5.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/composer/semver.git",
--                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
-+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
--                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
-+                "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
-+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
-                 "shasum": ""
-             },
-             "require": {
-@@ -395,28 +395,27 @@
-                 "validation",
-                 "versioning"
-             ],
--            "time": "2016-08-30T16:08:34+00:00"
-+            "time": "2019-03-19T17:25:45+00:00"
-         },
-         {
-             "name": "composer/spdx-licenses",
--            "version": "1.4.0",
-+            "version": "1.5.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/composer/spdx-licenses.git",
--                "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b"
-+                "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/cb17687e9f936acd7e7245ad3890f953770dec1b",
--                "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b",
-+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
-+                "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
-                 "shasum": ""
-             },
-             "require": {
--                "php": "^5.3.2 || ^7.0"
-+                "php": "^5.3.2 || ^7.0 || ^8.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
--                "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
-             },
-             "type": "library",
-             "extra": {
-@@ -456,20 +455,20 @@
-                 "spdx",
-                 "validator"
-             ],
--            "time": "2018-04-30T10:33:04+00:00"
-+            "time": "2019-03-26T10:23:26+00:00"
-         },
-         {
-             "name": "composer/xdebug-handler",
--            "version": "1.2.0",
-+            "version": "1.3.3",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/composer/xdebug-handler.git",
--                "reference": "e1809da56ce1bd1b547a752936817341ac244d8e"
-+                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/e1809da56ce1bd1b547a752936817341ac244d8e",
--                "reference": "e1809da56ce1bd1b547a752936817341ac244d8e",
-+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f",
-+                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f",
-                 "shasum": ""
-             },
-             "require": {
-@@ -500,7 +499,7 @@
-                 "Xdebug",
-                 "performance"
-             ],
--            "time": "2018-08-16T10:54:23+00:00"
-+            "time": "2019-05-27T17:52:04+00:00"
-         },
-         {
-             "name": "container-interop/container-interop",
-@@ -535,29 +534,31 @@
-         },
-         {
-             "name": "elasticsearch/elasticsearch",
--            "version": "v5.3.2",
-+            "version": "v6.7.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/elastic/elasticsearch-php.git",
--                "reference": "4b29a4121e790bbfe690d5ee77da348b62d48eb8"
-+                "reference": "7be453dd36d1b141b779f2cb956715f8e04ac2f4"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/4b29a4121e790bbfe690d5ee77da348b62d48eb8",
--                "reference": "4b29a4121e790bbfe690d5ee77da348b62d48eb8",
-+                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/7be453dd36d1b141b779f2cb956715f8e04ac2f4",
-+                "reference": "7be453dd36d1b141b779f2cb956715f8e04ac2f4",
-                 "shasum": ""
-             },
-             "require": {
-+                "ext-json": ">=1.3.7",
-                 "guzzlehttp/ringphp": "~1.0",
--                "php": "^5.6|^7.0",
-+                "php": "^7.0",
-                 "psr/log": "~1.0"
-             },
-             "require-dev": {
--                "cpliakas/git-wrapper": "~1.0",
-+                "cpliakas/git-wrapper": "^1.7 || ^2.1",
-                 "doctrine/inflector": "^1.1",
--                "mockery/mockery": "0.9.4",
--                "phpunit/phpunit": "^4.7|^5.4",
--                "sami/sami": "~3.2",
-+                "mockery/mockery": "^1.2",
-+                "phpstan/phpstan-shim": "^0.9 || ^0.11",
-+                "phpunit/phpunit": "^5.7 || ^6.5",
-+                "squizlabs/php_codesniffer": "^3.4",
-                 "symfony/finder": "^2.8",
-                 "symfony/yaml": "^2.8"
-             },
-@@ -578,6 +579,9 @@
-             "authors": [
-                 {
-                     "name": "Zachary Tong"
-+                },
-+                {
-+                    "name": "Enrico Zimuel"
-                 }
-             ],
-             "description": "PHP Client for Elasticsearch",
-@@ -586,7 +590,190 @@
-                 "elasticsearch",
-                 "search"
-             ],
--            "time": "2017-11-08T17:04:47+00:00"
-+            "time": "2019-05-20T14:15:55+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/guzzle",
-+            "version": "6.3.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/guzzle.git",
-+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "guzzlehttp/promises": "^1.0",
-+                "guzzlehttp/psr7": "^1.4",
-+                "php": ">=5.5"
-+            },
-+            "require-dev": {
-+                "ext-curl": "*",
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-+                "psr/log": "^1.0"
-+            },
-+            "suggest": {
-+                "psr/log": "Required for using the Log middleware"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "6.3-dev"
-+                }
-+            },
-+            "autoload": {
-+                "files": [
-+                    "src/functions_include.php"
-+                ],
-+                "psr-4": {
-+                    "GuzzleHttp\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                }
-+            ],
-+            "description": "Guzzle is a PHP HTTP client library",
-+            "homepage": "http://guzzlephp.org/",
-+            "keywords": [
-+                "client",
-+                "curl",
-+                "framework",
-+                "http",
-+                "http client",
-+                "rest",
-+                "web service"
-+            ],
-+            "time": "2018-04-22T15:46:56+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/promises",
-+            "version": "v1.3.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/promises.git",
-+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.5.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.4-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "GuzzleHttp\\Promise\\": "src/"
-+                },
-+                "files": [
-+                    "src/functions_include.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                }
-+            ],
-+            "description": "Guzzle promises library",
-+            "keywords": [
-+                "promise"
-+            ],
-+            "time": "2016-12-20T10:07:11+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/psr7",
-+            "version": "1.5.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/psr7.git",
-+                "reference": "9f83dded91781a01c63574e387eaa769be769115"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
-+                "reference": "9f83dded91781a01c63574e387eaa769be769115",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.4.0",
-+                "psr/http-message": "~1.0",
-+                "ralouphie/getallheaders": "^2.0.5"
-+            },
-+            "provide": {
-+                "psr/http-message-implementation": "1.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.5-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "GuzzleHttp\\Psr7\\": "src/"
-+                },
-+                "files": [
-+                    "src/functions_include.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                },
-+                {
-+                    "name": "Tobias Schultze",
-+                    "homepage": "https://github.com/Tobion"
-+                }
-+            ],
-+            "description": "PSR-7 message implementation that also provides common utility methods",
-+            "keywords": [
-+                "http",
-+                "message",
-+                "psr-7",
-+                "request",
-+                "response",
-+                "stream",
-+                "uri",
-+                "url"
-+            ],
-+            "time": "2018-12-04T20:46:45+00:00"
-         },
-         {
-             "name": "guzzlehttp/ringphp",
-@@ -691,23 +878,23 @@
-         },
-         {
-             "name": "justinrainbow/json-schema",
--            "version": "5.2.7",
-+            "version": "5.2.8",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/justinrainbow/json-schema.git",
--                "reference": "8560d4314577199ba51bf2032f02cd1315587c23"
-+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/8560d4314577199ba51bf2032f02cd1315587c23",
--                "reference": "8560d4314577199ba51bf2032f02cd1315587c23",
-+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4",
-+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": ">=5.3.3"
-             },
-             "require-dev": {
--                "friendsofphp/php-cs-fixer": "^2.1",
-+                "friendsofphp/php-cs-fixer": "~2.2.20",
-                 "json-schema/json-schema-test-suite": "1.2.0",
-                 "phpunit/phpunit": "^4.8.35"
-             },
-@@ -753,7 +940,7 @@
-                 "json",
-                 "schema"
-             ],
--            "time": "2018-02-14T22:26:30+00:00"
-+            "time": "2019-01-14T23:55:14+00:00"
-         },
-         {
-             "name": "magento/composer",
-@@ -919,16 +1106,16 @@
-         },
-         {
-             "name": "monolog/monolog",
--            "version": "1.23.0",
-+            "version": "1.24.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/Seldaek/monolog.git",
--                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
-+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
--                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
-+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
-+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
-                 "shasum": ""
-             },
-             "require": {
-@@ -993,7 +1180,7 @@
-                 "logging",
-                 "psr-3"
-             ],
--            "time": "2017-06-19T01:22:40+00:00"
-+            "time": "2018-11-05T09:00:11+00:00"
-         },
-         {
-             "name": "oyejorge/less.php",
-@@ -1059,33 +1246,29 @@
-         },
-         {
-             "name": "paragonie/random_compat",
--            "version": "v2.0.17",
-+            "version": "v9.99.99",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/paragonie/random_compat.git",
--                "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d"
-+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d",
--                "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d",
-+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.2.0"
-+                "php": "^7"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "4.*|5.*"
-+                "phpunit/phpunit": "4.*|5.*",
-+                "vimeo/psalm": "^1"
-             },
-             "suggest": {
-                 "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-             },
-             "type": "library",
--            "autoload": {
--                "files": [
--                    "lib/random.php"
--                ]
--            },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-@@ -1104,25 +1287,25 @@
-                 "pseudorandom",
-                 "random"
-             ],
--            "time": "2018-07-04T16:31:37+00:00"
-+            "time": "2018-07-02T15:55:56+00:00"
-         },
-         {
-             "name": "paragonie/sodium_compat",
--            "version": "v1.6.3",
-+            "version": "v1.10.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/paragonie/sodium_compat.git",
--                "reference": "7d0549c3947eaea620f4e523f42ab236cf7fd304"
-+                "reference": "228a9fc64cf4ba84c7967c1076d94209db03e0ee"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/7d0549c3947eaea620f4e523f42ab236cf7fd304",
--                "reference": "7d0549c3947eaea620f4e523f42ab236cf7fd304",
-+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/228a9fc64cf4ba84c7967c1076d94209db03e0ee",
-+                "reference": "228a9fc64cf4ba84c7967c1076d94209db03e0ee",
-                 "shasum": ""
-             },
-             "require": {
-                 "paragonie/random_compat": ">=1",
--                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7"
-+                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
-             },
-             "require-dev": {
-                 "phpunit/phpunit": "^3|^4|^5"
-@@ -1186,28 +1369,33 @@
-                 "secret-key cryptography",
-                 "side-channel resistant"
-             ],
--            "time": "2018-06-06T17:30:29+00:00"
-+            "time": "2019-05-13T16:04:50+00:00"
-         },
-         {
-             "name": "pelago/emogrifier",
--            "version": "v2.0.0",
-+            "version": "v2.1.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/MyIntervals/emogrifier.git",
--                "reference": "8babf8ddbf348f26b29674e2f84db66ff7e3d95e"
-+                "reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/8babf8ddbf348f26b29674e2f84db66ff7e3d95e",
--                "reference": "8babf8ddbf348f26b29674e2f84db66ff7e3d95e",
-+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/8ee7fb5ad772915451ed3415c1992bd3697d4983",
-+                "reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983",
-                 "shasum": ""
-             },
-             "require": {
--                "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0"
-+                "ext-dom": "*",
-+                "ext-libxml": "*",
-+                "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
-+                "symfony/css-selector": "^3.4.0 || ^4.0.0"
-             },
-             "require-dev": {
-+                "friendsofphp/php-cs-fixer": "^2.2.0",
-+                "phpmd/phpmd": "^2.6.0",
-                 "phpunit/phpunit": "^4.8.0",
--                "squizlabs/php_codesniffer": "^3.1.0"
-+                "squizlabs/php_codesniffer": "^3.3.2"
-             },
-             "type": "library",
-             "extra": {
-@@ -1217,7 +1405,7 @@
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Pelago\\": "Classes/"
-+                    "Pelago\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -1235,10 +1423,6 @@
-                 {
-                     "name": "Jaime Prado"
-                 },
--                {
--                    "name": "Roman Ožana",
--                    "email": "ozana@omdesign.cz"
--                },
-                 {
-                     "name": "Oliver Klee",
-                     "email": "github@oliverklee.de"
-@@ -1246,6 +1430,10 @@
-                 {
-                     "name": "Zoli Szabó",
-                     "email": "zoli.szabo+github@gmail.com"
-+                },
-+                {
-+                    "name": "Jake Hotson",
-+                    "email": "jake@qzdesign.co.uk"
-                 }
-             ],
-             "description": "Converts CSS styles into inline style attributes in your HTML code",
-@@ -1255,20 +1443,20 @@
-                 "email",
-                 "pre-processing"
-             ],
--            "time": "2018-01-05T23:30:21+00:00"
-+            "time": "2018-12-10T10:36:30+00:00"
-         },
-         {
-             "name": "php-amqplib/php-amqplib",
--            "version": "v2.7.2",
-+            "version": "v2.7.3",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/php-amqplib/php-amqplib.git",
--                "reference": "dfd3694a86f1a7394d3693485259d4074a6ec79b"
-+                "reference": "a8ba54bd35b973fc6861e4c2e105f71e9e95f43f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/dfd3694a86f1a7394d3693485259d4074a6ec79b",
--                "reference": "dfd3694a86f1a7394d3693485259d4074a6ec79b",
-+                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/a8ba54bd35b973fc6861e4c2e105f71e9e95f43f",
-+                "reference": "a8ba54bd35b973fc6861e4c2e105f71e9e95f43f",
-                 "shasum": ""
-             },
-             "require": {
-@@ -1326,25 +1514,25 @@
-                 "queue",
-                 "rabbitmq"
-             ],
--            "time": "2018-02-11T19:28:00+00:00"
-+            "time": "2018-04-30T03:54:54+00:00"
-         },
-         {
-             "name": "phpseclib/mcrypt_compat",
--            "version": "1.0.5",
-+            "version": "1.0.8",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpseclib/mcrypt_compat.git",
--                "reference": "9646c46c7286284bd6c774b0c02f172fa302b879"
-+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/9646c46c7286284bd6c774b0c02f172fa302b879",
--                "reference": "9646c46c7286284bd6c774b0c02f172fa302b879",
-+                "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
-+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": ">=5.3.3",
--                "phpseclib/phpseclib": ">=2.0.10 <3.0.0"
-+                "phpseclib/phpseclib": ">=2.0.11 <3.0.0"
-             },
-             "require-dev": {
-                 "phpunit/phpunit": "^4.8.35|^5.7|^6.0"
-@@ -1375,20 +1563,20 @@
-                 "encryption",
-                 "mcrypt"
-             ],
--            "time": "2018-04-15T18:49:21+00:00"
-+            "time": "2018-08-22T03:11:43+00:00"
-         },
-         {
-             "name": "phpseclib/phpseclib",
--            "version": "2.0.11",
-+            "version": "2.0.18",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpseclib/phpseclib.git",
--                "reference": "7053f06f91b3de78e143d430e55a8f7889efc08b"
-+                "reference": "60519001db8d791215a822efd366d24cafee9e63"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7053f06f91b3de78e143d430e55a8f7889efc08b",
--                "reference": "7053f06f91b3de78e143d430e55a8f7889efc08b",
-+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/60519001db8d791215a822efd366d24cafee9e63",
-+                "reference": "60519001db8d791215a822efd366d24cafee9e63",
-                 "shasum": ""
-             },
-             "require": {
-@@ -1467,7 +1655,7 @@
-                 "x.509",
-                 "x509"
-             ],
--            "time": "2018-04-15T16:55:05+00:00"
-+            "time": "2019-06-13T06:15:54+00:00"
-         },
-         {
-             "name": "psr/container",
-@@ -1570,16 +1758,16 @@
-         },
-         {
-             "name": "psr/log",
--            "version": "1.0.2",
-+            "version": "1.1.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/php-fig/log.git",
--                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
-+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
--                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-+                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                 "shasum": ""
-             },
-             "require": {
-@@ -1613,25 +1801,66 @@
-                 "psr",
-                 "psr-3"
-             ],
--            "time": "2016-10-10T12:19:37+00:00"
-+            "time": "2018-11-20T15:27:04+00:00"
-+        },
-+        {
-+            "name": "ralouphie/getallheaders",
-+            "version": "2.0.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/ralouphie/getallheaders.git",
-+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
-+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~3.7.0",
-+                "satooshi/php-coveralls": ">=1.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "src/getallheaders.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Ralph Khattar",
-+                    "email": "ralph.khattar@gmail.com"
-+                }
-+            ],
-+            "description": "A polyfill for getallheaders.",
-+            "time": "2016-02-11T07:05:27+00:00"
-         },
-         {
-             "name": "ramsey/uuid",
--            "version": "3.7.3",
-+            "version": "3.8.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/ramsey/uuid.git",
--                "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76"
-+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/ramsey/uuid/zipball/44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
--                "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
-+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
-+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
-                 "shasum": ""
-             },
-             "require": {
--                "paragonie/random_compat": "^1.0|^2.0",
--                "php": "^5.4 || ^7.0"
-+                "paragonie/random_compat": "^1.0|^2.0|9.99.99",
-+                "php": "^5.4 || ^7.0",
-+                "symfony/polyfill-ctype": "^1.8"
-             },
-             "replace": {
-                 "rhumsaa/uuid": "self.version"
-@@ -1639,16 +1868,17 @@
-             "require-dev": {
-                 "codeception/aspect-mock": "^1.0 | ~2.0.0",
-                 "doctrine/annotations": "~1.2.0",
--                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
-+                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
-                 "ircmaxell/random-lib": "^1.1",
-                 "jakub-onderka/php-parallel-lint": "^0.9.0",
-                 "mockery/mockery": "^0.9.9",
-                 "moontoast/math": "^1.1",
-                 "php-mock/php-mock-phpunit": "^0.3|^1.1",
--                "phpunit/phpunit": "^4.7|^5.0",
-+                "phpunit/phpunit": "^4.7|^5.0|^6.5",
-                 "squizlabs/php_codesniffer": "^2.3"
-             },
-             "suggest": {
-+                "ext-ctype": "Provides support for PHP Ctype functions",
-                 "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
-                 "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
-                 "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
-@@ -1693,20 +1923,20 @@
-                 "identifier",
-                 "uuid"
-             ],
--            "time": "2018-01-20T00:28:24+00:00"
-+            "time": "2018-07-19T23:38:55+00:00"
-         },
-         {
-             "name": "react/promise",
--            "version": "v2.7.0",
-+            "version": "v2.7.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/reactphp/promise.git",
--                "reference": "f4edc2581617431aea50430749db55cc3fc031b3"
-+                "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/reactphp/promise/zipball/f4edc2581617431aea50430749db55cc3fc031b3",
--                "reference": "f4edc2581617431aea50430749db55cc3fc031b3",
-+                "url": "https://api.github.com/repos/reactphp/promise/zipball/31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
-+                "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
-                 "shasum": ""
-             },
-             "require": {
-@@ -1739,7 +1969,7 @@
-                 "promise",
-                 "promises"
-             ],
--            "time": "2018-06-13T15:59:06+00:00"
-+            "time": "2019-01-07T21:25:54+00:00"
-         },
-         {
-             "name": "seld/jsonlint",
-@@ -1836,16 +2066,16 @@
-         },
-         {
-             "name": "symfony/console",
--            "version": "v4.1.3",
-+            "version": "v4.1.12",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/symfony/console.git",
--                "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f"
-+                "reference": "9e87c798f67dc9fceeb4f3d57847b52d945d1a02"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/console/zipball/ca80b8ced97cf07390078b29773dc384c39eee1f",
--                "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f",
-+                "url": "https://api.github.com/repos/symfony/console/zipball/9e87c798f67dc9fceeb4f3d57847b52d945d1a02",
-+                "reference": "9e87c798f67dc9fceeb4f3d57847b52d945d1a02",
-                 "shasum": ""
-             },
-             "require": {
-@@ -1856,6 +2086,9 @@
-                 "symfony/dependency-injection": "<3.4",
-                 "symfony/process": "<3.3"
-             },
-+            "provide": {
-+                "psr/log-implementation": "1.0"
-+            },
-             "require-dev": {
-                 "psr/log": "~1.0",
-                 "symfony/config": "~3.4|~4.0",
-@@ -1865,7 +2098,7 @@
-                 "symfony/process": "~3.4|~4.0"
-             },
-             "suggest": {
--                "psr/log-implementation": "For using the console logger",
-+                "psr/log": "For using the console logger",
-                 "symfony/event-dispatcher": "",
-                 "symfony/lock": "",
-                 "symfony/process": ""
-@@ -1900,48 +2133,34 @@
-             ],
-             "description": "Symfony Console Component",
-             "homepage": "https://symfony.com",
--            "time": "2018-07-26T11:24:31+00:00"
-+            "time": "2019-01-25T14:34:37+00:00"
-         },
-         {
--            "name": "symfony/event-dispatcher",
--            "version": "v4.1.3",
-+            "name": "symfony/css-selector",
-+            "version": "v4.3.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/event-dispatcher.git",
--                "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e"
-+                "url": "https://github.com/symfony/css-selector.git",
-+                "reference": "105c98bb0c5d8635bea056135304bd8edcc42b4d"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bfb30c2ad377615a463ebbc875eba64a99f6aa3e",
--                "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e",
-+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/105c98bb0c5d8635bea056135304bd8edcc42b4d",
-+                "reference": "105c98bb0c5d8635bea056135304bd8edcc42b4d",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": "^7.1.3"
-             },
--            "conflict": {
--                "symfony/dependency-injection": "<3.4"
--            },
--            "require-dev": {
--                "psr/log": "~1.0",
--                "symfony/config": "~3.4|~4.0",
--                "symfony/dependency-injection": "~3.4|~4.0",
--                "symfony/expression-language": "~3.4|~4.0",
--                "symfony/stopwatch": "~3.4|~4.0"
--            },
--            "suggest": {
--                "symfony/dependency-injection": "",
--                "symfony/http-kernel": ""
--            },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "4.1-dev"
-+                    "dev-master": "4.3-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Symfony\\Component\\EventDispatcher\\": ""
-+                    "Symfony\\Component\\CssSelector\\": ""
-                 },
-                 "exclude-from-classmap": [
-                     "/Tests/"
-@@ -1953,9 +2172,76 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
-+                    "name": "Jean-François Simon",
-+                    "email": "jeanfrancois.simon@sensiolabs.com"
-+                },
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony CssSelector Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-16T21:53:39+00:00"
-+        },
-+        {
-+            "name": "symfony/event-dispatcher",
-+            "version": "v4.1.12",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/event-dispatcher.git",
-+                "reference": "51be1b61dfe04d64a260223f2b81475fa8066b97"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/51be1b61dfe04d64a260223f2b81475fa8066b97",
-+                "reference": "51be1b61dfe04d64a260223f2b81475fa8066b97",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3"
-+            },
-+            "conflict": {
-+                "symfony/dependency-injection": "<3.4"
-+            },
-+            "require-dev": {
-+                "psr/log": "~1.0",
-+                "symfony/config": "~3.4|~4.0",
-+                "symfony/dependency-injection": "~3.4|~4.0",
-+                "symfony/expression-language": "~3.4|~4.0",
-+                "symfony/stopwatch": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/dependency-injection": "",
-+                "symfony/http-kernel": ""
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\EventDispatcher\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-                 {
-                     "name": "Symfony Community",
-                     "homepage": "https://symfony.com/contributors"
-@@ -1963,20 +2249,20 @@
-             ],
-             "description": "Symfony EventDispatcher Component",
-             "homepage": "https://symfony.com",
--            "time": "2018-07-26T09:10:45+00:00"
-+            "time": "2019-01-16T18:35:49+00:00"
-         },
-         {
-             "name": "symfony/filesystem",
--            "version": "v4.1.3",
-+            "version": "v4.3.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/symfony/filesystem.git",
--                "reference": "2e30335e0aafeaa86645555959572fe7cea22b43"
-+                "reference": "bf2af40d738dec5e433faea7b00daa4431d0a4cf"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/filesystem/zipball/2e30335e0aafeaa86645555959572fe7cea22b43",
--                "reference": "2e30335e0aafeaa86645555959572fe7cea22b43",
-+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/bf2af40d738dec5e433faea7b00daa4431d0a4cf",
-+                "reference": "bf2af40d738dec5e433faea7b00daa4431d0a4cf",
-                 "shasum": ""
-             },
-             "require": {
-@@ -1986,7 +2272,7 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "4.1-dev"
-+                    "dev-master": "4.3-dev"
-                 }
-             },
-             "autoload": {
-@@ -2013,20 +2299,20 @@
-             ],
-             "description": "Symfony Filesystem Component",
-             "homepage": "https://symfony.com",
--            "time": "2018-07-26T11:24:31+00:00"
-+            "time": "2019-06-03T20:27:40+00:00"
-         },
-         {
-             "name": "symfony/finder",
--            "version": "v4.1.3",
-+            "version": "v4.3.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/symfony/finder.git",
--                "reference": "e162f1df3102d0b7472805a5a9d5db9fcf0a8068"
-+                "reference": "b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/finder/zipball/e162f1df3102d0b7472805a5a9d5db9fcf0a8068",
--                "reference": "e162f1df3102d0b7472805a5a9d5db9fcf0a8068",
-+                "url": "https://api.github.com/repos/symfony/finder/zipball/b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176",
-+                "reference": "b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176",
-                 "shasum": ""
-             },
-             "require": {
-@@ -2035,7 +2321,7 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "4.1-dev"
-+                    "dev-master": "4.3-dev"
-                 }
-             },
-             "autoload": {
-@@ -2062,20 +2348,20 @@
-             ],
-             "description": "Symfony Finder Component",
-             "homepage": "https://symfony.com",
--            "time": "2018-07-26T11:24:31+00:00"
-+            "time": "2019-05-26T20:47:49+00:00"
-         },
-         {
-             "name": "symfony/polyfill-ctype",
--            "version": "v1.9.0",
-+            "version": "v1.11.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/symfony/polyfill-ctype.git",
--                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
-+                "reference": "82ebae02209c21113908c229e9883c419720738a"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
--                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
-+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
-+                "reference": "82ebae02209c21113908c229e9883c419720738a",
-                 "shasum": ""
-             },
-             "require": {
-@@ -2087,7 +2373,7 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.9-dev"
-+                    "dev-master": "1.11-dev"
-                 }
-             },
-             "autoload": {
-@@ -2109,7 +2395,7 @@
-                 },
-                 {
-                     "name": "Gert de Pagter",
--                    "email": "BackEndTea@gmail.com"
-+                    "email": "backendtea@gmail.com"
-                 }
-             ],
-             "description": "Symfony polyfill for ctype functions",
-@@ -2120,20 +2406,20 @@
-                 "polyfill",
-                 "portable"
-             ],
--            "time": "2018-08-06T14:22:27+00:00"
-+            "time": "2019-02-06T07:57:58+00:00"
-         },
-         {
-             "name": "symfony/polyfill-mbstring",
--            "version": "v1.9.0",
-+            "version": "v1.11.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/symfony/polyfill-mbstring.git",
--                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
-+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
--                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
-+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
-+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
-                 "shasum": ""
-             },
-             "require": {
-@@ -2145,7 +2431,7 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.9-dev"
-+                    "dev-master": "1.11-dev"
-                 }
-             },
-             "autoload": {
-@@ -2179,20 +2465,20 @@
-                 "portable",
-                 "shim"
-             ],
--            "time": "2018-08-06T14:22:27+00:00"
-+            "time": "2019-02-06T07:57:58+00:00"
-         },
-         {
-             "name": "symfony/process",
--            "version": "v4.1.3",
-+            "version": "v4.1.12",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/symfony/process.git",
--                "reference": "f01fc7a4493572f7f506c49dcb50ad01fb3a2f56"
-+                "reference": "72d838aafaa7c790330fe362b9cecec362c64629"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/process/zipball/f01fc7a4493572f7f506c49dcb50ad01fb3a2f56",
--                "reference": "f01fc7a4493572f7f506c49dcb50ad01fb3a2f56",
-+                "url": "https://api.github.com/repos/symfony/process/zipball/72d838aafaa7c790330fe362b9cecec362c64629",
-+                "reference": "72d838aafaa7c790330fe362b9cecec362c64629",
-                 "shasum": ""
-             },
-             "require": {
-@@ -2228,20 +2514,20 @@
-             ],
-             "description": "Symfony Process Component",
-             "homepage": "https://symfony.com",
--            "time": "2018-07-26T11:24:31+00:00"
-+            "time": "2019-01-16T19:07:26+00:00"
-         },
-         {
-             "name": "tedivm/jshrink",
--            "version": "v1.3.0",
-+            "version": "v1.3.2",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/tedious/JShrink.git",
--                "reference": "68ce379b213741e86f02bf6053b0d26b9f833448"
-+                "reference": "d9b51729f3c6692c2da3e3fe6c5cd7c9d1d3fa8f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/tedious/JShrink/zipball/68ce379b213741e86f02bf6053b0d26b9f833448",
--                "reference": "68ce379b213741e86f02bf6053b0d26b9f833448",
-+                "url": "https://api.github.com/repos/tedious/JShrink/zipball/d9b51729f3c6692c2da3e3fe6c5cd7c9d1d3fa8f",
-+                "reference": "d9b51729f3c6692c2da3e3fe6c5cd7c9d1d3fa8f",
-                 "shasum": ""
-             },
-             "require": {
-@@ -2274,7 +2560,7 @@
-                 "javascript",
-                 "minifier"
-             ],
--            "time": "2017-12-08T00:59:56+00:00"
-+            "time": "2019-06-15T23:11:19+00:00"
-         },
-         {
-             "name": "true/punycode",
-@@ -2377,25 +2663,26 @@
-         },
-         {
-             "name": "webonyx/graphql-php",
--            "version": "v0.11.6",
-+            "version": "v0.12.6",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/webonyx/graphql-php.git",
--                "reference": "f438a726cd523bc584e78d866eca270165c42fd5"
-+                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/f438a726cd523bc584e78d866eca270165c42fd5",
--                "reference": "f438a726cd523bc584e78d866eca270165c42fd5",
-+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
-+                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
-                 "shasum": ""
-             },
-             "require": {
-                 "ext-mbstring": "*",
--                "php": ">=5.5,<8.0-DEV"
-+                "php": ">=5.6"
-             },
-             "require-dev": {
-                 "phpunit/phpunit": "^4.8",
--                "psr/http-message": "^1.0"
-+                "psr/http-message": "^1.0",
-+                "react/promise": "2.*"
-             },
-             "suggest": {
-                 "psr/http-message": "To use standard GraphQL server",
-@@ -2403,9 +2690,6 @@
-             },
-             "type": "library",
-             "autoload": {
--                "files": [
--                    "src/deprecated.php"
--                ],
-                 "psr-4": {
-                     "GraphQL\\": "src/"
-                 }
-@@ -2420,7 +2704,7 @@
-                 "api",
-                 "graphql"
-             ],
--            "time": "2018-04-17T10:34:43+00:00"
-+            "time": "2018-09-02T14:59:54+00:00"
-         },
-         {
-             "name": "zendframework/zend-captcha",
-@@ -2694,16 +2978,16 @@
-         },
-         {
-             "name": "zendframework/zend-db",
--            "version": "2.9.3",
-+            "version": "2.10.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/zendframework/zend-db.git",
--                "reference": "5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9"
-+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9",
--                "reference": "5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9",
-+                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
-+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
-                 "shasum": ""
-             },
-             "require": {
-@@ -2714,7 +2998,7 @@
-                 "phpunit/phpunit": "^5.7.25 || ^6.4.4",
-                 "zendframework/zend-coding-standard": "~1.0.0",
-                 "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
--                "zendframework/zend-hydrator": "^1.1 || ^2.1",
-+                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
-                 "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-             },
-             "suggest": {
-@@ -2748,7 +3032,7 @@
-                 "db",
-                 "zf"
-             ],
--            "time": "2018-04-09T13:21:36+00:00"
-+            "time": "2019-02-25T11:37:45+00:00"
-         },
-         {
-             "name": "zendframework/zend-di",
-@@ -2799,16 +3083,16 @@
-         },
-         {
-             "name": "zendframework/zend-diactoros",
--            "version": "1.8.5",
-+            "version": "1.8.6",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/zendframework/zend-diactoros.git",
--                "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87"
-+                "reference": "20da13beba0dde8fb648be3cc19765732790f46e"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/3e4edb822c942f37ade0d09579cfbab11e2fee87",
--                "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87",
-+                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e",
-+                "reference": "20da13beba0dde8fb648be3cc19765732790f46e",
-                 "shasum": ""
-             },
-             "require": {
-@@ -2821,6 +3105,7 @@
-             "require-dev": {
-                 "ext-dom": "*",
-                 "ext-libxml": "*",
-+                "php-http/psr7-integration-tests": "dev-master",
-                 "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
-                 "zendframework/zend-coding-standard": "~1.0"
-             },
-@@ -2858,7 +3143,7 @@
-                 "psr",
-                 "psr-7"
-             ],
--            "time": "2018-08-10T14:16:32+00:00"
-+            "time": "2018-09-05T19:29:37+00:00"
-         },
-         {
-             "name": "zendframework/zend-escaper",
-@@ -3015,16 +3300,16 @@
-         },
-         {
-             "name": "zendframework/zend-filter",
--            "version": "2.8.0",
-+            "version": "2.9.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/zendframework/zend-filter.git",
--                "reference": "7b997dbe79459f1652deccc8786d7407fb66caa9"
-+                "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/7b997dbe79459f1652deccc8786d7407fb66caa9",
--                "reference": "7b997dbe79459f1652deccc8786d7407fb66caa9",
-+                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/1c3e6d02f9cd5f6c929c9859498f5efbe216e86f",
-+                "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f",
-                 "shasum": ""
-             },
-             "require": {
-@@ -3037,12 +3322,14 @@
-             "require-dev": {
-                 "pear/archive_tar": "^1.4.3",
-                 "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "psr/http-factory": "^1.0",
-                 "zendframework/zend-coding-standard": "~1.0.0",
-                 "zendframework/zend-crypt": "^3.2.1",
-                 "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-                 "zendframework/zend-uri": "^2.6"
-             },
-             "suggest": {
-+                "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters",
-                 "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
-                 "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
-                 "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
-@@ -3051,8 +3338,8 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.8.x-dev",
--                    "dev-develop": "2.9.x-dev"
-+                    "dev-master": "2.9.x-dev",
-+                    "dev-develop": "2.10.x-dev"
-                 },
-                 "zf": {
-                     "component": "Zend\\Filter",
-@@ -3074,25 +3361,25 @@
-                 "filter",
-                 "zf"
-             ],
--            "time": "2018-04-11T16:20:04+00:00"
-+            "time": "2018-12-17T16:00:04+00:00"
-         },
-         {
-             "name": "zendframework/zend-form",
--            "version": "2.12.0",
-+            "version": "2.13.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/zendframework/zend-form.git",
--                "reference": "565fb4f4bb3e0dbeea0173c923c4a8be77de9441"
-+                "reference": "c713a12ccbd43148b71c9339e171ca11e3f8a1da"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/565fb4f4bb3e0dbeea0173c923c4a8be77de9441",
--                "reference": "565fb4f4bb3e0dbeea0173c923c4a8be77de9441",
-+                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/c713a12ccbd43148b71c9339e171ca11e3f8a1da",
-+                "reference": "c713a12ccbd43148b71c9339e171ca11e3f8a1da",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": "^5.6 || ^7.0",
--                "zendframework/zend-hydrator": "^1.1 || ^2.1",
-+                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
-                 "zendframework/zend-inputfilter": "^2.8",
-                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
-@@ -3126,8 +3413,8 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.12.x-dev",
--                    "dev-develop": "2.13.x-dev"
-+                    "dev-master": "2.13.x-dev",
-+                    "dev-develop": "2.14.x-dev"
-                 },
-                 "zf": {
-                     "component": "Zend\\Form",
-@@ -3152,20 +3439,20 @@
-                 "form",
-                 "zf"
-             ],
--            "time": "2018-05-16T18:49:44+00:00"
-+            "time": "2018-12-11T22:51:29+00:00"
-         },
-         {
-             "name": "zendframework/zend-http",
--            "version": "2.8.2",
-+            "version": "2.8.4",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/zendframework/zend-http.git",
--                "reference": "2c8aed3d25522618573194e7cc51351f8cd4a45b"
-+                "reference": "d160aedc096be230af0fe9c31151b2b33ad4e807"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/2c8aed3d25522618573194e7cc51351f8cd4a45b",
--                "reference": "2c8aed3d25522618573194e7cc51351f8cd4a45b",
-+                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/d160aedc096be230af0fe9c31151b2b33ad4e807",
-+                "reference": "d160aedc096be230af0fe9c31151b2b33ad4e807",
-                 "shasum": ""
-             },
-             "require": {
-@@ -3207,7 +3494,7 @@
-                 "zend",
-                 "zf"
-             ],
--            "time": "2018-08-13T18:47:03+00:00"
-+            "time": "2019-02-07T17:47:08+00:00"
-         },
-         {
-             "name": "zendframework/zend-hydrator",
-@@ -3337,34 +3624,38 @@
-         },
-         {
-             "name": "zendframework/zend-inputfilter",
--            "version": "2.8.2",
-+            "version": "2.10.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/zendframework/zend-inputfilter.git",
--                "reference": "3f02179e014d9ef0faccda2ad6c65d38adc338d8"
-+                "reference": "4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/3f02179e014d9ef0faccda2ad6c65d38adc338d8",
--                "reference": "3f02179e014d9ef0faccda2ad6c65d38adc338d8",
-+                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c",
-+                "reference": "4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": "^5.6 || ^7.0",
--                "zendframework/zend-filter": "^2.6",
-+                "zendframework/zend-filter": "^2.9.1",
-                 "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1",
-                 "zendframework/zend-stdlib": "^2.7 || ^3.0",
--                "zendframework/zend-validator": "^2.10.1"
-+                "zendframework/zend-validator": "^2.11"
-             },
-             "require-dev": {
-                 "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "psr/http-message": "^1.0",
-                 "zendframework/zend-coding-standard": "~1.0.0"
-             },
-+            "suggest": {
-+                "psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads"
-+            },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.8.x-dev",
--                    "dev-develop": "2.9.x-dev"
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-                 },
-                 "zf": {
-                     "component": "Zend\\InputFilter",
-@@ -3386,7 +3677,7 @@
-                 "inputfilter",
-                 "zf"
-             ],
--            "time": "2018-05-14T17:38:03+00:00"
-+            "time": "2019-01-30T16:58:51+00:00"
-         },
-         {
-             "name": "zendframework/zend-json",
-@@ -3623,16 +3914,16 @@
-         },
-         {
-             "name": "zendframework/zend-math",
--            "version": "2.7.0",
-+            "version": "2.7.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/zendframework/zend-math.git",
--                "reference": "f4358090d5d23973121f1ed0b376184b66d9edec"
-+                "reference": "1abce074004dacac1a32cd54de94ad47ef960d38"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/f4358090d5d23973121f1ed0b376184b66d9edec",
--                "reference": "f4358090d5d23973121f1ed0b376184b66d9edec",
-+                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/1abce074004dacac1a32cd54de94ad47ef960d38",
-+                "reference": "1abce074004dacac1a32cd54de94ad47ef960d38",
-                 "shasum": ""
-             },
-             "require": {
-@@ -3669,7 +3960,7 @@
-                 "math",
-                 "zf2"
-             ],
--            "time": "2016-04-07T16:29:53+00:00"
-+            "time": "2018-12-04T15:34:17+00:00"
-         },
-         {
-             "name": "zendframework/zend-mime",
-@@ -4151,16 +4442,16 @@
-         },
-         {
-             "name": "zendframework/zend-soap",
--            "version": "2.7.0",
-+            "version": "2.8.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/zendframework/zend-soap.git",
--                "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284"
-+                "reference": "8762d79efa220d82529c43ce08d70554146be645"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/af03c32f0db2b899b3df8cfe29aeb2b49857d284",
--                "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284",
-+                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/8762d79efa220d82529c43ce08d70554146be645",
-+                "reference": "8762d79efa220d82529c43ce08d70554146be645",
-                 "shasum": ""
-             },
-             "require": {
-@@ -4200,7 +4491,7 @@
-                 "soap",
-                 "zf2"
-             ],
--            "time": "2018-01-29T17:51:26+00:00"
-+            "time": "2019-04-30T16:45:35+00:00"
-         },
-         {
-             "name": "zendframework/zend-stdlib",
-@@ -4311,16 +4602,16 @@
-         },
-         {
-             "name": "zendframework/zend-uri",
--            "version": "2.6.1",
-+            "version": "2.7.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/zendframework/zend-uri.git",
--                "reference": "3b6463645c6766f78ce537c70cb4fdabee1e725f"
-+                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/3b6463645c6766f78ce537c70cb4fdabee1e725f",
--                "reference": "3b6463645c6766f78ce537c70cb4fdabee1e725f",
-+                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/b2785cd38fe379a784645449db86f21b7739b1ee",
-+                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee",
-                 "shasum": ""
-             },
-             "require": {
-@@ -4335,8 +4626,8 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.6.x-dev",
--                    "dev-develop": "2.7.x-dev"
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-                 }
-             },
-             "autoload": {
-@@ -4354,20 +4645,20 @@
-                 "uri",
-                 "zf"
-             ],
--            "time": "2018-04-30T13:40:08+00:00"
-+            "time": "2019-02-27T21:39:04+00:00"
-         },
-         {
-             "name": "zendframework/zend-validator",
--            "version": "2.10.2",
-+            "version": "2.11.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/zendframework/zend-validator.git",
--                "reference": "38109ed7d8e46cfa71bccbe7e6ca80cdd035f8c9"
-+                "reference": "3c28dfe4e5951ba38059cea895244d9d206190b3"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/38109ed7d8e46cfa71bccbe7e6ca80cdd035f8c9",
--                "reference": "38109ed7d8e46cfa71bccbe7e6ca80cdd035f8c9",
-+                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/3c28dfe4e5951ba38059cea895244d9d206190b3",
-+                "reference": "3c28dfe4e5951ba38059cea895244d9d206190b3",
-                 "shasum": ""
-             },
-             "require": {
-@@ -4377,6 +4668,7 @@
-             },
-             "require-dev": {
-                 "phpunit/phpunit": "^6.0.8 || ^5.7.15",
-+                "psr/http-message": "^1.0",
-                 "zendframework/zend-cache": "^2.6.1",
-                 "zendframework/zend-coding-standard": "~1.0.0",
-                 "zendframework/zend-config": "^2.6",
-@@ -4390,6 +4682,7 @@
-                 "zendframework/zend-uri": "^2.5"
-             },
-             "suggest": {
-+                "psr/http-message": "psr/http-message, required when validating PSR-7 UploadedFileInterface instances via the Upload and UploadFile validators",
-                 "zendframework/zend-db": "Zend\\Db component, required by the (No)RecordExists validator",
-                 "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
-                 "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages",
-@@ -4402,8 +4695,8 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.10.x-dev",
--                    "dev-develop": "2.11.x-dev"
-+                    "dev-master": "2.11.x-dev",
-+                    "dev-develop": "2.12.x-dev"
-                 },
-                 "zf": {
-                     "component": "Zend\\Validator",
-@@ -4425,25 +4718,26 @@
-                 "validator",
-                 "zf2"
-             ],
--            "time": "2018-02-01T17:05:33+00:00"
-+            "time": "2019-01-29T22:26:39+00:00"
-         },
-         {
-             "name": "zendframework/zend-view",
--            "version": "2.10.0",
-+            "version": "2.10.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/zendframework/zend-view.git",
--                "reference": "4478cc5dd960e2339d88b363ef99fa278700e80e"
-+                "reference": "c1a3f2043fb75b5983ab9adfc369ae396601be7e"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/4478cc5dd960e2339d88b363ef99fa278700e80e",
--                "reference": "4478cc5dd960e2339d88b363ef99fa278700e80e",
-+                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/c1a3f2043fb75b5983ab9adfc369ae396601be7e",
-+                "reference": "c1a3f2043fb75b5983ab9adfc369ae396601be7e",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": "^5.6 || ^7.0",
-                 "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-json": "^2.6.1",
-                 "zendframework/zend-loader": "^2.5",
-                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
-@@ -4459,10 +4753,9 @@
-                 "zendframework/zend-filter": "^2.6.1",
-                 "zendframework/zend-http": "^2.5.4",
-                 "zendframework/zend-i18n": "^2.6",
--                "zendframework/zend-json": "^2.6.1",
-                 "zendframework/zend-log": "^2.7",
-                 "zendframework/zend-modulemanager": "^2.7.1",
--                "zendframework/zend-mvc": "^2.7 || ^3.0",
-+                "zendframework/zend-mvc": "^2.7.14 || ^3.0",
-                 "zendframework/zend-navigation": "^2.5",
-                 "zendframework/zend-paginator": "^2.5",
-                 "zendframework/zend-permissions-acl": "^2.6",
-@@ -4479,8 +4772,8 @@
-                 "zendframework/zend-filter": "Zend\\Filter component",
-                 "zendframework/zend-http": "Zend\\Http component",
-                 "zendframework/zend-i18n": "Zend\\I18n component",
--                "zendframework/zend-json": "Zend\\Json component",
-                 "zendframework/zend-mvc": "Zend\\Mvc component",
-+                "zendframework/zend-mvc-plugin-flashmessenger": "zend-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with zend-mvc versions 3 and up",
-                 "zendframework/zend-navigation": "Zend\\Navigation component",
-                 "zendframework/zend-paginator": "Zend\\Paginator component",
-                 "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
-@@ -4512,22 +4805,22 @@
-                 "view",
-                 "zf2"
-             ],
--            "time": "2018-01-17T22:21:50+00:00"
-+            "time": "2018-12-06T21:20:01+00:00"
-         }
-     ],
-     "packages-dev": [
-         {
-             "name": "allure-framework/allure-codeception",
--            "version": "1.2.7",
-+            "version": "1.3.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/allure-framework/allure-codeception.git",
--                "reference": "48598f4b4603b50b663bfe977260113a40912131"
-+                "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/48598f4b4603b50b663bfe977260113a40912131",
--                "reference": "48598f4b4603b50b663bfe977260113a40912131",
-+                "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/9d31d781b3622b028f1f6210bc76ba88438bd518",
-+                "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518",
-                 "shasum": ""
-             },
-             "require": {
-@@ -4565,7 +4858,7 @@
-                 "steps",
-                 "testing"
-             ],
--            "time": "2018-03-07T11:18:27+00:00"
-+            "time": "2018-12-18T19:47:23+00:00"
-         },
-         {
-             "name": "allure-framework/allure-php-api",
-@@ -4619,18 +4912,68 @@
-             ],
-             "time": "2016-12-07T12:15:46+00:00"
-         },
-+        {
-+            "name": "allure-framework/allure-phpunit",
-+            "version": "1.2.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/allure-framework/allure-phpunit.git",
-+                "reference": "45504aeba41304cf155a898fa9ac1aae79f4a089"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/allure-framework/allure-phpunit/zipball/45504aeba41304cf155a898fa9ac1aae79f4a089",
-+                "reference": "45504aeba41304cf155a898fa9ac1aae79f4a089",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "allure-framework/allure-php-api": "~1.1.0",
-+                "mikey179/vfsstream": "1.*",
-+                "php": ">=7.0.0",
-+                "phpunit/phpunit": ">=6.0.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Yandex": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Ivan Krutov",
-+                    "email": "vania-pooh@yandex-team.ru",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "A PHPUnit adapter for Allure report.",
-+            "homepage": "http://allure.qatools.ru/",
-+            "keywords": [
-+                "allure",
-+                "attachments",
-+                "cases",
-+                "phpunit",
-+                "report",
-+                "steps",
-+                "testing"
-+            ],
-+            "time": "2017-11-03T13:08:21+00:00"
-+        },
-         {
-             "name": "behat/gherkin",
--            "version": "v4.4.5",
-+            "version": "v4.6.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/Behat/Gherkin.git",
--                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74"
-+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74",
--                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74",
-+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07",
-+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07",
-                 "shasum": ""
-             },
-             "require": {
-@@ -4638,8 +4981,8 @@
-             },
-             "require-dev": {
-                 "phpunit/phpunit": "~4.5|~5",
--                "symfony/phpunit-bridge": "~2.7|~3",
--                "symfony/yaml": "~2.3|~3"
-+                "symfony/phpunit-bridge": "~2.7|~3|~4",
-+                "symfony/yaml": "~2.3|~3|~4"
-             },
-             "suggest": {
-                 "symfony/yaml": "If you want to parse features, represented in YAML files"
-@@ -4676,35 +5019,32 @@
-                 "gherkin",
-                 "parser"
-             ],
--            "time": "2016-10-30T11:50:56+00:00"
-+            "time": "2019-01-16T14:22:17+00:00"
-         },
-         {
-             "name": "codeception/codeception",
--            "version": "2.3.9",
-+            "version": "2.4.5",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/Codeception/Codeception.git",
--                "reference": "104f46fa0bde339f1bcc3a375aac21eb36e65a1e"
-+                "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/104f46fa0bde339f1bcc3a375aac21eb36e65a1e",
--                "reference": "104f46fa0bde339f1bcc3a375aac21eb36e65a1e",
-+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/5fee32d5c82791548931cbc34806b4de6aa1abfc",
-+                "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc",
-                 "shasum": ""
-             },
-             "require": {
--                "behat/gherkin": "~4.4.0",
--                "codeception/stub": "^1.0",
-+                "behat/gherkin": "^4.4.0",
-+                "codeception/phpunit-wrapper": "^6.0.9|^7.0.6",
-+                "codeception/stub": "^2.0",
-                 "ext-json": "*",
-                 "ext-mbstring": "*",
-                 "facebook/webdriver": ">=1.1.3 <2.0",
-                 "guzzlehttp/guzzle": ">=4.1.4 <7.0",
-                 "guzzlehttp/psr7": "~1.0",
--                "php": ">=5.4.0 <8.0",
--                "phpunit/php-code-coverage": ">=2.2.4 <6.0",
--                "phpunit/phpunit": ">=4.8.28 <5.0.0 || >=5.6.3 <7.0",
--                "sebastian/comparator": ">1.1 <3.0",
--                "sebastian/diff": ">=1.4 <3.0",
-+                "php": ">=5.6.0 <8.0",
-                 "symfony/browser-kit": ">=2.7 <5.0",
-                 "symfony/console": ">=2.7 <5.0",
-                 "symfony/css-selector": ">=2.7 <5.0",
-@@ -4770,27 +5110,70 @@
-                 "functional testing",
-                 "unit testing"
-             ],
--            "time": "2018-02-26T23:29:41+00:00"
-+            "time": "2018-08-01T07:21:49+00:00"
-         },
-         {
--            "name": "codeception/stub",
--            "version": "1.0.4",
-+            "name": "codeception/phpunit-wrapper",
-+            "version": "6.6.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/Codeception/Stub.git",
--                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805"
-+                "url": "https://github.com/Codeception/phpunit-wrapper.git",
-+                "reference": "d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/Codeception/Stub/zipball/681b62348837a5ef07d10d8a226f5bc358cc8805",
--                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805",
-+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c",
-+                "reference": "d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c",
-                 "shasum": ""
-             },
-             "require": {
--                "phpunit/phpunit-mock-objects": ">2.3 <7.0"
-+                "phpunit/php-code-coverage": ">=4.0.4 <6.0",
-+                "phpunit/phpunit": ">=6.5.13 <7.0",
-+                "sebastian/comparator": ">=1.2.4 <3.0",
-+                "sebastian/diff": ">=1.4 <4.0"
-+            },
-+            "replace": {
-+                "codeception/phpunit-wrapper": "*"
-             },
-             "require-dev": {
--                "phpunit/phpunit": ">=4.8 <8.0"
-+                "codeception/specify": "*",
-+                "vlucas/phpdotenv": "^3.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Codeception\\PHPUnit\\": "src\\"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Davert",
-+                    "email": "davert.php@resend.cc"
-+                }
-+            ],
-+            "description": "PHPUnit classes used by Codeception",
-+            "time": "2019-02-26T20:47:39+00:00"
-+        },
-+        {
-+            "name": "codeception/stub",
-+            "version": "2.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Codeception/Stub.git",
-+                "reference": "853657f988942f7afb69becf3fd0059f192c705a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/853657f988942f7afb69becf3fd0059f192c705a",
-+                "reference": "853657f988942f7afb69becf3fd0059f192c705a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3"
-             },
-             "type": "library",
-             "autoload": {
-@@ -4803,38 +5186,82 @@
-                 "MIT"
-             ],
-             "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
--            "time": "2018-05-17T09:31:08+00:00"
-+            "time": "2019-03-02T15:35:10+00:00"
-         },
-         {
-             "name": "consolidation/annotated-command",
--            "version": "2.8.5",
-+            "version": "2.12.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/consolidation/annotated-command.git",
--                "reference": "1e8ff512072422b850b44aa721b5b303e4a5ebb3"
-+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/1e8ff512072422b850b44aa721b5b303e4a5ebb3",
--                "reference": "1e8ff512072422b850b44aa721b5b303e4a5ebb3",
-+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789",
-+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789",
-                 "shasum": ""
-             },
-             "require": {
--                "consolidation/output-formatters": "^3.1.12",
--                "php": ">=5.4.0",
-+                "consolidation/output-formatters": "^3.4",
-+                "php": ">=5.4.5",
-                 "psr/log": "^1",
-                 "symfony/console": "^2.8|^3|^4",
-                 "symfony/event-dispatcher": "^2.5|^3|^4",
-                 "symfony/finder": "^2.5|^3|^4"
-             },
-             "require-dev": {
--                "g1a/composer-test-scenarios": "^2",
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-                 "phpunit/phpunit": "^6",
--                "satooshi/php-coveralls": "^2",
-                 "squizlabs/php_codesniffer": "^2.7"
-             },
-             "type": "library",
-             "extra": {
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        },
-+                        "scenario-options": {
-+                            "create-lockfile": "false"
-+                        }
-+                    },
-+                    "phpunit4": {
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    }
-+                },
-                 "branch-alias": {
-                     "dev-master": "2.x-dev"
-                 }
-@@ -4855,20 +5282,20 @@
-                 }
-             ],
-             "description": "Initialize Symfony Console commands from annotated command class methods.",
--            "time": "2018-08-18T23:51:49+00:00"
-+            "time": "2019-03-08T16:55:03+00:00"
-         },
-         {
-             "name": "consolidation/config",
--            "version": "1.1.0",
-+            "version": "1.2.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/consolidation/config.git",
--                "reference": "c9fc25e9088a708637e18a256321addc0670e578"
-+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/consolidation/config/zipball/c9fc25e9088a708637e18a256321addc0670e578",
--                "reference": "c9fc25e9088a708637e18a256321addc0670e578",
-+                "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
-+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
-                 "shasum": ""
-             },
-             "require": {
-@@ -4877,9 +5304,9 @@
-                 "php": ">=5.4.0"
-             },
-             "require-dev": {
--                "g1a/composer-test-scenarios": "^1",
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-                 "phpunit/phpunit": "^5",
--                "satooshi/php-coveralls": "^1.0",
-                 "squizlabs/php_codesniffer": "2.*",
-                 "symfony/console": "^2.5|^3|^4",
-                 "symfony/yaml": "^2.8.11|^3|^4"
-@@ -4889,6 +5316,33 @@
-             },
-             "type": "library",
-             "extra": {
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require-dev": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require-dev": {
-+                            "symfony/console": "^2.8",
-+                            "symfony/event-dispatcher": "^2.8",
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    }
-+                },
-                 "branch-alias": {
-                     "dev-master": "1.x-dev"
-                 }
-@@ -4909,35 +5363,76 @@
-                 }
-             ],
-             "description": "Provide configuration services for a commandline tool.",
--            "time": "2018-08-07T22:57:00+00:00"
-+            "time": "2019-03-03T19:37:04+00:00"
-         },
-         {
-             "name": "consolidation/log",
--            "version": "1.0.6",
-+            "version": "1.1.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/consolidation/log.git",
--                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395"
-+                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395",
--                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395",
-+                "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
-+                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.5.0",
--                "psr/log": "~1.0",
-+                "php": ">=5.4.5",
-+                "psr/log": "^1.0",
-                 "symfony/console": "^2.8|^3|^4"
-             },
-             "require-dev": {
--                "g1a/composer-test-scenarios": "^1",
--                "phpunit/phpunit": "4.*",
--                "satooshi/php-coveralls": "^2",
--                "squizlabs/php_codesniffer": "2.*"
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/phpunit": "^6",
-+                "squizlabs/php_codesniffer": "^2"
-             },
-             "type": "library",
-             "extra": {
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    },
-+                    "phpunit4": {
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    }
-+                },
-                 "branch-alias": {
-                     "dev-master": "1.x-dev"
-                 }
-@@ -4958,33 +5453,33 @@
-                 }
-             ],
-             "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
--            "time": "2018-05-25T18:14:39+00:00"
-+            "time": "2019-01-01T17:30:51+00:00"
-         },
-         {
-             "name": "consolidation/output-formatters",
--            "version": "3.2.1",
-+            "version": "3.5.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/consolidation/output-formatters.git",
--                "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5"
-+                "reference": "99ec998ffb697e0eada5aacf81feebfb13023605"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d78ef59aea19d3e2e5a23f90a055155ee78a0ad5",
--                "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5",
-+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/99ec998ffb697e0eada5aacf81feebfb13023605",
-+                "reference": "99ec998ffb697e0eada5aacf81feebfb13023605",
-                 "shasum": ""
-             },
-             "require": {
-+                "dflydev/dot-access-data": "^1.1.0",
-                 "php": ">=5.4.0",
-                 "symfony/console": "^2.8|^3|^4",
-                 "symfony/finder": "^2.5|^3|^4"
-             },
-             "require-dev": {
--                "g1a/composer-test-scenarios": "^2",
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-                 "phpunit/phpunit": "^5.7.27",
--                "satooshi/php-coveralls": "^2",
-                 "squizlabs/php_codesniffer": "^2.7",
--                "symfony/console": "3.2.3",
-                 "symfony/var-dumper": "^2.8|^3|^4",
-                 "victorjonsson/markdowndocs": "^1.3"
-             },
-@@ -4993,6 +5488,52 @@
-             },
-             "type": "library",
-             "extra": {
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^6"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony3": {
-+                        "require": {
-+                            "symfony/console": "^3.4",
-+                            "symfony/finder": "^3.4",
-+                            "symfony/var-dumper": "^3.4"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.6.32"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        },
-+                        "scenario-options": {
-+                            "create-lockfile": "false"
-+                        }
-+                    }
-+                },
-                 "branch-alias": {
-                     "dev-master": "3.x-dev"
-                 }
-@@ -5013,29 +5554,28 @@
-                 }
-             ],
-             "description": "Format text by applying transformations provided by plug-in formatters.",
--            "time": "2018-05-25T18:02:34+00:00"
-+            "time": "2019-05-30T23:16:01+00:00"
-         },
-         {
-             "name": "consolidation/robo",
--            "version": "1.3.1",
-+            "version": "1.4.9",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/consolidation/Robo.git",
--                "reference": "31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d"
-+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/consolidation/Robo/zipball/31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d",
--                "reference": "31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d",
-+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
-+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
-                 "shasum": ""
-             },
-             "require": {
--                "consolidation/annotated-command": "^2.8.2",
--                "consolidation/config": "^1.0.10",
-+                "consolidation/annotated-command": "^2.10.2",
-+                "consolidation/config": "^1.2",
-                 "consolidation/log": "~1",
-                 "consolidation/output-formatters": "^3.1.13",
-                 "consolidation/self-update": "^1",
--                "g1a/composer-test-scenarios": "^2",
-                 "grasmash/yaml-expander": "^1.3",
-                 "league/container": "^2.2",
-                 "php": ">=5.5.0",
-@@ -5052,14 +5592,15 @@
-                 "codeception/aspect-mock": "^1|^2.1.1",
-                 "codeception/base": "^2.3.7",
-                 "codeception/verify": "^0.3.2",
-+                "g1a/composer-test-scenarios": "^3",
-                 "goaop/framework": "~2.1.2",
-                 "goaop/parser-reflection": "^1.1.0",
-                 "natxet/cssmin": "3.0.4",
-                 "nikic/php-parser": "^3.1.5",
-                 "patchwork/jsqueeze": "~2",
--                "pear/archive_tar": "^1.4.2",
-+                "pear/archive_tar": "^1.4.4",
-+                "php-coveralls/php-coveralls": "^1",
-                 "phpunit/php-code-coverage": "~2|~4",
--                "satooshi/php-coveralls": "^2",
-                 "squizlabs/php_codesniffer": "^2.8"
-             },
-             "suggest": {
-@@ -5073,9 +5614,36 @@
-             ],
-             "type": "library",
-             "extra": {
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "remove": [
-+                            "goaop/framework"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.5.9"
-+                            }
-+                        },
-+                        "scenario-options": {
-+                            "create-lockfile": "false"
-+                        }
-+                    }
-+                },
-                 "branch-alias": {
--                    "dev-master": "1.x-dev",
--                    "dev-state": "1.x-dev"
-+                    "dev-master": "2.x-dev"
-                 }
-             },
-             "autoload": {
-@@ -5094,20 +5662,20 @@
-                 }
-             ],
-             "description": "Modern task runner",
--            "time": "2018-08-17T18:44:18+00:00"
-+            "time": "2019-03-19T18:07:19+00:00"
-         },
-         {
-             "name": "consolidation/self-update",
--            "version": "1.0.0",
-+            "version": "1.1.5",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/consolidation/self-update.git",
--                "reference": "adbb784e58cc0836d8522851f7e38ee7ade0d553"
-+                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/consolidation/self-update/zipball/adbb784e58cc0836d8522851f7e38ee7ade0d553",
--                "reference": "adbb784e58cc0836d8522851f7e38ee7ade0d553",
-+                "url": "https://api.github.com/repos/consolidation/self-update/zipball/a1c273b14ce334789825a09d06d4c87c0a02ad54",
-+                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54",
-                 "shasum": ""
-             },
-             "require": {
-@@ -5115,6 +5683,9 @@
-                 "symfony/console": "^2.8|^3|^4",
-                 "symfony/filesystem": "^2.5|^3|^4"
-             },
-+            "bin": [
-+                "scripts/release"
-+            ],
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
-@@ -5131,13 +5702,17 @@
-                 "MIT"
-             ],
-             "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                },
-                 {
-                     "name": "Alexander Menk",
-                     "email": "menk@mestrona.net"
-                 }
-             ],
-             "description": "Provides a self:update command for Symfony Console applications.",
--            "time": "2018-08-17T04:50:59+00:00"
-+            "time": "2018-10-28T01:52:03+00:00"
-         },
-         {
-             "name": "dflydev/dot-access-data",
-@@ -5200,16 +5775,16 @@
-         },
-         {
-             "name": "doctrine/annotations",
--            "version": "v1.6.0",
-+            "version": "v1.6.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/doctrine/annotations.git",
--                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5"
-+                "reference": "53120e0eb10355388d6ccbe462f1fea34ddadb24"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
--                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
-+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/53120e0eb10355388d6ccbe462f1fea34ddadb24",
-+                "reference": "53120e0eb10355388d6ccbe462f1fea34ddadb24",
-                 "shasum": ""
-             },
-             "require": {
-@@ -5264,38 +5839,40 @@
-                 "docblock",
-                 "parser"
-             ],
--            "time": "2017-12-06T07:11:42+00:00"
-+            "time": "2019-03-25T19:12:02+00:00"
-         },
-         {
-             "name": "doctrine/collections",
--            "version": "v1.5.0",
-+            "version": "v1.6.2",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/doctrine/collections.git",
--                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
-+                "reference": "c5e0bc17b1620e97c968ac409acbff28b8b850be"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
--                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
-+                "url": "https://api.github.com/repos/doctrine/collections/zipball/c5e0bc17b1620e97c968ac409acbff28b8b850be",
-+                "reference": "c5e0bc17b1620e97c968ac409acbff28b8b850be",
-                 "shasum": ""
-             },
-             "require": {
--                "php": "^7.1"
-+                "php": "^7.1.3"
-             },
-             "require-dev": {
--                "doctrine/coding-standard": "~0.1@dev",
--                "phpunit/phpunit": "^5.7"
-+                "doctrine/coding-standard": "^6.0",
-+                "phpstan/phpstan-shim": "^0.9.2",
-+                "phpunit/phpunit": "^7.0",
-+                "vimeo/psalm": "^3.2.2"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.3.x-dev"
-+                    "dev-master": "1.6.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Doctrine\\Common\\Collections\\": "lib/"
-+                "psr-4": {
-+                    "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -5324,38 +5901,41 @@
-                     "email": "schmittjoh@gmail.com"
-                 }
-             ],
--            "description": "Collections Abstraction library",
--            "homepage": "http://www.doctrine-project.org",
-+            "description": "PHP Doctrine Collections library that adds additional functionality on top of PHP arrays.",
-+            "homepage": "https://www.doctrine-project.org/projects/collections.html",
-             "keywords": [
-                 "array",
-                 "collections",
--                "iterator"
-+                "iterators",
-+                "php"
-             ],
--            "time": "2017-07-22T10:37:32+00:00"
-+            "time": "2019-06-09T13:48:14+00:00"
-         },
-         {
-             "name": "doctrine/instantiator",
--            "version": "1.1.0",
-+            "version": "1.2.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/doctrine/instantiator.git",
--                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
-+                "reference": "a2c590166b2133a4633738648b6b064edae0814a"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
--                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
-+                "reference": "a2c590166b2133a4633738648b6b064edae0814a",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": "^7.1"
-             },
-             "require-dev": {
--                "athletic/athletic": "~0.1.8",
-+                "doctrine/coding-standard": "^6.0",
-                 "ext-pdo": "*",
-                 "ext-phar": "*",
--                "phpunit/phpunit": "^6.2.3",
--                "squizlabs/php_codesniffer": "^3.0.2"
-+                "phpbench/phpbench": "^0.13",
-+                "phpstan/phpstan-phpunit": "^0.11",
-+                "phpstan/phpstan-shim": "^0.11",
-+                "phpunit/phpunit": "^7.0"
-             },
-             "type": "library",
-             "extra": {
-@@ -5380,30 +5960,33 @@
-                 }
-             ],
-             "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
--            "homepage": "https://github.com/doctrine/instantiator",
-+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
-             "keywords": [
-                 "constructor",
-                 "instantiate"
-             ],
--            "time": "2017-07-22T11:58:36+00:00"
-+            "time": "2019-03-17T17:37:11+00:00"
-         },
-         {
-             "name": "doctrine/lexer",
--            "version": "v1.0.1",
-+            "version": "1.0.2",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/doctrine/lexer.git",
--                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
-+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
--                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
-+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
-+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": ">=5.3.2"
-             },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.5"
-+            },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
-@@ -5411,8 +5994,8 @@
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Doctrine\\Common\\Lexer\\": "lib/"
-+                "psr-4": {
-+                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -5433,13 +6016,16 @@
-                     "email": "schmittjoh@gmail.com"
-                 }
-             ],
--            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
--            "homepage": "http://www.doctrine-project.org",
-+            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
-+            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
-             "keywords": [
-+                "annotations",
-+                "docblock",
-                 "lexer",
--                "parser"
-+                "parser",
-+                "php"
-             ],
--            "time": "2014-09-09T13:34:57+00:00"
-+            "time": "2019-06-08T11:03:04+00:00"
-         },
-         {
-             "name": "epfremme/swagger-php",
-@@ -5489,16 +6075,16 @@
-         },
-         {
-             "name": "facebook/webdriver",
--            "version": "1.6.0",
-+            "version": "1.7.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/facebook/php-webdriver.git",
--                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e"
-+                "reference": "e43de70f3c7166169d0f14a374505392734160e5"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/bd8c740097eb9f2fc3735250fc1912bc811a954e",
--                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e",
-+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/e43de70f3c7166169d0f14a374505392734160e5",
-+                "reference": "e43de70f3c7166169d0f14a374505392734160e5",
-                 "shasum": ""
-             },
-             "require": {
-@@ -5545,7 +6131,7 @@
-                 "selenium",
-                 "webdriver"
-             ],
--            "time": "2018-05-16T17:37:13+00:00"
-+            "time": "2019-06-13T08:02:18+00:00"
-         },
-         {
-             "name": "flow/jsonpath",
-@@ -5590,16 +6176,16 @@
-         },
-         {
-             "name": "friendsofphp/php-cs-fixer",
--            "version": "v2.12.3",
-+            "version": "v2.13.3",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
--                "reference": "b23d49981cfc95497d03081aeb6df6575196a0d3"
-+                "reference": "38d6f2e9be2aa80bf3c7365612af7f9eb9078719"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/b23d49981cfc95497d03081aeb6df6575196a0d3",
--                "reference": "b23d49981cfc95497d03081aeb6df6575196a0d3",
-+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/38d6f2e9be2aa80bf3c7365612af7f9eb9078719",
-+                "reference": "38d6f2e9be2aa80bf3c7365612af7f9eb9078719",
-                 "shasum": ""
-             },
-             "require": {
-@@ -5610,7 +6196,7 @@
-                 "ext-tokenizer": "*",
-                 "php": "^5.6 || >=7.0 <7.3",
-                 "php-cs-fixer/diff": "^1.3",
--                "symfony/console": "^3.2 || ^4.0",
-+                "symfony/console": "^3.4.17 || ^4.1.6",
-                 "symfony/event-dispatcher": "^3.0 || ^4.0",
-                 "symfony/filesystem": "^3.0 || ^4.0",
-                 "symfony/finder": "^3.0 || ^4.0",
-@@ -5626,7 +6212,7 @@
-             "require-dev": {
-                 "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
-                 "justinrainbow/json-schema": "^5.0",
--                "keradus/cli-executor": "^1.1",
-+                "keradus/cli-executor": "^1.2",
-                 "mikey179/vfsstream": "^1.6",
-                 "php-coveralls/php-coveralls": "^2.1",
-                 "php-cs-fixer/accessible-object": "^1.0",
-@@ -5677,7 +6263,7 @@
-                 }
-             ],
-             "description": "A tool to automatically fix PHP code style",
--            "time": "2018-08-19T22:33:38+00:00"
-+            "time": "2019-01-04T18:24:28+00:00"
-         },
-         {
-             "name": "fzaninotto/faker",
-@@ -5729,39 +6315,6 @@
-             ],
-             "time": "2018-07-12T10:23:15+00:00"
-         },
--        {
--            "name": "g1a/composer-test-scenarios",
--            "version": "2.2.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/g1a/composer-test-scenarios.git",
--                "reference": "a166fd15191aceab89f30c097e694b7cf3db4880"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/g1a/composer-test-scenarios/zipball/a166fd15191aceab89f30c097e694b7cf3db4880",
--                "reference": "a166fd15191aceab89f30c097e694b7cf3db4880",
--                "shasum": ""
--            },
--            "bin": [
--                "scripts/create-scenario",
--                "scripts/dependency-licenses",
--                "scripts/install-scenario"
--            ],
--            "type": "library",
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Greg Anderson",
--                    "email": "greg.1.anderson@greenknowe.org"
--                }
--            ],
--            "description": "Useful scripts for testing multiple sets of Composer dependencies.",
--            "time": "2018-08-08T23:37:23+00:00"
--        },
-         {
-             "name": "grasmash/expander",
-             "version": "1.0.0",
-@@ -5857,199 +6410,18 @@
-             "description": "Expands internal property references in a yaml file.",
-             "time": "2017-12-16T16:06:03+00:00"
-         },
--        {
--            "name": "guzzlehttp/guzzle",
--            "version": "6.3.3",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/guzzle/guzzle.git",
--                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
--                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
--                "shasum": ""
--            },
--            "require": {
--                "guzzlehttp/promises": "^1.0",
--                "guzzlehttp/psr7": "^1.4",
--                "php": ">=5.5"
--            },
--            "require-dev": {
--                "ext-curl": "*",
--                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
--                "psr/log": "^1.0"
--            },
--            "suggest": {
--                "psr/log": "Required for using the Log middleware"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "6.3-dev"
--                }
--            },
--            "autoload": {
--                "files": [
--                    "src/functions_include.php"
--                ],
--                "psr-4": {
--                    "GuzzleHttp\\": "src/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Michael Dowling",
--                    "email": "mtdowling@gmail.com",
--                    "homepage": "https://github.com/mtdowling"
--                }
--            ],
--            "description": "Guzzle is a PHP HTTP client library",
--            "homepage": "http://guzzlephp.org/",
--            "keywords": [
--                "client",
--                "curl",
--                "framework",
--                "http",
--                "http client",
--                "rest",
--                "web service"
--            ],
--            "time": "2018-04-22T15:46:56+00:00"
--        },
--        {
--            "name": "guzzlehttp/promises",
--            "version": "v1.3.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/guzzle/promises.git",
--                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
--                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.5.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^4.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.4-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "GuzzleHttp\\Promise\\": "src/"
--                },
--                "files": [
--                    "src/functions_include.php"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Michael Dowling",
--                    "email": "mtdowling@gmail.com",
--                    "homepage": "https://github.com/mtdowling"
--                }
--            ],
--            "description": "Guzzle promises library",
--            "keywords": [
--                "promise"
--            ],
--            "time": "2016-12-20T10:07:11+00:00"
--        },
--        {
--            "name": "guzzlehttp/psr7",
--            "version": "1.4.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/guzzle/psr7.git",
--                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
--                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.4.0",
--                "psr/http-message": "~1.0"
--            },
--            "provide": {
--                "psr/http-message-implementation": "1.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "~4.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.4-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "GuzzleHttp\\Psr7\\": "src/"
--                },
--                "files": [
--                    "src/functions_include.php"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Michael Dowling",
--                    "email": "mtdowling@gmail.com",
--                    "homepage": "https://github.com/mtdowling"
--                },
--                {
--                    "name": "Tobias Schultze",
--                    "homepage": "https://github.com/Tobion"
--                }
--            ],
--            "description": "PSR-7 message implementation that also provides common utility methods",
--            "keywords": [
--                "http",
--                "message",
--                "request",
--                "response",
--                "stream",
--                "uri",
--                "url"
--            ],
--            "time": "2017-03-20T17:10:46+00:00"
--        },
-         {
-             "name": "jms/metadata",
--            "version": "1.6.0",
-+            "version": "1.7.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/schmittjoh/metadata.git",
--                "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab"
-+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/6a06970a10e0a532fb52d3959547123b84a3b3ab",
--                "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab",
-+                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/e5854ab1aa643623dc64adde718a8eec32b957a8",
-+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8",
-                 "shasum": ""
-             },
-             "require": {
-@@ -6072,9 +6444,13 @@
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "Apache-2.0"
-+                "MIT"
-             ],
-             "authors": [
-+                {
-+                    "name": "Asmir Mustafic",
-+                    "email": "goetas@gmail.com"
-+                },
-                 {
-                     "name": "Johannes M. Schmitt",
-                     "email": "schmittjoh@gmail.com"
-@@ -6087,7 +6463,7 @@
-                 "xml",
-                 "yaml"
-             ],
--            "time": "2016-12-05T10:18:33+00:00"
-+            "time": "2018-10-26T12:40:10+00:00"
-         },
-         {
-             "name": "jms/parser-lib",
-@@ -6126,16 +6502,16 @@
-         },
-         {
-             "name": "jms/serializer",
--            "version": "1.13.0",
-+            "version": "1.14.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/schmittjoh/serializer.git",
--                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c"
-+                "reference": "ee96d57024af9a7716d56fcbe3aa94b3d030f3ca"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
--                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
-+                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/ee96d57024af9a7716d56fcbe3aa94b3d030f3ca",
-+                "reference": "ee96d57024af9a7716d56fcbe3aa94b3d030f3ca",
-                 "shasum": ""
-             },
-             "require": {
-@@ -6175,7 +6551,7 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-1.x": "1.13-dev"
-+                    "dev-1.x": "1.14-dev"
-                 }
-             },
-             "autoload": {
-@@ -6206,7 +6582,7 @@
-                 "serialization",
-                 "xml"
-             ],
--            "time": "2018-07-25T13:58:54+00:00"
-+            "time": "2019-04-17T08:12:16+00:00"
-         },
-         {
-             "name": "league/container",
-@@ -6340,41 +6716,73 @@
-             ],
-             "time": "2018-02-14T22:37:14+00:00"
-         },
-+        {
-+            "name": "magento/magento-coding-standard",
-+            "version": "1.0.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/magento/magento-coding-standard.git",
-+                "reference": "f7de26fb6add389d1b42286f67ee87424588a868"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/magento/magento-coding-standard/zipball/f7de26fb6add389d1b42286f67ee87424588a868",
-+                "reference": "f7de26fb6add389d1b42286f67ee87424588a868",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.6.0",
-+                "squizlabs/php_codesniffer": "~3.3.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
-+            },
-+            "type": "phpcodesniffer-standard",
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "A set of Magento specific PHP CodeSniffer rules.",
-+            "time": "2019-04-05T19:05:17+00:00"
-+        },
-         {
-             "name": "magento/magento2-functional-testing-framework",
--            "version": "2.3.4",
-+            "version": "2.4.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
--                "reference": "ac56e5a6520dd580658034ae53d3724985c2a901"
-+                "reference": "9b5de03fe069d4a36c911112c30b824ff4e80c3a"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/ac56e5a6520dd580658034ae53d3724985c2a901",
--                "reference": "ac56e5a6520dd580658034ae53d3724985c2a901",
-+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/9b5de03fe069d4a36c911112c30b824ff4e80c3a",
-+                "reference": "9b5de03fe069d4a36c911112c30b824ff4e80c3a",
-                 "shasum": ""
-             },
-             "require": {
--                "allure-framework/allure-codeception": "~1.2.6",
--                "codeception/codeception": "~2.3.4",
-+                "allure-framework/allure-codeception": "~1.3.0",
-+                "codeception/codeception": "~2.3.4 || ~2.4.0 ",
-                 "consolidation/robo": "^1.0.0",
-                 "epfremme/swagger-php": "^2.0",
-+                "ext-curl": "*",
-                 "flow/jsonpath": ">0.2",
-                 "fzaninotto/faker": "^1.6",
-                 "monolog/monolog": "^1.0",
-                 "mustache/mustache": "~2.5",
--                "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
-+                "php": "7.0.2||7.0.4||~7.0.6||~7.1.0||~7.2.0||~7.3.0",
-                 "symfony/process": "^2.8 || ^3.1 || ^4.0",
-                 "vlucas/phpdotenv": "^2.4"
-             },
-             "require-dev": {
--                "brainmaestro/composer-git-hooks": "^2.3",
-+                "brainmaestro/composer-git-hooks": "^2.3.1",
-                 "codacy/coverage": "^1.4",
-                 "codeception/aspect-mock": "^3.0",
-                 "doctrine/cache": "<1.7.0",
-                 "goaop/framework": "2.2.0",
-                 "php-coveralls/php-coveralls": "^1.0",
-                 "phpmd/phpmd": "^2.6.0",
-+                "phpunit/phpunit": "~6.5.0 || ~7.0.0",
-                 "rregeer/phpunit-coverage-check": "^0.1.4",
-                 "sebastian/phpcpd": "~3.0 || ~4.0",
-                 "squizlabs/php_codesniffer": "~3.2",
-@@ -6409,7 +6817,53 @@
-                 "magento",
-                 "testing"
-             ],
--            "time": "2018-08-10T20:16:42+00:00"
-+            "time": "2019-06-10T17:57:40+00:00"
-+        },
-+        {
-+            "name": "mikey179/vfsstream",
-+            "version": "v1.6.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/bovigo/vfsStream.git",
-+                "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
-+                "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.5"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.6.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "org\\bovigo\\vfs\\": "src/main/php"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Frank Kleine",
-+                    "homepage": "http://frankkleine.de/",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "Virtual file system to mock the real file system in unit tests.",
-+            "homepage": "http://vfs.bovigo.org/",
-+            "time": "2019-04-08T13:54:32+00:00"
-         },
-         {
-             "name": "moontoast/math",
-@@ -6508,16 +6962,16 @@
-         },
-         {
-             "name": "myclabs/deep-copy",
--            "version": "1.8.1",
-+            "version": "1.9.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/myclabs/DeepCopy.git",
--                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
-+                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
--                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
-+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
-+                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
-                 "shasum": ""
-             },
-             "require": {
-@@ -6552,7 +7006,7 @@
-                 "object",
-                 "object graph"
-             ],
--            "time": "2018-06-11T23:09:50+00:00"
-+            "time": "2019-04-07T13:18:21+00:00"
-         },
-         {
-             "name": "pdepend/pdepend",
-@@ -6851,16 +7305,16 @@
-         },
-         {
-             "name": "phpdocumentor/reflection-docblock",
--            "version": "4.3.0",
-+            "version": "4.3.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
--                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
-+                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
--                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
-+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
-+                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
-                 "shasum": ""
-             },
-             "require": {
-@@ -6898,7 +7352,7 @@
-                 }
-             ],
-             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
--            "time": "2017-11-30T07:14:17+00:00"
-+            "time": "2019-04-30T17:48:53+00:00"
-         },
-         {
-             "name": "phpdocumentor/type-resolver",
-@@ -7065,16 +7519,16 @@
-         },
-         {
-             "name": "phpspec/prophecy",
--            "version": "1.8.0",
-+            "version": "1.8.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpspec/prophecy.git",
--                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
-+                "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
--                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
-+                "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
-                 "shasum": ""
-             },
-             "require": {
-@@ -7095,8 +7549,8 @@
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Prophecy\\": "src/"
-+                "psr-4": {
-+                    "Prophecy\\": "src/Prophecy"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -7124,7 +7578,7 @@
-                 "spy",
-                 "stub"
-             ],
--            "time": "2018-08-05T17:53:17+00:00"
-+            "time": "2019-06-13T12:50:23+00:00"
-         },
-         {
-             "name": "phpunit/php-code-coverage",
-@@ -7377,16 +7831,16 @@
-         },
-         {
-             "name": "phpunit/phpunit",
--            "version": "6.5.11",
-+            "version": "6.5.14",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/sebastianbergmann/phpunit.git",
--                "reference": "7bab54cb366076023bbf457a2a0d513332cd40f2"
-+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7bab54cb366076023bbf457a2a0d513332cd40f2",
--                "reference": "7bab54cb366076023bbf457a2a0d513332cd40f2",
-+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7",
-+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7",
-                 "shasum": ""
-             },
-             "require": {
-@@ -7457,7 +7911,7 @@
-                 "testing",
-                 "xunit"
-             ],
--            "time": "2018-08-07T07:05:35+00:00"
-+            "time": "2019-02-01T05:22:47+00:00"
-         },
-         {
-             "name": "phpunit/phpunit-mock-objects",
-@@ -7516,6 +7970,7 @@
-                 "mock",
-                 "xunit"
-             ],
-+            "abandoned": true,
-             "time": "2018-08-09T05:50:03+00:00"
-         },
-         {
-@@ -8168,16 +8623,16 @@
-         },
-         {
-             "name": "squizlabs/php_codesniffer",
--            "version": "3.3.0",
-+            "version": "3.3.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
--                "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266"
-+                "reference": "628a481780561150481a9ec74709092b9759b3ec"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d86873af43b4aa9d1f39a3601cc0cfcf02b25266",
--                "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266",
-+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/628a481780561150481a9ec74709092b9759b3ec",
-+                "reference": "628a481780561150481a9ec74709092b9759b3ec",
-                 "shasum": ""
-             },
-             "require": {
-@@ -8215,20 +8670,20 @@
-                 "phpcs",
-                 "standards"
-             ],
--            "time": "2018-06-06T23:58:19+00:00"
-+            "time": "2018-07-26T23:47:18+00:00"
-         },
-         {
-             "name": "symfony/browser-kit",
--            "version": "v4.1.3",
-+            "version": "v4.3.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/symfony/browser-kit.git",
--                "reference": "c55fe9257003b2d95c0211b3f6941e8dfd26dffd"
-+                "reference": "e07d50e84b8cf489590f22244f4f609579b4a2c4"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/c55fe9257003b2d95c0211b3f6941e8dfd26dffd",
--                "reference": "c55fe9257003b2d95c0211b3f6941e8dfd26dffd",
-+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/e07d50e84b8cf489590f22244f4f609579b4a2c4",
-+                "reference": "e07d50e84b8cf489590f22244f4f609579b4a2c4",
-                 "shasum": ""
-             },
-             "require": {
-@@ -8237,6 +8692,8 @@
-             },
-             "require-dev": {
-                 "symfony/css-selector": "~3.4|~4.0",
-+                "symfony/http-client": "^4.3",
-+                "symfony/mime": "^4.3",
-                 "symfony/process": "~3.4|~4.0"
-             },
-             "suggest": {
-@@ -8245,7 +8702,7 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "4.1-dev"
-+                    "dev-master": "4.3-dev"
-                 }
-             },
-             "autoload": {
-@@ -8272,20 +8729,20 @@
-             ],
-             "description": "Symfony BrowserKit Component",
-             "homepage": "https://symfony.com",
--            "time": "2018-07-26T09:10:45+00:00"
-+            "time": "2019-05-30T16:10:05+00:00"
-         },
-         {
-             "name": "symfony/config",
--            "version": "v4.1.3",
-+            "version": "v4.3.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/symfony/config.git",
--                "reference": "c868972ac26e4e19860ce11b300bb74145246ff9"
-+                "reference": "6379ee07398643e09e6ed1e87d9c62dfcad7f4eb"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/config/zipball/c868972ac26e4e19860ce11b300bb74145246ff9",
--                "reference": "c868972ac26e4e19860ce11b300bb74145246ff9",
-+                "url": "https://api.github.com/repos/symfony/config/zipball/6379ee07398643e09e6ed1e87d9c62dfcad7f4eb",
-+                "reference": "6379ee07398643e09e6ed1e87d9c62dfcad7f4eb",
-                 "shasum": ""
-             },
-             "require": {
-@@ -8300,6 +8757,7 @@
-                 "symfony/dependency-injection": "~3.4|~4.0",
-                 "symfony/event-dispatcher": "~3.4|~4.0",
-                 "symfony/finder": "~3.4|~4.0",
-+                "symfony/messenger": "~4.1",
-                 "symfony/yaml": "~3.4|~4.0"
-             },
-             "suggest": {
-@@ -8308,7 +8766,7 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "4.1-dev"
-+                    "dev-master": "4.3-dev"
-                 }
-             },
-             "autoload": {
-@@ -8335,34 +8793,58 @@
-             ],
-             "description": "Symfony Config Component",
-             "homepage": "https://symfony.com",
--            "time": "2018-07-26T11:24:31+00:00"
-+            "time": "2019-05-30T16:10:05+00:00"
-         },
-         {
--            "name": "symfony/css-selector",
--            "version": "v4.1.3",
-+            "name": "symfony/dependency-injection",
-+            "version": "v4.3.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/css-selector.git",
--                "reference": "2a4df7618f869b456f9096781e78c57b509d76c7"
-+                "url": "https://github.com/symfony/dependency-injection.git",
-+                "reference": "fea7f73e278ee0337349a5a68b867fc656bb33f3"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/css-selector/zipball/2a4df7618f869b456f9096781e78c57b509d76c7",
--                "reference": "2a4df7618f869b456f9096781e78c57b509d76c7",
-+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/fea7f73e278ee0337349a5a68b867fc656bb33f3",
-+                "reference": "fea7f73e278ee0337349a5a68b867fc656bb33f3",
-                 "shasum": ""
-             },
-             "require": {
--                "php": "^7.1.3"
-+                "php": "^7.1.3",
-+                "psr/container": "^1.0",
-+                "symfony/service-contracts": "^1.1.2"
-+            },
-+            "conflict": {
-+                "symfony/config": "<4.3",
-+                "symfony/finder": "<3.4",
-+                "symfony/proxy-manager-bridge": "<3.4",
-+                "symfony/yaml": "<3.4"
-+            },
-+            "provide": {
-+                "psr/container-implementation": "1.0",
-+                "symfony/service-implementation": "1.0"
-+            },
-+            "require-dev": {
-+                "symfony/config": "^4.3",
-+                "symfony/expression-language": "~3.4|~4.0",
-+                "symfony/yaml": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/config": "",
-+                "symfony/expression-language": "For using expressions in service container configuration",
-+                "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
-+                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-+                "symfony/yaml": ""
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "4.1-dev"
-+                    "dev-master": "4.3-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Symfony\\Component\\CssSelector\\": ""
-+                    "Symfony\\Component\\DependencyInjection\\": ""
-                 },
-                 "exclude-from-classmap": [
-                     "/Tests/"
-@@ -8373,10 +8855,6 @@
-                 "MIT"
-             ],
-             "authors": [
--                {
--                    "name": "Jean-François Simon",
--                    "email": "jeanfrancois.simon@sensiolabs.com"
--                },
-                 {
-                     "name": "Fabien Potencier",
-                     "email": "fabien@symfony.com"
-@@ -8386,58 +8864,48 @@
-                     "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Symfony CssSelector Component",
-+            "description": "Symfony DependencyInjection Component",
-             "homepage": "https://symfony.com",
--            "time": "2018-07-26T09:10:45+00:00"
-+            "time": "2019-05-30T16:10:05+00:00"
-         },
-         {
--            "name": "symfony/dependency-injection",
--            "version": "v4.1.3",
-+            "name": "symfony/dom-crawler",
-+            "version": "v4.3.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/dependency-injection.git",
--                "reference": "f4f401fc2766eb8d766fc6043d9e6489b37a41e4"
-+                "url": "https://github.com/symfony/dom-crawler.git",
-+                "reference": "06ee58fbc9a8130f1d35b5280e15235a0515d457"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f4f401fc2766eb8d766fc6043d9e6489b37a41e4",
--                "reference": "f4f401fc2766eb8d766fc6043d9e6489b37a41e4",
-+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/06ee58fbc9a8130f1d35b5280e15235a0515d457",
-+                "reference": "06ee58fbc9a8130f1d35b5280e15235a0515d457",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": "^7.1.3",
--                "psr/container": "^1.0"
-+                "symfony/polyfill-ctype": "~1.8",
-+                "symfony/polyfill-mbstring": "~1.0"
-             },
-             "conflict": {
--                "symfony/config": "<4.1.1",
--                "symfony/finder": "<3.4",
--                "symfony/proxy-manager-bridge": "<3.4",
--                "symfony/yaml": "<3.4"
--            },
--            "provide": {
--                "psr/container-implementation": "1.0"
-+                "masterminds/html5": "<2.6"
-             },
-             "require-dev": {
--                "symfony/config": "~4.1",
--                "symfony/expression-language": "~3.4|~4.0",
--                "symfony/yaml": "~3.4|~4.0"
-+                "masterminds/html5": "^2.6",
-+                "symfony/css-selector": "~3.4|~4.0"
-             },
-             "suggest": {
--                "symfony/config": "",
--                "symfony/expression-language": "For using expressions in service container configuration",
--                "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
--                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
--                "symfony/yaml": ""
-+                "symfony/css-selector": ""
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "4.1-dev"
-+                    "dev-master": "4.3-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Symfony\\Component\\DependencyInjection\\": ""
-+                    "Symfony\\Component\\DomCrawler\\": ""
-                 },
-                 "exclude-from-classmap": [
-                     "/Tests/"
-@@ -8457,44 +8925,42 @@
-                     "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Symfony DependencyInjection Component",
-+            "description": "Symfony DomCrawler Component",
-             "homepage": "https://symfony.com",
--            "time": "2018-08-01T08:24:03+00:00"
-+            "time": "2019-05-31T18:55:30+00:00"
-         },
-         {
--            "name": "symfony/dom-crawler",
--            "version": "v4.1.3",
-+            "name": "symfony/http-foundation",
-+            "version": "v4.3.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/dom-crawler.git",
--                "reference": "1c4519d257e652404c3aa550207ccd8ada66b38e"
-+                "url": "https://github.com/symfony/http-foundation.git",
-+                "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1c4519d257e652404c3aa550207ccd8ada66b38e",
--                "reference": "1c4519d257e652404c3aa550207ccd8ada66b38e",
-+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b7e4945dd9b277cd24e93566e4da0a87956392a9",
-+                "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": "^7.1.3",
--                "symfony/polyfill-ctype": "~1.8",
--                "symfony/polyfill-mbstring": "~1.0"
-+                "symfony/mime": "^4.3",
-+                "symfony/polyfill-mbstring": "~1.1"
-             },
-             "require-dev": {
--                "symfony/css-selector": "~3.4|~4.0"
--            },
--            "suggest": {
--                "symfony/css-selector": ""
-+                "predis/predis": "~1.0",
-+                "symfony/expression-language": "~3.4|~4.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "4.1-dev"
-+                    "dev-master": "4.3-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Symfony\\Component\\DomCrawler\\": ""
-+                    "Symfony\\Component\\HttpFoundation\\": ""
-                 },
-                 "exclude-from-classmap": [
-                     "/Tests/"
-@@ -8514,41 +8980,42 @@
-                     "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Symfony DomCrawler Component",
-+            "description": "Symfony HttpFoundation Component",
-             "homepage": "https://symfony.com",
--            "time": "2018-07-26T11:00:49+00:00"
-+            "time": "2019-06-06T10:05:02+00:00"
-         },
-         {
--            "name": "symfony/http-foundation",
--            "version": "v4.1.3",
-+            "name": "symfony/mime",
-+            "version": "v4.3.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/http-foundation.git",
--                "reference": "7d93e3547660ec7ee3dad1428ba42e8076a0e5f1"
-+                "url": "https://github.com/symfony/mime.git",
-+                "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7d93e3547660ec7ee3dad1428ba42e8076a0e5f1",
--                "reference": "7d93e3547660ec7ee3dad1428ba42e8076a0e5f1",
-+                "url": "https://api.github.com/repos/symfony/mime/zipball/ec2c5565de60e03f33d4296a655e3273f0ad1f8b",
-+                "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": "^7.1.3",
--                "symfony/polyfill-mbstring": "~1.1"
-+                "symfony/polyfill-intl-idn": "^1.10",
-+                "symfony/polyfill-mbstring": "^1.0"
-             },
-             "require-dev": {
--                "predis/predis": "~1.0",
--                "symfony/expression-language": "~3.4|~4.0"
-+                "egulias/email-validator": "^2.0",
-+                "symfony/dependency-injection": "~3.4|^4.1"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "4.1-dev"
-+                    "dev-master": "4.3-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Symfony\\Component\\HttpFoundation\\": ""
-+                    "Symfony\\Component\\Mime\\": ""
-                 },
-                 "exclude-from-classmap": [
-                     "/Tests/"
-@@ -8568,22 +9035,26 @@
-                     "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Symfony HttpFoundation Component",
-+            "description": "A library to manipulate MIME messages",
-             "homepage": "https://symfony.com",
--            "time": "2018-08-01T14:07:44+00:00"
-+            "keywords": [
-+                "mime",
-+                "mime-type"
-+            ],
-+            "time": "2019-06-04T09:22:54+00:00"
-         },
-         {
-             "name": "symfony/options-resolver",
--            "version": "v4.1.3",
-+            "version": "v4.3.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/symfony/options-resolver.git",
--                "reference": "1913f1962477cdbb13df951f8147d5da1fe2412c"
-+                "reference": "914e0edcb7cd0c9f494bc023b1d47534f4542332"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/1913f1962477cdbb13df951f8147d5da1fe2412c",
--                "reference": "1913f1962477cdbb13df951f8147d5da1fe2412c",
-+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/914e0edcb7cd0c9f494bc023b1d47534f4542332",
-+                "reference": "914e0edcb7cd0c9f494bc023b1d47534f4542332",
-                 "shasum": ""
-             },
-             "require": {
-@@ -8592,7 +9063,7 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "4.1-dev"
-+                    "dev-master": "4.3-dev"
-                 }
-             },
-             "autoload": {
-@@ -8624,20 +9095,82 @@
-                 "configuration",
-                 "options"
-             ],
--            "time": "2018-07-26T08:55:25+00:00"
-+            "time": "2019-05-10T05:38:46+00:00"
-+        },
-+        {
-+            "name": "symfony/polyfill-intl-idn",
-+            "version": "v1.11.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
-+                "reference": "c766e95bec706cdd89903b1eda8afab7d7a6b7af"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c766e95bec706cdd89903b1eda8afab7d7a6b7af",
-+                "reference": "c766e95bec706cdd89903b1eda8afab7d7a6b7af",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3",
-+                "symfony/polyfill-mbstring": "^1.3",
-+                "symfony/polyfill-php72": "^1.9"
-+            },
-+            "suggest": {
-+                "ext-intl": "For best performance"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.9-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                },
-+                {
-+                    "name": "Laurent Bassin",
-+                    "email": "laurent@bassin.info"
-+                }
-+            ],
-+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "compatibility",
-+                "idn",
-+                "intl",
-+                "polyfill",
-+                "portable",
-+                "shim"
-+            ],
-+            "time": "2019-03-04T13:44:35+00:00"
-         },
-         {
-             "name": "symfony/polyfill-php70",
--            "version": "v1.9.0",
-+            "version": "v1.11.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/symfony/polyfill-php70.git",
--                "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934"
-+                "reference": "bc4858fb611bda58719124ca079baff854149c89"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
--                "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
-+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89",
-+                "reference": "bc4858fb611bda58719124ca079baff854149c89",
-                 "shasum": ""
-             },
-             "require": {
-@@ -8647,7 +9180,7 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.9-dev"
-+                    "dev-master": "1.11-dev"
-                 }
-             },
-             "autoload": {
-@@ -8683,20 +9216,20 @@
-                 "portable",
-                 "shim"
-             ],
--            "time": "2018-08-06T14:22:27+00:00"
-+            "time": "2019-02-06T07:57:58+00:00"
-         },
-         {
-             "name": "symfony/polyfill-php72",
--            "version": "v1.9.0",
-+            "version": "v1.11.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/symfony/polyfill-php72.git",
--                "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae"
-+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/95c50420b0baed23852452a7f0c7b527303ed5ae",
--                "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae",
-+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c",
-+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c",
-                 "shasum": ""
-             },
-             "require": {
-@@ -8705,7 +9238,7 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.9-dev"
-+                    "dev-master": "1.11-dev"
-                 }
-             },
-             "autoload": {
-@@ -8738,29 +9271,88 @@
-                 "portable",
-                 "shim"
-             ],
--            "time": "2018-08-06T14:22:27+00:00"
-+            "time": "2019-02-06T07:57:58+00:00"
-+        },
-+        {
-+            "name": "symfony/service-contracts",
-+            "version": "v1.1.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/service-contracts.git",
-+                "reference": "191afdcb5804db960d26d8566b7e9a2843cab3a0"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/191afdcb5804db960d26d8566b7e9a2843cab3a0",
-+                "reference": "191afdcb5804db960d26d8566b7e9a2843cab3a0",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3"
-+            },
-+            "suggest": {
-+                "psr/container": "",
-+                "symfony/service-implementation": ""
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Contracts\\Service\\": ""
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Generic abstractions related to writing services",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "abstractions",
-+                "contracts",
-+                "decoupling",
-+                "interfaces",
-+                "interoperability",
-+                "standards"
-+            ],
-+            "time": "2019-05-28T07:50:59+00:00"
-         },
-         {
-             "name": "symfony/stopwatch",
--            "version": "v4.1.3",
-+            "version": "v4.3.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/symfony/stopwatch.git",
--                "reference": "966c982df3cca41324253dc0c7ffe76b6076b705"
-+                "reference": "6b100e9309e8979cf1978ac1778eb155c1f7d93b"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/966c982df3cca41324253dc0c7ffe76b6076b705",
--                "reference": "966c982df3cca41324253dc0c7ffe76b6076b705",
-+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6b100e9309e8979cf1978ac1778eb155c1f7d93b",
-+                "reference": "6b100e9309e8979cf1978ac1778eb155c1f7d93b",
-                 "shasum": ""
-             },
-             "require": {
--                "php": "^7.1.3"
-+                "php": "^7.1.3",
-+                "symfony/service-contracts": "^1.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "4.1-dev"
-+                    "dev-master": "4.3-dev"
-                 }
-             },
-             "autoload": {
-@@ -8787,20 +9379,20 @@
-             ],
-             "description": "Symfony Stopwatch Component",
-             "homepage": "https://symfony.com",
--            "time": "2018-07-26T11:00:49+00:00"
-+            "time": "2019-05-27T08:16:38+00:00"
-         },
-         {
-             "name": "symfony/yaml",
--            "version": "v3.4.14",
-+            "version": "v3.4.28",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/symfony/yaml.git",
--                "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2"
-+                "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/yaml/zipball/810af2d35fc72b6cf5c01116806d2b65ccaaf2e2",
--                "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2",
-+                "url": "https://api.github.com/repos/symfony/yaml/zipball/212a27b731e5bfb735679d1ffaac82bd6a1dc996",
-+                "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996",
-                 "shasum": ""
-             },
-             "require": {
-@@ -8846,7 +9438,7 @@
-             ],
-             "description": "Symfony Yaml Component",
-             "homepage": "https://symfony.com",
--            "time": "2018-07-26T11:19:56+00:00"
-+            "time": "2019-03-25T07:48:46+00:00"
-         },
-         {
-             "name": "theseer/fdomdocument",
-@@ -8890,16 +9482,16 @@
-         },
-         {
-             "name": "theseer/tokenizer",
--            "version": "1.1.0",
-+            "version": "1.1.3",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/theseer/tokenizer.git",
--                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
-+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
--                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
-+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
-                 "shasum": ""
-             },
-             "require": {
-@@ -8926,24 +9518,25 @@
-                 }
-             ],
-             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
--            "time": "2017-04-07T12:08:54+00:00"
-+            "time": "2019-06-13T22:48:21+00:00"
-         },
-         {
-             "name": "vlucas/phpdotenv",
--            "version": "v2.5.1",
-+            "version": "v2.6.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/vlucas/phpdotenv.git",
--                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e"
-+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
--                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
-+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
-+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.9"
-+                "php": ">=5.3.9",
-+                "symfony/polyfill-ctype": "^1.9"
-             },
-             "require-dev": {
-                 "phpunit/phpunit": "^4.8.35 || ^5.0"
-@@ -8951,7 +9544,7 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.5-dev"
-+                    "dev-master": "2.6-dev"
-                 }
-             },
-             "autoload": {
-@@ -8976,24 +9569,25 @@
-                 "env",
-                 "environment"
-             ],
--            "time": "2018-07-29T20:33:41+00:00"
-+            "time": "2019-01-29T11:11:52+00:00"
-         },
-         {
-             "name": "webmozart/assert",
--            "version": "1.3.0",
-+            "version": "1.4.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/webmozart/assert.git",
--                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
-+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
--                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
-+                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
-+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
-                 "shasum": ""
-             },
-             "require": {
--                "php": "^5.3.3 || ^7.0"
-+                "php": "^5.3.3 || ^7.0",
-+                "symfony/polyfill-ctype": "^1.8"
-             },
-             "require-dev": {
-                 "phpunit/phpunit": "^4.6",
-@@ -9026,7 +9620,7 @@
-                 "check",
-                 "validate"
-             ],
--            "time": "2018-01-29T19:49:41+00:00"
-+            "time": "2018-12-25T11:19:39+00:00"
-         }
-     ],
-     "aliases": [],
-@@ -9038,6 +9632,7 @@
-     "prefer-lowest": false,
-     "platform": {
-         "php": "~7.1.3||~7.2.0",
-+        "ext-bcmath": "*",
-         "ext-ctype": "*",
-         "ext-curl": "*",
-         "ext-dom": "*",
-@@ -9053,7 +9648,6 @@
-         "ext-spl": "*",
-         "ext-xsl": "*",
-         "ext-zip": "*",
--        "ext-bcmath": "*",
-         "lib-libxml": "*"
-     },
-     "platform-dev": []
-diff --git a/dev/tests/acceptance/.gitignore b/dev/tests/acceptance/.gitignore
-index de6a96d05e7..87ce9d4ff35 100755
---- a/dev/tests/acceptance/.gitignore
-+++ b/dev/tests/acceptance/.gitignore
-@@ -1,7 +1,11 @@
- .idea
- .env
-+.htaccess
- codeception.yml
- tests/_output/*
- tests/functional.suite.yml
- tests/functional/Magento/FunctionalTest/_generated
- vendor/*
-+mftf.log
-+/.credentials.example
-+/utils/
-\ No newline at end of file
-diff --git a/dev/tests/acceptance/RoboFile.php b/dev/tests/acceptance/RoboFile.php
-deleted file mode 100644
-index e6e9e591bbd..00000000000
---- a/dev/tests/acceptance/RoboFile.php
-+++ /dev/null
-@@ -1,175 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--use Symfony\Component\Yaml\Yaml;
--
--/** This is project's console commands configuration for Robo task runner.
-- *
-- * @codingStandardsIgnoreStart
-- * @see http://robo.li/
-- */
--class RoboFile extends \Robo\Tasks
--{
--    use Robo\Task\Base\loadShortcuts;
--
--    /**
--     * Duplicate the Example configuration files for the Project.
--     * Build the Codeception project.
--     *
--     * @return void
--     */
--    function buildProject()
--    {
--        passthru($this->getBaseCmd("build:project"));
--    }
--
--    /**
--     * Generate all Tests in PHP OR Generate set of tests via passing array of tests
--     *
--     * @param array $tests
--     * @param array $opts
--     * @return \Robo\Result
--     */
--    function generateTests(array $tests, $opts = [
--        'config' => null,
--        'force' => false,
--        'nodes' => null,
--        'lines' => null,
--        'tests' => null
--    ])
--    {
--        $baseCmd = $this->getBaseCmd("generate:tests");
--
--        $mftfArgNames = ['config', 'nodes', 'lines', 'tests'];
--        // append arguments to the end of the command
--        foreach ($opts as $argName => $argValue) {
--            if (in_array($argName, $mftfArgNames) && $argValue !== null) {
--                $baseCmd .= " --$argName $argValue";
--            }
--        }
--
--        // use a separate conditional for the force flag (casting bool to string in php is hard)
--        if ($opts['force']) {
--            $baseCmd .= ' --force';
--        }
--
--        return $this->taskExec($baseCmd)->args($tests)->run();
--    }
--
--    /**
--     * Generate a suite based on name(s) passed in as args.
--     *
--     * @param array $args
--     * @throws Exception
--     * @return \Robo\Result
--     */
--    function generateSuite(array $args)
--    {
--        if (empty($args)) {
--            throw new Exception("Please provide suite name(s) after generate:suite command");
--        }
--        $baseCmd = $this->getBaseCmd("generate:suite");
--        return $this->taskExec($baseCmd)->args($args)->run();
--    }
--
--    /**
--     * Run all Tests with the specified @group tag'.
--     *
--     * @param array $args
--     * @return \Robo\Result
--     */
--    function group(array $args)
--    {
--        $args = array_merge($args, ['-k']);
--        $baseCmd = $this->getBaseCmd("run:group");
--        return $this->taskExec($baseCmd)->args($args)->run();
--    }
--
--    /**
--     * Generate the HTML for the Allure report based on the Test XML output - Allure v1.4.X
--     *
--     * @return \Robo\Result
--     */
--    function allure1Generate()
--    {
--        return $this->_exec('allure generate tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-results'. DIRECTORY_SEPARATOR .' -o tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
--    }
--
--    /**
--     * Generate the HTML for the Allure report based on the Test XML output - Allure v2.3.X
--     *
--     * @return \Robo\Result
--     */
--    function allure2Generate()
--    {
--        return $this->_exec('allure generate tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-results'. DIRECTORY_SEPARATOR .' --output tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .' --clean');
--    }
--
--    /**
--     * Open the HTML Allure report - Allure v1.4.X
--     *
--     * @return \Robo\Result
--     */
--    function allure1Open()
--    {
--        return $this->_exec('allure report open --report-dir tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
--    }
--
--    /**
--     * Open the HTML Allure report - Allure v2.3.X
--     *
--     * @return \Robo\Result
--     */
--    function allure2Open()
--    {
--        return $this->_exec('allure open --port 0 tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
--    }
--
--    /**
--     * Generate and open the HTML Allure report - Allure v1.4.X
--     *
--     * @return \Robo\Result
--     */
--    function allure1Report()
--    {
--        $result1 = $this->allure1Generate();
--
--        if ($result1->wasSuccessful()) {
--            return $this->allure1Open();
--        } else {
--            return $result1;
--        }
--    }
--
--    /**
--     * Generate and open the HTML Allure report - Allure v2.3.X
--     *
--     * @return \Robo\Result
--     */
--    function allure2Report()
--    {
--        $result1 = $this->allure2Generate();
--
--        if ($result1->wasSuccessful()) {
--            return $this->allure2Open();
--        } else {
--            return $result1;
--        }
--    }
--
--    /**
--     * Private function for returning the formatted command for the passthru to mftf bin execution.
--     *
--     * @param string $command
--     * @return string
--     */
--    private function getBaseCmd($command)
--    {
--        $this->writeln("\033[01;31m Use of robo will be deprecated with next major release, please use <root>/vendor/bin/mftf $command \033[0m");
--        chdir(__DIR__);
--        return realpath('../../../vendor/bin/mftf') . " $command";
--    }
--}
-\ No newline at end of file
-diff --git a/dev/tests/acceptance/composer.json b/dev/tests/acceptance/composer.json
-deleted file mode 100755
-index a20176a29c4..00000000000
---- a/dev/tests/acceptance/composer.json
-+++ /dev/null
-@@ -1,25 +0,0 @@
--{
--    "description": "Magento 2 (Open Source) Functional Tests",
--    "type": "project",
--    "version": "1.0.0-dev",
--    "license": [
--        "OSL-3.0",
--        "AFL-3.0"
--    ],
--    "config": {
--        "sort-packages": true
--    },
--    "require": {
--        "php": "~7.1.3||~7.2.0",
--        "codeception/codeception": "~2.3.4",
--        "consolidation/robo": "^1.0.0",
--        "vlucas/phpdotenv": "^2.4"
--    },
--    "autoload": {
--        "psr-4": {
--            "Magento\\": "tests/functional/Magento"
--        },
--        "files": ["tests/_bootstrap.php"]
--    },
--    "prefer-stable": true
--}
-diff --git a/dev/tests/acceptance/composer.lock b/dev/tests/acceptance/composer.lock
-deleted file mode 100644
-index 8542402a98f..00000000000
---- a/dev/tests/acceptance/composer.lock
-+++ /dev/null
-@@ -1,3262 +0,0 @@
--{
--    "_readme": [
--        "This file locks the dependencies of your project to a known state",
--        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
--        "This file is @generated automatically"
--    ],
--    "content-hash": "46ca2d50566f5069daef753664080c5a",
--    "packages": [
--        {
--            "name": "behat/gherkin",
--            "version": "v4.4.5",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/Behat/Gherkin.git",
--                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74",
--                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.3.1"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "~4.5|~5",
--                "symfony/phpunit-bridge": "~2.7|~3",
--                "symfony/yaml": "~2.3|~3"
--            },
--            "suggest": {
--                "symfony/yaml": "If you want to parse features, represented in YAML files"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "4.4-dev"
--                }
--            },
--            "autoload": {
--                "psr-0": {
--                    "Behat\\Gherkin": "src/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Konstantin Kudryashov",
--                    "email": "ever.zet@gmail.com",
--                    "homepage": "http://everzet.com"
--                }
--            ],
--            "description": "Gherkin DSL parser for PHP 5.3",
--            "homepage": "http://behat.org/",
--            "keywords": [
--                "BDD",
--                "Behat",
--                "Cucumber",
--                "DSL",
--                "gherkin",
--                "parser"
--            ],
--            "time": "2016-10-30T11:50:56+00:00"
--        },
--        {
--            "name": "codeception/codeception",
--            "version": "2.3.9",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/Codeception/Codeception.git",
--                "reference": "104f46fa0bde339f1bcc3a375aac21eb36e65a1e"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/104f46fa0bde339f1bcc3a375aac21eb36e65a1e",
--                "reference": "104f46fa0bde339f1bcc3a375aac21eb36e65a1e",
--                "shasum": ""
--            },
--            "require": {
--                "behat/gherkin": "~4.4.0",
--                "codeception/stub": "^1.0",
--                "ext-json": "*",
--                "ext-mbstring": "*",
--                "facebook/webdriver": ">=1.1.3 <2.0",
--                "guzzlehttp/guzzle": ">=4.1.4 <7.0",
--                "guzzlehttp/psr7": "~1.0",
--                "php": ">=5.4.0 <8.0",
--                "phpunit/php-code-coverage": ">=2.2.4 <6.0",
--                "phpunit/phpunit": ">=4.8.28 <5.0.0 || >=5.6.3 <7.0",
--                "sebastian/comparator": ">1.1 <3.0",
--                "sebastian/diff": ">=1.4 <3.0",
--                "symfony/browser-kit": ">=2.7 <5.0",
--                "symfony/console": ">=2.7 <5.0",
--                "symfony/css-selector": ">=2.7 <5.0",
--                "symfony/dom-crawler": ">=2.7 <5.0",
--                "symfony/event-dispatcher": ">=2.7 <5.0",
--                "symfony/finder": ">=2.7 <5.0",
--                "symfony/yaml": ">=2.7 <5.0"
--            },
--            "require-dev": {
--                "codeception/specify": "~0.3",
--                "facebook/graph-sdk": "~5.3",
--                "flow/jsonpath": "~0.2",
--                "monolog/monolog": "~1.8",
--                "pda/pheanstalk": "~3.0",
--                "php-amqplib/php-amqplib": "~2.4",
--                "predis/predis": "^1.0",
--                "squizlabs/php_codesniffer": "~2.0",
--                "symfony/process": ">=2.7 <5.0",
--                "vlucas/phpdotenv": "^2.4.0"
--            },
--            "suggest": {
--                "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module",
--                "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests",
--                "codeception/specify": "BDD-style code blocks",
--                "codeception/verify": "BDD-style assertions",
--                "flow/jsonpath": "For using JSONPath in REST module",
--                "league/factory-muffin": "For DataFactory module",
--                "league/factory-muffin-faker": "For Faker support in DataFactory module",
--                "phpseclib/phpseclib": "for SFTP option in FTP Module",
--                "stecman/symfony-console-completion": "For BASH autocompletion",
--                "symfony/phpunit-bridge": "For phpunit-bridge support"
--            },
--            "bin": [
--                "codecept"
--            ],
--            "type": "library",
--            "extra": {
--                "branch-alias": []
--            },
--            "autoload": {
--                "psr-4": {
--                    "Codeception\\": "src\\Codeception",
--                    "Codeception\\Extension\\": "ext"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Michael Bodnarchuk",
--                    "email": "davert@mail.ua",
--                    "homepage": "http://codegyre.com"
--                }
--            ],
--            "description": "BDD-style testing framework",
--            "homepage": "http://codeception.com/",
--            "keywords": [
--                "BDD",
--                "TDD",
--                "acceptance testing",
--                "functional testing",
--                "unit testing"
--            ],
--            "time": "2018-02-26T23:29:41+00:00"
--        },
--        {
--            "name": "codeception/stub",
--            "version": "1.0.4",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/Codeception/Stub.git",
--                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/Codeception/Stub/zipball/681b62348837a5ef07d10d8a226f5bc358cc8805",
--                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805",
--                "shasum": ""
--            },
--            "require": {
--                "phpunit/phpunit-mock-objects": ">2.3 <7.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": ">=4.8 <8.0"
--            },
--            "type": "library",
--            "autoload": {
--                "psr-4": {
--                    "Codeception\\": "src/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
--            "time": "2018-05-17T09:31:08+00:00"
--        },
--        {
--            "name": "consolidation/annotated-command",
--            "version": "2.8.4",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/consolidation/annotated-command.git",
--                "reference": "651541a0b68318a2a202bda558a676e5ad92223c"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/651541a0b68318a2a202bda558a676e5ad92223c",
--                "reference": "651541a0b68318a2a202bda558a676e5ad92223c",
--                "shasum": ""
--            },
--            "require": {
--                "consolidation/output-formatters": "^3.1.12",
--                "php": ">=5.4.0",
--                "psr/log": "^1",
--                "symfony/console": "^2.8|^3|^4",
--                "symfony/event-dispatcher": "^2.5|^3|^4",
--                "symfony/finder": "^2.5|^3|^4"
--            },
--            "require-dev": {
--                "g1a/composer-test-scenarios": "^2",
--                "phpunit/phpunit": "^6",
--                "satooshi/php-coveralls": "^2",
--                "squizlabs/php_codesniffer": "^2.7"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Consolidation\\AnnotatedCommand\\": "src"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Greg Anderson",
--                    "email": "greg.1.anderson@greenknowe.org"
--                }
--            ],
--            "description": "Initialize Symfony Console commands from annotated command class methods.",
--            "time": "2018-05-25T18:04:25+00:00"
--        },
--        {
--            "name": "consolidation/config",
--            "version": "1.0.11",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/consolidation/config.git",
--                "reference": "ede41d946078e97e7a9513aadc3352f1c26817af"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/consolidation/config/zipball/ede41d946078e97e7a9513aadc3352f1c26817af",
--                "reference": "ede41d946078e97e7a9513aadc3352f1c26817af",
--                "shasum": ""
--            },
--            "require": {
--                "dflydev/dot-access-data": "^1.1.0",
--                "grasmash/expander": "^1",
--                "php": ">=5.4.0"
--            },
--            "require-dev": {
--                "g1a/composer-test-scenarios": "^1",
--                "phpunit/phpunit": "^4",
--                "satooshi/php-coveralls": "^1.0",
--                "squizlabs/php_codesniffer": "2.*",
--                "symfony/console": "^2.5|^3|^4",
--                "symfony/yaml": "^2.8.11|^3|^4"
--            },
--            "suggest": {
--                "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Consolidation\\Config\\": "src"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Greg Anderson",
--                    "email": "greg.1.anderson@greenknowe.org"
--                }
--            ],
--            "description": "Provide configuration services for a commandline tool.",
--            "time": "2018-05-27T01:17:02+00:00"
--        },
--        {
--            "name": "consolidation/log",
--            "version": "1.0.6",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/consolidation/log.git",
--                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395",
--                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.5.0",
--                "psr/log": "~1.0",
--                "symfony/console": "^2.8|^3|^4"
--            },
--            "require-dev": {
--                "g1a/composer-test-scenarios": "^1",
--                "phpunit/phpunit": "4.*",
--                "satooshi/php-coveralls": "^2",
--                "squizlabs/php_codesniffer": "2.*"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Consolidation\\Log\\": "src"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Greg Anderson",
--                    "email": "greg.1.anderson@greenknowe.org"
--                }
--            ],
--            "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
--            "time": "2018-05-25T18:14:39+00:00"
--        },
--        {
--            "name": "consolidation/output-formatters",
--            "version": "3.2.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/consolidation/output-formatters.git",
--                "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d78ef59aea19d3e2e5a23f90a055155ee78a0ad5",
--                "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.4.0",
--                "symfony/console": "^2.8|^3|^4",
--                "symfony/finder": "^2.5|^3|^4"
--            },
--            "require-dev": {
--                "g1a/composer-test-scenarios": "^2",
--                "phpunit/phpunit": "^5.7.27",
--                "satooshi/php-coveralls": "^2",
--                "squizlabs/php_codesniffer": "^2.7",
--                "symfony/console": "3.2.3",
--                "symfony/var-dumper": "^2.8|^3|^4",
--                "victorjonsson/markdowndocs": "^1.3"
--            },
--            "suggest": {
--                "symfony/var-dumper": "For using the var_dump formatter"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "3.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Consolidation\\OutputFormatters\\": "src"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Greg Anderson",
--                    "email": "greg.1.anderson@greenknowe.org"
--                }
--            ],
--            "description": "Format text by applying transformations provided by plug-in formatters.",
--            "time": "2018-05-25T18:02:34+00:00"
--        },
--        {
--            "name": "consolidation/robo",
--            "version": "1.3.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/consolidation/Robo.git",
--                "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/consolidation/Robo/zipball/ac563abfadf7cb7314b4e152f2b5033a6c255f6f",
--                "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f",
--                "shasum": ""
--            },
--            "require": {
--                "consolidation/annotated-command": "^2.8.2",
--                "consolidation/config": "^1.0.10",
--                "consolidation/log": "~1",
--                "consolidation/output-formatters": "^3.1.13",
--                "grasmash/yaml-expander": "^1.3",
--                "league/container": "^2.2",
--                "php": ">=5.5.0",
--                "symfony/console": "^2.8|^3|^4",
--                "symfony/event-dispatcher": "^2.5|^3|^4",
--                "symfony/filesystem": "^2.5|^3|^4",
--                "symfony/finder": "^2.5|^3|^4",
--                "symfony/process": "^2.5|^3|^4"
--            },
--            "replace": {
--                "codegyre/robo": "< 1.0"
--            },
--            "require-dev": {
--                "codeception/aspect-mock": "^1|^2.1.1",
--                "codeception/base": "^2.3.7",
--                "codeception/verify": "^0.3.2",
--                "g1a/composer-test-scenarios": "^2",
--                "goaop/framework": "~2.1.2",
--                "goaop/parser-reflection": "^1.1.0",
--                "natxet/cssmin": "3.0.4",
--                "nikic/php-parser": "^3.1.5",
--                "patchwork/jsqueeze": "~2",
--                "pear/archive_tar": "^1.4.2",
--                "phpunit/php-code-coverage": "~2|~4",
--                "satooshi/php-coveralls": "^2",
--                "squizlabs/php_codesniffer": "^2.8"
--            },
--            "suggest": {
--                "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch",
--                "natxet/CssMin": "For minifying CSS files in taskMinify",
--                "patchwork/jsqueeze": "For minifying JS files in taskMinify",
--                "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively."
--            },
--            "bin": [
--                "robo"
--            ],
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.x-dev",
--                    "dev-state": "1.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Robo\\": "src"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Davert",
--                    "email": "davert.php@resend.cc"
--                }
--            ],
--            "description": "Modern task runner",
--            "time": "2018-05-27T01:42:53+00:00"
--        },
--        {
--            "name": "container-interop/container-interop",
--            "version": "1.2.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/container-interop/container-interop.git",
--                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
--                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
--                "shasum": ""
--            },
--            "require": {
--                "psr/container": "^1.0"
--            },
--            "type": "library",
--            "autoload": {
--                "psr-4": {
--                    "Interop\\Container\\": "src/Interop/Container/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
--            "homepage": "https://github.com/container-interop/container-interop",
--            "time": "2017-02-14T19:40:03+00:00"
--        },
--        {
--            "name": "dflydev/dot-access-data",
--            "version": "v1.1.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
--                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a",
--                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.3.2"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.0-dev"
--                }
--            },
--            "autoload": {
--                "psr-0": {
--                    "Dflydev\\DotAccessData": "src"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Dragonfly Development Inc.",
--                    "email": "info@dflydev.com",
--                    "homepage": "http://dflydev.com"
--                },
--                {
--                    "name": "Beau Simensen",
--                    "email": "beau@dflydev.com",
--                    "homepage": "http://beausimensen.com"
--                },
--                {
--                    "name": "Carlos Frutos",
--                    "email": "carlos@kiwing.it",
--                    "homepage": "https://github.com/cfrutos"
--                }
--            ],
--            "description": "Given a deep data structure, access data by dot notation.",
--            "homepage": "https://github.com/dflydev/dflydev-dot-access-data",
--            "keywords": [
--                "access",
--                "data",
--                "dot",
--                "notation"
--            ],
--            "time": "2017-01-20T21:14:22+00:00"
--        },
--        {
--            "name": "doctrine/instantiator",
--            "version": "1.1.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/doctrine/instantiator.git",
--                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
--                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.1"
--            },
--            "require-dev": {
--                "athletic/athletic": "~0.1.8",
--                "ext-pdo": "*",
--                "ext-phar": "*",
--                "phpunit/phpunit": "^6.2.3",
--                "squizlabs/php_codesniffer": "^3.0.2"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.2.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Marco Pivetta",
--                    "email": "ocramius@gmail.com",
--                    "homepage": "http://ocramius.github.com/"
--                }
--            ],
--            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
--            "homepage": "https://github.com/doctrine/instantiator",
--            "keywords": [
--                "constructor",
--                "instantiate"
--            ],
--            "time": "2017-07-22T11:58:36+00:00"
--        },
--        {
--            "name": "facebook/webdriver",
--            "version": "1.6.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/facebook/php-webdriver.git",
--                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/bd8c740097eb9f2fc3735250fc1912bc811a954e",
--                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e",
--                "shasum": ""
--            },
--            "require": {
--                "ext-curl": "*",
--                "ext-json": "*",
--                "ext-mbstring": "*",
--                "ext-zip": "*",
--                "php": "^5.6 || ~7.0",
--                "symfony/process": "^2.8 || ^3.1 || ^4.0"
--            },
--            "require-dev": {
--                "friendsofphp/php-cs-fixer": "^2.0",
--                "jakub-onderka/php-parallel-lint": "^0.9.2",
--                "php-coveralls/php-coveralls": "^2.0",
--                "php-mock/php-mock-phpunit": "^1.1",
--                "phpunit/phpunit": "^5.7",
--                "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
--                "squizlabs/php_codesniffer": "^2.6",
--                "symfony/var-dumper": "^3.3 || ^4.0"
--            },
--            "suggest": {
--                "ext-SimpleXML": "For Firefox profile creation"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-community": "1.5-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Facebook\\WebDriver\\": "lib/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "Apache-2.0"
--            ],
--            "description": "A PHP client for Selenium WebDriver",
--            "homepage": "https://github.com/facebook/php-webdriver",
--            "keywords": [
--                "facebook",
--                "php",
--                "selenium",
--                "webdriver"
--            ],
--            "time": "2018-05-16T17:37:13+00:00"
--        },
--        {
--            "name": "grasmash/expander",
--            "version": "1.0.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/grasmash/expander.git",
--                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f",
--                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f",
--                "shasum": ""
--            },
--            "require": {
--                "dflydev/dot-access-data": "^1.1.0",
--                "php": ">=5.4"
--            },
--            "require-dev": {
--                "greg-1-anderson/composer-test-scenarios": "^1",
--                "phpunit/phpunit": "^4|^5.5.4",
--                "satooshi/php-coveralls": "^1.0.2|dev-master",
--                "squizlabs/php_codesniffer": "^2.7"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Grasmash\\Expander\\": "src/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Matthew Grasmick"
--                }
--            ],
--            "description": "Expands internal property references in PHP arrays file.",
--            "time": "2017-12-21T22:14:55+00:00"
--        },
--        {
--            "name": "grasmash/yaml-expander",
--            "version": "1.4.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/grasmash/yaml-expander.git",
--                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1",
--                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1",
--                "shasum": ""
--            },
--            "require": {
--                "dflydev/dot-access-data": "^1.1.0",
--                "php": ">=5.4",
--                "symfony/yaml": "^2.8.11|^3|^4"
--            },
--            "require-dev": {
--                "greg-1-anderson/composer-test-scenarios": "^1",
--                "phpunit/phpunit": "^4.8|^5.5.4",
--                "satooshi/php-coveralls": "^1.0.2|dev-master",
--                "squizlabs/php_codesniffer": "^2.7"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Grasmash\\YamlExpander\\": "src/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Matthew Grasmick"
--                }
--            ],
--            "description": "Expands internal property references in a yaml file.",
--            "time": "2017-12-16T16:06:03+00:00"
--        },
--        {
--            "name": "guzzlehttp/guzzle",
--            "version": "6.3.3",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/guzzle/guzzle.git",
--                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
--                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
--                "shasum": ""
--            },
--            "require": {
--                "guzzlehttp/promises": "^1.0",
--                "guzzlehttp/psr7": "^1.4",
--                "php": ">=5.5"
--            },
--            "require-dev": {
--                "ext-curl": "*",
--                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
--                "psr/log": "^1.0"
--            },
--            "suggest": {
--                "psr/log": "Required for using the Log middleware"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "6.3-dev"
--                }
--            },
--            "autoload": {
--                "files": [
--                    "src/functions_include.php"
--                ],
--                "psr-4": {
--                    "GuzzleHttp\\": "src/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Michael Dowling",
--                    "email": "mtdowling@gmail.com",
--                    "homepage": "https://github.com/mtdowling"
--                }
--            ],
--            "description": "Guzzle is a PHP HTTP client library",
--            "homepage": "http://guzzlephp.org/",
--            "keywords": [
--                "client",
--                "curl",
--                "framework",
--                "http",
--                "http client",
--                "rest",
--                "web service"
--            ],
--            "time": "2018-04-22T15:46:56+00:00"
--        },
--        {
--            "name": "guzzlehttp/promises",
--            "version": "v1.3.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/guzzle/promises.git",
--                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
--                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.5.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^4.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.4-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "GuzzleHttp\\Promise\\": "src/"
--                },
--                "files": [
--                    "src/functions_include.php"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Michael Dowling",
--                    "email": "mtdowling@gmail.com",
--                    "homepage": "https://github.com/mtdowling"
--                }
--            ],
--            "description": "Guzzle promises library",
--            "keywords": [
--                "promise"
--            ],
--            "time": "2016-12-20T10:07:11+00:00"
--        },
--        {
--            "name": "guzzlehttp/psr7",
--            "version": "1.4.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/guzzle/psr7.git",
--                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
--                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.4.0",
--                "psr/http-message": "~1.0"
--            },
--            "provide": {
--                "psr/http-message-implementation": "1.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "~4.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.4-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "GuzzleHttp\\Psr7\\": "src/"
--                },
--                "files": [
--                    "src/functions_include.php"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Michael Dowling",
--                    "email": "mtdowling@gmail.com",
--                    "homepage": "https://github.com/mtdowling"
--                },
--                {
--                    "name": "Tobias Schultze",
--                    "homepage": "https://github.com/Tobion"
--                }
--            ],
--            "description": "PSR-7 message implementation that also provides common utility methods",
--            "keywords": [
--                "http",
--                "message",
--                "request",
--                "response",
--                "stream",
--                "uri",
--                "url"
--            ],
--            "time": "2017-03-20T17:10:46+00:00"
--        },
--        {
--            "name": "league/container",
--            "version": "2.4.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/thephpleague/container.git",
--                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0",
--                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0",
--                "shasum": ""
--            },
--            "require": {
--                "container-interop/container-interop": "^1.2",
--                "php": "^5.4.0 || ^7.0"
--            },
--            "provide": {
--                "container-interop/container-interop-implementation": "^1.2",
--                "psr/container-implementation": "^1.0"
--            },
--            "replace": {
--                "orno/di": "~2.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "4.*"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-2.x": "2.x-dev",
--                    "dev-1.x": "1.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "League\\Container\\": "src"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Phil Bennett",
--                    "email": "philipobenito@gmail.com",
--                    "homepage": "http://www.philipobenito.com",
--                    "role": "Developer"
--                }
--            ],
--            "description": "A fast and intuitive dependency injection container.",
--            "homepage": "https://github.com/thephpleague/container",
--            "keywords": [
--                "container",
--                "dependency",
--                "di",
--                "injection",
--                "league",
--                "provider",
--                "service"
--            ],
--            "time": "2017-05-10T09:20:27+00:00"
--        },
--        {
--            "name": "myclabs/deep-copy",
--            "version": "1.8.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/myclabs/DeepCopy.git",
--                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
--                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.1"
--            },
--            "replace": {
--                "myclabs/deep-copy": "self.version"
--            },
--            "require-dev": {
--                "doctrine/collections": "^1.0",
--                "doctrine/common": "^2.6",
--                "phpunit/phpunit": "^7.1"
--            },
--            "type": "library",
--            "autoload": {
--                "psr-4": {
--                    "DeepCopy\\": "src/DeepCopy/"
--                },
--                "files": [
--                    "src/DeepCopy/deep_copy.php"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "description": "Create deep copies (clones) of your objects",
--            "keywords": [
--                "clone",
--                "copy",
--                "duplicate",
--                "object",
--                "object graph"
--            ],
--            "time": "2018-06-11T23:09:50+00:00"
--        },
--        {
--            "name": "phar-io/manifest",
--            "version": "1.0.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/phar-io/manifest.git",
--                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
--                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
--                "shasum": ""
--            },
--            "require": {
--                "ext-dom": "*",
--                "ext-phar": "*",
--                "phar-io/version": "^1.0.1",
--                "php": "^5.6 || ^7.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.0.x-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Arne Blankerts",
--                    "email": "arne@blankerts.de",
--                    "role": "Developer"
--                },
--                {
--                    "name": "Sebastian Heuer",
--                    "email": "sebastian@phpeople.de",
--                    "role": "Developer"
--                },
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de",
--                    "role": "Developer"
--                }
--            ],
--            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
--            "time": "2017-03-05T18:14:27+00:00"
--        },
--        {
--            "name": "phar-io/version",
--            "version": "1.0.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/phar-io/version.git",
--                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
--                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^5.6 || ^7.0"
--            },
--            "type": "library",
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Arne Blankerts",
--                    "email": "arne@blankerts.de",
--                    "role": "Developer"
--                },
--                {
--                    "name": "Sebastian Heuer",
--                    "email": "sebastian@phpeople.de",
--                    "role": "Developer"
--                },
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de",
--                    "role": "Developer"
--                }
--            ],
--            "description": "Library for handling version information and constraints",
--            "time": "2017-03-05T17:38:23+00:00"
--        },
--        {
--            "name": "phpdocumentor/reflection-common",
--            "version": "1.0.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
--                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
--                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.5"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^4.6"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.0.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "phpDocumentor\\Reflection\\": [
--                        "src"
--                    ]
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Jaap van Otterdijk",
--                    "email": "opensource@ijaap.nl"
--                }
--            ],
--            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
--            "homepage": "http://www.phpdoc.org",
--            "keywords": [
--                "FQSEN",
--                "phpDocumentor",
--                "phpdoc",
--                "reflection",
--                "static analysis"
--            ],
--            "time": "2017-09-11T18:02:19+00:00"
--        },
--        {
--            "name": "phpdocumentor/reflection-docblock",
--            "version": "4.3.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
--                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
--                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.0",
--                "phpdocumentor/reflection-common": "^1.0.0",
--                "phpdocumentor/type-resolver": "^0.4.0",
--                "webmozart/assert": "^1.0"
--            },
--            "require-dev": {
--                "doctrine/instantiator": "~1.0.5",
--                "mockery/mockery": "^1.0",
--                "phpunit/phpunit": "^6.4"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "4.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "phpDocumentor\\Reflection\\": [
--                        "src/"
--                    ]
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Mike van Riel",
--                    "email": "me@mikevanriel.com"
--                }
--            ],
--            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
--            "time": "2017-11-30T07:14:17+00:00"
--        },
--        {
--            "name": "phpdocumentor/type-resolver",
--            "version": "0.4.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/phpDocumentor/TypeResolver.git",
--                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
--                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^5.5 || ^7.0",
--                "phpdocumentor/reflection-common": "^1.0"
--            },
--            "require-dev": {
--                "mockery/mockery": "^0.9.4",
--                "phpunit/phpunit": "^5.2||^4.8.24"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.0.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "phpDocumentor\\Reflection\\": [
--                        "src/"
--                    ]
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Mike van Riel",
--                    "email": "me@mikevanriel.com"
--                }
--            ],
--            "time": "2017-07-14T14:27:02+00:00"
--        },
--        {
--            "name": "phpspec/prophecy",
--            "version": "1.7.6",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/phpspec/prophecy.git",
--                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
--                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
--                "shasum": ""
--            },
--            "require": {
--                "doctrine/instantiator": "^1.0.2",
--                "php": "^5.3|^7.0",
--                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
--                "sebastian/comparator": "^1.1|^2.0|^3.0",
--                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
--            },
--            "require-dev": {
--                "phpspec/phpspec": "^2.5|^3.2",
--                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.7.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-0": {
--                    "Prophecy\\": "src/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Konstantin Kudryashov",
--                    "email": "ever.zet@gmail.com",
--                    "homepage": "http://everzet.com"
--                },
--                {
--                    "name": "Marcello Duarte",
--                    "email": "marcello.duarte@gmail.com"
--                }
--            ],
--            "description": "Highly opinionated mocking framework for PHP 5.3+",
--            "homepage": "https://github.com/phpspec/prophecy",
--            "keywords": [
--                "Double",
--                "Dummy",
--                "fake",
--                "mock",
--                "spy",
--                "stub"
--            ],
--            "time": "2018-04-18T13:57:24+00:00"
--        },
--        {
--            "name": "phpunit/php-code-coverage",
--            "version": "5.3.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
--                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
--                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
--                "shasum": ""
--            },
--            "require": {
--                "ext-dom": "*",
--                "ext-xmlwriter": "*",
--                "php": "^7.0",
--                "phpunit/php-file-iterator": "^1.4.2",
--                "phpunit/php-text-template": "^1.2.1",
--                "phpunit/php-token-stream": "^2.0.1",
--                "sebastian/code-unit-reverse-lookup": "^1.0.1",
--                "sebastian/environment": "^3.0",
--                "sebastian/version": "^2.0.1",
--                "theseer/tokenizer": "^1.1"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^6.0"
--            },
--            "suggest": {
--                "ext-xdebug": "^2.5.5"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "5.3.x-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de",
--                    "role": "lead"
--                }
--            ],
--            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
--            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
--            "keywords": [
--                "coverage",
--                "testing",
--                "xunit"
--            ],
--            "time": "2018-04-06T15:36:58+00:00"
--        },
--        {
--            "name": "phpunit/php-file-iterator",
--            "version": "1.4.5",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
--                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
--                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.3.3"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.4.x-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sb@sebastian-bergmann.de",
--                    "role": "lead"
--                }
--            ],
--            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
--            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
--            "keywords": [
--                "filesystem",
--                "iterator"
--            ],
--            "time": "2017-11-27T13:52:08+00:00"
--        },
--        {
--            "name": "phpunit/php-text-template",
--            "version": "1.2.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-text-template.git",
--                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
--                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.3.3"
--            },
--            "type": "library",
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de",
--                    "role": "lead"
--                }
--            ],
--            "description": "Simple template engine.",
--            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
--            "keywords": [
--                "template"
--            ],
--            "time": "2015-06-21T13:50:34+00:00"
--        },
--        {
--            "name": "phpunit/php-timer",
--            "version": "1.0.9",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-timer.git",
--                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
--                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^5.3.3 || ^7.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.0-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sb@sebastian-bergmann.de",
--                    "role": "lead"
--                }
--            ],
--            "description": "Utility class for timing",
--            "homepage": "https://github.com/sebastianbergmann/php-timer/",
--            "keywords": [
--                "timer"
--            ],
--            "time": "2017-02-26T11:10:40+00:00"
--        },
--        {
--            "name": "phpunit/php-token-stream",
--            "version": "2.0.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
--                "reference": "791198a2c6254db10131eecfe8c06670700904db"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
--                "reference": "791198a2c6254db10131eecfe8c06670700904db",
--                "shasum": ""
--            },
--            "require": {
--                "ext-tokenizer": "*",
--                "php": "^7.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^6.2.4"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.0-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
--                }
--            ],
--            "description": "Wrapper around PHP's tokenizer extension.",
--            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
--            "keywords": [
--                "tokenizer"
--            ],
--            "time": "2017-11-27T05:48:46+00:00"
--        },
--        {
--            "name": "phpunit/phpunit",
--            "version": "6.5.9",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/phpunit.git",
--                "reference": "093ca5508174cd8ab8efe44fd1dde447adfdec8f"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/093ca5508174cd8ab8efe44fd1dde447adfdec8f",
--                "reference": "093ca5508174cd8ab8efe44fd1dde447adfdec8f",
--                "shasum": ""
--            },
--            "require": {
--                "ext-dom": "*",
--                "ext-json": "*",
--                "ext-libxml": "*",
--                "ext-mbstring": "*",
--                "ext-xml": "*",
--                "myclabs/deep-copy": "^1.6.1",
--                "phar-io/manifest": "^1.0.1",
--                "phar-io/version": "^1.0",
--                "php": "^7.0",
--                "phpspec/prophecy": "^1.7",
--                "phpunit/php-code-coverage": "^5.3",
--                "phpunit/php-file-iterator": "^1.4.3",
--                "phpunit/php-text-template": "^1.2.1",
--                "phpunit/php-timer": "^1.0.9",
--                "phpunit/phpunit-mock-objects": "^5.0.5",
--                "sebastian/comparator": "^2.1",
--                "sebastian/diff": "^2.0",
--                "sebastian/environment": "^3.1",
--                "sebastian/exporter": "^3.1",
--                "sebastian/global-state": "^2.0",
--                "sebastian/object-enumerator": "^3.0.3",
--                "sebastian/resource-operations": "^1.0",
--                "sebastian/version": "^2.0.1"
--            },
--            "conflict": {
--                "phpdocumentor/reflection-docblock": "3.0.2",
--                "phpunit/dbunit": "<3.0"
--            },
--            "require-dev": {
--                "ext-pdo": "*"
--            },
--            "suggest": {
--                "ext-xdebug": "*",
--                "phpunit/php-invoker": "^1.1"
--            },
--            "bin": [
--                "phpunit"
--            ],
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "6.5.x-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de",
--                    "role": "lead"
--                }
--            ],
--            "description": "The PHP Unit Testing framework.",
--            "homepage": "https://phpunit.de/",
--            "keywords": [
--                "phpunit",
--                "testing",
--                "xunit"
--            ],
--            "time": "2018-07-03T06:40:40+00:00"
--        },
--        {
--            "name": "phpunit/phpunit-mock-objects",
--            "version": "5.0.8",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
--                "reference": "6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f",
--                "reference": "6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f",
--                "shasum": ""
--            },
--            "require": {
--                "doctrine/instantiator": "^1.0.5",
--                "php": "^7.0",
--                "phpunit/php-text-template": "^1.2.1",
--                "sebastian/exporter": "^3.1"
--            },
--            "conflict": {
--                "phpunit/phpunit": "<6.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^6.5"
--            },
--            "suggest": {
--                "ext-soap": "*"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "5.0.x-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de",
--                    "role": "lead"
--                }
--            ],
--            "description": "Mock Object library for PHPUnit",
--            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
--            "keywords": [
--                "mock",
--                "xunit"
--            ],
--            "time": "2018-07-13T03:27:23+00:00"
--        },
--        {
--            "name": "psr/container",
--            "version": "1.0.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/php-fig/container.git",
--                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
--                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.3.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.0.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Psr\\Container\\": "src/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "PHP-FIG",
--                    "homepage": "http://www.php-fig.org/"
--                }
--            ],
--            "description": "Common Container Interface (PHP FIG PSR-11)",
--            "homepage": "https://github.com/php-fig/container",
--            "keywords": [
--                "PSR-11",
--                "container",
--                "container-interface",
--                "container-interop",
--                "psr"
--            ],
--            "time": "2017-02-14T16:28:37+00:00"
--        },
--        {
--            "name": "psr/http-message",
--            "version": "1.0.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/php-fig/http-message.git",
--                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
--                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.3.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.0.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Psr\\Http\\Message\\": "src/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "PHP-FIG",
--                    "homepage": "http://www.php-fig.org/"
--                }
--            ],
--            "description": "Common interface for HTTP messages",
--            "homepage": "https://github.com/php-fig/http-message",
--            "keywords": [
--                "http",
--                "http-message",
--                "psr",
--                "psr-7",
--                "request",
--                "response"
--            ],
--            "time": "2016-08-06T14:39:51+00:00"
--        },
--        {
--            "name": "psr/log",
--            "version": "1.0.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/php-fig/log.git",
--                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
--                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.3.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.0.x-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Psr\\Log\\": "Psr/Log/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "PHP-FIG",
--                    "homepage": "http://www.php-fig.org/"
--                }
--            ],
--            "description": "Common interface for logging libraries",
--            "homepage": "https://github.com/php-fig/log",
--            "keywords": [
--                "log",
--                "psr",
--                "psr-3"
--            ],
--            "time": "2016-10-10T12:19:37+00:00"
--        },
--        {
--            "name": "sebastian/code-unit-reverse-lookup",
--            "version": "1.0.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
--                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
--                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^5.6 || ^7.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^5.7 || ^6.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.0.x-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
--                }
--            ],
--            "description": "Looks up which function or method a line of code belongs to",
--            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
--            "time": "2017-03-04T06:30:41+00:00"
--        },
--        {
--            "name": "sebastian/comparator",
--            "version": "2.1.3",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/comparator.git",
--                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
--                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.0",
--                "sebastian/diff": "^2.0 || ^3.0",
--                "sebastian/exporter": "^3.1"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^6.4"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.1.x-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Jeff Welch",
--                    "email": "whatthejeff@gmail.com"
--                },
--                {
--                    "name": "Volker Dusch",
--                    "email": "github@wallbash.com"
--                },
--                {
--                    "name": "Bernhard Schussek",
--                    "email": "bschussek@2bepublished.at"
--                },
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
--                }
--            ],
--            "description": "Provides the functionality to compare PHP values for equality",
--            "homepage": "https://github.com/sebastianbergmann/comparator",
--            "keywords": [
--                "comparator",
--                "compare",
--                "equality"
--            ],
--            "time": "2018-02-01T13:46:46+00:00"
--        },
--        {
--            "name": "sebastian/diff",
--            "version": "2.0.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/diff.git",
--                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
--                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^6.2"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.0-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Kore Nordmann",
--                    "email": "mail@kore-nordmann.de"
--                },
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
--                }
--            ],
--            "description": "Diff implementation",
--            "homepage": "https://github.com/sebastianbergmann/diff",
--            "keywords": [
--                "diff"
--            ],
--            "time": "2017-08-03T08:09:46+00:00"
--        },
--        {
--            "name": "sebastian/environment",
--            "version": "3.1.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/environment.git",
--                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
--                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^6.1"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "3.1.x-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
--                }
--            ],
--            "description": "Provides functionality to handle HHVM/PHP environments",
--            "homepage": "http://www.github.com/sebastianbergmann/environment",
--            "keywords": [
--                "Xdebug",
--                "environment",
--                "hhvm"
--            ],
--            "time": "2017-07-01T08:51:00+00:00"
--        },
--        {
--            "name": "sebastian/exporter",
--            "version": "3.1.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/exporter.git",
--                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
--                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.0",
--                "sebastian/recursion-context": "^3.0"
--            },
--            "require-dev": {
--                "ext-mbstring": "*",
--                "phpunit/phpunit": "^6.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "3.1.x-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Jeff Welch",
--                    "email": "whatthejeff@gmail.com"
--                },
--                {
--                    "name": "Volker Dusch",
--                    "email": "github@wallbash.com"
--                },
--                {
--                    "name": "Bernhard Schussek",
--                    "email": "bschussek@2bepublished.at"
--                },
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
--                },
--                {
--                    "name": "Adam Harvey",
--                    "email": "aharvey@php.net"
--                }
--            ],
--            "description": "Provides the functionality to export PHP variables for visualization",
--            "homepage": "http://www.github.com/sebastianbergmann/exporter",
--            "keywords": [
--                "export",
--                "exporter"
--            ],
--            "time": "2017-04-03T13:19:02+00:00"
--        },
--        {
--            "name": "sebastian/global-state",
--            "version": "2.0.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/global-state.git",
--                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
--                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^6.0"
--            },
--            "suggest": {
--                "ext-uopz": "*"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.0-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
--                }
--            ],
--            "description": "Snapshotting of global state",
--            "homepage": "http://www.github.com/sebastianbergmann/global-state",
--            "keywords": [
--                "global state"
--            ],
--            "time": "2017-04-27T15:39:26+00:00"
--        },
--        {
--            "name": "sebastian/object-enumerator",
--            "version": "3.0.3",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
--                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
--                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.0",
--                "sebastian/object-reflector": "^1.1.1",
--                "sebastian/recursion-context": "^3.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^6.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "3.0.x-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
--                }
--            ],
--            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
--            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
--            "time": "2017-08-03T12:35:26+00:00"
--        },
--        {
--            "name": "sebastian/object-reflector",
--            "version": "1.1.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/object-reflector.git",
--                "reference": "773f97c67f28de00d397be301821b06708fca0be"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
--                "reference": "773f97c67f28de00d397be301821b06708fca0be",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^6.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.1-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
--                }
--            ],
--            "description": "Allows reflection of object attributes, including inherited and non-public ones",
--            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
--            "time": "2017-03-29T09:07:27+00:00"
--        },
--        {
--            "name": "sebastian/recursion-context",
--            "version": "3.0.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/recursion-context.git",
--                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
--                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^6.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "3.0.x-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Jeff Welch",
--                    "email": "whatthejeff@gmail.com"
--                },
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
--                },
--                {
--                    "name": "Adam Harvey",
--                    "email": "aharvey@php.net"
--                }
--            ],
--            "description": "Provides functionality to recursively process PHP variables",
--            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
--            "time": "2017-03-03T06:23:57+00:00"
--        },
--        {
--            "name": "sebastian/resource-operations",
--            "version": "1.0.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/resource-operations.git",
--                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
--                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.6.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.0.x-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
--                }
--            ],
--            "description": "Provides a list of PHP built-in functions that operate on resources",
--            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
--            "time": "2015-07-28T20:34:47+00:00"
--        },
--        {
--            "name": "sebastian/version",
--            "version": "2.0.1",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/sebastianbergmann/version.git",
--                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
--                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.6"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.0.x-dev"
--                }
--            },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de",
--                    "role": "lead"
--                }
--            ],
--            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
--            "homepage": "https://github.com/sebastianbergmann/version",
--            "time": "2016-10-03T07:35:21+00:00"
--        },
--        {
--            "name": "symfony/browser-kit",
--            "version": "v4.1.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/symfony/browser-kit.git",
--                "reference": "ff9ac5d5808a530b2e7f6abcf3a2412d4f9bcd62"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/ff9ac5d5808a530b2e7f6abcf3a2412d4f9bcd62",
--                "reference": "ff9ac5d5808a530b2e7f6abcf3a2412d4f9bcd62",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.1.3",
--                "symfony/dom-crawler": "~3.4|~4.0"
--            },
--            "require-dev": {
--                "symfony/css-selector": "~3.4|~4.0",
--                "symfony/process": "~3.4|~4.0"
--            },
--            "suggest": {
--                "symfony/process": ""
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "4.1-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\BrowserKit\\": ""
--                },
--                "exclude-from-classmap": [
--                    "/Tests/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
--                }
--            ],
--            "description": "Symfony BrowserKit Component",
--            "homepage": "https://symfony.com",
--            "time": "2018-06-04T17:31:56+00:00"
--        },
--        {
--            "name": "symfony/console",
--            "version": "v4.1.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/symfony/console.git",
--                "reference": "5c31f6a97c1c240707f6d786e7e59bfacdbc0219"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/symfony/console/zipball/5c31f6a97c1c240707f6d786e7e59bfacdbc0219",
--                "reference": "5c31f6a97c1c240707f6d786e7e59bfacdbc0219",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.1.3",
--                "symfony/polyfill-mbstring": "~1.0"
--            },
--            "conflict": {
--                "symfony/dependency-injection": "<3.4",
--                "symfony/process": "<3.3"
--            },
--            "require-dev": {
--                "psr/log": "~1.0",
--                "symfony/config": "~3.4|~4.0",
--                "symfony/dependency-injection": "~3.4|~4.0",
--                "symfony/event-dispatcher": "~3.4|~4.0",
--                "symfony/lock": "~3.4|~4.0",
--                "symfony/process": "~3.4|~4.0"
--            },
--            "suggest": {
--                "psr/log-implementation": "For using the console logger",
--                "symfony/event-dispatcher": "",
--                "symfony/lock": "",
--                "symfony/process": ""
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "4.1-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\Console\\": ""
--                },
--                "exclude-from-classmap": [
--                    "/Tests/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
--                }
--            ],
--            "description": "Symfony Console Component",
--            "homepage": "https://symfony.com",
--            "time": "2018-07-16T14:05:40+00:00"
--        },
--        {
--            "name": "symfony/css-selector",
--            "version": "v4.1.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/symfony/css-selector.git",
--                "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/symfony/css-selector/zipball/03ac71606ecb0b0ce792faa17d74cc32c2949ef4",
--                "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.1.3"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "4.1-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\CssSelector\\": ""
--                },
--                "exclude-from-classmap": [
--                    "/Tests/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Jean-François Simon",
--                    "email": "jeanfrancois.simon@sensiolabs.com"
--                },
--                {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
--                }
--            ],
--            "description": "Symfony CssSelector Component",
--            "homepage": "https://symfony.com",
--            "time": "2018-05-30T07:26:09+00:00"
--        },
--        {
--            "name": "symfony/dom-crawler",
--            "version": "v4.1.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/symfony/dom-crawler.git",
--                "reference": "eb501fa8aab8c8e2db790d8d0f945697769f6c41"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/eb501fa8aab8c8e2db790d8d0f945697769f6c41",
--                "reference": "eb501fa8aab8c8e2db790d8d0f945697769f6c41",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.1.3",
--                "symfony/polyfill-ctype": "~1.8",
--                "symfony/polyfill-mbstring": "~1.0"
--            },
--            "require-dev": {
--                "symfony/css-selector": "~3.4|~4.0"
--            },
--            "suggest": {
--                "symfony/css-selector": ""
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "4.1-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\DomCrawler\\": ""
--                },
--                "exclude-from-classmap": [
--                    "/Tests/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
--                }
--            ],
--            "description": "Symfony DomCrawler Component",
--            "homepage": "https://symfony.com",
--            "time": "2018-07-05T11:54:23+00:00"
--        },
--        {
--            "name": "symfony/event-dispatcher",
--            "version": "v4.1.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/symfony/event-dispatcher.git",
--                "reference": "00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f",
--                "reference": "00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.1.3"
--            },
--            "conflict": {
--                "symfony/dependency-injection": "<3.4"
--            },
--            "require-dev": {
--                "psr/log": "~1.0",
--                "symfony/config": "~3.4|~4.0",
--                "symfony/dependency-injection": "~3.4|~4.0",
--                "symfony/expression-language": "~3.4|~4.0",
--                "symfony/stopwatch": "~3.4|~4.0"
--            },
--            "suggest": {
--                "symfony/dependency-injection": "",
--                "symfony/http-kernel": ""
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "4.1-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\EventDispatcher\\": ""
--                },
--                "exclude-from-classmap": [
--                    "/Tests/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
--                }
--            ],
--            "description": "Symfony EventDispatcher Component",
--            "homepage": "https://symfony.com",
--            "time": "2018-07-10T11:02:47+00:00"
--        },
--        {
--            "name": "symfony/filesystem",
--            "version": "v4.1.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/symfony/filesystem.git",
--                "reference": "562bf7005b55fd80d26b582d28e3e10f2dd5ae9c"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/symfony/filesystem/zipball/562bf7005b55fd80d26b582d28e3e10f2dd5ae9c",
--                "reference": "562bf7005b55fd80d26b582d28e3e10f2dd5ae9c",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.1.3",
--                "symfony/polyfill-ctype": "~1.8"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "4.1-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\Filesystem\\": ""
--                },
--                "exclude-from-classmap": [
--                    "/Tests/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
--                }
--            ],
--            "description": "Symfony Filesystem Component",
--            "homepage": "https://symfony.com",
--            "time": "2018-05-30T07:26:09+00:00"
--        },
--        {
--            "name": "symfony/finder",
--            "version": "v4.1.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/symfony/finder.git",
--                "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/symfony/finder/zipball/84714b8417d19e4ba02ea78a41a975b3efaafddb",
--                "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.1.3"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "4.1-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\Finder\\": ""
--                },
--                "exclude-from-classmap": [
--                    "/Tests/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
--                }
--            ],
--            "description": "Symfony Finder Component",
--            "homepage": "https://symfony.com",
--            "time": "2018-06-19T21:38:16+00:00"
--        },
--        {
--            "name": "symfony/polyfill-ctype",
--            "version": "v1.8.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/symfony/polyfill-ctype.git",
--                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
--                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.3.3"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.8-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Symfony\\Polyfill\\Ctype\\": ""
--                },
--                "files": [
--                    "bootstrap.php"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
--                },
--                {
--                    "name": "Gert de Pagter",
--                    "email": "BackEndTea@gmail.com"
--                }
--            ],
--            "description": "Symfony polyfill for ctype functions",
--            "homepage": "https://symfony.com",
--            "keywords": [
--                "compatibility",
--                "ctype",
--                "polyfill",
--                "portable"
--            ],
--            "time": "2018-04-30T19:57:29+00:00"
--        },
--        {
--            "name": "symfony/polyfill-mbstring",
--            "version": "v1.8.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/symfony/polyfill-mbstring.git",
--                "reference": "3296adf6a6454a050679cde90f95350ad604b171"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
--                "reference": "3296adf6a6454a050679cde90f95350ad604b171",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.3.3"
--            },
--            "suggest": {
--                "ext-mbstring": "For best performance"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.8-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Symfony\\Polyfill\\Mbstring\\": ""
--                },
--                "files": [
--                    "bootstrap.php"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Nicolas Grekas",
--                    "email": "p@tchwork.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
--                }
--            ],
--            "description": "Symfony polyfill for the Mbstring extension",
--            "homepage": "https://symfony.com",
--            "keywords": [
--                "compatibility",
--                "mbstring",
--                "polyfill",
--                "portable",
--                "shim"
--            ],
--            "time": "2018-04-26T10:06:28+00:00"
--        },
--        {
--            "name": "symfony/process",
--            "version": "v4.1.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/symfony/process.git",
--                "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/symfony/process/zipball/1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
--                "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.1.3"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "4.1-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\Process\\": ""
--                },
--                "exclude-from-classmap": [
--                    "/Tests/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
--                }
--            ],
--            "description": "Symfony Process Component",
--            "homepage": "https://symfony.com",
--            "time": "2018-05-31T10:17:53+00:00"
--        },
--        {
--            "name": "symfony/yaml",
--            "version": "v4.1.2",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/symfony/yaml.git",
--                "reference": "80e4bfa9685fc4a09acc4a857ec16974a9cd944e"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/symfony/yaml/zipball/80e4bfa9685fc4a09acc4a857ec16974a9cd944e",
--                "reference": "80e4bfa9685fc4a09acc4a857ec16974a9cd944e",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^7.1.3",
--                "symfony/polyfill-ctype": "~1.8"
--            },
--            "conflict": {
--                "symfony/console": "<3.4"
--            },
--            "require-dev": {
--                "symfony/console": "~3.4|~4.0"
--            },
--            "suggest": {
--                "symfony/console": "For validating YAML files using the lint command"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "4.1-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\Yaml\\": ""
--                },
--                "exclude-from-classmap": [
--                    "/Tests/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
--                }
--            ],
--            "description": "Symfony Yaml Component",
--            "homepage": "https://symfony.com",
--            "time": "2018-05-30T07:26:09+00:00"
--        },
--        {
--            "name": "theseer/tokenizer",
--            "version": "1.1.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/theseer/tokenizer.git",
--                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
--                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
--                "shasum": ""
--            },
--            "require": {
--                "ext-dom": "*",
--                "ext-tokenizer": "*",
--                "ext-xmlwriter": "*",
--                "php": "^7.0"
--            },
--            "type": "library",
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Arne Blankerts",
--                    "email": "arne@blankerts.de",
--                    "role": "Developer"
--                }
--            ],
--            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
--            "time": "2017-04-07T12:08:54+00:00"
--        },
--        {
--            "name": "vlucas/phpdotenv",
--            "version": "v2.5.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/vlucas/phpdotenv.git",
--                "reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/6ae3e2e6494bb5e58c2decadafc3de7f1453f70a",
--                "reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a",
--                "shasum": ""
--            },
--            "require": {
--                "php": ">=5.3.9"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^4.8.35 || ^5.0"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.5-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Dotenv\\": "src/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Vance Lucas",
--                    "email": "vance@vancelucas.com",
--                    "homepage": "http://www.vancelucas.com"
--                }
--            ],
--            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
--            "keywords": [
--                "dotenv",
--                "env",
--                "environment"
--            ],
--            "time": "2018-07-01T10:25:50+00:00"
--        },
--        {
--            "name": "webmozart/assert",
--            "version": "1.3.0",
--            "source": {
--                "type": "git",
--                "url": "https://github.com/webmozart/assert.git",
--                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
--            },
--            "dist": {
--                "type": "zip",
--                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
--                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
--                "shasum": ""
--            },
--            "require": {
--                "php": "^5.3.3 || ^7.0"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "^4.6",
--                "sebastian/version": "^1.0.1"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.3-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Webmozart\\Assert\\": "src/"
--                }
--            },
--            "notification-url": "https://packagist.org/downloads/",
--            "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Bernhard Schussek",
--                    "email": "bschussek@gmail.com"
--                }
--            ],
--            "description": "Assertions to validate method input/output with nice error messages.",
--            "keywords": [
--                "assert",
--                "check",
--                "validate"
--            ],
--            "time": "2018-01-29T19:49:41+00:00"
--        }
--    ],
--    "packages-dev": [],
--    "aliases": [],
--    "minimum-stability": "stable",
--    "stability-flags": [],
--    "prefer-stable": true,
--    "prefer-lowest": false,
--    "platform": {
--        "php": "~7.1.3||~7.2.0"
--    },
--    "platform-dev": []
--}
-diff --git a/dev/tests/acceptance/tests/_data/catalog_import_products.csv b/dev/tests/acceptance/tests/_data/catalog_import_products.csv
-new file mode 100644
-index 00000000000..7732f15d4ce
---- /dev/null
-+++ b/dev/tests/acceptance/tests/_data/catalog_import_products.csv
-@@ -0,0 +1,4 @@
-+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,configurable_variations,configurable_variation_labels,associated_skus
-+SimpleProductForTest1,,Default,simple,"Default","base,second_website",SimpleProductAfterImport1,,,1.0000,1,"Taxable Goods","Catalog, Search",250.0000,,,,simple-product-for-test-1,,,,,,,,,,,,"3/4/19, 5:53 AM","3/4/19, 4:47 PM",,,"Block after Info Column",,,,,,,,,,,"Use config",,,100.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,,,,,,,,,,,,,,,,,,,
-+SimpleProductForTest2,,Default,simple,"Default",base,SimpleProductAfterImport2,,,1.0000,1,"Taxable Goods","Catalog, Search",300.0000,,,,simple-product-for-test-2,,,,,,,,,,,,"3/4/19, 5:53 AM","3/4/19, 4:47 PM",,,"Block after Info Column",,,,,,,,,,,"Use config",,,100.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,,,,,,,,,,,,,,,,,,,
-+SimpleProductForTest3,,Default,simple,"Default","base,second_website",SimpleProductAfterImport3,,,1.0000,1,"Taxable Goods","Catalog, Search",350.0000,,,,simple-product-for-test-3,,,,,,,,,,,,"3/4/19, 5:53 AM","3/4/19, 4:47 PM",,,"Block after Info Column",,,,,,,,,,,"Use config",,,100.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,,,,,,,,,,,,,,,,,,,
-\ No newline at end of file
-diff --git a/dev/tests/acceptance/tests/_data/catalog_products.csv b/dev/tests/acceptance/tests/_data/catalog_products.csv
-new file mode 100644
-index 00000000000..3b580172d6a
---- /dev/null
-+++ b/dev/tests/acceptance/tests/_data/catalog_products.csv
-@@ -0,0 +1,4 @@
-+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,deferred_stock_update,use_config_deferred_stock_update,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,configurable_variations,configurable_variation_labels,associated_skus
-+"Simple Product for Test",,Default,simple,,base,"Simple Product for Test",,,,1,"Taxable Goods","Catalog, Search",123.0000,,,,simple-product-for-test,,,,,,,,,,,,"12/18/18, 7:50 AM","12/18/18, 7:50 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
-+"Virtual Product for Test",,Default,virtual,,base,"Virtual Product for Test",,,0.0000,1,"Taxable Goods","Catalog, Search",99.9900,,,,virtual-product-for-test,,,,,,,,,,,,"12/18/18, 7:51 AM","12/18/18, 7:51 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
-+"Api Downloadable Product for Test",,Default,downloadable,,base,"Api Downloadable Product for Test","API Product Description5c18fb47982621","API Product Short Description5c18fb47982e21",,1,"Taxable Goods","Catalog, Search",123.0000,,,,api-downloadable-product-for-test,,,,,,,,,,,,"12/18/18, 7:51 AM","12/18/18, 7:51 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
-diff --git a/dev/tests/acceptance/tests/_data/import_updated.csv b/dev/tests/acceptance/tests/_data/import_updated.csv
-new file mode 100644
-index 00000000000..b517150eec8
---- /dev/null
-+++ b/dev/tests/acceptance/tests/_data/import_updated.csv
-@@ -0,0 +1,4 @@
-+product_websites,store_view_code,attribute_set_code,product_type,categories,sku,price,name,url_key
-+base,,Default,simple,Default Category/category-admin,productformagetwo68980,123,productformagetwo68980,productformagetwo68980
-+,en,Default,simple,,productformagetwo68980,,productformagetwo68980-english,productformagetwo68980-english
-+,nl,Default,simple,,productformagetwo68980,,productformagetwo68980-dutch,productformagetwo68980-dutch
-diff --git a/dev/tests/acceptance/tests/_data/prepared-for-sample-data.csv b/dev/tests/acceptance/tests/_data/prepared-for-sample-data.csv
-new file mode 100644
-index 00000000000..cb4f9817172
---- /dev/null
-+++ b/dev/tests/acceptance/tests/_data/prepared-for-sample-data.csv
-@@ -0,0 +1,499 @@
-+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,url_key,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,deferred_stock_update,use_config_deferred_stock_update,related_skus,upsell_skus,additional_images,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,configurable_variations,configurable_variation_labels,associated_skus,brand,can_add_earmold,use_pcm,product_line,product_group,related_earmold_sku,warranty_product_type,extended_warranty_sku,show_default_warranty,show_extended_warranty,infor_product_class,infor_platform,local_private_label,infor_item_group,infor_serialized_item_group,infor_product_group,infor_sales_price_group,ignore_price_options,loss_and_damage_sku
-+10536515,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Extended Warranty 12 Months new,,,0.001,1,0,"Catalog, Search",133,10536515_Extended-Warranty-12-Months_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,Warranty,,NWY,,,,,,,,,,,,
-+10536515,second_storeview,Default,simple,,,Extended Warranty 12 Months,,,,,,"Catalog, Search",,10536515_Extended-Warranty-12-Months_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10536515,third_store_view,Default,simple,,,Extended Warranty 12 Months,,,,,,"Catalog, Search",,10536515_Extended-Warranty-12-Months_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10536516,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Extended Warranty 24 Months,,,0.001,1,0,"Catalog, Search",189,10536516_Extended-Warranty-24-Months_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,Warranty,,NWY,,,,,,,,,,,,
-+10536516,second_storeview,Default,simple,,,Extended Warranty 24 Months,,,,,,"Catalog, Search",,10536516_Extended-Warranty-24-Months_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10536516,third_store_view,Default,simple,,,Extended Warranty 24 Months,,,,,,"Catalog, Search",,10536516_Extended-Warranty-24-Months_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10240175,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,L&D CHARGE LEVEL 1,,,0.001,1,0,"Catalog, Search",150,10240175_LD-CHARGE-LEVEL-1_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,LossDamage,,S03,,,,,,,,,,,,
-+10240175,second_storeview,Default,simple,,,L&D CHARGE LEVEL 1,,,,,,"Catalog, Search",,10240175_LD-CHARGE-LEVEL-1_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10240175,third_store_view,Default,simple,,,L&D CHARGE LEVEL 1,,,,,,"Catalog, Search",,10240175_LD-CHARGE-LEVEL-1_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10240176,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,L&D CHARGE LEVEL 2,,,0.001,1,0,"Catalog, Search",220,10240176_LD-CHARGE-LEVEL-2_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,LossDamage,,S03,,,,,,,,,,,,
-+10240176,second_storeview,Default,simple,,,L&D CHARGE LEVEL 2,,,,,,"Catalog, Search",,10240176_LD-CHARGE-LEVEL-2_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10240176,third_store_view,Default,simple,,,L&D CHARGE LEVEL 2,,,,,,"Catalog, Search",,10240176_LD-CHARGE-LEVEL-2_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10825023,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,LICENSE CHARGES UNITY 3 REM,,,0.001,1,0,"Catalog, Search",1100,10825023_LICENSE-CHARGES-UNITY-3-REM_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A99,,,,,,,,,,,,
-+10825023,second_storeview,Default,simple,,,LICENSE CHARGES UNITY 3 REM,,,,,,"Catalog, Search",,10825023_LICENSE-CHARGES-UNITY-3-REM_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10825023,third_store_view,Default,simple,,,LICENSE CHARGES UNITY 3 REM,,,,,,"Catalog, Search",,10825023_LICENSE-CHARGES-UNITY-3-REM_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10825024,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,LICENSE CHARGES UNITY 3 SM,,,0.001,1,0,"Catalog, Search",1100,10825024_LICENSE-CHARGES-UNITY-3-SM_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A99,,,,,,,,,,,,
-+10825024,second_storeview,Default,simple,,,LICENSE CHARGES UNITY 3 SM,,,,,,"Catalog, Search",,10825024_LICENSE-CHARGES-UNITY-3-SM_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10825024,third_store_view,Default,simple,,,LICENSE CHARGES UNITY 3 SM,,,,,,"Catalog, Search",,10825024_LICENSE-CHARGES-UNITY-3-SM_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10825022,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,LICENSE CHARGES UNTIY 3 AUD,,,0.001,1,0,"Catalog, Search",1000,10825022_LICENSE-CHARGES-UNTIY-3-AUD_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A99,,,,,,,,,,,,
-+10825022,second_storeview,Default,simple,,,LICENSE CHARGES UNTIY 3 AUD,,,,,,"Catalog, Search",,10825022_LICENSE-CHARGES-UNTIY-3-AUD_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10825022,third_store_view,Default,simple,,,LICENSE CHARGES UNTIY 3 AUD,,,,,,"Catalog, Search",,10825022_LICENSE-CHARGES-UNTIY-3-AUD_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10601877,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Concha Lock S 45db  10/PACK,,,0.015,1,0,"Catalog, Search",6,10601877_Concha-Lock-S-45db--10PACK_transparent_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A99,,,,,,,,,,,,
-+10601877,second_storeview,Default,simple,,,Concha Lock S 45db  10/PACK,,,,,,"Catalog, Search",,10601877_Concha-Lock-S-45db--10PACK_transparent_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10601877,third_store_view,Default,simple,,,Concha Lock S 45db  10/PACK,,,,,,"Catalog, Search",,10601877_Concha-Lock-S-45db--10PACK_transparent_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10674949,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Otoform A SoftX,,Otoform softX Deep fit (8 refill w/o tips),500,1,0,"Catalog, Search",49,10674949_Otoform-A-SoftX_pink_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,S03,,,,,,,,,,,,
-+10674949,second_storeview,Default,simple,,,Otoform A SoftX,,Otoform softX Deep fit (8 refill w/o tips),,,,"Catalog, Search",,10674949_Otoform-A-SoftX_pink_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10674949,third_store_view,Default,simple,,,Otoform A SoftX,,Otoform softX Deep fit (8 refill w/o tips),,,,"Catalog, Search",,10674949_Otoform-A-SoftX_pink_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+7212678,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,EARHOOK SMALL H2030,,,0.35,1,0,"Catalog, Search",6,107212678_EARHOOK-SMALL-H2030_transparent_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,S01,,,,,,,,,,,,
-+7212678,second_storeview,Default,simple,,,EARHOOK SMALL H2030,,,,,,"Catalog, Search",,207212678_EARHOOK-SMALL-H2030_transparent_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+7212678,third_store_view,Default,simple,,,EARHOOK SMALL H2030,,,,,,"Catalog, Search",,307212678_EARHOOK-SMALL-H2030_transparent_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296987,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Refill Open Tip 4MM,,10 pieces per Package,0.5,1,0,"Catalog, Search",10,110296987_Refill-Open-Tip-4MM_Open_4_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10296987,second_storeview,Default,simple,,,Refill Open Tip 4MM,,10 pieces per Package,,,,"Catalog, Search",,10296987_Refill-Open-Tip-4MM_Open_4_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296987,third_store_view,Default,simple,,,Refill Open Tip 4MM,,10 pieces per Package,,,,"Catalog, Search",,10296987_Refill-Open-Tip-4MM_Open_4_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10297179,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,HiPro 2 USB PC Interface,,,230,1,0,"Catalog, Search",1100,10297179_HiPro-2-USB-PC-Interface_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A05,,,,,,,,,,,,
-+10297179,second_storeview,Default,simple,,,HiPro 2 USB PC Interface,,,,,,"Catalog, Search",,10297179_HiPro-2-USB-PC-Interface_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10297179,third_store_view,Default,simple,,,HiPro 2 USB PC Interface,,,,,,"Catalog, Search",,10297179_HiPro-2-USB-PC-Interface_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10667517,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,ERU HP-Receiver,,,15,1,0,"Catalog, Search",108,10667517_ERU-HP-Receiver_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,ERU,,ITE,,,,,,,,,,,,
-+10667517,second_storeview,Default,simple,,,ERU HP-Receiver,,,,,,"Catalog, Search",,10667517_ERU-HP-Receiver_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10667517,third_store_view,Default,simple,,,ERU HP-Receiver,,,,,,"Catalog, Search",,10667517_ERU-HP-Receiver_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942148,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SP 7 px Beige,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2199,10942148_Motion-SP-7-px-Beige_beige_675_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10942148,second_storeview,Default,simple,,,Motion SP 7 px Beige,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942148_Motion-SP-7-px-Beige_beige_675_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942148,third_store_view,Default,simple,,,Motion SP 7 px Beige,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942148_Motion-SP-7-px-Beige_beige_675_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934914,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Silver,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934914_Motion-SX-7-px-Silver_silver_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934914,second_storeview,Default,simple,,,Motion SX 7 px Silver,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934914_Motion-SX-7-px-Silver_silver_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934914,third_store_view,Default,simple,,,Motion SX 7 px Silver,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934914_Motion-SX-7-px-Silver_silver_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934639,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Silver,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934639_Motion-P-7-px-Silver_silver_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934639,second_storeview,Default,simple,,,Motion P 7 px Silver,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934639_Motion-P-7-px-Silver_silver_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934639,third_store_view,Default,simple,,,Motion P 7 px Silver,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934639_Motion-P-7-px-Silver_silver_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942709,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SP 7 px Dark Granite,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2199,10942709_Motion-SP-7-px-Dark-Granite_dark-granite_675_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10942709,second_storeview,Default,simple,,,Motion SP 7 px Dark Granite,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942709_Motion-SP-7-px-Dark-Granite_dark-granite_675_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942709,third_store_view,Default,simple,,,Motion SP 7 px Dark Granite,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942709_Motion-SP-7-px-Dark-Granite_dark-granite_675_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942710,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SP 7 px Grey,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2199,10942710_Motion-SP-7-px-Grey_grey_675_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10942710,second_storeview,Default,simple,,,Motion SP 7 px Grey,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942710_Motion-SP-7-px-Grey_grey_675_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942710,third_store_view,Default,simple,,,Motion SP 7 px Grey,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942710_Motion-SP-7-px-Grey_grey_675_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942711,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SP 7 px Black,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2199,10942711_Motion-SP-7-px-Black_black_675_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10942711,second_storeview,Default,simple,,,Motion SP 7 px Black,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942711_Motion-SP-7-px-Black_black_675_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942711,third_store_view,Default,simple,,,Motion SP 7 px Black,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942711_Motion-SP-7-px-Black_black_675_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942712,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SP 7 px Dark Brown,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2199,10942712_Motion-SP-7-px-Dark-Brown_dark-brown_675_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10942712,second_storeview,Default,simple,,,Motion SP 7 px Dark Brown,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942712_Motion-SP-7-px-Dark-Brown_dark-brown_675_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942712,third_store_view,Default,simple,,,Motion SP 7 px Dark Brown,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942712_Motion-SP-7-px-Dark-Brown_dark-brown_675_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942713,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SP 7 px Granite,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2199,10942713_Motion-SP-7-px-Granite_granite_675_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10942713,second_storeview,Default,simple,,,Motion SP 7 px Granite,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942713_Motion-SP-7-px-Granite_granite_675_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942713,third_store_view,Default,simple,,,Motion SP 7 px Granite,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942713_Motion-SP-7-px-Granite_granite_675_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10936002,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Deep Red,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10936002_Motion-SX-7-px-Deep-Red_deep-red_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10936002,second_storeview,Default,simple,,,Motion SX 7 px Deep Red,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10936002_Motion-SX-7-px-Deep-Red_deep-red_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10936002,third_store_view,Default,simple,,,Motion SX 7 px Deep Red,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10936002_Motion-SX-7-px-Deep-Red_deep-red_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934904,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Black,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934904_Motion-SX-7-px-Black_black_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934904,second_storeview,Default,simple,,,Motion SX 7 px Black,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934904_Motion-SX-7-px-Black_black_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934904,third_store_view,Default,simple,,,Motion SX 7 px Black,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934904_Motion-SX-7-px-Black_black_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934905,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Brown,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934905_Motion-SX-7-px-Brown_brown_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934905,second_storeview,Default,simple,,,Motion SX 7 px Brown,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934905_Motion-SX-7-px-Brown_brown_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934905,third_store_view,Default,simple,,,Motion SX 7 px Brown,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934905_Motion-SX-7-px-Brown_brown_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934906,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Dark Granite,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934906_Motion-SX-7-px-Dark-Granite_dark-granite_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934906,second_storeview,Default,simple,,,Motion SX 7 px Dark Granite,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934906_Motion-SX-7-px-Dark-Granite_dark-granite_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934906,third_store_view,Default,simple,,,Motion SX 7 px Dark Granite,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934906_Motion-SX-7-px-Dark-Granite_dark-granite_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934909,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Granite,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934909_Motion-SX-7-px-Granite_granite_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934909,second_storeview,Default,simple,,,Motion SX 7 px Granite,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934909_Motion-SX-7-px-Granite_granite_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934909,third_store_view,Default,simple,,,Motion SX 7 px Granite,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934909_Motion-SX-7-px-Granite_granite_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934908,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Golden Blonde,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934908_Motion-SX-7-px-Golden-Blonde_golden-blonde_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934908,second_storeview,Default,simple,,,Motion SX 7 px Golden Blonde,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934908_Motion-SX-7-px-Golden-Blonde_golden-blonde_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934908,third_store_view,Default,simple,,,Motion SX 7 px Golden Blonde,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934908_Motion-SX-7-px-Golden-Blonde_golden-blonde_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934915,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Spirit,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934915_Motion-SX-7-px-Spirit_spirit_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934915,second_storeview,Default,simple,,,Motion SX 7 px Spirit,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934915_Motion-SX-7-px-Spirit_spirit_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934915,third_store_view,Default,simple,,,Motion SX 7 px Spirit,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934915_Motion-SX-7-px-Spirit_spirit_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934903,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Beige,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934903_Motion-SX-7-px-Beige_beige_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934903,second_storeview,Default,simple,,,Motion SX 7 px Beige,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934903_Motion-SX-7-px-Beige_beige_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934903,third_store_view,Default,simple,,,Motion SX 7 px Beige,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934903_Motion-SX-7-px-Beige_beige_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934910,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Grey,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934910_Motion-SX-7-px-Grey_grey_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934910,second_storeview,Default,simple,,,Motion SX 7 px Grey,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934910_Motion-SX-7-px-Grey_grey_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934910,third_store_view,Default,simple,,,Motion SX 7 px Grey,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934910_Motion-SX-7-px-Grey_grey_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934911,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Elegance,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934911_Motion-SX-7-px-Elegance_elegance_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934911,second_storeview,Default,simple,,,Motion SX 7 px Elegance,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934911_Motion-SX-7-px-Elegance_elegance_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934911,third_store_view,Default,simple,,,Motion SX 7 px Elegance,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934911_Motion-SX-7-px-Elegance_elegance_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934913,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Sandy Brown,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934913_Motion-SX-7-px-Sandy-Brown_dark-blonde_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934913,second_storeview,Default,simple,,,Motion SX 7 px Sandy Brown,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934913_Motion-SX-7-px-Sandy-Brown_dark-blonde_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934913,third_store_view,Default,simple,,,Motion SX 7 px Sandy Brown,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934913_Motion-SX-7-px-Sandy-Brown_dark-blonde_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934375,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Beige,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934375_Motion-P-7-px-Beige_beige_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934375,second_storeview,Default,simple,,,Motion P 7 px Beige,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934375_Motion-P-7-px-Beige_beige_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934375,third_store_view,Default,simple,,,Motion P 7 px Beige,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934375_Motion-P-7-px-Beige_beige_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934912,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Pearl White,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934912_Motion-SX-7-px-Pearl-White_pearl-white_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934912,second_storeview,Default,simple,,,Motion SX 7 px Pearl White,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934912_Motion-SX-7-px-Pearl-White_pearl-white_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934912,third_store_view,Default,simple,,,Motion SX 7 px Pearl White,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934912_Motion-SX-7-px-Pearl-White_pearl-white_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934622,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Pearl White,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934622_Motion-SA-7-px-Pearl-White_pearl-white_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934622,second_storeview,Default,simple,,,Motion SA 7 px Pearl White,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934622_Motion-SA-7-px-Pearl-White_pearl-white_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934622,third_store_view,Default,simple,,,Motion SA 7 px Pearl White,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934622_Motion-SA-7-px-Pearl-White_pearl-white_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934907,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 7 px Dark Champagne,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934907_Motion-SX-7-px-Dark-Champagne_dark-champagner_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934907,second_storeview,Default,simple,,,Motion SX 7 px Dark Champagne,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934907_Motion-SX-7-px-Dark-Champagne_dark-champagner_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934907,third_store_view,Default,simple,,,Motion SX 7 px Dark Champagne,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934907_Motion-SX-7-px-Dark-Champagne_dark-champagner_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296988,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Refill Open Tip 6MM,,10 pieces per Package,0.5,1,0,"Catalog, Search",10,10296988_Refill-Open-Tip-6MM_Open_6_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10296988,second_storeview,Default,simple,,,Refill Open Tip 6MM,,10 pieces per Package,,,,"Catalog, Search",,10296988_Refill-Open-Tip-6MM_Open_6_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296988,third_store_view,Default,simple,,,Refill Open Tip 6MM,,10 pieces per Package,,,,"Catalog, Search",,10296988_Refill-Open-Tip-6MM_Open_6_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296989,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Refill Open Tip  8MM,,10 pieces per Package,0.5,1,0,"Catalog, Search",10,10296989_Refill-Open-Tip--8MM_Open_8_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10296989,second_storeview,Default,simple,,,Refill Open Tip  8MM,,10 pieces per Package,,,,"Catalog, Search",,10296989_Refill-Open-Tip--8MM_Open_8_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296989,third_store_view,Default,simple,,,Refill Open Tip  8MM,,10 pieces per Package,,,,"Catalog, Search",,10296989_Refill-Open-Tip--8MM_Open_8_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934631,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Dark Granite,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934631_Motion-P-7-px-Dark-Granite_dark-granite_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934631,second_storeview,Default,simple,,,Motion P 7 px Dark Granite,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934631_Motion-P-7-px-Dark-Granite_dark-granite_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934631,third_store_view,Default,simple,,,Motion P 7 px Dark Granite,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934631_Motion-P-7-px-Dark-Granite_dark-granite_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934632,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Dark Champagne,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934632_Motion-P-7-px-Dark-Champagne_dark-champagner_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934632,second_storeview,Default,simple,,,Motion P 7 px Dark Champagne,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934632_Motion-P-7-px-Dark-Champagne_dark-champagner_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934632,third_store_view,Default,simple,,,Motion P 7 px Dark Champagne,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934632_Motion-P-7-px-Dark-Champagne_dark-champagner_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934633,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Golden Blonde,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934633_Motion-P-7-px-Golden-Blonde_golden-blonde_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934633,second_storeview,Default,simple,,,Motion P 7 px Golden Blonde,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934633_Motion-P-7-px-Golden-Blonde_golden-blonde_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934633,third_store_view,Default,simple,,,Motion P 7 px Golden Blonde,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934633_Motion-P-7-px-Golden-Blonde_golden-blonde_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934634,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Galactic Blue,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934634_Motion-P-7-px-Galactic-Blue_galactic-blue_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934634,second_storeview,Default,simple,,,Motion P 7 px Galactic Blue,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934634_Motion-P-7-px-Galactic-Blue_galactic-blue_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934634,third_store_view,Default,simple,,,Motion P 7 px Galactic Blue,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934634_Motion-P-7-px-Galactic-Blue_galactic-blue_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934635,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Granite,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934635_Motion-P-7-px-Granite_granite_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934635,second_storeview,Default,simple,,,Motion P 7 px Granite,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934635_Motion-P-7-px-Granite_granite_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934635,third_store_view,Default,simple,,,Motion P 7 px Granite,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934635_Motion-P-7-px-Granite_granite_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934636,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Grey,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934636_Motion-P-7-px-Grey_grey_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934636,second_storeview,Default,simple,,,Motion P 7 px Grey,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934636_Motion-P-7-px-Grey_grey_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934636,third_store_view,Default,simple,,,Motion P 7 px Grey,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934636_Motion-P-7-px-Grey_grey_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934638,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Sandy Brown,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934638_Motion-P-7-px-Sandy-Brown_dark-blonde_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934638,second_storeview,Default,simple,,,Motion P 7 px Sandy Brown,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934638_Motion-P-7-px-Sandy-Brown_dark-blonde_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934638,third_store_view,Default,simple,,,Motion P 7 px Sandy Brown,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934638_Motion-P-7-px-Sandy-Brown_dark-blonde_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934624,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Silver,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934624_Motion-SA-7-px-Silver_silver_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934624,second_storeview,Default,simple,,,Motion SA 7 px Silver,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934624_Motion-SA-7-px-Silver_silver_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934624,third_store_view,Default,simple,,,Motion SA 7 px Silver,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934624_Motion-SA-7-px-Silver_silver_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10939410,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Deep Red,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10939410_Motion-P-7-px-Deep-Red_deep-red_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10939410,second_storeview,Default,simple,,,Motion P 7 px Deep Red,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10939410_Motion-P-7-px-Deep-Red_deep-red_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10939410,third_store_view,Default,simple,,,Motion P 7 px Deep Red,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10939410_Motion-P-7-px-Deep-Red_deep-red_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934581,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Black,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934581_Motion-P-7-px-Black_black_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934581,second_storeview,Default,simple,,,Motion P 7 px Black,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934581_Motion-P-7-px-Black_black_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934581,third_store_view,Default,simple,,,Motion P 7 px Black,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934581_Motion-P-7-px-Black_black_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934582,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Brown,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934582_Motion-P-7-px-Brown_brown_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934582,second_storeview,Default,simple,,,Motion P 7 px Brown,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934582_Motion-P-7-px-Brown_brown_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934582,third_store_view,Default,simple,,,Motion P 7 px Brown,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934582_Motion-P-7-px-Brown_brown_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934585,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Candy Pink,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934585_Motion-P-7-px-Candy-Pink_candy-pink_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934585,second_storeview,Default,simple,,,Motion P 7 px Candy Pink,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934585_Motion-P-7-px-Candy-Pink_candy-pink_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934585,third_store_view,Default,simple,,,Motion P 7 px Candy Pink,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934585_Motion-P-7-px-Candy-Pink_candy-pink_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934637,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 7 px Pearl White,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934637_Motion-P-7-px-Pearl-White_pearl-white_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934637,second_storeview,Default,simple,,,Motion P 7 px Pearl White,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934637_Motion-P-7-px-Pearl-White_pearl-white_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934637,third_store_view,Default,simple,,,Motion P 7 px Pearl White,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934637_Motion-P-7-px-Pearl-White_pearl-white_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934611,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Beige,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934611_Motion-SA-7-px-Beige_beige_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934611,second_storeview,Default,simple,,,Motion SA 7 px Beige,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934611_Motion-SA-7-px-Beige_beige_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934611,third_store_view,Default,simple,,,Motion SA 7 px Beige,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934611_Motion-SA-7-px-Beige_beige_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934612,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Black,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934612_Motion-SA-7-px-Black_black_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934612,second_storeview,Default,simple,,,Motion SA 7 px Black,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934612_Motion-SA-7-px-Black_black_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934612,third_store_view,Default,simple,,,Motion SA 7 px Black,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934612_Motion-SA-7-px-Black_black_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934613,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Brown,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934613_Motion-SA-7-px-Brown_brown_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934613,second_storeview,Default,simple,,,Motion SA 7 px Brown,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934613_Motion-SA-7-px-Brown_brown_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934613,third_store_view,Default,simple,,,Motion SA 7 px Brown,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934613_Motion-SA-7-px-Brown_brown_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934614,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Candy Pink,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934614_Motion-SA-7-px-Candy-Pink_candy-pink_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934614,second_storeview,Default,simple,,,Motion SA 7 px Candy Pink,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934614_Motion-SA-7-px-Candy-Pink_candy-pink_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934614,third_store_view,Default,simple,,,Motion SA 7 px Candy Pink,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934614_Motion-SA-7-px-Candy-Pink_candy-pink_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934615,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Dark Granite,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934615_Motion-SA-7-px-Dark-Granite_dark-granite_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934615,second_storeview,Default,simple,,,Motion SA 7 px Dark Granite,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934615_Motion-SA-7-px-Dark-Granite_dark-granite_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934615,third_store_view,Default,simple,,,Motion SA 7 px Dark Granite,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934615_Motion-SA-7-px-Dark-Granite_dark-granite_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934616,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Dark Champagne,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934616_Motion-SA-7-px-Dark-Champagne_dark-champagner_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934616,second_storeview,Default,simple,,,Motion SA 7 px Dark Champagne,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934616_Motion-SA-7-px-Dark-Champagne_dark-champagner_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934616,third_store_view,Default,simple,,,Motion SA 7 px Dark Champagne,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934616_Motion-SA-7-px-Dark-Champagne_dark-champagner_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934617,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Golden Blonde,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",50,1,0,"Catalog, Search",2149,10934617_Motion-SA-7-px-Golden-Blonde_golden-blonde_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934617,second_storeview,Default,simple,,,Motion SA 7 px Golden Blonde,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934617_Motion-SA-7-px-Golden-Blonde_golden-blonde_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934617,third_store_view,Default,simple,,,Motion SA 7 px Golden Blonde,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934617_Motion-SA-7-px-Golden-Blonde_golden-blonde_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934618,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Galactic Blue,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934618_Motion-SA-7-px-Galactic-Blue_galactic-blue_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934618,second_storeview,Default,simple,,,Motion SA 7 px Galactic Blue,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934618_Motion-SA-7-px-Galactic-Blue_galactic-blue_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934618,third_store_view,Default,simple,,,Motion SA 7 px Galactic Blue,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934618_Motion-SA-7-px-Galactic-Blue_galactic-blue_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934619,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Granite,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934619_Motion-SA-7-px-Granite_granite_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934619,second_storeview,Default,simple,,,Motion SA 7 px Granite,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934619_Motion-SA-7-px-Granite_granite_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934619,third_store_view,Default,simple,,,Motion SA 7 px Granite,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934619_Motion-SA-7-px-Granite_granite_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934620,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Grey,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934620_Motion-SA-7-px-Grey_grey_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934620,second_storeview,Default,simple,,,Motion SA 7 px Grey,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934620_Motion-SA-7-px-Grey_grey_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934620,third_store_view,Default,simple,,,Motion SA 7 px Grey,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934620_Motion-SA-7-px-Grey_grey_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10936009,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Deep Red,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10936009_Motion-SA-7-px-Deep-Red_deep-red_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10936009,second_storeview,Default,simple,,,Motion SA 7 px Deep Red,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10936009_Motion-SA-7-px-Deep-Red_deep-red_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10936009,third_store_view,Default,simple,,,Motion SA 7 px Deep Red,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10936009_Motion-SA-7-px-Deep-Red_deep-red_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934625,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Spirit,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934625_Motion-SA-7-px-Spirit_spirit_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934625,second_storeview,Default,simple,,,Motion SA 7 px Spirit,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934625_Motion-SA-7-px-Spirit_spirit_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934625,third_store_view,Default,simple,,,Motion SA 7 px Spirit,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934625_Motion-SA-7-px-Spirit_spirit_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934623,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Dark Blonde,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934623_Motion-SA-7-px-Dark-Blonde_dark-blonde_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934623,second_storeview,Default,simple,,,Motion SA 7 px Dark Blonde,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934623_Motion-SA-7-px-Dark-Blonde_dark-blonde_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934623,third_store_view,Default,simple,,,Motion SA 7 px Dark Blonde,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934623_Motion-SA-7-px-Dark-Blonde_dark-blonde_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934621,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 7 px Elegance,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",2149,10934621_Motion-SA-7-px-Elegance_elegance_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934621,second_storeview,Default,simple,,,Motion SA 7 px Elegance,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934621_Motion-SA-7-px-Elegance_elegance_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934621,third_store_view,Default,simple,,,Motion SA 7 px Elegance,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934621_Motion-SA-7-px-Elegance_elegance_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296990,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Refill Open Tip 10MM,,10 pieces per Package,0.5,1,0,"Catalog, Search",10,10296990_Refill-Open-Tip-10MM_Open_10_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10296990,second_storeview,Default,simple,,,Refill Open Tip 10MM,,10 pieces per Package,,,,"Catalog, Search",,10296990_Refill-Open-Tip-10MM_Open_10_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296990,third_store_view,Default,simple,,,Refill Open Tip 10MM,,10 pieces per Package,,,,"Catalog, Search",,10296990_Refill-Open-Tip-10MM_Open_10_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828292,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Thin Tubes Size 1R,,,1,1,0,"Catalog, Search",10,10828292_Thin-Tubes-Size-1R_Right_1_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10828292,second_storeview,Default,simple,,,Thin Tubes Size 1R,,,,,,"Catalog, Search",,10828292_Thin-Tubes-Size-1R_Right_1_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828292,third_store_view,Default,simple,,,Thin Tubes Size 1R,,,,,,"Catalog, Search",,10828292_Thin-Tubes-Size-1R_Right_1_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828294,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Thin Tubes Size 2R,,,1,1,0,"Catalog, Search",10,10828294_Thin-Tubes-Size-2R_Right_2_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10828294,second_storeview,Default,simple,,,Thin Tubes Size 2R,,,,,,"Catalog, Search",,10828294_Thin-Tubes-Size-2R_Right_2_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828294,third_store_view,Default,simple,,,Thin Tubes Size 2R,,,,,,"Catalog, Search",,10828294_Thin-Tubes-Size-2R_Right_2_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828296,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Thin Tubes Size 3R,,,1,1,0,"Catalog, Search",10,10828296_Thin-Tubes-Size-3R_Right_3_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10828296,second_storeview,Default,simple,,,Thin Tubes Size 3R,,,,,,"Catalog, Search",,10828296_Thin-Tubes-Size-3R_Right_3_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828296,third_store_view,Default,simple,,,Thin Tubes Size 3R,,,,,,"Catalog, Search",,10828296_Thin-Tubes-Size-3R_Right_3_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296986,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Refill Closed Tip 8MM,,10 pieces per Package,0.5,1,0,"Catalog, Search",10,10296986_Refill-Closed-Tip-8MM_Closed_8_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10296986,second_storeview,Default,simple,,,Refill Closed Tip 8MM,,10 pieces per Package,,,,"Catalog, Search",,10296986_Refill-Closed-Tip-8MM_Closed_8_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296986,third_store_view,Default,simple,,,Refill Closed Tip 8MM,,10 pieces per Package,,,,"Catalog, Search",,10296986_Refill-Closed-Tip-8MM_Closed_8_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296985,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Refill Double Tip 10/12MM,,10 pieces per Package,0.5,1,0,"Catalog, Search",10,10296985_Refill-Double-Tip-1012MM_Double_10_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10296985,second_storeview,Default,simple,,,Refill Double Tip 10/12MM,,10 pieces per Package,,,,"Catalog, Search",,10296985_Refill-Double-Tip-1012MM_Double_10_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296985,third_store_view,Default,simple,,,Refill Double Tip 10/12MM,,10 pieces per Package,,,,"Catalog, Search",,10296985_Refill-Double-Tip-1012MM_Double_10_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296984,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Refill Double Tip 8/10MM,,10 pieces per Package,0.5,1,0,"Catalog, Search",10,10296984_Refill-Double-Tip-810MM_Double_8_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10296984,second_storeview,Default,simple,,,Refill Double Tip 8/10MM,,10 pieces per Package,,,,"Catalog, Search",,10296984_Refill-Double-Tip-810MM_Double_8_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296984,third_store_view,Default,simple,,,Refill Double Tip 8/10MM,,10 pieces per Package,,,,"Catalog, Search",,10296984_Refill-Double-Tip-810MM_Double_8_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828298,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Thin Tubes Size 4R,,,1,1,0,"Catalog, Search",10,10828298_Thin-Tubes-Size-4R_Right_4_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10828298,second_storeview,Default,simple,,,Thin Tubes Size 4R,,,,,,"Catalog, Search",,10828298_Thin-Tubes-Size-4R_Right_4_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828298,third_store_view,Default,simple,,,Thin Tubes Size 4R,,,,,,"Catalog, Search",,10828298_Thin-Tubes-Size-4R_Right_4_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828291,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Thin Tubes Size 1L,,,1,1,0,"Catalog, Search",10,10828291_Thin-Tubes-Size-1L_Left_1_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10828291,second_storeview,Default,simple,,,Thin Tubes Size 1L,,,,,,"Catalog, Search",,10828291_Thin-Tubes-Size-1L_Left_1_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828291,third_store_view,Default,simple,,,Thin Tubes Size 1L,,,,,,"Catalog, Search",,10828291_Thin-Tubes-Size-1L_Left_1_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828293,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Thin Tubes Size 2L,,,1,1,0,"Catalog, Search",10,10828293_Thin-Tubes-Size-2L_Left_2_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10828293,second_storeview,Default,simple,,,Thin Tubes Size 2L,,,,,,"Catalog, Search",,10828293_Thin-Tubes-Size-2L_Left_2_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828293,third_store_view,Default,simple,,,Thin Tubes Size 2L,,,,,,"Catalog, Search",,10828293_Thin-Tubes-Size-2L_Left_2_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828295,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Thin Tubes Size 3L,,,1,1,0,"Catalog, Search",10,10828295_Thin-Tubes-Size-3L_Left_3_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10828295,second_storeview,Default,simple,,,Thin Tubes Size 3L,,,,,,"Catalog, Search",,10828295_Thin-Tubes-Size-3L_Left_3_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828295,third_store_view,Default,simple,,,Thin Tubes Size 3L,,,,,,"Catalog, Search",,10828295_Thin-Tubes-Size-3L_Left_3_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828297,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Thin Tubes Size 4L,,,1,1,0,"Catalog, Search",10,10828297_Thin-Tubes-Size-4L_Left_4_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10828297,second_storeview,Default,simple,,,Thin Tubes Size 4L,,,,,,"Catalog, Search",,10828297_Thin-Tubes-Size-4L_Left_4_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10828297,third_store_view,Default,simple,,,Thin Tubes Size 4L,,,,,,"Catalog, Search",,10828297_Thin-Tubes-Size-4L_Left_4_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10673779,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Semi Open Tip Refill (Siemens),,,3,1,0,"Catalog, Search",10,10673779_Semi-Open-Tip-Refill-Siemens_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A07,,,,,,,,,,,,
-+10673779,second_storeview,Default,simple,,,Semi Open Tip Refill (Siemens),,,,,,"Catalog, Search",,10673779_Semi-Open-Tip-Refill-Siemens_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10673779,third_store_view,Default,simple,,,Semi Open Tip Refill (Siemens),,,,,,"Catalog, Search",,10673779_Semi-Open-Tip-Refill-Siemens_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10935754,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,HA MOTION S 3PX BG,,,50,1,0,"Catalog, Search",949,10935754_HA-MOTION-S-3PX-BG_beige_312_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,,,,,,,,,,,,
-+10935754,second_storeview,Default,simple,,,HA MOTION S 3PX BG,,,,,,"Catalog, Search",,10935754_HA-MOTION-S-3PX-BG_beige_312_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10935754,third_store_view,Default,simple,,,HA MOTION S 3PX BG,,,,,,"Catalog, Search",,10935754_HA-MOTION-S-3PX-BG_beige_312_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296968,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Life Tube Fitting Set,,,1,1,0,"Catalog, Search",199,10296968_Life-Tube-Fitting-Set_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A13,,,,,,,,,,,,
-+10296968,second_storeview,Default,simple,,,Life Tube Fitting Set,,,,,,"Catalog, Search",,10296968_Life-Tube-Fitting-Set_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10296968,third_store_view,Default,simple,,,Life Tube Fitting Set,,,,,,"Catalog, Search",,10296968_Life-Tube-Fitting-Set_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+7227098,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,EARHOOK W. DAMPER,,,0.015,1,0,"Catalog, Search",6,307227098_EARHOOK-W-DAMPER_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,S01,,,,,,,,,,,,
-+7227098,second_storeview,Default,simple,,,EARHOOK W. DAMPER,,,,,,"Catalog, Search",,407227098_EARHOOK-W-DAMPER_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+7227098,third_store_view,Default,simple,,,EARHOOK W. DAMPER,,,,,,"Catalog, Search",,907227098_EARHOOK-W-DAMPER_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10824187,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,HiPro Extension Cable,,,100,1,0,"Catalog, Search",19,10824187_HiPro-Extension-Cable_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A05,,,,,,,,,,,,
-+10824187,second_storeview,Default,simple,,,HiPro Extension Cable,,,,,,"Catalog, Search",,10824187_HiPro-Extension-Cable_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10824187,third_store_view,Default,simple,,,HiPro Extension Cable,,,,,,"Catalog, Search",,10824187_HiPro-Extension-Cable_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10937826,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,NEW concha lock M 55/60db 10/pack,,,25,1,0,"Catalog, Search",6,10937826_NEW-concha-lock-M-5560db-10pack_transparent_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A99,,,,,,,,,,,,
-+10937826,second_storeview,Default,simple,,,NEW concha lock M 55/60db 10/pack,,,,,,"Catalog, Search",,10937826_NEW-concha-lock-M-5560db-10pack_transparent_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10937826,third_store_view,Default,simple,,,NEW concha lock M 55/60db 10/pack,,,,,,"Catalog, Search",,10937826_NEW-concha-lock-M-5560db-10pack_transparent_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+7784916,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,NOAHLink Cable Right,,,0.015,1,0,"Catalog, Search",75,507784916_NOAHLink-Cable-Right_red_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,StockItem,,A05,,,,,,,,,,,,
-+7784916,second_storeview,Default,simple,,,NOAHLink Cable Right,,,,,,"Catalog, Search",,707784916_NOAHLink-Cable-Right_red_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+7784916,third_store_view,Default,simple,,,NOAHLink Cable Right,,,,,,"Catalog, Search",,607784916_NOAHLink-Cable-Right_red_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934901,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SX 5 px Silver,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10934901_Motion-SX-5-px-Silver_silver_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934901,second_storeview,Default,simple,,,Motion SX 5 px Silver,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934901_Motion-SX-5-px-Silver_silver_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934901,third_store_view,Default,simple,,,Motion SX 5 px Silver,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and rechargeable BTE with advanced primax Technology",,,,"Catalog, Search",,10934901_Motion-SX-5-px-Silver_silver_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934520,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 5 px Elegance,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10934520_Motion-SA-5-px-Elegance_elegance_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934520,second_storeview,Default,simple,,,Motion SA 5 px Elegance,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934520_Motion-SA-5-px-Elegance_elegance_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934520,third_store_view,Default,simple,,,Motion SA 5 px Elegance,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934520_Motion-SA-5-px-Elegance_elegance_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934521,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 5 px Pearl White,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10934521_Motion-SA-5-px-Pearl-White_pearl-white_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934521,second_storeview,Default,simple,,,Motion SA 5 px Pearl White,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934521_Motion-SA-5-px-Pearl-White_pearl-white_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934521,third_store_view,Default,simple,,,Motion SA 5 px Pearl White,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934521_Motion-SA-5-px-Pearl-White_pearl-white_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934522,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 5 px Sandy Brown,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10934522_Motion-SA-5-px-Sandy-Brown_dark-blonde_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934522,second_storeview,Default,simple,,,Motion SA 5 px Sandy Brown,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934522_Motion-SA-5-px-Sandy-Brown_dark-blonde_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934522,third_store_view,Default,simple,,,Motion SA 5 px Sandy Brown,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934522_Motion-SA-5-px-Sandy-Brown_dark-blonde_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934523,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 5 px Silver,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10934523_Motion-SA-5-px-Silver_silver_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934523,second_storeview,Default,simple,,,Motion SA 5 px Silver,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934523_Motion-SA-5-px-Silver_silver_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934523,third_store_view,Default,simple,,,Motion SA 5 px Silver,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934523_Motion-SA-5-px-Silver_silver_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942714,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SP 5 px Beige,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1479,10942714_Motion-SP-5-px-Beige_beige_675_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10942714,second_storeview,Default,simple,,,Motion SP 5 px Beige,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942714_Motion-SP-5-px-Beige_beige_675_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942714,third_store_view,Default,simple,,,Motion SP 5 px Beige,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942714_Motion-SP-5-px-Beige_beige_675_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942723,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SP 5 px Granite,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1479,10942723_Motion-SP-5-px-Granite_granite_675_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10942723,second_storeview,Default,simple,,,Motion SP 5 px Granite,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942723_Motion-SP-5-px-Granite_granite_675_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10942723,third_store_view,Default,simple,,,Motion SP 5 px Granite,,"Fits severe to profound hearing loss
-+small and reliable desiged BTE with advanced primax Technology",,,,"Catalog, Search",,10942723_Motion-SP-5-px-Granite_granite_675_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934524,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion SA 5 px Spirit,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10934524_Motion-SA-5-px-Spirit_spirit_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934524,second_storeview,Default,simple,,,Motion SA 5 px Spirit,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934524_Motion-SA-5-px-Spirit_spirit_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934524,third_store_view,Default,simple,,,Motion SA 5 px Spirit,,"Fits mild to moderate hearing loss
-+Comfortable, convenient and DAI compatible BTE with advanced primax Technology",,,,"Catalog, Search",,10934524_Motion-SA-5-px-Spirit_spirit_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10939409,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 5 px Deep Red,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10939409_Motion-P-5-px-Deep-Red_deep-red_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10939409,second_storeview,Default,simple,,,Motion P 5 px Deep Red,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10939409_Motion-P-5-px-Deep-Red_deep-red_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10939409,third_store_view,Default,simple,,,Motion P 5 px Deep Red,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10939409_Motion-P-5-px-Deep-Red_deep-red_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934652,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 5 px Beige,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10934652_Motion-P-5-px-Beige_beige_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934652,second_storeview,Default,simple,,,Motion P 5 px Beige,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934652_Motion-P-5-px-Beige_beige_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934652,third_store_view,Default,simple,,,Motion P 5 px Beige,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934652_Motion-P-5-px-Beige_beige_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934653,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 5 px Black,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10934653_Motion-P-5-px-Black_black_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934653,second_storeview,Default,simple,,,Motion P 5 px Black,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934653_Motion-P-5-px-Black_black_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934653,third_store_view,Default,simple,,,Motion P 5 px Black,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934653_Motion-P-5-px-Black_black_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934654,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 5 px Brown,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10934654_Motion-P-5-px-Brown_brown_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934654,second_storeview,Default,simple,,,Motion P 5 px Brown,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934654_Motion-P-5-px-Brown_brown_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934654,third_store_view,Default,simple,,,Motion P 5 px Brown,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934654_Motion-P-5-px-Brown_brown_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934655,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 5 px Candy Pink,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10934655_Motion-P-5-px-Candy-Pink_candy-pink_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934655,second_storeview,Default,simple,,,Motion P 5 px Candy Pink,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934655_Motion-P-5-px-Candy-Pink_candy-pink_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934655,third_store_view,Default,simple,,,Motion P 5 px Candy Pink,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934655_Motion-P-5-px-Candy-Pink_candy-pink_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934656,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 5 px Dark Granite,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10934656_Motion-P-5-px-Dark-Granite_dark-granite_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934656,second_storeview,Default,simple,,,Motion P 5 px Dark Granite,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934656_Motion-P-5-px-Dark-Granite_dark-granite_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934656,third_store_view,Default,simple,,,Motion P 5 px Dark Granite,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934656_Motion-P-5-px-Dark-Granite_dark-granite_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934657,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 5 px Dark Champagne,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10934657_Motion-P-5-px-Dark-Champagne_dark-champagner_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934657,second_storeview,Default,simple,,,Motion P 5 px Dark Champagne,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934657_Motion-P-5-px-Dark-Champagne_dark-champagner_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934657,third_store_view,Default,simple,,,Motion P 5 px Dark Champagne,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934657_Motion-P-5-px-Dark-Champagne_dark-champagner_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934658,,Default,simple,"Default Category/Gear,Default Category/Gear/Defaults",base,Motion P 5 px Golden Blonde,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",5.5,1,0,"Catalog, Search",1459,10934658_Motion-P-5-px-Golden-Blonde_golden-blonde_13_mysignia_usa_english,"color=Black,eco_collection=No,erin_recommends=No,gift_wrapping_available=No,new=No,performance_fabric=No,sale=No",0,0,1,0,1,1,1,1,0,1,1,0,1,0,1,1,1,1,0,0,0,1,,,,"name=Patient Reference,type=field,required=0,sku=PR,max_characters=20,price=0.0000,price_type=fixed",,,,,,,,,,,,,,BTE,,BTE,2439523,,,,,,,,,,,
-+10934658,second_storeview,Default,simple,,,Motion P 5 px Golden Blonde,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934658_Motion-P-5-px-Golden-Blonde_golden-blonde_13_mysignia_usa_english,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-+10934658,third_store_view,Default,simple,,,Motion P 5 px Golden Blonde,,"Fits severe to profound hearing loss
-+Powerful and small BTE with advanced primax Technology",,,,"Catalog, Search",,10934658_Motion-P-5-px-Golden-Blonde_golden-blonde_13_my_signia_usa_factory_only,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Patient Reference,type=field",,,,,,,,,,,,,,,,,,,,,,,,,,,,
-\ No newline at end of file
-diff --git a/dev/tests/acceptance/tests/_data/table_rate_30895.csv b/dev/tests/acceptance/tests/_data/table_rate_30895.csv
-new file mode 100644
-index 00000000000..6c4420c9378
---- /dev/null
-+++ b/dev/tests/acceptance/tests/_data/table_rate_30895.csv
-@@ -0,0 +1,3 @@
-+Country,Region/State,Zip/Postal Code,Weight (and above),Shipping Price
-+US,CA,*,0,5
-+US,*,*,0,10
-diff --git a/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml b/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml
-new file mode 100644
-index 00000000000..65c2bb70045
---- /dev/null
-+++ b/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * Copyright © Magento, Inc. All rights reserved.
-+  * See COPYING.txt for license details.
-+  */
-+-->
-+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
-+    <suite name="WYSIWYGDisabledSuite">
-+        <before>
-+            <magentoCLI stepKey="disableWYSYWYG" command="config:set cms/wysiwyg/enabled disabled" />
-+        </before>
-+        <include>
-+            <group name="WYSIWYGDisabled"/>
-+        </include>
-+        <exclude>
-+            <group name="skip"/>
-+        </exclude>
-+        <after>
-+            <magentoCLI stepKey="disableWYSYWYG" command="config:set cms/wysiwyg/enabled enabled" />
-+        </after>
-+    </suite>
-+</suites>
-\ No newline at end of file
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
-index f5cd41bda74..f0bfec543f2 100644
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
-+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CGuestUserTest">
-         <!-- Search configurable product -->
-         <comment userInput="Search configurable product" stepKey="commentSearchConfigurableProduct" after="searchAssertSimpleProduct2ImageNotDefault" />
-@@ -26,5 +26,5 @@
-         <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
-         <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="searchGrabConfigProductPageImageSrc" after="searchAssertConfigProductPage"/>
-         <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$searchGrabConfigProductPageImageSrc" stepKey="searchAssertConfigProductPageImageNotDefault" after="searchGrabConfigProductPageImageSrc"/>
--   </test>
-+    </test>
- </tests>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
-index 3e386a034ee..9fe70c8b4dd 100644
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
-+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CLoggedInUserTest">
-         <!-- Search configurable product -->
-         <comment userInput="Search configurable product" stepKey="commentSearchConfigurableProduct" after="searchAssertSimpleProduct2ImageNotDefault" />
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
-index d3b009eecf8..cb3d9edbc1c 100644
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
-+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
-@@ -7,7 +7,7 @@
- -->
- 
- <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-     <test name="EndToEndB2CLoggedInUserTest">
-         <!-- Step 5: Add products to wishlist -->
-         <!-- Add Configurable Product to wishlist -->
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/README.md
-deleted file mode 100644
-index 7fbe454f709..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/README.md
-+++ /dev/null
-@@ -1,3 +0,0 @@
--# Magento 2 Functional Tests
--
--The Functional Tests Module for **Magento_Framework**.
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/ActionGroup/TemplateActionGroupFile.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/ActionGroup/TemplateActionGroupFile.xml
-deleted file mode 100644
-index d1bc251f263..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/ActionGroup/TemplateActionGroupFile.xml
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
--    <actionGroup name="">
--        <!-- ADD TEST STEPS HERE -->
--    </actionGroup>
--</actionGroups>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Data/TemplateDataFile.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Data/TemplateDataFile.xml
-deleted file mode 100644
-index 6f13f04aef3..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Data/TemplateDataFile.xml
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
--    <entity name="" type="">
--        <data key=""></data>
--    </entity>
--</entities>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Metadata/TemplateMetaFile.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Metadata/TemplateMetaFile.xml
-deleted file mode 100644
-index 7293cea9a9b..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Metadata/TemplateMetaFile.xml
-+++ /dev/null
-@@ -1,22 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
--    <operation name="" dataType="" type="" auth="adminOauth" url="" method="">
--        <contentType>application/json</contentType>
--        <param key=""></param>
--        <object dataType="" key="">
--            <field key=""></field>
--            <array key="">
--                <value></value>
--            </array>
--        </object>
--        <field key=""></field>
--    </operation>
--</operations>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Page/TemplatePageFile.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Page/TemplatePageFile.xml
-deleted file mode 100644
-index 27559a48bef..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Page/TemplatePageFile.xml
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
--    <page name="" url="" area="" module="">
--        <section name=""/>
--    </page>
--</pages>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/README.md
-deleted file mode 100644
-index 986c2af6164..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/README.md
-+++ /dev/null
-@@ -1,3 +0,0 @@
--# Magento 2 Functional Tests
--
--The Functional Tests Module for **Magento_SampleTemplates** Module.
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Section/TemplateSectionFile.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Section/TemplateSectionFile.xml
-deleted file mode 100644
-index 4c1cd7300cf..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Section/TemplateSectionFile.xml
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="">
--        <element name="" type="" selector=""/>
--    </section>
--</sections>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Test/TemplateTestFile.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Test/TemplateTestFile.xml
-deleted file mode 100644
-index d9a98d4baa6..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Test/TemplateTestFile.xml
-+++ /dev/null
-@@ -1,24 +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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
--    <test name="TemplateTestFile">
--        <annotations>
--            <features value=""/>
--            <stories value=""/>
--        </annotations>
--        <before>
--
--        </before>
--        <after>
--
--        </after>
--        <!-- ADD TEST STEPS HERE -->
--    </test>
--</tests>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/ActionGroup/SampleActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/ActionGroup/SampleActionGroup.xml
-deleted file mode 100644
-index 45ec5f3adf2..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/ActionGroup/SampleActionGroup.xml
-+++ /dev/null
-@@ -1,24 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
--    <actionGroup name="SampleActionGroup">
--        <arguments>
--            <argument name="person" defaultValue="SamplePerson"/>
--        </arguments>
--        <fillField selector="#foo" userInput="{{person.foo}}" stepKey="fillField1"/>
--        <fillField selector="#bar" userInput="{{person.bar}}" stepKey="fillField2"/>
--    </actionGroup>
--    <actionGroup name="ValidateSlideOutPanelField">
--        <arguments>
--            <argument name="property" defaultValue=""/>
--        </arguments>
--        <see userInput="{{property.name}}" selector="{{ColumnSection.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
--    </actionGroup>
--</actionGroups>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Data/SampleData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Data/SampleData.xml
-deleted file mode 100644
-index 361f06a6ff3..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Data/SampleData.xml
-+++ /dev/null
-@@ -1,32 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
--    <entity name="SamplePerson" type="samplePerson">
--        <data key="foo">foo</data>
--        <data key="bar">bar</data>
--        <data key="lastName">Doe</data>
--        <data key="email" unique="prefix">.email@gmail.com</data>
--    </entity>
--    <entity name="OverrideDefaultPerson" type="samplePerson">
--        <data key="foo">fizz</data>
--        <data key="bar">buzz</data>
--    </entity>
--    <entity name="AppearanceMinHeightProperty" type="min_height_property">
--        <data key="name">Minimum Height</data>
--        <data key="section">appearance</data>
--        <data key="fieldName">min_height</data>
--    </entity>
--    <entity name="AssertThis" type="samplePerson">
--        <data key="firstname">Well</data>
--        <data key="lastname">Done</data>
--        <data key="email" unique="prefix">.email@gmail.com</data>
--    </entity>
--</entities>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Page/SamplePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Page/SamplePage.xml
-deleted file mode 100644
-index 6fd2a54c601..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Page/SamplePage.xml
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
--    <page name="SamplePage" url="/{{var1}}/{{var2}}.html" area="storefront" module="SampleTests" parameterized="true">
--        <section name="SampleSection"/>
--    </page>
--</pages>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/README.md
-deleted file mode 100644
-index f3340b205f1..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/README.md
-+++ /dev/null
-@@ -1,3 +0,0 @@
--# Magento 2 Functional Tests
--
--The Functional Tests Module for **Magento_SampleTests** Module.
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Section/SampleSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Section/SampleSection.xml
-deleted file mode 100644
-index 6aa54d2fb9b..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Section/SampleSection.xml
-+++ /dev/null
-@@ -1,20 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--
--<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
--    <section name="SampleSection">
--        <element name="oneParamElement" type="button" selector="#element .{{var1}}" parameterized="true"/>
--        <element name="twoParamElement" type="button" selector="#{{var1}} .{{var2}}" parameterized="true"/>
--        <element name="threeParamElement" type="button" selector="#{{var1}}-{{var2}} .{{var3}}" parameterized="true"/>
--        <element name="timeoutElement" type="button" selector="#foo" timeout="30"/>
--    </section>
--    <section name="ColumnSection">
--        <element name="panelFieldLabel" type="text" selector='//div[@data-index="{{arg1}}"]/descendant::div[@data-index="{{arg2}}"]/label | //div[@data-index="{{arg3}}"]/descendant::*[@class="admin__field-label"]/span[text()="{{arg4}}"]' parameterized="true" />
--    </section>
--</sections>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AdvancedSampleTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AdvancedSampleTest.xml
-deleted file mode 100644
-index 4fead0e5149..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AdvancedSampleTest.xml
-+++ /dev/null
-@@ -1,54 +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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
--    <test name="AdvancedSampleTest">
--        <annotations>
--            <features value="SampleTests"/>
--            <title value=""/>
--            <description value=""/>
--            <severity value="CRITICAL"/>
--            <testCaseId value="#"/>
--            <skip>
--                <issueId value="SAMPLE"/>
--            </skip>
--        </annotations>
--        <before>
--            <createData entity="SamplePerson" stepKey="beforeData"/>
--        </before>
--        <after>
--
--        </after>
--
--        <!-- Create an entity that depends on another entity -->
--        <createData entity="_defaultCategory" stepKey="createCategory"/>
--        <createData entity="_defaultProduct" stepKey="createProduct">
--            <requiredEntity createDataKey="createCategory"/>
--        </createData>
--
--        <!-- Parameterized url -->
--        <amOnPage url="{{SamplePage.url('foo', SamplePerson.bar)}}" stepKey="amOnPage"/>
--
--        <!-- Parameterized selector -->
--        <grabTextFrom selector="{{SampleSection.twoParamElement(SamplePerson.foo, 'bar')}}" stepKey="grabTextFrom"/>
--
--        <!-- Element with a timeout -->
--        <click selector="{{SampleSection.timeoutElement}}" stepKey="click"/>
--
--        <!-- ActionGroup -->
--        <actionGroup ref="SampleActionGroup" stepKey="actionGroup">
--            <argument name="person" value="OverrideDefaultPerson"/>
--        </actionGroup>
--
--        <actionGroup ref="ValidateSlideOutPanelField" stepKey="seeAppearanceMinHeightProperty">
--            <argument name="property" value="AppearanceMinHeightProperty"/>
--        </actionGroup>
--    </test>
--</tests>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AssertsTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AssertsTest.xml
-deleted file mode 100644
-index 200c52cab79..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AssertsTest.xml
-+++ /dev/null
-@@ -1,79 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<!-- Test XML Example -->
--<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
--    <test name="AssertsTest">
--        <annotations>
--            <features value="SampleTests"/>
--            <skip>
--                <issueId value="SAMPLE"/>
--            </skip>
--        </annotations>
--
--        <createData entity="Simple_US_Customer" stepKey="createData2"/>
--        <amOnUrl url="https://www.yahoo.com" stepKey="amOnPage"/>
--        <waitForElementVisible stepKey="wait1" selector="#uh-logo" time="10"/>
--        <grabTextFrom selector="#uh-logo" stepKey="grabTextFrom1"/>
--
--        <!-- asserts without variable replacement -->
--        <assertArrayHasKey stepKey="assertArrayHasKey" message="pass">
--            <expectedResult type="string">apple</expectedResult>
--            <actualResult type="const">['orange' => 2, 'apple' => 1]</actualResult>
--        </assertArrayHasKey>
--        <assertEquals stepKey="assertEquals1" message="pass">
--            <expectedResult type="variable">grabTextFrom1</expectedResult>
--            <actualResult type="string">Copyright © 2013-2017 Magento, Inc. All rights reserved.</actualResult>
--        </assertEquals>
--        <assertFalse stepKey="assertFalse1" message="pass">
--            <actualResult type="bool">0</actualResult>
--        </assertFalse>
--        <assertGreaterOrEquals stepKey="assertGreaterOrEquals" message="pass">
--            <expectedResult type="int">2</expectedResult>
--            <actualResult type="int">5</actualResult>
--        </assertGreaterOrEquals>
--        <assertElementContainsAttribute stepKey="assertElementContainsAttribute1" selector="#username" attribute="class">
--            <expectedResult type="string">admin__control-text</expectedResult>
--        </assertElementContainsAttribute>
--
--        <!-- string type that use created data -->
--        <assertStringStartsWith stepKey="assert1" message="fail">
--            <expectedResult type="string">D</expectedResult>
--            <actualResult type="string">$$createData1.lastname$$, $$createData1.firstname$$</actualResult>
--        </assertStringStartsWith>
--        <assertStringStartsNotWith stepKey="assert2" message="pass">
--            <expectedResult type="string">W</expectedResult>
--            <actualResult type="string">$createData2.firstname$, $createData2.lastname$</actualResult>
--        </assertStringStartsNotWith>
--        <assertEquals stepKey="assert5" message="pass">
--            <expectedResult type="string">$$createData1.lastname$$</expectedResult>
--            <actualResult type="string">$$createData1.lastname$$</actualResult>
--        </assertEquals>
--        <assertElementContainsAttribute stepKey="assertElementContainsAttribute7" selector="#username" attribute="value">
--            <expectedResult type="const">$createData2.firstname$</expectedResult>
--        </assertElementContainsAttribute>
--
--        <!-- array type that use created data -->
--        <assertArraySubset stepKey="assert9" message="pass">
--            <expectedResult type="array">[$$createData1.lastname$$, $$createData1.firstname$$]</expectedResult>
--            <actualResult type="array">[$$createData1.lastname$$, $$createData1.firstname$$, 1]</actualResult>
--        </assertArraySubset>
--        <assertArraySubset stepKey="assert10" message="pass">
--            <expectedResult type="array">[$createData2.firstname$, $createData2.lastname$]</expectedResult>
--            <actualResult type="array">[$createData2.firstname$, $createData2.lastname$, 1]</actualResult>
--        </assertArraySubset>
--        <assertArrayHasKey stepKey="assert3" message="pass">
--            <expectedResult type="string">lastname</expectedResult>
--            <actualResult type="array">['lastname' => $$createData1.lastname$$, 'firstname' => $$createData1.firstname$$]</actualResult>
--        </assertArrayHasKey>
--        <assertArrayHasKey stepKey="assert4" message="pass">
--            <expectedResult type="string">lastname</expectedResult>
--            <actualResult type="array">['lastname' => $createData2.lastname$, 'firstname' => $createData2.firstname$]</actualResult>
--        </assertArrayHasKey>
--    </test>
--</tests>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateConfigurableProductByApiTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateConfigurableProductByApiTest.xml
-deleted file mode 100644
-index d759d1ab274..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateConfigurableProductByApiTest.xml
-+++ /dev/null
-@@ -1,77 +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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
--    <test name="CreateConfigurableProductByApiTest">
--        <annotations>
--            <features value="SampleTests"/>
--            <stories value="Create a Configurable Product By API"/>
--            <skip>
--                <issueId value="SAMPLE"/>
--            </skip>
--        </annotations>
--        <before>
--            <createData stepKey="categoryHandle" entity="SimpleSubCategory" />
--            <createData stepKey="baseConfigProductHandle" entity="BaseConfigurableProduct" >
--                <requiredEntity createDataKey="categoryHandle"/>
--            </createData>
--            <createData stepKey="productAttributeHandle" entity="productDropDownAttribute"/>
--
--            <createData stepKey="productAttributeOption1Handle" entity="productAttributeOption1">
--                <requiredEntity createDataKey="productAttributeHandle"/>
--            </createData>
--            <createData stepKey="productAttributeOption2Handle" entity="productAttributeOption2">
--                <requiredEntity createDataKey="productAttributeHandle"/>
--            </createData>
--
--            <createData stepKey="addToAttributeSetHandle" entity="AddToDefaultSet">
--                <requiredEntity createDataKey="productAttributeHandle"/>
--            </createData>
--
--            <getData stepKey="getAttributeOption1Handle" entity="ProductAttributeOptionGetter" index="1">
--                <requiredEntity createDataKey="productAttributeHandle"/>
--            </getData>
--            <getData stepKey="getAttributeOption2Handle" entity="ProductAttributeOptionGetter" index="2">
--                <requiredEntity createDataKey="productAttributeHandle"/>
--            </getData>
--
--            <createData stepKey="childProductHandle1" entity="SimpleOne">
--                <requiredEntity createDataKey="productAttributeHandle"/>
--                <requiredEntity createDataKey="getAttributeOption1Handle"/>
--            </createData>
--            <createData stepKey="childProductHandle2" entity="SimpleOne">
--                <requiredEntity createDataKey="productAttributeHandle"/>
--                <requiredEntity createDataKey="getAttributeOption2Handle"/>
--            </createData>
--
--            <createData stepKey="configProductOptionHandle" entity="ConfigurableProductTwoOptions">
--                <requiredEntity createDataKey="baseConfigProductHandle"/>
--                <requiredEntity createDataKey="productAttributeHandle"/>
--                <requiredEntity createDataKey="getAttributeOption1Handle"/>
--                <requiredEntity createDataKey="getAttributeOption2Handle"/>
--            </createData>
--
--            <createData stepKey="configProductHandle1" entity="ConfigurableProductAddChild">
--                <requiredEntity createDataKey="childProductHandle1"/>
--                <requiredEntity createDataKey="baseConfigProductHandle"/>
--            </createData>
--            <createData stepKey="configProductHandle2" entity="ConfigurableProductAddChild">
--                <requiredEntity createDataKey="childProductHandle2"/>
--                <requiredEntity createDataKey="baseConfigProductHandle"/>
--            </createData>
--        </before>
--        <after>
--            <deleteData stepKey="d2" createDataKey="childProductHandle1"/>
--            <deleteData stepKey="d3" createDataKey="childProductHandle2"/>
--            <deleteData stepKey="d7" createDataKey="baseConfigProductHandle"/>
--            <deleteData stepKey="d8" createDataKey="categoryHandle"/>
--            <deleteData stepKey="d6" createDataKey="productAttributeHandle"/>
--        </after>
--    </test>
--</tests>
-\ No newline at end of file
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateSalesRuleByApiTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateSalesRuleByApiTest.xml
-deleted file mode 100644
-index 8cd83fd6206..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateSalesRuleByApiTest.xml
-+++ /dev/null
-@@ -1,24 +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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
--    <test name="CreateSalesRuleByApiTest">
--        <annotations>
--            <features value="SampleTests"/>
--            <stories value="Create a Sales Rule By API"/>
--            <skip>
--                <issueId value="SAMPLE"/>
--            </skip>
--        </annotations>
--        <before>
--            <createData stepKey="saleRule" entity="SimpleSalesRule" />
--        </before>
--        <!--see stepKey="test" userInput="$$saleRule.store_labels[0][store_id]$$" selector="test"/-->
--    </test>
--</tests>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/MinimumTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/MinimumTest.xml
-deleted file mode 100644
-index f8702eeaf5e..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/MinimumTest.xml
-+++ /dev/null
-@@ -1,26 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<!-- Test XML Example -->
--<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
--    <test name="MinimumTest">
--        <annotations>
--            <features value="SampleTests"/>
--            <title value="Minimum Test"/>
--            <description value="Minimum Test"/>
--            <group value="example"/>
--        </annotations>
--        <after>
--            <seeInCurrentUrl url="/admin/admin/" stepKey="seeInCurrentUrl"/>
--        </after>
--        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
--        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
--        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
--        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
--    </test>
--</tests>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/PersistMultipleEntitiesTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/PersistMultipleEntitiesTest.xml
-deleted file mode 100644
-index 6a196c2c32c..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/PersistMultipleEntitiesTest.xml
-+++ /dev/null
-@@ -1,36 +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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
--    <test name="PersistMultipleEntitiesTest">
--        <annotations>
--            <features value="SampleTests"/>
--            <skip>
--                <issueId value="SAMPLE"/>
--            </skip>
--        </annotations>
--        <before>
--            <createData entity="simplesubcategory" stepKey="simplecategory"/>
--            <createData entity="simpleproduct" stepKey="simpleproduct1">
--                <requiredEntity createDataKey="simplecategory"/>
--            </createData>
--            <createData entity="simpleproduct" stepKey="simpleproduct2">
--                <requiredEntity createDataKey="categoryLink"/>
--            </createData>
--        </before>
--        <after>
--            <deleteData createDataKey="simpleproduct1" stepKey="deleteProduct1"/>
--            <deleteData createDataKey="simpleproduct2" stepKey="deleteProduct2"/>
--            <deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
--        </after>
--        <amOnPage stepKey="s11" url="/$$simplecategory.name$$.html" />
--        <waitForPageLoad stepKey="s33"/>
--        <see stepKey="s35" selector="{{StorefrontCategoryMainSection.productCount}}" userInput="2"/>
--    </test>
--</tests>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/SampleTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/SampleTest.xml
-deleted file mode 100644
-index c107debc1aa..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/SampleTest.xml
-+++ /dev/null
-@@ -1,298 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- /**
--  * Copyright © Magento, Inc. All rights reserved.
--  * See COPYING.txt for license details.
--  */
---->
--<!-- Test XML Example -->
--<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
--    <test name="PreAndPostHooksTest">
--        <before>
--            <amOnUrl url="http://127.0.0.1:32772/admin/" stepKey="amOnPage"/>
--            <createData entity="CustomerEntity1" stepKey="createData1"/>
--            <createData entity="AssertThis" stepKey="createData2"/>
--        </before>
--        <after>
--            <amOnUrl url="http://127.0.0.1:32772/admin/admin/auth/logout" stepKey="amOnPage"/>
--            <deleteData createDataKey="createData1" stepKey="deleteData1"/>
--            <deleteData createDataKey="createData2" stepKey="deleteData2"/>
--        </after>
--    </test>
--    <test name="AllCodeceptionMethodsTest">
--        <annotations>
--            <features value="SampleTests"/>
--            <title value="Create all Codeception methods"/>
--            <description value="Exercises the Generator to make sure it creates every Codeception method correctly."/>
--            <severity value="CRITICAL"/>
--            <testCaseId value="#"/>
--        </annotations>
--        <acceptPopup stepKey="acceptPopup"/>
--        <amOnPage url="/admin" stepKey="amOnPage"/>
--        <amOnSubdomain url="admin" stepKey="amOnSubdomain"/>
--        <amOnUrl url="http://www.google.com/" stepKey="amOnUrl"/>
--        <appendField userInput="More Words" selector=".stuff" stepKey="appendField"/>
--        <attachFile userInput="filename.php" selector="#stuff" stepKey="attachFile"/>
--        <cancelPopup stepKey="cancelPopup"/>
--        <checkOption selector="#checkbox" stepKey="checkOption"/>
--        <clearField selector="#field" stepKey="clearField"/>
--        <click selector="#button" userInput="Context" stepKey="click1"/>
--        <click selectorArray="['link' => 'Login']" stepKey="click2"/>
--        <click selectorArray="['link' => 'Login']" userInput="stuff" stepKey="click3"/>
--        <clickWithLeftButton selector="#clickHere" stepKey="clickWithLeftButton1" x="23" y="324"/>
--        <clickWithLeftButton selectorArray="['css' => '.checkout']" stepKey="clickWithLeftButton2" x="23" y="324"/>
--        <clickWithLeftButton stepKey="clickWithLeftButton3" x="23" y="324"/>
--        <clickWithRightButton selector="#clickHere" stepKey="clickWithRightButton1" x="23" y="324"/>
--        <clickWithRightButton selectorArray="['css' => '.checkout']" stepKey="clickWithRightButton2" x="23" y="324"/>
--        <clickWithRightButton stepKey="clickWithRightButton3" x="23" y="324"/>
--        <closeTab stepKey="closeTab"/>
--        <comment userInput="This is a Comment." stepKey="comment"/>
--        <createData entity="CustomerEntity1" stepKey="createData1"/>
--        <deleteData createDataKey="createData1" stepKey="deleteData1"/>
--        <dontSee userInput="Text" stepKey="dontSee1"/>
--        <dontSee userInput="Text" selector=".title" stepKey="dontSee2"/>
--        <dontSee userInput="Text" selectorArray="['css' => 'body h1']" stepKey="dontSee3"/>
--        <dontSeeCheckboxIsChecked selector="#checkbox" stepKey="dontSeeCheckboxIsChecked"/>
--        <dontSeeCookie userInput="cookieName" stepKey="dontSeeCookie1"/>
--        <dontSeeCookie userInput="cookieName" parameterArray="['domainName' => 'stuff']" stepKey="dontSeeCookie2"/>
--        <dontSeeCurrentUrlEquals url="/stuff" stepKey="dontSeeCurrentUrlEquals"/>
--        <dontSeeCurrentUrlMatches regex="~$/users/(\d+)~" stepKey="dontSeeCurrentUrlMatches"/>
--        <dontSeeElement selector=".error" stepKey="dontSeeElement1"/>
--        <dontSeeElement selector="input" parameterArray="['name' => 'login']" stepKey="dontSeeElement2"/>
--        <dontSeeElementInDOM selector="#stuff" stepKey="dontSeeElementInDOM1"/>
--        <dontSeeElementInDOM selector="#stuff" parameterArray="['name' => 'login']" stepKey="dontSeeElementInDOM2"/>
--        <dontSeeInCurrentUrl url="/users/" stepKey="dontSeeInCurrentUrl"/>
--        <dontSeeInField selector=".field" userInput="stuff" stepKey="dontSeeInField1"/>
--        <dontSeeInField selectorArray="['name' => 'search']" userInput="Comment Here" stepKey="dontSeeInField2"/>
--        <dontSeeInFormFields selector="form[name=myform]" parameterArray="['input1' => 'non-existent value', 'input2' => 'other non-existent value']" stepKey="dontSeeInFormFields"/>
--        <dontSeeInPageSource userInput="Stuff in Page Source" stepKey="dontSeeInPageSource"/>
--        <!--<dontSeeInSource html="<h1></h1>" stepKey="dontSeeInSource"/>-->
--        <dontSeeInTitle userInput="Title" stepKey="dontSeeInTitle"/>
--        <dontSeeLink userInput="Logout" stepKey="dontSeeLink1"/>
--        <dontSeeLink userInput="Checkout" url="/store/cart.php" stepKey="dontSeeLink2"/>
--        <dontSeeOptionIsSelected selector="#form .stuff" userInput="Option Name" stepKey="dontSeeOptionIsSelected"/>
--        <doubleClick selector="#click .here" stepKey="doubleClick"/>
--        <dragAndDrop selector1="#number1" selector2="#number2" stepKey="dragAndDrop"/>
--        <executeInSelenium function="function(\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {$webdriver->get('http://google.com');}" stepKey="executeInSelenium"/>
--        <executeJS function="return $('#myField').val()" stepKey="executeJS"/>
--        <fillField selector="#field" userInput="stuff" stepKey="fillField1"/>
--        <fillField selectorArray="['name' => 'email']" userInput="stuff" stepKey="fillField2"/>
--        <grabAttributeFrom selector="#target" userInput="title" stepKey="grabAttributeFrom"/>
--        <grabCookie userInput="cookie" parameterArray="['domain' => 'www.google.com']" stepKey="grabCookie"/>
--        <grabFromCurrentUrl regex="~$/user/(\d+)/~" stepKey="grabFromCurrentUrl"/>
--        <grabMultiple selector="a" userInput="href" stepKey="grabMultiple"/>
--        <grabPageSource stepKey="grabPageSource1"/>
--        <grabTextFrom selector="h1" stepKey="grabTextFrom1"/>
--        <grabValueFrom selector=".form" stepKey="grabValueFrom1"/>
--        <grabValueFrom selectorArray="['name' => 'username']" stepKey="grabValueFrom2"/>
--        <loadSessionSnapshot userInput="stuff" stepKey="loadSessionSnapshot1"/>
--        <loadSessionSnapshot userInput="stuff" stepKey="loadSessionSnapshot2"/>
--        <makeScreenshot userInput="ScreenshotName" stepKey="makeScreenshot"/>
--        <maximizeWindow stepKey="maximizeWindow"/>
--        <moveBack stepKey="moveBack"/>
--        <moveForward stepKey="moveForward"/>
--        <moveMouseOver selector="#stuff" stepKey="moveMouseOver1"/>
--        <moveMouseOver selectorArray="['css' => '.checkout']" stepKey="moveMouseOver2"/>
--        <moveMouseOver x="5" y="5" stepKey="moveMouseOver3"/>
--        <moveMouseOver selector="#stuff" x="5" y="5" stepKey="moveMouseOver4"/>
--        <moveMouseOver selectorArray="['css' => '.checkout']" x="5" y="5" stepKey="moveMouseOver5"/>
--        <openNewTab stepKey="openNewTab"/>
--        <pauseExecution stepKey="pauseExecution"/>
--        <performOn selector=".rememberMe" function="function (WebDriver $I) { $I->see('Remember me next time'); $I->seeElement('#LoginForm_rememberMe'); $I->dontSee('Login'); }" stepKey="performOn1"/>
--        <performOn selector=".rememberMe" function="ActionSequence::build()->see('Warning')->see('Are you sure you want to delete this?')->click('Yes')" stepKey="performOn2"/>
--        <pressKey selector="#page" userInput="a" stepKey="pressKey1"/>
--        <pressKey selector="#page" parameterArray="[['ctrl','a'],'new']" stepKey="pressKey2"/>
--        <pressKey selector="#page" parameterArray="[['shift','111'],'1','x']" stepKey="pressKey3"/>
--        <pressKey selector="#page" parameterArray="[['ctrl', 'a'], \Facebook\WebDriver\WebDriverKeys::DELETE]" stepKey="pressKey4"/>
--        <!--pressKey selector="descendant-or-self::*[@id='page']" userInput="u" stepKey="pressKey5"/-->
--        <reloadPage stepKey="reloadPage"/>
--        <resetCookie userInput="cookie" stepKey="resetCookie1"/>
--        <resetCookie userInput="cookie" parameterArray="['domainName' => 'www.google.com']" stepKey="resetCookie2"/>
--        <resizeWindow width="800" height="600" stepKey="resizeWindow"/>
--        <saveSessionSnapshot userInput="stuff" stepKey="saveSessionSnapshot"/>
--        <scrollTo selector="#place" x="20" y="50" stepKey="scrollTo1"/>
--        <scrollTo selectorArray="['css' => '.checkout']" x="20" y="50" stepKey="scrollTo2"/>
--        <see userInput="Stuff" stepKey="see1"/>
--        <see userInput="More Stuff" selector=".stuff" stepKey="see2"/>
--        <see userInput="More More Stuff" selectorArray="['css' => 'body h1']" stepKey="see3"/>
--        <seeCheckboxIsChecked selector="#checkbox" stepKey="seeCheckboxIsChecked"/>
--        <seeCookie userInput="PHPSESSID" stepKey="seeCookie1"/>
--        <seeCookie userInput="PHPSESSID" parameterArray="['domainName' => 'www.google.com']" stepKey="seeCookie2"/>
--        <seeCurrentUrlEquals url="/" stepKey="seeCurrentUrlEquals"/>
--        <seeCurrentUrlMatches regex="~$/users/(\d+)~" stepKey="seeCurrentUrlMatches"/>
--        <seeElement selector=".error" stepKey="seeElement1"/>
--        <seeElement selectorArray="['css' => 'form input']" stepKey="seeElement2"/>
--        <seeElement selector=".error" parameterArray="['name' => 'login']" stepKey="seeElement3"/>
--        <seeElement selectorArray="['css' => 'form input']" parameterArray="['name' => 'login']" stepKey="seeElement4"/>
--        <seeElementInDOM selector="//form/input[type=hidden]" stepKey="seeElementInDOM1"/>
--        <seeElementInDOM selector="//form/input[type=hidden]" parameterArray="['name' => 'form']" stepKey="seeElementInDOM2"/>
--        <seeInCurrentUrl url="home" stepKey="seeInCurrentUrl1"/>
--        <seeInCurrentUrl url="/home/" stepKey="seeInCurrentUrl2"/>
--        <seeInField userInput="Stuff" selector="#field" stepKey="seeInField1"/>
--        <seeInField userInput="Stuff" selectorArray="['name' => 'search']" stepKey="seeInField2"/>
--        <seeInFormFields selector="form[name=myform]" parameterArray="['input1' => 'value','input2' => 'other value']" stepKey="seeInFormFields1"/>
--        <seeInFormFields selector=".form-class" parameterArray="[['multiselect' => ['value1','value2'],'checkbox[]]' => ['a checked value','another checked value',]]" stepKey="seeInFormFields2"/>
--        <!--<seeInPageSource html="<h1></h1>" stepKey="seeInPageSource"/>-->
--        <seeInPopup userInput="Yes in Popup" stepKey="seeInPopup"/>
--        <!--<seeInSource html="<h1></h1>" stepKey="seeInSource"/>-->
--        <seeInTitle userInput="In Title" stepKey="seeInTitle"/>
--        <seeLink userInput="Logout" stepKey="seeLink1"/>
--        <seeLink userInput="Logout" url="/logout" stepKey="seeLink2"/>
--        <seeNumberOfElements selector="tr" userInput="10" stepKey="seeNumberOfElements1"/>
--        <seeNumberOfElements selector="tr" userInput="[0, 10]" stepKey="seeNumberOfElements2"/>
--        <seeOptionIsSelected selector=".option" userInput="Visa" stepKey="seeOptionIsSelected"/>
--        <selectOption selector=".dropDown" userInput="Option Name" stepKey="selectOption1"/>
--        <selectOption selector="//form/select[@name=account]" parameterArray="['Windows','Linux']" stepKey="selectOption2"/>
--        <selectOption selector="Which OS do you use?" parameterArray="['text' => 'Windows']" stepKey="selectOption3"/>
--        <setCookie userInput="PHPSESSID" value="stuff" stepKey="setCookie1"/>
--        <setCookie userInput="PHPSESSID" value="stuff" parameterArray="['domainName' => 'www.google.com']" stepKey="setCookie2"/>
--        <submitForm selector="#my-form" parameterArray="['field' => ['value','another value',]]" button="#submit" stepKey="submitForm2"/>
--        <switchToIFrame stepKey="switchToIFrame1"/>
--        <switchToIFrame userInput="another_frame" stepKey="switchToIFrame2"/>
--        <switchToNextTab stepKey="switchToNextTab1"/>
--        <switchToNextTab userInput="2" stepKey="switchToNextTab2"/>
--        <switchToPreviousTab stepKey="switchToPreviewTab1"/>
--        <switchToPreviousTab userInput="1" stepKey="switchToPreviewTab2"/>
--        <switchToWindow stepKey="switchToWindow1"/>
--        <switchToWindow userInput="another_window" stepKey="switchToWindow2"/>
--        <typeInPopup userInput="Stuff for popup" stepKey="typeInPopup"/>
--        <uncheckOption selector="#option" stepKey="uncheckOption"/>
--        <unselectOption selector="#dropDown" userInput="Option" stepKey="unselectOption"/>
--        <wait time="15" stepKey="wait"/>
--        <waitForElement selector="#button" time="10" stepKey="waitForElement"/>
--        <waitForElementChange selector="#menu" function="function(\WebDriverElement $el) {return $el->isDisplayed();}" time="100" stepKey="waitForElementChange"/>
--        <waitForElementNotVisible selector="#a_thing .className" time="30" stepKey="waitForElementNotVisible"/>
--        <waitForElementVisible selector="#a_thing .className" time="15" stepKey="waitForElementVisible"/>
--        <waitForJS function="return $.active == 0;" time="30" stepKey="waitForJS"/>
--        <waitForText userInput="foo" time="30" stepKey="waitForText1"/>
--        <waitForText userInput="foo" selector=".title" time="30" stepKey="waitForText2"/>
--    </test>
--    <test name="AllCustomMethodsTest">
--        <annotations>
--            <title value="Create all Custom methods"/>
--            <description value="Exercises the Generator to make sure it creates every Custom method correctly."/>
--            <severity value="CRITICAL"/>
--            <testCaseId value="#"/>
--        </annotations>
--        <assertElementContainsAttribute selector="#username" attribute="class" expectedValue="admin__control-text" stepKey="assertElementContainsAttribute1"/>
--        <assertElementContainsAttribute selector="#username" attribute="type" expectedValue="text" stepKey="assertElementContainsAttribute2"/>
--        <assertElementContainsAttribute selector="#username" attribute="name" expectedValue="login[username]" stepKey="assertElementContainsAttribute3"/>
--        <assertElementContainsAttribute selector="#username" attribute="autofocus" expectedValue="" stepKey="assertElementContainsAttribute4"/>
--        <assertElementContainsAttribute selector="#username" attribute="data-validate" expectedValue="{required:true}" stepKey="assertElementContainsAttribute5"/>
--        <assertElementContainsAttribute selector="#username" attribute="placeholder" expectedValue="user name" stepKey="assertElementContainsAttribute6"/>
--        <assertElementContainsAttribute selector="#username" attribute="autocomplete" expectedValue="off" stepKey="assertElementContainsAttribute7"/>
--        <assertElementContainsAttribute selector=".admin__menu-overlay" attribute="style" expectedValue="display: none;" stepKey="assertElementContainsAttribute8"/>
--        <assertElementContainsAttribute selector=".admin__menu-overlay" attribute="border" expectedValue="0" stepKey="assertElementContainsAttribute9"/>
--        <closeAdminNotification stepKey="closeAdminNotification1"/>
--        <searchAndMultiSelectOption selector="#stuff" parameterArray="['Item 1', 'Item 2']" stepKey="searchAndMultiSelect1"/>
--        <searchAndMultiSelectOption selector="#stuff" parameterArray="['Item 1', 'Item 2']" requiredAction="true" stepKey="searchAndMultiSelect2"/>
--        <waitForPageLoad stepKey="waitForPageLoad1"/>
--        <waitForPageLoad time="15" stepKey="waitForPageLoad2"/>
--        <waitForAjaxLoad stepKey="waitForAjax1"/>
--        <waitForAjaxLoad time="15" stepKey="waitForAjax2"/>
--        <dontSeeJsError stepKey="dontSeeJsError"/>
--        <formatMoney userInput="$300,000" stepKey="formatMoney1"/>
--        <formatMoney userInput="$300,000" locale="en_US.UTF-8" stepKey="formatMoney2"/>
--        <mSetLocale userInput="300" locale="en_US.UTF-8" stepKey="mSetLocale1"/>
--        <mResetLocale stepKey="mResetLocale1"/>
--        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
--        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
--        <parseFloat userInput="300,000.2325" stepKey="parseFloat1"/>
--        <magentoCLI stepKey="enableMaintenance1" command="maintenance:enable"/>
--    </test>
--    <test name="AllVariableMethodsTest">
--        <annotations>
--            <features value="SampleTests"/>
--            <title value="Create all Methods that support Variables."/>
--            <description value="Exercises the Generator to make sure it creates every Method that supports a Variable."/>
--            <severity value="CRITICAL"/>
--            <testCaseId value="#"/>
--        </annotations>
--        <grabFromCurrentUrl stepKey="grabFromCurrentUrl1"/>
--        <amOnPage url="{$randomStuff}" stepKey="amOnPage1"/>
--        <amOnSubdomain url="{$randomStuff}" stepKey="amOnSubdomain1"/>
--        <amOnUrl url="{$randomStuff}" stepKey="amOnUrl1"/>
--        <appendField userInput="{$randomStuff}" selector="#randomField" stepKey="appendField1"/>
--        <attachFile userInput="{$randomStuff}" selector="#filePathField" stepKey="attachFile1"/>
--        <click userInput="{$randomStuff}" stepKey="click1"/>
--        <dontSee userInput="{$randomStuff}" stepKey="dontSee1"/>
--        <dontSeeCookie userInput="{$randomStuff}" stepKey="dontSeeCookie1"/>
--        <dontSeeCurrentUrlEquals url="{$randomStuff}" stepKey="dontSeeCurrentUrlEquals1"/>
--        <dontSeeCurrentUrlMatches regex="{$randomStuff}" stepKey="dontSeeCurrentUrlMatches1"/>
--        <dontSeeInCurrentUrl url="{$randomStuff}" stepKey="dontSeeInCurrentUrl1"/>
--        <dontSeeInField selector="#stuff" userInput="{$randomStuff}" stepKey="dontSeeInField1"/>
--        <dontSeeInPageSource userInput="{$randomStuff}" stepKey="dontSeeInPageSource1"/>
--        <dontSeeInTitle userInput="{$randomStuff}" stepKey="dontSeeInTitle1"/>
--        <dontSeeLink userInput="{$randomStuff}" stepKey="dontSeeLink1"/>
--        <dontSeeOptionIsSelected selector="#dropdown" userInput="{$randomStuff}" stepKey="dontSeeOptionIsSelected1"/>
--        <fillField userInput="{$randomStuff}" selector="#field" stepKey="fillField1"/>
--        <grabAttributeFrom selector="#stuff" userInput="{$randomStuff}" stepKey="grabAttributeFrom1"/>
--        <grabCookie userInput="{$randomStuff}" stepKey="grabValueFrom1"/>
--        <grabFromCurrentUrl regex="{$randomStuff}" stepKey="grabFromCurrentUrl"/>
--        <grabMultiple selector="a" userInput="{$randomStuff}" stepKey="grabMultiple1"/>
--        <loadSessionSnapshot userInput="{$randomStuff}" stepKey="loadSessionSnapshot"/>
--        <pressKey selector="a" userInput="{$randomStuff}" stepKey="pressKey1"/>
--        <saveSessionSnapshot userInput="{$randomStuff}" stepKey="saveSessionSnapshot1"/>
--        <see userInput="{$randomStuff}" stepKey="see1"/>
--        <seeCookie userInput="{$randomStuff}" stepKey="seeCookie1"/>
--        <seeCurrentUrlEquals url="{$randomStuff}" stepKey="seeCurrentUrlEquals1"/>
--        <seeCurrentUrlMatches regex="{$randomStuff}" stepKey="seeCurrentUrlMatches1"/>
--        <seeInCurrentUrl url="{$randomStuff}" stepKey="seeInCurrentUrl1"/>
--        <seeInField selector="a" userInput="{$randomStuff}" stepKey="seeInField1"/>
--        <seeInPopup userInput="{$randomStuff}" stepKey="seeInPopup"/>
--        <seeInTitle userInput="{$randomStuff}" stepKey="seeInTitle1"/>
--        <seeLink userInput="{$randomStuff}" stepKey="seeLink1"/>
--        <seeNumberOfElements selector="#stuff" userInput="{$randomStuff}" stepKey="seeNumberOfElements1"/>
--        <seeOptionIsSelected selector="#stuff" userInput="{$randomStuff}" stepKey="seeOptionIsSelected1"/>
--        <selectOption selector="#stuff" userInput="{$randomStuff}" stepKey="selectOption1"/>
--        <switchToIFrame userInput="{$randomStuff}" stepKey="switchToIFrame1"/>
--        <switchToNextTab userInput="{$randomStuff}" stepKey="switchToNextTab2"/>
--        <switchToPreviousTab userInput="{$randomStuff}" stepKey="switchToPreviousTab1"/>
--        <switchToNextTab userInput="{$randomStuff}" stepKey="switchToNextTab3"/>
--        <switchToWindow userInput="{$randomStuff}" stepKey="switchToWindow1"/>
--        <typeInPopup userInput="{$randomStuff}" stepKey="typeInPopup"/>
--        <unselectOption selector="#option" userInput="{$randomStuff}" stepKey="unselectOption1"/>
--        <waitForText userInput="{$randomStuff}" time="5" stepKey="waitForText1"/>
--    </test>
--    <test name="AllReplacementTest">
--        <annotations>
--            <features value="SampleTests"/>
--            <title value="Exercise reference replacement."/>
--            <description value="Exercises {{foo}}, $foo$, and $$foo$$ replacement."/>
--            <severity value="CRITICAL"/>
--            <testCaseId value="#"/>
--        </annotations>
--
--        <createData entity="CustomerEntity1" stepKey="testScopeData"/>
--        <createData entity="AssertThis" stepKey="testScopeData2"/>
--
--        <!-- parameterized url that uses literal params -->
--        <amOnPage url="{{SamplePage.url('success','success2')}}" stepKey="a0"/>
--
--        <!-- url referencing data that was created in this <test> -->
--        <amOnPage url="$testScopeData.firstname$.html" stepKey="a1"/>
--
--        <!-- url referencing data that was created in a <before> -->
--        <amOnPage url="$$createData1.firstname$$.html" stepKey="a2"/>
--
--        <!-- parameterized url that uses created data params -->
--        <amOnPage url="{{SamplePage.url($testScopeData.firstname$,$testScopeData.lastname$)}}" stepKey="a3"/>
--        <amOnPage url="{{SamplePage.url($$createData1.firstname$$,$$createData1.lastname$$)}}" stepKey="a4"/>
--
--        <!-- parameterized selector that uses literal params -->
--        <click selector="{{SampleSection.oneParamElement('success')}}" stepKey="c1"/>
--        <click selector="{{SampleSection.twoParamElement('success','success2')}}" stepKey="c2"/>
--
--        <!-- parameterized selector with literal, static data, and created data  -->
--        <click selector="{{SampleSection.threeParamElement('John', SamplePerson.lastname, $testScopeData.lastname$)}}" stepKey="c3"/>
--
--        <!-- selector that uses created data -->
--        <click selector="#$testScopeData.firstname$ .$testScopeData.lastname$" stepKey="c4"/>
--        <click selector="#$$createData1.firstname$$ .$$createData1.lastname$$" stepKey="c5"/>
--
--        <!-- userInput that uses created data -->
--        <fillField selector="#sample" userInput="Hello $testScopeData.firstname$ $testScopeData.lastname$" stepKey="f1"/>
--        <fillField selector="#sample" userInput="Hello $$createData1.firstname$$ $$createData1.lastname$$" stepKey="f2"/>
--    </test>
--</tests>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/SetPaymentConfigurationTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/SetPaymentConfigurationTest.xml
-deleted file mode 100644
-index f908c5cb457..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/SetPaymentConfigurationTest.xml
-+++ /dev/null
-@@ -1,31 +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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
--    <test name="SetPaypalConfigurationTest">
--        <annotations>
--            <features value="SampleTests"/>
--            <skip>
--                <issueId value="SAMPLE"/>
--            </skip>
--        </annotations>
--        <createData entity="SamplePaypalConfig" stepKey="createSamplePaypalConfig"/>
--        <createData entity="DefaultPayPalConfig" stepKey="restoreDefaultPaypalConfig"/>
--    </test>
--    <test name="SetBraintreeConfigurationTest">
--        <annotations>
--            <features value="SampleTests"/>
--            <skip>
--                <issueId value="SAMPLE"/>
--            </skip>
--        </annotations>
--        <createData entity="SampleBraintreeConfig" stepKey="createSampleBraintreeConfig"/>
--        <createData entity="DefaultBraintreeConfig" stepKey="restoreDefaultBraintreeConfig"/>
--    </test>
--</tests>
-diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/UpdateSimpleProductByApiTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/UpdateSimpleProductByApiTest.xml
-deleted file mode 100644
-index b18c24050d3..00000000000
---- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/UpdateSimpleProductByApiTest.xml
-+++ /dev/null
-@@ -1,29 +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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
--    <test name="UpdateSimpleProductByApiTest">
--        <annotations>
--            <features value="SampleTests"/>
--            <stories value="Update simple product by api test."/>
--            <skip>
--                <issueId value="SAMPLE"/>
--            </skip>
--        </annotations>
--        <before>
--            <createData stepKey="categoryHandle" entity="SimpleSubCategory"/>
--            <createData stepKey="productHandle" entity="SimpleProduct" >
--                <requiredEntity createDataKey="categoryHandle"/>
--            </createData>
--            <updateData stepKey="updateProduct" entity="NewSimpleProduct" createDataKey="productHandle"/>
--        </before>
--        <after>
--            <deleteData stepKey="delete" createDataKey="updateProduct"/>
--        </after>
--    </test>
--</tests>
-\ No newline at end of file
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema.xml b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema.xml
-index d9bba3ca5db..3c71e2fde48 100644
---- a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema.xml
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema.xml
-@@ -11,10 +11,10 @@
-         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"/>
-         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false"/>
-         <column xsi:type="varchar" name="value" nullable="true" length="255"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="entity_id"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="CSTR_EXTENSION_ATTR_ENTT_CSTR_ID_CSTR_ENTT_ENTT_ID"
-+        <constraint xsi:type="foreign" referenceId="CSTR_EXTENSION_ATTR_ENTT_CSTR_ID_CSTR_ENTT_ENTT_ID"
-                     table="testmodule_default_hydrator_extension_attribute_entity" column="customer_id"
-                     referenceTable="customer_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
-     </table>
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleFedex/Model/MockResponseBodyLoader.php b/dev/tests/api-functional/_files/Magento/TestModuleFedex/Model/MockResponseBodyLoader.php
-new file mode 100644
-index 00000000000..869fd113d1a
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleFedex/Model/MockResponseBodyLoader.php
-@@ -0,0 +1,79 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestModuleFedex\Model;
-+
-+use Magento\Framework\Exception\NotFoundException;
-+use Magento\Framework\HTTP\AsyncClient\Request;
-+use Magento\Framework\Module\Dir;
-+use Magento\Framework\Filesystem\Io\File;
-+use Magento\Framework\Stdlib\ArrayManager;
-+
-+/**
-+ * Load mock response body for Fedex rate request
-+ */
-+class MockResponseBodyLoader
-+{
-+    private const RESPONSE_FILE_PATTERN = '%s/_files/mock_response_%s_%s.json';
-+    private const PATH_COUNTRY = 'RequestedShipment/Recipient/Address/CountryCode';
-+    private const PATH_SERVICE_TYPE = 'RequestedShipment/ServiceType';
-+
-+    /**
-+     * @var Dir
-+     */
-+    private $moduleDirectory;
-+
-+    /**
-+     * @var File
-+     */
-+    private $fileIo;
-+
-+    /**
-+     * @var ArrayManager
-+     */
-+    private $arrayManager;
-+
-+    /**
-+     * @param Dir $moduleDirectory
-+     * @param File $fileIo
-+     * @param ArrayManager
-+     */
-+    public function __construct(
-+        Dir $moduleDirectory,
-+        File $fileIo,
-+        ArrayManager $arrayManager
-+    ) {
-+        $this->moduleDirectory = $moduleDirectory;
-+        $this->fileIo = $fileIo;
-+        $this->arrayManager = $arrayManager;
-+    }
-+
-+    /**
-+     * Loads mock response xml for a given request
-+     *
-+     * @param array $request
-+     * @return string
-+     * @throws NotFoundException
-+     */
-+    public function loadForRequest(array $request): string
-+    {
-+        $moduleDir = $this->moduleDirectory->getDir('Magento_TestModuleFedex');
-+
-+        $type = strtolower($this->arrayManager->get(static::PATH_SERVICE_TYPE, $request) ?? 'general');
-+        $country = strtolower($this->arrayManager->get(static::PATH_COUNTRY, $request) ?? '');
-+
-+        $responsePath = sprintf(static::RESPONSE_FILE_PATTERN, $moduleDir, $type, $country);
-+
-+        if (!$this->fileIo->fileExists($responsePath)) {
-+            throw new NotFoundException(
-+                __('"%1" is not a valid mock response type for country "%2".', $type, $country)
-+            );
-+        }
-+
-+        return $this->fileIo->read($responsePath);
-+    }
-+}
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleFedex/Model/MockSoapClient.php b/dev/tests/api-functional/_files/Magento/TestModuleFedex/Model/MockSoapClient.php
-new file mode 100644
-index 00000000000..9720a504e33
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleFedex/Model/MockSoapClient.php
-@@ -0,0 +1,47 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestModuleFedex\Model;
-+
-+/**
-+ * Mock Fedex soap client factory
-+ */
-+class MockSoapClient extends \SoapClient
-+{
-+    /**
-+     * @var MockResponseBodyLoader
-+     */
-+    private $mockResponseBodyLoader;
-+
-+    /**
-+     * @param string $wsdl
-+     * @param MockResponseBodyLoader $mockResponseBodyLoader
-+     * @param array|null $options
-+     */
-+    public function __construct(
-+        string $wsdl,
-+        MockResponseBodyLoader $mockResponseBodyLoader,
-+        array $options = null
-+    ) {
-+        parent::__construct($wsdl, $options);
-+        $this->mockResponseBodyLoader = $mockResponseBodyLoader;
-+    }
-+
-+    /**
-+     * Fetch mock Fedex rates
-+     *
-+     * @param array $rateRequest
-+     * @return \stdClass
-+     * @throws \Magento\Framework\Exception\NotFoundException
-+     */
-+    public function getRates(array $rateRequest): \stdClass
-+    {
-+        $response = $this->mockResponseBodyLoader->loadForRequest($rateRequest);
-+
-+        return json_decode($response);
-+    }
-+}
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleFedex/Model/MockSoapClientFactory.php b/dev/tests/api-functional/_files/Magento/TestModuleFedex/Model/MockSoapClientFactory.php
-new file mode 100644
-index 00000000000..4309625746b
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleFedex/Model/MockSoapClientFactory.php
-@@ -0,0 +1,34 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestModuleFedex\Model;
-+
-+use Magento\Framework\App\ObjectManager;
-+
-+/**
-+ * Mock Fedex soap client factory
-+ */
-+class MockSoapClientFactory extends \Magento\Framework\Webapi\Soap\ClientFactory
-+{
-+    /**
-+     * Create instance of the mock SoapClient
-+     *
-+     * @param string $wsdl
-+     * @param array $options
-+     * @return \SoapClient
-+     */
-+    public function create($wsdl, array $options = []): \SoapClient
-+    {
-+        return ObjectManager::getInstance()->create(
-+            MockSoapClient::class,
-+            [
-+                'wsdl' => $wsdl,
-+                'options' => $options,
-+            ]
-+        );
-+    }
-+}
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleFedex/_files/mock_response_general_ca.json b/dev/tests/api-functional/_files/Magento/TestModuleFedex/_files/mock_response_general_ca.json
-new file mode 100644
-index 00000000000..e26f1e48554
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleFedex/_files/mock_response_general_ca.json
-@@ -0,0 +1,912 @@
-+{
-+  "HighestSeverity": "NOTE",
-+  "Notifications": [
-+    {
-+      "Severity": "NOTE",
-+      "Source": "crs",
-+      "Code": "886",
-+      "Message": "Money Back Guarantee is not eligible for this pick up\/delivery postal\/zip code. FDXG",
-+      "LocalizedMessage": "Money Back Guarantee is not eligible for this pick up\/delivery postal\/zip code. FDXG",
-+      "MessageParameters": {
-+        "Id": "OPERATING_COMPANY",
-+        "Value": "FDXG"
-+      }
-+    },
-+    {
-+      "Severity": "NOTE",
-+      "Source": "crs",
-+      "Code": "819",
-+      "Message": "The origin state\/province code has been changed.  ",
-+      "LocalizedMessage": "The origin state\/province code has been changed.  "
-+    },
-+    {
-+      "Severity": "NOTE",
-+      "Source": "crs",
-+      "Code": "820",
-+      "Message": "The destination state\/province code has been changed.  ",
-+      "LocalizedMessage": "The destination state\/province code has been changed.  "
-+    }
-+  ],
-+  "Version": {
-+    "ServiceId": "crs",
-+    "Major": 10,
-+    "Intermediate": 0,
-+    "Minor": 0
-+  },
-+  "RateReplyDetails": [
-+    {
-+      "ServiceType": "INTERNATIONAL_PRIORITY",
-+      "PackagingType": "YOUR_PACKAGING",
-+      "DestinationAirportId": "YYZ",
-+      "IneligibleForMoneyBackGuarantee": false,
-+      "OriginServiceArea": "A1",
-+      "DestinationServiceArea": "AM",
-+      "SignatureOption": "SERVICE_DEFAULT",
-+      "ActualRateType": "PAYOR_ACCOUNT_SHIPMENT",
-+      "RatedShipmentDetails": [
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_ACCOUNT_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.65"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.65"
-+              }
-+            }
-+          }
-+        },
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_ACCOUNT_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.65"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.65"
-+              }
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_LIST_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.65"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.65"
-+              }
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_LIST_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.65"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.65"
-+              }
-+            }
-+          }
-+        }
-+      ]
-+    },
-+    {
-+      "ServiceType": "INTERNATIONAL_ECONOMY",
-+      "PackagingType": "YOUR_PACKAGING",
-+      "DestinationAirportId": "YYZ",
-+      "IneligibleForMoneyBackGuarantee": false,
-+      "OriginServiceArea": "A1",
-+      "DestinationServiceArea": "AM",
-+      "SignatureOption": "SERVICE_DEFAULT",
-+      "ActualRateType": "PAYOR_ACCOUNT_SHIPMENT",
-+      "RatedShipmentDetails": [
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_ACCOUNT_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.16"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.16"
-+              }
-+            }
-+          }
-+        },
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_ACCOUNT_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.16"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.16"
-+              }
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_LIST_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.16"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.16"
-+              }
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_LIST_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.16"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.16"
-+              }
-+            }
-+          }
-+        }
-+      ]
-+    },
-+    {
-+      "ServiceType": "FEDEX_GROUND",
-+      "PackagingType": "YOUR_PACKAGING",
-+      "DestinationAirportId": "YYZ",
-+      "IneligibleForMoneyBackGuarantee": true,
-+      "SignatureOption": "SERVICE_DEFAULT",
-+      "ActualRateType": "PAYOR_ACCOUNT_PACKAGE",
-+      "RatedShipmentDetails": [
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+            "RateZone": "51",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "7.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "22.73"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "22.73"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "1.59"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "24.32"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "24.32"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "24.32"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Level": "PACKAGE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Level": "PACKAGE",
-+                "Description": "FedEx Ground Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "1.59"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "EffectiveNetDiscount": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "22.73"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "22.73"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "1.59"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "24.32"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "24.32"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Level": "PACKAGE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Level": "PACKAGE",
-+                  "Description": "FedEx Ground Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "1.59"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_LIST_PACKAGE",
-+            "RateZone": "51",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "7.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "22.73"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "22.73"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "1.59"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "24.32"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "24.32"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "24.32"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Level": "PACKAGE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Level": "PACKAGE",
-+                "Description": "FedEx Ground Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "1.59"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_LIST_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "22.73"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "22.73"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "1.59"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "24.32"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "24.32"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Level": "PACKAGE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Level": "PACKAGE",
-+                  "Description": "FedEx Ground Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "1.59"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        }
-+      ]
-+    }
-+  ]
-+}
-\ No newline at end of file
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleFedex/_files/mock_response_general_us.json b/dev/tests/api-functional/_files/Magento/TestModuleFedex/_files/mock_response_general_us.json
-new file mode 100644
-index 00000000000..bc7d51dcbb3
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleFedex/_files/mock_response_general_us.json
-@@ -0,0 +1,2870 @@
-+{
-+  "HighestSeverity": "WARNING",
-+  "Notifications": [
-+    {
-+      "Severity": "WARNING",
-+      "Source": "crs",
-+      "Code": "835",
-+      "Message": "Destination Postal-City Mismatch. ",
-+      "LocalizedMessage": "Destination Postal-City Mismatch. "
-+    },
-+    {
-+      "Severity": "NOTE",
-+      "Source": "crs",
-+      "Code": "819",
-+      "Message": "The origin state\/province code has been changed.  ",
-+      "LocalizedMessage": "The origin state\/province code has been changed.  "
-+    },
-+    {
-+      "Severity": "NOTE",
-+      "Source": "crs",
-+      "Code": "820",
-+      "Message": "The destination state\/province code has been changed.  ",
-+      "LocalizedMessage": "The destination state\/province code has been changed.  "
-+    }
-+  ],
-+  "Version": {
-+    "ServiceId": "crs",
-+    "Major": 10,
-+    "Intermediate": 0,
-+    "Minor": 0
-+  },
-+  "RateReplyDetails": [
-+    {
-+      "ServiceType": "FIRST_OVERNIGHT",
-+      "PackagingType": "YOUR_PACKAGING",
-+      "DestinationAirportId": "DFW",
-+      "IneligibleForMoneyBackGuarantee": false,
-+      "OriginServiceArea": "A1",
-+      "DestinationServiceArea": "A6",
-+      "SignatureOption": "SERVICE_DEFAULT",
-+      "ActualRateType": "PAYOR_ACCOUNT_PACKAGE",
-+      "RatedShipmentDetails": [
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+            "RateScale": "14",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "102.59"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "102.59"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "9.18"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "111.77"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "111.77"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "111.77"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "6.33"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "EffectiveNetDiscount": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "102.59"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "102.59"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "9.18"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "111.77"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "111.77"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "6.33"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_ACCOUNT_PACKAGE",
-+            "RateScale": "14",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "102.59"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "102.59"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "9.18"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "111.77"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "111.77"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "111.77"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "6.33"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "EffectiveNetDiscount": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "PackageRateDetail": {
-+              "RateType": "RATED_ACCOUNT_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "102.59"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "102.59"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "9.18"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "111.77"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "111.77"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "6.33"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_LIST_PACKAGE",
-+            "RateScale": "14",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "102.59"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "102.59"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "9.18"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "111.77"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "111.77"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "111.77"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "6.33"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_LIST_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "102.59"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "102.59"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "9.18"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "111.77"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "111.77"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "6.33"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_LIST_PACKAGE",
-+            "RateScale": "14",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "102.59"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "102.59"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "9.18"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "111.77"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "111.77"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "111.77"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "6.33"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "PackageRateDetail": {
-+              "RateType": "RATED_LIST_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "102.59"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "102.59"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "9.18"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "111.77"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "111.77"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "6.33"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        }
-+      ]
-+    },
-+    {
-+      "ServiceType": "PRIORITY_OVERNIGHT",
-+      "PackagingType": "YOUR_PACKAGING",
-+      "DestinationAirportId": "DFW",
-+      "IneligibleForMoneyBackGuarantee": false,
-+      "OriginServiceArea": "A1",
-+      "DestinationServiceArea": "A6",
-+      "SignatureOption": "SERVICE_DEFAULT",
-+      "ActualRateType": "PAYOR_ACCOUNT_PACKAGE",
-+      "RatedShipmentDetails": [
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "49.92"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+            "RateScale": "1",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "25.5"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "25.5"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.55"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "30.05"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "30.05"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "30.05"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "1.7"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "EffectiveNetDiscount": {
-+              "Currency": "USD",
-+              "Amount": "49.92"
-+            },
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "25.5"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "25.5"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "4.55"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "30.05"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "30.05"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "1.7"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "49.92"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_ACCOUNT_PACKAGE",
-+            "RateScale": "1",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "25.5"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "25.5"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.55"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "30.05"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "30.05"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "30.05"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "1.7"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "EffectiveNetDiscount": {
-+              "Currency": "USD",
-+              "Amount": "49.92"
-+            },
-+            "PackageRateDetail": {
-+              "RateType": "RATED_ACCOUNT_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "25.5"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "25.5"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "4.55"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "30.05"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "30.05"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "1.7"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_LIST_PACKAGE",
-+            "RateScale": "1574",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "72.59"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "72.59"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "7.38"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "79.97"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "79.97"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "79.97"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "4.53"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_LIST_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "72.59"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "72.59"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "7.38"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "79.97"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "79.97"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "4.53"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_LIST_PACKAGE",
-+            "RateScale": "1574",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "72.59"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "72.59"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "7.38"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "79.97"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "79.97"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "79.97"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "4.53"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "PackageRateDetail": {
-+              "RateType": "RATED_LIST_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "72.59"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "72.59"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "7.38"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "79.97"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "79.97"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "4.53"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        }
-+      ]
-+    },
-+    {
-+      "ServiceType": "FEDEX_2_DAY",
-+      "PackagingType": "YOUR_PACKAGING",
-+      "DestinationAirportId": "DFW",
-+      "IneligibleForMoneyBackGuarantee": false,
-+      "OriginServiceArea": "A1",
-+      "DestinationServiceArea": "A6",
-+      "SignatureOption": "SERVICE_DEFAULT",
-+      "ActualRateType": "PAYOR_ACCOUNT_PACKAGE",
-+      "RatedShipmentDetails": [
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+            "RateScale": "6068",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "30.8"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "30.8"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.87"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "35.67"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "35.67"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "35.67"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.02"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "EffectiveNetDiscount": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "30.8"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "30.8"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "4.87"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "35.67"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "35.67"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.02"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_ACCOUNT_PACKAGE",
-+            "RateScale": "6068",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "30.8"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "30.8"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.87"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "35.67"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "35.67"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "35.67"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.02"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "EffectiveNetDiscount": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "PackageRateDetail": {
-+              "RateType": "RATED_ACCOUNT_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "30.8"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "30.8"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "4.87"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "35.67"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "35.67"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.02"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_LIST_PACKAGE",
-+            "RateScale": "6068",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "30.8"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "30.8"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.87"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "35.67"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "35.67"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "35.67"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.02"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_LIST_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "30.8"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "30.8"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "4.87"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "35.67"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "35.67"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.02"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_LIST_PACKAGE",
-+            "RateScale": "6068",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "30.8"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "30.8"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.87"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "35.67"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "35.67"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "35.67"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.02"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "PackageRateDetail": {
-+              "RateType": "RATED_LIST_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "30.8"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "30.8"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "4.87"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "35.67"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "35.67"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.02"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        }
-+      ]
-+    },
-+    {
-+      "ServiceType": "FEDEX_EXPRESS_SAVER",
-+      "PackagingType": "YOUR_PACKAGING",
-+      "DestinationAirportId": "DFW",
-+      "IneligibleForMoneyBackGuarantee": false,
-+      "OriginServiceArea": "A1",
-+      "DestinationServiceArea": "A6",
-+      "SignatureOption": "SERVICE_DEFAULT",
-+      "ActualRateType": "PAYOR_ACCOUNT_PACKAGE",
-+      "RatedShipmentDetails": [
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+            "RateScale": "7175",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "22.37"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "22.37"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.36"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "26.73"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "26.73"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "26.73"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "1.51"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "EffectiveNetDiscount": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "22.37"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "22.37"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "4.36"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "26.73"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "26.73"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "1.51"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_ACCOUNT_PACKAGE",
-+            "RateScale": "7175",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "22.37"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "22.37"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.36"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "26.73"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "26.73"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "26.73"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "1.51"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "EffectiveNetDiscount": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "PackageRateDetail": {
-+              "RateType": "RATED_ACCOUNT_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "22.37"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "22.37"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "4.36"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "26.73"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "26.73"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "1.51"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_LIST_PACKAGE",
-+            "RateScale": "7175",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "22.37"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "22.37"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.36"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "26.73"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "26.73"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "26.73"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "1.51"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_LIST_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "22.37"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "22.37"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "4.36"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "26.73"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "26.73"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "1.51"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_LIST_PACKAGE",
-+            "RateScale": "7175",
-+            "RateZone": "6",
-+            "PricingCode": "PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "6.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "22.37"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "22.37"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.36"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "26.73"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "26.73"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "26.73"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.85"
-+                }
-+              },
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Description": "Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "1.51"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "PackageRateDetail": {
-+              "RateType": "RATED_LIST_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "22.37"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "22.37"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "4.36"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "26.73"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "26.73"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.85"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Description": "Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "1.51"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        }
-+      ]
-+    },
-+    {
-+      "ServiceType": "FEDEX_GROUND",
-+      "PackagingType": "YOUR_PACKAGING",
-+      "DestinationAirportId": "DFW",
-+      "IneligibleForMoneyBackGuarantee": false,
-+      "SignatureOption": "SERVICE_DEFAULT",
-+      "ActualRateType": "PAYOR_ACCOUNT_PACKAGE",
-+      "RatedShipmentDetails": [
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+            "RateZone": "6",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "7.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "10.82"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "10.82"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "3.65"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "14.47"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "14.47"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "14.47"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Level": "PACKAGE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Level": "PACKAGE",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.7"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Level": "PACKAGE",
-+                "Description": "FedEx Ground Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.95"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "EffectiveNetDiscount": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "10.82"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "10.82"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "3.65"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "14.47"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "14.47"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Level": "PACKAGE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Level": "PACKAGE",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.7"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Level": "PACKAGE",
-+                  "Description": "FedEx Ground Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.95"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_LIST_PACKAGE",
-+            "RateZone": "6",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "7.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "10.82"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "10.82"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "3.65"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "14.47"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "14.47"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "14.47"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Level": "PACKAGE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Level": "PACKAGE",
-+                "Description": "Delivery Area Surcharge Extended Commercial",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "2.7"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Level": "PACKAGE",
-+                "Description": "FedEx Ground Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.95"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_LIST_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "10.82"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "10.82"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "3.65"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "14.47"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "14.47"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Level": "PACKAGE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "DELIVERY_AREA",
-+                  "Level": "PACKAGE",
-+                  "Description": "Delivery Area Surcharge Extended Commercial",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "2.7"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Level": "PACKAGE",
-+                  "Description": "FedEx Ground Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.95"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        }
-+      ]
-+    }
-+  ]
-+}
-\ No newline at end of file
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleFedex/_files/mock_response_smart_post_ca.json b/dev/tests/api-functional/_files/Magento/TestModuleFedex/_files/mock_response_smart_post_ca.json
-new file mode 100644
-index 00000000000..e26f1e48554
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleFedex/_files/mock_response_smart_post_ca.json
-@@ -0,0 +1,912 @@
-+{
-+  "HighestSeverity": "NOTE",
-+  "Notifications": [
-+    {
-+      "Severity": "NOTE",
-+      "Source": "crs",
-+      "Code": "886",
-+      "Message": "Money Back Guarantee is not eligible for this pick up\/delivery postal\/zip code. FDXG",
-+      "LocalizedMessage": "Money Back Guarantee is not eligible for this pick up\/delivery postal\/zip code. FDXG",
-+      "MessageParameters": {
-+        "Id": "OPERATING_COMPANY",
-+        "Value": "FDXG"
-+      }
-+    },
-+    {
-+      "Severity": "NOTE",
-+      "Source": "crs",
-+      "Code": "819",
-+      "Message": "The origin state\/province code has been changed.  ",
-+      "LocalizedMessage": "The origin state\/province code has been changed.  "
-+    },
-+    {
-+      "Severity": "NOTE",
-+      "Source": "crs",
-+      "Code": "820",
-+      "Message": "The destination state\/province code has been changed.  ",
-+      "LocalizedMessage": "The destination state\/province code has been changed.  "
-+    }
-+  ],
-+  "Version": {
-+    "ServiceId": "crs",
-+    "Major": 10,
-+    "Intermediate": 0,
-+    "Minor": 0
-+  },
-+  "RateReplyDetails": [
-+    {
-+      "ServiceType": "INTERNATIONAL_PRIORITY",
-+      "PackagingType": "YOUR_PACKAGING",
-+      "DestinationAirportId": "YYZ",
-+      "IneligibleForMoneyBackGuarantee": false,
-+      "OriginServiceArea": "A1",
-+      "DestinationServiceArea": "AM",
-+      "SignatureOption": "SERVICE_DEFAULT",
-+      "ActualRateType": "PAYOR_ACCOUNT_SHIPMENT",
-+      "RatedShipmentDetails": [
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_ACCOUNT_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.65"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.65"
-+              }
-+            }
-+          }
-+        },
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_ACCOUNT_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.65"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.65"
-+              }
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_LIST_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.65"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.65"
-+              }
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_LIST_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "92.99"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.65"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "97.64"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.65"
-+              }
-+            }
-+          }
-+        }
-+      ]
-+    },
-+    {
-+      "ServiceType": "INTERNATIONAL_ECONOMY",
-+      "PackagingType": "YOUR_PACKAGING",
-+      "DestinationAirportId": "YYZ",
-+      "IneligibleForMoneyBackGuarantee": false,
-+      "OriginServiceArea": "A1",
-+      "DestinationServiceArea": "AM",
-+      "SignatureOption": "SERVICE_DEFAULT",
-+      "ActualRateType": "PAYOR_ACCOUNT_SHIPMENT",
-+      "RatedShipmentDetails": [
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_ACCOUNT_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.16"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.16"
-+              }
-+            }
-+          }
-+        },
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_ACCOUNT_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.16"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.16"
-+              }
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_LIST_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.16"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.16"
-+              }
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "RATED_LIST_SHIPMENT",
-+            "RateScale": "0000000",
-+            "RateZone": "US001O",
-+            "PricingCode": "ACTUAL",
-+            "RatedWeightMethod": "ACTUAL",
-+            "CurrencyExchangeRate": {
-+              "FromCurrency": "USD",
-+              "IntoCurrency": "USD",
-+              "Rate": "1.0"
-+            },
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "5.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "83.18"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "4.16"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "87.34"
-+            },
-+            "Surcharges": {
-+              "SurchargeType": "FUEL",
-+              "Description": "Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "4.16"
-+              }
-+            }
-+          }
-+        }
-+      ]
-+    },
-+    {
-+      "ServiceType": "FEDEX_GROUND",
-+      "PackagingType": "YOUR_PACKAGING",
-+      "DestinationAirportId": "YYZ",
-+      "IneligibleForMoneyBackGuarantee": true,
-+      "SignatureOption": "SERVICE_DEFAULT",
-+      "ActualRateType": "PAYOR_ACCOUNT_PACKAGE",
-+      "RatedShipmentDetails": [
-+        {
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+            "RateZone": "51",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "7.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "22.73"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "22.73"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "1.59"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "24.32"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "24.32"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "24.32"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Level": "PACKAGE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Level": "PACKAGE",
-+                "Description": "FedEx Ground Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "1.59"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "EffectiveNetDiscount": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "22.73"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "22.73"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "1.59"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "24.32"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "24.32"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Level": "PACKAGE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Level": "PACKAGE",
-+                  "Description": "FedEx Ground Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "1.59"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        },
-+        {
-+          "ShipmentRateDetail": {
-+            "RateType": "PAYOR_LIST_PACKAGE",
-+            "RateZone": "51",
-+            "RatedWeightMethod": "ACTUAL",
-+            "DimDivisor": 0,
-+            "FuelSurchargePercent": "7.0",
-+            "TotalBillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "TotalBaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "22.73"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetFreight": {
-+              "Currency": "USD",
-+              "Amount": "22.73"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "1.59"
-+            },
-+            "TotalNetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "24.32"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetCharge": {
-+              "Currency": "USD",
-+              "Amount": "24.32"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "TotalNetChargeWithDutiesAndTaxes": {
-+              "Currency": "USD",
-+              "Amount": "24.32"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "INSURED_VALUE",
-+                "Level": "PACKAGE",
-+                "Description": "Insured value",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.0"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Level": "PACKAGE",
-+                "Description": "FedEx Ground Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "1.59"
-+                }
-+              }
-+            ]
-+          },
-+          "RatedPackages": {
-+            "GroupNumber": 0,
-+            "PackageRateDetail": {
-+              "RateType": "PAYOR_LIST_PACKAGE",
-+              "RatedWeightMethod": "ACTUAL",
-+              "BillingWeight": {
-+                "Units": "LB",
-+                "Value": "2.0"
-+              },
-+              "BaseCharge": {
-+                "Currency": "USD",
-+                "Amount": "22.73"
-+              },
-+              "TotalFreightDiscounts": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetFreight": {
-+                "Currency": "USD",
-+                "Amount": "22.73"
-+              },
-+              "TotalSurcharges": {
-+                "Currency": "USD",
-+                "Amount": "1.59"
-+              },
-+              "NetFedExCharge": {
-+                "Currency": "USD",
-+                "Amount": "24.32"
-+              },
-+              "TotalTaxes": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "NetCharge": {
-+                "Currency": "USD",
-+                "Amount": "24.32"
-+              },
-+              "TotalRebates": {
-+                "Currency": "USD",
-+                "Amount": "0.0"
-+              },
-+              "Surcharges": [
-+                {
-+                  "SurchargeType": "INSURED_VALUE",
-+                  "Level": "PACKAGE",
-+                  "Description": "Insured value",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "0.0"
-+                  }
-+                },
-+                {
-+                  "SurchargeType": "FUEL",
-+                  "Level": "PACKAGE",
-+                  "Description": "FedEx Ground Fuel",
-+                  "Amount": {
-+                    "Currency": "USD",
-+                    "Amount": "1.59"
-+                  }
-+                }
-+              ]
-+            }
-+          }
-+        }
-+      ]
-+    }
-+  ]
-+}
-\ No newline at end of file
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleFedex/_files/mock_response_smart_post_us.json b/dev/tests/api-functional/_files/Magento/TestModuleFedex/_files/mock_response_smart_post_us.json
-new file mode 100644
-index 00000000000..2670f2be8b3
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleFedex/_files/mock_response_smart_post_us.json
-@@ -0,0 +1,305 @@
-+{
-+  "HighestSeverity": "SUCCESS",
-+  "Notifications": {
-+    "Severity": "SUCCESS",
-+    "Source": "crs",
-+    "Code": "0",
-+    "Message": "Request was successfully processed. ",
-+    "LocalizedMessage": "Request was successfully processed. "
-+  },
-+  "Version": {
-+    "ServiceId": "crs",
-+    "Major": 10,
-+    "Intermediate": 0,
-+    "Minor": 0
-+  },
-+  "RateReplyDetails": {
-+    "ServiceType": "SMART_POST",
-+    "PackagingType": "YOUR_PACKAGING",
-+    "IneligibleForMoneyBackGuarantee": false,
-+    "SignatureOption": "SERVICE_DEFAULT",
-+    "ActualRateType": "PAYOR_ACCOUNT_PACKAGE",
-+    "RatedShipmentDetails": [
-+      {
-+        "EffectiveNetDiscount": {
-+          "Currency": "USD",
-+          "Amount": "1.91"
-+        },
-+        "ShipmentRateDetail": {
-+          "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+          "RateZone": "6",
-+          "RatedWeightMethod": "ACTUAL",
-+          "DimDivisor": 0,
-+          "FuelSurchargePercent": "7.0",
-+          "TotalBillingWeight": {
-+            "Units": "LB",
-+            "Value": "2.0"
-+          },
-+          "TotalBaseCharge": {
-+            "Currency": "USD",
-+            "Amount": "9.49"
-+          },
-+          "TotalFreightDiscounts": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "TotalNetFreight": {
-+            "Currency": "USD",
-+            "Amount": "9.49"
-+          },
-+          "TotalSurcharges": {
-+            "Currency": "USD",
-+            "Amount": "2.27"
-+          },
-+          "TotalNetFedExCharge": {
-+            "Currency": "USD",
-+            "Amount": "11.76"
-+          },
-+          "TotalTaxes": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "TotalNetCharge": {
-+            "Currency": "USD",
-+            "Amount": "11.76"
-+          },
-+          "TotalRebates": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "TotalDutiesAndTaxes": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "TotalNetChargeWithDutiesAndTaxes": {
-+            "Currency": "USD",
-+            "Amount": "11.76"
-+          },
-+          "Surcharges": [
-+            {
-+              "SurchargeType": "DELIVERY_AREA",
-+              "Level": "PACKAGE",
-+              "Description": "Delivery Area Surcharge Extended",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "1.5"
-+              }
-+            },
-+            {
-+              "SurchargeType": "FUEL",
-+              "Level": "PACKAGE",
-+              "Description": "SmartPost Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "0.77"
-+              }
-+            }
-+          ]
-+        },
-+        "RatedPackages": {
-+          "GroupNumber": 0,
-+          "EffectiveNetDiscount": {
-+            "Currency": "USD",
-+            "Amount": "1.91"
-+          },
-+          "PackageRateDetail": {
-+            "RateType": "PAYOR_ACCOUNT_PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "BillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "BaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "9.49"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "NetFreight": {
-+              "Currency": "USD",
-+              "Amount": "9.49"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "2.27"
-+            },
-+            "NetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "11.76"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "NetCharge": {
-+              "Currency": "USD",
-+              "Amount": "11.76"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Level": "PACKAGE",
-+                "Description": "Delivery Area Surcharge Extended",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "1.5"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Level": "PACKAGE",
-+                "Description": "SmartPost Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.77"
-+                }
-+              }
-+            ]
-+          }
-+        }
-+      },
-+      {
-+        "ShipmentRateDetail": {
-+          "RateType": "PAYOR_LIST_PACKAGE",
-+          "RateZone": "6",
-+          "RatedWeightMethod": "ACTUAL",
-+          "DimDivisor": 0,
-+          "FuelSurchargePercent": "7.0",
-+          "TotalBillingWeight": {
-+            "Units": "LB",
-+            "Value": "2.0"
-+          },
-+          "TotalBaseCharge": {
-+            "Currency": "USD",
-+            "Amount": "10.82"
-+          },
-+          "TotalFreightDiscounts": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "TotalNetFreight": {
-+            "Currency": "USD",
-+            "Amount": "10.82"
-+          },
-+          "TotalSurcharges": {
-+            "Currency": "USD",
-+            "Amount": "2.85"
-+          },
-+          "TotalNetFedExCharge": {
-+            "Currency": "USD",
-+            "Amount": "13.67"
-+          },
-+          "TotalTaxes": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "TotalNetCharge": {
-+            "Currency": "USD",
-+            "Amount": "13.67"
-+          },
-+          "TotalRebates": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "TotalDutiesAndTaxes": {
-+            "Currency": "USD",
-+            "Amount": "0.0"
-+          },
-+          "TotalNetChargeWithDutiesAndTaxes": {
-+            "Currency": "USD",
-+            "Amount": "13.67"
-+          },
-+          "Surcharges": [
-+            {
-+              "SurchargeType": "DELIVERY_AREA",
-+              "Level": "PACKAGE",
-+              "Description": "Delivery Area Surcharge Extended",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "1.95"
-+              }
-+            },
-+            {
-+              "SurchargeType": "FUEL",
-+              "Level": "PACKAGE",
-+              "Description": "SmartPost Fuel",
-+              "Amount": {
-+                "Currency": "USD",
-+                "Amount": "0.9"
-+              }
-+            }
-+          ]
-+        },
-+        "RatedPackages": {
-+          "GroupNumber": 0,
-+          "PackageRateDetail": {
-+            "RateType": "PAYOR_LIST_PACKAGE",
-+            "RatedWeightMethod": "ACTUAL",
-+            "BillingWeight": {
-+              "Units": "LB",
-+              "Value": "2.0"
-+            },
-+            "BaseCharge": {
-+              "Currency": "USD",
-+              "Amount": "10.82"
-+            },
-+            "TotalFreightDiscounts": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "NetFreight": {
-+              "Currency": "USD",
-+              "Amount": "10.82"
-+            },
-+            "TotalSurcharges": {
-+              "Currency": "USD",
-+              "Amount": "2.85"
-+            },
-+            "NetFedExCharge": {
-+              "Currency": "USD",
-+              "Amount": "13.67"
-+            },
-+            "TotalTaxes": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "NetCharge": {
-+              "Currency": "USD",
-+              "Amount": "13.67"
-+            },
-+            "TotalRebates": {
-+              "Currency": "USD",
-+              "Amount": "0.0"
-+            },
-+            "Surcharges": [
-+              {
-+                "SurchargeType": "DELIVERY_AREA",
-+                "Level": "PACKAGE",
-+                "Description": "Delivery Area Surcharge Extended",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "1.95"
-+                }
-+              },
-+              {
-+                "SurchargeType": "FUEL",
-+                "Level": "PACKAGE",
-+                "Description": "SmartPost Fuel",
-+                "Amount": {
-+                  "Currency": "USD",
-+                  "Amount": "0.9"
-+                }
-+              }
-+            ]
-+          }
-+        }
-+      }
-+    ]
-+  }
-+}
-\ No newline at end of file
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleFedex/etc/di.xml b/dev/tests/api-functional/_files/Magento/TestModuleFedex/etc/di.xml
-new file mode 100644
-index 00000000000..87067a1ed75
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleFedex/etc/di.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\Fedex\Model\Carrier">
-+        <arguments>
-+            <argument name="soapClientFactory" xsi:type="object">Magento\TestModuleFedex\Model\MockSoapClientFactory</argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleFedex/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModuleFedex/etc/module.xml
-new file mode 100644
-index 00000000000..b6edf2f79b4
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleFedex/etc/module.xml
-@@ -0,0 +1,10 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_TestModuleFedex" />
-+</config>
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleFedex/registration.php b/dev/tests/api-functional/_files/Magento/TestModuleFedex/registration.php
-new file mode 100644
-index 00000000000..7b11c17ff7e
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleFedex/registration.php
-@@ -0,0 +1,11 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+$registrar = new ComponentRegistrar();
-+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleFedex') === null) {
-+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleFedex', __DIR__);
-+}
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/Item.php b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/Item.php
-index 6170c8dea3d..1731a974aae 100644
---- a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/Item.php
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/Item.php
-@@ -9,27 +9,10 @@ namespace Magento\TestModuleGraphQlQuery\Model\Resolver;
- 
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\PostFetchProcessorInterface;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- class Item implements ResolverInterface
- {
--    /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
--    /**
--     * @param ValueFactory $valueFactory
--     */
--    public function __construct(
--        ValueFactory $valueFactory
--    ) {
--        $this->valueFactory = $valueFactory;
--    }
--
-     /**
-      * @inheritdoc
-      */
-@@ -39,7 +22,7 @@ class Item implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ) : Value {
-+    ) {
-         $id = 0;
-         foreach ($args as $key => $argValue) {
-             if ($key === "id") {
-@@ -50,11 +33,6 @@ class Item implements ResolverInterface
-             'item_id' => $id,
-             'name' => "itemName"
-         ];
--
--        $result = function () use ($itemData) {
--            return $itemData;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $itemData;
-     }
- }
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/Model/Resolver/IntegerList.php b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/Model/Resolver/IntegerList.php
-index 878212f4942..34dc92fcbba 100644
---- a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/Model/Resolver/IntegerList.php
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/Model/Resolver/IntegerList.php
-@@ -9,8 +9,6 @@ namespace Magento\TestModuleGraphQlQueryExtension\Model\Resolver;
- 
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Framework\GraphQl\Config\Element\Field;
--use Magento\Framework\GraphQl\Query\Resolver\Value;
--use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-@@ -19,20 +17,7 @@ use Magento\Framework\GraphQl\Query\ResolverInterface;
- class IntegerList implements ResolverInterface
- {
-     /**
--     * @var ValueFactory
--     */
--    private $valueFactory;
--
--    /**
--     * @param ValueFactory $valueFactory
--     */
--    public function __construct(ValueFactory $valueFactory)
--    {
--        $this->valueFactory = $valueFactory;
--    }
--
--    /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(
-         Field $field,
-@@ -40,21 +25,14 @@ class IntegerList implements ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ): Value {
-+    ) {
-         if (!isset($value['item_id'])) {
--            return $this->valueFactory->create(function () {
--                return null;
--            });
-+            return null;
-         }
- 
-         $itemId = $value['item_id'];
- 
-         $resultData = [$itemId + 1, $itemId + 2, $itemId + 3];
--
--        $result = function () use ($resultData) {
--            return $resultData;
--        };
--
--        return $this->valueFactory->create($result);
-+        return $resultData;
-     }
- }
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/etc/extension_attributes.xml b/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/etc/extension_attributes.xml
-index 3bd64a7aff7..8254a9d8e92 100644
---- a/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/etc/extension_attributes.xml
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/etc/extension_attributes.xml
-@@ -31,4 +31,16 @@
-             </join>
-         </attribute>
-     </extension_attributes>
-+    <extension_attributes for="Magento\Sales\Api\Data\OrderInterface">
-+        <attribute code="orderApiTestAttribute" type="Magento\User\Api\Data\UserInterface">
-+            <join reference_table="admin_user"
-+                  join_on_field="store_id"
-+                  reference_field="user_id"
-+            >
-+                <field>firstname</field>
-+                <field>lastname</field>
-+                <field>email</field>
-+            </join>
-+        </attribute>
-+    </extension_attributes>
- </config>
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleUsps/Model/MockAsyncClient.php b/dev/tests/api-functional/_files/Magento/TestModuleUsps/Model/MockAsyncClient.php
-new file mode 100644
-index 00000000000..bd64e02c57c
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleUsps/Model/MockAsyncClient.php
-@@ -0,0 +1,62 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestModuleUsps\Model;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\HTTP\AsyncClient\HttpResponseDeferredInterface;
-+use Magento\Framework\HTTP\AsyncClient\Request;
-+use Magento\Framework\HTTP\AsyncClient\ResponseFactory;
-+use Magento\Framework\HTTP\AsyncClientInterface;
-+
-+/**
-+ * Mock async client returns USPS rate responses
-+ */
-+class MockAsyncClient implements AsyncClientInterface
-+{
-+    /**
-+     * @var MockResponseBodyLoader
-+     */
-+    private $mockResponseBodyLoader;
-+
-+    /**
-+     * @var ResponseFactory
-+     */
-+    private $responseFactory;
-+
-+    /**
-+     * @param MockResponseBodyLoader $mockResponseBodyLoader
-+     * @param ResponseFactory $responseFactory
-+     */
-+    public function __construct(
-+        MockResponseBodyLoader $mockResponseBodyLoader,
-+        ResponseFactory $responseFactory
-+    ) {
-+        $this->mockResponseBodyLoader = $mockResponseBodyLoader;
-+        $this->responseFactory = $responseFactory;
-+    }
-+
-+    /**
-+     * Fetch mock USPS rate response
-+     *
-+     * @param Request $request
-+     * @return HttpResponseDeferredInterface
-+     * @throws LocalizedException
-+     */
-+    public function request(Request $request): HttpResponseDeferredInterface
-+    {
-+        return new MockDeferredResponse(
-+            $this->responseFactory->create(
-+                [
-+                    'statusCode' => 200,
-+                    'headers' => [],
-+                    'body' => $this->mockResponseBodyLoader->loadForRequest($request),
-+                ]
-+            )
-+        );
-+    }
-+}
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleUsps/Model/MockDeferredResponse.php b/dev/tests/api-functional/_files/Magento/TestModuleUsps/Model/MockDeferredResponse.php
-new file mode 100644
-index 00000000000..30c9b108081
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleUsps/Model/MockDeferredResponse.php
-@@ -0,0 +1,64 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestModuleUsps\Model;
-+
-+use Magento\Framework\Async\CancelingDeferredException;
-+use Magento\Framework\HTTP\AsyncClient\HttpResponseDeferredInterface;
-+use Magento\Framework\HTTP\AsyncClient\Response;
-+
-+/**
-+ * Mock for HTTP responses.
-+ */
-+class MockDeferredResponse implements HttpResponseDeferredInterface
-+{
-+    /**
-+     * @var Response
-+     */
-+    private $response;
-+
-+    /**
-+     * MockDeferredResponse constructor.
-+     * @param Response $response
-+     */
-+    public function __construct(Response $response)
-+    {
-+        $this->response = $response;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function cancel(bool $force = false): void
-+    {
-+        throw new CancelingDeferredException('Cannot be canceled');
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function isCancelled(): bool
-+    {
-+        return false;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function isDone(): bool
-+    {
-+        return true;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function get(): Response
-+    {
-+        return $this->response;
-+    }
-+}
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleUsps/Model/MockResponseBodyLoader.php b/dev/tests/api-functional/_files/Magento/TestModuleUsps/Model/MockResponseBodyLoader.php
-new file mode 100644
-index 00000000000..83704333da5
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleUsps/Model/MockResponseBodyLoader.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestModuleUsps\Model;
-+
-+use Magento\Framework\Exception\NotFoundException;
-+use Magento\Framework\HTTP\AsyncClient\Request;
-+use Magento\Framework\Module\Dir;
-+use Magento\Framework\Filesystem\Io\File;
-+
-+/**
-+ * Load mock response body for USPS rate request
-+ */
-+class MockResponseBodyLoader
-+{
-+    private const RESPONSE_FILE_PATTERN = '%s/_files/mock_response_%s.xml';
-+
-+    /**
-+     * @var Dir
-+     */
-+    private $moduleDirectory;
-+
-+    /**
-+     * @var File
-+     */
-+    private $fileIo;
-+
-+    /**
-+     * @param Dir $moduleDirectory
-+     * @param File $fileIo
-+     */
-+    public function __construct(
-+        Dir $moduleDirectory,
-+        File $fileIo
-+    ) {
-+        $this->moduleDirectory = $moduleDirectory;
-+        $this->fileIo = $fileIo;
-+    }
-+
-+    /**
-+     * Loads mock response xml for a given request
-+     *
-+     * @param Request $request
-+     * @return string
-+     * @throws NotFoundException
-+     */
-+    public function loadForRequest(Request $request): string
-+    {
-+        $moduleDir = $this->moduleDirectory->getDir('Magento_TestModuleUsps');
-+
-+        $destination = 'us';
-+        if (strpos($request->getUrl(), 'IntlRateV2Request') !== false) {
-+            $destination = 'ca';
-+        }
-+
-+        $responsePath = sprintf(static::RESPONSE_FILE_PATTERN, $moduleDir, $destination);
-+
-+        if (!$this->fileIo->fileExists($responsePath)) {
-+            throw new NotFoundException(__('%1 is not a valid destination country.', $destination));
-+        }
-+
-+        return $this->fileIo->read($responsePath);
-+    }
-+}
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleUsps/_files/mock_response_ca.xml b/dev/tests/api-functional/_files/Magento/TestModuleUsps/_files/mock_response_ca.xml
-new file mode 100644
-index 00000000000..e2ae700cf7b
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleUsps/_files/mock_response_ca.xml
-@@ -0,0 +1,752 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<IntlRateV2Response>
-+    <Package ID="0">
-+        <Prohibitions>An issue of a publication in which more than 5 percent of its total advertising space is primarily
-+            directed to a Canadian market and which indicates:
-+            (a) Specifically where goods or services may be obtained in Canada, or
-+            (b) Specific items or conditions relating to the sale or provision of goods or services in Canada.
-+            All alcoholic beverages including wines, etc.
-+            An issue of a publication that contains an advertisement primarily directed to a Canadian market is a
-+            prohibited import if that advertisement does not appear in identical form in all editions of the issue
-+            distributed in the country of origin.
-+            Articles so marked as to create the false impression that they were made in Canada, Great Britain or any
-+            other British country.
-+            Commercial tags of metal.
-+            Firearms, except as follows: Firearms may be mailed to Canada provided that they meet the requirements in
-+            DMM 601.11.1, 601.11.2, 601.11.3, and 601.11.6 and that the importer has the required documentation.
-+            Customers must visit http://cbsa-asfc.gc.ca/publications/pub/bsf5044-eng.html prior to mailing for Canadian
-+            import requirements.
-+            Gold bullion, gold dust, and nonmanufactured precious metals.
-+            Non-refillable lighters or any other lighter that contains fuel. New lighters with no fuel may be sent.
-+            Oleomargarine and other butter substitutes, including altered or renovated butter.
-+            Perishable infectious biological substances.
-+            Perishable noninfectious biological substances.
-+            Plumage and skins of wild birds.
-+            Prison-made goods being sold or intended for sale by a person or firm.
-+            Radioactive materials.
-+            Replica or inert munitions, as well as other devices that simulate explosive devices or munitions, including
-+            replica or inert grenades or other simulated military munitions, whether or not such items are for display
-+            purposes.
-+            Reprints of Canadian or British works copyrighted in Canada.
-+            Reproductions of Canadian postage stamps unless printed in publications in black and white only and with a
-+            defacing line drawn across each reproduction.
-+            Shipments bearing caution labels indicating the contents are flammable.
-+            Smoke-making devices for motor vehicles and boats.
-+            Used or secondhand hives or bee supplies.
-+        </Prohibitions>
-+        <Restrictions>Coins; banknotes; currency notes; securities payable to bearer; traveler's checks; gold, silver,
-+            platinum, manufactured or not; jewelry; and other valuable articles may be sent only in registered items
-+            First-Class Package International Service with Registered Mail service.
-+            Exceptions:
-+            Coins sent to or from collectors or dealers may be mailed in ordinary (uninsured) parcels.
-+            Drugs and medicines must comply with Canadian law.
-+            Eggs for hatching must be packed in new, clean containers and accompanied by a certificate issued by a
-+            veterinarian of the U.S. Department of Agriculture, or one issued by a State veterinarian and endorsed by a
-+            veterinarian of that Bureau, stating that to the best of his or her knowledge the eggs come from a flock
-+            that is free from Newcastle disease, fowl pest, or fowl typhoid. See 135.3 for method of packing.
-+            Meat and meat food products must be accompanied by an export certificate issued by the U.S. Department of
-+            Agriculture and labeled in accordance with Canadian regulations. Exception to these requirements are:
-+            1. bona fide sample shipments weighing less than 10 kg;
-+            2. meat products addressed to a government department or agency;
-+            3. meat products intended for personal consumption when they enter Canada in the possession of the importer.
-+            Precious stones, set or not set; all items used as dress ornaments and coming under the term "jewelry"
-+            including articles of gold or other precious metal for personal use such as cigarette holders, cases, powder
-+            cases, card cases, opera glasses, fountain pens, watches, etc., are permitted in insured parcels provided
-+            the articles have value not over $5 U.S. A parcel containing a number of such articles valued at $5 or less
-+            may be insured for the total value of the contents up to a maximum of $200.
-+            Veterinary biological products including serums and vaccines must be accompanied by a permit issued by the
-+            Veterinary Director General, Ministry of Agriculture of Canada.
-+        </Restrictions>
-+        <Observations>1. Electronic smoking products (i.e., electronic products for the vaporization and administration
-+            of inhaled doses of nicotine including electronic cigarettes, cigars, cigarillos, and pipes, as well as
-+            cartridges of nicotine solutions and related products) require market authorization by Department of Health
-+            Canada prior to being imported. Failure to obtain this authorization will result in the items being refused
-+            entry by Canada Border Services Agency (CBSA). For additional information, refer to the Department of Health
-+            Canada website at http://www.hc-sc.gc.ca/dhp-mps/prodpharma/applic-demande/pol/notice_avis_e-cig-eng.php.
-+            2. Banknotes valued at $100 or more must be put up in a compact package and securely tied with strong twine
-+            before wrapping. The wrapper must be linen or other strong, woven material, linen lined paper, or two
-+            thicknesses of strong kraft paper. After wrapping, the package must be again securely tied or stitched and
-+            sealed at the points of closing.
-+            3. The name of the Canadian province in which the office of destination is located must appear as part of
-+            the address.
-+            4. The following must not be accepted for insurance:
-+            Bees, postage stamps (canceled and uncanceled) and albums in which they are mounted, and parcels addressed
-+            to CFPOs.
-+            5. Canadian Forces Mail (CFPO) is processed through Canadian military post offices and must be addressed in
-+            the following manner:
-+            (a) NUMBER, RANK, NAME UNIT
-+            (b) CFPO (NUMBER)
-+            (c) BELLEVILLE ON K0K 3R0
-+            (d) CANADA
-+            Maximum weight limits for mail addressed to members of the Canadian Forces based outside of Canada (CFPO) is
-+            22 pounds. Parcels for CFPO addresses may not be insured. Direct sacks of printed matter (M-bags) are not
-+            permitted for CFPO addresses.
-+            6. A letter fully prepaid and bearing the same address as that of a parcel may be tied or otherwise securely
-+            attached to the outside of the parcel. Stamps to cover postage on the parcel must be affixed to the wrapper
-+            of the parcel. Stamps to pay postage on the letter must be affixed to the envelope thereof.
-+            7. Certain types of merchandise must be marked to show country of origin in the manner prescribed by the
-+            Canadian customs regulations.
-+            8. Goods valued under 20 Canadian dollars are duty and excise tax exempt. Goods over 20 Canadian dollars
-+            will be subject to the applicable duties and excise taxes. Gift shipments received by mail that are valued
-+            under 60 Canadian dollars are duty and excise tax exempt.
-+            9. For all casual and commercial goods valued at or under 1,600 Canadian dollars, Canada Post will collect
-+            assessed duties, excise taxes, and a handling fee from the addressee. This handling fee is set by Canada
-+            Post (see http://www.canadapost.ca/tools/pg/manual/PGcustoms-e.asp). All commercial mail items over 1,600
-+            Canadian dollars will be held by Canada Customs and Excise until proper invoice and accounting documentation
-+            is provided by the addressee.
-+            10. The Canada Customs Invoice can be obtained from stationery, office supply, or printing companies. If
-+            mailers are unable to obtain the Canada Customs Invoice locally, they should visit the following Web site:
-+            www.canadapost.ca. In addition, commercial invoices are acceptable provided that each invoice has the
-+            required information for customs purposes.
-+            11. Information on Canadian customs regulations may be obtained from the Office of International
-+            Marketing/223, Bureau of International Commerce, Department of Commerce, Washington, DC 20230, or any field
-+            office of that Department.
-+            Obtaining post code information:
-+            12. Information on Canadian post code directories can be obtained from:
-+            (a) NATIONAL PHILATELIC CENTER
-+            CANADA POST CORPORATION
-+            STATION 1
-+            ANTIGONISH NS B2G 2R8
-+            Telephone: 1-800-565-4362
-+            Fax: 1-902-863-6796
-+            (b) To obtain Canadian post codes for specific addresses, call the General Information line at
-+            1-416-979-8822 or access the Canada Post Corporation web site on the Internet at http://www.canadapost.ca.
-+            13. Pursuant to the Canada Customs Act and a need to heighten border security, Canada will deny entry of all
-+            postal items (except postcards) that do not bear complete sender and addressee information in roman letters
-+            and arabic numerals.
-+        </Observations>
-+        <CustomsForms>First-Class Mail International items and Priority Mail International Flat Rate Envelopes and Small
-+            Flat Rate Boxes:
-+            PS Form 2976 (see 123.61)
-+            Priority Mail International parcels:
-+            PS Form 2976-A inside 2976-E (envelope)
-+        </CustomsForms>
-+        <ExpressMail>Country Code:
-+            CA
-+
-+            Reciprocal Service Name:
-+            There is no reciprocal service.
-+
-+            Required Customs Form/Endorsement
-+            1. Business papers and commercial documents.
-+            PS Form 2976-B placed inside PS Form 2976-E (plastic envelope).
-+
-+            2. Merchandise samples and gift shipments (non-commercial parcels).
-+            PS Form 2976-B placed inside PS Form 2976-E (plastic envelope).
-+
-+            3. Merchandise (commercial shipments) and all articles subject to customs duty.
-+            PS Form 2976-B placed inside PS Form 2976-E (plastic envelope).
-+
-+
-+            Notes:
-+            1. Gift shipments (non-commercial parcels) require a sales receipt, invoice or other documentation to
-+            support the declared value.
-+            2. Coins; banknotes; currency notes, including paper money; securities of any kind payable to bearer;
-+            traveler's checks; platinum, gold, and silver; precious stones; jewelry; watches; and other valuable
-+            articles are prohibited in Priority Mail Express International shipments to Canada.
-+            3. Priority Mail Express International shipments may have a street address or a post office box address. A
-+            local telephone number for the addressee MUST be provided for shipments addressed to a post office box
-+            address. A local telephone number for the addressee should be provided if possible for shipments to a street
-+            address.
-+
-+            Areas Served: All
-+        </ExpressMail>
-+        <AreasServed>Please reference Express Mail for Areas Served.</AreasServed>
-+        <AdditionalRestrictions>No Additional Restrictions Data found.</AdditionalRestrictions>
-+        <Service ID="12">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>86.65</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>106</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>1 - 3 business days to many major markets</SvcCommitments>
-+            <SvcDescription>USPS GXG&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Envelopes</SvcDescription>
-+            <MaxDimensions>USPS-Produced regular size cardboard envelope (12-1/2" x 9-1/2"), the legal-sized cardboard
-+                envelope (15" x 9-1/2") and the GXG Tyvek envelope (15-1/2" x 12-1/2")
-+            </MaxDimensions>
-+            <MaxWeight>70</MaxWeight>
-+        </Service>
-+        <Service ID="1">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>53.20</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>107</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>Tue, Jul 02, 2019 Guaranteed</SvcCommitments>
-+            <SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</SvcDescription>
-+            <MaxDimensions>Max. length 42", max. length plus girth combined 79"</MaxDimensions>
-+            <MaxWeight>66</MaxWeight>
-+            <GuaranteeAvailability>07/02/2019</GuaranteeAvailability>
-+        </Service>
-+        <Service ID="10">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>44.50</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>107</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>Tue, Jul 02, 2019 Guaranteed</SvcCommitments>
-+            <SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Flat Rate Envelope</SvcDescription>
-+            <MaxDimensions>USPS-Produced Envelope: 12-1/2" x 9-1/2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
-+            <MaxWeight>4</MaxWeight>
-+            <GuaranteeAvailability>07/02/2019</GuaranteeAvailability>
-+        </Service>
-+        <Service ID="17">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>44.50</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>107</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>Tue, Jul 02, 2019 Guaranteed</SvcCommitments>
-+            <SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Legal Flat Rate Envelope</SvcDescription>
-+            <MaxDimensions>USPS-Produced Envelope: 15" x 9-1/2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
-+            <MaxWeight>4</MaxWeight>
-+            <GuaranteeAvailability>07/02/2019</GuaranteeAvailability>
-+        </Service>
-+        <Service ID="27">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>44.50</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>107</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>Tue, Jul 02, 2019 Guaranteed</SvcCommitments>
-+            <SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Padded Flat Rate Envelope</SvcDescription>
-+            <MaxDimensions>USPS-Produced Envelope: 12-1/2" x 9-1/2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
-+            <MaxWeight>4</MaxWeight>
-+            <GuaranteeAvailability>07/02/2019</GuaranteeAvailability>
-+        </Service>
-+        <Service ID="2">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>37.05</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>108</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>105</ServiceID>
-+                    <ServiceName>Return Receipt</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>4.10</Price>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
-+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt;</SvcDescription>
-+            <MaxDimensions>Max. length 79", max. length plus girth 108"</MaxDimensions>
-+            <MaxWeight>66</MaxWeight>
-+        </Service>
-+        <Service ID="11">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>64.50</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>108</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>105</ServiceID>
-+                    <ServiceName>Return Receipt</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>4.10</Price>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
-+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Large Flat Rate Box</SvcDescription>
-+            <MaxDimensions>USPS-Produced Box: 23-11/16" x 11-3/4" x 3" or 12" x 12" x 5-1/2"&lt;br>Maximum weight 20
-+                pounds.
-+            </MaxDimensions>
-+            <MaxWeight>20</MaxWeight>
-+        </Service>
-+        <Service ID="9">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>49.60</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>108</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>105</ServiceID>
-+                    <ServiceName>Return Receipt</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>4.10</Price>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
-+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Medium Flat Rate Box</SvcDescription>
-+            <MaxDimensions>USPS-Produced Box: 13-5/8" x 11-7/8" x 3-3/8" or 11" x 8-1/2" x 5-1/2"&lt;br>Maximum weight
-+                20 pounds.
-+            </MaxDimensions>
-+            <MaxWeight>20</MaxWeight>
-+        </Service>
-+        <Service ID="16">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>26.85</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>108</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>105</ServiceID>
-+                    <ServiceName>Return Receipt</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>4.10</Price>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
-+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Small Flat Rate Box</SvcDescription>
-+            <MaxDimensions>USPS-Produced Box: 8-5/8" x 5-3/8" x 1-5/8"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
-+            <MaxWeight>4</MaxWeight>
-+        </Service>
-+        <Service ID="24">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>26.85</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>108</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>105</ServiceID>
-+                    <ServiceName>Return Receipt</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>4.10</Price>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
-+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; DVD Flat Rate priced box</SvcDescription>
-+            <MaxDimensions>USPS-Produced Box: 7-9/16" x 5-7/16" x 5/8"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
-+            <MaxWeight>4</MaxWeight>
-+        </Service>
-+        <Service ID="25">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>26.85</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>108</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>105</ServiceID>
-+                    <ServiceName>Return Receipt</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>4.10</Price>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
-+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Large Video Flat Rate priced box</SvcDescription>
-+            <MaxDimensions>USPS-Produced Box: 9-1/4" x 6-1/4" x 2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
-+            <MaxWeight>4</MaxWeight>
-+        </Service>
-+        <Service ID="8">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>25.85</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>108</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>105</ServiceID>
-+                    <ServiceName>Return Receipt</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>4.10</Price>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
-+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Flat Rate Envelope</SvcDescription>
-+            <MaxDimensions>USPS-Produced Envelope: 12-1/2" x 9-1/2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
-+            <MaxWeight>4</MaxWeight>
-+        </Service>
-+        <Service ID="22">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>25.85</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>108</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>105</ServiceID>
-+                    <ServiceName>Return Receipt</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>4.10</Price>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
-+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Legal Flat Rate Envelope</SvcDescription>
-+            <MaxDimensions>USPS-Produced Envelope: 15" x 9-1/2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
-+            <MaxWeight>4</MaxWeight>
-+        </Service>
-+        <Service ID="23">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>25.85</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>108</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>105</ServiceID>
-+                    <ServiceName>Return Receipt</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>4.10</Price>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
-+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Padded Flat Rate Envelope</SvcDescription>
-+            <MaxDimensions>USPS-Produced Envelope: 12-1/2" x 9-1/2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
-+            <MaxWeight>4</MaxWeight>
-+        </Service>
-+        <Service ID="18">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>25.85</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>108</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>105</ServiceID>
-+                    <ServiceName>Return Receipt</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>4.10</Price>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
-+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Gift Card Flat Rate Envelope</SvcDescription>
-+            <MaxDimensions>USPS-Produced Envelope: 10" x 7"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
-+            <MaxWeight>4</MaxWeight>
-+        </Service>
-+        <Service ID="20">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>25.85</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>108</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>105</ServiceID>
-+                    <ServiceName>Return Receipt</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>4.10</Price>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
-+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Small Flat Rate Envelope</SvcDescription>
-+            <MaxDimensions>USPS-Produced Envelope: 10" x 6"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
-+            <MaxWeight>4</MaxWeight>
-+        </Service>
-+        <Service ID="19">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>25.85</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>108</ServiceID>
-+                    <ServiceName>Insurance</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                    <DeclaredValueRequired>True</DeclaredValueRequired>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>105</ServiceID>
-+                    <ServiceName>Return Receipt</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>4.10</Price>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
-+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Window Flat Rate Envelope</SvcDescription>
-+            <MaxDimensions>USPS-Produced Envelope: 10" x 5" or 12-1/2" x 9-1/2"&lt;br>Maximum weight 4 pounds.
-+            </MaxDimensions>
-+            <MaxWeight>4</MaxWeight>
-+        </Service>
-+        <Service ID="15">
-+            <Pounds>2</Pounds>
-+            <Ounces>0.00000000</Ounces>
-+            <MailType>All</MailType>
-+            <Container>VARIABLE</Container>
-+            <Size>REGULAR</Size>
-+            <Width>0.0</Width>
-+            <Length>0.0</Length>
-+            <Height>0.0</Height>
-+            <Girth>0.0</Girth>
-+            <Country>CANADA</Country>
-+            <Postage>17.25</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>109</ServiceID>
-+                    <ServiceName>Electronic USPS Delivery Confirmation&#8482; International (E-USPS DELCON INTL&#8482;)</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>0.00</Price>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>100</ServiceID>
-+                    <ServiceName>Certificate of Mailing</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>1.45</Price>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>103</ServiceID>
-+                    <ServiceName>Registered Mail</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>16.00</Price>
-+                </ExtraService>
-+                <ExtraService>
-+                    <ServiceID>105</ServiceID>
-+                    <ServiceName>Return Receipt</ServiceName>
-+                    <Available>True</Available>
-+                    <Price>4.10</Price>
-+                </ExtraService>
-+            </ExtraServices>
-+            <ValueOfContents>20.00</ValueOfContents>
-+            <InsComment>SERVICE</InsComment>
-+            <SvcCommitments>Varies by destination</SvcCommitments>
-+            <SvcDescription>First-Class Package International Service&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</SvcDescription>
-+            <MaxDimensions>Other than rolls: Max. length 24", max length, height and depth (thickness) combined 36"&lt;br>Rolls:
-+                Max. length 36". Max length and twice the diameter combined 42"
-+            </MaxDimensions>
-+            <MaxWeight>4</MaxWeight>
-+        </Service>
-+    </Package>
-+</IntlRateV2Response>
-\ No newline at end of file
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleUsps/_files/mock_response_us.xml b/dev/tests/api-functional/_files/Magento/TestModuleUsps/_files/mock_response_us.xml
-new file mode 100644
-index 00000000000..bda939dd88d
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleUsps/_files/mock_response_us.xml
-@@ -0,0 +1,102 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<RateV4Response>
-+    <Package ID="0">
-+        <ZipOrigination>90210</ZipOrigination>
-+        <ZipDestination>75477</ZipDestination>
-+        <Pounds>2</Pounds>
-+        <Ounces>0.00000000</Ounces>
-+        <Size>REGULAR</Size>
-+        <Machinable>TRUE</Machinable>
-+        <Zone>6</Zone>
-+        <Postage CLASSID="3">
-+            <MailService>Priority Mail Express 2-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</MailService>
-+            <Rate>41.65</Rate>
-+        </Postage>
-+        <Postage CLASSID="2">
-+            <MailService>Priority Mail Express 2-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Hold For Pickup</MailService>
-+            <Rate>41.65</Rate>
-+        </Postage>
-+        <Postage CLASSID="13">
-+            <MailService>Priority Mail Express 2-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Flat Rate Envelope</MailService>
-+            <Rate>25.50</Rate>
-+        </Postage>
-+        <Postage CLASSID="27">
-+            <MailService>Priority Mail Express 2-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Flat Rate Envelope Hold For Pickup</MailService>
-+            <Rate>25.50</Rate>
-+        </Postage>
-+        <Postage CLASSID="30">
-+            <MailService>Priority Mail Express 2-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Legal Flat Rate Envelope</MailService>
-+            <Rate>25.70</Rate>
-+        </Postage>
-+        <Postage CLASSID="31">
-+            <MailService>Priority Mail Express 2-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Legal Flat Rate Envelope Hold For Pickup</MailService>
-+            <Rate>25.70</Rate>
-+        </Postage>
-+        <Postage CLASSID="62">
-+            <MailService>Priority Mail Express 2-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Padded Flat Rate Envelope</MailService>
-+            <Rate>26.20</Rate>
-+        </Postage>
-+        <Postage CLASSID="63">
-+            <MailService>Priority Mail Express 2-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Padded Flat Rate Envelope Hold For Pickup</MailService>
-+            <Rate>26.20</Rate>
-+        </Postage>
-+        <Postage CLASSID="1">
-+            <MailService>Priority Mail 3-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</MailService>
-+            <Rate>11.20</Rate>
-+        </Postage>
-+        <Postage CLASSID="22">
-+            <MailService>Priority Mail 3-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Large Flat Rate Box</MailService>
-+            <Rate>19.95</Rate>
-+        </Postage>
-+        <Postage CLASSID="17">
-+            <MailService>Priority Mail 3-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Medium Flat Rate Box</MailService>
-+            <Rate>14.35</Rate>
-+        </Postage>
-+        <Postage CLASSID="28">
-+            <MailService>Priority Mail 3-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Small Flat Rate Box</MailService>
-+            <Rate>7.90</Rate>
-+        </Postage>
-+        <Postage CLASSID="16">
-+            <MailService>Priority Mail 3-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Flat Rate Envelope</MailService>
-+            <Rate>7.35</Rate>
-+        </Postage>
-+        <Postage CLASSID="44">
-+            <MailService>Priority Mail 3-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Legal Flat Rate Envelope</MailService>
-+            <Rate>7.65</Rate>
-+        </Postage>
-+        <Postage CLASSID="29">
-+            <MailService>Priority Mail 3-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Padded Flat Rate Envelope</MailService>
-+            <Rate>8.00</Rate>
-+        </Postage>
-+        <Postage CLASSID="38">
-+            <MailService>Priority Mail 3-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Gift Card Flat Rate Envelope</MailService>
-+            <Rate>7.35</Rate>
-+        </Postage>
-+        <Postage CLASSID="42">
-+            <MailService>Priority Mail 3-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Small Flat Rate Envelope</MailService>
-+            <Rate>7.35</Rate>
-+        </Postage>
-+        <Postage CLASSID="40">
-+            <MailService>Priority Mail 3-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Window Flat Rate Envelope</MailService>
-+            <Rate>7.35</Rate>
-+        </Postage>
-+        <Postage CLASSID="4">
-+            <MailService>USPS Retail Ground&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt;</MailService>
-+            <Rate>11.17</Rate>
-+        </Postage>
-+        <Postage CLASSID="6">
-+            <MailService>Media Mail Parcel</MailService>
-+            <Rate>3.27</Rate>
-+        </Postage>
-+        <Postage CLASSID="7">
-+            <MailService>Library Mail Parcel</MailService>
-+            <Rate>3.10</Rate>
-+        </Postage>
-+    </Package>
-+</RateV4Response>
-\ No newline at end of file
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleUsps/etc/di.xml b/dev/tests/api-functional/_files/Magento/TestModuleUsps/etc/di.xml
-new file mode 100644
-index 00000000000..817121eb9f5
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleUsps/etc/di.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\Usps\Model\Carrier">
-+        <arguments>
-+            <argument name="httpClient" xsi:type="object">Magento\TestModuleUsps\Model\MockAsyncClient</argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleUsps/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModuleUsps/etc/module.xml
-new file mode 100644
-index 00000000000..9318240d90e
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleUsps/etc/module.xml
-@@ -0,0 +1,10 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_TestModuleUsps" />
-+</config>
-diff --git a/dev/tests/api-functional/_files/Magento/TestModuleUsps/registration.php b/dev/tests/api-functional/_files/Magento/TestModuleUsps/registration.php
-new file mode 100644
-index 00000000000..3d45a323b52
---- /dev/null
-+++ b/dev/tests/api-functional/_files/Magento/TestModuleUsps/registration.php
-@@ -0,0 +1,11 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+$registrar = new ComponentRegistrar();
-+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleUsps') === null) {
-+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleUsps', __DIR__);
-+}
-diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php
-index 64ad4452857..5af6413840c 100644
---- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php
-+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php
-@@ -29,8 +29,6 @@ class Client
-     private $json;
- 
-     /**
--     * CurlClient constructor.
--     *
-      * @param CurlClient|null $curlClient
-      * @param JsonSerializer|null $json
-      */
-@@ -53,34 +51,114 @@ class Client
-      * @return array|string|int|float|bool
-      * @throws \Exception
-      */
--    public function postQuery(string $query, array $variables = [], string $operationName = '', array $headers = [])
-+    public function post(string $query, array $variables = [], string $operationName = '', array $headers = [])
-     {
-         $url = $this->getEndpointUrl();
-         $headers = array_merge($headers, ['Accept: application/json', 'Content-Type: application/json']);
-         $requestArray = [
-             'query' => $query,
--            'variables' => empty($variables) ? $variables : null,
--            'operationName' => empty($operationName) ? $operationName : null
-+            'variables' => !empty($variables) ? $variables : null,
-+            'operationName' => !empty($operationName) ? $operationName : null
-         ];
-         $postData = $this->json->jsonEncode($requestArray);
-+        try {
-+            $responseBody = $this->curlClient->post($url, $postData, $headers);
-+        } catch (\Exception $e) {
-+            // if response code > 400 then response is the exception message
-+            $responseBody = $e->getMessage();
-+        }
- 
--        $responseBody = $this->curlClient->post($url, $postData, $headers);
--        $responseBodyArray = $this->json->jsonDecode($responseBody);
-+        return $this->processResponse($responseBody);
-+    }
- 
--        if (!is_array($responseBodyArray)) {
--            throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
-+    /**
-+     * Perform HTTP GET request for query
-+     *
-+     * @param string $query
-+     * @param array $variables
-+     * @param string $operationName
-+     * @param array $headers
-+     * @return mixed
-+     * @throws \Exception
-+     */
-+    public function get(string $query, array $variables = [], string $operationName = '', array $headers = [])
-+    {
-+        $url = $this->getEndpointUrl();
-+        $requestArray = [
-+            'query' => $query,
-+            'variables' => $variables ? $this->json->jsonEncode($variables) : null,
-+            'operationName' => $operationName ?? null
-+        ];
-+        array_filter($requestArray);
-+
-+        try {
-+            $responseBody = $this->curlClient->get($url, $requestArray, $headers);
-+        } catch (\Exception $e) {
-+            // if response code > 400 then response is the exception message
-+            $responseBody = $e->getMessage();
-         }
-+        return $this->processResponse($responseBody);
-+    }
- 
--        $this->processErrors($responseBodyArray);
-+    /**
-+     * Process response from GraphQl server
-+     *
-+     * @param string $response
-+     * @return mixed
-+     * @throws \Exception
-+     */
-+    private function processResponse(string $response)
-+    {
-+        $responseArray = $this->json->jsonDecode($response);
-+
-+        if (!is_array($responseArray)) {
-+            //phpcs:ignore Magento2.Exceptions.DirectThrow
-+            throw new \Exception('Unknown GraphQL response body: ' . $response);
-+        }
-+
-+        $this->processErrors($responseArray);
- 
--        if (!isset($responseBodyArray['data'])) {
--            throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
--        } else {
--            return $responseBodyArray['data'];
-+        if (!isset($responseArray['data'])) {
-+            //phpcs:ignore Magento2.Exceptions.DirectThrow
-+            throw new \Exception('Unknown GraphQL response body: ' . $response);
-         }
-+
-+        return $responseArray['data'];
-     }
- 
-     /**
-+     * Perform HTTP GET request, return response data and headers
-+     *
-+     * @param string $query
-+     * @param array $variables
-+     * @param string $operationName
-+     * @param array $headers
-+     * @return array
-+     */
-+    public function getWithResponseHeaders(
-+        string $query,
-+        array $variables = [],
-+        string $operationName = '',
-+        array $headers = []
-+    ): array {
-+        $url = $this->getEndpointUrl();
-+        $requestArray = [
-+            'query' => $query,
-+            'variables' => $variables ? $this->json->jsonEncode($variables) : null,
-+            'operationName' => !empty($operationName) ? $operationName : null
-+        ];
-+        array_filter($requestArray);
-+
-+        $response = $this->curlClient->getWithFullResponse($url, $requestArray, $headers);
-+        $responseBody = $this->processResponse($response['body']);
-+        $responseHeaders = !empty($response['header']) ? $this->processResponseHeaders($response['header']) : [];
-+
-+        return ['headers' => $responseHeaders, 'body' => $responseBody];
-+    }
-+
-+    /**
-+     * Process errors
-+     *
-      * @param array $responseBodyArray
-      * @throws \Exception
-      */
-@@ -102,13 +180,19 @@ class Client
-                     }
-                 }
- 
--                throw new \Exception('GraphQL response contains errors: ' . $errorMessage);
-+                throw new ResponseContainsErrorsException(
-+                    'GraphQL response contains errors: ' . $errorMessage,
-+                    $responseBodyArray
-+                );
-             }
-+            //phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception('GraphQL responded with an unknown error: ' . json_encode($responseBodyArray));
-         }
-     }
- 
-     /**
-+     * Get endpoint url
-+     *
-      * @return string resource URL
-      * @throws \Exception
-      */
-@@ -116,4 +200,27 @@ class Client
-     {
-         return rtrim(TESTS_BASE_URL, '/') . '/graphql';
-     }
-+
-+    /**
-+     * Parse response headers into associative array
-+     *
-+     * @param string $headers
-+     * @return array
-+     */
-+    private function processResponseHeaders(string $headers): array
-+    {
-+        $headersArray = [];
-+
-+        $headerLines = preg_split('/((\r?\n)|(\r\n?))/', $headers);
-+        foreach ($headerLines as $headerLine) {
-+            $headerParts = preg_split('/:/', $headerLine);
-+            if (count($headerParts) == 2) {
-+                $headersArray[trim($headerParts[0])] = trim($headerParts[1]);
-+            } elseif (preg_match('/HTTP\/[\.0-9]+/', $headerLine)) {
-+                $headersArray[trim('Status-Line')] = trim($headerLine);
-+            }
-+        }
-+
-+        return $headersArray;
-+    }
- }
-diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/ResponseContainsErrorsException.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/ResponseContainsErrorsException.php
-new file mode 100644
-index 00000000000..568de57543d
---- /dev/null
-+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/ResponseContainsErrorsException.php
-@@ -0,0 +1,41 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestFramework\TestCase\GraphQl;
-+
-+/**
-+ * Response contains errors exception
-+ */
-+class ResponseContainsErrorsException extends \Exception
-+{
-+    /**
-+     * @var array
-+     */
-+    private $responseData;
-+
-+    /**
-+     * @param string $message
-+     * @param array $responseData
-+     * @param \Exception|null $cause
-+     * @param int $code
-+     */
-+    public function __construct(string $message, array $responseData, \Exception $cause = null, int $code = 0)
-+    {
-+        parent::__construct($message, $code, $cause);
-+        $this->responseData = $responseData;
-+    }
-+
-+    /**
-+     * Get response data
-+     *
-+     * @return array
-+     */
-+    public function getResponseData(): array
-+    {
-+        return $this->responseData;
-+    }
-+}
-diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
-index 84ac6360643..94eb5ddec86 100644
---- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
-+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
-@@ -6,6 +6,7 @@
- namespace Magento\TestFramework\TestCase;
- 
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Request\Http;
- 
- /**
-  * Test case for Web API functional tests for Graphql.
-@@ -27,13 +28,15 @@ abstract class GraphQlAbstract extends WebapiAbstract
-     private $appCache;
- 
-     /**
--     * Perform GraphQL call to the system under test.
-+     * Perform GraphQL query call via GET to the system under test.
-      *
-      * @see \Magento\TestFramework\TestCase\GraphQl\Client::call()
-      * @param string $query
-      * @param array $variables
-      * @param string $operationName
-+     * @param array $headers
-      * @return array|int|string|float|bool GraphQL call results
-+     * @throws \Exception
-      */
-     public function graphQlQuery(
-         string $query,
-@@ -41,7 +44,7 @@ abstract class GraphQlAbstract extends WebapiAbstract
-         string $operationName = '',
-         array $headers = []
-     ) {
--        return $this->getGraphQlClient()->postQuery(
-+        return $this->getGraphQlClient()->get(
-             $query,
-             $variables,
-             $operationName,
-@@ -50,11 +53,62 @@ abstract class GraphQlAbstract extends WebapiAbstract
-     }
- 
-     /**
-+     * Perform GraphQL mutations call via POST to the system under test.
-+     *
-+     * @see \Magento\TestFramework\TestCase\GraphQl\Client::call()
-+     * @param string $query
-+     * @param array $variables
-+     * @param string $operationName
-+     * @param array $headers
-+     * @return array|int|string|float|bool GraphQL call results
-+     * @throws \Exception
-+     */
-+    public function graphQlMutation(
-+        string $query,
-+        array $variables = [],
-+        string $operationName = '',
-+        array $headers = []
-+    ) {
-+        return $this->getGraphQlClient()->post(
-+            $query,
-+            $variables,
-+            $operationName,
-+            $this->composeHeaders($headers)
-+        );
-+    }
-+
-+    /**
-+     * Perform GraphQL query via GET and returns only the response headers
-+     *
-+     * @param string $query
-+     * @param array $variables
-+     * @param string $operationName
-+     * @param array $headers
-+     * @return array
-+     */
-+    public function graphQlQueryWithResponseHeaders(
-+        string $query,
-+        array $variables = [],
-+        string $operationName = '',
-+        array $headers = []
-+    ): array {
-+        return $this->getGraphQlClient()->getWithResponseHeaders(
-+            $query,
-+            $variables,
-+            $operationName,
-+            $this->composeHeaders($headers)
-+        );
-+    }
-+
-+    /**
-+     * Compose headers
-+     *
-+     * @param array $headers
-      * @return string[]
-      */
--    private function composeHeaders($headers)
-+    private function composeHeaders(array $headers): array
-     {
--        $headersArray =[];
-+        $headersArray = [];
-         foreach ($headers as $key => $value) {
-             $headersArray[] = sprintf('%s: %s', $key, $value);
-         }
-@@ -98,4 +152,31 @@ abstract class GraphQlAbstract extends WebapiAbstract
-         }
-         return $this->graphQlClient;
-     }
-+
-+    /**
-+     * Compare actual response fields with expected
-+     *
-+     * @param array $actualResponse
-+     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
-+     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
-+     */
-+    protected function assertResponseFields($actualResponse, $assertionMap)
-+    {
-+        foreach ($assertionMap as $key => $assertionData) {
-+            $expectedValue = isset($assertionData['expected_value'])
-+                ? $assertionData['expected_value']
-+                : $assertionData;
-+            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
-+            self::assertNotNull(
-+                $expectedValue,
-+                "Value of '{$responseField}' field must not be NULL"
-+            );
-+            self::assertEquals(
-+                $expectedValue,
-+                $actualResponse[$responseField],
-+                "Value of '{$responseField}' field in response does not match expected value: "
-+                . var_export($expectedValue, true)
-+            );
-+        }
-+    }
- }
-diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/HttpClient/CurlClient.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/HttpClient/CurlClient.php
-index 787f207ef33..67691a3c909 100644
---- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/HttpClient/CurlClient.php
-+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/HttpClient/CurlClient.php
-@@ -32,6 +32,25 @@ class CurlClient
-         return $resp["body"];
-     }
- 
-+    /**
-+     * Perform a HTTP GET request and return the full response
-+     *
-+     * @param string $url
-+     * @param array $data
-+     * @param array $headers
-+     * @return array
-+     */
-+    public function getWithFullResponse($url, $data = [], $headers = []): array
-+    {
-+        if (!empty($data)) {
-+            $url .= '?' . http_build_query($data);
-+        }
-+
-+        $curlOpts = [];
-+        $curlOpts[CURLOPT_CUSTOMREQUEST] = \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET;
-+        return $this->invokeApi($url, $curlOpts, $headers);
-+    }
-+
-     /**
-      * Perform HTTP DELETE request
-      *
-@@ -98,8 +117,10 @@ class CurlClient
-     public function invokeApi($url, $additionalCurlOpts, $headers = [])
-     {
-         // initialize cURL
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         $curl = curl_init($url);
-         if ($curl === false) {
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception("Error Initializing cURL for baseUrl: " . $url);
-         }
- 
-@@ -108,28 +129,40 @@ class CurlClient
- 
-         // add CURL opts
-         foreach ($curlOpts as $opt => $val) {
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             curl_setopt($curl, $opt, $val);
-         }
- 
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         $response = curl_exec($curl);
-         if ($response === false) {
--            throw new \Exception(curl_error($curl));
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+            $error = curl_error($curl);
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-+            throw new \Exception($error);
-         }
- 
-         $resp = [];
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         $headerSize = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
-         $resp["header"] = substr($response, 0, $headerSize);
-         $resp["body"] = substr($response, $headerSize);
- 
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         $resp["meta"] = curl_getinfo($curl);
-         if ($resp["meta"] === false) {
--            throw new \Exception(curl_error($curl));
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+            $error = curl_error($curl);
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-+            throw new \Exception($error);
-         }
- 
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         curl_close($curl);
- 
-         $meta = $resp["meta"];
-         if ($meta && $meta['http_code'] >= 400) {
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception($resp["body"], $meta['http_code']);
-         }
- 
-diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/HttpClient/CurlClientWithCookies.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/HttpClient/CurlClientWithCookies.php
-index ecd748d89bb..1dd9d17f904 100644
---- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/HttpClient/CurlClientWithCookies.php
-+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/HttpClient/CurlClientWithCookies.php
-@@ -23,8 +23,6 @@ class CurlClientWithCookies
-     protected $jsonSerializer;
- 
-     /**
--     * CurlClient constructor.
--     *
-      * @param CurlClient $curlClient
-      * @param \Magento\TestFramework\Helper\JsonSerializer $jsonSerializer
-      */
-@@ -38,6 +36,8 @@ class CurlClientWithCookies
-     }
- 
-     /**
-+     * Compose the resource url
-+     *
-      * @param string $resourcePath Resource URL like /V1/Resource1/123
-      * @return string resource URL
-      * @throws \Exception
-@@ -82,7 +82,7 @@ class CurlClientWithCookies
-      *      ],
-      *  ]
-      *
--     * @param $headerBlock
-+     * @param string $headerBlock
-      * @return array
-      */
-     private function cookieParse($headerBlock)
-diff --git a/dev/tests/api-functional/phpunit_graphql.xml.dist b/dev/tests/api-functional/phpunit_graphql.xml.dist
-index 4a57c338ca3..aa1899d88f4 100644
---- a/dev/tests/api-functional/phpunit_graphql.xml.dist
-+++ b/dev/tests/api-functional/phpunit_graphql.xml.dist
-@@ -52,5 +52,58 @@
-     <!-- Test listeners -->
-     <listeners>
-         <listener class="Magento\TestFramework\Event\PhpUnit"/>
-+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
-+            <arguments>
-+                <string>var/allure-results</string> <!-- XML files output folder -->
-+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
-+                <array> <!-- A list of custom annotations to ignore (optional) -->
-+                    <element key="codingStandardsIgnoreStart">
-+                        <string>codingStandardsIgnoreStart</string>
-+                    </element>
-+                    <element key="codingStandardsIgnoreEnd">
-+                        <string>codingStandardsIgnoreEnd</string>
-+                    </element>
-+                    <element key="expectedExceptionMessageRegExp">
-+                        <string>expectedExceptionMessageRegExp</string>
-+                    </element>
-+                    <element key="magentoAdminConfigFixture">
-+                        <string>magentoAdminConfigFixture</string>
-+                    </element>
-+                    <element key="magentoAppArea">
-+                        <string>magentoAppArea</string>
-+                    </element>
-+                    <element key="magentoAppIsolation">
-+                        <string>magentoAppIsolation</string>
-+                    </element>
-+                    <element key="magentoCache">
-+                        <string>magentoCache</string>
-+                    </element>
-+                    <element key="magentoComponentsDir">
-+                        <string>magentoComponentsDir</string>
-+                    </element>
-+                    <element key="magentoConfigFixture">
-+                        <string>magentoConfigFixture</string>
-+                    </element>
-+                    <element key="magentoDataFixture">
-+                        <string>magentoDataFixture</string>
-+                    </element>
-+                    <element key="magentoDataFixtureBeforeTransaction">
-+                        <string>magentoDataFixtureBeforeTransaction</string>
-+                    </element>
-+                    <element key="magentoDbIsolation">
-+                        <string>magentoDbIsolation</string>
-+                    </element>
-+                    <element key="magentoIndexerDimensionMode">
-+                        <string>magentoIndexerDimensionMode</string>
-+                    </element>
-+                    <element key="magentoApiDataFixture">
-+                        <string>magentoApiDataFixture</string>
-+                    </element>
-+                    <element key="Override">
-+                        <string>Override</string>
-+                    </element>
-+                </array>
-+            </arguments>
-+        </listener>
-     </listeners>
- </phpunit>
-diff --git a/dev/tests/api-functional/phpunit_rest.xml.dist b/dev/tests/api-functional/phpunit_rest.xml.dist
-index a2bc077328e..c5173e5dd43 100644
---- a/dev/tests/api-functional/phpunit_rest.xml.dist
-+++ b/dev/tests/api-functional/phpunit_rest.xml.dist
-@@ -58,5 +58,58 @@
-     <!-- Test listeners -->
-     <listeners>
-         <listener class="Magento\TestFramework\Event\PhpUnit"/>
-+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
-+            <arguments>
-+                <string>var/allure-results</string> <!-- XML files output folder -->
-+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
-+                <array> <!-- A list of custom annotations to ignore (optional) -->
-+                    <element key="codingStandardsIgnoreStart">
-+                        <string>codingStandardsIgnoreStart</string>
-+                    </element>
-+                    <element key="codingStandardsIgnoreEnd">
-+                        <string>codingStandardsIgnoreEnd</string>
-+                    </element>
-+                    <element key="expectedExceptionMessageRegExp">
-+                        <string>expectedExceptionMessageRegExp</string>
-+                    </element>
-+                    <element key="magentoAdminConfigFixture">
-+                        <string>magentoAdminConfigFixture</string>
-+                    </element>
-+                    <element key="magentoAppArea">
-+                        <string>magentoAppArea</string>
-+                    </element>
-+                    <element key="magentoAppIsolation">
-+                        <string>magentoAppIsolation</string>
-+                    </element>
-+                    <element key="magentoCache">
-+                        <string>magentoCache</string>
-+                    </element>
-+                    <element key="magentoComponentsDir">
-+                        <string>magentoComponentsDir</string>
-+                    </element>
-+                    <element key="magentoConfigFixture">
-+                        <string>magentoConfigFixture</string>
-+                    </element>
-+                    <element key="magentoDataFixture">
-+                        <string>magentoDataFixture</string>
-+                    </element>
-+                    <element key="magentoDataFixtureBeforeTransaction">
-+                        <string>magentoDataFixtureBeforeTransaction</string>
-+                    </element>
-+                    <element key="magentoDbIsolation">
-+                        <string>magentoDbIsolation</string>
-+                    </element>
-+                    <element key="magentoIndexerDimensionMode">
-+                        <string>magentoIndexerDimensionMode</string>
-+                    </element>
-+                    <element key="magentoApiDataFixture">
-+                        <string>magentoApiDataFixture</string>
-+                    </element>
-+                    <element key="Override">
-+                        <string>Override</string>
-+                    </element>
-+                </array>
-+            </arguments>
-+        </listener>
-     </listeners>
- </phpunit>
-diff --git a/dev/tests/api-functional/phpunit_soap.xml.dist b/dev/tests/api-functional/phpunit_soap.xml.dist
-index cc0d5555383..935f5113b67 100644
---- a/dev/tests/api-functional/phpunit_soap.xml.dist
-+++ b/dev/tests/api-functional/phpunit_soap.xml.dist
-@@ -57,5 +57,58 @@
-     <!-- Test listeners -->
-     <listeners>
-         <listener class="Magento\TestFramework\Event\PhpUnit"/>
-+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
-+            <arguments>
-+                <string>var/allure-results</string> <!-- XML files output folder -->
-+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
-+                <array> <!-- A list of custom annotations to ignore (optional) -->
-+                    <element key="codingStandardsIgnoreStart">
-+                        <string>codingStandardsIgnoreStart</string>
-+                    </element>
-+                    <element key="codingStandardsIgnoreEnd">
-+                        <string>codingStandardsIgnoreEnd</string>
-+                    </element>
-+                    <element key="expectedExceptionMessageRegExp">
-+                        <string>expectedExceptionMessageRegExp</string>
-+                    </element>
-+                    <element key="magentoAdminConfigFixture">
-+                        <string>magentoAdminConfigFixture</string>
-+                    </element>
-+                    <element key="magentoAppArea">
-+                        <string>magentoAppArea</string>
-+                    </element>
-+                    <element key="magentoAppIsolation">
-+                        <string>magentoAppIsolation</string>
-+                    </element>
-+                    <element key="magentoCache">
-+                        <string>magentoCache</string>
-+                    </element>
-+                    <element key="magentoComponentsDir">
-+                        <string>magentoComponentsDir</string>
-+                    </element>
-+                    <element key="magentoConfigFixture">
-+                        <string>magentoConfigFixture</string>
-+                    </element>
-+                    <element key="magentoDataFixture">
-+                        <string>magentoDataFixture</string>
-+                    </element>
-+                    <element key="magentoDataFixtureBeforeTransaction">
-+                        <string>magentoDataFixtureBeforeTransaction</string>
-+                    </element>
-+                    <element key="magentoDbIsolation">
-+                        <string>magentoDbIsolation</string>
-+                    </element>
-+                    <element key="magentoIndexerDimensionMode">
-+                        <string>magentoIndexerDimensionMode</string>
-+                    </element>
-+                    <element key="magentoApiDataFixture">
-+                        <string>magentoApiDataFixture</string>
-+                    </element>
-+                    <element key="Override">
-+                        <string>Override</string>
-+                    </element>
-+                </array>
-+            </arguments>
-+        </listener>
-     </listeners>
- </phpunit>
-diff --git a/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php b/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php
-index 6fd75516766..4bf1335f206 100644
---- a/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php
-@@ -95,6 +95,6 @@ class LinkProviderTest extends WebapiAbstract
-      */
-     private function isTestBaseUrlSecure()
-     {
--        return strpos('https://', TESTS_BASE_URL) !== false;
-+        return strpos(TESTS_BASE_URL, 'https://') !== false;
-     }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
-index f9442d8b649..1d37ea9a2fc 100644
---- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
-@@ -111,6 +111,9 @@ class ProductAttributeOptionManagementInterfaceTest extends WebapiAbstract
-             'option_with_value_node_that_starts_with_a_number' => [
-                 array_merge($optionPayload, [AttributeOptionInterface::VALUE => '123_some_text'])
-             ],
-+            'option_with_value_node_that_is_a_number' => [
-+                array_merge($optionPayload, [AttributeOptionInterface::VALUE => '123'])
-+            ],
- 
-         ];
-     }
-diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php
-index 5241e281b34..386bd9fc9ae 100644
---- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php
-@@ -23,6 +23,7 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
- 
-     /**
-      * @magentoApiDataFixture Magento/Catalog/_files/product_attribute.php
-+     * @return void
-      */
-     public function testGet()
-     {
-@@ -35,6 +36,9 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
-         $this->assertEquals($attributeCode, $attribute['attribute_code']);
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testGetList()
-     {
-         $searchCriteria = [
-@@ -83,6 +87,7 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
- 
-     /**
-      * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/create_attribute_service.php
-+     * @return void
-      */
-     public function testCreate()
-     {
-@@ -101,7 +106,8 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
-             "is_filterable_in_search" => true,
-         ];
- 
--        $this->assertEquals('front_lbl', $attribute['default_frontend_label']);
-+        $this->assertEquals('default_label', $attribute['default_frontend_label']);
-+        $this->assertEquals('front_lbl_store1', $attribute['frontend_labels'][0]['label']);
-         foreach ($expectedData as $key => $value) {
-             $this->assertEquals($value, $attribute[$key]);
-         }
-@@ -116,6 +122,7 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
- 
-     /**
-      * @magentoApiDataFixture Magento/Catalog/_files/product_attribute.php
-+     * @return void
-      */
-     public function testCreateWithExceptionIfAttributeAlreadyExists()
-     {
-@@ -132,6 +139,7 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
- 
-     /**
-      * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/create_attribute_service.php
-+     * @return void
-      */
-     public function testUpdate()
-     {
-@@ -146,9 +154,12 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
-                 'attribute_code' => $attributeCode,
-                 'entity_type_id' => 4,
-                 'is_used_in_grid' => true,
-+                //Update existing
-                 'default_frontend_label' => 'default_label_new',
-                 'frontend_labels' => [
--                    ['store_id' => 1, 'label' => 'front_lbl_new'],
-+                    //Update existing
-+                    ['store_id' => 0, 'label' => 'front_lbl_store0_new'],
-+                    ['store_id' => 1, 'label' => 'front_lbl_store1_new'],
-                 ],
-                 "options" => [
-                     //Update existing
-@@ -190,6 +201,7 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
-         $this->assertEquals(true, $result['is_used_in_grid']);
-         $this->assertEquals($attributeCode, $result['attribute_code']);
-         $this->assertEquals('default_label_new', $result['default_frontend_label']);
-+        $this->assertEquals('front_lbl_store1_new', $result['frontend_labels'][0]['label']);
-         //New option set as default
-         $this->assertEquals($result['options'][3]['value'], $result['default_value']);
-         $this->assertEquals("Default Blue Updated", $result['options'][1]['label']);
-@@ -197,6 +209,72 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
- 
-     /**
-      * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/create_attribute_service.php
-+     * @return void
-+     */
-+    public function testUpdateWithNoDefaultLabelAndAdminStorelabel()
-+    {
-+        $attributeCode = uniqid('label_attr_code');
-+        $attribute = $this->createAttribute($attributeCode);
-+
-+        $attributeData = [
-+            'attribute' => [
-+                'attribute_id' => $attribute['attribute_id'],
-+                'attribute_code' => $attributeCode,
-+                'entity_type_id' => 4,
-+                'is_used_in_grid' => true,
-+                'frontend_labels' => [
-+                    //Update existing
-+                    ['store_id' => 0, 'label' => 'front_lbl_store0_new'],
-+                    ['store_id' => 1, 'label' => 'front_lbl_store1_new'],
-+                ],
-+                'is_required' => false,
-+                'frontend_input' => 'select',
-+            ],
-+        ];
-+        $result = $this->updateAttribute($attributeCode, $attributeData);
-+
-+        $this->assertEquals($attribute['attribute_id'], $result['attribute_id']);
-+        $this->assertEquals(true, $result['is_used_in_grid']);
-+        $this->assertEquals($attributeCode, $result['attribute_code']);
-+        $this->assertEquals('front_lbl_store0_new', $result['default_frontend_label']);
-+        $this->assertEquals('front_lbl_store1_new', $result['frontend_labels'][0]['label']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/create_attribute_service.php
-+     * @return void
-+     */
-+    public function testUpdateWithNoDefaultLabelAndNoAdminStoreLabel()
-+    {
-+        $attributeCode = uniqid('label_attr_code');
-+        $attribute = $this->createAttribute($attributeCode);
-+
-+        $attributeData = [
-+            'attribute' => [
-+                'attribute_id' => $attribute['attribute_id'],
-+                'attribute_code' => $attributeCode,
-+                'entity_type_id' => 4,
-+                'is_used_in_grid' => true,
-+                'frontend_labels' => [
-+                    //Update existing
-+                    ['store_id' => 1, 'label' => 'front_lbl_store1_new'],
-+                ],
-+                'is_required' => false,
-+                'frontend_input' => 'select',
-+            ],
-+        ];
-+        $result = $this->updateAttribute($attributeCode, $attributeData);
-+
-+        $this->assertEquals($attribute['attribute_id'], $result['attribute_id']);
-+        $this->assertEquals(true, $result['is_used_in_grid']);
-+        $this->assertEquals($attributeCode, $result['attribute_code']);
-+        $this->assertEquals('default_label', $result['default_frontend_label']);
-+        $this->assertEquals('front_lbl_store1_new', $result['frontend_labels'][0]['label']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/create_attribute_service.php
-+     * @return void
-      */
-     public function testUpdateWithNewOption()
-     {
-@@ -234,6 +312,7 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
- 
-     /**
-      * @magentoApiDataFixture Magento/Catalog/_files/product_attribute.php
-+     * @return void
-      */
-     public function testDeleteById()
-     {
-@@ -241,6 +320,9 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
-         $this->assertTrue($this->deleteAttribute($attributeCode));
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testDeleteNoSuchEntityException()
-     {
-         $attributeCode = 'some_test_code';
-@@ -286,11 +368,10 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
-             'attribute' => [
-                 'attribute_code' => $attributeCode,
-                 'entity_type_id' => '4',
-+                "default_frontend_label" => 'default_label',
-                 'frontend_labels' => [
--                    [
--                        'store_id' => 0,
--                        'label' => 'front_lbl'
--                    ],
-+                    ['store_id' => 0, 'label' => 'front_lbl_store0'],
-+                    ['store_id' => 1, 'label' => 'front_lbl_store1'],
-                 ],
-                 'is_required' => true,
-                 "default_value" => "",
-@@ -423,6 +504,9 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
-         return $this->_webApiCall($serviceInfo, $attributeData);
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function tearDown()
-     {
-         foreach ($this->createdAttributes as $attributeCode) {
-diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
-index e83811042fd..f3be684f93a 100644
---- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
-@@ -146,6 +146,10 @@ class ProductCustomOptionRepositoryTest extends WebapiAbstract
-     public function testSave($optionData)
-     {
-         $productSku = 'simple';
-+        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
-+        $productRepository = $this->objectManager->create(
-+            \Magento\Catalog\Model\ProductRepository::class
-+        );
- 
-         $optionDataPost = $optionData;
-         $optionDataPost['product_sku'] = $productSku;
-@@ -162,6 +166,7 @@ class ProductCustomOptionRepositoryTest extends WebapiAbstract
-         ];
- 
-         $result = $this->_webApiCall($serviceInfo, ['option' => $optionDataPost]);
-+        $product = $productRepository->get($productSku);
-         unset($result['product_sku']);
-         unset($result['option_id']);
-         if (!empty($result['values'])) {
-@@ -169,7 +174,12 @@ class ProductCustomOptionRepositoryTest extends WebapiAbstract
-                 unset($result['values'][$key]['option_type_id']);
-             }
-         }
-+
-         $this->assertEquals($optionData, $result);
-+        $this->assertTrue($product->getHasOptions() == 1);
-+        if ($optionDataPost['is_require']) {
-+            $this->assertTrue($product->getRequiredOptions() == 1);
-+        }
-     }
- 
-     public function optionDataProvider()
-@@ -180,7 +190,7 @@ class ProductCustomOptionRepositoryTest extends WebapiAbstract
-             $fixtureOptions[$item['type']] = [
-                 'optionData' => $item,
-             ];
--        };
-+        }
- 
-         return $fixtureOptions;
-     }
-@@ -230,7 +240,7 @@ class ProductCustomOptionRepositoryTest extends WebapiAbstract
-             $fixtureOptions[$key] = [
-                 'optionData' => $item,
-             ];
--        };
-+        }
- 
-         return $fixtureOptions;
-     }
-diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
-index e140305db4d..3e935e1d7ae 100644
---- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
-@@ -3,22 +3,25 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Catalog\Api;
- 
- use Magento\Catalog\Api\Data\ProductInterface;
--use Magento\Store\Model\Store;
- use Magento\CatalogInventory\Api\Data\StockItemInterface;
-+use Magento\Downloadable\Model\Link;
-+use Magento\Store\Model\Store;
- use Magento\Store\Model\Website;
- use Magento\Store\Model\WebsiteRepository;
- use Magento\TestFramework\Helper\Bootstrap;
- use Magento\TestFramework\TestCase\WebapiAbstract;
-+use Magento\Framework\Api\ExtensibleDataInterface;
- use Magento\Framework\Api\FilterBuilder;
- use Magento\Framework\Api\SearchCriteriaBuilder;
- use Magento\Framework\Api\SortOrder;
- use Magento\Framework\Api\SortOrderBuilder;
--use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
- use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
- 
- /**
-  * @magentoAppIsolation enabled
-@@ -696,6 +699,31 @@ class ProductRepositoryInterfaceTest extends WebapiAbstract
-         $this->assertEquals($productData[ProductInterface::SKU], $response[ProductInterface::SKU]);
-     }
- 
-+    /**
-+     * Update product with extension attributes.
-+     *
-+     * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
-+     */
-+    public function testUpdateWithExtensionAttributes(): void
-+    {
-+        $sku = 'downloadable-product';
-+        $linksKey = 'downloadable_product_links';
-+        $productData = [
-+            ProductInterface::NAME => 'Downloadable (updated)',
-+            ProductInterface::SKU => $sku,
-+        ];
-+        $response = $this->updateProduct($productData);
-+
-+        self::assertArrayHasKey(ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY, $response);
-+        self::assertArrayHasKey($linksKey, $response[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
-+        self::assertCount(1, $response[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY][$linksKey]);
-+
-+        $linkData = $response[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY][$linksKey][0];
-+
-+        self::assertArrayHasKey(Link::KEY_LINK_URL, $linkData);
-+        self::assertEquals('http://example.com/downloadable.txt', $linkData[Link::KEY_LINK_URL]);
-+    }
-+
-     /**
-      * @param array $product
-      * @return array|bool|float|int|string
-@@ -787,6 +815,7 @@ class ProductRepositoryInterfaceTest extends WebapiAbstract
-         $this->assertTrue(count($response['items']) > 0);
- 
-         $this->assertNotNull($response['items'][0]['sku']);
-+        $this->assertNotNull($response['items'][0][ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]['website_ids']);
-         $this->assertEquals('simple', $response['items'][0]['sku']);
- 
-         $index = null;
-@@ -802,6 +831,45 @@ class ProductRepositoryInterfaceTest extends WebapiAbstract
-         $this->assertEquals($expectedResult, $response['items'][0]['custom_attributes'][$index]['value']);
-     }
- 
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-+     */
-+    public function testGetListWithAdditionalParams()
-+    {
-+        $this->_markTestAsRestOnly();
-+        $searchCriteria = [
-+            'searchCriteria' => [
-+                'current_page' => 1,
-+                'page_size' => 2,
-+            ],
-+        ];
-+        $additionalParams = urlencode('items[id,custom_attributes[description]]');
-+
-+        $serviceInfo = [
-+            'rest' => [
-+                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($searchCriteria) . '&fields=' .
-+                    $additionalParams,
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
-+            ]
-+        ];
-+
-+        $response = $this->_webApiCall($serviceInfo, $searchCriteria);
-+
-+        $this->assertArrayHasKey('items', $response);
-+        $this->assertTrue(count($response['items']) > 0);
-+
-+        $indexDescription = null;
-+        foreach ($response['items'][0]['custom_attributes'] as $key => $customAttribute) {
-+            if ($customAttribute['attribute_code'] == 'description') {
-+                $indexDescription = $key;
-+            }
-+        }
-+
-+        $this->assertNotNull($response['items'][0]['custom_attributes'][$indexDescription]['attribute_code']);
-+        $this->assertNotNull($response['items'][0]['custom_attributes'][$indexDescription]['value']);
-+        $this->assertTrue(count($response['items'][0]['custom_attributes']) == 1);
-+    }
-+
-     /**
-      * @magentoApiDataFixture Magento/Catalog/_files/products_with_websites_and_stores.php
-      * @return void
-@@ -845,6 +913,7 @@ class ProductRepositoryInterfaceTest extends WebapiAbstract
-         $this->assertTrue(count($response['items']) == 1);
-         $this->assertTrue(isset($response['items'][0]['sku']));
-         $this->assertEquals('simple-2', $response['items'][0]['sku']);
-+        $this->assertNotNull($response['items'][0][ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]['website_ids']);
-     }
- 
-     /**
-@@ -991,6 +1060,9 @@ class ProductRepositoryInterfaceTest extends WebapiAbstract
-         $this->assertEquals(3, $searchResult['total_count']);
-         $this->assertEquals(1, count($searchResult['items']));
-         $this->assertEquals('search_product_4', $searchResult['items'][0][ProductInterface::SKU]);
-+        $this->assertNotNull(
-+            $searchResult['items'][0][ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]['website_ids']
-+        );
-     }
- 
-     /**
-diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
-index 6b8388e2f43..237574dd6e2 100644
---- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
-@@ -45,6 +45,9 @@ class ProductSwatchAttributeOptionManagementInterfaceTest extends WebapiAbstract
-         $this->assertNotNull($response);
-         $updatedData = $this->getAttributeOptions($testAttributeCode);
-         $lastOption = array_pop($updatedData);
-+        foreach ($updatedData as $option) {
-+            $this->assertNotContains('id', $option['value']);
-+        }
-         $this->assertEquals(
-             $optionData[AttributeOptionInterface::STORE_LABELS][0][AttributeOptionLabelInterface::LABEL],
-             $lastOption['label']
-diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php
-index 9562d6618d8..d5c03573394 100644
---- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php
-@@ -49,7 +49,7 @@ class ProductTierPriceManagementTest extends WebapiAbstract
-     public function getListDataProvider()
-     {
-         return [
--            [0, 2, 5, 3],
-+            [0, 3, 5, 3],
-             [1, 0, null, null],
-             ['all', 2, 8, 2],
-         ];
-diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/LinkManagementTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/LinkManagementTest.php
-index d899839d43d..53c1bf08bb7 100644
---- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/LinkManagementTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/LinkManagementTest.php
-@@ -6,11 +6,19 @@
-  */
- namespace Magento\ConfigurableProduct\Api;
- 
-+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
- use Magento\Eav\Model\AttributeRepository;
-+use Magento\Eav\Model\Entity\Attribute\Option;
-+use Magento\Framework\Webapi\Rest\Request;
-+use Magento\TestFramework\TestCase\WebapiAbstract;
- 
--class LinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-+/**
-+ * Class LinkManagementTest for testing ConfigurableProduct to SimpleProduct link functionality
-+ */
-+class LinkManagementTest extends WebapiAbstract
- {
-     const SERVICE_NAME = 'configurableProductLinkManagementV1';
-+    const OPTION_SERVICE_NAME = 'configurableProductOptionRepositoryV1';
-     const SERVICE_VERSION = 'V1';
-     const RESOURCE_PATH = '/V1/configurable-products';
- 
-@@ -85,9 +93,27 @@ class LinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
- 
-         $this->createConfigurableProduct($productSku);
-         $attribute = $this->attributeRepository->get('catalog_product', 'test_configurable');
--        $attributeValue = $attribute->getOptions()[1]->getValue();
--        $this->addOptionToConfigurableProduct($productSku, $attribute->getAttributeId(), $attributeValue);
--        $this->createSimpleProduct($childSku, $attributeValue);
-+
-+        $this->addOptionToConfigurableProduct(
-+            $productSku,
-+            $attribute->getAttributeId(),
-+            [
-+                [
-+                    'value_index' => $attribute->getOptions()[1]->getValue()
-+                ]
-+            ]
-+        );
-+
-+        $this->createSimpleProduct(
-+            $childSku,
-+            [
-+                [
-+                    'attribute_code' => 'test_configurable',
-+                    'value' => $attribute->getOptions()[1]->getValue()
-+                ]
-+            ]
-+        );
-+
-         $res = $this->addChild($productSku, $childSku);
-         $this->assertTrue($res);
- 
-@@ -103,10 +129,129 @@ class LinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-         $this->assertTrue($added);
- 
-         // clean up products
-+
-+        $this->deleteProduct($productSku);
-+        $this->deleteProduct($childSku);
-+    }
-+
-+    /**
-+     * Test if configurable option attribute positions are being preserved after simple products were assigned to a
-+     * configurable product.
-+     *
-+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test.php
-+     */
-+    public function testConfigurableOptionPositionPreservation()
-+    {
-+        $productSku = 'configurable-product-sku';
-+        $childProductSkus = [
-+            'simple-product-sku-1',
-+            'simple-product-sku-2'
-+        ];
-+        $attributesToAdd = [
-+            'custom_attr_1',
-+            'custom_attr_2',
-+        ];
-+
-+        $this->createConfigurableProduct($productSku);
-+
-+        $position = 0;
-+        $attributeOptions = [];
-+        foreach ($attributesToAdd as $attributeToAdd) {
-+            /** @var Attribute $attribute */
-+            $attribute = $this->attributeRepository->get('catalog_product', $attributeToAdd);
-+
-+            /** @var Option $options[] */
-+            $options = $attribute->getOptions();
-+            array_shift($options);
-+
-+            $attributeOptions[$attributeToAdd] = $options;
-+
-+            $valueIndexesData = [];
-+            foreach ($options as $option) {
-+                $valueIndexesData []['value_index']= $option->getValue();
-+            }
-+            $this->addOptionToConfigurableProduct(
-+                $productSku,
-+                $attribute->getAttributeId(),
-+                $valueIndexesData,
-+                $position
-+            );
-+            $position++;
-+        }
-+
-+        $this->assertArrayHasKey($attributesToAdd[0], $attributeOptions);
-+        $this->assertArrayHasKey($attributesToAdd[1], $attributeOptions);
-+        $this->assertCount(4, $attributeOptions[$attributesToAdd[0]]);
-+        $this->assertCount(4, $attributeOptions[$attributesToAdd[1]]);
-+
-+        $attributesBeforeAssign = $this->getConfigurableAttribute($productSku);
-+
-+        $simpleProdsAttributeData = [];
-+        foreach ($attributeOptions as $attributeCode => $options) {
-+            $simpleProdsAttributeData [0][] = [
-+                'attribute_code' => $attributeCode,
-+                'value' => $options[0]->getValue(),
-+            ];
-+            $simpleProdsAttributeData [0][] = [
-+                'attribute_code' => $attributeCode,
-+                'value' => $options[1]->getValue(),
-+            ];
-+            $simpleProdsAttributeData [1][] = [
-+                'attribute_code' => $attributeCode,
-+                'value' => $options[2]->getValue(),
-+            ];
-+            $simpleProdsAttributeData [1][] = [
-+                'attribute_code' => $attributeCode,
-+                'value' => $options[3]->getValue(),
-+            ];
-+        }
-+
-+        foreach ($childProductSkus as $childNum => $childSku) {
-+            $this->createSimpleProduct($childSku, $simpleProdsAttributeData[$childNum]);
-+            $res = $this->addChild($productSku, $childSku);
-+            $this->assertTrue($res);
-+        }
-+
-+        $childProductsDiff = array_diff(
-+            $childProductSkus,
-+            array_column(
-+                $this->getChildren($productSku),
-+                'sku'
-+            )
-+        );
-+        $this->assertCount(0, $childProductsDiff, 'Added child product count mismatch expected result');
-+
-+        $attributesAfterAssign = $this->getConfigurableAttribute($productSku);
-+
-+        $this->assertEquals(
-+            $attributesBeforeAssign[0]['position'],
-+            $attributesAfterAssign[0]['position'],
-+            'Product 1 attribute option position mismatch'
-+        );
-+        $this->assertEquals(
-+            $attributesBeforeAssign[1]['position'],
-+            $attributesAfterAssign[1]['position'],
-+            'Product 2 attribute option position mismatch'
-+        );
-+
-+        foreach ($childProductSkus as $childSku) {
-+            $this->deleteProduct($childSku);
-+        }
-+        $this->deleteProduct($productSku);
-+    }
-+
-+    /**
-+     * Delete product by SKU
-+     *
-+     * @param string $sku
-+     * @return bool
-+     */
-+    private function deleteProduct(string $sku): bool
-+    {
-         $serviceInfo = [
-             'rest' => [
--                'resourcePath' => '/V1/products/' . $productSku,
--                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE
-+                'resourcePath' => '/V1/products/' . $sku,
-+                'httpMethod' => Request::HTTP_METHOD_DELETE
-             ],
-             'soap' => [
-                 'service' => 'catalogProductRepositoryV1',
-@@ -114,19 +259,29 @@ class LinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-                 'operation' => 'catalogProductRepositoryV1DeleteById',
-             ],
-         ];
--        $this->_webApiCall($serviceInfo, ['sku' => $productSku]);
-+        return $this->_webApiCall($serviceInfo, ['sku' => $sku]);
-+    }
-+
-+    /**
-+     * Get configurable product attributes
-+     *
-+     * @param string $productSku
-+     * @return array
-+     */
-+    protected function getConfigurableAttribute(string $productSku): array
-+    {
-         $serviceInfo = [
-             'rest' => [
--                'resourcePath' => '/V1/products/' . $childSku,
--                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE
-+                'resourcePath' => self::RESOURCE_PATH . '/' . $productSku . '/options/all',
-+                'httpMethod' => Request::HTTP_METHOD_GET
-             ],
-             'soap' => [
--                'service' => 'catalogProductRepositoryV1',
-+                'service' => self::OPTION_SERVICE_NAME,
-                 'serviceVersion' => self::SERVICE_VERSION,
--                'operation' => 'catalogProductRepositoryV1DeleteById',
--            ],
-+                'operation' => self::OPTION_SERVICE_NAME . 'GetList'
-+            ]
-         ];
--        $this->_webApiCall($serviceInfo, ['sku' => $childSku]);
-+        return $this->_webApiCall($serviceInfo, ['sku' => $productSku]);
-     }
- 
-     private function addChild($productSku, $childSku)
-@@ -134,7 +289,7 @@ class LinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-         $serviceInfo = [
-             'rest' => [
-                 'resourcePath' => self::RESOURCE_PATH . '/' . $productSku . '/child',
--                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
-+                'httpMethod' => Request::HTTP_METHOD_POST
-             ],
-             'soap' => [
-                 'service' => self::SERVICE_NAME,
-@@ -159,7 +314,7 @@ class LinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-         $serviceInfo = [
-             'rest' => [
-                 'resourcePath' => '/V1/products',
--                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
-+                'httpMethod' => Request::HTTP_METHOD_POST
-             ],
-             'soap' => [
-                 'service' => 'catalogProductRepositoryV1',
-@@ -170,24 +325,22 @@ class LinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-         return $this->_webApiCall($serviceInfo, $requestData);
-     }
- 
--    protected function addOptionToConfigurableProduct($productSku, $attributeId, $attributeValue)
-+    protected function addOptionToConfigurableProduct($productSku, $attributeId, $attributeValues, $position = 0)
-     {
-         $requestData = [
-             'sku' => $productSku,
-             'option' => [
-                 'attribute_id' => $attributeId,
-                 'label' => 'test_configurable',
--                'position' => 0,
-+                'position' => $position,
-                 'is_use_default' => true,
--                'values' => [
--                    ['value_index' => $attributeValue],
--                ]
-+                'values' => $attributeValues
-             ]
-         ];
-         $serviceInfo = [
-             'rest' => [
-                 'resourcePath' => '/V1/configurable-products/'. $productSku .'/options',
--                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
-+                'httpMethod' => Request::HTTP_METHOD_POST,
-             ],
-             'soap' => [
-                 'service' => 'configurableProductOptionRepositoryV1',
-@@ -198,7 +351,7 @@ class LinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-         return $this->_webApiCall($serviceInfo, $requestData);
-     }
- 
--    protected function createSimpleProduct($sku, $attributeValue)
-+    protected function createSimpleProduct($sku, $customAttributes)
-     {
-         $requestData = [
-             'product' => [
-@@ -209,15 +362,13 @@ class LinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-                 'price' => 3.62,
-                 'status' => 1,
-                 'visibility' => 4,
--                'custom_attributes' => [
--                    ['attribute_code' => 'test_configurable', 'value' => $attributeValue],
--                ]
-+                'custom_attributes' => $customAttributes
-             ]
-         ];
-         $serviceInfo = [
-             'rest' => [
-                 'resourcePath' => '/V1/products',
--                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
-+                'httpMethod' => Request::HTTP_METHOD_POST,
-             ],
-             'soap' => [
-                 'service' => 'catalogProductRepositoryV1',
-@@ -244,7 +395,7 @@ class LinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-         $serviceInfo = [
-             'rest' => [
-                 'resourcePath' => sprintf($resourcePath, $productSku, $childSku),
--                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE
-+                'httpMethod' => Request::HTTP_METHOD_DELETE
-             ],
-             'soap' => [
-                 'service' => self::SERVICE_NAME,
-@@ -265,7 +416,7 @@ class LinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-         $serviceInfo = [
-             'rest' => [
-                 'resourcePath' => self::RESOURCE_PATH . '/' . $productSku  . '/children',
--                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET
-+                'httpMethod' => Request::HTTP_METHOD_GET
-             ],
-             'soap' => [
-                 'service' => self::SERVICE_NAME,
-diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php
-index 43d5a5b63b8..2aabf376e89 100644
---- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php
-@@ -10,6 +10,9 @@ namespace Magento\ConfigurableProduct\Api;
- use Magento\TestFramework\Helper\Bootstrap;
- use Magento\Eav\Api\AttributeRepositoryInterface;
- 
-+/**
-+ * Class OptionRepositoryTest for testing ConfigurableProductoption integration
-+ */
- class OptionRepositoryTest extends \Magento\TestFramework\TestCase\WebapiAbstract
- {
-     const SERVICE_NAME = 'configurableProductOptionRepositoryV1';
-@@ -210,6 +213,47 @@ class OptionRepositoryTest extends \Magento\TestFramework\TestCase\WebapiAbstrac
-         $this->assertEquals($requestBody['option']['label'], $configurableAttribute[0]['label']);
-     }
- 
-+    /**
-+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-+     */
-+    public function testUpdateWithoutOptionId()
-+    {
-+        $productSku = 'configurable';
-+        /** @var AttributeRepositoryInterface $attributeRepository */
-+
-+        $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
-+
-+        /** @var \Magento\Eav\Api\Data\AttributeInterface $attribute */
-+        $attribute = $attributeRepository->get('catalog_product', 'test_configurable');
-+
-+        $serviceInfo = [
-+            'rest' => [
-+                'resourcePath' => self::RESOURCE_PATH . '/' . $productSku . '/options',
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
-+            ],
-+            'soap' => [
-+                'service' => self::SERVICE_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => self::SERVICE_NAME . 'Save'
-+            ]
-+        ];
-+
-+        $option = [
-+            'attribute_id' => $attribute->getAttributeId(),
-+            'label' => 'Update Test Configurable with sku and attribute_id',
-+            'values' => [
-+                [
-+                    'value_index' => 1,
-+                ]
-+            ],
-+        ];
-+
-+        $result = $this->_webApiCall($serviceInfo, ['sku' => $productSku, 'option' => $option]);
-+        $this->assertGreaterThan(0, $result);
-+        $configurableAttribute = $this->getConfigurableAttribute($productSku);
-+        $this->assertEquals($option['label'], $configurableAttribute[0]['label']);
-+    }
-+
-     /**
-      * @param string $productSku
-      * @return array
-diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php
-index b0d1647d8b8..b2276d79f5e 100644
---- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php
-@@ -213,6 +213,34 @@ class AccountManagementTest extends WebapiAbstract
-         }
-     }
- 
-+    public function testCreateCustomerWithoutOptionalFields()
-+    {
-+        $serviceInfo = [
-+            'rest' => [
-+                'resourcePath' => self::RESOURCE_PATH,
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST, ],
-+            'soap' => [
-+                'service' => self::SERVICE_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => self::SERVICE_NAME . 'CreateAccount',
-+            ],
-+        ];
-+
-+        $customerDataArray = $this->dataObjectProcessor->buildOutputDataArray(
-+            $this->customerHelper->createSampleCustomerDataObject(),
-+            \Magento\Customer\Api\Data\CustomerInterface::class
-+        );
-+        unset($customerDataArray['store_id']);
-+        unset($customerDataArray['website_id']);
-+        $requestData = ['customer' => $customerDataArray, 'password' => CustomerHelper::PASSWORD];
-+        try {
-+            $customerData = $this->_webApiCall($serviceInfo, $requestData, null, 'all');
-+            $this->assertNotNull($customerData['id']);
-+        } catch (\Exception $e) {
-+            $this->fail('Customer should be created without optional fields.');
-+        }
-+    }
-+
-     /**
-      * Test customer activation when it is required
-      *
-diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php
-index f2632aa1481..3b1d4313429 100644
---- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php
-@@ -9,6 +9,7 @@ namespace Magento\Customer\Api;
- use Magento\Customer\Api\Data\CustomerInterface as Customer;
- use Magento\Customer\Model\Data\AttributeMetadata;
- use Magento\TestFramework\TestCase\WebapiAbstract;
-+use Magento\TestFramework\Helper\Bootstrap;
- 
- /**
-  * Class CustomerMetadataTest
-@@ -19,6 +20,19 @@ class CustomerMetadataTest extends WebapiAbstract
-     const SERVICE_VERSION = "V1";
-     const RESOURCE_PATH = "/V1/attributeMetadata/customer";
- 
-+    /**
-+     * @var CustomerMetadataInterface
-+     */
-+    private $customerMetadata;
-+
-+    /**
-+     * Execute per test initialization.
-+     */
-+    public function setUp()
-+    {
-+        $this->customerMetadata = Bootstrap::getObjectManager()->create(CustomerMetadataInterface::class);
-+    }
-+
-     /**
-      * Test retrieval of attribute metadata for the customer entity type.
-      *
-@@ -200,8 +214,7 @@ class CustomerMetadataTest extends WebapiAbstract
- 
-         $attributeMetadata = $this->_webApiCall($serviceInfo);
- 
--        // There are no default custom attributes.
--        $this->assertCount(0, $attributeMetadata);
-+        $this->assertCount(count($this->customerMetadata->getCustomAttributesMetadata()), $attributeMetadata);
-     }
- 
-     /**
-diff --git a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
-index 4608b255459..769abadf205 100644
---- a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
-@@ -51,11 +51,13 @@ class ProductRepositoryTest extends WebapiAbstract
-                 'link_type' => 'file',
-                 'link_file_content' => [
-                     'name' => 'link1_content.jpg',
-+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                     'file_data' => base64_encode(file_get_contents($this->testImagePath)),
-                 ],
-                 'sample_type' => 'file',
-                 'sample_file_content' => [
-                     'name' => 'link1_sample.jpg',
-+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                     'file_data' => base64_encode(file_get_contents($this->testImagePath)),
-                 ],
-             ],
-@@ -114,6 +116,7 @@ class ProductRepositoryTest extends WebapiAbstract
-                 'sample_type' => 'file',
-                 'sample_file_content' => [
-                     'name' => 'sample2.jpg',
-+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                     'file_data' => base64_encode(file_get_contents($this->testImagePath)),
-                 ],
-             ],
-@@ -146,7 +149,9 @@ class ProductRepositoryTest extends WebapiAbstract
-             "price" => 10,
-             'attribute_set_id' => 4,
-             "extension_attributes" => [
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                 "downloadable_product_links" => array_values($this->getLinkData()),
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                 "downloadable_product_samples" => array_values($this->getSampleData()),
-             ],
-         ];
-@@ -301,11 +306,13 @@ class ProductRepositoryTest extends WebapiAbstract
-             'link_type' => 'file',
-             'link_file_content' => [
-                 'name' => $linkFile . $extension,
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                 'file_data' => base64_encode(file_get_contents($this->testImagePath)),
-             ],
-             'sample_type' => 'file',
-             'sample_file_content' => [
-                 'name' => $sampleFile . $extension,
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                 'file_data' => base64_encode(file_get_contents($this->testImagePath)),
-             ],
-         ];
-@@ -319,11 +326,13 @@ class ProductRepositoryTest extends WebapiAbstract
-             'link_type' => 'file',
-             'link_file_content' => [
-                 'name' => 'link2_content.jpg',
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                 'file_data' => base64_encode(file_get_contents($this->testImagePath)),
-             ],
-             'sample_type' => 'file',
-             'sample_file_content' => [
-                 'name' => 'link2_sample.jpg',
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                 'file_data' => base64_encode(file_get_contents($this->testImagePath)),
-             ],
-         ];
-@@ -463,6 +472,7 @@ class ProductRepositoryTest extends WebapiAbstract
-             'sample_type' => 'file',
-             'sample_file_content' => [
-                 'name' => 'sample1.jpg',
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                 'file_data' => base64_encode(file_get_contents($this->testImagePath)),
-             ],
-         ];
-@@ -472,6 +482,11 @@ class ProductRepositoryTest extends WebapiAbstract
-             'title' => 'sample2_updated',
-             'sort_order' => 2,
-             'sample_type' => 'file',
-+            'sample_file_content' => [
-+                'name' => 'sample2.jpg',
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+                'file_data' => base64_encode(file_get_contents($this->testImagePath)),
-+            ],
-         ];
- 
-         $response[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]["downloadable_product_samples"] =
-@@ -606,7 +621,7 @@ class ProductRepositoryTest extends WebapiAbstract
-     protected function saveProduct($product)
-     {
-         if (isset($product['custom_attributes'])) {
--            for ($i=0; $i<sizeof($product['custom_attributes']); $i++) {
-+            for ($i = 0, $iMax = count($product['custom_attributes']); $i < $iMax; $i++) {
-                 if ($product['custom_attributes'][$i]['attribute_code'] == 'category_ids'
-                     && !is_array($product['custom_attributes'][$i]['value'])
-                 ) {
-diff --git a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/GuestItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/GuestItemRepositoryTest.php
-index 8c30ef875c2..b7db294eedf 100644
---- a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/GuestItemRepositoryTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/GuestItemRepositoryTest.php
-@@ -117,7 +117,6 @@ class GuestItemRepositoryTest extends WebapiAbstract
-             ],
-         ];
-         $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
--//        $quote->load('test_order_item_with_message', 'reserved_order_id');
-         $messageId = $quote->getItemByProduct($product)->getGiftMessageId();
-         /** @var  \Magento\GiftMessage\Model\Message $message */
-         $message = $this->objectManager->create(\Magento\GiftMessage\Model\Message::class)->load($messageId);
-diff --git a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
-index 4b821b118f9..d4df57fbff8 100644
---- a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
-@@ -144,7 +144,6 @@ class ItemRepositoryTest extends WebapiAbstract
-             ],
-         ];
-         $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
--//        $quote->load('test_order_item_with_message', 'reserved_order_id');
-         $messageId = $quote->getItemByProduct($product)->getGiftMessageId();
-         /** @var  \Magento\GiftMessage\Model\Message $message */
-         $message = $this->objectManager->create(\Magento\GiftMessage\Model\Message::class)->load($messageId);
-@@ -193,7 +192,6 @@ class ItemRepositoryTest extends WebapiAbstract
-             ],
-         ];
-         $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
--//        $quote->load('test_order_item_with_message', 'reserved_order_id');
-         $messageId = $quote->getItemByProduct($product)->getGiftMessageId();
-         /** @var  \Magento\GiftMessage\Model\Message $message */
-         $message = $this->objectManager->create(\Magento\GiftMessage\Model\Message::class)->load($messageId);
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php
-index 8ccd9d0c94f..d5d34e48d77 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php
-@@ -15,6 +15,9 @@ use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\TestFramework\ObjectManager;
- use Magento\TestFramework\TestCase\GraphQlAbstract;
- 
-+/**
-+ * Bundle product view test
-+ */
- class BundleProductViewTest extends GraphQlAbstract
- {
-     const KEY_PRICE_TYPE_FIXED = 'FIXED';
-@@ -108,7 +111,7 @@ QUERY;
-     /**
-      * @magentoApiDataFixture Magento/Bundle/_files/bundle_product_with_not_visible_children.php
-      */
--    public function testBundleProdutWithNotVisibleChildren()
-+    public function testBundleProductWithNotVisibleChildren()
-     {
-         $productSku = 'bundle-product-1';
-         $query
-@@ -285,31 +288,6 @@ QUERY;
-         );
-     }
- 
--    /**
--     * @param array $actualResponse
--     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
--     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
--     */
--    private function assertResponseFields($actualResponse, $assertionMap)
--    {
--        foreach ($assertionMap as $key => $assertionData) {
--            $expectedValue = isset($assertionData['expected_value'])
--                ? $assertionData['expected_value']
--                : $assertionData;
--            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
--            $this->assertNotNull(
--                $expectedValue,
--                "Value of '{$responseField}' field must not be NULL"
--            );
--            $this->assertEquals(
--                $expectedValue,
--                $actualResponse[$responseField],
--                "Value of '{$responseField}' field in response does not match expected value: "
--                . var_export($expectedValue, true)
--            );
--        }
--    }
--
-     /**
-      * @magentoApiDataFixture Magento/Bundle/_files/product_with_multiple_options_1.php
-      */
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php
-new file mode 100644
-index 00000000000..46309c6d97d
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php
-@@ -0,0 +1,281 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Catalog;
-+
-+use Magento\Catalog\Api\CategoryLinkManagementInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status as productStatus;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\CatalogInventory\Model\Configuration;
-+use Magento\Config\Model\ResourceModel\Config;
-+use Magento\Framework\App\Config\ReinitableConfigInterface;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Class CategoryProductsCountTest
-+ *
-+ * Test for Magento\CatalogGraphQl\Model\Resolver\Category\ProductsCount resolver
-+ */
-+class CategoryProductsCountTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @var Config $config
-+     */
-+    private $resourceConfig;
-+
-+    /**
-+     * @var ScopeConfigInterface
-+     */
-+    private $scopeConfig;
-+
-+    /**
-+     * @var ReinitableConfigInterface
-+     */
-+    private $reinitConfig;
-+
-+    /**
-+     * @var CategoryLinkManagementInterface
-+     */
-+    private $categoryLinkManagement;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $objectManager = ObjectManager::getInstance();
-+        $this->productRepository = $objectManager->create(ProductRepositoryInterface::class);
-+        $this->resourceConfig = $objectManager->get(Config::class);
-+        $this->scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-+        $this->reinitConfig = $objectManager->get(ReinitableConfigInterface::class);
-+        $this->categoryLinkManagement = $objectManager->get(CategoryLinkManagementInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-+     */
-+    public function testCategoryWithSaleableProduct()
-+    {
-+        $categoryId = 2;
-+
-+        $query = <<<QUERY
-+{
-+  category(id: {$categoryId}) {
-+      id
-+      product_count
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertEquals(1, $response['category']['product_count']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
-+     */
-+    public function testCategoryWithInvisibleProduct()
-+    {
-+        $categoryId = 333;
-+        $sku = 'simple333';
-+
-+        $product = $this->productRepository->get($sku);
-+        $product->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE);
-+        $this->productRepository->save($product);
-+
-+        $query = <<<QUERY
-+{
-+  category(id: {$categoryId}) {
-+      id
-+      product_count
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertEquals(0, $response['category']['product_count']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
-+     */
-+    public function testCategoryWithOutOfStockProductManageStockEnabled()
-+    {
-+        $categoryId = 2;
-+        $sku = 'simple-out-of-stock';
-+        $manageStock = $this->scopeConfig->getValue(Configuration::XML_PATH_MANAGE_STOCK);
-+
-+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_MANAGE_STOCK, 1);
-+        $this->reinitConfig->reinit();
-+
-+        // need to resave product to reindex it with new configuration.
-+        $product = $this->productRepository->get($sku);
-+        $this->productRepository->save($product);
-+
-+        $query = <<<QUERY
-+{
-+  category(id: {$categoryId}) {
-+      id
-+      product_count
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_MANAGE_STOCK, $manageStock);
-+        $this->reinitConfig->reinit();
-+
-+        self::assertEquals(0, $response['category']['product_count']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
-+     */
-+    public function testCategoryWithOutOfStockProductManageStockDisabled()
-+    {
-+        $categoryId = 2;
-+        $sku = 'simple-out-of-stock';
-+        $manageStock = $this->scopeConfig->getValue(Configuration::XML_PATH_MANAGE_STOCK);
-+
-+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_MANAGE_STOCK, 0);
-+        $this->reinitConfig->reinit();
-+
-+        // need to resave product to reindex it with new configuration.
-+        $product = $this->productRepository->get($sku);
-+        $this->productRepository->save($product);
-+
-+        $query = <<<QUERY
-+{
-+  category(id: {$categoryId}) {
-+      id
-+      product_count
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_MANAGE_STOCK, $manageStock);
-+        $this->reinitConfig->reinit();
-+
-+        self::assertEquals(1, $response['category']['product_count']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
-+     */
-+    public function testCategoryWithDisabledProduct()
-+    {
-+        $categoryId = 333;
-+        $sku = 'simple333';
-+
-+        $product = $this->productRepository->get($sku);
-+        $product->setStatus(ProductStatus::STATUS_DISABLED);
-+        $this->productRepository->save($product);
-+
-+        $query = <<<QUERY
-+{
-+  category(id: {$categoryId}) {
-+      id
-+      product_count
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertEquals(0, $response['category']['product_count']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
-+     */
-+    public function testCategoryWithOutOfStockProductShowOutOfStockProduct()
-+    {
-+        $showOutOfStock = $this->scopeConfig->getValue(Configuration::XML_PATH_SHOW_OUT_OF_STOCK);
-+
-+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_SHOW_OUT_OF_STOCK, 1);
-+        $this->reinitConfig->reinit();
-+
-+        $categoryId = 2;
-+
-+        $query = <<<QUERY
-+{
-+  category(id: {$categoryId}) {
-+      id
-+      product_count
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_SHOW_OUT_OF_STOCK, $showOutOfStock);
-+        $this->reinitConfig->reinit();
-+
-+        self::assertEquals(1, $response['category']['product_count']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/CatalogRule/_files/configurable_product.php
-+     */
-+    public function testCategoryWithConfigurableChildrenOutOfStock()
-+    {
-+        $categoryId = 2;
-+
-+        $this->categoryLinkManagement->assignProductToCategories('configurable', [$categoryId]);
-+
-+        foreach (['simple1', 'simple2'] as $sku) {
-+            $product = $this->productRepository->get($sku);
-+            $product->setStockData(['is_in_stock' => 0]);
-+            $this->productRepository->save($product);
-+        }
-+
-+        $query = <<<QUERY
-+{
-+  category(id: {$categoryId}) {
-+      id
-+      product_count
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertEquals(0, $response['category']['product_count']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
-+     */
-+    public function testCategoryWithProductNotAvailableOnWebsite()
-+    {
-+        $product = $this->productRepository->getById(333);
-+        $product->setWebsiteIds([]);
-+        $this->productRepository->save($product);
-+
-+        $categoryId = 333;
-+
-+        $query = <<<QUERY
-+{
-+  category(id: {$categoryId}) {
-+      id
-+      product_count
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertEquals(0, $response['category']['product_count']);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
-index d9a46a44512..f62be732848 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
-@@ -18,13 +18,11 @@ use Magento\TestFramework\TestCase\GraphQlAbstract;
- class CategoryProductsVariantsTest extends GraphQlAbstract
- {
-     /**
--     *
-      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function testGetSimpleProductsFromCategory()
-     {
--
-         $query
-             = <<<QUERY
- {
-@@ -74,28 +72,4 @@ QUERY;
- 
-         $this->assertResponseFields($actualResponse, $assertionMap);
-     }
--
--    /**
--     * @param array $actualResponse
--     * @param array $assertionMap
--     */
--    private function assertResponseFields($actualResponse, $assertionMap)
--    {
--        foreach ($assertionMap as $key => $assertionData) {
--            $expectedValue = isset($assertionData['expected_value'])
--                ? $assertionData['expected_value']
--                : $assertionData;
--            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
--            self::assertNotNull(
--                $expectedValue,
--                "Value of '{$responseField}' field must not be NULL"
--            );
--            self::assertEquals(
--                $expectedValue,
--                $actualResponse[$responseField],
--                "Value of '{$responseField}' field in response does not match expected value: "
--                . var_export($expectedValue, true)
--            );
--        }
--    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
-index c7697a99875..df8e399ce6c 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
-@@ -8,13 +8,18 @@ declare(strict_types=1);
- namespace Magento\GraphQl\Catalog;
- 
- use Magento\Catalog\Api\Data\CategoryInterface;
-+use Magento\Catalog\Model\CategoryRepository;
- use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
- use Magento\Framework\DataObject;
-+use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
- use Magento\TestFramework\TestCase\GraphQlAbstract;
- use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\TestFramework\ObjectManager;
- 
-+/**
-+ * Test loading of category tree
-+ */
- class CategoryTest extends GraphQlAbstract
- {
-     /**
-@@ -22,13 +27,18 @@ class CategoryTest extends GraphQlAbstract
-      */
-     private $objectManager;
- 
-+    /**
-+     * @var CategoryRepository
-+     */
-+    private $categoryRepository;
-+
-     protected function setUp()
-     {
-         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $this->categoryRepository = $this->objectManager->get(CategoryRepository::class);
-     }
- 
-     /**
--     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-@@ -70,21 +80,12 @@ class CategoryTest extends GraphQlAbstract
-     }
- }
- QUERY;
--
--        // get customer ID token
--        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
--        $customerTokenService = $this->objectManager->create(
--            \Magento\Integration\Api\CustomerTokenServiceInterface::class
--        );
--        $customerToken = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
--
--        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
--        $response = $this->graphQlQuery($query, [], '', $headerMap);
-+        $response = $this->graphQlQuery($query);
-         $responseDataObject = new DataObject($response);
-         //Some sort of smoke testing
-         self::assertEquals(
--            'Ololo',
--            $responseDataObject->getData('category/children/7/children/1/description')
-+            'Its a description of Test Category 1.2',
-+            $responseDataObject->getData('category/children/0/children/1/description')
-         );
-         self::assertEquals(
-             'default-category',
-@@ -99,19 +100,108 @@ QUERY;
-             $responseDataObject->getData('category/children/0/default_sort_by')
-         );
-         self::assertCount(
--            8,
-+            7,
-             $responseDataObject->getData('category/children')
-         );
-         self::assertCount(
-             2,
--            $responseDataObject->getData('category/children/7/children')
-+            $responseDataObject->getData('category/children/0/children')
-         );
-         self::assertEquals(
--            5,
--            $responseDataObject->getData('category/children/7/children/1/children/0/id')
-+            13,
-+            $responseDataObject->getData('category/children/0/children/1/id')
-         );
-     }
- 
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
-+     */
-+    public function testCategoriesTreeWithDisabledCategory()
-+    {
-+        $category = $this->categoryRepository->get(3);
-+        $category->setIsActive(false);
-+        $this->categoryRepository->save($category);
-+
-+        $rootCategoryId = 2;
-+        $query = <<<QUERY
-+{
-+  category(id: {$rootCategoryId}) {
-+      id
-+      name
-+      level
-+      description
-+      children {
-+        id
-+        name
-+        productImagePreview: products(pageSize: 1) {
-+            items {
-+                id
-+                } 
-+            }
-+      }
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->assertArrayHasKey('category', $response);
-+        $this->assertArrayHasKey('children', $response['category']);
-+        $this->assertSame(6, count($response['category']['children']));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
-+     */
-+    public function testGetCategoryById()
-+    {
-+        $categoryId = 13;
-+        $query = <<<QUERY
-+{
-+  category(id: {$categoryId}) {
-+      id
-+      name
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+        self::assertEquals('Category 1.2', $response['category']['name']);
-+        self::assertEquals(13, $response['category']['id']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Category doesn't exist
-+     */
-+    public function testGetDisabledCategory()
-+    {
-+        $categoryId = 8;
-+        $query = <<<QUERY
-+{
-+  category(id: {$categoryId}) {
-+      id
-+      name
-+  }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+
-+    public function testNonExistentCategoryWithProductCount()
-+    {
-+        $query = <<<QUERY
-+{
-+  category(id: 99) {
-+      product_count
-+    }
-+}
-+QUERY;
-+
-+        $this->expectException(ResponseContainsErrorsException::class);
-+        $this->expectExceptionMessage('GraphQL response contains errors: Category doesn\'t exist');
-+        $this->graphQlQuery($query);
-+    }
-+
-     /**
-      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-@@ -132,7 +222,9 @@ QUERY;
-         attribute_set_id
-         country_of_manufacture
-         created_at
--        description
-+        description {
-+            html
-+        }
-         gift_message_available
-         id
-         categories {
-@@ -141,8 +233,7 @@ QUERY;
-           available_sort_by
-           level
-         }
--        image
--        image_label
-+        image { url, label }
-         meta_description
-         meta_keyword
-         meta_title
-@@ -223,16 +314,16 @@ QUERY;
-           position
-           sku
-         }
--        short_description
-+        short_description {
-+            html
-+        }
-         sku
--        small_image
--        small_image_label
-+        small_image { url, label }
-+        thumbnail { url, label }
-         special_from_date
-         special_price
-         special_to_date
-         swatch_image
--        thumbnail
--        thumbnail_label
-         tier_price
-         tier_prices {
-           customer_group_id
-@@ -258,17 +349,14 @@ QUERY;
-   }
- }
- QUERY;
--
-         $response = $this->graphQlQuery($query);
-         $this->assertArrayHasKey('products', $response['category']);
-         $this->assertArrayHasKey('total_count', $response['category']['products']);
-         $this->assertGreaterThanOrEqual(1, $response['category']['products']['total_count']);
-         $this->assertEquals(1, $response['category']['products']['page_info']['current_page']);
-         $this->assertEquals(20, $response['category']['products']['page_info']['page_size']);
--
-         $this->assertArrayHasKey('sku', $response['category']['products']['items'][0]);
-         $firstProductSku = $response['category']['products']['items'][0]['sku'];
--
-         /**
-          * @var ProductRepositoryInterface $productRepository
-          */
-@@ -290,9 +378,7 @@ QUERY;
-         /** @var CategoryInterface $category */
-         $category = $categoryCollection->getFirstItem();
-         $categoryId = $category->getId();
--
-         $this->assertNotEmpty($categoryId, "Preconditions failed: category is not available.");
--
-         $query = <<<QUERY
- {
-   category(id: {$categoryId}) {
-@@ -306,7 +392,6 @@ QUERY;
-   }
- }
- QUERY;
--
-         $response = $this->graphQlQuery($query);
-         $expectedResponse = [
-             'category' => [
-@@ -330,7 +415,6 @@ QUERY;
-      */
-     private function assertBaseFields($product, $actualResponse)
-     {
--
-         $assertionMap = [
-             ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()],
-             ['response_field' => 'created_at', 'expected_value' => $product->getCreatedAt()],
-@@ -364,7 +448,6 @@ QUERY;
-             ['response_field' => 'type_id', 'expected_value' => $product->getTypeId()],
-             ['response_field' => 'updated_at', 'expected_value' => $product->getUpdatedAt()],
-         ];
--
-         $this->assertResponseFields($actualResponse, $assertionMap);
-     }
- 
-@@ -384,7 +467,6 @@ QUERY;
-                 'is_default' => true,
-             ]
-         ];
--
-         $this->assertEquals($actualResponse, $assertionMap);
-     }
- 
-@@ -409,34 +491,8 @@ QUERY;
-             'special_from_date',
-             'special_to_date',
-         ];
--
-         foreach ($eavAttributes as $eavAttribute) {
-             $this->assertArrayHasKey($eavAttribute, $actualResponse);
-         }
-     }
--
--    /**
--     * @param array $actualResponse
--     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
--     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
--     */
--    private function assertResponseFields($actualResponse, $assertionMap)
--    {
--        foreach ($assertionMap as $key => $assertionData) {
--            $expectedValue = isset($assertionData['expected_value'])
--                ? $assertionData['expected_value']
--                : $assertionData;
--            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
--            self::assertNotNull(
--                $expectedValue,
--                "Value of '{$responseField}' field must not be NULL"
--            );
--            self::assertEquals(
--                $expectedValue,
--                $actualResponse[$responseField],
--                "Value of '{$responseField}' field in response does not match expected value: "
--                . var_export($expectedValue, true)
--            );
--        }
--    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryWithDescriptionDirectivesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryWithDescriptionDirectivesTest.php
-new file mode 100644
-index 00000000000..c115f7124c9
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryWithDescriptionDirectivesTest.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Catalog;
-+
-+use Magento\Catalog\Api\CategoryRepositoryInterface;
-+use Magento\Catalog\Api\Data\CategoryInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for checking that category description directives are rendered correctly
-+ */
-+class CategoryWithDescriptionDirectivesTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var \Magento\TestFramework\ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/category.php
-+     */
-+    public function testHtmlDirectivesRendered()
-+    {
-+        $categoryId = 333;
-+        $mediaFilePath = '/path/to/mediafile';
-+        /** @var StoreManagerInterface $storeManager */
-+        $storeManager = ObjectManager::getInstance()->get(StoreManagerInterface::class);
-+        $storeBaseUrl = $storeManager->getStore()->getBaseUrl();
-+
-+        /* Remove index.php from base URL */
-+        $storeBaseUrlParts = explode('/index.php', $storeBaseUrl);
-+        $storeBaseUrl = $storeBaseUrlParts[0];
-+
-+        /** @var CategoryRepositoryInterface $categoryRepository */
-+        $categoryRepository = ObjectManager::getInstance()->get(CategoryRepositoryInterface::class);
-+        /** @var CategoryInterface $category */
-+        $category = $categoryRepository->get($categoryId);
-+        $category->setDescription('Test: {{media url="' . $mediaFilePath . '"}}');
-+        $categoryRepository->save($category);
-+
-+        $query = <<<QUERY
-+{
-+  category(id: {$categoryId}) {
-+    description
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertNotContains('media url', $response['category']['description']);
-+        self::assertContains($storeBaseUrl, $response['category']['description']);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/MediaGalleryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/MediaGalleryTest.php
-new file mode 100644
-index 00000000000..49e2a9dd539
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/MediaGalleryTest.php
-@@ -0,0 +1,95 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Catalog;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test cases for product media gallery data retrieval.
-+ */
-+class MediaGalleryTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var \Magento\TestFramework\ObjectManager
-+     */
-+    private $objectManager;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
-+     */
-+    public function testProductSmallImageUrlWithExistingImage()
-+    {
-+        $productSku = 'simple';
-+        $query = <<<QUERY
-+{
-+  products(filter: {sku: {eq: "{$productSku}"}}) {
-+    items {
-+        small_image {
-+            url
-+        }
-+    }
-+  }    
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('url', $response['products']['items'][0]['small_image']);
-+        self::assertContains('magento_image.jpg', $response['products']['items'][0]['small_image']['url']);
-+        self::assertTrue($this->checkImageExists($response['products']['items'][0]['small_image']['url']));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
-+     */
-+    public function testProductMediaGalleryEntries()
-+    {
-+        $this->markTestSkipped('https://github.com/magento/graphql-ce/issues/738');
-+        $productSku = 'simple';
-+        $query = <<<QUERY
-+{
-+  products(filter: {sku: {eq: "{$productSku}"}}) {
-+    items {
-+      name
-+      sku
-+      media_gallery_entries {
-+        id
-+        file
-+        types
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('file', $response['products']['items'][0]['media_gallery_entries'][0]);
-+        self::assertContains('magento_image.jpg', $response['products']['items'][0]['media_gallery_entries'][0]['url']);
-+    }
-+
-+    /**
-+     * @param string $url
-+     * @return bool
-+     */
-+    private function checkImageExists(string $url): bool
-+    {
-+        // phpcs:disable Magento2.Functions.DiscouragedFunction
-+        $connection = curl_init($url);
-+        curl_setopt($connection, CURLOPT_HEADER, true);
-+        curl_setopt($connection, CURLOPT_NOBODY, true);
-+        curl_setopt($connection, CURLOPT_RETURNTRANSFER, 1);
-+        curl_exec($connection);
-+        $responseStatus = curl_getinfo($connection, CURLINFO_HTTP_CODE);
-+        // phpcs:enable Magento2.Functions.DiscouragedFunction
-+        return $responseStatus === 200 ? true : false;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php
-index 2db400769c3..063da7c11bf 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php
-@@ -231,29 +231,4 @@ QUERY;
-             );
-         }
-     }
--
--    /**
--     * @param array $actualResponse
--     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
--     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
--     */
--    private function assertResponseFields(array $actualResponse, array $assertionMap)
--    {
--        foreach ($assertionMap as $key => $assertionData) {
--            $expectedValue = isset($assertionData['expected_value'])
--                ? $assertionData['expected_value']
--                : $assertionData;
--            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
--            $this->assertNotNull(
--                $expectedValue,
--                "Value of '{$responseField}' field must not be NULL"
--            );
--            $this->assertEquals(
--                $expectedValue,
--                $actualResponse[$responseField],
--                "Value of '{$responseField}' field in response does not match expected value: "
--                . var_export($expectedValue, true)
--            );
--        }
--    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductImageTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductImageTest.php
-new file mode 100644
-index 00000000000..b957292a3ac
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductImageTest.php
-@@ -0,0 +1,149 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Catalog;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+class ProductImageTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var \Magento\TestFramework\ObjectManager
-+     */
-+    private $objectManager;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
-+     */
-+    public function testProductWithBaseImage()
-+    {
-+        $productSku = 'simple';
-+        $query = <<<QUERY
-+{
-+  products(filter: {sku: {eq: "{$productSku}"}}) {
-+    items {
-+        image {
-+            url
-+            label
-+        }
-+    }
-+  }    
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertContains('magento_image.jpg', $response['products']['items'][0]['image']['url']);
-+        self::assertTrue($this->checkImageExists($response['products']['items'][0]['image']['url']));
-+        self::assertEquals('Image Alt Text', $response['products']['items'][0]['image']['label']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-+     */
-+    public function testProductWithoutBaseImage()
-+    {
-+        $productSku = 'simple';
-+        $query = <<<QUERY
-+{
-+  products(filter: {sku: {eq: "{$productSku}"}}) {
-+    items {
-+        image {
-+            url
-+            label
-+        }
-+        small_image {
-+            url
-+            label
-+        }
-+    }
-+  }    
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+        self::assertEquals('Simple Product', $response['products']['items'][0]['image']['label']);
-+        self::assertStringEndsWith(
-+            'images/product/placeholder/image.jpg',
-+            $response['products']['items'][0]['image']['url']
-+        );
-+        self::assertEquals('Simple Product', $response['products']['items'][0]['small_image']['label']);
-+        self::assertStringEndsWith(
-+            'images/product/placeholder/small_image.jpg',
-+            $response['products']['items'][0]['small_image']['url']
-+        );
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
-+     */
-+    public function testProductWithSmallImage()
-+    {
-+        $productSku = 'simple';
-+        $query = <<<QUERY
-+{
-+  products(filter: {sku: {eq: "{$productSku}"}}) {
-+    items {
-+        small_image {
-+            url
-+            label
-+        }
-+    }
-+  }    
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertContains('magento_image.jpg', $response['products']['items'][0]['small_image']['url']);
-+        self::assertTrue($this->checkImageExists($response['products']['items'][0]['small_image']['url']));
-+        self::assertEquals('Image Alt Text', $response['products']['items'][0]['small_image']['label']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
-+     */
-+    public function testProductWithThumbnail()
-+    {
-+        $productSku = 'simple';
-+        $query = <<<QUERY
-+{
-+  products(filter: {sku: {eq: "{$productSku}"}}) {
-+    items {
-+        thumbnail {
-+            url
-+            label
-+        }
-+    }
-+  }    
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertContains('magento_image.jpg', $response['products']['items'][0]['thumbnail']['url']);
-+        self::assertTrue($this->checkImageExists($response['products']['items'][0]['thumbnail']['url']));
-+        self::assertEquals('Image Alt Text', $response['products']['items'][0]['thumbnail']['label']);
-+    }
-+
-+    /**
-+     * @param string $url
-+     * @return bool
-+     */
-+    private function checkImageExists(string $url): bool
-+    {
-+        $connection = curl_init($url);
-+        curl_setopt($connection, CURLOPT_HEADER, true);
-+        curl_setopt($connection, CURLOPT_NOBODY, true);
-+        curl_setopt($connection, CURLOPT_RETURNTRANSFER, 1);
-+        curl_exec($connection);
-+        $responseStatus = curl_getinfo($connection, CURLINFO_HTTP_CODE);
-+
-+        return $responseStatus === 200 ? true : false;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
-index 2ef081ebcfa..d17b434f39d 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
-@@ -10,10 +10,13 @@ namespace Magento\GraphQl\Catalog;
- use Magento\TestFramework\ObjectManager;
- use Magento\TestFramework\TestCase\GraphQlAbstract;
- 
-+/**
-+ * Class ProductInMultipleStoresTest
-+ */
- class ProductInMultipleStoresTest extends GraphQlAbstract
- {
--
-     /**
-+     * Test a product from a specific and a default store
-      *
-      * @magentoApiDataFixture Magento/Store/_files/second_store.php
-      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-@@ -94,7 +97,7 @@ QUERY;
-         $nonExistingStoreCode = "non_existent_store";
-         $headerMapInvalidStoreCode = ['Store' => $nonExistingStoreCode];
-         $this->expectException(\Exception::class);
--        $this->expectExceptionMessage('Store code non_existent_store does not exist');
-+        $this->expectExceptionMessage('Requested store is not found');
-         $this->graphQlQuery($query, [], '', $headerMapInvalidStoreCode);
-     }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
-index dc5a66fbb34..4ce8ad8dab3 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
-@@ -381,84 +381,13 @@ QUERY;
- }
- QUERY;
-         $this->expectException(\Exception::class);
--        $this->expectExceptionMessage('GraphQL response contains errors: currentPage value 1 specified is greater ' .
--            'than the number of pages available.');
-+        $this->expectExceptionMessage(
-+            'GraphQL response contains errors: currentPage value 2 specified is greater ' .
-+            'than the 1 page(s) available'
-+        );
-         $this->graphQlQuery($query);
-     }
- 
--    /**
--     * The query returns a total_count of 2 records; setting the pageSize = 1 and currentPage2
--     * Expected result is to get the second product on the list on the second page
--     *
--     * @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
--     */
--    public function testSearchWithFilterPageSizeLessThanCurrentPage()
--    {
--
--        $query
--            = <<<QUERY
--{
--    products(
--     search : "simple"
--        filter:
--        {
--          special_price:{neq:"null"}
--          price:{lt:"60"}
--          or:
--          {
--           sku:{like:"%simple%"}
--           name:{like:"%configurable%"}
--          }
--           weight:{eq:"1"}
--        }
--        pageSize:1
--        currentPage:2
--        sort:
--       {
--        price:DESC
--       }
--    )
--    {
--        items
--         {
--           sku
--           price {
--            minimalPrice {
--                amount {
--                    value
--                    currency
--                }
--            }
--           }
--           name
--           ... on PhysicalProductInterface {
--            weight
--           }
--           type_id
--           attribute_set_id
--         }
--        total_count
--        page_info
--        {
--          page_size
--        }
--    }
--}
--QUERY;
--        /**
--         * @var ProductRepositoryInterface $productRepository
--         */
--        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
--        // when pagSize =1 and currentPage = 2, it should have simple2 on first page and simple1 on 2nd page
--        // since sorting is done on price in the DESC order
--        $product = $productRepository->get('simple1');
--        $filteredProducts = [$product];
--
--        $response = $this->graphQlQuery($query);
--        $this->assertEquals(1, $response['products']['total_count']);
--        $this->assertProductItems($filteredProducts, $response);
--    }
--
-     /**
-      * Requesting for items that match a specific SKU or NAME within a certain price range sorted by Price in ASC order
-      *
-@@ -549,12 +478,11 @@ QUERY;
-     }
- 
-     /**
--     * Verify the items in the second page is correct after sorting their name in ASC order
-+     * Verify the items is correct after sorting their name in ASC order
-      *
-      * @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
--    public function testFilterProductsInNextPageSortedByNameASC()
-+    public function testQueryProductsSortedByNameASC()
-     {
-         $query
-             = <<<QUERY
-@@ -562,44 +490,27 @@ QUERY;
-     products(
-         filter:
-         {
--            price:{gt: "5", lt: "50"}
--            or:
--            {
--                sku:{eq:"simple1"}
--                name:{like:"configurable%"}
--            }
-+            sku:{in:["simple2", "simple1"]}
-         }
--         pageSize:4
-+         pageSize:1
-          currentPage:2
-          sort:
-          {
--          name:ASC
-+             name:ASC
-          }
-     )
-     {
-       items
-       {
-         sku
--        price {
--            minimalPrice {
--                amount {
--                    value
--                    currency
--                }
--            }
--        }
-         name
--        type_id
--        ... on PhysicalProductInterface {
--            weight
--           }
--           attribute_set_id
--         }
--        total_count
--        page_info
--        {
-+      }
-+      total_count
-+      page_info
-+      {
-           page_size
--        }
-+          current_page
-+      }
-     }
- }
- QUERY;
-@@ -607,13 +518,15 @@ QUERY;
-          * @var ProductRepositoryInterface $productRepository
-          */
-         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
--        $product = $productRepository->get('simple1');
--        $filteredProducts = [$product];
-+        $product = $productRepository->get('simple2');
- 
-         $response = $this->graphQlQuery($query);
--        $this->assertEquals(1, $response['products']['total_count']);
--        $this->assertProductItems($filteredProducts, $response);
--        $this->assertEquals(4, $response['products']['page_info']['page_size']);
-+        $this->assertEquals(2, $response['products']['total_count']);
-+        $this->assertEquals(['page_size' => 1, 'current_page' => 2], $response['products']['page_info']);
-+        $this->assertEquals(
-+            [['sku' => $product->getSku(), 'name' => $product->getName()]],
-+            $response['products']['items']
-+        );
-     }
- 
-     /**
-@@ -1132,8 +1045,10 @@ QUERY;
- QUERY;
- 
-         $this->expectException(\Exception::class);
--        $this->expectExceptionMessage('GraphQL response contains errors: currentPage value 1 specified is greater ' .
--            'than the number of pages available.');
-+        $this->expectExceptionMessage(
-+            'GraphQL response contains errors: currentPage value 2 specified is greater ' .
-+            'than the 1 page(s) available.'
-+        );
-         $this->graphQlQuery($query);
-     }
- 
-@@ -1164,8 +1079,10 @@ QUERY;
- QUERY;
- 
-         $this->expectException(\Exception::class);
--        $this->expectExceptionMessage('GraphQL response contains errors: \'search\' or \'filter\' input argument is ' .
--            'required.');
-+        $this->expectExceptionMessage(
-+            'GraphQL response contains errors: \'search\' or \'filter\' input argument is ' .
-+            'required.'
-+        );
-         $this->graphQlQuery($query);
-     }
- 
-@@ -1220,6 +1137,64 @@ QUERY;
-         $this->assertEquals(1, $response['products']['total_count']);
-     }
- 
-+    /**
-+     * Verify that invalid current page return an error
-+     *
-+     * @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage currentPage value must be greater than 0
-+     */
-+    public function testInvalidCurrentPage()
-+    {
-+        $query = <<<QUERY
-+{
-+  products (
-+    filter: {
-+      sku: {
-+        like:"simple%"
-+      }
-+    }
-+    pageSize: 4
-+    currentPage: 0
-+  ) {
-+    items {
-+      sku
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * Verify that invalid page size returns an error.
-+     *
-+     * @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage pageSize value must be greater than 0
-+     */
-+    public function testInvalidPageSize()
-+    {
-+        $query = <<<QUERY
-+{
-+  products (
-+    filter: {
-+      sku: {
-+        like:"simple%"
-+      }
-+    }
-+    pageSize: 0
-+    currentPage: 1
-+  ) {
-+    items {
-+      sku
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+
-     /**
-      * Asserts the different fields of items returned after search query is executed
-      *
-@@ -1229,7 +1204,7 @@ QUERY;
-     private function assertProductItems(array $filteredProducts, array $actualResponse)
-     {
-         $productItemsInResponse = array_map(null, $actualResponse['products']['items'], $filteredProducts);
--
-+        // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
-         for ($itemIndex = 0; $itemIndex < count($filteredProducts); $itemIndex++) {
-             $this->assertNotEmpty($productItemsInResponse[$itemIndex]);
-             $this->assertResponseFields(
-@@ -1283,29 +1258,4 @@ QUERY;
-             );
-         }
-     }
--
--    /**
--     * @param array $actualResponse
--     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
--     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
--     */
--    private function assertResponseFields(array $actualResponse, array $assertionMap)
--    {
--        foreach ($assertionMap as $key => $assertionData) {
--            $expectedValue = isset($assertionData['expected_value'])
--                ? $assertionData['expected_value']
--                : $assertionData;
--            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
--            $this->assertNotNull(
--                $expectedValue,
--                "Value of '{$responseField}' field must not be NULL"
--            );
--            $this->assertEquals(
--                $expectedValue,
--                $actualResponse[$responseField],
--                "Value of '{$responseField}' field in response does not match expected value: "
--                . var_export($expectedValue, true)
--            );
--        }
--    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductTextAttributesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductTextAttributesTest.php
-new file mode 100644
-index 00000000000..999e1cc7fca
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductTextAttributesTest.php
-@@ -0,0 +1,142 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Catalog;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+class ProductTextAttributesTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    protected function setUp()
-+    {
-+        $this->productRepository = Bootstrap::getObjectManager()::getInstance()->get(ProductRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-+     */
-+    public function testProductTextAttributes()
-+    {
-+        $productSku = 'simple';
-+
-+        $query = <<<QUERY
-+{
-+    products(filter: {sku: {eq: "{$productSku}"}})
-+    {
-+        items {
-+            sku
-+            description {
-+                html
-+            }
-+            short_description {
-+                html
-+            }
-+        }
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->assertEquals(
-+            $productSku,
-+            $response['products']['items'][0]['sku']
-+        );
-+        $this->assertEquals(
-+            'Short description',
-+            $response['products']['items'][0]['short_description']['html']
-+        );
-+        $this->assertEquals(
-+            'Description with <b>html tag</b>',
-+            $response['products']['items'][0]['description']['html']
-+        );
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-+     */
-+    public function testProductWithoutFilledTextAttributes()
-+    {
-+        $productSku = 'virtual-product';
-+
-+        $query = <<<QUERY
-+{
-+    products(filter: {sku: {eq: "{$productSku}"}})
-+    {
-+        items {
-+            sku
-+            description {
-+                html
-+            }
-+            short_description {
-+                html
-+            }
-+        }
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->assertEquals(
-+            $productSku,
-+            $response['products']['items'][0]['sku']
-+        );
-+        $this->assertEquals(
-+            '',
-+            $response['products']['items'][0]['short_description']['html']
-+        );
-+        $this->assertEquals(
-+            '',
-+            $response['products']['items'][0]['description']['html']
-+        );
-+    }
-+
-+    /**
-+     * Test for checking that product fields with directives allowed are rendered correctly
-+     *
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-+     * @magentoApiDataFixture Magento/Cms/_files/block.php
-+     */
-+    public function testHtmlDirectivesRendering()
-+    {
-+        $productSku = 'simple';
-+        $cmsBlockId = 'fixture_block';
-+        $assertionCmsBlockText = 'Fixture Block Title';
-+
-+        $product = $this->productRepository->get($productSku, false, null, true);
-+        $product->setDescription('Test: {{block id="' . $cmsBlockId . '"}}');
-+        $product->setShortDescription('Test: {{block id="' . $cmsBlockId . '"}}');
-+        $this->productRepository->save($product);
-+
-+        $query = <<<QUERY
-+{
-+    products(filter: {sku: {eq: "{$productSku}"}}) {
-+        items {
-+            description {
-+                html
-+            }
-+            short_description {
-+                html
-+            }
-+        }
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertContains($assertionCmsBlockText, $response['products']['items'][0]['description']['html']);
-+        self::assertNotContains('{{block id', $response['products']['items'][0]['description']['html']);
-+        self::assertContains($assertionCmsBlockText, $response['products']['items'][0]['short_description']['html']);
-+        self::assertNotContains('{{block id', $response['products']['items'][0]['short_description']['html']);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
-index b5aa73a5a7a..e517b22ad09 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
-@@ -44,7 +44,6 @@ class ProductViewTest extends GraphQlAbstract
-             attribute_set_id
-             country_of_manufacture
-             created_at
--            description
-             gift_message_available
-             id
-             categories {
-@@ -53,8 +52,7 @@ class ProductViewTest extends GraphQlAbstract
-                available_sort_by
-                level
-             }
--            image
--            image_label
-+            image { url, label }
-             meta_description
-             meta_keyword
-             meta_title
-@@ -92,6 +90,7 @@ class ProductViewTest extends GraphQlAbstract
-                 title
-                 required
-                 sort_order
-+                option_id
-                 ... on CustomizableFieldOption {
-                   product_sku
-                   field_option: value {
-@@ -138,6 +137,26 @@ class ProductViewTest extends GraphQlAbstract
-                     sort_order
-                   }
-                 }
-+                ... on CustomizableCheckboxOption {
-+                  checkbox_option: value {
-+                    option_type_id
-+                    sku
-+                    price
-+                    price_type
-+                    title
-+                    sort_order
-+                  }
-+                }
-+                ... on CustomizableMultipleOption {
-+                  multiple_option: value {
-+                    option_type_id
-+                    sku
-+                    price
-+                    price_type
-+                    title
-+                    sort_order
-+                  }
-+                }
-                 ...on CustomizableFileOption {
-                     product_sku
-                     file_option: value {
-@@ -203,16 +222,13 @@ class ProductViewTest extends GraphQlAbstract
-                 position
-                 sku
-             }
--            short_description
-             sku
--            small_image
--            small_image_label
-+            small_image{ url, label }
-+            thumbnail { url, label }
-             special_from_date
-             special_price
-             special_to_date
--            swatch_image
--            thumbnail
--            thumbnail_label
-+            swatch_image            
-             tier_price
-             tier_prices
-             {
-@@ -285,7 +301,6 @@ QUERY;
-      */
-     public function testQueryMediaGalleryEntryFieldsSimpleProduct()
-     {
--        $this->markTestSkipped("Skipped until ticket MAGETWO-90021 is resolved.");
-         $productSku = 'simple';
- 
-         $query = <<<QUERY
-@@ -300,11 +315,9 @@ QUERY;
-             }
-             country_of_manufacture
-             created_at
--            description
-             gift_message_available
-             id
--            image
--            image_label
-+            image {url, label}
-             meta_description
-             meta_keyword
-             meta_title
-@@ -342,6 +355,7 @@ QUERY;
-                 title
-                 required
-                 sort_order
-+                option_id
-                 ... on CustomizableFieldOption {
-                   product_sku
-                   field_option: value {
-@@ -451,16 +465,13 @@ QUERY;
-                 position
-                 sku
-             }
--            short_description
-             sku
--            small_image
--            small_image_label
-+            small_image { url, label }
-             special_from_date
-             special_price
-             special_to_date
-             swatch_image
--            thumbnail
--            thumbnail_label
-+            thumbnail { url, label }
-             tier_price
-             tier_prices
-             {
-@@ -484,7 +495,7 @@ QUERY;
- QUERY;
- 
-         $response = $this->graphQlQuery($query);
--        
-+
-         /**
-          * @var ProductRepositoryInterface $productRepository
-          */
-@@ -745,7 +756,7 @@ QUERY;
-                         $values = $option->getValues();
-                         /** @var \Magento\Catalog\Model\Product\Option\Value $value */
-                         $value = current($values);
--                        $findValueKeyName = $option->getType() === 'radio' ? 'radio_option' : 'drop_down_option';
-+                        $findValueKeyName = $option->getType() . '_option';
-                         if ($value->getTitle() === $optionsArray[$findValueKeyName][0]['title']) {
-                             $match = true;
-                         }
-@@ -760,11 +771,12 @@ QUERY;
-             $assertionMap = [
-                 ['response_field' => 'sort_order', 'expected_value' => $option->getSortOrder()],
-                 ['response_field' => 'title', 'expected_value' => $option->getTitle()],
--                ['response_field' => 'required', 'expected_value' => $option->getIsRequire()]
-+                ['response_field' => 'required', 'expected_value' => $option->getIsRequire()],
-+                ['response_field' => 'option_id', 'expected_value' => $option->getOptionId()]
-             ];
- 
-             if (!empty($option->getValues())) {
--                $valueKeyName = $option->getType() === 'radio' ? 'radio_option' : 'drop_down_option';
-+                $valueKeyName = $option->getType() . '_option';
-                 $value = current($optionsArray[$valueKeyName]);
-                 /** @var \Magento\Catalog\Model\Product\Option\Value $productValue */
-                 $productValue = current($option->getValues());
-@@ -784,7 +796,7 @@ QUERY;
-                         ['response_field' => 'product_sku', 'expected_value' => $option->getProductSku()],
-                     ]
-                 );
--                $valueKeyName = "";
-+
-                 if ($option->getType() === 'file') {
-                     $valueKeyName = 'file_option';
-                     $valueAssertionMap = [
-@@ -915,11 +927,9 @@ QUERY;
-     {
-         $eavAttributes = [
-             'url_key',
--            'description',
-             'meta_description',
-             'meta_keyword',
-             'meta_title',
--            'short_description',
-             'country_of_manufacture',
-             'gift_message_available',
-             'news_from_date',
-@@ -957,29 +967,4 @@ QUERY;
-         }
-         return $eavAttributeCode;
-     }
--
--    /**
--     * @param array $actualResponse
--     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
--     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
--     */
--    private function assertResponseFields($actualResponse, $assertionMap)
--    {
--        foreach ($assertionMap as $key => $assertionData) {
--            $expectedValue = isset($assertionData['expected_value'])
--                ? $assertionData['expected_value']
--                : $assertionData;
--            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
--            self::assertNotNull(
--                $expectedValue,
--                "Value of '{$responseField}' field must not be NULL"
--            );
--            self::assertEquals(
--                $expectedValue,
--                $actualResponse[$responseField],
--                "Value of '{$responseField}' field in response does not match expected value: "
--                . var_export($expectedValue, true)
--            );
--        }
--    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/StoreConfigTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/StoreConfigTest.php
-new file mode 100644
-index 00000000000..2672431dbb5
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/StoreConfigTest.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Catalog;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test the GraphQL endpoint's StoreConfigs query for Catalog Configs
-+ */
-+class StoreConfigTest extends GraphQlAbstract
-+{
-+    protected function setUp()
-+    {
-+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Store/_files/store.php
-+     */
-+    public function testGetStoreConfig()
-+    {
-+        $query
-+            = <<<QUERY
-+{
-+  storeConfig{
-+    product_url_suffix,
-+    category_url_suffix,
-+    title_separator,
-+    list_mode,
-+    grid_per_page_values,
-+    list_per_page_values,
-+    grid_per_page,
-+    list_per_page,
-+    catalog_default_sort_by
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+        $this->assertArrayHasKey('storeConfig', $response);
-+
-+        //TODO: provide assertions after unmarking test as incomplete
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/UrlRewritesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/UrlRewritesTest.php
-new file mode 100644
-index 00000000000..43796d78064
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/UrlRewritesTest.php
-@@ -0,0 +1,153 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Catalog;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\UrlRewrite\Model\UrlFinderInterface;
-+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite as UrlRewriteDTO;
-+
-+/**
-+ * Test of getting URL rewrites data from products
-+ */
-+class UrlRewritesTest extends GraphQlAbstract
-+{
-+    /**
-+     *
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    public function testProductWithNoCategoriesAssigned()
-+    {
-+        $productSku = 'virtual-product';
-+        $query
-+            = <<<QUERY
-+{
-+    products (filter: {sku: {eq: "{$productSku}"}}) {
-+        items {
-+            name,
-+            sku,
-+            description {
-+                html
-+            }
-+            url_rewrites {
-+              url,
-+              parameters {
-+                name,
-+                value
-+              }
-+            }
-+        }
-+    }
-+}
-+QUERY;
-+
-+        $response = $this->graphQlQuery($query);
-+
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
-+        $product = $productRepository->get('virtual-product', false, null, true);
-+
-+        $urlFinder = ObjectManager::getInstance()->get(UrlFinderInterface::class);
-+
-+        $rewritesCollection = $urlFinder->findAllByData([UrlRewriteDTO::ENTITY_ID => $product->getId()]);
-+
-+        /* There should be only one rewrite */
-+        /** @var UrlRewriteDTO $urlRewrite */
-+        $urlRewrite = current($rewritesCollection);
-+
-+        $this->assertArrayHasKey('url_rewrites', $response['products']['items'][0]);
-+        $this->assertCount(1, $response['products']['items'][0]['url_rewrites']);
-+
-+        $this->assertResponseFields(
-+            $response['products']['items'][0]['url_rewrites'][0],
-+            [
-+                "url" => $urlRewrite->getRequestPath(),
-+                "parameters" => $this->getUrlParameters($urlRewrite->getTargetPath())
-+            ]
-+        );
-+    }
-+
-+    /**
-+     *
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    public function testProductWithOneCategoryAssigned()
-+    {
-+        $productSku = 'simple';
-+        $query
-+            = <<<QUERY
-+{
-+    products (filter: {sku: {eq: "{$productSku}"}}) {
-+        items {
-+            name,
-+            sku,
-+            description {
-+                html
-+            }
-+            url_rewrites {
-+              url,
-+              parameters {
-+                name,
-+                value
-+              }
-+            }
-+        }
-+    }
-+}
-+QUERY;
-+
-+        $response = $this->graphQlQuery($query);
-+
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
-+        $product = $productRepository->get('simple', false, null, true);
-+
-+        $urlFinder = ObjectManager::getInstance()->get(UrlFinderInterface::class);
-+
-+        $rewritesCollection = $urlFinder->findAllByData([UrlRewriteDTO::ENTITY_ID => $product->getId()]);
-+        $rewritesCount = count($rewritesCollection);
-+
-+        $this->assertArrayHasKey('url_rewrites', $response['products']['items'][0]);
-+        $this->assertCount($rewritesCount, $response['products']['items'][0]['url_rewrites']);
-+
-+        for ($i = 0; $i < $rewritesCount; $i++) {
-+            $urlRewrite = $rewritesCollection[$i];
-+            $this->assertResponseFields(
-+                $response['products']['items'][0]['url_rewrites'][$i],
-+                [
-+                    "url" => $urlRewrite->getRequestPath(),
-+                    "parameters" => $this->getUrlParameters($urlRewrite->getTargetPath())
-+                ]
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Parses target path and extracts parameters
-+     *
-+     * @param string $targetPath
-+     * @return array
-+     */
-+    private function getUrlParameters(string $targetPath): array
-+    {
-+        $urlParameters = [];
-+        $targetPathParts = explode('/', trim($targetPath, '/'));
-+
-+        for ($i = 3; ($i < sizeof($targetPathParts) - 1); $i += 2) {
-+            $urlParameters[] = [
-+                'name' => $targetPathParts[$i],
-+                'value' => $targetPathParts[$i + 1]
-+            ];
-+        }
-+
-+        return $urlParameters;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php
-index df3386f2f78..58b6d4f0e4e 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php
-@@ -134,29 +134,4 @@ QUERY;
- 
-         $this->assertResponseFields($actualResponse, $assertionMap);
-     }
--
--    /**
--     * @param array $actualResponse
--     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
--     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
--     */
--    private function assertResponseFields($actualResponse, $assertionMap)
--    {
--        foreach ($assertionMap as $key => $assertionData) {
--            $expectedValue = isset($assertionData['expected_value'])
--                ? $assertionData['expected_value']
--                : $assertionData;
--            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
--            $this->assertNotNull(
--                $expectedValue,
--                "Value of '{$responseField}' field must not be NULL"
--            );
--            $this->assertEquals(
--                $expectedValue,
--                $actualResponse[$responseField],
--                "Value of '{$responseField}' field in response does not match expected value: "
--                . var_export($expectedValue, true)
--            );
--        }
--    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
-new file mode 100644
-index 00000000000..91982d298c9
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
-@@ -0,0 +1,157 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\CatalogInventory;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Add simple product to cart testcases related to inventory
-+ */
-+class AddProductToCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The requested qty is not available
-+     */
-+    public function testAddProductIfQuantityIsNotAvailable()
-+    {
-+        $sku = 'simple';
-+        $quantity = 200;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Some of the products are out of stock.
-+     */
-+    public function testUpdateProductOutOfStockInCart()
-+    {
-+        $sku = 'simple';
-+        $qty = 1;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-+        $this->graphQlQuery($query);
-+
-+        $product = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+        $productId = $product->getIdBySku($sku);
-+        $product->load($productId);
-+        $product->setStockData(['is_in_stock' => 0]);
-+        $product->save();
-+
-+        $this->graphQlQuery($query);
-+    }
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     * @magentoConfigFixture default cataloginventory/item_options/max_sale_qty 5
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The most you may purchase is 5.
-+     */
-+    public function testAddMoreProductsThatAllowed()
-+    {
-+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
-+
-+        $sku = 'custom-design-simple-product';
-+        $quantity = 7;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Please enter a number greater than 0 in this field.
-+     */
-+    public function testAddSimpleProductToCartWithNegativeQuantity()
-+    {
-+        $sku = 'simple';
-+        $quantity = -2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     */
-+    public function testAddProductIfQuantityIsDecimal()
-+    {
-+        $sku = 'simple_product';
-+        $quantity = 0.2;
-+
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+
-+        $this->expectExceptionMessage(
-+            "Could not add the product with SKU {$sku} to the shopping cart: The fewest you may purchase is 1"
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $sku
-+     * @param float $quantity
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, string $sku, float $quantity) : string
-+    {
-+        return <<<QUERY
-+mutation {  
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "{$maskedQuoteId}", 
-+      cart_items: [
-+        {
-+          data: {
-+            quantity: $quantity
-+            sku: "$sku"
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      items {
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductOnlyXLeftInStockTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductOnlyXLeftInStockTest.php
-new file mode 100644
-index 00000000000..3969c758f12
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductOnlyXLeftInStockTest.php
-@@ -0,0 +1,64 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\CatalogInventory;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+class ProductOnlyXLeftInStockTest extends GraphQlAbstract
-+{
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_all_fields.php
-+     */
-+    public function testQueryProductOnlyXLeftInStockDisabled()
-+    {
-+        $productSku = 'simple';
-+
-+        $query = <<<QUERY
-+        {
-+            products(filter: {sku: {eq: "{$productSku}"}})
-+            {
-+                items {
-+                    only_x_left_in_stock
-+                }
-+            }
-+        }
-+QUERY;
-+
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->assertArrayHasKey(0, $response['products']['items']);
-+        $this->assertArrayHasKey('only_x_left_in_stock', $response['products']['items'][0]);
-+        $this->assertNull($response['products']['items'][0]['only_x_left_in_stock']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_all_fields.php
-+     * @magentoConfigFixture default_store cataloginventory/options/stock_threshold_qty 120
-+     */
-+    public function testQueryProductOnlyXLeftInStockEnabled()
-+    {
-+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
-+        $productSku = 'simple';
-+
-+        $query = <<<QUERY
-+        {
-+            products(filter: {sku: {eq: "{$productSku}"}})
-+            {
-+                items {
-+                    only_x_left_in_stock            
-+                }
-+            }
-+        }
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->assertArrayHasKey(0, $response['products']['items']);
-+        $this->assertArrayHasKey('only_x_left_in_stock', $response['products']['items'][0]);
-+        $this->assertEquals(100, $response['products']['items'][0]['only_x_left_in_stock']);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductStockStatusTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductStockStatusTest.php
-new file mode 100644
-index 00000000000..c5571a4a338
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductStockStatusTest.php
-@@ -0,0 +1,82 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\CatalogInventory;
-+
-+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
-+use Magento\CatalogInventory\Api\StockRegistryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+class ProductStockStatusTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var StockRegistryInterface
-+     */
-+    private $stockRegistry;
-+
-+    protected function setUp()
-+    {
-+        $this->stockRegistry = Bootstrap::getObjectManager()->create(StockRegistryInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_all_fields.php
-+     */
-+    public function testQueryProductStockStatusInStock()
-+    {
-+        $productSku = 'simple';
-+
-+        $query = <<<QUERY
-+        {
-+            products(filter: {sku: {eq: "{$productSku}"}})
-+            {
-+                items {
-+                    stock_status            
-+                }
-+            }
-+        }
-+QUERY;
-+
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->assertArrayHasKey(0, $response['products']['items']);
-+        $this->assertArrayHasKey('stock_status', $response['products']['items'][0]);
-+        $this->assertEquals('IN_STOCK', $response['products']['items'][0]['stock_status']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_all_fields.php
-+     * @magentoConfigFixture default_store cataloginventory/options/show_out_of_stock 1
-+     */
-+    public function testQueryProductStockStatusOutOfStock()
-+    {
-+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
-+        $productSku = 'simple';
-+
-+        $query = <<<QUERY
-+        {
-+            products(filter: {sku: {eq: "{$productSku}"}})
-+            {
-+                items {
-+                    stock_status            
-+                }
-+            }
-+        }
-+QUERY;
-+
-+        $stockItem = $this->stockRegistry->getStockItemBySku($productSku);
-+        $stockItem->setQty(0);
-+        $this->stockRegistry->updateStockItemBySku($productSku, $stockItem);
-+
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->assertArrayHasKey(0, $response['products']['items']);
-+        $this->assertArrayHasKey('stock_status', $response['products']['items'][0]);
-+        $this->assertEquals('OUT_OF_STOCK', $response['products']['items'][0]['stock_status']);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/UpdateCartItemsTest.php
-new file mode 100644
-index 00000000000..3b238f86416
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/UpdateCartItemsTest.php
-@@ -0,0 +1,86 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\CatalogInventory;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\GraphQl\Quote\GetQuoteItemIdByReservedQuoteIdAndSku;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for updating/removing shopping cart items
-+ */
-+class UpdateCartItemsTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var GetQuoteItemIdByReservedQuoteIdAndSku
-+     */
-+    private $getQuoteItemIdByReservedQuoteIdAndSku;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->getQuoteItemIdByReservedQuoteIdAndSku = $objectManager->get(
-+            GetQuoteItemIdByReservedQuoteIdAndSku::class
-+        );
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testUpdateCartItemDecimalQuantity()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $itemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
-+
-+        $quantity = 0.5;
-+        $this->expectExceptionMessage(
-+            "Could not update the product with SKU simple_product: The fewest you may purchase is 1"
-+        );
-+        $query = $this->getQuery($maskedQuoteId, $itemId, $quantity);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param int $itemId
-+     * @param float $quantity
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, int $itemId, float $quantity): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  updateCartItems(input: {
-+    cart_id: "{$maskedQuoteId}"
-+    cart_items:[
-+      {
-+        cart_item_id: {$itemId}
-+        quantity: {$quantity}
-+      }
-+    ]
-+  }) {
-+    cart {
-+      items {
-+        id
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CheckoutAgreements/GetCheckoutAgreementsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CheckoutAgreements/GetCheckoutAgreementsTest.php
-new file mode 100644
-index 00000000000..3aa01d79942
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CheckoutAgreements/GetCheckoutAgreementsTest.php
-@@ -0,0 +1,235 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\CheckoutAgreements;
-+
-+use Magento\CheckoutAgreements\Api\Data\AgreementInterface;
-+use Magento\CheckoutAgreements\Model\Agreement as AgreementModel;
-+use Magento\CheckoutAgreements\Model\AgreementFactory;
-+use Magento\CheckoutAgreements\Model\ResourceModel\Agreement;
-+use Magento\Config\Model\ResourceModel\Config;
-+use Magento\Framework\App\Config\ReinitableConfigInterface;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Get checkout agreements test
-+ */
-+class GetCheckoutAgreementsTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var string
-+     */
-+    private $agreementsXmlConfigPath = 'checkout/options/enable_agreements';
-+
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $config;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->objectManager = Bootstrap::getObjectManager();
-+
-+        // TODO: remove usage of the Config, use ConfigFixture instead https://github.com/magento/graphql-ce/issues/167
-+        $this->config = $this->objectManager->get(Config::class);
-+        $this->saveAgreementConfig(1);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_active_with_html_content.php
-+     * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_inactive_with_text_content.php
-+     */
-+    public function testGetActiveAgreement()
-+    {
-+        $query = $this->getQuery();
-+
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('checkoutAgreements', $response);
-+        $agreements = $response['checkoutAgreements'];
-+        self::assertCount(1, $agreements);
-+        self::assertEquals('Checkout Agreement (active)', $agreements[0]['name']);
-+        self::assertEquals('Checkout agreement content: <b>HTML</b>', $agreements[0]['content']);
-+        self::assertEquals('200px', $agreements[0]['content_height']);
-+        self::assertEquals('Checkout agreement checkbox text.', $agreements[0]['checkbox_text']);
-+        self::assertTrue($agreements[0]['is_html']);
-+        self::assertEquals('AUTO', $agreements[0]['mode']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_active_with_html_content.php
-+     * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_inactive_with_text_content.php
-+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
-+     */
-+    public function testGetActiveAgreementOnSecondStore()
-+    {
-+        $secondStoreCode = 'fixture_second_store';
-+        $agreementsName = 'Checkout Agreement (active)';
-+
-+        $query = $this->getQuery();
-+        $this->assignAgreementsToStore($secondStoreCode, $agreementsName);
-+
-+        $headerMap['Store'] = $secondStoreCode;
-+        $response = $this->graphQlQuery($query, [], '', $headerMap);
-+
-+        self::assertArrayHasKey('checkoutAgreements', $response);
-+        $agreements = $response['checkoutAgreements'];
-+        self::assertCount(1, $agreements);
-+        self::assertEquals($agreementsName, $agreements[0]['name']);
-+        self::assertEquals('Checkout agreement content: <b>HTML</b>', $agreements[0]['content']);
-+        self::assertEquals('200px', $agreements[0]['content_height']);
-+        self::assertEquals('Checkout agreement checkbox text.', $agreements[0]['checkbox_text']);
-+        self::assertTrue($agreements[0]['is_html']);
-+        self::assertEquals('AUTO', $agreements[0]['mode']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_active_with_html_content.php
-+     * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_inactive_with_text_content.php
-+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
-+     */
-+    public function testGetActiveAgreementFromSecondStoreOnDefaultStore()
-+    {
-+        $secondStoreCode = 'fixture_second_store';
-+        $agreementsName = 'Checkout Agreement (active)';
-+
-+        $query = $this->getQuery();
-+        $this->assignAgreementsToStore($secondStoreCode, $agreementsName);
-+
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('checkoutAgreements', $response);
-+        $agreements = $response['checkoutAgreements'];
-+        self::assertEmpty($agreements);
-+    }
-+
-+    public function testGetAgreementNotSet()
-+    {
-+        $query = $this->getQuery();
-+
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('checkoutAgreements', $response);
-+        $agreements = $response['checkoutAgreements'];
-+        self::assertEmpty($agreements);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_active_with_html_content.php
-+     * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_inactive_with_text_content.php
-+     */
-+    public function testDisabledAgreements()
-+    {
-+        $query = $this->getQuery();
-+        $this->saveAgreementConfig(0);
-+
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('checkoutAgreements', $response);
-+        $agreements = $response['checkoutAgreements'];
-+        self::assertEmpty($agreements);
-+    }
-+
-+    /**
-+     * @return string
-+     */
-+    private function getQuery(): string
-+    {
-+        return
-+            <<<QUERY
-+{
-+  checkoutAgreements {
-+    agreement_id
-+    name
-+    content
-+    content_height
-+    checkbox_text
-+    is_html
-+    mode
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $storeCode
-+     * @param string $agreementsName
-+     * @return void
-+     */
-+    private function assignAgreementsToStore(string $storeCode, string $agreementsName): void
-+    {
-+        $agreementsFactory = $this->objectManager->get(AgreementFactory::class);
-+        /** @var Agreement $agreementsResource */
-+        $agreementsResource = $this->objectManager->get(Agreement::class);
-+        /** @var StoreManagerInterface $storeManager */
-+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
-+        $store = $storeManager->getStore($storeCode);
-+        /** @var AgreementModel $agreements */
-+        $agreements = $agreementsFactory->create();
-+        $agreementsResource->load($agreements, $agreementsName, AgreementInterface::NAME);
-+        $agreements->setData('stores', [$store->getId()]);
-+        $agreementsResource->save($agreements);
-+    }
-+
-+    protected function tearDown()
-+    {
-+        parent::tearDown();
-+
-+        $this->deleteAgreementConfig();
-+    }
-+
-+    /**
-+     * @param int $value
-+     * @param StoreInterface $store
-+     */
-+    private function saveAgreementConfig(int $value): void
-+    {
-+        $this->config->saveConfig(
-+            $this->agreementsXmlConfigPath,
-+            $value,
-+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-+            0
-+        );
-+
-+        $this->reinitConfig();
-+    }
-+
-+    /**
-+     * Delete config
-+     *
-+     * @return void
-+     */
-+    private function deleteAgreementConfig(): void
-+    {
-+        $this->config->deleteConfig(
-+            $this->agreementsXmlConfigPath,
-+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-+            0
-+        );
-+
-+        $this->reinitConfig();
-+    }
-+
-+    private function reinitConfig(): void
-+    {
-+        /** @var ReinitableConfigInterface $config */
-+        $config = $this->objectManager->get(ReinitableConfigInterface::class);
-+        $config->reinit();
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php
-new file mode 100644
-index 00000000000..d598a463a48
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php
-@@ -0,0 +1,206 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Cms;
-+
-+use Magento\Cms\Api\BlockRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\Widget\Model\Template\FilterEmulate;
-+
-+/**
-+ * Get CMS Block test
-+ */
-+class CmsBlockTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var BlockRepositoryInterface
-+     */
-+    private $blockRepository;
-+
-+    /**
-+     * @var FilterEmulate
-+     */
-+    private $filterEmulate;
-+
-+    protected function setUp()
-+    {
-+        $this->blockRepository = Bootstrap::getObjectManager()->get(BlockRepositoryInterface::class);
-+        $this->filterEmulate = Bootstrap::getObjectManager()->get(FilterEmulate::class);
-+    }
-+
-+    /**
-+     * Verify the fields of CMS Block selected by identifiers
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/blocks.php
-+     */
-+    public function testGetCmsBlock()
-+    {
-+        $cmsBlock = $this->blockRepository->getById('enabled_block');
-+        $cmsBlockData = $cmsBlock->getData();
-+        $renderedContent = $this->filterEmulate->setUseSessionInUrl(false)->filter($cmsBlock->getContent());
-+
-+        $query =
-+            <<<QUERY
-+{
-+  cmsBlocks(identifiers: "enabled_block") {
-+    items {
-+      identifier
-+      title
-+      content
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('cmsBlocks', $response);
-+        self::assertArrayHasKey('items', $response['cmsBlocks']);
-+
-+        self::assertEquals($cmsBlockData['identifier'], $response['cmsBlocks']['items'][0]['identifier']);
-+        self::assertEquals($cmsBlockData['title'], $response['cmsBlocks']['items'][0]['title']);
-+        self::assertEquals($renderedContent, $response['cmsBlocks']['items'][0]['content']);
-+    }
-+
-+    /**
-+     * Verify the fields of CMS Block selected by block_id
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/blocks.php
-+     */
-+    public function testGetCmsBlockByBlockId()
-+    {
-+        $cmsBlock = $this->blockRepository->getById('enabled_block');
-+        $cmsBlockData = $cmsBlock->getData();
-+        $blockId = $cmsBlockData['block_id'];
-+        $renderedContent = $this->filterEmulate->setUseSessionInUrl(false)->filter($cmsBlock->getContent());
-+
-+        $query =
-+            <<<QUERY
-+{
-+  cmsBlocks(identifiers: "$blockId") {
-+    items {
-+      identifier
-+      title
-+      content
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('cmsBlocks', $response);
-+        self::assertArrayHasKey('items', $response['cmsBlocks']);
-+        self::assertEquals($cmsBlockData['identifier'], $response['cmsBlocks']['items'][0]['identifier']);
-+        self::assertEquals($cmsBlockData['title'], $response['cmsBlocks']['items'][0]['title']);
-+        self::assertEquals($renderedContent, $response['cmsBlocks']['items'][0]['content']);
-+    }
-+
-+    /**
-+     * Verify the message when CMS Block is disabled
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The CMS block with the "disabled_block" ID doesn't exist
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/blocks.php
-+     */
-+    public function testGetDisabledCmsBlock()
-+    {
-+        $query =
-+            <<<QUERY
-+{
-+  cmsBlocks(identifiers: "disabled_block") {
-+    items {
-+      identifier
-+      title
-+      content
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * Verify the message when identifiers were not specified
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage "identifiers" of CMS blocks should be specified
-+     */
-+    public function testGetCmsBlocksWithoutIdentifiers()
-+    {
-+        $query =
-+            <<<QUERY
-+{
-+  cmsBlocks(identifiers: []) {
-+    items {
-+      identifier
-+      title
-+      content
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * Verify the message when CMS Block with such identifiers does not exist
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The CMS block with the "nonexistent_id" ID doesn't exist.
-+     */
-+    public function testGetCmsBlockByNonExistentIdentifier()
-+    {
-+        $query =
-+            <<<QUERY
-+{
-+  cmsBlocks(identifiers: "nonexistent_id") {
-+    items {
-+      identifier
-+      title
-+      content
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * Verify the fields of CMS Block selected by identifiers
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/blocks.php
-+     */
-+    public function testGetEnabledAndDisabledCmsBlockInOneRequest()
-+    {
-+        $query =
-+            <<<QUERY
-+{
-+  cmsBlocks(identifiers: ["enabled_block", "disabled_block"]) {
-+    items {
-+      identifier
-+    }
-+  }
-+}
-+QUERY;
-+
-+        try {
-+            $this->graphQlQuery($query);
-+            self::fail('Response should contains errors.');
-+        } catch (ResponseContainsErrorsException $e) {
-+            $responseData = $e->getResponseData();
-+        }
-+
-+        self::assertNotEmpty($responseData);
-+        self::assertEquals('enabled_block', $responseData['data']['cmsBlocks']['items'][0]['identifier']);
-+        self::assertEquals(
-+            'The CMS block with the "disabled_block" ID doesn\'t exist.',
-+            $responseData['errors'][0]['message']
-+        );
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsPageTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsPageTest.php
-new file mode 100644
-index 00000000000..afbb3d40bc9
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsPageTest.php
-@@ -0,0 +1,212 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Cms;
-+
-+use Magento\Cms\Model\GetPageByIdentifier;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Get CMS Page test
-+ */
-+class CmsPageTest extends GraphQlAbstract
-+{
-+    /**
-+     * Verify the fields of CMS Page selected by page_id
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/pages.php
-+     */
-+    public function testGetCmsPageById()
-+    {
-+        $cmsPage = ObjectManager::getInstance()->get(GetPageByIdentifier::class)->execute('page100', 0);
-+        $pageId = $cmsPage->getPageId();
-+        $cmsPageData = $cmsPage->getData();
-+        $query =
-+            <<<QUERY
-+{
-+  cmsPage(id: $pageId) {
-+    url_key
-+    title
-+    content
-+    content_heading
-+    page_layout
-+    meta_title
-+    meta_description
-+    meta_keywords
-+  }
-+}
-+QUERY;
-+
-+        $response = $this->graphQlQuery($query);
-+        $this->assertEquals($cmsPageData['identifier'], $response['cmsPage']['url_key']);
-+        $this->assertEquals($cmsPageData['title'], $response['cmsPage']['title']);
-+        $this->assertEquals($cmsPageData['content'], $response['cmsPage']['content']);
-+        $this->assertEquals($cmsPageData['content_heading'], $response['cmsPage']['content_heading']);
-+        $this->assertEquals($cmsPageData['page_layout'], $response['cmsPage']['page_layout']);
-+        $this->assertEquals($cmsPageData['meta_title'], $response['cmsPage']['meta_title']);
-+        $this->assertEquals($cmsPageData['meta_description'], $response['cmsPage']['meta_description']);
-+        $this->assertEquals($cmsPageData['meta_keywords'], $response['cmsPage']['meta_keywords']);
-+    }
-+
-+    /**
-+     * Verify the fields of CMS Page selected by page_id
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/pages.php
-+     */
-+    public function testGetCmsPageByIdentifier()
-+    {
-+        $cmsPageIdentifier = 'page100';
-+
-+        $query =
-+            <<<QUERY
-+{
-+  cmsPage(identifier: "$cmsPageIdentifier") {
-+    identifier
-+  }
-+}
-+QUERY;
-+
-+        $response = $this->graphQlQuery($query);
-+        $this->assertEquals($cmsPageIdentifier, $response['cmsPage']['identifier']);
-+    }
-+
-+    /**
-+     * Verify the message when page_id is not specified.
-+     */
-+    public function testGetCmsPageWithoutId()
-+    {
-+        $query =
-+            <<<QUERY
-+{
-+  cmsPage {
-+    url_key
-+    title
-+    content
-+    content_heading
-+    page_layout
-+    meta_title
-+    meta_description
-+    meta_keywords
-+  }
-+}
-+QUERY;
-+
-+        $this->expectException(\Exception::class);
-+        $this->expectExceptionMessage('Page id/identifier should be specified');
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * Verify the message when page_id does not exist.
-+     */
-+    public function testGetCmsPageByNonExistentId()
-+    {
-+        $query =
-+            <<<QUERY
-+{
-+  cmsPage(id: 0) {
-+    url_key
-+    title
-+    content
-+    content_heading
-+    page_layout
-+    meta_title
-+    meta_description
-+    meta_keywords
-+  }
-+}
-+QUERY;
-+
-+        $this->expectException(\Exception::class);
-+        $this->expectExceptionMessage('The CMS page with the "0" ID doesn\'t exist.');
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * Verify the message when identifier does not exist.
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The CMS page with the "" ID doesn't exist.
-+     */
-+    public function testGetCmsPageByNonExistentIdentifier()
-+    {
-+        $query =
-+            <<<QUERY
-+{
-+  cmsPage(identifier: "") {
-+    url_key
-+    title
-+    content
-+    content_heading
-+    page_layout
-+    meta_title
-+    meta_description
-+    meta_keywords
-+  }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * Verify the message when CMS Page selected by page_id is disabled
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/noroute.php
-+     */
-+    public function testGetDisabledCmsPageById()
-+    {
-+        $cmsPageId = ObjectManager::getInstance()->get(GetPageByIdentifier::class)->execute('no-route', 0)->getPageId();
-+        $query =
-+            <<<QUERY
-+{
-+  cmsPage(id: $cmsPageId) {
-+    url_key
-+    title
-+    content
-+    content_heading
-+    page_layout
-+    meta_title
-+    meta_description
-+    meta_keywords
-+  }
-+}
-+QUERY;
-+
-+        $this->expectException(\Exception::class);
-+        $this->expectExceptionMessage('No such entity.');
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * Verify the message when CMS Page selected by identifier is disabled
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/noroute.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The CMS page with the "no-route" ID doesn't exist.
-+     */
-+    public function testGetDisabledCmsPageByIdentifier()
-+    {
-+        $cmsPageIdentifier = 'no-route';
-+        $query =
-+            <<<QUERY
-+{
-+  cmsPage(identifier: "$cmsPageIdentifier") {
-+    url_key
-+    title
-+    content
-+    content_heading
-+    page_layout
-+    meta_title
-+    meta_description
-+    meta_keywords
-+  }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
-new file mode 100644
-index 00000000000..a6f02e4239f
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
-@@ -0,0 +1,126 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\ConfigurableProduct;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Add configurable product to cart testcases
-+ */
-+class AddConfigurableProductToCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     */
-+    public function testAddConfigurableProductToCart()
-+    {
-+        $variantSku = 'simple_41';
-+        $quantity = 2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-+
-+        $query = $this->getQuery($maskedQuoteId, $variantSku, $quantity);
-+        $response = $this->graphQlMutation($query);
-+
-+        $cartItems = $response['addConfigurableProductsToCart']['cart']['items'];
-+        self::assertEquals($quantity, $cartItems[0]['quantity']);
-+        self::assertEquals($variantSku, $cartItems[0]['product']['sku']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The requested qty is not available
-+     */
-+    public function testAddProductIfQuantityIsNotAvailable()
-+    {
-+        $variantSku = 'simple_41';
-+        $quantity = 200;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-+
-+        $query = $this->getQuery($maskedQuoteId, $variantSku, $quantity);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Framework/Search/_files/product_configurable.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Product that you are trying to add is not available.
-+     */
-+    public function testAddOutOfStockProduct()
-+    {
-+        $variantSku = 'simple_1010';
-+        $quantity = 1;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-+
-+        $query = $this->getQuery($maskedQuoteId, $variantSku, $quantity);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $variantSku
-+     * @param int $quantity
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, string $variantSku, int $quantity): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  addConfigurableProductsToCart(
-+    input: {
-+      cart_id: "{$maskedQuoteId}"
-+      cart_items: [
-+        {
-+          variant_sku: "{$variantSku}"
-+          data: {
-+            quantity: {$quantity}
-+            sku: "{$variantSku}"
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+        quantity
-+        product {
-+          name
-+          sku
-+        }
-+        ... on ConfigurableCartItem {
-+          configurable_options {
-+            option_label
-+          }
-+        }
-+    }
-+  }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductFrontendLabelAttributeTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductFrontendLabelAttributeTest.php
-new file mode 100644
-index 00000000000..32cd3a9a51d
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductFrontendLabelAttributeTest.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\ConfigurableProduct;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Class ConfigurableProductFrontendLabelAttributeTest
-+ *
-+ * @package Magento\GraphQl\ConfigurableProduct
-+ */
-+class ConfigurableProductFrontendLabelAttributeTest extends GraphQlAbstract
-+{
-+    /**
-+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute.php
-+     */
-+    public function testGetFrontendLabelAttribute()
-+    {
-+        $expectLabelValue = 'Default Store View label';
-+        $productSku = 'configurable';
-+
-+        $query = <<<QUERY
-+{
-+  products(filter: {sku: {eq: "{$productSku}"}}) {
-+    items {
-+      name
-+        ... on ConfigurableProduct{
-+        configurable_options{
-+          id
-+          label
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->assertArrayHasKey('products', $response);
-+        $this->assertArrayHasKey('items', $response['products']);
-+        $this->assertArrayHasKey(0, $response['products']['items']);
-+        
-+        $product = $response['products']['items'][0];
-+        $this->assertArrayHasKey('configurable_options', $product);
-+        $this->assertArrayHasKey(0, $product['configurable_options']);
-+        $this->assertArrayHasKey('label', $product['configurable_options'][0]);
-+
-+        $option = $product['configurable_options'][0];
-+        $this->assertEquals($expectLabelValue, $option['label']);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductStockStatusTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductStockStatusTest.php
-new file mode 100644
-index 00000000000..2826d61022c
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductStockStatusTest.php
-@@ -0,0 +1,97 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\ConfigurableProduct;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\CatalogInventory\Api\StockRegistryInterface;
-+
-+/**
-+ * Checks if stock status correctly displays for configurable variants.
-+ */
-+class ConfigurableProductStockStatusTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var StockRegistryInterface
-+     */
-+    private $stockRegistry;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->stockRegistry = Bootstrap::getObjectManager()->create(StockRegistryInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Framework/Search/_files/product_configurable.php
-+     * @magentoConfigFixture default_store cataloginventory/options/show_out_of_stock 1
-+     */
-+    public function testConfigurableProductShowOutOfStock()
-+    {
-+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
-+        $parentSku = 'configurable';
-+        $childSkuOutOfStock = 'simple_1010';
-+        $stockItem = $this->stockRegistry->getStockItemBySku($childSkuOutOfStock);
-+        $stockItem->setQty(0);
-+        $this->stockRegistry->updateStockItemBySku($childSkuOutOfStock, $stockItem);
-+        $query = $this->getQuery($parentSku);
-+        $response = $this->graphQlQuery($query);
-+        $this->assertArraySubset(
-+            [['product' => ['sku' => $childSkuOutOfStock, 'stock_status' => 'OUT_OF_STOCK']]],
-+            $response['products']['items'][0]['variants']
-+        );
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Framework/Search/_files/product_configurable.php
-+     * @magentoConfigFixture default_store cataloginventory/options/show_out_of_stock 0
-+     */
-+    public function testConfigurableProductDoNotShowOutOfStock()
-+    {
-+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
-+        $parentSku = 'configurable';
-+        $childSkuOutOfStock = 'simple_1010';
-+        $stockItem = $this->stockRegistry->getStockItemBySku($childSkuOutOfStock);
-+        $stockItem->setQty(0);
-+        $this->stockRegistry->updateStockItemBySku($childSkuOutOfStock, $stockItem);
-+        $query = $this->getQuery($parentSku);
-+        $response = $this->graphQlQuery($query);
-+        $this->assertEquals(
-+            [['product' => ['sku' => 'simple_1020', 'stock_status' => 'IN_STOCK']]],
-+            $response['products']['items'][0]['variants']
-+        );
-+    }
-+
-+    /**
-+     * @param string $sku
-+     * @return string
-+     */
-+    private function getQuery(string $sku)
-+    {
-+        return <<<QUERY
-+        {
-+            products(filter: {sku: {eq: "{$sku}"}})
-+            {
-+                items {
-+                    sku
-+                    ... on ConfigurableProduct {
-+                        variants {
-+                            product {
-+                                sku
-+                                stock_status
-+                            }
-+                        }
-+                    }
-+                }
-+            }
-+        }
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
-index 84c4e80d325..da541038462 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
-@@ -204,7 +204,6 @@ QUERY;
-         /**
-          * @var ProductRepositoryInterface $productRepository
-          */
--
-         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
-         $product = $productRepository->get($productSku, false, null, true);
- 
-@@ -407,6 +406,7 @@ QUERY;
-                 $variantArray['product']['price']
-             );
-             $configurableOptions = $this->getConfigurableOptions();
-+            $this->assertEquals(1, count($variantArray['attributes']));
-             foreach ($variantArray['attributes'] as $attribute) {
-                 $hasAssertion = false;
-                 foreach ($configurableOptions as $option) {
-@@ -487,31 +487,6 @@ QUERY;
-         }
-     }
- 
--    /**
--     * @param array $actualResponse
--     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
--     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
--     */
--    private function assertResponseFields(array $actualResponse, array $assertionMap)
--    {
--        foreach ($assertionMap as $key => $assertionData) {
--            $expectedValue = isset($assertionData['expected_value'])
--                ? $assertionData['expected_value']
--                : $assertionData;
--            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
--            $this->assertNotNull(
--                $expectedValue,
--                "Value of '{$responseField}' field must not be NULL"
--            );
--            $this->assertEquals(
--                $expectedValue,
--                $actualResponse[$responseField],
--                "Value of '{$responseField}' field in response does not match expected value: "
--                . var_export($expectedValue, true)
--            );
--        }
--    }
--
-     private function getConfigurableOptions()
-     {
-         if (!empty($this->configurableOptions)) {
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
-new file mode 100644
-index 00000000000..f36200c8e92
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
-@@ -0,0 +1,233 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Customer;
-+
-+use Magento\Customer\Api\AccountManagementInterface;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Model\CustomerAuthUpdate;
-+use Magento\Customer\Model\CustomerRegistry;
-+use Magento\Framework\Exception\AuthenticationException;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test change customer password
-+ */
-+class ChangeCustomerPasswordTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var AccountManagementInterface
-+     */
-+    private $accountManagement;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var CustomerRegistry
-+     */
-+    private $customerRegistry;
-+
-+    /**
-+     * @var CustomerAuthUpdate
-+     */
-+    private $customerAuthUpdate;
-+
-+    /**
-+     * @var CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    protected function setUp()
-+    {
-+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-+        $this->accountManagement = Bootstrap::getObjectManager()->get(AccountManagementInterface::class);
-+        $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
-+        $this->customerAuthUpdate = Bootstrap::getObjectManager()->get(CustomerAuthUpdate::class);
-+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testChangePassword()
-+    {
-+        $customerEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+        $newPassword = 'anotherPassword1';
-+
-+        $query = $this->getQuery($currentPassword, $newPassword);
-+        $headerMap = $this->getCustomerAuthHeaders($customerEmail, $currentPassword);
-+
-+        $response = $this->graphQlMutation($query, [], '', $headerMap);
-+        $this->assertEquals($customerEmail, $response['changeCustomerPassword']['email']);
-+
-+        try {
-+            // registry contains the old password hash so needs to be reset
-+            $this->customerRegistry->removeByEmail($customerEmail);
-+            $this->accountManagement->authenticate($customerEmail, $newPassword);
-+        } catch (LocalizedException $e) {
-+            $this->fail('Password was not changed: ' . $e->getMessage());
-+        }
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The current customer isn't authorized.
-+     */
-+    public function testChangePasswordIfUserIsNotAuthorizedTest()
-+    {
-+        $query = $this->getQuery('currentpassword', 'newpassword');
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testChangeWeakPassword()
-+    {
-+        $customerEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+        $newPassword = 'weakpass';
-+
-+        $query = $this->getQuery($currentPassword, $newPassword);
-+        $headerMap = $this->getCustomerAuthHeaders($customerEmail, $currentPassword);
-+
-+        $this->expectException(\Exception::class);
-+        $this->expectExceptionMessageRegExp('/Minimum of different classes of characters in password is.*/');
-+
-+        $this->graphQlMutation($query, [], '', $headerMap);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Invalid login or password.
-+     */
-+    public function testChangePasswordIfPasswordIsInvalid()
-+    {
-+        $customerEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+        $newPassword = 'anotherPassword1';
-+        $incorrectCurrentPassword = 'password-incorrect';
-+
-+        $query = $this->getQuery($incorrectCurrentPassword, $newPassword);
-+
-+        $headerMap = $this->getCustomerAuthHeaders($customerEmail, $currentPassword);
-+        $this->graphQlMutation($query, [], '', $headerMap);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Specify the "currentPassword" value.
-+     */
-+    public function testChangePasswordIfCurrentPasswordIsEmpty()
-+    {
-+        $customerEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+        $newPassword = 'anotherPassword1';
-+        $incorrectCurrentPassword = '';
-+
-+        $query = $this->getQuery($incorrectCurrentPassword, $newPassword);
-+
-+        $headerMap = $this->getCustomerAuthHeaders($customerEmail, $currentPassword);
-+        $this->graphQlMutation($query, [], '', $headerMap);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Specify the "newPassword" value.
-+     */
-+    public function testChangePasswordIfNewPasswordIsEmpty()
-+    {
-+        $customerEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+        $incorrectNewPassword = '';
-+
-+        $query = $this->getQuery($currentPassword, $incorrectNewPassword);
-+
-+        $headerMap = $this->getCustomerAuthHeaders($customerEmail, $currentPassword);
-+        $this->graphQlMutation($query, [], '', $headerMap);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The account is locked.
-+     */
-+    public function testChangePasswordIfCustomerIsLocked()
-+    {
-+        $customerEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+        $newPassword = 'anotherPassword1';
-+
-+        $this->lockCustomer(1);
-+        $query = $this->getQuery($currentPassword, $newPassword);
-+
-+        $headerMap = $this->getCustomerAuthHeaders($customerEmail, $currentPassword);
-+        $this->graphQlMutation($query, [], '', $headerMap);
-+    }
-+
-+    /**
-+     * @param int $customerId
-+     *
-+     * @return void
-+     * @throws NoSuchEntityException
-+     */
-+    private function lockCustomer(int $customerId): void
-+    {
-+        $customerSecure = $this->customerRegistry->retrieveSecureData($customerId);
-+        $customerSecure->setLockExpires('2030-12-31 00:00:00');
-+        $this->customerAuthUpdate->saveAuth($customerId);
-+    }
-+
-+    /**
-+     * @param $currentPassword
-+     * @param $newPassword
-+     *
-+     * @return string
-+     */
-+    private function getQuery($currentPassword, $newPassword)
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  changeCustomerPassword(
-+    currentPassword: "$currentPassword",
-+    newPassword: "$newPassword"
-+  ) {
-+    id
-+    email
-+    firstname
-+    lastname
-+  }
-+}
-+QUERY;
-+
-+        return $query;
-+    }
-+
-+    /**
-+     * @param string $email
-+     * @param string $password
-+     *
-+     * @return array
-+     * @throws AuthenticationException
-+     */
-+    private function getCustomerAuthHeaders(string $email, string $password): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
-+        return ['Authorization' => 'Bearer ' . $customerToken];
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
-new file mode 100644
-index 00000000000..47c4d3ad91c
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
-@@ -0,0 +1,357 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Customer;
-+
-+use Exception;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+
-+/**
-+ * Create customer address tests
-+ */
-+class CreateCustomerAddressTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var AddressRepositoryInterface
-+     */
-+    private $addressRepository;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-+        $this->addressRepository = Bootstrap::getObjectManager()->get(AddressRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testCreateCustomerAddress()
-+    {
-+        $customerId = 1;
-+        $newAddress = [
-+            'region' => [
-+                'region' => 'Arizona',
-+                'region_id' => 4,
-+                'region_code' => 'AZ'
-+            ],
-+            'country_id' => 'US',
-+            'street' => ['Line 1 Street', 'Line 2'],
-+            'company' => 'Company name',
-+            'telephone' => '123456789',
-+            'fax' => '123123123',
-+            'postcode' => '7777',
-+            'city' => 'City Name',
-+            'firstname' => 'Adam',
-+            'lastname' => 'Phillis',
-+            'middlename' => 'A',
-+            'prefix' => 'Mr.',
-+            'suffix' => 'Jr.',
-+            'vat_id' => '1',
-+            'default_shipping' => true,
-+            'default_billing' => false
-+        ];
-+
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  createCustomerAddress(input: {
-+    region: {
-+        region: "{$newAddress['region']['region']}"
-+        region_id: {$newAddress['region']['region_id']}
-+        region_code: "{$newAddress['region']['region_code']}"
-+    }
-+    country_id: {$newAddress['country_id']}
-+    street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}"]
-+    company: "{$newAddress['company']}"
-+    telephone: "{$newAddress['telephone']}"
-+    fax: "{$newAddress['fax']}"
-+    postcode: "{$newAddress['postcode']}"
-+    city: "{$newAddress['city']}"
-+    firstname: "{$newAddress['firstname']}"
-+    lastname: "{$newAddress['lastname']}"
-+    middlename: "{$newAddress['middlename']}"
-+    prefix: "{$newAddress['prefix']}"
-+    suffix: "{$newAddress['suffix']}"
-+    vat_id: "{$newAddress['vat_id']}"
-+    default_shipping: true
-+    default_billing: false
-+  }) {
-+    id
-+    customer_id
-+    region {
-+      region
-+      region_id
-+      region_code
-+    }
-+    country_id
-+    street
-+    company
-+    telephone
-+    fax
-+    postcode
-+    city
-+    firstname
-+    lastname
-+    middlename
-+    prefix
-+    suffix
-+    vat_id
-+    default_shipping
-+    default_billing
-+  }
-+}
-+MUTATION;
-+
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+
-+        $response = $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+        $this->assertArrayHasKey('createCustomerAddress', $response);
-+        $this->assertArrayHasKey('customer_id', $response['createCustomerAddress']);
-+        $this->assertEquals($customerId, $response['createCustomerAddress']['customer_id']);
-+        $this->assertArrayHasKey('id', $response['createCustomerAddress']);
-+
-+        $address = $this->addressRepository->getById($response['createCustomerAddress']['id']);
-+        $this->assertEquals($address->getId(), $response['createCustomerAddress']['id']);
-+        $this->assertCustomerAddressesFields($address, $response['createCustomerAddress']);
-+        $this->assertCustomerAddressesFields($address, $newAddress);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The current customer isn't authorized.
-+     */
-+    public function testCreateCustomerAddressIfUserIsNotAuthorized()
-+    {
-+        $mutation
-+            = <<<MUTATION
-+mutation{
-+  createCustomerAddress(input: {
-+    prefix: "Mr."
-+    firstname: "John"
-+    middlename: "A"
-+    lastname: "Smith"
-+    telephone: "123456789"
-+    street: ["Line 1", "Line 2"]
-+    city: "Test City"
-+    region: {
-+        region_id: 1
-+    }
-+    country_id: US
-+    postcode: "9999"
-+    default_shipping: true
-+    default_billing: false
-+  }) {
-+    id
-+  }
-+}
-+MUTATION;
-+        $this->graphQlMutation($mutation);
-+    }
-+
-+    /**
-+     * Verify customers with valid credentials create new address
-+     * with missing required Firstname attribute
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameters are missing: firstname
-+     */
-+    public function testCreateCustomerAddressWithMissingAttribute()
-+    {
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  createCustomerAddress(input: {
-+    region: {
-+        region_id: 1
-+    }
-+    country_id: US
-+    street: ["Line 1 Street","Line 2"]
-+    company: "Company name"
-+    telephone: "123456789"
-+    fax: "123123123"
-+    postcode: "7777"
-+    city: "City Name"
-+    firstname: ""
-+    lastname: "Phillis"
-+  }) {
-+    id
-+  }
-+}
-+MUTATION;
-+
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testCreateCustomerAddressWithRedundantStreetLine()
-+    {
-+        $newAddress = [
-+            'region' => [
-+                'region' => 'Arizona',
-+                'region_id' => 4,
-+                'region_code' => 'AZ'
-+            ],
-+            'country_id' => 'US',
-+            'street' => ['Line 1 Street', 'Line 2', 'Line 3'],
-+            'company' => 'Company name',
-+            'telephone' => '123456789',
-+            'fax' => '123123123',
-+            'postcode' => '7777',
-+            'city' => 'City Name',
-+            'firstname' => 'Adam',
-+            'lastname' => 'Phillis',
-+            'middlename' => 'A',
-+            'prefix' => 'Mr.',
-+            'suffix' => 'Jr.',
-+            'vat_id' => '1',
-+            'default_shipping' => true,
-+            'default_billing' => false
-+        ];
-+
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  createCustomerAddress(input: {
-+    region: {
-+        region: "{$newAddress['region']['region']}"
-+        region_id: {$newAddress['region']['region_id']}
-+        region_code: "{$newAddress['region']['region_code']}"
-+    }
-+    country_id: {$newAddress['country_id']}
-+    street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}","{$newAddress['street'][2]}"]
-+    company: "{$newAddress['company']}"
-+    telephone: "{$newAddress['telephone']}"
-+    fax: "{$newAddress['fax']}"
-+    postcode: "{$newAddress['postcode']}"
-+    city: "{$newAddress['city']}"
-+    firstname: "{$newAddress['firstname']}"
-+    lastname: "{$newAddress['lastname']}"
-+    middlename: "{$newAddress['middlename']}"
-+    prefix: "{$newAddress['prefix']}"
-+    suffix: "{$newAddress['suffix']}"
-+    vat_id: "{$newAddress['vat_id']}"
-+    default_shipping: true
-+    default_billing: false
-+  }) {
-+    id
-+  }
-+}
-+MUTATION;
-+
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+
-+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * Create new address with invalid input
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
-+     * @dataProvider invalidInputDataProvider
-+     * @param string $input
-+     * @param $exceptionMessage
-+     * @throws Exception
-+     */
-+    public function testCreateCustomerAddressWithInvalidInput($input, $exceptionMessage)
-+    {
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  createCustomerAddress($input) {
-+    id
-+  }
-+}
-+MUTATION;
-+
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+
-+        self::expectException(Exception::class);
-+        self::expectExceptionMessage($exceptionMessage);
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function invalidInputDataProvider()
-+    {
-+        return [
-+            ['', 'Syntax Error: Expected Name, found )'],
-+            ['input: ""', 'Expected type CustomerAddressInput!, found "".'],
-+            ['input: "foo"', 'Expected type CustomerAddressInput!, found "foo".']
-+        ];
-+    }
-+
-+    /**
-+     * Verify the fields for Customer address
-+     *
-+     * @param AddressInterface $address
-+     * @param array $actualResponse
-+     */
-+    private function assertCustomerAddressesFields(AddressInterface $address, array $actualResponse): void
-+    {
-+        /** @var  $addresses */
-+        $assertionMap = [
-+            ['response_field' => 'country_id', 'expected_value' => $address->getCountryId()],
-+            ['response_field' => 'street', 'expected_value' => $address->getStreet()],
-+            ['response_field' => 'company', 'expected_value' => $address->getCompany()],
-+            ['response_field' => 'telephone', 'expected_value' => $address->getTelephone()],
-+            ['response_field' => 'fax', 'expected_value' => $address->getFax()],
-+            ['response_field' => 'postcode', 'expected_value' => $address->getPostcode()],
-+            ['response_field' => 'city', 'expected_value' => $address->getCity()],
-+            ['response_field' => 'firstname', 'expected_value' => $address->getFirstname()],
-+            ['response_field' => 'lastname', 'expected_value' => $address->getLastname()],
-+            ['response_field' => 'middlename', 'expected_value' => $address->getMiddlename()],
-+            ['response_field' => 'prefix', 'expected_value' => $address->getPrefix()],
-+            ['response_field' => 'suffix', 'expected_value' => $address->getSuffix()],
-+            ['response_field' => 'vat_id', 'expected_value' => $address->getVatId()],
-+            ['response_field' => 'default_shipping', 'expected_value' => (bool)$address->isDefaultShipping()],
-+            ['response_field' => 'default_billing', 'expected_value' => (bool)$address->isDefaultBilling()],
-+        ];
-+        $this->assertResponseFields($actualResponse, $assertionMap);
-+        $this->assertTrue(is_array([$actualResponse['region']]), "region field must be of an array type.");
-+        $assertionRegionMap = [
-+            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
-+            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
-+            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
-+        ];
-+        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
-+    }
-+
-+    /**
-+     * @param string $email
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getCustomerAuthHeaders(string $email, string $password): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
-+        return ['Authorization' => 'Bearer ' . $customerToken];
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
-new file mode 100644
-index 00000000000..fc51f57a83a
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
-@@ -0,0 +1,260 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Customer;
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for create customer functionallity
-+ */
-+class CreateCustomerTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var Registry
-+     */
-+    private $registry;
-+
-+    /**
-+     * @var CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
-+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * @throws \Exception
-+     */
-+    public function testCreateCustomerAccountWithPassword()
-+    {
-+        $newFirstname = 'Richard';
-+        $newLastname = 'Rowe';
-+        $currentPassword = 'test123#';
-+        $newEmail = 'new_customer@example.com';
-+
-+        $query = <<<QUERY
-+mutation {
-+    createCustomer(
-+        input: {
-+            firstname: "{$newFirstname}"
-+            lastname: "{$newLastname}"
-+            email: "{$newEmail}"
-+            password: "{$currentPassword}"
-+            is_subscribed: true
-+        }
-+    ) {
-+        customer {
-+            id
-+            firstname
-+            lastname
-+            email
-+            is_subscribed
-+        }
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+
-+        $this->assertEquals($newFirstname, $response['createCustomer']['customer']['firstname']);
-+        $this->assertEquals($newLastname, $response['createCustomer']['customer']['lastname']);
-+        $this->assertEquals($newEmail, $response['createCustomer']['customer']['email']);
-+        $this->assertEquals(true, $response['createCustomer']['customer']['is_subscribed']);
-+    }
-+
-+    /**
-+     * @throws \Exception
-+     */
-+    public function testCreateCustomerAccountWithoutPassword()
-+    {
-+        $newFirstname = 'Richard';
-+        $newLastname = 'Rowe';
-+        $newEmail = 'new_customer@example.com';
-+
-+        $query = <<<QUERY
-+mutation {
-+    createCustomer(
-+        input: {
-+            firstname: "{$newFirstname}"
-+            lastname: "{$newLastname}"
-+            email: "{$newEmail}"
-+            is_subscribed: true
-+        }
-+    ) {
-+        customer {
-+            id
-+            firstname
-+            lastname
-+            email
-+            is_subscribed
-+        }
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+
-+        $this->assertEquals($newFirstname, $response['createCustomer']['customer']['firstname']);
-+        $this->assertEquals($newLastname, $response['createCustomer']['customer']['lastname']);
-+        $this->assertEquals($newEmail, $response['createCustomer']['customer']['email']);
-+        $this->assertEquals(true, $response['createCustomer']['customer']['is_subscribed']);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage "input" value should be specified
-+     */
-+    public function testCreateCustomerIfInputDataIsEmpty()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+    createCustomer(
-+        input: {
-+        
-+        }
-+    ) {
-+        customer {
-+            id
-+            firstname
-+            lastname
-+            email
-+            is_subscribed
-+        }
-+    }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The customer email is missing. Enter and try again.
-+     */
-+    public function testCreateCustomerIfEmailMissed()
-+    {
-+        $newFirstname = 'Richard';
-+        $newLastname = 'Rowe';
-+        $currentPassword = 'test123#';
-+
-+        $query = <<<QUERY
-+mutation {
-+    createCustomer(
-+        input: {
-+            firstname: "{$newFirstname}"
-+            lastname: "{$newLastname}"
-+            password: "{$currentPassword}"
-+            is_subscribed: true
-+        }
-+    ) {
-+        customer {
-+            id
-+            firstname
-+            lastname
-+            email
-+            is_subscribed
-+        }
-+    }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage "Email" is not a valid email address.
-+     */
-+    public function testCreateCustomerIfEmailIsNotValid()
-+    {
-+        $newFirstname = 'Richard';
-+        $newLastname = 'Rowe';
-+        $currentPassword = 'test123#';
-+        $newEmail = 'email';
-+
-+        $query = <<<QUERY
-+mutation {
-+    createCustomer(
-+        input: {
-+            firstname: "{$newFirstname}"
-+            lastname: "{$newLastname}"
-+            email: "{$newEmail}"
-+            password: "{$currentPassword}"
-+            is_subscribed: true
-+        }
-+    ) {
-+        customer {
-+            id
-+            firstname
-+            lastname
-+            email
-+            is_subscribed
-+        }
-+    }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Field "test123" is not defined by type CustomerInput.
-+     */
-+    public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
-+    {
-+        $newFirstname = 'Richard';
-+        $newLastname = 'Rowe';
-+        $currentPassword = 'test123#';
-+        $newEmail = 'new_customer@example.com';
-+
-+        $query = <<<QUERY
-+mutation {
-+    createCustomer(
-+        input: {
-+            firstname: "{$newFirstname}"
-+            lastname: "{$newLastname}"
-+            test123: "123test123"
-+            email: "{$newEmail}"
-+            password: "{$currentPassword}"
-+            is_subscribed: true
-+        }
-+    ) {
-+        customer {
-+            id
-+            firstname
-+            lastname
-+            email
-+            is_subscribed
-+        }
-+    }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    public function tearDown()
-+    {
-+        $newEmail = 'new_customer@example.com';
-+        try {
-+            $customer = $this->customerRepository->get($newEmail);
-+        } catch (\Exception $exception) {
-+            return;
-+        }
-+
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', true);
-+        $this->customerRepository->delete($customer);
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', false);
-+        parent::tearDown();
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAuthenticationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAuthenticationTest.php
-deleted file mode 100644
-index 60fa63338e7..00000000000
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAuthenticationTest.php
-+++ /dev/null
-@@ -1,192 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\GraphQl\Customer;
--
--use Magento\Customer\Api\CustomerRepositoryInterface;
--use Magento\Customer\Api\Data\AddressInterface;
--use Magento\Customer\Api\Data\CustomerInterface;
--use Magento\TestFramework\ObjectManager;
--use Magento\TestFramework\TestCase\GraphQlAbstract;
--use Magento\Integration\Api\CustomerTokenServiceInterface;
--
--class CustomerAuthenticationTest extends GraphQlAbstract
--{
--    /**
--     * Verify customers with valid credentials with a customer bearer token
--     *
--     * @magentoApiDataFixture Magento/Customer/_files/customer.php
--     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function testRegisteredCustomerWithValidCredentials()
--    {
--        $query
--            = <<<QUERY
--{
--  customer 
--  {
--    created_at
--    group_id
--    prefix
--    firstname
--    middlename
--    lastname
--    suffix
--    email
--    default_billing
--    default_shipping
--    id
--      addresses{
--      id
--      customer_id
--      region_id
--      country_id
--      telephone
--      postcode
--      city      
--      firstname
--      lastname
--    }
--   }
--}
--QUERY;
--
--        $userName = 'customer@example.com';
--        $password = 'password';
--        /** @var CustomerTokenServiceInterface $customerTokenService */
--        $customerTokenService = ObjectManager::getInstance()
--                               ->get(\Magento\Integration\Api\CustomerTokenServiceInterface::class);
--        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
--        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
--        /** @var CustomerRepositoryInterface $customerRepository */
--        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
--        $customer = $customerRepository->get('customer@example.com');
--
--        $response = $this->graphQlQuery($query, [], '', $headerMap);
--        $this->assertArrayHasKey('customer', $response);
--        $this->assertArrayHasKey('addresses', $response['customer']);
--        $this->assertTrue(
--            is_array([$response['customer']['addresses']]),
--            " Addresses field must be of an array type."
--        );
--        $this->assertCustomerFields($customer, $response['customer']);
--        $this->assertCustomerAddressesFields($customer, $response);
--    }
--
--    /**
--     * Verify customer with valid credentials but without the bearer token
--     *
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function testCustomerWithValidCredentialsWithoutToken()
--    {
--         $query
--           = <<<QUERY
--{
--  customer 
--  {
--    created_at
--    group_id
--    prefix
--    firstname
--    middlename
--    lastname
--    suffix
--    email
--    default_billing
--    default_shipping
--    id   
--   }
--}
--QUERY;
--
--        $this->expectException(\Exception::class);
--        $this->expectExceptionMessage('GraphQL response contains errors: Current customer' . ' ' .
--           'does not have access to the resource "customer"');
--        $this->graphQlQuery($query);
--    }
--
--    /**
--     * Verify the all the whitelisted fields for a Customer Object
--     *
--     * @param CustomerInterface $customer
--     * @param $actualResponse
--     */
--    public function assertCustomerFields($customer, $actualResponse)
--    {
--        // ['customer_object_field_name', 'expected_value']
--        $assertionMap = [
--            ['response_field' => 'id', 'expected_value' => $customer->getId()],
--            ['response_field' => 'created_at', 'expected_value' => $customer->getCreatedAt()],
--            ['response_field' => 'group_id', 'expected_value' => $customer->getGroupId()],
--            ['response_field' => 'prefix', 'expected_value' => $customer->getPrefix()],
--            ['response_field' => 'firstname', 'expected_value' => $customer->getFirstname()],
--            ['response_field' => 'middlename', 'expected_value' => $customer->getMiddlename()],
--            ['response_field' => 'lastname', 'expected_value' => $customer->getLastname()],
--            ['response_field' => 'suffix', 'expected_value' => $customer->getSuffix()],
--            ['response_field' => 'email', 'expected_value' => $customer->getEmail()],
--            ['response_field' => 'default_shipping', 'expected_value' => (bool)$customer->getDefaultShipping()],
--            ['response_field' => 'default_billing', 'expected_value' => (bool)$customer->getDefaultBilling()],
--            ['response_field' => 'id', 'expected_value' => $customer->getId()]
--        ];
--
--        $this->assertResponseFields($actualResponse, $assertionMap);
--    }
--
--    /**
--     * Verify the fields for CustomerAddress object
--     *
--     * @param CustomerInterface $customer
--     * @param array $actualResponse
--     */
--    public function assertCustomerAddressesFields($customer, $actualResponse)
--    {
--        /** @var AddressInterface $addresses */
--        $addresses = $customer->getAddresses();
--        foreach ($addresses as $addressKey => $addressValue) {
--            $this->assertNotEmpty($addressValue);
--            $assertionMap = [
--                ['response_field' => 'id', 'expected_value' => $addresses[$addressKey]->getId()],
--                ['response_field' => 'customer_id', 'expected_value' => $addresses[$addressKey]->getCustomerId()],
--                ['response_field' => 'region_id', 'expected_value' => $addresses[$addressKey]->getRegionId()],
--                ['response_field' => 'country_id', 'expected_value' => $addresses[$addressKey]->getCountryId()],
--                ['response_field' => 'telephone', 'expected_value' => $addresses[$addressKey]->getTelephone()],
--                ['response_field' => 'postcode', 'expected_value' => $addresses[$addressKey]->getPostcode()],
--                ['response_field' => 'city', 'expected_value' => $addresses[$addressKey]->getCity()],
--                ['response_field' => 'firstname', 'expected_value' => $addresses[$addressKey]->getFirstname()],
--                ['response_field' => 'lastname', 'expected_value' => $addresses[$addressKey]->getLastname()]
--            ];
--            $this->assertResponseFields($actualResponse['customer']['addresses'][$addressKey], $assertionMap);
--        }
--    }
--
--    /**
--     * @param array $actualResponse
--     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
--     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
--     */
--    private function assertResponseFields($actualResponse, $assertionMap)
--    {
--        foreach ($assertionMap as $key => $assertionData) {
--            $expectedValue = isset($assertionData['expected_value'])
--                ? $assertionData['expected_value']
--                : $assertionData;
--            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
--            $this->assertNotNull(
--                $expectedValue,
--                "Value of '{$responseField}' field must not be NULL"
--            );
--            $this->assertEquals(
--                $expectedValue,
--                $actualResponse[$responseField],
--                "Value of '{$responseField}' field in response does not match expected value: "
--                . var_export($expectedValue, true)
--            );
--        }
--    }
--}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
-new file mode 100644
-index 00000000000..443b9d7ec53
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
-@@ -0,0 +1,263 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Customer;
-+
-+use Exception;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+
-+/**
-+ * Delete customer address tests
-+ */
-+class DeleteCustomerAddressTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * @var AddressRepositoryInterface
-+     */
-+    private $addressRepository;
-+
-+    /**
-+     * @var LockCustomer
-+     */
-+    private $lockCustomer;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
-+        $this->addressRepository = Bootstrap::getObjectManager()->get(AddressRepositoryInterface::class);
-+        $this->lockCustomer = Bootstrap::getObjectManager()->get(LockCustomer::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     */
-+    public function testDeleteCustomerAddress()
-+    {
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $addressId = 2;
-+
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  deleteCustomerAddress(id: {$addressId})
-+}
-+MUTATION;
-+        $response = $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+        $this->assertArrayHasKey('deleteCustomerAddress', $response);
-+        $this->assertEquals(true, $response['deleteCustomerAddress']);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The current customer isn't authorized.
-+     */
-+    public function testDeleteCustomerAddressIfUserIsNotAuthorized()
-+    {
-+        $addressId = 1;
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  deleteCustomerAddress(id: {$addressId})
-+}
-+MUTATION;
-+        $this->graphQlMutation($mutation);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Customer Address 2 is set as default shipping address and can not be deleted
-+     */
-+    public function testDeleteDefaultShippingCustomerAddress()
-+    {
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $addressId = 2;
-+
-+        $address = $this->addressRepository->getById($addressId);
-+        $address->setIsDefaultShipping(true);
-+        $this->addressRepository->save($address);
-+
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  deleteCustomerAddress(id: {$addressId})
-+}
-+MUTATION;
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Customer Address 2 is set as default billing address and can not be deleted
-+     */
-+    public function testDeleteDefaultBillingCustomerAddress()
-+    {
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $addressId = 2;
-+
-+        $address = $this->addressRepository->getById($addressId);
-+        $address->setIsDefaultBilling(true);
-+        $this->addressRepository->save($address);
-+
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  deleteCustomerAddress(id: {$addressId})
-+}
-+MUTATION;
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a address with ID "9999"
-+     */
-+    public function testDeleteNonExistCustomerAddress()
-+    {
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  deleteCustomerAddress(id: 9999)
-+}
-+MUTATION;
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * Delete address with missing ID input.
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Syntax Error: Expected Name, found )
-+     * @throws Exception
-+     */
-+    public function testDeleteCustomerAddressWithMissingData()
-+    {
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  deleteCustomerAddress()
-+}
-+MUTATION;
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * Delete address with incorrect ID input type.
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Expected type Int!, found "".
-+     * @throws Exception
-+     */
-+    public function testDeleteCustomerAddressWithIncorrectIdType()
-+    {
-+        $this->markTestSkipped(
-+            'Type validation returns wrong message https://github.com/magento/graphql-ce/issues/735'
-+        );
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  deleteCustomerAddress(id: "string")
-+}
-+MUTATION;
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Current customer does not have permission to address with ID "2"
-+     */
-+    public function testDeleteAnotherCustomerAddress()
-+    {
-+        $userName = 'customer_two@example.com';
-+        $password = 'password';
-+        $addressId = 2;
-+
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  deleteCustomerAddress(id: {$addressId})
-+}
-+MUTATION;
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The account is locked
-+     */
-+    public function testDeleteCustomerAddressIfAccountIsLocked()
-+    {
-+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/750');
-+
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $addressId = 2;
-+
-+        $this->lockCustomer->execute(1);
-+
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  deleteCustomerAddress(id: {$addressId})
-+}
-+MUTATION;
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * @param string $email
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getCustomerAuthHeaders(string $email, string $password): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
-+        return ['Authorization' => 'Bearer ' . $customerToken];
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php
-new file mode 100644
-index 00000000000..85c2fc1c847
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php
-@@ -0,0 +1,123 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Customer;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * API-functional tests cases for generateCustomerToken mutation
-+ */
-+class GenerateCustomerTokenTest extends GraphQlAbstract
-+{
-+    /**
-+     * Verify customer token with valid credentials
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testGenerateCustomerValidToken()
-+    {
-+        $email = 'customer@example.com';
-+        $password = 'password';
-+
-+        $mutation = $this->getQuery($email, $password);
-+
-+        $response = $this->graphQlMutation($mutation);
-+        $this->assertArrayHasKey('generateCustomerToken', $response);
-+        $this->assertInternalType('array', $response['generateCustomerToken']);
-+    }
-+
-+    /**
-+     * Test customer with invalid data.
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     *
-+     * @dataProvider dataProviderInvalidCustomerInfo
-+     * @param string $email
-+     * @param string $password
-+     * @param string $message
-+     */
-+    public function testGenerateCustomerTokenInvalidData(string $email, string $password, string $message)
-+    {
-+        $mutation = $this->getQuery($email, $password);
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($mutation);
-+    }
-+
-+    /**
-+     * Test customer token regeneration.
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testRegenerateCustomerToken()
-+    {
-+        $email = 'customer@example.com';
-+        $password = 'password';
-+
-+        $mutation = $this->getQuery($email, $password);
-+
-+        $response1 = $this->graphQlMutation($mutation);
-+        $token1 = $response1['generateCustomerToken']['token'];
-+
-+        $response2 = $this->graphQlMutation($mutation);
-+        $token2 = $response2['generateCustomerToken']['token'];
-+
-+        $this->assertNotEquals($token1, $token2, 'Tokens should not be identical!');
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderInvalidCustomerInfo(): array
-+    {
-+        return [
-+            'invalid_email' => [
-+                'invalid_email@example.com',
-+                'password',
-+                'The account sign-in was incorrect or your account is disabled temporarily. ' .
-+                'Please wait and try again later.'
-+            ],
-+            'empty_email' => [
-+                '',
-+                'password',
-+                'Specify the "email" value.'
-+            ],
-+            'invalid_password' => [
-+                'customer@example.com',
-+                'invalid_password',
-+                'The account sign-in was incorrect or your account is disabled temporarily. ' .
-+                'Please wait and try again later.'
-+            ],
-+            'empty_password' => [
-+                'customer@example.com',
-+                '',
-+                'Specify the "password" value.'
-+
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * @param string $email
-+     * @param string $password
-+     * @return string
-+     */
-+    private function getQuery(string $email, string $password) : string
-+    {
-+        return <<<MUTATION
-+mutation {
-+	generateCustomerToken(
-+        email: "{$email}"
-+        password: "{$password}"
-+    ) {
-+        token
-+    }
-+}
-+MUTATION;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetAddressesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetAddressesTest.php
-new file mode 100644
-index 00000000000..e0c6841b2ea
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetAddressesTest.php
-@@ -0,0 +1,155 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Customer;
-+
-+use Exception;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+
-+/**
-+ * Test for customer address retrieval.
-+ */
-+class GetAddressesTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var LockCustomer
-+     */
-+    private $lockCustomer;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-+        $this->lockCustomer = Bootstrap::getObjectManager()->get(LockCustomer::class);
-+    }
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     */
-+    public function testGetCustomerWithAddresses()
-+    {
-+        $query = $this->getQuery();
-+
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($userName, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        /** @var CustomerRepositoryInterface $customerRepository */
-+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-+        $customer = $customerRepository->get('customer@example.com');
-+
-+        $response = $this->graphQlQuery($query, [], '', $headerMap);
-+        $this->assertArrayHasKey('customer', $response);
-+        $this->assertArrayHasKey('addresses', $response['customer']);
-+        $this->assertTrue(
-+            is_array([$response['customer']['addresses']]),
-+            " Addresses field must be of an array type."
-+        );
-+        self::assertEquals($customer->getId(), $response['customer']['id']);
-+        $this->assertCustomerAddressesFields($customer, $response);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage GraphQL response contains errors: The account is locked.
-+     */
-+    public function testGetCustomerAddressIfAccountIsLocked()
-+    {
-+        $query = $this->getQuery();
-+
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $this->lockCustomer->execute(1);
-+
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($userName, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+
-+        $this->graphQlQuery($query, [], '', $headerMap);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage GraphQL response contains errors: The current customer isn't authorized.
-+     */
-+    public function testGetCustomerAddressIfUserIsNotAuthorized()
-+    {
-+        $query = $this->getQuery();
-+
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * Verify the fields for CustomerAddress object
-+     *
-+     * @param CustomerInterface $customer
-+     * @param array $actualResponse
-+     */
-+    public function assertCustomerAddressesFields($customer, $actualResponse)
-+    {
-+        /** @var AddressInterface $addresses */
-+        $addresses = $customer->getAddresses();
-+        foreach ($addresses as $addressKey => $addressValue) {
-+            $this->assertNotEmpty($addressValue);
-+            $assertionMap = [
-+                ['response_field' => 'id', 'expected_value' => $addresses[$addressKey]->getId()],
-+                ['response_field' => 'customer_id', 'expected_value' => $addresses[$addressKey]->getCustomerId()],
-+                ['response_field' => 'region_id', 'expected_value' => $addresses[$addressKey]->getRegionId()],
-+                ['response_field' => 'country_id', 'expected_value' => $addresses[$addressKey]->getCountryId()],
-+                ['response_field' => 'telephone', 'expected_value' => $addresses[$addressKey]->getTelephone()],
-+                ['response_field' => 'postcode', 'expected_value' => $addresses[$addressKey]->getPostcode()],
-+                ['response_field' => 'city', 'expected_value' => $addresses[$addressKey]->getCity()],
-+                ['response_field' => 'firstname', 'expected_value' => $addresses[$addressKey]->getFirstname()],
-+                ['response_field' => 'lastname', 'expected_value' => $addresses[$addressKey]->getLastname()]
-+            ];
-+            $this->assertResponseFields($actualResponse['customer']['addresses'][$addressKey], $assertionMap);
-+        }
-+    }
-+
-+    /**
-+     * @return string
-+     */
-+    private function getQuery(): string
-+    {
-+        $query
-+            = <<<QUERY
-+{
-+  customer {
-+    id
-+    addresses {
-+      id
-+      customer_id
-+      region_id
-+      country_id
-+      telephone
-+      postcode
-+      city      
-+      firstname
-+      lastname
-+    }
-+   }
-+}
-+QUERY;
-+        return $query;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php
-new file mode 100644
-index 00000000000..928a263e853
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php
-@@ -0,0 +1,129 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Customer;
-+
-+use Magento\Customer\Model\CustomerAuthUpdate;
-+use Magento\Customer\Model\CustomerRegistry;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+class GetCustomerTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var CustomerRegistry
-+     */
-+    private $customerRegistry;
-+
-+    /**
-+     * @var CustomerAuthUpdate
-+     */
-+    private $customerAuthUpdate;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-+        $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
-+        $this->customerAuthUpdate = Bootstrap::getObjectManager()->get(CustomerAuthUpdate::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testGetCustomer()
-+    {
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+
-+        $query = <<<QUERY
-+query {
-+    customer {
-+        firstname
-+        lastname
-+        email
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
-+
-+        $this->assertEquals('John', $response['customer']['firstname']);
-+        $this->assertEquals('Smith', $response['customer']['lastname']);
-+        $this->assertEquals($currentEmail, $response['customer']['email']);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The current customer isn't authorized.
-+     */
-+    public function testGetCustomerIfUserIsNotAuthorized()
-+    {
-+        $query = <<<QUERY
-+query {
-+    customer {
-+        firstname
-+        lastname
-+        email
-+    }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The account is locked.
-+     */
-+    public function testGetCustomerIfAccountIsLocked()
-+    {
-+        $this->lockCustomer(1);
-+
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+
-+        $query = <<<QUERY
-+query {
-+    customer {
-+        firstname
-+        lastname
-+        email
-+    }
-+}
-+QUERY;
-+        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
-+    }
-+
-+    /**
-+     * @param string $email
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getCustomerAuthHeaders(string $email, string $password): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
-+        return ['Authorization' => 'Bearer ' . $customerToken];
-+    }
-+
-+    /**
-+     * @param int $customerId
-+     * @return void
-+     */
-+    private function lockCustomer(int $customerId): void
-+    {
-+        $customerSecure = $this->customerRegistry->retrieveSecureData($customerId);
-+        $customerSecure->setLockExpires('2030-12-31 00:00:00');
-+        $this->customerAuthUpdate->saveAuth($customerId);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/IsEmailAvailableTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/IsEmailAvailableTest.php
-new file mode 100644
-index 00000000000..a8c4d453e29
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/IsEmailAvailableTest.php
-@@ -0,0 +1,107 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Customer;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test email availability functionality
-+ */
-+class IsEmailAvailableTest extends GraphQlAbstract
-+{
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testEmailNotAvailable()
-+    {
-+        $query =
-+            <<<QUERY
-+{
-+  isEmailAvailable(email: "customer@example.com") {
-+    is_email_available
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('isEmailAvailable', $response);
-+        self::assertArrayHasKey('is_email_available', $response['isEmailAvailable']);
-+        self::assertFalse($response['isEmailAvailable']['is_email_available']);
-+    }
-+
-+    /**
-+     * Verify email availability
-+     */
-+    public function testEmailAvailable()
-+    {
-+        $query =
-+            <<<QUERY
-+{
-+  isEmailAvailable(email: "customer@example.com") {
-+    is_email_available
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('isEmailAvailable', $response);
-+        self::assertArrayHasKey('is_email_available', $response['isEmailAvailable']);
-+        self::assertTrue($response['isEmailAvailable']['is_email_available']);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage GraphQL response contains errors: Email must be specified
-+     */
-+    public function testEmailAvailableEmptyValue()
-+    {
-+        $query =
-+            <<<QUERY
-+{
-+  isEmailAvailable(email: "") {
-+    is_email_available
-+  }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Field "isEmailAvailable" argument "email" of type "String!" is required
-+     */
-+    public function testEmailAvailableMissingValue()
-+    {
-+        $query =
-+            <<<QUERY
-+{
-+  isEmailAvailable {
-+    is_email_available
-+  }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage GraphQL response contains errors: Email is invalid
-+     */
-+    public function testEmailAvailableInvalidValue()
-+    {
-+        $query =
-+            <<<QUERY
-+{
-+  isEmailAvailable(email: "invalid-email") {
-+    is_email_available
-+  }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/LockCustomer.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/LockCustomer.php
-new file mode 100644
-index 00000000000..e745c3587d8
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/LockCustomer.php
-@@ -0,0 +1,51 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Customer;
-+
-+use Magento\Customer\Model\CustomerAuthUpdate;
-+use Magento\Customer\Model\CustomerRegistry;
-+
-+/**
-+ * Lock customer account by ID
-+ */
-+class LockCustomer
-+{
-+    /**
-+     * @var CustomerRegistry
-+     */
-+    private $customerRegistry;
-+
-+    /**
-+     * @var CustomerAuthUpdate
-+     */
-+    private $customerAuthUpdate;
-+
-+    /**
-+     * @param CustomerRegistry $customerRegistry
-+     * @param CustomerAuthUpdate $customerAuthUpdate
-+     */
-+    public function __construct(CustomerRegistry $customerRegistry, CustomerAuthUpdate $customerAuthUpdate)
-+    {
-+        $this->customerRegistry = $customerRegistry;
-+        $this->customerAuthUpdate = $customerAuthUpdate;
-+    }
-+
-+    /**
-+     * Lock customer by ID.
-+     *
-+     * @param int $customerId
-+     *
-+     * @return void
-+     */
-+    public function execute(int $customerId): void
-+    {
-+        $customerSecure = $this->customerRegistry->retrieveSecureData($customerId);
-+        $customerSecure->setLockExpires('2030-12-31 00:00:00');
-+        $this->customerAuthUpdate->saveAuth($customerId);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RevokeCustomerTokenTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RevokeCustomerTokenTest.php
-new file mode 100644
-index 00000000000..fc0c02bae55
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RevokeCustomerTokenTest.php
-@@ -0,0 +1,58 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Customer;
-+
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for revoke customer token mutation
-+ */
-+class RevokeCustomerTokenTest extends GraphQlAbstract
-+{
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testRevokeCustomerTokenValidCredentials()
-+    {
-+        $query = <<<QUERY
-+            mutation {
-+                revokeCustomerToken {
-+                    result
-+                }
-+            }
-+QUERY;
-+
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        /** @var CustomerTokenServiceInterface $customerTokenService */
-+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
-+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-+
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        $response = $this->graphQlMutation($query, [], '', $headerMap);
-+        $this->assertTrue($response['revokeCustomerToken']['result']);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The current customer isn't authorized.
-+     */
-+    public function testRevokeCustomerTokenForGuestCustomer()
-+    {
-+        $query = <<<QUERY
-+            mutation {
-+                revokeCustomerToken {
-+                    result
-+                }
-+            }
-+QUERY;
-+        $this->graphQlMutation($query, [], '');
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php
-new file mode 100644
-index 00000000000..bbb7e245c91
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php
-@@ -0,0 +1,171 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Customer;
-+
-+use Exception;
-+use Magento\Framework\Exception\AuthenticationException;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\Newsletter\Model\SubscriberFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Tests for subscription status
-+ */
-+class SubscriptionStatusTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var SubscriberFactory
-+     */
-+    private $subscriberFactory;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-+        $this->subscriberFactory = Bootstrap::getObjectManager()->get(SubscriberFactory::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testGetSubscriptionStatusTest()
-+    {
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+
-+        $query = <<<QUERY
-+query {
-+    customer {
-+        is_subscribed
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap($currentEmail, $currentPassword));
-+        $this->assertFalse($response['customer']['is_subscribed']);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The current customer isn't authorized.
-+     */
-+    public function testGetSubscriptionStatusIfUserIsNotAuthorizedTest()
-+    {
-+        $query = <<<QUERY
-+query {
-+    customer {
-+        is_subscribed
-+    }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testSubscribeCustomer()
-+    {
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+
-+        $query = <<<QUERY
-+mutation {
-+    updateCustomer(
-+        input: {
-+            is_subscribed: true
-+        }
-+    ) {
-+        customer {
-+            is_subscribed
-+        }
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation(
-+            $query,
-+            [],
-+            '',
-+            $this->getHeaderMap($currentEmail, $currentPassword)
-+        );
-+        $this->assertTrue($response['updateCustomer']['customer']['is_subscribed']);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The current customer isn't authorized.
-+     */
-+    public function testChangeSubscriptionStatuIfUserIsNotAuthorizedTest()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+    updateCustomer(
-+        input: {
-+            is_subscribed: true
-+        }
-+    ) {
-+        customer {
-+            is_subscribed
-+        }
-+    }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Newsletter/_files/subscribers.php
-+     */
-+    public function testUnsubscribeCustomer()
-+    {
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+
-+        $query = <<<QUERY
-+mutation {
-+    updateCustomer(
-+        input: {
-+            is_subscribed: false
-+        }
-+    ) {
-+        customer {
-+            is_subscribed
-+        }
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap($currentEmail, $currentPassword));
-+        $this->assertFalse($response['updateCustomer']['customer']['is_subscribed']);
-+    }
-+
-+    /**
-+     * @param string $email
-+     * @param string $password
-+     *
-+     * @return array
-+     * @throws AuthenticationException
-+     */
-+    private function getHeaderMap(string $email, string $password): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
-+        return ['Authorization' => 'Bearer ' . $customerToken];
-+    }
-+
-+    protected function tearDown()
-+    {
-+        parent::tearDown();
-+
-+        $this->subscriberFactory->create()->loadByCustomerId(1)->delete();
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
-new file mode 100644
-index 00000000000..f2e82398df4
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
-@@ -0,0 +1,470 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Customer;
-+
-+use Exception;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+
-+/**
-+ * Update customer address tests
-+ */
-+class UpdateCustomerAddressTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * @var AddressRepositoryInterface
-+     */
-+    private $addressRepository;
-+
-+    /**
-+     * @var LockCustomer
-+     */
-+    private $lockCustomer;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
-+        $this->addressRepository = Bootstrap::getObjectManager()->get(AddressRepositoryInterface::class);
-+        $this->lockCustomer = Bootstrap::getObjectManager()->get(LockCustomer::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testUpdateCustomerAddress()
-+    {
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $customerId = 1;
-+        $addressId = 1;
-+
-+        $mutation = $this->getMutation($addressId);
-+
-+        $response = $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+        $this->assertArrayHasKey('updateCustomerAddress', $response);
-+        $this->assertArrayHasKey('customer_id', $response['updateCustomerAddress']);
-+        $this->assertEquals($customerId, $response['updateCustomerAddress']['customer_id']);
-+        $this->assertArrayHasKey('id', $response['updateCustomerAddress']);
-+
-+        $address = $this->addressRepository->getById($addressId);
-+        $this->assertEquals($address->getId(), $response['updateCustomerAddress']['id']);
-+        $this->assertCustomerAddressesFields($address, $response['updateCustomerAddress']);
-+        $updateAddress = $this->getAddressData();
-+        $this->assertCustomerAddressesFields($address, $updateAddress);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The current customer isn't authorized.
-+     */
-+    public function testUpdateCustomerAddressIfUserIsNotAuthorized()
-+    {
-+        $addressId = 1;
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  updateCustomerAddress(id:{$addressId}, input: {
-+    city: "New City"
-+    postcode: "5555"
-+  }) {
-+    id
-+  }
-+}
-+MUTATION;
-+        $this->graphQlMutation($mutation);
-+    }
-+
-+    /**
-+     * Verify customers with credentials update address
-+     * with missing required Firstname attribute
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameters are missing: firstname
-+     */
-+    public function testUpdateCustomerAddressWithMissingAttribute()
-+    {
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $addressId = 1;
-+
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  updateCustomerAddress(id: {$addressId}, input: {
-+    firstname: ""
-+    lastname: "Phillis"
-+  }) {
-+    id
-+  }
-+}
-+MUTATION;
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * Verify the fields for Customer address
-+     *
-+     * @param AddressInterface $address
-+     * @param array $actualResponse
-+     */
-+    private function assertCustomerAddressesFields(AddressInterface $address, $actualResponse): void
-+    {
-+        /** @var  $addresses */
-+        $assertionMap = [
-+            ['response_field' => 'country_id', 'expected_value' => $address->getCountryId()],
-+            ['response_field' => 'street', 'expected_value' => $address->getStreet()],
-+            ['response_field' => 'company', 'expected_value' => $address->getCompany()],
-+            ['response_field' => 'telephone', 'expected_value' => $address->getTelephone()],
-+            ['response_field' => 'fax', 'expected_value' => $address->getFax()],
-+            ['response_field' => 'postcode', 'expected_value' => $address->getPostcode()],
-+            ['response_field' => 'city', 'expected_value' => $address->getCity()],
-+            ['response_field' => 'firstname', 'expected_value' => $address->getFirstname()],
-+            ['response_field' => 'lastname', 'expected_value' => $address->getLastname()],
-+            ['response_field' => 'middlename', 'expected_value' => $address->getMiddlename()],
-+            ['response_field' => 'prefix', 'expected_value' => $address->getPrefix()],
-+            ['response_field' => 'suffix', 'expected_value' => $address->getSuffix()],
-+            ['response_field' => 'vat_id', 'expected_value' => $address->getVatId()],
-+            ['response_field' => 'default_shipping', 'expected_value' => (bool)$address->isDefaultShipping()],
-+            ['response_field' => 'default_billing', 'expected_value' => (bool)$address->isDefaultBilling()],
-+        ];
-+        $this->assertResponseFields($actualResponse, $assertionMap);
-+        $this->assertTrue(is_array([$actualResponse['region']]), "region field must be of an array type.");
-+        $assertionRegionMap = [
-+            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
-+            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
-+            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
-+        ];
-+        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
-+    }
-+
-+    /**
-+     * Update address with missing ID input.
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testUpdateCustomerAddressWithMissingId()
-+    {
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+
-+        $updateAddress = $this->getAddressData();
-+        $defaultShippingText = $updateAddress['default_shipping'] ? 'true' : 'false';
-+        $defaultBillingText = $updateAddress['default_billing'] ? 'true' : 'false';
-+
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  updateCustomerAddress(, input: {
-+    region: {
-+        region: "{$updateAddress['region']['region']}"
-+        region_id: {$updateAddress['region']['region_id']}
-+        region_code: "{$updateAddress['region']['region_code']}"
-+    }
-+    country_id: {$updateAddress['country_id']}
-+    street: ["{$updateAddress['street'][0]}","{$updateAddress['street'][1]}"]
-+    company: "{$updateAddress['company']}"
-+    telephone: "{$updateAddress['telephone']}"
-+    fax: "{$updateAddress['fax']}"
-+    postcode: "{$updateAddress['postcode']}"
-+    city: "{$updateAddress['city']}"
-+    firstname: "{$updateAddress['firstname']}"
-+    lastname: "{$updateAddress['lastname']}"
-+    middlename: "{$updateAddress['middlename']}"
-+    prefix: "{$updateAddress['prefix']}"
-+    suffix: "{$updateAddress['suffix']}"
-+    vat_id: "{$updateAddress['vat_id']}"
-+    default_shipping: {$defaultShippingText}
-+    default_billing: {$defaultBillingText}
-+  }) {
-+    id
-+  }
-+}
-+MUTATION;
-+
-+        $this->expectException(Exception::class);
-+        $this->expectExceptionMessage(
-+            'Field "updateCustomerAddress" argument "id" of type "Int!" is required but not provided.'
-+        );
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * Update address with invalid ID input.
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testUpdateCustomerAddressWithInvalidIdType()
-+    {
-+        $this->markTestSkipped(
-+            'Type validation returns wrong message https://github.com/magento/graphql-ce/issues/735'
-+        );
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+
-+        $updateAddress = $this->getAddressData();
-+        $defaultShippingText = $updateAddress['default_shipping'] ? 'true' : 'false';
-+        $defaultBillingText = $updateAddress['default_billing'] ? 'true' : 'false';
-+
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  updateCustomerAddress(id: "", input: {
-+    region: {
-+        region: "{$updateAddress['region']['region']}"
-+        region_id: {$updateAddress['region']['region_id']}
-+        region_code: "{$updateAddress['region']['region_code']}"
-+    }
-+    country_id: {$updateAddress['country_id']}
-+    street: ["{$updateAddress['street'][0]}","{$updateAddress['street'][1]}"]
-+    company: "{$updateAddress['company']}"
-+    telephone: "{$updateAddress['telephone']}"
-+    fax: "{$updateAddress['fax']}"
-+    postcode: "{$updateAddress['postcode']}"
-+    city: "{$updateAddress['city']}"
-+    firstname: "{$updateAddress['firstname']}"
-+    lastname: "{$updateAddress['lastname']}"
-+    middlename: "{$updateAddress['middlename']}"
-+    prefix: "{$updateAddress['prefix']}"
-+    suffix: "{$updateAddress['suffix']}"
-+    vat_id: "{$updateAddress['vat_id']}"
-+    default_shipping: {$defaultShippingText}
-+    default_billing: {$defaultBillingText}
-+  }) {
-+    id
-+  }
-+}
-+MUTATION;
-+
-+        $this->expectException(Exception::class);
-+        $this->expectExceptionMessage('Expected type Int!, found ""');
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * Update address with invalid input
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @dataProvider invalidInputDataProvider
-+     * @param string $input
-+     * @param string $exceptionMessage
-+     */
-+    public function testUpdateCustomerAddressWithInvalidInput(string $input, string $exceptionMessage)
-+    {
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $addressId = 1;
-+
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  updateCustomerAddress(id: {$addressId}, $input) {
-+    id
-+  }
-+}
-+MUTATION;
-+
-+        $this->expectException(Exception::class);
-+        $this->expectExceptionMessage($exceptionMessage);
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function invalidInputDataProvider()
-+    {
-+        return [
-+            ['', '"input" value must be specified'],
-+            ['input: ""', 'Expected type CustomerAddressInput, found ""'],
-+            ['input: "foo"', 'Expected type CustomerAddressInput, found "foo"']
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a address with ID "9999"
-+     */
-+    public function testUpdateNotExistingCustomerAddress()
-+    {
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $addressId = 9999;
-+
-+        $mutation = $this->getMutation($addressId);
-+
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Current customer does not have permission to address with ID "1"
-+     */
-+    public function testUpdateAnotherCustomerAddress()
-+    {
-+        $userName = 'customer_two@example.com';
-+        $password = 'password';
-+        $addressId = 1;
-+
-+        $mutation = $this->getMutation($addressId);
-+
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The account is locked.
-+     */
-+    public function testUpdateCustomerAddressIfAccountIsLocked()
-+    {
-+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/750');
-+
-+        $userName = 'customer@example.com';
-+        $password = 'password';
-+        $addressId = 1;
-+        $this->lockCustomer->execute(1);
-+
-+        $mutation = $this->getMutation($addressId);
-+
-+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-+    }
-+
-+    /**
-+     * @param string $email
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getCustomerAuthHeaders(string $email, string $password): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
-+        return ['Authorization' => 'Bearer ' . $customerToken];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    private function getAddressData(): array
-+    {
-+        return [
-+            'region' => [
-+                'region' => 'Alaska',
-+                'region_id' => 2,
-+                'region_code' => 'AK'
-+            ],
-+            'country_id' => 'US',
-+            'street' => ['Line 1 Street', 'Line 2'],
-+            'company' => 'Company Name',
-+            'telephone' => '123456789',
-+            'fax' => '123123123',
-+            'postcode' => '7777',
-+            'city' => 'City Name',
-+            'firstname' => 'Adam',
-+            'lastname' => 'Phillis',
-+            'middlename' => 'A',
-+            'prefix' => 'Mr.',
-+            'suffix' => 'Jr.',
-+            'vat_id' => '1',
-+            'default_shipping' => true,
-+            'default_billing' => true
-+        ];
-+    }
-+
-+    /**
-+     * @param int $addressId
-+     * @return string
-+     */
-+    private function getMutation(int $addressId): string
-+    {
-+        $updateAddress = $this->getAddressData();
-+        $defaultShippingText = $updateAddress['default_shipping'] ? "true" : "false";
-+        $defaultBillingText = $updateAddress['default_billing'] ? "true" : "false";
-+
-+        $mutation
-+            = <<<MUTATION
-+mutation {
-+  updateCustomerAddress(id: {$addressId}, input: {
-+    region: {
-+        region: "{$updateAddress['region']['region']}"
-+        region_id: {$updateAddress['region']['region_id']}
-+        region_code: "{$updateAddress['region']['region_code']}"
-+    }
-+    country_id: {$updateAddress['country_id']}
-+    street: ["{$updateAddress['street'][0]}","{$updateAddress['street'][1]}"]
-+    company: "{$updateAddress['company']}"
-+    telephone: "{$updateAddress['telephone']}"
-+    fax: "{$updateAddress['fax']}"
-+    postcode: "{$updateAddress['postcode']}"
-+    city: "{$updateAddress['city']}"
-+    firstname: "{$updateAddress['firstname']}"
-+    lastname: "{$updateAddress['lastname']}"
-+    middlename: "{$updateAddress['middlename']}"
-+    prefix: "{$updateAddress['prefix']}"
-+    suffix: "{$updateAddress['suffix']}"
-+    vat_id: "{$updateAddress['vat_id']}"
-+    default_shipping: {$defaultShippingText}
-+    default_billing: {$defaultBillingText}
-+  }) {
-+    id
-+    customer_id
-+    region {
-+      region
-+      region_id
-+      region_code
-+    }
-+    country_id
-+    street
-+    company
-+    telephone
-+    fax
-+    postcode
-+    city
-+    firstname
-+    lastname
-+    middlename
-+    prefix
-+    suffix
-+    vat_id
-+    default_shipping
-+    default_billing
-+  }
-+}
-+MUTATION;
-+        return $mutation;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
-new file mode 100644
-index 00000000000..7b1f3a67a11
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
-@@ -0,0 +1,284 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Customer;
-+
-+use Magento\Customer\Model\CustomerAuthUpdate;
-+use Magento\Customer\Model\CustomerRegistry;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Tests for update customer
-+ */
-+class UpdateCustomerTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var CustomerAuthUpdate
-+     */
-+    private $customerAuthUpdate;
-+
-+    /**
-+     * @var LockCustomer
-+     */
-+    private $lockCustomer;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-+        $this->customerAuthUpdate = Bootstrap::getObjectManager()->get(CustomerAuthUpdate::class);
-+        $this->lockCustomer = Bootstrap::getObjectManager()->get(LockCustomer::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testUpdateCustomer()
-+    {
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+
-+        $newPrefix = 'Dr';
-+        $newFirstname = 'Richard';
-+        $newMiddlename = 'Riley';
-+        $newLastname = 'Rowe';
-+        $newSuffix = 'III';
-+        $newDob = '3/11/1972';
-+        $newTaxVat = 'GQL1234567';
-+        $newGender = 2;
-+        $newEmail = 'customer_updated@example.com';
-+
-+        $query = <<<QUERY
-+mutation {
-+    updateCustomer(
-+        input: {
-+            prefix: "{$newPrefix}"
-+            firstname: "{$newFirstname}"
-+            middlename: "{$newMiddlename}"
-+            lastname: "{$newLastname}"
-+            suffix: "{$newSuffix}"
-+            dob: "{$newDob}"
-+            taxvat: "{$newTaxVat}"
-+            email: "{$newEmail}"
-+            password: "{$currentPassword}"
-+            gender: {$newGender}
-+        }
-+    ) {
-+        customer {
-+            prefix
-+            firstname
-+            middlename
-+            lastname
-+            suffix
-+            dob
-+            taxvat
-+            email
-+            gender
-+        }
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation(
-+            $query,
-+            [],
-+            '',
-+            $this->getCustomerAuthHeaders($currentEmail, $currentPassword)
-+        );
-+
-+        $this->assertEquals($newPrefix, $response['updateCustomer']['customer']['prefix']);
-+        $this->assertEquals($newFirstname, $response['updateCustomer']['customer']['firstname']);
-+        $this->assertEquals($newMiddlename, $response['updateCustomer']['customer']['middlename']);
-+        $this->assertEquals($newLastname, $response['updateCustomer']['customer']['lastname']);
-+        $this->assertEquals($newSuffix, $response['updateCustomer']['customer']['suffix']);
-+        $this->assertEquals($newDob, $response['updateCustomer']['customer']['dob']);
-+        $this->assertEquals($newTaxVat, $response['updateCustomer']['customer']['taxvat']);
-+        $this->assertEquals($newEmail, $response['updateCustomer']['customer']['email']);
-+        $this->assertEquals($newGender, $response['updateCustomer']['customer']['gender']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage "input" value should be specified
-+     */
-+    public function testUpdateCustomerIfInputDataIsEmpty()
-+    {
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+
-+        $query = <<<QUERY
-+mutation {
-+    updateCustomer(
-+        input: {
-+
-+        }
-+    ) {
-+        customer {
-+            firstname
-+        }
-+    }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The current customer isn't authorized.
-+     */
-+    public function testUpdateCustomerIfUserIsNotAuthorized()
-+    {
-+        $newFirstname = 'Richard';
-+
-+        $query = <<<QUERY
-+mutation {
-+    updateCustomer(
-+        input: {
-+            firstname: "{$newFirstname}"
-+        }
-+    ) {
-+        customer {
-+            firstname
-+        }
-+    }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The account is locked.
-+     */
-+    public function testUpdateCustomerIfAccountIsLocked()
-+    {
-+        $this->lockCustomer->execute(1);
-+
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+        $newFirstname = 'Richard';
-+
-+        $query = <<<QUERY
-+mutation {
-+    updateCustomer(
-+        input: {
-+            firstname: "{$newFirstname}"
-+        }
-+    ) {
-+        customer {
-+            firstname
-+        }
-+    }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Provide the current "password" to change "email".
-+     */
-+    public function testUpdateEmailIfPasswordIsMissed()
-+    {
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+        $newEmail = 'customer_updated@example.com';
-+
-+        $query = <<<QUERY
-+mutation {
-+    updateCustomer(
-+        input: {
-+            email: "{$newEmail}"
-+        }
-+    ) {
-+        customer {
-+            firstname
-+        }
-+    }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Invalid login or password.
-+     */
-+    public function testUpdateEmailIfPasswordIsInvalid()
-+    {
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+        $invalidPassword = 'invalid_password';
-+        $newEmail = 'customer_updated@example.com';
-+
-+        $query = <<<QUERY
-+mutation {
-+    updateCustomer(
-+        input: {
-+            email: "{$newEmail}"
-+            password: "{$invalidPassword}"
-+        }
-+    ) {
-+        customer {
-+            firstname
-+        }
-+    }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage A customer with the same email address already exists in an associated website.
-+     */
-+    public function testUpdateEmailIfEmailAlreadyExists()
-+    {
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+        $existedEmail = 'customer_two@example.com';
-+
-+        $query = <<<QUERY
-+mutation {
-+    updateCustomer(
-+        input: {
-+            email: "{$existedEmail}"
-+            password: "{$currentPassword}"
-+        }
-+    ) {
-+        customer {
-+            firstname
-+        }
-+    }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
-+    }
-+
-+    /**
-+     * @param string $email
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getCustomerAuthHeaders(string $email, string $password): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
-+        return ['Authorization' => 'Bearer ' . $customerToken];
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CountriesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CountriesTest.php
-new file mode 100644
-index 00000000000..c42ce4c46fa
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CountriesTest.php
-@@ -0,0 +1,45 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Directory;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test the GraphQL endpoint's Coutries query
-+ */
-+class CountriesTest extends GraphQlAbstract
-+{
-+    public function testGetCountries()
-+    {
-+        $query = <<<QUERY
-+query {
-+    countries {
-+        id
-+        two_letter_abbreviation
-+        three_letter_abbreviation
-+        full_name_locale
-+        full_name_english
-+        available_regions {
-+            id
-+            code
-+            name
-+        }
-+    }
-+}
-+QUERY;
-+
-+        $result = $this->graphQlQuery($query);
-+        $this->assertArrayHasKey('countries', $result);
-+        $this->assertArrayHasKey('id', $result['countries'][0]);
-+        $this->assertArrayHasKey('two_letter_abbreviation', $result['countries'][0]);
-+        $this->assertArrayHasKey('three_letter_abbreviation', $result['countries'][0]);
-+        $this->assertArrayHasKey('full_name_locale', $result['countries'][0]);
-+        $this->assertArrayHasKey('full_name_english', $result['countries'][0]);
-+        $this->assertArrayHasKey('available_regions', $result['countries'][0]);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CountryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CountryTest.php
-new file mode 100644
-index 00000000000..dda5ef34224
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CountryTest.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Directory;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test the GraphQL endpoint's Coutries query
-+ */
-+class CountryTest extends GraphQlAbstract
-+{
-+    public function testGetCountry()
-+    {
-+        $query = <<<QUERY
-+query {
-+    country(id: "US") {
-+        id
-+        two_letter_abbreviation
-+        three_letter_abbreviation
-+        full_name_locale
-+        full_name_english
-+        available_regions {
-+            id
-+            code
-+            name
-+        }
-+    }
-+}
-+QUERY;
-+
-+        $result = $this->graphQlQuery($query);
-+        $this->assertArrayHasKey('country', $result);
-+        $this->assertArrayHasKey('id', $result['country']);
-+        $this->assertArrayHasKey('two_letter_abbreviation', $result['country']);
-+        $this->assertArrayHasKey('three_letter_abbreviation', $result['country']);
-+        $this->assertArrayHasKey('full_name_locale', $result['country']);
-+        $this->assertArrayHasKey('full_name_english', $result['country']);
-+        $this->assertArrayHasKey('available_regions', $result['country']);
-+        $this->assertArrayHasKey('id', $result['country']['available_regions'][0]);
-+        $this->assertArrayHasKey('code', $result['country']['available_regions'][0]);
-+        $this->assertArrayHasKey('name', $result['country']['available_regions'][0]);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage GraphQL response contains errors: The country isn't available.
-+     */
-+    public function testGetCountryNotFoundException()
-+    {
-+        $query = <<<QUERY
-+query {
-+    country(id: "BLAH") {
-+        id
-+        two_letter_abbreviation
-+        three_letter_abbreviation
-+        full_name_locale
-+        full_name_english
-+        available_regions {
-+            id
-+            code
-+            name
-+        }
-+    }
-+}
-+QUERY;
-+
-+        $this->graphQlQuery($query);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CurrencyTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CurrencyTest.php
-new file mode 100644
-index 00000000000..ad5d71cb086
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CurrencyTest.php
-@@ -0,0 +1,44 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Directory;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test the GraphQL endpoint's Currency query
-+ */
-+class CurrencyTest extends GraphQlAbstract
-+{
-+    public function testGetCurrency()
-+    {
-+        $query = <<<QUERY
-+query {
-+    currency {
-+        base_currency_code
-+        base_currency_symbol
-+        default_display_currency_code
-+        default_display_currency_symbol
-+        available_currency_codes
-+        exchange_rates {
-+            currency_to
-+            rate
-+        }
-+    }
-+}
-+QUERY;
-+
-+        $result = $this->graphQlQuery($query);
-+        $this->assertArrayHasKey('currency', $result);
-+        $this->assertArrayHasKey('base_currency_code', $result['currency']);
-+        $this->assertArrayHasKey('base_currency_symbol', $result['currency']);
-+        $this->assertArrayHasKey('default_display_currency_code', $result['currency']);
-+        $this->assertArrayHasKey('default_display_currency_symbol', $result['currency']);
-+        $this->assertArrayHasKey('available_currency_codes', $result['currency']);
-+        $this->assertArrayHasKey('exchange_rates', $result['currency']);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php
-index 57d39f04347..37f8801a6c2 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php
-@@ -15,6 +15,9 @@ use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\TestFramework\ObjectManager;
- use Magento\TestFramework\TestCase\GraphQlAbstract;
- 
-+/**
-+ * Test for downloadable product.
-+ */
- class DownloadableProductViewTest extends GraphQlAbstract
- {
-     /**
-@@ -53,24 +56,16 @@ class DownloadableProductViewTest extends GraphQlAbstract
-             links_purchased_separately
-             
-             downloadable_product_links{
--              id
-               sample_url
--              sample_type
--              
--              is_shareable
--              number_of_downloads
-               sort_order
-               title
--              link_type
--              
-               price              
-             }
-             downloadable_product_samples{
-               title
-               sort_order
-               sort_order
--              sample_type
--              sample_file
-+              sample_url
-             }
-            }
-        }
-@@ -82,8 +77,6 @@ QUERY;
-         $config = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
-         $config->saveConfig(
-             \Magento\Downloadable\Model\Link::XML_PATH_CONFIG_IS_SHAREABLE,
--            0,
--            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-             0
-         );
-         $response = $this->graphQlQuery($query);
-@@ -143,22 +136,15 @@ QUERY;
-             links_purchased_separately
- 
-             downloadable_product_links{
--              id
-               sample_url
--              sample_type
--              is_shareable
--              number_of_downloads
-               sort_order
-               title
--              link_type
-               price
-             }
-             downloadable_product_samples{
-               title
-               sort_order
--              sort_order
--              sample_type
--              sample_file
-+              sample_url
-             }
-            }
-        }
-@@ -197,12 +183,8 @@ QUERY;
-         $this->assertResponseFields(
-             $response['products']['items'][0]['downloadable_product_links'][0],
-             [
--                'id' => $downloadableProductLink->getId(),
--                'is_shareable' => false,
--                'number_of_downloads' => $downloadableProductLink->getNumberOfDownloads(),
-                 'sort_order' => $downloadableProductLink->getSortOrder(),
-                 'title' => $downloadableProductLink->getTitle(),
--                'link_type' => strtoupper($downloadableProductLink->getLinkType()),
-                 'price' => $downloadableProductLink->getPrice()
-             ]
-         );
-@@ -221,18 +203,12 @@ QUERY;
-         /** @var LinkInterface $downloadableProductLinks */
-         $downloadableProductLinks = $product->getExtensionAttributes()->getDownloadableProductLinks();
-         $downloadableProductLink = $downloadableProductLinks[1];
--
-+        $this->assertNotEmpty('sample_url', $actualResponse['downloadable_product_links'][1]);
-         $this->assertResponseFields(
-             $actualResponse['downloadable_product_links'][1],
-             [
--                'id' => $downloadableProductLink->getId(),
--                'sample_url' => $downloadableProductLink->getSampleUrl(),
--                'sample_type' => strtoupper($downloadableProductLink->getSampleType()),
--                'is_shareable' => false,
--                'number_of_downloads' => $downloadableProductLink->getNumberOfDownloads(),
-                 'sort_order' => $downloadableProductLink->getSortOrder(),
-                 'title' => $downloadableProductLink->getTitle(),
--                'link_type' => strtoupper($downloadableProductLink->getLinkType()),
-                 'price' => $downloadableProductLink->getPrice()
-             ]
-         );
-@@ -251,39 +227,13 @@ QUERY;
-         /** @var SampleInterface $downloadableProductSamples */
-         $downloadableProductSamples = $product->getExtensionAttributes()->getDownloadableProductSamples();
-         $downloadableProductSample = $downloadableProductSamples[0];
-+        $this->assertNotEmpty('sample_url', $actualResponse['downloadable_product_samples'][0]);
-         $this->assertResponseFields(
-             $actualResponse['downloadable_product_samples'][0],
-             [
-                 'title' => $downloadableProductSample->getTitle(),
--                'sort_order' =>$downloadableProductSample->getSortOrder(),
--                'sample_type' => strtoupper($downloadableProductSample->getSampleType()),
--                'sample_file' => $downloadableProductSample->getSampleFile()
-+                'sort_order' => $downloadableProductSample->getSortOrder()
-             ]
-         );
-     }
--
--    /**
--     * @param array $actualResponse
--     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
--     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
--     */
--    private function assertResponseFields($actualResponse, $assertionMap)
--    {
--        foreach ($assertionMap as $key => $assertionData) {
--            $expectedValue = isset($assertionData['expected_value'])
--                ? $assertionData['expected_value']
--                : $assertionData;
--            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
--            $this->assertNotNull(
--                $expectedValue,
--                "Value of '{$responseField}' field must not be NULL"
--            );
--            $this->assertEquals(
--                $expectedValue,
--                $actualResponse[$responseField],
--                "Value of '{$responseField}' field in response does not match expected value: "
--                . var_export($expectedValue, true)
--            );
--        }
--    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/FedEx/SetFedExShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/FedEx/SetFedExShippingMethodsOnCartTest.php
-new file mode 100644
-index 00000000000..9525ab521a5
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/FedEx/SetFedExShippingMethodsOnCartTest.php
-@@ -0,0 +1,226 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\FedEx;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting FedEx shipping method on cart.
-+ * Current class covers following base FedEx shipping methods:
-+ *
-+ * | Code                   | Label
-+ * --------------------------------------
-+ * | FEDEX_GROUND           | Ground
-+ * | SMART_POST             | Smart Post
-+ * | FEDEX_EXPRESS_SAVER    | Express Saver
-+ * | PRIORITY_OVERNIGHT     | Priority Overnight
-+ * | FEDEX_2_DAY            | 2 Day
-+ * | FIRST_OVERNIGHT        | First Overnight
-+ * | INTERNATIONAL_ECONOMY  |International Economy
-+ * | INTERNATIONAL_PRIORITY | International Priority
-+ */
-+class SetFedExShippingMethodsOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * Defines carrier label for "FedEx" shipping method
-+     */
-+    const CARRIER_LABEL = 'Federal Express';
-+
-+    /**
-+     * Defines carrier code for "FedEx" shipping method
-+     */
-+    const CARRIER_CODE = 'fedex';
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_weight_to_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/FedEx/_files/enable_fedex_shipping_method.php
-+     *
-+     * @dataProvider dataProviderShippingMethods
-+     * @param string $methodCode
-+     * @param string $methodLabel
-+     */
-+    public function testSetFedExShippingMethod(string $methodCode, string $methodLabel)
-+    {
-+        $quoteReservedId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-+
-+        $query = $this->getQuery($maskedQuoteId, self::CARRIER_CODE, $methodCode);
-+        $response = $this->sendRequestWithToken($query);
-+
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals(self::CARRIER_LABEL, $shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodLabel, $shippingAddress['selected_shipping_method']['method_title']);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderShippingMethods(): array
-+    {
-+        return [
-+            'Ground' => ['FEDEX_GROUND', 'Ground'],
-+            'Smart Post' => ['SMART_POST', 'Smart Post'],
-+            'Express Saver' => ['FEDEX_EXPRESS_SAVER', 'Express Saver'],
-+            'Priority Overnight' => ['PRIORITY_OVERNIGHT', 'Priority Overnight'],
-+            '2 Day' => ['FEDEX_2_DAY', '2 Day'],
-+            'First Overnight' => ['FIRST_OVERNIGHT', 'First Overnight'],
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_weight_to_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/FedEx/_files/enable_fedex_shipping_method.php
-+     *
-+     * @dataProvider dataProviderShippingMethodsBasedOnCanadaAddress
-+     * @param string $methodCode
-+     * @param string $methodLabel
-+     */
-+    public function testSetFedExShippingMethodBasedOnCanadaAddress(string $methodCode, string $methodLabel)
-+    {
-+        $quoteReservedId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-+
-+        $query = $this->getQuery($maskedQuoteId, self::CARRIER_CODE, $methodCode);
-+        $response = $this->sendRequestWithToken($query);
-+
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals(self::CARRIER_LABEL, $shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodLabel, $shippingAddress['selected_shipping_method']['method_title']);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderShippingMethodsBasedOnCanadaAddress(): array
-+    {
-+        return [
-+            'Ground' => ['FEDEX_GROUND', 'Ground'],
-+            'International Economy' => ['INTERNATIONAL_ECONOMY', 'International Economy'],
-+            'International Priority' => ['INTERNATIONAL_PRIORITY', 'International Priority'],
-+        ];
-+    }
-+
-+    /**
-+     * Generates query for setting the specified shipping method on cart
-+     *
-+     * @param string $maskedQuoteId
-+     * @param string $carrierCode
-+     * @param string $methodCode
-+     * @return string
-+     */
-+    private function getQuery(
-+        string $maskedQuoteId,
-+        string $carrierCode,
-+        string $methodCode
-+    ): string {
-+        return <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input: {
-+    cart_id: "$maskedQuoteId"
-+    shipping_methods: [
-+      {
-+        carrier_code: "$carrierCode"
-+        method_code: "$methodCode"
-+      }
-+    ]
-+  }) {
-+    cart {
-+      shipping_addresses {
-+        selected_shipping_method {
-+          carrier_code
-+          method_code
-+          carrier_title
-+          method_title
-+        }
-+      }
-+    } 
-+  }
-+}        
-+QUERY;
-+    }
-+
-+    /**
-+     * Sends a GraphQL request with using a bearer token
-+     *
-+     * @param string $query
-+     * @return array
-+     * @throws \Magento\Framework\Exception\AuthenticationException
-+     */
-+    private function sendRequestWithToken(string $query): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+
-+        return $this->graphQlMutation($query, [], '', $headerMap);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Framework/QueryComplexityLimiterTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Framework/QueryComplexityLimiterTest.php
-new file mode 100644
-index 00000000000..e784061d556
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Framework/QueryComplexityLimiterTest.php
-@@ -0,0 +1,466 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Framework;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Tests query complexity limiter and depth limiter.
-+ * Actual for production mode only
-+ */
-+class QueryComplexityLimiterTest extends GraphQlAbstract
-+{
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testQueryComplexityIsLimited()
-+    {
-+        $query
-+            = <<<QUERY
-+{
-+  category(id: 2) {
-+    products {
-+      items {
-+        name
-+        categories {
-+          id
-+          position
-+          level
-+          url_key
-+          url_path
-+          product_count
-+          breadcrumbs {
-+            category_id
-+            category_name
-+            category_url_key
-+          }
-+          products {
-+            items {
-+              media_gallery_entries {
-+                file
-+              }
-+              name
-+              special_from_date
-+              special_to_date
-+              new_to_date
-+              new_from_date
-+              tier_price
-+              manufacturer
-+              thumbnail {
-+                url
-+                label
-+              }
-+              sku
-+              image {
-+                url
-+                label
-+              }
-+              canonical_url
-+              updated_at
-+              created_at
-+              categories {
-+                id
-+                position
-+                level
-+                url_key
-+                url_path
-+                product_count
-+                breadcrumbs {
-+                  category_id
-+                  category_name
-+                  category_url_key
-+                }
-+                products {
-+                  items {
-+                    name
-+                    special_from_date
-+                    special_to_date
-+                    new_to_date
-+                    thumbnail {
-+                      url
-+                      label
-+                    }
-+                    new_from_date
-+                    tier_price
-+                    manufacturer
-+                    sku
-+                    image {
-+                      url
-+                      label
-+                    }
-+                    canonical_url
-+                    updated_at
-+                    created_at
-+                    media_gallery_entries {
-+                      position
-+                      id
-+                      types
-+                    }
-+                    categories {
-+                      id
-+                      position
-+                      level
-+                      url_key
-+                      url_path
-+                      product_count
-+                      breadcrumbs {
-+                        category_id
-+                        category_name
-+                        category_url_key
-+                      }
-+                      products {
-+                        items {
-+                          name
-+                          special_from_date
-+                          special_to_date
-+                          new_to_date
-+                          new_from_date
-+                          tier_price
-+                          manufacturer
-+                          thumbnail {
-+                            url
-+                            label
-+                          }
-+                          sku
-+                          image {
-+                            url
-+                            label
-+                          }
-+                          canonical_url
-+                          updated_at
-+                          created_at
-+                          categories {
-+                            id
-+                            position
-+                            level
-+                            url_key
-+                            url_path
-+                            product_count
-+                            breadcrumbs {
-+                              category_id
-+                              category_name
-+                              category_url_key
-+                            }
-+                            products {
-+                              items {
-+                                name
-+                                special_from_date
-+                                special_to_date
-+                                new_to_date
-+                                new_from_date
-+                                tier_price
-+                                manufacturer
-+                                sku
-+                                image {
-+                                  url
-+                                  label
-+                                }
-+                                canonical_url
-+                                updated_at
-+                                created_at
-+                                categories {
-+                                  id
-+                                  position
-+                                  level
-+                                  url_key
-+                                  url_path
-+                                  product_count
-+                                  breadcrumbs {
-+                                    category_id
-+                                    category_name
-+                                    category_url_key
-+                                  }
-+                                  products {
-+                                    items {
-+                                      name
-+                                      special_from_date
-+                                      special_to_date
-+                                      price {
-+                                        minimalPrice {
-+                                          amount {
-+                                            value
-+                                            currency
-+                                          }
-+                                        }
-+                                        maximalPrice {
-+                                          amount {
-+                                            value
-+                                            currency
-+                                          }
-+                                        }
-+                                        regularPrice {
-+                                          amount {
-+                                            value
-+                                            currency
-+                                          }
-+                                        }
-+                                      }
-+                                      tier_price
-+                                      special_price
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      tier_prices {
-+                                        customer_group_id
-+                                        qty
-+                                        percentage_value
-+                                        website_id
-+                                      }
-+                                      new_to_date
-+                                      new_from_date
-+                                      tier_price
-+                                      manufacturer
-+                                      sku
-+                                      image {
-+                                        url
-+                                        label
-+                                      }
-+                                      thumbnail {
-+                                        url
-+                                        label
-+                                      }
-+                                      canonical_url
-+                                      updated_at
-+                                      created_at
-+                                      categories {
-+                                        id
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        position
-+                                        level
-+                                        url_key
-+                                        url_path
-+                                        product_count
-+                                        default_sort_by
-+                                        breadcrumbs {
-+                                          category_id
-+                                          category_name
-+                                          category_url_key
-+                                        }
-+                                      }
-+                                    }
-+                                  }
-+                                }
-+                              }
-+                            }
-+                          }
-+                        }
-+                      }
-+                    }
-+                  }
-+                }
-+              }
-+            }
-+          }
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        self::expectExceptionMessageRegExp('/Max query complexity should be 300 but got 302/');
-+        //Use POST request because request uri is too large for some servers
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testQueryDepthIsLimited()
-+    {
-+        $query
-+            = <<<QUERY
-+{
-+  category(id: 2) {
-+    products {
-+      items {
-+        name
-+        categories {
-+          products {
-+            items {
-+              media_gallery_entries {
-+                file
-+              }
-+              categories {
-+                products {
-+                  items {
-+                    categories {
-+                      products {
-+                        items {
-+                          categories {
-+                            products {
-+                              items {
-+                                categories {
-+                                  products {
-+                                    items {
-+                                      categories {
-+                                        products {
-+                                          items {
-+                                            categories {
-+                                              products {
-+                                                items {
-+                                                  name
-+                                                }
-+                                              }
-+                                            }
-+                                          }
-+                                        }
-+                                      }
-+                                    }
-+                                  }
-+                                }
-+                              }
-+                            }
-+                          }
-+                        }
-+                      }
-+                    }
-+                  }
-+                }
-+              }
-+            }
-+          }
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        self::expectExceptionMessageRegExp('/Max query depth should be 20 but got 23/');
-+        $this->graphQlQuery($query);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/GroupedProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/GroupedProductViewTest.php
-index 841bff42a30..cbd91f6fbdb 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/GroupedProductViewTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/GroupedProductViewTest.php
-@@ -92,29 +92,4 @@ QUERY;
-             );
-         }
-     }
--
--    /**
--     * @param array $actualResponse
--     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
--     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
--     */
--    private function assertResponseFields($actualResponse, $assertionMap)
--    {
--        foreach ($assertionMap as $key => $assertionData) {
--            $expectedValue = isset($assertionData['expected_value'])
--                ? $assertionData['expected_value']
--                : $assertionData;
--            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
--            $this->assertNotNull(
--                $expectedValue,
--                "Value of '{$responseField}' field must not be NULL"
--            );
--            $this->assertEquals(
--                $expectedValue,
--                $actualResponse[$responseField],
--                "Value of '{$responseField}' field in response does not match expected value: "
--                . var_export($expectedValue, true)
--            );
--        }
--    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php
-index 85b4c62c419..60acb3a7a4d 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php
-@@ -12,10 +12,10 @@ use Magento\TestFramework\TestCase\GraphQlAbstract;
- class IntrospectionQueryTest extends GraphQlAbstract
- {
-     /**
--     * Tests that Introspection is disabled when not in developer mode
-+     * Tests that Introspection is allowed by default
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
--    public function testIntrospectionQueryWithFieldArgs()
-+    public function testIntrospectionQuery()
-     {
-         $query
-             = <<<QUERY
-@@ -54,11 +54,6 @@ fragment InputValue on __InputValue {
- }
- QUERY;
- 
--        $this->expectException(\Exception::class);
--        $this->expectExceptionMessage(
--            'GraphQL response contains errors: GraphQL introspection is not allowed, but ' .
--            'the query contained __schema or __type'
--        );
--        $this->graphQlQuery($query);
-+        $this->assertArrayHasKey('__schema', $this->graphQlQuery($query));
-     }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/CacheTagTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/CacheTagTest.php
-new file mode 100644
-index 00000000000..23bcd342ec9
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/CacheTagTest.php
-@@ -0,0 +1,202 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\PageCache;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test the caching works properly for products and categories
-+ */
-+class CacheTagTest extends GraphQlAbstract
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->markTestSkipped(
-+            'This test will stay skipped until DEVOPS-4924 is resolved'
-+        );
-+    }
-+
-+    /**
-+     * Test if Magento cache tags and debug headers for products are generated properly
-+     *
-+     * @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
-+     */
-+    public function testCacheTagsAndCacheDebugHeaderForProducts()
-+    {
-+        $productSku='simple2';
-+        $query
-+            = <<<QUERY
-+ {
-+           products(filter: {sku: {eq: "{$productSku}"}})
-+           {
-+               items {
-+                   id
-+                   name
-+                   sku
-+               }
-+           }
-+       }
-+QUERY;
-+
-+        // Cache-debug should be a MISS when product is queried for first time
-+        $responseMiss = $this->graphQlQueryWithResponseHeaders($query);
-+        $this->assertArrayHasKey('X-Magento-Cache-Debug', $responseMiss['headers']);
-+        $this->assertEquals('MISS', $responseMiss['headers']['X-Magento-Cache-Debug']);
-+
-+        // Cache-debug should be a HIT for the second round
-+        $responseHit = $this->graphQlQueryWithResponseHeaders($query);
-+        $this->assertArrayHasKey('X-Magento-Cache-Debug', $responseHit['headers']);
-+        $this->assertEquals('HIT', $responseHit['headers']['X-Magento-Cache-Debug']);
-+
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
-+        /** @var Product $product */
-+        $product = $productRepository->get($productSku, false, null, true);
-+        $product->setPrice(15);
-+        $productRepository->save($product);
-+        // Cache invalidation happens and cache-debug header value is a MISS after product update
-+        $responseMiss = $this->graphQlQueryWithResponseHeaders($query);
-+        $this->assertArrayHasKey('X-Magento-Cache-Debug', $responseMiss['headers']);
-+        $this->assertEquals('MISS', $responseMiss['headers']['X-Magento-Cache-Debug']);
-+        $this->assertArrayHasKey('X-Magento-Tags', $responseMiss['headers']);
-+        $expectedCacheTags = ['cat_p','cat_p_' . $product->getId(),'FPC'];
-+        $actualCacheTags  = explode(',', $responseMiss['headers']['X-Magento-Tags']);
-+        foreach ($expectedCacheTags as $expectedCacheTag) {
-+            $this->assertContains($expectedCacheTag, $actualCacheTags);
-+        }
-+    }
-+
-+    /**
-+     * Test if X-Magento-Tags for categories are generated properly
-+     *
-+     * Also tests the use case for cache invalidation
-+     *
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_in_multiple_categories.php
-+     */
-+    public function testCacheTagForCategoriesWithProduct()
-+    {
-+        $firstProductSku = 'simple333';
-+        $secondProductSku = 'simple444';
-+        $categoryId ='4';
-+
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
-+        /** @var Product $firstProduct */
-+        $firstProduct = $productRepository->get($firstProductSku, false, null, true);
-+        /** @var Product $secondProduct */
-+        $secondProduct = $productRepository->get($secondProductSku, false, null, true);
-+
-+        $categoryQueryVariables =[
-+            'id' => $categoryId,
-+            'pageSize'=> 10,
-+            'currentPage' => 1
-+        ];
-+
-+        $product1Query = $this->getProductQuery($firstProductSku);
-+        $product2Query =$this->getProductQuery($secondProductSku);
-+        $categoryQuery = $this->getCategoryQuery();
-+
-+        // cache-debug header value should be a MISS when category is loaded first time
-+        $responseMiss = $this->graphQlQueryWithResponseHeaders($categoryQuery, $categoryQueryVariables);
-+        $this->assertArrayHasKey('X-Magento-Cache-Debug', $responseMiss['headers']);
-+        $this->assertEquals('MISS', $responseMiss['headers']['X-Magento-Cache-Debug']);
-+        $this->assertArrayHasKey('X-Magento-Tags', $responseMiss['headers']);
-+        $actualCacheTags = explode(',', $responseMiss['headers']['X-Magento-Tags']);
-+        $expectedCacheTags =
-+            [
-+                'cat_c',
-+                'cat_c_' . $categoryId,
-+                'cat_p',
-+                'cat_p_' . $firstProduct->getId(),
-+                'cat_p_' . $secondProduct->getId(),
-+                'FPC'
-+            ];
-+        $this->assertEquals($expectedCacheTags, $actualCacheTags);
-+
-+        // Cache-debug header should be a MISS for product 1 on first request
-+        $responseFirstProduct = $this->graphQlQueryWithResponseHeaders($product1Query);
-+        $this->assertEquals('MISS', $responseFirstProduct['headers']['X-Magento-Cache-Debug']);
-+        // Cache-debug header should be a MISS for product 2 during first load
-+        $responseSecondProduct = $this->graphQlQueryWithResponseHeaders($product2Query);
-+        $this->assertEquals('MISS', $responseSecondProduct['headers']['X-Magento-Cache-Debug']);
-+
-+        $firstProduct->setPrice(20);
-+        $productRepository->save($firstProduct);
-+        // cache-debug header value should be MISS after  updating product1 and reloading the Category
-+        $responseMissCategory = $this->graphQlQueryWithResponseHeaders($categoryQuery, $categoryQueryVariables);
-+        $this->assertArrayHasKey('X-Magento-Cache-Debug', $responseMissCategory['headers']);
-+        $this->assertEquals('MISS', $responseMissCategory['headers']['X-Magento-Cache-Debug']);
-+
-+        // cache-debug should be a MISS for product 1 after it is updated - cache invalidation
-+        $responseMissFirstProduct = $this->graphQlQueryWithResponseHeaders($product1Query);
-+        $this->assertArrayHasKey('X-Magento-Cache-Debug', $responseMissFirstProduct['headers']);
-+        $this->assertEquals('MISS', $responseMissFirstProduct['headers']['X-Magento-Cache-Debug']);
-+        // Cache-debug header should be a HIT for product 2
-+        $responseHitSecondProduct = $this->graphQlQueryWithResponseHeaders($product2Query);
-+        $this->assertArrayHasKey('X-Magento-Cache-Debug', $responseHitSecondProduct['headers']);
-+        $this->assertEquals('HIT', $responseHitSecondProduct['headers']['X-Magento-Cache-Debug']);
-+    }
-+
-+    /**
-+     * Get Product query
-+     *
-+     * @param string $productSku
-+     * @return string
-+     */
-+    private function getProductQuery(string $productSku): string
-+    {
-+        $productQuery = <<<QUERY
-+       {
-+           products(filter: {sku: {eq: "{$productSku}"}})
-+           {
-+               items {
-+                   id
-+                   name
-+                   sku
-+               }
-+           }
-+       }
-+QUERY;
-+        return $productQuery;
-+    }
-+
-+    /**
-+     * Get category query
-+     *
-+     * @return string
-+     */
-+    private function getCategoryQuery(): string
-+    {
-+        $categoryQueryString = <<<QUERY
-+query GetCategoryQuery(\$id: Int!, \$pageSize: Int!, \$currentPage: Int!) {
-+        category(id: \$id) {
-+            id
-+            description
-+            name
-+            product_count
-+            products(pageSize: \$pageSize, currentPage: \$currentPage) {
-+                items {
-+                    id
-+                    name
-+                    url_key
-+                }
-+                total_count
-+            }
-+        }
-+    }
-+QUERY;
-+
-+        return $categoryQueryString;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Cms/BlockCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Cms/BlockCacheTest.php
-new file mode 100644
-index 00000000000..5182ff791f5
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Cms/BlockCacheTest.php
-@@ -0,0 +1,160 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\PageCache\Cms;
-+
-+use Magento\Cms\Model\Block;
-+use Magento\Cms\Model\BlockRepository;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test the caching works properly for CMS Blocks
-+ */
-+class BlockCacheTest extends GraphQlAbstract
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->markTestSkipped(
-+            'This test will stay skipped until DEVOPS-4924 is resolved'
-+        );
-+    }
-+
-+    /**
-+     * Test that X-Magento-Tags are correct
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/block.php
-+     */
-+    public function testCacheTagsHaveExpectedValue()
-+    {
-+        $blockIdentifier = 'fixture_block';
-+        $blockRepository = Bootstrap::getObjectManager()->get(BlockRepository::class);
-+        $block = $blockRepository->getById($blockIdentifier);
-+        $blockId = $block->getId();
-+        $query = $this->getBlockQuery([$blockIdentifier]);
-+
-+        //cache-debug should be a MISS on first request
-+        $response = $this->graphQlQueryWithResponseHeaders($query);
-+
-+        $this->assertArrayHasKey('X-Magento-Tags', $response['headers']);
-+        $actualTags = explode(',', $response['headers']['X-Magento-Tags']);
-+        $expectedTags = ["cms_b", "cms_b_{$blockId}", "cms_b_{$blockIdentifier}", "FPC"];
-+        $this->assertEquals($expectedTags, $actualTags);
-+    }
-+
-+    /**
-+     * Test the second request for the same block will return a cached result
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/block.php
-+     */
-+    public function testCacheIsUsedOnSecondRequest()
-+    {
-+        $blockIdentifier = 'fixture_block';
-+        $query = $this->getBlockQuery([$blockIdentifier]);
-+
-+        //cache-debug should be a MISS on first request
-+        $responseMiss = $this->graphQlQueryWithResponseHeaders($query);
-+        $this->assertArrayHasKey('X-Magento-Cache-Debug', $responseMiss['headers']);
-+        $this->assertEquals('MISS', $responseMiss['headers']['X-Magento-Cache-Debug']);
-+
-+        //cache-debug should be a HIT on second request
-+        $responseHit = $this->graphQlQueryWithResponseHeaders($query);
-+        $this->assertArrayHasKey('X-Magento-Cache-Debug', $responseHit['headers']);
-+        $this->assertEquals('HIT', $responseHit['headers']['X-Magento-Cache-Debug']);
-+        //cached data should be correct
-+        $this->assertNotEmpty($responseHit['body']);
-+        $this->assertArrayNotHasKey('errors', $responseHit['body']);
-+        $blocks = $responseHit['body']['cmsBlocks']['items'];
-+        $this->assertEquals($blockIdentifier, $blocks[0]['identifier']);
-+        $this->assertEquals('CMS Block Title', $blocks[0]['title']);
-+    }
-+
-+    /**
-+     * Test that cache is invalidated when block is updated
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/blocks.php
-+     * @magentoApiDataFixture Magento/Cms/_files/block.php
-+     */
-+    public function testCacheIsInvalidatedOnBlockUpdate()
-+    {
-+        $fixtureBlockIdentifier = 'fixture_block';
-+        $enabledBlockIdentifier = 'enabled_block';
-+        $fixtureBlockQuery = $this->getBlockQuery([$fixtureBlockIdentifier]);
-+        $enabledBlockQuery = $this->getBlockQuery([$enabledBlockIdentifier]);
-+
-+        //cache-debug should be a MISS on first request
-+        $fixtureBlockMiss = $this->graphQlQueryWithResponseHeaders($fixtureBlockQuery);
-+        $this->assertEquals('MISS', $fixtureBlockMiss['headers']['X-Magento-Cache-Debug']);
-+        $enabledBlockMiss = $this->graphQlQueryWithResponseHeaders($enabledBlockQuery);
-+        $this->assertEquals('MISS', $enabledBlockMiss['headers']['X-Magento-Cache-Debug']);
-+
-+        //cache-debug should be a HIT on second request
-+        $fixtureBlockHit = $this->graphQlQueryWithResponseHeaders($fixtureBlockQuery);
-+        $this->assertEquals('HIT', $fixtureBlockHit['headers']['X-Magento-Cache-Debug']);
-+        $enabledBlockHit = $this->graphQlQueryWithResponseHeaders($enabledBlockQuery);
-+        $this->assertEquals('HIT', $enabledBlockHit['headers']['X-Magento-Cache-Debug']);
-+
-+        $newBlockContent = 'New block content!!!';
-+        $this->updateBlockContent($fixtureBlockIdentifier, $newBlockContent);
-+
-+        //cache-debug should be a MISS after update the block
-+        $fixtureBlockMiss = $this->graphQlQueryWithResponseHeaders($fixtureBlockQuery);
-+        $this->assertEquals('MISS', $fixtureBlockMiss['headers']['X-Magento-Cache-Debug']);
-+        $enabledBlockHit = $this->graphQlQueryWithResponseHeaders($enabledBlockQuery);
-+        $this->assertEquals('HIT', $enabledBlockHit['headers']['X-Magento-Cache-Debug']);
-+        //updated block data should be correct
-+        $this->assertNotEmpty($fixtureBlockMiss['body']);
-+        $blocks = $fixtureBlockMiss['body']['cmsBlocks']['items'];
-+        $this->assertArrayNotHasKey('errors', $fixtureBlockMiss['body']);
-+        $this->assertEquals($fixtureBlockIdentifier, $blocks[0]['identifier']);
-+        $this->assertEquals('CMS Block Title', $blocks[0]['title']);
-+        $this->assertEquals($newBlockContent, $blocks[0]['content']);
-+    }
-+
-+    /**
-+     * Update the content of a CMS block
-+     *
-+     * @param $identifier
-+     * @param $newContent
-+     * @return Block
-+     */
-+    private function updateBlockContent($identifier, $newContent): Block
-+    {
-+        $blockRepository = Bootstrap::getObjectManager()->get(BlockRepository::class);
-+        $block = $blockRepository->getById($identifier);
-+        $block->setContent($newContent);
-+        $blockRepository->save($block);
-+
-+        return $block;
-+    }
-+
-+    /**
-+     * Get cmsBlocks query
-+     *
-+     * @param array $identifiers
-+     * @return string
-+     */
-+    private function getBlockQuery(array $identifiers): string
-+    {
-+        $identifiersString = implode(',', $identifiers);
-+        $query = <<<QUERY
-+    { 
-+        cmsBlocks(identifiers: ["$identifiersString"]) {
-+            items {
-+                title
-+                identifier
-+                content
-+            }
-+        }
-+    }
-+QUERY;
-+        return $query;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Cms/PageCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Cms/PageCacheTest.php
-new file mode 100644
-index 00000000000..34dc9eef4c3
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Cms/PageCacheTest.php
-@@ -0,0 +1,153 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\PageCache\Cms;
-+
-+use Magento\Cms\Model\GetPageByIdentifier;
-+use Magento\Cms\Model\PageRepository;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test the caching works properly for CMS Pages
-+ */
-+class PageCacheTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetPageByIdentifier
-+     */
-+    private $pageByIdentifier;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->markTestSkipped(
-+            'This test will stay skipped until DEVOPS-4924 is resolved'
-+        );
-+        $this->pageByIdentifier = Bootstrap::getObjectManager()->get(GetPageByIdentifier::class);
-+    }
-+
-+    /**
-+     * Test that X-Magento-Tags are correct
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/pages.php
-+     */
-+    public function testCacheTagsHaveExpectedValue()
-+    {
-+        $pageIdentifier = 'page100';
-+        $page = $this->pageByIdentifier->execute($pageIdentifier, 0);
-+        $pageId = (int) $page->getId();
-+
-+        $query = $this->getPageQuery($pageId);
-+
-+        //cache-debug should be a MISS on first request
-+        $response = $this->graphQlQueryWithResponseHeaders($query);
-+
-+        $this->assertArrayHasKey('X-Magento-Tags', $response['headers']);
-+        $actualTags = explode(',', $response['headers']['X-Magento-Tags']);
-+        $expectedTags = ["cms_p", "cms_p_{$pageId}", "FPC"];
-+        $this->assertEquals($expectedTags, $actualTags);
-+    }
-+
-+    /**
-+     * Test the second request for the same page will return a cached result
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/pages.php
-+     */
-+    public function testCacheIsUsedOnSecondRequest()
-+    {
-+        $pageIdentifier = 'page100';
-+        $page = $this->pageByIdentifier->execute($pageIdentifier, 0);
-+        $pageId = (int) $page->getId();
-+
-+        $query = $this->getPageQuery($pageId);
-+
-+        //cache-debug should be a MISS on first request
-+        $responseMiss = $this->graphQlQueryWithResponseHeaders($query);
-+        $this->assertArrayHasKey('X-Magento-Cache-Debug', $responseMiss['headers']);
-+        $this->assertEquals('MISS', $responseMiss['headers']['X-Magento-Cache-Debug']);
-+
-+        //cache-debug should be a HIT on second request
-+        $responseHit = $this->graphQlQueryWithResponseHeaders($query);
-+        $this->assertArrayHasKey('X-Magento-Cache-Debug', $responseHit['headers']);
-+        $this->assertEquals('HIT', $responseHit['headers']['X-Magento-Cache-Debug']);
-+        //cached data should be correct
-+        $this->assertNotEmpty($responseHit['body']);
-+        $this->assertArrayNotHasKey('errors', $responseHit['body']);
-+        $pageData = $responseHit['body']['cmsPage'];
-+        $this->assertEquals('Cms Page 100', $pageData['title']);
-+    }
-+
-+    /**
-+     * Test that cache is invalidated when page is updated
-+     *
-+     * @magentoApiDataFixture Magento/Cms/_files/pages.php
-+     */
-+    public function testCacheIsInvalidatedOnPageUpdate()
-+    {
-+        $page100Identifier = 'page100';
-+        $page100 = $this->pageByIdentifier->execute($page100Identifier, 0);
-+        $page100Id = (int) $page100->getId();
-+        $pageBlankIdentifier = 'page_design_blank';
-+        $pageBlank = $this->pageByIdentifier->execute($pageBlankIdentifier, 0);
-+        $pageBlankId = (int) $pageBlank->getId();
-+
-+        $page100Query = $this->getPageQuery($page100Id);
-+        $pageBlankQuery = $this->getPageQuery($pageBlankId);
-+
-+        //cache-debug should be a MISS on first request
-+        $page100Miss = $this->graphQlQueryWithResponseHeaders($page100Query);
-+        $this->assertEquals('MISS', $page100Miss['headers']['X-Magento-Cache-Debug']);
-+        $pageBlankMiss = $this->graphQlQueryWithResponseHeaders($pageBlankQuery);
-+        $this->assertEquals('MISS', $pageBlankMiss['headers']['X-Magento-Cache-Debug']);
-+
-+        //cache-debug should be a HIT on second request
-+        $page100Hit = $this->graphQlQueryWithResponseHeaders($page100Query);
-+        $this->assertEquals('HIT', $page100Hit['headers']['X-Magento-Cache-Debug']);
-+        $pageBlankHit = $this->graphQlQueryWithResponseHeaders($pageBlankQuery);
-+        $this->assertEquals('HIT', $pageBlankHit['headers']['X-Magento-Cache-Debug']);
-+
-+        $pageRepository = Bootstrap::getObjectManager()->get(PageRepository::class);
-+        $newPageContent = 'New page content for blank page.';
-+        $pageBlank->setContent($newPageContent);
-+        $pageRepository->save($pageBlank);
-+
-+        //cache-debug should be a MISS after updating the page
-+        $pageBlankMiss = $this->graphQlQueryWithResponseHeaders($pageBlankQuery);
-+        $this->assertEquals('MISS', $pageBlankMiss['headers']['X-Magento-Cache-Debug']);
-+        $page100Hit = $this->graphQlQueryWithResponseHeaders($page100Query);
-+        $this->assertEquals('HIT', $page100Hit['headers']['X-Magento-Cache-Debug']);
-+        //updated page data should be correct
-+        $this->assertNotEmpty($pageBlankMiss['body']);
-+        $pageData = $pageBlankMiss['body']['cmsPage'];
-+        $this->assertArrayNotHasKey('errors', $pageBlankMiss['body']);
-+        $this->assertEquals('Cms Page Design Blank', $pageData['title']);
-+        $this->assertEquals($newPageContent, $pageData['content']);
-+    }
-+
-+    /**
-+     * Get page query
-+     *
-+     * @param int $pageId
-+     * @return string
-+     */
-+    private function getPageQuery(int $pageId): string
-+    {
-+        $query = <<<QUERY
-+{   
-+    cmsPage(id: $pageId) {    
-+        title
-+   	    url_key
-+        content
-+    }
-+}
-+QUERY;
-+        return $query;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
-new file mode 100644
-index 00000000000..cf4cebdfe8e
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
-@@ -0,0 +1,322 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\PageCache;
-+
-+use Magento\TestFramework\ObjectManager;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * This test considers FPC caching but it can't check the headers since we don't guarantee that test if in dev mode.
-+ *
-+ * @magentoAppIsolation enabled
-+ */
-+class ProductInMultipleStoresCacheTest extends GraphQlAbstract
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        /** @var \Magento\Store\Model\Store $store */
-+        $store =  ObjectManager::getInstance()->get(\Magento\Store\Model\Store::class);
-+        $storeCodeFromFixture = 'fixture_second_store';
-+
-+        /** @var \Magento\Config\Model\ResourceModel\Config $configResource */
-+        $configResource = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
-+        /** @var \Magento\Config\App\Config\Type\System $config */
-+        $config = ObjectManager::getInstance()->get(\Magento\Config\App\Config\Type\System::class);
-+
-+        $configResource->saveConfig(
-+            \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT,
-+            'EUR',
-+            \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES,
-+            $store->load($storeCodeFromFixture)->getWebsiteId()
-+        );
-+
-+        // allow USD & EUR currency
-+        $configResource->saveConfig(
-+            \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
-+            'EUR,USD',
-+            \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES,
-+            $store->load($storeCodeFromFixture)->getWebsiteId()
-+        );
-+
-+        // allow USD & EUR currency
-+        $configResource->saveConfig(
-+            \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
-+            'EUR,USD'
-+        );
-+
-+        // configuration cache clean is required to reload currency setting
-+        $config->clean();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function tearDown()
-+    {
-+        /** @var \Magento\Config\App\Config\Type\System $config */
-+        $config = ObjectManager::getInstance()->get(\Magento\Config\App\Config\Type\System::class);
-+        /** @var \Magento\Config\Model\ResourceModel\Config $configResource */
-+        $configResource = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
-+
-+        // restore allow USD currency
-+        $configResource->saveConfig(
-+            \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
-+            'USD'
-+        );
-+
-+        // configuration cache clean is required to reload currency setting
-+        $config->clean();
-+        parent::tearDown();
-+    }
-+
-+    /**
-+     * Test a non existing or non existing currency
-+     *
-+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_second_currency.php
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testProductFromSpecificAndDefaultStoreWithMultiCurrencyNonExisting()
-+    {
-+        $productSku = 'simple';
-+
-+        $query = <<<QUERY
-+{
-+    products(filter: {sku: {eq: "{$productSku}"}})
-+    {
-+        items {
-+            attribute_set_id
-+            created_at
-+            id
-+            name
-+            price {
-+                minimalPrice {
-+                    amount {
-+                        value
-+                        currency
-+                    }
-+                }
-+            }
-+            sku
-+            type_id
-+            updated_at
-+            ... on PhysicalProductInterface {
-+                weight
-+            }
-+        }
-+    }
-+}
-+QUERY;
-+
-+        //test non existing currency
-+        $headerMap = ['Store' => 'default', 'Content-Currency' => 'someNonExistentCurrency'];
-+        $this->expectExceptionMessage('GraphQL response contains errors: Please correct the target currency');
-+        $this->graphQlQuery($query, [], '', $headerMap);
-+    }
-+
-+    /**
-+     * Test a non existing or non allowed currency
-+     *
-+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_second_currency.php
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testProductFromSpecificAndDefaultStoreWithMultiCurrencyNotAllowed()
-+    {
-+        $productSku = 'simple';
-+
-+        $query = <<<QUERY
-+{
-+    products(filter: {sku: {eq: "{$productSku}"}})
-+    {
-+        items {
-+            attribute_set_id
-+            created_at
-+            id
-+            name
-+            price {
-+                minimalPrice {
-+                    amount {
-+                        value
-+                        currency
-+                    }
-+                }
-+            }
-+            sku
-+            type_id
-+            updated_at
-+            ... on PhysicalProductInterface {
-+                weight
-+            }
-+        }
-+    }
-+}
-+QUERY;
-+
-+        $storeCodeFromFixture = 'fixture_second_store';
-+
-+        //test not allowed existing currency
-+        $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'CAD'];
-+        $this->expectExceptionMessage(
-+            'GraphQL response contains errors: Please correct the target currency'
-+        );
-+        $this->graphQlQuery($query, [], '', $headerMap);
-+    }
-+
-+    /**
-+     * Test a product from a custom and default store, with cache with repeating queries asserting different results.
-+     *
-+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_second_currency.php
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
-+    {
-+        $productSku = 'simple';
-+
-+        $query = <<<QUERY
-+{
-+    products(filter: {sku: {eq: "{$productSku}"}})
-+    {
-+        items {
-+            attribute_set_id
-+            created_at
-+            id
-+            name
-+            price {
-+                minimalPrice {
-+                    amount {
-+                        value
-+                        currency
-+                    }
-+                }
-+            }
-+            sku
-+            type_id
-+            updated_at
-+            ... on PhysicalProductInterface {
-+                weight
-+            }
-+        }
-+    }
-+}
-+QUERY;
-+
-+        /** @var \Magento\Store\Model\Store $store */
-+        $store =  ObjectManager::getInstance()->get(\Magento\Store\Model\Store::class);
-+        $storeCodeFromFixture = 'fixture_second_store';
-+        $storeId = $store->load($storeCodeFromFixture)->getStoreId();
-+
-+        /** @var \Magento\Catalog\Model\Product $product */
-+        $product = ObjectManager::getInstance()->get(\Magento\Catalog\Model\Product::class);
-+        $product->load($product->getIdBySku($productSku));
-+
-+        $website = ObjectManager::getInstance()->get(\Magento\Store\Model\Website::class);
-+        /** @var $website \Magento\Store\Model\Website */
-+        $website->load('test', 'code');
-+        $product->setWebsiteIds([1, $website->getId()]);
-+
-+        // change product name for custom store
-+        $productNameInFixtureStore = 'Product\'s Name in Fixture Store';
-+        $product->setName($productNameInFixtureStore)->setStoreId($storeId)->save();
-+
-+        // test store header only, query is cached at this point in EUR
-+        $headerMap = ['Store' => $storeCodeFromFixture];
-+        $response = $this->graphQlQuery($query, [], '', $headerMap);
-+        $this->assertEquals(
-+            $productNameInFixtureStore,
-+            $response['products']['items'][0]['name'],
-+            'Product name in fixture store is invalid.'
-+        );
-+        $this->assertEquals(
-+            'EUR',
-+            $response['products']['items'][0]['price']['minimalPrice']['amount']['currency'],
-+            'Currency code EUR in fixture ' . $storeCodeFromFixture . ' is unexpected'
-+        );
-+
-+        // test cached store + currency header in Euros
-+        $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'EUR'];
-+        $response = $this->graphQlQuery($query, [], '', $headerMap);
-+        $this->assertEquals(
-+            $productNameInFixtureStore,
-+            $response['products']['items'][0]['name'],
-+            'Product name in fixture ' . $storeCodeFromFixture . ' is invalid.'
-+        );
-+        $this->assertEquals(
-+            'EUR',
-+            $response['products']['items'][0]['price']['minimalPrice']['amount']['currency'],
-+            'Currency code EUR in fixture ' . $storeCodeFromFixture . ' is unexpected'
-+        );
-+
-+        // test non cached store + currency header in USD
-+        $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'USD'];
-+        $response = $this->graphQlQuery($query, [], '', $headerMap);
-+        $this->assertEquals(
-+            $productNameInFixtureStore,
-+            $response['products']['items'][0]['name'],
-+            'Product name in fixture store is invalid.'
-+        );
-+        $this->assertEquals(
-+            'USD',
-+            $response['products']['items'][0]['price']['minimalPrice']['amount']['currency'],
-+            'Currency code USD in fixture ' . $storeCodeFromFixture . ' is unexpected'
-+        );
-+
-+        // test non cached store + currency header in USD not cached
-+        $headerMap = ['Store' => 'default', 'Content-Currency' => 'USD'];
-+        $response = $this->graphQlQuery($query, [], '', $headerMap);
-+        $this->assertEquals(
-+            'Simple Product',
-+            $response['products']['items'][0]['name'],
-+            'Product name in fixture store is invalid.'
-+        );
-+        $this->assertEquals(
-+            'USD',
-+            $response['products']['items'][0]['price']['minimalPrice']['amount']['currency'],
-+            'Currency code USD in fixture store default is unexpected'
-+        );
-+
-+        // test non cached store + currency header in USD not cached
-+        $headerMap = ['Store' => 'default', 'Content-Currency' => 'EUR'];
-+        $response = $this->graphQlQuery($query, [], '', $headerMap);
-+        $this->assertEquals(
-+            'Simple Product',
-+            $response['products']['items'][0]['name'],
-+            'Product name in fixture store is invalid.'
-+        );
-+        $this->assertEquals(
-+            'EUR',
-+            $response['products']['items'][0]['price']['minimalPrice']['amount']['currency'],
-+            'Currency code EUR in fixture store default is unexpected'
-+        );
-+
-+        // test non cached store + currency header in USD  cached
-+        $headerMap = ['Store' => 'default'];
-+        $response = $this->graphQlQuery($query, [], '', $headerMap);
-+        $this->assertEquals(
-+            'Simple Product',
-+            $response['products']['items'][0]['name'],
-+            'Product name in fixture store is invalid.'
-+        );
-+        $this->assertEquals(
-+            'USD',
-+            $response['products']['items'][0]['price']['minimalPrice']['amount']['currency'],
-+            'Currency code USD in fixture store default is unexpected'
-+        );
-+
-+        // test cached response store + currency header with non existing currency, and no valid response, no cache
-+        $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'SOMECURRENCY'];
-+        $this->expectExceptionMessage(
-+            'GraphQL response contains errors: Please correct the target currency'
-+        );
-+        $this->graphQlQuery($query, [], '', $headerMap);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Quote/Guest/CartCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Quote/Guest/CartCacheTest.php
-new file mode 100644
-index 00000000000..808fd95d331
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Quote/Guest/CartCacheTest.php
-@@ -0,0 +1,129 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\PageCache\Quote\Guest;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test cart queries are not cached
-+ *
-+ * @magentoApiDataFixture Magento/Catalog/_files/products.php
-+ */
-+class CartCacheTest extends GraphQlAbstract
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->markTestSkipped(
-+            'This test will stay skipped until DEVOPS-4924 is resolved'
-+        );
-+    }
-+
-+    public function testCartIsNotCached()
-+    {
-+        $qty = 2;
-+        $sku = 'simple';
-+        $cartId = $this->createEmptyCart();
-+        $this->addSimpleProductToCart($cartId, $qty, $sku);
-+
-+        $getCartQuery = $this->getCartQuery($cartId);
-+        $responseMiss = $this->graphQlQueryWithResponseHeaders($getCartQuery);
-+        $this->assertArrayHasKey('cart', $responseMiss['body']);
-+        $this->assertArrayHasKey('items', $responseMiss['body']['cart']);
-+        $this->assertEquals('MISS', $responseMiss['headers']['X-Magento-Cache-Debug']);
-+
-+        /** Cache debug header value is still a MISS for any subsequent request */
-+        $responseMissNext = $this->graphQlQueryWithResponseHeaders($getCartQuery);
-+        $this->assertEquals('MISS', $responseMissNext['headers']['X-Magento-Cache-Debug']);
-+    }
-+
-+    /**
-+     * Create a guest cart which generates a maskedQuoteId
-+     *
-+     * @return string
-+     */
-+    private function createEmptyCart(): string
-+    {
-+        $query =
-+            <<<QUERY
-+        mutation
-+            {
-+               createEmptyCart
-+            }
-+QUERY;
-+
-+        $response = $this->graphQlMutation($query);
-+        $maskedQuoteId = $response['createEmptyCart'];
-+        return $maskedQuoteId;
-+    }
-+
-+    /**
-+     * Add simple product to the cart using the maskedQuoteId
-+     *
-+     * @param string $maskedCartId
-+     * @param int $qty
-+     * @param string $sku
-+     */
-+    private function addSimpleProductToCart(string $maskedCartId, int $qty, string $sku): void
-+    {
-+        $addProductToCartQuery =
-+            <<<QUERY
-+        mutation {  
-+        addSimpleProductsToCart(
-+          input: {
-+            cart_id: "{$maskedCartId}"
-+            cart_items: [
-+              {
-+                data: {
-+                  qty: $qty
-+                  sku: "$sku"
-+                }
-+              }
-+            ]
-+          }
-+        ) {
-+          cart {
-+            items {
-+              qty
-+              product {
-+                sku
-+              }
-+            }
-+          }
-+        }
-+        }
-+QUERY;
-+        $response = $this->graphQlMutation($addProductToCartQuery);
-+        self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
-+    }
-+
-+    /**
-+     * Get cart query string
-+     *
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getCartQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "{$maskedQuoteId}") {
-+    items {
-+      id
-+      qty
-+      product {
-+        sku
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php
-new file mode 100644
-index 00000000000..53be8f84ffc
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php
-@@ -0,0 +1,167 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote;
-+
-+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Add simple product with custom options to cart testcases
-+ */
-+class AddSimpleProductWithCustomOptionsToCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var ProductCustomOptionRepositoryInterface
-+     */
-+    private $productCustomOptionsRepository;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->productCustomOptionsRepository = $objectManager->get(ProductCustomOptionRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * Test adding a simple product to the shopping cart with all supported
-+     * customizable options assigned
-+     *
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_options.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     */
-+    public function testAddSimpleProductWithOptions()
-+    {
-+        $sku = 'simple';
-+        $quantity = 1;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-+
-+        $customOptionsValues = $this->getCustomOptionsValuesForQuery($sku);
-+        /* Generate customizable options fragment for GraphQl request */
-+        $queryCustomizableOptionValues = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
-+
-+        $customizableOptions = "customizable_options: {$queryCustomizableOptionValues}";
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity, $customizableOptions);
-+
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('items', $response['addSimpleProductsToCart']['cart']);
-+        self::assertCount(1, $response['addSimpleProductsToCart']['cart']);
-+
-+        $customizableOptionsOutput = $response['addSimpleProductsToCart']['cart']['items'][0]['customizable_options'];
-+        $assignedOptionsCount = count($customOptionsValues);
-+        for ($counter = 0; $counter < $assignedOptionsCount; $counter++) {
-+            self::assertEquals(
-+                $customOptionsValues[$counter]['value_string'],
-+                $customizableOptionsOutput[$counter]['values'][0]['value']
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Test adding a simple product with empty values for required options
-+     *
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_options.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     */
-+    public function testAddSimpleProductWithMissedRequiredOptionsSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-+        $sku = 'simple';
-+        $quantity = 1;
-+        $customizableOptions = '';
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity, $customizableOptions);
-+
-+        self::expectExceptionMessage(
-+            'The product\'s required option(s) weren\'t entered. Make sure the options are entered and try again.'
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $sku
-+     * @param float $quantity
-+     * @param string $customizableOptions
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, string $sku, float $quantity, string $customizableOptions): string
-+    {
-+        return <<<QUERY
-+mutation {  
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "{$maskedQuoteId}", 
-+      cart_items: [
-+        {
-+          data: {
-+            quantity: $quantity
-+            sku: "$sku"
-+          }
-+          {$customizableOptions}
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      items {
-+        ... on SimpleCartItem {
-+          customizable_options {
-+            label
-+              values {
-+                value
-+              }
-+            }
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * Generate an array with test values for customizable options
-+     * based on the option type
-+     *
-+     * @param string $sku
-+     * @return array
-+     */
-+    private function getCustomOptionsValuesForQuery(string $sku): array
-+    {
-+        $customOptions = $this->productCustomOptionsRepository->getList($sku);
-+        $customOptionsValues = [];
-+
-+        foreach ($customOptions as $customOption) {
-+            $optionType = $customOption->getType();
-+            if ($optionType == 'field' || $optionType == 'area') {
-+                $customOptionsValues[] = [
-+                    'id' => (int) $customOption->getOptionId(),
-+                    'value_string' => 'test'
-+                ];
-+            } elseif ($optionType == 'drop_down') {
-+                $optionSelectValues = $customOption->getValues();
-+                $customOptionsValues[] = [
-+                    'id' => (int) $customOption->getOptionId(),
-+                    'value_string' => reset($optionSelectValues)->getOptionTypeId()
-+                ];
-+            }
-+        }
-+
-+        return $customOptionsValues;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php
-new file mode 100644
-index 00000000000..7b3c5de4ba6
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php
-@@ -0,0 +1,167 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
-+
-+/**
-+ * Add virtual product with custom options to cart testcases
-+ */
-+class AddVirtualProductWithCustomOptionsToCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var ProductCustomOptionRepositoryInterface
-+     */
-+    private $productCustomOptionsRepository;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->productCustomOptionsRepository = $objectManager->get(ProductCustomOptionRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * Test adding a virtual product to the shopping cart with all supported
-+     * customizable options assigned
-+     *
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual_with_options.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     */
-+    public function testAddVirtualProductWithOptions()
-+    {
-+        $sku = 'virtual';
-+        $quantity = 1;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-+
-+        $customOptionsValues = $this->getCustomOptionsValuesForQuery($sku);
-+        /* Generate customizable options fragment for GraphQl request */
-+        $queryCustomizableOptionValues = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
-+
-+        $customizableOptions = "customizable_options: {$queryCustomizableOptionValues}";
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity, $customizableOptions);
-+
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('items', $response['addVirtualProductsToCart']['cart']);
-+        self::assertCount(1, $response['addVirtualProductsToCart']['cart']);
-+
-+        $customizableOptionsOutput = $response['addVirtualProductsToCart']['cart']['items'][0]['customizable_options'];
-+        $assignedOptionsCount = count($customOptionsValues);
-+        for ($counter = 0; $counter < $assignedOptionsCount; $counter++) {
-+            self::assertEquals(
-+                $customOptionsValues[$counter]['value_string'],
-+                $customizableOptionsOutput[$counter]['values'][0]['value']
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Test adding a virtual product with empty values for required options
-+     *
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual_with_options.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     */
-+    public function testAddSimpleProductWithMissedRequiredOptionsSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-+        $sku = 'virtual';
-+        $quantity = 1;
-+        $customizableOptions = '';
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity, $customizableOptions);
-+
-+        self::expectExceptionMessage(
-+            'The product\'s required option(s) weren\'t entered. Make sure the options are entered and try again.'
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $sku
-+     * @param float $quantity
-+     * @param string $customizableOptions
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, string $sku, float $quantity, string $customizableOptions): string
-+    {
-+        return <<<QUERY
-+mutation {  
-+  addVirtualProductsToCart(
-+    input: {
-+      cart_id: "{$maskedQuoteId}", 
-+      cart_items: [
-+        {
-+          data: {
-+            quantity: $quantity
-+            sku: "$sku"
-+          }
-+          {$customizableOptions}
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      items {
-+        ... on VirtualCartItem {
-+          customizable_options {
-+            label
-+              values {
-+                value
-+              }
-+            }
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * Generate an array with test values for customizable options
-+     * based on the option type
-+     *
-+     * @param string $sku
-+     * @return array
-+     */
-+    private function getCustomOptionsValuesForQuery(string $sku): array
-+    {
-+        $customOptions = $this->productCustomOptionsRepository->getList($sku);
-+        $customOptionsValues = [];
-+
-+        foreach ($customOptions as $customOption) {
-+            $optionType = $customOption->getType();
-+            if ($optionType == 'field' || $optionType == 'area') {
-+                $customOptionsValues[] = [
-+                    'id' => (int) $customOption->getOptionId(),
-+                    'value_string' => 'test'
-+                ];
-+            } elseif ($optionType == 'drop_down') {
-+                $optionSelectValues = $customOption->getValues();
-+                $customOptionsValues[] = [
-+                    'id' => (int) $customOption->getOptionId(),
-+                    'value_string' => reset($optionSelectValues)->getOptionTypeId()
-+                ];
-+            }
-+        }
-+
-+        return $customOptionsValues;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php
-new file mode 100644
-index 00000000000..e1b93e0bdb8
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php
-@@ -0,0 +1,286 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Exception;
-+use Magento\Framework\Exception\AuthenticationException;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test adding simple product to Cart
-+ */
-+class AddSimpleProductToCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testAddSimpleProductToCart()
-+    {
-+        $sku = 'simple_product';
-+        $quantity = 2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
-+        self::assertEquals($quantity, $response['addSimpleProductsToCart']['cart']['items'][0]['quantity']);
-+        self::assertEquals($sku, $response['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testAddSimpleProductToCartIfCartIdIsMissed()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_items: []
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testAddSimpleProductToCartIfCartIdIsEmpty()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "",
-+      cart_items: []
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_items" is missing
-+     */
-+    public function testAddSimpleProductToCartIfCartItemsAreMissed()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "cart_id"
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_items" is missing
-+     */
-+    public function testAddSimpleProductToCartIfCartItemsAreEmpty()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "cart_id",
-+      cart_items: []
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testAddProductToNonExistentCart()
-+    {
-+        $sku = 'simple_product';
-+        $quantity = 2;
-+        $maskedQuoteId = 'non_existent_masked_id';
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a product with SKU "simple_product"
-+     */
-+    public function testNonExistentProductToCart()
-+    {
-+        $sku = 'simple_product';
-+        $qty = 2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     */
-+    public function testAddSimpleProductToGuestCart()
-+    {
-+        $sku = 'simple_product';
-+        $qty = 2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testAddSimpleProductToAnotherCustomerCart()
-+    {
-+        $sku = 'simple_product';
-+        $qty = 2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $sku
-+     * @param float $quantity
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, string $sku, float $quantity): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(input: {
-+    cart_id: "{$maskedQuoteId}", 
-+    cart_items: [
-+      {
-+        data: {
-+          quantity: {$quantity}
-+          sku: "{$sku}"
-+        }
-+      }                
-+    ]
-+  }) {
-+    cart {
-+      items {
-+        id
-+        quantity
-+        product {
-+          sku
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * Retrieve customer authorization headers
-+     *
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     * @throws AuthenticationException
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php
-new file mode 100644
-index 00000000000..ae0208ca310
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php
-@@ -0,0 +1,286 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Exception;
-+use Magento\Framework\Exception\AuthenticationException;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test adding virtual product to Cart
-+ */
-+class AddVirtualProductToCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/virtual_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testAddVirtualProductToCart()
-+    {
-+        $sku = 'virtual_product';
-+        $quantity = 2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response['addVirtualProductsToCart']);
-+        self::assertEquals($quantity, $response['addVirtualProductsToCart']['cart']['items'][0]['quantity']);
-+        self::assertEquals($sku, $response['addVirtualProductsToCart']['cart']['items'][0]['product']['sku']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testAddVirtualProductToCartIfCartIdIsMissed()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_items: []
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testAddVirtualProductToCartIfCartIdIsEmpty()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "",
-+      cart_items: []
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_items" is missing
-+     */
-+    public function testAddVirtualProductToCartIfCartItemsAreMissed()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "cart_id"
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_items" is missing
-+     */
-+    public function testAddVirtualProductToCartIfCartItemsAreEmpty()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "cart_id",
-+      cart_items: []
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/virtual_product.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testAddVirtualToNonExistentCart()
-+    {
-+        $sku = 'virtual_product';
-+        $qty = 2;
-+        $nonExistentMaskedQuoteId = 'non_existent_masked_id';
-+
-+        $query = $this->getQuery($nonExistentMaskedQuoteId, $sku, $qty);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a product with SKU "virtual_product"
-+     */
-+    public function testNonExistentProductToCart()
-+    {
-+        $sku = 'virtual_product';
-+        $qty = 2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/virtual_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     */
-+    public function testAddVirtualProductToGuestCart()
-+    {
-+        $sku = 'virtual_product';
-+        $qty = 2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/virtual_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testAddVirtualProductToAnotherCustomerCart()
-+    {
-+        $sku = 'virtual_product';
-+        $qty = 2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $sku
-+     * @param float $quantity
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, string $sku, float $quantity): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  addVirtualProductsToCart(input: {
-+    cart_id: "{$maskedQuoteId}", 
-+    cart_items: [
-+      {
-+        data: {
-+          quantity: {$quantity}
-+          sku: "{$sku}"
-+        }
-+      }                
-+    ]
-+  }) {
-+    cart {
-+      items {
-+        id
-+        quantity
-+        product {
-+          sku
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * Retrieve customer authorization headers
-+     *
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     * @throws AuthenticationException
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
-new file mode 100644
-index 00000000000..df138f90147
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
-@@ -0,0 +1,263 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\Framework\Exception\AuthenticationException;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test Apply Coupon to Cart functionality for customer
-+ */
-+class ApplyCouponToCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testApplyCouponToCart()
-+    {
-+        $couponCode = '2?ds5!2d';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('applyCouponToCart', $response);
-+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage A coupon is already applied to the cart. Please remove it to apply another
-+     */
-+    public function testApplyCouponTwice()
-+    {
-+        $couponCode = '2?ds5!2d';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey("applyCouponToCart", $response);
-+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Cart does not contain products.
-+     */
-+    public function testApplyCouponToCartWithoutItems()
-+    {
-+        $couponCode = '2?ds5!2d';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-+     * @expectedException \Exception
-+     */
-+    public function testApplyCouponToGuestCart()
-+    {
-+        $couponCode = '2?ds5!2d';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+
-+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
-+     * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @expectedException \Exception
-+     */
-+    public function testApplyCouponToAnotherCustomerCart()
-+    {
-+        $couponCode = '2?ds5!2d';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+
-+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer_two@example.com'));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
-+     */
-+    public function testApplyNonExistentCouponToCart()
-+    {
-+        $couponCode = 'non_existent_coupon_code';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-+     * @expectedException \Exception
-+     */
-+    public function testApplyCouponToNonExistentCart()
-+    {
-+        $couponCode = '2?ds5!2d';
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+
-+        self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * Products in cart don't fit to the coupon
-+     *
-+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
-+     */
-+    public function testApplyCouponWhichIsNotApplicable()
-+    {
-+        $couponCode = '2?ds5!2d';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @param string $input
-+     * @param string $message
-+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @expectedException \Exception
-+     */
-+    public function testApplyCouponWithMissedRequiredParameters(string $input, string $message)
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  applyCouponToCart(input: {{$input}}) {
-+    cart {
-+      applied_coupon {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderUpdateWithMissedRequiredParameters(): array
-+    {
-+        return [
-+            'missed_cart_id' => [
-+                'coupon_code: "test"',
-+                'Required parameter "cart_id" is missing'
-+            ],
-+            'missed_coupon_code' => [
-+                'cart_id: "test_quote"',
-+                'Required parameter "coupon_code" is missing'
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Retrieve customer authorization headers
-+     *
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     * @throws AuthenticationException
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $couponCode
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, string $couponCode): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  applyCouponToCart(input: {cart_id: "$maskedQuoteId", coupon_code: "$couponCode"}) {
-+    cart {
-+      applied_coupon {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartDiscountTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartDiscountTest.php
-new file mode 100644
-index 00000000000..37c53a62f7d
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartDiscountTest.php
-@@ -0,0 +1,123 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test is getting cart discount for registered customer.
-+ */
-+class CartDiscountTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/cart_rule_discount_no_coupon.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testGetDiscountInformation()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+        $discountResponse = $response['cart']['prices']['discount'];
-+        self::assertEquals(-10, $discountResponse['amount']['value']);
-+        self::assertEquals(['50% Off for all orders'], $discountResponse['label']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/cart_rule_discount_no_coupon.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
-+     */
-+    public function testGetDiscountInformationWithTwoRulesApplied()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+        $discountResponse = $response['cart']['prices']['discount'];
-+        self::assertEquals(-11, $discountResponse['amount']['value']);
-+        self::assertEquals(['50% Off for all orders', 'Test Coupon for General'], $discountResponse['label']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testGetDiscountInformationWithNoRulesApplied()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+        self::assertEquals(null, $response['cart']['prices']['discount']);
-+    }
-+
-+    /**
-+     * Generates GraphQl query for retrieving cart discount
-+     *
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "$maskedQuoteId") {
-+    prices {
-+      discount {
-+        label
-+        amount {
-+          value
-+          currency
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
-new file mode 100644
-index 00000000000..bb8acfce629
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
-@@ -0,0 +1,208 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test getting cart totals for registered customer
-+ */
-+class CartTotalsTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testGetCartTotalsWithTaxApplied()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('prices', $response['cart']);
-+        $pricesResponse = $response['cart']['prices'];
-+        self::assertEquals(21.5, $pricesResponse['grand_total']['value']);
-+        self::assertEquals(21.5, $pricesResponse['subtotal_including_tax']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_excluding_tax']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
-+
-+        $appliedTaxesResponse = $pricesResponse['applied_taxes'];
-+
-+        self::assertEquals('US-TEST-*-Rate-1', $appliedTaxesResponse[0]['label']);
-+        self::assertEquals(1.5, $appliedTaxesResponse[0]['amount']['value']);
-+        self::assertEquals('USD', $appliedTaxesResponse[0]['amount']['currency']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testGetTotalsWithNoTaxApplied()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+
-+        $pricesResponse = $response['cart']['prices'];
-+        self::assertEquals(20, $pricesResponse['grand_total']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_including_tax']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_excluding_tax']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
-+        self::assertEmpty($pricesResponse['applied_taxes']);
-+    }
-+
-+    /**
-+     * The totals calculation is based on quote address.
-+     * But the totals should be calculated even if no address is set
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testGetCartTotalsWithNoAddressSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+
-+        $pricesResponse = $response['cart']['prices'];
-+        self::assertEquals(20, $pricesResponse['grand_total']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_including_tax']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_excluding_tax']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
-+        self::assertEmpty($pricesResponse['applied_taxes']);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testGetTotalsFromGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testGetTotalsFromAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
-+    }
-+
-+    /**
-+     * Generates GraphQl query for retrieving cart totals
-+     *
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "$maskedQuoteId") {
-+    prices {
-+      grand_total {
-+        value,
-+        currency
-+      }
-+      subtotal_including_tax {
-+        value
-+        currency
-+      }
-+      subtotal_excluding_tax {
-+        value
-+        currency
-+      }
-+      subtotal_with_discount_excluding_tax {
-+        value
-+        currency
-+      }
-+      applied_taxes {
-+        label
-+        amount {
-+          value
-+          currency
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php
-new file mode 100644
-index 00000000000..5a4cc88d696
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php
-@@ -0,0 +1,527 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\Quote\Model\QuoteIdMaskFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Framework\Registry;
-+use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory as QuoteCollectionFactory;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * End to checkout tests for customer
-+ */
-+class CheckoutEndToEndTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var Registry
-+     */
-+    private $registry;
-+
-+    /**
-+     * @var QuoteCollectionFactory
-+     */
-+    private $quoteCollectionFactory;
-+
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @var QuoteIdMaskFactory
-+     */
-+    private $quoteIdMaskFactory;
-+
-+    /**
-+     * @var CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $orderCollectionFactory;
-+
-+    /**
-+     * @var OrderRepositoryInterface
-+     */
-+    private $orderRepository;
-+
-+    /**
-+     * @var array
-+     */
-+    private $headers = [];
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->registry = $objectManager->get(Registry::class);
-+        $this->quoteCollectionFactory = $objectManager->get(QuoteCollectionFactory::class);
-+        $this->quoteResource = $objectManager->get(QuoteResource::class);
-+        $this->quoteIdMaskFactory = $objectManager->get(QuoteIdMaskFactory::class);
-+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
-+        $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
-+        $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute.php
-+     */
-+    public function testCheckoutWorkflow()
-+    {
-+        $quantity = 2;
-+
-+        $this->createCustomer();
-+        $token = $this->loginCustomer();
-+        $this->headers = ['Authorization' => 'Bearer ' . $token];
-+
-+        $sku = $this->findProduct();
-+        $cartId = $this->createEmptyCart();
-+        $this->addProductToCart($cartId, $quantity, $sku);
-+
-+        $this->setBillingAddress($cartId);
-+        $shippingMethod = $this->setShippingAddress($cartId);
-+
-+        $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
-+        $this->setPaymentMethod($cartId, $paymentMethod);
-+
-+        $orderId = $this->placeOrder($cartId);
-+        $this->checkOrderInHistory($orderId);
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    private function createCustomer(): void
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  createCustomer(
-+    input: {
-+      firstname: "endto"
-+      lastname: "endtester"
-+      email: "customer@example.com"
-+      password: "123123Qa"
-+    }
-+  ) {
-+    customer {
-+      id
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @return string
-+     */
-+    private function loginCustomer(): string
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  generateCustomerToken(
-+    email: "customer@example.com"
-+    password: "123123Qa"
-+  ) {
-+    token
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+        self::assertArrayHasKey('generateCustomerToken', $response);
-+        self::assertArrayHasKey('token', $response['generateCustomerToken']);
-+        self::assertNotEmpty($response['generateCustomerToken']['token']);
-+
-+        return $response['generateCustomerToken']['token'];
-+    }
-+
-+    /**
-+     * @return string
-+     */
-+    private function findProduct(): string
-+    {
-+        $query = <<<QUERY
-+{
-+  products (
-+    filter: {
-+      sku: {
-+        like:"simple%"
-+      }
-+    }
-+    pageSize: 1
-+    currentPage: 1
-+  ) {
-+    items {
-+      sku
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+        self::assertArrayHasKey('products', $response);
-+        self::assertArrayHasKey('items', $response['products']);
-+        self::assertCount(1, $response['products']['items']);
-+
-+        $product = current($response['products']['items']);
-+        self::assertArrayHasKey('sku', $product);
-+        self::assertNotEmpty($product['sku']);
-+
-+        return $product['sku'];
-+    }
-+
-+    /**
-+     * @return string
-+     */
-+    private function createEmptyCart(): string
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  createEmptyCart
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query, [], '', $this->headers);
-+        self::assertArrayHasKey('createEmptyCart', $response);
-+        self::assertNotEmpty($response['createEmptyCart']);
-+
-+        return $response['createEmptyCart'];
-+    }
-+
-+    /**
-+     * @param string $cartId
-+     * @param float $qty
-+     * @param string $sku
-+     * @return void
-+     */
-+    private function addProductToCart(string $cartId, float $qty, string $sku): void
-+    {
-+        $query = <<<QUERY
-+mutation {  
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "{$cartId}"
-+      cart_items: [
-+        {
-+          data: {
-+            quantity: {$qty}
-+            sku: "{$sku}"
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      items {
-+        quantity
-+        product {
-+          sku
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->headers);
-+    }
-+
-+    /**
-+     * @param string $cartId
-+     * @param array $auth
-+     * @return array
-+     */
-+    private function setBillingAddress(string $cartId): void
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "{$cartId}"
-+      billing_address: {
-+         address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2"]
-+          city: "test city"
-+          postcode: "887766"
-+          telephone: "88776655"
-+          region: "TX"
-+          country_code: "US"
-+          save_in_address_book: false
-+         }
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        __typename
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->headers);
-+    }
-+
-+    /**
-+     * @param string $cartId
-+     * @return array
-+     */
-+    private function setShippingAddress(string $cartId): array
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$cartId"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "test firstname"
-+            lastname: "test lastname"
-+            company: "test company"
-+            street: ["test street 1", "test street 2"]
-+            city: "test city"
-+            region: "TX"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        available_shipping_methods {
-+          carrier_code
-+          method_code
-+          amount {
-+            value
-+          }
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query, [], '', $this->headers);
-+        self::assertArrayHasKey('setShippingAddressesOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingAddressesOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingAddressesOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingAddressesOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('available_shipping_methods', $shippingAddress);
-+        self::assertCount(1, $shippingAddress['available_shipping_methods']);
-+
-+        $availableShippingMethod = current($shippingAddress['available_shipping_methods']);
-+        self::assertArrayHasKey('carrier_code', $availableShippingMethod);
-+        self::assertNotEmpty($availableShippingMethod['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $availableShippingMethod);
-+        self::assertNotEmpty($availableShippingMethod['method_code']);
-+
-+        self::assertArrayHasKey('amount', $availableShippingMethod);
-+        self::assertArrayHasKey('value', $availableShippingMethod['amount']);
-+        self::assertNotEmpty($availableShippingMethod['amount']['value']);
-+
-+        return $availableShippingMethod;
-+    }
-+
-+    /**
-+     * @param string $cartId
-+     * @param array $method
-+     * @return array
-+     */
-+    private function setShippingMethod(string $cartId, array $method): array
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input:  {
-+    cart_id: "{$cartId}", 
-+    shipping_methods: [
-+      {
-+         carrier_code: "{$method['carrier_code']}"
-+         method_code: "{$method['method_code']}"
-+      }
-+    ]
-+  }) {
-+    cart {
-+      available_payment_methods {
-+        code
-+        title
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query, [], '', $this->headers);
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('available_payment_methods', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['available_payment_methods']);
-+
-+        $availablePaymentMethod = current($response['setShippingMethodsOnCart']['cart']['available_payment_methods']);
-+        self::assertArrayHasKey('code', $availablePaymentMethod);
-+        self::assertNotEmpty($availablePaymentMethod['code']);
-+        self::assertArrayHasKey('title', $availablePaymentMethod);
-+        self::assertNotEmpty($availablePaymentMethod['title']);
-+
-+        return $availablePaymentMethod;
-+    }
-+
-+    /**
-+     * @param string $cartId
-+     * @param array $method
-+     * @return void
-+     */
-+    private function setPaymentMethod(string $cartId, array $method): void
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(
-+    input: {
-+      cart_id: "{$cartId}"
-+      payment_method: {
-+        code: "{$method['code']}"
-+      }
-+    }
-+  ) {
-+    cart {
-+      selected_payment_method {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->headers);
-+    }
-+
-+    /**
-+     * @param string $cartId
-+     * @return string
-+     */
-+    private function placeOrder(string $cartId): string
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  placeOrder(
-+    input: {
-+      cart_id: "{$cartId}"
-+    }
-+  ) {
-+    order {
-+      order_id
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query, [], '', $this->headers);
-+        self::assertArrayHasKey('placeOrder', $response);
-+        self::assertArrayHasKey('order', $response['placeOrder']);
-+        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-+        self::assertNotEmpty($response['placeOrder']['order']['order_id']);
-+
-+        return $response['placeOrder']['order']['order_id'];
-+    }
-+
-+    /**
-+     * @param string $orderId
-+     * @return void
-+     */
-+    private function checkOrderInHistory(string $orderId): void
-+    {
-+        $query = <<<QUERY
-+{
-+  customerOrders {
-+    items {
-+      increment_id
-+      grand_total
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query, [], '', $this->headers);
-+        self::assertArrayHasKey('customerOrders', $response);
-+        self::assertArrayHasKey('items', $response['customerOrders']);
-+        self::assertCount(1, $response['customerOrders']['items']);
-+
-+        $order = current($response['customerOrders']['items']);
-+        self::assertArrayHasKey('increment_id', $order);
-+        self::assertEquals($orderId, $order['increment_id']);
-+
-+        self::assertArrayHasKey('grand_total', $order);
-+    }
-+
-+    public function tearDown()
-+    {
-+        $this->deleteCustomer();
-+        $this->deleteQuote();
-+        $this->deleteOrder();
-+        parent::tearDown();
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    private function deleteCustomer(): void
-+    {
-+        $email = 'customer@example.com';
-+        try {
-+            $customer = $this->customerRepository->get($email);
-+        } catch (\Exception $exception) {
-+            return;
-+        }
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', true);
-+        $this->customerRepository->delete($customer);
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', false);
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    private function deleteQuote(): void
-+    {
-+        $quoteCollection = $this->quoteCollectionFactory->create();
-+        foreach ($quoteCollection as $quote) {
-+            $this->quoteResource->delete($quote);
-+
-+            $quoteIdMask = $this->quoteIdMaskFactory->create();
-+            $quoteIdMask->setQuoteId($quote->getId())
-+                ->delete();
-+        }
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    private function deleteOrder()
-+    {
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', true);
-+
-+        $orderCollection = $this->orderCollectionFactory->create();
-+        foreach ($orderCollection as $order) {
-+            $this->orderRepository->delete($order);
-+        }
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', false);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
-new file mode 100644
-index 00000000000..fbd0cf19740
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
-@@ -0,0 +1,196 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\Quote\Model\QuoteIdMaskFactory;
-+use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory as QuoteCollectionFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\Quote\Api\GuestCartRepositoryInterface;
-+
-+/**
-+ * Test for empty cart creation mutation for customer
-+ */
-+class CreateEmptyCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GuestCartRepositoryInterface
-+     */
-+    private $guestCartRepository;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var QuoteCollectionFactory
-+     */
-+    private $quoteCollectionFactory;
-+
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @var QuoteIdMaskFactory
-+     */
-+    private $quoteIdMaskFactory;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->quoteCollectionFactory = $objectManager->get(QuoteCollectionFactory::class);
-+        $this->guestCartRepository = $objectManager->get(GuestCartRepositoryInterface::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+        $this->quoteResource = $objectManager->get(QuoteResource::class);
-+        $this->quoteIdMaskFactory = $objectManager->get(QuoteIdMaskFactory::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testCreateEmptyCart()
-+    {
-+        $query = $this->getQuery();
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMapWithCustomerToken());
-+
-+        self::assertArrayHasKey('createEmptyCart', $response);
-+        self::assertNotEmpty($response['createEmptyCart']);
-+
-+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
-+
-+        self::assertNotNull($guestCart->getId());
-+        self::assertEquals(1, $guestCart->getCustomer()->getId());
-+        self::assertEquals('default', $guestCart->getStore()->getCode());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testCreateEmptyCartWithNotDefaultStore()
-+    {
-+        $query = $this->getQuery();
-+
-+        $headerMap = $this->getHeaderMapWithCustomerToken();
-+        $headerMap['Store'] = 'fixture_second_store';
-+        $response = $this->graphQlMutation($query, [], '', $headerMap);
-+
-+        self::assertArrayHasKey('createEmptyCart', $response);
-+        self::assertNotEmpty($response['createEmptyCart']);
-+
-+        /* guestCartRepository is used for registered customer to get the cart hash */
-+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
-+
-+        self::assertNotNull($guestCart->getId());
-+        self::assertEquals(1, $guestCart->getCustomer()->getId());
-+        self::assertEquals('fixture_second_store', $guestCart->getStore()->getCode());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testCreateEmptyCartWithPredefinedCartId()
-+    {
-+        $predefinedCartId = '572cda51902b5b517c0e1a2b2fd004b4';
-+
-+        $query = <<<QUERY
-+mutation {
-+  createEmptyCart (input: {cart_id: "{$predefinedCartId}"})
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMapWithCustomerToken());
-+
-+        self::assertArrayHasKey('createEmptyCart', $response);
-+        self::assertEquals($predefinedCartId, $response['createEmptyCart']);
-+
-+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
-+        self::assertNotNull($guestCart->getId());
-+        self::assertEquals(1, $guestCart->getCustomer()->getId());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Cart with ID "572cda51902b5b517c0e1a2b2fd004b4" already exists.
-+     */
-+    public function testCreateEmptyCartIfPredefinedCartIdAlreadyExists()
-+    {
-+        $predefinedCartId = '572cda51902b5b517c0e1a2b2fd004b4';
-+
-+        $query = <<<QUERY
-+mutation {
-+  createEmptyCart (input: {cart_id: "{$predefinedCartId}"})
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMapWithCustomerToken());
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMapWithCustomerToken());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Cart ID length should to be 32 symbols.
-+     */
-+    public function testCreateEmptyCartWithWrongPredefinedCartId()
-+    {
-+        $predefinedCartId = '572';
-+
-+        $query = <<<QUERY
-+mutation {
-+  createEmptyCart (input: {cart_id: "{$predefinedCartId}"})
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMapWithCustomerToken());
-+    }
-+
-+    /**
-+     * @return string
-+     */
-+    private function getQuery(): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  createEmptyCart
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMapWithCustomerToken(
-+        string $username = 'customer@example.com',
-+        string $password = 'password'
-+    ): array {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+
-+    public function tearDown()
-+    {
-+        $quoteCollection = $this->quoteCollectionFactory->create();
-+        foreach ($quoteCollection as $quote) {
-+            $this->quoteResource->delete($quote);
-+
-+            $quoteIdMask = $this->quoteIdMaskFactory->create();
-+            $quoteIdMask->setQuoteId($quote->getId())
-+                ->delete();
-+        }
-+        parent::tearDown();
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
-new file mode 100644
-index 00000000000..673d4963026
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
-@@ -0,0 +1,160 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for get available payment methods
-+ */
-+class GetAvailablePaymentMethodsTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetAvailablePaymentMethods()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('available_payment_methods', $response['cart']);
-+
-+        self::assertEquals('checkmo', $response['cart']['available_payment_methods'][0]['code']);
-+        self::assertEquals('Check / Money order', $response['cart']['available_payment_methods'][0]['title']);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetAvailablePaymentMethodsFromGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetAvailablePaymentMethodsFromAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php
-+     */
-+    public function testGetAvailablePaymentMethodsIfPaymentsAreNotPresent()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('available_payment_methods', $response['cart']);
-+        self::assertEmpty($response['cart']['available_payment_methods']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetAvailablePaymentMethodsOfNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "$maskedQuoteId") {
-+    available_payment_methods {
-+      code
-+      title
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
-new file mode 100644
-index 00000000000..b01921ae67e
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
-@@ -0,0 +1,212 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types = 1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for get available shipping methods
-+ */
-+class GetAvailableShippingMethodsTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * Test case: get available shipping methods from current customer quote
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetAvailableShippingMethods()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $response = $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
-+        self::assertCount(1, $response['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('available_shipping_methods', $response['cart']['shipping_addresses'][0]);
-+        self::assertCount(1, $response['cart']['shipping_addresses'][0]['available_shipping_methods']);
-+
-+        $expectedAddressData = [
-+            'amount' => [
-+                'value' => 10,
-+                'currency' => 'USD',
-+            ],
-+            'base_amount' => [
-+                'value' => 10,
-+                'currency' => 'USD',
-+            ],
-+            'carrier_code' => 'flatrate',
-+            'carrier_title' => 'Flat Rate',
-+            'error_message' => '',
-+            'method_code' => 'flatrate',
-+            'method_title' => 'Fixed',
-+            'price_incl_tax' => [
-+                'value' => 10,
-+                'currency' => 'USD',
-+            ],
-+            'price_excl_tax' => [
-+                'value' => 10,
-+                'currency' => 'USD',
-+            ],
-+        ];
-+        self::assertEquals(
-+            $expectedAddressData,
-+            $response['cart']['shipping_addresses'][0]['available_shipping_methods'][0]
-+        );
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetAvailableShippingMethodsFromGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * Test case: get available shipping methods from quote of another customer
-+     *
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
-+    }
-+
-+    /**
-+     * Test case: get available shipping methods when all shipping methods are disabled
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php
-+     */
-+    public function testGetAvailableShippingMethodsIfShippingMethodsAreNotPresent()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $response = $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
-+
-+        self::assertEmpty($response['cart']['shipping_addresses'][0]['available_shipping_methods']);
-+    }
-+
-+    /**
-+     * Test case: get available shipping methods from non-existent cart
-+     *
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetAvailableShippingMethodsOfNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+query {
-+  cart (cart_id: "{$maskedQuoteId}") {
-+    shipping_addresses {
-+        available_shipping_methods {
-+          amount {
-+            value
-+            currency
-+          }
-+          base_amount {
-+            value
-+            currency
-+          }
-+          carrier_code
-+          carrier_title
-+          error_message
-+          method_code
-+          method_title
-+          price_excl_tax {
-+            value
-+            currency
-+          }
-+          price_incl_tax {
-+            value
-+            currency
-+          }
-+        }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartEmailTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartEmailTest.php
-new file mode 100644
-index 00000000000..951fe08db5e
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartEmailTest.php
-@@ -0,0 +1,125 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for getting email from cart
-+ */
-+class GetCartEmailTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testGetCartEmail()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+
-+        $this->assertArrayHasKey('cart', $response);
-+        $this->assertArrayHasKey('email', $response['cart']);
-+        $this->assertEquals('customer@example.com', $response['cart']['email']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetCartEmailFromNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     */
-+    public function testGetEmailFromGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
-+        );
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testGetEmailFromAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id:"$maskedQuoteId") {    
-+    email
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
-new file mode 100644
-index 00000000000..e7f87f36204
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
-@@ -0,0 +1,281 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Exception;
-+use Magento\Customer\Model\CustomerAuthUpdate;
-+use Magento\Customer\Model\CustomerRegistry;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for getting cart information
-+ */
-+class GetCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var CustomerAuthUpdate
-+     */
-+    private $customerAuthUpdate;
-+
-+    /**
-+     * @var CustomerRegistry
-+     */
-+    private $customerRegistry;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+        $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
-+        $this->customerAuthUpdate = Bootstrap::getObjectManager()->get(CustomerAuthUpdate::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
-+     */
-+    public function testGetCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('items', $response['cart']);
-+        self::assertCount(2, $response['cart']['items']);
-+
-+        self::assertNotEmpty($response['cart']['items'][0]['id']);
-+        self::assertEquals(2, $response['cart']['items'][0]['quantity']);
-+        self::assertEquals('simple_product', $response['cart']['items'][0]['product']['sku']);
-+
-+        self::assertNotEmpty($response['cart']['items'][1]['id']);
-+        self::assertEquals(2, $response['cart']['items'][1]['quantity']);
-+        self::assertEquals('virtual-product', $response['cart']['items'][1]['product']['sku']);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     */
-+    public function testGetGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
-+        );
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testGetAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
-+        );
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testGetCartIfCartIdIsEmpty()
-+    {
-+        $maskedQuoteId = '';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Field "cart" argument "cart_id" of type "String!" is required but not provided.
-+     */
-+    public function testGetCartIfCartIdIsMissed()
-+    {
-+        $query = <<<QUERY
-+{
-+  cart {
-+    email
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_cart_inactive.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Current user does not have an active cart.
-+     */
-+    public function testGetInactiveCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_customer_not_default_store.php
-+     */
-+    public function testGetCartWithNotDefaultStore()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $headerMap = $this->getHeaderMap();
-+        $headerMap['Store'] = 'fixture_second_store';
-+
-+        $response = $this->graphQlQuery($query, [], '', $headerMap);
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('items', $response['cart']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Wrong store code specified for cart
-+     */
-+    public function testGetCartWithWrongStore()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $headerMap = $this->getHeaderMap();
-+        $headerMap['Store'] = 'fixture_second_store';
-+
-+        $this->graphQlQuery($query, [], '', $headerMap);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_customer_not_default_store.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Requested store is not found
-+     */
-+    public function testGetCartWithNotExistingStore()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $headerMap = $this->getHeaderMap();
-+        $headerMap['Store'] = 'not_existing_store';
-+
-+        $this->graphQlQuery($query, [], '', $headerMap);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testGetCartForLockedCustomer()
-+    {
-+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/750');
-+
-+        /* lock customer */
-+        $customerSecure = $this->customerRegistry->retrieveSecureData(1);
-+        $customerSecure->setLockExpires('2030-12-31 00:00:00');
-+        $this->customerAuthUpdate->saveAuth(1);
-+
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The account is locked"
-+        );
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "{$maskedQuoteId}") {
-+    items {
-+      id
-+      quantity
-+      product {
-+        sku
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedPaymentMethodTest.php
-new file mode 100644
-index 00000000000..4432a233e96
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedPaymentMethodTest.php
-@@ -0,0 +1,164 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for getting selected payment method from cart
-+ */
-+class GetSelectedPaymentMethodTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     */
-+    public function testGetSelectedPaymentMethod()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+
-+        $this->assertArrayHasKey('cart', $response);
-+        $this->assertArrayHasKey('selected_payment_method', $response['cart']);
-+        $this->assertArrayHasKey('code', $response['cart']['selected_payment_method']);
-+        $this->assertEquals('checkmo', $response['cart']['selected_payment_method']['code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetSelectedPaymentMethodBeforeSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+
-+        $this->assertArrayHasKey('cart', $response);
-+        $this->assertArrayHasKey('selected_payment_method', $response['cart']);
-+        $this->assertArrayHasKey('code', $response['cart']['selected_payment_method']);
-+        $this->assertEquals('', $response['cart']['selected_payment_method']['code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     */
-+    public function testGetSelectedPaymentMethodFromNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            'Could not find a cart with ID "non_existent_masked_id"'
-+        );
-+
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     */
-+    public function testGetSelectedPaymentMethodFromGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testGetSelectedPaymentMethodFromAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
-+        );
-+
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
-+    }
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id:"$maskedQuoteId") {    
-+    selected_payment_method {
-+      code
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     * @throws \Magento\Framework\Exception\AuthenticationException
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
-new file mode 100644
-index 00000000000..9bb36bf8f09
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
-@@ -0,0 +1,253 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for get selected shipping method
-+ */
-+class GetSelectedShippingMethodTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testGetSelectedShippingMethod()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
-+        self::assertCount(1, $response['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('flatrate', $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('flatrate', $shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('Flat Rate', $shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('Fixed', $shippingAddress['selected_shipping_method']['method_title']);
-+
-+        self::assertArrayHasKey('amount', $shippingAddress['selected_shipping_method']);
-+        $amount = $shippingAddress['selected_shipping_method']['amount'];
-+
-+        self::assertArrayHasKey('value', $amount);
-+        self::assertEquals(10, $amount['value']);
-+        self::assertArrayHasKey('currency', $amount);
-+        self::assertEquals('USD', $amount['currency']);
-+
-+        self::assertArrayHasKey('base_amount', $shippingAddress['selected_shipping_method']);
-+        $baseAmount = $shippingAddress['selected_shipping_method']['base_amount'];
-+
-+        self::assertArrayHasKey('value', $baseAmount);
-+        self::assertEquals(10, $baseAmount['value']);
-+        self::assertArrayHasKey('currency', $baseAmount);
-+        self::assertEquals('USD', $baseAmount['currency']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetSelectedShippingMethodBeforeSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
-+        self::assertCount(1, $response['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['method_title']);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testGetSelectedShippingMethodFromGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testGetSelectedShippingMethodFromAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetGetSelectedShippingMethodIfShippingMethodIsNotSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
-+        self::assertCount(1, $response['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertNull($shippingAddress['selected_shipping_method']['carrier_code']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['method_code']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['carrier_title']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['method_title']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['amount']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['base_amount']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetGetSelectedShippingMethodOfNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "$maskedQuoteId") {
-+    shipping_addresses {
-+      available_shipping_methods {
-+        carrier_code
-+        method_code
-+      }
-+      selected_shipping_method {
-+        carrier_code
-+        method_code
-+        carrier_title
-+        method_title
-+        amount {
-+            value
-+            currency
-+        }
-+        base_amount {
-+            value
-+            currency
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
-new file mode 100644
-index 00000000000..b6dde46871c
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
-@@ -0,0 +1,219 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for get specified billing address
-+ */
-+class GetSpecifiedBillingAddressTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testGetSpecifiedBillingAddress()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('billing_address', $response['cart']);
-+
-+        $expectedBillingAddressData = [
-+            'firstname' => 'John',
-+            'lastname' => 'Smith',
-+            'company' => 'CompanyName',
-+            'street' => [
-+                'Green str, 67'
-+            ],
-+            'city' => 'CityM',
-+            'region' => [
-+                'code' => 'AL',
-+                'label' => 'Alabama',
-+            ],
-+            'postcode' => '75477',
-+            'country' => [
-+                'code' => 'US',
-+                'label' => 'US',
-+            ],
-+            'telephone' => '3468676',
-+            '__typename' => 'BillingCartAddress',
-+            'customer_notes' => null,
-+        ];
-+        self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testGetSpecifiedBillingAddressIfBillingAddressIsNotSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('billing_address', $response['cart']);
-+
-+        $expectedBillingAddressData = [
-+            'firstname' => null,
-+            'lastname' => null,
-+            'company' => null,
-+            'street' => [
-+                ''
-+            ],
-+            'city' => null,
-+            'region' => [
-+                'code' => null,
-+                'label' => null,
-+            ],
-+            'postcode' => null,
-+            'country' => [
-+                'code' => null,
-+                'label' => null,
-+            ],
-+            'telephone' => null,
-+            '__typename' => 'BillingCartAddress',
-+            'customer_notes' => null,
-+        ];
-+        self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetSpecifiedBillingAddressOfNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testGetSpecifiedBillingAddressFromAnotherGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testGetSpecifiedBillingAddressFromAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery(
-+            $this->getQuery($maskedQuoteId),
-+            [],
-+            '',
-+            $this->getHeaderMap('customer2@search.example.com')
-+        );
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "$maskedQuoteId") {
-+    billing_address {
-+      firstname
-+      lastname
-+      company
-+      street
-+      city
-+      region 
-+      {
-+        code
-+        label
-+      }
-+      postcode
-+      country 
-+      {
-+        code
-+        label
-+      }
-+      telephone
-+      __typename
-+      customer_notes
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedShippingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedShippingAddressTest.php
-new file mode 100644
-index 00000000000..de3c384e657
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedShippingAddressTest.php
-@@ -0,0 +1,219 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for get specified shipping address
-+ */
-+class GetSpecifiedShippingAddressTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetSpecifiedShippingAddress()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
-+
-+        $expectedShippingAddressData = [
-+            'firstname' => 'John',
-+            'lastname' => 'Smith',
-+            'company' => 'CompanyName',
-+            'street' => [
-+                'Green str, 67'
-+            ],
-+            'city' => 'CityM',
-+            'region' => [
-+                'code' => 'AL',
-+                'label' => 'Alabama',
-+            ],
-+            'postcode' => '75477',
-+            'country' => [
-+                'code' => 'US',
-+                'label' => 'US',
-+            ],
-+            'telephone' => '3468676',
-+            '__typename' => 'ShippingCartAddress',
-+            'customer_notes' => null,
-+        ];
-+        self::assertEquals($expectedShippingAddressData, current($response['cart']['shipping_addresses']));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testGetSpecifiedShippingAddressIfShippingAddressIsNotSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
-+
-+        $expectedShippingAddressData = [
-+            'firstname' => null,
-+            'lastname' => null,
-+            'company' => null,
-+            'street' => [
-+                ''
-+            ],
-+            'city' => null,
-+            'region' => [
-+                'code' => null,
-+                'label' => null,
-+            ],
-+            'postcode' => null,
-+            'country' => [
-+                'code' => null,
-+                'label' => null,
-+            ],
-+            'telephone' => null,
-+            '__typename' => 'ShippingCartAddress',
-+            'customer_notes' => null,
-+        ];
-+        self::assertEquals($expectedShippingAddressData, current($response['cart']['shipping_addresses']));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetSpecifiedShippingAddressOfNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetSpecifiedShippingAddressFromGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetSpecifiedShippingAddressFromAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery(
-+            $this->getQuery($maskedQuoteId),
-+            [],
-+            '',
-+            $this->getHeaderMap('customer2@search.example.com')
-+        );
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "$maskedQuoteId") {
-+    shipping_addresses {
-+      firstname
-+      lastname
-+      company
-+      street
-+      city
-+      region 
-+      {
-+        code
-+        label
-+      }
-+      postcode
-+      country 
-+      {
-+        code
-+        label
-+      }
-+      telephone
-+      __typename
-+      customer_notes
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
-new file mode 100644
-index 00000000000..591bac1c35b
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
-@@ -0,0 +1,329 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Exception;
-+use Magento\Framework\Registry;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for placing an order for customer
-+ */
-+class PlaceOrderTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $orderCollectionFactory;
-+
-+    /**
-+     * @var OrderRepositoryInterface
-+     */
-+    private $orderRepository;
-+
-+    /**
-+     * @var Registry
-+     */
-+    private $registry;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+        $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
-+        $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     */
-+    public function testPlaceOrder()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('placeOrder', $response);
-+        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-+        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testPlaceOrderIfCartIdIsEmpty()
-+    {
-+        $maskedQuoteId = '';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testPlaceOrderIfCartIdIsMissed()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  placeOrder(input: {}) {
-+    order {
-+      order_id
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testPlaceOrderWithNoItemsInCart()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessage(
-+            'Unable to place order: A server error stopped your order from being placed. ' .
-+            'Please try to place your order again'
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testPlaceOrderWithNoShippingAddress()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessage(
-+            'Unable to place order: Some addresses can\'t be used due to the configurations for specific countries'
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testPlaceOrderWithNoShippingMethod()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessage(
-+            'Unable to place order: The shipping method is missing. Select the shipping method and try again'
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testPlaceOrderWithNoBillingAddress()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessageRegExp(
-+            '/Unable to place order: Please check the billing address information*/'
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testPlaceOrderWithNoPaymentMethod()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessage('Unable to place order: Enter a valid payment method and try again');
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
-+     */
-+    public function testPlaceOrderWithOutOfStockProduct()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessage('Unable to place order: Some of the products are out of stock');
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     */
-+    public function testPlaceOrderOfGuestCart()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessageRegExp('/The current user cannot perform operations on cart*/');
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     */
-+    public function testPlaceOrderOfAnotherCustomerCart()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessageRegExp('/The current user cannot perform operations on cart*/');
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
-+    order {
-+      order_id
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     * @throws \Magento\Framework\Exception\AuthenticationException
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function tearDown()
-+    {
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', true);
-+
-+        $orderCollection = $this->orderCollectionFactory->create();
-+        foreach ($orderCollection as $order) {
-+            $this->orderRepository->delete($order);
-+        }
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', false);
-+
-+        parent::tearDown();
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
-new file mode 100644
-index 00000000000..f906b33fe19
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
-@@ -0,0 +1,206 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Exception;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Check removing of the coupon from customer cart
-+ */
-+class RemoveCouponFromCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
-+     */
-+    public function testRemoveCouponFromCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('removeCouponFromCart', $response);
-+        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testRemoveCouponFromCartIfCartIdIsEmpty()
-+    {
-+        $maskedQuoteId = '';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testRemoveCouponFromCartIfCartIdIsMissed()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  removeCouponFromCart(input: {}) {
-+    cart {
-+      applied_coupon {
-+        code
-+      }
-+    }
-+  }
-+}
-+
-+QUERY;
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testRemoveCouponFromNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Cart does not contain products
-+     */
-+    public function testRemoveCouponFromEmptyCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testRemoveCouponFromCartIfCouponWasNotSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('removeCouponFromCart', $response);
-+        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
-+     */
-+    public function testRemoveCouponFromGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
-+     */
-+    public function testRemoveCouponFromAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  removeCouponFromCart(input: {cart_id: "$maskedQuoteId"}) {
-+    cart {
-+      applied_coupon {
-+        code
-+      }
-+    }
-+  }
-+}
-+
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
-new file mode 100644
-index 00000000000..b810022403b
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
-@@ -0,0 +1,238 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\GraphQl\Quote\GetQuoteItemIdByReservedQuoteIdAndSku;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ *  Test for removeItemFromCartTest mutation
-+ */
-+class RemoveItemFromCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var GetQuoteItemIdByReservedQuoteIdAndSku
-+     */
-+    private $getQuoteItemIdByReservedQuoteIdAndSku;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->getQuoteItemIdByReservedQuoteIdAndSku = $objectManager->get(
-+            GetQuoteItemIdByReservedQuoteIdAndSku::class
-+        );
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testRemoveItemFromCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $itemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
-+
-+        $query = $this->getQuery($maskedQuoteId, $itemId);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        $this->assertArrayHasKey('removeItemFromCart', $response);
-+        $this->assertArrayHasKey('cart', $response['removeItemFromCart']);
-+        $this->assertCount(0, $response['removeItemFromCart']['cart']['items']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testRemoveItemFromNonExistentCart()
-+    {
-+        $query = $this->getQuery('non_existent_masked_id', 1);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testRemoveNonExistentItem()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $notExistentItemId = 999;
-+
-+        $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
-+
-+        $query = $this->getQuery($maskedQuoteId, $notExistentItemId);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @param string $input
-+     * @param string $message
-+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
-+     */
-+    public function testUpdateWithMissedItemRequiredParameters(string $input, string $message)
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  removeItemFromCart(
-+    input: {
-+      {$input}
-+    }
-+  ) {
-+    cart {
-+      items {
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderUpdateWithMissedRequiredParameters(): array
-+    {
-+        return [
-+            'missed_cart_id' => [
-+                'cart_item_id: 1',
-+                'Required parameter "cart_id" is missing.'
-+            ],
-+            'missed_cart_item_id' => [
-+                'cart_id: "test_quote"',
-+                'Required parameter "cart_item_id" is missing.'
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
-+     */
-+    public function testRemoveItemIfItemIsNotBelongToCart()
-+    {
-+        $firstQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $secondQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute(
-+            'test_order_with_virtual_product',
-+            'virtual-product'
-+        );
-+
-+        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
-+
-+        $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testRemoveItemFromGuestCart()
-+    {
-+        $guestQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $guestQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$guestQuoteMaskedId\""
-+        );
-+
-+        $query = $this->getQuery($guestQuoteMaskedId, $guestQuoteItemId);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testRemoveItemFromAnotherCustomerCart()
-+    {
-+        $anotherCustomerQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $anotherCustomerQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute(
-+            'test_quote',
-+            'simple_product'
-+        );
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$anotherCustomerQuoteMaskedId\""
-+        );
-+
-+        $query = $this->getQuery($anotherCustomerQuoteMaskedId, $anotherCustomerQuoteItemId);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param int $itemId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, int $itemId): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  removeItemFromCart(
-+    input: {
-+      cart_id: "{$maskedQuoteId}"
-+      cart_item_id: {$itemId}
-+    }
-+  ) {
-+    cart {
-+      items {
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
-new file mode 100644
-index 00000000000..9ff4d3bd0f6
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
-@@ -0,0 +1,711 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for set billing address on cart mutation
-+ */
-+class SetBillingAddressOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @var QuoteFactory
-+     */
-+    private $quoteFactory;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteIdInterface
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->quoteResource = $objectManager->get(QuoteResource::class);
-+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewBillingAddress()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+         address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2"]
-+          city: "test city"
-+          region: "test region"
-+          postcode: "887766"
-+          country_code: "US"
-+          telephone: "88776655"
-+          save_in_address_book: false
-+         }
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        firstname
-+        lastname
-+        company
-+        street
-+        city
-+        postcode
-+        telephone
-+        country {
-+          code
-+          label
-+        }
-+        __typename
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
-+        $cartResponse = $response['setBillingAddressOnCart']['cart'];
-+        self::assertArrayHasKey('billing_address', $cartResponse);
-+        $billingAddressResponse = $cartResponse['billing_address'];
-+        $this->assertNewAddressFields($billingAddressResponse);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewBillingAddressWithUseForShippingParameter()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+         address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2"]
-+          city: "test city"
-+          region: "test region"
-+          postcode: "887766"
-+          country_code: "US"
-+          telephone: "88776655"
-+          save_in_address_book: false
-+         }
-+         use_for_shipping: true
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        firstname
-+        lastname
-+        company
-+        street
-+        city
-+        postcode
-+        telephone
-+        country {
-+          code
-+          label
-+        }
-+        __typename
-+      }
-+      shipping_addresses {
-+        firstname
-+        lastname
-+        company
-+        street
-+        city
-+        postcode
-+        telephone
-+        country {
-+          code
-+          label
-+        }
-+        __typename
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
-+        $cartResponse = $response['setBillingAddressOnCart']['cart'];
-+        self::assertArrayHasKey('billing_address', $cartResponse);
-+        $billingAddressResponse = $cartResponse['billing_address'];
-+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
-+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
-+        $this->assertNewAddressFields($billingAddressResponse);
-+        $this->assertNewAddressFields($shippingAddressResponse, 'ShippingCartAddress');
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetBillingAddressFromAddressBook()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+          customer_address_id: 1
-+       }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        firstname
-+        lastname
-+        company
-+        street
-+        city
-+        postcode
-+        telephone
-+        country {
-+          code
-+          label
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
-+        $cartResponse = $response['setBillingAddressOnCart']['cart'];
-+        self::assertArrayHasKey('billing_address', $cartResponse);
-+        $billingAddressResponse = $cartResponse['billing_address'];
-+        $this->assertSavedBillingAddressFields($billingAddressResponse);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a address with ID "100"
-+     */
-+    public function testSetNotExistedBillingAddressFromAddressBook()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+          customer_address_id: 100
-+       }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewBillingAddressAndFromAddressBookAtSameTime()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+        customer_address_id: 1
-+        address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2"]
-+          city: "test city"
-+          region: "test region"
-+          postcode: "887766"
-+          country_code: "US"
-+          telephone: "88776655"
-+          save_in_address_book: false
-+        }
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        self::expectExceptionMessage(
-+            'The billing address cannot contain "customer_address_id" and "address" at the same time.'
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewBillingAddressWithoutCustomerAddressIdAndAddress()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+        use_for_shipping: true
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        self::expectExceptionMessage(
-+            'The billing address must contain either "customer_address_id" or "address".'
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_multishipping_with_two_shipping_addresses.php
-+     */
-+    public function testSetNewBillingAddressWithUseForShippingAndMultishipping()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+        address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2"]
-+          city: "test city"
-+          region: "test region"
-+          postcode: "887766"
-+          country_code: "US"
-+          telephone: "88776655"
-+          save_in_address_book: false
-+        }
-+        use_for_shipping: true
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        self::expectExceptionMessage(
-+            'Using the "use_for_shipping" option with multishipping is not possible.'
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetBillingAddressToGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+          customer_address_id: 1
-+       }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
-+        );
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-+     */
-+    public function testSetBillingAddressToAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 2);
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+          customer_address_id: 1
-+       }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
-+        );
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer@search.example.com'));
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Current customer does not have permission to address with ID "1"
-+     */
-+    public function testSetBillingAddressIfCustomerIsNotOwnerOfAddress()
-+    {
-+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 2);
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+          customer_address_id: 1
-+       }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testSetBillingAddressOnNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+          customer_address_id: 1
-+       }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @dataProvider dataProviderSetWithoutRequiredParameters
-+     * @param string $input
-+     * @param string $message
-+     * @throws \Exception
-+     */
-+    public function testSetBillingAddressWithoutRequiredParameters(string $input, string $message)
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $input = str_replace('cart_id_value', $maskedQuoteId, $input);
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      {$input}
-+    }
-+  ) {
-+    cart {
-+        billing_address {
-+            city
-+          }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderSetWithoutRequiredParameters(): array
-+    {
-+        return [
-+            'missed_billing_address' => [
-+                'cart_id: "cart_id_value"',
-+                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
-+                . ' was not provided.',
-+            ],
-+            'missed_cart_id' => [
-+                'billing_address: {}',
-+                'Required parameter "cart_id" is missing'
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewBillingAddressWithRedundantStreetLine()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+         address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2", "test street 3"]
-+          city: "test city"
-+          region: "test region"
-+          postcode: "887766"
-+          country_code: "US"
-+          telephone: "88776655"
-+          save_in_address_book: false
-+         }
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        firstname
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * Verify the all the whitelisted fields for a New Address Object
-+     *
-+     * @param array $addressResponse
-+     * @param string $addressType
-+     */
-+    private function assertNewAddressFields(array $addressResponse, string $addressType = 'BillingCartAddress'): void
-+    {
-+        $assertionMap = [
-+            ['response_field' => 'firstname', 'expected_value' => 'test firstname'],
-+            ['response_field' => 'lastname', 'expected_value' => 'test lastname'],
-+            ['response_field' => 'company', 'expected_value' => 'test company'],
-+            ['response_field' => 'street', 'expected_value' => [0 => 'test street 1', 1 => 'test street 2']],
-+            ['response_field' => 'city', 'expected_value' => 'test city'],
-+            ['response_field' => 'postcode', 'expected_value' => '887766'],
-+            ['response_field' => 'telephone', 'expected_value' => '88776655'],
-+            ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
-+            ['response_field' => '__typename', 'expected_value' => $addressType]
-+        ];
-+
-+        $this->assertResponseFields($addressResponse, $assertionMap);
-+    }
-+
-+    /**
-+     * Verify the all the whitelisted fields for a Address Object
-+     *
-+     * @param array $billingAddressResponse
-+     */
-+    private function assertSavedBillingAddressFields(array $billingAddressResponse): void
-+    {
-+        $assertionMap = [
-+            ['response_field' => 'firstname', 'expected_value' => 'John'],
-+            ['response_field' => 'lastname', 'expected_value' => 'Smith'],
-+            ['response_field' => 'company', 'expected_value' => 'CompanyName'],
-+            ['response_field' => 'street', 'expected_value' => [0 => 'Green str, 67']],
-+            ['response_field' => 'city', 'expected_value' => 'CityM'],
-+            ['response_field' => 'postcode', 'expected_value' => '75477'],
-+            ['response_field' => 'telephone', 'expected_value' => '3468676'],
-+            ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
-+        ];
-+
-+        $this->assertResponseFields($billingAddressResponse, $assertionMap);
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+
-+    /**
-+     * @param string $reservedOrderId
-+     * @param int $customerId
-+     * @return string
-+     */
-+    private function assignQuoteToCustomer(
-+        string $reservedOrderId = 'test_order_with_simple_product_without_address',
-+        int $customerId = 1
-+    ): string {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-+        $quote->setCustomerId($customerId);
-+        $this->quoteResource->save($quote);
-+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php
-new file mode 100644
-index 00000000000..a4a84c2f8c7
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php
-@@ -0,0 +1,104 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setGuestEmailOnCart mutation
-+ */
-+class SetGuestEmailOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The request is not allowed for logged in customers
-+     */
-+    public function testSetGuestEmailOnCartForLoggedInCustomer()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $email = 'some@user.com';
-+
-+        $query = $this->getQuery($maskedQuoteId, $email);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The request is not allowed for logged in customers
-+     */
-+    public function testSetGuestEmailOnGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $email = 'some@user.com';
-+
-+        $query = $this->getQuery($maskedQuoteId, $email);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * Returns GraphQl mutation query for setting email address for a guest
-+     *
-+     * @param string $maskedQuoteId
-+     * @param string $email
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, string $email): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  setGuestEmailOnCart(input: {
-+    cart_id: "$maskedQuoteId"
-+    email: "$email"
-+  }) {
-+    cart {
-+      email
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflinePaymentMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflinePaymentMethodsOnCartTest.php
-new file mode 100644
-index 00000000000..0fe7aec2d63
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflinePaymentMethodsOnCartTest.php
-@@ -0,0 +1,177 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\OfflinePayments\Model\Banktransfer;
-+use Magento\OfflinePayments\Model\Cashondelivery;
-+use Magento\OfflinePayments\Model\Checkmo;
-+use Magento\OfflinePayments\Model\Purchaseorder;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting offline payment methods on cart
-+ */
-+class SetOfflinePaymentMethodsOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     *
-+     * @param string $methodCode
-+     * @param string $methodTitle
-+     * @dataProvider offlinePaymentMethodDataProvider
-+     */
-+    public function testSetOfflinePaymentMethod(string $methodCode, string $methodTitle)
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
-+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
-+
-+        $selectedPaymentMethod = $response['setPaymentMethodOnCart']['cart']['selected_payment_method'];
-+        self::assertArrayHasKey('code', $selectedPaymentMethod);
-+        self::assertEquals($methodCode, $selectedPaymentMethod['code']);
-+
-+        self::assertArrayHasKey('title', $selectedPaymentMethod);
-+        self::assertEquals($methodTitle, $selectedPaymentMethod['title']);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function offlinePaymentMethodDataProvider(): array
-+    {
-+        return [
-+            'check_mo' => [Checkmo::PAYMENT_METHOD_CHECKMO_CODE, 'Check / Money order'],
-+            'bank_transfer' => [Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE, 'Bank Transfer Payment'],
-+            'cash_on_delivery' => [Cashondelivery::PAYMENT_METHOD_CASHONDELIVERY_CODE, 'Cash On Delivery'],
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     */
-+    public function testSetPurchaseOrderPaymentMethod()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $methodTitle = 'Purchase Order';
-+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
-+        $poNumber = 'abc123';
-+
-+        $query = <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(input: {
-+    cart_id: "{$maskedQuoteId}", 
-+    payment_method: {
-+      code: "{$methodCode}"
-+      purchase_order_number: "{$poNumber}"
-+    }
-+  }) {
-+    cart {
-+      selected_payment_method {
-+        code
-+        title
-+        purchase_order_number
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
-+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
-+
-+        $selectedPaymentMethod = $response['setPaymentMethodOnCart']['cart']['selected_payment_method'];
-+        self::assertArrayHasKey('code', $selectedPaymentMethod);
-+        self::assertEquals($methodCode, $selectedPaymentMethod['code']);
-+
-+        self::assertArrayHasKey('title', $selectedPaymentMethod);
-+        self::assertEquals($methodTitle, $selectedPaymentMethod['title']);
-+
-+        self::assertArrayHasKey('purchase_order_number', $selectedPaymentMethod);
-+        self::assertEquals($poNumber, $selectedPaymentMethod['purchase_order_number']);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $methodCode
-+     * @return string
-+     */
-+    private function getQuery(
-+        string $maskedQuoteId,
-+        string $methodCode
-+    ) : string {
-+        return <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(input: {
-+    cart_id: "{$maskedQuoteId}", 
-+    payment_method: {
-+      code: "{$methodCode}"
-+    }
-+  }) {
-+    cart {
-+      selected_payment_method {
-+        code
-+        title
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
-new file mode 100644
-index 00000000000..c6c4a18bce4
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
-@@ -0,0 +1,190 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting offline shipping methods on cart
-+ */
-+class SetOfflineShippingMethodsOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
-+     *
-+     * @param string $carrierCode
-+     * @param string $methodCode
-+     * @param string $carrierTitle
-+     * @param string $methodTitle
-+     * @param array $amount
-+     * @param array $baseAmount
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     * @dataProvider offlineShippingMethodDataProvider
-+     */
-+    public function testSetOfflineShippingMethod(
-+        string $carrierCode,
-+        string $methodCode,
-+        string $carrierTitle,
-+        string $methodTitle,
-+        array $amount,
-+        array $baseAmount
-+    ) {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery(
-+            $maskedQuoteId,
-+            $methodCode,
-+            $carrierCode
-+        );
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($carrierCode, $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($carrierTitle, $shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodTitle, $shippingAddress['selected_shipping_method']['method_title']);
-+
-+        self::assertArrayHasKey('amount', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($amount, $shippingAddress['selected_shipping_method']['amount']);
-+
-+        self::assertArrayHasKey('base_amount', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($baseAmount, $shippingAddress['selected_shipping_method']['base_amount']);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function offlineShippingMethodDataProvider(): array
-+    {
-+        return [
-+            'flatrate_flatrate' => [
-+                'flatrate',
-+                'flatrate',
-+                'Flat Rate',
-+                'Fixed',
-+                ['value' => 10, 'currency' => 'USD'],
-+                ['value' => 10, 'currency' => 'USD'],
-+            ],
-+            'tablerate_bestway' => [
-+                'tablerate',
-+                'bestway',
-+                'Best Way',
-+                'Table Rate',
-+                ['value' => 10, 'currency' => 'USD'],
-+                ['value' => 10, 'currency' => 'USD'],
-+            ],
-+            'freeshipping_freeshipping' => [
-+                'freeshipping',
-+                'freeshipping',
-+                'Free Shipping',
-+                'Free',
-+                ['value' => 0, 'currency' => 'USD'],
-+                ['value' => 0, 'currency' => 'USD'],
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $shippingMethodCode
-+     * @param string $shippingCarrierCode
-+     * @return string
-+     */
-+    private function getQuery(
-+        string $maskedQuoteId,
-+        string $shippingMethodCode,
-+        string $shippingCarrierCode
-+    ): string {
-+        return <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input: 
-+    {
-+      cart_id: "$maskedQuoteId", 
-+      shipping_methods: [{
-+        carrier_code: "$shippingCarrierCode"
-+        method_code: "$shippingMethodCode"
-+      }]
-+    }) {
-+    cart {
-+      shipping_addresses {
-+        selected_shipping_method {
-+          carrier_code
-+          method_code
-+          carrier_title
-+          method_title
-+          amount {
-+            value
-+            currency
-+          }
-+          base_amount {
-+            value
-+            currency
-+          }
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php
-new file mode 100644
-index 00000000000..12fb3569042
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php
-@@ -0,0 +1,270 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Exception;
-+use Magento\Framework\Registry;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\OfflinePayments\Model\Checkmo;
-+use Magento\OfflinePayments\Model\Purchaseorder;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting payment method and placing order by customer
-+ */
-+class SetPaymentMethodAndPlaceOrderTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $orderCollectionFactory;
-+
-+    /**
-+     * @var OrderRepositoryInterface
-+     */
-+    private $orderRepository;
-+
-+    /**
-+     * @var Registry
-+     */
-+    private $registry;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+        $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
-+        $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testSetPaymentOnCartWithSimpleProduct()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('setPaymentMethodAndPlaceOrder', $response);
-+        self::assertArrayHasKey('order', $response['setPaymentMethodAndPlaceOrder']);
-+        self::assertArrayHasKey('order_id', $response['setPaymentMethodAndPlaceOrder']['order']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
-+     */
-+    public function testSetPaymentOnCartWithSimpleProductAndWithoutAddress()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testSetPaymentOnCartWithVirtualProduct()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('setPaymentMethodAndPlaceOrder', $response);
-+        self::assertArrayHasKey('order', $response['setPaymentMethodAndPlaceOrder']);
-+        self::assertArrayHasKey('order_id', $response['setPaymentMethodAndPlaceOrder']['order']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The requested Payment Method is not available.
-+     */
-+    public function testSetNonExistentPaymentMethod()
-+    {
-+        $methodCode = 'noway';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testSetPaymentOnNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetPaymentMethodToGuestCart()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetPaymentMethodToAnotherCustomerCart()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The requested Payment Method is not available.
-+     */
-+    public function testSetDisabledPaymentOnCart()
-+    {
-+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $methodCode
-+     * @return string
-+     */
-+    private function getQuery(
-+        string $maskedQuoteId,
-+        string $methodCode
-+    ) : string {
-+        return <<<QUERY
-+mutation {
-+  setPaymentMethodAndPlaceOrder(input: {
-+      cart_id: "$maskedQuoteId"
-+      payment_method: {
-+          code: "$methodCode"
-+      }
-+  }) {    
-+    order {
-+      order_id
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function tearDown()
-+    {
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', true);
-+
-+        $orderCollection = $this->orderCollectionFactory->create();
-+        foreach ($orderCollection as $order) {
-+            $this->orderRepository->delete($order);
-+        }
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', false);
-+
-+        parent::tearDown();
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
-new file mode 100644
-index 00000000000..7a1cd9edf78
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
-@@ -0,0 +1,313 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Exception;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\OfflinePayments\Model\Cashondelivery;
-+use Magento\OfflinePayments\Model\Checkmo;
-+use Magento\OfflinePayments\Model\Purchaseorder;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting payment methods on cart by customer
-+ */
-+class SetPaymentMethodOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testSetPaymentOnCartWithSimpleProduct()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
-+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
-+        self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
-+     */
-+    public function testSetPaymentOnCartWithSimpleProductAndWithoutAddress()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
-+     */
-+    public function testSetPaymentOnCartWithVirtualProduct()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
-+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
-+        self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The requested Payment Method is not available.
-+     */
-+    public function testSetNonExistentPaymentMethod()
-+    {
-+        $methodCode = 'noway';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testSetPaymentOnNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetPaymentMethodToGuestCart()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetPaymentMethodToAnotherCustomerCart()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @param string $input
-+     * @param string $message
-+     * @throws Exception
-+     * @dataProvider dataProviderSetPaymentMethodWithoutRequiredParameters
-+     */
-+    public function testSetPaymentMethodWithoutRequiredParameters(string $input, string $message)
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $input = str_replace('cart_id_value', $maskedQuoteId, $input);
-+
-+        $query = <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(
-+    input: {
-+      {$input}
-+    }
-+  ) {
-+    cart {
-+      items {
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The requested Payment Method is not available.
-+     */
-+    public function testSetDisabledPaymentOnCart()
-+    {
-+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
-+    {
-+        return [
-+            'missed_cart_id' => [
-+                'payment_method: {code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"}',
-+                'Required parameter "cart_id" is missing.'
-+            ],
-+            'missed_payment_method' => [
-+                'cart_id: "cart_id_value"',
-+                'Required parameter "code" for "payment_method" is missing.'
-+            ],
-+            'missed_payment_method_code' => [
-+                'cart_id: "cart_id_value", payment_method: {code: ""}',
-+                'Required parameter "code" for "payment_method" is missing.'
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     */
-+    public function testReSetPayment()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $methodCode = Cashondelivery::PAYMENT_METHOD_CASHONDELIVERY_CODE;
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
-+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
-+        self::assertArrayHasKey('code', $response['setPaymentMethodOnCart']['cart']['selected_payment_method']);
-+        self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $methodCode
-+     * @return string
-+     */
-+    private function getQuery(
-+        string $maskedQuoteId,
-+        string $methodCode
-+    ) : string {
-+        return <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$maskedQuoteId"
-+      payment_method: {
-+          code: "$methodCode"
-+      }
-+  }) {    
-+    cart {
-+      selected_payment_method {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php
-new file mode 100644
-index 00000000000..bff66ece59b
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php
-@@ -0,0 +1,169 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Exception;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\OfflinePayments\Model\Purchaseorder;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting Purchase Order payment method on cart by customer
-+ */
-+class SetPurchaseOrderPaymentMethodOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     */
-+    public function testSetPurchaseOrderPaymentMethodOnCartWithSimpleProduct()
-+    {
-+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
-+        $purchaseOrderNumber = '123456';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$maskedQuoteId"
-+      payment_method: {
-+          code: "$methodCode"
-+          purchase_order_number: "$purchaseOrderNumber"
-+      }
-+  }) {    
-+    cart {
-+      selected_payment_method {
-+        code
-+        purchase_order_number
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
-+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
-+        self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
-+        self::assertEquals(
-+            $purchaseOrderNumber,
-+            $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['purchase_order_number']
-+        );
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Purchase order number is a required field.
-+     */
-+    public function testSetPurchaseOrderPaymentMethodOnCartWithoutPurchaseOrderNumber()
-+    {
-+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$maskedQuoteId"
-+      payment_method: {
-+          code: "$methodCode"
-+      }
-+  }) {    
-+    cart {
-+      selected_payment_method {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The requested Payment Method is not available.
-+     */
-+    public function testSetDisabledPurchaseOrderPaymentMethodOnCart()
-+    {
-+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
-+        $purchaseOrderNumber = '123456';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$maskedQuoteId"
-+      payment_method: {
-+          code: "$methodCode"
-+          purchase_order_number: "$purchaseOrderNumber"
-+      }
-+  }) {    
-+    cart {
-+      selected_payment_method {
-+        code
-+        purchase_order_number
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
-new file mode 100644
-index 00000000000..15ee1259550
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
-@@ -0,0 +1,727 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for set shipping addresses on cart mutation
-+ */
-+class SetShippingAddressOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @var QuoteFactory
-+     */
-+    private $quoteFactory;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteIdInterface
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->quoteResource = $objectManager->get(QuoteResource::class);
-+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewShippingAddressOnCartWithSimpleProduct()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "test firstname"
-+            lastname: "test lastname"
-+            company: "test company"
-+            street: ["test street 1", "test street 2"]
-+            city: "test city"
-+            region: "test region"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        firstname
-+        lastname
-+        company
-+        street
-+        city
-+        postcode
-+        telephone
-+        country {
-+          label
-+          code
-+        }
-+        __typename
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
-+        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
-+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
-+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
-+        $this->assertNewShippingAddressFields($shippingAddressResponse);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
-+     */
-+    public function testSetNewShippingAddressOnCartWithVirtualProduct()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "test firstname"
-+            lastname: "test lastname"
-+            company: "test company"
-+            street: ["test street 1", "test street 2"]
-+            city: "test city"
-+            region: "test region"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetShippingAddressFromAddressBook()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          customer_address_id: 1
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        firstname
-+        lastname
-+        company
-+        street
-+        city
-+        postcode
-+        telephone
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
-+        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
-+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
-+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
-+        $this->assertSavedShippingAddressFields($shippingAddressResponse);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a address with ID "100"
-+     */
-+    public function testSetNonExistentShippingAddressFromAddressBook()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          customer_address_id: 100
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewShippingAddressAndFromAddressBookAtSameTime()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          customer_address_id: 1,
-+          address: {
-+            firstname: "test firstname"
-+            lastname: "test lastname"
-+            company: "test company"
-+            street: ["test street 1", "test street 2"]
-+            city: "test city"
-+            region: "test region"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        self::expectExceptionMessage(
-+            'The shipping address cannot contain "customer_address_id" and "address" at the same time.'
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Current customer does not have permission to address with ID "1"
-+     */
-+    public function testSetShippingAddressIfCustomerIsNotOwnerOfAddress()
-+    {
-+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 2);
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          customer_address_id: 1
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        postcode
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-+     *
-+     * @expectedException \Exception
-+     */
-+    public function testSetShippingAddressToAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 1);
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          customer_address_id: 1
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        postcode
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
-+     * @param string $input
-+     * @param string $message
-+     * @throws \Exception
-+     */
-+    public function testSetNewShippingAddressWithMissedRequiredParameters(string $input, string $message)
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $input = str_replace('cart_id_value', $maskedQuoteId, $input);
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      {$input}
-+    }
-+  ) {
-+    cart {
-+        shipping_addresses {
-+            city
-+          }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderUpdateWithMissedRequiredParameters(): array
-+    {
-+        return [
-+            'missed_shipping_addresses' => [
-+                'cart_id: "cart_id_value"',
-+                'Field SetShippingAddressesOnCartInput.shipping_addresses of required type [ShippingAddressInput]! ' .
-+                'was not provided.',
-+            ],
-+            'missed_city' => [
-+                'shipping_addresses: [ { address: { save_in_address_book: false } } ]',
-+                'Field CartAddressInput.city of required type String! was not provided'
-+            ],
-+            'missed_cart_id' => [
-+                'shipping_addresses: {}',
-+                'Required parameter "cart_id" is missing'
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage You cannot specify multiple shipping addresses.
-+     */
-+    public function testSetMultipleNewShippingAddresses()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "test firstname"
-+            lastname: "test lastname"
-+            company: "test company"
-+            street: ["test street 1", "test street 2"]
-+            city: "test city"
-+            region: "test region"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        },
-+        {
-+          address: {
-+            firstname: "test firstname 2"
-+            lastname: "test lastname 2"
-+            company: "test company 2"
-+            street: ["test street 1", "test street 2"]
-+            city: "test city"
-+            region: "test region"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewShippingAddressOnCartWithRedundantStreetLine()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "test firstname"
-+            lastname: "test lastname"
-+            company: "test company"
-+            street: ["test street 1", "test street 2", "test street 3"]
-+            city: "test city"
-+            region: "test region"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        firstname
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testSetShippingAddressOnNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          customer_address_id: 1
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetShippingAddressToGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: {
-+          customer_address_id: 1
-+       }
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
-+        );
-+
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetShippingAddressWithLowerCaseCountry()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "{$maskedQuoteId}"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "John"
-+            lastname: "Doe"
-+            street: ["6161 West Centinella Avenue"]
-+            city: "Culver City"
-+            region: "CA"
-+            postcode: "90230"
-+            country_code: "us"
-+            telephone: "555-555-55-55"
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        region {
-+            code
-+        }
-+        country {
-+            code
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $result = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertCount(1, $result['setShippingAddressesOnCart']['cart']['shipping_addresses']);
-+        $address = reset($result['setShippingAddressesOnCart']['cart']['shipping_addresses']);
-+
-+        $this->assertEquals('US', $address['country']['code']);
-+        $this->assertEquals('CA', $address['region']['code']);
-+    }
-+
-+    /**
-+     * Verify the all the whitelisted fields for a New Address Object
-+     *
-+     * @param array $shippingAddressResponse
-+     */
-+    private function assertNewShippingAddressFields(array $shippingAddressResponse): void
-+    {
-+        $assertionMap = [
-+            ['response_field' => 'firstname', 'expected_value' => 'test firstname'],
-+            ['response_field' => 'lastname', 'expected_value' => 'test lastname'],
-+            ['response_field' => 'company', 'expected_value' => 'test company'],
-+            ['response_field' => 'street', 'expected_value' => [0 => 'test street 1', 1 => 'test street 2']],
-+            ['response_field' => 'city', 'expected_value' => 'test city'],
-+            ['response_field' => 'postcode', 'expected_value' => '887766'],
-+            ['response_field' => 'telephone', 'expected_value' => '88776655'],
-+            ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
-+            ['response_field' => '__typename', 'expected_value' => 'ShippingCartAddress']
-+        ];
-+
-+        $this->assertResponseFields($shippingAddressResponse, $assertionMap);
-+    }
-+
-+    /**
-+     * Verify the all the whitelisted fields for a Address Object
-+     *
-+     * @param array $shippingAddressResponse
-+     */
-+    private function assertSavedShippingAddressFields(array $shippingAddressResponse): void
-+    {
-+        $assertionMap = [
-+            ['response_field' => 'firstname', 'expected_value' => 'John'],
-+            ['response_field' => 'lastname', 'expected_value' => 'Smith'],
-+            ['response_field' => 'company', 'expected_value' => 'CompanyName'],
-+            ['response_field' => 'street', 'expected_value' => [0 => 'Green str, 67']],
-+            ['response_field' => 'city', 'expected_value' => 'CityM'],
-+            ['response_field' => 'postcode', 'expected_value' => '75477'],
-+            ['response_field' => 'telephone', 'expected_value' => '3468676']
-+        ];
-+
-+        $this->assertResponseFields($shippingAddressResponse, $assertionMap);
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+
-+    /**
-+     * @param string $reservedOrderId
-+     * @param int $customerId
-+     * @return string
-+     */
-+    private function assignQuoteToCustomer(
-+        string $reservedOrderId = 'test_order_with_simple_product_without_address',
-+        int $customerId = 1
-+    ): string {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-+        $quote->setCustomerId($customerId);
-+        $this->quoteResource->save($quote);
-+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
-new file mode 100644
-index 00000000000..9ddedbfc465
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
-@@ -0,0 +1,423 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Exception;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting shipping methods on cart for customer
-+ */
-+class SetShippingMethodsOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testSetShippingMethodOnCartWithSimpleProduct()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $carrierCode = 'flatrate';
-+        $methodCode = 'flatrate';
-+
-+        $query = $this->getQuery(
-+            $maskedQuoteId,
-+            $methodCode,
-+            $carrierCode
-+        );
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('flatrate', $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('flatrate', $shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('Flat Rate', $shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('Fixed', $shippingAddress['selected_shipping_method']['method_title']);
-+
-+        self::assertArrayHasKey('amount', $shippingAddress['selected_shipping_method']);
-+        $amount = $shippingAddress['selected_shipping_method']['amount'];
-+
-+        self::assertArrayHasKey('value', $amount);
-+        self::assertEquals(10, $amount['value']);
-+        self::assertArrayHasKey('currency', $amount);
-+        self::assertEquals('USD', $amount['currency']);
-+
-+        self::assertArrayHasKey('base_amount', $shippingAddress['selected_shipping_method']);
-+        $baseAmount = $shippingAddress['selected_shipping_method']['base_amount'];
-+
-+        self::assertArrayHasKey('value', $baseAmount);
-+        self::assertEquals(10, $baseAmount['value']);
-+        self::assertArrayHasKey('currency', $baseAmount);
-+        self::assertEquals('USD', $baseAmount['currency']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testReSetShippingMethod()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $carrierCode = 'freeshipping';
-+        $methodCode = 'freeshipping';
-+
-+        $query = $this->getQuery(
-+            $maskedQuoteId,
-+            $methodCode,
-+            $carrierCode
-+        );
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($carrierCode, $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     *
-+     * @param string $input
-+     * @param string $message
-+     * @dataProvider dataProviderSetShippingMethodWithWrongParameters
-+     * @throws Exception
-+     */
-+    public function testSetShippingMethodWithWrongParameters(string $input, string $message)
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $input = str_replace('cart_id_value', $maskedQuoteId, $input);
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input:  {
-+   {$input}     
-+  }) {
-+    cart {
-+      shipping_addresses {
-+        selected_shipping_method {
-+          carrier_code
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @return array
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function dataProviderSetShippingMethodWithWrongParameters(): array
-+    {
-+        return [
-+            'missed_cart_id' => [
-+                'shipping_methods: [{
-+                    carrier_code: "flatrate"
-+                    method_code: "flatrate"
-+                }]',
-+                'Required parameter "cart_id" is missing'
-+            ],
-+            'missed_shipping_methods' => [
-+                'cart_id: "cart_id_value"',
-+                'Required parameter "shipping_methods" is missing'
-+            ],
-+            'shipping_methods_are_empty' => [
-+                'cart_id: "cart_id_value" shipping_methods: []',
-+                'Required parameter "shipping_methods" is missing'
-+            ],
-+            'missed_carrier_code' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    method_code: "flatrate"
-+                }]',
-+                'Field ShippingMethodInput.carrier_code of required type String! was not provided.'
-+            ],
-+            'empty_carrier_code' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    carrier_code: ""
-+                    method_code: "flatrate"
-+                }]',
-+                'Required parameter "carrier_code" is missing.'
-+            ],
-+            'non_existent_carrier_code' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    carrier_code: "wrong-carrier-code"
-+                    method_code: "flatrate"
-+                }]',
-+                'Carrier with such method not found: wrong-carrier-code, flatrate'
-+            ],
-+            'missed_method_code' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    carrier_code: "flatrate"
-+                }]',
-+                'Required parameter "method_code" is missing.'
-+            ],
-+            'empty_method_code' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    carrier_code: "flatrate"
-+                    method_code: ""
-+                }]',
-+                'Required parameter "method_code" is missing.'
-+            ],
-+            'non_existent_method_code' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    carrier_code: "flatrate"
-+                    method_code: "wrong-carrier-code"
-+                }]',
-+                'Carrier with such method not found: flatrate, wrong-carrier-code'
-+            ],
-+            'non_existent_shopping_cart' => [
-+                'cart_id: "non_existent_masked_id", shipping_methods: [{
-+                    carrier_code: "flatrate"
-+                    method_code: "flatrate"
-+                }]',
-+                'Could not find a cart with ID "non_existent_masked_id"'
-+            ],
-+            'disabled_shipping_method' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    carrier_code: "freeshipping"
-+                    method_code: "freeshipping"
-+                }]',
-+                'Carrier with such method not found: freeshipping, freeshipping'
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage You cannot specify multiple shipping methods.
-+     */
-+    public function testSetMultipleShippingMethods()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input:  {
-+   cart_id: "{$maskedQuoteId}", 
-+   shipping_methods: [
-+        {
-+            carrier_code: "flatrate"
-+            method_code: "flatrate"
-+        }
-+        {
-+            carrier_code: "flatrate"
-+            method_code: "flatrate"
-+        }
-+   ]
-+  }) {
-+    cart {
-+      shipping_addresses {
-+        selected_shipping_method {
-+          carrier_code
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     *
-+     * @expectedException Exception
-+     */
-+    public function testSetShippingMethodToGuestCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $carrierCode = 'flatrate';
-+        $methodCode = 'flatrate';
-+        $query = $this->getQuery(
-+            $maskedQuoteId,
-+            $methodCode,
-+            $carrierCode
-+        );
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     *
-+     * @expectedException Exception
-+     */
-+    public function testSetShippingMethodToAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $carrierCode = 'flatrate';
-+        $methodCode = 'flatrate';
-+        $query = $this->getQuery(
-+            $maskedQuoteId,
-+            $methodCode,
-+            $carrierCode
-+        );
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $shippingMethodCode
-+     * @param string $shippingCarrierCode
-+     * @return string
-+     */
-+    private function getQuery(
-+        string $maskedQuoteId,
-+        string $shippingMethodCode,
-+        string $shippingCarrierCode
-+    ): string {
-+        return <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input: 
-+    {
-+      cart_id: "$maskedQuoteId", 
-+      shipping_methods: [{
-+        carrier_code: "$shippingCarrierCode"
-+        method_code: "$shippingMethodCode"
-+      }]
-+    }) {
-+    cart {
-+      shipping_addresses {
-+        selected_shipping_method {
-+          carrier_code
-+          method_code
-+          carrier_title
-+          method_title
-+          amount {
-+            value
-+            currency
-+          }
-+          base_amount {
-+            value
-+            currency
-+          }
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The shipping method can't be set for an empty cart. Add an item to cart and try again.
-+     */
-+    public function testSetShippingMethodOnAnEmptyCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $carrierCode = 'flatrate';
-+        $methodCode = 'flatrate';
-+
-+        $query = $this->getQuery(
-+            $maskedQuoteId,
-+            $methodCode,
-+            $carrierCode
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
-new file mode 100644
-index 00000000000..48ea4ab7a15
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
-@@ -0,0 +1,334 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Customer;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for updating shopping cart items
-+ */
-+class UpdateCartItemsTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @var QuoteFactory
-+     */
-+    private $quoteFactory;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteIdInterface
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->quoteResource = $objectManager->get(QuoteResource::class);
-+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-+     */
-+    public function testUpdateCartItemQuantity()
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
-+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-+        $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
-+        $quantity = 2;
-+
-+        $query = $this->getQuery($maskedQuoteId, $itemId, $quantity);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        $this->assertArrayHasKey('updateCartItems', $response);
-+        $this->assertArrayHasKey('cart', $response['updateCartItems']);
-+
-+        $responseCart = $response['updateCartItems']['cart'];
-+        $item = current($responseCart['items']);
-+
-+        $this->assertEquals($itemId, $item['id']);
-+        $this->assertEquals($quantity, $item['quantity']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-+     */
-+    public function testRemoveCartItemIfQuantityIsZero()
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
-+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-+        $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
-+        $quantity = 0;
-+
-+        $query = $this->getQuery($maskedQuoteId, $itemId, $quantity);
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+
-+        $this->assertArrayHasKey('updateCartItems', $response);
-+        $this->assertArrayHasKey('cart', $response['updateCartItems']);
-+
-+        $responseCart = $response['updateCartItems']['cart'];
-+        $this->assertCount(0, $responseCart['items']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testUpdateItemInNonExistentCart()
-+    {
-+        $query = $this->getQuery('non_existent_masked_id', 1, 2);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-+     */
-+    public function testUpdateNonExistentItem()
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
-+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-+        $notExistentItemId = 999;
-+
-+        $this->expectExceptionMessage("Could not find cart item with id: {$notExistentItemId}.");
-+
-+        $query = $this->getQuery($maskedQuoteId, $notExistentItemId, 2);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
-+     */
-+    public function testUpdateItemIfItemIsNotBelongToCart()
-+    {
-+        $firstQuote = $this->quoteFactory->create();
-+        $this->quoteResource->load($firstQuote, 'test_order_1', 'reserved_order_id');
-+        $firstQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
-+
-+        $secondQuote = $this->quoteFactory->create();
-+        $this->quoteResource->load(
-+            $secondQuote,
-+            'test_order_with_virtual_product_without_address',
-+            'reserved_order_id'
-+        );
-+        $secondQuote->setCustomerId(1);
-+        $this->quoteResource->save($secondQuote);
-+        $secondQuoteItemId = (int)$secondQuote
-+            ->getItemByProduct($this->productRepository->get('virtual-product'))
-+            ->getId();
-+
-+        $this->expectExceptionMessage("Could not find cart item with id: {$secondQuoteItemId}.");
-+
-+        $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId, 2);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
-+     */
-+    public function testUpdateItemInGuestCart()
-+    {
-+        $guestQuote = $this->quoteFactory->create();
-+        $this->quoteResource->load(
-+            $guestQuote,
-+            'test_order_with_virtual_product_without_address',
-+            'reserved_order_id'
-+        );
-+        $guestQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$guestQuote->getId());
-+        $guestQuoteItemId = (int)$guestQuote
-+            ->getItemByProduct($this->productRepository->get('virtual-product'))
-+            ->getId();
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$guestQuoteMaskedId\""
-+        );
-+
-+        $query = $this->getQuery($guestQuoteMaskedId, $guestQuoteItemId, 2);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
-+     */
-+    public function testUpdateItemInAnotherCustomerCart()
-+    {
-+        $anotherCustomerQuote = $this->quoteFactory->create();
-+        $this->quoteResource->load(
-+            $anotherCustomerQuote,
-+            'test_order_with_virtual_product_without_address',
-+            'reserved_order_id'
-+        );
-+        $anotherCustomerQuote->setCustomerId(2);
-+        $this->quoteResource->save($anotherCustomerQuote);
-+
-+        $anotherCustomerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$anotherCustomerQuote->getId());
-+        $anotherCustomerQuoteItemId = (int)$anotherCustomerQuote
-+            ->getItemByProduct($this->productRepository->get('virtual-product'))
-+            ->getId();
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$anotherCustomerQuoteMaskedId\""
-+        );
-+
-+        $query = $this->getQuery($anotherCustomerQuoteMaskedId, $anotherCustomerQuoteItemId, 2);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing.
-+     */
-+    public function testUpdateWithMissedCartItemId()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  updateCartItems(input: {
-+    cart_items: [
-+      {
-+        cart_item_id: 1
-+        quantity: 2
-+      }
-+    ]  
-+  }) {
-+    cart {
-+      items {
-+        id
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @param string $input
-+     * @param string $message
-+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-+     */
-+    public function testUpdateWithMissedItemRequiredParameters(string $input, string $message)
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
-+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-+
-+        $query = <<<QUERY
-+mutation {
-+  updateCartItems(input: {
-+    cart_id: "{$maskedQuoteId}"
-+    {$input}
-+  }) {
-+    cart {
-+      items {
-+        id
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderUpdateWithMissedRequiredParameters(): array
-+    {
-+        return [
-+            'missed_cart_items' => [
-+                '',
-+                'Required parameter "cart_items" is missing.'
-+            ],
-+            'missed_cart_item_id' => [
-+                'cart_items: [{ quantity: 2 }]',
-+                'Required parameter "cart_item_id" for "cart_items" is missing.'
-+            ],
-+            'missed_cart_item_qty' => [
-+                'cart_items: [{ cart_item_id: 1 }]',
-+                'Required parameter "quantity" for "cart_items" is missing.'
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param int $itemId
-+     * @param float $quantity
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, int $itemId, float $quantity): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  updateCartItems(input: {
-+    cart_id: "{$maskedQuoteId}"
-+    cart_items:[
-+      {
-+        cart_item_id: {$itemId}
-+        quantity: {$quantity}
-+      }
-+    ]
-+  }) {
-+    cart {
-+      items {
-+        id
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/EditQuoteItemWithCustomOptionsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/EditQuoteItemWithCustomOptionsTest.php
-new file mode 100644
-index 00000000000..62c1ae0dab3
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/EditQuoteItemWithCustomOptionsTest.php
-@@ -0,0 +1,273 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote;
-+
-+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException as NoSuchEntityException;
-+use Magento\Quote\Model\Quote\Item;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Edit cart customizable options test
-+ */
-+class EditQuoteItemWithCustomOptionsTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var ProductCustomOptionRepositoryInterface
-+     */
-+    private $productCustomOptionsRepository;
-+
-+    /**
-+     * @var QuoteFactory
-+     */
-+    private $quoteFactory;
-+
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->productCustomOptionsRepository = $objectManager->get(ProductCustomOptionRepositoryInterface::class);
-+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-+        $this->quoteResource = $objectManager->get(QuoteResource::class);
-+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_custom_options_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product_with_options.php
-+     */
-+    public function testChangeQuoteItemCustomOptions()
-+    {
-+        $sku = 'simple_product';
-+        $quoteItemId = $this->getQuoteItemIdBySku($sku);
-+        $customOptionsValues = $this->getCustomOptionsValuesForQuery($sku);
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $customizableOptionsQuery = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
-+
-+        $query = $this->getQuery($maskedQuoteId, $quoteItemId, $customizableOptionsQuery);
-+        $response = $this->graphQlMutation($query);
-+        $itemOptionsResponse = $response['updateCartItems']['cart']['items'][0]['customizable_options'];
-+        self::assertCount(2, $itemOptionsResponse);
-+        self::assertEquals('test', $itemOptionsResponse[0]['values'][0]['value']);
-+        self::assertEquals('test', $itemOptionsResponse[1]['values'][0]['value']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_custom_options_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product_with_options.php
-+     */
-+    public function testOptionsSetPersistsOnQtyChange()
-+    {
-+        $sku = 'simple_product';
-+        $newQuantity = 2;
-+        $quoteItemId = $this->getQuoteItemIdBySku($sku);
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  updateCartItems(input: {
-+    cart_id:"$maskedQuoteId"
-+    cart_items: [
-+      {
-+        cart_item_id: $quoteItemId
-+        quantity: $newQuantity
-+      }
-+    ]
-+  }) {
-+    cart {
-+      items {
-+        quantity
-+        ... on SimpleCartItem {
-+          customizable_options {
-+            label
-+            values {
-+              value
-+            }
-+          }
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+        $cartItemResponse = $response['updateCartItems']['cart']['items'][0];
-+
-+        self::assertEquals($newQuantity, $cartItemResponse['quantity']);
-+        self::assertCount(2, $cartItemResponse['customizable_options']);
-+        self::assertEquals('initial value', $cartItemResponse['customizable_options'][0]['values'][0]['value']);
-+        self::assertEquals('initial value', $cartItemResponse['customizable_options'][1]['values'][0]['value']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_custom_options_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product_with_options.php
-+     */
-+    public function testOptionsSetChangedOnChangeOneOption()
-+    {
-+        $sku = 'simple_product';
-+        $quoteItemId = $this->getQuoteItemIdBySku($sku);
-+
-+        /* Get only the first option */
-+        $customOptionsValues = array_slice($this->getCustomOptionsValuesForQuery($sku), 0, 1);
-+
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $customizableOptionsQuery = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
-+        $query = $this->getQuery($maskedQuoteId, $quoteItemId, $customizableOptionsQuery);
-+
-+        $response = $this->graphQlMutation($query);
-+        $itemOptionsResponse = $response['updateCartItems']['cart']['items'][0]['customizable_options'];
-+        self::assertCount(1, $itemOptionsResponse);
-+        self::assertEquals('test', $itemOptionsResponse[0]['values'][0]['value']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_custom_options_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product_with_options.php
-+     */
-+    public function testOptionSetPersistsOnExtraOptionWithIncorrectId()
-+    {
-+        $sku = 'simple_product';
-+        $quoteItemId = $this->getQuoteItemIdBySku($sku);
-+        $customOptionsValues = $this->getCustomOptionsValuesForQuery($sku);
-+
-+        /* Add nonexistent option to the query */
-+        $customOptionsValues[] = ['id' => -10, 'value_string' => 'value'];
-+
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $customizableOptionsQuery = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
-+        $query = $this->getQuery($maskedQuoteId, $quoteItemId, $customizableOptionsQuery);
-+
-+        $response = $this->graphQlMutation($query);
-+        $itemOptionsResponse = $response['updateCartItems']['cart']['items'][0]['customizable_options'];
-+        self::assertCount(2, $itemOptionsResponse);
-+    }
-+
-+    /**
-+     * Returns GraphQl query for updating items in shopping cart
-+     *
-+     * @param string $maskedQuoteId
-+     * @param int $quoteItemId
-+     * @param $customizableOptionsQuery
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, int $quoteItemId, $customizableOptionsQuery): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  updateCartItems(input: {
-+    cart_id:"$maskedQuoteId"
-+    cart_items: [
-+      {
-+        cart_item_id: $quoteItemId
-+        quantity: 1
-+        customizable_options: $customizableOptionsQuery
-+      }
-+    ]
-+  }) {
-+    cart {
-+      items {
-+        quantity
-+        product {
-+          name
-+        }
-+        ... on SimpleCartItem {
-+          customizable_options {
-+            label
-+            values {
-+              label
-+              value
-+            }
-+          }
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * Returns quote item id by product's SKU
-+     *
-+     * @param string $sku
-+     * @return int
-+     * @throws NoSuchEntityException
-+     */
-+    private function getQuoteItemIdBySku(string $sku): int
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $product = $this->productRepository->get($sku);
-+        $this->quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+        /** @var Item $quoteItem */
-+        $quoteItem = $quote->getItemByProduct($product);
-+
-+        return (int)$quoteItem->getId();
-+    }
-+
-+    /**
-+     * Generate an array with test values for customizable options
-+     * based on the option type
-+     *
-+     * @param string $sku
-+     * @return array
-+     */
-+    private function getCustomOptionsValuesForQuery(string $sku): array
-+    {
-+        $customOptions = $this->productCustomOptionsRepository->getList($sku);
-+        $customOptionsValues = [];
-+
-+        foreach ($customOptions as $customOption) {
-+            $optionType = $customOption->getType();
-+            if ($optionType == 'field' || $optionType == 'area') {
-+                $customOptionsValues[] = [
-+                    'id' => (int) $customOption->getOptionId(),
-+                    'value_string' => 'test'
-+                ];
-+            } elseif ($optionType == 'drop_down') {
-+                $optionSelectValues = $customOption->getValues();
-+                $customOptionsValues[] = [
-+                    'id' => (int) $customOption->getOptionId(),
-+                    'value_string' => reset($optionSelectValues)->getOptionTypeId()
-+                ];
-+            }
-+        }
-+
-+        return $customOptionsValues;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
-new file mode 100644
-index 00000000000..1c3dc2400bf
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
-@@ -0,0 +1,159 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+
-+/**
-+ * Class GetCartMessagesTest
-+ *
-+ * @package Magento\GraphQl\Quote
-+ */
-+class GetCartMessagesTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @var QuoteFactory
-+     */
-+    private $quoteFactory;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteIdInterface
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->quoteResource = $objectManager->get(QuoteResource::class);
-+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     */
-+    public function testGetCartMessages()
-+    {
-+        $sku = 'simple';
-+        $qty = 1;
-+        $maskedQuoteId = $this->getMaskedQuoteId();
-+
-+        $queryAddProduct = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
-+        $this->graphQlQuery($queryAddProduct);
-+
-+        $product = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+        $productId = $product->getIdBySku($sku);
-+        $product->load($productId);
-+        $product->setStockData(['is_in_stock' => 0]);
-+        $product->save();
-+
-+        $queryGetMessages = $this->getCartMessagesQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($queryGetMessages);
-+        self::assertEquals('Some of the products are out of stock.', $response['getCartMessages']['messages'][0]);
-+    }
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing.
-+     */
-+    public function testRequiredParamMissing()
-+    {
-+        $maskedQuoteId = '';
-+
-+        $query = $this->getCartMessagesQuery($maskedQuoteId);
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Requested cart hasn't errors.
-+     */
-+    public function testCartWithoutErrors()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteId();
-+
-+        $query = $this->getCartMessagesQuery($maskedQuoteId);
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @return string
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    public function getMaskedQuoteId() : string
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
-+
-+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    public function getCartMessagesQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+mutation {  
-+  getCartMessages(
-+    input: {
-+      cart_id: "{$maskedQuoteId}"
-+    }
-+  ){
-+      messages
-+  }
-+}  
-+QUERY;
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $sku
-+     * @param int $qty
-+     * @return string
-+     */
-+    public function getAddSimpleProductQuery(string $maskedQuoteId, string $sku, int $qty) : string
-+    {
-+        return <<<QUERY
-+mutation {  
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "{$maskedQuoteId}", 
-+      cartItems: [
-+        {
-+          data: {
-+            qty: $qty
-+            sku: "$sku"
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      items {
-+        qty
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
-new file mode 100644
-index 00000000000..9bb9bef9bdb
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
-@@ -0,0 +1,64 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote;
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+
-+/**
-+ * Get masked quote id by reserved order id
-+ */
-+class GetMaskedQuoteIdByReservedOrderId
-+{
-+    /**
-+     * @var QuoteFactory
-+     */
-+    private $quoteFactory;
-+
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteIdInterface
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    /**
-+     * @param QuoteFactory $quoteFactory
-+     * @param QuoteResource $quoteResource
-+     * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedId
-+     */
-+    public function __construct(
-+        QuoteFactory $quoteFactory,
-+        QuoteResource $quoteResource,
-+        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedId
-+    ) {
-+        $this->quoteFactory = $quoteFactory;
-+        $this->quoteResource = $quoteResource;
-+        $this->quoteIdToMaskedId = $quoteIdToMaskedId;
-+    }
-+
-+    /**
-+     * Get masked quote id by reserved order id
-+     *
-+     * @param string $reservedOrderId
-+     * @return string
-+     * @throws NoSuchEntityException
-+     */
-+    public function execute(string $reservedOrderId): string
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-+
-+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php
-new file mode 100644
-index 00000000000..6f027babc0e
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php
-@@ -0,0 +1,66 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\Quote\Model\QuoteFactory;
-+
-+/**
-+ * Get quote item id by reserved order id and product sku
-+ */
-+class GetQuoteItemIdByReservedQuoteIdAndSku
-+{
-+    /**
-+     * @var QuoteFactory
-+     */
-+    private $quoteFactory;
-+
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @param QuoteFactory $quoteFactory
-+     * @param QuoteResource $quoteResource
-+     * @param ProductRepositoryInterface $productRepository
-+     */
-+    public function __construct(
-+        QuoteFactory $quoteFactory,
-+        QuoteResource $quoteResource,
-+        ProductRepositoryInterface $productRepository
-+    ) {
-+        $this->quoteFactory = $quoteFactory;
-+        $this->quoteResource = $quoteResource;
-+        $this->productRepository = $productRepository;
-+    }
-+
-+    /**
-+     * Get quote item id by reserved order id and product sku
-+     *
-+     * @param string $reservedOrderId
-+     * @param string $sku
-+     * @return int
-+     * @throws NoSuchEntityException
-+     */
-+    public function execute(string $reservedOrderId, string $sku): int
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-+        $product = $this->productRepository->get($sku);
-+
-+        return (int)$quote->getItemByProduct($product)->getId();
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
-new file mode 100644
-index 00000000000..4deed99243f
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
-@@ -0,0 +1,240 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Exception;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Add simple product to cart testcases
-+ */
-+class AddSimpleProductToCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     */
-+    public function testAddSimpleProductToCart()
-+    {
-+        $sku = 'simple_product';
-+        $quantity = 2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+        $response = $this->graphQlMutation($query);
-+        self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
-+
-+        self::assertEquals($quantity, $response['addSimpleProductsToCart']['cart']['items'][0]['quantity']);
-+        self::assertEquals($sku, $response['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testAddSimpleProductToCartIfCartIdIsMissed()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_items: []
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testAddSimpleProductToCartIfCartIdIsEmpty()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "",
-+      cart_items: []
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_items" is missing
-+     */
-+    public function testAddSimpleProductToCartIfCartItemsAreMissed()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "cart_id"
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_items" is missing
-+     */
-+    public function testAddSimpleProductToCartIfCartItemsAreEmpty()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "cart_id",
-+      cart_items: []
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testAddProductToNonExistentCart()
-+    {
-+        $sku = 'simple_product';
-+        $quantity = 1;
-+        $maskedQuoteId = 'non_existent_masked_id';
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a product with SKU "simple_product"
-+     */
-+    public function testNonExistentProductToCart()
-+    {
-+        $sku = 'simple_product';
-+        $quantity = 1;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testAddSimpleProductToCustomerCart()
-+    {
-+        $sku = 'simple_product';
-+        $quantity = 2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $sku
-+     * @param float $quantity
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, string $sku, float $quantity): string
-+    {
-+        return <<<QUERY
-+mutation {  
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "{$maskedQuoteId}"
-+      cart_items: [
-+        {
-+          data: {
-+            quantity: $quantity
-+            sku: "$sku"
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      items {
-+        quantity
-+        product {
-+          sku
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddVirtualProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddVirtualProductToCartTest.php
-new file mode 100644
-index 00000000000..131ff0c480d
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddVirtualProductToCartTest.php
-@@ -0,0 +1,241 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Exception;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Add virtual product to cart testcases
-+ */
-+class AddVirtualProductToCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/virtual_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     */
-+    public function testAddVirtualProductToCart()
-+    {
-+        $sku = 'virtual_product';
-+        $quantity = 2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('cart', $response['addVirtualProductsToCart']);
-+        self::assertEquals($quantity, $response['addVirtualProductsToCart']['cart']['items'][0]['quantity']);
-+        self::assertEquals($sku, $response['addVirtualProductsToCart']['cart']['items'][0]['product']['sku']);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testAddVirtualProductToCartIfCartIdIsMissed()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_items: []
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testAddVirtualProductToCartIfCartIdIsEmpty()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "",
-+      cart_items: []
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_items" is missing
-+     */
-+    public function testAddVirtualProductToCartIfCartItemsAreMissed()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "cart_id"
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_items" is missing
-+     */
-+    public function testAddVirtualProductToCartIfCartItemsAreEmpty()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "cart_id",
-+      cart_items: []
-+    }
-+  ) {
-+    cart {
-+      items {
-+        id
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/virtual_product.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testAddVirtualToNonExistentCart()
-+    {
-+        $sku = 'virtual_product';
-+        $quantity = 1;
-+        $maskedQuoteId = 'non_existent_masked_id';
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a product with SKU "virtual_product"
-+     */
-+    public function testNonExistentProductToCart()
-+    {
-+        $sku = 'virtual_product';
-+        $quantity = 1;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/virtual_product.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testAddVirtualProductToCustomerCart()
-+    {
-+        $sku = 'virtual_product';
-+        $quantity = 2;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $sku
-+     * @param float $quantity
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, string $sku, float $quantity): string
-+    {
-+        return <<<QUERY
-+mutation {  
-+  addVirtualProductsToCart(
-+    input: {
-+      cart_id: "{$maskedQuoteId}"
-+      cart_items: [
-+        {
-+          data: {
-+            quantity: {$quantity}
-+            sku: "{$sku}"
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      items {
-+        quantity
-+        product {
-+          sku
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php
-new file mode 100644
-index 00000000000..1501a942023
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php
-@@ -0,0 +1,346 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\Framework\Registry;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\OfflinePayments\Model\Checkmo;
-+use Magento\Quote\Api\GuestCartRepositoryInterface;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Allow guest checkout option test
-+ */
-+class AllowGuestCheckoutOptionTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $orderCollectionFactory;
-+
-+    /**
-+     * @var OrderRepositoryInterface
-+     */
-+    private $orderRepository;
-+
-+    /**
-+     * @var Registry
-+     */
-+    private $registry;
-+
-+    /**
-+     * @var GuestCartRepositoryInterface
-+     */
-+    private $guestCartRepository;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
-+        $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
-+        $this->guestCartRepository = $objectManager->get(GuestCartRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
-+     * @magentoConfigFixture default_store checkout/options/guest_checkout 0
-+     */
-+    public function testCreateEmptyCartIfGuestCheckoutIsDisabled()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  createEmptyCart
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('createEmptyCart', $response);
-+        self::assertNotEmpty($response['createEmptyCart']);
-+
-+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
-+
-+        self::assertNotNull($guestCart->getId());
-+        self::assertNull($guestCart->getCustomer()->getId());
-+        self::assertEquals('default', $guestCart->getStore()->getCode());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
-+     * @magentoConfigFixture default_store checkout/options/guest_checkout 0
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Guest checkout is not allowed. Register a customer account or login with existing one.
-+     */
-+    public function testSetBillingAddressToGuestCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+        address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2"]
-+          city: "test city"
-+          region: "test region"
-+          postcode: "887766"
-+          country_code: "US"
-+          telephone: "88776655"
-+          save_in_address_book: false
-+        }
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
-+     * @magentoConfigFixture default_store checkout/options/guest_checkout 0
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Guest checkout is not allowed. Register a customer account or login with existing one.
-+     */
-+    public function testSetGuestEmailOnCartWithGuestCheckoutDisabled()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $email = 'some@user.com';
-+
-+        $query = <<<QUERY
-+mutation {
-+  setGuestEmailOnCart(input: {
-+    cart_id: "$maskedQuoteId"
-+    email: "$email"
-+  }) {
-+    cart {
-+      email
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
-+     * @magentoConfigFixture default_store checkout/options/guest_checkout 0
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Guest checkout is not allowed. Register a customer account or login with existing one.
-+     */
-+    public function testSetPaymentOnCartWithGuestCheckoutDisabled()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(input: {
-+    cart_id: "{$maskedQuoteId}", 
-+    payment_method: {
-+      code: "{$methodCode}"
-+    }
-+  }) {
-+    cart {
-+      selected_payment_method {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
-+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
-+        self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
-+     * @magentoConfigFixture default_store checkout/options/guest_checkout 0
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Guest checkout is not allowed. Register a customer account or login with existing one.
-+     */
-+    public function testSetNewShippingAddressOnCartWithGuestCheckoutDisabled()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "test firstname"
-+            lastname: "test lastname"
-+            company: "test company"
-+            street: ["test street 1", "test street 2"]
-+            city: "test city"
-+            region: "test region"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        firstname
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
-+     * @magentoConfigFixture default_store checkout/options/guest_checkout 0
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Guest checkout is not allowed. Register a customer account or login with existing one.
-+     */
-+    public function testSetShippingMethodOnCartWithGuestCheckoutDisabled()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $carrierCode = 'flatrate';
-+        $methodCode = 'flatrate';
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input: 
-+    {
-+      cart_id: "$maskedQuoteId", 
-+      shipping_methods: [{
-+        carrier_code: "$carrierCode"
-+        method_code: "$methodCode"
-+      }]
-+    }) {
-+    cart {
-+      shipping_addresses {
-+        selected_shipping_method {
-+          carrier_code
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
-+     * @magentoConfigFixture default_store checkout/options/guest_checkout 0
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Guest checkout is not allowed. Register a customer account or login with existing one.
-+     */
-+    public function testPlaceOrderWithGuestCheckoutDisabled()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
-+    order {
-+      order_id
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function tearDown()
-+    {
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', true);
-+
-+        $orderCollection = $this->orderCollectionFactory->create();
-+        foreach ($orderCollection as $order) {
-+            $this->orderRepository->delete($order);
-+        }
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', false);
-+
-+        parent::tearDown();
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
-new file mode 100644
-index 00000000000..35ad3ad34c7
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
-@@ -0,0 +1,213 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test Apply Coupon to Cart functionality for guest
-+ */
-+class ApplyCouponToCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-+     */
-+    public function testApplyCouponToCart()
-+    {
-+        $couponCode = '2?ds5!2d';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('applyCouponToCart', $response);
-+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage A coupon is already applied to the cart. Please remove it to apply another
-+     */
-+    public function testApplyCouponTwice()
-+    {
-+        $couponCode = '2?ds5!2d';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey("applyCouponToCart", $response);
-+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Cart does not contain products.
-+     */
-+    public function testApplyCouponToCartWithoutItems()
-+    {
-+        $couponCode = '2?ds5!2d';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @expectedException \Exception
-+     */
-+    public function testApplyCouponToCustomerCart()
-+    {
-+        $couponCode = '2?ds5!2d';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+
-+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
-+     */
-+    public function testApplyNonExistentCouponToCart()
-+    {
-+        $couponCode = 'non_existent_coupon_code';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-+     * @expectedException \Exception
-+     */
-+    public function testApplyCouponToNonExistentCart()
-+    {
-+        $couponCode = '2?ds5!2d';
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+
-+        self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * Products in cart don't fit to the coupon
-+     *
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
-+     */
-+    public function testApplyCouponWhichIsNotApplicable()
-+    {
-+        $couponCode = '2?ds5!2d';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $couponCode);
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $input
-+     * @param string $message
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
-+     * @expectedException \Exception
-+     */
-+    public function testApplyCouponWithMissedRequiredParameters(string $input, string $message)
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  applyCouponToCart(input: {{$input}}) {
-+    cart {
-+      applied_coupon {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderUpdateWithMissedRequiredParameters(): array
-+    {
-+        return [
-+            'missed_cart_id' => [
-+                'coupon_code: "test"',
-+                'Required parameter "cart_id" is missing'
-+            ],
-+            'missed_coupon_code' => [
-+                'cart_id: "test_quote"',
-+                'Required parameter "coupon_code" is missing'
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $couponCode
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, string $couponCode): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  applyCouponToCart(input: {cart_id: "$maskedQuoteId", coupon_code: "$couponCode"}) {
-+    cart {
-+      applied_coupon {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartDiscountTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartDiscountTest.php
-new file mode 100644
-index 00000000000..4dc02c343d7
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartDiscountTest.php
-@@ -0,0 +1,101 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test is getting cart discount for guest customer.
-+ */
-+class CartDiscountTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/cart_rule_discount_no_coupon.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testGetDiscountInformation()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query);
-+        $discountResponse = $response['cart']['prices']['discount'];
-+        self::assertEquals(-10, $discountResponse['amount']['value']);
-+        self::assertEquals(['50% Off for all orders'], $discountResponse['label']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/cart_rule_discount_no_coupon.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
-+     */
-+    public function testGetDiscountInformationWithTwoRulesApplied()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query);
-+        $discountResponse = $response['cart']['prices']['discount'];
-+        self::assertEquals(-15, $discountResponse['amount']['value']);
-+        self::assertEquals(['50% Off for all orders', '5$ fixed discount on whole cart'], $discountResponse['label']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testGetDiscountInformationWithNoRulesApplied()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query);
-+        self::assertEquals(null, $response['cart']['prices']['discount']);
-+    }
-+
-+    /**
-+     * Generates GraphQl query for retrieving cart discount.
-+     *
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "$maskedQuoteId") {
-+    prices {
-+      discount {
-+        label
-+        amount {
-+          value
-+          currency
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
-new file mode 100644
-index 00000000000..7eb09cf301b
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
-@@ -0,0 +1,167 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test getting cart totals for guest
-+ */
-+class CartTotalsTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testGetCartTotalsWithTaxApplied()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('prices', $response['cart']);
-+        $pricesResponse = $response['cart']['prices'];
-+        self::assertEquals(21.5, $pricesResponse['grand_total']['value']);
-+        self::assertEquals(21.5, $pricesResponse['subtotal_including_tax']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_excluding_tax']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
-+
-+        $appliedTaxesResponse = $pricesResponse['applied_taxes'];
-+
-+        self::assertEquals('US-TEST-*-Rate-1', $appliedTaxesResponse[0]['label']);
-+        self::assertEquals(1.5, $appliedTaxesResponse[0]['amount']['value']);
-+        self::assertEquals('USD', $appliedTaxesResponse[0]['amount']['currency']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testGetTotalsWithNoTaxApplied()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query);
-+
-+        $pricesResponse = $response['cart']['prices'];
-+        self::assertEquals(20, $pricesResponse['grand_total']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_including_tax']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_excluding_tax']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
-+        self::assertEmpty($pricesResponse['applied_taxes']);
-+    }
-+
-+    /**
-+     * The totals calculation is based on quote address.
-+     * But the totals should be calculated even if no address is set
-+     *
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testGetCartTotalsWithNoAddressSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query);
-+
-+        $pricesResponse = $response['cart']['prices'];
-+        self::assertEquals(20, $pricesResponse['grand_total']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_including_tax']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_excluding_tax']['value']);
-+        self::assertEquals(20, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
-+        self::assertEmpty($pricesResponse['applied_taxes']);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testGetSelectedShippingMethodFromCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * Generates GraphQl query for retrieving cart totals
-+     *
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "$maskedQuoteId") {
-+    prices {
-+      grand_total {
-+        value,
-+        currency
-+      }
-+      subtotal_including_tax {
-+        value
-+        currency
-+      }
-+      subtotal_excluding_tax {
-+        value
-+        currency
-+      }
-+      subtotal_with_discount_excluding_tax {
-+        value
-+        currency
-+      }
-+      applied_taxes {
-+        label
-+        amount {
-+          value
-+          currency
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php
-new file mode 100644
-index 00000000000..ed5aa9303d8
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php
-@@ -0,0 +1,438 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\Quote\Model\QuoteIdMaskFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\Framework\Registry;
-+use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory as QuoteCollectionFactory;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * End to checkout tests for guest
-+ */
-+class CheckoutEndToEndTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var Registry
-+     */
-+    private $registry;
-+
-+    /**
-+     * @var QuoteCollectionFactory
-+     */
-+    private $quoteCollectionFactory;
-+
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @var QuoteIdMaskFactory
-+     */
-+    private $quoteIdMaskFactory;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $orderCollectionFactory;
-+
-+    /**
-+     * @var OrderRepositoryInterface
-+     */
-+    private $orderRepository;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->registry = $objectManager->get(Registry::class);
-+        $this->quoteCollectionFactory = $objectManager->get(QuoteCollectionFactory::class);
-+        $this->quoteResource = $objectManager->get(QuoteResource::class);
-+        $this->quoteIdMaskFactory = $objectManager->get(QuoteIdMaskFactory::class);
-+        $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
-+        $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute.php
-+     */
-+    public function testCheckoutWorkflow()
-+    {
-+        $quantity = 2;
-+
-+        $sku = $this->findProduct();
-+        $cartId = $this->createEmptyCart();
-+        $this->setGuestEmailOnCart($cartId);
-+        $this->addProductToCart($cartId, $quantity, $sku);
-+
-+        $this->setBillingAddress($cartId);
-+        $shippingMethod = $this->setShippingAddress($cartId);
-+
-+        $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
-+        $this->setPaymentMethod($cartId, $paymentMethod);
-+
-+        $this->placeOrder($cartId);
-+    }
-+
-+    /**
-+     * @return string
-+     */
-+    private function findProduct(): string
-+    {
-+        $query = <<<QUERY
-+{
-+  products (
-+    filter: {
-+      sku: {
-+        like:"simple%"
-+      }
-+    }
-+    pageSize: 1
-+    currentPage: 1
-+  ) {
-+    items {
-+      sku
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+        self::assertArrayHasKey('products', $response);
-+        self::assertArrayHasKey('items', $response['products']);
-+        self::assertCount(1, $response['products']['items']);
-+
-+        $product = current($response['products']['items']);
-+        self::assertArrayHasKey('sku', $product);
-+        self::assertNotEmpty($product['sku']);
-+
-+        return $product['sku'];
-+    }
-+
-+    /**
-+     * @return string
-+     */
-+    private function createEmptyCart(): string
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  createEmptyCart
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+        self::assertArrayHasKey('createEmptyCart', $response);
-+        self::assertNotEmpty($response['createEmptyCart']);
-+
-+        return $response['createEmptyCart'];
-+    }
-+
-+    /**
-+     * @param string $cartId
-+     * @return void
-+     */
-+    private function setGuestEmailOnCart(string $cartId): void
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  setGuestEmailOnCart(
-+    input: {
-+      cart_id: "{$cartId}"
-+      email: "customer@example.com"
-+    }
-+  ) {
-+    cart {
-+      email
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $cartId
-+     * @param float $quantity
-+     * @param string $sku
-+     * @return void
-+     */
-+    private function addProductToCart(string $cartId, float $quantity, string $sku): void
-+    {
-+        $query = <<<QUERY
-+mutation {  
-+  addSimpleProductsToCart(
-+    input: {
-+      cart_id: "{$cartId}"
-+      cart_items: [
-+        {
-+          data: {
-+            quantity: {$quantity}
-+            sku: "{$sku}"
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      items {
-+        quantity
-+        product {
-+          sku
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $cartId
-+     * @param array $auth
-+     * @return array
-+     */
-+    private function setBillingAddress(string $cartId): void
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "{$cartId}"
-+      billing_address: {
-+         address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2"]
-+          city: "test city"
-+          postcode: "887766"
-+          telephone: "88776655"
-+          region: "TX"
-+          country_code: "US"
-+          save_in_address_book: false
-+         }
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        __typename
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $cartId
-+     * @return array
-+     */
-+    private function setShippingAddress(string $cartId): array
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$cartId"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "test firstname"
-+            lastname: "test lastname"
-+            company: "test company"
-+            street: ["test street 1", "test street 2"]
-+            city: "test city"
-+            region: "TX"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        available_shipping_methods {
-+          carrier_code
-+          method_code
-+          amount {
-+            value
-+          }
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+        self::assertArrayHasKey('setShippingAddressesOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingAddressesOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingAddressesOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingAddressesOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('available_shipping_methods', $shippingAddress);
-+        self::assertCount(1, $shippingAddress['available_shipping_methods']);
-+
-+        $availableShippingMethod = current($shippingAddress['available_shipping_methods']);
-+        self::assertArrayHasKey('carrier_code', $availableShippingMethod);
-+        self::assertNotEmpty($availableShippingMethod['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $availableShippingMethod);
-+        self::assertNotEmpty($availableShippingMethod['method_code']);
-+
-+        self::assertArrayHasKey('amount', $availableShippingMethod);
-+        self::assertArrayHasKey('value', $availableShippingMethod['amount']);
-+        self::assertNotEmpty($availableShippingMethod['amount']['value']);
-+
-+        return $availableShippingMethod;
-+    }
-+
-+    /**
-+     * @param string $cartId
-+     * @param array $method
-+     * @return array
-+     */
-+    private function setShippingMethod(string $cartId, array $method): array
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input:  {
-+    cart_id: "{$cartId}", 
-+    shipping_methods: [
-+      {
-+         carrier_code: "{$method['carrier_code']}"
-+         method_code: "{$method['method_code']}"
-+      }
-+    ]
-+  }) {
-+    cart {
-+      available_payment_methods {
-+        code
-+        title
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('available_payment_methods', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['available_payment_methods']);
-+
-+        $availablePaymentMethod = current($response['setShippingMethodsOnCart']['cart']['available_payment_methods']);
-+        self::assertArrayHasKey('code', $availablePaymentMethod);
-+        self::assertNotEmpty($availablePaymentMethod['code']);
-+        self::assertArrayHasKey('title', $availablePaymentMethod);
-+        self::assertNotEmpty($availablePaymentMethod['title']);
-+
-+        return $availablePaymentMethod;
-+    }
-+
-+    /**
-+     * @param string $cartId
-+     * @param array $method
-+     * @return void
-+     */
-+    private function setPaymentMethod(string $cartId, array $method): void
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(
-+    input: {
-+      cart_id: "{$cartId}"
-+      payment_method: {
-+        code: "{$method['code']}"
-+      }
-+    }
-+  ) {
-+    cart {
-+      selected_payment_method {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $cartId
-+     * @return void
-+     */
-+    private function placeOrder(string $cartId): void
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  placeOrder(
-+    input: {
-+      cart_id: "{$cartId}"
-+    }
-+  ) {
-+    order {
-+      order_id
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+        self::assertArrayHasKey('placeOrder', $response);
-+        self::assertArrayHasKey('order', $response['placeOrder']);
-+        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-+        self::assertNotEmpty($response['placeOrder']['order']['order_id']);
-+    }
-+
-+    public function tearDown()
-+    {
-+        $this->deleteQuote();
-+        $this->deleteOrder();
-+        parent::tearDown();
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    private function deleteQuote(): void
-+    {
-+        $quoteCollection = $this->quoteCollectionFactory->create();
-+        foreach ($quoteCollection as $quote) {
-+            $this->quoteResource->delete($quote);
-+
-+            $quoteIdMask = $this->quoteIdMaskFactory->create();
-+            $quoteIdMask->setQuoteId($quote->getId())
-+                ->delete();
-+        }
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    private function deleteOrder()
-+    {
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', true);
-+
-+        $orderCollection = $this->orderCollectionFactory->create();
-+        foreach ($orderCollection as $order) {
-+            $this->orderRepository->delete($order);
-+        }
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', false);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
-new file mode 100644
-index 00000000000..6ed91d21f0a
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
-@@ -0,0 +1,169 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\Quote\Model\QuoteIdMaskFactory;
-+use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory as QuoteCollectionFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\Quote\Api\GuestCartRepositoryInterface;
-+
-+/**
-+ * Test for empty cart creation mutation
-+ */
-+class CreateEmptyCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GuestCartRepositoryInterface
-+     */
-+    private $guestCartRepository;
-+
-+    /**
-+     * @var QuoteCollectionFactory
-+     */
-+    private $quoteCollectionFactory;
-+
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @var QuoteIdMaskFactory
-+     */
-+    private $quoteIdMaskFactory;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->guestCartRepository = $objectManager->get(GuestCartRepositoryInterface::class);
-+        $this->quoteCollectionFactory = $objectManager->get(QuoteCollectionFactory::class);
-+        $this->quoteResource = $objectManager->get(QuoteResource::class);
-+        $this->quoteIdMaskFactory = $objectManager->get(QuoteIdMaskFactory::class);
-+    }
-+
-+    public function testCreateEmptyCart()
-+    {
-+        $query = $this->getQuery();
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('createEmptyCart', $response);
-+        self::assertNotEmpty($response['createEmptyCart']);
-+
-+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
-+
-+        self::assertNotNull($guestCart->getId());
-+        self::assertNull($guestCart->getCustomer()->getId());
-+        self::assertEquals('default', $guestCart->getStore()->getCode());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
-+     */
-+    public function testCreateEmptyCartWithNotDefaultStore()
-+    {
-+        $query = $this->getQuery();
-+        $headerMap = ['Store' => 'fixture_second_store'];
-+        $response = $this->graphQlMutation($query, [], '', $headerMap);
-+
-+        self::assertArrayHasKey('createEmptyCart', $response);
-+        self::assertNotEmpty($response['createEmptyCart']);
-+
-+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
-+        $this->maskedQuoteId = $response['createEmptyCart'];
-+
-+        self::assertNotNull($guestCart->getId());
-+        self::assertNull($guestCart->getCustomer()->getId());
-+        self::assertSame('fixture_second_store', $guestCart->getStore()->getCode());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testCreateEmptyCartWithPredefinedCartId()
-+    {
-+        $predefinedCartId = '572cda51902b5b517c0e1a2b2fd004b4';
-+
-+        $query = <<<QUERY
-+mutation {
-+  createEmptyCart (input: {cart_id: "{$predefinedCartId}"})
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('createEmptyCart', $response);
-+        self::assertEquals($predefinedCartId, $response['createEmptyCart']);
-+
-+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
-+        self::assertNotNull($guestCart->getId());
-+        self::assertNull($guestCart->getCustomer()->getId());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Cart with ID "572cda51902b5b517c0e1a2b2fd004b4" already exists.
-+     */
-+    public function testCreateEmptyCartIfPredefinedCartIdAlreadyExists()
-+    {
-+        $predefinedCartId = '572cda51902b5b517c0e1a2b2fd004b4';
-+
-+        $query = <<<QUERY
-+mutation {
-+  createEmptyCart (input: {cart_id: "{$predefinedCartId}"})
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Cart ID length should to be 32 symbols.
-+     */
-+    public function testCreateEmptyCartWithWrongPredefinedCartId()
-+    {
-+        $predefinedCartId = '572';
-+
-+        $query = <<<QUERY
-+mutation {
-+  createEmptyCart (input: {cart_id: "{$predefinedCartId}"})
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @return string
-+     */
-+    private function getQuery(): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  createEmptyCart
-+}
-+QUERY;
-+    }
-+
-+    public function tearDown()
-+    {
-+        $quoteCollection = $this->quoteCollectionFactory->create();
-+        foreach ($quoteCollection as $quote) {
-+            $this->quoteResource->delete($quote);
-+
-+            $quoteIdMask = $this->quoteIdMaskFactory->create();
-+            $quoteIdMask->setQuoteId($quote->getId())
-+                ->delete();
-+        }
-+        parent::tearDown();
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
-new file mode 100644
-index 00000000000..af1f72fe716
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
-@@ -0,0 +1,117 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for getting cart information
-+ */
-+class GetAvailablePaymentMethodsTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetAvailablePaymentMethods()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('available_payment_methods', $response['cart']);
-+
-+        self::assertEquals('checkmo', $response['cart']['available_payment_methods'][0]['code']);
-+        self::assertEquals('Check / Money order', $response['cart']['available_payment_methods'][0]['title']);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetAvailablePaymentMethodsFromCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php
-+     */
-+    public function testGetAvailablePaymentMethodsIfPaymentsAreNotPresent()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('available_payment_methods', $response['cart']);
-+        self::assertEmpty($response['cart']['available_payment_methods']);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetAvailablePaymentMethodsOfNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "$maskedQuoteId") {
-+    available_payment_methods {
-+      code
-+      title
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
-new file mode 100644
-index 00000000000..8703a690c62
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
-@@ -0,0 +1,168 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types = 1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for get available shipping methods
-+ */
-+class GetAvailableShippingMethodsTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * Test case: get available shipping methods from current customer quote
-+     *
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetAvailableShippingMethods()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $response = $this->graphQlQuery($this->getQuery($maskedQuoteId));
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
-+        self::assertCount(1, $response['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('available_shipping_methods', $response['cart']['shipping_addresses'][0]);
-+        self::assertCount(1, $response['cart']['shipping_addresses'][0]['available_shipping_methods']);
-+
-+        $expectedAddressData = [
-+            'amount' => [
-+                'value' => 10,
-+                'currency' => 'USD',
-+            ],
-+            'base_amount' => [
-+                'value' => 10,
-+                'currency' => 'USD',
-+            ],
-+            'carrier_code' => 'flatrate',
-+            'carrier_title' => 'Flat Rate',
-+            'error_message' => '',
-+            'method_code' => 'flatrate',
-+            'method_title' => 'Fixed',
-+            'price_incl_tax' => [
-+                'value' => 10,
-+                'currency' => 'USD',
-+            ],
-+            'price_excl_tax' => [
-+                'value' => 10,
-+                'currency' => 'USD',
-+            ],
-+        ];
-+        self::assertEquals(
-+            $expectedAddressData,
-+            $response['cart']['shipping_addresses'][0]['available_shipping_methods'][0]
-+        );
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetAvailableShippingMethodsFromCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($this->getQuery($maskedQuoteId));
-+    }
-+
-+    /**
-+     * Test case: get available shipping methods when all shipping methods are disabled
-+     *
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php
-+     */
-+    public function testGetAvailableShippingMethodsIfShippingMethodsAreNotPresent()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $response = $this->graphQlQuery($this->getQuery($maskedQuoteId));
-+
-+        self::assertEmpty($response['cart']['shipping_addresses'][0]['available_shipping_methods']);
-+    }
-+
-+    /**
-+     * Test case: get available shipping methods from non-existent cart
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetAvailableShippingMethodsOfNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+query {
-+  cart (cart_id: "{$maskedQuoteId}") {
-+    shipping_addresses {
-+        available_shipping_methods {
-+          amount {
-+            value
-+            currency
-+          }
-+          base_amount {
-+            value
-+            currency
-+          }
-+          carrier_code
-+          carrier_title
-+          error_message
-+          method_code
-+          method_title
-+          price_excl_tax {
-+            value
-+            currency
-+          }
-+          price_incl_tax {
-+            value
-+            currency
-+          }
-+        }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartEmailTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartEmailTest.php
-new file mode 100644
-index 00000000000..8c6ecd07504
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartEmailTest.php
-@@ -0,0 +1,88 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for getting email from cart
-+ */
-+class GetCartEmailTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     */
-+    public function testGetCartEmail()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->assertArrayHasKey('cart', $response);
-+        $this->assertArrayHasKey('email', $response['cart']);
-+        $this->assertEquals('guest@example.com', $response['cart']['email']);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetCartEmailFromNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testGetCartEmailFromCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
-+        );
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id:"$maskedQuoteId") {    
-+    email
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
-new file mode 100644
-index 00000000000..d39f1b42459
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
-@@ -0,0 +1,198 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Exception;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for getting cart information
-+ */
-+class GetCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
-+     */
-+    public function testGetCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('items', $response['cart']);
-+        self::assertCount(2, $response['cart']['items']);
-+
-+        self::assertNotEmpty($response['cart']['items'][0]['id']);
-+        self::assertEquals(2, $response['cart']['items'][0]['quantity']);
-+        self::assertEquals('simple_product', $response['cart']['items'][0]['product']['sku']);
-+
-+        self::assertNotEmpty($response['cart']['items'][1]['id']);
-+        self::assertEquals(2, $response['cart']['items'][1]['quantity']);
-+        self::assertEquals('virtual-product', $response['cart']['items'][1]['product']['sku']);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testGetCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
-+        );
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testGetCartIfCartIdIsEmpty()
-+    {
-+        $maskedQuoteId = '';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Field "cart" argument "cart_id" of type "String!" is required but not provided.
-+     */
-+    public function testGetCartIfCartIdIsMissed()
-+    {
-+        $query = <<<QUERY
-+{
-+  cart {
-+    email
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_cart_inactive.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Current user does not have an active cart.
-+     */
-+    public function testGetInactiveCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_guest_not_default_store.php
-+     */
-+    public function testGetCartWithNotDefaultStore()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store_guest');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $headerMap = ['Store' => 'fixture_second_store'];
-+        $response = $this->graphQlQuery($query, [], '', $headerMap);
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('items', $response['cart']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Wrong store code specified for cart
-+     */
-+    public function testGetCartWithWrongStore()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $headerMap = ['Store' => 'fixture_second_store'];
-+        $this->graphQlQuery($query, [], '', $headerMap);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_guest_not_default_store.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Requested store is not found
-+     */
-+    public function testGetCartWithNotExistingStore()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store_guest');
-+
-+        $headerMap['Store'] = 'not_existing_store';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlQuery($query, [], '', $headerMap);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "{$maskedQuoteId}") {
-+    items {
-+      id
-+      quantity
-+      product {
-+        sku
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedPaymentMethodTest.php
-new file mode 100644
-index 00000000000..a918279bada
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedPaymentMethodTest.php
-@@ -0,0 +1,125 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for getting selected payment method from cart
-+ */
-+class GetSelectedPaymentMethodTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     *
-+     */
-+    public function testGetSelectedPaymentMethod()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->assertArrayHasKey('cart', $response);
-+        $this->assertArrayHasKey('selected_payment_method', $response['cart']);
-+        $this->assertArrayHasKey('code', $response['cart']['selected_payment_method']);
-+        $this->assertEquals('checkmo', $response['cart']['selected_payment_method']['code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetSelectedPaymentMethodBeforeSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query);
-+
-+        $this->assertArrayHasKey('cart', $response);
-+        $this->assertArrayHasKey('selected_payment_method', $response['cart']);
-+        $this->assertArrayHasKey('code', $response['cart']['selected_payment_method']);
-+        $this->assertEquals('', $response['cart']['selected_payment_method']['code']);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     */
-+    public function testGetSelectedPaymentMethodFromNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            'Could not find a cart with ID "non_existent_masked_id"'
-+        );
-+
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     */
-+    public function testGetSelectedPaymentMethodFromCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
-+        );
-+
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id:"$maskedQuoteId") {    
-+    selected_payment_method {
-+      code
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
-new file mode 100644
-index 00000000000..5d1033b3981
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
-@@ -0,0 +1,208 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for get selected shipping method
-+ */
-+class GetSelectedShippingMethodTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testGetSelectedShippingMethod()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
-+        self::assertCount(1, $response['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('flatrate', $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('flatrate', $shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('Flat Rate', $shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('Fixed', $shippingAddress['selected_shipping_method']['method_title']);
-+
-+        self::assertArrayHasKey('amount', $shippingAddress['selected_shipping_method']);
-+        $amount = $shippingAddress['selected_shipping_method']['amount'];
-+
-+        self::assertArrayHasKey('value', $amount);
-+        self::assertEquals(10, $amount['value']);
-+        self::assertArrayHasKey('currency', $amount);
-+        self::assertEquals('USD', $amount['currency']);
-+
-+        self::assertArrayHasKey('base_amount', $shippingAddress['selected_shipping_method']);
-+        $baseAmount = $shippingAddress['selected_shipping_method']['base_amount'];
-+
-+        self::assertArrayHasKey('value', $baseAmount);
-+        self::assertEquals(10, $baseAmount['value']);
-+        self::assertArrayHasKey('currency', $baseAmount);
-+        self::assertEquals('USD', $baseAmount['currency']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetSelectedShippingMethodBeforeSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
-+        self::assertCount(1, $response['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['method_title']);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testGetSelectedShippingMethodFromCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetGetSelectedShippingMethodIfShippingMethodIsNotSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
-+        self::assertCount(1, $response['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertNull($shippingAddress['selected_shipping_method']['carrier_code']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['method_code']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['carrier_title']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['method_title']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['amount']);
-+        self::assertNull($shippingAddress['selected_shipping_method']['base_amount']);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetSelectedShippingMethodOfNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "$maskedQuoteId") {
-+    shipping_addresses {
-+      available_shipping_methods {
-+        carrier_code
-+        method_code
-+      }
-+      selected_shipping_method {
-+        carrier_code
-+        method_code
-+        carrier_title
-+        method_title
-+        amount {
-+            value
-+            currency
-+        }
-+        base_amount {
-+            value
-+            currency
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php
-new file mode 100644
-index 00000000000..8ddf1641ede
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php
-@@ -0,0 +1,170 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for get specified billing address
-+ */
-+class GetSpecifiedBillingAddressTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testGetSpecifiedBillingAddress()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $response = $this->graphQlQuery($query);
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('billing_address', $response['cart']);
-+
-+        $expectedBillingAddressData = [
-+            'firstname' => 'John',
-+            'lastname' => 'Smith',
-+            'company' => 'CompanyName',
-+            'street' => [
-+                'Green str, 67'
-+            ],
-+            'city' => 'CityM',
-+            'region' => [
-+                'code' => 'AL',
-+                'label' => 'Alabama',
-+            ],
-+            'postcode' => '75477',
-+            'country' => [
-+                'code' => 'US',
-+                'label' => 'US',
-+            ],
-+            'telephone' => '3468676',
-+            '__typename' => 'BillingCartAddress',
-+        ];
-+        self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testGetSpecifiedBillingAddressIfBillingAddressIsNotSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $response = $this->graphQlQuery($query);
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('billing_address', $response['cart']);
-+
-+        $expectedBillingAddressData = [
-+            'firstname' => null,
-+            'lastname' => null,
-+            'company' => null,
-+            'street' => [
-+                ''
-+            ],
-+            'city' => null,
-+            'region' => [
-+                'code' => null,
-+                'label' => null,
-+            ],
-+            'postcode' => null,
-+            'country' => [
-+                'code' => null,
-+                'label' => null,
-+            ],
-+            'telephone' => null,
-+            '__typename' => 'BillingCartAddress',
-+        ];
-+        self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetBillingAddressOfNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testGetBillingAddressFromAnotherCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "$maskedQuoteId") {
-+    billing_address {
-+      firstname
-+      lastname
-+      company
-+      street
-+      city
-+      region 
-+      {
-+        code
-+        label
-+      }
-+      postcode
-+      country 
-+      {
-+        code
-+        label
-+      }
-+      telephone
-+      __typename
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedShippingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedShippingAddressTest.php
-new file mode 100644
-index 00000000000..f71915bab65
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedShippingAddressTest.php
-@@ -0,0 +1,171 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for get specified shipping address
-+ */
-+class GetSpecifiedShippingAddressTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetSpecifiedShippingAddress()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $response = $this->graphQlQuery($query);
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
-+
-+        $expectedShippingAddressData = [
-+            'firstname' => 'John',
-+            'lastname' => 'Smith',
-+            'company' => 'CompanyName',
-+            'street' => [
-+                'Green str, 67'
-+            ],
-+            'city' => 'CityM',
-+            'region' => [
-+                'code' => 'AL',
-+                'label' => 'Alabama',
-+            ],
-+            'postcode' => '75477',
-+            'country' => [
-+                'code' => 'US',
-+                'label' => 'US',
-+            ],
-+            'telephone' => '3468676',
-+            '__typename' => 'ShippingCartAddress',
-+        ];
-+        self::assertEquals($expectedShippingAddressData, current($response['cart']['shipping_addresses']));
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testGetSpecifiedShippingAddressIfShippingAddressIsNotSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $response = $this->graphQlQuery($query);
-+        self::assertArrayHasKey('cart', $response);
-+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
-+
-+        $expectedShippingAddressData = [
-+            'firstname' => null,
-+            'lastname' => null,
-+            'company' => null,
-+            'street' => [
-+                ''
-+            ],
-+            'city' => null,
-+            'region' => [
-+                'code' => null,
-+                'label' => null,
-+            ],
-+            'postcode' => null,
-+            'country' => [
-+                'code' => null,
-+                'label' => null,
-+            ],
-+            'telephone' => null,
-+            '__typename' => 'ShippingCartAddress',
-+        ];
-+        self::assertEquals($expectedShippingAddressData, current($response['cart']['shipping_addresses']));
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testGetShippingAddressOfNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testGetShippingAddressFromCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+{
-+  cart(cart_id: "$maskedQuoteId") {
-+    shipping_addresses {
-+      firstname
-+      lastname
-+      company
-+      street
-+      city
-+      region 
-+      {
-+        code
-+        label
-+      }
-+      postcode
-+      country 
-+      {
-+        code
-+        label
-+      }
-+      telephone
-+      __typename
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
-new file mode 100644
-index 00000000000..cbfad81b130
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
-@@ -0,0 +1,307 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Exception;
-+use Magento\Framework\Registry;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for placing an order for guest
-+ */
-+class PlaceOrderTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $orderCollectionFactory;
-+
-+    /**
-+     * @var OrderRepositoryInterface
-+     */
-+    private $orderRepository;
-+
-+    /**
-+     * @var Registry
-+     */
-+    private $registry;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
-+        $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     */
-+    public function testPlaceOrder()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('placeOrder', $response);
-+        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-+        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testPlaceOrderIfCartIdIsEmpty()
-+    {
-+        $maskedQuoteId = '';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testPlaceOrderIfCartIdIsMissed()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  placeOrder(input: {}) {
-+    order {
-+      order_id
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Guest email for cart is missing.
-+     */
-+    public function testPlaceOrderWithNoEmail()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     */
-+    public function testPlaceOrderWithNoItemsInCart()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessage(
-+            'Unable to place order: A server error stopped your order from being placed. ' .
-+            'Please try to place your order again'
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testPlaceOrderWithNoShippingAddress()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessage(
-+            'Unable to place order: Some addresses can\'t be used due to the configurations for specific countries'
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testPlaceOrderWithNoShippingMethod()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessage(
-+            'Unable to place order: The shipping method is missing. Select the shipping method and try again'
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testPlaceOrderWithNoBillingAddress()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessageRegExp(
-+            '/Unable to place order: Please check the billing address information*/'
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testPlaceOrderWithNoPaymentMethod()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessage('Unable to place order: Enter a valid payment method and try again');
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
-+     */
-+    public function testPlaceOrderWithOutOfStockProduct()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessage('Unable to place order: Some of the products are out of stock');
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     */
-+    public function testPlaceOrderOfCustomerCart()
-+    {
-+        $reservedOrderId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessageRegExp('/The current user cannot perform operations on cart*/');
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
-+    order {
-+      order_id
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function tearDown()
-+    {
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', true);
-+
-+        $orderCollection = $this->orderCollectionFactory->create();
-+        foreach ($orderCollection as $order) {
-+            $this->orderRepository->delete($order);
-+        }
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', false);
-+
-+        parent::tearDown();
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
-new file mode 100644
-index 00000000000..57a13e2f1bc
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
-@@ -0,0 +1,163 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Exception;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Check removing of the coupon from guest cart
-+ */
-+class RemoveCouponFromCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
-+     */
-+    public function testRemoveCouponFromCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('removeCouponFromCart', $response);
-+        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testRemoveCouponFromCartIfCartIdIsEmpty()
-+    {
-+        $maskedQuoteId = '';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testRemoveCouponFromCartIfCartIdIsMissed()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  removeCouponFromCart(input: {}) {
-+    cart {
-+      applied_coupon {
-+        code
-+      }
-+    }
-+  }
-+}
-+
-+QUERY;
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testRemoveCouponFromNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Cart does not contain products
-+     */
-+    public function testRemoveCouponFromEmptyCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testRemoveCouponFromCartIfCouponWasNotSet()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId);
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('removeCouponFromCart', $response);
-+        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
-+     */
-+    public function testRemoveCouponFromCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId);
-+
-+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  removeCouponFromCart(input: {cart_id: "{$maskedQuoteId}"}) {
-+    cart {
-+      applied_coupon {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
-new file mode 100644
-index 00000000000..7e3d3553ba2
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
-@@ -0,0 +1,189 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\GraphQl\Quote\GetQuoteItemIdByReservedQuoteIdAndSku;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for removeItemFromCartTest mutation
-+ */
-+class RemoveItemFromCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var GetQuoteItemIdByReservedQuoteIdAndSku
-+     */
-+    private $getQuoteItemIdByReservedQuoteIdAndSku;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->getQuoteItemIdByReservedQuoteIdAndSku = $objectManager->get(
-+            GetQuoteItemIdByReservedQuoteIdAndSku::class
-+        );
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testRemoveItemFromCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $itemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
-+
-+        $query = $this->getQuery($maskedQuoteId, $itemId);
-+        $response = $this->graphQlMutation($query);
-+
-+        $this->assertArrayHasKey('removeItemFromCart', $response);
-+        $this->assertArrayHasKey('cart', $response['removeItemFromCart']);
-+        $this->assertCount(0, $response['removeItemFromCart']['cart']['items']);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testRemoveItemFromNonExistentCart()
-+    {
-+        $query = $this->getQuery('non_existent_masked_id', 1);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testRemoveNonExistentItem()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $notExistentItemId = 999;
-+
-+        $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
-+
-+        $query = $this->getQuery($maskedQuoteId, $notExistentItemId);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $input
-+     * @param string $message
-+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
-+     */
-+    public function testUpdateWithMissedItemRequiredParameters(string $input, string $message)
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  removeItemFromCart(
-+    input: {
-+      {$input}
-+    }
-+  ) {
-+    cart {
-+      items {
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderUpdateWithMissedRequiredParameters(): array
-+    {
-+        return [
-+            'missed_cart_id' => [
-+                'cart_item_id: 1',
-+                'Required parameter "cart_id" is missing.'
-+            ],
-+            'missed_cart_item_id' => [
-+                'cart_id: "test_quote"',
-+                'Required parameter "cart_item_id" is missing.'
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
-+     */
-+    public function testRemoveItemIfItemIsNotBelongToCart()
-+    {
-+        $firstQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $secondQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute(
-+            'test_order_with_virtual_product_without_address',
-+            'virtual-product'
-+        );
-+
-+        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
-+
-+        $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testRemoveItemFromCustomerCart()
-+    {
-+        $customerQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $customerQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
-+
-+        $this->expectExceptionMessage("The current user cannot perform operations on cart \"$customerQuoteMaskedId\"");
-+
-+        $query = $this->getQuery($customerQuoteMaskedId, $customerQuoteItemId);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param int $itemId
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, int $itemId): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  removeItemFromCart(
-+    input: {
-+      cart_id: "{$maskedQuoteId}"
-+      cart_item_id: {$itemId}
-+    }
-+  ) {
-+    cart {
-+      items {
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
-new file mode 100644
-index 00000000000..4afcfb2aef9
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
-@@ -0,0 +1,480 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for set billing address on cart mutation
-+ */
-+class SetBillingAddressOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewBillingAddress()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+        address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2"]
-+          city: "test city"
-+          region: "test region"
-+          postcode: "887766"
-+          country_code: "US"
-+          telephone: "88776655"
-+          save_in_address_book: false
-+        }
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        firstname
-+        lastname
-+        company
-+        street
-+        city
-+        postcode
-+        telephone
-+        country {
-+          code
-+          label
-+        }
-+        __typename
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
-+        $cartResponse = $response['setBillingAddressOnCart']['cart'];
-+        self::assertArrayHasKey('billing_address', $cartResponse);
-+        $billingAddressResponse = $cartResponse['billing_address'];
-+        $this->assertNewAddressFields($billingAddressResponse);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewBillingAddressWithUseForShippingParameter()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+         address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2"]
-+          city: "test city"
-+          region: "test region"
-+          postcode: "887766"
-+          country_code: "US"
-+          telephone: "88776655"
-+          save_in_address_book: false
-+         }
-+         use_for_shipping: true
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        firstname
-+        lastname
-+        company
-+        street
-+        city
-+        postcode
-+        telephone
-+        country {
-+          code
-+          label
-+        }
-+        __typename
-+      }
-+      shipping_addresses {
-+        firstname
-+        lastname
-+        company
-+        street
-+        city
-+        postcode
-+        telephone
-+        country {
-+          code
-+          label
-+        }
-+        __typename
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
-+        $cartResponse = $response['setBillingAddressOnCart']['cart'];
-+        self::assertArrayHasKey('billing_address', $cartResponse);
-+        $billingAddressResponse = $cartResponse['billing_address'];
-+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
-+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
-+        $this->assertNewAddressFields($billingAddressResponse);
-+        $this->assertNewAddressFields($shippingAddressResponse, 'ShippingCartAddress');
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testSetBillingAddressToCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+        address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2"]
-+          city: "test city"
-+          region: "test region"
-+          postcode: "887766"
-+          country_code: "US"
-+          telephone: "88776655"
-+          save_in_address_book: false
-+        }
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The current customer isn't authorized.
-+     */
-+    public function testSetBillingAddressFromAddressBook()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+          customer_address_id: 1
-+        }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testSetBillingAddressOnNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+        address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2"]
-+          city: "test city"
-+          region: "test region"
-+          postcode: "887766"
-+          country_code: "US"
-+          telephone: "88776655"
-+          save_in_address_book: false
-+        }
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @dataProvider dataProviderSetWithoutRequiredParameters
-+     * @param string $input
-+     * @param string $message
-+     * @throws \Exception
-+     */
-+    public function testSetBillingAddressWithoutRequiredParameters(string $input, string $message)
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $input = str_replace('cart_id_value', $maskedQuoteId, $input);
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      {$input}
-+    }
-+  ) {
-+    cart {
-+        billing_address {
-+            city
-+          }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderSetWithoutRequiredParameters(): array
-+    {
-+        return [
-+            'missed_billing_address' => [
-+                'cart_id: "cart_id_value"',
-+                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
-+                . ' was not provided.',
-+            ],
-+            'missed_cart_id' => [
-+                'billing_address: {}',
-+                'Required parameter "cart_id" is missing'
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewBillingAddressWithoutCustomerAddressIdAndAddress()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+        use_for_shipping: true
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        self::expectExceptionMessage(
-+            'The billing address must contain either "customer_address_id" or "address".'
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_multishipping_with_two_shipping_addresses.php
-+     */
-+    public function testSetNewBillingAddressWithUseForShippingAndMultishipping()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+        address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2"]
-+          city: "test city"
-+          region: "test region"
-+          postcode: "887766"
-+          country_code: "US"
-+          telephone: "88776655"
-+          save_in_address_book: false
-+        }
-+        use_for_shipping: true
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        self::expectExceptionMessage(
-+            'Using the "use_for_shipping" option with multishipping is not possible.'
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewBillingAddressRedundantStreetLine()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setBillingAddressOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      billing_address: {
-+        address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2", "test street 3"]
-+          city: "test city"
-+          region: "test region"
-+          postcode: "887766"
-+          country_code: "US"
-+          telephone: "88776655"
-+          save_in_address_book: false
-+        }
-+      }
-+    }
-+  ) {
-+    cart {
-+      billing_address {
-+        firstname
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * Verify the all the whitelisted fields for a New Address Object
-+     *
-+     * @param array $addressResponse
-+     * @param string $addressType
-+     */
-+    private function assertNewAddressFields(array $addressResponse, string $addressType = 'BillingCartAddress'): void
-+    {
-+        $assertionMap = [
-+            ['response_field' => 'firstname', 'expected_value' => 'test firstname'],
-+            ['response_field' => 'lastname', 'expected_value' => 'test lastname'],
-+            ['response_field' => 'company', 'expected_value' => 'test company'],
-+            ['response_field' => 'street', 'expected_value' => [0 => 'test street 1', 1 => 'test street 2']],
-+            ['response_field' => 'city', 'expected_value' => 'test city'],
-+            ['response_field' => 'postcode', 'expected_value' => '887766'],
-+            ['response_field' => 'telephone', 'expected_value' => '88776655'],
-+            ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
-+            ['response_field' => '__typename', 'expected_value' => $addressType]
-+        ];
-+
-+        $this->assertResponseFields($addressResponse, $assertionMap);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php
-new file mode 100644
-index 00000000000..b877dccdeba
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php
-@@ -0,0 +1,141 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setGuestEmailOnCart mutation
-+ */
-+class SetGuestEmailOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     */
-+    public function testSetGuestEmailOnCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $email = 'some@user.com';
-+
-+        $query = $this->getQuery($maskedQuoteId, $email);
-+        $response = $this->graphQlMutation($query);
-+
-+        $this->assertArrayHasKey('setGuestEmailOnCart', $response);
-+        $this->assertArrayHasKey('cart', $response['setGuestEmailOnCart']);
-+        $this->assertEquals($email, $response['setGuestEmailOnCart']['cart']['email']);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     */
-+    public function testSetGuestEmailOnCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $email = 'some@user.com';
-+
-+        $query = $this->getQuery($maskedQuoteId, $email);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     *
-+     * @dataProvider incorrectEmailDataProvider
-+     * @param string $email
-+     * @param string $exceptionMessage
-+     */
-+    public function testSetGuestEmailOnCartWithIncorrectEmail(
-+        string $email,
-+        string $exceptionMessage
-+    ) {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $email);
-+        $this->expectExceptionMessage($exceptionMessage);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function incorrectEmailDataProvider(): array
-+    {
-+        return [
-+            'wrong_email' => ['some', 'Invalid email format'],
-+            'no_email' => ['', 'Required parameter "email" is missing'],
-+        ];
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testSetGuestEmailOnNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $email = 'some@user.com';
-+
-+        $query = $this->getQuery($maskedQuoteId, $email);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing
-+     */
-+    public function testSetGuestEmailWithEmptyCartId()
-+    {
-+        $maskedQuoteId = '';
-+        $email = 'some@user.com';
-+
-+        $query = $this->getQuery($maskedQuoteId, $email);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * Returns GraphQl mutation query for setting email address for a guest
-+     *
-+     * @param string $maskedQuoteId
-+     * @param string $email
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, string $email): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  setGuestEmailOnCart(input: {
-+    cart_id: "$maskedQuoteId"
-+    email: "$email"
-+  }) {
-+    cart {
-+      email
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflinePaymentMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflinePaymentMethodsOnCartTest.php
-new file mode 100644
-index 00000000000..7ec3148ea85
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflinePaymentMethodsOnCartTest.php
-@@ -0,0 +1,157 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\OfflinePayments\Model\Banktransfer;
-+use Magento\OfflinePayments\Model\Cashondelivery;
-+use Magento\OfflinePayments\Model\Checkmo;
-+use Magento\OfflinePayments\Model\Purchaseorder;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting offline payment methods on cart
-+ */
-+class SetOfflinePaymentMethodsOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     *
-+     * @param string $methodCode
-+     * @param string $methodTitle
-+     * @dataProvider offlinePaymentMethodDataProvider
-+     */
-+    public function testSetOfflinePaymentMethod(string $methodCode, string $methodTitle)
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
-+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
-+
-+        $selectedPaymentMethod = $response['setPaymentMethodOnCart']['cart']['selected_payment_method'];
-+        self::assertArrayHasKey('code', $selectedPaymentMethod);
-+        self::assertEquals($methodCode, $selectedPaymentMethod['code']);
-+
-+        self::assertArrayHasKey('title', $selectedPaymentMethod);
-+        self::assertEquals($methodTitle, $selectedPaymentMethod['title']);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function offlinePaymentMethodDataProvider(): array
-+    {
-+        return [
-+            'check_mo' => [Checkmo::PAYMENT_METHOD_CHECKMO_CODE, 'Check / Money order'],
-+            'bank_transfer' => [Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE, 'Bank Transfer Payment'],
-+            'cash_on_delivery' => [Cashondelivery::PAYMENT_METHOD_CASHONDELIVERY_CODE, 'Cash On Delivery'],
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     */
-+    public function testSetPurchaseOrderPaymentMethod()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
-+        $methodTitle = 'Purchase Order';
-+        $poNumber = 'abc123';
-+
-+        $query = <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(input: {
-+    cart_id: "{$maskedQuoteId}", 
-+    payment_method: {
-+      code: "{$methodCode}"
-+      purchase_order_number: "{$poNumber}"
-+    }
-+  }) {
-+    cart {
-+      selected_payment_method {
-+        code
-+        title
-+        purchase_order_number
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
-+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
-+
-+        $selectedPaymentMethod = $response['setPaymentMethodOnCart']['cart']['selected_payment_method'];
-+        self::assertArrayHasKey('code', $selectedPaymentMethod);
-+        self::assertEquals($methodCode, $selectedPaymentMethod['code']);
-+
-+        self::assertArrayHasKey('title', $selectedPaymentMethod);
-+        self::assertEquals($methodTitle, $selectedPaymentMethod['title']);
-+
-+        self::assertArrayHasKey('purchase_order_number', $selectedPaymentMethod);
-+        self::assertEquals($poNumber, $selectedPaymentMethod['purchase_order_number']);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $methodCode
-+     * @return string
-+     */
-+    private function getQuery(
-+        string $maskedQuoteId,
-+        string $methodCode
-+    ) : string {
-+        return <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(input: {
-+    cart_id: "{$maskedQuoteId}", 
-+    payment_method: {
-+      code: "{$methodCode}"
-+    }
-+  }) {
-+    cart {
-+      selected_payment_method {
-+        code
-+        title
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
-new file mode 100644
-index 00000000000..ff2c5f2e6b5
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
-@@ -0,0 +1,170 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting offline shipping methods on cart
-+ */
-+class SetOfflineShippingMethodsOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
-+     *
-+     * @param string $carrierCode
-+     * @param string $methodCode
-+     * @param string $carrierTitle
-+     * @param string $methodTitle
-+     * @param array $amount
-+     * @param array $baseAmount
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     * @dataProvider offlineShippingMethodDataProvider
-+     */
-+    public function testSetOfflineShippingMethod(
-+        string $carrierCode,
-+        string $methodCode,
-+        string $carrierTitle,
-+        string $methodTitle,
-+        array $amount,
-+        array $baseAmount
-+    ) {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery(
-+            $maskedQuoteId,
-+            $methodCode,
-+            $carrierCode
-+        );
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($carrierCode, $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($carrierTitle, $shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodTitle, $shippingAddress['selected_shipping_method']['method_title']);
-+
-+        self::assertArrayHasKey('amount', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($amount, $shippingAddress['selected_shipping_method']['amount']);
-+
-+        self::assertArrayHasKey('base_amount', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($baseAmount, $shippingAddress['selected_shipping_method']['base_amount']);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function offlineShippingMethodDataProvider(): array
-+    {
-+        return [
-+            'flatrate_flatrate' => [
-+                'flatrate',
-+                'flatrate',
-+                'Flat Rate',
-+                'Fixed',
-+                ['value' => 10, 'currency' => 'USD'],
-+                ['value' => 10, 'currency' => 'USD'],
-+            ],
-+            'tablerate_bestway' => [
-+                'tablerate',
-+                'bestway',
-+                'Best Way',
-+                'Table Rate',
-+                ['value' => 10, 'currency' => 'USD'],
-+                ['value' => 10, 'currency' => 'USD'],
-+            ],
-+            'freeshipping_freeshipping' => [
-+                'freeshipping',
-+                'freeshipping',
-+                'Free Shipping',
-+                'Free',
-+                ['value' => 0, 'currency' => 'USD'],
-+                ['value' => 0, 'currency' => 'USD'],
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $shippingMethodCode
-+     * @param string $shippingCarrierCode
-+     * @return string
-+     */
-+    private function getQuery(
-+        string $maskedQuoteId,
-+        string $shippingMethodCode,
-+        string $shippingCarrierCode
-+    ): string {
-+        return <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input: 
-+    {
-+      cart_id: "$maskedQuoteId", 
-+      shipping_methods: [{
-+        carrier_code: "$shippingCarrierCode"
-+        method_code: "$shippingMethodCode"
-+      }]
-+    }) {
-+    cart {
-+      shipping_addresses {
-+        selected_shipping_method {
-+          carrier_code
-+          method_code
-+          carrier_title
-+          method_title
-+          amount {
-+            value
-+            currency
-+          }
-+          base_amount {
-+            value
-+            currency
-+          }
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php
-new file mode 100644
-index 00000000000..5a063fcb2e4
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php
-@@ -0,0 +1,253 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Exception;
-+use Magento\Framework\Registry;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\OfflinePayments\Model\Checkmo;
-+use Magento\OfflinePayments\Model\Purchaseorder;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting payment method and placing an order by guest
-+ */
-+class SetPaymentMethodAndPlaceOrderTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $orderCollectionFactory;
-+
-+    /**
-+     * @var OrderRepositoryInterface
-+     */
-+    private $orderRepository;
-+
-+    /**
-+     * @var Registry
-+     */
-+    private $registry;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
-+        $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testSetPaymentOnCartWithSimpleProduct()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('setPaymentMethodAndPlaceOrder', $response);
-+        self::assertArrayHasKey('order', $response['setPaymentMethodAndPlaceOrder']);
-+        self::assertArrayHasKey('order_id', $response['setPaymentMethodAndPlaceOrder']['order']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
-+     */
-+    public function testSetPaymentOnCartWithSimpleProductAndWithoutAddress()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     */
-+    public function testSetPaymentOnCartWithVirtualProduct()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('setPaymentMethodAndPlaceOrder', $response);
-+        self::assertArrayHasKey('order', $response['setPaymentMethodAndPlaceOrder']);
-+        self::assertArrayHasKey('order_id', $response['setPaymentMethodAndPlaceOrder']['order']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The requested Payment Method is not available.
-+     */
-+    public function testSetNonExistentPaymentMethod()
-+    {
-+        $methodCode = 'noway';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testSetPaymentOnNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Guest email for cart is missing.
-+     */
-+    public function testPlaceOrderWithNoEmail()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testSetPaymentMethodToCustomerCart()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The requested Payment Method is not available.
-+     */
-+    public function testSetDisabledPaymentOnCart()
-+    {
-+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $methodCode
-+     * @return string
-+     */
-+    private function getQuery(
-+        string $maskedQuoteId,
-+        string $methodCode
-+    ) : string {
-+        return <<<QUERY
-+mutation {
-+  setPaymentMethodAndPlaceOrder(input: {
-+      cart_id: "$maskedQuoteId"
-+      payment_method: {
-+          code: "$methodCode"
-+      }
-+  }) {    
-+    order {
-+      order_id
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function tearDown()
-+    {
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', true);
-+
-+        $orderCollection = $this->orderCollectionFactory->create();
-+        foreach ($orderCollection as $order) {
-+            $this->orderRepository->delete($order);
-+        }
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', false);
-+
-+        parent::tearDown();
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
-new file mode 100644
-index 00000000000..c3de80d08f0
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
-@@ -0,0 +1,267 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Exception;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\OfflinePayments\Model\Cashondelivery;
-+use Magento\OfflinePayments\Model\Checkmo;
-+use Magento\OfflinePayments\Model\Purchaseorder;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting payment methods on cart by guest
-+ */
-+class SetPaymentMethodOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testSetPaymentOnCartWithSimpleProduct()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
-+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
-+        self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
-+     */
-+    public function testSetPaymentOnCartWithSimpleProductAndWithoutAddress()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
-+     */
-+    public function testSetPaymentOnCartWithVirtualProduct()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
-+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
-+        self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The requested Payment Method is not available.
-+     */
-+    public function testSetNonExistentPaymentMethod()
-+    {
-+        $methodCode = 'noway';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testSetPaymentOnNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testSetPaymentMethodToCustomerCart()
-+    {
-+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     *
-+     * @param string $input
-+     * @param string $message
-+     * @dataProvider dataProviderSetPaymentMethodWithoutRequiredParameters
-+     * @throws Exception
-+     */
-+    public function testSetPaymentMethodWithoutRequiredParameters(string $input, string $message)
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $input = str_replace('cart_id_value', $maskedQuoteId, $input);
-+
-+        $query = <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(
-+    input: {
-+      {$input}
-+    }
-+  ) {
-+    cart {
-+      items {
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
-+    {
-+        return [
-+            'missed_cart_id' => [
-+                'payment_method: {code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"}',
-+                'Required parameter "cart_id" is missing.'
-+            ],
-+            'missed_payment_method' => [
-+                'cart_id: "cart_id_value"',
-+                'Required parameter "code" for "payment_method" is missing.'
-+            ],
-+            'missed_payment_method_code' => [
-+                'cart_id: "cart_id_value", payment_method: {code: ""}',
-+                'Required parameter "code" for "payment_method" is missing.'
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-+     */
-+    public function testReSetPayment()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $methodCode = Cashondelivery::PAYMENT_METHOD_CASHONDELIVERY_CODE;
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
-+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
-+        self::assertArrayHasKey('code', $response['setPaymentMethodOnCart']['cart']['selected_payment_method']);
-+        self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The requested Payment Method is not available.
-+     */
-+    public function testSetDisabledPaymentOnCart()
-+    {
-+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = $this->getQuery($maskedQuoteId, $methodCode);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $methodCode
-+     * @return string
-+     */
-+    private function getQuery(
-+        string $maskedQuoteId,
-+        string $methodCode
-+    ) : string {
-+        return <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(input: {
-+    cart_id: "{$maskedQuoteId}", 
-+    payment_method: {
-+      code: "{$methodCode}"
-+    }
-+  }) {
-+    cart {
-+      selected_payment_method {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPurchaseOrderPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPurchaseOrderPaymentMethodOnCartTest.php
-new file mode 100644
-index 00000000000..9dd0382a5db
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPurchaseOrderPaymentMethodOnCartTest.php
-@@ -0,0 +1,147 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Exception;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\OfflinePayments\Model\Purchaseorder;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting Purchase Order payment method on cart by guest
-+ */
-+class SetPurchaseOrderPaymentMethodOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     */
-+    public function testSetPurchaseOrderPaymentMethodOnCartWithSimpleProduct()
-+    {
-+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $purchaseOrderNumber = '123456';
-+
-+        $query = <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$maskedQuoteId"
-+      payment_method: {
-+          code: "$methodCode"
-+          purchase_order_number: "$purchaseOrderNumber"
-+      }
-+  }) {    
-+    cart {
-+      selected_payment_method {
-+        code
-+        purchase_order_number
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
-+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
-+        self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
-+        self::assertEquals(
-+            $purchaseOrderNumber,
-+            $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['purchase_order_number']
-+        );
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage Purchase order number is a required field.
-+     */
-+    public function testSetPurchaseOrderPaymentMethodOnCartWithoutPurchaseOrderNumber()
-+    {
-+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$maskedQuoteId"
-+      payment_method: {
-+          code: "$methodCode"
-+      }
-+  }) {    
-+    cart {
-+      selected_payment_method {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The requested Payment Method is not available.
-+     */
-+    public function testSetDisabledPurchaseOrderPaymentMethodOnCart()
-+    {
-+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
-+        $purchaseOrderNumber = '123456';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$maskedQuoteId"
-+      payment_method: {
-+          code: "$methodCode"
-+          purchase_order_number: "$purchaseOrderNumber"
-+      }
-+  }) {    
-+    cart {
-+      selected_payment_method {
-+        code
-+        purchase_order_number
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
-new file mode 100644
-index 00000000000..537c8f09a0a
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
-@@ -0,0 +1,535 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for set shipping addresses on cart mutation
-+ */
-+class SetShippingAddressOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewShippingAddressOnCartWithSimpleProduct()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "test firstname"
-+            lastname: "test lastname"
-+            company: "test company"
-+            street: ["test street 1", "test street 2"]
-+            city: "test city"
-+            region: "test region"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        firstname
-+        lastname
-+        company
-+        street
-+        city
-+        postcode
-+        telephone
-+        country {
-+          code
-+          label
-+        }
-+        __typename
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
-+        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
-+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
-+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
-+        $this->assertNewShippingAddressFields($shippingAddressResponse);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
-+     */
-+    public function testSetNewShippingAddressOnCartWithVirtualProduct()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "test firstname"
-+            lastname: "test lastname"
-+            company: "test company"
-+            street: ["test street 1", "test street 2"]
-+            city: "test city"
-+            region: "test region"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The current customer isn't authorized.
-+     */
-+    public function testSetShippingAddressFromAddressBook()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          customer_address_id: 1
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @expectedException \Exception
-+     */
-+    public function testSetShippingAddressToCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          customer_address_id: 1
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        postcode
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
-+     * @param string $input
-+     * @param string $message
-+     * @throws \Exception
-+     */
-+    public function testSetNewShippingAddressWithMissedRequiredParameters(string $input, string $message)
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $input = str_replace('cart_id_value', $maskedQuoteId, $input);
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      {$input}
-+    }
-+  ) {
-+    cart {
-+        shipping_addresses {
-+            city
-+          }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetNewShippingAddressOnCartWithRedundantStreetLine()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "test firstname"
-+            lastname: "test lastname"
-+            company: "test company"
-+            street: ["test street 1", "test street 2", "test street 3"]
-+            city: "test city"
-+            region: "test region"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        firstname
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderUpdateWithMissedRequiredParameters(): array
-+    {
-+        return [
-+            'missed_shipping_addresses' => [
-+                'cart_id: "cart_id_value"',
-+                'Field SetShippingAddressesOnCartInput.shipping_addresses of required type [ShippingAddressInput]! ' .
-+                'was not provided.',
-+            ],
-+            'missed_city' => [
-+                'shipping_addresses: [ { address: { save_in_address_book: false } } ]',
-+                'Field CartAddressInput.city of required type String! was not provided'
-+            ],
-+            'missed_cart_id' => [
-+                'shipping_addresses: {}',
-+                'Required parameter "cart_id" is missing'
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     *
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage You cannot specify multiple shipping addresses.
-+     */
-+    public function testSetMultipleNewShippingAddresses()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "test firstname"
-+            lastname: "test lastname"
-+            company: "test company"
-+            street: ["test street 1", "test street 2"]
-+            city: "test city"
-+            region: "test region"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        },
-+        {
-+          address: {
-+            firstname: "test firstname 2"
-+            lastname: "test lastname 2"
-+            company: "test company 2"
-+            street: ["test street 1", "test street 2"]
-+            city: "test city"
-+            region: "test region"
-+            postcode: "887766"
-+            country_code: "US"
-+            telephone: "88776655"
-+            save_in_address_book: false
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testSetShippingAddressOnNonExistentCart()
-+    {
-+        $maskedQuoteId = 'non_existent_masked_id';
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "$maskedQuoteId"
-+      shipping_addresses: {
-+        address: {
-+          firstname: "test firstname"
-+          lastname: "test lastname"
-+          company: "test company"
-+          street: ["test street 1", "test street 2"]
-+          city: "test city"
-+          region: "test region"
-+          postcode: "887766"
-+          country_code: "US"
-+          telephone: "88776655"
-+          save_in_address_book: false
-+        }
-+      }
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        city
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetShippingAddressWithLowerCaseCountry()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "{$maskedQuoteId}"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "John"
-+            lastname: "Doe"
-+            street: ["6161 West Centinella Avenue"]
-+            city: "Culver City"
-+            region: "CA"
-+            postcode: "90230"
-+            country_code: "us"
-+            telephone: "555-555-55-55"
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        region {
-+            code
-+        }
-+        country {
-+            code
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $result = $this->graphQlMutation($query);
-+
-+        self::assertCount(1, $result['setShippingAddressesOnCart']['cart']['shipping_addresses']);
-+        $address = reset($result['setShippingAddressesOnCart']['cart']['shipping_addresses']);
-+
-+        $this->assertEquals('US', $address['country']['code']);
-+        $this->assertEquals('CA', $address['region']['code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     */
-+    public function testSetShippingAddressWithLowerCaseRegion()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingAddressesOnCart(
-+    input: {
-+      cart_id: "{$maskedQuoteId}"
-+      shipping_addresses: [
-+        {
-+          address: {
-+            firstname: "John"
-+            lastname: "Doe"
-+            street: ["6161 West Centinella Avenue"]
-+            city: "Culver City"
-+            region: "ca"
-+            postcode: "90230"
-+            country_code: "US"
-+            telephone: "555-555-55-55"
-+          }
-+        }
-+      ]
-+    }
-+  ) {
-+    cart {
-+      shipping_addresses {
-+        region {
-+            code
-+        }
-+        country {
-+            code
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $result = $this->graphQlMutation($query);
-+
-+        self::assertCount(1, $result['setShippingAddressesOnCart']['cart']['shipping_addresses']);
-+        $address = reset($result['setShippingAddressesOnCart']['cart']['shipping_addresses']);
-+
-+        $this->assertEquals('US', $address['country']['code']);
-+        $this->assertEquals('CA', $address['region']['code']);
-+    }
-+
-+    /**
-+     * Verify the all the whitelisted fields for a New Address Object
-+     *
-+     * @param array $shippingAddressResponse
-+     */
-+    private function assertNewShippingAddressFields(array $shippingAddressResponse): void
-+    {
-+        $assertionMap = [
-+            ['response_field' => 'firstname', 'expected_value' => 'test firstname'],
-+            ['response_field' => 'lastname', 'expected_value' => 'test lastname'],
-+            ['response_field' => 'company', 'expected_value' => 'test company'],
-+            ['response_field' => 'street', 'expected_value' => [0 => 'test street 1', 1 => 'test street 2']],
-+            ['response_field' => 'city', 'expected_value' => 'test city'],
-+            ['response_field' => 'postcode', 'expected_value' => '887766'],
-+            ['response_field' => 'telephone', 'expected_value' => '88776655'],
-+            ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
-+            ['response_field' => '__typename', 'expected_value' => 'ShippingCartAddress']
-+        ];
-+
-+        $this->assertResponseFields($shippingAddressResponse, $assertionMap);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
-new file mode 100644
-index 00000000000..60c8bee75e2
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
-@@ -0,0 +1,400 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Exception;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting shipping methods on cart for guest
-+ */
-+class SetShippingMethodsOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testSetShippingMethodOnCartWithSimpleProduct()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $carrierCode = 'flatrate';
-+        $methodCode = 'flatrate';
-+
-+        $query = $this->getQuery(
-+            $maskedQuoteId,
-+            $methodCode,
-+            $carrierCode
-+        );
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('flatrate', $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('flatrate', $shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('Flat Rate', $shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals('Fixed', $shippingAddress['selected_shipping_method']['method_title']);
-+
-+        self::assertArrayHasKey('amount', $shippingAddress['selected_shipping_method']);
-+        $amount = $shippingAddress['selected_shipping_method']['amount'];
-+
-+        self::assertArrayHasKey('value', $amount);
-+        self::assertEquals(10, $amount['value']);
-+        self::assertArrayHasKey('currency', $amount);
-+        self::assertEquals('USD', $amount['currency']);
-+
-+        self::assertArrayHasKey('base_amount', $shippingAddress['selected_shipping_method']);
-+        $baseAmount = $shippingAddress['selected_shipping_method']['base_amount'];
-+
-+        self::assertArrayHasKey('value', $baseAmount);
-+        self::assertEquals(10, $baseAmount['value']);
-+        self::assertArrayHasKey('currency', $baseAmount);
-+        self::assertEquals('USD', $baseAmount['currency']);
-+    }
-+
-+    /**
-+     * Shipping address for quote will be created automatically BUT with NULL values (considered that address
-+     * is not set)
-+     *
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
-+     */
-+    public function testSetShippingMethodOnCartWithSimpleProductAndWithoutAddress()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $carrierCode = 'flatrate';
-+        $methodCode = 'flatrate';
-+
-+        $query = $this->getQuery(
-+            $maskedQuoteId,
-+            $methodCode,
-+            $carrierCode
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testReSetShippingMethod()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $carrierCode = 'freeshipping';
-+        $methodCode = 'freeshipping';
-+
-+        $query = $this->getQuery(
-+            $maskedQuoteId,
-+            $methodCode,
-+            $carrierCode
-+        );
-+        $response = $this->graphQlMutation($query);
-+
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($carrierCode, $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     *
-+     * @param string $input
-+     * @param string $message
-+     * @dataProvider dataProviderSetShippingMethodWithWrongParameters
-+     * @throws Exception
-+     */
-+    public function testSetShippingMethodWithWrongParameters(string $input, string $message)
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $input = str_replace('cart_id_value', $maskedQuoteId, $input);
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input:  {
-+   {$input}     
-+  }) {
-+    cart {
-+      shipping_addresses {
-+        selected_shipping_method {
-+          carrier_code
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @return array
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function dataProviderSetShippingMethodWithWrongParameters(): array
-+    {
-+        return [
-+            'missed_cart_id' => [
-+                'shipping_methods: [{
-+                    carrier_code: "flatrate"
-+                    method_code: "flatrate"
-+                }]',
-+                'Required parameter "cart_id" is missing'
-+            ],
-+            'missed_shipping_methods' => [
-+                'cart_id: "cart_id_value"',
-+                'Required parameter "shipping_methods" is missing'
-+            ],
-+            'shipping_methods_are_empty' => [
-+                'cart_id: "cart_id_value" shipping_methods: []',
-+                'Required parameter "shipping_methods" is missing'
-+            ],
-+            'missed_carrier_code' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    method_code: "flatrate"
-+                }]',
-+                'Field ShippingMethodInput.carrier_code of required type String! was not provided.'
-+            ],
-+            'empty_carrier_code' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    carrier_code: ""
-+                    method_code: "flatrate"
-+                }]',
-+                'Required parameter "carrier_code" is missing.'
-+            ],
-+            'non_existent_carrier_code' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    carrier_code: "wrong-carrier-code"
-+                    method_code: "flatrate"
-+                }]',
-+                'Carrier with such method not found: wrong-carrier-code, flatrate'
-+            ],
-+            'missed_method_code' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    carrier_code: "flatrate"
-+                }]',
-+                'Required parameter "method_code" is missing.'
-+            ],
-+            'empty_method_code' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    carrier_code: "flatrate"
-+                    method_code: ""
-+                }]',
-+                'Required parameter "method_code" is missing.'
-+            ],
-+            'non_existent_method_code' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    carrier_code: "flatrate"
-+                    method_code: "wrong-carrier-code"
-+                }]',
-+                'Carrier with such method not found: flatrate, wrong-carrier-code'
-+            ],
-+            'non_existent_shopping_cart' => [
-+                'cart_id: "non_existent_masked_id", shipping_methods: [{
-+                    carrier_code: "flatrate"
-+                    method_code: "flatrate"
-+                }]',
-+                'Could not find a cart with ID "non_existent_masked_id"'
-+            ],
-+            'disabled_shipping_method' => [
-+                'cart_id: "cart_id_value", shipping_methods: [{
-+                    carrier_code: "freeshipping"
-+                    method_code: "freeshipping"
-+                }]',
-+                'Carrier with such method not found: freeshipping, freeshipping'
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @expectedException Exception
-+     * @expectedExceptionMessage You cannot specify multiple shipping methods.
-+     */
-+    public function testSetMultipleShippingMethods()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query = <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input:  {
-+   cart_id: "{$maskedQuoteId}", 
-+   shipping_methods: [
-+        {
-+            carrier_code: "flatrate"
-+            method_code: "flatrate"
-+        }
-+        {
-+            carrier_code: "flatrate"
-+            method_code: "flatrate"
-+        }
-+   ]
-+  }) {
-+    cart {
-+      shipping_addresses {
-+        selected_shipping_method {
-+          carrier_code
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * _security
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     *
-+     * @expectedException Exception
-+     */
-+    public function testSetShippingMethodToCustomerCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $carrierCode = 'flatrate';
-+        $methodCode = 'flatrate';
-+        $query = $this->getQuery(
-+            $maskedQuoteId,
-+            $methodCode,
-+            $carrierCode
-+        );
-+
-+        $this->expectExceptionMessage(
-+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/quote_with_address.php
-+     *
-+     * @expectedException Exception
-+     * @expectedExceptionMessage The shipping method can't be set for an empty cart. Add an item to cart and try again.
-+     */
-+    public function testSetShippingMethodOnAnEmptyCart()
-+    {
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $carrierCode = 'flatrate';
-+        $methodCode = 'flatrate';
-+
-+        $query = $this->getQuery(
-+            $maskedQuoteId,
-+            $methodCode,
-+            $carrierCode
-+        );
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param string $shippingMethodCode
-+     * @param string $shippingCarrierCode
-+     * @return string
-+     */
-+    private function getQuery(
-+        string $maskedQuoteId,
-+        string $shippingMethodCode,
-+        string $shippingCarrierCode
-+    ): string {
-+        return <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input: 
-+    {
-+      cart_id: "$maskedQuoteId", 
-+      shipping_methods: [{
-+        carrier_code: "$shippingCarrierCode"
-+        method_code: "$shippingMethodCode"
-+      }]
-+    }) {
-+    cart {
-+      shipping_addresses {
-+        selected_shipping_method {
-+          carrier_code
-+          method_code
-+          carrier_title
-+          method_title
-+          amount {
-+            value
-+            currency
-+          }
-+          base_amount {
-+            value
-+            currency
-+          }
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
-new file mode 100644
-index 00000000000..988ead7d86d
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
-@@ -0,0 +1,273 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote\Guest;
-+
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for updating/removing shopping cart items
-+ */
-+class UpdateCartItemsTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @var QuoteFactory
-+     */
-+    private $quoteFactory;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteIdInterface
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->quoteResource = $objectManager->get(QuoteResource::class);
-+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-+     */
-+    public function testUpdateCartItemQuantity()
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-+        $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
-+        $quantity = 2;
-+
-+        $query = $this->getQuery($maskedQuoteId, $itemId, $quantity);
-+        $response = $this->graphQlMutation($query);
-+
-+        $this->assertArrayHasKey('updateCartItems', $response);
-+        $this->assertArrayHasKey('cart', $response['updateCartItems']);
-+
-+        $responseCart = $response['updateCartItems']['cart'];
-+        $item = current($responseCart['items']);
-+
-+        $this->assertEquals($itemId, $item['id']);
-+        $this->assertEquals($quantity, $item['quantity']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-+     */
-+    public function testRemoveCartItemIfQuantityIsZero()
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-+        $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
-+        $quantity = 0;
-+
-+        $query = $this->getQuery($maskedQuoteId, $itemId, $quantity);
-+        $response = $this->graphQlMutation($query);
-+
-+        $this->assertArrayHasKey('updateCartItems', $response);
-+        $this->assertArrayHasKey('cart', $response['updateCartItems']);
-+
-+        $responseCart = $response['updateCartItems']['cart'];
-+        $this->assertCount(0, $responseCart['items']);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-+     */
-+    public function testUpdateItemInNonExistentCart()
-+    {
-+        $query = $this->getQuery('non_existent_masked_id', 1, 2);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-+     */
-+    public function testUpdateNonExistentItem()
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-+        $notExistentItemId = 999;
-+
-+        $this->expectExceptionMessage("Could not find cart item with id: {$notExistentItemId}.");
-+
-+        $query = $this->getQuery($maskedQuoteId, $notExistentItemId, 2);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
-+     */
-+    public function testUpdateItemIfItemIsNotBelongToCart()
-+    {
-+        $firstQuote = $this->quoteFactory->create();
-+        $this->quoteResource->load($firstQuote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-+        $firstQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
-+
-+        $secondQuote = $this->quoteFactory->create();
-+        $this->quoteResource->load(
-+            $secondQuote,
-+            'test_order_with_virtual_product_without_address',
-+            'reserved_order_id'
-+        );
-+        $secondQuoteItemId = (int)$secondQuote
-+            ->getItemByProduct($this->productRepository->get('virtual-product'))
-+            ->getId();
-+
-+        $this->expectExceptionMessage("Could not find cart item with id: {$secondQuoteItemId}.");
-+
-+        $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId, 2);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-+     */
-+    public function testUpdateItemFromCustomerCart()
-+    {
-+        $customerQuote = $this->quoteFactory->create();
-+        $this->quoteResource->load($customerQuote, 'test_order_1', 'reserved_order_id');
-+        $customerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$customerQuote->getId());
-+        $customerQuoteItemId = (int)$customerQuote->getItemByProduct($this->productRepository->get('simple'))->getId();
-+
-+        $this->expectExceptionMessage("The current user cannot perform operations on cart \"$customerQuoteMaskedId\"");
-+
-+        $query = $this->getQuery($customerQuoteMaskedId, $customerQuoteItemId, 2);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Required parameter "cart_id" is missing.
-+     */
-+    public function testUpdateWithMissedCartItemId()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  updateCartItems(input: {
-+    cart_items: [
-+      {
-+        cart_item_id: 1
-+        quantity: 2
-+      }
-+    ]  
-+  }) {
-+    cart {
-+      items {
-+        id
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @param string $input
-+     * @param string $message
-+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-+     */
-+    public function testUpdateWithMissedItemRequiredParameters(string $input, string $message)
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-+
-+        $query = <<<QUERY
-+mutation {
-+  updateCartItems(input: {
-+    cart_id: "{$maskedQuoteId}"
-+    {$input}
-+  }) {
-+    cart {
-+      items {
-+        id
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->expectExceptionMessage($message);
-+        $this->graphQlMutation($query);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderUpdateWithMissedRequiredParameters(): array
-+    {
-+        return [
-+            'missed_cart_items' => [
-+                '',
-+                'Required parameter "cart_items" is missing.'
-+            ],
-+            'missed_cart_item_id' => [
-+                'cart_items: [{ quantity: 2 }]',
-+                'Required parameter "cart_item_id" for "cart_items" is missing.'
-+            ],
-+            'missed_cart_item_qty' => [
-+                'cart_items: [{ cart_item_id: 1 }]',
-+                'Required parameter "quantity" for "cart_items" is missing.'
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * @param string $maskedQuoteId
-+     * @param int $itemId
-+     * @param float $quantity
-+     * @return string
-+     */
-+    private function getQuery(string $maskedQuoteId, int $itemId, float $quantity): string
-+    {
-+        return <<<QUERY
-+mutation {
-+  updateCartItems(input: {
-+    cart_id: "{$maskedQuoteId}"
-+    cart_items: [
-+      {
-+        cart_item_id: {$itemId}
-+        quantity: {$quantity}
-+      }
-+    ]
-+  }) {
-+    cart {
-+      items {
-+        id
-+        quantity
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/RelatedProduct/GetRelatedProductsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/RelatedProduct/GetRelatedProductsTest.php
-new file mode 100644
-index 00000000000..dff1301e12f
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/RelatedProduct/GetRelatedProductsTest.php
-@@ -0,0 +1,169 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\RelatedProduct;
-+
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Get related products test
-+ */
-+class GetRelatedProductsTest extends GraphQlAbstract
-+{
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/products_related_multiple.php
-+     */
-+    public function testQueryRelatedProducts()
-+    {
-+        $productSku = 'simple_with_cross';
-+
-+        $query = <<<QUERY
-+{
-+    products(filter: {sku: {eq: "{$productSku}"}})
-+    {
-+        items {            
-+            related_products
-+            {
-+                sku
-+                name
-+                url_key
-+                created_at
-+            }
-+        }
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('products', $response);
-+        self::assertArrayHasKey('items', $response['products']);
-+        self::assertEquals(1, count($response['products']['items']));
-+        self::assertArrayHasKey(0, $response['products']['items']);
-+        self::assertArrayHasKey('related_products', $response['products']['items'][0]);
-+        $relatedProducts = $response['products']['items'][0]['related_products'];
-+        self::assertCount(2, $relatedProducts);
-+        self::assertRelatedProducts($relatedProducts);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/products_crosssell.php
-+     */
-+    public function testQueryCrossSellProducts()
-+    {
-+        $productSku = 'simple_with_cross';
-+
-+        $query = <<<QUERY
-+{
-+    products(filter: {sku: {eq: "{$productSku}"}})
-+    {
-+        items {            
-+            crosssell_products
-+            {
-+                sku
-+                name
-+                url_key
-+                created_at
-+            }
-+        }
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('products', $response);
-+        self::assertArrayHasKey('items', $response['products']);
-+        self::assertEquals(1, count($response['products']['items']));
-+        self::assertArrayHasKey(0, $response['products']['items']);
-+        self::assertArrayHasKey('crosssell_products', $response['products']['items'][0]);
-+        $crossSellProducts = $response['products']['items'][0]['crosssell_products'];
-+        self::assertCount(1, $crossSellProducts);
-+        $crossSellProduct = $crossSellProducts[0];
-+        self::assertArrayHasKey('sku', $crossSellProduct);
-+        self::assertArrayHasKey('name', $crossSellProduct);
-+        self::assertArrayHasKey('url_key', $crossSellProduct);
-+        self::assertArrayHasKey('created_at', $crossSellProduct);
-+        self::assertEquals($crossSellProduct['sku'], 'simple');
-+        self::assertEquals($crossSellProduct['name'], 'Simple Cross Sell');
-+        self::assertEquals($crossSellProduct['url_key'], 'simple-cross-sell');
-+        self::assertNotEmpty($crossSellProduct['created_at']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/products_upsell.php
-+     */
-+    public function testQueryUpSellProducts()
-+    {
-+        $productSku = 'simple_with_upsell';
-+
-+        $query = <<<QUERY
-+{
-+    products(filter: {sku: {eq: "{$productSku}"}})
-+    {
-+        items {            
-+            upsell_products
-+            {
-+                sku
-+                name
-+                url_key
-+                created_at
-+            }
-+        }
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+
-+        self::assertArrayHasKey('products', $response);
-+        self::assertArrayHasKey('items', $response['products']);
-+        self::assertEquals(1, count($response['products']['items']));
-+        self::assertArrayHasKey(0, $response['products']['items']);
-+        self::assertArrayHasKey('upsell_products', $response['products']['items'][0]);
-+        $upSellProducts = $response['products']['items'][0]['upsell_products'];
-+        self::assertCount(1, $upSellProducts);
-+        $upSellProduct = $upSellProducts[0];
-+        self::assertArrayHasKey('sku', $upSellProduct);
-+        self::assertArrayHasKey('name', $upSellProduct);
-+        self::assertArrayHasKey('url_key', $upSellProduct);
-+        self::assertArrayHasKey('created_at', $upSellProduct);
-+        self::assertEquals($upSellProduct['sku'], 'simple');
-+        self::assertEquals($upSellProduct['name'], 'Simple Up Sell');
-+        self::assertEquals($upSellProduct['url_key'], 'simple-up-sell');
-+        self::assertNotEmpty($upSellProduct['created_at']);
-+    }
-+
-+    /**
-+     * @param array $relatedProducts
-+     */
-+    private function assertRelatedProducts(array $relatedProducts): void
-+    {
-+        $expectedData = [
-+            'simple' => [
-+                'name' => 'Simple Related Product',
-+                'url_key' => 'simple-related-product',
-+
-+            ],
-+            'simple_with_cross_two' => [
-+                'name' => 'Simple Product With Related Product Two',
-+                'url_key' => 'simple-product-with-related-product-two',
-+            ]
-+        ];
-+
-+        foreach ($relatedProducts as $product) {
-+            self::assertArrayHasKey('sku', $product);
-+            self::assertArrayHasKey('name', $product);
-+            self::assertArrayHasKey('url_key', $product);
-+            self::assertArrayHasKey('created_at', $product);
-+
-+            self::assertArrayHasKey($product['sku'], $expectedData);
-+            $productExpectedData = $expectedData[$product['sku']];
-+
-+            self::assertEquals($product['name'], $productExpectedData['name']);
-+            self::assertEquals($product['url_key'], $productExpectedData['url_key']);
-+            self::assertNotEmpty($product['created_at']);
-+        }
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php
-new file mode 100644
-index 00000000000..9c969befa32
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php
-@@ -0,0 +1,115 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Sales;
-+
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Class OrdersTest
-+ */
-+class OrdersTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Sales/_files/orders_with_customer.php
-+     */
-+    public function testOrdersQuery()
-+    {
-+        $query =
-+            <<<QUERY
-+query {
-+  customerOrders {
-+    items {
-+      id
-+      increment_id
-+      created_at
-+      grand_total
-+      status
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
-+
-+        $expectedData = [
-+            [
-+                'increment_id' => '100000002',
-+                'status' => 'processing',
-+                'grand_total' => 120.00
-+            ],
-+            [
-+                'increment_id' => '100000003',
-+                'status' => 'processing',
-+                'grand_total' => 130.00
-+            ],
-+            [
-+                'increment_id' => '100000004',
-+                'status' => 'closed',
-+                'grand_total' => 140.00
-+            ],
-+            [
-+                'increment_id' => '100000005',
-+                'status' => 'complete',
-+                'grand_total' => 150.00
-+            ],
-+            [
-+                'increment_id' => '100000006',
-+                'status' => 'complete',
-+                'grand_total' => 160.00
-+            ]
-+        ];
-+
-+        $actualData = $response['customerOrders']['items'];
-+
-+        foreach ($expectedData as $key => $data) {
-+            $this->assertEquals(
-+                $data['increment_id'],
-+                $actualData[$key]['increment_id'],
-+                "increment_id is different than the expected for order - " . $data['increment_id']
-+            );
-+            $this->assertEquals(
-+                $data['grand_total'],
-+                $actualData[$key]['grand_total'],
-+                "grand_total is different than the expected for order - " . $data['increment_id']
-+            );
-+            $this->assertEquals(
-+                $data['status'],
-+                $actualData[$key]['status'],
-+                "status is different than the expected for order - " . $data['increment_id']
-+            );
-+        }
-+    }
-+
-+    /**
-+     * @param string $email
-+     * @param string $password
-+     * @return array
-+     * @throws \Magento\Framework\Exception\AuthenticationException
-+     */
-+    private function getCustomerAuthHeaders(string $email, string $password): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
-+        return ['Authorization' => 'Bearer ' . $customerToken];
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php
-new file mode 100644
-index 00000000000..200bae76e0a
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php
-@@ -0,0 +1,429 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\SendFriend;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Exception\AuthenticationException;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\SendFriend\Model\SendFriend;
-+use Magento\SendFriend\Model\SendFriendFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Tests for send email to friend
-+ */
-+class SendFriendTest extends GraphQlAbstract
-+{
-+
-+    /**
-+     * @var SendFriendFactory
-+     */
-+    private $sendFriendFactory;
-+
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    protected function setUp()
-+    {
-+        $this->sendFriendFactory = Bootstrap::getObjectManager()->get(SendFriendFactory::class);
-+        $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/SendFriend/_files/enable_send_friend_guest.php
-+     */
-+    public function testSendFriendGuestEnable()
-+    {
-+        $productId = (int)$this->productRepository->get('simple_product')->getId();
-+        $recipients = '{
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               },
-+              {
-+                  name: "Recipient Name 2"
-+                  email:"recipient2@mail.com"
-+              }';
-+        $query = $this->getQuery($productId, $recipients);
-+
-+        $response = $this->graphQlMutation($query);
-+        $this->assertResponse($response);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/SendFriend/_files/disable_send_friend_guest.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The current customer isn't authorized.
-+     */
-+    public function testSendFriendGuestDisableAsGuest()
-+    {
-+        $productId = (int)$this->productRepository->get('simple_product')->getId();
-+        $recipients = '{
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               },
-+              {
-+                  name: "Recipient Name 2"
-+                  email:"recipient2@mail.com"
-+              }';
-+        $query = $this->getQuery($productId, $recipients);
-+
-+        $response = $this->graphQlMutation($query);
-+        $this->assertResponse($response);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/SendFriend/_files/disable_send_friend_guest.php
-+     */
-+    public function testSendFriendGuestDisableAsCustomer()
-+    {
-+        $productId = (int)$this->productRepository->get('simple_product')->getId();
-+        $recipients = '{
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               },
-+              {
-+                  name: "Recipient Name 2"
-+                  email:"recipient2@mail.com"
-+              }';
-+        $query = $this->getQuery($productId, $recipients);
-+
-+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+        $this->assertResponse($response);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testSendWithoutExistProduct()
-+    {
-+        $productId = 2018;
-+        $recipients = '{
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               },
-+              {
-+                  name: "Recipient Name 2"
-+                  email:"recipient2@mail.com"
-+              }';
-+        $query = $this->getQuery($productId, $recipients);
-+
-+        $this->expectExceptionMessage(
-+            'The product that was requested doesn\'t exist. Verify the product and try again.'
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     */
-+    public function testMaxSendEmailToFriend()
-+    {
-+        /** @var SendFriend $sendFriend */
-+        $sendFriend = $this->sendFriendFactory->create();
-+
-+        $productId = (int)$this->productRepository->get('simple_product')->getId();
-+        $recipients = '{
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               },
-+               {
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               },
-+               {
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               },
-+               {
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               },
-+               {
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               },
-+               {
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               }';
-+
-+        $query = $this->getQuery($productId, $recipients);
-+
-+        $this->expectException(\Exception::class);
-+        $this->expectExceptionMessage("No more than {$sendFriend->getMaxRecipients()} emails can be sent at a time.");
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-+     * @dataProvider sendFriendsErrorsDataProvider
-+     * @param string $input
-+     * @param string $errorMessage
-+     */
-+    public function testErrors(string $input, string $errorMessage)
-+    {
-+        $query =
-+            <<<QUERY
-+mutation {
-+    sendEmailToFriend(
-+        input: {
-+          $input
-+        } 
-+    ) {
-+        sender {
-+            name
-+            email
-+            message
-+        }
-+        recipients {
-+            name
-+            email
-+        }
-+    }
-+}
-+QUERY;
-+        $this->expectException(\Exception::class);
-+        $this->expectExceptionMessage($errorMessage);
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * TODO: use magentoApiConfigFixture (to be merged https://github.com/magento/graphql-ce/pull/351)
-+     * @magentoApiDataFixture Magento/SendFriend/Fixtures/sendfriend_configuration.php
-+     */
-+    public function testLimitMessagesPerHour()
-+    {
-+
-+        /** @var SendFriend $sendFriend */
-+        $sendFriend = $this->sendFriendFactory->create();
-+
-+        $productId = (int)$this->productRepository->get('simple_product')->getId();
-+        $recipients = '{
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               },
-+              {
-+                  name: "Recipient Name 2"
-+                  email:"recipient2@mail.com"
-+              }';
-+        $query = $this->getQuery($productId, $recipients);
-+
-+        $this->expectException(\Exception::class);
-+        $this->expectExceptionMessage(
-+            "You can't send messages more than {$sendFriend->getMaxSendsToFriend()} times an hour."
-+        );
-+
-+        $maxSendToFriends = $sendFriend->getMaxSendsToFriend();
-+        for ($i = 0; $i <= $maxSendToFriends + 1; $i++) {
-+            $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+        }
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     */
-+    public function testSendProductWithoutSenderEmail()
-+    {
-+        $productId = (int)$this->productRepository->get('simple_product')->getId();
-+        $recipients = '{
-+                  name: "Recipient Name 1"
-+                  email:""
-+               }';
-+        $query = $this->getQuery($productId, $recipients);
-+
-+        $this->expectException(\Exception::class);
-+        $this->expectExceptionMessage('GraphQL response contains errors: Please provide Email for all of recipients.');
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product_without_visibility.php
-+     */
-+    public function testSendProductWithoutVisibility()
-+    {
-+        $productId = (int)$this->productRepository->get('simple_product_without_visibility')->getId();
-+        $recipients = '{
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               },
-+              {
-+                  name: "Recipient Name 2"
-+                  email:"recipient2@mail.com"
-+              }';
-+        $query = $this->getQuery($productId, $recipients);
-+        $this->expectExceptionMessage(
-+            'The product that was requested doesn\'t exist. Verify the product and try again.'
-+        );
-+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function sendFriendsErrorsDataProvider()
-+    {
-+        return [
-+            [
-+          'product_id: 1	
-+         sender: {
-+            name: "Name"
-+            email: "e@mail.com"
-+            message: "Lorem Ipsum"
-+        }          
-+          recipients: [
-+              {
-+                  name: ""
-+                  email:"recipient1@mail.com"
-+               },
-+              {
-+                  name: ""
-+                  email:"recipient2@mail.com"
-+              }
-+          ]', 'Please provide Name for all of recipients.'
-+            ],
-+            [
-+                'product_id: 1	
-+          sender: {
-+            name: "Name"
-+            email: "e@mail.com"
-+            message: "Lorem Ipsum"
-+        }          
-+          recipients: [
-+              {
-+                  name: "Recipient Name 1"
-+                  email:""
-+               },
-+              {
-+                  name: "Recipient Name 2"
-+                  email:""
-+              }
-+          ]', 'Please provide Email for all of recipients.'
-+            ],
-+            [
-+                'product_id: 1	
-+          sender: {
-+            name: ""
-+            email: "e@mail.com"
-+            message: "Lorem Ipsum"
-+        }          
-+          recipients: [
-+              {
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               },
-+              {
-+                  name: "Recipient Name 2"
-+                  email:"recipient2@mail.com"
-+              }
-+          ]', 'Please provide Name of sender.'
-+            ],
-+            [
-+                'product_id: 1	
-+          sender: {
-+            name: "Name"
-+            email: "e@mail.com"
-+            message: ""
-+        }          
-+          recipients: [
-+              {
-+                  name: "Recipient Name 1"
-+                  email:"recipient1@mail.com"
-+               },
-+              {
-+                  name: "Recipient Name 2"
-+                  email:"recipient2@mail.com"
-+              }
-+          ]', 'Please provide Message.'
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * Generic assertions for send a friend response
-+     *
-+     * @param array $response
-+     */
-+    private function assertResponse(array $response): void
-+    {
-+        self::assertEquals('Name', $response['sendEmailToFriend']['sender']['name']);
-+        self::assertEquals('e@mail.com', $response['sendEmailToFriend']['sender']['email']);
-+        self::assertEquals('Lorem Ipsum', $response['sendEmailToFriend']['sender']['message']);
-+        self::assertEquals('Recipient Name 1', $response['sendEmailToFriend']['recipients'][0]['name']);
-+        self::assertEquals('recipient1@mail.com', $response['sendEmailToFriend']['recipients'][0]['email']);
-+        self::assertEquals('Recipient Name 2', $response['sendEmailToFriend']['recipients'][1]['name']);
-+        self::assertEquals('recipient2@mail.com', $response['sendEmailToFriend']['recipients'][1]['email']);
-+    }
-+
-+    /**
-+     * Retrieve customer authorization headers
-+     *
-+     * @param string $username
-+     * @param string $password
-+     * @return array
-+     * @throws AuthenticationException
-+     */
-+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+        return $headerMap;
-+    }
-+
-+    /**
-+     * @param int $productId
-+     * @param string $recipients
-+     * @return string
-+     */
-+    private function getQuery(int $productId, string $recipients): string
-+    {
-+        return <<<QUERY
-+mutation {
-+    sendEmailToFriend(
-+        input: {
-+          product_id: {$productId}
-+          sender: {
-+            name: "Name"
-+            email: "e@mail.com"
-+            message: "Lorem Ipsum"
-+        }          
-+          recipients: [{$recipients}]
-+        } 
-+    ) {
-+        sender {
-+            name
-+            email
-+            message
-+        }
-+        recipients {
-+            name
-+            email
-+        }
-+    }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
-index 4657a1e763a..a536022e316 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
-@@ -25,6 +25,7 @@ class StoreConfigResolverTest extends GraphQlAbstract
- 
-     protected function setUp()
-     {
-+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
-         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-     }
- 
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php
-index 4d0797d32e4..dfbe943ecdc 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php
-@@ -325,29 +325,4 @@ QUERY;
- 
-         $this->assertResponseFields($actualResponse, $assertionMap);
-     }
--
--    /**
--     * @param array $actualResponse
--     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
--     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
--     */
--    private function assertResponseFields($actualResponse, $assertionMap)
--    {
--        foreach ($assertionMap as $key => $assertionData) {
--            $expectedValue = isset($assertionData['expected_value'])
--                ? $assertionData['expected_value']
--                : $assertionData;
--            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
--            $this->assertNotNull(
--                $expectedValue,
--                "Value of '{$responseField}' field must not be NULL"
--            );
--            $this->assertEquals(
--                $expectedValue,
--                $actualResponse[$responseField],
--                "Value of '{$responseField}' field in response does not match expected value: "
--                . var_export($expectedValue, true)
--            );
--        }
--    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
-index b6e1a61f035..c85f63c0837 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
-@@ -28,10 +28,31 @@ mutation {
- }
- MUTATION;
- 
--        $response = $this->graphQlQuery($query);
-+        $response = $this->graphQlMutation($query);
-         $this->assertArrayHasKey('testItem', $response);
-         $testItem = $response['testItem'];
-         $this->assertArrayHasKey('integer_list', $testItem);
-         $this->assertEquals([4, 5, 6], $testItem['integer_list']);
-     }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Mutation requests allowed only for POST requests
-+     */
-+    public function testMutationIsNotAllowedViaGetRequest()
-+    {
-+        $id = 3;
-+
-+        $query = <<<MUTATION
-+mutation {
-+  testItem(id: {$id}) {
-+    item_id,
-+    name,
-+    integer_list
-+  }
-+}
-+MUTATION;
-+
-+        $this->graphQlQuery($query, [], '', []);
-+    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
-index d59e255daa1..2db06e38375 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
-@@ -58,4 +58,46 @@ QUERY;
-         $this->assertArrayHasKey('integer_list', $testItem);
-         $this->assertEquals([3, 4, 5], $testItem['integer_list']);
-     }
-+
-+    public function testQueryViaGetRequestReturnsResults()
-+    {
-+        $id = 1;
-+
-+        $query = <<<QUERY
-+{
-+    testItem(id: {$id})
-+    {
-+        item_id
-+        name
-+    }
-+}
-+QUERY;
-+
-+        $response = $this->graphQlQuery($query, [], '', []);
-+
-+        $this->assertArrayHasKey('testItem', $response);
-+    }
-+
-+    public function testQueryViaGetRequestWithVariablesReturnsResults()
-+    {
-+        $id = 1;
-+
-+        $query = <<<QUERY
-+query getTestItem(\$id: Int!)
-+{
-+    testItem(id: \$id)
-+    {
-+        item_id
-+        name
-+    }
-+}
-+QUERY;
-+        $variables = [
-+            "id" => $id
-+        ];
-+
-+        $response = $this->graphQlQuery($query, $variables, '', []);
-+
-+        $this->assertArrayHasKey('testItem', $response);
-+    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
-new file mode 100644
-index 00000000000..7de689a6ad0
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
-@@ -0,0 +1,245 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Ups;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting "UPS" shipping method on cart. Current class covers the next UPS shipping methods:
-+ *
-+ * | Code      | Label
-+ * --------------------------------------
-+ * | 1DM       | Next Day Air Early AM
-+ * | 1DA       | Next Day Air
-+ * | 2DA       | 2nd Day Air
-+ * | 3DS       | 3 Day Select
-+ * | GND       | Ground
-+ * | STD       | Canada Standard
-+ * | XPR       | Worldwide Express
-+ * | WXS       | Worldwide Express Saver
-+ * | XDM       | Worldwide Express Plus
-+ * | XPD       | Worldwide Expedited
-+ *
-+ * Current class does not cover these UPS shipping methods (depends on address and sandbox settings)
-+ *
-+ * | Code      | Label
-+ * --------------------------------------
-+ * | 1DML      | Next Day Air Early AM Letter
-+ * | 1DAL      | Next Day Air Letter
-+ * | 1DAPI     | Next Day Air Intra (Puerto Rico)
-+ * | 1DP       | Next Day Air Saver
-+ * | 1DPL      | Next Day Air Saver Letter
-+ * | 2DM       | 2nd Day Air AM
-+ * | 2DML      | 2nd Day Air AM Letter
-+ * | 2DAL      | 2nd Day Air Letter
-+ * | GNDCOM    | Ground Commercial
-+ * | GNDRES    | Ground Residential
-+ * | XPRL      | Worldwide Express Letter
-+ * | XDML      | Worldwide Express Plus Letter
-+ */
-+class SetUpsShippingMethodsOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * Defines carrier title for "UPS" shipping method
-+     */
-+    const CARRIER_TITLE = 'United Parcel Service';
-+
-+    /**
-+     * Defines carrier code for "UPS" shipping method
-+     */
-+    const CARRIER_CODE = 'ups';
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
-+     *
-+     * @dataProvider dataProviderShippingMethods
-+     * @param string $methodCode
-+     * @param string $methodTitle
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function testSetUpsShippingMethod(string $methodCode, string $methodTitle)
-+    {
-+        $quoteReservedId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-+
-+        $query = $this->getQuery($maskedQuoteId, self::CARRIER_CODE, $methodCode);
-+        $response = $this->sendRequestWithToken($query);
-+
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals(self::CARRIER_TITLE, $shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodTitle, $shippingAddress['selected_shipping_method']['method_title']);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderShippingMethods(): array
-+    {
-+        return [
-+            'Next Day Air Early AM' => ['1DM', 'Next Day Air Early AM'],
-+            'Next Day Air' => ['1DA', 'Next Day Air'],
-+            '2nd Day Air' => ['2DA', '2nd Day Air'],
-+            '3 Day Select' => ['3DS', '3 Day Select'],
-+            'Ground' => ['GND', 'Ground'],
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
-+     *
-+     * @dataProvider dataProviderShippingMethodsBasedOnCanadaAddress
-+     * @param string $methodCode
-+     * @param string $methodTitle
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function testSetUpsShippingMethodBasedOnCanadaAddress(string $methodCode, string $methodTitle)
-+    {
-+        $quoteReservedId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-+
-+        $query = $this->getQuery($maskedQuoteId, self::CARRIER_CODE, $methodCode);
-+        $response = $this->sendRequestWithToken($query);
-+
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals(self::CARRIER_TITLE, $shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodTitle, $shippingAddress['selected_shipping_method']['method_title']);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderShippingMethodsBasedOnCanadaAddress(): array
-+    {
-+        return [
-+            'Canada Standard' => ['STD', 'Canada Standard'],
-+            'Worldwide Express' => ['XPR', 'Worldwide Express'],
-+            'Worldwide Express Saver' => ['WXS', 'Worldwide Express Saver'],
-+            'Worldwide Express Plus' => ['XDM', 'Worldwide Express Plus'],
-+            'Worldwide Expedited' => ['XPD', 'Worldwide Expedited'],
-+        ];
-+    }
-+
-+    /**
-+     * Generates query for setting the specified shipping method on cart
-+     *
-+     * @param string $maskedQuoteId
-+     * @param string $carrierCode
-+     * @param string $methodCode
-+     * @return string
-+     */
-+    private function getQuery(
-+        string $maskedQuoteId,
-+        string $carrierCode,
-+        string $methodCode
-+    ): string {
-+        return <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input: {
-+    cart_id: "$maskedQuoteId"
-+    shipping_methods: [
-+      {
-+        carrier_code: "$carrierCode"
-+        method_code: "$methodCode"
-+      }
-+    ]
-+  }) {
-+    cart {
-+      shipping_addresses {
-+        selected_shipping_method {
-+          carrier_code
-+          method_code
-+          carrier_title
-+          method_title
-+        }
-+      }
-+    } 
-+  }
-+}        
-+QUERY;
-+    }
-+
-+    /**
-+     * Sends a GraphQL request with using a bearer token
-+     *
-+     * @param string $query
-+     * @return array
-+     * @throws \Magento\Framework\Exception\AuthenticationException
-+     */
-+    private function sendRequestWithToken(string $query): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+
-+        return $this->graphQlMutation($query, [], '', $headerMap);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php
-index 0bd24ee7bc8..8eaf3348353 100644
---- a/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php
-@@ -12,6 +12,10 @@ use Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator;
- use Magento\TestFramework\ObjectManager;
- use Magento\TestFramework\TestCase\GraphQlAbstract;
- use Magento\UrlRewrite\Model\UrlFinderInterface;
-+use Magento\Cms\Helper\Page as PageHelper;
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\UrlRewrite\Model\UrlRewrite;
- 
- /**
-  * Test the GraphQL endpoint's URLResolver query to verify canonical URL's are correctly returned.
-@@ -28,7 +32,7 @@ class UrlResolverTest extends GraphQlAbstract
-     }
- 
-     /**
--     * Tests if target_path(canonical_url) is resolved for Product entity
-+     * Tests if target_path(relative_url) is resolved for Product entity
-      *
-      * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
-      */
-@@ -57,7 +61,7 @@ class UrlResolverTest extends GraphQlAbstract
-   urlResolver(url:"{$urlPath}")
-   {
-    id
--   canonical_url
-+   relative_url
-    type
-   }
- }
-@@ -65,12 +69,12 @@ QUERY;
-         $response = $this->graphQlQuery($query);
-         $this->assertArrayHasKey('urlResolver', $response);
-         $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']);
--        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
-+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
-         $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
-     }
- 
-     /**
--     * Tests the use case where canonical_url is provided as resolver input in the Query
-+     * Tests the use case where relative_url is provided as resolver input in the Query
-      *
-      * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
-      */
-@@ -101,7 +105,7 @@ QUERY;
-   urlResolver(url:"{$canonicalPath}")
-   {
-    id
--   canonical_url
-+   relative_url
-    type
-   }
- }
-@@ -109,7 +113,7 @@ QUERY;
-         $response = $this->graphQlQuery($query);
-         $this->assertArrayHasKey('urlResolver', $response);
-         $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']);
--        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
-+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
-         $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
-     }
- 
-@@ -144,7 +148,7 @@ QUERY;
-   urlResolver(url:"{$urlPath2}")
-   {
-    id
--   canonical_url
-+   relative_url
-    type
-   }
- }
-@@ -152,7 +156,7 @@ QUERY;
-         $response = $this->graphQlQuery($query);
-         $this->assertArrayHasKey('urlResolver', $response);
-         $this->assertEquals($categoryId, $response['urlResolver']['id']);
--        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
-+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
-         $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
-     }
- 
-@@ -180,14 +184,14 @@ QUERY;
-   urlResolver(url:"{$requestPath}")
-   {
-    id
--   canonical_url
-+   relative_url
-    type
-   }
- }
- QUERY;
-         $response = $this->graphQlQuery($query);
-         $this->assertEquals($cmsPageId, $response['urlResolver']['id']);
--        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
-+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
-         $this->assertEquals(strtoupper(str_replace('-', '_', $expectedEntityType)), $response['urlResolver']['type']);
-     }
- 
-@@ -223,7 +227,7 @@ QUERY;
-   urlResolver(url:"{$urlPath}")
-   {
-    id
--   canonical_url
-+   relative_url
-    type
-   }
- }
-@@ -231,7 +235,7 @@ QUERY;
-         $response = $this->graphQlQuery($query);
-         $this->assertArrayHasKey('urlResolver', $response);
-         $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']);
--        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
-+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
-         $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
-     }
- 
-@@ -263,7 +267,7 @@ QUERY;
-   urlResolver(url:"{$urlPath}")
-   {
-    id
--   canonical_url
-+   relative_url
-    type
-   }
- }
-@@ -304,7 +308,7 @@ QUERY;
-   urlResolver(url:"/{$urlPath}")
-   {
-    id
--   canonical_url
-+   relative_url
-    type
-   }
- }
-@@ -312,7 +316,7 @@ QUERY;
-         $response = $this->graphQlQuery($query);
-         $this->assertArrayHasKey('urlResolver', $response);
-         $this->assertEquals($categoryId, $response['urlResolver']['id']);
--        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
-+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
-         $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
-     }
- 
-@@ -321,22 +325,99 @@ QUERY;
-      */
-     public function testResolveSlash()
-     {
-+        /** @var \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface */
-+        $scopeConfigInterface = $this->objectManager->get(ScopeConfigInterface::class);
-+        $homePageIdentifier = $scopeConfigInterface->getValue(
-+            PageHelper::XML_PATH_HOME_PAGE,
-+            ScopeInterface::SCOPE_STORE
-+        );
-+        /** @var \Magento\Cms\Model\Page $page */
-+        $page = $this->objectManager->get(\Magento\Cms\Model\Page::class);
-+        $page->load($homePageIdentifier);
-+        $homePageId = $page->getId();
-+        /** @var \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator $urlPathGenerator */
-+        $urlPathGenerator = $this->objectManager->get(\Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator::class);
-+        /** @param \Magento\Cms\Api\Data\PageInterface $page */
-+        $targetPath = $urlPathGenerator->getCanonicalUrlPath($page);
-         $query
-             = <<<QUERY
- {
-   urlResolver(url:"/")
-   {
-    id
--   canonical_url
-+   relative_url
-    type
-   }
- }
- QUERY;
-         $response = $this->graphQlQuery($query);
--
-         $this->assertArrayHasKey('urlResolver', $response);
--        $this->assertEquals(2, $response['urlResolver']['id']);
--        $this->assertEquals('cms/page/view/page_id/2', $response['urlResolver']['canonical_url']);
-+        $this->assertEquals($homePageId, $response['urlResolver']['id']);
-+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
-         $this->assertEquals('CMS_PAGE', $response['urlResolver']['type']);
-     }
-+
-+    /**
-+     * Test for custom type which point to the valid product/category/cms page.
-+     *
-+     * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
-+     */
-+    public function testGetNonExistentUrlRewrite()
-+    {
-+        $urlPath = 'non-exist-product.html';
-+        /** @var UrlRewrite $urlRewrite */
-+        $urlRewrite = $this->objectManager->create(UrlRewrite::class);
-+        $urlRewrite->load($urlPath, 'request_path');
-+
-+        /** @var  UrlFinderInterface $urlFinder */
-+        $urlFinder = $this->objectManager->get(UrlFinderInterface::class);
-+        $actualUrls = $urlFinder->findOneByData(
-+            [
-+                'request_path' => $urlPath,
-+                'store_id' => 1
-+            ]
-+        );
-+        $targetPath = $actualUrls->getTargetPath();
-+
-+        $query = <<<QUERY
-+{
-+  urlResolver(url:"{$urlPath}")
-+  {
-+   id
-+   relative_url
-+   type
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query);
-+        $this->assertArrayHasKey('urlResolver', $response);
-+        $this->assertEquals('PRODUCT', $response['urlResolver']['type']);
-+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
-+    }
-+
-+    /**
-+     * Test for custom type which point to the invalid product/category/cms page.
-+     *
-+     * @magentoApiDataFixture Magento/UrlRewrite/_files/url_rewrite_not_existing_entity.php
-+     */
-+    public function testNonExistentEntityUrlRewrite()
-+    {
-+        $urlPath = 'non-exist-entity.html';
-+
-+        $query = <<<QUERY
-+{
-+  urlResolver(url:"{$urlPath}")
-+  {
-+   id
-+   relative_url
-+   type
-+  }
-+}
-+QUERY;
-+
-+        $this->expectExceptionMessage(
-+            "No such entity found with matching URL key: " . $urlPath
-+        );
-+        $this->graphQlQuery($query);
-+    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Usps/SetUspsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Usps/SetUspsShippingMethodsOnCartTest.php
-new file mode 100644
-index 00000000000..80e66370e0f
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Usps/SetUspsShippingMethodsOnCartTest.php
-@@ -0,0 +1,272 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Usps;
-+
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+
-+/**
-+ * Test for setting USPS shipping method on cart.
-+ * Current class covers following base USPS shipping methods:
-+ *
-+ * | Code      | Label
-+ * --------------------------------------
-+ * | 1         | Priority Mail
-+ * | 2         | Priority Mail Express Hold For Pickup
-+ * | 3         | Priority Mail Express
-+ * | 6         | Media Mail
-+ * | 7         | Library Mail
-+ * | 13        | Priority Mail Express Flat Rate Envelope
-+ * | 16        | Priority Mail Flat Rate Envelope
-+ * | 17        | Priority Mail Medium Flat Rate Box
-+ * | 22        | Priority Mail Large Flat Rate Box
-+ * | 27        | Priority Mail Express Flat Rate Envelope Hold For Pickup
-+ * | 28        | Priority Mail Small Flat Rate Box
-+ * | INT_1     | Priority Mail Express International
-+ * | INT_2     | Priority Mail International
-+ * | INT_8     | Priority Mail International Flat Rate Envelope
-+ * | INT_9     | Priority Mail International Medium Flat Rate Box
-+ * | INT_10    | Priority Mail Express International Flat Rate Envelope
-+ * | INT_11    | Priority Mail International Large Flat Rate Box
-+ * | INT_12    | USPS GXG Envelopes
-+ * | INT_15    | First-Class Package International Service
-+ * | INT_16    | Priority Mail International Small Flat Rate Box
-+ * | INT_20    | Priority Mail International Small Flat Rate Envelope
-+ */
-+class SetUspsShippingMethodsOnCartTest extends GraphQlAbstract
-+{
-+    /**
-+     * Defines carrier label for "USPS" shipping method
-+     */
-+    const CARRIER_TITLE = 'United States Postal Service';
-+
-+    /**
-+     * Defines carrier code for "USPS" shipping method
-+     */
-+    const CARRIER_CODE = 'usps';
-+
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var GetMaskedQuoteIdByReservedOrderId
-+     */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_weight_to_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Usps/_files/enable_usps_shipping_method.php
-+     *
-+     * @dataProvider dataProviderShippingMethods
-+     * @param string $methodCode
-+     * @param string $methodLabel
-+     */
-+    public function testSetUspsShippingMethod(string $methodCode, string $methodLabel)
-+    {
-+        $quoteReservedId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-+
-+        $query = $this->getQuery($maskedQuoteId, self::CARRIER_CODE, $methodCode);
-+        $response = $this->sendRequestWithToken($query);
-+
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals(self::CARRIER_TITLE, $shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodLabel, $shippingAddress['selected_shipping_method']['method_title']);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderShippingMethods(): array
-+    {
-+        return [
-+            'Library Mail Parcel' =>
-+                ['7', 'Library Mail Parcel'],
-+            'Media Mail Parcel' => ['6', 'Media Mail Parcel'],
-+            'Priority Mail 3-Day Small Flat Rate Box' =>
-+                ['28', 'Priority Mail 3-Day Small Flat Rate Box'],
-+            'Priority Mail 3-Day Flat Rate Envelope' =>
-+                ['16', 'Priority Mail 3-Day Flat Rate Envelope'],
-+            'Priority Mail 3-Day' => ['1', 'Priority Mail 3-Day'],
-+            'Priority Mail 3-Day Small Flat Rate Envelope' =>
-+                ['42', 'Priority Mail 3-Day Small Flat Rate Envelope'],
-+            'Priority Mail 3-Day Medium Flat Rate Box' =>
-+                ['17', 'Priority Mail 3-Day Medium Flat Rate Box'],
-+            'Priority Mail 3-Day Large Flat Rate Box' =>
-+                ['22', 'Priority Mail 3-Day Large Flat Rate Box'],
-+            'Priority Mail Express 2-Day Flat Rate Envelope' =>
-+                ['13', 'Priority Mail Express 2-Day Flat Rate Envelope'],
-+            'Priority Mail Express 2-Day Flat Rate Envelope Hold For Pickup' =>
-+                ['27', 'Priority Mail Express 2-Day Flat Rate Envelope Hold For Pickup'],
-+            'Priority Mail Express 2-Day' =>
-+                ['3', 'Priority Mail Express 2-Day'],
-+            'Priority Mail Express 2-Day Hold For Pickup' =>
-+                ['2', 'Priority Mail Express 2-Day Hold For Pickup'],
-+        ];
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_weight_to_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
-+     * @magentoApiDataFixture Magento/GraphQl/Usps/_files/enable_usps_shipping_method.php
-+     *
-+     * @dataProvider dataProviderShippingMethodsBasedOnCanadaAddress
-+     * @param string $methodCode
-+     * @param string $methodLabel
-+     */
-+    public function testSetUspsShippingMethodBasedOnCanadaAddress(string $methodCode, string $methodLabel)
-+    {
-+        $quoteReservedId = 'test_quote';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-+
-+        $query = $this->getQuery($maskedQuoteId, self::CARRIER_CODE, $methodCode);
-+        $response = $this->sendRequestWithToken($query);
-+
-+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+
-+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-+
-+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-+
-+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-+
-+        self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals(self::CARRIER_TITLE, $shippingAddress['selected_shipping_method']['carrier_title']);
-+
-+        self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-+        self::assertEquals($methodLabel, $shippingAddress['selected_shipping_method']['method_title']);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderShippingMethodsBasedOnCanadaAddress(): array
-+    {
-+        return [
-+            'First-Class Package International Service' =>
-+                ['INT_15', 'First-Class Package International Service'],
-+            'Priority Mail International Small Flat Rate Envelope' =>
-+                ['INT_20', 'Priority Mail International Small Flat Rate Envelope'],
-+            'Priority Mail International Flat Rate Envelope' =>
-+                ['INT_8', 'Priority Mail International Flat Rate Envelope'],
-+            'Priority Mail International Small Flat Rate Box' =>
-+                ['INT_16', 'Priority Mail International Small Flat Rate Box'],
-+            'Priority Mail International' =>
-+                ['INT_2', 'Priority Mail International'],
-+            'Priority Mail Express International Flat Rate Envelope' =>
-+                ['INT_10', 'Priority Mail Express International Flat Rate Envelope'],
-+            'Priority Mail Express International' =>
-+                ['INT_1', 'Priority Mail Express International'],
-+            'Priority Mail International Medium Flat Rate Box' =>
-+                ['INT_9', 'Priority Mail International Medium Flat Rate Box'],
-+            'Priority Mail International Large Flat Rate Box' =>
-+                ['INT_11', 'Priority Mail International Large Flat Rate Box'],
-+            'USPS GXG Envelopes' =>
-+                ['INT_12', 'USPS GXG Envelopes'],
-+        ];
-+    }
-+
-+    /**
-+     * Generates query for setting the specified shipping method on cart
-+     *
-+     * @param string $maskedQuoteId
-+     * @param string $carrierCode
-+     * @param string $methodCode
-+     * @return string
-+     */
-+    private function getQuery(
-+        string $maskedQuoteId,
-+        string $carrierCode,
-+        string $methodCode
-+    ): string {
-+        return <<<QUERY
-+mutation {
-+  setShippingMethodsOnCart(input: {
-+    cart_id: "$maskedQuoteId"
-+    shipping_methods: [
-+      {
-+        carrier_code: "$carrierCode"
-+        method_code: "$methodCode"
-+      }
-+    ]
-+  }) {
-+    cart {
-+      shipping_addresses {
-+        selected_shipping_method {
-+          carrier_code
-+          method_code
-+          carrier_title
-+          method_title
-+        }
-+      }
-+    } 
-+  }
-+}        
-+QUERY;
-+    }
-+
-+    /**
-+     * Sends a GraphQL request with using a bearer token
-+     *
-+     * @param string $query
-+     * @return array
-+     * @throws \Magento\Framework\Exception\AuthenticationException
-+     */
-+    private function sendRequestWithToken(string $query): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-+
-+        return $this->graphQlMutation($query, [], '', $headerMap);
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php
-new file mode 100644
-index 00000000000..7448b165fc2
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php
-@@ -0,0 +1,81 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+
-+class VariablesSupportQueryTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    protected function setUp()
-+    {
-+        $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/products_list.php
-+     */
-+    public function testQueryObjectVariablesSupport()
-+    {
-+        $productSku = 'simple-249';
-+        $minPrice = 153;
-+
-+        $query
-+            = <<<'QUERY'
-+query GetProductsQuery($pageSize: Int, $filterInput: ProductFilterInput, $priceSort: SortEnum) {
-+  products(
-+    pageSize: $pageSize
-+    filter: $filterInput
-+    sort: {price: $priceSort}
-+  ) {
-+    items {
-+      sku
-+      price {
-+        minimalPrice {
-+          amount {
-+            value
-+            currency
-+          }          
-+        }
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $variables = [
-+            'pageSize' => 1,
-+            'priceSort' => 'ASC',
-+            'filterInput' => [
-+                'min_price' => [
-+                    'gt' => 150,
-+                ],
-+            ],
-+        ];
-+
-+        $response = $this->graphQlQuery($query, $variables);
-+        /** @var \Magento\Catalog\Model\Product $product */
-+        $product = $this->productRepository->get($productSku, false, null, true);
-+
-+        self::assertArrayHasKey('products', $response);
-+        self::assertArrayHasKey('items', $response['products']);
-+        self::assertEquals(1, count($response['products']['items']));
-+        self::assertArrayHasKey(0, $response['products']['items']);
-+        self::assertEquals($product->getSku(), $response['products']['items'][0]['sku']);
-+        self::assertEquals(
-+            $minPrice,
-+            $response['products']['items'][0]['price']['minimalPrice']['amount']['value']
-+        );
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php
-new file mode 100644
-index 00000000000..45c82906d25
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php
-@@ -0,0 +1,214 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Vault;
-+
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\Vault\Model\PaymentTokenManagement;
-+use Magento\Vault\Model\ResourceModel\PaymentToken as TokenResource;
-+use Magento\Vault\Model\ResourceModel\PaymentToken\CollectionFactory;
-+
-+/**
-+ * Tests for customer payment tokens
-+ */
-+class CustomerPaymentTokensTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var PaymentTokenManagement
-+     */
-+    private $paymentTokenManagement;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $tokenCollectionFactory;
-+
-+    /**
-+     * @var TokenResource
-+     */
-+    private $tokenResource;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-+        $this->paymentTokenManagement = Bootstrap::getObjectManager()->get(PaymentTokenManagement::class);
-+        $this->tokenResource = Bootstrap::getObjectManager()->get(TokenResource::class);
-+        $this->tokenCollectionFactory = Bootstrap::getObjectManager()->get(CollectionFactory::class);
-+    }
-+
-+    protected function tearDown()
-+    {
-+        parent::tearDown();
-+
-+        $collection = $this->tokenCollectionFactory->create();
-+        $collection->addFieldToFilter('customer_id', ['eq' => 1]);
-+
-+        foreach ($collection->getItems() as $token) {
-+            // Using the resource directly to delete. Deleting from the repository only makes token inactive
-+            $this->tokenResource->delete($token);
-+        }
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Vault/_files/payment_tokens.php
-+     */
-+    public function testGetCustomerPaymentTokens()
-+    {
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+
-+        $query = <<<QUERY
-+query {
-+    customerPaymentTokens {
-+        items {
-+            public_hash
-+            details
-+            payment_method_code
-+            type
-+        }
-+    }
-+}
-+QUERY;
-+        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
-+
-+        $this->assertEquals(2, count($response['customerPaymentTokens']['items']));
-+        $this->assertArrayHasKey('public_hash', $response['customerPaymentTokens']['items'][0]);
-+        $this->assertArrayHasKey('details', $response['customerPaymentTokens']['items'][0]);
-+        $this->assertArrayHasKey('payment_method_code', $response['customerPaymentTokens']['items'][0]);
-+        $this->assertArrayHasKey('type', $response['customerPaymentTokens']['items'][0]);
-+        // Validate gateway token is NOT returned
-+        $this->assertArrayNotHasKey('gateway_token', $response['customerPaymentTokens']['items'][0]);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage GraphQL response contains errors: The current customer isn't authorized.
-+     */
-+    public function testGetCustomerPaymentTokensIfUserIsNotAuthorized()
-+    {
-+        $query = <<<QUERY
-+query {
-+    customerPaymentTokens {
-+        items {
-+            public_hash
-+            details
-+            payment_method_code
-+            type
-+        }
-+    }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Vault/_files/payment_tokens.php
-+     */
-+    public function testDeletePaymentToken()
-+    {
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+        $tokens = $this->paymentTokenManagement->getVisibleAvailableTokens(1);
-+        $token = current($tokens);
-+        $publicHash = $token->getPublicHash();
-+
-+        $query = <<<QUERY
-+mutation {
-+  deletePaymentToken(
-+    public_hash: "$publicHash"
-+  ) {
-+    result
-+    customerPaymentTokens {
-+      items {
-+        public_hash
-+        details
-+        payment_method_code
-+        type
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $response = $this->graphQlMutation(
-+            $query,
-+            [],
-+            '',
-+            $this->getCustomerAuthHeaders($currentEmail, $currentPassword)
-+        );
-+
-+        $this->assertTrue($response['deletePaymentToken']['result']);
-+        $this->assertEquals(1, count($response['deletePaymentToken']['customerPaymentTokens']['items']));
-+
-+        $token = $response['deletePaymentToken']['customerPaymentTokens']['items'][0];
-+        $this->assertArrayHasKey('public_hash', $token);
-+        $this->assertArrayHasKey('details', $token);
-+        $this->assertArrayHasKey('payment_method_code', $token);
-+        $this->assertArrayHasKey('type', $token);
-+        // Validate gateway token is NOT returned
-+        $this->assertArrayNotHasKey('gateway_token', $token);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage GraphQL response contains errors: The current customer isn't authorized.
-+     */
-+    public function testDeletePaymentTokenIfUserIsNotAuthorized()
-+    {
-+        $query = <<<QUERY
-+mutation {
-+  deletePaymentToken(
-+    public_hash: "ksdfk392ks"
-+  ) {
-+    result
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '');
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Vault/_files/payment_tokens.php
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage GraphQL response contains errors: Could not find a token using public hash: ksdfk392ks
-+     */
-+    public function testDeletePaymentTokenInvalidPublicHash()
-+    {
-+        $currentEmail = 'customer@example.com';
-+        $currentPassword = 'password';
-+
-+        $query = <<<QUERY
-+mutation {
-+  deletePaymentToken(
-+    public_hash: "ksdfk392ks"
-+  ) {
-+    result
-+  }
-+}
-+QUERY;
-+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
-+    }
-+
-+    /**
-+     * @param string $email
-+     * @param string $password
-+     * @return array
-+     */
-+    private function getCustomerAuthHeaders(string $email, string $password): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
-+        return ['Authorization' => 'Bearer ' . $customerToken];
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php
-new file mode 100644
-index 00000000000..4aac5d94459
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php
-@@ -0,0 +1,137 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Wishlist;
-+
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\GraphQlAbstract;
-+use Magento\Wishlist\Model\Item;
-+use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResourceModel;
-+use Magento\Wishlist\Model\WishlistFactory;
-+
-+class WishlistTest extends GraphQlAbstract
-+{
-+    /**
-+     * @var CustomerTokenServiceInterface
-+     */
-+    private $customerTokenService;
-+
-+    /**
-+     * @var WishlistFactory
-+     */
-+    private $wishlistFactory;
-+
-+    /**
-+     * @var WishlistResourceModel
-+     */
-+    private $wishlistResource;
-+
-+    protected function setUp()
-+    {
-+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-+        $this->wishlistFactory = Bootstrap::getObjectManager()->get(WishlistFactory::class);
-+        $this->wishlistResource = Bootstrap::getObjectManager()->get(WishlistResourceModel::class);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Wishlist/_files/wishlist.php
-+     */
-+    public function testGetCustomerWishlist(): void
-+    {
-+        /** @var \Magento\Wishlist\Model\Wishlist $wishlist */
-+        $wishlist = $this->wishlistFactory->create();
-+        $this->wishlistResource->load($wishlist, 1, 'customer_id');
-+
-+        /** @var Item $wishlistItem */
-+        $wishlistItem = $wishlist->getItemCollection()->getFirstItem();
-+        $wishlistItemProduct = $wishlistItem->getProduct();
-+        $query =
-+            <<<QUERY
-+{
-+  wishlist {
-+    items_count
-+    name
-+    sharing_code
-+    updated_at
-+    items {
-+      id
-+      qty
-+      description
-+      added_at
-+      product {
-+        sku
-+        name
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $response = $this->graphQlQuery(
-+            $query,
-+            [],
-+            '',
-+            $this->getCustomerAuthHeaders('customer@example.com', 'password')
-+        );
-+
-+        $this->assertEquals($wishlist->getItemsCount(), $response['wishlist']['items_count']);
-+        $this->assertEquals($wishlist->getName(), $response['wishlist']['name']);
-+        $this->assertEquals($wishlist->getSharingCode(), $response['wishlist']['sharing_code']);
-+        $this->assertEquals($wishlist->getUpdatedAt(), $response['wishlist']['updated_at']);
-+
-+        $this->assertEquals($wishlistItem->getId(), $response['wishlist']['items'][0]['id']);
-+        $this->assertEquals($wishlistItem->getData('qty'), $response['wishlist']['items'][0]['qty']);
-+        $this->assertEquals($wishlistItem->getDescription(), $response['wishlist']['items'][0]['description']);
-+        $this->assertEquals($wishlistItem->getAddedAt(), $response['wishlist']['items'][0]['added_at']);
-+
-+        $this->assertEquals($wishlistItemProduct->getSku(), $response['wishlist']['items'][0]['product']['sku']);
-+        $this->assertEquals($wishlistItemProduct->getName(), $response['wishlist']['items'][0]['product']['name']);
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage The current user cannot perform operations on wishlist
-+     */
-+    public function testGetGuestWishlist()
-+    {
-+        $query =
-+            <<<QUERY
-+{
-+  wishlist {
-+    items_count
-+    name
-+    sharing_code
-+    updated_at
-+    items {
-+      id
-+      qty
-+      description
-+      added_at
-+      product {
-+        sku
-+        name
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+        $this->graphQlQuery($query);
-+    }
-+
-+    /**
-+     * @param string $email
-+     * @param string $password
-+     * @return array
-+     * @throws \Magento\Framework\Exception\AuthenticationException
-+     */
-+    private function getCustomerAuthHeaders(string $email, string $password): array
-+    {
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
-+        return ['Authorization' => 'Bearer ' . $customerToken];
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/CartItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/CartItemRepositoryTest.php
-new file mode 100644
-index 00000000000..60249348144
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/CartItemRepositoryTest.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ *
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\GroupedProduct\Api;
-+
-+use Magento\Catalog\Model\CustomOptions\CustomOptionProcessor;
-+use Magento\Framework\Webapi\Rest\Request;
-+use Magento\Quote\Model\Quote;
-+use Magento\TestFramework\TestCase\WebapiAbstract;
-+
-+class CartItemRepositoryTest extends WebapiAbstract
-+{
-+    const SERVICE_VERSION = 'V1';
-+    const SERVICE_NAME = 'quoteCartItemRepositoryV1';
-+    const RESOURCE_PATH = '/V1/carts/';
-+
-+    /**
-+     * @var \Magento\TestFramework\ObjectManager
-+     */
-+    protected $objectManager;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-+     * @magentoApiDataFixture Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock.php
-+     */
-+    public function testAddGroupedProductToCartThatHasAnOutOfStockItemInTheGroup()
-+    {
-+        $this->_markTestAsRestOnly();
-+
-+        /** @var  \Magento\Catalog\Model\Product $product */
-+        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class)->load('100000003');
-+        $productSku = $product->getSku();
-+        /** @var Quote  $quote */
-+        $quote = $this->objectManager->create(Quote::class);
-+        $quote->load('test_order_1', 'reserved_order_id');
-+        $cartId = $quote->getId();
-+        $serviceInfo = [
-+            'rest' => [
-+                'resourcePath' => self::RESOURCE_PATH .  $cartId . '/items',
-+                'httpMethod' => Request::HTTP_METHOD_POST,
-+            ],
-+            'soap' => [
-+                'service' => self::SERVICE_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => self::SERVICE_NAME . 'Save',
-+            ],
-+        ];
-+
-+        $requestData = [
-+            'cartItem' => [
-+                'sku' => $productSku,
-+                'qty' => 1,
-+                'quote_id' => $cartId,
-+            ],
-+        ];
-+        $this->_webApiCall($serviceInfo, $requestData);
-+        $this->assertTrue($quote->hasProductId('100000001'));
-+        $this->assertFalse($quote->hasProductId('100000002'));
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartAddingItemsTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartAddingItemsTest.php
-new file mode 100644
-index 00000000000..b52c4fb6f0b
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartAddingItemsTest.php
-@@ -0,0 +1,95 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Api;
-+
-+use Magento\TestFramework\TestCase\WebapiAbstract;
-+
-+/**
-+ * Class for payment info in quote for registered customer.
-+ */
-+class CartAddingItemsTest extends WebapiAbstract
-+{
-+    /**
-+     * @var \Magento\TestFramework\ObjectManager
-+     */
-+    protected $objectManager;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+    }
-+
-+    /**
-+     * Test price for cart after adding product to.
-+     *
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_without_options_with_stock_data.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_one_address.php
-+     * @return void
-+     */
-+    public function testPriceForCreatingQuoteFromEmptyCart()
-+    {
-+        $this->_markTestAsRestOnly();
-+
-+        // Get customer ID token
-+        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
-+        $customerTokenService = $this->objectManager->create(
-+            \Magento\Integration\Api\CustomerTokenServiceInterface::class
-+        );
-+        $token = $customerTokenService->createCustomerAccessToken(
-+            'customer_one_address@test.com',
-+            'password'
-+        );
-+
-+        // Creating empty cart for registered customer.
-+        $serviceInfo = [
-+            'rest' => [
-+                'resourcePath' => '/V1/carts/mine',
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
-+                'token' => $token
-+            ]
-+        ];
-+
-+        $quoteId = $this->_webApiCall($serviceInfo, ['customerId' => 999]); // customerId 999 will get overridden
-+        $this->assertGreaterThan(0, $quoteId);
-+
-+        // Adding item to the cart
-+        $serviceInfoForAddingProduct = [
-+            'rest' => [
-+                'resourcePath' => '/V1/carts/mine/items',
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
-+                'token' => $token
-+            ]
-+        ];
-+        $requestData = [
-+            'cartItem' => [
-+                'quote_id' => $quoteId,
-+                'sku' => 'simple',
-+                'qty' => 1
-+            ]
-+        ];
-+        $item = $this->_webApiCall($serviceInfoForAddingProduct, $requestData);
-+        $this->assertNotEmpty($item);
-+        $this->assertEquals(10, $item['price']);
-+
-+        // Get payment information
-+        $serviceInfoForGettingPaymentInfo = [
-+            'rest' => [
-+                'resourcePath' => '/V1/carts/mine/payment-information',
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
-+                'token' => $token
-+            ]
-+        ];
-+        $paymentInfo = $this->_webApiCall($serviceInfoForGettingPaymentInfo);
-+        $this->assertEquals($paymentInfo['totals']['grand_total'], 10);
-+
-+        /** @var \Magento\Quote\Model\Quote $quote */
-+        $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class);
-+        $quote->load($quoteId);
-+        $quote->delete();
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartManagementTest.php
-index 80a4acbc563..6d585561ae3 100644
---- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartManagementTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartManagementTest.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Quote\Api;
- 
-@@ -66,7 +67,7 @@ class CartManagementTest extends WebapiAbstract
-     }
- 
-     /**
--     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_one_address.php
-      */
-     public function testCreateEmptyCartForCustomer()
-     {
-@@ -94,7 +95,7 @@ class CartManagementTest extends WebapiAbstract
-     }
- 
-     /**
--     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-+     * @magentoApiDataFixture Magento/Customer/_files/customer_one_address.php
-      */
-     public function testCreateEmptyCartAndGetCartForCustomer()
-     {
-@@ -105,7 +106,10 @@ class CartManagementTest extends WebapiAbstract
-         $customerTokenService = $this->objectManager->create(
-             \Magento\Integration\Api\CustomerTokenServiceInterface::class
-         );
--        $token = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-+        $token = $customerTokenService->createCustomerAccessToken(
-+            'customer_one_address@test.com',
-+            'password'
-+        );
- 
-         $serviceInfo = [
-             'rest' => [
-diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartTotalRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartTotalRepositoryTest.php
-index 609ae1cfe09..a3ded4f5f12 100644
---- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartTotalRepositoryTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartTotalRepositoryTest.php
-@@ -12,6 +12,8 @@ use Magento\Framework\Api\FilterBuilder;
- use Magento\Framework\Api\SearchCriteriaBuilder;
- use Magento\TestFramework\ObjectManager;
- use Magento\TestFramework\TestCase\WebapiAbstract;
-+use Magento\Quote\Model\Quote;
-+use Magento\Quote\Model\Quote\Address;
- 
- class CartTotalRepositoryTest extends WebapiAbstract
- {
-@@ -54,36 +56,11 @@ class CartTotalRepositoryTest extends WebapiAbstract
-         /** @var \Magento\Quote\Model\Quote\Address $shippingAddress */
-         $shippingAddress = $quote->getShippingAddress();
- 
--        $data = [
--            Totals::KEY_GRAND_TOTAL => $quote->getGrandTotal(),
--            Totals::KEY_BASE_GRAND_TOTAL => $quote->getBaseGrandTotal(),
--            Totals::KEY_SUBTOTAL => $quote->getSubtotal(),
--            Totals::KEY_BASE_SUBTOTAL => $quote->getBaseSubtotal(),
--            Totals::KEY_DISCOUNT_AMOUNT => $shippingAddress->getDiscountAmount(),
--            Totals::KEY_BASE_DISCOUNT_AMOUNT => $shippingAddress->getBaseDiscountAmount(),
--            Totals::KEY_SUBTOTAL_WITH_DISCOUNT => $quote->getSubtotalWithDiscount(),
--            Totals::KEY_BASE_SUBTOTAL_WITH_DISCOUNT => $quote->getBaseSubtotalWithDiscount(),
--            Totals::KEY_SHIPPING_AMOUNT => $shippingAddress->getShippingAmount(),
--            Totals::KEY_BASE_SHIPPING_AMOUNT => $shippingAddress->getBaseShippingAmount(),
--            Totals::KEY_SHIPPING_DISCOUNT_AMOUNT => $shippingAddress->getShippingDiscountAmount(),
--            Totals::KEY_BASE_SHIPPING_DISCOUNT_AMOUNT => $shippingAddress->getBaseShippingDiscountAmount(),
--            Totals::KEY_TAX_AMOUNT => $shippingAddress->getTaxAmount(),
--            Totals::KEY_BASE_TAX_AMOUNT => $shippingAddress->getBaseTaxAmount(),
--            Totals::KEY_SHIPPING_TAX_AMOUNT => $shippingAddress->getShippingTaxAmount(),
--            Totals::KEY_BASE_SHIPPING_TAX_AMOUNT => $shippingAddress->getBaseShippingTaxAmount(),
--            Totals::KEY_SUBTOTAL_INCL_TAX => $shippingAddress->getSubtotalInclTax(),
--            Totals::KEY_BASE_SUBTOTAL_INCL_TAX => $shippingAddress->getBaseSubtotalTotalInclTax(),
--            Totals::KEY_SHIPPING_INCL_TAX => $shippingAddress->getShippingInclTax(),
--            Totals::KEY_BASE_SHIPPING_INCL_TAX => $shippingAddress->getBaseShippingInclTax(),
--            Totals::KEY_BASE_CURRENCY_CODE => $quote->getBaseCurrencyCode(),
--            Totals::KEY_QUOTE_CURRENCY_CODE => $quote->getQuoteCurrencyCode(),
--            Totals::KEY_ITEMS_QTY => $quote->getItemsQty(),
--            Totals::KEY_ITEMS => [$this->getQuoteItemTotalsData($quote)],
--        ];
-+        $data = $this->getData($quote, $shippingAddress);
-+        $data = $this->formatTotalsData($data);
- 
-         $requestData = ['cartId' => $cartId];
- 
--        $data = $this->formatTotalsData($data);
-         $actual = $this->_webApiCall($this->getServiceInfoForTotalsService($cartId), $requestData);
-         unset($actual['items'][0]['options']);
-         unset($actual['weee_tax_applied_amount']);
-@@ -162,22 +139,22 @@ class CartTotalRepositoryTest extends WebapiAbstract
-         $item = array_shift($items);
-         return [
-             ItemTotals::KEY_ITEM_ID => $item->getItemId(),
--            ItemTotals::KEY_PRICE => intval($item->getPrice()),
--            ItemTotals::KEY_BASE_PRICE => intval($item->getBasePrice()),
-+            ItemTotals::KEY_PRICE => (int)$item->getPrice(),
-+            ItemTotals::KEY_BASE_PRICE => (int)$item->getBasePrice(),
-             ItemTotals::KEY_QTY => $item->getQty(),
--            ItemTotals::KEY_ROW_TOTAL => intval($item->getRowTotal()),
--            ItemTotals::KEY_BASE_ROW_TOTAL => intval($item->getBaseRowTotal()),
--            ItemTotals::KEY_ROW_TOTAL_WITH_DISCOUNT => intval($item->getRowTotalWithDiscount()),
--            ItemTotals::KEY_TAX_AMOUNT => intval($item->getTaxAmount()),
--            ItemTotals::KEY_BASE_TAX_AMOUNT => intval($item->getBaseTaxAmount()),
--            ItemTotals::KEY_TAX_PERCENT => intval($item->getTaxPercent()),
--            ItemTotals::KEY_DISCOUNT_AMOUNT => intval($item->getDiscountAmount()),
--            ItemTotals::KEY_BASE_DISCOUNT_AMOUNT => intval($item->getBaseDiscountAmount()),
--            ItemTotals::KEY_DISCOUNT_PERCENT => intval($item->getDiscountPercent()),
--            ItemTotals::KEY_PRICE_INCL_TAX => intval($item->getPriceInclTax()),
--            ItemTotals::KEY_BASE_PRICE_INCL_TAX => intval($item->getBasePriceInclTax()),
--            ItemTotals::KEY_ROW_TOTAL_INCL_TAX => intval($item->getRowTotalInclTax()),
--            ItemTotals::KEY_BASE_ROW_TOTAL_INCL_TAX => intval($item->getBaseRowTotalInclTax()),
-+            ItemTotals::KEY_ROW_TOTAL => (int)$item->getRowTotal(),
-+            ItemTotals::KEY_BASE_ROW_TOTAL => (int)$item->getBaseRowTotal(),
-+            ItemTotals::KEY_ROW_TOTAL_WITH_DISCOUNT => (int)$item->getRowTotalWithDiscount(),
-+            ItemTotals::KEY_TAX_AMOUNT => (int)$item->getTaxAmount(),
-+            ItemTotals::KEY_BASE_TAX_AMOUNT => (int)$item->getBaseTaxAmount(),
-+            ItemTotals::KEY_TAX_PERCENT => (int)$item->getTaxPercent(),
-+            ItemTotals::KEY_DISCOUNT_AMOUNT => (int)$item->getDiscountAmount(),
-+            ItemTotals::KEY_BASE_DISCOUNT_AMOUNT => (int)$item->getBaseDiscountAmount(),
-+            ItemTotals::KEY_DISCOUNT_PERCENT => (int)$item->getDiscountPercent(),
-+            ItemTotals::KEY_PRICE_INCL_TAX => (int)$item->getPriceInclTax(),
-+            ItemTotals::KEY_BASE_PRICE_INCL_TAX => (int)$item->getBasePriceInclTax(),
-+            ItemTotals::KEY_ROW_TOTAL_INCL_TAX => (int)$item->getRowTotalInclTax(),
-+            ItemTotals::KEY_BASE_ROW_TOTAL_INCL_TAX => (int)$item->getBaseRowTotalInclTax(),
-             ItemTotals::KEY_WEEE_TAX_APPLIED_AMOUNT => $item->getWeeeTaxAppliedAmount(),
-             ItemTotals::KEY_WEEE_TAX_APPLIED => $item->getWeeeTaxApplied(),
-             ItemTotals::KEY_NAME => $item->getName(),
-@@ -213,7 +190,32 @@ class CartTotalRepositoryTest extends WebapiAbstract
-         /** @var \Magento\Quote\Model\Quote\Address $shippingAddress */
-         $shippingAddress = $quote->getShippingAddress();
- 
--        $data = [
-+        $data = $this->getData($quote, $shippingAddress);
-+        $data = $this->formatTotalsData($data);
-+
-+        $actual = $this->_webApiCall($serviceInfo);
-+        unset($actual['items'][0]['options']);
-+        unset($actual['weee_tax_applied_amount']);
-+
-+        /** TODO: cover total segments with separate test */
-+        unset($actual['total_segments']);
-+        if (array_key_exists('extension_attributes', $actual)) {
-+            unset($actual['extension_attributes']);
-+        }
-+        $this->assertEquals($data, $actual);
-+    }
-+
-+    /**
-+     * Get expected data.
-+     *
-+     * @param Quote $quote
-+     * @param Address $shippingAddress
-+     *
-+     * @return array
-+     */
-+    private function getData(Quote $quote, Address $shippingAddress) : array
-+    {
-+        return [
-             Totals::KEY_GRAND_TOTAL => $quote->getGrandTotal(),
-             Totals::KEY_BASE_GRAND_TOTAL => $quote->getBaseGrandTotal(),
-             Totals::KEY_SUBTOTAL => $quote->getSubtotal(),
-@@ -239,17 +241,5 @@ class CartTotalRepositoryTest extends WebapiAbstract
-             Totals::KEY_ITEMS_QTY => $quote->getItemsQty(),
-             Totals::KEY_ITEMS => [$this->getQuoteItemTotalsData($quote)],
-         ];
--
--        $data = $this->formatTotalsData($data);
--        $actual = $this->_webApiCall($serviceInfo);
--        unset($actual['items'][0]['options']);
--        unset($actual['weee_tax_applied_amount']);
--
--        /** TODO: cover total segments with separate test */
--        unset($actual['total_segments']);
--        if (array_key_exists('extension_attributes', $actual)) {
--            unset($actual['extension_attributes']);
--        }
--        $this->assertEquals($data, $actual);
-     }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
-index 1aee493d8e0..1fb8fc43b0d 100644
---- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
-@@ -9,6 +9,9 @@ namespace Magento\Quote\Api;
- 
- use Magento\TestFramework\TestCase\WebapiAbstract;
- 
-+/**
-+ * Coupon management service tests
-+ */
- class CouponManagementTest extends WebapiAbstract
- {
-     const SERVICE_VERSION = 'V1';
-@@ -93,7 +96,7 @@ class CouponManagementTest extends WebapiAbstract
- 
-         $serviceInfo = [
-             'rest' => [
--                'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . $couponCode,
-+                'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . urlencode($couponCode),
-                 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
-             ],
-             'soap' => [
-@@ -129,7 +132,7 @@ class CouponManagementTest extends WebapiAbstract
-         $couponCode = $salesRule->getPrimaryCoupon()->getCode();
-         $serviceInfo = [
-             'rest' => [
--                'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . $couponCode,
-+                'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . urlencode($couponCode),
-                 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
-             ],
-             'soap' => [
-@@ -232,7 +235,7 @@ class CouponManagementTest extends WebapiAbstract
- 
-         $serviceInfo = [
-             'rest' => [
--                'resourcePath' => self::RESOURCE_PATH . 'mine/coupons/' . $couponCode,
-+                'resourcePath' => self::RESOURCE_PATH . 'mine/coupons/' . urlencode($couponCode),
-                 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
-                 'token' => $token,
-             ],
-@@ -280,7 +283,7 @@ class CouponManagementTest extends WebapiAbstract
- 
-         $serviceInfo = [
-             'rest' => [
--                'resourcePath' => self::RESOURCE_PATH . 'mine/coupons/' . $couponCode,
-+                'resourcePath' => self::RESOURCE_PATH . 'mine/coupons/' . urlencode($couponCode),
-                 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
-                 'token' => $token,
-             ],
-diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartAddingItemsTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartAddingItemsTest.php
-new file mode 100644
-index 00000000000..2067393b0bc
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartAddingItemsTest.php
-@@ -0,0 +1,120 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Api;
-+
-+use Magento\TestFramework\TestCase\WebapiAbstract;
-+
-+/**
-+ * Class for testing adding and deleting items flow.
-+ */
-+class GuestCartAddingItemsTest extends WebapiAbstract
-+{
-+    const SERVICE_VERSION = 'V1';
-+    const SERVICE_NAME = 'quoteGuestCartManagementV1';
-+    const RESOURCE_PATH = '/V1/guest-carts/';
-+
-+    /**
-+     * @var \Magento\TestFramework\ObjectManager
-+     */
-+    protected $objectManager;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+    }
-+
-+    /**
-+     * Test price for cart after deleting and adding product to.
-+     *
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_without_options_with_stock_data.php
-+     * @return void
-+     */
-+    public function testPriceForCreatingQuoteFromEmptyCart()
-+    {
-+        // Creating empty cart
-+        $serviceInfoForCreatingEmptyCart = [
-+            'rest' => [
-+                'resourcePath' => self::RESOURCE_PATH,
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
-+            ],
-+            'soap' => [
-+                'service' => self::SERVICE_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => self::SERVICE_NAME . 'CreateEmptyCart',
-+            ],
-+        ];
-+        $quoteId = $this->_webApiCall($serviceInfoForCreatingEmptyCart);
-+
-+        // Adding item to the cart
-+        $serviceInfoForAddingProduct = [
-+            'rest' => [
-+                'resourcePath' => self::RESOURCE_PATH . $quoteId . '/items',
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
-+            ],
-+            'soap' => [
-+                'service' => GuestCartItemRepositoryTest::SERVICE_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => GuestCartItemRepositoryTest::SERVICE_NAME . 'Save',
-+            ],
-+        ];
-+        $requestData = [
-+            'cartItem' => [
-+                'quote_id' => $quoteId,
-+                'sku' => 'simple',
-+                'qty' => 1
-+            ]
-+        ];
-+        $item = $this->_webApiCall($serviceInfoForAddingProduct, $requestData);
-+        $this->assertNotEmpty($item);
-+
-+        // Delete the item for the cart
-+        $serviceInfoForDeleteProduct = [
-+            'rest' => [
-+                'resourcePath' => self::RESOURCE_PATH . $quoteId . '/items/' . $item['item_id'],
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE,
-+            ],
-+            'soap' => [
-+                'service' => GuestCartItemRepositoryTest::SERVICE_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => GuestCartItemRepositoryTest::SERVICE_NAME . 'deleteById',
-+            ],
-+        ];
-+        $response = (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) ?
-+            $this->_webApiCall($serviceInfoForDeleteProduct, ['cartId' => $quoteId, 'itemId' => $item['item_id']])
-+            : $this->_webApiCall($serviceInfoForDeleteProduct);
-+        $this->assertTrue($response);
-+
-+        // Add one more item and check price for this item
-+        $serviceInfoForAddingProduct = [
-+            'rest' => [
-+                'resourcePath' => self::RESOURCE_PATH . $quoteId . '/items',
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
-+            ],
-+            'soap' => [
-+                'service' => GuestCartItemRepositoryTest::SERVICE_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => GuestCartItemRepositoryTest::SERVICE_NAME . 'Save',
-+            ],
-+        ];
-+        $requestData = [
-+            'cartItem' => [
-+                'quote_id' => $quoteId,
-+                'sku' => 'simple',
-+                'qty' => 1
-+            ]
-+        ];
-+        $item = $this->_webApiCall($serviceInfoForAddingProduct, $requestData);
-+        $this->assertNotEmpty($item);
-+        $this->assertEquals($item['price'], 10);
-+
-+        /** @var \Magento\Quote\Model\Quote $quote */
-+        $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class);
-+        $quote->load($quoteId);
-+        $quote->delete();
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartTotalRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartTotalRepositoryTest.php
-index 7ad0e62f29d..28195cca679 100644
---- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartTotalRepositoryTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartTotalRepositoryTest.php
-@@ -63,14 +63,14 @@ class GuestCartTotalRepositoryTest extends WebapiAbstract
-         $shippingAddress = $quote->getShippingAddress();
- 
-         $data = [
--            Totals::KEY_BASE_GRAND_TOTAL => $quote->getBaseGrandTotal(),
-             Totals::KEY_GRAND_TOTAL => $quote->getGrandTotal(),
--            Totals::KEY_BASE_SUBTOTAL => $quote->getBaseSubtotal(),
-+            Totals::KEY_BASE_GRAND_TOTAL => $quote->getBaseGrandTotal(),
-             Totals::KEY_SUBTOTAL => $quote->getSubtotal(),
--            Totals::KEY_BASE_SUBTOTAL_WITH_DISCOUNT => $quote->getBaseSubtotalWithDiscount(),
--            Totals::KEY_SUBTOTAL_WITH_DISCOUNT => $quote->getSubtotalWithDiscount(),
-+            Totals::KEY_BASE_SUBTOTAL => $quote->getBaseSubtotal(),
-             Totals::KEY_DISCOUNT_AMOUNT => $shippingAddress->getDiscountAmount(),
-             Totals::KEY_BASE_DISCOUNT_AMOUNT => $shippingAddress->getBaseDiscountAmount(),
-+            Totals::KEY_SUBTOTAL_WITH_DISCOUNT => $quote->getSubtotalWithDiscount(),
-+            Totals::KEY_BASE_SUBTOTAL_WITH_DISCOUNT => $quote->getBaseSubtotalWithDiscount(),
-             Totals::KEY_SHIPPING_AMOUNT => $shippingAddress->getShippingAmount(),
-             Totals::KEY_BASE_SHIPPING_AMOUNT => $shippingAddress->getBaseShippingAmount(),
-             Totals::KEY_SHIPPING_DISCOUNT_AMOUNT => $shippingAddress->getShippingDiscountAmount(),
-@@ -94,6 +94,7 @@ class GuestCartTotalRepositoryTest extends WebapiAbstract
-         $data = $this->formatTotalsData($data);
- 
-         $actual = $this->_webApiCall($this->getServiceInfoForTotalsService($cartId), $requestData);
-+        $actual = $this->formatTotalsData($actual);
- 
-         unset($actual['items'][0]['options']);
-         unset($actual['weee_tax_applied_amount']);
-diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php
-index aef162d92b1..45bae261bb6 100644
---- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php
-@@ -38,7 +38,6 @@ class CreditmemoCreateTest extends WebapiAbstract
-         $orderCollection = $this->objectManager->get(\Magento\Sales\Model\ResourceModel\Order\Collection::class);
-         $order = $orderCollection->getFirstItem();
- 
--//        $order = $this->objectManager->create('Magento\Sales\Model\Order')->loadByIncrementId('100000001');
-         /** @var \Magento\Sales\Model\Order\Item $orderItem */
-         $orderItem = current($order->getAllItems());
-         $items = [
-diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
-index 7adde3c11ac..db96728e206 100644
---- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
-@@ -3,8 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Service\V1;
- 
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\Webapi\Rest\Request;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\TestFramework\Helper\Bootstrap;
- use Magento\TestFramework\TestCase\WebapiAbstract;
- 
- class OrderGetTest extends WebapiAbstract
-@@ -18,19 +25,24 @@ class OrderGetTest extends WebapiAbstract
-     const ORDER_INCREMENT_ID = '100000001';
- 
-     /**
--     * @var \Magento\Framework\ObjectManagerInterface
-+     * @var ObjectManagerInterface
-      */
--    protected $objectManager;
-+    private $objectManager;
- 
--    protected function setUp()
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-     {
--        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $this->objectManager = Bootstrap::getObjectManager();
-     }
- 
-     /**
-+     * Checks order attributes.
-+     *
-      * @magentoApiDataFixture Magento/Sales/_files/order.php
-      */
--    public function testOrderGet()
-+    public function testOrderGet(): void
-     {
-         $expectedOrderData = [
-             'base_subtotal' => '100.0000',
-@@ -67,36 +79,21 @@ class OrderGetTest extends WebapiAbstract
-             'region' => 'CA'
-         ];
- 
--        /** @var \Magento\Sales\Model\Order $order */
--        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
--        $order->loadByIncrementId(self::ORDER_INCREMENT_ID);
--
--        $serviceInfo = [
--            'rest' => [
--                'resourcePath' => self::RESOURCE_PATH . '/' . $order->getId(),
--                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
--            ],
--            'soap' => [
--                'service' => self::SERVICE_READ_NAME,
--                'serviceVersion' => self::SERVICE_VERSION,
--                'operation' => self::SERVICE_READ_NAME . 'get',
--            ],
--        ];
--        $result = $this->_webApiCall($serviceInfo, ['id' => $order->getId()]);
-+        $result = $this->makeServiceCall(self::ORDER_INCREMENT_ID);
- 
-         foreach ($expectedOrderData as $field => $value) {
--            $this->assertArrayHasKey($field, $result);
--            $this->assertEquals($value, $result[$field]);
-+            self::assertArrayHasKey($field, $result);
-+            self::assertEquals($value, $result[$field]);
-         }
- 
--        $this->assertArrayHasKey('payment', $result);
-+        self::assertArrayHasKey('payment', $result);
-         foreach ($expectedPayments as $field => $value) {
--            $this->assertEquals($value, $result['payment'][$field]);
-+            self::assertEquals($value, $result['payment'][$field]);
-         }
- 
--        $this->assertArrayHasKey('billing_address', $result);
-+        self::assertArrayHasKey('billing_address', $result);
-         foreach ($expectedBillingAddressNotEmpty as $field) {
--            $this->assertArrayHasKey($field, $result['billing_address']);
-+            self::assertArrayHasKey($field, $result['billing_address']);
-         }
- 
-         self::assertArrayHasKey('extension_attributes', $result);
-@@ -112,7 +109,112 @@ class OrderGetTest extends WebapiAbstract
- 
-         //check that nullable fields were marked as optional and were not sent
-         foreach ($result as $value) {
--            $this->assertNotNull($value);
-+            self::assertNotNull($value);
-+        }
-+    }
-+
-+    /**
-+     * Checks order extension attributes.
-+     *
-+     * @magentoApiDataFixture Magento/Sales/_files/order_with_tax.php
-+     */
-+    public function testOrderGetExtensionAttributes(): void
-+    {
-+        $expectedTax = [
-+            'code' => 'US-NY-*-Rate 1',
-+            'type' => 'shipping'
-+        ];
-+
-+        $result = $this->makeServiceCall(self::ORDER_INCREMENT_ID);
-+
-+        $appliedTaxes = $result['extension_attributes']['applied_taxes'];
-+        self::assertEquals($expectedTax['code'], $appliedTaxes[0]['code']);
-+        $appliedTaxes = $result['extension_attributes']['item_applied_taxes'];
-+        self::assertEquals($expectedTax['type'], $appliedTaxes[0]['type']);
-+        self::assertNotEmpty($appliedTaxes[0]['applied_taxes']);
-+        self::assertEquals(true, $result['extension_attributes']['converting_from_quote']);
-+        self::assertArrayHasKey('payment_additional_info', $result['extension_attributes']);
-+        self::assertNotEmpty($result['extension_attributes']['payment_additional_info']);
-+    }
-+
-+    /**
-+     * Checks if the order contains product option attributes.
-+     *
-+     * @magentoApiDataFixture Magento/Sales/_files/order_with_bundle.php
-+     */
-+    public function testGetOrderWithProductOption(): void
-+    {
-+        $expected = [
-+            'extension_attributes' => [
-+                'bundle_options' => [
-+                    [
-+                        'option_id' => 1,
-+                        'option_selections' => [1],
-+                        'option_qty' => 1
-+                    ]
-+                ]
-+            ]
-+        ];
-+        $result = $this->makeServiceCall(self::ORDER_INCREMENT_ID);
-+
-+        $bundleProduct = $this->getBundleProduct($result['items']);
-+        self::assertNotEmpty($bundleProduct, '"Bundle Product" should not be empty.');
-+        self::assertNotEmpty($bundleProduct['product_option'], '"Product Option" should not be empty.');
-+        self::assertEquals($expected, $bundleProduct['product_option']);
-+    }
-+
-+    /**
-+     * Gets order by increment ID.
-+     *
-+     * @param string $incrementId
-+     * @return OrderInterface
-+     */
-+    private function getOrder(string $incrementId): OrderInterface
-+    {
-+        /** @var Order $order */
-+        $order = $this->objectManager->create(Order::class);
-+        $order->loadByIncrementId($incrementId);
-+
-+        return $order;
-+    }
-+
-+    /**
-+     * Makes service call.
-+     *
-+     * @param string $incrementId
-+     * @return array
-+     */
-+    private function makeServiceCall(string $incrementId): array
-+    {
-+        $order = $this->getOrder($incrementId);
-+        $serviceInfo = [
-+            'rest' => [
-+                'resourcePath' => self::RESOURCE_PATH . '/' . $order->getId(),
-+                'httpMethod' => Request::HTTP_METHOD_GET,
-+            ],
-+            'soap' => [
-+                'service' => self::SERVICE_READ_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => self::SERVICE_READ_NAME . 'get',
-+            ],
-+        ];
-+        return $this->_webApiCall($serviceInfo, ['id' => $order->getId()]);
-+    }
-+
-+    /**
-+     * Gets a bundle product from the result.
-+     *
-+     * @param array $items
-+     * @return array
-+     */
-+    private function getBundleProduct(array $items): array
-+    {
-+        foreach ($items as $item) {
-+            if ($item['product_type'] == 'bundle') {
-+                return $item;
-+            }
-         }
-+
-+        return [];
-     }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderInvoiceCreateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderInvoiceCreateTest.php
-index 49e05832f2e..f6194db6d8e 100644
---- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderInvoiceCreateTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderInvoiceCreateTest.php
-@@ -90,4 +90,96 @@ class OrderInvoiceCreateTest extends \Magento\TestFramework\TestCase\WebapiAbstr
-             'Failed asserting that Order status was changed'
-         );
-     }
-+
-+    /**
-+     * Tests that MAGETWO-95346 was fixed for bundled products
-+     *
-+     * @expectedException \Exception
-+     * @codingStandardsIgnoreStart
-+     * @expectedExceptionMessageRegExp /Invoice Document Validation Error\(s\):(?:\n|\\n)The invoice can't be created without products. Add products and try again./
-+     * @codingStandardsIgnoreEnd
-+     * @magentoApiDataFixture Magento/Sales/_files/order_with_bundle.php
-+     */
-+    public function testOrderWithBundleInvoicedWithInvalidQuantitiesReturnsError()
-+    {
-+        /** @var \Magento\Sales\Model\Order $existingOrder */
-+        $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
-+            ->loadByIncrementId('100000001');
-+
-+        $serviceInfo = [
-+            'rest' => [
-+                'resourcePath' => '/V1/order/' . $existingOrder->getId() . '/invoice',
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
-+            ],
-+            'soap' => [
-+                'service' => self::SERVICE_READ_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => self::SERVICE_READ_NAME . 'execute',
-+            ],
-+        ];
-+
-+        $requestData = [
-+            'orderId' => $existingOrder->getId(),
-+            'notify' => true,
-+            'appendComment' => true,
-+            'items' => [
-+                [
-+                    'order_item_id' => -1,
-+                    'qty' => 1
-+                ]
-+            ],
-+            'comment' => [
-+                'comment' => 'Test offline',
-+                'isVisibleOnFront' => 1,
-+            ],
-+        ];
-+
-+        $this->_webApiCall($serviceInfo, $requestData);
-+    }
-+
-+    /**
-+     * Tests that MAGETWO-95346 was fixed for configurable products
-+     *
-+     * @expectedException \Exception
-+     * @codingStandardsIgnoreStart
-+     * @expectedExceptionMessageRegExp /Invoice Document Validation Error\(s\):(?:\n|\\n)The invoice can't be created without products. Add products and try again./
-+     * @codingStandardsIgnoreEnd
-+     * @magentoApiDataFixture Magento/Sales/_files/order_configurable_product.php
-+     */
-+    public function testOrderWithConfigurableProductInvoicedWithInvalidQuantitiesReturnsError()
-+    {
-+        /** @var \Magento\Sales\Model\Order $existingOrder */
-+        $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
-+            ->loadByIncrementId('100000001');
-+
-+        $serviceInfo = [
-+            'rest' => [
-+                'resourcePath' => '/V1/order/' . $existingOrder->getId() . '/invoice',
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
-+            ],
-+            'soap' => [
-+                'service' => self::SERVICE_READ_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => self::SERVICE_READ_NAME . 'execute',
-+            ],
-+        ];
-+
-+        $requestData = [
-+            'orderId' => $existingOrder->getId(),
-+            'notify' => true,
-+            'appendComment' => true,
-+            'items' => [
-+                [
-+                    'order_item_id' => -1,
-+                    'qty' => 1
-+                ]
-+            ],
-+            'comment' => [
-+                'comment' => 'Test offline',
-+                'isVisibleOnFront' => 1,
-+            ],
-+        ];
-+
-+        $this->_webApiCall($serviceInfo, $requestData);
-+    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
-index 3ab93f9aecb..9ba648c7327 100644
---- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
-@@ -77,4 +77,36 @@ class OrderItemGetTest extends WebapiAbstract
-         $this->assertEquals($orderItem->getBasePrice(), $response['base_price']);
-         $this->assertEquals($orderItem->getRowTotal(), $response['row_total']);
-     }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Sales/_files/order_with_discount.php
-+     */
-+    public function testGetOrderWithDiscount()
-+    {
-+        /** @var \Magento\Sales\Model\Order $order */
-+        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
-+        $order->loadByIncrementId(self::ORDER_INCREMENT_ID);
-+        /** @var \Magento\Sales\Model\Order\Item $orderItem */
-+        $orderItem = current($order->getItems());
-+
-+        $serviceInfo = [
-+            'rest' => [
-+                'resourcePath' => self::RESOURCE_PATH . '/' . $orderItem->getId(),
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
-+            ],
-+            'soap' => [
-+                'service' => self::SERVICE_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => self::SERVICE_NAME . 'get',
-+            ],
-+        ];
-+
-+        $response = $this->_webApiCall($serviceInfo, ['id' => $orderItem->getId()]);
-+
-+        $this->assertTrue(is_array($response));
-+        $this->assertEquals(8.00, $response['row_total']);
-+        $this->assertEquals(8.00, $response['base_row_total']);
-+        $this->assertEquals(9.00, $response['row_total_incl_tax']);
-+        $this->assertEquals(9.00, $response['base_row_total_incl_tax']);
-+    }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
-index 0500f318582..506f82eab7a 100644
---- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
-@@ -33,6 +33,73 @@ class OrderListTest extends WebapiAbstract
-      * @magentoApiDataFixture Magento/Sales/_files/order_list.php
-      */
-     public function testOrderList()
-+    {
-+        $searchData = $this->getSearchData();
-+
-+        $requestData = ['searchCriteria' => $searchData];
-+        $serviceInfo = [
-+            'rest' => [
-+                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
-+            ],
-+            'soap' => [
-+                'service' => self::SERVICE_READ_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => self::SERVICE_READ_NAME . 'getList',
-+            ],
-+        ];
-+
-+        $result = $this->_webApiCall($serviceInfo, $requestData);
-+        $this->assertArrayHasKey('items', $result);
-+        $this->assertCount(2, $result['items']);
-+        $this->assertArrayHasKey('search_criteria', $result);
-+        $this->assertEquals($searchData, $result['search_criteria']);
-+        $this->assertEquals('100000002', $result['items'][0]['increment_id']);
-+        $this->assertEquals('100000001', $result['items'][1]['increment_id']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Sales/_files/order_list_with_tax.php
-+     */
-+    public function testOrderListExtensionAttributes()
-+    {
-+        $searchData = $this->getSearchData();
-+
-+        $requestData = ['searchCriteria' => $searchData];
-+        $serviceInfo = [
-+            'rest' => [
-+                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
-+            ],
-+            'soap' => [
-+                'service' => self::SERVICE_READ_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => self::SERVICE_READ_NAME . 'getList',
-+            ],
-+        ];
-+
-+        $result = $this->_webApiCall($serviceInfo, $requestData);
-+
-+        $expectedTax = [
-+            'code' => 'US-NY-*-Rate 1',
-+            'type' => 'shipping'
-+        ];
-+        $appliedTaxes = $result['items'][0]['extension_attributes']['applied_taxes'];
-+        $this->assertEquals($expectedTax['code'], $appliedTaxes[0]['code']);
-+        $appliedTaxes = $result['items'][0]['extension_attributes']['item_applied_taxes'];
-+        $this->assertEquals($expectedTax['type'], $appliedTaxes[0]['type']);
-+        $this->assertNotEmpty($appliedTaxes[0]['applied_taxes']);
-+        $this->assertEquals(true, $result['items'][0]['extension_attributes']['converting_from_quote']);
-+        $this->assertArrayHasKey('payment_additional_info', $result['items'][0]['extension_attributes']);
-+        $this->assertNotEmpty($result['items'][0]['extension_attributes']['payment_additional_info']);
-+    }
-+
-+    /**
-+     * Get search data for request.
-+     *
-+     * @return array
-+     */
-+    private function getSearchData() : array
-     {
-         /** @var \Magento\Framework\Api\SortOrderBuilder $sortOrderBuilder */
-         $sortOrderBuilder = $this->objectManager->get(
-@@ -70,25 +137,6 @@ class OrderListTest extends WebapiAbstract
-         $searchCriteriaBuilder->addSortOrder($sortOrder);
-         $searchData = $searchCriteriaBuilder->create()->__toArray();
- 
--        $requestData = ['searchCriteria' => $searchData];
--        $serviceInfo = [
--            'rest' => [
--                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
--                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
--            ],
--            'soap' => [
--                'service' => self::SERVICE_READ_NAME,
--                'serviceVersion' => self::SERVICE_VERSION,
--                'operation' => self::SERVICE_READ_NAME . 'getList',
--            ],
--        ];
--
--        $result = $this->_webApiCall($serviceInfo, $requestData);
--        $this->assertArrayHasKey('items', $result);
--        $this->assertCount(2, $result['items']);
--        $this->assertArrayHasKey('search_criteria', $result);
--        $this->assertEquals($searchData, $result['search_criteria']);
--        $this->assertEquals('100000002', $result['items'][0]['increment_id']);
--        $this->assertEquals('100000001', $result['items'][1]['increment_id']);
-+        return $searchData;
-     }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
-index c5ecead00ce..9e3bd4ca484 100644
---- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
-@@ -11,6 +11,7 @@ use Magento\TestFramework\TestCase\WebapiAbstract;
- 
- /**
-  * Class OrderCommentAddTest
-+ *
-  * @package Magento\Sales\Service\V1
-  */
- class OrderStatusHistoryAddTest extends WebapiAbstract
-@@ -48,7 +49,7 @@ class OrderStatusHistoryAddTest extends WebapiAbstract
-             OrderStatusHistoryInterface::CREATED_AT => null,
-             OrderStatusHistoryInterface::PARENT_ID => $order->getId(),
-             OrderStatusHistoryInterface::ENTITY_NAME => null,
--            OrderStatusHistoryInterface::STATUS => null,
-+            OrderStatusHistoryInterface::STATUS => $order->getStatus(),
-             OrderStatusHistoryInterface::IS_VISIBLE_ON_FRONT => 1,
-         ];
- 
-@@ -69,25 +70,27 @@ class OrderStatusHistoryAddTest extends WebapiAbstract
- 
-         //Verification
-         $comments = $order->load($order->getId())->getAllStatusHistory();
-+        $comment = reset($comments);
- 
--        $commentData = reset($comments);
--        foreach ($commentData as $key => $value) {
--            $this->assertEquals(
--                $commentData[OrderStatusHistoryInterface::COMMENT],
--                $statusHistoryComment->getComment()
--            );
--            $this->assertEquals(
--                $commentData[OrderStatusHistoryInterface::PARENT_ID],
--                $statusHistoryComment->getParentId()
--            );
--            $this->assertEquals(
--                $commentData[OrderStatusHistoryInterface::IS_CUSTOMER_NOTIFIED],
--                $statusHistoryComment->getIsCustomerNotified()
--            );
--            $this->assertEquals(
--                $commentData[OrderStatusHistoryInterface::IS_VISIBLE_ON_FRONT],
--                $statusHistoryComment->getIsVisibleOnFront()
--            );
--        }
-+        $this->assertEquals(
-+            $commentData[OrderStatusHistoryInterface::COMMENT],
-+            $comment->getComment()
-+        );
-+        $this->assertEquals(
-+            $commentData[OrderStatusHistoryInterface::PARENT_ID],
-+            $comment->getParentId()
-+        );
-+        $this->assertEquals(
-+            $commentData[OrderStatusHistoryInterface::IS_CUSTOMER_NOTIFIED],
-+            $comment->getIsCustomerNotified()
-+        );
-+        $this->assertEquals(
-+            $commentData[OrderStatusHistoryInterface::IS_VISIBLE_ON_FRONT],
-+            $comment->getIsVisibleOnFront()
-+        );
-+        $this->assertEquals(
-+            $commentData[OrderStatusHistoryInterface::STATUS],
-+            $comment->getStatus()
-+        );
-     }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php
-index 12cbe1ca0e5..92942d7acc6 100644
---- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php
-@@ -3,8 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Sales\Service\V1;
- 
-+use Magento\Sales\Model\Order;
-+
- /**
-  * API test for creation of Creditmemo for certain Order.
-  */
-@@ -86,10 +89,10 @@ class RefundOrderTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-                 'Failed asserting that proper shipping amount of the Order was refunded'
-             );
- 
--            $this->assertNotEquals(
--                $existingOrder->getStatus(),
-+            $this->assertEquals(
-+                Order::STATE_COMPLETE,
-                 $updatedOrder->getStatus(),
--                'Failed asserting that order status was changed'
-+                'Failed asserting that order status has not changed'
-             );
-         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-             $this->fail('Failed asserting that Creditmemo was created');
-@@ -199,6 +202,73 @@ class RefundOrderTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-         }
-     }
- 
-+    /**
-+     * Test order will keep same(custom) status after partial refund, if state has not been changed.
-+     *
-+     * @magentoApiDataFixture Magento/Sales/_files/order_with_invoice_and_custom_status.php
-+     */
-+    public function testOrderStatusPartialRefund()
-+    {
-+        /** @var \Magento\Sales\Model\Order $existingOrder */
-+        $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
-+            ->loadByIncrementId('100000001');
-+
-+        $items = $this->getOrderItems($existingOrder);
-+        $items[0]['qty'] -= 1;
-+        $result = $this->_webApiCall(
-+            $this->getServiceData($existingOrder),
-+            [
-+                'orderId' => $existingOrder->getEntityId(),
-+                'items' => $items,
-+            ]
-+        );
-+
-+        $this->assertNotEmpty(
-+            $result,
-+            'Failed asserting that the received response is correct'
-+        );
-+
-+        /** @var \Magento\Sales\Model\Order $updatedOrder */
-+        $updatedOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
-+            ->loadByIncrementId($existingOrder->getIncrementId());
-+
-+        $this->assertSame('custom_processing', $updatedOrder->getStatus());
-+        $this->assertSame('processing', $updatedOrder->getState());
-+    }
-+
-+    /**
-+     * Test order will change custom status after total refund, when state has been changed.
-+     *
-+     * @magentoApiDataFixture Magento/Sales/_files/order_with_invoice_and_custom_status.php
-+     */
-+    public function testOrderStatusTotalRefund()
-+    {
-+        /** @var \Magento\Sales\Model\Order $existingOrder */
-+        $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
-+            ->loadByIncrementId('100000001');
-+
-+        $items = $this->getOrderItems($existingOrder);
-+        $result = $this->_webApiCall(
-+            $this->getServiceData($existingOrder),
-+            [
-+                'orderId' => $existingOrder->getEntityId(),
-+                'items' => $items,
-+            ]
-+        );
-+
-+        $this->assertNotEmpty(
-+            $result,
-+            'Failed asserting that the received response is correct'
-+        );
-+
-+        /** @var \Magento\Sales\Model\Order $updatedOrder */
-+        $updatedOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
-+            ->loadByIncrementId($existingOrder->getIncrementId());
-+
-+        $this->assertSame('complete', $updatedOrder->getStatus());
-+        $this->assertSame('complete', $updatedOrder->getState());
-+    }
-+
-     /**
-      * Prepares and returns info for API service.
-      *
-diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipOrderTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipOrderTest.php
-index 32e33e8ed9b..e2a156cc6fb 100644
---- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipOrderTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipOrderTest.php
-@@ -37,6 +37,7 @@ class ShipOrderTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-      */
-     public function testConfigurableShipOrder()
-     {
-+        $this->markTestIncomplete('https://github.com/magento-engcom/msi/issues/1335');
-         $productsQuantity = 1;
- 
-         /** @var \Magento\Sales\Model\Order $existingOrder */
-@@ -131,6 +132,39 @@ class ShipOrderTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-         );
-     }
- 
-+    /**
-+     * Tests that not providing a tracking number produces the correct error. See MAGETWO-95429
-+     * @expectedException \Exception
-+     * @codingStandardsIgnoreStart
-+     * @expectedExceptionMessageRegExp /Shipment Document Validation Error\(s\):(?:\n|\\n)Please enter a tracking number./
-+     * @codingStandardsIgnoreEnd
-+     * @magentoApiDataFixture Magento/Sales/_files/order_new.php
-+     */
-+    public function testShipOrderWithoutTrackingNumberReturnsError()
-+    {
-+        $this->_markTestAsRestOnly('SOAP requires an tracking number to be provided so this case is not possible.');
-+
-+        /** @var \Magento\Sales\Model\Order $existingOrder */
-+        $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
-+            ->loadByIncrementId('100000001');
-+
-+        $requestData = [
-+            'orderId' => $existingOrder->getId(),
-+            'comment' => [
-+                'comment' => 'Test Comment',
-+                'is_visible_on_front' => 1,
-+            ],
-+            'tracks' => [
-+                [
-+                    'title' => 'Simple shipment track',
-+                    'carrier_code' => 'UPS'
-+                ]
-+            ]
-+        ];
-+
-+        $this->_webApiCall($this->getServiceInfo($existingOrder), $requestData);
-+    }
-+
-     /**
-      * @magentoApiDataFixture Magento/Bundle/_files/order_with_bundle_shipped_separately.php
-      */
-diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentLabelGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentLabelGetTest.php
-index 1a957e51b1e..b496f08cc3e 100644
---- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentLabelGetTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentLabelGetTest.php
-@@ -50,6 +50,6 @@ class ShipmentLabelGetTest extends WebapiAbstract
-             ],
-         ];
-         $result = $this->_webApiCall($serviceInfo, ['id' => $shipment->getId()]);
--        $this->assertEquals($result, 'test_shipping_label');
-+        $this->assertEquals($result, base64_encode('test_shipping_label'));
-     }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentListTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentListTest.php
-index ad776da3ae4..1f5c7415ace 100644
---- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentListTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentListTest.php
-@@ -91,5 +91,7 @@ class ShipmentListTest extends WebapiAbstract
-         $this->assertEquals($searchData, $result['search_criteria']);
-         $this->assertEquals('100000002', $result['items'][0]['increment_id']);
-         $this->assertEquals('100000003', $result['items'][1]['increment_id']);
-+        $this->assertEquals(base64_encode('shipping_label_100000002'), $result['items'][0]['shipping_label']);
-+        $this->assertEquals(base64_encode('shipping_label_100000003'), $result['items'][1]['shipping_label']);
-     }
- }
-diff --git a/dev/tests/api-functional/testsuite/Magento/Search/Api/SearchTest.php b/dev/tests/api-functional/testsuite/Magento/Search/Api/SearchTest.php
-new file mode 100644
-index 00000000000..f6167a06c64
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/Search/Api/SearchTest.php
-@@ -0,0 +1,110 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Search\Api;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Webapi\Rest\Request;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\WebapiAbstract;
-+
-+class SearchTest extends WebapiAbstract
-+{
-+    const SERVICE_VERSION = 'V1';
-+    const SERVICE_NAME = 'searchV1';
-+    const RESOURCE_PATH = '/V1/search/';
-+
-+    /**
-+     * @var ProductInterface
-+     */
-+    private $product;
-+
-+    protected function setUp()
-+    {
-+        $productSku = 'simple';
-+
-+        $objectManager = Bootstrap::getObjectManager();
-+        $productRepository = $objectManager->create(ProductRepositoryInterface::class);
-+        $this->product = $productRepository->get($productSku);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-+     */
-+    public function testExistingProductSearch()
-+    {
-+        $productName = $this->product->getName();
-+
-+        $searchCriteria = $this->buildSearchCriteria($productName);
-+        $serviceInfo = $this->buildServiceInfo($searchCriteria);
-+
-+        $response = $this->_webApiCall($serviceInfo, $searchCriteria);
-+
-+        self::assertArrayHasKey('search_criteria', $response);
-+        self::assertArrayHasKey('items', $response);
-+        self::assertGreaterThan(0, count($response['items']));
-+        self::assertGreaterThan(0, $response['items'][0]['id']);
-+    }
-+
-+    /**
-+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-+     */
-+    public function testNonExistentProductSearch()
-+    {
-+        $searchCriteria = $this->buildSearchCriteria('nonExistentProduct');
-+        $serviceInfo = $this->buildServiceInfo($searchCriteria);
-+
-+        $response = $this->_webApiCall($serviceInfo, $searchCriteria);
-+
-+        self::assertArrayHasKey('search_criteria', $response);
-+        self::assertArrayHasKey('items', $response);
-+        self::assertEquals(0, count($response['items']));
-+    }
-+
-+    /**
-+     * @param string $productName
-+     * @return array
-+     */
-+    private function buildSearchCriteria(string $productName): array
-+    {
-+        return [
-+            'searchCriteria' => [
-+                'request_name' => 'quick_search_container',
-+                'filter_groups' => [
-+                    [
-+                        'filters' => [
-+                            [
-+                                'field' => 'search_term',
-+                                'value' => $productName,
-+                            ]
-+                        ]
-+                    ]
-+                ]
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * @param array $searchCriteria
-+     * @return array
-+     */
-+    private function buildServiceInfo(array $searchCriteria): array
-+    {
-+        return [
-+            'rest' => [
-+                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($searchCriteria),
-+                'httpMethod' => Request::HTTP_METHOD_GET
-+            ],
-+            'soap' => [
-+                'service' => self::SERVICE_NAME,
-+                'serviceVersion' => self::SERVICE_VERSION,
-+                'operation' => self::SERVICE_NAME . 'Search'
-+            ]
-+        ];
-+    }
-+}
-diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/JoinDirectivesTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/JoinDirectivesTest.php
-index 5f967758e21..8beb14e81be 100644
---- a/dev/tests/api-functional/testsuite/Magento/Webapi/JoinDirectivesTest.php
-+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/JoinDirectivesTest.php
-@@ -6,12 +6,14 @@
- 
- namespace Magento\Webapi;
- 
-+use Magento\Framework\Api\FilterBuilder;
- use Magento\Framework\Api\SearchCriteriaBuilder;
--use Magento\Framework\Api\SortOrderBuilder;
- use Magento\Framework\Api\SortOrder;
--use Magento\Framework\Api\SearchCriteria;
--use Magento\Framework\Api\FilterBuilder;
-+use Magento\Framework\Api\SortOrderBuilder;
- 
-+/**
-+ * Test join directives.
-+ */
- class JoinDirectivesTest extends \Magento\TestFramework\TestCase\WebapiAbstract
- {
-     /**
-@@ -44,7 +46,8 @@ class JoinDirectivesTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-     }
- 
-     /**
--     * Rollback rules
-+     * Rollback rules.
-+     *
-      * @magentoApiDataFixture Magento/SalesRule/_files/rules_rollback.php
-      * @magentoApiDataFixture Magento/Sales/_files/quote.php
-      */
-@@ -124,6 +127,49 @@ class JoinDirectivesTest extends \Magento\TestFramework\TestCase\WebapiAbstract
-         $this->assertEquals($expectedExtensionAttributes['email'], $testAttribute['email']);
-     }
- 
-+    /**
-+     * Test get list of orders with extension attributes.
-+     *
-+     * @magentoApiDataFixture Magento/Sales/_files/order.php
-+     */
-+    public function testGetOrdertList()
-+    {
-+        $filter = $this->filterBuilder
-+            ->setField('increment_id')
-+            ->setValue('100000001')
-+            ->setConditionType('eq')
-+            ->create();
-+        $this->searchBuilder->addFilters([$filter]);
-+        $searchData = $this->searchBuilder->create()->__toArray();
-+
-+        $requestData = ['searchCriteria' => $searchData];
-+
-+        $restResourcePath = '/V1/orders/';
-+        $soapService = 'salesOrderRepositoryV1';
-+        $expectedExtensionAttributes = $this->getExpectedExtensionAttributes();
-+
-+        $serviceInfo = [
-+            'rest' => [
-+                'resourcePath' => $restResourcePath . '?' . http_build_query($requestData),
-+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
-+            ],
-+            'soap' => [
-+                'service' => $soapService,
-+                'operation' => $soapService . 'GetList',
-+            ],
-+        ];
-+        $searchResult = $this->_webApiCall($serviceInfo, $requestData);
-+
-+        $this->assertArrayHasKey('items', $searchResult);
-+        $itemData = array_pop($searchResult['items']);
-+        $this->assertArrayHasKey('extension_attributes', $itemData);
-+        $this->assertArrayHasKey('order_api_test_attribute', $itemData['extension_attributes']);
-+        $testAttribute = $itemData['extension_attributes']['order_api_test_attribute'];
-+        $this->assertEquals($expectedExtensionAttributes['firstname'], $testAttribute['first_name']);
-+        $this->assertEquals($expectedExtensionAttributes['lastname'], $testAttribute['last_name']);
-+        $this->assertEquals($expectedExtensionAttributes['email'], $testAttribute['email']);
-+    }
-+
-     /**
-      * Retrieve the admin user's information.
-      *
-diff --git a/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncScheduleMultiStoreTest.php b/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncScheduleMultiStoreTest.php
-new file mode 100644
-index 00000000000..a58bb6b14d0
---- /dev/null
-+++ b/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncScheduleMultiStoreTest.php
-@@ -0,0 +1,373 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\WebapiAsync\Model;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\TestFramework\MessageQueue\PreconditionFailedException;
-+use Magento\TestFramework\MessageQueue\PublisherConsumerController;
-+use Magento\TestFramework\MessageQueue\EnvironmentPreconditionException;
-+use Magento\TestFramework\TestCase\WebapiAbstract;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Catalog\Model\ResourceModel\Product\Collection;
-+use Magento\Framework\Phrase;
-+use Magento\Framework\Registry;
-+use Magento\Framework\Webapi\Exception;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Api\Data\ProductInterface as Product;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Store\Model\Store;
-+use Magento\Framework\Webapi\Rest\Request;
-+
-+/**
-+ * Check async request for multistore product creation service, scheduling bulk
-+ * to rabbitmq running consumers and check async.operation.add consumer check
-+ * if product was created by async requests
-+ *
-+ * @magentoAppIsolation enabled
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class AsyncScheduleMultiStoreTest extends WebapiAbstract
-+{
-+    const SERVICE_NAME = 'catalogProductRepositoryV1';
-+    const SERVICE_VERSION = 'V1';
-+    const REST_RESOURCE_PATH = '/V1/products';
-+    const ASYNC_RESOURCE_PATH = '/async/V1/products';
-+    const ASYNC_CONSUMER_NAME = 'async.operations.all';
-+
-+    const STORE_CODE_FROM_FIXTURE = 'fixturestore';
-+    const STORE_NAME_FROM_FIXTURE = 'Fixture Store';
-+
-+    const STORE_CODE_ALL = 'all';
-+    const STORE_CODE_DEFAULT = 'default';
-+
-+    private $stores = [
-+        self::STORE_CODE_DEFAULT,
-+        self::STORE_CODE_ALL,
-+        self::STORE_CODE_FROM_FIXTURE,
-+    ];
-+
-+    const KEY_TIER_PRICES = 'tier_prices';
-+    const KEY_SPECIAL_PRICE = 'special_price';
-+    const KEY_CATEGORY_LINKS = 'category_links';
-+
-+    const BULK_UUID_KEY = 'bulk_uuid';
-+
-+    protected $consumers = [
-+        self::ASYNC_CONSUMER_NAME,
-+    ];
-+
-+    /**
-+     * @var string[]
-+     */
-+    private $skus = [];
-+
-+    /**
-+     * @var PublisherConsumerController
-+     */
-+    private $publisherConsumerController;
-+
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var Registry
-+     */
-+    private $registry;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->logFilePath = TESTS_TEMP_DIR . "/MessageQueueTestLog.txt";
-+        $this->registry = $this->objectManager->get(Registry::class);
-+
-+        $params = array_merge_recursive(
-+            Bootstrap::getInstance()->getAppInitParams(),
-+            ['MAGE_DIRS' => ['cache' => ['path' => TESTS_TEMP_DIR . '/cache']]]
-+        );
-+
-+        /** @var PublisherConsumerController publisherConsumerController */
-+        $this->publisherConsumerController = $this->objectManager->create(
-+            PublisherConsumerController::class,
-+            [
-+                'consumers' => $this->consumers,
-+                'logFilePath' => $this->logFilePath,
-+                'appInitParams' => $params,
-+            ]
-+        );
-+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-+
-+        try {
-+            $this->publisherConsumerController->initialize();
-+        } catch (EnvironmentPreconditionException $e) {
-+            $this->markTestSkipped($e->getMessage());
-+        } catch (PreconditionFailedException $e) {
-+            $this->fail(
-+                $e->getMessage()
-+            );
-+        }
-+
-+        parent::setUp();
-+    }
-+
-+    /**
-+     * @dataProvider storeProvider
-+     * @magentoApiDataFixture Magento/Store/_files/core_fixturestore.php
-+     */
-+    public function testAsyncScheduleBulkMultistore($storeCode)
-+    {
-+        $product = $this->getProductData();
-+        $this->_markTestAsRestOnly();
-+
-+        /** @var Store $store */
-+        $store = $this->objectManager->create(Store::class);
-+        $store->load(self::STORE_CODE_FROM_FIXTURE);
-+        $this->assertEquals(
-+            self::STORE_NAME_FROM_FIXTURE,
-+            $store->getName(),
-+            'Precondition failed: fixture store was not created.'
-+        );
-+
-+        try {
-+            /** @var Product $productModel */
-+            $productModel = $this->objectManager->create(
-+                Product::class,
-+                ['data' => $product['product']]
-+            );
-+            $this->productRepository->save($productModel);
-+        } catch (\Exception $e) {
-+            $this->fail("Precondition failed: product was not created.");
-+        }
-+
-+        $this->asyncScheduleAndTest($product, $storeCode);
-+        $this->clearProducts();
-+    }
-+
-+    private function asyncScheduleAndTest($product, $storeCode = null)
-+    {
-+        $sku = $product['product'][Product::SKU];
-+        $productName = $product['product'][Product::NAME];
-+        $newProductName = $product['product'][Product::NAME] . $storeCode;
-+
-+        $this->skus[] = $sku;
-+
-+        $product['product'][Product::NAME] = $newProductName;
-+        $product['product'][Product::TYPE_ID] = 'virtual';
-+
-+        $response = $this->updateProductAsync($product, $sku, $storeCode);
-+
-+        $this->assertArrayHasKey(self::BULK_UUID_KEY, $response);
-+        $this->assertNotNull($response[self::BULK_UUID_KEY]);
-+
-+        $this->assertCount(1, $response['request_items']);
-+        $this->assertEquals('accepted', $response['request_items'][0]['status']);
-+        $this->assertFalse($response['errors']);
-+
-+        //assert one products is created
-+        try {
-+            $this->publisherConsumerController->waitForAsynchronousResult(
-+                [$this, 'assertProductCreation'],
-+                [$product]
-+            );
-+        } catch (PreconditionFailedException $e) {
-+            $this->fail("Not all products were created");
-+        }
-+
-+        $requestData = ['id' => $sku, 'sku' => $sku];
-+
-+        foreach ($this->stores as $checkingStore) {
-+            $serviceInfo = [
-+                'rest' => [
-+                    'resourcePath' => self::REST_RESOURCE_PATH . '/' . $sku,
-+                    'httpMethod' => Request::HTTP_METHOD_GET
-+                ]
-+            ];
-+            $storeResponse = $this->_webApiCall($serviceInfo, $requestData, null, $checkingStore);
-+            if ($checkingStore == $storeCode || $storeCode == self::STORE_CODE_ALL) {
-+                $this->assertEquals(
-+                    $newProductName,
-+                    $storeResponse[Product::NAME],
-+                    sprintf(
-+                        'Product name in %s store is invalid after updating in store %s.',
-+                        $checkingStore,
-+                        $storeCode
-+                    )
-+                );
-+            } else {
-+                $this->assertEquals(
-+                    $productName,
-+                    $storeResponse[Product::NAME],
-+                    sprintf(
-+                        'Product name in %s store is invalid after updating in store %s.',
-+                        $checkingStore,
-+                        $storeCode
-+                    )
-+                );
-+            }
-+        }
-+    }
-+
-+    public function tearDown()
-+    {
-+        $this->clearProducts();
-+        $this->publisherConsumerController->stopConsumers();
-+        parent::tearDown();
-+    }
-+
-+    private function clearProducts()
-+    {
-+        $size = $this->objectManager->create(Collection::class)
-+            ->addAttributeToFilter('sku', ['in' => $this->skus])
-+            ->load()
-+            ->getSize();
-+
-+        if ($size == 0) {
-+            return;
-+        }
-+
-+        $this->registry->unregister('isSecureArea');
-+        $this->registry->register('isSecureArea', true);
-+        try {
-+            foreach ($this->skus as $sku) {
-+                $this->productRepository->deleteById($sku);
-+            }
-+        // phpcs:ignore Magento2.Exceptions.ThrowCatch
-+        } catch (\Exception $e) {
-+            throw $e;
-+            //nothing to delete
-+        }
-+        $this->registry->unregister('isSecureArea');
-+
-+        $size = $this->objectManager->create(Collection::class)
-+            ->addAttributeToFilter('sku', ['in' => $this->skus])
-+            ->load()
-+            ->getSize();
-+
-+        if ($size > 0) {
-+            //phpcs:ignore Magento2.Exceptions.DirectThrow
-+            throw new Exception(new Phrase("Collection size after clearing the products: %size", ['size' => $size]));
-+        }
-+        $this->skus = [];
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getProductData()
-+    {
-+        $productBuilder = function ($data) {
-+            return array_replace_recursive(
-+                $this->getSimpleProductData(),
-+                $data
-+            );
-+        };
-+
-+        return [
-+            'product' =>
-+                $productBuilder(
-+                    [
-+                        ProductInterface::TYPE_ID => 'simple',
-+                        ProductInterface::SKU => 'multistore-sku-test-1',
-+                        ProductInterface::NAME => 'Test Name ',
-+                    ]
-+                ),
-+        ];
-+    }
-+
-+    public function storeProvider()
-+    {
-+        $dataSets = [];
-+        foreach ($this->stores as $store) {
-+            $dataSets[$store] = [$store];
-+        }
-+        return $dataSets;
-+    }
-+
-+    /**
-+     * Get Simple Product Data
-+     *
-+     * @param array $productData
-+     * @return array
-+     */
-+    private function getSimpleProductData($productData = [])
-+    {
-+        return [
-+            ProductInterface::SKU => isset($productData[ProductInterface::SKU])
-+                ? $productData[ProductInterface::SKU] : uniqid('sku-', true),
-+            ProductInterface::NAME => isset($productData[ProductInterface::NAME])
-+                ? $productData[ProductInterface::NAME] : uniqid('sku-', true),
-+            ProductInterface::VISIBILITY => 4,
-+            ProductInterface::TYPE_ID => 'simple',
-+            ProductInterface::PRICE => 3.62,
-+            ProductInterface::STATUS => 1,
-+            ProductInterface::TYPE_ID => 'simple',
-+            ProductInterface::ATTRIBUTE_SET_ID => 4,
-+        ];
-+    }
-+
-+    /**
-+     * @param $requestData
-+     * @param string|null $storeCode
-+     * @return mixed
-+     */
-+    private function updateProductAsync($requestData, $sku, $storeCode = null)
-+    {
-+        $serviceInfo = [
-+            'rest' => [
-+                'resourcePath' => self::ASYNC_RESOURCE_PATH . '/' . $sku,
-+                'httpMethod' => Request::HTTP_METHOD_PUT,
-+            ],
-+        ];
-+
-+        return $this->_webApiCall($serviceInfo, $requestData, null, $storeCode);
-+    }
-+
-+    public function assertProductCreation($product)
-+    {
-+        $sku = $product['product'][Product::SKU];
-+        $collection = $this->objectManager->create(Collection::class)
-+            ->addAttributeToFilter(Product::SKU, ['eq' => $sku])
-+            ->addAttributeToFilter(Product::TYPE_ID, ['eq' => 'virtual'])
-+            ->load();
-+        $size = $collection->getSize();
-+
-+        return $size > 0;
-+    }
-+
-+    /**
-+     * Remove test store
-+     * //phpcs:disable
-+     */
-+    public static function tearDownAfterClass()
-+    {
-+        parent::tearDownAfterClass();
-+        //phpcs:enable
-+        /** @var Registry $registry */
-+        $registry = Bootstrap::getObjectManager()->get(Registry::class);
-+
-+        $registry->unregister('isSecureArea');
-+        $registry->register('isSecureArea', true);
-+
-+        /** @var Store $store*/
-+        $store = Bootstrap::getObjectManager()->create(Store::class);
-+        $store->load('fixturestore');
-+        if ($store->getId()) {
-+            $store->delete();
-+        }
-+
-+        $registry->unregister('isSecureArea');
-+        $registry->register('isSecureArea', false);
-+    }
-+}
-diff --git a/dev/tests/functional/.htaccess.sample b/dev/tests/functional/.htaccess.sample
-deleted file mode 100644
-index 67c2f3fe2d0..00000000000
---- a/dev/tests/functional/.htaccess.sample
-+++ /dev/null
-@@ -1,11 +0,0 @@
--##############################################
--## Allow access to command.php, website.php, export.php, pathChecker.php, locales.php, deleteMagentoGeneratedCode.php and log.php
--    <FilesMatch "command.php|website.php|export.php|pathChecker.php|deleteMagentoGeneratedCode.php|log.php|locales.php">
--        <IfVersion < 2.4>
--            order allow,deny
--            allow from all
--        </IfVersion>
--        <IfVersion >= 2.4>
--            Require all granted
--        </IfVersion>
--    </FilesMatch>
-diff --git a/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php b/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
-index 60abe18f5a7..fc54e73ff1a 100644
---- a/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
-@@ -7,6 +7,7 @@
- namespace Magento\Mtf\App\State;
- 
- use Magento\Mtf\ObjectManager;
-+use Magento\Mtf\Util\Command\Cli;
- use Magento\Mtf\Util\Protocol\CurlInterface;
- use Magento\Mtf\Util\Protocol\CurlTransport;
- 
-@@ -27,7 +28,7 @@ class State1 extends AbstractState
-      *
-      * @var string
-      */
--    protected $config ='admin_session_lifetime_1_hour, wysiwyg_disabled, admin_account_sharing_enable, log_to_file';
-+    protected $config ='admin_session_lifetime_1_hour, wysiwyg_disabled, admin_account_sharing_enable';
- 
-     /**
-      * HTTP CURL Adapter.
-@@ -55,6 +56,7 @@ class State1 extends AbstractState
-      * Apply set up configuration profile.
-      *
-      * @return void
-+     * @throws \Exception
-      */
-     public function apply()
-     {
-@@ -67,6 +69,10 @@ class State1 extends AbstractState
-                 ['configData' => $this->config]
-             )->run();
-         }
-+
-+        /** @var Cli $cli */
-+        $cli = $this->objectManager->create(Cli::class);
-+        $cli->execute('setup:config:set', ['--enable-debug-logging=true']);
-     }
- 
-     /**
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
-index d1fd3513024..03492f7ae1a 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
-@@ -6,9 +6,9 @@
- 
- namespace Magento\Mtf\Client\Element;
- 
--use Magento\Mtf\ObjectManager;
--use Magento\Mtf\Client\Locator;
- use Magento\Mtf\Client\ElementInterface;
-+use Magento\Mtf\Client\Locator;
-+use Magento\Mtf\ObjectManager;
- 
- /**
-  * Typified element class for conditions.
-@@ -135,6 +135,13 @@ class ConditionsElement extends SimpleElement
-      */
-     protected $chooserGridLocator = 'div[id*=chooser]';
- 
-+    /**
-+     * Datepicker xpath.
-+     *
-+     * @var string
-+     */
-+    private $datepicker = './/*[contains(@class,"ui-datepicker-trigger")]';
-+
-     /**
-      * Key of last find param.
-      *
-@@ -189,10 +196,14 @@ class ConditionsElement extends SimpleElement
-     protected $exception;
- 
-     /**
--     * Set value to conditions.
-+     * Condition option text selector.
-      *
--     * @param string $value
--     * @return void
-+     * @var string
-+     */
-+    private $conditionOptionTextSelector = '//option[normalize-space(text())="%s"]';
-+
-+    /**
-+     * @inheritdoc
-      */
-     public function setValue($value)
-     {
-@@ -261,7 +272,7 @@ class ConditionsElement extends SimpleElement
-         $this->addCondition($condition['type'], $context);
-         $createdCondition = $context->find($this->created, Locator::SELECTOR_XPATH);
-         $this->waitForCondition($createdCondition);
--        $this->fillCondition($condition['rules'], $createdCondition);
-+        $this->fillCondition($condition['rules'], $createdCondition, $condition['type']);
-     }
- 
-     /**
-@@ -278,10 +289,16 @@ class ConditionsElement extends SimpleElement
-         $count = 0;
- 
-         do {
--            $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
--
-             try {
--                $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select')->setValue($type);
-+                $specificType = $newCondition->find(
-+                    sprintf($this->conditionOptionTextSelector, $type),
-+                    Locator::SELECTOR_XPATH
-+                )->isPresent();
-+                $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
-+                $condition = $specificType
-+                    ? $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'selectcondition')
-+                    : $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select');
-+                $condition->setValue($type);
-                 $isSetType = true;
-             } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
-                 $isSetType = false;
-@@ -302,13 +319,14 @@ class ConditionsElement extends SimpleElement
-      *
-      * @param array $rules
-      * @param ElementInterface $element
-+     * @param string|null $type
-      * @return void
-      * @throws \Exception
-      *
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
--    protected function fillCondition(array $rules, ElementInterface $element)
-+    protected function fillCondition(array $rules, ElementInterface $element, $type = null)
-     {
-         $this->resetKeyParam();
-         foreach ($rules as $rule) {
-@@ -329,7 +347,7 @@ class ConditionsElement extends SimpleElement
- 
-                     if ($this->fillGrid($rule, $param)) {
-                         $isSet = true;
--                    } elseif ($this->fillSelect($rule, $param)) {
-+                    } elseif ($this->fillSelect($rule, $param, $type)) {
-                         $isSet = true;
-                     } elseif ($this->fillText($rule, $param)) {
-                         $isSet = true;
-@@ -386,11 +404,15 @@ class ConditionsElement extends SimpleElement
-      *
-      * @param string $rule
-      * @param ElementInterface $param
-+     * @param string|null $type
-      * @return bool
-      */
--    protected function fillSelect($rule, ElementInterface $param)
-+    protected function fillSelect($rule, ElementInterface $param, $type = null)
-     {
--        $value = $param->find('select', Locator::SELECTOR_TAG_NAME, 'select');
-+        //Avoid confusion between regions like: "Baja California" and "California".
-+        $value = strpos($type, 'State/Province') === false
-+            ? $param->find('select', Locator::SELECTOR_TAG_NAME, 'select')
-+            : $param->find('select', Locator::SELECTOR_TAG_NAME, 'selectstate');
-         if ($value->isVisible()) {
-             $value->setValue($rule);
-             $this->click();
-@@ -411,7 +433,16 @@ class ConditionsElement extends SimpleElement
-     {
-         $value = $param->find('input', Locator::SELECTOR_TAG_NAME);
-         if ($value->isVisible()) {
--            $value->setValue($rule);
-+            if (!$value->getAttribute('readonly')) {
-+                $value->setValue($rule);
-+            } else {
-+                $datepicker = $param->find(
-+                    $this->datepicker,
-+                    Locator::SELECTOR_XPATH,
-+                    DatepickerElement::class
-+                );
-+                $datepicker->setValue($rule);
-+            }
- 
-             $apply = $param->find('.//*[@class="rule-param-apply"]', Locator::SELECTOR_XPATH);
-             if ($apply->isVisible()) {
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
-index a0e350cb3da..eb277c2cc43 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
-@@ -66,13 +66,16 @@ class DatepickerElement extends SimpleElement
-         $date = $this->parseDate($value);
-         $date[1] = ltrim($date[1], '0');
-         $this->click();
--        $this->find($this->datePickerButton, Locator::SELECTOR_XPATH)->click();
-         $datapicker = $this->find($this->datePickerBlock, Locator::SELECTOR_XPATH);
-+        $datepickerClose = $datapicker->find($this->datePickerButtonClose, Locator::SELECTOR_XPATH);
-+        if (!$datepickerClose->isVisible()) {
-+            $this->find($this->datePickerButton, Locator::SELECTOR_XPATH)->click();
-+        }
-         $datapicker->find($this->datePickerYear, Locator::SELECTOR_XPATH, 'select')->setValue($date[2]);
-         $datapicker->find($this->datePickerMonth, Locator::SELECTOR_XPATH, 'select')->setValue($date[0]);
-         $datapicker->find(sprintf($this->datePickerCalendar, $date[1]), Locator::SELECTOR_XPATH)->click();
-         if ($datapicker->isVisible()) {
--            $datapicker->find($this->datePickerButtonClose, Locator::SELECTOR_XPATH)->click();
-+            $datepickerClose->click();
-         }
-     }
- 
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php
-new file mode 100644
-index 00000000000..15a799eac51
---- /dev/null
-+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Mtf\Client\Element;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class SelectconditionElement extends SelectElement
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    protected $optionByValue = './/option[normalize-space(.)=%s]';
-+}
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstateElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstateElement.php
-new file mode 100644
-index 00000000000..a21353f46c1
---- /dev/null
-+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstateElement.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Mtf\Client\Element;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class SelectstateElement extends SelectElement
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    protected $optionByValue = './/option[normalize-space(.)=%s]';
-+}
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php b/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php
-index eb04450d526..61e5b764930 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php
-@@ -53,7 +53,7 @@ abstract class AbstractAssertForm extends AbstractConstraint
-             }
-             $formValue = isset($formData[$key]) ? $formData[$key] : null;
-             if (is_numeric($formValue)) {
--                $formValue = floatval($formValue);
-+                $formValue = (float)$formValue;
-             }
- 
-             if (null === $formValue) {
-@@ -118,6 +118,7 @@ abstract class AbstractAssertForm extends AbstractConstraint
- 
-     /**
-      * Sort multidimensional array by paths.
-+     *
-      * Pattern path: key/subKey::sortKey.
-      * Example:
-      * $data = [
-@@ -150,7 +151,6 @@ abstract class AbstractAssertForm extends AbstractConstraint
-      *
-      * @param array $data
-      * @param string $path
--     * @param string $path
-      * @return array
-      * @throws \Exception
-      *
-diff --git a/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php b/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
-index 745f97b9b43..836cc486cb0 100644
---- a/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Mtf\EntryPoint;
- 
-@@ -10,8 +11,8 @@ use Magento\Mtf\ObjectManager;
- 
- /**
-  * Class EntryPoint
-- * Application entry point, used to bootstrap and run application
-  *
-+ * Application entry point, used to bootstrap and run application
-  */
- class EntryPoint
- {
-@@ -36,7 +37,6 @@ class EntryPoint
-      * @param string $rootDir
-      * @param array $parameters
-      * @param ObjectManager $objectManager
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     public function __construct(
-         $rootDir,
-@@ -51,7 +51,7 @@ class EntryPoint
-     /**
-      * Run a Mtf application
-      *
--     * @param $applicationName
-+     * @param string $applicationName
-      * @param array $arguments
-      * @return mixed
-      * @throws \DomainException
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli.php
-index 8fa22122cce..f0abd280f3e 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli.php
-@@ -8,6 +8,7 @@ namespace Magento\Mtf\Util\Command;
- 
- use Magento\Mtf\Util\Protocol\CurlInterface;
- use Magento\Mtf\Util\Protocol\CurlTransport;
-+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
- 
- /**
-  * Perform bin/magento commands from command line for functional tests executions.
-@@ -17,7 +18,7 @@ class Cli
-     /**
-      * Url to command.php.
-      */
--    const URL = 'dev/tests/functional/utils/command.php';
-+    const URL = '/dev/tests/functional/utils/command.php';
- 
-     /**
-      * Curl transport protocol.
-@@ -26,12 +27,21 @@ class Cli
-      */
-     private $transport;
- 
-+    /**
-+     * Webapi handler.
-+     *
-+     * @var WebapiDecorator
-+     */
-+    private $webapiHandler;
-+
-     /**
-      * @param CurlTransport $transport
-+     * @param WebapiDecorator $webapiHandler
-      */
--    public function __construct(CurlTransport $transport)
-+    public function __construct(CurlTransport $transport, WebapiDecorator $webapiHandler)
-     {
-         $this->transport = $transport;
-+        $this->webapiHandler = $webapiHandler;
-     }
- 
-     /**
-@@ -43,22 +53,31 @@ class Cli
-      */
-     public function execute($command, $options = [])
-     {
--        $curl = $this->transport;
--        $curl->write($this->prepareUrl($command, $options), [], CurlInterface::GET);
--        $curl->read();
--        $curl->close();
-+        $this->transport->write(
-+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
-+            $this->prepareParamArray($command, $options),
-+            CurlInterface::POST,
-+            []
-+        );
-+        $this->transport->read();
-+        $this->transport->close();
-     }
- 
-     /**
--     * Prepare url.
-+     * Prepare parameter array.
-      *
-      * @param string $command
-      * @param array $options [optional]
--     * @return string
-+     * @return array
-      */
--    private function prepareUrl($command, $options = [])
-+    private function prepareParamArray($command, $options = [])
-     {
--        $command .= ' ' . implode(' ', $options);
--        return $_ENV['app_frontend_url'] . self::URL . '?command=' . urlencode($command);
-+        if (!empty($options)) {
-+            $command .= ' ' . implode(' ', $options);
-+        }
-+        return [
-+            'token' => urlencode($this->webapiHandler->getWebapiToken()),
-+            'command' => urlencode($command)
-+        ];
-     }
- }
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export.php
-index f2ab1501dc2..1dac1f21392 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export.php
-@@ -9,6 +9,7 @@ namespace Magento\Mtf\Util\Command\File;
- use Magento\Mtf\ObjectManagerInterface;
- use Magento\Mtf\Util\Command\File\Export\Data;
- use Magento\Mtf\Util\Command\File\Export\ReaderInterface;
-+use Magento\ImportExport\Test\Page\Adminhtml\AdminExportIndex;
- 
- /**
-  * Get Exporting file from the Magento.
-@@ -36,13 +37,26 @@ class Export implements ExportInterface
-      */
-     private $reader;
- 
-+    /**
-+     * Admin export index page.
-+     *
-+     * @var AdminExportIndex
-+     */
-+    private $adminExportIndex;
-+
-     /**
-      * @param ObjectManagerInterface $objectManager
--     * @param string $type [optional]
-+     * @param AdminExportIndex $adminExportIndex
-+     * @param string $type
-+     * @throws \ReflectionException
-      */
--    public function __construct(ObjectManagerInterface $objectManager, $type = 'product')
--    {
-+    public function __construct(
-+        ObjectManagerInterface $objectManager,
-+        AdminExportIndex $adminExportIndex,
-+        $type = 'product'
-+    ) {
-         $this->objectManager = $objectManager;
-+        $this->adminExportIndex = $adminExportIndex;
-         $this->reader = $this->getReader($type);
-     }
- 
-@@ -68,9 +82,11 @@ class Export implements ExportInterface
-      *
-      * @param string $name
-      * @return Data|null
-+     * @throws \Exception
-      */
-     public function getByName($name)
-     {
-+        $this->downloadFile();
-         $this->reader->getData();
-         foreach ($this->reader->getData() as $file) {
-             if ($file->getName() === $name) {
-@@ -85,9 +101,11 @@ class Export implements ExportInterface
-      * Get latest created the export file.
-      *
-      * @return Data|null
-+     * @throws \Exception
-      */
-     public function getLatest()
-     {
-+        $this->downloadFile();
-         $max = 0;
-         $latest = null;
-         foreach ($this->reader->getData() as $file) {
-@@ -106,9 +124,11 @@ class Export implements ExportInterface
-      * @param string $start
-      * @param string $end
-      * @return Data[]
-+     * @throws \Exception
-      */
-     public function getByDateRange($start, $end)
-     {
-+        $this->downloadFile();
-         $files = [];
-         foreach ($this->reader->getData() as $file) {
-             if ($file->getDate() > $start && $file->getDate() < $end) {
-@@ -123,9 +143,25 @@ class Export implements ExportInterface
-      * Get all export files.
-      *
-      * @return Data[]
-+     * @throws \Exception
-      */
-     public function getAll()
-     {
-+        $this->downloadFile();
-         return $this->reader->getData();
-     }
-+
-+    /**
-+     * Download exported file
-+     *
-+     * @return void
-+     * @throws \Exception
-+     */
-+    private function downloadFile()
-+    {
-+        $this->adminExportIndex->open();
-+        /** @var \Magento\ImportExport\Test\Block\Adminhtml\Export\ExportedGrid $exportedGrid */
-+        $exportedGrid = $this->adminExportIndex->getExportedGrid();
-+        $exportedGrid->downloadFirstFile();
-+    }
- }
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/Reader.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/Reader.php
-index 1c05fbaebf6..f5b6d681e4f 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/Reader.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/Reader.php
-@@ -3,12 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- namespace Magento\Mtf\Util\Command\File\Export;
- 
- use Magento\Mtf\ObjectManagerInterface;
- use Magento\Mtf\Util\Protocol\CurlTransport;
- use Magento\Mtf\Util\Protocol\CurlInterface;
-+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
- 
- /**
-  * File reader for Magento export files.
-@@ -36,16 +36,29 @@ class Reader implements ReaderInterface
-      */
-     private $transport;
- 
-+    /**
-+     * Webapi handler.
-+     *
-+     * @var WebapiDecorator
-+     */
-+    private $webapiHandler;
-+
-     /**
-      * @param ObjectManagerInterface $objectManager
-      * @param CurlTransport $transport
-+     * @param WebapiDecorator $webapiHandler
-      * @param string $template
-      */
--    public function __construct(ObjectManagerInterface $objectManager, CurlTransport $transport, $template)
--    {
-+    public function __construct(
-+        ObjectManagerInterface $objectManager,
-+        CurlTransport $transport,
-+        WebapiDecorator $webapiHandler,
-+        $template
-+    ) {
-         $this->objectManager = $objectManager;
-         $this->template = $template;
-         $this->transport = $transport;
-+        $this->webapiHandler = $webapiHandler;
-     }
- 
-     /**
-@@ -70,20 +83,28 @@ class Reader implements ReaderInterface
-      */
-     private function getFiles()
-     {
--        $this->transport->write($this->prepareUrl(), [], CurlInterface::GET);
-+        $this->transport->write(
-+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
-+            $this->prepareParamArray(),
-+            CurlInterface::POST,
-+            []
-+        );
-         $serializedFiles = $this->transport->read();
-         $this->transport->close();
--
-+        // phpcs:ignore Magento2.Security.InsecureFunction
-         return unserialize($serializedFiles);
-     }
- 
-     /**
--     * Prepare url.
-+     * Prepare parameter array.
-      *
--     * @return string
-+     * @return array
-      */
--    private function prepareUrl()
-+    private function prepareParamArray()
-     {
--        return $_ENV['app_frontend_url'] . self::URL . '?template=' . urlencode($this->template);
-+        return [
-+            'token' => urlencode($this->webapiHandler->getWebapiToken()),
-+            'template' => urlencode($this->template)
-+        ];
-     }
- }
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/ReaderInterface.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/ReaderInterface.php
-index 93f7cf1ce97..3666e8643ef 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/ReaderInterface.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/ReaderInterface.php
-@@ -14,7 +14,7 @@ interface ReaderInterface
-     /**
-      * Url to export.php.
-      */
--    const URL = 'dev/tests/functional/utils/export.php';
-+    const URL = '/dev/tests/functional/utils/export.php';
- 
-     /**
-      * Exporting files as Data object from Magento.
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Log.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Log.php
-index 8b41924fe0a..2539be593a7 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Log.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Log.php
-@@ -7,6 +7,7 @@
- namespace Magento\Mtf\Util\Command\File;
- 
- use Magento\Mtf\Util\Protocol\CurlTransport;
-+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
- 
- /**
-  * Get content of log file in var/log folder.
-@@ -16,7 +17,7 @@ class Log
-     /**
-      * Url to log.php.
-      */
--    const URL = 'dev/tests/functional/utils/log.php';
-+    const URL = '/dev/tests/functional/utils/log.php';
- 
-     /**
-      * Curl transport protocol.
-@@ -25,12 +26,21 @@ class Log
-      */
-     private $transport;
- 
-+    /**
-+     * Webapi handler.
-+     *
-+     * @var WebapiDecorator
-+     */
-+    private $webapiHandler;
-+
-     /**
-      * @param CurlTransport $transport
-+     * @param WebapiDecorator $webapiHandler
-      */
--    public function __construct(CurlTransport $transport)
-+    public function __construct(CurlTransport $transport, WebapiDecorator $webapiHandler)
-     {
-         $this->transport = $transport;
-+        $this->webapiHandler = $webapiHandler;
-     }
- 
-     /**
-@@ -41,22 +51,29 @@ class Log
-      */
-     public function getFileContent($name)
-     {
--        $curl = $this->transport;
--        $curl->write($this->prepareUrl($name), [], CurlTransport::GET);
--        $data = $curl->read();
--        $curl->close();
--
-+        $this->transport->write(
-+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
-+            $this->prepareParamArray($name),
-+            CurlInterface::POST,
-+            []
-+        );
-+        $data = $this->transport->read();
-+        $this->transport->close();
-+        // phpcs:ignore Magento2.Security.InsecureFunction
-         return unserialize($data);
-     }
- 
-     /**
--     * Prepare url.
-+     * Prepare parameter array.
-      *
-      * @param string $name
--     * @return string
-+     * @return array
-      */
--    private function prepareUrl($name)
-+    private function prepareParamArray($name)
-     {
--        return $_ENV['app_frontend_url'] . self::URL . '?name=' . urlencode($name);
-+        return [
-+            'token' => urlencode($this->webapiHandler->getWebapiToken()),
-+            'name' => urlencode($name)
-+        ];
-     }
- }
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/GeneratedCode.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/GeneratedCode.php
-index dde3409ed15..a9fefa25ffa 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/GeneratedCode.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/GeneratedCode.php
-@@ -7,6 +7,7 @@ namespace Magento\Mtf\Util\Command;
- 
- use Magento\Mtf\Util\Protocol\CurlInterface;
- use Magento\Mtf\Util\Protocol\CurlTransport;
-+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
- 
- /**
-  * GeneratedCode removes generated code of Magento (like generated/code and generated/metadata).
-@@ -16,7 +17,7 @@ class GeneratedCode
-     /**
-      * Url to deleteMagentoGeneratedCode.php.
-      */
--    const URL = 'dev/tests/functional/utils/deleteMagentoGeneratedCode.php';
-+    const URL = '/dev/tests/functional/utils/deleteMagentoGeneratedCode.php';
- 
-     /**
-      * Curl transport protocol.
-@@ -25,12 +26,21 @@ class GeneratedCode
-      */
-     private $transport;
- 
-+    /**
-+     * Webapi handler.
-+     *
-+     * @var WebapiDecorator
-+     */
-+    private $webapiHandler;
-+
-     /**
-      * @param CurlTransport $transport
-+     * @param WebapiDecorator $webapiHandler
-      */
--    public function __construct(CurlTransport $transport)
-+    public function __construct(CurlTransport $transport, WebapiDecorator $webapiHandler)
-     {
-         $this->transport = $transport;
-+        $this->webapiHandler = $webapiHandler;
-     }
- 
-     /**
-@@ -40,10 +50,25 @@ class GeneratedCode
-      */
-     public function delete()
-     {
--        $url = $_ENV['app_frontend_url'] . self::URL;
--        $curl = $this->transport;
--        $curl->write($url, [], CurlInterface::GET);
--        $curl->read();
--        $curl->close();
-+        $this->transport->write(
-+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
-+            $this->prepareParamArray(),
-+            CurlInterface::POST,
-+            []
-+        );
-+        $this->transport->read();
-+        $this->transport->close();
-+    }
-+
-+    /**
-+     * Prepare parameter array.
-+     *
-+     * @return array
-+     */
-+    private function prepareParamArray()
-+    {
-+        return [
-+            'token' => urlencode($this->webapiHandler->getWebapiToken())
-+        ];
-     }
- }
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Locales.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Locales.php
-index f669d91f2f2..a55d803f430 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Locales.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Locales.php
-@@ -7,6 +7,7 @@ namespace Magento\Mtf\Util\Command;
- 
- use Magento\Mtf\Util\Protocol\CurlInterface;
- use Magento\Mtf\Util\Protocol\CurlTransport;
-+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
- 
- /**
-  * Returns array of locales depends on fetching type.
-@@ -26,7 +27,7 @@ class Locales
-     /**
-      * Url to locales.php.
-      */
--    const URL = 'dev/tests/functional/utils/locales.php';
-+    const URL = '/dev/tests/functional/utils/locales.php';
- 
-     /**
-      * Curl transport protocol.
-@@ -35,12 +36,21 @@ class Locales
-      */
-     private $transport;
- 
-+    /**
-+     * Webapi handler.
-+     *
-+     * @var WebapiDecorator
-+     */
-+    private $webapiHandler;
-+
-     /**
-      * @param CurlTransport $transport Curl transport protocol
-+     * @param WebapiDecorator $webapiHandler
-      */
--    public function __construct(CurlTransport $transport)
-+    public function __construct(CurlTransport $transport, WebapiDecorator $webapiHandler)
-     {
-         $this->transport = $transport;
-+        $this->webapiHandler = $webapiHandler;
-     }
- 
-     /**
-@@ -51,12 +61,28 @@ class Locales
-      */
-     public function getList($type = self::TYPE_ALL)
-     {
--        $url = $_ENV['app_frontend_url'] . self::URL . '?type=' . $type;
--        $curl = $this->transport;
--        $curl->write($url, [], CurlInterface::GET);
--        $result = $curl->read();
--        $curl->close();
--
-+        $this->transport->write(
-+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
-+            $this->prepareParamArray($type),
-+            CurlInterface::POST,
-+            []
-+        );
-+        $result = $this->transport->read();
-+        $this->transport->close();
-         return explode('|', $result);
-     }
-+
-+    /**
-+     * Prepare parameter array.
-+     *
-+     * @param string $type
-+     * @return array
-+     */
-+    private function prepareParamArray($type)
-+    {
-+        return [
-+            'token' => urlencode($this->webapiHandler->getWebapiToken()),
-+            'type' => urlencode($type)
-+        ];
-+    }
- }
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/PathChecker.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/PathChecker.php
-index fd1f746a6f0..4b12f6eec87 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/PathChecker.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/PathChecker.php
-@@ -7,6 +7,7 @@ namespace Magento\Mtf\Util\Command;
- 
- use Magento\Mtf\Util\Protocol\CurlInterface;
- use Magento\Mtf\Util\Protocol\CurlTransport;
-+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
- 
- /**
-  * PathChecker checks that path to file or directory exists.
-@@ -16,7 +17,7 @@ class PathChecker
-     /**
-      * Url to checkPath.php.
-      */
--    const URL = 'dev/tests/functional/utils/pathChecker.php';
-+    const URL = '/dev/tests/functional/utils/pathChecker.php';
- 
-     /**
-      * Curl transport protocol.
-@@ -26,11 +27,21 @@ class PathChecker
-     private $transport;
- 
-     /**
-+     * Webapi handler.
-+     *
-+     * @var WebapiDecorator
-+     */
-+    private $webapiHandler;
-+
-+    /**
-+     * @constructor
-      * @param CurlTransport $transport
-+     * @param WebapiDecorator $webapiHandler
-      */
--    public function __construct(CurlTransport $transport)
-+    public function __construct(CurlTransport $transport, WebapiDecorator $webapiHandler)
-     {
-         $this->transport = $transport;
-+        $this->webapiHandler = $webapiHandler;
-     }
- 
-     /**
-@@ -41,12 +52,28 @@ class PathChecker
-      */
-     public function pathExists($path)
-     {
--        $url = $_ENV['app_frontend_url'] . self::URL . '?path=' . urlencode($path);
--        $curl = $this->transport;
--        $curl->write($url, [], CurlInterface::GET);
--        $result = $curl->read();
--        $curl->close();
--
-+        $this->transport->write(
-+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
-+            $this->prepareParamArray($path),
-+            CurlInterface::POST,
-+            []
-+        );
-+        $result = $this->transport->read();
-+        $this->transport->close();
-         return strpos($result, 'path exists: true') !== false;
-     }
-+
-+    /**
-+     * Prepare parameter array.
-+     *
-+     * @param string $path
-+     * @return array
-+     */
-+    private function prepareParamArray($path)
-+    {
-+        return [
-+            'token' => urlencode($this->webapiHandler->getWebapiToken()),
-+            'path' => urlencode($path)
-+        ];
-+    }
- }
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Website.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Website.php
-index 7d73634c036..fec20bb2a87 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Website.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Website.php
-@@ -3,11 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- namespace Magento\Mtf\Util\Command;
- 
- use Magento\Mtf\Util\Protocol\CurlInterface;
- use Magento\Mtf\Util\Protocol\CurlTransport;
-+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
- 
- /**
-  * Perform Website folder creation for functional tests executions.
-@@ -17,7 +17,7 @@ class Website
-     /**
-      * Url to website.php.
-      */
--    const URL = 'dev/tests/functional/utils/website.php';
-+    const URL = '/dev/tests/functional/utils/website.php';
- 
-     /**
-      * Curl transport protocol.
-@@ -26,13 +26,22 @@ class Website
-      */
-     private $transport;
- 
-+    /**
-+     * Webapi handler.
-+     *
-+     * @var WebapiDecorator
-+     */
-+    private $webapiHandler;
-+
-     /**
-      * @constructor
-      * @param CurlTransport $transport
-+     * @param WebapiDecorator $webapiHandler
-      */
--    public function __construct(CurlTransport $transport)
-+    public function __construct(CurlTransport $transport, WebapiDecorator $webapiHandler)
-     {
-         $this->transport = $transport;
-+        $this->webapiHandler = $webapiHandler;
-     }
- 
-     /**
-@@ -43,21 +52,28 @@ class Website
-      */
-     public function create($websiteCode)
-     {
--        $curl = $this->transport;
--        $curl->addOption(CURLOPT_HEADER, 1);
--        $curl->write($this->prepareUrl($websiteCode), [], CurlInterface::GET);
--        $curl->read();
--        $curl->close();
-+        $this->transport->addOption(CURLOPT_HEADER, 1);
-+        $this->transport->write(
-+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
-+            $this->prepareParamArray($websiteCode),
-+            CurlInterface::POST,
-+            []
-+        );
-+        $this->transport->read();
-+        $this->transport->close();
-     }
- 
-     /**
--     * Prepare url.
-+     * Prepare parameter array.
-      *
-      * @param string $websiteCode
--     * @return string
-+     * @return array
-      */
--    private function prepareUrl($websiteCode)
-+    private function prepareParamArray($websiteCode)
-     {
--        return $_ENV['app_frontend_url'] . self::URL . '?website_code=' . urlencode($websiteCode);
-+        return [
-+            'token' => urlencode($this->webapiHandler->getWebapiToken()),
-+            'website_code' => urlencode($websiteCode)
-+        ];
-     }
- }
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/SchemaXml.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/SchemaXml.php
-index aa85299deea..6d1d5b6f4b3 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/SchemaXml.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/SchemaXml.php
-@@ -145,7 +145,7 @@ class SchemaXml
-         foreach ($fields as $fieldName => $fieldValue) {
-             $field = $this->dom->createElement('field');
-             $field->setAttribute('name', $fieldName);
--            $field->setAttribute('is_required', intval($fieldValue['is_required']));
-+            $field->setAttribute('is_required', (int)$fieldValue['is_required']);
-             $fixture->appendChild($field);
-         }
- 
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
-index bb82715e4b4..a9a082e2c00 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
-@@ -63,23 +63,60 @@ class BackendDecorator implements CurlInterface
-      */
-     protected function authorize()
-     {
--        // Perform GET to backend url so form_key is set
--        $url = $_ENV['app_backend_url'];
--        $this->transport->write($url, [], CurlInterface::GET);
--        $this->read();
--
--        $url = $_ENV['app_backend_url'] . $this->configuration->get('application/0/backendLoginUrl/0/value');
--        $data = [
--            'login[username]' => $this->configuration->get('application/0/backendLogin/0/value'),
--            'login[password]' => $this->configuration->get('application/0/backendPassword/0/value'),
--            'form_key' => $this->formKey,
--        ];
--        $this->transport->write($url, $data, CurlInterface::POST);
--        $response = $this->read();
--        if (strpos($response, 'login-form') !== false) {
--            throw new \Exception(
--                'Admin user cannot be logged in by curl handler!'
--            );
-+        // There are situations where magento application backend url could be slightly different from the environment
-+        // variable we know. It could be intentionally (e.g. InstallTest) or unintentionally. We would still want tests
-+        // to run in this case.
-+        // When the original app_backend_url does not work, we will try 4 variants of the it. i.e. with and without
-+        // url rewrite, http and https.
-+        $urls = [];
-+        $originalUrl = rtrim($_ENV['app_backend_url'], '/') . '/';
-+        $urls[] = $originalUrl;
-+        // It could be the case that the page needs a refresh, so we will try the original one twice.
-+        $urls[] = $originalUrl;
-+        if (strpos($originalUrl, '/index.php') !== false) {
-+            $url2 = str_replace('/index.php', '', $originalUrl);
-+        } else {
-+            $url2 = $originalUrl . 'index.php/';
-+        }
-+        $urls[] = $url2;
-+        if (strpos($originalUrl, 'https') !== false) {
-+            $urls[] = str_replace('https', 'http', $originalUrl);
-+            $urls[] = str_replace('https', 'http', $url2);
-+        } else {
-+            $urls[] = str_replace('http', 'https', $originalUrl);
-+            $urls[] = str_replace('http', 'https', $url2);
-+        }
-+
-+        $isAuthorized = false;
-+        foreach ($urls as $url) {
-+            try {
-+                // Perform GET to backend url so form_key is set
-+                $this->transport->write($url, [], CurlInterface::GET);
-+                $this->read();
-+
-+                $authUrl = $url . $this->configuration->get('application/0/backendLoginUrl/0/value');
-+                $data = [
-+                    'login[username]' => $this->configuration->get('application/0/backendLogin/0/value'),
-+                    'login[password]' => $this->configuration->get('application/0/backendPassword/0/value'),
-+                    'form_key' => $this->formKey,
-+                ];
-+
-+                $this->transport->write($authUrl, $data, CurlInterface::POST);
-+                $response = $this->read();
-+                if (strpos($response, 'login-form') !== false) {
-+                    continue;
-+                }
-+                $isAuthorized = true;
-+                $_ENV['app_backend_url'] = $url;
-+                break;
-+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
-+            } catch (\Exception $e) {
-+                continue;
-+            }
-+        }
-+        if ($isAuthorized == false) {
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-+            throw new \Exception('Admin user cannot be logged in by curl handler!');
-         }
-     }
- 
-@@ -111,6 +148,7 @@ class BackendDecorator implements CurlInterface
-         if ($this->formKey) {
-             $params['form_key'] = $this->formKey;
-         } else {
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception(sprintf('Form key is absent! Url: "%s" Response: "%s"', $url, $this->response));
-         }
-         $this->transport->write($url, http_build_query($params), $method, $headers);
-diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/WebapiDecorator.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/WebapiDecorator.php
-index 3aa756904ab..df5ab45a3f9 100644
---- a/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/WebapiDecorator.php
-+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/WebapiDecorator.php
-@@ -70,6 +70,13 @@ class WebapiDecorator implements CurlInterface
-      */
-     protected $response;
- 
-+    /**
-+     * Webapi token.
-+     *
-+     * @var string
-+     */
-+    protected $webapiToken;
-+
-     /**
-      * @construct
-      * @param ObjectManager $objectManager
-@@ -110,6 +117,9 @@ class WebapiDecorator implements CurlInterface
-             $integration->persist();
- 
-             $this->setConfiguration($integration);
-+            $this->webapiToken = $integration->getToken();
-+        } else {
-+            $this->webapiToken = $integrationToken;
-         }
-     }
- 
-@@ -161,7 +171,13 @@ class WebapiDecorator implements CurlInterface
-      */
-     protected function isValidIntegration()
-     {
--        $this->write($_ENV['app_frontend_url'] . 'rest/V1/modules', [], CurlInterface::GET);
-+        $url = rtrim($_ENV['app_frontend_url'], '/');
-+        if (strpos($url, 'index.php') === false) {
-+            $url .=  '/index.php/rest/V1/modules';
-+        } else {
-+            $url .= '/rest/V1/modules';
-+        }
-+        $this->write($url, [], CurlInterface::GET);
-         $response = json_decode($this->read(), true);
- 
-         return (null !== $response) && !isset($response['message']);
-@@ -219,4 +235,18 @@ class WebapiDecorator implements CurlInterface
-     {
-         $this->transport->close();
-     }
-+
-+    /**
-+     * Return webapiToken.
-+     *
-+     * @return string
-+     */
-+    public function getWebapiToken()
-+    {
-+        // Request token if integration is no longer valid
-+        if (!$this->isValidIntegration()) {
-+            $this->init();
-+        }
-+        return $this->webapiToken;
-+    }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/AdminNotification/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/AdminNotification/Test/TestCase/NavigateMenuTest.xml
-index f2f56eb74f7..99bd9c6d9d2 100644
---- a/dev/tests/functional/tests/app/Magento/AdminNotification/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/AdminNotification/Test/TestCase/NavigateMenuTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">System > Notifications</data>
-             <data name="pageTitle" xsi:type="string">Notifications</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertExportAdvancedPricing.php b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertExportAdvancedPricing.php
-index 565d0f432bd..c92563c1ca5 100644
---- a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertExportAdvancedPricing.php
-+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertExportAdvancedPricing.php
-@@ -8,6 +8,7 @@ namespace Magento\AdvancedPricingImportExport\Test\Constraint;
- use Magento\Mtf\Constraint\AbstractConstraint;
- use Magento\Mtf\Fixture\InjectableFixture;
- use Magento\Mtf\Util\Command\File\ExportInterface;
-+use Magento\ImportExport\Test\Page\Adminhtml\AdminExportIndex;
- 
- /**
-  * Assert that exported file with advanced pricing options contains product data.
-@@ -21,19 +22,30 @@ class AssertExportAdvancedPricing extends AbstractConstraint
-      */
-     private $exportData;
- 
-+    /**
-+     * Admin export index page.
-+     *
-+     * @var AdminExportIndex
-+     */
-+    private $adminExportIndex;
-+
-     /**
-      * Assert that exported file with advanced pricing options contains product data.
-      *
-      * @param ExportInterface $export
-      * @param array $products
-      * @param array $exportedFields
-+     * @param AdminExportIndex $adminExportIndex
-      * @return void
-      */
-     public function processAssert(
-         ExportInterface $export,
-         array $products,
--        array $exportedFields
-+        array $exportedFields,
-+        AdminExportIndex $adminExportIndex
-     ) {
-+        $this->adminExportIndex = $adminExportIndex;
-+        $this->adminExportIndex->open();
-         $this->exportData = $export->getLatest();
-         foreach ($products as $product) {
-             $regexps = $this->prepareRegexpsForCheck($exportedFields, $product);
-diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.php b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.php
-index df8cd6f354c..c2c684c89d0 100644
---- a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.php
-+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.php
-@@ -11,6 +11,7 @@ use Magento\Mtf\Fixture\FixtureFactory;
- use Magento\Mtf\TestCase\Injectable;
- use Magento\Mtf\TestStep\TestStepFactory;
- use Magento\Store\Test\Fixture\Website;
-+use Magento\Mtf\Util\Command\Cli\Cron;
- 
- /**
-  * Preconditions:
-@@ -65,16 +66,23 @@ class ExportAdvancedPricingTest extends Injectable
-     private $catalogProductIndex;
- 
-     /**
--     * Prepare test data.
-+     * Cron command
-      *
--     * @param CatalogProductIndex $catalogProductIndex
-+     * @var Cron
-+     */
-+    private $cron;
-+
-+    /**
-+     * Run cron before tests running
-+     *
-+     * @param Cron $cron
-      * @return void
-      */
-     public function __prepare(
--        CatalogProductIndex $catalogProductIndex
-+        Cron $cron
-     ) {
--        $catalogProductIndex->open();
--        $catalogProductIndex->getProductGrid()->massaction([], 'Delete', true, 'Select All');
-+        $cron->run();
-+        $cron->run();
-     }
- 
-     /**
-@@ -84,18 +92,21 @@ class ExportAdvancedPricingTest extends Injectable
-      * @param FixtureFactory $fixtureFactory
-      * @param AdminExportIndex $adminExportIndex
-      * @param CatalogProductIndex $catalogProductIndexPage
-+     * @param Cron $cron
-      * @return void
-      */
-     public function __inject(
-         TestStepFactory $stepFactory,
-         FixtureFactory $fixtureFactory,
-         AdminExportIndex $adminExportIndex,
--        CatalogProductIndex $catalogProductIndexPage
-+        CatalogProductIndex $catalogProductIndexPage,
-+        Cron $cron
-     ) {
-         $this->stepFactory = $stepFactory;
-         $this->fixtureFactory = $fixtureFactory;
-         $this->adminExportIndex = $adminExportIndex;
-         $this->catalogProductIndex = $catalogProductIndexPage;
-+        $this->cron = $cron;
-     }
- 
-     /**
-@@ -130,9 +141,13 @@ class ExportAdvancedPricingTest extends Injectable
-             $website->persist();
-             $this->setupCurrencyForCustomWebsite($website, $currencyCustomWebsite);
-         }
-+        $this->cron->run();
-+        $this->cron->run();
-         $products = $this->prepareProducts($products, $website);
-+        $this->cron->run();
-+        $this->cron->run();
-         $this->adminExportIndex->open();
--
-+        $this->adminExportIndex->getExportedGrid()->deleteAllExportedFiles();
-         $exportData = $this->fixtureFactory->createByCode(
-             'exportData',
-             [
-@@ -150,7 +165,8 @@ class ExportAdvancedPricingTest extends Injectable
-         if (!empty($advancedPricingAttributes)) {
-             $products = [$products[0]];
-         }
--
-+        $this->cron->run();
-+        $this->cron->run();
-         return [
-             'products' => $products
-         ];
-@@ -191,6 +207,9 @@ class ExportAdvancedPricingTest extends Injectable
-      */
-     public function prepareProducts(array $products, Website $website = null)
-     {
-+        $this->catalogProductIndex->open();
-+        $this->catalogProductIndex->getProductGrid()->massaction([], 'Delete', true, 'Select All');
-+
-         if (empty($products)) {
-             return null;
-         }
-diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml
-index 9f19ff4cb00..07646c2aced 100644
---- a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml
-@@ -9,6 +9,7 @@
-     <testCase name="Magento\AdvancedPricingImportExport\Test\TestCase\ExportAdvancedPricingTest" summary="Export with advanced pricing entity type option">
-         <variation name="ExportAdvancedPricingTestVariation1" summary="Trying export product data with advanced pricing option but without created products" ticketId="MAGETWO-46147">
-             <data name="exportData" xsi:type="string">csv_with_advanced_pricing</data>
-+            <constraint name="Magento\ImportExport\Test\Constraint\AssertExportSubmittedMessage"/>
-             <constraint name="Magento\ImportExport\Test\Constraint\AssertExportNoDataErrorMessage"/>
-         </variation>
-         <variation name="ExportAdvancedPricingTestVariation2" summary="Trying export product data with advanced pricing option" ticketId="MAGETWO-46120">
-diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ImportDataNegativeTest.xml b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ImportDataNegativeTest.xml
-index 65b4d6e973b..db992e662d8 100644
---- a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ImportDataNegativeTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ImportDataNegativeTest.xml
-@@ -19,7 +19,7 @@
-                 <item name="entity" xsi:type="string">Advanced Pricing</item>
-                 <item name="behavior" xsi:type="string">Add/Update</item>
-                 <item name="validation_strategy" xsi:type="string">Stop on Error</item>
--                <item name="allowed_error_count" xsi:type="string">10</item>
-+                <item name="allowed_error_count" xsi:type="string">1</item>
-                 <item name="import_field_separator" xsi:type="string">,</item>
-                 <item name="import_multiple_value_separator" xsi:type="string">,</item>
-                 <item name="import_file" xsi:type="array">
-diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_incorrect.php b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_incorrect.php
-index 12203222534..e728a876163 100644
---- a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_incorrect.php
-+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_incorrect.php
-@@ -14,5 +14,13 @@ return [
-             'tier_price' => 'text',
-             'tier_price_value_type' => 'Fixed',
-         ],
-+        'data_1' => [
-+            'sku' => '%sku%',
-+            'tier_price_website' => "All Websites [USD]",
-+            'tier_price_customer_group' => 'ALL GROUPS',
-+            'tier_price_qty' => '3',
-+            'tier_price' => 'text',
-+            'tier_price_value_type' => 'Fixed',
-+        ],
-     ],
- ];
-diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.xml
-index a975d19ef88..89c9d916892 100644
---- a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Analytics\Test\TestCase\AdvancedReportingButtonTest" summary="Navigate through Advanced Reporting button on dashboard to Sign Up page" ticketId="MAGETWO-63715">
-         <variation name="AdvancedReportingButtonTest">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="advancedReportingLink" xsi:type="string">https://advancedreporting.rjmetrics.com/report</data>
-             <constraint name="Magento\Analytics\Test\Constraint\AssertAdvancedReportingPage" />
-         </variation>
-diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
-index 9c19f80e91d..8f7b07c8c14 100644
---- a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
-@@ -8,12 +8,15 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate to menu chapter">
-         <variation name="NavigateMenuTestBIEssentials" summary="Navigate through BI Essentials admin menu to Sign Up page" ticketId="MAGETWO-63700">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="issue" xsi:type="string">MAGETWO-97261: Magento\Backend\Test\TestCase\NavigateMenuTest fails on Jenkins</data>
-             <data name="menuItem" xsi:type="string">Reports > BI Essentials</data>
-             <data name="waitMenuItemNotVisible" xsi:type="boolean">false</data>
-             <data name="businessIntelligenceLink" xsi:type="string">https://dashboard.rjmetrics.com/v2/magento/signup</data>
-             <constraint name="Magento\Analytics\Test\Constraint\AssertBIEssentialsLink" />
-         </variation>
-         <variation name="NavigateMenuTestAdvancedReporting" summary="Navigate through Advanced Reporting admin menu to BI Reports page" ticketId="MAGETWO-65748">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Advanced Reporting</data>
-             <data name="waitMenuItemNotVisible" xsi:type="boolean">false</data>
-             <data name="advancedReportingLink" xsi:type="string">https://advancedreporting.rjmetrics.com/report</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php
-index 3738f51ef6c..01d8401b22f 100644
---- a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php
-+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\Backend\Test\Handler\Ui;
- 
-+use Magento\Backend\Test\Page\AdminAuthLogin;
- use Magento\Mtf\Factory\Factory;
- use Magento\Mtf\Fixture\FixtureInterface;
- use Magento\Mtf\Handler\Ui;
-@@ -29,10 +30,15 @@ class LoginUser extends Ui
-             $fixture = Factory::getFixtureFactory()->getMagentoBackendAdminSuperAdmin();
-         }
- 
-+        /** @var AdminAuthLogin $loginPage */
-         $loginPage = Factory::getPageFactory()->getAdminAuthLogin();
-         $loginForm = $loginPage->getLoginBlock();
--
-         $adminHeaderPanel = $loginPage->getHeaderBlock();
-+        if (!$loginForm->isVisible() && !$adminHeaderPanel->isVisible()) {
-+            //We are currently not in the admin area.
-+            $loginPage->open();
-+        }
-+
-         if (!$adminHeaderPanel || !$adminHeaderPanel->isVisible()) {
-             $loginPage->open();
-             if ($adminHeaderPanel->isVisible()) {
-diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
-index adae65a1d06..799f9e30fd9 100644
---- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
-+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
-@@ -17,5 +17,6 @@
-         <block name="accessDeniedBlock" class="Magento\Backend\Test\Block\Denied" locator="#anchor-content" strategy="css selector" />
-         <block name="systemMessageDialog" class="Magento\AdminNotification\Test\Block\System\Messages" locator='.ui-popup-message .modal-inner-wrap' strategy="css selector" />
-         <block name="applicationVersion" class="Magento\Backend\Test\Block\Version" locator="body" strategy="css selector" />
-+        <block name="modalMessage" class="Magento\Ui\Test\Block\Adminhtml\Modal" locator=".modal-popup>.modal-inner-wrap" strategy="css selector" />
-     </page>
- </config>
-diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
-index 1792ddb5abd..9985e962b04 100644
---- a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
-+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
-@@ -174,15 +174,6 @@
-                 <item name="value" xsi:type="number">0</item>
-             </field>
-         </dataset>
--
--        <dataset name="log_to_file">
--            <field name="dev/debug/debug_logging" xsi:type="array">
--                <item name="scope" xsi:type="string">default</item>
--                <item name="scope_id" xsi:type="number">0</item>
--                <item name="label" xsi:type="string">Yes</item>
--                <item name="value" xsi:type="number">1</item>
--            </field>
--        </dataset>
-         
-         <dataset name="minify_js_files">
-             <field name="dev/js/minify_files" xsi:type="array">
-diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml
-index dca6e1d1502..6d9c50b4317 100644
---- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml
-@@ -8,31 +8,26 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\GlobalSearchEntityTest" summary="Global Search Backend " ticketId="MAGETWO-28457">
-         <variation name="GlobalSearchEntityTestVariation1">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="description" xsi:type="string">search shows admin preview</data>
-             <data name="search/data/query" xsi:type="string">Some search term</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchPreview" />
-         </variation>
-         <variation name="GlobalSearchEntityTestVariation2">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="description" xsi:type="string">search with 2 sign return no results</data>
-             <data name="search/data/query" xsi:type="string">:)</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchNoRecordsFound" />
-         </variation>
-         <variation name="GlobalSearchEntityTestVariation3">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="description" xsi:type="string">search product by sku</data>
-             <data name="search/data/query" xsi:type="string">orderInjectable::default::product::sku</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchProductName" />
-         </variation>
-         <variation name="GlobalSearchEntityTestVariation4">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="description" xsi:type="string">search existed customer</data>
-             <data name="search/data/query" xsi:type="string">customer::johndoe_unique::lastname</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchCustomerName" />
-         </variation>
-         <variation name="GlobalSearchEntityTestVariation5">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="description" xsi:type="string">search order (by order id)</data>
-             <data name="search/data/query" xsi:type="string">orderInjectable::default::id</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchOrderId" />
-diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.php b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.php
-index 1c3d018af07..4a6202f815b 100644
---- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.php
-@@ -9,6 +9,7 @@ use Magento\Mtf\TestCase\Injectable;
- use Magento\Backend\Test\Page\Adminhtml\Dashboard;
- use Magento\Mtf\Util\Command\Cli\DeployMode;
- use Magento\Mtf\TestStep\TestStepFactory;
-+use Magento\User\Test\TestStep\LoginUserOnBackendStep;
- 
- /**
-  * Verify visibility of form elements on Configuration page.
-@@ -53,9 +54,11 @@ class LoginAfterJSMinificationTest extends Injectable
-     }
- 
-     /**
--     * Admin login test after JS minification is turned on in production mode
-+     * Admin login test after JS minification is turned on in production mode.
-+     *
-      * @param DeployMode $cli
-      * @param null $configData
-+     *
-      * @return void
-      */
-     public function test(
-@@ -64,15 +67,26 @@ class LoginAfterJSMinificationTest extends Injectable
-     ) {
-         $this->configData = $configData;
- 
--       //Pre-conditions
-+        //Pre-conditions
-         $cli->setDeployModeToDeveloper();
--        $this->objectManager->create(
-+        $this->stepFactory->create(
-             \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
-             ['configData' => $this->configData]
-         )->run();
- 
-         // Steps
-         $cli->setDeployModeToProduction();
--        $this->adminDashboardPage->open();
-+        $this->stepFactory->create(LoginUserOnBackendStep::class)->run();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function tearDown()
-+    {
-+        $this->stepFactory->create(
-+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
-+            ['configData' => $this->configData]
-+        )->cleanup();
-     }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.xml
-index 4519655395f..e63efd4db99 100644
---- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\LoginAfterJSMinificationTest" summary="Verify login is successful after JS minification is enabled">
-         <variation name="LoginAfterJSMinificationEnabledVariation1" summary="Verify login is successful after JS minification" ticketId="MAGETWO-71416">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1,mftf_migrated:yes</data>
-             <data name="configData" xsi:type="string">minify_js_files</data>
-             <data name="menuItem" xsi:type="string">Dashboard</data>
-             <data name="pageTitle" xsi:type="string">Dashboard</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.xml
-index 67842f62d7c..afdf70704a9 100644
---- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.xml
-@@ -8,26 +8,31 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate through admin menu" ticketId="MAGETWO-34874">
-         <variation name="NavigateMenuTest2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Dashboard</data>
-             <data name="pageTitle" xsi:type="string">Dashboard</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest3">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Content > Schedule</data>
-             <data name="pageTitle" xsi:type="string">Store Design Schedule</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest4">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Stores > All Stores</data>
-             <data name="pageTitle" xsi:type="string">Stores</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest5">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Stores > Configuration</data>
-             <data name="pageTitle" xsi:type="string">Configuration</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest6">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">System > Cache Management</data>
-             <data name="pageTitle" xsi:type="string">Cache Management</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backup/Test/Repository/ConfigData.xml
-new file mode 100644
-index 00000000000..c8b19aa2bd3
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/Backup/Test/Repository/ConfigData.xml
-@@ -0,0 +1,24 @@
-+<?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="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
-+    <repository class="Magento\Config\Test\Repository\ConfigData">
-+        <dataset name="enable_backups_functionality">
-+            <field name="system/backup/functionality_enabled" xsi:type="array">
-+                <item name="label" xsi:type="string">Yes</item>
-+                <item name="value" xsi:type="number">1</item>
-+            </field>
-+        </dataset>
-+        <dataset name="enable_backups_functionality_rollback">
-+            <field name="web/url/use_store" xsi:type="array">
-+                <item name="label" xsi:type="string">No</item>
-+                <item name="value" xsi:type="number">0</item>
-+            </field>
-+        </dataset>
-+    </repository>
-+</config>
-diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Backup/Test/TestCase/NavigateMenuTest.xml
-deleted file mode 100644
-index 0c024f0e3f5..00000000000
---- a/dev/tests/functional/tests/app/Magento/Backup/Test/TestCase/NavigateMenuTest.xml
-+++ /dev/null
-@@ -1,16 +0,0 @@
--<?xml version="1.0" encoding="utf-8"?>
--<!--
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
-- -->
--<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
--    <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
--        <variation name="NavigateMenuTest7">
--            <data name="menuItem" xsi:type="string">System > Backups</data>
--            <data name="pageTitle" xsi:type="string">Backups</data>
--            <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
--        </variation>
--    </testCase>
--</config>
-diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Form/BraintreeCc.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Form/BraintreeCc.php
-index b4569e63e58..5f02a29a0f5 100644
---- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Form/BraintreeCc.php
-+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Form/BraintreeCc.php
-@@ -64,12 +64,6 @@ class BraintreeCc extends PaymentCc
-             );
-             $this->browser->switchToFrame($iframeLocator);
-             $element = $this->browser->find('body');
--            $this->browser->waitUntil(
--                function () use ($element) {
--                    $fieldElement = $element->find('input');
--                    return $fieldElement->isVisible() ? true : null;
--                }
--            );
-             $this->_fill([$mapping[$field]], $element);
-             $this->browser->switchToFrame();
-         }
-diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.xml
-index e4c0dce0c5b..18aedfa97f9 100644
---- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.xml
-+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.xml
-@@ -7,7 +7,6 @@
- -->
- <mapping strict="0">
-     <fields>
--        <qty />
-         <checkbox>
-             <selector>div[contains(@class,"field choice") and label[contains(.,"%product_name%")]]//input</selector>
-             <strategy>xpath</strategy>
-diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php
-index efa75981db7..b97a954a981 100644
---- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php
-+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php
-@@ -8,6 +8,7 @@ namespace Magento\Bundle\Test\Constraint;
- 
- use Magento\Bundle\Test\Fixture\BundleProduct;
- use Magento\Catalog\Test\Page\Product\CatalogProductView;
-+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
- use Magento\Checkout\Test\Fixture\Cart;
- use Magento\Checkout\Test\Page\CheckoutCart;
- use Magento\Mtf\Constraint\AbstractAssertForm;
-@@ -17,6 +18,8 @@ use Magento\Mtf\Constraint\AbstractAssertForm;
-  */
- class AssertBundleProductOnConfigureCartPage extends AbstractAssertForm
- {
-+    use CartPageLoadTrait;
-+
-     /**
-      * Check bundle product options correctly displayed on cart configuration page.
-      *
-@@ -28,6 +31,8 @@ class AssertBundleProductOnConfigureCartPage extends AbstractAssertForm
-     public function processAssert(CheckoutCart $checkoutCart, Cart $cart, CatalogProductView $catalogProductView)
-     {
-         $checkoutCart->open();
-+        $this->waitForCartPageLoaded($checkoutCart);
-+
-         $sourceProducts = $cart->getDataFieldConfig('items')['source'];
-         $products = $sourceProducts->getProducts();
-         foreach ($cart->getItems() as $key => $item) {
-diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php
-index 9b12c467e57..4d6d06ac6e6 100644
---- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php
-+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php
-@@ -46,7 +46,7 @@ class Item extends \Magento\Catalog\Test\Fixture\Cart\Item
-             $optionData = [
-                 'title' => $checkoutOption['title'],
-                 'value' => "{$qty} x {$value} {$price}",
--                'sku' => "{$qty} x {$value}"
-+                'sku' => "{$value}"
-             ];
- 
-             $checkoutBundleOptions[$checkoutOptionKey] = $optionData;
-diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductEntityTest.xml
-index 45e255649d2..157135117fb 100644
---- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\DeleteProductEntityTest">
-         <variation name="DeleteProductEntityTestVariation4">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
-             <data name="isRequired" xsi:type="string">Yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
-@@ -15,6 +16,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductIsNotDisplayingOnFrontend" />
-         </variation>
-         <variation name="DeleteProductEntityTestVariation5">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products" xsi:type="string">bundleProduct::bundle_fixed_product</data>
-             <data name="isRequired" xsi:type="string">No</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
-diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
-index cc93c82a631..3f16c27b6ec 100644
---- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
-@@ -10,6 +10,7 @@
-         <variation name="DeleteBundleProductFromMiniShoppingCartTestVariation">
-             <data name="products/0" xsi:type="string">bundleProduct::default</data>
-             <data name="deletedProductIndex" xsi:type="string">0</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
-         </variation>
-     </testCase>
-diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/ValidateOrderOfProductTypeTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/ValidateOrderOfProductTypeTest.xml
-index 7077f367795..cb32742a0ce 100644
---- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/ValidateOrderOfProductTypeTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/ValidateOrderOfProductTypeTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\ValidateOrderOfProductTypeTest">
-         <variation name="ValidateOrderOfProductTypeTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menu/4" xsi:type="string">Bundle Product</data>
-         </variation>
-     </testCase>
-diff --git a/dev/tests/functional/tests/app/Magento/BundleImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/BundleImportExport/Test/TestCase/ExportProductsTest.xml
-index 3ad8cff31ea..bfbe233b9dc 100644
---- a/dev/tests/functional/tests/app/Magento/BundleImportExport/Test/TestCase/ExportProductsTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/BundleImportExport/Test/TestCase/ExportProductsTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\CatalogImportExport\Test\TestCase\ExportProductsTest" summary="Export products">
-         <variation name="ExportProductsTestVariation4" summary="Export bundle products" ticketId="MAGETWO-30602">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="exportData" xsi:type="string">default</data>
-             <data name="products/0" xsi:type="array">
-                 <item name="fixture" xsi:type="string">bundleProduct</item>
-diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
-index 4883d7819c2..b0403971394 100644
---- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
-+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
-@@ -6,7 +6,7 @@
- 
- namespace Magento\Captcha\Test\Constraint;
- 
--use Magento\Contact\Test\Page\ContactIndex;
-+use Magento\Captcha\Test\Page\ContactIndexCaptcha as ContactIndex;
- use Magento\Mtf\Constraint\AbstractConstraint;
- 
- /**
-diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml
-index 060fc5f346f..742eabb61f3 100644
---- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml
-+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml
-@@ -6,7 +6,7 @@
-  */
-  -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
--    <page name="ContactIndex" mca="contact/index/index" module="Magento_Contact">
-+    <page name="ContactIndexCaptcha" mca="contact/index/index" module="Magento_Captcha">
-         <block name="contactUs" class="Magento\Captcha\Test\Block\Form\ContactUs" locator="#contact-form" strategy="css selector" />
-     </page>
- </config>
-diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.xml
-index 12b9808adb9..0c0e06d63b6 100644
---- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.xml
-@@ -14,6 +14,7 @@
-             <data name="attempts" xsi:type="number">3</data>
-             <data name="captcha" xsi:type="string">111</data>
-             <data name="configData" xsi:type="string">captcha_storefront_user_edit_failures_number, customer_max_login_failures_number</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Security\Test\Constraint\AssertCustomerIsLocked" />
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerIsLockedOnBackend" />
-         </variation>
-diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.xml
-index 186439bb9f1..9242bfbef23 100644
---- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.xml
-@@ -12,6 +12,7 @@
-             <data name="customAdmin/data/captcha" xsi:type="string">111</data>
-             <data name="pageTitle" xsi:type="string">Dashboard</data>
-             <data name="configData" xsi:type="string">captcha_backend_login</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-     </testCase>
-diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php
-index d8c9bf1f719..0de71c3a416 100644
---- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php
-@@ -8,7 +8,7 @@ namespace Magento\Captcha\Test\TestCase;
- 
- use Magento\Captcha\Test\Constraint\AssertCaptchaFieldOnContactUsForm;
- use Magento\Contact\Test\Fixture\Comment;
--use Magento\Contact\Test\Page\ContactIndex;
-+use Magento\Captcha\Test\Page\ContactIndexCaptcha as ContactIndex;
- use Magento\Mtf\TestCase\Injectable;
- use Magento\Mtf\TestStep\TestStepFactory;
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.xml
-index a88cd98e3c3..1a25afeabc5 100644
---- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.xml
-@@ -12,6 +12,7 @@
-             <data name="comment/data/captcha" xsi:type="string">111</data>
-             <data name="comment/data/customer/dataset" xsi:type="string">default</data>
-             <data name="configData" xsi:type="string">captcha_storefront_contact_us</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Contact\Test\Constraint\AssertContactUsSuccessMessage" />
-         </variation>
-     </testCase>
-diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontLoginTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontLoginTest.xml
-index 8e4327db5ed..8068b2cbc05 100644
---- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontLoginTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontLoginTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Captcha\Test\TestCase\CaptchaOnStoreFrontLoginTest" summary="Check CAPTCHA on StoreFront Login Page" ticketId="MAGETWO-43639">
-         <variation name="CaptchaOnStoreFrontLoginTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customer/dataset" xsi:type="string">default</data>
-             <data name="captcha" xsi:type="string">111</data>
-             <data name="configData" xsi:type="string">captcha_storefront_login</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml
-index 8e83c189efc..b0ce6dfa561 100644
---- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Captcha\Test\TestCase\CaptchaOnStoreFrontRegisterTest" summary="Check CAPTCHA on StoreFront Register Page" ticketId="MAGETWO-43602">
-         <variation name="CaptchaOnStoreFrontRegisterTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customer/dataset" xsi:type="string">register_customer</data>
-             <data name="customer/data/captcha" xsi:type="string">111</data>
-             <data name="configData" xsi:type="string">captcha_storefront_register</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
-index 2035e7e8320..30a323eebb7 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
-@@ -187,6 +187,8 @@ class Tree extends Block
-      */
-     public function expandAllCategories()
-     {
-+        $this->getTemplateBlock()->waitLoader();
-         $this->_rootElement->find($this->expandAll)->click();
-+        $this->getTemplateBlock()->waitLoader();
-     }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php
-index 2ac4fb81ae6..d591f3b4446 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php
-@@ -403,4 +403,21 @@ class Options extends Section
-     {
-         return $this->_rootElement->getElements($this->hintMessage);
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function _fill(array $fields, SimpleElement $element = null)
-+    {
-+        $context = ($element === null) ? $this->_rootElement : $element;
-+        foreach ($fields as $name => $field) {
-+            $element = $this->getElement($context, $field);
-+            if (!$element->isDisabled()) {
-+                $element->getContext()->hover();
-+                $element->setValue($field['value']);
-+            } else {
-+                throw new \Exception("Unable to set value to field '$name' as it's disabled.");
-+            }
-+        }
-+    }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/ProductDetails/NewCategoryIds.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/ProductDetails/NewCategoryIds.xml
-index f318287720c..87618777d79 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/ProductDetails/NewCategoryIds.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/ProductDetails/NewCategoryIds.xml
-@@ -11,7 +11,7 @@
-             <selector>[name="name"]</selector>
-         </name>
-         <parent_category>
--            <selector>div[data-index="parent"]>div</selector>
-+            <selector>div[data-index="parent"]>div[class="admin__field-control"]</selector>
-             <class>Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\ProductDetails\CategoryIds</class>
-         </parent_category>
-     </fields>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
-index 61142adc8f9..fa2b66d3e96 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
-@@ -28,7 +28,7 @@ class ProductForm extends FormSections
-      *
-      * @var string
-      */
--    protected $attribute = './/*[contains(@class,"label")]/label[text()="%s"]';
-+    protected $attribute = './/*[contains(@class,"label")]//span[text()="%s"]';
- 
-     /**
-      * Product new from date field on the product form
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
-index 090042140a5..48769126d88 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
-@@ -48,7 +48,7 @@ class TopToolbar extends Block
-     public function getSortType()
-     {
-         $content = $this->_rootElement->find($this->sorter)->getText();
--        return explode("\n", $content);
-+        return array_values(array_filter(array_map('trim', explode("\n", $content))));
-     }
- 
-     /**
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
-index 990906b7e30..c4ac7f32a94 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
-@@ -220,6 +220,13 @@ class View extends AbstractConfigureBlock
-      */
-     private $thresholdMessage = '.availability.only';
- 
-+    /**
-+     * Qty field error message selector.
-+     *
-+     * @var string
-+     */
-+    private $qtyErrorMessage = '#qty-error';
-+
-     /**
-      * Checks if threshold message is displayed.
-      *
-@@ -677,4 +684,16 @@ class View extends AbstractConfigureBlock
-         $dataVideoSelector = $this->productVideo . '[data-code="' . $videoData. '"]';
-         return $this->_rootElement->find($dataVideoSelector)->isPresent();
-     }
-+
-+    /**
-+     * Resolve qty field error message.
-+     *
-+     * @return string
-+     */
-+    public function getQtyErrorMessage()
-+    {
-+        $this->waitForElementVisible($this->qtyErrorMessage);
-+
-+        return $this->_rootElement->find($this->qtyErrorMessage)->getText();
-+    }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
-index 9f05a4ade8a..4e8e0f97d70 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
-@@ -128,7 +128,8 @@ class CustomOptions extends Form
-      *
-      * @var string
-      */
--    private $validationErrorMessage = '//div[@class="mage-error"][contains(text(), "required field")]';
-+    private $validationErrorMessage = '//div[@class="mage-error"][contains(text(), "required field")' .
-+    'and not(contains(@style,\'display\'))]';
- 
-     /**
-      * Get product options
-@@ -148,6 +149,7 @@ class CustomOptions extends Form
-         foreach ($dataOptions as $option) {
-             $title = $option['title'];
-             if (!isset($listCustomOptions[$title])) {
-+                // phpcs:ignore Magento2.Exceptions.DirectThrow
-                 throw new \Exception("Can't find option: \"{$title}\"");
-             }
- 
-@@ -231,7 +233,7 @@ class CustomOptions extends Form
-         return [
-             'options' => [
-                 [
--                    'price' => floatval($price),
-+                    'price' => (float)$price,
-                     'max_characters' => $maxCharacters,
-                 ],
-             ]
-@@ -262,7 +264,7 @@ class CustomOptions extends Form
-         return [
-             'options' => [
-                 [
--                    'price' => floatval($price),
-+                    'price' => (float)$price,
-                     'file_extension' => $this->getOptionNotice($option, 1),
-                     'image_size_x' => preg_replace('/[^0-9]/', '', $this->getOptionNotice($option, 2)),
-                     'image_size_y' => preg_replace('/[^0-9]/', '', $this->getOptionNotice($option, 3)),
-@@ -344,7 +346,7 @@ class CustomOptions extends Form
-         return [
-             'options' => [
-                 [
--                    'price' => floatval($price),
-+                    'price' => (float)$price,
-                 ],
-             ]
-         ];
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
-index 7ca5bfd2be1..a34b97b4ce2 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
-@@ -10,7 +10,6 @@ use Magento\Mtf\Block\Block;
- use Magento\Mtf\Client\Locator;
- 
- /**
-- * Class Search
-  * Block for "Search" section
-  */
- class Search extends Block
-@@ -77,6 +76,7 @@ class Search extends Block
-             $keyword = substr($keyword, 0, $length);
-         }
-         $this->fillSearch($keyword);
-+        $this->waitForElementEnabled($this->searchButton);
-         $this->_rootElement->find($this->searchButton)->click();
-     }
- 
-@@ -157,4 +157,24 @@ class Search extends Block
-         $searchAutocomplete = sprintf($this->searchAutocomplete, $text);
-         $this->_rootElement->find($searchAutocomplete, Locator::SELECTOR_XPATH)->click();
-     }
-+
-+    /**
-+     * Wait for element is enabled.
-+     *
-+     * @param string $selector
-+     * @param string $strategy
-+     * @return bool|null
-+     */
-+    public function waitForElementEnabled($selector, $strategy = Locator::SELECTOR_CSS)
-+    {
-+        $browser = $this->browser;
-+
-+        return $browser->waitUntil(
-+            function () use ($browser, $selector, $strategy) {
-+                $element = $browser->find($selector, $strategy);
-+
-+                return !$element->isDisabled() ? true : null;
-+            }
-+        );
-+    }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
-index f65aa33ff93..d5cf5d91881 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
-@@ -116,7 +116,7 @@ class AssertProductDuplicateForm extends AssertProductForm
-     protected function prepareUrlKey($urlKey)
-     {
-         preg_match("~\d+$~", $urlKey, $matches);
--        $key = intval($matches[0]) + 1;
-+        $key = (int)$matches[0] + 1;
-         return str_replace($matches[0], $key, $urlKey);
-     }
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMaxAllowedQty.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMaxAllowedQty.php
-index cb05b289105..fadd9e14763 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMaxAllowedQty.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMaxAllowedQty.php
-@@ -22,7 +22,7 @@ class AssertProductInventoryMaxAllowedQty extends AbstractConstraint
-      *
-      * @var string
-      */
--    private $errorMessage = 'The most you may purchase is %s.';
-+    private $errorMessage = 'The maximum you may purchase is %s.';
- 
-     /**
-      * Check if max qty setting is working correctly.
-@@ -48,8 +48,8 @@ class AssertProductInventoryMaxAllowedQty extends AbstractConstraint
-         $catalogProductView->getViewBlock()->waitLoader();
-         $catalogProductView->getViewBlock()->setQtyAndClickAddToCart($maxQty * 2);
-         \PHPUnit\Framework\Assert::assertEquals(
--            $catalogProductView->getMessagesBlock()->getErrorMessage(),
-             sprintf($this->errorMessage, $maxQty),
-+            $catalogProductView->getViewBlock()->getQtyErrorMessage(),
-             'The maximum purchase warning message is not appears.'
-         );
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMinAllowedQty.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMinAllowedQty.php
-index b950fb216b1..8c083157847 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMinAllowedQty.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMinAllowedQty.php
-@@ -48,8 +48,8 @@ class AssertProductInventoryMinAllowedQty extends AbstractConstraint
-         $catalogProductView->getViewBlock()->waitLoader();
-         $catalogProductView->getViewBlock()->setQtyAndClickAddToCart(1);
-         \PHPUnit\Framework\Assert::assertEquals(
--            $catalogProductView->getMessagesBlock()->getErrorMessage(),
-             sprintf($this->errorMessage, $minQty),
-+            $catalogProductView->getViewBlock()->getQtyErrorMessage(),
-             'The minimum purchase warning message is not appears.'
-         );
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
-index d78095f05fe..3d644a2a322 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
-@@ -91,15 +91,18 @@ class Curl extends AbstractCurl implements CatalogProductAttributeInterface
-         $data['frontend_label'] = [0 => $data['frontend_label']];
- 
-         if (isset($data['options'])) {
-+            $optionsData = [];
-             foreach ($data['options'] as $key => $values) {
-+                $optionRowData = [];
-                 $index = 'option_' . $key;
-                 if ($values['is_default'] == 'Yes') {
--                    $data['default'][] = $index;
-+                    $optionRowData['default'][] = $index;
-                 }
--                $data['option']['value'][$index] = [$values['admin'], $values['view']];
--                $data['option']['order'][$index] = $key;
-+                $optionRowData['option']['value'][$index] = [$values['admin'], $values['view']];
-+                $optionRowData['option']['order'][$index] = $key;
-+                $optionsData[] = $optionRowData;
-             }
--            unset($data['options']);
-+            $data['options'] = $optionsData;
-         }
- 
-         $data = $this->changeStructureOfTheData($data);
-@@ -134,11 +137,39 @@ class Curl extends AbstractCurl implements CatalogProductAttributeInterface
-     }
- 
-     /**
-+     * Additional data handling.
-+     *
-      * @param array $data
-      * @return array
-      */
--    protected function changeStructureOfTheData(array $data)
-+    protected function changeStructureOfTheData(array $data): array
-     {
-+        if (!isset($data['options'])) {
-+            return $data;
-+        }
-+
-+        $serializedOptions = $this->getSerializeOptions($data['options']);
-+        if ($serializedOptions) {
-+            $data['serialized_options'] = $serializedOptions;
-+            unset($data['options']);
-+        }
-+
-         return $data;
-     }
-+
-+    /**
-+     * Provides serialized product attribute options.
-+     *
-+     * @param array $data
-+     * @return string
-+     */
-+    protected function getSerializeOptions(array $data): string
-+    {
-+        $options = [];
-+        foreach ($data as $optionRowData) {
-+            $options[] = http_build_query($optionRowData);
-+        }
-+
-+        return json_encode($options);
-+    }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
-index c75112fee86..2a23903a697 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
-@@ -411,7 +411,7 @@ class Curl extends AbstractCurl implements CatalogProductSimpleInterface
-             : ['is_in_stock' => 'In Stock'];
- 
-         if (!isset($quantityAndStockStatus['is_in_stock'])) {
--            $qty = isset($quantityAndStockStatus['qty']) ? intval($quantityAndStockStatus['qty']) : null;
-+            $qty = isset($quantityAndStockStatus['qty']) ? (int)$quantityAndStockStatus['qty'] : null;
-             $quantityAndStockStatus['is_in_stock'] = 0 === $qty ? 'Out of Stock' : 'In Stock';
-         }
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
-index 721b0ff5700..e90ca6bf786 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
-@@ -41,7 +41,7 @@
-             <field name="attribute_set_id" xsi:type="array">
-                 <item name="dataset" xsi:type="string">default</item>
-             </field>
--            <field name="name" xsi:type="string">Product \&#39;!@#$%^&amp;*()+:;\\|}{][?=-~` %isolation%</field>
-+            <field name="name" xsi:type="string">Product \&#39;!@#$%^&amp;*()+:;\\|}{][?=~` %isolation%</field>
-             <field name="sku" xsi:type="string">sku_simple_product_%isolation%</field>
-             <field name="is_virtual" xsi:type="string">No</field>
-             <field name="product_has_weight" xsi:type="string">This item has weight</field>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml
-index d529f748659..014d685cfdb 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml
-@@ -179,5 +179,31 @@
-                 <item name="dataset" xsi:type="string">catalogProductSimple::default</item>
-             </field>
-         </dataset>
-+        <dataset name="default_subcategory_with_anchored_parent_with_product">
-+            <field name="name" xsi:type="string">DefaultSubcategory%isolation%</field>
-+            <field name="url_key" xsi:type="string">default-subcategory-%isolation%</field>
-+            <field name="parent_id" xsi:type="array">
-+                <item name="dataset" xsi:type="string">default_anchored_category_with_product</item>
-+            </field>
-+            <field name="is_active" xsi:type="string">Yes</field>
-+            <field name="include_in_menu" xsi:type="string">Yes</field>
-+            <field name="is_anchor" xsi:type="string">Yes</field>
-+            <field name="category_products" xsi:type="array">
-+                <item name="dataset" xsi:type="string">catalogProductSimple::default</item>
-+            </field>
-+        </dataset>
-+        <dataset name="default_anchored_category_with_product">
-+            <field name="name" xsi:type="string">Category%isolation%</field>
-+            <field name="url_key" xsi:type="string">category%isolation%</field>
-+            <field name="is_active" xsi:type="string">Yes</field>
-+            <field name="include_in_menu" xsi:type="string">Yes</field>
-+            <field name="is_anchor" xsi:type="string">Yes</field>
-+            <field name="parent_id" xsi:type="array">
-+                <item name="dataset" xsi:type="string">default_category</item>
-+            </field>
-+            <field name="category_products" xsi:type="array">
-+                <item name="dataset" xsi:type="string">catalogProductSimple::product_5_dollar</item>
-+            </field>
-+        </dataset>
-     </repository>
- </config>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/AdvancedMoveCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/AdvancedMoveCategoryEntityTest.xml
-index 96a9d91a8e5..e92edf4a143 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/AdvancedMoveCategoryEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/AdvancedMoveCategoryEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Category\AdvancedMoveCategoryEntityTest" summary="Move category from one to another" ticketId="MAGETWO-27319">
-         <variation name="AdvancedMoveCategoryEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="childCategory/dataset" xsi:type="string">three_nested_categories</data>
-             <data name="parentCategory/dataset" xsi:type="string">default</data>
-             <data name="moveLevel" xsi:type="number">1</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
-index a840b81a5d2..69093b8adb8 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Category\CreateCategoryEntityTest" summary="Create Category from Category Page" ticketId="MAGETWO-23411">
-         <variation name="CreateCategoryEntityTestVariation1_RootCategory_RequiredFields">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Create root category with required fields only</data>
-             <data name="addCategory" xsi:type="string">addRootCategory</data>
-             <data name="category/data/is_active" xsi:type="string">Yes</data>
-@@ -16,7 +17,6 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForm" />
-         </variation>
-         <variation name="CreateCategoryEntityTestVariation2_RootCategory_AllFields">
--            <data name="issue" xsi:type="string">MAGETWO-60635: [CE][Categories] Design update dates are incorrect after save</data>
-             <data name="description" xsi:type="string">Create root category with all fields</data>
-             <data name="addCategory" xsi:type="string">addRootCategory</data>
-             <data name="category/data/is_active" xsi:type="string">Yes</data>
-@@ -57,7 +57,6 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryPage" />
-         </variation>
-         <variation name="CreateCategoryEntityTestVariation4_Subcategory_AllFields">
--            <data name="issue" xsi:type="string">MAGETWO-60635: [CE][Categories] Design update dates are incorrect after save</data>
-             <data name="description" xsi:type="string">Create not anchor subcategory specifying all fields</data>
-             <data name="addCategory" xsi:type="string">addSubcategory</data>
-             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
-@@ -95,6 +94,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
-         </variation>
-         <variation name="CreateCategoryEntityTestVariation5_Anchor_MostOfFields">
-+            <data name="tag" xsi:type="string">test_type:acceptance_test</data>
-             <data name="description" xsi:type="string">Create anchor subcategory with all fields</data>
-             <data name="addCategory" xsi:type="string">addSubcategory</data>
-             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
-@@ -144,7 +144,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryPage" />
-         </variation>
-         <variation name="CreateCategoryEntityTestVariation8_WithProducts" summary="Assign Products at the Category Level" ticketId="MAGETWO-16351">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-             <data name="addCategory" xsi:type="string">addSubcategory</data>
-             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
-             <data name="category/data/is_active" xsi:type="string">Yes</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml
-index 6951194308b..77ed04d40b7 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml
-@@ -8,11 +8,13 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Category\DeleteCategoryEntityTest" summary="Delete Category" ticketId="MAGETWO-23303">
-         <variation name="DeleteCategoryEntityTestVariation1_RootCategory" summary="Can delete a root category not assigned to any store">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="category/dataset" xsi:type="string">root_category</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategorySuccessDeleteMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryAbsenceOnBackend" />
-         </variation>
-         <variation name="DeleteCategoryEntityTestVariation2_Subcategory" summary="Can delete a subcategory">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="category/dataset" xsi:type="string">root_subcategory</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategorySuccessDeleteMessage" />
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryNotInGrid" />
-@@ -20,6 +22,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryAbsenceOnFrontend" />
-         </variation>
-         <variation name="DeleteCategoryEntityTestVariation3_RootCategory_AssignedToStore" summary="Cannot delete root category assigned to some store">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="category/dataset" xsi:type="string">default_category</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryCannotBeDeleted" />
-         </variation>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.xml
-index 446011902c0..b4fd843ca80 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Category\MoveCategoryEntityTest" summary="Move category from one to another" ticketId="MAGETWO-27319">
-         <variation name="MoveCategoryEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="childCategory/dataset" xsi:type="string">three_nested_categories</data>
-             <data name="parentCategory/dataset" xsi:type="string">default</data>
-             <data name="nestingLevel" xsi:type="string">3</data>
-@@ -15,8 +16,8 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryInGrid" />
-         </variation>
-         <variation name="MoveCategoryEntityTestVariation2" summary="Move default subcategory with anchored parent to default subcategory" ticketId="MAGETWO-21202">
--            <data name="issue" xsi:type="string">MAGETWO-65147: Category is not present in Layered navigation block when anchor is on</data>
--            <data name="childCategory/dataset" xsi:type="string">default_subcategory_with_anchored_parent</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="childCategory/dataset" xsi:type="string">default_subcategory_with_anchored_parent_with_product</data>
-             <data name="parentCategory/dataset" xsi:type="string">default</data>
-             <data name="moveLevel" xsi:type="number">2</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryMovedMessage" />
-@@ -25,9 +26,9 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryBreadcrumbs" />
-         </variation>
-         <variation name="MoveCategoryEntityTestVariation3" summary="Move default anchored subcategory with anchored parent to default subcategory" ticketId="MAGETWO-21202">
--            <data name="issue" xsi:type="string">MAGETWO-65147: Category is not present in Layered navigation block when anchor is on</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="childCategory/dataset" xsi:type="string">default_subcategory_with_anchored_parent</data>
--            <data name="childCategory/data/parent_id/dataset" xsi:type="string">default_anchor_subcategory_with_anchored_parent</data>
-+            <data name="childCategory/data/parent_id/dataset" xsi:type="string">default_subcategory_with_anchored_parent_with_product</data>
-             <data name="parentCategory/dataset" xsi:type="string">default_category</data>
-             <data name="moveLevel" xsi:type="number">2</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryMovedMessage" />
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/SubcategoryNotIncludeInNavigationMenuTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/SubcategoryNotIncludeInNavigationMenuTest.xml
-index 94d99dd6b7b..53a7debffa4 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/SubcategoryNotIncludeInNavigationMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/SubcategoryNotIncludeInNavigationMenuTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Category\MyTest" summary="Test child categories should not include in menu" ticketId="MAGETWO-72238">
-         <variation name="CategoryIncludeInNavigationMenuAndSubcategoryNotIncludeInNavigationMenu" summary="Active category and check that category is visible on navigation menu and subcategory is not visible on navigation menu">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCategory/dataset" xsi:type="string">two_nested_categories</data>
-             <data name="nestingLevel" xsi:type="number">2</data>
-             <data name="category/data/is_active" xsi:type="string">Yes</data>
-@@ -16,6 +17,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertSubCategoryNotInNavigationMenu" />
-         </variation>
-         <variation name="CategoryAndSubcategotyNotIncludeInNavigationMenu1" summary="Turn off include_in_menu category and check that category and subcategory are not visible on navigation menu">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCategory/dataset" xsi:type="string">two_nested_categories</data>
-             <data name="nestingLevel" xsi:type="number">2</data>
-             <data name="category/data/is_active" xsi:type="string">Yes</data>
-@@ -24,6 +26,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertSubCategoryNotInNavigationMenu" />
-         </variation>
-         <variation name="InactiveCategoryAndSubcategotyNotIncludeInNavigationMenu" summary="Inactive category and check that category and subcategory are not visible on navigation menu">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCategory/dataset" xsi:type="string">two_nested_categories</data>
-             <data name="nestingLevel" xsi:type="number">2</data>
-             <data name="category/data/is_active" xsi:type="string">No</data>
-@@ -32,6 +35,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertSubCategoryNotInNavigationMenu" />
-         </variation>
-         <variation name="CategoryAndSubcategotyNotIncludeInNavigationMenu2" summary="Turn off include_in_menu category, inactive category and check that category and subcategory are not visible on navigation menu">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCategory/dataset" xsi:type="string">two_nested_categories</data>
-             <data name="nestingLevel" xsi:type="number">2</data>
-             <data name="category/data/is_active" xsi:type="string">No</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityFlatDataTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityFlatDataTest.xml
-index 5f14f579a42..99f4b6718fe 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityFlatDataTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityFlatDataTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Category\UpdateCategoryEntityFlatDataTest" summary="Update Category if Use Category Flat (Cron is ON, 'Update on Save' Mode)" ticketId="MAGETWO-20169">
-         <variation name="UpdateCategoryEntityFlatDataTestVariation1" summary="Update Category with custom name and description">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCategory/dataset" xsi:type="string">default</data>
-             <data name="category/data/name" xsi:type="string">Name%isolation%</data>
-             <data name="category/data/description" xsi:type="string">Category Description Updated</data>
-@@ -23,6 +24,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryPage" />
-         </variation>
-         <variation name="UpdateCategoryEntityFlatDataTestVariation2" summary="Include category to navigation menu">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCategory/dataset" xsi:type="string">default</data>
-             <data name="initialCategory/data/include_in_menu" xsi:type="string">No</data>
-             <data name="category/data/include_in_menu" xsi:type="string">Yes</data>
-@@ -37,6 +39,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryInNavigationMenu" />
-         </variation>
-         <variation name="UpdateCategoryEntityFlatDataTestVariation3" summary="Update category and assert assigned products">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCategory/dataset" xsi:type="string">default</data>
-             <data name="category/data/category_products/dataset" xsi:type="string">catalogProductSimple::default</data>
-             <data name="indexers/0" xsi:type="string">Category Flat Data</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml
-index 76d5a532271..1cda62997e1 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Category\UpdateCategoryEntityTest" summary="Update Category" ticketId="MAGETWO-23290">
-         <variation name="UpdateCategoryEntityTestVariation1_Name_Description_UrlKey_MetaTitle_ExcludeFromMenu">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
-             <data name="category/data/name" xsi:type="string">Name%isolation%</data>
-             <data name="category/data/include_in_menu" xsi:type="string">No</data>
-@@ -22,6 +23,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryPage" />
-         </variation>
-         <variation name="UpdateCategoryEntityTestVariation2_SortProductsBy_DefaultProductSorting_AddProduct">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
-             <data name="category/data/available_product_listing_config" xsi:type="string">Yes</data>
-             <data name="category/data/default_product_listing_config" xsi:type="string">No</data>
-@@ -36,6 +38,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
-         </variation>
-         <variation name="UpdateCategoryEntityTestVariation3_MakeInactive">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
-             <data name="category/data/is_active" xsi:type="string">No</data>
-             <data name="category/data/name" xsi:type="string">Name%isolation%</data>
-@@ -44,6 +47,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryIsNotActive" />
-         </variation>
-         <variation name="UpdateCategoryEntityTestVariation4_ChangeCategoryNameOnStoreView" summary="Update Category with custom Store View.">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="category/data/store_id/dataset" xsi:type="string">custom</data>
- 	        <data name="category/data/use_default_name" xsi:type="string">No</data>
-             <data name="category/data/name" xsi:type="string">Category %isolation%</data>
-@@ -51,6 +55,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryWithCustomStoreOnFrontend" />
-         </variation>
-         <variation name="UpdateCategoryEntityTestVariation5_ChangeCategoryUrlOnStoreView" summary="Update URL Key with custom Store View." ticketId="MAGETWO-16471">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
-             <data name="category/data/store_id/dataset" xsi:type="string">custom</data>
-             <data name="category/data/use_default_url_key" xsi:type="string">No</data>
-@@ -59,6 +64,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryOnCustomStore" />
-         </variation>
-         <variation name="UpdateCategoryEntityTestVariation6_CheckCategoryDefaultUrlOnStoreView" summary="Check default URL Key on the custom Store View." ticketId="MAGETWO-64337">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCategory/dataset" xsi:type="string">default_with_custom_url</data>
-             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
-             <data name="category/data/store_id/dataset" xsi:type="string">custom</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateInactiveCategoryEntityFlatDataTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateInactiveCategoryEntityFlatDataTest.xml
-index fd2c9afaea1..0c7d88cc920 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateInactiveCategoryEntityFlatDataTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateInactiveCategoryEntityFlatDataTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Category\UpdateInactiveCategoryEntityFlatDataTest" summary="Update Category if Use Category Flat (Cron is ON, 'Update on Save' Mode)" ticketId="MAGETWO-20169">
-         <variation name="UpdateInactiveCategoryEntityFlatDataTestVariation1" summary="Inactive category and check that category is absent on frontend">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCategory/dataset" xsi:type="string">default</data>
-             <data name="category/data/is_active" xsi:type="string">No</data>
-             <data name="indexers/0" xsi:type="string">Category Flat Data</data>
-@@ -22,6 +23,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryAbsenceOnFrontend" />
-         </variation>
-         <variation name="UpdateInactiveCategoryEntityFlatDataTestVariation2" summary="Inactive category and check that category is not active on frontend">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCategory/dataset" xsi:type="string">default</data>
-             <data name="initialCategory/data/is_active" xsi:type="string">No</data>
-             <data name="category/data/is_active" xsi:type="string">No</data>
-@@ -36,6 +38,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryIsNotActive" />
-         </variation>
-         <variation name="UpdateInactiveCategoryEntityFlatDataTestVariation3" summary="Exclude category from navigation menu">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCategory/dataset" xsi:type="string">default</data>
-             <data name="category/data/include_in_menu" xsi:type="string">No</data>
-             <data name="indexers/0" xsi:type="string">Category Flat Data</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateTopCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateTopCategoryEntityTest.xml
-index 9126b619bbf..e8a5fd355da 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateTopCategoryEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateTopCategoryEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Category\UpdateTopCategoryEntityTest" summary="Update top category url" ticketId="MAGETWO-27327">
-         <variation name="UpdateCategoryEntityTestVariation1" summary="Update top category url and do not create redirect">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCategory/dataset" xsi:type="string">three_nested_categories</data>
-             <data name="nestingLevel" xsi:type="number">3</data>
-             <data name="category/data/url_key" xsi:type="string">cat1-rewrite%isolation%</data>
-@@ -17,6 +18,7 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewritesCategoriesInGrid" />
-         </variation>
-         <variation name="UpdateCategoryEntityTestVariation2" summary="Update top category url and create redirect">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCategory/dataset" xsi:type="string">three_nested_categories</data>
-             <data name="nestingLevel" xsi:type="number">3</data>
-             <data name="category/data/url_key" xsi:type="string">cat1-rewrite%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
-index 26009504843..08bff9f7070 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
-@@ -8,21 +8,25 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest9">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Catalog > Products</data>
-             <data name="pageTitle" xsi:type="string">Products</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest10">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Catalog > Categories</data>
-             <data name="pageTitle" xsi:type="string">Default Category (ID: 2)</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest11">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Stores > Product</data>
-             <data name="pageTitle" xsi:type="string">Product Attributes</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest12">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Stores > Attribute Set</data>
-             <data name="pageTitle" xsi:type="string">Attribute Sets</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php
-index c700dbc362c..c40387aba46 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php
-@@ -76,7 +76,7 @@ class AddCompareProductsTest extends AbstractCompareProductsTest
-     {
-         $this->cmsIndex->open();
-         $this->cmsIndex->getLinksBlock()->openLink("Compare Products");
--        for ($i = 1; $i <= count($this->products); $i++) {
-+        for ($i = 1, $count = count($this->products); $i <= $count; $i++) {
-             $this->catalogProductCompare->getCompareProductsBlock()->removeProduct();
-         }
-     }
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.xml
-index 874fc3f6703..b1f093162fa 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\AddToCartCrossSellTest" summary="Promote Products as Cross-Sells" ticketId="MAGETWO-12390">
-         <variation name="AddToCartCrossSellTestVariation1" method="test">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="products" xsi:type="string">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
-             <data name="promotedProducts" xsi:type="string">simple1:simple2,config1;config1:simple2</data>
-             <data name="navigateProductsOrder" xsi:type="string">simple1,config1,simple2</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml
-index 523156fb0de..24a09510ea9 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml
-@@ -9,6 +9,7 @@
-     <testCase name="Magento\Catalog\Test\TestCase\Product\ClearAllCompareProductsTest" summary="Clear All Compare Products" ticketId="MAGETWO-25961">
-         <variation name="ClearAllCompareProductsTestVariation1">
-             <data name="config/dataset" xsi:type="string">compare_products</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products" xsi:type="string">catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareSuccessRemoveAllProductsMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareItemsLinkIsAbsent" />
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.php
-deleted file mode 100644
-index cb5ad93ee42..00000000000
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.php
-+++ /dev/null
-@@ -1,146 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Catalog\Test\TestCase\Product;
--
--use Magento\Config\Test\TestStep\SetupConfigurationStep;
--use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
--use Magento\Mtf\Fixture\FixtureFactory;
--use Magento\Mtf\TestCase\Injectable;
--use Magento\Catalog\Test\Fixture\Category;
--
--/**
-- * Preconditions:
-- * 1. Use Flat Catalog Category & Use Flat Catalog Product are enabled (Store/Configuration/Catalog/Catalog/Storefront)
-- *
-- * Steps:
-- * 1. Assign 16 or more products to the same category (e.g. 20 products)
-- * 2. Go to Storefront and navigate to this category
-- * 3. Click on Page 2 or any further page
-- * 4. Go back to page 1 and change № of products per page from 9 to any number (e.g 12)
-- * 5. Click on Page 2 or any further page
-- * 5. Perform assertions.
-- *
-- * @ZephyrId MAGETWO-67570
-- */
--class CreateFlatCatalogProduct extends Injectable
--{
--    /* tags */
--    const MVP = 'yes';
--    /* end tags */
--
--    /**
--     * Configuration data
--     *
--     * @var string
--     */
--    private $configData;
--
--    /**
--     * Factory for Fixtures
--     *
--     * @var FixtureFactory
--     */
--    private $fixtureFactory;
--
--    /**
--     * Category fixture
--     *
--     * @var Category
--     */
--    private $category;
--
--    /**
--     * CatalogCategoryView page
--     *
--     * @var CatalogCategoryView
--     */
--    private $catalogCategoryView;
--
--    /**
--     * Prepare data
--     *
--     * @param Category $category
--     * @return array
--     */
--    public function __prepare(Category $category)
--    {
--        $category->persist();
--        return [
--            'category' => $category
--        ];
--    }
--
--    /**
--     * Injection data
--     *
--     * @param Category $category
--     * @param FixtureFactory $fixtureFactory
--     * @param CatalogCategoryView $catalogCategoryView
--     * @return void
--     */
--    public function __inject(
--        Category $category,
--        FixtureFactory $fixtureFactory,
--        CatalogCategoryView $catalogCategoryView
--    ) {
--        $this->category = $category;
--        $this->fixtureFactory = $fixtureFactory;
--        $this->catalogCategoryView = $catalogCategoryView;
--    }
--
--    /**
--     * Run create flat catalog product
--     *
--     * @param string $configData
--     * @param string $productsCount
--     * @return array
--     */
--    public function test($configData, $productsCount)
--    {
--        $this->objectManager->create(SetupConfigurationStep::class, ['configData' => $this->configData])->run();
--        $this->createBulkOfProducts($productsCount);
--        $this->configData = $configData;
--        return ['category' => $this->category, 'catalogCategoryView' => $this->catalogCategoryView];
--    }
--
--    /**
--     * Clear data after test
--     *
--     * @return void
--     */
--    public function tearDown()
--    {
--        $this->objectManager->create(
--            SetupConfigurationStep::class,
--            ['configData' => $this->configData, 'rollback' => true]
--        )->run();
--    }
--
--    /**
--     * Create products for tests
--     *
--     * @param $productsCount
--     * @return void
--     */
--    private function createBulkOfProducts($productsCount)
--    {
--        for ($counter = 1; $counter <= $productsCount; $counter++) {
--            $product = $this->fixtureFactory->createByCode(
--                'catalogProductSimple',
--                [
--                    'dataset' => 'default',
--                    'data' => [
--                        'category_ids' => [
--                            'category' => $this->category
--                        ]
--                    ]
--                ]
--            );
--            $product->persist();
--        }
--    }
--}
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.xml
-deleted file mode 100644
-index 17d362f35ec..00000000000
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.xml
-+++ /dev/null
-@@ -1,16 +0,0 @@
--<?xml version="1.0" encoding="utf-8"?>
--<!--
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
-- -->
--<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
--    <testCase name="Magento\Catalog\Test\TestCase\Product\CreateFlatCatalogProduct" summary="Create flat catalog Product" ticketId="MAGETWO-67570">
--        <variation name="CheckPaginationInStorefront"  ticketId="MAGETWO-67570">
--            <data name="configData" xsi:type="string">category_flat,product_flat</data>
--            <data name="productsCount" xsi:type="number">19</data>
--            <constraint name="Magento\Catalog\Test\Constraint\AssertPaginationCorrectOnStoreFront" />
--        </variation>
--    </testCase>
--</config>
-\ No newline at end of file
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.php
-new file mode 100644
-index 00000000000..8f11f31a6df
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.php
-@@ -0,0 +1,146 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Catalog\Test\TestCase\Product;
-+
-+use Magento\Config\Test\TestStep\SetupConfigurationStep;
-+use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-+use Magento\Mtf\Fixture\FixtureFactory;
-+use Magento\Mtf\TestCase\Injectable;
-+use Magento\Catalog\Test\Fixture\Category;
-+
-+/**
-+ * Preconditions:
-+ * 1. Use Flat Catalog Category & Use Flat Catalog Product are enabled (Store/Configuration/Catalog/Catalog/Storefront)
-+ *
-+ * Steps:
-+ * 1. Assign 16 or more products to the same category (e.g. 20 products)
-+ * 2. Go to Storefront and navigate to this category
-+ * 3. Click on Page 2 or any further page
-+ * 4. Go back to page 1 and change № of products per page from 9 to any number (e.g 12)
-+ * 5. Click on Page 2 or any further page
-+ * 5. Perform assertions.
-+ *
-+ * @ZephyrId MAGETWO-67570
-+ */
-+class CreateFlatCatalogProductTest extends Injectable
-+{
-+    /* tags */
-+    const MVP = 'yes';
-+    /* end tags */
-+
-+    /**
-+     * Configuration data
-+     *
-+     * @var string
-+     */
-+    private $configData;
-+
-+    /**
-+     * Factory for Fixtures
-+     *
-+     * @var FixtureFactory
-+     */
-+    private $fixtureFactory;
-+
-+    /**
-+     * Category fixture
-+     *
-+     * @var Category
-+     */
-+    private $category;
-+
-+    /**
-+     * CatalogCategoryView page
-+     *
-+     * @var CatalogCategoryView
-+     */
-+    private $catalogCategoryView;
-+
-+    /**
-+     * Prepare data
-+     *
-+     * @param Category $category
-+     * @return array
-+     */
-+    public function __prepare(Category $category)
-+    {
-+        $category->persist();
-+        return [
-+            'category' => $category
-+        ];
-+    }
-+
-+    /**
-+     * Injection data
-+     *
-+     * @param Category $category
-+     * @param FixtureFactory $fixtureFactory
-+     * @param CatalogCategoryView $catalogCategoryView
-+     * @return void
-+     */
-+    public function __inject(
-+        Category $category,
-+        FixtureFactory $fixtureFactory,
-+        CatalogCategoryView $catalogCategoryView
-+    ) {
-+        $this->category = $category;
-+        $this->fixtureFactory = $fixtureFactory;
-+        $this->catalogCategoryView = $catalogCategoryView;
-+    }
-+
-+    /**
-+     * Run create flat catalog product
-+     *
-+     * @param string $configData
-+     * @param string $productsCount
-+     * @return array
-+     */
-+    public function test($configData, $productsCount)
-+    {
-+        $this->objectManager->create(SetupConfigurationStep::class, ['configData' => $this->configData])->run();
-+        $this->createBulkOfProducts($productsCount);
-+        $this->configData = $configData;
-+        return ['category' => $this->category, 'catalogCategoryView' => $this->catalogCategoryView];
-+    }
-+
-+    /**
-+     * Clear data after test
-+     *
-+     * @return void
-+     */
-+    public function tearDown()
-+    {
-+        $this->objectManager->create(
-+            SetupConfigurationStep::class,
-+            ['configData' => $this->configData, 'rollback' => true]
-+        )->run();
-+    }
-+
-+    /**
-+     * Create products for tests
-+     *
-+     * @param $productsCount
-+     * @return void
-+     */
-+    private function createBulkOfProducts($productsCount)
-+    {
-+        for ($counter = 1; $counter <= $productsCount; $counter++) {
-+            $product = $this->fixtureFactory->createByCode(
-+                'catalogProductSimple',
-+                [
-+                    'dataset' => 'default',
-+                    'data' => [
-+                        'category_ids' => [
-+                            'category' => $this->category
-+                        ]
-+                    ]
-+                ]
-+            );
-+            $product->persist();
-+        }
-+    }
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.xml
-new file mode 100644
-index 00000000000..45161e1471f
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+ -->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-+    <testCase name="Magento\Catalog\Test\TestCase\Product\CreateFlatCatalogProductTest" summary="Create flat catalog Product" ticketId="MAGETWO-67570">
-+        <variation name="CheckPaginationInStorefront"  ticketId="MAGETWO-67570">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="configData" xsi:type="string">category_flat,product_flat</data>
-+            <data name="productsCount" xsi:type="number">19</data>
-+            <constraint name="Magento\Catalog\Test\Constraint\AssertPaginationCorrectOnStoreFront" />
-+        </variation>
-+    </testCase>
-+</config>
-\ No newline at end of file
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityByAttributeMaskSkuTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityByAttributeMaskSkuTest.xml
-index aecdbc5362f..bdea332a3af 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityByAttributeMaskSkuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityByAttributeMaskSkuTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\CreateSimpleProductEntityByAttributeMaskSkuTest" summary="Create Simple Product with attribute sku mask" ticketId="MAGETWO-59861">
-         <variation name="CreateSimpleProductEntityByAttributeMaskSkuTest1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="configData" xsi:type="string">attribute_product_mask_sku</data>
-             <data name="description" xsi:type="string">Create product with country of manufacture attribute sku mask</data>
-             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartOneTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartOneTest.xml
-index 4a3d80b0b60..ffaefdd9455 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartOneTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartOneTest.xml
-@@ -8,7 +8,6 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\CreateSimpleProductEntityPartOneTest" summary="Create Simple Product" ticketId="MAGETWO-23414">
-         <variation name="CreateSimpleProductEntityTestVariation12" summary="Create product that visible only in search and check min/max qty allowed in the shopping cart" ticketId="MAGETWO-43376, MAGETWO-43359">
--            <data name="issue" xsi:type="string">MAGETWO-63217: Error message doesn't appear on add in the cart less products than configured</data>
-             <data name="configData" xsi:type="string">inventory_min_qty_3, inventory_max_qty_5</data>
-             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
-@@ -25,6 +24,8 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInventoryMaxAllowedQty" />
-         </variation>
-         <variation name="CreateSimpleProductEntityTestVariation13">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="issue" xsi:type="string">MAGETWO-48850: Filtering Category Products using scope selector</data>
-             <data name="description" xsi:type="string">Create simple product and check search by sku</data>
-             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
-@@ -42,6 +43,8 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-         </variation>
-         <variation name="CreateSimpleProductEntityTestVariation14">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="issue" xsi:type="string">MC-6220: Add products to wishlist from Category page with multiple wishlist enabled</data>
-             <data name="description" xsi:type="string">Create simple product and check visibility in category</data>
-             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartTwoTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartTwoTest.xml
-index a40c715bb3a..d6b75e5c3a6 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartTwoTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartTwoTest.xml
-@@ -8,6 +8,8 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\CreateSimpleProductEntityPartTwoTest" summary="Create Simple Product" ticketId="MAGETWO-23414">
-         <variation name="CreateSimpleProductEntityTestVariation23" summary="Create Simple Product with Creating New Category (Required Fields Only)" ticketId="MAGETWO-27293">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="issue" xsi:type="string">MC-234: Admin should be able to create category from the product page</data>
-             <data name="product/data/category_ids/new_category" xsi:type="string">yes</data>
-             <data name="product/data/category_ids/dataset" xsi:type="string">default_subcategory_without_url_key</data>
-             <data name="product/data/website_ids/0/dataset" xsi:type="string">default</data>
-@@ -23,6 +25,8 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteProductInGrid" />
-         </variation>
-         <variation name="CreateSimpleProductEntityTestVariation24" summary="Create Simple Product and Assigning It to Category" ticketId="MAGETWO-12514">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="issue" xsi:type="string">MAGETWO-23414: Create Simple Product</data>
-             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
-@@ -79,6 +83,8 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-         </variation>
-         <variation name="CreateSimpleProductEntityTestVariation28" summary="Create product with tier price for not logged in customer">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="issue" xsi:type="string">MAGETWO-68921: Apply Tier Price to a product</data>
-             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
-@@ -118,6 +124,8 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCart" />
-         </variation>
-         <variation name="CreateSimpleProductEntityWithTierPriceTestVariation1" summary="Create Simple Product with fixed tier price.">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="issue" xsi:type="string">MAGETWO-68921: Apply Tier Price to a product</data>
-             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
-@@ -127,6 +135,8 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceInCart" />
-         </variation>
-         <variation name="CreateSimpleProductEntityWithTierPriceTestVariation2" summary="Create Simple Product with percentage tier price.">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="issue" xsi:type="string">MAGETWO-68921: Apply Tier Price to a product</data>
-             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
-index 3ae531ac46c..4d866f716d7 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
-@@ -79,6 +79,7 @@ class CreateSimpleProductEntityTest extends Injectable
-         $flushCache = false,
-         $configData = null
-     ) {
-+
-         $this->configData = $configData;
-         $this->flushCache = $flushCache;
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
-index 8732157e5c6..840dc0b0812 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
-@@ -182,6 +182,8 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-         </variation>
-         <variation name="CreateSimpleProductEntityTestVariation10" summary="Create in stock product and check threshold" ticketId="MAGETWO-43345">
-+            <data name="issue" xsi:type="string">https://github.com/magento-engcom/msi/issues/1620</data>
-+            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="configData" xsi:type="string">inventory_threshold_5</data>
-             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
-index 1449e7df0ce..a9c78117d7b 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\CreateVirtualProductEntityTest" summary="Create Virtual Product" ticketId="MAGETWO-23417">
-         <variation name="CreateVirtualProductEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Create product with required fields</data>
-             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-@@ -17,7 +18,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-         </variation>
-         <variation name="CreateVirtualProductEntityTestVariation2" summary="Create product with tier price">
--            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
-@@ -51,6 +52,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="CreateVirtualProductEntityTestVariation4">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Create product with tier price for "General" group</data>
-             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-@@ -71,6 +73,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPageWithCustomer" />
-         </variation>
-         <variation name="CreateVirtualProductEntityTestVariation5">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Create product with custom options suite and import options</data>
-             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-@@ -86,6 +89,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage" />
-         </variation>
-         <variation name="CreateVirtualProductEntityTestVariation6">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Create product without manage stock</data>
-             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-@@ -102,6 +106,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInStock" />
-         </variation>
-         <variation name="CreateVirtualProductEntityTestVariation7">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Create product out of stock with tier price</data>
-             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.xml
-index fc566e855c0..2d91f4a7024 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.xml
-@@ -10,12 +10,13 @@
-         <variation name="DeleteProductEntityTestVariation1">
-             <data name="products" xsi:type="string">catalogProductSimple::default</data>
-             <data name="isRequired" xsi:type="string">Yes</data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-+            <data name="tag" xsi:type="string">to_maintain:yes, mftf_migrated:yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductNotInGrid" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductIsNotDisplayingOnFrontend" />
-         </variation>
-         <variation name="DeleteProductEntityTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products" xsi:type="string">catalogProductVirtual::default</data>
-             <data name="isRequired" xsi:type="string">Yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
-@@ -23,6 +24,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductIsNotDisplayingOnFrontend" />
-         </variation>
-         <variation name="DeleteProductEntityTestVariation3">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products" xsi:type="string">catalogProductSimple::with_one_custom_option</data>
-             <data name="isRequired" xsi:type="string">Yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php
-index 0954727ce13..69d09bdd47f 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php
-@@ -90,6 +90,8 @@ class DuplicateProductEntityTest extends Injectable
-      */
-     public function test($productType)
-     {
-+        $this->markTestIncomplete('https://github.com/magento-engcom/msi/issues/666');
-+
-         // Precondition
-         $product = $this->createProduct($productType);
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/GridFilteringDeletedEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/GridFilteringDeletedEntityTest.xml
-index 687ed7038f4..3bb0d5c0e1e 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/GridFilteringDeletedEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/GridFilteringDeletedEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Ui\Test\TestCase\GridFilteringDeletedEntityTest" summary="Grid filtering by deleted entity" ticketId="MAGETWO-88982">
-         <variation name="GridFilteringDeletedEntityTestVariation1">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="steps" xsi:type="array">
-                 <item name="0" xsi:type="array">
-                     <item name="0" xsi:type="string">Magento\Store\Test\TestStep\DeleteWebsitesEntityStep</item>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ManageProductsStockTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ManageProductsStockTest.xml
-index 33b578672d4..d005c05a9cb 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ManageProductsStockTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ManageProductsStockTest.xml
-@@ -15,6 +15,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart" />
-         </variation>
-         <variation name="ManageProductsStockTestVariation2" summary="Checking that Out of Stock products are not visible in category" ticketId="MAGETWO-13645">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/dataset" xsi:type="string">product_with_category</data>
-             <data name="product/data/stock_data/manage_stock" xsi:type="string">Yes</data>
-             <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">5</data>
-@@ -33,6 +34,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
-         </variation>
-         <variation name="ManageProductsStockTestVariation3" summary="Add In Stock product to cart" ticketId="MAGETWO-13645">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/dataset" xsi:type="string">product_with_category</data>
-             <data name="product/data/stock_data/manage_stock" xsi:type="string">Yes</data>
-             <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">5</data>
-@@ -51,6 +53,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-         </variation>
-         <variation name="ManageProductsStockTestVariation4" summary="Enable displaying of out of stock products in category" ticketId="MAGETWO-13645">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/dataset" xsi:type="string">product_with_category</data>
-             <data name="product/data/stock_data/manage_stock" xsi:type="string">Yes</data>
-             <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">5</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateStatusTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateStatusTest.xml
-index fa82fd90268..6936315a128 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateStatusTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateStatusTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\MassProductUpdateStatusTest" summary="Update status of Products Using Mass Actions" ticketId="MAGETWO-60847">
-         <variation name="MassProductStatusUpdateTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialProducts" xsi:type="array">
-                 <item name ="0" xsi:type="string">catalogProductSimple::simple_10_dollar</item>
-                 <item name ="1" xsi:type="string">catalogProductSimple::simple_10_dollar</item>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.xml
-index 6f3803d832c..d2fe51ecd81 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\MassProductUpdateTest" summary="Edit Products Using Mass Actions" ticketId="MAGETWO-21128">
-         <variation name="MassProductPriceUpdateTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="configData" xsi:type="string">product_flat</data>
-             <data name="initialProducts/0" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
-             <data name="initialProducts/1" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.xml
-index cf52597cfc5..0db197ba3b3 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\NavigateUpSellProductsTest" summary="Promote Products as Up-Sells" ticketId="MAGETWO-12391">
-         <variation name="NavigateUpSellProductsTestVariation1" method="test">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no, mftf_migrated:yes</data>
-             <data name="products" xsi:type="string">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
-             <data name="promotedProducts" xsi:type="string">simple1:simple2,config1;config1:simple2</data>
-             <data name="navigateProductsOrder" xsi:type="string">simple1,config1,simple2</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
-index 5e871bf6d97..707a62a4460 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
-@@ -10,6 +10,7 @@ use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
- use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
- use Magento\Mtf\Fixture\FixtureFactory;
- use Magento\Mtf\TestCase\Injectable;
-+use Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Section\Downloadable;
- 
- /**
-  * Test Creation for ProductTypeSwitchingOnCreation
-@@ -75,18 +76,49 @@ class ProductTypeSwitchingOnCreationTest extends Injectable
-      *
-      * @param string $createProduct
-      * @param string $product
-+     * @param string $actionName
-      * @return array
-      */
--    public function test($createProduct, $product)
-+    public function test(string $createProduct, string $product, string $actionName = null): array
-     {
-         // Steps
-         list($fixture, $dataset) = explode('::', $product);
-         $product = $this->fixtureFactory->createByCode($fixture, ['dataset' => $dataset]);
-         $this->catalogProductIndex->open();
-         $this->catalogProductIndex->getGridPageActionBlock()->addProduct($createProduct);
-+        if ($actionName) {
-+            $this->performAction($actionName);
-+        }
-         $this->catalogProductNew->getProductForm()->fill($product);
-         $this->catalogProductNew->getFormPageActions()->save($product);
- 
-         return ['product' => $product];
-     }
-+
-+    /**
-+     * Perform action.
-+     *
-+     * @param string $actionName
-+     * @return void
-+     */
-+    private function performAction(string $actionName): void
-+    {
-+        if (method_exists(__CLASS__, $actionName)) {
-+            $this->$actionName();
-+        }
-+    }
-+
-+    /**
-+     * Clear downloadable product data.
-+     *
-+     * @return void
-+     */
-+    private function clearDownloadableData(): void
-+    {
-+        $this->catalogProductNew->getProductForm()->openSection('downloadable_information');
-+        /** @var Downloadable $downloadableInfoTab */
-+        $downloadableInfoTab = $this->catalogProductNew->getProductForm()->getSection('downloadable_information');
-+        $downloadableInfoTab->getDownloadableBlock('Links')->clearDownloadableData();
-+        $downloadableInfoTab->setIsDownloadable('No');
-+    }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
-index f45fbc96a73..a563d369f95 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\ProductTypeSwitchingOnCreationTest" summary="Product Type Switching on Creation" ticketId="MAGETWO-29398">
-         <variation name="ProductTypeSwitchingOnCreationTestVariation1">
--            <data name="tag" xsi:type="string">stable:no</data>
-+            <data name="tag" xsi:type="string">stable:no, mftf_migrated:yes</data>
-             <data name="createProduct" xsi:type="string">simple</data>
-             <data name="product" xsi:type="string">configurableProduct::default</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-@@ -23,16 +23,20 @@
-         <variation name="ProductTypeSwitchingOnCreationTestVariation2">
-             <data name="createProduct" xsi:type="string">simple</data>
-             <data name="product" xsi:type="string">catalogProductVirtual::default</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-         </variation>
-         <variation name="ProductTypeSwitchingOnCreationTestVariation3">
-             <data name="createProduct" xsi:type="string">configurable</data>
-             <data name="product" xsi:type="string">catalogProductSimple::product_without_category</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-         </variation>
-         <variation name="ProductTypeSwitchingOnCreationTestVariation4">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="issue" xsi:type="string">MSI-1624</data>
-             <data name="createProduct" xsi:type="string">configurable</data>
-             <data name="product" xsi:type="string">catalogProductVirtual::required_fields</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-@@ -41,11 +45,12 @@
-         <variation name="ProductTypeSwitchingOnCreationTestVariation5">
-             <data name="createProduct" xsi:type="string">virtual</data>
-             <data name="product" xsi:type="string">catalogProductSimple::default</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-         </variation>
-         <variation name="ProductTypeSwitchingOnCreationTestVariation6">
--            <data name="tag" xsi:type="string">stable:no</data>
-+            <data name="tag" xsi:type="string">stable:no, mftf_migrated:yes</data>
-             <data name="createProduct" xsi:type="string">virtual</data>
-             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-@@ -70,13 +75,15 @@
-         <variation name="ProductTypeSwitchingOnCreationTestVariation8">
-             <data name="createProduct" xsi:type="string">downloadable</data>
-             <data name="product" xsi:type="string">catalogProductSimple::default</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-         </variation>
-         <variation name="ProductTypeSwitchingOnCreationTestVariation9">
-             <data name="createProduct" xsi:type="string">downloadable</data>
-             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-+            <data name="actionName" xsi:type="string">clearDownloadableData</data>
-+            <data name="issue" xsi:type="string">MSI-1624</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
-index 43741393e79..90cd6bdb763 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
-@@ -143,5 +143,6 @@ class ProductTypeSwitchingOnUpdateTest extends Injectable
-         /** @var Downloadable $downloadableInfoTab */
-         $downloadableInfoTab = $this->catalogProductEdit->getProductForm()->getSection('downloadable_information');
-         $downloadableInfoTab->getDownloadableBlock('Links')->clearDownloadableData();
-+        $downloadableInfoTab->setIsDownloadable('No');
-     }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
-index f3df374a8ba..5fa1cfe5e59 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
-@@ -11,7 +11,6 @@
-             <data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
-             <data name="product" xsi:type="string">configurableProduct::default</data>
-             <data name="actionName" xsi:type="string">-</data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
-@@ -21,7 +20,6 @@
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately" />
-         </variation>
-         <variation name="ProductTypeSwitchingOnUpdateTestVariation2">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
-             <data name="product" xsi:type="string">catalogProductVirtual::default</data>
-             <data name="actionName" xsi:type="string">-</data>
-@@ -29,7 +27,6 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-         </variation>
-         <variation name="ProductTypeSwitchingOnUpdateTestVariation3">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="productOrigin" xsi:type="string">configurableProduct::default</data>
-             <data name="product" xsi:type="string">catalogProductSimple::product_without_category</data>
-             <data name="actionName" xsi:type="string">deleteVariations</data>
-@@ -40,12 +37,10 @@
-             <data name="productOrigin" xsi:type="string">configurableProduct::default</data>
-             <data name="product" xsi:type="string">catalogProductVirtual::required_fields</data>
-             <data name="actionName" xsi:type="string">deleteVariations</data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-         </variation>
-         <variation name="ProductTypeSwitchingOnUpdateTestVariation5">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
-             <data name="product" xsi:type="string">catalogProductSimple::default</data>
-             <data name="actionName" xsi:type="string">-</data>
-@@ -56,7 +51,6 @@
-             <data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
-             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
-             <data name="actionName" xsi:type="string">-</data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
-@@ -69,7 +63,6 @@
-             <data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
-             <data name="product" xsi:type="string">downloadableProduct::default</data>
-             <data name="actionName" xsi:type="string">-</data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-             <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-@@ -81,15 +74,13 @@
-             <data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
-             <data name="product" xsi:type="string">catalogProductSimple::default</data>
-             <data name="actionName" xsi:type="string">-</data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-         </variation>
-         <variation name="ProductTypeSwitchingOnUpdateTestVariation9">
-             <data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
-             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
--            <data name="actionName" xsi:type="string">-</data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-+            <data name="actionName" xsi:type="string">clearDownloadableData</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
-@@ -99,7 +90,6 @@
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately" />
-         </variation>
-         <variation name="ProductTypeSwitchingOnUpdateTestVariation10">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
-             <data name="product" xsi:type="string">catalogProductVirtual::default</data>
-             <data name="actionName" xsi:type="string">clearDownloadableData</data>
-@@ -110,7 +100,6 @@
-             <data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
-             <data name="product" xsi:type="string">downloadableProduct::default</data>
-             <data name="actionName" xsi:type="string">-</data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-             <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml
-index 2a46abdc2fd..ce99a61c33b 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\UpdateSimpleProductEntityTest" summary="Update Simple Product" ticketId="MAGETWO-23544">
-         <variation name="UpdateSimpleProductEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Update visibility to Catalog, Search</data>
-             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
-             <data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
-@@ -24,6 +25,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-         </variation>
-         <variation name="UpdateSimpleProductEntityTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Update visibility to Not Visible Individually</data>
-             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
-             <data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
-@@ -38,6 +40,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductIsNotDisplayingOnFrontend" />
-         </variation>
-         <variation name="UpdateSimpleProductEntityTestVariation3">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Update visibility to Catalog</data>
-             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
-             <data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
-@@ -55,6 +58,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-         </variation>
-         <variation name="UpdateSimpleProductEntityTestVariation4">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Update visibility to Search</data>
-             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
-             <data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
-@@ -72,6 +76,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="UpdateSimpleProductEntityTestVariation5">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Update stock to Out of Stock</data>
-             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
-             <data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
-@@ -89,6 +94,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="UpdateSimpleProductEntityTestVariation6">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Update product status to offline</data>
-             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
-             <data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
-@@ -103,6 +109,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductIsNotDisplayingOnFrontend" />
-         </variation>
-         <variation name="UpdateSimpleProductEntityTestVariation7">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Update category</data>
-             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
-             <data name="product/data/category_ids/dataset" xsi:type="string">default</data>
-@@ -118,6 +125,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
-         </variation>
-         <variation name="UpdateSimpleProductEntityTestVariation8" summary="Edit Simple Product" ticketId="MAGETWO-12428">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
-             <data name="product/data/category_ids/dataset" xsi:type="string">default</data>
-             <data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
-@@ -128,13 +136,14 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-         </variation>
-         <variation name="UpdateSimpleProductEntityTestVariation9" summary="Unassign Products from the Category" ticketId="MAGETWO-12417">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
-             <data name="product/data/category_ids/dataset" xsi:type="string"> -</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductNotVisibleInCategory" />
-         </variation>
-         <variation name="EditSimpleProductTestVariation10" summary="Edit product with enabled flat" ticketId="MAGETWO-21125">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="configData" xsi:type="string">product_flat</data>
-             <data name="initialProduct/dataset" xsi:type="string">simple_10_dollar</data>
-             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
-@@ -146,6 +155,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />
-         </variation>
-         <variation name="EditSimpleProductTestVariation11" summary="Update simple product with custom option">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
-             <data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">test_simple_product_%isolation%</data>
-@@ -160,6 +170,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCart" />
-         </variation>
-         <variation name="UpdateSimpleProductEntityTestVariation12" summary="Verify data overriding on Store View level" ticketId="MAGETWO-50640">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
-             <data name="store/dataset" xsi:type="string">custom</data>
-             <data name="product/data/use_default_name" xsi:type="string">No</data>
-@@ -168,7 +179,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductNameOnDifferentStoreViews" />
-         </variation>
-         <variation name="UpdateSimpleProductEntityTestVariation13" summary="Price overriding on Store View level" ticketId="MAGETWO-58861">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="configData" xsi:type="string">price_scope_website</data>
-             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
-             <data name="store/dataset" xsi:type="string">custom</data>
-@@ -178,6 +189,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPriceOnDifferentStoreViews" />
-         </variation>
-         <variation name="UpdateSimpleProductEntityTestVariation14" summary="An error appears on open tier price with locale formatting" ticketId="MAGETWO-62076">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialProduct/dataset" xsi:type="string">simple_with_hight_tier_price</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductFormattingTierPrice" />
-         </variation>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml
-index daa19a8fe6f..e2715bb6b4b 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\UpdateVirtualProductEntityTest" summary="Update Virtual Product" ticketId="MAGETWO-26204">
-         <variation name="UpdateVirtualProductEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">99.99</data>
-@@ -28,6 +29,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="UpdateVirtualProductEntityTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">virtual_product_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">120.00</data>
-@@ -47,6 +49,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="UpdateVirtualProductEntityTestVariation3">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">185.00</data>
-@@ -67,6 +70,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="UpdateVirtualProductEntityTestVariation4">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">virtual_product_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">99.99</data>
-@@ -82,6 +86,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="UpdateVirtualProductEntityTestVariation5">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">5.00</data>
-@@ -97,6 +102,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="UpdateVirtualProductEntityTestVariation6">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">virtual_product_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">145.00</data>
-@@ -116,6 +122,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="UpdateVirtualProductEntityTestVariation7">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">99.99</data>
-@@ -133,6 +140,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="UpdateVirtualProductEntityTestVariation8">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">virtual_product_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">5.00</data>
-@@ -149,6 +157,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="UpdateVirtualProductEntityTestVariation9">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">120.00</data>
-@@ -168,6 +177,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="UpdateVirtualProductEntityTestVariation10">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">99.99</data>
-@@ -183,6 +193,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="UpdateVirtualProductEntityTestVariation11">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">99.99</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ValidateOrderOfProductTypeTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ValidateOrderOfProductTypeTest.xml
-index 0d1a34ab52f..ec776128fdf 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ValidateOrderOfProductTypeTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ValidateOrderOfProductTypeTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\ValidateOrderOfProductTypeTest" summary="Validate product types order on product grid page" ticketId="MAGETWO-37146">
-         <variation name="ValidateOrderOfProductTypeTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menu/0" xsi:type="string">Simple Product</data>
-             <data name="menu/3" xsi:type="string">Virtual Product</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductTypeOrderOnCreate" />
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml
-index 86bacd925ba..13e05b1d122 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\CreateAttributeSetEntityTest" summary="Create Attribute Set (Attribute Set)" ticketId="MAGETWO-25104">
-         <variation name="CreateAttributeSetEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attributeSet/data/attribute_set_name" xsi:type="string">AttributeSet%isolation%</data>
-             <data name="attributeSet/data/skeleton_set/dataset" xsi:type="string">default</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeSetSuccessSaveMessage" />
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.xml
-index 73fbf556d09..e15eab57cca 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\CreateProductAttributeEntityFromProductPageTest" summary="Create Product Attribute from Product Page" ticketId="MAGETWO-30528">
-         <variation name="CreateProductAttributeEntityFromProductPageTestVariation1_Searchable_Global_Visible_Comparable_HtmlAllowed_UsedForSorting">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
-             <data name="attribute/data/frontend_input" xsi:type="string">Text Field</data>
-             <data name="attribute/data/is_required" xsi:type="string">No</data>
-@@ -33,6 +34,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsUsedInSortOnFrontend" />
-         </variation>
-         <variation name="CreateProductAttributeEntityFromProductPageTestVariation2_Filterable">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attribute/data/frontend_label" xsi:type="string">Dropdown_Admin_%isolation%</data>
-             <data name="attribute/data/frontend_input" xsi:type="string">Dropdown</data>
-             <data name="attribute/data/options/dataset" xsi:type="string">two_options</data>
-@@ -50,6 +52,7 @@
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertProductAttributeIsConfigurable" />
-         </variation>
-         <variation name="CreateProductAttributeEntityFromProductPageTestVariation3_Required">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
-             <data name="attribute/data/frontend_input" xsi:type="string">Text Field</data>
-             <data name="attribute/data/is_required" xsi:type="string">Yes</data>
-@@ -59,6 +62,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsRequired" />
-         </variation>
-         <variation name="CreateProductAttributeEntityFromProductPageTestVariation4_Unique">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
-             <data name="attribute/data/frontend_input" xsi:type="string">Text Field</data>
-             <data name="attribute/data/is_required" xsi:type="string">No</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml
-index aae9ec6039f..49725d08b63 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml
-@@ -8,7 +8,6 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\CreateProductAttributeEntityTest" summary="Create Product Attribute" ticketId="MAGETWO-24767">
-         <variation name="CreateProductAttributeEntityTestVariation1">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
-             <data name="productAttribute/data/frontend_input" xsi:type="string">Text Field</data>
-@@ -20,6 +19,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
-         </variation>
-         <variation name="CreateProductAttributeEntityTestVariation2"  summary="Create custom text attribute product field" ticketId="MAGETWO-17475">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
-             <data name="productAttribute/data/frontend_input" xsi:type="string">Text Area</data>
-@@ -59,7 +59,6 @@
-             <data name="productAttribute/data/used_in_product_listing" xsi:type="string">Yes</data>
-             <data name="productAttribute/data/is_used_for_promo_rules" xsi:type="string">Yes</data>
-             <data name="productAttribute/data/used_for_sort_by" xsi:type="string">Yes</data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeInGrid" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeForm" />
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductByAttribute" />
-@@ -68,7 +67,6 @@
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertProductAttributeIsUsedPromoRules" />
-         </variation>
-         <variation name="CreateProductAttributeEntityTestVariation4">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttribute/data/frontend_label" xsi:type="string">Yes/No_Admin_%isolation%</data>
-             <data name="productAttribute/data/frontend_input" xsi:type="string">Yes/No</data>
-@@ -85,6 +83,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
-         </variation>
-         <variation name="CreateProductAttributeEntityTestVariation5" summary="Create custom multiple select attribute product field" ticketId="MAGETWO-14862">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttribute/data/frontend_label" xsi:type="string">Multiple_Select_Admin_%isolation%</data>
-             <data name="productAttribute/data/frontend_input" xsi:type="string">Multiple Select</data>
-@@ -101,7 +100,6 @@
-             <data name="productAttribute/data/is_html_allowed_on_front" xsi:type="string">Yes</data>
-             <data name="productAttribute/data/is_visible_on_front" xsi:type="string">Yes</data>
-             <data name="productAttribute/data/used_in_product_listing" xsi:type="string">Yes</data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeInGrid" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeForm" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
-@@ -115,7 +113,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeOptionsOnProductForm" />
-         </variation>
-         <variation name="CreateProductAttributeEntityTestVariation6" summary="Create custom dropdown attribute product field" ticketId="MAGETWO-17475, MAGETWO-14862">
--            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttribute/data/frontend_label" xsi:type="string">Dropdown_Admin_%isolation%</data>
-             <data name="productAttribute/data/frontend_input" xsi:type="string">Dropdown</data>
-@@ -154,6 +152,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeOptionsOnProductForm" />
-         </variation>
-         <variation name="CreateProductAttributeEntityTestVariation7" summary="Create custom price attribute product field" ticketId="MAGETWO-17475">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttribute/data/frontend_label" xsi:type="string">Price_Admin_%isolation%</data>
-             <data name="productAttribute/data/frontend_input" xsi:type="string">Price</data>
-@@ -176,7 +175,6 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsFilterableInSearch" />
-         </variation>
-         <variation name="CreateProductAttributeEntityTestVariation8">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttribute/data/frontend_label" xsi:type="string">Fixed_Product_Tax_Admin_%isolation%</data>
-             <data name="productAttribute/data/frontend_input" xsi:type="string">Fixed Product Tax</data>
-@@ -193,7 +191,6 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
-         </variation>
-         <variation name="CreateProductAttributeEntityTestVariation9">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
-             <data name="productAttribute/data/frontend_input" xsi:type="string">Text Field</data>
-@@ -209,6 +206,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsUnique" />
-         </variation>
-         <variation name="CreateProductAttributeEntityTestVariation10" summary="Create custom dropdown attribute with single quotation in option">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttribute/data/frontend_label" xsi:type="string">Dropdown_Admin_%isolation%</data>
-             <data name="productAttribute/data/frontend_input" xsi:type="string">Dropdown</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.xml
-index b12f4f1ad7d..d674535b54a 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\DeleteAssignedToTemplateProductAttributeTest" summary="Delete Assigned to Template Product Attribute" ticketId="MAGETWO-26011">
-         <variation name="DeleteAssignedToTemplateProductAttributeTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="attributeSet/data/assigned_attributes/dataset" xsi:type="string">attribute_type_dropdown</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeSuccessDeleteMessage" />
-@@ -16,6 +17,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeAbsenceInUnassignedAttributes" />
-         </variation>
-         <variation name="DeleteAssignedToTemplateProductAttributeTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">default</data>
-             <data name="attributeSet/data/assigned_attributes/dataset" xsi:type="string">attribute_type_text_field</data>
-             <data name="assertProduct/data/name" xsi:type="string">Product name</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml
-index 361f2acb1d8..a83fce14d93 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\DeleteAttributeSetTest" summary="Delete Attribute Set (Attribute Set)" ticketId="MAGETWO-25473">
-         <variation name="DeleteAttributeSetTestVariation1">
--            <data name="tag" xsi:type="string">stable:no</data>
-+            <data name="tag" xsi:type="string">stable:no, mftf_migrated:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="attributeSet/data/assigned_attributes/dataset" xsi:type="string">default</data>
-             <data name="product/dataset" xsi:type="string">default</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml
-index 6cca4b3f368..0dd47942c8f 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\DeleteProductAttributeEntityTest" summary="Delete Product Attribute" ticketId="MAGETWO-24998">
-         <variation name="DeleteProductAttributeEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attribute/dataset" xsi:type="string">attribute_type_text_field</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeSuccessDeleteMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeAbsenceInGrid" />
-@@ -15,7 +16,6 @@
-             <constraint name="Magento\ImportExport\Test\Constraint\AssertProductAttributeAbsenceForExport" />
-         </variation>
-         <variation name="DeleteProductAttributeEntityTestVariation2">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="attribute/dataset" xsi:type="string">attribute_type_dropdown</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeSuccessDeleteMessage" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeAbsenceInGrid" />
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.xml
-index 7763b0fb534..a9a85d24720 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\DeleteSystemProductAttributeTest" summary="Delete System Product Attribute" ticketId="MAGETWO-24771">
-         <variation name="DeleteSystemProductAttributeTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="productAttribute/data/attribute_code" xsi:type="string">news_from_date</data>
-             <data name="productAttribute/data/is_user_defined" xsi:type="string">Yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertAbsenceDeleteAttributeButton" />
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.xml
-index df396c22312..e46174de881 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\DeleteUsedInConfigurableProductAttributeTest" summary="Delete Used in Configurable Product Attribute" ticketId="MAGETWO-26652">
-         <variation name="DeleteUsedInConfigurableProductAttributeTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/dataset" xsi:type="string">one_variation</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertUsedSuperAttributeImpossibleDeleteMessages" />
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeInGrid" />
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml
-index 18b9a199cac..18dc5c983ad 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml
-@@ -8,7 +8,6 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\UpdateAttributeSetTest" summary="Update Attribute Set" ticketId="MAGETWO-26251">
-         <variation name="UpdateAttributeSetTestVariation1">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="attributeSet/data/attribute_set_name" xsi:type="string">AttributeSetEdit1%isolation%</data>
-             <data name="attributeSet/data/group" xsi:type="string">Custom-group%isolation%</data>
-             <data name="attributeSetOriginal/dataset" xsi:type="string">custom_attribute_set</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml
-index b051d50b4ac..d6420ff431c 100644
---- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml
-@@ -8,7 +8,6 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\UpdateProductAttributeEntityTest" summary="Update Product Attribute" ticketId="MAGETWO-23459">
-         <variation name="UpdateProductAttributeEntityTestVariation1">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttributeOriginal/dataset" xsi:type="string">attribute_type_text_field</data>
-             <data name="attribute/data/frontend_label" xsi:type="string">Text_Field_%isolation%</data>
-@@ -29,7 +28,6 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
-         </variation>
-         <variation name="UpdateProductAttributeEntityTestVariation2">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttributeOriginal/dataset" xsi:type="string">attribute_type_dropdown</data>
-             <data name="attribute/data/frontend_label" xsi:type="string">Dropdown_%isolation%</data>
-@@ -55,6 +53,8 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
-         </variation>
-         <variation name="UpdateProductAttributeEntityTestVariation3">
-+            <data name="issue" xsi:type="string">MAGETWO-46494: [FT] UpdateProductAttributeEntityTestVariation3 does not actually create an attribute to check</data>
-+            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttributeOriginal/dataset" xsi:type="string">tax_class_id</data>
-             <data name="attribute/data/is_searchable" xsi:type="string">Yes</data>
-@@ -62,11 +62,11 @@
-             <data name="cacheTags" xsi:type="array">
-                 <item name="0" xsi:type="string">FPC</item>
-             </data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <constraint name="Magento\PageCache\Test\Constraint\AssertCacheIsRefreshableAndInvalidated" />
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductByAttribute" />
-         </variation>
-         <variation name="UpdateProductAttributeEntityTestVariation4" summary="Create product attribute of type Dropdown and check its visibility on frontend in Advanced Search form" ticketId="MAGETWO-12941">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttributeOriginal/dataset" xsi:type="string">attribute_type_dropdown</data>
-             <data name="attribute/data/frontend_input" xsi:type="string">Dropdown</data>
-@@ -76,6 +76,7 @@
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchAttributeIsAbsent" />
-         </variation>
-         <variation name="UpdateProductAttributeEntityTestVariation5" summary="Create product attribute of type Multiple Select and check its visibility on frontend in Advanced Search form" ticketId="MAGETWO-12941">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
-             <data name="productAttributeOriginal/dataset" xsi:type="string">attribute_type_multiple_select</data>
-             <data name="attribute/data/frontend_label" xsi:type="string">Dropdown_%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.php b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.php
-index 9e246939595..b5cd056fb99 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.php
-+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.php
-@@ -11,6 +11,7 @@ use Magento\Mtf\Fixture\InjectableFixture;
- use Magento\Mtf\Util\Command\File\Export;
- use Magento\Mtf\Fixture\FixtureFactory;
- use Magento\Mtf\TestCase\Injectable;
-+use Magento\Mtf\Util\Command\Cli\Cron;
- 
- /**
-  * Preconditions:
-@@ -50,22 +51,32 @@ class ExportProductsTest extends Injectable
-      */
-     private $assertExportProduct;
- 
-+    /**
-+     * Cron command
-+     *
-+     * @var Cron
-+     */
-+    private $cron;
-+
-     /**
-      * Inject data.
-      *
-      * @param FixtureFactory $fixtureFactory
-      * @param AdminExportIndex $adminExportIndex
-      * @param AssertExportProduct $assertExportProduct
-+     * @param Cron $cron
-      * @return void
-      */
-     public function __inject(
-         FixtureFactory $fixtureFactory,
-         AdminExportIndex $adminExportIndex,
--        AssertExportProduct $assertExportProduct
-+        AssertExportProduct $assertExportProduct,
-+        Cron $cron
-     ) {
-         $this->fixtureFactory = $fixtureFactory;
-         $this->adminExportIndex = $adminExportIndex;
-         $this->assertExportProduct = $assertExportProduct;
-+        $this->cron = $cron;
-     }
- 
-     /**
-@@ -83,14 +94,18 @@ class ExportProductsTest extends Injectable
-         array $exportedFields,
-         array $products
-     ) {
-+        $this->cron->run();
-+        $this->cron->run();
-         $products = $this->prepareProducts($products);
-         $this->adminExportIndex->open();
-+        $this->adminExportIndex->getExportedGrid()->deleteAllExportedFiles();
- 
-         $exportData = $this->fixtureFactory->createByCode('exportData', ['dataset' => $exportData]);
-         $exportData->persist();
-         $this->adminExportIndex->getExportForm()->fill($exportData);
-         $this->adminExportIndex->getFilterExport()->clickContinue();
--
-+        $this->cron->run();
-+        $this->cron->run();
-         $this->assertExportProduct->processAssert($export, $exportedFields, $products);
-     }
- 
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml
-index 40f535cd225..be22eab8ac7 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\CatalogImportExport\Test\TestCase\ExportProductsTest" summary="Export products">
-         <variation name="ExportProductsTestVariation1" summary="Export simple product and configured products with assigned images" ticketId="MAGETWO-46112">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="exportData" xsi:type="string">default</data>
-             <data name="products/0" xsi:type="array">
-                 <item name="fixture" xsi:type="string">catalogProductSimple</item>
-@@ -27,6 +28,7 @@
-             </data>
-         </variation>
-         <variation name="ExportProductsTestVariation2" summary="Export simple and configured products with custom options" ticketId="MAGETWO-46113, MAGETWO-46109">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="exportData" xsi:type="string">default</data>
-             <data name="products/0" xsi:type="array">
-                 <item name="fixture" xsi:type="string">catalogProductSimple</item>
-@@ -43,6 +45,7 @@
-             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertExportProductDate" />
-         </variation>
-         <variation name="ExportProductsTestVariation3" summary="Export simple product with custom attribute" ticketId="MAGETWO-46121">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="exportData" xsi:type="string">default</data>
-             <data name="products/0" xsi:type="array">
-                 <item name="fixture" xsi:type="string">catalogProductSimple</item>
-@@ -58,6 +61,7 @@
-             </data>
-         </variation>
-         <variation name="ExportProductsTestVariation5" summary="Export simple product assigned to Main Website and configurable product assigned to Custom Website" ticketId="MAGETWO-46114">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="exportData" xsi:type="string">default</data>
-             <data name="products/0" xsi:type="array">
-                 <item name="fixture" xsi:type="string">catalogProductSimple</item>
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml
-index edb0aad954f..77e5e2b91d9 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\CatalogImportExport\Test\TestCase\ImportProductsTest" summary="Import products">
-         <variation name="ImportProductVariation1" ticketId="MAGETWO-47724" summary="Import Products with Add/Update Behavior">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="import/data" xsi:type="array">
-                 <item name="entity" xsi:type="string">Products</item>
-                 <item name="behavior" xsi:type="string">Add/Update</item>
-@@ -38,6 +39,7 @@
-             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsInGrid" />
-         </variation>
-         <variation name="ImportProductVariation2" ticketId="MAGETWO-47719" summary="Import Products assigned to different websites with Replace Behavior">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="import/data/entity" xsi:type="string">Products</data>
-             <data name="import/data/behavior" xsi:type="string">Replace</data>
-             <data name="import/data/validation_strategy" xsi:type="string">Stop on Error</data>
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
-index 7db32337b99..17739f5524e 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
-+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
-@@ -42,10 +42,10 @@ class AssertCatalogPriceRuleForm extends AbstractConstraint
-         $fixtureData = $catalogPriceRule->getData();
-         //convert discount_amount to float to compare
-         if (isset($formData['discount_amount'])) {
--            $formData['discount_amount'] = floatval($formData['discount_amount']);
-+            $formData['discount_amount'] = (float)$formData['discount_amount'];
-         }
-         if (isset($fixtureData['discount_amount'])) {
--            $fixtureData['discount_amount'] = floatval($fixtureData['discount_amount']);
-+            $fixtureData['discount_amount'] = (float)$fixtureData['discount_amount'];
-         }
-         $diff = $this->verifyData($formData, $fixtureData);
-         \PHPUnit\Framework\Assert::assertTrue(
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml
-index 1fad2f282fa..8b36f78e4fc 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml
-@@ -106,6 +106,8 @@
-             <data name="productPrice/0/special" xsi:type="string">5</data>
-             <data name="productPrice/0/sub_total" xsi:type="string">5</data>
-             <data name="productPrice/0/regular" xsi:type="string">10</data>
-+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
-+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedCatalogPage" />
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedProductPage" />
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedShoppingCart" />
-@@ -114,6 +116,7 @@
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleAppliedShoppingCart" />
-         </variation>
-         <variation name="ApplyCatalogRuleForSimpleProductWithCustomOptions" summary="Apply Catalog Rule for Simple Product With Custom Options" ticketId="MAGETWO-23038">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::with_default_custom_option</data>
-             <data name="products/1" xsi:type="string">catalogProductSimple::with_percent_and_fixed_custom_option</data>
-             <data name="products/2" xsi:type="string">catalogProductSimple::with_custom_options_and_price_56_78</data>
-@@ -147,6 +150,7 @@
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleOnOnepageCheckout" />
-         </variation>
-         <variation name="ApplyCatalogRuleForSimpleProductAndConfigurableProduct" summary="Apply Catalog Rule For Simple Product And Configurable Product" ticketId="MAGETWO-20616">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">configurableProduct::product_with_price_10</data>
-             <data name="products/1" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
-             <data name="catalogRules/0/data/customer_group_ids/option_0" xsi:type="string">NOT LOGGED IN</data>
-@@ -175,6 +179,7 @@
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleAppliedShoppingCart" />
-         </variation>
-         <variation name="ApplyCatalogRuleForSimpleProductAndFixedMethod" summary="Apply Catalog Rule For Simple Product And Fixed Shipping Method" ticketId="MAGETWO-23039">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::with_fixed_custom_option_price_100</data>
-             <data name="customer/dataset" xsi:type="string">customer_US</data>
-             <data name="catalogRules/0/data/name" xsi:type="string">CatalogPriceRule %isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.xml
-index 819fb7b25e4..49bf36b0325 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.xml
-@@ -21,6 +21,7 @@
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleInGrid" />
-         </variation>
-         <variation name="CatalogRule_Create_Inactive_AdminOnly">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogPriceRule/data/name" xsi:type="string">CatalogPriceRule %isolation%</data>
-             <data name="catalogPriceRule/data/description" xsi:type="string">Catalog Price Rule Description</data>
-             <data name="catalogPriceRule/data/is_active" xsi:type="string">Inactive</data>
-@@ -29,6 +30,7 @@
-             <data name="catalogPriceRule/data/condition" xsi:type="string">-</data>
-             <data name="catalogPriceRule/data/simple_action" xsi:type="string">Apply as fixed amount</data>
-             <data name="catalogPriceRule/data/discount_amount" xsi:type="string">10</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleSuccessSaveMessage" />
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNoticeMessage" />
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleForm" />
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.xml
-index 738e9422fd9..3862d010076 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.xml
-@@ -17,6 +17,7 @@
-             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
-             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
-             <data name="payment/method" xsi:type="string">checkmo</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleSuccessDeleteMessage" />
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotInGrid" />
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedCatalogPage" />
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/NavigateMenuTest.xml
-index 659d76eabcc..4a965d57089 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/NavigateMenuTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest14">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Marketing > Catalog Price Rule</data>
-             <data name="pageTitle" xsi:type="string">Catalog Price Rule</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogRuleConfigurable/Test/TestCase/ApplyConfigurableProductCatalogPriceRulesTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRuleConfigurable/Test/TestCase/ApplyConfigurableProductCatalogPriceRulesTest.xml
-index 2e9e2480f38..1645c68f8fb 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogRuleConfigurable/Test/TestCase/ApplyConfigurableProductCatalogPriceRulesTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogRuleConfigurable/Test/TestCase/ApplyConfigurableProductCatalogPriceRulesTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\CatalogRuleConfigurable\Test\TestCase\ApplyConfigurableProductCatalogPriceRulesTest" summary="Apply Catalog Price Rules">
-         <variation name="ApplyCatalogRuleForComfigurableProductWithOptions1" summary="Apply Catalog Rule For Configurable Product With Promo Simple Product" ticketId="MAGETWO-47186">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">configurableProduct::Stellar_Solar_Jacket_SIZE_S</data>
-             <data name="products/1" xsi:type="string">configurableProduct::Stellar_Solar_Jacket_SIZE_M</data>
-             <data name="products/2" xsi:type="string">configurableProduct::Stellar_Solar_Jacket_SIZE_L</data>
-@@ -39,6 +40,7 @@
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleAppliedShoppingCart" />
-         </variation>
-         <variation name="ApplyCatalogRuleForConfigurableProductWithAssignedSimpleProducts" summary="Apply Catalog Rule For Configurable Product With Custom Options" ticketId="MAGETWO-23042">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">configurableProduct::first_product_with_custom_options_and_option_key_1</data>
-             <data name="products/1" xsi:type="string">configurableProduct::first_product_with_custom_options_and_option_key_2</data>
-             <data name="products/2" xsi:type="string">configurableProduct::second_product_with_custom_options_and_option_key_1</data>
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogRuleConfigurable/Test/TestCase/DeleteCatalogPriceRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRuleConfigurable/Test/TestCase/DeleteCatalogPriceRuleEntityTest.xml
-index dd332ead13a..d7d0c9e8b35 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogRuleConfigurable/Test/TestCase/DeleteCatalogPriceRuleEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogRuleConfigurable/Test/TestCase/DeleteCatalogPriceRuleEntityTest.xml
-@@ -11,6 +11,7 @@
-             <data name="catalogPriceRule/dataset" xsi:type="string">active_catalog_price_rule_with_conditions</data>
-             <data name="product" xsi:type="string">configurableProduct::two_options_by_one_dollar</data>
-             <data name="productPrice/0/regular" xsi:type="string">1</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleSuccessDeleteMessage" />
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotInGrid" />
-             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedCatalogPage" />
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php
-index 400289eccda..11a8693723f 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php
-+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php
-@@ -61,7 +61,7 @@ class QueryText extends DataSource
-                 $searchValue = isset($productData[2]) ? $productData[2] : $productData[1];
-                 if ($this->data === null) {
-                     if ($product->hasData($searchValue)) {
--                        $getProperty = 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $searchValue)));
-+                        $getProperty = 'get' . str_replace('_', '', ucwords($searchValue, '_'));
-                         $this->data = $product->$getProperty();
-                     } else {
-                         $this->data = $searchValue;
-@@ -70,7 +70,7 @@ class QueryText extends DataSource
- 
-                 $products[] = $product;
-             } elseif ($this->data === null) {
--                $this->data = strval($productData);
-+                $this->data = (string)$productData;
-             }
-         }
- 
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml
-index 0437e0a5e99..8c465544a32 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\CatalogSearch\Test\TestCase\CreateSearchTermEntityTest" summary="Create Search Term" ticketId="MAGETWO-26165">
-         <variation name="CreateSearchTermEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="searchTerm/data/query_text/value" xsi:type="string">catalogProductSimple::sku</data>
-             <data name="searchTerm/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="searchTerm/data/redirect" xsi:type="string">http://example.com/</data>
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml
-index a9cc0dfd34f..8fdd7ef7155 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\CatalogSearch\Test\TestCase\DeleteSearchTermEntityTest" summary="Delete Search Term" ticketId="MAGETWO-26491">
-         <variation name="DeleteSearchTermEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="searchTerm/dataset" xsi:type="string">default</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermSuccessDeleteMessage" />
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermNotInGrid" />
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml
-index 3bf4e521c4a..3ef2b65c022 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\CatalogSearch\Test\TestCase\MassDeleteSearchTermEntityTest" summary="Mass Delete Search Term" ticketId="MAGETWO-26599">
-         <variation name="MassDeleteSearchTermEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="searchTerms" xsi:type="string">catalogSearchQuery::default,catalogSearchQuery::default,catalogSearchQuery::default</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermSuccessMassDeleteMessage" />
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermMassActionsNotInGrid" />
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/NavigateMenuTest.xml
-index 493d427dd0a..d9bb0f65e70 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/NavigateMenuTest.xml
-@@ -8,11 +8,13 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest15">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Marketing > Search Terms</data>
-             <data name="pageTitle" xsi:type="string">Search Terms</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest16">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Search Terms</data>
-             <data name="pageTitle" xsi:type="string">Search Terms Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
-index 9a6a66091d4..42dd7b6c96e 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
-@@ -8,66 +8,76 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\CatalogSearch\Test\TestCase\SearchEntityResultsTest" summary="Use Quick Search to Find Product" ticketId="MAGETWO-25095">
-         <variation name="SearchEntityResultsTestVariation1" summary="Use Quick Search to Find the Product" ticketId="MAGETWO-12420">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::sku</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation2" summary="Search simple product and add to cart" ticketId="MAGETWO-43235">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::simple</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductAddedToCartFromSearchResults" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation3" summary="Search virtual product and add to cart" ticketId="MAGETWO-43235">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductVirtual::default::virtual</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductAddedToCartFromSearchResults" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation4" summary="Search configurable product and add to cart" ticketId="MAGETWO-43235">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">configurableProduct::default::configurable</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductAddedToCartFromSearchResults" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation5" summary="Search downloadable product and add to cart" ticketId="MAGETWO-43235">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">downloadableProduct::default::downloadable</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductAddedToCartFromSearchResults" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation6" summary="Search grouped product and add to cart" ticketId="MAGETWO-43235">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">groupedProduct::withSimpleProducts_without_qty::grouped</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductAddedToCartFromSearchResults" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation7" summary="Search bundle dynamic product and add to cart" ticketId="MAGETWO-43235">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">bundleProduct::bundle_dynamic_product::bundle</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductAddedToCartFromSearchResults" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation8" summary="Search fixed product">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">bundleProduct::bundle_fixed_product::bundle</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchResult" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation9">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::name</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation10">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::product_with_special_symbols_in_name::name</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation11">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/search_query" xsi:type="string">TryToFindMeAndI&#39;llFindYOU</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchNoResultMessage" />
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchNoResult" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation12" summary="Search for simple product name using 2 symbols query length" ticketId="MAGETWO-36542">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::name</data>
-             <data name="queryLength" xsi:type="string">2</data>
--            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchNoResultMessage" />
--            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchNoResult" />
-+            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation13" summary="Search for simple product name using 3 symbols query length" ticketId="MAGETWO-36542">
--            <data name="issue" xsi:type="string">MAGETWO-65509: [FT] Magento\CatalogSearch\Test\TestCase\SearchEntityResultsTest fails on Jenkins</data>
-             <data name="tag" xsi:type="string">stable:no</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::name</data>
-             <data name="queryLength" xsi:type="string">3</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation14" summary="Search for simple product name using 128 symbols query length" ticketId="MAGETWO-36542">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::product_with_long_name::name</data>
-             <data name="queryLength" xsi:type="string">128</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
-@@ -82,6 +92,7 @@
-         <variation name="SearchEntityResultsTestVariation16"
-                    summary="Search for two simple products for text in attributes with same search weight and check their sort order"
-                    ticketId="MAGETWO-64501">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/search_query" xsi:type="string">alaska</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="array">
-                 <item name="product_2" xsi:type="string">catalogProductSimple::search_weight_term_twice_weight_1</item>
-@@ -92,6 +103,7 @@
-         <variation name="SearchEntityResultsTestVariation17"
-                    summary="Search for two simple products for text in attributes with different search weight and check their sort order"
-                    ticketId="MAGETWO-64502">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/search_query" xsi:type="string">alaska</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="array">
-                 <item name="product_1" xsi:type="string">catalogProductSimple::search_weight_term_once_weight_5</item>
-@@ -100,6 +112,7 @@
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchResultOrder" />
-         </variation>
-         <variation name="SearchEntityResultsTestVariation18" summary="Search Configurable Product with Enabled and Disabled Children." ticketId="MAGETWO-69181">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="catalogSearch/data/query_text/value" xsi:type="string">configurableProduct::one_simple_product_not_visible_individually::name</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchResult" />
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertConfigurableWithDisabledOptionCatalogSearchNoResult" />
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml
-index e9e4bcca2e1..ffd9e902cde 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml
-@@ -8,22 +8,26 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\CatalogSearch\Test\TestCase\SuggestSearchingResultEntityTest" summary="Suggest Searching Results" ticketId="MAGETWO-24671, MAGETWO-23186">
-         <variation name="SuggestSearchingResultEntityTestVariation1" summary="Auto-complete search with product name" ticketId="MAGETWO-24671">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="searchTerm/data/query_text/value" xsi:type="string">catalogProductSimple::name</data>
-             <data name="searchTerm/data/num_results" xsi:type="string">-</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSuggestSearchingResult" />
-         </variation>
-         <variation name="SuggestSearchingResultEntityTestVariation2" summary="Auto-complete search with product sku" ticketId="MAGETWO-24671">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="searchTerm/data/query_text/value" xsi:type="string">catalogProductSimple::sku</data>
-             <data name="searchTerm/data/num_results" xsi:type="string">1</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSuggestSearchingResult" />
-         </variation>
-         <variation name="SuggestSearchingResultEntityTestVariation3" summary="Auto-complete search with product description" ticketId="MAGETWO-23186">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="searchTerm/data/query_text/value" xsi:type="string">catalogProductSimple::abc_dfj_simple_for_advancedsearch::adc_Full</data>
-             <data name="searchTerm/data/num_results" xsi:type="string">1</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSuggestSearchingResult" />
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermInGrid" />
-         </variation>
-         <variation name="SuggestSearchingResultEntityTestVariation4" summary="Auto-complete search with product short description" ticketId="MAGETWO-23186">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="searchTerm/data/query_text/value" xsi:type="string">catalogProductSimple::abc_dfj_simple_for_advancedsearch::abc_short</data>
-             <data name="searchTerm/data/num_results" xsi:type="string">1</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSuggestSearchingResult" />
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/UpdateSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/UpdateSearchTermEntityTest.xml
-index 922973dbf31..2ce4bbaa8a6 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/UpdateSearchTermEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/UpdateSearchTermEntityTest.xml
-@@ -14,6 +14,7 @@
-             <data name="searchTerm/data/popularity" xsi:type="string">20</data>
-             <data name="searchTerm/data/redirect" xsi:type="string">http://example.com/</data>
-             <data name="searchTerm/data/display_in_terms" xsi:type="string">No</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermSuccessSaveMessage" />
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermForm" />
-             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermInGrid" />
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlCategoryEntityTest.xml
-index 398054f1f0e..8b15da5ecd2 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlCategoryEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlCategoryEntityTest.xml
-@@ -14,7 +14,7 @@
-             <data name="category/data/include_in_menu" xsi:type="string">Yes</data>
-             <data name="category/data/name" xsi:type="string">Subcategory%isolation%</data>
-             <data name="category/data/url_key" xsi:type="string">subcategory-%isolation%</data>
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1, mftf_migrated:yes</data>
-             <constraint name="Magento\CatalogUrlRewrite\Test\Constraint\AssertCategoryUrlDuplicateErrorMessage" />
-         </variation>
-     </testCase>
-diff --git a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlProductEntity.xml b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlProductEntity.xml
-index 1116821f756..8110ed1ed00 100644
---- a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlProductEntity.xml
-+++ b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlProductEntity.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\CatalogUrlRewrite\Test\TestCase\CreateDuplicateUrlProductEntity" summary="Create Simple Product" ticketId="MAGETWO-69427">
-         <variation name="CreateDuplicateUrlProductEntityTestVariation1" summary="Create Duplicate Url Product">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1, mftf_migrated:yes</data>
-             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
-index b0e99635564..bbe6fe293ab 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
-@@ -106,6 +106,13 @@ class Cart extends Block
-      */
-     protected $cartItemClass = \Magento\Checkout\Test\Block\Cart\CartItem::class;
- 
-+    /**
-+     * Locator for page with ajax loading state.
-+     *
-+     * @var string
-+     */
-+    private $ajaxLoading = 'body.ajax-loading';
-+
-     /**
-      * Wait for PayPal page is loaded.
-      *
-@@ -273,4 +280,14 @@ class Cart extends Block
-     {
-         $this->waitForElementVisible($this->inContextPaypalCheckoutButton);
-     }
-+
-+    /**
-+     * Wait loading.
-+     *
-+     * @return void
-+     */
-+    public function waitForLoader()
-+    {
-+        $this->waitForElementNotVisible($this->ajaxLoading);
-+    }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
-index 10299486a08..3d293700db8 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
-@@ -72,6 +72,13 @@ class Shipping extends Form
-      */
-     protected $commonShippingPriceSelector = '.totals.shipping .price';
- 
-+    /**
-+     * Estimate shipping and tax form locator.
-+     *
-+     * @var string
-+     */
-+    private $estimateShippingForm = '#shipping-zip-form';
-+
-     /**
-      * Open estimate shipping and tax form.
-      *
-@@ -250,4 +257,51 @@ class Shipping extends Form
-     {
-         $this->waitForElementVisible($this->commonShippingPriceSelector, Locator::SELECTOR_CSS);
-     }
-+
-+    /**
-+     * Wait until estimation form to appear.
-+     *
-+     * @return void
-+     */
-+    public function waitForEstimateShippingAndTaxForm()
-+    {
-+        $browser = $this->browser;
-+        $selector = $this->estimateShippingForm;
-+
-+        $browser->waitUntil(
-+            function () use ($browser, $selector) {
-+                $element = $browser->find($selector);
-+                return $element->isPresent() ? true : null;
-+            }
-+        );
-+    }
-+
-+    /**
-+     * Wait for shipping method form.
-+     *
-+     * @return void
-+     */
-+    public function waitForShippingMethodForm()
-+    {
-+        $browser = $this->browser;
-+        $selector = $this->shippingMethodForm;
-+
-+        $browser->waitUntil(
-+            function () use ($browser, $selector) {
-+                $element = $browser->find($selector);
-+                return $element->isPresent() ? true : null;
-+            }
-+        );
-+    }
-+
-+    /**
-+     * Wait for summary block to be loaded.
-+     *
-+     * @return void
-+     */
-+    public function waitForSummaryBlock()
-+    {
-+        $this->waitForEstimateShippingAndTaxForm();
-+        $this->waitForShippingMethodForm();
-+    }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
-index 562bc3a2612..7f9c6717c7e 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
-@@ -34,7 +34,7 @@ class Sidebar extends Block
-      *
-      * @var string
-      */
--    protected $braintreePaypalCheckoutButton = './/button[contains(@id, "braintree-paypal-mini-cart")]';
-+    protected $braintreePaypalCheckoutButton = 'button[id^="braintree-paypal-mini-cart"]';
- 
-     /**
-      * Locator value for "Proceed to Checkout" button.
-@@ -124,8 +124,18 @@ class Sidebar extends Block
-      */
-     public function clickBraintreePaypalButton()
-     {
--        $this->_rootElement->find($this->braintreePaypalCheckoutButton, Locator::SELECTOR_XPATH)
-+        // Button can be enabled/disabled few times.
-+        sleep(3);
-+
-+        $windowsCount = count($this->browser->getWindowHandles());
-+        $this->_rootElement->find($this->braintreePaypalCheckoutButton)
-             ->click();
-+        $browser = $this->browser;
-+        $this->browser->waitUntil(
-+            function () use ($browser, $windowsCount) {
-+                return count($browser->getWindowHandles()) === ($windowsCount + 1) ? true: null;
-+            }
-+        );
-     }
- 
-     /**
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
-index fda29a2fe78..1d3950091d0 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
-@@ -117,6 +117,7 @@ class Totals extends Block
-      */
-     public function getGrandTotalIncludingTax()
-     {
-+        $this->waitForGrandTotal();
-         $priceElement = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_CSS);
-         return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
-     }
-@@ -264,4 +265,15 @@ class Totals extends Block
-     {
-         $this->waitForElementVisible($this->shippingPriceBlockSelector, Locator::SELECTOR_CSS);
-     }
-+
-+    /**
-+     * Wait for "Grand Total" row to appear.
-+     *
-+     * @return void
-+     */
-+    public function waitForGrandTotal()
-+    {
-+        $this->waitForUpdatedTotals();
-+        $this->waitForElementVisible($this->grandTotal);
-+    }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Registration.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Registration.php
-index c1bab0ae688..eda93a53a48 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Registration.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Registration.php
-@@ -19,7 +19,7 @@ class Registration extends Block
-      *
-      * @var string
-      */
--    protected $createAccountButton = 'input[data-bind*="Create an Account"]';
-+    protected $createAccountButton = '[data-bind*="i18n: \'Create an Account\'"]';
- 
-     /**
-      * Click 'Create an Account' button and wait until button will be not visible.
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php
-index 0bf9b37c75e..1013404f42d 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php
-@@ -102,7 +102,7 @@ class Shipping extends Form
-      *
-      * @var string
-      */
--    private $emailError = '#customer-email-error';
-+    private $emailError = '#checkout-customer-email-error';
- 
-     /**
-      * Get email error.
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.xml
-index 71115e40288..0973b968cba 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.xml
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.xml
-@@ -8,7 +8,7 @@
- <mapping strict="0">
-     <fields>
-         <email>
--            <selector>#customer-email</selector>
-+            <selector>#checkout-customer-email</selector>
-         </email>
-         <firstname />
-         <lastname />
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
-index c2839651b58..cf05079b0a0 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
-@@ -3,10 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Checkout\Test\Constraint;
- 
--use Magento\Checkout\Test\Fixture\Cart;
- use Magento\Checkout\Test\Page\CheckoutCart;
- use Magento\Mtf\Client\BrowserInterface;
- use Magento\Mtf\Constraint\AbstractConstraint;
-@@ -30,8 +30,10 @@ class AssertCartIsEmpty extends AbstractConstraint
-      * @param BrowserInterface $browser
-      * @return void
-      */
--    public function processAssert(CheckoutCart $checkoutCart, BrowserInterface $browser)
--    {
-+    public function processAssert(
-+        CheckoutCart $checkoutCart,
-+        BrowserInterface $browser
-+    ): void {
-         $checkoutCart->open();
-         $cartEmptyBlock = $checkoutCart->getCartEmptyBlock();
- 
-@@ -42,10 +44,12 @@ class AssertCartIsEmpty extends AbstractConstraint
-         );
- 
-         $cartEmptyBlock->clickLinkToMainPage();
--        \PHPUnit\Framework\Assert::assertEquals(
-+        $this->assertUrlEqual(
-             $_ENV['app_frontend_url'],
-             $browser->getUrl(),
--            'Wrong link to main page on empty cart page.'
-+            true,
-+            'Wrong link to main page on empty cart page: expected - ' . $_ENV['app_frontend_url']
-+            . ', actual - ' . $browser->getUrl()
-         );
-     }
- 
-@@ -58,4 +62,31 @@ class AssertCartIsEmpty extends AbstractConstraint
-     {
-         return 'Shopping Cart is empty.';
-     }
-+
-+    /**
-+     * Asserts that two urls are equal
-+     *
-+     * @param string $expectedUrl
-+     * @param string $actualUrl
-+     * @param bool $ignoreScheme
-+     * @param string $message
-+     * @return void
-+     */
-+    private function assertUrlEqual(
-+        string $expectedUrl,
-+        string $actualUrl,
-+        bool $ignoreScheme = false,
-+        string $message = ''
-+    ): void {
-+        $urlArray1 = parse_url($expectedUrl);
-+        $urlArray2 = parse_url($actualUrl);
-+        if ($ignoreScheme) {
-+            unset($urlArray1['scheme']);
-+            unset($urlArray2['scheme']);
-+        }
-+        \PHPUnit\Framework\Assert::assertTrue(
-+            $urlArray1 === $urlArray2,
-+            $message
-+        );
-+    }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
-index 144e41dca0d..b0ed9d358f9 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
-@@ -7,6 +7,7 @@
- namespace Magento\Checkout\Test\Constraint;
- 
- use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
- use Magento\Checkout\Test\Fixture\Cart;
- use Magento\Checkout\Test\Fixture\Cart\Items;
- use Magento\Checkout\Test\Page\CheckoutCart;
-@@ -21,6 +22,8 @@ use Magento\Mtf\Fixture\FixtureInterface;
-  */
- class AssertCartItemsOptions extends AbstractAssertForm
- {
-+    use CartPageLoadTrait;
-+
-     /**
-      * Error message for verify options
-      *
-@@ -44,6 +47,8 @@ class AssertCartItemsOptions extends AbstractAssertForm
-     public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
-     {
-         $checkoutCart->open();
-+        $this->waitForCartPageLoaded($checkoutCart);
-+
-         /** @var Items $sourceProducts */
-         $sourceProducts = $cart->getDataFieldConfig('items')['source'];
-         $products = $sourceProducts->getProducts();
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
-index 9bedda350d0..432bbd4f214 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\Checkout\Test\Constraint;
- 
-+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
- use Magento\Checkout\Test\Fixture\Cart;
- use Magento\Checkout\Test\Page\CheckoutCart;
- use Magento\Mtf\Constraint\AbstractConstraint;
-@@ -16,6 +17,8 @@ use Magento\Mtf\Constraint\AbstractConstraint;
-  */
- class AssertGrandTotalInShoppingCart extends AbstractConstraint
- {
-+    use CartPageLoadTrait;
-+
-     /**
-      * Assert that grand total is equal to expected
-      *
-@@ -28,6 +31,7 @@ class AssertGrandTotalInShoppingCart extends AbstractConstraint
-     {
-         if ($requireReload) {
-             $checkoutCart->open();
-+            $this->waitForCartPageLoaded($checkoutCart);
-             $checkoutCart->getTotalsBlock()->waitForUpdatedTotals();
-         }
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
-index 42c79c1280e..88d4a3e8d35 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
-@@ -7,6 +7,7 @@
- namespace Magento\Checkout\Test\Constraint;
- 
- use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
- use Magento\Checkout\Test\Fixture\Cart;
- use Magento\Checkout\Test\Fixture\Cart\Items;
- use Magento\Checkout\Test\Page\CheckoutCart;
-@@ -19,6 +20,8 @@ use Magento\Mtf\Fixture\FixtureInterface;
-  */
- class AssertPriceInShoppingCart extends AbstractAssertForm
- {
-+    use CartPageLoadTrait;
-+
-     /**
-      * Assert that price in the shopping cart equals to expected price from data set
-      *
-@@ -29,6 +32,8 @@ class AssertPriceInShoppingCart extends AbstractAssertForm
-     public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
-     {
-         $checkoutCart->open();
-+        $this->waitForCartPageLoaded($checkoutCart);
-+
-         /** @var Items $sourceProducts */
-         $sourceProducts = $cart->getDataFieldConfig('items')['source'];
-         $products = $sourceProducts->getProducts();
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
-index 40eb41e1272..b80b4c85227 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
-@@ -7,6 +7,7 @@
- namespace Magento\Checkout\Test\Constraint;
- 
- use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
- use Magento\Checkout\Test\Fixture\Cart;
- use Magento\Checkout\Test\Fixture\Cart\Items;
- use Magento\Checkout\Test\Page\CheckoutCart;
-@@ -19,6 +20,8 @@ use Magento\Mtf\Fixture\FixtureInterface;
-  */
- class AssertProductQtyInShoppingCart extends AbstractAssertForm
- {
-+    use CartPageLoadTrait;
-+
-     /**
-      * Assert that quantity in the shopping cart is equals to expected quantity from data set
-      *
-@@ -29,6 +32,8 @@ class AssertProductQtyInShoppingCart extends AbstractAssertForm
-     public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
-     {
-         $checkoutCart->open();
-+        $this->waitForCartPageLoaded($checkoutCart);
-+
-         /** @var Items $sourceProducts */
-         $sourceProducts = $cart->getDataFieldConfig('items')['source'];
-         $products = $sourceProducts->getProducts();
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
-index 2ee9caa251a..5e743e735d4 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
-@@ -7,6 +7,7 @@
- namespace Magento\Checkout\Test\Constraint;
- 
- use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
- use Magento\Checkout\Test\Fixture\Cart;
- use Magento\Checkout\Test\Fixture\Cart\Items;
- use Magento\Checkout\Test\Page\CheckoutCart;
-@@ -19,6 +20,8 @@ use Magento\Mtf\Fixture\FixtureInterface;
-  */
- class AssertSubtotalInShoppingCart extends AbstractAssertForm
- {
-+    use CartPageLoadTrait;
-+
-     /**
-      * Assert that subtotal total in the shopping cart is equals to expected total from data set
-      *
-@@ -31,6 +34,7 @@ class AssertSubtotalInShoppingCart extends AbstractAssertForm
-     {
-         if ($requireReload) {
-             $checkoutCart->open();
-+            $this->waitForCartPageLoaded($checkoutCart);
-         }
- 
-         /** @var Items $sourceProducts */
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/Utils/CartPageLoadTrait.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/Utils/CartPageLoadTrait.php
-new file mode 100644
-index 00000000000..fa349554fa1
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/Utils/CartPageLoadTrait.php
-@@ -0,0 +1,30 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Checkout\Test\Constraint\Utils;
-+
-+use Magento\Checkout\Test\Page\CheckoutCart;
-+
-+/**
-+ * Check if cart page is fully loaded.
-+ */
-+trait CartPageLoadTrait
-+{
-+    /**
-+     * @param CheckoutCart $checkoutCart
-+     * @return void
-+     */
-+    public function waitForCartPageLoaded(CheckoutCart $checkoutCart) : void
-+    {
-+        $checkoutCart->getCartBlock()->waitForLoader();
-+        if (!$checkoutCart->getCartBlock()->cartIsEmpty()) {
-+            $checkoutCart->getShippingBlock()->waitForSummaryBlock();
-+            $checkoutCart->getTotalsBlock()->waitForGrandTotal();
-+        }
-+    }
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
-index 8d054c02308..6baeae29566 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Checkout\Test\TestCase\AddProductsToShoppingCartEntityTest" summary="Add Products to Shopping Cart" ticketId="MAGETWO-25382">
-         <variation name="AddProductsToShoppingCartEntityTestVariation1" ticketId="MAGETWO-42677">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
-             <data name="cart/data/grand_total" xsi:type="string">210</data>
-             <data name="cart/data/subtotal" xsi:type="string">200</data>
-@@ -22,7 +22,6 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
-         </variation>
-         <variation name="AddProductsToShoppingCartEntityTestVariation2">
--            <data name="tag" xsi:type="string">to_maintain:yes, severity:S2</data>
-             <data name="productsData/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
-             <data name="cart/data/grand_total" xsi:type="string">761</data>
-             <data name="cart/data/subtotal" xsi:type="string">756</data>
-@@ -35,7 +34,6 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
-         </variation>
-         <variation name="AddProductsToShoppingCartEntityTestVariation3">
--            <data name="tag" xsi:type="string">to_maintain:yes, severity:S0</data>
-             <data name="productsData/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
-             <data name="cart/data/grand_total" xsi:type="string">345</data>
-             <data name="cart/data/subtotal" xsi:type="string">340</data>
-@@ -48,7 +46,6 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
-         </variation>
-         <variation name="AddProductsToShoppingCartEntityTestVariation4">
--            <data name="tag" xsi:type="string">to_maintain:yes, severity:S1</data>
-             <data name="productsData/0" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
-             <data name="cart/data/grand_total" xsi:type="string">50</data>
-             <data name="cart/data/subtotal" xsi:type="string">50</data>
-@@ -61,7 +58,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
-         </variation>
-         <variation name="AddProductsToShoppingCartEntityTestVariation5">
--            <data name="tag" xsi:type="string">severity:S0</data>
-+            <data name="tag" xsi:type="string">severity:S0, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">configurableProduct::default</data>
-             <data name="cart/data/grand_total" xsi:type="string">135</data>
-             <data name="cart/data/subtotal" xsi:type="string">120</data>
-@@ -74,7 +71,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
-         </variation>
-         <variation name="AddProductsToShoppingCartEntityTestVariation6">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">downloadableProduct::with_two_separately_links</data>
-             <data name="cart/data/grand_total" xsi:type="string">22.43</data>
-             <data name="cart/data/subtotal" xsi:type="string">22.43</data>
-@@ -87,7 +84,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
-         </variation>
-         <variation name="AddProductsToShoppingCartEntityTestVariation7">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">groupedProduct::three_simple_products</data>
-             <data name="cart/data/grand_total" xsi:type="string">1950</data>
-             <data name="cart/data/subtotal" xsi:type="string">1920</data>
-@@ -100,8 +97,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
-         </variation>
-         <variation name="AddProductsToShoppingCartEntityTestVariation8" summary="Enable https in backend and add products of different types to cart" ticketId="MAGETWO-42677">
--            <data name="tag" xsi:type="string">to_maintain:yes, severity:S0</data>
--            <data name="issue" xsi:type="string">Errors on configuration step. Skipped.</data>
-+            <data name="tag" xsi:type="string">severity:S0</data>
-             <data name="productsData/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
-             <data name="productsData/1" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
-             <data name="productsData/2" xsi:type="string">downloadableProduct::with_two_separately_links</data>
-@@ -123,6 +119,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
-         </variation>
-         <variation name="AddProductsToShoppingCartEntityTestVariation9" summary="Add dynamic bundle product to shopping cart with disabled mini shoping cart sidebar" ticketId="MAGETWO-35535">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="configData" xsi:type="string">disable_display_shopping_cart_sidebar</data>
-             <data name="flushCache" xsi:type="boolean">true</data>
-             <data name="productsData/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
-@@ -136,6 +133,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertMyCartLinkRedirect" />
-         </variation>
-         <variation name="AddProductsToShoppingCartEntityTestVariation10" summary="Verify Top Destinations for Country Options configuration applied in shopping cart" ticketId="MAGETWO-38700">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
-             <data name="configData" xsi:type="string">top_destinations_DE_ES_GB</data>
-             <data name="cart/data/grand_total" xsi:type="string">15.00</data>
-@@ -149,7 +147,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertTopDestinationsInSelect" />
-         </variation>
-         <variation name="VariationWithCartItemsDisplayDefaultLimitation" summary="Verify visible items count in minicart and checkout summary block according to configuration" ticketId="MAGETWO-63442">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="productsData/1" xsi:type="string">catalogProductSimple::default</data>
-             <data name="productsData/2" xsi:type="string">catalogProductSimple::default</data>
-@@ -170,7 +168,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertVisibleItemsQtyInMiniShoppingCart" />
-         </variation>
-         <variation name="VariationWithCartItemsDisplayDefaultLimitationAndDefaultTotalQty" summary="Verify visible items count in minicart and checkout summary block according to configuration" ticketId="MAGETWO-63441">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="productsData/1" xsi:type="string">catalogProductSimple::default</data>
-             <data name="productsData/2" xsi:type="string">catalogProductSimple::default</data>
-@@ -190,7 +188,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertVisibleItemsQtyInMiniShoppingCart" />
-         </variation>
-         <variation name="VariationWithCartItemsDisplayDefaultLimitationOnCheckoutAndDefaultTotalQty" summary="Verify visible items count in minicart and checkout summary block according to configuration" ticketId="MAGETWO-63447">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="productsData/1" xsi:type="string">catalogProductSimple::default</data>
-             <data name="productsData/2" xsi:type="string">catalogProductSimple::default</data>
-@@ -211,7 +209,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertLinkGoToCartNotPresentInSummaryBlock" />
-         </variation>
-         <variation name="VariationWithCartItemsDisplayDefaultLimitationOnCheckout" summary="Verify visible items count in minicart and checkout summary block according to configuration" ticketId="MAGETWO-63448">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="productsData/1" xsi:type="string">catalogProductSimple::default</data>
-             <data name="productsData/2" xsi:type="string">catalogProductSimple::default</data>
-@@ -233,7 +231,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertLinkGoToCartPresentInSummaryBlock" />
-         </variation>
-         <variation name="VariationWithCartItemsDisplayCustomLimitations" summary="Verify visible items count in minicart and checkout summary block according to configuration" ticketId="MAGETWO-63445, MAGETWO-63449, MAGETWO-63452">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">catalogProductVirtual::default</data>
-             <data name="productsData/1" xsi:type="string">catalogProductVirtual::default</data>
-             <data name="productsData/2" xsi:type="string">catalogProductVirtual::default</data>
-@@ -252,6 +250,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertLinkGoToCartPresentInSummaryBlock" />
-         </variation>
-         <variation name="AddProductsToShoppingCartEntityTestVariation11" summary="Create product with all types of custom options that are required and trigger JS validation" ticketId="MAGETWO-45389">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">catalogProductSimple::with_all_required_custom_option</data>
-             <data name="cart/data/subtotal" xsi:type="string">6160.00</data>
-             <data name="isValidationFailed" xsi:type="boolean">true</data>
-@@ -259,12 +258,14 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertProductsAbsentInShoppingCart" />
-         </variation>
-         <variation name="AddProductsToShoppingCartEntityTestVariation12" summary="Create product with all types of custom options that are required and check that item options for product(s) display with correct information" ticketId="MAGETWO-45389">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">catalogProductSimple::with_all_required_custom_option</data>
-             <data name="cart/data/subtotal" xsi:type="string">6160.00</data>
-             <data name="isValidationFailed" xsi:type="boolean">true</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
-         </variation>
-         <variation name="AddProductsToShoppingCartEntityTestVariation13" summary="Check Bundle on Cart Configuration Page." ticketId="MAGETWO-71634">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">bundleProduct::bundle_with_multiselect_option_one_selection</data>
-             <data name="cart/data/grand_total" xsi:type="string">105</data>
-             <data name="cart/data/subtotal" xsi:type="string">100</data>
-@@ -277,6 +278,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertGrandTotalInShoppingCart" />
-         </variation>
-         <variation name="AddProductsToShoppingCartEntityTestVariation14" summary="Check Bundle on Cart Configuration Page." ticketId="MAGETWO-71634">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">bundleProduct::bundle_with_multiselect_option_two_selections</data>
-             <data name="cart/data/grand_total" xsi:type="string">665</data>
-             <data name="cart/data/subtotal" xsi:type="string">660</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
-index d29d1674e2b..43ad90fd45b 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Checkout\Test\TestCase\DeleteProductFromMiniShoppingCartTest" summary="Delete Product from Mini Shopping Cart" ticketId="MAGETWO-29104">
-         <variation name="DeleteProductFromMiniShoppingCartTestVariation1">
--            <data name="tag" xsi:type="string">severity:S0</data>
-+            <data name="tag" xsi:type="string">severity:S0, mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">delete Simple</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="products/1" xsi:type="string">catalogProductVirtual::default</data>
-@@ -17,7 +17,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertProductPresentInMiniShoppingCart" />
-         </variation>
-         <variation name="DeleteProductFromMiniShoppingCartTestVariation2">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">delete Simple</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="deletedProductIndex" xsi:type="string">0</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml
-index 597a5d0c72f..ef726351688 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml
-@@ -8,12 +8,12 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Checkout\Test\TestCase\DeleteProductsFromShoppingCartTest" summary="Delete Products from Shopping Cart" ticketId="MAGETWO-25218">
-         <variation name="DeleteProductsFromShoppingCartTestVariation1">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
-         </variation>
-         <variation name="DeleteProductsFromShoppingCartTestVariation2">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
-         </variation>
-@@ -23,22 +23,22 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
-         </variation>
-         <variation name="DeleteProductsFromShoppingCartTestVariation4">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
-         </variation>
-         <variation name="DeleteProductsFromShoppingCartTestVariation5">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">configurableProduct::default</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
-         </variation>
-         <variation name="DeleteProductsFromShoppingCartTestVariation6">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">downloadableProduct::with_two_separately_links</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
-         </variation>
-         <variation name="DeleteProductsFromShoppingCartTestVariation7">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">groupedProduct::three_simple_products</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
-         </variation>
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/EditShippingAddressOnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/EditShippingAddressOnePageCheckoutTest.xml
-index 3c88d9193db..64ed0590446 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/EditShippingAddressOnePageCheckoutTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/EditShippingAddressOnePageCheckoutTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Checkout\Test\TestCase\EditShippingAddressOnePageCheckoutTest" summary="Customer can place order with new addresses that was edited during checkout with several conditions" ticketId="MAGETWO-67837">
-         <variation name="EditShippingAddressOnePageCheckoutTestVariation1">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="customer/dataset" xsi:type="string">johndoe_with_addresses</data>
-             <data name="shippingAddress/dataset" xsi:type="string">UK_address_without_email</data>
-             <data name="editShippingAddress/dataset" xsi:type="string">empty_UK_address_without_email</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.xml
-index 6635c1edbe7..75603d12cbe 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutJsValidationTest" summary="JS validation verification for Checkout flow" ticketId="MAGETWO-59697">
-         <variation name="OnePageCheckoutJsValidationTestVariation1" summary="JS validation is not applied for empty required checkout fields if customer did not fill them">
-+            <data name="issue" xsi:type="string">MAGETWO-97990: [MTF] OnePageCheckoutJsValidationTestVariation1_0 randomly fails on jenkins</data>
-             <data name="tag" xsi:type="string">severity:S2</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="checkoutMethod" xsi:type="string">guest</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.xml
-index 387e6418ee5..361c5031f33 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.xml
-@@ -22,7 +22,6 @@
-             <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
-         </variation>
-         <variation name="OnePageCheckoutUsingRegisterLink" summary="Customer is redirected to checkout on login if guest is disabled, flow with registration new Customer" ticketId="MAGETWO-49917">
--            <data name="issue" xsi:type="string">MAGETWO-59816: Redirect works improperly in a browser incognito mode</data>
-             <data name="tag" xsi:type="string">severity:S1</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="customer/dataset" xsi:type="string">register_customer</data>
-@@ -57,7 +56,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
-         </variation>
-         <variation name="OnePageCheckoutTestVariation2" summary="US customer during checkout using coupon for all customer groups">
--            <data name="tag" xsi:type="string">stable:no, severity:S0</data>
-+            <data name="tag" xsi:type="string">severity:S0</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups</data>
-             <data name="customer/dataset" xsi:type="string">default</data>
-@@ -79,7 +78,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
-         </variation>
-         <variation name="OnePageCheckoutTestVariation3" summary="Checkout as UK guest with simple product" ticketId="MAGETWO-42603, MAGETWO-43282, MAGETWO-43318">
--            <data name="tag" xsi:type="string">severity:S1, stable:no</data>
-+            <data name="tag" xsi:type="string">severity:S1</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::product_with_qty_25</data>
-             <data name="expectedQty/0" xsi:type="string">0</data>
-             <data name="expectedStockStatus/0" xsi:type="string">out of stock</data>
-@@ -92,7 +91,7 @@
-                 <item name="grandTotal" xsi:type="string">375.00</item>
-             </data>
-             <data name="payment/method" xsi:type="string">banktransfer</data>
--            <data name="status" xsi:type="string">Precessing</data>
-+            <data name="status" xsi:type="string">Processing</data>
-             <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Cancel, Hold, Invoice, Edit</data>
-             <data name="configData" xsi:type="string">banktransfer_specificcountry_gb, can_subtract_and_can_back_in_stock</data>
-             <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
-@@ -102,7 +101,6 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
--            <data name="issue" xsi:type="string">MAGETWO-66737: Magento\Checkout\Test\TestCase\OnePageCheckoutTest with OnePageCheckoutTestVariation3 and 4 is not stable</data>
-         </variation>
-         <variation name="OnePageCheckoutTestVariation4" summary="One Page Checkout Products with Special Prices" ticketId="MAGETWO-12429">
-             <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S0</data>
-@@ -125,7 +123,6 @@
-             <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
-             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal"/>
--            <data name="issue" xsi:type="string">MAGETWO-66737: Magento\Checkout\Test\TestCase\OnePageCheckoutTest with OnePageCheckoutTestVariation3 and 4 is not stable</data>
-         </variation>
-         <variation name="OnePageCheckoutTestVariation5" summary="Guest Checkout using Check/Money Order and Free Shipping with Prices/Taxes Verifications" ticketId="MAGETWO-12412">
-             <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S0</data>
-@@ -211,7 +208,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
-         </variation>
-         <variation name="OnePageCheckoutTestVariation9" summary="One Page Checkout Products with different shipping/billing address and Tier Prices" ticketId="MAGETWO-42604">
--            <data name="tag" xsi:type="string">stable:no, severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_order_qty_3</data>
-             <data name="customer/dataset" xsi:type="string">default</data>
-             <data name="checkoutMethod" xsi:type="string">login</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
-index 5c05d4a8400..0e646ecea04 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
-@@ -7,21 +7,19 @@
-  -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest" summary="OnePageCheckout within Offline Payment Methods" ticketId="MAGETWO-27485">
--        <variation name="OnePageCheckoutUsingSingInLink" summary="Login during checkout using 'Sign In' link" ticketId="MAGETWO-42547">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+        <variation name="OnePageCheckoutUsingSignInLink" summary="Login during checkout using 'Sign In' link" ticketId="MAGETWO-42547">
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="customer/dataset" xsi:type="string">customer_UK_US_addresses</data>
-             <data name="checkoutMethod" xsi:type="string">sign_in</data>
-             <data name="shippingAddressCustomer" xsi:type="array">
-                 <item name="added" xsi:type="number">1</item>
-             </data>
--            <data name="billingAddressCustomer" xsi:type="array">
--                <item name="added" xsi:type="number">1</item>
--            </data>
-             <data name="prices" xsi:type="array">
-                 <item name="grandTotal" xsi:type="string">565.00</item>
-             </data>
-             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
-+            <data name="editBillingInformation" xsi:type="boolean">false</data>
-             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
-             <data name="payment/method" xsi:type="string">checkmo</data>
-             <data name="configData" xsi:type="string">checkmo</data>
-@@ -29,7 +27,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
-         </variation>
-         <variation name="OnePageCheckoutUsingNonDefaultAddress" summary="Checkout as Customer using non default address" ticketId="MAGETWO-42602">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="customer/dataset" xsi:type="string">customer_US_DE_UK</data>
-             <data name="checkoutMethod" xsi:type="string">login</data>
-@@ -43,19 +41,16 @@
-                 <item name="grandTotal" xsi:type="string">565.00</item>
-             </data>
-             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
-+            <data name="editBillingInformation" xsi:type="boolean">false</data>
-             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
-             <data name="payment/method" xsi:type="string">checkmo</data>
-             <data name="configData" xsi:type="string">checkmo</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
--            <!-- MAGETWO-94169 -->
--            <data name="tag" xsi:type="string">stable:no</data>
--            <data name="issue" xsi:type="string">MAGETWO-94169: [MTF] - OnePageCheckoutUsingNonDefaultAddress_0 fails on 2.3-develop</data>
--            <!-- MAGETWO-94169 -->
-         </variation>
-         <variation name="OnePageCheckoutUsingNewAddress" summary="Checkout as Customer using New address" ticketId="MAGETWO-42601">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="customer/dataset" xsi:type="string">johndoe_with_addresses</data>
-             <data name="checkoutMethod" xsi:type="string">sign_in</data>
-@@ -65,7 +60,7 @@
-             <data name="shippingAddress/dataset" xsi:type="string">UK_address_without_email</data>
-             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
-             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
--            <data name="billingCheckboxState" xsi:type="string">Yes</data>
-+            <data name="editBillingInformation" xsi:type="boolean">false</data>
-             <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
-             <data name="payment/method" xsi:type="string">checkmo</data>
-             <data name="configData" xsi:type="string">checkmo</data>
-@@ -74,7 +69,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
-         </variation>
-         <variation name="OnePageCheckoutTestVariation11" summary="Checkout as Customer using default address" ticketId="MAGETWO-42600, MAGETWO-42546">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="customer/dataset" xsi:type="string">customer_UK_US_addresses</data>
-             <data name="checkoutMethod" xsi:type="string">login</data>
-@@ -96,7 +91,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
-         </variation>
-         <variation name="OnePageCheckoutTestVariation10" summary="One Page Checkout with all product types" ticketId="MAGETWO-17475">
--            <data name="tag" xsi:type="string">severity:S0</data>
-+            <data name="tag" xsi:type="string">severity:S0, mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">catalogProductVirtual::default</data>
-             <data name="products/1" xsi:type="string">downloadableProduct::with_two_separately_links</data>
-             <data name="products/2" xsi:type="string">configurableProduct::with_one_option</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.php
-index bdd54ce3559..7365195d0cd 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.php
-@@ -95,7 +95,7 @@ class ShoppingCartPerCustomerTest extends Injectable
- 
-         $customers = [];
-         $cartFixtures = [];
--        for ($i = 0; $i < count($checkoutData); $i++) {
-+        for ($i = 0, $count = count($checkoutData); $i < $count; $i++) {
-             $customers[$i] = $this->fixtureFactory->createByCode('customer', ['dataset' => $customerDataset]);
-             $customers[$i]->persist();
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.xml
-index abdcfc2de33..cd6a9559e31 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Checkout\Test\TestCase\ShoppingCartPerCustomerTest" summary="Shopping Cart and Mini Shopping Cart per Customer with enabled cached" ticketId="MAGETWO-37214">
-         <variation name="ShoppingCartPerCustomerTestVariation1" summary="Shopping Cart and Mini Shopping Cart per Customer with enabled cached" ticketId="MAGETWO-37214">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="productsData/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="productsData/1" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
-             <data name="customerDataset" xsi:type="string">johndoe_unique_firstname</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
-index 5935a68c43c..af267cfa30e 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
-@@ -115,6 +115,7 @@ class UpdateProductFromMiniShoppingCartEntityTest extends Injectable
-         } else {
-             $miniShoppingCart->getCartItem($newProduct)->clickEditItem();
-             $this->catalogProductView->getViewBlock()->addToCart($newProduct);
-+            $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
-         }
-         // Prepare data for asserts:
-         $cart['data']['items'] = ['products' => [$newProduct]];
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
-index 3177f0fbccc..4b99de09f2a 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
-@@ -8,7 +8,8 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Checkout\Test\TestCase\UpdateProductFromMiniShoppingCartEntityTest" summary="Update Product from Mini Shopping Cart" ticketId="MAGETWO-29812">
-         <variation name="UpdateProductFromMiniShoppingCartEntityTestVariation1" summary="Update Product Qty on Mini Shopping Cart" ticketId=" MAGETWO-35536">
--            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S0</data>
-+            <data name="issue" xsi:type="string">https://github.com/magento-engcom/msi/issues/1624</data>
-+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S0, mftf_migrated:yes</data>
-             <data name="originalProduct/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="checkoutData/dataset" xsi:type="string">simple_order_qty_2</data>
-             <data name="use_minicart_to_edit_qty" xsi:type="boolean">true</data>
-@@ -25,7 +26,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCustomerIsRedirectedToCheckoutFromCart" />
-         </variation>
-         <variation name="UpdateProductFromMiniShoppingCartEntityTestVariation2" summary="Update Configurable and verify previous product was updated to new one in shopping cart and mini shopping cart">
--            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes, severity:S0</data>
-+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S0</data>
-             <data name="originalProduct/0" xsi:type="string">configurableProduct::default</data>
-             <data name="checkoutData/dataset" xsi:type="string">configurable_update_mini_shopping_cart</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
-@@ -34,7 +35,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertProductOptionsAbsentInShoppingCart" />
-         </variation>
-         <variation name="UpdateProductFromMiniShoppingCartEntityTestVariation3" summary="Update Bundle and verify previous product was updated to new one in shopping cart and mini shopping cart">
--            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes, severity:S0</data>
-+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S0</data>
-             <data name="originalProduct/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
-             <data name="checkoutData/dataset" xsi:type="string">bundle_update_mini_shopping_cart</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
-@@ -43,7 +44,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertProductOptionsAbsentInShoppingCart" />
-         </variation>
-         <variation name="UpdateProductFromMiniShoppingCartEntityTestVariation4" summary="Update Downloadable and check previous link was updated to new one in shopping cart and mini shopping cart">
--            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes, severity:S1</data>
-+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S1</data>
-             <data name="originalProduct/0" xsi:type="string">downloadableProduct::with_two_separately_links</data>
-             <data name="checkoutData/dataset" xsi:type="string">downloadable_update_mini_shopping_cart</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
-@@ -52,7 +53,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertProductOptionsAbsentInShoppingCart" />
-         </variation>
-         <variation name="UpdateProductFromMiniShoppingCartEntityTestVariation5" summary="Update Virtual product in mini shopping cart">
--            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes, severity:S1</data>
-+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S1</data>
-             <data name="originalProduct/0" xsi:type="string">catalogProductVirtual::default</data>
-             <data name="checkoutData/dataset" xsi:type="string">virtual_update_mini_shopping_cart</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertProductDataInMiniShoppingCart" />
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml
-index e0ea721a51f..5caa3ba9b92 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Checkout\Test\TestCase\UpdateShoppingCartTest" summary="Update Shopping Cart" ticketId="MAGETWO-25081">
-         <variation name="UpdateShoppingCartTestVariation1">
--            <data name="tag" xsi:type="string">severity:S0</data>
-+            <data name="tag" xsi:type="string">severity:S0,mftf_migrated:yes</data>
-             <data name="product/dataset" xsi:type="string">default</data>
-             <data name="product/data/price/value" xsi:type="string">100</data>
-             <data name="product/data/checkout_data/qty" xsi:type="string">3</data>
-@@ -20,7 +20,7 @@
-             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInShoppingCart" />
-         </variation>
-         <variation name="UpdateShoppingCartTestVariation2">
--            <data name="tag" xsi:type="string">severity:S0</data>
-+            <data name="tag" xsi:type="string">severity:S0,mftf_migrated:yes</data>
-             <data name="product/dataset" xsi:type="string">with_two_custom_option</data>
-             <data name="product/data/price/value" xsi:type="string">50</data>
-             <data name="product/data/checkout_data/qty" xsi:type="string">11</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ValidateEmailOnCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ValidateEmailOnCheckoutTest.xml
-index 90c42505585..8290d825593 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ValidateEmailOnCheckoutTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ValidateEmailOnCheckoutTest.xml
-@@ -10,17 +10,20 @@
-         <variation name="ValidateEmailOnCheckoutTestVariation1">
-             <data name="customer/data/email" xsi:type="string">johndoe</data>
-             <data name="customer/data/firstname" xsi:type="string">John</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertEmailErrorValidationMessage" />
-             <constraint name="Magento\Checkout\Test\Constraint\AssertEmailToolTips" />
-         </variation>
-         <variation name="ValidateEmailOnCheckoutTestVariation2">
-             <data name="customer/data/email" xsi:type="string">johndoe#example.com</data>
-             <data name="customer/data/firstname" xsi:type="string">John</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertEmailErrorValidationMessage" />
-         </variation>
-         <variation name="ValidateEmailOnCheckoutTestVariation3">
-             <data name="customer/data/email" xsi:type="string">johndoe@example.c</data>
-             <data name="customer/data/firstname" xsi:type="string">John</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertEmailErrorValidationMessage" />
-         </variation>
-     </testCase>
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
-index aa7eba63414..52b296c2e01 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
-@@ -126,11 +126,15 @@ class FillBillingInformationStep implements TestStepInterface
-         if ($this->billingCheckboxState) {
-             $this->assertBillingAddressCheckbox->processAssert($this->checkoutOnepage, $this->billingCheckboxState);
-         }
--        if ($this->billingCheckboxState === 'Yes' && !$this->editBillingInformation) {
--            return [
--                'billingAddress' => $this->shippingAddress
--            ];
-+
-+        if (!$this->editBillingInformation) {
-+            $billingAddress = $this->billingCheckboxState === 'Yes'
-+                ? $this->shippingAddress
-+                : $this->getDefaultBillingAddress();
-+
-+            return ['billingAddress' => $billingAddress];
-         }
-+
-         if ($this->billingAddress) {
-             $selectedPaymentMethod = $this->checkoutOnepage->getPaymentBlock()->getSelectedPaymentMethodBlock();
-             if ($this->shippingAddress) {
-@@ -139,9 +143,11 @@ class FillBillingInformationStep implements TestStepInterface
-             $selectedPaymentMethod->getBillingBlock()->fillBilling($this->billingAddress);
-             $billingAddress = $this->billingAddress;
-         }
-+
-         if (isset($this->billingAddressCustomer['added'])) {
-             $addressIndex = $this->billingAddressCustomer['added'];
--            $billingAddress = $this->customer->getDataFieldConfig('address')['source']->getAddresses()[$addressIndex];
-+            $billingAddress = $this->customer->getDataFieldConfig('address')['source']
-+                ->getAddresses()[$addressIndex];
-             $address = $this->objectManager->create(
-                 \Magento\Customer\Test\Block\Address\Renderer::class,
-                 ['address' => $billingAddress, 'type' => 'html_for_select_element']
-@@ -156,4 +162,25 @@ class FillBillingInformationStep implements TestStepInterface
-             'billingAddress' => $billingAddress
-         ];
-     }
-+
-+    /**
-+     * Get default billing address
-+     *
-+     * @return Address|null
-+     */
-+    private function getDefaultBillingAddress()
-+    {
-+        $addresses = $this->customer->hasData('address')
-+            ? $this->customer->getDataFieldConfig('address')['source']->getAddresses()
-+            : [];
-+        $defaultAddress = null;
-+        foreach ($addresses as $address) {
-+            if ($address->getDefaultBilling() === 'Yes') {
-+                $defaultAddress = $address;
-+                break;
-+            }
-+        }
-+
-+        return $defaultAddress;
-+    }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
-index d951d84bab7..f79cf8d7eb7 100644
---- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
-+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
-@@ -59,6 +59,13 @@ class SelectCheckoutMethodStep implements TestStepInterface
-      */
-     private $customerAccountCreatePage;
- 
-+    /**
-+     * Proceed to checkout from minicart step
-+     *
-+     * @var proceedToCheckoutFromMiniShoppingCartStep
-+     */
-+    private $proceedToCheckoutFromMiniShoppingCartStep;
-+
-     /**
-      * @constructor
-      * @param CheckoutOnepage $checkoutOnepage
-@@ -66,6 +73,7 @@ class SelectCheckoutMethodStep implements TestStepInterface
-      * @param Customer $customer
-      * @param LogoutCustomerOnFrontendStep $logoutCustomerOnFrontend
-      * @param ClickProceedToCheckoutStep $clickProceedToCheckoutStep
-+     * @param ProceedToCheckoutFromMiniShoppingCartStep $proceedToCheckoutFromMiniShoppingCartStep
-      * @param string $checkoutMethod
-      */
-     public function __construct(
-@@ -74,6 +82,7 @@ class SelectCheckoutMethodStep implements TestStepInterface
-         Customer $customer,
-         LogoutCustomerOnFrontendStep $logoutCustomerOnFrontend,
-         ClickProceedToCheckoutStep $clickProceedToCheckoutStep,
-+        ProceedToCheckoutFromMiniShoppingCartStep $proceedToCheckoutFromMiniShoppingCartStep,
-         $checkoutMethod
-     ) {
-         $this->checkoutOnepage = $checkoutOnepage;
-@@ -82,6 +91,7 @@ class SelectCheckoutMethodStep implements TestStepInterface
-         $this->logoutCustomerOnFrontend = $logoutCustomerOnFrontend;
-         $this->clickProceedToCheckoutStep = $clickProceedToCheckoutStep;
-         $this->checkoutMethod = $checkoutMethod;
-+        $this->proceedToCheckoutFromMiniShoppingCartStep = $proceedToCheckoutFromMiniShoppingCartStep;
-     }
- 
-     /**
-@@ -129,6 +139,7 @@ class SelectCheckoutMethodStep implements TestStepInterface
-         if ($this->checkoutMethod === 'register_before_checkout') {
-             $this->checkoutOnepage->getAuthenticationPopupBlock()->createAccount();
-             $this->customerAccountCreatePage->getRegisterForm()->registerCustomer($this->customer);
-+            $this->proceedToCheckoutFromMiniShoppingCartStep->run();
-         }
-     }
- 
-diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.xml
-index f98f9ca7cfe..95d99f9fa76 100644
---- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.xml
-+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.xml
-@@ -18,7 +18,7 @@
-             <input>select</input>
-         </mode>
-         <stores>
--            <selector>[name="stores[]"]</selector>
-+            <selector>[name="stores[0]"]</selector>
-             <input>multiselectgrouplist</input>
-         </stores>
-         <checkbox_text />
-diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml
-index d304d305a72..a266b09278d 100644
---- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml
-+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml
-@@ -7,6 +7,6 @@
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
-     <page name="MultishippingCheckoutOverview" mca="multishipping/checkout/overview" module="Magento_Checkout">
--        <block name="agreementReview" class="Magento\CheckoutAgreements\Test\Block\Multishipping\MultishippingAgreementReview" locator="#checkout-agreements" strategy="css selector"/>
-+        <block name="agreementReview" class="Magento\CheckoutAgreements\Test\Block\Multishipping\MultishippingAgreementReview" locator=".checkout-agreements" strategy="css selector"/>
-     </page>
- </config>
-diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/NavigateMenuTest.xml
-index 18cbf32ded5..3458e2944a9 100644
---- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/NavigateMenuTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest17">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Stores > Terms and Conditions</data>
-             <data name="pageTitle" xsi:type="string">Terms and Conditions</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.php
-index 0b7c31a0922..c08ea7aa9e2 100644
---- a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.php
-+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.php
-@@ -87,7 +87,7 @@ class PageForm extends FormTabs
-         if ($tabHeader->isVisible() && strpos($tabHeader->getAttribute('class'), '_show') === false) {
-             $tabHeader->hover();
-             $tabHeader->click();
--        };
-+        }
-         return $this;
-     }
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsPage.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsPage.xml
-index 22d29eae165..1a7adcd531c 100644
---- a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsPage.xml
-+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsPage.xml
-@@ -7,6 +7,6 @@
-  -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
-     <page name="CmsPage" mca="cms/page" module="Magento_Cms">
--        <block name="cmsPageBlock" class="Magento\Cms\Test\Block\Page" locator=".page-main" strategy="css selector" />
-+        <block name="cmsPageBlock" class="Magento\Cms\Test\Block\Page" locator="#maincontent" strategy="css selector" />
-     </page>
- </config>
-diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CmsPageMassActionTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CmsPageMassActionTest.xml
-index d032ef47823..68cdf5ba7b4 100644
---- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CmsPageMassActionTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CmsPageMassActionTest.xml
-@@ -12,6 +12,7 @@
-             <data name="cmsPages/1" xsi:type="string">3_column_template</data>
-             <data name="action" xsi:type="string">Disable</data>
-             <data name="expectedStatus" xsi:type="string">Disabled</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Cms\Test\Constraint\AssertCmsPagesInGrid" />
-             <constraint name="Magento\Cms\Test\Constraint\AssertCmsPagesDisabledOnFrontend" />
-         </variation>
-diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml
-index 72a76dacc32..06fe76c5efd 100644
---- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Cms\Test\TestCase\CreateCmsPageEntityMultipleStoreViewsTest" summary="Page cache for different CMS pages on multiple store views" ticketId="MAGETWO-52467">
-         <variation name="CreateCmsPageEntityMultipleStoreViewsTestVariation1">
-+            <data name="issue" xsi:type="string">MC-13801: Test "Page cache for different CMS pages on multiple store views" fails on Jenkins</data>
-             <data name="cmsPages/0/is_active" xsi:type="string">Yes</data>
-             <data name="cmsPages/0/title" xsi:type="string">NewCmsPage</data>
-             <data name="cmsPages/0/store_id/dataset" xsi:type="string">default</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCustomUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCustomUrlRewriteEntityTest.xml
-index 3682fce4267..8adbc1ae46c 100644
---- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCustomUrlRewriteEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCustomUrlRewriteEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\UrlRewrite\Test\TestCase\CreateCustomUrlRewriteEntityTest" summary="Create Custom URL Rewrites" ticketId="MAGETWO-25474">
-         <variation name="CreateCustomUrlRewriteEntityTestVariation3">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="urlRewrite/data/entity_type" xsi:type="string">Custom</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
-@@ -19,7 +19,7 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCustomRedirect" />
-         </variation>
-         <variation name="CreateCustomUrlRewriteEntityTestVariation4">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="urlRewrite/data/entity_type" xsi:type="string">Custom</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/NavigateMenuTest.xml
-index f9f0a11c0a4..cff5f7f2a56 100644
---- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/NavigateMenuTest.xml
-@@ -8,13 +8,13 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest18">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Content > Pages</data>
-             <data name="pageTitle" xsi:type="string">Pages</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest19">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Content > Blocks</data>
-             <data name="pageTitle" xsi:type="string">Blocks</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Config/Test/Handler/ConfigData/Curl.php b/dev/tests/functional/tests/app/Magento/Config/Test/Handler/ConfigData/Curl.php
-index 66587879848..0d89a1d4eba 100644
---- a/dev/tests/functional/tests/app/Magento/Config/Test/Handler/ConfigData/Curl.php
-+++ b/dev/tests/functional/tests/app/Magento/Config/Test/Handler/ConfigData/Curl.php
-@@ -123,9 +123,9 @@ class Curl extends AbstractCurl implements ConfigDataInterface
-      */
-     protected function applyConfigSettings(array $data, $section)
-     {
--        $url = $this->getUrl($section);
-         $curl = new BackendDecorator(new CurlTransport(), $this->_configuration);
-         $curl->addOption(CURLOPT_HEADER, 1);
-+        $url = $this->getUrl($section);
-         $curl->write($url, $data);
-         $response = $curl->read();
-         $curl->close();
-diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml
-index c157f5c58d4..0a2ce7ab7f1 100644
---- a/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml
-@@ -7,7 +7,8 @@
-  -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\CatalogImportExport\Test\TestCase\ExportProductsTest" summary="Export products">
--        <variation name="ExportProductsTestVariation1" summary="Export simple product and configured products with assigned images" ticketId="MAGETWO-46112">
-+        <variation name="ExportProductsTestVariation7" summary="Export simple product and configured products with assigned images" ticketId="MAGETWO-46112">
-+            <data name="exportData" xsi:type="string">default</data>
-             <data name="products/1" xsi:type="array">
-                 <item name="fixture" xsi:type="string">configurableProduct</item>
-                 <item name="dataset" xsi:type="string">product_with_size</item>
-@@ -18,19 +19,48 @@
-                     </item>
-                 </item>
-             </data>
-+            <data name="exportedFields" xsi:type="array">
-+                <item name="0" xsi:type="string">sku</item>
-+                <item name="1" xsi:type="string">name</item>
-+                <item name="2" xsi:type="string">weight</item>
-+                <item name="3" xsi:type="string">visibility</item>
-+                <item name="4" xsi:type="string">price</item>
-+                <item name="5" xsi:type="string">url_key</item>
-+                <item name="6" xsi:type="string">additional_images</item>
-+            </data>
-         </variation>
--        <variation name="ExportProductsTestVariation2" summary="Export simple and configured products with custom options" ticketId="MAGETWO-46113, MAGETWO-46109">
-+        <variation name="ExportProductsTestVariation8" summary="Export simple and configured products with custom options" ticketId="MAGETWO-46113, MAGETWO-46109">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="exportData" xsi:type="string">default</data>
-             <data name="products/1" xsi:type="array">
-                 <item name="fixture" xsi:type="string">configurableProduct</item>
-                 <item name="dataset" xsi:type="string">first_product_with_custom_options_and_option_key_1</item>
-             </data>
-+            <data name="exportedFields" xsi:type="array">
-+                <item name="0" xsi:type="string">sku</item>
-+                <item name="1" xsi:type="string">name</item>
-+                <item name="2" xsi:type="string">weight</item>
-+                <item name="3" xsi:type="string">visibility</item>
-+                <item name="4" xsi:type="string">price</item>
-+                <item name="5" xsi:type="string">url_key</item>
-+            </data>
-         </variation>
--        <variation name="ExportProductsTestVariation5" summary="Export simple product assigned to Main Website and configurable product assigned to Custom Website" ticketId="MAGETWO-46114">
-+        <variation name="ExportProductsTestVariation9" summary="Export simple product assigned to Main Website and configurable product assigned to Custom Website" ticketId="MAGETWO-46114">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="exportData" xsi:type="string">default</data>
-             <data name="products/1" xsi:type="array">
-                 <item name="fixture" xsi:type="string">configurableProduct</item>
-                 <item name="dataset" xsi:type="string">default</item>
-                 <item name="store" xsi:type="string">custom_store</item>
-             </data>
-+            <data name="exportedFields" xsi:type="array">
-+                <item name="0" xsi:type="string">sku</item>
-+                <item name="1" xsi:type="string">name</item>
-+                <item name="2" xsi:type="string">weight</item>
-+                <item name="3" xsi:type="string">visibility</item>
-+                <item name="4" xsi:type="string">price</item>
-+                <item name="5" xsi:type="string">url_key</item>
-+            </data>
-         </variation>
-     </testCase>
- </config>
-diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml
-index a66753c2adf..d89fb3ddf88 100644
---- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml
-+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml
-@@ -7,9 +7,8 @@
- -->
- <mapping strict="0">
-     <fields>
--        <qty />
-         <attribute>
--            <selector>//div[@class="product-options"]//label[.="%s"]//following-sibling::*//select</selector>
-+            <selector>//div[contains(@class, "product-options")]//div//label[.="%s"]//following-sibling::*//select</selector>
-             <strategy>xpath</strategy>
-             <input>select</input>
-         </attribute>
-diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
-index 02cb304325c..c50f0e338c2 100644
---- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
-+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
-@@ -70,7 +70,7 @@ class AssertConfigurableProductDuplicateForm extends AssertConfigurableProductFo
-     protected function prepareUrlKey($urlKey)
-     {
-         preg_match("~\d+$~", $urlKey, $matches);
--        $key = intval($matches[0]) + 1;
-+        $key = (int)$matches[0] + 1;
-         return str_replace($matches[0], $key, $urlKey);
-     }
- 
-diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
-index e1b6fcf47e5..f831173ba0a 100644
---- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\ConfigurableProduct\Test\TestCase\CreateConfigurableProductEntityTest" summary="Create Configurable Product" ticketId="MAGETWO-26041">
-         <variation name="CreateConfigurableProductEntityTestVariation1" summary="Create product with category and two new options">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_new_options</data>
-             <data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_options</data>
-@@ -32,6 +33,7 @@
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately"/>
-         </variation>
-         <variation name="CreateConfigurableProductEntityTestVariation2" summary="Create product with two options">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options</data>
-             <data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_options</data>
-@@ -97,6 +99,7 @@
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductInCart" />
-         </variation>
-         <variation name="CreateConfigurableProductEntityTestVariation5" summary="Create Configurable Product and Assign it to Category" ticketId="MAGETWO-12620">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options_with_fixed_price</data>
-             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
-@@ -113,7 +116,7 @@
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductPage" />
-         </variation>
-         <variation name="CreateConfigurableProductEntityTestVariation6" summary="Create Configurable Product with Creating New Category and New Attribute (Required Fields Only)" ticketId="MAGETWO-13361">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_searchable_options</data>
-             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
-@@ -129,6 +132,7 @@
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductPage" />
-         </variation>
-         <variation name="CreateConfigurableProductEntityTestVariation7" summary="Verify that variation's SKU based on parent SKU">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_new_options_with_empty_sku</data>
-             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
-@@ -137,6 +141,7 @@
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsGeneratedSku" />
-         </variation>
-         <variation name="CreateConfigurableProductEntityTestVariation8" summary="Assert notice that existing sku automatically changed when saving product with same sku">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_new_options_with_parent_sku</data>
-             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">existing_sku</data>
-@@ -145,6 +150,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAutoincrementedSkuNoticeMessage" />
-         </variation>
-         <variation name="CreateConfigurableProductEntityTestVariation9" summary="Create configurable product and assign it to custom website">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options_with_assigned_product_special_price</data>
-             <data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_new_options_with_special_price</data>
-@@ -156,6 +162,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductOnCustomWebsite" />
-         </variation>
-         <variation name="CreateConfigurableProductEntityTestVariation10" summary="Create configurable product with tier price for one item">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options_with_assigned_product_tier_price</data>
-             <data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_new_options_with_special_price</data>
-@@ -170,7 +177,7 @@
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertProductTierPriceOnProductPage" />
-         </variation>
-         <variation name="CreateConfigurableProductEntityTestVariation11" summary="Create Configurable Product with out of stock child" ticketId="MAGETWO-65660">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">with_out_of_stock_item</data>
-             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
-@@ -189,7 +196,7 @@
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductOutOfStockPage" />
-         </variation>
-         <variation name="CreateConfigurableProductEntityTestVariation12" summary="Create Configurable Product with disabled child" ticketId="MAGETWO-65661">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">with_disabled_item</data>
-             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
-@@ -207,7 +214,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductNotVisibleInCategory" />
-         </variation>
-         <variation name="CreateConfigurableProductEntityTestVariation13" summary="Create Configurable Product with one disabled child and with one out of stock child" ticketId="MAGETWO-65662">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">with_one_disabled_item_and_one_out_of_stock_item</data>
-             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
-@@ -225,6 +232,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
-         </variation>
-         <variation name="CreateConfigurableProductEntityTestVariation14" summary="Create configurable product with images" ticketId="MAGETWO-41354">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">color_and_size_with_images</data>
-             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
-@@ -238,6 +246,7 @@
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductImages" />
-         </variation>
-         <variation name="CreateConfigurableProductEntityTestVariation15" summary="Create Configurable Product with 1 out of stock and several in stock options with displaying out of stock ones" ticketId="MAGETWO-89274">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">three_new_options_with_out_of_stock_product</data>
-             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
-@@ -254,6 +263,7 @@
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertOutOfStockOptionIsAbsentOnProductPage" />
-         </variation>
-         <variation name="CreateConfigurableProductEntityTestVariation16" summary="Create Configurable Product with 1 out of stock and several in stock options" ticketId="MAGETWO-69508">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">three_new_options_with_out_of_stock_product</data>
-             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateCreditMemoEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateCreditMemoEntityTest.xml
-index 70bbd95218a..e3225cb15bd 100644
---- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateCreditMemoEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateCreditMemoEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Sales\Test\TestCase\CreateCreditMemoEntityTest" summary="Create Credit Memo for Offline Payment Methods" ticketId="MAGETWO-59074">
-         <variation name="CreateCreditMemoEntityWithConfigurableTestVariation1" summary="Creditmemo return to stock only one unit of configurable product" ticketId="MAGETWO-59479">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/data/refund" xsi:type="array">
-                 <item name="0" xsi:type="array">
-                     <item name="invoiceId" xsi:type="string">0</item>
-diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteChildConfigurableProductTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteChildConfigurableProductTest.xml
-index 435d5aad463..64f9141fba9 100644
---- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteChildConfigurableProductTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteChildConfigurableProductTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\ConfigurableProduct\Test\TestCase\DeleteChildConfigurableProductTest" summary="Configurable Product is not available on frontend after child products are deleted" ticketId="MAGETWO-70346">
-         <variation name="DeleteChildConfigurableProductTestVariation1" summary="Verify that variation's SKU based on parent SKU">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
-             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_new_options_with_empty_sku</data>
-             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductEntityTest.xml
-index 25f31b23fa6..68dc1ecbe78 100644
---- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\DeleteProductEntityTest">
-         <variation name="DeleteProductEntityTestVariation9">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products" xsi:type="string">configurableProduct::default</data>
-             <data name="isRequired" xsi:type="string">Yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
-@@ -15,6 +16,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductIsNotDisplayingOnFrontend" />
-         </variation>
-         <variation name="DeleteProductEntityTestVariation10">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products" xsi:type="string">configurableProduct::with_one_option</data>
-             <data name="isRequired" xsi:type="string">Yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
-diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
-index 2d00317b61b..042c4d45cac 100644
---- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
-@@ -10,6 +10,7 @@
-         <variation name="DeleteConfigurableProductFromMiniShoppingCartTestVariation">
-             <data name="products/0" xsi:type="string">configurableProduct::default</data>
-             <data name="deletedProductIndex" xsi:type="string">0</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
-         </variation>
-     </testCase>
-diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
-index c7d66781738..bb88bc854f7 100644
---- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
-+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
-@@ -32,7 +32,6 @@ class UpdateConfigurableProductEntityTest extends Scenario
- {
-     /* tags */
-     const MVP = 'yes';
--    const TO_MAINTAIN = 'yes';
-     /* end tags */
- 
-     /**
-diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml
-index a62bcf92ebf..5af854cae54 100644
---- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\ValidateOrderOfProductTypeTest">
-         <variation name="ValidateOrderOfProductTypeTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menu/1" xsi:type="string">Configurable Product</data>
-         </variation>
-     </testCase>
-diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductEntityPriceTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductEntityPriceTest.xml
-index 6d22cea4689..d576e760179 100644
---- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductEntityPriceTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductEntityPriceTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\ConfigurableProduct\Test\TestCase\VerifyConfigurableProductEntityPriceTest" summary="Verify price for configurable product">
-         <variation name="VerifyConfigurableProductEntityPriceTestVariation1" summary="Disable child product" ticketId="MAGETWO-60196">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product" xsi:type="string">configurableProduct::product_with_color</data>
-             <data name="productUpdate/childProductUpdate" xsi:type="array">
-                 <item name="data" xsi:type="array">
-@@ -19,6 +20,7 @@
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductPage" />
-         </variation>
-         <variation name="VerifyConfigurableProductEntityPriceTestVariation2" summary="Set child product Out of stock" ticketId="MAGETWO-60206">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product" xsi:type="string">configurableProduct::product_with_color</data>
-             <data name="productUpdate/childProductUpdate" xsi:type="array">
-                 <item name="data" xsi:type="array">
-diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductLayeredNavigationTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductLayeredNavigationTest.xml
-index 082b93ba62e..9108b44a0e8 100644
---- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductLayeredNavigationTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductLayeredNavigationTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\ConfigurableProduct\Test\TestCase\VerifyConfigurableProductLayeredNavigationTest" summary="Verify OOS option configurable product in Layered Navigation on storefront">
-         <variation name="VerifyConfigurableProductLayeredNavigationTestVariation1" summary="Verify the out of stock configurable attribute option doesn't show in Layered navigation" ticketId="MAGETWO-89745">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product" xsi:type="string">configurableProduct::product_with_3_sizes</data>
-             <data name="productUpdate/childProductUpdate" xsi:type="array">
-                 <item name="data" xsi:type="array">
-diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/NavigateMenuTest.xml
-index 0a061eb4be6..fc031a77ff5 100644
---- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/NavigateMenuTest.xml
-@@ -8,11 +8,13 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest20">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Stores > Currency Rates</data>
-             <data name="pageTitle" xsi:type="string">Currency Rates</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest21">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Stores > Currency Symbols</data>
-             <data name="pageTitle" xsi:type="string">Currency Symbols</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
-index cba358549c3..13ef742d062 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
-@@ -20,14 +20,14 @@ class AddressesAdditional extends Block
-      *
-      * @var string
-      */
--    protected $addressSelector = '//li[address[contains(.,"%s")]]';
-+    protected $addressSelector = '//tbody//tr[contains(.,"%s")]';
- 
-     /**
-      * Selector for addresses block
-      *
-      * @var string
-      */
--    protected $addressesSelector = '//li[address]';
-+    protected $addressesSelector = '.additional-addresses';
- 
-     /**
-      * Selector for delete link
-@@ -74,16 +74,19 @@ class AddressesAdditional extends Block
-      */
-     public function isAdditionalAddressExists($address)
-     {
--        $additionalAddressExists = false;
--
--        $addresses = $this->_rootElement->getElements($this->addressesSelector, Locator::SELECTOR_XPATH);
--        foreach ($addresses as $addressBlock) {
--            if (strpos($addressBlock->getText(), $address) === 0) {
--                $additionalAddressExists = $addressBlock->isVisible();
-+        $addressExists = true;
-+        foreach (explode("\n", $address) as $addressItem) {
-+            $addressElement = $this->_rootElement->find(
-+                sprintf($this->addressSelector, $addressItem),
-+                Locator::SELECTOR_XPATH
-+            );
-+            if (!$addressElement->isVisible()) {
-+                $addressExists = false;
-                 break;
-             }
-         }
--        return $additionalAddressExists;
-+
-+        return $addressExists;
-     }
- 
-     /**
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php
-index 1ef9267e737..7d2e9e748c5 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php
-@@ -72,6 +72,7 @@ class AuthenticationPopup extends Form
-         sleep(10);
-         $this->fill($customer);
-         $this->_rootElement->find($this->login)->click();
-+        sleep(10);
-         $this->waitForElementNotVisible($this->loadingMask);
-     }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Renderer.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Renderer.php
-index f9a3989d8f5..8d8a0cfe5ea 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Renderer.php
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Renderer.php
-@@ -58,6 +58,11 @@ class Renderer
-                     . "{{lastname}}{{depend}} {{suffix}}{{/depend}}\n{{/depend}}{{street}}\n"
-                     . "{{city}}, {{{$region}}} {{postcode}}\n{{country_id}}\n{{depend}}{{telephone}}{{/depend}}";
-                 break;
-+            case "html_without_company_separated_names":
-+                $outputPattern = "{{depend}}{{prefix}}\n{{/depend}}{{firstname}}\n{{depend}}{{middlename}}\n{{/depend}}"
-+                    . "{{lastname}}{{depend}}\n{{suffix}}{{/depend}}\n{{/depend}}{{street}}\n"
-+                    . "{{city}}\n{{{$region}}}\n{{postcode}}\n{{country_id}}\n{{depend}}{{telephone}}{{/depend}}";
-+                break;
-             case "html_for_select_element":
-                 $outputPattern = "{{depend}}{{prefix}} {{/depend}}{{firstname}} {{depend}}{{middlename}} {{/depend}}"
-                     . "{{lastname}}{{depend}} {{suffix}}{{/depend}}, {{/depend}}{{street}}, "
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
-index 83d86669aa8..f456635882e 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
-@@ -65,6 +65,7 @@ class CustomerForm extends FormTabs
-      * @param FixtureInterface $customer
-      * @param FixtureInterface|FixtureInterface[]|null $address
-      * @return $this
-+     * @throws \Exception
-      */
-     public function fillCustomer(FixtureInterface $customer, $address = null)
-     {
-@@ -76,12 +77,29 @@ class CustomerForm extends FormTabs
-         }
-         if (null !== $address) {
-             $this->openTab('addresses');
--            $this->getTab('addresses')->fillAddresses($address);
-+            $this->fillCustomerAddress($address);
-         }
- 
-         return $this;
-     }
- 
-+    /**
-+     * Fill customer address by provided in parameter data
-+     *
-+     * @param FixtureInterface|FixtureInterface[] $address
-+     * @return $this
-+     * @throws \Exception
-+     */
-+    public function fillCustomerAddress($address)
-+    {
-+        $addressesTab = $this->getTab('addresses');
-+        $this->openTab('addresses');
-+        $addressesTab->waitForAddressesGrid();
-+        $addressesTab->fillAddresses($address);
-+
-+        return $this;
-+    }
-+
-     /**
-      * Update Customer forms on tabs by customer, addresses data.
-      *
-@@ -98,13 +116,16 @@ class CustomerForm extends FormTabs
-         if ($isHasData) {
-             parent::fill($customer);
-         }
-+        $addressesTab = $this->getTab('addresses');
-         if ($addressToDelete !== null) {
-             $this->openTab('addresses');
--            $this->getTab('addresses')->deleteCustomerAddress($addressToDelete);
-+            $addressesTab->waitForAddressesGrid();
-+            $addressesTab->deleteCustomerAddress($addressToDelete);
-         }
-         if ($address !== null) {
-             $this->openTab('addresses');
--            $this->getTab('addresses')->updateAddresses($address);
-+            $addressesTab->waitForAddressesGrid();
-+            $addressesTab->updateAddresses($address);
-         }
- 
-         return $this;
-@@ -124,6 +145,9 @@ class CustomerForm extends FormTabs
-         $data = ['customer' => $customer->hasData() ? parent::getData($customer) : parent::getData()];
-         if (null !== $address) {
-             $this->openTab('addresses');
-+            $this->waitForElementNotVisible($this->tabReadiness);
-+            $this->waitForm();
-+            $this->getTab('addresses')->waitForAddressesGrid();
-             $data['addresses'] = $this->getTab('addresses')->getDataAddresses($address);
-         }
- 
-@@ -148,8 +172,10 @@ class CustomerForm extends FormTabs
-      */
-     public function openTab($tabName)
-     {
-+        $this->waitForElementNotVisible($this->tabReadiness);
-         parent::openTab($tabName);
-         $this->waitForElementNotVisible($this->tabReadiness);
-+        $this->waitForm();
- 
-         return $this;
-     }
-@@ -161,13 +187,10 @@ class CustomerForm extends FormTabs
-      */
-     public function getJsErrors()
-     {
--        $tabs = ['account_information', 'addresses'];
-         $jsErrors = [];
--        foreach ($tabs as $tabName) {
--            $tab = $this->getTab($tabName);
--            $this->openTab($tabName);
--            $jsErrors = array_merge($jsErrors, $tab->getJsErrors());
--        }
-+        $tab = $this->getTab('account_information');
-+        $this->openTab('account_information');
-+        $jsErrors = array_merge($jsErrors, $tab->getJsErrors());
-         return $jsErrors;
-     }
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
-index 86df3ea9121..99a79a8a4a8 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
-@@ -29,7 +29,7 @@ class Addresses extends Tab
-      *
-      * @var string
-      */
--    protected $addNewAddress = '.address-list-actions .add';
-+    protected $addNewAddress = '.add-new-address-button';
- 
-     /**
-      * Selector for address block.
-@@ -48,25 +48,32 @@ class Addresses extends Tab
-     protected $deleteAddress = '.action-delete';
- 
-     /**
--     * Accept button selector.
-+     * Open customer address.
-      *
-      * @var string
-      */
--    private $confirmModal = '.confirm._show[data-role=modal]';
-+    protected $customerAddress = '//*[contains(@class, "address-list-item")][%d]';
- 
-     /**
--     * Open customer address.
-+     * Magento loader.
-      *
-      * @var string
-      */
--    protected $customerAddress = '//*[contains(@class, "address-list-item")][%d]';
-+    protected $loader = '//ancestor::body/div[@data-role="loader"]';
- 
-     /**
--     * Magento loader.
-+     * Customer address modal window.
-      *
-      * @var string
-      */
--    protected $loader = '//ancestor::body/div[@data-role="loader"]';
-+    private $customerAddressModalForm = '.customer_form_areas_address_address_customer_address_update_modal';
-+
-+    /**
-+     * Customer addresses list grid.
-+     *
-+     * @var string
-+     */
-+    private $customerAddressesGrid = '.customer_form_areas_address_address_customer_address_listing';
- 
-     /**
-      * Object Manager.
-@@ -107,9 +114,11 @@ class Addresses extends Tab
-     public function fillAddresses($address)
-     {
-         $addresses = is_array($address) ? $address : [$address];
-+        $customerAddressForm = $this->getCustomerAddressModalForm();
-         foreach ($addresses as $address) {
-             $this->addNewAddress();
--            $this->setFieldsData($address->getData(), $this->_rootElement);
-+            $customerAddressForm->fillAddressData($address);
-+            $customerAddressForm->saveAddress();
-         }
- 
-         return $this;
-@@ -136,8 +145,9 @@ class Addresses extends Tab
- 
-             if (!$this->isVisibleCustomerAddress($addressNumber)) {
-                 $this->addNewAddress();
-+            } else {
-+                $this->openCustomerAddress($addressNumber);
-             }
--            $this->openCustomerAddress($addressNumber);
- 
-             $defaultAddress = ['default_billing' => 'No', 'default_shipping' => 'No'];
-             $addressData = $address->getData();
-@@ -146,9 +156,10 @@ class Addresses extends Tab
-                     $defaultAddress[$key] = $value;
-                 }
-             }
--            $this->_fill($this->dataMapping($defaultAddress));
--
--            $this->setFieldsData(array_diff($addressData, $defaultAddress), $this->_rootElement);
-+            $customerAddressForm = $this->getCustomerAddressModalForm();
-+            $customerAddressForm->setFieldsData($this->dataMapping($defaultAddress));
-+            $customerAddressForm->setFieldsData(array_diff($addressData, $defaultAddress));
-+            $customerAddressForm->saveAddress();
-         }
- 
-         return $this;
-@@ -168,6 +179,10 @@ class Addresses extends Tab
- 
-         foreach ($addresses as $addressNumber => $address) {
-             $hasData = (null !== $address) && $address->hasData();
-+            $customerAddressesGrid = $this->getCustomerAddressesGrid();
-+            if ($hasData) {
-+                $customerAddressesGrid->search($address->getData());
-+            }
-             $isVisibleCustomerAddress = $this->isVisibleCustomerAddress($addressNumber);
- 
-             if ($hasData && !$isVisibleCustomerAddress) {
-@@ -177,14 +192,36 @@ class Addresses extends Tab
-             if (!$hasData && !$isVisibleCustomerAddress) {
-                 $data[$addressNumber] = [];
-             } else {
--                $this->openCustomerAddress($addressNumber);
--                $data[$addressNumber] = $this->getData($address, $this->_rootElement);
-+                $customerAddressesGrid->openFirstRow();
-+                $data[$addressNumber] = $this->getCustomerAddressModalForm()
-+                    ->getData($address, $this->browser->find($this->customerAddressModalForm));
-+                $this->getCustomerAddressModalForm()->clickCancelButton();
-             }
-         }
- 
-         return $data;
-     }
- 
-+    /**
-+     * Get data from Customer addresses.
-+     *
-+     * @param FixtureInterface|FixtureInterface[]|null $address
-+     * @return array|null
-+     * @throws \Exception
-+     */
-+    public function getAddressFromFirstRow($address = null)
-+    {
-+        $customerAddressesGrid = $this->getCustomerAddressesGrid();
-+        $customerAddressesGrid->resetFilter();
-+        $customerAddressesGrid->openFirstRow();
-+        if ($this->getCustomerAddressModalForm()->isVisible()) {
-+            $address = $this->getCustomerAddressModalForm()
-+                ->getData($address, $this->browser->find($this->customerAddressModalForm));
-+        }
-+
-+        return $address;
-+    }
-+
-     /**
-      * Get data to fields on tab.
-      *
-@@ -206,6 +243,7 @@ class Addresses extends Tab
-     protected function addNewAddress()
-     {
-         $this->_rootElement->find($this->addNewAddress)->click();
-+        $this->waitForElementVisible($this->customerAddressModalForm);
-     }
- 
-     /**
-@@ -216,31 +254,24 @@ class Addresses extends Tab
-      */
-     protected function openCustomerAddress($addressNumber)
-     {
--        $addressTab = $this->_rootElement->find(
--            sprintf($this->customerAddress, $addressNumber),
--            Locator::SELECTOR_XPATH
--        );
--
--        if (!$addressTab->isVisible()) {
-+        $customerAddressesGrid = $this->getCustomerAddressesGrid();
-+        if (!$customerAddressesGrid->getFirstRow()->isVisible()) {
-             throw new \Exception("Can't open customer address #{$addressNumber}");
-         }
--        $addressTab->click();
-+        $customerAddressesGrid->openFirstRow();
-     }
- 
-     /**
-      * Check is visible customer address.
-      *
--     * @param int $addressNumber
-      * @return bool
-      */
--    protected function isVisibleCustomerAddress($addressNumber)
-+    protected function isVisibleCustomerAddress()
-     {
--        $addressTab = $this->_rootElement->find(
--            sprintf($this->customerAddress, $addressNumber),
--            Locator::SELECTOR_XPATH
--        );
-+        $customerAddressesGrid = $this->getCustomerAddressesGrid();
-+        $customerAddressesGrid->isFirstRowVisible();
- 
--        return $addressTab->isVisible();
-+        return $customerAddressesGrid->isFirstRowVisible();
-     }
- 
-     /**
-@@ -279,24 +310,43 @@ class Addresses extends Tab
-      */
-     public function deleteCustomerAddress(Address $addressToDelete)
-     {
--        $addressRenderer = $this->objectManager->create(
--            \Magento\Customer\Test\Block\Address\Renderer::class,
--            ['address' => $addressToDelete, 'type' => 'html']
--        );
--        $addressToDelete = $addressRenderer->render();
-+        $customerAddressesGrid = $this->getCustomerAddressesGrid();
-+        $customerAddressesGrid->deleteCustomerAddress($addressToDelete->getData());
- 
--        $dataList = explode("\n", $addressToDelete);
--        $dataList = implode("') and contains(.,'", $dataList);
-+        return $this;
-+    }
- 
--        $this->_rootElement
--            ->find(sprintf($this->addressSelector, $dataList), Locator::SELECTOR_XPATH)
--            ->find($this->deleteAddress)->click();
-+    /**
-+     * Get new/update customer address modal form.
-+     *
-+     * @return \Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses\AddressForm
-+     */
-+    public function getCustomerAddressModalForm()
-+    {
-+        return $this->blockFactory->create(
-+            \Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses\AddressForm::class,
-+            ['element' => $this->browser->find($this->customerAddressModalForm)]
-+        );
-+    }
- 
--        $element = $this->browser->find($this->confirmModal);
--        /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
--        $modal = $this->blockFactory->create(\Magento\Ui\Test\Block\Adminhtml\Modal::class, ['element' => $element]);
--        $modal->acceptAlert();
-+    /**
-+     * Get customer addresses grid.
-+     *
-+     * @return \Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses\AddressesGrid
-+     */
-+    public function getCustomerAddressesGrid()
-+    {
-+        return $this->blockFactory->create(
-+            \Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses\AddressesGrid::class,
-+            ['element' => $this->browser->find($this->customerAddressesGrid)]
-+        );
-+    }
- 
--        return $this;
-+    /**
-+     * Wait for addresses grid rendering
-+     */
-+    public function waitForAddressesGrid()
-+    {
-+        $this->waitForElementVisible($this->customerAddressesGrid);
-     }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml
-deleted file mode 100644
-index 8e16226adcc..00000000000
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml
-+++ /dev/null
-@@ -1,81 +0,0 @@
--<?xml version="1.0" ?>
--<!--
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
---->
--<mapping strict="0">
--    <fields>
--        <prefix>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[prefix]"]</selector>
--            <strategy>css selector</strategy>
--        </prefix>
--        <firstname>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[firstname]"]</selector>
--            <strategy>css selector</strategy>
--        </firstname>
--        <middlename>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[middlename]"]</selector>
--            <strategy>css selector</strategy>
--        </middlename>
--        <lastname>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[lastname]"]</selector>
--            <strategy>css selector</strategy>
--        </lastname>
--        <suffix>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[suffix]"]</selector>
--            <strategy>css selector</strategy>
--        </suffix>
--        <company>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[company]"]</selector>
--            <strategy>css selector</strategy>
--        </company>
--        <street>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[street][0]"]</selector>
--            <strategy>css selector</strategy>
--        </street>
--        <city>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[city]"]</selector>
--            <strategy>css selector</strategy>
--        </city>
--        <country_id>
--            <input>select</input>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[country_id]"]</selector>
--            <strategy>css selector</strategy>
--        </country_id>
--        <region_id>
--            <input>select</input>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[region_id]"]</selector>
--            <strategy>css selector</strategy>
--        </region_id>
--        <region>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[region]"]</selector>
--            <strategy>css selector</strategy>
--        </region>
--        <postcode>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[postcode]"]</selector>
--            <strategy>css selector</strategy>
--        </postcode>
--        <telephone>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[telephone]"]</selector>
--            <strategy>css selector</strategy>
--        </telephone>
--        <fax>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[fax]"]</selector>
--            <strategy>css selector</strategy>
--        </fax>
--        <vat_id>
--            <selector>.address-item-edit:not([style="display: none;"]) [name$="[vat_id]"]</selector>
--            <strategy>css selector</strategy>
--        </vat_id>
--        <default_billing>
--            <selector>.ui-state-active [name$="[default_billing]"]</selector>
--            <input>checkbox</input>
--        </default_billing>
--        <default_shipping>
--            <selector>.ui-state-active [name$="[default_shipping]"]</selector>
--            <input>checkbox</input>
--        </default_shipping>
--    </fields>
--</mapping>
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.php
-new file mode 100644
-index 00000000000..029836d2143
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.php
-@@ -0,0 +1,126 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses;
-+
-+use Magento\Mtf\Client\Locator;
-+use Magento\Mtf\Block\Form;
-+
-+/**
-+ * Create/Edit customer address.
-+ */
-+class AddressForm extends Form
-+{
-+    /**
-+     * Save address button
-+     *
-+     * @var string
-+     */
-+    protected $saveAddressButton = '#save';
-+
-+    /**
-+     * cancel button
-+     *
-+     * @var string
-+     */
-+    protected $cancelButton = '#cancel';
-+
-+    /**
-+     * Loader mask
-+     *
-+     * @var string
-+     */
-+    private $loader = '.popup-loading';
-+
-+    /**
-+     * Field with Mage error.
-+     *
-+     * @var string
-+     */
-+    private $mageErrorField = '//fieldset/*[contains(@class,"field ")][.//*[contains(@class,"error")]]';
-+
-+    /**
-+     * Fields label with mage error.
-+     *
-+     * @var string
-+     */
-+    private $mageErrorLabel = './/*[contains(@class,"label")]';
-+
-+    /**
-+     * Mage error text.
-+     *
-+     * @var string
-+     */
-+    private $mageErrorText = './/label[contains(@class,"error")]';
-+
-+    /**
-+     * Fill address form by provided data
-+     *
-+     * @param \Magento\Mtf\Fixture\FixtureInterface $address
-+     * @return void
-+     * @throws \Exception
-+     */
-+    public function fillAddressData(\Magento\Mtf\Fixture\FixtureInterface $address)
-+    {
-+        $this->waitForElementNotVisible($this->loader);
-+        $this->setFieldsData($address->getData(), $this->_rootElement);
-+    }
-+
-+    /**
-+     * Fill data into fields in the container.
-+     *
-+     * @param array $fields
-+     * @param \Magento\Mtf\Client\Element\SimpleElement|null $contextElement
-+     * @return void
-+     * @throws \Exception
-+     */
-+    public function setFieldsData(array $fields, \Magento\Mtf\Client\Element\SimpleElement $contextElement = null): void
-+    {
-+        $data = $this->dataMapping($fields);
-+        $this->_fill($data, $contextElement);
-+    }
-+
-+    /**
-+     * Save customer address
-+     *
-+     * @return void
-+     */
-+    public function saveAddress(): void
-+    {
-+        $this->_rootElement->find($this->saveAddressButton)->click();
-+        $this->waitForElementNotVisible($this->loader);
-+    }
-+
-+    /**
-+     * Close create/update address modal
-+     *
-+     * @return void
-+     */
-+    public function clickCancelButton(): void
-+    {
-+        $this->_rootElement->find($this->cancelButton)->click();
-+    }
-+
-+    /**
-+     * Get array of label => js error text.
-+     *
-+     * @return array
-+     */
-+    public function getJsErrors(): array
-+    {
-+        $data = [];
-+        $elements = $this->_rootElement->getElements($this->mageErrorField, Locator::SELECTOR_XPATH);
-+        foreach ($elements as $element) {
-+            $error = $element->find($this->mageErrorText, Locator::SELECTOR_XPATH);
-+            if ($error->isVisible()) {
-+                $label = $element->find($this->mageErrorLabel, Locator::SELECTOR_XPATH)->getText();
-+                $data[$label] = $error->getText();
-+            }
-+        }
-+        return $data;
-+    }
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.xml
-new file mode 100644
-index 00000000000..c56c6479dcb
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.xml
-@@ -0,0 +1,81 @@
-+<?xml version="1.0" ?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<mapping strict="0">
-+    <fields>
-+        <prefix>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="prefix"]</selector>
-+            <strategy>css selector</strategy>
-+        </prefix>
-+        <firstname>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="firstname"]</selector>
-+            <strategy>css selector</strategy>
-+        </firstname>
-+        <middlename>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="middlename"]</selector>
-+            <strategy>css selector</strategy>
-+        </middlename>
-+        <lastname>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="lastname"]</selector>
-+            <strategy>css selector</strategy>
-+        </lastname>
-+        <suffix>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="suffix"]</selector>
-+            <strategy>css selector</strategy>
-+        </suffix>
-+        <company>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="company"]</selector>
-+            <strategy>css selector</strategy>
-+        </company>
-+        <street>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="street[0]"]</selector>
-+            <strategy>css selector</strategy>
-+        </street>
-+        <city>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="city"]</selector>
-+            <strategy>css selector</strategy>
-+        </city>
-+        <country_id>
-+            <input>select</input>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="country_id"]</selector>
-+            <strategy>css selector</strategy>
-+        </country_id>
-+        <region_id>
-+            <input>select</input>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="region_id"]</selector>
-+            <strategy>css selector</strategy>
-+        </region_id>
-+        <region>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="region"]</selector>
-+            <strategy>css selector</strategy>
-+        </region>
-+        <postcode>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="postcode"]</selector>
-+            <strategy>css selector</strategy>
-+        </postcode>
-+        <telephone>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="telephone"]</selector>
-+            <strategy>css selector</strategy>
-+        </telephone>
-+        <fax>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="fax"]</selector>
-+            <strategy>css selector</strategy>
-+        </fax>
-+        <vat_id>
-+            <selector>.admin__fieldset:not([style="display: none;"]) [name="vat_id"]</selector>
-+            <strategy>css selector</strategy>
-+        </vat_id>
-+        <default_billing>
-+            <selector>.admin__fieldset:not([style="display: none;"]) input[name='default_billing']</selector>
-+            <input>switcher</input>
-+        </default_billing>
-+        <default_shipping>
-+            <selector>.admin__fieldset:not([style="display: none;"]) input[name='default_shipping']</selector>
-+            <input>switcher</input>
-+        </default_shipping>
-+    </fields>
-+</mapping>
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressesGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressesGrid.php
-new file mode 100644
-index 00000000000..ef1fb09c8f8
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressesGrid.php
-@@ -0,0 +1,174 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses;
-+
-+use Magento\Ui\Test\Block\Adminhtml\DataGrid;
-+
-+/**
-+ * Class AddressesGrid
-+ * Backend customer addresses grid
-+ *
-+ */
-+class AddressesGrid extends DataGrid
-+{
-+    /**
-+     * Locator value for link in action column
-+     *
-+     * @var string
-+     */
-+    protected $editLink = '//tr[@class="data-row"][1]//a[@data-action="item-edit"]';
-+
-+    /**
-+     * First row selector
-+     *
-+     * @var string
-+     */
-+    protected $firstRowSelector = '//tr[@class="data-row"][1]';
-+
-+    /**
-+     * Customer address grid loader.
-+     *
-+     * @var string
-+     */
-+    protected $loader = '.customer_form_areas_address_address_customer_address_listing [data-role="spinner"]';
-+
-+    /**
-+     * Filters array mapping
-+     *
-+     * @var array
-+     */
-+    protected $filters = [
-+        'firstname' => [
-+            'selector' => '.admin__data-grid-filters input[name*=firstname]',
-+        ],
-+        'lastname' => [
-+            'selector' => '.admin__data-grid-filters input[name*=lastname]',
-+        ],
-+        'street' => [
-+            'selector' => '.admin__data-grid-filters input[name*=street]',
-+        ],
-+        'city' => [
-+            'selector' => '.admin__data-grid-filters input[name*=city]',
-+        ],
-+        'region_id' => [
-+            'selector' => '.admin__data-grid-filters input[name*=region]',
-+        ],
-+        'postcode' => [
-+            'selector' => '.admin__data-grid-filters input[name*=postcode]',
-+        ],
-+        'telephone' => [
-+            'selector' => '.admin__data-grid-filters input[name*=telephone]',
-+        ],
-+        'country_id' => [
-+            'selector' => '.admin__data-grid-filters select[name*=country]',
-+            'input' => 'select',
-+        ],
-+
-+    ];
-+
-+    /**
-+     * Select action toggle.
-+     *
-+     * @var string
-+     */
-+    private $selectAction = '.action-select';
-+
-+    /**
-+     * Delete action toggle.
-+     *
-+     * @var string
-+     */
-+    private $deleteAddress = '[data-action="item-delete"]';
-+
-+    /**
-+     * Locator value for "Edit" link inside action column.
-+     *
-+     * @var string
-+     */
-+    private $editAddress = '[data-action="item-edit"]';
-+
-+    /**
-+     * Customer address modal window.
-+     *
-+     * @var string
-+     */
-+    private $customerAddressModalForm = '.customer_form_areas_address_address_customer_address_update_modal';
-+
-+    /**
-+     * Search customer address by filter.
-+     *
-+     * @param array $filter
-+     * @return void
-+     */
-+    public function search(array $filter): void
-+    {
-+        parent::search(array_intersect_key($filter, $this->filters));
-+    }
-+
-+    /**
-+     * Delete customer address by filter
-+     *
-+     * @param array $filter
-+     * @return void
-+     * @throws \Exception
-+     */
-+    public function deleteCustomerAddress(array $filter): void
-+    {
-+        $this->search($filter);
-+        $rowItem = $this->getRow([$filter['firstname']]);
-+        if ($rowItem->isVisible()) {
-+            $this->deleteRowItemAddress($rowItem);
-+        } else {
-+            throw new \Exception("Searched item was not found by filter\n" . print_r($filter, true));
-+        }
-+    }
-+
-+    /**
-+     * @param \Magento\Mtf\Client\Element\SimpleElement $rowItem
-+     * @return void
-+     */
-+    public function deleteRowItemAddress(\Magento\Mtf\Client\Element\SimpleElement $rowItem): void
-+    {
-+        $rowItem->find($this->selectAction)->click();
-+        $rowItem->find($this->deleteAddress)->click();
-+        $modalElement = $this->browser->find($this->confirmModal);
-+        /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
-+        $modal = $this->blockFactory->create(
-+            \Magento\Ui\Test\Block\Adminhtml\Modal::class,
-+            ['element' => $modalElement]
-+        );
-+        $modal->acceptAlert();
-+        $this->waitLoader();
-+    }
-+
-+    /**
-+     * Open first row from the addresses grid
-+     *
-+     * @return void
-+     */
-+    public function openFirstRow(): void
-+    {
-+        $firstRow = $this->getFirstRow();
-+        if ($firstRow->isVisible()) {
-+            $firstRow->find($this->selectAction)->click();
-+            $firstRow->find($this->editAddress)->click();
-+            $this->waitForElementVisible($this->customerAddressModalForm);
-+            $this->waitLoader();
-+        }
-+    }
-+
-+    /**
-+     * Get first row from the grid
-+     *
-+     * @return \Magento\Mtf\Client\Element\SimpleElement
-+     */
-+    public function getFirstRow(): \Magento\Mtf\Client\Element\SimpleElement
-+    {
-+        return $this->_rootElement->find($this->firstRowSelector, \Magento\Mtf\Client\Locator::SELECTOR_XPATH);
-+    }
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
-index dc1e901a3fe..61166339475 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
-@@ -29,7 +29,7 @@ class CustomerForm extends Form
-      *
-      * @var string
-      */
--    protected $customerAttribute = "[name='%s[]']";
-+    protected $customerAttribute = "[orig-name='%s[]']";
- 
-     /**
-      * Validation text message for a field.
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressCreatedFrontend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressCreatedFrontend.php
-index abfee067a73..4d086cf0605 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressCreatedFrontend.php
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressCreatedFrontend.php
-@@ -28,7 +28,7 @@ class AssertAdditionalAddressCreatedFrontend extends AbstractConstraint
-         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('Address Book');
-         $addressRenderer = $this->objectManager->create(
-             \Magento\Customer\Test\Block\Address\Renderer::class,
--            ['address' => $shippingAddress, 'type' => 'html']
-+            ['address' => $shippingAddress, 'type' => 'html_without_company_separated_names']
-         )->render();
-         $isAddressExists = $customerAccountIndex->getAdditionalAddressBlock()
-             ->isAdditionalAddressExists($addressRenderer);
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressBackendRequiredFields.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressBackendRequiredFields.php
-new file mode 100644
-index 00000000000..46bb8ce72ab
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressBackendRequiredFields.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Test\Constraint;
-+
-+use Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew;
-+use Magento\Mtf\Constraint\AbstractConstraint;
-+
-+/**
-+ * Assert required fields on customer address form.
-+ */
-+class AssertCustomerAddressBackendRequiredFields extends AbstractConstraint
-+{
-+    /**
-+     * Expected message.
-+     */
-+    const REQUIRE_MESSAGE = 'This is a required field.';
-+
-+    /**
-+     * Assert required fields on customer address form.
-+     * @param CustomerIndexNew $customerNewPage
-+     * @param array $expectedRequiredFields
-+     * @return void
-+     * @throws \Exception
-+     */
-+    public function processAssert(CustomerIndexNew $customerNewPage, array $expectedRequiredFields): void
-+    {
-+        $actualRequiredFields = $customerNewPage->getCustomerForm()->getTab('addresses')
-+            ->getCustomerAddressModalForm()->getJsErrors();
-+        foreach ($expectedRequiredFields as $field) {
-+            \PHPUnit\Framework\Assert::assertTrue(
-+                isset($actualRequiredFields[$field]),
-+                "Field '$field' is not highlighted with an JS error."
-+            );
-+            \PHPUnit\Framework\Assert::assertEquals(
-+                self::REQUIRE_MESSAGE,
-+                $actualRequiredFields[$field],
-+                "Field '$field' is not highlighted as required."
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Return string representation of object.
-+     *
-+     * @return string
-+     */
-+    public function toString(): string
-+    {
-+        return 'All required fields on customer form are highlighted.';
-+    }
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.xml
-index 9765b9d9340..f94d99b07ec 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.xml
-@@ -9,6 +9,7 @@
-     <testCase name="Magento\Customer\Test\TestCase\ChangeCustomerPasswordTest" summary="Change Customer Password from My Account" ticketId="MAGETWO-29411">
-         <variation name="ChangeCustomerPasswordTestVariation1">
-             <data name="initialCustomer/dataset" xsi:type="string">default</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customer/data/current_password" xsi:type="string">123123^q</data>
-             <data name="customer/data/password" xsi:type="string">123123^a</data>
-             <data name="customer/data/password_confirmation" xsi:type="string">123123^a</data>
-@@ -17,6 +18,7 @@
-         </variation>
-         <variation name="ChangeCustomerPasswordTestVariation2">
-             <data name="initialCustomer/dataset" xsi:type="string">default</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customer/data/current_password" xsi:type="string">123123</data>
-             <data name="customer/data/password" xsi:type="string">123123^a</data>
-             <data name="customer/data/password_confirmation" xsi:type="string">123123^a</data>
-@@ -24,6 +26,7 @@
-         </variation>
-         <variation name="ChangeCustomerPasswordTestVariation3">
-             <data name="initialCustomer/dataset" xsi:type="string">default</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customer/data/current_password" xsi:type="string">123123^q</data>
-             <data name="customer/data/password" xsi:type="string">123123^a</data>
-             <data name="customer/data/password_confirmation" xsi:type="string">123123^d</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
-index f1a8b17ae28..ccc6da81038 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
-@@ -112,15 +112,15 @@ class CreateCustomerBackendEntityTest extends Injectable
-      * Create customer on backend.
-      *
-      * @param Customer $customer
--     * @param string $customerAction
--     * @param Address $address
-+     * @param null $customerAction
-+     * @param Address|null $address
-      * @param array $steps
-      * @param array $beforeActionCallback
--     * @return void
-+     * @throws \Exception
-      */
-     public function test(
-         Customer $customer,
--        $customerAction,
-+        $customerAction = null,
-         Address $address = null,
-         array $steps = [],
-         array $beforeActionCallback = []
-@@ -135,7 +135,12 @@ class CreateCustomerBackendEntityTest extends Injectable
- 
-         $this->pageCustomerIndex->open();
-         $this->pageCustomerIndex->getPageActionsBlock()->addNew();
--        $this->pageCustomerIndexNew->getCustomerForm()->fillCustomer($customer, $address);
-+        $this->pageCustomerIndexNew->getCustomerForm()->fillCustomer($customer);
-+        if (null !== $address) {
-+            $this->pageCustomerIndexNew->getPageActionsBlock()->saveAndContinue();
-+            $this->pageCustomerIndexNew->getMessagesBlock()->waitSuccessMessage();
-+            $this->pageCustomerIndexNew->getCustomerForm()->fillCustomerAddress($address);
-+        }
-         $this->address = $address;
-         $this->customer = $customer;
- 
-@@ -144,8 +149,9 @@ class CreateCustomerBackendEntityTest extends Injectable
-                 call_user_func([$this, $methodName]);
-             }
-         }
--
--        $this->pageCustomerIndexNew->getPageActionsBlock()->$customerAction();
-+        if (null !== $customerAction) {
-+            $this->pageCustomerIndexNew->getPageActionsBlock()->$customerAction();
-+        }
-     }
- 
-     /**
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
-index 502ac249535..ff87a1df60f 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Customer\Test\TestCase\CreateCustomerBackendEntityTest" summary="Create Customer from Backend" ticketId="MAGETWO-23424">
-         <variation name="CreateCustomerBackendEntityTestVariation1" summary="General customer without address">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customerAction" xsi:type="string">save</data>
-             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
-             <data name="customer/data/group_id/dataset" xsi:type="string">General</data>
-@@ -35,7 +36,7 @@
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
-         </variation>
-         <variation name="CreateCustomerBackendEntityTestVariation3" summary="General customer from USA">
--            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="customerAction" xsi:type="string">save</data>
-             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
-             <data name="customer/data/group_id/dataset" xsi:type="string">General</data>
-@@ -55,6 +56,7 @@
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
-         </variation>
-         <variation name="CreateCustomerBackendEntityTestVariation4" summary="Retailer customer without address">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customerAction" xsi:type="string">save</data>
-             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
-             <data name="customer/data/group_id/dataset" xsi:type="string">Retailer</data>
-@@ -64,6 +66,7 @@
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerInvalidEmail" />
-         </variation>
-         <variation name="CreateCustomerBackendEntityTestVariation5" summary="General customer from Poland">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customerAction" xsi:type="string">save</data>
-             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
-             <data name="customer/data/group_id/dataset" xsi:type="string">General</data>
-@@ -83,6 +86,7 @@
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
-         </variation>
-         <variation name="CreateCustomerBackendEntityTestVariation6" summary="Create New Customer on Backend" ticketId="MAGETWO-12516">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customerAction" xsi:type="string">saveAndContinue</data>
-             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
-             <data name="customer/data/group_id/dataset" xsi:type="string">General</data>
-@@ -105,6 +109,7 @@
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
-         </variation>
-         <variation name="CreateCustomerBackendEntityTestVariation8" summary="Verify required fields on Account Information tab.">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customerAction" xsi:type="string">save</data>
-             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
-             <data name="customer/data/group_id/dataset" xsi:type="string">General</data>
-@@ -115,8 +120,8 @@
-             </data>
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerBackendRequiredFields" />
-         </variation>
--        <variation name="CreateCustomerBackendEntityTestVariation9" summary="Verify required fields on Addresses tab.">
--            <data name="customerAction" xsi:type="string">save</data>
-+        <variation name="CreateCustomerBackendEntityTestVariation9" summary="Verify required fields on the Add address modal.">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
-             <data name="customer/data/group_id/dataset" xsi:type="string">General</data>
-             <data name="customer/data/firstname" xsi:type="string">John%isolation%</data>
-@@ -131,7 +136,7 @@
-                 <item name="5" xsi:type="string">Zip/Postal Code</item>
-                 <item name="6" xsi:type="string">Phone Number</item>
-             </data>
--            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerBackendRequiredFields" />
-+            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerAddressBackendRequiredFields" />
-         </variation>
-         <variation name="CreateCustomerBackendEntityTestVariation10" summary="Create customer with 2 websites and with different allowed countries.">
-             <data name="tag" xsi:type="string">to_maintain:yes</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.xml
-index 92f8d7c32ea..3865b6acd5b 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.xml
-@@ -14,6 +14,7 @@
-             <data name="customer/data/password" xsi:type="string">123123q#</data>
-             <data name="customer/data/password_confirmation" xsi:type="string">123123q#</data>
-             <data name="customer/data/website_id/dataset" xsi:type="string">default</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerFailRegisterMessage" />
-         </variation>
-     </testCase>
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.xml
-index 77b63fe39d4..3807360e89e 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Customer\Test\TestCase\DeleteCustomerBackendEntityTest" summary="Delete Customer Backend Entity" ticketId="MAGETWO-24764">
-         <variation name="DeleteCustomerBackendEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customer/dataset" xsi:type="string">default</data>
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerSuccessDeleteMessage" />
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerNotInGrid" />
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.xml
-index cffbbca8ad5..4251a1c5ee9 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Customer\Test\TestCase\DeleteCustomerGroupEntityTest" summary="Delete Customer Group" ticketId="MAGETWO-25243">
-         <variation name="DeleteCustomerGroupEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customer/dataset" xsi:type="string">customer_with_new_customer_group</data>
-             <data name="customer/data/group_id/dataset" xsi:type="string">default</data>
-             <data name="defaultCustomerGroup/dataset" xsi:type="string">General</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.xml
-index 0d168451c6d..7bf916157c5 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Customer\Test\TestCase\ForgotPasswordOnFrontendTest" summary="Forgot customer password on frontend" ticketId="MAGETWO-37145">
-         <variation name="ForgotPasswordOnFrontendTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customer/dataset" xsi:type="string">customer_US</data>
-             <data name="configData" xsi:type="string">captcha_storefront_disable</data>
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForgotPasswordSuccessMessage" />
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/LoginOnFrontendFailTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/LoginOnFrontendFailTest.xml
-index 2dea52c1b7f..bf84d2be43a 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/LoginOnFrontendFailTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/LoginOnFrontendFailTest.xml
-@@ -9,6 +9,7 @@
-     <testCase name="Magento\Customer\Test\TestCase\LoginOnFrontendFailTest" summary="Check error message with wrong credentials" ticketId="MAGETWO-16883">
-         <variation name="LoginOnFrontendFailTestVariation1">
-             <data name="customer/dataset" xsi:type="string">default</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerLoginErrorMessage" />
-         </variation>
-     </testCase>
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.xml
-index 4086a8585c8..c868d3332a5 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Customer\Test\TestCase\MassAssignCustomerGroupTest" summary="Mass Assign Customer's Group to Customers" ticketId="MAGETWO-27892">
-         <variation name="MassAssignCustomerGroupTestVariation1" summary="Customer is created and mass action for changing customer group to created group is applied">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customers" xsi:type="array">
-                 <item name="0" xsi:type="string">default</item>
-             </data>
-@@ -16,6 +17,7 @@
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerGroupInGrid" />
-         </variation>
-         <variation name="MassAssignCustomerGroupTestVariation2" summary="Two customers are created and mass actions for changing customer group to 'Retail' is applied" ticketId="MAGETWO-19456">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customers" xsi:type="array">
-                 <item name="0" xsi:type="string">default</item>
-                 <item name="1" xsi:type="string">customer_US</item>
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml
-index 404e62dcad6..a4a3aa34f9f 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml
-@@ -8,16 +8,19 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest22">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Customers > All Customers</data>
-             <data name="pageTitle" xsi:type="string">Customers</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest23">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Customers > Now Online</data>
-             <data name="pageTitle" xsi:type="string">Customers Now Online</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest24">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Customers > Customer Groups</data>
-             <data name="pageTitle" xsi:type="string">Customer Groups</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/PasswordAutocompleteOffTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/PasswordAutocompleteOffTest.xml
-index b4188ebd98a..7f267c1f171 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/PasswordAutocompleteOffTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/PasswordAutocompleteOffTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Customer\Test\TestCase\PasswordAutocompleteOffTest" summary="Test that autocomplete is off" ticketId="MAGETWO-45324">
-         <variation name="RegisterCustomerFrontendEntityTestVariation1" summary="Test that autocomplete is off">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/dataset" xsi:type="string">default</data>
-             <data name="configData" xsi:type="string">disable_guest_checkout,password_autocomplete_off</data>
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerPasswordAutocompleteOnAuthorizationPopup" />
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml
-index c1cf5335831..86c8e56d232 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml
-@@ -20,6 +20,7 @@
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerLogout" />
-         </variation>
-         <variation name="RegisterCustomerFrontendEntityTestVariation2" summary="Register new customer with subscribing">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customer/data/firstname" xsi:type="string">john</data>
-             <data name="customer/data/lastname" xsi:type="string">doe</data>
-             <data name="customer/data/email" xsi:type="string">johndoe%isolation%@example.com</data>
-@@ -32,7 +33,7 @@
-             <constraint name="Magento\Newsletter\Test\Constraint\AssertCustomerIsSubscribedToNewsletter" />
-         </variation>
-         <variation name="RegisterCustomerFrontendEntityTestVariation3" summary="Register Customer" ticketId="MAGETWO-12394">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="customer/data/firstname" xsi:type="string">john</data>
-             <data name="customer/data/lastname" xsi:type="string">doe</data>
-             <data name="customer/data/email" xsi:type="string">johndoe%isolation%@example.com</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml
-index 24f68f686fd..095746cfdef 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml
-@@ -25,6 +25,7 @@
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerInGrid" />
-         </variation>
-         <variation name="UpdateCustomerBackendEntityTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCustomer/dataset" xsi:type="string">default</data>
-             <data name="customer/data/email" xsi:type="string">-</data>
-             <data name="address/data/prefix" xsi:type="string">Prefix%isolation%_</data>
-@@ -75,6 +76,7 @@
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerInGrid" />
-         </variation>
-         <variation name="UpdateCustomerBackendEntityTestVariation4" summary="Address w/o zip/state required, default billing/shipping checked">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCustomer/dataset" xsi:type="string">default</data>
-             <data name="customer/data/email" xsi:type="string">-</data>
-             <data name="address/data/default_billing" xsi:type="string">Yes</data>
-@@ -95,6 +97,7 @@
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerLogin" />
-         </variation>
-         <variation name="UpdateCustomerBackendEntityTestVariation5" summary="Default billing/shipping unchecked">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCustomer/dataset" xsi:type="string">johndoe_unique_TX</data>
-             <data name="customer/data/email" xsi:type="string">-</data>
-             <data name="address/data/default_billing" xsi:type="string">No</data>
-@@ -114,6 +117,7 @@
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
-         </variation>
-         <variation name="UpdateCustomerBackendEntityTestVariation6" summary="Delete customer address">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialCustomer/dataset" xsi:type="string">johndoe_with_multiple_addresses</data>
-             <data name="customer/data/email" xsi:type="string">-</data>
-             <data name="addressIndexToDelete" xsi:type="number">1</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.xml
-index 2cbb9a0315e..b96d688b0c4 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Customer\Test\TestCase\UpdateCustomerFrontendEntityTest" summary="Update Customer on Frontend" ticketId="MAGETWO-25925">
-         <variation name="UpdateCustomerFrontendEntityTestVariation1" summary="No XSS injection on update customer information add address" ticketId="MAGETWO-47189">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customer/data/firstname" xsi:type="string">Patrick&lt;/title&gt;&lt;/head&gt;&lt;svg/onload=alert(&#39;XSS&#39;)&gt;</data>
-             <data name="customer/data/lastname" xsi:type="string">&lt;script&gt;alert(&#39;Last name&#39;)&lt;/script&gt;</data>
-             <data name="customer/data/current_password" xsi:type="string">123123^q</data>
-@@ -25,6 +26,7 @@
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
-         </variation>
-         <variation name="UpdateCustomerFrontendEntityTestVariation2" summary="Update customer information and add UK address, assert customer name and address on address book tab">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customer/data/firstname" xsi:type="string">Jonny %isolation%</data>
-             <data name="customer/data/lastname" xsi:type="string">Doe %isolation%</data>
-             <data name="customer/data/email" xsi:type="string">jonny%isolation%@example.com</data>
-@@ -44,6 +46,7 @@
-             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerNameFrontend" />
-         </variation>
-         <variation name="UpdateCustomerFrontendEntityTestVariation3" summary="Update customer information and add France address">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customer/data/firstname" xsi:type="string">Jean %isolation%</data>
-             <data name="customer/data/lastname" xsi:type="string">Reno %isolation%</data>
-             <data name="customer/data/email" xsi:type="string">jean%isolation%@example.com</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml
-index 70a912a3b5f..e88e5161e47 100644
---- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Customer\Test\TestCase\VerifyDisabledCustomerGroupFieldTest" summary="Check that field is disabled in system Customer Group" ticketId="MAGETWO-52481">
-         <variation name="VerifyDisabledCustomerGroupField1" summary="Checks that customer_group_code field is disabled in NOT LOGGED IN Customer Group">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="customerGroup/dataset" xsi:type="string">NOT_LOGGED_IN</data>
-             <data name="disabledFields" xsi:type="array">
-                 <item name="0" xsi:type="string">customer_group_code</item>
-diff --git a/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php b/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php
-index 18b2d44a22f..f73609b3ba2 100644
---- a/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php
-+++ b/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php
-@@ -116,8 +116,7 @@ class AssertImportCustomerAddresses extends AbstractConstraint
-         foreach ($customers as $customer) {
-             $this->customerIndexEdit->open(['id' => $customer->getId()]);
-             $customerForm->openTab('addresses');
--            $addresses = $customerForm->getTab('addresses')->getDataAddresses($addressTemplate);
--            $address = array_shift($addresses);
-+            $address = $customerForm->getTab('addresses')->getAddressFromFirstRow($addressTemplate);
-             if (!empty($address)) {
-                 $resultAddressesArray[] = $address;
-             }
-diff --git a/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/TestCase/ExportCustomerAddressesTest.php b/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/TestCase/ExportCustomerAddressesTest.php
-index 1f046f5111d..17dfb4fb8cd 100644
---- a/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/TestCase/ExportCustomerAddressesTest.php
-+++ b/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/TestCase/ExportCustomerAddressesTest.php
-@@ -10,6 +10,7 @@ use Magento\ImportExport\Test\Fixture\ExportData;
- use Magento\ImportExport\Test\Page\Adminhtml\AdminExportIndex;
- use Magento\Mtf\Fixture\FixtureFactory;
- use Magento\Mtf\TestCase\Injectable;
-+use Magento\Mtf\Util\Command\Cli\Cron;
- 
- /**
-  * Preconditions:
-@@ -42,19 +43,29 @@ class ExportCustomerAddressesTest extends Injectable
-      */
-     private $adminExportIndex;
- 
-+    /**
-+     * Cron command
-+     *
-+     * @var Cron
-+     */
-+    private $cron;
-+
-     /**
-      * Inject pages.
-      *
-      * @param FixtureFactory $fixtureFactory
-      * @param AdminExportIndex $adminExportIndex
-+     * @param Cron $cron
-      * @return void
-      */
-     public function __inject(
-         FixtureFactory $fixtureFactory,
--        AdminExportIndex $adminExportIndex
-+        AdminExportIndex $adminExportIndex,
-+        Cron $cron
-     ) {
-         $this->fixtureFactory = $fixtureFactory;
-         $this->adminExportIndex = $adminExportIndex;
-+        $this->cron = $cron;
-     }
- 
-     /**
-@@ -68,12 +79,16 @@ class ExportCustomerAddressesTest extends Injectable
-         ExportData $exportData,
-         Customer $customer
-     ) {
-+        $this->cron->run();
-+        $this->cron->run();
-         $customer->persist();
-         $this->adminExportIndex->open();
-+        $this->adminExportIndex->getExportedGrid()->deleteAllExportedFiles();
-         $exportData->persist();
-         $this->adminExportIndex->getExportForm()->fill($exportData);
-         $this->adminExportIndex->getFilterExport()->clickContinue();
--
-+        $this->cron->run();
-+        $this->cron->run();
-         return [
-             'customer' => $customer
-         ];
-diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable.php
-index ebc19eec9ad..d78a2d94e76 100644
---- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable.php
-+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable.php
-@@ -104,4 +104,21 @@ class Downloadable extends Section
- 
-         return $this;
-     }
-+
-+    /**
-+     * Set "Is this downloadable Product?" value.
-+     *
-+     * @param string $downloadable
-+     * @param SimpleElement|null $element
-+     * @return void
-+     */
-+    public function setIsDownloadable(string $downloadable = 'Yes', SimpleElement $element = null): void
-+    {
-+        $context = $element ?: $this->_rootElement;
-+        $isDownloadable = $context->find($this->isDownloadableProduct);
-+        $value = 'Yes' == $downloadable ? '1' : '0';
-+        if ($isDownloadable->isVisible() && $isDownloadable->getAttribute('value') != $value) {
-+            $isDownloadable->click();
-+        }
-+    }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.xml
-index 7a7a6d2124c..2f721f05f5e 100644
---- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.xml
-+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.xml
-@@ -7,7 +7,6 @@
- -->
- <mapping strict="0">
-     <fields>
--        <qty />
-         <link>
-             <selector>//*[@id="downloadable-links-list"]/*[contains(.,"%link_name%")]//input</selector>
-             <strategy>xpath</strategy>
-diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
-index e5d97e1511e..2033189214e 100644
---- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
-+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
-@@ -32,11 +32,7 @@ class AssertDownloadableDuplicateForm extends AssertProductDuplicateForm
-         usort(
-             $fields,
-             function ($row1, $row2) {
--                if ($row1['sort_order'] == $row2['sort_order']) {
--                    return 0;
--                }
--
--                return ($row1['sort_order'] < $row2['sort_order']) ? -1 : 1;
-+                return $row1['sort_order'] <=> $row2['sort_order'];
-             }
-         );
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProduct/Webapi.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProduct/Webapi.php
-index 434c78e55c6..d14d6754b12 100644
---- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProduct/Webapi.php
-+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProduct/Webapi.php
-@@ -148,7 +148,7 @@ class Webapi extends SimpleProductWebapi implements DownloadableProductInterface
-             'title' => $link['title'],
-             'sort_order' => isset($link['sort_order']) ? $link['sort_order'] : 0,
-             'is_shareable' => $link['is_shareable'],
--            'price' => floatval($link['price']),
-+            'price' => (float)$link['price'],
-             'number_of_downloads' => isset($link['number_of_downloads']) ? $link['number_of_downloads'] : 0,
-             'link_type' => $link['type'],
-             'link_url' => isset($link['link_url']) ? $link['link_url'] : null,
-diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml
-index 5afe815edad..b61a244345a 100644
---- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest" summary="Create Downloadable Product" ticketId="MAGETWO-23425">
-         <variation name="CreateDownloadableProductEntityTestVariation1" summary="Create Downloadable Product with Required Fields Only and Assign it to the Category" ticketId="MAGETWO-13595">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">10</data>
-@@ -24,6 +24,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCart" />
-         </variation>
-         <variation name="CreateDownloadableProductEntityTestVariation2" summary="Create product with default set links">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">100</data>
-@@ -61,6 +62,7 @@
-             <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableLinksData" />
-         </variation>
-         <variation name="CreateDownloadableProductEntityTestVariation4" summary="Create product with custom options">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">33</data>
-@@ -102,6 +104,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-         </variation>
-         <variation name="CreateDownloadableProductEntityTestVariation6" summary="Create product with out of stock status">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">100</data>
-@@ -117,6 +120,7 @@
-             <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-         </variation>
-         <variation name="CreateDownloadableProductEntityTestVariation7" summary="Create product with manage stock">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">9999</data>
-@@ -133,6 +137,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
-         </variation>
-         <variation name="CreateDownloadableProductEntityTestVariation8" summary="Create product without tax class id">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">98</data>
-@@ -217,6 +222,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage" />
-         </variation>
-         <variation name="CreateDownloadableProductEntityTestVariation12" summary="Create product without filling quantity and stock">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">100</data>
-@@ -231,6 +237,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-         </variation>
-         <variation name="CreateDownloadableProductEntityTestVariation13" summary="Create product with special price">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">10</data>
-@@ -248,6 +255,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSpecialPriceOnProductPage" />
-         </variation>
-         <variation name="CreateDownloadableProductEntityTestVariation14" summary="Create product with group price">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">365</data>
-@@ -263,6 +271,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-         </variation>
-         <variation name="CreateDownloadableProductEntityTestVariation15" summary="Create product with tier price">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">250</data>
-@@ -280,6 +289,7 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
-         </variation>
-         <variation name="CreateDownloadableProductEntityTestVariation16" summary="Create downloadable product and assign it to custom website">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
-             <data name="product/data/price/value" xsi:type="string">350</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductEntityTest.xml
-index e2f86d82363..ffcafbe6872 100644
---- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\DeleteProductEntityTest">
-         <variation name="DeleteProductEntityTestVariation7" firstConstraint="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" method="test">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products" xsi:type="string">downloadableProduct::default</data>
-             <data name="isRequired" xsi:type="string">Yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
-diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
-index bb6a9171525..980fdb2998c 100644
---- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Checkout\Test\TestCase\DeleteProductFromMiniShoppingCartTest" summary="Delete Downloadable Product from Mini Shopping Cart" ticketId="MAGETWO-29104">
-         <variation name="DeleteDownloadableProductFromMiniShoppingCartTestVariation">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">downloadableProduct::default</data>
-             <data name="deletedProductIndex" xsi:type="string">0</data>
-             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
-diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/ValidateOrderOfProductTypeTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/ValidateOrderOfProductTypeTest.xml
-index ccb74e1f79d..e807ec91342 100644
---- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/ValidateOrderOfProductTypeTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/ValidateOrderOfProductTypeTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\ValidateOrderOfProductTypeTest">
-         <variation name="ValidateOrderOfProductTypeTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menu/5" xsi:type="string">Downloadable Product</data>
-         </variation>
-     </testCase>
-diff --git a/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/NavigateMenuTest.xml
-index f6dcdd5b65d..4e98019c253 100644
---- a/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/NavigateMenuTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest29">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Marketing > Email Templates</data>
-             <data name="pageTitle" xsi:type="string">Email Templates</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/GroupedImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/GroupedImportExport/Test/TestCase/ExportProductsTest.xml
-index cffcdbf45a6..a110dc6a89f 100644
---- a/dev/tests/functional/tests/app/Magento/GroupedImportExport/Test/TestCase/ExportProductsTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/GroupedImportExport/Test/TestCase/ExportProductsTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\CatalogImportExport\Test\TestCase\ExportProductsTest" summary="Export products">
-         <variation name="ExportProductsTestVariation6" summary="Export grouped product with special price" ticketId="MAGETWO-46116">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="exportData" xsi:type="string">default</data>
-             <data name="products/0" xsi:type="array">
-                 <item name="fixture" xsi:type="string">groupedProduct</item>
-diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php
-index 45481d6ee07..6c19291222a 100644
---- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php
-+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php
-@@ -20,6 +20,13 @@ class Grid extends DataGrid
-      */
-     protected $addProducts = '.action-primary[data-role="action"]';
- 
-+    /**
-+     * Grid selector.
-+     *
-+     * @var string
-+     */
-+    private $gridSelector = '[data-role="grid-wrapper"]';
-+
-     /**
-      * Filters array mapping
-      *
-@@ -40,4 +47,59 @@ class Grid extends DataGrid
-     {
-         $this->_rootElement->find($this->addProducts)->click();
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function searchAndSelect(array $filter)
-+    {
-+        $this->waitGridVisible();
-+        $this->waitLoader();
-+        parent::searchAndSelect($filter);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function waitLoader()
-+    {
-+        parent::waitLoader();
-+        $this->waitGridLoaderInvisible();
-+    }
-+
-+    /**
-+     * Wait for grid to appear.
-+     *
-+     * @return void
-+     */
-+    private function waitGridVisible()
-+    {
-+        $browser = $this->_rootElement;
-+        $selector = $this->gridSelector;
-+
-+        return $browser->waitUntil(
-+            function () use ($browser, $selector) {
-+                $element = $browser->find($selector);
-+                return $element->isVisible() ? true : null;
-+            }
-+        );
-+    }
-+
-+    /**
-+     * Wait for grid spinner disappear.
-+     *
-+     * @return void
-+     */
-+    private function waitGridLoaderInvisible()
-+    {
-+        $browser = $this->_rootElement;
-+        $selector = $this->loader;
-+
-+        return $browser->waitUntil(
-+            function () use ($browser, $selector) {
-+                $element = $browser->find($selector);
-+                return $element->isVisible() === false ? true : null;
-+            }
-+        );
-+    }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php
-index 5627a9d887b..c47df8c5463 100644
---- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php
-+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php
-@@ -27,14 +27,15 @@ class View extends ParentView
-      *
-      * @var string
-      */
--    protected $formatTierPrice = "//tbody[%row-number%]//ul[contains(@class,'tier')]//*[@class='item'][%line-number%]";
-+    protected $formatTierPrice =
-+        "//tr[@class='row-tier-price'][%row-number%]//ul[contains(@class,'tier')]//*[@class='item'][%line-number%]";
- 
-     /**
-      * This member holds the class name of the special price block.
-      *
-      * @var string
-      */
--    protected $formatSpecialPrice = '//tbody[%row-number%]//*[contains(@class,"price-box")]';
-+    protected $formatSpecialPrice = '//tbody//tr[%row-number%]//*[contains(@class,"price-box")]';
- 
-     /**
-      * Get grouped product block
-diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml
-index dce1358a1ec..59c00683e3b 100644
---- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml
-+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml
-@@ -58,7 +58,7 @@
-         <field name="sku" is_required="1" group="product-details" />
-         <field name="small_image" is_required="0" />
-         <field name="small_image_label" is_required="0" />
--        <field name="status" is_required="0" />
-+        <field name="status" is_required="0" group="product-details" />
-         <field name="thumbnail" is_required="0" />
-         <field name="thumbnail_label" is_required="0" />
-         <field name="updated_at" is_required="1" />
-@@ -66,7 +66,7 @@
-         <field name="upsell_tgtr_position_limit" is_required="0" />
-         <field name="url_key" is_required="0" group="search-engine-optimization" />
-         <field name="url_path" is_required="0" />
--        <field name="visibility" is_required="0" />
-+        <field name="visibility" is_required="0" group="product-details" />
-         <field name="id" />
-         <field name="type_id" />
-         <field name="attribute_set_id" group="product-details" source="Magento\Catalog\Test\Fixture\Product\AttributeSetId" />
-diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml
-index 38ef02ff494..f397c1b99e3 100644
---- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\GroupedProduct\Test\TestCase\CreateGroupedProductEntityTest" summary="Create Grouped Product" ticketId="MAGETWO-24877">
-         <variation name="CreateGroupedProductEntityTestVariation1" summary="Create Grouped Product and Assign It to the Category" ticketId="MAGETWO-13610">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-             <data name="product/data/url_key" xsi:type="string">test-grouped-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">GroupedProduct %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">GroupedProduct_sku%isolation%</data>
-@@ -57,7 +57,6 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
-         </variation>
-         <variation name="CreateGroupedProductEntityTestVariation5" summary="Create with no required products">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="product/data/url_key" xsi:type="string">test-grouped-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">GroupedProduct %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">GroupedProduct_sku%isolation%</data>
-@@ -110,7 +109,6 @@
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-         </variation>
-         <variation name="CreateGroupedProductEntityTestVariation10" summary="Create Grouped Product and Assign it on Custom Website">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="product/data/url_key" xsi:type="string">test-grouped-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">GroupedProduct %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">GroupedProduct_sku%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductEntityTest.xml
-index cf0c8c81416..e62e5ad7395 100644
---- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\DeleteProductEntityTest">
-         <variation name="DeleteProductEntityTestVariation8" firstConstraint="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" method="test">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="products" xsi:type="string">groupedProduct::default</data>
-             <data name="isRequired" xsi:type="string">Yes</data>
-             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
-diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml
-index 5a5cfdd9adc..ac57cdeb920 100644
---- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Catalog\Test\TestCase\Product\ValidateOrderOfProductTypeTest">
-         <variation name="ValidateOrderOfProductTypeTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menu/2" xsi:type="string">Grouped Product</data>
-         </variation>
-     </testCase>
-diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/ExportedGrid.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/ExportedGrid.php
-new file mode 100644
-index 00000000000..60a313a9c01
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/ExportedGrid.php
-@@ -0,0 +1,148 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\ImportExport\Test\Block\Adminhtml\Export;
-+
-+use Magento\Ui\Test\Block\Adminhtml\DataGrid;
-+use Magento\Mtf\Client\Element\SimpleElement;
-+use Magento\Mtf\Client\Locator;
-+
-+/**
-+ * List of exported files
-+ */
-+class ExportedGrid extends DataGrid
-+{
-+    /**
-+     * Locator value for "Download" link inside action column.
-+     *
-+     * @var string
-+     */
-+    protected $editLink = '//a[@class="action-menu-item"][text()="Download"]';
-+
-+    /**
-+     * First row in the grid selector
-+     *
-+     * @var string
-+     */
-+    protected $firstRowSelector = '//tr[@data-repeat-index="0"]';
-+
-+    /**
-+     * Select action toggle.
-+     *
-+     * @var string
-+     */
-+    private $selectAction = '.action-select';
-+
-+    /**
-+     * Locator value for "Delete" link inside action column.
-+     *
-+     * @var string
-+     */
-+    private $deleteLink = '//a[@class="action-menu-item"][text()="Delete"]';
-+
-+    /**
-+     * Exported grid locator
-+     *
-+     * @var string
-+     */
-+    private $exportGrid = '.data-grid';
-+
-+    /**
-+     * Delete all files from exported grid
-+     */
-+    public function deleteAllExportedFiles()
-+    {
-+        $this->waifForGrid();
-+        $firstGridRow = $this->getFirstRow();
-+        while ($firstGridRow->isVisible()) {
-+            $this->deleteFile($firstGridRow);
-+        }
-+    }
-+
-+    /**
-+     * Delete exported file from the grid
-+     *
-+     * @param SimpleElement $rowItem
-+     * @return void
-+     */
-+    private function deleteFile(SimpleElement $rowItem)
-+    {
-+        $rowItem->find($this->selectAction)->click();
-+        $rowItem->find($this->deleteLink, Locator::SELECTOR_XPATH)->click();
-+        $this->confirmDeleteModal();
-+        $this->waitLoader();
-+    }
-+
-+    /**
-+     * Get first row from the grid
-+     *
-+     * @return SimpleElement
-+     */
-+    public function getFirstRow(): SimpleElement
-+    {
-+        return $this->_rootElement->find($this->firstRowSelector, \Magento\Mtf\Client\Locator::SELECTOR_XPATH);
-+    }
-+
-+    /**
-+     * Download first exported file
-+     *
-+     * @throws \Exception
-+     */
-+    public function downloadFirstFile()
-+    {
-+        $this->waifForGrid();
-+        $firstRow = $this->getFirstRow();
-+        $i = 0;
-+        while (!$firstRow->isVisible()) {
-+            if ($i === 10) {
-+                throw new \Exception('There is no exported file in the grid');
-+            }
-+            $this->browser->refresh();
-+            $this->waifForGrid();
-+            ++$i;
-+        }
-+        $this->clickDownloadLink($firstRow);
-+    }
-+
-+    /**
-+     * Wait for the grid
-+     *
-+     * @return void
-+     */
-+    public function waifForGrid()
-+    {
-+        $this->waitForElementVisible($this->exportGrid);
-+        $this->waitLoader();
-+    }
-+
-+    /**
-+     * Click on "Download" link.
-+     *
-+     * @param SimpleElement $rowItem
-+     * @return void
-+     */
-+    private function clickDownloadLink(SimpleElement $rowItem)
-+    {
-+        $rowItem->find($this->selectAction)->click();
-+        $rowItem->find($this->editLink, Locator::SELECTOR_XPATH)->click();
-+    }
-+
-+    /**
-+     * Confirm delete file modal
-+     *
-+     * @return void
-+     */
-+    private function confirmDeleteModal()
-+    {
-+        $modalElement = $this->browser->find($this->confirmModal);
-+        /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
-+        $modal = $this->blockFactory->create(
-+            \Magento\Ui\Test\Block\Adminhtml\Modal::class,
-+            ['element' => $modalElement]
-+        );
-+        $modal->acceptAlert();
-+    }
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/NotificationsArea.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/NotificationsArea.php
-new file mode 100644
-index 00000000000..4a781c787eb
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/NotificationsArea.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\ImportExport\Test\Block\Adminhtml\Export;
-+
-+use Magento\Backend\Test\Block\Widget\Grid;
-+use Magento\Mtf\Client\Locator;
-+
-+/**
-+ * Notification messages area
-+ */
-+class NotificationsArea extends Grid
-+{
-+    /**
-+     * Notifications section drop down locator
-+     *
-+     * @var string
-+     */
-+    private $notificationsDropdown = '.notifications-action';
-+
-+    /**
-+     * First notification description
-+     *
-+     * @var string
-+     */
-+    private $notificationDescription = '//li[@class="notifications-entry notifications-critical"][1]'
-+        . '/p[@class="notifications-entry-description"]';
-+
-+    /**
-+     * Open notifications drop down
-+     *
-+     * @return void
-+     */
-+    public function openNotificationsDropDown()
-+    {
-+        $this->browser->find($this->notificationsDropdown)->click();
-+    }
-+
-+    /**
-+     * Get latest notification message text
-+     *
-+     * @return string
-+     */
-+    public function getLatestMessage()
-+    {
-+        $this->waitForElementVisible($this->notificationDescription, Locator::SELECTOR_XPATH);
-+        return $this->_rootElement->find($this->notificationDescription, Locator::SELECTOR_XPATH)->getText();
-+    }
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportNoDataErrorMessage.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportNoDataErrorMessage.php
-index 25e4d4b3917..c52f8c6613f 100644
---- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportNoDataErrorMessage.php
-+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportNoDataErrorMessage.php
-@@ -16,7 +16,7 @@ class AssertExportNoDataErrorMessage extends AbstractConstraint
-     /**
-      * Text value to be checked.
-      */
--    const ERROR_MESSAGE = 'There is no data for the export.';
-+    const ERROR_MESSAGE = 'Error during export process occurred. Please check logs for detail';
- 
-     /**
-      * Assert that error message is visible after exporting without entity attributes data.
-@@ -26,7 +26,11 @@ class AssertExportNoDataErrorMessage extends AbstractConstraint
-      */
-     public function processAssert(AdminExportIndex $adminExportIndex)
-     {
--        $actualMessage = $adminExportIndex->getMessagesBlock()->getErrorMessage();
-+        $adminExportIndex->open();
-+        /** @var \Magento\ImportExport\Test\Block\Adminhtml\Export\NotificationsArea $notificationsArea */
-+        $notificationsArea = $adminExportIndex->getNotificationsArea();
-+        $notificationsArea->openNotificationsDropDown();
-+        $actualMessage = $notificationsArea->getLatestMessage();
- 
-         \PHPUnit\Framework\Assert::assertEquals(
-             self::ERROR_MESSAGE,
-diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportSubmittedMessage.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportSubmittedMessage.php
-new file mode 100644
-index 00000000000..59b1c7570c3
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportSubmittedMessage.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\ImportExport\Test\Constraint;
-+
-+use Magento\ImportExport\Test\Page\Adminhtml\AdminExportIndex;
-+use Magento\Mtf\Constraint\AbstractConstraint;
-+
-+/**
-+ * Assert that export submitted message is visible after exporting.
-+ */
-+class AssertExportSubmittedMessage extends AbstractConstraint
-+{
-+    /**
-+     * Text value to be checked.
-+     */
-+    const MESSAGE = 'Message is added to queue, wait to get your file soon';
-+
-+    /**
-+     * Assert that export submitted message is visible after exporting.
-+     *
-+     * @param AdminExportIndex $adminExportIndex
-+     * @return void
-+     */
-+    public function processAssert(AdminExportIndex $adminExportIndex)
-+    {
-+        $actualMessage = $adminExportIndex->getMessagesBlock()->getSuccessMessage();
-+
-+        \PHPUnit\Framework\Assert::assertEquals(
-+            self::MESSAGE,
-+            $actualMessage,
-+            'Wrong message is displayed.'
-+            . "\nExpected: " . self::MESSAGE
-+            . "\nActual: " . $actualMessage
-+        );
-+    }
-+
-+    /**
-+     * Returns a string representation of the object.
-+     *
-+     * @return string
-+     */
-+    public function toString()
-+    {
-+        return 'Correct message is displayed.';
-+    }
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportSuccessMessage.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportSuccessMessage.php
-index ca75e3b203f..a5408426514 100644
---- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportSuccessMessage.php
-+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportSuccessMessage.php
-@@ -28,7 +28,7 @@ class AssertImportSuccessMessage extends AbstractConstraint
-     public function processAssert(AdminImportIndex $adminImportIndex)
-     {
-         $validationMessage = $adminImportIndex->getMessagesBlock()->getImportResultMessage();
--        \PHPUnit\Framework\Assert::assertEquals(
-+        \PHPUnit\Framework\Assert::assertStringEndsWith(
-             self::SUCCESS_MESSAGE,
-             $validationMessage,
-             'Wrong validation result is displayed.'
-diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/Import/File.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/Import/File.php
-index 17cfdc31720..89f51931f8d 100644
---- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/Import/File.php
-+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/Import/File.php
-@@ -316,7 +316,7 @@ class File extends DataSource
-                     $explodedArray = $compiledData['explodedArray'];
-                 } else {
-                     $explodedArray[$i] = str_replace('"', '', $explodedArray[$i]);
--                };
-+                }
-             }
-             $data = array_diff($explodedArray, ['%to_delete%']);
-             $this->csv[] = $data;
-diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.xml
-index 51afed20873..e70a5fc2982 100644
---- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.xml
-+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.xml
-@@ -9,6 +9,9 @@
-   <page name="AdminExportIndex" area="Adminhtml" mca="admin/export/index" module="Magento_ImportExport">
-     <block name="filterExport" class="Magento\ImportExport\Test\Block\Adminhtml\Export\Filter" locator="#export_filter_container" strategy="css selector" />
-     <block name="exportForm" class="Magento\ImportExport\Test\Block\Adminhtml\Export\Edit\Form" locator="#container" strategy="css selector" />
-+    <block name="exportedGrid" class="Magento\ImportExport\Test\Block\Adminhtml\Export\ExportedGrid" locator="#container" strategy="css selector" />
-     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages" strategy="css selector" />
-+    <block name="systemMessageDialog" class="Magento\AdminNotification\Test\Block\System\Messages" locator='.ui-popup-message .modal-inner-wrap' strategy="css selector" />
-+    <block name="notificationsArea" class="Magento\ImportExport\Test\Block\Adminhtml\Export\NotificationsArea" locator='//ul[contains(@data-mark-as-read-url,"notification")]' strategy="xpath" />
-   </page>
- </config>
-diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestCase/NavigateMenuTest.xml
-index 6ce4d01d177..d396a364a3f 100644
---- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestCase/NavigateMenuTest.xml
-@@ -8,11 +8,13 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest35">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">System > Import</data>
-             <data name="pageTitle" xsi:type="string">Import</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest36">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">System > Export</data>
-             <data name="pageTitle" xsi:type="string">Export</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Indexer/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Indexer/Test/TestCase/NavigateMenuTest.xml
-index 883e9bde47b..16ae092e62c 100644
---- a/dev/tests/functional/tests/app/Magento/Indexer/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Indexer/Test/TestCase/NavigateMenuTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest37">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">System > Index Management</data>
-             <data name="pageTitle" xsi:type="string">Index Management</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Page/DevdocsInstall.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Page/DevdocsInstall.xml
-index f63e7282719..15e0b8a27d2 100644
---- a/dev/tests/functional/tests/app/Magento/Install/Test/Page/DevdocsInstall.xml
-+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Page/DevdocsInstall.xml
-@@ -6,7 +6,7 @@
-  */
-  -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
--    <page name="DevdocsInstall" mca="http://devdocs.magento.com/guides/v2.0/install-gde/install/web/install-web.html" module="Magento_Install">
-+    <page name="DevdocsInstall" mca="https://devdocs.magento.com/guides/v2.0/install-gde/install/web/install-web.html" module="Magento_Install">
-         <block name="devdocsBlock" class="Magento\Install\Test\Block\Devdocs" locator="body" strategy="css selector"/>
-     </page>
- </config>
-diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml
-index 2b407e3d392..86906d4c094 100644
---- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml
-@@ -17,7 +17,7 @@
-         <variation name="InstallTestVariation2" firstConstraint="Magento\Install\Test\Constraint\AssertSuccessInstall" summary="Install with custom encryption key and changed currency and locale">
-             <data name="user/dataset" xsi:type="string">default</data>
-             <data name="install/keyOwn" xsi:type="string">I want to use my own encryption key</data>
--            <data name="install/keyValue" xsi:type="string">123123qa</data>
-+            <data name="install/keyValue" xsi:type="string">I_want_to_use_my_own__encryption</data>
-             <data name="install/storeLanguage" xsi:type="string">German (Germany)</data>
-             <data name="install/storeCurrency" xsi:type="string">Euro (EUR)</data>
-             <data name="currencySymbol" xsi:type="string">€</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/NavigateMenuTest.xml
-index 22def36751f..265790ed4b7 100644
---- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/NavigateMenuTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest38">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">System > Integrations</data>
-             <data name="pageTitle" xsi:type="string">Integrations</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php
-index 3c36fe82b13..97c43d7c4e2 100644
---- a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php
-+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php
-@@ -64,6 +64,13 @@ class Navigation extends Block
-      */
-     private $productQty = '/following-sibling::span[contains(text(), "%s")]';
- 
-+    /**
-+     * Selector for child element with product quantity.
-+     *
-+     * @var string
-+     */
-+    private $productQtyInCategory = '/span[contains(text(), "%s")]';
-+
-     /**
-      * Remove all applied filters.
-      *
-@@ -124,10 +131,20 @@ class Navigation extends Block
-      */
-     public function isCategoryVisible(Category $category, $qty)
-     {
--        return $this->_rootElement->find(
--            sprintf($this->categoryName, $category->getName()) . sprintf($this->productQty, $qty),
--            Locator::SELECTOR_XPATH
--        )->isVisible();
-+        $link = sprintf($this->categoryName, $category->getName());
-+
-+        if (!$this->_rootElement->find($link, Locator::SELECTOR_XPATH)->isVisible()) {
-+            $this->openFilterContainer('Category', $link);
-+            return $this->_rootElement->find(
-+                $link . sprintf($this->productQtyInCategory, $qty),
-+                Locator::SELECTOR_XPATH
-+            )->isVisible();
-+        } else {
-+            return $this->_rootElement->find(
-+                $link . sprintf($this->productQty, $qty),
-+                Locator::SELECTOR_XPATH
-+            )->isVisible();
-+        }
-     }
- 
-     /**
-diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php
-index 67c1826f40a..2c41ce3d8b4 100644
---- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php
-+++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php
-@@ -58,7 +58,7 @@ class FillShippingInformationStep implements TestStepInterface
-     public function run()
-     {
-         $shippingMethods = [];
--        for ($i = 0; $i < count($this->customer->getAddress()); $i++) {
-+        for ($i = 0, $count = count($this->customer->getAddress()); $i < $count; $i++) {
-             $shippingMethods[] = $this->shippingMethod;
-         }
-         $this->shippingInformation->getShippingBlock()->selectShippingMethod($shippingMethods);
-diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Queue/Edit/QueueForm.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Queue/Edit/QueueForm.xml
-index c1970955013..4d2acc76c87 100644
---- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Queue/Edit/QueueForm.xml
-+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Queue/Edit/QueueForm.xml
-@@ -11,7 +11,7 @@
-             <selector>input[name='start_at']</selector>
-         </queue_start_at>
-         <stores>
--            <selector>select[name="stores[]"]</selector>
-+            <selector>select[name="stores[0]"]</selector>
-             <input>multiselectgrouplist</input>
-         </stores>
-         <newsletter_subject>
-diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/NavigateMenuTest.xml
-index 13843a50868..b1a6b3e0c43 100644
---- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/NavigateMenuTest.xml
-@@ -8,21 +8,25 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest46">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Marketing > Newsletter Template</data>
-             <data name="pageTitle" xsi:type="string">Newsletter Templates</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest47">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Marketing > Newsletter Queue</data>
-             <data name="pageTitle" xsi:type="string">Newsletter Queue</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest48">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Marketing > Newsletter Subscribers</data>
-             <data name="pageTitle" xsi:type="string">Newsletter Subscribers</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest49">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Newsletter Problem Reports</data>
-             <data name="pageTitle" xsi:type="string">Newsletter Problems Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml b/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml
-index cbdce590571..bc529729f12 100644
---- a/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\PageCache\Test\TestCase\FlushStaticFilesCacheButtonVisibilityTest" summary="Flush Static Files Cache button visibility" ticketId="MAGETWO-39934">
-         <variation name="FlushStaticFilesCacheButtonVisibilityTest">
--            <data name="tag" xsi:type="string">severity:S3</data>
-+            <data name="tag" xsi:type="string">severity:S3, mftf_migrated:yes</data>
-             <constraint name="Magento\PageCache\Test\Constraint\AssertFlushStaticFilesCacheButtonVisibility" />
-         </variation>
-     </testCase>
-diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/NavigateMenuTest.xml
-index d7d031f559f..114235e7552 100644
---- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/NavigateMenuTest.xml
-@@ -8,13 +8,13 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate through admin menu" ticketId="MAGETWO-34874">
-         <variation name="NavigateMenuTest50">
--            <data name="tag" xsi:type="string">severity:S0</data>
-+            <data name="tag" xsi:type="string">severity:S0, mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > PayPal Settlement</data>
-             <data name="pageTitle" xsi:type="string">PayPal Settlement Reports</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest51">
--            <data name="tag" xsi:type="string">severity:S0</data>
-+            <data name="tag" xsi:type="string">severity:S0, mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Sales > Billing Agreements</data>
-             <data name="pageTitle" xsi:type="string">Billing Agreements</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Coupons/Filter.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Coupons/Filter.xml
-index d66c3b702f0..51809448e4e 100644
---- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Coupons/Filter.xml
-+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Coupons/Filter.xml
-@@ -29,7 +29,7 @@
-             <input>select</input>
-         </price_rule_type>
-         <order_statuses>
--            <selector>[name="order_statuses[]"]</selector>
-+            <selector>[name="order_statuses[0]"]</selector>
-             <input>multiselect</input>
-         </order_statuses>
-         <rules_list>
-diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/TaxRule/Filter.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/TaxRule/Filter.xml
-index 08e783e1329..5820de6772e 100644
---- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/TaxRule/Filter.xml
-+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/TaxRule/Filter.xml
-@@ -23,7 +23,7 @@
-             <input>select</input>
-         </show_order_statuses>
-         <order_statuses>
--            <selector>[name="order_statuses[]"]</selector>
-+            <selector>[name="order_statuses[0]"]</selector>
-             <input>multiselect</input>
-         </order_statuses>
-         <show_empty_rows>
-diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportStatisticsNoticeMessage.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportStatisticsNoticeMessage.php
-index f68666366a6..4abb2a6ead8 100644
---- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportStatisticsNoticeMessage.php
-+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportStatisticsNoticeMessage.php
-@@ -7,8 +7,6 @@
- namespace Magento\Reports\Test\Constraint;
- 
- use Magento\Reports\Test\Page\Adminhtml\SalesReport;
--use Magento\Sales\Test\Fixture\OrderInjectable;
--use DateTime;
- 
- /**
-  * Assert that message in Sales Reports Pages displays correct date/time.
-@@ -27,22 +25,22 @@ class AssertReportStatisticsNoticeMessage extends AbstractAssertSalesReportResul
-      *
-      * @param array $salesReport
-      * @param SalesReport $salesReportPage
--     * @param DateTime $currentDate
-      * @return void
-      */
-     public function processAssert(
-         array $salesReport,
--        SalesReport $salesReportPage,
--        DateTime $currentDate
-+        SalesReport $salesReportPage
-     ) {
-+        $timezone = new \DateTimeZone($_ENV['magento_timezone']);
-+        $initialDate = new \DateTime('now', $timezone);
-         $this->salesReportPage = $salesReportPage;
-         $this->searchInSalesReportGrid($salesReport);
--        $date = $this->getLastUpdatedDate();
--        $currentDateTime = $currentDate->format('M j, Y, g');
--        $displayedDateTime = date('M j, Y, g', strtotime($date));
--        \PHPUnit\Framework\Assert::assertEquals(
--            $currentDateTime,
--            $displayedDateTime,
-+        $displayedDate = new \DateTime($this->getLastUpdatedDate(), $timezone);
-+        $currentDate = new \DateTime('now', $timezone);
-+
-+        \PHPUnit\Framework\Assert::assertTrue(
-+            $displayedDate->getTimestamp() > $initialDate->getTimestamp()
-+            && $displayedDate->getTimestamp() < $currentDate->getTimestamp(),
-             "Message in Sales Reports Page is displayed in an incorrect timezone."
-         );
-     }
-diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php
-index 745450aa2c0..1236a86e160 100644
---- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php
-+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php
-@@ -52,7 +52,7 @@ class AssertSalesReportIntervalResult extends AbstractAssertSalesReportResult
-     {
-         $data = [];
-         foreach ($salesResult as $key => $result) {
--            $data[$key] = floatval($result);
-+            $data[$key] = (float)$result;
-         }
- 
-         return $data;
-diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php
-index 5f435e48229..423ca6dafbd 100644
---- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php
-+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php
-@@ -52,7 +52,7 @@ class AssertSalesReportTotalResult extends AbstractAssertSalesReportResult
-     {
-         $data = [];
-         foreach ($salesResult as $key => $result) {
--            $data[$key] = floatval($result);
-+            $data[$key] = (float)$result;
-         }
- 
-         return $data;
-diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
-index 72a3b2b5f68..610387d9a39 100644
---- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
-@@ -34,7 +34,7 @@ class AbandonedCartsReportEntityTest extends Injectable
- {
-     /* tags */
-     const MVP = 'no';
--    const STABLE = 'no';
-+    const STABLE = 'yes';
-     /* end tags */
- 
-     /**
-diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NavigateMenuTest.xml
-index 08cce1ffe7d..4e3cd182476 100644
---- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NavigateMenuTest.xml
-@@ -8,76 +8,91 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate through Reports admin menu">
-         <variation name="NavigateMenuTest55">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Products in Cart</data>
-             <data name="pageTitle" xsi:type="string">Products in Carts</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest56">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Abandoned Carts</data>
-             <data name="pageTitle" xsi:type="string">Abandoned Carts</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest57">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Orders</data>
-             <data name="pageTitle" xsi:type="string">Orders Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest58">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Tax</data>
-             <data name="pageTitle" xsi:type="string">Tax Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest59">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Invoiced</data>
-             <data name="pageTitle" xsi:type="string">Invoice Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest60">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Coupons</data>
-             <data name="pageTitle" xsi:type="string">Coupons Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest61">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Order Total</data>
-             <data name="pageTitle" xsi:type="string">Order Total Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest62">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Order Count</data>
-             <data name="pageTitle" xsi:type="string">Order Count Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest63">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > New</data>
-             <data name="pageTitle" xsi:type="string">New Accounts Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest64">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Views</data>
-             <data name="pageTitle" xsi:type="string">Product Views Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest65">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Bestsellers</data>
-             <data name="pageTitle" xsi:type="string">Bestsellers Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest66">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Low Stock</data>
-             <data name="pageTitle" xsi:type="string">Low Stock Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest67">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Ordered</data>
-             <data name="pageTitle" xsi:type="string">Ordered Products Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest68">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Downloads</data>
-             <data name="pageTitle" xsi:type="string">Downloads Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-         </variation>
-         <variation name="NavigateMenuTest69">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > Refresh Statistics</data>
-             <data name="pageTitle" xsi:type="string">Refresh Statistics</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php
-index 30e790f978c..1a4cb787bf1 100644
---- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php
-@@ -102,10 +102,12 @@ class ProductsInCartReportEntityTest extends Injectable
-         $productUrl = $_ENV['app_frontend_url'] . $product->getUrlKey() . '.html';
-         $browser->open($productUrl);
-         $this->catalogProductView->getViewBlock()->addToCart($product);
-+        $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
-         if ($isGuest) {
-             $this->objectManager->create(\Magento\Customer\Test\TestStep\LogoutCustomerOnFrontendStep::class)->run();
-             $browser->open($productUrl);
-             $this->catalogProductView->getViewBlock()->addToCart($product);
-+            $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
-         }
-     }
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.xml
-index 998102bcfbc..20501b73813 100644
---- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.xml
-@@ -22,7 +22,6 @@
-             <constraint name="Magento\Reports\Test\Constraint\AssertReportStatisticsNoticeMessage" />
-         </variation>
-         <variation name="SalesOrderReportEntityTestVariation2">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
-             <data name="salesReport/report_type" xsi:type="string">Order Created</data>
-@@ -36,7 +35,6 @@
-             <constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult" />
-         </variation>
-         <variation name="SalesOrderReportEntityTestVariation3">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
-             <data name="salesReport/report_type" xsi:type="string">Order Updated</data>
-@@ -50,5 +48,19 @@
-             <constraint name="Magento\Reports\Test\Constraint\AssertSalesReportIntervalResult" />
-             <constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult" />
-         </variation>
-+        <variation name="SalesOrderReportEntityTestVariation4">
-+            <data name="order/dataset" xsi:type="string">default</data>
-+            <data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
-+            <data name="salesReport/report_type" xsi:type="string">Order Created</data>
-+            <data name="salesReport/period_type" xsi:type="string">Year</data>
-+            <data name="salesReport/from" xsi:type="string">12/31/Y 12:00 a-1 year</data>
-+            <data name="salesReport/to" xsi:type="string">m/d/Y 12:00</data>
-+            <data name="salesReport/show_order_statuses" xsi:type="string">Any</data>
-+            <data name="salesReport/show_empty_rows" xsi:type="string">Yes</data>
-+            <data name="salesReport/show_actual_columns" xsi:type="string">No</data>
-+            <constraint name="Magento\Reports\Test\Constraint\AssertSalesReportIntervalResult" />
-+            <constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult" />
-+            <constraint name="Magento\Reports\Test\Constraint\AssertReportStatisticsNoticeMessage" />
-+        </variation>
-     </testCase>
- </config>
-diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.xml
-index 27014c0afb3..58fad5925e5 100644
---- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.xml
-@@ -20,7 +20,6 @@
-             <constraint name="Magento\Reports\Test\Constraint\AssertRefundReportIntervalResult" />
-         </variation>
-         <variation name="SalesRefundsReportEntityTestVariation2">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="description" xsi:type="string">assert refunds month report</data>
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
-@@ -33,7 +32,6 @@
-             <constraint name="Magento\Reports\Test\Constraint\AssertRefundReportIntervalResult" />
-         </variation>
-         <variation name="SalesRefundsReportEntityTestVariation3">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="description" xsi:type="string">assert refund Daily report</data>
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Rating/Edit/RatingForm.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Rating/Edit/RatingForm.xml
-index 3e1a1c727c6..504ce64bf2a 100644
---- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Rating/Edit/RatingForm.xml
-+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Rating/Edit/RatingForm.xml
-@@ -12,7 +12,7 @@
-         <strategy>css selector</strategy>
-         <fields>
-             <stores>
--                <selector>[name="stores[]"]</selector>
-+                <selector>[name="stores[0]"]</selector>
-                 <input>multiselectgrouplist</input>
-             </stores>
-             <is_active>
-diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/NavigateMenuTest.xml
-index 8445a21604c..334497cc2f7 100644
---- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/NavigateMenuTest.xml
-@@ -8,21 +8,25 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest70">
--            <data name="menuItem" xsi:type="string">Marketing > Reviews</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="menuItem" xsi:type="string">Marketing > All Reviews</data>
-             <data name="pageTitle" xsi:type="string">Reviews</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest71">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > By Customers</data>
-             <data name="pageTitle" xsi:type="string">Customer Reviews Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest72">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Reports > By Products</data>
-             <data name="pageTitle" xsi:type="string">Product Reviews Report</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest73">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Stores > Rating</data>
-             <data name="pageTitle" xsi:type="string">Ratings</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
-index 5b9ae99a2e8..f460cd91167 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
-@@ -323,7 +323,6 @@ class Create extends Block
-      */
-     public function selectShippingMethod(array $shippingMethod)
-     {
--        $this->_rootElement->find($this->orderMethodsSelector)->click();
-         $this->getShippingMethodBlock()->selectShippingMethod($shippingMethod);
-         $this->getTemplateBlock()->waitLoader();
-     }
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
-index dee1336c14e..e5c414c4807 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
-@@ -22,6 +22,13 @@ class Method extends Block
-      */
-     private $paymentMethod = '#p_method_%s';
- 
-+    /**
-+     * Get available payment methods link.
-+     *
-+     * @var string
-+     */
-+    private $billingMethodsLink = '#order-billing_method_summary a';
-+
-     /**
-      * Purchase order number selector.
-      *
-@@ -59,6 +66,13 @@ class Method extends Block
-      */
-     public function selectPaymentMethod(array $payment, CreditCard $creditCard = null)
-     {
-+        $this->waitForElementNotVisible($this->loader);
-+        $billingMethodsLink = $this->_rootElement->find($this->billingMethodsLink);
-+        if ($billingMethodsLink->isPresent()) {
-+            $billingMethodsLink->click();
-+            $this->waitForElementNotVisible($this->loader);
-+        }
-+
-         $paymentMethod = $payment['method'];
-         $paymentInput = $this->_rootElement->find(sprintf($this->paymentMethod, $paymentMethod));
-         if ($paymentInput->isVisible()) {
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
-index daa58a3447c..61c48d62630 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
-@@ -73,6 +73,7 @@ class Items extends Block
-                 return $addProductsButton->isVisible() ? true : null;
-             }
-         );
-+        $this->getTemplateBlock()->waitLoader();
-         $this->_rootElement->find($this->addProducts, Locator::SELECTOR_XPATH)->click();
-         $this->getTemplateBlock()->waitLoader();
-     }
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
-index 2ee6269c39d..b5acaf01f54 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
-@@ -44,13 +44,12 @@ class Method extends Block
-     public function selectShippingMethod(array $shippingMethod)
-     {
-         $this->waitFormLoading();
--        $this->_rootElement->waitUntil(
--            function () {
--                return $this->_rootElement->find($this->shippingMethodsLink)->isVisible() ? true : null;
--            }
--        );
-+        $shippingMethodsLink = $this->_rootElement->find($this->shippingMethodsLink);
-+        if ($shippingMethodsLink->isPresent()) {
-+            $shippingMethodsLink->click();
-+            $this->waitFormLoading();
-+        }
- 
--        $this->_rootElement->find($this->shippingMethodsLink)->click();
-         $selector = sprintf(
-             $this->shippingMethod,
-             $shippingMethod['shipping_service'],
-@@ -67,7 +66,6 @@ class Method extends Block
-      */
-     private function waitFormLoading()
-     {
--        $this->_rootElement->click();
-         $this->browser->waitUntil(
-             function () {
-                 return $this->browser->find($this->waitElement)->isVisible() ? null : true;
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Report/Filter/Form.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Report/Filter/Form.xml
-index d868798eba7..294f64966bd 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Report/Filter/Form.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Report/Filter/Form.xml
-@@ -26,7 +26,7 @@
-             <input>select</input>
-         </show_order_statuses>
-         <order_statuses>
--            <selector>[name="order_statuses[]"]</selector>
-+            <selector>[name="order_statuses[0]"]</selector>
-             <input>multiselect</input>
-         </order_statuses>
-         <show_actual_columns>
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
-index fffb0746d49..2c87d8539f0 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Sales\Test\Constraint;
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
-index c3e8558df7f..fc854bd8c50 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
-@@ -39,8 +39,8 @@ class AssertOrderStatusIsCorrect extends AbstractConstraint
-         /** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
-         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
-         \PHPUnit\Framework\Assert::assertEquals(
--            $infoTab->getOrderStatus(),
--            $orderStatus
-+            $orderStatus,
-+            $infoTab->getOrderStatus()
-         );
-     }
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductsQtyAfterOrderCancel.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductsQtyAfterOrderCancel.php
-index 28259c8f6d9..24027cacd9e 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductsQtyAfterOrderCancel.php
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductsQtyAfterOrderCancel.php
-@@ -52,7 +52,7 @@ class AssertProductsQtyAfterOrderCancel extends AbstractConstraint
-         AssertProductForm $assertProductForm,
-         AssertConfigurableProductForm $assertConfigurableProductForm
-     ) {
--        for ($i = 0; $i < count($order->getEntityId()['products']); $i++) {
-+        for ($i = 0, $count = count($order->getEntityId()['products']); $i < $count; $i++) {
-             $product = $order->getEntityId()['products'][$i];
-             $productData = $product->getData();
-             if ($product instanceof BundleProduct) {
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Webapi.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Webapi.php
-index 073fb096714..972dc0f510b 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Webapi.php
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Webapi.php
-@@ -200,7 +200,7 @@ class Webapi extends AbstractWebapi implements OrderInjectableInterface
-         $this->webapiTransport->close();
-         if (!is_numeric($response)) {
-             $this->eventManager->dispatchEvent(['webapi_failed'], [$response]);
--            throw new \Exception("Could not set billing addresss to quote!");
-+            throw new \Exception("Could not set billing address to quote!");
-         }
-     }
- 
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AssignCustomOrderStatusTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AssignCustomOrderStatusTest.xml
-index 6ac008dc4e9..808201b8e6a 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AssignCustomOrderStatusTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AssignCustomOrderStatusTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Sales\Test\TestCase\AssignCustomOrderStatusTest" summary="Assign Custom Order Status" ticketId="MAGETWO-29382">
-         <variation name="AssignCustomOrderStatusTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="orderStatusState/state" xsi:type="string">Pending</data>
-             <data name="orderStatusState/is_default" xsi:type="string">Yes</data>
-             <data name="orderStatusState/visible_on_front" xsi:type="string">No</data>
-@@ -16,6 +17,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderNotVisibleOnMyAccount" />
-         </variation>
-         <variation name="AssignCustomOrderStatusTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="orderStatusState/state" xsi:type="string">Pending</data>
-             <data name="orderStatusState/is_default" xsi:type="string">Yes</data>
-             <data name="orderStatusState/visible_on_front" xsi:type="string">Yes</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.xml
-index 4d997d528c0..6cf6a58e6d8 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.xml
-@@ -12,13 +12,13 @@
-             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::low_stock_product,catalogProductVirtual::virtual_low_stock,bundleProduct::bundle_low_stock,configurableProduct::configurable_low_stock</data>
-             <data name="status" xsi:type="string">Canceled</data>
-             <data name="configData" xsi:type="string">checkmo</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelSuccessMessage" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertProductsQtyAfterOrderCancel" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
-         </variation>
-         <variation name="CancelCreatedOrderTestVariationWithZeroSubtotalCheckout" summary="Cancel order with zero subtotal checkout payment method and check status on storefront">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/payment_auth_expiration/method" xsi:type="string">free</data>
-             <data name="order/data/shipping_method" xsi:type="string">freeshipping_freeshipping</data>
-@@ -26,6 +26,7 @@
-             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
-             <data name="status" xsi:type="string">Canceled</data>
-             <data name="configData" xsi:type="string">zero_subtotal_checkout, freeshipping</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelSuccessMessage" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
-         </variation>
-@@ -34,6 +35,7 @@
-             <data name="order/data/payment_auth_expiration/method" xsi:type="string">banktransfer</data>
-             <data name="status" xsi:type="string">Canceled</data>
-             <data name="configData" xsi:type="string">banktransfer</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelSuccessMessage" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
-         </variation>
-@@ -42,14 +44,17 @@
-             <data name="order/data/payment_auth_expiration/method" xsi:type="string">cashondelivery</data>
-             <data name="status" xsi:type="string">Canceled</data>
-             <data name="configData" xsi:type="string">cashondelivery</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelSuccessMessage" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
-         </variation>
-         <variation name="CancelCreatedOrderTestVariationWithPurchaseOrderPaymentMethod" summary="Cancel order with purchase order payment method and check status on storefront">
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/payment_auth_expiration/method" xsi:type="string">purchaseorder</data>
-+            <data name="order/data/payment_auth_expiration/po_number" xsi:type="string">po_number</data>
-             <data name="status" xsi:type="string">Canceled</data>
-             <data name="configData" xsi:type="string">purchaseorder</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelSuccessMessage" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
-         </variation>
-@@ -57,6 +62,7 @@
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::low_stock_product</data>
-             <data name="configData" xsi:type="string">decrease_stock_after_order_no</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelSuccessMessage" />
-             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductsQtyAfterReorder" />
-         </variation>
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml
-index 9a781be52f0..1c07dee56a9 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Sales\Test\TestCase\CreateCreditMemoEntityTest" summary="Create Credit Memo for Offline Payment Methods" ticketId="MAGETWO-29116">
-         <variation name="CreateCreditMemoEntityTestVariation1" summary="Assert items return to stock (partial refund)">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/data/refund" xsi:type="array">
-                 <item name="0" xsi:type="array">
-                     <item name="invoiceId" xsi:type="string">0</item>
-@@ -37,6 +38,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertCreditMemoItems" />
-         </variation>
-         <variation name="CreateCreditMemoEntityTestVariation2" summary="Assert 0 shipping refund">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/data/refund" xsi:type="array">
-                 <item name="0" xsi:type="array">
-                     <item name="invoiceId" xsi:type="string">0</item>
-@@ -64,6 +66,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertCreditMemoItems" />
-         </variation>
-         <variation name="CreateCreditMemoEntityTestVariationWithCashOnDeliveryPaymentMethod" summary="Assert 0 shipping refund with Cash on delivery payment method">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/data/refund" xsi:type="array">
-                 <item name="0" xsi:type="array">
-                     <item name="invoiceId" xsi:type="string">0</item>
-@@ -87,6 +90,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertRefundedGrandTotalOnFrontend" />
-         </variation>
-         <variation name="CreateCreditMemoEntityTestVariationWithPurchaseOrderPaymentMethod" summary="Assert 0 shipping refund with Purchase Order payment method">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/data/refund" xsi:type="array">
-                 <item name="0" xsi:type="array">
-                     <item name="invoiceId" xsi:type="string">0</item>
-@@ -104,6 +108,7 @@
-             </data>
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/payment_auth_expiration/method" xsi:type="string">purchaseorder</data>
-+            <data name="order/data/payment_auth_expiration/po_number" xsi:type="string">po_number</data>
-             <data name="order/data/price/dataset" xsi:type="string">full_refund_with_zero_shipping_refund</data>
-             <data name="configData" xsi:type="string">purchaseorder</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.xml
-index 38ce04fa56d..e05d0fea6b1 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.xml
-@@ -8,17 +8,20 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Sales\Test\TestCase\CreateCustomOrderStatusEntityTest" summary="Create Custom Order Status Entity" ticketId="MAGETWO-23412">
-         <variation name="CreateCustomOrderStatusEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="orderStatus/data/status" xsi:type="string">order_status%isolation%</data>
-             <data name="orderStatus/data/label" xsi:type="string">orderLabel%isolation%</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusSuccessCreateMessage" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusInGrid" />
-         </variation>
-         <variation name="CreateCustomOrderStatusEntityTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="orderStatus/data/status" xsi:type="string">pending</data>
-             <data name="orderStatus/data/label" xsi:type="string">orderLabel%isolation%</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusDuplicateStatus" />
-         </variation>
-         <variation name="CreateCustomOrderStatusEntityTestVariation3">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="orderStatus/data/status" xsi:type="string">order_status%isolation%</data>
-             <data name="orderStatus/data/label" xsi:type="string">Suspected Fraud</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusSuccessCreateMessage" />
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.xml
-index 5896c2b8eb6..a6a1d61d0d6 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Sales\Test\TestCase\CreateInvoiceEntityTest" summary="Create Invoice for Offline Payment Methods" ticketId="MAGETWO-28209, MAGETWO-45491">
-         <variation name="CreateInvoiceEntityTestVariation1" summary="Create Invoice for Offline Payment Methods and check invoiced order on admin dashboard" ticketId="MAGETWO-28209, MAGETWO-45491">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
-             <data name="order/data/total_qty_ordered/0" xsi:type="string">1</data>
-@@ -34,6 +35,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertInvoiceItems" />
-         </variation>
-         <variation name="CreateInvoiceEntityTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/price/dataset" xsi:type="string">partial_invoice</data>
-             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::product_100_dollar</data>
-@@ -60,6 +62,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertInvoicedAmountOnFrontend" />
-         </variation>
-         <variation name="CreateInvoiceEntityTestVariationWithCashOnDeliveryPaymentMethod">
-+        <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/price/dataset" xsi:type="string">partial_invoice</data>
-             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::product_100_dollar</data>
-@@ -83,11 +86,13 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertInvoicedAmountOnFrontend" />
-         </variation>
-         <variation name="CreateInvoiceEntityTestVariationWithPurchaseOrderPaymentMethod">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/price/dataset" xsi:type="string">partial_invoice</data>
-             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::product_100_dollar</data>
-             <data name="order/data/total_qty_ordered/0" xsi:type="string">-</data>
-             <data name="order/data/payment_auth_expiration/method" xsi:type="string">purchaseorder</data>
-+            <data name="order/data/payment_auth_expiration/po_number" xsi:type="string">po_number</data>
-             <data name="order/data/invoice" xsi:type="array">
-                 <item name="0" xsi:type="array">
-                     <item name="items_data" xsi:type="array">
-@@ -106,6 +111,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertInvoicedAmountOnFrontend" />
-         </variation>
-         <variation name="CreateInvoiceEntityTestVariationWithZeroSubtotalCheckout">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/price/dataset" xsi:type="string">free_invoice</data>
-             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendPartOneTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendPartOneTest.xml
-index 0a5958b506a..880c66483d5 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendPartOneTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendPartOneTest.xml
-@@ -69,7 +69,6 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderByDateInOrdersGrid" />
-         </variation>
-         <variation name="CreateOrderBackendTestVariation4">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="description" xsi:type="string">Create order with virtual product for registered UK customer using Bank Transfer payment method</data>
-             <data name="products/0" xsi:type="string">catalogProductVirtual::default</data>
-             <data name="customer/dataset" xsi:type="string">default</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/FrontendOrderPagerTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/FrontendOrderPagerTest.xml
-index 871f6adfb51..77aedc21b36 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/FrontendOrderPagerTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/FrontendOrderPagerTest.xml
-@@ -8,10 +8,12 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Sales\Test\TestCase\FrontendOrderPagerTest" summary="Pager is enabled for orders with more than 20 items" ticketId="MAGETWO-63457">
-         <variation name="FrontendOrderPagerTestVariation1" summary="Pager is absent for 20 order items" ticketId="MAGETWO-63457">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/dataset" xsi:type="string">twenty_products</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderItemsPagerHiddenOnFrontend" />
-         </variation>
-         <variation name="FrontendOrderPagerTestVariation2" summary="Pager is displayed for 21 order items" ticketId="MAGETWO-63459">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/dataset" xsi:type="string">twenty_one_products</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderItemsPagerDisplayedOnFrontend" />
-         </variation>
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
-index 6ae9d19a898..28894ed6cc1 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
-@@ -9,7 +9,6 @@
-     <testCase name="Magento\Ui\Test\TestCase\GridSortingTest" summary="Grid UI Component Sorting" ticketId="MAGETWO-41328">
-         <variation name="SalesOrderGridSorting">
-             <data name="tag" xsi:type="string">severity:S2</data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="description" xsi:type="string">Verify sales order grid storting</data>
-             <data name="steps" xsi:type="array">
-                 <item name="0" xsi:type="string">-</item>
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/HoldCreatedOrderTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/HoldCreatedOrderTest.xml
-index 8fc6c40f578..43eaa07fd69 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/HoldCreatedOrderTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/HoldCreatedOrderTest.xml
-@@ -13,6 +13,7 @@
-             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::default,catalogProductSimple::default</data>
-             <data name="orderButtonsUnavailable" xsi:type="string">Invoice,Cancel,Reorder,Ship,Edit</data>
-             <data name="status" xsi:type="string">On Hold</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderOnHoldSuccessMessage" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsUnavailable" />
-             <constraint name="Magento\Sales\Test\Constraint\AssertUnholdButton" />
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
-index d4b9856c5e3..90a75bd1bda 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Sales\Test\TestCase\MassOrdersUpdateTest" summary="Mass Update Orders" ticketId="MAGETWO-27897">
-         <variation name="MassOrdersUpdateTestVariation1">
--            <data name="tag" xsi:type="string">stable:no</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">cancel orders in status Pending and Processing</data>
-             <data name="steps" xsi:type="string">-</data>
-             <data name="action" xsi:type="string">Cancel</data>
-@@ -18,6 +18,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
-         </variation>
-         <variation name="MassOrdersUpdateTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">try to cancel orders in status Complete, Closed</data>
-             <data name="steps" xsi:type="string">invoice, shipment|invoice, credit memo</data>
-             <data name="action" xsi:type="string">Cancel</data>
-@@ -27,7 +28,8 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
-         </variation>
-         <variation name="MassOrdersUpdateTestVariation3">
--            <data name="description" xsi:type="string">try to cancel orders in status Pending, Closed</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="description" xsi:type="string">try to cancel orders in status Processing, Closed</data>
-             <data name="steps" xsi:type="string">invoice|invoice, credit memo</data>
-             <data name="action" xsi:type="string">Cancel</data>
-             <data name="ordersCount" xsi:type="string">2</data>
-@@ -36,6 +38,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
-         </variation>
-         <variation name="MassOrdersUpdateTestVariation4">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Put orders in statuses Pending, Processing on Hold</data>
-             <data name="steps" xsi:type="string">-|invoice</data>
-             <data name="action" xsi:type="string">Hold</data>
-@@ -45,7 +48,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
-         </variation>
-         <variation name="MassOrdersUpdateTestVariation5">
--            <data name="tag" xsi:type="string">stable:no</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Try to put order in status Complete on Hold</data>
-             <data name="steps" xsi:type="string">invoice, shipment</data>
-             <data name="action" xsi:type="string">Hold</data>
-@@ -55,7 +58,8 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
-         </variation>
-         <variation name="MassOrdersUpdateTestVariation6">
--            <data name="description" xsi:type="string">Release order in statuse On Hold</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-+            <data name="description" xsi:type="string">Release order in status On Hold</data>
-             <data name="steps" xsi:type="string">on hold</data>
-             <data name="action" xsi:type="string">Unhold</data>
-             <data name="ordersCount" xsi:type="string">1</data>
-@@ -64,6 +68,7 @@
-             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
-         </variation>
-         <variation name="MassOrdersUpdateTestVariation7">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">try to Release order in status Pending</data>
-             <data name="steps" xsi:type="string">-</data>
-             <data name="action" xsi:type="string">Unhold</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
-index 6f568df8f21..ddb66fe921e 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
-@@ -8,13 +8,13 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Sales\Test\TestCase\MoveLastOrderedProductsOnOrderPageTest" summary="Add Products to Order from Last Ordered Products Section" ticketId="MAGETWO-27640">
-         <variation name="MoveLastOrderedProductsOnOrderPageTestVariation1">
--            <data name="tag" xsi:type="string">stable:no</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::default</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
-         </variation>
-         <variation name="MoveLastOrderedProductsOnOrderPageTestVariation2">
--            <data name="issue" xsi:type="string">MAGETWO-58762: Customer grid does not open in MoveLastOrderedProductsOnOrderPageTestVariation2 on Jenkins</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="order/dataset" xsi:type="string">default</data>
-             <data name="order/data/entity_id/products" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.xml
-index 3badce50c6f..cfeb5719ac6 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.xml
-@@ -8,13 +8,13 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Sales\Test\TestCase\MoveProductsInComparedOnOrderPageTest" summary="Add Products to Order from Products in Comparison List Section" ticketId="MAGETWO-28050">
-         <variation name="MoveProductsInComparedOnOrderPageTestVariation1">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-+            <data name="tag" xsi:type="string">to_maintain:yes, mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
-             <data name="products/1" xsi:type="string">catalogProductSimple::default</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
-         </variation>
-         <variation name="MoveProductsInComparedOnOrderPageTestVariation2">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-+            <data name="tag" xsi:type="string">to_maintain:yes, mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
-             <data name="products/1" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.xml
-index 579e8543d8c..e32f5c2d18e 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.xml
-@@ -8,12 +8,12 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Sales\Test\TestCase\MoveRecentlyViewedProductsOnOrderPageTest" summary="Add Products to Order from Recently Viewed Products Section" ticketId="MAGETWO-29723">
-         <variation name="MoveRecentlyViewedProductsOnOrderPageTestVariation1">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-+            <data name="tag" xsi:type="string">to_maintain:yes, mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">configurableProduct::default</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
-         </variation>
-         <variation name="MoveRecentlyViewedProductsOnOrderPageTestVariation2">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-+            <data name="tag" xsi:type="string">to_maintain:yes, mftf_migrated:yes</data>
-             <data name="products/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
-         </variation>
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php
-index 2b0bd7178cd..91b4f711700 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php
-@@ -144,6 +144,7 @@ class MoveShoppingCartProductsOnOrderPageTest extends Injectable
-         )->run();
-         $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
-         $this->catalogProductView->getViewBlock()->addToCart($product);
-+        $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
- 
-         //Steps
-         $this->customerIndex->open();
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.xml
-index f10ef041d40..df840455850 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.xml
-@@ -8,12 +8,12 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Sales\Test\TestCase\MoveShoppingCartProductsOnOrderPageTest" summary="Add Products to Order from Shopping Cart " ticketId="MAGETWO-28540">
-         <variation name="MoveShoppingCartProductsOnOrderPageTestVariation1">
--            <data name="tag" xsi:type="string">stable:no</data>
-+            <data name="tag" xsi:type="string">stable:no, mftf_migrated:yes</data>
-             <data name="product" xsi:type="string">catalogProductSimple::default</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
-         </variation>
-         <variation name="MoveShoppingCartProductsOnOrderPageTestVariation2" firstConstraint="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductInItemsOrderedGrid" method="test">
--            <data name="tag" xsi:type="string">stable:no</data>
-+            <data name="tag" xsi:type="string">stable:no, mftf_migrated:yes</data>
-             <data name="product" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
-             <constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
-         </variation>
-diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/NavigateMenuTest.xml
-index 316ba33f19f..5cc673f4b4f 100644
---- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/NavigateMenuTest.xml
-@@ -8,31 +8,37 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest77">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Sales > Orders</data>
-             <data name="pageTitle" xsi:type="string">Orders</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest78">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Sales > Invoices</data>
-             <data name="pageTitle" xsi:type="string">Invoices</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest79">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Sales > Shipments</data>
-             <data name="pageTitle" xsi:type="string">Shipments</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest80">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Sales > Credit Memos</data>
-             <data name="pageTitle" xsi:type="string">Credit Memos</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest81">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Sales > Transactions</data>
-             <data name="pageTitle" xsi:type="string">Transactions</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest82">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Stores > Order Status</data>
-             <data name="pageTitle" xsi:type="string">Order Status</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php
-index 2627f99d4c8..54cec6cf279 100644
---- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php
-+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php
-@@ -28,6 +28,13 @@ class PromoQuoteForm extends FormSections
-      */
-     protected $waitForSelectorVisible = false;
- 
-+    /**
-+     * Selector of name element on the form.
-+     *
-+     * @var string
-+     */
-+    private $nameElementSelector = 'input[name=name]';
-+
-     /**
-      * Fill form with sections.
-      *
-@@ -38,6 +45,8 @@ class PromoQuoteForm extends FormSections
-      */
-     public function fill(FixtureInterface $fixture, SimpleElement $element = null, array $replace = null)
-     {
-+        $this->waitForElementNotVisible($this->waitForSelector);
-+        $this->waitForElementVisible($this->nameElementSelector);
-         $sections = $this->getFixtureFieldsByContainers($fixture);
-         if ($replace) {
-             $sections = $this->prepareData($sections, $replace);
-diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
-index 521d7d68ac4..5cb5b4db727 100644
---- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
-+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
-@@ -271,7 +271,7 @@
-             <field name="coupon_type" xsi:type="string">No Coupon</field>
-             <field name="sort_order" xsi:type="string">1</field>
-             <field name="is_rss" xsi:type="string">Yes</field>
--            <field name="conditions_serialized" xsi:type="string">[Total Items Quantity|equals or greater than|3]{Product attribute combination|FOUND|ALL|:[[Category|is|2]]}</field>
-+            <field name="conditions_serialized" xsi:type="string">[Total Items Quantity|equals or greater than|3]</field>
-             <field name="simple_action" xsi:type="string">Percent of product price discount</field>
-             <field name="discount_amount" xsi:type="string">25</field>
-             <field name="apply_to_shipping" xsi:type="string">No</field>
-diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
-index e160fef6095..3dfe4cf1185 100644
---- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
-@@ -31,7 +31,6 @@
-             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
-         </variation>
-         <variation name="ApplySeveralSalesRuleEntityTestVariation3" summary="Rules with different priority, both are applied">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="salesRules/rule1" xsi:type="string">active_sales_rule_product_attribute</data>
-             <data name="salesRules/rule2" xsi:type="string">active_sales_total_items</data>
-             <data name="cartPrice/sub_total" xsi:type="string">250.00</data>
-@@ -44,7 +43,6 @@
-             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
-         </variation>
-         <variation name="ApplySeveralSalesRuleEntityTestVariation4" summary="Rules with different priority, none are applied">
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="salesRules/rule1" xsi:type="string">active_sales_rule_row_total</data>
-             <data name="salesRules/rule2" xsi:type="string">active_sales_total_items</data>
-             <data name="productForSalesRule1/dataset" xsi:type="string">simple_for_salesrule_1</data>
-diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityPartOneTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityPartOneTest.xml
-index 7ea54daccf5..23256b192b2 100644
---- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityPartOneTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityPartOneTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\SalesRule\Test\TestCase\CreateSalesRuleEntityPartOneTest" summary="Create Cart Price Rule" ticketId="MAGETWO-24855">
-         <variation name="CreateSalesRuleEntityTestVariation7">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="address/data/country_id" xsi:type="string">United States</data>
-             <data name="address/data/region_id" xsi:type="string">California</data>
-             <data name="address/data/postcode" xsi:type="string">95814</data>
-@@ -37,6 +38,7 @@
-             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleFreeShippingIsApplied" />
-         </variation>
-         <variation name="CreateSalesRuleEntityTestVariation8">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="address/data/country_id" xsi:type="string">United States</data>
-             <data name="address/data/region_id" xsi:type="string">California</data>
-             <data name="address/data/postcode" xsi:type="string">95814</data>
-@@ -66,6 +68,7 @@
-             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
-         </variation>
-         <variation name="CreateSalesRuleEntityTestVariation9">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="salesRule/data/name" xsi:type="string">Cart Price Rule9 %isolation%</data>
-             <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
-             <data name="salesRule/data/is_active" xsi:type="string">Yes</data>
-@@ -85,6 +88,7 @@
-             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsNotApplied" />
-         </variation>
-         <variation name="CreateSalesRuleEntityTestVariation10">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="salesRule/data/name" xsi:type="string">Cart Price Rule10 %isolation%</data>
-             <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
-             <data name="salesRule/data/is_active" xsi:type="string">Yes</data>
-@@ -110,6 +114,7 @@
-             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
-         </variation>
-         <variation name="CreateSalesRuleEntityTestVariation11">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="salesRule/data/name" xsi:type="string">Cart Price Rule11 %isolation%</data>
-             <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
-             <data name="salesRule/data/is_active" xsi:type="string">Yes</data>
-diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
-index 586ad2acee2..4995c1feb04 100644
---- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
-@@ -75,7 +75,6 @@
-             <data name="salesRule/data/coupon_code" xsi:type="string">Lorem ipsum dolor sit amet, consectetur adipiscing elit - %isolation%</data>
-             <data name="salesRule/data/simple_action" xsi:type="string">Fixed amount discount for whole cart</data>
-             <data name="salesRule/data/discount_amount" xsi:type="string">60</data>
--            <data name="salesRule/data/apply_to_shipping" xsi:type="string">No</data>
-             <data name="salesRule/data/simple_free_shipping" xsi:type="string">No</data>
-             <data name="salesRule/data/store_labels/0" xsi:type="string">Coupon code+Fixed amount discount for whole cart</data>
-             <data name="productForSalesRule1/dataset" xsi:type="string">simple_for_salesrule_1</data>
-diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.xml
-index ec3ccf331c2..c9af05b8f77 100644
---- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.xml
-@@ -8,16 +8,19 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\SalesRule\Test\TestCase\DeleteSalesRuleEntityTest" summary="Delete Sales Rule" ticketId="MAGETWO-24985">
-         <variation name="DeleteSalesRuleEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="salesRule/dataset" xsi:type="string">active_sales_rule_with_percent_price_discount_coupon</data>
-             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleSuccessDeleteMessage" />
-             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleIsNotPresentedInGrid" />
-         </variation>
-         <variation name="DeleteSalesRuleEntityTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="salesRule/dataset" xsi:type="string">active_sales_rule_with_complex_conditions</data>
-             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleSuccessDeleteMessage" />
-             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleIsNotPresentedInGrid" />
-         </variation>
-         <variation name="DeleteSalesRuleEntityTestVariation3" summary="Assert That Cart Price Rule Condition Is Not Applied" ticketId="MAGETWO-16987">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="salesRule/dataset" xsi:type="string">inactive_sales_rule</data>
-             <data name="productForSalesRule1/dataset" xsi:type="string">simple_for_salesrule_1</data>
-             <data name="productQuantity/productForSalesRule1" xsi:type="string">1</data>
-diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/NavigateMenuTest.xml
-index 0a100eabcff..1eeaeaaa483 100644
---- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/NavigateMenuTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest83">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Marketing > Cart Price Rules</data>
-             <data name="pageTitle" xsi:type="string">Cart Price Rules</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/AdvancedSearchWithAttributeTest.xml b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/AdvancedSearchWithAttributeTest.xml
-index 13c7051d0c1..733b110ec54 100644
---- a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/AdvancedSearchWithAttributeTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/AdvancedSearchWithAttributeTest.xml
-@@ -8,8 +8,6 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Search\Test\TestCase\AdvancedSearchWithAttributeTest" summary="Use Advanced Search by Decimal indexable attribute if Edit/Add Attribute" ticketId="MAGETWO-25931">
-         <variation name="AdvancedSearchWithWeightAttributeTestVariation1">
--            <data name="issue" xsi:type="string">MAGETWO-65408: [FT] Magento\Search\Test\TestCase\AdvancedSearchWithAttributeTest fails on Jenkins</data>
--            <data name="tag" xsi:type="string">to_maintain:yes</data>
-             <data name="productDropDownList/0" xsi:type="string">configurable</data>
-             <data name="productDropDownList/1" xsi:type="string">simple</data>
-             <data name="productDropDownList/2" xsi:type="string">bundle</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewRoleTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewRoleTest.xml
-index 73a2a71b7c3..0e4c33f7371 100644
---- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewRoleTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewRoleTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Security\Test\TestCase\LockAdminUserWhenCreatingNewRoleTest" summary="Lock admin user after entering incorrect password while creating new role">
-         <variation name="LockAdminUserWhenCreatingNewRoleTestVariation1">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="configData" xsi:type="string">user_lockout_failures</data>
-             <data name="customAdmin/dataset" xsi:type="string">custom_admin_with_default_role</data>
-             <data name="role/data/rolename" xsi:type="string">AdminRole%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewUserTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewUserTest.xml
-index c4cfe3f7f27..3bb370a15e9 100644
---- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewUserTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewUserTest.xml
-@@ -9,7 +9,7 @@
-     <testCase name="Magento\Security\Test\TestCase\LockAdminUserWhenCreatingNewUserTest" summary="Lock admin user after entering incorrect password while creating new User">
-         <variation name="LockAdminUserWhenCreatingNewUserTestVariation1">
-             <data name="configData" xsi:type="string">user_lockout_failures</data>
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
-             <data name="customAdmin/dataset" xsi:type="string">custom_admin_with_default_role</data>
-             <data name="user/data/username" xsi:type="string">AdminUser%isolation%</data>
-             <data name="user/data/firstname" xsi:type="string">FirstName%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml
-index 7c043a36708..07976ad01bd 100644
---- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Security\Test\TestCase\LockCustomerOnLoginPageTest" summary="Lock customer on login page">
-         <variation name="LockCustomerOnLoginPageTestVariation1">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1,mftf_migrated:yes</data>
-             <data name="configData" xsi:type="string">customer_max_login_failures_number,captcha_storefront_disable</data>
-             <data name="initialCustomer/dataset" xsi:type="string">default</data>
-             <data name="incorrectPassword" xsi:type="string">incorrect password</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.xml
-index 0b5b8a059cb..b4fbe7bb929 100644
---- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Security\Test\TestCase\ResetCustomerPasswordFailedTest" summary="Reset customer password.">
-         <variation name="ResetPasswordTestVariation">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1,mftf_migrated:yes</data>
-             <data name="customer/dataset" xsi:type="string">customer_US</data>
-             <data name="attempts" xsi:type="string">2</data>
-             <data name="configData" xsi:type="string">captcha_storefront_disable</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetUserPasswordFailedTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetUserPasswordFailedTest.xml
-index 55f1b695043..f43469358aa 100644
---- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetUserPasswordFailedTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetUserPasswordFailedTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Security\Test\TestCase\ResetUserPasswordFailedTest" summary="Prevent Locked Admin User to Log In into the Backend">
-         <variation name="ResetUserPasswordTestVariation1">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1,mftf_migrated:yes</data>
-             <data name="customAdmin/dataset" xsi:type="string">custom_admin_with_default_role</data>
-             <data name="attempts" xsi:type="string">2</data>
-             <constraint name="Magento\Security\Test\Constraint\AssertUserPasswordResetFailed" />
-diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/NavigateMenuTest.xml
-index cbef8fd52fd..0f9514ffc7a 100644
---- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/NavigateMenuTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest85">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Marketing > Site Map</data>
-             <data name="pageTitle" xsi:type="string">Site Map</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
-index 10ebd2b6d5f..0c101741096 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
-@@ -65,7 +65,7 @@ class Curl extends AbstractCurl implements StoreGroupInterface
-             throw new \Exception('Cannot find store group id');
-         }
- 
--        return intval($matches[1]);
-+        return (int)$matches[1];
-     }
- 
-     /**
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
-index ab0b1f20968..0b738c5e159 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
-@@ -119,7 +119,7 @@ class Curl extends AbstractCurl implements WebsiteInterface
-             throw new \Exception('Cannot find website id.');
-         }
- 
--        return intval($matches[1]);
-+        return (int)$matches[1];
-     }
- 
-     /**
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/AccessAdminWithStoreCodeInUrlTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/AccessAdminWithStoreCodeInUrlTest.xml
-index a4abfc5daf2..4d3677076d3 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/AccessAdminWithStoreCodeInUrlTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/AccessAdminWithStoreCodeInUrlTest.xml
-@@ -11,6 +11,7 @@
-             <data name="configData" xsi:type="string">add_store_code_to_urls</data>
-             <data name="user/dataset" xsi:type="string">default</data>
-             <data name="storeCode" xsi:type="string">default</data>
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogin" />
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreCodeInUrl" />
-         </variation>
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.xml
-index 31e7f611a12..d86c36c984d 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Store\Test\TestCase\CreateStoreEntityTest" summary="Create Store View" ticketId="MAGETWO-27647">
-         <variation name="CreateStoreEntityTestVariation1">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="store/data/group_id/dataset" xsi:type="string">default</data>
-             <data name="store/data/name" xsi:type="string">store_name_%isolation%</data>
-             <data name="store/data/code" xsi:type="string">storecode_%isolation%</data>
-@@ -18,7 +18,7 @@
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreFrontend" />
-         </variation>
-         <variation name="CreateStoreEntityTestVariation2">
--            <data name="tag" xsi:type="string">severity:S3</data>
-+            <data name="tag" xsi:type="string">severity:S3, mftf_migrated:yes</data>
-             <data name="store/data/group_id/dataset" xsi:type="string">default</data>
-             <data name="store/data/name" xsi:type="string">store_name_%isolation%</data>
-             <data name="store/data/code" xsi:type="string">storecode_%isolation%</data>
-@@ -28,7 +28,7 @@
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreNotOnFrontend" />
-         </variation>
-         <variation name="CreateStoreEntityTestVariation3">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="store/data/group_id/dataset" xsi:type="string">custom</data>
-             <data name="store/data/name" xsi:type="string">store_name_%isolation%</data>
-             <data name="store/data/code" xsi:type="string">storecode_%isolation%</data>
-@@ -40,7 +40,7 @@
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreFrontend" />
-         </variation>
-         <variation name="CreateStoreEntityTestVariation4" summary="Create New Localized Store View" ticketId="MAGETWO-12405">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S0</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S0, mftf_migrated:yes</data>
-             <data name="store/data/group_id/dataset" xsi:type="string">default</data>
-             <data name="store/data/name" xsi:type="string">DE_%isolation%</data>
-             <data name="store/data/code" xsi:type="string">de_%isolation%</data>
-@@ -51,12 +51,14 @@
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreInGrid" />
-         </variation>
-         <variation name="CreateStoreEntityTestVariation5" summary="Check the absence of delete button" ticketId="MAGETWO-17475">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="store/dataset" xsi:type="string">custom_store</data>
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreSuccessSaveMessage" />
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreForm" />
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreNoDeleteButton" />
-         </variation>
-         <variation name="CreateDisabledStoreView" summary="Create disabled store view" ticketId="MAGETWO-17475">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="store/data/group_id/dataset" xsi:type="string">custom_new_group</data>
-             <data name="store/data/name" xsi:type="string">store_name_%isolation%</data>
-             <data name="store/data/code" xsi:type="string">storecode_%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.xml
-index 8cdeb48bb1c..dcfe22eb0d5 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Store\Test\TestCase\CreateStoreGroupEntityTest" summary="Create Store Group" ticketId="MAGETWO-27345">
-         <variation name="CreateStoreGroupEntityTestVariation1">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="storeGroup/data/website_id/dataset" xsi:type="string">main_website</data>
-             <data name="storeGroup/data/name" xsi:type="string">store_name_%isolation%</data>
-             <data name="storeGroup/data/code" xsi:type="string">store_code_%isolation%</data>
-@@ -18,7 +18,7 @@
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupOnStoreViewForm" />
-         </variation>
-         <variation name="CreateStoreGroupEntityTestVariation2">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="storeGroup/data/website_id/dataset" xsi:type="string">custom_website</data>
-             <data name="storeGroup/data/name" xsi:type="string">store_name_%isolation%</data>
-             <data name="storeGroup/data/code" xsi:type="string">store_code_%isolation%</data>
-@@ -29,6 +29,7 @@
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupOnStoreViewForm" />
-         </variation>
-         <variation name="CreateStoreGroupEntityTestVariation3" summary="Check the absence of delete button" ticketId="MAGETWO-17475">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="storeGroup/dataset" xsi:type="string">custom_new_group</data>
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupSuccessSaveMessage" />
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupForm" />
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml
-index 5a547f69280..e35ef853d1b 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Store\Test\TestCase\CreateWebsiteEntityTest" summary="Create Website" ticketId="MAGETWO-27665">
-         <variation name="CreateWebsiteEntityTestVariation1">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="website/data/name" xsi:type="string">website_%isolation%</data>
-             <data name="website/data/code" xsi:type="string">code_%isolation%</data>
-             <constraint name="Magento\Store\Test\Constraint\AssertWebsiteSuccessSaveMessage" />
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
-index e867ebe3997..c1fe9ca4597 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
-@@ -12,6 +12,7 @@ use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
- use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
- use Magento\Store\Test\Fixture\Store;
- use Magento\Mtf\TestCase\Injectable;
-+use Magento\Config\Test\TestStep\SetupConfigurationStep;
- 
- /**
-  * Test Creation for DeleteStoreEntity
-@@ -100,7 +101,15 @@ class DeleteStoreEntityTest extends Injectable
-     {
-         // Preconditions:
-         $store->persist();
--        $this->backupIndex->open()->getBackupGrid()->massaction([], 'Delete', true, 'Select All');
-+        /** @var SetupConfigurationStep $enableBackupsStep */
-+        $enableBackupsStep = $this->objectManager->create(
-+            SetupConfigurationStep::class,
-+            ['configData' => 'enable_backups_functionality']
-+        );
-+        $enableBackupsStep->run();
-+        $this->backupIndex->open()
-+            ->getBackupGrid()
-+            ->massaction([], 'Delete', true, 'Select All');
- 
-         // Steps:
-         $this->storeIndex->open();
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml
-index 306a9fd2024..cd37c555fdb 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Store\Test\TestCase\DeleteStoreEntityTest" summary="Delete Store View" ticketId="MAGETWO-27942">
-         <variation name="DeleteStoreEntityTestVariation1">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="store/dataset" xsi:type="string">custom</data>
-             <data name="createBackup" xsi:type="string">Yes</data>
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreSuccessDeleteAndBackupMessages" />
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
-index cd37576443c..c332b83a22d 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
-@@ -12,6 +12,7 @@ use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
- use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
- use Magento\Store\Test\Fixture\StoreGroup;
- use Magento\Mtf\TestCase\Injectable;
-+use Magento\Config\Test\TestStep\SetupConfigurationStep;
- 
- /**
-  * Delete StoreGroup (Store Management)
-@@ -101,7 +102,15 @@ class DeleteStoreGroupEntityTest extends Injectable
-     {
-         //Preconditions
-         $storeGroup->persist();
--        $this->backupIndex->open()->getBackupGrid()->massaction([], 'Delete', true, 'Select All');
-+        /** @var SetupConfigurationStep $enableBackupsStep */
-+        $enableBackupsStep = $this->objectManager->create(
-+            SetupConfigurationStep::class,
-+            ['configData' => 'enable_backups_functionality']
-+        );
-+        $enableBackupsStep->run();
-+        $this->backupIndex->open()
-+            ->getBackupGrid()
-+            ->massaction([], 'Delete', true, 'Select All');
- 
-         //Steps
-         $this->storeIndex->open();
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
-index 02fcf3b19fb..86553086285 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Store\Test\TestCase\DeleteStoreGroupEntityTest" summary="Delete Store Group" ticketId="MAGETWO-27596">
-         <variation name="DeleteStoreGroupEntityTestVariation1">
--            <data name="tag" xsi:type="string">severity:S3, stable:no</data>
-+            <data name="tag" xsi:type="string">severity:S3, mftf_migrated:yes</data>
-             <data name="storeGroup/dataset" xsi:type="string">custom</data>
-             <data name="createBackup" xsi:type="string">Yes</data>
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupSuccessDeleteAndBackupMessages" />
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
-index 2431cb3e065..22259a30b15 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
-@@ -12,6 +12,7 @@ use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
- use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
- use Magento\Store\Test\Fixture\Website;
- use Magento\Mtf\TestCase\Injectable;
-+use Magento\Config\Test\TestStep\SetupConfigurationStep;
- 
- /**
-  * Delete Website (Store Management)
-@@ -102,7 +103,15 @@ class DeleteWebsiteEntityTest extends Injectable
-     {
-         //Preconditions
-         $website->persist();
--        $this->backupIndex->open()->getBackupGrid()->massaction([], 'Delete', true, 'Select All');
-+        /** @var SetupConfigurationStep $enableBackupsStep */
-+        $enableBackupsStep = $this->objectManager->create(
-+            SetupConfigurationStep::class,
-+            ['configData' => 'enable_backups_functionality']
-+        );
-+        $enableBackupsStep->run();
-+        $this->backupIndex->open()
-+            ->getBackupGrid()
-+            ->massaction([], 'Delete', true, 'Select All');
- 
-         //Steps
-         $this->storeIndex->open();
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/MoveStoreToOtherGroupSameWebsiteTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/MoveStoreToOtherGroupSameWebsiteTest.xml
-index 8da208bc3f0..ab702dfdd4b 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/MoveStoreToOtherGroupSameWebsiteTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/MoveStoreToOtherGroupSameWebsiteTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Store\Test\TestCase\MoveStoreToOtherGroupSameWebsiteTest" summary="Move Store View" ticketId="MAGETWO-58361">
-         <variation name="MoveStoreTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="storeInitialA/dataset" xsi:type="string">custom_group_custom_store</data>
-             <data name="storeInitialB/dataset" xsi:type="string">custom_group_custom_store</data>
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreSuccessSaveMessage" />
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.xml
-index 4a73986673c..60533523862 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Store\Test\TestCase\UpdateStoreEntityTest" summary="Update Store View" ticketId="MAGETWO-27786">
-         <variation name="UpdateStoreEntityTestVariation1">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="storeInitial/dataset" xsi:type="string">custom</data>
-             <data name="store/data/group_id/dataset" xsi:type="string">default</data>
-             <data name="store/data/name" xsi:type="string">storename_updated%isolation%</data>
-@@ -21,7 +21,7 @@
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreFrontend" />
-         </variation>
-         <variation name="UpdateStoreEntityTestVariation2">
--            <data name="tag" xsi:type="string">severity:S1</data>
-+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
-             <data name="storeInitial/dataset" xsi:type="string">default</data>
-             <data name="store/data/name" xsi:type="string">storename_updated%isolation%</data>
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreSuccessSaveMessage" />
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.xml
-index 593d9c365a9..9ff67a9ba9f 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Store\Test\TestCase\UpdateStoreGroupEntityTest" summary="Update Store Group" ticketId="MAGETWO-27568">
-         <variation name="UpdateStoreGroupEntityTestVariation1">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="storeGroupOrigin/dataset" xsi:type="string">custom</data>
-             <data name="storeGroup/data/website_id/dataset" xsi:type="string">main_website</data>
-             <data name="storeGroup/data/name" xsi:type="string">store_name_updated_%isolation%</data>
-@@ -20,7 +20,7 @@
-             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupOnStoreViewForm" />
-         </variation>
-         <variation name="UpdateStoreGroupEntityTestVariation2">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="storeGroupOrigin/dataset" xsi:type="string">custom</data>
-             <data name="storeGroup/data/website_id/dataset" xsi:type="string">custom_website</data>
-             <data name="storeGroup/data/name" xsi:type="string">store_name_updated_%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml
-index ac857ad035f..5db0e7f8baa 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Store\Test\TestCase\UpdateWebsiteEntityTest" summary="Update Website" ticketId="MAGETWO-27690">
-         <variation name="UpdateWebsiteEntityTestVariation1">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="websiteOrigin/dataset" xsi:type="string">custom_website</data>
-             <data name="website/data/name" xsi:type="string">website_upd%isolation%</data>
-             <data name="website/data/code" xsi:type="string">code_upd%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestStep/DeleteWebsitesEntityStep.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestStep/DeleteWebsitesEntityStep.php
-index 155ed21064b..03486f337d7 100644
---- a/dev/tests/functional/tests/app/Magento/Store/Test/TestStep/DeleteWebsitesEntityStep.php
-+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestStep/DeleteWebsitesEntityStep.php
-@@ -10,10 +10,12 @@ use Magento\Backend\Test\Page\Adminhtml\EditWebsite;
- use Magento\Backend\Test\Page\Adminhtml\DeleteWebsite;
- use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
- use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
-+use Magento\Config\Test\TestStep\SetupConfigurationStep;
- use Magento\Store\Test\Fixture\Store;
- use Magento\Mtf\TestStep\TestStepInterface;
- use Magento\Mtf\Fixture\FixtureFactory;
- use Magento\Mtf\Fixture\FixtureInterface;
-+use Magento\Mtf\TestStep\TestStepFactory;
- 
- /**
-  * Test Step for DeleteWebsitesEntity.
-@@ -60,6 +62,11 @@ class DeleteWebsitesEntityStep implements TestStepInterface
-      */
-     private $createBackup;
- 
-+    /**
-+     * @var TestStepFactory
-+     */
-+    private $stepFactory;
-+
-     /**
-      * Prepare pages for test.
-      *
-@@ -69,6 +76,7 @@ class DeleteWebsitesEntityStep implements TestStepInterface
-      * @param DeleteWebsite $deleteWebsite
-      * @param FixtureFactory $fixtureFactory
-      * @param FixtureInterface $item
-+     * @param TestStepFactory $testStepFactory
-      * @param string $createBackup
-      */
-     public function __construct(
-@@ -78,6 +86,7 @@ class DeleteWebsitesEntityStep implements TestStepInterface
-         DeleteWebsite $deleteWebsite,
-         FixtureFactory $fixtureFactory,
-         FixtureInterface $item,
-+        TestStepFactory $testStepFactory,
-         $createBackup = 'No'
-     ) {
-         $this->storeIndex = $storeIndex;
-@@ -87,6 +96,7 @@ class DeleteWebsitesEntityStep implements TestStepInterface
-         $this->item = $item;
-         $this->createBackup = $createBackup;
-         $this->fixtureFactory = $fixtureFactory;
-+        $this->stepFactory = $testStepFactory;
-     }
- 
-     /**
-@@ -96,6 +106,12 @@ class DeleteWebsitesEntityStep implements TestStepInterface
-      */
-     public function run()
-     {
-+        /** @var SetupConfigurationStep $enableBackupsStep */
-+        $enableBackupsStep = $this->stepFactory->create(
-+            SetupConfigurationStep::class,
-+            ['configData' => 'enable_backups_functionality']
-+        );
-+        $enableBackupsStep->run();
-         $this->backupIndex->open()->getBackupGrid()->massaction([], 'Delete', true, 'Select All');
-         $this->storeIndex->open();
-         $websiteNames = $this->item->getWebsiteIds();
-diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
-index 083fa246c96..f4adb9dec12 100644
---- a/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
-+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
-@@ -29,21 +29,32 @@ class Curl extends CatalogProductAttributeCurl implements SwatchProductAttribute
-         ];
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function changeStructureOfTheData(array $data): array
-+    {
-+        return parent::changeStructureOfTheData($data);
-+    }
-+
-     /**
-      * Re-map options from default options structure to swatches structure,
-      * as swatches was initially created with name convention differ from other attributes.
-      *
--     * @param array $data
--     * @return array
-+     * @inheritdoc
-      */
--    protected function changeStructureOfTheData(array $data)
-+    protected function getSerializeOptions(array $data): string
-     {
--        $data = parent::changeStructureOfTheData($data);
--        $data['optiontext'] = $data['option'];
--        $data['swatchtext'] = [
--            'value' => $data['option']['value']
--        ];
--        unset($data['option']);
--        return $data;
-+        $options = [];
-+        foreach ($data as $optionRowData) {
-+            $optionRowData['optiontext'] = $optionRowData['option'];
-+            $optionRowData['swatchtext'] = [
-+                'value' => $optionRowData['option']['value']
-+            ];
-+            unset($optionRowData['option']);
-+            $options[] = http_build_query($optionRowData);
-+        }
-+
-+        return json_encode($options);
-     }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
-index aa74de5afe5..8b4f233f355 100644
---- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
-@@ -28,6 +28,7 @@ class CreateTaxRateEntityTest extends Injectable
- {
-     /* tags */
-     const MVP = 'yes';
-+    const MFTF_MIGRATED = 'yes';
-     /* end tags */
- 
-     /**
-diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml
-index 62e91f39fcc..b4b76fd62cc 100644
---- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Tax\Test\TestCase\CreateTaxRateEntityTest" summary="Create Tax Rate" ticketId="MAGETWO-23286">
-         <variation name="CreateTaxRateEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
-             <data name="taxRate/data/zip_from" xsi:type="string">-</data>
-@@ -21,6 +22,7 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateInTaxRule" />
-         </variation>
-         <variation name="CreateTaxRateEntityTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRate/data/zip_is_range" xsi:type="string">Yes</data>
-             <data name="taxRate/data/zip_from" xsi:type="string">90001</data>
-@@ -35,6 +37,7 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateInTaxRule" />
-         </variation>
-         <variation name="CreateTaxRateEntityTestVariation3">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
-             <data name="taxRate/data/zip_from" xsi:type="string">-</data>
-@@ -48,6 +51,7 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateInTaxRule" />
-         </variation>
-         <variation name="CreateTaxRateEntityTestVariation4">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRate/data/zip_is_range" xsi:type="string">Yes</data>
-             <data name="taxRate/data/zip_from" xsi:type="string">1</data>
-@@ -60,6 +64,7 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateInTaxRule" />
-         </variation>
-         <variation name="CreateTaxRateEntityTestVariation5">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
-             <data name="taxRate/data/zip_from" xsi:type="string">-</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml
-index fe4ea7a0fb0..cf4e54adac0 100644
---- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Tax\Test\TestCase\CreateTaxRuleEntityTest" summary="Create Tax Rule " ticketId="MAGETWO-20913">
-         <variation name="CreateTaxRuleEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">US-CA-Rate_1</data>
-             <data name="taxRule/data/tax_customer_class/dataset/class_0" xsi:type="string">-</data>
-@@ -19,6 +20,7 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleForm" />
-         </variation>
-         <variation name="CreateTaxRuleEntityTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="tag" xsi:type="string">stable:no</data>
-             <data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">US-CA-Rate_1</data>
-@@ -34,6 +36,7 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleForm" />
-         </variation>
-         <variation name="CreateTaxRuleEntityTestVariation3">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="description" xsi:type="string">Creating tax rule with new tax classes and tax rate</data>
-             <data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">default</data>
-@@ -48,6 +51,7 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleForm" />
-         </variation>
-         <variation name="CreateTaxRuleEntityTestVariation4">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">withZipRange</data>
-             <data name="taxRule/data/tax_rate/dataset/rate_1" xsi:type="string">US-CA-Rate_1</data>
-@@ -61,6 +65,7 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleForm" />
-         </variation>
-         <variation name="CreateTaxRuleEntityTestVariation5" summary="Create Tax Rule with New and Existing Tax Rate, Customer Tax Class, Product Tax Class" ticketId="MAGETWO-12438">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-             <data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">US-CA-*-Rate 1</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.xml
-index 5d80acd8a00..40270d84199 100644
---- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Tax\Test\TestCase\DeleteTaxRateEntityTest" summary="Delete Tax Rate" ticketId="MAGETWO-23295">
-         <variation name="DeleteTaxRateEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="taxRate/dataset" xsi:type="string">default</data>
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateSuccessDeleteMessage" />
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateNotInGrid" />
-diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml
-index dc5e121db3d..96bfec0121e 100644
---- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Tax\Test\TestCase\DeleteTaxRuleEntityTest" summary="Delete Tax Rule" ticketId="MAGETWO-20924">
-         <variation name="DeleteTaxRuleEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="taxRule/dataset" xsi:type="string">tax_rule_with_custom_tax_classes</data>
-             <data name="address/data/country_id" xsi:type="string">United States</data>
-             <data name="address/data/region_id" xsi:type="string">California</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/NavigateMenuTest.xml
-index ee225f21462..ecf202ddae3 100644
---- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/NavigateMenuTest.xml
-@@ -8,16 +8,19 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest87">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Stores > Tax Rules</data>
-             <data name="pageTitle" xsi:type="string">Tax Rules</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest88">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Stores > Tax Zones and Rates</data>
-             <data name="pageTitle" xsi:type="string">Tax Zones and Rates</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest89">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">System > Import/Export Tax Rates</data>
-             <data name="pageTitle" xsi:type="string">Import and Export Tax Rates</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php
-index 0f163933d26..40d3401a207 100644
---- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php
-@@ -37,7 +37,6 @@ class TaxWithCrossBorderTest extends Injectable
- {
-     /* tags */
-     const MVP = 'yes';
--    const STABLE = 'no';
-     /* end tags */
- 
-     /**
-diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
-index 1e66ad61b6c..10f41e68b65 100644
---- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
-@@ -33,6 +33,7 @@ class UpdateTaxRateEntityTest extends Injectable
- {
-     /* tags */
-     const MVP = 'yes';
-+    const MFTF_MIGRATED = 'yes';
-     /* end tags */
- 
-     /**
-diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml
-index f8d9a00958b..1fef659a3de 100644
---- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Tax\Test\TestCase\UpdateTaxRateEntityTest" summary="Edit Tax Rate" ticketId="MAGETWO-23299">
-         <variation name="UpdateTaxRateEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialTaxRate/dataset" xsi:type="string">default</data>
-             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
-@@ -20,6 +21,7 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateForm" />
-         </variation>
-         <variation name="UpdateTaxRateEntityTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialTaxRate/dataset" xsi:type="string">default</data>
-             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRate/data/zip_is_range" xsi:type="string">Yes</data>
-@@ -33,6 +35,7 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateForm" />
-         </variation>
-         <variation name="UpdateTaxRateEntityTestVariation3">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialTaxRate/dataset" xsi:type="string">default</data>
-             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
-@@ -44,6 +47,7 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateForm" />
-         </variation>
-         <variation name="UpdateTaxRateEntityTestVariation4">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialTaxRate/dataset" xsi:type="string">withZipRange</data>
-             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
-@@ -56,6 +60,7 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateForm" />
-         </variation>
-         <variation name="UpdateTaxRateEntityTestVariation5">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialTaxRate/dataset" xsi:type="string">withZipRange</data>
-             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRate/data/zip_is_range" xsi:type="string">Yes</data>
-@@ -67,6 +72,7 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateForm" />
-         </variation>
-         <variation name="UpdateTaxRateEntityTestVariation6">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialTaxRate/dataset" xsi:type="string">withZipRange</data>
-             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
-             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml
-index 277bdbb7f54..8b864b0eaba 100644
---- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml
-@@ -48,7 +48,6 @@
-             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleIsApplied" />
-         </variation>
-         <variation name="UpdateTaxRuleEntityTestVariation4">
--            <data name="tag" xsi:type="string">stable:no</data>
-             <data name="initialTaxRule/dataset" xsi:type="string">tax_rule_with_custom_tax_classes</data>
-             <data name="address/data/country_id" xsi:type="string">United States</data>
-             <data name="address/data/region_id" xsi:type="string">Idaho</data>
-diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Theme/Test/TestCase/NavigateMenuTest.xml
-index 71964fc9264..ee386591223 100644
---- a/dev/tests/functional/tests/app/Magento/Theme/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/TestCase/NavigateMenuTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest90">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Content > Themes</data>
-             <data name="pageTitle" xsi:type="string">Themes</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
-index 235b0d09653..56ca47331fa 100644
---- a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
-+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
-@@ -162,6 +162,11 @@ class DataGrid extends Grid
-      */
-     protected $currentPage = ".//*[@data-ui-id='current-page-input'][not(ancestor::*[@class='sticky-header'])]";
- 
-+    /**
-+     * Top page element to implement a scrolling in case of grid element not visible.
-+     */
-+    private $topElementToScroll = 'header.page-header';
-+
-     /**
-      * Clear all applied Filters.
-      *
-@@ -181,7 +186,7 @@ class DataGrid extends Grid
-      *
-      * @return void
-      */
--    protected function waitFilterToLoad()
-+    public function waitFilterToLoad()
-     {
-         $this->getTemplateBlock()->waitLoader();
-         $browser = $this->_rootElement;
-@@ -368,6 +373,10 @@ class DataGrid extends Grid
-             $this->sortGridByField('ID');
-         }
-         foreach ($items as $item) {
-+            //Scroll to the top of the page in case current page input is not visible.
-+            if (!$this->_rootElement->find($this->currentPage, Locator::SELECTOR_XPATH)->isVisible()) {
-+                $this->browser->find($this->topElementToScroll)->hover();
-+            }
-             $this->_rootElement->find($this->currentPage, Locator::SELECTOR_XPATH)->setValue('');
-             $this->waitLoader();
-             $selectItem = $this->getRow($item)->find($this->selectItem);
-diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php
-index af4ccfdac9d..0574fc8dc55 100644
---- a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php
-+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php
-@@ -89,6 +89,7 @@ class GridSortingTest extends Injectable
-         $page->open();
-         /** @var DataGrid $gridBlock */
-         $gridBlock = $page->$gridRetriever();
-+        $gridBlock->waitFilterToLoad();
-         $gridBlock->resetFilter();
- 
-         $sortingResults = [];
-diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php
-index cc2763c0e3c..7f0c29da037 100644
---- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php
-+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php
-@@ -44,7 +44,7 @@ class TargetPath extends DataSource
-             $id = $this->entity->hasData('id') ? $this->entity->getId() : $this->entity->getPageId();
-             $this->data = preg_replace('`(%.*?%)`', $id, $data['entity']);
-         } else {
--            $this->data = strval($data['entity']);
-+            $this->data = (string)$data['entity'];
-         }
-     }
- 
-diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.php
-index 8147818135e..a2767f76cfe 100644
---- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.php
-+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.php
-@@ -85,6 +85,7 @@ class CategoryUrlRewriteTest extends Injectable
-         $this->catalogCategoryEdit->getFormPageActions()->selectStoreView($storeView->getName());
-         $this->catalogCategoryEdit->getEditForm()->fill($categoryUpdates);
-         $this->catalogCategoryEdit->getFormPageActions()->save();
-+        $this->catalogCategoryEdit->getFormPageActions()->selectStoreView('All Store Views');
-         $this->catalogCategoryIndex->getTreeCategories()->assignCategory(
-             $parentCategory->getName(),
-             $childCategory->getName()
-diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.xml
-index 730eb285d6d..1f888c3a2a8 100644
---- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\UrlRewrite\Test\TestCase\CategoryUrlRewriteTest" summary="Check url rewrites in catalog categories after changing url key for store view and moving category." ticketId="MAGETWO-45385">
-         <variation name="CategoryUrlRewriteTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="storeView/dataset" xsi:type="string">custom</data>
-             <data name="childCategory/dataset" xsi:type="string">default</data>
-             <data name="childCategory/data/category_products/dataset" xsi:type="string">catalogProductSimple::default</data>
-diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml
-index 890b1d55a64..1293c6e89b6 100644
---- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\UrlRewrite\Test\TestCase\CreateCategoryRewriteEntityTest" summary="Create Category URL Rewrites" ticketId="MAGETWO-24280">
-         <variation name="CreateCategoryRewriteEntityTestVariation1" summary="Add Permanent Redirect for Category" ticketId="MAGETWO-12407">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="urlRewrite/data/entity_type" xsi:type="string">For Category</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="urlRewrite/data/request_path" xsi:type="string">cat%isolation%-redirect.html</data>
-@@ -18,6 +18,7 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryRedirect" />
-         </variation>
-         <variation name="CreateCategoryRewriteEntityTestVariation2" summary="Create Category URL Rewrites with no redirect">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/data/entity_type" xsi:type="string">For Category</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="urlRewrite/data/request_path" xsi:type="string">test_request%isolation%</data>
-@@ -27,6 +28,7 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteInGrid" />
-         </variation>
-         <variation name="CreateCategoryRewriteEntityTestVariation3" summary="Create Category URL Rewrites with Temporary redirect">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/data/entity_type" xsi:type="string">For Category</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCustomUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCustomUrlRewriteEntityTest.xml
-index 159663ad391..d6c37b851aa 100644
---- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCustomUrlRewriteEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCustomUrlRewriteEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\UrlRewrite\Test\TestCase\CreateCustomUrlRewriteEntityTest" summary="Create Custom URL Rewrites" ticketId="MAGETWO-25474">
-         <variation name="CreateCustomUrlRewriteEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/data/entity_type" xsi:type="string">Custom</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="urlRewrite/data/target_path/entity" xsi:type="string">catalog/category/view/id/%category::default_subcategory%</data>
-@@ -19,6 +20,7 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCustomRedirect" />
-         </variation>
-         <variation name="CreateCustomUrlRewriteEntityTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/data/entity_type" xsi:type="string">Custom</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="urlRewrite/data/target_path/entity" xsi:type="string">catalog/product/view/id/%catalogProductSimple::default%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml
-index 1917ec928bf..0cf2fd9c0d4 100644
---- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\UrlRewrite\Test\TestCase\CreateProductUrlRewriteEntityTest" summary="Create Product URL Rewrites" ticketId="MAGETWO-25150">
-         <variation name="CreateProductUrlRewriteEntityTestVariation1" summary="Add Temporary Redirect for Product" ticketId="MAGETWO-12409">
--            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
-             <data name="product/dataset" xsi:type="string">product_with_category</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-@@ -19,6 +19,7 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteProductRedirect" />
-         </variation>
-         <variation name="CreateProductUrlRewriteEntityTestVariation2" summary="Create Product URL Rewrites with no redirect">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
-             <data name="product/dataset" xsi:type="string">default</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-@@ -28,6 +29,7 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteSaveMessage" />
-         </variation>
-         <variation name="CreateProductUrlRewriteEntityTestVariation3" summary="Create Product URL Rewrites with Temporary redirect">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
-             <data name="product/dataset" xsi:type="string">default</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-@@ -38,6 +40,7 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteProductRedirect" />
-         </variation>
-         <variation name="CreateProductUrlRewriteEntityTestVariation4" summary="Create Product URL Rewrites with Permanent redirect">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
-             <data name="product/dataset" xsi:type="string">default</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-@@ -48,6 +51,7 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteProductRedirect" />
-         </variation>
-         <variation name="CreateProductUrlRewriteEntityTestVariation5" summary="Autoupdate URL Rewrites if Subcategories deleted" ticketId="MAGETWO-27325">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
-             <data name="product/dataset" xsi:type="string">product_with_category</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductWithSeveralWebsitesUrlRewriteTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductWithSeveralWebsitesUrlRewriteTest.xml
-index 98e3f9e3838..8e737f193cf 100644
---- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductWithSeveralWebsitesUrlRewriteTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductWithSeveralWebsitesUrlRewriteTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\UrlRewrite\Test\TestCase\CreateProductWithSeveralWebsitesUrlRewriteTest" summary="Test product url rewrites when it is created in several websites">
-         <variation name="CreateSimpleProductEntityWithSeveralWebsites" summary="Create product with several websites and check URL Rewites" ticketId="MAGETWO-27238">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
-             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
-             <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.xml
-index 90f5edec2f4..8e0e8ebde99 100644
---- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\UrlRewrite\Test\TestCase\DeleteCustomUrlRewriteEntityTest" summary="Delete Custom URL Rewrites" ticketId="MAGETWO-26337">
-         <variation name="DeleteCustomUrlRewriteEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/dataset" xsi:type="string">default</data>
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteDeletedMessage" />
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteNotInGrid" />
-diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/NavigateMenuTest.xml
-index cdf1d9e3617..30d9e57602a 100644
---- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/NavigateMenuTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest91">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Marketing > URL Rewrites</data>
-             <data name="pageTitle" xsi:type="string">URL Rewrites</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.xml
-index 4a88ad01b5a..b2be1a20521 100644
---- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\UrlRewrite\Test\TestCase\UpdateCategoryUrlRewriteEntityTest" summary="Update Category URL Rewrites" ticketId="MAGETWO-24838">
-         <variation name="UpdateCategoryUrlRewriteEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="category/dataset" xsi:type="string">default_subcategory</data>
-             <data name="categoryRewrite/dataset" xsi:type="string">default</data>
-@@ -20,6 +21,7 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryRedirect" />
-         </variation>
-         <variation name="UpdateCategoryUrlRewriteEntityTestVariation2">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="category/dataset" xsi:type="string">default_subcategory</data>
-             <data name="categoryRewrite/dataset" xsi:type="string">default</data>
-@@ -32,6 +34,7 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryRedirect" />
-         </variation>
-         <variation name="UpdateCategoryUrlRewriteEntityTestVariation3">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="category/dataset" xsi:type="string">default_subcategory</data>
-             <data name="categoryRewrite/dataset" xsi:type="string">default</data>
-@@ -44,6 +47,7 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryRedirect" />
-         </variation>
-         <variation name="UpdateCategoryUrlRewriteEntityTestVariation4">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="category/dataset" xsi:type="string">default_subcategory</data>
-             <data name="categoryRewrite/dataset" xsi:type="string">default</data>
-diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml
-index 3671cd767ec..2405216c122 100644
---- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\UrlRewrite\Test\TestCase\UpdateCustomUrlRewriteEntityTest" summary="Update Custom URL Rewrites" ticketId="MAGETWO-25784">
-         <variation name="UpdateCustomUrlRewriteEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="initialRewrite/dataset" xsi:type="string">default</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="urlRewrite/data/request_path" xsi:type="string">wishlist/%isolation%</data>
-@@ -19,7 +20,7 @@
-             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteSuccessOutsideRedirect" />
-         </variation>
-         <variation name="UpdateCustomUrlRewriteEntityTestVariation2">
--            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
-+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, mftf_migrated:yes</data>
-             <data name="initialRewrite/dataset" xsi:type="string">custom_rewrite_wishlist</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="urlRewrite/data/request_path" xsi:type="string">wishlist/%isolation%</data>
-diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml
-index 60de554d594..8f12930aa41 100644
---- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\UrlRewrite\Test\TestCase\UpdateProductUrlRewriteEntityTest" summary="Update Product URL Rewrites" ticketId="MAGETWO-24819">
-         <variation name="UpdateProductUrlRewriteEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="urlRewrite/data/target_path/entity" xsi:type="string">product/%catalogProductSimple::product_100_dollar%</data>
-             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
-             <data name="urlRewrite/data/request_path" xsi:type="string">test_%isolation%.html</data>
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php
-deleted file mode 100644
-index b1a64c7c7e7..00000000000
---- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php
-+++ /dev/null
-@@ -1,46 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\User\Test\Constraint;
--
--use Magento\User\Test\Page\Adminhtml\UserEdit;
--use Magento\Mtf\Constraint\AbstractConstraint;
--
--/**
-- * Class AssertAccessTokensErrorRevokeMessage
-- * Assert that error message appears after click on 'Force Sing-In' button for user without tokens.
-- */
--class AssertAccessTokensErrorRevokeMessage extends AbstractConstraint
--{
--    /**
--     * User revoke tokens error message.
--     */
--    const ERROR_MESSAGE = 'This user has no tokens.';
--
--    /**
--     * Assert that error message appears after click on 'Force Sing-In' button for user without tokens.
--     *
--     * @param UserEdit $userEdit
--     * @return void
--     */
--    public function processAssert(UserEdit $userEdit)
--    {
--        \PHPUnit\Framework\Assert::assertEquals(
--            self::ERROR_MESSAGE,
--            $userEdit->getMessagesBlock()->getErrorMessage()
--        );
--    }
--
--    /**
--     * Return string representation of object
--     *
--     * @return string
--     */
--    public function toString()
--    {
--        return self::ERROR_MESSAGE . ' error message is present on UserEdit page.';
--    }
--}
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensSuccessfullyRevoked.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensSuccessfullyRevoked.php
-new file mode 100644
-index 00000000000..b2e52f6a15a
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensSuccessfullyRevoked.php
-@@ -0,0 +1,45 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\User\Test\Constraint;
-+
-+use Magento\User\Test\Page\Adminhtml\UserEdit;
-+use Magento\Mtf\Constraint\AbstractConstraint;
-+
-+/**
-+ * Assert that success message appears after click on 'Force Sing-In' button.
-+ */
-+class AssertAccessTokensSuccessfullyRevoked extends AbstractConstraint
-+{
-+    /**
-+     * User revoke tokens success message.
-+     */
-+    const SUCCESS_MESSAGE = 'You have revoked the user\'s tokens.';
-+
-+    /**
-+     * Assert that success message appears after click on 'Force Sing-In' button.
-+     *
-+     * @param UserEdit $userEdit
-+     * @return void
-+     */
-+    public function processAssert(UserEdit $userEdit): void
-+    {
-+        \PHPUnit\Framework\Assert::assertEquals(
-+            self::SUCCESS_MESSAGE,
-+            $userEdit->getMessagesBlock()->getSuccessMessage()
-+        );
-+    }
-+
-+    /**
-+     * Return string representation of object
-+     *
-+     * @return string
-+     */
-+    public function toString()
-+    {
-+        return self::SUCCESS_MESSAGE . ' message is present on UserEdit page.';
-+    }
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php
-index f7c56ae1b96..ecfbc8d3538 100644
---- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php
-@@ -10,6 +10,7 @@ use Magento\Backend\Test\Page\Adminhtml\Dashboard;
- use Magento\Mtf\Client\BrowserInterface;
- use Magento\Mtf\Constraint\AbstractConstraint;
- use Magento\User\Test\Fixture\User;
-+use Magento\User\Test\TestStep\LoginUserOnBackendWithErrorStep;
- 
- /**
-  * Asserts that user has only related permissions.
-@@ -18,6 +19,8 @@ class AssertUserRoleRestrictedAccess extends AbstractConstraint
- {
-     const DENIED_ACCESS = 'Sorry, you need permissions to view this content.';
- 
-+    protected $loginStep = 'Magento\User\Test\TestStep\LoginUserOnBackendStep';
-+
-     /**
-      * Asserts that user has only related permissions.
-      *
-@@ -36,7 +39,7 @@ class AssertUserRoleRestrictedAccess extends AbstractConstraint
-         $denyUrl
-     ) {
-         $this->objectManager->create(
--            \Magento\User\Test\TestStep\LoginUserOnBackendStep::class,
-+            $this->loginStep,
-             ['user' => $user]
-         )->run();
- 
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccessWithError.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccessWithError.php
-new file mode 100644
-index 00000000000..b001893abb4
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccessWithError.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\User\Test\Constraint;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class AssertUserRoleRestrictedAccessWithError extends AssertUserRoleRestrictedAccess
-+{
-+    protected $loginStep = 'Magento\User\Test\TestStep\LoginUserOnBackendWithErrorStep';
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
-index c0c04628f74..c4645e6e891 100644
---- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
-@@ -7,14 +7,20 @@
- namespace Magento\User\Test\Constraint;
- 
- use Magento\Backend\Test\Page\Adminhtml\Dashboard;
--use Magento\User\Test\Fixture\User;
- use Magento\Mtf\Constraint\AbstractConstraint;
-+use Magento\User\Test\Fixture\User;
-+use Magento\User\Test\TestStep\LoginUserOnBackendStep;
- 
- /**
-  * Verify whether customer has logged in to the Backend.
-  */
- class AssertUserSuccessLogin extends AbstractConstraint
- {
-+    /**
-+     * @var string
-+     */
-+    protected $loginStep = LoginUserOnBackendStep::class;
-+
-     /**
-      * Verify whether customer has logged in to the Backend.
-      *
-@@ -25,7 +31,7 @@ class AssertUserSuccessLogin extends AbstractConstraint
-     public function processAssert(User $user, Dashboard $dashboard)
-     {
-         $this->objectManager->create(
--            \Magento\User\Test\TestStep\LoginUserOnBackendStep::class,
-+            $this->loginStep,
-             ['user' => $user]
-         )->run();
-         \PHPUnit\Framework\Assert::assertTrue(
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLoginWithError.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLoginWithError.php
-new file mode 100644
-index 00000000000..9fed1f4df85
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLoginWithError.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\User\Test\Constraint;
-+
-+use Magento\User\Test\TestStep\LoginUserOnBackendWithErrorStep;
-+
-+/**
-+ * Verify whether customer has logged in to the Backend with error alert.
-+ */
-+class AssertUserSuccessLoginWithError extends AssertUserSuccessLogin
-+{
-+    /**
-+     * @var string
-+     */
-+    protected $loginStep = LoginUserOnBackendWithErrorStep::class;
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/NavigateMenuTest.xml
-index d196bebca0e..4572738b6cb 100644
---- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/NavigateMenuTest.xml
-@@ -8,21 +8,25 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest52">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">System > Locked Users</data>
-             <data name="pageTitle" xsi:type="string">Locked Users</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest53">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">System > Manage Encryption Key</data>
-             <data name="pageTitle" xsi:type="string">Encryption Key</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest92">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">System > All Users</data>
-             <data name="pageTitle" xsi:type="string">Users</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-         </variation>
-         <variation name="NavigateMenuTest93">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">System > User Roles</data>
-             <data name="pageTitle" xsi:type="string">Roles</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.xml
-index e5fcba9b72c..afdb72d8c56 100644
---- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.xml
-@@ -9,7 +9,7 @@
-     <testCase name="Magento\User\Test\TestCase\RevokeAllAccessTokensForAdminWithoutTokensTest" summary="Revoke All Access Tokens for Admin without Tokens" ticketId="MAGETWO-29675">
-         <variation name="RevokeAllAccessTokensForAdminWithoutTokensTestVariation1">
-             <data name="user/dataset" xsi:type="string">custom_admin</data>
--            <constraint name="Magento\User\Test\Constraint\AssertAccessTokensErrorRevokeMessage" />
-+            <constraint name="Magento\User\Test\Constraint\AssertAccessTokensSuccessfullyRevoked" />
-         </variation>
-     </testCase>
- </config>
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml
-index f7de667cf17..a89d1ede801 100644
---- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml
-@@ -32,7 +32,7 @@
-             <constraint name="Magento\User\Test\Constraint\AssertUserInGrid" />
-             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogOut" />
-             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogin" />
--            <constraint name="Magento\User\Test\Constraint\AssertUserRoleRestrictedAccess" />
-+            <constraint name="Magento\User\Test\Constraint\AssertUserRoleRestrictedAccessWithError" />
-         </variation>
-     </testCase>
- </config>
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
-index cc1d0fc980f..58450abc716 100644
---- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
-@@ -121,6 +121,11 @@ class UpdateAdminUserRoleEntityTest extends Injectable
-      */
-     public function tearDown()
-     {
-+        sleep(3);
-+        $modalMessage = $this->dashboard->getModalMessage();
-+        if ($modalMessage->isVisible()) {
-+            $modalMessage->acceptAlert();
-+        }
-         $this->dashboard->getAdminPanelHeader()->logOut();
-     }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml
-index 1f1530b08b2..db6a13d0f35 100644
---- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml
-@@ -17,7 +17,6 @@
-             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogin" />
-         </variation>
-         <variation name="UpdateAdminUserRoleEntityTestVariation2">
--            <data name="issue" xsi:type="string">MAGETWO-65658: [FT] User with restricted access can't log in to Admin in UpdateAdminUserEntityTest</data>
-             <data name="user/dataset" xsi:type="string">default</data>
-             <data name="role/data/resource_access" xsi:type="string">Custom</data>
-             <data name="role/data/roles_resources" xsi:type="string">Sales</data>
-@@ -30,8 +29,8 @@
-             <constraint name="Magento\User\Test\Constraint\AssertRoleSuccessSaveMessage" />
-             <constraint name="Magento\User\Test\Constraint\AssertRoleInGrid" />
-             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogOut" />
--            <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogin" />
--            <constraint name="Magento\User\Test\Constraint\AssertUserRoleRestrictedAccess" />
-+            <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLoginWithError"/>
-+            <constraint name="Magento\User\Test\Constraint\AssertUserRoleRestrictedAccessWithError" />
-         </variation>
-         <variation name="UpdateAdminUserRoleEntityTestVariation3">
-             <data name="user/dataset" xsi:type="string">custom_admin_with_default_role</data>
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php
-new file mode 100644
-index 00000000000..51d48058c8a
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php
-@@ -0,0 +1,57 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\User\Test\TestStep;
-+
-+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-+use Magento\Mtf\Client\BrowserInterface;
-+use Magento\Mtf\TestStep\TestStepInterface;
-+
-+/**
-+ * Close access error modal message.
-+ */
-+class CloseErrorAlertStep implements TestStepInterface
-+{
-+    /**
-+     * @var Dashboard
-+     */
-+    private $dashboard;
-+
-+    /**
-+     * @var BrowserInterface
-+     */
-+    private $browser;
-+
-+    /**
-+     * @param Dashboard $dashboard
-+     * @param BrowserInterface $browser
-+     */
-+    public function __construct(
-+        Dashboard $dashboard,
-+        BrowserInterface $browser
-+    ) {
-+        $this->dashboard = $dashboard;
-+        $this->browser = $browser;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function run()
-+    {
-+        $modalMessage = $this->dashboard->getModalMessage();
-+        try {
-+            $this->browser->waitUntil(
-+                function () use ($modalMessage) {
-+                    return $modalMessage->isVisible() ? true : null;
-+                }
-+            );
-+            $modalMessage->acceptAlert();
-+        } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
-+            //There is no modal to accept.
-+        }
-+    }
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php
-index 4f7e6deed7a..c244e27d428 100644
---- a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php
-@@ -50,7 +50,7 @@ class LoginUserOnBackendStep implements TestStepInterface
-      *
-      * @var BrowserInterface
-      */
--    private $browser;
-+    protected $browser;
- 
-     /**
-      * Array of error messages on admin login form.
-@@ -108,8 +108,6 @@ class LoginUserOnBackendStep implements TestStepInterface
-                 }
-             }
-         }
--
--        $this->dashboard->getSystemMessageDialog()->closePopup();
-     }
- 
-     /**
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendWithErrorStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendWithErrorStep.php
-new file mode 100644
-index 00000000000..094f90d0a5d
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendWithErrorStep.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\User\Test\TestStep;
-+
-+use Magento\Backend\Test\Page\AdminAuthLogin;
-+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-+use Magento\Mtf\Client\BrowserInterface;
-+use Magento\User\Test\Fixture\User;
-+
-+/**
-+ * Login user on backend with access error.
-+ */
-+class LoginUserOnBackendWithErrorStep extends LoginUserOnBackendStep
-+{
-+    /**
-+     * @var CloseErrorAlertStep
-+     */
-+    private $closeErrorAlertStep;
-+
-+    /**
-+     * @param LogoutUserOnBackendStep $logoutUserOnBackendStep
-+     * @param AdminAuthLogin $adminAuth
-+     * @param User $user
-+     * @param Dashboard $dashboard
-+     * @param BrowserInterface $browser
-+     */
-+    public function __construct(
-+        LogoutUserOnBackendStep $logoutUserOnBackendStep,
-+        AdminAuthLogin $adminAuth,
-+        User $user,
-+        Dashboard $dashboard,
-+        BrowserInterface $browser,
-+        CloseErrorAlertStep $closeErrorAlertStep
-+    ) {
-+        parent::__construct($logoutUserOnBackendStep, $adminAuth, $user, $dashboard, $browser);
-+        $this->closeErrorAlertStep = $closeErrorAlertStep;
-+    }
-+
-+    /**
-+     * Run step flow.
-+     *
-+     * @return void
-+     */
-+    public function run()
-+    {
-+        parent::run();
-+        $this->closeErrorAlertStep->run();
-+    }
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendStep.php
-index 70a4080a0b4..7f366312bba 100644
---- a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendStep.php
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendStep.php
-@@ -48,7 +48,6 @@ class LogoutUserOnBackendStep implements TestStepInterface
-     public function run()
-     {
-         $this->adminAuth->open();
--        $this->dashboard->getSystemMessageDialog()->closePopup();
-         $this->dashboard->getAdminPanelHeader()->logOut();
-     }
- }
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendWithErrorStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendWithErrorStep.php
-new file mode 100644
-index 00000000000..ce49e86afc0
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendWithErrorStep.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\User\Test\TestStep;
-+
-+use Magento\Backend\Test\Page\AdminAuthLogin;
-+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-+
-+/**
-+ * Logout user on backend with access error.
-+ */
-+class LogoutUserOnBackendWithErrorStep extends LogoutUserOnBackendStep
-+{
-+    /**
-+     * @var CloseErrorAlertStep
-+     */
-+    private $closeErrorAlertStep;
-+
-+    public function __construct(
-+        AdminAuthLogin $adminAuth,
-+        Dashboard $dashboard,
-+        CloseErrorAlertStep $closeErrorAlertStep
-+    ) {
-+        parent::__construct($adminAuth, $dashboard);
-+        $this->closeErrorAlertStep = $closeErrorAlertStep;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function run()
-+    {
-+        $this->adminAuth->open();
-+        $this->closeErrorAlertStep->run();
-+        $this->dashboard->getAdminPanelHeader()->logOut();
-+    }
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/User/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/User/Test/etc/di.xml
-new file mode 100644
-index 00000000000..1298bd56a8f
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/User/Test/etc/di.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" ?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-+    <type name="Magento\User\Test\TestStep\LoginUserOnBackendWithErrorStep">
-+        <arguments>
-+            <argument name="logoutUserOnBackendStep" xsi:type="object">\Magento\User\Test\TestStep\LogoutUserOnBackendWithErrorStep</argument>
-+        </arguments>
-+    </type>
-+</config>
-diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/NavigateMenuTest.xml
-index 3fceddf1a80..0a9c74cd92b 100644
---- a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/NavigateMenuTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest94">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">System > Custom Variables</data>
-             <data name="pageTitle" xsi:type="string">Custom Variables</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/Instance/Edit/Tab/ParametersType/RecentlyComparedProducts.xml b/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/Instance/Edit/Tab/ParametersType/RecentlyComparedProducts.xml
-index be353be8bf6..9da96ab4c8f 100644
---- a/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/Instance/Edit/Tab/ParametersType/RecentlyComparedProducts.xml
-+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/Instance/Edit/Tab/ParametersType/RecentlyComparedProducts.xml
-@@ -12,13 +12,13 @@
-         </page_size>
-         <show_attributes>
-             <selector>
--                .control [name="parameters[show_attributes][]"]
-+                .control [name="parameters[show_attributes][1]"]
-             </selector>
-             <input>multiselect</input>
-         </show_attributes>
-         <show_buttons>
-             <selector>
--                .control [name="parameters[show_buttons][]"]
-+                .control [name="parameters[show_buttons][2]"]
-             </selector>
-             <input>multiselect</input>
-         </show_buttons>
-diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/Instance/Edit/Tab/ParametersType/RecentlyViewedProducts.xml b/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/Instance/Edit/Tab/ParametersType/RecentlyViewedProducts.xml
-index be353be8bf6..9da96ab4c8f 100644
---- a/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/Instance/Edit/Tab/ParametersType/RecentlyViewedProducts.xml
-+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/Instance/Edit/Tab/ParametersType/RecentlyViewedProducts.xml
-@@ -12,13 +12,13 @@
-         </page_size>
-         <show_attributes>
-             <selector>
--                .control [name="parameters[show_attributes][]"]
-+                .control [name="parameters[show_attributes][1]"]
-             </selector>
-             <input>multiselect</input>
-         </show_attributes>
-         <show_buttons>
-             <selector>
--                .control [name="parameters[show_buttons][]"]
-+                .control [name="parameters[show_buttons][2]"]
-             </selector>
-             <input>multiselect</input>
-         </show_buttons>
-diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/WidgetForm.xml b/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/WidgetForm.xml
-index 0e13f4ccc99..374b966861f 100644
---- a/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/WidgetForm.xml
-+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/WidgetForm.xml
-@@ -32,13 +32,13 @@
-         <page_size />
-         <show_attributes>
-             <selector>
--                .control [name="parameters[show_attributes][]"]
-+                .control [name="parameters[show_attributes][1]"]
-             </selector>
-             <input>multiselect</input>
-         </show_attributes>
-         <show_buttons>
-             <selector>
--                .control [name="parameters[show_buttons][]"]
-+                .control [name="parameters[show_buttons][2]"]
-             </selector>
-             <input>multiselect</input>
-         </show_buttons>
-diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Handler/Widget/Curl.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Handler/Widget/Curl.php
-index 1a024eefe16..13c16c888fb 100644
---- a/dev/tests/functional/tests/app/Magento/Widget/Test/Handler/Widget/Curl.php
-+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Handler/Widget/Curl.php
-@@ -172,7 +172,7 @@ class Curl extends AbstractCurl
-         $widgetInstances = [];
-         foreach ($data['widget_instance'] as $key => $widgetInstance) {
-             $pageGroup = $widgetInstance['page_group'];
--            $method = 'prepare' . str_replace(' ', '', ucwords(str_replace('_', ' ', $pageGroup))) . 'Group';
-+            $method = 'prepare' . str_replace('_', '', ucwords($pageGroup, '_')) . 'Group';
-             if (!method_exists(__CLASS__, $method)) {
-                 throw new \Exception('Method for prepare page group "' . $method . '" is not exist.');
-             }
-diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/NavigateMenuTest.xml
-index 6b3215dd30d..6a2a533c59d 100644
---- a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/NavigateMenuTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/NavigateMenuTest.xml
-@@ -8,7 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-         <variation name="NavigateMenuTest96">
--            <data name="tag" xsi:type="string">severity:S2</data>
-+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
-             <data name="menuItem" xsi:type="string">Content > Widgets</data>
-             <data name="pageTitle" xsi:type="string">Widgets</data>
-             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
-diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/TopToolbar.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/TopToolbar.php
-new file mode 100644
-index 00000000000..9d2d0fee46b
---- /dev/null
-+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/TopToolbar.php
-@@ -0,0 +1,98 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Wishlist\Test\Block\Customer\Wishlist\Items;
-+
-+use Magento\Mtf\Block\Block;
-+use Magento\Mtf\Client\Locator;
-+
-+/**
-+ * Pager block for wishlist items page.
-+ */
-+class TopToolbar extends Block
-+{
-+    /**
-+     * Selector next active element
-+     *
-+     * @var string
-+     */
-+    private $nextPageSelector = '.item.current + .item a';
-+
-+    /**
-+     * Selector first element
-+     *
-+     * @var string
-+     */
-+    private $firstPageSelector = '.item>.page';
-+
-+    /**
-+     * Selector option element
-+     *
-+     * @var string
-+     */
-+    private $optionSelector = './/option';
-+
-+    /**
-+     * Go to the next page
-+     *
-+     * @return bool
-+     */
-+    public function nextPage()
-+    {
-+        $nextPageItem = $this->_rootElement->find($this->nextPageSelector);
-+        if ($nextPageItem->isVisible()) {
-+            $nextPageItem->click();
-+            return true;
-+        }
-+        return false;
-+    }
-+
-+    /**
-+     * Go to the first page
-+     *
-+     * @return bool
-+     */
-+    public function firstPage()
-+    {
-+        $firstPageItem = $this->_rootElement->find($this->firstPageSelector);
-+        if ($firstPageItem->isVisible()) {
-+            $firstPageItem->click();
-+            return true;
-+        }
-+        return false;
-+    }
-+
-+    /**
-+     * Set value for limiter element by index
-+     *
-+     * @param int $index
-+     * @return $this
-+     */
-+    public function setLimiterValueByIndex($index)
-+    {
-+        $options = $this->_rootElement->getElements($this->optionSelector, Locator::SELECTOR_XPATH);
-+        if (isset($options[$index])) {
-+            $options[$index]->click();
-+        }
-+        return $this;
-+    }
-+
-+    /**
-+     * Get value for limiter element by index
-+     *
-+     * @param int $index
-+     * @return int|null
-+     */
-+    public function getLimitedValueByIndex($index)
-+    {
-+        $options = $this->_rootElement->getElements($this->optionSelector, Locator::SELECTOR_XPATH);
-+        if (isset($options[$index])) {
-+            return $options[$index]->getValue();
-+        }
-+        return null;
-+    }
-+}
-diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
-index ae994f84c47..058c764be16 100644
---- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
-+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
-@@ -36,6 +36,13 @@ class AssertProductIsPresentInWishlist extends AbstractConstraint
-         $cmsIndex->getLinksBlock()->openLink('My Account');
-         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Wish List');
- 
-+        $isProductVisible = $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product)
-+            ->isVisible();
-+        while (!$isProductVisible && $wishlistIndex->getTopToolbar()->nextPage()) {
-+            $isProductVisible = $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product)
-+                ->isVisible();
-+        }
-+
-         \PHPUnit\Framework\Assert::assertTrue(
-             $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product)->isVisible(),
-             $product->getName() . ' is not visible on Wish List page.'
-diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
-index 68e30e13558..dc71939d479 100644
---- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
-+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
-@@ -44,44 +44,40 @@ class AssertProductRegularPriceOnStorefront extends AbstractConstraint
-         $cmsIndex->getLinksBlock()->openLink('My Account');
-         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Wish List');
- 
--        $productRegularPrice = 0;
--        if ($product instanceof GroupedProduct) {
--            $associatedProducts = $product->getAssociated();
-+        $isProductVisible = $wishlistIndex->getWishlistBlock()
-+            ->getProductItemsBlock()
-+            ->getItemProduct($product)
-+            ->isVisible();
-+        while (!$isProductVisible && $wishlistIndex->getTopToolbar()->nextPage()) {
-+            $isProductVisible = $wishlistIndex->getWishlistBlock()
-+                ->getProductItemsBlock()
-+                ->getItemProduct($product)
-+                ->isVisible();
-+        }
- 
--            /** @var \Magento\Catalog\Test\Fixture\CatalogProductSimple $associatedProduct */
--            foreach ($associatedProducts['products'] as $key => $associatedProduct) {
--                $qty = $associatedProducts['assigned_products'][$key]['qty'];
--                $price = $associatedProduct->getPrice();
--                $productRegularPrice += $qty * $price;
--            }
-+        if ($product instanceof GroupedProduct) {
-+            $productRegularPrice = $this->getGroupedProductRegularPrice($product);
-         } elseif ($product instanceof BundleProduct) {
--            $bundleSelection = (array)$product->getBundleSelections();
--            foreach ($bundleSelection['products'] as $bundleOption) {
--                $regularBundleProductPrice = 0;
--                /** @var \Magento\Catalog\Test\Fixture\CatalogProductSimple $bundleProduct */
--                foreach ($bundleOption as $bundleProduct) {
--                    $checkoutData = $bundleProduct->getCheckoutData();
--                    $bundleProductPrice = $checkoutData['qty'] * $checkoutData['cartItem']['price'];
--                    if (0 === $regularBundleProductPrice) {
--                        $regularBundleProductPrice = $bundleProductPrice;
--                    } else {
--                        $regularBundleProductPrice = max([$bundleProductPrice, $regularBundleProductPrice]);
--                    }
--                }
--                $productRegularPrice += $regularBundleProductPrice;
--            }
-+            $productRegularPrice = $this->getBundleProductRegularPrice($product);
-         } else {
--            $productRegularPrice = (float)$product->getPrice();
-+            $productRegularPrice = (float) $product->getPrice();
-         }
- 
--        $productItem = $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product);
--        $wishListProductRegularPrice = (float)$productItem->getRegularPrice();
-+        $productItem = $wishlistIndex->getWishlistBlock()
-+            ->getProductItemsBlock()
-+            ->getItemProduct($product);
- 
--        \PHPUnit\Framework\Assert::assertEquals(
--            $this->regularPriceLabel,
--            $productItem->getPriceLabel(),
--            'Wrong product regular price is displayed.'
--        );
-+        $wishListProductRegularPrice = $product instanceof BundleProduct
-+            ? (float)$productItem->getPrice()
-+            : (float)$productItem->getRegularPrice();
-+
-+        if (!$product instanceof BundleProduct) {
-+            \PHPUnit\Framework\Assert::assertEquals(
-+                $this->regularPriceLabel,
-+                $productItem->getPriceLabel(),
-+                'Wrong product regular price is displayed.'
-+            );
-+        }
- 
-         \PHPUnit\Framework\Assert::assertNotEmpty(
-             $wishListProductRegularPrice,
-@@ -95,6 +91,52 @@ class AssertProductRegularPriceOnStorefront extends AbstractConstraint
-         );
-     }
- 
-+    /**
-+     * Retrieve grouped product regular price
-+     *
-+     * @param GroupedProduct $product
-+     * @return float
-+     */
-+    private function getGroupedProductRegularPrice(GroupedProduct $product)
-+    {
-+        $productRegularPrice = 0;
-+        $associatedProducts = $product->getAssociated();
-+        /** @var \Magento\Catalog\Test\Fixture\CatalogProductSimple $associatedProduct */
-+        foreach ($associatedProducts['products'] as $key => $associatedProduct) {
-+            $qty = $associatedProducts['assigned_products'][$key]['qty'];
-+            $price = $associatedProduct->getPrice();
-+            $productRegularPrice += $qty * $price;
-+        }
-+        return $productRegularPrice;
-+    }
-+
-+    /**
-+     * Retrieve bundle product regular price
-+     *
-+     * @param BundleProduct $product
-+     * @return float
-+     */
-+    private function getBundleProductRegularPrice(BundleProduct $product)
-+    {
-+        $productRegularPrice = 0;
-+        $bundleSelection = (array) $product->getBundleSelections();
-+        foreach ($bundleSelection['products'] as $bundleOption) {
-+            $regularBundleProductPrice = 0;
-+            /** @var \Magento\Catalog\Test\Fixture\CatalogProductSimple $bundleProduct */
-+            foreach ($bundleOption as $bundleProduct) {
-+                $checkoutData = $bundleProduct->getCheckoutData();
-+                $bundleProductPrice = $checkoutData['qty'] * $checkoutData['cartItem']['price'];
-+                if (0 === $regularBundleProductPrice) {
-+                    $regularBundleProductPrice = $bundleProductPrice;
-+                } else {
-+                    $regularBundleProductPrice = max([$bundleProductPrice, $regularBundleProductPrice]);
-+                }
-+            }
-+            $productRegularPrice += $regularBundleProductPrice;
-+        }
-+        return $productRegularPrice;
-+    }
-+
-     /**
-      * Returns a string representation of the object.
-      *
-diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistIndex.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistIndex.xml
-index 141bc8c5898..4e67c8d4e1d 100644
---- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistIndex.xml
-+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistIndex.xml
-@@ -9,5 +9,6 @@
-   <page name="WishlistIndex" mca="wishlist/index/index" module="Magento_Wishlist">
-     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".messages" strategy="css selector"/>
-     <block name="wishlistBlock" class="Magento\Wishlist\Test\Block\Customer\Wishlist" locator="#wishlist-view-form" strategy="css selector"/>
-+    <block name="topToolbar" class="Magento\Wishlist\Test\Block\Customer\Wishlist\Items\TopToolbar" locator=".//*[contains(@class,'wishlist-toolbar')][2]" strategy="xpath"/>
-   </page>
- </config>
-diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
-index 06b1a6078d5..e5fa4b6fc11 100644
---- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
-@@ -108,7 +108,7 @@
-         </variation>
-         <variation name="AddProductToWishlistEntityTestVariation14" ticketId="MAGETWO-90131">
-             <data name="product" xsi:type="array">
--                <item name="0" xsi:type="string">bundleProduct::with_special_price_and_custom_options</item>
-+                <item name="0" xsi:type="string">bundleProduct::default_with_one_simple_product</item>
-             </data>
-             <constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
-             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
-diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.xml
-index ec01f57202b..cbf5ba39284 100644
---- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.xml
-+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.xml
-@@ -8,6 +8,7 @@
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-     <testCase name="Magento\Wishlist\Test\TestCase\ShareWishlistEntityTest" summary="Share wishlist" ticketId="MAGETWO-23394">
-         <variation name="ShareWishlistEntityTestVariation1">
-+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-             <data name="sharingInfo/emails" xsi:type="string">JohnDoe123456789@example.com,JohnDoe987654321@example.com,JohnDoe123456abc@example.com</data>
-             <data name="sharingInfo/message" xsi:type="string">Sharing message.</data>
-             <constraint name="Magento\Wishlist\Test\Constraint\AssertWishlistShareMessage" />
-diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml
-index 7eea71a955c..17578fcfe85 100644
---- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml
-+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml
-@@ -11,6 +11,7 @@
-         <deny>
-             <tag group="stable" value="no" />
-             <tag group="to_maintain" value="yes" />
-+            <tag group="mftf_migrated" value="yes" />
-         </deny>
-     </rule>
-     <rule scope="testsuite">
-@@ -23,6 +24,7 @@
-         <deny>
-             <tag group="test_type" value="3rd_party_test, 3rd_party_test_single_flow" />
-             <tag group="stable" value="no" />
-+            <tag group="mftf_migrated" value="yes" />
-             <tag group="to_maintain" value="yes" />
-         </deny>
-     </rule>
-diff --git a/dev/tests/functional/utils/command.php b/dev/tests/functional/utils/command.php
-deleted file mode 100644
-index 8eaf82475a4..00000000000
---- a/dev/tests/functional/utils/command.php
-+++ /dev/null
-@@ -1,23 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--require_once __DIR__ . '/../../../../app/bootstrap.php';
--
--use Symfony\Component\Console\Input\StringInput;
--use Symfony\Component\Console\Output\NullOutput;
--
--if (isset($_GET['command'])) {
--    $command = urldecode($_GET['command']);
--    $magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
--    $magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);
--    $cli = $magentoObjectManager->create(\Magento\Framework\Console\Cli::class);
--    $input = new StringInput($command);
--    $input->setInteractive(false);
--    $output = new NullOutput();
--    $cli->doRun($input, $output);
--} else {
--    throw new \InvalidArgumentException("Command GET parameter is not set.");
--}
-diff --git a/dev/tests/functional/utils/deleteMagentoGeneratedCode.php b/dev/tests/functional/utils/deleteMagentoGeneratedCode.php
-deleted file mode 100644
-index 99aa9af06e9..00000000000
---- a/dev/tests/functional/utils/deleteMagentoGeneratedCode.php
-+++ /dev/null
-@@ -1,7 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--exec('rm -rf ../../../../generated/*');
-diff --git a/dev/tests/functional/utils/export.php b/dev/tests/functional/utils/export.php
-deleted file mode 100644
-index 343dcc557c8..00000000000
---- a/dev/tests/functional/utils/export.php
-+++ /dev/null
-@@ -1,27 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--if (!isset($_GET['template'])) {
--    throw new \InvalidArgumentException('Argument "template" must be set.');
--}
--
--$varDir = '../../../../var/';
--$template = urldecode($_GET['template']);
--$fileList = scandir($varDir, SCANDIR_SORT_NONE);
--$files = [];
--
--foreach ($fileList as $fileName) {
--    if (preg_match("`$template`", $fileName) === 1) {
--        $filePath = $varDir . $fileName;
--        $files[] = [
--            'content' => file_get_contents($filePath),
--            'name' => $fileName,
--            'date' => filectime($filePath),
--        ];
--    }
--}
--
--echo serialize($files);
-diff --git a/dev/tests/functional/utils/locales.php b/dev/tests/functional/utils/locales.php
-deleted file mode 100644
-index 827b8b1b894..00000000000
---- a/dev/tests/functional/utils/locales.php
-+++ /dev/null
-@@ -1,17 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--if (isset($_GET['type']) && $_GET['type'] == 'deployed') {
--    $themePath = isset($_GET['theme_path']) ? $_GET['theme_path'] : 'adminhtml/Magento/backend';
--    $directory = __DIR__ . '/../../../../pub/static/' . $themePath;
--    $locales = array_diff(scandir($directory), ['..', '.']);
--} else {
--    require_once __DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php';
--    $localeConfig = $magentoObjectManager->create(\Magento\Framework\Locale\Config::class);
--    $locales = $localeConfig->getAllowedLocales();
--}
--
--echo implode('|', $locales);
-diff --git a/dev/tests/functional/utils/log.php b/dev/tests/functional/utils/log.php
-deleted file mode 100644
-index b6c19458b10..00000000000
---- a/dev/tests/functional/utils/log.php
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--if (!isset($_GET['name'])) {
--    throw new \InvalidArgumentException('The name of log file is required for getting logs.');
--}
--
--$name = urldecode($_GET['name']);
--$file = file_get_contents('../../../../var/log/' . $name);
--
--echo serialize($file);
-diff --git a/dev/tests/functional/utils/pathChecker.php b/dev/tests/functional/utils/pathChecker.php
-deleted file mode 100644
-index 11f8229bce5..00000000000
---- a/dev/tests/functional/utils/pathChecker.php
-+++ /dev/null
-@@ -1,17 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--if (isset($_GET['path'])) {
--    $path = urldecode($_GET['path']);
--
--    if (file_exists('../../../../' . $path)) {
--        echo 'path exists: true';
--    } else {
--        echo 'path exists: false';
--    }
--} else {
--    throw new \InvalidArgumentException("GET parameter 'path' is not set.");
--}
-diff --git a/dev/tests/functional/utils/website.php b/dev/tests/functional/utils/website.php
-deleted file mode 100644
-index 625f5c6b483..00000000000
---- a/dev/tests/functional/utils/website.php
-+++ /dev/null
-@@ -1,32 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--if (!isset($_GET['website_code'])) {
--    throw new \Exception("website_code GET parameter is not set.");
--}
--
--$websiteCode = urldecode($_GET['website_code']);
--$rootDir = '../../../../';
--$websiteDir = $rootDir . 'websites/' . $websiteCode . '/';
--$contents = file_get_contents($rootDir . 'index.php');
--
--$websiteParam = <<<EOD
--\$params = \$_SERVER;
--\$params[\Magento\Store\Model\StoreManager::PARAM_RUN_CODE] = '$websiteCode';
--\$params[\Magento\Store\Model\StoreManager::PARAM_RUN_TYPE] = 'website';
--EOD;
--
--$pattern = '`(try {.*?)(\/app\/bootstrap.*?}\n)(.*?)\$_SERVER`mis';
--$replacement = "$1/../..$2\n$websiteParam$3\$params";
--
--$contents = preg_replace($pattern, $replacement, $contents);
--
--$old = umask(0);
--mkdir($websiteDir, 0760, true);
--umask($old);
--
--copy($rootDir . '.htaccess', $websiteDir . '.htaccess');
--file_put_contents($websiteDir . 'index.php', $contents);
-diff --git a/dev/tests/integration/.gitignore b/dev/tests/integration/.gitignore
-index 7f8540b3c77..c4d6c1a77a9 100644
---- a/dev/tests/integration/.gitignore
-+++ b/dev/tests/integration/.gitignore
-@@ -2,3 +2,4 @@
- !/etc/integration-tests-config.xml
- /var/
- /etc/*.php
-+/framework/tests/unit/var/allure-results/
-diff --git a/dev/tests/integration/_files/Magento/TestModuleMysqlMq/Model/DataObject.php b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/Model/DataObject.php
-new file mode 100644
-index 00000000000..ad3033cf7ee
---- /dev/null
-+++ b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/Model/DataObject.php
-@@ -0,0 +1,60 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\TestModuleMysqlMq\Model;
-+
-+class DataObject extends \Magento\Framework\Api\AbstractExtensibleObject
-+{
-+    /**
-+     * @return string
-+     */
-+    public function getName()
-+    {
-+        return $this->_get('name');
-+    }
-+
-+    /**
-+     * @param string $name
-+     * @return $this
-+     */
-+    public function setName($name)
-+    {
-+        return $this->setData('name', $name);
-+    }
-+
-+    /**
-+     * @return int|null
-+     */
-+    public function getEntityId()
-+    {
-+        return $this->_get('entity_id');
-+    }
-+
-+    /**
-+     * @param int $entityId
-+     * @return $this
-+     */
-+    public function setEntityId($entityId)
-+    {
-+        return $this->setData('entity_id', $entityId);
-+    }
-+
-+    /**
-+     * @return string
-+     */
-+    public function getOutputPath()
-+    {
-+        return $this->_get('outputPath');
-+    }
-+
-+    /**
-+     * @param string $path
-+     * @return $this
-+     */
-+    public function setOutputPath($path)
-+    {
-+        return $this->setData('outputPath', $path);
-+    }
-+}
-diff --git a/dev/tests/integration/_files/Magento/TestModuleMysqlMq/Model/DataObjectRepository.php b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/Model/DataObjectRepository.php
-new file mode 100644
-index 00000000000..942298e4997
---- /dev/null
-+++ b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/Model/DataObjectRepository.php
-@@ -0,0 +1,27 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\TestModuleMysqlMq\Model;
-+
-+class DataObjectRepository
-+{
-+    /**
-+     * @param DataObject $dataObject
-+     * @param string $requiredParam
-+     * @param int|null $optionalParam
-+     * @return null
-+     */
-+    public function delayedOperation(
-+        \Magento\TestModuleMysqlMq\Model\DataObject $dataObject,
-+        $requiredParam,
-+        $optionalParam = null
-+    ) {
-+        $output = "Processed '{$dataObject->getEntityId()}'; "
-+            . "Required param '{$requiredParam}'; Optional param '{$optionalParam}'\n";
-+        file_put_contents($dataObject->getOutputPath(), $output);
-+
-+        return null;
-+    }
-+}
-diff --git a/dev/tests/integration/_files/Magento/TestModuleMysqlMq/Model/Processor.php b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/Model/Processor.php
-new file mode 100644
-index 00000000000..fb6fd4c5c28
---- /dev/null
-+++ b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/Model/Processor.php
-@@ -0,0 +1,71 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\TestModuleMysqlMq\Model;
-+
-+/**
-+ * Test message processor is used by \Magento\MysqlMq\Model\PublisherConsumerTest
-+ */
-+class Processor
-+{
-+    /**
-+     * @param \Magento\TestModuleMysqlMq\Model\DataObject $message
-+     */
-+    public function processMessage($message)
-+    {
-+        file_put_contents(
-+            $message->getOutputPath(),
-+            "Processed {$message->getEntityId()}" . PHP_EOL,
-+            FILE_APPEND
-+        );
-+    }
-+
-+    /**
-+     * @param \Magento\TestModuleMysqlMq\Model\DataObject $message
-+     */
-+    public function processObjectCreated($message)
-+    {
-+        file_put_contents(
-+            $message->getOutputPath(),
-+            "Processed object created {$message->getEntityId()}" . PHP_EOL,
-+            FILE_APPEND
-+        );
-+    }
-+
-+    /**
-+     * @param \Magento\TestModuleMysqlMq\Model\DataObject $message
-+     */
-+    public function processCustomObjectCreated($message)
-+    {
-+        file_put_contents(
-+            $message->getOutputPath(),
-+            "Processed custom object created {$message->getEntityId()}" . PHP_EOL,
-+            FILE_APPEND
-+        );
-+    }
-+
-+    /**
-+     * @param \Magento\TestModuleMysqlMq\Model\DataObject $message
-+     */
-+    public function processObjectUpdated($message)
-+    {
-+        file_put_contents(
-+            $message->getOutputPath(),
-+            "Processed object updated {$message->getEntityId()}" . PHP_EOL,
-+            FILE_APPEND
-+        );
-+    }
-+
-+    /**
-+     * @param \Magento\TestModuleMysqlMq\Model\DataObject $message
-+     */
-+    public function processMessageWithException($message)
-+    {
-+        file_put_contents($message->getOutputPath(), "Exception processing {$message->getEntityId()}");
-+        throw new \LogicException(
-+            "Exception during message processing happened. Entity: {{$message->getEntityId()}}"
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/communication.xml b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/communication.xml
-new file mode 100644
-index 00000000000..4d6269dbb79
---- /dev/null
-+++ b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/communication.xml
-@@ -0,0 +1,14 @@
-+<?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:Communication/etc/communication.xsd">
-+    <topic name="demo.exception" request="Magento\TestModuleMysqlMq\Model\DataObject"/>
-+    <topic name="test.schema.defined.by.method" schema="Magento\TestModuleMysqlMq\Model\DataObjectRepository::delayedOperation" is_synchronous="false"/>
-+    <topic name="demo.object.created" request="Magento\TestModuleMysqlMq\Model\DataObject"/>
-+    <topic name="demo.object.updated" request="Magento\TestModuleMysqlMq\Model\DataObject"/>
-+    <topic name="demo.object.custom.created" request="Magento\TestModuleMysqlMq\Model\DataObject"/>
-+</config>
-diff --git a/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/module.xml
-new file mode 100644
-index 00000000000..8b6ea0f44ce
---- /dev/null
-+++ b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/module.xml
-@@ -0,0 +1,11 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_TestModuleMysqlMq" active="true">
-+    </module>
-+</config>
-diff --git a/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/queue.xml b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/queue.xml
-new file mode 100644
-index 00000000000..362237c0c5e
---- /dev/null
-+++ b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/queue.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+ /**
-+  * 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-message-queue:etc/queue.xsd">
-+    <broker topic="demo.exception" type="db" exchange="magento">
-+        <queue consumer="demoConsumerWithException" name="queue-exception" handler="Magento\TestModuleMysqlMq\Model\Processor::processMessageWithException"/>
-+    </broker>
-+    <broker topic="test.schema.defined.by.method" type="db" exchange="magento">
-+        <queue consumer="delayedOperationConsumer" name="demo-queue-6" handler="Magento\TestModuleMysqlMq\Model\DataObjectRepository::delayedOperation"/>
-+    </broker>
-+    <broker topic="demo.object.created" type="db" exchange="magento">
-+        <queue consumer="demoConsumerQueueOne" name="queue-created" handler="\Magento\TestModuleMysqlMq\Model\Processor::processObjectCreated"/>
-+    </broker>
-+    <broker topic="demo.object.updated" exchange="magento" type="db">
-+        <queue consumer="demoConsumerQueueTwo" name="queue-updated" handler="\Magento\TestModuleMysqlMq\Model\Processor::processObjectUpdated"/>
-+    </broker>
-+    <broker topic="demo.object.custom.created" exchange="magento" type="db">
-+        <queue consumer="demoConsumerQueueThree" name="queue-custom-created" handler="\Magento\TestModuleMysqlMq\Model\Processor::processCustomObjectCreated"/>
-+    </broker>
-+</config>
-diff --git a/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/queue_consumer.xml b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/queue_consumer.xml
-new file mode 100644
-index 00000000000..bb495a123a0
---- /dev/null
-+++ b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/queue_consumer.xml
-@@ -0,0 +1,14 @@
-+<?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-message-queue:etc/consumer.xsd">
-+    <consumer name="demoConsumerQueueOne" queue="queue-created" connection="db" handler="Magento\TestModuleMysqlMq\Model\Processor::processObjectCreated"/>
-+    <consumer name="demoConsumerQueueTwo" queue="queue-updated" connection="db" handler="Magento\TestModuleMysqlMq\Model\Processor::processObjectUpdated"/>
-+    <consumer name="demoConsumerQueueThree" queue="queue-custom-created" connection="db" handler="Magento\TestModuleMysqlMq\Model\Processor::processCustomObjectCreated"/>
-+    <consumer name="demoConsumerWithException" queue="queue-exception" connection="db" handler="Magento\TestModuleMysqlMq\Model\Processor::processMessageWithException"/>
-+    <consumer name="delayedOperationConsumer" queue="demo-queue-6" connection="db" handler="Magento\TestModuleMysqlMq\Model\DataObjectRepository::delayedOperation"/>
-+</config>
-diff --git a/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/queue_publisher.xml b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/queue_publisher.xml
-new file mode 100644
-index 00000000000..a665e10ef5f
---- /dev/null
-+++ b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/queue_publisher.xml
-@@ -0,0 +1,24 @@
-+<?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-message-queue:etc/publisher.xsd">
-+    <publisher topic="demo.exception">
-+        <connection name="db" exchange="magento"/>
-+    </publisher>
-+    <publisher topic="test.schema.defined.by.method">
-+        <connection name="db" exchange="magento"/>
-+    </publisher>
-+    <publisher topic="demo.object.created">
-+        <connection name="db" exchange="magento"/>
-+    </publisher>
-+    <publisher topic="demo.object.updated">
-+        <connection name="db" exchange="magento"/>
-+    </publisher>
-+    <publisher topic="demo.object.custom.created">
-+        <connection name="db" exchange="magento"/>
-+    </publisher>
-+</config>
-diff --git a/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/queue_topology.xml b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/queue_topology.xml
-new file mode 100644
-index 00000000000..2df5485ee34
---- /dev/null
-+++ b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/etc/queue_topology.xml
-@@ -0,0 +1,17 @@
-+<?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-message-queue:etc/topology.xsd">
-+
-+    <exchange name="magento" type="topic" connection="db">
-+        <binding id="demo.exception.consumer" topic="demo.exception" destination="queue-exception" destinationType="queue"/>
-+        <binding id="test.schema.defined.by.method" topic="test.schema.defined.by.method" destination="demo-queue-6" destinationType="queue"/>
-+        <binding id="demo.object.created" topic="demo.object.created" destination="queue-created" destinationType="queue"/>
-+        <binding id="demo.object.updated" topic="demo.object.updated" destination="queue-updated" destinationType="queue"/>
-+        <binding id="demo.object.all" topic="demo.object.*" destination="queue-custom-created" destinationType="queue"/>
-+    </exchange>
-+</config>
-diff --git a/dev/tests/integration/_files/Magento/TestModuleMysqlMq/registration.php b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/registration.php
-new file mode 100644
-index 00000000000..4250e95bd7c
---- /dev/null
-+++ b/dev/tests/integration/_files/Magento/TestModuleMysqlMq/registration.php
-@@ -0,0 +1,12 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+$registrar = new ComponentRegistrar();
-+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleMysqlMq') === null) {
-+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleMysqlMq', __DIR__);
-+}
-diff --git a/dev/tests/integration/etc/di/preferences/ce.php b/dev/tests/integration/etc/di/preferences/ce.php
-index b871fe19059..b8264ea9777 100644
---- a/dev/tests/integration/etc/di/preferences/ce.php
-+++ b/dev/tests/integration/etc/di/preferences/ce.php
-@@ -27,4 +27,8 @@ return [
-     \Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class,
-     \Magento\Framework\App\ResourceConnection\ConfigInterface::class =>
-         \Magento\Framework\App\ResourceConnection\Config::class,
-+    \Magento\Framework\Lock\Backend\Cache::class =>
-+        \Magento\TestFramework\Lock\Backend\DummyLocker::class,
-+    \Magento\Framework\Session\SessionStartChecker::class => \Magento\TestFramework\Session\SessionStartChecker::class,
-+    \Magento\Framework\HTTP\AsyncClientInterface::class => \Magento\TestFramework\HTTP\AsyncClientInterfaceMock::class,
- ];
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
-index dc525a46428..ddebbf37b16 100644
---- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
-+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
-@@ -4,13 +4,14 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Implementation of the @magentoDataFixture DocBlock annotation
-- */
- namespace Magento\TestFramework\Annotation;
- 
-+use Magento\Framework\Component\ComponentRegistrar;
- use PHPUnit\Framework\Exception;
- 
-+/**
-+ * Implementation of the @magentoDataFixture DocBlock annotation.
-+ */
- class DataFixture
- {
-     /**
-@@ -126,6 +127,8 @@ class DataFixture
-                 $fixtureMethod = [get_class($test), $fixture];
-                 if (is_callable($fixtureMethod)) {
-                     $result[] = $fixtureMethod;
-+                } elseif ($this->isModuleAnnotation($fixture)) {
-+                    $result[] = $this->getModulePath($fixture);
-                 } else {
-                     $result[] = $this->_fixtureBaseDir . '/' . $fixture;
-                 }
-@@ -135,6 +138,44 @@ class DataFixture
-     }
- 
-     /**
-+     * Check is the Annotation like Magento_InventoryApi::Test/_files/products.php
-+     *
-+     * @param string $fixture
-+     * @return bool
-+     */
-+    private function isModuleAnnotation(string $fixture)
-+    {
-+        return (strpos($fixture, '::') !== false);
-+    }
-+
-+    /**
-+     * Resolve the Fixture
-+     *
-+     * @param string $fixture
-+     * @return string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @SuppressWarnings(PHPMD.StaticAccess)
-+     */
-+    private function getModulePath(string $fixture)
-+    {
-+        [$moduleName, $fixtureFile] = explode('::', $fixture, 2);
-+
-+        $modulePath = (new ComponentRegistrar())->getPath(ComponentRegistrar::MODULE, $moduleName);
-+
-+        if ($modulePath === null) {
-+            throw new \Magento\Framework\Exception\LocalizedException(
-+                new \Magento\Framework\Phrase('Can\'t find registered Module with name %1 .', [$moduleName])
-+            );
-+        }
-+
-+        return $modulePath . '/' . ltrim($fixtureFile, '/');
-+    }
-+
-+    /**
-+     * Get method annotations.
-+     *
-+     * Overwrites class-defined annotations.
-+     *
-      * @param \PHPUnit\Framework\TestCase $test
-      * @return array
-      */
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
-index db7f57362d8..ba23ecd13b6 100644
---- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
-+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
-@@ -4,13 +4,14 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Implementation of the @magentoDataFixture DocBlock annotation
-- */
- namespace Magento\TestFramework\Annotation;
- 
-+use Magento\Framework\Component\ComponentRegistrar;
- use PHPUnit\Framework\Exception;
- 
-+/**
-+ * Implementation of the @magentoDataFixtureBeforeTransaction DocBlock annotation
-+ */
- class DataFixtureBeforeTransaction
- {
-     /**
-@@ -93,6 +94,8 @@ class DataFixtureBeforeTransaction
-                 $fixtureMethod = [get_class($test), $fixture];
-                 if (is_callable($fixtureMethod)) {
-                     $result[] = $fixtureMethod;
-+                } elseif ($this->isModuleAnnotation($fixture)) {
-+                    $result[] = $this->getModulePath($fixture);
-                 } else {
-                     $result[] = $this->_fixtureBaseDir . '/' . $fixture;
-                 }
-@@ -102,6 +105,42 @@ class DataFixtureBeforeTransaction
-     }
- 
-     /**
-+     * Check is the Annotation like Magento_InventoryApi::Test/_files/products.php
-+     *
-+     * @param string $fixture
-+     * @return bool
-+     */
-+    private function isModuleAnnotation(string $fixture)
-+    {
-+        return (strpos($fixture, '::') !== false);
-+    }
-+
-+    /**
-+     * Resolve the Fixture
-+     *
-+     * @param string $fixture
-+     * @return string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @SuppressWarnings(PHPMD.StaticAccess)
-+     */
-+    private function getModulePath(string $fixture)
-+    {
-+        [$moduleName, $fixtureFile] = explode('::', $fixture, 2);
-+
-+        $modulePath = (new ComponentRegistrar())->getPath(ComponentRegistrar::MODULE, $moduleName);
-+
-+        if ($modulePath === null) {
-+            throw new \Magento\Framework\Exception\LocalizedException(
-+                new \Magento\Framework\Phrase('Can\'t find registered Module with name %1 .', [$moduleName])
-+            );
-+        }
-+
-+        return $modulePath . '/' . ltrim($fixtureFile, '/');
-+    }
-+
-+    /**
-+     * Get annotations for test.
-+     *
-      * @param \PHPUnit\Framework\TestCase $test
-      * @return array
-      */
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/IndexerDimensionMode.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/IndexerDimensionMode.php
-new file mode 100644
-index 00000000000..9f8518239cc
---- /dev/null
-+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/IndexerDimensionMode.php
-@@ -0,0 +1,141 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestFramework\Annotation;
-+
-+use Magento\Catalog\Model\Indexer\Product\Price\ModeSwitcher;
-+use Magento\Catalog\Model\Indexer\Product\Price\ModeSwitcherConfiguration;
-+use Magento\Catalog\Model\Indexer\Product\Price\Processor;
-+use Magento\Framework\App\Cache\TypeListInterface;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\TestFramework\App\Config;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Implementation of the @magentoIndexerDimensionMode DocBlock annotation
-+ */
-+class IndexerDimensionMode
-+{
-+    /** @var TypeListInterface */
-+    private $cacheTypeList;
-+
-+    /** @var ScopeConfigInterface */
-+    private $configReader;
-+
-+    /** @var ModeSwitcher */
-+    private $modeSwitcher;
-+
-+    /** @var ObjectManagerInterface */
-+    private $objectManager;
-+
-+    /** @var \Magento\TestFramework\Db\Mysql */
-+    private $db;
-+
-+    /** @var bool */
-+    private $isDimensionMode = false;
-+
-+    /**
-+     * Restore db
-+     */
-+    private function restoreDb()
-+    {
-+        $this->db = Bootstrap::getInstance()->getBootstrap()->getApplication()->getDbInstance();
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->db->restoreFromDbDump();
-+        $this->cacheTypeList = $this->objectManager->get(TypeListInterface::class);
-+        $this->cacheTypeList->cleanType('config');
-+        $this->objectManager->get(Config::class)->clean();
-+    }
-+
-+    /**
-+     * @param string $mode
-+     * @param TestCase $test
-+     * @throws \Exception
-+     */
-+    private function setDimensionMode(string $mode, TestCase $test)
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->modeSwitcher = $this->objectManager->get(ModeSwitcher::class);
-+        $this->configReader = $this->objectManager->get(ScopeConfigInterface::class);
-+        $this->cacheTypeList = $this->objectManager->get(TypeListInterface::class);
-+
-+        $this->configReader->clean();
-+        $previousMode = $this->configReader->getValue(ModeSwitcherConfiguration::XML_PATH_PRICE_DIMENSIONS_MODE) ?:
-+            DimensionModeConfiguration::DIMENSION_NONE;
-+
-+        if ($previousMode !== $mode) {
-+            //Create new tables and move data
-+            $this->modeSwitcher->switchMode($mode, $previousMode);
-+            $this->objectManager->get(Config::class)->clean();
-+        } else {
-+            $this->fail('Dimensions mode for indexer has not been changed', $test);
-+        }
-+    }
-+
-+    /**
-+     * Handler for 'startTest' event
-+     *
-+     * @param TestCase $test
-+     * @return void
-+     * @throws \Exception
-+     */
-+    public function startTest(TestCase $test)
-+    {
-+        $source = $test->getAnnotations();
-+
-+        if (isset($source['method']['magentoIndexerDimensionMode'])) {
-+            $annotations = $source['method']['magentoIndexerDimensionMode'];
-+        } elseif (isset($source['class']['magentoIndexerDimensionMode'])) {
-+            $annotations = $source['class']['magentoIndexerDimensionMode'];
-+        } else {
-+            return;
-+        }
-+
-+        $dbIsolation = $source['method']['magentoDbIsolation']
-+            ?? $source['class']['magentoDbIsolation']
-+            ?? ['disabled'];
-+
-+        if ($dbIsolation[0] != 'disabled') {
-+            $this->fail("Invalid @magentoDbIsolation declaration: $dbIsolation[0]", $test);
-+        }
-+
-+        list($indexerType, $indexerMode) = explode(' ', $annotations[0]);
-+
-+        if ($indexerType == Processor::INDEXER_ID) {
-+            $this->isDimensionMode = true;
-+            $this->setDimensionMode($indexerMode, $test);
-+        }
-+    }
-+
-+    /**
-+     * Handler for 'endTest' event
-+     *
-+     * @return void
-+     */
-+    public function endTest()
-+    {
-+        if ($this->isDimensionMode) {
-+            $this->restoreDb();
-+            $this->isDimensionMode = false;
-+        }
-+    }
-+
-+    /**
-+     * Fails the test with specified error message
-+     *
-+     * @param string $message
-+     * @param TestCase $test
-+     * @throws \Exception
-+     */
-+    private function fail($message, TestCase $test)
-+    {
-+        $test->fail("{$message} in the test '{$test->toString()}'");
-+    }
-+}
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/App/MutableScopeConfig.php b/dev/tests/integration/framework/Magento/TestFramework/App/MutableScopeConfig.php
-index 3a714faba4e..4af09e8db29 100644
---- a/dev/tests/integration/framework/Magento/TestFramework/App/MutableScopeConfig.php
-+++ b/dev/tests/integration/framework/Magento/TestFramework/App/MutableScopeConfig.php
-@@ -23,10 +23,7 @@ class MutableScopeConfig implements MutableScopeConfigInterface
-     private $testAppConfig;
- 
-     /**
--     * @param string $path
--     * @param string $scopeType
--     * @param null $scopeCode
--     * @return bool
-+     * @inheritdoc
-      */
-     public function isSetFlag($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null)
-     {
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php
-index 4fec36633c9..1bfc928f291 100644
---- a/dev/tests/integration/framework/Magento/TestFramework/Application.php
-+++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php
-@@ -498,6 +498,7 @@ class Application
-         $this->_ensureDirExists($this->_initParams[$dirs][DirectoryList::VAR_DIR][DirectoryList::PATH]);
- 
-         $this->copyAppConfigFiles();
-+        $this->copyGlobalConfigFile();
- 
-         $installParams = $this->getInstallCliParams();
- 
-@@ -557,6 +558,17 @@ class Application
-             }
-         }
-     }
-+    
-+    /**
-+     * Copies global configuration file from the tests folder (see TESTS_GLOBAL_CONFIG_FILE)
-+     *
-+     * @return void
-+     */
-+    private function copyGlobalConfigFile()
-+    {
-+        $targetFile = $this->_configDir . '/config.local.php';
-+        copy($this->globalConfigFile, $targetFile);
-+    }
- 
-     /**
-      * Gets a list of CLI params for installation
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
-index d0b6d0427bb..9a6b808ef7d 100644
---- a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
-+++ b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\TestFramework\Bootstrap;
- 
-+use Magento\TestFramework\Application;
-+
- /**
-  * Bootstrap of the custom DocBlock annotations
-  *
-@@ -27,8 +29,9 @@ class DocBlock
- 
-     /**
-      * Activate custom DocBlock annotations along with more-or-less permanent workarounds
-+     * @param Application $application
-      */
--    public function registerAnnotations(\Magento\TestFramework\Application $application)
-+    public function registerAnnotations(Application $application)
-     {
-         $eventManager = new \Magento\TestFramework\EventManager($this->_getSubscribers($application));
-         \Magento\TestFramework\Event\PhpUnit::setDefaultEventManager($eventManager);
-@@ -42,10 +45,10 @@ class DocBlock
-      * To allow config fixtures to deal with fixture stores, data fixtures should be processed first.
-      * ConfigFixture applied twice because data fixtures could clean config and clean custom settings
-      *
--     * @param \Magento\TestFramework\Application $application
-+     * @param Application $application
-      * @return array
-      */
--    protected function _getSubscribers(\Magento\TestFramework\Application $application)
-+    protected function _getSubscribers(Application $application)
-     {
-         return [
-             new \Magento\TestFramework\Workaround\Segfault(),
-@@ -54,6 +57,7 @@ class DocBlock
-             new \Magento\TestFramework\Isolation\WorkingDirectory(),
-             new \Magento\TestFramework\Isolation\DeploymentConfig(),
-             new \Magento\TestFramework\Annotation\AppIsolation($application),
-+            new \Magento\TestFramework\Annotation\IndexerDimensionMode($application),
-             new \Magento\TestFramework\Isolation\AppConfig(),
-             new \Magento\TestFramework\Annotation\ConfigFixture(),
-             new \Magento\TestFramework\Annotation\DataFixtureBeforeTransaction($this->_fixturesBaseDir),
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Indexer/Product/Flat/Action/Full.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Indexer/Product/Flat/Action/Full.php
-new file mode 100644
-index 00000000000..17ffb5cf274
---- /dev/null
-+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Indexer/Product/Flat/Action/Full.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\TestFramework\Catalog\Model\Indexer\Product\Flat\Action;
-+
-+/**
-+ * Class Full reindex action
-+ */
-+class Full extends \Magento\Catalog\Model\Indexer\Product\Flat\Action\Full
-+{
-+    /**
-+     * List of product types available in installation
-+     *
-+     * @var array
-+     */
-+    protected $_productTypes;
-+}
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/HTTP/AsyncClientInterfaceMock.php b/dev/tests/integration/framework/Magento/TestFramework/HTTP/AsyncClientInterfaceMock.php
-new file mode 100644
-index 00000000000..caef011267b
---- /dev/null
-+++ b/dev/tests/integration/framework/Magento/TestFramework/HTTP/AsyncClientInterfaceMock.php
-@@ -0,0 +1,78 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestFramework\HTTP;
-+
-+use Magento\Framework\HTTP\AsyncClient\GuzzleAsyncClient;
-+use Magento\Framework\HTTP\AsyncClient\HttpResponseDeferredInterface;
-+use Magento\Framework\HTTP\AsyncClient\Request;
-+use Magento\Framework\HTTP\AsyncClient\Response;
-+use Magento\Framework\HTTP\AsyncClientInterface;
-+
-+/**
-+ * Mock for the asynchronous client.
-+ */
-+class AsyncClientInterfaceMock implements AsyncClientInterface
-+{
-+    /**
-+     * @var GuzzleAsyncClient
-+     */
-+    private $client;
-+
-+    /**
-+     * @var Response[]
-+     */
-+    private $mockResponses = [];
-+
-+    /**
-+     * @var Request|null
-+     */
-+    private $lastRequest;
-+
-+    /**
-+     * AsyncClientInterfaceMock constructor.
-+     * @param GuzzleAsyncClient $client
-+     */
-+    public function __construct(GuzzleAsyncClient $client)
-+    {
-+        $this->client = $client;
-+    }
-+
-+    /**
-+     * Next responses will be as given.
-+     *
-+     * @param Response[] $responses
-+     * @return void
-+     */
-+    public function nextResponses(array $responses): void
-+    {
-+        $this->mockResponses = $responses;
-+    }
-+
-+    /**
-+     * Last request made.
-+     *
-+     * @return Request|null
-+     */
-+    public function getLastRequest(): ?Request
-+    {
-+        return $this->lastRequest;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function request(Request $request): HttpResponseDeferredInterface
-+    {
-+        $this->lastRequest = $request;
-+        if ($mockResponse = array_shift($this->mockResponses)) {
-+            return new MockDeferredResponse($mockResponse);
-+        }
-+
-+        return $this->client->request($request);
-+    }
-+}
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/HTTP/MockDeferredResponse.php b/dev/tests/integration/framework/Magento/TestFramework/HTTP/MockDeferredResponse.php
-new file mode 100644
-index 00000000000..faa5c40fc15
---- /dev/null
-+++ b/dev/tests/integration/framework/Magento/TestFramework/HTTP/MockDeferredResponse.php
-@@ -0,0 +1,64 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestFramework\HTTP;
-+
-+use Magento\Framework\Async\CancelingDeferredException;
-+use Magento\Framework\HTTP\AsyncClient\HttpResponseDeferredInterface;
-+use Magento\Framework\HTTP\AsyncClient\Response;
-+
-+/**
-+ * Mock for HTTP responses.
-+ */
-+class MockDeferredResponse implements HttpResponseDeferredInterface
-+{
-+    /**
-+     * @var Response
-+     */
-+    private $response;
-+
-+    /**
-+     * MockDeferredResponse constructor.
-+     * @param Response $response
-+     */
-+    public function __construct(Response $response)
-+    {
-+        $this->response = $response;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function cancel(bool $force = false): void
-+    {
-+        throw new CancelingDeferredException('Cannot be canceled');
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function isCancelled(): bool
-+    {
-+        return false;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function isDone(): bool
-+    {
-+        return true;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function get(): Response
-+    {
-+        return $this->response;
-+    }
-+}
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php b/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php
-index 992b980d6a8..aa0c790eeac 100644
---- a/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php
-+++ b/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php
-@@ -13,26 +13,62 @@ namespace Magento\TestFramework\Helper;
-  */
- class Amqp
- {
-+    const CONFIG_PATH_HOST = 'queue/amqp/host';
-+    const CONFIG_PATH_USER = 'queue/amqp/user';
-+    const CONFIG_PATH_PASSWORD = 'queue/amqp/password';
-+    const DEFAULT_MANAGEMENT_PORT = '15672';
-+
-     /**
-      * @var Curl
-      */
-     private $curl;
- 
-+    /**
-+     * @var \Magento\Framework\App\DeploymentConfig
-+     */
-+    private $deploymentConfig;
-+
-     /**
-      * RabbitMQ API host
-      *
-      * @var string
-      */
--    private $host = 'http://localhost:15672/api/';
-+    private $host;
- 
-     /**
-      * Initialize dependencies.
-+     * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
-      */
--    public function __construct()
--    {
-+    public function __construct(
-+        \Magento\Framework\App\DeploymentConfig $deploymentConfig = null
-+    ) {
-+        $this->deploymentConfig = $deploymentConfig ?? \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+            ->get(\Magento\Framework\App\DeploymentConfig::class);
-         $this->curl = new Curl();
--        $this->curl->setCredentials('guest', 'guest');
-+        $this->curl->setCredentials(
-+            $this->deploymentConfig->get(self::CONFIG_PATH_USER),
-+            $this->deploymentConfig->get(self::CONFIG_PATH_PASSWORD)
-+        );
-         $this->curl->addHeader('content-type', 'application/json');
-+        $this->host = sprintf(
-+            'http://%s:%s/api/',
-+            $this->deploymentConfig->get(self::CONFIG_PATH_HOST),
-+            defined('RABBITMQ_MANAGEMENT_PORT') ? RABBITMQ_MANAGEMENT_PORT : self::DEFAULT_MANAGEMENT_PORT
-+        );
-+    }
-+
-+    /**
-+     * Check that the RabbitMQ instance has the management plugin installed and the api is available.
-+     *
-+     * @return bool
-+     */
-+    public function isAvailable(): bool
-+    {
-+        $this->curl->get($this->host . 'overview');
-+        $data = $this->curl->getBody();
-+        $data = json_decode($data, true);
-+
-+        return isset($data['management_version']);
-     }
- 
-     /**
-@@ -55,6 +91,7 @@ class Amqp
-     /**
-      * Get declared exchange bindings.
-      *
-+     * @param string $name
-      * @return array
-      */
-     public function getExchangeBindings($name)
-@@ -82,6 +119,8 @@ class Amqp
-     }
- 
-     /**
-+     * Clear Queue
-+     *
-      * @param string $name
-      * @param int $numMessages
-      * @return string
-@@ -101,7 +140,7 @@ class Amqp
-     /**
-      * Delete connection
-      *
--     * @param $name
-+     * @param string $name
-      * @return string $data
-      */
-     public function deleteConnection($name)
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/Lock/Backend/DummyLocker.php b/dev/tests/integration/framework/Magento/TestFramework/Lock/Backend/DummyLocker.php
-new file mode 100644
-index 00000000000..41125493643
---- /dev/null
-+++ b/dev/tests/integration/framework/Magento/TestFramework/Lock/Backend/DummyLocker.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestFramework\Lock\Backend;
-+
-+use Magento\Framework\Lock\LockManagerInterface;
-+
-+/**
-+ * Dummy locker for the integration framework.
-+ */
-+class DummyLocker implements LockManagerInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function lock(string $name, int $timeout = -1): bool
-+    {
-+        return true;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function unlock(string $name): bool
-+    {
-+        return true;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function isLocked(string $name): bool
-+    {
-+        return false;
-+    }
-+}
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
-index 14847ae5066..32240e68ae7 100644
---- a/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
-+++ b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
-@@ -12,6 +12,9 @@ use Magento\Framework\MessageQueue\PublisherInterface;
- use Magento\Framework\OsInfo;
- use Magento\TestFramework\Helper\Amqp;
- 
-+/**
-+ * Publisher Consumer Controller
-+ */
- class PublisherConsumerController
- {
-     /**
-@@ -49,6 +52,16 @@ class PublisherConsumerController
-      */
-     private $amqpHelper;
- 
-+    /**
-+     * PublisherConsumerController constructor.
-+     * @param PublisherInterface $publisher
-+     * @param OsInfo $osInfo
-+     * @param Amqp $amqpHelper
-+     * @param string $logFilePath
-+     * @param array $consumers
-+     * @param array $appInitParams
-+     * @param null|int $maxMessages
-+     */
-     public function __construct(
-         PublisherInterface $publisher,
-         OsInfo $osInfo,
-@@ -75,27 +88,16 @@ class PublisherConsumerController
-      */
-     public function initialize()
-     {
--        if ($this->osInfo->isWindows()) {
--            throw new EnvironmentPreconditionException(
--                "This test relies on *nix shell and should be skipped in Windows environment."
--            );
--        }
-+        $this->validateEnvironmentPreconditions();
-+
-         $connections = $this->amqpHelper->getConnections();
-         foreach (array_keys($connections) as $connectionName) {
-             $this->amqpHelper->deleteConnection($connectionName);
-         }
-         $this->amqpHelper->clearQueue("async.operations.all");
--        foreach ($this->consumers as $consumer) {
--            foreach ($this->getConsumerProcessIds($consumer) as $consumerProcessId) {
--                exec("kill {$consumerProcessId}");
--            }
--        }
--        foreach ($this->consumers as $consumer) {
--            if (!$this->getConsumerProcessIds($consumer)) {
--                exec("{$this->getConsumerStartCommand($consumer, true)} > /dev/null &");
--            }
--            sleep(5);
--        }
-+
-+        $this->stopConsumers();
-+        $this->startConsumers();
- 
-         if (file_exists($this->logFilePath)) {
-             // try to remove before failing the test
-@@ -108,6 +110,27 @@ class PublisherConsumerController
-         }
-     }
- 
-+    /**
-+     * Validate environment preconditions
-+     *
-+     * @throws EnvironmentPreconditionException
-+     * @throws PreconditionFailedException
-+     */
-+    private function validateEnvironmentPreconditions()
-+    {
-+        if ($this->osInfo->isWindows()) {
-+            throw new EnvironmentPreconditionException(
-+                "This test relies on *nix shell and should be skipped in Windows environment."
-+            );
-+        }
-+
-+        if (!$this->amqpHelper->isAvailable()) {
-+            throw new PreconditionFailedException(
-+                'This test relies on RabbitMQ Management Plugin.'
-+            );
-+        }
-+    }
-+
-     /**
-      * Stop Consumers
-      */
-@@ -121,6 +144,8 @@ class PublisherConsumerController
-     }
- 
-     /**
-+     * Get Consumers ProcessIds
-+     *
-      * @return array
-      */
-     public function getConsumersProcessIds()
-@@ -133,6 +158,8 @@ class PublisherConsumerController
-     }
- 
-     /**
-+     * Get Consumer ProcessIds
-+     *
-      * @param string $consumer
-      * @return string[]
-      */
-@@ -167,8 +194,10 @@ class PublisherConsumerController
-     }
- 
-     /**
-+     * Wait for asynchronous result
-+     *
-      * @param callable $condition
--     * @param $params
-+     * @param array $params
-      * @throws PreconditionFailedException
-      */
-     public function waitForAsynchronousResult(callable $condition, $params)
-@@ -185,10 +214,27 @@ class PublisherConsumerController
-     }
- 
-     /**
-+     * Get publisher
-+     *
-      * @return PublisherInterface
-      */
-     public function getPublisher()
-     {
-         return $this->publisher;
-     }
-+
-+    /**
-+     * Start consumers
-+     *
-+     * @return void
-+     */
-+    public function startConsumers(): void
-+    {
-+        foreach ($this->consumers as $consumer) {
-+            if (!$this->getConsumerProcessIds($consumer)) {
-+                exec("{$this->getConsumerStartCommand($consumer, true)} > /dev/null &");
-+            }
-+            sleep(5);
-+        }
-+    }
- }
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/Session/SessionStartChecker.php b/dev/tests/integration/framework/Magento/TestFramework/Session/SessionStartChecker.php
-new file mode 100644
-index 00000000000..136b0565a72
---- /dev/null
-+++ b/dev/tests/integration/framework/Magento/TestFramework/Session/SessionStartChecker.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\TestFramework\Session;
-+
-+/**
-+ * Class to check if session can be started or not. Dummy for integration tests.
-+ */
-+class SessionStartChecker extends \Magento\Framework\Session\SessionStartChecker
-+{
-+    /**
-+     * Can session be started or not.
-+     *
-+     * @return bool
-+     */
-+    public function check() : bool
-+    {
-+        return true;
-+    }
-+}
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
-index 543bac2c6b5..7a387bd41ee 100644
---- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
-+++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
-@@ -6,9 +6,9 @@
- namespace Magento\TestFramework\TestCase;
- 
- /**
-- * A parent class for backend controllers - contains directives for admin user creation and authentication
-+ * A parent class for backend controllers - contains directives for admin user creation and authentication.
-+ *
-  * @SuppressWarnings(PHPMD.NumberOfChildren)
-- * @SuppressWarnings(PHPMD.numberOfChildren)
-  */
- abstract class AbstractBackendController extends \Magento\TestFramework\TestCase\AbstractController
- {
-@@ -36,6 +36,16 @@ abstract class AbstractBackendController extends \Magento\TestFramework\TestCase
-      */
-     protected $uri = null;
- 
-+    /**
-+     * @var string|null
-+     */
-+    protected $httpMethod;
-+
-+    /**
-+     * @inheritDoc
-+     *
-+     * @throws \Magento\Framework\Exception\AuthenticationException
-+     */
-     protected function setUp()
-     {
-         parent::setUp();
-@@ -62,6 +72,9 @@ abstract class AbstractBackendController extends \Magento\TestFramework\TestCase
-         ];
-     }
- 
-+    /**
-+     * @inheritDoc
-+     */
-     protected function tearDown()
-     {
-         $this->_auth->getAuthStorage()->destroy(['send_expire_cookie' => false]);
-@@ -86,21 +99,33 @@ abstract class AbstractBackendController extends \Magento\TestFramework\TestCase
-         parent::assertSessionMessages($constraint, $messageType, $messageManagerClass);
-     }
- 
-+    /**
-+     * Test ACL configuration for action working.
-+     */
-     public function testAclHasAccess()
-     {
-         if ($this->uri === null) {
-             $this->markTestIncomplete('AclHasAccess test is not complete');
-         }
-+        if ($this->httpMethod) {
-+            $this->getRequest()->setMethod($this->httpMethod);
-+        }
-         $this->dispatch($this->uri);
-         $this->assertNotSame(403, $this->getResponse()->getHttpResponseCode());
-         $this->assertNotSame(404, $this->getResponse()->getHttpResponseCode());
-     }
- 
-+    /**
-+     * Test ACL actually denying access.
-+     */
-     public function testAclNoAccess()
-     {
--        if ($this->resource === null) {
-+        if ($this->resource === null || $this->uri === null) {
-             $this->markTestIncomplete('Acl test is not complete');
-         }
-+        if ($this->httpMethod) {
-+            $this->getRequest()->setMethod($this->httpMethod);
-+        }
-         $this->_objectManager->get(\Magento\Framework\Acl\Builder::class)
-             ->getAcl()
-             ->deny(null, $this->resource);
-diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
-index 1bf6d471fc4..feb9eca0793 100644
---- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
-+++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
-@@ -10,10 +10,12 @@
- namespace Magento\TestFramework\TestCase;
- 
- use Magento\Framework\Data\Form\FormKey;
-+use Magento\Framework\Message\MessageInterface;
- use Magento\Framework\Stdlib\CookieManagerInterface;
- use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
- use Magento\Theme\Controller\Result\MessagePlugin;
- use Magento\Framework\App\Request\Http as HttpRequest;
-+use Magento\Framework\App\Response\Http as HttpResponse;
- 
- /**
-  * @SuppressWarnings(PHPMD.NumberOfChildren)
-@@ -70,6 +72,9 @@ abstract class AbstractController extends \PHPUnit\Framework\TestCase
-         $this->_objectManager->removeSharedInstance(\Magento\Framework\App\RequestInterface::class);
-     }
- 
-+    /**
-+     * @inheritDoc
-+     */
-     protected function tearDown()
-     {
-         $this->_request = null;
-@@ -114,7 +119,7 @@ abstract class AbstractController extends \PHPUnit\Framework\TestCase
-     /**
-      * Request getter
-      *
--     * @return \Magento\Framework\App\RequestInterface
-+     * @return \Magento\Framework\App\RequestInterface|HttpRequest
-      */
-     public function getRequest()
-     {
-@@ -127,7 +132,7 @@ abstract class AbstractController extends \PHPUnit\Framework\TestCase
-     /**
-      * Response getter
-      *
--     * @return \Magento\Framework\App\ResponseInterface
-+     * @return \Magento\Framework\App\ResponseInterface|HttpResponse
-      */
-     public function getResponse()
-     {
-@@ -212,13 +217,21 @@ abstract class AbstractController extends \PHPUnit\Framework\TestCase
-         $messageManagerClass = \Magento\Framework\Message\Manager::class
-     ) {
-         $this->_assertSessionErrors = false;
--
-+        /** @var MessageInterface[]|string[] $messageObjects */
-         $messages = $this->getMessages($messageType, $messageManagerClass);
-+        /** @var string[] $messages */
-+        $messagesFiltered = array_map(
-+            function ($message) {
-+                /** @var MessageInterface|string $message */
-+                return ($message instanceof MessageInterface) ? $message->toString() : $message;
-+            },
-+            $messages
-+        );
- 
-         $this->assertThat(
--            $messages,
-+            $messagesFiltered,
-             $constraint,
--            'Session messages do not meet expectations ' . var_export($messages, true)
-+            'Session messages do not meet expectations ' . var_export($messagesFiltered, true)
-         );
-     }
- 
-diff --git a/dev/tests/integration/framework/bootstrap.php b/dev/tests/integration/framework/bootstrap.php
-index 1cae393dc01..59fb1535d18 100644
---- a/dev/tests/integration/framework/bootstrap.php
-+++ b/dev/tests/integration/framework/bootstrap.php
-@@ -5,9 +5,15 @@
-  */
- use Magento\Framework\Autoload\AutoloaderRegistry;
- 
-+/**
-+ * phpcs:disable PSR1.Files.SideEffects
-+ * phpcs:disable Squiz.Functions.GlobalFunction
-+ * phpcs:disable Magento2.Security.IncludeFile
-+ */
- require_once __DIR__ . '/../../../../app/bootstrap.php';
- require_once __DIR__ . '/autoload.php';
- 
-+// phpcs:ignore Magento2.Functions.DiscouragedFunction
- $testsBaseDir = dirname(__DIR__);
- $fixtureBaseDir = $testsBaseDir. '/testsuite';
- 
-@@ -19,15 +25,15 @@ if (!defined('INTEGRATION_TESTS_DIR')) {
-     define('INTEGRATION_TESTS_DIR', $testsBaseDir);
- }
- 
--$testFrameworkDir = __DIR__;
--require_once 'deployTestModules.php';
--
- try {
-     setCustomErrorHandler();
- 
-     /* Bootstrap the application */
-     $settings = new \Magento\TestFramework\Bootstrap\Settings($testsBaseDir, get_defined_constants());
- 
-+    $testFrameworkDir = __DIR__;
-+    require_once 'deployTestModules.php';
-+
-     if ($settings->get('TESTS_EXTRA_VERBOSE_LOG')) {
-         $filesystem = new \Magento\Framework\Filesystem\Driver\File();
-         $exceptionHandler = new \Magento\Framework\Logger\Handler\Exception($filesystem);
-@@ -44,14 +50,16 @@ try {
-     }
- 
-     $installConfigFile = $settings->getAsConfigFile('TESTS_INSTALL_CONFIG_FILE');
-+    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-     if (!file_exists($installConfigFile)) {
-         $installConfigFile .= '.dist';
-     }
-     $globalConfigFile = $settings->getAsConfigFile('TESTS_GLOBAL_CONFIG_FILE');
-+    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-     if (!file_exists($globalConfigFile)) {
-         $globalConfigFile .= '.dist';
-     }
--    $sandboxUniqueId = md5(sha1_file($installConfigFile));
-+    $sandboxUniqueId = hash('sha256', sha1_file($installConfigFile));
-     $installDir = TESTS_TEMP_DIR . "/sandbox-{$settings->get('TESTS_PARALLEL_THREAD', 0)}-{$sandboxUniqueId}";
-     $application = new \Magento\TestFramework\Application(
-         $shell,
-@@ -99,7 +107,9 @@ try {
-     /* Unset declared global variables to release the PHPUnit from maintaining their values between tests */
-     unset($testsBaseDir, $logWriter, $settings, $shell, $application, $bootstrap);
- } catch (\Exception $e) {
-+    // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
-     echo $e . PHP_EOL;
-+    // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-     exit(1);
- }
- 
-diff --git a/dev/tests/integration/framework/deployTestModules.php b/dev/tests/integration/framework/deployTestModules.php
-index 4c894d80f98..34e1aa9b4e2 100644
---- a/dev/tests/integration/framework/deployTestModules.php
-+++ b/dev/tests/integration/framework/deployTestModules.php
-@@ -5,7 +5,10 @@
-  */
- 
- /**
-- * @var $testFrameworkDir string - Must be defined in parent script.
-+ * phpcs:disable PSR1.Files.SideEffects
-+ * phpcs:disable Squiz.Functions.GlobalFunction
-+ * @var string $testFrameworkDir - Must be defined in parent script.
-+ * @var \Magento\TestFramework\Bootstrap\Settings $settings - Must be defined in parent script.
-  */
- 
- /** Copy test modules to app/code/Magento to make them visible for Magento instance */
-@@ -20,10 +23,14 @@ foreach ($iterator as $file) {
-         $source = $file->getPathname();
-         $relativePath = substr($source, strlen($pathToCommittedTestModules));
-         $destination = $pathToInstalledMagentoInstanceModules . $relativePath;
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         $targetDir = dirname($destination);
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         if (!is_dir($targetDir)) {
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             mkdir($targetDir, 0755, true);
-         }
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         copy($source, $destination);
-     }
- }
-@@ -31,10 +38,42 @@ unset($iterator, $file);
- 
- // Register the modules under '_files/'
- $pathPattern = $pathToInstalledMagentoInstanceModules . '/TestModule*/registration.php';
-+// phpcs:ignore Magento2.Functions.DiscouragedFunction
- $files = glob($pathPattern, GLOB_NOSORT);
- if ($files === false) {
-     throw new \RuntimeException('glob() returned error while searching in \'' . $pathPattern . '\'');
- }
- foreach ($files as $file) {
-+    // phpcs:ignore Magento2.Security.IncludeFile
-     include $file;
- }
-+
-+if ((int)$settings->get('TESTS_PARALLEL_RUN') !== 1) {
-+    // Only delete modules if we are not using parallel executions
-+    // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+    register_shutdown_function(
-+        'deleteTestModules',
-+        $pathToCommittedTestModules,
-+        $pathToInstalledMagentoInstanceModules
-+    );
-+}
-+
-+/**
-+ * Delete all test module directories which have been created before
-+ *
-+ * @param string $pathToCommittedTestModules
-+ * @param string $pathToInstalledMagentoInstanceModules
-+ */
-+function deleteTestModules($pathToCommittedTestModules, $pathToInstalledMagentoInstanceModules)
-+{
-+    $filesystem = new \Symfony\Component\Filesystem\Filesystem();
-+    $iterator = new DirectoryIterator($pathToCommittedTestModules);
-+    /** @var SplFileInfo $file */
-+    foreach ($iterator as $file) {
-+        if ($file->isDir() && !in_array($file->getFilename(), ['.', '..'])) {
-+            $targetDirPath = $pathToInstalledMagentoInstanceModules . '/' . $file->getFilename();
-+            $filesystem->remove($targetDirPath);
-+        }
-+    }
-+    unset($iterator, $file);
-+}
-diff --git a/dev/tests/integration/framework/tests/unit/phpunit.xml.dist b/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
-index b52ca37987c..1a93397caaa 100644
---- a/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
-+++ b/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
-@@ -21,4 +21,32 @@
-     <php>
-         <ini name="date.timezone" value="America/Los_Angeles"/>
-     </php>
-+    <listeners>
-+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
-+            <arguments>
-+                <string>var/allure-results</string> <!-- XML files output directory -->
-+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
-+                <array> <!-- A list of custom annotations to ignore (optional) -->
-+                    <element key="magentoAdminConfigFixture">
-+                        <string>magentoAdminConfigFixture</string>
-+                    </element>
-+                    <element key="magentoAppIsolation">
-+                        <string>magentoAppIsolation</string>
-+                    </element>
-+                    <element key="magentoComponentsDir">
-+                        <string>magentoComponentsDir</string>
-+                    </element>
-+                    <element key="magentoConfigFixture">
-+                        <string>magentoConfigFixture</string>
-+                    </element>
-+                    <element key="@magentoDbIsolation">
-+                        <string>magentoDataFixture</string>
-+                    </element>
-+                    <element key="magentoDbIsolation">
-+                        <string>magentoDbIsolation</string>
-+                    </element>
-+                </array>
-+            </arguments>
-+        </listener>
-+    </listeners>
- </phpunit>
-diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DataFixtureTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DataFixtureTest.php
-index 22240ad8e1f..00af4419e11 100644
---- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DataFixtureTest.php
-+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DataFixtureTest.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Test\Annotation;
- 
-+use Magento\Framework\Component\ComponentRegistrar;
-+
- /**
-  * Test class for \Magento\TestFramework\Annotation\DataFixture.
-  *
-@@ -178,4 +180,16 @@ class DataFixtureTest extends \PHPUnit\Framework\TestCase
-         );
-         $this->_object->rollbackTransaction();
-     }
-+
-+    /**
-+     * @magentoDataFixture Foo_DataFixtureDummy::Test/Integration/foo.php
-+     * @SuppressWarnings(PHPMD.StaticAccess)
-+     */
-+    public function testModuleDataFixture()
-+    {
-+        ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Foo_DataFixtureDummy', __DIR__);
-+        $this->_object->expects($this->once())->method('_applyOneFixture')
-+            ->with(__DIR__ . '/Test/Integration/foo.php');
-+        $this->_object->startTransaction($this);
-+    }
- }
-diff --git a/dev/tests/integration/phpunit.xml.dist b/dev/tests/integration/phpunit.xml.dist
-index dedc144c567..858de7a9873 100644
---- a/dev/tests/integration/phpunit.xml.dist
-+++ b/dev/tests/integration/phpunit.xml.dist
-@@ -72,10 +72,60 @@
-         <!-- Connection parameters for MongoDB library tests -->
-         <!--<const name="MONGODB_CONNECTION_STRING" value="mongodb://localhost:27017"/>-->
-         <!--<const name="MONGODB_DATABASE_NAME" value="magento_integration_tests"/>-->
-+        <!-- Connection parameters for RabbitMQ tests -->
-+        <!--<const name="RABBITMQ_MANAGEMENT_PORT" value="15672"/>-->
-+        <!--<const name="TESTS_PARALLEL_RUN" value="1"/>-->
-     </php>
-     <!-- Test listeners -->
-     <listeners>
-         <listener class="Magento\TestFramework\Event\PhpUnit"/>
-         <listener class="Magento\TestFramework\ErrorLog\Listener"/>
-+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
-+            <arguments>
-+                <string>var/allure-results</string> <!-- XML files output directory -->
-+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
-+                <array> <!-- A list of custom annotations to ignore (optional) -->
-+                    <element key="codingStandardsIgnoreStart">
-+                        <string>codingStandardsIgnoreStart</string>
-+                    </element>
-+                    <element key="codingStandardsIgnoreEnd">
-+                        <string>codingStandardsIgnoreEnd</string>
-+                    </element>
-+                    <element key="expectedExceptionMessageRegExp">
-+                        <string>expectedExceptionMessageRegExp</string>
-+                    </element>
-+                    <element key="magentoAdminConfigFixture">
-+                        <string>magentoAdminConfigFixture</string>
-+                    </element>
-+                    <element key="magentoAppArea">
-+                        <string>magentoAppArea</string>
-+                    </element>
-+                    <element key="magentoAppIsolation">
-+                        <string>magentoAppIsolation</string>
-+                    </element>
-+                    <element key="magentoCache">
-+                        <string>magentoCache</string>
-+                    </element>
-+                    <element key="magentoComponentsDir">
-+                        <string>magentoComponentsDir</string>
-+                    </element>
-+                    <element key="magentoConfigFixture">
-+                        <string>magentoConfigFixture</string>
-+                    </element>
-+                    <element key="magentoDataFixture">
-+                        <string>magentoDataFixture</string>
-+                    </element>
-+                    <element key="magentoDataFixtureBeforeTransaction">
-+                        <string>magentoDataFixtureBeforeTransaction</string>
-+                    </element>
-+                    <element key="magentoDbIsolation">
-+                        <string>magentoDbIsolation</string>
-+                    </element>
-+                    <element key="magentoIndexerDimensionMode">
-+                        <string>magentoIndexerDimensionMode</string>
-+                    </element>
-+                </array>
-+            </arguments>
-+        </listener>
-     </listeners>
- </phpunit>
-diff --git a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
-index 481cc629c67..b4f38d207c1 100644
---- a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
-+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
-@@ -6,11 +6,24 @@
- namespace Magento\AdvancedPricingImportExport\Model\Export;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\TestFramework\Indexer\TestCase;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\Filesystem;
-+use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\ImportExport\Model\Export\Adapter\Csv as ExportAdapterCsv;
-+use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as ImportAdvancedPricing;
-+use Magento\ImportExport\Model\Import\Source\Csv as ImportSourceCsv;
-+use Magento\ImportExport\Model\Import;
- 
--class AdvancedPricingTest extends \Magento\TestFramework\Indexer\TestCase
-+/**
-+ * Advanced pricing test
-+ */
-+class AdvancedPricingTest extends TestCase
- {
-     /**
--     * @var \Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing
-+     * @var ExportAdvancedPricing
-      */
-     protected $model;
- 
-@@ -20,13 +33,15 @@ class AdvancedPricingTest extends \Magento\TestFramework\Indexer\TestCase
-     protected $objectManager;
- 
-     /**
--     * @var \Magento\Framework\Filesystem
-+     * @var Filesystem
-      */
-     protected $fileSystem;
- 
-+    // @codingStandardsIgnoreStart
-     public static function setUpBeforeClass()
-     {
--        $db = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getBootstrap()
-+        $db = Bootstrap::getInstance()
-+            ->getBootstrap()
-             ->getApplication()
-             ->getDbInstance();
-         if (!$db->isDbDumpExists()) {
-@@ -36,16 +51,15 @@ class AdvancedPricingTest extends \Magento\TestFramework\Indexer\TestCase
- 
-         parent::setUpBeforeClass();
-     }
-+    // @codingStandardsIgnoreEnd
- 
-     protected function setUp()
-     {
-         parent::setUp();
- 
--        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
--        $this->fileSystem = $this->objectManager->get(\Magento\Framework\Filesystem::class);
--        $this->model = $this->objectManager->create(
--            \Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing::class
--        );
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->fileSystem = $this->objectManager->get(Filesystem::class);
-+        $this->model = $this->objectManager->create(ExportAdvancedPricing::class);
-     }
- 
-     /**
-@@ -56,16 +70,15 @@ class AdvancedPricingTest extends \Magento\TestFramework\Indexer\TestCase
-      */
-     public function testExport()
-     {
--        $productRepository = $this->objectManager->create(
--            \Magento\Catalog\Api\ProductRepositoryInterface::class
--        );
-+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-         $index = 0;
-         $ids = [];
-         $origPricingData = [];
-         $skus = ['simple'];
-         while (isset($skus[$index])) {
--            $ids[$index] = $productRepository->get($skus[$index])->getId();
--            $origPricingData[$index] = $this->objectManager->create(\Magento\Catalog\Model\Product::class)
-+            $ids[$index] = $productRepository->get($skus[$index])
-+                ->getId();
-+            $origPricingData[$index] = $this->objectManager->create(Product::class)
-                 ->load($ids[$index])
-                 ->getTierPrices();
-             $index++;
-@@ -80,7 +93,7 @@ class AdvancedPricingTest extends \Magento\TestFramework\Indexer\TestCase
- 
-         while ($index > 0) {
-             $index--;
--            $newPricingData = $this->objectManager->create(\Magento\Catalog\Model\Product::class)
-+            $newPricingData = $this->objectManager->create(Product::class)
-                 ->load($ids[$index])
-                 ->getTierPrices();
-             $this->assertEquals(count($origPricingData[$index]), count($newPricingData));
-@@ -97,7 +110,7 @@ class AdvancedPricingTest extends \Magento\TestFramework\Indexer\TestCase
-     private function assertDiscountTypes($exportContent)
-     {
-         $this->assertContains(
--            '2.0000,8.0000,Fixed',
-+            '2.0000,8.000000,Fixed',
-             $exportContent
-         );
-         $this->assertContains(
-@@ -115,16 +128,15 @@ class AdvancedPricingTest extends \Magento\TestFramework\Indexer\TestCase
-      */
-     public function testExportMultipleWebsites()
-     {
--        $productRepository = $this->objectManager->create(
--            \Magento\Catalog\Api\ProductRepositoryInterface::class
--        );
-+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-         $index = 0;
-         $ids = [];
-         $origPricingData = [];
-         $skus = ['AdvancedPricingSimple 1', 'AdvancedPricingSimple 2'];
-         while (isset($skus[$index])) {
--            $ids[$index] = $productRepository->get($skus[$index])->getId();
--            $origPricingData[$index] = $this->objectManager->create(\Magento\Catalog\Model\Product::class)
-+            $ids[$index] = $productRepository->get($skus[$index])
-+                ->getId();
-+            $origPricingData[$index] = $this->objectManager->create(Product::class)
-                 ->load($ids[$index])
-                 ->getTierPrices();
-             $index++;
-@@ -141,7 +153,7 @@ class AdvancedPricingTest extends \Magento\TestFramework\Indexer\TestCase
- 
-         while ($index > 0) {
-             $index--;
--            $newPricingData = $this->objectManager->create(\Magento\Catalog\Model\Product::class)
-+            $newPricingData = $this->objectManager->create(Product::class)
-                 ->load($ids[$index])
-                 ->getTierPrices();
-             $this->assertEquals(count($origPricingData[$index]), count($newPricingData));
-@@ -156,10 +168,11 @@ class AdvancedPricingTest extends \Magento\TestFramework\Indexer\TestCase
-     private function exportData($csvFile)
-     {
-         $this->model->setWriter(
--            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--                \Magento\ImportExport\Model\Export\Adapter\Csv::class,
--                ['fileSystem' => $this->fileSystem, 'destination' => $csvFile]
--            )
-+            Bootstrap::getObjectManager()
-+                ->create(
-+                    ExportAdapterCsv::class,
-+                    ['fileSystem' => $this->fileSystem, 'destination' => $csvFile]
-+                )
-         );
-         $exportContent = $this->model->export();
-         $this->assertNotEmpty($exportContent);
-@@ -172,13 +185,11 @@ class AdvancedPricingTest extends \Magento\TestFramework\Indexer\TestCase
-      */
-     private function importData($csvFile)
-     {
--        /** @var \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing $importModel */
--        $importModel = $this->objectManager->create(
--            \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing::class
--        );
-+        /** @var ImportAdvancedPricing $importModel */
-+        $importModel = $this->objectManager->create(ImportAdvancedPricing::class);
-         $directory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_DIR);
-         $source = $this->objectManager->create(
--            \Magento\ImportExport\Model\Import\Source\Csv::class,
-+            ImportSourceCsv::class,
-             [
-                 'file' => $csvFile,
-                 'directory' => $directory
-@@ -186,7 +197,7 @@ class AdvancedPricingTest extends \Magento\TestFramework\Indexer\TestCase
-         );
-         $errors = $importModel->setParameters(
-             [
--                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
-+                'behavior' => Import::BEHAVIOR_APPEND,
-                 'entity' => 'advanced_pricing'
-             ]
-         )->setSource(
-diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
-index 305c3550269..c0cc1763b26 100644
---- a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
-+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
-@@ -128,7 +128,10 @@ class MassScheduleTest extends \PHPUnit\Framework\TestCase
-         }
-         $this->clearProducts();
- 
--        $result = $this->massSchedule->publishMass('async.V1.products.POST', $products);
-+        $result = $this->massSchedule->publishMass(
-+            'async.magento.catalog.api.productrepositoryinterface.save.post',
-+            $products
-+        );
- 
-         //assert bulk accepted with no errors
-         $this->assertFalse($result->isErrors());
-@@ -206,7 +209,7 @@ class MassScheduleTest extends \PHPUnit\Framework\TestCase
- 
-             $expectedErrorMessage = "Data item corresponding to \"product\" " .
-                 "must be specified in the message with topic " .
--                "\"async.V1.products.POST\".";
-+                "\"async.magento.catalog.api.productrepositoryinterface.save.post\".";
-             $this->assertEquals(
-                 $expectedErrorMessage,
-                 $reasonException->getMessage()
-diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php
-index c6c58d47e5a..9e215667903 100644
---- a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php
-+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php
-@@ -18,30 +18,35 @@ $bulks = [
-     'not_started' => [
-         'uuid' => 'bulk-uuid-1',
-         'user_id' => 1,
-+        'user_type' => \Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN,
-         'description' => 'Bulk Description',
-         'operation_count' => 1,
-     ],
-     'in_progress_success' => [
-         'uuid' => 'bulk-uuid-2',
-         'user_id' => 1,
-+        'user_type' => \Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN,
-         'description' => 'Bulk Description',
-         'operation_count' => 3,
-     ],
-     'in_progress_failed' => [
-         'uuid' => 'bulk-uuid-3',
-         'user_id' => 1,
-+        'user_type' => \Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN,
-         'description' => 'Bulk Description',
-         'operation_count' => 2,
-     ],
-     'finish_success' => [
-         'uuid' => 'bulk-uuid-4',
-         'user_id' => 1,
-+        'user_type' => \Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN,
-         'description' => 'Bulk Description',
-         'operation_count' => 1,
-     ],
-     'finish_failed' => [
-         'uuid' => 'bulk-uuid-5',
-         'user_id' => 1,
-+        'user_type' => \Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN,
-         'description' => 'Bulk Description',
-         'operation_count' => 2,
-     ],
-@@ -90,8 +95,8 @@ $operations = [
-     ],
- ];
- 
--$bulkQuery = "INSERT INTO {$bulkTable} (`uuid`, `user_id`, `description`, `operation_count`)"
--    . " VALUES (:uuid, :user_id, :description, :operation_count);";
-+$bulkQuery = "INSERT INTO {$bulkTable} (`uuid`, `user_id`, `user_type`, `description`, `operation_count`)"
-+    . " VALUES (:uuid, :user_id, :user_type, :description, :operation_count);";
- foreach ($bulks as $bulk) {
-     $connection->query($bulkQuery, $bulk);
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponseTest.php b/dev/tests/integration/testsuite/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponseTest.php
-index 28d4395e7e4..7ab55dc7fd9 100644
---- a/dev/tests/integration/testsuite/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponseTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponseTest.php
-@@ -23,7 +23,7 @@ class BackendResponseTest extends AbstractController
-         $data = [
-             'x_response_code' => 1,
-             'x_response_reason_code' => 1,
--            'x_invoice_num' => 1,
-+            'x_invoice_num' => '1',
-             'x_amount' => 16,
-             'x_trans_id' => '32iiw5ve',
-             'x_card_type' => 'American Express',
-@@ -48,7 +48,7 @@ class BackendResponseTest extends AbstractController
-         $data = [
-             'x_response_code' => 1,
-             'x_response_reason_code' => 1,
--            'x_invoice_num' => 1,
-+            'x_invoice_num' => '1',
-             'x_amount' => 16,
-             'x_trans_id' => '32iiw5ve',
-             'x_card_type' => 'American Express',
-diff --git a/dev/tests/integration/testsuite/Magento/Authorizenet/Model/DirectpostTest.php b/dev/tests/integration/testsuite/Magento/Authorizenet/Model/DirectpostTest.php
-index 71105cd844c..ba4c4efd78f 100644
---- a/dev/tests/integration/testsuite/Magento/Authorizenet/Model/DirectpostTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Authorizenet/Model/DirectpostTest.php
-@@ -19,6 +19,8 @@ use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
- /**
-  * Class contains tests for Direct Post integration
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class DirectpostTest extends \PHPUnit\Framework\TestCase
- {
-@@ -141,7 +143,7 @@ class DirectpostTest extends \PHPUnit\Framework\TestCase
-             [
-                 'filter_action' => 'report',
-                 'order_id' => '100000004',
--                'expected_order_state' => Order::STATE_PROCESSING
-+                'expected_order_state' => Order::STATE_COMPLETE
-             ],
-         ];
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/full_order_with_capture.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/full_order_with_capture.php
-new file mode 100644
-index 00000000000..4ef5a4dd14c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/full_order_with_capture.php
-@@ -0,0 +1,45 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\Sales\Model\OrderRepository;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Sales\Api\TransactionRepositoryInterface;
-+use Magento\Sales\Model\Order\Payment\Transaction;
-+use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface as TransactionBuilder;
-+
-+$order = include __DIR__ . '/../_files/full_order.php';
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var Payment $payment */
-+$payment = $order->getPayment();
-+$payment->setMethod(Config::METHOD);
-+$payment->setAuthorizationTransaction(false);
-+$payment->setParentTransactionId(4321);
-+
-+
-+/** @var OrderRepository $orderRepo */
-+$orderRepo = $objectManager->get(OrderRepository::class);
-+$orderRepo->save($order);
-+
-+/** @var TransactionBuilder $transactionBuilder */
-+$transactionBuilder = $objectManager->create(TransactionBuilder::class);
-+$transactionAuthorize = $transactionBuilder->setPayment($payment)
-+    ->setOrder($order)
-+    ->setTransactionId(1234)
-+    ->build(Transaction::TYPE_AUTH);
-+$transactionCapture = $transactionBuilder->setPayment($payment)
-+    ->setOrder($order)
-+    ->setTransactionId(4321)
-+    ->build(Transaction::TYPE_CAPTURE);
-+
-+$transactionRepository = $objectManager->create(TransactionRepositoryInterface::class);
-+$transactionRepository->save($transactionAuthorize);
-+$transactionRepository->save($transactionCapture);
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/full_order_with_capture_rollback.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/full_order_with_capture_rollback.php
-new file mode 100644
-index 00000000000..1a2cb2532fe
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/full_order_with_capture_rollback.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\TestFramework\ObjectManager;
-+
-+$objectManager = ObjectManager::getInstance();
-+
-+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
-+$searchCriteria = $searchCriteriaBuilder->addFilter('increment_id', '100000001')
-+    ->create();
-+
-+/** @var OrderRepositoryInterface $orderRepository */
-+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+$items = $orderRepository->getList($searchCriteria)
-+    ->getItems();
-+
-+foreach ($items as $item) {
-+    $orderRepository->delete($item);
-+}
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/order_auth_only.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/order_auth_only.php
-new file mode 100644
-index 00000000000..b1d0521c9c6
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/order_auth_only.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Address;
-+use Magento\Sales\Model\Order\Item as OrderItem;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\Sales\Api\TransactionRepositoryInterface;
-+use Magento\Sales\Model\Order\Payment\Transaction;
-+use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface as TransactionBuilder;
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+$addressData = include __DIR__ . '/../../Sales/_files/address_data.php';
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
-+
-+$billingAddress = $objectManager->create(Address::class, ['data' => $addressData]);
-+$billingAddress->setAddressType('billing');
-+
-+$shippingAddress = clone $billingAddress;
-+$shippingAddress->setId(null)
-+    ->setAddressType('shipping');
-+
-+/** @var OrderItem $orderItem */
-+$orderItem = $objectManager->create(OrderItem::class);
-+$orderItem->setProductId($product->getId())
-+    ->setQtyOrdered(2)
-+    ->setBasePrice($product->getPrice())
-+    ->setPrice($product->getPrice())
-+    ->setRowTotal($product->getPrice())
-+    ->setProductType('simple');
-+
-+require __DIR__ . '/payment.php';
-+
-+$order = $objectManager->create(Order::class);
-+$order->setIncrementId('100000002')
-+    ->setSubtotal($product->getPrice() * 2)
-+    ->setBaseSubtotal($product->getPrice() * 2)
-+    ->setCustomerEmail('admin@example.com')
-+    ->setCustomerIsGuest(true)
-+    ->setBillingAddress($billingAddress)
-+    ->setShippingAddress($shippingAddress)
-+    ->setStoreId(
-+        $objectManager->get(StoreManagerInterface::class)->getStore()
-+            ->getId()
-+    )
-+    ->addItem($orderItem)
-+    ->setPayment($payment);
-+
-+$payment->setParentTransactionId(1234);
-+
-+/** @var OrderRepositoryInterface $orderRepository */
-+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+$orderRepository->save($order);
-+
-+/** @var TransactionBuilder $transactionBuilder */
-+$transactionBuilder = $objectManager->create(TransactionBuilder::class);
-+$transactionAuthorize = $transactionBuilder->setPayment($payment)
-+    ->setOrder($order)
-+    ->setTransactionId(1234)
-+    ->build(Transaction::TYPE_AUTH);
-+
-+$transactionAuthorize->setAdditionalInformation('real_transaction_id', '1234');
-+
-+$transactionRepository = $objectManager->create(TransactionRepositoryInterface::class);
-+$transactionRepository->save($transactionAuthorize);
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/order_auth_only_rollback.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/order_auth_only_rollback.php
-new file mode 100644
-index 00000000000..5a65a1fc0d0
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/order_auth_only_rollback.php
-@@ -0,0 +1,9 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+require __DIR__ . '/order_captured_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/order_captured.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/order_captured.php
-new file mode 100644
-index 00000000000..9bfc863df7d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/order_captured.php
-@@ -0,0 +1,77 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Address;
-+use Magento\Sales\Model\Order\Item as OrderItem;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\Sales\Api\TransactionRepositoryInterface;
-+use Magento\Sales\Model\Order\Payment\Transaction;
-+use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface as TransactionBuilder;
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+$addressData = include __DIR__ . '/../../Sales/_files/address_data.php';
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
-+
-+$billingAddress = $objectManager->create(Address::class, ['data' => $addressData]);
-+$billingAddress->setAddressType('billing');
-+
-+$shippingAddress = clone $billingAddress;
-+$shippingAddress->setId(null)
-+    ->setAddressType('shipping');
-+
-+/** @var OrderItem $orderItem */
-+$orderItem = $objectManager->create(OrderItem::class);
-+$orderItem->setProductId($product->getId())
-+    ->setQtyOrdered(2)
-+    ->setBasePrice($product->getPrice())
-+    ->setPrice($product->getPrice())
-+    ->setRowTotal($product->getPrice())
-+    ->setProductType('simple');
-+
-+require __DIR__ . '/payment.php';
-+
-+$order = $objectManager->create(Order::class);
-+$order->setIncrementId('100000002')
-+    ->setSubtotal($product->getPrice() * 2)
-+    ->setBaseSubtotal($product->getPrice() * 2)
-+    ->setCustomerEmail('admin@example.com')
-+    ->setCustomerIsGuest(true)
-+    ->setBillingAddress($billingAddress)
-+    ->setShippingAddress($shippingAddress)
-+    ->setStoreId(
-+        $objectManager->get(StoreManagerInterface::class)->getStore()
-+            ->getId()
-+    )
-+    ->addItem($orderItem)
-+    ->setPayment($payment);
-+
-+$payment->setParentTransactionId(4321);
-+
-+/** @var OrderRepositoryInterface $orderRepository */
-+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+$orderRepository->save($order);
-+
-+/** @var TransactionBuilder $transactionBuilder */
-+$transactionBuilder = $objectManager->create(TransactionBuilder::class);
-+$transactionAuthorize = $transactionBuilder->setPayment($payment)
-+    ->setOrder($order)
-+    ->setTransactionId(1234)
-+    ->build(Transaction::TYPE_AUTH);
-+$transactionCapture = $transactionBuilder->setPayment($payment)
-+    ->setOrder($order)
-+    ->setTransactionId(4321)
-+    ->build(Transaction::TYPE_CAPTURE);
-+
-+$transactionRepository = $objectManager->create(TransactionRepositoryInterface::class);
-+$transactionRepository->save($transactionAuthorize);
-+$transactionRepository->save($transactionCapture);
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/order_captured_rollback.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/order_captured_rollback.php
-new file mode 100644
-index 00000000000..a2da0b639e9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/order_captured_rollback.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\TestFramework\ObjectManager;
-+
-+$objectManager = ObjectManager::getInstance();
-+
-+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
-+$searchCriteria = $searchCriteriaBuilder->addFilter('increment_id', '100000002')
-+    ->create();
-+
-+/** @var OrderRepositoryInterface $orderRepository */
-+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+$items = $orderRepository->getList($searchCriteria)
-+    ->getItems();
-+
-+foreach ($items as $item) {
-+    $orderRepository->delete($item);
-+}
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/payment.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/payment.php
-new file mode 100644
-index 00000000000..5b15e356a7d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Fixture/payment.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\Config;
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var Payment $payment */
-+$payment = $objectManager->create(Payment::class);
-+$payment->setMethod(Config::METHOD);
-+$payment->setAuthorizationTransaction(true);
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/AbstractTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/AbstractTest.php
-new file mode 100644
-index 00000000000..f1458a19012
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/AbstractTest.php
-@@ -0,0 +1,91 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway;
-+
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\App\Area;
-+use Magento\Framework\HTTP\ZendClient;
-+use Magento\Framework\HTTP\ZendClientFactory;
-+use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\Payment\Gateway\Data\PaymentDataObjectFactory;
-+use Magento\Quote\Model\Quote\PaymentFactory;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\Order;
-+use Zend_Http_Response;
-+
-+abstract class AbstractTest extends TestCase
-+{
-+    /**
-+     * @var ObjectManager
-+     */
-+    protected $objectManager;
-+
-+    /**
-+     * @var ZendClient|MockObject|InvocationMocker
-+     */
-+    protected $clientMock;
-+
-+    /**
-+     * @var PaymentFactory
-+     */
-+    protected $paymentFactory;
-+
-+    /**
-+     * @var Zend_Http_Response
-+     */
-+    protected $responseMock;
-+
-+    /**
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    protected function setUp()
-+    {
-+        $bootstrap = Bootstrap::getInstance();
-+        $bootstrap->loadArea(Area::AREA_FRONTEND);
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->clientMock = $this->createMock(ZendClient::class);
-+        $this->responseMock = $this->createMock(Zend_Http_Response::class);
-+        $this->clientMock->method('request')
-+            ->willReturn($this->responseMock);
-+        $this->clientMock->method('setUri')
-+            ->with('https://apitest.authorize.net/xml/v1/request.api');
-+        $clientFactoryMock = $this->createMock(ZendClientFactory::class);
-+        $clientFactoryMock->method('create')
-+            ->willReturn($this->clientMock);
-+        /** @var PaymentDataObjectFactory $paymentFactory */
-+        $this->paymentFactory = $this->objectManager->get(PaymentDataObjectFactory::class);
-+        $this->objectManager->addSharedInstance($clientFactoryMock, ZendClientFactory::class);
-+    }
-+
-+    protected function tearDown()
-+    {
-+        $this->objectManager->removeSharedInstance(ZendClientFactory::class);
-+        parent::tearDown();
-+    }
-+
-+    protected function getOrderWithIncrementId(string $incrementId): Order
-+    {
-+        /** @var OrderRepositoryInterface $orderRepository */
-+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
-+        $searchCriteria = $this->objectManager->get(SearchCriteriaBuilder::class)
-+            ->addFilter('increment_id', $incrementId)
-+            ->create();
-+        /** @var Order $order */
-+        $order = current(
-+            $orderRepository->getList($searchCriteria)
-+                ->getItems()
-+        );
-+
-+        return $order;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptFdsCommandTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptFdsCommandTest.php
-new file mode 100644
-index 00000000000..394d9de6684
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptFdsCommandTest.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\AbstractTest;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+class AcceptFdsCommandTest extends AbstractTest
-+{
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoDataFixture Magento/AuthorizenetAcceptjs/Fixture/order_auth_only.php
-+     */
-+    public function testAcceptFdsCommand()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('accept_fds');
-+
-+        $order = $this->getOrderWithIncrementId('100000002');
-+        $payment = $order->getPayment();
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/accept_fds.php';
-+        $response = include __DIR__ . '/../../_files/response/generic_success.php';
-+
-+        $this->clientMock->expects($this->once())
-+            ->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->expects($this->once())
-+            ->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $command->execute([
-+            'payment' => $paymentDO
-+        ]);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/AuthorizeCommandTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/AuthorizeCommandTest.php
-new file mode 100644
-index 00000000000..9affd80be06
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/AuthorizeCommandTest.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\AbstractTest;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\Sales\Model\Order\Payment\Transaction;
-+
-+class AuthorizeCommandTest extends AbstractTest
-+{
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     */
-+    public function testAuthorizeCommand()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('authorize');
-+
-+        $order = include __DIR__ . '/../../_files/full_order.php';
-+        $payment = $order->getPayment();
-+
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/authorize.php';
-+        $response = include __DIR__ . '/../../_files/response/authorize.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $command->execute([
-+            'payment' => $paymentDO,
-+            'amount' => 100.00
-+        ]);
-+
-+        /** @var Payment $payment */
-+        $rawDetails = [
-+            'authCode' => 'abc123',
-+            'avsResultCode' => 'Y',
-+            'cvvResultCode' => 'P',
-+            'cavvResultCode' => '2',
-+            'accountType' => 'Visa',
-+        ];
-+        $this->assertSame('1111', $payment->getCcLast4());
-+        $this->assertSame('Y', $payment->getCcAvsStatus());
-+        $this->assertFalse($payment->getData('is_transaction_closed'));
-+
-+        $transactionDetails = $payment->getTransactionAdditionalInfo();
-+        foreach ($rawDetails as $key => $value) {
-+            $this->assertSame($value, $payment->getAdditionalInformation($key));
-+            $this->assertSame($value, $transactionDetails[Transaction::RAW_DETAILS][$key]);
-+        }
-+
-+        $this->assertSame('123456', $payment->getTransactionId());
-+        $this->assertSame('123456', $transactionDetails['real_transaction_id']);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/CancelCommandTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/CancelCommandTest.php
-new file mode 100644
-index 00000000000..aa606a50ae6
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/CancelCommandTest.php
-@@ -0,0 +1,62 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\AbstractTest;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+class CancelCommandTest extends AbstractTest
-+{
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoDataFixture Magento/AuthorizenetAcceptjs/Fixture/order_auth_only.php
-+     * @dataProvider aliasesProvider
-+     */
-+    public function testCancelCommand(string $commandName)
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get($commandName);
-+
-+        $order = $this->getOrderWithIncrementId('100000002');
-+        $payment = $order->getPayment();
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/void.php';
-+        $response = include __DIR__ . '/../../_files/response/void.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $command->execute([
-+            'payment' => $paymentDO
-+        ]);
-+
-+        /** @var Payment $payment */
-+
-+        $this->assertTrue($payment->getIsTransactionClosed());
-+        $this->assertTrue($payment->getShouldCloseParentTransaction());
-+        $this->assertArrayNotHasKey('real_transaction_id', $payment->getTransactionAdditionalInfo());
-+    }
-+
-+    public function aliasesProvider()
-+    {
-+        return [
-+            ['cancel'],
-+            ['deny_payment']
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommandTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommandTest.php
-new file mode 100644
-index 00000000000..1651dfc7db3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommandTest.php
-@@ -0,0 +1,184 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\AbstractTest;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+class FetchTransactionInfoCommandTest extends AbstractTest
-+{
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/transactionSyncKeys transId,transactionType
-+     * @magentoDataFixture Magento/AuthorizenetAcceptjs/Fixture/order_auth_only.php
-+     */
-+    public function testTransactionApproved()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('fetch_transaction_information');
-+
-+        $order = $this->getOrderWithIncrementId('100000002');
-+        $payment = $order->getPayment();
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/transaction_details_authorized.php';
-+        $response = include __DIR__ . '/../../_files/response/transaction_details_authorized.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $result = $command->execute([
-+            'payment' => $paymentDO
-+        ]);
-+
-+        $expected = [
-+            'transId' => '1234',
-+            'transactionType' => 'authOnlyTransaction'
-+        ];
-+        $this->assertSame($expected, $result);
-+
-+        /** @var Payment $payment */
-+        $this->assertTrue($payment->getIsTransactionApproved());
-+        $this->assertFalse($payment->getIsTransactionDenied());
-+    }
-+
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * * @magentoConfigFixture default_store payment/authorizenet_acceptjs/transactionSyncKeys transId,transactionType
-+     * @magentoDataFixture Magento/AuthorizenetAcceptjs/Fixture/order_auth_only.php
-+     */
-+    public function testTransactionVoided()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('fetch_transaction_information');
-+
-+        $order = $this->getOrderWithIncrementId('100000002');
-+        $payment = $order->getPayment();
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/transaction_details_authorized.php';
-+        $response = include __DIR__ . '/../../_files/response/transaction_details_voided.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $result = $command->execute([
-+            'payment' => $paymentDO
-+        ]);
-+
-+        $expected = [
-+            'transId' => '1234',
-+            'transactionType' => 'authOnlyTransaction'
-+        ];
-+        $this->assertSame($expected, $result);
-+
-+        /** @var Payment $payment */
-+        $this->assertFalse($payment->getIsTransactionApproved());
-+        $this->assertTrue($payment->getIsTransactionDenied());
-+    }
-+
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/transactionSyncKeys transId,transactionType
-+     * @magentoDataFixture Magento/AuthorizenetAcceptjs/Fixture/order_auth_only.php
-+     */
-+    public function testTransactionDenied()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('fetch_transaction_information');
-+
-+        $order = $this->getOrderWithIncrementId('100000002');
-+        $payment = $order->getPayment();
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/transaction_details_authorized.php';
-+        $response = include __DIR__ . '/../../_files/response/transaction_details_voided.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $result = $command->execute([
-+            'payment' => $paymentDO
-+        ]);
-+
-+        $expected = [
-+            'transId' => '1234',
-+            'transactionType' => 'authOnlyTransaction'
-+        ];
-+        $this->assertSame($expected, $result);
-+
-+        /** @var Payment $payment */
-+        $this->assertFalse($payment->getIsTransactionApproved());
-+        $this->assertTrue($payment->getIsTransactionDenied());
-+    }
-+
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/transactionSyncKeys transId,transactionType
-+     * @magentoDataFixture Magento/AuthorizenetAcceptjs/Fixture/order_auth_only.php
-+     */
-+    public function testTransactionPending()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('fetch_transaction_information');
-+
-+        $order = $this->getOrderWithIncrementId('100000002');
-+        $payment = $order->getPayment();
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/transaction_details_authorized.php';
-+        $response = include __DIR__ . '/../../_files/response/transaction_details_fds_pending.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $result = $command->execute([
-+            'payment' => $paymentDO
-+        ]);
-+
-+        $expected = [
-+            'transId' => '1234',
-+            'transactionType' => 'authOnlyTransaction'
-+        ];
-+        $this->assertSame($expected, $result);
-+
-+        /** @var Payment $payment */
-+        $this->assertNull($payment->getIsTransactionApproved());
-+        $this->assertNull($payment->getIsTransactionDenied());
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundSettledCommandTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundSettledCommandTest.php
-new file mode 100644
-index 00000000000..6e06d749f39
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundSettledCommandTest.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\AbstractTest;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+class RefundSettledCommandTest extends AbstractTest
-+{
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoDataFixture Magento/AuthorizenetAcceptjs/Fixture/full_order_with_capture.php
-+     */
-+    public function testRefundSettledCommand()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('refund_settled');
-+
-+        $order = $this->getOrderWithIncrementId('100000001');
-+        $payment = $order->getPayment();
-+
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/refund.php';
-+        $response = include __DIR__ . '/../../_files/response/refund.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $command->execute([
-+            'payment' => $paymentDO,
-+            'amount' => 100.00
-+        ]);
-+
-+        /** @var Payment $payment */
-+        $this->assertTrue($payment->getIsTransactionClosed());
-+        $this->assertSame('5678', $payment->getTransactionId());
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/SaleCommandTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/SaleCommandTest.php
-new file mode 100644
-index 00000000000..7ae03d36cb7
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/SaleCommandTest.php
-@@ -0,0 +1,71 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\AbstractTest;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\Sales\Model\Order\Payment\Transaction;
-+
-+class SaleCommandTest extends AbstractTest
-+{
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     */
-+    public function testSaleCommand()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('sale');
-+
-+        $order = include __DIR__ . '/../../_files/full_order.php';
-+        $payment = $order->getPayment();
-+
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/sale.php';
-+        $response = include __DIR__ . '/../../_files/response/sale.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $command->execute([
-+            'payment' => $paymentDO,
-+            'amount' => 100.00
-+        ]);
-+
-+        /** @var Payment $payment */
-+        $rawDetails = [
-+            'authCode' => 'abc123',
-+            'avsResultCode' => 'Y',
-+            'cvvResultCode' => 'P',
-+            'cavvResultCode' => '2',
-+            'accountType' => 'Visa',
-+        ];
-+        $this->assertSame('1111', $payment->getCcLast4());
-+        $this->assertSame('Y', $payment->getCcAvsStatus());
-+
-+        $transactionDetails = $payment->getTransactionAdditionalInfo();
-+        foreach ($rawDetails as $key => $value) {
-+            $this->assertSame($value, $payment->getAdditionalInformation($key));
-+            $this->assertSame($value, $transactionDetails[Transaction::RAW_DETAILS][$key]);
-+        }
-+
-+        $this->assertSame('123456', $payment->getTransactionId());
-+        $this->assertSame('123456', $transactionDetails['real_transaction_id']);
-+        $this->assertTrue($payment->getShouldCloseParentTransaction());
-+        $this->assertFalse($payment->getData('is_transaction_closed'));
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/SettleCommandTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/SettleCommandTest.php
-new file mode 100644
-index 00000000000..bb0a259b165
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/SettleCommandTest.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\AbstractTest;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+class SettleCommandTest extends AbstractTest
-+{
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoDataFixture Magento/AuthorizenetAcceptjs/Fixture/order_auth_only.php
-+     */
-+    public function testRefundSettledCommand()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('settle');
-+
-+        $order = $this->getOrderWithIncrementId('100000002');
-+        $payment = $order->getPayment();
-+
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/settle.php';
-+        $response = include __DIR__ . '/../../_files/response/settle.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $command->execute([
-+            'payment' => $paymentDO,
-+            'amount' => 100.00
-+        ]);
-+
-+        /** @var Payment $payment */
-+        $this->assertTrue($payment->getShouldCloseParentTransaction());
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/TransactionDetailsCommandTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/TransactionDetailsCommandTest.php
-new file mode 100644
-index 00000000000..d81cffc413b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/TransactionDetailsCommandTest.php
-@@ -0,0 +1,50 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\AbstractTest;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+
-+class TransactionDetailsCommandTest extends AbstractTest
-+{
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoDataFixture Magento/AuthorizenetAcceptjs/Fixture/order_captured.php
-+     */
-+    public function testTransactionDetails()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('get_transaction_details');
-+
-+        $order = $this->getOrderWithIncrementId('100000002');
-+        $payment = $order->getPayment();
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/transaction_details.php';
-+        $response = include __DIR__ . '/../../_files/response/transaction_details_settled_capture.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $result = $command->execute([
-+            'payment' => $paymentDO
-+        ]);
-+
-+        $resultData = $result->get();
-+
-+        $this->assertEquals($response, $resultData);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/VoidCommandTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/VoidCommandTest.php
-new file mode 100644
-index 00000000000..f74f8542bfd
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Command/VoidCommandTest.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\AbstractTest;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Sales\Model\Order\Payment;
-+
-+class VoidCommandTest extends AbstractTest
-+{
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoDataFixture Magento/AuthorizenetAcceptjs/Fixture/order_auth_only.php
-+     */
-+    public function testVoidCommand()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('void');
-+
-+        $order = $this->getOrderWithIncrementId('100000002');
-+        $payment = $order->getPayment();
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/void.php';
-+        $response = include __DIR__ . '/../../_files/response/void.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $command->execute([
-+            'payment' => $paymentDO
-+        ]);
-+
-+        /** @var Payment $payment */
-+
-+        $this->assertTrue($payment->getIsTransactionClosed());
-+        $this->assertTrue($payment->getShouldCloseParentTransaction());
-+        $this->assertEquals('1234', $payment->getTransactionAdditionalInfo()['real_transaction_id']);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/ConfigTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/ConfigTest.php
-new file mode 100644
-index 00000000000..a37f9272742
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/ConfigTest.php
-@@ -0,0 +1,51 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway;
-+
-+use Magento\Framework\Config\Data;
-+use Magento\Payment\Model\Method\Adapter;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\TestCase;
-+
-+class ConfigTest extends TestCase
-+{
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+    }
-+
-+    public function testVerifyConfiguration()
-+    {
-+        /** @var Adapter $paymentAdapter */
-+        $paymentAdapter = $this->objectManager->get('AuthorizenetAcceptjsFacade');
-+
-+        $this->assertEquals('authorizenet_acceptjs', $paymentAdapter->getCode());
-+        $this->assertTrue($paymentAdapter->canAuthorize());
-+        $this->assertTrue($paymentAdapter->canCapture());
-+        $this->assertFalse($paymentAdapter->canCapturePartial());
-+        $this->assertTrue($paymentAdapter->canRefund());
-+        $this->assertTrue($paymentAdapter->canUseCheckout());
-+        $this->assertTrue($paymentAdapter->canVoid());
-+        $this->assertTrue($paymentAdapter->canUseInternal());
-+        $this->assertTrue($paymentAdapter->canEdit());
-+        $this->assertTrue($paymentAdapter->canFetchTransactionInfo());
-+
-+        /** @var Data $configReader */
-+        $configReader = $this->objectManager->get('Magento\Payment\Model\Config\Data');
-+        $value = $configReader->get('methods/authorizenet_acceptjs/allow_multiple_address');
-+
-+        $this->assertSame('0', $value);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandlerTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandlerTest.php
-new file mode 100644
-index 00000000000..1bee2e95cef
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandlerTest.php
-@@ -0,0 +1,47 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetAcceptjs\Gateway\Response;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\AbstractTest;
-+
-+/**
-+ * Test for Magento\AuthorizenetAcceptjs\Gateway\Response\CloseTransactionHandler class.
-+ */
-+class CloseTransactionHandlerTest extends AbstractTest
-+{
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoDataFixture Magento/AuthorizenetAcceptjs/Fixture/order_auth_only.php
-+     *
-+     * @return void
-+     */
-+    public function testTransactionCloseStatus(): void
-+    {
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('settle');
-+        $order = $this->getOrderWithIncrementId('100000002');
-+        $payment = $order->getPayment();
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/settle.php';
-+        $response = include __DIR__ . '/../../_files/response/settle.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $command->execute(['payment' => $paymentDO]);
-+
-+        $this->assertFalse($payment->getIsTransactionClosed());
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/accept_fds.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/accept_fds.php
-new file mode 100644
-index 00000000000..d843de1c2ca
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/accept_fds.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'updateHeldTransactionRequest' => [
-+        'merchantAuthentication' => [
-+            'name' => 'someusername',
-+            'transactionKey' => 'somepassword'
-+        ],
-+        'heldTransactionRequest' => [
-+            'action' => 'approve',
-+            'refTransId' => '1234',
-+        ]
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/authorize.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/authorize.php
-new file mode 100644
-index 00000000000..16debdb2ef8
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/authorize.php
-@@ -0,0 +1,66 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'createTransactionRequest' => [
-+        'merchantAuthentication' =>[
-+            'name' => 'someusername',
-+            'transactionKey' => 'somepassword',
-+        ],
-+        'transactionRequest' => [
-+            'transactionType' => 'authOnlyTransaction',
-+            'amount' => '100.00',
-+            'payment' => [
-+                'opaqueData' => [
-+                    'dataDescriptor' => 'mydescriptor',
-+                    'dataValue' => 'myvalue',
-+                ],
-+            ],
-+            'solution' => [
-+                'id' => 'AAA102993',
-+            ],
-+            'order' => [
-+                'invoiceNumber' => '100000001',
-+            ],
-+            'poNumber' => null,
-+            'customer' => [
-+                'id' => 1,
-+                'email' => 'admin@example.com',
-+            ],
-+            'billTo' => [
-+                'firstName' => 'firstname',
-+                'lastName' => 'lastname',
-+                'company' => '',
-+                'address' => 'street',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'shipTo' => [
-+                'firstName' => 'John',
-+                'lastName' => 'Doe',
-+                'company' => '',
-+                'address' => '6161 West Centinela Avenue',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'customerIP' => '127.0.0.1',
-+            'userFields' => [
-+                'userField' => [
-+                    [
-+                        'name' => 'transactionType',
-+                        'value' => 'authOnlyTransaction',
-+                    ],
-+                ],
-+            ],
-+        ],
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/refund.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/refund.php
-new file mode 100644
-index 00000000000..5ed331d076f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/refund.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'createTransactionRequest' => [
-+        'merchantAuthentication' =>[
-+            'name' => 'someusername',
-+            'transactionKey' => 'somepassword',
-+        ],
-+        'transactionRequest' => [
-+            'transactionType' => 'refundTransaction',
-+            'amount' => '100.00',
-+            'payment' => [
-+                'creditCard' => [
-+                    'cardNumber' => '1111',
-+                    'expirationDate' => 'XXXX'
-+                ]
-+            ],
-+            'refTransId' => '4321',
-+            'order' => [
-+                'invoiceNumber' => '100000001',
-+            ],
-+            'poNumber' => null,
-+            'customer' => [
-+                'id' => '1',
-+                'email' => 'admin@example.com',
-+            ],
-+            'billTo' => [
-+                'firstName' => 'firstname',
-+                'lastName' => 'lastname',
-+                'company' => '',
-+                'address' => 'street',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'shipTo' => [
-+                'firstName' => 'John',
-+                'lastName' => 'Doe',
-+                'company' => '',
-+                'address' => '6161 West Centinela Avenue',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'customerIP' => '127.0.0.1'
-+        ],
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/sale.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/sale.php
-new file mode 100644
-index 00000000000..4514acbcb66
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/sale.php
-@@ -0,0 +1,66 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'createTransactionRequest' => [
-+        'merchantAuthentication' =>[
-+            'name' => 'someusername',
-+            'transactionKey' => 'somepassword',
-+        ],
-+        'transactionRequest' => [
-+            'transactionType' => 'authCaptureTransaction',
-+            'amount' => '100.00',
-+            'payment' => [
-+                'opaqueData' => [
-+                    'dataDescriptor' => 'mydescriptor',
-+                    'dataValue' => 'myvalue',
-+                ],
-+            ],
-+            'solution' => [
-+                'id' => 'AAA102993',
-+            ],
-+            'order' => [
-+                'invoiceNumber' => '100000001',
-+            ],
-+            'poNumber' => null,
-+            'customer' => [
-+                'id' => 1,
-+                'email' => 'admin@example.com',
-+            ],
-+            'billTo' => [
-+                'firstName' => 'firstname',
-+                'lastName' => 'lastname',
-+                'company' => '',
-+                'address' => 'street',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'shipTo' => [
-+                'firstName' => 'John',
-+                'lastName' => 'Doe',
-+                'company' => '',
-+                'address' => '6161 West Centinela Avenue',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'customerIP' => '127.0.0.1',
-+            'userFields' => [
-+                'userField' => [
-+                    [
-+                        'name' => 'transactionType',
-+                        'value' => 'authCaptureTransaction',
-+                    ],
-+                ],
-+            ],
-+        ],
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/settle.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/settle.php
-new file mode 100644
-index 00000000000..b4fa88cc1e5
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/settle.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'createTransactionRequest' => [
-+        'merchantAuthentication' =>[
-+            'name' => 'someusername',
-+            'transactionKey' => 'somepassword',
-+        ],
-+        'transactionRequest' => [
-+            'transactionType' => 'priorAuthCaptureTransaction',
-+            'refTransId' => '1234',
-+            'userFields' => [
-+                'userField' => [
-+                    [
-+                        'name' => 'transactionType',
-+                        'value' => 'priorAuthCaptureTransaction',
-+                    ],
-+                ],
-+            ],
-+        ],
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/transaction_details.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/transaction_details.php
-new file mode 100644
-index 00000000000..11033386676
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/transaction_details.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'getTransactionDetailsRequest' => [
-+        'merchantAuthentication' => [
-+            'name' => 'someusername',
-+            'transactionKey' => 'somepassword'
-+        ],
-+        'transId' => '4321'
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/transaction_details_authorized.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/transaction_details_authorized.php
-new file mode 100644
-index 00000000000..c3ffdedba68
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/transaction_details_authorized.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'getTransactionDetailsRequest' => [
-+        'merchantAuthentication' => [
-+            'name' => 'someusername',
-+            'transactionKey' => 'somepassword'
-+        ],
-+        'transId' => '1234'
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/void.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/void.php
-new file mode 100644
-index 00000000000..a1d3dade74f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/expected_request/void.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'createTransactionRequest' => [
-+        'merchantAuthentication' => [
-+            'name' => 'someusername',
-+            'transactionKey' => 'somepassword',
-+        ],
-+        'transactionRequest' =>[
-+            'transactionType' => 'voidTransaction',
-+            'refTransId' => '1234',
-+        ],
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/full_order.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/full_order.php
-new file mode 100644
-index 00000000000..cac7c38971a
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/full_order.php
-@@ -0,0 +1,125 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\Catalog\Model\Product\Type;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\Sales\Model\Order\Address;
-+use Magento\Sales\Model\Order\Item;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$addressData = include __DIR__ . '/../../../Magento/Sales/_files/address_data.php';
-+require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var $product Product */
-+$product = $objectManager->create(Product::class);
-+$product->isObjectNew(true);
-+$product->setTypeId(Type::TYPE_SIMPLE)
-+    ->setId(1)
-+    ->setAttributeSetId(4)
-+    ->setWebsiteIds([1])
-+    ->setName('Simple Product')
-+    ->setSku('simple')
-+    ->setPrice(10)
-+    ->setWeight(1)
-+    ->setShortDescription('Short description')
-+    ->setTaxClassId(0)
-+    ->setDescription('Description with <b>html tag</b>')
-+    ->setMetaTitle('meta title')
-+    ->setMetaKeyword('meta keyword')
-+    ->setMetaDescription('meta description')
-+    ->setVisibility(Visibility::VISIBILITY_BOTH)
-+    ->setStatus(Status::STATUS_ENABLED)
-+    ->setStockData([
-+        'use_config_manage_stock'   => 1,
-+        'qty'                       => 100,
-+        'is_qty_decimal'            => 0,
-+        'is_in_stock'               => 1,
-+    ])->setCanSaveCustomOptions(true)
-+    ->setHasOptions(false);
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
-+$productRepository->save($product);
-+
-+
-+$billingAddress = $objectManager->create(Address::class, ['data' => $addressData]);
-+$billingAddress->setAddressType('billing');
-+
-+$shippingAddress = clone $billingAddress;
-+$shippingAddress->setId(null)
-+    ->setAddressType('shipping')
-+    ->setStreet(['6161 West Centinela Avenue'])
-+    ->setFirstname('John')
-+    ->setLastname('Doe')
-+    ->setShippingMethod('flatrate_flatrate');
-+
-+$payment = $objectManager->create(Payment::class);
-+$payment->setAdditionalInformation('ccLast4', '1111');
-+$payment->setAdditionalInformation('opaqueDataDescriptor', 'mydescriptor');
-+$payment->setAdditionalInformation('opaqueDataValue', 'myvalue');
-+
-+/** @var Item $orderItem */
-+$orderItem1 = $objectManager->create(Item::class);
-+$orderItem1->setProductId($product->getId())
-+    ->setSku($product->getSku())
-+    ->setName($product->getName())
-+    ->setQtyOrdered(1)
-+    ->setBasePrice($product->getPrice())
-+    ->setPrice($product->getPrice())
-+    ->setRowTotal($product->getPrice())
-+    ->setProductType($product->getTypeId());
-+
-+/** @var Item $orderItem */
-+$orderItem2 = $objectManager->create(Item::class);
-+$orderItem2->setProductId($product->getId())
-+    ->setSku('simple2')
-+    ->setName('Simple product')
-+    ->setPrice(100)
-+    ->setQtyOrdered(2)
-+    ->setBasePrice($product->getPrice())
-+    ->setPrice($product->getPrice())
-+    ->setRowTotal($product->getPrice())
-+    ->setProductType($product->getTypeId());
-+
-+$orderAmount = 100;
-+$customerEmail = $billingAddress->getEmail();
-+
-+/** @var Order $order */
-+$order = $objectManager->create(Order::class);
-+$order->setIncrementId('100000001')
-+    ->setState(Order::STATE_PROCESSING)
-+    ->setStatus(Order::STATE_PROCESSING)
-+    ->setCustomerId($customer->getId())
-+    ->setCustomerIsGuest(false)
-+    ->setRemoteIp('127.0.0.1')
-+    ->setCreatedAt(date('Y-m-d 00:00:55'))
-+    ->setOrderCurrencyCode('USD')
-+    ->setBaseCurrencyCode('USD')
-+    ->setSubtotal($orderAmount)
-+    ->setGrandTotal($orderAmount)
-+    ->setBaseSubtotal($orderAmount)
-+    ->setBaseGrandTotal($orderAmount)
-+    ->setCustomerEmail($customerEmail)
-+    ->setBillingAddress($billingAddress)
-+    ->setShippingAddress($shippingAddress)
-+    ->setShippingDescription('Flat Rate - Fixed')
-+    ->setShippingAmount(10)
-+    ->setStoreId(1)
-+    ->addItem($orderItem1)
-+    ->addItem($orderItem2)
-+    ->setQuoteId(1)
-+    ->setPayment($payment);
-+
-+return $order;
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/authorize.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/authorize.php
-new file mode 100644
-index 00000000000..f80495137ca
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/authorize.php
-@@ -0,0 +1,47 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'transactionResponse' => [
-+        'responseCode' => '1',
-+        'authCode' => 'abc123',
-+        'avsResultCode' => 'Y',
-+        'cvvResultCode' => 'P',
-+        'cavvResultCode' => '2',
-+        'transId' => '123456',
-+        'refTransID' => '',
-+        'transHash' => 'foobar',
-+        'testRequest' => '0',
-+        'accountNumber' => 'XXXX1111',
-+        'accountType' => 'Visa',
-+        'messages' => [
-+            [
-+                'code' => '1',
-+                'description' => 'This transaction has been approved.'
-+            ]
-+        ],
-+        'userFields' => [
-+            [
-+                'name' => 'transactionType',
-+                'value' => 'authOnlyTransaction'
-+            ]
-+        ],
-+        'transHashSha2' => 'CD1E57FB1B5C876FDBD536CB16F8BBBA687580EDD78DD881C7F14DC4467C32BF6C'
-+            . '808620FBD59E5977DF19460B98CCFC0DA0D90755992C0D611CABB8E2BA52B0',
-+        'SupplementalDataQualificationIndicator' => 0
-+    ],
-+    'messages' => [
-+        'resultCode' => 'Ok',
-+        'message' => [
-+            [
-+                'code' => 'I00001',
-+                'text' => 'Successful.'
-+            ]
-+        ]
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/generic_success.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/generic_success.php
-new file mode 100644
-index 00000000000..ea7662e3193
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/generic_success.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'messages' => [
-+        'resultCode' => 'Ok',
-+        'message' => [
-+            'code' => 'I00001',
-+            'text' => 'Successful'
-+        ]
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/refund.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/refund.php
-new file mode 100644
-index 00000000000..536f51d659a
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/refund.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'transactionResponse' =>  [
-+        'responseCode' => '1',
-+        'authCode' => '',
-+        'avsResultCode' => 'P',
-+        'cvvResultCode' => '',
-+        'cavvResultCode' => '',
-+        'transId' => '5678',
-+        'refTransID' => '4321',
-+        'testRequest' => '0',
-+        'accountNumber' => 'XXXX1111',
-+        'accountType' => 'Visa',
-+        'messages' => [
-+            [
-+                'code' => '1',
-+                'description' => 'This transaction has been approved.'
-+            ]
-+        ],
-+        'transHashSha2' => '78BD31BA5BCDF3C3FA3C8373D8DF80EF07FC7E02C3545FCF18A408E2F76ED4F20D'
-+            . 'FF007221374B576FDD1BFD953B3E5CF37249CEC4C135EEF975F7B478D8452C',
-+        'SupplementalDataQualificationIndicator' => 0
-+    ],
-+    'messages' => [
-+        'resultCode' => 'Ok',
-+        'message' => [
-+            [
-+                'code' => 'I00001',
-+                'text' => 'Successful.'
-+            ]
-+        ]
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/sale.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/sale.php
-new file mode 100644
-index 00000000000..74a80110ade
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/sale.php
-@@ -0,0 +1,47 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'transactionResponse' => [
-+        'responseCode' => '1',
-+        'authCode' => 'abc123',
-+        'avsResultCode' => 'Y',
-+        'cvvResultCode' => 'P',
-+        'cavvResultCode' => '2',
-+        'transId' => '123456',
-+        'refTransID' => '',
-+        'transHash' => 'foobar',
-+        'testRequest' => '0',
-+        'accountNumber' => 'XXXX1111',
-+        'accountType' => 'Visa',
-+        'messages' => [
-+            [
-+                'code' => '1',
-+                'description' => 'This transaction has been approved.'
-+            ]
-+        ],
-+        'userFields' => [
-+            [
-+                'name' => 'transactionType',
-+                'value' => 'authCaptureTransaction'
-+            ]
-+        ],
-+        'transHashSha2' => 'CD1E57FB1B5C876FDBD536CB16F8BBBA687580EDD78DD881C7F14DC4467C32BF6C'
-+            . '808620FBD59E5977DF19460B98CCFC0DA0D90755992C0D611CABB8E2BA52B0',
-+        'SupplementalDataQualificationIndicator' => 0
-+    ],
-+    'messages' => [
-+        'resultCode' => 'Ok',
-+        'message' => [
-+            [
-+                'code' => 'I00001',
-+                'text' => 'Successful.'
-+            ]
-+        ]
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/settle.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/settle.php
-new file mode 100644
-index 00000000000..5e54c301987
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/settle.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'transactionResponse' =>  [
-+        'responseCode' => '1',
-+        'authCode' => '',
-+        'avsResultCode' => 'P',
-+        'cvvResultCode' => '',
-+        'cavvResultCode' => '',
-+        'transId' => '1234',
-+        'refTransID' => '1234',
-+        'testRequest' => '0',
-+        'accountNumber' => 'XXXX1111',
-+        'accountType' => 'Visa',
-+        'messages' => [
-+            [
-+                'code' => '1',
-+                'description' => 'This transaction has been approved.'
-+            ]
-+        ],
-+        'transHashSha2' => '1B22AB4E4DF750CF2E0D1944BB6903537C145545C7313C87B6FD4A6384'
-+            . '709EA2609CE9A9788C128F2F2EAEEE474F6010418904648C6D000BE3AF7BCD98A5AD8F',
-+        'SupplementalDataQualificationIndicator' => 0
-+    ],
-+    'messages' => [
-+        'resultCode' => 'Ok',
-+        'message' => [
-+            [
-+                'code' => 'I00001',
-+                'text' => 'Successful.'
-+            ]
-+        ]
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_authorized.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_authorized.php
-new file mode 100644
-index 00000000000..80fd24a5c60
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_authorized.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'messages' => [
-+        'resultCode' => 'Ok',
-+        'message' => [
-+            'code' => 'I00001',
-+            'text' => 'Successful'
-+        ]
-+    ],
-+    'transaction' => [
-+        'transId' => '1234',
-+        'transactionType' => 'authOnlyTransaction',
-+        'transactionStatus' => 'authorizedPendingCapture'
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_declined.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_declined.php
-new file mode 100644
-index 00000000000..24c9353e408
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_declined.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'messages' => [
-+        'resultCode' => 'Ok',
-+        'message' => [
-+            'code' => 'I00001',
-+            'text' => 'Successful'
-+        ]
-+    ],
-+    'transaction' => [
-+        'transId' => '1234',
-+        'transactionType' => 'authOnlyTransaction',
-+        'transactionStatus' => 'declined'
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_fds_pending.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_fds_pending.php
-new file mode 100644
-index 00000000000..de045f30ab2
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_fds_pending.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'messages' => [
-+        'resultCode' => 'Ok',
-+        'message' => [
-+            'code' => 'I00001',
-+            'text' => 'Successful'
-+        ]
-+    ],
-+    'transaction' => [
-+        'transId' => '1234',
-+        'transactionType' => 'authOnlyTransaction',
-+        'transactionStatus' => 'FDSPendingReview'
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_settled_capture.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_settled_capture.php
-new file mode 100644
-index 00000000000..5df2f03a943
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_settled_capture.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'messages' => [
-+        'resultCode' => 'Ok',
-+        'message' => [
-+            'code' => 'I00001',
-+            'text' => 'Successful'
-+        ]
-+    ],
-+    'transaction' => [
-+        'transId' => '4321',
-+        'transactionType' => 'captureOnlyTransaction',
-+        'transactionStatus' => 'settledSuccessfully'
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_voided.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_voided.php
-new file mode 100644
-index 00000000000..7ee735cd8cf
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/transaction_details_voided.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'messages' => [
-+        'resultCode' => 'Ok',
-+        'message' => [
-+            'code' => 'I00001',
-+            'text' => 'Successful'
-+        ]
-+    ],
-+    'transaction' => [
-+        'transId' => '1234',
-+        'transactionType' => 'authOnlyTransaction',
-+        'transactionStatus' => 'void'
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/void.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/void.php
-new file mode 100644
-index 00000000000..eb71de4dd96
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/_files/response/void.php
-@@ -0,0 +1,30 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'messages' => [
-+        'resultCode' => 'Ok',
-+        'message' => [
-+            'code' => 'I00001',
-+            'text' => 'Successful'
-+        ]
-+    ],
-+    'transactionResponse' => [
-+        'responseCode' => '1',
-+        'messages' => [
-+            'message' => [
-+                [
-+                    'code' => 1
-+                ]
-+            ]
-+        ],
-+        'transHashSha2' => '1B22AB4E4DF750CF2E0D1944BB6903537C145545C7313C87B6FD4A6384709E'
-+            . 'A2609CE9A9788C128F2F2EAEEE474F6010418904648C6D000BE3AF7BCD98A5AD8F',
-+        'transId' => '1234'
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/expected_request/authorize.php b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/expected_request/authorize.php
-new file mode 100644
-index 00000000000..ceab22403d9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/expected_request/authorize.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'createTransactionRequest' => [
-+        'merchantAuthentication' =>[
-+            'name' => 'someusername',
-+            'transactionKey' => 'somepassword',
-+        ],
-+        'transactionRequest' => [
-+            'transactionType' => 'authOnlyTransaction',
-+            'amount' => '100.00',
-+            'payment' => [
-+                'opaqueData' => [
-+                    'dataDescriptor' => 'mydescriptor',
-+                    'dataValue' => 'myvalue',
-+                ],
-+            ],
-+            'solution' => [
-+                'id' => 'AAA102993',
-+            ],
-+            'order' => [
-+                'invoiceNumber' => '100000001',
-+            ],
-+            'poNumber' => null,
-+            'customer' => [
-+                'id' => 1,
-+                'email' => 'admin@example.com',
-+            ],
-+            'billTo' => [
-+                'firstName' => 'firstname',
-+                'lastName' => 'lastname',
-+                'company' => '',
-+                'address' => 'street',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'shipTo' => [
-+                'firstName' => 'John',
-+                'lastName' => 'Doe',
-+                'company' => '',
-+                'address' => '6161 West Centinela Avenue',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'customerIP' => '127.0.0.1',
-+            'cardholderAuthentication' => [
-+                'authenticationIndicator' => '05',
-+                'cardholderAuthenticationValue' => 'AAABAWFlmQAAAABjRWWZEEFgFz8=',
-+            ],
-+            'userFields' => [
-+                'userField' => [
-+                    [
-+                        'name' => 'transactionType',
-+                        'value' => 'authOnlyTransaction',
-+                    ],
-+                ],
-+            ],
-+        ],
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/expected_request/sale.php b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/expected_request/sale.php
-new file mode 100644
-index 00000000000..f96facb19b3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/expected_request/sale.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'createTransactionRequest' => [
-+        'merchantAuthentication' =>[
-+            'name' => 'someusername',
-+            'transactionKey' => 'somepassword',
-+        ],
-+        'transactionRequest' => [
-+            'transactionType' => 'authCaptureTransaction',
-+            'amount' => '100.00',
-+            'payment' => [
-+                'opaqueData' => [
-+                    'dataDescriptor' => 'mydescriptor',
-+                    'dataValue' => 'myvalue',
-+                ],
-+            ],
-+            'solution' => [
-+                'id' => 'AAA102993',
-+            ],
-+            'order' => [
-+                'invoiceNumber' => '100000001',
-+            ],
-+            'poNumber' => null,
-+            'customer' => [
-+                'id' => 1,
-+                'email' => 'admin@example.com',
-+            ],
-+            'billTo' => [
-+                'firstName' => 'firstname',
-+                'lastName' => 'lastname',
-+                'company' => '',
-+                'address' => 'street',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'shipTo' => [
-+                'firstName' => 'John',
-+                'lastName' => 'Doe',
-+                'company' => '',
-+                'address' => '6161 West Centinela Avenue',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'customerIP' => '127.0.0.1',
-+            'cardholderAuthentication' => [
-+                'authenticationIndicator' => '05',
-+                'cardholderAuthenticationValue' => 'AAABAWFlmQAAAABjRWWZEEFgFz8=',
-+            ],
-+            'userFields' => [
-+                'userField' => [
-+                    [
-+                        'name' => 'transactionType',
-+                        'value' => 'authCaptureTransaction',
-+                    ],
-+                ],
-+            ],
-+        ],
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/full_order_with_3dsecure.php b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/full_order_with_3dsecure.php
-new file mode 100644
-index 00000000000..4f50b502e85
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/full_order_with_3dsecure.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$order = include __DIR__ . '/../../AuthorizenetAcceptjs/_files/full_order.php';
-+
-+$objectManager = Bootstrap::getObjectManager();
-+$cardinalJWT = include __DIR__ . '/response/cardinal_jwt.php';
-+
-+/** @var Payment $payment */
-+$payment = $order->getPayment();
-+$payment->setAdditionalInformation('cardinalJWT', $cardinalJWT);
-+
-+return $order;
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/response/authorize.php b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/response/authorize.php
-new file mode 100644
-index 00000000000..3af04813c1a
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/response/authorize.php
-@@ -0,0 +1,47 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'transactionResponse' => [
-+        'responseCode' => '1',
-+        'authCode' => 'abc123',
-+        'avsResultCode' => 'P',
-+        'cvvResultCode' => '',
-+        'cavvResultCode' => '',
-+        'transId' => '123456',
-+        'refTransID' => '',
-+        'transHash' => 'foobar',
-+        'testRequest' => '0',
-+        'accountNumber' => 'XXXX1111',
-+        'accountType' => 'Visa',
-+        'messages' => [
-+            [
-+                'code' => '1',
-+                'description' => 'This transaction has been approved.'
-+            ]
-+        ],
-+        'userFields' => [
-+            [
-+                'name' => 'transactionType',
-+                'value' => 'authOnlyTransaction'
-+            ]
-+        ],
-+        'transHashSha2' => 'CD1E57FB1B5C876FDBD536CB16F8BBBA687580EDD78DD881C7F14DC4467C32BF6C'
-+            . '808620FBD59E5977DF19460B98CCFC0DA0D90755992C0D611CABB8E2BA52B0',
-+        'SupplementalDataQualificationIndicator' => 0
-+    ],
-+    'messages' => [
-+        'resultCode' => 'Ok',
-+        'message' => [
-+            [
-+                'code' => 'I00001',
-+                'text' => 'Successful.'
-+            ]
-+        ]
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/response/cardinal_jwt.php b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/response/cardinal_jwt.php
-new file mode 100644
-index 00000000000..80f42524897
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Fixture/response/cardinal_jwt.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\CardinalCommerce\Model\Config;
-+use Magento\CardinalCommerce\Model\JwtManagement;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var JwtManagement $jwtManagment */
-+$jwtManagment = $objectManager->get(JwtManagement::class);
-+/** @var Config $config */
-+$config = $objectManager->get(Config::class);
-+$currentDate = new \DateTime('now', new \DateTimeZone('UTC'));
-+$response = [
-+    'iss' => 'some_api_identifier',
-+    'iat' => 1559855656,
-+    'exp' => $currentDate->getTimestamp() + 3600,
-+    'jti' => '0d695df5-ca06-4f7d-b150-ff169510f6d2',
-+    'ConsumerSessionId' => '0_9e6a4084-2191-4fd7-9631-19f576375e0a',
-+    'ReferenceId' => '0_9e6a4084-2191-4fd7-9631-19f576375e0a',
-+    'aud' => '52efb9cc-843c-4ee9-a38c-107943be6b03',
-+    'Payload' => [
-+        'Validated' => true,
-+        'Payment' => [
-+            'Type' => 'CCA',
-+            'ProcessorTransactionId' => '4l7xg1WA7CS0YwgPgNZ0',
-+            'ExtendedData' => [
-+                'CAVV' => 'AAABAWFlmQAAAABjRWWZEEFgFz8=',
-+                'ECIFlag' => '05',
-+                'XID' => 'NGw3eGcxV0E3Q1MwWXdnUGdOWjA=',
-+                'Enrolled' => 'Y',
-+                'PAResStatus' => 'Y',
-+                'SignatureVerification' => 'Y',
-+            ],
-+        ],
-+        'ActionCode' => 'SUCCESS',
-+        'ErrorNumber' => 0,
-+        'ErrorDescription' => 'Success',
-+    ],
-+];
-+$cardinalJWT = $jwtManagment->encode($response, $config->getApiKey());
-+
-+return $cardinalJWT;
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Gateway/Command/AuthorizeCommandTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Gateway/Command/AuthorizeCommandTest.php
-new file mode 100644
-index 00000000000..f41025e08ec
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Gateway/Command/AuthorizeCommandTest.php
-@@ -0,0 +1,186 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetCardinal\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\AbstractTest;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\Sales\Model\Order\Payment\Transaction;
-+
-+/**
-+ * Tests "Authorize" command for Authorize.net payment requests with 3D-Secure.
-+ */
-+class AuthorizeCommandTest extends AbstractTest
-+{
-+    /**
-+     * Tests Authorize command with enabled 3D secure and valid Cardinal response JWT.
-+     *
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/enabled_authorizenet 1
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/environment sandbox
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/api_key some_api_key
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/api_identifier some_api_identifier
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/org_unit_id some_org_unit_id
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     *
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testAuthorizeCommandWith3dSecure()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('authorize');
-+
-+        $order = include __DIR__ . '/../../Fixture/full_order_with_3dsecure.php';
-+        $payment = $order->getPayment();
-+
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../Fixture/expected_request/authorize.php';
-+        $response = include __DIR__ . '/../../Fixture/response/authorize.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $command->execute(
-+            [
-+                'payment' => $paymentDO,
-+                'amount' => 100.00
-+            ]
-+        );
-+
-+        /** @var Payment $payment */
-+        $rawDetails = [
-+            'authCode' => 'abc123',
-+            'avsResultCode' => 'P',
-+            'cvvResultCode' => '',
-+            'cavvResultCode' => '',
-+            'accountType' => 'Visa',
-+        ];
-+        $this->assertSame('1111', $payment->getCcLast4());
-+        $this->assertSame('P', $payment->getCcAvsStatus());
-+        $this->assertFalse($payment->getData('is_transaction_closed'));
-+
-+        $transactionDetails = $payment->getTransactionAdditionalInfo();
-+        foreach ($rawDetails as $key => $value) {
-+            $this->assertSame($value, $payment->getAdditionalInformation($key));
-+            $this->assertSame($value, $transactionDetails[Transaction::RAW_DETAILS][$key]);
-+        }
-+
-+        $this->assertSame('123456', $payment->getTransactionId());
-+        $this->assertSame('123456', $transactionDetails['real_transaction_id']);
-+    }
-+
-+    /**
-+     * Tests Authorize command with enabled 3D secure and invalid Cardinal response JWT.
-+     *
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/enabled_authorizenet 1
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/environment sandbox
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/api_key some_api_key
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/api_identifier some_api_identifier
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/org_unit_id some_org_unit_id
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     *
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testAuthorizeCommandWithInvalidJwt()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('authorize');
-+
-+        $order = include __DIR__ . '/../../../AuthorizenetAcceptjs/_files/full_order.php';
-+        $payment = $order->getPayment();
-+        $payment->setAdditionalInformation('cardinalJWT', 'Invalid JWT');
-+
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $this->expectException(LocalizedException::class);
-+
-+        $command->execute(
-+            [
-+                'payment' => $paymentDO,
-+                'amount' => 100.00
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Tests Authorize command with disabled 3D secure.
-+     *
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/enabled_authorizenet 0
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/environment sandbox
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/api_key some_api_key
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/api_identifier some_api_identifier
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/org_unit_id some_org_unit_id
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     *
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testAuthorizeCommandWithDisabled3dSecure()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('authorize');
-+
-+        $order = include __DIR__ . '/../../Fixture/full_order_with_3dsecure.php';
-+        $payment = $order->getPayment();
-+
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../../AuthorizenetAcceptjs/_files/expected_request/authorize.php';
-+        $response = include __DIR__ . '/../../../AuthorizenetAcceptjs/_files/response/authorize.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $command->execute(
-+            [
-+                'payment' => $paymentDO,
-+                'amount' => 100.00
-+            ]
-+        );
-+
-+        /** @var Payment $payment */
-+        $rawDetails = [
-+            'authCode' => 'abc123',
-+            'avsResultCode' => 'Y',
-+            'cvvResultCode' => 'P',
-+            'cavvResultCode' => '2',
-+            'accountType' => 'Visa',
-+        ];
-+        $this->assertSame('1111', $payment->getCcLast4());
-+        $this->assertSame('Y', $payment->getCcAvsStatus());
-+        $this->assertFalse($payment->getData('is_transaction_closed'));
-+
-+        $transactionDetails = $payment->getTransactionAdditionalInfo();
-+        foreach ($rawDetails as $key => $value) {
-+            $this->assertSame($value, $payment->getAdditionalInformation($key));
-+            $this->assertSame($value, $transactionDetails[Transaction::RAW_DETAILS][$key]);
-+        }
-+
-+        $this->assertSame('123456', $payment->getTransactionId());
-+        $this->assertSame('123456', $transactionDetails['real_transaction_id']);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Gateway/Command/SaleCommandTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Gateway/Command/SaleCommandTest.php
-new file mode 100644
-index 00000000000..c22e1fceaa8
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetCardinal/Gateway/Command/SaleCommandTest.php
-@@ -0,0 +1,85 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetCardinal\Gateway\Command;
-+
-+use Magento\AuthorizenetAcceptjs\Gateway\AbstractTest;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Payment\Gateway\Command\CommandPoolInterface;
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\Sales\Model\Order\Payment\Transaction;
-+
-+/**
-+ * Tests "Sale" command for Authorize.net payment requests with 3D-Secure.
-+ */
-+class SaleCommandTest extends AbstractTest
-+{
-+    /**
-+     * Tests Sale command with enabled 3D secure and valid Cardinal response JWT.
-+     *
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/enabled_authorizenet 1
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/environment sandbox
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/api_key some_api_key
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/api_identifier some_api_identifier
-+     * @magentoConfigFixture default_store three_d_secure/cardinal/org_unit_id some_org_unit_id
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     *
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testSaleCommandWith3dSecure()
-+    {
-+        /** @var CommandPoolInterface $commandPool */
-+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
-+        $command = $commandPool->get('sale');
-+
-+        $order = include __DIR__ . '/../../Fixture/full_order_with_3dsecure.php';
-+        $payment = $order->getPayment();
-+
-+        $paymentDO = $this->paymentFactory->create($payment);
-+
-+        $expectedRequest = include __DIR__ . '/../../Fixture/expected_request/sale.php';
-+        $response = include __DIR__ . '/../../../AuthorizenetAcceptjs/_files/response/sale.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')
-+            ->willReturn(json_encode($response));
-+
-+        $command->execute(
-+            [
-+                'payment' => $paymentDO,
-+                'amount' => 100.00
-+            ]
-+        );
-+
-+        /** @var Payment $payment */
-+        $rawDetails = [
-+            'authCode' => 'abc123',
-+            'avsResultCode' => 'Y',
-+            'cvvResultCode' => 'P',
-+            'cavvResultCode' => '2',
-+            'accountType' => 'Visa',
-+        ];
-+        $this->assertSame('1111', $payment->getCcLast4());
-+        $this->assertSame('Y', $payment->getCcAvsStatus());
-+        $this->assertFalse($payment->getData('is_transaction_closed'));
-+
-+        $transactionDetails = $payment->getTransactionAdditionalInfo();
-+        foreach ($rawDetails as $key => $value) {
-+            $this->assertSame($value, $payment->getAdditionalInformation($key));
-+            $this->assertSame($value, $transactionDetails[Transaction::RAW_DETAILS][$key]);
-+        }
-+
-+        $this->assertSame('123456', $payment->getTransactionId());
-+        $this->assertSame('123456', $transactionDetails['real_transaction_id']);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/PlaceOrderWithAuthorizeNetTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/PlaceOrderWithAuthorizeNetTest.php
-new file mode 100644
-index 00000000000..90ec6686c5a
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/PlaceOrderWithAuthorizeNetTest.php
-@@ -0,0 +1,159 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetGraphQl\Model\Resolver\Customer;
-+
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\GraphQl\Service\GraphQlRequest;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\HTTP\ZendClient;
-+use Magento\Framework\HTTP\ZendClientFactory;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+use Zend_Http_Response;
-+
-+/**
-+ * Tests end to end Place Order process for customer via authorizeNet
-+ *
-+ * @magentoAppArea graphql
-+ * @magentoDbIsolation disabled
-+ */
-+class PlaceOrderWithAuthorizeNetTest extends TestCase
-+{
-+    /** @var ObjectManager */
-+    private $objectManager;
-+
-+    /** @var GetMaskedQuoteIdByReservedOrderId */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /** @var SerializerInterface */
-+    private $jsonSerializer;
-+
-+    /** @var GraphQlRequest */
-+    private $graphQlRequest;
-+
-+    /** @var ZendClient|MockObject|InvocationMocker */
-+    private $clientMock;
-+
-+    /** @var CustomerTokenServiceInterface */
-+    private $customerTokenService;
-+
-+    /** @var Zend_Http_Response */
-+    protected $responseMock;
-+
-+    protected function setUp() : void
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->jsonSerializer = $this->objectManager->get(SerializerInterface::class);
-+        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $this->objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $this->objectManager->get(CustomerTokenServiceInterface::class);
-+        $this->clientMock = $this->createMock(ZendClient::class);
-+        $this->responseMock = $this->createMock(Zend_Http_Response::class);
-+        $this->clientMock->method('request')
-+            ->willReturn($this->responseMock);
-+        $this->clientMock->method('setUri')
-+            ->with('https://apitest.authorize.net/xml/v1/request.api');
-+        $clientFactoryMock = $this->createMock(ZendClientFactory::class);
-+        $clientFactoryMock->method('create')
-+            ->willReturn($this->clientMock);
-+        $this->objectManager->addSharedInstance($clientFactoryMock, ZendClientFactory::class);
-+    }
-+
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/AuthorizenetGraphQl/_files/simple_product_authorizenet.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoDataFixture Magento/AuthorizenetGraphQl/_files/set_new_shipping_address_authorizenet.php
-+     * @magentoDataFixture Magento/AuthorizenetGraphQl/_files/set_new_billing_address_authorizenet.php
-+     * @magentoDataFixture Magento/AuthorizenetGraphQl/_files/add_simple_products_authorizenet.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testDispatchToPlaceOrderWithRegisteredCustomer(): void
-+    {
-+        $paymentMethod = 'authorizenet_acceptjs';
-+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query
-+            = <<<QUERY
-+ mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$cartId"
-+      payment_method: {
-+          code: "$paymentMethod"
-+          additional_data:
-+         {authorizenet_acceptjs: 
-+            {opaque_data_descriptor: "mydescriptor",
-+             opaque_data_value: "myvalue",
-+             cc_last_4: 1111}}
-+      }
-+  }) {    
-+       cart {
-+          selected_payment_method {
-+          code
-+      }
-+    }
-+  }
-+    placeOrder(input: {cart_id: "$cartId"}) {
-+      order {
-+        order_id
-+      }
-+    }
-+}
-+QUERY;
-+
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-+        $requestHeaders = [
-+            'Accept' => 'application/json',
-+            'Authorization' => 'Bearer ' . $customerToken
-+        ];
-+        // phpcs:ignore Magento2.Security.IncludeFile
-+        $expectedRequest = include __DIR__ . '/../../../_files/request_authorize_customer.php';
-+        // phpcs:ignore Magento2.Security.IncludeFile
-+        $authorizeResponse = include __DIR__ . '/../../../_files/response_authorize.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')->willReturn(json_encode($authorizeResponse));
-+
-+        $response = $this->graphQlRequest->send($query, [], '', $requestHeaders);
-+        $responseData = $this->jsonSerializer->unserialize($response->getContent());
-+
-+        $this->assertArrayNotHasKey('errors', $responseData, 'Response has errors');
-+        $this->assertTrue(
-+            isset($responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code'])
-+        );
-+        $this->assertEquals(
-+            $paymentMethod,
-+            $responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
-+        );
-+
-+        $this->assertTrue(
-+            isset($responseData['data']['placeOrder']['order']['order_id'])
-+        );
-+
-+        $this->assertEquals(
-+            'test_quote',
-+            $responseData['data']['placeOrder']['order']['order_id']
-+        );
-+    }
-+
-+    protected function tearDown()
-+    {
-+        $this->objectManager->removeSharedInstance(ZendClientFactory::class);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/SetAuthorizeNetPaymentMethodOnCartTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/SetAuthorizeNetPaymentMethodOnCartTest.php
-new file mode 100644
-index 00000000000..e304216bc4a
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/SetAuthorizeNetPaymentMethodOnCartTest.php
-@@ -0,0 +1,103 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetGraphQl\Model\Resolver\Customer;
-+
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\GraphQl\Service\GraphQlRequest;
-+use Magento\Integration\Api\CustomerTokenServiceInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Tests SetPaymentMethod mutation for customer via authorizeNet payment
-+ *
-+ * @magentoAppArea graphql
-+ * @magentoDbIsolation disabled
-+ */
-+class SetAuthorizeNetPaymentMethodOnCartTest extends TestCase
-+{
-+    /** @var \Magento\Framework\ObjectManagerInterface */
-+    private $objectManager;
-+
-+    /** @var GetMaskedQuoteIdByReservedOrderId */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /** @var SerializerInterface */
-+    private $jsonSerializer;
-+
-+    /** @var CustomerTokenServiceInterface */
-+    private $customerTokenService;
-+
-+    /** @var GraphQlRequest */
-+    private $graphQlRequest;
-+
-+    protected function setUp() : void
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->jsonSerializer = $this->objectManager->get(SerializerInterface::class);
-+        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $this->objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->customerTokenService = $this->objectManager->get(CustomerTokenServiceInterface::class);
-+    }
-+
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testDispatchToSetPaymentMethodWithAuthorizenet(): void
-+    {
-+        $methodCode = 'authorizenet_acceptjs';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query
-+            = <<<QUERY
-+ mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$maskedQuoteId"
-+      payment_method: {
-+          code: "$methodCode"
-+          additional_data:
-+         {authorizenet_acceptjs: 
-+            {opaque_data_descriptor: "COMMON.ACCEPT.INAPP.PAYMENT",
-+             opaque_data_value: "abx",
-+             cc_last_4: 1111}}
-+      }
-+  }) {    
-+    cart {
-+      selected_payment_method {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-+
-+        $requestHeaders = [
-+            'Accept' => 'application/json',
-+            'Authorization' => 'Bearer ' . $customerToken
-+        ];
-+
-+        $response = $this->graphQlRequest->send($query, [], '', $requestHeaders);
-+
-+        $output = $this->jsonSerializer->unserialize($response->getContent());
-+        $this->assertArrayNotHasKey('errors', $output, 'Response has errors');
-+        $this->assertArrayHasKey('setPaymentMethodOnCart', $output['data']);
-+        $selectedPaymentMethod = $output['data']['setPaymentMethodOnCart']['cart']['selected_payment_method'];
-+        $this->assertEquals($methodCode, $selectedPaymentMethod['code']);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/PlaceOrderWithAuthorizeNetTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/PlaceOrderWithAuthorizeNetTest.php
-new file mode 100644
-index 00000000000..383abf81a11
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/PlaceOrderWithAuthorizeNetTest.php
-@@ -0,0 +1,149 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetGraphQl\Model\Resolver\Guest;
-+
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\GraphQl\Service\GraphQlRequest;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\HTTP\ZendClient;
-+use Magento\Framework\HTTP\ZendClientFactory;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+use Zend_Http_Response;
-+
-+/**
-+ * Tests end to end Place Order process for non logged in customer using authorizeNet payment
-+ *
-+ * @magentoAppArea graphql
-+ * @magentoDbIsolation disabled
-+ */
-+class PlaceOrderWithAuthorizeNetTest extends TestCase
-+{
-+    /** @var ObjectManager */
-+    private $objectManager;
-+
-+    /** @var GetMaskedQuoteIdByReservedOrderId */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /** @var SerializerInterface */
-+    private $jsonSerializer;
-+
-+    /** @var GraphQlRequest */
-+    private $graphQlRequest;
-+
-+    /** @var ZendClient|MockObject|InvocationMocker */
-+    private $clientMock;
-+
-+    /** @var Zend_Http_Response */
-+    protected $responseMock;
-+
-+    protected function setUp() : void
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->jsonSerializer = $this->objectManager->get(SerializerInterface::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $this->objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
-+        $this->clientMock = $this->createMock(ZendClient::class);
-+        $this->responseMock = $this->createMock(Zend_Http_Response::class);
-+        $this->clientMock->method('request')
-+            ->willReturn($this->responseMock);
-+        $this->clientMock->method('setUri')
-+            ->with('https://apitest.authorize.net/xml/v1/request.api');
-+        $clientFactoryMock = $this->createMock(ZendClientFactory::class);
-+        $clientFactoryMock->method('create')
-+            ->willReturn($this->clientMock);
-+        $this->objectManager->addSharedInstance($clientFactoryMock, ZendClientFactory::class);
-+    }
-+
-+    protected function tearDown()
-+    {
-+        $this->objectManager->removeSharedInstance(ZendClientFactory::class);
-+    }
-+
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
-+     * @magentoDataFixture Magento/AuthorizenetGraphQl/_files/simple_product_authorizenet.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoDataFixture Magento/AuthorizenetGraphQl/_files/set_new_shipping_address_authorizenet.php
-+     * @magentoDataFixture Magento/AuthorizenetGraphQl/_files/set_new_billing_address_authorizenet.php
-+     * @magentoDataFixture Magento/AuthorizenetGraphQl/_files/add_simple_products_authorizenet.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testDispatchToPlaceAnOrderWithAuthorizenet(): void
-+    {
-+        $paymentMethod = 'authorizenet_acceptjs';
-+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query
-+            = <<<QUERY
-+ mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$cartId"
-+      payment_method: {
-+          code: "$paymentMethod"
-+          additional_data:
-+         {authorizenet_acceptjs: 
-+            {opaque_data_descriptor: "mydescriptor",
-+             opaque_data_value: "myvalue",
-+             cc_last_4: 1111}}
-+      }
-+  }) {    
-+       cart {
-+          selected_payment_method {
-+          code
-+      }
-+    }
-+  }
-+    placeOrder(input: {cart_id: "$cartId"}) {
-+      order {
-+        order_id
-+      }
-+    }
-+}
-+QUERY;
-+
-+        // phpcs:ignore Magento2.Security.IncludeFile
-+        $expectedRequest = include __DIR__ . '/../../../_files/request_authorize.php';
-+        // phpcs:ignore Magento2.Security.IncludeFile
-+        $authorizeResponse = include __DIR__ . '/../../../_files/response_authorize.php';
-+
-+        $this->clientMock->method('setRawData')
-+            ->with(json_encode($expectedRequest), 'application/json');
-+
-+        $this->responseMock->method('getBody')->willReturn(json_encode($authorizeResponse));
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $responseData = $this->jsonSerializer->unserialize($response->getContent());
-+
-+        $this->assertArrayNotHasKey('errors', $responseData, 'Response has errors');
-+        $this->assertTrue(
-+            isset($responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code'])
-+        );
-+        $this->assertEquals(
-+            $paymentMethod,
-+            $responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
-+        );
-+
-+        $this->assertTrue(
-+            isset($responseData['data']['placeOrder']['order']['order_id'])
-+        );
-+
-+        $this->assertEquals(
-+            'test_quote',
-+            $responseData['data']['placeOrder']['order']['order_id']
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/SetAuthorizeNetPaymentMethodOnCartTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/SetAuthorizeNetPaymentMethodOnCartTest.php
-new file mode 100644
-index 00000000000..fef20df4ee9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/SetAuthorizeNetPaymentMethodOnCartTest.php
-@@ -0,0 +1,90 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\AuthorizenetGraphQl\Model\Resolver\Guest;
-+
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\GraphQl\Service\GraphQlRequest;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Tests SetPaymentMethod mutation for guest via authorizeNet payment
-+ *
-+ * @magentoAppArea graphql
-+ * @magentoDbIsolation disabled
-+ */
-+class SetAuthorizeNetPaymentMethodOnCartTest extends TestCase
-+{
-+    /** @var ObjectManager */
-+    private $objectManager;
-+
-+    /** @var GetMaskedQuoteIdByReservedOrderId */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /** @var SerializerInterface */
-+    private $jsonSerializer;
-+
-+    /** @var GraphQlRequest */
-+    private $graphQlRequest;
-+
-+    protected function setUp() : void
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->jsonSerializer = $this->objectManager->get(SerializerInterface::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $this->objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
-+    }
-+
-+    /**
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
-+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     */
-+    public function testDispatchToSetPaymentMethodWithAuthorizenet(): void
-+    {
-+        $methodCode = 'authorizenet_acceptjs';
-+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+        $query
-+            = <<<QUERY
-+ mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$maskedQuoteId"
-+      payment_method: {
-+          code: "$methodCode"
-+          additional_data:
-+         {authorizenet_acceptjs: 
-+            {opaque_data_descriptor: "COMMON.ACCEPT.INAPP.PAYMENT",
-+             opaque_data_value: "abx",
-+             cc_last_4: 1111}}
-+      }
-+  }) {    
-+    cart {
-+      selected_payment_method {
-+        code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $output = $this->jsonSerializer->unserialize($response->getContent());
-+        $this->assertArrayNotHasKey('errors', $output, 'Response has errors');
-+        $this->assertArrayHasKey('setPaymentMethodOnCart', $output['data']);
-+        $selectedPaymentMethod = $output['data']['setPaymentMethodOnCart']['cart']['selected_payment_method'];
-+        $this->assertEquals($methodCode, $selectedPaymentMethod['code']);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/add_simple_products_authorizenet.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/add_simple_products_authorizenet.php
-new file mode 100644
-index 00000000000..3646e864ab4
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/add_simple_products_authorizenet.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var CartRepositoryInterface $cartRepository */
-+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-+
-+$product = $productRepository->get('simple_product');
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$quote->addProduct($product, 4);
-+$cartRepository->save($quote);
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/request_authorize.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/request_authorize.php
-new file mode 100644
-index 00000000000..c91c8081736
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/request_authorize.php
-@@ -0,0 +1,65 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'createTransactionRequest' => [
-+        'merchantAuthentication' =>[
-+            'name' => 'someusername',
-+            'transactionKey' => 'somepassword',
-+        ],
-+        'transactionRequest' => [
-+            'transactionType' => 'authOnlyTransaction',
-+            'amount' => '100.00',
-+            'payment' => [
-+                'opaqueData' => [
-+                    'dataDescriptor' => 'mydescriptor',
-+                    'dataValue' => 'myvalue',
-+                ],
-+            ],
-+            'solution' => [
-+                'id' => 'AAA102993',
-+            ],
-+            'order' => [
-+                'invoiceNumber' => 'test_quote',
-+            ],
-+            'poNumber' => null,
-+            'customer' => [
-+                'id' => null,
-+                'email' => 'guest@example.com',
-+            ],
-+            'billTo' => [
-+                'firstName' => 'firstname',
-+                'lastName' => 'lastname',
-+                'company' => '',
-+                'address' => 'street',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'shipTo' => [
-+                'firstName' => 'John',
-+                'lastName' => 'Doe',
-+                'company' => '',
-+                'address' => '6161 West Centinela Avenue',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'userFields' => [
-+                'userField' => [
-+                    [
-+                        'name' => 'transactionType',
-+                        'value' => 'authOnlyTransaction',
-+                    ],
-+                ],
-+            ],
-+        ],
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/request_authorize_customer.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/request_authorize_customer.php
-new file mode 100644
-index 00000000000..0ef173009bd
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/request_authorize_customer.php
-@@ -0,0 +1,65 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'createTransactionRequest' => [
-+        'merchantAuthentication' =>[
-+            'name' => 'someusername',
-+            'transactionKey' => 'somepassword',
-+        ],
-+        'transactionRequest' => [
-+            'transactionType' => 'authOnlyTransaction',
-+            'amount' => '100.00',
-+            'payment' => [
-+                'opaqueData' => [
-+                    'dataDescriptor' => 'mydescriptor',
-+                    'dataValue' => 'myvalue',
-+                ],
-+            ],
-+            'solution' => [
-+                'id' => 'AAA102993',
-+            ],
-+            'order' => [
-+                'invoiceNumber' => 'test_quote',
-+            ],
-+            'poNumber' => null,
-+            'customer' => [
-+                'id' => '1',
-+                'email' => 'customer@example.com',
-+            ],
-+            'billTo' => [
-+                'firstName' => 'firstname',
-+                'lastName' => 'lastname',
-+                'company' => '',
-+                'address' => 'street',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'shipTo' => [
-+                'firstName' => 'John',
-+                'lastName' => 'Doe',
-+                'company' => '',
-+                'address' => '6161 West Centinela Avenue',
-+                'city' => 'Los Angeles',
-+                'state' => 'CA',
-+                'zip' => '11111',
-+                'country' => 'US',
-+            ],
-+            'userFields' => [
-+                'userField' => [
-+                    [
-+                        'name' => 'transactionType',
-+                        'value' => 'authOnlyTransaction',
-+                    ],
-+                ],
-+            ],
-+        ],
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/response_authorize.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/response_authorize.php
-new file mode 100644
-index 00000000000..f80495137ca
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/response_authorize.php
-@@ -0,0 +1,47 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+return [
-+    'transactionResponse' => [
-+        'responseCode' => '1',
-+        'authCode' => 'abc123',
-+        'avsResultCode' => 'Y',
-+        'cvvResultCode' => 'P',
-+        'cavvResultCode' => '2',
-+        'transId' => '123456',
-+        'refTransID' => '',
-+        'transHash' => 'foobar',
-+        'testRequest' => '0',
-+        'accountNumber' => 'XXXX1111',
-+        'accountType' => 'Visa',
-+        'messages' => [
-+            [
-+                'code' => '1',
-+                'description' => 'This transaction has been approved.'
-+            ]
-+        ],
-+        'userFields' => [
-+            [
-+                'name' => 'transactionType',
-+                'value' => 'authOnlyTransaction'
-+            ]
-+        ],
-+        'transHashSha2' => 'CD1E57FB1B5C876FDBD536CB16F8BBBA687580EDD78DD881C7F14DC4467C32BF6C'
-+            . '808620FBD59E5977DF19460B98CCFC0DA0D90755992C0D611CABB8E2BA52B0',
-+        'SupplementalDataQualificationIndicator' => 0
-+    ],
-+    'messages' => [
-+        'resultCode' => 'Ok',
-+        'message' => [
-+            [
-+                'code' => 'I00001',
-+                'text' => 'Successful.'
-+            ]
-+        ]
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/set_new_billing_address_authorizenet.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/set_new_billing_address_authorizenet.php
-new file mode 100644
-index 00000000000..4f045c550cd
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/set_new_billing_address_authorizenet.php
-@@ -0,0 +1,44 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\Quote\Api\Data\AddressInterface;
-+use Magento\Quote\Api\Data\AddressInterfaceFactory;
-+use Magento\Quote\Api\BillingAddressManagementInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var AddressInterfaceFactory $quoteAddressFactory */
-+$quoteAddressFactory = Bootstrap::getObjectManager()->get(AddressInterfaceFactory::class);
-+/** @var DataObjectHelper $dataObjectHelper */
-+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
-+/** @var BillingAddressManagementInterface $billingAddressManagement */
-+$billingAddressManagement = Bootstrap::getObjectManager()->get(BillingAddressManagementInterface::class);
-+
-+$quoteAddressData = [
-+    AddressInterface::KEY_TELEPHONE => 11111111,
-+    AddressInterface::KEY_POSTCODE => 11111,
-+    AddressInterface::KEY_COUNTRY_ID => 'US',
-+    AddressInterface::KEY_CITY => 'Los Angeles',
-+    AddressInterface::KEY_COMPANY => '',
-+    AddressInterface::KEY_STREET => 'street',
-+    AddressInterface::KEY_LASTNAME => 'lastname',
-+    AddressInterface::KEY_FIRSTNAME => 'firstname',
-+    AddressInterface::KEY_REGION_ID => 12,
-+];
-+$quoteAddress = $quoteAddressFactory->create();
-+$dataObjectHelper->populateWithArray($quoteAddress, $quoteAddressData, AddressInterfaceFactory::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$billingAddressManagement->assign($quote->getId(), $quoteAddress);
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/set_new_shipping_address_authorizenet.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/set_new_shipping_address_authorizenet.php
-new file mode 100644
-index 00000000000..8837a3cb239
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/set_new_shipping_address_authorizenet.php
-@@ -0,0 +1,43 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\Quote\Api\Data\AddressInterface;
-+use Magento\Quote\Api\Data\AddressInterfaceFactory;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\Quote\Model\ShippingAddressManagementInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var AddressInterfaceFactory $quoteAddressFactory */
-+$quoteAddressFactory = Bootstrap::getObjectManager()->get(AddressInterfaceFactory::class);
-+/** @var DataObjectHelper $dataObjectHelper */
-+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
-+/** @var ShippingAddressManagementInterface $shippingAddressManagement */
-+$shippingAddressManagement = Bootstrap::getObjectManager()->get(ShippingAddressManagementInterface::class);
-+
-+$quoteAddressData = [
-+    AddressInterface::KEY_TELEPHONE => 3468676,
-+    AddressInterface::KEY_POSTCODE => '11111',
-+    AddressInterface::KEY_COUNTRY_ID => 'US',
-+    AddressInterface::KEY_CITY => 'Los Angeles',
-+    AddressInterface::KEY_COMPANY => '',
-+    AddressInterface::KEY_STREET => '6161 West Centinela Avenue',
-+    AddressInterface::KEY_LASTNAME => 'Doe',
-+    AddressInterface::KEY_FIRSTNAME => 'John',
-+    AddressInterface::KEY_REGION_ID => 12,
-+];
-+$quoteAddress = $quoteAddressFactory->create();
-+$dataObjectHelper->populateWithArray($quoteAddress, $quoteAddressData, AddressInterfaceFactory::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$shippingAddressManagement->assign($quote->getId(), $quoteAddress);
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/simple_product_authorizenet.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/simple_product_authorizenet.php
-new file mode 100644
-index 00000000000..50ec9508537
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/simple_product_authorizenet.php
-@@ -0,0 +1,47 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\Catalog\Model\Product\Type;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ProductInterfaceFactory $productFactory */
-+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
-+/** @var DataObjectHelper $dataObjectHelper */
-+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+
-+$product = $productFactory->create();
-+$productData = [
-+    ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
-+    ProductInterface::ATTRIBUTE_SET_ID => 4,
-+    ProductInterface::SKU => 'simple_product',
-+    ProductInterface::NAME => 'Simple Product',
-+    ProductInterface::PRICE => 20,
-+    ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH,
-+    ProductInterface::STATUS => Status::STATUS_ENABLED,
-+];
-+$dataObjectHelper->populateWithArray($product, $productData, ProductInterface::class);
-+/** Out of interface */
-+$product
-+    ->setWebsiteIds([1])
-+    ->setStockData(
-+        [
-+        'qty' => 85.5,
-+        'is_in_stock' => true,
-+        'manage_stock' => true,
-+        'is_qty_decimal' => true
-+         ]
-+    );
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/simple_product_authorizenet_rollback.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/simple_product_authorizenet_rollback.php
-new file mode 100644
-index 00000000000..6b37585f822
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/_files/simple_product_authorizenet_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+// phpcs:ignore Magento2.Security.IncludeFile
-+require __DIR__ . '/../../GraphQl/Catalog/_files/simple_product_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/GraphTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/GraphTest.php
-index 17863cd7095..497deb2c991 100644
---- a/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/GraphTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/GraphTest.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Backend\Block\Dashboard;
- 
- /**
-@@ -27,6 +29,6 @@ class GraphTest extends \PHPUnit\Framework\TestCase
- 
-     public function testGetChartUrl()
-     {
--        $this->assertStringStartsWith('http://chart.apis.google.com/chart', $this->_block->getChartUrl());
-+        $this->assertStringStartsWith('https://image-charts.com/chart', $this->_block->getChartUrl());
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
-index 8aeee9cf124..e11c5ce5d9c 100644
---- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
-@@ -87,41 +87,6 @@ class MassactionTest extends \PHPUnit\Framework\TestCase
-         $this->assertFalse($blockEmpty->isAvailable());
-     }
- 
--    public function testGetJavaScript()
--    {
--        $this->loadLayout();
--
--        $javascript = $this->_block->getJavaScript();
--
--        $expectedItemFirst = '#"option_id1":{"label":"Option One",' .
--            '"url":"http:\\\/\\\/localhost\\\/index\.php\\\/(?:key\\\/([\w\d]+)\\\/)?",' .
--            '"complete":"Test","id":"option_id1"}#';
--        $this->assertRegExp($expectedItemFirst, $javascript);
--
--        $expectedItemSecond = '#"option_id2":{"label":"Option Two",' .
--            '"url":"http:\\\/\\\/localhost\\\/index\.php\\\/(?:key\\\/([\w\d]+)\\\/)?",' .
--            '"confirm":"Are you sure\?","id":"option_id2"}#';
--        $this->assertRegExp($expectedItemSecond, $javascript);
--    }
--
--    public function testGetJavaScriptWithAddedItem()
--    {
--        $this->loadLayout();
--
--        $input = [
--            'id' => 'option_id3',
--            'label' => 'Option Three',
--            'url' => '*/*/option3',
--            'block_name' => 'admin.test.grid.massaction.option3',
--        ];
--        $expected = '#"option_id3":{"id":"option_id3","label":"Option Three",' .
--            '"url":"http:\\\/\\\/localhost\\\/index\.php\\\/(?:key\\\/([\w\d]+)\\\/)?",' .
--            '"block_name":"admin.test.grid.massaction.option3"}#';
--
--        $this->_block->addItem($input['id'], $input);
--        $this->assertRegExp($expected, $this->_block->getJavaScript());
--    }
--
-     /**
-      * @param string $mageMode
-      * @param int $expectedCount
-@@ -213,21 +178,4 @@ class MassactionTest extends \PHPUnit\Framework\TestCase
-             ]
-         ];
-     }
--
--    public function testGridContainsMassactionColumn()
--    {
--        $this->loadLayout();
--        $this->_layout->getBlock('admin.test.grid')->toHtml();
--
--        $gridMassactionColumn = $this->_layout->getBlock('admin.test.grid')
--            ->getColumnSet()
--            ->getChildBlock('massaction');
--
--        $this->assertNotNull($gridMassactionColumn, 'Massaction column does not exist in the grid column set');
--        $this->assertInstanceOf(
--            \Magento\Backend\Block\Widget\Grid\Column::class,
--            $gridMassactionColumn,
--            'Massaction column is not an instance of \Magento\Backend\Block\Widget\Column'
--        );
--    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
-index 04930661efb..6836161fd6e 100644
---- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
-@@ -73,7 +73,7 @@ class CacheTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-         $this->getRequest()->setParams(['types' => ['invalid_type_1', 'invalid_type_2', 'config']]);
-         $this->dispatch('backend/admin/cache/' . $action);
-         $this->assertSessionMessages(
--            $this->contains("These cache type(s) don't exist: invalid_type_1, invalid_type_2"),
-+            $this->contains("These cache type(s) don&#039;t exist: invalid_type_1, invalid_type_2"),
-             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
-         );
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
-index 595a33344c7..bd4dd0c8daf 100644
---- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
-@@ -4,8 +4,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Backend\Controller\Adminhtml\Dashboard;
- 
-+/**
-+ * Test product viewed backend controller.
-+ */
- class ProductsViewedTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
-     /**
-@@ -14,6 +18,7 @@ class ProductsViewedTest extends \Magento\TestFramework\TestCase\AbstractBackend
-      */
-     public function testExecute()
-     {
-+        $this->getRequest()->setMethod("POST");
-         $this->dispatch('backend/admin/dashboard/productsViewed/');
- 
-         $this->assertEquals(200, $this->getResponse()->getHttpResponseCode());
-diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
-index 07af21505f1..0eb98379b45 100644
---- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Backend\Controller\Adminhtml;
- 
- /**
-@@ -19,8 +21,15 @@ class DashboardTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-         $this->assertContains('dashboard-diagram', $actual);
-     }
- 
-+    /**
-+     * Tests tunnelAction
-+     *
-+     * @throws \Exception
-+     * @return void
-+     */
-     public function testTunnelAction()
-     {
-+        // phpcs:disable Magento2.Functions.DiscouragedFunction
-         $testUrl = \Magento\Backend\Block\Dashboard\Graph::API_URL . '?cht=p3&chd=t:60,40&chs=250x100&chl=Hello|World';
-         $handle = curl_init();
-         curl_setopt($handle, CURLOPT_URL, $testUrl);
-@@ -34,6 +43,7 @@ class DashboardTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-             curl_close($handle);
-             throw $e;
-         }
-+        // phpcs:enable
- 
-         $gaData = [
-             'cht' => 'lc',
-diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
-index 219fde6e370..d5a48b96081 100644
---- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml;
- 
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+
- /**
-  * @magentoAppArea adminhtml
-  * @magentoDbIsolation enabled
-@@ -45,6 +47,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     public function testGlobalSearchAction()
-     {
-         $this->getRequest()->setParam('isAjax', 'true');
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue('query', 'dummy');
-         $this->dispatch('backend/admin/index/globalSearch');
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php
-index 1185ae9727e..0d48fc8b0f5 100644
---- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Backend\Controller\Adminhtml;
- 
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+
- /**
-  * @magentoAppArea adminhtml
-  */
-@@ -20,6 +22,7 @@ class UrlRewriteTest extends \Magento\TestFramework\TestCase\AbstractBackendCont
-         $page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Cms\Model\Page::class);
-         $page->load('page_design_blank', 'identifier');
- 
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue(
-             [
-                 'description' => 'Some URL rewrite description',
-diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php
-index 5ca2bf1f731..f1e7a107376 100644
---- a/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php
-@@ -3,8 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Backend\Model\Auth;
- 
-+use Magento\TestFramework\Bootstrap as TestHelper;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
- /**
-  * @magentoAppArea adminhtml
-  * @magentoAppIsolation enabled
-@@ -18,10 +22,15 @@ class SessionTest extends \PHPUnit\Framework\TestCase
-     private $auth;
- 
-     /**
--     * @var \Magento\Backend\Model\Auth\Session
-+     * @var Session
-      */
-     private $authSession;
- 
-+    /**
-+     * @var SessionFactory
-+     */
-+    private $authSessionFactory;
-+
-     /**
-      * @var \Magento\Framework\ObjectManagerInterface
-      */
-@@ -30,11 +39,12 @@ class SessionTest extends \PHPUnit\Framework\TestCase
-     protected function setUp()
-     {
-         parent::setUp();
--        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $this->objectManager = Bootstrap::getObjectManager();
-         $this->objectManager->get(\Magento\Framework\Config\ScopeInterface::class)
-             ->setCurrentScope(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
-         $this->auth = $this->objectManager->create(\Magento\Backend\Model\Auth::class);
--        $this->authSession = $this->objectManager->create(\Magento\Backend\Model\Auth\Session::class);
-+        $this->authSession = $this->objectManager->create(Session::class);
-+        $this->authSessionFactory = $this->objectManager->get(SessionFactory::class);
-         $this->auth->setAuthStorage($this->authSession);
-         $this->auth->logout();
-     }
-@@ -52,8 +62,8 @@ class SessionTest extends \PHPUnit\Framework\TestCase
-     {
-         if ($loggedIn) {
-             $this->auth->login(
--                \Magento\TestFramework\Bootstrap::ADMIN_NAME,
--                \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD
-+                TestHelper::ADMIN_NAME,
-+                TestHelper::ADMIN_PASSWORD
-             );
-         }
-         $this->assertEquals($loggedIn, $this->authSession->isLoggedIn());
-@@ -63,4 +73,23 @@ class SessionTest extends \PHPUnit\Framework\TestCase
-     {
-         return [[false], [true]];
-     }
-+
-+    /**
-+     * Check that persisting user data is working.
-+     */
-+    public function testStorage()
-+    {
-+        $this->auth->login(TestHelper::ADMIN_NAME, TestHelper::ADMIN_PASSWORD);
-+        $user = $this->authSession->getUser();
-+        $acl = $this->authSession->getAcl();
-+        /** @var Session $session */
-+        $session = $this->authSessionFactory->create();
-+        $persistedUser = $session->getUser();
-+        $persistedAcl = $session->getAcl();
-+
-+        $this->assertEquals($user->getData(), $persistedUser->getData());
-+        $this->assertEquals($user->getAclRole(), $persistedUser->getAclRole());
-+        $this->assertEquals($acl->getRoles(), $persistedAcl->getRoles());
-+        $this->assertEquals($acl->getResources(), $persistedAcl->getResources());
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/Locale/ResolverTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/Locale/ResolverTest.php
-index d1252be2c4b..88662a65c74 100644
---- a/dev/tests/integration/testsuite/Magento/Backend/Model/Locale/ResolverTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/Locale/ResolverTest.php
-@@ -3,9 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Backend\Model\Locale;
- 
- use Magento\Framework\Locale\Resolver;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\User\Model\User;
- 
- /**
-  * @magentoAppArea adminhtml
-@@ -20,7 +23,7 @@ class ResolverTest extends \PHPUnit\Framework\TestCase
-     protected function setUp()
-     {
-         parent::setUp();
--        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+        $this->_model = Bootstrap::getObjectManager()->create(
-             \Magento\Backend\Model\Locale\Resolver::class
-         );
-     }
-@@ -38,12 +41,12 @@ class ResolverTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testSetLocaleWithBaseInterfaceLocale()
-     {
--        $user = new \Magento\Framework\DataObject();
--        $session = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-+        $user = Bootstrap::getObjectManager()->create(User::class);
-+        $session = Bootstrap::getObjectManager()->get(
-             \Magento\Backend\Model\Auth\Session::class
-         );
-         $session->setUser($user);
--        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-+        Bootstrap::getObjectManager()->get(
-             \Magento\Backend\Model\Auth\Session::class
-         )->getUser()->setInterfaceLocale(
-             'fr_FR'
-@@ -56,7 +59,7 @@ class ResolverTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testSetLocaleWithSessionLocale()
-     {
--        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-+        Bootstrap::getObjectManager()->get(
-             \Magento\Backend\Model\Session::class
-         )->setSessionLocale(
-             'es_ES'
-@@ -69,7 +72,7 @@ class ResolverTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testSetLocaleWithRequestLocale()
-     {
--        $request = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+        $request = Bootstrap::getObjectManager()
-             ->get(\Magento\Framework\App\RequestInterface::class);
-         $request->setPostValue(['locale' => 'de_DE']);
-         $this->_checkSetLocale('de_DE');
-diff --git a/dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr.php b/dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr.php
-new file mode 100644
-index 00000000000..4bce8d95daf
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr.php
-@@ -0,0 +1,16 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types = 1);
-+
-+use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
-+use Magento\Framework\App\Config\ReinitableConfigInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ConfigInterface $config */
-+$config = $objectManager->get(ConfigInterface::class);
-+$config->saveConfig('general/country/allow', 'FR');
-+$objectManager->get(ReinitableConfigInterface::class)->reinit();
-diff --git a/dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr_rollback.php
-new file mode 100644
-index 00000000000..711d9857863
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr_rollback.php
-@@ -0,0 +1,16 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types = 1);
-+
-+use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
-+use Magento\Framework\App\Config\ReinitableConfigInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ConfigInterface $config */
-+$config = $objectManager->get(ConfigInterface::class);
-+$config->deleteConfig('general/country/allow');
-+$objectManager->get(ReinitableConfigInterface::class)->reinit();
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Invoice/CreateTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Invoice/CreateTest.php
-new file mode 100644
-index 00000000000..d6ea08a2f7c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Invoice/CreateTest.php
-@@ -0,0 +1,151 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Braintree\Controller\Adminhtml\Invoice;
-+
-+use Braintree\Result\Successful;
-+use Braintree\Transaction;
-+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
-+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Data\Form\FormKey;
-+use Magento\Framework\Message\MessageInterface;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\TestFramework\TestCase\AbstractBackendController;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+
-+/**
-+ * @magentoAppArea adminhtml
-+ */
-+class CreateTest extends AbstractBackendController
-+{
-+    /**
-+     * @var BraintreeAdapter|MockObject
-+     */
-+    private $adapter;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $adapterFactory = $this->getMockBuilder(BraintreeAdapterFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $adapterFactory->method('create')
-+            ->willReturn($this->adapter);
-+
-+        $this->_objectManager->addSharedInstance($adapterFactory, BraintreeAdapterFactory::class);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function tearDown()
-+    {
-+        $this->_objectManager->removeSharedInstance(BraintreeAdapterFactory::class);
-+        parent::tearDown();
-+    }
-+
-+    /**
-+     * Checks a case when non default Merchant Account ID should be send to Braintree
-+     * during creation second partial invoice.
-+     *
-+     * @return void
-+     * @magentoConfigFixture default_store payment/braintree/merchant_account_id Magneto
-+     * @magentoConfigFixture current_store payment/braintree/merchant_account_id USA_Merchant
-+     * @magentoDataFixture Magento/Braintree/Fixtures/partial_invoice.php
-+     */
-+    public function testCreatePartialInvoiceWithNonDefaultMerchantAccount(): void
-+    {
-+        $order = $this->getOrder('100000002');
-+
-+        $this->adapter->method('sale')
-+            ->with(self::callback(function ($request) {
-+                self::assertEquals('USA_Merchant', $request['merchantAccountId']);
-+                return true;
-+            }))
-+            ->willReturn($this->getTransactionStub());
-+
-+        $uri = 'backend/sales/order_invoice/save/order_id/' . $order->getEntityId();
-+        $this->prepareRequest($uri);
-+        $this->dispatch($uri);
-+
-+        self::assertSessionMessages(
-+            self::equalTo(['The invoice has been created.']),
-+            MessageInterface::TYPE_SUCCESS
-+        );
-+    }
-+
-+    /**
-+     * Creates stub for Braintree capture Transaction.
-+     *
-+     * @return Successful
-+     */
-+    private function getTransactionStub(): Successful
-+    {
-+        $transaction = $this->getMockBuilder(Transaction::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $transaction->status = 'submitted_for_settlement';
-+        $response = new Successful();
-+        $response->success = true;
-+        $response->transaction = $transaction;
-+
-+        return $response;
-+    }
-+
-+    /**
-+     * Gets order by increment ID.
-+     *
-+     * @param string $incrementId
-+     * @return OrderInterface
-+     */
-+    private function getOrder(string $incrementId): OrderInterface
-+    {
-+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
-+        $searchCriteria = $searchCriteriaBuilder->addFilter('increment_id', $incrementId)
-+            ->create();
-+
-+        /** @var OrderRepositoryInterface $repository */
-+        $repository = $this->_objectManager->get(OrderRepositoryInterface::class);
-+        $items = $repository->getList($searchCriteria)
-+            ->getItems();
-+
-+        return array_pop($items);
-+    }
-+
-+    /**
-+     * Prepares POST request for invoice creation.
-+     *
-+     * @param string $uri
-+     * @return void
-+     */
-+    private function prepareRequest(string $uri): void
-+    {
-+        /** @var FormKey $formKey */
-+        $formKey = $this->_objectManager->get(FormKey::class);
-+        $request = $this->getRequest();
-+        $request->setMethod('POST');
-+        $request->setParam('form_key', $formKey->getFormKey());
-+        $request->setRequestUri($uri);
-+        $request->setPostValue(
-+            [
-+                'invoice' => [
-+                    'capture_case' => 'online'
-+                ]
-+            ]
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php
-index 04bac807637..bb7b04f53dd 100644
---- a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php
-@@ -70,8 +70,8 @@ class PaymentReviewTest extends AbstractBackendController
-         );
- 
-         $order = $this->orderRepository->get($orderId);
--        static::assertEquals(Order::STATE_PROCESSING, $order->getState());
--        static::assertEquals(Order::STATE_PROCESSING, $order->getStatus());
-+        static::assertEquals(Order::STATE_COMPLETE, $order->getState());
-+        static::assertEquals(Order::STATE_COMPLETE, $order->getStatus());
-     }
- 
-     /**
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/PlaceOrderTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/PlaceOrderTest.php
-new file mode 100644
-index 00000000000..4f2b0fd6784
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/PlaceOrderTest.php
-@@ -0,0 +1,173 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Braintree\Controller\Paypal;
-+
-+use Braintree\Result\Successful;
-+use Braintree\Transaction;
-+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
-+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
-+use Magento\Checkout\Model\Session;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+use Magento\Framework\Message\MessageInterface;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Api\Data\CartInterface;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\TestFramework\TestCase\AbstractController;
-+use PHPUnit\Framework\MockObject\MockObject;
-+
-+/**
-+ * PlaceOrderTest
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class PlaceOrderTest extends AbstractController
-+{
-+    /**
-+     * @var Session|MockObject
-+     */
-+    private $session;
-+
-+    /**
-+     * @var BraintreeAdapter|MockObject
-+     */
-+    private $adapter;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->session = $this->getMockBuilder(Session::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getQuote', 'setLastOrderStatus', 'unsLastBillingAgreementReferenceId'])
-+            ->getMock();
-+
-+        $adapterFactory = $this->getMockBuilder(BraintreeAdapterFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $adapterFactory->method('create')
-+            ->willReturn($this->adapter);
-+
-+        $this->_objectManager->addSharedInstance($this->session, Session::class);
-+        $this->_objectManager->addSharedInstance($adapterFactory, BraintreeAdapterFactory::class);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function tearDown()
-+    {
-+        $this->_objectManager->removeSharedInstance(Session::class);
-+        $this->_objectManager->removeSharedInstance(BraintreeAdapterFactory::class);
-+        parent::tearDown();
-+    }
-+
-+    /**
-+     * Tests a negative scenario for a place order flow when exception throws after placing an order.
-+     *
-+     * @magentoDataFixture Magento/Braintree/Fixtures/paypal_quote.php
-+     */
-+    public function testExecuteWithFailedOrder()
-+    {
-+        $reservedOrderId = 'test01';
-+        $quote = $this->getQuote($reservedOrderId);
-+
-+        $this->session->method('getQuote')
-+            ->willReturn($quote);
-+
-+        $this->adapter->method('sale')
-+            ->willReturn($this->getTransactionStub('authorized'));
-+        $this->adapter->method('void')
-+            ->willReturn($this->getTransactionStub('voided'));
-+
-+        // emulates an error after placing the order
-+        $this->session->method('setLastOrderStatus')
-+            ->willThrowException(new \Exception('Test Exception'));
-+
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-+        $this->dispatch('braintree/paypal/placeOrder');
-+
-+        self::assertRedirect(self::stringContains('checkout/cart'));
-+        self::assertSessionMessages(
-+            self::equalTo(['The order #' . $reservedOrderId . ' cannot be processed.']),
-+            MessageInterface::TYPE_ERROR
-+        );
-+
-+        $order = $this->getOrder($reservedOrderId);
-+        self::assertEquals('canceled', $order->getState());
-+    }
-+
-+    /**
-+     * Gets quote by reserved order ID.
-+     *
-+     * @param string $reservedOrderId
-+     * @return CartInterface
-+     */
-+    private function getQuote(string $reservedOrderId): CartInterface
-+    {
-+        $searchCriteria = $this->_objectManager->get(SearchCriteriaBuilder::class)
-+            ->addFilter('reserved_order_id', $reservedOrderId)
-+            ->create();
-+
-+        /** @var CartRepositoryInterface $quoteRepository */
-+        $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
-+        $items = $quoteRepository->getList($searchCriteria)
-+            ->getItems();
-+
-+        return array_pop($items);
-+    }
-+
-+    /**
-+     * Gets order by increment ID.
-+     *
-+     * @param string $incrementId
-+     * @return OrderInterface
-+     */
-+    private function getOrder(string $incrementId): OrderInterface
-+    {
-+        $searchCriteria = $this->_objectManager->get(SearchCriteriaBuilder::class)
-+            ->addFilter('increment_id', $incrementId)
-+            ->create();
-+
-+        /** @var OrderRepositoryInterface $repository */
-+        $repository = $this->_objectManager->get(OrderRepositoryInterface::class);
-+        $items = $repository->getList($searchCriteria)
-+            ->getItems();
-+
-+        return array_pop($items);
-+    }
-+
-+    /**
-+     * Creates stub for Braintree Transaction.
-+     *
-+     * @param string $status
-+     * @return Successful
-+     */
-+    private function getTransactionStub(string $status): Successful
-+    {
-+        $transaction = $this->getMockBuilder(Transaction::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $transaction->status = $status;
-+        $transaction->paypal = [
-+            'paymentId' => 'pay-001',
-+            'payerEmail' => 'test@test.com'
-+        ];
-+        $response = new Successful();
-+        $response->success = true;
-+        $response->transaction = $transaction;
-+
-+        return $response;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/ReviewTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/ReviewTest.php
-new file mode 100644
-index 00000000000..fc79048f15f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/ReviewTest.php
-@@ -0,0 +1,43 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Braintree\Controller\Paypal;
-+
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\Action\HttpPostActionInterface;
-+use Magento\TestFramework\TestCase\AbstractController;
-+
-+/**
-+ * ReviewTest
-+ */
-+class ReviewTest extends AbstractController
-+{
-+    /**
-+     * @var Review
-+     */
-+    private $controller;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->controller = $this->_objectManager->create(Review::class);
-+    }
-+
-+    /**
-+     * Test controller implements correct interfaces
-+     *
-+     */
-+    public function testInterfaceImplementation()
-+    {
-+        $this->assertInstanceOf(HttpGetActionInterface::class, $this->controller);
-+        $this->assertInstanceOf(HttpPostActionInterface::class, $this->controller);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php
-new file mode 100644
-index 00000000000..91cea7dc966
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Api\CartRepositoryInterface;
-+
-+$store = $storeManager->getStore();
-+$quote->setReservedOrderId('multishipping_quote_id_braintree')
-+    ->setStoreId($store->getId())
-+    ->setCustomerEmail('customer001@test.com');
-+
-+/** @var CartRepositoryInterface $quoteRepository */
-+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
-+$quote->collectTotals();
-+$quoteRepository->save($quote);
-+
-+$items = $quote->getAllItems();
-+$addressList = $quote->getAllShippingAddresses();
-+
-+foreach ($addressList as $key => $address) {
-+    $item = $items[$key];
-+    // set correct quantity per shipping address
-+    $item->setQty(1);
-+    $address->setTotalQty(1);
-+    $address->addItem($item);
-+}
-+
-+// assign virtual product to the billing address
-+$billingAddress = $quote->getBillingAddress();
-+$virtualItem = $items[sizeof($items) - 1];
-+$billingAddress->setTotalQty(1);
-+$billingAddress->addItem($virtualItem);
-+
-+// need to recollect totals
-+$quote->setTotalsCollectedFlag(false);
-+$quote->collectTotals();
-+$quoteRepository->save($quote);
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order.php
-new file mode 100644
-index 00000000000..ceb90710ed5
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order.php
-@@ -0,0 +1,57 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Address;
-+use Magento\Sales\Model\Order\Item as OrderItem;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+$addressData = include __DIR__ . '/../../Sales/_files/address_data.php';
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
-+
-+$billingAddress = $objectManager->create(Address::class, ['data' => $addressData]);
-+$billingAddress->setAddressType('billing');
-+
-+$shippingAddress = clone $billingAddress;
-+$shippingAddress->setId(null)
-+    ->setAddressType('shipping');
-+
-+/** @var OrderItem $orderItem */
-+$orderItem = $objectManager->create(OrderItem::class);
-+$orderItem->setProductId($product->getId())
-+    ->setQtyOrdered(2)
-+    ->setBasePrice($product->getPrice())
-+    ->setPrice($product->getPrice())
-+    ->setRowTotal($product->getPrice())
-+    ->setProductType('simple');
-+
-+require __DIR__ . '/payment.php';
-+
-+$order = $objectManager->create(Order::class);
-+$order->setIncrementId('100000002')
-+    ->setSubtotal($product->getPrice() * 2)
-+    ->setBaseSubtotal($product->getPrice() * 2)
-+    ->setCustomerEmail('admin@example.com')
-+    ->setCustomerIsGuest(true)
-+    ->setBillingAddress($billingAddress)
-+    ->setShippingAddress($shippingAddress)
-+    ->setStoreId(
-+        $objectManager->get(StoreManagerInterface::class)->getStore()
-+            ->getId()
-+    )
-+    ->addItem($orderItem)
-+    ->setPayment($payment);
-+
-+/** @var OrderRepositoryInterface $orderRepository */
-+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+$orderRepository->save($order);
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order_rollback.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order_rollback.php
-new file mode 100644
-index 00000000000..a2da0b639e9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order_rollback.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\TestFramework\ObjectManager;
-+
-+$objectManager = ObjectManager::getInstance();
-+
-+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
-+$searchCriteria = $searchCriteriaBuilder->addFilter('increment_id', '100000002')
-+    ->create();
-+
-+/** @var OrderRepositoryInterface $orderRepository */
-+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+$items = $orderRepository->getList($searchCriteria)
-+    ->getItems();
-+
-+foreach ($items as $item) {
-+    $orderRepository->delete($item);
-+}
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice.php
-new file mode 100644
-index 00000000000..22b954515f3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice.php
-@@ -0,0 +1,47 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Api\InvoiceRepositoryInterface;
-+use Magento\Sales\Api\TransactionRepositoryInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Service\InvoiceService;
-+use Magento\TestFramework\ObjectManager;
-+
-+/** @var Order $order */
-+
-+require __DIR__ . '/order.php';
-+
-+$objectManager = ObjectManager::getInstance();
-+
-+/** @var InvoiceService $invoiceService */
-+$invoiceService = $objectManager->get(InvoiceService::class);
-+$invoice = $invoiceService->prepareInvoice($order);
-+$invoice->setIncrementId('100000002');
-+$invoice->register();
-+
-+$items = $invoice->getAllItems();
-+$item = array_pop($items);
-+$item->setQty(1);
-+$invoice->setTotalQty(1);
-+
-+$items = $order->getAllItems();
-+/** @var \Magento\Sales\Api\Data\OrderItemInterface $item */
-+$item = array_pop($items);
-+$item->setQtyInvoiced(1);
-+$invoice->collectTotals();
-+
-+/** @var InvoiceRepositoryInterface $invoiceRepository */
-+$invoiceRepository = $objectManager->get(InvoiceRepositoryInterface::class);
-+$invoice = $invoiceRepository->save($invoice);
-+
-+/** @var TransactionRepositoryInterface $transactionRepository */
-+$transactionRepository = $objectManager->get(TransactionRepositoryInterface::class);
-+$transaction = $transactionRepository->create();
-+$transaction->setTxnType('capture');
-+$transaction->setPaymentId($order->getPayment()->getEntityId());
-+$transaction->setOrderId($order->getEntityId());
-+$transactionRepository->save($transaction);
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice_rollback.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice_rollback.php
-new file mode 100644
-index 00000000000..1ed4438f87d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice_rollback.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Sales\Api\InvoiceRepositoryInterface;
-+use Magento\TestFramework\ObjectManager;
-+
-+$objectManager = ObjectManager::getInstance();
-+
-+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
-+$searchCriteria = $searchCriteriaBuilder->addFilter('increment_id', '%10000000%', 'like')
-+    ->create();
-+
-+/** @var InvoiceRepositoryInterface $invoiceRepository */
-+$invoiceRepository = $objectManager->get(InvoiceRepositoryInterface::class);
-+$items = $invoiceRepository->getList($searchCriteria)
-+    ->getItems();
-+
-+foreach ($items as $item) {
-+    $invoiceRepository->delete($item);
-+}
-+
-+require __DIR__ . '/order_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment.php
-new file mode 100644
-index 00000000000..a4285b963bf
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment.php
-@@ -0,0 +1,29 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Braintree\Model\Ui\ConfigProvider;
-+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+require __DIR__ . '/../../Vault/_files/token.php';
-+
-+$token->setPaymentMethodCode(ConfigProvider::CODE);
-+/** @var OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory */
-+$paymentExtensionFactory = $objectManager->get(OrderPaymentExtensionInterfaceFactory::class);
-+$extensionAttributes = $paymentExtensionFactory->create();
-+$extensionAttributes->setVaultPaymentToken($token);
-+
-+/** @var Payment $payment */
-+$payment = $objectManager->create(Payment::class);
-+$payment->setMethod(ConfigProvider::CODE);
-+$payment->setExtensionAttributes($extensionAttributes);
-+$payment->setAuthorizationTransaction(true);
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree.php
-new file mode 100644
-index 00000000000..3e1db90f1f2
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Model\Quote\Payment;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\Quote\Api\Data\PaymentInterface;
-+use Magento\Braintree\Model\Ui\ConfigProvider;
-+
-+/**
-+ * @var Magento\Quote\Model\Quote $quote
-+ */
-+
-+if (empty($quote)) {
-+    throw new \Exception('$quote should be defined in the parent fixture');
-+}
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var PaymentInterface $payment */
-+$payment = $objectManager->create(Payment::class);
-+$payment->setMethod(ConfigProvider::CODE);
-+$quote->setPayment($payment);
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree_paypal.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree_paypal.php
-new file mode 100644
-index 00000000000..e4bba222078
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree_paypal.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Model\Quote\Payment;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\Quote\Api\Data\PaymentInterface;
-+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
-+
-+/**
-+ * @var Magento\Quote\Model\Quote $quote
-+ */
-+
-+if (empty($quote)) {
-+    throw new \Exception('$quote should be defined in the parent fixture');
-+}
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var PaymentInterface $payment */
-+$payment = $objectManager->create(Payment::class);
-+$payment->setMethod(ConfigProvider::PAYPAL_CODE);
-+$quote->setPayment($payment);
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote.php
-new file mode 100644
-index 00000000000..e4c64d0e33d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote.php
-@@ -0,0 +1,31 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+
-+require __DIR__ . '/../_files/paypal_vault_token.php';
-+require __DIR__ . '/../../Sales/_files/quote_with_customer.php';
-+
-+$quote->getShippingAddress()
-+    ->setShippingMethod('flatrate_flatrate')
-+    ->setCollectShippingRates(true);
-+$quote->getPayment()
-+    ->setMethod(ConfigProvider::PAYPAL_VAULT_CODE)
-+    ->setAdditionalInformation(
-+        [
-+            'customer_id' => $quote->getCustomerId(),
-+            'public_hash' => $paymentToken->getPublicHash()
-+        ]
-+    );
-+
-+$quote->collectTotals();
-+
-+/** @var CartRepositoryInterface $quoteRepository */
-+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
-+$quoteRepository->save($quote);
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote_rollback.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote_rollback.php
-new file mode 100644
-index 00000000000..5d0fa8cca85
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote_rollback.php
-@@ -0,0 +1,9 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+require __DIR__ . '/../../Sales/_files/quote_with_customer_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree.php
-new file mode 100644
-index 00000000000..1c56e611dd6
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree.php
-@@ -0,0 +1,26 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Model\Quote;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var StoreManagerInterface $storeManager */
-+$storeManager = $objectManager->get(StoreManagerInterface::class);
-+
-+/** @var Quote $quote */
-+$quote = $objectManager->create(Quote::class);
-+
-+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/shipping_address_list.php';
-+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/billing_address.php';
-+require __DIR__ . '/payment_braintree.php';
-+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/items.php';
-+require __DIR__ . '/assign_items_per_address.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php
-new file mode 100644
-index 00000000000..4bd8e926abb
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php
-@@ -0,0 +1,26 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Model\Quote;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var StoreManagerInterface $storeManager */
-+$storeManager = $objectManager->get(StoreManagerInterface::class);
-+
-+/** @var Quote $quote */
-+$quote = $objectManager->create(Quote::class);
-+
-+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/shipping_address_list.php';
-+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/billing_address.php';
-+require __DIR__ . '/payment_braintree_paypal.php';
-+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/items.php';
-+require __DIR__ . '/assign_items_per_address.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Model/MultishippingTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Model/MultishippingTest.php
-new file mode 100644
-index 00000000000..91bc0388d85
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Braintree/Model/MultishippingTest.php
-@@ -0,0 +1,254 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Braintree\Model;
-+
-+use Braintree\Result\Successful;
-+use Braintree\Transaction;
-+use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
-+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
-+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
-+use Magento\Checkout\Model\Session as CheckoutSession;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Multishipping\Model\Checkout\Type\Multishipping;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\Quote;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\Order\Email\Sender\OrderSender;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
-+use Magento\Payment\Gateway\Command\ResultInterface as CommandResultInterface;
-+
-+/**
-+ * Tests Magento\Multishipping\Model\Checkout\Type\Multishipping with Braintree and BraintreePayPal payments.
-+ *
-+ * @magentoAppArea frontend
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class MultishippingTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var BraintreeAdapter|MockObject
-+     */
-+    private $adapter;
-+
-+    /**
-+     * @var Multishipping
-+     */
-+    private $model;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+
-+        $orderSender = $this->getMockBuilder(OrderSender::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $adapterFactory = $this->getMockBuilder(BraintreeAdapterFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $adapterFactory->method('create')
-+            ->willReturn($this->adapter);
-+
-+        $this->objectManager->addSharedInstance($adapterFactory, BraintreeAdapterFactory::class);
-+        $this->objectManager->addSharedInstance($this->getPaymentNonceMock(), GetPaymentNonceCommand::class);
-+
-+        $this->model = $this->objectManager->create(
-+            Multishipping::class,
-+            ['orderSender' => $orderSender]
-+        );
-+    }
-+
-+    /**
-+     * Checks a case when multiple orders are created successfully using Braintree payment method.
-+     *
-+     * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/Braintree/Fixtures/quote_with_split_items_braintree.php
-+     * @magentoConfigFixture current_store payment/braintree/active 1
-+     * @return void
-+     */
-+    public function testCreateOrdersWithBraintree()
-+    {
-+        $this->adapter->method('sale')
-+            ->willReturn(
-+                $this->getTransactionStub()
-+            );
-+        $this->createOrders();
-+    }
-+
-+    /**
-+     * Checks a case when multiple orders are created successfully using Braintree PayPal payment method.
-+     *
-+     * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php
-+     * @magentoConfigFixture current_store payment/braintree_paypal/active 1
-+     * @return void
-+     */
-+    public function testCreateOrdersWithBraintreePaypal()
-+    {
-+        $this->adapter->method('sale')
-+            ->willReturn(
-+                $this->getTransactionPaypalStub()
-+            );
-+        $this->createOrders();
-+    }
-+
-+    /**
-+     * Creates orders for multishipping checkout flow.
-+     *
-+     * @return void
-+     */
-+    private function createOrders()
-+    {
-+        $expectedPlacedOrdersNumber = 3;
-+        $quote = $this->getQuote('multishipping_quote_id_braintree');
-+
-+        /** @var CheckoutSession $session */
-+        $session = $this->objectManager->get(CheckoutSession::class);
-+        $session->replaceQuote($quote);
-+
-+        $this->model->createOrders();
-+
-+        $orderList = $this->getOrderList((int)$quote->getId());
-+        self::assertCount(
-+            $expectedPlacedOrdersNumber,
-+            $orderList,
-+            'Total successfully placed orders number mismatch'
-+        );
-+    }
-+
-+    /**
-+     * Creates stub for Braintree capture Transaction.
-+     *
-+     * @return Successful
-+     */
-+    private function getTransactionStub(): Successful
-+    {
-+        $transaction = $this->getMockBuilder(Transaction::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $transaction->status = 'submitted_for_settlement';
-+        $transaction->creditCard = [
-+            'last4' => '1111',
-+            'cardType' => 'Visa',
-+            'expirationMonth' => '12',
-+            'expirationYear' => '2021'
-+        ];
-+
-+        $creditCardDetails = new \stdClass();
-+        $creditCardDetails->token = '4fdg';
-+        $creditCardDetails->expirationMonth = '12';
-+        $creditCardDetails->expirationYear = '2021';
-+        $creditCardDetails->cardType = 'Visa';
-+        $creditCardDetails->last4 = '1111';
-+        $creditCardDetails->expirationDate = '12/2021';
-+        $transaction->creditCardDetails = $creditCardDetails;
-+
-+        $response = new Successful();
-+        $response->success = true;
-+        $response->transaction = $transaction;
-+
-+        return $response;
-+    }
-+
-+    /**
-+     * Creates stub for BraintreePaypal capture Transaction.
-+     *
-+     * @return Successful
-+     */
-+    private function getTransactionPaypalStub(): Successful
-+    {
-+        $transaction = $this->getMockBuilder(Transaction::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $transaction->status = 'submitted_for_settlement';
-+        $transaction->paypal = [
-+            'token' => 'fchxqx',
-+            'payerEmail' => 'payer@example.com',
-+            'paymentId' => 'PAY-33ac47a28e7f54791f6cda45',
-+        ];
-+        $paypalDetails = new \stdClass();
-+        $paypalDetails->token = 'fchxqx';
-+        $paypalDetails->payerEmail = 'payer@example.com';
-+        $paypalDetails->paymentId = '33ac47a28e7f54791f6cda45';
-+        $transaction->paypalDetails = $paypalDetails;
-+
-+        $response = new Successful();
-+        $response->success = true;
-+        $response->transaction = $transaction;
-+
-+        return $response;
-+    }
-+
-+    /**
-+     * Retrieves quote by reserved order id.
-+     *
-+     * @param string $reservedOrderId
-+     * @return Quote
-+     */
-+    private function getQuote(string $reservedOrderId): Quote
-+    {
-+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
-+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
-+            ->create();
-+
-+        /** @var CartRepositoryInterface $quoteRepository */
-+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
-+        $items = $quoteRepository->getList($searchCriteria)->getItems();
-+
-+        return array_pop($items);
-+    }
-+
-+    /**
-+     * Get list of orders by quote id.
-+     *
-+     * @param int $quoteId
-+     * @return array
-+     */
-+    private function getOrderList(int $quoteId): array
-+    {
-+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
-+        $searchCriteria = $searchCriteriaBuilder->addFilter('quote_id', $quoteId)
-+            ->create();
-+
-+        /** @var OrderRepositoryInterface $orderRepository */
-+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
-+        return $orderRepository->getList($searchCriteria)->getItems();
-+    }
-+
-+    /**
-+     * Returns GetPaymentNonceCommand command mock.
-+     *
-+     * @return MockObject
-+     */
-+    private function getPaymentNonceMock(): MockObject
-+    {
-+        $commandResult = $this->createMock(CommandResultInterface::class);
-+        $commandResult->method('get')
-+            ->willReturn(['paymentMethodNonce' => 'testNonce']);
-+        $paymentNonce = $this->createMock(GetPaymentNonceCommand::class);
-+        $paymentNonce->method('execute')
-+            ->willReturn($commandResult);
-+
-+        return $paymentNonce;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php
-index 35c47028293..ce324ed774d 100644
---- a/dev/tests/integration/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php
-@@ -11,6 +11,7 @@ namespace Magento\Bundle\Block\Catalog\Product\View\Type;
-  * Test for Magento\Bundle\Block\Catalog\Product\View\Type\Bundle
-  *
-  * @magentoDataFixture Magento/Bundle/_files/product.php
-+ * @magentoDbIsolation disabled
-  * @magentoAppArea frontend
-  */
- class BundleTest extends \PHPUnit\Framework\TestCase
-@@ -73,6 +74,9 @@ class BundleTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(5, $selection['prices']['finalPrice']['amount']);
-     }
- 
-+    /**
-+     * Tear Down
-+     */
-     protected function tearDown()
-     {
-         $this->objectManager->get(\Magento\Framework\Registry::class)->unregister('product');
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Controller/ProductTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Controller/ProductTest.php
-index 1f2f08f3450..65a9b1234ef 100644
---- a/dev/tests/integration/testsuite/Magento/Bundle/Controller/ProductTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/Controller/ProductTest.php
-@@ -13,6 +13,7 @@ class ProductTest extends \Magento\TestFramework\TestCase\AbstractController
- {
-     /**
-      * @magentoDataFixture Magento/Bundle/_files/product.php
-+     * @magentoDbIsolation disabled
-      */
-     public function testViewAction()
-     {
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Plugin/Frontend/ProductTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Plugin/Frontend/ProductTest.php
-new file mode 100644
-index 00000000000..91dcd5f3e8d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Plugin/Frontend/ProductTest.php
-@@ -0,0 +1,71 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Bundle\Model\Plugin\Frontend;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\Interception\PluginList;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Test bundle fronted product plugin adds children products ids to bundle product identities.
-+ */
-+class ProductTest extends TestCase
-+{
-+    /**
-+     * Check, product plugin is registered for storefront.
-+     *
-+     * @magentoAppArea frontend
-+     * @return void
-+     */
-+    public function testProductIsRegistered(): void
-+    {
-+        $pluginInfo = Bootstrap::getObjectManager()->get(PluginList::class)
-+            ->get(\Magento\Catalog\Model\Product::class, []);
-+        $this->assertSame(Product::class, $pluginInfo['bundle']['instance']);
-+    }
-+
-+    /**
-+     * Check plugin will add children ids to bundle product identities on storefront.
-+     *
-+     * @magentoDataFixture Magento/Bundle/_files/product.php
-+     * @magentoAppArea frontend
-+     * @return void
-+     */
-+    public function testGetIdentitiesForBundleProductOnStorefront(): void
-+    {
-+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+        $bundleProduct = $productRepository->get('bundle-product');
-+        $simpleProduct = $productRepository->get('simple');
-+        $expectedIdentities = [
-+            'cat_p_' . $bundleProduct->getId(),
-+            'cat_p',
-+            'cat_p_' . $simpleProduct->getId(),
-+
-+        ];
-+        $this->assertEquals($expectedIdentities, $bundleProduct->getIdentities());
-+    }
-+
-+    /**
-+     * Check plugin won't add children ids to bundle product identities in admin area.
-+     *
-+     * @magentoDataFixture Magento/Bundle/_files/product.php
-+     * @magentoAppArea adminhtml
-+     * @return void
-+     */
-+    public function testGetIdentitiesForBundleProductInAdminArea(): void
-+    {
-+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+        $bundleProduct = $productRepository->get('bundle-product');
-+        $expectedIdentities = [
-+            'cat_p_' . $bundleProduct->getId(),
-+        ];
-+        $this->assertEquals($expectedIdentities, $bundleProduct->getIdentities());
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorWithDimensionTest.php
-new file mode 100644
-index 00000000000..b008fe4003c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorWithDimensionTest.php
-@@ -0,0 +1,346 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Bundle\Model\Product;
-+
-+/**
-+ * @magentoDbIsolation disabled
-+ * @magentoAppIsolation enabled
-+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
-+ * @group indexer_dimension
-+ */
-+class DynamicBundlePriceCalculatorWithDimensionTest extends BundlePriceAbstract
-+{
-+    /**
-+     * @param array $strategyModifiers
-+     * @param array $expectedResults
-+     * @dataProvider getTestCases
-+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
-+     */
-+    public function testPriceForDynamicBundle(array $strategyModifiers, array $expectedResults)
-+    {
-+        $this->prepareFixture($strategyModifiers, 'bundle_product');
-+        $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
-+
-+        /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
-+        $priceInfo = $bundleProduct->getPriceInfo();
-+        $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
-+
-+        $this->assertEquals(
-+            $expectedResults['minimalPrice'],
-+            $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
-+            'Failed to check minimal price on product'
-+        );
-+        $this->assertEquals(
-+            $expectedResults['maximalPrice'],
-+            $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
-+            'Failed to check maximal price on product'
-+        );
-+
-+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
-+            ->addFieldToFilter('sku', 'bundle_product')
-+            ->addPriceData()
-+            ->load()
-+            ->getFirstItem();
-+
-+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
-+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
-+    }
-+
-+    /**
-+     * @param array $strategyModifiers
-+     * @param array $expectedResults
-+     * @dataProvider getTestCases
-+     * @magentoConfigFixture current_store catalog/price/scope 1
-+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
-+     */
-+    public function testPriceForDynamicBundleInWebsiteScope(array $strategyModifiers, array $expectedResults)
-+    {
-+        $this->prepareFixture($strategyModifiers, 'bundle_product');
-+        $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
-+
-+        /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
-+        $priceInfo = $bundleProduct->getPriceInfo();
-+        $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
-+
-+        $this->assertEquals(
-+            $expectedResults['minimalPrice'],
-+            $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
-+            'Failed to check minimal price on product'
-+        );
-+        $this->assertEquals(
-+            $expectedResults['maximalPrice'],
-+            $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
-+            'Failed to check maximal price on product'
-+        );
-+
-+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
-+            ->addFieldToFilter('sku', 'bundle_product')
-+            ->addPriceData()
-+            ->load()
-+            ->getFirstItem();
-+
-+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
-+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
-+    }
-+
-+    /**
-+     * Test cases for current test
-+     * @return array
-+     */
-+    public function getTestCases()
-+    {
-+        return [
-+            '#1 Testing price for dynamic bundle product with one simple' => [
-+                'strategy' => $this->getBundleConfiguration1(),
-+                'expectedResults' => [
-+                    // just price from simple1
-+                    'minimalPrice' => 10,
-+                    // just price from simple1
-+                    'maximalPrice' => 10
-+                ]
-+            ],
-+
-+            '#2 Testing price for dynamic bundle product with three simples and different qty' => [
-+                'strategy' => $this->getBundleConfiguration2(),
-+                'expectedResults' => [
-+                    // min price from simples 3*10 or 30
-+                    'minimalPrice' => 30,
-+                    // (3 * 10) + (2 * 20) + 30
-+                    'maximalPrice' => 100
-+                ]
-+            ],
-+
-+            '#3 Testing price for dynamic bundle product with four simples and different price' => [
-+                'strategy' => $this->getBundleConfiguration3(),
-+                'expectedResults' => [
-+                    //  10
-+                    'minimalPrice' => 10,
-+                    // 10 + 20 + 30
-+                    'maximalPrice' => 60
-+                ]
-+            ],
-+
-+            '#4 Testing price for dynamic bundle with two non required options' => [
-+                'strategy' => $this->getBundleConfiguration4(),
-+                'expectedResults' => [
-+                    // 1 * 10
-+                    'minimalPrice' => 10,
-+                    // 3 * 20 + 1 * 10 + 3 * 20
-+                    'maximalPrice' => 130
-+                ]
-+            ],
-+
-+            '#5 Testing price for dynamic bundle with two required options' => [
-+                'strategy' => $this->getBundleConfiguration5(),
-+                'expectedResults' => [
-+                    // 1 * 10 + 1 * 10
-+                    'minimalPrice' => 20,
-+                    // 3 * 20 + 1 * 10 + 3 * 20
-+                    'maximalPrice' => 130
-+                ]
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Dynamic bundle product with one simple
-+     *
-+     * @return array
-+     */
-+    private function getBundleConfiguration1()
-+    {
-+        $optionsData = [
-+            [
-+                'title' => 'op1',
-+                'required' => true,
-+                'type' => 'checkbox',
-+                'links' => [
-+                    [
-+                        'sku' => 'simple1',
-+                        'qty' => 1,
-+                    ],
-+                ]
-+            ],
-+        ];
-+
-+        return [
-+            [
-+                'modifierName' => 'addSimpleProduct',
-+                'data' => [$optionsData]
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Dynamic bundle product with three simples and different qty
-+     *
-+     * @return array
-+     */
-+    private function getBundleConfiguration2()
-+    {
-+        $optionsData = [
-+            [
-+                'title' => 'op1',
-+                'required' => true,
-+                'type' => 'checkbox',
-+                'links' => [
-+                    [
-+                        'sku' => 'simple1',
-+                        'qty' => 3,
-+                    ],
-+                    [
-+                        'sku' => 'simple2',
-+                        'qty' => 2,
-+                    ],
-+                    [
-+                        'sku' => 'simple3',
-+                        'qty' => 1,
-+                    ],
-+                ]
-+            ]
-+        ];
-+
-+        return [
-+            [
-+                'modifierName' => 'addSimpleProduct',
-+                'data' => [$optionsData]
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Dynamic bundle product with three simples and different price
-+     *
-+     * @return array
-+     */
-+    private function getBundleConfiguration3()
-+    {
-+        $optionsData = [
-+            [
-+                'title' => 'op1',
-+                'required' => true,
-+                'type' => 'checkbox',
-+                'links' => [
-+                    [
-+                        'sku' => 'simple1',
-+                        'qty' => 1,
-+                    ],
-+                    [
-+                        'sku' => 'simple2',
-+                        'qty' => 1,
-+                    ],
-+                    [
-+                        'sku' => 'simple3',
-+                        'qty' => 1,
-+                    ]
-+                ]
-+            ]
-+        ];
-+
-+        return [
-+            [
-+                'modifierName' => 'addSimpleProduct',
-+                'data' => [$optionsData]
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Dynamic bundle with two non required options and special price
-+     * @return array
-+     */
-+    private function getBundleConfiguration4()
-+    {
-+        $optionsData = [
-+            [
-+                'title' => 'Op1',
-+                'required' => false,
-+                'type' => 'radio',
-+                'links' => [
-+                    [
-+                        'sku' => 'simple1',
-+                        'qty' => 1,
-+                    ],
-+                    [
-+                        'sku' => 'simple2',
-+                        'qty' => 3,
-+                    ],
-+                ]
-+            ],
-+            [
-+                'title' => 'Op2',
-+                'required' => false,
-+                'type' => 'checkbox',
-+                'links' => [
-+                    [
-+                        'sku' => 'simple1',
-+                        'qty' => 1,
-+                    ],
-+                    [
-+                        'sku' => 'simple2',
-+                        'qty' => 3,
-+                    ],
-+                ]
-+            ]
-+        ];
-+
-+        return [
-+            [
-+                'modifierName' => 'addSimpleProduct',
-+                'data' => [$optionsData]
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Dynamic bundle with two required options
-+     * @return array
-+     */
-+    private function getBundleConfiguration5()
-+    {
-+        $optionsData = [
-+            [
-+                'title' => 'Op1',
-+                'required' => true,
-+                'type' => 'radio',
-+                'links' => [
-+                    [
-+                        'sku' => 'simple1',
-+                        'qty' => 1,
-+                    ],
-+                    [
-+                        'sku' => 'simple2',
-+                        'qty' => 3,
-+                    ],
-+                ]
-+            ],
-+            [
-+                'title' => 'Op2',
-+                'required' => true,
-+                'type' => 'checkbox',
-+                'links' => [
-+                    [
-+                        'sku' => 'simple1',
-+                        'qty' => 1,
-+                    ],
-+                    [
-+                        'sku' => 'simple2',
-+                        'qty' => 3,
-+                    ],
-+                ]
-+            ]
-+        ];
-+
-+        return [
-+            [
-+                'modifierName' => 'addSimpleProduct',
-+                'data' => [$optionsData]
-+            ],
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithCatalogPriceRuleCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithCatalogPriceRuleCalculatorTest.php
-index 3c756041eac..0162f70c76b 100644
---- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithCatalogPriceRuleCalculatorTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithCatalogPriceRuleCalculatorTest.php
-@@ -10,6 +10,7 @@ namespace Magento\Bundle\Model\Product;
-  * @codingStandardsIgnoreStart
-  * @magentoDataFixtureBeforeTransaction Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_catalog_rule.php
-  * @codingStandardsIgnoreEnd
-+ * @magentoDbIsolation enabled
-  * @magentoAppArea frontend
-  */
- class DynamicBundleWithCatalogPriceRuleCalculatorTest extends BundlePriceAbstract
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php
-new file mode 100644
-index 00000000000..e9cb2f2d6c9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php
-@@ -0,0 +1,416 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Bundle\Model\Product;
-+
-+use \Magento\Bundle\Api\Data\LinkInterface;
-+
-+/**
-+ * @magentoDbIsolation disabled
-+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
-+ * @group indexer_dimension
-+ */
-+class FixedBundlePriceCalculatorWithDimensionTest extends BundlePriceAbstract
-+{
-+    /**
-+     * @param array $strategyModifiers
-+     * @param array $expectedResults
-+     * @dataProvider getTestCases
-+     * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
-+     * @magentoDbIsolation disabled
-+     */
-+    public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
-+    {
-+        $this->prepareFixture($strategyModifiers, 'bundle_product');
-+        $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
-+
-+        /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
-+        $priceInfo = $bundleProduct->getPriceInfo();
-+        $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
-+
-+        $this->assertEquals(
-+            $expectedResults['minimalPrice'],
-+            $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
-+            'Failed to check minimal price on product'
-+        );
-+        $this->assertEquals(
-+            $expectedResults['maximalPrice'],
-+            $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
-+            'Failed to check maximal price on product'
-+        );
-+
-+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
-+            ->addIdFilter([42])
-+            ->addPriceData()
-+            ->load()
-+            ->getFirstItem();
-+
-+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
-+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
-+    }
-+
-+    /**
-+     * @param array $strategyModifiers
-+     * @param array $expectedResults
-+     * @dataProvider getTestCases
-+     * @magentoAppIsolation enabled
-+     * @magentoConfigFixture current_store catalog/price/scope 1
-+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
-+     * @magentoDbIsolation disabled
-+     */
-+    public function testPriceForFixedBundleInWebsiteScope(array $strategyModifiers, array $expectedResults)
-+    {
-+        $this->prepareFixture($strategyModifiers, 'bundle_product');
-+        $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
-+
-+        /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
-+        $priceInfo = $bundleProduct->getPriceInfo();
-+        $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
-+
-+        $this->assertEquals(
-+            $expectedResults['minimalPrice'],
-+            $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
-+            'Failed to check minimal price on product'
-+        );
-+        $this->assertEquals(
-+            $expectedResults['maximalPrice'],
-+            $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
-+            'Failed to check maximal price on product'
-+        );
-+
-+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
-+            ->addFieldToFilter('sku', 'bundle_product')
-+            ->addPriceData()
-+            ->load()
-+            ->getFirstItem();
-+
-+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
-+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
-+    }
-+
-+    /**
-+     * Test cases for current test
-+     * @return array
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function getTestCases()
-+    {
-+        return [
-+            '#1 Testing price for fixed bundle product with one simple' => [
-+                'strategy' => $this->getProductWithOneSimple(),
-+                'expectedResults' => [
-+                    //  110 + 10 (price from simple1)
-+                    'minimalPrice' => 120,
-+                    // 110 + 10 (sum of simple price)
-+                    'maximalPrice' => 120,
-+                ]
-+            ],
-+
-+            '#2 Testing price for fixed bundle product with three simples and different qty' => [
-+                'strategy' => $this->getProductWithDifferentQty(),
-+                'expectedResults' => [
-+                    // 110 + 10 (min price from simples)
-+                    'minimalPrice' => 120,
-+                    //  110 + (3 * 10) + (2 * 10) + 10
-+                    'maximalPrice' => 170,
-+                ]
-+            ],
-+
-+            '#3 Testing price for fixed bundle product with three simples and different price' => [
-+                'strategy' => $this->getProductWithDifferentPrice(),
-+                'expectedResults' => [
-+                    //  110 + 10
-+                    'minimalPrice' => 120,
-+                    // 110 + 60
-+                    'maximalPrice' => 170,
-+                ]
-+            ],
-+
-+            '#4 Testing price for fixed bundle product with three simples' => [
-+                'strategy' => $this->getProductWithSamePrice(),
-+                'expectedResults' => [
-+                    //  110 + 10
-+                    'minimalPrice' => 120,
-+                    // 110 + 30
-+                    'maximalPrice' => 140,
-+                ]
-+            ],
-+
-+            '
-+                #5 Testing price for fixed bundle product 
-+                with fixed sub items, fixed options and without any discounts
-+            ' => [
-+                'strategy' => $this->getBundleConfiguration3(
-+                    LinkInterface::PRICE_TYPE_FIXED,
-+                    self::CUSTOM_OPTION_PRICE_TYPE_FIXED
-+                ),
-+                'expectedResults' => [
-+                    // 110 + 1 * 20 + 100
-+                    'minimalPrice' => 230,
-+
-+                    // 110 + 1 * 20 + 100
-+                    'maximalPrice' => 230,
-+                ]
-+            ],
-+
-+            '
-+                #6 Testing price for fixed bundle product 
-+                with percent sub items, percent options and without any discounts
-+            ' => [
-+                'strategy' => $this->getBundleConfiguration3(
-+                    LinkInterface::PRICE_TYPE_PERCENT,
-+                    self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
-+                ),
-+                'expectedResults' => [
-+                    // 110 + 110 * 0.2 + 110 * 1
-+                    'minimalPrice' => 242,
-+
-+                    // 110 + 110 * 0.2 + 110 * 1
-+                    'maximalPrice' => 242,
-+                ]
-+            ],
-+
-+            '
-+                #7 Testing price for fixed bundle product 
-+                with fixed sub items, percent options and without any discounts
-+            ' => [
-+                'strategy' => $this->getBundleConfiguration3(
-+                    LinkInterface::PRICE_TYPE_FIXED,
-+                    self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
-+                ),
-+                'expectedResults' => [
-+                    // 110 + 1 * 20 + 110 * 1
-+                    'minimalPrice' => 240,
-+
-+                    // 110 + 1 * 20 + 110 * 1
-+                    'maximalPrice' => 240,
-+                ]
-+            ],
-+
-+            '
-+                #8 Testing price for fixed bundle product 
-+                with percent sub items, fixed options and without any discounts
-+            ' => [
-+                'strategy' => $this->getBundleConfiguration3(
-+                    LinkInterface::PRICE_TYPE_PERCENT,
-+                    self::CUSTOM_OPTION_PRICE_TYPE_FIXED
-+                ),
-+                'expectedResults' => [
-+                    // 110 + 110 * 0.2 + 100
-+                    'minimalPrice' => 232,
-+
-+                    // 110 + 110 * 0.2 + 100
-+                    'maximalPrice' => 232,
-+                ]
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Fixed bundle product with one simple
-+     * @return array
-+     */
-+    private function getProductWithOneSimple()
-+    {
-+        $optionsData = [
-+            [
-+                'title' => 'Op1',
-+                'required' => true,
-+                'type' => 'checkbox',
-+                'links' => [
-+                    [
-+                        'sku' => 'simple1',
-+                        'price' => 10,
-+                        'qty' => 1,
-+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
-+                    ],
-+                ]
-+            ],
-+        ];
-+
-+        return [
-+            [
-+                'modifierName' => 'addSimpleProduct',
-+                'data' => [$optionsData]
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Fixed bundle product with three simples and different qty
-+     * @return array
-+     */
-+    private function getProductWithDifferentQty()
-+    {
-+        $optionsData = [
-+            [
-+                'title' => 'Op1',
-+                'required' => true,
-+                'type' => 'checkbox',
-+                'links' => [
-+                    [
-+                        'sku' => 'simple1',
-+                        'price' => 10,
-+                        'qty' => 3,
-+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
-+                    ],
-+                    [
-+                        'sku' => 'simple2',
-+                        'price' => 10,
-+                        'qty' => 2,
-+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
-+                    ],
-+                    [
-+                        'sku' => 'simple3',
-+                        'price' => 10,
-+                        'qty' => 1,
-+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
-+                    ],
-+                ]
-+            ]
-+        ];
-+
-+        return [
-+            [
-+                'modifierName' => 'addSimpleProduct',
-+                'data' => [$optionsData]
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Fixed bundle product with three simples and different price
-+     * @return array
-+     */
-+    private function getProductWithSamePrice()
-+    {
-+        $optionsData = [
-+            [
-+                'title' => 'Op1',
-+                'required' => true,
-+                'type' => 'checkbox',
-+                'links' => [
-+                    [
-+                        'sku' => 'simple1',
-+                        'price' => 10,
-+                        'qty' => 1,
-+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
-+                    ],
-+                    [
-+                        'sku' => 'simple2',
-+                        'price' => 10,
-+                        'qty' => 1,
-+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
-+                    ],
-+                    [
-+                        'sku' => 'simple3',
-+                        'price' => 10,
-+                        'qty' => 1,
-+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
-+                    ]
-+                ]
-+            ]
-+        ];
-+
-+        return [
-+            [
-+                'modifierName' => 'addSimpleProduct',
-+                'data' => [$optionsData]
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Fixed bundle product with three simples
-+     * @return array
-+     */
-+    private function getProductWithDifferentPrice()
-+    {
-+        $optionsData = [
-+            [
-+                'title' => 'Op1',
-+                'required' => true,
-+                'type' => 'checkbox',
-+                'links' => [
-+                    [
-+                        'sku' => 'simple1',
-+                        'price' => 10,
-+                        'qty' => 1,
-+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
-+                    ],
-+                    [
-+                        'sku' => 'simple2',
-+                        'price' => 20,
-+                        'qty' => 1,
-+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
-+                    ],
-+                    [
-+                        'sku' => 'simple3',
-+                        'price' => 30,
-+                        'qty' => 1,
-+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
-+                    ]
-+                ]
-+            ]
-+        ];
-+
-+        return [
-+            [
-+                'modifierName' => 'addSimpleProduct',
-+                'data' => [$optionsData]
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Fixed bundle product with required option, custom option and without any discounts
-+     * @param string $selectionsPriceType
-+     * @param string $customOptionsPriceType
-+     * @return array
-+     */
-+    private function getBundleConfiguration3($selectionsPriceType, $customOptionsPriceType)
-+    {
-+        $optionsData = [
-+            [
-+                'title' => 'Op1',
-+                'required' => true,
-+                'type' => 'checkbox',
-+                'links' => [
-+                    [
-+                        'sku' => 'simple1',
-+                        'qty' => 1,
-+                        'price' => 20,
-+                        'price_type' => $selectionsPriceType
-+                    ],
-+                ]
-+            ],
-+        ];
-+
-+        $customOptionsData = [
-+            [
-+                'price_type' => $customOptionsPriceType,
-+                'title' => 'Test Field',
-+                'type' => 'field',
-+                'is_require' => 1,
-+                'price' => 100,
-+                'sku' => '1-text',
-+            ]
-+        ];
-+
-+        return [
-+            [
-+                'modifierName' => 'addSimpleProduct',
-+                'data' => [$optionsData]
-+            ],
-+            [
-+                'modifierName' => 'addCustomOption',
-+                'data' => [$customOptionsData]
-+            ],
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithSpecialPriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithSpecialPriceCalculatorTest.php
-index 1fcc205ddc3..d02f84e1641 100644
---- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithSpecialPriceCalculatorTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithSpecialPriceCalculatorTest.php
-@@ -23,6 +23,9 @@ class FixedBundleWithSpecialPriceCalculatorTest extends BundlePriceAbstract
-      */
-     public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
-     {
-+        if (empty($strategyModifiers)) {
-+            $this->markTestSkipped('Unskip after fixing https://github.com/magento-engcom/msi/issues/1398');
-+        }
-         $this->prepareFixture($strategyModifiers, 'bundle_product');
-         $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithTierPriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithTierPriceCalculatorTest.php
-index 3285b1e6450..74379524621 100644
---- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithTierPriceCalculatorTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithTierPriceCalculatorTest.php
-@@ -38,6 +38,10 @@ class FixedBundleWithTierPriceCalculatorTest extends BundlePriceAbstract
-         $this->prepareFixture($strategyModifiers, 'bundle_product');
-         $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
- 
-+        if (empty($bundleProduct->getOptions())) {
-+            $this->markTestSkipped('Unskip after fixing https://github.com/magento-engcom/msi/issues/1398');
-+        }
-+
-         /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
-         $priceInfo = $bundleProduct->getPriceInfo();
-         $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/OptionListTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/OptionListTest.php
-index 55f8821d708..47f50dc6d99 100644
---- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/OptionListTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/OptionListTest.php
-@@ -21,6 +21,9 @@ class OptionListTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $objectManager;
- 
-+    /**
-+     * Set up
-+     */
-     protected function setUp()
-     {
-         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-@@ -28,6 +31,7 @@ class OptionListTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @magentoDataFixture Magento/Bundle/_files/product.php
-+     * @magentoDbIsolation disabled
-      */
-     public function testGetItems()
-     {
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceTest.php
-index 2a68ff48e5f..4a5757aae31 100644
---- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceTest.php
-@@ -6,7 +6,7 @@
- namespace Magento\Bundle\Model\Product;
- 
- /**
-- * @magentoDataFixture Magento/Bundle/_files/product_with_tier_pricing.php
-+ * Class to test bundle prices
-  */
- class PriceTest extends \PHPUnit\Framework\TestCase
- {
-@@ -22,6 +22,9 @@ class PriceTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * @magentoDataFixture Magento/Bundle/_files/product_with_tier_pricing.php
-+     */
-     public function testGetTierPrice()
-     {
-         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-@@ -37,4 +40,50 @@ class PriceTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(20.0, $this->_model->getTierPrice(4, $product));
-         $this->assertEquals(30.0, $this->_model->getTierPrice(5, $product));
-     }
-+
-+    /**
-+     * Test calculation final price for bundle product with tire price in simple product
-+     *
-+     * @param float $bundleQty
-+     * @param float $selectionQty
-+     * @param float $finalPrice
-+     * @magentoDataFixture Magento/Bundle/_files/product_with_simple_tier_pricing.php
-+     * @dataProvider getSelectionFinalTotalPriceWithSimpleTierPriceDataProvider
-+     */
-+    public function testGetSelectionFinalTotalPriceWithSimpleTierPrice(
-+        float $bundleQty,
-+        float $selectionQty,
-+        float $finalPrice
-+    ) {
-+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+            ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+        $bundleProduct = $productRepository->get('bundle-product');
-+        $simpleProduct = $productRepository->get('simple');
-+        $simpleProduct->setCustomerGroupId(\Magento\Customer\Model\Group::CUST_GROUP_ALL);
-+
-+        $this->assertEquals(
-+            $finalPrice,
-+            $this->_model->getSelectionFinalTotalPrice(
-+                $bundleProduct,
-+                $simpleProduct,
-+                $bundleQty,
-+                $selectionQty,
-+                false
-+            ),
-+            'Tier price calculation for Simple product is wrong'
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getSelectionFinalTotalPriceWithSimpleTierPriceDataProvider(): array
-+    {
-+        return [
-+            [1, 1, 10],
-+            [2, 1, 8],
-+            [5, 1, 5],
-+        ];
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceWithDimensionTest.php
-new file mode 100644
-index 00000000000..bc25c3fa293
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceWithDimensionTest.php
-@@ -0,0 +1,51 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Bundle\Model\Product;
-+
-+/**
-+ * @magentoDbIsolation disabled
-+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
-+ * @group indexer_dimension
-+ * @magentoDataFixture Magento/Bundle/_files/product_with_tier_pricing.php
-+ */
-+class PriceWithDimensionTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Bundle\Model\Product\Price
-+     */
-+    protected $_model;
-+
-+    /**
-+     * Set up
-+     */
-+    protected function setUp()
-+    {
-+        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+            \Magento\Bundle\Model\Product\Price::class
-+        );
-+    }
-+
-+    /**
-+     * Get tier price
-+     */
-+    public function testGetTierPrice()
-+    {
-+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+            ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+        $product = $productRepository->get('bundle-product');
-+        // fixture
-+
-+        // Note that this is really not the "tier price" but the "tier discount percentage"
-+        // so it is expected to be increasing instead of decreasing
-+        $this->assertEquals(8.0, $this->_model->getTierPrice(2, $product));
-+        $this->assertEquals(20.0, $this->_model->getTierPrice(3, $product));
-+        $this->assertEquals(20.0, $this->_model->getTierPrice(4, $product));
-+        $this->assertEquals(30.0, $this->_model->getTierPrice(5, $product));
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
-index 9654df29bcb..4303577e6c4 100644
---- a/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
-@@ -17,12 +17,16 @@ use Magento\Catalog\Model\Product;
- use Magento\Catalog\Model\Product\Attribute\Source\Status;
- use Magento\Catalog\Model\Product\Type;
- use Magento\Catalog\Model\Product\Visibility;
-+use Magento\CatalogInventory\Model\Stock;
- use Magento\Framework\ObjectManagerInterface;
- use Magento\Store\Api\StoreRepositoryInterface;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\TestFramework\Entity;
- use Magento\TestFramework\Helper\Bootstrap;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class ProductTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -35,6 +39,9 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-      */
-     private $objectManager;
- 
-+    /**
-+     * @return void
-+     */
-     protected function setUp()
-     {
-         $this->objectManager = Bootstrap::getObjectManager();
-@@ -43,6 +50,13 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-         $this->model->setTypeId(Type::TYPE_BUNDLE);
-     }
- 
-+    /**
-+     * Tests Retrieve ans set type instance of the product
-+     *
-+     * @see \Magento\Catalog\Model\Product::getTypeInstance
-+     * @see \Magento\Catalog\Model\Product::setTypeInstance
-+     * @return void
-+     */
-     public function testGetSetTypeInstance()
-     {
-         // model getter
-@@ -82,6 +96,12 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-         $crud->testCrud();
-     }
- 
-+    /**
-+     * Tests Get product price model
-+     *
-+     * @see \Magento\Catalog\Model\Product::getPriceModel
-+     * @return void
-+     */
-     public function testGetPriceModel()
-     {
-         $this->model->setTypeId(Type::TYPE_BUNDLE);
-@@ -90,6 +110,12 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($type, $this->model->getPriceModel());
-     }
- 
-+    /**
-+     * Tests Check is product composite
-+     *
-+     * @see \Magento\Catalog\Model\Product::isComposite
-+     * @return void
-+     */
-     public function testIsComposite()
-     {
-         $this->assertTrue($this->model->isComposite());
-@@ -124,4 +150,122 @@ class ProductTest extends \PHPUnit\Framework\TestCase
- 
-         self::assertEquals($store->getId(), $updatedBundle->getStoreId());
-     }
-+
-+    /**
-+     * @param float $selectionQty
-+     * @param float $qty
-+     * @param int $isInStock
-+     * @param bool $manageStock
-+     * @param int $backorders
-+     * @param bool $isSalable
-+     * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/Bundle/_files/product.php
-+     * @dataProvider stockConfigDataProvider
-+     * @covers \Magento\Catalog\Model\Product::isSalable
-+     */
-+    public function testIsSalable(
-+        float $selectionQty,
-+        float $qty,
-+        int $isInStock,
-+        bool $manageStock,
-+        int $backorders,
-+        bool $isSalable
-+    ) {
-+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-+
-+        $child = $productRepository->get('simple');
-+        $childStockItem = $child->getExtensionAttributes()->getStockItem();
-+        $childStockItem->setQty($qty);
-+        $childStockItem->setIsInStock($isInStock);
-+        $childStockItem->setUseConfigManageStock(false);
-+        $childStockItem->setManageStock($manageStock);
-+        $childStockItem->setUseConfigBackorders(false);
-+        $childStockItem->setBackorders($backorders);
-+        $productRepository->save($child);
-+
-+        /** @var \Magento\Catalog\Model\Product $bundle */
-+        $bundle = $productRepository->get('bundle-product');
-+        foreach ($bundle->getExtensionAttributes()->getBundleProductOptions() as $productOption) {
-+            foreach ($productOption->getProductLinks() as $productLink) {
-+                $productLink->setCanChangeQuantity(0);
-+                $productLink->setQty($selectionQty);
-+            }
-+        }
-+        $productRepository->save($bundle);
-+
-+        $this->assertEquals($isSalable, $bundle->isSalable());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function stockConfigDataProvider(): array
-+    {
-+        $qtyVars = [0, 10];
-+        $isInStockVars = [
-+            Stock::STOCK_OUT_OF_STOCK,
-+            Stock::STOCK_IN_STOCK,
-+        ];
-+        $manageStockVars = [false, true];
-+        $backordersVars = [
-+            Stock::BACKORDERS_NO,
-+            Stock::BACKORDERS_YES_NONOTIFY,
-+            Stock::BACKORDERS_YES_NOTIFY,
-+        ];
-+        $selectionQtyVars = [5, 10, 15];
-+
-+        $variations = [];
-+        foreach ($qtyVars as $qty) {
-+            foreach ($isInStockVars as $isInStock) {
-+                foreach ($manageStockVars as $manageStock) {
-+                    foreach ($backordersVars as $backorders) {
-+                        foreach ($selectionQtyVars as $selectionQty) {
-+                            $variationName = "selectionQty: {$selectionQty}"
-+                                . " qty: {$qty}"
-+                                . " isInStock: {$isInStock}"
-+                                . " manageStock: {$manageStock}"
-+                                . " backorders: {$backorders}";
-+                            $isSalable = $this->checkIsSalable(
-+                                $selectionQty,
-+                                $qty,
-+                                $isInStock,
-+                                $manageStock,
-+                                $backorders
-+                            );
-+
-+                            $variations[$variationName] = [
-+                                $selectionQty,
-+                                $qty,
-+                                $isInStock,
-+                                $manageStock,
-+                                $backorders,
-+                                $isSalable
-+                            ];
-+                        }
-+                    }
-+                }
-+            }
-+        }
-+
-+        return $variations;
-+    }
-+
-+    /**
-+     * @param float $selectionQty
-+     * @param float $qty
-+     * @param int $isInStock
-+     * @param bool $manageStock
-+     * @param int $backorders
-+     * @return bool
-+     * @see \Magento\Bundle\Model\ResourceModel\Selection\Collection::addQuantityFilter
-+     */
-+    private function checkIsSalable(
-+        float $selectionQty,
-+        float $qty,
-+        int $isInStock,
-+        bool $manageStock,
-+        int $backorders
-+    ): bool {
-+        return !$manageStock || ($isInStock && ($backorders || $selectionQty <= $qty));
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
-new file mode 100644
-index 00000000000..30f09784807
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
-@@ -0,0 +1,43 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
-+
-+/** @var $productFactory Magento\Catalog\Model\ProductFactory */
-+$productFactory = $objectManager->create(\Magento\Catalog\Model\ProductFactory::class);
-+/** @var $bundleProduct \Magento\Catalog\Model\Product */
-+$bundleProduct = $productFactory->create();
-+$bundleProduct->setTypeId('bundle')
-+    ->setAttributeSetId($product->getDefaultAttributeSetId())
-+    ->setWebsiteIds([1])
-+    ->setPriceType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC)
-+    ->setPriceView(1)
-+    ->setName('Bundle Product')
-+    ->setSku('bundle-product')
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->setStockData([
-+        'use_config_manage_stock' => 1,
-+        'qty' => 100,
-+        'is_qty_decimal' => 0,
-+        'is_in_stock' => 1,
-+    ])
-+    ->setBundleOptionsData(
-+        [
-+            [
-+                'title' => 'Bundle Product Items',
-+                'default_title' => 'Bundle Product Items',
-+                'type' => 'checkbox',
-+                'required' => 1,
-+                'delete' => '',
-+            ],
-+        ]
-+    )
-+    ->setBundleSelectionsData(
-+        [[['product_id' => $product->getId(), 'selection_qty' => 1, 'delete' => '']]]
-+    );
-+$productRepository->save($bundleProduct);
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php
-new file mode 100644
-index 00000000000..aa661c7412d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+try {
-+    $product = $productRepository->get('bundle-product');
-+    $productRepository->delete($product);
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-+    //Product already removed
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_tier_pricing_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_tier_pricing_rollback.php
-new file mode 100644
-index 00000000000..7e4c5593f18
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_tier_pricing_rollback.php
-@@ -0,0 +1,29 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/*
-+ * Since the bundle product creation GUI doesn't allow to choose values for bundled products' custom options,
-+ * bundled items should not contain products with required custom options.
-+ * However, if to create such a bundle product, it will be always out of stock.
-+ */
-+require __DIR__ . '/../../../Magento/Catalog/_files/products_rollback.php';
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+try {
-+    $product = $productRepository->get('bundle-product');
-+    $productRepository->delete($product);
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-+    //Product already removed
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/BundleTest.php b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/BundleTest.php
-index e15f8d47a7b..864bdaa2a13 100644
---- a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/BundleTest.php
-+++ b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/BundleTest.php
-@@ -9,7 +9,10 @@ use Magento\CatalogImportExport\Model\AbstractProductExportImportTestCase;
- 
- class BundleTest extends AbstractProductExportImportTestCase
- {
--    public function exportImportDataProvider()
-+    /**
-+     * @return array
-+     */
-+    public function exportImportDataProvider(): array
-     {
-         return [
-             // @todo uncomment after MAGETWO-49677 resolved
-@@ -45,17 +48,13 @@ class BundleTest extends AbstractProductExportImportTestCase
-         ];
-     }
- 
--    public function importReplaceDataProvider()
--    {
--        return $this->exportImportDataProvider();
--    }
--
-     /**
--     * @param \Magento\Catalog\Model\Product $expectedProduct
--     * @param \Magento\Catalog\Model\Product $actualProduct
-+     * @inheritdoc
-      */
--    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
--    {
-+    protected function assertEqualsSpecificAttributes(
-+        \Magento\Catalog\Model\Product $expectedProduct,
-+        \Magento\Catalog\Model\Product $actualProduct
-+    ): void {
-         $expectedBundleProductOptions = $expectedProduct->getExtensionAttributes()->getBundleProductOptions();
-         $actualBundleProductOptions = $actualProduct->getExtensionAttributes()->getBundleProductOptions();
- 
-diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php
-index 53e8281ffbd..c26f5860f23 100644
---- a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php
-+++ b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php
-@@ -33,6 +33,7 @@ class RowCustomizerTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @magentoDataFixture Magento/Bundle/_files/product.php
-+     * @magentoDbIsolation disabled
-      *
-      * @return void
-      */
-diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCheckOnFrontendUnsuccessfulMessageWhenCaptchaFailedTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCheckOnFrontendUnsuccessfulMessageWhenCaptchaFailedTest.php
-new file mode 100644
-index 00000000000..8355d81fdf5
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCheckOnFrontendUnsuccessfulMessageWhenCaptchaFailedTest.php
-@@ -0,0 +1,118 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Captcha\Observer;
-+
-+use Magento\Framework\Data\Form\FormKey;
-+use Magento\Framework\Message\MessageInterface;
-+use Magento\TestFramework\Request;
-+use Magento\TestFramework\TestCase\AbstractController;
-+
-+/**
-+ * Test captcha observer behavior
-+ *
-+ * @magentoAppArea frontend
-+ */
-+class CaseCheckOnFrontendUnsuccessfulMessageWhenCaptchaFailedTest extends AbstractController
-+{
-+    /**
-+     * Test incorrect captcha on customer login page
-+     *
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     * @magentoConfigFixture default_store customer/captcha/enable 1
-+     * @magentoConfigFixture default_store customer/captcha/forms user_login
-+     * @magentoConfigFixture default_store customer/captcha/mode always
-+     */
-+    public function testLoginCheckUnsuccessfulMessageWhenCaptchaFailed()
-+    {
-+        /** @var FormKey $formKey */
-+        $formKey = $this->_objectManager->get(FormKey::class);
-+        $post = [
-+            'login' => [
-+                'username' => 'dummy@dummy.com',
-+                'password' => 'dummy_password1',
-+            ],
-+            'captcha' => ['user_login' => 'wrong_captcha'],
-+            'form_key' => $formKey->getFormKey(),
-+        ];
-+
-+        $this->prepareRequestData($post);
-+
-+        $this->dispatch('customer/account/loginPost');
-+
-+        $this->assertRedirect($this->stringContains('customer/account/login'));
-+        $this->assertSessionMessages(
-+            $this->equalTo(['Incorrect CAPTCHA']),
-+            MessageInterface::TYPE_ERROR
-+        );
-+    }
-+
-+    /**
-+     * Test incorrect captcha on customer forgot password page
-+     *
-+     * @codingStandardsIgnoreStart
-+     * @magentoConfigFixture current_store customer/password/limit_password_reset_requests_method 0
-+     * @magentoConfigFixture default_store customer/captcha/enable 1
-+     * @magentoConfigFixture default_store customer/captcha/forms user_forgotpassword
-+     * @magentoConfigFixture default_store customer/captcha/mode always
-+     */
-+    public function testForgotPasswordCheckUnsuccessfulMessageWhenCaptchaFailed()
-+    {
-+        $post = ['email' => 'dummy@dummy.com'];
-+        $this->prepareRequestData($post);
-+
-+        $this->dispatch('customer/account/forgotPasswordPost');
-+
-+        $this->assertRedirect($this->stringContains('customer/account/forgotpassword'));
-+        $this->assertSessionMessages(
-+            $this->equalTo(['Incorrect CAPTCHA']),
-+            MessageInterface::TYPE_ERROR
-+        );
-+    }
-+
-+    /**
-+     * Test incorrect captcha on customer create account page
-+     *
-+     * @codingStandardsIgnoreStart
-+     * @magentoConfigFixture current_store customer/password/limit_password_reset_requests_method 0
-+     * @magentoConfigFixture default_store customer/captcha/enable 1
-+     * @magentoConfigFixture default_store customer/captcha/forms user_create
-+     * @magentoConfigFixture default_store customer/captcha/mode always
-+     */
-+    public function testCreateAccountCheckUnsuccessfulMessageWhenCaptchaFailed()
-+    {
-+        /** @var FormKey $formKey */
-+        $formKey = $this->_objectManager->get(FormKey::class);
-+        $post = [
-+            'firstname' => 'Firstname',
-+            'lastname' => 'Lastname',
-+            'email' => 'dummy@dummy.com',
-+            'password' => 'TestPassword123',
-+            'password_confirmation' => 'TestPassword123',
-+            'captcha' => ['user_create' => 'wrong_captcha'],
-+            'form_key' => $formKey->getFormKey(),
-+        ];
-+        $this->prepareRequestData($post);
-+
-+        $this->dispatch('customer/account/createPost');
-+
-+        $this->assertRedirect($this->stringContains('customer/account/create'));
-+        $this->assertSessionMessages(
-+            $this->equalTo(['Incorrect CAPTCHA']),
-+            MessageInterface::TYPE_ERROR
-+        );
-+    }
-+
-+    /**
-+     * @param array $postData
-+     * @return void
-+     */
-+    private function prepareRequestData($postData)
-+    {
-+        $this->getRequest()->setMethod(Request::METHOD_POST);
-+        $this->getRequest()->setPostValue($postData);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
-index bdc135f2b48..800d41f3c78 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
-@@ -3,25 +3,140 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery;
- 
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery;
-+use Magento\Catalog\Model\Product;
-+use Magento\Framework\App\Request\DataPersistorInterface;
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
- /**
-  * @magentoAppArea adminhtml
-  */
- class ContentTest extends \PHPUnit\Framework\TestCase
- {
--    public function testGetUploader()
-+    /**
-+     * Test subject.
-+     *
-+     * @var Content
-+     */
-+    private $block;
-+
-+    /**
-+     * @var Registry
-+     */
-+    private $registry;
-+
-+    /**
-+     * @var DataPersistorInterface
-+     */
-+    private $dataPersistor;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-     {
--        /** @var $layout \Magento\Framework\View\Layout */
-+        $gallery = Bootstrap::getObjectManager()->get(Gallery::class);
-         $layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-             \Magento\Framework\View\LayoutInterface::class
-         );
--        /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
--        $block = $layout->createBlock(
--            \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content::class,
-+        $this->block = $layout->createBlock(
-+            Content::class,
-             'block'
-         );
-+        $this->block->setElement($gallery);
-+        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
-+        $this->dataPersistor = Bootstrap::getObjectManager()->get(DataPersistorInterface::class);
-+    }
-+
-+    public function testGetUploader()
-+    {
-+        $this->assertInstanceOf(\Magento\Backend\Block\Media\Uploader::class, $this->block->getUploader());
-+    }
- 
--        $this->assertInstanceOf(\Magento\Backend\Block\Media\Uploader::class, $block->getUploader());
-+    /**
-+     * Test get images json using registry or data persistor.
-+     *
-+     * @dataProvider getImagesAndImageTypesDataProvider
-+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
-+     * @magentoAppIsolation enabled
-+     * @param bool $isProductNew
-+     * @return void
-+     */
-+    public function testGetImagesJson(bool $isProductNew)
-+    {
-+        $this->prepareProduct($isProductNew);
-+        $imagesJson = $this->block->getImagesJson();
-+        $images = json_decode($imagesJson);
-+        $image = array_shift($images);
-+        $this->assertRegExp('/\/m\/a\/magento_image/', $image->file);
-+        $this->assertSame('image', $image->media_type);
-+        $this->assertSame('Image Alt Text', $image->label);
-+        $this->assertSame('Image Alt Text', $image->label_default);
-+        $this->assertRegExp('/\/pub\/media\/catalog\/product\/m\/a\/magento_image/', $image->url);
-+    }
-+
-+    /**
-+     * Test get image types json using registry or data persistor.
-+     *
-+     * @dataProvider getImagesAndImageTypesDataProvider
-+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
-+     * @magentoAppIsolation enabled
-+     * @param bool $isProductNew
-+     * @return void
-+     */
-+    public function testGetImageTypes(bool $isProductNew)
-+    {
-+        $this->prepareProduct($isProductNew);
-+        $imageTypes = $this->block->getImageTypes();
-+        foreach ($imageTypes as $type => $image) {
-+            $this->assertSame($type, $image['code']);
-+            $type !== 'swatch_image'
-+                ? $this->assertRegExp('/\/m\/a\/magento_image/', $image['value'])
-+                : $this->assertNull($image['value']);
-+            $this->assertSame('[STORE VIEW]', $image['scope']->getText());
-+            $this->assertSame(sprintf('product[%s]', $type), $image['name']);
-+        }
-+    }
-+
-+    /**
-+     * Provide test data for testGetImagesJson() and tesGetImageTypes().
-+     *
-+     * @return array
-+     */
-+    public function getImagesAndImageTypesDataProvider()
-+    {
-+        return [
-+            [
-+                'isProductNew' => true,
-+            ],
-+            [
-+                'isProductNew' => false,
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Prepare product, and set it to registry and data persistor.
-+     *
-+     * @param bool $isProductNew
-+     * @return void
-+     */
-+    private function prepareProduct(bool $isProductNew)
-+    {
-+        $product = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class)->get('simple');
-+        if ($isProductNew) {
-+            $newProduct = Bootstrap::getObjectManager()->create(Product::class);
-+            $this->registry->register('current_product', $newProduct);
-+            $productData['product'] = $product->getData();
-+            $dataPersistor = Bootstrap::getObjectManager()->get(DataPersistorInterface::class);
-+            $dataPersistor->set('catalog_product', $productData);
-+        } else {
-+            $this->registry->register('current_product', $product);
-+        }
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
-index 11f49464bbd..1001d58ee8a 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
-@@ -5,11 +5,36 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml;
- 
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Store\Model\Store;
-+use Magento\Catalog\Model\ResourceModel\Product;
-+
- /**
-  * @magentoAppArea adminhtml
-  */
- class CategoryTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
-+    /**
-+     * @var \Magento\Catalog\Model\ResourceModel\Product
-+     */
-+    protected $productResource;
-+
-+    /**
-+     * @inheritDoc
-+     *
-+     * @throws \Magento\Framework\Exception\AuthenticationException
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        /** @var Product $productResource */
-+        $this->productResource = Bootstrap::getObjectManager()->get(
-+            Product::class
-+        );
-+    }
-+
-     /**
-      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
-      * @magentoDbIsolation enabled
-@@ -27,6 +52,7 @@ class CategoryTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
-         $store->load('fixturestore', 'code');
-         $storeId = $store->getId();
- 
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($inputData);
-         $this->getRequest()->setParam('store', $storeId);
-         $this->getRequest()->setParam('id', 2);
-@@ -75,6 +101,7 @@ class CategoryTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
-      */
-     public function testSaveActionFromProductCreationPage($postData)
-     {
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($postData);
- 
-         $this->dispatch('backend/catalog/category/save');
-@@ -123,6 +150,9 @@ class CategoryTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
-         return [[$postData], [$postData + ['return_session_messages_only' => 1]]];
-     }
- 
-+    /**
-+     * Test SuggestCategories finds any categories.
-+     */
-     public function testSuggestCategoriesActionDefaultCategoryFound()
-     {
-         $this->getRequest()->setParam('label_part', 'Default');
-@@ -133,6 +163,9 @@ class CategoryTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
-         );
-     }
- 
-+    /**
-+     * Test SuggestCategories properly processes search by label.
-+     */
-     public function testSuggestCategoriesActionNoSuggestions()
-     {
-         $this->getRequest()->setParam('label_part', strrev('Default'));
-@@ -322,8 +355,12 @@ class CategoryTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
-         ];
-     }
- 
-+    /**
-+     * Test validation.
-+     */
-     public function testSaveActionCategoryWithDangerRequest()
-     {
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue(
-             [
-                 'general' => [
-@@ -374,7 +411,8 @@ class CategoryTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
-         }
-         $this->getRequest()
-             ->setPostValue('id', $grandChildId)
--            ->setPostValue('pid', $parentId);
-+            ->setPostValue('pid', $parentId)
-+            ->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/catalog/category/move');
-         $jsonResponse = json_decode($this->getResponse()->getBody());
-         $this->assertNotNull($jsonResponse);
-@@ -388,9 +426,133 @@ class CategoryTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
-     {
-         return [
-             [400, 401, 'first_url_key', 402, 'second_url_key', false],
--            [400, 401, 'duplicated_url_key', 402, 'duplicated_url_key', true],
-+            [400, 401, 'duplicated_url_key', 402, 'duplicated_url_key', false],
-             [0, 401, 'first_url_key', 402, 'second_url_key', true],
-             [400, 401, 'first_url_key', 0, 'second_url_key', true],
-         ];
-     }
-+
-+    /**
-+     * @magentoDataFixture Magento/Catalog/_files/products_in_different_stores.php
-+     * @magentoDbIsolation disabled
-+     * @dataProvider saveActionWithDifferentWebsitesDataProvider
-+     *
-+     * @param array $postData
-+     */
-+    public function testSaveCategoryWithProductPosition(array $postData)
-+    {
-+        /** @var $store \Magento\Store\Model\Store */
-+        $store = Bootstrap::getObjectManager()->create(Store::class);
-+        $store->load('fixturestore', 'code');
-+        $storeId = $store->getId();
-+        $oldCategoryProductsCount = $this->getCategoryProductsCount();
-+        $this->getRequest()->setParam('store', $storeId);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-+        $this->getRequest()->setParam('id', 96377);
-+        $this->getRequest()->setPostValue($postData);
-+        $this->dispatch('backend/catalog/category/save');
-+        $newCategoryProductsCount = $this->getCategoryProductsCount();
-+        $this->assertEquals(
-+            $oldCategoryProductsCount,
-+            $newCategoryProductsCount,
-+            'After changing product position number of records from catalog_category_product has changed'
-+        );
-+    }
-+
-+    /**
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     * @return array
-+     */
-+    public function saveActionWithDifferentWebsitesDataProvider()
-+    {
-+        return [
-+            'default_values' => [
-+                [
-+                    'store_id' => '1',
-+                    'entity_id' => '96377',
-+                    'attribute_set_id' => '4',
-+                    'parent_id' => '2',
-+                    'created_at' => '2018-11-29 08:28:37',
-+                    'updated_at' => '2018-11-29 08:57:43',
-+                    'path' => '1/2/96377',
-+                    'level' => '2',
-+                    'children_count' => '0',
-+                    'row_id' => '96377',
-+                    'name' => 'Category 1',
-+                    'display_mode' => 'PRODUCTS',
-+                    'url_key' => 'category-1',
-+                    'url_path' => 'category-1',
-+                    'automatic_sorting' => '0',
-+                    'is_active' => '1',
-+                    'is_anchor' => '1',
-+                    'include_in_menu' => '1',
-+                    'custom_use_parent_settings' => '0',
-+                    'custom_apply_to_products' => '0',
-+                    'path_ids' => [
-+                        0 => '1',
-+                        1 => '2',
-+                        2 => '96377'
-+                    ],
-+                    'use_config' => [
-+                        'available_sort_by' => 'true',
-+                        'default_sort_by' => 'true',
-+                        'filter_price_range' => 'true'
-+                    ],
-+                    'id' => '',
-+                    'parent' => '0',
-+                    'use_default' => [
-+                        'name' => '1',
-+                        'url_key' => '1',
-+                        'meta_title' => '1',
-+                        'is_active' => '1',
-+                        'include_in_menu' => '1',
-+                        'custom_use_parent_settings' => '1',
-+                        'custom_apply_to_products' => '1',
-+                        'description' => '1',
-+                        'landing_page' => '1',
-+                        'display_mode' => '1',
-+                        'custom_design' => '1',
-+                        'page_layout' => '1',
-+                        'meta_keywords' => '1',
-+                        'meta_description' => '1',
-+                        'custom_layout_update' => '1',
-+                        'image' => '1'
-+                    ],
-+                    'filter_price_range' => false,
-+                    'meta_title' => false,
-+                    'url_key_create_redirect' => 'category-1',
-+                    'description' => false,
-+                    'landing_page' => false,
-+                    'default_sort_by' => 'position',
-+                    'available_sort_by' => false,
-+                    'custom_design' => false,
-+                    'page_layout' => false,
-+                    'meta_keywords' => false,
-+                    'meta_description' => false,
-+                    'custom_layout_update' => false,
-+                    'position_cache_key' => '5c069248346ac',
-+                    'is_smart_category' => '0',
-+                    'smart_category_rules' => false,
-+                    'sort_order' => '0',
-+                    'vm_category_products' => '{"1":1,"3":0}'
-+                ]
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * Get items count from catalog_category_product
-+     *
-+     * @return int
-+     */
-+    private function getCategoryProductsCount(): int
-+    {
-+        $oldCategoryProducts = $this->productResource->getConnection()->select()->from(
-+            $this->productResource->getTable('catalog_category_product'),
-+            'product_id'
-+        );
-+        return count(
-+            $this->productResource->getConnection()->fetchAll($oldCategoryProducts)
-+        );
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
-index cea49d940cb..3ec8c806dcb 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
-@@ -5,11 +5,49 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml\Product\Action;
- 
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\Catalog\Model\ProductRepository;
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\MessageQueue\PublisherConsumerController;
-+
- /**
-  * @magentoAppArea adminhtml
-  */
- class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
-+    /** @var PublisherConsumerController */
-+    private $publisherConsumerController;
-+    private $consumers = ['product_action_attribute.update'];
-+
-+    protected function setUp()
-+    {
-+        $this->publisherConsumerController = Bootstrap::getObjectManager()->create(PublisherConsumerController::class, [
-+            'consumers' => $this->consumers,
-+            'logFilePath' => TESTS_TEMP_DIR . "/MessageQueueTestLog.txt",
-+            'maxMessages' => null,
-+            'appInitParams' => Bootstrap::getInstance()->getAppInitParams()
-+        ]);
-+
-+        try {
-+            $this->publisherConsumerController->startConsumers();
-+        } catch (\Magento\TestFramework\MessageQueue\EnvironmentPreconditionException $e) {
-+            $this->markTestSkipped($e->getMessage());
-+        } catch (\Magento\TestFramework\MessageQueue\PreconditionFailedException $e) {
-+            $this->fail(
-+                $e->getMessage()
-+            );
-+        }
-+
-+        parent::setUp();
-+    }
-+
-+    protected function tearDown()
-+    {
-+        $this->publisherConsumerController->stopConsumers();
-+        parent::tearDown();
-+    }
-+
-     /**
-      * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save::execute
-      *
-@@ -18,11 +56,12 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-      */
-     public function testSaveActionRedirectsSuccessfully()
-     {
--        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $objectManager = Bootstrap::getObjectManager();
- 
-         /** @var $session \Magento\Backend\Model\Session */
-         $session = $objectManager->get(\Magento\Backend\Model\Session::class);
-         $session->setProductIds([1]);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
- 
-         $this->dispatch('backend/catalog/product_action_attribute/save/store/0');
- 
-@@ -56,30 +95,46 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-      */
-     public function testSaveActionChangeVisibility($attributes)
-     {
--        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
--        $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Catalog\Model\ProductRepository::class
-+        $objectManager = Bootstrap::getObjectManager();
-+        /** @var ProductRepository $repository */
-+        $repository = Bootstrap::getObjectManager()->create(
-+            ProductRepository::class
-         );
-         $product = $repository->get('simple');
-         $product->setOrigData();
--        $product->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE);
-+        $product->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE);
-         $product->save();
- 
-         /** @var $session \Magento\Backend\Model\Session */
-         $session = $objectManager->get(\Magento\Backend\Model\Session::class);
-         $session->setProductIds([$product->getId()]);
-         $this->getRequest()->setParam('attributes', $attributes);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
- 
-         $this->dispatch('backend/catalog/product_action_attribute/save/store/0');
-+
-         /** @var \Magento\Catalog\Model\Category $category */
--        $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-+        $categoryFactory = Bootstrap::getObjectManager()->get(
-             \Magento\Catalog\Model\CategoryFactory::class
-         );
-         /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */
--        $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-+        $listProduct = Bootstrap::getObjectManager()->get(
-             \Magento\Catalog\Block\Product\ListProduct::class
-         );
- 
-+        $this->publisherConsumerController->waitForAsynchronousResult(
-+            function () use ($repository) {
-+                sleep(3);
-+                return $repository->get(
-+                    'simple',
-+                    false,
-+                    null,
-+                    true
-+                )->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE;
-+            },
-+            []
-+        );
-+
-         $category = $categoryFactory->create()->load(2);
-         $layer = $listProduct->getLayer();
-         $layer->setCurrentCategory($category);
-@@ -89,6 +144,8 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-     }
- 
-     /**
-+     * @param array $attributes Request parameter.
-+     *
-      * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Validate::execute
-      *
-      * @dataProvider validateActionDataProvider
-@@ -99,7 +156,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-      */
-     public function testValidateActionWithMassUpdate($attributes)
-     {
--        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $objectManager = Bootstrap::getObjectManager();
- 
-         /** @var $session \Magento\Backend\Model\Session */
-         $session = $objectManager->get(\Magento\Backend\Model\Session::class);
-@@ -150,8 +207,8 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-     public function saveActionVisibilityAttrDataProvider()
-     {
-         return [
--            ['arguments' => ['visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH]],
--            ['arguments' => ['visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG]]
-+            ['arguments' => ['visibility' => Visibility::VISIBILITY_BOTH]],
-+            ['arguments' => ['visibility' => Visibility::VISIBILITY_IN_CATALOG]]
-         ];
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
-index 4261873cc8e..e1d3e960593 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
-@@ -6,10 +6,13 @@
- namespace Magento\Catalog\Controller\Adminhtml\Product;
- 
- use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- 
- /**
-  * @magentoAppArea adminhtml
-  * @magentoDbIsolation enabled
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
-@@ -25,6 +28,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-                 'frontend_input' => 'some_input',
-             ]
-         );
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($postData);
-         $this->dispatch('backend/catalog/product_attribute/save');
-         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
-@@ -50,6 +54,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-             'popup' => 'true',
-             'new_attribute_set_name' => 'new_attribute_set',
-         ];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($postData);
-         $this->dispatch('backend/catalog/product_attribute/save');
-         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
-@@ -71,6 +76,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-     {
-         $postData = $this->_getAttributeData() + ['attribute_id' => 0, 'frontend_input' => 'boolean'];
-         $this->getRequest()->setPostValue($postData);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/catalog/product_attribute/save');
-         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
-         $this->assertContains(
-@@ -89,6 +95,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-     {
-         $postData = $this->_getAttributeData() + ['attribute_id' => 100500];
-         $this->getRequest()->setPostValue($postData);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/catalog/product_attribute/save');
-         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
-         $this->assertContains(
-@@ -113,6 +120,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-                 'set' => 4,
-                 'frontend_input' => 'boolean',
-             ];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($postData);
-         $this->dispatch('backend/catalog/product_attribute/save');
-         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
-@@ -135,6 +143,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-     {
-         $postData = $this->_getAttributeData() + ['attribute_code' => '_()&&&?'];
-         $this->getRequest()->setPostValue($postData);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/catalog/product_attribute/save');
-         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
-         $this->assertContains(
-@@ -147,8 +156,8 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-         /** @var \Magento\Framework\Message\Error $message */
-         $message = $messages->getItemsByType('error')[0];
-         $this->assertEquals(
--            'Attribute code "_()&&&?" is invalid. Please use only letters (a-z),'
--            . ' numbers (0-9) or underscore(_) in this field, first character should be a letter.',
-+            'Attribute code "_()&&&?" is invalid. Please use only letters (a-z or A-Z),'
-+            . ' numbers (0-9) or underscore (_) in this field, and the first character should be a letter.',
-             $message->getText()
-         );
-     }
-@@ -159,6 +168,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-     public function testAttributeWithoutEntityTypeId()
-     {
-         $postData = $this->_getAttributeData() + ['attribute_id' => '2', 'new_attribute_set_name' => ' '];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($postData);
-         $this->dispatch('backend/catalog/product_attribute/save');
-         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
-@@ -174,6 +184,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-     public function testSaveActionApplyToDataSystemAttribute()
-     {
-         $postData = $this->_getAttributeData() + ['attribute_id' => '2'];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($postData);
-         $this->dispatch('backend/catalog/product_attribute/save');
-         $model = $this->_objectManager->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
-@@ -187,6 +198,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-     public function testSaveActionApplyToDataUserDefinedAttribute()
-     {
-         $postData = $this->_getAttributeData() + ['attribute_id' => '1'];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($postData);
-         $this->dispatch('backend/catalog/product_attribute/save');
-         /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $model */
-@@ -202,6 +214,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-     {
-         $postData = $this->_getAttributeData() + ['attribute_id' => '3'];
-         unset($postData['apply_to']);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($postData);
-         $this->dispatch('backend/catalog/product_attribute/save');
-         $model = $this->_objectManager->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
-@@ -221,6 +234,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-         $this->assertEquals('predefined string translation', $this->_translate('string to translate'));
-         $string->saveTranslate('string to translate', 'new string translation');
-         $postData = $this->_getAttributeData() + ['attribute_id' => 1];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($postData);
-         $this->dispatch('backend/catalog/product_attribute/save');
-         $this->assertEquals('new string translation', $this->_translate('string to translate'));
-@@ -284,15 +298,18 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-         $optionsData = [];
-         $expectedOptionsLabels = [];
-         for ($i = 0; $i < $optionsCount; $i++) {
--            $order = $i + 1;
--            $expectedOptionLabelOnStoreView = "value_{$i}_store_1";
-+            $expectedOptionLabelOnStoreView = 'value_' . $i . '_store_1';
-             $expectedOptionsLabels[$i+1] = $expectedOptionLabelOnStoreView;
--            $optionsData []= "option[order][option_{$i}]={$order}";
--            $optionsData []= "option[value][option_{$i}][0]=value_{$i}_admin";
--            $optionsData []= "option[value][option_{$i}][1]={$expectedOptionLabelOnStoreView}";
--            $optionsData []= "option[delete][option_{$i}=";
-+            $optionId = 'option_' . $i;
-+            $optionRowData = [];
-+            $optionRowData['option']['order'][$optionId] = $i + 1;
-+            $optionRowData['option']['value'][$optionId][0] = 'value_' . $i . '_admin';
-+            $optionRowData['option']['value'][$optionId][1] = $expectedOptionLabelOnStoreView;
-+            $optionRowData['option']['delete'][$optionId] = '';
-+            $optionsData[] = http_build_query($optionRowData);
-         }
-         $attributeData['serialized_options'] = json_encode($optionsData);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($attributeData);
-         $this->dispatch('backend/catalog/product_attribute/save');
-         $entityTypeId = $this->_objectManager->create(
-@@ -376,7 +393,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-             'used_in_product_listing' => '1',
-             'used_for_sort_by' => '0',
-             'apply_to' => ['simple'],
--            'frontend_label' => [\Magento\Store\Model\Store::DEFAULT_STORE_ID => 'string to translate']
-+            'frontend_label' => [\Magento\Store\Model\Store::DEFAULT_STORE_ID => 'string to translate'],
-         ];
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php
-index 7c5d4ea48a2..7e034b8b3cb 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php
-@@ -6,6 +6,7 @@
- namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
- 
- use Magento\Framework\Message\MessageInterface;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- 
- class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
-@@ -15,7 +16,7 @@ class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-     public function testDeleteById()
-     {
-         $attributeSet = $this->getAttributeSetByName('empty_attribute_set');
--        $this->getRequest()->setParam('id', $attributeSet->getId());
-+        $this->getRequest()->setParam('id', $attributeSet->getId())->setMethod(HttpRequest::METHOD_POST);
- 
-         $this->dispatch('backend/catalog/product_set/delete/');
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php
-index 5b711b2ea74..8ccd426424a 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php
-@@ -9,6 +9,7 @@ use Magento\Eav\Api\AttributeSetRepositoryInterface;
- use Magento\Eav\Api\Data\AttributeSetInterface;
- use Magento\Framework\Api\SearchCriteriaBuilder;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- 
- class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
-@@ -20,6 +21,7 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-         $attributeSet = $this->getAttributeSetByName('attribute_set_test');
-         $this->assertNotEmpty($attributeSet, 'Attribute set with name "attribute_set_test" is missed');
- 
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue('data', json_encode([
-             'attribute_set_name' => 'attribute_set_test',
-             'groups' => [
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
-index 3e67095edce..acec996d0c4 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
-@@ -5,23 +5,35 @@
-  */
- namespace Magento\Catalog\Controller\Adminhtml;
- 
-+use Magento\Framework\App\Request\DataPersistorInterface;
-+use Magento\Framework\Message\Manager;
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Message\MessageInterface;
-+
- /**
-  * @magentoAppArea adminhtml
-  */
- class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
-+    /**
-+     * Test calling save with invalid product's ID.
-+     */
-     public function testSaveActionWithDangerRequest()
-     {
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue(['product' => ['entity_id' => 15]]);
-         $this->dispatch('backend/catalog/product/save');
-         $this->assertSessionMessages(
-             $this->equalTo(['The product was unable to be saved. Please try again.']),
--            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
-+            MessageInterface::TYPE_ERROR
-         );
-         $this->assertRedirect($this->stringContains('/backend/catalog/product/new'));
-     }
- 
-     /**
-+     * Test saving existing product and specifying that we want redirect to new product form.
-+     *
-      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-      */
-     public function testSaveActionAndNew()
-@@ -29,15 +41,19 @@ class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendControl
-         $this->getRequest()->setPostValue(['back' => 'new']);
-         $repository = $this->_objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
-         $product = $repository->get('simple');
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId());
-         $this->assertRedirect($this->stringStartsWith('http://localhost/index.php/backend/catalog/product/new/'));
-         $this->assertSessionMessages(
-             $this->contains('You saved the product.'),
--            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-+            MessageInterface::TYPE_SUCCESS
-         );
-     }
- 
-     /**
-+     * Test saving existing product and specifying that
-+     * we want redirect to new product form with saved product's data applied.
-+     *
-      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-      */
-     public function testSaveActionAndDuplicate()
-@@ -45,6 +61,7 @@ class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendControl
-         $this->getRequest()->setPostValue(['back' => 'duplicate']);
-         $repository = $this->_objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
-         $product = $repository->get('simple');
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId());
-         $this->assertRedirect($this->stringStartsWith('http://localhost/index.php/backend/catalog/product/edit/'));
-         $this->assertRedirect(
-@@ -56,14 +73,17 @@ class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendControl
-         );
-         $this->assertSessionMessages(
-             $this->contains('You saved the product.'),
--            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-+            MessageInterface::TYPE_SUCCESS
-         );
-         $this->assertSessionMessages(
-             $this->contains('You duplicated the product.'),
--            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-+            MessageInterface::TYPE_SUCCESS
-         );
-     }
- 
-+    /**
-+     * Testing Add Product button showing.
-+     */
-     public function testIndexAction()
-     {
-         $this->dispatch('backend/catalog/product');
-@@ -104,6 +124,8 @@ class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendControl
-     }
- 
-     /**
-+     * Testing existing product edit page.
-+     *
-      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-      */
-     public function testEditAction()
-@@ -140,4 +162,197 @@ class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendControl
-             '"Save & Duplicate" button isn\'t present on Edit Product page'
-         );
-     }
-+
-+    /**
-+     * Test create product with already existing url key.
-+     *
-+     * @dataProvider saveActionWithAlreadyExistingUrlKeyDataProvider
-+     * @magentoDataFixture Magento/Catalog/_files/product_image.php
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-+     * @magentoDbIsolation disabled
-+     * @param array $postData
-+     * @return void
-+     */
-+    public function testSaveActionWithAlreadyExistingUrlKey(array $postData)
-+    {
-+        $this->getRequest()->setPostValue($postData);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-+        $this->dispatch('backend/catalog/product/save');
-+        /** @var Manager $messageManager */
-+        $messageManager = $this->_objectManager->get(Manager::class);
-+        $messages = $messageManager->getMessages();
-+        $errors = $messages->getItemsByType('error');
-+        $this->assertNotEmpty($errors);
-+        $message = array_shift($errors);
-+        $this->assertSame('URL key for specified store already exists.', $message->getText());
-+        $this->assertRedirect($this->stringContains('/backend/catalog/product/new'));
-+        /** @var DataPersistorInterface $dataPersistor */
-+        $dataPersistor = $this->_objectManager->get(DataPersistorInterface::class);
-+        $productData = $dataPersistor->get('catalog_product')['product'];
-+        $image = array_shift($productData['media_gallery']['images']);
-+        $this->assertStringEndsNotWith('.tmp', $image['file']);
-+        $this->assertStringEndsNotWith('.tmp', $productData['image']);
-+        $this->assertStringEndsNotWith('.tmp', $productData['small_image']);
-+        $this->assertStringEndsNotWith('.tmp', $productData['thumbnail']);
-+        $this->assertStringEndsNotWith('.tmp', $productData['swatch_image']);
-+    }
-+
-+    /**
-+     * Provide test data for testSaveActionWithAlreadyExistingUrlKey().
-+     *
-+     * @return array
-+     */
-+    public function saveActionWithAlreadyExistingUrlKeyDataProvider()
-+    {
-+        return [
-+            [
-+                'post_data' => [
-+                    'product' =>
-+                        [
-+                            'attribute_set_id' => '4',
-+                            'status' => '1',
-+                            'name' => 's2',
-+                            'url_key' => 'simple-product',
-+                            'quantity_and_stock_status' =>
-+                                [
-+                                    'qty' => '10',
-+                                    'is_in_stock' => '1',
-+                                ],
-+                            'website_ids' =>
-+                                [
-+                                    1 => '1',
-+                                ],
-+                            'sku' => 's2',
-+                            'price' => '3',
-+                            'tax_class_id' => '2',
-+                            'product_has_weight' => '0',
-+                            'visibility' => '4',
-+                            'media_gallery' =>
-+                                [
-+                                    'images' =>
-+                                        [
-+                                            'h17hftqohrd' =>
-+                                                [
-+                                                    'position' => '1',
-+                                                    'media_type' => 'image',
-+                                                    'video_provider' => '',
-+                                                    'file' => '/m/a//magento_image.jpg.tmp',
-+                                                    'value_id' => '',
-+                                                    'label' => '',
-+                                                    'disabled' => '0',
-+                                                    'removed' => '',
-+                                                    'role' => '',
-+                                                ],
-+                                        ],
-+                                ],
-+                            'image' => '/m/a//magento_image.jpg.tmp',
-+                            'small_image' => '/m/a//magento_image.jpg.tmp',
-+                            'thumbnail' => '/m/a//magento_image.jpg.tmp',
-+                            'swatch_image' => '/m/a//magento_image.jpg.tmp',
-+                        ],
-+                ]
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * Test product save with selected tier price
-+     *
-+     * @dataProvider saveActionTierPriceDataProvider
-+     * @param array $postData
-+     * @param array $tierPrice
-+     * @magentoDataFixture Magento/Catalog/_files/product_has_tier_price_show_as_low_as.php
-+     * @magentoConfigFixture current_store catalog/price/scope 1
-+     */
-+    public function testSaveActionTierPrice(array $postData, array $tierPrice)
-+    {
-+        $postData['product'] = $this->getProductData($tierPrice);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-+        $this->getRequest()->setPostValue($postData);
-+        $this->dispatch('backend/catalog/product/save/id/' . $postData['id']);
-+        $this->assertSessionMessages(
-+            $this->contains('You saved the product.'),
-+            MessageInterface::TYPE_SUCCESS
-+        );
-+    }
-+
-+    /**
-+     * Provide test data for testSaveActionWithAlreadyExistingUrlKey().
-+     *
-+     * @return array
-+     */
-+    public function saveActionTierPriceDataProvider()
-+    {
-+        return [
-+            [
-+                'post_data' => [
-+                    'id' => '1',
-+                    'type' => 'simple',
-+                    'store' => '0',
-+                    'set' => '4',
-+                    'back' => 'edit',
-+                    'product' => [],
-+                    'is_downloadable' => '0',
-+                    'affect_configurable_product_attributes' => '1',
-+                    'new_variation_attribute_set_id' => '4',
-+                    'use_default' => [
-+                        'gift_message_available' => '0',
-+                        'gift_wrapping_available' => '0'
-+                    ],
-+                    'configurable_matrix_serialized' => '[]',
-+                    'associated_product_ids_serialized' => '[]'
-+                ],
-+                'tier_price_for_request' => [
-+                    [
-+                        'price_id' => '1',
-+                        'website_id' => '0',
-+                        'cust_group' => '32000',
-+                        'price' => '111.00',
-+                        'price_qty' => '100',
-+                        'website_price' => '111.0000',
-+                        'initialize' => 'true',
-+                        'record_id' => '1',
-+                        'value_type' => 'fixed'
-+                    ],
-+                    [
-+                        'price_id' => '2',
-+                        'website_id' => '1',
-+                        'cust_group' => '32000',
-+                        'price' => '222.00',
-+                        'price_qty' => '200',
-+                        'website_price' => '111.0000',
-+                        'initialize' => 'true',
-+                        'record_id' => '2',
-+                        'value_type' => 'fixed'
-+                    ],
-+                    [
-+                        'price_id' => '3',
-+                        'website_id' => '1',
-+                        'cust_group' => '32000',
-+                        'price' => '333.00',
-+                        'price_qty' => '300',
-+                        'website_price' => '111.0000',
-+                        'initialize' => 'true',
-+                        'record_id' => '3',
-+                        'value_type' => 'fixed'
-+                    ]
-+                ]
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * Return product data for test without entity_id for further save
-+     *
-+     * @param array $tierPrice
-+     * @return array
-+     */
-+    private function getProductData(array $tierPrice)
-+    {
-+        $productRepositoryInterface = $this->_objectManager->get(ProductRepositoryInterface::class);
-+        $product = $productRepositoryInterface->get('tier_prices')->getData();
-+        $product['tier_price'] = $tierPrice;
-+        unset($product['entity_id']);
-+        return $product;
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php
-index ec2e97f9424..1cb2caace4f 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php
-@@ -7,6 +7,7 @@
- namespace Magento\Catalog\Controller\Product;
- 
- use Magento\Framework\Message\MessageInterface;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- 
- /**
-  * @magentoDataFixture Magento/Catalog/controllers/_files/products.php
-@@ -23,7 +24,7 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
-     protected $productRepository;
- 
-     /**
--     * Test setup
-+     * @inheritDoc
-      */
-     protected function setUp()
-     {
-@@ -36,6 +37,8 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
-+     * Test adding product to compare list.
-+     *
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function testAddAction()
-@@ -45,6 +48,7 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
-         /** @var \Magento\Framework\Data\Form\FormKey $formKey */
-         $formKey = $objectManager->get(\Magento\Framework\Data\Form\FormKey::class);
-         $product = $this->productRepository->get('simple_product_1');
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch(
-             sprintf(
-                 'catalog/product_compare/add/product/%s/form_key/%s?nocookie=1',
-@@ -69,6 +73,8 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
-+     * Test comparing a product.
-+     *
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function testIndexActionAddProducts()
-@@ -83,12 +89,15 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
-+     * Test removing a product from compare list.
-+     *
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function testRemoveAction()
-     {
-         $this->_requireVisitorWithTwoProducts();
-         $product = $this->productRepository->get('simple_product_2');
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId());
- 
-         $this->assertSessionMessages(
-@@ -102,12 +111,15 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
-+     * Test removing a product from compare list of a registered customer.
-+     *
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     public function testRemoveActionWithSession()
-     {
-         $this->_requireCustomerWithTwoProducts();
-         $product = $this->productRepository->get('simple_product_1');
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId());
-         $secondProduct = $this->productRepository->get('simple_product_2');
- 
-@@ -122,7 +134,7 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
--     * testIndexActionDisplay
-+     * Test getting a list of compared product.
-      */
-     public function testIndexActionDisplay()
-     {
-@@ -151,12 +163,13 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
--     * testClearAction
-+     * Test clearing a list of compared products.
-      */
-     public function testClearAction()
-     {
-         $this->_requireVisitorWithTwoProducts();
- 
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('catalog/product_compare/clear');
- 
-         $this->assertSessionMessages(
-@@ -170,12 +183,15 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
-+     * Test escaping a session message.
-+     *
-      * @magentoDataFixture Magento/Catalog/_files/product_simple_xss.php
-      */
-     public function testRemoveActionProductNameXss()
-     {
-         $this->_prepareCompareListWithProductNameXss();
-         $product = $this->productRepository->get('product-with-xss');
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId() . '?nocookie=1');
- 
-         $this->assertSessionMessages(
-@@ -187,6 +203,9 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
-+     * Preparing compare list.
-+     *
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     protected function _prepareCompareListWithProductNameXss()
-@@ -212,7 +231,9 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
--     * _requireVisitorWithNoProducts
-+     * Preparing compare list.
-+     *
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     protected function _requireVisitorWithNoProducts()
-     {
-@@ -234,6 +255,9 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
-+     * Preparing compare list.
-+     *
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     protected function _requireVisitorWithTwoProducts()
-@@ -269,6 +293,9 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
-+     * Preparing a compare list.
-+     *
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     protected function _requireCustomerWithTwoProducts()
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/Link/SaveHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/Link/SaveHandlerTest.php
-new file mode 100644
-index 00000000000..5b24c4e2219
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/Link/SaveHandlerTest.php
-@@ -0,0 +1,141 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Category\Link;
-+
-+use Magento\Catalog\Api\Data\CategoryLinkInterfaceFactory;
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\EntityManager\MetadataPool;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Save handler test
-+ *
-+ * @magentoDataFixture Magento/Catalog/_files/categories_no_products.php
-+ * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
-+ */
-+class SaveHandlerTest extends TestCase
-+{
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @var string
-+     */
-+    private $productLinkField;
-+
-+    /**
-+     * @var CategoryLinkInterfaceFactory
-+     */
-+    private $categoryLinkFactory;
-+
-+    /**
-+     * @var SaveHandler
-+     */
-+    private $saveHandler;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->productRepository = $objectManager->create(ProductRepositoryInterface::class);
-+        $metadataPool = $objectManager->create(MetadataPool::class);
-+        $this->productLinkField = $metadataPool->getMetadata(ProductInterface::class)
-+            ->getLinkField();
-+        $this->categoryLinkFactory = $objectManager->create(CategoryLinkInterfaceFactory::class);
-+        $this->saveHandler = $objectManager->create(SaveHandler::class);
-+    }
-+
-+    /**
-+     * Execute test
-+     *
-+     * @return void
-+     */
-+    public function testExecute(): void
-+    {
-+        $product = $this->productRepository->get('simple2');
-+        $product->setCategoryIds([3, 4, 6]);
-+        $this->productRepository->save($product);
-+        $categoryPositions = [
-+            3 => [
-+                'category_id' => 3,
-+                'position' => 0,
-+            ],
-+            4 => [
-+                'category_id' => 4,
-+                'position' => 0,
-+            ],
-+            6 => [
-+                'category_id' => 6,
-+                'position' => 0,
-+            ],
-+        ];
-+
-+        $categoryLinks = $product->getExtensionAttributes()->getCategoryLinks();
-+        $this->assertEmpty($categoryLinks);
-+
-+        $categoryLinks = [];
-+        $categoryPositions[4]['position'] = 1;
-+        $categoryPositions[6]['position'] = 1;
-+        foreach ($categoryPositions as $categoryPosition) {
-+            $categoryLink = $this->categoryLinkFactory->create()
-+                ->setCategoryId($categoryPosition['category_id'])
-+                ->setPosition($categoryPosition['position']);
-+            $categoryLinks[] = $categoryLink;
-+        }
-+        $categoryLinks = $this->updateCategoryLinks($product, $categoryLinks);
-+        $this->assertPositions($categoryPositions, $categoryLinks);
-+
-+        $categoryPositions[4]['position'] = 2;
-+        $categoryLink = $this->categoryLinkFactory->create()
-+            ->setCategoryId(4)
-+            ->setPosition($categoryPositions[4]['position']);
-+        $categoryLinks = $this->updateCategoryLinks($product, [$categoryLink]);
-+        $this->assertPositions($categoryPositions, $categoryLinks);
-+    }
-+
-+    /**
-+     * Update category links
-+     *
-+     * @param ProductInterface $product
-+     * @param \Magento\Catalog\Api\Data\CategoryLinkInterface[] $categoryLinks
-+     * @return \Magento\Catalog\Api\Data\CategoryLinkInterface[]
-+     */
-+    private function updateCategoryLinks(ProductInterface $product, array $categoryLinks): array
-+    {
-+        $product->getExtensionAttributes()->setCategoryLinks($categoryLinks);
-+        $arguments = [$this->productLinkField => $product->getData($this->productLinkField)];
-+        $this->saveHandler->execute($product, $arguments);
-+        $product = $this->productRepository->get($product->getSku(), false, null, true);
-+        $categoryLinks = $product->getExtensionAttributes()
-+            ->getCategoryLinks();
-+
-+        return $categoryLinks;
-+    }
-+
-+    /**
-+     * Assert positions
-+     *
-+     * @param array $categoryPositions
-+     * @param array $categoryLinks
-+     * @return void
-+     */
-+    private function assertPositions(array $categoryPositions, array $categoryLinks): void
-+    {
-+        foreach ($categoryLinks as $categoryLink) {
-+            $categoryPosition = $categoryPositions[$categoryLink->getCategoryId()];
-+            $this->assertEquals($categoryPosition['category_id'], $categoryLink->getCategoryId());
-+            $this->assertEquals($categoryPosition['position'], $categoryLink->getPosition());
-+        }
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php
-index 33f26302394..38960ab6639 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php
-@@ -32,8 +32,12 @@ class DesignTest extends \PHPUnit\Framework\TestCase
-         $design = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-             \Magento\Framework\View\DesignInterface::class
-         );
-+        $translate = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-+            \Magento\Framework\TranslateInterface::class
-+        );
-         $this->assertEquals('package', $design->getDesignTheme()->getPackageCode());
-         $this->assertEquals('theme', $design->getDesignTheme()->getThemeCode());
-+        $this->assertEquals('themepackage/theme', $translate->getTheme());
-     }
- 
-     /**
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php
-index 50b40cf4f2e..04baef55863 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php
-@@ -50,6 +50,7 @@ class ImageUploaderTest extends \PHPUnit\Framework\TestCase
-                 'baseTmpPath' => $this->mediaDirectory->getRelativePath('tmp'),
-                 'basePath' => __DIR__,
-                 'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png'],
-+                'allowedMimeTypes' => ['image/jpg', 'image/jpeg', 'image/gif', 'image/png']
-             ]
-         );
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/CustomFlatAttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/CustomFlatAttributeTest.php
-new file mode 100644
-index 00000000000..049e7c8d201
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/CustomFlatAttributeTest.php
-@@ -0,0 +1,91 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
-+
-+use Magento\TestFramework\Indexer\TestCase as IndexerTestCase;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
-+use Magento\Catalog\Model\ResourceModel\Product\Flat;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+
-+/**
-+ * Custom Flat Attribute Test
-+ */
-+class CustomFlatAttributeTest extends IndexerTestCase
-+{
-+    /**
-+     * @var Processor
-+     */
-+    private $processor;
-+
-+    /**
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->processor = $this->objectManager->get(Processor::class);
-+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * Tests that custom product attribute will appear in flat table and can be updated in it.
-+     *
-+     * @magentoDbIsolation disabled
-+     * @magentoAppArea frontend
-+     * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php
-+     *
-+     * @return void
-+     * @throws \Magento\Framework\Exception\CouldNotSaveException
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\StateException
-+     */
-+    public function testProductUpdateCustomAttribute(): void
-+    {
-+        $product = $this->productRepository->get('simple_with_custom_flat_attribute');
-+        $product->setCustomAttribute('flat_attribute', 'changed flat attribute');
-+        $this->productRepository->save($product);
-+
-+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+        $searchCriteriaBuilder = $this->objectManager->create(SearchCriteriaBuilder::class);
-+        /** @var \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria */
-+        $searchCriteria = $searchCriteriaBuilder->addFilter('sku', 'simple_with_custom_flat_attribute')
-+            ->create();
-+
-+        $items = $this->productRepository->getList($searchCriteria)
-+            ->getItems();
-+        $product = reset($items);
-+        $resourceModel = $product->getResourceCollection()
-+            ->getEntity();
-+
-+        self::assertInstanceOf(
-+            Flat::class,
-+            $resourceModel,
-+            'Product should be received from flat resource'
-+        );
-+
-+        self::assertEquals(
-+            'changed flat attribute',
-+            $product->getFlatAttribute(),
-+            'Product flat attribute should be able to change.'
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RelationTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RelationTest.php
-new file mode 100644
-index 00000000000..85bcd54767e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RelationTest.php
-@@ -0,0 +1,134 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
-+
-+use Magento\Framework\App\ResourceConnection;
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\TestFramework\Catalog\Model\Indexer\Product\Flat\Action\Full as FlatIndexerFull;
-+
-+/**
-+ * Test relation customization
-+ */
-+class RelationTest extends \Magento\TestFramework\Indexer\TestCase
-+{
-+    /**
-+     * @var FlatIndexerFull
-+     */
-+    private $indexer;
-+
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-+    /**
-+     * @var AdapterInterface
-+     */
-+    private $connection;
-+
-+    /**
-+     * Updated flat tables
-+     *
-+     * @var array
-+     */
-+    private $flatUpdated = [];
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+        $tableBuilderMock = $this->createMock(\Magento\Catalog\Model\Indexer\Product\Flat\TableBuilder::class);
-+        $flatTableBuilderMock = $this->createMock(\Magento\Catalog\Model\Indexer\Product\Flat\FlatTableBuilder::class);
-+
-+        $productIndexerHelper = $objectManager->create(
-+            \Magento\Catalog\Helper\Product\Flat\Indexer::class,
-+            ['addChildData' => 1]
-+        );
-+        $this->indexer = $objectManager->create(
-+            FlatIndexerFull::class,
-+            [
-+                'productHelper' => $productIndexerHelper,
-+                'tableBuilder' => $tableBuilderMock,
-+                'flatTableBuilder' => $flatTableBuilderMock
-+            ]
-+        );
-+        $this->storeManager = $objectManager->create(StoreManagerInterface::class);
-+        $this->connection = $objectManager->get(ResourceConnection::class)->getConnection();
-+
-+        foreach ($this->storeManager->getStores() as $store) {
-+            $flatTable = $productIndexerHelper->getFlatTableName($store->getId());
-+            if ($this->connection->isTableExists($flatTable) &&
-+                !$this->connection->tableColumnExists($flatTable, 'child_id') &&
-+                !$this->connection->tableColumnExists($flatTable, 'is_child')
-+            ) {
-+                $this->connection->addColumn(
-+                    $flatTable,
-+                    'child_id',
-+                    [
-+                        'type' => 'integer',
-+                        'length' => null,
-+                        'unsigned' => true,
-+                        'nullable' => true,
-+                        'default' => null,
-+                        'unique' => true,
-+                        'comment' => 'Child Id',
-+                    ]
-+                );
-+                $this->connection->addColumn(
-+                    $flatTable,
-+                    'is_child',
-+                    [
-+                        'type' => 'smallint',
-+                        'length' => 1,
-+                        'unsigned' => true,
-+                        'nullable' => false,
-+                        'default' => '0',
-+                        'comment' => 'Checks If Entity Is Child',
-+                    ]
-+                );
-+
-+                $this->flatUpdated[] = $flatTable;
-+            }
-+        }
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function tearDown()
-+    {
-+        foreach ($this->flatUpdated as $flatTable) {
-+            $this->connection->dropColumn($flatTable, 'child_id');
-+            $this->connection->dropColumn($flatTable, 'is_child');
-+        }
-+    }
-+
-+    /**
-+     * Test that SQL generated for relation customization is valid
-+     *
-+     * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Exception
-+     */
-+    public function testExecute() : void
-+    {
-+        try {
-+            $this->indexer->execute();
-+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-+            if ($e->getPrevious() instanceof \Zend_Db_Statement_Exception) {
-+                $this->fail($e->getMessage());
-+            }
-+            throw $e;
-+        }
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
-index 15c90891878..a32b476fe75 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
-@@ -3,87 +3,110 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
- 
-+use Magento\TestFramework\Indexer\TestCase as IndexerTestCase;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
-+use Magento\Catalog\Block\Product\ListProduct;
-+use Magento\Catalog\Api\CategoryRepositoryInterface;
-+
- /**
-  * Class RowTest
-  */
--class RowTest extends \Magento\TestFramework\Indexer\TestCase
-+class RowTest extends IndexerTestCase
- {
-     /**
--     * @var \Magento\Catalog\Model\Product
-+     * @var Processor
-      */
--    protected $_product;
-+    private $processor;
- 
-     /**
--     * @var \Magento\Catalog\Model\Category
-+     * @var \Magento\Framework\ObjectManagerInterface
-      */
--    protected $_category;
-+    private $objectManager;
- 
-     /**
--     * @var \Magento\Catalog\Model\Indexer\Product\Flat\State
-+     * @var ProductRepositoryInterface
-      */
--    protected $_state;
-+    private $productRepository;
- 
-     /**
--     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
-+     * @var CategoryRepositoryInterface
-      */
--    protected $_processor;
-+    private $categoryRepository;
- 
--    protected function setUp()
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-     {
--        $this->_product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Catalog\Model\Product::class
--        );
--        $this->_category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Catalog\Model\Category::class
--        );
--        $this->_processor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Catalog\Model\Indexer\Product\Flat\Processor::class
--        );
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->processor = $this->objectManager->get(Processor::class);
-+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-+        $this->categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
-     }
- 
-     /**
-+     * Tests product update
-+     *
-      * @magentoDbIsolation disabled
-      * @magentoDataFixture Magento/Catalog/_files/row_fixture.php
-      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
-      * @magentoAppArea frontend
-+     *
-+     * @return void
-+     * @throws \Magento\Framework\Exception\CouldNotSaveException
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\StateException
-      */
--    public function testProductUpdate()
-+    public function testProductUpdate(): void
-     {
--        $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
--            ->create(\Magento\Catalog\Model\CategoryFactory::class);
--        $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
--            ->create(\Magento\Catalog\Block\Product\ListProduct::class);
-+        /** @var ListProduct $listProduct */
-+        $listProduct = $this->objectManager->create(ListProduct::class);
- 
--        $this->_processor->getIndexer()->setScheduled(false);
--        $this->assertFalse(
--            $this->_processor->getIndexer()->isScheduled(),
-+        $this->processor->getIndexer()
-+            ->setScheduled(false);
-+        $isScheduled = $this->processor->getIndexer()
-+            ->isScheduled();
-+        self::assertFalse(
-+            $isScheduled,
-             'Indexer is in scheduled mode when turned to update on save mode'
-         );
- 
--        $this->_product->load(1);
--        $this->_product->setName('Updated Product');
--        $this->_product->save();
-+        $this->processor->reindexAll();
- 
--        $this->_processor->reindexAll();
--        
--        $category = $categoryFactory->create()->load(9);
-+        $product = $this->productRepository->get('simple');
-+        $product->setName('Updated Product');
-+        $this->productRepository->save($product);
-+
-+        /** @var \Magento\Catalog\Api\Data\CategoryInterface $category */
-+        $category = $this->categoryRepository->get(9);
-+        /** @var \Magento\Catalog\Model\Layer $layer */
-         $layer = $listProduct->getLayer();
-         $layer->setCurrentCategory($category);
-         /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
-         $productCollection = $layer->getProductCollection();
--        $this->assertTrue(
-+        self::assertTrue(
-             $productCollection->isEnabledFlat(),
-             'Product collection is not using flat resource when flat is on'
-         );
- 
--        $this->assertEquals(2, $productCollection->count(), 'Product collection items count must be exactly 2');
-+        self::assertEquals(
-+            2,
-+            $productCollection->count(),
-+            'Product collection items count must be exactly 2'
-+        );
- 
-         foreach ($productCollection as $product) {
-             /** @var $product \Magento\Catalog\Model\Product */
--            if ($product->getId() == 1) {
--                $this->assertEquals(
-+            if ($product->getSku() === 'simple') {
-+                self::assertEquals(
-                     'Updated Product',
-                     $product->getName(),
-                     'Product name from flat does not match with updated name'
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceWithDimensionTest.php
-new file mode 100644
-index 00000000000..80af901788d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceWithDimensionTest.php
-@@ -0,0 +1,86 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Indexer\Product\Price;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Api\ScopedProductTierPriceManagementInterface;
-+use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
-+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-+use Magento\Catalog\Pricing\Price\TierPrice;
-+use Magento\Customer\Model\Group as CustomerGroup;
-+
-+/**
-+ * @group indexer_dimension
-+ */
-+class SimpleWithOptionsTierPriceWithDimensionTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $productCollectionFactory;
-+
-+    /**
-+     * set up
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-+        $this->productCollectionFactory = $this->objectManager->create(CollectionFactory::class);
-+    }
-+
-+    /**
-+     * @magentoDbIsolation disabled
-+     * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
-+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
-+     */
-+    public function testTierPrice()
-+    {
-+        $tierPriceValue = 9.00;
-+
-+        $tierPrice = $this->objectManager->create(ProductTierPriceInterfaceFactory::class)
-+            ->create();
-+        $tierPrice->setCustomerGroupId(CustomerGroup::CUST_GROUP_ALL);
-+        $tierPrice->setQty(1.00);
-+        $tierPrice->setValue($tierPriceValue);
-+        $tierPriceManagement = $this->objectManager->create(ScopedProductTierPriceManagementInterface::class);
-+        $tierPriceManagement->add('simple333', $tierPrice);
-+
-+        $productCollection = $this->productCollectionFactory->create();
-+        $productCollection->addIdFilter(333);
-+        $productCollection->addPriceData();
-+        $productCollection->load();
-+        /** @var \Magento\Catalog\Model\Product $product */
-+        $product = $productCollection->getFirstItem();
-+        $tierPrice = $product->getPriceInfo()
-+            ->getPrice(TierPrice::PRICE_CODE)
-+            ->getValue();
-+
-+        $this->assertEquals($tierPriceValue, $tierPrice);
-+
-+        $tierPrice = $product->getTierPrice(1);
-+        $this->assertEquals($tierPriceValue, $tierPrice);
-+
-+        $tierPrices = $product->getData('tier_price');
-+        $this->assertEquals($tierPriceValue, $tierPrices[0]['price']);
-+
-+        $minPrice = $product->getData('min_price');
-+        $this->assertEquals($tierPriceValue, $minPrice);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
-index 5721982ab8d..d4926e78040 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
-@@ -38,8 +38,7 @@ class CategoryTest extends \PHPUnit\Framework\TestCase
-         /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
-         $collection = $this->_model->getProductCollection();
-         $this->assertInstanceOf(\Magento\Catalog\Model\ResourceModel\Product\Collection::class, $collection);
--        $ids = $collection->getAllIds();
--        $this->assertEquals(2, count($ids));
-+        $this->assertEquals(2, $collection->count());
-         $this->assertSame($collection, $this->_model->getProductCollection());
-     }
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php
-index 4b69bcd4615..e3a948d6c63 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php
-@@ -112,7 +112,7 @@ class AlgorithmBaseTest extends \PHPUnit\Framework\TestCase
-         $items = $model->calculateSeparators($interval);
-         $this->assertEquals(array_keys($intervalItems), array_keys($items));
- 
--        for ($i = 0; $i < count($intervalItems); ++$i) {
-+        for ($i = 0, $count = count($intervalItems); $i < $count; ++$i) {
-             $this->assertInternalType('array', $items[$i]);
-             $this->assertEquals($intervalItems[$i]['from'], $items[$i]['from']);
-             $this->assertEquals($intervalItems[$i]['to'], $items[$i]['to']);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
-index 1a0439fccac..973d290d614 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Catalog\Model\Product\Attribute\Backend;
- 
- use Magento\Catalog\Api\Data\ProductInterface;
-@@ -11,6 +13,7 @@ use Magento\Catalog\Api\Data\ProductInterface;
-  * Test class for \Magento\Catalog\Model\Product\Attribute\Backend\Tierprice.
-  *
-  * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class TierpriceTest extends \PHPUnit\Framework\TestCase
- {
-@@ -24,6 +27,11 @@ class TierpriceTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $productRepository;
- 
-+    /**
-+     * @var \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory
-+     */
-+    private $tierPriceFactory;
-+
-     /**
-      * @var \Magento\Catalog\Model\Product\Attribute\Backend\Tierprice
-      */
-@@ -40,6 +48,9 @@ class TierpriceTest extends \PHPUnit\Framework\TestCase
-         $this->metadataPool = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-             \Magento\Framework\EntityManager\MetadataPool::class
-         );
-+        $this->tierPriceFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+            ->create(\Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory::class);
-+
-         $this->_model->setAttribute(
-             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                 \Magento\Eav\Model\Config::class
-@@ -57,27 +68,49 @@ class TierpriceTest extends \PHPUnit\Framework\TestCase
-             [
-                 ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
-                 ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5],
-+                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 5.6, 'price' => 4],
-             ]
-         );
-         $this->assertTrue($this->_model->validate($product));
-     }
- 
-     /**
-+     * Test that duplicated tier price values issues exception during validation.
-+     *
-+     * @dataProvider validateDuplicateDataProvider
-      * @expectedException \Magento\Framework\Exception\LocalizedException
-      */
--    public function testValidateDuplicate()
-+    public function testValidateDuplicate(array $tierPricesData)
-     {
-         $product = new \Magento\Framework\DataObject();
--        $product->setTierPrice(
--            [
--                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
--                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
--            ]
--        );
-+        $product->setTierPrice($tierPricesData);
- 
-         $this->_model->validate($product);
-     }
- 
-+    /**
-+     * testValidateDuplicate data provider.
-+     *
-+     * @return array
-+     */
-+    public function validateDuplicateDataProvider(): array
-+    {
-+        return [
-+            [
-+                [
-+                    ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
-+                    ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
-+                ],
-+            ],
-+            [
-+                [
-+                    ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2.2, 'price' => 8],
-+                    ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2.2, 'price' => 8],
-+                ],
-+            ],
-+        ];
-+    }
-+
-     /**
-      * @expectedException \Magento\Framework\Exception\LocalizedException
-      */
-@@ -86,9 +119,9 @@ class TierpriceTest extends \PHPUnit\Framework\TestCase
-         $product = new \Magento\Framework\DataObject();
-         $product->setTierPrice(
-             [
--                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
--                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5],
--                ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5],
-+                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2.2, 'price' => 8],
-+                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 5.3, 'price' => 5],
-+                ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5.3, 'price' => 5],
-             ]
-         );
- 
-@@ -116,12 +149,17 @@ class TierpriceTest extends \PHPUnit\Framework\TestCase
-             ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
-             ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5],
-             ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5],
-+            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5.3, 'price' => 4],
-+            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5.4, 'price' => 3],
-+            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => '5.40', 'price' => 2],
-         ];
- 
-         $newData = $this->_model->preparePriceData($data, \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE, 1);
--        $this->assertEquals(2, count($newData));
-+        $this->assertEquals(4, count($newData));
-         $this->assertArrayHasKey('1-2', $newData);
-         $this->assertArrayHasKey('1-5', $newData);
-+        $this->assertArrayHasKey('1-5.3', $newData);
-+        $this->assertArrayHasKey('1-5.4', $newData);
-     }
- 
-     public function testAfterLoad()
-@@ -137,87 +175,163 @@ class TierpriceTest extends \PHPUnit\Framework\TestCase
-         $this->_model->afterLoad($product);
-         $price = $product->getTierPrice();
-         $this->assertNotEmpty($price);
--        $this->assertEquals(4, count($price));
-+        $this->assertEquals(5, count($price));
-     }
- 
-     /**
--     * @magentoAppArea adminhtml
--     * @param array $tierPrice
--     * @param bool $isChanged
--     * @param int $tierPriceCtr
--     * @dataProvider afterSaveDataProvider
-+     * @dataProvider saveExistingProductDataProvider
-+     * @param array $tierPricesData
-+     * @param int $tierPriceCount
-+     * @throws \Magento\Framework\Exception\CouldNotSaveException
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\StateException
-      */
--    public function testAfterSave($tierPrice, $isChanged, $tierPriceCtr)
-+    public function testSaveExistingProduct(array $tierPricesData, int $tierPriceCount): void
-     {
-         /** @var $product \Magento\Catalog\Model\Product */
--        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Catalog\Model\Product::class
--        );
--        $product->load($this->productRepository->get('simple')->getId());
--        $product->unlockAttributes();
--        // Added tier price
--        $product->setTierPrice($tierPrice);
--
--        $this->_model->afterSave($product);
--        $this->assertEquals($isChanged, $product->getData('tier_price_changed'));
--
--        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Catalog\Model\Product::class
--        );
--        $fixtureProduct = $this->productRepository->get('simple');
--        $product->setId($fixtureProduct->getId());
--        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
--        $product->setData($linkField, $fixtureProduct->getData($linkField));
--        $this->_model->afterLoad($product);
--        $this->assertEquals($tierPriceCtr, count($product->getTierPrice()));
-+        $product = $this->productRepository->get('simple', true);
-+        $tierPrices = [];
-+        foreach ($tierPricesData as $tierPrice) {
-+            $tierPrices[] = $this->tierPriceFactory->create([
-+                'data' => $tierPrice
-+            ]);
-+        }
-+        $product->setTierPrices($tierPrices);
-+        $product = $this->productRepository->save($product);
-+        $this->assertEquals($tierPriceCount, count($product->getTierPrice()));
-         $this->assertEquals(0, $product->getData('tier_price_changed'));
-     }
- 
--    public function afterSaveDataProvider()
-+    /**
-+     * @return array
-+     */
-+    public function saveExistingProductDataProvider(): array
-     {
-         return [
-             'same' => [
-                 [
--                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 2, 'price' => 8],
--                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 5, 'price' => 5],
--                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 5],
--                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 10, 'percentage_value' => 50],
-+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 2, 'value' => 8],
-+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 5, 'value' => 5],
-+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3, 'value' => 5],
-+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3.2, 'value' => 6],
-+                    [
-+                        'website_id' => 0,
-+                        'customer_group_id' => 0,
-+                        'qty' => 10,
-+                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 50])
-+                    ],
-                 ],
--                0,
--                4,
-+                5,
-             ],
-             'update one' => [
-                 [
--                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 2, 'price' => 8],
--                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 5, 'price' => 5],
--                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 5],
--                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 10, 'percentage_value' => 10],
-+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 2, 'value' => 8],
-+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 5, 'value' => 5],
-+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3, 'value' => 5],
-+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => '3.2', 'value' => 6],
-+                    [
-+                        'website_id' => 0,
-+                        'customer_group_id' => 0,
-+                        'qty' => 10,
-+                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 10])
-+                    ],
-                 ],
--                1,
--                4,
-+                5,
-             ],
-             'delete one' => [
-                 [
--                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 2, 'price' => 8, 'delete' => true],
--                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 5, 'price' => 5],
--                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 5],
--                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 10, 'percentage_value' => 50],
-+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 5, 'value' => 5],
-+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3, 'value' => 5],
-+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => '3.2', 'value' => 6],
-+                    [
-+                        'website_id' => 0,
-+                        'customer_group_id' => 0,
-+                        'qty' => 10,
-+                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 50])
-+                    ],
-                 ],
--                1,
--                3,
-+                4,
-             ],
-             'add one' => [
-                 [
--                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 2, 'price' => 8],
--                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 5, 'price' => 5],
--                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 20, 'percentage_value' => 90],
--                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 5],
--                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 10, 'percentage_value' => 50],
-+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 2, 'value' => 8],
-+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 5, 'value' => 5],
-+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3, 'value' => 5],
-+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3.2, 'value' => 6],
-+                    [
-+                        'website_id' => 0,
-+                        'customer_group_id' => 32000,
-+                        'qty' => 20,
-+                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 90])
-+                    ],
-+                    [
-+                        'website_id' => 0,
-+                        'customer_group_id' => 0,
-+                        'qty' => 10,
-+                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 50])
-+                    ],
-                 ],
--                1,
--                5,
-+                6,
-+            ],
-+            'delete all' => [[], 0,],
-+        ];
-+    }
-+
-+    /**
-+     * @dataProvider saveNewProductDataProvider
-+     * @param array $tierPricesData
-+     * @param int $tierPriceCount
-+     * @throws \Magento\Framework\Exception\CouldNotSaveException
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\StateException
-+     */
-+    public function testSaveNewProduct(array $tierPricesData, int $tierPriceCount): void
-+    {
-+        /** @var $product \Magento\Catalog\Model\Product */
-+        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+            ->create(\Magento\Catalog\Model\Product::class);
-+        $product->isObjectNew(true);
-+        $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+            ->setAttributeSetId(4)
-+            ->setName('Simple Product New')
-+            ->setSku('simple product new')
-+            ->setPrice(10);
-+        $tierPrices = [];
-+        foreach ($tierPricesData as $tierPrice) {
-+            $tierPrices[] = $this->tierPriceFactory->create([
-+                'data' => $tierPrice,
-+            ]);
-+        }
-+        $product->setTierPrices($tierPrices);
-+        $product = $this->productRepository->save($product);
-+        $this->assertEquals($tierPriceCount, count($product->getTierPrice()));
-+        $this->assertEquals(0, $product->getData('tier_price_changed'));
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function saveNewProductDataProvider(): array
-+    {
-+        return [
-+            [
-+                [
-+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 2, 'value' => 8],
-+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 5, 'value' => 5],
-+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3, 'value' => 5],
-+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => '3.2', 'value' => 4],
-+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => '3.3', 'value' => 3],
-+                    [
-+                        'website_id' => 0,
-+                        'customer_group_id' => 0,
-+                        'qty' => 10,
-+                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 50])
-+                    ],
-+                ],
-+                6,
-             ],
--            'delete all' => [[], 1, 0,],
-         ];
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php
-index e7a2d17586a..37ef6020886 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php
-@@ -6,6 +6,8 @@
- 
- namespace Magento\Catalog\Model\Product\Option\Type\File;
- 
-+use Magento\Framework\Math\Random;
-+
- /**
-  * @magentoDataFixture Magento/Catalog/_files/validate_image.php
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -48,11 +50,18 @@ class ValidatorFileTest extends \PHPUnit\Framework\TestCase
-         $fileSize = $this->objectManager->create(\Magento\Framework\File\Size::class);
-         $this->maxFileSize = $fileSize->getMaxFileSize();
-         $this->maxFileSizeInMb = $fileSize->getMaxFileSizeInMb();
-+        $random = $this->getMockBuilder(Random::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $random->expects($this->any())
-+            ->method('getRandomString')
-+            ->willReturn('RandomString');
- 
-         $this->model = $this->objectManager->create(
--            \Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile::class,
-+            ValidatorFile::class,
-             [
--                'httpFactory' => $this->httpFactoryMock
-+                'httpFactory' => $this->httpFactoryMock,
-+                'random' => $random,
-             ]
-         );
-     }
-@@ -350,8 +359,8 @@ class ValidatorFileTest extends \PHPUnit\Framework\TestCase
-         return [
-             'type' => 'image/jpeg',
-             'title' => 'test.jpg',
--            'quote_path' => 'custom_options/quote/t/e/a071b9ffc8fda6df1652c05a4c61bf8a.jpg',
--            'order_path' => 'custom_options/order/t/e/a071b9ffc8fda6df1652c05a4c61bf8a.jpg',
-+            'quote_path' => 'custom_options/quote/t/e/RandomString',
-+            'order_path' => 'custom_options/order/t/e/RandomString',
-             'size' => '3046',
-             'width' => 136,
-             'height' => 131,
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/OptionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/OptionTest.php
-index c9d5ed732df..bfb49686447 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/OptionTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/OptionTest.php
-@@ -8,6 +8,8 @@ namespace Magento\Catalog\Model\Product;
- 
- use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
- use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Store\Model\Store;
-+use Magento\Store\Model\StoreManagerInterface;
- use Magento\TestFramework\Helper\Bootstrap;
- 
- /**
-@@ -31,6 +33,11 @@ class OptionTest extends \PHPUnit\Framework\TestCase
-      */
-     private $customOptionFactory;
- 
-+    /**
-+     * @var StoreManagerInterface
-+     */
-+    private $storeManager;
-+
-     /**
-      * @inheritdoc
-      */
-@@ -38,6 +45,7 @@ class OptionTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
-         $this->customOptionFactory = Bootstrap::getObjectManager()->create(ProductCustomOptionInterfaceFactory::class);
-+        $this->storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
-     }
- 
-     /**
-@@ -103,4 +111,39 @@ class OptionTest extends \PHPUnit\Framework\TestCase
- 
-         return $this->customOptionFactory->create(['data' => $data]);
-     }
-+
-+    /**
-+     * Test to save option price by store
-+     *
-+     * @magentoDataFixture Magento/Catalog/_files/product_with_options.php
-+     * @magentoDataFixture Magento/Store/_files/core_second_third_fixturestore.php
-+     * @magentoConfigFixture default_store catalog/price/scope 1
-+     * @magentoConfigFixture secondstore_store catalog/price/scope 1
-+     */
-+    public function testSaveOptionPriceByStore()
-+    {
-+        $secondWebsitePrice = 22.0;
-+        $defaultStoreId = $this->storeManager->getStore()->getId();
-+        $secondStoreId = $this->storeManager->getStore('secondstore')->getId();
-+
-+        /** @var \Magento\Catalog\Model\Product $product */
-+        $product = $this->productRepository->get('simple');
-+        $option = $product->getOptions()[0];
-+        $defaultPrice = $option->getPrice();
-+
-+        $option->setPrice($secondWebsitePrice);
-+        $product->setStoreId($secondStoreId);
-+        // set Current store='secondstore' to correctly save product options for 'secondstore'
-+        $this->storeManager->setCurrentStore($secondStoreId);
-+        $this->productRepository->save($product);
-+        $this->storeManager->setCurrentStore($defaultStoreId);
-+
-+        $product = $this->productRepository->get('simple', false, Store::DEFAULT_STORE_ID, true);
-+        $option = $product->getOptions()[0];
-+        $this->assertEquals($defaultPrice, $option->getPrice(), 'Price value by default store is wrong');
-+
-+        $product = $this->productRepository->get('simple', false, $secondStoreId, true);
-+        $option = $product->getOptions()[0];
-+        $this->assertEquals($secondWebsitePrice, $option->getPrice(), 'Price value by store_id=1 is wrong');
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
-new file mode 100644
-index 00000000000..fe39de2729e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
-@@ -0,0 +1,183 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model\Product\Type;
-+
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\ProductRepository;
-+use Magento\Framework\App\ResourceConnection;
-+use Magento\Framework\DataObject;
-+use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
-+use Magento\Framework\Indexer\DimensionFactory;
-+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
-+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * @magentoDbIsolation disabled
-+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
-+ * @group indexer_dimension
-+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-+ */
-+class PriceWithDimensionTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Catalog\Model\Product\Type\Price
-+     */
-+    protected $_model;
-+
-+    /**
-+     * Set up
-+     */
-+    protected function setUp()
-+    {
-+        $this->_model = Bootstrap::getObjectManager()->create(
-+            \Magento\Catalog\Model\Product\Type\Price::class
-+        );
-+    }
-+
-+    /**
-+     * Get price from indexer
-+     */
-+    public function testGetPriceFromIndexer()
-+    {
-+        /** @var PriceTableResolver $tableResolver */
-+        $tableResolver = Bootstrap::getObjectManager()->create(PriceTableResolver::class);
-+
-+        /** @var ResourceConnection $resourceConnection */
-+        $resourceConnection = Bootstrap::getObjectManager()->create(ResourceConnection::class);
-+
-+        /** @var DimensionFactory $dimensionFactory */
-+        $dimensionFactory = Bootstrap::getObjectManager()->create(DimensionFactory::class);
-+        $dimension = [
-+            $dimensionFactory->create(CustomerGroupDimensionProvider::DIMENSION_NAME, (string)0),
-+            $dimensionFactory->create(WebsiteDimensionProvider::DIMENSION_NAME, (string)1)
-+        ];
-+        $connection = $resourceConnection->getConnection();
-+        $priceTable = $connection->getTableName(
-+            $tableResolver->resolve('catalog_product_index_price', $dimension)
-+        );
-+
-+        $select = $connection->select()->from($priceTable)->where('entity_id = 1');
-+
-+        $return = $connection->fetchAll($select);
-+
-+        $this->assertEquals('10', $return[0]['price']);
-+        $this->assertEquals('10', $return[0]['final_price']);
-+        $this->assertEquals('19', $return[0]['min_price']);
-+        $this->assertEquals('19', $return[0]['max_price']);
-+    }
-+
-+    /**
-+     * Get price
-+     */
-+    public function testGetPrice()
-+    {
-+        $this->assertEquals('test', $this->_model->getPrice(new DataObject(['price' => 'test'])));
-+    }
-+
-+    /**
-+     * Get final price
-+     */
-+    public function testGetFinalPrice()
-+    {
-+        $repository = Bootstrap::getObjectManager()->create(
-+            ProductRepository::class
-+        );
-+        $product = $repository->get('simple');
-+        // fixture
-+
-+        // regular & tier prices
-+        $this->assertEquals(10.0, $this->_model->getFinalPrice(1, $product));
-+        $this->assertEquals(8.0, $this->_model->getFinalPrice(2, $product));
-+        $this->assertEquals(5.0, $this->_model->getFinalPrice(5, $product));
-+
-+        // with options
-+        $buyRequest = $this->prepareBuyRequest($product);
-+        $product->getTypeInstance()->prepareForCart($buyRequest, $product);
-+
-+        //product price + options price(10+1+2+3+3)
-+        $this->assertEquals(19.0, $this->_model->getFinalPrice(1, $product));
-+
-+        //product tier price + options price(5+1+2+3+3)
-+        $this->assertEquals(14.0, $this->_model->getFinalPrice(5, $product));
-+    }
-+
-+    /**
-+     * Get formatted price
-+     */
-+    public function testGetFormatedPrice()
-+    {
-+        $repository = Bootstrap::getObjectManager()->create(
-+            ProductRepository::class
-+        );
-+        $product = $repository->get('simple');
-+        // fixture
-+        $this->assertEquals('<span class="price">$10.00</span>', $this->_model->getFormatedPrice($product));
-+    }
-+
-+    /**
-+     * Calculate price
-+     */
-+    public function testCalculatePrice()
-+    {
-+        $this->assertEquals(10, $this->_model->calculatePrice(10, 8, '1970-12-12 23:59:59', '1971-01-01 01:01:01'));
-+        $this->assertEquals(8, $this->_model->calculatePrice(10, 8, '1970-12-12 23:59:59', '2034-01-01 01:01:01'));
-+    }
-+
-+    /**
-+     * Calculate special price
-+     */
-+    public function testCalculateSpecialPrice()
-+    {
-+        $this->assertEquals(
-+            10,
-+            $this->_model->calculateSpecialPrice(10, 8, '1970-12-12 23:59:59', '1971-01-01 01:01:01')
-+        );
-+        $this->assertEquals(
-+            8,
-+            $this->_model->calculateSpecialPrice(10, 8, '1970-12-12 23:59:59', '2034-01-01 01:01:01')
-+        );
-+    }
-+
-+    /**
-+     * Is tier price fixed
-+     */
-+    public function testIsTierPriceFixed()
-+    {
-+        $this->assertTrue($this->_model->isTierPriceFixed());
-+    }
-+
-+    /**
-+     * Build buy request based on product custom options
-+     *
-+     * @param Product $product
-+     * @return DataObject
-+     */
-+    private function prepareBuyRequest(Product $product)
-+    {
-+        $options = [];
-+        /** @var $option \Magento\Catalog\Model\Product\Option */
-+        foreach ($product->getOptions() as $option) {
-+            switch ($option->getGroupByType()) {
-+                case \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_DATE:
-+                    $value = ['year' => 2013, 'month' => 8, 'day' => 9, 'hour' => 13, 'minute' => 35];
-+                    break;
-+                case \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_SELECT:
-+                    $value = key($option->getValues());
-+                    break;
-+                default:
-+                    $value = 'test';
-+                    break;
-+            }
-+            $options[$option->getId()] = $value;
-+        }
-+
-+        return new DataObject(['qty' => 1, 'options' => $options]);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php
-index f9075a58c39..4cf059d4bf6 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php
-@@ -42,6 +42,46 @@ class UrlTest extends \PHPUnit\Framework\TestCase
-         $this->assertStringEndsWith('simple-product.html', $this->_model->getUrlInStore($product));
-     }
- 
-+    /**
-+     * @magentoDataFixture Magento/Store/_files/second_store.php
-+     * @magentoConfigFixture default_store web/unsecure/base_url http://sample.com/
-+     * @magentoConfigFixture default_store web/unsecure/base_link_url http://sample.com/
-+     * @magentoConfigFixture fixturestore_store web/unsecure/base_url http://sample-second.com/
-+     * @magentoConfigFixture fixturestore_store web/unsecure/base_link_url http://sample-second.com/
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple_multistore.php
-+     * @dataProvider getUrlsWithSecondStoreProvider
-+     * @magentoAppArea adminhtml
-+     */
-+    public function testGetUrlInStoreWithSecondStore($storeCode, $expectedProductUrl)
-+    {
-+        $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+            \Magento\Catalog\Model\ProductRepository::class
-+        );
-+        /** @var \Magento\Store\Model\Store $store */
-+        $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+            ->create(\Magento\Store\Model\Store::class);
-+        $store->load($storeCode, 'code');
-+        /** @var \Magento\Store\Model\Store $store */
-+
-+        $product = $repository->get('simple');
-+
-+        $this->assertEquals(
-+            $expectedProductUrl,
-+            $this->_model->getUrlInStore($product, ['_scope' => $store->getId(), '_nosid' => true])
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getUrlsWithSecondStoreProvider()
-+    {
-+        return [
-+           'case1' => ['fixturestore', 'http://sample-second.com/index.php/simple-product-one.html'],
-+           'case2' => ['default', 'http://sample.com/index.php/simple-product-one.html']
-+        ];
-+    }
-+
-     public function testGetProductUrl()
-     {
-         $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
-index 8370e514dc2..a1923e63972 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
-@@ -69,7 +69,7 @@ class ProductExternalTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->assertFalse($this->_model->getCategoryId());
-         $category = new \Magento\Framework\DataObject(['id' => 5]);
--
-+        $this->_model->setCategoryIds([5]);
-         $this->objectManager->get(\Magento\Framework\Registry::class)->register('current_category', $category);
-         try {
-             $this->assertEquals(5, $this->_model->getCategoryId());
-@@ -83,6 +83,7 @@ class ProductExternalTest extends \PHPUnit\Framework\TestCase
-     public function testGetCategory()
-     {
-         $this->assertEmpty($this->_model->getCategory());
-+        $this->_model->setCategoryIds([3]);
- 
-         $this->objectManager->get(\Magento\Framework\Registry::class)
-             ->register('current_category', new \Magento\Framework\DataObject(['id' => 3]));
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceWithDimensionTest.php
-new file mode 100644
-index 00000000000..348d6e19b44
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceWithDimensionTest.php
-@@ -0,0 +1,138 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Model;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\ResourceModel\Product\Collection;
-+use Magento\CatalogInventory\Api\StockRegistryInterface;
-+
-+/**
-+ * Tests product model:
-+ * - pricing behaviour is tested
-+ * @group indexer_dimension
-+ * @magentoDbIsolation disabled
-+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
-+ * @see \Magento\Catalog\Model\ProductTest
-+ * @see \Magento\Catalog\Model\ProductExternalTest
-+ */
-+class ProductPriceWithDimensionTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Catalog\Model\Product
-+     */
-+    protected $_model;
-+
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * Set up
-+     */
-+    protected function setUp()
-+    {
-+        $this->_model = Bootstrap::getObjectManager()->create(Product::class);
-+        $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * Get price
-+     */
-+    public function testGetPrice()
-+    {
-+        $this->assertEmpty($this->_model->getPrice());
-+        $this->_model->setPrice(10.0);
-+        $this->assertEquals(10.0, $this->_model->getPrice());
-+    }
-+
-+    /**
-+     * Get price model
-+     */
-+    public function testGetPriceModel()
-+    {
-+        $default = $this->_model->getPriceModel();
-+        $this->assertInstanceOf(\Magento\Catalog\Model\Product\Type\Price::class, $default);
-+        $this->assertSame($default, $this->_model->getPriceModel());
-+    }
-+
-+    /**
-+     * See detailed tests at \Magento\Catalog\Model\Product\Type*_PriceTest
-+     */
-+    public function testGetTierPrice()
-+    {
-+        $this->assertEquals([], $this->_model->getTierPrice());
-+    }
-+
-+    /**
-+     * See detailed tests at \Magento\Catalog\Model\Product\Type*_PriceTest
-+     */
-+    public function testGetTierPriceCount()
-+    {
-+        $this->assertEquals(0, $this->_model->getTierPriceCount());
-+    }
-+
-+    /**
-+     * See detailed tests at \Magento\Catalog\Model\Product\Type*_PriceTest
-+     */
-+    public function testGetFormatedPrice()
-+    {
-+        $this->assertEquals('<span class="price">$0.00</span>', $this->_model->getFormatedPrice());
-+    }
-+
-+    /**
-+     * Set get final price
-+     */
-+    public function testSetGetFinalPrice()
-+    {
-+        $this->assertEquals(0, $this->_model->getFinalPrice());
-+        $this->_model->setPrice(10);
-+        $this->_model->setFinalPrice(10);
-+        $this->assertEquals(10, $this->_model->getFinalPrice());
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Catalog/_files/product_with_options.php
-+     * @return void
-+     */
-+    public function testGetMinPrice(): void
-+    {
-+        $product = $this->productRepository->get('simple');
-+        $collection = Bootstrap::getObjectManager()->create(Collection::class);
-+        $collection->addIdFilter($product->getId());
-+        $collection->addPriceData();
-+        $collection->load();
-+        /** @var \Magento\Catalog\Model\Product $product */
-+        $product = $collection->getFirstItem();
-+        $this->assertEquals(323, $product->getData('min_price'));
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable_sku.php
-+     */
-+    public function testGetMinPriceForComposite()
-+    {
-+        $confProduct = $this->productRepository->get('configurable');
-+        $collection = Bootstrap::getObjectManager()->create(Collection::class);
-+        $collection->addIdFilter($confProduct->getId());
-+        $collection->addPriceData();
-+        $collection->load();
-+        $product = $collection->getFirstItem();
-+        $this->assertEquals(10, $product->getData('min_price'));
-+
-+        $childProduct = $this->productRepository->get('simple_10');
-+        $stockRegistry = Bootstrap::getObjectManager()->get(StockRegistryInterface::class);
-+        $stockItem = $stockRegistry->getStockItem($childProduct->getId());
-+        $stockItem->setIsInStock(false);
-+        $stockRegistry->updateStockItemBySku($childProduct->getSku(), $stockItem);
-+        $collection->clear()->load();
-+        $product = $collection->getFirstItem();
-+        $this->assertEquals(20, $product->getData('min_price'));
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
-index 39752460a1c..cbde2fa1d2b 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
-@@ -8,6 +8,7 @@ declare(strict_types=1);
- namespace Magento\Catalog\Model;
- 
- use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
- use Magento\TestFramework\Helper\Bootstrap;
- 
- /**
-@@ -15,6 +16,7 @@ use Magento\TestFramework\Helper\Bootstrap;
-  *
-  * @magentoDbIsolation enabled
-  * @magentoAppIsolation enabled
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
- {
-@@ -30,6 +32,16 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     private $searchCriteriaBuilder;
- 
-+    /**
-+     * @var ProductFactory
-+     */
-+    private $productFactory;
-+
-+    /**
-+     * @var ProductResource
-+     */
-+    private $productResource;
-+
-     /**
-      * Sets up common objects
-      */
-@@ -42,6 +54,12 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->searchCriteriaBuilder = \Magento\Framework\App\ObjectManager::getInstance()->create(
-             \Magento\Framework\Api\SearchCriteriaBuilder::class
-         );
-+
-+        $this->productFactory = Bootstrap::getObjectManager()->get(ProductFactory::class);
-+
-+        $this->productResource = Bootstrap::getObjectManager()->get(ProductResource::class);
-+
-+        $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-     }
- 
-     /**
-@@ -90,4 +108,82 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
-             ['sku' => 'simple '],
-         ];
-     }
-+
-+    /**
-+     * Test save product with gallery image
-+     *
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_image.php
-+     *
-+     * @throws \Magento\Framework\Exception\CouldNotSaveException
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Magento\Framework\Exception\StateException
-+     */
-+    public function testSaveProductWithGalleryImage(): void
-+    {
-+        /** @var $mediaConfig \Magento\Catalog\Model\Product\Media\Config */
-+        $mediaConfig = Bootstrap::getObjectManager()
-+            ->get(\Magento\Catalog\Model\Product\Media\Config::class);
-+
-+        /** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
-+        $mediaDirectory = Bootstrap::getObjectManager()
-+            ->get(\Magento\Framework\Filesystem::class)
-+            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
-+
-+        $product = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+        $product->load(1);
-+
-+        $path = $mediaConfig->getBaseMediaPath() . '/magento_image.jpg';
-+        $absolutePath = $mediaDirectory->getAbsolutePath() . $path;
-+        $product->addImageToMediaGallery(
-+            $absolutePath,
-+            [
-+            'image',
-+            'small_image',
-+            ],
-+            false,
-+            false
-+        );
-+
-+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+        $productRepository = Bootstrap::getObjectManager()
-+            ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+        $productRepository->save($product);
-+
-+        $gallery = $product->getData('media_gallery');
-+        $this->assertArrayHasKey('images', $gallery);
-+        $images = array_values($gallery['images']);
-+
-+        $this->assertNotEmpty($gallery);
-+        $this->assertTrue(isset($images[0]['file']));
-+        $this->assertStringStartsWith('/m/a/magento_image', $images[0]['file']);
-+        $this->assertArrayHasKey('media_type', $images[0]);
-+        $this->assertEquals('image', $images[0]['media_type']);
-+        $this->assertStringStartsWith('/m/a/magento_image', $product->getData('image'));
-+        $this->assertStringStartsWith('/m/a/magento_image', $product->getData('small_image'));
-+    }
-+
-+    /**
-+     * Test Product Repository can change(update) "sku" for given product.
-+     *
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-+     * @magentoDbIsolation enabled
-+     * @magentoAppArea adminhtml
-+     */
-+    public function testUpdateProductSku()
-+    {
-+        $newSku = 'simple-edited';
-+        $productId = $this->productResource->getIdBySku('simple');
-+        $initialProduct = $this->productFactory->create();
-+        $this->productResource->load($initialProduct, $productId);
-+
-+        $initialProduct->setSku($newSku);
-+        $this->productRepository->save($initialProduct);
-+
-+        $updatedProduct = $this->productFactory->create();
-+        $this->productResource->load($updatedProduct, $productId);
-+        self::assertSame($newSku, $updatedProduct->getSku());
-+
-+        //clean up.
-+        $this->productRepository->delete($updatedProduct);
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
-index 82d39bbb706..c34120404a9 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
-@@ -581,8 +581,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-             '4-2-radio' => 40000.00
-         ];
-         foreach ($options as $option) {
-+            if (!$option->getValues()) {
-+                continue;
-+            }
-             foreach ($option->getValues() as $value) {
--                $this->assertEquals($expectedValue[$value->getSku()], floatval($value->getPrice()));
-+                $this->assertEquals($expectedValue[$value->getSku()], (float)$value->getPrice());
-             }
-         }
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php
-index a5e55e181cb..4cc6265a992 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Catalog\Model\ResourceModel\Product;
- 
-+/**
-+ * Collection test
-+ */
- class CollectionTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -181,10 +184,35 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         $productTable = $this->collection->getTable('catalog_product_entity');
-         $urlRewriteTable = $this->collection->getTable('url_rewrite');
- 
-+        // phpcs:ignore
-         $expected = 'SELECT `e`.*, `alias`.`request_path` FROM `' . $productTable . '` AS `e`'
-             . ' LEFT JOIN `' . $urlRewriteTable . '` AS `alias` ON (alias.entity_id =e.entity_id)'
-             . ' AND (alias.entity_type = \'product\')';
- 
-         self::assertContains($expected, str_replace(PHP_EOL, '', $sql));
-     }
-+
-+    /**
-+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php
-+     * @magentoDbIsolation enabled
-+     */
-+    public function testAddAttributeToFilterAffectsGetSize(): void
-+    {
-+        $this->assertEquals(10, $this->collection->getSize());
-+        $this->collection->addAttributeToFilter('sku', 'Product1');
-+        $this->assertEquals(1, $this->collection->getSize());
-+    }
-+
-+    /**
-+     * Add tier price attribute filter to collection
-+     *
-+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php
-+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/product_simple.php
-+     */
-+    public function testAddAttributeTierPriceToFilter(): void
-+    {
-+        $this->assertEquals(11, $this->collection->getSize());
-+        $this->collection->addAttributeToFilter('tier_price', ['gt' => 0]);
-+        $this->assertEquals(1, $this->collection->getSize());
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
-index 4280e9dc891..5cf6d00fe77 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
-@@ -8,6 +8,7 @@ namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav;
- use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Catalog\Model\Product\Attribute\Source\Status;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Catalog\_files\MultiselectSourceMock;
- 
- /**
-  * Class SourceTest
-@@ -157,4 +158,50 @@ class SourceTest extends \PHPUnit\Framework\TestCase
-         $result = $connection->fetchAll($select);
-         $this->assertCount(3, $result);
-     }
-+
-+    /**
-+     * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model.php
-+     * @magentoDbIsolation disabled
-+     */
-+    public function testReindexMultiselectAttributeWithSourceModel()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = $objectManager->create(ProductRepositoryInterface::class);
-+
-+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attr **/
-+        $attr = $objectManager->get(\Magento\Eav\Model\Config::class)
-+           ->getAttribute('catalog_product', 'multiselect_attr_with_source');
-+
-+        /** @var $sourceModel MultiselectSourceMock */
-+        $sourceModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+            MultiselectSourceMock::class
-+        );
-+        $options = $sourceModel->getAllOptions();
-+        $product1Id = $options[0]['value'] * 10;
-+        $product2Id = $options[1]['value'] * 10;
-+
-+        /** @var \Magento\Catalog\Model\Product $product1 **/
-+        $product1 = $productRepository->getById($product1Id);
-+        $product1->setSpecialFromDate(date('Y-m-d H:i:s'));
-+        $product1->setNewsFromDate(date('Y-m-d H:i:s'));
-+        $productRepository->save($product1);
-+
-+        /** @var \Magento\Catalog\Model\Product $product2 **/
-+        $product2 = $productRepository->getById($product2Id);
-+        $product1->setSpecialFromDate(date('Y-m-d H:i:s'));
-+        $product1->setNewsFromDate(date('Y-m-d H:i:s'));
-+        $productRepository->save($product2);
-+
-+        $this->_eavIndexerProcessor->reindexAll();
-+        $connection = $this->productResource->getConnection();
-+        $select = $connection->select()
-+            ->from($this->productResource->getTable('catalog_product_index_eav'))
-+            ->where('entity_id in (?)', [$product1Id, $product2Id])
-+            ->where('attribute_id = ?', $attr->getId());
-+
-+        $result = $connection->fetchAll($select);
-+        $this->assertCount(3, $result);
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
-index 7954e2c3622..476f01eb277 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
-@@ -12,6 +12,11 @@ use PHPUnit\Framework\TestCase;
- 
- class ProductTest extends TestCase
- {
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-     /**
-      * @var Product
-      */
-@@ -29,7 +34,8 @@ class ProductTest extends TestCase
-     {
-         $this->objectManager = Bootstrap::getObjectManager();
- 
--        $this->model = $this->objectManager->get(Product::class);
-+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-+        $this->model = $this->objectManager->create(Product::class);
-     }
- 
-     /**
-@@ -42,11 +48,29 @@ class ProductTest extends TestCase
-         $sku = 'simple';
-         $attribute = 'name';
- 
--        /** @var ProductRepositoryInterface $productRepository */
--        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
--        $product = $productRepository->get($sku);
--
-+        $product = $this->productRepository->get($sku);
-         $actual = $this->model->getAttributeRawValue($product->getId(), $attribute, null);
-         self::assertEquals($product->getName(), $actual);
-     }
-+
-+    /**
-+     * @magentoAppArea adminhtml
-+     * @magentoDataFixture Magento/Catalog/_files/product_special_price.php
-+     * @magentoAppIsolation enabled
-+     * @magentoConfigFixture default_store catalog/price/scope 1
-+     */
-+    public function testUpdateStoreSpecificSpecialPrice()
-+    {
-+        /** @var \Magento\Catalog\Model\Product $product */
-+        $product = $this->productRepository->get('simple', true, 1);
-+        $this->assertEquals(5.99, $product->getSpecialPrice());
-+
-+        $product->setSpecialPrice('');
-+        $this->model->save($product);
-+        $product = $this->productRepository->get('simple', false, 1, true);
-+        $this->assertEmpty($product->getSpecialPrice());
-+
-+        $product = $this->productRepository->get('simple', false, 0, true);
-+        $this->assertEquals(5.99, $product->getSpecialPrice());
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php
-new file mode 100644
-index 00000000000..d8b24855ed1
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php
-@@ -0,0 +1,36 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Catalog\Model\ProductFactory;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+
-+/** @var Magento\Framework\ObjectManagerInterface $objcetManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var ProductFactory $productFactory */
-+$productFactory = $objectManager->create(ProductFactory::class);
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
-+
-+// Create 10 products (with change this variable, don't forget to change the same in rollback)
-+$productsAmount = 10;
-+
-+for ($i = 1; $i <= $productsAmount; $i++) {
-+    $productArray = [
-+        'data' => [
-+            'name' => "Product{$i}",
-+            'sku' => "Product{$i}",
-+            'price' => 100,
-+            'attribute_set_id' => 4,
-+            'website_ids' => [1]
-+        ]
-+    ];
-+    
-+    $productRepository->save($productFactory->create($productArray));
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products_rollback.php
-new file mode 100644
-index 00000000000..afe9483f63e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products_rollback.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = Bootstrap::getObjectManager()
-+    ->get(ProductRepositoryInterface::class);
-+
-+/**
-+ * Delete 10 products
-+ */
-+$productsAmount = 10;
-+
-+try {
-+    for ($i = 1; $i <= $productsAmount; $i++) {
-+        /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
-+        $product = $productRepository->get("Product{$i}", false, null, true);
-+        $productRepository->delete($product);
-+    }
-+} catch (NoSuchEntityException $e) {
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBoxTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBoxTest.php
-index c6d6c3cf422..8e5b38a4f88 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBoxTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBoxTest.php
-@@ -68,6 +68,9 @@ class FinalPriceBoxTest extends \PHPUnit\Framework\TestCase
-      */
-     private $templateEnginePool;
- 
-+    /**
-+     * Set up
-+     */
-     protected function setUp()
-     {
-         $this->objectManager = Bootstrap::getObjectManager();
-@@ -125,7 +128,7 @@ class FinalPriceBoxTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @magentoDataFixture Magento/Catalog/_files/product_has_tier_price_show_as_low_as.php
--     * @magentoDbIsolation enabled
-+     * @magentoDbIsolation disabled
-      * @magentoAppIsolation enabled
-      */
-     public function testRenderAmountMinimalProductWithTierPricesShouldShowMinTierPrice()
-@@ -136,7 +139,7 @@ class FinalPriceBoxTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @magentoDataFixture Magento/Catalog/_files/product_different_store_prices.php
--     * @magentoDbIsolation enabled
-+     * @magentoDbIsolation disabled
-      * @magentoAppIsolation enabled
-      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
-      */
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/QuantityAndStockStatusTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/QuantityAndStockStatusTest.php
-new file mode 100644
-index 00000000000..c09d68a66ee
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/QuantityAndStockStatusTest.php
-@@ -0,0 +1,79 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Catalog\Ui\DataProvider\Product;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\CatalogInventory\Model\Stock\StockItemRepository;
-+use Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityAndStockStatusFieldToCollection;
-+use PHPUnit\Framework\TestCase;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\CatalogInventory\Api\StockItemCriteriaInterface;
-+use Magento\CatalogInventory\Api\StockRegistryInterface;
-+
-+/**
-+ * Quantity and stock status test
-+ */
-+class QuantityAndStockStatusTest extends TestCase
-+{
-+    /**
-+     * @var string
-+     */
-+    private static $quantityAndStockStatus = 'quantity_and_stock_status';
-+
-+    /**
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+    }
-+
-+    /**
-+     * Test product stock status in the products grid column
-+     *
-+     * @magentoDataFixture Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid.php
-+     * @magentoDataFixture Magento/Catalog/_files/products.php
-+     */
-+    public function testProductStockStatus()
-+    {
-+        /** @var StockItemRepository $stockItemRepository */
-+        $stockItemRepository = $this->objectManager->create(StockItemRepository::class);
-+
-+        /** @var StockRegistryInterface $stockRegistry */
-+        $stockRegistry = $this->objectManager->create(StockRegistryInterface::class);
-+
-+        $stockItem = $stockRegistry->getStockItemBySku('simple');
-+        $stockItem->setIsInStock(false);
-+        $stockItemRepository->save($stockItem);
-+        $savedStockStatus = (int)$stockItem->getIsInStock();
-+
-+        $dataProvider = $this->objectManager->create(
-+            ProductDataProvider::class,
-+            [
-+                'name' => 'product_listing_data_source',
-+                'primaryFieldName' => 'entity_id',
-+                'requestFieldName' => 'id',
-+                'addFieldStrategies' => [
-+                    'quantity_and_stock_status' =>
-+                        $this->objectManager->get(AddQuantityAndStockStatusFieldToCollection::class)
-+                ]
-+            ]
-+        );
-+
-+        $dataProvider->addField(self::$quantityAndStockStatus);
-+        $data = $dataProvider->getData();
-+        $dataProviderStockStatus = $data['items'][0][self::$quantityAndStockStatus];
-+
-+        $this->assertEquals($dataProviderStockStatus, $savedStockStatus);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/MultiselectSourceMock.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/MultiselectSourceMock.php
-new file mode 100644
-index 00000000000..b9325622d89
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/MultiselectSourceMock.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Catalog\_files;
-+
-+use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
-+
-+/**
-+ * Creates mock source for multiselect attributes
-+ */
-+class MultiselectSourceMock extends AbstractSource
-+{
-+
-+    public function getAllOptions()
-+    {
-+        return [
-+            ['value' => 1, 'label' => 'Option 1'],
-+            ['value' => 2, 'label' => 'Option 2'],
-+            ['value' => 3, 'label' => 'Option 3'],
-+            ['value' => 4, 'label' => 'Option 4 "!@#$%^&*'],
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_product.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_product.php
-index 95f277c7124..8712bbb1f86 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_product.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_product.php
-@@ -7,5 +7,12 @@
- require __DIR__ . '/../../Eav/_files/empty_attribute_set.php';
- require __DIR__ . '/../../Catalog/_files/product_simple.php';
- 
--$product->setAttributeSetId($attributeSet->getId());
--$product->save();
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+try {
-+    $product = $productRepository->get('simple', true, null, true);
-+    $product->setAttributeSetId($attributeSet->getId());
-+    $productRepository->save($product);
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
-index a903274793c..a5ab9619324 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
-@@ -178,7 +178,7 @@ $category->setId(13)
-     ->setParentId(3)
-     ->setPath('1/2/3/13')
-     ->setLevel(3)
--    ->setDescription('Ololo')
-+    ->setDescription('Its a description of Test Category 1.2')
-     ->setAvailableSortBy('name')
-     ->setDefaultSortBy('name')
-     ->setIsActive(true)
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php
-index d3825675b72..46d5bfea645 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php
-@@ -15,7 +15,7 @@ $category->setId(
- )->setParentId(
-     2
- )->setPath(
--    '1/2'
-+    '1/2/444'
- )->setLevel(
-     '2'
- )->setDefaultSortBy(
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates_rollback.php
-new file mode 100644
-index 00000000000..ceaad3a0032
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates_rollback.php
-@@ -0,0 +1,35 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+
-+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = $objectManager->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
-+$categoryCollection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
-+$categoryCollection
-+    ->addAttributeToFilter('level', 2)
-+    ->load()
-+    ->delete();
-+
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+try {
-+    $product = $productRepository->get('simple3', false, null, true);
-+    $productRepository->delete($product);
-+} catch (NoSuchEntityException $e) {
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model.php
-new file mode 100644
-index 00000000000..6dcba90bf44
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model.php
-@@ -0,0 +1,46 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+/* Create attribute */
-+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
-+$installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    \Magento\Catalog\Setup\CategorySetup::class
-+);
-+/** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-+$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
-+);
-+$entityType = $installer->getEntityTypeId('catalog_product');
-+if (!$attribute->loadByCode($entityType, 'multiselect_attr_with_source')->getAttributeId()) {
-+    $attribute->setData(
-+        [
-+            'attribute_code' => 'multiselect_attr_with_source',
-+            'entity_type_id' => $entityType,
-+            'is_global' => 1,
-+            'is_user_defined' => 1,
-+            'frontend_input' => 'multiselect',
-+            'is_unique' => 0,
-+            'is_required' => 0,
-+            'is_searchable' => 0,
-+            'is_visible_in_advanced_search' => 0,
-+            'is_comparable' => 0,
-+            'is_filterable' => 1,
-+            'is_filterable_in_search' => 0,
-+            'is_used_for_promo_rules' => 0,
-+            'is_html_allowed_on_front' => 1,
-+            'is_visible_on_front' => 0,
-+            'used_in_product_listing' => 0,
-+            'used_for_sort_by' => 0,
-+            'frontend_label' => ['Multiselect Attribute with Source Model'],
-+            'backend_type' => 'varchar',
-+            'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
-+            'source_model' => \Magento\Catalog\_files\MultiselectSourceMock::class
-+        ]
-+    );
-+    $attribute->save();
-+
-+    /* Assign attribute to attribute set */
-+    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model_rollback.php
-new file mode 100644
-index 00000000000..9859e1ab4c7
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model_rollback.php
-@@ -0,0 +1,18 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+/* Delete attribute  with multiselect_attribute code */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+/** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-+$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    'Magento\Catalog\Model\ResourceModel\Eav\Attribute'
-+);
-+$attribute->load('multiselect_attr_with_source', 'attribute_code');
-+$attribute->delete();
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php
-index 1c8a4e64cdf..514c6563622 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php
-@@ -5,6 +5,7 @@
-  */
- 
- use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
-+use Magento\Catalog\Api\Data\ProductExtensionInterfaceFactory;
- 
- \Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize();
- 
-@@ -19,10 +20,15 @@ $tierPrices = [];
- $tierPriceFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory::class);
- /** @var  $tpExtensionAttributes */
- $tpExtensionAttributesFactory = $objectManager->get(ProductTierPriceExtensionFactory::class);
-+/** @var  $productExtensionAttributes */
-+$productExtensionAttributesFactory = $objectManager->get(ProductExtensionInterfaceFactory::class);
- 
- $adminWebsite = $objectManager->get(\Magento\Store\Api\WebsiteRepositoryInterface::class)->get('admin');
- $tierPriceExtensionAttributes1 = $tpExtensionAttributesFactory->create()
-     ->setWebsiteId($adminWebsite->getId());
-+$productExtensionAttributesWebsiteIds = $productExtensionAttributesFactory->create(
-+    ['website_ids' => $adminWebsite->getId()]
-+);
- 
- $tierPrices[] = $tierPriceFactory->create(
-     [
-@@ -54,6 +60,16 @@ $tierPrices[] = $tierPriceFactory->create(
-     ]
- )->setExtensionAttributes($tierPriceExtensionAttributes1);
- 
-+$tierPrices[] = $tierPriceFactory->create(
-+    [
-+        'data' => [
-+            'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
-+            'qty' => 3.2,
-+            'value' => 6,
-+        ]
-+    ]
-+)->setExtensionAttributes($tierPriceExtensionAttributes1);
-+
- $tierPriceExtensionAttributes2 = $tpExtensionAttributesFactory->create()
-     ->setWebsiteId($adminWebsite->getId())
-     ->setPercentageValue(50);
-@@ -82,6 +98,7 @@ $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-     ->setTaxClassId(0)
-     ->setTierPrices($tierPrices)
-     ->setDescription('Description with <b>html tag</b>')
-+    ->setExtensionAttributes($productExtensionAttributesWebsiteIds)
-     ->setMetaTitle('meta title')
-     ->setMetaKeyword('meta keyword')
-     ->setMetaDescription('meta description')
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php
-new file mode 100644
-index 00000000000..2b1b271a8bb
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php
-@@ -0,0 +1,79 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\ProductFactory;
-+use Magento\Catalog\Api\Data\ProductAttributeInterface;
-+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-+use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
-+use Magento\Catalog\Setup\CategorySetup;
-+use Magento\Eav\Model\Entity;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Type;
-+
-+/** @var \Magento\TestFramework\ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+/** @var ProductFactory $productFactory */
-+$productFactory = $objectManager->get(ProductFactory::class);
-+/** @var ProductAttributeRepositoryInterface $attributeRepository */
-+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
-+
-+
-+/** @var $installer CategorySetup */
-+$installer = $objectManager->create(CategorySetup::class);
-+$entityModel = $objectManager->create(Entity::class);
-+$attributeSetId = $installer->getAttributeSetId(Product::ENTITY, 'Default');
-+$entityTypeId = $entityModel->setType(Product::ENTITY)
-+    ->getTypeId();
-+$groupId = $installer->getDefaultAttributeGroupId($entityTypeId, $attributeSetId);
-+
-+/** @var ProductAttributeInterface $attribute */
-+$attribute = $objectManager->create(ProductAttributeInterface::class);
-+
-+$attribute->setAttributeCode('flat_attribute')
-+    ->setEntityTypeId($entityTypeId)
-+    ->setIsVisible(true)
-+    ->setFrontendInput('text')
-+    ->setIsFilterable(1)
-+    ->setIsUserDefined(1)
-+    ->setUsedInProductListing(1)
-+    ->setBackendType('varchar')
-+    ->setIsUsedInGrid(1)
-+    ->setIsVisibleInGrid(1)
-+    ->setIsFilterableInGrid(1)
-+    ->setFrontendLabel('nobody cares')
-+    ->setAttributeGroupId($groupId)
-+    ->setAttributeSetId(4);
-+
-+$attributeRepository->save($attribute);
-+
-+/** @var Processor $processor */
-+$processor = $objectManager->create(Processor::class);
-+$scheduled = $processor->getIndexer()
-+    ->isScheduled();
-+$processor->reindexAll();
-+
-+$product = $productFactory->create()
-+    ->setTypeId(Type::TYPE_SIMPLE)
-+    ->setAttributeSetId(4)
-+    ->setName('Simple With Attribute That Used In Flat')
-+    ->setSku('simple_with_custom_flat_attribute')
-+    ->setPrice(100)
-+    ->setVisibility(1)
-+    ->setStockData(
-+        [
-+            'use_config_manage_stock'   => 1,
-+            'qty'                       => 100,
-+            'is_in_stock'               => 1,
-+        ]
-+    )
-+    ->setStatus(1);
-+$product->setCustomAttribute('flat_attribute', 'flat attribute value');
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat_rollback.php
-new file mode 100644
-index 00000000000..c1892d504ec
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat_rollback.php
-@@ -0,0 +1,41 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-+
-+/** @var Magento\Framework\ObjectManagerInterface $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+/** @var ProductAttributeRepositoryInterface $attributeRepository */
-+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
-+/** @var Registry $registry */
-+$registry = $objectManager->get(Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+try {
-+    /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
-+    $product = $productRepository->get('simple_with_custom_flat_attribute');
-+    $productRepository->delete($product);
-+} catch (NoSuchEntityException $e) {
-+}
-+
-+try {
-+    /** @var \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute */
-+    $attribute = $attributeRepository->get('flat_attribute');
-+    $attributeRepository->delete($attribute);
-+} catch (NoSuchEntityException $e) {
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php
-index 059b784978a..61b549f7729 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php
-@@ -86,7 +86,18 @@ $oldOptions = [
-                 'sku' => '4-2-radio',
-             ],
-         ]
--    ]
-+    ],
-+    [
-+        'previous_group' => 'text',
-+        'title'     => 'Test Field',
-+        'type'      => 'field',
-+        'is_require' => 1,
-+        'sort_order' => 0,
-+        'price'     => 1,
-+        'price_type' => 'fixed',
-+        'sku'       => '1-text',
-+        'max_characters' => 100,
-+    ],
- ];
- 
- $options = [];
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_full_option_set.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_full_option_set.php
-index bd5dc541a15..5facba07d58 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_full_option_set.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_full_option_set.php
-@@ -187,6 +187,50 @@ $oldOptions = [
-         'price_type' => 'percent',
-         'sku' => 'sku2',
-         'max_characters' => 20,
-+    ],
-+    [
-+        'title' => 'multiple option',
-+        'type' => 'multiple',
-+        'is_require' => true,
-+        'sort_order' => 7,
-+        'values' => [
-+            [
-+                'title' => 'multiple option 1',
-+                'price' => 10,
-+                'price_type' => 'fixed',
-+                'sku' => 'multiple option 1 sku',
-+                'sort_order' => 1,
-+            ],
-+            [
-+                'title' => 'multiple option 2',
-+                'price' => 20,
-+                'price_type' => 'fixed',
-+                'sku' => 'multiple option 2 sku',
-+                'sort_order' => 2,
-+            ],
-+        ],
-+    ],
-+    [
-+        'title' => 'checkbox option',
-+        'type' => 'checkbox',
-+        'is_require' => true,
-+        'sort_order' => 6,
-+        'values' => [
-+            [
-+                'title' => 'checkbox option 1',
-+                'price' => 10,
-+                'price_type' => 'fixed',
-+                'sku' => 'checkbox option 1 sku',
-+                'sort_order' => 1,
-+            ],
-+            [
-+                'title' => 'checkbox option 2',
-+                'price' => 20,
-+                'price_type' => 'fixed',
-+                'sku' => 'checkbox option 2 sku',
-+                'sort_order' => 2,
-+            ],
-+        ],
-     ]
- ];
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_image.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_image.php
-new file mode 100644
-index 00000000000..252f99c97b7
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_image.php
-@@ -0,0 +1,45 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Catalog\Api\Data\ProductExtensionInterfaceFactory;
-+use Magento\Framework\App\Filesystem\DirectoryList;
-+
-+\Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize();
-+
-+/** @var \Magento\TestFramework\ObjectManager $objectManager */
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+/** @var $product \Magento\Catalog\Model\Product */
-+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-+$product->isObjectNew(true);
-+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+    ->setId(1)
-+    ->setAttributeSetId(4)
-+    ->setWebsiteIds([1])
-+    ->setName('Simple Product')
-+    ->setSku('simple')
-+    ->setPrice(10)
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED);
-+
-+/** @var $mediaConfig \Magento\Catalog\Model\Product\Media\Config */
-+$mediaConfig = $objectManager->get(\Magento\Catalog\Model\Product\Media\Config::class);
-+
-+/** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
-+$mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem::class)
-+    ->getDirectoryWrite(DirectoryList::MEDIA);
-+
-+$targetDirPath = $mediaConfig->getBaseMediaPath();
-+$targetTmpDirPath = $mediaConfig->getBaseTmpMediaPath();
-+
-+$mediaDirectory->create($targetDirPath);
-+$mediaDirectory->create($targetTmpDirPath);
-+
-+$dist = $mediaDirectory->getAbsolutePath($mediaConfig->getBaseMediaPath() .  DIRECTORY_SEPARATOR . 'magento_image.jpg');
-+copy(__DIR__ . '/magento_image.jpg', $dist);
-+
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_non_latin_url_key.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_non_latin_url_key.php
-new file mode 100644
-index 00000000000..23fd8d7fe32
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_non_latin_url_key.php
-@@ -0,0 +1,63 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\Catalog\Model\Product\Type;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$stockDataConfig = [
-+    'use_config_manage_stock' => 1,
-+    'qty' => 100,
-+    'is_qty_decimal' => 0,
-+    'is_in_stock' => 1
-+];
-+
-+/** @var ObjectManagerInterface $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
-+
-+/** @var ProductInterface $product */
-+$product = $objectManager->create(ProductInterface::class);
-+$product->setTypeId(Type::TYPE_SIMPLE)
-+    ->setAttributeSetId(4)
-+    ->setWebsiteIds([1])
-+    ->setName('Чудовий продукт без Url Key')
-+    ->setSku('ukrainian-without-url-key')
-+    ->setPrice(10)
-+    ->setVisibility(Visibility::VISIBILITY_BOTH)
-+    ->setStatus(Status::STATUS_ENABLED)
-+    ->setCategoryIds([2])
-+    ->setStockData($stockDataConfig);
-+try {
-+    $productRepository->save($product);
-+} catch (\Exception $e) {
-+    // problems during save
-+};
-+
-+/** @var ProductInterface $product */
-+$product = $objectManager->create(ProductInterface::class);
-+$product->setTypeId(Type::TYPE_SIMPLE)
-+    ->setAttributeSetId(4)
-+    ->setWebsiteIds([1])
-+    ->setName('Надзвичайний продукт з Url Key')
-+    ->setSku('ukrainian-with-url-key')
-+    ->setPrice(10)
-+    ->setVisibility(Visibility::VISIBILITY_BOTH)
-+    ->setStatus(Status::STATUS_ENABLED)
-+    ->setCategoryIds([2])
-+    ->setStockData($stockDataConfig)
-+    ->setUrlKey('надзвичайний продукт на кожен день');
-+try {
-+    $productRepository->save($product);
-+} catch (\Exception $e) {
-+    // problems during save
-+};
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_non_latin_url_key_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_non_latin_url_key_rollback.php
-new file mode 100644
-index 00000000000..d4592430c0e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_non_latin_url_key_rollback.php
-@@ -0,0 +1,37 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+Bootstrap::getInstance()->getInstance()->reinitialize();
-+
-+/** @var Registry $registry */
-+$registry = Bootstrap::getObjectManager()->get(Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = Bootstrap::getObjectManager()
-+    ->get(ProductRepositoryInterface::class);
-+
-+$productSkus = [
-+    'ukrainian-with-url-key',
-+    'ukrainian-without-url-key',
-+];
-+try {
-+    foreach ($productSkus as $sku) {
-+        $product = $productRepository->get($sku, false, null, true);
-+        $productRepository->delete($product);
-+    }
-+} catch (NoSuchEntityException $e) {
-+    // nothing to delete
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
-new file mode 100644
-index 00000000000..a401db8eb2b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
-@@ -0,0 +1,107 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+/** @var $product \Magento\Catalog\Model\Product */
-+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-+
-+$product->setTypeId(
-+    'simple'
-+)->setAttributeSetId(
-+    4
-+)->setWebsiteIds(
-+    [1]
-+)->setName(
-+    'Virtual Product With Custom Options'
-+)->setSku(
-+    'simple'
-+)->setPrice(
-+    10
-+)->setMetaTitle(
-+    'meta title'
-+)->setMetaKeyword(
-+    'meta keyword'
-+)->setMetaDescription(
-+    'meta description'
-+)->setVisibility(
-+    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
-+)->setStatus(
-+    \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
-+)->setCanSaveCustomOptions(
-+    true
-+)->setStockData(
-+    [
-+        'qty' => 100,
-+        'is_in_stock' => 1,
-+        'manage_stock' => 1,
-+    ]
-+)->setHasOptions(true);
-+
-+$options = [
-+    [
-+        'title' => 'test_option_code_1',
-+        'type' => 'field',
-+        'is_require' => true,
-+        'sort_order' => 1,
-+        'price' => -10.0,
-+        'price_type' => 'fixed',
-+        'sku' => 'sku1',
-+        'max_characters' => 10,
-+    ],
-+    [
-+        'title' => 'area option',
-+        'type' => 'area',
-+        'is_require' => true,
-+        'sort_order' => 2,
-+        'price' => 20.0,
-+        'price_type' => 'percent',
-+        'sku' => 'sku2',
-+        'max_characters' => 20
-+    ],
-+    [
-+        'title' => 'drop_down option',
-+        'type' => 'drop_down',
-+        'is_require' => false,
-+        'sort_order' => 4,
-+        'values' => [
-+            [
-+                'title' => 'drop_down option 1',
-+                'price' => 10,
-+                'price_type' => 'fixed',
-+                'sku' => 'drop_down option 1 sku',
-+                'sort_order' => 1,
-+            ],
-+            [
-+                'title' => 'drop_down option 2',
-+                'price' => 20,
-+                'price_type' => 'fixed',
-+                'sku' => 'drop_down option 2 sku',
-+                'sort_order' => 2,
-+            ],
-+        ],
-+    ]
-+];
-+
-+$customOptions = [];
-+
-+/** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
-+$customOptionFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
-+
-+foreach ($options as $option) {
-+    /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterface $customOption */
-+    $customOption = $customOptionFactory->create(['data' => $option]);
-+    $customOption->setProductSku($product->getSku());
-+
-+    $customOptions[] = $customOption;
-+}
-+
-+$product->setOptions($customOptions);
-+
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */
-+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php
-new file mode 100644
-index 00000000000..8863da1cd27
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+$repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    \Magento\Catalog\Model\ProductRepository::class
-+);
-+try {
-+    $product = $repository->get('simple', false, null, true);
-+    $repository->delete($product);
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+    //Entity already deleted
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_wrong_url_key.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_wrong_url_key.php
-new file mode 100644
-index 00000000000..5012bc94721
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_wrong_url_key.php
-@@ -0,0 +1,38 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/** @var $product \Magento\Catalog\Model\Product */
-+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+    ->setAttributeSetId(4)
-+    ->setWebsiteIds([1])
-+    ->setName('Simple Product')
-+    ->setSku('simple1')
-+    ->setPrice(10)
-+    ->setDescription('Description with <b>html tag</b>')
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->setCategoryIds([2])
-+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
-+    ->setUrlKey('cuvee-merlot-cabernet-igp-pays-d-oc-frankrijk')
-+    ->save();
-+
-+/** @var $product \Magento\Catalog\Model\Product */
-+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+    ->setAttributeSetId(4)
-+    ->setWebsiteIds([1])
-+    ->setName('Simple Product 2')
-+    ->setSku('simple2')
-+    ->setPrice(10)
-+    ->setDescription('Description with <b>html tag</b>')
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->setCategoryIds([2])
-+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
-+    ->setUrlKey('normal-url')
-+    ->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_wrong_url_key_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_wrong_url_key_rollback.php
-new file mode 100644
-index 00000000000..778fa7b15df
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_wrong_url_key_rollback.php
-@@ -0,0 +1,29 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+
-+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+try {
-+    $product = $productRepository->get('simple1', false, null, true);
-+    $productRepository->delete($product);
-+    $product = $productRepository->get('simple2', false, null, true);
-+    $productRepository->delete($product);
-+} catch (NoSuchEntityException $e) {
-+}
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_text_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_text_attribute_rollback.php
-new file mode 100644
-index 00000000000..a9ab0e11312
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_text_attribute_rollback.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/* Delete attribute with text_attribute code */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-+$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
-+);
-+$attribute->load('text_attribute', 'attribute_code');
-+$attribute->delete();
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
-index 38e8c404dc0..838ae2b9a2a 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
-@@ -3,9 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
--/** @var $product \Magento\Catalog\Model\Product */
--$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
-+
-+$productFactory = Bootstrap::getObjectManager()->get(ProductInterfaceFactory::class);
-+$product = $productFactory->create();
- $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL)
-     ->setId(21)
-     ->setAttributeSetId(4)
-@@ -22,4 +27,7 @@ $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL)
-             'is_in_stock' => 1,
-             'manage_stock' => 1,
-         ]
--    )->save();
-+    );
-+/** @var ProductResource $productResource */
-+$productResource = Bootstrap::getObjectManager()->get(ProductResource::class);
-+$productResource->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock.php
-new file mode 100644
-index 00000000000..cff2e83ed00
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/** @var $product \Magento\Catalog\Model\Product */
-+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL)
-+    ->setId(31)
-+    ->setAttributeSetId(4)
-+    ->setWebsiteIds([1])
-+    ->setName('Virtual Product Out')
-+    ->setSku('virtual-product-out')
-+    ->setPrice(10)
-+    ->setTaxClassId(0)
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->setStockData(['is_in_stock' => 0])
-+    ->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock_rollback.php
-new file mode 100644
-index 00000000000..8055ca4a255
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock_rollback.php
-@@ -0,0 +1,26 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+
-+try {
-+    $product = $productRepository->get('virtual-product-out', false, null, true);
-+    $productRepository->delete($product);
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-+    //Product already removed
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php
-index 479661f26bc..f5568ced2c9 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php
-@@ -3,22 +3,27 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
--/** @var \Magento\Framework\Registry $registry */
--$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Exception\StateException;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
- 
- $registry->unregister('isSecureArea');
- $registry->register('isSecureArea', true);
- 
--/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
--$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
--    ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+$productRepository = Bootstrap::getObjectManager()
-+    ->get(ProductRepositoryInterface::class);
- 
- try {
-     $product = $productRepository->get('virtual-product', false, null, true);
-     $productRepository->delete($product);
--} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-+} catch (NoSuchEntityException $exception) {
-     //Product already removed
-+} catch (StateException $exception) {
- }
- 
- $registry->unregister('isSecureArea');
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php
-new file mode 100644
-index 00000000000..c1f981cefa6
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php
-@@ -0,0 +1,107 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+/** @var $product \Magento\Catalog\Model\Product */
-+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-+
-+$product->setTypeId(
-+    'virtual'
-+)->setAttributeSetId(
-+    4
-+)->setWebsiteIds(
-+    [1]
-+)->setName(
-+    'Virtual Product With Custom Options'
-+)->setSku(
-+    'virtual'
-+)->setPrice(
-+    10
-+)->setMetaTitle(
-+    'meta title'
-+)->setMetaKeyword(
-+    'meta keyword'
-+)->setMetaDescription(
-+    'meta description'
-+)->setVisibility(
-+    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
-+)->setStatus(
-+    \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
-+)->setCanSaveCustomOptions(
-+    true
-+)->setStockData(
-+    [
-+        'qty' => 100,
-+        'is_in_stock' => 1,
-+        'manage_stock' => 1,
-+    ]
-+)->setHasOptions(true);
-+
-+$options = [
-+    [
-+        'title' => 'test_option_code_1',
-+        'type' => 'field',
-+        'is_require' => true,
-+        'sort_order' => 1,
-+        'price' => -10.0,
-+        'price_type' => 'fixed',
-+        'sku' => 'sku1',
-+        'max_characters' => 10,
-+    ],
-+    [
-+        'title' => 'area option',
-+        'type' => 'area',
-+        'is_require' => true,
-+        'sort_order' => 2,
-+        'price' => 20.0,
-+        'price_type' => 'percent',
-+        'sku' => 'sku2',
-+        'max_characters' => 20
-+    ],
-+    [
-+        'title' => 'drop_down option',
-+        'type' => 'drop_down',
-+        'is_require' => false,
-+        'sort_order' => 4,
-+        'values' => [
-+            [
-+                'title' => 'drop_down option 1',
-+                'price' => 10,
-+                'price_type' => 'fixed',
-+                'sku' => 'drop_down option 1 sku',
-+                'sort_order' => 1,
-+            ],
-+            [
-+                'title' => 'drop_down option 2',
-+                'price' => 20,
-+                'price_type' => 'fixed',
-+                'sku' => 'drop_down option 2 sku',
-+                'sort_order' => 2,
-+            ],
-+        ],
-+    ]
-+];
-+
-+$customOptions = [];
-+
-+/** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
-+$customOptionFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
-+
-+foreach ($options as $option) {
-+    /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterface $customOption */
-+    $customOption = $customOptionFactory->create(['data' => $option]);
-+    $customOption->setProductSku($product->getSku());
-+
-+    $customOptions[] = $customOption;
-+}
-+
-+$product->setOptions($customOptions);
-+
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */
-+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php
-new file mode 100644
-index 00000000000..f46cdc13d32
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+$repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    \Magento\Catalog\Model\ProductRepository::class
-+);
-+try {
-+    $product = $repository->get('virtual', false, null, true);
-+    $repository->delete($product);
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+    //Entity already deleted
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_two_websites_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_two_websites_rollback.php
-index 141920afbdc..987ee96ce6b 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_two_websites_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_two_websites_rollback.php
-@@ -4,8 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- 
--use Magento\Catalog\Api\Data\ProductInterface;
--
- $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- 
- /** @var \Magento\Framework\Registry $registry */
-@@ -15,16 +13,18 @@ $registry->unregister("isSecureArea");
- $registry->register("isSecureArea", true);
- 
- /** @var Magento\Store\Model\Website $website */
--$website = $objectManager->create(\Magento\Store\Model\Website::class);
--$website->load('second_website');
--$website->delete();
-+$website = $objectManager->get(Magento\Store\Model\Website::class);
-+$website->load('second_website', 'code');
-+if ($website->getId()) {
-+    $website->delete();
-+}
- 
- /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
- $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
- 
- try {
-     $firstProduct = $productRepository->get('unique-simple-azaza');
--    $firstProduct->delete();
-+    $productRepository->delete($firstProduct);
- } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-     //Product already removed
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_without_options_with_stock_data.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_without_options_with_stock_data.php
-new file mode 100644
-index 00000000000..268d5bf792d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_without_options_with_stock_data.php
-@@ -0,0 +1,30 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/** @var $product \Magento\Catalog\Model\Product */
-+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+$product->setTypeId('simple')
-+    ->setId(1)
-+    ->setAttributeSetId(4)
-+    ->setWebsiteIds([1])
-+    ->setName('Simple Product Without Custom Options')
-+    ->setSku('simple')
-+    ->setPrice(10)
-+    ->setMetaTitle('meta title')
-+    ->setMetaKeyword('meta keyword')
-+    ->setMetaDescription('meta description')
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->setQty(100)
-+    ->setStockData(
-+        [
-+            'use_config_manage_stock'   => 1,
-+            'qty'                       => 100,
-+            'is_qty_decimal'            => 0,
-+            'is_in_stock'               => 1,
-+        ]
-+    )->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_without_options_with_stock_data_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_without_options_with_stock_data_rollback.php
-new file mode 100644
-index 00000000000..41d06e5f255
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_without_options_with_stock_data_rollback.php
-@@ -0,0 +1,26 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+$repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    \Magento\Catalog\Model\ProductRepository::class
-+);
-+try {
-+    $product = $repository->get('simple', false, null, true);
-+    $product->delete();
-+// phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+    //Entity already deleted
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores.php
-new file mode 100644
-index 00000000000..6102738bd6b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores.php
-@@ -0,0 +1,122 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\Indexer\IndexerRegistry;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Type;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+
-+require __DIR__ . '/../../Store/_files/core_fixturestore.php';
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var Magento\Store\Model\Website $website */
-+$website = $objectManager->get(Magento\Store\Model\Website::class);
-+
-+$website->setData(
-+    [
-+        'code' => 'second_website',
-+        'name' => 'Test Website',
-+    ]
-+);
-+
-+$website->save();
-+
-+$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
-+
-+/** @var IndexerRegistry $indexerRegistry */
-+$indexerRegistry = $objectManager->create(IndexerRegistry::class);
-+$indexer =  $indexerRegistry->get('catalogsearch_fulltext');
-+
-+$indexer->reindexAll();
-+
-+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
-+$category->isObjectNew(true);
-+$category->setId(96377)
-+    ->setName('Category 1')
-+    ->setParentId(2)
-+    ->setPath('1/2/96377')
-+    ->setLevel(2)
-+    ->setAvailableSortBy('name')
-+    ->setDefaultSortBy('name')
-+    ->setIsActive(true)
-+    ->setPosition(1)
-+    ->save();
-+
-+/** @var $product Product */
-+$product = $objectManager->create(Product::class);
-+$product->isObjectNew(true);
-+$product->setTypeId(Type::TYPE_SIMPLE)
-+    ->setAttributeSetId(4)
-+    ->setWebsiteIds([1])
-+    ->setName('Simple Product')
-+    ->setSku('simple_1')
-+    ->setPrice(10)
-+    ->setWeight(1)
-+    ->setShortDescription("Short description")
-+    ->setTaxClassId(0)
-+    ->setDescription('Description with <b>html tag</b>')
-+    ->setMetaTitle('meta title')
-+    ->setMetaKeyword('meta keyword')
-+    ->setMetaDescription('meta description')
-+    ->setVisibility(Visibility::VISIBILITY_BOTH)
-+    ->setStatus(Status::STATUS_ENABLED)
-+    ->setCategoryIds([96377]);
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
-+$productRepository->save($product);
-+
-+/** @var $product Product */
-+$product = $objectManager->create(Product::class);
-+$product->isObjectNew(true);
-+$product->setTypeId(Type::TYPE_SIMPLE)
-+    ->setAttributeSetId(4)
-+    ->setWebsiteIds([$website->getId()])
-+    ->setName('Simple Product 2')
-+    ->setSku('simple_2')
-+    ->setPrice(10)
-+    ->setWeight(1)
-+    ->setShortDescription("Short description")
-+    ->setTaxClassId(0)
-+    ->setDescription('Description with <b>html tag</b>')
-+    ->setMetaTitle('meta title')
-+    ->setMetaKeyword('meta keyword')
-+    ->setMetaDescription('meta description')
-+    ->setVisibility(Visibility::VISIBILITY_BOTH)
-+    ->setStatus(Status::STATUS_ENABLED)
-+    ->setCategoryIds([96377]);
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
-+$productRepository->save($product);
-+
-+/** @var $product Product */
-+$product = $objectManager->create(Product::class);
-+$product->isObjectNew(true);
-+$product->setTypeId(Type::TYPE_SIMPLE)
-+    ->setAttributeSetId(4)
-+    ->setWebsiteIds([1, $website->getId()])
-+    ->setName('Simple Product 3')
-+    ->setSku('simple_3')
-+    ->setPrice(10)
-+    ->setWeight(1)
-+    ->setShortDescription("Short description")
-+    ->setTaxClassId(0)
-+    ->setDescription('Description with <b>html tag</b>')
-+    ->setMetaTitle('meta title')
-+    ->setMetaKeyword('meta keyword')
-+    ->setMetaDescription('meta description')
-+    ->setVisibility(Visibility::VISIBILITY_BOTH)
-+    ->setStatus(Status::STATUS_ENABLED)
-+    ->setCategoryIds([96377]);
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores_rollback.php
-new file mode 100644
-index 00000000000..9b957b75eb2
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores_rollback.php
-@@ -0,0 +1,46 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+require __DIR__ . '/../../Store/_files/core_fixturestore_rollback.php';
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = $objectManager->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+//Remove category
-+/** @var $category \Magento\Catalog\Model\Category */
-+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
-+$category->load(96377);
-+if ($category->getId()) {
-+    $category->delete();
-+}
-+
-+$productSkuList = ['simple_1', 'simple_2', 'simple_3'];
-+foreach ($productSkuList as $sku) {
-+    try {
-+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+            ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+        $product = $productRepository->get($sku, true);
-+        if ($product->getId()) {
-+            $productRepository->delete($product);
-+        }
-+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+        //Product already removed
-+    }
-+}
-+
-+/** @var Magento\Store\Model\Website $website */
-+$website = $objectManager->get(Magento\Store\Model\Website::class);
-+$website->load('second_website', 'code');
-+if ($website->getId()) {
-+    $website->delete();
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
-index 7d6e2e6f978..2cd0dd2c775 100644
---- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
-@@ -15,8 +15,8 @@ $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-     ->setWebsiteIds([1])
-     ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
--    ->setNewsFromDate(date('Y-m-d', strtotime('-2 day')))
--    ->setNewsToDate(date('Y-m-d', strtotime('+2 day')))
-+    ->setNewsFromDate(date('Y-m-d H:i:s', strtotime('-2 day')))
-+    ->setNewsToDate(date('Y-m-d H:i:s', strtotime('+2 day')))
-     ->setDescription('description')
-     ->setShortDescription('short desc')
-     ->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute.php
-new file mode 100644
-index 00000000000..1dca8c383cc
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/**
-+ * Create multiselect attribute
-+ */
-+require __DIR__ . '/dropdown_attribute.php';
-+
-+/** Create products with attribute option of dropdown type */
-+
-+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
-+$installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    \Magento\Catalog\Setup\CategorySetup::class
-+);
-+
-+/** @var $options \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection */
-+$options = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class
-+);
-+$options->setAttributeFilter($attribute->getId());
-+$optionIds = $options->getAllIds();
-+
-+/** @var $product \Magento\Catalog\Model\Product */
-+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+    ->setId($optionIds[0] * 10)
-+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
-+    ->setWebsiteIds([1])
-+    ->setName('With Option 1')
-+    ->setSku('simple_op_1')
-+    ->setPrice(10)
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setDropdownAttribute($optionIds[0])
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
-+    ->save();
-+
-+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+    ->setId($optionIds[1] * 10)
-+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
-+    ->setWebsiteIds([1])
-+    ->setName('With Option 2')
-+    ->setSku('simple_op_2')
-+    ->setPrice(10)
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setDropdownAttribute($optionIds[1])
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
-+    ->save();
-+
-+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+    ->setId($optionIds[2] * 10)
-+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
-+    ->setWebsiteIds([1])
-+    ->setName('With Option 3')
-+    ->setSku('simple_op_3')
-+    ->setPrice(10)
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setDropdownAttribute($optionIds[2])
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
-+    ->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute_rollback.php
-new file mode 100644
-index 00000000000..07570894b87
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute_rollback.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/**
-+ * Remove all products as strategy of isolation process
-+ */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product */
-+$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->create('Magento\Catalog\Model\Product')
-+    ->getCollection();
-+
-+foreach ($productCollection as $product) {
-+    $product->delete();
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model.php
-new file mode 100644
-index 00000000000..a1e81fd3b40
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Catalog\_files\MultiselectSourceMock;
-+
-+/**
-+ * Create multiselect attribute
-+ */
-+require __DIR__ . '/multiselect_attribute_with_source_model.php';
-+require __DIR__ . '/../../Checkout/_files/ValidatorFileMock.php';
-+
-+/** Create product with options and multiselect attribute */
-+
-+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
-+$installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    \Magento\Catalog\Setup\CategorySetup::class
-+);
-+
-+/** @var $sourceModel MultiselectSourceMock */
-+$sourceModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    MultiselectSourceMock::class
-+);
-+$options = $sourceModel->getAllOptions();
-+
-+/** @var $product \Magento\Catalog\Model\Product */
-+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+    ->setId($options[0]['value'] * 10)
-+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
-+    ->setWebsiteIds([1])
-+    ->setName('With Multiselect Source Model 1')
-+    ->setSku('simple_mssm_1')
-+    ->setPrice(10)
-+    ->setDescription('Hello " &amp;" Bring the water bottle when you can!')
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setMultiselectAttrWithSource([$options[0]['value']])
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
-+    ->save();
-+
-+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+    ->setId($options[1]['value'] * 10)
-+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
-+    ->setWebsiteIds([1])
-+    ->setName('With Multiselect Source Model 2')
-+    ->setSku('simple_mssm_2')
-+    ->setPrice(10)
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setMultiselectAttrWithSource([$options[1]['value'], $options[2]['value'], $options[3]['value']])
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
-+    ->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model_rollback.php
-new file mode 100644
-index 00000000000..a8121a7913e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model_rollback.php
-@@ -0,0 +1,32 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+require __DIR__ . '/multiselect_attribute_with_source_model_rollback.php';
-+
-+use Magento\Framework\Indexer\IndexerRegistry;
-+
-+/**
-+ * Remove all products as strategy of isolation process
-+ */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product */
-+$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->create('Magento\Catalog\Model\Product')
-+    ->getCollection();
-+
-+foreach ($productCollection as $product) {
-+    $product->delete();
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-+
-+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(IndexerRegistry::class)
-+    ->get(Magento\CatalogInventory\Model\Indexer\Stock\Processor::INDEXER_ID)
-+    ->reindexAll();
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid.php
-new file mode 100644
-index 00000000000..1870eaba566
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid.php
-@@ -0,0 +1,18 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+$eavSetupFactory = $objectManager->create(\Magento\Eav\Setup\EavSetupFactory::class);
-+/** @var \Magento\Eav\Setup\EavSetup $eavSetup */
-+$eavSetup = $eavSetupFactory->create();
-+$eavSetup->updateAttribute(
-+    \Magento\Catalog\Model\Product::ENTITY,
-+    'quantity_and_stock_status',
-+    [
-+        'is_used_in_grid' => 1,
-+    ]
-+);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid_rollback.php
-new file mode 100644
-index 00000000000..fba12f19fdc
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid_rollback.php
-@@ -0,0 +1,18 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+$eavSetupFactory = $objectManager->create(\Magento\Eav\Setup\EavSetupFactory::class);
-+/** @var \Magento\Eav\Setup\EavSetup $eavSetup */
-+$eavSetup = $eavSetupFactory->create();
-+$eavSetup->updateAttribute(
-+    \Magento\Catalog\Model\Product::ENTITY,
-+    'quantity_and_stock_status',
-+    [
-+        'is_used_in_grid' => 0,
-+    ]
-+);
-diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/text_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/text_attribute_rollback.php
-deleted file mode 100644
-index cbc0476efd1..00000000000
---- a/dev/tests/integration/testsuite/Magento/Catalog/_files/text_attribute_rollback.php
-+++ /dev/null
-@@ -1,18 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--/* Delete attribute with text_attribute code */
--$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
--$registry->unregister('isSecureArea');
--$registry->register('isSecureArea', true);
--/** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
--$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--    'Magento\Catalog\Model\ResourceModel\Eav\Attribute'
--);
--$attribute->load('text_attribute', 'attribute_code');
--$attribute->delete();
--
--$registry->unregister('isSecureArea');
--$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
-index b562879b319..d3a2e4c53f2 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
-@@ -55,6 +55,16 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
-         'is_salable', // stock indexation is not performed during import
-     ];
- 
-+    /**
-+     * @var array
-+     */
-+    private static $attributesToRefresh = [
-+        'tax_class_id',
-+    ];
-+
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-@@ -65,12 +75,17 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
-         \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType::$commonAttributesCache = [];
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function tearDown()
-     {
--        $this->executeRollbackFixtures($this->fixtures);
-+        $this->executeFixtures($this->fixtures, true);
-     }
- 
-     /**
-+     * Run import/export tests.
-+     *
-      * @magentoAppArea adminhtml
-      * @magentoDbIsolation disabled
-      * @magentoAppIsolation enabled
-@@ -78,36 +93,60 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
-      * @param array $fixtures
-      * @param string[] $skus
-      * @param string[] $skippedAttributes
-+     * @return void
-      * @dataProvider exportImportDataProvider
-      */
--    public function testExport($fixtures, $skus, $skippedAttributes = [])
-+    public function testImportExport(array $fixtures, array $skus, array $skippedAttributes = []): void
-     {
-         $this->fixtures = $fixtures;
--        $this->executeFixtures($fixtures, $skus);
-+        $this->executeFixtures($fixtures);
-         $this->modifyData($skus);
-         $skippedAttributes = array_merge(self::$skippedAttributes, $skippedAttributes);
--        $this->executeExportTest($skus, $skippedAttributes);
-+        $csvFile = $this->executeExportTest($skus, $skippedAttributes);
-+
-+        $this->executeImportReplaceTest($skus, $skippedAttributes, false, $csvFile);
-+        $this->executeImportReplaceTest($skus, $skippedAttributes, true, $csvFile);
-+        $this->executeImportDeleteTest($skus, $csvFile);
-     }
- 
--    abstract public function exportImportDataProvider();
-+    /**
-+     * Provide data for import/export.
-+     *
-+     * @return array
-+     */
-+    abstract public function exportImportDataProvider(): array;
- 
-     /**
-+     * Modify data.
-+     *
-      * @param array $skus
-+     * @return void
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    protected function modifyData($skus)
-+    protected function modifyData(array $skus): void
-     {
-     }
- 
-     /**
-+     * Prepare product.
-+     *
-      * @param \Magento\Catalog\Model\Product $product
-+     * @return void
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    public function prepareProduct($product)
-+    public function prepareProduct(\Magento\Catalog\Model\Product $product): void
-     {
-     }
- 
--    protected function executeExportTest($skus, $skippedAttributes)
-+    /**
-+     * Execute export test.
-+     *
-+     * @param array $skus
-+     * @param array $skippedAttributes
-+     * @return string
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    protected function executeExportTest(array $skus, array $skippedAttributes): string
-     {
-         $index = 0;
-         $ids = [];
-@@ -140,10 +179,23 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
- 
-             $this->assertEqualsSpecificAttributes($origProducts[$index], $newProduct);
-         }
-+
-+        return $csvfile;
-     }
- 
--    private function assertEqualsOtherThanSkippedAttributes($expected, $actual, $skippedAttributes)
--    {
-+    /**
-+     * Assert data equals (ignore skipped attributes).
-+     *
-+     * @param array $expected
-+     * @param array $actual
-+     * @param array $skippedAttributes
-+     * @return void
-+     */
-+    private function assertEqualsOtherThanSkippedAttributes(
-+        array $expected,
-+        array $actual,
-+        array $skippedAttributes
-+    ): void {
-         foreach ($expected as $key => $value) {
-             if (is_object($value) || in_array($key, $skippedAttributes)) {
-                 continue;
-@@ -158,134 +210,93 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
-     }
- 
-     /**
--     * @magentoAppArea adminhtml
--     * @magentoDbIsolation disabled
--     * @magentoAppIsolation enabled
-+     * Execute import test with delete behavior.
-      *
--     * @param array $fixtures
--     * @param string[] $skus
--     * @dataProvider exportImportDataProvider
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     * @param array $skus
-+     * @param string|null $csvFile
-+     * @return void
-      */
--    public function testImportDelete($fixtures, $skus, $skippedAttributes = [])
--    {
--        $this->fixtures = $fixtures;
--        $this->executeFixtures($fixtures, $skus);
--        $this->modifyData($skus);
--        $this->executeImportDeleteTest($skus);
--    }
--
--    protected function executeImportDeleteTest($skus)
-+    protected function executeImportDeleteTest(array $skus, string $csvFile = null): void
-     {
--        $csvfile = $this->exportProducts();
--        $this->importProducts($csvfile, \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE);
--        /** @var \Magento\Catalog\Model\Product $product */
--        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
-+        $csvFile = $csvFile ?? $this->exportProducts();
-+        $this->importProducts($csvFile, \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE);
-         foreach ($skus as $sku) {
-             $productId = $this->productResource->getIdBySku($sku);
--            $product->load($productId);
--            $this->assertNull($product->getId());
-+            $this->assertFalse($productId);
-         }
-     }
- 
-     /**
--     * Execute fixtures
-+     * Execute fixtures.
-      *
--     * @param array $skus
-      * @param array $fixtures
-+     * @param bool $rollback
-      * @return void
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    protected function executeFixtures($fixtures, $skus = [])
-+    protected function executeFixtures(array $fixtures, bool $rollback = false)
-     {
-         foreach ($fixtures as $fixture) {
--            $fixturePath = $this->fileSystem->getDirectoryRead(DirectoryList::ROOT)
--                ->getAbsolutePath('/dev/tests/integration/testsuite/' . $fixture);
-+            $fixturePath = $this->resolveFixturePath($fixture, $rollback);
-             include $fixturePath;
-         }
-     }
- 
-     /**
--     * Execute rollback fixtures
-+     * Resolve fixture path.
-      *
--     * @param array $fixtures
--     * @return void
-+     * @param string $fixture
-+     * @param bool $rollback
-+     * @return string
-      */
--    private function executeRollbackFixtures($fixtures)
-+    private function resolveFixturePath(string $fixture, bool $rollback = false)
-     {
--        foreach ($fixtures as $fixture) {
--            $fixturePath = $this->fileSystem->getDirectoryRead(DirectoryList::ROOT)
--                ->getAbsolutePath('/dev/tests/integration/testsuite/' . $fixture);
-+        $fixturePath = $this->fileSystem->getDirectoryRead(DirectoryList::ROOT)
-+            ->getAbsolutePath('/dev/tests/integration/testsuite/' . $fixture);
-+        if ($rollback) {
-             $fileInfo = pathinfo($fixturePath);
-             $extension = '';
-             if (isset($fileInfo['extension'])) {
-                 $extension = '.' . $fileInfo['extension'];
-             }
--            $rollbackfixturePath = $fileInfo['dirname'] . '/' . $fileInfo['filename'] . '_rollback' . $extension;
--            if (file_exists($rollbackfixturePath)) {
--                include $rollbackfixturePath;
--            }
-+            $fixturePath = $fileInfo['dirname'] . '/' . $fileInfo['filename'] . '_rollback' . $extension;
-         }
-+
-+        return $fixturePath;
-     }
- 
-     /**
-+     * Assert that specific attributes equal.
-+     *
-      * @param \Magento\Catalog\Model\Product $expectedProduct
-      * @param \Magento\Catalog\Model\Product $actualProduct
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
--    {
-+    protected function assertEqualsSpecificAttributes(
-+        \Magento\Catalog\Model\Product $expectedProduct,
-+        \Magento\Catalog\Model\Product $actualProduct
-+    ): void {
-         // check custom options
-     }
- 
-     /**
--     * @magentoAppArea adminhtml
--     * @magentoDbIsolation disabled
--     * @magentoAppIsolation enabled
-+     * Execute import test with replace behavior.
-      *
--     * @param array $fixtures
--     * @param string[] $skus
--     * @param string[] $skippedAttributes
--     * @dataProvider importReplaceDataProvider
--     */
--    public function testImportReplace($fixtures, $skus, $skippedAttributes = [])
--    {
--        $this->fixtures = $fixtures;
--        $this->executeFixtures($fixtures, $skus);
--        $this->modifyData($skus);
--        $skippedAttributes = array_merge(self::$skippedAttributes, $skippedAttributes);
--        $this->executeImportReplaceTest($skus, $skippedAttributes);
--    }
--
--    /**
--     * @magentoAppArea adminhtml
--     * @magentoDbIsolation disabled
--     * @magentoAppIsolation enabled
--     *
--     * @param array $fixtures
--     * @param string[] $skus
--     * @param string[] $skippedAttributes
--     * @dataProvider importReplaceDataProvider
--     */
--    public function testImportReplaceWithPagination($fixtures, $skus, $skippedAttributes = [])
--    {
--        $this->fixtures = $fixtures;
--        $this->executeFixtures($fixtures, $skus);
--        $this->modifyData($skus);
--        $skippedAttributes = array_merge(self::$skippedAttributes, $skippedAttributes);
--        $this->executeImportReplaceTest($skus, $skippedAttributes, true);
--    }
--
--    /**
-      * @param string[] $skus
-      * @param string[] $skippedAttributes
-      * @param bool $usePagination
--     *
-+     * @param string|null $csvfile
-+     * @return void
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
--    protected function executeImportReplaceTest($skus, $skippedAttributes, $usePagination = false)
--    {
-+    protected function executeImportReplaceTest(
-+        $skus,
-+        $skippedAttributes,
-+        $usePagination = false,
-+        string $csvfile = null
-+    ) {
-         $replacedAttributes = [
-             'row_id',
-             'entity_id',
-@@ -293,6 +304,7 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
-             'media_gallery'
-         ];
-         $skippedAttributes = array_merge($replacedAttributes, $skippedAttributes);
-+        $this->cleanAttributesCache();
- 
-         $index = 0;
-         $ids = [];
-@@ -316,15 +328,15 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
-             $itemsPerPageProperty->setValue($exportProduct, 1);
-         }
- 
--        $csvfile = $this->exportProducts($exportProduct);
-+        $csvfile = $csvfile ?? $this->exportProducts($exportProduct);
-         $this->importProducts($csvfile, \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE);
- 
-         while ($index > 0) {
-             $index--;
-             $newProduct = $productRepository->get($skus[$index], false, Store::DEFAULT_STORE_ID, true);
-             // check original product is deleted
--            $origProduct = $this->objectManager->create(\Magento\Catalog\Model\Product::class)->load($ids[$index]);
--            $this->assertNull($origProduct->getId());
-+            $productId = $this->productResource->getIdBySku($ids[$index]);
-+            $this->assertFalse($productId);
- 
-             // check new product data
-             // @todo uncomment or remove after MAGETWO-49806 resolved
-@@ -342,7 +354,7 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
-                         array_filter($origProductData[$attribute]) :
-                         $origProductData[$attribute];
-                     if (!empty($expected)) {
--                        $actual = isset($newProductData[$attribute]) ? $newProductData[$attribute] : null;
-+                        $actual = $newProductData[$attribute] ?? null;
-                         $actual = is_array($actual) ? array_filter($actual) : $actual;
-                         $this->assertNotEquals($expected, $actual, $attribute . ' is expected to be changed');
-                     }
-@@ -352,7 +364,7 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
-     }
- 
-     /**
--     * Export products in the system
-+     * Export products in the system.
-      *
-      * @param \Magento\CatalogImportExport\Model\Export\Product|null $exportProduct
-      * @return string Return exported file name
-@@ -371,17 +383,18 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
-             )
-         );
-         $this->assertNotEmpty($exportProduct->export());
-+
-         return $csvfile;
-     }
- 
-     /**
--     * Import products from the given file
-+     * Import products from the given file.
-      *
-      * @param string $csvfile
-      * @param string $behavior
-      * @return void
-      */
--    private function importProducts($csvfile, $behavior)
-+    private function importProducts(string $csvfile, string $behavior): void
-     {
-         /** @var \Magento\CatalogImportExport\Model\Import\Product $importModel */
-         $importModel = $this->objectManager->create(
-@@ -437,15 +450,33 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
-     }
- 
-     /**
-+     * Extract error message.
-+     *
-      * @param \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError[] $errors
-      * @return string
-      */
--    private function extractErrorMessage($errors)
-+    private function extractErrorMessage(array $errors): string
-     {
-         $errorMessage = '';
-         foreach ($errors as $error) {
-             $errorMessage = "\n" . $error->getErrorMessage();
-         }
-+
-         return $errorMessage;
-     }
-+
-+    /**
-+     * Clean import attribute cache.
-+     *
-+     * @return void
-+     */
-+    private function cleanAttributesCache(): void
-+    {
-+        foreach (self::$attributesToRefresh as $attributeCode) {
-+            $attributeId = Import\Product\Type\AbstractType::$attributeCodeToId[$attributeCode] ?? null;
-+            if ($attributeId !== null) {
-+                unset(Import\Product\Type\AbstractType::$commonAttributesCache[$attributeId]);
-+            }
-+        }
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
-index 70e0cf0e1e7..183ba86ca75 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
-@@ -3,6 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types = 1);
-+
- namespace Magento\CatalogImportExport\Model\Export;
- 
- /**
-@@ -70,7 +73,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_data.php
--     * @magentoDbIsolationEnabled
-+     * @magentoDbIsolation enabled
-      */
-     public function testExport()
-     {
-@@ -95,7 +98,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_data_special_chars.php
--     * @magentoDbIsolationEnabled
-+     * @magentoDbIsolation enabled
-      */
-     public function testExportSpecialChars()
-     {
-@@ -111,7 +114,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
--     * @magentoDbIsolationEnabled
-+     * @magentoDbIsolation enabled
-      */
-     public function testExportWithProductLinks()
-     {
-@@ -248,9 +251,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testExportWithFieldsEnclosure()
-     {
--        $this->model->setParameters([
--            \Magento\ImportExport\Model\Export::FIELDS_ENCLOSURE => 1
--        ]);
-+        $this->model->setParameters(
-+            [
-+                \Magento\ImportExport\Model\Export::FIELDS_ENCLOSURE => 1
-+            ]
-+        );
- 
-         $this->model->setWriter(
-             $this->objectManager->create(
-@@ -278,11 +283,13 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-             )
-         );
- 
--        $this->model->setParameters([
--            \Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP => [
--                'category_ids' => '2,13'
-+        $this->model->setParameters(
-+            [
-+                \Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP => [
-+                    'category_ids' => '2,13'
-+                ]
-             ]
--        ]);
-+        );
- 
-         $exportData = $this->model->export();
- 
-@@ -292,6 +299,22 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-         $this->assertNotContains('Simple Product Not Visible On Storefront', $exportData);
-     }
- 
-+    /**
-+     * Verify that export processed successfully with wrong category path
-+     *
-+     * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_with_broken_categories_path.php
-+     */
-+    public function testExportWithWrongCategoryPath()
-+    {
-+        $this->model->setWriter(
-+            $this->objectManager->create(
-+                \Magento\ImportExport\Model\Export\Adapter\Csv::class
-+            )
-+        );
-+
-+        $this->model->export();
-+    }
-+
-     /**
-      * Test 'hide from product page' export for non-default store.
-      *
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
-index c5e704c2434..c9a08c7f8a1 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
-@@ -20,20 +20,25 @@ use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
- use Magento\Framework\App\Bootstrap;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Filesystem;
- use Magento\Framework\Registry;
- use Magento\ImportExport\Model\Import;
- use Magento\Store\Model\Store;
- use Psr\Log\LoggerInterface;
-+use Magento\ImportExport\Model\Import\Source\Csv;
- 
- /**
-  * Class ProductTest
-  * @magentoAppIsolation enabled
-  * @magentoDbIsolation enabled
-+ * @magentoAppArea adminhtml
-  * @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_reindex_schedule.php
-  * @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_catalog_product_reindex_schedule.php
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
-+ * phpcs:disable Generic.PHP.NoSilencedErrors, Generic.Metrics.NestingLevel, Magento2.Functions.StaticFunction
-  */
- class ProductTest extends \Magento\TestFramework\Indexer\TestCase
- {
-@@ -77,9 +82,33 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-             \Magento\CatalogImportExport\Model\Import\Product::class,
-             ['logger' => $this->logger]
-         );
-+        $this->importedProducts = [];
-+
-         parent::setUp();
-     }
- 
-+    protected function tearDown()
-+    {
-+        /* We rollback here the products created during the Import because they were
-+           created during test execution and we do not have the rollback for them */
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-+        foreach ($this->importedProducts as $productSku) {
-+            try {
-+                $product = $productRepository->get($productSku, false, null, true);
-+                $productRepository->delete($product);
-+                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-+            } catch (NoSuchEntityException $e) {
-+                // nothing to delete
-+            }
-+        }
-+    }
-+
-+    /**
-+     * @var array
-+     */
-+    private $importedProducts;
-+
-     /**
-      * Options for assertion
-      *
-@@ -278,7 +307,10 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-      * @param string $importFile
-      * @param string $sku
-      * @param int $expectedOptionsQty
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      * @magentoAppIsolation enabled
-+
-      *
-      * @return void
-      */
-@@ -431,7 +463,7 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-             'Append behavior with new product' => [
-                 'importFile' => 'product_with_custom_options_new.csv',
-                 'sku' => 'simple_new',
--                'expectedOptionsQty' => 4,
-+                'expectedOptionsQty' => 5,
-             ],
-         ];
-     }
-@@ -567,6 +599,7 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-      */
-     protected function getExpectedOptionsData(string $pathToFile, string $storeCode = ''): array
-     {
-+        // phpcs:disable Magento2.Functions.DiscouragedFunction
-         $productData = $this->csvToArray(file_get_contents($pathToFile));
-         $expectedOptionId = 0;
-         $expectedOptions = [];
-@@ -762,7 +795,6 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-     /**
-      * Test that product import with images works properly
-      *
--     * @magentoDataIsolation enabled
-      * @magentoDataFixture mediaImportImageFixture
-      * @magentoAppIsolation enabled
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-@@ -813,7 +845,6 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-     /**
-      * Test that errors occurred during importing images are logged.
-      *
--     * @magentoDataIsolation enabled
-      * @magentoAppIsolation enabled
-      * @magentoDataFixture mediaImportImageFixture
-      * @magentoDataFixture mediaImportImageFixtureError
-@@ -958,6 +989,7 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-         $errors = $this->_model->setParameters(
-             [
-                 'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
-+                Import::FIELD_NAME_VALIDATION_STRATEGY => null,
-                 'entity' => 'catalog_product'
-             ]
-         )->setSource(
-@@ -1068,6 +1100,7 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-     /**
-      * Test url keys properly generated in multistores environment.
-      *
-+     * @magentoConfigFixture current_store catalog/seo/product_use_categories 1
-      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
-      * @magentoDataFixture Magento/Catalog/_files/category_with_two_stores.php
-      * @magentoDbIsolation enabled
-@@ -1292,12 +1325,10 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-      * @magentoAppArea adminhtml
-      * @magentoDbIsolation disabled
-      * @magentoAppIsolation enabled
--     * @magentoDataFixture Magento/Catalog/_files/category_duplicates.php
-+     * @magentoDataFixture Magento/CatalogImportExport/_files/update_category_duplicates.php
-      */
-     public function testProductDuplicateCategories()
-     {
--        $this->markTestSkipped('Due to MAGETWO-48956');
--
-         $csvFixture = 'products_duplicate_category.csv';
-         // import data from CSV file
-         $pathToFile = __DIR__ . '/_files/' . $csvFixture;
-@@ -1322,19 +1353,6 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
- 
-         $this->assertTrue($errors->getErrorsCount() === 0);
- 
--        /** @var \Magento\Catalog\Model\Category $category */
--        $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Catalog\Model\Category::class
--        );
--
--        $category->load(444);
--
--        $this->assertTrue($category !== null);
--
--        $category->setName(
--            'Category 2-updated'
--        )->save();
--
-         $this->_model->importData();
- 
-         $errorProcessor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-@@ -1373,6 +1391,7 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-      * @dataProvider validateUrlKeysDataProvider
-      * @param $importFile string
-      * @param $expectedErrors array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function testValidateUrlKeys($importFile, $expectedErrors)
-     {
-@@ -1566,6 +1585,97 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-         }
-     }
- 
-+    /**
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_wrong_url_key.php
-+     * @magentoDbIsolation disabled
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testAddUpdateProductWithInvalidUrlKeys() : void
-+    {
-+        $products = [
-+            'simple1' => 'cuvée merlot-cabernet igp pays d\'oc frankrijk',
-+            'simple2' => 'normal-url',
-+            'simple3' => 'some!wrong\'url'
-+        ];
-+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+            ->create(\Magento\Framework\Filesystem::class);
-+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
-+        $source = $this->objectManager->create(
-+            \Magento\ImportExport\Model\Import\Source\Csv::class,
-+            [
-+                'file' => __DIR__ . '/_files/products_to_import_with_invalid_url_keys.csv',
-+                'directory' => $directory
-+            ]
-+        );
-+
-+        $errors = $this->_model->setParameters(
-+            ['behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_ADD_UPDATE, 'entity' => 'catalog_product']
-+        )->setSource(
-+            $source
-+        )->validateData();
-+
-+        $this->assertTrue($errors->getErrorsCount() == 0);
-+        $this->_model->importData();
-+
-+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+            \Magento\Catalog\Api\ProductRepositoryInterface::class
-+        );
-+        foreach ($products as $productSku => $productUrlKey) {
-+            $this->assertEquals($productUrlKey, $productRepository->get($productSku)->getUrlKey());
-+        }
-+    }
-+
-+    /**
-+     * Make sure the non existing image in the csv file won't erase the qty key of the existing products.
-+     *
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testImportWithNonExistingImage()
-+    {
-+        $products = [
-+            'simple_new' => 100,
-+        ];
-+
-+        $this->importFile('products_to_import_with_non_existing_image.csv');
-+
-+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+        foreach ($products as $productSku => $productQty) {
-+            $product = $productRepository->get($productSku);
-+            $stockItem = $product->getExtensionAttributes()->getStockItem();
-+            $this->assertEquals($productQty, $stockItem->getQty());
-+        }
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testImportWithoutChangingUrlKeys()
-+    {
-+        $filesystem = $this->objectManager->create(Filesystem::class);
-+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
-+        $source = $this->objectManager->create(
-+            Csv::class,
-+            [
-+                'file' => __DIR__ . '/_files/products_to_import_without_url_key_column.csv',
-+                'directory' => $directory
-+            ]
-+        );
-+
-+        $errors = $this->_model->setParameters(
-+            ['behavior' => Import::BEHAVIOR_APPEND, 'entity' => 'catalog_product']
-+        )
-+            ->setSource($source)
-+            ->validateData();
-+
-+        $this->assertTrue($errors->getErrorsCount() == 0);
-+        $this->_model->importData();
-+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-+        $this->assertEquals('url-key', $productRepository->get('simple1')->getUrlKey());
-+    }
-+
-     /**
-      * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
-      * @magentoDbIsolation disabled
-@@ -1603,6 +1713,91 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-         }
-     }
- 
-+    /**
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_non_latin_url_key.php
-+     * @magentoDbIsolation disabled
-+     * @magentoAppIsolation enabled
-+     * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function testImportWithNonLatinUrlKeys()
-+    {
-+        $productsCreatedByFixture = [
-+            'ukrainian-with-url-key' => 'nove-im-ja-pislja-importu-scho-stane-url-key',
-+            'ukrainian-without-url-key' => 'новий url key після імпорту',
-+        ];
-+        $productsImportedByCsv = [
-+            'imported-ukrainian-with-url-key' => 'імпортований продукт',
-+            'imported-ukrainian-without-url-key' => 'importovanij-produkt-bez-url-key',
-+        ];
-+        $productSkuMap = array_merge($productsCreatedByFixture, $productsImportedByCsv);
-+        $this->importedProducts = array_keys($productsImportedByCsv);
-+
-+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
-+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
-+        $source = $this->objectManager->create(
-+            \Magento\ImportExport\Model\Import\Source\Csv::class,
-+            [
-+                'file' => __DIR__ . '/_files/products_to_import_with_non_latin_url_keys.csv',
-+                'directory' => $directory,
-+            ]
-+        );
-+
-+        $errors = $this->_model->setParameters(
-+            ['behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_ADD_UPDATE, 'entity' => 'catalog_product']
-+        )
-+            ->setSource($source)
-+            ->validateData();
-+
-+        $this->assertEquals($errors->getErrorsCount(), 0);
-+        $this->_model->importData();
-+
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-+        foreach ($productSkuMap as $productSku => $productUrlKey) {
-+            $this->assertEquals($productUrlKey, $productRepository->get($productSku)->getUrlKey());
-+        }
-+    }
-+
-+    /**
-+     * Make sure the absence of a url_key column in the csv file won't erase the url key of the existing products.
-+     * To reach the goal we need to not send the name column, as the url key is generated from it.
-+     *
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
-+     * @magentoDbIsolation disabled
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testImportWithoutUrlKeysAndName()
-+    {
-+        $products = [
-+            'simple1' => 'url-key',
-+            'simple2' => 'url-key2',
-+        ];
-+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
-+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
-+        $source = $this->objectManager->create(
-+            \Magento\ImportExport\Model\Import\Source\Csv::class,
-+            [
-+                'file' => __DIR__ . '/_files/products_to_import_without_url_keys_and_name.csv',
-+                'directory' => $directory
-+            ]
-+        );
-+
-+        $errors = $this->_model->setParameters(
-+            ['behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND, 'entity' => 'catalog_product']
-+        )
-+            ->setSource($source)
-+            ->validateData();
-+
-+        $this->assertTrue($errors->getErrorsCount() == 0);
-+        $this->_model->importData();
-+
-+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+        foreach ($products as $productSku => $productUrlKey) {
-+            $this->assertEquals($productUrlKey, $productRepository->get($productSku)->getUrlKey());
-+        }
-+    }
-+
-     /**
-      * @magentoAppIsolation enabled
-      */
-@@ -1718,6 +1913,7 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-                 if ($product->getId()) {
-                     $productRepository->delete($product);
-                 }
-+                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-             } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-                 //Product already removed
-             }
-@@ -2005,7 +2201,6 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-      * @magentoDataFixture Magento/Catalog/_files/attribute_set_with_renamed_group.php
-      * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
-      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
--     *
-      */
-     public function testImportDataChangeAttributeSet()
-     {
-@@ -2023,7 +2218,7 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-         );
-         $errors = $this->_model->setParameters(
-             [
--                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_ADD_UPDATE,
-+                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
-                 'entity' => \Magento\Catalog\Model\Product::ENTITY
-             ]
-         )->setSource(
-@@ -2147,7 +2342,6 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-     /**
-      * Test that product import with images for non-default store works properly.
-      *
--     * @magentoDataIsolation enabled
-      * @magentoDataFixture mediaImportImageFixture
-      * @magentoAppIsolation enabled
-      */
-@@ -2210,6 +2404,20 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
-         $this->assertFalse($product->getDataByKey('quantity_and_stock_status')['is_in_stock']);
-     }
- 
-+    /**
-+     * Test that imported product stock status with stock quantity > 0 and backorders functionality disabled
-+     * can be set to 'out of stock'.
-+     *
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testImportWithBackordersDisabled(): void
-+    {
-+        $this->importFile('products_to_import_with_backorders_disabled_and_not_0_qty.csv');
-+        $product = $this->getProductBySku('simple_new');
-+        $this->assertFalse($product->getDataByKey('quantity_and_stock_status')['is_in_stock']);
-+    }
-+
-     /**
-      * Import file by providing import filename in parameters.
-      *
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_new.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_new.csv
-index 7fe8832cd58..f276a96cd1d 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_new.csv
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_new.csv
-@@ -1,2 +1,2 @@
- sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,crosssell_skus,upsell_skus,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,associated_skus
--simple_new,,Default,simple,,base,"New Product",,,,1,"Taxable Goods","Catalog, Search",10.0000,,,,new-product,"New Product","New Product","New Product ",,,,,,,"2015-10-20 07:05:38","2015-10-20 07:05:38",,,"Block after Info Column",,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",100.0000,0.0000,1,0,0,1,1.0000,1,10000.0000,1,1,1.0000,1,1,0,1,1.0000,0,0,0,1,,,,,,,"name=New Radio,type=radio,required=1,price=3.0000,price_type=fixed,sku=4-1-radio,option_title=Option 1|name=New Radio,type=radio,required=1,price=3.0000,price_type=fixed,sku=4-2-radio,option_title=Option 2|name=New Select,type=drop_down,required=1,price=3.0000,price_type=fixed,sku=3-1-select,option_title=Option 1|name=New Select,type=drop_down,required=1,price=3.0000,price_type=fixed,sku=3-2-select,option_title=Option2|name=Test Date and Time Title,type=date_time,required=1,price=2.0000,price_type=fixed,sku=2-date|name=Test Field Title,type=field,required=1,price=0.0000,price_type=fixed,sku=1-text,max_characters=10",,,,,,
-+simple_new,,Default,simple,,base,"New Product",,,,1,"Taxable Goods","Catalog, Search",10.0000,,,,new-product,"New Product","New Product","New Product ",,,,,,,"2015-10-20 07:05:38","2015-10-20 07:05:38",,,"Block after Info Column",,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",100.0000,0.0000,1,0,0,1,1.0000,1,10000.0000,1,1,1.0000,1,1,0,1,1.0000,0,0,0,1,,,,,,,"name=New Radio,type=radio,required=1,price=3.0000,price_type=fixed,sku=4-1-radio,option_title=Option 1|name=New Radio,type=radio,required=1,price=3.0000,price_type=fixed,sku=4-2-radio,option_title=Option 2|name=New Select,type=drop_down,required=1,price=3.0000,price_type=fixed,sku=3-1-select,option_title=Option 1|name=New Select,type=drop_down,required=1,price=3.0000,price_type=fixed,sku=3-2-select,option_title=Option2|name=Test Date and Time Title,type=date_time,required=1,price=2.0000,price_type=fixed,sku=2-date|name=Test Field Title,type=field,required=1,price=0.0000,price_type=fixed,sku=1-text,max_characters=10|name=New Select With Zero Price,type=drop_down,required=1,price=0,price_type=fixed,sku=3-1-select,option_title=Option 1",,,,,,
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_disabled_and_not_0_qty.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_disabled_and_not_0_qty.csv
-new file mode 100644
-index 00000000000..b22427a8af1
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_disabled_and_not_0_qty.csv
-@@ -0,0 +1,2 @@
-+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,crosssell_skus,upsell_skus,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,associated_skus
-+simple_new,,Default,simple,,base,New Product,,,,1,Taxable Goods,"Catalog, Search",10,,,,new-product,New Product,New Product,New Product ,,,,,,,10/20/2015 7:05,10/20/2015 7:05,,,Block after Info Column,,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",100,0,1,0,0,0,1,1,10000,1,0,1,1,1,0,1,1,0,0,0,1,,,,,,,,,,,,,
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_invalid_url_keys.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_invalid_url_keys.csv
-new file mode 100644
-index 00000000000..25bb95ab9e0
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_invalid_url_keys.csv
-@@ -0,0 +1,4 @@
-+sku,product_type,store_view_code,name,price,attribute_set_code,url_key
-+simple1,simple,,"simple 1",25,Default,cuvée merlot-cabernet igp pays d'oc frankrijk
-+simple2,simple,,"simple 2",34,Default,normal-url
-+simple3,simple,,"simple 3",58,Default,some!wrong'url
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_non_existing_image.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_non_existing_image.csv
-new file mode 100644
-index 00000000000..8122433a8c9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_non_existing_image.csv
-@@ -0,0 +1,2 @@
-+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label1,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,crosssell_skus,upsell_skus,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,associated_skus
-+simple_new,,Default,simple,,base,New Product,,,,1,Taxable Goods,"Catalog, Search",10,,,,new-product,New Product,New Product,New Product ,/no/exists/image/magento_image.jpg,Image Label,magento_small_image.jpg,Small Image Label,magento_thumbnail.jpg,Thumbnail Label,magento_image.jpg,Image Label,10/20/15 07:05,10/20/15 07:05,,,Block after Info Column,,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",100,0,1,0,0,1,1,1,10000,1,1,1,1,1,0,1,1,0,0,0,1,,,,"magento_additional_image_one.jpg, magento_additional_image_two.jpg","Additional Image Label One,Additional Image Label Two",,,,,,,,
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_non_latin_url_keys.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_non_latin_url_keys.csv
-new file mode 100644
-index 00000000000..41c6eaa254e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_non_latin_url_keys.csv
-@@ -0,0 +1,5 @@
-+sku,product_type,store_view_code,name,price,attribute_set_code,url_key
-+imported-ukrainian-with-url-key,simple,,"Імпортований продукт з Url Key",50,Default,"імпортований продукт"
-+imported-ukrainian-without-url-key,simple,,"Імпортований продукт без Url Key",55,Default,
-+ukrainian-without-url-key,simple,,"Чудовий продукт без Url Key",55,Default,"новий url key після імпорту"
-+ukrainian-with-url-key,simple,,"Нове ім'я після імпорту що стане url key",55,Default,
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_key_column.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_key_column.csv
-new file mode 100644
-index 00000000000..437ed182f9f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_key_column.csv
-@@ -0,0 +1,2 @@
-+sku,product_type,store_view_code,name,price,attribute_set_code
-+simple1,simple,,"simple 1",25,Default
-\ No newline at end of file
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_keys_and_name.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_keys_and_name.csv
-new file mode 100644
-index 00000000000..8ea6ab92a02
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_keys_and_name.csv
-@@ -0,0 +1,3 @@
-+sku,price
-+simple1,25
-+simple2,34
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
-index 186c6b8a92b..c39acbc3387 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
-@@ -13,7 +13,7 @@ class ProductTest extends AbstractProductExportImportTestCase
-     /**
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
--    public function exportImportDataProvider()
-+    public function exportImportDataProvider(): array
-     {
-         return [
-             'product_export_data' => [
-@@ -136,11 +136,6 @@ class ProductTest extends AbstractProductExportImportTestCase
-         ];
-     }
- 
--    public function importReplaceDataProvider()
--    {
--        return $this->exportImportDataProvider();
--    }
--
-     /**
-      * Fixing https://github.com/magento-engcom/import-export-improvements/issues/50 means that during import images
-      * can now get renamed for this we need to skip the attribute checking and instead check that the images contain
-@@ -150,8 +145,10 @@ class ProductTest extends AbstractProductExportImportTestCase
-      * @param \Magento\Catalog\Model\Product $expectedProduct
-      * @param \Magento\Catalog\Model\Product $actualProduct
-      */
--    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
--    {
-+    protected function assertEqualsSpecificAttributes(
-+        \Magento\Catalog\Model\Product $expectedProduct,
-+        \Magento\Catalog\Model\Product $actualProduct
-+    ): void {
-         if (!empty($actualProduct->getImage())
-             && !empty($expectedProduct->getImage())
-         ) {
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
-index 89fb9952cc6..477494626b9 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
-@@ -70,7 +70,7 @@ $productModel->setTypeId(
- )->setPrice(
-     10
- )->addData(
--    ['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/']
-+    ['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/›ƒª']
- )->setTierPrice(
-     [0 => ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 8]]
- )->setVisibility(
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php
-index 168073bc6ab..c57c7c3fd6a 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php
-@@ -5,10 +5,10 @@
-  */
- 
- /** Delete all products */
--require dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
-+include dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
- /** Delete text attribute */
--require dirname(dirname(__DIR__)) . '/Catalog/_files/text_attribute_rollback.php';
-+include dirname(dirname(__DIR__)) . '/Catalog/_files/product_text_attribute_rollback.php';
- 
--require dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
-+include dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
- 
--require dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
-+include dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php
-index a2c2c1815a8..591dccf229f 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php
-@@ -25,7 +25,7 @@ $productModel->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-     ->setName('New Product')
-     ->setSku('simple &quot;1&quot;')
-     ->setPrice(10)
--    ->addData(['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/'])
-+    ->addData(['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/›ƒª'])
-     ->setTierPrice([0 => ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 8]])
-     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php
-index 168073bc6ab..c57c7c3fd6a 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php
-@@ -5,10 +5,10 @@
-  */
- 
- /** Delete all products */
--require dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
-+include dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
- /** Delete text attribute */
--require dirname(dirname(__DIR__)) . '/Catalog/_files/text_attribute_rollback.php';
-+include dirname(dirname(__DIR__)) . '/Catalog/_files/product_text_attribute_rollback.php';
- 
--require dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
-+include dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
- 
--require dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
-+include dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_broken_categories_path.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_broken_categories_path.php
-new file mode 100644
-index 00000000000..3fdfeda826a
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_broken_categories_path.php
-@@ -0,0 +1,90 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types = 1);
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+$defaultAttributeSet = $objectManager->get(Magento\Eav\Model\Config::class)
-+    ->getEntityType('catalog_product')
-+    ->getDefaultAttributeSetId();
-+
-+$productRepository = $objectManager->create(
-+    \Magento\Catalog\Api\ProductRepositoryInterface::class
-+);
-+
-+$categoryLinkRepository = $objectManager->create(
-+    \Magento\Catalog\Api\CategoryLinkRepositoryInterface::class,
-+    [
-+        'productRepository' => $productRepository
-+    ]
-+);
-+
-+/** @var Magento\Catalog\Api\CategoryLinkManagementInterface $linkManagement */
-+$categoryLinkManagement = $objectManager->create(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
-+$reflectionClass = new \ReflectionClass(get_class($categoryLinkManagement));
-+$properties = [
-+    'productRepository' => $productRepository,
-+    'categoryLinkRepository' => $categoryLinkRepository
-+];
-+foreach ($properties as $key => $value) {
-+    if ($reflectionClass->hasProperty($key)) {
-+        $reflectionProperty = $reflectionClass->getProperty($key);
-+        $reflectionProperty->setAccessible(true);
-+        $reflectionProperty->setValue($categoryLinkManagement, $value);
-+    }
-+}
-+
-+/**
-+ * After installation system has two categories: root one with ID:1 and Default category with ID:2
-+ */
-+/** @var $category \Magento\Catalog\Model\Category */
-+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
-+$category->isObjectNew(true);
-+$category->setId(3)
-+    ->setName('Category 1')
-+    ->setParentId(2)
-+    ->setPath('1/2/3')
-+    ->setLevel(2)
-+    ->setAvailableSortBy('name')
-+    ->setDefaultSortBy('name')
-+    ->setIsActive(true)
-+    ->setPosition(1)
-+    ->save();
-+
-+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
-+$category->isObjectNew(true);
-+$category->setId(5)
-+    ->setName('Category 1.1')
-+    ->setParentId(3)
-+    ->setPath('1/2/3/4/5')
-+    ->setLevel(4)
-+    ->setAvailableSortBy('name')
-+    ->setDefaultSortBy('name')
-+    ->setIsActive(true)
-+    ->setIsAnchor(true)
-+    ->setPosition(1)
-+    ->save();
-+
-+/** @var $product \Magento\Catalog\Model\Product */
-+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-+$product->isObjectNew(true);
-+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+    ->setAttributeSetId($defaultAttributeSet)
-+    ->setStoreId(1)
-+    ->setWebsiteIds([1])
-+    ->setName('Simple Product')
-+    ->setSku('simple')
-+    ->setPrice(10)
-+    ->setWeight(18)
-+    ->setStockData(['use_config_manage_stock' => 0])
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->save();
-+
-+$categoryLinkManagement->assignProductToCategories(
-+    $product->getSku(),
-+    [5]
-+);
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_broken_categories_path_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_broken_categories_path_rollback.php
-new file mode 100644
-index 00000000000..d03c95cbeb4
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_broken_categories_path_rollback.php
-@@ -0,0 +1,41 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types = 1);
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = $objectManager->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+// Remove products
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+
-+try {
-+    $product = $productRepository->get('simple', false, null, true);
-+    $productRepository->delete($product);
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-+    //Product already removed
-+}
-+
-+$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
-+foreach ($productCollection as $product) {
-+    $product->delete();
-+}
-+
-+//Remove categories
-+/** @var Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
-+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
-+foreach ($collection->addAttributeToFilter('level', ['in' => [2, 3, 4]]) as $category) {
-+    /** @var \Magento\Catalog\Model\Category $category */
-+    $category->delete();
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/update_category_duplicates.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/update_category_duplicates.php
-new file mode 100644
-index 00000000000..53d30e834a0
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/update_category_duplicates.php
-@@ -0,0 +1,18 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require dirname(dirname(__DIR__)) . '/Catalog/_files/category_duplicates.php';
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+/** @var \Magento\Catalog\Model\Category $category */
-+$categoryModel = $objectManager->create(\Magento\Catalog\Model\Category::class);
-+$categoryModel->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
-+
-+$categoryModel->load(444)
-+    ->setName('Category 2-updated')
-+    ->save();
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/update_category_duplicates_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/update_category_duplicates_rollback.php
-new file mode 100644
-index 00000000000..ca0f379a03d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/update_category_duplicates_rollback.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require dirname(dirname(__DIR__)) . '/Catalog/_files/category_duplicates_rollback.php';
-+
-+//Delete products created in CSV import
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+$csvProductSkus = ['simple1', 'simple2', 'simple3'];
-+foreach ($csvProductSkus as $sku) {
-+    try {
-+        $product = $productRepository->get($sku, false, null, true);
-+        $productRepository->delete($product);
-+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Quote/Item/QuantityValidatorTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Quote/Item/QuantityValidatorTest.php
-index 873c5db9ab7..6105aba9201 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Quote/Item/QuantityValidatorTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Quote/Item/QuantityValidatorTest.php
-@@ -5,12 +5,20 @@
-  */
- namespace Magento\CatalogInventory\Model\Quote\Item;
- 
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\CatalogInventory\Api\Data\StockItemInterface;
-+use Magento\CatalogInventory\Model\Stock\StockItemRepository;
-+use Magento\CatalogInventory\Model\StockState;
-+use Magento\CatalogInventory\Observer\QuantityValidatorObserver;
-+use Magento\Eav\Model\Config;
-+use Magento\Framework\Exception\CouldNotSaveException;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Quote\Api\Data\CartInterface;
-+use Magento\Quote\Model\Quote;
- use Magento\TestFramework\Helper\Bootstrap;
- use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer\Option;
- use Magento\Framework\Event\Observer;
--use Magento\CatalogInventory\Model\StockState;
--use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator;
--use Magento\CatalogInventory\Observer\QuantityValidatorObserver;
- use Magento\Framework\Event;
- use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Framework\DataObject;
-@@ -58,6 +66,9 @@ class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
-      */
-     private $observer;
- 
-+    /**
-+     * Set up
-+     */
-     protected function setUp()
-     {
-         /** @var \Magento\Framework\ObjectManagerInterface objectManager */
-@@ -83,7 +94,7 @@ class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @magentoDataFixture Magento/Checkout/_files/quote_with_bundle_product.php
--     * @magentoDbIsolation enabled
-+     * @magentoDbIsolation disabled
-      * @magentoAppIsolation enabled
-      */
-     public function testQuoteWithOptions()
-@@ -93,7 +104,7 @@ class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
- 
-         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-         $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
--        /** @var $product \Magento\Catalog\Model\Product */
-+        /** @var $product Product */
-         $product = $productRepository->get('bundle-product');
-         $resultMock = $this->createMock(DataObject::class);
-         $this->stockState->expects($this->any())->method('checkQtyIncrements')->willReturn($resultMock);
-@@ -108,7 +119,7 @@ class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @magentoDataFixture Magento/Checkout/_files/quote_with_bundle_product.php
--     * @magentoDbIsolation enabled
-+     * @magentoDbIsolation disabled
-      * @magentoAppIsolation enabled
-      */
-     public function testQuoteWithOptionsWithErrors()
-@@ -117,7 +128,7 @@ class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
-         $session = $this->objectManager->create(Session::class);
-         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-         $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
--        /** @var $product \Magento\Catalog\Model\Product */
-+        /** @var $product Product */
-         $product = $productRepository->get('bundle-product');
-         /* @var $quoteItem \Magento\Quote\Model\Quote\Item */
-         $quoteItem = $this->_getQuoteItemIdByProductId($session->getQuote(), $product->getId());
-@@ -132,7 +143,7 @@ class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
-         $resultMock->expects($this->any())->method('getHasError')->willReturn(true);
-         $this->setMockStockStateResultToQuoteItemOptions($quoteItem, $resultMock);
-         $this->observer->execute($this->observerMock);
--        $this->assertCount(2, $quoteItem->getErrorInfos(), 'Expected 2 errors in QuoteItem');
-+        $this->assertCount(1, $quoteItem->getErrorInfos(), 'Expected 1 error in QuoteItem');
-     }
- 
-     /**
-@@ -155,11 +166,102 @@ class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
-         $this->fail('Test failed since Quote Item does not have Qty options.');
-     }
- 
-+    /**
-+     * Tests quantity verifications for configurable product.
-+     *
-+     * @param int $quantity - quantity of configurable option.
-+     * @param string $errorMessageRegexp - expected error message regexp.
-+     * @return void
-+     * @throws CouldNotSaveException
-+     * @throws LocalizedException
-+     * @dataProvider quantityDataProvider
-+     * @magentoDataFixture Magento/CatalogInventory/_files/configurable_options_advanced_inventory.php
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testConfigurableWithOptions(int $quantity, string $errorMessageRegexp): void
-+    {
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-+        /** @var Product $product */
-+        $product = $productRepository->get('configurable');
-+        $product->setStatus(Status::STATUS_ENABLED)
-+            ->setData('is_salable', true);
-+        $productRepository->save($product);
-+
-+        /** @var StockItemRepository $stockItemRepository */
-+        $stockItemRepository = $this->objectManager->create(StockItemRepository::class);
-+
-+        /** @var StockItemInterface $stockItem */
-+        $stockItem = $stockItemRepository->get($product->getExtensionAttributes()
-+            ->getStockItem()
-+            ->getItemId());
-+        $stockItem->setIsInStock(true)
-+            ->setQty(1000);
-+        $stockItemRepository->save($stockItem);
-+
-+        /** @var Config $eavConfig */
-+        $eavConfig = $this->objectManager->get(Config::class);
-+        /** @var  $attribute */
-+        $attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
-+
-+        $request = $this->objectManager->create(DataObject::class);
-+        $request->setData(
-+            [
-+                'product_id' => $product->getId(),
-+                'selected_configurable_option' => 1,
-+                'super_attribute' => [
-+                    $attribute->getAttributeId() => $attribute->getOptions()[1]->getValue()
-+                ],
-+                'qty' => $quantity
-+            ]
-+        );
-+
-+        try {
-+            /** @var Quote $cart */
-+            $cart = $this->objectManager->create(CartInterface::class);
-+            $result = $cart->addProduct($product, $request);
-+
-+            if (empty($errorMessageRegexp)) {
-+                self::assertEquals('Configurable Product', $result->getName());
-+            }
-+        } catch (LocalizedException $e) {
-+            self::assertEquals(1, preg_match($errorMessageRegexp, $e->getMessage()));
-+        }
-+    }
-+
-+    /**
-+     * Provides request quantity for configurable option
-+     * and corresponding error message.
-+     *
-+     * @return array
-+     */
-+    public function quantityDataProvider(): array
-+    {
-+        $qtyRegexp = '/You can buy (this product|Configurable OptionOption 1) only in quantities of 500 at a time/';
-+
-+        return [
-+            [
-+                'quantity' => 1,
-+                'error_regexp' => '/The fewest you may purchase is 500/'
-+            ],
-+            [
-+                'quantity' => 501,
-+                'error_regexp' => $qtyRegexp
-+            ],
-+            [
-+                'quantity' => 1000,
-+                'error_regexp' => ''
-+            ],
-+
-+        ];
-+    }
-+
-     /**
-      * Gets \Magento\Quote\Model\Quote\Item from \Magento\Quote\Model\Quote by product id
-      *
--     * @param \Magento\Quote\Model\Quote $quote
--     * @param $productId
-+     * @param Quote $quote
-+     * @param int $productId
-      * @return \Magento\Quote\Model\Quote\Item
-      */
-     private function _getQuoteItemIdByProductId($quote, $productId)
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Observer/SaveInventoryDataObserverTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Observer/SaveInventoryDataObserverTest.php
-new file mode 100644
-index 00000000000..a50a7b096fe
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Observer/SaveInventoryDataObserverTest.php
-@@ -0,0 +1,86 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogInventory\Observer;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Api\Data\ProductExtensionInterface;
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\CatalogInventory\Api\Data\StockItemInterface;
-+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Exception\InputException;
-+use Magento\Framework\Exception\StateException;
-+use Magento\Framework\Exception\CouldNotSaveException;
-+
-+/**
-+ * Test for SaveInventoryDataObserver
-+ */
-+class SaveInventoryDataObserverTest extends TestCase
-+{
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @var StockItemRepositoryInterface
-+     */
-+    private $stockItemRepository;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->productRepository = Bootstrap::getObjectManager()
-+            ->get(ProductRepositoryInterface::class);
-+        $this->stockItemRepository = Bootstrap::getObjectManager()
-+            ->get(StockItemRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * Check that parent product will be out of stock
-+     *
-+     * @magentoAppArea adminhtml
-+     * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-+     * @magentoDataFixture Magento/CatalogInventory/_files/configurable_options_with_low_stock.php
-+     * @throws NoSuchEntityException
-+     * @throws InputException
-+     * @throws StateException
-+     * @throws CouldNotSaveException
-+     * @return void
-+     */
-+    public function testAutoChangingIsInStockForParent()
-+    {
-+        /** @var ProductInterface $product */
-+        $product = $this->productRepository->get('simple_10');
-+
-+        /** @var ProductExtensionInterface $attributes*/
-+        $attributes = $product->getExtensionAttributes();
-+
-+        /** @var StockItemInterface $stockItem */
-+        $stockItem = $attributes->getStockItem();
-+        $stockItem->setQty(0);
-+        $stockItem->setIsInStock(false);
-+        $attributes->setStockItem($stockItem);
-+        $product->setExtensionAttributes($attributes);
-+        $this->productRepository->save($product);
-+
-+        /** @var ProductInterface $product */
-+        $parentProduct = $this->productRepository->get('configurable');
-+
-+        $parentProductStockItem = $this->stockItemRepository->get(
-+            $parentProduct->getExtensionAttributes()->getStockItem()->getItemId()
-+        );
-+        $this->assertSame(false, $parentProductStockItem->getIsInStock());
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/configurable_options_advanced_inventory.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/configurable_options_advanced_inventory.php
-new file mode 100644
-index 00000000000..901a1d33444
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/configurable_options_advanced_inventory.php
-@@ -0,0 +1,34 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\CatalogInventory\Api\Data\StockItemInterface;
-+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+require __DIR__ . '/../../../Magento/ConfigurableProduct/_files/product_configurable.php';
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var StockItemRepositoryInterface $stockItemRepository */
-+$stockItemRepository = $objectManager->get(StockItemRepositoryInterface::class);
-+
-+/** @var ProductInterface $product */
-+$product = $productRepository->get('simple_10');
-+
-+/** @var StockItemInterface $stockItem */
-+$stockItem = $product->getExtensionAttributes()->getStockItem();
-+$stockItem->setIsInStock(true)
-+    ->setQty(10000)
-+    ->setUseConfigMinSaleQty(false)
-+    ->setMinSaleQty(500)
-+    ->setUseConfigEnableQtyInc(false)
-+    ->setEnableQtyIncrements(true)
-+    ->setUseConfigQtyIncrements(false)
-+    ->setQtyIncrements(500);
-+
-+$stockItemRepository->save($stockItem);
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/configurable_options_with_low_stock.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/configurable_options_with_low_stock.php
-new file mode 100644
-index 00000000000..f6013b2e4b9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/configurable_options_with_low_stock.php
-@@ -0,0 +1,38 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\CatalogInventory\Api\Data\StockItemInterface;
-+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
-+
-+/** @var StockItemRepositoryInterface $stockItemRepository */
-+$stockItemRepository = $objectManager->get(StockItemRepositoryInterface::class);
-+
-+/** @var ProductInterface $product */
-+$product = $productRepository->get('simple_10');
-+
-+/** @var StockItemInterface $stockItem */
-+$stockItem = $product->getExtensionAttributes()->getStockItem();
-+$stockItem->setIsInStock(true)
-+    ->setQty(1);
-+$stockItemRepository->save($stockItem);
-+
-+/** @var ProductInterface $product */
-+$product = $productRepository->get('simple_20');
-+
-+/** @var StockItemInterface $stockItem */
-+$stockItem = $product->getExtensionAttributes()->getStockItem();
-+$stockItem->setIsInStock(false)
-+    ->setQty(0);
-+$stockItemRepository->save($stockItem);
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/BatchIndexTest.php b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/BatchIndexTest.php
-index b71b466714e..11556dcfb7e 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/BatchIndexTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/BatchIndexTest.php
-@@ -102,17 +102,20 @@ class BatchIndexTest extends \PHPUnit\Framework\TestCase
-             ->setUrlKey(null)
-             ->setSku(uniqid($this->product->getSku() . '-'))
-             ->setName(uniqid($this->product->getName() . '-'))
--            ->setWebsiteIds([1]);
--        $productSecond->save();
--        $productSecond->setPrice($price)->save();
-+            ->setWebsiteIds([1])
-+            ->save();
-+        $productSecond->setPrice($price);
-+        $this->productRepository->save($productSecond);
-         $productThird = clone $this->product;
-         $productThird->setId(null)
-             ->setUrlKey(null)
--            ->setSku(uniqid($this->product->getSku() . '-'))
--            ->setName(uniqid($this->product->getName() . '-'))
-+            ->setSku(uniqid($this->product->getSku() . '--'))
-+            ->setName(uniqid($this->product->getName() . '--'))
-             ->setWebsiteIds([1])
-             ->save();
--        $productThird->setPrice($price)->save();
-+        $productThird->setPrice($price);
-+        $this->productRepository->save($productThird);
-+
-         return [
-             $productSecond->getEntityId(),
-             $productThird->getEntityId(),
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php
-index 4cd0f124b6e..4f8a279a591 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php
-@@ -33,13 +33,15 @@ class ResultTest extends \Magento\TestFramework\TestCase\AbstractController
- 
-     public function testIndexActionXSSQueryVerification()
-     {
-+        $escaper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+            ->get(\Magento\Framework\Escaper::class);
-         $this->getRequest()->setParam('q', '<script>alert(1)</script>');
-         $this->dispatch('catalogsearch/result');
- 
-         $responseBody = $this->getResponse()->getBody();
-         $data = '<script>alert(1)</script>';
-         $this->assertNotContains($data, $responseBody);
--        $this->assertContains(htmlspecialchars($data, ENT_COMPAT, 'UTF-8', false), $responseBody);
-+        $this->assertContains($escaper->escapeHtml($data), $responseBody);
-     }
- 
-     /**
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
-index 59ad91ae7b0..56c5db5572a 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
-@@ -14,6 +14,9 @@ use Magento\Store\Model\Store;
- use Magento\Catalog\Model\Product;
- use Magento\TestFramework\Helper\Bootstrap;
- 
-+/**
-+ * Class for testing fulltext index rebuild
-+ */
- class FullTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -21,6 +24,9 @@ class FullTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $actionFull;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->actionFull = Bootstrap::getObjectManager()->create(
-@@ -29,6 +35,8 @@ class FullTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Testing fulltext index rebuild
-+     *
-      * @magentoDataFixture Magento/CatalogSearch/_files/products_for_index.php
-      * @magentoDataFixture Magento/CatalogSearch/_files/product_configurable_not_available.php
-      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php
-@@ -39,7 +47,6 @@ class FullTest extends \PHPUnit\Framework\TestCase
-         $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-         $allowedStatuses = Bootstrap::getObjectManager()->get(Status::class)->getVisibleStatusIds();
-         $allowedVisibility = Bootstrap::getObjectManager()->get(Engine::class)->getAllowedVisibility();
--
-         $result = iterator_to_array($this->actionFull->rebuildStoreIndex(Store::DISTRO_STORE_ID));
-         $this->assertNotEmpty($result);
- 
-@@ -58,7 +65,10 @@ class FullTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Prepare and return expected index data
-+     *
-      * @return array
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
-     private function getExpectedIndexData()
-     {
-@@ -68,32 +78,48 @@ class FullTest extends \PHPUnit\Framework\TestCase
-         $nameId = $attributeRepository->get(ProductInterface::NAME)->getAttributeId();
-         /** @see dev/tests/integration/testsuite/Magento/Framework/Search/_files/configurable_attribute.php */
-         $configurableId = $attributeRepository->get('test_configurable')->getAttributeId();
-+        $statusId = $attributeRepository->get(ProductInterface::STATUS)->getAttributeId();
-+        $taxClassId = $attributeRepository
-+            ->get(\Magento\Customer\Api\Data\GroupInterface::TAX_CLASS_ID)
-+            ->getAttributeId();
-         return [
-             'configurable' => [
-                 $skuId => 'configurable',
-                 $configurableId => 'Option 1 | Option 2',
-                 $nameId => 'Configurable Product | Configurable OptionOption 1 | Configurable OptionOption 2',
-+                $taxClassId => 'Taxable Goods | Taxable Goods | Taxable Goods',
-+                $statusId => 'Enabled | Enabled | Enabled'
-             ],
-             'index_enabled' => [
-                 $skuId => 'index_enabled',
-                 $nameId => 'index enabled',
-+                $taxClassId => 'Taxable Goods',
-+                $statusId => 'Enabled'
-             ],
-             'index_visible_search' => [
-                 $skuId => 'index_visible_search',
-                 $nameId => 'index visible search',
-+                $taxClassId => 'Taxable Goods',
-+                $statusId => 'Enabled'
-             ],
-             'index_visible_category' => [
-                 $skuId => 'index_visible_category',
-                 $nameId => 'index visible category',
-+                $taxClassId => 'Taxable Goods',
-+                $statusId => 'Enabled'
-             ],
-             'index_visible_both' => [
-                 $skuId => 'index_visible_both',
-                 $nameId => 'index visible both',
-+                $taxClassId => 'Taxable Goods',
-+                $statusId => 'Enabled'
-             ]
-         ];
-     }
- 
-     /**
-+     * Testing fulltext index rebuild with configurations
-+     *
-      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-      */
-     public function testRebuildStoreIndexConfigurable()
-@@ -114,6 +140,8 @@ class FullTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Get product Id by its SKU
-+     *
-      * @param string $sku
-      * @return int
-      */
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/AttributeSearchWeightTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/AttributeSearchWeightTest.php
-new file mode 100644
-index 00000000000..775210669ab
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/AttributeSearchWeightTest.php
-@@ -0,0 +1,179 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\CatalogSearch\Model\Search;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-+use Magento\Eav\Api\AttributeRepositoryInterface;
-+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
-+use Magento\Elasticsearch6\Model\Client\Elasticsearch as ElasticsearchClient;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Exception\StateException;
-+use Magento\Framework\Search\Request\Builder;
-+use Magento\Framework\Search\Request\Config as RequestConfig;
-+use Magento\Framework\Search\Response\QueryResponse;
-+use Magento\Framework\Search\SearchEngineInterface;
-+use Magento\Indexer\Model\Indexer;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\Helper\CacheCleaner;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Test for name over sku search weight of product attributes
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @magentoAppIsolation enabled
-+ * @magentoDbIsolation enabled
-+ */
-+class AttributeSearchWeightTest extends TestCase
-+{
-+
-+    /** @var $objectManager ObjectManager */
-+    private $objectManager;
-+
-+    /**
-+     * @var ConnectionManager
-+     */
-+    private $connectionManager;
-+
-+    /**
-+     * @var ElasticsearchClient
-+     */
-+    private $client;
-+
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->connectionManager = $this->objectManager->create(ConnectionManager::class);
-+        $this->client = $this->connectionManager->getConnection();
-+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-+    }
-+
-+    /**
-+     * @param string $attributeName
-+     * @param int $searchWeight
-+     * @throws NoSuchEntityException
-+     * @throws StateException
-+     */
-+    private function setAttributeSearchWeight(string $attributeName, int $searchWeight)
-+    {
-+        /** @var AttributeRepositoryInterface $attributeRepository */
-+        $attributeRepository = $this->objectManager->create(AttributeRepositoryInterface::class);
-+
-+        /** @var Attribute $attribute */
-+        $attribute = $attributeRepository->get('catalog_product', $attributeName);
-+
-+        if ($attribute) {
-+            $attribute->setSearchWeight($searchWeight);
-+            $attributeRepository->save($attribute);
-+        }
-+    }
-+
-+    /**
-+     * @throws \Throwable
-+     */
-+    private function reindex()
-+    {
-+        CacheCleaner::cleanAll();
-+
-+        /** @var Indexer $indexer */
-+        $indexer = $this->objectManager->create(Indexer::class);
-+        $indexer->load('catalogsearch_fulltext');
-+        $indexer->reindexAll();
-+    }
-+
-+    /**
-+     * @param string $query
-+     * @return array
-+     * @throws NoSuchEntityException
-+     */
-+    private function findProducts(string $query): array
-+    {
-+        $config = $this->objectManager->create(RequestConfig::class);
-+
-+        /** @var Builder $requestBuilder */
-+        $requestBuilder = $this->objectManager->create(
-+            Builder::class,
-+            ['config' => $config]
-+        );
-+        $requestBuilder->bind('search_term', $query);
-+        $requestBuilder->setRequestName('quick_search_container');
-+
-+        /** @var QueryResponse $searchResult */
-+        $searchResults = $this->objectManager->create(SearchEngineInterface::class)
-+            ->search($requestBuilder->create());
-+
-+        $products = [];
-+        foreach ($searchResults as $searchResult) {
-+            $products [] = $this->productRepository->getById($searchResult->getId());
-+        }
-+
-+        return $products;
-+    }
-+
-+    /**
-+     * @dataProvider skuOverNameAttributeSearchWeightDataProvider
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
-+     * @magentoDataFixture Magento/CatalogSearch/_files/products_for_sku_search_weight_score.php
-+     * @param string $searchQuery
-+     * @param int $skuSearchWeight
-+     * @param int $nameSearchWeight
-+     * @param string $firstMatchProductName
-+     * @param string $secondMatchProductName
-+     * @throws NoSuchEntityException
-+     * @throws \Throwable
-+     */
-+    public function testSkuOverNameAttributeSearchWeight(
-+        string $searchQuery,
-+        int $skuSearchWeight,
-+        int $nameSearchWeight,
-+        string $firstMatchProductName,
-+        string $secondMatchProductName
-+    ) {
-+        $this->setAttributeSearchWeight('sku', $skuSearchWeight);
-+        $this->setAttributeSearchWeight('name', $nameSearchWeight);
-+        $this->reindex();
-+
-+        /** @var Product $products [] */
-+        $products = $this->findProducts($searchQuery);
-+
-+        $this->assertCount(
-+            2,
-+            $products,
-+            'Expected to find 2 products, found ' . count($products) . '.'
-+        );
-+
-+        $this->assertEquals(
-+            $firstMatchProductName,
-+            $products[0]->getData('name'),
-+            'Products order is not as expected.'
-+        );
-+        $this->assertEquals(
-+            $secondMatchProductName,
-+            $products[1]->getData('name'),
-+            'Products order is not as expected.'
-+        );
-+    }
-+
-+    public function skuOverNameAttributeSearchWeightDataProvider(): array
-+    {
-+        return [
-+            ['1-2-3-4', 10, 5, 'test', '1-2-3-4'],
-+            ['1-2-3-4', 5, 10, '1-2-3-4', 'test'],
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilterTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilterTest.php
-index 7d0f9148cd7..d92539396de 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilterTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilterTest.php
-@@ -155,7 +155,6 @@ class CustomAttributeFilterTest extends \PHPUnit\Framework\TestCase
- 
-         $joinConditions = [
-             '`some_index`.`entity_id` = `field1_filter`.`entity_id`',
--            '`some_index`.`source_id` = `field1_filter`.`source_id`',
-             sprintf('`field1_filter`.`attribute_id` = %s', $firstAttribute->getId()),
-             sprintf('`field1_filter`.`store_id` = %s', (int) $this->storeManager->getStore()->getId())
-         ];
-@@ -182,14 +181,12 @@ class CustomAttributeFilterTest extends \PHPUnit\Framework\TestCase
- 
-         $joinConditions1 = [
-             '`some_index`.`entity_id` = `field1_filter`.`entity_id`',
--            '`some_index`.`source_id` = `field1_filter`.`source_id`',
-             sprintf('`field1_filter`.`attribute_id` = %s', $firstAttribute->getId()),
-             sprintf('`field1_filter`.`store_id` = %s', (int) $this->storeManager->getStore()->getId())
-         ];
- 
-         $joinConditions2 = [
-             '`some_index`.`entity_id` = `field2_filter`.`entity_id`',
--            '`some_index`.`source_id` = `field2_filter`.`source_id`',
-             sprintf('`field2_filter`.`attribute_id` = %s', $secondAttribute->getId()),
-             sprintf('`field2_filter`.`store_id` = %s', (int) $this->storeManager->getStore()->getId())
-         ];
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/products_for_sku_search_weight_score.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/products_for_sku_search_weight_score.php
-new file mode 100644
-index 00000000000..96d5c256dc7
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/products_for_sku_search_weight_score.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\Catalog\Model\Product\Type;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
-+$product = Bootstrap::getObjectManager()->create(Product::class);
-+$product->setTypeId(Type::TYPE_SIMPLE)
-+    ->setAttributeSetId(4)
-+    ->setWebsiteIds([1])
-+    ->setName('1-2-3-4')
-+    ->setSku('testsku')
-+    ->setPrice(10)
-+    ->setTaxClassId(0)
-+    ->setVisibility(Visibility::VISIBILITY_BOTH)
-+    ->setStatus(Status::STATUS_ENABLED)
-+    ->setStockData(
-+        [
-+            'use_config_manage_stock' => 1,
-+            'qty' => 100,
-+            'is_qty_decimal' => 0,
-+            'is_in_stock' => 1,
-+        ]
-+    );
-+$productRepository->save($product);
-+
-+$product = Bootstrap::getObjectManager()->create(Product::class);
-+$product->setTypeId(Type::TYPE_SIMPLE)
-+    ->setAttributeSetId(4)
-+    ->setWebsiteIds([1])
-+    ->setName('test')
-+    ->setSku('1-2-3-4')
-+    ->setPrice(10)
-+    ->setTaxClassId(0)
-+    ->setVisibility(Visibility::VISIBILITY_BOTH)
-+    ->setStatus(Status::STATUS_ENABLED)
-+    ->setStockData(
-+        [
-+            'use_config_manage_stock' => 1,
-+            'qty' => 100,
-+            'is_qty_decimal' => 0,
-+            'is_in_stock' => 1,
-+        ]
-+    );
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
-index a0cac124bea..1c2ee602c3b 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
-@@ -6,32 +6,46 @@
- 
- namespace Magento\CatalogUrlRewrite\Model;
- 
-+use Magento\Catalog\Api\CategoryRepositoryInterface;
-+use Magento\Catalog\Model\Category;
-+use Magento\Catalog\Model\CategoryRepository;
-+use Magento\Catalog\Model\ProductRepository;
-+use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
-+use Magento\Framework\Exception\CouldNotSaveException;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
- use Magento\UrlRewrite\Model\OptionProvider;
-+use Magento\UrlRewrite\Model\UrlFinderInterface;
- use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
--use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-+use PHPUnit\Framework\Exception;
-+use PHPUnit\Framework\TestCase;
- 
- /**
-  * @magentoAppArea adminhtml
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class CategoryUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
-+class CategoryUrlRewriteGeneratorTest extends TestCase
- {
--    /** @var \Magento\Framework\ObjectManagerInterface */
-+    /** @var ObjectManagerInterface */
-     protected $objectManager;
- 
-     protected function setUp()
-     {
--        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $this->objectManager = Bootstrap::getObjectManager();
-     }
- 
-     /**
-      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php
-+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
-      * @magentoDbIsolation enabled
-      * @magentoAppIsolation enabled
-      */
-     public function testGenerateUrlRewritesWithoutSaveHistory()
-     {
--        /** @var \Magento\Catalog\Model\Category $category */
--        $category = $this->objectManager->create(\Magento\Catalog\Model\Category::class);
-+        /** @var Category $category */
-+        $category = $this->objectManager->create(Category::class);
-         $category->load(3);
-         $category->setData('save_rewrites_history', false);
-         $category->setUrlKey('new-url');
-@@ -50,8 +64,8 @@ class CategoryUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
- 
-         $this->assertResults($categoryExpectedResult, $actualResults);
- 
--        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
--        $productRepository = $this->objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
-+        /** @var ProductRepository $productRepository */
-+        $productRepository = $this->objectManager->create(ProductRepository::class);
-         $product = $productRepository->get('12345');
-         $productForTest = $product->getId();
- 
-@@ -98,13 +112,14 @@ class CategoryUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @magentoDbIsolation enabled
-+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
-      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php
-      * @magentoAppIsolation enabled
-      */
-     public function testGenerateUrlRewritesWithSaveHistory()
-     {
--        /** @var \Magento\Catalog\Model\Category $category */
--        $category = $this->objectManager->create(\Magento\Catalog\Model\Category::class);
-+        /** @var Category $category */
-+        $category = $this->objectManager->create(Category::class);
-         $category->load(3);
-         $category->setData('save_rewrites_history', true);
-         $category->setUrlKey('new-url');
-@@ -131,8 +146,8 @@ class CategoryUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
- 
-         $this->assertResults($categoryExpectedResult, $actualResults);
- 
--        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
--        $productRepository = $this->objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
-+        /** @var ProductRepository $productRepository */
-+        $productRepository = $this->objectManager->create(ProductRepository::class);
-         $product = $productRepository->get('12345');
-         $productForTest = $product->getId();
- 
-@@ -200,14 +215,17 @@ class CategoryUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
-      * @magentoDbIsolation enabled
-      * @magentoAppIsolation enabled
-      * @param string $urlKey
-+     * @throws CouldNotSaveException
-+     * @throws NoSuchEntityException
-+     * @throws Exception
-      * @dataProvider incorrectUrlRewritesDataProvider
-      */
-     public function testGenerateUrlRewritesWithIncorrectUrlKey($urlKey)
-     {
--        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-+        $this->expectException(LocalizedException::class);
-         $this->expectExceptionMessage('Invalid URL key');
--        /** @var \Magento\Catalog\Api\CategoryRepositoryInterface $repository */
--        $repository = $this->objectManager->get(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
-+        /** @var CategoryRepositoryInterface $repository */
-+        $repository = $this->objectManager->get(CategoryRepositoryInterface::class);
-         $category = $repository->get(3);
-         $category->setUrlKey($urlKey);
-         $repository->save($category);
-@@ -230,8 +248,8 @@ class CategoryUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
-      */
-     protected function getActualResults(array $filter)
-     {
--        /** @var \Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder */
--        $urlFinder = $this->objectManager->get(\Magento\UrlRewrite\Model\UrlFinderInterface::class);
-+        /** @var UrlFinderInterface $urlFinder */
-+        $urlFinder = $this->objectManager->get(UrlFinderInterface::class);
-         $actualResults = [];
-         foreach ($urlFinder->findAllByData($filter) as $url) {
-             $actualResults[] = [
-@@ -244,9 +262,115 @@ class CategoryUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
-         return $actualResults;
-     }
- 
-+    /**
-+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 0
-+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testGenerateUrlRewritesWithoutGenerateCategoryRewrites()
-+    {
-+        /** @var Category $category */
-+        $category = $this->objectManager->create(Category::class);
-+        $category->load(3);
-+        $category->setData('save_rewrites_history', false);
-+        $category->setUrlKey('new-url');
-+        $category->save();
-+
-+        $categoryFilter = [
-+            UrlRewrite::ENTITY_TYPE => CategoryUrlRewriteGenerator::ENTITY_TYPE,
-+            UrlRewrite::ENTITY_ID => [3, 4, 5]
-+        ];
-+        $actualResults = $this->getActualResults($categoryFilter);
-+        $categoryExpectedResult = [
-+            ['new-url.html', 'catalog/category/view/id/3', 1, 0],
-+            ['new-url/category-1-1.html', 'catalog/category/view/id/4', 1, 0],
-+            ['new-url/category-1-1/category-1-1-1.html', 'catalog/category/view/id/5', 1, 0],
-+        ];
-+
-+        $this->assertResults($categoryExpectedResult, $actualResults);
-+    }
-+
-+    /**
-+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 0
-+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testGenerateUrlRewritesWithoutGenerateProductRewrites()
-+    {
-+        /** @var ProductRepository $productRepository */
-+        $productRepository = $this->objectManager->create(ProductRepository::class);
-+        $product = $productRepository->get('12345');
-+        $productForTest = $product->getId();
-+
-+        $productFilter = [
-+            UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
-+            UrlRewrite::ENTITY_ID => [$productForTest]
-+        ];
-+        $actualResults = $this->getActualResults($productFilter);
-+        $productExpectedResult = [
-+            [
-+                'simple-product-two.html',
-+                'catalog/product/view/id/' . $productForTest,
-+                1,
-+                0
-+            ]
-+        ];
-+
-+        $this->assertResults($productExpectedResult, $actualResults);
-+    }
-+
-+    /**
-+     * Check number of records after removing product
-+     *
-+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php
-+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     *
-+     * @return void
-+     */
-+    public function testRemoveCatalogUrlRewrites()
-+    {
-+        /** @var CategoryRepository $categoryRepository */
-+        $categoryRepository = $this->objectManager->create(CategoryRepository::class);
-+        $category = $categoryRepository->get(5);
-+        $categoryId = $category->getId();
-+
-+        /** @var ProductRepository $productRepository */
-+        $productRepository = $this->objectManager->create(ProductRepository::class);
-+        $product = $productRepository->get('12345');
-+        $productId = $product->getId();
-+
-+        $countBeforeRemoving = $this->getCountOfRewrites($productId, $categoryId);
-+        $productRepository->delete($product);
-+        $countAfterRemoving = $this->getCountOfRewrites($productId, $categoryId);
-+        $this->assertEquals($countBeforeRemoving - 1, $countAfterRemoving);
-+    }
-+
-+    /**
-+     * Get count of records in table
-+     *
-+     * @param $productId
-+     * @param $categoryId
-+     * @return string
-+     */
-+    private function getCountOfRewrites($productId, $categoryId): string
-+    {
-+        /** @var Product $model */
-+        $model = $this->objectManager->get(Product::class);
-+        $connection = $model->getConnection();
-+        $select = $connection->select();
-+        $select->from(Product::TABLE_NAME, 'COUNT(*)');
-+        $select->where('category_id = ?', $categoryId);
-+        $select->where('product_id = ?', $productId);
-+        return $connection->fetchOne($select);
-+    }
-+
-     /**
-      * @param array $expected
-      * @param array $actual
-+     * @throws Exception
-      */
-     protected function assertResults($expected, $actual)
-     {
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
-index 1203ca191b4..091e5318fa9 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
-@@ -30,6 +30,7 @@ class ProductUrlRewriteGeneratorTest extends TestCase
- 
-     /**
-      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
-+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
-      * @magentoDbIsolation disabled
-      * @magentoAppIsolation enabled
-      */
-@@ -45,10 +46,13 @@ class ProductUrlRewriteGeneratorTest extends TestCase
-         $generator = $this->objectManager->get(ProductUrlRewriteGenerator::class);
-         $urls = $generator->generate($product);
- 
--        $actualUrls = array_map(function ($url) {
--            /** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewrite $url */
--            return $url->getRequestPath();
--        }, $urls);
-+        $actualUrls = array_map(
-+            function ($url) {
-+                /** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewrite $url */
-+                return $url->getRequestPath();
-+            },
-+            $urls
-+        );
- 
-         self::assertTrue(in_array('p002.html', $actualUrls));
-         self::assertTrue(in_array('cat-1/p002.html', $actualUrls));
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeVisibilityObserverTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeVisibilityObserverTest.php
-new file mode 100644
-index 00000000000..d3f0e9fa2a5
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeVisibilityObserverTest.php
-@@ -0,0 +1,195 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\CatalogUrlRewrite\Observer;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\Framework\Event\ManagerInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
-+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-+
-+/**
-+ * @magentoAppArea adminhtml
-+ * @magentoDbIsolation disabled
-+ */
-+class ProcessUrlRewriteOnChangeVisibilityObserverTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @var ManagerInterface
-+     */
-+    private $eventManager;
-+
-+    /**
-+     * Set up
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-+        $this->eventManager = $this->objectManager->create(ManagerInterface::class);
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_rewrite_multistore.php
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testMakeProductInvisibleViaMassAction()
-+    {
-+        /** @var \Magento\Catalog\Model\Product $product*/
-+        $product = $this->productRepository->get('product1');
-+
-+        /** @var StoreManagerInterface $storeManager */
-+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
-+        $storeManager->setCurrentStore(0);
-+
-+        $testStore = $storeManager->getStore('test');
-+        $productFilter = [
-+            UrlRewrite::ENTITY_TYPE => 'product',
-+        ];
-+
-+        $expected = [
-+            [
-+                'request_path' => "product-1.html",
-+                'target_path' => "catalog/product/view/id/" . $product->getId(),
-+                'is_auto_generated' => 1,
-+                'redirect_type' => 0,
-+                'store_id' => '1',
-+            ],
-+            [
-+                'request_path' => "product-1.html",
-+                'target_path' => "catalog/product/view/id/" . $product->getId(),
-+                'is_auto_generated' => 1,
-+                'redirect_type' => 0,
-+                'store_id' => $testStore->getId(),
-+            ]
-+        ];
-+
-+        $actual = $this->getActualResults($productFilter);
-+        foreach ($expected as $row) {
-+            $this->assertContains($row, $actual);
-+        }
-+
-+        $this->eventManager->dispatch(
-+            'catalog_product_attribute_update_before',
-+            [
-+                'attributes_data' => [ ProductInterface::VISIBILITY => Visibility::VISIBILITY_NOT_VISIBLE ],
-+                'product_ids' => [$product->getId()]
-+            ]
-+        );
-+
-+        $actual = $this->getActualResults($productFilter);
-+        $this->assertCount(0, $actual);
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_invisible_multistore.php
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testMakeProductVisibleViaMassAction()
-+    {
-+        /** @var \Magento\Catalog\Model\Product $product*/
-+        $product = $this->productRepository->get('product1');
-+
-+        /** @var StoreManagerInterface $storeManager */
-+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
-+        $storeManager->setCurrentStore(0);
-+
-+        $testStore = $storeManager->getStore('test');
-+        $productFilter = [
-+            UrlRewrite::ENTITY_TYPE => 'product',
-+        ];
-+
-+        $actual = $this->getActualResults($productFilter);
-+        $this->assertCount(0, $actual);
-+
-+        $this->eventManager->dispatch(
-+            'catalog_product_attribute_update_before',
-+            [
-+                'attributes_data' => [ ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH ],
-+                'product_ids' => [$product->getId()]
-+            ]
-+        );
-+
-+        $expected = [
-+            [
-+                'request_path' => "product-1.html",
-+                'target_path' => "catalog/product/view/id/" . $product->getId(),
-+                'is_auto_generated' => 1,
-+                'redirect_type' => 0,
-+                'store_id' => '1',
-+            ],
-+            [
-+                'request_path' => "product-1.html",
-+                'target_path' => "catalog/product/view/id/" . $product->getId(),
-+                'is_auto_generated' => 1,
-+                'redirect_type' => 0,
-+                'store_id' => $testStore->getId(),
-+            ]
-+        ];
-+
-+        $actual = $this->getActualResults($productFilter);
-+        foreach ($expected as $row) {
-+            $this->assertContains($row, $actual);
-+        }
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/products_invisible.php
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testErrorOnDuplicatedUrlKey()
-+    {
-+        $skus = ['product1', 'product2'];
-+        foreach ($skus as $sku) {
-+            /** @var \Magento\Catalog\Model\Product $product */
-+            $productIds[] = $this->productRepository->get($sku)->getId();
-+        }
-+        $this->expectException(UrlAlreadyExistsException::class);
-+        $this->expectExceptionMessage('Can not change the visibility of the product with SKU equals "product2". '
-+            . 'URL key "product-1" for specified store already exists.');
-+
-+        $this->eventManager->dispatch(
-+            'catalog_product_attribute_update_before',
-+            [
-+                'attributes_data' => [ ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH ],
-+                'product_ids' => $productIds
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @param array $filter
-+     * @return array
-+     */
-+    private function getActualResults(array $filter)
-+    {
-+        /** @var \Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder */
-+        $urlFinder = $this->objectManager->get(\Magento\UrlRewrite\Model\UrlFinderInterface::class);
-+        $actualResults = [];
-+        foreach ($urlFinder->findAllByData($filter) as $url) {
-+            $actualResults[] = [
-+                'request_path' => $url->getRequestPath(),
-+                'target_path' => $url->getTargetPath(),
-+                'is_auto_generated' => (int)$url->getIsAutogenerated(),
-+                'redirect_type' => $url->getRedirectType(),
-+                'store_id' => $url->getStoreId()
-+            ];
-+        }
-+        return $actualResults;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php
-index 34f873df71a..c72a58197b1 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php
-@@ -11,12 +11,16 @@ use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
- 
- /**
-  * @magentoAppArea adminhtml
-+ * @magentoDbIsolation disabled
-  */
- class ProductProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\TestCase
- {
-     /** @var \Magento\Framework\ObjectManagerInterface */
-     protected $objectManager;
- 
-+    /**
-+     * Set up
-+     */
-     protected function setUp()
-     {
-         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-@@ -86,6 +90,7 @@ class ProductProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\Test
- 
-         $product->setData('save_rewrites_history', true);
-         $product->setUrlKey('new-url');
-+        $product->setUrlPath('new-path');
-         $product->save();
- 
-         $expected = [
-@@ -148,6 +153,7 @@ class ProductProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\Test
- 
-         $product->setData('save_rewrites_history', true);
-         $product->setUrlKey('new-url');
-+        $product->setUrlPath('new-path');
-         $product->save();
- 
-         $expected = [
-@@ -203,6 +209,7 @@ class ProductProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\Test
- 
-         $product->setData('save_rewrites_history', false);
-         $product->setUrlKey('new-url');
-+        $product->setUrlPath('new-path');
-         $product->save();
- 
-         $expected = [
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php
-index 402db06a0bb..ed69c2a7488 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php
-@@ -9,7 +9,6 @@ namespace Magento\CatalogUrlRewrite\Observer;
- 
- use Magento\Catalog\Api\CategoryListInterface;
- use Magento\Catalog\Api\Data\CategoryInterface;
--use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Framework\Api\SearchCriteriaBuilder;
- use Magento\TestFramework\Helper\Bootstrap;
-@@ -19,6 +18,7 @@ use PHPUnit\Framework\TestCase;
- 
- /**
-  * @magentoAppArea adminhtml
-+ * @magentoDbIsolation disabled
-  */
- class UrlRewriteHandlerTest extends TestCase
- {
-@@ -27,6 +27,11 @@ class UrlRewriteHandlerTest extends TestCase
-      */
-     private $handler;
- 
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-     /**
-      * @var ObjectManager
-      */
-@@ -38,20 +43,21 @@ class UrlRewriteHandlerTest extends TestCase
-     protected function setUp()
-     {
-         $this->objectManager = Bootstrap::getObjectManager();
--        $this->handler = $this->objectManager->get(UrlRewriteHandler::class);
-+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-+        $this->handler = $this->objectManager->create(UrlRewriteHandler::class);
-     }
- 
-     /**
-      * Checks category URLs rewrites generation with enabled `Use Categories Path for Product URLs` option and
-      * store's specific product URL key.
-      *
--     * @magentoDbIsolation disabled
-      * @magentoDataFixture Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key.php
-      * @magentoConfigFixture admin_store catalog/seo/product_use_categories 1
-+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
-      */
-     public function testGenerateProductUrlRewrites()
-     {
--        $product = $this->getProduct('p002');
-+        $product = $this->productRepository->get('p002');
-         $category = $this->getCategory('category 1');
-         // change the category scope to the global
-         $category->setStoreId(0)
-@@ -60,9 +66,14 @@ class UrlRewriteHandlerTest extends TestCase
-             ->setAnchorsAbove(false);
- 
-         $generatedUrls = $this->handler->generateProductUrlRewrites($category);
--        $actual = array_values(array_map(function (UrlRewrite $urlRewrite) {
--            return $urlRewrite->getRequestPath();
--        }, $generatedUrls));
-+        $actual = array_values(
-+            array_map(
-+                function (UrlRewrite $urlRewrite) {
-+                    return $urlRewrite->getRequestPath();
-+                },
-+                $generatedUrls
-+            )
-+        );
- 
-         $expected = [
-             'store-1-key.html', // the Default store
-@@ -75,6 +86,36 @@ class UrlRewriteHandlerTest extends TestCase
-         self::assertEquals($expected, $actual, 'Generated URLs rewrites do not match.');
-     }
- 
-+    /**
-+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/category_with_products.php
-+     */
-+    public function testGenerateProductUrlRewrites2()
-+    {
-+        $product1 = $this->productRepository->get('simple');
-+        $product2 = $this->productRepository->get('12345');
-+        $category = $this->getCategory('Category 1');
-+
-+        $category->setChangedProductIds([$product1->getId()]);
-+        $category->setAffectedProductIds([$product1->getId(), $product2->getId()]);
-+        $category->setAnchorsAbove(false);
-+        $generatedUrls = $this->handler->generateProductUrlRewrites($category);
-+        $actual = array_values(
-+            array_map(
-+                function (UrlRewrite $urlRewrite) {
-+                    return $urlRewrite->getRequestPath();
-+                },
-+                $generatedUrls
-+            )
-+        );
-+
-+        $expected = [
-+            'simple-product.html',
-+            'category-1/simple-product.html',
-+            '/simple-product.html',
-+        ];
-+        $this->assertEquals($expected, $actual, 'Generated URLs rewrites do not match.');
-+    }
-+
-     /**
-      * Gets category by name.
-      *
-@@ -94,18 +135,4 @@ class UrlRewriteHandlerTest extends TestCase
- 
-         return array_pop($items);
-     }
--
--    /**
--     * Gets product by SKU.
--     *
--     * @param string $sku
--     * @return ProductInterface
--     * @throws \Magento\Framework\Exception\NoSuchEntityException
--     */
--    private function getProduct(string $sku): ProductInterface
--    {
--        /** @var ProductRepositoryInterface $productRepository */
--        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
--        return $productRepository->get($sku);
--    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products.php
-new file mode 100644
-index 00000000000..8d0a7ea6096
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products.php
-@@ -0,0 +1,71 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+$installer = $objectManager->create(\Magento\Catalog\Setup\CategorySetup::class);
-+
-+\Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea(
-+    \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE
-+);
-+
-+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
-+$category->isObjectNew(true);
-+$category->setId(3)
-+    ->setName('Category 1')
-+    ->setParentId(2)
-+    ->setPath('1/2/3')
-+    ->setLevel(2)
-+    ->setAvailableSortBy('name')
-+    ->setDefaultSortBy('name')
-+    ->setIsActive(true)
-+    ->setPosition(1)
-+    ->save();
-+
-+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+$categoryLinkRepository = $objectManager->create(
-+    \Magento\Catalog\Api\CategoryLinkRepositoryInterface::class,
-+    [
-+        'productRepository' => $productRepository
-+    ]
-+);
-+$categoryLinkManagement = $objectManager->create(
-+    \Magento\Catalog\Api\CategoryLinkManagementInterface::class,
-+    [
-+        'productRepository' => $productRepository,
-+        'categoryLinkRepository' => $categoryLinkRepository
-+    ]
-+);
-+
-+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
-+    ->setStoreId(1)
-+    ->setWebsiteIds([1])
-+    ->setName('Simple Product')
-+    ->setSku('simple')
-+    ->setPrice(10)
-+    ->setWeight(18)
-+    ->setStockData(['use_config_manage_stock' => 0])
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->save();
-+$categoryLinkManagement->assignProductToCategories($product->getSku(), [3]);
-+
-+$product =$objectManager->create(\Magento\Catalog\Model\Product::class);
-+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
-+    ->setStoreId(1)
-+    ->setWebsiteIds([1])
-+    ->setName('Simple Product Two')
-+    ->setSku('12345') // SKU intentionally contains digits only
-+    ->setPrice(45.67)
-+    ->setWeight(56)
-+    ->setStockData(['use_config_manage_stock' => 0])
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->save();
-+$categoryLinkManagement->assignProductToCategories($product->getSku(), [3]);
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products_rollback.php
-new file mode 100644
-index 00000000000..3f00437a14a
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products_rollback.php
-@@ -0,0 +1,31 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+$registry = $objectManager->get(\Magento\Framework\Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+$productSkuList = ['simple', '12345'];
-+foreach ($productSkuList as $sku) {
-+    try {
-+        $product = $productRepository->get($sku, true, null, true);
-+        $productRepository->delete($product);
-+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+        //Product already removed
-+        continue;
-+    }
-+}
-+
-+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
-+$collection->addAttributeToFilter('level', 2)
-+    ->load()
-+    ->delete();
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore.php
-new file mode 100644
-index 00000000000..d50b29383b1
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Setup\CategorySetup;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+\Magento\TestFramework\Helper\Bootstrap::getInstance()
-+    ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
-+
-+require __DIR__ . '/../../Store/_files/store.php';
-+
-+/** @var $installer CategorySetup */
-+$objectManager = Bootstrap::getObjectManager();
-+$installer = $objectManager->create(CategorySetup::class);
-+$storeManager = $objectManager->get(StoreManagerInterface::class);
-+$storeManager->setCurrentStore(0);
-+
-+/** @var $product \Magento\Catalog\Model\Product */
-+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
-+    ->setStoreId(0)
-+    ->setWebsiteIds([1])
-+    ->setName('Product1')
-+    ->setSku('product1')
-+    ->setPrice(10)
-+    ->setWeight(18)
-+    ->setStockData(['use_config_manage_stock' => 0])
-+    ->setUrlKey('product-1')
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE)
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED);
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore_rollback.php
-new file mode 100644
-index 00000000000..bcf399cb5e5
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore_rollback.php
-@@ -0,0 +1,33 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+
-+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+try {
-+    $product = $productRepository->get('product1', true);
-+    if ($product->getId()) {
-+        $productRepository->delete($product);
-+    }
-+} catch (NoSuchEntityException $e) {
-+}
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-+
-+require __DIR__ . '/../../Store/_files/store_rollback.php';
-+require __DIR__ . '/../../Store/_files/second_store_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_rewrite_multistore_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_rewrite_multistore_rollback.php
-index 1ac9fbf63b1..bcf399cb5e5 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_rewrite_multistore_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_rewrite_multistore_rollback.php
-@@ -4,9 +4,30 @@
-  * See COPYING.txt for license details.
-  */
- 
--use Magento\TestFramework\Helper\Bootstrap;
-+declare(strict_types=1);
- 
--$objectManager = Bootstrap::getObjectManager();
-+use Magento\Framework\Exception\NoSuchEntityException;
-+
-+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+try {
-+    $product = $productRepository->get('product1', true);
-+    if ($product->getId()) {
-+        $productRepository->delete($product);
-+    }
-+} catch (NoSuchEntityException $e) {
-+}
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
- 
- require __DIR__ . '/../../Store/_files/store_rollback.php';
- require __DIR__ . '/../../Store/_files/second_store_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category.php
-index 2f3d4ea4c3e..3c033189421 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category.php
-@@ -14,6 +14,7 @@ use Magento\CatalogSearch\Model\Indexer\Fulltext;
- use Magento\Framework\Indexer\IndexerRegistry;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\UrlRewrite\Model\UrlRewrite;
- 
- /**
-  * @var \Magento\Store\Model\Store $store
-@@ -80,3 +81,15 @@ $product = $productRepository->save($product);
- /** @var CategoryLinkManagementInterface $linkManagement */
- $linkManagement = $objectManager->get(CategoryLinkManagementInterface::class);
- $linkManagement->assignProductToCategories($product->getSku(), [Category::TREE_ROOT_ID, $category->getEntityId()]);
-+
-+/** @var UrlRewrite $urlRewrite */
-+$urlRewrite = $objectManager->create(UrlRewrite::class);
-+$urlRewrite->setEntityType('custom')
-+    ->setRequestPath('non-exist-product.html')
-+    ->setTargetPath('catalog/product/view/id/' . $product->getId())
-+    ->setRedirectType(0)
-+    ->setStoreId(1)
-+    ->setDescription(null)
-+    ->setIsAutogenerated(0);
-+
-+$urlRewrite->save();
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php
-index 2598dd66935..61e2d84513f 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php
-@@ -9,6 +9,7 @@ use Magento\Catalog\Api\CategoryRepositoryInterface;
- use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Framework\Api\SearchCriteriaBuilder;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\UrlRewrite\Model\UrlRewrite;
- 
- $objectManager = Bootstrap::getObjectManager();
- /** @var \Magento\Framework\Registry $registry */
-@@ -20,7 +21,6 @@ $registry->register('isSecureArea', true);
- 
- /** @var ProductRepositoryInterface $productRepository */
- $productRepository = $objectManager->get(ProductRepositoryInterface::class);
--//$productRepository->deleteById('p002');
- $product = $productRepository->get('p002', false, null, true);
- $productRepository->delete($product);
- 
-@@ -41,6 +41,11 @@ foreach ($categories as $category) {
-     $categoryRepository->delete($category);
- }
- 
-+/** @var UrlRewrite $urlRewrite */
-+$urlRewrite = $objectManager->create(UrlRewrite::class);
-+$urlRewrite->load('non-exist-product.html', 'request_path');
-+$urlRewrite->delete();
-+
- $registry->unregister('isSecureArea');
- $registry->register('isSecureArea', false);
- 
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible.php
-new file mode 100644
-index 00000000000..c72d9c8284d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible.php
-@@ -0,0 +1,38 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Setup\CategorySetup;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+\Magento\TestFramework\Helper\Bootstrap::getInstance()
-+    ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
-+
-+/** @var $installer CategorySetup */
-+$objectManager = Bootstrap::getObjectManager();
-+$installer = $objectManager->create(CategorySetup::class);
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+
-+$skus = ['product1', 'product2'];
-+foreach ($skus as $sku) {
-+    /** @var $product \Magento\Catalog\Model\Product */
-+    $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-+    $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+        ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
-+        ->setStoreId(0)
-+        ->setWebsiteIds([1])
-+        ->setName('Product1')
-+        ->setSku($sku)
-+        ->setPrice(10)
-+        ->setWeight(18)
-+        ->setStockData(['use_config_manage_stock' => 0])
-+        ->setUrlKey('product-1')
-+        ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE)
-+        ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED);
-+    $productRepository->save($product);
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible_rollback.php
-new file mode 100644
-index 00000000000..d3d17542aa6
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible_rollback.php
-@@ -0,0 +1,37 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+
-+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+
-+$skus = ['product1', 'product2'];
-+foreach ($skus as $sku) {
-+    try {
-+        $product = $productRepository->get($sku, true);
-+        if ($product->getId()) {
-+            $productRepository->delete($product);
-+        }
-+    } catch (NoSuchEntityException $e) {
-+    }
-+}
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-+
-+require __DIR__ . '/../../Store/_files/store_rollback.php';
-+require __DIR__ . '/../../Store/_files/second_store_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php b/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
-index a8572df0361..2695948e783 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
-@@ -78,4 +78,98 @@ class ProductListTest extends \PHPUnit\Framework\TestCase
-             "Product collection was not filtered according to the widget condition."
-         );
-     }
-+
-+    /**
-+     * Test product list widget can process condition with dropdown type of attribute
-+     *
-+     * @magentoDbIsolation disabled
-+     * @magentoDataFixture Magento/Catalog/_files/products_with_dropdown_attribute.php
-+     */
-+    public function testCreateCollectionWithDropdownAttribute()
-+    {
-+        /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-+        $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
-+        );
-+        $attribute->load('dropdown_attribute', 'attribute_code');
-+        $dropdownAttributeOptionIds = [];
-+        foreach ($attribute->getOptions() as $option) {
-+            if ($option->getValue()) {
-+                $dropdownAttributeOptionIds[] = $option->getValue();
-+            }
-+        }
-+        $encodedConditions = '^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,' .
-+            '`aggregator`:`any`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule|' .
-+            '|Condition||Product`,`attribute`:`dropdown_attribute`,`operator`:`==`,`value`:`'
-+            . $dropdownAttributeOptionIds[0] . '`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule|' .
-+            '|Condition||Product`,`attribute`:`dropdown_attribute`,`operator`:`==`,`value`:`'
-+            . $dropdownAttributeOptionIds[1] . '`^]^]';
-+        $this->block->setData('conditions_encoded', $encodedConditions);
-+        $this->performAssertions(2);
-+        $attribute->setUsedInProductListing(0);
-+        $attribute->save();
-+        $this->performAssertions(2);
-+        $attribute->setIsGlobal(1);
-+        $attribute->save();
-+        $this->performAssertions(2);
-+    }
-+
-+    /**
-+     * Check product collection includes correct amount of products.
-+     *
-+     * @param int $count
-+     * @return void
-+     */
-+    private function performAssertions(int $count)
-+    {
-+        // Load products collection filtered using specified conditions and perform assertions.
-+        $productCollection = $this->block->createCollection();
-+        $productCollection->load();
-+        $this->assertEquals(
-+            $count,
-+            $productCollection->count(),
-+            "Product collection was not filtered according to the widget condition."
-+        );
-+    }
-+
-+    /**
-+     * Check that collection returns correct result if use not contains operator for string attribute
-+     *
-+     * @magentoDbIsolation disabled
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple_xss.php
-+     * @magentoDataFixture Magento/Catalog/_files/product_virtual.php
-+     * @dataProvider createCollectionForSkuDataProvider
-+     * @param string $encodedConditions
-+     * @param string $sku
-+     * @return void
-+     */
-+    public function testCreateCollectionForSku($encodedConditions, $sku)
-+    {
-+        $this->block->setData('conditions_encoded', $encodedConditions);
-+        $productCollection = $this->block->createCollection();
-+        $productCollection->load();
-+        $this->assertEquals(
-+            1,
-+            $productCollection->count(),
-+            "Product collection was not filtered according to the widget condition."
-+        );
-+        $this->assertEquals($sku, $productCollection->getFirstItem()->getSku());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function createCollectionForSkuDataProvider()
-+    {
-+        return [
-+            'contains' => ['^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,'
-+                . '`aggregator`:`all`,`value`:`1`,`new_child`:``^],'
-+                . '`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,'
-+                . '`attribute`:`sku`,`operator`:`^[^]`,`value`:`virtual`^]^]' , 'virtual-product'],
-+            'not contains' => ['^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,'
-+                . '`aggregator`:`all`,`value`:`1`,`new_child`:``^],'
-+                . '`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,'
-+                . '`attribute`:`sku`,`operator`:`!^[^]`,`value`:`virtual`^]^]', 'product-with-xss']
-+        ];
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/CatalogWidget/Model/Rule/Condition/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogWidget/Model/Rule/Condition/ProductTest.php
-index 61ce3315fd9..f7967eee8b2 100644
---- a/dev/tests/integration/testsuite/Magento/CatalogWidget/Model/Rule/Condition/ProductTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CatalogWidget/Model/Rule/Condition/ProductTest.php
-@@ -6,6 +6,8 @@
- 
- namespace Magento\CatalogWidget\Model\Rule\Condition;
- 
-+use Magento\Catalog\Api\Data\ProductInterface;
-+
- class ProductTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -18,6 +20,9 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $objectManager;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-@@ -28,19 +33,26 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-         $this->conditionProduct->setRule($rule);
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testLoadAttributeOptions()
-     {
-         $this->conditionProduct->loadAttributeOptions();
-         $options = $this->conditionProduct->getAttributeOption();
--        $this->assertArrayHasKey('sku', $options);
--        $this->assertArrayHasKey('attribute_set_id', $options);
-+        $this->assertArrayHasKey(ProductInterface::SKU, $options);
-+        $this->assertArrayHasKey(ProductInterface::ATTRIBUTE_SET_ID, $options);
-         $this->assertArrayHasKey('category_ids', $options);
-+        $this->assertArrayNotHasKey(ProductInterface::STATUS, $options);
-         foreach ($options as $code => $label) {
-             $this->assertNotEmpty($label);
-             $this->assertNotEmpty($code);
-         }
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testAddGlobalAttributeToCollection()
-     {
-         $collection = $this->objectManager->create(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
-@@ -53,6 +65,9 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals('at_special_price.value', $this->conditionProduct->getMappedSqlField());
-     }
- 
-+    /**
-+     * @return void
-+     */
-     public function testAddNonGlobalAttributeToCollectionNoProducts()
-     {
-         $collection = $this->objectManager->create(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Api/GuestShippingInformationManagementTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Api/GuestShippingInformationManagementTest.php
-new file mode 100644
-index 00000000000..50b1256c0f1
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/Api/GuestShippingInformationManagementTest.php
-@@ -0,0 +1,125 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Checkout\Api;
-+
-+use Magento\Checkout\Api\Data\ShippingInformationInterface;
-+use Magento\Checkout\Api\Data\ShippingInformationInterfaceFactory;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Quote\Model\QuoteIdMask;
-+use Magento\Quote\Model\QuoteIdMaskFactory;
-+
-+/**
-+ * Test GuestShippingInformationManagement API.
-+ */
-+class GuestShippingInformationManagementTest extends TestCase
-+{
-+    /**
-+     * @var GuestShippingInformationManagementInterface
-+     */
-+    private $management;
-+
-+    /**
-+     * @var CartRepositoryInterface
-+     */
-+    private $cartRepo;
-+
-+    /**
-+     * @var CustomerRepositoryInterface
-+     */
-+    private $customerRepo;
-+
-+    /**
-+     * @var ShippingInformationInterfaceFactory
-+     */
-+    private $shippingFactory;
-+
-+    /**
-+     * @var SearchCriteriaBuilder
-+     */
-+    private $searchCriteria;
-+
-+    /**
-+     * @var QuoteIdMaskFactory
-+     */
-+    private $maskFactory;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->management = $objectManager->get(GuestShippingInformationManagementInterface::class);
-+        $this->cartRepo = $objectManager->get(CartRepositoryInterface::class);
-+        $this->customerRepo = $objectManager->get(CustomerRepositoryInterface::class);
-+        $this->shippingFactory = $objectManager->get(ShippingInformationInterfaceFactory::class);
-+        $this->searchCriteria = $objectManager->get(SearchCriteriaBuilder::class);
-+        $this->maskFactory = $objectManager->get(QuoteIdMaskFactory::class);
-+    }
-+
-+    /**
-+     * Test using another address for quote.
-+     *
-+     * @param bool $swapShipping Whether to swap shipping or billing addresses.
-+     * @return void
-+     *
-+     * @magentoDataFixture Magento/Sales/_files/quote.php
-+     * @magentoDataFixture Magento/Customer/_files/customer_with_addresses.php
-+     * @dataProvider getAddressesVariation
-+     * @expectedException  \Magento\Framework\Exception\InputException
-+     * @expectedExceptionMessage The shipping information was unable to be saved. Verify the input data and try again.
-+     */
-+    public function testDifferentAddresses(bool $swapShipping)
-+    {
-+        $carts = $this->cartRepo->getList(
-+            $this->searchCriteria->addFilter('reserved_order_id', 'test01')->create()
-+        )->getItems();
-+        $cart = array_pop($carts);
-+        $otherCustomer = $this->customerRepo->get('customer_with_addresses@test.com');
-+        $otherAddresses = $otherCustomer->getAddresses();
-+        $otherAddress = array_pop($otherAddresses);
-+
-+        //Setting invalid IDs.
-+        /** @var ShippingAssignmentInterface $shippingAssignment */
-+        $shippingAssignment = $cart->getExtensionAttributes()->getShippingAssignments()[0];
-+        $shippingAddress = $shippingAssignment->getShipping()->getAddress();
-+        $billingAddress = $cart->getBillingAddress();
-+        if ($swapShipping) {
-+            $address = $shippingAddress;
-+        } else {
-+            $address = $billingAddress;
-+        }
-+        $address->setCustomerAddressId($otherAddress->getId());
-+        $address->setCustomerId($otherCustomer->getId());
-+        $address->setId(null);
-+        /** @var ShippingInformationInterface $shippingInformation */
-+        $shippingInformation = $this->shippingFactory->create();
-+        $shippingInformation->setBillingAddress($billingAddress);
-+        $shippingInformation->setShippingAddress($shippingAddress);
-+        $shippingInformation->setShippingMethodCode('flatrate');
-+        /** @var QuoteIdMask $idMask */
-+        $idMask = $this->maskFactory->create();
-+        $idMask->load($cart->getId(), 'quote_id');
-+        $this->management->saveAddressInformation($idMask->getMaskedId(), $shippingInformation);
-+    }
-+
-+    /**
-+     * Different variations for addresses test.
-+     *
-+     * @return array
-+     */
-+    public function getAddressesVariation(): array
-+    {
-+        return [
-+            'Shipping address swap' => [true],
-+            'Billing address swap' => [false]
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Api/PaymentInformationManagementTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Api/PaymentInformationManagementTest.php
-index f6338c1ee16..1266dc7bb88 100644
---- a/dev/tests/integration/testsuite/Magento/Checkout/Api/PaymentInformationManagementTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/Api/PaymentInformationManagementTest.php
-@@ -96,7 +96,7 @@ class PaymentInformationManagementTest extends TestCase
-             array_push($errors['errors'], ['code' => $testErrorCode]);
-         }
- 
--        $response = new Error(['errors' => $errors]);
-+        $response = new Error(['errors' => $errors, 'transaction' => ['status' => 'declined']]);
- 
-         $this->client->method('placeRequest')
-             ->willReturn(['object' => $response]);
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Api/ShippingInformationManagementTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Api/ShippingInformationManagementTest.php
-new file mode 100644
-index 00000000000..7440fb7fd3d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/Api/ShippingInformationManagementTest.php
-@@ -0,0 +1,104 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Checkout\Api;
-+
-+use Magento\Checkout\Api\Data\ShippingInformationInterface;
-+use Magento\Checkout\Api\Data\ShippingInformationInterfaceFactory;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Test ShippingInformationManagement API.
-+ */
-+class ShippingInformationManagementTest extends TestCase
-+{
-+    /**
-+     * @var ShippingInformationManagementInterface
-+     */
-+    private $management;
-+
-+    /**
-+     * @var CartRepositoryInterface
-+     */
-+    private $cartRepo;
-+
-+    /**
-+     * @var CustomerRepositoryInterface
-+     */
-+    private $customerRepo;
-+
-+    /**
-+     * @var ShippingInformationInterfaceFactory
-+     */
-+    private $shippingFactory;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->management = $objectManager->get(ShippingInformationManagementInterface::class);
-+        $this->cartRepo = $objectManager->get(CartRepositoryInterface::class);
-+        $this->customerRepo = $objectManager->get(CustomerRepositoryInterface::class);
-+        $this->shippingFactory = $objectManager->get(ShippingInformationInterfaceFactory::class);
-+    }
-+
-+    /**
-+     * Test using another address for quote.
-+     *
-+     * @param bool $swapShipping Whether to swap shipping or billing addresses.
-+     * @return void
-+     *
-+     * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
-+     * @magentoDataFixture Magento/Customer/_files/customer_with_addresses.php
-+     * @dataProvider getAddressesVariation
-+     * @expectedException  \Magento\Framework\Exception\InputException
-+     * @expectedExceptionMessage The shipping information was unable to be saved. Verify the input data and try again.
-+     */
-+    public function testDifferentAddresses(bool $swapShipping)
-+    {
-+        $cart = $this->cartRepo->getForCustomer(1);
-+        $otherCustomer = $this->customerRepo->get('customer_with_addresses@test.com');
-+        $otherAddresses = $otherCustomer->getAddresses();
-+        $otherAddress = array_pop($otherAddresses);
-+
-+        //Setting invalid IDs.
-+        /** @var ShippingAssignmentInterface $shippingAssignment */
-+        $shippingAssignment = $cart->getExtensionAttributes()->getShippingAssignments()[0];
-+        $shippingAddress = $shippingAssignment->getShipping()->getAddress();
-+        $billingAddress = $cart->getBillingAddress();
-+        if ($swapShipping) {
-+            $address = $shippingAddress;
-+        } else {
-+            $address = $billingAddress;
-+        }
-+        $address->setCustomerAddressId($otherAddress->getId());
-+        $address->setCustomerId($otherCustomer->getId());
-+        $address->setId(null);
-+        /** @var ShippingInformationInterface $shippingInformation */
-+        $shippingInformation = $this->shippingFactory->create();
-+        $shippingInformation->setBillingAddress($billingAddress);
-+        $shippingInformation->setShippingAddress($shippingAddress);
-+        $shippingInformation->setShippingMethodCode('flatrate');
-+        $this->management->saveAddressInformation($cart->getId(), $shippingInformation);
-+    }
-+
-+    /**
-+     * Different variations for addresses test.
-+     *
-+     * @return array
-+     */
-+    public function getAddressesVariation(): array
-+    {
-+        return [
-+            'Shipping address swap' => [true],
-+            'Billing address swap' => [false]
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
-index 07141843793..2ba798e4811 100644
---- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
-@@ -6,6 +6,8 @@
- 
- namespace Magento\Checkout\Controller\Cart\Index;
- 
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+
- /**
-  * @magentoDbIsolation enabled
-  */
-@@ -26,6 +28,7 @@ class CouponPostTest extends \Magento\TestFramework\TestCase\AbstractController
-             'remove' => 0,
-             'coupon_code' => 'test'
-         ];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($inputData);
-         $this->dispatch(
-             'checkout/cart/couponPost/'
-@@ -36,4 +39,35 @@ class CouponPostTest extends \Magento\TestFramework\TestCase\AbstractController
-             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
-         );
-     }
-+
-+    /**
-+     * Testing by adding a valid coupon to cart
-+     *
-+     * @magentoDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
-+     * @magentoDataFixture Magento/Usps/Fixtures/cart_rule_coupon_free_shipping.php
-+     * @return void
-+     */
-+    public function testAddingValidCoupon(): void
-+    {
-+        /** @var $session \Magento\Checkout\Model\Session */
-+        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
-+        $quote = $session->getQuote();
-+        $quote->setData('trigger_recollect', 1)->setTotalsCollectedFlag(true);
-+
-+        $couponCode = 'IMPHBR852R61';
-+        $inputData = [
-+            'remove' => 0,
-+            'coupon_code' => $couponCode
-+        ];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-+        $this->getRequest()->setPostValue($inputData);
-+        $this->dispatch(
-+            'checkout/cart/couponPost/'
-+        );
-+
-+        $this->assertSessionMessages(
-+            $this->equalTo(['You used coupon code &quot;' . $couponCode . '&quot;.']),
-+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-+        );
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
-index 5ffaa789cf2..fc85cc384a3 100644
---- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
-@@ -11,13 +11,18 @@ namespace Magento\Checkout\Controller;
- 
- use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Checkout\Model\Session;
-+use Magento\Checkout\Model\Session as CheckoutSession;
- use Magento\Customer\Model\ResourceModel\CustomerRepository;
- use Magento\Framework\Data\Form\FormKey;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Quote\Model\Quote;
-+use Magento\Quote\Api\CartRepositoryInterface;
- use Magento\TestFramework\Helper\Bootstrap;
- use Magento\TestFramework\Request;
- use Magento\Customer\Model\Session as CustomerSession;
- use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
- use Magento\Sales\Model\ResourceModel\Order\Item\Collection as OrderItemCollection;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -25,6 +30,28 @@ use Magento\Sales\Model\ResourceModel\Order\Item\Collection as OrderItemCollecti
-  */
- class CartTest extends \Magento\TestFramework\TestCase\AbstractController
- {
-+    /** @var CheckoutSession */
-+    private $checkoutSession;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $this->checkoutSession = $this->_objectManager->get(CheckoutSession::class);
-+        $this->_objectManager->addSharedInstance($this->checkoutSession, CheckoutSession::class);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function tearDown()
-+    {
-+        $this->_objectManager->removeSharedInstance(CheckoutSession::class);
-+        parent::tearDown();
-+    }
-+
-     /**
-      * Test for \Magento\Checkout\Controller\Cart::configureAction() with simple product
-      *
-@@ -32,8 +59,8 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController
-      */
-     public function testConfigureActionWithSimpleProduct()
-     {
--        /** @var $session \Magento\Checkout\Model\Session  */
--        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
-+        /** @var $session CheckoutSession */
-+        $session = $this->_objectManager->create(CheckoutSession::class);
- 
-         /** @var ProductRepositoryInterface $productRepository */
-         $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
-@@ -63,19 +90,20 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController
-     /**
-      * Test for \Magento\Checkout\Controller\Cart::configureAction() with simple product and custom option
-      *
--     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_and_custom_option.php
-+     * @magentoDataFixture Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php
-      */
-     public function testConfigureActionWithSimpleProductAndCustomOption()
-     {
--        /** @var $session \Magento\Checkout\Model\Session  */
--        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
-+        /** @var Quote $quote */
-+        $quote = $this->getQuote('test_order_item_with_custom_options');
-+        $this->checkoutSession->setQuoteId($quote->getId());
- 
-         /** @var ProductRepositoryInterface $productRepository */
-         $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
-         /** @var $product \Magento\Catalog\Model\Product */
--        $product = $productRepository->get('simple');
-+        $product = $productRepository->get('simple_with_custom_options');
- 
--        $quoteItem = $this->_getQuoteItemIdByProductId($session->getQuote(), $product->getId());
-+        $quoteItem = $this->_getQuoteItemIdByProductId($quote, $product->getId());
-         $this->assertNotNull($quoteItem, 'Cannot get quote item for simple product with custom option');
- 
-         $this->dispatch(
-@@ -108,11 +136,12 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController
-      * Test for \Magento\Checkout\Controller\Cart::configureAction() with bundle product
-      *
-      * @magentoDataFixture Magento/Checkout/_files/quote_with_bundle_product.php
-+     * @magentoDbIsolation disabled
-      */
-     public function testConfigureActionWithBundleProduct()
-     {
--        /** @var $session \Magento\Checkout\Model\Session  */
--        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
-+        /** @var $session CheckoutSession */
-+        $session = $this->_objectManager->create(CheckoutSession::class);
- 
-         /** @var ProductRepositoryInterface $productRepository */
-         $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
-@@ -146,8 +175,8 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController
-      */
-     public function testConfigureActionWithDownloadableProduct()
-     {
--        /** @var $session \Magento\Checkout\Model\Session  */
--        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
-+        /** @var $session CheckoutSession */
-+        $session = $this->_objectManager->create(CheckoutSession::class);
- 
-         /** @var ProductRepositoryInterface $productRepository */
-         $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
-@@ -200,8 +229,8 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController
-         $productId = $product->getId();
-         $originalQuantity = 1;
-         $updatedQuantity = 2;
--        /** @var $checkoutSession \Magento\Checkout\Model\Session  */
--        $checkoutSession = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
-+        /** @var $checkoutSession CheckoutSession */
-+        $checkoutSession = $this->_objectManager->create(CheckoutSession::class);
-         $quoteItem = $this->_getQuoteItemIdByProductId($checkoutSession->getQuote(), $productId);
- 
-         /** @var FormKey $formKey */
-@@ -211,6 +240,7 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController
-             'update_cart_action' => 'update_qty',
-             'form_key' => $formKey->getFormKey(),
-         ];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($postData);
-         /** @var $customerSession \Magento\Customer\Model\Session */
-         $customerSession = $this->_objectManager->create(\Magento\Customer\Model\Session::class);
-@@ -234,11 +264,32 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController
-         $this->assertEquals($updatedQuantity, $quoteItem->getQty(), "Invalid quote item quantity");
-     }
- 
-+    /**
-+     * Gets quote by reserved order id.
-+     *
-+     * @param string $reservedOrderId
-+     * @return Quote
-+     */
-+    private function getQuote($reservedOrderId)
-+    {
-+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
-+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
-+            ->create();
-+
-+        /** @var CartRepositoryInterface $quoteRepository */
-+        $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
-+        $items = $quoteRepository->getList($searchCriteria)->getItems();
-+
-+        return array_pop($items);
-+    }
-+
-     /**
-      * Gets \Magento\Quote\Model\Quote\Item from \Magento\Quote\Model\Quote by product id
-      *
-      * @param \Magento\Quote\Model\Quote $quote
--     * @param $productId
-+     * @param string|int $productId
-+     *
-      * @return \Magento\Quote\Model\Quote\Item|null
-      */
-     private function _getQuoteItemIdByProductId($quote, $productId)
-@@ -273,6 +324,7 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController
-             'isAjax' => 1
-         ];
-         \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea($area);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($postData);
- 
-         $quote =  $this->_objectManager->create(\Magento\Checkout\Model\Cart::class);
-@@ -300,6 +352,77 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController
-         ];
-     }
- 
-+    /**
-+     * Test for \Magento\Checkout\Controller\Cart\Add::execute() with simple product and activated redirect to cart
-+     *
-+     * @magentoDataFixture Magento/Catalog/_files/products.php
-+     * @magentoConfigFixture current_store checkout/cart/redirect_to_cart 1
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testMessageAtAddToCartWithRedirect()
-+    {
-+        $formKey = $this->_objectManager->get(FormKey::class);
-+        $postData = [
-+            'qty' => '1',
-+            'product' => '1',
-+            'custom_price' => 1,
-+            'form_key' => $formKey->getFormKey(),
-+            'isAjax' => 1
-+        ];
-+        \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend');
-+        $this->getRequest()->setPostValue($postData);
-+        $this->getRequest()->setMethod('POST');
-+
-+        $this->dispatch('checkout/cart/add');
-+
-+        $this->assertEquals(
-+            '{"backUrl":"http:\/\/localhost\/index.php\/checkout\/cart\/"}',
-+            $this->getResponse()->getBody()
-+        );
-+
-+        $this->assertSessionMessages(
-+            $this->contains(
-+                'You added Simple Product to your shopping cart.'
-+            ),
-+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-+        );
-+    }
-+
-+    /**
-+     * Test for \Magento\Checkout\Controller\Cart\Add::execute() with simple product and deactivated redirect to cart
-+     *
-+     * @magentoDataFixture Magento/Catalog/_files/products.php
-+     * @magentoConfigFixture current_store checkout/cart/redirect_to_cart 0
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testMessageAtAddToCartWithoutRedirect()
-+    {
-+        $formKey = $this->_objectManager->get(FormKey::class);
-+        $postData = [
-+            'qty' => '1',
-+            'product' => '1',
-+            'custom_price' => 1,
-+            'form_key' => $formKey->getFormKey(),
-+            'isAjax' => 1
-+        ];
-+        \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend');
-+        $this->getRequest()->setPostValue($postData);
-+        $this->getRequest()->setMethod('POST');
-+
-+        $this->dispatch('checkout/cart/add');
-+
-+        $this->assertFalse($this->getResponse()->isRedirect());
-+        $this->assertEquals('[]', $this->getResponse()->getBody());
-+
-+        $this->assertSessionMessages(
-+            $this->contains(
-+                "\n" . 'You added Simple Product to your ' .
-+                '<a href="http://localhost/index.php/checkout/cart/">shopping cart</a>.'
-+            ),
-+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-+        );
-+    }
-+
-     /**
-      * @covers \Magento\Checkout\Controller\Cart\Addgroup::execute()
-      *
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php
-index 57cbaef54e5..af572c556bb 100644
---- a/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php
-@@ -5,19 +5,50 @@
-  */
- namespace Magento\Checkout\Model;
- 
-+use Magento\Catalog\Api\Data\ProductTierPriceInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Model\Session as CustomerSession;
-+use Magento\Framework\Api\FilterBuilder;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Api\Data\CartInterface;
- use Magento\TestFramework\Helper\Bootstrap;
- 
-+/**
-+ * Class SessionTest
-+ */
- class SessionTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\Checkout\Model\Session
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var CustomerRepositoryInterface
-      */
--    protected $_checkoutSession;
-+    private $customerRepository;
- 
-+    /**
-+     * @var CustomerSession
-+     */
-+    private $customerSession;
-+
-+    /**
-+     * @var Session
-+     */
-+    private $checkoutSession;
-+
-+    /**
-+     * @return void
-+     */
-     protected function setUp()
-     {
--        $this->_checkoutSession = Bootstrap::getObjectManager()->create(\Magento\Checkout\Model\Session::class);
--        parent::setUp();
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->customerRepository = $this->objectManager->create(CustomerRepositoryInterface::class);
-+        $this->customerSession = $this->objectManager->get(CustomerSession::class);
-+        $this->checkoutSession = $this->objectManager->create(Session::class);
-     }
- 
-     /**
-@@ -29,15 +60,11 @@ class SessionTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testGetQuoteNotInitializedCustomerSet()
-     {
--        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
--
--        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
--        $customerRepository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
--        $customer = $customerRepository->getById(1);
--        $this->_checkoutSession->setCustomerData($customer);
-+        $customer = $this->customerRepository->getById(1);
-+        $this->checkoutSession->setCustomerData($customer);
- 
-         /** Execute SUT */
--        $quote = $this->_checkoutSession->getQuote();
-+        $quote = $this->checkoutSession->getQuote();
-         $this->_validateCustomerDataInQuote($quote);
-     }
- 
-@@ -51,17 +78,11 @@ class SessionTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testGetQuoteNotInitializedCustomerLoggedIn()
-     {
--        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
--
--        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
--        $customerRepository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
--        $customer = $customerRepository->getById(1);
--        /** @var \Magento\Customer\Model\Session $customerSession */
--        $customerSession = Bootstrap::getObjectManager()->get(\Magento\Customer\Model\Session::class);
--        $customerSession->setCustomerDataObject($customer);
-+        $customer = $this->customerRepository->getById(1);
-+        $this->customerSession->setCustomerDataObject($customer);
- 
-         /** Execute SUT */
--        $quote = $this->_checkoutSession->getQuote();
-+        $quote = $this->checkoutSession->getQuote();
-         $this->_validateCustomerDataInQuote($quote);
-     }
- 
-@@ -80,29 +101,86 @@ class SessionTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testLoadCustomerQuoteCustomerWithoutQuote()
-     {
--        $quote = $this->_checkoutSession->getQuote();
-+        $quote = $this->checkoutSession->getQuote();
-         $this->assertEmpty($quote->getCustomerId(), 'Precondition failed: Customer data must not be set to quote');
-         $this->assertEmpty($quote->getCustomerEmail(), 'Precondition failed: Customer data must not be set to quote');
- 
--        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
--
--        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
--        $customerRepository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
--        $customer = $customerRepository->getById(1);
--        /** @var \Magento\Customer\Model\Session $customerSession */
--        $customerSession = Bootstrap::getObjectManager()->get(\Magento\Customer\Model\Session::class);
--        $customerSession->setCustomerDataObject($customer);
-+        $customer = $this->customerRepository->getById(1);
-+        $this->customerSession->setCustomerDataObject($customer);
- 
-         /** Ensure that customer data is still unavailable before SUT invocation */
--        $quote = $this->_checkoutSession->getQuote();
-+        $quote = $this->checkoutSession->getQuote();
-         $this->assertEmpty($quote->getCustomerEmail(), 'Precondition failed: Customer data must not be set to quote');
- 
-         /** Execute SUT */
--        $this->_checkoutSession->loadCustomerQuote();
--        $quote = $this->_checkoutSession->getQuote();
-+        $this->checkoutSession->loadCustomerQuote();
-+        $quote = $this->checkoutSession->getQuote();
-         $this->_validateCustomerDataInQuote($quote);
-     }
- 
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/Sales/_files/quote.php
-+     */
-+    public function testGetQuoteWithProductWithTierPrice()
-+    {
-+        $reservedOrderId = 'test01';
-+        $customerGroupId = 1;
-+        $tierPriceQty = 1;
-+        $tierPriceValue = 9;
-+
-+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-+        $product = $productRepository->get('simple');
-+        $tierPrice = $this->objectManager->create(ProductTierPriceInterface::class)
-+            ->setCustomerGroupId($customerGroupId)
-+            ->setQty($tierPriceQty)
-+            ->setValue($tierPriceValue);
-+        $product->setTierPrices([$tierPrice]);
-+        $productRepository->save($product);
-+
-+        $quote = $this->getQuote($reservedOrderId);
-+        $this->checkoutSession->setQuoteId($quote->getId());
-+
-+        $quote = $this->checkoutSession->getQuote();
-+        $item = $quote->getItems()[0];
-+        /** @var \Magento\Catalog\Model\Product $quoteProduct */
-+        $quoteProduct = $item->getProduct();
-+        $this->assertEquals(10, $quoteProduct->getTierPrice($tierPriceQty));
-+
-+        $customer = $this->customerRepository->getById(1);
-+        $this->customerSession->setCustomerDataAsLoggedIn($customer);
-+
-+        $quote = $this->checkoutSession->getQuote();
-+        $item = $quote->getItems()[0];
-+        /** @var \Magento\Catalog\Model\Product $quoteProduct */
-+        $quoteProduct = $item->getProduct();
-+        $this->assertEquals($tierPriceValue, $quoteProduct->getTierPrice(1));
-+    }
-+
-+    /**
-+     * Returns quote by reserved order id.
-+     *
-+     * @param string $reservedOrderId
-+     * @return CartInterface
-+     */
-+    private function getQuote(string $reservedOrderId): CartInterface
-+    {
-+        $filterBuilder = $this->objectManager->create(FilterBuilder::class);
-+        $filter = $filterBuilder->setField('reserved_order_id')
-+            ->setConditionType('=')
-+            ->setValue($reservedOrderId)
-+            ->create();
-+        $searchCriteriaBuilder = $this->objectManager->create(SearchCriteriaBuilder::class);
-+        $searchCriteria = $searchCriteriaBuilder->addFilters([$filter])
-+            ->create();
-+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
-+        $searchResult = $quoteRepository->getList($searchCriteria);
-+        /** @var CartInterface[] $items */
-+        $items = $searchResult->getItems();
-+
-+        return \array_values($items)[0];
-+    }
-+
-     /**
-      * Ensure that quote has customer data specified in customer fixture.
-      *
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/ShippingInformationManagementTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Model/ShippingInformationManagementTest.php
-new file mode 100644
-index 00000000000..36991943752
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/Model/ShippingInformationManagementTest.php
-@@ -0,0 +1,142 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Checkout\Model;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Checkout\Api\Data\ShippingInformationInterface;
-+use Magento\Checkout\Api\PaymentInformationManagementInterface;
-+use Magento\Checkout\Api\ShippingInformationManagementInterface;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Quote\Api\CartItemRepositoryInterface;
-+use Magento\Quote\Api\CartManagementInterface;
-+use Magento\Quote\Api\Data\AddressInterfaceFactory;
-+use Magento\Quote\Api\Data\CartItemInterface;
-+use Magento\Quote\Api\Data\PaymentInterface;
-+use Magento\Quote\Api\ShipmentEstimationInterface;
-+use Magento\Sales\Api\InvoiceOrderInterface;
-+
-+/**
-+ * Shipping information managment test.
-+ */
-+class ShippingInformationManagementTest extends \PHPUnit\Framework\TestCase
-+{
-+    /** @var CartManagementInterface */
-+    private $cartManagement;
-+
-+    /** @var CartItemRepositoryInterface */
-+    private $cartItemRepository;
-+
-+    /** @var CartItemInterface */
-+    private $cartItem;
-+
-+    /** @var ShippingInformationManagementInterface */
-+    private $shippingInformationManagement;
-+
-+    /** @var ShippingInformationInterface */
-+    private $shippingInformation;
-+
-+    /** @var CustomerRepositoryInterface */
-+    private $customerRepository;
-+
-+    /** @var AddressInterfaceFactory */
-+    private $apiAddressFactory;
-+
-+    /** @var ShipmentEstimationInterface */
-+    private $shipmentEstimation;
-+
-+    /** @var PaymentInformationManagementInterface */
-+    private $paymentInformationManagement;
-+
-+    /** @var PaymentInterface */
-+    private $payment;
-+
-+    /** @var InvoiceOrderInterface */
-+    private $invoiceOrder;
-+
-+    public function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+
-+        $this->cartManagement = $objectManager->create(CartManagementInterface::class);
-+        $this->cartItemRepository = $objectManager->create(CartItemRepositoryInterface::class);
-+        $this->cartItem = $objectManager->create(CartItemInterface::class);
-+        $this->shippingInformationManagement = $objectManager->create(ShippingInformationManagementInterface::class);
-+        $this->shippingInformation = $objectManager->create(ShippingInformationInterface::class);
-+        $this->customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
-+        $this->apiAddressFactory = $objectManager->create(AddressInterfaceFactory::class);
-+        $this->shipmentEstimation = $objectManager->create(ShipmentEstimationInterface::class);
-+        $this->paymentInformationManagement = $objectManager->create(PaymentInformationManagementInterface::class);
-+        $this->payment = $objectManager->create(PaymentInterface::class);
-+        $this->invoiceOrder = $objectManager->create(InvoiceOrderInterface::class);
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
-+     * @magentoDataFixture Magento/Catalog/_files/product_virtual_in_stock.php
-+     */
-+    public function testQuoteApiWithOnlyVirtualProducts()
-+    {
-+        $customer = $this->customerRepository->getById(1);
-+
-+        // Create empty quote
-+        $quoteId = $this->cartManagement->createEmptyCartForCustomer($customer->getId());
-+
-+        $cartItem = $this->cartItem
-+            ->setSku('virtual-product')
-+            ->setQty(1)
-+            ->setQuoteId($quoteId);
-+
-+        // Add item to cart
-+        $this->cartItemRepository->save($cartItem);
-+
-+        $billingAddress = $shippingAddress = null;
-+        foreach ($customer->getAddresses() as $address) {
-+            $billingAddress = $address;
-+            $shippingAddress = $address;
-+            break;
-+        }
-+
-+        /** @var \Magento\Quote\Model\Quote\Address $apiBillingAddress */
-+        $apiBillingAddress = $this->apiAddressFactory->create();
-+        $apiBillingAddress->setRegion($billingAddress->getRegion())
-+            ->setRegionId($billingAddress->getRegionId())
-+            ->setCountryId($billingAddress->getCountryId())
-+            ->setStreet($billingAddress->getStreet())
-+            ->setPostcode($billingAddress->getPostcode())
-+            ->setCity($billingAddress->getCity())
-+            ->setFirstname($billingAddress->getFirstname())
-+            ->setLastname($billingAddress->getLastname())
-+            ->setEmail($customer->getEmail())
-+            ->setTelephone($billingAddress->getTelephone());
-+
-+        /** @var \Magento\Quote\Model\Quote\Address $apiShippingAddress */
-+        $apiShippingAddress = $this->apiAddressFactory->create();
-+        $apiShippingAddress->setRegion($shippingAddress->getRegion())
-+            ->setRegionId($shippingAddress->getRegionId())
-+            ->setCountryId($shippingAddress->getCountryId())
-+            ->setStreet($shippingAddress->getStreet())
-+            ->setPostcode($shippingAddress->getPostcode())
-+            ->setCity($shippingAddress->getCity())
-+            ->setFirstname($shippingAddress->getFirstname())
-+            ->setLastname($shippingAddress->getLastname())
-+            ->setEmail($customer->getEmail())
-+            ->setTelephone($shippingAddress->getTelephone());
-+
-+        // Estimate shipping
-+        $this->shipmentEstimation->estimateByExtendedAddress($quoteId, $apiShippingAddress);
-+
-+        $addressInformation = $this->shippingInformation
-+            ->setBillingAddress($apiBillingAddress)
-+            ->setShippingAddress($apiShippingAddress)
-+            ->setShippingCarrierCode('flatrate')
-+            ->setShippingMethodCode('flatrate');
-+
-+        // Set address information on quote
-+        $this->shippingInformationManagement->saveAddressInformation($quoteId, $addressInformation);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
-index e533dbfa0c8..60ccdb88676 100644
---- a/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
-@@ -22,6 +22,7 @@ class ResetQuoteAddressesTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @magentoDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
-      *
-+     * @magentoAppArea frontend
-      * @return void
-      */
-     public function testAfterRemoveItem(): void
-@@ -52,9 +53,15 @@ class ResetQuoteAddressesTest extends \PHPUnit\Framework\TestCase
-         $cart = Bootstrap::getObjectManager()->create(Cart::class);
- 
-         $activeQuote = $cart->getQuote();
-+        // Dummy data is still persisted here. This is sufficient to check that it is removed
-+        $activeQuote->getExtensionAttributes()->setShippingAssignments(['test']);
-+
-         $cart->removeItem($activeQuote->getAllVisibleItems()[0]->getId());
-         $cart->save();
- 
-+        // Check that the shipping assignments were also unset
-+        $this->assertEmpty($activeQuote->getExtensionAttributes()->getShippingAssignments());
-+
-         /** @var Quote $quote */
-         $quote = Bootstrap::getObjectManager()->create(Quote::class);
-         $quote->load('test_order_with_virtual_product', 'reserved_order_id');
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote.php
-index 2d948ebeb01..52437ef828a 100644
---- a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote.php
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote.php
-@@ -9,3 +9,11 @@ $quote->setStoreId(1)
-     ->setIsMultiShipping(false)
-     ->setReservedOrderId('test_order_1')
-     ->save();
-+
-+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
-+$quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
-+    ->create();
-+$quoteIdMask->setQuoteId($quote->getId());
-+$quoteIdMask->setDataChanges(true);
-+$quoteIdMask->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store.php
-new file mode 100644
-index 00000000000..6448a570424
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store.php
-@@ -0,0 +1,23 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+include 'testsuite/Magento/Store/_files/second_store.php';
-+include 'testsuite/Magento/Customer/_files/customer.php';
-+
-+$quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
-+$quote->setStoreId($store->getId())
-+    ->setIsActive(true)
-+    ->setIsMultiShipping(false)
-+    ->setReservedOrderId('test_order_1_not_default_store')
-+    ->setCustomerId($customer->getId())
-+    ->save();
-+
-+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
-+$quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
-+    ->create();
-+$quoteIdMask->setQuoteId($quote->getId());
-+$quoteIdMask->setDataChanges(true);
-+$quoteIdMask->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php
-new file mode 100644
-index 00000000000..e3e1513cb61
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
-+$quote->load('test_order_1_not_default_store', 'reserved_order_id')->delete();
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php
-new file mode 100644
-index 00000000000..bbd3d5efbe8
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+include 'testsuite/Magento/Store/_files/second_store.php';
-+
-+$quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
-+$quote->setStoreId($store->getId())
-+    ->setIsActive(true)
-+    ->setIsMultiShipping(false)
-+    ->setReservedOrderId('test_order_1_not_default_store_guest')
-+    ->save();
-+
-+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
-+$quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
-+    ->create();
-+$quoteIdMask->setQuoteId($quote->getId());
-+$quoteIdMask->setDataChanges(true);
-+$quoteIdMask->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php
-new file mode 100644
-index 00000000000..f511133280e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
-+$quote->load('test_order_1_not_default_store_guest', 'reserved_order_id')->delete();
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php
-new file mode 100644
-index 00000000000..22367979adc
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php
-@@ -0,0 +1,47 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product\Option;
-+use Magento\Checkout\Model\Session;
-+use Magento\Framework\DataObject;
-+use Magento\Quote\Model\Quote;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_custom_options.php';
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = Bootstrap::getObjectManager()
-+    ->create(ProductRepositoryInterface::class);
-+$product = $productRepository->get('simple_with_custom_options');
-+
-+$options = [];
-+/** @var $option Option */
-+foreach ($product->getOptions() as $option) {
-+    switch ($option->getGroupByType()) {
-+        case ProductCustomOptionInterface::OPTION_GROUP_SELECT:
-+            $value = key($option->getValues());
-+            break;
-+        default:
-+            $value = 'test';
-+            break;
-+    }
-+    $options[$option->getId()] = $value;
-+}
-+
-+$requestInfo = new DataObject(['qty' => 1, 'options' => $options]);
-+
-+/** @var $cart \Magento\Checkout\Model\Cart */
-+$quote = Bootstrap::getObjectManager()->create(Quote::class);
-+$quote->setReservedOrderId('test_order_item_with_custom_options');
-+$quote->addProduct($product, $requestInfo);
-+$quote->save();
-+
-+/** @var $objectManager \Magento\TestFramework\ObjectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+$objectManager->removeSharedInstance(Session::class);
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent_generalusers.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent_generalusers.php
-index 507f6b755bc..f8fb587f32d 100644
---- a/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent_generalusers.php
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent_generalusers.php
-@@ -14,6 +14,7 @@ $salesRule = $objectManager->create(\Magento\SalesRule\Model\Rule::class);
- $data = [
-     'name' => 'Test Coupon for General',
-     'is_active' => true,
-+    'store_labels' => [0 => 'Test Coupon for General'],
-     'website_ids' => [
-         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-             \Magento\Store\Model\StoreManagerInterface::class
-@@ -21,7 +22,7 @@ $data = [
-     ],
-     'customer_group_ids' => [1],
-     'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC,
--    'coupon_code' => uniqid(),
-+    'coupon_code' => '2?ds5!2d',
-     'simple_action' => \Magento\SalesRule\Model\Rule::BY_PERCENT_ACTION,
-     'discount_amount' => 10,
-     'discount_step' => 1
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product.php
-index ddc7d206315..c88c87d74df 100644
---- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product.php
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product.php
-@@ -35,6 +35,7 @@ $requestInfo = new \Magento\Framework\DataObject(
- /** @var $cart \Magento\Checkout\Model\Cart */
- $cart = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Checkout\Model\Cart::class);
- $cart->addProduct($product, $requestInfo);
-+$cart->getQuote()->setReservedOrderId('test_cart_with_bundle');
- $cart->save();
- 
- /** @var $objectManager \Magento\TestFramework\ObjectManager */
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_rollback.php
-new file mode 100644
-index 00000000000..090248820e2
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_rollback.php
-@@ -0,0 +1,36 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/*
-+ * Since the bundle product creation GUI doesn't allow to choose values for bundled products' custom options,
-+ * bundled items should not contain products with required custom options.
-+ * However, if to create such a bundle product, it will be always out of stock.
-+ */
-+require __DIR__ . '/../../../Magento/Catalog/_files/products_rollback.php';
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+try {
-+    $product = $productRepository->get('bundle-product', false, null, true);
-+    $productRepository->delete($product);
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+    //Product already removed
-+}
-+
-+/** @var $objectManager \Magento\TestFramework\ObjectManager */
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
-+$quote->load('test_cart_with_bundle', 'reserved_order_id');
-+$quote->delete();
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_shipping_method.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_shipping_method.php
-index 3c54fe16db7..61779da29c6 100644
---- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_shipping_method.php
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_shipping_method.php
-@@ -11,10 +11,18 @@
- 
- require 'quote_with_address_saved.php';
- 
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+$rate = $objectManager->get(\Magento\Quote\Model\Quote\Address\Rate::class);
-+
- $quote->load('test_order_1', 'reserved_order_id');
- $shippingAddress = $quote->getShippingAddress();
- $shippingAddress->setShippingMethod('flatrate_flatrate')
-     ->setShippingDescription('Flat Rate - Fixed')
--    ->setShippingAmount(10.0)
--    ->setBaseShippingAmount(12.0)
-     ->save();
-+
-+$rate->setPrice(0)
-+    ->setAddressId($shippingAddress->getId())
-+    ->save();
-+$shippingAddress->setBaseShippingAmount($rate->getPrice());
-+$shippingAddress->setShippingAmount($rate->getPrice());
-+$rate->delete();
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php
-index 105a981ccfc..39b75844722 100644
---- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php
-@@ -14,3 +14,5 @@ $quote->load('test_order_with_simple_product_without_address', 'reserved_order_i
- /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
- $quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMask::class);
- $quoteIdMask->delete($quote->getId());
-+
-+require 'simple_product_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php
-index 2b906bdc022..402ad030ed8 100644
---- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php
-@@ -13,3 +13,7 @@ $quote->load('test_order_with_virtual_product', 'reserved_order_id')->delete();
- /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
- $quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMask::class);
- $quoteIdMask->delete($quote->getId());
-+
-+require __DIR__ . '/../../Customer/_files/customer_rollback.php';
-+require __DIR__ . '/../../Customer/_files/customer_address_rollback.php';
-+require __DIR__ . '/../../Catalog/_files/product_virtual_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved.php
-index 835b2ab8128..833e5a57ac3 100644
---- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved.php
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved.php
-@@ -13,6 +13,7 @@ $quote->setStoreId(1)
-     ->setIsMultiShipping(false)
-     ->setReservedOrderId('test_order_with_virtual_product_without_address')
-     ->setEmail('store@example.com')
-+    ->setCustomerEmail('store@example.com')
-     ->addProduct(
-         $product->load($product->getId()),
-         1
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved_rollback.php
-index b3224bb5274..afcb7f56f8d 100644
---- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved_rollback.php
-@@ -14,3 +14,5 @@ $quote->load('test_order_with_virtual_product_without_address', 'reserved_order_
- /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
- $quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMask::class);
- $quoteIdMask->delete($quote->getId());
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_virtual_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
-new file mode 100644
-index 00000000000..d8744873af0
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
-@@ -0,0 +1,26 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = $objectManager->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+
-+try {
-+    $product = $productRepository->get('simple', false, null, true);
-+    $productRepository->delete($product);
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-+    //Product already removed
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/ResourceModel/Grid/CollectionTest.php b/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/ResourceModel/Grid/CollectionTest.php
-new file mode 100644
-index 00000000000..bc098cf1bd0
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/ResourceModel/Grid/CollectionTest.php
-@@ -0,0 +1,44 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\CheckoutAgreements\Model\ResourceModel\Grid;
-+
-+use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Grid\Collection;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Check data in collection
-+ */
-+class CollectionTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var Collection;
-+     */
-+    private $collection;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setUp()
-+    {
-+        $this->collection = Bootstrap::getObjectManager()
-+            ->create(Collection::class);
-+    }
-+
-+    /**
-+     * Check that collection is filterable by store
-+     *
-+     * @magentoDataFixture Magento/CheckoutAgreements/_files/multi_agreements_active_with_text.php
-+     */
-+    public function testAddStoresToFilter(): void
-+    {
-+        $collectionSize = $this->collection->addStoreFilter(1)
-+            ->load(false, false)
-+            ->getSize();
-+        $this->assertEquals(2, $collectionSize);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Cms/Block/Widget/BlockTest.php b/dev/tests/integration/testsuite/Magento/Cms/Block/Widget/BlockTest.php
-index 7ee1f569180..266fd66bc3d 100644
---- a/dev/tests/integration/testsuite/Magento/Cms/Block/Widget/BlockTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Cms/Block/Widget/BlockTest.php
-@@ -31,5 +31,6 @@ class BlockTest extends \PHPUnit\Framework\TestCase
-         $this->assertContains('<a href="http://example.com/', $result);
-         $this->assertContains('<p>Config value: "http://example.com/".</p>', $result);
-         $this->assertContains('<p>Custom variable: "HTML Value".</p>', $result);
-+        $this->assertSame($cmsBlock->getIdentities(), $block->getIdentities());
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php
-index fa49a7b1f57..1fc07d32c77 100644
---- a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php
-@@ -64,6 +64,10 @@ class DeleteFilesTest extends \PHPUnit\Framework\TestCase
-         $filePath =  $this->fullDirectoryPath . DIRECTORY_SEPARATOR . $this->fileName;
-         $fixtureDir = realpath(__DIR__ . '/../../../../../Catalog/_files');
-         copy($fixtureDir . '/' . $this->fileName, $filePath);
-+        $path = $this->fullDirectoryPath . '/.htaccess';
-+        if (!$this->mediaDirectory->isFile($path)) {
-+            $this->mediaDirectory->writeFile($path, "Order deny,allow\nDeny from all");
-+        }
-         $this->model = $this->objectManager->get(\Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles::class);
-     }
- 
-@@ -87,6 +91,26 @@ class DeleteFilesTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * Check that htaccess file couldn't be removed via
-+     * \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles::execute method
-+     *
-+     * @return void
-+     */
-+    public function testDeleteHtaccess()
-+    {
-+        $this->model->getRequest()->setMethod('POST')
-+            ->setPostValue('files', [$this->imagesHelper->idEncode('.htaccess')]);
-+        $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
-+        $this->model->execute();
-+
-+        $this->assertTrue(
-+            $this->mediaDirectory->isExist(
-+                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . '/' . '.htaccess')
-+            )
-+        );
-+    }
-+
-     /**
-      * Execute method with traversal file path to check that there is no ability to remove file which is not
-      * under media directory.
-diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php
-index a1a29706756..c574869a83c 100644
---- a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php
-@@ -66,6 +66,7 @@ class DeleteFolderTest extends \PHPUnit\Framework\TestCase
-             $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . $directoryName)
-         );
-         $this->model->getRequest()->setParams(['node' => $this->imagesHelper->idEncode($directoryName)]);
-+        $this->model->getRequest()->setMethod('POST');
-         $this->model->execute();
- 
-         $this->assertFalse(
-diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
-index bab14a8663e..00f56e57004 100644
---- a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
-@@ -4,9 +4,14 @@
-  * See COPYING.txt for license details.
-  */
- 
-+declare(strict_types=1);
-+
- namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\Framework\Controller\Result\Json as JsonResponse;
-+use Magento\Framework\App\Response\HttpFactory as ResponseFactory;
-+use Magento\Framework\App\Response\Http as Response;
- 
- /**
-  * Test for \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\Upload class.
-@@ -43,6 +48,11 @@ class UploadTest extends \PHPUnit\Framework\TestCase
-      */
-     private $objectManager;
- 
-+    /**
-+     * @var HttpFactory
-+     */
-+    private $responseFactory;
-+
-     /**
-      * @inheritdoc
-      */
-@@ -56,6 +66,7 @@ class UploadTest extends \PHPUnit\Framework\TestCase
-         $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-         $this->fullDirectoryPath = $imagesHelper->getStorageRoot() . DIRECTORY_SEPARATOR . $directoryName;
-         $this->mediaDirectory->create($this->mediaDirectory->getRelativePath($this->fullDirectoryPath));
-+        $this->responseFactory = $this->objectManager->get(ResponseFactory::class);
-         $this->model = $this->objectManager->get(\Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\Upload::class);
-         $fixtureDir = realpath(__DIR__ . '/../../../../../Catalog/_files');
-         $tmpFile = $this->filesystem->getDirectoryRead(DirectoryList::PUB)->getAbsolutePath() . $this->fileName;
-@@ -81,8 +92,13 @@ class UploadTest extends \PHPUnit\Framework\TestCase
-     public function testExecute()
-     {
-         $this->model->getRequest()->setParams(['type' => 'image/png']);
-+        $this->model->getRequest()->setMethod('POST');
-         $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
--        $this->model->execute();
-+        /** @var JsonResponse $jsonResponse */
-+        $jsonResponse = $this->model->execute();
-+        /** @var Response $response */
-+        $jsonResponse->renderResult($response = $this->responseFactory->create());
-+        $data = json_decode($response->getBody(), true);
- 
-         $this->assertTrue(
-             $this->mediaDirectory->isExist(
-@@ -91,6 +107,12 @@ class UploadTest extends \PHPUnit\Framework\TestCase
-                 )
-             )
-         );
-+        //Asserting that response contains only data needed by clients.
-+        $keys = ['name', 'type', 'error', 'size', 'file'];
-+        sort($keys);
-+        $dataKeys = array_keys($data);
-+        sort($dataKeys);
-+        $this->assertEquals($keys, $dataKeys);
-     }
- 
-     /**
-diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php
-index 16331ccde24..3925975a0f7 100644
---- a/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php
-@@ -7,6 +7,7 @@ namespace Magento\Cms\Model;
- 
- use Magento\Cms\Model\ResourceModel\Block;
- use Magento\Cms\Model\BlockFactory;
-+use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\ObjectManagerInterface;
- use Magento\Framework\Stdlib\DateTime\DateTime;
- use Magento\Framework\Stdlib\DateTime\Timezone;
-@@ -82,23 +83,26 @@ class BlockTest extends TestCase
-      */
-     public function testUpdateTime(array $blockData)
-     {
-+        /**
-+         * @var $db \Magento\Framework\DB\Adapter\AdapterInterface
-+         */
-+        $db = $this->objectManager->get(\Magento\Framework\App\ResourceConnection::class)
-+            ->getConnection(ResourceConnection::DEFAULT_CONNECTION);
- 
-         # Prepare and save the temporary block
--        $beforeTimestamp = $this->objectManager->get(DateTime::class)->timestamp();
-         $tempBlock       = $this->blockFactory->create();
-         $tempBlock->setData($blockData);
-+        $beforeTimestamp = $db->fetchCol('SELECT UNIX_TIMESTAMP()')[0];
-         $this->blockResource->save($tempBlock);
-+        $afterTimestamp = $db->fetchCol('SELECT UNIX_TIMESTAMP()')[0];
- 
-         # Load previously created block and compare identifiers
-         $storeId        = reset($blockData['stores']);
-         $block          = $this->blockIdentifier->execute($blockData['identifier'], $storeId);
--        $afterTimestamp = $this->objectManager->get(DateTime::class)->timestamp();
-         $blockTimestamp = strtotime($block->getUpdateTime());
- 
-         /*
--         * This test used to fail due to a race condition @see MAGETWO-87353
--         * The DB time would be one second older than the check time. The new check allows the DB time
--         * to be between the test start time and right before the assertion.
-+         * These checks prevent a race condition MAGETWO-87353
-          */
-         $this->assertGreaterThanOrEqual($beforeTimestamp, $blockTimestamp);
-         $this->assertLessThanOrEqual($afterTimestamp, $blockTimestamp);
-diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php
-index 42697e1b66b..83e7c678ffc 100644
---- a/dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php
-@@ -6,6 +6,7 @@
- namespace Magento\Cms\Model;
- 
- use Magento\Cms\Api\PageRepositoryInterface;
-+use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\Stdlib\DateTime\DateTime;
- 
- /**
-@@ -79,13 +80,27 @@ class PageTest extends \PHPUnit\Framework\TestCase
-     public function testUpdateTime()
-     {
-         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+        /**
-+         * @var $db \Magento\Framework\DB\Adapter\AdapterInterface
-+         */
-+        $db = $objectManager->get(\Magento\Framework\App\ResourceConnection::class)
-+            ->getConnection(ResourceConnection::DEFAULT_CONNECTION);
-+
-         /** @var \Magento\Cms\Model\Page $page */
-         $page = $objectManager->create(\Magento\Cms\Model\Page::class);
-         $page->setData(['title' => 'Test', 'stores' => [1]]);
-+        $beforeTimestamp = $db->fetchCol('SELECT UNIX_TIMESTAMP()')[0];
-         $page->save();
-+        $afterTimestamp = $db->fetchCol('SELECT UNIX_TIMESTAMP()')[0];
-         $page = $objectManager->get(PageRepositoryInterface::class)->getById($page->getId());
--        $date = $objectManager->get(DateTime::class)->date();
--        $this->assertEquals($date, $page->getUpdateTime());
-+        $pageTimestamp = strtotime($page->getUpdateTime());
-+
-+        /*
-+         * These checks prevent a race condition MAGETWO-95534
-+         */
-+        $this->assertGreaterThanOrEqual($beforeTimestamp, $pageTimestamp);
-+        $this->assertLessThanOrEqual($afterTimestamp, $pageTimestamp);
-     }
- 
-     public function generateIdentifierFromTitleDataProvider() : array
-diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/block_rollback.php b/dev/tests/integration/testsuite/Magento/Cms/_files/block_rollback.php
-new file mode 100644
-index 00000000000..9214dd543bd
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/block_rollback.php
-@@ -0,0 +1,30 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Cms\Api\BlockRepositoryInterface;
-+use Magento\Cms\Api\Data\BlockInterface;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var BlockRepositoryInterface $blockRepository */
-+$blockRepository = $objectManager->get(BlockRepositoryInterface::class);
-+
-+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
-+$searchCriteria = $searchCriteriaBuilder->addFilter(BlockInterface::IDENTIFIER, 'fixture_block')
-+    ->create();
-+$result = $blockRepository->getList($searchCriteria);
-+
-+/**
-+ * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
-+ * In that case there is "if" which checks that "fixture_block" still exists in database.
-+ */
-+foreach ($result->getItems() as $item) {
-+    $blockRepository->delete($item);
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/blocks.php b/dev/tests/integration/testsuite/Magento/Cms/_files/blocks.php
-new file mode 100644
-index 00000000000..bbdc697645a
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/blocks.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Cms\Api\BlockRepositoryInterface;
-+use Magento\Cms\Api\Data\BlockInterface;
-+use Magento\Cms\Api\Data\BlockInterfaceFactory;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var BlockRepositoryInterface $blockRepository */
-+$blockRepository = Bootstrap::getObjectManager()->get(BlockRepositoryInterface::class);
-+/** @var BlockInterfaceFactory $blockFactory */
-+$blockFactory = Bootstrap::getObjectManager()->get(BlockInterfaceFactory::class);
-+$storeId = Bootstrap::getObjectManager()->get(StoreManagerInterface::class)->getStore()->getId();
-+
-+/** @var BlockInterface $block */
-+$block = $blockFactory->create([
-+    'data' => [
-+        BlockInterface::IDENTIFIER => 'enabled_block',
-+        BlockInterface::TITLE => 'Enabled CMS Block Title',
-+        BlockInterface::CONTENT => '
-+            <h1>Enabled Block</h1>
-+            <a href="{{store url=""}}">store url</a>
-+            <p>Config value: "{{config path="web/unsecure/base_url"}}".</p>
-+            <p>Custom variable: "{{customvar code="variable_code"}}".</p>
-+            ',
-+        BlockInterface::IS_ACTIVE => 1,
-+        'store_id' => [$storeId],
-+    ]
-+]);
-+$blockRepository->save($block);
-+
-+/** @var BlockInterface $block */
-+$block = $blockFactory->create([
-+    'data' => [
-+        BlockInterface::IDENTIFIER => 'disabled_block',
-+        BlockInterface::TITLE => 'Disabled CMS Block Title',
-+        BlockInterface::CONTENT => '
-+            <h1>Disabled Block</h1>
-+            <a href="{{store url=""}}">store url</a>
-+            <p>Config value: "{{config path="web/unsecure/base_url"}}".</p>
-+            <p>Custom variable: "{{customvar code="variable_code"}}".</p>
-+            ',
-+        BlockInterface::IS_ACTIVE => 0,
-+        'store_id' => [$storeId],
-+    ]
-+]);
-+$blockRepository->save($block);
-diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/blocks_rollback.php b/dev/tests/integration/testsuite/Magento/Cms/_files/blocks_rollback.php
-new file mode 100644
-index 00000000000..a7a2a51524c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/blocks_rollback.php
-@@ -0,0 +1,23 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Cms\Api\BlockRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var BlockRepositoryInterface $blockRepository */
-+$blockRepository = Bootstrap::getObjectManager()->get(BlockRepositoryInterface::class);
-+
-+foreach (['enabled_block', 'disabled_block'] as $blockId) {
-+    try {
-+        $blockRepository->deleteById($blockId);
-+    } catch (NoSuchEntityException $e) {
-+        /**
-+         * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
-+         */
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/pages.php b/dev/tests/integration/testsuite/Magento/Cms/_files/pages.php
-index a0b7b99a877..b2742ecd380 100644
---- a/dev/tests/integration/testsuite/Magento/Cms/_files/pages.php
-+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/pages.php
-@@ -11,6 +11,10 @@ $page->setTitle('Cms Page 100')
-     ->setStores([0])
-     ->setIsActive(1)
-     ->setContent('<h1>Cms Page 100 Title</h1>')
-+    ->setContentHeading('<h2>Cms Page 100 Title</h2>')
-+    ->setMetaTitle('Cms Meta title for page100')
-+    ->setMetaKeywords('Cms Meta Keywords for page100')
-+    ->setMetaDescription('Cms Meta Description for page100')
-     ->setPageLayout('1column')
-     ->save();
- 
-@@ -20,6 +24,10 @@ $page->setTitle('Cms Page Design Blank')
-     ->setStores([0])
-     ->setIsActive(1)
-     ->setContent('<h1>Cms Page Design Blank Title</h1>')
-+    ->setContentHeading('<h2>Cms Page Blank Title</h2>')
-+    ->setMetaTitle('Cms Meta title for Blank page')
-+    ->setMetaKeywords('Cms Meta Keywords for Blank page')
-+    ->setMetaDescription('Cms Meta Description for Blank page')
-     ->setPageLayout('1column')
-     ->setCustomTheme('Magento/blank')
-     ->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/pages_rollback.php b/dev/tests/integration/testsuite/Magento/Cms/_files/pages_rollback.php
-new file mode 100644
-index 00000000000..038b36db32a
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/pages_rollback.php
-@@ -0,0 +1,30 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Cms\Api\Data\PageInterface;
-+use Magento\Cms\Api\PageRepositoryInterface;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var PageRepositoryInterface $pageRepository */
-+$pageRepository = $objectManager->get(PageRepositoryInterface::class);
-+
-+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
-+$searchCriteria = $searchCriteriaBuilder->addFilter(PageInterface::IDENTIFIER, ['page100', 'page_design_blank'], 'in')
-+    ->create();
-+$result = $pageRepository->getList($searchCriteria);
-+
-+/**
-+ * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
-+ * In that case there is "if" which checks that "page100" and "page_design_blank" still exists in database.
-+ */
-+foreach ($result->getItems() as $item) {
-+    $pageRepository->delete($item);
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
-index f68f3cf37b0..e59672f1b5e 100644
---- a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
-@@ -7,6 +7,8 @@
- namespace Magento\Config\Console\Command;
- 
- use Magento\Config\Model\Config\Backend\Admin\Custom;
-+use Magento\Config\Model\Config\Structure\Converter;
-+use Magento\Config\Model\Config\Structure\Data as StructureData;
- use Magento\Directory\Model\Currency;
- use Magento\Framework\App\Config\ConfigPathResolver;
- use Magento\Framework\App\Config\ScopeConfigInterface;
-@@ -28,7 +30,7 @@ use Symfony\Component\Console\Output\OutputInterface;
- /**
-  * Tests the different flows of config:set command.
-  *
-- * {@inheritdoc}
-+ * @inheritdoc
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @magentoDbIsolation enabled
-  */
-@@ -91,6 +93,8 @@ class ConfigSetCommandTest extends \PHPUnit\Framework\TestCase
-     {
-         Bootstrap::getInstance()->reinitialize();
-         $this->objectManager = Bootstrap::getObjectManager();
-+        $this->extendSystemStructure();
-+
-         $this->scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
-         $this->reader = $this->objectManager->get(FileReader::class);
-         $this->filesystem = $this->objectManager->get(Filesystem::class);
-@@ -123,6 +127,21 @@ class ConfigSetCommandTest extends \PHPUnit\Framework\TestCase
-         $this->appConfig->reinit();
-     }
- 
-+    /**
-+     * Add test system structure to main system structure
-+     *
-+     * @return void
-+     */
-+    private function extendSystemStructure()
-+    {
-+        $document = new \DOMDocument();
-+        $document->load(__DIR__ . '/../../_files/system.xml');
-+        $converter = $this->objectManager->get(Converter::class);
-+        $systemConfig = $converter->convert($document);
-+        $structureData = $this->objectManager->get(StructureData::class);
-+        $structureData->merge($systemConfig);
-+    }
-+
-     /**
-      * @return array
-      */
-@@ -191,6 +210,8 @@ class ConfigSetCommandTest extends \PHPUnit\Framework\TestCase
-             ['general/region/display_all', '1'],
-             ['general/region/state_required', 'BR,FR', ScopeInterface::SCOPE_WEBSITE, 'base'],
-             ['admin/security/use_form_key', '0'],
-+            ['general/group/subgroup/field', 'default_value'],
-+            ['general/group/subgroup/field', 'website_value', ScopeInterface::SCOPE_WEBSITE, 'base'],
-         ];
-     }
- 
-@@ -292,8 +313,7 @@ class ConfigSetCommandTest extends \PHPUnit\Framework\TestCase
-      * @param string $scope
-      * @param $scopeCode string|null
-      * @dataProvider configSetValidationErrorDataProvider
--     *
--     * @magentoDbIsolation enabled
-+     * @magentoDbIsolation disabled
-      */
-     public function testConfigSetValidationError(
-         $path,
-@@ -307,6 +327,7 @@ class ConfigSetCommandTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * Data provider for testConfigSetValidationError
-+     *
-      * @return array
-      */
-     public function configSetValidationErrorDataProvider()
-@@ -399,7 +420,6 @@ class ConfigSetCommandTest extends \PHPUnit\Framework\TestCase
-      * Saving values with successful validation
-      *
-      * @dataProvider configSetValidDataProvider
--     *
-      * @magentoDbIsolation enabled
-      */
-     public function testConfigSetValid()
-diff --git a/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php
-index 2ad15fbea6c..24b68e804cd 100644
---- a/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php
-@@ -7,12 +7,16 @@
- namespace Magento\Config\Controller\Adminhtml\System;
- 
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- 
- /**
-  * @magentoAppArea adminhtml
-  */
- class ConfigTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
-+    /**
-+     * Test Configuration page existing.
-+     */
-     public function testEditAction()
-     {
-         $this->dispatch('backend/admin/system_config/edit');
-@@ -20,6 +24,8 @@ class ConfigTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-     }
- 
-     /**
-+     * Test redirect after changing base URL.
-+     *
-      * @magentoAppIsolation enabled
-      * @magentoDbIsolation enabled
-      */
-@@ -43,6 +49,8 @@ class ConfigTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-         )->setParam(
-             'section',
-             'web'
-+        )->setMethod(
-+            HttpRequest::METHOD_POST
-         );
-         $this->dispatch('backend/admin/system_config/save');
- 
-@@ -60,7 +68,9 @@ class ConfigTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-     }
- 
-     /**
--     * Reset test framework default base url
-+     * Reset test framework default base url.
-+     *
-+     * @param string $defaultHost
-      */
-     protected function resetBaseUrl($defaultHost)
-     {
-diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ConverterStub.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ConverterStub.php
-new file mode 100644
-index 00000000000..7493d31f02b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ConverterStub.php
-@@ -0,0 +1,38 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Config\Model\Config\Structure\Reader;
-+
-+use Magento\Config\Model\Config\Structure\Converter;
-+
-+/**
-+ * Class ConverterStub used for ReaderTest.
-+ */
-+class ConverterStub extends Converter
-+{
-+    /**
-+     * Convert dom document wrapper.
-+     *
-+     * @param \DOMDocument $document
-+     * @return array|null
-+     */
-+    public function getArrayData(\DOMDocument $document)
-+    {
-+        return $this->_convertDOMDocument($document);
-+    }
-+
-+    /**
-+     * Convert dom document.
-+     *
-+     * @param \DOMNode $source
-+     * @return array
-+     */
-+    public function convert($source)
-+    {
-+        return $this->_convertDOMDocument($source);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderStub.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderStub.php
-new file mode 100644
-index 00000000000..866ff91678e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderStub.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Config\Model\Config\Structure\Reader;
-+
-+use Magento\Config\Model\Config\Structure\Reader;
-+
-+/**
-+ * Class ReaderStub used for testing protected Reader::_readFiles() method.
-+ */
-+class ReaderStub extends Reader
-+{
-+    /**
-+     * Wrapper for protected Reader::_readFiles() method.
-+     *
-+     * @param array $fileList
-+     * @return array
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function readFiles(array $fileList)
-+    {
-+        return $this->_readFiles($fileList);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php
-new file mode 100644
-index 00000000000..eef8e68458d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php
-@@ -0,0 +1,146 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Config\Model\Config\Structure\Reader;
-+
-+use Magento\Config\Model\Config\SchemaLocator;
-+use Magento\Framework\App\Utility\Files;
-+use Magento\Framework\Config\Dom;
-+use Magento\Framework\Config\FileResolverInterface;
-+use Magento\Framework\Config\ValidationStateInterface;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\View\TemplateEngine\Xhtml\CompilerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Class ReaderTest check Magento\Config\Model\Config\Structure\Reader::_readFiles() method.
-+ */
-+class ReaderTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Test config location.
-+     *
-+     * @string
-+     */
-+    const CONFIG = '/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/';
-+
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var Files
-+     */
-+    private $fileUtility;
-+
-+    /**
-+     * @var ValidationStateInterface
-+     */
-+    private $validationStateMock;
-+
-+    /**
-+     * @var \Magento\Framework\Config\SchemaLocatorInterface
-+     */
-+    private $schemaLocatorMock;
-+
-+    /**
-+     * @var FileResolverInterface
-+     */
-+    private $fileResolverMock;
-+
-+    /**
-+     * @var ReaderStub
-+     */
-+    private $reader;
-+
-+    /**
-+     * @var ConverterStub
-+     */
-+    private $converter;
-+
-+    /**
-+     * @var CompilerInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $compiler;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->fileUtility = Files::init();
-+
-+        $this->validationStateMock = $this->getMockBuilder(ValidationStateInterface::class)
-+            ->setMethods(['isValidationRequired'])
-+            ->getMockForAbstractClass();
-+        $this->schemaLocatorMock = $this->getMockBuilder(SchemaLocator::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getPerFileSchema'])
-+            ->getMock();
-+        $this->fileResolverMock = $this->getMockBuilder(FileResolverInterface::class)
-+            ->getMockForAbstractClass();
-+
-+        $this->validationStateMock->expects($this->atLeastOnce())
-+            ->method('isValidationRequired')
-+            ->willReturn(false);
-+        $this->schemaLocatorMock->expects($this->atLeastOnce())
-+            ->method('getPerFileSchema')
-+            ->willReturn(false);
-+
-+        $this->converter = $this->objectManager->create(ConverterStub::class);
-+
-+        //Isolate test from actual configuration, and leave only sample data.
-+        $this->compiler = $this->getMockBuilder(CompilerInterface::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['compile'])
-+            ->getMockForAbstractClass();
-+
-+        $this->reader = $this->objectManager->create(
-+            ReaderStub::class,
-+            [
-+                'fileResolver' => $this->fileResolverMock,
-+                'converter' => $this->converter,
-+                'schemaLocator' => $this->schemaLocatorMock,
-+                'validationState' => $this->validationStateMock,
-+                'fileName' => 'no_existing_file.xml',
-+                'compiler' => $this->compiler,
-+                'domDocumentClass' => Dom::class
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * The test checks the file structure after processing the nodes responsible for inserting content.
-+     *
-+     * @return void
-+     */
-+    public function testXmlConvertedConfigurationAndCompereStructure()
-+    {
-+        $actual = $this->reader->readFiles(['actual' => $this->getContent()]);
-+
-+        $document = new \DOMDocument();
-+        $document->loadXML($this->getContent());
-+
-+        $expected = $this->converter->getArrayData($document);
-+
-+        $this->assertEquals($expected, $actual);
-+    }
-+
-+    /**
-+     * Get config sample data for test.
-+     *
-+     * @return string
-+     */
-+    protected function getContent()
-+    {
-+        $files = $this->fileUtility->getFiles([BP . static::CONFIG], 'config.xml');
-+
-+        return file_get_contents(reset($files));
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml
-new file mode 100644
-index 00000000000..f473af1bce3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml
-@@ -0,0 +1,373 @@
-+<?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_Config:etc/system_file.xsd">
-+    <system>
-+        <section id="payment">
-+            <group id="account" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
-+                <label>Merchant Location</label>
-+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-+                <field id="merchant_country" type="select" translate="label comment" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
-+                    <label>Merchant Country</label>
-+                    <comment>If not specified, Default Country from General Config will be used</comment>
-+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Country</frontend_model>
-+                    <source_model>Magento\Paypal\Model\System\Config\Source\MerchantCountry</source_model>
-+                    <backend_model>Magento\Paypal\Model\System\Config\Backend\MerchantCountry</backend_model>
-+                    <config_path>paypal/general/merchant_country</config_path>
-+                </field>
-+            </group>
-+            <group id="recommended_solutions" translate="label" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <label>Recommended Solutions:</label>
-+                <fieldset_css>paypal-top-section paypal-recommended-header</fieldset_css>
-+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-+            </group>
-+            <group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <label>Other PayPal Payment Solutions:</label>
-+                <fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
-+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-+            </group>
-+            <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <label>Other Payment Methods:</label>
-+                <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
-+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-+            </group>
-+        </section>
-+        <section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">
-+            <include path="Magento_Paypal::system/paypal_payflowpro.xml"/>
-+            <include path="Magento_Paypal::system/payflow_link.xml"/>
-+            <include path="Magento_Paypal::system/express_checkout.xml"/>
-+            <include path="Magento_Paypal::system/payments_pro_hosted_solution.xml"/>
-+            <group id="payments_pro_hosted_solution_without_bml" extends="payments_pro_hosted_solution">
-+                <group id="pphs_required_settings">
-+                    <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-+                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-+                    <group id="pphs_advertise_bml" showInDefault="0" showInWebsite="0"/>
-+                </group>
-+            </group>
-+        </section>
-+        <section id="payment_us" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-+            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
-+                <group id="express_checkout_us" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-+                    <label>PayPal Express Checkout</label>
-+                    <fieldset_css>complex paypal-express-section</fieldset_css>
-+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-+                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-+                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-+                    <attribute type="shared">0</attribute>
-+                    <attribute type="activity_path">payment/paypal_express/active</attribute>
-+                    <attribute type="activity_path">payment/payflow_express/active</attribute>
-+                    <attribute type="displayIn">recommended_solutions</attribute>
-+                </group>
-+            </group>
-+            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
-+                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
-+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-+                <comment>Choose a secure bundled payment solution for your business.</comment>
-+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-+                <include path="Magento_Paypal::system/payflow_advanced.xml"/>
-+                <group id="wpp_usuk" translate="label" sortOrder="40" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout">
-+                    <label>Payments Pro</label>
-+                    <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
-+                    <group id="configuration_details">
-+                        <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-+                    </group>
-+                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-+                        <field id="enable_paypal_payflow">
-+                            <attribute type="shared">0</attribute>
-+                            <config_path>payment/paypal_payment_pro/active</config_path>
-+                        </field>
-+                        <group id="paypal_payflow_api_settings" translate="label">
-+                            <label>Payments Pro and Express Checkout</label>
-+                        </group>
-+                    </group>
-+                    <group id="settings_paypal_payflow" translate="label">
-+                        <label>Basic Settings - PayPal Payments Pro</label>
-+                    </group>
-+                </group>
-+                <group id="wps_express" extends="payment_all_paypal/express_checkout">
-+                    <label>Payments Standard</label>
-+                    <comment>Accept credit card and PayPal payments securely.</comment>
-+                    <attribute type="activity_path">payment/wps_express/active</attribute>
-+                    <group id="configuration_details">
-+                        <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-+                    </group>
-+                    <group id="express_checkout_required">
-+                        <group id="express_checkout_required_express_checkout">
-+                            <label>Payments Standard</label>
-+                        </group>
-+                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-+                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
-+                        <field id="enable_express_checkout">
-+                            <config_path>payment/wps_express/active</config_path>
-+                        </field>
-+                        <field id="enable_express_checkout_bml">
-+                            <config_path>payment/wps_express_bml/active</config_path>
-+                        </field>
-+                    </group>
-+                    <group id="settings_ec">
-+                        <label>Basic Settings - PayPal Website Payments Standard</label>
-+                    </group>
-+                </group>
-+            </group>
-+            <group id="paypal_payment_gateways" translate="label" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
-+                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
-+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-+                <include path="Magento_Paypal::system/paypal_payflowpro_with_express_checkout.xml"/>
-+                <group id="payflow_link_us" extends="payment_all_paypal/payflow_link"/>
-+            </group>
-+        </section>
-+        <section id="payment_gb" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
-+            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
-+                <group id="express_checkout_gb" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-+                    <label>PayPal Express Checkout</label>
-+                    <fieldset_css>complex paypal-express-section</fieldset_css>
-+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-+                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-+                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-+                    <attribute type="displayIn">recommended_solutions</attribute>
-+                    <group id="express_checkout_required">
-+                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-+                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-+                    </group>
-+                </group>
-+            </group>
-+            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
-+                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
-+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-+                <comment>Choose a secure bundled payment solution for your business.</comment>
-+                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-+                <group id="wpp_usuk" translate="comment" sortOrder="20">
-+                    <fieldset_css>pp-general-uk</fieldset_css>
-+                    <demo_link>http://www.youtube.com/watch?v=LBe-TW87eGI&amp;list=PLF18B1094ABCD7CE8&amp;index=1&amp;feature=plpp_video</demo_link>
-+                    <comment>Accept payments with a completely customizable checkout page.</comment>
-+                    <group id="wpp_required_settings">
-+                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-+                        <group id="wpp_advertise_bml" showInDefault="0" showInWebsite="0"/>
-+                    </group>
-+                </group>
-+                <include path="Magento_Paypal::system/payments_pro_hosted_solution_with_express_checkout.xml"/>
-+                <group id="wps_express" extends="payment_all_paypal/express_checkout" sortOrder="50">
-+                    <label>Website Payments Standard</label>
-+                    <comment>Accept credit card and PayPal payments securely.</comment>
-+                    <attribute type="activity_path">payment/wps_express/active</attribute>
-+                    <group id="configuration_details">
-+                        <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-+                    </group>
-+                    <group id="express_checkout_required">
-+                        <group id="express_checkout_required_express_checkout">
-+                            <label>Website Payments Standard</label>
-+                        </group>
-+                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-+                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
-+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-+                        <field id="enable_express_checkout">
-+                            <config_path>payment/wps_express/active</config_path>
-+                        </field>
-+                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-+                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-+                    </group>
-+                    <group id="settings_ec">
-+                        <label>Basic Settings - PayPal Website Payments Standard</label>
-+                    </group>
-+                </group>
-+            </group>
-+        </section>
-+        <section id="payment_de" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-+            <group id="paypal_payment_solutions" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
-+                <group id="express_checkout_de" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-+                    <label>PayPal Express Checkout</label>
-+                    <fieldset_css>complex paypal-express-section</fieldset_css>
-+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-+                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-+                    <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-+                    <attribute type="displayIn">recommended_solutions</attribute>
-+                    <group id="express_checkout_required">
-+                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-+                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-+                    </group>
-+                    <group id="settings_ec">
-+                        <group id="settings_ec_advanced">
-+                            <field id="solution_type" showInDefault="0" showInWebsite="0"/>
-+                        </group>
-+                    </group>
-+                </group>
-+            </group>
-+        </section>
-+        <section id="payment_other" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-+            <group id="express_checkout_other" translate="label comment" sortOrder="5" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <label>PayPal Express Checkout</label>
-+                <fieldset_css>complex paypal-express-section</fieldset_css>
-+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-+                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-+                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-+                <attribute type="displayIn">recommended_solutions</attribute>
-+                <group id="express_checkout_required">
-+                    <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-+                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-+                    <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-+                </group>
-+            </group>
-+            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
-+                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
-+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-+                <comment>Choose a secure bundled payment solution for your business.</comment>
-+                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-+                <group id="wps_other" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-+                    <label>Website Payments Standard</label>
-+                    <fieldset_css>complex</fieldset_css>
-+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-+                    <comment>Accept credit card and PayPal payments securely.</comment>
-+                    <attribute type="activity_path">payment/wps_express/active</attribute>
-+                    <group id="configuration_details">
-+                        <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-+                    </group>
-+                    <group id="express_checkout_required">
-+                        <group id="express_checkout_required_express_checkout">
-+                            <label>Website Payments Standard</label>
-+                        </group>
-+                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-+                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
-+                        <field id="enable_express_checkout">
-+                            <config_path>payment/wps_express/active</config_path>
-+                        </field>
-+                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-+                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-+                    </group>
-+                    <group id="settings_ec">
-+                        <label>Basic Settings - PayPal Website Payments Standard</label>
-+                    </group>
-+                </group>
-+            </group>
-+            <group id="paypal_payment_gateways" translate="label comment" sortOrder="8" showInDefault="0" showInWebsite="0" showInStore="0">
-+                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
-+                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
-+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-+                <comment>Process payments using your own internet merchant account.</comment>
-+                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-+            </group>
-+        </section>
-+        <section id="payment_ca" extends="payment_other">
-+            <group id="express_checkout_other">
-+                <attribute type="activity_path">payment/paypal_express/active</attribute>
-+                <attribute type="activity_path">payment/payflow_express/active</attribute>
-+            </group>
-+            <group id="paypal_group_all_in_one">
-+                <group id="wps_other" sortOrder="20"/>
-+            </group>
-+            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
-+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-+                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
-+                <group id="wpp_ca" translate="label" extends="payment_all_paypal/paypal_payflowpro" sortOrder="30">
-+                    <label>Website Payments Pro</label>
-+                    <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
-+                    <group id="configuration_details">
-+                        <comment>https://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-+                    </group>
-+                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-+                        <group id="paypal_payflow_api_settings">
-+                            <label>Payments Pro</label>
-+                        </group>
-+                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-+                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
-+                        <field id="enable_paypal_payflow">
-+                            <frontend_class>paypal-enabler paypal-ec-pe</frontend_class>
-+                            <attribute type="shared">0</attribute>
-+                            <config_path>payment/paypal_payment_pro/active</config_path>
-+                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-+                        </field>
-+                    </group>
-+                    <group id="settings_paypal_payflow">
-+                        <label>Basic Settings - PayPal Payments Pro</label>
-+                    </group>
-+                </group>
-+                <group id="paypal_payflowpro_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="40"/>
-+                <group id="payflow_link_ca" extends="payment_all_paypal/payflow_link" sortOrder="50">
-+                    <group id="payflow_link_required">
-+                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-+                        <group id="payflow_link_advertise_bml" showInDefault="0" showInWebsite="0"/>
-+                    </group>
-+                </group>
-+            </group>
-+        </section>
-+        <section id="payment_au" extends="payment_other">
-+            <group id="express_checkout_other"/>
-+            <group id="paypal_group_all_in_one">
-+                <group id="wps_other" sortOrder="12"/>
-+                <group id="payments_pro_hosted_solution_au" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
-+            </group>
-+            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <group id="paypal_payflowpro_au" extends="payment_all_paypal/paypal_payflowpro" sortOrder="20"/>
-+            </group>
-+        </section>
-+        <section id="payment_jp" extends="payment_other">
-+            <group id="express_checkout_other"/>
-+            <group id="paypal_group_all_in_one">
-+                <group id="wps_other" sortOrder="12"/>
-+                <group id="payments_pro_hosted_solution_jp" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
-+                    <label>Website Payments Plus</label>
-+                </group>
-+            </group>
-+        </section>
-+        <section id="payment_fr" extends="payment_other">
-+            <group id="express_checkout_other"/>
-+            <group id="paypal_group_all_in_one">
-+                <group id="wps_other" sortOrder="12"/>
-+                <group id="payments_pro_hosted_solution_fr" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
-+                    <label>Integral Evolution</label>
-+                </group>
-+            </group>
-+        </section>
-+        <section id="payment_it" extends="payment_other">
-+            <group id="express_checkout_other"/>
-+            <group id="paypal_group_all_in_one">
-+                <group id="wps_other" sortOrder="12"/>
-+                <group id="payments_pro_hosted_solution_it" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
-+                    <label>Pro</label>
-+                </group>
-+            </group>
-+        </section>
-+        <section id="payment_es" extends="payment_other">
-+            <group id="express_checkout_other"/>
-+            <group id="paypal_group_all_in_one">
-+                <group id="wps_other" sortOrder="12"/>
-+                <group id="payments_pro_hosted_solution_es" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
-+                    <label>Pasarela integral</label>
-+                </group>
-+            </group>
-+        </section>
-+        <section id="payment_hk" extends="payment_other">
-+            <group id="express_checkout_other"/>
-+            <group id="paypal_group_all_in_one">
-+                <group id="wps_other" sortOrder="12"/>
-+                <group id="payments_pro_hosted_solution_hk" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
-+            </group>
-+        </section>
-+        <section id="payment_nz" extends="payment_other">
-+            <group id="express_checkout_other"/>
-+            <group id="paypal_group_all_in_one">
-+                <group id="wps_other"/>
-+            </group>
-+            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
-+                <group id="paypal_payflowpro_nz" extends="payment_all_paypal/paypal_payflowpro"/>
-+            </group>
-+        </section>
-+    </system>
-+</config>
-diff --git a/dev/tests/integration/testsuite/Magento/Config/_files/system.xml b/dev/tests/integration/testsuite/Magento/Config/_files/system.xml
-new file mode 100644
-index 00000000000..f0063a3c0bf
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Config/_files/system.xml
-@@ -0,0 +1,20 @@
-+<?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_Config:etc/system_file.xsd">
-+    <system>
-+        <section id="general">
-+            <group id="group">
-+                <group id="subgroup">
-+                    <field id="field" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
-+                        <label>Label</label>
-+                    </field>
-+                </group>
-+            </group>
-+        </section>
-+    </system>
-+</config>
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php
-index 5184a375633..338daa56450 100644
---- a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php
-@@ -9,7 +9,10 @@ use Magento\CatalogImportExport\Model\AbstractProductExportImportTestCase;
- 
- class ConfigurableTest extends AbstractProductExportImportTestCase
- {
--    public function exportImportDataProvider()
-+    /**
-+     * @return array
-+     */
-+    public function exportImportDataProvider(): array
-     {
-         return [
-             'configurable-product' => [
-@@ -34,11 +37,12 @@ class ConfigurableTest extends AbstractProductExportImportTestCase
-     }
- 
-     /**
--     * @param \Magento\Catalog\Model\Product $expectedProduct
--     * @param \Magento\Catalog\Model\Product $actualProduct
-+     * @inheritdoc
-      */
--    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
--    {
-+    protected function assertEqualsSpecificAttributes(
-+        \Magento\Catalog\Model\Product $expectedProduct,
-+        \Magento\Catalog\Model\Product $actualProduct
-+    ): void {
-         /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable $productType */
-         $productType = $expectedProduct->getTypeInstance();
-         $expectedAssociatedProducts = $productType->getUsedProductCollection($expectedProduct);
-@@ -95,12 +99,16 @@ class ConfigurableTest extends AbstractProductExportImportTestCase
-         }
-     }
- 
--    public function importReplaceDataProvider()
--    {
--        $data = $this->exportImportDataProvider();
--        foreach ($data as $key => $value) {
--            $data[$key][2] = array_merge($value[2], ['_cache_instance_product_set_attributes']);
--        }
--        return $data;
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function executeImportReplaceTest(
-+        $skus,
-+        $skippedAttributes,
-+        $usePagination = false,
-+        string $csvfile = null
-+    ) {
-+        $skippedAttributes = array_merge($skippedAttributes, ['_cache_instance_product_set_attributes']);
-+        parent::executeImportReplaceTest($skus, $skippedAttributes, $usePagination, $csvfile);
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php
-index 4254a6ce9c7..b71507ae43f 100644
---- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php
-@@ -9,6 +9,7 @@ use Magento\Catalog\Model\Product;
- use Magento\Framework\Registry;
- use Magento\TestFramework\ObjectManager;
- use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- 
- /**
-  * @magentoAppArea adminhtml
-@@ -23,6 +24,7 @@ class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendControl
-     {
-         $associatedProductIds = ['3', '14', '15', '92'];
-         $associatedProductIdsJSON = json_encode($associatedProductIds);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue(
-             [
-                 'id' => 1,
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php
-index 4e0b74ba0f9..0d93d3ad4f4 100644
---- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php
-@@ -9,6 +9,8 @@
-  */
- namespace Magento\ConfigurableProduct\Controller;
- 
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+
- class CartTest extends \Magento\TestFramework\TestCase\AbstractController
- {
-     /**
-@@ -85,6 +87,7 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController
-             'remove' => 0,
-             'coupon_code' => 'test'
-         ];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($inputData);
-         $this->dispatch(
-             'checkout/cart/couponPost/'
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php
-new file mode 100644
-index 00000000000..1fffd701c50
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php
-@@ -0,0 +1,73 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\ConfigurableProduct\Model\Plugin\Frontend;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\Interception\PluginList;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Test configurable fronted product plugin will add children products ids to configurable product identities.
-+ */
-+class ProductIdentitiesExtenderTest extends TestCase
-+{
-+    /**
-+     * Check, product identities extender plugin is registered for storefront.
-+     *
-+     * @magentoAppArea frontend
-+     * @return void
-+     */
-+    public function testIdentitiesExtenderIsRegistered(): void
-+    {
-+        $pluginInfo = Bootstrap::getObjectManager()->get(PluginList::class)
-+            ->get(\Magento\Catalog\Model\Product::class, []);
-+        $this->assertSame(ProductIdentitiesExtender::class, $pluginInfo['product_identities_extender']['instance']);
-+    }
-+
-+    /**
-+     * Check plugin will add children ids to configurable product identities on storefront.
-+     *
-+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-+     * @magentoAppArea frontend
-+     * @return void
-+     */
-+    public function testGetIdentitiesForConfigurableProductOnStorefront(): void
-+    {
-+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+        $configurableProduct = $productRepository->get('configurable');
-+        $simpleProduct1 = $productRepository->get('simple_10');
-+        $simpleProduct2 = $productRepository->get('simple_20');
-+        $expectedIdentities = [
-+            'cat_p_' . $configurableProduct->getId(),
-+            'cat_p',
-+            'cat_p_' . $simpleProduct1->getId(),
-+            'cat_p_' . $simpleProduct2->getId(),
-+
-+        ];
-+        $this->assertEquals($expectedIdentities, $configurableProduct->getIdentities());
-+    }
-+
-+    /**
-+     * Check plugin won't add children ids to configurable product identities in admin area.
-+     *
-+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-+     * @magentoAppArea adminhtml
-+     * @return void
-+     */
-+    public function testGetIdentitiesForConfigurableProductInAdminArea(): void
-+    {
-+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+        $configurableProduct = $productRepository->get('configurable');
-+        $expectedIdentities = [
-+            'cat_p_' . $configurableProduct->getId(),
-+        ];
-+        $this->assertEquals($expectedIdentities, $configurableProduct->getIdentities());
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
-index 01a7ae6087e..78fa4733a25 100644
---- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
-@@ -4,6 +4,8 @@
-  * See COPYING.txt for license details.
-  */
- 
-+// @codingStandardsIgnoreFile
-+
- namespace Magento\ConfigurableProduct\Model\Product\Type;
- 
- use Magento\Catalog\Api\Data\ProductInterface;
-@@ -128,6 +130,10 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($testConfigurable->getData(), $attributes[$attributeId]->getData());
-     }
- 
-+    /**
-+     * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-+     */
-     public function testGetConfigurableAttributes()
-     {
-         $collection = $this->model->getConfigurableAttributes($this->product);
-@@ -151,6 +157,19 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-         }
-     }
- 
-+    /**
-+     * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable_custom.php
-+     */
-+    public function testGetConfigurableAttributesWithSourceModel()
-+    {
-+        $collection = $this->model->getConfigurableAttributes($this->product);
-+        /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute $configurableAttribute */
-+        $configurableAttribute = $collection->getFirstItem();
-+        $attribute = $this->_getAttributeByCode('test_configurable_with_sm');
-+        $this->assertSameSize($attribute->getSource()->getAllOptions(), $configurableAttribute->getOptions());
-+    }
-+
-     /**
-      * @magentoAppIsolation enabled
-      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-@@ -319,8 +338,7 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-         $attribute = reset($attributes);
-         $optionValueId = $attribute['values'][0]['value_index'];
- 
--        $product->addCustomOption(
--            'attributes',
-+        $product->addCustomOption('attributes',
-             $serializer->serialize([$attribute['attribute_id'] => $optionValueId])
-         );
- 
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
-index 66091c108f0..32eddb28151 100644
---- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
-@@ -12,11 +12,18 @@ use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
- use Magento\Store\Model\Store;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\CatalogInventory\Model\Stock;
-+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Catalog\Api\Data\ProductInterface;
- 
- /**
-+ * Configurable test
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @magentoAppArea adminhtml
-  */
--class ConfigurableTest extends \PHPUnit\Framework\TestCase
-+class ConfigurableTest extends TestCase
- {
-     /**
-      * @var StoreManagerInterface
-@@ -28,26 +35,36 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-      */
-     private $productRepository;
- 
--    protected function setUp()
-+    /**
-+     * @var StockItemRepositoryInterface
-+     */
-+    private $stockRepository;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-     {
-         $this->storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
-         $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+        $this->stockRepository = Bootstrap::getObjectManager()->get(StockItemRepositoryInterface::class);
-     }
- 
-     /**
-+     * Test get product final price if one of child is disabled
-+     *
-      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-      * @magentoDbIsolation disabled
-+     *
-+     * @return void
-+     * @throws \Magento\Framework\Exception\CouldNotSaveException
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\StateException
-      */
--    public function testGetProductFinalPriceIfOneOfChildIsDisabled()
-+    public function testGetProductFinalPriceIfOneOfChildIsDisabled(): void
-     {
--        /** @var Collection $collection */
--        $collection = Bootstrap::getObjectManager()->get(CollectionFactory::class)
--            ->create();
--        $configurableProduct = $collection
--            ->addIdFilter([1])
--            ->addMinimalPrice()
--            ->load()
--            ->getFirstItem();
-+        $configurableProduct = $this->getConfigurableProductFromCollection();
-         $this->assertEquals(10, $configurableProduct->getMinimalPrice());
- 
-         $childProduct = $this->productRepository->getById(10, false, null, true);
-@@ -58,34 +75,28 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-         $this->productRepository->save($childProduct);
-         $this->storeManager->setCurrentStore($currentStoreId);
- 
--        /** @var Collection $collection */
--        $collection = Bootstrap::getObjectManager()->get(CollectionFactory::class)
--            ->create();
--        $configurableProduct = $collection
--            ->addIdFilter([1])
--            ->addMinimalPrice()
--            ->load()
--            ->getFirstItem();
-+        $configurableProduct = $this->getConfigurableProductFromCollection();
-         $this->assertEquals(20, $configurableProduct->getMinimalPrice());
-     }
- 
-     /**
-+     * Test get product final price if one of child is disabled per store
-+     *
-      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-      * @magentoDbIsolation disabled
-+     *
-+     * @return void
-+     * @throws \Magento\Framework\Exception\CouldNotSaveException
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\StateException
-      */
--    public function testGetProductFinalPriceIfOneOfChildIsDisabledPerStore()
-+    public function testGetProductFinalPriceIfOneOfChildIsDisabledPerStore(): void
-     {
--        /** @var Collection $collection */
--        $collection = Bootstrap::getObjectManager()->get(CollectionFactory::class)
--            ->create();
--        $configurableProduct = $collection
--            ->addIdFilter([1])
--            ->addMinimalPrice()
--            ->load()
--            ->getFirstItem();
-+        $configurableProduct = $this->getConfigurableProductFromCollection();
-         $this->assertEquals(10, $configurableProduct->getMinimalPrice());
- 
--        $childProduct = $this->productRepository->getById(10, false, null, true);
-+        $childProduct = $this->productRepository->get('simple_10', false, null, true);
-         $childProduct->setStatus(Status::STATUS_DISABLED);
- 
-         // update in default store scope
-@@ -95,14 +106,53 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
-         $this->productRepository->save($childProduct);
-         $this->storeManager->setCurrentStore($currentStoreId);
- 
-+        $configurableProduct = $this->getConfigurableProductFromCollection();
-+        $this->assertEquals(20, $configurableProduct->getMinimalPrice());
-+    }
-+
-+    /**
-+     * Test get product minimal price if one child is out of stock
-+     *
-+     * @magentoConfigFixture current_store cataloginventory/options/show_out_of_stock 1
-+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-+     * @magentoDbIsolation disabled
-+     *
-+     * @return void
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    public function testGetProductMinimalPriceIfOneOfChildIsOutOfStock(): void
-+    {
-+        $configurableProduct = $this->getConfigurableProductFromCollection();
-+        $this->assertEquals(10, $configurableProduct->getMinimalPrice());
-+
-+        $childProduct = $this->productRepository->getById(10, false, null, true);
-+        $stockItem = $childProduct->getExtensionAttributes()->getStockItem();
-+        $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
-+        $this->stockRepository->save($stockItem);
-+
-+        $configurableProduct = $this->getConfigurableProductFromCollection();
-+        $this->assertEquals(20, $configurableProduct->getMinimalPrice());
-+    }
-+
-+    /**
-+     * Retrieve configurable product.
-+     * Returns Configurable product that was created by Magento/ConfigurableProduct/_files/product_configurable.php
-+     * fixture
-+     *
-+     * @return ProductInterface
-+     */
-+    private function getConfigurableProductFromCollection(): ProductInterface
-+    {
-         /** @var Collection $collection */
-         $collection = Bootstrap::getObjectManager()->get(CollectionFactory::class)
-             ->create();
-+        /** @var ProductInterface $configurableProduct */
-         $configurableProduct = $collection
-             ->addIdFilter([1])
-             ->addMinimalPrice()
-             ->load()
-             ->getFirstItem();
--        $this->assertEquals(20, $configurableProduct->getMinimalPrice());
-+
-+        return $configurableProduct;
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerWithDimensionTest.php
-new file mode 100644
-index 00000000000..578cb47d146
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerWithDimensionTest.php
-@@ -0,0 +1,112 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ConfigurableProduct\Pricing\Price;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Indexer\Product\Price\Processor;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
-+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * @magentoDbIsolation disabled
-+ * @group indexer_dimension
-+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
-+ */
-+class SpecialPriceIndexerWithDimensionTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var ProductRepositoryInterface
-+     */
-+    private $productRepository;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $productCollectionFactory;
-+
-+    /**
-+     * @var Processor
-+     */
-+    private $indexerProcessor;
-+
-+    /**
-+     * Set up
-+     */
-+    protected function setUp()
-+    {
-+        $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+        $this->productCollectionFactory = Bootstrap::getObjectManager()->get(CollectionFactory::class);
-+        $this->indexerProcessor = Bootstrap::getObjectManager()->get(Processor::class);
-+    }
-+
-+    /**
-+     * Use collection to check data in index
-+     * Do not use magentoDbIsolation because index statement changing "tears" transaction (triggers creating)
-+     *
-+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-+     * @magentoDataFixture Magento/Catalog/_files/enable_price_index_schedule.php
-+     */
-+    public function testFullReindexIfChildHasSpecialPrice()
-+    {
-+        $specialPrice = 2;
-+        /** @var Product $childProduct */
-+        $childProduct = $this->productRepository->get('simple_10', true);
-+        $childProduct->setData('special_price', $specialPrice);
-+        $this->productRepository->save($childProduct);
-+
-+        /** @var ProductCollection $collection */
-+        $collection = $this->productCollectionFactory->create();
-+        $collection
-+            ->addPriceData()
-+            ->addFieldToFilter(ProductInterface::SKU, 'configurable');
-+
-+        /** @var Product[] $items */
-+        $items = array_values($collection->getItems());
-+        self::assertEquals(10, $items[0]->getData('min_price'));
-+
-+        $this->indexerProcessor->reindexAll();
-+
-+        /** @var ProductCollection $collection */
-+        $collection = $this->productCollectionFactory->create();
-+        $collection
-+            ->addPriceData()
-+            ->addFieldToFilter(ProductInterface::SKU, 'configurable');
-+
-+        /** @var Product $item */
-+        $item = $collection->getFirstItem();
-+        self::assertEquals($specialPrice, $item->getData('min_price'));
-+    }
-+
-+    /**
-+     * Use collection to check data in index
-+     *
-+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-+     * @magentoDbIsolation disabled
-+     */
-+    public function testOnSaveIndexationIfChildHasSpecialPrice()
-+    {
-+        $specialPrice = 2;
-+        /** @var Product $childProduct */
-+        $childProduct = $this->productRepository->get('simple_10', true);
-+        $childProduct->setData('special_price', $specialPrice);
-+        $this->productRepository->save($childProduct);
-+
-+        /** @var ProductCollection $collection */
-+        $collection = $this->productCollectionFactory->create();
-+        $collection
-+            ->addPriceData()
-+            ->addFieldToFilter(ProductInterface::SKU, 'configurable');
-+
-+        /** @var Product $item */
-+        $item = $collection->getFirstItem();
-+        self::assertEquals($specialPrice, $item->getData('min_price'));
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagWithDimensionTest.php
-new file mode 100644
-index 00000000000..b2e4fe6af32
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagWithDimensionTest.php
-@@ -0,0 +1,154 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\ConfigurableProduct\Pricing\Render\FinalPriceBox;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Pricing\Price\FinalPrice;
-+use Magento\Catalog\Pricing\Render\FinalPriceBox;
-+use Magento\Framework\Pricing\Render\Amount;
-+use Magento\Framework\Pricing\Render\RendererPool;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * @magentoDbIsolation disabled
-+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
-+ * @group indexer_dimension
-+ * Test price rendering according to is_product_list flag for Configurable product
-+ */
-+class RenderingBasedOnIsProductListFlagWithDimensionTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var ProductInterface
-+     */
-+    private $product;
-+
-+    /**
-+     * @var FinalPrice
-+     */
-+    private $finalPrice;
-+
-+    /**
-+     * @var RendererPool
-+     */
-+    private $rendererPool;
-+
-+    /**
-+     * @var FinalPriceBox
-+     */
-+    private $finalPriceBox;
-+
-+    /**
-+     * Set up
-+     */
-+    protected function setUp()
-+    {
-+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+        $this->product = $productRepository->get('configurable');
-+        $this->finalPrice = Bootstrap::getObjectManager()->create(FinalPrice::class, [
-+            'saleableItem' => $this->product,
-+            'quantity' => null
-+        ]);
-+        $this->rendererPool = Bootstrap::getObjectManager()->create(RendererPool::class);
-+        $this->rendererPool->setData(
-+            [
-+                'default' =>
-+                    [
-+                        'default_amount_render_class' => Amount::class,
-+                        'default_amount_render_template' => 'Magento_Catalog::product/price/amount/default.phtml',
-+                    ],
-+            ]
-+        );
-+        $this->finalPriceBox = Bootstrap::getObjectManager()->create(FinalPriceBox::class, [
-+            'saleableItem' => $this->product,
-+            'price' => $this->finalPrice,
-+            'rendererPool' => $this->rendererPool,
-+        ]);
-+        $this->finalPriceBox->setTemplate('Magento_ConfigurableProduct::product/price/final_price.phtml');
-+
-+        /** @var Product $childProduct */
-+        $childProduct = $productRepository->get('simple_10', true);
-+        $childProduct->setData('special_price', 5.99);
-+        $productRepository->save($childProduct);
-+    }
-+
-+    /**
-+     * Test when is_product_list flag is not specified. Regular and Special price should be rendered
-+     *
-+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-+     * @magentoAppArea frontend
-+     * @magentoDbIsolation disabled
-+     */
-+    public function testRenderingByDefault()
-+    {
-+        $html = $this->finalPriceBox->toHtml();
-+        self::assertContains('5.99', $html);
-+        $this->assertGreaterThanOrEqual(
-+            1,
-+            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
-+                '//*[contains(@class,"normal-price")]',
-+                $html
-+            )
-+        );
-+        $this->assertGreaterThanOrEqual(
-+            1,
-+            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
-+                '//*[contains(@class,"old-price")]',
-+                $html
-+            )
-+        );
-+    }
-+
-+    /**
-+     * Test when is_product_list flag is specified
-+     *
-+     * Special price should be valid
-+     * FinalPriceBox::hasSpecialPrice should not be call
-+     * Regular price for Configurable product should be rendered for is_product_list = false (product page), but not be
-+     * for for is_product_list = true (list of products)
-+     *
-+     * @param bool $flag
-+     * @param int|bool $count
-+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-+     * @magentoAppArea frontend
-+     * @dataProvider isProductListDataProvider
-+     * @magentoDbIsolation disabled
-+     */
-+    public function testRenderingAccordingToIsProductListFlag($flag, $count)
-+    {
-+        $this->finalPriceBox->setData('is_product_list', $flag);
-+        $html = $this->finalPriceBox->toHtml();
-+        self::assertContains('5.99', $html);
-+        $this->assertEquals(
-+            1,
-+            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
-+                '//*[contains(@class,"normal-price")]',
-+                $html
-+            )
-+        );
-+        $this->assertEquals(
-+            $count,
-+            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
-+                '//*[contains(@class,"old-price")]',
-+                $html
-+            )
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function isProductListDataProvider()
-+    {
-+        return [
-+            'is_not_product_list' => [false, 1],
-+            'is_product_list' => [true, 0],
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php
-index 234f0aae6a3..676433c0a1e 100644
---- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php
-@@ -5,7 +5,19 @@
-  */
- namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\Data;
- 
--class AssociatedProductsTest extends \PHPUnit\Framework\TestCase
-+use Magento\Framework\View\Element\UiComponentFactory;
-+use Magento\Ui\Component\Filters\FilterModifier;
-+use Magento\Framework\View\Element\UiComponent\ContextInterface;
-+use Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\ConfigurablePanel;
-+use Magento\Framework\App\RequestInterface;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * AssociatedProductsTest
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class AssociatedProductsTest extends TestCase
- {
-     /**
-      * @var \Magento\Framework\ObjectManagerInterface $objectManager
-@@ -17,7 +29,10 @@ class AssociatedProductsTest extends \PHPUnit\Framework\TestCase
-      */
-     private $registry;
- 
--    public function setUp()
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setUp(): void
-     {
-         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-         $this->registry = $this->objectManager->get(\Magento\Framework\Registry::class);
-@@ -64,6 +79,53 @@ class AssociatedProductsTest extends \PHPUnit\Framework\TestCase
-         }
-     }
- 
-+    /**
-+     * Tests configurable product won't appear in product listing.
-+     *
-+     * Tests configurable product won't appear in configurable associated product listing if its options attribute
-+     * is not filterable in grid.
-+     *
-+     * @return void
-+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-+     * @magentoAppArea adminhtml
-+     */
-+    public function testAddManuallyConfigurationsWithNotFilterableInGridAttribute(): void
-+    {
-+        /** @var RequestInterface $request */
-+        $request = $this->objectManager->get(RequestInterface::class);
-+        $request->setParams([
-+            FilterModifier::FILTER_MODIFIER => [
-+                'test_configurable' => [
-+                    'condition_type' => 'notnull',
-+                ],
-+            ],
-+            'attributes_codes' => [
-+                'test_configurable'
-+            ],
-+        ]);
-+        $context = $this->objectManager->create(ContextInterface::class, ['request' => $request]);
-+        /** @var UiComponentFactory $uiComponentFactory */
-+        $uiComponentFactory = $this->objectManager->get(UiComponentFactory::class);
-+        $uiComponent = $uiComponentFactory->create(
-+            ConfigurablePanel::ASSOCIATED_PRODUCT_LISTING,
-+            null,
-+            ['context' => $context]
-+        );
-+
-+        foreach ($uiComponent->getChildComponents() as $childUiComponent) {
-+            $childUiComponent->prepare();
-+        }
-+
-+        $dataSource = $uiComponent->getDataSourceData();
-+        $skus = array_column($dataSource['data']['items'], 'sku');
-+
-+        $this->assertNotContains(
-+            'configurable',
-+            $skus,
-+            'Only products with specified attribute should be in product list'
-+        );
-+    }
-+
-     /**
-      * @return array
-      */
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model.php
-new file mode 100644
-index 00000000000..1f30d538508
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model.php
-@@ -0,0 +1,38 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+$eavSetup = $objectManager->create(\Magento\Eav\Setup\EavSetup::class);
-+$eavSetup->addAttribute(
-+    \Magento\Catalog\Model\Product::ENTITY,
-+    'test_configurable_with_sm',
-+    [
-+        'group' => 'General',
-+        'type' => 'varchar',
-+        'backend' => '',
-+        'frontend' => '',
-+        'label' => 'Test configurable with source model',
-+        'input' => 'select',
-+        'source' => \Magento\Catalog\Model\Category\Attribute\Source\Mode::class,
-+        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
-+        'visible' => true,
-+        'required' => false,
-+        'user_defined' => true,
-+        'default' => '',
-+        'searchable' => false,
-+        'filterable' => false,
-+        'comparable' => false,
-+        'visible_on_front' => false,
-+        'used_in_product_listing' => true,
-+        'unique' => false,
-+        'apply_to' => ''
-+    ]
-+);
-+
-+$eavConfig = $objectManager->get(\Magento\Eav\Model\Config::class);
-+$eavConfig->clear();
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model_rollback.php
-new file mode 100644
-index 00000000000..8b6861516a8
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model_rollback.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+$registry = $objectManager->get(\Magento\Framework\Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+$eavConfig = $objectManager->get(\Magento\Eav\Model\Config::class);
-+$attribute = $eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'test_configurable_with_sm');
-+if ($attribute instanceof \Magento\Eav\Model\Entity\Attribute\AbstractAttribute && $attribute->getId()) {
-+    $attribute->delete();
-+}
-+$eavConfig->clear();
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test.php
-new file mode 100644
-index 00000000000..3f907c0ad0c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test.php
-@@ -0,0 +1,101 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-+use Magento\Catalog\Setup\CategorySetup;
-+use Magento\Eav\Model\Config;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Eav\Api\AttributeRepositoryInterface;
-+
-+Bootstrap::getInstance()->reinitialize();
-+
-+/** @var $eavConfig Config */
-+$eavConfig = Bootstrap::getObjectManager()->get(Config::class);
-+
-+/** @var $installer CategorySetup */
-+$installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
-+
-+$attributesData = [
-+    [
-+        'code' => 'custom_attr_1',
-+        'label' => 'custom_attr_1',
-+    ],
-+    [
-+        'code' => 'custom_attr_2',
-+        'label' => 'custom_attr_2',
-+    ],
-+];
-+
-+foreach ($attributesData as $attributeData) {
-+    $attribute = $eavConfig->getAttribute('catalog_product', $attributeData['code']);
-+
-+    $eavConfig->clear();
-+
-+
-+    if (!$attribute->getId()) {
-+
-+        /** @var $attribute Attribute */
-+        $attribute = Bootstrap::getObjectManager()->create(
-+            Attribute::class
-+        );
-+
-+        /** @var AttributeRepositoryInterface $attributeRepository */
-+        $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
-+
-+        $attribute->setData(
-+            [
-+                'attribute_code' => $attributeData['code'],
-+                'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
-+                'is_global' => 1,
-+                'is_user_defined' => 1,
-+                'frontend_input' => 'select',
-+                'is_unique' => 0,
-+                'is_required' => 0,
-+                'is_searchable' => 0,
-+                'is_visible_in_advanced_search' => 0,
-+                'is_comparable' => 0,
-+                'is_filterable' => 0,
-+                'is_filterable_in_search' => 0,
-+                'is_used_for_promo_rules' => 0,
-+                'is_html_allowed_on_front' => 1,
-+                'is_visible_on_front' => 0,
-+                'used_in_product_listing' => 0,
-+                'used_for_sort_by' => 0,
-+                'frontend_label' => $attributeData['label'],
-+                'backend_type' => 'int',
-+                'option' => [
-+                    'value' => [
-+                        'option_0' => [
-+                            $attributeData['label'] . ' Option 1'
-+                        ],
-+                        'option_1' => [
-+                            $attributeData['label'] . ' Option 2'
-+                        ],
-+                        'option_2' => [
-+                            $attributeData['label'] . ' Option 3'
-+                        ],
-+                        'option_3' => [
-+                            $attributeData['label'] . ' Option 4'
-+                        ]
-+                    ],
-+                    'order' => [
-+                        'option_0' => 1,
-+                        'option_1' => 2,
-+                        'option_2' => 3,
-+                        'option_3' => 4
-+                    ],
-+                ],
-+            ]
-+        );
-+
-+        $attributeRepository->save($attribute);
-+
-+        /* Assign attribute to attribute set */
-+        $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
-+    }
-+}
-+
-+$eavConfig->clear();
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test_rollback.php
-new file mode 100644
-index 00000000000..c947eaafda3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test_rollback.php
-@@ -0,0 +1,41 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Catalog\Model\ResourceModel\Product\Collection;
-+use Magento\Eav\Model\Config;
-+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var Registry $registry */
-+$registry = Bootstrap::getObjectManager()->get(Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+$productCollection = Bootstrap::getObjectManager()
-+    ->get(Collection::class);
-+foreach ($productCollection as $product) {
-+    $product->delete();
-+}
-+
-+$attributesToDelete = [
-+    'custom_attr_1',
-+    'custom_attr_2',
-+];
-+
-+foreach ($attributesToDelete as $attributeToDelete) {
-+    $eavConfig = Bootstrap::getObjectManager()->get(Config::class);
-+    $attribute = $eavConfig->getAttribute('catalog_product', $attributeToDelete);
-+    if ($attribute instanceof AbstractAttribute
-+        && $attribute->getId()
-+    ) {
-+        $attribute->delete();
-+    }
-+    $eavConfig->clear();
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom.php
-new file mode 100644
-index 00000000000..d0bdf8f2e0b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom.php
-@@ -0,0 +1,92 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require __DIR__ . '/configurable_attribute_with_source_model.php';
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+$installer = $objectManager->create(\Magento\Catalog\Setup\CategorySetup::class);
-+
-+$eavConfig = $objectManager->get(\Magento\Eav\Model\Config::class);
-+$attribute = $eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'test_configurable_with_sm');
-+$options = $attribute->getOptions();
-+
-+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+$attributeValues = [];
-+$associatedProductIds = [];
-+$attributeSetId = $installer->getAttributeSetId(\Magento\Catalog\Model\Product::ENTITY, 'Default');
-+
-+foreach ($options as $key => $option) {
-+    $productId = $key + 10;
-+
-+    $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-+    $product->setTypeId(Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-+        ->setId($productId)
-+        ->setAttributeSetId($attributeSetId)
-+        ->setWebsiteIds([1])
-+        ->setName('Configurable Option ' . $option->getLabel())
-+        ->setSku('simple_' . $productId)
-+        ->setPrice($productId)
-+        ->setTestConfigurableWithSm($option->getValue())
-+        ->setVisibility(Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE)
-+        ->setStatus(Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+        ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
-+    $product = $productRepository->save($product);
-+
-+    $stockItem = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Item::class);
-+    $stockItem->load($productId, 'product_id');
-+    if (!$stockItem->getProductId()) {
-+        $stockItem->setProductId($productId);
-+    }
-+    $stockItem->setUseConfigManageStock(1);
-+    $stockItem->setQty(1000);
-+    $stockItem->setIsQtyDecimal(0);
-+    $stockItem->setIsInStock(1);
-+    $stockItem->save();
-+
-+    $attributeValues[] = [
-+        'label' => 'test',
-+        'attribute_id' => $attribute->getId(),
-+        'value_index' => $option->getValue(),
-+    ];
-+    $associatedProductIds[] = $product->getId();
-+}
-+
-+$optionsFactory = $objectManager->create(\Magento\ConfigurableProduct\Helper\Product\Options\Factory::class);
-+$configurableAttributesData = [
-+    [
-+        'attribute_id' => $attribute->getId(),
-+        'code' => $attribute->getAttributeCode(),
-+        'label' => $attribute->getStoreLabel(),
-+        'position' => '0',
-+        'values' => $attributeValues,
-+    ],
-+];
-+$configurableOptions = $optionsFactory->create($configurableAttributesData);
-+
-+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-+$extensionConfigurableAttributes = $product->getExtensionAttributes();
-+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
-+$extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
-+$product->setExtensionAttributes($extensionConfigurableAttributes);
-+
-+$product->setTypeId(\Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE)
-+    ->setId(1)
-+    ->setAttributeSetId($attributeSetId)
-+    ->setWebsiteIds([1])
-+    ->setName('Configurable Product')
-+    ->setSku('configurable')
-+    ->setVisibility(Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setStatus(Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
-+$productRepository->save($product);
-+
-+$categoryLinkManagement = $objectManager->create(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
-+$categoryLinkManagement->assignProductToCategories(
-+    $product->getSku(),
-+    [2]
-+);
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom_rollback.php
-new file mode 100644
-index 00000000000..eb3db259d4c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom_rollback.php
-@@ -0,0 +1,35 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = $objectManager->get(\Magento\Framework\Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+foreach (['simple_10', 'simple_11', 'simple_12', 'configurable'] as $sku) {
-+    try {
-+        $product = $productRepository->get($sku, true);
-+
-+        $stockStatus = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Status::class);
-+        $stockStatus->load($product->getEntityId(), 'product_id');
-+        $stockStatus->delete();
-+
-+        if ($product->getId()) {
-+            $productRepository->delete($product);
-+        }
-+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+        //Product already removed
-+    }
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-+
-+require __DIR__ . '/configurable_attribute_with_source_model_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute.php
-new file mode 100644
-index 00000000000..69607ffb445
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Eav\Model\Entity\Attribute\FrontendLabel;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+require __DIR__ . '/configurable_products.php';
-+
-+// Add frontend label to created attribute:
-+$frontendLabelAttribute = Bootstrap::getObjectManager()->get(FrontendLabel::class);
-+$frontendLabelAttribute->setStoreId(1);
-+$frontendLabelAttribute->setLabel('Default Store View label');
-+
-+$frontendLabels = $attribute->getFrontendLabels();
-+$frontendLabels[] = $frontendLabelAttribute;
-+
-+$attribute->setFrontendLabels($frontendLabels);
-+$attributeRepository->save($attribute);
-diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute_rollback.php
-new file mode 100644
-index 00000000000..616bd44666e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require __DIR__ . '/configurable_products_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php
-index 2f89cb72b0c..c1255ae9b1a 100644
---- a/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php
-@@ -6,7 +6,7 @@
- 
- namespace Magento\Contact\Controller;
- 
--use Zend\Http\Request;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- 
- /**
-  * Contact index controller test
-@@ -14,7 +14,7 @@ use Zend\Http\Request;
- class IndexTest extends \Magento\TestFramework\TestCase\AbstractController
- {
-     /**
--     * testPostAction
-+     * Test contacting.
-      */
-     public function testPostAction()
-     {
-@@ -24,8 +24,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractController
-             'email' => 'user@example.com',
-             'hideit' => '',
-         ];
--        $this->getRequest()->setPostValue($params);
--        $this->getRequest()->setMethod(Request::METHOD_POST);
-+        $this->getRequest()->setPostValue($params)->setMethod(HttpRequest::METHOD_POST);
- 
-         $this->dispatch('contact/index/post');
-         $this->assertRedirect($this->stringContains('contact/index'));
-@@ -38,14 +37,16 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
-+     * Test validation.
-+     *
-+     * @param array $params For Request.
-+     * @param string $expectedMessage Expected response.
-+     *
-      * @dataProvider dataInvalidPostAction
--     * @param array $params
--     * @param string $expectedMessage
-      */
-     public function testInvalidPostAction($params, $expectedMessage)
-     {
--        $this->getRequest()->setPostValue($params);
--        $this->getRequest()->setMethod(Request::METHOD_POST);
-+        $this->getRequest()->setPostValue($params)->setMethod(HttpRequest::METHOD_POST);
- 
-         $this->dispatch('contact/index/post');
-         $this->assertRedirect($this->stringContains('contact/index'));
-diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php
-index ce83b7d3a6e..8e25e5960a4 100644
---- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php
-@@ -6,12 +6,17 @@
- 
- namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
- 
-+/**
-+ * Fetch Rates Test
-+ */
- class FetchRatesTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
-     /**
-      * Test fetch action without service
-+     *
-+     * @return void
-      */
--    public function testFetchRatesActionWithoutService()
-+    public function testFetchRatesActionWithoutService(): void
-     {
-         $request = $this->getRequest();
-         $request->setParam(
-@@ -28,8 +33,10 @@ class FetchRatesTest extends \Magento\TestFramework\TestCase\AbstractBackendCont
- 
-     /**
-      * Test save action with nonexistent service
-+     *
-+     * @return void
-      */
--    public function testFetchRatesActionWithNonexistentService()
-+    public function testFetchRatesActionWithNonexistentService(): void
-     {
-         $request = $this->getRequest();
-         $request->setParam(
-@@ -43,85 +50,4 @@ class FetchRatesTest extends \Magento\TestFramework\TestCase\AbstractBackendCont
-             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
-         );
-     }
--
--    /**
--     * Test save action with nonexistent service
--     */
--    public function testFetchRatesActionWithServiceErrors()
--    {
--        $this->runActionWithMockedImportService(['We can\'t retrieve a rate from url']);
--
--        $this->assertSessionMessages(
--            $this->contains('Click "Save" to apply the rates we found.'),
--            \Magento\Framework\Message\MessageInterface::TYPE_WARNING
--        );
--    }
--
--    /**
--     * Test save action with nonexistent service
--     */
--    public function testFetchRatesActionWithoutServiceErrors()
--    {
--        $this->runActionWithMockedImportService();
--
--        $this->assertSessionMessages(
--            $this->contains('Click "Save" to apply the rates we found.'),
--            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
--        );
--    }
--
--    /**
--     * Run fetchRates with mocked external import service
--     *
--     * @param array $messages messages from external import service
--     */
--    protected function runActionWithMockedImportService(array $messages = [])
--    {
--        $importServiceMock = $this->getMockBuilder(\Magento\Directory\Model\Currency\Import\Webservicex::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $importServiceMock->method('fetchRates')
--            ->willReturn(['USD' => ['USD' => 1]]);
--
--        $importServiceMock->method('getMessages')
--            ->willReturn($messages);
--
--        $backendSessionMock = $this->getMockBuilder(\Magento\Backend\Model\Session::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $importServiceFactoryMock = $this->getMockBuilder(\Magento\Directory\Model\Currency\Import\Factory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $importServiceFactoryMock->method('create')
--            ->willReturn($importServiceMock);
--
--        $objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $objectManagerMap = [
--            [\Magento\Directory\Model\Currency\Import\Factory::class, $importServiceFactoryMock],
--            [\Magento\Backend\Model\Session::class, $backendSessionMock]
--        ];
--
--        $objectManagerMock->method('get')
--            ->will($this->returnValueMap($objectManagerMap));
--
--        $context =  $this->_objectManager->create(
--            \Magento\Backend\App\Action\Context::class,
--            ["objectManager" => $objectManagerMock]
--        );
--        $registry =  $this->_objectManager->get(\Magento\Framework\Registry::class);
--
--        $this->getRequest()->setParam('rate_services', 'webservicex');
--
--        $action = new \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency\FetchRates(
--            $context,
--            $registry
--        );
--        $action->execute();
--    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
-index c9f2ffad676..fefd1a7b250 100644
---- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
- 
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+
- class SaveRatesTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
- 
-@@ -43,6 +45,7 @@ class SaveRatesTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-         $rate = 1.0000;
- 
-         $request = $this->getRequest();
-+        $request->setMethod(HttpRequest::METHOD_POST);
-         $request->setPostValue(
-             'rate',
-             [
-@@ -75,6 +78,7 @@ class SaveRatesTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-         $rate = '0';
- 
-         $request = $this->getRequest();
-+        $request->setMethod(HttpRequest::METHOD_POST);
-         $request->setPostValue(
-             'rate',
-             [
-diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
-index 5217c3576a5..2929f137be8 100644
---- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
-@@ -5,10 +5,16 @@
-  */
- namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol;
- 
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+
- class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
-     /**
--     * Test save action
-+     * Test save action.
-+     *
-+     * @param string $currencyCode
-+     * @param string $inputCurrencySymbol
-+     * @param string $outputCurrencySymbol
-      *
-      * @magentoConfigFixture               currency/options/allow USD
-      * @magentoDbIsolation enabled
-@@ -31,6 +37,7 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-                 $currencyCode => $inputCurrencySymbol,
-             ]
-         );
-+        $request->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/admin/system_currencysymbol/save');
- 
-         $this->assertRedirect();
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/AddressTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/AddressTest.php
-index 844325540e4..b159dceadfb 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/AddressTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/AddressTest.php
-@@ -9,6 +9,9 @@ namespace Magento\Customer\Block\Account\Dashboard;
- use Magento\Customer\Api\CustomerRepositoryInterface;
- use Magento\TestFramework\Helper\Bootstrap;
- 
-+/**
-+ * Class address test.
-+ */
- class AddressTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -66,7 +69,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase
- 
-     public function testGetCustomerMissingCustomer()
-     {
--        $moduleManager = $this->objectManager->get(\Magento\Framework\Module\Manager::class);
-+        $moduleManager = $this->objectManager->get(\Magento\Framework\Module\ModuleManagerInterface::class);
-         if ($moduleManager->isEnabled('Magento_PageCache')) {
-             $customerDataFactory = $this->objectManager->create(
-                 \Magento\Customer\Api\Data\CustomerInterfaceFactory::class
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php
-index 4c31fb740c5..1ef7d54c5aa 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php
-@@ -65,6 +65,7 @@ class BookTest extends \PHPUnit\Framework\TestCase
-      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-      * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
-      * @dataProvider hasPrimaryAddressDataProvider
-+     * @magentoAppIsolation enabled
-      */
-     public function testHasPrimaryAddress($customerId, $expected)
-     {
-@@ -82,6 +83,7 @@ class BookTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     * @magentoAppIsolation enabled
-      */
-     public function testGetAdditionalAddresses()
-     {
-@@ -98,6 +100,7 @@ class BookTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
-      * @dataProvider getAdditionalAddressesDataProvider
-+     * @magentoAppIsolation enabled
-      */
-     public function testGetAdditionalAddressesNegative($customerId, $expected)
-     {
-@@ -115,6 +118,7 @@ class BookTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-      * @magentoDataFixture Magento/Customer/_files/customer_address.php
-+     * @magentoAppIsolation enabled
-      */
-     public function testGetAddressHtml()
-     {
-@@ -134,6 +138,7 @@ class BookTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoAppIsolation enabled
-      */
-     public function testGetCustomer()
-     {
-@@ -158,6 +163,7 @@ class BookTest extends \PHPUnit\Framework\TestCase
-      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-      * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
-      * @dataProvider getDefaultBillingDataProvider
-+     * @magentoAppIsolation enabled
-      */
-     public function testGetDefaultBilling($customerId, $expected)
-     {
-@@ -175,6 +181,7 @@ class BookTest extends \PHPUnit\Framework\TestCase
-      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-      * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
-      * @dataProvider getDefaultShippingDataProvider
-+     * @magentoAppIsolation enabled
-      */
-     public function testGetDefaultShipping($customerId, $expected)
-     {
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/GridTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/GridTest.php
-new file mode 100644
-index 00000000000..ac11c6c08bd
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/GridTest.php
-@@ -0,0 +1,141 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Customer\Block\Address;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Integration tests for the \Magento\Customer\Block\Address\Grid class
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class GridTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Framework\View\LayoutInterface
-+     */
-+    private $layout;
-+
-+    /**
-+     * @var \Magento\Customer\Helper\Session\CurrentCustomer
-+     */
-+    protected $currentCustomer;
-+
-+    protected function setUp()
-+    {
-+        /** @var \PHPUnit_Framework_MockObject_MockObject $blockMock */
-+        $blockMock = $this->getMockBuilder(
-+            \Magento\Framework\View\Element\BlockInterface::class
-+        )->disableOriginalConstructor()->setMethods(
-+            ['setTitle', 'toHtml']
-+        )->getMock();
-+        $blockMock->expects($this->any())->method('setTitle');
-+
-+        $this->currentCustomer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+            ->get(\Magento\Customer\Helper\Session\CurrentCustomer::class);
-+        $this->layout = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class);
-+        $this->layout->setBlock('head', $blockMock);
-+    }
-+
-+    protected function tearDown()
-+    {
-+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        /** @var \Magento\Customer\Model\CustomerRegistry $customerRegistry */
-+        $customerRegistry = $objectManager->get(\Magento\Customer\Model\CustomerRegistry::class);
-+        // Cleanup customer from registry
-+        $customerRegistry->remove(1);
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testGetAddressEditUrl()
-+    {
-+        $gridBlock = $this->createBlockForCustomer(1);
-+
-+        $this->assertEquals(
-+            'http://localhost/index.php/customer/address/edit/id/1/',
-+            $gridBlock->getAddressEditUrl(1)
-+        );
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testGetAdditionalAddresses()
-+    {
-+        $gridBlock = $this->createBlockForCustomer(1);
-+        $this->assertNotNull($gridBlock->getAdditionalAddresses());
-+        $this->assertCount(1, $gridBlock->getAdditionalAddresses());
-+        $this->assertInstanceOf(
-+            \Magento\Customer\Api\Data\AddressInterface::class,
-+            $gridBlock->getAdditionalAddresses()[0]
-+        );
-+        $this->assertEquals(2, $gridBlock->getAdditionalAddresses()[0]->getId());
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
-+     * @dataProvider getAdditionalAddressesDataProvider
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testGetAdditionalAddressesNegative($customerId, $expected)
-+    {
-+        $gridBlock = $this->createBlockForCustomer($customerId);
-+        $this->currentCustomer->setCustomerId($customerId);
-+        $this->assertEquals($expected, $gridBlock->getAdditionalAddresses());
-+    }
-+
-+    public function getAdditionalAddressesDataProvider()
-+    {
-+        return ['5' => [5, []]];
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testGetAddressHtmlWithoutAddress()
-+    {
-+        $gridBlock = $this->createBlockForCustomer(5);
-+        $this->assertEquals('', $gridBlock->getAddressHtml(null));
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoAppIsolation enabled
-+     */
-+    public function testGetCustomer()
-+    {
-+        $gridBlock = $this->createBlockForCustomer(1);
-+        /** @var CustomerRepositoryInterface $customerRepository */
-+        $customerRepository = Bootstrap::getObjectManager()->get(
-+            \Magento\Customer\Api\CustomerRepositoryInterface::class
-+        );
-+        $customer = $customerRepository->getById(1);
-+        $object = $gridBlock->getCustomer();
-+        $this->assertEquals($customer, $object);
-+    }
-+
-+    /**
-+     * Create address book block for customer
-+     *
-+     * @param int $customerId
-+     * @return \Magento\Framework\View\Element\BlockInterface
-+     */
-+    private function createBlockForCustomer($customerId)
-+    {
-+        $this->currentCustomer->setCustomerId($customerId);
-+        return $this->layout->createBlock(
-+            \Magento\Customer\Block\Address\Grid::class,
-+            '',
-+            ['currentCustomer' => $this->currentCustomer]
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/OrdersTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/OrdersTest.php
-index 2e997a153d3..ba4b6b6d80d 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/OrdersTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/OrdersTest.php
-@@ -6,6 +6,7 @@
- namespace Magento\Customer\Block\Adminhtml\Edit\Tab;
- 
- use Magento\Customer\Controller\RegistryConstants;
-+use Magento\Framework\Escaper;
- use Magento\TestFramework\Helper\Bootstrap;
- 
- /**
-@@ -29,6 +30,11 @@ class OrdersTest extends \PHPUnit\Framework\TestCase
-      */
-     private $coreRegistry;
- 
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * Execute per test initialization.
-      */
-@@ -48,6 +54,7 @@ class OrdersTest extends \PHPUnit\Framework\TestCase
-             ['coreRegistry' => $this->coreRegistry]
-         );
-         $this->block->getPreparedCollection();
-+        $this->escaper = $objectManager->get(Escaper::class);
-     }
- 
-     /**
-@@ -81,6 +88,9 @@ class OrdersTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testToHtml()
-     {
--        $this->assertContains("We couldn't find any records.", $this->block->toHtml());
-+        $this->assertContains(
-+            $this->escaper->escapeHtml("We couldn't find any records."),
-+            $this->block->toHtml()
-+        );
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/CartTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/CartTest.php
-index 3bb10baff65..41391d79004 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/CartTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/CartTest.php
-@@ -3,9 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Customer\Block\Adminhtml\Edit\Tab\View;
- 
- use Magento\Customer\Controller\RegistryConstants;
-+use Magento\Framework\Escaper;
- use Magento\TestFramework\Helper\Bootstrap;
- 
- /**
-@@ -29,6 +31,11 @@ class CartTest extends \PHPUnit\Framework\TestCase
-      */
-     private $coreRegistry;
- 
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * Execute per test initialization.
-      */
-@@ -48,6 +55,7 @@ class CartTest extends \PHPUnit\Framework\TestCase
-             ['coreRegistry' => $this->coreRegistry, 'data' => ['website_id' => 1]]
-         );
-         $this->block->getPreparedCollection();
-+        $this->escaper = $objectManager->get(Escaper::class);
-     }
- 
-     /**
-@@ -83,7 +91,10 @@ class CartTest extends \PHPUnit\Framework\TestCase
-     public function testToHtmlEmptyCart()
-     {
-         $this->assertEquals(0, $this->block->getCollection()->getSize());
--        $this->assertContains('There are no items in customer\'s shopping cart.', $this->block->toHtml());
-+        $this->assertContains(
-+            $this->escaper->escapeHtml('There are no items in customer\'s shopping cart.'),
-+            $this->block->toHtml()
-+        );
-     }
- 
-     /**
-@@ -98,17 +109,6 @@ class CartTest extends \PHPUnit\Framework\TestCase
-         $this->assertContains('Simple Product', $html);
-         $this->assertContains('simple', $html);
-         $this->assertContains('$10.00', $html);
--        $this->assertContains('catalog/product/edit/id/1', $html);
--    }
--
--    /**
--     * Verify that the customer has a single item in his cart.
--     *
--     * @magentoDataFixture Magento/Customer/_files/customer.php
--     * @magentoDataFixture Magento/Customer/_files/quote.php
--     */
--    public function testGetCollection()
--    {
--        $this->assertEquals(1, $this->block->getCollection()->getSize());
-+        $this->assertContains($this->escaper->escapeHtmlAttr('catalog/product/edit/id/1'), $html);
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
-index 8d82ad94dfa..161734f47bf 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
-@@ -110,9 +110,9 @@ class PersonalInfoTest extends \PHPUnit\Framework\TestCase
-             \Magento\Customer\Api\Data\CustomerInterface::class
-         );
-         foreach ($expectedCustomerData as $property => $value) {
--            $expectedValue = is_numeric($value) ? intval($value) : $value;
-+            $expectedValue = is_numeric($value) ? (int)$value : $value;
-             $actualValue = isset($actualCustomerData[$property]) ? $actualCustomerData[$property] : null;
--            $actualValue = is_numeric($actualValue) ? intval($actualValue) : $actualValue;
-+            $actualValue = is_numeric($actualValue) ? (int)$actualValue : $actualValue;
-             $this->assertEquals($expectedValue, $actualValue);
-         }
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php
-index 874811d1590..cb07b1a401f 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php
-@@ -5,6 +5,10 @@
-  */
- namespace Magento\Customer\Block\Form;
- 
-+use Magento\Customer\Block\DataProviders\AddressAttributeData;
-+use Magento\Framework\View\Element\Template;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
- /**
-  * Test class for \Magento\Customer\Block\Form\Register
-  *
-@@ -15,14 +19,15 @@ class RegisterTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @magentoAppIsolation enabled
-      * @magentoDbIsolation enabled
-+     * @return void
-      */
--    public function testCompanyDefault()
-+    public function testCompanyDefault(): void
-     {
-         /** @var \Magento\Customer\Block\Widget\Company $block */
--        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Customer\Block\Form\Register::class
--        )->setTemplate('Magento_Customer::form/register.phtml')
--        ->setShowAddressFields(true);
-+        $block = Bootstrap::getObjectManager()->create(Register::class)
-+            ->setTemplate('Magento_Customer::form/register.phtml')
-+            ->setShowAddressFields(true);
-+        $this->setAttributeDataProvider($block);
- 
-         $this->assertContains('title="Company"', $block->toHtml());
-     }
-@@ -30,14 +35,16 @@ class RegisterTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @magentoAppIsolation enabled
-      * @magentoDbIsolation enabled
-+     * @return void
-      */
--    public function testTelephoneDefault()
-+    public function testTelephoneDefault(): void
-     {
-         /** @var \Magento\Customer\Block\Widget\Company $block */
--        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Customer\Block\Form\Register::class
-+        $block = Bootstrap::getObjectManager()->create(
-+            Register::class
-         )->setTemplate('Magento_Customer::form/register.phtml')
-         ->setShowAddressFields(true);
-+        $this->setAttributeDataProvider($block);
- 
-         $this->assertContains('title="Phone&#x20;Number"', $block->toHtml());
-     }
-@@ -45,14 +52,16 @@ class RegisterTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @magentoAppIsolation enabled
-      * @magentoDbIsolation enabled
-+     * @return void
-      */
--    public function testFaxDefault()
-+    public function testFaxDefault(): void
-     {
-         /** @var \Magento\Customer\Block\Widget\Company $block */
--        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Customer\Block\Form\Register::class
-+        $block = Bootstrap::getObjectManager()->create(
-+            Register::class
-         )->setTemplate('Magento_Customer::form/register.phtml')
-         ->setShowAddressFields(true);
-+        $this->setAttributeDataProvider($block);
- 
-         $this->assertNotContains('title="Fax"', $block->toHtml());
-     }
-@@ -60,21 +69,23 @@ class RegisterTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @magentoAppIsolation enabled
-      * @magentoDbIsolation enabled
-+     * @return void
-      */
--    public function testCompanyDisabled()
-+    public function testCompanyDisabled(): void
-     {
-         /** @var \Magento\Customer\Model\Attribute $model */
--        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+        $model = Bootstrap::getObjectManager()->create(
-             \Magento\Customer\Model\Attribute::class
-         );
-         $model->loadByCode('customer_address', 'company')->setIsVisible('0');
-         $model->save();
- 
-         /** @var \Magento\Customer\Block\Widget\Company $block */
--        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Customer\Block\Form\Register::class
-+        $block = Bootstrap::getObjectManager()->create(
-+            Register::class
-         )->setTemplate('Magento_Customer::form/register.phtml')
-         ->setShowAddressFields(true);
-+        $this->setAttributeDataProvider($block);
- 
-         $this->assertNotContains('title="Company"', $block->toHtml());
-     }
-@@ -82,21 +93,23 @@ class RegisterTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @magentoAppIsolation enabled
-      * @magentoDbIsolation enabled
-+     * @return void
-      */
--    public function testTelephoneDisabled()
-+    public function testTelephoneDisabled(): void
-     {
-         /** @var \Magento\Customer\Model\Attribute $model */
--        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+        $model = Bootstrap::getObjectManager()->create(
-             \Magento\Customer\Model\Attribute::class
-         );
-         $model->loadByCode('customer_address', 'telephone')->setIsVisible('0');
-         $model->save();
- 
-         /** @var \Magento\Customer\Block\Widget\Company $block */
--        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Customer\Block\Form\Register::class
-+        $block = Bootstrap::getObjectManager()->create(
-+            Register::class
-         )->setTemplate('Magento_Customer::form/register.phtml')
-         ->setShowAddressFields(true);
-+        $this->setAttributeDataProvider($block);
- 
-         $this->assertNotContains('title="Phone&#x20;Number"', $block->toHtml());
-     }
-@@ -104,29 +117,46 @@ class RegisterTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @magentoAppIsolation enabled
-      * @magentoDbIsolation enabled
-+     * @return void
-      */
--    public function testFaxEnabled()
-+    public function testFaxEnabled(): void
-     {
-         /** @var \Magento\Customer\Model\Attribute $model */
--        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+        $model = Bootstrap::getObjectManager()->create(
-             \Magento\Customer\Model\Attribute::class
-         );
-         $model->loadByCode('customer_address', 'fax')->setIsVisible('1');
-         $model->save();
- 
-         /** @var \Magento\Customer\Block\Widget\Company $block */
--        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Customer\Block\Form\Register::class
-+        $block = Bootstrap::getObjectManager()->create(
-+            Register::class
-         )->setTemplate('Magento_Customer::form/register.phtml')
-         ->setShowAddressFields(true);
-+        $this->setAttributeDataProvider($block);
- 
-         $this->assertContains('title="Fax"', $block->toHtml());
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function tearDown()
-     {
-         /** @var \Magento\Eav\Model\Config $eavConfig */
--        $eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
-+        $eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
-         $eavConfig->clear();
-     }
-+
-+    /**
-+     * Set attribute data provider.
-+     *
-+     * @param Template $block
-+     * @return void
-+     */
-+    private function setAttributeDataProvider(Template $block): void
-+    {
-+        $attributeData = Bootstrap::getObjectManager()->get(AddressAttributeData::class);
-+        $block->setAttributeData($attributeData);
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php
-index 2cc2c2a426d..3883f3f88ee 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php
-@@ -15,6 +15,9 @@ class GenderTest extends \PHPUnit\Framework\TestCase
-     /** @var Gender */
-     protected $_block;
- 
-+    /** @var \Magento\Customer\Model\Attribute */
-+    private $_model;
-+
-     /**
-      * Test initialization and set up. Create the Gender block.
-      * @return void
-@@ -28,6 +31,8 @@ class GenderTest extends \PHPUnit\Framework\TestCase
-         )->createBlock(
-             \Magento\Customer\Block\Widget\Gender::class
-         );
-+        $this->_model = $objectManager->create(\Magento\Customer\Model\Attribute::class);
-+        $this->_model->loadByCode('customer', 'gender');
-     }
- 
-     /**
-@@ -49,7 +54,8 @@ class GenderTest extends \PHPUnit\Framework\TestCase
-     public function testToHtml()
-     {
-         $html = $this->_block->toHtml();
--        $this->assertContains('<span>Gender</span>', $html);
-+        $attributeLabel = $this->_model->getStoreLabel();
-+        $this->assertContains('<span>' . $attributeLabel . '</span>', $html);
-         $this->assertContains('<option value="1">Male</option>', $html);
-         $this->assertContains('<option value="2">Female</option>', $html);
-         $this->assertContains('<option value="3">Not Specified</option>', $html);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php
-index 3650a7e95a3..3bc9fea5db3 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php
-@@ -22,7 +22,13 @@ class TaxvatTest extends \PHPUnit\Framework\TestCase
-             \Magento\Customer\Block\Widget\Taxvat::class
-         );
- 
--        $this->assertContains('title="Tax&#x2F;VAT&#x20;number"', $block->toHtml());
-+        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+            \Magento\Customer\Model\Attribute::class
-+        );
-+        $model->loadByCode('customer', 'taxvat');
-+        $attributeLabel = $model->getStoreLabel();
-+
-+        $this->assertContains('title="' . $block->escapeHtmlAttr($attributeLabel) . '"', $block->toHtml());
-         $this->assertNotContains('required', $block->toHtml());
-     }
- 
-@@ -38,13 +44,14 @@ class TaxvatTest extends \PHPUnit\Framework\TestCase
-         );
-         $model->loadByCode('customer', 'taxvat')->setIsRequired(true);
-         $model->save();
-+        $attributeLabel = $model->getStoreLabel();
- 
-         /** @var \Magento\Customer\Block\Widget\Taxvat $block */
-         $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-             \Magento\Customer\Block\Widget\Taxvat::class
-         );
- 
--        $this->assertContains('title="Tax&#x2F;VAT&#x20;number"', $block->toHtml());
-+        $this->assertContains('title="' . $block->escapeHtmlAttr($attributeLabel) . '"', $block->toHtml());
-         $this->assertContains('required', $block->toHtml());
-     }
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
-index 186d9c8f87d..898d3ff400b 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
-@@ -15,12 +15,16 @@ use Magento\Framework\Api\SearchCriteriaBuilder;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\Config\Value;
- use Magento\Framework\App\Http;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- use Magento\Framework\Data\Form\FormKey;
- use Magento\Framework\Message\MessageInterface;
--use Magento\Store\Model\ScopeInterface;
-+use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Framework\Stdlib\CookieManagerInterface;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
- use Magento\TestFramework\Request;
- use Magento\TestFramework\Response;
-+use Magento\Theme\Controller\Result\MessagePlugin;
- use Zend\Stdlib\Parameters;
- 
- /**
-@@ -28,6 +32,20 @@ use Zend\Stdlib\Parameters;
-  */
- class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
- {
-+    /**
-+     * @var TransportBuilderMock
-+     */
-+    private $transportBuilderMock;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $this->transportBuilderMock = $this->_objectManager->get(TransportBuilderMock::class);
-+    }
-+
-     /**
-      * Login the user
-      *
-@@ -56,7 +74,36 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
--     * @return void
-+     * @magentoDataFixture Magento/Customer/_files/customer_no_password.php
-+     */
-+    public function testLoginWithIncorrectPassword()
-+    {
-+        $expectedMessage = 'The account sign-in was incorrect or your account is disabled temporarily. '
-+            . 'Please wait and try again later.';
-+        $this->getRequest()
-+            ->setMethod('POST')
-+            ->setPostValue(
-+                [
-+                    'login' => [
-+                        'username' => 'customer@example.com',
-+                        'password' => '123123q'
-+                    ]
-+                ]
-+            );
-+
-+        $this->dispatch('customer/account/loginPost');
-+        $this->assertRedirect($this->stringContains('customer/account/login'));
-+        $this->assertSessionMessages(
-+            $this->equalTo(
-+                [
-+                    $expectedMessage
-+                ]
-+            )
-+        );
-+    }
-+
-+    /**
-+     * Test sign up form displaying.
-      */
-     public function testCreateAction()
-     {
-@@ -97,19 +144,13 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-     {
-         $email = 'customer@example.com';
- 
--        $this->getRequest()
--            ->setPostValue([
--                'email' => $email,
--            ]);
-+        $this->getRequest()->setPostValue(['email' => $email]);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
- 
-         $this->dispatch('customer/account/forgotPasswordPost');
-         $this->assertRedirect($this->stringContains('customer/account/'));
- 
--        /** @var \Magento\TestFramework\Mail\Template\TransportBuilderMock $transportBuilder */
--        $transportBuilder = $this->_objectManager->get(
--            \Magento\TestFramework\Mail\Template\TransportBuilderMock::class
--        );
--        $subject = $transportBuilder->getSentMessage()->getSubject();
-+        $subject = $this->transportBuilderMock->getSentMessage()->getSubject();
-         $this->assertContains(
-             'Test special\' characters',
-             $subject
-@@ -128,10 +169,10 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $token = Bootstrap::getObjectManager()->get(\Magento\Framework\Math\Random::class)
-             ->getUniqueHash();
-         $customer->changeResetPasswordLinkToken($token);
-+        $customer->setData('confirmation', 'confirmation');
-         $customer->save();
- 
-         $this->getRequest()->setParam('token', $token);
--        $this->getRequest()->setParam('id', $customer->getId());
- 
-         $this->dispatch('customer/account/createPassword');
- 
-@@ -139,13 +180,15 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $this->assertEquals(302, $response->getHttpResponseCode());
-         $text = $response->getBody();
-         $this->assertFalse((bool)preg_match('/' . $token . '/m', $text));
--        $this->assertRedirect($this->stringContains('customer/account/createpassword'));
-+        $this->assertRedirect(
-+            $this->stringContains('customer/account/createpassword')
-+        );
- 
--        /** @var \Magento\Customer\Model\Session $customer */
--        $session = Bootstrap::getObjectManager()->get(\Magento\Customer\Model\Session::class);
-+        /** @var Session $customer */
-+        $session = Bootstrap::getObjectManager()->get(Session::class);
-         $this->assertEquals($token, $session->getRpToken());
--        $this->assertEquals($customer->getId(), $session->getRpCustomerId());
-         $this->assertNotContains($token, $response->getHeader('Location')->getFieldValue());
-+        $this->assertCustomerConfirmationEquals(1, null);
-     }
- 
-     /**
-@@ -160,6 +203,7 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $token = Bootstrap::getObjectManager()->get(\Magento\Framework\Math\Random::class)
-             ->getUniqueHash();
-         $customer->changeResetPasswordLinkToken($token);
-+        $customer->setData('confirmation', 'confirmation');
-         $customer->save();
- 
-         /** @var \Magento\Customer\Model\Session $customer */
-@@ -172,6 +216,7 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $response = $this->getResponse();
-         $text = $response->getBody();
-         $this->assertTrue((bool)preg_match('/' . $token . '/m', $text));
-+        $this->assertCustomerConfirmationEquals(1, null);
-     }
- 
-     /**
-@@ -186,6 +231,7 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $token = Bootstrap::getObjectManager()->get(\Magento\Framework\Math\Random::class)
-             ->getUniqueHash();
-         $customer->changeResetPasswordLinkToken($token);
-+        $customer->setData('confirmation', 'confirmation');
-         $customer->save();
- 
-         $this->getRequest()->setParam('token', 'INVALIDTOKEN');
-@@ -197,6 +243,19 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $response = $this->getResponse();
-         $this->assertEquals(302, $response->getHttpResponseCode());
-         $this->assertContains('customer/account/forgotpassword', $response->getHeader('Location')->getFieldValue());
-+        $this->assertCustomerConfirmationEquals(1, 'confirmation');
-+    }
-+
-+    /**
-+     * @param int         $customerId
-+     * @param string|null $confirmation
-+     */
-+    private function assertCustomerConfirmationEquals(int $customerId, string $confirmation = null)
-+    {
-+        /** @var \Magento\Customer\Model\Customer $customer */
-+        $customer = Bootstrap::getObjectManager()
-+                             ->create(\Magento\Customer\Model\Customer::class)->load($customerId);
-+        $this->assertEquals($confirmation, $customer->getConfirmation());
-     }
- 
-     /**
-@@ -232,26 +291,10 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-     /**
-      * @magentoDbIsolation enabled
-      * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/Customer/_files/customer_confirmation_config_disable.php
-      */
-     public function testNoConfirmCreatePostAction()
-     {
--        /** @var \Magento\Framework\App\Config\MutableScopeConfigInterface $mutableScopeConfig */
--        $mutableScopeConfig = Bootstrap::getObjectManager()
--            ->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class);
--
--        $scopeValue = $mutableScopeConfig->getValue(
--            'customer/create_account/confirm',
--            ScopeInterface::SCOPE_WEBSITES,
--            null
--        );
--
--        $mutableScopeConfig->setValue(
--            'customer/create_account/confirm',
--            0,
--            ScopeInterface::SCOPE_WEBSITES,
--            null
--        );
--
-         $this->fillRequestWithAccountDataAndFormKey('test1@email.com');
-         $this->dispatch('customer/account/createPost');
-         $this->assertRedirect($this->stringEndsWith('customer/account/'));
-@@ -259,56 +302,28 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-             $this->equalTo(['Thank you for registering with Main Website Store.']),
-             MessageInterface::TYPE_SUCCESS
-         );
--
--        $mutableScopeConfig->setValue(
--            'customer/create_account/confirm',
--            $scopeValue,
--            ScopeInterface::SCOPE_WEBSITES,
--            null
--        );
-     }
- 
-     /**
-      * @magentoDbIsolation enabled
-      * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/Customer/_files/customer_confirmation_config_enable.php
-      */
-     public function testWithConfirmCreatePostAction()
-     {
--        /** @var \Magento\Framework\App\Config\MutableScopeConfigInterface $mutableScopeConfig */
--        $mutableScopeConfig = Bootstrap::getObjectManager()
--            ->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class);
--
--        $scopeValue = $mutableScopeConfig->getValue(
--            'customer/create_account/confirm',
--            ScopeInterface::SCOPE_WEBSITES,
--            null
--        );
--
--        $mutableScopeConfig->setValue(
--            'customer/create_account/confirm',
--            1,
--            ScopeInterface::SCOPE_WEBSITES,
--            null
--        );
--
-         $this->fillRequestWithAccountDataAndFormKey('test2@email.com');
-         $this->dispatch('customer/account/createPost');
-         $this->assertRedirect($this->stringContains('customer/account/index/'));
-         $this->assertSessionMessages(
--            $this->equalTo([
--                'You must confirm your account. Please check your email for the confirmation link or '
-+            $this->equalTo(
-+                [
-+                    'You must confirm your account. Please check your email for the confirmation link or '
-                     . '<a href="http://localhost/index.php/customer/account/confirmation/'
-                     . '?email=test2%40email.com">click here</a> for a new link.'
--            ]),
-+                ]
-+            ),
-             MessageInterface::TYPE_SUCCESS
-         );
--
--        $mutableScopeConfig->setValue(
--            'customer/create_account/confirm',
--            $scopeValue,
--            ScopeInterface::SCOPE_WEBSITES,
--            null
--        );
-     }
- 
-     /**
-@@ -320,10 +335,14 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $this->dispatch('customer/account/createPost');
-         $this->assertRedirect($this->stringContains('customer/account/create/'));
-         $this->assertSessionMessages(
--            $this->equalTo(['There is already an account with this email address. ' .
--                'If you are sure that it is your email address, ' .
--                '<a href="http://localhost/index.php/customer/account/forgotpassword/">click here</a>' .
--                ' to get your password and access your account.', ]),
-+            $this->equalTo(
-+                [
-+                    'There is already an account with this email address. ' .
-+                    'If you are sure that it is your email address, ' .
-+                    '<a href="http://localhost/index.php/customer/account/forgotpassword/">click here</a>' .
-+                    ' to get your password and access your account.',
-+                ]
-+            ),
-             MessageInterface::TYPE_ERROR
-         );
-     }
-@@ -335,7 +354,11 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-     {
-         $this->getRequest()
-             ->setMethod('POST')
--            ->setPostValue(['email' => 'customer@needAconfirmation.com']);
-+            ->setPostValue(
-+                [
-+                    'email' => 'customer@needAconfirmation.com',
-+                ]
-+            );
- 
-         $this->dispatch('customer/account/confirmation');
-         $this->assertRedirect($this->stringContains('customer/account/index'));
-@@ -352,14 +375,20 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-     {
-         $this->getRequest()
-             ->setMethod('POST')
--            ->setPostValue([
--                'email' => 'customer@example.com',
--            ]);
-+            ->setPostValue(
-+                [
-+                    'email' => 'customer@example.com',
-+                ]
-+            );
- 
-         $this->dispatch('customer/account/confirmation');
-         $this->assertRedirect($this->stringContains('customer/account/index'));
-         $this->assertSessionMessages(
--            $this->equalTo(['This email does not require confirmation.']),
-+            $this->equalTo(
-+                [
-+                    'This email does not require confirmation.',
-+                ]
-+            ),
-             MessageInterface::TYPE_SUCCESS
-         );
-     }
-@@ -377,10 +406,8 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-     {
-         $email = 'customer@example.com';
- 
--        $this->getRequest()
--            ->setPostValue([
--                'email' => $email,
--            ]);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-+        $this->getRequest()->setPostValue(['email' => $email]);
- 
-         $this->dispatch('customer/account/forgotPasswordPost');
-         $this->assertRedirect($this->stringContains('customer/account/'));
-@@ -400,10 +427,13 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-      */
-     public function testForgotPasswordPostWithBadEmailAction()
-     {
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()
--            ->setPostValue([
--                'email' => 'bad@email',
--            ]);
-+            ->setPostValue(
-+                [
-+                    'email' => 'bad@email',
-+                ]
-+            );
- 
-         $this->dispatch('customer/account/forgotPasswordPost');
-         $this->assertRedirect($this->stringContains('customer/account/forgotpassword'));
-@@ -421,10 +451,13 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $this->getRequest()
-             ->setParam('id', 1)
-             ->setParam('token', '8ed8677e6c79e68b94e61658bd756ea5')
--            ->setPostValue([
--                'password' => 'new-password',
--                'password_confirmation' => 'new-password',
--            ]);
-+            ->setMethod('POST')
-+            ->setPostValue(
-+                [
-+                    'password' => 'new-password',
-+                    'password_confirmation' => 'new-password',
-+                ]
-+            );
- 
-         $this->dispatch('customer/account/resetPasswordPost');
-         $this->assertRedirect($this->stringContains('customer/account/'));
-@@ -443,10 +476,13 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $this->getRequest()
-             ->setQueryValue('id', 1)
-             ->setQueryValue('token', '8ed8677e6c79e68b94e61658bd756ea5')
--            ->setPostValue([
--                'password' => 'new-Password1',
--                'password_confirmation' => 'new-Password1',
--            ]);
-+            ->setMethod('POST')
-+            ->setPostValue(
-+                [
-+                    'password' => 'new-Password1',
-+                    'password_confirmation' => 'new-Password1',
-+                ]
-+            );
- 
-         $this->dispatch('customer/account/resetPasswordPost');
-         $this->assertRedirect($this->stringContains('customer/account/login'));
-@@ -469,8 +505,11 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $this->assertEquals(200, $this->getResponse()->getHttpResponseCode(), $body);
-         $this->assertContains('<div class="field field-name-firstname required">', $body);
-         // Verify the password check box is not checked
--        $this->assertContains('<input type="checkbox" name="change_password" id="change-password" '
--            . 'data-role="change-password" value="1" title="Change&#x20;Password" class="checkbox" />', $body);
-+        $this->assertContains(
-+            '<input type="checkbox" name="change_password" id="change-password" '
-+            . 'data-role="change-password" value="1" title="Change&#x20;Password" class="checkbox" />',
-+            $body
-+        );
-     }
- 
-     /**
-@@ -514,14 +553,16 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $this->login(1);
-         $this->getRequest()
-             ->setMethod('POST')
--            ->setPostValue([
--                'form_key'  => $this->_objectManager->get(FormKey::class)->getFormKey(),
--                'firstname' => 'John',
--                'lastname'  => 'Doe',
--                'email'     => 'johndoe@email.com',
--                'change_email'     => 1,
--                'current_password' => 'password'
--            ]);
-+            ->setPostValue(
-+                [
-+                    'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
-+                    'firstname' => 'John',
-+                    'lastname' => 'Doe',
-+                    'email' => 'johndoe@email.com',
-+                    'change_email' => 1,
-+                    'current_password' => 'password'
-+                ]
-+            );
- 
-         $this->dispatch('customer/account/editPost');
- 
-@@ -608,7 +649,7 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
- 
-         $this->assertRedirect($this->stringContains('customer/account/edit/'));
-         $this->assertSessionMessages(
--            $this->equalTo(['"Email" is not a valid email address.']),
-+            $this->equalTo(['&quot;Email&quot; is not a valid email address.']),
-             MessageInterface::TYPE_ERROR
-         );
-     }
-@@ -639,7 +680,7 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $this->assertRedirect($this->stringContains('customer/account/edit/'));
-         // Not sure if its the most secure message. Not changing the behavior for now in the new AccountManagement APIs.
-         $this->assertSessionMessages(
--            $this->equalTo(["The password doesn't match this account. Verify the password and try again."]),
-+            $this->equalTo(["The password doesn&#039;t match this account. Verify the password and try again."]),
-             MessageInterface::TYPE_ERROR
-         );
-     }
-@@ -652,22 +693,24 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $this->login(1);
-         $this->getRequest()
-             ->setMethod('POST')
--            ->setPostValue([
--                'form_key'         => $this->_objectManager->get(FormKey::class)->getFormKey(),
--                'firstname'        => 'John',
--                'lastname'         => 'Doe',
--                'email'            => 'johndoe@email.com',
--                'change_password'  => 1,
--                'current_password' => 'password',
--                'password'         => 'new-password',
--                'password_confirmation' => 'new-password-no-match',
--            ]);
-+            ->setPostValue(
-+                [
-+                    'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
-+                    'firstname' => 'John',
-+                    'lastname' => 'Doe',
-+                    'email' => 'johndoe@email.com',
-+                    'change_password' => 1,
-+                    'current_password' => 'password',
-+                    'password' => 'new-password',
-+                    'password_confirmation' => 'new-password-no-match',
-+                ]
-+            );
- 
-         $this->dispatch('customer/account/editPost');
- 
-         $this->assertRedirect($this->stringContains('customer/account/edit/'));
-         $this->assertSessionMessages(
--            $this->equalTo(['Password confirmation doesn\'t match entered password.']),
-+            $this->equalTo(['Password confirmation doesn&#039;t match entered password.']),
-             MessageInterface::TYPE_ERROR
-         );
-     }
-@@ -701,6 +744,46 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $this->assertTrue($this->_objectManager->get(Session::class)->isLoggedIn());
-     }
- 
-+    /**
-+     * Test that confirmation email address displays special characters correctly.
-+     *
-+     * @magentoDbIsolation enabled
-+     * @magentoDataFixture Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php
-+     *
-+     * @return void
-+     */
-+    public function testConfirmationEmailWithSpecialCharacters(): void
-+    {
-+        $email = 'customer+confirmation@example.com';
-+        $this->dispatch('customer/account/confirmation/email/customer%2Bconfirmation%40email.com');
-+        $this->getRequest()->setPostValue('email', $email);
-+        $this->dispatch('customer/account/confirmation/email/customer%2Bconfirmation%40email.com');
-+
-+        $this->assertRedirect($this->stringContains('customer/account/index'));
-+        $this->assertSessionMessages(
-+            $this->equalTo(['Please check your email for confirmation key.']),
-+            MessageInterface::TYPE_SUCCESS
-+        );
-+
-+        /** @var $message \Magento\Framework\Mail\Message */
-+        $message = $this->transportBuilderMock->getSentMessage();
-+        $rawMessage = $message->getRawMessage();
-+
-+        $this->assertContains('To: ' . $email, $rawMessage);
-+
-+        $content = $message->getBody()->getPartContent(0);
-+        $confirmationUrl = $this->getConfirmationUrlFromMessageContent($content);
-+        $this->setRequestInfo($confirmationUrl, 'confirm');
-+        $this->clearCookieMessagesList();
-+        $this->dispatch($confirmationUrl);
-+
-+        $this->assertRedirect($this->stringContains('customer/account/index'));
-+        $this->assertSessionMessages(
-+            $this->equalTo(['Thank you for registering with Main Website Store.']),
-+            MessageInterface::TYPE_SUCCESS
-+        );
-+    }
-+
-     /**
-      * Data provider for testLoginPostRedirect.
-      *
-@@ -715,6 +798,21 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         ];
-     }
- 
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
-+     * @magentoAppArea frontend
-+     */
-+    public function testCheckVisitorModel()
-+    {
-+        /** @var \Magento\Customer\Model\Visitor $visitor */
-+        $visitor = $this->_objectManager->get(\Magento\Customer\Model\Visitor::class);
-+        $this->login(1);
-+        $this->assertNull($visitor->getId());
-+        $this->dispatch('customer/account/index');
-+        $this->assertNotNull($visitor->getId());
-+    }
-+
-     /**
-      * @param string $email
-      * @return void
-@@ -790,13 +888,15 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-      */
-     private function prepareRequest()
-     {
--        $post = new Parameters([
--            'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
--            'login' => [
--                'username' => 'customer@example.com',
--                'password' => 'password'
-+        $post = new Parameters(
-+            [
-+                'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
-+                'login' => [
-+                    'username' => 'customer@example.com',
-+                    'password' => 'password'
-+                ]
-             ]
--        ]);
-+        );
-         $request = $this->getRequest();
-         $formKey = $this->_objectManager->get(FormKey::class);
-         $request->setParam('form_key', $formKey->getFormKey());
-@@ -818,4 +918,54 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
-         $this->assertTrue($response->isRedirect());
-         $this->assertSame($redirectUrl, $response->getHeader('Location')->getUri());
-     }
-+
-+    /**
-+     * Add new request info (request uri, path info, action name).
-+     *
-+     * @param string $uri
-+     * @param string $actionName
-+     * @return void
-+     */
-+    private function setRequestInfo(string $uri, string $actionName): void
-+    {
-+        $this->getRequest()
-+            ->setRequestUri($uri)
-+            ->setPathInfo()
-+            ->setActionName($actionName);
-+    }
-+
-+    /**
-+     * Clear cookie messages list.
-+     *
-+     * @return void
-+     */
-+    private function clearCookieMessagesList(): void
-+    {
-+        $cookieManager = $this->_objectManager->get(CookieManagerInterface::class);
-+        $jsonSerializer = $this->_objectManager->get(Json::class);
-+        $cookieManager->setPublicCookie(
-+            MessagePlugin::MESSAGES_COOKIES_NAME,
-+            $jsonSerializer->serialize([])
-+        );
-+    }
-+
-+    /**
-+     * Get confirmation URL from message content.
-+     *
-+     * @param string $content
-+     * @return string
-+     */
-+    private function getConfirmationUrlFromMessageContent(string $content): string
-+    {
-+        $confirmationUrl = '';
-+
-+        if (preg_match('<a\s*href="(?<url>.*?)".*>', $content, $matches)) {
-+            $confirmationUrl = $matches['url'];
-+            $confirmationUrl = str_replace('http://localhost/index.php/', '', $confirmationUrl);
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+            $confirmationUrl = html_entity_decode($confirmationUrl);
-+        }
-+
-+        return $confirmationUrl;
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
-index 32a622d4aa6..92e104496fe 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
-@@ -9,6 +9,7 @@ use Magento\Customer\Api\AccountManagementInterface;
- use Magento\Customer\Model\CustomerRegistry;
- use Magento\Framework\Data\Form\FormKey;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- 
- class AddressTest extends \Magento\TestFramework\TestCase\AbstractController
- {
-@@ -19,7 +20,7 @@ class AddressTest extends \Magento\TestFramework\TestCase\AbstractController
-     private $formKey;
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritDoc
-      */
-     protected function setUp()
-     {
-@@ -168,7 +169,7 @@ class AddressTest extends \Magento\TestFramework\TestCase\AbstractController
-     public function testDeleteAction()
-     {
-         $this->getRequest()->setParam('id', 1);
--        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey());
-+        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey())->setMethod(HttpRequest::METHOD_POST);
-         // we are overwriting the address coming from the fixture
-         $this->dispatch('customer/address/delete');
- 
-@@ -186,7 +187,7 @@ class AddressTest extends \Magento\TestFramework\TestCase\AbstractController
-     public function testWrongAddressDeleteAction()
-     {
-         $this->getRequest()->setParam('id', 555);
--        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey());
-+        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey())->setMethod(HttpRequest::METHOD_POST);
-         // we are overwriting the address coming from the fixture
-         $this->dispatch('customer/address/delete');
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Address/SaveTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Address/SaveTest.php
-new file mode 100644
-index 00000000000..cbfa794f94d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Address/SaveTest.php
-@@ -0,0 +1,195 @@
-+<?php
-+declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Customer\Controller\Adminhtml\Address;
-+
-+use Magento\Customer\Api\AccountManagementInterface;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+
-+/**
-+ * @magentoAppArea adminhtml
-+ */
-+class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-+{
-+    /** @var CustomerRepositoryInterface */
-+    private $customerRepository;
-+
-+    /** @var AccountManagementInterface */
-+    private $accountManagement;
-+
-+    /** @var \Magento\TestFramework\ObjectManager */
-+    private $objectManager;
-+
-+    /** @var \Magento\Customer\Controller\Adminhtml\Address\Save */
-+    private $customerAddress;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $this->customerRepository = Bootstrap::getObjectManager()->get(
-+            \Magento\Customer\Api\CustomerRepositoryInterface::class
-+        );
-+        $this->accountManagement = Bootstrap::getObjectManager()->get(
-+            \Magento\Customer\Api\AccountManagementInterface::class
-+        );
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->customerAddress = $this->objectManager->get(\Magento\Customer\Controller\Adminhtml\Address\Save::class);
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function tearDown()
-+    {
-+        /**
-+         * Unset customer data
-+         */
-+        Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->setCustomerData(null);
-+
-+        /**
-+         * Unset messages
-+         */
-+        Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->getMessages(true);
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
-+     *
-+     * Check that customer id set and addresses saved
-+     */
-+    public function testSaveActionWithValidAddressData()
-+    {
-+        $customer = $this->customerRepository->get('customer5@example.com');
-+        $customerId = $customer->getId();
-+        $post = [
-+            'parent_id' => $customerId,
-+            'firstname' => 'test firstname',
-+            'lastname' => 'test lastname',
-+            'street' => ['test street'],
-+            'city' => 'test city',
-+            'region_id' => 10,
-+            'country_id' => 'US',
-+            'postcode' => '01001',
-+            'telephone' => '+7000000001',
-+        ];
-+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
-+
-+        $this->objectManager->get(\Magento\Backend\Model\Session::class)->setCustomerFormData($post);
-+
-+        $this->customerAddress->execute();
-+
-+        $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
-+
-+        /** Check that customer data were cleaned after it was saved successfully*/
-+        $this->assertEmpty($this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerData());
-+
-+        $customer = $this->customerRepository->getById($customerId);
-+
-+        $this->assertEquals('Firstname', $customer->getFirstname());
-+        $addresses = $customer->getAddresses();
-+        $this->assertCount(1, $addresses);
-+        $this->assertNull($this->accountManagement->getDefaultBillingAddress($customerId));
-+        $this->assertNull($this->accountManagement->getDefaultShippingAddress($customerId));
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
-+     *
-+     * Check that customer id set and addresses saved
-+     */
-+    public function testSaveActionWithDefaultShippingAndBilling()
-+    {
-+        $customer = $this->customerRepository->get('customer5@example.com');
-+        $customerId = $customer->getId();
-+        $post = [
-+            'parent_id' => $customerId,
-+            'firstname' => 'test firstname',
-+            'lastname' => 'test lastname',
-+            'street' => ['test street'],
-+            'city' => 'test city',
-+            'region_id' => 10,
-+            'country_id' => 'US',
-+            'postcode' => '01001',
-+            'telephone' => '+7000000001',
-+            'default_billing' => true,
-+            'default_shipping' => true
-+        ];
-+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
-+
-+        $this->objectManager->get(\Magento\Backend\Model\Session::class)->setCustomerFormData($post);
-+
-+        $this->customerAddress->execute();
-+        /**
-+         * Check that errors was generated and set to session
-+         */
-+        $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
-+
-+        /**
-+         * Check that customer data were cleaned after it was saved successfully
-+         */
-+        $this->assertEmpty($this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerData());
-+
-+        /**
-+         * Remove stored customer from registry
-+         */
-+        $this->objectManager->get(\Magento\Customer\Model\CustomerRegistry::class)->remove($customerId);
-+        $customer = $this->customerRepository->get('customer5@example.com');
-+        $this->assertEquals('Firstname', $customer->getFirstname());
-+        $addresses = $customer->getAddresses();
-+        $this->assertCount(1, $addresses);
-+
-+        $this->assertNotNull($this->accountManagement->getDefaultBillingAddress($customerId));
-+        $this->assertNotNull($this->accountManagement->getDefaultShippingAddress($customerId));
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer_sample.php
-+     *
-+     * Check that customer id set and addresses saved
-+     */
-+    public function testSaveActionWithExistingAdresses()
-+    {
-+        $customer = $this->customerRepository->get('customer@example.com');
-+        $customerId = $customer->getId();
-+        $post = [
-+            'parent_id' => $customerId,
-+            'firstname' => 'test firstname',
-+            'lastname' => 'test lastname',
-+            'street' => ['test street'],
-+            'city' => 'test city',
-+            'region_id' => 10,
-+            'country_id' => 'US',
-+            'postcode' => '01001',
-+            'telephone' => '+7000000001',
-+        ];
-+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
-+
-+        $this->objectManager->get(\Magento\Backend\Model\Session::class)->setCustomerFormData($post);
-+
-+        $this->customerAddress->execute();
-+        /**
-+         * Check that errors was generated and set to session
-+         */
-+        $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
-+
-+        /**
-+         * Check that customer data were cleaned after it was saved successfully
-+         */
-+        $this->assertEmpty($this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerData());
-+
-+        $customer = $this->customerRepository->getById($customerId);
-+
-+        $this->assertEquals('test firstname', $customer->getFirstname());
-+        $addresses = $customer->getAddresses();
-+        $this->assertCount(4, $addresses);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php
-index 80b11a920e3..db1cc4995e6 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php
-@@ -7,6 +7,7 @@ namespace Magento\Customer\Controller\Adminhtml;
- 
- use Magento\Framework\Message\MessageInterface;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- 
- /**
-  * @magentoAppArea adminhtml
-@@ -25,6 +26,11 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     /** @var  \Magento\Customer\Api\GroupRepositoryInterface */
-     private $groupRepository;
- 
-+    /**
-+     * @inheritDoc
-+     *
-+     * @throws \Magento\Framework\Exception\AuthenticationException
-+     */
-     public function setUp()
-     {
-         parent::setUp();
-@@ -33,12 +39,18 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-         $this->groupRepository = $objectManager->get(\Magento\Customer\Api\GroupRepositoryInterface::class);
-     }
- 
-+    /**
-+     * @inheritDoc
-+     */
-     public function tearDown()
-     {
-         parent::tearDown();
-         //$this->session->unsCustomerGroupData();
-     }
- 
-+    /**
-+     * Test new group form.
-+     */
-     public function testNewActionNoCustomerGroupDataInSession()
-     {
-         $this->dispatch('backend/customer/group/new');
-@@ -49,6 +61,9 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-         $this->assertContains($expected, $responseBody);
-     }
- 
-+    /**
-+     * Test form filling with data in session.
-+     */
-     public function testNewActionWithCustomerGroupDataInSession()
-     {
-         /** @var \Magento\Customer\Api\Data\GroupInterfaceFactory $customerGroupFactory */
-@@ -76,21 +91,27 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     }
- 
-     /**
-+     * Test calling delete without an ID.
-+     *
-      * @magentoDataFixture Magento/Customer/_files/customer_group.php
-      */
-     public function testDeleteActionNoGroupId()
-     {
-+        $this->getRequest()->setMethod(\Magento\Framework\App\Request\Http::METHOD_POST);
-         $this->dispatch('backend/customer/group/delete');
-         $this->assertRedirect($this->stringStartsWith(self::BASE_CONTROLLER_URL));
-     }
- 
-     /**
-+     * Test deleting a group.
-+     *
-      * @magentoDataFixture Magento/Customer/_files/customer_group.php
-      */
-     public function testDeleteActionExistingGroup()
-     {
-         $groupId = $this->findGroupIdWithCode(self::CUSTOMER_GROUP_CODE);
-         $this->getRequest()->setParam('id', $groupId);
-+        $this->getRequest()->setMethod(\Magento\Framework\App\Request\Http::METHOD_POST);
-         $this->dispatch('backend/customer/group/delete');
- 
-         /**
-@@ -104,11 +125,14 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     }
- 
-     /**
-+     * Tet deleting with wrong ID.
-+     *
-      * @magentoDataFixture Magento/Customer/_files/customer_group.php
-      */
-     public function testDeleteActionNonExistingGroupId()
-     {
-         $this->getRequest()->setParam('id', 10000);
-+        $this->getRequest()->setMethod(\Magento\Framework\App\Request\Http::METHOD_POST);
-         $this->dispatch('backend/customer/group/delete');
- 
-         /**
-@@ -122,6 +146,8 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     }
- 
-     /**
-+     * Test saving a valid group.
-+     *
-      * @magentoDataFixture Magento/Customer/_files/customer_group.php
-      */
-     public function testSaveActionExistingGroup()
-@@ -130,6 +156,7 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
-         $this->getRequest()->setParam('id', $groupId);
-         $this->getRequest()->setParam('code', self::CUSTOMER_GROUP_CODE);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
- 
-         $this->dispatch('backend/customer/group/save');
- 
-@@ -161,9 +188,13 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-         );
-     }
- 
-+    /**
-+     * Test saving an invalid group.
-+     */
-     public function testSaveActionCreateNewGroupWithoutCode()
-     {
-         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
- 
-         $this->dispatch('backend/customer/group/save');
- 
-@@ -173,19 +204,26 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-         );
-     }
- 
-+    /**
-+     * Test saving an empty group.
-+     */
-     public function testSaveActionForwardNewCreateNewGroup()
-     {
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/customer/group/save');
-         $responseBody = $this->getResponse()->getBody();
-         $this->assertRegExp('/<h1 class\="page-title">\s*New Customer Group\s*<\/h1>/', $responseBody);
-     }
- 
-     /**
-+     * Test saving an existing group.
-+     *
-      * @magentoDataFixture Magento/Customer/_files/customer_group.php
-      */
-     public function testSaveActionForwardNewEditExistingGroup()
-     {
-         $groupId = $this->findGroupIdWithCode(self::CUSTOMER_GROUP_CODE);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setParam('id', $groupId);
-         $this->dispatch('backend/customer/group/save');
- 
-@@ -193,10 +231,14 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-         $this->assertRegExp('/<h1 class\="page-title">\s*' . self::CUSTOMER_GROUP_CODE . '\s*<\/h1>/', $responseBody);
-     }
- 
-+    /**
-+     * Test using an invalid ID.
-+     */
-     public function testSaveActionNonExistingGroupId()
-     {
-         $this->getRequest()->setParam('id', 10000);
-         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
- 
-         $this->dispatch('backend/customer/group/save');
- 
-@@ -211,6 +253,8 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     }
- 
-     /**
-+     * Test using existing code.
-+     *
-      * @magentoDataFixture Magento/Customer/_files/customer_group.php
-      */
-     public function testSaveActionNewGroupWithExistingGroupCode()
-@@ -220,6 +264,7 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
- 
-         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
-         $this->getRequest()->setParam('code', self::CUSTOMER_GROUP_CODE);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
- 
-         $this->dispatch('backend/customer/group/save');
- 
-@@ -232,6 +277,8 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     }
- 
-     /**
-+     * Test saving an invalid group.
-+     *
-      * @magentoDataFixture Magento/Customer/_files/customer_group.php
-      */
-     public function testSaveActionNewGroupWithoutGroupCode()
-@@ -240,6 +287,7 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-         $originalCode = $this->groupRepository->getById($groupId)->getCode();
- 
-         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
- 
-         $this->dispatch('backend/customer/group/save');
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
-index 8ee12fa1aa8..761064ed61f 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
-@@ -9,6 +9,7 @@ namespace Magento\Customer\Controller\Adminhtml\Index;
- 
- use Magento\Backend\Model\Session;
- use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- use Magento\Customer\Api\Data\CustomerInterface;
- use Magento\Framework\Message\MessageInterface;
- use Magento\TestFramework\Helper\Bootstrap;
-@@ -31,12 +32,20 @@ class MassAssignGroupTest extends AbstractBackendController
-      */
-     protected $customerRepository;
- 
-+    /**
-+     * @inheritDoc
-+     *
-+     * @throws \Magento\Framework\Exception\AuthenticationException
-+     */
-     protected function setUp()
-     {
-         parent::setUp();
-         $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
-     }
- 
-+    /**
-+     * @inheritDoc
-+     */
-     protected function tearDown()
-     {
-         /**
-@@ -69,7 +78,8 @@ class MassAssignGroupTest extends AbstractBackendController
-             'selected' => [$customer->getId()]
-         ];
- 
--        $this->getRequest()->setParams($params);
-+        $this->getRequest()->setParams($params)
-+            ->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/customer/index/massAssignGroup');
-         $this->assertSessionMessages(
-             self::equalTo(['A total of 1 record(s) were updated.']),
-@@ -103,7 +113,8 @@ class MassAssignGroupTest extends AbstractBackendController
-             'selected' => $ids,
-         ];
- 
--        $this->getRequest()->setParams($params);
-+        $this->getRequest()->setParams($params)
-+            ->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/customer/index/massAssignGroup');
-         $this->assertSessionMessages(
-             self::equalTo(['A total of 5 record(s) were updated.']),
-@@ -124,11 +135,9 @@ class MassAssignGroupTest extends AbstractBackendController
-      */
-     public function testMassAssignGroupActionNoCustomerIds()
-     {
--        $params = [
--            'group' => 0,
--            'namespace' => 'customer_listing',
-+        $params = ['group'=> 0,'namespace'=> 'customer_listing',
-         ];
--        $this->getRequest()->setParams($params);
-+        $this->getRequest()->setParams($params)->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/customer/index/massAssignGroup');
-         $this->assertSessionMessages(
-             $this->equalTo(['An item needs to be selected. Select and try again.']),
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php
-index 940f7c84325..eea94bb3f98 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php
-@@ -13,6 +13,7 @@ use Magento\Customer\Api\Data\CustomerInterface;
- use PHPUnit\Framework\Constraint\Constraint;
- use Magento\Framework\Message\MessageInterface;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- use Magento\TestFramework\TestCase\AbstractBackendController;
- 
- /**
-@@ -32,12 +33,20 @@ class MassDeleteTest extends AbstractBackendController
-      */
-     private $baseControllerUrl = 'http://localhost/index.php/backend/customer/index/index';
- 
-+    /**
-+     * @inheritDoc
-+     *
-+     * @throws \Magento\Framework\Exception\AuthenticationException
-+     */
-     protected function setUp()
-     {
-         parent::setUp();
-         $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
-     }
- 
-+    /**
-+     * @inheritDoc
-+     */
-     protected function tearDown()
-     {
-         /**
-@@ -106,7 +115,7 @@ class MassDeleteTest extends AbstractBackendController
-             'namespace' => 'customer_listing',
-         ];
- 
--        $this->getRequest()->setParams($requestData);
-+        $this->getRequest()->setParams($requestData)->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/customer/index/massDelete');
-         $this->assertSessionMessages(
-             $constraint,
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php
-index b5ca783d68c..789978d8180 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Customer\Controller\Adminhtml\Index;
- 
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+
- /**
-  * ResetPassword controller test.
-  *
-@@ -32,7 +34,7 @@ class ResetPasswordTest extends \Magento\TestFramework\TestCase\AbstractBackendC
-         $this->passwordResetRequestEventCreate(
-             \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST
-         );
--        $this->getRequest()->setPostValue(['customer_id' => '1']);
-+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_GET);
-         $this->dispatch('backend/customer/index/resetPassword');
-         $this->assertSessionMessages(
-             $this->equalTo(['The customer will receive an email with a link to reset password.']),
-@@ -41,6 +43,23 @@ class ResetPasswordTest extends \Magento\TestFramework\TestCase\AbstractBackendC
-         $this->assertRedirect($this->stringStartsWith($this->baseControllerUrl . 'edit'));
-     }
- 
-+    /**
-+     * Checks reset password functionality cannot be performed with POST request
-+     *
-+     * @magentoConfigFixture current_store customer/password/limit_password_reset_requests_method 0
-+     * @magentoConfigFixture current_store customer/password/min_time_between_password_reset_requests 0
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testResetPasswordWithPost()
-+    {
-+        $this->passwordResetRequestEventCreate(
-+            \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST
-+        );
-+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_POST);
-+        $this->dispatch('backend/customer/index/resetPassword');
-+        $this->assertEquals('noroute', $this->getRequest()->getControllerName());
-+    }
-+
-     /**
-      * Checks reset password functionality with default restrictive min time between
-      * password reset requests and customer reset request event.
-@@ -55,7 +74,7 @@ class ResetPasswordTest extends \Magento\TestFramework\TestCase\AbstractBackendC
-         $this->passwordResetRequestEventCreate(
-             \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST
-         );
--        $this->getRequest()->setPostValue(['customer_id' => '1']);
-+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_GET);
-         $this->dispatch('backend/customer/index/resetPassword');
-         $this->assertSessionMessages(
-             $this->equalTo(['The customer will receive an email with a link to reset password.']),
-@@ -78,7 +97,7 @@ class ResetPasswordTest extends \Magento\TestFramework\TestCase\AbstractBackendC
-         $this->passwordResetRequestEventCreate(
-             \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST
-         );
--        $this->getRequest()->setPostValue(['customer_id' => '1']);
-+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_GET);
-         $this->dispatch('backend/customer/index/resetPassword');
-         $this->assertSessionMessages(
-             $this->equalTo(['The customer will receive an email with a link to reset password.']),
-@@ -103,7 +122,7 @@ class ResetPasswordTest extends \Magento\TestFramework\TestCase\AbstractBackendC
-         $this->passwordResetRequestEventCreate(
-             \Magento\Security\Model\PasswordResetRequestEvent::ADMIN_PASSWORD_RESET_REQUEST
-         );
--        $this->getRequest()->setPostValue(['customer_id' => '1']);
-+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_GET);
-         $this->dispatch('backend/customer/index/resetPassword');
-         $this->assertSessionMessages(
-             $this->equalTo(['The customer will receive an email with a link to reset password.']),
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
-index 6448816c934..1b7f2c1f7ef 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
-@@ -12,6 +12,7 @@ use Magento\Customer\Api\CustomerRepositoryInterface;
- use Magento\Customer\Controller\RegistryConstants;
- use Magento\Customer\Model\EmailNotification;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- 
- /**
-  * @magentoAppArea adminhtml
-@@ -45,7 +46,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     protected $objectManager;
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritDoc
-      */
-     protected function setUp()
-     {
-@@ -71,7 +72,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritDoc
-      */
-     protected function tearDown()
-     {
-@@ -91,7 +92,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-      */
-     public function testSaveActionWithEmptyPostData()
-     {
--        $this->getRequest()->setPostValue([]);
-+        $this->getRequest()->setPostValue([])->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/customer/index/save');
-         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl));
-     }
-@@ -102,7 +103,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     public function testSaveActionWithInvalidFormData()
-     {
-         $post = ['account' => ['middlename' => 'test middlename', 'group_id' => 1]];
--        $this->getRequest()->setPostValue($post);
-+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/customer/index/save');
-         /**
-          * Check that errors was generated and set to session
-@@ -111,236 +112,16 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-             $this->logicalNot($this->isEmpty()),
-             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
-         );
-+        /** @var \Magento\Backend\Model\Session $session */
-+        $session = $this->objectManager->get(\Magento\Backend\Model\Session::class);
-         /**
-          * Check that customer data were set to session
-          */
--        $this->assertEquals(
--            $post,
--            $this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerFormData()
--        );
--        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new'));
--    }
--
--    /**
--     * @magentoDbIsolation enabled
--     */
--    public function testSaveActionWithInvalidCustomerAddressData()
--    {
--        $post = [
--            'customer' => [
--                'middlename' => 'test middlename',
--                'group_id' => 1,
--                'website_id' => 0,
--                'firstname' => 'test firstname',
--                'lastname' => 'test lastname',
--                'email' => 'example@domain.com',
--                'default_billing' => '_item1',
--            ],
--            'address' => ['_item1' => []],
--        ];
--        $this->getRequest()->setPostValue($post);
--        $this->dispatch('backend/customer/index/save');
--        /**
--         * Check that errors was generated and set to session
--         */
--        $this->assertSessionMessages(
--            $this->logicalNot($this->isEmpty()),
--            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
--        );
--        /**
--         * Check that customer data were set to session
--         */
--        $this->assertEquals(
--            $post,
--            $this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerFormData()
--        );
-+        $this->assertNotEmpty($session->getCustomerFormData());
-+        $this->assertArraySubset($post, $session->getCustomerFormData());
-         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new'));
-     }
- 
--    /**
--     * @magentoDbIsolation enabled
--     */
--    public function testSaveActionWithValidCustomerDataAndValidAddressData()
--    {
--        $post = [
--            'customer' => [
--                'middlename' => 'test middlename',
--                'group_id' => 1,
--                'website_id' => 0,
--                'firstname' => 'test firstname',
--                'lastname' => 'test lastname',
--                'email' => 'example@domain.com',
--                'default_billing' => '_item1',
--                'password' => 'password',
--            ],
--            'address' => [
--                '_item1' => [
--                    'firstname' => 'test firstname',
--                    'lastname' => 'test lastname',
--                    'street' => ['test street'],
--                    'city' => 'test city',
--                    'region_id' => 10,
--                    'country_id' => 'US',
--                    'postcode' => '01001',
--                    'telephone' => '+7000000001',
--                    'default_billing' => 'true',
--                ],
--            ],
--        ];
--        $this->getRequest()->setPostValue($post);
--        $this->getRequest()->setParam('back', '1');
--
--        // Emulate setting customer data to session in editAction
--        $this->objectManager->get(\Magento\Backend\Model\Session::class)->setCustomerFormData($post);
--
--        $this->dispatch('backend/customer/index/save');
--        /**
--         * Check that errors was generated and set to session
--         */
--        $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
--
--        /**
--         * Check that customer data were cleaned after it was saved successfully
--         */
--        $this->assertEmpty($this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerData());
--
--        /**
--         * Check that success message is set
--         */
--        $this->assertSessionMessages(
--            $this->logicalNot($this->isEmpty()),
--            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
--        );
--
--        /**
--         * Check that customer id set and addresses saved
--         */
--        $registry = $this->objectManager->get(\Magento\Framework\Registry::class);
--        $customerId = $registry->registry(RegistryConstants::CURRENT_CUSTOMER_ID);
--        $customer = $this->customerRepository->getById($customerId);
--        $this->assertEquals('test firstname', $customer->getFirstname());
--        $addresses = $customer->getAddresses();
--        $this->assertEquals(1, count($addresses));
--        $this->assertNotEquals(0, $this->accountManagement->getDefaultBillingAddress($customerId));
--        $this->assertNull($this->accountManagement->getDefaultShippingAddress($customerId));
--
--        $urlPatternParts = [
--            $this->_baseControllerUrl . 'edit',
--            'id/' . $customerId,
--            'back/1',
--        ];
--        $urlPattern = '/^' . str_replace('/', '\/', implode('(/.*/)|/', $urlPatternParts)) . '/';
--
--        $this->assertRedirect(
--            $this->matchesRegularExpression($urlPattern)
--        );
--
--        /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
--        $subscriber = $this->objectManager->get(\Magento\Newsletter\Model\SubscriberFactory::class)->create();
--        $this->assertEmpty($subscriber->getId());
--        $subscriber->loadByCustomerId($customerId);
--        $this->assertEmpty($subscriber->getId());
--    }
--
--    /**
--     * @magentoDataFixture Magento/Customer/_files/customer_sample.php
--     */
--    public function testSaveActionExistingCustomerAndExistingAddressData()
--    {
--        $post = [
--            'customer' => [
--                'entity_id' => '1',
--                'middlename' => 'test middlename',
--                'group_id' => 1,
--                'website_id' => 1,
--                'firstname' => 'test firstname',
--                'lastname' => 'test lastname',
--                'email' => 'customer@example.com',
--                'new_password' => 'auto',
--                'sendemail_store_id' => '1',
--                'sendemail' => '1',
--                'created_at' => '2000-01-01 00:00:00',
--                'default_shipping' => '_item1',
--                'default_billing' => 1,
--            ],
--            'address' => [
--                '1' => [
--                    'firstname' => 'update firstname',
--                    'lastname' => 'update lastname',
--                    'street' => ['update street'],
--                    'city' => 'update city',
--                    'region_id' => 10,
--                    'country_id' => 'US',
--                    'postcode' => '01001',
--                    'telephone' => '+7000000001',
--                    'default_billing' => 'true',
--                ],
--                '_item1' => [
--                    'firstname' => 'new firstname',
--                    'lastname' => 'new lastname',
--                    'street' => ['new street'],
--                    'city' => 'new city',
--                    'region_id' => 10,
--                    'country_id' => 'US',
--                    'postcode' => '01001',
--                    'telephone' => '+7000000001',
--                    'default_shipping' => 'true',
--                ],
--                '_template_' => [
--                    'firstname' => '',
--                    'lastname' => '',
--                    'street' => [],
--                    'city' => '',
--                    'region_id' => 10,
--                    'country_id' => 'US',
--                    'postcode' => '',
--                    'telephone' => '',
--                ],
--            ],
--            'subscription' => '',
--        ];
--        $this->getRequest()->setPostValue($post);
--        $this->getRequest()->setParam('id', 1);
--        $this->dispatch('backend/customer/index/save');
--
--        /** Check that success message is set */
--        $this->assertSessionMessages(
--            $this->equalTo(['You saved the customer.']),
--            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
--        );
--
--        /** Check that customer id set and addresses saved */
--        $registry = $this->objectManager->get(\Magento\Framework\Registry::class);
--        $customerId = $registry->registry(RegistryConstants::CURRENT_CUSTOMER_ID);
--        $customer = $this->customerRepository->getById($customerId);
--        $this->assertEquals('test firstname', $customer->getFirstname());
--
--        /**
--         * Addresses should be removed by
--         * \Magento\Customer\Model\ResourceModel\Customer::_saveAddresses during _afterSave
--         * addressOne - updated
--         * addressTwo - removed
--         * addressThree - removed
--         * _item1 - new address
--         */
--        $addresses = $customer->getAddresses();
--        $this->assertEquals(2, count($addresses));
--        $updatedAddress = $this->addressRepository->getById(1);
--        $this->assertEquals('update firstname', $updatedAddress->getFirstname());
--        $this->assertTrue($updatedAddress->isDefaultBilling());
--        $this->assertEquals($updatedAddress->getId(), $customer->getDefaultBilling());
--        $newAddress = $this->accountManagement->getDefaultShippingAddress($customerId);
--        $this->assertEquals('new firstname', $newAddress->getFirstname());
--
--        /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
--        $subscriber = $this->objectManager->get(\Magento\Newsletter\Model\SubscriberFactory::class)->create();
--        $this->assertEmpty($subscriber->getId());
--        $subscriber->loadByCustomerId($customerId);
--        $this->assertNotEmpty($subscriber->getId());
--        $this->assertEquals(1, $subscriber->getStatus());
--        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'index/key/'));
--    }
--
-     /**
-      * @magentoDataFixture Magento/Newsletter/_files/subscribers.php
-      */
-@@ -365,7 +146,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-             ],
-             'subscription' => '0'
-         ];
--        $this->getRequest()->setPostValue($post);
-+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setParam('id', 1);
-         $this->dispatch('backend/customer/index/save');
- 
-@@ -426,7 +207,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-                 'default_billing' => 1,
-             ]
-         ];
--        $this->getRequest()->setPostValue($post);
-+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setParam('id', 1);
-         $this->dispatch('backend/customer/index/save');
- 
-@@ -473,7 +254,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-             ]
-         ];
-         $this->getRequest()->setParam('ajax', true)->setParam('isAjax', true);
--        $this->getRequest()->setPostValue($post);
-+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setParam('id', 1);
-         $this->dispatch('backend/customer/index/inlineEdit');
- 
-@@ -499,7 +280,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-                 'password' => 'password',
-             ],
-         ];
--        $this->getRequest()->setPostValue($post);
-+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/customer/index/save');
-         /*
-          * Check that error message is set
-@@ -508,13 +289,58 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-             $this->equalTo(['A customer with the same email address already exists in an associated website.']),
-             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
-         );
--        $this->assertEquals(
-+        $this->assertArraySubset(
-             $post,
-             Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->getCustomerFormData()
-         );
-         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new/key/'));
-     }
- 
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer_sample.php
-+     */
-+    public function testSaveActionCoreExceptionFormatFormData()
-+    {
-+        $post = [
-+            'customer' => [
-+                'middlename' => 'test middlename',
-+                'website_id' => 1,
-+                'firstname' => 'test firstname',
-+                'lastname' => 'test lastname',
-+                'email' => 'customer@example.com',
-+                'dob' => '12/3/1996',
-+            ],
-+        ];
-+        $postCustomerFormatted = [
-+            'middlename' => 'test middlename',
-+            'website_id' => 1,
-+            'firstname' => 'test firstname',
-+            'lastname' => 'test lastname',
-+            'email' => 'customer@example.com',
-+            'dob' => '1996-12-03',
-+        ];
-+
-+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
-+        $this->dispatch('backend/customer/index/save');
-+        /*
-+        * Check that error message is set
-+        */
-+        $this->assertSessionMessages(
-+            $this->equalTo(['A customer with the same email address already exists in an associated website.']),
-+            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
-+        );
-+
-+        $customerFormData = Bootstrap::getObjectManager()
-+            ->get(\Magento\Backend\Model\Session::class)
-+            ->getCustomerFormData();
-+        $this->assertEquals(
-+            $postCustomerFormatted,
-+            $customerFormData['customer'],
-+            'Customer form data should be formatted'
-+        );
-+        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new/key/'));
-+    }
-+
-     /**
-      * @magentoDataFixture Magento/Customer/_files/customer_sample.php
-      */
-@@ -529,9 +355,9 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     }
- 
-     /**
--     * Tests new action
-+     * Test new customer form page.
-      */
--    public function testNewAction(): void
-+    public function testNewAction()
-     {
-         $this->dispatch('backend/customer/index/edit');
-         $body = $this->getResponse()->getBody();
-@@ -543,7 +369,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     /**
-      * Test the editing of a new customer that has not been saved but the page has been reloaded
-      */
--    public function testNewActionWithCustomerData()
-+    public function te1stNewActionWithCustomerData()
-     {
-         $customerData = [
-             'customer_id' => 0,
-@@ -666,7 +492,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-         /**
-          * set customer data
-          */
--        $this->getRequest()->setParams($customerData);
-+        $this->getRequest()->setParams($customerData)->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/customer/index/validate');
-         $body = $this->getResponse()->getBody();
- 
-@@ -678,65 +504,13 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-         $this->assertEquals('{"error":0}', $body);
-     }
- 
--    /**
--     * @magentoDataFixture Magento/Customer/_files/customer.php
--     * @magentoDataFixture Magento/Customer/_files/customer_address.php
--     */
--    public function testValidateCustomerWithAddressFailure()
--    {
--        $customerData = [
--            'customer' => [
--                'entity_id' => '1',
--                'middlename' => 'new middlename',
--                'group_id' => 1,
--                'website_id' => 1,
--                'firstname' => '',
--                'lastname' => '',
--                'email' => '*',
--                'default_shipping' => '_item1',
--                'new_password' => 'auto',
--                'sendemail_store_id' => '1',
--                'sendemail' => '1',
--            ],
--            'address' => [
--                '1' => [
--                    'firstname' => '',
--                    'lastname' => '',
--                    'street' => ['update street'],
--                    'city' => 'update city',
--                    'postcode' => '01001',
--                    'telephone' => '',
--                ],
--                '_template_' => [
--                    'lastname' => '',
--                    'street' => [],
--                    'city' => '',
--                    'country_id' => 'US',
--                    'postcode' => '',
--                    'telephone' => '',
--                ],
--            ],
--        ];
--        /**
--         * set customer data
--         */
--        $this->getRequest()->setPostValue($customerData);
--        $this->dispatch('backend/customer/index/validate');
--        $body = $this->getResponse()->getBody();
--
--        $this->assertContains('{"error":true,"messages":', $body);
--        $this->assertContains('\"First Name\" is a required value', $body);
--        $this->assertContains('\"Last Name\" is a required value.', $body);
--        $this->assertContains('\"Country\" is a required value.', $body);
--        $this->assertContains('\"Phone Number\" is a required value.', $body);
--    }
--
-     /**
-      * @magentoDbIsolation enabled
-      */
-     public function testResetPasswordActionNoCustomerId()
-     {
-         // No customer ID in post, will just get redirected to base
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_GET);
-         $this->dispatch('backend/customer/index/resetPassword');
-         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl));
-     }
-@@ -747,6 +521,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     public function testResetPasswordActionBadCustomerId()
-     {
-         // Bad customer ID in post, will just get redirected to base
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_GET);
-         $this->getRequest()->setPostValue(['customer_id' => '789']);
-         $this->dispatch('backend/customer/index/resetPassword');
-         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl));
-@@ -758,6 +533,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-     public function testResetPasswordActionSuccess()
-     {
-         $this->getRequest()->setPostValue(['customer_id' => '1']);
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_GET);
-         $this->dispatch('backend/customer/index/resetPassword');
-         $this->assertSessionMessages(
-             $this->equalTo(['The customer will receive an email with a link to reset password.']),
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
-index 3e086a89f81..3db22b83798 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
-@@ -13,7 +13,9 @@ class LoadTest extends \Magento\TestFramework\TestCase\AbstractController
-         $expected = [
-             'message' => 'The &quot;section&lt;invalid&quot; section source isn&#039;t supported.',
-         ];
--        $this->dispatch('/customer/section/load/?sections=section<invalid&update_section_id=false&_=147066166394');
-+        $this->dispatch(
-+            '/customer/section/load/?sections=section<invalid&force_new_section_timestamp=false&_=147066166394'
-+        );
-         self::assertEquals(json_encode($expected), $this->getResponse()->getBody());
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php
-new file mode 100644
-index 00000000000..54dbdf25dd6
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php
-@@ -0,0 +1,93 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Customer\Controller;
-+
-+use Magento\TestFramework\TestCase\AbstractController;
-+use Magento\Customer\Api\AccountManagementInterface;
-+use Magento\Framework\Data\Form\FormKey;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Customer\Model\Session;
-+use Psr\Log\LoggerInterface;
-+
-+class SendTest extends AbstractController
-+{
-+    /** @var AccountManagementInterface */
-+    private $accountManagement;
-+
-+    /** @var FormKey */
-+    private $formKey;
-+
-+    /**
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $logger = $this->createMock(LoggerInterface::class);
-+        $session = Bootstrap::getObjectManager()->create(
-+            Session::class,
-+            [$logger]
-+        );
-+        $this->accountManagement = Bootstrap::getObjectManager()->create(AccountManagementInterface::class);
-+        $this->formKey = Bootstrap::getObjectManager()->create(FormKey::class);
-+        $customer = $this->accountManagement->authenticate('customer@example.com', 'password');
-+        $session->setCustomerDataAsLoggedIn($customer);
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testExecutePost()
-+    {
-+        $this->getRequest()
-+            ->setMethod('POST')
-+            ->setPostValue(
-+                [
-+                    'form_key' => $this->formKey->getFormKey(),
-+                    'emails' => 'example1@gmail.com, example2@gmail.com, example3@gmail.com'
-+                ]
-+            );
-+
-+        $this->dispatch('wishlist/index/send');
-+        $this->assertRedirect($this->stringContains('wishlist/index/index'));
-+        $this->assertSessionMessages(
-+            $this->equalTo(['Your wish list has been shared.']),
-+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-+        );
-+    }
-+    /**
-+     * @magentoAppIsolation enabled
-+     * @magentoConfigFixture default_store customer/captcha/enable 1
-+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_login 0
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoConfigFixture default_store customer/captcha/forms user_forgotpassword,user_login,share_wishlist_form
-+     *
-+     */
-+    public function testCaptchaFailed()
-+    {
-+        $this->getRequest()
-+            ->setMethod('POST')
-+            ->setPostValue(
-+                [
-+                    'form_key' => $this->formKey->getFormKey(),
-+                    'emails' => 'example1@gmail.com, example2@gmail.com, example3@gmail.com',
-+                    'captcha' => [
-+                        'share_wishlist_form' => 'wrong_captcha_word'
-+                        ]
-+                ]
-+            );
-+
-+        $this->dispatch('wishlist/index/send');
-+        $this->assertRedirect($this->stringContains('wishlist/index/share'));
-+        $this->assertSessionMessages(
-+            $this->equalTo(['Incorrect CAPTCHA']),
-+            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/address_data.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/address_data.php
-new file mode 100644
-index 00000000000..62b7fab906c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/address_data.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+return [
-+    [
-+        'telephone' => 3468676,
-+        'postcode' => 90230,
-+        'country_id' => 'US',
-+        'city' => 'Culver City',
-+        'street' => 'Green str, 67',
-+        'lastname' => 'Smith',
-+        'firstname' => 'John',
-+        'region_id' => 12,
-+    ],
-+    [
-+        'telephone' => 845454465,
-+        'postcode' => 10178,
-+        'country_id' => 'DE',
-+        'city' => 'Berlin',
-+        'street' => ['Tunnel Alexanderpl'],
-+        'lastname' => 'Smith',
-+        'firstname' => 'John',
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_2_addresses.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_2_addresses.php
-new file mode 100644
-index 00000000000..24a99638c64
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_2_addresses.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+require __DIR__ . '/../../Customer/_files/customer.php';
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+$addressData = include __DIR__ . '/address_data.php';
-+
-+/** @var AddressRepositoryInterface $repository */
-+$repository = $objectManager->get(AddressRepositoryInterface::class);
-+foreach ($addressData as $data) {
-+    /** @var AddressInterface $address */
-+    $address = $objectManager->create(AddressInterface::class, ['data' => $data]);
-+    $address->setCustomerId($customer->getId());
-+    $repository->save($address);
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_2_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_2_addresses_rollback.php
-new file mode 100644
-index 00000000000..9e29bd77e2b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_2_addresses_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require __DIR__ . '/../../Customer/_files/customer_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website.php
-new file mode 100644
-index 00000000000..781bcec1670
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+require __DIR__ . '/../../Store/_files/websites_different_countries.php';
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var CustomerInterface $customer */
-+$customer = $objectManager->create(CustomerInterface::class);
-+$customer->setWebsiteId($websiteId)
-+    ->setEmail('customer.web@example.com')
-+    ->setGroupId(1)
-+    ->setStoreId($store->getId())
-+    ->setFirstname('John')
-+    ->setLastname('Doe')
-+    ->setGender(1);
-+
-+/** @var $repository CustomerRepositoryInterface */
-+$repository = $objectManager->get(CustomerRepositoryInterface::class);
-+$customer = $repository->save($customer);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_2_addresses.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_2_addresses.php
-new file mode 100644
-index 00000000000..5dafc0dcae3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_2_addresses.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+require __DIR__ . '/customer_sec_website.php';
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+$addressData = include __DIR__ . '/address_data.php';
-+
-+/** @var AddressRepositoryInterface $repository */
-+$repository = $objectManager->get(AddressRepositoryInterface::class);
-+foreach ($addressData as $data) {
-+    /** @var AddressInterface $address */
-+    $address = $objectManager->create(AddressInterface::class, ['data' => $data]);
-+    $address->setCustomerId($customer->getId());
-+    $repository->save($address);
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_2_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_2_addresses_rollback.php
-new file mode 100644
-index 00000000000..77f1b5d0736
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_2_addresses_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require __DIR__ . '/customer_sec_website_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_rollback.php
-new file mode 100644
-index 00000000000..a5aab413227
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_rollback.php
-@@ -0,0 +1,30 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Framework\Registry;
-+use Magento\Store\Api\WebsiteRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+$registry = $objectManager->get(Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var WebsiteRepositoryInterface $websiteRepository */
-+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
-+$website = $websiteRepository->get('test');
-+
-+/** @var $repository CustomerRepositoryInterface */
-+$repository = $objectManager->get(CustomerRepositoryInterface::class);
-+$customer = $repository->get('customer.web@example.com', $website->getId());
-+$repository->delete($customer);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-+
-+require __DIR__ . '/../../Store/_files/websites_different_countries_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
-index f5b6fdc93d3..754c949747d 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
-@@ -14,6 +14,7 @@ use Magento\Framework\Exception\InputException;
- use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Exception\State\ExpiredException;
- use Magento\Framework\Reflection\DataObjectProcessor;
-+use Magento\Store\Model\StoreManagerInterface;
- use Magento\TestFramework\Helper\Bootstrap;
- 
- /**
-@@ -53,6 +54,9 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-     /** @var \Magento\Framework\Api\ExtensibleDataObjectConverter */
-     private $extensibleDataObjectConverter;
- 
-+    /** @var StoreManagerInterface */
-+    private $storeManager;
-+
-     /** @var  \Magento\Framework\Api\DataObjectHelper */
-     protected $dataObjectHelper;
- 
-@@ -114,6 +118,9 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
- 
-         $this->extensibleDataObjectConverter = $this->objectManager
-             ->create(\Magento\Framework\Api\ExtensibleDataObjectConverter::class);
-+
-+        $this->storeManager = $this->objectManager
-+            ->create(StoreManagerInterface::class);
-     }
- 
-     /**
-@@ -357,6 +364,29 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         }
-     }
- 
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testValidateResetPasswordLinkTokenWithoutId()
-+    {
-+        $token = 'randomStr123';
-+        $this->setResetPasswordData($token, 'Y-m-d H:i:s');
-+        $this->assertTrue(
-+            $this->accountManagement->validateResetPasswordLinkToken(null, $token)
-+        );
-+    }
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/two_customers.php
-+     * @expectedException \Magento\Framework\Exception\State\ExpiredException
-+     */
-+    public function testValidateResetPasswordLinkTokenAmbiguous()
-+    {
-+        $token = 'randomStr123';
-+        $this->setResetPasswordData($token, 'Y-m-d H:i:s', 1);
-+        $this->setResetPasswordData($token, 'Y-m-d H:i:s', 2);
-+        $this->accountManagement->validateResetPasswordLinkToken(null, $token);
-+    }
-+
-     /**
-      * @magentoAppArea frontend
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-@@ -512,6 +542,31 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         }
-     }
- 
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testResetPasswordWithoutEmail()
-+    {
-+        $resetToken = 'lsdj579slkj5987slkj595lkj';
-+        $password = 'new_Password123';
-+        $this->setResetPasswordData($resetToken, 'Y-m-d H:i:s');
-+        $this->assertTrue(
-+            $this->accountManagement->resetPassword(null, $resetToken, $password)
-+        );
-+    }
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/two_customers.php
-+     * @expectedException \Magento\Framework\Exception\State\ExpiredException
-+     */
-+    public function testResetPasswordAmbiguousToken()
-+    {
-+        $resetToken = 'lsdj579slkj5987slkj595lkj';
-+        $password = 'new_Password123';
-+        $this->setResetPasswordData($resetToken, 'Y-m-d H:i:s', 1);
-+        $this->setResetPasswordData($resetToken, 'Y-m-d H:i:s', 2);
-+        $this->accountManagement->resetPassword(null, $resetToken, $password);
-+    }
-+
-     /**
-      * @magentoAppArea frontend
-      * @magentoAppIsolation enabled
-@@ -796,6 +851,44 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * Customer has two addresses one of it is allowed in website and second is not
-+     *
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     * @magentoDataFixture Magento/Store/_files/websites_different_countries.php
-+     * @magentoConfigFixture fixture_second_store_store general/country/allow UA
-+     * @return void
-+     */
-+    public function testCreateNewCustomerWithPasswordHashWithNotAllowedCountry()
-+    {
-+        $customerId = 1;
-+        $allowedCountryIdForSecondWebsite = 'UA';
-+        $store = $this->storeManager->getStore('fixture_second_store');
-+        $customerData = $this->customerRepository->getById($customerId);
-+        $customerData->getAddresses()[1]->setRegion(null)->setCountryId($allowedCountryIdForSecondWebsite)
-+            ->setRegionId(null);
-+        $customerData->setStoreId($store->getId())->setWebsiteId($store->getWebsiteId())->setId(null);
-+        $encryptor = $this->objectManager->get(\Magento\Framework\Encryption\EncryptorInterface::class);
-+        /** @var \Magento\Framework\Math\Random $mathRandom */
-+        $password = $this->objectManager->get(\Magento\Framework\Math\Random::class)->getRandomString(8);
-+        $passwordHash = $encryptor->getHash($password, true);
-+        $savedCustomer = $this->accountManagement->createAccountWithPasswordHash(
-+            $customerData,
-+            $passwordHash
-+        );
-+        $this->assertCount(
-+            1,
-+            $savedCustomer->getAddresses(),
-+            'The wrong address quantity was saved'
-+        );
-+        $this->assertSame(
-+            'UA',
-+            $savedCustomer->getAddresses()[0]->getCountryId(),
-+            'The address with the disallowed country was saved'
-+        );
-+    }
-+
-     /**
-      * @magentoAppArea frontend
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-@@ -960,10 +1053,14 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
-      *
-      * @param $resetToken
-      * @param $date
-+     * @param int $customerIdFromFixture Which customer to use.
-+     * @throws \Exception
-      */
--    protected function setResetPasswordData($resetToken, $date)
--    {
--        $customerIdFromFixture = 1;
-+    protected function setResetPasswordData(
-+        $resetToken,
-+        $date,
-+        int $customerIdFromFixture = 1
-+    ) {
-         /** @var \Magento\Customer\Model\Customer $customerModel */
-         $customerModel = $this->objectManager->create(\Magento\Customer\Model\Customer::class);
-         $customerModel->load($customerIdFromFixture);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AddressTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AddressTest.php
-index 017532fb392..b6e8cba82ad 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Model/AddressTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/AddressTest.php
-@@ -67,4 +67,28 @@ class AddressTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals('CompanyZ', $updatedAddressData->getCompany());
-         $this->assertEquals('99999', $updatedAddressData->getPostcode());
-     }
-+
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer_sample.php
-+     */
-+    public function testUpdateDataForExistingCustomer()
-+    {
-+        /** @var \Magento\Customer\Model\CustomerRegistry $customerRegistry */
-+        $customerRegistry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(CustomerRegistry::class);
-+        /** @var \Magento\Customer\Model\Data\Address $addressData */
-+        $updatedAddressData = $this->addressFactory->create()
-+            ->setId(1)
-+            ->setCustomerId($customerRegistry->retrieveByEmail('customer@example.com')->getId())
-+            ->setCity('CityZ')
-+            ->setCompany('CompanyZ')
-+            ->setPostcode('99999');
-+        $updatedAddressData = $this->addressModel->updateData($updatedAddressData)->getDataModel();
-+
-+        $this->assertEquals(1, $updatedAddressData->getId());
-+        $this->assertEquals('CityZ', $updatedAddressData->getCity());
-+        $this->assertEquals('CompanyZ', $updatedAddressData->getCompany());
-+        $this->assertEquals('99999', $updatedAddressData->getPostcode());
-+        $this->assertEquals(true, $updatedAddressData->isDefaultBilling());
-+        $this->assertEquals(true, $updatedAddressData->isDefaultShipping());
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
-index 336b4386617..a5c69bcd323 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
-@@ -51,16 +51,23 @@ class CustomerMetadataTest extends \PHPUnit\Framework\TestCase
- 
-     public function testGetCustomAttributesMetadata()
-     {
--        $customAttributesMetadata = $this->service->getCustomAttributesMetadata();
--        $this->assertCount(0, $customAttributesMetadata, "Invalid number of attributes returned.");
-+        $customAttributesMetadataQty = count($this->service->getCustomAttributesMetadata()) ;
- 
-         // Verify the consistency of getCustomerAttributeMetadata() function from the 2nd call of the same service
--        $customAttributesMetadata1 = $this->service->getCustomAttributesMetadata();
--        $this->assertCount(0, $customAttributesMetadata1, "Invalid number of attributes returned.");
-+        $customAttributesMetadata1Qty = count($this->service->getCustomAttributesMetadata());
-+        $this->assertEquals(
-+            $customAttributesMetadataQty,
-+            $customAttributesMetadata1Qty,
-+            "Invalid number of attributes returned."
-+        );
- 
-         // Verify the consistency of getCustomAttributesMetadata() function from the 2nd service
--        $customAttributesMetadata2 = $this->serviceTwo->getCustomAttributesMetadata();
--        $this->assertCount(0, $customAttributesMetadata2, "Invalid number of attributes returned.");
-+        $customAttributesMetadata2Qty = count($this->serviceTwo->getCustomAttributesMetadata());
-+        $this->assertEquals(
-+            $customAttributesMetadataQty,
-+            $customAttributesMetadata2Qty,
-+            "Invalid number of attributes returned."
-+        );
-     }
- 
-     public function testGetNestedOptionsCustomerAttributesMetadata()
-@@ -232,10 +239,10 @@ class CustomerMetadataTest extends \PHPUnit\Framework\TestCase
-         $this->assertNotEmpty($attributes);
- 
-         // remove odd extension attributes
--        $allAtrributes = $expectAttrsWithVals;
--        $allAtrributes['created_at'] = $attributes['created_at'];
--        $allAtrributes['updated_at'] = $attributes['updated_at'];
--        $attributes = array_intersect_key($attributes, $allAtrributes);
-+        $allAttributes = $expectAttrsWithVals;
-+        $allAttributes['created_at'] = $attributes['created_at'];
-+        $allAttributes['updated_at'] = $attributes['updated_at'];
-+        $attributes = array_intersect_key($attributes, $allAttributes);
- 
-         foreach ($attributes as $attributeCode => $attributeValue) {
-             $this->assertNotNull($attributeCode);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
-index 4257b5a9285..381c580f55e 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
-@@ -7,12 +7,17 @@
- namespace Magento\Customer\Model\ResourceModel;
- 
- use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Customer\Api\Data\RegionInterfaceFactory;
- use Magento\Framework\Api\SortOrder;
- use Magento\Framework\Exception\InputException;
- use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Store\Api\Data\WebsiteInterface;
-+use Magento\Store\Api\WebsiteRepositoryInterface;
- 
- /**
-- * Integration test for \Magento\Customer\Model\ResourceModel\AddressRepository
-+ * Class with integration tests for AddressRepository.
-  *
-  * @SuppressWarnings(PHPMD.TooManyMethods)
-  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
-@@ -24,37 +29,40 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-     private $repository;
- 
-     /** @var \Magento\Framework\ObjectManagerInterface */
--    private $_objectManager;
-+    private $objectManager;
- 
-     /** @var \Magento\Customer\Model\Data\Address[] */
--    private $_expectedAddresses;
-+    private $expectedAddresses;
- 
-     /** @var \Magento\Customer\Api\Data\AddressInterfaceFactory */
--    private $_addressFactory;
-+    private $addressFactory;
- 
-     /** @var  \Magento\Framework\Api\DataObjectHelper */
--    protected $dataObjectHelper;
-+    private $dataObjectHelper;
- 
-+    /**
-+     * Set up.
-+     */
-     protected function setUp()
-     {
--        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- 
-         /* @var \Magento\Framework\Config\CacheInterface $cache */
--        $cache = $this->_objectManager->create(\Magento\Framework\Config\CacheInterface::class);
-+        $cache = $this->objectManager->create(\Magento\Framework\Config\CacheInterface::class);
-         $cache->remove('extension_attributes_config');
- 
--        $this->repository = $this->_objectManager->create(\Magento\Customer\Api\AddressRepositoryInterface::class);
--        $this->_addressFactory = $this->_objectManager->create(
-+        $this->repository = $this->objectManager->create(\Magento\Customer\Api\AddressRepositoryInterface::class);
-+        $this->addressFactory = $this->objectManager->create(
-             \Magento\Customer\Api\Data\AddressInterfaceFactory::class
-         );
--        $this->dataObjectHelper = $this->_objectManager->create(\Magento\Framework\Api\DataObjectHelper::class);
-+        $this->dataObjectHelper = $this->objectManager->create(\Magento\Framework\Api\DataObjectHelper::class);
- 
--        $regionFactory = $this->_objectManager->create(\Magento\Customer\Api\Data\RegionInterfaceFactory::class);
-+        $regionFactory = $this->objectManager->get(RegionInterfaceFactory::class);
-         $region = $regionFactory->create()
-             ->setRegionCode('AL')
-             ->setRegion('Alabama')
-             ->setRegionId(1);
--        $address = $this->_addressFactory->create()
-+        $address = $this->addressFactory->create()
-             ->setId('1')
-             ->setCountryId('US')
-             ->setCustomerId('1')
-@@ -67,7 +75,7 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-             ->setFirstname('John')
-             ->setLastname('Smith')
-             ->setCompany('CompanyName');
--        $address2 = $this->_addressFactory->create()
-+        $address2 = $this->addressFactory->create()
-             ->setId('2')
-             ->setCountryId('US')
-             ->setCustomerId('1')
-@@ -80,9 +88,12 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-             ->setFirstname('John')
-             ->setLastname('Smith');
- 
--        $this->_expectedAddresses = [$address, $address2];
-+        $this->expectedAddresses = [$address, $address2];
-     }
- 
-+    /**
-+     * Tear down.
-+     */
-     protected function tearDown()
-     {
-         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-@@ -92,6 +103,8 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test for save address changes.
-+     *
-      * @magentoDataFixture  Magento/Customer/_files/customer.php
-      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
-      * @magentoDataFixture  Magento/Customer/_files/customer_two_addresses.php
-@@ -109,10 +122,12 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(2, $proposedAddress->getId());
- 
-         $savedAddress = $this->repository->getById(2);
--        $this->assertNotEquals($this->_expectedAddresses[1]->getTelephone(), $savedAddress->getTelephone());
-+        $this->assertNotEquals($this->expectedAddresses[1]->getTelephone(), $savedAddress->getTelephone());
-     }
- 
-     /**
-+     * Test for method save address with new id.
-+     *
-      * @magentoDataFixture  Magento/Customer/_files/customer.php
-      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
-      * @magentoDataFixture  Magento/Customer/_files/customer_two_addresses.php
-@@ -127,6 +142,8 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test for method get address by id.
-+     *
-      * @magentoDataFixture  Magento/Customer/_files/customer.php
-      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
-      * @magentoDataFixture  Magento/Customer/_files/customer_two_addresses.php
-@@ -136,10 +153,12 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-     {
-         $addressId = 2;
-         $address = $this->repository->getById($addressId);
--        $this->assertEquals($this->_expectedAddresses[1], $address);
-+        $this->assertEquals($this->expectedAddresses[1], $address);
-     }
- 
-     /**
-+     * Test for method get address by id with incorrect id.
-+     *
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-      * @expectedExceptionMessage No such entity with addressId = 12345
-@@ -150,6 +169,8 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test for method save new address.
-+     *
-      * @magentoDataFixture  Magento/Customer/_files/customer.php
-      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
-      * @magentoAppIsolation enabled
-@@ -163,20 +184,21 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
- 
-         $savedAddress = $this->repository->getById($returnedAddress->getId());
- 
--        $expectedNewAddress = $this->_expectedAddresses[1];
-+        $expectedNewAddress = $this->expectedAddresses[1];
-         $expectedNewAddress->setId($savedAddress->getId());
--        $expectedNewAddress->setRegion($this->_expectedAddresses[1]->getRegion());
-+        $expectedNewAddress->setRegion($this->expectedAddresses[1]->getRegion());
- 
-         $this->assertEquals($expectedNewAddress->getExtensionAttributes(), $savedAddress->getExtensionAttributes());
-         $this->assertEquals(
-             $expectedNewAddress->getRegion()->getExtensionAttributes(),
-             $savedAddress->getRegion()->getExtensionAttributes()
-         );
--
-         $this->assertEquals($expectedNewAddress, $savedAddress);
-     }
- 
-     /**
-+     * Test for method saaveNewAddress with new attributes.
-+     *
-      * @magentoDataFixture  Magento/Customer/_files/customer.php
-      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
-      * @magentoAppIsolation enabled
-@@ -202,6 +224,8 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test for saving address with invalid address.
-+     *
-      * @magentoDataFixture  Magento/Customer/_files/customer.php
-      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
-      * @magentoAppIsolation enabled
-@@ -225,6 +249,11 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-         }
-     }
- 
-+    /**
-+     * Test for saving address without existing customer.
-+     *
-+     * @return void
-+     */
-     public function testSaveAddressesCustomerIdNotExist()
-     {
-         $proposedAddress = $this->_createSecondAddress()->setCustomerId(4200);
-@@ -236,6 +265,11 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-         }
-     }
- 
-+    /**
-+     * Test for saving addresses with invalid customer id.
-+     *
-+     * @return void
-+     */
-     public function testSaveAddressesCustomerIdInvalid()
-     {
-         $proposedAddress = $this->_createSecondAddress()->setCustomerId('this_is_not_a_valid_id');
-@@ -248,6 +282,8 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test for delete method.
-+     *
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-      * @magentoDataFixture Magento/Customer/_files/customer_address.php
-      */
-@@ -271,6 +307,8 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test for deleteAddressById.
-+     *
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-      * @magentoDataFixture Magento/Customer/_files/customer_address.php
-      */
-@@ -294,6 +332,8 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test delete address from customer with incorrect address id.
-+     *
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-      */
-     public function testDeleteAddressFromCustomerBadAddressId()
-@@ -307,10 +347,13 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test for searching addressed.
-+     *
-      * @param \Magento\Framework\Api\Filter[] $filters
-      * @param \Magento\Framework\Api\Filter[] $filterGroup
-      * @param \Magento\Framework\Api\SortOrder[] $filterOrders
-      * @param array $expectedResult array of expected results indexed by ID
-+     * @param int $currentPage current page for search criteria
-      *
-      * @dataProvider searchAddressDataProvider
-      *
-@@ -318,10 +361,10 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-      * @magentoDataFixture  Magento/Customer/_files/customer_two_addresses.php
-      * @magentoAppIsolation enabled
-      */
--    public function testSearchAddresses($filters, $filterGroup, $filterOrders, $expectedResult)
-+    public function testSearchAddresses($filters, $filterGroup, $filterOrders, $expectedResult, $currentPage)
-     {
-         /** @var \Magento\Framework\Api\SearchCriteriaBuilder $searchBuilder */
--        $searchBuilder = $this->_objectManager->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
-+        $searchBuilder = $this->objectManager->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
-         foreach ($filters as $filter) {
-             $searchBuilder->addFilters([$filter]);
-         }
-@@ -335,7 +378,7 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-         }
- 
-         $searchBuilder->setPageSize(1);
--        $searchBuilder->setCurrentPage(2);
-+        $searchBuilder->setCurrentPage($currentPage);
- 
-         $searchCriteria = $searchBuilder->create();
-         $searchResults = $this->repository->getList($searchCriteria);
-@@ -353,6 +396,11 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($expectedResult[$expectedResultIndex]['firstname'], $items[0]->getFirstname());
-     }
- 
-+    /**
-+     * Data provider for searchAddresses.
-+     *
-+     * @return array
-+     */
-     public function searchAddressDataProvider()
-     {
-         /**
-@@ -373,6 +421,7 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-                 [
-                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
-                 ],
-+                1
-             ],
-             'Address with city CityM' => [
-                 [$filterBuilder->setField('city')->setValue('CityM')->create()],
-@@ -381,6 +430,7 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-                 [
-                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
-                 ],
-+                1
-             ],
-             'Addresses with firstname John sorted by firstname desc, city asc' => [
-                 [$filterBuilder->setField('firstname')->setValue('John')->create()],
-@@ -393,6 +443,7 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
-                     ['id' => 2, 'city' => 'CityX', 'postcode' => 47676, 'firstname' => 'John'],
-                 ],
-+                2
-             ],
-             'Addresses with postcode of either 75477 or 47676 sorted by city desc' => [
-                 [],
-@@ -407,6 +458,7 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-                     ['id' => 2, 'city' => 'CityX', 'postcode' => 47676, 'firstname' => 'John'],
-                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
-                 ],
-+                2
-             ],
-             'Addresses with postcode greater than 0 sorted by firstname asc, postcode desc' => [
-                 [$filterBuilder->setField('postcode')->setValue('0')->setConditionType('gt')->create()],
-@@ -419,10 +471,41 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-                     ['id' => 2, 'city' => 'CityX', 'postcode' => 47676, 'firstname' => 'John'],
-                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
-                 ],
-+                2
-             ],
-         ];
-     }
- 
-+    /**
-+     * Test for save addresses with restricted countries.
-+     *
-+     * @magentoDataFixture Magento/Customer/Fixtures/customer_sec_website.php
-+     */
-+    public function testSaveAddressWithRestrictedCountries()
-+    {
-+        $website = $this->getWebsite('test');
-+        $customer = $this->getCustomer('customer.web@example.com', (int)$website->getId());
-+        $regionFactory = $this->objectManager->get(RegionInterfaceFactory::class);
-+        $region = $regionFactory->create()
-+            ->setRegionCode('CA')
-+            ->setRegion('California')
-+            ->setRegionId(12);
-+        $addressData = [
-+            'customer_id' => $customer->getId(),
-+            'firstname' => 'John',
-+            'lastname' => 'Doe',
-+            'street' => ['6161 Main Street'],
-+            'city' => 'Culver City',
-+            'country_id' => 'US',
-+            'region' => $region,
-+            'postcode' => 90230,
-+            'telephone' => '555655431'
-+        ];
-+        $address = $this->addressFactory->create(['data' => $addressData]);
-+        $saved = $this->repository->save($address);
-+        self::assertNotEmpty($saved->getId());
-+    }
-+
-     /**
-      * Helper function that returns an Address Data Object that matches the data from customer_address fixture
-      *
-@@ -430,14 +513,14 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     private function _createFirstAddress()
-     {
--        $address = $this->_addressFactory->create();
-+        $address = $this->addressFactory->create();
-         $this->dataObjectHelper->mergeDataObjects(
-             \Magento\Customer\Api\Data\AddressInterface::class,
-             $address,
--            $this->_expectedAddresses[0]
-+            $this->expectedAddresses[0]
-         );
-         $address->setId(null);
--        $address->setRegion($this->_expectedAddresses[0]->getRegion());
-+        $address->setRegion($this->expectedAddresses[0]->getRegion());
-         return $address;
-     }
- 
-@@ -448,14 +531,44 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     private function _createSecondAddress()
-     {
--        $address = $this->_addressFactory->create();
-+        $address = $this->addressFactory->create();
-         $this->dataObjectHelper->mergeDataObjects(
-             \Magento\Customer\Api\Data\AddressInterface::class,
-             $address,
--            $this->_expectedAddresses[1]
-+            $this->expectedAddresses[1]
-         );
-         $address->setId(null);
--        $address->setRegion($this->_expectedAddresses[1]->getRegion());
-+        $address->setRegion($this->expectedAddresses[1]->getRegion());
-         return $address;
-     }
-+
-+    /**
-+     * Gets customer entity.
-+     *
-+     * @param string $email
-+     * @param int $websiteId
-+     * @return CustomerInterface
-+     * @throws NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function getCustomer(string $email, int $websiteId): CustomerInterface
-+    {
-+        /** @var CustomerRepositoryInterface $repository */
-+        $repository = $this->objectManager->get(CustomerRepositoryInterface::class);
-+        return $repository->get($email, $websiteId);
-+    }
-+
-+    /**
-+     * Gets website entity.
-+     *
-+     * @param string $code
-+     * @return WebsiteInterface
-+     * @throws NoSuchEntityException
-+     */
-+    private function getWebsite(string $code): WebsiteInterface
-+    {
-+        /** @var WebsiteRepositoryInterface $repository */
-+        $repository = $this->objectManager->get(WebsiteRepositoryInterface::class);
-+        return $repository->get($code);
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php
-index 1af093bea06..75dfcf7e8f2 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php
-@@ -8,8 +8,24 @@ namespace Magento\Customer\Model\ResourceModel;
- 
- use Magento\Customer\Api\AccountManagementInterface;
- use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
-+use Magento\Customer\Api\Data\AddressInterfaceFactory;
-+use Magento\Customer\Api\Data\RegionInterfaceFactory;
-+use Magento\Framework\Api\ExtensibleDataObjectConverter;
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\Framework\Encryption\EncryptorInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Customer\Model\CustomerRegistry;
- use Magento\Framework\Api\SortOrder;
-+use Magento\Framework\Config\CacheInterface;
-+use Magento\Framework\ObjectManagerInterface;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Api\FilterBuilder;
-+use Magento\Framework\Api\SortOrderBuilder;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Customer\Model\Customer;
- 
- /**
-  * Checks Customer insert, update, search with repository
-@@ -24,60 +40,65 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-     /** @var CustomerRepositoryInterface */
-     private $customerRepository;
- 
--    /** @var \Magento\Framework\ObjectManagerInterface */
-+    /** @var ObjectManagerInterface */
-     private $objectManager;
- 
--    /** @var \Magento\Customer\Api\Data\CustomerInterfaceFactory */
-+    /** @var CustomerInterfaceFactory */
-     private $customerFactory;
- 
--    /** @var \Magento\Customer\Api\Data\AddressInterfaceFactory */
-+    /** @var AddressInterfaceFactory */
-     private $addressFactory;
- 
--    /** @var \Magento\Customer\Api\Data\RegionInterfaceFactory */
-+    /** @var RegionInterfaceFactory */
-     private $regionFactory;
- 
--    /** @var \Magento\Framework\Api\ExtensibleDataObjectConverter */
-+    /** @var ExtensibleDataObjectConverter */
-     private $converter;
- 
--    /** @var \Magento\Framework\Api\DataObjectHelper  */
-+    /** @var DataObjectHelper  */
-     protected $dataObjectHelper;
- 
--    /** @var \Magento\Framework\Encryption\EncryptorInterface */
-+    /** @var EncryptorInterface */
-     protected $encryptor;
- 
--    /** @var \Magento\Customer\Model\CustomerRegistry */
-+    /** @var CustomerRegistry */
-     protected $customerRegistry;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->objectManager = Bootstrap::getObjectManager();
--        $this->customerRepository =
--            $this->objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
--        $this->customerFactory =
--            $this->objectManager->create(\Magento\Customer\Api\Data\CustomerInterfaceFactory::class);
--        $this->addressFactory = $this->objectManager->create(\Magento\Customer\Api\Data\AddressInterfaceFactory::class);
--        $this->regionFactory = $this->objectManager->create(\Magento\Customer\Api\Data\RegionInterfaceFactory::class);
--        $this->accountManagement =
--            $this->objectManager->create(\Magento\Customer\Api\AccountManagementInterface::class);
--        $this->converter = $this->objectManager->create(\Magento\Framework\Api\ExtensibleDataObjectConverter::class);
--        $this->dataObjectHelper = $this->objectManager->create(\Magento\Framework\Api\DataObjectHelper::class);
--        $this->encryptor = $this->objectManager->create(\Magento\Framework\Encryption\EncryptorInterface::class);
--        $this->customerRegistry = $this->objectManager->create(\Magento\Customer\Model\CustomerRegistry::class);
--
--        /** @var \Magento\Framework\Config\CacheInterface $cache */
--        $cache = $this->objectManager->create(\Magento\Framework\Config\CacheInterface::class);
-+        $this->customerRepository = $this->objectManager->create(CustomerRepositoryInterface::class);
-+        $this->customerFactory = $this->objectManager->create(CustomerInterfaceFactory::class);
-+        $this->addressFactory = $this->objectManager->create(AddressInterfaceFactory::class);
-+        $this->regionFactory = $this->objectManager->create(RegionInterfaceFactory::class);
-+        $this->accountManagement = $this->objectManager->create(AccountManagementInterface::class);
-+        $this->converter = $this->objectManager->create(ExtensibleDataObjectConverter::class);
-+        $this->dataObjectHelper = $this->objectManager->create(DataObjectHelper::class);
-+        $this->encryptor = $this->objectManager->create(EncryptorInterface::class);
-+        $this->customerRegistry = $this->objectManager->create(CustomerRegistry::class);
-+
-+        /** @var CacheInterface $cache */
-+        $cache = $this->objectManager->create(CacheInterface::class);
-         $cache->remove('extension_attributes_config');
-     }
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function tearDown()
-     {
--        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $objectManager = Bootstrap::getObjectManager();
-         /** @var \Magento\Customer\Model\CustomerRegistry $customerRegistry */
--        $customerRegistry = $objectManager->get(\Magento\Customer\Model\CustomerRegistry::class);
-+        $customerRegistry = $objectManager->get(CustomerRegistry::class);
-         $customerRegistry->remove(1);
-     }
- 
-     /**
-+     * Check if first name update was successful
-+     *
-      * @magentoDbIsolation enabled
-      */
-     public function testCreateCustomerNewThenUpdateFirstName()
-@@ -99,7 +120,7 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $newCustomerFirstname = 'New First Name';
-         $updatedCustomer = $this->customerFactory->create();
-         $this->dataObjectHelper->mergeDataObjects(
--            \Magento\Customer\Api\Data\CustomerInterface::class,
-+            CustomerInterface::class,
-             $updatedCustomer,
-             $customer
-         );
-@@ -112,6 +133,8 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test create new customer
-+     *
-      * @magentoDbIsolation enabled
-      */
-     public function testCreateNewCustomer()
-@@ -139,6 +162,8 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test update customer
-+     *
-      * @dataProvider updateCustomerDataProvider
-      * @magentoAppArea frontend
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-@@ -168,7 +193,7 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->dataObjectHelper->populateWithArray(
-             $customerDetails,
-             $customerData,
--            \Magento\Customer\Api\Data\CustomerInterface::class
-+            CustomerInterface::class
-         );
-         $this->customerRepository->save($customerDetails, $newPasswordHash);
-         $customerAfter = $this->customerRepository->getById($existingCustomerId);
-@@ -187,12 +212,12 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $attributesBefore = $this->converter->toFlatArray(
-             $customerBefore,
-             [],
--            \Magento\Customer\Api\Data\CustomerInterface::class
-+            CustomerInterface::class
-         );
-         $attributesAfter = $this->converter->toFlatArray(
-             $customerAfter,
-             [],
--            \Magento\Customer\Api\Data\CustomerInterface::class
-+            CustomerInterface::class
-         );
-         // ignore 'updated_at'
-         unset($attributesBefore['updated_at']);
-@@ -215,6 +240,8 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test update customer address
-+     *
-      * @magentoAppArea frontend
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-@@ -233,14 +260,14 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->dataObjectHelper->populateWithArray(
-             $newAddressDataObject,
-             $newAddress,
--            \Magento\Customer\Api\Data\AddressInterface::class
-+            AddressInterface::class
-         );
-         $newAddressDataObject->setRegion($addresses[0]->getRegion());
-         $newCustomerEntity = $this->customerFactory->create();
-         $this->dataObjectHelper->populateWithArray(
-             $newCustomerEntity,
-             $customerDetails,
--            \Magento\Customer\Api\Data\CustomerInterface::class
-+            CustomerInterface::class
-         );
-         $newCustomerEntity->setId($customerId)
-             ->setAddresses([$newAddressDataObject, $addresses[1]]);
-@@ -256,6 +283,8 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test preserve all addresses after customer update
-+     *
-      * @magentoAppArea frontend
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-@@ -269,7 +298,7 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->dataObjectHelper->populateWithArray(
-             $newCustomerEntity,
-             $customerDetails,
--            \Magento\Customer\Api\Data\CustomerInterface::class
-+            CustomerInterface::class
-         );
-         $newCustomerEntity->setId($customer->getId())
-             ->setAddresses(null);
-@@ -281,6 +310,8 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test update delete all addresses with empty arrays
-+     *
-      * @magentoAppArea frontend
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-@@ -294,7 +325,7 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->dataObjectHelper->populateWithArray(
-             $newCustomerEntity,
-             $customerDetails,
--            \Magento\Customer\Api\Data\CustomerInterface::class
-+            CustomerInterface::class
-         );
-         $newCustomerEntity->setId($customer->getId())
-             ->setAddresses([]);
-@@ -306,6 +337,51 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test customer update with new address
-+     *
-+     * @magentoAppArea frontend
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-+     */
-+    public function testUpdateCustomerWithNewAddress()
-+    {
-+        $customerId = 1;
-+        $customer = $this->customerRepository->getById($customerId);
-+        $customerDetails = $customer->__toArray();
-+        unset($customerDetails['default_billing']);
-+        unset($customerDetails['default_shipping']);
-+
-+        $beforeSaveCustomer = $this->customerFactory->create();
-+        $this->dataObjectHelper->populateWithArray(
-+            $beforeSaveCustomer,
-+            $customerDetails,
-+            CustomerInterface::class
-+        );
-+
-+        $addresses = $customer->getAddresses();
-+        $beforeSaveAddress = $addresses[0]->__toArray();
-+        unset($beforeSaveAddress['id']);
-+        $newAddressDataObject = $this->addressFactory->create();
-+        $this->dataObjectHelper->populateWithArray(
-+            $newAddressDataObject,
-+            $beforeSaveAddress,
-+            AddressInterface::class
-+        );
-+
-+        $beforeSaveCustomer->setAddresses([$newAddressDataObject]);
-+        $this->customerRepository->save($beforeSaveCustomer);
-+
-+        $newCustomer = $this->customerRepository->getById($customerId);
-+        $newCustomerAddresses = $newCustomer->getAddresses();
-+        $addressId = $newCustomerAddresses[0]->getId();
-+
-+        $this->assertEquals($newCustomer->getDefaultBilling(), $addressId, "Default billing invalid value");
-+        $this->assertEquals($newCustomer->getDefaultShipping(), $addressId, "Default shipping invalid value");
-+    }
-+
-+    /**
-+     * Test search customers
-+     *
-      * @param \Magento\Framework\Api\Filter[] $filters
-      * @param \Magento\Framework\Api\Filter[] $filterGroup
-      * @param array $expectedResult array of expected results indexed by ID
-@@ -317,9 +393,8 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testSearchCustomers($filters, $filterGroup, $expectedResult)
-     {
--        /** @var \Magento\Framework\Api\SearchCriteriaBuilder $searchBuilder */
--        $searchBuilder = Bootstrap::getObjectManager()
--            ->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
-+        /** @var SearchCriteriaBuilder $searchBuilder */
-+        $searchBuilder = Bootstrap::getObjectManager()->create(SearchCriteriaBuilder::class);
-         foreach ($filters as $filter) {
-             $searchBuilder->addFilters([$filter]);
-         }
-@@ -346,19 +421,19 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testSearchCustomersOrder()
-     {
--        /** @var \Magento\Framework\Api\SearchCriteriaBuilder $searchBuilder */
-+        /** @var SearchCriteriaBuilder $searchBuilder */
-         $objectManager = Bootstrap::getObjectManager();
--        $searchBuilder = $objectManager->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
-+        $searchBuilder = $objectManager->create(SearchCriteriaBuilder::class);
- 
-         // Filter for 'firstname' like 'First'
--        $filterBuilder = $objectManager->create(\Magento\Framework\Api\FilterBuilder::class);
-+        $filterBuilder = $objectManager->create(FilterBuilder::class);
-         $firstnameFilter = $filterBuilder->setField('firstname')
-             ->setConditionType('like')
-             ->setValue('First%')
-             ->create();
-         $searchBuilder->addFilters([$firstnameFilter]);
-         // Search ascending order
--        $sortOrderBuilder = $objectManager->create(\Magento\Framework\Api\SortOrderBuilder::class);
-+        $sortOrderBuilder = $objectManager->create(SortOrderBuilder::class);
-         $sortOrder = $sortOrderBuilder
-             ->setField('lastname')
-             ->setDirection(SortOrder::SORT_ASC)
-@@ -383,6 +458,8 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test delete
-+     *
-      * @magentoAppArea adminhtml
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-      * @magentoAppIsolation enabled
-@@ -393,12 +470,14 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $customer = $this->customerRepository->get($fixtureCustomerEmail);
-         $this->customerRepository->delete($customer);
-         /** Ensure that customer was deleted */
--        $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class);
-+        $this->expectException(NoSuchEntityException::class);
-         $this->expectExceptionMessage('No such entity with email = customer@example.com, websiteId = 1');
-         $this->customerRepository->get($fixtureCustomerEmail);
-     }
- 
-     /**
-+     * Test delete by id
-+     *
-      * @magentoAppArea adminhtml
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-      * @magentoAppIsolation enabled
-@@ -409,7 +488,7 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $fixtureCustomerId = 1;
-         $this->customerRepository->deleteById($fixtureCustomerId);
-         /** Ensure that customer was deleted */
--        $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class);
-+        $this->expectException(NoSuchEntityException::class);
-         $this->expectExceptionMessage('No such entity with email = customer@example.com, websiteId = 1');
-         $this->customerRepository->get($fixtureCustomerEmail);
-     }
-@@ -433,9 +512,14 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
-+    /**
-+     * Search customer data provider
-+     *
-+     * @return array
-+     */
-     public function searchCustomersDataProvider()
-     {
--        $builder = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\FilterBuilder::class);
-+        $builder = Bootstrap::getObjectManager()->create(FilterBuilder::class);
-         return [
-             'Customer with specific email' => [
-                 [$builder->setField('email')->setValue('customer@search.example.com')->create()],
-@@ -485,9 +569,9 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $defaultShipping
-     ) {
-         /**
--         * @var \Magento\Customer\Model\Customer $customer
-+         * @var Customer $customer
-          */
--        $customer = $this->objectManager->create(\Magento\Customer\Model\Customer::class);
-+        $customer = $this->objectManager->create(Customer::class);
-         /** @var \Magento\Customer\Model\Customer $customer */
-         $customer->load($customerId);
-         $this->assertEquals(
-@@ -503,6 +587,8 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test update default shipping and default billing address
-+     *
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-      * @magentoDbIsolation enabled
-      */
-@@ -530,13 +616,13 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(
-             $savedCustomer->getDefaultBilling(),
-             $oldDefaultBilling,
--            'Default billing shoud not be overridden'
-+            'Default billing should not be overridden'
-         );
- 
-         $this->assertEquals(
-             $savedCustomer->getDefaultShipping(),
-             $oldDefaultShipping,
--            'Default shipping shoud not be overridden'
-+            'Default shipping should not be overridden'
-         );
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionReindexOnAccountLockTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionReindexOnAccountLockTest.php
-new file mode 100644
-index 00000000000..a665046ceef
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionReindexOnAccountLockTest.php
-@@ -0,0 +1,89 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Customer\Model\ResourceModel\Grid;
-+
-+use Magento\Customer\Api\AccountManagementInterface;
-+use Magento\Customer\Model\CustomerRegistry;
-+use Magento\Framework\Exception\InvalidEmailOrPasswordException;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\Indexer\TestCase;
-+use Magento\Tests\NamingConvention\true\mixed;
-+
-+/**
-+ * Test if customer account lock on too many failed authentication attempts triggers customer grid reindex
-+ *
-+ * @SuppressWarnings(PHPMD)
-+ */
-+class CollectionReindexOnAccountLockTest extends TestCase
-+{
-+    /**
-+     * Trigger customer account lock by making 10 failed authentication attempts
-+     */
-+    private function lockCustomerAccountWithInvalidAuthentications()
-+    {
-+        /** @var AccountManagementInterface */
-+        $accountManagement = Bootstrap::getObjectManager()->create(AccountManagementInterface::class);
-+
-+        for ($i = 0; $i < 10; $i++) {
-+            try {
-+                $accountManagement->authenticate('customer@example.com', 'wrongPassword');
-+                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-+            } catch (InvalidEmailOrPasswordException $e) {
-+            }
-+        }
-+    }
-+
-+    /**
-+     * @return mixed
-+     * @throws NoSuchEntityException
-+     */
-+    private function getCustomerLockExpire(): ?string
-+    {
-+        /** @var CustomerRegistry $customerRegistry */
-+        $customerRegistry = Bootstrap::getObjectManager()->create(CustomerRegistry::class);
-+        $customerModel = $customerRegistry->retrieve(1);
-+        $this->assertNotEmpty($customerModel);
-+
-+        return $customerModel->getData('lock_expires');
-+    }
-+
-+    /**
-+     * @return mixed
-+     */
-+    private function getCustomerGridLockExpire(): ?string
-+    {
-+        /** @var Collection */
-+        $gridCustomerCollection = Bootstrap::getObjectManager()->create(Collection::class);
-+        $gridCustomerItem = $gridCustomerCollection->getItemById(1);
-+        $this->assertNotEmpty($gridCustomerItem);
-+
-+        return $gridCustomerItem->getData('lock_expires');
-+    }
-+
-+    /**
-+     * Test if customer account lock on too many failed authentication attempts triggers customer grid reindex
-+     *
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoAppIsolation enabled
-+     * @magentoDbIsolation disabled
-+     */
-+    public function testCustomerAccountReindexOnLock()
-+    {
-+        $this->assertSame(
-+            $this->getCustomerGridLockExpire(),
-+            $this->getCustomerLockExpire()
-+        );
-+
-+        $this->lockCustomerAccountWithInvalidAuthentications();
-+
-+        $this->assertSame(
-+            $this->getCustomerGridLockExpire(),
-+            $this->getCustomerLockExpire()
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable.php
-new file mode 100644
-index 00000000000..7d4e451db51
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Framework\App\Config\MutableScopeConfigInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+$mutableScopeConfig = $objectManager->create(MutableScopeConfigInterface::class);
-+
-+$mutableScopeConfig->setValue(
-+    'customer/create_account/confirm',
-+    0,
-+    ScopeInterface::SCOPE_WEBSITES,
-+    null
-+);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable_rollback.php
-new file mode 100644
-index 00000000000..36743b4a20e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable_rollback.php
-@@ -0,0 +1,23 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\Config\Model\ResourceModel\Config;
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var Registry $registry */
-+$registry = Bootstrap::getObjectManager()->get(Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var Config $config */
-+$config = Bootstrap::getObjectManager()->create(Config::class);
-+$config->deleteConfig('customer/create_account/confirm');
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable.php
-new file mode 100644
-index 00000000000..c8deb7ec2a5
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\Store\Model\ScopeInterface;
-+use Magento\Framework\App\Config\MutableScopeConfigInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+$mutableScopeConfig = $objectManager->create(MutableScopeConfigInterface::class);
-+
-+$mutableScopeConfig->setValue(
-+    'customer/create_account/confirm',
-+    1,
-+    ScopeInterface::SCOPE_WEBSITES,
-+    null
-+);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable_rollback.php
-new file mode 100644
-index 00000000000..36743b4a20e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable_rollback.php
-@@ -0,0 +1,23 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\Config\Model\ResourceModel\Config;
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var Registry $registry */
-+$registry = Bootstrap::getObjectManager()->get(Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var Config $config */
-+$config = Bootstrap::getObjectManager()->create(Config::class);
-+$config->deleteConfig('customer/create_account/confirm');
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php
-new file mode 100644
-index 00000000000..c4f046bac57
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php
-@@ -0,0 +1,37 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Customer\Model\Customer;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+include __DIR__ . '/customer_confirmation_config_enable.php';
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var Customer $customer */
-+$customer = $objectManager->create(Customer::class);
-+/** @var CustomerRepositoryInterface $customerRepository */
-+$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
-+/** @var CustomerInterface $customerInterface */
-+$customerInterface = $objectManager->create(CustomerInterface::class);
-+
-+$customerInterface->setWebsiteId(1)
-+    ->setEmail('customer+confirmation@example.com')
-+    ->setConfirmation($customer->getRandomConfirmationKey())
-+    ->setGroupId(1)
-+    ->setStoreId(1)
-+    ->setFirstname('John')
-+    ->setLastname('Smith')
-+    ->setDefaultBilling(1)
-+    ->setDefaultShipping(1)
-+    ->setTaxvat('12')
-+    ->setGender(0);
-+
-+$customerRepository->save($customerInterface, 'password');
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars_rollback.php
-new file mode 100644
-index 00000000000..7a0ebf74ed8
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars_rollback.php
-@@ -0,0 +1,31 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+include __DIR__ . '/customer_confirmation_config_enable_rollback.php';
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var Registry $registry */
-+$registry = Bootstrap::getObjectManager()->get(Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var CustomerRepositoryInterface $customerRepository */
-+$customerRepository = Bootstrap::getObjectManager()->create(CustomerRepositoryInterface::class);
-+
-+try {
-+    $customer = $customerRepository->get('customer+confirmation@example.com');
-+    $customerRepository->delete($customer);
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+    // Customer with the specified email does not exist
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_no_password.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_no_password.php
-new file mode 100644
-index 00000000000..0340f0f841c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_no_password.php
-@@ -0,0 +1,33 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+use Magento\Customer\Model\CustomerRegistry;
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+/** @var $repository \Magento\Customer\Api\CustomerRepositoryInterface */
-+$repository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-+$customer = $objectManager->create(\Magento\Customer\Model\Customer::class);
-+/** @var CustomerRegistry $customerRegistry */
-+$customerRegistry = $objectManager->get(CustomerRegistry::class);
-+/** @var Magento\Customer\Model\Customer $customer */
-+$customer->setWebsiteId(1)
-+    ->setId(1)
-+    ->setEmail('customer@example.com')
-+    ->setGroupId(1)
-+    ->setStoreId(1)
-+    ->setIsActive(1)
-+    ->setPrefix('Mr.')
-+    ->setFirstname('John')
-+    ->setMiddlename('A')
-+    ->setLastname('Smith')
-+    ->setSuffix('Esq.')
-+    ->setDefaultBilling(1)
-+    ->setDefaultShipping(1)
-+    ->setTaxvat('12')
-+    ->setGender(0);
-+
-+$customer->isObjectNew(true);
-+$customer->save();
-+$customerRegistry->remove($customer->getId());
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_one_address.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_one_address.php
-new file mode 100644
-index 00000000000..1ae532e32a9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_one_address.php
-@@ -0,0 +1,78 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Customer\Model\CustomerRegistry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Model\Customer;
-+use Magento\Customer\Model\Address;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Model\AddressRegistry;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+//Creating customer
-+/** @var $repository CustomerRepositoryInterface */
-+$repository = $objectManager->create(CustomerRepositoryInterface::class);
-+/** @var Customer $customer */
-+$customer = $objectManager->create(Customer::class);
-+/** @var CustomerRegistry $customerRegistry */
-+$customerRegistry = $objectManager->get(CustomerRegistry::class);
-+$customer->setWebsiteId(1)
-+    ->setEmail('customer_one_address@test.com')
-+    ->setPassword('password')
-+    ->setGroupId(1)
-+    ->setStoreId(1)
-+    ->setIsActive(1)
-+    ->setPrefix('Mr.')
-+    ->setFirstname('John')
-+    ->setMiddlename('A')
-+    ->setLastname('Smith')
-+    ->setSuffix('Esq.')
-+    ->setTaxvat('12')
-+    ->setGender(0)
-+    ->setId(1);
-+
-+$customer->isObjectNew(true);
-+$customer->save();
-+$customerRegistry->remove($customer->getId());
-+
-+//Creating address
-+/** @var Address $customerAddress */
-+$customerAddress = $objectManager->create(Address::class);
-+$customerAddress->isObjectNew(true);
-+$customerAddress->setData(
-+    [
-+        'attribute_set_id' => 2,
-+        'telephone' => 3468676,
-+        'postcode' => 75477,
-+        'country_id' => 'US',
-+        'city' => 'CityM',
-+        'company' => 'CompanyName',
-+        'street' => 'CustomerAddress1',
-+        'lastname' => 'Smith',
-+        'firstname' => 'John',
-+        'parent_id' => $customer->getId(),
-+        'region_id' => 1,
-+    ]
-+);
-+$customerAddress->save();
-+/** @var AddressRepositoryInterface $addressRepository */
-+$addressRepository = $objectManager->get(AddressRepositoryInterface::class);
-+$customerAddress = $addressRepository->getById($customerAddress->getId());
-+$customerAddress->setCustomerId($customer->getId());
-+$customerAddress->isDefaultBilling(true);
-+$customerAddress->setIsDefaultShipping(true);
-+$customerAddress = $addressRepository->save($customerAddress);
-+
-+$customer->setDefaultBilling($customerAddress->getId());
-+$customer->setDefaultShipping($customerAddress->getId());
-+$customer->save();
-+
-+$customerRegistry->remove($customerAddress->getCustomerId());
-+/** @var AddressRegistry $addressRegistry */
-+$addressRegistry = $objectManager->get(AddressRegistry::class);
-+$addressRegistry->remove($customerAddress->getId());
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_one_address_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_one_address_rollback.php
-new file mode 100644
-index 00000000000..44170038984
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_one_address_rollback.php
-@@ -0,0 +1,34 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Registry;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Registry $registry */
-+$registry = $objectManager->get(Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+/** @var CustomerRepositoryInterface $customerRepo */
-+$customerRepo = $objectManager->get(CustomerRepositoryInterface::class);
-+try {
-+    $customer = $customerRepo->get('customer_with_addresses@test.com');
-+    /** @var AddressRepositoryInterface $addressRepo */
-+    $addressRepo = $objectManager->get(AddressRepositoryInterface::class);
-+    foreach ($customer->getAddresses() as $address) {
-+        $addressRepo->delete($address);
-+    }
-+    $customerRepo->delete($customer);
-+// phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-+} catch (NoSuchEntityException $exception) {
-+    //Already deleted
-+}
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_sample.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_sample.php
-index e12eec293f2..1af64898705 100644
---- a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_sample.php
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_sample.php
-@@ -19,6 +19,7 @@ $customerData = [
-     'lastname' => 'test lastname',
-     'email' => 'customer@example.com',
-     'default_billing' => 1,
-+    'default_shipping' => 1,
-     'password' => '123123q',
-     'attribute_set_id' => 1,
- ];
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_two_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_two_addresses_rollback.php
-new file mode 100644
-index 00000000000..414d31ac9d0
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_two_addresses_rollback.php
-@@ -0,0 +1,32 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var Registry $registry */
-+$registry = Bootstrap::getObjectManager()->get(Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var AddressRepositoryInterface $addressRepository */
-+$addressRepository = Bootstrap::getObjectManager()->get(AddressRepositoryInterface::class);
-+
-+foreach ([1, 2] as $addressId) {
-+    try {
-+        $addressRepository->deleteById($addressId);
-+    } catch (NoSuchEntityException $e) {
-+        /**
-+         * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
-+         */
-+    }
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses.php
-new file mode 100644
-index 00000000000..60b570b9d13
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\Customer\Model\CustomerRegistry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Model\Customer;
-+use Magento\Customer\Model\Address;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Customer\Model\AddressRegistry;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+//Creating customer
-+/** @var $repository CustomerRepositoryInterface */
-+$repository = $objectManager->create(CustomerRepositoryInterface::class);
-+/** @var Customer $customer */
-+$customer = $objectManager->create(Customer::class);
-+/** @var CustomerRegistry $customerRegistry */
-+$customerRegistry = $objectManager->get(CustomerRegistry::class);
-+$customer->setWebsiteId(1)
-+    ->setEmail('customer_with_addresses@test.com')
-+    ->setPassword('password')
-+    ->setGroupId(1)
-+    ->setStoreId(1)
-+    ->setIsActive(1)
-+    ->setPrefix('Mr.')
-+    ->setFirstname('John')
-+    ->setMiddlename('A')
-+    ->setLastname('Smith')
-+    ->setSuffix('Esq.')
-+    ->setDefaultBilling(1)
-+    ->setDefaultShipping(1)
-+    ->setTaxvat('12')
-+    ->setGender(0);
-+
-+$customer->isObjectNew(true);
-+$customer->save();
-+$customerRegistry->remove($customer->getId());
-+
-+//Creating address
-+/** @var Address $customerAddress */
-+$customerAddress = $objectManager->create(Address::class);
-+$customerAddress->isObjectNew(true);
-+$customerAddress->setData(
-+    [
-+        'attribute_set_id' => 2,
-+        'telephone' => 3468676,
-+        'postcode' => 75477,
-+        'country_id' => 'US',
-+        'city' => 'CityM',
-+        'company' => 'CompanyName',
-+        'street' => 'CustomerAddress1',
-+        'lastname' => 'Smith',
-+        'firstname' => 'John',
-+        'parent_id' => $customer->getId(),
-+        'region_id' => 1,
-+    ]
-+);
-+$customerAddress->save();
-+/** @var AddressRepositoryInterface $addressRepository */
-+$addressRepository = $objectManager->get(AddressRepositoryInterface::class);
-+$customerAddress = $addressRepository->getById($customerAddress->getId());
-+$customerAddress->setCustomerId($customer->getId());
-+$customerAddress->isDefaultBilling(true);
-+$customerAddress->setIsDefaultShipping(true);
-+$customerAddress = $addressRepository->save($customerAddress);
-+$customerRegistry->remove($customerAddress->getCustomerId());
-+/** @var AddressRegistry $addressRegistry */
-+$addressRegistry = $objectManager->get(AddressRegistry::class);
-+$addressRegistry->remove($customerAddress->getId());
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses_rollback.php
-new file mode 100644
-index 00000000000..e0c62bffc70
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses_rollback.php
-@@ -0,0 +1,34 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\AddressRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Registry;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Registry $registry */
-+$registry = $objectManager->get(Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+/** @var CustomerRepositoryInterface $customerRepo */
-+$customerRepo = $objectManager->get(CustomerRepositoryInterface::class);
-+try {
-+    $customer = $customerRepo->get('customer_with_addresses@test.com');
-+    /** @var AddressRepositoryInterface $addressRepo */
-+    $addressRepo = $objectManager->get(AddressRepositoryInterface::class);
-+    foreach ($customer->getAddresses() as $address) {
-+        $addressRepo->delete($address);
-+    }
-+    $customerRepo->delete($customer);
-+} catch (NoSuchEntityException $exception) {
-+    //Already deleted
-+}
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses.php
-new file mode 100644
-index 00000000000..0948e461736
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses.php
-@@ -0,0 +1,31 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Customer\Model\Customer;
-+use Magento\Customer\Model\CustomerRegistry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var CustomerRegistry $customerRegistry */
-+$customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
-+/** @var Customer $customer */
-+$customer = Bootstrap::getObjectManager()->get(Customer::class);
-+
-+$customer->setWebsiteId(1)
-+    ->setId(1)
-+    ->setEmail('customer@example.com')
-+    ->setPassword('password')
-+    ->setGroupId(1)
-+    ->setStoreId(1)
-+    ->setIsActive(1)
-+    ->setPrefix('Mr.')
-+    ->setFirstname('John')
-+    ->setMiddlename('A')
-+    ->setLastname('Smith')
-+    ->setSuffix('Esq.')
-+    ->setGender(0)
-+    ->save();
-+$customerRegistry->remove($customer->getId());
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses_rollback.php
-new file mode 100644
-index 00000000000..d5f9308ee77
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses_rollback.php
-@@ -0,0 +1,34 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Model\CustomerRegistry;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var CustomerRegistry $customerRegistry */
-+$customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
-+/** @var CustomerRepositoryInterface $customerRepository */
-+$customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
-+
-+/** @var Registry $registry */
-+$registry = Bootstrap::getObjectManager()->get(Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+try {
-+    $customerRepository->deleteById(1);
-+} catch (NoSuchEntityException $e) {
-+    /**
-+     * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
-+     */
-+}
-+$customerRegistry->remove(1);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/three_customers_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/three_customers_rollback.php
-new file mode 100644
-index 00000000000..8e13c1c2516
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/three_customers_rollback.php
-@@ -0,0 +1,46 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Integration\Model\Oauth\Token\RequestThrottler;
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = $objectManager->get(\Magento\Framework\Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+$customersToRemove = [
-+    'customer@search.example.com',
-+    'customer2@search.example.com',
-+    'customer3@search.example.com',
-+];
-+
-+/**
-+ * @var Magento\Customer\Api\CustomerRepositoryInterface
-+ */
-+$customerRepository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-+/**
-+ * @var RequestThrottler $throttler
-+ */
-+$throttler = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(RequestThrottler::class);
-+foreach ($customersToRemove as $customerEmail) {
-+    try {
-+        $customer = $customerRepository->get($customerEmail);
-+        $customerRepository->delete($customer);
-+    } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-+        /**
-+         * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
-+         */
-+        continue;
-+    }
-+
-+    /* Unlock account if it was locked for tokens retrieval */
-+    $throttler->resetAuthenticationFailuresCount($customerEmail, RequestThrottler::USER_TYPE_CUSTOMER);
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/two_customers_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/two_customers_rollback.php
-new file mode 100644
-index 00000000000..5beb9e654de
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/two_customers_rollback.php
-@@ -0,0 +1,32 @@
-+<?php
-+/**
-+ * Fixture for Customer List method.
-+ *
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require 'customer_rollback.php';
-+
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var CustomerRepositoryInterface $customerRepository */
-+$customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
-+try {
-+    $customerRepository->deleteById(2);
-+} catch (NoSuchEntityException $e) {
-+    /**
-+     * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
-+     */
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerCompositeTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerCompositeTest.php
-index ea2b47a9b80..321e56cd169 100644
---- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerCompositeTest.php
-+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerCompositeTest.php
-@@ -8,6 +8,9 @@ namespace Magento\CustomerImportExport\Model\Import;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
- 
-+/**
-+ * Test for CustomerComposite import class
-+ */
- class CustomerCompositeTest extends \PHPUnit\Framework\TestCase
- {
-     /**#@+
-@@ -129,6 +132,9 @@ class CustomerCompositeTest extends \PHPUnit\Framework\TestCase
-      * @param string $sourceFile
-      * @param array $dataBefore
-      * @param array $dataAfter
-+     * @param int $updatedItemsCount
-+     * @param int $createdItemsCount
-+     * @param int $deletedItemsCount
-      * @param array $errors
-      *
-      * @magentoDataFixture Magento/Customer/_files/import_export/customers_for_address_import.php
-@@ -136,8 +142,16 @@ class CustomerCompositeTest extends \PHPUnit\Framework\TestCase
-      *
-      * @dataProvider importDataDataProvider
-      */
--    public function testImportData($behavior, $sourceFile, array $dataBefore, array $dataAfter, array $errors = [])
--    {
-+    public function testImportData(
-+        $behavior,
-+        $sourceFile,
-+        array $dataBefore,
-+        array $dataAfter,
-+        $updatedItemsCount,
-+        $createdItemsCount,
-+        $deletedItemsCount,
-+        array $errors = []
-+    ) {
-         \Magento\TestFramework\Helper\Bootstrap::getInstance()
-             ->loadArea(\Magento\Framework\App\Area::AREA_FRONTEND);
-         // set entity adapter parameters
-@@ -173,6 +187,9 @@ class CustomerCompositeTest extends \PHPUnit\Framework\TestCase
- 
-         // import data
-         $this->_entityAdapter->importData();
-+        $this->assertSame($updatedItemsCount, $this->_entityAdapter->getUpdatedItemsCount());
-+        $this->assertSame($createdItemsCount, $this->_entityAdapter->getCreatedItemsCount());
-+        $this->assertSame($deletedItemsCount, $this->_entityAdapter->getDeletedItemsCount());
- 
-         // assert data after import
-         $this->_assertCustomerData($dataAfter);
-@@ -192,6 +209,10 @@ class CustomerCompositeTest extends \PHPUnit\Framework\TestCase
-                 '$sourceFile' => $filesDirectory . self::DELETE_FILE_NAME,
-                 '$dataBefore' => $this->_beforeImport,
-                 '$dataAfter' => [],
-+                '$updatedItemsCount' => 0,
-+                '$createdItemsCount' => 0,
-+                '$deletedItemsCount' => 1,
-+                '$errors' => [],
-             ],
-         ];
- 
-@@ -200,6 +221,9 @@ class CustomerCompositeTest extends \PHPUnit\Framework\TestCase
-             '$sourceFile' => $filesDirectory . self::UPDATE_FILE_NAME,
-             '$dataBefore' => $this->_beforeImport,
-             '$dataAfter' => $this->_afterImport,
-+            '$updatedItemsCount' => 1,
-+            '$createdItemsCount' => 3,
-+            '$deletedItemsCount' => 0,
-             '$errors' => [],
-         ];
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Deploy/_files/theme.php b/dev/tests/integration/testsuite/Magento/Deploy/_files/theme.php
-index ffeca0f1609..bc190a8519a 100644
---- a/dev/tests/integration/testsuite/Magento/Deploy/_files/theme.php
-+++ b/dev/tests/integration/testsuite/Magento/Deploy/_files/theme.php
-@@ -24,7 +24,7 @@ if (!function_exists('rcopy')) {
-         // If source is not a directory stop processing
-         if (!is_dir($src)) {
-             return false;
--        };
-+        }
- 
-         // If the destination directory does not exist create it
-         // If the destination directory could not be created stop processing
-diff --git a/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php b/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
-index 3bef48d8801..f7a47017f8b 100644
---- a/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
-@@ -5,34 +5,20 @@
-  */
- namespace Magento\Developer\Model\Logger\Handler;
- 
--use Magento\Config\Console\Command\ConfigSetCommand;
--use Magento\Framework\App\Config;
--use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Config\Setup\ConfigOptionsList;
-+use Magento\Framework\App\DeploymentConfig;
- use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\Framework\App\State;
- use Magento\Framework\Filesystem;
- use Magento\Framework\Filesystem\Directory\WriteInterface;
- use Magento\Framework\Logger\Monolog;
-+use Magento\Framework\Shell;
-+use Magento\Setup\Mvc\Bootstrap\InitParamListener;
- use Magento\TestFramework\Helper\Bootstrap;
--use Magento\Deploy\Model\Mode;
--use Symfony\Component\Console\Input\InputInterface;
--use Symfony\Component\Console\Output\OutputInterface;
-+use Magento\TestFramework\ObjectManager;
- 
- /**
-- * Preconditions
-- *  - Developer mode enabled
-- *  - Log file isn't exists
-- *  - 'Log to file' setting are enabled
-- *
-- * Test steps
-- *  - Enable production mode without compilation
-- *  - Try to log message into log file
-- *  - Assert that log file isn't exists
-- *  - Assert that 'Log to file' setting are disabled
-- *
-- *  - Enable 'Log to file' setting
-- *  - Try to log message into debug file
-- *  - Assert that log file is exists
-- *  - Assert that log file contain logged message
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class DebugTest extends \PHPUnit\Framework\TestCase
- {
-@@ -42,127 +28,212 @@ class DebugTest extends \PHPUnit\Framework\TestCase
-     private $logger;
- 
-     /**
--     * @var Mode
-+     * @var WriteInterface
-      */
--    private $mode;
-+    private $etcDirectory;
- 
-     /**
--     * @var InputInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var ObjectManager
-      */
--    private $inputMock;
-+    private $objectManager;
- 
-     /**
--     * @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Shell
-      */
--    private $outputMock;
-+    private $shell;
- 
-     /**
--     * @var ConfigSetCommand
-+     * @var DeploymentConfig
-      */
--    private $configSetCommand;
-+    private $deploymentConfig;
- 
-     /**
--     * @var WriteInterface
-+     * @var string
-      */
--    private $etcDirectory;
-+    private $debugLogPath = '';
-+
-+    /**
-+     * @var string
-+     */
-+    private static $backupFile = 'env.base.php';
-+
-+    /**
-+     * @var string
-+     */
-+    private static $configFile = 'env.php';
- 
-     /**
--     * @var Config
-+     * @var Debug
-      */
--    private $appConfig;
-+    private $debugHandler;
- 
-+    /**
-+     * @inheritdoc
-+     * @throws \Magento\Framework\Exception\FileSystemException
-+     * @throws \Exception
-+     */
-     public function setUp()
-     {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->shell = $this->objectManager->get(Shell::class);
-+        $this->logger = $this->objectManager->get(Monolog::class);
-+        $this->deploymentConfig = $this->objectManager->get(DeploymentConfig::class);
-+
-         /** @var Filesystem $filesystem */
--        $filesystem = Bootstrap::getObjectManager()->create(Filesystem::class);
-+        $filesystem = $this->objectManager->create(Filesystem::class);
-         $this->etcDirectory = $filesystem->getDirectoryWrite(DirectoryList::CONFIG);
--        $this->etcDirectory->copyFile('env.php', 'env.base.php');
--
--        $this->inputMock = $this->getMockBuilder(InputInterface::class)
--            ->getMockForAbstractClass();
--        $this->outputMock = $this->getMockBuilder(OutputInterface::class)
--            ->getMockForAbstractClass();
--        $this->logger = Bootstrap::getObjectManager()->get(Monolog::class);
--        $this->mode = Bootstrap::getObjectManager()->create(
--            Mode::class,
--            [
--                'input' => $this->inputMock,
--                'output' => $this->outputMock
--            ]
--        );
--        $this->configSetCommand = Bootstrap::getObjectManager()->create(ConfigSetCommand::class);
--        $this->appConfig = Bootstrap::getObjectManager()->create(Config::class);
--
--        // Preconditions
--        $this->mode->enableDeveloperMode();
--        $this->enableDebugging();
--        if (file_exists($this->getDebuggerLogPath())) {
--            unlink($this->getDebuggerLogPath());
--        }
-+        $this->etcDirectory->copyFile(self::$configFile, self::$backupFile);
-     }
- 
-+    /**
-+     * @inheritdoc
-+     * @throws \Magento\Framework\Exception\FileSystemException
-+     */
-     public function tearDown()
-     {
--        $this->etcDirectory->delete('env.php');
--        $this->etcDirectory->renameFile('env.base.php', 'env.php');
-+        $this->reinitDeploymentConfig();
-+        $this->etcDirectory->delete(self::$backupFile);
-     }
- 
--    private function enableDebugging()
-+    /**
-+     * @param bool $flag
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function enableDebugging(bool $flag)
-     {
--        $this->inputMock = $this->getMockBuilder(InputInterface::class)
--            ->getMockForAbstractClass();
--        $this->outputMock = $this->getMockBuilder(OutputInterface::class)
--            ->getMockForAbstractClass();
--        $this->inputMock->expects($this->exactly(4))
--            ->method('getOption')
--            ->withConsecutive(
--                [ConfigSetCommand::OPTION_LOCK_ENV],
--                [ConfigSetCommand::OPTION_LOCK_CONFIG],
--                [ConfigSetCommand::OPTION_SCOPE],
--                [ConfigSetCommand::OPTION_SCOPE_CODE]
--            )
--            ->willReturnOnConsecutiveCalls(
--                true,
--                false,
--                ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
--                null
--            );
--        $this->inputMock->expects($this->exactly(2))
--            ->method('getArgument')
--            ->withConsecutive([ConfigSetCommand::ARG_PATH], [ConfigSetCommand::ARG_VALUE])
--            ->willReturnOnConsecutiveCalls('dev/debug/debug_logging', 1);
--        $this->outputMock->expects($this->once())
--            ->method('writeln')
--            ->with('<info>Value was saved in app/etc/env.php and locked.</info>');
--        $this->assertFalse((bool)$this->configSetCommand->run($this->inputMock, $this->outputMock));
-+        $this->shell->execute(
-+            PHP_BINARY . ' -f %s setup:config:set -n --%s=%s --%s=%s',
-+            [
-+                BP . '/bin/magento',
-+                ConfigOptionsList::INPUT_KEY_DEBUG_LOGGING,
-+                (int)$flag,
-+                InitParamListener::BOOTSTRAP_PARAM,
-+                urldecode(http_build_query(Bootstrap::getInstance()->getAppInitParams())),
-+            ]
-+        );
-+        $this->deploymentConfig->resetData();
-+        $this->assertSame((int)$flag, $this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING));
-     }
- 
-+    /**
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-     public function testDebugInProductionMode()
-     {
-         $message = 'test message';
-+        $this->reinitDebugHandler(State::MODE_PRODUCTION);
- 
--        $this->mode->enableProductionModeMinimal();
-+        $this->removeDebugLog();
-         $this->logger->debug($message);
-         $this->assertFileNotExists($this->getDebuggerLogPath());
--        $this->assertFalse((bool)$this->appConfig->getValue('dev/debug/debug_logging'));
-+        $this->assertNull($this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING));
- 
--        $this->enableDebugging();
--        $this->logger->debug($message);
-+        $this->checkCommonFlow($message);
-+        $this->reinitDeploymentConfig();
-+    }
-+
-+    /**
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function testDebugInDeveloperMode()
-+    {
-+        $message = 'test message';
-+        $this->reinitDebugHandler(State::MODE_DEVELOPER);
- 
-+        $this->removeDebugLog();
-+        $this->logger->debug($message);
-         $this->assertFileExists($this->getDebuggerLogPath());
-         $this->assertContains($message, file_get_contents($this->getDebuggerLogPath()));
-+        $this->assertNull($this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING));
-+
-+        $this->checkCommonFlow($message);
-+        $this->reinitDeploymentConfig();
-     }
- 
-     /**
--     * @return bool|string
-+     * @return string
-      */
-     private function getDebuggerLogPath()
-     {
--        foreach ($this->logger->getHandlers() as $handler) {
--            if ($handler instanceof Debug) {
--                return $handler->getUrl();
-+        if (!$this->debugLogPath) {
-+            foreach ($this->logger->getHandlers() as $handler) {
-+                if ($handler instanceof Debug) {
-+                    $this->debugLogPath = $handler->getUrl();
-+                }
-             }
-         }
--        return false;
-+
-+        return $this->debugLogPath;
-+    }
-+
-+    /**
-+     * @throws \Magento\Framework\Exception\FileSystemException
-+     */
-+    private function reinitDeploymentConfig()
-+    {
-+        $this->etcDirectory->delete(self::$configFile);
-+        $this->etcDirectory->copyFile(self::$backupFile, self::$configFile);
-+    }
-+
-+    /**
-+     * @param string $instanceMode
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function reinitDebugHandler(string $instanceMode)
-+    {
-+        $this->debugHandler = $this->objectManager->create(
-+            Debug::class,
-+            [
-+                'filePath' => Bootstrap::getInstance()->getAppTempDir(),
-+                'state' => $this->objectManager->create(
-+                    State::class,
-+                    [
-+                        'mode' => $instanceMode,
-+                    ]
-+                ),
-+            ]
-+        );
-+        $this->logger->setHandlers(
-+            [
-+                $this->debugHandler,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    private function detachLogger()
-+    {
-+        $this->debugHandler->close();
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    private function removeDebugLog()
-+    {
-+        $this->detachLogger();
-+        if (file_exists($this->getDebuggerLogPath())) {
-+            unlink($this->getDebuggerLogPath());
-+        }
-+    }
-+
-+    /**
-+     * @param string $message
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function checkCommonFlow(string $message)
-+    {
-+        $this->enableDebugging(true);
-+        $this->removeDebugLog();
-+        $this->logger->debug($message);
-+        $this->assertFileExists($this->getDebuggerLogPath());
-+        $this->assertContains($message, file_get_contents($this->getDebuggerLogPath()));
-+
-+        $this->enableDebugging(false);
-+        $this->removeDebugLog();
-+        $this->logger->debug($message);
-+        $this->assertFileNotExists($this->getDebuggerLogPath());
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
-new file mode 100644
-index 00000000000..69eab0656f8
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
-@@ -0,0 +1,488 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Dhl\Model;
-+
-+use Magento\Framework\App\Config\ReinitableConfigInterface;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\HTTP\AsyncClient\Response;
-+use Magento\Framework\HTTP\AsyncClientInterface;
-+use Magento\Framework\Simplexml\Element;
-+use Magento\Quote\Model\Quote\Address\RateRequest;
-+use Magento\Shipping\Model\Shipment\Request;
-+use Magento\Shipping\Model\Tracking\Result\Status;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\HTTP\AsyncClientInterfaceMock;
-+use Magento\Shipping\Model\Simplexml\Element as ShippingElement;
-+
-+/**
-+ * Test for DHL integration.
-+ */
-+class CarrierTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var Carrier
-+     */
-+    private $dhlCarrier;
-+
-+    /**
-+     * @var AsyncClientInterfaceMock
-+     */
-+    private $httpClient;
-+
-+    /**
-+     * @var ReinitableConfigInterface
-+     */
-+    private $config;
-+
-+    /**
-+     * @var string
-+     */
-+    private $restoreCountry;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->dhlCarrier = $objectManager->get(Carrier::class);
-+        $this->httpClient = $objectManager->get(AsyncClientInterface::class);
-+        $this->config = $objectManager->get(ReinitableConfigInterface::class);
-+        $this->restoreCountry = $this->config->getValue('shipping/origin/country_id', 'store', 'default_store');
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function tearDown()
-+    {
-+        $this->config->setValue(
-+            'shipping/origin/country_id',
-+            $this->restoreCountry,
-+            'store',
-+            'default_store'
-+        );
-+    }
-+
-+    /**
-+     * Test sending tracking requests.
-+     *
-+     * @magentoConfigFixture default_store carriers/dhl/id CustomerSiteID
-+     * @magentoConfigFixture default_store carriers/dhl/password CustomerPassword
-+     * @param string[] $trackingNumbers
-+     * @param string $responseXml
-+     * @param array $expectedTrackingData
-+     * @param string $expectedRequestXml
-+     * @dataProvider trackingDataProvider
-+     */
-+    public function testGetTracking(
-+        $trackingNumbers,
-+        string $responseXml,
-+        $expectedTrackingData,
-+        string $expectedRequestXml = ''
-+    ) {
-+        $this->httpClient->nextResponses([new Response(200, [], $responseXml)]);
-+        $trackingResult = $this->dhlCarrier->getTracking($trackingNumbers);
-+        $this->assertTrackingResult($expectedTrackingData, $trackingResult->getAllTrackings());
-+        if ($expectedRequestXml !== '') {
-+            $this->assertRequest($expectedRequestXml, $this->httpClient->getLastRequest()->getBody());
-+        }
-+    }
-+
-+    /**
-+     * Get tracking data provider
-+     *
-+     * @return array
-+     */
-+    public function trackingDataProvider() : array
-+    {
-+        // phpcs:disable Magento2.Functions.DiscouragedFunction
-+        $expectedMultiAWBRequestXml = file_get_contents(__DIR__ . '/../_files/TrackingRequest_MultipleAWB.xml');
-+        $multiAWBResponseXml = file_get_contents(__DIR__ . '/../_files/TrackingResponse_MultipleAWB.xml');
-+        $expectedSingleAWBRequestXml = file_get_contents(__DIR__ . '/../_files/TrackingRequest_SingleAWB.xml');
-+        $singleAWBResponseXml = file_get_contents(__DIR__ . '/../_files/TrackingResponse_SingleAWB.xml');
-+        $singleNoDataResponseXml = file_get_contents(__DIR__ . '/../_files/SingleknownTrackResponse-no-data-found.xml');
-+        $failedResponseXml = file_get_contents(__DIR__ . '/../_files/Track-res-XML-Parse-Err.xml');
-+        //phpcs:enable Magento2.Functions.DiscouragedFunction
-+        $expectedTrackingDataA = [
-+            'carrier' => 'dhl',
-+            'carrier_title' => 'DHL',
-+            'tracking' => 4781584780,
-+            'service' => 'DOCUMENT',
-+            'progressdetail' => [
-+                [
-+                    'activity' => 'SD Shipment information received',
-+                    'deliverydate' => '2017-12-25',
-+                    'deliverytime' => '14:38:00',
-+                    'deliverylocation' => 'BEIJING-CHN [PEK]'
-+                ]
-+            ],
-+            'weight' => '0.5 K',
-+        ];
-+        $expectedTrackingDataB = [
-+            'carrier' => 'dhl',
-+            'carrier_title' => 'DHL',
-+            'tracking' => 4781585060,
-+            'service' => 'NOT RESTRICTED FOR TRANSPORT,',
-+            'progressdetail' => [
-+                [
-+                    'activity' => 'SD Shipment information received',
-+                    'deliverydate' => '2017-12-24',
-+                    'deliverytime' => '13:35:00',
-+                    'deliverylocation' => 'HONG KONG-HKG [HKG]'
-+                ]
-+            ],
-+            'weight' => '2.0 K',
-+        ];
-+        $expectedTrackingDataC = [
-+            'carrier' => 'dhl',
-+            'carrier_title' => 'DHL',
-+            'tracking' => 5702254250,
-+            'service' => 'CD',
-+            'progressdetail' => [
-+                [
-+                    'activity' => 'SD Shipment information received',
-+                    'deliverydate' => '2017-12-24',
-+                    'deliverytime' => '04:12:00',
-+                    'deliverylocation' => 'BIRMINGHAM-GBR [BHX]'
-+                ]
-+            ],
-+            'weight' => '0.12 K',
-+        ];
-+        $expectedTrackingDataD = [
-+            'carrier' => 'dhl',
-+            'carrier_title' => 'DHL',
-+            'tracking' => 4781585060,
-+            'error_message' => __('Unable to retrieve tracking')
-+        ];
-+        $expectedTrackingDataE = [
-+            'carrier' => 'dhl',
-+            'carrier_title' => 'DHL',
-+            'tracking' => 111,
-+            'error_message' => __(
-+                'Error #%1 : %2',
-+                '111',
-+                ' Error Parsing incoming request XML
-+                    Error: The content of element type
-+                    "ShipperReference" must match
-+                    "(ReferenceID,ReferenceType?)". at line
-+                    16, column 22'
-+            )
-+        ];
-+        return [
-+            'multi-AWB' => [
-+                ['4781584780', '4781585060', '5702254250'],
-+                $multiAWBResponseXml,
-+                [$expectedTrackingDataA, $expectedTrackingDataB, $expectedTrackingDataC],
-+                $expectedMultiAWBRequestXml
-+            ],
-+            'single-AWB' => [
-+                ['4781585060'],
-+                $singleAWBResponseXml,
-+                [$expectedTrackingDataB],
-+                $expectedSingleAWBRequestXml
-+            ],
-+            'single-AWB-no-data' => [['4781585061'], $singleNoDataResponseXml, [$expectedTrackingDataD]],
-+            'failed-response' => [['4781585060-failed'], $failedResponseXml, [$expectedTrackingDataE]]
-+        ];
-+    }
-+
-+    /**
-+     * Assert request
-+     *
-+     * @param string $expectedRequestXml
-+     * @param string $requestXml
-+     */
-+    private function assertRequest(string $expectedRequestXml, string $requestXml): void
-+    {
-+        $expectedRequestElement = new Element($expectedRequestXml);
-+        $requestElement = new Element($requestXml);
-+        $requestMessageTime = $requestElement->Request->ServiceHeader->MessageTime->__toString();
-+        $this->assertEquals(
-+            1,
-+            preg_match("/\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}\+\d{2}\:\d{2}/", $requestMessageTime)
-+        );
-+        $expectedRequestElement->Request->ServiceHeader->MessageTime = $requestMessageTime;
-+        $messageReference = $requestElement->Request->ServiceHeader->MessageReference->__toString();
-+        $this->assertStringStartsWith('MAGE_TRCK_', $messageReference);
-+        $this->assertGreaterThanOrEqual(28, strlen($messageReference));
-+        $this->assertLessThanOrEqual(32, strlen($messageReference));
-+        $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_TRCK_28TO32_Char_CHECKED';
-+        $this->assertXmlStringEqualsXmlString($expectedRequestElement->asXML(), $requestElement->asXML());
-+    }
-+
-+    /**
-+     * Assert tracking
-+     *
-+     * @param array|null $expectedTrackingData
-+     * @param Status[]|null $trackingResults
-+     * @return void
-+     */
-+    private function assertTrackingResult($expectedTrackingData, $trackingResults): void
-+    {
-+        if (null === $expectedTrackingData) {
-+            $this->assertNull($trackingResults);
-+        } else {
-+            $ctr = 0;
-+            foreach ($trackingResults as $trackingResult) {
-+                $this->assertEquals($expectedTrackingData[$ctr++], $trackingResult->getData());
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Test sending shipping requests.
-+     *
-+     * @magentoConfigFixture default_store carriers/dhl/id some ID
-+     * @magentoConfigFixture default_store carriers/dhl/password some password
-+     * @magentoConfigFixture default_store carriers/dhl/account 1234567890
-+     * @magentoConfigFixture default_store carriers/dhl/gateway_url https://xmlpi-ea.dhl.com/XMLShippingServlet
-+     * @magentoConfigFixture default_store carriers/dhl/content_type N
-+     * @magentoConfigFixture default_store carriers/dhl/nondoc_methods 1,3,4,8,P,Q,E,F,H,J,M,V,Y
-+     * @magentoConfigFixture default_store carriers/dhl/unit_of_measure C
-+     * @param string $origCountryId
-+     * @param string $expectedRegionCode
-+     * @param string $destCountryId
-+     * @dataProvider requestToShipmentDataProvider
-+     */
-+    public function testRequestToShip(string $origCountryId, string $expectedRegionCode, string $destCountryId): void
-+    {
-+        $this->config->setValue(
-+            'shipping/origin/country_id',
-+            $origCountryId,
-+            'store',
-+            null
-+        );
-+        //phpcs:disable Magento2.Functions.DiscouragedFunction
-+        $this->httpClient->nextResponses(
-+            [
-+                new Response(
-+                    200,
-+                    [],
-+                    utf8_encode(file_get_contents(__DIR__ . '/../_files/response_shipping_label.xml'))
-+                )
-+            ]
-+        );
-+        //phpcs:enable Magento2.Functions.DiscouragedFunction
-+        $request = new Request(
-+            [
-+                'packages' => [
-+                    'package' => [
-+                        'params' => [
-+                            'width' => '3',
-+                            'length' => '3',
-+                            'height' => '3',
-+                            'dimension_units' => 'CENTIMETER',
-+                            'weight_units' => 'KILOGRAM',
-+                            'weight' => '0.454000000001',
-+                            'customs_value' => '10.00',
-+                            'container' => Carrier::DHL_CONTENT_TYPE_NON_DOC,
-+                        ],
-+                        'items' => [
-+                            'item1' => [
-+                                'name' => 'item_name',
-+                            ],
-+                        ],
-+                    ],
-+                ],
-+                'orig_country_id' => $origCountryId,
-+                'dest_country_id' => $destCountryId,
-+                'shipper_address_country_code' => $origCountryId,
-+                'recipient_address_country_code' => $destCountryId,
-+                'package_weight' => '0.454000000001',
-+                'free_method_weight' => '0.454000000001',
-+                'recipient_address_street_1' => '15099 Some Blvd',
-+                'shipper_address_street_1' => '4956 Some Way',
-+                'order_shipment' => new DataObject(
-+                    [
-+                        'order' => new DataObject(
-+                            [
-+                                'subtotal' => '10.00'
-+                            ]
-+                        )
-+                    ]
-+                )
-+            ]
-+        );
-+
-+        //Generating labels
-+        $labels = $this->dhlCarrier->requestToShipment($request);
-+        $this->assertNotEmpty($labels);
-+        $this->assertNotEmpty($labels->getInfo());
-+        $request = $this->httpClient->getLastRequest()->getBody();
-+        $requestElement = new Element($request);
-+        $messageReference = $requestElement->Request->ServiceHeader->MessageReference->__toString();
-+        $this->assertStringStartsWith('MAGE_SHIP_', $messageReference);
-+        $this->assertGreaterThanOrEqual(28, strlen($messageReference));
-+        $this->assertLessThanOrEqual(32, strlen($messageReference));
-+        $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_SHIP_28TO32_Char_CHECKED';
-+        $requestElement->Request->ServiceHeader->MessageTime = 'currentTime';
-+        $requestElement->ShipmentDetails->Date = 'currentTime';
-+        $this->assertXmlStringEqualsXmlString(
-+            $this->getExpectedLabelRequestXml($origCountryId, $destCountryId, $expectedRegionCode),
-+            $requestElement->asXML()
-+        );
-+    }
-+
-+    /**
-+     * Cases with different countries.
-+     *
-+     * @return array
-+     */
-+    public function requestToShipmentDataProvider(): array
-+    {
-+        return [
-+            [
-+                'GB', 'EU', 'US'
-+            ],
-+            [
-+                'SG', 'AP', 'US'
-+            ],
-+            [
-+                'DE', 'EU', 'DE'
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * Generate expected labels request XML.
-+     *
-+     * @param string $origCountryId
-+     * @param string $destCountryId
-+     * @param string $regionCode
-+     * @return string
-+     */
-+    private function getExpectedLabelRequestXml(
-+        string $origCountryId,
-+        string $destCountryId,
-+        string $regionCode
-+    ): string {
-+        $countryNames = [
-+            'US' => 'United States of America',
-+            'SG' => 'Singapore',
-+            'GB' => 'United Kingdom',
-+            'DE' => 'Germany',
-+        ];
-+        $requestXmlPath = $origCountryId == $destCountryId
-+            ? '/../_files/domestic_shipment_request.xml'
-+            : '/../_files/shipment_request.xml';
-+
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+        $expectedRequestElement = new ShippingElement(file_get_contents(__DIR__ . $requestXmlPath));
-+
-+        $expectedRequestElement->Consignee->CountryCode = $destCountryId;
-+        $expectedRequestElement->Consignee->CountryName = $countryNames[$destCountryId];
-+        $expectedRequestElement->Shipper->CountryCode = $origCountryId;
-+        $expectedRequestElement->Shipper->CountryName = $countryNames[$origCountryId];
-+        $expectedRequestElement->RegionCode = $regionCode;
-+
-+        return $expectedRequestElement->asXML();
-+    }
-+
-+    /**
-+     * Tests that valid rates are returned when sending a quotes request.
-+     *
-+     * @magentoConfigFixture default_store carriers/dhl/active 1
-+     * @magentoConfigFixture default_store carriers/dhl/id some ID
-+     * @magentoConfigFixture default_store carriers/dhl/shipment_days Mon,Tue,Wed,Thu,Fri,Sat
-+     * @magentoConfigFixture default_store carriers/dhl/intl_shipment_days Mon,Tue,Wed,Thu,Fri,Sat
-+     * @magentoConfigFixture default_store carriers/dhl/allowed_methods IE
-+     * @magentoConfigFixture default_store carriers/dhl/international_service IE
-+     * @magentoConfigFixture default_store carriers/dhl/gateway_url https://xmlpi-ea.dhl.com/XMLShippingServlet
-+     * @magentoConfigFixture default_store carriers/dhl/id some ID
-+     * @magentoConfigFixture default_store carriers/dhl/password some password
-+     * @magentoConfigFixture default_store carriers/dhl/content_type N
-+     * @magentoConfigFixture default_store carriers/dhl/nondoc_methods 1,3,4,8,P,Q,E,F,H,J,M,V,Y
-+     * @magentoConfigFixture default_store carriers/dhl/showmethod' => 1,
-+     * @magentoConfigFixture default_store carriers/dhl/title DHL Title
-+     * @magentoConfigFixture default_store carriers/dhl/specificerrmsg dhl error message
-+     * @magentoConfigFixture default_store carriers/dhl/unit_of_measure K
-+     * @magentoConfigFixture default_store carriers/dhl/size 1
-+     * @magentoConfigFixture default_store carriers/dhl/height 1.6
-+     * @magentoConfigFixture default_store carriers/dhl/width 1.6
-+     * @magentoConfigFixture default_store carriers/dhl/depth 1.6
-+     * @magentoConfigFixture default_store carriers/dhl/debug 1
-+     * @magentoConfigFixture default_store shipping/origin/country_id GB
-+     */
-+    public function testCollectRates()
-+    {
-+        $requestData = [
-+            'data' => [
-+                'dest_country_id' => 'DE',
-+                'dest_region_id' => '82',
-+                'dest_region_code' => 'BER',
-+                'dest_street' => 'Turmstraße 17',
-+                'dest_city' => 'Berlin',
-+                'dest_postcode' => '10559',
-+                'dest_postal' => '10559',
-+                'package_value' => '5',
-+                'package_value_with_discount' => '5',
-+                'package_weight' => '8.2657',
-+                'package_qty' => '1',
-+                'package_physical_value' => '5',
-+                'free_method_weight' => '5',
-+                'store_id' => '1',
-+                'website_id' => '1',
-+                'free_shipping' => '0',
-+                'limit_carrier' => null,
-+                'base_subtotal_incl_tax' => '5',
-+                'orig_country_id' => 'US',
-+                'orig_region_id' => '12',
-+                'orig_city' => 'Fremont',
-+                'orig_postcode' => '94538',
-+                'dhl_id' => 'MAGEN_8501',
-+                'dhl_password' => 'QR2GO1U74X',
-+                'dhl_account' => '799909537',
-+                'dhl_shipping_intl_key' => '54233F2B2C4E5C4B4C5E5A59565530554B405641475D5659',
-+                'girth' => null,
-+                'height' => null,
-+                'length' => null,
-+                'width' => null,
-+                'weight' => 1,
-+                'dhl_shipment_type' => 'P',
-+                'dhl_duitable' => 0,
-+                'dhl_duty_payment_type' => 'R',
-+                'dhl_content_desc' => 'Big Box',
-+                'limit_method' => 'IE',
-+                'ship_date' => '2014-01-09',
-+                'action' => 'RateEstimate',
-+                'all_items' => [],
-+            ]
-+        ];
-+        //phpcs:disable Magento2.Functions.DiscouragedFunction
-+        $response = new Response(
-+            200,
-+            [],
-+            file_get_contents(__DIR__ . '/../_files/dhl_quote_response.xml')
-+        );
-+        //phpcs:enable Magento2.Functions.DiscouragedFunction
-+        $this->httpClient->nextResponses(array_fill(0, Carrier::UNAVAILABLE_DATE_LOOK_FORWARD + 1, $response));
-+        /** @var RateRequest $request */
-+        $request = Bootstrap::getObjectManager()->create(RateRequest::class, $requestData);
-+        $expectedRates = [
-+            ['carrier' => 'dhl', 'carrier_title' => 'DHL Title', 'cost' => 45.85, 'method' => 'E', 'price' => 45.85],
-+            ['carrier' => 'dhl', 'carrier_title' => 'DHL Title', 'cost' => 35.26, 'method' => 'Q', 'price' => 35.26],
-+            ['carrier' => 'dhl', 'carrier_title' => 'DHL Title', 'cost' => 37.38, 'method' => 'Y', 'price' => 37.38],
-+            ['carrier' => 'dhl', 'carrier_title' => 'DHL Title', 'cost' => 35.26, 'method' => 'P', 'price' => 35.26]
-+        ];
-+
-+        $actualRates = $this->dhlCarrier->collectRates($request)->getAllRates();
-+
-+        self::assertEquals(count($expectedRates), count($actualRates));
-+        foreach ($actualRates as $i => $actualRate) {
-+            $actualRate = $actualRate->getData();
-+            unset($actualRate['method_title']);
-+            self::assertEquals($expectedRates[$i], $actualRate);
-+        }
-+        $requestXml = $this->httpClient->getLastRequest()->getBody();
-+        self::assertContains('<Weight>18.223</Weight>', $requestXml);
-+        self::assertContains('<Height>0.630</Height>', $requestXml);
-+        self::assertContains('<Width>0.630</Width>', $requestXml);
-+        self::assertContains('<Depth>0.630</Depth>', $requestXml);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml
-new file mode 100755
-index 00000000000..9887cecbd2d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml
-@@ -0,0 +1,28 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<req:TrackingResponse xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingResponse.xsd">
-+    <Response>
-+        <ServiceHeader>
-+            <MessageTime>2018-02-27T12:59:34+01:00</MessageTime>
-+            <MessageReference>1234567890123456789012345678</MessageReference>
-+            <SiteID>CustomerSiteID</SiteID>
-+        </ServiceHeader>
-+    </Response>
-+    <AWBInfo>
-+        <AWBNumber>4781585060</AWBNumber>
-+        <Status>
-+            <ActionStatus>No Shipments Found</ActionStatus>
-+            <Condition>
-+                <ConditionCode>209</ConditionCode>
-+                <ConditionData>No Shipments Found for AWBNumber 6017300993</ConditionData>
-+            </Condition>
-+        </Status>
-+    </AWBInfo>
-+    <LanguageCode>String</LanguageCode>
-+</req:TrackingResponse>
-+<!-- ServiceInvocationId:20180227125934_5793_74fbd9e1-a8b0-4f6a-a326-26aae979e5f0 -->
-diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/Track-res-XML-Parse-Err.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/Track-res-XML-Parse-Err.xml
-new file mode 100755
-index 00000000000..c2abd68d3c4
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/Track-res-XML-Parse-Err.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<req:ShipmentTrackingErrorResponse xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com track-err-res.xsd">
-+    <Response>
-+        <ServiceHeader>
-+            <MessageTime>2018-02-27T12:55:05+01:00</MessageTime>
-+        </ServiceHeader>
-+        <Status>
-+            <ActionStatus>Failure</ActionStatus>
-+            <Condition>
-+                <ConditionCode>111</ConditionCode>
-+                <ConditionData> Error Parsing incoming request XML
-+                    Error: The content of element type
-+                    &quot;ShipperReference&quot; must match
-+                    &quot;(ReferenceID,ReferenceType?)&quot;. at line
-+                    16, column 22</ConditionData>
-+            </Condition>
-+        </Status>
-+    </Response>
-+</req:ShipmentTrackingErrorResponse>
-+<!-- ServiceInvocationId:20180227125505_5793_2008671c-9292-4790-87b6-b02ccdf913db -->
-diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml
-new file mode 100755
-index 00000000000..c0a18fcc4e2
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<req:KnownTrackingRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingRequestKnown-1.0.xsd" schemaVersion="1.0">
-+	<Request>
-+		<ServiceHeader>
-+			<MessageTime>2002-06-25T11:28:56-08:00</MessageTime>
-+			<MessageReference>MAGE_TRCK_28TO32_Char_CHECKED</MessageReference>
-+			<SiteID>CustomerSiteID</SiteID>
-+			<Password>CustomerPassword</Password>
-+		</ServiceHeader>
-+	</Request>
-+	<LanguageCode>en</LanguageCode>
-+	<AWBNumber>4781584780</AWBNumber>
-+	<AWBNumber>4781585060</AWBNumber>
-+	<AWBNumber>5702254250</AWBNumber>
-+	<LevelOfDetails>ALL_CHECK_POINTS</LevelOfDetails>
-+</req:KnownTrackingRequest>
-+
-+
-diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml
-new file mode 100755
-index 00000000000..dac69a0d68c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<req:KnownTrackingRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingRequestKnown-1.0.xsd" schemaVersion="1.0">
-+	<Request>
-+		<ServiceHeader>
-+			<MessageTime>2002-06-25T11:28:56-08:00</MessageTime>
-+			<MessageReference>MAGE_TRCK_28TO32_Char_CHECKED</MessageReference>
-+			<SiteID>CustomerSiteID</SiteID>
-+			<Password>CustomerPassword</Password>
-+		</ServiceHeader>
-+	</Request>
-+	<LanguageCode>en</LanguageCode>
-+	<AWBNumber>4781585060</AWBNumber>
-+	<LevelOfDetails>ALL_CHECK_POINTS</LevelOfDetails>
-+</req:KnownTrackingRequest>
-\ No newline at end of file
-diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml
-new file mode 100755
-index 00000000000..369236d80c6
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml
-@@ -0,0 +1,174 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<req:TrackingResponse xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingResponse.xsd">
-+    <Response>
-+        <ServiceHeader>
-+            <MessageTime>2018-02-27T12:43:44+01:00</MessageTime>
-+            <MessageReference>1234567890123456789012345678</MessageReference>
-+            <SiteID>CustomerSiteID</SiteID>
-+        </ServiceHeader>
-+    </Response>
-+    <AWBInfo>
-+        <AWBNumber>4781584780</AWBNumber>
-+        <Status>
-+            <ActionStatus>success</ActionStatus>
-+        </Status>
-+        <ShipmentInfo>
-+            <OriginServiceArea>
-+                <ServiceAreaCode>PEK</ServiceAreaCode>
-+                <Description>BEIJING-CHN</Description>
-+            </OriginServiceArea>
-+            <DestinationServiceArea>
-+                <ServiceAreaCode>PHL</ServiceAreaCode>
-+                <Description>WEST PHILADELPHIA,PA-USA</Description>
-+            </DestinationServiceArea>
-+            <ShipperName>THE EXP HIGH SCH ATT TO BNU</ShipperName>
-+            <ShipperAccountNumber>123456789</ShipperAccountNumber>
-+            <ConsigneeName>HAVEFORD COLLEGE</ConsigneeName>
-+            <ShipmentDate>2017-12-25T14:38:00</ShipmentDate>
-+            <Pieces>1</Pieces>
-+            <Weight>0.5</Weight>
-+            <WeightUnit>K</WeightUnit>
-+            <GlobalProductCode>D</GlobalProductCode>
-+            <ShipmentDesc>DOCUMENT</ShipmentDesc>
-+            <DlvyNotificationFlag>Y</DlvyNotificationFlag>
-+            <Shipper>
-+                <City>BEIJING</City>
-+                <PostalCode>100032</PostalCode>
-+                <CountryCode>CN</CountryCode>
-+            </Shipper>
-+            <Consignee>
-+                <City>HAVERFORD</City>
-+                <DivisionCode>PA</DivisionCode>
-+                <PostalCode>19041</PostalCode>
-+                <CountryCode>US</CountryCode>
-+            </Consignee>
-+            <ShipperReference>
-+                <ReferenceID>2469</ReferenceID>
-+            </ShipperReference>
-+            <ShipmentEvent>
-+                <Date>2017-12-25</Date>
-+                <Time>14:38:00</Time>
-+                <ServiceEvent>
-+                    <EventCode>SD</EventCode>
-+                    <Description>Shipment information received</Description>
-+                </ServiceEvent>
-+                <Signatory/>
-+                <ServiceArea>
-+                    <ServiceAreaCode>PEK</ServiceAreaCode>
-+                    <Description>BEIJING-CHN</Description>
-+                </ServiceArea>
-+            </ShipmentEvent>
-+        </ShipmentInfo>
-+    </AWBInfo>
-+    <AWBInfo>
-+        <AWBNumber>4781585060</AWBNumber>
-+        <Status>
-+            <ActionStatus>success</ActionStatus>
-+        </Status>
-+        <ShipmentInfo>
-+            <OriginServiceArea>
-+                <ServiceAreaCode>HKG</ServiceAreaCode>
-+                <Description>HONG KONG-HKG</Description>
-+            </OriginServiceArea>
-+            <DestinationServiceArea>
-+                <ServiceAreaCode>HKG</ServiceAreaCode>
-+                <Description>HONG KONG-HKG</Description>
-+            </DestinationServiceArea>
-+            <ShipperName>NET-A-PORTER</ShipperName>
-+            <ShipperAccountNumber>123456789</ShipperAccountNumber>
-+            <ConsigneeName>NICOLE LI</ConsigneeName>
-+            <ShipmentDate>2017-12-24T13:35:00</ShipmentDate>
-+            <Pieces>1</Pieces>
-+            <Weight>2.0</Weight>
-+            <WeightUnit>K</WeightUnit>
-+            <GlobalProductCode>N</GlobalProductCode>
-+            <ShipmentDesc>NOT RESTRICTED FOR TRANSPORT,</ShipmentDesc>
-+            <DlvyNotificationFlag>Y</DlvyNotificationFlag>
-+            <Shipper>
-+                <City>HONG KONG</City>
-+                <CountryCode>HK</CountryCode>
-+            </Shipper>
-+            <Consignee>
-+                <City>HONG KONG</City>
-+                <DivisionCode>CH</DivisionCode>
-+                <CountryCode>HK</CountryCode>
-+            </Consignee>
-+            <ShipperReference>
-+                <ReferenceID>1060571</ReferenceID>
-+            </ShipperReference>
-+            <ShipmentEvent>
-+                <Date>2017-12-24</Date>
-+                <Time>13:35:00</Time>
-+                <ServiceEvent>
-+                    <EventCode>SD</EventCode>
-+                    <Description>Shipment information received</Description>
-+                </ServiceEvent>
-+                <Signatory/>
-+                <ServiceArea>
-+                    <ServiceAreaCode>HKG</ServiceAreaCode>
-+                    <Description>HONG KONG-HKG</Description>
-+                </ServiceArea>
-+            </ShipmentEvent>
-+        </ShipmentInfo>
-+    </AWBInfo>
-+    <AWBInfo>
-+        <AWBNumber>5702254250</AWBNumber>
-+        <Status>
-+            <ActionStatus>success</ActionStatus>
-+        </Status>
-+        <ShipmentInfo>
-+            <OriginServiceArea>
-+                <ServiceAreaCode>BHX</ServiceAreaCode>
-+                <Description>BIRMINGHAM-GBR</Description>
-+            </OriginServiceArea>
-+            <DestinationServiceArea>
-+                <ServiceAreaCode>AOI</ServiceAreaCode>
-+                <Description>ANCONA-ITA</Description>
-+            </DestinationServiceArea>
-+            <ShipperName>AMAZON EU SARL</ShipperName>
-+            <ShipperAccountNumber>123456789</ShipperAccountNumber>
-+            <ConsigneeName>MATTEO LOMBO</ConsigneeName>
-+            <ShipmentDate>2017-12-24T04:12:00</ShipmentDate>
-+            <Pieces>1</Pieces>
-+            <Weight>0.12</Weight>
-+            <WeightUnit>K</WeightUnit>
-+            <GlobalProductCode>U</GlobalProductCode>
-+            <ShipmentDesc>CD</ShipmentDesc>
-+            <DlvyNotificationFlag>Y</DlvyNotificationFlag>
-+            <Shipper>
-+                <City>PETERBOROUGH</City>
-+                <PostalCode>PE2 9EN</PostalCode>
-+                <CountryCode>GB</CountryCode>
-+            </Shipper>
-+            <Consignee>
-+                <City>ORTONA</City>
-+                <PostalCode>66026</PostalCode>
-+                <CountryCode>IT</CountryCode>
-+            </Consignee>
-+            <ShipperReference>
-+                <ReferenceID>DGWYDy4xN_1</ReferenceID>
-+            </ShipperReference>
-+            <ShipmentEvent>
-+                <Date>2017-12-24</Date>
-+                <Time>04:12:00</Time>
-+                <ServiceEvent>
-+                    <EventCode>SD</EventCode>
-+                    <Description>Shipment information received</Description>
-+                </ServiceEvent>
-+                <Signatory/>
-+                <ServiceArea>
-+                    <ServiceAreaCode>BHX</ServiceAreaCode>
-+                    <Description>BIRMINGHAM-GBR</Description>
-+                </ServiceArea>
-+            </ShipmentEvent>
-+        </ShipmentInfo>
-+    </AWBInfo>
-+    <LanguageCode>en</LanguageCode>
-+</req:TrackingResponse>
-+<!-- ServiceInvocationId:20180227124344_5793_23bed3d9-e792-4955-8055-9472b1b41929 -->
-diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml
-new file mode 100755
-index 00000000000..ef303eaab64
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml
-@@ -0,0 +1,69 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<req:TrackingResponse xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingResponse.xsd">
-+    <Response>
-+        <ServiceHeader>
-+            <MessageTime>2018-02-27T12:27:42+01:00</MessageTime>
-+            <MessageReference>1234567890123456789012345678</MessageReference>
-+            <SiteID>CustomerSiteID</SiteID>
-+        </ServiceHeader>
-+    </Response>
-+    <AWBInfo>
-+        <AWBNumber>4781585060</AWBNumber>
-+        <Status>
-+            <ActionStatus>success</ActionStatus>
-+        </Status>
-+        <ShipmentInfo>
-+            <OriginServiceArea>
-+                <ServiceAreaCode>HKG</ServiceAreaCode>
-+                <Description>HONG KONG-HKG</Description>
-+            </OriginServiceArea>
-+            <DestinationServiceArea>
-+                <ServiceAreaCode>HKG</ServiceAreaCode>
-+                <Description>HONG KONG-HKG</Description>
-+            </DestinationServiceArea>
-+            <ShipperName>NET-A-PORTER</ShipperName>
-+            <ShipperAccountNumber>123456789</ShipperAccountNumber>
-+            <ConsigneeName>NICOLE LI</ConsigneeName>
-+            <ShipmentDate>2017-12-24T13:35:00</ShipmentDate>
-+            <Pieces>1</Pieces>
-+            <Weight>2.0</Weight>
-+            <WeightUnit>K</WeightUnit>
-+            <GlobalProductCode>N</GlobalProductCode>
-+            <ShipmentDesc>NOT RESTRICTED FOR TRANSPORT,</ShipmentDesc>
-+            <DlvyNotificationFlag>Y</DlvyNotificationFlag>
-+            <Shipper>
-+                <City>HONG KONG</City>
-+                <CountryCode>HK</CountryCode>
-+            </Shipper>
-+            <Consignee>
-+                <City>HONG KONG</City>
-+                <DivisionCode>CH</DivisionCode>
-+                <CountryCode>HK</CountryCode>
-+            </Consignee>
-+            <ShipperReference>
-+                <ReferenceID>1060571</ReferenceID>
-+            </ShipperReference>
-+            <ShipmentEvent>
-+                <Date>2017-12-24</Date>
-+                <Time>13:35:00</Time>
-+                <ServiceEvent>
-+                    <EventCode>SD</EventCode>
-+                    <Description>Shipment information received</Description>
-+                </ServiceEvent>
-+                <Signatory/>
-+                <ServiceArea>
-+                    <ServiceAreaCode>HKG</ServiceAreaCode>
-+                    <Description>HONG KONG-HKG</Description>
-+                </ServiceArea>
-+            </ShipmentEvent>
-+        </ShipmentInfo>
-+    </AWBInfo>
-+    <LanguageCode>en</LanguageCode>
-+</req:TrackingResponse>
-+<!-- ServiceInvocationId:20180227122741_5793_e0f8c40e-5245-4737-ab31-323030366721 -->
-diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/dhl_quote_response.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/dhl_quote_response.xml
-new file mode 100644
-index 00000000000..74217079664
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/dhl_quote_response.xml
-@@ -0,0 +1,530 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<res:DCTResponse xmlns:res="http://www.dhl.com"
-+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+                 xsi:schemaLocation="http://www.dhl.com DCT-Response_global-2.0.xsd">
-+    <GetQuoteResponse>
-+        <Response>
-+            <ServiceHeader>
-+                <MessageTime>2014-01-09T12:13:29.498+00:00</MessageTime>
-+                <SiteID>EvgeniyUSA</SiteID>
-+            </ServiceHeader>
-+        </Response>
-+        <BkgDetails>
-+            <QtdShp>
-+                <OriginServiceArea>
-+                    <FacilityCode>NUQ</FacilityCode>
-+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
-+                </OriginServiceArea>
-+                <DestinationServiceArea>
-+                    <FacilityCode>BER</FacilityCode>
-+                    <ServiceAreaCode>BER</ServiceAreaCode>
-+                </DestinationServiceArea>
-+                <GlobalProductCode>E</GlobalProductCode>
-+                <LocalProductCode>E</LocalProductCode>
-+                <ProductShortName>EXPRESS 9:00</ProductShortName>
-+                <LocalProductName>EXPRESS 9:00 NONDOC</LocalProductName>
-+                <NetworkTypeCode>TD</NetworkTypeCode>
-+                <POfferedCustAgreement>N</POfferedCustAgreement>
-+                <TransInd>Y</TransInd>
-+                <PickupDate>2014-01-09</PickupDate>
-+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
-+                <BookingTime>PT15H15M</BookingTime>
-+                <CurrencyCode>USD</CurrencyCode>
-+                <ExchangeRate>1.000000</ExchangeRate>
-+                <WeightCharge>42.060</WeightCharge>
-+                <WeightChargeTax>0.000</WeightChargeTax>
-+                <TotalTransitDays>2</TotalTransitDays>
-+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
-+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-+                <DeliveryDate>
-+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
-+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
-+                </DeliveryDate>
-+                <DeliveryTime>PT9H</DeliveryTime>
-+                <DimensionalWeight>2.205</DimensionalWeight>
-+                <WeightUnit>LB</WeightUnit>
-+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
-+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
-+                <QtdShpExChrg>
-+                    <SpecialServiceType>FF</SpecialServiceType>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <ChargeValue>3.790</ChargeValue>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>3.790</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>3.790</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>3.790</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                </QtdShpExChrg>
-+                <PricingDate>2014-01-09</PricingDate>
-+                <ShippingCharge>45.850</ShippingCharge>
-+                <TotalTaxAmount>0.000</TotalTaxAmount>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    <WeightCharge>42.060</WeightCharge>
-+                    <TotalAmount>45.850</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    <WeightCharge>42.060</WeightCharge>
-+                    <TotalAmount>45.850</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    <WeightCharge>42.060</WeightCharge>
-+                    <TotalAmount>45.850</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
-+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
-+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
-+            </QtdShp>
-+            <QtdShp>
-+                <OriginServiceArea>
-+                    <FacilityCode>NUQ</FacilityCode>
-+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
-+                </OriginServiceArea>
-+                <DestinationServiceArea>
-+                    <FacilityCode>BER</FacilityCode>
-+                    <ServiceAreaCode>BER</ServiceAreaCode>
-+                </DestinationServiceArea>
-+                <GlobalProductCode>Q</GlobalProductCode>
-+                <LocalProductCode>Q</LocalProductCode>
-+                <ProductShortName>MEDICAL EXPRESS</ProductShortName>
-+                <LocalProductName>MEDICAL EXPRESS</LocalProductName>
-+                <NetworkTypeCode>TD</NetworkTypeCode>
-+                <POfferedCustAgreement>Y</POfferedCustAgreement>
-+                <TransInd>N</TransInd>
-+                <PickupDate>2014-01-09</PickupDate>
-+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
-+                <BookingTime>PT15H15M</BookingTime>
-+                <CurrencyCode>USD</CurrencyCode>
-+                <ExchangeRate>1.000000</ExchangeRate>
-+                <WeightCharge>32.350</WeightCharge>
-+                <WeightChargeTax>0.000</WeightChargeTax>
-+                <TotalTransitDays>2</TotalTransitDays>
-+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
-+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-+                <DeliveryDate>
-+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
-+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
-+                </DeliveryDate>
-+                <DeliveryTime>PT9H</DeliveryTime>
-+                <DimensionalWeight>2.205</DimensionalWeight>
-+                <WeightUnit>LB</WeightUnit>
-+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
-+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
-+                <QtdShpExChrg>
-+                    <SpecialServiceType>FF</SpecialServiceType>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <ChargeValue>2.910</ChargeValue>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>2.910</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>2.910</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>2.910</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                </QtdShpExChrg>
-+                <PricingDate>2014-01-09</PricingDate>
-+                <ShippingCharge>35.260</ShippingCharge>
-+                <TotalTaxAmount>0.000</TotalTaxAmount>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    <WeightCharge>32.350</WeightCharge>
-+                    <TotalAmount>35.260</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    <WeightCharge>32.350</WeightCharge>
-+                    <TotalAmount>35.260</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    <WeightCharge>32.350</WeightCharge>
-+                    <TotalAmount>35.260</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
-+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
-+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
-+            </QtdShp>
-+            <QtdShp>
-+                <OriginServiceArea>
-+                    <FacilityCode>NUQ</FacilityCode>
-+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
-+                </OriginServiceArea>
-+                <DestinationServiceArea>
-+                    <FacilityCode>BER</FacilityCode>
-+                    <ServiceAreaCode>BER</ServiceAreaCode>
-+                </DestinationServiceArea>
-+                <GlobalProductCode>Y</GlobalProductCode>
-+                <LocalProductCode>Y</LocalProductCode>
-+                <ProductShortName>EXPRESS 12:00</ProductShortName>
-+                <LocalProductName>EXPRESS 12:00 NONDOC</LocalProductName>
-+                <NetworkTypeCode>TD</NetworkTypeCode>
-+                <POfferedCustAgreement>N</POfferedCustAgreement>
-+                <TransInd>Y</TransInd>
-+                <PickupDate>2014-01-09</PickupDate>
-+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
-+                <BookingTime>PT15H15M</BookingTime>
-+                <CurrencyCode>USD</CurrencyCode>
-+                <ExchangeRate>1.000000</ExchangeRate>
-+                <WeightCharge>34.290</WeightCharge>
-+                <WeightChargeTax>0.000</WeightChargeTax>
-+                <TotalTransitDays>2</TotalTransitDays>
-+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
-+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-+                <DeliveryDate>
-+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
-+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
-+                </DeliveryDate>
-+                <DeliveryTime>PT12H</DeliveryTime>
-+                <DimensionalWeight>2.205</DimensionalWeight>
-+                <WeightUnit>LB</WeightUnit>
-+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
-+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
-+                <QtdShpExChrg>
-+                    <SpecialServiceType>FF</SpecialServiceType>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <ChargeValue>3.090</ChargeValue>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>3.090</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>3.090</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>3.090</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                </QtdShpExChrg>
-+                <PricingDate>2014-01-09</PricingDate>
-+                <ShippingCharge>37.380</ShippingCharge>
-+                <TotalTaxAmount>0.000</TotalTaxAmount>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    <WeightCharge>34.290</WeightCharge>
-+                    <TotalAmount>37.380</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    <WeightCharge>34.290</WeightCharge>
-+                    <TotalAmount>37.380</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    <WeightCharge>34.290</WeightCharge>
-+                    <TotalAmount>37.380</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
-+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
-+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
-+            </QtdShp>
-+            <QtdShp>
-+                <OriginServiceArea>
-+                    <FacilityCode>NUQ</FacilityCode>
-+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
-+                </OriginServiceArea>
-+                <DestinationServiceArea>
-+                    <FacilityCode>BER</FacilityCode>
-+                    <ServiceAreaCode>BER</ServiceAreaCode>
-+                </DestinationServiceArea>
-+                <GlobalProductCode>3</GlobalProductCode>
-+                <LocalProductCode>3</LocalProductCode>
-+                <ProductShortName>B2C</ProductShortName>
-+                <LocalProductName>EXPRESS WORLDWIDE (B2C)</LocalProductName>
-+                <NetworkTypeCode>TD</NetworkTypeCode>
-+                <POfferedCustAgreement>Y</POfferedCustAgreement>
-+                <TransInd>N</TransInd>
-+                <PickupDate>2014-01-09</PickupDate>
-+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
-+                <BookingTime>PT15H15M</BookingTime>
-+                <ExchangeRate>1.000000</ExchangeRate>
-+                <WeightCharge>0</WeightCharge>
-+                <WeightChargeTax>0.000</WeightChargeTax>
-+                <TotalTransitDays>2</TotalTransitDays>
-+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
-+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-+                <DeliveryDate>
-+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
-+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
-+                </DeliveryDate>
-+                <DeliveryTime>PT23H59M</DeliveryTime>
-+                <DimensionalWeight>2.205</DimensionalWeight>
-+                <WeightUnit>LB</WeightUnit>
-+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
-+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
-+                <PricingDate>2014-01-09</PricingDate>
-+                <ShippingCharge>0.000</ShippingCharge>
-+                <TotalTaxAmount>0.000</TotalTaxAmount>
-+                <QtdSInAdCur>
-+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    <WeightCharge>0</WeightCharge>
-+                    <TotalAmount>0.000</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    <WeightCharge>0</WeightCharge>
-+                    <TotalAmount>0.000</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    <WeightCharge>0</WeightCharge>
-+                    <TotalAmount>0.000</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
-+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
-+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
-+            </QtdShp>
-+            <QtdShp>
-+                <OriginServiceArea>
-+                    <FacilityCode>NUQ</FacilityCode>
-+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
-+                </OriginServiceArea>
-+                <DestinationServiceArea>
-+                    <FacilityCode>BER</FacilityCode>
-+                    <ServiceAreaCode>BER</ServiceAreaCode>
-+                </DestinationServiceArea>
-+                <GlobalProductCode>P</GlobalProductCode>
-+                <LocalProductCode>P</LocalProductCode>
-+                <ProductShortName>EXPRESS WORLDWIDE</ProductShortName>
-+                <LocalProductName>EXPRESS WORLDWIDE NONDOC</LocalProductName>
-+                <NetworkTypeCode>TD</NetworkTypeCode>
-+                <POfferedCustAgreement>N</POfferedCustAgreement>
-+                <TransInd>Y</TransInd>
-+                <PickupDate>2014-01-09</PickupDate>
-+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
-+                <BookingTime>PT15H15M</BookingTime>
-+                <CurrencyCode>USD</CurrencyCode>
-+                <ExchangeRate>1.000000</ExchangeRate>
-+                <WeightCharge>32.350</WeightCharge>
-+                <WeightChargeTax>0.000</WeightChargeTax>
-+                <TotalTransitDays>2</TotalTransitDays>
-+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
-+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-+                <DeliveryDate>
-+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
-+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
-+                </DeliveryDate>
-+                <DeliveryTime>PT23H59M</DeliveryTime>
-+                <DimensionalWeight>2.205</DimensionalWeight>
-+                <WeightUnit>LB</WeightUnit>
-+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
-+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
-+                <QtdShpExChrg>
-+                    <SpecialServiceType>FF</SpecialServiceType>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <ChargeValue>2.910</ChargeValue>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>2.910</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>2.910</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                    <QtdSExtrChrgInAdCur>
-+                        <ChargeValue>2.910</ChargeValue>
-+                        <CurrencyCode>USD</CurrencyCode>
-+                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    </QtdSExtrChrgInAdCur>
-+                </QtdShpExChrg>
-+                <PricingDate>2014-01-09</PricingDate>
-+                <ShippingCharge>35.260</ShippingCharge>
-+                <TotalTaxAmount>0.000</TotalTaxAmount>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
-+                    <WeightCharge>32.350</WeightCharge>
-+                    <TotalAmount>35.260</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
-+                    <WeightCharge>32.350</WeightCharge>
-+                    <TotalAmount>35.260</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <QtdSInAdCur>
-+                    <CurrencyCode>USD</CurrencyCode>
-+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
-+                    <WeightCharge>32.350</WeightCharge>
-+                    <TotalAmount>35.260</TotalAmount>
-+                    <TotalTaxAmount>0.000</TotalTaxAmount>
-+                    <WeightChargeTax>0.000</WeightChargeTax>
-+                </QtdSInAdCur>
-+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
-+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
-+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
-+            </QtdShp>
-+        </BkgDetails>
-+        <Srvs>
-+            <Srv>
-+                <GlobalProductCode>E</GlobalProductCode>
-+                <MrkSrv>
-+                    <LocalProductCode>E</LocalProductCode>
-+                    <ProductShortName>EXPRESS 9:00</ProductShortName>
-+                    <LocalProductName>EXPRESS 9:00 NONDOC</LocalProductName>
-+                    <NetworkTypeCode>TD</NetworkTypeCode>
-+                    <POfferedCustAgreement>N</POfferedCustAgreement>
-+                    <TransInd>Y</TransInd>
-+                </MrkSrv>
-+                <MrkSrv>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <MrkSrvInd>N</MrkSrvInd>
-+                </MrkSrv>
-+            </Srv>
-+            <Srv>
-+                <GlobalProductCode>Q</GlobalProductCode>
-+                <MrkSrv>
-+                    <LocalProductCode>Q</LocalProductCode>
-+                    <ProductShortName>MEDICAL EXPRESS</ProductShortName>
-+                    <LocalProductName>MEDICAL EXPRESS</LocalProductName>
-+                    <NetworkTypeCode>TD</NetworkTypeCode>
-+                    <POfferedCustAgreement>Y</POfferedCustAgreement>
-+                    <TransInd>N</TransInd>
-+                </MrkSrv>
-+                <MrkSrv>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <MrkSrvInd>N</MrkSrvInd>
-+                </MrkSrv>
-+            </Srv>
-+            <Srv>
-+                <GlobalProductCode>Y</GlobalProductCode>
-+                <MrkSrv>
-+                    <LocalProductCode>Y</LocalProductCode>
-+                    <ProductShortName>EXPRESS 12:00</ProductShortName>
-+                    <LocalProductName>EXPRESS 12:00 NONDOC</LocalProductName>
-+                    <NetworkTypeCode>TD</NetworkTypeCode>
-+                    <POfferedCustAgreement>N</POfferedCustAgreement>
-+                    <TransInd>Y</TransInd>
-+                </MrkSrv>
-+                <MrkSrv>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <MrkSrvInd>N</MrkSrvInd>
-+                </MrkSrv>
-+            </Srv>
-+            <Srv>
-+                <GlobalProductCode>3</GlobalProductCode>
-+                <MrkSrv>
-+                    <LocalProductCode>3</LocalProductCode>
-+                    <ProductShortName>B2C</ProductShortName>
-+                    <LocalProductName>EXPRESS WORLDWIDE (B2C)</LocalProductName>
-+                    <NetworkTypeCode>TD</NetworkTypeCode>
-+                    <POfferedCustAgreement>Y</POfferedCustAgreement>
-+                    <TransInd>N</TransInd>
-+                </MrkSrv>
-+            </Srv>
-+            <Srv>
-+                <GlobalProductCode>P</GlobalProductCode>
-+                <MrkSrv>
-+                    <LocalProductCode>P</LocalProductCode>
-+                    <ProductShortName>EXPRESS WORLDWIDE</ProductShortName>
-+                    <LocalProductName>EXPRESS WORLDWIDE NONDOC</LocalProductName>
-+                    <NetworkTypeCode>TD</NetworkTypeCode>
-+                    <POfferedCustAgreement>N</POfferedCustAgreement>
-+                    <TransInd>Y</TransInd>
-+                </MrkSrv>
-+                <MrkSrv>
-+                    <LocalServiceType>FF</LocalServiceType>
-+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
-+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
-+                    <ChargeCodeType>SCH</ChargeCodeType>
-+                    <MrkSrvInd>N</MrkSrvInd>
-+                </MrkSrv>
-+            </Srv>
-+        </Srvs>
-+    </GetQuoteResponse>
-+</res:DCTResponse>
-diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/domestic_shipment_request.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/domestic_shipment_request.xml
-new file mode 100644
-index 00000000000..14ef165a4e5
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/domestic_shipment_request.xml
-@@ -0,0 +1,88 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<req:ShipmentRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+                     xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.0.xsd" schemaVersion="6.0">
-+    <Request xmlns="">
-+        <ServiceHeader>
-+            <MessageTime>currentTime</MessageTime>
-+            <MessageReference>MAGE_SHIP_28TO32_Char_CHECKED</MessageReference>
-+            <SiteID>some ID</SiteID>
-+            <Password>some password</Password>
-+        </ServiceHeader>
-+    </Request>
-+    <RegionCode xmlns="">CHECKED</RegionCode>
-+    <RequestedPickupTime xmlns="">N</RequestedPickupTime>
-+    <NewShipper xmlns="">N</NewShipper>
-+    <LanguageCode xmlns="">EN</LanguageCode>
-+    <PiecesEnabled xmlns="">Y</PiecesEnabled>
-+    <Billing xmlns="">
-+        <ShipperAccountNumber>1234567890</ShipperAccountNumber>
-+        <ShippingPaymentType>S</ShippingPaymentType>
-+        <BillingAccountNumber>1234567890</BillingAccountNumber>
-+        <DutyPaymentType>S</DutyPaymentType>
-+        <DutyAccountNumber>1234567890</DutyAccountNumber>
-+    </Billing>
-+    <Consignee xmlns="">
-+        <CompanyName/>
-+        <AddressLine>15099 Some Blvd</AddressLine>
-+        <City/>
-+        <PostalCode/>
-+        <CountryCode/>
-+        <CountryName/>
-+        <Contact>
-+            <PersonName/>
-+            <PhoneNumber/>
-+        </Contact>
-+    </Consignee>
-+    <Commodity xmlns="">
-+        <CommodityCode>1</CommodityCode>
-+    </Commodity>
-+    <Reference xmlns="">
-+        <ReferenceID>shipment reference</ReferenceID>
-+        <ReferenceType>St</ReferenceType>
-+    </Reference>
-+    <ShipmentDetails xmlns="">
-+        <NumberOfPieces>1</NumberOfPieces>
-+        <Pieces xmlns="">
-+            <Piece xmlns="">
-+                <PieceID>1</PieceID>
-+                <PackageType>CP</PackageType>
-+                <Weight>0.454</Weight>
-+                <Width>3</Width>
-+                <Height>3</Height>
-+                <Depth>3</Depth>
-+                <PieceContents>item_name</PieceContents>
-+            </Piece>
-+        </Pieces>
-+        <Weight>0.454</Weight>
-+        <WeightUnit>K</WeightUnit>
-+        <GlobalProductCode/>
-+        <LocalProductCode/>
-+        <Date>currentTime</Date>
-+        <Contents>DHL Parcel</Contents>
-+        <DoorTo>DD</DoorTo>
-+        <DimensionUnit>C</DimensionUnit>
-+        <PackageType>CP</PackageType>
-+        <CurrencyCode>USD</CurrencyCode>
-+    </ShipmentDetails>
-+    <Shipper xmlns="">
-+        <ShipperID>1234567890</ShipperID>
-+        <CompanyName/>
-+        <RegisteredAccount>1234567890</RegisteredAccount>
-+        <AddressLine>4956 Some Way</AddressLine>
-+        <City/>
-+        <PostalCode/>
-+        <CountryCode/>
-+        <CountryName/>
-+        <Contact xmlns="">
-+            <PersonName/>
-+            <PhoneNumber/>
-+        </Contact>
-+    </Shipper>
-+    <LabelImageFormat xmlns="">PDF</LabelImageFormat>
-+</req:ShipmentRequest>
-\ No newline at end of file
-diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/response_shipping_label.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/response_shipping_label.xml
-new file mode 100644
-index 00000000000..40f97b4faa4
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/response_shipping_label.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <AirwayBillNumber>1111</AirwayBillNumber>
-+    <LabelImage>
-+        <OutputImage>OutputImageContent</OutputImage>
-+    </LabelImage>
-+    <City>Nürnberg</City>
-+</root>
-diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/shipment_request.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/shipment_request.xml
-new file mode 100644
-index 00000000000..3edefb5e9ab
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/shipment_request.xml
-@@ -0,0 +1,93 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<req:ShipmentRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+                     xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.0.xsd" schemaVersion="6.0">
-+    <Request xmlns="">
-+        <ServiceHeader>
-+            <MessageTime>currentTime</MessageTime>
-+            <MessageReference>MAGE_SHIP_28TO32_Char_CHECKED</MessageReference>
-+            <SiteID>some ID</SiteID>
-+            <Password>some password</Password>
-+        </ServiceHeader>
-+    </Request>
-+    <RegionCode xmlns="">CHECKED</RegionCode>
-+    <RequestedPickupTime xmlns="">N</RequestedPickupTime>
-+    <NewShipper xmlns="">N</NewShipper>
-+    <LanguageCode xmlns="">EN</LanguageCode>
-+    <PiecesEnabled xmlns="">Y</PiecesEnabled>
-+    <Billing xmlns="">
-+        <ShipperAccountNumber>1234567890</ShipperAccountNumber>
-+        <ShippingPaymentType>S</ShippingPaymentType>
-+        <BillingAccountNumber>1234567890</BillingAccountNumber>
-+        <DutyPaymentType>S</DutyPaymentType>
-+        <DutyAccountNumber>1234567890</DutyAccountNumber>
-+    </Billing>
-+    <Consignee xmlns="">
-+        <CompanyName/>
-+        <AddressLine>15099 Some Blvd</AddressLine>
-+        <City/>
-+        <PostalCode/>
-+        <CountryCode/>
-+        <CountryName/>
-+        <Contact>
-+            <PersonName/>
-+            <PhoneNumber/>
-+        </Contact>
-+    </Consignee>
-+    <Commodity xmlns="">
-+        <CommodityCode>1</CommodityCode>
-+    </Commodity>
-+    <Dutiable xmlns="">
-+        <DeclaredValue>10.00</DeclaredValue>
-+        <DeclaredCurrency>USD</DeclaredCurrency>
-+    </Dutiable>
-+    <Reference xmlns="">
-+        <ReferenceID>shipment reference</ReferenceID>
-+        <ReferenceType>St</ReferenceType>
-+    </Reference>
-+    <ShipmentDetails xmlns="">
-+        <NumberOfPieces>1</NumberOfPieces>
-+        <Pieces xmlns="">
-+            <Piece xmlns="">
-+                <PieceID>1</PieceID>
-+                <PackageType>CP</PackageType>
-+                <Weight>0.454</Weight>
-+                <Width>3</Width>
-+                <Height>3</Height>
-+                <Depth>3</Depth>
-+                <PieceContents>item_name</PieceContents>
-+            </Piece>
-+        </Pieces>
-+        <Weight>0.454</Weight>
-+        <WeightUnit>K</WeightUnit>
-+        <GlobalProductCode/>
-+        <LocalProductCode/>
-+        <Date>currentTime</Date>
-+        <Contents>DHL Parcel</Contents>
-+        <DoorTo>DD</DoorTo>
-+        <DimensionUnit>C</DimensionUnit>
-+        <PackageType>CP</PackageType>
-+        <IsDutiable>Y</IsDutiable>
-+        <CurrencyCode>USD</CurrencyCode>
-+    </ShipmentDetails>
-+    <Shipper xmlns="">
-+        <ShipperID>1234567890</ShipperID>
-+        <CompanyName/>
-+        <RegisteredAccount>1234567890</RegisteredAccount>
-+        <AddressLine>4956 Some Way</AddressLine>
-+        <City/>
-+        <PostalCode/>
-+        <CountryCode/>
-+        <CountryName/>
-+        <Contact xmlns="">
-+            <PersonName/>
-+            <PhoneNumber/>
-+        </Contact>
-+    </Shipper>
-+    <LabelImageFormat xmlns="">PDF</LabelImageFormat>
-+</req:ShipmentRequest>
-diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/CurrencyConfigTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/CurrencyConfigTest.php
-index b620d9097b4..10f2749ddac 100644
---- a/dev/tests/integration/testsuite/Magento/Directory/Model/CurrencyConfigTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Directory/Model/CurrencyConfigTest.php
-@@ -56,7 +56,7 @@ class CurrencyConfigTest extends TestCase
-     }
- 
-     /**
--     * Test get currency config for admin and storefront areas.
-+     * Test get currency config for admin, crontab and storefront areas.
-      *
-      * @dataProvider getConfigCurrenciesDataProvider
-      * @magentoDataFixture Magento/Store/_files/store.php
-@@ -77,7 +77,7 @@ class CurrencyConfigTest extends TestCase
-         $storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
-         $storeManager->setCurrentStore($store->getId());
- 
--        if ($areaCode === Area::AREA_ADMINHTML) {
-+        if (in_array($areaCode, [Area::AREA_ADMINHTML, Area::AREA_CRONTAB])) {
-             self::assertEquals($expected['allowed'], $this->currency->getConfigAllowCurrencies());
-             self::assertEquals($expected['base'], $this->currency->getConfigBaseCurrencies());
-             self::assertEquals($expected['default'], $this->currency->getConfigDefaultCurrencies());
-@@ -118,6 +118,14 @@ class CurrencyConfigTest extends TestCase
-                     'default' => ['BDT', 'USD'],
-                 ],
-             ],
-+            [
-+                'areaCode' => Area::AREA_CRONTAB,
-+                'expected' => [
-+                    'allowed' => ['BDT', 'BNS', 'BTD', 'EUR', 'USD'],
-+                    'base' => ['BDT', 'USD'],
-+                    'default' => ['BDT', 'USD'],
-+                ],
-+            ],
-             [
-                 'areaCode' => Area::AREA_FRONTEND,
-                 'expected' => [
-diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
-deleted file mode 100644
-index c3549a60e24..00000000000
---- a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
-+++ /dev/null
-@@ -1,90 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Directory\Model;
--
--use Magento\Framework\ObjectManagerInterface;
--use Magento\Store\Model\ScopeInterface;
--use Magento\TestFramework\Helper\Bootstrap;
--
--/**
-- * Integration test for \Magento\Directory\Model\Observer
-- */
--class ObserverTest extends \PHPUnit\Framework\TestCase
--{
--    /** @var  ObjectManagerInterface */
--    protected $objectManager;
--
--    /** @var Observer */
--    protected $observer;
--
--    /** @var \Magento\Framework\App\MutableScopeConfig */
--    protected $scopeConfig;
--
--    /** @var string */
--    protected $baseCurrency = 'USD';
--
--    /** @var string */
--    protected $baseCurrencyPath = 'currency/options/base';
--
--    /** @var string */
--    protected $allowedCurrenciesPath = 'currency/options/allow';
--
--    /** @var \Magento\Config\Model\ResourceModel\Config */
--    protected $configResource;
--
--    public function setUp()
--    {
--        $this->objectManager = Bootstrap::getObjectManager();
--
--        $this->scopeConfig = $this->objectManager->create(\Magento\Framework\App\MutableScopeConfig::class);
--        $this->scopeConfig->setValue(Observer::IMPORT_ENABLE, 1, ScopeInterface::SCOPE_STORE);
--        $this->scopeConfig->setValue(Observer::CRON_STRING_PATH, 'cron-string-path', ScopeInterface::SCOPE_STORE);
--        $this->scopeConfig->setValue(Observer::IMPORT_SERVICE, 'webservicex', ScopeInterface::SCOPE_STORE);
--
--        $this->configResource = $this->objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
--        $this->configResource->saveConfig(
--            $this->baseCurrencyPath,
--            $this->baseCurrency,
--            ScopeInterface::SCOPE_STORE,
--            0
--        );
--
--        $this->observer = $this->objectManager->create(\Magento\Directory\Model\Observer::class);
--    }
--
--    public function testScheduledUpdateCurrencyRates()
--    {
--        //skipping test if service is unavailable
--        $url = str_replace(
--            '{{CURRENCY_FROM}}',
--            'USD',
--            \Magento\Directory\Model\Currency\Import\Webservicex::CURRENCY_CONVERTER_URL
--        );
--        $url = str_replace('{{CURRENCY_TO}}', 'GBP', $url);
--        try {
--            file_get_contents($url);
--        } catch (\PHPUnit\Framework\Exception $e) {
--            $this->markTestSkipped('http://www.webservicex.net is unavailable ');
--        }
--
--        $allowedCurrencies = 'USD,GBP,EUR';
--        $this->configResource->saveConfig(
--            $this->allowedCurrenciesPath,
--            $allowedCurrencies,
--            ScopeInterface::SCOPE_STORE,
--            0
--        );
--        $this->observer->scheduledUpdateCurrencyRates(null);
--        /** @var Currency $currencyResource */
--        $currencyResource = $this->objectManager
--            ->create(\Magento\Directory\Model\CurrencyFactory::class)
--            ->create()
--            ->getResource();
--        $rates = $currencyResource->getCurrencyRates($this->baseCurrency, explode(',', $allowedCurrencies));
--        $this->assertNotEmpty($rates);
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
-index c743fcec1dd..b07a6506c1b 100644
---- a/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
-@@ -5,6 +5,13 @@
-  */
- namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
- 
-+/**
-+ * Class LinksTest
-+ *
-+ * @package Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable
-+ * @deprecated
-+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Links
-+ */
- class LinksTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
-index 28d36803583..3f3b3bd6219 100644
---- a/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
-@@ -5,6 +5,13 @@
-  */
- namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
- 
-+/**
-+ * Class SamplesTest
-+ *
-+ * @package Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable
-+ * @deprecated
-+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples
-+ */
- class SamplesTest extends \PHPUnit\Framework\TestCase
- {
-     public function testGetUploadButtonsHtml()
-diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Controller/Adminhtml/Downloadable/FileTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Controller/Adminhtml/Downloadable/FileTest.php
-index 3f13ce7f41e..60c2a41fae4 100644
---- a/dev/tests/integration/testsuite/Magento/Downloadable/Controller/Adminhtml/Downloadable/FileTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Downloadable/Controller/Adminhtml/Downloadable/FileTest.php
-@@ -37,6 +37,7 @@ class FileTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-             ],
-         ];
- 
-+        $this->getRequest()->setMethod('POST');
-         $this->dispatch('backend/admin/downloadable_file/upload/type/samples');
-         $body = $this->getResponse()->getBody();
-         $result = Bootstrap::getObjectManager()->get(Json::class)->unserialize($body);
-@@ -64,6 +65,7 @@ class FileTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-             ],
-         ];
- 
-+        $this->getRequest()->setMethod('POST');
-         $this->dispatch('backend/admin/downloadable_file/upload/type/samples');
-         $body = $this->getResponse()->getBody();
-         $result = Bootstrap::getObjectManager()->get(Json::class)->unserialize($body);
-diff --git a/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php b/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php
-index c80cd13a168..d0e4471e2ea 100644
---- a/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php
-+++ b/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php
-@@ -9,7 +9,10 @@ use Magento\CatalogImportExport\Model\AbstractProductExportImportTestCase;
- 
- class DownloadableTest extends AbstractProductExportImportTestCase
- {
--    public function exportImportDataProvider()
-+    /**
-+     * @return array
-+     */
-+    public function exportImportDataProvider(): array
-     {
-         return [
-             'downloadable-product' => [
-@@ -31,79 +34,32 @@ class DownloadableTest extends AbstractProductExportImportTestCase
-         ];
-     }
- 
--    public function importReplaceDataProvider()
--    {
--        return $this->exportImportDataProvider();
--    }
--
--    /**
--     * @param array $fixtures
--     * @param string[] $skus
--     * @param string[] $skippedAttributes
--     * @dataProvider exportImportDataProvider
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
--     *
--     * @todo remove after MAGETWO-38240 resolved
--     */
--    public function testExport($fixtures, $skus, $skippedAttributes = [], $rollbackFixtures = [])
--    {
--        $this->markTestSkipped('Uncomment after MAGETWO-38240 resolved');
--    }
--
--    /**
--     * @param array $fixtures
--     * @param string[] $skus
--     * @dataProvider exportImportDataProvider
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
--     *
--     * @todo remove after MAGETWO-38240 resolved
--     */
--    public function testImportDelete($fixtures, $skus, $skippedAttributes = [], $rollbackFixtures = [])
--    {
--        $this->markTestSkipped('Uncomment after MAGETWO-38240 resolved');
--    }
--
-     /**
--     * @magentoAppArea adminhtml
--     * @magentoDbIsolation enabled
--     * @magentoAppIsolation enabled
--     *
--     * @param array $fixtures
--     * @param string[] $skus
--     * @param string[] $skippedAttributes
--     * @dataProvider importReplaceDataProvider
--     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     * Run import/export tests.
-      *
--     * @todo remove after MAGETWO-38240 resolved
--     */
--    public function testImportReplace($fixtures, $skus, $skippedAttributes = [], $rollbackFixtures = [])
--    {
--        $this->markTestSkipped('Uncomment after MAGETWO-38240 resolved');
--    }
--
--    /**
-      * @magentoAppArea adminhtml
--     * @magentoDbIsolation enabled
-+     * @magentoDbIsolation disabled
-      * @magentoAppIsolation enabled
-      *
-      * @param array $fixtures
-      * @param string[] $skus
-      * @param string[] $skippedAttributes
--     * @dataProvider importReplaceDataProvider
--     *
-+     * @return void
-+     * @dataProvider exportImportDataProvider
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    public function testImportReplaceWithPagination($fixtures, $skus, $skippedAttributes = [])
-+    public function testImportExport(array $fixtures, array $skus, array $skippedAttributes = []): void
-     {
-         $this->markTestSkipped('Uncomment after MAGETWO-38240 resolved');
-     }
- 
-     /**
--     * @param \Magento\Catalog\Model\Product $expectedProduct
--     * @param \Magento\Catalog\Model\Product $actualProduct
-+     * @inheritdoc
-      */
--    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
--    {
-+    protected function assertEqualsSpecificAttributes(
-+        \Magento\Catalog\Model\Product $expectedProduct,
-+        \Magento\Catalog\Model\Product $actualProduct
-+    ): void {
-         $expectedProductLinks   = $expectedProduct->getExtensionAttributes()->getDownloadableProductLinks();
-         $expectedProductSamples = $expectedProduct->getExtensionAttributes()->getDownloadableProductSamples();
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
-index 5e8239586d7..9961101dac7 100644
---- a/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
-@@ -9,7 +9,7 @@ use Magento\TestFramework\Helper\Bootstrap;
- use Magento\TestFramework\Helper\CacheCleaner;
- use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
- use Magento\Framework\App\CacheInterface;
--use Magento\Store\Api\StoreResolverInterface;
-+use Magento\Store\Model\StoreManagerInterface;
- use Magento\Framework\Serialize\Serializer\Json as Serializer;
- use Magento\Eav\Model\Entity\Attribute;
- 
-@@ -44,9 +44,9 @@ class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
-     private $cache;
- 
-     /**
--     * @var StoreResolverInterface
-+     * @var StoreManagerInterface
-      */
--    private $storeResolver;
-+    private $storeManager;
- 
-     /**
-      * @var Serializer
-@@ -60,7 +60,7 @@ class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
- 
-         $this->defaultFrontend = $this->objectManager->get(DefaultFrontend::class);
-         $this->cache = $this->objectManager->get(CacheInterface::class);
--        $this->storeResolver = $this->objectManager->get(StoreResolverInterface::class);
-+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
-         $this->serializer = $this->objectManager->get(Serializer::class);
-         $this->attribute = $this->objectManager->get(Attribute::class);
- 
-@@ -99,6 +99,6 @@ class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
-     {
-         return 'attribute-navigation-option-' .
-             $this->defaultFrontend->getAttribute()->getAttributeCode() . '-' .
--            $this->storeResolver->getCurrentStoreId();
-+            $this->storeManager->getStore()->getId();
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php b/dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php
-index 5d7a72c6559..a5843f20ad9 100644
---- a/dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php
-@@ -55,7 +55,7 @@ class EavSetupTest extends \PHPUnit\Framework\TestCase
-     {
-         return [
-             ['eav_setup_test'],
--            ['_59_characters_59_characters_59_characters_59_characters_59'],
-+            ['characters_59_characters_59_characters_59_characters_59_59_'],
-         ];
-     }
- 
-@@ -90,6 +90,33 @@ class EavSetupTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
-+    /**
-+     * Verify that add attribute throw exception if attribute_code is not valid.
-+     *
-+     * @param string|null $attributeCode
-+     *
-+     * @dataProvider addInvalidAttributeThrowExceptionDataProvider
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field,
-+     */
-+    public function testAddInvalidAttributeThrowException($attributeCode)
-+    {
-+        $attributeData = $this->getAttributeData();
-+        $this->eavSetup->addAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode, $attributeData);
-+    }
-+    /**
-+     * Data provider for testAddInvalidAttributeThrowException().
-+     *
-+     * @return array
-+     */
-+    public function addInvalidAttributeThrowExceptionDataProvider()
-+    {
-+        return [
-+            ['1first_character_is_not_letter'],
-+            ['attribute.with.dots'],
-+        ];
-+    }
-+
-     /**
-      * Get simple attribute data.
-      */
-diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php
-new file mode 100644
-index 00000000000..fcd8226aec5
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php
-@@ -0,0 +1,170 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Controller\Adminhtml\Category;
-+
-+use Magento\Catalog\Api\CategoryListInterface;
-+use Magento\Catalog\Api\Data\CategoryInterface;
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Indexer\Category\Product as CategoryIndexer;
-+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
-+use Magento\Elasticsearch\Model\Config;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Indexer\IndexerInterface;
-+use Magento\Framework\Indexer\IndexerRegistry;
-+use Magento\Framework\Message\MessageInterface;
-+use Magento\TestFramework\TestCase\AbstractBackendController;
-+
-+/**
-+ * @magentoAppArea adminhtml
-+ * @magentoDbIsolation disabled
-+ */
-+class SaveTest extends AbstractBackendController
-+{
-+    private $indexerSchedule = [];
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $config = $this->getMockBuilder(Config::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $config->method('isElasticsearchEnabled')
-+            ->willReturn(true);
-+        $this->_objectManager->addSharedInstance($config, Config::class);
-+
-+        $this->changeIndexerSchedule(FulltextIndexer::INDEXER_ID, true);
-+        $this->changeIndexerSchedule(CategoryIndexer::INDEXER_ID, true);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function tearDown()
-+    {
-+        $this->_objectManager->removeSharedInstance(Config::class);
-+        $this->changeIndexerSchedule(FulltextIndexer::INDEXER_ID, $this->indexerSchedule[FulltextIndexer::INDEXER_ID]);
-+        $this->changeIndexerSchedule(CategoryIndexer::INDEXER_ID, $this->indexerSchedule[CategoryIndexer::INDEXER_ID]);
-+
-+        parent::tearDown();
-+    }
-+
-+    /**
-+     * Checks a case when indexers are invalidated if products for category were changed.
-+     *
-+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
-+     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
-+     */
-+    public function testExecute()
-+    {
-+        $fulltextIndexer = $this->getIndexer(FulltextIndexer::INDEXER_ID);
-+        self::assertTrue($fulltextIndexer->isValid(), 'Fulltext indexer should be valid.');
-+        $categoryIndexer = $this->getIndexer(CategoryIndexer::INDEXER_ID);
-+        self::assertTrue($categoryIndexer->isValid(), 'Category indexer should be valid.');
-+
-+        $category = $this->getCategory('Category 1');
-+        $productIdList = $this->getProductIdList(['simple1', 'simple2', 'simple3']);
-+        $inputData = [
-+            'category_products' => json_encode(array_fill_keys($productIdList, [0, 1, 2])),
-+            'entity_id' => $category->getId(),
-+            'default_sort_by' => 'position'
-+        ];
-+
-+        $this->getRequest()->setPostValue($inputData);
-+        $this->getRequest()->setMethod('POST');
-+        $this->dispatch('backend/catalog/category/save');
-+        $this->assertSessionMessages(
-+            self::equalTo(['You saved the category.']),
-+            MessageInterface::TYPE_SUCCESS
-+        );
-+
-+        $fulltextIndexer = $this->getIndexer(FulltextIndexer::INDEXER_ID);
-+        self::assertTrue($fulltextIndexer->isInvalid(), 'Fulltext indexer should be invalidated.');
-+        $categoryIndexer = $this->getIndexer(CategoryIndexer::INDEXER_ID);
-+        self::assertTrue($categoryIndexer->isInvalid(), 'Category indexer should be invalidated.');
-+    }
-+
-+    /**
-+     * Gets indexer from registry by ID.
-+     *
-+     * @param string $indexerId
-+     * @return IndexerInterface
-+     */
-+    private function getIndexer(string $indexerId): IndexerInterface
-+    {
-+        /** @var IndexerRegistry $indexerRegistry */
-+        $indexerRegistry = $this->_objectManager->get(IndexerRegistry::class);
-+        return $indexerRegistry->get($indexerId);
-+    }
-+
-+    /**
-+     * Changes the scheduled state of indexer.
-+     *
-+     * @param string $indexerId
-+     * @param bool $isScheduled
-+     * @return void
-+     */
-+    private function changeIndexerSchedule(string $indexerId, bool $isScheduled): void
-+    {
-+        $indexer = $this->getIndexer($indexerId);
-+        if (!isset($this->indexerSchedule[$indexerId])) {
-+            $this->indexerSchedule[$indexerId] = $indexer->isScheduled();
-+            $indexer->reindexAll();
-+        }
-+        $indexer->setScheduled($isScheduled);
-+    }
-+
-+    /**
-+     * Gets category by name.
-+     *
-+     * @param string $name
-+     * @return CategoryInterface
-+     */
-+    private function getCategory(string $name): CategoryInterface
-+    {
-+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
-+        $searchCriteria = $searchCriteriaBuilder->addFilter('name', $name)
-+            ->create();
-+        /** @var CategoryListInterface $repository */
-+        $repository = $this->_objectManager->get(CategoryListInterface::class);
-+        $items = $repository->getList($searchCriteria)
-+            ->getItems();
-+
-+        return array_pop($items);
-+    }
-+
-+    /**
-+     * Gets list of product ID by SKU.
-+     *
-+     * @param array $skuList
-+     * @return array
-+     */
-+    private function getProductIdList(array $skuList): array
-+    {
-+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
-+        $searchCriteria = $searchCriteriaBuilder->addFilter('sku', $skuList, 'in')
-+            ->create();
-+
-+        /** @var ProductRepositoryInterface $repository */
-+        $repository = $this->_objectManager->get(ProductRepositoryInterface::class);
-+        $items = $repository->getList($searchCriteria)
-+            ->getItems();
-+
-+        $idList = array_map(function (ProductInterface $item) {
-+            return $item->getId();
-+        }, $items);
-+
-+        return $idList;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php
-new file mode 100644
-index 00000000000..a52c5bb9e21
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php
-@@ -0,0 +1,107 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Class AdapterTest
-+ */
-+class AdapterTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Adapter
-+     */
-+    private $adapter;
-+
-+    /**
-+     * @var \Magento\Elasticsearch\Model\Client\Elasticsearch|\PHPUnit\Framework\MockObject\MockObject
-+     */
-+    private $clientMock;
-+
-+    /**
-+     * @var \Magento\Framework\Search\Request\Builder
-+     */
-+    private $requestBuilder;
-+
-+    /**
-+     * @var \Psr\Log\LoggerInterface|\PHPUnit\Framework\MockObject\MockObject
-+     */
-+    private $loggerMock;
-+
-+    /**
-+     * @return void
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $contentManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch6\Model\Client\Elasticsearch::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $contentManager
-+            ->expects($this->any())
-+            ->method('getConnection')
-+            ->willReturn($this->clientMock);
-+        /** @var \Magento\Framework\Search\Request\Config\Converter $converter */
-+        $converter = $objectManager->create(\Magento\Framework\Search\Request\Config\Converter::class);
-+
-+        $document = new \DOMDocument();
-+        $document->load($this->getRequestConfigPath());
-+        $requestConfig = $converter->convert($document);
-+
-+        /** @var \Magento\Framework\Search\Request\Config $config */
-+        $config = $objectManager->create(\Magento\Framework\Search\Request\Config::class);
-+        $config->merge($requestConfig);
-+
-+        $this->requestBuilder = $objectManager->create(
-+            \Magento\Framework\Search\Request\Builder::class,
-+            ['config' => $config]
-+        );
-+        $this->loggerMock = $this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class);
-+
-+        $this->adapter = $objectManager->create(
-+            \Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Adapter::class,
-+            [
-+                'connectionManager' => $contentManager,
-+                'logger' => $this->loggerMock
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @magentoAppIsolation enabled
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-+     * @return void
-+     */
-+    public function testQuery()
-+    {
-+        $this->requestBuilder->bind('fulltext_search_query', 'socks');
-+        $this->requestBuilder->setRequestName('one_match');
-+        $queryRequest = $this->requestBuilder->create();
-+        $exception = new \Exception('Test Message');
-+        $this->loggerMock->expects($this->once())->method('critical')->with($exception);
-+        $this->clientMock->expects($this->once())->method('query')->willThrowException($exception);
-+        $actualResponse = $this->adapter->query($queryRequest);
-+        $this->assertEmpty($actualResponse->getAggregations()->getBuckets());
-+        $this->assertEquals(0, $actualResponse->count());
-+    }
-+
-+    /**
-+     * Get request config path
-+     *
-+     * @return string
-+     */
-+    private function getRequestConfigPath()
-+    {
-+        return __DIR__ . '/../../_files/requests.xml';
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
-index 61add5f7d0e..3eea2497daa 100644
---- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
-@@ -10,7 +10,7 @@ use Magento\Indexer\Model\Indexer;
- use Magento\TestFramework\Helper\Bootstrap;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
--use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
-+use Magento\Elasticsearch6\Model\Client\Elasticsearch as ElasticsearchClient;
- use Magento\Elasticsearch\Model\Config;
- use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
- 
-@@ -95,7 +95,7 @@ class ElasticsearchTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
-      */
-     public function testSearchConfigurableProductBySimpleProductName()
-@@ -104,7 +104,7 @@ class ElasticsearchTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
-      */
-     public function testSearchConfigurableProductBySimpleProductAttributeMultiselect()
-@@ -113,7 +113,7 @@ class ElasticsearchTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
-      */
-     public function testSearchConfigurableProductBySimpleProductAttributeSelect()
-@@ -122,7 +122,7 @@ class ElasticsearchTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
-      */
-     public function testSearchConfigurableProductBySimpleProductAttributeShortDescription()
-diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
-index 014aaf7679b..77533e83b71 100755
---- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
-@@ -13,7 +13,7 @@ use Magento\CatalogSearch\Model\Indexer\Fulltext as CatalogSearchFulltextIndexer
- use Magento\TestFramework\Helper\Bootstrap;
- use Magento\Store\Model\StoreManagerInterface;
- use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
--use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
-+use Magento\Elasticsearch6\Model\Client\Elasticsearch as ElasticsearchClient;
- use Magento\Elasticsearch\Model\Config;
- use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
- use Magento\Indexer\Model\Indexer;
-@@ -87,7 +87,7 @@ class IndexHandlerTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
-      * @return void
-      */
-@@ -106,7 +106,7 @@ class IndexHandlerTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
-      * @return void
-      */
-@@ -131,7 +131,7 @@ class IndexHandlerTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
-      * @return void
-      */
-@@ -170,7 +170,7 @@ class IndexHandlerTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
-      * @magentoAppArea adminhtml
-      * @return void
-@@ -192,7 +192,7 @@ class IndexHandlerTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @magentoDbIsolation enabled
-      * @magentoAppArea adminhtml
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
-      * @magentoDataFixture Magento/Elasticsearch/_files/configurable_products.php
-      * @return void
-diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
-index d40ce9e8a07..7d4aa8e005e 100644
---- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
-@@ -68,7 +68,7 @@ class ReindexAllTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Test search of all products after full reindex
-      *
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
-      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
-      */
-@@ -82,7 +82,7 @@ class ReindexAllTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Test search of specific product after full reindex
-      *
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
-      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
-      */
-diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
-index d3fba768e9f..a3da32e0d6c 100644
---- a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
-@@ -5,8 +5,6 @@
-  */
- namespace Magento\Elasticsearch\SearchAdapter;
- 
--use Magento\Elasticsearch\Model\Config;
--
- /**
-  * Class AdapterTest
-  *
-@@ -26,7 +24,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-     /**
-      * @var string
-      */
--    protected $searchEngine = Config::ENGINE_NAME;
-+    protected $searchEngine = 'elasticsearch6';
- 
-     /**
-      * Get request config path
-@@ -43,12 +41,12 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      */
-     protected function createAdapter()
-     {
--        return $this->objectManager->create(\Magento\Elasticsearch\SearchAdapter\Adapter::class);
-+        return $this->objectManager->create(\Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Adapter::class);
-     }
- 
-     /**
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testMatchQuery()
-@@ -58,7 +56,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
- 
-     /**
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testMatchOrderedQuery()
-@@ -70,7 +68,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
- 
-     /**
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testAggregationsQuery()
-@@ -80,7 +78,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
- 
-     /**
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testMatchQueryFilters()
-@@ -92,7 +90,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      * Range filter test with all fields filled
-      *
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testRangeFilterWithAllFields()
-@@ -104,7 +102,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      * Range filter test with all fields filled
-      *
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testRangeFilterWithoutFromField()
-@@ -116,7 +114,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      * Range filter test with all fields filled
-      *
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testRangeFilterWithoutToField()
-@@ -128,7 +126,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      * Term filter test
-      *
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testTermFilter()
-@@ -140,7 +138,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      * Term filter test
-      *
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testTermFilterArray()
-@@ -152,7 +150,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      * Term filter test
-      *
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testWildcardFilter()
-@@ -164,7 +162,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      * Request limits test
-      *
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testSearchLimit()
-@@ -176,7 +174,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      * Bool filter test
-      *
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testBoolFilter()
-@@ -188,7 +186,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      * Test bool filter with nested negative bool filter
-      *
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testBoolFilterWithNestedNegativeBoolFilter()
-@@ -200,7 +198,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      * Test range inside nested negative bool filter
-      *
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
-@@ -213,7 +211,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      *
-      * @dataProvider elasticSearchAdvancedSearchDataProvider
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      * @param string $nameQuery
-      * @param string $descriptionQuery
-@@ -259,7 +257,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-     /**
-      * @magentoAppIsolation enabled
-      * @magentoDataFixture Magento/Framework/Search/_files/filterable_attribute.php
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testCustomFilterableAttribute()
-@@ -274,7 +272,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      *
-      * @magentoAppIsolation enabled
-      * @magentoDataFixture Magento/Framework/Search/_files/filterable_attributes.php
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      * @dataProvider filterByAttributeValuesDataProvider
-      * @param string $requestName
-@@ -294,7 +292,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-      * @param $rangeFilter
-      * @param $expectedRecordsCount
-      * @magentoDataFixture Magento/Framework/Search/_files/date_attribute.php
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      * @magentoAppIsolation enabled
-      * @dataProvider dateDataProvider
-@@ -309,24 +307,22 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-     /**
-      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testAdvancedSearchCompositeProductWithOutOfStockOption()
-     {
--        $this->markTestSkipped('Filter of composite products with Out of Stock child not supported till MAGETWO-59305');
-         parent::testAdvancedSearchCompositeProductWithOutOfStockOption();
-     }
- 
-     /**
-      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable_with_disabled_child.php
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testAdvancedSearchCompositeProductWithDisabledChild()
-     {
--        $this->markTestSkipped('Filter of composite products with Out of Stock child not supported till MAGETWO-59305');
-         // Reindex Elastic Search since date_attribute data fixture added new fields to be indexed
-         $this->reindexAll();
-         parent::testAdvancedSearchCompositeProductWithDisabledChild();
-@@ -335,7 +331,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-     /**
-      * @magentoDataFixture Magento/Framework/Search/_files/search_weight_products.php
-      * @magentoAppIsolation enabled
--     * @magentoConfigFixture default/catalog/search/engine elasticsearch
-+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
-      */
-     public function testSearchQueryBoost()
-@@ -358,4 +354,31 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
-         $indexer->load('catalogsearch_fulltext');
-         $indexer->reindexAll();
-     }
-+
-+    /**
-+     * Date data provider
-+     *
-+     * @return array
-+     */
-+    public function dateDataProvider()
-+    {
-+        return [
-+            [['from' => '1999-12-31T00:00:00Z', 'to' => '2000-01-01T00:00:00Z'], 1],
-+            [['from' => '2000-02-01T00:00:00Z', 'to' => ''], 0],
-+        ];
-+    }
-+
-+    public function filterByAttributeValuesDataProvider()
-+    {
-+        $variations = parent::filterByAttributeValuesDataProvider();
-+
-+        $variations['quick search by date'] = [
-+            'quick_search_container',
-+            [
-+                'search_term' => '2000-10-30',
-+            ],
-+        ];
-+
-+        return $variations;
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
-index a68b0942ec0..dd55dcc8b47 100644
---- a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
-@@ -130,22 +130,22 @@ class FilterTest extends \PHPUnit\Framework\TestCase
-             'area parameter - omitted' => [
-                 'adminhtml',
-                 'handle="email_template_test_handle"',
--                '<b>Email content for frontend/Magento/default theme</b>',
-+                '<strong>Email content for frontend/Magento/default theme</strong>',
-             ],
-             'area parameter - frontend' => [
-                 'adminhtml',
-                 'handle="email_template_test_handle" area="frontend"',
--                '<b>Email content for frontend/Magento/default theme</b>',
-+                '<strong>Email content for frontend/Magento/default theme</strong>',
-             ],
-             'area parameter - backend' => [
-                 'frontend',
-                 'handle="email_template_test_handle" area="adminhtml"',
--                '<b>Email content for adminhtml/Magento/default theme</b>',
-+                '<strong>Email content for adminhtml/Magento/default theme</strong>',
-             ],
-             'custom parameter' => [
-                 'frontend',
-                 'handle="email_template_test_handle" template="Magento_Email::sample_email_content_custom.phtml"',
--                '<b>Custom Email content for frontend/Magento/default theme</b>',
-+                '<strong>Custom Email content for frontend/Magento/default theme</strong>',
-             ],
-         ];
-         return $result;
-diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
-index a83de07443e..2d12eefc286 100644
---- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
-@@ -315,25 +315,25 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-                 Area::AREA_FRONTEND,
-                 TemplateTypesInterface::TYPE_HTML,
-                 '{{template config_path="customer/create_account/email_template"}}',
--                '<b>customer_create_account_email_template template from Vendor/custom_theme</b>',
-+                '<strong>customer_create_account_email_template template from Vendor/custom_theme</strong>',
-             ],
-             'Template from parent theme - frontend' => [
-                 Area::AREA_FRONTEND,
-                 TemplateTypesInterface::TYPE_HTML,
-                 '{{template config_path="customer/create_account/email_confirmation_template"}}',
--                '<b>customer_create_account_email_confirmation_template template from Vendor/default</b>',
-+                '<strong>customer_create_account_email_confirmation_template template from Vendor/default</strong',
-             ],
-             'Template from grandparent theme - frontend' => [
-                 Area::AREA_FRONTEND,
-                 TemplateTypesInterface::TYPE_HTML,
-                 '{{template config_path="customer/create_account/email_confirmed_template"}}',
--                '<b>customer_create_account_email_confirmed_template template from Magento/default</b>',
-+                '<strong>customer_create_account_email_confirmed_template template from Magento/default</strong',
-             ],
-             'Template from grandparent theme - adminhtml' => [
-                 BackendFrontNameResolver::AREA_CODE,
-                 TemplateTypesInterface::TYPE_HTML,
-                 '{{template config_path="catalog/productalert_cron/error_email_template"}}',
--                '<b>catalog_productalert_cron_error_email_template template from Magento/default</b>',
-+                '<strong>catalog_productalert_cron_error_email_template template from Magento/default</strong',
-                 null,
-                 null,
-                 true,
-@@ -703,8 +703,8 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-         $testTemplateVariables = '{"var data.name":"Sender Name","var data.email":"Sender Email"}';
-         $this->model->setOrigTemplateVariables($testTemplateVariables);
-         $variablesOptionArray = $this->model->getVariablesOptionArray(true);
--        $this->assertEquals('Template Variables', $variablesOptionArray['label']->getText());
--        $this->assertEquals($this->model->getVariablesOptionArray(), $variablesOptionArray['value']);
-+        $this->assertEquals('Template Variables', $variablesOptionArray[0]['label']->getText());
-+        $this->assertEquals($this->model->getVariablesOptionArray(), $variablesOptionArray[0]['value']);
-     }
- 
-     /**
-diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml
-index d53468a3837..bb0073cedee 100644
---- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml
-+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml
-@@ -4,4 +4,4 @@
-  * See COPYING.txt for license details.
-  */
- ?>
--<b>Email content for adminhtml/Magento/default theme</b>
-+<strong>Email content for adminhtml/Magento/default theme</strong>
-diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_ProductAlert/email/cron_error.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_ProductAlert/email/cron_error.html
-index f13e54edf93..d65f9d4c408 100644
---- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_ProductAlert/email/cron_error.html
-+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_ProductAlert/email/cron_error.html
-@@ -4,4 +4,4 @@
-  * See COPYING.txt for license details.
-  */
- -->
--<b>catalog_productalert_cron_error_email_template template from Magento/default</b>
-+<strong>catalog_productalert_cron_error_email_template template from Magento/default</strong>
-diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Customer/email/account_new_confirmed.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Customer/email/account_new_confirmed.html
-index f687fc041db..ffc4d8893fe 100644
---- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Customer/email/account_new_confirmed.html
-+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Customer/email/account_new_confirmed.html
-@@ -4,4 +4,4 @@
-  * See COPYING.txt for license details.
-  */
- -->
--<b>customer_create_account_email_confirmed_template template from Magento/default</b>
-+<strong>customer_create_account_email_confirmed_template template from Magento/default</strong>
-diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml
-index acbdf16d474..9c973818272 100644
---- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml
-+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml
-@@ -4,4 +4,4 @@
-  * See COPYING.txt for license details.
-  */
- ?>
--<b>Email content for frontend/Magento/default theme</b>
-+<strong>Email content for frontend/Magento/default theme</strong>
-diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml
-index 1730bf904bb..4ed5685ee01 100644
---- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml
-+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml
-@@ -4,4 +4,4 @@
-  * See COPYING.txt for license details.
-  */
- ?>
--<b>Custom Email content for frontend/Magento/default theme</b>
-+<strong>Custom Email content for frontend/Magento/default theme</strong>
-diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/custom_theme/Magento_Customer/email/account_new.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/custom_theme/Magento_Customer/email/account_new.html
-index 7e8f9bd1b12..46257060f82 100644
---- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/custom_theme/Magento_Customer/email/account_new.html
-+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/custom_theme/Magento_Customer/email/account_new.html
-@@ -4,4 +4,4 @@
-  * See COPYING.txt for license details.
-  */
- -->
--<b>customer_create_account_email_template template from Vendor/custom_theme</b>
-+<strong>customer_create_account_email_template template from Vendor/custom_theme</strong>
-diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/default/Magento_Customer/email/account_new_confirmation.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/default/Magento_Customer/email/account_new_confirmation.html
-index c5801b6557a..9c52c5a1b38 100644
---- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/default/Magento_Customer/email/account_new_confirmation.html
-+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/default/Magento_Customer/email/account_new_confirmation.html
-@@ -4,4 +4,4 @@
-  * See COPYING.txt for license details.
-  */
- -->
--<b>customer_create_account_email_confirmation_template template from Vendor/default</b>
-+<strong>customer_create_account_email_confirmation_template template from Vendor/default</strong>
-diff --git a/dev/tests/integration/testsuite/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/SaveTest.php b/dev/tests/integration/testsuite/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/SaveTest.php
-index 22e8a5911f0..822c3c03188 100644
---- a/dev/tests/integration/testsuite/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/SaveTest.php
-+++ b/dev/tests/integration/testsuite/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/SaveTest.php
-@@ -72,7 +72,7 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- 
-         $this->assertRedirect();
-         $this->assertSessionMessages(
--            $this->contains('The encryption key format is invalid.'),
-+            $this->contains('Encryption key must be 32 character string without any white space.'),
-             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
-         );
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatchTest.php b/dev/tests/integration/testsuite/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatchTest.php
-index 3a47692bdb9..a563641a4f8 100644
---- a/dev/tests/integration/testsuite/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatchTest.php
-+++ b/dev/tests/integration/testsuite/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatchTest.php
-@@ -41,6 +41,9 @@ class SodiumChachaPatchTest extends \PHPUnit\Framework\TestCase
-         $structureMock->expects($this->once())
-             ->method('getFieldPathsByAttribute')
-             ->will($this->returnValue([$testPath]));
-+        $structureMock->expects($this->once())
-+            ->method('getFieldPaths')
-+            ->willReturn([]);
- 
-         /** @var \Magento\Config\Model\ResourceModel\Config $configModel */
-         $configModel = $this->objectManager->create(\Magento\Config\Model\ResourceModel\Config::class);
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php
-index 431c7054308..89240f4ab32 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php
-@@ -5,11 +5,21 @@
-  */
- namespace Magento\Framework\App;
- 
-+use Magento\Framework\App\Request\InvalidRequestException;
-+use Magento\Framework\App\Request\ValidatorInterface;
-+use Magento\Framework\Exception\NotFoundException;
-+use Magento\Framework\Phrase;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+use Magento\Framework\Controller\ResultInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
- /**
-  * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @magentoAppArea frontend
-  */
--class FrontControllerTest extends \PHPUnit\Framework\TestCase
-+class FrontControllerTest extends TestCase
- {
-     /**
-      * @var \Magento\Framework\ObjectManagerInterface
-@@ -17,28 +27,94 @@ class FrontControllerTest extends \PHPUnit\Framework\TestCase
-     protected $_objectManager;
- 
-     /**
--     * @var \Magento\Framework\App\FrontController
-+     * @var FrontController
-      */
-     protected $_model;
- 
-+    /**
-+     * @var ValidatorInterface
-+     */
-+    private $fakeRequestValidator;
-+
-+    /**
-+     * @return ValidatorInterface
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-+     */
-+    private function createRequestValidator(): ValidatorInterface
-+    {
-+        if (!$this->fakeRequestValidator) {
-+            $this->fakeRequestValidator = new class implements ValidatorInterface {
-+                /**
-+                 * @var bool
-+                 */
-+                public $valid;
-+
-+                /**
-+                 * @inheritDoc
-+                 */
-+                public function validate(
-+                    RequestInterface $request,
-+                    ActionInterface $action
-+                ): void {
-+                    if (!$this->valid) {
-+                        throw new InvalidRequestException(new NotFoundException(new Phrase('Not found')));
-+                    }
-+                }
-+            };
-+        }
-+
-+        return $this->fakeRequestValidator;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-     protected function setUp()
-     {
--        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
--        $this->_model = $this->_objectManager->create(\Magento\Framework\App\FrontController::class);
-+        $this->_objectManager = Bootstrap::getObjectManager();
-+        $this->_model = $this->_objectManager->create(
-+            FrontController::class,
-+            ['requestValidator' => $this->createRequestValidator()]
-+        );
-     }
- 
-+    /**
-+     * Test dispatching an empty action.
-+     */
-     public function testDispatch()
-     {
--        if (!\Magento\TestFramework\Helper\Bootstrap::canTestHeaders()) {
-+        if (!Bootstrap::canTestHeaders()) {
-+            $this->markTestSkipped('Can\'t test dispatch process without sending headers');
-+        }
-+        $this->fakeRequestValidator->valid = true;
-+        $_SERVER['HTTP_HOST'] = 'localhost';
-+        $this->_objectManager->get(State::class)->setAreaCode('frontend');
-+        $request = $this->_objectManager->get(HttpRequest::class);
-+        /* empty action */
-+        $request->setRequestUri('core/index/index');
-+        $this->assertInstanceOf(
-+            ResultInterface::class,
-+            $this->_model->dispatch($request)
-+        );
-+    }
-+
-+    /**
-+     * Test request validator invalidating given request.
-+     */
-+    public function testInvalidRequest()
-+    {
-+        if (!Bootstrap::canTestHeaders()) {
-             $this->markTestSkipped('Can\'t test dispatch process without sending headers');
-         }
-+        $this->fakeRequestValidator->valid = false;
-         $_SERVER['HTTP_HOST'] = 'localhost';
--        $this->_objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
--        $request = $this->_objectManager->get(\Magento\Framework\App\Request\Http::class);
-+        $this->_objectManager->get(State::class)->setAreaCode('frontend');
-+        $request = $this->_objectManager->get(HttpRequest::class);
-         /* empty action */
-         $request->setRequestUri('core/index/index');
-         $this->assertInstanceOf(
--            \Magento\Framework\Controller\ResultInterface::class,
-+            ResultInterface::class,
-             $this->_model->dispatch($request)
-         );
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/ObjectManager/ConfigWriter/FilesystemTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/ObjectManager/ConfigWriter/FilesystemTest.php
-new file mode 100644
-index 00000000000..843be22c57d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Framework/App/ObjectManager/ConfigWriter/FilesystemTest.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\ObjectManager\ConfigWriter;
-+
-+class FilesystemTest extends \PHPUnit\Framework\TestCase
-+{
-+    const CACHE_KEY = 'filesystemtest';
-+
-+    /**
-+     * @var \Magento\Framework\App\ObjectManager\ConfigWriter\Filesystem
-+     */
-+    private $configWriter;
-+
-+    /**
-+     * @var \Magento\Framework\App\ObjectManager\ConfigLoader
-+     */
-+    private $configReader;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $this->configWriter = $objectManager->create(
-+            \Magento\Framework\App\ObjectManager\ConfigWriter\Filesystem::class
-+        );
-+        $this->configReader = $objectManager->create(
-+            \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled::class
-+        );
-+    }
-+
-+    public function testWrite()
-+    {
-+        $sampleData = [
-+            'classA' => true,
-+            'classB' => false,
-+        ];
-+
-+        $this->configWriter->write(self::CACHE_KEY, $sampleData);
-+        $this->assertEquals($sampleData, $this->configReader->load(self::CACHE_KEY));
-+    }
-+
-+    public function testOverwrite()
-+    {
-+        $this->configWriter->write(self::CACHE_KEY, ['hello' => 'world']);
-+
-+        $sampleData = [
-+            'classC' => false,
-+            'classD' => true,
-+        ];
-+
-+        $this->configWriter->write(self::CACHE_KEY, $sampleData);
-+        $this->assertEquals($sampleData, $this->configReader->load(self::CACHE_KEY));
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php
-new file mode 100644
-index 00000000000..74aa5b8bfed
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php
-@@ -0,0 +1,110 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Request;
-+
-+use Magento\Framework\App\ActionInterface;
-+use Magento\Framework\App\RequestInterface;
-+use PHPUnit\Framework\TestCase;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+
-+class HttpMethodValidatorTest extends TestCase
-+{
-+    /**
-+     * @var HttpMethodValidator
-+     */
-+    private $validator;
-+
-+    /**
-+     * @var HttpRequest
-+     */
-+    private $request;
-+
-+    /**
-+     * @var HttpMethodMap
-+     */
-+    private $map;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->validator = $objectManager->get(HttpMethodValidator::class);
-+        $this->request = $objectManager->get(RequestInterface::class);
-+        if (!$this->request instanceof HttpRequest) {
-+            throw new \RuntimeException('We need HTTP request');
-+        }
-+        $this->map = $objectManager->get(HttpMethodMap::class);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    private function getMap(): array
-+    {
-+        $map = $this->map->getMap();
-+        if (count($map) < 2) {
-+            throw new \RuntimeException(
-+                'We need at least 2 HTTP methods allowed'
-+            );
-+        }
-+
-+        $sorted = [];
-+        foreach ($map as $method => $interface) {
-+            $sorted[] = ['method' => $method, 'interface' => $interface];
-+        }
-+
-+        return $sorted;
-+    }
-+
-+    /**
-+     * Test positive case.
-+     *
-+     * @throws InvalidRequestException
-+     */
-+    public function testAllowed()
-+    {
-+        $map = $this->getMap();
-+
-+        $action1 = $this->getMockForAbstractClass($map[0]['interface']);
-+        $this->request->setMethod($map[0]['method']);
-+        $this->validator->validate($this->request, $action1);
-+
-+        $action2 = $this->getMockForAbstractClass(ActionInterface::class);
-+        $this->validator->validate($this->request, $action2);
-+    }
-+
-+    /**
-+     * Test negative case.
-+     *
-+     * @expectedException \Magento\Framework\App\Request\InvalidRequestException
-+     */
-+    public function testNotAllowedMethod()
-+    {
-+        $this->request->setMethod('method' .rand(0, 1000));
-+        $action = $this->getMockForAbstractClass(ActionInterface::class);
-+
-+        $this->validator->validate($this->request, $action);
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\App\Request\InvalidRequestException
-+     */
-+    public function testRestrictedMethod()
-+    {
-+        $map = $this->getMap();
-+
-+        $this->request->setMethod($map[1]['method']);
-+        $action = $this->getMockForAbstractClass($map[0]['interface']);
-+
-+        $this->validator->validate($this->request, $action);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Async/ProxyDeferredFactoryTest.php b/dev/tests/integration/testsuite/Magento/Framework/Async/ProxyDeferredFactoryTest.php
-new file mode 100644
-index 00000000000..e4385b598c6
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Async/ProxyDeferredFactoryTest.php
-@@ -0,0 +1,148 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Async;
-+
-+use Magento\Framework\Math\Random;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Testing proxies for deferred values.
-+ */
-+class ProxyDeferredFactoryTest extends TestCase
-+{
-+    /**
-+     * @var ProxyDeferredFactory
-+     */
-+    private $factory;
-+
-+    /**
-+     * @var CallbackDeferredFactory
-+     */
-+    private $callbackDeferredFactory;
-+
-+    /**
-+     * @var Random
-+     */
-+    private $random;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->factory = Bootstrap::getObjectManager()->get(ProxyDeferredFactory::class);
-+        $this->callbackDeferredFactory = Bootstrap::getObjectManager()->get(CallbackDeferredFactory::class);
-+        $this->random = Bootstrap::getObjectManager()->get(Random::class);
-+        //phpcs:ignore
-+        include_once __DIR__ .'/_files/test_class.php';
-+        \TestDeferred\TestClass::$created = 0;
-+    }
-+
-+    /*
-+     * Test creating a proxy for deferred value.
-+     */
-+    public function testCreate(): void
-+    {
-+        $value = $this->random->getRandomString(32);
-+        $called = 0;
-+        $callback = function () use ($value, &$called) {
-+            $called++;
-+            return new \TestDeferred\TestClass($value);
-+        };
-+        /** @var \TestDeferred\TestClass $proxy */
-+        $proxy = $this->factory->createFor(
-+            \TestDeferred\TestClass::class,
-+            $this->callbackDeferredFactory->create(['callback' => $callback])
-+        );
-+        $this->assertInstanceOf(\TestDeferred\TestClass::class, $proxy);
-+        $this->assertEmpty(\TestDeferred\TestClass::$created);
-+        $this->assertEquals($value, $proxy->getValue());
-+        $this->assertEquals(1, \TestDeferred\TestClass::$created);
-+        $this->assertEquals(1, $called);
-+    }
-+
-+    /**
-+     * Test serializing without a value ready.
-+     */
-+    public function testSerialize(): void
-+    {
-+        $value = $this->random->getRandomString(32);
-+        $called = 0;
-+        $callback = function () use ($value, &$called) {
-+            $called++;
-+            return new \TestDeferred\TestClass($value);
-+        };
-+        /** @var \TestDeferred\TestClass $proxy */
-+        $proxy = $this->factory->createFor(
-+            \TestDeferred\TestClass::class,
-+            $this->callbackDeferredFactory->create(['callback' => $callback])
-+        );
-+        //phpcs:disable
-+        /** @var \TestDeferred\TestClass $unserialized */
-+        $unserialized = unserialize(serialize($proxy));
-+        //phpcs:enable
-+        $this->assertEquals($value, $unserialized->getValue());
-+        $this->assertEquals($value, $proxy->getValue());
-+        $this->assertEquals(1, \TestDeferred\TestClass::$created);
-+        $this->assertEquals(1, $called);
-+    }
-+
-+    /**
-+     * Test cloning the deferred value.
-+     */
-+    public function testClone(): void
-+    {
-+        $value = $this->random->getRandomString(32);
-+        $called = 0;
-+        $callback = function () use ($value, &$called) {
-+            $called++;
-+            return new \TestDeferred\TestClass($value);
-+        };
-+        /** @var \TestDeferred\TestClass $proxy */
-+        $proxy = $this->factory->createFor(
-+            \TestDeferred\TestClass::class,
-+            $this->callbackDeferredFactory->create(['callback' => $callback])
-+        );
-+        $this->assertEquals(0, \TestDeferred\TestClass::$created);
-+        $this->assertEquals(0, $called);
-+        $cloned = clone $proxy;
-+        $this->assertEquals(1, \TestDeferred\TestClass::$created);
-+        $this->assertEquals(1, $called);
-+        $this->assertTrue($cloned->isCloned());
-+        $this->assertFalse($proxy->isCloned());
-+        $this->assertEquals($value, $cloned->getValue());
-+    }
-+
-+    /**
-+     * Test with deferred value having different type.
-+     *
-+     * @expectedException \RuntimeException
-+     * @expectedExceptionMessage Wrong instance returned by deferred
-+     */
-+    public function testCreateWrongValue(): void
-+    {
-+        $callback = function () {
-+            return new class {
-+                public function getValue()
-+                {
-+                    return 'test';
-+                }
-+            };
-+        };
-+        /** @var \TestDeferred\TestClass $proxy */
-+        $proxy = $this->factory->createFor(
-+            \TestDeferred\TestClass::class,
-+            $this->callbackDeferredFactory->create(['callback' => $callback])
-+        );
-+        $this->assertInstanceOf(\TestDeferred\TestClass::class, $proxy);
-+        $this->assertEmpty(\TestDeferred\TestClass::$created);
-+        $proxy->getValue();
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Async/_files/test_class.php b/dev/tests/integration/testsuite/Magento/Framework/Async/_files/test_class.php
-new file mode 100644
-index 00000000000..dadd83f2974
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Async/_files/test_class.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace TestDeferred;
-+
-+/**
-+ * Class meant for testing deferred proxy.
-+ */
-+class TestClass
-+{
-+    /**
-+     * Number of instances created.
-+     *
-+     * @var int
-+     */
-+    public static $created = 0;
-+
-+    /**
-+     * @var bool
-+     */
-+    private $cloned = false;
-+
-+    /**
-+     * @var string
-+     */
-+    private $value;
-+
-+    /**
-+     * TestClassForProxy constructor.
-+     * @param string $value
-+     */
-+    public function __construct(string $value)
-+    {
-+        $this->value = $value;
-+        self::$created++;
-+    }
-+
-+    /**
-+     * Initial value.
-+     *
-+     * @return string
-+     */
-+    public function getValue(): string
-+    {
-+        return $this->value;
-+    }
-+
-+    /**
-+     * Whether the object is a clone.
-+     *
-+     * @return bool
-+     */
-+    public function isCloned(): bool
-+    {
-+        return $this->cloned;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function __clone()
-+    {
-+        $this->cloned = true;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php b/dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php
-index 9d149eceb45..3ee68b1012c 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php
-@@ -34,6 +34,7 @@ class DbTest extends \Magento\TestFramework\Indexer\TestCase
-     /**
-      * Test db backup includes triggers.
-      *
-+     * @magentoConfigFixture default/system/backup/functionality_enabled 1
-      * @magentoDataFixture Magento/Framework/Backup/_files/trigger.php
-      * @magentoDbIsolation disabled
-      */
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/File/Validator/NotProtectedExtensionTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/File/Validator/NotProtectedExtensionTest.php
-new file mode 100644
-index 00000000000..622f17cbf9c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/File/Validator/NotProtectedExtensionTest.php
-@@ -0,0 +1,36 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Code\File\Validator;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Class NotProtectedExtension
-+ */
-+class NotProtectedExtensionTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Test that phpt, pht is invalid extension type
-+     * @dataProvider isValidDataProvider
-+     */
-+    public function testIsValid($extension)
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        /** @var \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $model */
-+        $model = $objectManager->create(\Magento\MediaStorage\Model\File\Validator\NotProtectedExtension::class);
-+        $this->assertFalse($model->isValid($extension));
-+    }
-+
-+    public function isValidDataProvider()
-+    {
-+        return [
-+            ['phpt'],
-+            ['pht']
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Generator/AutoloaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/Generator/AutoloaderTest.php
-new file mode 100644
-index 00000000000..0e1b51b3ae2
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Generator/AutoloaderTest.php
-@@ -0,0 +1,85 @@
-+<?php declare(strict_types=1);
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Framework\Code\Generator;
-+
-+use Magento\Framework\Code\Generator;
-+use Magento\Framework\Logger\Monolog as MagentoMonologLogger;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\TestCase;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+use Psr\Log\LoggerInterface;
-+
-+class AutoloaderTest extends TestCase
-+{
-+    /**
-+     * This method exists to fix the wrong return type hint on \Magento\Framework\App\ObjectManager::getInstance.
-+     * This way the IDE knows it's dealing with an instance of \Magento\TestFramework\ObjectManager and
-+     * not \Magento\Framework\App\ObjectManager. The former has the method addSharedInstance, the latter does not.
-+     *
-+     * @return ObjectManager|\Magento\Framework\App\ObjectManager
-+     * @SuppressWarnings(PHPMD.StaticAccess)
-+     */
-+    private function getTestFrameworkObjectManager()
-+    {
-+        return ObjectManager::getInstance();
-+    }
-+
-+    /**
-+     * @before
-+     */
-+    public function setupLoggerTestDouble(): void
-+    {
-+        $loggerTestDouble = $this->createMock(LoggerInterface::class);
-+        $this->getTestFrameworkObjectManager()->addSharedInstance($loggerTestDouble, MagentoMonologLogger::class);
-+    }
-+
-+    /**
-+     * @after
-+     */
-+    public function removeLoggerTestDouble(): void
-+    {
-+        $this->getTestFrameworkObjectManager()->removeSharedInstance(MagentoMonologLogger::class);
-+    }
-+
-+    /**
-+     * @param \RuntimeException $testException
-+     * @return Generator|MockObject
-+     */
-+    private function createExceptionThrowingGeneratorTestDouble(\RuntimeException $testException)
-+    {
-+        /** @var Generator|MockObject $generatorStub */
-+        $generatorStub = $this->createMock(Generator::class);
-+        $generatorStub->method('generateClass')->willThrowException($testException);
-+
-+        return $generatorStub;
-+    }
-+
-+    public function testLogsExceptionDuringGeneration(): void
-+    {
-+        $exceptionMessage = 'Test exception thrown during generation';
-+        $testException = new \RuntimeException($exceptionMessage);
-+
-+        $loggerMock = ObjectManager::getInstance()->get(LoggerInterface::class);
-+        $loggerMock->expects($this->once())->method('debug')->with($exceptionMessage, ['exception' => $testException]);
-+
-+        $autoloader = new Autoloader($this->createExceptionThrowingGeneratorTestDouble($testException));
-+        $this->assertNull($autoloader->load(NonExistingClassName::class));
-+    }
-+
-+    public function testFiltersDuplicateExceptionMessages(): void
-+    {
-+        $exceptionMessage = 'Test exception thrown during generation';
-+        $testException = new \RuntimeException($exceptionMessage);
-+
-+        $loggerMock = ObjectManager::getInstance()->get(LoggerInterface::class);
-+        $loggerMock->expects($this->once())->method('debug')->with($exceptionMessage, ['exception' => $testException]);
-+
-+        $autoloader = new Autoloader($this->createExceptionThrowingGeneratorTestDouble($testException));
-+        $autoloader->load(OneNonExistingClassName::class);
-+        $autoloader->load(AnotherNonExistingClassName::class);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/ParentClassWithNamespace.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/ParentClassWithNamespace.php
-index e42a79aa525..01e63126e5c 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/ParentClassWithNamespace.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/ParentClassWithNamespace.php
-@@ -7,6 +7,9 @@ namespace Magento\Framework\Code\GeneratorTest;
- 
- use Zend\Code\Generator\DocBlockGenerator;
- 
-+/**
-+ * phpcs:ignoreFile
-+ */
- class ParentClassWithNamespace
- {
-     /**
-@@ -78,9 +81,6 @@ class ParentClassWithNamespace
-     {
-     }
- 
--    /**
--     * @SuppressWarnings(PHPMD.FinalImplementation) Suppressed as is a fixture but not a real code
--     */
-     final public function publicParentFinal()
-     {
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php
-index 62a91b913fb..b9fc351ff64 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php
-@@ -7,6 +7,9 @@ namespace Magento\Framework\Code\GeneratorTest;
- 
- use Zend\Code\Generator\ClassGenerator;
- 
-+/**
-+ * phpcs:ignoreFile
-+ */
- class SourceClassWithNamespace extends ParentClassWithNamespace
- {
-     /**
-@@ -96,22 +99,30 @@ class SourceClassWithNamespace extends ParentClassWithNamespace
-     ) {
-     }
- 
-+    /**
-+     * Test method
-+     */
-     public function publicChildWithoutParameters()
-     {
-     }
- 
-+    /**
-+     * Test method
-+     */
-     public static function publicChildStatic()
-     {
-     }
- 
-     /**
--     * @SuppressWarnings(PHPMD.FinalImplementation) Suppressed as is a fixture but not a real code
-+     * Test method
-      */
-     final public function publicChildFinal()
-     {
-     }
- 
-     /**
-+     * Test method
-+     *
-      * @param mixed $arg1
-      * @param string $arg2
-      * @param int|null $arg3
-@@ -130,6 +141,8 @@ class SourceClassWithNamespace extends ParentClassWithNamespace
-     }
- 
-     /**
-+     * Test method
-+     *
-      * @param \DateTime|null $arg1
-      * @param mixed $arg2
-      *
-@@ -140,4 +153,16 @@ class SourceClassWithNamespace extends ParentClassWithNamespace
-     public function public71Another(?\DateTime $arg1, $arg2 = false): ?string
-     {
-     }
-+
-+    /**
-+     * Test method
-+     *
-+     * @param bool $arg
-+     * @return SourceClassWithNamespace
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function publicWithSelf($arg = false): self
-+    {
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample
-index 2a240bb685f..83191f2d1b0 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample
-@@ -80,6 +80,19 @@ class Interceptor extends \Magento\Framework\Code\GeneratorTest\SourceClassWithN
-         }
-     }
- 
-+    /**
-+     * {@inheritdoc}
-+     */
-+    public function publicWithSelf($arg = false) : \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
-+    {
-+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'publicWithSelf');
-+        if (!$pluginInfo) {
-+            return parent::publicWithSelf($arg);
-+        } else {
-+            return $this->___callPlugins('publicWithSelf', func_get_args(), $pluginInfo);
-+        }
-+    }
-+
-     /**
-      * {@inheritdoc}
-      */
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample
-index 0aa086c0ab8..359854f2d48 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample
-@@ -130,6 +130,14 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa
-         return $this->_getSubject()->public71Another($arg1, $arg2);
-     }
- 
-+    /**
-+     * {@inheritdoc}
-+     */
-+    public function publicWithSelf($arg = false) : \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
-+    {
-+        return $this->_getSubject()->publicWithSelf($arg);
-+    }
-+
-     /**
-      * {@inheritdoc}
-      */
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/ComposerInformationTest.php b/dev/tests/integration/testsuite/Magento/Framework/Composer/ComposerInformationTest.php
-index 3c1d77ac9e7..b1aee3ace52 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Composer/ComposerInformationTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/ComposerInformationTest.php
-@@ -81,7 +81,7 @@ class ComposerInformationTest extends \PHPUnit\Framework\TestCase
-             ['composerFactory' => $this->composerFactory]
-         );
- 
--        $this->assertEquals("~5.5.0|~5.6.0|~7.0.0", $composerInfo->getRequiredPhpVersion());
-+        $this->assertEquals("~7.1.3||~7.2.0", $composerInfo->getRequiredPhpVersion());
-     }
- 
-     /**
-@@ -92,7 +92,7 @@ class ComposerInformationTest extends \PHPUnit\Framework\TestCase
-     public function testGetRequiredExtensions($composerDir)
-     {
-         $this->setupDirectory($composerDir);
--        $expectedExtensions = ['ctype', 'gd', 'spl', 'dom', 'simplexml', 'mcrypt', 'hash', 'curl', 'iconv', 'intl'];
-+        $expectedExtensions = ['ctype', 'gd', 'spl', 'dom', 'simplexml', 'hash', 'curl', 'iconv', 'intl'];
- 
-         /** @var \Magento\Framework\Composer\ComposerInformation $composerInfo */
-         $composerInfo = $this->objectManager->create(
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/RemoveTest.php b/dev/tests/integration/testsuite/Magento/Framework/Composer/RemoveTest.php
-index bfe8264d7cc..211b28617cb 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Composer/RemoveTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/RemoveTest.php
-@@ -24,7 +24,7 @@ class RemoveTest extends \PHPUnit\Framework\TestCase
-                 [
-                     'command' => 'remove',
-                     'packages' => ['magento/package-a', 'magento/package-b'],
--                    '--no-update' => true,
-+                    '--no-update-with-dependencies' => true,
-                 ]
-             );
-         $composerAppFactory->expects($this->once())
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.lock b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.lock
-index c2df6e0637e..094f899a260 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.lock
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.lock
-@@ -1,39 +1,300 @@
- {
-     "_readme": [
-         "This file locks the dependencies of your project to a known state",
--        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-         "This file is @generated automatically"
-     ],
--    "hash": "68035e485f35f7660cc3e736d3f8fde2",
-+    "content-hash": "60007664938710edf52eadddd7551867",
-     "packages": [
-+        {
-+            "name": "braintree/braintree_php",
-+            "version": "3.35.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/braintree/braintree_php.git",
-+                "reference": "6c4388199ce379432804a5c18b88585157ef2ed7"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/braintree/braintree_php/zipball/6c4388199ce379432804a5c18b88585157ef2ed7",
-+                "reference": "6c4388199ce379432804a5c18b88585157ef2ed7",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-curl": "*",
-+                "ext-dom": "*",
-+                "ext-hash": "*",
-+                "ext-openssl": "*",
-+                "ext-xmlwriter": "*",
-+                "php": ">=5.4.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "3.7.*"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Braintree": "lib/"
-+                },
-+                "psr-4": {
-+                    "Braintree\\": "lib/Braintree"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Braintree",
-+                    "homepage": "https://www.braintreepayments.com"
-+                }
-+            ],
-+            "description": "Braintree PHP Client Library",
-+            "time": "2018-07-26T14:37:38+00:00"
-+        },
-+        {
-+            "name": "colinmollenhour/cache-backend-file",
-+            "version": "v1.4.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git",
-+                "reference": "184171cc79933a828c3f9b1a1054724cea22a216"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/184171cc79933a828c3f9b1a1054724cea22a216",
-+                "reference": "184171cc79933a828c3f9b1a1054724cea22a216",
-+                "shasum": ""
-+            },
-+            "type": "magento-module",
-+            "autoload": {
-+                "classmap": [
-+                    "File.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Colin Mollenhour"
-+                }
-+            ],
-+            "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
-+            "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
-+            "time": "2018-04-05T15:28:43+00:00"
-+        },
-+        {
-+            "name": "colinmollenhour/cache-backend-redis",
-+            "version": "1.10.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git",
-+                "reference": "cc941a5f4cc017e11d3eab9061811ba9583ed6bf"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/cc941a5f4cc017e11d3eab9061811ba9583ed6bf",
-+                "reference": "cc941a5f4cc017e11d3eab9061811ba9583ed6bf",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "magento-hackathon/magento-composer-installer": "*"
-+            },
-+            "type": "magento-module",
-+            "autoload": {
-+                "classmap": [
-+                    "Cm/Cache/Backend/Redis.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Colin Mollenhour"
-+                }
-+            ],
-+            "description": "Zend_Cache backend using Redis with full support for tags.",
-+            "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
-+            "time": "2018-09-24T16:02:07+00:00"
-+        },
-+        {
-+            "name": "colinmollenhour/credis",
-+            "version": "1.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/colinmollenhour/credis.git",
-+                "reference": "8ab6db707c821055f9856b8cf76d5f44beb6fd8a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/8ab6db707c821055f9856b8cf76d5f44beb6fd8a",
-+                "reference": "8ab6db707c821055f9856b8cf76d5f44beb6fd8a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.4.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "classmap": [
-+                    "Client.php",
-+                    "Cluster.php",
-+                    "Sentinel.php",
-+                    "Module.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Colin Mollenhour",
-+                    "email": "colin@mollenhour.com"
-+                }
-+            ],
-+            "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
-+            "homepage": "https://github.com/colinmollenhour/credis",
-+            "time": "2018-05-07T14:45:04+00:00"
-+        },
-+        {
-+            "name": "colinmollenhour/php-redis-session-abstract",
-+            "version": "v1.4.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
-+                "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
-+                "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "colinmollenhour/credis": "~1.6",
-+                "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Cm\\RedisSession\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Colin Mollenhour"
-+                }
-+            ],
-+            "description": "A Redis-based session handler with optimistic locking",
-+            "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
-+            "time": "2018-03-29T15:54:15+00:00"
-+        },
-+        {
-+            "name": "composer/ca-bundle",
-+            "version": "1.1.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/composer/ca-bundle.git",
-+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
-+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-openssl": "*",
-+                "ext-pcre": "*",
-+                "php": "^5.3.2 || ^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
-+                "psr/log": "^1.0",
-+                "symfony/process": "^2.5 || ^3.0 || ^4.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Composer\\CaBundle\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-+                }
-+            ],
-+            "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
-+            "keywords": [
-+                "cabundle",
-+                "cacert",
-+                "certificate",
-+                "ssl",
-+                "tls"
-+            ],
-+            "time": "2019-01-28T09:30:10+00:00"
-+        },
-         {
-             "name": "composer/composer",
--            "version": "1.0.0-alpha9",
-+            "version": "1.8.4",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/composer/composer.git",
--                "reference": "eb1ce550ca51134ee619ad3e37f5a0b7e980dd24"
-+                "reference": "bc364c2480c17941e2135cfc568fa41794392534"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/composer/composer/zipball/eb1ce550ca51134ee619ad3e37f5a0b7e980dd24",
--                "reference": "eb1ce550ca51134ee619ad3e37f5a0b7e980dd24",
-+                "url": "https://api.github.com/repos/composer/composer/zipball/bc364c2480c17941e2135cfc568fa41794392534",
-+                "reference": "bc364c2480c17941e2135cfc568fa41794392534",
-                 "shasum": ""
-             },
-             "require": {
--                "justinrainbow/json-schema": "~1.1",
--                "php": ">=5.3.2",
--                "seld/jsonlint": "~1.0",
--                "symfony/console": "~2.3",
--                "symfony/finder": "~2.2",
--                "symfony/process": "~2.1"
-+                "composer/ca-bundle": "^1.0",
-+                "composer/semver": "^1.0",
-+                "composer/spdx-licenses": "^1.2",
-+                "composer/xdebug-handler": "^1.1",
-+                "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
-+                "php": "^5.3.2 || ^7.0",
-+                "psr/log": "^1.0",
-+                "seld/jsonlint": "^1.4",
-+                "seld/phar-utils": "^1.0",
-+                "symfony/console": "^2.7 || ^3.0 || ^4.0",
-+                "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
-+                "symfony/finder": "^2.7 || ^3.0 || ^4.0",
-+                "symfony/process": "^2.7 || ^3.0 || ^4.0"
-+            },
-+            "conflict": {
-+                "symfony/console": "2.8.38"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.0"
-+                "phpunit/phpunit": "^4.8.35 || ^5.7",
-+                "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
-             },
-             "suggest": {
-                 "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
--                "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic"
-+                "ext-zip": "Enabling the zip extension allows you to unzip archives",
-+                "ext-zlib": "Allow gzip compression of HTTP requests"
-             },
-             "bin": [
-                 "bin/composer"
-@@ -41,12 +302,12 @@
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.0-dev"
-+                    "dev-master": "1.8-dev"
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Composer": "src/"
-+                "psr-4": {
-+                    "Composer\\": "src/Composer"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -66,253 +327,5746 @@
-                 }
-             ],
-             "description": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.",
--            "homepage": "http://getcomposer.org/",
-+            "homepage": "https://getcomposer.org/",
-             "keywords": [
-                 "autoload",
-                 "dependency",
-                 "package"
-             ],
--            "time": "2014-12-07 17:15:20"
-+            "time": "2019-02-11T09:52:10+00:00"
-         },
-         {
--            "name": "justinrainbow/json-schema",
--            "version": "1.4.4",
-+            "name": "composer/semver",
-+            "version": "1.4.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/justinrainbow/json-schema.git",
--                "reference": "8dc9b9d85ab639ca60ab4608b34c1279d6ae7bce"
-+                "url": "https://github.com/composer/semver.git",
-+                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/8dc9b9d85ab639ca60ab4608b34c1279d6ae7bce",
--                "reference": "8dc9b9d85ab639ca60ab4608b34c1279d6ae7bce",
-+                "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
-+                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.2"
-+                "php": "^5.3.2 || ^7.0"
-             },
-             "require-dev": {
--                "json-schema/json-schema-test-suite": "1.1.0",
--                "phpdocumentor/phpdocumentor": "~2",
--                "phpunit/phpunit": "~3.7"
-+                "phpunit/phpunit": "^4.5 || ^5.0.5",
-+                "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
-             },
--            "bin": [
--                "bin/validate-json"
--            ],
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.4.x-dev"
-+                    "dev-master": "1.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "JsonSchema": "src/"
-+                "psr-4": {
-+                    "Composer\\Semver\\": "src"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Bruno Prieto Reis",
--                    "email": "bruno.p.reis@gmail.com"
--                },
--                {
--                    "name": "Justin Rainbow",
--                    "email": "justin.rainbow@gmail.com"
-+                    "name": "Nils Adermann",
-+                    "email": "naderman@naderman.de",
-+                    "homepage": "http://www.naderman.de"
-                 },
-                 {
--                    "name": "Igor Wiedler",
--                    "email": "igor@wiedler.ch"
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-                 },
-                 {
--                    "name": "Robert Schönthal",
--                    "email": "seroscho@googlemail.com"
-+                    "name": "Rob Bast",
-+                    "email": "rob.bast@gmail.com",
-+                    "homepage": "http://robbast.nl"
-                 }
-             ],
--            "description": "A library to validate a json schema.",
--            "homepage": "https://github.com/justinrainbow/json-schema",
-+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
-             "keywords": [
--                "json",
--                "schema"
-+                "semantic",
-+                "semver",
-+                "validation",
-+                "versioning"
-             ],
--            "time": "2015-07-14 16:29:50"
-+            "time": "2016-08-30T16:08:34+00:00"
-         },
-         {
--            "name": "magento/magento-composer-installer",
--            "version": "0.1.4",
-+            "name": "composer/spdx-licenses",
-+            "version": "1.5.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/magento/magento-composer-installer.git",
--                "reference": "7f03451f71e55d52c2bb07325d56a4e6df322f30"
-+                "url": "https://github.com/composer/spdx-licenses.git",
-+                "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/7f03451f71e55d52c2bb07325d56a4e6df322f30",
--                "reference": "7f03451f71e55d52c2bb07325d56a4e6df322f30",
-+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
-+                "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
-                 "shasum": ""
-             },
-             "require": {
--                "composer-plugin-api": "1.0.0"
-+                "php": "^5.3.2 || ^7.0"
-             },
-             "require-dev": {
--                "composer/composer": "*@dev",
--                "firegento/phpcs": "dev-patch-1",
--                "mikey179/vfsstream": "*",
--                "phpunit/phpunit": "*",
--                "phpunit/phpunit-mock-objects": "dev-master",
--                "squizlabs/php_codesniffer": "1.4.7",
--                "symfony/process": "*"
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
-+                "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
-             },
--            "type": "composer-plugin",
-+            "type": "library",
-             "extra": {
--                "composer-command-registry": [
--                    "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand"
--                ],
--                "class": "MagentoHackathon\\Composer\\Magento\\Plugin"
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-             },
-             "autoload": {
--                "psr-0": {
--                    "MagentoHackathon\\Composer\\Magento": "src/"
-+                "psr-4": {
-+                    "Composer\\Spdx\\": "src"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Vinai Kopp",
--                    "email": "vinai@netzarbeiter.com"
--                },
--                {
--                    "name": "Daniel Fahlke aka Flyingmana",
--                    "email": "flyingmana@googlemail.com"
--                },
--                {
--                    "name": "Jörg Weller",
--                    "email": "weller@flagbit.de"
--                },
--                {
--                    "name": "Karl Spies",
--                    "email": "karl.spies@gmx.net"
-+                    "name": "Nils Adermann",
-+                    "email": "naderman@naderman.de",
-+                    "homepage": "http://www.naderman.de"
-                 },
-                 {
--                    "name": "Tobias Vogt",
--                    "email": "tobi@webguys.de"
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-                 },
-                 {
--                    "name": "David Fuhr",
--                    "email": "fuhr@flagbit.de"
-+                    "name": "Rob Bast",
-+                    "email": "rob.bast@gmail.com",
-+                    "homepage": "http://robbast.nl"
-                 }
-             ],
--            "description": "Composer installer for Magento modules",
--            "homepage": "https://github.com/magento/magento-composer-installer",
-+            "description": "SPDX licenses list and validation library.",
-             "keywords": [
--                "composer-installer",
--                "magento"
-+                "license",
-+                "spdx",
-+                "validator"
-             ],
--            "time": "2015-03-05 21:40:30"
-+            "time": "2018-11-01T09:45:54+00:00"
-         },
-         {
--            "name": "magento/zendframework1",
--            "version": "1.12.10",
-+            "name": "composer/xdebug-handler",
-+            "version": "1.3.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/magento/zf1.git",
--                "reference": "d1e5cd8c9f83229bcdd9bb485c3ce25259c77884"
-+                "url": "https://github.com/composer/xdebug-handler.git",
-+                "reference": "d17708133b6c276d6e42ef887a877866b909d892"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/magento/zf1/zipball/d1e5cd8c9f83229bcdd9bb485c3ce25259c77884",
--                "reference": "d1e5cd8c9f83229bcdd9bb485c3ce25259c77884",
-+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/d17708133b6c276d6e42ef887a877866b909d892",
-+                "reference": "d17708133b6c276d6e42ef887a877866b909d892",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.2.11"
-+                "php": "^5.3.2 || ^7.0",
-+                "psr/log": "^1.0"
-             },
-             "require-dev": {
--                "phpunit/dbunit": "1.3.*",
--                "phpunit/phpunit": "3.7.*"
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
-+            "autoload": {
-+                "psr-4": {
-+                    "Composer\\XdebugHandler\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "John Stevenson",
-+                    "email": "john-stevenson@blueyonder.co.uk"
-+                }
-+            ],
-+            "description": "Restarts a process without xdebug.",
-+            "keywords": [
-+                "Xdebug",
-+                "performance"
-+            ],
-+            "time": "2019-01-28T20:25:53+00:00"
-+        },
-+        {
-+            "name": "container-interop/container-interop",
-+            "version": "1.2.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/container-interop/container-interop.git",
-+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "psr/container": "^1.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Interop\\Container\\": "src/Interop/Container/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-+            "homepage": "https://github.com/container-interop/container-interop",
-+            "time": "2017-02-14T19:40:03+00:00"
-+        },
-+        {
-+            "name": "elasticsearch/elasticsearch",
-+            "version": "v6.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/elastic/elasticsearch-php.git",
-+                "reference": "b237a37b2cdf23a5a17fd3576cdea771394ad00d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/b237a37b2cdf23a5a17fd3576cdea771394ad00d",
-+                "reference": "b237a37b2cdf23a5a17fd3576cdea771394ad00d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-json": ">=1.3.7",
-+                "guzzlehttp/ringphp": "~1.0",
-+                "php": "^7.0",
-+                "psr/log": "~1.0"
-+            },
-+            "require-dev": {
-+                "cpliakas/git-wrapper": "~1.0",
-+                "doctrine/inflector": "^1.1",
-+                "mockery/mockery": "0.9.4",
-+                "phpstan/phpstan-shim": "0.8.3",
-+                "phpunit/phpunit": "6.3.0",
-+                "squizlabs/php_codesniffer": "3.0.2",
-+                "symfony/finder": "^2.8",
-+                "symfony/yaml": "^2.8"
-+            },
-+            "suggest": {
-+                "ext-curl": "*",
-+                "monolog/monolog": "Allows for client-level logging and tracing"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Elasticsearch\\": "src/Elasticsearch/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Zachary Tong"
-+                }
-+            ],
-+            "description": "PHP Client for Elasticsearch",
-+            "keywords": [
-+                "client",
-+                "elasticsearch",
-+                "search"
-+            ],
-+            "time": "2019-01-08T18:53:46+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/ringphp",
-+            "version": "1.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/RingPHP.git",
-+                "reference": "5e2a174052995663dd68e6b5ad838afd47dd615b"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/5e2a174052995663dd68e6b5ad838afd47dd615b",
-+                "reference": "5e2a174052995663dd68e6b5ad838afd47dd615b",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "guzzlehttp/streams": "~3.0",
-+                "php": ">=5.4.0",
-+                "react/promise": "~2.0"
-+            },
-+            "require-dev": {
-+                "ext-curl": "*",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "suggest": {
-+                "ext-curl": "Guzzle will use specific adapters if cURL is present"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "GuzzleHttp\\Ring\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                }
-+            ],
-+            "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
-+            "time": "2018-07-31T13:22:33+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/streams",
-+            "version": "3.0.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/streams.git",
-+                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
-+                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.4.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "3.0-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "GuzzleHttp\\Stream\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                }
-+            ],
-+            "description": "Provides a simple abstraction over streams of data",
-+            "homepage": "http://guzzlephp.org/",
-+            "keywords": [
-+                "Guzzle",
-+                "stream"
-+            ],
-+            "time": "2014-10-12T19:18:40+00:00"
-+        },
-+        {
-+            "name": "justinrainbow/json-schema",
-+            "version": "5.2.8",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/justinrainbow/json-schema.git",
-+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4",
-+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "~2.2.20",
-+                "json-schema/json-schema-test-suite": "1.2.0",
-+                "phpunit/phpunit": "^4.8.35"
-+            },
-+            "bin": [
-+                "bin/validate-json"
-+            ],
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "5.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "JsonSchema\\": "src/JsonSchema/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Bruno Prieto Reis",
-+                    "email": "bruno.p.reis@gmail.com"
-+                },
-+                {
-+                    "name": "Justin Rainbow",
-+                    "email": "justin.rainbow@gmail.com"
-+                },
-+                {
-+                    "name": "Igor Wiedler",
-+                    "email": "igor@wiedler.ch"
-+                },
-+                {
-+                    "name": "Robert Schönthal",
-+                    "email": "seroscho@googlemail.com"
-+                }
-+            ],
-+            "description": "A library to validate a json schema.",
-+            "homepage": "https://github.com/justinrainbow/json-schema",
-+            "keywords": [
-+                "json",
-+                "schema"
-+            ],
-+            "time": "2019-01-14T23:55:14+00:00"
-+        },
-+        {
-+            "name": "magento/composer",
-+            "version": "1.4.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/magento/composer.git",
-+                "reference": "6fb9eb3dd72a5e70aa53983f132f8e1883e79978"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/magento/composer/zipball/6fb9eb3dd72a5e70aa53983f132f8e1883e79978",
-+                "reference": "6fb9eb3dd72a5e70aa53983f132f8e1883e79978",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "composer/composer": "^1.6",
-+                "php": "~7.1.3|~7.2.0",
-+                "symfony/console": "~4.0.0 || ~4.1.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~7.0.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Magento\\Composer\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-+            "time": "2018-06-29T18:46:51+00:00"
-+        },
-+        {
-+            "name": "magento/magento-composer-installer",
-+            "version": "0.1.13",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/magento/magento-composer-installer.git",
-+                "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/8b6c32f53b4944a5d6656e86344cd0f9784709a1",
-+                "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "composer-plugin-api": "^1.0"
-+            },
-+            "replace": {
-+                "magento-hackathon/magento-composer-installer": "*"
-+            },
-+            "require-dev": {
-+                "composer/composer": "*@dev",
-+                "firegento/phpcs": "dev-patch-1",
-+                "mikey179/vfsstream": "*",
-+                "phpunit/phpunit": "*",
-+                "phpunit/phpunit-mock-objects": "dev-master",
-+                "squizlabs/php_codesniffer": "1.4.7",
-+                "symfony/process": "*"
-+            },
-+            "type": "composer-plugin",
-+            "extra": {
-+                "composer-command-registry": [
-+                    "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand"
-+                ],
-+                "class": "MagentoHackathon\\Composer\\Magento\\Plugin"
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "MagentoHackathon\\Composer\\Magento": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "OSL-3.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Vinai Kopp",
-+                    "email": "vinai@netzarbeiter.com"
-+                },
-+                {
-+                    "name": "Daniel Fahlke aka Flyingmana",
-+                    "email": "flyingmana@googlemail.com"
-+                },
-+                {
-+                    "name": "Jörg Weller",
-+                    "email": "weller@flagbit.de"
-+                },
-+                {
-+                    "name": "Karl Spies",
-+                    "email": "karl.spies@gmx.net"
-+                },
-+                {
-+                    "name": "Tobias Vogt",
-+                    "email": "tobi@webguys.de"
-+                },
-+                {
-+                    "name": "David Fuhr",
-+                    "email": "fuhr@flagbit.de"
-+                }
-+            ],
-+            "description": "Composer installer for Magento modules",
-+            "homepage": "https://github.com/magento/magento-composer-installer",
-+            "keywords": [
-+                "composer-installer",
-+                "magento"
-+            ],
-+            "time": "2017-12-29T16:45:24+00:00"
-+        },
-+        {
-+            "name": "magento/zendframework1",
-+            "version": "1.14.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/magento/zf1.git",
-+                "reference": "4df018254c70b5b998b00a8cb1a30760f831ff0d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/magento/zf1/zipball/4df018254c70b5b998b00a8cb1a30760f831ff0d",
-+                "reference": "4df018254c70b5b998b00a8cb1a30760f831ff0d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.2.11"
-+            },
-+            "require-dev": {
-+                "phpunit/dbunit": "1.3.*",
-+                "phpunit/phpunit": "3.7.*"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-                     "dev-master": "1.12.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-0": {
--                    "Zend_": "library/"
-+                    "Zend_": "library/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "include-path": [
-+                "library/"
-+            ],
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Magento Zend Framework 1",
-+            "homepage": "http://framework.zend.com/",
-+            "keywords": [
-+                "ZF1",
-+                "framework"
-+            ],
-+            "time": "2018-08-09T15:03:40+00:00"
-+        },
-+        {
-+            "name": "monolog/monolog",
-+            "version": "1.24.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Seldaek/monolog.git",
-+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
-+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0",
-+                "psr/log": "~1.0"
-+            },
-+            "provide": {
-+                "psr/log-implementation": "1.0.0"
-+            },
-+            "require-dev": {
-+                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
-+                "doctrine/couchdb": "~1.0@dev",
-+                "graylog2/gelf-php": "~1.0",
-+                "jakub-onderka/php-parallel-lint": "0.9",
-+                "php-amqplib/php-amqplib": "~2.4",
-+                "php-console/php-console": "^3.1.3",
-+                "phpunit/phpunit": "~4.5",
-+                "phpunit/phpunit-mock-objects": "2.3.0",
-+                "ruflin/elastica": ">=0.90 <3.0",
-+                "sentry/sentry": "^0.13",
-+                "swiftmailer/swiftmailer": "^5.3|^6.0"
-+            },
-+            "suggest": {
-+                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-+                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-+                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-+                "ext-mongo": "Allow sending log messages to a MongoDB server",
-+                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-+                "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
-+                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-+                "php-console/php-console": "Allow sending log messages to Google Chrome",
-+                "rollbar/rollbar": "Allow sending log messages to Rollbar",
-+                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
-+                "sentry/sentry": "Allow sending log messages to a Sentry server"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Monolog\\": "src/Monolog"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-+                }
-+            ],
-+            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-+            "homepage": "http://github.com/Seldaek/monolog",
-+            "keywords": [
-+                "log",
-+                "logging",
-+                "psr-3"
-+            ],
-+            "time": "2018-11-05T09:00:11+00:00"
-+        },
-+        {
-+            "name": "oyejorge/less.php",
-+            "version": "v1.7.0.14",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/oyejorge/less.php.git",
-+                "reference": "42925c5a01a07d67ca7e82dfc8fb31814d557bc9"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/oyejorge/less.php/zipball/42925c5a01a07d67ca7e82dfc8fb31814d557bc9",
-+                "reference": "42925c5a01a07d67ca7e82dfc8fb31814d557bc9",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.8.24"
-+            },
-+            "bin": [
-+                "bin/lessc"
-+            ],
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Less": "lib/"
-+                },
-+                "classmap": [
-+                    "lessc.inc.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Matt Agar",
-+                    "homepage": "https://github.com/agar"
-+                },
-+                {
-+                    "name": "Martin Jantošovič",
-+                    "homepage": "https://github.com/Mordred"
-+                },
-+                {
-+                    "name": "Josh Schmidt",
-+                    "homepage": "https://github.com/oyejorge"
-+                }
-+            ],
-+            "description": "PHP port of the Javascript version of LESS http://lesscss.org (Originally maintained by Josh Schmidt)",
-+            "homepage": "http://lessphp.gpeasy.com",
-+            "keywords": [
-+                "css",
-+                "less",
-+                "less.js",
-+                "lesscss",
-+                "php",
-+                "stylesheet"
-+            ],
-+            "time": "2017-03-28T22:19:25+00:00"
-+        },
-+        {
-+            "name": "paragonie/random_compat",
-+            "version": "v9.99.99",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/paragonie/random_compat.git",
-+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "4.*|5.*",
-+                "vimeo/psalm": "^1"
-+            },
-+            "suggest": {
-+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-+            },
-+            "type": "library",
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Paragon Initiative",
-+                    "email": "security@paragonie.com",
-+                    "homepage": "https://paragonie.com"
-+                }
-+            ],
-+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-+            "keywords": [
-+                "csprng",
-+                "polyfill",
-+                "pseudorandom",
-+                "random"
-+            ],
-+            "time": "2018-07-02T15:55:56+00:00"
-+        },
-+        {
-+            "name": "paragonie/sodium_compat",
-+            "version": "v1.8.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/paragonie/sodium_compat.git",
-+                "reference": "57bb5ef079d3724148da3d5c99e30695ab17afda"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/57bb5ef079d3724148da3d5c99e30695ab17afda",
-+                "reference": "57bb5ef079d3724148da3d5c99e30695ab17afda",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "paragonie/random_compat": ">=1",
-+                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^3|^4|^5"
-+            },
-+            "suggest": {
-+                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
-+                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "autoload.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "ISC"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Paragon Initiative",
-+                    "email": "security@paragonie.com"
-+                },
-+                {
-+                    "name": "Frank Denis",
-+                    "email": "jedisct1@pureftpd.org"
-+                }
-+            ],
-+            "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
-+            "keywords": [
-+                "Authentication",
-+                "BLAKE2b",
-+                "ChaCha20",
-+                "ChaCha20-Poly1305",
-+                "Chapoly",
-+                "Curve25519",
-+                "Ed25519",
-+                "EdDSA",
-+                "Edwards-curve Digital Signature Algorithm",
-+                "Elliptic Curve Diffie-Hellman",
-+                "Poly1305",
-+                "Pure-PHP cryptography",
-+                "RFC 7748",
-+                "RFC 8032",
-+                "Salpoly",
-+                "Salsa20",
-+                "X25519",
-+                "XChaCha20-Poly1305",
-+                "XSalsa20-Poly1305",
-+                "Xchacha20",
-+                "Xsalsa20",
-+                "aead",
-+                "cryptography",
-+                "ecdh",
-+                "elliptic curve",
-+                "elliptic curve cryptography",
-+                "encryption",
-+                "libsodium",
-+                "php",
-+                "public-key cryptography",
-+                "secret-key cryptography",
-+                "side-channel resistant"
-+            ],
-+            "time": "2019-01-03T21:00:55+00:00"
-+        },
-+        {
-+            "name": "pelago/emogrifier",
-+            "version": "v2.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/MyIntervals/emogrifier.git",
-+                "reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/8ee7fb5ad772915451ed3415c1992bd3697d4983",
-+                "reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-dom": "*",
-+                "ext-libxml": "*",
-+                "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
-+                "symfony/css-selector": "^3.4.0 || ^4.0.0"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "^2.2.0",
-+                "phpmd/phpmd": "^2.6.0",
-+                "phpunit/phpunit": "^4.8.0",
-+                "squizlabs/php_codesniffer": "^3.3.2"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Pelago\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "John Reeve",
-+                    "email": "jreeve@pelagodesign.com"
-+                },
-+                {
-+                    "name": "Cameron Brooks"
-+                },
-+                {
-+                    "name": "Jaime Prado"
-+                },
-+                {
-+                    "name": "Oliver Klee",
-+                    "email": "github@oliverklee.de"
-+                },
-+                {
-+                    "name": "Zoli Szabó",
-+                    "email": "zoli.szabo+github@gmail.com"
-+                },
-+                {
-+                    "name": "Jake Hotson",
-+                    "email": "jake@qzdesign.co.uk"
-+                }
-+            ],
-+            "description": "Converts CSS styles into inline style attributes in your HTML code",
-+            "homepage": "https://www.myintervals.com/emogrifier.php",
-+            "keywords": [
-+                "css",
-+                "email",
-+                "pre-processing"
-+            ],
-+            "time": "2018-12-10T10:36:30+00:00"
-+        },
-+        {
-+            "name": "php-amqplib/php-amqplib",
-+            "version": "v2.7.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/php-amqplib/php-amqplib.git",
-+                "reference": "a8ba54bd35b973fc6861e4c2e105f71e9e95f43f"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/a8ba54bd35b973fc6861e4c2e105f71e9e95f43f",
-+                "reference": "a8ba54bd35b973fc6861e4c2e105f71e9e95f43f",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-bcmath": "*",
-+                "ext-mbstring": "*",
-+                "php": ">=5.3.0"
-+            },
-+            "replace": {
-+                "videlalvaro/php-amqplib": "self.version"
-+            },
-+            "require-dev": {
-+                "phpdocumentor/phpdocumentor": "^2.9",
-+                "phpunit/phpunit": "^4.8",
-+                "scrutinizer/ocular": "^1.1",
-+                "squizlabs/php_codesniffer": "^2.5"
-+            },
-+            "suggest": {
-+                "ext-sockets": "Use AMQPSocketConnection"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "PhpAmqpLib\\": "PhpAmqpLib/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "LGPL-2.1-or-later"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Alvaro Videla",
-+                    "role": "Original Maintainer"
-+                },
-+                {
-+                    "name": "John Kelly",
-+                    "email": "johnmkelly86@gmail.com",
-+                    "role": "Maintainer"
-+                },
-+                {
-+                    "name": "Raúl Araya",
-+                    "email": "nubeiro@gmail.com",
-+                    "role": "Maintainer"
-+                }
-+            ],
-+            "description": "Formerly videlalvaro/php-amqplib.  This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.",
-+            "homepage": "https://github.com/php-amqplib/php-amqplib/",
-+            "keywords": [
-+                "message",
-+                "queue",
-+                "rabbitmq"
-+            ],
-+            "time": "2018-04-30T03:54:54+00:00"
-+        },
-+        {
-+            "name": "phpseclib/mcrypt_compat",
-+            "version": "1.0.8",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/phpseclib/mcrypt_compat.git",
-+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
-+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3",
-+                "phpseclib/phpseclib": ">=2.0.11 <3.0.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0"
-+            },
-+            "suggest": {
-+                "ext-openssl": "Will enable faster cryptographic operations"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "lib/mcrypt.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jim Wigginton",
-+                    "email": "terrafrost@php.net",
-+                    "homepage": "http://phpseclib.sourceforge.net"
-+                }
-+            ],
-+            "description": "PHP 7.1 polyfill for the mcrypt extension from PHP <= 7.0",
-+            "keywords": [
-+                "cryptograpy",
-+                "encryption",
-+                "mcrypt"
-+            ],
-+            "time": "2018-08-22T03:11:43+00:00"
-+        },
-+        {
-+            "name": "phpseclib/phpseclib",
-+            "version": "2.0.14",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/phpseclib/phpseclib.git",
-+                "reference": "8ebfcadbf30524aeb75b2c446bc2519d5b321478"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/8ebfcadbf30524aeb75b2c446bc2519d5b321478",
-+                "reference": "8ebfcadbf30524aeb75b2c446bc2519d5b321478",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3"
-+            },
-+            "require-dev": {
-+                "phing/phing": "~2.7",
-+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
-+                "sami/sami": "~2.0",
-+                "squizlabs/php_codesniffer": "~2.0"
-+            },
-+            "suggest": {
-+                "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
-+                "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
-+                "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-+                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "phpseclib/bootstrap.php"
-+                ],
-+                "psr-4": {
-+                    "phpseclib\\": "phpseclib/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jim Wigginton",
-+                    "email": "terrafrost@php.net",
-+                    "role": "Lead Developer"
-+                },
-+                {
-+                    "name": "Patrick Monnerat",
-+                    "email": "pm@datasphere.ch",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Andreas Fischer",
-+                    "email": "bantu@phpbb.com",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Hans-Jürgen Petrich",
-+                    "email": "petrich@tronic-media.com",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Graham Campbell",
-+                    "email": "graham@alt-three.com",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
-+            "homepage": "http://phpseclib.sourceforge.net",
-+            "keywords": [
-+                "BigInteger",
-+                "aes",
-+                "asn.1",
-+                "asn1",
-+                "blowfish",
-+                "crypto",
-+                "cryptography",
-+                "encryption",
-+                "rsa",
-+                "security",
-+                "sftp",
-+                "signature",
-+                "signing",
-+                "ssh",
-+                "twofish",
-+                "x.509",
-+                "x509"
-+            ],
-+            "time": "2019-01-27T19:37:29+00:00"
-+        },
-+        {
-+            "name": "psr/container",
-+            "version": "1.0.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/php-fig/container.git",
-+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Psr\\Container\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "PHP-FIG",
-+                    "homepage": "http://www.php-fig.org/"
-+                }
-+            ],
-+            "description": "Common Container Interface (PHP FIG PSR-11)",
-+            "homepage": "https://github.com/php-fig/container",
-+            "keywords": [
-+                "PSR-11",
-+                "container",
-+                "container-interface",
-+                "container-interop",
-+                "psr"
-+            ],
-+            "time": "2017-02-14T16:28:37+00:00"
-+        },
-+        {
-+            "name": "psr/http-message",
-+            "version": "1.0.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/php-fig/http-message.git",
-+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Psr\\Http\\Message\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "PHP-FIG",
-+                    "homepage": "http://www.php-fig.org/"
-+                }
-+            ],
-+            "description": "Common interface for HTTP messages",
-+            "homepage": "https://github.com/php-fig/http-message",
-+            "keywords": [
-+                "http",
-+                "http-message",
-+                "psr",
-+                "psr-7",
-+                "request",
-+                "response"
-+            ],
-+            "time": "2016-08-06T14:39:51+00:00"
-+        },
-+        {
-+            "name": "psr/log",
-+            "version": "1.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/php-fig/log.git",
-+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Psr\\Log\\": "Psr/Log/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "PHP-FIG",
-+                    "homepage": "http://www.php-fig.org/"
-+                }
-+            ],
-+            "description": "Common interface for logging libraries",
-+            "homepage": "https://github.com/php-fig/log",
-+            "keywords": [
-+                "log",
-+                "psr",
-+                "psr-3"
-+            ],
-+            "time": "2018-11-20T15:27:04+00:00"
-+        },
-+        {
-+            "name": "ramsey/uuid",
-+            "version": "3.8.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/ramsey/uuid.git",
-+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
-+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "paragonie/random_compat": "^1.0|^2.0|9.99.99",
-+                "php": "^5.4 || ^7.0",
-+                "symfony/polyfill-ctype": "^1.8"
-+            },
-+            "replace": {
-+                "rhumsaa/uuid": "self.version"
-+            },
-+            "require-dev": {
-+                "codeception/aspect-mock": "^1.0 | ~2.0.0",
-+                "doctrine/annotations": "~1.2.0",
-+                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
-+                "ircmaxell/random-lib": "^1.1",
-+                "jakub-onderka/php-parallel-lint": "^0.9.0",
-+                "mockery/mockery": "^0.9.9",
-+                "moontoast/math": "^1.1",
-+                "php-mock/php-mock-phpunit": "^0.3|^1.1",
-+                "phpunit/phpunit": "^4.7|^5.0|^6.5",
-+                "squizlabs/php_codesniffer": "^2.3"
-+            },
-+            "suggest": {
-+                "ext-ctype": "Provides support for PHP Ctype functions",
-+                "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
-+                "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
-+                "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
-+                "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
-+                "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid",
-+                "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "3.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Ramsey\\Uuid\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Marijn Huizendveld",
-+                    "email": "marijn.huizendveld@gmail.com"
-+                },
-+                {
-+                    "name": "Thibaud Fabre",
-+                    "email": "thibaud@aztech.io"
-+                },
-+                {
-+                    "name": "Ben Ramsey",
-+                    "email": "ben@benramsey.com",
-+                    "homepage": "https://benramsey.com"
-+                }
-+            ],
-+            "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
-+            "homepage": "https://github.com/ramsey/uuid",
-+            "keywords": [
-+                "guid",
-+                "identifier",
-+                "uuid"
-+            ],
-+            "time": "2018-07-19T23:38:55+00:00"
-+        },
-+        {
-+            "name": "react/promise",
-+            "version": "v2.7.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/reactphp/promise.git",
-+                "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/reactphp/promise/zipball/31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
-+                "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.4.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.8"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "React\\Promise\\": "src/"
-+                },
-+                "files": [
-+                    "src/functions_include.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jan Sorgalla",
-+                    "email": "jsorgalla@gmail.com"
-+                }
-+            ],
-+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
-+            "keywords": [
-+                "promise",
-+                "promises"
-+            ],
-+            "time": "2019-01-07T21:25:54+00:00"
-+        },
-+        {
-+            "name": "seld/jsonlint",
-+            "version": "1.7.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Seldaek/jsonlint.git",
-+                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
-+                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.3 || ^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-+            },
-+            "bin": [
-+                "bin/jsonlint"
-+            ],
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-+                }
-+            ],
-+            "description": "JSON Linter",
-+            "keywords": [
-+                "json",
-+                "linter",
-+                "parser",
-+                "validator"
-+            ],
-+            "time": "2018-01-24T12:46:19+00:00"
-+        },
-+        {
-+            "name": "seld/phar-utils",
-+            "version": "1.0.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Seldaek/phar-utils.git",
-+                "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/7009b5139491975ef6486545a39f3e6dad5ac30a",
-+                "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Seld\\PharUtils\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be"
-+                }
-+            ],
-+            "description": "PHAR file format utilities, for when PHP phars you up",
-+            "keywords": [
-+                "phra"
-+            ],
-+            "time": "2015-10-13T18:44:15+00:00"
-+        },
-+        {
-+            "name": "symfony/console",
-+            "version": "v4.1.11",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/console.git",
-+                "reference": "9e87c798f67dc9fceeb4f3d57847b52d945d1a02"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/console/zipball/9e87c798f67dc9fceeb4f3d57847b52d945d1a02",
-+                "reference": "9e87c798f67dc9fceeb4f3d57847b52d945d1a02",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3",
-+                "symfony/polyfill-mbstring": "~1.0"
-+            },
-+            "conflict": {
-+                "symfony/dependency-injection": "<3.4",
-+                "symfony/process": "<3.3"
-+            },
-+            "provide": {
-+                "psr/log-implementation": "1.0"
-+            },
-+            "require-dev": {
-+                "psr/log": "~1.0",
-+                "symfony/config": "~3.4|~4.0",
-+                "symfony/dependency-injection": "~3.4|~4.0",
-+                "symfony/event-dispatcher": "~3.4|~4.0",
-+                "symfony/lock": "~3.4|~4.0",
-+                "symfony/process": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "psr/log": "For using the console logger",
-+                "symfony/event-dispatcher": "",
-+                "symfony/lock": "",
-+                "symfony/process": ""
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Console\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Console Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-25T14:34:37+00:00"
-+        },
-+        {
-+            "name": "symfony/css-selector",
-+            "version": "v4.2.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/css-selector.git",
-+                "reference": "48eddf66950fa57996e1be4a55916d65c10c604a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/48eddf66950fa57996e1be4a55916d65c10c604a",
-+                "reference": "48eddf66950fa57996e1be4a55916d65c10c604a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\CssSelector\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jean-François Simon",
-+                    "email": "jeanfrancois.simon@sensiolabs.com"
-+                },
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony CssSelector Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-16T20:31:39+00:00"
-+        },
-+        {
-+            "name": "symfony/event-dispatcher",
-+            "version": "v4.1.11",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/event-dispatcher.git",
-+                "reference": "51be1b61dfe04d64a260223f2b81475fa8066b97"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/51be1b61dfe04d64a260223f2b81475fa8066b97",
-+                "reference": "51be1b61dfe04d64a260223f2b81475fa8066b97",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3"
-+            },
-+            "conflict": {
-+                "symfony/dependency-injection": "<3.4"
-+            },
-+            "require-dev": {
-+                "psr/log": "~1.0",
-+                "symfony/config": "~3.4|~4.0",
-+                "symfony/dependency-injection": "~3.4|~4.0",
-+                "symfony/expression-language": "~3.4|~4.0",
-+                "symfony/stopwatch": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/dependency-injection": "",
-+                "symfony/http-kernel": ""
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\EventDispatcher\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony EventDispatcher Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-16T18:35:49+00:00"
-+        },
-+        {
-+            "name": "symfony/filesystem",
-+            "version": "v4.2.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/filesystem.git",
-+                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e16b9e471703b2c60b95f14d31c1239f68f11601",
-+                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3",
-+                "symfony/polyfill-ctype": "~1.8"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Filesystem\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Filesystem Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-07T11:40:08+00:00"
-+        },
-+        {
-+            "name": "symfony/finder",
-+            "version": "v4.2.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/finder.git",
-+                "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/finder/zipball/267b7002c1b70ea80db0833c3afe05f0fbde580a",
-+                "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Finder\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Finder Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-23T15:42:05+00:00"
-+        },
-+        {
-+            "name": "symfony/polyfill-ctype",
-+            "version": "v1.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/polyfill-ctype.git",
-+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
-+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3"
-+            },
-+            "suggest": {
-+                "ext-ctype": "For best performance"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.9-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Ctype\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                },
-+                {
-+                    "name": "Gert de Pagter",
-+                    "email": "BackEndTea@gmail.com"
-+                }
-+            ],
-+            "description": "Symfony polyfill for ctype functions",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "compatibility",
-+                "ctype",
-+                "polyfill",
-+                "portable"
-+            ],
-+            "time": "2018-08-06T14:22:27+00:00"
-+        },
-+        {
-+            "name": "symfony/polyfill-mbstring",
-+            "version": "v1.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/polyfill-mbstring.git",
-+                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
-+                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3"
-+            },
-+            "suggest": {
-+                "ext-mbstring": "For best performance"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.9-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Mbstring\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony polyfill for the Mbstring extension",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "compatibility",
-+                "mbstring",
-+                "polyfill",
-+                "portable",
-+                "shim"
-+            ],
-+            "time": "2018-09-21T13:07:52+00:00"
-+        },
-+        {
-+            "name": "symfony/process",
-+            "version": "v4.1.11",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/process.git",
-+                "reference": "72d838aafaa7c790330fe362b9cecec362c64629"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/process/zipball/72d838aafaa7c790330fe362b9cecec362c64629",
-+                "reference": "72d838aafaa7c790330fe362b9cecec362c64629",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Process\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Process Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-16T19:07:26+00:00"
-+        },
-+        {
-+            "name": "tedivm/jshrink",
-+            "version": "v1.3.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/tedious/JShrink.git",
-+                "reference": "21254058dc3ce6aba6bef458cff4bfa25cf8b198"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/tedious/JShrink/zipball/21254058dc3ce6aba6bef458cff4bfa25cf8b198",
-+                "reference": "21254058dc3ce6aba6bef458cff4bfa25cf8b198",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6|^7.0"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "^2.8",
-+                "php-coveralls/php-coveralls": "^1.1.0",
-+                "phpunit/phpunit": "^6"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "JShrink": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Robert Hafner",
-+                    "email": "tedivm@tedivm.com"
-+                }
-+            ],
-+            "description": "Javascript Minifier built in PHP",
-+            "homepage": "http://github.com/tedious/JShrink",
-+            "keywords": [
-+                "javascript",
-+                "minifier"
-+            ],
-+            "time": "2018-09-16T00:02:51+00:00"
-+        },
-+        {
-+            "name": "true/punycode",
-+            "version": "v2.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/true/php-punycode.git",
-+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/true/php-punycode/zipball/a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
-+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0",
-+                "symfony/polyfill-mbstring": "^1.3"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.7",
-+                "squizlabs/php_codesniffer": "~2.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "TrueBV\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Renan Gonçalves",
-+                    "email": "renan.saddam@gmail.com"
-+                }
-+            ],
-+            "description": "A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA)",
-+            "homepage": "https://github.com/true/php-punycode",
-+            "keywords": [
-+                "idna",
-+                "punycode"
-+            ],
-+            "time": "2016-11-16T10:37:54+00:00"
-+        },
-+        {
-+            "name": "tubalmartin/cssmin",
-+            "version": "v4.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
-+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
-+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-pcre": "*",
-+                "php": ">=5.3.2"
-+            },
-+            "require-dev": {
-+                "cogpowered/finediff": "0.3.*",
-+                "phpunit/phpunit": "4.8.*"
-+            },
-+            "bin": [
-+                "cssmin"
-+            ],
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "tubalmartin\\CssMin\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Túbal Martín",
-+                    "homepage": "http://tubalmartin.me/"
-+                }
-+            ],
-+            "description": "A PHP port of the YUI CSS compressor",
-+            "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port",
-+            "keywords": [
-+                "compress",
-+                "compressor",
-+                "css",
-+                "cssmin",
-+                "minify",
-+                "yui"
-+            ],
-+            "time": "2018-01-15T15:26:51+00:00"
-+        },
-+        {
-+            "name": "webonyx/graphql-php",
-+            "version": "v0.12.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/webonyx/graphql-php.git",
-+                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
-+                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-mbstring": "*",
-+                "php": ">=5.6"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8",
-+                "psr/http-message": "^1.0",
-+                "react/promise": "2.*"
-+            },
-+            "suggest": {
-+                "psr/http-message": "To use standard GraphQL server",
-+                "react/promise": "To leverage async resolving on React PHP platform"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "GraphQL\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "description": "A PHP port of GraphQL reference implementation",
-+            "homepage": "https://github.com/webonyx/graphql-php",
-+            "keywords": [
-+                "api",
-+                "graphql"
-+            ],
-+            "time": "2018-09-02T14:59:54+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-captcha",
-+            "version": "2.8.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-captcha.git",
-+                "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/37e9b6a4f632a9399eecbf2e5e325ad89083f87b",
-+                "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-math": "^2.7 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-session": "^2.8",
-+                "zendframework/zend-text": "^2.6",
-+                "zendframework/zend-validator": "^2.10.1",
-+                "zendframework/zendservice-recaptcha": "^3.0"
-+            },
-+            "suggest": {
-+                "zendframework/zend-i18n-resources": "Translations of captcha messages",
-+                "zendframework/zend-session": "Zend\\Session component",
-+                "zendframework/zend-text": "Zend\\Text component",
-+                "zendframework/zend-validator": "Zend\\Validator component",
-+                "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.8.x-dev",
-+                    "dev-develop": "2.9.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Captcha\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Generate and validate CAPTCHAs using Figlets, images, ReCaptcha, and more",
-+            "keywords": [
-+                "ZendFramework",
-+                "captcha",
-+                "zf"
-+            ],
-+            "time": "2018-04-24T17:24:10+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-code",
-+            "version": "3.3.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-code.git",
-+                "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-code/zipball/c21db169075c6ec4b342149f446e7b7b724f95eb",
-+                "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1",
-+                "zendframework/zend-eventmanager": "^2.6 || ^3.0"
-+            },
-+            "require-dev": {
-+                "doctrine/annotations": "~1.0",
-+                "ext-phar": "*",
-+                "phpunit/phpunit": "^6.2.3",
-+                "zendframework/zend-coding-standard": "^1.0.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "suggest": {
-+                "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
-+                "zendframework/zend-stdlib": "Zend\\Stdlib component"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "3.3.x-dev",
-+                    "dev-develop": "3.4.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Code\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "provides facilities to generate arbitrary code using an object oriented interface",
-+            "homepage": "https://github.com/zendframework/zend-code",
-+            "keywords": [
-+                "code",
-+                "zf2"
-+            ],
-+            "time": "2018-08-13T20:36:59+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-config",
-+            "version": "2.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-config.git",
-+                "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
-+                "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0",
-+                "zendframework/zend-filter": "^2.6",
-+                "zendframework/zend-i18n": "^2.5",
-+                "zendframework/zend-json": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-+            },
-+            "suggest": {
-+                "zendframework/zend-filter": "Zend\\Filter component",
-+                "zendframework/zend-i18n": "Zend\\I18n component",
-+                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.6-dev",
-+                    "dev-develop": "2.7-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Config\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
-+            "homepage": "https://github.com/zendframework/zend-config",
-+            "keywords": [
-+                "config",
-+                "zf2"
-+            ],
-+            "time": "2016-02-04T23:01:10+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-console",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-console.git",
-+                "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-console/zipball/e8aa08da83de3d265256c40ba45cd649115f0e18",
-+                "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-filter": "^2.7.2",
-+                "zendframework/zend-json": "^2.6 || ^3.0",
-+                "zendframework/zend-validator": "^2.10.1"
-+            },
-+            "suggest": {
-+                "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
-+                "zendframework/zend-validator": "To support DefaultRouteMatcher usage"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Console\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Build console applications using getopt syntax or routing, complete with prompts",
-+            "keywords": [
-+                "ZendFramework",
-+                "console",
-+                "zf"
-+            ],
-+            "time": "2018-01-25T19:08:04+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-crypt",
-+            "version": "2.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-crypt.git",
-+                "reference": "1b2f5600bf6262904167116fa67b58ab1457036d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-crypt/zipball/1b2f5600bf6262904167116fa67b58ab1457036d",
-+                "reference": "1b2f5600bf6262904167116fa67b58ab1457036d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "container-interop/container-interop": "~1.0",
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-math": "^2.6",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "suggest": {
-+                "ext-mcrypt": "Required for most features of Zend\\Crypt"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.6-dev",
-+                    "dev-develop": "2.7-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Crypt\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "homepage": "https://github.com/zendframework/zend-crypt",
-+            "keywords": [
-+                "crypt",
-+                "zf2"
-+            ],
-+            "time": "2016-02-03T23:46:30+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-db",
-+            "version": "2.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-db.git",
-+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
-+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.25 || ^6.4.4",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-+            },
-+            "suggest": {
-+                "zendframework/zend-eventmanager": "Zend\\EventManager component",
-+                "zendframework/zend-hydrator": "Zend\\Hydrator component for using HydratingResultSets",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.9-dev",
-+                    "dev-develop": "2.10-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Db",
-+                    "config-provider": "Zend\\Db\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Db\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Database abstraction layer, SQL abstraction, result set abstraction, and RowDataGateway and TableDataGateway implementations",
-+            "keywords": [
-+                "ZendFramework",
-+                "db",
-+                "zf"
-+            ],
-+            "time": "2019-02-25T11:37:45+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-di",
-+            "version": "2.6.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-di.git",
-+                "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-di/zipball/1fd1ba85660b5a2718741b38639dc7c4c3194b37",
-+                "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "container-interop/container-interop": "^1.1",
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-code": "^2.6 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.6-dev",
-+                    "dev-develop": "2.7-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Di\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "homepage": "https://github.com/zendframework/zend-di",
-+            "keywords": [
-+                "di",
-+                "zf2"
-+            ],
-+            "time": "2016-04-25T20:58:11+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-diactoros",
-+            "version": "1.8.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-diactoros.git",
-+                "reference": "20da13beba0dde8fb648be3cc19765732790f46e"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e",
-+                "reference": "20da13beba0dde8fb648be3cc19765732790f46e",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "psr/http-message": "^1.0"
-+            },
-+            "provide": {
-+                "psr/http-message-implementation": "1.0"
-+            },
-+            "require-dev": {
-+                "ext-dom": "*",
-+                "ext-libxml": "*",
-+                "php-http/psr7-integration-tests": "dev-master",
-+                "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
-+                "zendframework/zend-coding-standard": "~1.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.8.x-dev",
-+                    "dev-develop": "1.9.x-dev",
-+                    "dev-release-2.0": "2.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "files": [
-+                    "src/functions/create_uploaded_file.php",
-+                    "src/functions/marshal_headers_from_sapi.php",
-+                    "src/functions/marshal_method_from_sapi.php",
-+                    "src/functions/marshal_protocol_version_from_sapi.php",
-+                    "src/functions/marshal_uri_from_sapi.php",
-+                    "src/functions/normalize_server.php",
-+                    "src/functions/normalize_uploaded_files.php",
-+                    "src/functions/parse_cookie_header.php"
-+                ],
-+                "psr-4": {
-+                    "Zend\\Diactoros\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-2-Clause"
-+            ],
-+            "description": "PSR HTTP Message implementations",
-+            "homepage": "https://github.com/zendframework/zend-diactoros",
-+            "keywords": [
-+                "http",
-+                "psr",
-+                "psr-7"
-+            ],
-+            "time": "2018-09-05T19:29:37+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-escaper",
-+            "version": "2.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-escaper.git",
-+                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/31d8aafae982f9568287cb4dce987e6aff8fd074",
-+                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.6.x-dev",
-+                    "dev-develop": "2.7.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Escaper\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
-+            "keywords": [
-+                "ZendFramework",
-+                "escaper",
-+                "zf"
-+            ],
-+            "time": "2018-04-25T15:48:53+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-eventmanager",
-+            "version": "2.6.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-eventmanager.git",
-+                "reference": "d238c443220dce4b6396579c8ab2200ec25f9108"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/d238c443220dce4b6396579c8ab2200ec25f9108",
-+                "reference": "d238c443220dce4b6396579c8ab2200ec25f9108",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7"
-+            },
-+            "require-dev": {
-+                "athletic/athletic": "dev-master",
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-release-2.6": "2.6-dev",
-+                    "dev-master": "3.0-dev",
-+                    "dev-develop": "3.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\EventManager\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "homepage": "https://github.com/zendframework/zend-eventmanager",
-+            "keywords": [
-+                "eventmanager",
-+                "zf2"
-+            ],
-+            "time": "2017-12-12T17:48:56+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-feed",
-+            "version": "2.10.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-feed.git",
-+                "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/6641f4cf3f4586c63f83fd70b6d19966025c8888",
-+                "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-escaper": "^2.5.2",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "psr/http-message": "^1.0.1",
-+                "zendframework/zend-cache": "^2.7.2",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-db": "^2.8.2",
-+                "zendframework/zend-http": "^2.7",
-+                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-+                "zendframework/zend-validator": "^2.10.1"
-+            },
-+            "suggest": {
-+                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
-+                "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
-+                "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
-+                "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
-+                "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Feed\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "provides functionality for consuming RSS and Atom feeds",
-+            "keywords": [
-+                "ZendFramework",
-+                "feed",
-+                "zf"
-+            ],
-+            "time": "2018-08-01T13:53:20+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-filter",
-+            "version": "2.9.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-filter.git",
-+                "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/1c3e6d02f9cd5f6c929c9859498f5efbe216e86f",
-+                "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
-+            },
-+            "conflict": {
-+                "zendframework/zend-validator": "<2.10.1"
-+            },
-+            "require-dev": {
-+                "pear/archive_tar": "^1.4.3",
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "psr/http-factory": "^1.0",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-crypt": "^3.2.1",
-+                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-+                "zendframework/zend-uri": "^2.6"
-+            },
-+            "suggest": {
-+                "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters",
-+                "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
-+                "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
-+                "zendframework/zend-uri": "Zend\\Uri component, for the UriNormalize filter"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.9.x-dev",
-+                    "dev-develop": "2.10.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Filter",
-+                    "config-provider": "Zend\\Filter\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Filter\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "provides a set of commonly needed data filters",
-+            "keywords": [
-+                "ZendFramework",
-+                "filter",
-+                "zf"
-+            ],
-+            "time": "2018-12-17T16:00:04+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-form",
-+            "version": "2.13.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-form.git",
-+                "reference": "c713a12ccbd43148b71c9339e171ca11e3f8a1da"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/c713a12ccbd43148b71c9339e171ca11e3f8a1da",
-+                "reference": "c713a12ccbd43148b71c9339e171ca11e3f8a1da",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
-+                "zendframework/zend-inputfilter": "^2.8",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "require-dev": {
-+                "doctrine/annotations": "~1.0",
-+                "phpunit/phpunit": "^5.7.23 || ^6.5.3",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-captcha": "^2.7.1",
-+                "zendframework/zend-code": "^2.6 || ^3.0",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-escaper": "^2.5",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-filter": "^2.6",
-+                "zendframework/zend-i18n": "^2.6",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-session": "^2.8.1",
-+                "zendframework/zend-text": "^2.6",
-+                "zendframework/zend-validator": "^2.6",
-+                "zendframework/zend-view": "^2.6.2",
-+                "zendframework/zendservice-recaptcha": "^3.0.0"
-+            },
-+            "suggest": {
-+                "zendframework/zend-captcha": "^2.7.1, required for using CAPTCHA form elements",
-+                "zendframework/zend-code": "^2.6 || ^3.0, required to use zend-form annotations support",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, reuired for zend-form annotations support",
-+                "zendframework/zend-i18n": "^2.6, required when using zend-form view helpers",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services",
-+                "zendframework/zend-view": "^2.6.2, required for using the zend-form view helpers",
-+                "zendframework/zendservice-recaptcha": "in order to use the ReCaptcha form element"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.13.x-dev",
-+                    "dev-develop": "2.14.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Form",
-+                    "config-provider": "Zend\\Form\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Form\\": "src/"
-+                },
-+                "files": [
-+                    "autoload/formElementManagerPolyfill.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Validate and display simple and complex forms, casting forms to business objects and vice versa",
-+            "keywords": [
-+                "ZendFramework",
-+                "form",
-+                "zf"
-+            ],
-+            "time": "2018-12-11T22:51:29+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-http",
-+            "version": "2.8.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-http.git",
-+                "reference": "d160aedc096be230af0fe9c31151b2b33ad4e807"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/d160aedc096be230af0fe9c31151b2b33ad4e807",
-+                "reference": "d160aedc096be230af0fe9c31151b2b33ad4e807",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-loader": "^2.5.1",
-+                "zendframework/zend-stdlib": "^3.1 || ^2.7.7",
-+                "zendframework/zend-uri": "^2.5.2",
-+                "zendframework/zend-validator": "^2.10.1"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^3.1 || ^2.6"
-+            },
-+            "suggest": {
-+                "paragonie/certainty": "For automated management of cacert.pem"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.8.x-dev",
-+                    "dev-develop": "2.9.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Http\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
-+            "keywords": [
-+                "ZendFramework",
-+                "http",
-+                "http client",
-+                "zend",
-+                "zf"
-+            ],
-+            "time": "2019-02-07T17:47:08+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-hydrator",
-+            "version": "1.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-hydrator.git",
-+                "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65",
-+                "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.0",
-+                "squizlabs/php_codesniffer": "^2.0@dev",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-filter": "^2.6",
-+                "zendframework/zend-inputfilter": "^2.6",
-+                "zendframework/zend-serializer": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-+            },
-+            "suggest": {
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
-+                "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage",
-+                "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-release-1.0": "1.0-dev",
-+                    "dev-release-1.1": "1.1-dev",
-+                    "dev-master": "2.0-dev",
-+                    "dev-develop": "2.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Hydrator\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "homepage": "https://github.com/zendframework/zend-hydrator",
-+            "keywords": [
-+                "hydrator",
-+                "zf2"
-+            ],
-+            "time": "2016-02-18T22:38:26+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-i18n",
-+            "version": "2.9.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-i18n.git",
-+                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
-+                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-filter": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-validator": "^2.6",
-+                "zendframework/zend-view": "^2.6.3"
-+            },
-+            "suggest": {
-+                "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
-+                "zendframework/zend-cache": "Zend\\Cache component",
-+                "zendframework/zend-config": "Zend\\Config component",
-+                "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
-+                "zendframework/zend-filter": "You should install this package to use the provided filters",
-+                "zendframework/zend-i18n-resources": "Translation resources",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-+                "zendframework/zend-validator": "You should install this package to use the provided validators",
-+                "zendframework/zend-view": "You should install this package to use the provided view helpers"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.9.x-dev",
-+                    "dev-develop": "2.10.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\I18n",
-+                    "config-provider": "Zend\\I18n\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\I18n\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Provide translations for your application, and filter and validate internationalized values",
-+            "keywords": [
-+                "ZendFramework",
-+                "i18n",
-+                "zf"
-+            ],
-+            "time": "2018-05-16T16:39:13+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-inputfilter",
-+            "version": "2.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-inputfilter.git",
-+                "reference": "4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c",
-+                "reference": "4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-filter": "^2.9.1",
-+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-+                "zendframework/zend-validator": "^2.11"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "psr/http-message": "^1.0",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-+            },
-+            "suggest": {
-+                "psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\InputFilter",
-+                    "config-provider": "Zend\\InputFilter\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\InputFilter\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files",
-+            "keywords": [
-+                "ZendFramework",
-+                "inputfilter",
-+                "zf"
-+            ],
-+            "time": "2019-01-30T16:58:51+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-json",
-+            "version": "2.6.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-json.git",
-+                "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28",
-+                "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.5 || ^7.0"
-+            },
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0",
-+                "zendframework/zend-http": "^2.5.4",
-+                "zendframework/zend-server": "^2.6.1",
-+                "zendframework/zend-stdlib": "^2.5 || ^3.0",
-+                "zendframework/zendxml": "^1.0.2"
-+            },
-+            "suggest": {
-+                "zendframework/zend-http": "Zend\\Http component, required to use Zend\\Json\\Server",
-+                "zendframework/zend-server": "Zend\\Server component, required to use Zend\\Json\\Server",
-+                "zendframework/zend-stdlib": "Zend\\Stdlib component, for use with caching Zend\\Json\\Server responses",
-+                "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.6-dev",
-+                    "dev-develop": "2.7-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Json\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
-+            "homepage": "https://github.com/zendframework/zend-json",
-+            "keywords": [
-+                "json",
-+                "zf2"
-+            ],
-+            "time": "2016-02-04T21:20:26+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-loader",
-+            "version": "2.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-loader.git",
-+                "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/78f11749ea340f6ca316bca5958eef80b38f9b6c",
-+                "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.6.x-dev",
-+                    "dev-develop": "2.7.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Loader\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Autoloading and plugin loading strategies",
-+            "keywords": [
-+                "ZendFramework",
-+                "loader",
-+                "zf"
-+            ],
-+            "time": "2018-04-30T15:20:54+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-log",
-+            "version": "2.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-log.git",
-+                "reference": "9cec3b092acb39963659c2f32441cccc56b3f430"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-log/zipball/9cec3b092acb39963659c2f32441cccc56b3f430",
-+                "reference": "9cec3b092acb39963659c2f32441cccc56b3f430",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "psr/log": "^1.0",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "provide": {
-+                "psr/log-implementation": "1.0.0"
-+            },
-+            "require-dev": {
-+                "mikey179/vfsstream": "^1.6",
-+                "phpunit/phpunit": "^5.7.15 || ^6.0.8",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-db": "^2.6",
-+                "zendframework/zend-escaper": "^2.5",
-+                "zendframework/zend-filter": "^2.5",
-+                "zendframework/zend-mail": "^2.6.1",
-+                "zendframework/zend-validator": "^2.10.1"
-+            },
-+            "suggest": {
-+                "ext-mongo": "mongo extension to use Mongo writer",
-+                "ext-mongodb": "mongodb extension to use MongoDB writer",
-+                "zendframework/zend-console": "Zend\\Console component to use the RequestID log processor",
-+                "zendframework/zend-db": "Zend\\Db component to use the database log writer",
-+                "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML log formatter",
-+                "zendframework/zend-mail": "Zend\\Mail component to use the email log writer",
-+                "zendframework/zend-validator": "Zend\\Validator component to block invalid log messages"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Log",
-+                    "config-provider": "Zend\\Log\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Log\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "component for general purpose logging",
-+            "homepage": "https://github.com/zendframework/zend-log",
-+            "keywords": [
-+                "log",
-+                "logging",
-+                "zf2"
-+            ],
-+            "time": "2018-04-09T21:59:51+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-mail",
-+            "version": "2.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-mail.git",
-+                "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/d7beb63d5f7144a21ac100072c453e63860cdab8",
-+                "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-iconv": "*",
-+                "php": "^5.6 || ^7.0",
-+                "true/punycode": "^2.1",
-+                "zendframework/zend-loader": "^2.5",
-+                "zendframework/zend-mime": "^2.5",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-+                "zendframework/zend-validator": "^2.10.2"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-crypt": "^2.6 || ^3.0",
-+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1"
-+            },
-+            "suggest": {
-+                "zendframework/zend-crypt": "Crammd5 support in SMTP Auth",
-+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Mail",
-+                    "config-provider": "Zend\\Mail\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Mail\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
-+            "keywords": [
-+                "ZendFramework",
-+                "mail",
-+                "zf"
-+            ],
-+            "time": "2018-06-07T13:37:07+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-math",
-+            "version": "2.7.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-math.git",
-+                "reference": "1abce074004dacac1a32cd54de94ad47ef960d38"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/1abce074004dacac1a32cd54de94ad47ef960d38",
-+                "reference": "1abce074004dacac1a32cd54de94ad47ef960d38",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.5 || ^7.0"
-+            },
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "ircmaxell/random-lib": "~1.1",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "suggest": {
-+                "ext-bcmath": "If using the bcmath functionality",
-+                "ext-gmp": "If using the gmp functionality",
-+                "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if Mcrypt extensions is unavailable"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "2.8-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Math\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "homepage": "https://github.com/zendframework/zend-math",
-+            "keywords": [
-+                "math",
-+                "zf2"
-+            ],
-+            "time": "2018-12-04T15:34:17+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-mime",
-+            "version": "2.7.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-mime.git",
-+                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/52ae5fa9f12845cae749271034a2d594f0e4c6f2",
-+                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.21 || ^6.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-mail": "^2.6"
-+            },
-+            "suggest": {
-+                "zendframework/zend-mail": "Zend\\Mail component"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "2.8-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Mime\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Create and parse MIME messages and parts",
-+            "homepage": "https://github.com/zendframework/zend-mime",
-+            "keywords": [
-+                "ZendFramework",
-+                "mime",
-+                "zf"
-+            ],
-+            "time": "2018-05-14T19:02:50+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-modulemanager",
-+            "version": "2.8.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-modulemanager.git",
-+                "reference": "394df6e12248ac430a312d4693f793ee7120baa6"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/394df6e12248ac430a312d4693f793ee7120baa6",
-+                "reference": "394df6e12248ac430a312d4693f793ee7120baa6",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-config": "^3.1 || ^2.6",
-+                "zendframework/zend-eventmanager": "^3.2 || ^2.6.3",
-+                "zendframework/zend-stdlib": "^3.1 || ^2.7"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-console": "^2.6",
-+                "zendframework/zend-di": "^2.6",
-+                "zendframework/zend-loader": "^2.5",
-+                "zendframework/zend-mvc": "^3.0 || ^2.7",
-+                "zendframework/zend-servicemanager": "^3.0.3 || ^2.7.5"
-+            },
-+            "suggest": {
-+                "zendframework/zend-console": "Zend\\Console component",
-+                "zendframework/zend-loader": "Zend\\Loader component if you are not using Composer autoloading for your modules",
-+                "zendframework/zend-mvc": "Zend\\Mvc component",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "2.8-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\ModuleManager\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Modular application system for zend-mvc applications",
-+            "homepage": "https://github.com/zendframework/zend-modulemanager",
-+            "keywords": [
-+                "ZendFramework",
-+                "modulemanager",
-+                "zf"
-+            ],
-+            "time": "2017-12-02T06:11:18+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-mvc",
-+            "version": "2.7.15",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-mvc.git",
-+                "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
-+                "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "container-interop/container-interop": "^1.1",
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-console": "^2.7",
-+                "zendframework/zend-eventmanager": "^2.6.4 || ^3.0",
-+                "zendframework/zend-form": "^2.11",
-+                "zendframework/zend-hydrator": "^1.1 || ^2.4",
-+                "zendframework/zend-psr7bridge": "^0.2",
-+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.0.3",
-+                "zendframework/zend-stdlib": "^2.7.5 || ^3.0"
-+            },
-+            "replace": {
-+                "zendframework/zend-router": "^2.0"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "^4.8.36",
-+                "sebastian/comparator": "^1.2.4",
-+                "sebastian/version": "^1.0.4",
-+                "zendframework/zend-authentication": "^2.6",
-+                "zendframework/zend-cache": "^2.8",
-+                "zendframework/zend-di": "^2.6",
-+                "zendframework/zend-filter": "^2.8",
-+                "zendframework/zend-http": "^2.8",
-+                "zendframework/zend-i18n": "^2.8",
-+                "zendframework/zend-inputfilter": "^2.8",
-+                "zendframework/zend-json": "^2.6.1",
-+                "zendframework/zend-log": "^2.9.3",
-+                "zendframework/zend-modulemanager": "^2.8",
-+                "zendframework/zend-serializer": "^2.8",
-+                "zendframework/zend-session": "^2.8.1",
-+                "zendframework/zend-text": "^2.7",
-+                "zendframework/zend-uri": "^2.6",
-+                "zendframework/zend-validator": "^2.10",
-+                "zendframework/zend-view": "^2.9"
-+            },
-+            "suggest": {
-+                "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
-+                "zendframework/zend-config": "Zend\\Config component",
-+                "zendframework/zend-di": "Zend\\Di component",
-+                "zendframework/zend-filter": "Zend\\Filter component",
-+                "zendframework/zend-http": "Zend\\Http component",
-+                "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
-+                "zendframework/zend-inputfilter": "Zend\\Inputfilter component",
-+                "zendframework/zend-json": "Zend\\Json component",
-+                "zendframework/zend-log": "Zend\\Log component",
-+                "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
-+                "zendframework/zend-serializer": "Zend\\Serializer component",
-+                "zendframework/zend-servicemanager-di": "^1.0.1, if using zend-servicemanager v3 and requiring the zend-di integration",
-+                "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
-+                "zendframework/zend-text": "Zend\\Text component",
-+                "zendframework/zend-uri": "Zend\\Uri component",
-+                "zendframework/zend-validator": "Zend\\Validator component",
-+                "zendframework/zend-view": "Zend\\View component"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "3.0-dev"
-+                }
-+            },
-+            "autoload": {
-+                "files": [
-+                    "src/autoload.php"
-+                ],
-+                "psr-4": {
-+                    "Zend\\Mvc\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "homepage": "https://github.com/zendframework/zend-mvc",
-+            "keywords": [
-+                "mvc",
-+                "zf2"
-+            ],
-+            "time": "2018-05-03T13:13:41+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-psr7bridge",
-+            "version": "0.2.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-psr7bridge.git",
-+                "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-psr7bridge/zipball/86c0b53b0c6381391c4add4a93a56e51d5c74605",
-+                "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.5",
-+                "psr/http-message": "^1.0",
-+                "zendframework/zend-diactoros": "^1.1",
-+                "zendframework/zend-http": "^2.5"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.7",
-+                "squizlabs/php_codesniffer": "^2.3"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.0-dev",
-+                    "dev-develop": "1.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Psr7Bridge\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "PSR-7 <-> Zend\\Http bridge",
-+            "homepage": "https://github.com/zendframework/zend-psr7bridge",
-+            "keywords": [
-+                "http",
-+                "psr",
-+                "psr-7"
-+            ],
-+            "time": "2016-05-10T21:44:39+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-serializer",
-+            "version": "2.9.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-serializer.git",
-+                "reference": "0172690db48d8935edaf625c4cba38b79719892c"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/0172690db48d8935edaf625c4cba38b79719892c",
-+                "reference": "0172690db48d8935edaf625c4cba38b79719892c",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-json": "^2.5 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.25 || ^6.4.4",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-math": "^2.6 || ^3.0",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-+            },
-+            "suggest": {
-+                "zendframework/zend-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
-+                "zendframework/zend-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.9.x-dev",
-+                    "dev-develop": "2.10.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Serializer",
-+                    "config-provider": "Zend\\Serializer\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Serializer\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
-+            "keywords": [
-+                "ZendFramework",
-+                "serializer",
-+                "zf"
-+            ],
-+            "time": "2018-05-14T18:45:18+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-server",
-+            "version": "2.8.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-server.git",
-+                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/23a2e9a5599c83c05da831cb7c649e8a7809595e",
-+                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-code": "^2.5 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.5 || ^3.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.8.x-dev",
-+                    "dev-develop": "2.9.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Server\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Create Reflection-based RPC servers",
-+            "keywords": [
-+                "ZendFramework",
-+                "server",
-+                "zf"
-+            ],
-+            "time": "2018-04-30T22:21:28+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-servicemanager",
-+            "version": "2.7.11",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-servicemanager.git",
-+                "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/99ec9ed5d0f15aed9876433c74c2709eb933d4c7",
-+                "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "container-interop/container-interop": "~1.0",
-+                "php": "^5.5 || ^7.0"
-+            },
-+            "require-dev": {
-+                "athletic/athletic": "dev-master",
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0",
-+                "zendframework/zend-di": "~2.5",
-+                "zendframework/zend-mvc": "~2.5"
-+            },
-+            "suggest": {
-+                "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
-+                "zendframework/zend-di": "Zend\\Di component"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "3.0-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\ServiceManager\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "homepage": "https://github.com/zendframework/zend-servicemanager",
-+            "keywords": [
-+                "servicemanager",
-+                "zf2"
-+            ],
-+            "time": "2018-06-22T14:49:54+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-session",
-+            "version": "2.8.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-session.git",
-+                "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-session/zipball/2cfd90e1a2f6b066b9f908599251d8f64f07021b",
-+                "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "require-dev": {
-+                "container-interop/container-interop": "^1.1",
-+                "mongodb/mongodb": "^1.0.1",
-+                "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
-+                "phpunit/phpunit": "^5.7.5 || >=6.0.13 <6.5.0",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-db": "^2.7",
-+                "zendframework/zend-http": "^2.5.4",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-validator": "^2.6"
-+            },
-+            "suggest": {
-+                "mongodb/mongodb": "If you want to use the MongoDB session save handler",
-+                "zendframework/zend-cache": "Zend\\Cache component",
-+                "zendframework/zend-db": "Zend\\Db component",
-+                "zendframework/zend-http": "Zend\\Http component",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-+                "zendframework/zend-validator": "Zend\\Validator component"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.8-dev",
-+                    "dev-develop": "2.9-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Session",
-+                    "config-provider": "Zend\\Session\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Session\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "manage and preserve session data, a logical complement of cookie data, across multiple page requests by the same client",
-+            "keywords": [
-+                "ZendFramework",
-+                "session",
-+                "zf"
-+            ],
-+            "time": "2018-02-22T16:33:54+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-soap",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-soap.git",
-+                "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/af03c32f0db2b899b3df8cfe29aeb2b49857d284",
-+                "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-soap": "*",
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-server": "^2.6.1",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-+                "zendframework/zend-uri": "^2.5.2"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.21 || ^6.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-http": "^2.5.4"
-+            },
-+            "suggest": {
-+                "zendframework/zend-http": "Zend\\Http component"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Soap\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "homepage": "https://github.com/zendframework/zend-soap",
-+            "keywords": [
-+                "soap",
-+                "zf2"
-+            ],
-+            "time": "2018-01-29T17:51:26+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-stdlib",
-+            "version": "2.7.7",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-stdlib.git",
-+                "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/0e44eb46788f65e09e077eb7f44d2659143bcc1f",
-+                "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-hydrator": "~1.1"
-+            },
-+            "require-dev": {
-+                "athletic/athletic": "~0.1",
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0",
-+                "zendframework/zend-config": "~2.5",
-+                "zendframework/zend-eventmanager": "~2.5",
-+                "zendframework/zend-filter": "~2.5",
-+                "zendframework/zend-inputfilter": "~2.5",
-+                "zendframework/zend-serializer": "~2.5",
-+                "zendframework/zend-servicemanager": "~2.5"
-+            },
-+            "suggest": {
-+                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
-+                "zendframework/zend-filter": "To support naming strategy hydrator usage",
-+                "zendframework/zend-serializer": "Zend\\Serializer component",
-+                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-release-2.7": "2.7-dev",
-+                    "dev-master": "3.0-dev",
-+                    "dev-develop": "3.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Stdlib\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "homepage": "https://github.com/zendframework/zend-stdlib",
-+            "keywords": [
-+                "stdlib",
-+                "zf2"
-+            ],
-+            "time": "2016-04-12T21:17:31+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-text",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-text.git",
-+                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-text/zipball/ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
-+                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Text\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Create FIGlets and text-based tables",
-+            "keywords": [
-+                "ZendFramework",
-+                "text",
-+                "zf"
-+            ],
-+            "time": "2018-04-30T14:55:10+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-uri",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-uri.git",
-+                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/b2785cd38fe379a784645449db86f21b7739b1ee",
-+                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-escaper": "^2.5",
-+                "zendframework/zend-validator": "^2.10"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Uri\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "A component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
-+            "keywords": [
-+                "ZendFramework",
-+                "uri",
-+                "zf"
-+            ],
-+            "time": "2019-02-27T21:39:04+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-validator",
-+            "version": "2.11.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-validator.git",
-+                "reference": "3c28dfe4e5951ba38059cea895244d9d206190b3"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/3c28dfe4e5951ba38059cea895244d9d206190b3",
-+                "reference": "3c28dfe4e5951ba38059cea895244d9d206190b3",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "container-interop/container-interop": "^1.1",
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7.6 || ^3.1"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
-+                "psr/http-message": "^1.0",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-db": "^2.7",
-+                "zendframework/zend-filter": "^2.6",
-+                "zendframework/zend-http": "^2.5.4",
-+                "zendframework/zend-i18n": "^2.6",
-+                "zendframework/zend-math": "^2.6",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-session": "^2.8",
-+                "zendframework/zend-uri": "^2.5"
-+            },
-+            "suggest": {
-+                "psr/http-message": "psr/http-message, required when validating PSR-7 UploadedFileInterface instances via the Upload and UploadFile validators",
-+                "zendframework/zend-db": "Zend\\Db component, required by the (No)RecordExists validator",
-+                "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
-+                "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages",
-+                "zendframework/zend-i18n-resources": "Translations of validator messages",
-+                "zendframework/zend-math": "Zend\\Math component, required by the Csrf validator",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
-+                "zendframework/zend-session": "Zend\\Session component, ^2.8; required by the Csrf validator",
-+                "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.11.x-dev",
-+                    "dev-develop": "2.12.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Validator",
-+                    "config-provider": "Zend\\Validator\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Validator\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "provides a set of commonly needed validators",
-+            "homepage": "https://github.com/zendframework/zend-validator",
-+            "keywords": [
-+                "validator",
-+                "zf2"
-+            ],
-+            "time": "2019-01-29T22:26:39+00:00"
-+        },
-+        {
-+            "name": "zendframework/zend-view",
-+            "version": "2.10.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-view.git",
-+                "reference": "c1a3f2043fb75b5983ab9adfc369ae396601be7e"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/c1a3f2043fb75b5983ab9adfc369ae396601be7e",
-+                "reference": "c1a3f2043fb75b5983ab9adfc369ae396601be7e",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-json": "^2.6.1",
-+                "zendframework/zend-loader": "^2.5",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.15 || ^6.0.8",
-+                "zendframework/zend-authentication": "^2.5",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-console": "^2.6",
-+                "zendframework/zend-escaper": "^2.5",
-+                "zendframework/zend-feed": "^2.7",
-+                "zendframework/zend-filter": "^2.6.1",
-+                "zendframework/zend-http": "^2.5.4",
-+                "zendframework/zend-i18n": "^2.6",
-+                "zendframework/zend-log": "^2.7",
-+                "zendframework/zend-modulemanager": "^2.7.1",
-+                "zendframework/zend-mvc": "^2.7.14 || ^3.0",
-+                "zendframework/zend-navigation": "^2.5",
-+                "zendframework/zend-paginator": "^2.5",
-+                "zendframework/zend-permissions-acl": "^2.6",
-+                "zendframework/zend-router": "^3.0.1",
-+                "zendframework/zend-serializer": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-session": "^2.8.1",
-+                "zendframework/zend-uri": "^2.5"
-+            },
-+            "suggest": {
-+                "zendframework/zend-authentication": "Zend\\Authentication component",
-+                "zendframework/zend-escaper": "Zend\\Escaper component",
-+                "zendframework/zend-feed": "Zend\\Feed component",
-+                "zendframework/zend-filter": "Zend\\Filter component",
-+                "zendframework/zend-http": "Zend\\Http component",
-+                "zendframework/zend-i18n": "Zend\\I18n component",
-+                "zendframework/zend-mvc": "Zend\\Mvc component",
-+                "zendframework/zend-mvc-plugin-flashmessenger": "zend-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with zend-mvc versions 3 and up",
-+                "zendframework/zend-navigation": "Zend\\Navigation component",
-+                "zendframework/zend-paginator": "Zend\\Paginator component",
-+                "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-+                "zendframework/zend-uri": "Zend\\Uri component"
-+            },
-+            "bin": [
-+                "bin/templatemap_generator.php"
-+            ],
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\View\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "provides a system of helpers, output filters, and variable escaping",
-+            "homepage": "https://github.com/zendframework/zend-view",
-+            "keywords": [
-+                "view",
-+                "zf2"
-+            ],
-+            "time": "2018-12-06T21:20:01+00:00"
-+        }
-+    ],
-+    "packages-dev": [
-+        {
-+            "name": "allure-framework/allure-codeception",
-+            "version": "1.3.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/allure-framework/allure-codeception.git",
-+                "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/9d31d781b3622b028f1f6210bc76ba88438bd518",
-+                "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "allure-framework/allure-php-api": "~1.1.0",
-+                "codeception/codeception": "~2.1",
-+                "php": ">=5.4.0",
-+                "symfony/filesystem": ">=2.6",
-+                "symfony/finder": ">=2.6"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Yandex": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Ivan Krutov",
-+                    "email": "vania-pooh@yandex-team.ru",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "A Codeception adapter for Allure report.",
-+            "homepage": "http://allure.qatools.ru/",
-+            "keywords": [
-+                "allure",
-+                "attachments",
-+                "cases",
-+                "codeception",
-+                "report",
-+                "steps",
-+                "testing"
-+            ],
-+            "time": "2018-12-18T19:47:23+00:00"
-+        },
-+        {
-+            "name": "allure-framework/allure-php-api",
-+            "version": "1.1.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/allure-framework/allure-php-adapter-api.git",
-+                "reference": "a462a0da121681577033e13c123b6cc4e89cdc64"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/allure-framework/allure-php-adapter-api/zipball/a462a0da121681577033e13c123b6cc4e89cdc64",
-+                "reference": "a462a0da121681577033e13c123b6cc4e89cdc64",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "jms/serializer": ">=0.16.0",
-+                "moontoast/math": ">=1.1.0",
-+                "php": ">=5.4.0",
-+                "phpunit/phpunit": ">=4.0.0",
-+                "ramsey/uuid": ">=3.0.0",
-+                "symfony/http-foundation": ">=2.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Yandex": [
-+                        "src/",
-+                        "test/"
-+                    ]
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Ivan Krutov",
-+                    "email": "vania-pooh@yandex-team.ru",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "PHP API for Allure adapter",
-+            "homepage": "http://allure.qatools.ru/",
-+            "keywords": [
-+                "allure",
-+                "api",
-+                "php",
-+                "report"
-+            ],
-+            "time": "2016-12-07T12:15:46+00:00"
-+        },
-+        {
-+            "name": "allure-framework/allure-phpunit",
-+            "version": "1.2.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/allure-framework/allure-phpunit.git",
-+                "reference": "45504aeba41304cf155a898fa9ac1aae79f4a089"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/allure-framework/allure-phpunit/zipball/45504aeba41304cf155a898fa9ac1aae79f4a089",
-+                "reference": "45504aeba41304cf155a898fa9ac1aae79f4a089",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "allure-framework/allure-php-api": "~1.1.0",
-+                "mikey179/vfsstream": "1.*",
-+                "php": ">=7.0.0",
-+                "phpunit/phpunit": ">=6.0.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Yandex": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Ivan Krutov",
-+                    "email": "vania-pooh@yandex-team.ru",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "A PHPUnit adapter for Allure report.",
-+            "homepage": "http://allure.qatools.ru/",
-+            "keywords": [
-+                "allure",
-+                "attachments",
-+                "cases",
-+                "phpunit",
-+                "report",
-+                "steps",
-+                "testing"
-+            ],
-+            "time": "2017-11-03T13:08:21+00:00"
-+        },
-+        {
-+            "name": "behat/gherkin",
-+            "version": "v4.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Behat/Gherkin.git",
-+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07",
-+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.1"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.5|~5",
-+                "symfony/phpunit-bridge": "~2.7|~3|~4",
-+                "symfony/yaml": "~2.3|~3|~4"
-+            },
-+            "suggest": {
-+                "symfony/yaml": "If you want to parse features, represented in YAML files"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.4-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "Behat\\Gherkin": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Konstantin Kudryashov",
-+                    "email": "ever.zet@gmail.com",
-+                    "homepage": "http://everzet.com"
-+                }
-+            ],
-+            "description": "Gherkin DSL parser for PHP 5.3",
-+            "homepage": "http://behat.org/",
-+            "keywords": [
-+                "BDD",
-+                "Behat",
-+                "Cucumber",
-+                "DSL",
-+                "gherkin",
-+                "parser"
-+            ],
-+            "time": "2019-01-16T14:22:17+00:00"
-+        },
-+        {
-+            "name": "codeception/codeception",
-+            "version": "2.4.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Codeception/Codeception.git",
-+                "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/5fee32d5c82791548931cbc34806b4de6aa1abfc",
-+                "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "behat/gherkin": "^4.4.0",
-+                "codeception/phpunit-wrapper": "^6.0.9|^7.0.6",
-+                "codeception/stub": "^2.0",
-+                "ext-json": "*",
-+                "ext-mbstring": "*",
-+                "facebook/webdriver": ">=1.1.3 <2.0",
-+                "guzzlehttp/guzzle": ">=4.1.4 <7.0",
-+                "guzzlehttp/psr7": "~1.0",
-+                "php": ">=5.6.0 <8.0",
-+                "symfony/browser-kit": ">=2.7 <5.0",
-+                "symfony/console": ">=2.7 <5.0",
-+                "symfony/css-selector": ">=2.7 <5.0",
-+                "symfony/dom-crawler": ">=2.7 <5.0",
-+                "symfony/event-dispatcher": ">=2.7 <5.0",
-+                "symfony/finder": ">=2.7 <5.0",
-+                "symfony/yaml": ">=2.7 <5.0"
-+            },
-+            "require-dev": {
-+                "codeception/specify": "~0.3",
-+                "facebook/graph-sdk": "~5.3",
-+                "flow/jsonpath": "~0.2",
-+                "monolog/monolog": "~1.8",
-+                "pda/pheanstalk": "~3.0",
-+                "php-amqplib/php-amqplib": "~2.4",
-+                "predis/predis": "^1.0",
-+                "squizlabs/php_codesniffer": "~2.0",
-+                "symfony/process": ">=2.7 <5.0",
-+                "vlucas/phpdotenv": "^2.4.0"
-+            },
-+            "suggest": {
-+                "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module",
-+                "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests",
-+                "codeception/specify": "BDD-style code blocks",
-+                "codeception/verify": "BDD-style assertions",
-+                "flow/jsonpath": "For using JSONPath in REST module",
-+                "league/factory-muffin": "For DataFactory module",
-+                "league/factory-muffin-faker": "For Faker support in DataFactory module",
-+                "phpseclib/phpseclib": "for SFTP option in FTP Module",
-+                "stecman/symfony-console-completion": "For BASH autocompletion",
-+                "symfony/phpunit-bridge": "For phpunit-bridge support"
-+            },
-+            "bin": [
-+                "codecept"
-+            ],
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": []
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Codeception\\": "src\\Codeception",
-+                    "Codeception\\Extension\\": "ext"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Bodnarchuk",
-+                    "email": "davert@mail.ua",
-+                    "homepage": "http://codegyre.com"
-+                }
-+            ],
-+            "description": "BDD-style testing framework",
-+            "homepage": "http://codeception.com/",
-+            "keywords": [
-+                "BDD",
-+                "TDD",
-+                "acceptance testing",
-+                "functional testing",
-+                "unit testing"
-+            ],
-+            "time": "2018-08-01T07:21:49+00:00"
-+        },
-+        {
-+            "name": "codeception/phpunit-wrapper",
-+            "version": "6.6.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Codeception/phpunit-wrapper.git",
-+                "reference": "d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c",
-+                "reference": "d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "phpunit/php-code-coverage": ">=4.0.4 <6.0",
-+                "phpunit/phpunit": ">=6.5.13 <7.0",
-+                "sebastian/comparator": ">=1.2.4 <3.0",
-+                "sebastian/diff": ">=1.4 <4.0"
-+            },
-+            "replace": {
-+                "codeception/phpunit-wrapper": "*"
-+            },
-+            "require-dev": {
-+                "codeception/specify": "*",
-+                "vlucas/phpdotenv": "^3.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Codeception\\PHPUnit\\": "src\\"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Davert",
-+                    "email": "davert.php@resend.cc"
-+                }
-+            ],
-+            "description": "PHPUnit classes used by Codeception",
-+            "time": "2019-02-26T20:47:39+00:00"
-+        },
-+        {
-+            "name": "codeception/stub",
-+            "version": "2.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Codeception/Stub.git",
-+                "reference": "853657f988942f7afb69becf3fd0059f192c705a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/853657f988942f7afb69becf3fd0059f192c705a",
-+                "reference": "853657f988942f7afb69becf3fd0059f192c705a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Codeception\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-+            "time": "2019-03-02T15:35:10+00:00"
-+        },
-+        {
-+            "name": "consolidation/annotated-command",
-+            "version": "2.11.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/annotated-command.git",
-+                "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/004af26391cd7d1cd04b0ac736dc1324d1b4f572",
-+                "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "consolidation/output-formatters": "^3.4",
-+                "php": ">=5.4.5",
-+                "psr/log": "^1",
-+                "symfony/console": "^2.8|^3|^4",
-+                "symfony/event-dispatcher": "^2.5|^3|^4",
-+                "symfony/finder": "^2.5|^3|^4"
-+            },
-+            "require-dev": {
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/phpunit": "^6",
-+                "squizlabs/php_codesniffer": "^2.7"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        },
-+                        "scenario-options": {
-+                            "create-lockfile": "false"
-+                        }
-+                    },
-+                    "phpunit4": {
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Consolidation\\AnnotatedCommand\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                }
-+            ],
-+            "description": "Initialize Symfony Console commands from annotated command class methods.",
-+            "time": "2019-02-02T02:29:53+00:00"
-+        },
-+        {
-+            "name": "consolidation/config",
-+            "version": "1.2.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/config.git",
-+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
-+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "dflydev/dot-access-data": "^1.1.0",
-+                "grasmash/expander": "^1",
-+                "php": ">=5.4.0"
-+            },
-+            "require-dev": {
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/phpunit": "^5",
-+                "squizlabs/php_codesniffer": "2.*",
-+                "symfony/console": "^2.5|^3|^4",
-+                "symfony/yaml": "^2.8.11|^3|^4"
-+            },
-+            "suggest": {
-+                "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require-dev": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require-dev": {
-+                            "symfony/console": "^2.8",
-+                            "symfony/event-dispatcher": "^2.8",
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Consolidation\\Config\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                }
-+            ],
-+            "description": "Provide configuration services for a commandline tool.",
-+            "time": "2019-03-03T19:37:04+00:00"
-+        },
-+        {
-+            "name": "consolidation/log",
-+            "version": "1.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/log.git",
-+                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
-+                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.4.5",
-+                "psr/log": "^1.0",
-+                "symfony/console": "^2.8|^3|^4"
-+            },
-+            "require-dev": {
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/phpunit": "^6",
-+                "squizlabs/php_codesniffer": "^2"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    },
-+                    "phpunit4": {
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Consolidation\\Log\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                }
-+            ],
-+            "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
-+            "time": "2019-01-01T17:30:51+00:00"
-+        },
-+        {
-+            "name": "consolidation/output-formatters",
-+            "version": "3.4.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/output-formatters.git",
-+                "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/a942680232094c4a5b21c0b7e54c20cce623ae19",
-+                "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "dflydev/dot-access-data": "^1.1.0",
-+                "php": ">=5.4.0",
-+                "symfony/console": "^2.8|^3|^4",
-+                "symfony/finder": "^2.5|^3|^4"
-+            },
-+            "require-dev": {
-+                "g1a/composer-test-scenarios": "^2",
-+                "phpunit/phpunit": "^5.7.27",
-+                "satooshi/php-coveralls": "^2",
-+                "squizlabs/php_codesniffer": "^2.7",
-+                "symfony/console": "3.2.3",
-+                "symfony/var-dumper": "^2.8|^3|^4",
-+                "victorjonsson/markdowndocs": "^1.3"
-+            },
-+            "suggest": {
-+                "symfony/var-dumper": "For using the var_dump formatter"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "3.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Consolidation\\OutputFormatters\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                }
-+            ],
-+            "description": "Format text by applying transformations provided by plug-in formatters.",
-+            "time": "2018-10-19T22:35:38+00:00"
-+        },
-+        {
-+            "name": "consolidation/robo",
-+            "version": "1.4.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/Robo.git",
-+                "reference": "d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3",
-+                "reference": "d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "consolidation/annotated-command": "^2.10.2",
-+                "consolidation/config": "^1.0.10",
-+                "consolidation/log": "~1",
-+                "consolidation/output-formatters": "^3.1.13",
-+                "consolidation/self-update": "^1",
-+                "grasmash/yaml-expander": "^1.3",
-+                "league/container": "^2.2",
-+                "php": ">=5.5.0",
-+                "symfony/console": "^2.8|^3|^4",
-+                "symfony/event-dispatcher": "^2.5|^3|^4",
-+                "symfony/filesystem": "^2.5|^3|^4",
-+                "symfony/finder": "^2.5|^3|^4",
-+                "symfony/process": "^2.5|^3|^4"
-+            },
-+            "replace": {
-+                "codegyre/robo": "< 1.0"
-+            },
-+            "require-dev": {
-+                "codeception/aspect-mock": "^1|^2.1.1",
-+                "codeception/base": "^2.3.7",
-+                "codeception/verify": "^0.3.2",
-+                "g1a/composer-test-scenarios": "^3",
-+                "goaop/framework": "~2.1.2",
-+                "goaop/parser-reflection": "^1.1.0",
-+                "natxet/cssmin": "3.0.4",
-+                "nikic/php-parser": "^3.1.5",
-+                "patchwork/jsqueeze": "~2",
-+                "pear/archive_tar": "^1.4.4",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/php-code-coverage": "~2|~4",
-+                "squizlabs/php_codesniffer": "^2.8"
-+            },
-+            "suggest": {
-+                "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch",
-+                "natxet/CssMin": "For minifying CSS files in taskMinify",
-+                "patchwork/jsqueeze": "For minifying JS files in taskMinify",
-+                "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively."
-+            },
-+            "bin": [
-+                "robo"
-+            ],
-+            "type": "library",
-+            "extra": {
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "remove": [
-+                            "goaop/framework"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.5.9"
-+                            }
-+                        },
-+                        "scenario-options": {
-+                            "create-lockfile": "false"
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Robo\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Davert",
-+                    "email": "davert.php@resend.cc"
-+                }
-+            ],
-+            "description": "Modern task runner",
-+            "time": "2019-02-17T05:32:27+00:00"
-+        },
-+        {
-+            "name": "consolidation/self-update",
-+            "version": "1.1.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/self-update.git",
-+                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/consolidation/self-update/zipball/a1c273b14ce334789825a09d06d4c87c0a02ad54",
-+                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.5.0",
-+                "symfony/console": "^2.8|^3|^4",
-+                "symfony/filesystem": "^2.5|^3|^4"
-+            },
-+            "bin": [
-+                "scripts/release"
-+            ],
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "SelfUpdate\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                },
-+                {
-+                    "name": "Alexander Menk",
-+                    "email": "menk@mestrona.net"
-+                }
-+            ],
-+            "description": "Provides a self:update command for Symfony Console applications.",
-+            "time": "2018-10-28T01:52:03+00:00"
-+        },
-+        {
-+            "name": "dflydev/dot-access-data",
-+            "version": "v1.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
-+                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a",
-+                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.2"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.0-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "Dflydev\\DotAccessData": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Dragonfly Development Inc.",
-+                    "email": "info@dflydev.com",
-+                    "homepage": "http://dflydev.com"
-+                },
-+                {
-+                    "name": "Beau Simensen",
-+                    "email": "beau@dflydev.com",
-+                    "homepage": "http://beausimensen.com"
-+                },
-+                {
-+                    "name": "Carlos Frutos",
-+                    "email": "carlos@kiwing.it",
-+                    "homepage": "https://github.com/cfrutos"
-+                }
-+            ],
-+            "description": "Given a deep data structure, access data by dot notation.",
-+            "homepage": "https://github.com/dflydev/dflydev-dot-access-data",
-+            "keywords": [
-+                "access",
-+                "data",
-+                "dot",
-+                "notation"
-+            ],
-+            "time": "2017-01-20T21:14:22+00:00"
-+        },
-+        {
-+            "name": "doctrine/annotations",
-+            "version": "v1.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/doctrine/annotations.git",
-+                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
-+                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "doctrine/lexer": "1.*",
-+                "php": "^7.1"
-+            },
-+            "require-dev": {
-+                "doctrine/cache": "1.*",
-+                "phpunit/phpunit": "^6.4"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.6.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Roman Borschel",
-+                    "email": "roman@code-factory.org"
-+                },
-+                {
-+                    "name": "Benjamin Eberlei",
-+                    "email": "kontakt@beberlei.de"
-+                },
-+                {
-+                    "name": "Guilherme Blanco",
-+                    "email": "guilhermeblanco@gmail.com"
-+                },
-+                {
-+                    "name": "Jonathan Wage",
-+                    "email": "jonwage@gmail.com"
-+                },
-+                {
-+                    "name": "Johannes Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "Docblock Annotations Parser",
-+            "homepage": "http://www.doctrine-project.org",
-+            "keywords": [
-+                "annotations",
-+                "docblock",
-+                "parser"
-+            ],
-+            "time": "2017-12-06T07:11:42+00:00"
-+        },
-+        {
-+            "name": "doctrine/collections",
-+            "version": "v1.5.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/doctrine/collections.git",
-+                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
-+                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1"
-+            },
-+            "require-dev": {
-+                "doctrine/coding-standard": "~0.1@dev",
-+                "phpunit/phpunit": "^5.7"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.3.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "Doctrine\\Common\\Collections\\": "lib/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Roman Borschel",
-+                    "email": "roman@code-factory.org"
-+                },
-+                {
-+                    "name": "Benjamin Eberlei",
-+                    "email": "kontakt@beberlei.de"
-+                },
-+                {
-+                    "name": "Guilherme Blanco",
-+                    "email": "guilhermeblanco@gmail.com"
-+                },
-+                {
-+                    "name": "Jonathan Wage",
-+                    "email": "jonwage@gmail.com"
-+                },
-+                {
-+                    "name": "Johannes Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "Collections Abstraction library",
-+            "homepage": "http://www.doctrine-project.org",
-+            "keywords": [
-+                "array",
-+                "collections",
-+                "iterator"
-+            ],
-+            "time": "2017-07-22T10:37:32+00:00"
-+        },
-+        {
-+            "name": "doctrine/instantiator",
-+            "version": "1.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/doctrine/instantiator.git",
-+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1"
-+            },
-+            "require-dev": {
-+                "athletic/athletic": "~0.1.8",
-+                "ext-pdo": "*",
-+                "ext-phar": "*",
-+                "phpunit/phpunit": "^6.2.3",
-+                "squizlabs/php_codesniffer": "^3.0.2"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Marco Pivetta",
-+                    "email": "ocramius@gmail.com",
-+                    "homepage": "http://ocramius.github.com/"
-+                }
-+            ],
-+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-+            "homepage": "https://github.com/doctrine/instantiator",
-+            "keywords": [
-+                "constructor",
-+                "instantiate"
-+            ],
-+            "time": "2017-07-22T11:58:36+00:00"
-+        },
-+        {
-+            "name": "doctrine/lexer",
-+            "version": "v1.0.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/doctrine/lexer.git",
-+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
-+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.2"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "Doctrine\\Common\\Lexer\\": "lib/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
--            "include-path": [
--                "library/"
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Roman Borschel",
-+                    "email": "roman@code-factory.org"
-+                },
-+                {
-+                    "name": "Guilherme Blanco",
-+                    "email": "guilhermeblanco@gmail.com"
-+                },
-+                {
-+                    "name": "Johannes Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
-+            "homepage": "http://www.doctrine-project.org",
-+            "keywords": [
-+                "lexer",
-+                "parser"
-             ],
-+            "time": "2014-09-09T13:34:57+00:00"
-+        },
-+        {
-+            "name": "epfremme/swagger-php",
-+            "version": "v2.0.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/epfremmer/swagger-php.git",
-+                "reference": "eee28a442b7e6220391ec953d3c9b936354f23bc"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/epfremmer/swagger-php/zipball/eee28a442b7e6220391ec953d3c9b936354f23bc",
-+                "reference": "eee28a442b7e6220391ec953d3c9b936354f23bc",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "doctrine/annotations": "^1.2",
-+                "doctrine/collections": "^1.3",
-+                "jms/serializer": "^1.1",
-+                "php": ">=5.5",
-+                "phpoption/phpoption": "^1.1",
-+                "symfony/yaml": "^2.7|^3.1"
-+            },
-+            "require-dev": {
-+                "mockery/mockery": "^0.9.4",
-+                "phpunit/phpunit": "~4.8|~5.0",
-+                "satooshi/php-coveralls": "^1.0"
-+            },
-+            "type": "package",
-+            "autoload": {
-+                "psr-4": {
-+                    "Epfremme\\Swagger\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "description": "Magento Zend Framework 1",
--            "homepage": "http://framework.zend.com/",
-+            "authors": [
-+                {
-+                    "name": "Edward Pfremmer",
-+                    "email": "epfremme@nerdery.com"
-+                }
-+            ],
-+            "description": "Library for parsing swagger documentation into PHP entities for use in testing and code generation",
-+            "time": "2016-09-26T17:24:17+00:00"
-+        },
-+        {
-+            "name": "facebook/webdriver",
-+            "version": "1.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/facebook/php-webdriver.git",
-+                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/bd8c740097eb9f2fc3735250fc1912bc811a954e",
-+                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-curl": "*",
-+                "ext-json": "*",
-+                "ext-mbstring": "*",
-+                "ext-zip": "*",
-+                "php": "^5.6 || ~7.0",
-+                "symfony/process": "^2.8 || ^3.1 || ^4.0"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "^2.0",
-+                "jakub-onderka/php-parallel-lint": "^0.9.2",
-+                "php-coveralls/php-coveralls": "^2.0",
-+                "php-mock/php-mock-phpunit": "^1.1",
-+                "phpunit/phpunit": "^5.7",
-+                "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
-+                "squizlabs/php_codesniffer": "^2.6",
-+                "symfony/var-dumper": "^3.3 || ^4.0"
-+            },
-+            "suggest": {
-+                "ext-SimpleXML": "For Firefox profile creation"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-community": "1.5-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Facebook\\WebDriver\\": "lib/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "description": "A PHP client for Selenium WebDriver",
-+            "homepage": "https://github.com/facebook/php-webdriver",
-+            "keywords": [
-+                "facebook",
-+                "php",
-+                "selenium",
-+                "webdriver"
-+            ],
-+            "time": "2018-05-16T17:37:13+00:00"
-+        },
-+        {
-+            "name": "flow/jsonpath",
-+            "version": "0.4.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/FlowCommunications/JSONPath.git",
-+                "reference": "f0222818d5c938e4ab668ab2e2c079bd51a27112"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/FlowCommunications/JSONPath/zipball/f0222818d5c938e4ab668ab2e2c079bd51a27112",
-+                "reference": "f0222818d5c938e4ab668ab2e2c079bd51a27112",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.4.0"
-+            },
-+            "require-dev": {
-+                "peekmo/jsonpath": "dev-master",
-+                "phpunit/phpunit": "^4.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Flow\\JSONPath": "src/",
-+                    "Flow\\JSONPath\\Test": "tests/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Stephen Frank",
-+                    "email": "stephen@flowsa.com"
-+                }
-+            ],
-+            "description": "JSONPath implementation for parsing, searching and flattening arrays",
-+            "time": "2018-03-04T16:39:47+00:00"
-+        },
-+        {
-+            "name": "friendsofphp/php-cs-fixer",
-+            "version": "v2.13.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-+                "reference": "38d6f2e9be2aa80bf3c7365612af7f9eb9078719"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/38d6f2e9be2aa80bf3c7365612af7f9eb9078719",
-+                "reference": "38d6f2e9be2aa80bf3c7365612af7f9eb9078719",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "composer/semver": "^1.4",
-+                "composer/xdebug-handler": "^1.2",
-+                "doctrine/annotations": "^1.2",
-+                "ext-json": "*",
-+                "ext-tokenizer": "*",
-+                "php": "^5.6 || >=7.0 <7.3",
-+                "php-cs-fixer/diff": "^1.3",
-+                "symfony/console": "^3.4.17 || ^4.1.6",
-+                "symfony/event-dispatcher": "^3.0 || ^4.0",
-+                "symfony/filesystem": "^3.0 || ^4.0",
-+                "symfony/finder": "^3.0 || ^4.0",
-+                "symfony/options-resolver": "^3.0 || ^4.0",
-+                "symfony/polyfill-php70": "^1.0",
-+                "symfony/polyfill-php72": "^1.4",
-+                "symfony/process": "^3.0 || ^4.0",
-+                "symfony/stopwatch": "^3.0 || ^4.0"
-+            },
-+            "conflict": {
-+                "hhvm": "*"
-+            },
-+            "require-dev": {
-+                "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
-+                "justinrainbow/json-schema": "^5.0",
-+                "keradus/cli-executor": "^1.2",
-+                "mikey179/vfsstream": "^1.6",
-+                "php-coveralls/php-coveralls": "^2.1",
-+                "php-cs-fixer/accessible-object": "^1.0",
-+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1",
-+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1",
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
-+                "phpunitgoodpractices/traits": "^1.5.1",
-+                "symfony/phpunit-bridge": "^4.0"
-+            },
-+            "suggest": {
-+                "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
-+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
-+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
-+                "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
-+            },
-+            "bin": [
-+                "php-cs-fixer"
-+            ],
-+            "type": "application",
-+            "autoload": {
-+                "psr-4": {
-+                    "PhpCsFixer\\": "src/"
-+                },
-+                "classmap": [
-+                    "tests/Test/AbstractFixerTestCase.php",
-+                    "tests/Test/AbstractIntegrationCaseFactory.php",
-+                    "tests/Test/AbstractIntegrationTestCase.php",
-+                    "tests/Test/Assert/AssertTokensTrait.php",
-+                    "tests/Test/IntegrationCase.php",
-+                    "tests/Test/IntegrationCaseFactory.php",
-+                    "tests/Test/IntegrationCaseFactoryInterface.php",
-+                    "tests/Test/InternalIntegrationCaseFactory.php",
-+                    "tests/TestCase.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Dariusz Rumiński",
-+                    "email": "dariusz.ruminski@gmail.com"
-+                },
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                }
-+            ],
-+            "description": "A tool to automatically fix PHP code style",
-+            "time": "2019-01-04T18:24:28+00:00"
-+        },
-+        {
-+            "name": "fzaninotto/faker",
-+            "version": "v1.8.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/fzaninotto/Faker.git",
-+                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
-+                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.3.3 || ^7.0"
-+            },
-+            "require-dev": {
-+                "ext-intl": "*",
-+                "phpunit/phpunit": "^4.8.35 || ^5.7",
-+                "squizlabs/php_codesniffer": "^1.5"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.8-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Faker\\": "src/Faker/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "François Zaninotto"
-+                }
-+            ],
-+            "description": "Faker is a PHP library that generates fake data for you.",
-             "keywords": [
--                "ZF1",
--                "framework"
-+                "data",
-+                "faker",
-+                "fixtures"
-             ],
--            "time": "2015-02-06 17:25:45"
-+            "time": "2018-07-12T10:23:15+00:00"
-         },
-         {
--            "name": "monolog/monolog",
--            "version": "1.11.0",
-+            "name": "grasmash/expander",
-+            "version": "1.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/Seldaek/monolog.git",
--                "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa"
-+                "url": "https://github.com/grasmash/expander.git",
-+                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
--                "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
-+                "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f",
-+                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.0",
--                "psr/log": "~1.0"
--            },
--            "provide": {
--                "psr/log-implementation": "1.0.0"
-+                "dflydev/dot-access-data": "^1.1.0",
-+                "php": ">=5.4"
-             },
-             "require-dev": {
--                "aws/aws-sdk-php": "~2.4, >2.4.8",
--                "doctrine/couchdb": "~1.0@dev",
--                "graylog2/gelf-php": "~1.0",
--                "phpunit/phpunit": "~3.7.0",
--                "raven/raven": "~0.5",
--                "ruflin/elastica": "0.90.*",
--                "videlalvaro/php-amqplib": "~2.4"
--            },
--            "suggest": {
--                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
--                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
--                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
--                "ext-mongo": "Allow sending log messages to a MongoDB server",
--                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
--                "raven/raven": "Allow sending log messages to a Sentry server",
--                "rollbar/rollbar": "Allow sending log messages to Rollbar",
--                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
--                "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
-+                "greg-1-anderson/composer-test-scenarios": "^1",
-+                "phpunit/phpunit": "^4|^5.5.4",
-+                "satooshi/php-coveralls": "^1.0.2|dev-master",
-+                "squizlabs/php_codesniffer": "^2.7"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.11.x-dev"
-+                    "dev-master": "1.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Monolog\\": "src/Monolog"
-+                    "Grasmash\\Expander\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -321,240 +6075,214 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Jordi Boggiano",
--                    "email": "j.boggiano@seld.be",
--                    "homepage": "http://seld.be"
-+                    "name": "Matthew Grasmick"
-                 }
-             ],
--            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
--            "homepage": "http://github.com/Seldaek/monolog",
--            "keywords": [
--                "log",
--                "logging",
--                "psr-3"
--            ],
--            "time": "2014-09-30 13:30:58"
-+            "description": "Expands internal property references in PHP arrays file.",
-+            "time": "2017-12-21T22:14:55+00:00"
-         },
-         {
--            "name": "oyejorge/less.php",
--            "version": "v1.7.0.3",
-+            "name": "grasmash/yaml-expander",
-+            "version": "1.4.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/oyejorge/less.php.git",
--                "reference": "6e08ecb07e6f6d9170c23e8744c58fdd822ad0de"
-+                "url": "https://github.com/grasmash/yaml-expander.git",
-+                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/oyejorge/less.php/zipball/6e08ecb07e6f6d9170c23e8744c58fdd822ad0de",
--                "reference": "6e08ecb07e6f6d9170c23e8744c58fdd822ad0de",
-+                "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1",
-+                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.2"
-+                "dflydev/dot-access-data": "^1.1.0",
-+                "php": ">=5.4",
-+                "symfony/yaml": "^2.8.11|^3|^4"
-+            },
-+            "require-dev": {
-+                "greg-1-anderson/composer-test-scenarios": "^1",
-+                "phpunit/phpunit": "^4.8|^5.5.4",
-+                "satooshi/php-coveralls": "^1.0.2|dev-master",
-+                "squizlabs/php_codesniffer": "^2.7"
-             },
--            "bin": [
--                "bin/lessc"
--            ],
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-             "autoload": {
--                "psr-0": {
--                    "Less": "lib/"
--                },
--                "classmap": [
--                    "lessc.inc.php"
--                ]
-+                "psr-4": {
-+                    "Grasmash\\YamlExpander\\": "src/"
-+                }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "Apache-2.0"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Matt Agar",
--                    "homepage": "https://github.com/agar"
--                },
--                {
--                    "name": "Martin Jantošovič",
--                    "homepage": "https://github.com/Mordred"
--                },
--                {
--                    "name": "Josh Schmidt",
--                    "homepage": "https://github.com/oyejorge"
-+                    "name": "Matthew Grasmick"
-                 }
-             ],
--            "description": "PHP port of the Javascript version of LESS http://lesscss.org",
--            "homepage": "http://lessphp.gpeasy.com",
--            "keywords": [
--                "css",
--                "less",
--                "less.js",
--                "lesscss",
--                "php",
--                "stylesheet"
--            ],
--            "time": "2015-03-10 18:12:59"
-+            "description": "Expands internal property references in a yaml file.",
-+            "time": "2017-12-16T16:06:03+00:00"
-         },
-         {
--            "name": "phpseclib/phpseclib",
--            "version": "0.3.10",
-+            "name": "guzzlehttp/guzzle",
-+            "version": "6.3.3",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/phpseclib/phpseclib.git",
--                "reference": "d15bba1edcc7c89e09cc74c5d961317a8b947bf4"
-+                "url": "https://github.com/guzzle/guzzle.git",
-+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d15bba1edcc7c89e09cc74c5d961317a8b947bf4",
--                "reference": "d15bba1edcc7c89e09cc74c5d961317a8b947bf4",
-+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.0.0"
-+                "guzzlehttp/promises": "^1.0",
-+                "guzzlehttp/psr7": "^1.4",
-+                "php": ">=5.5"
-             },
-             "require-dev": {
--                "phing/phing": "~2.7",
--                "phpunit/phpunit": "~4.0",
--                "sami/sami": "~2.0",
--                "squizlabs/php_codesniffer": "~1.5"
-+                "ext-curl": "*",
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-+                "psr/log": "^1.0"
-             },
-             "suggest": {
--                "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
--                "ext-mcrypt": "Install the Mcrypt extension in order to speed up a wide variety of cryptographic operations.",
--                "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP < 4.3.3."
-+                "psr/log": "Required for using the Log middleware"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "0.3-dev"
-+                    "dev-master": "6.3-dev"
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Crypt": "phpseclib/",
--                    "File": "phpseclib/",
--                    "Math": "phpseclib/",
--                    "Net": "phpseclib/",
--                    "System": "phpseclib/"
--                },
-                 "files": [
--                    "phpseclib/Crypt/Random.php"
--                ]
-+                    "src/functions_include.php"
-+                ],
-+                "psr-4": {
-+                    "GuzzleHttp\\": "src/"
-+                }
-             },
-             "notification-url": "https://packagist.org/downloads/",
--            "include-path": [
--                "phpseclib/"
--            ],
-             "license": [
-                 "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Jim Wigginton",
--                    "email": "terrafrost@php.net",
--                    "role": "Lead Developer"
--                },
--                {
--                    "name": "Patrick Monnerat",
--                    "email": "pm@datasphere.ch",
--                    "role": "Developer"
--                },
--                {
--                    "name": "Andreas Fischer",
--                    "email": "bantu@phpbb.com",
--                    "role": "Developer"
--                },
--                {
--                    "name": "Hans-Jürgen Petrich",
--                    "email": "petrich@tronic-media.com",
--                    "role": "Developer"
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-                 }
-             ],
--            "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
--            "homepage": "http://phpseclib.sourceforge.net",
-+            "description": "Guzzle is a PHP HTTP client library",
-+            "homepage": "http://guzzlephp.org/",
-             "keywords": [
--                "BigInteger",
--                "aes",
--                "asn.1",
--                "asn1",
--                "blowfish",
--                "crypto",
--                "cryptography",
--                "encryption",
--                "rsa",
--                "security",
--                "sftp",
--                "signature",
--                "signing",
--                "ssh",
--                "twofish",
--                "x.509",
--                "x509"
-+                "client",
-+                "curl",
-+                "framework",
-+                "http",
-+                "http client",
-+                "rest",
-+                "web service"
-             ],
--            "time": "2015-01-28 21:50:33"
-+            "time": "2018-04-22T15:46:56+00:00"
-         },
-         {
--            "name": "psr/log",
--            "version": "1.0.0",
-+            "name": "guzzlehttp/promises",
-+            "version": "v1.3.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/php-fig/log.git",
--                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
-+                "url": "https://github.com/guzzle/promises.git",
-+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
--                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
-+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                 "shasum": ""
-             },
-+            "require": {
-+                "php": ">=5.5.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.0"
-+            },
-             "type": "library",
--            "autoload": {
--                "psr-0": {
--                    "Psr\\Log\\": ""
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.4-dev"
-                 }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "GuzzleHttp\\Promise\\": "src/"
-+                },
-+                "files": [
-+                    "src/functions_include.php"
-+                ]
-+            },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "PHP-FIG",
--                    "homepage": "http://www.php-fig.org/"
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-                 }
-             ],
--            "description": "Common interface for logging libraries",
-+            "description": "Guzzle promises library",
-             "keywords": [
--                "log",
--                "psr",
--                "psr-3"
-+                "promise"
-             ],
--            "time": "2012-12-21 11:40:51"
-+            "time": "2016-12-20T10:07:11+00:00"
-         },
-         {
--            "name": "seld/jsonlint",
--            "version": "1.3.1",
-+            "name": "guzzlehttp/psr7",
-+            "version": "1.5.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/Seldaek/jsonlint.git",
--                "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4"
-+                "url": "https://github.com/guzzle/psr7.git",
-+                "reference": "9f83dded91781a01c63574e387eaa769be769115"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/863ae85c6d3ef60ca49cb12bd051c4a0648c40c4",
--                "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4",
-+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
-+                "reference": "9f83dded91781a01c63574e387eaa769be769115",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.0"
-+                "php": ">=5.4.0",
-+                "psr/http-message": "~1.0",
-+                "ralouphie/getallheaders": "^2.0.5"
-+            },
-+            "provide": {
-+                "psr/http-message-implementation": "1.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
-             },
--            "bin": [
--                "bin/jsonlint"
--            ],
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.5-dev"
-+                }
-+            },
-             "autoload": {
-                 "psr-4": {
--                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
--                }
-+                    "GuzzleHttp\\Psr7\\": "src/"
-+                },
-+                "files": [
-+                    "src/functions_include.php"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-@@ -562,57 +6290,58 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Jordi Boggiano",
--                    "email": "j.boggiano@seld.be",
--                    "homepage": "http://seld.be"
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                },
-+                {
-+                    "name": "Tobias Schultze",
-+                    "homepage": "https://github.com/Tobion"
-                 }
-             ],
--            "description": "JSON Linter",
-+            "description": "PSR-7 message implementation that also provides common utility methods",
-             "keywords": [
--                "json",
--                "linter",
--                "parser",
--                "validator"
-+                "http",
-+                "message",
-+                "psr-7",
-+                "request",
-+                "response",
-+                "stream",
-+                "uri",
-+                "url"
-             ],
--            "time": "2015-01-04 21:18:15"
-+            "time": "2018-12-04T20:46:45+00:00"
-         },
-         {
--            "name": "symfony/console",
--            "version": "v2.7.3",
-+            "name": "jms/metadata",
-+            "version": "1.7.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Console.git",
--                "reference": "d6cf02fe73634c96677e428f840704bfbcaec29e"
-+                "url": "https://github.com/schmittjoh/metadata.git",
-+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Console/zipball/d6cf02fe73634c96677e428f840704bfbcaec29e",
--                "reference": "d6cf02fe73634c96677e428f840704bfbcaec29e",
-+                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/e5854ab1aa643623dc64adde718a8eec32b957a8",
-+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.9"
-+                "php": ">=5.3.0"
-             },
-             "require-dev": {
--                "psr/log": "~1.0",
--                "symfony/event-dispatcher": "~2.1",
--                "symfony/phpunit-bridge": "~2.7",
--                "symfony/process": "~2.1"
--            },
--            "suggest": {
--                "psr/log": "For using the console logger",
--                "symfony/event-dispatcher": "",
--                "symfony/process": ""
-+                "doctrine/cache": "~1.0",
-+                "symfony/cache": "~3.1"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.7-dev"
-+                    "dev-master": "1.5.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\Console\\": ""
-+                "psr-0": {
-+                    "Metadata\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -621,96 +6350,111 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
-+                    "name": "Asmir Mustafic",
-+                    "email": "goetas@gmail.com"
-                 },
-                 {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Johannes M. Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-                 }
-             ],
--            "description": "Symfony Console Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-07-28 15:18:12"
-+            "description": "Class/method/property metadata management in PHP",
-+            "keywords": [
-+                "annotations",
-+                "metadata",
-+                "xml",
-+                "yaml"
-+            ],
-+            "time": "2018-10-26T12:40:10+00:00"
-         },
-         {
--            "name": "symfony/finder",
--            "version": "v2.7.3",
-+            "name": "jms/parser-lib",
-+            "version": "1.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Finder.git",
--                "reference": "ae0f363277485094edc04c9f3cbe595b183b78e4"
-+                "url": "https://github.com/schmittjoh/parser-lib.git",
-+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Finder/zipball/ae0f363277485094edc04c9f3cbe595b183b78e4",
--                "reference": "ae0f363277485094edc04c9f3cbe595b183b78e4",
-+                "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.9"
--            },
--            "require-dev": {
--                "symfony/phpunit-bridge": "~2.7"
-+                "phpoption/phpoption": ">=0.9,<2.0-dev"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.7-dev"
-+                    "dev-master": "1.0-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\Finder\\": ""
-+                "psr-0": {
-+                    "JMS\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
--                }
-+                "Apache2"
-             ],
--            "description": "Symfony Finder Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-07-09 16:07:40"
-+            "description": "A library for easily creating recursive-descent parsers.",
-+            "time": "2012-11-18T18:08:43+00:00"
-         },
-         {
--            "name": "symfony/process",
--            "version": "v2.7.3",
-+            "name": "jms/serializer",
-+            "version": "1.13.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Process.git",
--                "reference": "48aeb0e48600321c272955132d7606ab0a49adb3"
-+                "url": "https://github.com/schmittjoh/serializer.git",
-+                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Process/zipball/48aeb0e48600321c272955132d7606ab0a49adb3",
--                "reference": "48aeb0e48600321c272955132d7606ab0a49adb3",
-+                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
-+                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.9"
-+                "doctrine/annotations": "^1.0",
-+                "doctrine/instantiator": "^1.0.3",
-+                "jms/metadata": "^1.3",
-+                "jms/parser-lib": "1.*",
-+                "php": "^5.5|^7.0",
-+                "phpcollection/phpcollection": "~0.1",
-+                "phpoption/phpoption": "^1.1"
-             },
-             "require-dev": {
--                "symfony/phpunit-bridge": "~2.7"
-+                "doctrine/orm": "~2.1",
-+                "doctrine/phpcr-odm": "^1.3|^2.0",
-+                "ext-pdo_sqlite": "*",
-+                "jackalope/jackalope-doctrine-dbal": "^1.1.5",
-+                "phpunit/phpunit": "^4.8|^5.0",
-+                "propel/propel1": "~1.7",
-+                "psr/container": "^1.0",
-+                "symfony/dependency-injection": "^2.7|^3.3|^4.0",
-+                "symfony/expression-language": "^2.6|^3.0",
-+                "symfony/filesystem": "^2.1",
-+                "symfony/form": "~2.1|^3.0",
-+                "symfony/translation": "^2.1|^3.0",
-+                "symfony/validator": "^2.2|^3.0",
-+                "symfony/yaml": "^2.1|^3.0"
-+            },
-+            "suggest": {
-+                "doctrine/cache": "Required if you like to use cache functionality.",
-+                "doctrine/collections": "Required if you like to use doctrine collection types as ArrayCollection.",
-+                "symfony/yaml": "Required if you'd like to serialize data to YAML format."
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.7-dev"
-+                    "dev-1.x": "1.13-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\Process\\": ""
-+                "psr-0": {
-+                    "JMS\\Serializer": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -719,1860 +6463,1818 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
-+                    "name": "Asmir Mustafic",
-+                    "email": "goetas@gmail.com"
-                 },
-                 {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Johannes M. Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-                 }
-             ],
--            "description": "Symfony Process Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-07-01 11:25:50"
-+            "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
-+            "homepage": "http://jmsyst.com/libs/serializer",
-+            "keywords": [
-+                "deserialization",
-+                "jaxb",
-+                "json",
-+                "serialization",
-+                "xml"
-+            ],
-+            "time": "2018-07-25T13:58:54+00:00"
-         },
-         {
--            "name": "tubalmartin/cssmin",
--            "version": "v2.4.8-p4",
-+            "name": "league/container",
-+            "version": "2.4.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
--                "reference": "fe84d71e8420243544c0ce3bd0f5d7c1936b0f90"
-+                "url": "https://github.com/thephpleague/container.git",
-+                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/fe84d71e8420243544c0ce3bd0f5d7c1936b0f90",
--                "reference": "fe84d71e8420243544c0ce3bd0f5d7c1936b0f90",
-+                "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0",
-+                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.0.0"
-+                "container-interop/container-interop": "^1.2",
-+                "php": "^5.4.0 || ^7.0"
-+            },
-+            "provide": {
-+                "container-interop/container-interop-implementation": "^1.2",
-+                "psr/container-implementation": "^1.0"
-+            },
-+            "replace": {
-+                "orno/di": "~2.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "4.*"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-2.x": "2.x-dev",
-+                    "dev-1.x": "1.x-dev"
-+                }
-             },
--            "type": "library",
-             "autoload": {
--                "classmap": [
--                    "cssmin.php"
--                ]
-+                "psr-4": {
-+                    "League\\Container\\": "src"
-+                }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Túbal Martín",
--                    "homepage": "http://tubalmartin.me/"
-+                    "name": "Phil Bennett",
-+                    "email": "philipobenito@gmail.com",
-+                    "homepage": "http://www.philipobenito.com",
-+                    "role": "Developer"
-                 }
-             ],
--            "description": "A PHP port of the YUI CSS compressor",
--            "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port",
-+            "description": "A fast and intuitive dependency injection container.",
-+            "homepage": "https://github.com/thephpleague/container",
-             "keywords": [
--                "compress",
--                "compressor",
--                "css",
--                "minify",
--                "yui"
-+                "container",
-+                "dependency",
-+                "di",
-+                "injection",
-+                "league",
-+                "provider",
-+                "service"
-             ],
--            "time": "2014-09-22 08:08:50"
-+            "time": "2017-05-10T09:20:27+00:00"
-         },
-         {
--            "name": "zendframework/zend-code",
--            "version": "2.4.0",
-+            "name": "lusitanian/oauth",
-+            "version": "v0.8.11",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-code.git",
--                "reference": "0ed94f842ba60cdc900c46a61bdbd7ac95a3e140"
-+                "url": "https://github.com/Lusitanian/PHPoAuthLib.git",
-+                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-code/zipball/0ed94f842ba60cdc900c46a61bdbd7ac95a3e140",
--                "reference": "0ed94f842ba60cdc900c46a61bdbd7ac95a3e140",
-+                "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/fc11a53db4b66da555a6a11fce294f574a8374f9",
-+                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-eventmanager": "self.version"
-+                "php": ">=5.3.0"
-             },
-             "require-dev": {
--                "doctrine/common": ">=2.1",
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-stdlib": "self.version"
-+                "phpunit/phpunit": "3.7.*",
-+                "predis/predis": "0.8.*@dev",
-+                "squizlabs/php_codesniffer": "2.*",
-+                "symfony/http-foundation": "~2.1"
-             },
-             "suggest": {
--                "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
--                "zendframework/zend-stdlib": "Zend\\Stdlib component"
-+                "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.",
-+                "predis/predis": "Allows using the Redis storage backend.",
-+                "symfony/http-foundation": "Allows using the Symfony Session storage backend."
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "0.1-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Code\\": "src/"
-+                "psr-0": {
-+                    "OAuth": "src",
-+                    "OAuth\\Unit": "tests"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "description": "provides facilities to generate arbitrary code using an object oriented interface",
--            "homepage": "https://github.com/zendframework/zend-code",
-+            "authors": [
-+                {
-+                    "name": "David Desberg",
-+                    "email": "david@daviddesberg.com"
-+                },
-+                {
-+                    "name": "Elliot Chance",
-+                    "email": "elliotchance@gmail.com"
-+                },
-+                {
-+                    "name": "Pieter Hordijk",
-+                    "email": "info@pieterhordijk.com"
-+                }
-+            ],
-+            "description": "PHP 5.3+ oAuth 1/2 Library",
-             "keywords": [
--                "code",
--                "zf2"
-+                "Authentication",
-+                "authorization",
-+                "oauth",
-+                "security"
-             ],
--            "time": "2015-03-31 15:39:14"
-+            "time": "2018-02-14T22:37:14+00:00"
-         },
-         {
--            "name": "zendframework/zend-config",
--            "version": "2.4.0",
-+            "name": "magento/magento2-functional-testing-framework",
-+            "version": "2.3.14",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-config.git",
--                "reference": "95f3a4b3fa85d49e6f060183122de4596fa6d29d"
-+                "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-+                "reference": "b4002b3fe53884895921b44cf519d42918e3c7c6"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-config/zipball/95f3a4b3fa85d49e6f060183122de4596fa6d29d",
--                "reference": "95f3a4b3fa85d49e6f060183122de4596fa6d29d",
-+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/b4002b3fe53884895921b44cf519d42918e3c7c6",
-+                "reference": "b4002b3fe53884895921b44cf519d42918e3c7c6",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "allure-framework/allure-codeception": "~1.3.0",
-+                "codeception/codeception": "~2.3.4 || ~2.4.0 ",
-+                "consolidation/robo": "^1.0.0",
-+                "epfremme/swagger-php": "^2.0",
-+                "ext-curl": "*",
-+                "flow/jsonpath": ">0.2",
-+                "fzaninotto/faker": "^1.6",
-+                "monolog/monolog": "^1.0",
-+                "mustache/mustache": "~2.5",
-+                "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
-+                "symfony/process": "^2.8 || ^3.1 || ^4.0",
-+                "vlucas/phpdotenv": "^2.4"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-json": "self.version",
--                "zendframework/zend-servicemanager": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-filter": "Zend\\Filter component",
--                "zendframework/zend-i18n": "Zend\\I18n component",
--                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
-+                "brainmaestro/composer-git-hooks": "^2.3",
-+                "codacy/coverage": "^1.4",
-+                "codeception/aspect-mock": "^3.0",
-+                "doctrine/cache": "<1.7.0",
-+                "goaop/framework": "2.2.0",
-+                "php-coveralls/php-coveralls": "^1.0",
-+                "phpmd/phpmd": "^2.6.0",
-+                "phpunit/phpunit": "~6.5.0 || ~7.0.0",
-+                "rregeer/phpunit-coverage-check": "^0.1.4",
-+                "sebastian/phpcpd": "~3.0 || ~4.0",
-+                "squizlabs/php_codesniffer": "~3.2",
-+                "symfony/stopwatch": "~3.4.6"
-             },
-+            "bin": [
-+                "bin/mftf"
-+            ],
-             "type": "library",
-             "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                "hooks": {
-+                    "pre-push": "bin/all-checks"
-                 }
-             },
-             "autoload": {
-+                "files": [
-+                    "src/Magento/FunctionalTestingFramework/_bootstrap.php"
-+                ],
-                 "psr-4": {
--                    "Zend\\Config\\": "src/"
-+                    "Magento\\FunctionalTestingFramework\\": "src/Magento/FunctionalTestingFramework",
-+                    "MFTF\\": "dev/tests/functional/MFTF"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "AGPL-3.0"
-             ],
--            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
--            "homepage": "https://github.com/zendframework/zend-config",
-+            "description": "Magento2 Functional Testing Framework",
-             "keywords": [
--                "config",
--                "zf2"
-+                "automation",
-+                "functional",
-+                "magento",
-+                "testing"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2019-02-19T16:03:22+00:00"
-         },
-         {
--            "name": "zendframework/zend-console",
--            "version": "2.4.0",
-+            "name": "mikey179/vfsStream",
-+            "version": "v1.6.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-console.git",
--                "reference": "54823d9ba6f8ce39046384ee5a043b5b3d5f56d7"
-+                "url": "https://github.com/mikey179/vfsStream.git",
-+                "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-console/zipball/54823d9ba6f8ce39046384ee5a043b5b3d5f56d7",
--                "reference": "54823d9ba6f8ce39046384ee5a043b5b3d5f56d7",
-+                "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
-+                "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": ">=5.3.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
--            },
--            "suggest": {
--                "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
--                "zendframework/zend-validator": "To support DefaultRouteMatcher usage"
-+                "phpunit/phpunit": "~4.5"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.6.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Console\\": "src/"
-+                "psr-0": {
-+                    "org\\bovigo\\vfs\\": "src/main/php"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-console",
--            "keywords": [
--                "console",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Frank Kleine",
-+                    "homepage": "http://frankkleine.de/",
-+                    "role": "Developer"
-+                }
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "description": "Virtual file system to mock the real file system in unit tests.",
-+            "homepage": "http://vfs.bovigo.org/",
-+            "time": "2017-08-01T08:02:14+00:00"
-         },
-         {
--            "name": "zendframework/zend-di",
--            "version": "2.4.0",
-+            "name": "moontoast/math",
-+            "version": "1.1.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-di.git",
--                "reference": "b9f8de081adecf71a003a569e9ba76c0a4c00bf2"
-+                "url": "https://github.com/ramsey/moontoast-math.git",
-+                "reference": "c2792a25df5cad4ff3d760dd37078fc5b6fccc79"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-di/zipball/b9f8de081adecf71a003a569e9ba76c0a4c00bf2",
--                "reference": "b9f8de081adecf71a003a569e9ba76c0a4c00bf2",
-+                "url": "https://api.github.com/repos/ramsey/moontoast-math/zipball/c2792a25df5cad4ff3d760dd37078fc5b6fccc79",
-+                "reference": "c2792a25df5cad4ff3d760dd37078fc5b6fccc79",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-code": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "ext-bcmath": "*",
-+                "php": ">=5.3.3"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-servicemanager": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-+                "jakub-onderka/php-parallel-lint": "^0.9.0",
-+                "phpunit/phpunit": "^4.7|>=5.0 <5.4",
-+                "satooshi/php-coveralls": "^0.6.1",
-+                "squizlabs/php_codesniffer": "^2.3"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Di\\": "src/"
-+                    "Moontoast\\Math\\": "src/Moontoast/Math/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "Apache-2.0"
-             ],
--            "homepage": "https://github.com/zendframework/zend-di",
-+            "authors": [
-+                {
-+                    "name": "Ben Ramsey",
-+                    "email": "ben@benramsey.com",
-+                    "homepage": "https://benramsey.com"
-+                }
-+            ],
-+            "description": "A mathematics library, providing functionality for large numbers",
-+            "homepage": "https://github.com/ramsey/moontoast-math",
-             "keywords": [
--                "di",
--                "zf2"
-+                "bcmath",
-+                "math"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2017-02-16T16:54:46+00:00"
-         },
-         {
--            "name": "zendframework/zend-escaper",
--            "version": "2.4.0",
-+            "name": "mustache/mustache",
-+            "version": "v2.12.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-escaper.git",
--                "reference": "15e5769e4fcdb4bf07ebd76500810e7070e23a97"
-+                "url": "https://github.com/bobthecow/mustache.php.git",
-+                "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/15e5769e4fcdb4bf07ebd76500810e7070e23a97",
--                "reference": "15e5769e4fcdb4bf07ebd76500810e7070e23a97",
-+                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/fe8fe72e9d580591854de404cc59a1b83ca4d19e",
-+                "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
-+                "php": ">=5.2.4"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "friendsofphp/php-cs-fixer": "~1.11",
-+                "phpunit/phpunit": "~3.7|~4.0|~5.0"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Escaper\\": "src/"
-+                "psr-0": {
-+                    "Mustache": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Justin Hileman",
-+                    "email": "justin@justinhileman.info",
-+                    "homepage": "http://justinhileman.com"
-+                }
-             ],
--            "homepage": "https://github.com/zendframework/zend-escaper",
-+            "description": "A Mustache implementation in PHP.",
-+            "homepage": "https://github.com/bobthecow/mustache.php",
-             "keywords": [
--                "escaper",
--                "zf2"
-+                "mustache",
-+                "templating"
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "time": "2017-07-11T12:54:05+00:00"
-         },
-         {
--            "name": "zendframework/zend-eventmanager",
--            "version": "2.4.0",
-+            "name": "myclabs/deep-copy",
-+            "version": "1.8.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-eventmanager.git",
--                "reference": "58d21c95c7005a527262fd536499195f104e83f9"
-+                "url": "https://github.com/myclabs/DeepCopy.git",
-+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/58d21c95c7005a527262fd536499195f104e83f9",
--                "reference": "58d21c95c7005a527262fd536499195f104e83f9",
-+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
-+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^7.1"
-+            },
-+            "replace": {
-+                "myclabs/deep-copy": "self.version"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "doctrine/collections": "^1.0",
-+                "doctrine/common": "^2.6",
-+                "phpunit/phpunit": "^7.1"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\EventManager\\": "src/"
--                }
-+                    "DeepCopy\\": "src/DeepCopy/"
-+                },
-+                "files": [
-+                    "src/DeepCopy/deep_copy.php"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "homepage": "https://github.com/zendframework/zend-event-manager",
-+            "description": "Create deep copies (clones) of your objects",
-             "keywords": [
--                "eventmanager",
--                "zf2"
-+                "clone",
-+                "copy",
-+                "duplicate",
-+                "object",
-+                "object graph"
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "time": "2018-06-11T23:09:50+00:00"
-         },
-         {
--            "name": "zendframework/zend-filter",
--            "version": "2.4.0",
-+            "name": "pdepend/pdepend",
-+            "version": "2.5.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-filter.git",
--                "reference": "6d8aed2da81b62a04747346c4370562cdbe34595"
-+                "url": "https://github.com/pdepend/pdepend.git",
-+                "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/6d8aed2da81b62a04747346c4370562cdbe34595",
--                "reference": "6d8aed2da81b62a04747346c4370562cdbe34595",
-+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/9daf26d0368d4a12bed1cacae1a9f3a6f0adf239",
-+                "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": ">=5.3.7",
-+                "symfony/config": "^2.3.0|^3|^4",
-+                "symfony/dependency-injection": "^2.3.0|^3|^4",
-+                "symfony/filesystem": "^2.3.0|^3|^4"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-crypt": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-uri": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-crypt": "Zend\\Crypt component",
--                "zendframework/zend-i18n": "Zend\\I18n component",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
--                "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter"
-+                "phpunit/phpunit": "^4.8|^5.7",
-+                "squizlabs/php_codesniffer": "^2.0.0"
-             },
-+            "bin": [
-+                "src/bin/pdepend"
-+            ],
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Filter\\": "src/"
-+                    "PDepend\\": "src/main/php/PDepend"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides a set of commonly needed data filters",
--            "homepage": "https://github.com/zendframework/zend-filter",
--            "keywords": [
--                "filter",
--                "zf2"
--            ],
--            "time": "2015-03-25 20:55:48"
-+            "description": "Official version of pdepend to be handled with Composer",
-+            "time": "2017-12-13T13:21:38+00:00"
-         },
-         {
--            "name": "zendframework/zend-form",
--            "version": "2.4.0",
-+            "name": "phar-io/manifest",
-+            "version": "1.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-form.git",
--                "reference": "bca0db55718355d25c2c10fdd41a83561f1c94b3"
-+                "url": "https://github.com/phar-io/manifest.git",
-+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/bca0db55718355d25c2c10fdd41a83561f1c94b3",
--                "reference": "bca0db55718355d25c2c10fdd41a83561f1c94b3",
-+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
-+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-inputfilter": "self.version",
--                "zendframework/zend-stdlib": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-captcha": "self.version",
--                "zendframework/zend-code": "self.version",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-validator": "self.version",
--                "zendframework/zend-view": "self.version",
--                "zendframework/zendservice-recaptcha": "*"
--            },
--            "suggest": {
--                "zendframework/zend-captcha": "Zend\\Captcha component",
--                "zendframework/zend-code": "Zend\\Code component",
--                "zendframework/zend-eventmanager": "Zend\\EventManager component",
--                "zendframework/zend-filter": "Zend\\Filter component",
--                "zendframework/zend-i18n": "Zend\\I18n component",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
--                "zendframework/zend-validator": "Zend\\Validator component",
--                "zendframework/zend-view": "Zend\\View component",
--                "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
-+                "ext-dom": "*",
-+                "ext-phar": "*",
-+                "phar-io/version": "^1.0.1",
-+                "php": "^5.6 || ^7.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Form\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-form",
--            "keywords": [
--                "form",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Arne Blankerts",
-+                    "email": "arne@blankerts.de",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Sebastian Heuer",
-+                    "email": "sebastian@phpeople.de",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "Developer"
-+                }
-             ],
--            "time": "2015-03-28 20:29:18"
-+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-+            "time": "2017-03-05T18:14:27+00:00"
-         },
-         {
--            "name": "zendframework/zend-http",
--            "version": "2.4.0",
-+            "name": "phar-io/version",
-+            "version": "1.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-http.git",
--                "reference": "9c6047a0bdb3094d3ea07a215ff929cc47de4deb"
-+                "url": "https://github.com/phar-io/version.git",
-+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/9c6047a0bdb3094d3ea07a215ff929cc47de4deb",
--                "reference": "9c6047a0bdb3094d3ea07a215ff929cc47de4deb",
-+                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
-+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-loader": "self.version",
--                "zendframework/zend-stdlib": "self.version",
--                "zendframework/zend-uri": "self.version",
--                "zendframework/zend-validator": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "php": "^5.6 || ^7.0"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Http\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
--            "homepage": "https://github.com/zendframework/zend-http",
--            "keywords": [
--                "http",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Arne Blankerts",
-+                    "email": "arne@blankerts.de",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Sebastian Heuer",
-+                    "email": "sebastian@phpeople.de",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "Developer"
-+                }
-             ],
--            "time": "2015-03-27 15:46:30"
-+            "description": "Library for handling version information and constraints",
-+            "time": "2017-03-05T17:38:23+00:00"
-         },
-         {
--            "name": "zendframework/zend-i18n",
--            "version": "2.4.0",
-+            "name": "php-cs-fixer/diff",
-+            "version": "v1.3.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-i18n.git",
--                "reference": "9aebc5287373a802540d75fe5508417f866c2e52"
-+                "url": "https://github.com/PHP-CS-Fixer/diff.git",
-+                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/9aebc5287373a802540d75fe5508417f866c2e52",
--                "reference": "9aebc5287373a802540d75fe5508417f866c2e52",
-+                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756",
-+                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^5.6 || ^7.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-cache": "self.version",
--                "zendframework/zend-config": "self.version",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-validator": "self.version",
--                "zendframework/zend-view": "self.version"
--            },
--            "suggest": {
--                "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
--                "zendframework/zend-cache": "Zend\\Cache component",
--                "zendframework/zend-config": "Zend\\Config component",
--                "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
--                "zendframework/zend-filter": "You should install this package to use the provided filters",
--                "zendframework/zend-resources": "Translation resources",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
--                "zendframework/zend-validator": "You should install this package to use the provided validators",
--                "zendframework/zend-view": "You should install this package to use the provided view helpers"
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "symfony/process": "^3.3"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\I18n\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-i18n",
-+            "authors": [
-+                {
-+                    "name": "Kore Nordmann",
-+                    "email": "mail@kore-nordmann.de"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                },
-+                {
-+                    "name": "SpacePossum"
-+                }
-+            ],
-+            "description": "sebastian/diff v2 backport support for PHP5.6",
-+            "homepage": "https://github.com/PHP-CS-Fixer",
-             "keywords": [
--                "i18n",
--                "zf2"
-+                "diff"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2018-02-15T16:58:55+00:00"
-         },
-         {
--            "name": "zendframework/zend-inputfilter",
--            "version": "2.4.0",
-+            "name": "phpcollection/phpcollection",
-+            "version": "0.5.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-inputfilter.git",
--                "reference": "4b1398f3635fae3cc5e873c5bb067274f3d10a93"
-+                "url": "https://github.com/schmittjoh/php-collection.git",
-+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/4b1398f3635fae3cc5e873c5bb067274f3d10a93",
--                "reference": "4b1398f3635fae3cc5e873c5bb067274f3d10a93",
-+                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
-+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-stdlib": "self.version",
--                "zendframework/zend-validator": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-servicemanager": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-servicemanager": "To support plugin manager support"
-+                "phpoption/phpoption": "1.*"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "0.4-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\InputFilter\\": "src/"
-+                "psr-0": {
-+                    "PhpCollection": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "Apache2"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Johannes M. Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-             ],
--            "homepage": "https://github.com/zendframework/zend-input-filter",
-+            "description": "General-Purpose Collection Library for PHP",
-             "keywords": [
--                "inputfilter",
--                "zf2"
-+                "collection",
-+                "list",
-+                "map",
-+                "sequence",
-+                "set"
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "time": "2015-05-17T12:39:23+00:00"
-         },
-         {
--            "name": "zendframework/zend-json",
--            "version": "2.4.0",
-+            "name": "phpdocumentor/reflection-common",
-+            "version": "1.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-json.git",
--                "reference": "2d845e151c1b9a237cf1899ac31e17fb10bd1e3f"
-+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-json/zipball/2d845e151c1b9a237cf1899ac31e17fb10bd1e3f",
--                "reference": "2d845e151c1b9a237cf1899ac31e17fb10bd1e3f",
-+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": ">=5.5"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-http": "self.version",
--                "zendframework/zend-server": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-http": "Zend\\Http component",
--                "zendframework/zend-server": "Zend\\Server component",
--                "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage"
-+                "phpunit/phpunit": "^4.6"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Json\\": "src/"
-+                    "phpDocumentor\\Reflection\\": [
-+                        "src"
-+                    ]
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
--            "homepage": "https://github.com/zendframework/zend-json",
-+            "authors": [
-+                {
-+                    "name": "Jaap van Otterdijk",
-+                    "email": "opensource@ijaap.nl"
-+                }
-+            ],
-+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-+            "homepage": "http://www.phpdoc.org",
-             "keywords": [
--                "json",
--                "zf2"
-+                "FQSEN",
-+                "phpDocumentor",
-+                "phpdoc",
-+                "reflection",
-+                "static analysis"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2017-09-11T18:02:19+00:00"
-         },
-         {
--            "name": "zendframework/zend-loader",
--            "version": "2.4.0",
-+            "name": "phpdocumentor/reflection-docblock",
-+            "version": "4.3.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-loader.git",
--                "reference": "65de2c7a56f8eee633c6bf1cfab73e45648880d4"
-+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/65de2c7a56f8eee633c6bf1cfab73e45648880d4",
--                "reference": "65de2c7a56f8eee633c6bf1cfab73e45648880d4",
-+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
-+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
-+                "php": "^7.0",
-+                "phpdocumentor/reflection-common": "^1.0.0",
-+                "phpdocumentor/type-resolver": "^0.4.0",
-+                "webmozart/assert": "^1.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "doctrine/instantiator": "~1.0.5",
-+                "mockery/mockery": "^1.0",
-+                "phpunit/phpunit": "^6.4"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "4.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Loader\\": "src/"
-+                    "phpDocumentor\\Reflection\\": [
-+                        "src/"
-+                    ]
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "homepage": "https://github.com/zendframework/zend-loader",
--            "keywords": [
--                "loader",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Mike van Riel",
-+                    "email": "me@mikevanriel.com"
-+                }
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-+            "time": "2017-11-30T07:14:17+00:00"
-         },
-         {
--            "name": "zendframework/zend-log",
--            "version": "2.4.0",
-+            "name": "phpdocumentor/type-resolver",
-+            "version": "0.4.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-log.git",
--                "reference": "002e3c810cad7e31e51c9895e9e3cb6fbd312cdd"
-+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-log/zipball/002e3c810cad7e31e51c9895e9e3cb6fbd312cdd",
--                "reference": "002e3c810cad7e31e51c9895e9e3cb6fbd312cdd",
-+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^5.5 || ^7.0",
-+                "phpdocumentor/reflection-common": "^1.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-console": "self.version",
--                "zendframework/zend-db": "self.version",
--                "zendframework/zend-escaper": "self.version",
--                "zendframework/zend-mail": "self.version",
--                "zendframework/zend-validator": "self.version"
--            },
--            "suggest": {
--                "ext-mongo": "*",
--                "zendframework/zend-console": "Zend\\Console component",
--                "zendframework/zend-db": "Zend\\Db component",
--                "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML formatter",
--                "zendframework/zend-mail": "Zend\\Mail component",
--                "zendframework/zend-validator": "Zend\\Validator component"
-+                "mockery/mockery": "^0.9.4",
-+                "phpunit/phpunit": "^5.2||^4.8.24"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Log\\": "src/"
-+                    "phpDocumentor\\Reflection\\": [
-+                        "src/"
-+                    ]
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "description": "component for general purpose logging",
--            "homepage": "https://github.com/zendframework/zend-log",
--            "keywords": [
--                "log",
--                "logging",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Mike van Riel",
-+                    "email": "me@mikevanriel.com"
-+                }
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2017-07-14T14:27:02+00:00"
-         },
-         {
--            "name": "zendframework/zend-math",
--            "version": "2.4.0",
-+            "name": "phpmd/phpmd",
-+            "version": "2.6.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-math.git",
--                "reference": "f41fe4acfd809c14f2a802d1aa45dec8fcd2cc73"
-+                "url": "https://github.com/phpmd/phpmd.git",
-+                "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/f41fe4acfd809c14f2a802d1aa45dec8fcd2cc73",
--                "reference": "f41fe4acfd809c14f2a802d1aa45dec8fcd2cc73",
-+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/4e9924b2c157a3eb64395460fcf56b31badc8374",
-+                "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
-+                "ext-xml": "*",
-+                "pdepend/pdepend": "^2.5",
-+                "php": ">=5.3.9"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
--            },
--            "suggest": {
--                "ext-bcmath": "If using the bcmath functionality",
--                "ext-gmp": "If using the gmp functionality",
--                "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
--                "zendframework/zend-servicemanager": ">= current version, if using the BigInteger::factory functionality"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
-+                "phpunit/phpunit": "^4.0",
-+                "squizlabs/php_codesniffer": "^2.0"
-             },
-+            "bin": [
-+                "src/bin/phpmd"
-+            ],
-+            "type": "project",
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Math\\": "src/"
-+                "psr-0": {
-+                    "PHPMD\\": "src/main/php"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-math",
-+            "authors": [
-+                {
-+                    "name": "Manuel Pichler",
-+                    "email": "github@manuel-pichler.de",
-+                    "homepage": "https://github.com/manuelpichler",
-+                    "role": "Project Founder"
-+                },
-+                {
-+                    "name": "Other contributors",
-+                    "homepage": "https://github.com/phpmd/phpmd/graphs/contributors",
-+                    "role": "Contributors"
-+                },
-+                {
-+                    "name": "Marc Würth",
-+                    "email": "ravage@bluewin.ch",
-+                    "homepage": "https://github.com/ravage84",
-+                    "role": "Project Maintainer"
-+                }
-+            ],
-+            "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
-+            "homepage": "http://phpmd.org/",
-             "keywords": [
--                "math",
--                "zf2"
-+                "mess detection",
-+                "mess detector",
-+                "pdepend",
-+                "phpmd",
-+                "pmd"
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "time": "2017-01-20T14:41:10+00:00"
-         },
-         {
--            "name": "zendframework/zend-modulemanager",
--            "version": "2.4.0",
-+            "name": "phpoption/phpoption",
-+            "version": "1.5.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-modulemanager.git",
--                "reference": "af7ae3cd29a1efb73cc66ae1081e606039d5c20f"
-+                "url": "https://github.com/schmittjoh/php-option.git",
-+                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/af7ae3cd29a1efb73cc66ae1081e606039d5c20f",
--                "reference": "af7ae3cd29a1efb73cc66ae1081e606039d5c20f",
-+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed",
-+                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": ">=5.3.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-config": "self.version",
--                "zendframework/zend-console": "self.version",
--                "zendframework/zend-loader": "self.version",
--                "zendframework/zend-servicemanager": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-config": "Zend\\Config component",
--                "zendframework/zend-console": "Zend\\Console component",
--                "zendframework/zend-loader": "Zend\\Loader component",
--                "zendframework/zend-mvc": "Zend\\Mvc component",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-+                "phpunit/phpunit": "4.7.*"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.3-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\ModuleManager\\": "src/"
-+                "psr-0": {
-+                    "PhpOption\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "Apache2"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Johannes M. Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-             ],
--            "homepage": "https://github.com/zendframework/zend-module-manager",
-+            "description": "Option Type for PHP",
-             "keywords": [
--                "modulemanager",
--                "zf2"
-+                "language",
-+                "option",
-+                "php",
-+                "type"
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "time": "2015-07-25T16:39:46+00:00"
-         },
-         {
--            "name": "zendframework/zend-mvc",
--            "version": "2.4.0",
-+            "name": "phpspec/prophecy",
-+            "version": "1.8.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-mvc.git",
--                "reference": "0b4a4a829b30be510a3f215c4ff00c703ee8b431"
-+                "url": "https://github.com/phpspec/prophecy.git",
-+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/0b4a4a829b30be510a3f215c4ff00c703ee8b431",
--                "reference": "0b4a4a829b30be510a3f215c4ff00c703ee8b431",
-+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-form": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "doctrine/instantiator": "^1.0.2",
-+                "php": "^5.3|^7.0",
-+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-+                "sebastian/comparator": "^1.1|^2.0|^3.0",
-+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-authentication": "self.version",
--                "zendframework/zend-console": "self.version",
--                "zendframework/zend-di": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-http": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-inputfilter": "self.version",
--                "zendframework/zend-json": "self.version",
--                "zendframework/zend-log": "self.version",
--                "zendframework/zend-modulemanager": "self.version",
--                "zendframework/zend-serializer": "self.version",
--                "zendframework/zend-session": "self.version",
--                "zendframework/zend-text": "self.version",
--                "zendframework/zend-uri": "self.version",
--                "zendframework/zend-validator": "self.version",
--                "zendframework/zend-version": "self.version",
--                "zendframework/zend-view": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
--                "zendframework/zend-config": "Zend\\Config component",
--                "zendframework/zend-console": "Zend\\Console component",
--                "zendframework/zend-di": "Zend\\Di component",
--                "zendframework/zend-filter": "Zend\\Filter component",
--                "zendframework/zend-http": "Zend\\Http component",
--                "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
--                "zendframework/zend-inputfilter": "Zend\\Inputfilter component",
--                "zendframework/zend-json": "Zend\\Json component",
--                "zendframework/zend-log": "Zend\\Log component",
--                "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
--                "zendframework/zend-serializer": "Zend\\Serializer component",
--                "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
--                "zendframework/zend-stdlib": "Zend\\Stdlib component",
--                "zendframework/zend-text": "Zend\\Text component",
--                "zendframework/zend-uri": "Zend\\Uri component",
--                "zendframework/zend-validator": "Zend\\Validator component",
--                "zendframework/zend-version": "Zend\\Version component",
--                "zendframework/zend-view": "Zend\\View component"
-+                "phpspec/phpspec": "^2.5|^3.2",
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.8.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Mvc\\": "src/"
-+                "psr-0": {
-+                    "Prophecy\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "homepage": "https://github.com/zendframework/zend-mvc",
-+            "authors": [
-+                {
-+                    "name": "Konstantin Kudryashov",
-+                    "email": "ever.zet@gmail.com",
-+                    "homepage": "http://everzet.com"
-+                },
-+                {
-+                    "name": "Marcello Duarte",
-+                    "email": "marcello.duarte@gmail.com"
-+                }
-+            ],
-+            "description": "Highly opinionated mocking framework for PHP 5.3+",
-+            "homepage": "https://github.com/phpspec/prophecy",
-             "keywords": [
--                "mvc",
--                "zf2"
-+                "Double",
-+                "Dummy",
-+                "fake",
-+                "mock",
-+                "spy",
-+                "stub"
-             ],
--            "time": "2015-03-26 18:55:14"
-+            "time": "2018-08-05T17:53:17+00:00"
-         },
-         {
--            "name": "zendframework/zend-serializer",
--            "version": "2.4.0",
-+            "name": "phpunit/php-code-coverage",
-+            "version": "5.3.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-serializer.git",
--                "reference": "3c531789a9882a5deb721356a7bd2642b65d4b09"
-+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/3c531789a9882a5deb721356a7bd2642b65d4b09",
--                "reference": "3c531789a9882a5deb721356a7bd2642b65d4b09",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
-+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-json": "self.version",
--                "zendframework/zend-math": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "ext-dom": "*",
-+                "ext-xmlwriter": "*",
-+                "php": "^7.0",
-+                "phpunit/php-file-iterator": "^1.4.2",
-+                "phpunit/php-text-template": "^1.2.1",
-+                "phpunit/php-token-stream": "^2.0.1",
-+                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-+                "sebastian/environment": "^3.0",
-+                "sebastian/version": "^2.0.1",
-+                "theseer/tokenizer": "^1.1"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-servicemanager": "self.version"
-+                "phpunit/phpunit": "^6.0"
-             },
-             "suggest": {
--                "zendframework/zend-servicemanager": "To support plugin manager support"
-+                "ext-xdebug": "^2.5.5"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "5.3.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Serializer\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
--            "homepage": "https://github.com/zendframework/zend-serializer",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-             "keywords": [
--                "serializer",
--                "zf2"
-+                "coverage",
-+                "testing",
-+                "xunit"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2018-04-06T15:36:58+00:00"
-         },
-         {
--            "name": "zendframework/zend-server",
--            "version": "2.4.0",
-+            "name": "phpunit/php-file-iterator",
-+            "version": "1.4.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-server.git",
--                "reference": "d11ff0bd529d202022823d4accf5983cbd50fc49"
-+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/d11ff0bd529d202022823d4accf5983cbd50fc49",
--                "reference": "d11ff0bd529d202022823d4accf5983cbd50fc49",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-code": "self.version",
--                "zendframework/zend-stdlib": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "php": ">=5.3.3"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.4.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Server\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-server",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sb@sebastian-bergmann.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-             "keywords": [
--                "server",
--                "zf2"
-+                "filesystem",
-+                "iterator"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2017-11-27T13:52:08+00:00"
-         },
-         {
--            "name": "zendframework/zend-servicemanager",
--            "version": "2.4.0",
-+            "name": "phpunit/php-text-template",
-+            "version": "1.2.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-servicemanager.git",
--                "reference": "57cf99fa5ac08c05a135a8d0d676c52a5e450083"
-+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/57cf99fa5ac08c05a135a8d0d676c52a5e450083",
--                "reference": "57cf99fa5ac08c05a135a8d0d676c52a5e450083",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-di": "self.version"
--            },
--            "suggest": {
--                "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
--                "zendframework/zend-di": "Zend\\Di component"
-+                "php": ">=5.3.3"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\ServiceManager\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-service-manager",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "Simple template engine.",
-+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-             "keywords": [
--                "servicemanager",
--                "zf2"
-+                "template"
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "time": "2015-06-21T13:50:34+00:00"
-         },
-         {
--            "name": "zendframework/zend-soap",
--            "version": "2.4.0",
-+            "name": "phpunit/php-timer",
-+            "version": "1.0.9",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-soap.git",
--                "reference": "a599463aba97ce247faf3fb443e3c7858b46449b"
-+                "url": "https://github.com/sebastianbergmann/php-timer.git",
-+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/a599463aba97ce247faf3fb443e3c7858b46449b",
--                "reference": "a599463aba97ce247faf3fb443e3c7858b46449b",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-server": "self.version",
--                "zendframework/zend-stdlib": "self.version",
--                "zendframework/zend-uri": "self.version"
-+                "php": "^5.3.3 || ^7.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-http": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-http": "Zend\\Http component"
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.0-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Soap\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-soap",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sb@sebastian-bergmann.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "Utility class for timing",
-+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-             "keywords": [
--                "soap",
--                "zf2"
-+                "timer"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2017-02-26T11:10:40+00:00"
-         },
-         {
--            "name": "zendframework/zend-stdlib",
--            "version": "2.4.0",
-+            "name": "phpunit/php-token-stream",
-+            "version": "2.0.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-stdlib.git",
--                "reference": "cf05c5ba75606e47ffee91cedc72778da46f74c3"
-+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-+                "reference": "791198a2c6254db10131eecfe8c06670700904db"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cf05c5ba75606e47ffee91cedc72778da46f74c3",
--                "reference": "cf05c5ba75606e47ffee91cedc72778da46f74c3",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
-+                "reference": "791198a2c6254db10131eecfe8c06670700904db",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
-+                "ext-tokenizer": "*",
-+                "php": "^7.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-serializer": "self.version",
--                "zendframework/zend-servicemanager": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
--                "zendframework/zend-filter": "To support naming strategy hydrator usage",
--                "zendframework/zend-serializer": "Zend\\Serializer component",
--                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
-+                "phpunit/phpunit": "^6.2.4"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "2.0-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Stdlib\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-stdlib",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                }
-+            ],
-+            "description": "Wrapper around PHP's tokenizer extension.",
-+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-             "keywords": [
--                "stdlib",
--                "zf2"
-+                "tokenizer"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2017-11-27T05:48:46+00:00"
-         },
-         {
--            "name": "zendframework/zend-text",
--            "version": "2.4.0",
-+            "name": "phpunit/phpunit",
-+            "version": "6.5.14",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-text.git",
--                "reference": "d962ea25647b20527f3ca34ae225bbc885dabfc7"
-+                "url": "https://github.com/sebastianbergmann/phpunit.git",
-+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-text/zipball/d962ea25647b20527f3ca34ae225bbc885dabfc7",
--                "reference": "d962ea25647b20527f3ca34ae225bbc885dabfc7",
-+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7",
-+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "ext-dom": "*",
-+                "ext-json": "*",
-+                "ext-libxml": "*",
-+                "ext-mbstring": "*",
-+                "ext-xml": "*",
-+                "myclabs/deep-copy": "^1.6.1",
-+                "phar-io/manifest": "^1.0.1",
-+                "phar-io/version": "^1.0",
-+                "php": "^7.0",
-+                "phpspec/prophecy": "^1.7",
-+                "phpunit/php-code-coverage": "^5.3",
-+                "phpunit/php-file-iterator": "^1.4.3",
-+                "phpunit/php-text-template": "^1.2.1",
-+                "phpunit/php-timer": "^1.0.9",
-+                "phpunit/phpunit-mock-objects": "^5.0.9",
-+                "sebastian/comparator": "^2.1",
-+                "sebastian/diff": "^2.0",
-+                "sebastian/environment": "^3.1",
-+                "sebastian/exporter": "^3.1",
-+                "sebastian/global-state": "^2.0",
-+                "sebastian/object-enumerator": "^3.0.3",
-+                "sebastian/resource-operations": "^1.0",
-+                "sebastian/version": "^2.0.1"
-+            },
-+            "conflict": {
-+                "phpdocumentor/reflection-docblock": "3.0.2",
-+                "phpunit/dbunit": "<3.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "ext-pdo": "*"
-+            },
-+            "suggest": {
-+                "ext-xdebug": "*",
-+                "phpunit/php-invoker": "^1.1"
-             },
-+            "bin": [
-+                "phpunit"
-+            ],
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "6.5.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Text\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-text",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "The PHP Unit Testing framework.",
-+            "homepage": "https://phpunit.de/",
-             "keywords": [
--                "text",
--                "zf2"
-+                "phpunit",
-+                "testing",
-+                "xunit"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2019-02-01T05:22:47+00:00"
-         },
-         {
--            "name": "zendframework/zend-uri",
--            "version": "2.4.0",
-+            "name": "phpunit/phpunit-mock-objects",
-+            "version": "5.0.10",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-uri.git",
--                "reference": "bd9e625639415376f6a82551c73328448d7bc7d1"
-+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/bd9e625639415376f6a82551c73328448d7bc7d1",
--                "reference": "bd9e625639415376f6a82551c73328448d7bc7d1",
-+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
-+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-escaper": "self.version",
--                "zendframework/zend-validator": "self.version"
-+                "doctrine/instantiator": "^1.0.5",
-+                "php": "^7.0",
-+                "phpunit/php-text-template": "^1.2.1",
-+                "sebastian/exporter": "^3.1"
-+            },
-+            "conflict": {
-+                "phpunit/phpunit": "<6.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "phpunit/phpunit": "^6.5.11"
-+            },
-+            "suggest": {
-+                "ext-soap": "*"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "5.0.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Uri\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
--            "homepage": "https://github.com/zendframework/zend-uri",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "Mock Object library for PHPUnit",
-+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-             "keywords": [
--                "uri",
--                "zf2"
-+                "mock",
-+                "xunit"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "abandoned": true,
-+            "time": "2018-08-09T05:50:03+00:00"
-         },
-         {
--            "name": "zendframework/zend-validator",
--            "version": "2.4.0",
-+            "name": "ralouphie/getallheaders",
-+            "version": "2.0.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-validator.git",
--                "reference": "45fac2545a0f2eb66d71cb7966feee481e7c475f"
-+                "url": "https://github.com/ralouphie/getallheaders.git",
-+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/45fac2545a0f2eb66d71cb7966feee481e7c475f",
--                "reference": "45fac2545a0f2eb66d71cb7966feee481e7c475f",
-+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
-+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": ">=5.3"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-db": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-math": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-session": "self.version",
--                "zendframework/zend-uri": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-db": "Zend\\Db component",
--                "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
--                "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators",
--                "zendframework/zend-math": "Zend\\Math component",
--                "zendframework/zend-resources": "Translations of validator messages",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
--                "zendframework/zend-session": "Zend\\Session component",
--                "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
-+                "phpunit/phpunit": "~3.7.0",
-+                "satooshi/php-coveralls": ">=1.0"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Validator\\": "src/"
--                }
-+                "files": [
-+                    "src/getallheaders.php"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "description": "provides a set of commonly needed validators",
--            "homepage": "https://github.com/zendframework/zend-validator",
--            "keywords": [
--                "validator",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Ralph Khattar",
-+                    "email": "ralph.khattar@gmail.com"
-+                }
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "description": "A polyfill for getallheaders.",
-+            "time": "2016-02-11T07:05:27+00:00"
-         },
-         {
--            "name": "zendframework/zend-view",
--            "version": "2.4.0",
-+            "name": "sebastian/code-unit-reverse-lookup",
-+            "version": "1.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-view.git",
--                "reference": "37beb1ad46e530f627b4b6c3716efd728e976ba9"
-+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/37beb1ad46e530f627b4b6c3716efd728e976ba9",
--                "reference": "37beb1ad46e530f627b4b6c3716efd728e976ba9",
-+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-loader": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^5.6 || ^7.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-authentication": "self.version",
--                "zendframework/zend-escaper": "self.version",
--                "zendframework/zend-feed": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-http": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-json": "self.version",
--                "zendframework/zend-mvc": "self.version",
--                "zendframework/zend-navigation": "self.version",
--                "zendframework/zend-paginator": "self.version",
--                "zendframework/zend-permissions-acl": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-uri": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-authentication": "Zend\\Authentication component",
--                "zendframework/zend-escaper": "Zend\\Escaper component",
--                "zendframework/zend-feed": "Zend\\Feed component",
--                "zendframework/zend-filter": "Zend\\Filter component",
--                "zendframework/zend-http": "Zend\\Http component",
--                "zendframework/zend-i18n": "Zend\\I18n component",
--                "zendframework/zend-json": "Zend\\Json component",
--                "zendframework/zend-mvc": "Zend\\Mvc component",
--                "zendframework/zend-navigation": "Zend\\Navigation component",
--                "zendframework/zend-paginator": "Zend\\Paginator component",
--                "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
--                "zendframework/zend-uri": "Zend\\Uri component"
-+                "phpunit/phpunit": "^5.7 || ^6.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\View\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides a system of helpers, output filters, and variable escaping",
--            "homepage": "https://github.com/zendframework/zend-view",
--            "keywords": [
--                "view",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                }
-             ],
--            "time": "2015-03-25 20:55:48"
--        }
--    ],
--    "packages-dev": [
-+            "description": "Looks up which function or method a line of code belongs to",
-+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-+            "time": "2017-03-04T06:30:41+00:00"
-+        },
-         {
--            "name": "doctrine/instantiator",
--            "version": "1.0.5",
-+            "name": "sebastian/comparator",
-+            "version": "2.1.3",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/doctrine/instantiator.git",
--                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-+                "url": "https://github.com/sebastianbergmann/comparator.git",
-+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
--                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
-+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3,<8.0-DEV"
-+                "php": "^7.0",
-+                "sebastian/diff": "^2.0 || ^3.0",
-+                "sebastian/exporter": "^3.1"
-             },
-             "require-dev": {
--                "athletic/athletic": "~0.1.8",
--                "ext-pdo": "*",
--                "ext-phar": "*",
--                "phpunit/phpunit": "~4.0",
--                "squizlabs/php_codesniffer": "~2.0"
-+                "phpunit/phpunit": "^6.4"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.0.x-dev"
-+                    "dev-master": "2.1.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Marco Pivetta",
--                    "email": "ocramius@gmail.com",
--                    "homepage": "http://ocramius.github.com/"
-+                    "name": "Jeff Welch",
-+                    "email": "whatthejeff@gmail.com"
-+                },
-+                {
-+                    "name": "Volker Dusch",
-+                    "email": "github@wallbash.com"
-+                },
-+                {
-+                    "name": "Bernhard Schussek",
-+                    "email": "bschussek@2bepublished.at"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
--            "homepage": "https://github.com/doctrine/instantiator",
-+            "description": "Provides the functionality to compare PHP values for equality",
-+            "homepage": "https://github.com/sebastianbergmann/comparator",
-             "keywords": [
--                "constructor",
--                "instantiate"
-+                "comparator",
-+                "compare",
-+                "equality"
-             ],
--            "time": "2015-06-14 21:17:01"
-+            "time": "2018-02-01T13:46:46+00:00"
-         },
-         {
--            "name": "fabpot/php-cs-fixer",
--            "version": "v1.10",
-+            "name": "sebastian/diff",
-+            "version": "2.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
--                "reference": "8e21b4fb32c4618a425817d9f0daf3d57a9808d1"
-+                "url": "https://github.com/sebastianbergmann/diff.git",
-+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/8e21b4fb32c4618a425817d9f0daf3d57a9808d1",
--                "reference": "8e21b4fb32c4618a425817d9f0daf3d57a9808d1",
-+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
-+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
-                 "shasum": ""
-             },
-             "require": {
--                "ext-tokenizer": "*",
--                "php": ">=5.3.6",
--                "sebastian/diff": "~1.1",
--                "symfony/console": "~2.3",
--                "symfony/event-dispatcher": "~2.1",
--                "symfony/filesystem": "~2.1",
--                "symfony/finder": "~2.1",
--                "symfony/process": "~2.3",
--                "symfony/stopwatch": "~2.5"
-+                "php": "^7.0"
-             },
-             "require-dev": {
--                "satooshi/php-coveralls": "0.7.*@dev"
-+                "phpunit/phpunit": "^6.2"
-             },
--            "bin": [
--                "php-cs-fixer"
--            ],
--            "type": "application",
--            "autoload": {
--                "psr-4": {
--                    "Symfony\\CS\\": "Symfony/CS/"
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.0-dev"
-                 }
-             },
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-+                ]
-+            },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Dariusz Rumiński",
--                    "email": "dariusz.ruminski@gmail.com"
-+                    "name": "Kore Nordmann",
-+                    "email": "mail@kore-nordmann.de"
-                 },
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "A tool to automatically fix PHP code style",
--            "time": "2015-07-27 20:56:10"
-+            "description": "Diff implementation",
-+            "homepage": "https://github.com/sebastianbergmann/diff",
-+            "keywords": [
-+                "diff"
-+            ],
-+            "time": "2017-08-03T08:09:46+00:00"
-         },
-         {
--            "name": "league/climate",
--            "version": "2.6.1",
-+            "name": "sebastian/environment",
-+            "version": "3.1.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/thephpleague/climate.git",
--                "reference": "28851c909017424f61cc6a62089316313c645d1c"
-+                "url": "https://github.com/sebastianbergmann/environment.git",
-+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/thephpleague/climate/zipball/28851c909017424f61cc6a62089316313c645d1c",
--                "reference": "28851c909017424f61cc6a62089316313c645d1c",
-+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.4.0"
-+                "php": "^7.0"
-             },
-             "require-dev": {
--                "mockery/mockery": "dev-master",
--                "phpunit/phpunit": "4.1.*"
-+                "phpunit/phpunit": "^6.1"
-             },
-             "type": "library",
--            "autoload": {
--                "psr-4": {
--                    "League\\CLImate\\": "src/"
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "3.1.x-dev"
-                 }
-             },
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-+                ]
-+            },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Joe Tannenbaum",
--                    "email": "hey@joe.codes",
--                    "homepage": "http://joe.codes/",
--                    "role": "Developer"
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "PHP's best friend for the terminal. CLImate allows you to easily output colored text, special formats, and more.",
-+            "description": "Provides functionality to handle HHVM/PHP environments",
-+            "homepage": "http://www.github.com/sebastianbergmann/environment",
-             "keywords": [
--                "cli",
--                "colors",
--                "command",
--                "php",
--                "terminal"
-+                "Xdebug",
-+                "environment",
-+                "hhvm"
-             ],
--            "time": "2015-01-18 14:31:58"
-+            "time": "2017-07-01T08:51:00+00:00"
-         },
-         {
--            "name": "lusitanian/oauth",
--            "version": "v0.3.5",
-+            "name": "sebastian/exporter",
-+            "version": "3.1.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/Lusitanian/PHPoAuthLib.git",
--                "reference": "ac5a1cd5a4519143728dce2213936eea302edf8a"
-+                "url": "https://github.com/sebastianbergmann/exporter.git",
-+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/ac5a1cd5a4519143728dce2213936eea302edf8a",
--                "reference": "ac5a1cd5a4519143728dce2213936eea302edf8a",
-+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
-+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.0"
-+                "php": "^7.0",
-+                "sebastian/recursion-context": "^3.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "3.7.*",
--                "predis/predis": "0.8.*@dev",
--                "symfony/http-foundation": "~2.1"
--            },
--            "suggest": {
--                "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.",
--                "predis/predis": "Allows using the Redis storage backend.",
--                "symfony/http-foundation": "Allows using the Symfony Session storage backend."
-+                "ext-mbstring": "*",
-+                "phpunit/phpunit": "^6.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "0.1-dev"
-+                    "dev-master": "3.1.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "OAuth": "src",
--                    "OAuth\\Unit": "tests"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "David Desberg",
--                    "email": "david@daviddesberg.com"
-+                    "name": "Jeff Welch",
-+                    "email": "whatthejeff@gmail.com"
-                 },
-                 {
--                    "name": "Pieter Hordijk",
--                    "email": "info@pieterhordijk.com"
-+                    "name": "Volker Dusch",
-+                    "email": "github@wallbash.com"
-+                },
-+                {
-+                    "name": "Bernhard Schussek",
-+                    "email": "bschussek@2bepublished.at"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                },
-+                {
-+                    "name": "Adam Harvey",
-+                    "email": "aharvey@php.net"
-                 }
-             ],
--            "description": "PHP 5.3+ oAuth 1/2 Library",
-+            "description": "Provides the functionality to export PHP variables for visualization",
-+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-             "keywords": [
--                "Authentication",
--                "authorization",
--                "oauth",
--                "security"
-+                "export",
-+                "exporter"
-             ],
--            "time": "2014-09-05 15:19:58"
-+            "time": "2017-04-03T13:19:02+00:00"
-         },
-         {
--            "name": "pdepend/pdepend",
--            "version": "2.0.6",
-+            "name": "sebastian/finder-facade",
-+            "version": "1.2.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/pdepend/pdepend.git",
--                "reference": "a15ffcbfbcc4570d4a733ca7b76e9cac0a56c3f4"
-+                "url": "https://github.com/sebastianbergmann/finder-facade.git",
-+                "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/a15ffcbfbcc4570d4a733ca7b76e9cac0a56c3f4",
--                "reference": "a15ffcbfbcc4570d4a733ca7b76e9cac0a56c3f4",
-+                "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
-+                "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
-                 "shasum": ""
-             },
-             "require": {
--                "symfony/config": ">=2.4",
--                "symfony/dependency-injection": ">=2.4",
--                "symfony/filesystem": ">=2.4"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "4.*@stable",
--                "squizlabs/php_codesniffer": "@stable"
-+                "symfony/finder": "~2.3|~3.0|~4.0",
-+                "theseer/fdomdocument": "~1.3"
-             },
--            "bin": [
--                "src/bin/pdepend"
--            ],
-             "type": "library",
-             "autoload": {
--                "psr-0": {
--                    "PDepend\\": "src/main/php/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "Official version of pdepend to be handled with Composer",
--            "time": "2015-03-02 08:06:43"
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
-+            "homepage": "https://github.com/sebastianbergmann/finder-facade",
-+            "time": "2017-11-18T17:31:49+00:00"
-         },
-         {
--            "name": "phpmd/phpmd",
--            "version": "2.2.3",
-+            "name": "sebastian/global-state",
-+            "version": "2.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/phpmd/phpmd.git",
--                "reference": "5eeb5a4d39c8304910b33ae49f8813905346cc35"
-+                "url": "https://github.com/sebastianbergmann/global-state.git",
-+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/5eeb5a4d39c8304910b33ae49f8813905346cc35",
--                "reference": "5eeb5a4d39c8304910b33ae49f8813905346cc35",
-+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                 "shasum": ""
-             },
-             "require": {
--                "pdepend/pdepend": "~2.0",
--                "php": ">=5.3.0",
--                "symfony/config": ">=2.4",
--                "symfony/dependency-injection": ">=2.4",
--                "symfony/filesystem": ">=2.4"
-+                "php": "^7.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "*",
--                "squizlabs/php_codesniffer": "*"
-+                "phpunit/phpunit": "^6.0"
-             },
--            "bin": [
--                "src/bin/phpmd"
--            ],
--            "type": "project",
--            "autoload": {
--                "psr-0": {
--                    "PHPMD\\": "src/main/php"
-+            "suggest": {
-+                "ext-uopz": "*"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.0-dev"
-                 }
-             },
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-+                ]
-+            },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Manuel Pichler",
--                    "email": "github@manuel-pichler.de",
--                    "homepage": "https://github.com/manuelpichler",
--                    "role": "Project founder"
--                },
--                {
--                    "name": "Other contributors",
--                    "homepage": "https://github.com/phpmd/phpmd/graphs/contributors",
--                    "role": "Contributors"
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
--            "homepage": "http://phpmd.org/",
-+            "description": "Snapshotting of global state",
-+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-             "keywords": [
--                "mess detection",
--                "mess detector",
--                "pdepend",
--                "phpmd",
--                "pmd"
-+                "global state"
-             ],
--            "time": "2015-05-27 18:16:57"
-+            "time": "2017-04-27T15:39:26+00:00"
-         },
-         {
--            "name": "phpunit/php-code-coverage",
--            "version": "2.2.2",
-+            "name": "sebastian/object-enumerator",
-+            "version": "3.0.3",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
--                "reference": "2d7c03c0e4e080901b8f33b2897b0577be18a13c"
-+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2d7c03c0e4e080901b8f33b2897b0577be18a13c",
--                "reference": "2d7c03c0e4e080901b8f33b2897b0577be18a13c",
-+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3",
--                "phpunit/php-file-iterator": "~1.3",
--                "phpunit/php-text-template": "~1.2",
--                "phpunit/php-token-stream": "~1.3",
--                "sebastian/environment": "^1.3.2",
--                "sebastian/version": "~1.0"
-+                "php": "^7.0",
-+                "sebastian/object-reflector": "^1.1.1",
-+                "sebastian/recursion-context": "^3.0"
-             },
-             "require-dev": {
--                "ext-xdebug": ">=2.1.4",
--                "phpunit/phpunit": "~4"
--            },
--            "suggest": {
--                "ext-dom": "*",
--                "ext-xdebug": ">=2.2.1",
--                "ext-xmlwriter": "*"
-+                "phpunit/phpunit": "^6.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.2.x-dev"
-+                    "dev-master": "3.0.x-dev"
-                 }
-             },
-             "autoload": {
-@@ -2587,82 +8289,88 @@
-             "authors": [
-                 {
-                     "name": "Sebastian Bergmann",
--                    "email": "sb@sebastian-bergmann.de",
--                    "role": "lead"
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
--            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
--            "keywords": [
--                "coverage",
--                "testing",
--                "xunit"
--            ],
--            "time": "2015-08-04 03:42:39"
-+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-+            "time": "2017-08-03T12:35:26+00:00"
-         },
-         {
--            "name": "phpunit/php-file-iterator",
--            "version": "1.3.4",
-+            "name": "sebastian/object-reflector",
-+            "version": "1.1.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
--                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
-+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-+                "reference": "773f97c67f28de00d397be301821b06708fca0be"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
--                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
-+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
-+                "reference": "773f97c67f28de00d397be301821b06708fca0be",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^6.0"
-             },
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.1-dev"
-+                }
-+            },
-             "autoload": {
-                 "classmap": [
--                    "File/"
-+                    "src/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
--            "include-path": [
--                ""
--            ],
-             "license": [
-                 "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
-                     "name": "Sebastian Bergmann",
--                    "email": "sb@sebastian-bergmann.de",
--                    "role": "lead"
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
--            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
--            "keywords": [
--                "filesystem",
--                "iterator"
--            ],
--            "time": "2013-10-10 15:34:57"
-+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-+            "time": "2017-03-29T09:07:27+00:00"
-         },
-         {
--            "name": "phpunit/php-text-template",
--            "version": "1.2.1",
-+            "name": "sebastian/phpcpd",
-+            "version": "3.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-text-template.git",
--                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-+                "url": "https://github.com/sebastianbergmann/phpcpd.git",
-+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
--                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-+                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564",
-+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^5.6|^7.0",
-+                "phpunit/php-timer": "^1.0.6",
-+                "sebastian/finder-facade": "^1.1",
-+                "sebastian/version": "^1.0|^2.0",
-+                "symfony/console": "^2.7|^3.0|^4.0"
-             },
-+            "bin": [
-+                "phpcpd"
-+            ],
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "3.0-dev"
-+                }
-+            },
-             "autoload": {
-                 "classmap": [
-                     "src/"
-@@ -2679,31 +8387,36 @@
-                     "role": "lead"
-                 }
-             ],
--            "description": "Simple template engine.",
--            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
--            "keywords": [
--                "template"
--            ],
--            "time": "2015-06-21 13:50:34"
-+            "description": "Copy/Paste Detector (CPD) for PHP code.",
-+            "homepage": "https://github.com/sebastianbergmann/phpcpd",
-+            "time": "2017-11-16T08:49:28+00:00"
-         },
-         {
--            "name": "phpunit/php-timer",
--            "version": "1.0.7",
-+            "name": "sebastian/recursion-context",
-+            "version": "3.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-timer.git",
--                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
-+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
--                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
-+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^6.0"
-             },
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "3.0.x-dev"
-+                }
-+            },
-             "autoload": {
-                 "classmap": [
-                     "src/"
-@@ -2714,44 +8427,44 @@
-                 "BSD-3-Clause"
-             ],
-             "authors": [
-+                {
-+                    "name": "Jeff Welch",
-+                    "email": "whatthejeff@gmail.com"
-+                },
-                 {
-                     "name": "Sebastian Bergmann",
--                    "email": "sb@sebastian-bergmann.de",
--                    "role": "lead"
-+                    "email": "sebastian@phpunit.de"
-+                },
-+                {
-+                    "name": "Adam Harvey",
-+                    "email": "aharvey@php.net"
-                 }
-             ],
--            "description": "Utility class for timing",
--            "homepage": "https://github.com/sebastianbergmann/php-timer/",
--            "keywords": [
--                "timer"
--            ],
--            "time": "2015-06-21 08:01:12"
-+            "description": "Provides functionality to recursively process PHP variables",
-+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-+            "time": "2017-03-03T06:23:57+00:00"
-         },
-         {
--            "name": "phpunit/php-token-stream",
--            "version": "1.4.6",
-+            "name": "sebastian/resource-operations",
-+            "version": "1.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
--                "reference": "3ab72c62e550370a6cd5dc873e1a04ab57562f5b"
-+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3ab72c62e550370a6cd5dc873e1a04ab57562f5b",
--                "reference": "3ab72c62e550370a6cd5dc873e1a04ab57562f5b",
-+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                 "shasum": ""
-             },
-             "require": {
--                "ext-tokenizer": "*",
--                "php": ">=5.3.3"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "~4.2"
-+                "php": ">=5.6.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.4-dev"
-+                    "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
-@@ -2769,56 +8482,31 @@
-                     "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "Wrapper around PHP's tokenizer extension.",
--            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
--            "keywords": [
--                "tokenizer"
--            ],
--            "time": "2015-08-16 08:51:00"
-+            "description": "Provides a list of PHP built-in functions that operate on resources",
-+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-+            "time": "2015-07-28T20:34:47+00:00"
-         },
-         {
--            "name": "phpunit/phpunit",
--            "version": "4.1.0",
-+            "name": "sebastian/version",
-+            "version": "2.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/phpunit.git",
--                "reference": "efb1b1334605594417a3bd466477772d06d460a8"
-+                "url": "https://github.com/sebastianbergmann/version.git",
-+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/efb1b1334605594417a3bd466477772d06d460a8",
--                "reference": "efb1b1334605594417a3bd466477772d06d460a8",
-+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                 "shasum": ""
-             },
-             "require": {
--                "ext-dom": "*",
--                "ext-json": "*",
--                "ext-pcre": "*",
--                "ext-reflection": "*",
--                "ext-spl": "*",
--                "php": ">=5.3.3",
--                "phpunit/php-code-coverage": "~2.0",
--                "phpunit/php-file-iterator": "~1.3.1",
--                "phpunit/php-text-template": "~1.2",
--                "phpunit/php-timer": "~1.0.2",
--                "phpunit/phpunit-mock-objects": "~2.1",
--                "sebastian/comparator": "~1.0",
--                "sebastian/diff": "~1.1",
--                "sebastian/environment": "~1.0",
--                "sebastian/exporter": "~1.0",
--                "sebastian/version": "~1.0",
--                "symfony/yaml": "~2.0"
--            },
--            "suggest": {
--                "phpunit/php-invoker": "~1.1"
-+                "php": ">=5.6"
-             },
--            "bin": [
--                "phpunit"
--            ],
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "4.1.x-dev"
-+                    "dev-master": "2.0.x-dev"
-                 }
-             },
-             "autoload": {
-@@ -2827,10 +8515,6 @@
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
--            "include-path": [
--                "",
--                "../../symfony/yaml/"
--            ],
-             "license": [
-                 "BSD-3-Clause"
-             ],
-@@ -2841,429 +8525,463 @@
-                     "role": "lead"
-                 }
-             ],
--            "description": "The PHP Unit Testing framework.",
--            "homepage": "http://www.phpunit.de/",
--            "keywords": [
--                "phpunit",
--                "testing",
--                "xunit"
--            ],
--            "time": "2014-05-02 07:13:40"
-+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-+            "homepage": "https://github.com/sebastianbergmann/version",
-+            "time": "2016-10-03T07:35:21+00:00"
-         },
-         {
--            "name": "phpunit/phpunit-mock-objects",
--            "version": "2.3.7",
-+            "name": "squizlabs/php_codesniffer",
-+            "version": "3.3.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
--                "reference": "5e2645ad49d196e020b85598d7c97e482725786a"
-+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-+                "reference": "628a481780561150481a9ec74709092b9759b3ec"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5e2645ad49d196e020b85598d7c97e482725786a",
--                "reference": "5e2645ad49d196e020b85598d7c97e482725786a",
-+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/628a481780561150481a9ec74709092b9759b3ec",
-+                "reference": "628a481780561150481a9ec74709092b9759b3ec",
-                 "shasum": ""
-             },
-             "require": {
--                "doctrine/instantiator": "^1.0.2",
--                "php": ">=5.3.3",
--                "phpunit/php-text-template": "~1.2",
--                "sebastian/exporter": "~1.2"
-+                "ext-simplexml": "*",
-+                "ext-tokenizer": "*",
-+                "ext-xmlwriter": "*",
-+                "php": ">=5.4.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.4"
--            },
--            "suggest": {
--                "ext-soap": "*"
-+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
-             },
-+            "bin": [
-+                "bin/phpcs",
-+                "bin/phpcbf"
-+            ],
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3.x-dev"
-+                    "dev-master": "3.x-dev"
-                 }
-             },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Sebastian Bergmann",
--                    "email": "sb@sebastian-bergmann.de",
-+                    "name": "Greg Sherwood",
-                     "role": "lead"
-                 }
-             ],
--            "description": "Mock Object library for PHPUnit",
--            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-+            "homepage": "http://www.squizlabs.com/php-codesniffer",
-             "keywords": [
--                "mock",
--                "xunit"
-+                "phpcs",
-+                "standards"
-             ],
--            "time": "2015-08-19 09:14:08"
-+            "time": "2018-07-26T23:47:18+00:00"
-         },
-         {
--            "name": "sebastian/comparator",
--            "version": "1.2.0",
-+            "name": "symfony/browser-kit",
-+            "version": "v4.2.4",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/comparator.git",
--                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
-+                "url": "https://github.com/symfony/browser-kit.git",
-+                "reference": "61d85c5af2fc058014c7c89504c3944e73a086f0"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
--                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
-+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/61d85c5af2fc058014c7c89504c3944e73a086f0",
-+                "reference": "61d85c5af2fc058014c7c89504c3944e73a086f0",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3",
--                "sebastian/diff": "~1.2",
--                "sebastian/exporter": "~1.2"
-+                "php": "^7.1.3",
-+                "symfony/dom-crawler": "~3.4|~4.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.4"
-+                "symfony/css-selector": "~3.4|~4.0",
-+                "symfony/process": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/process": ""
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.2.x-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
--                "classmap": [
--                    "src/"
-+                "psr-4": {
-+                    "Symfony\\Component\\BrowserKit\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Jeff Welch",
--                    "email": "whatthejeff@gmail.com"
--                },
--                {
--                    "name": "Volker Dusch",
--                    "email": "github@wallbash.com"
--                },
--                {
--                    "name": "Bernhard Schussek",
--                    "email": "bschussek@2bepublished.at"
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-                 },
-                 {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Provides the functionality to compare PHP values for equality",
--            "homepage": "http://www.github.com/sebastianbergmann/comparator",
--            "keywords": [
--                "comparator",
--                "compare",
--                "equality"
--            ],
--            "time": "2015-07-26 15:48:44"
-+            "description": "Symfony BrowserKit Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-23T15:17:42+00:00"
-         },
-         {
--            "name": "sebastian/diff",
--            "version": "1.3.0",
-+            "name": "symfony/config",
-+            "version": "v4.2.4",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/diff.git",
--                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
-+                "url": "https://github.com/symfony/config.git",
-+                "reference": "7f70d79c7a24a94f8e98abb988049403a53d7b31"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
--                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
-+                "url": "https://api.github.com/repos/symfony/config/zipball/7f70d79c7a24a94f8e98abb988049403a53d7b31",
-+                "reference": "7f70d79c7a24a94f8e98abb988049403a53d7b31",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^7.1.3",
-+                "symfony/filesystem": "~3.4|~4.0",
-+                "symfony/polyfill-ctype": "~1.8"
-+            },
-+            "conflict": {
-+                "symfony/finder": "<3.4"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.2"
-+                "symfony/dependency-injection": "~3.4|~4.0",
-+                "symfony/event-dispatcher": "~3.4|~4.0",
-+                "symfony/finder": "~3.4|~4.0",
-+                "symfony/yaml": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/yaml": "To use the yaml reference dumper"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.3-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
--                "classmap": [
--                    "src/"
-+                "psr-4": {
-+                    "Symfony\\Component\\Config\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Kore Nordmann",
--                    "email": "mail@kore-nordmann.de"
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-                 },
-                 {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Diff implementation",
--            "homepage": "http://www.github.com/sebastianbergmann/diff",
--            "keywords": [
--                "diff"
--            ],
--            "time": "2015-02-22 15:13:53"
-+            "description": "Symfony Config Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-23T15:17:42+00:00"
-         },
-         {
--            "name": "sebastian/environment",
--            "version": "1.3.2",
-+            "name": "symfony/contracts",
-+            "version": "v1.0.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/environment.git",
--                "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44"
-+                "url": "https://github.com/symfony/contracts.git",
-+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44",
--                "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44",
-+                "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf",
-+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^7.1.3"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.4"
-+                "psr/cache": "^1.0",
-+                "psr/container": "^1.0"
-+            },
-+            "suggest": {
-+                "psr/cache": "When using the Cache contracts",
-+                "psr/container": "When using the Service contracts",
-+                "symfony/cache-contracts-implementation": "",
-+                "symfony/service-contracts-implementation": "",
-+                "symfony/translation-contracts-implementation": ""
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.3.x-dev"
-+                    "dev-master": "1.0-dev"
-                 }
-             },
-             "autoload": {
--                "classmap": [
--                    "src/"
-+                "psr-4": {
-+                    "Symfony\\Contracts\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "**/Tests/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Provides functionality to handle HHVM/PHP environments",
--            "homepage": "http://www.github.com/sebastianbergmann/environment",
-+            "description": "A set of abstractions extracted out of the Symfony components",
-+            "homepage": "https://symfony.com",
-             "keywords": [
--                "Xdebug",
--                "environment",
--                "hhvm"
-+                "abstractions",
-+                "contracts",
-+                "decoupling",
-+                "interfaces",
-+                "interoperability",
-+                "standards"
-             ],
--            "time": "2015-08-03 06:14:51"
-+            "time": "2018-12-05T08:06:11+00:00"
-         },
-         {
--            "name": "sebastian/exporter",
--            "version": "1.2.1",
-+            "name": "symfony/dependency-injection",
-+            "version": "v4.2.4",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/exporter.git",
--                "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
-+                "url": "https://github.com/symfony/dependency-injection.git",
-+                "reference": "cdadb3765df7c89ac93628743913b92bb91f1704"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
--                "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
-+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/cdadb3765df7c89ac93628743913b92bb91f1704",
-+                "reference": "cdadb3765df7c89ac93628743913b92bb91f1704",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3",
--                "sebastian/recursion-context": "~1.0"
-+                "php": "^7.1.3",
-+                "psr/container": "^1.0",
-+                "symfony/contracts": "^1.0"
-+            },
-+            "conflict": {
-+                "symfony/config": "<4.2",
-+                "symfony/finder": "<3.4",
-+                "symfony/proxy-manager-bridge": "<3.4",
-+                "symfony/yaml": "<3.4"
-+            },
-+            "provide": {
-+                "psr/container-implementation": "1.0",
-+                "symfony/service-contracts-implementation": "1.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.4"
-+                "symfony/config": "~4.2",
-+                "symfony/expression-language": "~3.4|~4.0",
-+                "symfony/yaml": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/config": "",
-+                "symfony/expression-language": "For using expressions in service container configuration",
-+                "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
-+                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-+                "symfony/yaml": ""
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.2.x-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
--                "classmap": [
--                    "src/"
-+                "psr-4": {
-+                    "Symfony\\Component\\DependencyInjection\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Jeff Welch",
--                    "email": "whatthejeff@gmail.com"
--                },
--                {
--                    "name": "Volker Dusch",
--                    "email": "github@wallbash.com"
--                },
--                {
--                    "name": "Bernhard Schussek",
--                    "email": "bschussek@2bepublished.at"
--                },
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-                 },
-                 {
--                    "name": "Adam Harvey",
--                    "email": "aharvey@php.net"
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Provides the functionality to export PHP variables for visualization",
--            "homepage": "http://www.github.com/sebastianbergmann/exporter",
--            "keywords": [
--                "export",
--                "exporter"
--            ],
--            "time": "2015-06-21 07:55:53"
-+            "description": "Symfony DependencyInjection Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-23T15:17:42+00:00"
-         },
-         {
--            "name": "sebastian/recursion-context",
--            "version": "1.0.1",
-+            "name": "symfony/dom-crawler",
-+            "version": "v4.2.4",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/recursion-context.git",
--                "reference": "994d4a811bafe801fb06dccbee797863ba2792ba"
-+                "url": "https://github.com/symfony/dom-crawler.git",
-+                "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba",
--                "reference": "994d4a811bafe801fb06dccbee797863ba2792ba",
-+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/53c97769814c80a84a8403efcf3ae7ae966d53bb",
-+                "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^7.1.3",
-+                "symfony/polyfill-ctype": "~1.8",
-+                "symfony/polyfill-mbstring": "~1.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.4"
-+                "symfony/css-selector": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/css-selector": ""
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.0.x-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
--                "classmap": [
--                    "src/"
-+                "psr-4": {
-+                    "Symfony\\Component\\DomCrawler\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Jeff Welch",
--                    "email": "whatthejeff@gmail.com"
--                },
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-                 },
-                 {
--                    "name": "Adam Harvey",
--                    "email": "aharvey@php.net"
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Provides functionality to recursively process PHP variables",
--            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
--            "time": "2015-06-21 08:04:50"
-+            "description": "Symfony DomCrawler Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-23T15:17:42+00:00"
-         },
-         {
--            "name": "sebastian/version",
--            "version": "1.0.6",
-+            "name": "symfony/http-foundation",
-+            "version": "v4.2.4",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/version.git",
--                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
-+                "url": "https://github.com/symfony/http-foundation.git",
-+                "reference": "850a667d6254ccf6c61d853407b16f21c4579c77"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
--                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/850a667d6254ccf6c61d853407b16f21c4579c77",
-+                "reference": "850a667d6254ccf6c61d853407b16f21c4579c77",
-                 "shasum": ""
-             },
-+            "require": {
-+                "php": "^7.1.3",
-+                "symfony/polyfill-mbstring": "~1.1"
-+            },
-+            "require-dev": {
-+                "predis/predis": "~1.0",
-+                "symfony/expression-language": "~3.4|~4.0"
-+            },
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-             "autoload": {
--                "classmap": [
--                    "src/"
-+                "psr-4": {
-+                    "Symfony\\Component\\HttpFoundation\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de",
--                    "role": "lead"
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
--            "homepage": "https://github.com/sebastianbergmann/version",
--            "time": "2015-06-21 13:59:46"
-+            "description": "Symfony HttpFoundation Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-26T08:03:39+00:00"
-         },
-         {
--            "name": "sjparkinson/static-review",
--            "version": "4.1.1",
-+            "name": "symfony/options-resolver",
-+            "version": "v4.2.4",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sjparkinson/static-review.git",
--                "reference": "493c3410cf146a12fca84209bad126c494e125f0"
-+                "url": "https://github.com/symfony/options-resolver.git",
-+                "reference": "3896e5a7d06fd15fa4947694c8dcdd371ff147d1"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sjparkinson/static-review/zipball/493c3410cf146a12fca84209bad126c494e125f0",
--                "reference": "493c3410cf146a12fca84209bad126c494e125f0",
-+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3896e5a7d06fd15fa4947694c8dcdd371ff147d1",
-+                "reference": "3896e5a7d06fd15fa4947694c8dcdd371ff147d1",
-                 "shasum": ""
-             },
-             "require": {
--                "league/climate": "~2.0",
--                "php": ">=5.4.0",
--                "symfony/console": "~2.0",
--                "symfony/process": "~2.0"
--            },
--            "require-dev": {
--                "mockery/mockery": "~0.9",
--                "phpunit/phpunit": "~4.0",
--                "sensiolabs/security-checker": "~2.0",
--                "squizlabs/php_codesniffer": "~1.0"
--            },
--            "suggest": {
--                "sensiolabs/security-checker": "Required for ComposerSecurityReview.",
--                "squizlabs/php_codesniffer": "Required for PhpCodeSnifferReview."
-+                "php": "^7.1.3"
-             },
--            "bin": [
--                "bin/static-review.php"
--            ],
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-             "autoload": {
-                 "psr-4": {
--                    "StaticReview\\": "src/"
--                }
-+                    "Symfony\\Component\\OptionsResolver\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-@@ -3271,120 +8989,112 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Samuel Parkinson",
--                    "email": "sam.james.parkinson@gmail.com",
--                    "homepage": "http://samp.im"
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "An extendable framework for version control hooks.",
--            "time": "2014-09-22 08:40:36"
-+            "description": "Symfony OptionsResolver Component",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "config",
-+                "configuration",
-+                "options"
-+            ],
-+            "time": "2019-02-23T15:17:42+00:00"
-         },
-         {
--            "name": "squizlabs/php_codesniffer",
--            "version": "1.5.3",
-+            "name": "symfony/polyfill-php70",
-+            "version": "v1.10.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
--                "reference": "396178ada8499ec492363587f037125bf7b07fcc"
-+                "url": "https://github.com/symfony/polyfill-php70.git",
-+                "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/396178ada8499ec492363587f037125bf7b07fcc",
--                "reference": "396178ada8499ec492363587f037125bf7b07fcc",
-+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/6b88000cdd431cd2e940caa2cb569201f3f84224",
-+                "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224",
-                 "shasum": ""
-             },
-             "require": {
--                "ext-tokenizer": "*",
--                "php": ">=5.1.2"
--            },
--            "suggest": {
--                "phpunit/php-timer": "dev-master"
-+                "paragonie/random_compat": "~1.0|~2.0|~9.99",
-+                "php": ">=5.3.3"
-             },
--            "bin": [
--                "scripts/phpcs"
--            ],
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-phpcs-fixer": "2.0.x-dev"
-+                    "dev-master": "1.9-dev"
-                 }
-             },
-             "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Php70\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-+                ],
-                 "classmap": [
--                    "CodeSniffer.php",
--                    "CodeSniffer/CLI.php",
--                    "CodeSniffer/Exception.php",
--                    "CodeSniffer/File.php",
--                    "CodeSniffer/Report.php",
--                    "CodeSniffer/Reporting.php",
--                    "CodeSniffer/Sniff.php",
--                    "CodeSniffer/Tokens.php",
--                    "CodeSniffer/Reports/",
--                    "CodeSniffer/CommentParser/",
--                    "CodeSniffer/Tokenizers/",
--                    "CodeSniffer/DocGenerators/",
--                    "CodeSniffer/Standards/AbstractPatternSniff.php",
--                    "CodeSniffer/Standards/AbstractScopeSniff.php",
--                    "CodeSniffer/Standards/AbstractVariableSniff.php",
--                    "CodeSniffer/Standards/IncorrectPatternException.php",
--                    "CodeSniffer/Standards/Generic/Sniffs/",
--                    "CodeSniffer/Standards/MySource/Sniffs/",
--                    "CodeSniffer/Standards/PEAR/Sniffs/",
--                    "CodeSniffer/Standards/PSR1/Sniffs/",
--                    "CodeSniffer/Standards/PSR2/Sniffs/",
--                    "CodeSniffer/Standards/Squiz/Sniffs/",
--                    "CodeSniffer/Standards/Zend/Sniffs/"
-+                    "Resources/stubs"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Greg Sherwood",
--                    "role": "lead"
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
--            "homepage": "http://www.squizlabs.com/php-codesniffer",
-+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-+            "homepage": "https://symfony.com",
-             "keywords": [
--                "phpcs",
--                "standards"
-+                "compatibility",
-+                "polyfill",
-+                "portable",
-+                "shim"
-             ],
--            "time": "2014-05-01 03:07:07"
-+            "time": "2018-09-21T06:26:08+00:00"
-         },
-         {
--            "name": "symfony/config",
--            "version": "v2.7.3",
-+            "name": "symfony/polyfill-php72",
-+            "version": "v1.10.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Config.git",
--                "reference": "6c905bbed1e728226de656e4c07d620dfe9e80d9"
-+                "url": "https://github.com/symfony/polyfill-php72.git",
-+                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Config/zipball/6c905bbed1e728226de656e4c07d620dfe9e80d9",
--                "reference": "6c905bbed1e728226de656e4c07d620dfe9e80d9",
-+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
-+                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.9",
--                "symfony/filesystem": "~2.3"
--            },
--            "require-dev": {
--                "symfony/phpunit-bridge": "~2.7"
-+                "php": ">=5.3.3"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.7-dev"
-+                    "dev-master": "1.9-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Symfony\\Component\\Config\\": ""
--                }
-+                    "Symfony\\Polyfill\\Php72\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-@@ -3392,59 +9102,55 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-                 },
-                 {
-                     "name": "Symfony Community",
-                     "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Symfony Config Component",
-+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-             "homepage": "https://symfony.com",
--            "time": "2015-07-09 16:07:40"
-+            "keywords": [
-+                "compatibility",
-+                "polyfill",
-+                "portable",
-+                "shim"
-+            ],
-+            "time": "2018-09-21T13:07:52+00:00"
-         },
-         {
--            "name": "symfony/dependency-injection",
--            "version": "v2.7.3",
-+            "name": "symfony/stopwatch",
-+            "version": "v4.2.4",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/DependencyInjection.git",
--                "reference": "851e3ffe8a366b1590bdaf3df2c1395f2d27d8a6"
-+                "url": "https://github.com/symfony/stopwatch.git",
-+                "reference": "b1a5f646d56a3290230dbc8edf2a0d62cda23f67"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/851e3ffe8a366b1590bdaf3df2c1395f2d27d8a6",
--                "reference": "851e3ffe8a366b1590bdaf3df2c1395f2d27d8a6",
-+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b1a5f646d56a3290230dbc8edf2a0d62cda23f67",
-+                "reference": "b1a5f646d56a3290230dbc8edf2a0d62cda23f67",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.9"
--            },
--            "conflict": {
--                "symfony/expression-language": "<2.6"
--            },
--            "require-dev": {
--                "symfony/config": "~2.2",
--                "symfony/expression-language": "~2.6",
--                "symfony/phpunit-bridge": "~2.7",
--                "symfony/yaml": "~2.1"
--            },
--            "suggest": {
--                "symfony/config": "",
--                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
--                "symfony/yaml": ""
-+                "php": "^7.1.3",
-+                "symfony/contracts": "^1.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.7-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Symfony\\Component\\DependencyInjection\\": ""
--                }
-+                    "Symfony\\Component\\Stopwatch\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-@@ -3460,49 +9166,50 @@
-                     "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Symfony DependencyInjection Component",
-+            "description": "Symfony Stopwatch Component",
-             "homepage": "https://symfony.com",
--            "time": "2015-07-28 14:07:07"
-+            "time": "2019-01-16T20:31:39+00:00"
-         },
-         {
--            "name": "symfony/event-dispatcher",
--            "version": "v2.7.3",
-+            "name": "symfony/yaml",
-+            "version": "v3.4.23",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/EventDispatcher.git",
--                "reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3"
-+                "url": "https://github.com/symfony/yaml.git",
-+                "reference": "57f1ce82c997f5a8701b89ef970e36bb657fd09c"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/9310b5f9a87ec2ea75d20fec0b0017c77c66dac3",
--                "reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3",
-+                "url": "https://api.github.com/repos/symfony/yaml/zipball/57f1ce82c997f5a8701b89ef970e36bb657fd09c",
-+                "reference": "57f1ce82c997f5a8701b89ef970e36bb657fd09c",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.9"
-+                "php": "^5.5.9|>=7.0.8",
-+                "symfony/polyfill-ctype": "~1.8"
-+            },
-+            "conflict": {
-+                "symfony/console": "<3.4"
-             },
-             "require-dev": {
--                "psr/log": "~1.0",
--                "symfony/config": "~2.0,>=2.0.5",
--                "symfony/dependency-injection": "~2.6",
--                "symfony/expression-language": "~2.6",
--                "symfony/phpunit-bridge": "~2.7",
--                "symfony/stopwatch": "~2.3"
-+                "symfony/console": "~3.4|~4.0"
-             },
-             "suggest": {
--                "symfony/dependency-injection": "",
--                "symfony/http-kernel": ""
-+                "symfony/console": "For validating YAML files using the lint command"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.7-dev"
-+                    "dev-master": "3.4-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Symfony\\Component\\EventDispatcher\\": ""
--                }
-+                    "Symfony\\Component\\Yaml\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-@@ -3518,137 +9225,172 @@
-                     "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Symfony EventDispatcher Component",
-+            "description": "Symfony Yaml Component",
-             "homepage": "https://symfony.com",
--            "time": "2015-06-18 19:21:56"
-+            "time": "2019-02-23T15:06:07+00:00"
-         },
-         {
--            "name": "symfony/filesystem",
--            "version": "v2.7.3",
-+            "name": "theseer/fdomdocument",
-+            "version": "1.6.6",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Filesystem.git",
--                "reference": "2d7b2ddaf3f548f4292df49a99d19c853d43f0b8"
-+                "url": "https://github.com/theseer/fDOMDocument.git",
-+                "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/2d7b2ddaf3f548f4292df49a99d19c853d43f0b8",
--                "reference": "2d7b2ddaf3f548f4292df49a99d19c853d43f0b8",
-+                "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/6e8203e40a32a9c770bcb62fe37e68b948da6dca",
-+                "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.9"
--            },
--            "require-dev": {
--                "symfony/phpunit-bridge": "~2.7"
-+                "ext-dom": "*",
-+                "lib-libxml": "*",
-+                "php": ">=5.3.3"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.7-dev"
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Arne Blankerts",
-+                    "email": "arne@blankerts.de",
-+                    "role": "lead"
-                 }
-+            ],
-+            "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
-+            "homepage": "https://github.com/theseer/fDOMDocument",
-+            "time": "2017-06-30T11:53:12+00:00"
-+        },
-+        {
-+            "name": "theseer/tokenizer",
-+            "version": "1.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/theseer/tokenizer.git",
-+                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-+                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-dom": "*",
-+                "ext-tokenizer": "*",
-+                "ext-xmlwriter": "*",
-+                "php": "^7.0"
-             },
-+            "type": "library",
-             "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\Filesystem\\": ""
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Arne Blankerts",
-+                    "email": "arne@blankerts.de",
-+                    "role": "Developer"
-                 }
-             ],
--            "description": "Symfony Filesystem Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-07-09 16:07:40"
-+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-+            "time": "2017-04-07T12:08:54+00:00"
-         },
-         {
--            "name": "symfony/stopwatch",
--            "version": "v2.7.3",
-+            "name": "vlucas/phpdotenv",
-+            "version": "v2.6.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Stopwatch.git",
--                "reference": "b07a866719bbac5294c67773340f97b871733310"
-+                "url": "https://github.com/vlucas/phpdotenv.git",
-+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/b07a866719bbac5294c67773340f97b871733310",
--                "reference": "b07a866719bbac5294c67773340f97b871733310",
-+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
-+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.9"
-+                "php": ">=5.3.9",
-+                "symfony/polyfill-ctype": "^1.9"
-             },
-             "require-dev": {
--                "symfony/phpunit-bridge": "~2.7"
-+                "phpunit/phpunit": "^4.8.35 || ^5.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.7-dev"
-+                    "dev-master": "2.6-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Symfony\\Component\\Stopwatch\\": ""
-+                    "Dotenv\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Vance Lucas",
-+                    "email": "vance@vancelucas.com",
-+                    "homepage": "http://www.vancelucas.com"
-                 }
-             ],
--            "description": "Symfony Stopwatch Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-07-01 18:23:16"
-+            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
-+            "keywords": [
-+                "dotenv",
-+                "env",
-+                "environment"
-+            ],
-+            "time": "2019-01-29T11:11:52+00:00"
-         },
-         {
--            "name": "symfony/yaml",
--            "version": "v2.7.3",
-+            "name": "webmozart/assert",
-+            "version": "1.4.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Yaml.git",
--                "reference": "71340e996171474a53f3d29111d046be4ad8a0ff"
-+                "url": "https://github.com/webmozart/assert.git",
-+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Yaml/zipball/71340e996171474a53f3d29111d046be4ad8a0ff",
--                "reference": "71340e996171474a53f3d29111d046be4ad8a0ff",
-+                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
-+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.9"
-+                "php": "^5.3.3 || ^7.0",
-+                "symfony/polyfill-ctype": "^1.8"
-             },
-             "require-dev": {
--                "symfony/phpunit-bridge": "~2.7"
-+                "phpunit/phpunit": "^4.6",
-+                "sebastian/version": "^1.0.1"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.7-dev"
-+                    "dev-master": "1.3-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Symfony\\Component\\Yaml\\": ""
-+                    "Webmozart\\Assert\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -3657,41 +9399,45 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Bernhard Schussek",
-+                    "email": "bschussek@gmail.com"
-                 }
-             ],
--            "description": "Symfony Yaml Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-07-28 14:07:07"
-+            "description": "Assertions to validate method input/output with nice error messages.",
-+            "keywords": [
-+                "assert",
-+                "check",
-+                "validate"
-+            ],
-+            "time": "2018-12-25T11:19:39+00:00"
-         }
-     ],
-     "aliases": [],
--    "minimum-stability": "alpha",
-+    "minimum-stability": "stable",
-     "stability-flags": {
--        "composer/composer": 15,
-         "phpmd/phpmd": 0
-     },
-     "prefer-stable": true,
-     "prefer-lowest": false,
-     "platform": {
--        "php": "~5.5.0|~5.6.0|~7.0.0"
--    },
--    "platform-dev": {
--        "lib-libxml": "*",
-+        "php": "~7.1.3||~7.2.0",
-+        "ext-bcmath": "*",
-         "ext-ctype": "*",
--        "ext-gd": "*",
--        "ext-spl": "*",
-+        "ext-curl": "*",
-         "ext-dom": "*",
--        "ext-simplexml": "*",
--        "ext-mcrypt": "*",
-+        "ext-gd": "*",
-         "ext-hash": "*",
--        "ext-curl": "*",
-         "ext-iconv": "*",
--        "ext-intl": "*"
--    }
-+        "ext-intl": "*",
-+        "ext-mbstring": "*",
-+        "ext-openssl": "*",
-+        "ext-pdo_mysql": "*",
-+        "ext-simplexml": "*",
-+        "ext-soap": "*",
-+        "ext-spl": "*",
-+        "ext-xsl": "*",
-+        "ext-zip": "*",
-+        "lib-libxml": "*"
-+    },
-+    "platform-dev": []
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
-index 756542fbdb2..4fb998ab77b 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
-@@ -1,4437 +1,15991 @@
- {
-     "_readme": [
-         "This file locks the dependencies of your project to a known state",
--        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-         "This file is @generated automatically"
-     ],
--    "hash": "8500e076fe26c04cf68124e561f62f52",
-+    "content-hash": "758832dca53cba659d813c126f37d8a1",
-     "packages": [
-         {
--            "name": "composer/composer",
--            "version": "1.0.0-alpha9",
-+            "name": "amzn/amazon-pay-and-login-magento-2-module",
-+            "version": "3.1.4",
-+            "require": {
-+                "amzn/amazon-pay-and-login-with-amazon-core-module": "3.1.4",
-+                "amzn/amazon-pay-module": "3.1.4",
-+                "amzn/login-with-amazon-module": "3.1.4"
-+            },
-+            "type": "metapackage",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "description": "Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon"
-+        },
-+        {
-+            "name": "amzn/amazon-pay-and-login-with-amazon-core-module",
-+            "version": "3.1.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/amzn/amazon-pay-and-login-with-amazon-core-module/amzn-amazon-pay-and-login-with-amazon-core-module-3.1.4.0.zip",
-+                "reference": null,
-+                "shasum": "1ad5fdd9a997284f005d933b1fead3a746f158bb"
-+            },
-+            "require": {
-+                "amzn/amazon-pay-sdk-php": "^3.2.0",
-+                "magento/framework": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-checkout": "*",
-+                "magento/module-config": "*",
-+                "magento/module-customer": "*",
-+                "magento/module-developer": "*",
-+                "magento/module-payment": "*",
-+                "magento/module-paypal": "*",
-+                "magento/module-quote": "*",
-+                "magento/module-sales": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Amazon\\Core\\": ""
-+                }
-+            },
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "description": "Shared functionality for Amazon Pay and Login with Amazon modules"
-+        },
-+        {
-+            "name": "amzn/amazon-pay-module",
-+            "version": "3.1.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/amzn/amazon-pay-module/amzn-amazon-pay-module-3.1.4.0.zip",
-+                "reference": null,
-+                "shasum": "03cec957586f9e14f0914b58f651c661c509d08d"
-+            },
-+            "require": {
-+                "amzn/amazon-pay-and-login-with-amazon-core-module": "^3.1.4",
-+                "amzn/login-with-amazon-module": "^3.1.4",
-+                "magento/module-backend": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-checkout": "*",
-+                "magento/module-customer": "*",
-+                "magento/module-directory": "*",
-+                "magento/module-eav": "*",
-+                "magento/module-payment": "*",
-+                "magento/module-paypal": "*",
-+                "magento/module-quote": "*",
-+                "magento/module-sales": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-customer": "*",
-+                "magento/module-scalable-checkout": "*",
-+                "magento/module-scalable-oms": "*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Amazon\\Payment\\": ""
-+                }
-+            },
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "description": "Amazon Pay module"
-+        },
-+        {
-+            "name": "amzn/amazon-pay-sdk-php",
-+            "version": "3.4.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/composer/composer.git",
--                "reference": "eb1ce550ca51134ee619ad3e37f5a0b7e980dd24"
-+                "url": "https://github.com/amzn/amazon-pay-sdk-php.git",
-+                "reference": "aff849d831b95469d68708ac1bdb316a56896e4c"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/composer/composer/zipball/eb1ce550ca51134ee619ad3e37f5a0b7e980dd24",
--                "reference": "eb1ce550ca51134ee619ad3e37f5a0b7e980dd24",
-+                "url": "https://api.github.com/repos/amzn/amazon-pay-sdk-php/zipball/aff849d831b95469d68708ac1bdb316a56896e4c",
-+                "reference": "aff849d831b95469d68708ac1bdb316a56896e4c",
-                 "shasum": ""
-             },
-             "require": {
--                "justinrainbow/json-schema": "~1.1",
--                "php": ">=5.3.2",
--                "seld/jsonlint": "~1.0",
--                "symfony/console": "~2.3",
--                "symfony/finder": "~2.2",
--                "symfony/process": "~2.1"
-+                "ext-curl": "*",
-+                "php": ">=5.5.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.0"
-+                "phpunit/phpunit": "^4"
-             },
--            "suggest": {
--                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
--                "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic"
--            },
--            "bin": [
--                "bin/composer"
--            ],
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.0-dev"
--                }
--            },
-             "autoload": {
--                "psr-0": {
--                    "Composer": "src/"
-+                "psr-4": {
-+                    "AmazonPay\\": "AmazonPay/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "Apache OSL-2"
-             ],
-             "authors": [
-                 {
--                    "name": "Nils Adermann",
--                    "email": "naderman@naderman.de",
--                    "homepage": "http://www.naderman.de"
--                },
--                {
--                    "name": "Jordi Boggiano",
--                    "email": "j.boggiano@seld.be",
--                    "homepage": "http://seld.be"
-+                    "name": "Amazon Pay SDK",
-+                    "email": "amazon-pay-sdk@amazon.com"
-                 }
-             ],
--            "description": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.",
--            "homepage": "http://getcomposer.org/",
-+            "description": "Amazon Pay SDK (PHP)",
-+            "homepage": "https://github.com/amzn/amazon-pay-sdk-php",
-             "keywords": [
--                "autoload",
--                "dependency",
--                "package"
-+                "amazon",
-+                "amazon pay",
-+                "amazon payments",
-+                "pay",
-+                "pay with amazon",
-+                "payment",
-+                "payments"
-+            ],
-+            "time": "2019-02-11T16:32:17+00:00"
-+        },
-+        {
-+            "name": "amzn/login-with-amazon-module",
-+            "version": "3.1.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/amzn/login-with-amazon-module/amzn-login-with-amazon-module-3.1.4.0.zip",
-+                "reference": null,
-+                "shasum": "d927403b521e59d36d42a29998c774986c65398b"
-+            },
-+            "require": {
-+                "amzn/amazon-pay-and-login-with-amazon-core-module": "^3.1.4",
-+                "magento/module-checkout": "*",
-+                "magento/module-checkout-agreements": "*",
-+                "magento/module-customer": "*",
-+                "magento/module-eav": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-sales": "*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Amazon\\Login\\": ""
-+                }
-+            },
-+            "license": [
-+                "Apache-2.0"
-             ],
--            "time": "2014-12-07 17:15:20"
-+            "description": "Login with Amazon module"
-         },
-         {
--            "name": "justinrainbow/json-schema",
--            "version": "1.4.1",
-+            "name": "bacon/bacon-qr-code",
-+            "version": "1.0.3",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/justinrainbow/json-schema.git",
--                "reference": "2465fe486c864e30badaa4d005ebdf89dbc503f3"
-+                "url": "https://github.com/Bacon/BaconQrCode.git",
-+                "reference": "5a91b62b9d37cee635bbf8d553f4546057250bee"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2465fe486c864e30badaa4d005ebdf89dbc503f3",
--                "reference": "2465fe486c864e30badaa4d005ebdf89dbc503f3",
-+                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/5a91b62b9d37cee635bbf8d553f4546057250bee",
-+                "reference": "5a91b62b9d37cee635bbf8d553f4546057250bee",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.0"
-+                "ext-iconv": "*",
-+                "php": "^5.4|^7.0"
-             },
-             "require-dev": {
--                "json-schema/json-schema-test-suite": "1.1.0",
--                "phpdocumentor/phpdocumentor": "~2",
--                "phpunit/phpunit": "~3.7"
-+                "phpunit/phpunit": "^4.8"
-             },
--            "bin": [
--                "bin/validate-json"
--            ],
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.4.x-dev"
--                }
-+            "suggest": {
-+                "ext-gd": "to generate QR code images"
-             },
-+            "type": "library",
-             "autoload": {
-                 "psr-0": {
--                    "JsonSchema": "src/"
-+                    "BaconQrCode": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "BSD-2-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Bruno Prieto Reis",
--                    "email": "bruno.p.reis@gmail.com"
--                },
--                {
--                    "name": "Justin Rainbow",
--                    "email": "justin.rainbow@gmail.com"
-+                    "name": "Ben Scholzen 'DASPRiD'",
-+                    "email": "mail@dasprids.de",
-+                    "homepage": "http://www.dasprids.de",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "BaconQrCode is a QR code generator for PHP.",
-+            "homepage": "https://github.com/Bacon/BaconQrCode",
-+            "time": "2017-10-17T09:59:25+00:00"
-+        },
-+        {
-+            "name": "beberlei/assert",
-+            "version": "v2.9.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/beberlei/assert.git",
-+                "reference": "ec9e4cf0b63890edce844ee3922e2b95a526e936"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/beberlei/assert/zipball/ec9e4cf0b63890edce844ee3922e2b95a526e936",
-+                "reference": "ec9e4cf0b63890edce844ee3922e2b95a526e936",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-mbstring": "*",
-+                "php": ">=5.3"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "^2.1.1",
-+                "phpunit/phpunit": "^4.8.35|^5.7"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Assert\\": "lib/Assert"
-                 },
-+                "files": [
-+                    "lib/Assert/functions.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-2-Clause"
-+            ],
-+            "authors": [
-                 {
--                    "name": "Igor Wiedler",
--                    "email": "igor@wiedler.ch"
-+                    "name": "Benjamin Eberlei",
-+                    "email": "kontakt@beberlei.de",
-+                    "role": "Lead Developer"
-                 },
-                 {
--                    "name": "Robert Schönthal",
--                    "email": "seroscho@googlemail.com"
-+                    "name": "Richard Quadling",
-+                    "email": "rquadling@gmail.com",
-+                    "role": "Collaborator"
-                 }
-             ],
--            "description": "A library to validate a json schema.",
--            "homepage": "https://github.com/justinrainbow/json-schema",
-+            "description": "Thin assertion library for input validation in business models.",
-             "keywords": [
--                "json",
--                "schema"
-+                "assert",
-+                "assertion",
-+                "validation"
-             ],
--            "time": "2015-03-27 16:41:39"
-+            "time": "2018-06-11T17:15:25+00:00"
-         },
-         {
--            "name": "magento/framework",
--            "version": "0.74.0-beta9",
-+            "name": "braintree/braintree_php",
-+            "version": "3.35.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/braintree/braintree_php.git",
-+                "reference": "6c4388199ce379432804a5c18b88585157ef2ed7"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_framework-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "bd9d7a552b4f71dc2b3c74f9bd2d81f15a9037c4"
-+                "url": "https://api.github.com/repos/braintree/braintree_php/zipball/6c4388199ce379432804a5c18b88585157ef2ed7",
-+                "reference": "6c4388199ce379432804a5c18b88585157ef2ed7",
-+                "shasum": ""
-             },
-             "require": {
-                 "ext-curl": "*",
-                 "ext-dom": "*",
--                "ext-gd": "*",
-                 "ext-hash": "*",
--                "ext-iconv": "*",
--                "ext-mcrypt": "*",
--                "ext-simplexml": "*",
--                "ext-spl": "*",
--                "lib-libxml": "*",
--                "magento/magento-composer-installer": "*",
--                "php": "~5.5.0|~5.6.0"
--            },
--            "suggest": {
--                "ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library"
-+                "ext-openssl": "*",
-+                "ext-xmlwriter": "*",
-+                "php": ">=5.4.0"
-             },
--            "type": "magento2-library",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Framework"
--                    ]
--                ]
-+            "require-dev": {
-+                "phpunit/phpunit": "3.7.*"
-             },
-+            "type": "library",
-             "autoload": {
-+                "psr-0": {
-+                    "Braintree": "lib/"
-+                },
-                 "psr-4": {
--                    "Magento\\Framework\\": ""
-+                    "Braintree\\": "lib/Braintree"
-                 }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Braintree",
-+                    "homepage": "https://www.braintreepayments.com"
-+                }
-+            ],
-+            "description": "Braintree PHP Client Library",
-+            "time": "2018-07-26T14:37:38+00:00"
-         },
-         {
--            "name": "magento/language-de_de",
--            "version": "0.74.0-beta9",
-+            "name": "christian-riesen/base32",
-+            "version": "1.3.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/ChristianRiesen/base32.git",
-+                "reference": "80ff0e3b2124e61b4b39e2535709452f70bff367"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-de_de-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "6b1072242183699164f1717d996bb165769c1b6b"
-+                "url": "https://api.github.com/repos/ChristianRiesen/base32/zipball/80ff0e3b2124e61b4b39e2535709452f70bff367",
-+                "reference": "80ff0e3b2124e61b4b39e2535709452f70bff367",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*"
-+                "php": ">=5.3"
-             },
--            "type": "magento2-language",
-+            "require-dev": {
-+                "php": ">=5.6",
-+                "phpunit/phpunit": "^5.0",
-+                "satooshi/php-coveralls": "^1.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/de_de"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.1.x-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Base32\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "German (Germany) language"
-+            "authors": [
-+                {
-+                    "name": "Christian Riesen",
-+                    "email": "chris.riesen@gmail.com",
-+                    "homepage": "http://christianriesen.com",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "Base32 encoder/decoder according to RFC 4648",
-+            "homepage": "https://github.com/ChristianRiesen/base32",
-+            "keywords": [
-+                "base32",
-+                "decode",
-+                "encode",
-+                "rfc4648"
-+            ],
-+            "time": "2018-11-02T09:03:50+00:00"
-         },
-         {
--            "name": "magento/language-en_us",
--            "version": "0.74.0-beta9",
-+            "name": "colinmollenhour/cache-backend-file",
-+            "version": "v1.4.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git",
-+                "reference": "184171cc79933a828c3f9b1a1054724cea22a216"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-en_us-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "70adc34f8d995776366273ff94a0524861b463a2"
--            },
--            "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*"
-+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/184171cc79933a828c3f9b1a1054724cea22a216",
-+                "reference": "184171cc79933a828c3f9b1a1054724cea22a216",
-+                "shasum": ""
-             },
--            "type": "magento2-language",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/en_us"
--                    ]
-+            "type": "magento-module",
-+            "autoload": {
-+                "classmap": [
-+                    "File.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "English (United States) language"
-+            "authors": [
-+                {
-+                    "name": "Colin Mollenhour"
-+                }
-+            ],
-+            "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
-+            "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
-+            "time": "2018-04-05T15:28:43+00:00"
-         },
-         {
--            "name": "magento/language-es_es",
--            "version": "0.74.0-beta9",
-+            "name": "colinmollenhour/cache-backend-redis",
-+            "version": "1.10.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git",
-+                "reference": "cc941a5f4cc017e11d3eab9061811ba9583ed6bf"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-es_es-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "ff62ceb7ce109c31c67fb1fdf154a2415bcc8045"
-+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/cc941a5f4cc017e11d3eab9061811ba9583ed6bf",
-+                "reference": "cc941a5f4cc017e11d3eab9061811ba9583ed6bf",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*"
-+                "magento-hackathon/magento-composer-installer": "*"
-             },
--            "type": "magento2-language",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/es_es"
--                    ]
-+            "type": "magento-module",
-+            "autoload": {
-+                "classmap": [
-+                    "Cm/Cache/Backend/Redis.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "Spanish (Spain) language"
-+            "authors": [
-+                {
-+                    "name": "Colin Mollenhour"
-+                }
-+            ],
-+            "description": "Zend_Cache backend using Redis with full support for tags.",
-+            "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
-+            "time": "2018-09-24T16:02:07+00:00"
-         },
-         {
--            "name": "magento/language-fr_fr",
--            "version": "0.74.0-beta9",
-+            "name": "colinmollenhour/credis",
-+            "version": "1.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/colinmollenhour/credis.git",
-+                "reference": "8ab6db707c821055f9856b8cf76d5f44beb6fd8a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-fr_fr-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "69f30ec0de09458d7e99d9c4ea42548f31411ee2"
-+                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/8ab6db707c821055f9856b8cf76d5f44beb6fd8a",
-+                "reference": "8ab6db707c821055f9856b8cf76d5f44beb6fd8a",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*"
-+                "php": ">=5.4.0"
-             },
--            "type": "magento2-language",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/fr_fr"
--                    ]
-+            "type": "library",
-+            "autoload": {
-+                "classmap": [
-+                    "Client.php",
-+                    "Cluster.php",
-+                    "Sentinel.php",
-+                    "Module.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "French (France) language"
-+            "authors": [
-+                {
-+                    "name": "Colin Mollenhour",
-+                    "email": "colin@mollenhour.com"
-+                }
-+            ],
-+            "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
-+            "homepage": "https://github.com/colinmollenhour/credis",
-+            "time": "2018-05-07T14:45:04+00:00"
-         },
-         {
--            "name": "magento/language-nl_nl",
--            "version": "0.74.0-beta9",
-+            "name": "colinmollenhour/php-redis-session-abstract",
-+            "version": "v1.4.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
-+                "reference": "4949ca28b86037abb44984c77bab9d0a4e075643"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-nl_nl-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "e11c7880d71955b794bccefcf2a26e6f381657a7"
-+                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4949ca28b86037abb44984c77bab9d0a4e075643",
-+                "reference": "4949ca28b86037abb44984c77bab9d0a4e075643",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*"
-+                "colinmollenhour/credis": "~1.6",
-+                "php": "^5.5 || ^7.0"
-             },
--            "type": "magento2-language",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/nl_nl"
--                    ]
--                ]
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Cm\\RedisSession\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "Dutch (Netherlands) language"
-+            "authors": [
-+                {
-+                    "name": "Colin Mollenhour"
-+                }
-+            ],
-+            "description": "A Redis-based session handler with optimistic locking",
-+            "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
-+            "time": "2019-03-18T14:43:14+00:00"
-         },
-         {
--            "name": "magento/language-pt_br",
--            "version": "0.74.0-beta9",
-+            "name": "composer/ca-bundle",
-+            "version": "1.1.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/composer/ca-bundle.git",
-+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-pt_br-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "0b74dfba9407e5d69aca5f6723529e2c1daab7cf"
-+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
-+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*"
-+                "ext-openssl": "*",
-+                "ext-pcre": "*",
-+                "php": "^5.3.2 || ^7.0"
-             },
--            "type": "magento2-language",
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
-+                "psr/log": "^1.0",
-+                "symfony/process": "^2.5 || ^3.0 || ^4.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/pt_br"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Composer\\CaBundle\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "Portuguese (Brazil) language"
-+            "authors": [
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-+                }
-+            ],
-+            "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
-+            "keywords": [
-+                "cabundle",
-+                "cacert",
-+                "certificate",
-+                "ssl",
-+                "tls"
-+            ],
-+            "time": "2019-01-28T09:30:10+00:00"
-         },
-         {
--            "name": "magento/language-zh_cn",
--            "version": "0.74.0-beta9",
-+            "name": "composer/composer",
-+            "version": "1.8.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/composer/composer.git",
-+                "reference": "949b116f9e7d98d8d276594fed74b580d125c0e6"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-zh_cn-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "360355c1ee1d29b958630427d086ba33607f3ef3"
-+                "url": "https://api.github.com/repos/composer/composer/zipball/949b116f9e7d98d8d276594fed74b580d125c0e6",
-+                "reference": "949b116f9e7d98d8d276594fed74b580d125c0e6",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*"
-+                "composer/ca-bundle": "^1.0",
-+                "composer/semver": "^1.0",
-+                "composer/spdx-licenses": "^1.2",
-+                "composer/xdebug-handler": "^1.1",
-+                "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
-+                "php": "^5.3.2 || ^7.0",
-+                "psr/log": "^1.0",
-+                "seld/jsonlint": "^1.4",
-+                "seld/phar-utils": "^1.0",
-+                "symfony/console": "^2.7 || ^3.0 || ^4.0",
-+                "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
-+                "symfony/finder": "^2.7 || ^3.0 || ^4.0",
-+                "symfony/process": "^2.7 || ^3.0 || ^4.0"
-             },
--            "type": "magento2-language",
-+            "conflict": {
-+                "symfony/console": "2.8.38"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35 || ^5.7",
-+                "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
-+            },
-+            "suggest": {
-+                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
-+                "ext-zip": "Enabling the zip extension allows you to unzip archives",
-+                "ext-zlib": "Allow gzip compression of HTTP requests"
-+            },
-+            "bin": [
-+                "bin/composer"
-+            ],
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/zh_cn"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.8-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Composer\\": "src/Composer"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "Chinese (China) language"
-+            "authors": [
-+                {
-+                    "name": "Nils Adermann",
-+                    "email": "naderman@naderman.de",
-+                    "homepage": "http://www.naderman.de"
-+                },
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-+                }
-+            ],
-+            "description": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.",
-+            "homepage": "https://getcomposer.org/",
-+            "keywords": [
-+                "autoload",
-+                "dependency",
-+                "package"
-+            ],
-+            "time": "2019-04-09T15:46:48+00:00"
-         },
-         {
--            "name": "magento/magento-composer-installer",
--            "version": "0.1.4",
-+            "name": "composer/semver",
-+            "version": "1.5.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/magento/magento-composer-installer.git",
--                "reference": "7f03451f71e55d52c2bb07325d56a4e6df322f30"
-+                "url": "https://github.com/composer/semver.git",
-+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/7f03451f71e55d52c2bb07325d56a4e6df322f30",
--                "reference": "7f03451f71e55d52c2bb07325d56a4e6df322f30",
-+                "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
-+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
-                 "shasum": ""
-             },
-             "require": {
--                "composer-plugin-api": "1.0.0"
-+                "php": "^5.3.2 || ^7.0"
-             },
-             "require-dev": {
--                "composer/composer": "*@dev",
--                "firegento/phpcs": "dev-patch-1",
--                "mikey179/vfsstream": "*",
--                "phpunit/phpunit": "*",
--                "phpunit/phpunit-mock-objects": "dev-master",
--                "squizlabs/php_codesniffer": "1.4.7",
--                "symfony/process": "*"
-+                "phpunit/phpunit": "^4.5 || ^5.0.5",
-+                "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
-             },
--            "type": "composer-plugin",
-+            "type": "library",
-             "extra": {
--                "composer-command-registry": [
--                    "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand"
--                ],
--                "class": "MagentoHackathon\\Composer\\Magento\\Plugin"
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-             },
-             "autoload": {
--                "psr-0": {
--                    "MagentoHackathon\\Composer\\Magento": "src/"
-+                "psr-4": {
-+                    "Composer\\Semver\\": "src"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Vinai Kopp",
--                    "email": "vinai@netzarbeiter.com"
-+                    "name": "Nils Adermann",
-+                    "email": "naderman@naderman.de",
-+                    "homepage": "http://www.naderman.de"
-                 },
-                 {
--                    "name": "Daniel Fahlke aka Flyingmana",
--                    "email": "flyingmana@googlemail.com"
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-                 },
-                 {
--                    "name": "Jörg Weller",
--                    "email": "weller@flagbit.de"
--                },
-+                    "name": "Rob Bast",
-+                    "email": "rob.bast@gmail.com",
-+                    "homepage": "http://robbast.nl"
-+                }
-+            ],
-+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
-+            "keywords": [
-+                "semantic",
-+                "semver",
-+                "validation",
-+                "versioning"
-+            ],
-+            "time": "2019-03-19T17:25:45+00:00"
-+        },
-+        {
-+            "name": "composer/spdx-licenses",
-+            "version": "1.5.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/composer/spdx-licenses.git",
-+                "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
-+                "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.3.2 || ^7.0 || ^8.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Composer\\Spdx\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-                 {
--                    "name": "Karl Spies",
--                    "email": "karl.spies@gmx.net"
-+                    "name": "Nils Adermann",
-+                    "email": "naderman@naderman.de",
-+                    "homepage": "http://www.naderman.de"
-                 },
-                 {
--                    "name": "Tobias Vogt",
--                    "email": "tobi@webguys.de"
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-                 },
-                 {
--                    "name": "David Fuhr",
--                    "email": "fuhr@flagbit.de"
-+                    "name": "Rob Bast",
-+                    "email": "rob.bast@gmail.com",
-+                    "homepage": "http://robbast.nl"
-                 }
-             ],
--            "description": "Composer installer for Magento modules",
--            "homepage": "https://github.com/magento/magento-composer-installer",
-+            "description": "SPDX licenses list and validation library.",
-             "keywords": [
--                "composer-installer",
--                "magento"
-+                "license",
-+                "spdx",
-+                "validator"
-             ],
--            "time": "2015-03-05 21:40:30"
-+            "time": "2019-03-26T10:23:26+00:00"
-         },
-         {
--            "name": "magento/magento2-base",
--            "version": "0.74.0-beta9",
-+            "name": "composer/xdebug-handler",
-+            "version": "1.3.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/composer/xdebug-handler.git",
-+                "reference": "d17708133b6c276d6e42ef887a877866b909d892"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_magento2-base-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "268b541398bbca13688ade93d66d390b2f30da7a"
-+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/d17708133b6c276d6e42ef887a877866b909d892",
-+                "reference": "d17708133b6c276d6e42ef887a877866b909d892",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/magento-composer-installer": "*"
-+                "php": "^5.3.2 || ^7.0",
-+                "psr/log": "^1.0"
-             },
--            "replace": {
--                "blueimp/jquery-file-upload": "5.6.14",
--                "colinmollenhour/cache-backend-redis": "dev-master#193d377b7fb2e88595578b282fa01a62d1185abc",
--                "colinmollenhour/credis": "dev-master#f07bbfd4117294f462f0fb19c49221d350bf396f",
--                "components/jquery": "1.11.0",
--                "components/jqueryui": "1.10.4",
--                "linkorb/jsmin-php": "1.1.2",
--                "tinymce/tinymce": "3.4.7",
--                "trentrichardson/jquery-timepicker-addon": "1.4.3",
--                "twbs/bootstrap": "3.1.0"
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
-             },
--            "type": "magento2-component",
--            "extra": {
--                "component_paths": {
--                    "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js",
--                    "colinmollenhour/cache-backend-redis": "lib/internal/Cm/Cache/Backend/Redis.php",
--                    "colinmollenhour/credis": "lib/internal/Credis",
--                    "linkorb/jsmin-php": "lib/internal/JSMin",
--                    "components/jquery": [
--                        "lib/web/jquery.js",
--                        "lib/web/jquery/jquery.min.js",
--                        "lib/web/jquery/jquery-migrate.js",
--                        "lib/web/jquery/jquery-migrate.min.js"
--                    ],
--                    "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader",
--                    "components/jqueryui": [
--                        "lib/web/jquery/jquery-ui.js",
--                        "lib/web/jquery/jquery-ui.min.js"
--                    ],
--                    "twbs/bootstrap": "lib/web/jquery/jquery.tabs.js",
--                    "tinymce/tinymce": "lib/web/tiny_mce"
--                },
--                "map": [
--                    [
--                        "lib/internal/Cm",
--                        "lib/internal/Cm"
--                    ],
--                    [
--                        "lib/internal/LinLibertineFont",
--                        "lib/internal/LinLibertineFont"
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Composer\\XdebugHandler\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "John Stevenson",
-+                    "email": "john-stevenson@blueyonder.co.uk"
-+                }
-+            ],
-+            "description": "Restarts a process without xdebug.",
-+            "keywords": [
-+                "Xdebug",
-+                "performance"
-+            ],
-+            "time": "2019-01-28T20:25:53+00:00"
-+        },
-+        {
-+            "name": "container-interop/container-interop",
-+            "version": "1.2.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/container-interop/container-interop.git",
-+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "psr/container": "^1.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Interop\\Container\\": "src/Interop/Container/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-+            "homepage": "https://github.com/container-interop/container-interop",
-+            "time": "2017-02-14T19:40:03+00:00"
-+        },
-+        {
-+            "name": "donatj/phpuseragentparser",
-+            "version": "v0.13.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/donatj/PhpUserAgent.git",
-+                "reference": "5f2da266d2a386f9b231d4344ae37baf7a467c2d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/donatj/PhpUserAgent/zipball/5f2da266d2a386f9b231d4344ae37baf7a467c2d",
-+                "reference": "5f2da266d2a386f9b231d4344ae37baf7a467c2d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0"
-+            },
-+            "require-dev": {
-+                "camspiers/json-pretty": "0.1.*",
-+                "donatj/drop": "*",
-+                "phpunit/phpunit": "~4.8"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "src/UserAgentParser.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jesse G. Donat",
-+                    "email": "donatj@gmail.com",
-+                    "homepage": "http://donatstudios.com",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "Lightning fast, minimalist PHP UserAgent string parser.",
-+            "homepage": "http://donatstudios.com/PHP-Parser-HTTP_USER_AGENT",
-+            "keywords": [
-+                "browser",
-+                "browser detection",
-+                "parser",
-+                "user agent",
-+                "useragent"
-+            ],
-+            "time": "2019-03-08T20:52:23+00:00"
-+        },
-+        {
-+            "name": "dotmailer/dotmailer-magento2-extension",
-+            "version": "3.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/dotmailer/dotmailer-magento2-extension/dotmailer-dotmailer-magento2-extension-3.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "2ede8827f7faacf72f6bc2004f9d4325f61cbd3f"
-+            },
-+            "require": {
-+                "magento/framework": ">=100 <103",
-+                "magento/module-backend": ">=100 <102",
-+                "magento/module-catalog": ">=101 <104",
-+                "magento/module-catalog-inventory": "100.*",
-+                "magento/module-catalog-rule": ">=100 <102",
-+                "magento/module-checkout": "100.*",
-+                "magento/module-config": ">=100 <103",
-+                "magento/module-cron": "100.*",
-+                "magento/module-customer": ">=100 <103",
-+                "magento/module-directory": "100.*",
-+                "magento/module-eav": ">=100 <103",
-+                "magento/module-email": ">=100 <102",
-+                "magento/module-newsletter": "100.*",
-+                "magento/module-payment": "100.*",
-+                "magento/module-product-alert": "100.*",
-+                "magento/module-quote": ">=100 <102",
-+                "magento/module-reports": "100.*",
-+                "magento/module-review": ">=100 <102",
-+                "magento/module-sales": ">=100 <103",
-+                "magento/module-sales-rule": ">=100 <102",
-+                "magento/module-send-friend": "100.*",
-+                "magento/module-shipping": "100.*",
-+                "magento/module-store": ">=100 <102",
-+                "magento/module-ui": ">=100 <102",
-+                "magento/module-user": ">=100 <102",
-+                "magento/module-wishlist": ">=100 <102"
-+            },
-+            "require-dev": {
-+                "magento/marketplace-eqp": "dev-master",
-+                "phpmd/phpmd": "@stable",
-+                "squizlabs/php_codesniffer": "@stable"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Dotdigitalgroup\\Email\\": ""
-+                }
-+            },
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Calin Diacon",
-+                    "email": "calin.diacon@dotmailer.com"
-+                },
-+                {
-+                    "name": "Adeel Qamar",
-+                    "email": "adeel.qamar@dotmailer.com"
-+                },
-+                {
-+                    "name": "Zygimantas",
-+                    "email": "zygimantas.simkus@dotmailer.com"
-+                }
-+            ],
-+            "description": "dotmailer integration for magento 2"
-+        },
-+        {
-+            "name": "elasticsearch/elasticsearch",
-+            "version": "v6.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/elastic/elasticsearch-php.git",
-+                "reference": "b237a37b2cdf23a5a17fd3576cdea771394ad00d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/b237a37b2cdf23a5a17fd3576cdea771394ad00d",
-+                "reference": "b237a37b2cdf23a5a17fd3576cdea771394ad00d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-json": ">=1.3.7",
-+                "guzzlehttp/ringphp": "~1.0",
-+                "php": "^7.0",
-+                "psr/log": "~1.0"
-+            },
-+            "require-dev": {
-+                "cpliakas/git-wrapper": "~1.0",
-+                "doctrine/inflector": "^1.1",
-+                "mockery/mockery": "0.9.4",
-+                "phpstan/phpstan-shim": "0.8.3",
-+                "phpunit/phpunit": "6.3.0",
-+                "squizlabs/php_codesniffer": "3.0.2",
-+                "symfony/finder": "^2.8",
-+                "symfony/yaml": "^2.8"
-+            },
-+            "suggest": {
-+                "ext-curl": "*",
-+                "monolog/monolog": "Allows for client-level logging and tracing"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Elasticsearch\\": "src/Elasticsearch/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Zachary Tong"
-+                }
-+            ],
-+            "description": "PHP Client for Elasticsearch",
-+            "keywords": [
-+                "client",
-+                "elasticsearch",
-+                "search"
-+            ],
-+            "time": "2019-01-08T18:53:46+00:00"
-+        },
-+        {
-+            "name": "endroid/qr-code",
-+            "version": "2.5.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/endroid/qr-code.git",
-+                "reference": "a9a57ab57ac75928fcdcfb2a71179963ff6fe573"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/endroid/qr-code/zipball/a9a57ab57ac75928fcdcfb2a71179963ff6fe573",
-+                "reference": "a9a57ab57ac75928fcdcfb2a71179963ff6fe573",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "bacon/bacon-qr-code": "^1.0.3",
-+                "ext-gd": "*",
-+                "khanamiryan/qrcode-detector-decoder": "^1.0",
-+                "myclabs/php-enum": "^1.5",
-+                "php": ">=5.6",
-+                "symfony/options-resolver": ">=2.7",
-+                "symfony/property-access": ">=2.7"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": ">=5.7",
-+                "symfony/asset": ">=2.7",
-+                "symfony/browser-kit": ">=2.7",
-+                "symfony/finder": ">=2.7",
-+                "symfony/framework-bundle": ">=2.7",
-+                "symfony/http-kernel": ">=2.7",
-+                "symfony/templating": ">=2.7",
-+                "symfony/yaml": ">=2.7"
-+            },
-+            "type": "symfony-bundle",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Endroid\\QrCode\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jeroen van den Enden",
-+                    "email": "info@endroid.nl",
-+                    "homepage": "http://endroid.nl/"
-+                }
-+            ],
-+            "description": "Endroid QR Code",
-+            "homepage": "https://github.com/endroid/QrCode",
-+            "keywords": [
-+                "bundle",
-+                "code",
-+                "endroid",
-+                "flex",
-+                "qr",
-+                "qrcode",
-+                "symfony"
-+            ],
-+            "time": "2017-10-22T18:56:00+00:00"
-+        },
-+        {
-+            "name": "google/recaptcha",
-+            "version": "1.2.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/google/recaptcha.git",
-+                "reference": "e7add3be59211482ecdb942288f52da64a35f61a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/google/recaptcha/zipball/e7add3be59211482ecdb942288f52da64a35f61a",
-+                "reference": "e7add3be59211482ecdb942288f52da64a35f61a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.5"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "^2.2.20|^2.12",
-+                "php-coveralls/php-coveralls": "^2.1",
-+                "phpunit/phpunit": "^4.8.36|^5.7.27|^6.59|^7"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "ReCaptcha\\": "src/ReCaptcha"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Client library for reCAPTCHA, a free service that protects websites from spam and abuse.",
-+            "homepage": "https://www.google.com/recaptcha/",
-+            "keywords": [
-+                "Abuse",
-+                "captcha",
-+                "recaptcha",
-+                "spam"
-+            ],
-+            "time": "2018-08-05T09:31:53+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/guzzle",
-+            "version": "6.3.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/guzzle.git",
-+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "guzzlehttp/promises": "^1.0",
-+                "guzzlehttp/psr7": "^1.4",
-+                "php": ">=5.5"
-+            },
-+            "require-dev": {
-+                "ext-curl": "*",
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-+                "psr/log": "^1.0"
-+            },
-+            "suggest": {
-+                "psr/log": "Required for using the Log middleware"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "6.3-dev"
-+                }
-+            },
-+            "autoload": {
-+                "files": [
-+                    "src/functions_include.php"
-+                ],
-+                "psr-4": {
-+                    "GuzzleHttp\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                }
-+            ],
-+            "description": "Guzzle is a PHP HTTP client library",
-+            "homepage": "http://guzzlephp.org/",
-+            "keywords": [
-+                "client",
-+                "curl",
-+                "framework",
-+                "http",
-+                "http client",
-+                "rest",
-+                "web service"
-+            ],
-+            "time": "2018-04-22T15:46:56+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/promises",
-+            "version": "v1.3.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/promises.git",
-+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.5.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.4-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "GuzzleHttp\\Promise\\": "src/"
-+                },
-+                "files": [
-+                    "src/functions_include.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                }
-+            ],
-+            "description": "Guzzle promises library",
-+            "keywords": [
-+                "promise"
-+            ],
-+            "time": "2016-12-20T10:07:11+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/psr7",
-+            "version": "1.5.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/psr7.git",
-+                "reference": "9f83dded91781a01c63574e387eaa769be769115"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
-+                "reference": "9f83dded91781a01c63574e387eaa769be769115",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.4.0",
-+                "psr/http-message": "~1.0",
-+                "ralouphie/getallheaders": "^2.0.5"
-+            },
-+            "provide": {
-+                "psr/http-message-implementation": "1.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.5-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "GuzzleHttp\\Psr7\\": "src/"
-+                },
-+                "files": [
-+                    "src/functions_include.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                },
-+                {
-+                    "name": "Tobias Schultze",
-+                    "homepage": "https://github.com/Tobion"
-+                }
-+            ],
-+            "description": "PSR-7 message implementation that also provides common utility methods",
-+            "keywords": [
-+                "http",
-+                "message",
-+                "psr-7",
-+                "request",
-+                "response",
-+                "stream",
-+                "uri",
-+                "url"
-+            ],
-+            "time": "2018-12-04T20:46:45+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/ringphp",
-+            "version": "1.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/RingPHP.git",
-+                "reference": "5e2a174052995663dd68e6b5ad838afd47dd615b"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/5e2a174052995663dd68e6b5ad838afd47dd615b",
-+                "reference": "5e2a174052995663dd68e6b5ad838afd47dd615b",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "guzzlehttp/streams": "~3.0",
-+                "php": ">=5.4.0",
-+                "react/promise": "~2.0"
-+            },
-+            "require-dev": {
-+                "ext-curl": "*",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "suggest": {
-+                "ext-curl": "Guzzle will use specific adapters if cURL is present"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "GuzzleHttp\\Ring\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                }
-+            ],
-+            "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
-+            "time": "2018-07-31T13:22:33+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/streams",
-+            "version": "3.0.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/streams.git",
-+                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
-+                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.4.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "3.0-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "GuzzleHttp\\Stream\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                }
-+            ],
-+            "description": "Provides a simple abstraction over streams of data",
-+            "homepage": "http://guzzlephp.org/",
-+            "keywords": [
-+                "Guzzle",
-+                "stream"
-+            ],
-+            "time": "2014-10-12T19:18:40+00:00"
-+        },
-+        {
-+            "name": "justinrainbow/json-schema",
-+            "version": "5.2.8",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/justinrainbow/json-schema.git",
-+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4",
-+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "~2.2.20",
-+                "json-schema/json-schema-test-suite": "1.2.0",
-+                "phpunit/phpunit": "^4.8.35"
-+            },
-+            "bin": [
-+                "bin/validate-json"
-+            ],
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "5.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "JsonSchema\\": "src/JsonSchema/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Bruno Prieto Reis",
-+                    "email": "bruno.p.reis@gmail.com"
-+                },
-+                {
-+                    "name": "Justin Rainbow",
-+                    "email": "justin.rainbow@gmail.com"
-+                },
-+                {
-+                    "name": "Igor Wiedler",
-+                    "email": "igor@wiedler.ch"
-+                },
-+                {
-+                    "name": "Robert Schönthal",
-+                    "email": "seroscho@googlemail.com"
-+                }
-+            ],
-+            "description": "A library to validate a json schema.",
-+            "homepage": "https://github.com/justinrainbow/json-schema",
-+            "keywords": [
-+                "json",
-+                "schema"
-+            ],
-+            "time": "2019-01-14T23:55:14+00:00"
-+        },
-+        {
-+            "name": "khanamiryan/qrcode-detector-decoder",
-+            "version": "1.0.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/khanamiryan/php-qrcode-detector-decoder.git",
-+                "reference": "a75482d3bc804e3f6702332bfda6cccbb0dfaa76"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/khanamiryan/php-qrcode-detector-decoder/zipball/a75482d3bc804e3f6702332bfda6cccbb0dfaa76",
-+                "reference": "a75482d3bc804e3f6702332bfda6cccbb0dfaa76",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6|^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Zxing\\": "lib/"
-+                },
-+                "files": [
-+                    "lib/Common/customFunctions.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Ashot Khanamiryan",
-+                    "email": "a.khanamiryan@gmail.com",
-+                    "homepage": "https://github.com/khanamiryan",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "QR code decoder / reader",
-+            "homepage": "https://github.com/khanamiryan/php-qrcode-detector-decoder/",
-+            "keywords": [
-+                "barcode",
-+                "qr",
-+                "zxing"
-+            ],
-+            "time": "2018-04-26T11:41:33+00:00"
-+        },
-+        {
-+            "name": "klarna/m2-payments",
-+            "version": "7.1.0",
-+            "require": {
-+                "klarna/module-core": "5.1.0",
-+                "klarna/module-kp": "6.1.0",
-+                "klarna/module-ordermanagement": "5.0.3"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "~2.10.1",
-+                "jakub-onderka/php-console-highlighter": "^0.3.2",
-+                "jakub-onderka/php-parallel-lint": "^0.9.2",
-+                "lusitanian/oauth": "~0.8.10",
-+                "magento-ecg/coding-standard": "^3.1",
-+                "mikey179/vfsstream": "^1.6",
-+                "pdepend/pdepend": "^2.5",
-+                "phploc/phploc": "^4.0",
-+                "phpmd/phpmd": "@stable",
-+                "phpro/grumphp": "^0.14",
-+                "phpunit/phpunit": "~6.2.0",
-+                "sebastian/phpcpd": "~3.0.0",
-+                "squizlabs/php_codesniffer": "^3.2",
-+                "theseer/phpdox": "^0.10.1"
-+            },
-+            "type": "metapackage",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "description": "Klarna Payments for Magento 2 (CE & EE)"
-+        },
-+        {
-+            "name": "klarna/module-core",
-+            "version": "5.1.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/klarna/module-core/klarna-module-core-5.1.0.0.zip",
-+                "reference": null,
-+                "shasum": "050cc44c0077880e6a364e93f60d607cfd33c813"
-+            },
-+            "require": {
-+                "guzzlehttp/guzzle": "^6.0",
-+                "magento/framework": "^100.1||^101.0||^102.0",
-+                "magento/module-bundle": "^100.1",
-+                "magento/module-catalog": "^102.0||^103.0",
-+                "magento/module-config": "^101.0||^102.0",
-+                "magento/module-customer": "^101.0||^102.0",
-+                "magento/module-directory": "^100.1",
-+                "magento/module-payment": "^100.2",
-+                "magento/module-quote": "^101.0",
-+                "magento/module-sales": "^101.0||^102.0",
-+                "magento/module-store": "^100.1||^101.0",
-+                "magento/module-tax": "^100.1",
-+                "php": "~7.0.13|~7.1.0|~7.2.0",
-+                "psr/log": "^1.0",
-+                "ramsey/uuid": "3.6.1||^3.7"
-+            },
-+            "conflict": {
-+                "magento/module-payment": "100.0.8 || 100.1.3"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "~2.10.1",
-+                "jakub-onderka/php-console-highlighter": "^0.3.2",
-+                "jakub-onderka/php-parallel-lint": "^0.9.2",
-+                "lusitanian/oauth": "~0.8.10",
-+                "magento-ecg/coding-standard": "^3.1",
-+                "mikey179/vfsstream": "^1.6",
-+                "pdepend/pdepend": "^2.5",
-+                "phploc/phploc": "^4.0",
-+                "phpmd/phpmd": "@stable",
-+                "phpro/grumphp": "^0.14",
-+                "phpunit/phpunit": "~6.2.0",
-+                "sebastian/phpcpd": "~3.0",
-+                "squizlabs/php_codesniffer": "^3.2",
-+                "theseer/phpdox": "^0.10.1"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "psr-4": {
-+                    "Klarna\\Core\\": "."
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Joe Constant",
-+                    "email": "joe.constant@klarna.com"
-+                },
-+                {
-+                    "name": "Jason Grim",
-+                    "email": "jason.grim@klarna.com"
-+                },
-+                {
-+                    "name": "Fei Chen",
-+                    "email": "fei.chen@klarna.com"
-+                }
-+            ],
-+            "description": "Klarna Core Magento 2 Extension"
-+        },
-+        {
-+            "name": "klarna/module-kp",
-+            "version": "6.1.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/klarna/module-kp/klarna-module-kp-6.1.0.0.zip",
-+                "reference": null,
-+                "shasum": "cf1911ce01da43e226fced1d3d72baec66875393"
-+            },
-+            "require": {
-+                "klarna/module-core": "^4.0||^5.0",
-+                "klarna/module-ordermanagement": "^4.0||^5.0",
-+                "magento/framework": "^100.1||^101.0||^102.0",
-+                "magento/module-checkout": "^100.1",
-+                "magento/module-customer": "^100.1||^101.0||^102.0",
-+                "magento/module-directory": "^100.1",
-+                "magento/module-payment": "^100.1",
-+                "magento/module-quote": "^100.1||^101.0",
-+                "magento/module-sales": "^100.1||^101.0||^102.0",
-+                "magento/module-store": "^100.1||^101.0",
-+                "php": "~7.0.13|~7.1.0|~7.2.0"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "~2.10.1",
-+                "jakub-onderka/php-console-highlighter": "^0.3.2",
-+                "jakub-onderka/php-parallel-lint": "^0.9.2",
-+                "lusitanian/oauth": "~0.8.10",
-+                "magento-ecg/coding-standard": "^3.1",
-+                "magento/framework": "^101.0.0",
-+                "mikey179/vfsstream": "^1.6",
-+                "pdepend/pdepend": "^2.5",
-+                "phploc/phploc": "^4.0",
-+                "phpmd/phpmd": "@stable",
-+                "phpro/grumphp": "^0.14",
-+                "phpunit/phpunit": "~6.2.0",
-+                "sebastian/phpcpd": "~3.0",
-+                "squizlabs/php_codesniffer": "^3.2",
-+                "theseer/phpdox": "^0.10.1"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "psr-4": {
-+                    "Klarna\\Kp\\": ""
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Joe Constant",
-+                    "email": "joe.constant@klarna.com"
-+                },
-+                {
-+                    "name": "Jason Grim",
-+                    "email": "jason.grim@klarna.com"
-+                },
-+                {
-+                    "name": "Fei Chen",
-+                    "email": "fei.chen@klarna.com"
-+                },
-+                {
-+                    "name": "Dario Kassler",
-+                    "email": "dario.kassler@klarna.com"
-+                }
-+            ],
-+            "description": "Klarna Payments Magento 2 Extension"
-+        },
-+        {
-+            "name": "klarna/module-ordermanagement",
-+            "version": "5.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/klarna/module-ordermanagement/klarna-module-ordermanagement-5.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "5a73ab885349d4c7f9a56dc9465c4ff712e808ca"
-+            },
-+            "require": {
-+                "klarna/module-core": "^4.0||^5.0",
-+                "magento/framework": "^102.0",
-+                "magento/module-payment": "^100.1",
-+                "magento/module-quote": "^100.1||^101.0||^102.0",
-+                "magento/module-sales": "^100.1||^101.0||^102.0",
-+                "magento/module-store": "^100.1||^101.0",
-+                "php": "~7.1.0|~7.2.0"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "~2.10.1",
-+                "jakub-onderka/php-console-highlighter": "^0.3.2",
-+                "jakub-onderka/php-parallel-lint": "^0.9.2",
-+                "lusitanian/oauth": "~0.8.10",
-+                "magento-ecg/coding-standard": "^3.1",
-+                "magento/framework": "^101.0.0",
-+                "mikey179/vfsstream": "^1.6",
-+                "pdepend/pdepend": "^2.5",
-+                "phploc/phploc": "^4.0",
-+                "phpmd/phpmd": "@stable",
-+                "phpro/grumphp": "^0.14",
-+                "phpunit/phpunit": "~6.2.0",
-+                "sebastian/phpcpd": "~3.0",
-+                "squizlabs/php_codesniffer": "^3.2",
-+                "theseer/phpdox": "^0.10.1"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "psr-4": {
-+                    "Klarna\\Ordermanagement\\": "."
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Joe Constant",
-+                    "email": "joe.constant@klarna.com"
-+                },
-+                {
-+                    "name": "Jason Grim",
-+                    "email": "jason.grim@klarna.com"
-+                },
-+                {
-+                    "name": "Fei Chen",
-+                    "email": "fei.chen@klarna.com"
-+                },
-+                {
-+                    "name": "Dario Kassler",
-+                    "email": "dario.kassler@klarna.com"
-+                }
-+            ],
-+            "description": "Klarna Order Management Magento 2 Extension"
-+        },
-+        {
-+            "name": "magento/composer",
-+            "version": "1.4.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/magento/composer.git",
-+                "reference": "6fb9eb3dd72a5e70aa53983f132f8e1883e79978"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/magento/composer/zipball/6fb9eb3dd72a5e70aa53983f132f8e1883e79978",
-+                "reference": "6fb9eb3dd72a5e70aa53983f132f8e1883e79978",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "composer/composer": "^1.6",
-+                "php": "~7.1.3|~7.2.0",
-+                "symfony/console": "~4.0.0 || ~4.1.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~7.0.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Magento\\Composer\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-+            "time": "2018-06-29T18:46:51+00:00"
-+        },
-+        {
-+            "name": "magento/framework",
-+            "version": "102.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/framework/magento-framework-102.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "399d85904a005db76ce518a265cfdaff68d02984"
-+            },
-+            "require": {
-+                "colinmollenhour/php-redis-session-abstract": "~1.4.0",
-+                "composer/composer": "^1.6",
-+                "ext-bcmath": "*",
-+                "ext-curl": "*",
-+                "ext-dom": "*",
-+                "ext-gd": "*",
-+                "ext-hash": "*",
-+                "ext-iconv": "*",
-+                "ext-openssl": "*",
-+                "ext-simplexml": "*",
-+                "ext-spl": "*",
-+                "ext-xsl": "*",
-+                "lib-libxml": "*",
-+                "magento/zendframework1": "~1.14.0",
-+                "monolog/monolog": "^1.17",
-+                "oyejorge/less.php": "~1.7.0",
-+                "php": "~7.1.3||~7.2.0",
-+                "symfony/console": "~4.1.0",
-+                "symfony/process": "~4.1.0",
-+                "tedivm/jshrink": "~1.3.0",
-+                "zendframework/zend-code": "~3.3.0",
-+                "zendframework/zend-crypt": "^2.6.0",
-+                "zendframework/zend-http": "^2.6.0",
-+                "zendframework/zend-mvc": "~2.7.0",
-+                "zendframework/zend-stdlib": "^2.7.7",
-+                "zendframework/zend-uri": "^2.5.1",
-+                "zendframework/zend-validator": "^2.6.0"
-+            },
-+            "suggest": {
-+                "ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library"
-+            },
-+            "type": "magento2-library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Magento\\Framework\\": ""
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/framework-amqp",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/framework-amqp/magento-framework-amqp-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "40a4d6799c43dd9eed1f7dba4ca2eb6b26518966"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0",
-+                "php-amqplib/php-amqplib": "~2.7.0"
-+            },
-+            "type": "magento2-library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Magento\\Framework\\Amqp\\": ""
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/framework-bulk",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/framework-bulk/magento-framework-bulk-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "efa487ceac1c91824797e1f8a87d9b6bd2fdfa3a"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Magento\\Framework\\Bulk\\": ""
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/framework-message-queue",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/framework-message-queue/magento-framework-message-queue-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "51901caed892f2e26241677df2f72deaa010a1a3"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Magento\\Framework\\MessageQueue\\": ""
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/inventory-composer-installer",
-+            "version": "1.1.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/inventory-composer-installer/magento-inventory-composer-installer-1.1.0.0.zip",
-+                "reference": null,
-+                "shasum": "c52566b82926bb37487a2b3cb2c8ae091be9be9e"
-+            },
-+            "require": {
-+                "composer-plugin-api": "^1.1",
-+                "magento/framework": "*"
-+            },
-+            "require-dev": {
-+                "composer/composer": "*"
-+            },
-+            "type": "composer-plugin",
-+            "extra": {
-+                "class": "Magento\\InventoryComposerInstaller\\Plugin"
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Magento\\InventoryComposerInstaller\\": "src"
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Composer plugin for Magento Multi Source Inventory"
-+        },
-+        {
-+            "name": "magento/inventory-composer-metapackage",
-+            "version": "1.1.1",
-+            "require": {
-+                "magento/inventory-composer-installer": "1.1.0",
-+                "magento/module-inventory": "1.0.4",
-+                "magento/module-inventory-admin-ui": "1.0.4",
-+                "magento/module-inventory-api": "1.0.4",
-+                "magento/module-inventory-bundle-product": "1.0.3",
-+                "magento/module-inventory-bundle-product-admin-ui": "1.0.3",
-+                "magento/module-inventory-cache": "1.0.3",
-+                "magento/module-inventory-catalog": "1.0.4",
-+                "magento/module-inventory-catalog-admin-ui": "1.0.4",
-+                "magento/module-inventory-catalog-api": "1.0.4",
-+                "magento/module-inventory-catalog-search": "1.0.4",
-+                "magento/module-inventory-configurable-product": "1.0.4",
-+                "magento/module-inventory-configurable-product-admin-ui": "1.0.4",
-+                "magento/module-inventory-configurable-product-indexer": "1.0.3",
-+                "magento/module-inventory-configuration": "1.0.4",
-+                "magento/module-inventory-configuration-api": "1.0.4",
-+                "magento/module-inventory-distance-based-source-selection": "1.0.0",
-+                "magento/module-inventory-distance-based-source-selection-admin-ui": "1.0.0",
-+                "magento/module-inventory-distance-based-source-selection-api": "1.0.0",
-+                "magento/module-inventory-elasticsearch": "1.0.0",
-+                "magento/module-inventory-grouped-product": "1.0.3",
-+                "magento/module-inventory-grouped-product-admin-ui": "1.0.4",
-+                "magento/module-inventory-grouped-product-indexer": "1.0.3",
-+                "magento/module-inventory-import-export": "1.0.4",
-+                "magento/module-inventory-indexer": "1.0.4",
-+                "magento/module-inventory-low-quantity-notification": "1.0.4",
-+                "magento/module-inventory-low-quantity-notification-admin-ui": "1.0.4",
-+                "magento/module-inventory-low-quantity-notification-api": "1.0.3",
-+                "magento/module-inventory-multi-dimensional-indexer-api": "1.0.4",
-+                "magento/module-inventory-product-alert": "1.0.4",
-+                "magento/module-inventory-reservations": "1.0.4",
-+                "magento/module-inventory-reservations-api": "1.0.3",
-+                "magento/module-inventory-sales": "1.0.4",
-+                "magento/module-inventory-sales-admin-ui": "1.0.4",
-+                "magento/module-inventory-sales-api": "1.0.4",
-+                "magento/module-inventory-sales-frontend-ui": "1.0.3",
-+                "magento/module-inventory-setup-fixture-generator": "1.0.0",
-+                "magento/module-inventory-shipping": "1.0.4",
-+                "magento/module-inventory-shipping-admin-ui": "1.0.4",
-+                "magento/module-inventory-source-deduction-api": "1.0.4",
-+                "magento/module-inventory-source-selection": "1.0.4",
-+                "magento/module-inventory-source-selection-api": "1.1.0"
-+            },
-+            "type": "metapackage",
-+            "description": "Metapackage with Magento Inventory modules for simple installation"
-+        },
-+        {
-+            "name": "magento/language-de_de",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-de_de/magento-language-de_de-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "4fa504af2bb938cadea2376cb17caa0832791bfa"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "German (Germany) language"
-+        },
-+        {
-+            "name": "magento/language-en_us",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-en_us/magento-language-en_us-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "13e74a7d83dbd49dec496aeaedc5ad0dc82dacd8"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "English (United States) language"
-+        },
-+        {
-+            "name": "magento/language-es_es",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-es_es/magento-language-es_es-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ea3dd068fe9caad30835e9dff5a2aab96032e4c0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Spanish (Spain) language"
-+        },
-+        {
-+            "name": "magento/language-fr_fr",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-fr_fr/magento-language-fr_fr-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "9ab44b7845abb6f1b031864c815de6ae836dbaf7"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "French (France) language"
-+        },
-+        {
-+            "name": "magento/language-nl_nl",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-nl_nl/magento-language-nl_nl-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "060a175c553e80abf77f877a6d92746658e270f0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Dutch (Netherlands) language"
-+        },
-+        {
-+            "name": "magento/language-pt_br",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-pt_br/magento-language-pt_br-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "50c59308621d44fe8def4a93253087fa69bdae70"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Portuguese (Brazil) language"
-+        },
-+        {
-+            "name": "magento/language-zh_hans_cn",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-zh_hans_cn/magento-language-zh_hans_cn-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "8b2e9a40c956bc05c50b02ea54e10c00d9d24d78"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Chinese (China) language"
-+        },
-+        {
-+            "name": "magento/magento-composer-installer",
-+            "version": "0.1.13",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/magento/magento-composer-installer.git",
-+                "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/8b6c32f53b4944a5d6656e86344cd0f9784709a1",
-+                "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "composer-plugin-api": "^1.0"
-+            },
-+            "replace": {
-+                "magento-hackathon/magento-composer-installer": "*"
-+            },
-+            "require-dev": {
-+                "composer/composer": "*@dev",
-+                "firegento/phpcs": "dev-patch-1",
-+                "mikey179/vfsstream": "*",
-+                "phpunit/phpunit": "*",
-+                "phpunit/phpunit-mock-objects": "dev-master",
-+                "squizlabs/php_codesniffer": "1.4.7",
-+                "symfony/process": "*"
-+            },
-+            "type": "composer-plugin",
-+            "extra": {
-+                "composer-command-registry": [
-+                    "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand"
-+                ],
-+                "class": "MagentoHackathon\\Composer\\Magento\\Plugin"
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "MagentoHackathon\\Composer\\Magento": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "OSL-3.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Vinai Kopp",
-+                    "email": "vinai@netzarbeiter.com"
-+                },
-+                {
-+                    "name": "Daniel Fahlke aka Flyingmana",
-+                    "email": "flyingmana@googlemail.com"
-+                },
-+                {
-+                    "name": "Jörg Weller",
-+                    "email": "weller@flagbit.de"
-+                },
-+                {
-+                    "name": "Karl Spies",
-+                    "email": "karl.spies@gmx.net"
-+                },
-+                {
-+                    "name": "Tobias Vogt",
-+                    "email": "tobi@webguys.de"
-+                },
-+                {
-+                    "name": "David Fuhr",
-+                    "email": "fuhr@flagbit.de"
-+                }
-+            ],
-+            "description": "Composer installer for Magento modules",
-+            "homepage": "https://github.com/magento/magento-composer-installer",
-+            "keywords": [
-+                "composer-installer",
-+                "magento"
-+            ],
-+            "time": "2017-12-29T16:45:24+00:00"
-+        },
-+        {
-+            "name": "magento/magento2-base",
-+            "version": "2.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/magento2-base/magento-magento2-base-2.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "7877828bb63a7cfca5c62c6c6caf6a9c05ab154b"
-+            },
-+            "require": {
-+                "braintree/braintree_php": "3.35.0",
-+                "composer/composer": "^1.6",
-+                "ext-intl": "*",
-+                "ext-mbstring": "*",
-+                "magento/composer": "~1.4.0",
-+                "magento/magento-composer-installer": "*",
-+                "magento/zendframework1": "~1.14.1",
-+                "monolog/monolog": "^1.17",
-+                "oyejorge/less.php": "~1.7.0",
-+                "pelago/emogrifier": "^2.0.0",
-+                "php": "~7.1.3||~7.2.0",
-+                "phpseclib/phpseclib": "2.0.*",
-+                "symfony/console": "~4.1.0",
-+                "symfony/event-dispatcher": "~4.1.0",
-+                "tedivm/jshrink": "~1.3.0",
-+                "tubalmartin/cssmin": "4.1.1",
-+                "zendframework/zend-code": "~3.3.0",
-+                "zendframework/zend-config": "^2.6.0",
-+                "zendframework/zend-console": "^2.6.0",
-+                "zendframework/zend-crypt": "^2.6.0",
-+                "zendframework/zend-di": "^2.6.1",
-+                "zendframework/zend-eventmanager": "^2.6.3",
-+                "zendframework/zend-form": "^2.10.0",
-+                "zendframework/zend-http": "^2.6.0",
-+                "zendframework/zend-i18n": "^2.7.3",
-+                "zendframework/zend-json": "^2.6.1",
-+                "zendframework/zend-log": "^2.9.1",
-+                "zendframework/zend-modulemanager": "^2.7",
-+                "zendframework/zend-mvc": "~2.7.0",
-+                "zendframework/zend-serializer": "^2.7.2",
-+                "zendframework/zend-server": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.8",
-+                "zendframework/zend-soap": "^2.7.0",
-+                "zendframework/zend-stdlib": "^2.7.7",
-+                "zendframework/zend-text": "^2.6.0",
-+                "zendframework/zend-uri": "^2.5.1",
-+                "zendframework/zend-validator": "^2.6.0",
-+                "zendframework/zend-view": "~2.10.0"
-+            },
-+            "conflict": {
-+                "gene/bluefoot": "*"
-+            },
-+            "replace": {
-+                "blueimp/jquery-file-upload": "5.6.14",
-+                "components/jquery": "1.11.0",
-+                "components/jqueryui": "1.10.4",
-+                "tinymce/tinymce": "3.4.7",
-+                "trentrichardson/jquery-timepicker-addon": "1.4.3",
-+                "twbs/bootstrap": "3.1.0"
-+            },
-+            "type": "magento2-component",
-+            "extra": {
-+                "component_paths": {
-+                    "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js",
-+                    "components/jquery": [
-+                        "lib/web/jquery.js",
-+                        "lib/web/jquery/jquery.min.js",
-+                        "lib/web/jquery/jquery-migrate.js"
-                     ],
-+                    "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader",
-+                    "components/jqueryui": "lib/web/jquery/jquery-ui.js",
-+                    "twbs/bootstrap": "lib/web/jquery/jquery.tabs.js",
-+                    "tinymce/tinymce": "lib/web/tiny_mce_4"
-+                },
-+                "map": [
-                     [
--                        "lib/internal/Credis",
--                        "lib/internal/Credis"
-+                        ".github",
-+                        ".github"
-                     ],
-                     [
--                        "lib/internal/CardinalCommerce",
--                        "lib/internal/CardinalCommerce"
-+                        ".htaccess",
-+                        ".htaccess"
-                     ],
-                     [
--                        "lib/internal/JSMin",
--                        "lib/internal/JSMin"
-+                        ".htaccess.sample",
-+                        ".htaccess.sample"
-                     ],
-                     [
--                        "lib/.htaccess",
--                        "lib/.htaccess"
-+                        ".php_cs.dist",
-+                        ".php_cs.dist"
-                     ],
-                     [
--                        "lib/web/lib",
--                        "lib/web/lib"
-+                        ".travis.yml",
-+                        ".travis.yml"
-                     ],
-                     [
--                        "lib/web/requirejs",
--                        "lib/web/requirejs"
-+                        ".user.ini",
-+                        ".user.ini"
-                     ],
-                     [
--                        "lib/web/prototype",
--                        "lib/web/prototype"
-+                        "COPYING.txt",
-+                        "COPYING.txt"
-                     ],
-                     [
--                        "lib/web/moment.js",
--                        "lib/web/moment.js"
-+                        "Gruntfile.js.sample",
-+                        "Gruntfile.js.sample"
-                     ],
-                     [
--                        "lib/web/i18n",
--                        "lib/web/i18n"
-+                        "LICENSE.txt",
-+                        "LICENSE.txt"
-                     ],
-                     [
--                        "lib/web/varien",
--                        "lib/web/varien"
-+                        "LICENSE_AFL.txt",
-+                        "LICENSE_AFL.txt"
-                     ],
-                     [
--                        "lib/web/blank.html",
--                        "lib/web/blank.html"
-+                        "app/.htaccess",
-+                        "app/.htaccess"
-                     ],
-                     [
--                        "lib/web/scriptaculous",
--                        "lib/web/scriptaculous"
-+                        "app/autoload.php",
-+                        "app/autoload.php"
-                     ],
-                     [
--                        "lib/web/ko",
--                        "lib/web/ko"
-+                        "app/bootstrap.php",
-+                        "app/bootstrap.php"
-                     ],
-                     [
--                        "lib/web/modernizr",
--                        "lib/web/modernizr"
-+                        "app/design/adminhtml/Magento",
-+                        "app/design/adminhtml/Magento"
-                     ],
-                     [
--                        "lib/web/spacer.gif",
--                        "lib/web/spacer.gif"
-+                        "app/design/frontend/Magento",
-+                        "app/design/frontend/Magento"
-                     ],
-                     [
--                        "lib/web/images",
--                        "lib/web/images"
-+                        "app/etc/NonComposerComponentRegistration.php",
-+                        "app/etc/NonComposerComponentRegistration.php"
-                     ],
-                     [
--                        "lib/web/matchMedia.js",
--                        "lib/web/matchMedia.js"
-+                        "app/etc/db_schema.xml",
-+                        "app/etc/db_schema.xml"
-                     ],
-                     [
--                        "lib/web/extjs",
--                        "lib/web/extjs"
-+                        "app/etc/di.xml",
-+                        "app/etc/di.xml"
-                     ],
-                     [
--                        "lib/web/css",
--                        "lib/web/css"
-+                        "app/etc/registration_globlist.php",
-+                        "app/etc/registration_globlist.php"
-                     ],
-                     [
--                        "lib/web/fonts",
--                        "lib/web/fonts"
-+                        "app/functions.php",
-+                        "app/functions.php"
-                     ],
-                     [
--                        "lib/web/jquery",
--                        "lib/web/jquery"
-+                        "auth.json.sample",
-+                        "auth.json.sample"
-                     ],
-                     [
--                        "lib/web/less",
--                        "lib/web/less"
-+                        "bin/.htaccess",
-+                        "bin/.htaccess"
-                     ],
-                     [
--                        "lib/web/jquery.js",
--                        "lib/web/jquery.js"
-+                        "bin/magento",
-+                        "bin/magento"
-                     ],
-                     [
--                        "lib/web/underscore.js",
--                        "lib/web/underscore.js"
-+                        "dev/.htaccess",
-+                        "dev/.htaccess"
-                     ],
-                     [
--                        "lib/web/legacy-build.min.js",
--                        "lib/web/legacy-build.min.js"
-+                        "dev/tests/acceptance",
-+                        "dev/tests/acceptance"
-                     ],
-                     [
--                        "lib/web/mage",
--                        "lib/web/mage"
-+                        "dev/tests/api-functional/.gitignore",
-+                        "dev/tests/api-functional/.gitignore"
-                     ],
-                     [
--                        "lib/web/tiny_mce",
--                        "lib/web/tiny_mce"
-+                        "dev/tests/api-functional/_files",
-+                        "dev/tests/api-functional/_files"
-                     ],
-                     [
--                        ".htaccess.sample",
--                        ".htaccess.sample"
-+                        "dev/tests/api-functional/config",
-+                        "dev/tests/api-functional/config"
-                     ],
-                     [
--                        "CONTRIBUTING.md",
--                        "CONTRIBUTING.md"
-+                        "dev/tests/api-functional/framework",
-+                        "dev/tests/api-functional/framework"
-                     ],
-                     [
--                        "package.json",
--                        "package.json"
-+                        "dev/tests/api-functional/phpunit_graphql.xml.dist",
-+                        "dev/tests/api-functional/phpunit_graphql.xml.dist"
-                     ],
-                     [
--                        "bin",
--                        "bin"
-+                        "dev/tests/api-functional/phpunit_rest.xml.dist",
-+                        "dev/tests/api-functional/phpunit_rest.xml.dist"
-                     ],
-                     [
--                        "nginx.conf.sample",
--                        "nginx.conf.sample"
-+                        "dev/tests/api-functional/phpunit_soap.xml.dist",
-+                        "dev/tests/api-functional/phpunit_soap.xml.dist"
-                     ],
-                     [
--                        "var/.htaccess",
--                        "var/.htaccess"
-+                        "dev/tests/api-functional/testsuite/Magento",
-+                        "dev/tests/api-functional/testsuite/Magento"
-                     ],
-                     [
--                        "pub/media/downloadable/.htaccess",
--                        "pub/media/downloadable/.htaccess"
-+                        "dev/tests/error_handler.php",
-+                        "dev/tests/error_handler.php"
-                     ],
-                     [
--                        "pub/media/theme_customization/.htaccess",
--                        "pub/media/theme_customization/.htaccess"
-+                        "dev/tests/functional/.gitignore",
-+                        "dev/tests/functional/.gitignore"
-                     ],
-                     [
--                        "pub/media/customer/.htaccess",
--                        "pub/media/customer/.htaccess"
-+                        "dev/tests/functional/.htaccess.sample",
-+                        "dev/tests/functional/.htaccess.sample"
-                     ],
-                     [
--                        "pub/media/.htaccess",
--                        "pub/media/.htaccess"
-+                        "dev/tests/functional/bootstrap.php",
-+                        "dev/tests/functional/bootstrap.php"
-+                    ],
-+                    [
-+                        "dev/tests/functional/composer.json",
-+                        "dev/tests/functional/composer.json"
-+                    ],
-+                    [
-+                        "dev/tests/functional/credentials.xml.dist",
-+                        "dev/tests/functional/credentials.xml.dist"
-+                    ],
-+                    [
-+                        "dev/tests/functional/etc",
-+                        "dev/tests/functional/etc"
-+                    ],
-+                    [
-+                        "dev/tests/functional/isolation.php",
-+                        "dev/tests/functional/isolation.php"
-+                    ],
-+                    [
-+                        "dev/tests/functional/lib",
-+                        "dev/tests/functional/lib"
-+                    ],
-+                    [
-+                        "dev/tests/functional/phpunit.xml.dist",
-+                        "dev/tests/functional/phpunit.xml.dist"
-+                    ],
-+                    [
-+                        "dev/tests/functional/tests",
-+                        "dev/tests/functional/tests"
-+                    ],
-+                    [
-+                        "dev/tests/functional/testsuites/Magento",
-+                        "dev/tests/functional/testsuites/Magento"
-+                    ],
-+                    [
-+                        "dev/tests/functional/utils",
-+                        "dev/tests/functional/utils"
-+                    ],
-+                    [
-+                        "dev/tests/integration/.gitignore",
-+                        "dev/tests/integration/.gitignore"
-+                    ],
-+                    [
-+                        "dev/tests/integration/_files",
-+                        "dev/tests/integration/_files"
-+                    ],
-+                    [
-+                        "dev/tests/integration/bin",
-+                        "dev/tests/integration/bin"
-+                    ],
-+                    [
-+                        "dev/tests/integration/etc",
-+                        "dev/tests/integration/etc"
-+                    ],
-+                    [
-+                        "dev/tests/integration/framework",
-+                        "dev/tests/integration/framework"
-+                    ],
-+                    [
-+                        "dev/tests/integration/phpunit.xml.dist",
-+                        "dev/tests/integration/phpunit.xml.dist"
-+                    ],
-+                    [
-+                        "dev/tests/integration/testsuite/Magento",
-+                        "dev/tests/integration/testsuite/Magento"
-+                    ],
-+                    [
-+                        "dev/tests/integration/tmp",
-+                        "dev/tests/integration/tmp"
-+                    ],
-+                    [
-+                        "dev/tests/js",
-+                        "dev/tests/js"
-+                    ],
-+                    [
-+                        "dev/tests/setup-integration",
-+                        "dev/tests/setup-integration"
-+                    ],
-+                    [
-+                        "dev/tests/static/.gitignore",
-+                        "dev/tests/static/.gitignore"
-+                    ],
-+                    [
-+                        "dev/tests/static/framework",
-+                        "dev/tests/static/framework"
-+                    ],
-+                    [
-+                        "dev/tests/static/get_github_changes.php",
-+                        "dev/tests/static/get_github_changes.php"
-+                    ],
-+                    [
-+                        "dev/tests/static/phpunit-all.xml.dist",
-+                        "dev/tests/static/phpunit-all.xml.dist"
-+                    ],
-+                    [
-+                        "dev/tests/static/phpunit.xml.dist",
-+                        "dev/tests/static/phpunit.xml.dist"
-+                    ],
-+                    [
-+                        "dev/tests/static/testsuite/Magento",
-+                        "dev/tests/static/testsuite/Magento"
-                     ],
-                     [
--                        "pub/errors",
--                        "pub/errors"
-+                        "dev/tests/static/tmp",
-+                        "dev/tests/static/tmp"
-                     ],
-                     [
--                        "pub/opt",
--                        "pub/opt"
-+                        "dev/tests/unit/.gitignore",
-+                        "dev/tests/unit/.gitignore"
-                     ],
-                     [
--                        "pub/get.php",
--                        "pub/get.php"
-+                        "dev/tests/unit/framework",
-+                        "dev/tests/unit/framework"
-                     ],
-                     [
--                        "pub/static/.htaccess",
--                        "pub/static/.htaccess"
-+                        "dev/tests/unit/phpunit.xml.dist",
-+                        "dev/tests/unit/phpunit.xml.dist"
-                     ],
-                     [
--                        "pub/.htaccess",
--                        "pub/.htaccess"
-+                        "dev/tests/unit/tmp",
-+                        "dev/tests/unit/tmp"
-                     ],
-                     [
--                        "pub/static.php",
--                        "pub/static.php"
-+                        "dev/tools",
-+                        "dev/tools"
-                     ],
-                     [
--                        "pub/cron.php",
--                        "pub/cron.php"
-+                        "dev/travis",
-+                        "dev/travis"
-                     ],
-                     [
--                        "pub/index.php",
--                        "pub/index.php"
-+                        "generated",
-+                        "generated"
-                     ],
-                     [
--                        ".php_cs",
--                        ".php_cs"
-+                        "grunt-config.json.sample",
-+                        "grunt-config.json.sample"
-                     ],
-                     [
--                        "COPYING.txt",
--                        "COPYING.txt"
-+                        "index.php",
-+                        "index.php"
-                     ],
-                     [
--                        "dev/shell",
--                        "dev/shell"
-+                        "lib/.htaccess",
-+                        "lib/.htaccess"
-                     ],
-                     [
--                        "dev/tools",
--                        "dev/tools"
-+                        "lib/internal/GnuFreeFont",
-+                        "lib/internal/GnuFreeFont"
-                     ],
-                     [
--                        "dev/tests/integration/phpunit.xml.dist",
--                        "dev/tests/integration/phpunit.xml.dist"
-+                        "lib/internal/LinLibertineFont",
-+                        "lib/internal/LinLibertineFont"
-                     ],
-                     [
--                        "dev/tests/integration/etc",
--                        "dev/tests/integration/etc"
-+                        "lib/web/FormData.js",
-+                        "lib/web/FormData.js"
-                     ],
-                     [
--                        "dev/tests/integration/tmp",
--                        "dev/tests/integration/tmp"
-+                        "lib/web/MutationObserver.js",
-+                        "lib/web/MutationObserver.js"
-                     ],
-                     [
--                        "dev/tests/integration/framework",
--                        "dev/tests/integration/framework"
-+                        "lib/web/blank.html",
-+                        "lib/web/blank.html"
-                     ],
-                     [
--                        "dev/tests/integration/testsuite/Magento",
--                        "dev/tests/integration/testsuite/Magento"
-+                        "lib/web/css",
-+                        "lib/web/css"
-                     ],
-                     [
--                        "dev/tests/integration/.gitignore",
--                        "dev/tests/integration/.gitignore"
-+                        "lib/web/es6-collections.js",
-+                        "lib/web/es6-collections.js"
-                     ],
-                     [
--                        "dev/tests/functional/composer.json",
--                        "dev/tests/functional/composer.json"
-+                        "lib/web/extjs",
-+                        "lib/web/extjs"
-                     ],
-                     [
--                        "dev/tests/functional/lib",
--                        "dev/tests/functional/lib"
-+                        "lib/web/fonts",
-+                        "lib/web/fonts"
-                     ],
-                     [
--                        "dev/tests/functional/phpunit.xml.dist",
--                        "dev/tests/functional/phpunit.xml.dist"
-+                        "lib/web/fotorama",
-+                        "lib/web/fotorama"
-                     ],
-                     [
--                        "dev/tests/functional/composer.json.dist",
--                        "dev/tests/functional/composer.json.dist"
-+                        "lib/web/i18n",
-+                        "lib/web/i18n"
-                     ],
-                     [
--                        "dev/tests/functional/bootstrap.php",
--                        "dev/tests/functional/bootstrap.php"
-+                        "lib/web/images",
-+                        "lib/web/images"
-                     ],
-                     [
--                        "dev/tests/functional/credentials.xml.dist",
--                        "dev/tests/functional/credentials.xml.dist"
-+                        "lib/web/jquery.js",
-+                        "lib/web/jquery.js"
-                     ],
-                     [
--                        "dev/tests/functional/tests",
--                        "dev/tests/functional/tests"
-+                        "lib/web/jquery",
-+                        "lib/web/jquery"
-                     ],
-                     [
--                        "dev/tests/functional/utils",
--                        "dev/tests/functional/utils"
-+                        "lib/web/knockoutjs",
-+                        "lib/web/knockoutjs"
-                     ],
-                     [
--                        "dev/tests/functional/isolation.php",
--                        "dev/tests/functional/isolation.php"
-+                        "lib/web/legacy-build.min.js",
-+                        "lib/web/legacy-build.min.js"
-                     ],
-                     [
--                        "dev/tests/functional/etc",
--                        "dev/tests/functional/etc"
-+                        "lib/web/less",
-+                        "lib/web/less"
-                     ],
-                     [
--                        "dev/tests/functional/.htaccess",
--                        "dev/tests/functional/.htaccess"
-+                        "lib/web/lib",
-+                        "lib/web/lib"
-                     ],
-                     [
--                        "dev/tests/functional/testsuites/Magento",
--                        "dev/tests/functional/testsuites/Magento"
-+                        "lib/web/mage",
-+                        "lib/web/mage"
-                     ],
-                     [
--                        "dev/tests/functional/.gitignore",
--                        "dev/tests/functional/.gitignore"
-+                        "lib/web/magnifier",
-+                        "lib/web/magnifier"
-                     ],
-                     [
--                        "dev/tests/js/jasmine",
--                        "dev/tests/js/jasmine"
-+                        "lib/web/matchMedia.js",
-+                        "lib/web/matchMedia.js"
-                     ],
-                     [
--                        "dev/tests/api-functional/phpunit.xml.dist",
--                        "dev/tests/api-functional/phpunit.xml.dist"
-+                        "lib/web/modernizr",
-+                        "lib/web/modernizr"
-                     ],
-                     [
--                        "dev/tests/api-functional/config",
--                        "dev/tests/api-functional/config"
-+                        "lib/web/moment-timezone-with-data.js",
-+                        "lib/web/moment-timezone-with-data.js"
-                     ],
-                     [
--                        "dev/tests/api-functional/framework",
--                        "dev/tests/api-functional/framework"
-+                        "lib/web/moment.js",
-+                        "lib/web/moment.js"
-                     ],
-                     [
--                        "dev/tests/api-functional/_files",
--                        "dev/tests/api-functional/_files"
-+                        "lib/web/prototype",
-+                        "lib/web/prototype"
-                     ],
-                     [
--                        "dev/tests/api-functional/testsuite/Magento",
--                        "dev/tests/api-functional/testsuite/Magento"
-+                        "lib/web/requirejs",
-+                        "lib/web/requirejs"
-                     ],
-                     [
--                        "dev/tests/api-functional/.gitignore",
--                        "dev/tests/api-functional/.gitignore"
-+                        "lib/web/scriptaculous",
-+                        "lib/web/scriptaculous"
-                     ],
-                     [
--                        "dev/tests/unit/phpunit.xml.dist",
--                        "dev/tests/unit/phpunit.xml.dist"
-+                        "lib/web/spacer.gif",
-+                        "lib/web/spacer.gif"
-                     ],
-                     [
--                        "dev/tests/unit/tmp",
--                        "dev/tests/unit/tmp"
-+                        "lib/web/tiny_mce_4",
-+                        "lib/web/tiny_mce_4"
-                     ],
-                     [
--                        "dev/tests/unit/framework",
--                        "dev/tests/unit/framework"
-+                        "lib/web/underscore.js",
-+                        "lib/web/underscore.js"
-                     ],
-                     [
--                        "dev/tests/unit/.gitignore",
--                        "dev/tests/unit/.gitignore"
-+                        "lib/web/varien",
-+                        "lib/web/varien"
-                     ],
-                     [
--                        "dev/tests/static/phpunit-all.xml.dist",
--                        "dev/tests/static/phpunit-all.xml.dist"
-+                        "nginx.conf.sample",
-+                        "nginx.conf.sample"
-                     ],
-                     [
--                        "dev/tests/static/phpunit.xml.dist",
--                        "dev/tests/static/phpunit.xml.dist"
-+                        "package.json.sample",
-+                        "package.json.sample"
-                     ],
-                     [
--                        "dev/tests/static/framework",
--                        "dev/tests/static/framework"
-+                        "phpserver",
-+                        "phpserver"
-                     ],
-                     [
--                        "dev/tests/static/testsuite/Magento",
--                        "dev/tests/static/testsuite/Magento"
-+                        "pub/.htaccess",
-+                        "pub/.htaccess"
-                     ],
-                     [
--                        "dev/tests/static/.gitignore",
--                        "dev/tests/static/.gitignore"
-+                        "pub/.user.ini",
-+                        "pub/.user.ini"
-                     ],
-                     [
--                        "dev/.htaccess",
--                        "dev/.htaccess"
-+                        "pub/cron.php",
-+                        "pub/cron.php"
-                     ],
-                     [
--                        "Gruntfile.js",
--                        "Gruntfile.js"
-+                        "pub/errors",
-+                        "pub/errors"
-                     ],
-                     [
--                        "setup",
--                        "setup"
-+                        "pub/get.php",
-+                        "pub/get.php"
-                     ],
-                     [
--                        "LICENSE.txt",
--                        "LICENSE.txt"
-+                        "pub/health_check.php",
-+                        "pub/health_check.php"
-                     ],
-                     [
--                        ".travis.yml",
--                        ".travis.yml"
-+                        "pub/index.php",
-+                        "pub/index.php"
-                     ],
-                     [
--                        "app/bootstrap.php",
--                        "app/bootstrap.php"
-+                        "pub/media/.htaccess",
-+                        "pub/media/.htaccess"
-                     ],
-                     [
--                        "app/design/frontend",
--                        "app/design/frontend"
-+                        "pub/media/customer/.htaccess",
-+                        "pub/media/customer/.htaccess"
-                     ],
-                     [
--                        "app/design/adminhtml",
--                        "app/design/adminhtml"
-+                        "pub/media/downloadable/.htaccess",
-+                        "pub/media/downloadable/.htaccess"
-                     ],
-                     [
--                        "app/etc/di.xml",
--                        "app/etc/di.xml"
-+                        "pub/media/import",
-+                        "pub/media/import"
-                     ],
-                     [
--                        "app/.htaccess",
--                        "app/.htaccess"
-+                        "pub/media/theme_customization/.htaccess",
-+                        "pub/media/theme_customization/.htaccess"
-                     ],
-                     [
--                        "app/functions.php",
--                        "app/functions.php"
-+                        "pub/opt",
-+                        "pub/opt"
-                     ],
-                     [
--                        "app/autoload.php",
--                        "app/autoload.php"
-+                        "pub/static.php",
-+                        "pub/static.php"
-                     ],
-                     [
--                        ".htaccess",
--                        ".htaccess"
-+                        "pub/static/.htaccess",
-+                        "pub/static/.htaccess"
-                     ],
-                     [
--                        "php.ini.sample",
--                        "php.ini.sample"
-+                        "setup",
-+                        "setup"
-                     ],
-                     [
--                        "index.php",
--                        "index.php"
-+                        "var/.htaccess",
-+                        "var/.htaccess"
-                     ],
-                     [
--                        "LICENSE_AFL.txt",
--                        "LICENSE_AFL.txt"
-+                        "vendor/.htaccess",
-+                        "vendor/.htaccess"
-                     ]
-+                ],
-+                "chmod": [
-+                    {
-+                        "mask": "0755",
-+                        "path": "bin/magento"
-+                    }
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Magento 2 Base (Community Edition)"
-+        },
-+        {
-+            "name": "magento/module-admin-notification",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-admin-notification/magento-module-admin-notification-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "e7aea76407406c35e6505d4fce2cb06be409ec64"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\AdminNotification\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-advanced-pricing-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-advanced-pricing-import-export/magento-module-advanced-pricing-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "fbb58c6284f6eba01927bdcf2be6460650a8eef7"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-import-export": "101.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\AdvancedPricingImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-advanced-search",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-advanced-search/magento-module-advanced-search-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "3dbf902fa79a08b136205c7b2681ad91425a97b5"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-search": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-search": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\AdvancedSearch\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-amqp",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-amqp/magento-module-amqp-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "fdf734b25eb5fd29a7a8743b3d1e575ba29aa947"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/framework-amqp": "100.3.*",
-+                "magento/framework-message-queue": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Amqp\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-analytics/magento-module-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "c17c1d3353335fb9c9197e715ad7ec117700755c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-integration": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Analytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-asynchronous-operations",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-asynchronous-operations/magento-module-asynchronous-operations-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "9666e0949545697e66d13df886e16915ddfd3ffa"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/framework-bulk": "100.3.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-admin-notification": "100.3.*",
-+                "magento/module-logging": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\AsynchronousOperations\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-authorization",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-authorization/magento-module-authorization-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "c2a05780a4568e92634a46199c6925fecb4c32e3"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Authorization\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Authorization module provides access to Magento ACL functionality."
-+        },
-+        {
-+            "name": "magento/module-authorizenet",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-authorizenet/magento-module-authorizenet-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ab9dc9018f1a5b71cfaa54c1975d6ee6b5c7610c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Authorizenet\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-authorizenet-acceptjs",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-authorizenet-acceptjs/magento-module-authorizenet-acceptjs-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "16bc1b50a4e7f63bfa3869fa2c3bd4c67cedd8a3"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\AuthorizenetAcceptjs\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-backend",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-backend/magento-module-backend-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "3670764e864583abb604107c13490e239ba094d8"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backup": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-developer": "100.3.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-reports": "100.3.*",
-+                "magento/module-require-js": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-security": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-translation": "100.3.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-theme": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Backend\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-backup",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-backup/magento-module-backup-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "bb5a040e418e42554c0887673e21420479e8bf76"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-cron": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Backup\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-braintree",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-braintree/magento-module-braintree-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "bc99da6e5eef549dc2542cfe914aa7742361e2c6"
-+            },
-+            "require": {
-+                "braintree/braintree_php": "3.35.0",
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-instant-purchase": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-paypal": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-vault": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-checkout-agreements": "100.3.*",
-+                "magento/module-theme": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Braintree\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-bundle",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-bundle/magento-module-bundle-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "b1ce50b01d2d8997e1f6dcfc9b2dc82f47d987db"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-catalog-rule": "101.1.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-gift-message": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-bundle-sample-data": "Sample Data version: 100.3.*",
-+                "magento/module-sales-rule": "101.1.*",
-+                "magento/module-webapi": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Bundle\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-bundle-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-bundle-graph-ql/magento-module-bundle-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "4adf0dc50f886e121dde5f906ceaff8630a96697"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-bundle": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\BundleGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-bundle-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-bundle-import-export/magento-module-bundle-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "bdd21ea7945b87b643de52d93fb63b4c6ee625c9"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-bundle": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-import-export": "101.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\BundleImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cache-invalidate",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cache-invalidate/magento-module-cache-invalidate-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ee84c4c87bc878f08f1c325f82b88a7f8a2b4d85"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CacheInvalidate\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-captcha",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-captcha/magento-module-captcha-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "1d37fe2ce55a611af45abf9a79bf3ab45b18fb41"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0",
-+                "zendframework/zend-captcha": "^2.7.1",
-+                "zendframework/zend-db": "^2.8.2",
-+                "zendframework/zend-session": "^2.7.3"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Captcha\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog",
-+            "version": "103.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog/magento-module-catalog-103.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "9f6308528cd0b385c47300ac96e88a48c7462958"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-catalog-rule": "101.1.*",
-+                "magento/module-catalog-url-rewrite": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-indexer": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-msrp": "100.3.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-product-alert": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-url-rewrite": "101.1.*",
-+                "magento/module-widget": "101.1.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-sample-data": "Sample Data version: 100.3.*",
-+                "magento/module-cookie": "100.3.*",
-+                "magento/module-sales": "102.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Catalog\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-analytics/magento-module-catalog-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "78dad80df624ec870cd1fe528eb6bf23dd2a9174"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-analytics": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-graph-ql/magento-module-catalog-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "cab0f652a82a7011271931cfedbb8c13f362ea8c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-eav-graph-ql": "100.3.*",
-+                "magento/module-search": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*",
-+                "magento/module-store-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-import-export",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-import-export/magento-module-catalog-import-export-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "240b1ea27fb0bdebd2cf674ce280917363463216"
-+            },
-+            "require": {
-+                "ext-ctype": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-catalog-url-rewrite": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-inventory",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-inventory/magento-module-catalog-inventory-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "c7c8e7308fa130fa471cf228537506667473d982"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogInventory\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-inventory-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-inventory-graph-ql/magento-module-catalog-inventory-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5438ed8a7e381b27d5325801f87a6a844005ff08"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogInventoryGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-rule",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-rule/magento-module-catalog-rule-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "9892c5ab997236ed1611d9a02ea9a5be925475d6"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-rule": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-rule-sample-data": "Sample Data version: 100.3.*",
-+                "magento/module-import-export": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogRule\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-rule-configurable",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-rule-configurable/magento-module-catalog-rule-configurable-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "0281e9723bb534ba2e12a55ae11260f6904485d6"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-rule": "101.1.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-rule": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogRuleConfigurable\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-search",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-search/magento-module-catalog-search-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "933c002006e94c91b14203178d694acbe3308f86"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-indexer": "100.3.*",
-+                "magento/module-search": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogSearch\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Catalog search"
-+        },
-+        {
-+            "name": "magento/module-catalog-url-rewrite",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-url-rewrite/magento-module-catalog-url-rewrite-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "7a978d3ff25ffebd252182269ecd18039159af70"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-import-export": "101.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-url-rewrite": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-webapi": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogUrlRewrite\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-url-rewrite-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-url-rewrite-graph-ql/magento-module-catalog-url-rewrite-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "408be2e9c2c72d92f43764bfeeedd0063538fc23"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-catalog-url-rewrite": "100.3.*",
-+                "magento/module-url-rewrite-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogUrlRewriteGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-widget",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-widget/magento-module-catalog-widget-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5ff1f431ea8c9453e632e3892afc50f07f45f5a6"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-rule": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-widget": "101.1.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogWidget\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-checkout",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-checkout/magento-module-checkout-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "259dfe67c0b4d6dc00746ac7f004999c58f1fded"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-msrp": "100.3.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-sales-rule": "101.1.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-cookie": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Checkout\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-checkout-agreements",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-checkout-agreements/magento-module-checkout-agreements-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "fe21cdbe902b50a634df92ebe4bac90967140671"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CheckoutAgreements\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cms",
-+            "version": "103.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cms/magento-module-cms-103.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "32b4db597a118386cfe5619f0a39129ab6f28e06"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-email": "101.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-variable": "100.3.*",
-+                "magento/module-widget": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-cms-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Cms\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cms-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cms-graph-ql/magento-module-cms-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "fae2f46721d225970beeb9e1cb26eff1dac6ad7f"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-widget": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*",
-+                "magento/module-store-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CmsGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cms-url-rewrite",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cms-url-rewrite/magento-module-cms-url-rewrite-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "66b9ca23c0af7c8387cfb24028128a64bf3337f4"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-url-rewrite": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CmsUrlRewrite\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cms-url-rewrite-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cms-url-rewrite-graph-ql/magento-module-cms-url-rewrite-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "3b58ec81afb10bbd30a2e011f887635b69803783"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-url-rewrite-graph-ql": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-cms-url-rewrite": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CmsUrlRewriteGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-config",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-config/magento-module-config-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "9458355eb5e383f148fbf503fe75d40d02de60b4"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-cron": "100.3.*",
-+                "magento/module-deploy": "100.3.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-email": "101.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Config\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-configurable-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-configurable-import-export/magento-module-configurable-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ac89ef960f75a7fcdf635dc3691366f7b0f41550"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-import-export": "101.0.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ConfigurableImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-configurable-product",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-configurable-product/magento-module-configurable-product-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "2f0f6c53b969b8b4378e91933ba2fa129fd0763c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-configurable-sample-data": "Sample Data version: 100.3.*",
-+                "magento/module-msrp": "100.3.*",
-+                "magento/module-product-links-sample-data": "Sample Data version: 100.3.*",
-+                "magento/module-product-video": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-sales-rule": "101.1.*",
-+                "magento/module-webapi": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ConfigurableProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-configurable-product-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-configurable-product-graph-ql/magento-module-configurable-product-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "6cf1902c260aa70630b96b806a49844b42136b9c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ConfigurableProductGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-configurable-product-sales",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-configurable-product-sales/magento-module-configurable-product-sales-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ab8e7350ef1fdc6e55f2dfd708d095560afe9d5b"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-configurable-product": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ConfigurableProductSales\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-contact",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-contact/magento-module-contact-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "4aed3599fdc7f885086726076d52e4b800b3d0ec"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Contact\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cookie",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cookie/magento-module-cookie-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "2b52880fe617d8e17746b8c637f56303063f54d0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-backend": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Cookie\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cron",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cron/magento-module-cron-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "953c6de628fbf6c2c02943c9fb14df9c384498c6"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Cron\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-currency-symbol",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-currency-symbol/magento-module-currency-symbol-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5967df5328174a24f59bdad5cc8e7a825878b195"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CurrencySymbol\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-customer",
-+            "version": "102.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-customer/magento-module-customer-102.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "9f99c836860ea853b7803e34c40f0874019f2a71"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-integration": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-newsletter": "100.3.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-review": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-cookie": "100.3.*",
-+                "magento/module-customer-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Customer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-customer-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-customer-analytics/magento-module-customer-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "6a055c7b8b46eb899cd5161a1ecc0874e576f3cd"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-analytics": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CustomerAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-customer-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-customer-graph-ql/magento-module-customer-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "127e9dfe4e63721218264c9046272f43ddce13de"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-integration": "100.3.*",
-+                "magento/module-newsletter": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CustomerGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-customer-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-customer-import-export/magento-module-customer-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "f1cdc6d8fe40bb058e76a0a0641230769a59a774"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CustomerImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-deploy",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-deploy/magento-module-deploy-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "40006c50c2e0d0ee9d17aebb98cc12e9b76a59f9"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-require-js": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "cli_commands.php",
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Deploy\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-developer",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-developer/magento-module-developer-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "007a40f6eaceb427b1a9f24f102bb1c5268c97e0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Developer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-dhl",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-dhl/magento-module-dhl-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "a54951a456d9ae56103fcac8a342fc8104f433e2"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-checkout": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Dhl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-directory",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-directory/magento-module-directory-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "401fd817778dcfb8b7091ede60e3b0bb99267051"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Directory\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-directory-graph-ql",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-directory-graph-ql/magento-module-directory-graph-ql-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "1d9d2307d514ea00d5a8a66cf0556d83986c6189"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\DirectoryGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-downloadable",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-downloadable/magento-module-downloadable-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "c3f2cd868754a23af542b2b19d72c4c4e506c618"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-gift-message": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-downloadable-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Downloadable\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-downloadable-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-downloadable-graph-ql/magento-module-downloadable-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "6324aa9e2f9ba1957778b509b7dcfa7662eb7488"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-downloadable": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\DownloadableGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-downloadable-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-downloadable-import-export/magento-module-downloadable-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "1d8ddfaabe5b6a7a5e5792f09737c0685916417c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-import-export": "101.0.*",
-+                "magento/module-downloadable": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\DownloadableImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-eav",
-+            "version": "102.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-eav/magento-module-eav-102.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "a28509b94e703c3002eeb3238bf3c5eb35b90d5d"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Eav\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-eav-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-eav-graph-ql/magento-module-eav-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "66edb69cdfbce0784166e7f83bf3ecc8adf7ae0e"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\EavGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-elasticsearch",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-elasticsearch/magento-module-elasticsearch-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ed1da1137848560dde1a85f0f54dc2fac262359e"
-+            },
-+            "require": {
-+                "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1",
-+                "magento/framework": "102.0.*",
-+                "magento/module-advanced-search": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-catalog-search": "101.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-search": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Elasticsearch\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-elasticsearch-6",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-elasticsearch-6/magento-module-elasticsearch-6-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "a9da3243900390ad163efc7969b07116d2eb793f"
-+            },
-+            "require": {
-+                "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1",
-+                "magento/framework": "102.0.*",
-+                "magento/module-advanced-search": "100.3.*",
-+                "magento/module-catalog-search": "101.0.*",
-+                "magento/module-elasticsearch": "100.3.*",
-+                "magento/module-search": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Elasticsearch6\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-email",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-email/magento-module-email-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "ebcc5912a5e51f97b8c393638d00ddfcf2f73731"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-variable": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-theme": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Email\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-encryption-key",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-encryption-key/magento-module-encryption-key-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "099f36ac60c8226e0c3c1485d29d336c44744dde"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\EncryptionKey\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-fedex",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-fedex/magento-module-fedex-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "1840c2272127aba6e51599aa2f751c3d250aa1ef"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Fedex\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-gift-message",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-gift-message/magento-module-gift-message-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "b94369cb227d47c934982c8feb06856892c999af"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-multishipping": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GiftMessage\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-google-adwords",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-google-adwords/magento-module-google-adwords-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "6302122da3e9d4084e128ea1a13282bd92ca503a"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GoogleAdwords\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-google-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-google-analytics/magento-module-google-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "f87431addf8245441f53dc88bcb1df6bf9a2b95f"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-cookie": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GoogleAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-google-optimizer",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-google-optimizer/magento-module-google-optimizer-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5239b8174777bdf3fac9f72aad27a604b3febdbb"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-google-analytics": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GoogleOptimizer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-graph-ql/magento-module-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ccb0cfb89c1acbb09c88e01b2c70e924e62a19ce"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-webapi": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-grouped-catalog-inventory",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-grouped-catalog-inventory/magento-module-grouped-catalog-inventory-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "bc0564d1cfb19b3ff7a3a45f287c5fd42749aa83"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-grouped-product": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GroupedCatalogInventory\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-grouped-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-grouped-import-export/magento-module-grouped-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "0d3764973ae6083a9046166bb8f0456b562b638e"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-import-export": "101.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-grouped-product": "100.3.*",
-+                "magento/module-import-export": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GroupedImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-grouped-product",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-grouped-product/magento-module-grouped-product-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "a80950a2b6919304e818ea52e5bbbd450f272130"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-msrp": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-grouped-product-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GroupedProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-grouped-product-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-grouped-product-graph-ql/magento-module-grouped-product-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "4ec0716ff30b242c05ea435ddbd43a4c82802a77"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-grouped-product": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GroupedProductGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-import-export/magento-module-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "3e09156751856fd6a7d96486687c5b56347672c2"
-+            },
-+            "require": {
-+                "ext-ctype": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-indexer",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-indexer/magento-module-indexer-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "bdd64582681713f6836e03916fbd5f88754480e5"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Indexer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-instant-purchase",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-instant-purchase/magento-module-instant-purchase-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "6a831727392f922a7af24ee282db3d8c0201f7db"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-vault": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InstantPurchase\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-integration",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-integration/magento-module-integration-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "416802c817152d1ceac6c1dd16162f08274f5ee6"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-security": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Integration\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory/magento-module-inventory-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "ce21405c9662b13edd131a3d52c562160f4d9f52"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Inventory\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-admin-ui/magento-module-inventory-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "ccdcdf958be78bf2b73b6d8fa558c42d07b87bbf"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-directory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-api",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-api/magento-module-inventory-api-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "f6da7918669ed256fab8bcf90537a1c853abd612"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-bundle-product",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-bundle-product/magento-module-inventory-bundle-product-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "395b08dcd35f14465f338a9da1cf1953a68ca327"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-bundle": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-configuration-api": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryBundleProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-bundle-product-admin-ui",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-bundle-product-admin-ui/magento-module-inventory-bundle-product-admin-ui-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "295705218a4f38202a3ee913092503dc5ccb9074"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-configuration-api": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryBundleProductAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-cache",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-cache/magento-module-inventory-cache-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "024f1d29d27adab967ae77e8b90ee208a06872e7"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-catalog-api": "1.0.*",
-+                "magento/module-inventory-indexer": "1.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog": "103.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryCache\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-catalog",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-catalog/magento-module-inventory-catalog-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "cf9fc73a20f4d4929c67ffddc5046bcf92437c69"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-indexer": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-reservations-api": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryCatalog\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-catalog-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-catalog-admin-ui/magento-module-inventory-catalog-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "828a6c4961021129eda07527d2d25eedac0e1bfa"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-asynchronous-operations": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-indexer": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-admin-ui": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryCatalogAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-catalog-api",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-catalog-api/magento-module-inventory-catalog-api-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "edc148f4419e249b37a316afefeef4b97c73bad1"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryCatalogApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-catalog-search",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-catalog-search/magento-module-inventory-catalog-search-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "cbe649fee67d9740d1cf2f3d9ce874d1a6413f76"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-indexer": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-search": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryCatalogSearch\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-configurable-product",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-configurable-product/magento-module-inventory-configurable-product-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "8d4c12fcdaa863c47893664e38fa1ad60e90ffb8"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-indexer": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-configurable-product": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryConfigurableProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-configurable-product-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-configurable-product-admin-ui/magento-module-inventory-configurable-product-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "18dfb9d8cb702ba1d2f465cbe0a5b8b57db07207"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-configurable-product": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-admin-ui": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryConfigurableProductAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-configurable-product-indexer",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-configurable-product-indexer/magento-module-inventory-configurable-product-indexer-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "540f1a1687b90b81168dca0f463fe12dae5e4e84"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-inventory-api": "1.0.*",
-+                "magento/module-inventory-catalog-api": "1.0.*",
-+                "magento/module-inventory-indexer": "1.0.*",
-+                "magento/module-inventory-multi-dimensional-indexer-api": "1.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryConfigurableProductIndexer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-configuration",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-configuration/magento-module-inventory-configuration-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "a9869aeddeede17ba0e442a989b809f86f0a86fe"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryConfiguration\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-configuration-api",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-configuration-api/magento-module-inventory-configuration-api-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "d091e7523a1d18099360d9e49f86a3e04dba71b4"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryConfigurationApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-distance-based-source-selection",
-+            "version": "1.0.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-distance-based-source-selection/magento-module-inventory-distance-based-source-selection-1.0.0.0.zip",
-+                "reference": null,
-+                "shasum": "c9b93cdfd600a3b493753313ac617dfc0ce8f19c"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-config": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-distance-based-source-selection-api": "*",
-+                "magento/module-inventory-source-selection-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryDistanceBasedSourceSelection\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-distance-based-source-selection-admin-ui",
-+            "version": "1.0.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-distance-based-source-selection-admin-ui/magento-module-inventory-distance-based-source-selection-admin-ui-1.0.0.0.zip",
-+                "reference": null,
-+                "shasum": "b75ca632a07386dc60c5572e353fe4ba47e22d01"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryDistanceBasedSourceSelectionAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-distance-based-source-selection-api",
-+            "version": "1.0.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-distance-based-source-selection-api/magento-module-inventory-distance-based-source-selection-api-1.0.0.0.zip",
-+                "reference": null,
-+                "shasum": "79d9c3f965d14612e95a4723000b1200d5a55b6c"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-source-selection-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryDistanceBasedSourceSelectionApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-elasticsearch",
-+            "version": "1.0.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-elasticsearch/magento-module-inventory-elasticsearch-1.0.0.0.zip",
-+                "reference": null,
-+                "shasum": "b46ff3807763c9967e60f67b155b47658387457b"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-catalog-search": "*",
-+                "magento/module-elasticsearch": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-indexer": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryElasticsearch\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-grouped-product",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-grouped-product/magento-module-inventory-grouped-product-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "19c3284175d75dafd8ad97cc35e1e47a527c82da"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-grouped-product": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-configuration-api": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryGroupedProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-grouped-product-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-grouped-product-admin-ui/magento-module-inventory-grouped-product-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "d15af53f7bbdd213fdb0af1a16f0e50d968c7240"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-grouped-product": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-admin-ui": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-configuration-api": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryGroupedProductAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-grouped-product-indexer",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-grouped-product-indexer/magento-module-inventory-grouped-product-indexer-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "f8aeffd329e1b556ebf1dfcb3ce23103ae724980"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-grouped-product": "*",
-+                "magento/module-inventory-api": "1.0.*",
-+                "magento/module-inventory-catalog-api": "1.0.*",
-+                "magento/module-inventory-indexer": "1.0.*",
-+                "magento/module-inventory-multi-dimensional-indexer-api": "1.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryGroupedProductIndexer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-import-export",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-import-export/magento-module-inventory-import-export-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "deefee73fd3c2bb9132e102cc272e4e2dce71088"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-eav": "*",
-+                "magento/module-import-export": "*",
-+                "magento/module-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-import-export": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-indexer",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-indexer/magento-module-inventory-indexer-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "61bc4572359a82e85b10d2a60a2ec15b9e917a9d"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-multi-dimensional-indexer-api": "*",
-+                "magento/module-inventory-sales": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog": "103.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryIndexer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-low-quantity-notification",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-low-quantity-notification/magento-module-inventory-low-quantity-notification-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "d6779810c096678fa838aff0dc1d5d4c04cb3af6"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-eav": "*",
-+                "magento/module-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-low-quantity-notification-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryLowQuantityNotification\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-low-quantity-notification-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-low-quantity-notification-admin-ui/magento-module-inventory-low-quantity-notification-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "c61e759363d9cd39f6deae99ffcc2b8248831477"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-low-quantity-notification": "*",
-+                "magento/module-inventory-low-quantity-notification-api": "*",
-+                "magento/module-reports": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryLowQuantityNotificationAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-low-quantity-notification-api",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-low-quantity-notification-api/magento-module-inventory-low-quantity-notification-api-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "08c2657ee45ff0db1ca949437d7dd2da0da956a1"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryLowQuantityNotificationApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-multi-dimensional-indexer-api",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-multi-dimensional-indexer-api/magento-module-inventory-multi-dimensional-indexer-api-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "630ab27e5d236a5f0d061a76f80656a248c36000"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryMultiDimensionalIndexerApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-product-alert",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-product-alert/magento-module-inventory-product-alert-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "e21d973d4e58ffa137824b1856cb4ea028fb5135"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-product-alert": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-product-alert": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryProductAlert\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-reservations",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-reservations/magento-module-inventory-reservations-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "e527a03b2f48c13cea4081da2c7261bd69c4c92d"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-reservations-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryReservations\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-reservations-api",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-reservations-api/magento-module-inventory-reservations-api-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "3955de482006ccbf8d823ec28e042a69862059da"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryReservationsApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-sales",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-sales/magento-module-inventory-sales-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "d0a9a3d09d41dc3c1e7cce3a07335935ae2b7fc6"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-reservations-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-inventory-source-deduction-api": "*",
-+                "magento/module-sales": "*",
-+                "magento/module-sales-inventory": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "require-dev": {
-+                "magento/module-inventory-indexer": "*"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-catalog": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySales\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-sales-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-sales-admin-ui/magento-module-inventory-sales-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "13daf51ba16c09101f2574eb3dabf2221e81cb0a"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory-admin-ui": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-store": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySalesAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-sales-api",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-sales-api/magento-module-inventory-sales-api-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "6b8847fc22bd04015a9fc5717dfa94f6154d14b4"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-sales": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySalesApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-sales-frontend-ui",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-sales-frontend-ui/magento-module-inventory-sales-frontend-ui-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "ef1f4e1d67c0add33fa1a5b6da08bed1fd6a7b97"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory-configuration-api": "1.0.*",
-+                "magento/module-inventory-sales-api": "1.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySalesFrontendUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-setup-fixture-generator",
-+            "version": "1.0.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-setup-fixture-generator/magento-module-inventory-setup-fixture-generator-1.0.0.0.zip",
-+                "reference": null,
-+                "shasum": "207fe21748b53ad44330a5abc5dc79f1f2a24bed"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySetupFixtureGenerator\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-shipping",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-shipping/magento-module-inventory-shipping-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "338a6df150d1ad1107cedba355c896b50275c431"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-inventory-source-deduction-api": "*",
-+                "magento/module-inventory-source-selection-api": "*",
-+                "magento/module-sales": "*",
-+                "magento/module-shipping": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryShipping\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-shipping-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-shipping-admin-ui/magento-module-inventory-shipping-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "faa48dd7930974c8fd4c792d70f9ab71fd971b78"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-inventory-source-selection-api": "*",
-+                "magento/module-sales": "*",
-+                "magento/module-shipping": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryShippingAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-source-deduction-api",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-source-deduction-api/magento-module-inventory-source-deduction-api-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "4f3167eb248232b18483dae7cde986cb4170239e"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySourceDeductionApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-source-selection",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-source-selection/magento-module-inventory-source-selection-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "3b8465fcb2f094c82eb86226581a74f8f6a23424"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-source-selection-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySourceSelection\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-source-selection-api",
-+            "version": "1.1.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-source-selection-api/magento-module-inventory-source-selection-api-1.1.0.0.zip",
-+                "reference": null,
-+                "shasum": "b7cf97c809075fe6fc2d95535a61c44f11440b77"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-sales": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySourceSelectionApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-layered-navigation",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-layered-navigation/magento-module-layered-navigation-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "32c5d1e9d21dd98adabe7083ddb3b39ab49d2bde"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\LayeredNavigation\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-marketplace",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-marketplace/magento-module-marketplace-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "81415a17e166c349e179e79fe8bb891a5cb63283"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Marketplace\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-media-storage",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-media-storage/magento-module-media-storage-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "dbf17a763cbf65cae32bb86fc1a0584fc51b00a0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\MediaStorage\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-message-queue",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-message-queue/magento-module-message-queue-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "e7a221ac13a53fc8e428bce254620f2d318ffd9c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\MessageQueue\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-msrp",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-msrp/magento-module-msrp-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "45cee25e493e4b43f1f10fc732f9967c62d36656"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-downloadable": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-bundle": "100.3.*",
-+                "magento/module-msrp-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Msrp\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-msrp-configurable-product",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-msrp-configurable-product/magento-module-msrp-configurable-product-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "cf76e419dad2243cd680b38e4d85aa48a1ea9ac9"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "magento/module-msrp": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\MsrpConfigurableProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-msrp-grouped-product",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-msrp-grouped-product/magento-module-msrp-grouped-product-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "083080ce31393078e30cb6fb17b274c865839b0c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-grouped-product": "100.3.*",
-+                "magento/module-msrp": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\MsrpGroupedProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-multishipping",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-multishipping/magento-module-multishipping-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "2da74e0371ddccaca808e55dc81863dd65e3fa6f"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Multishipping\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-mysql-mq",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-mysql-mq/magento-module-mysql-mq-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "dda5a554028c56847a1ce717f92927b453708cfd"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\MysqlMq\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-new-relic-reporting",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-new-relic-reporting/magento-module-new-relic-reporting-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ee8dbe8627dbadf731cb2f8a9182971b530b54b2"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\NewRelicReporting\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-newsletter",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-newsletter/magento-module-newsletter-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "fad2941ec1d5451f5adc492d298eeef4e2410fe4"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-email": "101.0.*",
-+                "magento/module-require-js": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-widget": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Newsletter\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-offline-payments",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-offline-payments/magento-module-offline-payments-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "1299eb55d0cabd756610f1f091f5a57b71d4813c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\OfflinePayments\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-offline-shipping",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-offline-shipping/magento-module-offline-shipping-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "2d4ae255389cf87a50ed8bfe9af7e7cabdd6e664"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-sales-rule": "101.1.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-offline-shipping-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\OfflineShipping\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-page-cache",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-page-cache/magento-module-page-cache-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "4e2729548eee3283f06d3ed3bd0aac2c2c012a2f"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\PageCache\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-payment",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-payment/magento-module-payment-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "3a5dc59dc2f36c28e1b84701d2deb444a1110373"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Payment\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-paypal",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-paypal/magento-module-paypal-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "1c9210c8fd9354d89d580ddc2d29121f0ffc8c20"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-instant-purchase": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-vault": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-checkout-agreements": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Paypal\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-persistent",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-persistent/magento-module-persistent-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "bb6e14bbf0d568563cf1dc2e4aafdedaa31709de"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-cron": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Persistent\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-product-alert",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-product-alert/magento-module-product-alert-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "324a647bc52ff96f365e0be0e9628f1d36829026"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ProductAlert\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-product-video",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-product-video/magento-module-product-video-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "c6cb19d8f73d44399dde39e72d79bf6b7ff8e029"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ProductVideo\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Add Video to Products"
-+        },
-+        {
-+            "name": "magento/module-quote",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-quote/magento-module-quote-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "e2b39264ded8af41839229e7ce6dc1e13f41dab1"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-sales-sequence": "100.3.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-webapi": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Quote\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-quote-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-quote-analytics/magento-module-quote-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "04b120e37bfe9d985dcf1b1eb90b5d8044dd4d77"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-analytics": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\QuoteAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-quote-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-quote-graph-ql/magento-module-quote-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "232b4284ed0ccd26c715fcc23a089b3a011c5639"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-customer-graph-ql": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\QuoteGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-release-notification",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-release-notification/magento-module-release-notification-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "b6f40a4a0a6328fdf5dde3dd18d702190d5c2347"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ReleaseNotification\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-reports",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-reports/magento-module-reports-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "56df5dc26d25298d608a2e130073aa46c51d7a45"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-downloadable": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-review": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-sales-rule": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-widget": "101.1.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Reports\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-require-js",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-require-js/magento-module-require-js-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "348fa995170de7f4d508a600d8ca2b73cddfc17f"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\RequireJs\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-review",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-review/magento-module-review-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5d226e5ddf781537a69ef6bf648cf2be7621d0a8"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-newsletter": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-cookie": "100.3.*",
-+                "magento/module-review-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Review\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-review-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-review-analytics/magento-module-review-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "eb26fb256b43d77b4da00e16d9e76d0cb7078c96"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-analytics": "100.3.*",
-+                "magento/module-review": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ReviewAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-robots",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-robots/magento-module-robots-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "52129625db7928a4723a47fed097c843a27663d8"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-theme": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Robots\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-rss",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-rss/magento-module-rss-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "1f792762c259e85590143df883323534611dc299"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Rss\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-rule",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-rule/magento-module-rule-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "2eec15c18c6ab5983a61e768f114c6dc96ec883d"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Rule\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sales",
-+            "version": "102.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sales/magento-module-sales-102.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "f7e58a0a0bcb551e96dde31c9de350e20e4d7ff5"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-bundle": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-gift-message": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-reports": "100.3.*",
-+                "magento/module-sales-rule": "101.1.*",
-+                "magento/module-sales-sequence": "100.3.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-widget": "101.1.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-sales-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Sales\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sales-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sales-analytics/magento-module-sales-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "f2d5d1dd165e3ea17667a5eaa105bd4757ac5844"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-analytics": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SalesAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sales-graph-ql",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sales-graph-ql/magento-module-sales-graph-ql-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "e10599dcbd5dd7866bfdaf8af7065577ce1e7ebc"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-customer-graph-ql": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SalesGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sales-inventory",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sales-inventory/magento-module-sales-inventory-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "6982aab2739a7ec5df5b25b5cac28dc70fea4c6b"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SalesInventory\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sales-rule",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sales-rule/magento-module-sales-rule-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "043d64f9e5a5b1564473532a1599c2fd58deed6e"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-rule": "101.1.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-reports": "100.3.*",
-+                "magento/module-rule": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-widget": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-sales-rule-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SalesRule\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sales-sequence",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sales-sequence/magento-module-sales-sequence-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "d045268eeef55a7d66f98c1ec77569ccc52b6683"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SalesSequence\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sample-data",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sample-data/magento-module-sample-data-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "da0800d6ed74b8956ef00ee080230a18f048ed8f"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/sample-data-media": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "cli_commands.php",
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SampleData\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Sample Data fixtures"
-+        },
-+        {
-+            "name": "magento/module-search",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-search/magento-module-search-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "a9486668c87a5ba4bb4aa6c9f8060637f7027ca1"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog-search": "101.0.*",
-+                "magento/module-reports": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Search\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-security",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-security/magento-module-security-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "17018cf2303e60994bf28daa52fa6f7180f182da"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-customer": "102.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Security\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Security management module"
-+        },
-+        {
-+            "name": "magento/module-send-friend",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-send-friend/magento-module-send-friend-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "547e26b8d3570b3f0969b9f5802725e8d8651714"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-captcha": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SendFriend\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-send-friend-graph-ql",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-send-friend-graph-ql/magento-module-send-friend-graph-ql-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "ef5fbfcd51beb3ad8225fa03320cc45012b0bd70"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-send-friend": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SendFriendGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-shipping",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-shipping/magento-module-shipping-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "dd53451df643e7d4513cb3102f182eb1f96bbc36"
-+            },
-+            "require": {
-+                "ext-gd": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-contact": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*",
-+                "magento/module-fedex": "100.3.*",
-+                "magento/module-ups": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Shipping\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-signifyd",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-signifyd/magento-module-signifyd-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "768442b807e31bacfb5bbf914e155bac3ca88dde"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Signifyd\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Submitting Case Entry to Signifyd on Order Creation"
-+        },
-+        {
-+            "name": "magento/module-sitemap",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sitemap/magento-module-sitemap-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "2f4535120d0551397680bdbd2365c08dd175f5f1"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-url-rewrite": "100.3.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-robots": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Sitemap\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-store",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-store/magento-module-store-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "aa4a2db8d42094f5978782138eb16e3adcf6798c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-deploy": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Store\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-store-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-store-graph-ql/magento-module-store-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "7c00e21d6f4c5c45bf2cc4bf0dd9dfdaa83ccad3"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\StoreGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-swagger",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-swagger/magento-module-swagger-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "f17474413c08f94ca5f704d9eff5b6ad268a0440"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Swagger\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-swagger-webapi",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-swagger-webapi/magento-module-swagger-webapi-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "7e4ee0f77d30c0e358771d2815ed1065bcfea7a2"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-swagger": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SwaggerWebapi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-swagger-webapi-async",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-swagger-webapi-async/magento-module-swagger-webapi-async-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "8e47ef5ab81bf92742b100c75879871e5d356095"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-swagger": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SwaggerWebapiAsync\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-swatches",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-swatches/magento-module-swatches-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "e8f12b8f0935403f693e78d60633da666162cb5a"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-layered-navigation": "100.3.*",
-+                "magento/module-swatches-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Swatches\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Add Swatches to Products"
-+        },
-+        {
-+            "name": "magento/module-swatches-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-swatches-graph-ql/magento-module-swatches-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "81636dcec8824fd41c6287203e25dd850afab20b"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-swatches": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SwatchesGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-swatches-layered-navigation",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-swatches-layered-navigation/magento-module-swatches-layered-navigation-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "0ba7397b12656fa9db3faee319ca64e65504cffa"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SwatchesLayeredNavigation\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-tax",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-tax/magento-module-tax-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ec9848f312abb6c03393aae776b086b1d4177ab0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-reports": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-tax-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Tax\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-tax-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-tax-graph-ql/magento-module-tax-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "eabd499aaf645826ac644dce948bba133d76aaf0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-tax": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\TaxGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-tax-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-tax-import-export/magento-module-tax-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "8027abc153f14886965525539f873c8a4120cf8c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\TaxImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-theme",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-theme/magento-module-theme-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "e6fed3b1a3a3f21452f151e1eb2aa36510cb1b50"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-require-js": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-widget": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-deploy": "100.3.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-theme-sample-data": "Sample Data version: 100.3.*",
-+                "magento/module-translation": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Theme\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-theme-graph-ql",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-theme-graph-ql/magento-module-theme-graph-ql-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "cd9d5fd79db5547f5a5b1e4761b901451b2fc013"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-store-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ThemeGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-tinymce-3",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-tinymce-3/magento-module-tinymce-3-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5153d30d5f5e5a8d99182a65dce142569f22861e"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-variable": "100.3.*",
-+                "magento/module-widget": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-cms": "103.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Tinymce3\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-translation",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-translation/magento-module-translation-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "dbc9a6bd9d8aa234c5809103e6ac93372fa33c81"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-developer": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-deploy": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Translation\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-ui",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-ui/magento-module-ui-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "fc1e9663747d2f40f9a3278983598d9098ffca1a"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Ui\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-ups",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-ups/magento-module-ups-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "34c0f3f7c03bd533aff334fb88750fc109a71d1d"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Ups\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-url-rewrite",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-url-rewrite/magento-module-url-rewrite-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "f21c8619cec00fda18dd3dcb51cb2a4e8d451aee"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-url-rewrite": "100.3.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-cms-url-rewrite": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\UrlRewrite\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-url-rewrite-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-url-rewrite-graph-ql/magento-module-url-rewrite-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ba563f2348277b9f06cd2f4e3118fa756f453d6e"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-url-rewrite": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\UrlRewriteGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-user",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-user/magento-module-user-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "28a050491e3e447c8460f42b0f0549ad6adca190"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-email": "101.0.*",
-+                "magento/module-integration": "100.3.*",
-+                "magento/module-security": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\User\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-usps",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-usps/magento-module-usps-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "cf9a786445d64b36c1d4bc32666213225821d84d"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Usps\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-variable",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-variable/magento-module-variable-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "7b8faefa05dc6e563ac5663db86b86a2dc3c02e8"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Variable\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-vault",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-vault/magento-module-vault-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "c8702e4f0ec7fa9538194203be7e5bbf0bc8077b"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Vault\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ]
-+        },
-+        {
-+            "name": "magento/module-version",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-version/magento-module-version-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "f35d618be8f999ec653c83de3e364d4eea5eb796"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Version\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-webapi",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-webapi/magento-module-webapi-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "9aee9870a6296462ed7b834383725b6f8cbfd8fe"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-integration": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-user": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Webapi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-webapi-async",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-webapi-async/magento-module-webapi-async-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "061d2e2ffd3476b78dedef5d078227fae7869019"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-asynchronous-operations": "100.3.*",
-+                "magento/module-webapi": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-user": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\WebapiAsync\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-webapi-security",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-webapi-security/magento-module-webapi-security-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ddc3201ecae4ff4fd0179fc387c69fe7af902caf"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-webapi": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\WebapiSecurity\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "WebapiSecurity module provides option to loosen security on some webapi resources."
-+        },
-+        {
-+            "name": "magento/module-weee",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-weee/magento-module-weee-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "665d507e1d1baad1769f91ad021a0484f811c745"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-bundle": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Weee\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-weee-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-weee-graph-ql/magento-module-weee-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "8cd539c61f3f52683cdf1d081d03ba1ab198da43"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-weee": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\WeeeGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-widget",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-widget/magento-module-widget-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "f7c8f6136274aee6ec623112981505475b36ea04"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-variable": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-widget-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Widget\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-wishlist",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-wishlist/magento-module-wishlist-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "e73a999d11356a60646ccf7bc753d8ee04ed7035"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-captcha": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-rss": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-bundle": "100.3.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "magento/module-cookie": "100.3.*",
-+                "magento/module-downloadable": "100.3.*",
-+                "magento/module-grouped-product": "100.3.*",
-+                "magento/module-wishlist-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Wishlist\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-wishlist-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-wishlist-analytics/magento-module-wishlist-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "65852d6f8437a52706906c7c529398e60bf9052d"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-analytics": "100.3.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\WishlistAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-wishlist-graph-ql",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-wishlist-graph-ql/magento-module-wishlist-graph-ql-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "6b63731e8f68755b22f29e0b29febc8c3c374842"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\WishlistGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/product-community-edition",
-+            "version": "2.3.1",
-+            "require": {
-+                "amzn/amazon-pay-and-login-magento-2-module": "3.1.4",
-+                "braintree/braintree_php": "3.35.0",
-+                "colinmollenhour/cache-backend-file": "~1.4.1",
-+                "colinmollenhour/cache-backend-redis": "1.10.6",
-+                "colinmollenhour/credis": "1.10.0",
-+                "colinmollenhour/php-redis-session-abstract": "~1.4.0",
-+                "composer/composer": "^1.6",
-+                "dotmailer/dotmailer-magento2-extension": "3.1.1",
-+                "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1",
-+                "ext-bcmath": "*",
-+                "ext-ctype": "*",
-+                "ext-curl": "*",
-+                "ext-dom": "*",
-+                "ext-gd": "*",
-+                "ext-hash": "*",
-+                "ext-iconv": "*",
-+                "ext-intl": "*",
-+                "ext-mbstring": "*",
-+                "ext-openssl": "*",
-+                "ext-pdo_mysql": "*",
-+                "ext-simplexml": "*",
-+                "ext-soap": "*",
-+                "ext-spl": "*",
-+                "ext-xsl": "*",
-+                "ext-zip": "*",
-+                "klarna/m2-payments": "7.1.0",
-+                "lib-libxml": "*",
-+                "magento/composer": "~1.4.0",
-+                "magento/framework": "102.0.1",
-+                "magento/framework-amqp": "100.3.1",
-+                "magento/framework-bulk": "100.3.1",
-+                "magento/framework-message-queue": "100.3.1",
-+                "magento/inventory-composer-metapackage": "1.1.1",
-+                "magento/language-de_de": "100.3.1",
-+                "magento/language-en_us": "100.3.1",
-+                "magento/language-es_es": "100.3.1",
-+                "magento/language-fr_fr": "100.3.1",
-+                "magento/language-nl_nl": "100.3.1",
-+                "magento/language-pt_br": "100.3.1",
-+                "magento/language-zh_hans_cn": "100.3.1",
-+                "magento/magento-composer-installer": ">=0.1.11",
-+                "magento/magento2-base": "2.3.1",
-+                "magento/module-admin-notification": "100.3.1",
-+                "magento/module-advanced-pricing-import-export": "100.3.1",
-+                "magento/module-advanced-search": "100.3.1",
-+                "magento/module-amqp": "100.3.1",
-+                "magento/module-analytics": "100.3.1",
-+                "magento/module-asynchronous-operations": "100.3.1",
-+                "magento/module-authorization": "100.3.1",
-+                "magento/module-authorizenet": "100.3.1",
-+                "magento/module-authorizenet-acceptjs": "100.3.0",
-+                "magento/module-backend": "101.0.1",
-+                "magento/module-backup": "100.3.1",
-+                "magento/module-braintree": "100.3.1",
-+                "magento/module-bundle": "100.3.1",
-+                "magento/module-bundle-graph-ql": "100.3.1",
-+                "magento/module-bundle-import-export": "100.3.1",
-+                "magento/module-cache-invalidate": "100.3.1",
-+                "magento/module-captcha": "100.3.1",
-+                "magento/module-catalog": "103.0.1",
-+                "magento/module-catalog-analytics": "100.3.1",
-+                "magento/module-catalog-graph-ql": "100.3.1",
-+                "magento/module-catalog-import-export": "101.0.1",
-+                "magento/module-catalog-inventory": "100.3.1",
-+                "magento/module-catalog-inventory-graph-ql": "100.3.1",
-+                "magento/module-catalog-rule": "101.1.1",
-+                "magento/module-catalog-rule-configurable": "100.3.1",
-+                "magento/module-catalog-search": "101.0.1",
-+                "magento/module-catalog-url-rewrite": "100.3.1",
-+                "magento/module-catalog-url-rewrite-graph-ql": "100.3.1",
-+                "magento/module-catalog-widget": "100.3.1",
-+                "magento/module-checkout": "100.3.1",
-+                "magento/module-checkout-agreements": "100.3.1",
-+                "magento/module-cms": "103.0.1",
-+                "magento/module-cms-graph-ql": "100.3.1",
-+                "magento/module-cms-url-rewrite": "100.3.1",
-+                "magento/module-cms-url-rewrite-graph-ql": "100.3.1",
-+                "magento/module-config": "101.1.1",
-+                "magento/module-configurable-import-export": "100.3.1",
-+                "magento/module-configurable-product": "100.3.1",
-+                "magento/module-configurable-product-graph-ql": "100.3.1",
-+                "magento/module-configurable-product-sales": "100.3.1",
-+                "magento/module-contact": "100.3.1",
-+                "magento/module-cookie": "100.3.1",
-+                "magento/module-cron": "100.3.1",
-+                "magento/module-currency-symbol": "100.3.1",
-+                "magento/module-customer": "102.0.1",
-+                "magento/module-customer-analytics": "100.3.1",
-+                "magento/module-customer-graph-ql": "100.3.1",
-+                "magento/module-customer-import-export": "100.3.1",
-+                "magento/module-deploy": "100.3.1",
-+                "magento/module-developer": "100.3.1",
-+                "magento/module-dhl": "100.3.1",
-+                "magento/module-directory": "100.3.1",
-+                "magento/module-directory-graph-ql": "100.3.0",
-+                "magento/module-downloadable": "100.3.1",
-+                "magento/module-downloadable-graph-ql": "100.3.1",
-+                "magento/module-downloadable-import-export": "100.3.1",
-+                "magento/module-eav": "102.0.1",
-+                "magento/module-eav-graph-ql": "100.3.1",
-+                "magento/module-elasticsearch": "100.3.1",
-+                "magento/module-elasticsearch-6": "100.3.0",
-+                "magento/module-email": "101.0.1",
-+                "magento/module-encryption-key": "100.3.1",
-+                "magento/module-fedex": "100.3.1",
-+                "magento/module-gift-message": "100.3.1",
-+                "magento/module-google-adwords": "100.3.1",
-+                "magento/module-google-analytics": "100.3.1",
-+                "magento/module-google-optimizer": "100.3.1",
-+                "magento/module-graph-ql": "100.3.1",
-+                "magento/module-grouped-catalog-inventory": "100.3.0",
-+                "magento/module-grouped-import-export": "100.3.1",
-+                "magento/module-grouped-product": "100.3.1",
-+                "magento/module-grouped-product-graph-ql": "100.3.1",
-+                "magento/module-import-export": "100.3.1",
-+                "magento/module-indexer": "100.3.1",
-+                "magento/module-instant-purchase": "100.3.1",
-+                "magento/module-integration": "100.3.1",
-+                "magento/module-layered-navigation": "100.3.1",
-+                "magento/module-marketplace": "100.3.1",
-+                "magento/module-media-storage": "100.3.1",
-+                "magento/module-message-queue": "100.3.1",
-+                "magento/module-msrp": "100.3.1",
-+                "magento/module-msrp-configurable-product": "100.3.0",
-+                "magento/module-msrp-grouped-product": "100.3.0",
-+                "magento/module-multishipping": "100.3.1",
-+                "magento/module-mysql-mq": "100.3.1",
-+                "magento/module-new-relic-reporting": "100.3.1",
-+                "magento/module-newsletter": "100.3.1",
-+                "magento/module-offline-payments": "100.3.1",
-+                "magento/module-offline-shipping": "100.3.1",
-+                "magento/module-page-cache": "100.3.1",
-+                "magento/module-payment": "100.3.1",
-+                "magento/module-paypal": "100.3.1",
-+                "magento/module-persistent": "100.3.1",
-+                "magento/module-product-alert": "100.3.1",
-+                "magento/module-product-video": "100.3.1",
-+                "magento/module-quote": "101.1.1",
-+                "magento/module-quote-analytics": "100.3.1",
-+                "magento/module-quote-graph-ql": "100.3.1",
-+                "magento/module-release-notification": "100.3.1",
-+                "magento/module-reports": "100.3.1",
-+                "magento/module-require-js": "100.3.1",
-+                "magento/module-review": "100.3.1",
-+                "magento/module-review-analytics": "100.3.1",
-+                "magento/module-robots": "101.0.1",
-+                "magento/module-rss": "100.3.1",
-+                "magento/module-rule": "100.3.1",
-+                "magento/module-sales": "102.0.1",
-+                "magento/module-sales-analytics": "100.3.1",
-+                "magento/module-sales-graph-ql": "100.3.0",
-+                "magento/module-sales-inventory": "100.3.1",
-+                "magento/module-sales-rule": "101.1.1",
-+                "magento/module-sales-sequence": "100.3.1",
-+                "magento/module-sample-data": "100.3.1",
-+                "magento/module-search": "101.0.1",
-+                "magento/module-security": "100.3.1",
-+                "magento/module-send-friend": "100.3.1",
-+                "magento/module-send-friend-graph-ql": "100.3.0",
-+                "magento/module-shipping": "100.3.1",
-+                "magento/module-signifyd": "100.3.1",
-+                "magento/module-sitemap": "100.3.1",
-+                "magento/module-store": "101.0.1",
-+                "magento/module-store-graph-ql": "100.3.1",
-+                "magento/module-swagger": "100.3.1",
-+                "magento/module-swagger-webapi": "100.3.1",
-+                "magento/module-swagger-webapi-async": "100.3.1",
-+                "magento/module-swatches": "100.3.1",
-+                "magento/module-swatches-graph-ql": "100.3.1",
-+                "magento/module-swatches-layered-navigation": "100.3.1",
-+                "magento/module-tax": "100.3.1",
-+                "magento/module-tax-graph-ql": "100.3.1",
-+                "magento/module-tax-import-export": "100.3.1",
-+                "magento/module-theme": "101.0.1",
-+                "magento/module-theme-graph-ql": "100.3.0",
-+                "magento/module-tinymce-3": "100.3.1",
-+                "magento/module-translation": "100.3.1",
-+                "magento/module-ui": "101.1.1",
-+                "magento/module-ups": "100.3.1",
-+                "magento/module-url-rewrite": "101.1.1",
-+                "magento/module-url-rewrite-graph-ql": "100.3.1",
-+                "magento/module-user": "101.1.1",
-+                "magento/module-usps": "100.3.1",
-+                "magento/module-variable": "100.3.1",
-+                "magento/module-vault": "101.1.1",
-+                "magento/module-version": "100.3.1",
-+                "magento/module-webapi": "100.3.1",
-+                "magento/module-webapi-async": "100.3.1",
-+                "magento/module-webapi-security": "100.3.1",
-+                "magento/module-weee": "100.3.1",
-+                "magento/module-weee-graph-ql": "100.3.1",
-+                "magento/module-widget": "101.1.1",
-+                "magento/module-wishlist": "101.1.1",
-+                "magento/module-wishlist-analytics": "100.3.1",
-+                "magento/module-wishlist-graph-ql": "100.3.0",
-+                "magento/theme-adminhtml-backend": "100.3.1",
-+                "magento/theme-frontend-blank": "100.3.1",
-+                "magento/theme-frontend-luma": "100.3.1",
-+                "magento/zendframework1": "~1.14.1",
-+                "monolog/monolog": "^1.17",
-+                "msp/recaptcha": "2.0.2",
-+                "msp/twofactorauth": "3.0.0",
-+                "oyejorge/less.php": "~1.7.0",
-+                "paragonie/sodium_compat": "^1.6",
-+                "pelago/emogrifier": "^2.0.0",
-+                "php": "~7.1.3||~7.2.0",
-+                "php-amqplib/php-amqplib": "~2.7.0",
-+                "phpseclib/mcrypt_compat": "1.0.8",
-+                "phpseclib/phpseclib": "2.0.*",
-+                "ramsey/uuid": "~3.8.0",
-+                "symfony/console": "~4.1.0",
-+                "symfony/event-dispatcher": "~4.1.0",
-+                "symfony/process": "~4.1.0",
-+                "tedivm/jshrink": "~1.3.0",
-+                "temando/module-shipping-m2": "1.5.1",
-+                "tubalmartin/cssmin": "4.1.1",
-+                "vertex/product-magento-module": "3.1.0",
-+                "webonyx/graphql-php": "^0.12.6",
-+                "zendframework/zend-captcha": "^2.7.1",
-+                "zendframework/zend-code": "~3.3.0",
-+                "zendframework/zend-config": "^2.6.0",
-+                "zendframework/zend-console": "^2.6.0",
-+                "zendframework/zend-crypt": "^2.6.0",
-+                "zendframework/zend-db": "^2.8.2",
-+                "zendframework/zend-di": "^2.6.1",
-+                "zendframework/zend-eventmanager": "^2.6.3",
-+                "zendframework/zend-feed": "^2.9.0",
-+                "zendframework/zend-form": "^2.10.0",
-+                "zendframework/zend-http": "^2.6.0",
-+                "zendframework/zend-i18n": "^2.7.3",
-+                "zendframework/zend-json": "^2.6.1",
-+                "zendframework/zend-log": "^2.9.1",
-+                "zendframework/zend-mail": "^2.9.0",
-+                "zendframework/zend-modulemanager": "^2.7",
-+                "zendframework/zend-mvc": "~2.7.0",
-+                "zendframework/zend-serializer": "^2.7.2",
-+                "zendframework/zend-server": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.8",
-+                "zendframework/zend-session": "^2.7.3",
-+                "zendframework/zend-soap": "^2.7.0",
-+                "zendframework/zend-stdlib": "^2.7.7",
-+                "zendframework/zend-text": "^2.6.0",
-+                "zendframework/zend-uri": "^2.5.1",
-+                "zendframework/zend-validator": "^2.6.0",
-+                "zendframework/zend-view": "~2.10.0"
-+            },
-+            "type": "metapackage",
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "eCommerce Platform for Growth (Community Edition)"
-+        },
-+        {
-+            "name": "magento/theme-adminhtml-backend",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/theme-adminhtml-backend/magento-theme-adminhtml-backend-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "16ba686421c8f62c5adafea59b9348dc3f9f9dc1"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-theme",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/theme-frontend-blank",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/theme-frontend-blank/magento-theme-frontend-blank-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5d0c6b04a16d20899bb5b70394fe8db257832dd1"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-theme",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/theme-frontend-luma",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/theme-frontend-luma/magento-theme-frontend-luma-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "4ecc9f6a9fa4dfc5be7f4dec8fc8a9535ec1f5f3"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/theme-frontend-blank": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-theme",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-                 ]
-             },
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/zendframework1",
-+            "version": "1.14.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/magento/zf1.git",
-+                "reference": "4df018254c70b5b998b00a8cb1a30760f831ff0d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/magento/zf1/zipball/4df018254c70b5b998b00a8cb1a30760f831ff0d",
-+                "reference": "4df018254c70b5b998b00a8cb1a30760f831ff0d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.2.11"
-+            },
-+            "require-dev": {
-+                "phpunit/dbunit": "1.3.*",
-+                "phpunit/phpunit": "3.7.*"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.12.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "Zend_": "library/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "include-path": [
-+                "library/"
-+            ],
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Magento Zend Framework 1",
-+            "homepage": "http://framework.zend.com/",
-+            "keywords": [
-+                "ZF1",
-+                "framework"
-+            ],
-+            "time": "2018-08-09T15:03:40+00:00"
-+        },
-+        {
-+            "name": "monolog/monolog",
-+            "version": "1.24.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Seldaek/monolog.git",
-+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
-+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0",
-+                "psr/log": "~1.0"
-+            },
-+            "provide": {
-+                "psr/log-implementation": "1.0.0"
-+            },
-+            "require-dev": {
-+                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
-+                "doctrine/couchdb": "~1.0@dev",
-+                "graylog2/gelf-php": "~1.0",
-+                "jakub-onderka/php-parallel-lint": "0.9",
-+                "php-amqplib/php-amqplib": "~2.4",
-+                "php-console/php-console": "^3.1.3",
-+                "phpunit/phpunit": "~4.5",
-+                "phpunit/phpunit-mock-objects": "2.3.0",
-+                "ruflin/elastica": ">=0.90 <3.0",
-+                "sentry/sentry": "^0.13",
-+                "swiftmailer/swiftmailer": "^5.3|^6.0"
-+            },
-+            "suggest": {
-+                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-+                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-+                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-+                "ext-mongo": "Allow sending log messages to a MongoDB server",
-+                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-+                "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
-+                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-+                "php-console/php-console": "Allow sending log messages to Google Chrome",
-+                "rollbar/rollbar": "Allow sending log messages to Rollbar",
-+                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
-+                "sentry/sentry": "Allow sending log messages to a Sentry server"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Monolog\\": "src/Monolog"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-+                }
-+            ],
-+            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-+            "homepage": "http://github.com/Seldaek/monolog",
-+            "keywords": [
-+                "log",
-+                "logging",
-+                "psr-3"
-+            ],
-+            "time": "2018-11-05T09:00:11+00:00"
-+        },
-+        {
-+            "name": "msp/recaptcha",
-+            "version": "2.0.2",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/msp/recaptcha/msp-recaptcha-2.0.2.0.zip",
-+                "reference": null,
-+                "shasum": "f037ce5e2b4202117adc4ec0ab93212ef31bff7e"
-+            },
-+            "require": {
-+                "google/recaptcha": "^1.1",
-+                "magento/magento-composer-installer": "*",
-+                "php": "^7.0|^7.1|^7.2"
-+            },
-+            "suggest": {
-+                "msp/security-suite": "Full MageSpecialist Security Suite"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "MSP\\ReCaptcha\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0"
-             ],
--            "description": "Magento 2 Base (Community Edition)"
-+            "authors": [
-+                {
-+                    "name": "Riccardo Tempesta",
-+                    "email": "riccardo.tempesta@magespecialist.it"
-+                }
-+            ],
-+            "description": "Google reCaptcha integration for Magento2 - Member of MageSpecialist SecuritySuite"
-         },
-         {
--            "name": "magento/module-admin-notification",
--            "version": "0.74.0-beta9",
-+            "name": "msp/twofactorauth",
-+            "version": "3.0.0",
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-admin-notification-0.74.0-beta9.zip",
-+                "url": "https://repo.magento.com/archives/msp/twofactorauth/msp-twofactorauth-3.0.0.0.zip",
-                 "reference": null,
--                "shasum": "9d9f819a651566a2ae6f12225d69941dbe5d0920"
-+                "shasum": "ba56d984ae834a8e87a76aed81bcaf6fd6d811b1"
-             },
-             "require": {
--                "lib-libxml": "*",
--                "magento/framework": "0.74.0-beta9",
-+                "christian-riesen/base32": "^1.3",
-+                "donatj/phpuseragentparser": "~0.7",
-+                "endroid/qr-code": "^2.5",
-                 "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.0|^7.1|^7.2",
-+                "spomky-labs/otphp": "~8.3",
-+                "yubico/u2flib-server": "^1.0"
-+            },
-+            "suggest": {
-+                "msp/security-suite": "Full MageSpecialist Security Suite"
-             },
-             "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/AdminNotification"
--                    ]
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "MSP\\TwoFactorAuth\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Riccardo Tempesta",
-+                    "email": "riccardo.tempesta@magespecialist.it"
-+                }
-+            ],
-+            "description": "Two Factor Authentication module for Magento2 - Member of MageSpecialist SecuritySuite"
-+        },
-+        {
-+            "name": "myclabs/php-enum",
-+            "version": "1.6.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/myclabs/php-enum.git",
-+                "reference": "32c4202886c51fbe5cc3a7c34ec5c9a4a790345e"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/32c4202886c51fbe5cc3a7c34ec5c9a4a790345e",
-+                "reference": "32c4202886c51fbe5cc3a7c34ec5c9a4a790345e",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-json": "*",
-+                "php": ">=5.4"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
-+                "squizlabs/php_codesniffer": "1.*"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "MyCLabs\\Enum\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "PHP Enum contributors",
-+                    "homepage": "https://github.com/myclabs/php-enum/graphs/contributors"
-+                }
-+            ],
-+            "description": "PHP Enum implementation",
-+            "homepage": "http://github.com/myclabs/php-enum",
-+            "keywords": [
-+                "enum"
-+            ],
-+            "time": "2019-02-04T21:18:49+00:00"
-+        },
-+        {
-+            "name": "oyejorge/less.php",
-+            "version": "v1.7.0.14",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/oyejorge/less.php.git",
-+                "reference": "42925c5a01a07d67ca7e82dfc8fb31814d557bc9"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/oyejorge/less.php/zipball/42925c5a01a07d67ca7e82dfc8fb31814d557bc9",
-+                "reference": "42925c5a01a07d67ca7e82dfc8fb31814d557bc9",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.8.24"
-+            },
-+            "bin": [
-+                "bin/lessc"
-+            ],
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Less": "lib/"
-+                },
-+                "classmap": [
-+                    "lessc.inc.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Matt Agar",
-+                    "homepage": "https://github.com/agar"
-+                },
-+                {
-+                    "name": "Martin Jantošovič",
-+                    "homepage": "https://github.com/Mordred"
-+                },
-+                {
-+                    "name": "Josh Schmidt",
-+                    "homepage": "https://github.com/oyejorge"
-+                }
-+            ],
-+            "description": "PHP port of the Javascript version of LESS http://lesscss.org (Originally maintained by Josh Schmidt)",
-+            "homepage": "http://lessphp.gpeasy.com",
-+            "keywords": [
-+                "css",
-+                "less",
-+                "less.js",
-+                "lesscss",
-+                "php",
-+                "stylesheet"
-+            ],
-+            "time": "2017-03-28T22:19:25+00:00"
-+        },
-+        {
-+            "name": "paragonie/constant_time_encoding",
-+            "version": "v2.2.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/paragonie/constant_time_encoding.git",
-+                "reference": "55af0dc01992b4d0da7f6372e2eac097bbbaffdb"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/55af0dc01992b4d0da7f6372e2eac097bbbaffdb",
-+                "reference": "55af0dc01992b4d0da7f6372e2eac097bbbaffdb",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^6|^7",
-+                "vimeo/psalm": "^1|^2"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "ParagonIE\\ConstantTime\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Paragon Initiative",
-+                    "email": "security@paragonie.com",
-+                    "homepage": "https://paragonie.com",
-+                    "role": "Maintainer"
-+                },
-+                {
-+                    "name": "Steve 'Sc00bz' Thomas",
-+                    "email": "steve@tobtu.com",
-+                    "homepage": "https://www.tobtu.com",
-+                    "role": "Original Developer"
-+                }
-+            ],
-+            "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
-+            "keywords": [
-+                "base16",
-+                "base32",
-+                "base32_decode",
-+                "base32_encode",
-+                "base64",
-+                "base64_decode",
-+                "base64_encode",
-+                "bin2hex",
-+                "encoding",
-+                "hex",
-+                "hex2bin",
-+                "rfc4648"
-+            ],
-+            "time": "2019-01-03T20:26:31+00:00"
-+        },
-+        {
-+            "name": "paragonie/random_compat",
-+            "version": "v9.99.99",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/paragonie/random_compat.git",
-+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "4.*|5.*",
-+                "vimeo/psalm": "^1"
-+            },
-+            "suggest": {
-+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-+            },
-+            "type": "library",
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Paragon Initiative",
-+                    "email": "security@paragonie.com",
-+                    "homepage": "https://paragonie.com"
-+                }
-+            ],
-+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-+            "keywords": [
-+                "csprng",
-+                "polyfill",
-+                "pseudorandom",
-+                "random"
-+            ],
-+            "time": "2018-07-02T15:55:56+00:00"
-+        },
-+        {
-+            "name": "paragonie/sodium_compat",
-+            "version": "v1.9.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/paragonie/sodium_compat.git",
-+                "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/87125d5b265f98c4d1b8d83a1f0726607c229421",
-+                "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "paragonie/random_compat": ">=1",
-+                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^3|^4|^5"
-+            },
-+            "suggest": {
-+                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
-+                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "autoload.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "ISC"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Paragon Initiative",
-+                    "email": "security@paragonie.com"
-+                },
-+                {
-+                    "name": "Frank Denis",
-+                    "email": "jedisct1@pureftpd.org"
-+                }
-+            ],
-+            "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
-+            "keywords": [
-+                "Authentication",
-+                "BLAKE2b",
-+                "ChaCha20",
-+                "ChaCha20-Poly1305",
-+                "Chapoly",
-+                "Curve25519",
-+                "Ed25519",
-+                "EdDSA",
-+                "Edwards-curve Digital Signature Algorithm",
-+                "Elliptic Curve Diffie-Hellman",
-+                "Poly1305",
-+                "Pure-PHP cryptography",
-+                "RFC 7748",
-+                "RFC 8032",
-+                "Salpoly",
-+                "Salsa20",
-+                "X25519",
-+                "XChaCha20-Poly1305",
-+                "XSalsa20-Poly1305",
-+                "Xchacha20",
-+                "Xsalsa20",
-+                "aead",
-+                "cryptography",
-+                "ecdh",
-+                "elliptic curve",
-+                "elliptic curve cryptography",
-+                "encryption",
-+                "libsodium",
-+                "php",
-+                "public-key cryptography",
-+                "secret-key cryptography",
-+                "side-channel resistant"
-+            ],
-+            "time": "2019-03-20T17:19:05+00:00"
-+        },
-+        {
-+            "name": "pelago/emogrifier",
-+            "version": "v2.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/MyIntervals/emogrifier.git",
-+                "reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/8ee7fb5ad772915451ed3415c1992bd3697d4983",
-+                "reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-dom": "*",
-+                "ext-libxml": "*",
-+                "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
-+                "symfony/css-selector": "^3.4.0 || ^4.0.0"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "^2.2.0",
-+                "phpmd/phpmd": "^2.6.0",
-+                "phpunit/phpunit": "^4.8.0",
-+                "squizlabs/php_codesniffer": "^3.3.2"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Pelago\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "John Reeve",
-+                    "email": "jreeve@pelagodesign.com"
-+                },
-+                {
-+                    "name": "Cameron Brooks"
-+                },
-+                {
-+                    "name": "Jaime Prado"
-+                },
-+                {
-+                    "name": "Oliver Klee",
-+                    "email": "github@oliverklee.de"
-+                },
-+                {
-+                    "name": "Zoli Szabó",
-+                    "email": "zoli.szabo+github@gmail.com"
-+                },
-+                {
-+                    "name": "Jake Hotson",
-+                    "email": "jake@qzdesign.co.uk"
-+                }
-             ],
--            "description": "N/A"
-+            "description": "Converts CSS styles into inline style attributes in your HTML code",
-+            "homepage": "https://www.myintervals.com/emogrifier.php",
-+            "keywords": [
-+                "css",
-+                "email",
-+                "pre-processing"
-+            ],
-+            "time": "2018-12-10T10:36:30+00:00"
-         },
-         {
--            "name": "magento/module-authorization",
--            "version": "0.74.0-beta9",
-+            "name": "php-amqplib/php-amqplib",
-+            "version": "v2.7.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/php-amqplib/php-amqplib.git",
-+                "reference": "a8ba54bd35b973fc6861e4c2e105f71e9e95f43f"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-authorization-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "28fb39cd7d95979865ee34293004c2dbd7fb0c74"
-+                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/a8ba54bd35b973fc6861e4c2e105f71e9e95f43f",
-+                "reference": "a8ba54bd35b973fc6861e4c2e105f71e9e95f43f",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-bcmath": "*",
-+                "ext-mbstring": "*",
-+                "php": ">=5.3.0"
-             },
--            "type": "magento2-module",
-+            "replace": {
-+                "videlalvaro/php-amqplib": "self.version"
-+            },
-+            "require-dev": {
-+                "phpdocumentor/phpdocumentor": "^2.9",
-+                "phpunit/phpunit": "^4.8",
-+                "scrutinizer/ocular": "^1.1",
-+                "squizlabs/php_codesniffer": "^2.5"
-+            },
-+            "suggest": {
-+                "ext-sockets": "Use AMQPSocketConnection"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Authorization"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "PhpAmqpLib\\": "PhpAmqpLib/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "LGPL-2.1-or-later"
-             ],
--            "description": "Authorization module provides access to Magento ACL functionality."
-+            "authors": [
-+                {
-+                    "name": "Alvaro Videla",
-+                    "role": "Original Maintainer"
-+                },
-+                {
-+                    "name": "John Kelly",
-+                    "email": "johnmkelly86@gmail.com",
-+                    "role": "Maintainer"
-+                },
-+                {
-+                    "name": "Raúl Araya",
-+                    "email": "nubeiro@gmail.com",
-+                    "role": "Maintainer"
-+                }
-+            ],
-+            "description": "Formerly videlalvaro/php-amqplib.  This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.",
-+            "homepage": "https://github.com/php-amqplib/php-amqplib/",
-+            "keywords": [
-+                "message",
-+                "queue",
-+                "rabbitmq"
-+            ],
-+            "time": "2018-04-30T03:54:54+00:00"
-         },
-         {
--            "name": "magento/module-backend",
--            "version": "0.74.0-beta9",
-+            "name": "phpseclib/mcrypt_compat",
-+            "version": "1.0.8",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/phpseclib/mcrypt_compat.git",
-+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-backend-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "47a8139710f3c269b06d444c29fd275b2a3c9c9b"
-+                "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
-+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backup": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-cron": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-developer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-reports": "0.74.0-beta9",
--                "magento/module-require-js": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "magento/module-translation": "0.74.0-beta9",
--                "magento/module-user": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.3",
-+                "phpseclib/phpseclib": ">=2.0.11 <3.0.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Backend"
--                    ]
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0"
-+            },
-+            "suggest": {
-+                "ext-openssl": "Will enable faster cryptographic operations"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "lib/mcrypt.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Jim Wigginton",
-+                    "email": "terrafrost@php.net",
-+                    "homepage": "http://phpseclib.sourceforge.net"
-+                }
-+            ],
-+            "description": "PHP 7.1 polyfill for the mcrypt extension from PHP <= 7.0",
-+            "keywords": [
-+                "cryptograpy",
-+                "encryption",
-+                "mcrypt"
-+            ],
-+            "time": "2018-08-22T03:11:43+00:00"
-         },
-         {
--            "name": "magento/module-backup",
--            "version": "0.74.0-beta9",
-+            "name": "phpseclib/phpseclib",
-+            "version": "2.0.15",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/phpseclib/phpseclib.git",
-+                "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-backup-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "defb31a8d7de0856753a04e15f5bf34684d25d90"
-+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
-+                "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-cron": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.3"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Backup"
--                    ]
--                ]
-+            "require-dev": {
-+                "phing/phing": "~2.7",
-+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
-+                "sami/sami": "~2.0",
-+                "squizlabs/php_codesniffer": "~2.0"
-+            },
-+            "suggest": {
-+                "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
-+                "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
-+                "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-+                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "phpseclib/bootstrap.php"
-+                ],
-+                "psr-4": {
-+                    "phpseclib\\": "phpseclib/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Jim Wigginton",
-+                    "email": "terrafrost@php.net",
-+                    "role": "Lead Developer"
-+                },
-+                {
-+                    "name": "Patrick Monnerat",
-+                    "email": "pm@datasphere.ch",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Andreas Fischer",
-+                    "email": "bantu@phpbb.com",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Hans-Jürgen Petrich",
-+                    "email": "petrich@tronic-media.com",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Graham Campbell",
-+                    "email": "graham@alt-three.com",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
-+            "homepage": "http://phpseclib.sourceforge.net",
-+            "keywords": [
-+                "BigInteger",
-+                "aes",
-+                "asn.1",
-+                "asn1",
-+                "blowfish",
-+                "crypto",
-+                "cryptography",
-+                "encryption",
-+                "rsa",
-+                "security",
-+                "sftp",
-+                "signature",
-+                "signing",
-+                "ssh",
-+                "twofish",
-+                "x.509",
-+                "x509"
-+            ],
-+            "time": "2019-03-10T16:53:45+00:00"
-         },
-         {
--            "name": "magento/module-bundle",
--            "version": "0.74.0-beta9",
-+            "name": "psr/container",
-+            "version": "1.0.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/php-fig/container.git",
-+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-bundle-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "a63880815cf2c96fc4e6e45cd982bf724682fe8b"
-+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-catalog-rule": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-gift-message": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
--            },
--            "suggest": {
--                "magento/module-webapi": "0.74.0-beta9"
-+                "php": ">=5.3.0"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Bundle"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Psr\\Container\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "PHP-FIG",
-+                    "homepage": "http://www.php-fig.org/"
-+                }
-+            ],
-+            "description": "Common Container Interface (PHP FIG PSR-11)",
-+            "homepage": "https://github.com/php-fig/container",
-+            "keywords": [
-+                "PSR-11",
-+                "container",
-+                "container-interface",
-+                "container-interop",
-+                "psr"
-+            ],
-+            "time": "2017-02-14T16:28:37+00:00"
-         },
-         {
--            "name": "magento/module-cache-invalidate",
--            "version": "0.74.0-beta9",
-+            "name": "psr/http-message",
-+            "version": "1.0.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/php-fig/http-message.git",
-+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-cache-invalidate-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "e0316dae00343426e331cb39520acf0f6c0c3db3"
-+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-page-cache": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.0"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CacheInvalidate"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Psr\\Http\\Message\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "PHP-FIG",
-+                    "homepage": "http://www.php-fig.org/"
-+                }
-+            ],
-+            "description": "Common interface for HTTP messages",
-+            "homepage": "https://github.com/php-fig/http-message",
-+            "keywords": [
-+                "http",
-+                "http-message",
-+                "psr",
-+                "psr-7",
-+                "request",
-+                "response"
-+            ],
-+            "time": "2016-08-06T14:39:51+00:00"
-         },
-         {
--            "name": "magento/module-captcha",
--            "version": "0.74.0-beta9",
-+            "name": "psr/log",
-+            "version": "1.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/php-fig/log.git",
-+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-captcha-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "cfc73a9579a990f215e10ec6b475255bef919920"
-+                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.0"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Captcha"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Psr\\Log\\": "Psr/Log/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "PHP-FIG",
-+                    "homepage": "http://www.php-fig.org/"
-+                }
-+            ],
-+            "description": "Common interface for logging libraries",
-+            "homepage": "https://github.com/php-fig/log",
-+            "keywords": [
-+                "log",
-+                "psr",
-+                "psr-3"
-+            ],
-+            "time": "2018-11-20T15:27:04+00:00"
-         },
-         {
--            "name": "magento/module-catalog",
--            "version": "0.74.0-beta9",
-+            "name": "ralouphie/getallheaders",
-+            "version": "2.0.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/ralouphie/getallheaders.git",
-+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "705f5317c0495c0a94ce0d6ad9c2400c7eee9494"
-+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
-+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-catalog-rule": "0.74.0-beta9",
--                "magento/module-catalog-url-rewrite": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-cms": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-indexer": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-msrp": "0.74.0-beta9",
--                "magento/module-page-cache": "0.74.0-beta9",
--                "magento/module-product-alert": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "magento/module-url-rewrite": "0.74.0-beta9",
--                "magento/module-widget": "0.74.0-beta9",
--                "magento/module-wishlist": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
--            },
--            "suggest": {
--                "magento/module-cookie": "0.74.0-beta9"
-+                "php": ">=5.3"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Catalog"
--                    ]
-+            "require-dev": {
-+                "phpunit/phpunit": "~3.7.0",
-+                "satooshi/php-coveralls": ">=1.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "src/getallheaders.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Ralph Khattar",
-+                    "email": "ralph.khattar@gmail.com"
-+                }
-+            ],
-+            "description": "A polyfill for getallheaders.",
-+            "time": "2016-02-11T07:05:27+00:00"
-         },
-         {
--            "name": "magento/module-catalog-import-export",
--            "version": "0.74.0-beta9",
-+            "name": "ramsey/uuid",
-+            "version": "3.8.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/ramsey/uuid.git",
-+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-import-export-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "81dfb1108a4717ba212b46af6502a17ba8a1f85d"
-+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
-+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
-+                "shasum": ""
-             },
-             "require": {
--                "ext-ctype": "*",
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-import-export": "0.74.0-beta9",
--                "magento/module-indexer": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "paragonie/random_compat": "^1.0|^2.0|9.99.99",
-+                "php": "^5.4 || ^7.0",
-+                "symfony/polyfill-ctype": "^1.8"
-             },
--            "type": "magento2-module",
-+            "replace": {
-+                "rhumsaa/uuid": "self.version"
-+            },
-+            "require-dev": {
-+                "codeception/aspect-mock": "^1.0 | ~2.0.0",
-+                "doctrine/annotations": "~1.2.0",
-+                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
-+                "ircmaxell/random-lib": "^1.1",
-+                "jakub-onderka/php-parallel-lint": "^0.9.0",
-+                "mockery/mockery": "^0.9.9",
-+                "moontoast/math": "^1.1",
-+                "php-mock/php-mock-phpunit": "^0.3|^1.1",
-+                "phpunit/phpunit": "^4.7|^5.0|^6.5",
-+                "squizlabs/php_codesniffer": "^2.3"
-+            },
-+            "suggest": {
-+                "ext-ctype": "Provides support for PHP Ctype functions",
-+                "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
-+                "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
-+                "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
-+                "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
-+                "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid",
-+                "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CatalogImportExport"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "3.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Ramsey\\Uuid\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Marijn Huizendveld",
-+                    "email": "marijn.huizendveld@gmail.com"
-+                },
-+                {
-+                    "name": "Thibaud Fabre",
-+                    "email": "thibaud@aztech.io"
-+                },
-+                {
-+                    "name": "Ben Ramsey",
-+                    "email": "ben@benramsey.com",
-+                    "homepage": "https://benramsey.com"
-+                }
-+            ],
-+            "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
-+            "homepage": "https://github.com/ramsey/uuid",
-+            "keywords": [
-+                "guid",
-+                "identifier",
-+                "uuid"
-+            ],
-+            "time": "2018-07-19T23:38:55+00:00"
-         },
-         {
--            "name": "magento/module-catalog-inventory",
--            "version": "0.74.0-beta9",
-+            "name": "react/promise",
-+            "version": "v2.7.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/reactphp/promise.git",
-+                "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-inventory-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "1b2039959817f22889fa461cd48c58dec10c5b0d"
-+                "url": "https://api.github.com/repos/reactphp/promise/zipball/31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
-+                "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-indexer": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.4.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CatalogInventory"
--                    ]
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.8"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "React\\Promise\\": "src/"
-+                },
-+                "files": [
-+                    "src/functions_include.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Jan Sorgalla",
-+                    "email": "jsorgalla@gmail.com"
-+                }
-+            ],
-+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
-+            "keywords": [
-+                "promise",
-+                "promises"
-+            ],
-+            "time": "2019-01-07T21:25:54+00:00"
-         },
-         {
--            "name": "magento/module-catalog-rule",
--            "version": "0.74.0-beta9",
-+            "name": "seld/jsonlint",
-+            "version": "1.7.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Seldaek/jsonlint.git",
-+                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-rule-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "43e105ef491933e96ee5f6c9543edb72076b9b8f"
-+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
-+                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-import-export": "0.74.0-beta9",
--                "magento/module-indexer": "0.74.0-beta9",
--                "magento/module-rule": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.3 || ^7.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CatalogRule"
--                    ]
--                ]
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-+            },
-+            "bin": [
-+                "bin/jsonlint"
-+            ],
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-+                }
-+            ],
-+            "description": "JSON Linter",
-+            "keywords": [
-+                "json",
-+                "linter",
-+                "parser",
-+                "validator"
-+            ],
-+            "time": "2018-01-24T12:46:19+00:00"
-         },
-         {
--            "name": "magento/module-catalog-search",
--            "version": "0.74.0-beta9",
-+            "name": "seld/phar-utils",
-+            "version": "1.0.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Seldaek/phar-utils.git",
-+                "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-search-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "3eb4841fe35753202d6985f65387da848ded3d9e"
-+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/7009b5139491975ef6486545a39f3e6dad5ac30a",
-+                "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-indexer": "0.74.0-beta9",
--                "magento/module-search": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CatalogSearch"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Seld\\PharUtils\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be"
-+                }
-+            ],
-+            "description": "PHAR file format utilities, for when PHP phars you up",
-+            "keywords": [
-+                "phra"
-+            ],
-+            "time": "2015-10-13T18:44:15+00:00"
-         },
-         {
--            "name": "magento/module-catalog-url-rewrite",
--            "version": "0.74.0-beta9",
-+            "name": "spomky-labs/otphp",
-+            "version": "v8.3.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Spomky-Labs/otphp.git",
-+                "reference": "eb14442699ae6470b29ffd89238a9ccfb9f20788"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-url-rewrite-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "d6ff96ba9c854368c0cdc2aa4ebb66bbb5201349"
-+                "url": "https://api.github.com/repos/Spomky-Labs/otphp/zipball/eb14442699ae6470b29ffd89238a9ccfb9f20788",
-+                "reference": "eb14442699ae6470b29ffd89238a9ccfb9f20788",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-import-export": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-import-export": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-url-rewrite": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "beberlei/assert": "^2.4",
-+                "paragonie/constant_time_encoding": "^1.0|^2.0",
-+                "paragonie/random_compat": ">=2",
-+                "php": "^5.5|^7.0",
-+                "symfony/polyfill-mbstring": "^1.1",
-+                "symfony/polyfill-php56": "^1.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.0|^5.0",
-+                "satooshi/php-coveralls": "^1.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CatalogUrlRewrite"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "8.2.x-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "OTPHP\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Florent Morselli",
-+                    "homepage": "https://github.com/Spomky"
-+                },
-+                {
-+                    "name": "All contributors",
-+                    "homepage": "https://github.com/Spomky-Labs/otphp/contributors"
-+                }
-+            ],
-+            "description": "A PHP library for generating one time passwords according to RFC 4226 (HOTP Algorithm) and the RFC 6238 (TOTP Algorithm) and compatible with Google Authenticator",
-+            "homepage": "https://github.com/Spomky-Labs/otphp",
-+            "keywords": [
-+                "FreeOTP",
-+                "RFC 4226",
-+                "RFC 6238",
-+                "google authenticator",
-+                "hotp",
-+                "otp",
-+                "totp"
-+            ],
-+            "time": "2018-09-13T19:25:26+00:00"
-         },
-         {
--            "name": "magento/module-catalog-widget",
--            "version": "0.74.0-beta9",
-+            "name": "symfony/console",
-+            "version": "v4.1.11",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/console.git",
-+                "reference": "9e87c798f67dc9fceeb4f3d57847b52d945d1a02"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-widget-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "7aa5387069cdcae7a6c4dab63a5e3a8e12921f2c"
-+                "url": "https://api.github.com/repos/symfony/console/zipball/9e87c798f67dc9fceeb4f3d57847b52d945d1a02",
-+                "reference": "9e87c798f67dc9fceeb4f3d57847b52d945d1a02",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-rule": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-widget": "0.74.0-beta9",
--                "magento/module-wishlist": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1.3",
-+                "symfony/polyfill-mbstring": "~1.0"
-             },
--            "type": "magento2-module",
-+            "conflict": {
-+                "symfony/dependency-injection": "<3.4",
-+                "symfony/process": "<3.3"
-+            },
-+            "provide": {
-+                "psr/log-implementation": "1.0"
-+            },
-+            "require-dev": {
-+                "psr/log": "~1.0",
-+                "symfony/config": "~3.4|~4.0",
-+                "symfony/dependency-injection": "~3.4|~4.0",
-+                "symfony/event-dispatcher": "~3.4|~4.0",
-+                "symfony/lock": "~3.4|~4.0",
-+                "symfony/process": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "psr/log": "For using the console logger",
-+                "symfony/event-dispatcher": "",
-+                "symfony/lock": "",
-+                "symfony/process": ""
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CatalogWidget"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "4.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Console\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Console Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-25T14:34:37+00:00"
-         },
-         {
--            "name": "magento/module-centinel",
--            "version": "0.74.0-beta9",
-+            "name": "symfony/css-selector",
-+            "version": "v4.2.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/css-selector.git",
-+                "reference": "48eddf66950fa57996e1be4a55916d65c10c604a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-centinel-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "4bda8da48084d11cd97f59292b35501ad1dae554"
-+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/48eddf66950fa57996e1be4a55916d65c10c604a",
-+                "reference": "48eddf66950fa57996e1be4a55916d65c10c604a",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1.3"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Centinel"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\CssSelector\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Jean-François Simon",
-+                    "email": "jeanfrancois.simon@sensiolabs.com"
-+                },
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony CssSelector Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-16T20:31:39+00:00"
-         },
-         {
--            "name": "magento/module-checkout",
--            "version": "0.74.0-beta9",
-+            "name": "symfony/event-dispatcher",
-+            "version": "v4.1.11",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/event-dispatcher.git",
-+                "reference": "51be1b61dfe04d64a260223f2b81475fa8066b97"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-checkout-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "c8ab1ccad853365098f1ea9efd3b2640f6ce1ab1"
-+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/51be1b61dfe04d64a260223f2b81475fa8066b97",
-+                "reference": "51be1b61dfe04d64a260223f2b81475fa8066b97",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-gift-message": "0.74.0-beta9",
--                "magento/module-msrp": "0.74.0-beta9",
--                "magento/module-page-cache": "0.74.0-beta9",
--                "magento/module-payment": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-shipping": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "magento/module-ui": "0.74.0-beta9",
--                "magento/module-wishlist": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
--            },
--            "suggest": {
--                "magento/module-cookie": "0.74.0-beta9"
-+                "php": "^7.1.3"
-             },
--            "type": "magento2-module",
-+            "conflict": {
-+                "symfony/dependency-injection": "<3.4"
-+            },
-+            "require-dev": {
-+                "psr/log": "~1.0",
-+                "symfony/config": "~3.4|~4.0",
-+                "symfony/dependency-injection": "~3.4|~4.0",
-+                "symfony/expression-language": "~3.4|~4.0",
-+                "symfony/stopwatch": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/dependency-injection": "",
-+                "symfony/http-kernel": ""
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Checkout"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "4.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\EventDispatcher\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony EventDispatcher Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-16T18:35:49+00:00"
-         },
-         {
--            "name": "magento/module-checkout-agreements",
--            "version": "0.74.0-beta9",
-+            "name": "symfony/filesystem",
-+            "version": "v4.2.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/filesystem.git",
-+                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-checkout-agreements-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "9adef902e061afdd2bc88b9257bbb7def693f46d"
-+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e16b9e471703b2c60b95f14d31c1239f68f11601",
-+                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1.3",
-+                "symfony/polyfill-ctype": "~1.8"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CheckoutAgreements"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Filesystem\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Filesystem Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-07T11:40:08+00:00"
-         },
-         {
--            "name": "magento/module-cms",
--            "version": "0.74.0-beta9",
-+            "name": "symfony/finder",
-+            "version": "v4.2.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/finder.git",
-+                "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-cms-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "31142e011e4269d240ea9389888484ab69b1eab1"
-+                "url": "https://api.github.com/repos/symfony/finder/zipball/267b7002c1b70ea80db0833c3afe05f0fbde580a",
-+                "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-email": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "magento/module-ui": "0.74.0-beta9",
--                "magento/module-variable": "0.74.0-beta9",
--                "magento/module-widget": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1.3"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Cms"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Finder\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Finder Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-23T15:42:05+00:00"
-         },
-         {
--            "name": "magento/module-cms-url-rewrite",
--            "version": "0.74.0-beta9",
-+            "name": "symfony/inflector",
-+            "version": "v4.2.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/inflector.git",
-+                "reference": "275e54941a4f17a471c68d2a00e2513fc1fd4a78"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-cms-url-rewrite-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "fe26190823ea1e1bd828ff5fc087506b38c45c5f"
-+                "url": "https://api.github.com/repos/symfony/inflector/zipball/275e54941a4f17a471c68d2a00e2513fc1fd4a78",
-+                "reference": "275e54941a4f17a471c68d2a00e2513fc1fd4a78",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-cms": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-url-rewrite": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1.3",
-+                "symfony/polyfill-ctype": "~1.8"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CmsUrlRewrite"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Inflector\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Bernhard Schussek",
-+                    "email": "bschussek@gmail.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Inflector Component",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "inflection",
-+                "pluralize",
-+                "singularize",
-+                "string",
-+                "symfony",
-+                "words"
-+            ],
-+            "time": "2019-01-16T20:31:39+00:00"
-         },
-         {
--            "name": "magento/module-config",
--            "version": "0.74.0-beta9",
-+            "name": "symfony/options-resolver",
-+            "version": "v4.2.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/options-resolver.git",
-+                "reference": "3896e5a7d06fd15fa4947694c8dcdd371ff147d1"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-config-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "ae36b5498a9f299bacb1cc306a066db4386ad3c8"
-+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3896e5a7d06fd15fa4947694c8dcdd371ff147d1",
-+                "reference": "3896e5a7d06fd15fa4947694c8dcdd371ff147d1",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-cron": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-email": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1.3"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Config"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\OptionsResolver\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony OptionsResolver Component",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "config",
-+                "configuration",
-+                "options"
-+            ],
-+            "time": "2019-02-23T15:17:42+00:00"
-         },
-         {
--            "name": "magento/module-configurable-import-export",
--            "version": "0.74.0-beta9",
-+            "name": "symfony/polyfill-ctype",
-+            "version": "v1.11.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/polyfill-ctype.git",
-+                "reference": "82ebae02209c21113908c229e9883c419720738a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-configurable-import-export-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "99d781b8ec0fb5c8655a0bacb75b6ff5151d7687"
-+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
-+                "reference": "82ebae02209c21113908c229e9883c419720738a",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-import-export": "0.74.0-beta9",
--                "magento/module-configurable-product": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-import-export": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.3"
-             },
--            "type": "magento2-module",
-+            "suggest": {
-+                "ext-ctype": "For best performance"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/ConfigurableImportExport"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "1.11-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Ctype\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                },
-+                {
-+                    "name": "Gert de Pagter",
-+                    "email": "backendtea@gmail.com"
-+                }
-+            ],
-+            "description": "Symfony polyfill for ctype functions",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "compatibility",
-+                "ctype",
-+                "polyfill",
-+                "portable"
-+            ],
-+            "time": "2019-02-06T07:57:58+00:00"
-         },
-         {
--            "name": "magento/module-configurable-product",
--            "version": "0.74.0-beta9",
-+            "name": "symfony/polyfill-mbstring",
-+            "version": "v1.11.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/polyfill-mbstring.git",
-+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-configurable-product-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "cd60da462c29cecacee7c7cf742ca9e3a962fc81"
-+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
-+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-catalog-rule": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.3"
-             },
-             "suggest": {
--                "magento/module-webapi": "0.74.0-beta9"
-+                "ext-mbstring": "For best performance"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/ConfigurableProduct"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "1.11-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Mbstring\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony polyfill for the Mbstring extension",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "compatibility",
-+                "mbstring",
-+                "polyfill",
-+                "portable",
-+                "shim"
-+            ],
-+            "time": "2019-02-06T07:57:58+00:00"
-         },
-         {
--            "name": "magento/module-contact",
--            "version": "0.74.0-beta9",
-+            "name": "symfony/polyfill-php56",
-+            "version": "v1.11.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/polyfill-php56.git",
-+                "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-contact-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "c3a57727ab245a396b597e41c78d9ff81c06fe88"
-+                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
-+                "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-cms": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.3",
-+                "symfony/polyfill-util": "~1.0"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Contact"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "1.11-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Php56\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "compatibility",
-+                "polyfill",
-+                "portable",
-+                "shim"
-+            ],
-+            "time": "2019-02-06T07:57:58+00:00"
-         },
-         {
--            "name": "magento/module-cookie",
--            "version": "0.74.0-beta9",
-+            "name": "symfony/polyfill-util",
-+            "version": "v1.11.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/polyfill-util.git",
-+                "reference": "b46c6cae28a3106735323f00a0c38eccf2328897"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-cookie-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "281a79e0f61889c3d17111451be1860abb216939"
-+                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/b46c6cae28a3106735323f00a0c38eccf2328897",
-+                "reference": "b46c6cae28a3106735323f00a0c38eccf2328897",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.4.11|~5.5.0|~5.6.0"
--            },
--            "suggest": {
--                "magento/module-backend": "0.74.0-beta9"
-+                "php": ">=5.3.3"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Cookie"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.11-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Util\\": ""
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony utilities for portability of PHP codes",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "compat",
-+                "compatibility",
-+                "polyfill",
-+                "shim"
-+            ],
-+            "time": "2019-02-08T14:16:39+00:00"
-         },
-         {
--            "name": "magento/module-cron",
--            "version": "0.74.0-beta9",
-+            "name": "symfony/process",
-+            "version": "v4.1.11",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/process.git",
-+                "reference": "72d838aafaa7c790330fe362b9cecec362c64629"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-cron-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "e20e45f6282f8a595637f404faccc444023f02e7"
-+                "url": "https://api.github.com/repos/symfony/process/zipball/72d838aafaa7c790330fe362b9cecec362c64629",
-+                "reference": "72d838aafaa7c790330fe362b9cecec362c64629",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1.3"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Cron"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "4.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Process\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Process Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-16T19:07:26+00:00"
-         },
-         {
--            "name": "magento/module-currency-symbol",
--            "version": "0.74.0-beta9",
-+            "name": "symfony/property-access",
-+            "version": "v4.2.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/property-access.git",
-+                "reference": "5440dd2b5373073beee051bd978b58a0f543b192"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-currency-symbol-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "3e105d2bae0106c0675e72c3fccf6a6f0463a346"
-+                "url": "https://api.github.com/repos/symfony/property-access/zipball/5440dd2b5373073beee051bd978b58a0f543b192",
-+                "reference": "5440dd2b5373073beee051bd978b58a0f543b192",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-page-cache": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1.3",
-+                "symfony/inflector": "~3.4|~4.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "symfony/cache": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "psr/cache-implementation": "To cache access methods."
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CurrencySymbol"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\PropertyAccess\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony PropertyAccess Component",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "access",
-+                "array",
-+                "extraction",
-+                "index",
-+                "injection",
-+                "object",
-+                "property",
-+                "property path",
-+                "reflection"
-+            ],
-+            "time": "2019-03-04T09:16:25+00:00"
-         },
-         {
--            "name": "magento/module-customer",
--            "version": "0.74.0-beta9",
-+            "name": "tedivm/jshrink",
-+            "version": "v1.3.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/tedious/JShrink.git",
-+                "reference": "21254058dc3ce6aba6bef458cff4bfa25cf8b198"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-customer-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "7d303f83ba1340fd2a979d87d7184f6d6c831f9f"
-+                "url": "https://api.github.com/repos/tedious/JShrink/zipball/21254058dc3ce6aba6bef458cff4bfa25cf8b198",
-+                "reference": "21254058dc3ce6aba6bef458cff4bfa25cf8b198",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-authorization": "0.74.0-beta9",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-integration": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-newsletter": "0.74.0-beta9",
--                "magento/module-page-cache": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-review": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "magento/module-ui": "0.74.0-beta9",
--                "magento/module-wishlist": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
--            },
--            "suggest": {
--                "magento/module-cookie": "0.74.0-beta9"
-+                "php": "^5.6|^7.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Customer"
--                    ]
--                ]
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "^2.8",
-+                "php-coveralls/php-coveralls": "^1.1.0",
-+                "phpunit/phpunit": "^6"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "JShrink": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Robert Hafner",
-+                    "email": "tedivm@tedivm.com"
-+                }
-+            ],
-+            "description": "Javascript Minifier built in PHP",
-+            "homepage": "http://github.com/tedious/JShrink",
-+            "keywords": [
-+                "javascript",
-+                "minifier"
-+            ],
-+            "time": "2018-09-16T00:02:51+00:00"
-         },
-         {
--            "name": "magento/module-customer-import-export",
--            "version": "0.74.0-beta9",
-+            "name": "temando/module-shipping-m2",
-+            "version": "1.5.1",
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-customer-import-export-0.74.0-beta9.zip",
-+                "url": "https://repo.magento.com/archives/temando/module-shipping-m2/temando-module-shipping-m2-1.5.1.0.zip",
-                 "reference": null,
--                "shasum": "865cf1afa2dcd6daecde627492421421d1b4b4ea"
-+                "shasum": "7fb7a9164d6bc4a17e9b8869ddbc8c5f79106905"
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-import-export": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-iconv": "*",
-+                "ext-intl": "*",
-+                "ext-json": "*",
-+                "magento/framework": "^102.0.0",
-+                "magento/module-backend": "^101.0.0",
-+                "magento/module-catalog": "^103.0.0",
-+                "magento/module-checkout": "^100.3.0",
-+                "magento/module-config": "^101.1.0||^102.0.0",
-+                "magento/module-customer": "^102.0.0",
-+                "magento/module-directory": "^100.3.0",
-+                "magento/module-eav": "^102.0.0",
-+                "magento/module-email": "^101.0.0",
-+                "magento/module-integration": "^100.3.0",
-+                "magento/module-multishipping": "^100.3.0",
-+                "magento/module-payment": "^100.3.0",
-+                "magento/module-quote": "^101.1.0",
-+                "magento/module-sales": "^102.0.0",
-+                "magento/module-security": "^100.3.0",
-+                "magento/module-shipping": "^100.3.0",
-+                "magento/module-store": "^101.0.0",
-+                "magento/module-tax": "^100.3.0",
-+                "magento/module-ui": "^101.1.0",
-+                "monolog/monolog": "^1.17.0",
-+                "php": "~7.1.3||~7.2.0",
-+                "psr/log": "~1.0",
-+                "zendframework/zend-barcode": "^2.7.0",
-+                "zendframework/zend-http": "^2.6.0"
-+            },
-+            "suggest": {
-+                "magento/module-rma": "^101.1.0",
-+                "magento/module-scalable-checkout": "^100.3.0",
-+                "magento/module-scalable-oms": "^100.3.0"
-             },
-             "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CustomerImportExport"
--                    ]
--                ]
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Temando\\Shipping\\": ""
-+                }
-             },
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "OSL-3.0"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Christoph Aßmann",
-+                    "email": "christoph.assmann@netresearch.de",
-+                    "homepage": "https://www.netresearch.de/",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "Temando multi-carrier shipping extension for Magento 2"
-         },
-         {
--            "name": "magento/module-developer",
--            "version": "0.74.0-beta9",
-+            "name": "true/punycode",
-+            "version": "v2.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/true/php-punycode.git",
-+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-developer-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "6706b2f7949678e99496ebea9fd12d9262b62004"
-+                "url": "https://api.github.com/repos/true/php-punycode/zipball/a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
-+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.0",
-+                "symfony/polyfill-mbstring": "^1.3"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Developer"
--                    ]
--                ]
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.7",
-+                "squizlabs/php_codesniffer": "~2.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "TrueBV\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Renan Gonçalves",
-+                    "email": "renan.saddam@gmail.com"
-+                }
-             ],
--            "description": "N/A"
-+            "description": "A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA)",
-+            "homepage": "https://github.com/true/php-punycode",
-+            "keywords": [
-+                "idna",
-+                "punycode"
-+            ],
-+            "time": "2016-11-16T10:37:54+00:00"
-         },
-         {
--            "name": "magento/module-dhl",
--            "version": "0.74.0-beta9",
-+            "name": "tubalmartin/cssmin",
-+            "version": "v4.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
-+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-dhl-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "34a111604699481f2eb3904bf4a1100c743f0e20"
-+                "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
-+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
-+                "shasum": ""
-             },
-             "require": {
--                "lib-libxml": "*",
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-shipping": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-pcre": "*",
-+                "php": ">=5.3.2"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Dhl"
--                    ]
--                ]
-+            "require-dev": {
-+                "cogpowered/finediff": "0.3.*",
-+                "phpunit/phpunit": "4.8.*"
-             },
-+            "bin": [
-+                "cssmin"
-+            ],
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "tubalmartin\\CssMin\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Túbal Martín",
-+                    "homepage": "http://tubalmartin.me/"
-+                }
-+            ],
-+            "description": "A PHP port of the YUI CSS compressor",
-+            "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port",
-+            "keywords": [
-+                "compress",
-+                "compressor",
-+                "css",
-+                "cssmin",
-+                "minify",
-+                "yui"
-+            ],
-+            "time": "2018-01-15T15:26:51+00:00"
-         },
-         {
--            "name": "magento/module-directory",
--            "version": "0.74.0-beta9",
-+            "name": "vertex/module-tax",
-+            "version": "3.1.0",
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-directory-0.74.0-beta9.zip",
-+                "url": "https://repo.magento.com/archives/vertex/module-tax/vertex-module-tax-3.1.0.0.zip",
-                 "reference": null,
--                "shasum": "426f27e9626d056dad46e805eae800eadf5e44fe"
-+                "shasum": "f741436e6732930f69d24f7f8291101b0d3382c6"
-             },
-             "require": {
--                "lib-libxml": "*",
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-json": "*",
-+                "ext-simplexml": "*",
-+                "ext-soap": "*",
-+                "magento/framework": "^100|^101|^102",
-+                "magento/module-backend": "^100|^101",
-+                "magento/module-catalog": "^100|^101|^102|^103",
-+                "magento/module-checkout": "^100",
-+                "magento/module-config": "^100|^101",
-+                "magento/module-cron": "^100",
-+                "magento/module-customer": "^100|^101|^102",
-+                "magento/module-directory": "^100",
-+                "magento/module-eav": "^100|^101|^102",
-+                "magento/module-quote": "^100|^101",
-+                "magento/module-sales": "^100|^101|^102",
-+                "magento/module-shipping": "^100",
-+                "magento/module-store": "^100|^101",
-+                "magento/module-tax": "^100",
-+                "magento/module-ui": "^100|^101",
-+                "php": "^5.6|^7.0",
-+                "vertex/sdk": "^1.1.0"
-+            },
-+            "conflict": {
-+                "magento/module-gift-wrapping": ">=102",
-+                "pixafy/tax": "*",
-+                "pixafy/tax-ee": "*",
-+                "vertex/tax": "*",
-+                "vertex/tax-ee": "*"
-+            },
-+            "require-dev": {
-+                "ext-dom": "*",
-+                "ext-simplexml": "*",
-+                "magento/marketplace-eqp": "^1.0",
-+                "magento/module-offline-shipping": "^100.2",
-+                "magento/module-usps": "^100.2"
-+            },
-+            "suggest": {
-+                "magento/module-gift-card-account": "Vertex Tax Links for Magento 2 also supports Magento's Gift Card Account module",
-+                "magento/module-gift-wrapping": "Vertex Tax Links for Magento 2 also supports Magento's Gift Wrapping module",
-+                "magento/module-multishipping": "Vertex Tax Links for Magento 2 also supports Magento's Multishipping module",
-+                "magento/module-reward": "Vertex Tax Links for Magento 2 also supports Magento's Reward module"
-             },
-             "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Directory"
--                    ]
--                ]
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Vertex\\Tax\\": ""
-+                }
-             },
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "proprietary"
-             ],
--            "description": "N/A"
-+            "description": "Vertex Tax Links for Magento 2"
-         },
-         {
--            "name": "magento/module-downloadable",
--            "version": "0.74.0-beta9",
--            "dist": {
--                "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-downloadable-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "548720f2619acfd6d05c2e2d4ef6d4e0add8bc32"
--            },
-+            "name": "vertex/product-magento-module",
-+            "version": "3.1.0",
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-gift-message": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-msrp": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "magento/module-wishlist": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
--            },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Downloadable"
--                    ]
--                ]
-+                "vertex/module-tax": "3.1.0"
-             },
-+            "type": "metapackage",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "proprietary"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Mediotype",
-+                    "email": "diveinto@mediotype.com",
-+                    "homepage": "http://www.mediotype.com/",
-+                    "role": "Development Company"
-+                }
-+            ],
-+            "description": "Vertex Tax Links for Magento 2",
-+            "homepage": "http://go.vertexsmb.com/magento_cbe",
-+            "keywords": [
-+                "tax",
-+                "vertex"
-+            ]
-         },
-         {
--            "name": "magento/module-eav",
--            "version": "0.74.0-beta9",
-+            "name": "vertex/sdk",
-+            "version": "1.1.0",
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-eav-0.74.0-beta9.zip",
-+                "url": "https://repo.magento.com/archives/vertex/sdk/vertex-sdk-1.1.0.0.zip",
-                 "reference": null,
--                "shasum": "6c3a9b09465bab43077912e1b592aad51f5535ea"
-+                "shasum": "85c38829f8233c14865912e092a2c5c6c80146ec"
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-mbstring": "*",
-+                "ext-openssl": "*",
-+                "ext-soap": "*",
-+                "php": "^5.4|^7"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Eav"
--                    ]
--                ]
-+            "require-dev": {
-+                "php": "^7.1",
-+                "phpmd/phpmd": "^2.6",
-+                "phpunit/phpunit": "^7.2",
-+                "squizlabs/php_codesniffer": "^3.3"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Vertex\\": "src/"
-+                }
-             },
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "proprietary"
-             ],
--            "description": "N/A"
-+            "description": "Tools for communicating with Vertex Cloud and Vertex O-Series"
-         },
-         {
--            "name": "magento/module-email",
--            "version": "0.74.0-beta9",
-+            "name": "webonyx/graphql-php",
-+            "version": "v0.12.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/webonyx/graphql-php.git",
-+                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-email-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "fdcbc0aa8f3bb96f267b77f560f0888c1dd07b4b"
-+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
-+                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-cms": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-variable": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-mbstring": "*",
-+                "php": ">=5.6"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Email"
--                    ]
--                ]
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8",
-+                "psr/http-message": "^1.0",
-+                "react/promise": "2.*"
-+            },
-+            "suggest": {
-+                "psr/http-message": "To use standard GraphQL server",
-+                "react/promise": "To leverage async resolving on React PHP platform"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "GraphQL\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "description": "A PHP port of GraphQL reference implementation",
-+            "homepage": "https://github.com/webonyx/graphql-php",
-+            "keywords": [
-+                "api",
-+                "graphql"
-+            ],
-+            "time": "2018-09-02T14:59:54+00:00"
-         },
-         {
--            "name": "magento/module-fedex",
--            "version": "0.74.0-beta9",
-+            "name": "yubico/u2flib-server",
-+            "version": "1.0.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Yubico/php-u2flib-server.git",
-+                "reference": "55d813acf68212ad2cadecde07551600d6971939"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-fedex-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "ddb21f39509d35d91d654ed4cee2d0bd6d96b8ff"
-+                "url": "https://api.github.com/repos/Yubico/php-u2flib-server/zipball/55d813acf68212ad2cadecde07551600d6971939",
-+                "reference": "55d813acf68212ad2cadecde07551600d6971939",
-+                "shasum": ""
-             },
-             "require": {
--                "lib-libxml": "*",
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-shipping": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-openssl": "*",
-+                "paragonie/random_compat": ">= 1",
-+                "php": ">=5.6"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Fedex"
--                    ]
-+            "require-dev": {
-+                "phpunit/phpunit": "~5.7",
-+                "vimeo/psalm": "^0|^1|^2"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-2-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Library for U2F implementation",
-+            "homepage": "https://developers.yubico.com/php-u2flib-server",
-+            "time": "2018-09-07T08:16:44+00:00"
-         },
-         {
--            "name": "magento/module-gift-message",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-barcode",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-barcode.git",
-+                "reference": "50f24f604ef2172a0127efe91e786bc2caf2e8cf"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-gift-message-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "baa084f6f8c5098573a39441b1e7ff478aaf645d"
-+                "url": "https://api.github.com/repos/zendframework/zend-barcode/zipball/50f24f604ef2172a0127efe91e786bc2caf2e8cf",
-+                "reference": "50f24f604ef2172a0127efe91e786bc2caf2e8cf",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-multishipping": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1",
-+                "zendframework/zend-validator": "^2.10.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6 || ^3.1",
-+                "zendframework/zendpdf": "^2.0.2"
-+            },
-+            "suggest": {
-+                "zendframework/zendpdf": "ZendPdf component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GiftMessage"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Barcode\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides a generic way to generate barcodes",
-+            "keywords": [
-+                "ZendFramework",
-+                "barcode",
-+                "zf"
-+            ],
-+            "time": "2017-12-11T15:30:02+00:00"
-         },
-         {
--            "name": "magento/module-google-adwords",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-captcha",
-+            "version": "2.8.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-captcha.git",
-+                "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-google-adwords-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "2e07b618a3a20384a128f6c769f0dd767d11da84"
-+                "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/37e9b6a4f632a9399eecbf2e5e325ad89083f87b",
-+                "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-math": "^2.7 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-session": "^2.8",
-+                "zendframework/zend-text": "^2.6",
-+                "zendframework/zend-validator": "^2.10.1",
-+                "zendframework/zendservice-recaptcha": "^3.0"
-+            },
-+            "suggest": {
-+                "zendframework/zend-i18n-resources": "Translations of captcha messages",
-+                "zendframework/zend-session": "Zend\\Session component",
-+                "zendframework/zend-text": "Zend\\Text component",
-+                "zendframework/zend-validator": "Zend\\Validator component",
-+                "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GoogleAdwords"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.8.x-dev",
-+                    "dev-develop": "2.9.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Captcha\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Generate and validate CAPTCHAs using Figlets, images, ReCaptcha, and more",
-+            "keywords": [
-+                "ZendFramework",
-+                "captcha",
-+                "zf"
-+            ],
-+            "time": "2018-04-24T17:24:10+00:00"
-         },
-         {
--            "name": "magento/module-google-analytics",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-code",
-+            "version": "3.3.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-code.git",
-+                "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-google-analytics-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "006250c389821f90c61bca62b29aa477f66071b5"
-+                "url": "https://api.github.com/repos/zendframework/zend-code/zipball/c21db169075c6ec4b342149f446e7b7b724f95eb",
-+                "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-cookie": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1",
-+                "zendframework/zend-eventmanager": "^2.6 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "doctrine/annotations": "~1.0",
-+                "ext-phar": "*",
-+                "phpunit/phpunit": "^6.2.3",
-+                "zendframework/zend-coding-standard": "^1.0.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "suggest": {
-+                "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
-+                "zendframework/zend-stdlib": "Zend\\Stdlib component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GoogleAnalytics"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "3.3.x-dev",
-+                    "dev-develop": "3.4.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Code\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides facilities to generate arbitrary code using an object oriented interface",
-+            "homepage": "https://github.com/zendframework/zend-code",
-+            "keywords": [
-+                "code",
-+                "zf2"
-+            ],
-+            "time": "2018-08-13T20:36:59+00:00"
-         },
-         {
--            "name": "magento/module-google-optimizer",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-config",
-+            "version": "2.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-config.git",
-+                "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-google-optimizer-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "35f7d31d069c1bfb8a9fc6e30757546f4188e05c"
-+                "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
-+                "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-cms": "0.74.0-beta9",
--                "magento/module-google-analytics": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0",
-+                "zendframework/zend-filter": "^2.6",
-+                "zendframework/zend-i18n": "^2.5",
-+                "zendframework/zend-json": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-+            },
-+            "suggest": {
-+                "zendframework/zend-filter": "Zend\\Filter component",
-+                "zendframework/zend-i18n": "Zend\\I18n component",
-+                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GoogleOptimizer"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.6-dev",
-+                    "dev-develop": "2.7-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Config\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
-+            "homepage": "https://github.com/zendframework/zend-config",
-+            "keywords": [
-+                "config",
-+                "zf2"
-+            ],
-+            "time": "2016-02-04T23:01:10+00:00"
-         },
-         {
--            "name": "magento/module-google-shopping",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-console",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-console.git",
-+                "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-google-shopping-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "b0867fd647a13818a701974a0224fd3c7f306d1a"
-+                "url": "https://api.github.com/repos/zendframework/zend-console/zipball/e8aa08da83de3d265256c40ba45cd649115f0e18",
-+                "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-filter": "^2.7.2",
-+                "zendframework/zend-json": "^2.6 || ^3.0",
-+                "zendframework/zend-validator": "^2.10.1"
-+            },
-+            "suggest": {
-+                "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
-+                "zendframework/zend-validator": "To support DefaultRouteMatcher usage"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GoogleShopping"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Console\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Build console applications using getopt syntax or routing, complete with prompts",
-+            "keywords": [
-+                "ZendFramework",
-+                "console",
-+                "zf"
-+            ],
-+            "time": "2018-01-25T19:08:04+00:00"
-         },
-         {
--            "name": "magento/module-grouped-import-export",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-crypt",
-+            "version": "2.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-crypt.git",
-+                "reference": "1b2f5600bf6262904167116fa67b58ab1457036d"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-grouped-import-export-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "b740cdb730ba164f15c8beca9e42076cd73506f6"
-+                "url": "https://api.github.com/repos/zendframework/zend-crypt/zipball/1b2f5600bf6262904167116fa67b58ab1457036d",
-+                "reference": "1b2f5600bf6262904167116fa67b58ab1457036d",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-import-export": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-grouped-product": "0.74.0-beta9",
--                "magento/module-import-export": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "container-interop/container-interop": "~1.0",
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-math": "^2.6",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "suggest": {
-+                "ext-mcrypt": "Required for most features of Zend\\Crypt"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GroupedImportExport"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.6-dev",
-+                    "dev-develop": "2.7-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Crypt\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-crypt",
-+            "keywords": [
-+                "crypt",
-+                "zf2"
-+            ],
-+            "time": "2016-02-03T23:46:30+00:00"
-         },
-         {
--            "name": "magento/module-grouped-product",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-db",
-+            "version": "2.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-db.git",
-+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-grouped-product-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "3b81ed8cbbe0118632fb0a73d96defaf17001627"
-+                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
-+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-msrp": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.25 || ^6.4.4",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-+            },
-+            "suggest": {
-+                "zendframework/zend-eventmanager": "Zend\\EventManager component",
-+                "zendframework/zend-hydrator": "Zend\\Hydrator component for using HydratingResultSets",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GroupedProduct"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.9-dev",
-+                    "dev-develop": "2.10-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Db",
-+                    "config-provider": "Zend\\Db\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Db\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Database abstraction layer, SQL abstraction, result set abstraction, and RowDataGateway and TableDataGateway implementations",
-+            "keywords": [
-+                "ZendFramework",
-+                "db",
-+                "zf"
-+            ],
-+            "time": "2019-02-25T11:37:45+00:00"
-         },
-         {
--            "name": "magento/module-import-export",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-di",
-+            "version": "2.6.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-di.git",
-+                "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-import-export-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "bdda8672b34b093b89ec54210b4e025b942f66b0"
-+                "url": "https://api.github.com/repos/zendframework/zend-di/zipball/1fd1ba85660b5a2718741b38639dc7c4c3194b37",
-+                "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37",
-+                "shasum": ""
-             },
-             "require": {
--                "ext-ctype": "*",
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-indexer": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "container-interop/container-interop": "^1.1",
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-code": "^2.6 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/ImportExport"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.6-dev",
-+                    "dev-develop": "2.7-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Di\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-di",
-+            "keywords": [
-+                "di",
-+                "zf2"
-+            ],
-+            "time": "2016-04-25T20:58:11+00:00"
-         },
-         {
--            "name": "magento/module-indexer",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-diactoros",
-+            "version": "1.8.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-diactoros.git",
-+                "reference": "20da13beba0dde8fb648be3cc19765732790f46e"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-indexer-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "f87dcac18e19a70d34be3c8e486397fa37368fe6"
-+                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e",
-+                "reference": "20da13beba0dde8fb648be3cc19765732790f46e",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-page-cache": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "psr/http-message": "^1.0"
-             },
--            "type": "magento2-module",
-+            "provide": {
-+                "psr/http-message-implementation": "1.0"
-+            },
-+            "require-dev": {
-+                "ext-dom": "*",
-+                "ext-libxml": "*",
-+                "php-http/psr7-integration-tests": "dev-master",
-+                "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
-+                "zendframework/zend-coding-standard": "~1.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Indexer"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.8.x-dev",
-+                    "dev-develop": "1.9.x-dev",
-+                    "dev-release-2.0": "2.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "files": [
-+                    "src/functions/create_uploaded_file.php",
-+                    "src/functions/marshal_headers_from_sapi.php",
-+                    "src/functions/marshal_method_from_sapi.php",
-+                    "src/functions/marshal_protocol_version_from_sapi.php",
-+                    "src/functions/marshal_uri_from_sapi.php",
-+                    "src/functions/normalize_server.php",
-+                    "src/functions/normalize_uploaded_files.php",
-+                    "src/functions/parse_cookie_header.php"
-+                ],
-+                "psr-4": {
-+                    "Zend\\Diactoros\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-2-Clause"
-             ],
--            "description": "N/A"
-+            "description": "PSR HTTP Message implementations",
-+            "homepage": "https://github.com/zendframework/zend-diactoros",
-+            "keywords": [
-+                "http",
-+                "psr",
-+                "psr-7"
-+            ],
-+            "time": "2018-09-05T19:29:37+00:00"
-         },
-         {
--            "name": "magento/module-integration",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-escaper",
-+            "version": "2.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-escaper.git",
-+                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-integration-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "4a4f8808a49733e7434198fd072a0f7dbb3dcff2"
-+                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/31d8aafae982f9568287cb4dce987e6aff8fd074",
-+                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-authorization": "0.74.0-beta9",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-user": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Integration"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.6.x-dev",
-+                    "dev-develop": "2.7.x-dev"
-+                }
-             },
--            "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Escaper\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
-+            "keywords": [
-+                "ZendFramework",
-+                "escaper",
-+                "zf"
-+            ],
-+            "time": "2018-04-25T15:48:53+00:00"
-         },
-         {
--            "name": "magento/module-layered-navigation",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-eventmanager",
-+            "version": "2.6.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-eventmanager.git",
-+                "reference": "d238c443220dce4b6396579c8ab2200ec25f9108"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-layered-navigation-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "a305729e3b91e7d37169eeb3e1dc8b1532982e7e"
-+                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/d238c443220dce4b6396579c8ab2200ec25f9108",
-+                "reference": "d238c443220dce4b6396579c8ab2200ec25f9108",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "athletic/athletic": "dev-master",
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/LayeredNavigation"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-release-2.6": "2.6-dev",
-+                    "dev-master": "3.0-dev",
-+                    "dev-develop": "3.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\EventManager\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-eventmanager",
-+            "keywords": [
-+                "eventmanager",
-+                "zf2"
-+            ],
-+            "time": "2017-12-12T17:48:56+00:00"
-         },
-         {
--            "name": "magento/module-media-storage",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-feed",
-+            "version": "2.10.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-feed.git",
-+                "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-media-storage-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "385de9b553cd7e712e4fbc9d5b8a9aab22b19734"
-+                "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/6641f4cf3f4586c63f83fd70b6d19966025c8888",
-+                "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-escaper": "^2.5.2",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "psr/http-message": "^1.0.1",
-+                "zendframework/zend-cache": "^2.7.2",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-db": "^2.8.2",
-+                "zendframework/zend-http": "^2.7",
-+                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-+                "zendframework/zend-validator": "^2.10.1"
-+            },
-+            "suggest": {
-+                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
-+                "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
-+                "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
-+                "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
-+                "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/MediaStorage"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Feed\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides functionality for consuming RSS and Atom feeds",
-+            "keywords": [
-+                "ZendFramework",
-+                "feed",
-+                "zf"
-+            ],
-+            "time": "2018-08-01T13:53:20+00:00"
-         },
-         {
--            "name": "magento/module-msrp",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-filter",
-+            "version": "2.9.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-filter.git",
-+                "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-msrp-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "a938500cd0391fb081840683bc1d25c8d24bde3f"
-+                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/1c3e6d02f9cd5f6c929c9859498f5efbe216e86f",
-+                "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-bundle": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-downloadable": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-grouped-product": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
-             },
--            "type": "magento2-module",
-+            "conflict": {
-+                "zendframework/zend-validator": "<2.10.1"
-+            },
-+            "require-dev": {
-+                "pear/archive_tar": "^1.4.3",
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "psr/http-factory": "^1.0",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-crypt": "^3.2.1",
-+                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-+                "zendframework/zend-uri": "^2.6"
-+            },
-+            "suggest": {
-+                "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters",
-+                "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
-+                "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
-+                "zendframework/zend-uri": "Zend\\Uri component, for the UriNormalize filter"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Msrp"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.9.x-dev",
-+                    "dev-develop": "2.10.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Filter",
-+                    "config-provider": "Zend\\Filter\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Filter\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides a set of commonly needed data filters",
-+            "keywords": [
-+                "ZendFramework",
-+                "filter",
-+                "zf"
-+            ],
-+            "time": "2018-12-17T16:00:04+00:00"
-         },
-         {
--            "name": "magento/module-multishipping",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-form",
-+            "version": "2.13.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-form.git",
-+                "reference": "c713a12ccbd43148b71c9339e171ca11e3f8a1da"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-multishipping-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "ed5f5195814708f0a40a063ede492ce28b7a85b6"
-+                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/c713a12ccbd43148b71c9339e171ca11e3f8a1da",
-+                "reference": "c713a12ccbd43148b71c9339e171ca11e3f8a1da",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-payment": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
-+                "zendframework/zend-inputfilter": "^2.8",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "doctrine/annotations": "~1.0",
-+                "phpunit/phpunit": "^5.7.23 || ^6.5.3",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-captcha": "^2.7.1",
-+                "zendframework/zend-code": "^2.6 || ^3.0",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-escaper": "^2.5",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-filter": "^2.6",
-+                "zendframework/zend-i18n": "^2.6",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-session": "^2.8.1",
-+                "zendframework/zend-text": "^2.6",
-+                "zendframework/zend-validator": "^2.6",
-+                "zendframework/zend-view": "^2.6.2",
-+                "zendframework/zendservice-recaptcha": "^3.0.0"
-+            },
-+            "suggest": {
-+                "zendframework/zend-captcha": "^2.7.1, required for using CAPTCHA form elements",
-+                "zendframework/zend-code": "^2.6 || ^3.0, required to use zend-form annotations support",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, reuired for zend-form annotations support",
-+                "zendframework/zend-i18n": "^2.6, required when using zend-form view helpers",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services",
-+                "zendframework/zend-view": "^2.6.2, required for using the zend-form view helpers",
-+                "zendframework/zendservice-recaptcha": "in order to use the ReCaptcha form element"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Multishipping"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "2.13.x-dev",
-+                    "dev-develop": "2.14.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Form",
-+                    "config-provider": "Zend\\Form\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Form\\": "src/"
-+                },
-+                "files": [
-+                    "autoload/formElementManagerPolyfill.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Validate and display simple and complex forms, casting forms to business objects and vice versa",
-+            "keywords": [
-+                "ZendFramework",
-+                "form",
-+                "zf"
-+            ],
-+            "time": "2018-12-11T22:51:29+00:00"
-         },
-         {
--            "name": "magento/module-newsletter",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-http",
-+            "version": "2.8.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-http.git",
-+                "reference": "d160aedc096be230af0fe9c31151b2b33ad4e807"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-newsletter-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "1d65d77fdcefdfb81fb7831ddf925340fb8e18da"
-+                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/d160aedc096be230af0fe9c31151b2b33ad4e807",
-+                "reference": "d160aedc096be230af0fe9c31151b2b33ad4e807",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-cms": "0.74.0-beta9",
--                "magento/module-cron": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-email": "0.74.0-beta9",
--                "magento/module-require-js": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-widget": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-loader": "^2.5.1",
-+                "zendframework/zend-stdlib": "^3.1 || ^2.7.7",
-+                "zendframework/zend-uri": "^2.5.2",
-+                "zendframework/zend-validator": "^2.10.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^3.1 || ^2.6"
-+            },
-+            "suggest": {
-+                "paragonie/certainty": "For automated management of cacert.pem"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Newsletter"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.8.x-dev",
-+                    "dev-develop": "2.9.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Http\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
-+            "keywords": [
-+                "ZendFramework",
-+                "http",
-+                "http client",
-+                "zend",
-+                "zf"
-+            ],
-+            "time": "2019-02-07T17:47:08+00:00"
-         },
-         {
--            "name": "magento/module-offline-payments",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-hydrator",
-+            "version": "1.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-hydrator.git",
-+                "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-offline-payments-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "820a2b58d81446545b30016a3601839d01d0d319"
-+                "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65",
-+                "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-payment": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.0",
-+                "squizlabs/php_codesniffer": "^2.0@dev",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-filter": "^2.6",
-+                "zendframework/zend-inputfilter": "^2.6",
-+                "zendframework/zend-serializer": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-+            },
-+            "suggest": {
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
-+                "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage",
-+                "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/OfflinePayments"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-release-1.0": "1.0-dev",
-+                    "dev-release-1.1": "1.1-dev",
-+                    "dev-master": "2.0-dev",
-+                    "dev-develop": "2.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Hydrator\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-hydrator",
-+            "keywords": [
-+                "hydrator",
-+                "zf2"
-+            ],
-+            "time": "2016-02-18T22:38:26+00:00"
-         },
-         {
--            "name": "magento/module-offline-shipping",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-i18n",
-+            "version": "2.9.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-i18n.git",
-+                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-offline-shipping-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "e72fb8afe1ca9edc7c5fc82a68873ff2961565cc"
-+                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
-+                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-sales-rule": "0.74.0-beta9",
--                "magento/module-shipping": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-filter": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-validator": "^2.6",
-+                "zendframework/zend-view": "^2.6.3"
-+            },
-+            "suggest": {
-+                "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
-+                "zendframework/zend-cache": "Zend\\Cache component",
-+                "zendframework/zend-config": "Zend\\Config component",
-+                "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
-+                "zendframework/zend-filter": "You should install this package to use the provided filters",
-+                "zendframework/zend-i18n-resources": "Translation resources",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-+                "zendframework/zend-validator": "You should install this package to use the provided validators",
-+                "zendframework/zend-view": "You should install this package to use the provided view helpers"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/OfflineShipping"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.9.x-dev",
-+                    "dev-develop": "2.10.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\I18n",
-+                    "config-provider": "Zend\\I18n\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\I18n\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Provide translations for your application, and filter and validate internationalized values",
-+            "keywords": [
-+                "ZendFramework",
-+                "i18n",
-+                "zf"
-+            ],
-+            "time": "2018-05-16T16:39:13+00:00"
-         },
-         {
--            "name": "magento/module-page-cache",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-inputfilter",
-+            "version": "2.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-inputfilter.git",
-+                "reference": "4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-page-cache-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "756fb21471c1b0259baf4e594032e7aea5b222f2"
-+                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c",
-+                "reference": "4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-filter": "^2.9.1",
-+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-+                "zendframework/zend-validator": "^2.11"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "psr/http-message": "^1.0",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-+            },
-+            "suggest": {
-+                "psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/PageCache"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\InputFilter",
-+                    "config-provider": "Zend\\InputFilter\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\InputFilter\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files",
-+            "keywords": [
-+                "ZendFramework",
-+                "inputfilter",
-+                "zf"
-+            ],
-+            "time": "2019-01-30T16:58:51+00:00"
-         },
-         {
--            "name": "magento/module-payment",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-json",
-+            "version": "2.6.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-json.git",
-+                "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-payment-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "4514f7446e6e9a19e82eddd8212e31d04377aa77"
-+                "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28",
-+                "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-centinel": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.5 || ^7.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0",
-+                "zendframework/zend-http": "^2.5.4",
-+                "zendframework/zend-server": "^2.6.1",
-+                "zendframework/zend-stdlib": "^2.5 || ^3.0",
-+                "zendframework/zendxml": "^1.0.2"
-+            },
-+            "suggest": {
-+                "zendframework/zend-http": "Zend\\Http component, required to use Zend\\Json\\Server",
-+                "zendframework/zend-server": "Zend\\Server component, required to use Zend\\Json\\Server",
-+                "zendframework/zend-stdlib": "Zend\\Stdlib component, for use with caching Zend\\Json\\Server responses",
-+                "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Payment"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.6-dev",
-+                    "dev-develop": "2.7-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Json\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
-+            "homepage": "https://github.com/zendframework/zend-json",
-+            "keywords": [
-+                "json",
-+                "zf2"
-+            ],
-+            "time": "2016-02-04T21:20:26+00:00"
-         },
-         {
--            "name": "magento/module-persistent",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-loader",
-+            "version": "2.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-loader.git",
-+                "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-persistent-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "afb7d470522a94295bc40744f6e99ae0ec682011"
-+                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/78f11749ea340f6ca316bca5958eef80b38f9b6c",
-+                "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-cron": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-page-cache": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Persistent"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.6.x-dev",
-+                    "dev-develop": "2.7.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Loader\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Autoloading and plugin loading strategies",
-+            "keywords": [
-+                "ZendFramework",
-+                "loader",
-+                "zf"
-+            ],
-+            "time": "2018-04-30T15:20:54+00:00"
-         },
-         {
--            "name": "magento/module-product-alert",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-log",
-+            "version": "2.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-log.git",
-+                "reference": "9cec3b092acb39963659c2f32441cccc56b3f430"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-product-alert-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "d3235530b5f3efd21e517052bdcf7fea0ced7475"
-+                "url": "https://api.github.com/repos/zendframework/zend-log/zipball/9cec3b092acb39963659c2f32441cccc56b3f430",
-+                "reference": "9cec3b092acb39963659c2f32441cccc56b3f430",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "psr/log": "^1.0",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "provide": {
-+                "psr/log-implementation": "1.0.0"
-+            },
-+            "require-dev": {
-+                "mikey179/vfsstream": "^1.6",
-+                "phpunit/phpunit": "^5.7.15 || ^6.0.8",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-db": "^2.6",
-+                "zendframework/zend-escaper": "^2.5",
-+                "zendframework/zend-filter": "^2.5",
-+                "zendframework/zend-mail": "^2.6.1",
-+                "zendframework/zend-validator": "^2.10.1"
-+            },
-+            "suggest": {
-+                "ext-mongo": "mongo extension to use Mongo writer",
-+                "ext-mongodb": "mongodb extension to use MongoDB writer",
-+                "zendframework/zend-console": "Zend\\Console component to use the RequestID log processor",
-+                "zendframework/zend-db": "Zend\\Db component to use the database log writer",
-+                "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML log formatter",
-+                "zendframework/zend-mail": "Zend\\Mail component to use the email log writer",
-+                "zendframework/zend-validator": "Zend\\Validator component to block invalid log messages"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/ProductAlert"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Log",
-+                    "config-provider": "Zend\\Log\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Log\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "component for general purpose logging",
-+            "homepage": "https://github.com/zendframework/zend-log",
-+            "keywords": [
-+                "log",
-+                "logging",
-+                "zf2"
-+            ],
-+            "time": "2018-04-09T21:59:51+00:00"
-         },
-         {
--            "name": "magento/module-quote",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-mail",
-+            "version": "2.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-mail.git",
-+                "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-quote-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "5c6a5e737a7c2fae72aa5381303030601eb3fac2"
-+                "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/d7beb63d5f7144a21ac100072c453e63860cdab8",
-+                "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-authorization": "0.74.0-beta9",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-catalog-rule": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-payment": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-sales-sequence": "0.74.0-beta9",
--                "magento/module-shipping": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-iconv": "*",
-+                "php": "^5.6 || ^7.0",
-+                "true/punycode": "^2.1",
-+                "zendframework/zend-loader": "^2.5",
-+                "zendframework/zend-mime": "^2.5",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-+                "zendframework/zend-validator": "^2.10.2"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-crypt": "^2.6 || ^3.0",
-+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1"
-+            },
-+            "suggest": {
-+                "zendframework/zend-crypt": "Crammd5 support in SMTP Auth",
-+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Quote"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Mail",
-+                    "config-provider": "Zend\\Mail\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Mail\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
-+            "keywords": [
-+                "ZendFramework",
-+                "mail",
-+                "zf"
-+            ],
-+            "time": "2018-06-07T13:37:07+00:00"
-         },
-         {
--            "name": "magento/module-reports",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-math",
-+            "version": "2.7.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-math.git",
-+                "reference": "1abce074004dacac1a32cd54de94ad47ef960d38"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-reports-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "6dd2cca08c4b7c0560167f2ee3fe846004a241bd"
-+                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/1abce074004dacac1a32cd54de94ad47ef960d38",
-+                "reference": "1abce074004dacac1a32cd54de94ad47ef960d38",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-cms": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-downloadable": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-review": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-sales-rule": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "magento/module-widget": "0.74.0-beta9",
--                "magento/module-wishlist": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.5 || ^7.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "ircmaxell/random-lib": "~1.1",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "suggest": {
-+                "ext-bcmath": "If using the bcmath functionality",
-+                "ext-gmp": "If using the gmp functionality",
-+                "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if Mcrypt extensions is unavailable"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Reports"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "2.8-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Math\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-math",
-+            "keywords": [
-+                "math",
-+                "zf2"
-+            ],
-+            "time": "2018-12-04T15:34:17+00:00"
-         },
-         {
--            "name": "magento/module-require-js",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-mime",
-+            "version": "2.7.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-mime.git",
-+                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-require-js-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "842a7c38569cd97b61412c1d60d979710a6a7f9e"
-+                "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/52ae5fa9f12845cae749271034a2d594f0e4c6f2",
-+                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.21 || ^6.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-mail": "^2.6"
-+            },
-+            "suggest": {
-+                "zendframework/zend-mail": "Zend\\Mail component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/RequireJs"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "2.8-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Mime\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Create and parse MIME messages and parts",
-+            "homepage": "https://github.com/zendframework/zend-mime",
-+            "keywords": [
-+                "ZendFramework",
-+                "mime",
-+                "zf"
-+            ],
-+            "time": "2018-05-14T19:02:50+00:00"
-         },
-         {
--            "name": "magento/module-review",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-modulemanager",
-+            "version": "2.8.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-modulemanager.git",
-+                "reference": "394df6e12248ac430a312d4693f793ee7120baa6"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-review-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "507b801b44f75bc421976918b068da84367eb9f7"
-+                "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/394df6e12248ac430a312d4693f793ee7120baa6",
-+                "reference": "394df6e12248ac430a312d4693f793ee7120baa6",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-newsletter": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "magento/module-ui": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-config": "^3.1 || ^2.6",
-+                "zendframework/zend-eventmanager": "^3.2 || ^2.6.3",
-+                "zendframework/zend-stdlib": "^3.1 || ^2.7"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-console": "^2.6",
-+                "zendframework/zend-di": "^2.6",
-+                "zendframework/zend-loader": "^2.5",
-+                "zendframework/zend-mvc": "^3.0 || ^2.7",
-+                "zendframework/zend-servicemanager": "^3.0.3 || ^2.7.5"
-             },
-             "suggest": {
--                "magento/module-cookie": "0.74.0-beta9"
-+                "zendframework/zend-console": "Zend\\Console component",
-+                "zendframework/zend-loader": "Zend\\Loader component if you are not using Composer autoloading for your modules",
-+                "zendframework/zend-mvc": "Zend\\Mvc component",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Review"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "2.8-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\ModuleManager\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Modular application system for zend-mvc applications",
-+            "homepage": "https://github.com/zendframework/zend-modulemanager",
-+            "keywords": [
-+                "ZendFramework",
-+                "modulemanager",
-+                "zf"
-+            ],
-+            "time": "2017-12-02T06:11:18+00:00"
-         },
-         {
--            "name": "magento/module-rss",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-mvc",
-+            "version": "2.7.15",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-mvc.git",
-+                "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-rss-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "dcbfaecc7026ed1ef047b6b8274db47009f7306f"
-+                "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
-+                "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "container-interop/container-interop": "^1.1",
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-console": "^2.7",
-+                "zendframework/zend-eventmanager": "^2.6.4 || ^3.0",
-+                "zendframework/zend-form": "^2.11",
-+                "zendframework/zend-hydrator": "^1.1 || ^2.4",
-+                "zendframework/zend-psr7bridge": "^0.2",
-+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.0.3",
-+                "zendframework/zend-stdlib": "^2.7.5 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "replace": {
-+                "zendframework/zend-router": "^2.0"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "^4.8.36",
-+                "sebastian/comparator": "^1.2.4",
-+                "sebastian/version": "^1.0.4",
-+                "zendframework/zend-authentication": "^2.6",
-+                "zendframework/zend-cache": "^2.8",
-+                "zendframework/zend-di": "^2.6",
-+                "zendframework/zend-filter": "^2.8",
-+                "zendframework/zend-http": "^2.8",
-+                "zendframework/zend-i18n": "^2.8",
-+                "zendframework/zend-inputfilter": "^2.8",
-+                "zendframework/zend-json": "^2.6.1",
-+                "zendframework/zend-log": "^2.9.3",
-+                "zendframework/zend-modulemanager": "^2.8",
-+                "zendframework/zend-serializer": "^2.8",
-+                "zendframework/zend-session": "^2.8.1",
-+                "zendframework/zend-text": "^2.7",
-+                "zendframework/zend-uri": "^2.6",
-+                "zendframework/zend-validator": "^2.10",
-+                "zendframework/zend-view": "^2.9"
-+            },
-+            "suggest": {
-+                "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
-+                "zendframework/zend-config": "Zend\\Config component",
-+                "zendframework/zend-di": "Zend\\Di component",
-+                "zendframework/zend-filter": "Zend\\Filter component",
-+                "zendframework/zend-http": "Zend\\Http component",
-+                "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
-+                "zendframework/zend-inputfilter": "Zend\\Inputfilter component",
-+                "zendframework/zend-json": "Zend\\Json component",
-+                "zendframework/zend-log": "Zend\\Log component",
-+                "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
-+                "zendframework/zend-serializer": "Zend\\Serializer component",
-+                "zendframework/zend-servicemanager-di": "^1.0.1, if using zend-servicemanager v3 and requiring the zend-di integration",
-+                "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
-+                "zendframework/zend-text": "Zend\\Text component",
-+                "zendframework/zend-uri": "Zend\\Uri component",
-+                "zendframework/zend-validator": "Zend\\Validator component",
-+                "zendframework/zend-view": "Zend\\View component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Rss"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "3.0-dev"
-+                }
-+            },
-+            "autoload": {
-+                "files": [
-+                    "src/autoload.php"
-+                ],
-+                "psr-4": {
-+                    "Zend\\Mvc\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-mvc",
-+            "keywords": [
-+                "mvc",
-+                "zf2"
-+            ],
-+            "time": "2018-05-03T13:13:41+00:00"
-         },
-         {
--            "name": "magento/module-rule",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-psr7bridge",
-+            "version": "0.2.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-psr7bridge.git",
-+                "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-rule-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "20aa3361bafb3587d9168521d7a6283122dc4ead"
-+                "url": "https://api.github.com/repos/zendframework/zend-psr7bridge/zipball/86c0b53b0c6381391c4add4a93a56e51d5c74605",
-+                "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605",
-+                "shasum": ""
-             },
-             "require": {
--                "lib-libxml": "*",
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.5",
-+                "psr/http-message": "^1.0",
-+                "zendframework/zend-diactoros": "^1.1",
-+                "zendframework/zend-http": "^2.5"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.7",
-+                "squizlabs/php_codesniffer": "^2.3"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Rule"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.0-dev",
-+                    "dev-develop": "1.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Psr7Bridge\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "PSR-7 <-> Zend\\Http bridge",
-+            "homepage": "https://github.com/zendframework/zend-psr7bridge",
-+            "keywords": [
-+                "http",
-+                "psr",
-+                "psr-7"
-+            ],
-+            "time": "2016-05-10T21:44:39+00:00"
-         },
-         {
--            "name": "magento/module-sales",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-serializer",
-+            "version": "2.9.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-serializer.git",
-+                "reference": "0172690db48d8935edaf625c4cba38b79719892c"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-sales-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "007ca46fc540820c8f17786cabaa544f0fe7f984"
-+                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/0172690db48d8935edaf625c4cba38b79719892c",
-+                "reference": "0172690db48d8935edaf625c4cba38b79719892c",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-authorization": "0.74.0-beta9",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-email": "0.74.0-beta9",
--                "magento/module-gift-message": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-payment": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-reports": "0.74.0-beta9",
--                "magento/module-sales-rule": "0.74.0-beta9",
--                "magento/module-sales-sequence": "0.74.0-beta9",
--                "magento/module-shipping": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "magento/module-ui": "0.74.0-beta9",
--                "magento/module-widget": "0.74.0-beta9",
--                "magento/module-wishlist": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-json": "^2.5 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.25 || ^6.4.4",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-math": "^2.6 || ^3.0",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-+            },
-+            "suggest": {
-+                "zendframework/zend-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
-+                "zendframework/zend-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Sales"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.9.x-dev",
-+                    "dev-develop": "2.10.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Serializer",
-+                    "config-provider": "Zend\\Serializer\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Serializer\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
-+            "keywords": [
-+                "ZendFramework",
-+                "serializer",
-+                "zf"
-+            ],
-+            "time": "2018-05-14T18:45:18+00:00"
-         },
-         {
--            "name": "magento/module-sales-rule",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-server",
-+            "version": "2.8.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-server.git",
-+                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-sales-rule-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "25a2d8e1c2e722e102745e88928de0bd1dd80274"
-+                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/23a2e9a5599c83c05da831cb7c649e8a7809595e",
-+                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-rule": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-payment": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-reports": "0.74.0-beta9",
--                "magento/module-rule": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-shipping": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-widget": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-code": "^2.5 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.5 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/SalesRule"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.8.x-dev",
-+                    "dev-develop": "2.9.x-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Server\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Create Reflection-based RPC servers",
-+            "keywords": [
-+                "ZendFramework",
-+                "server",
-+                "zf"
-+            ],
-+            "time": "2018-04-30T22:21:28+00:00"
-         },
-         {
--            "name": "magento/module-sales-sequence",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-servicemanager",
-+            "version": "2.7.11",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-servicemanager.git",
-+                "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-sales-sequence-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "a242a2b697fc95c36a125bb4e51ec0a2b206b359"
-+                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/99ec9ed5d0f15aed9876433c74c2709eb933d4c7",
-+                "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "php": "~5.5.0|~5.6.0"
-+                "container-interop/container-interop": "~1.0",
-+                "php": "^5.5 || ^7.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "athletic/athletic": "dev-master",
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0",
-+                "zendframework/zend-di": "~2.5",
-+                "zendframework/zend-mvc": "~2.5"
-+            },
-+            "suggest": {
-+                "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
-+                "zendframework/zend-di": "Zend\\Di component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/SalesSequence"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "3.0-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\ServiceManager\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-servicemanager",
-+            "keywords": [
-+                "servicemanager",
-+                "zf2"
-+            ],
-+            "time": "2018-06-22T14:49:54+00:00"
-         },
-         {
--            "name": "magento/module-search",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-session",
-+            "version": "2.8.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-session.git",
-+                "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-search-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "0005f68bc5abaa007361df0236b5fba80517af4d"
-+                "url": "https://api.github.com/repos/zendframework/zend-session/zipball/2cfd90e1a2f6b066b9f908599251d8f64f07021b",
-+                "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog-search": "0.74.0-beta9",
--                "magento/module-reports": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "container-interop/container-interop": "^1.1",
-+                "mongodb/mongodb": "^1.0.1",
-+                "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
-+                "phpunit/phpunit": "^5.7.5 || >=6.0.13 <6.5.0",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-db": "^2.7",
-+                "zendframework/zend-http": "^2.5.4",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-validator": "^2.6"
-+            },
-+            "suggest": {
-+                "mongodb/mongodb": "If you want to use the MongoDB session save handler",
-+                "zendframework/zend-cache": "Zend\\Cache component",
-+                "zendframework/zend-db": "Zend\\Db component",
-+                "zendframework/zend-http": "Zend\\Http component",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-+                "zendframework/zend-validator": "Zend\\Validator component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Search"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.8-dev",
-+                    "dev-develop": "2.9-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Session",
-+                    "config-provider": "Zend\\Session\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Session\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "manage and preserve session data, a logical complement of cookie data, across multiple page requests by the same client",
-+            "keywords": [
-+                "ZendFramework",
-+                "session",
-+                "zf"
-+            ],
-+            "time": "2018-02-22T16:33:54+00:00"
-         },
-         {
--            "name": "magento/module-sendfriend",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-soap",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-soap.git",
-+                "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-sendfriend-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "adb2246c88b666e9340f1a725bea2fb0aa037ca0"
-+                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/af03c32f0db2b899b3df8cfe29aeb2b49857d284",
-+                "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-soap": "*",
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-server": "^2.6.1",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-+                "zendframework/zend-uri": "^2.5.2"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.21 || ^6.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-http": "^2.5.4"
-+            },
-+            "suggest": {
-+                "zendframework/zend-http": "Zend\\Http component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Sendfriend"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Soap\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-soap",
-+            "keywords": [
-+                "soap",
-+                "zf2"
-+            ],
-+            "time": "2018-01-29T17:51:26+00:00"
-         },
-         {
--            "name": "magento/module-shipping",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-stdlib",
-+            "version": "2.7.7",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-stdlib.git",
-+                "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-shipping-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "76013d8582463caeb15ce63a96139048a07ba90b"
-+                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/0e44eb46788f65e09e077eb7f44d2659143bcc1f",
-+                "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f",
-+                "shasum": ""
-             },
-             "require": {
--                "ext-gd": "*",
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-contact": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-payment": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-hydrator": "~1.1"
-+            },
-+            "require-dev": {
-+                "athletic/athletic": "~0.1",
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0",
-+                "zendframework/zend-config": "~2.5",
-+                "zendframework/zend-eventmanager": "~2.5",
-+                "zendframework/zend-filter": "~2.5",
-+                "zendframework/zend-inputfilter": "~2.5",
-+                "zendframework/zend-serializer": "~2.5",
-+                "zendframework/zend-servicemanager": "~2.5"
-             },
-             "suggest": {
--                "magento/module-fedex": "0.74.0-beta9",
--                "magento/module-ups": "0.74.0-beta9"
-+                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
-+                "zendframework/zend-filter": "To support naming strategy hydrator usage",
-+                "zendframework/zend-serializer": "Zend\\Serializer component",
-+                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Shipping"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-release-2.7": "2.7-dev",
-+                    "dev-master": "3.0-dev",
-+                    "dev-develop": "3.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Stdlib\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-stdlib",
-+            "keywords": [
-+                "stdlib",
-+                "zf2"
-+            ],
-+            "time": "2016-04-12T21:17:31+00:00"
-         },
-         {
--            "name": "magento/module-sitemap",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-text",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-text.git",
-+                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-sitemap-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "2169a32cae4f3de305ec17c4d8246175b7ddde9e"
-+                "url": "https://api.github.com/repos/zendframework/zend-text/zipball/ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
-+                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-url-rewrite": "0.74.0-beta9",
--                "magento/module-cms": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Sitemap"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Text\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Create FIGlets and text-based tables",
-+            "keywords": [
-+                "ZendFramework",
-+                "text",
-+                "zf"
-+            ],
-+            "time": "2018-04-30T14:55:10+00:00"
-         },
-         {
--            "name": "magento/module-store",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-uri",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-uri.git",
-+                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-store-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "85ff2ce1c9c32ecb4696e96616b3523e2b78979d"
-+                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/b2785cd38fe379a784645449db86f21b7739b1ee",
-+                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-ui": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-escaper": "^2.5",
-+                "zendframework/zend-validator": "^2.10"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Store"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Uri\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "A component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
-+            "keywords": [
-+                "ZendFramework",
-+                "uri",
-+                "zf"
-+            ],
-+            "time": "2019-02-27T21:39:04+00:00"
-         },
-         {
--            "name": "magento/module-tax",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-validator",
-+            "version": "2.11.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-validator.git",
-+                "reference": "3c28dfe4e5951ba38059cea895244d9d206190b3"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-tax-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "8be068d30674efe3bc2bfe1dba983d8b5d5e680d"
-+                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/3c28dfe4e5951ba38059cea895244d9d206190b3",
-+                "reference": "3c28dfe4e5951ba38059cea895244d9d206190b3",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-reports": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-shipping": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "container-interop/container-interop": "^1.1",
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7.6 || ^3.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
-+                "psr/http-message": "^1.0",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-db": "^2.7",
-+                "zendframework/zend-filter": "^2.6",
-+                "zendframework/zend-http": "^2.5.4",
-+                "zendframework/zend-i18n": "^2.6",
-+                "zendframework/zend-math": "^2.6",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-session": "^2.8",
-+                "zendframework/zend-uri": "^2.5"
-+            },
-+            "suggest": {
-+                "psr/http-message": "psr/http-message, required when validating PSR-7 UploadedFileInterface instances via the Upload and UploadFile validators",
-+                "zendframework/zend-db": "Zend\\Db component, required by the (No)RecordExists validator",
-+                "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
-+                "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages",
-+                "zendframework/zend-i18n-resources": "Translations of validator messages",
-+                "zendframework/zend-math": "Zend\\Math component, required by the Csrf validator",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
-+                "zendframework/zend-session": "Zend\\Session component, ^2.8; required by the Csrf validator",
-+                "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Tax"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.11.x-dev",
-+                    "dev-develop": "2.12.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Validator",
-+                    "config-provider": "Zend\\Validator\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Validator\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides a set of commonly needed validators",
-+            "homepage": "https://github.com/zendframework/zend-validator",
-+            "keywords": [
-+                "validator",
-+                "zf2"
-+            ],
-+            "time": "2019-01-29T22:26:39+00:00"
-         },
-         {
--            "name": "magento/module-tax-import-export",
--            "version": "0.74.0-beta9",
-+            "name": "zendframework/zend-view",
-+            "version": "2.10.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-view.git",
-+                "reference": "c1a3f2043fb75b5983ab9adfc369ae396601be7e"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-tax-import-export-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "f2e9b0c55788af457a52ea579e2bb009f7f70ccd"
-+                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/c1a3f2043fb75b5983ab9adfc369ae396601be7e",
-+                "reference": "c1a3f2043fb75b5983ab9adfc369ae396601be7e",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-json": "^2.6.1",
-+                "zendframework/zend-loader": "^2.5",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.15 || ^6.0.8",
-+                "zendframework/zend-authentication": "^2.5",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-console": "^2.6",
-+                "zendframework/zend-escaper": "^2.5",
-+                "zendframework/zend-feed": "^2.7",
-+                "zendframework/zend-filter": "^2.6.1",
-+                "zendframework/zend-http": "^2.5.4",
-+                "zendframework/zend-i18n": "^2.6",
-+                "zendframework/zend-log": "^2.7",
-+                "zendframework/zend-modulemanager": "^2.7.1",
-+                "zendframework/zend-mvc": "^2.7.14 || ^3.0",
-+                "zendframework/zend-navigation": "^2.5",
-+                "zendframework/zend-paginator": "^2.5",
-+                "zendframework/zend-permissions-acl": "^2.6",
-+                "zendframework/zend-router": "^3.0.1",
-+                "zendframework/zend-serializer": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-session": "^2.8.1",
-+                "zendframework/zend-uri": "^2.5"
-+            },
-+            "suggest": {
-+                "zendframework/zend-authentication": "Zend\\Authentication component",
-+                "zendframework/zend-escaper": "Zend\\Escaper component",
-+                "zendframework/zend-feed": "Zend\\Feed component",
-+                "zendframework/zend-filter": "Zend\\Filter component",
-+                "zendframework/zend-http": "Zend\\Http component",
-+                "zendframework/zend-i18n": "Zend\\I18n component",
-+                "zendframework/zend-mvc": "Zend\\Mvc component",
-+                "zendframework/zend-mvc-plugin-flashmessenger": "zend-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with zend-mvc versions 3 and up",
-+                "zendframework/zend-navigation": "Zend\\Navigation component",
-+                "zendframework/zend-paginator": "Zend\\Paginator component",
-+                "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-+                "zendframework/zend-uri": "Zend\\Uri component"
-+            },
-+            "bin": [
-+                "bin/templatemap_generator.php"
-+            ],
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/TaxImportExport"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\View\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
--        },
-+            "description": "provides a system of helpers, output filters, and variable escaping",
-+            "homepage": "https://github.com/zendframework/zend-view",
-+            "keywords": [
-+                "view",
-+                "zf2"
-+            ],
-+            "time": "2018-12-06T21:20:01+00:00"
-+        }
-+    ],
-+    "packages-dev": [
-         {
--            "name": "magento/module-theme",
--            "version": "0.74.0-beta9",
-+            "name": "allure-framework/allure-codeception",
-+            "version": "1.3.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/allure-framework/allure-codeception.git",
-+                "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-theme-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "34fbc07ab9a15edac3b102a4ae6e04cbc16c4383"
-+                "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/9d31d781b3622b028f1f6210bc76ba88438bd518",
-+                "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-cms": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-require-js": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-widget": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
--            },
--            "suggest": {
--                "magento/module-translation": "0.74.0-beta9"
-+                "allure-framework/allure-php-api": "~1.1.0",
-+                "codeception/codeception": "~2.1",
-+                "php": ">=5.4.0",
-+                "symfony/filesystem": ">=2.6",
-+                "symfony/finder": ">=2.6"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Theme"
--                    ]
--                ]
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Yandex": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "Apache-2.0"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Ivan Krutov",
-+                    "email": "vania-pooh@yandex-team.ru",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "A Codeception adapter for Allure report.",
-+            "homepage": "http://allure.qatools.ru/",
-+            "keywords": [
-+                "allure",
-+                "attachments",
-+                "cases",
-+                "codeception",
-+                "report",
-+                "steps",
-+                "testing"
-+            ],
-+            "time": "2018-12-18T19:47:23+00:00"
-         },
-         {
--            "name": "magento/module-translation",
--            "version": "0.74.0-beta9",
-+            "name": "allure-framework/allure-php-api",
-+            "version": "1.1.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/allure-framework/allure-php-adapter-api.git",
-+                "reference": "a462a0da121681577033e13c123b6cc4e89cdc64"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-translation-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "a7d61f2d4fc262495f4d577ead1d66e6caebe200"
-+                "url": "https://api.github.com/repos/allure-framework/allure-php-adapter-api/zipball/a462a0da121681577033e13c123b6cc4e89cdc64",
-+                "reference": "a462a0da121681577033e13c123b6cc4e89cdc64",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-developer": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "jms/serializer": ">=0.16.0",
-+                "moontoast/math": ">=1.1.0",
-+                "php": ">=5.4.0",
-+                "phpunit/phpunit": ">=4.0.0",
-+                "ramsey/uuid": ">=3.0.0",
-+                "symfony/http-foundation": ">=2.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Translation"
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Yandex": [
-+                        "src/",
-+                        "test/"
-                     ]
--                ]
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "Apache-2.0"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Ivan Krutov",
-+                    "email": "vania-pooh@yandex-team.ru",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "PHP API for Allure adapter",
-+            "homepage": "http://allure.qatools.ru/",
-+            "keywords": [
-+                "allure",
-+                "api",
-+                "php",
-+                "report"
-+            ],
-+            "time": "2016-12-07T12:15:46+00:00"
-         },
-         {
--            "name": "magento/module-ui",
--            "version": "0.74.0-beta9",
-+            "name": "allure-framework/allure-phpunit",
-+            "version": "1.2.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/allure-framework/allure-phpunit.git",
-+                "reference": "45504aeba41304cf155a898fa9ac1aae79f4a089"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-ui-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "501305e3a3648d549c5bc91baca89395495b2a74"
-+                "url": "https://api.github.com/repos/allure-framework/allure-phpunit/zipball/45504aeba41304cf155a898fa9ac1aae79f4a089",
-+                "reference": "45504aeba41304cf155a898fa9ac1aae79f4a089",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "allure-framework/allure-php-api": "~1.1.0",
-+                "mikey179/vfsstream": "1.*",
-+                "php": ">=7.0.0",
-+                "phpunit/phpunit": ">=6.0.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Ui"
--                    ]
--                ]
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Yandex": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "Apache-2.0"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Ivan Krutov",
-+                    "email": "vania-pooh@yandex-team.ru",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "A PHPUnit adapter for Allure report.",
-+            "homepage": "http://allure.qatools.ru/",
-+            "keywords": [
-+                "allure",
-+                "attachments",
-+                "cases",
-+                "phpunit",
-+                "report",
-+                "steps",
-+                "testing"
-+            ],
-+            "time": "2017-11-03T13:08:21+00:00"
-         },
-         {
--            "name": "magento/module-ups",
--            "version": "0.74.0-beta9",
-+            "name": "behat/gherkin",
-+            "version": "v4.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Behat/Gherkin.git",
-+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-ups-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "b818adcf10ebdc0586a81b7165a34af5b3860008"
-+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07",
-+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-shipping": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.5|~5",
-+                "symfony/phpunit-bridge": "~2.7|~3|~4",
-+                "symfony/yaml": "~2.3|~3|~4"
-+            },
-+            "suggest": {
-+                "symfony/yaml": "If you want to parse features, represented in YAML files"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Ups"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "4.4-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "Behat\\Gherkin": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Konstantin Kudryashov",
-+                    "email": "ever.zet@gmail.com",
-+                    "homepage": "http://everzet.com"
-+                }
-+            ],
-+            "description": "Gherkin DSL parser for PHP 5.3",
-+            "homepage": "http://behat.org/",
-+            "keywords": [
-+                "BDD",
-+                "Behat",
-+                "Cucumber",
-+                "DSL",
-+                "gherkin",
-+                "parser"
-+            ],
-+            "time": "2019-01-16T14:22:17+00:00"
-         },
-         {
--            "name": "magento/module-url-rewrite",
--            "version": "0.74.0-beta9",
-+            "name": "codeception/codeception",
-+            "version": "2.4.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Codeception/Codeception.git",
-+                "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-url-rewrite-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "34d054a4ebd87ce92e1d1046d956862604f65b37"
-+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/5fee32d5c82791548931cbc34806b4de6aa1abfc",
-+                "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-url-rewrite": "0.74.0-beta9",
--                "magento/module-cms": "0.74.0-beta9",
--                "magento/module-cms-url-rewrite": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "behat/gherkin": "^4.4.0",
-+                "codeception/phpunit-wrapper": "^6.0.9|^7.0.6",
-+                "codeception/stub": "^2.0",
-+                "ext-json": "*",
-+                "ext-mbstring": "*",
-+                "facebook/webdriver": ">=1.1.3 <2.0",
-+                "guzzlehttp/guzzle": ">=4.1.4 <7.0",
-+                "guzzlehttp/psr7": "~1.0",
-+                "php": ">=5.6.0 <8.0",
-+                "symfony/browser-kit": ">=2.7 <5.0",
-+                "symfony/console": ">=2.7 <5.0",
-+                "symfony/css-selector": ">=2.7 <5.0",
-+                "symfony/dom-crawler": ">=2.7 <5.0",
-+                "symfony/event-dispatcher": ">=2.7 <5.0",
-+                "symfony/finder": ">=2.7 <5.0",
-+                "symfony/yaml": ">=2.7 <5.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "codeception/specify": "~0.3",
-+                "facebook/graph-sdk": "~5.3",
-+                "flow/jsonpath": "~0.2",
-+                "monolog/monolog": "~1.8",
-+                "pda/pheanstalk": "~3.0",
-+                "php-amqplib/php-amqplib": "~2.4",
-+                "predis/predis": "^1.0",
-+                "squizlabs/php_codesniffer": "~2.0",
-+                "symfony/process": ">=2.7 <5.0",
-+                "vlucas/phpdotenv": "^2.4.0"
-+            },
-+            "suggest": {
-+                "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module",
-+                "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests",
-+                "codeception/specify": "BDD-style code blocks",
-+                "codeception/verify": "BDD-style assertions",
-+                "flow/jsonpath": "For using JSONPath in REST module",
-+                "league/factory-muffin": "For DataFactory module",
-+                "league/factory-muffin-faker": "For Faker support in DataFactory module",
-+                "phpseclib/phpseclib": "for SFTP option in FTP Module",
-+                "stecman/symfony-console-completion": "For BASH autocompletion",
-+                "symfony/phpunit-bridge": "For phpunit-bridge support"
-+            },
-+            "bin": [
-+                "codecept"
-+            ],
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/UrlRewrite"
--                    ]
--                ]
-+                "branch-alias": []
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Codeception\\": "src\\Codeception",
-+                    "Codeception\\Extension\\": "ext"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Michael Bodnarchuk",
-+                    "email": "davert@mail.ua",
-+                    "homepage": "http://codegyre.com"
-+                }
-+            ],
-+            "description": "BDD-style testing framework",
-+            "homepage": "http://codeception.com/",
-+            "keywords": [
-+                "BDD",
-+                "TDD",
-+                "acceptance testing",
-+                "functional testing",
-+                "unit testing"
-+            ],
-+            "time": "2018-08-01T07:21:49+00:00"
-         },
-         {
--            "name": "magento/module-user",
--            "version": "0.74.0-beta9",
-+            "name": "codeception/phpunit-wrapper",
-+            "version": "6.6.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Codeception/phpunit-wrapper.git",
-+                "reference": "d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-user-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "4d31751fe30d0f71eead11dc4a55d389c6093eda"
-+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c",
-+                "reference": "d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-authorization": "0.74.0-beta9",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-integration": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "phpunit/php-code-coverage": ">=4.0.4 <6.0",
-+                "phpunit/phpunit": ">=6.5.13 <7.0",
-+                "sebastian/comparator": ">=1.2.4 <3.0",
-+                "sebastian/diff": ">=1.4 <4.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/User"
--                    ]
--                ]
-+            "replace": {
-+                "codeception/phpunit-wrapper": "*"
-+            },
-+            "require-dev": {
-+                "codeception/specify": "*",
-+                "vlucas/phpdotenv": "^3.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Codeception\\PHPUnit\\": "src\\"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Davert",
-+                    "email": "davert.php@resend.cc"
-+                }
-+            ],
-+            "description": "PHPUnit classes used by Codeception",
-+            "time": "2019-02-26T20:47:39+00:00"
-         },
-         {
--            "name": "magento/module-usps",
--            "version": "0.74.0-beta9",
-+            "name": "codeception/stub",
-+            "version": "2.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Codeception/Stub.git",
-+                "reference": "853657f988942f7afb69becf3fd0059f192c705a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-usps-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "81d063228ed743310ee1c9bbdc62562ac2fc9241"
-+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/853657f988942f7afb69becf3fd0059f192c705a",
-+                "reference": "853657f988942f7afb69becf3fd0059f192c705a",
-+                "shasum": ""
-             },
-             "require": {
--                "lib-libxml": "*",
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-shipping": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Usps"
--                    ]
--                ]
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Codeception\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-+            "time": "2019-03-02T15:35:10+00:00"
-         },
-         {
--            "name": "magento/module-variable",
--            "version": "0.74.0-beta9",
-+            "name": "consolidation/annotated-command",
-+            "version": "2.12.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/annotated-command.git",
-+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-variable-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "37a886883455a5321e5d28a5fc28248d56e32ee3"
-+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789",
-+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-email": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.4.11|~5.5.0|~5.6.0"
-+                "consolidation/output-formatters": "^3.4",
-+                "php": ">=5.4.5",
-+                "psr/log": "^1",
-+                "symfony/console": "^2.8|^3|^4",
-+                "symfony/event-dispatcher": "^2.5|^3|^4",
-+                "symfony/finder": "^2.5|^3|^4"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/phpunit": "^6",
-+                "squizlabs/php_codesniffer": "^2.7"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Variable"
--                    ]
--                ]
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        },
-+                        "scenario-options": {
-+                            "create-lockfile": "false"
-+                        }
-+                    },
-+                    "phpunit4": {
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Consolidation\\AnnotatedCommand\\": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                }
-+            ],
-+            "description": "Initialize Symfony Console commands from annotated command class methods.",
-+            "time": "2019-03-08T16:55:03+00:00"
-         },
-         {
--            "name": "magento/module-version",
--            "version": "0.74.0-beta9",
-+            "name": "consolidation/config",
-+            "version": "1.2.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/config.git",
-+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-version-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "7867b8eb39d12d99ed28373b30d0904e4cc115ca"
-+                "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
-+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "php": "~5.5.0|~5.6.0"
-+                "dflydev/dot-access-data": "^1.1.0",
-+                "grasmash/expander": "^1",
-+                "php": ">=5.4.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/phpunit": "^5",
-+                "squizlabs/php_codesniffer": "2.*",
-+                "symfony/console": "^2.5|^3|^4",
-+                "symfony/yaml": "^2.8.11|^3|^4"
-+            },
-+            "suggest": {
-+                "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Version"
--                    ]
--                ]
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require-dev": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require-dev": {
-+                            "symfony/console": "^2.8",
-+                            "symfony/event-dispatcher": "^2.8",
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Consolidation\\Config\\": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                }
-             ],
--            "description": "N/A"
-+            "description": "Provide configuration services for a commandline tool.",
-+            "time": "2019-03-03T19:37:04+00:00"
-         },
-         {
--            "name": "magento/module-webapi",
--            "version": "0.74.0-beta9",
-+            "name": "consolidation/log",
-+            "version": "1.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/log.git",
-+                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-webapi-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "aa667d18e1f941bafa1067f077ff473bcd43ef0f"
-+                "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
-+                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-authorization": "0.74.0-beta9",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-integration": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.4.5",
-+                "psr/log": "^1.0",
-+                "symfony/console": "^2.8|^3|^4"
-             },
--            "suggest": {
--                "magento/module-user": "0.74.0-beta9"
-+            "require-dev": {
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/phpunit": "^6",
-+                "squizlabs/php_codesniffer": "^2"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Webapi"
--                    ]
--                ]
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    },
-+                    "phpunit4": {
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Consolidation\\Log\\": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                }
-+            ],
-+            "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
-+            "time": "2019-01-01T17:30:51+00:00"
-         },
-         {
--            "name": "magento/module-weee",
--            "version": "0.74.0-beta9",
-+            "name": "consolidation/output-formatters",
-+            "version": "3.4.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/output-formatters.git",
-+                "reference": "0881112642ad9059071f13f397f571035b527cb9"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-weee-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "93cb501b913b88987b014815620f77c3d2c2ba34"
-+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/0881112642ad9059071f13f397f571035b527cb9",
-+                "reference": "0881112642ad9059071f13f397f571035b527cb9",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "dflydev/dot-access-data": "^1.1.0",
-+                "php": ">=5.4.0",
-+                "symfony/console": "^2.8|^3|^4",
-+                "symfony/finder": "^2.5|^3|^4"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/phpunit": "^5.7.27",
-+                "squizlabs/php_codesniffer": "^2.7",
-+                "symfony/var-dumper": "^2.8|^3|^4",
-+                "victorjonsson/markdowndocs": "^1.3"
-+            },
-+            "suggest": {
-+                "symfony/var-dumper": "For using the var_dump formatter"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Weee"
--                    ]
--                ]
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^6"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony3": {
-+                        "require": {
-+                            "symfony/console": "^3.4",
-+                            "symfony/finder": "^3.4",
-+                            "symfony/var-dumper": "^3.4"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.6.32"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        },
-+                        "scenario-options": {
-+                            "create-lockfile": "false"
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "3.x-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Consolidation\\OutputFormatters\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                }
-+            ],
-+            "description": "Format text by applying transformations provided by plug-in formatters.",
-+            "time": "2019-03-14T03:45:44+00:00"
-         },
-         {
--            "name": "magento/module-widget",
--            "version": "0.74.0-beta9",
-+            "name": "consolidation/robo",
-+            "version": "1.4.9",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/Robo.git",
-+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-widget-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "15f9242331dc9ba7a212e0a5ad2a8feea4b6c947"
-+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
-+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-cms": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "magento/module-variable": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "consolidation/annotated-command": "^2.10.2",
-+                "consolidation/config": "^1.2",
-+                "consolidation/log": "~1",
-+                "consolidation/output-formatters": "^3.1.13",
-+                "consolidation/self-update": "^1",
-+                "grasmash/yaml-expander": "^1.3",
-+                "league/container": "^2.2",
-+                "php": ">=5.5.0",
-+                "symfony/console": "^2.8|^3|^4",
-+                "symfony/event-dispatcher": "^2.5|^3|^4",
-+                "symfony/filesystem": "^2.5|^3|^4",
-+                "symfony/finder": "^2.5|^3|^4",
-+                "symfony/process": "^2.5|^3|^4"
-             },
--            "type": "magento2-module",
-+            "replace": {
-+                "codegyre/robo": "< 1.0"
-+            },
-+            "require-dev": {
-+                "codeception/aspect-mock": "^1|^2.1.1",
-+                "codeception/base": "^2.3.7",
-+                "codeception/verify": "^0.3.2",
-+                "g1a/composer-test-scenarios": "^3",
-+                "goaop/framework": "~2.1.2",
-+                "goaop/parser-reflection": "^1.1.0",
-+                "natxet/cssmin": "3.0.4",
-+                "nikic/php-parser": "^3.1.5",
-+                "patchwork/jsqueeze": "~2",
-+                "pear/archive_tar": "^1.4.4",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/php-code-coverage": "~2|~4",
-+                "squizlabs/php_codesniffer": "^2.8"
-+            },
-+            "suggest": {
-+                "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch",
-+                "natxet/CssMin": "For minifying CSS files in taskMinify",
-+                "patchwork/jsqueeze": "For minifying JS files in taskMinify",
-+                "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively."
-+            },
-+            "bin": [
-+                "robo"
-+            ],
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Widget"
--                    ]
--                ]
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "remove": [
-+                            "goaop/framework"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.5.9"
-+                            }
-+                        },
-+                        "scenario-options": {
-+                            "create-lockfile": "false"
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Robo\\": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Davert",
-+                    "email": "davert.php@resend.cc"
-+                }
-+            ],
-+            "description": "Modern task runner",
-+            "time": "2019-03-19T18:07:19+00:00"
-         },
-         {
--            "name": "magento/module-wishlist",
--            "version": "0.74.0-beta9",
-+            "name": "consolidation/self-update",
-+            "version": "1.1.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/self-update.git",
-+                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-wishlist-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "bd837563e9db26a98f853f8c812a033e3a522be9"
-+                "url": "https://api.github.com/repos/consolidation/self-update/zipball/a1c273b14ce334789825a09d06d4c87c0a02ad54",
-+                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-grouped-product": "0.74.0-beta9",
--                "magento/module-rss": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "magento/module-ui": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
--            },
--            "suggest": {
--                "magento/module-bundle": "0.74.0-beta9",
--                "magento/module-configurable-product": "0.74.0-beta9",
--                "magento/module-cookie": "0.74.0-beta9",
--                "magento/module-downloadable": "0.74.0-beta9"
-+                "php": ">=5.5.0",
-+                "symfony/console": "^2.8|^3|^4",
-+                "symfony/filesystem": "^2.5|^3|^4"
-             },
--            "type": "magento2-module",
-+            "bin": [
-+                "scripts/release"
-+            ],
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Wishlist"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "SelfUpdate\\": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                },
-+                {
-+                    "name": "Alexander Menk",
-+                    "email": "menk@mestrona.net"
-+                }
-+            ],
-+            "description": "Provides a self:update command for Symfony Console applications.",
-+            "time": "2018-10-28T01:52:03+00:00"
-         },
-         {
--            "name": "magento/product-community-edition",
--            "version": "0.74.0-beta9",
-+            "name": "dflydev/dot-access-data",
-+            "version": "v1.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
-+                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_product-community-edition-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "dcdb19ed1bd35078af02e032d57fa56f657e2de5"
-+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a",
-+                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a",
-+                "shasum": ""
-             },
-             "require": {
--                "composer/composer": "1.0.0-alpha9",
--                "magento/framework": "0.74.0-beta9",
--                "magento/language-de_de": "0.74.0-beta9",
--                "magento/language-en_us": "0.74.0-beta9",
--                "magento/language-es_es": "0.74.0-beta9",
--                "magento/language-fr_fr": "0.74.0-beta9",
--                "magento/language-nl_nl": "0.74.0-beta9",
--                "magento/language-pt_br": "0.74.0-beta9",
--                "magento/language-zh_cn": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/magento2-base": "0.74.0-beta9",
--                "magento/module-admin-notification": "0.74.0-beta9",
--                "magento/module-authorization": "0.74.0-beta9",
--                "magento/module-backend": "0.74.0-beta9",
--                "magento/module-backup": "0.74.0-beta9",
--                "magento/module-bundle": "0.74.0-beta9",
--                "magento/module-cache-invalidate": "0.74.0-beta9",
--                "magento/module-captcha": "0.74.0-beta9",
--                "magento/module-catalog": "0.74.0-beta9",
--                "magento/module-catalog-import-export": "0.74.0-beta9",
--                "magento/module-catalog-inventory": "0.74.0-beta9",
--                "magento/module-catalog-rule": "0.74.0-beta9",
--                "magento/module-catalog-search": "0.74.0-beta9",
--                "magento/module-catalog-url-rewrite": "0.74.0-beta9",
--                "magento/module-catalog-widget": "0.74.0-beta9",
--                "magento/module-centinel": "0.74.0-beta9",
--                "magento/module-checkout": "0.74.0-beta9",
--                "magento/module-checkout-agreements": "0.74.0-beta9",
--                "magento/module-cms": "0.74.0-beta9",
--                "magento/module-cms-url-rewrite": "0.74.0-beta9",
--                "magento/module-config": "0.74.0-beta9",
--                "magento/module-configurable-import-export": "0.74.0-beta9",
--                "magento/module-configurable-product": "0.74.0-beta9",
--                "magento/module-contact": "0.74.0-beta9",
--                "magento/module-cookie": "0.74.0-beta9",
--                "magento/module-cron": "0.74.0-beta9",
--                "magento/module-currency-symbol": "0.74.0-beta9",
--                "magento/module-customer": "0.74.0-beta9",
--                "magento/module-customer-import-export": "0.74.0-beta9",
--                "magento/module-developer": "0.74.0-beta9",
--                "magento/module-dhl": "0.74.0-beta9",
--                "magento/module-directory": "0.74.0-beta9",
--                "magento/module-downloadable": "0.74.0-beta9",
--                "magento/module-eav": "0.74.0-beta9",
--                "magento/module-email": "0.74.0-beta9",
--                "magento/module-fedex": "0.74.0-beta9",
--                "magento/module-gift-message": "0.74.0-beta9",
--                "magento/module-google-adwords": "0.74.0-beta9",
--                "magento/module-google-analytics": "0.74.0-beta9",
--                "magento/module-google-optimizer": "0.74.0-beta9",
--                "magento/module-google-shopping": "0.74.0-beta9",
--                "magento/module-grouped-import-export": "0.74.0-beta9",
--                "magento/module-grouped-product": "0.74.0-beta9",
--                "magento/module-import-export": "0.74.0-beta9",
--                "magento/module-indexer": "0.74.0-beta9",
--                "magento/module-integration": "0.74.0-beta9",
--                "magento/module-layered-navigation": "0.74.0-beta9",
--                "magento/module-media-storage": "0.74.0-beta9",
--                "magento/module-msrp": "0.74.0-beta9",
--                "magento/module-multishipping": "0.74.0-beta9",
--                "magento/module-newsletter": "0.74.0-beta9",
--                "magento/module-offline-payments": "0.74.0-beta9",
--                "magento/module-offline-shipping": "0.74.0-beta9",
--                "magento/module-page-cache": "0.74.0-beta9",
--                "magento/module-payment": "0.74.0-beta9",
--                "magento/module-persistent": "0.74.0-beta9",
--                "magento/module-product-alert": "0.74.0-beta9",
--                "magento/module-quote": "0.74.0-beta9",
--                "magento/module-reports": "0.74.0-beta9",
--                "magento/module-require-js": "0.74.0-beta9",
--                "magento/module-review": "0.74.0-beta9",
--                "magento/module-rss": "0.74.0-beta9",
--                "magento/module-rule": "0.74.0-beta9",
--                "magento/module-sales": "0.74.0-beta9",
--                "magento/module-sales-rule": "0.74.0-beta9",
--                "magento/module-sales-sequence": "0.74.0-beta9",
--                "magento/module-search": "0.74.0-beta9",
--                "magento/module-sendfriend": "0.74.0-beta9",
--                "magento/module-shipping": "0.74.0-beta9",
--                "magento/module-sitemap": "0.74.0-beta9",
--                "magento/module-store": "0.74.0-beta9",
--                "magento/module-tax": "0.74.0-beta9",
--                "magento/module-tax-import-export": "0.74.0-beta9",
--                "magento/module-theme": "0.74.0-beta9",
--                "magento/module-translation": "0.74.0-beta9",
--                "magento/module-ui": "0.74.0-beta9",
--                "magento/module-ups": "0.74.0-beta9",
--                "magento/module-url-rewrite": "0.74.0-beta9",
--                "magento/module-user": "0.74.0-beta9",
--                "magento/module-usps": "0.74.0-beta9",
--                "magento/module-variable": "0.74.0-beta9",
--                "magento/module-version": "0.74.0-beta9",
--                "magento/module-webapi": "0.74.0-beta9",
--                "magento/module-weee": "0.74.0-beta9",
--                "magento/module-widget": "0.74.0-beta9",
--                "magento/module-wishlist": "0.74.0-beta9",
--                "magento/theme-adminhtml-backend": "0.74.0-beta9",
--                "magento/theme-frontend-blank": "0.74.0-beta9",
--                "magento/theme-frontend-luma": "0.74.0-beta9",
--                "magento/zendframework1": "1.12.10",
--                "monolog/monolog": "1.11.0",
--                "oyejorge/less.php": "1.7.0.3",
--                "php": "~5.5.0|~5.6.0|~7.0.0",
--                "symfony/console": "~2.3",
--                "tubalmartin/cssmin": "2.4.8-p4",
--                "zendframework/zend-code": "2.4.0",
--                "zendframework/zend-config": "2.4.0",
--                "zendframework/zend-console": "2.4.0",
--                "zendframework/zend-di": "2.4.0",
--                "zendframework/zend-eventmanager": "2.4.0",
--                "zendframework/zend-form": "2.4.0",
--                "zendframework/zend-http": "2.4.0",
--                "zendframework/zend-i18n": "2.4.0",
--                "zendframework/zend-json": "2.4.0",
--                "zendframework/zend-log": "2.4.0",
--                "zendframework/zend-modulemanager": "2.4.0",
--                "zendframework/zend-mvc": "2.4.0",
--                "zendframework/zend-serializer": "2.4.0",
--                "zendframework/zend-server": "2.4.0",
--                "zendframework/zend-servicemanager": "2.4.0",
--                "zendframework/zend-soap": "2.4.0",
--                "zendframework/zend-stdlib": "2.4.0",
--                "zendframework/zend-text": "2.4.0",
--                "zendframework/zend-uri": "2.4.0",
--                "zendframework/zend-validator": "2.4.0",
--                "zendframework/zend-view": "2.4.0"
-+                "php": ">=5.3.2"
-             },
--            "type": "metapackage",
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.0-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "Dflydev\\DotAccessData": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "eCommerce Platform for Growth (Community Edition)"
-+            "authors": [
-+                {
-+                    "name": "Dragonfly Development Inc.",
-+                    "email": "info@dflydev.com",
-+                    "homepage": "http://dflydev.com"
-+                },
-+                {
-+                    "name": "Beau Simensen",
-+                    "email": "beau@dflydev.com",
-+                    "homepage": "http://beausimensen.com"
-+                },
-+                {
-+                    "name": "Carlos Frutos",
-+                    "email": "carlos@kiwing.it",
-+                    "homepage": "https://github.com/cfrutos"
-+                }
-+            ],
-+            "description": "Given a deep data structure, access data by dot notation.",
-+            "homepage": "https://github.com/dflydev/dflydev-dot-access-data",
-+            "keywords": [
-+                "access",
-+                "data",
-+                "dot",
-+                "notation"
-+            ],
-+            "time": "2017-01-20T21:14:22+00:00"
-         },
-         {
--            "name": "magento/theme-adminhtml-backend",
--            "version": "0.74.0-beta9",
-+            "name": "doctrine/annotations",
-+            "version": "v1.6.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/doctrine/annotations.git",
-+                "reference": "53120e0eb10355388d6ccbe462f1fea34ddadb24"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_theme-adminhtml-backend-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "180c47b61bd4711070cdc4156e652c0158fb85a6"
-+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/53120e0eb10355388d6ccbe462f1fea34ddadb24",
-+                "reference": "53120e0eb10355388d6ccbe462f1fea34ddadb24",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "php": "~5.5.0|~5.6.0"
-+                "doctrine/lexer": "1.*",
-+                "php": "^7.1"
-             },
--            "type": "magento2-theme",
-+            "require-dev": {
-+                "doctrine/cache": "1.*",
-+                "phpunit/phpunit": "^6.4"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "adminhtml/Magento/backend"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.6.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Roman Borschel",
-+                    "email": "roman@code-factory.org"
-+                },
-+                {
-+                    "name": "Benjamin Eberlei",
-+                    "email": "kontakt@beberlei.de"
-+                },
-+                {
-+                    "name": "Guilherme Blanco",
-+                    "email": "guilhermeblanco@gmail.com"
-+                },
-+                {
-+                    "name": "Jonathan Wage",
-+                    "email": "jonwage@gmail.com"
-+                },
-+                {
-+                    "name": "Johannes Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "Docblock Annotations Parser",
-+            "homepage": "http://www.doctrine-project.org",
-+            "keywords": [
-+                "annotations",
-+                "docblock",
-+                "parser"
-+            ],
-+            "time": "2019-03-25T19:12:02+00:00"
-         },
-         {
--            "name": "magento/theme-frontend-blank",
--            "version": "0.74.0-beta9",
-+            "name": "doctrine/collections",
-+            "version": "v1.6.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/doctrine/collections.git",
-+                "reference": "d2ae4ef05e25197343b6a39bae1d3c427a2f6956"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_theme-frontend-blank-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "dc037fe5de13aff46169958e58c07993b623909a"
-+                "url": "https://api.github.com/repos/doctrine/collections/zipball/d2ae4ef05e25197343b6a39bae1d3c427a2f6956",
-+                "reference": "d2ae4ef05e25197343b6a39bae1d3c427a2f6956",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1.3"
-             },
--            "type": "magento2-theme",
-+            "require-dev": {
-+                "doctrine/coding-standard": "^6.0",
-+                "phpstan/phpstan-shim": "^0.9.2",
-+                "phpunit/phpunit": "^7.0",
-+                "vimeo/psalm": "^3.2.2"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "frontend/Magento/blank"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.6.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Roman Borschel",
-+                    "email": "roman@code-factory.org"
-+                },
-+                {
-+                    "name": "Benjamin Eberlei",
-+                    "email": "kontakt@beberlei.de"
-+                },
-+                {
-+                    "name": "Guilherme Blanco",
-+                    "email": "guilhermeblanco@gmail.com"
-+                },
-+                {
-+                    "name": "Jonathan Wage",
-+                    "email": "jonwage@gmail.com"
-+                },
-+                {
-+                    "name": "Johannes Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "PHP Doctrine Collections library that adds additional functionality on top of PHP arrays.",
-+            "homepage": "https://www.doctrine-project.org/projects/collections.html",
-+            "keywords": [
-+                "array",
-+                "collections",
-+                "iterators",
-+                "php"
-+            ],
-+            "time": "2019-03-25T19:03:48+00:00"
-         },
-         {
--            "name": "magento/theme-frontend-luma",
--            "version": "0.74.0-beta9",
-+            "name": "doctrine/instantiator",
-+            "version": "1.2.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/doctrine/instantiator.git",
-+                "reference": "a2c590166b2133a4633738648b6b064edae0814a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_theme-frontend-luma-0.74.0-beta9.zip",
--                "reference": null,
--                "shasum": "11d0b3dd1f800ef730bf87c02a5e5031c8a8e214"
-+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
-+                "reference": "a2c590166b2133a4633738648b6b064edae0814a",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta9",
--                "magento/magento-composer-installer": "*",
--                "magento/theme-frontend-blank": "0.74.0-beta9",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1"
-             },
--            "type": "magento2-theme",
-+            "require-dev": {
-+                "doctrine/coding-standard": "^6.0",
-+                "ext-pdo": "*",
-+                "ext-phar": "*",
-+                "phpbench/phpbench": "^0.13",
-+                "phpstan/phpstan-phpunit": "^0.11",
-+                "phpstan/phpstan-shim": "^0.11",
-+                "phpunit/phpunit": "^7.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "frontend/Magento/luma"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Marco Pivetta",
-+                    "email": "ocramius@gmail.com",
-+                    "homepage": "http://ocramius.github.com/"
-+                }
-+            ],
-+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
-+            "keywords": [
-+                "constructor",
-+                "instantiate"
-+            ],
-+            "time": "2019-03-17T17:37:11+00:00"
-         },
-         {
--            "name": "magento/zendframework1",
--            "version": "1.12.10",
-+            "name": "doctrine/lexer",
-+            "version": "v1.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/magento/zf1.git",
--                "reference": "d1e5cd8c9f83229bcdd9bb485c3ce25259c77884"
-+                "url": "https://github.com/doctrine/lexer.git",
-+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/magento/zf1/zipball/d1e5cd8c9f83229bcdd9bb485c3ce25259c77884",
--                "reference": "d1e5cd8c9f83229bcdd9bb485c3ce25259c77884",
-+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
-+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.2.11"
--            },
--            "require-dev": {
--                "phpunit/dbunit": "1.3.*",
--                "phpunit/phpunit": "3.7.*"
-+                "php": ">=5.3.2"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.12.x-dev"
-+                    "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-0": {
--                    "Zend_": "library/"
-+                    "Doctrine\\Common\\Lexer\\": "lib/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
--            "include-path": [
--                "library/"
--            ],
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "description": "Magento Zend Framework 1",
--            "homepage": "http://framework.zend.com/",
-+            "authors": [
-+                {
-+                    "name": "Roman Borschel",
-+                    "email": "roman@code-factory.org"
-+                },
-+                {
-+                    "name": "Guilherme Blanco",
-+                    "email": "guilhermeblanco@gmail.com"
-+                },
-+                {
-+                    "name": "Johannes Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
-+            "homepage": "http://www.doctrine-project.org",
-             "keywords": [
--                "ZF1",
--                "framework"
-+                "lexer",
-+                "parser"
-             ],
--            "time": "2015-02-06 17:25:45"
-+            "time": "2014-09-09T13:34:57+00:00"
-         },
-         {
--            "name": "monolog/monolog",
--            "version": "1.11.0",
-+            "name": "epfremme/swagger-php",
-+            "version": "v2.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/Seldaek/monolog.git",
--                "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa"
-+                "url": "https://github.com/epfremmer/swagger-php.git",
-+                "reference": "eee28a442b7e6220391ec953d3c9b936354f23bc"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
--                "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
-+                "url": "https://api.github.com/repos/epfremmer/swagger-php/zipball/eee28a442b7e6220391ec953d3c9b936354f23bc",
-+                "reference": "eee28a442b7e6220391ec953d3c9b936354f23bc",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.0",
--                "psr/log": "~1.0"
-+                "doctrine/annotations": "^1.2",
-+                "doctrine/collections": "^1.3",
-+                "jms/serializer": "^1.1",
-+                "php": ">=5.5",
-+                "phpoption/phpoption": "^1.1",
-+                "symfony/yaml": "^2.7|^3.1"
-             },
--            "provide": {
--                "psr/log-implementation": "1.0.0"
-+            "require-dev": {
-+                "mockery/mockery": "^0.9.4",
-+                "phpunit/phpunit": "~4.8|~5.0",
-+                "satooshi/php-coveralls": "^1.0"
-+            },
-+            "type": "package",
-+            "autoload": {
-+                "psr-4": {
-+                    "Epfremme\\Swagger\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Edward Pfremmer",
-+                    "email": "epfremme@nerdery.com"
-+                }
-+            ],
-+            "description": "Library for parsing swagger documentation into PHP entities for use in testing and code generation",
-+            "time": "2016-09-26T17:24:17+00:00"
-+        },
-+        {
-+            "name": "facebook/webdriver",
-+            "version": "1.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/facebook/php-webdriver.git",
-+                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/bd8c740097eb9f2fc3735250fc1912bc811a954e",
-+                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-curl": "*",
-+                "ext-json": "*",
-+                "ext-mbstring": "*",
-+                "ext-zip": "*",
-+                "php": "^5.6 || ~7.0",
-+                "symfony/process": "^2.8 || ^3.1 || ^4.0"
-             },
-             "require-dev": {
--                "aws/aws-sdk-php": "~2.4, >2.4.8",
--                "doctrine/couchdb": "~1.0@dev",
--                "graylog2/gelf-php": "~1.0",
--                "phpunit/phpunit": "~3.7.0",
--                "raven/raven": "~0.5",
--                "ruflin/elastica": "0.90.*",
--                "videlalvaro/php-amqplib": "~2.4"
-+                "friendsofphp/php-cs-fixer": "^2.0",
-+                "jakub-onderka/php-parallel-lint": "^0.9.2",
-+                "php-coveralls/php-coveralls": "^2.0",
-+                "php-mock/php-mock-phpunit": "^1.1",
-+                "phpunit/phpunit": "^5.7",
-+                "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
-+                "squizlabs/php_codesniffer": "^2.6",
-+                "symfony/var-dumper": "^3.3 || ^4.0"
-             },
-             "suggest": {
--                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
--                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
--                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
--                "ext-mongo": "Allow sending log messages to a MongoDB server",
--                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
--                "raven/raven": "Allow sending log messages to a Sentry server",
--                "rollbar/rollbar": "Allow sending log messages to Rollbar",
--                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
--                "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
-+                "ext-SimpleXML": "For Firefox profile creation"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.11.x-dev"
-+                    "dev-community": "1.5-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Monolog\\": "src/Monolog"
-+                    "Facebook\\WebDriver\\": "lib/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Jordi Boggiano",
--                    "email": "j.boggiano@seld.be",
--                    "homepage": "http://seld.be"
--                }
-+                "Apache-2.0"
-             ],
--            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
--            "homepage": "http://github.com/Seldaek/monolog",
-+            "description": "A PHP client for Selenium WebDriver",
-+            "homepage": "https://github.com/facebook/php-webdriver",
-             "keywords": [
--                "log",
--                "logging",
--                "psr-3"
-+                "facebook",
-+                "php",
-+                "selenium",
-+                "webdriver"
-             ],
--            "time": "2014-09-30 13:30:58"
-+            "time": "2018-05-16T17:37:13+00:00"
-         },
-         {
--            "name": "oyejorge/less.php",
--            "version": "v1.7.0.3",
-+            "name": "flow/jsonpath",
-+            "version": "0.4.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/oyejorge/less.php.git",
--                "reference": "6e08ecb07e6f6d9170c23e8744c58fdd822ad0de"
-+                "url": "https://github.com/FlowCommunications/JSONPath.git",
-+                "reference": "f0222818d5c938e4ab668ab2e2c079bd51a27112"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/oyejorge/less.php/zipball/6e08ecb07e6f6d9170c23e8744c58fdd822ad0de",
--                "reference": "6e08ecb07e6f6d9170c23e8744c58fdd822ad0de",
-+                "url": "https://api.github.com/repos/FlowCommunications/JSONPath/zipball/f0222818d5c938e4ab668ab2e2c079bd51a27112",
-+                "reference": "f0222818d5c938e4ab668ab2e2c079bd51a27112",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.2"
-+                "php": ">=5.4.0"
-+            },
-+            "require-dev": {
-+                "peekmo/jsonpath": "dev-master",
-+                "phpunit/phpunit": "^4.0"
-             },
--            "bin": [
--                "bin/lessc"
--            ],
-             "type": "library",
-             "autoload": {
-                 "psr-0": {
--                    "Less": "lib/"
--                },
--                "classmap": [
--                    "lessc.inc.php"
--                ]
-+                    "Flow\\JSONPath": "src/",
-+                    "Flow\\JSONPath\\Test": "tests/"
-+                }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "Apache-2.0"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Matt Agar",
--                    "homepage": "https://github.com/agar"
--                },
--                {
--                    "name": "Martin Jantošovič",
--                    "homepage": "https://github.com/Mordred"
--                },
--                {
--                    "name": "Josh Schmidt",
--                    "homepage": "https://github.com/oyejorge"
-+                    "name": "Stephen Frank",
-+                    "email": "stephen@flowsa.com"
-                 }
-             ],
--            "description": "PHP port of the Javascript version of LESS http://lesscss.org",
--            "homepage": "http://lessphp.gpeasy.com",
--            "keywords": [
--                "css",
--                "less",
--                "less.js",
--                "lesscss",
--                "php",
--                "stylesheet"
--            ],
--            "time": "2015-03-10 18:12:59"
-+            "description": "JSONPath implementation for parsing, searching and flattening arrays",
-+            "time": "2018-03-04T16:39:47+00:00"
-         },
-         {
--            "name": "psr/log",
--            "version": "1.0.0",
-+            "name": "friendsofphp/php-cs-fixer",
-+            "version": "v2.13.3",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/php-fig/log.git",
--                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
-+                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-+                "reference": "38d6f2e9be2aa80bf3c7365612af7f9eb9078719"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
--                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
-+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/38d6f2e9be2aa80bf3c7365612af7f9eb9078719",
-+                "reference": "38d6f2e9be2aa80bf3c7365612af7f9eb9078719",
-                 "shasum": ""
-             },
--            "type": "library",
-+            "require": {
-+                "composer/semver": "^1.4",
-+                "composer/xdebug-handler": "^1.2",
-+                "doctrine/annotations": "^1.2",
-+                "ext-json": "*",
-+                "ext-tokenizer": "*",
-+                "php": "^5.6 || >=7.0 <7.3",
-+                "php-cs-fixer/diff": "^1.3",
-+                "symfony/console": "^3.4.17 || ^4.1.6",
-+                "symfony/event-dispatcher": "^3.0 || ^4.0",
-+                "symfony/filesystem": "^3.0 || ^4.0",
-+                "symfony/finder": "^3.0 || ^4.0",
-+                "symfony/options-resolver": "^3.0 || ^4.0",
-+                "symfony/polyfill-php70": "^1.0",
-+                "symfony/polyfill-php72": "^1.4",
-+                "symfony/process": "^3.0 || ^4.0",
-+                "symfony/stopwatch": "^3.0 || ^4.0"
-+            },
-+            "conflict": {
-+                "hhvm": "*"
-+            },
-+            "require-dev": {
-+                "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
-+                "justinrainbow/json-schema": "^5.0",
-+                "keradus/cli-executor": "^1.2",
-+                "mikey179/vfsstream": "^1.6",
-+                "php-coveralls/php-coveralls": "^2.1",
-+                "php-cs-fixer/accessible-object": "^1.0",
-+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1",
-+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1",
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
-+                "phpunitgoodpractices/traits": "^1.5.1",
-+                "symfony/phpunit-bridge": "^4.0"
-+            },
-+            "suggest": {
-+                "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
-+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
-+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
-+                "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
-+            },
-+            "bin": [
-+                "php-cs-fixer"
-+            ],
-+            "type": "application",
-             "autoload": {
--                "psr-0": {
--                    "Psr\\Log\\": ""
--                }
-+                "psr-4": {
-+                    "PhpCsFixer\\": "src/"
-+                },
-+                "classmap": [
-+                    "tests/Test/AbstractFixerTestCase.php",
-+                    "tests/Test/AbstractIntegrationCaseFactory.php",
-+                    "tests/Test/AbstractIntegrationTestCase.php",
-+                    "tests/Test/Assert/AssertTokensTrait.php",
-+                    "tests/Test/IntegrationCase.php",
-+                    "tests/Test/IntegrationCaseFactory.php",
-+                    "tests/Test/IntegrationCaseFactoryInterface.php",
-+                    "tests/Test/InternalIntegrationCaseFactory.php",
-+                    "tests/TestCase.php"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-@@ -4439,42 +15993,48 @@
-             ],
-             "authors": [
-                 {
--                    "name": "PHP-FIG",
--                    "homepage": "http://www.php-fig.org/"
-+                    "name": "Dariusz Rumiński",
-+                    "email": "dariusz.ruminski@gmail.com"
-+                },
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-                 }
-             ],
--            "description": "Common interface for logging libraries",
--            "keywords": [
--                "log",
--                "psr",
--                "psr-3"
--            ],
--            "time": "2012-12-21 11:40:51"
-+            "description": "A tool to automatically fix PHP code style",
-+            "time": "2019-01-04T18:24:28+00:00"
-         },
-         {
--            "name": "seld/jsonlint",
--            "version": "1.3.1",
-+            "name": "fzaninotto/faker",
-+            "version": "v1.8.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/Seldaek/jsonlint.git",
--                "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4"
-+                "url": "https://github.com/fzaninotto/Faker.git",
-+                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/863ae85c6d3ef60ca49cb12bd051c4a0648c40c4",
--                "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4",
-+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
-+                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.0"
-+                "php": "^5.3.3 || ^7.0"
-+            },
-+            "require-dev": {
-+                "ext-intl": "*",
-+                "phpunit/phpunit": "^4.8.35 || ^5.7",
-+                "squizlabs/php_codesniffer": "^1.5"
-             },
--            "bin": [
--                "bin/jsonlint"
--            ],
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.8-dev"
-+                }
-+            },
-             "autoload": {
-                 "psr-4": {
--                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
-+                    "Faker\\": "src/Faker/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -4483,58 +16043,50 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Jordi Boggiano",
--                    "email": "j.boggiano@seld.be",
--                    "homepage": "http://seld.be"
-+                    "name": "François Zaninotto"
-                 }
-             ],
--            "description": "JSON Linter",
-+            "description": "Faker is a PHP library that generates fake data for you.",
-             "keywords": [
--                "json",
--                "linter",
--                "parser",
--                "validator"
-+                "data",
-+                "faker",
-+                "fixtures"
-             ],
--            "time": "2015-01-04 21:18:15"
-+            "time": "2018-07-12T10:23:15+00:00"
-         },
-         {
--            "name": "symfony/console",
--            "version": "v2.6.7",
--            "target-dir": "Symfony/Component/Console",
-+            "name": "grasmash/expander",
-+            "version": "1.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Console.git",
--                "reference": "ebc5679854aa24ed7d65062e9e3ab0b18a917272"
-+                "url": "https://github.com/grasmash/expander.git",
-+                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Console/zipball/ebc5679854aa24ed7d65062e9e3ab0b18a917272",
--                "reference": "ebc5679854aa24ed7d65062e9e3ab0b18a917272",
-+                "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f",
-+                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "dflydev/dot-access-data": "^1.1.0",
-+                "php": ">=5.4"
-             },
-             "require-dev": {
--                "psr/log": "~1.0",
--                "symfony/event-dispatcher": "~2.1",
--                "symfony/phpunit-bridge": "~2.7",
--                "symfony/process": "~2.1"
--            },
--            "suggest": {
--                "psr/log": "For using the console logger",
--                "symfony/event-dispatcher": "",
--                "symfony/process": ""
-+                "greg-1-anderson/composer-test-scenarios": "^1",
-+                "phpunit/phpunit": "^4|^5.5.4",
-+                "satooshi/php-coveralls": "^1.0.2|dev-master",
-+                "squizlabs/php_codesniffer": "^2.7"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.6-dev"
-+                    "dev-master": "1.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Symfony\\Component\\Console\\": ""
-+                "psr-4": {
-+                    "Grasmash\\Expander\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -4543,98 +16095,90 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Matthew Grasmick"
-                 }
-             ],
--            "description": "Symfony Console Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-05-02 15:18:45"
-+            "description": "Expands internal property references in PHP arrays file.",
-+            "time": "2017-12-21T22:14:55+00:00"
-         },
-         {
--            "name": "symfony/finder",
--            "version": "v2.6.7",
--            "target-dir": "Symfony/Component/Finder",
-+            "name": "grasmash/yaml-expander",
-+            "version": "1.4.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Finder.git",
--                "reference": "704c64c8b12c8882640d5c0330a8414b1e06dc99"
-+                "url": "https://github.com/grasmash/yaml-expander.git",
-+                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Finder/zipball/704c64c8b12c8882640d5c0330a8414b1e06dc99",
--                "reference": "704c64c8b12c8882640d5c0330a8414b1e06dc99",
-+                "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1",
-+                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "dflydev/dot-access-data": "^1.1.0",
-+                "php": ">=5.4",
-+                "symfony/yaml": "^2.8.11|^3|^4"
-             },
-             "require-dev": {
--                "symfony/phpunit-bridge": "~2.7"
-+                "greg-1-anderson/composer-test-scenarios": "^1",
-+                "phpunit/phpunit": "^4.8|^5.5.4",
-+                "satooshi/php-coveralls": "^1.0.2|dev-master",
-+                "squizlabs/php_codesniffer": "^2.7"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.6-dev"
-+                    "dev-master": "1.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Symfony\\Component\\Finder\\": ""
-+                "psr-4": {
-+                    "Grasmash\\YamlExpander\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
--            ],
--            "authors": [
--                {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
-+                "MIT"
-+            ],
-+            "authors": [
-                 {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Matthew Grasmick"
-                 }
-             ],
--            "description": "Symfony Finder Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-05-02 15:18:45"
-+            "description": "Expands internal property references in a yaml file.",
-+            "time": "2017-12-16T16:06:03+00:00"
-         },
-         {
--            "name": "symfony/process",
--            "version": "v2.6.7",
--            "target-dir": "Symfony/Component/Process",
-+            "name": "jms/metadata",
-+            "version": "1.7.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Process.git",
--                "reference": "9f3c4baaf840ed849e1b1f7bfd5ae246e8509562"
-+                "url": "https://github.com/schmittjoh/metadata.git",
-+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Process/zipball/9f3c4baaf840ed849e1b1f7bfd5ae246e8509562",
--                "reference": "9f3c4baaf840ed849e1b1f7bfd5ae246e8509562",
-+                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/e5854ab1aa643623dc64adde718a8eec32b957a8",
-+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": ">=5.3.0"
-             },
-             "require-dev": {
--                "symfony/phpunit-bridge": "~2.7"
-+                "doctrine/cache": "~1.0",
-+                "symfony/cache": "~3.1"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.6-dev"
-+                    "dev-master": "1.5.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-0": {
--                    "Symfony\\Component\\Process\\": ""
-+                    "Metadata\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -4643,1528 +16187,1516 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
-+                    "name": "Asmir Mustafic",
-+                    "email": "goetas@gmail.com"
-                 },
-                 {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Johannes M. Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-                 }
-             ],
--            "description": "Symfony Process Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-05-02 15:18:45"
-+            "description": "Class/method/property metadata management in PHP",
-+            "keywords": [
-+                "annotations",
-+                "metadata",
-+                "xml",
-+                "yaml"
-+            ],
-+            "time": "2018-10-26T12:40:10+00:00"
-         },
-         {
--            "name": "tubalmartin/cssmin",
--            "version": "v2.4.8-p4",
-+            "name": "jms/parser-lib",
-+            "version": "1.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
--                "reference": "fe84d71e8420243544c0ce3bd0f5d7c1936b0f90"
-+                "url": "https://github.com/schmittjoh/parser-lib.git",
-+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/fe84d71e8420243544c0ce3bd0f5d7c1936b0f90",
--                "reference": "fe84d71e8420243544c0ce3bd0f5d7c1936b0f90",
-+                "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.0.0"
-+                "phpoption/phpoption": ">=0.9,<2.0-dev"
-             },
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.0-dev"
-+                }
-+            },
-             "autoload": {
--                "classmap": [
--                    "cssmin.php"
--                ]
-+                "psr-0": {
-+                    "JMS\\": "src/"
-+                }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
--            ],
--            "authors": [
--                {
--                    "name": "Túbal Martín",
--                    "homepage": "http://tubalmartin.me/"
--                }
--            ],
--            "description": "A PHP port of the YUI CSS compressor",
--            "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port",
--            "keywords": [
--                "compress",
--                "compressor",
--                "css",
--                "minify",
--                "yui"
-+                "Apache2"
-             ],
--            "time": "2014-09-22 08:08:50"
-+            "description": "A library for easily creating recursive-descent parsers.",
-+            "time": "2012-11-18T18:08:43+00:00"
-         },
-         {
--            "name": "zendframework/zend-code",
--            "version": "2.4.0",
-+            "name": "jms/serializer",
-+            "version": "1.13.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-code.git",
--                "reference": "0ed94f842ba60cdc900c46a61bdbd7ac95a3e140"
-+                "url": "https://github.com/schmittjoh/serializer.git",
-+                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-code/zipball/0ed94f842ba60cdc900c46a61bdbd7ac95a3e140",
--                "reference": "0ed94f842ba60cdc900c46a61bdbd7ac95a3e140",
-+                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
-+                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-eventmanager": "self.version"
-+                "doctrine/annotations": "^1.0",
-+                "doctrine/instantiator": "^1.0.3",
-+                "jms/metadata": "^1.3",
-+                "jms/parser-lib": "1.*",
-+                "php": "^5.5|^7.0",
-+                "phpcollection/phpcollection": "~0.1",
-+                "phpoption/phpoption": "^1.1"
-             },
-             "require-dev": {
--                "doctrine/common": ">=2.1",
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-stdlib": "self.version"
-+                "doctrine/orm": "~2.1",
-+                "doctrine/phpcr-odm": "^1.3|^2.0",
-+                "ext-pdo_sqlite": "*",
-+                "jackalope/jackalope-doctrine-dbal": "^1.1.5",
-+                "phpunit/phpunit": "^4.8|^5.0",
-+                "propel/propel1": "~1.7",
-+                "psr/container": "^1.0",
-+                "symfony/dependency-injection": "^2.7|^3.3|^4.0",
-+                "symfony/expression-language": "^2.6|^3.0",
-+                "symfony/filesystem": "^2.1",
-+                "symfony/form": "~2.1|^3.0",
-+                "symfony/translation": "^2.1|^3.0",
-+                "symfony/validator": "^2.2|^3.0",
-+                "symfony/yaml": "^2.1|^3.0"
-             },
-             "suggest": {
--                "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
--                "zendframework/zend-stdlib": "Zend\\Stdlib component"
-+                "doctrine/cache": "Required if you like to use cache functionality.",
-+                "doctrine/collections": "Required if you like to use doctrine collection types as ArrayCollection.",
-+                "symfony/yaml": "Required if you'd like to serialize data to YAML format."
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-1.x": "1.13-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Code\\": "src/"
-+                "psr-0": {
-+                    "JMS\\Serializer": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "description": "provides facilities to generate arbitrary code using an object oriented interface",
--            "homepage": "https://github.com/zendframework/zend-code",
-+            "authors": [
-+                {
-+                    "name": "Asmir Mustafic",
-+                    "email": "goetas@gmail.com"
-+                },
-+                {
-+                    "name": "Johannes M. Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
-+            "homepage": "http://jmsyst.com/libs/serializer",
-             "keywords": [
--                "code",
--                "zf2"
-+                "deserialization",
-+                "jaxb",
-+                "json",
-+                "serialization",
-+                "xml"
-             ],
--            "time": "2015-03-31 15:39:14"
-+            "time": "2018-07-25T13:58:54+00:00"
-         },
-         {
--            "name": "zendframework/zend-config",
--            "version": "2.4.0",
-+            "name": "league/container",
-+            "version": "2.4.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-config.git",
--                "reference": "95f3a4b3fa85d49e6f060183122de4596fa6d29d"
-+                "url": "https://github.com/thephpleague/container.git",
-+                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-config/zipball/95f3a4b3fa85d49e6f060183122de4596fa6d29d",
--                "reference": "95f3a4b3fa85d49e6f060183122de4596fa6d29d",
-+                "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0",
-+                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "container-interop/container-interop": "^1.2",
-+                "php": "^5.4.0 || ^7.0"
-             },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-json": "self.version",
--                "zendframework/zend-servicemanager": "self.version"
-+            "provide": {
-+                "container-interop/container-interop-implementation": "^1.2",
-+                "psr/container-implementation": "^1.0"
-             },
--            "suggest": {
--                "zendframework/zend-filter": "Zend\\Filter component",
--                "zendframework/zend-i18n": "Zend\\I18n component",
--                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
-+            "replace": {
-+                "orno/di": "~2.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "4.*"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-2.x": "2.x-dev",
-+                    "dev-1.x": "1.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Config\\": "src/"
-+                    "League\\Container\\": "src"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
--            "homepage": "https://github.com/zendframework/zend-config",
-+            "authors": [
-+                {
-+                    "name": "Phil Bennett",
-+                    "email": "philipobenito@gmail.com",
-+                    "homepage": "http://www.philipobenito.com",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "A fast and intuitive dependency injection container.",
-+            "homepage": "https://github.com/thephpleague/container",
-             "keywords": [
--                "config",
--                "zf2"
-+                "container",
-+                "dependency",
-+                "di",
-+                "injection",
-+                "league",
-+                "provider",
-+                "service"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2017-05-10T09:20:27+00:00"
-         },
-         {
--            "name": "zendframework/zend-console",
--            "version": "2.4.0",
-+            "name": "lusitanian/oauth",
-+            "version": "v0.8.11",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-console.git",
--                "reference": "54823d9ba6f8ce39046384ee5a043b5b3d5f56d7"
-+                "url": "https://github.com/Lusitanian/PHPoAuthLib.git",
-+                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-console/zipball/54823d9ba6f8ce39046384ee5a043b5b3d5f56d7",
--                "reference": "54823d9ba6f8ce39046384ee5a043b5b3d5f56d7",
-+                "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/fc11a53db4b66da555a6a11fce294f574a8374f9",
-+                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": ">=5.3.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "phpunit/phpunit": "3.7.*",
-+                "predis/predis": "0.8.*@dev",
-+                "squizlabs/php_codesniffer": "2.*",
-+                "symfony/http-foundation": "~2.1"
-             },
-             "suggest": {
--                "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
--                "zendframework/zend-validator": "To support DefaultRouteMatcher usage"
-+                "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.",
-+                "predis/predis": "Allows using the Redis storage backend.",
-+                "symfony/http-foundation": "Allows using the Symfony Session storage backend."
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "0.1-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Console\\": "src/"
-+                "psr-0": {
-+                    "OAuth": "src",
-+                    "OAuth\\Unit": "tests"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "David Desberg",
-+                    "email": "david@daviddesberg.com"
-+                },
-+                {
-+                    "name": "Elliot Chance",
-+                    "email": "elliotchance@gmail.com"
-+                },
-+                {
-+                    "name": "Pieter Hordijk",
-+                    "email": "info@pieterhordijk.com"
-+                }
-             ],
--            "homepage": "https://github.com/zendframework/zend-console",
-+            "description": "PHP 5.3+ oAuth 1/2 Library",
-             "keywords": [
--                "console",
--                "zf2"
-+                "Authentication",
-+                "authorization",
-+                "oauth",
-+                "security"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2018-02-14T22:37:14+00:00"
-         },
-         {
--            "name": "zendframework/zend-di",
--            "version": "2.4.0",
-+            "name": "magento/magento2-functional-testing-framework",
-+            "version": "2.3.14",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-di.git",
--                "reference": "b9f8de081adecf71a003a569e9ba76c0a4c00bf2"
-+                "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-+                "reference": "b4002b3fe53884895921b44cf519d42918e3c7c6"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-di/zipball/b9f8de081adecf71a003a569e9ba76c0a4c00bf2",
--                "reference": "b9f8de081adecf71a003a569e9ba76c0a4c00bf2",
-+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/b4002b3fe53884895921b44cf519d42918e3c7c6",
-+                "reference": "b4002b3fe53884895921b44cf519d42918e3c7c6",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-code": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "allure-framework/allure-codeception": "~1.3.0",
-+                "codeception/codeception": "~2.3.4 || ~2.4.0 ",
-+                "consolidation/robo": "^1.0.0",
-+                "epfremme/swagger-php": "^2.0",
-+                "ext-curl": "*",
-+                "flow/jsonpath": ">0.2",
-+                "fzaninotto/faker": "^1.6",
-+                "monolog/monolog": "^1.0",
-+                "mustache/mustache": "~2.5",
-+                "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
-+                "symfony/process": "^2.8 || ^3.1 || ^4.0",
-+                "vlucas/phpdotenv": "^2.4"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-servicemanager": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-+                "brainmaestro/composer-git-hooks": "^2.3",
-+                "codacy/coverage": "^1.4",
-+                "codeception/aspect-mock": "^3.0",
-+                "doctrine/cache": "<1.7.0",
-+                "goaop/framework": "2.2.0",
-+                "php-coveralls/php-coveralls": "^1.0",
-+                "phpmd/phpmd": "^2.6.0",
-+                "phpunit/phpunit": "~6.5.0 || ~7.0.0",
-+                "rregeer/phpunit-coverage-check": "^0.1.4",
-+                "sebastian/phpcpd": "~3.0 || ~4.0",
-+                "squizlabs/php_codesniffer": "~3.2",
-+                "symfony/stopwatch": "~3.4.6"
-             },
-+            "bin": [
-+                "bin/mftf"
-+            ],
-             "type": "library",
-             "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                "hooks": {
-+                    "pre-push": "bin/all-checks"
-                 }
-             },
-             "autoload": {
-+                "files": [
-+                    "src/Magento/FunctionalTestingFramework/_bootstrap.php"
-+                ],
-                 "psr-4": {
--                    "Zend\\Di\\": "src/"
-+                    "Magento\\FunctionalTestingFramework\\": "src/Magento/FunctionalTestingFramework",
-+                    "MFTF\\": "dev/tests/functional/MFTF"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "AGPL-3.0"
-             ],
--            "homepage": "https://github.com/zendframework/zend-di",
-+            "description": "Magento2 Functional Testing Framework",
-             "keywords": [
--                "di",
--                "zf2"
-+                "automation",
-+                "functional",
-+                "magento",
-+                "testing"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2019-02-19T16:03:22+00:00"
-         },
-         {
--            "name": "zendframework/zend-escaper",
--            "version": "2.4.0",
-+            "name": "mikey179/vfsStream",
-+            "version": "v1.6.6",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-escaper.git",
--                "reference": "15e5769e4fcdb4bf07ebd76500810e7070e23a97"
-+                "url": "https://github.com/bovigo/vfsStream.git",
-+                "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/15e5769e4fcdb4bf07ebd76500810e7070e23a97",
--                "reference": "15e5769e4fcdb4bf07ebd76500810e7070e23a97",
-+                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
-+                "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
-+                "php": ">=5.3.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "phpunit/phpunit": "~4.5"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.6.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Escaper\\": "src/"
-+                "psr-0": {
-+                    "org\\bovigo\\vfs\\": "src/main/php"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-escaper",
--            "keywords": [
--                "escaper",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Frank Kleine",
-+                    "homepage": "http://frankkleine.de/",
-+                    "role": "Developer"
-+                }
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "description": "Virtual file system to mock the real file system in unit tests.",
-+            "homepage": "http://vfs.bovigo.org/",
-+            "time": "2019-04-08T13:54:32+00:00"
-         },
-         {
--            "name": "zendframework/zend-eventmanager",
--            "version": "2.4.0",
-+            "name": "moontoast/math",
-+            "version": "1.1.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-eventmanager.git",
--                "reference": "58d21c95c7005a527262fd536499195f104e83f9"
-+                "url": "https://github.com/ramsey/moontoast-math.git",
-+                "reference": "c2792a25df5cad4ff3d760dd37078fc5b6fccc79"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/58d21c95c7005a527262fd536499195f104e83f9",
--                "reference": "58d21c95c7005a527262fd536499195f104e83f9",
-+                "url": "https://api.github.com/repos/ramsey/moontoast-math/zipball/c2792a25df5cad4ff3d760dd37078fc5b6fccc79",
-+                "reference": "c2792a25df5cad4ff3d760dd37078fc5b6fccc79",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "ext-bcmath": "*",
-+                "php": ">=5.3.3"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "jakub-onderka/php-parallel-lint": "^0.9.0",
-+                "phpunit/phpunit": "^4.7|>=5.0 <5.4",
-+                "satooshi/php-coveralls": "^0.6.1",
-+                "squizlabs/php_codesniffer": "^2.3"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\EventManager\\": "src/"
-+                    "Moontoast\\Math\\": "src/Moontoast/Math/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Ben Ramsey",
-+                    "email": "ben@benramsey.com",
-+                    "homepage": "https://benramsey.com"
-+                }
-             ],
--            "homepage": "https://github.com/zendframework/zend-event-manager",
-+            "description": "A mathematics library, providing functionality for large numbers",
-+            "homepage": "https://github.com/ramsey/moontoast-math",
-             "keywords": [
--                "eventmanager",
--                "zf2"
-+                "bcmath",
-+                "math"
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "time": "2017-02-16T16:54:46+00:00"
-         },
-         {
--            "name": "zendframework/zend-filter",
--            "version": "2.4.0",
-+            "name": "mustache/mustache",
-+            "version": "v2.12.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-filter.git",
--                "reference": "6d8aed2da81b62a04747346c4370562cdbe34595"
-+                "url": "https://github.com/bobthecow/mustache.php.git",
-+                "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/6d8aed2da81b62a04747346c4370562cdbe34595",
--                "reference": "6d8aed2da81b62a04747346c4370562cdbe34595",
-+                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/fe8fe72e9d580591854de404cc59a1b83ca4d19e",
-+                "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": ">=5.2.4"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-crypt": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-uri": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-crypt": "Zend\\Crypt component",
--                "zendframework/zend-i18n": "Zend\\I18n component",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
--                "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter"
-+                "friendsofphp/php-cs-fixer": "~1.11",
-+                "phpunit/phpunit": "~3.7|~4.0|~5.0"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Filter\\": "src/"
-+                "psr-0": {
-+                    "Mustache": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "description": "provides a set of commonly needed data filters",
--            "homepage": "https://github.com/zendframework/zend-filter",
-+            "authors": [
-+                {
-+                    "name": "Justin Hileman",
-+                    "email": "justin@justinhileman.info",
-+                    "homepage": "http://justinhileman.com"
-+                }
-+            ],
-+            "description": "A Mustache implementation in PHP.",
-+            "homepage": "https://github.com/bobthecow/mustache.php",
-             "keywords": [
--                "filter",
--                "zf2"
-+                "mustache",
-+                "templating"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2017-07-11T12:54:05+00:00"
-         },
-         {
--            "name": "zendframework/zend-form",
--            "version": "2.4.0",
-+            "name": "myclabs/deep-copy",
-+            "version": "1.9.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-form.git",
--                "reference": "bca0db55718355d25c2c10fdd41a83561f1c94b3"
-+                "url": "https://github.com/myclabs/DeepCopy.git",
-+                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/bca0db55718355d25c2c10fdd41a83561f1c94b3",
--                "reference": "bca0db55718355d25c2c10fdd41a83561f1c94b3",
-+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
-+                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-inputfilter": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^7.1"
-+            },
-+            "replace": {
-+                "myclabs/deep-copy": "self.version"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-captcha": "self.version",
--                "zendframework/zend-code": "self.version",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-validator": "self.version",
--                "zendframework/zend-view": "self.version",
--                "zendframework/zendservice-recaptcha": "*"
--            },
--            "suggest": {
--                "zendframework/zend-captcha": "Zend\\Captcha component",
--                "zendframework/zend-code": "Zend\\Code component",
--                "zendframework/zend-eventmanager": "Zend\\EventManager component",
--                "zendframework/zend-filter": "Zend\\Filter component",
--                "zendframework/zend-i18n": "Zend\\I18n component",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
--                "zendframework/zend-validator": "Zend\\Validator component",
--                "zendframework/zend-view": "Zend\\View component",
--                "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
-+                "doctrine/collections": "^1.0",
-+                "doctrine/common": "^2.6",
-+                "phpunit/phpunit": "^7.1"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Form\\": "src/"
--                }
-+                    "DeepCopy\\": "src/DeepCopy/"
-+                },
-+                "files": [
-+                    "src/DeepCopy/deep_copy.php"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "homepage": "https://github.com/zendframework/zend-form",
-+            "description": "Create deep copies (clones) of your objects",
-             "keywords": [
--                "form",
--                "zf2"
-+                "clone",
-+                "copy",
-+                "duplicate",
-+                "object",
-+                "object graph"
-             ],
--            "time": "2015-03-28 20:29:18"
-+            "time": "2019-04-07T13:18:21+00:00"
-         },
-         {
--            "name": "zendframework/zend-http",
--            "version": "2.4.0",
-+            "name": "pdepend/pdepend",
-+            "version": "2.5.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-http.git",
--                "reference": "9c6047a0bdb3094d3ea07a215ff929cc47de4deb"
-+                "url": "https://github.com/pdepend/pdepend.git",
-+                "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/9c6047a0bdb3094d3ea07a215ff929cc47de4deb",
--                "reference": "9c6047a0bdb3094d3ea07a215ff929cc47de4deb",
-+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/9daf26d0368d4a12bed1cacae1a9f3a6f0adf239",
-+                "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-loader": "self.version",
--                "zendframework/zend-stdlib": "self.version",
--                "zendframework/zend-uri": "self.version",
--                "zendframework/zend-validator": "self.version"
-+                "php": ">=5.3.7",
-+                "symfony/config": "^2.3.0|^3|^4",
-+                "symfony/dependency-injection": "^2.3.0|^3|^4",
-+                "symfony/filesystem": "^2.3.0|^3|^4"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "phpunit/phpunit": "^4.8|^5.7",
-+                "squizlabs/php_codesniffer": "^2.0.0"
-             },
-+            "bin": [
-+                "src/bin/pdepend"
-+            ],
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Http\\": "src/"
-+                    "PDepend\\": "src/main/php/PDepend"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
--            "homepage": "https://github.com/zendframework/zend-http",
--            "keywords": [
--                "http",
--                "zf2"
--            ],
--            "time": "2015-03-27 15:46:30"
-+            "description": "Official version of pdepend to be handled with Composer",
-+            "time": "2017-12-13T13:21:38+00:00"
-         },
-         {
--            "name": "zendframework/zend-i18n",
--            "version": "2.4.0",
-+            "name": "phar-io/manifest",
-+            "version": "1.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-i18n.git",
--                "reference": "9aebc5287373a802540d75fe5508417f866c2e52"
-+                "url": "https://github.com/phar-io/manifest.git",
-+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/9aebc5287373a802540d75fe5508417f866c2e52",
--                "reference": "9aebc5287373a802540d75fe5508417f866c2e52",
-+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
-+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-cache": "self.version",
--                "zendframework/zend-config": "self.version",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-validator": "self.version",
--                "zendframework/zend-view": "self.version"
--            },
--            "suggest": {
--                "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
--                "zendframework/zend-cache": "Zend\\Cache component",
--                "zendframework/zend-config": "Zend\\Config component",
--                "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
--                "zendframework/zend-filter": "You should install this package to use the provided filters",
--                "zendframework/zend-resources": "Translation resources",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
--                "zendframework/zend-validator": "You should install this package to use the provided validators",
--                "zendframework/zend-view": "You should install this package to use the provided view helpers"
-+                "ext-dom": "*",
-+                "ext-phar": "*",
-+                "phar-io/version": "^1.0.1",
-+                "php": "^5.6 || ^7.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\I18n\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-i18n",
--            "keywords": [
--                "i18n",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Arne Blankerts",
-+                    "email": "arne@blankerts.de",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Sebastian Heuer",
-+                    "email": "sebastian@phpeople.de",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "Developer"
-+                }
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-+            "time": "2017-03-05T18:14:27+00:00"
-         },
-         {
--            "name": "zendframework/zend-inputfilter",
--            "version": "2.4.0",
-+            "name": "phar-io/version",
-+            "version": "1.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-inputfilter.git",
--                "reference": "4b1398f3635fae3cc5e873c5bb067274f3d10a93"
-+                "url": "https://github.com/phar-io/version.git",
-+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/4b1398f3635fae3cc5e873c5bb067274f3d10a93",
--                "reference": "4b1398f3635fae3cc5e873c5bb067274f3d10a93",
-+                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
-+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-stdlib": "self.version",
--                "zendframework/zend-validator": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-servicemanager": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-servicemanager": "To support plugin manager support"
-+                "php": "^5.6 || ^7.0"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\InputFilter\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-input-filter",
--            "keywords": [
--                "inputfilter",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Arne Blankerts",
-+                    "email": "arne@blankerts.de",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Sebastian Heuer",
-+                    "email": "sebastian@phpeople.de",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "Developer"
-+                }
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "description": "Library for handling version information and constraints",
-+            "time": "2017-03-05T17:38:23+00:00"
-         },
-         {
--            "name": "zendframework/zend-json",
--            "version": "2.4.0",
-+            "name": "php-cs-fixer/diff",
-+            "version": "v1.3.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-json.git",
--                "reference": "2d845e151c1b9a237cf1899ac31e17fb10bd1e3f"
-+                "url": "https://github.com/PHP-CS-Fixer/diff.git",
-+                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-json/zipball/2d845e151c1b9a237cf1899ac31e17fb10bd1e3f",
--                "reference": "2d845e151c1b9a237cf1899ac31e17fb10bd1e3f",
-+                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756",
-+                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^5.6 || ^7.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-http": "self.version",
--                "zendframework/zend-server": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-http": "Zend\\Http component",
--                "zendframework/zend-server": "Zend\\Server component",
--                "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage"
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "symfony/process": "^3.3"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Json\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
--            "homepage": "https://github.com/zendframework/zend-json",
-+            "authors": [
-+                {
-+                    "name": "Kore Nordmann",
-+                    "email": "mail@kore-nordmann.de"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                },
-+                {
-+                    "name": "SpacePossum"
-+                }
-+            ],
-+            "description": "sebastian/diff v2 backport support for PHP5.6",
-+            "homepage": "https://github.com/PHP-CS-Fixer",
-             "keywords": [
--                "json",
--                "zf2"
-+                "diff"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2018-02-15T16:58:55+00:00"
-         },
-         {
--            "name": "zendframework/zend-loader",
--            "version": "2.4.0",
-+            "name": "phpcollection/phpcollection",
-+            "version": "0.5.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-loader.git",
--                "reference": "65de2c7a56f8eee633c6bf1cfab73e45648880d4"
-+                "url": "https://github.com/schmittjoh/php-collection.git",
-+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/65de2c7a56f8eee633c6bf1cfab73e45648880d4",
--                "reference": "65de2c7a56f8eee633c6bf1cfab73e45648880d4",
-+                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
-+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "phpoption/phpoption": "1.*"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "0.4-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Loader\\": "src/"
-+                "psr-0": {
-+                    "PhpCollection": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "Apache2"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Johannes M. Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-             ],
--            "homepage": "https://github.com/zendframework/zend-loader",
-+            "description": "General-Purpose Collection Library for PHP",
-             "keywords": [
--                "loader",
--                "zf2"
-+                "collection",
-+                "list",
-+                "map",
-+                "sequence",
-+                "set"
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "time": "2015-05-17T12:39:23+00:00"
-         },
-         {
--            "name": "zendframework/zend-log",
--            "version": "2.4.0",
-+            "name": "phpdocumentor/reflection-common",
-+            "version": "1.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-log.git",
--                "reference": "002e3c810cad7e31e51c9895e9e3cb6fbd312cdd"
-+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-log/zipball/002e3c810cad7e31e51c9895e9e3cb6fbd312cdd",
--                "reference": "002e3c810cad7e31e51c9895e9e3cb6fbd312cdd",
-+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": ">=5.5"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-console": "self.version",
--                "zendframework/zend-db": "self.version",
--                "zendframework/zend-escaper": "self.version",
--                "zendframework/zend-mail": "self.version",
--                "zendframework/zend-validator": "self.version"
--            },
--            "suggest": {
--                "ext-mongo": "*",
--                "zendframework/zend-console": "Zend\\Console component",
--                "zendframework/zend-db": "Zend\\Db component",
--                "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML formatter",
--                "zendframework/zend-mail": "Zend\\Mail component",
--                "zendframework/zend-validator": "Zend\\Validator component"
-+                "phpunit/phpunit": "^4.6"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Log\\": "src/"
-+                    "phpDocumentor\\Reflection\\": [
-+                        "src"
-+                    ]
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "description": "component for general purpose logging",
--            "homepage": "https://github.com/zendframework/zend-log",
-+            "authors": [
-+                {
-+                    "name": "Jaap van Otterdijk",
-+                    "email": "opensource@ijaap.nl"
-+                }
-+            ],
-+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-+            "homepage": "http://www.phpdoc.org",
-             "keywords": [
--                "log",
--                "logging",
--                "zf2"
-+                "FQSEN",
-+                "phpDocumentor",
-+                "phpdoc",
-+                "reflection",
-+                "static analysis"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2017-09-11T18:02:19+00:00"
-         },
-         {
--            "name": "zendframework/zend-math",
--            "version": "2.4.0",
-+            "name": "phpdocumentor/reflection-docblock",
-+            "version": "4.3.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-math.git",
--                "reference": "f41fe4acfd809c14f2a802d1aa45dec8fcd2cc73"
-+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/f41fe4acfd809c14f2a802d1aa45dec8fcd2cc73",
--                "reference": "f41fe4acfd809c14f2a802d1aa45dec8fcd2cc73",
-+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
-+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
-+                "php": "^7.0",
-+                "phpdocumentor/reflection-common": "^1.0.0",
-+                "phpdocumentor/type-resolver": "^0.4.0",
-+                "webmozart/assert": "^1.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
--            },
--            "suggest": {
--                "ext-bcmath": "If using the bcmath functionality",
--                "ext-gmp": "If using the gmp functionality",
--                "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
--                "zendframework/zend-servicemanager": ">= current version, if using the BigInteger::factory functionality"
-+                "doctrine/instantiator": "~1.0.5",
-+                "mockery/mockery": "^1.0",
-+                "phpunit/phpunit": "^6.4"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "4.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Math\\": "src/"
-+                    "phpDocumentor\\Reflection\\": [
-+                        "src/"
-+                    ]
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "homepage": "https://github.com/zendframework/zend-math",
--            "keywords": [
--                "math",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Mike van Riel",
-+                    "email": "me@mikevanriel.com"
-+                }
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-+            "time": "2017-11-30T07:14:17+00:00"
-         },
-         {
--            "name": "zendframework/zend-modulemanager",
--            "version": "2.4.0",
-+            "name": "phpdocumentor/type-resolver",
-+            "version": "0.4.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-modulemanager.git",
--                "reference": "af7ae3cd29a1efb73cc66ae1081e606039d5c20f"
-+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/af7ae3cd29a1efb73cc66ae1081e606039d5c20f",
--                "reference": "af7ae3cd29a1efb73cc66ae1081e606039d5c20f",
-+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^5.5 || ^7.0",
-+                "phpdocumentor/reflection-common": "^1.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-config": "self.version",
--                "zendframework/zend-console": "self.version",
--                "zendframework/zend-loader": "self.version",
--                "zendframework/zend-servicemanager": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-config": "Zend\\Config component",
--                "zendframework/zend-console": "Zend\\Console component",
--                "zendframework/zend-loader": "Zend\\Loader component",
--                "zendframework/zend-mvc": "Zend\\Mvc component",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-+                "mockery/mockery": "^0.9.4",
-+                "phpunit/phpunit": "^5.2||^4.8.24"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\ModuleManager\\": "src/"
-+                    "phpDocumentor\\Reflection\\": [
-+                        "src/"
-+                    ]
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "homepage": "https://github.com/zendframework/zend-module-manager",
--            "keywords": [
--                "modulemanager",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Mike van Riel",
-+                    "email": "me@mikevanriel.com"
-+                }
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "time": "2017-07-14T14:27:02+00:00"
-         },
-         {
--            "name": "zendframework/zend-mvc",
--            "version": "2.4.0",
-+            "name": "phpmd/phpmd",
-+            "version": "2.6.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-mvc.git",
--                "reference": "0b4a4a829b30be510a3f215c4ff00c703ee8b431"
-+                "url": "https://github.com/phpmd/phpmd.git",
-+                "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/0b4a4a829b30be510a3f215c4ff00c703ee8b431",
--                "reference": "0b4a4a829b30be510a3f215c4ff00c703ee8b431",
-+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/4e9924b2c157a3eb64395460fcf56b31badc8374",
-+                "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-form": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "ext-xml": "*",
-+                "pdepend/pdepend": "^2.5",
-+                "php": ">=5.3.9"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-authentication": "self.version",
--                "zendframework/zend-console": "self.version",
--                "zendframework/zend-di": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-http": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-inputfilter": "self.version",
--                "zendframework/zend-json": "self.version",
--                "zendframework/zend-log": "self.version",
--                "zendframework/zend-modulemanager": "self.version",
--                "zendframework/zend-serializer": "self.version",
--                "zendframework/zend-session": "self.version",
--                "zendframework/zend-text": "self.version",
--                "zendframework/zend-uri": "self.version",
--                "zendframework/zend-validator": "self.version",
--                "zendframework/zend-version": "self.version",
--                "zendframework/zend-view": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
--                "zendframework/zend-config": "Zend\\Config component",
--                "zendframework/zend-console": "Zend\\Console component",
--                "zendframework/zend-di": "Zend\\Di component",
--                "zendframework/zend-filter": "Zend\\Filter component",
--                "zendframework/zend-http": "Zend\\Http component",
--                "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
--                "zendframework/zend-inputfilter": "Zend\\Inputfilter component",
--                "zendframework/zend-json": "Zend\\Json component",
--                "zendframework/zend-log": "Zend\\Log component",
--                "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
--                "zendframework/zend-serializer": "Zend\\Serializer component",
--                "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
--                "zendframework/zend-stdlib": "Zend\\Stdlib component",
--                "zendframework/zend-text": "Zend\\Text component",
--                "zendframework/zend-uri": "Zend\\Uri component",
--                "zendframework/zend-validator": "Zend\\Validator component",
--                "zendframework/zend-version": "Zend\\Version component",
--                "zendframework/zend-view": "Zend\\View component"
--            },
--            "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
-+                "phpunit/phpunit": "^4.0",
-+                "squizlabs/php_codesniffer": "^2.0"
-             },
-+            "bin": [
-+                "src/bin/phpmd"
-+            ],
-+            "type": "project",
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Mvc\\": "src/"
-+                "psr-0": {
-+                    "PHPMD\\": "src/main/php"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-mvc",
-+            "authors": [
-+                {
-+                    "name": "Manuel Pichler",
-+                    "email": "github@manuel-pichler.de",
-+                    "homepage": "https://github.com/manuelpichler",
-+                    "role": "Project Founder"
-+                },
-+                {
-+                    "name": "Other contributors",
-+                    "homepage": "https://github.com/phpmd/phpmd/graphs/contributors",
-+                    "role": "Contributors"
-+                },
-+                {
-+                    "name": "Marc Würth",
-+                    "email": "ravage@bluewin.ch",
-+                    "homepage": "https://github.com/ravage84",
-+                    "role": "Project Maintainer"
-+                }
-+            ],
-+            "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
-+            "homepage": "http://phpmd.org/",
-             "keywords": [
--                "mvc",
--                "zf2"
-+                "mess detection",
-+                "mess detector",
-+                "pdepend",
-+                "phpmd",
-+                "pmd"
-             ],
--            "time": "2015-03-26 18:55:14"
-+            "time": "2017-01-20T14:41:10+00:00"
-         },
-         {
--            "name": "zendframework/zend-serializer",
--            "version": "2.4.0",
-+            "name": "phpoption/phpoption",
-+            "version": "1.5.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-serializer.git",
--                "reference": "3c531789a9882a5deb721356a7bd2642b65d4b09"
-+                "url": "https://github.com/schmittjoh/php-option.git",
-+                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/3c531789a9882a5deb721356a7bd2642b65d4b09",
--                "reference": "3c531789a9882a5deb721356a7bd2642b65d4b09",
-+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed",
-+                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-json": "self.version",
--                "zendframework/zend-math": "self.version",
--                "zendframework/zend-stdlib": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-servicemanager": "self.version"
-+                "php": ">=5.3.0"
-             },
--            "suggest": {
--                "zendframework/zend-servicemanager": "To support plugin manager support"
-+            "require-dev": {
-+                "phpunit/phpunit": "4.7.*"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.3-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Serializer\\": "src/"
-+                "psr-0": {
-+                    "PhpOption\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "Apache2"
-             ],
--            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
--            "homepage": "https://github.com/zendframework/zend-serializer",
-+            "authors": [
-+                {
-+                    "name": "Johannes M. Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "Option Type for PHP",
-             "keywords": [
--                "serializer",
--                "zf2"
-+                "language",
-+                "option",
-+                "php",
-+                "type"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2015-07-25T16:39:46+00:00"
-         },
-         {
--            "name": "zendframework/zend-server",
--            "version": "2.4.0",
-+            "name": "phpspec/prophecy",
-+            "version": "1.8.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-server.git",
--                "reference": "d11ff0bd529d202022823d4accf5983cbd50fc49"
-+                "url": "https://github.com/phpspec/prophecy.git",
-+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/d11ff0bd529d202022823d4accf5983cbd50fc49",
--                "reference": "d11ff0bd529d202022823d4accf5983cbd50fc49",
-+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-code": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "doctrine/instantiator": "^1.0.2",
-+                "php": "^5.3|^7.0",
-+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-+                "sebastian/comparator": "^1.1|^2.0|^3.0",
-+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "phpspec/phpspec": "^2.5|^3.2",
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.8.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Server\\": "src/"
-+                "psr-0": {
-+                    "Prophecy\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "homepage": "https://github.com/zendframework/zend-server",
-+            "authors": [
-+                {
-+                    "name": "Konstantin Kudryashov",
-+                    "email": "ever.zet@gmail.com",
-+                    "homepage": "http://everzet.com"
-+                },
-+                {
-+                    "name": "Marcello Duarte",
-+                    "email": "marcello.duarte@gmail.com"
-+                }
-+            ],
-+            "description": "Highly opinionated mocking framework for PHP 5.3+",
-+            "homepage": "https://github.com/phpspec/prophecy",
-             "keywords": [
--                "server",
--                "zf2"
-+                "Double",
-+                "Dummy",
-+                "fake",
-+                "mock",
-+                "spy",
-+                "stub"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2018-08-05T17:53:17+00:00"
-         },
-         {
--            "name": "zendframework/zend-servicemanager",
--            "version": "2.4.0",
-+            "name": "phpunit/php-code-coverage",
-+            "version": "5.3.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-servicemanager.git",
--                "reference": "57cf99fa5ac08c05a135a8d0d676c52a5e450083"
-+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/57cf99fa5ac08c05a135a8d0d676c52a5e450083",
--                "reference": "57cf99fa5ac08c05a135a8d0d676c52a5e450083",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
-+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
-+                "ext-dom": "*",
-+                "ext-xmlwriter": "*",
-+                "php": "^7.0",
-+                "phpunit/php-file-iterator": "^1.4.2",
-+                "phpunit/php-text-template": "^1.2.1",
-+                "phpunit/php-token-stream": "^2.0.1",
-+                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-+                "sebastian/environment": "^3.0",
-+                "sebastian/version": "^2.0.1",
-+                "theseer/tokenizer": "^1.1"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-di": "self.version"
-+                "phpunit/phpunit": "^6.0"
-             },
-             "suggest": {
--                "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
--                "zendframework/zend-di": "Zend\\Di component"
-+                "ext-xdebug": "^2.5.5"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "5.3.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\ServiceManager\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-service-manager",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-             "keywords": [
--                "servicemanager",
--                "zf2"
-+                "coverage",
-+                "testing",
-+                "xunit"
-             ],
--            "time": "2015-03-23 18:29:14"
-+            "time": "2018-04-06T15:36:58+00:00"
-         },
-         {
--            "name": "zendframework/zend-soap",
--            "version": "2.4.0",
-+            "name": "phpunit/php-file-iterator",
-+            "version": "1.4.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-soap.git",
--                "reference": "a599463aba97ce247faf3fb443e3c7858b46449b"
-+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/a599463aba97ce247faf3fb443e3c7858b46449b",
--                "reference": "a599463aba97ce247faf3fb443e3c7858b46449b",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-server": "self.version",
--                "zendframework/zend-stdlib": "self.version",
--                "zendframework/zend-uri": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-http": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-http": "Zend\\Http component"
-+                "php": ">=5.3.3"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.4.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Soap\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-soap",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sb@sebastian-bergmann.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-             "keywords": [
--                "soap",
--                "zf2"
-+                "filesystem",
-+                "iterator"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2017-11-27T13:52:08+00:00"
-         },
-         {
--            "name": "zendframework/zend-stdlib",
--            "version": "2.4.0",
-+            "name": "phpunit/php-text-template",
-+            "version": "1.2.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-stdlib.git",
--                "reference": "cf05c5ba75606e47ffee91cedc72778da46f74c3"
-+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cf05c5ba75606e47ffee91cedc72778da46f74c3",
--                "reference": "cf05c5ba75606e47ffee91cedc72778da46f74c3",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-serializer": "self.version",
--                "zendframework/zend-servicemanager": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
--                "zendframework/zend-filter": "To support naming strategy hydrator usage",
--                "zendframework/zend-serializer": "Zend\\Serializer component",
--                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
-+                "php": ">=5.3.3"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Stdlib\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-stdlib",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "Simple template engine.",
-+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-             "keywords": [
--                "stdlib",
--                "zf2"
-+                "template"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2015-06-21T13:50:34+00:00"
-         },
-         {
--            "name": "zendframework/zend-text",
--            "version": "2.4.0",
-+            "name": "phpunit/php-timer",
-+            "version": "1.0.9",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-text.git",
--                "reference": "d962ea25647b20527f3ca34ae225bbc885dabfc7"
-+                "url": "https://github.com/sebastianbergmann/php-timer.git",
-+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-text/zipball/d962ea25647b20527f3ca34ae225bbc885dabfc7",
--                "reference": "d962ea25647b20527f3ca34ae225bbc885dabfc7",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^5.3.3 || ^7.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.0-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Text\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-text",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sb@sebastian-bergmann.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "Utility class for timing",
-+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-             "keywords": [
--                "text",
--                "zf2"
-+                "timer"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2017-02-26T11:10:40+00:00"
-         },
-         {
--            "name": "zendframework/zend-uri",
--            "version": "2.4.0",
-+            "name": "phpunit/php-token-stream",
-+            "version": "2.0.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-uri.git",
--                "reference": "bd9e625639415376f6a82551c73328448d7bc7d1"
-+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-+                "reference": "791198a2c6254db10131eecfe8c06670700904db"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/bd9e625639415376f6a82551c73328448d7bc7d1",
--                "reference": "bd9e625639415376f6a82551c73328448d7bc7d1",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
-+                "reference": "791198a2c6254db10131eecfe8c06670700904db",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-escaper": "self.version",
--                "zendframework/zend-validator": "self.version"
-+                "ext-tokenizer": "*",
-+                "php": "^7.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "phpunit/phpunit": "^6.2.4"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "2.0-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Uri\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
--            "homepage": "https://github.com/zendframework/zend-uri",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                }
-+            ],
-+            "description": "Wrapper around PHP's tokenizer extension.",
-+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-             "keywords": [
--                "uri",
--                "zf2"
-+                "tokenizer"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2017-11-27T05:48:46+00:00"
-         },
-         {
--            "name": "zendframework/zend-validator",
--            "version": "2.4.0",
-+            "name": "phpunit/phpunit",
-+            "version": "6.5.14",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-validator.git",
--                "reference": "45fac2545a0f2eb66d71cb7966feee481e7c475f"
-+                "url": "https://github.com/sebastianbergmann/phpunit.git",
-+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/45fac2545a0f2eb66d71cb7966feee481e7c475f",
--                "reference": "45fac2545a0f2eb66d71cb7966feee481e7c475f",
-+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7",
-+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "ext-dom": "*",
-+                "ext-json": "*",
-+                "ext-libxml": "*",
-+                "ext-mbstring": "*",
-+                "ext-xml": "*",
-+                "myclabs/deep-copy": "^1.6.1",
-+                "phar-io/manifest": "^1.0.1",
-+                "phar-io/version": "^1.0",
-+                "php": "^7.0",
-+                "phpspec/prophecy": "^1.7",
-+                "phpunit/php-code-coverage": "^5.3",
-+                "phpunit/php-file-iterator": "^1.4.3",
-+                "phpunit/php-text-template": "^1.2.1",
-+                "phpunit/php-timer": "^1.0.9",
-+                "phpunit/phpunit-mock-objects": "^5.0.9",
-+                "sebastian/comparator": "^2.1",
-+                "sebastian/diff": "^2.0",
-+                "sebastian/environment": "^3.1",
-+                "sebastian/exporter": "^3.1",
-+                "sebastian/global-state": "^2.0",
-+                "sebastian/object-enumerator": "^3.0.3",
-+                "sebastian/resource-operations": "^1.0",
-+                "sebastian/version": "^2.0.1"
-+            },
-+            "conflict": {
-+                "phpdocumentor/reflection-docblock": "3.0.2",
-+                "phpunit/dbunit": "<3.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-db": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-math": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-session": "self.version",
--                "zendframework/zend-uri": "self.version"
-+                "ext-pdo": "*"
-             },
-             "suggest": {
--                "zendframework/zend-db": "Zend\\Db component",
--                "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
--                "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators",
--                "zendframework/zend-math": "Zend\\Math component",
--                "zendframework/zend-resources": "Translations of validator messages",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
--                "zendframework/zend-session": "Zend\\Session component",
--                "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
-+                "ext-xdebug": "*",
-+                "phpunit/php-invoker": "^1.1"
-             },
-+            "bin": [
-+                "phpunit"
-+            ],
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "6.5.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Validator\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides a set of commonly needed validators",
--            "homepage": "https://github.com/zendframework/zend-validator",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "The PHP Unit Testing framework.",
-+            "homepage": "https://phpunit.de/",
-             "keywords": [
--                "validator",
--                "zf2"
-+                "phpunit",
-+                "testing",
-+                "xunit"
-             ],
--            "time": "2015-03-25 20:55:48"
-+            "time": "2019-02-01T05:22:47+00:00"
-         },
-         {
--            "name": "zendframework/zend-view",
--            "version": "2.4.0",
-+            "name": "phpunit/phpunit-mock-objects",
-+            "version": "5.0.10",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-view.git",
--                "reference": "37beb1ad46e530f627b4b6c3716efd728e976ba9"
-+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/37beb1ad46e530f627b4b6c3716efd728e976ba9",
--                "reference": "37beb1ad46e530f627b4b6c3716efd728e976ba9",
-+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
-+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-loader": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "doctrine/instantiator": "^1.0.5",
-+                "php": "^7.0",
-+                "phpunit/php-text-template": "^1.2.1",
-+                "sebastian/exporter": "^3.1"
-+            },
-+            "conflict": {
-+                "phpunit/phpunit": "<6.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-authentication": "self.version",
--                "zendframework/zend-escaper": "self.version",
--                "zendframework/zend-feed": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-http": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-json": "self.version",
--                "zendframework/zend-mvc": "self.version",
--                "zendframework/zend-navigation": "self.version",
--                "zendframework/zend-paginator": "self.version",
--                "zendframework/zend-permissions-acl": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-uri": "self.version"
-+                "phpunit/phpunit": "^6.5.11"
-             },
-             "suggest": {
--                "zendframework/zend-authentication": "Zend\\Authentication component",
--                "zendframework/zend-escaper": "Zend\\Escaper component",
--                "zendframework/zend-feed": "Zend\\Feed component",
--                "zendframework/zend-filter": "Zend\\Filter component",
--                "zendframework/zend-http": "Zend\\Http component",
--                "zendframework/zend-i18n": "Zend\\I18n component",
--                "zendframework/zend-json": "Zend\\Json component",
--                "zendframework/zend-mvc": "Zend\\Mvc component",
--                "zendframework/zend-navigation": "Zend\\Navigation component",
--                "zendframework/zend-paginator": "Zend\\Paginator component",
--                "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
--                "zendframework/zend-uri": "Zend\\Uri component"
-+                "ext-soap": "*"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "5.0.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\View\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides a system of helpers, output filters, and variable escaping",
--            "homepage": "https://github.com/zendframework/zend-view",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "Mock Object library for PHPUnit",
-+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-             "keywords": [
--                "view",
--                "zf2"
-+                "mock",
-+                "xunit"
-             ],
--            "time": "2015-03-25 20:55:48"
--        }
--    ],
--    "packages-dev": [
-+            "abandoned": true,
-+            "time": "2018-08-09T05:50:03+00:00"
-+        },
-         {
--            "name": "doctrine/instantiator",
--            "version": "1.0.4",
-+            "name": "sebastian/code-unit-reverse-lookup",
-+            "version": "1.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/doctrine/instantiator.git",
--                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119"
-+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119",
--                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119",
-+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3,<8.0-DEV"
-+                "php": "^5.6 || ^7.0"
-             },
-             "require-dev": {
--                "athletic/athletic": "~0.1.8",
--                "ext-pdo": "*",
--                "ext-phar": "*",
--                "phpunit/phpunit": "~4.0",
--                "squizlabs/php_codesniffer": "2.0.*@ALPHA"
-+                "phpunit/phpunit": "^5.7 || ^6.0"
-             },
-             "type": "library",
-             "extra": {
-@@ -6173,266 +17705,280 @@
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Doctrine\\Instantiator\\": "src"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Marco Pivetta",
--                    "email": "ocramius@gmail.com",
--                    "homepage": "http://ocramius.github.com/"
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
--            "homepage": "https://github.com/doctrine/instantiator",
--            "keywords": [
--                "constructor",
--                "instantiate"
--            ],
--            "time": "2014-10-13 12:58:55"
-+            "description": "Looks up which function or method a line of code belongs to",
-+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-+            "time": "2017-03-04T06:30:41+00:00"
-         },
-         {
--            "name": "fabpot/php-cs-fixer",
--            "version": "v1.8",
-+            "name": "sebastian/comparator",
-+            "version": "2.1.3",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
--                "reference": "93c723fe0c50ed54292006e7249a4c1173cf5847"
-+                "url": "https://github.com/sebastianbergmann/comparator.git",
-+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/93c723fe0c50ed54292006e7249a4c1173cf5847",
--                "reference": "93c723fe0c50ed54292006e7249a4c1173cf5847",
-+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
-+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
-                 "shasum": ""
-             },
-             "require": {
--                "ext-tokenizer": "*",
--                "php": ">=5.3.6",
--                "sebastian/diff": "~1.1",
--                "symfony/console": "~2.3",
--                "symfony/event-dispatcher": "~2.1",
--                "symfony/filesystem": "~2.1",
--                "symfony/finder": "~2.1",
--                "symfony/process": "~2.3",
--                "symfony/stopwatch": "~2.5"
-+                "php": "^7.0",
-+                "sebastian/diff": "^2.0 || ^3.0",
-+                "sebastian/exporter": "^3.1"
-             },
-             "require-dev": {
--                "satooshi/php-coveralls": "0.7.*@dev"
-+                "phpunit/phpunit": "^6.4"
-             },
--            "bin": [
--                "php-cs-fixer"
--            ],
--            "type": "application",
--            "autoload": {
--                "psr-4": {
--                    "Symfony\\CS\\": "Symfony/CS/"
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.1.x-dev"
-                 }
-             },
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-+                ]
-+            },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Dariusz Rumiński",
--                    "email": "dariusz.ruminski@gmail.com"
-+                    "name": "Jeff Welch",
-+                    "email": "whatthejeff@gmail.com"
-                 },
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
-+                    "name": "Volker Dusch",
-+                    "email": "github@wallbash.com"
-+                },
-+                {
-+                    "name": "Bernhard Schussek",
-+                    "email": "bschussek@2bepublished.at"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "A tool to automatically fix PHP code style",
--            "time": "2015-05-04 17:06:20"
-+            "description": "Provides the functionality to compare PHP values for equality",
-+            "homepage": "https://github.com/sebastianbergmann/comparator",
-+            "keywords": [
-+                "comparator",
-+                "compare",
-+                "equality"
-+            ],
-+            "time": "2018-02-01T13:46:46+00:00"
-         },
-         {
--            "name": "league/climate",
--            "version": "2.6.1",
-+            "name": "sebastian/diff",
-+            "version": "2.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/thephpleague/climate.git",
--                "reference": "28851c909017424f61cc6a62089316313c645d1c"
-+                "url": "https://github.com/sebastianbergmann/diff.git",
-+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/thephpleague/climate/zipball/28851c909017424f61cc6a62089316313c645d1c",
--                "reference": "28851c909017424f61cc6a62089316313c645d1c",
-+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
-+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.4.0"
-+                "php": "^7.0"
-             },
-             "require-dev": {
--                "mockery/mockery": "dev-master",
--                "phpunit/phpunit": "4.1.*"
-+                "phpunit/phpunit": "^6.2"
-             },
-             "type": "library",
--            "autoload": {
--                "psr-4": {
--                    "League\\CLImate\\": "src/"
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.0-dev"
-                 }
-             },
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-+                ]
-+            },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Joe Tannenbaum",
--                    "email": "hey@joe.codes",
--                    "homepage": "http://joe.codes/",
--                    "role": "Developer"
-+                    "name": "Kore Nordmann",
-+                    "email": "mail@kore-nordmann.de"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "PHP's best friend for the terminal. CLImate allows you to easily output colored text, special formats, and more.",
-+            "description": "Diff implementation",
-+            "homepage": "https://github.com/sebastianbergmann/diff",
-             "keywords": [
--                "cli",
--                "colors",
--                "command",
--                "php",
--                "terminal"
-+                "diff"
-             ],
--            "time": "2015-01-18 14:31:58"
-+            "time": "2017-08-03T08:09:46+00:00"
-         },
-         {
--            "name": "lusitanian/oauth",
--            "version": "v0.3.5",
-+            "name": "sebastian/environment",
-+            "version": "3.1.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/Lusitanian/PHPoAuthLib.git",
--                "reference": "ac5a1cd5a4519143728dce2213936eea302edf8a"
-+                "url": "https://github.com/sebastianbergmann/environment.git",
-+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/ac5a1cd5a4519143728dce2213936eea302edf8a",
--                "reference": "ac5a1cd5a4519143728dce2213936eea302edf8a",
-+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.0"
-+                "php": "^7.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "3.7.*",
--                "predis/predis": "0.8.*@dev",
--                "symfony/http-foundation": "~2.1"
--            },
--            "suggest": {
--                "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.",
--                "predis/predis": "Allows using the Redis storage backend.",
--                "symfony/http-foundation": "Allows using the Symfony Session storage backend."
-+                "phpunit/phpunit": "^6.1"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "0.1-dev"
-+                    "dev-master": "3.1.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "OAuth": "src",
--                    "OAuth\\Unit": "tests"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "David Desberg",
--                    "email": "david@daviddesberg.com"
--                },
--                {
--                    "name": "Pieter Hordijk",
--                    "email": "info@pieterhordijk.com"
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "PHP 5.3+ oAuth 1/2 Library",
-+            "description": "Provides functionality to handle HHVM/PHP environments",
-+            "homepage": "http://www.github.com/sebastianbergmann/environment",
-             "keywords": [
--                "Authentication",
--                "authorization",
--                "oauth",
--                "security"
-+                "Xdebug",
-+                "environment",
-+                "hhvm"
-             ],
--            "time": "2014-09-05 15:19:58"
-+            "time": "2017-07-01T08:51:00+00:00"
-         },
-         {
--            "name": "pdepend/pdepend",
--            "version": "2.0.6",
-+            "name": "sebastian/exporter",
-+            "version": "3.1.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/pdepend/pdepend.git",
--                "reference": "a15ffcbfbcc4570d4a733ca7b76e9cac0a56c3f4"
-+                "url": "https://github.com/sebastianbergmann/exporter.git",
-+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/a15ffcbfbcc4570d4a733ca7b76e9cac0a56c3f4",
--                "reference": "a15ffcbfbcc4570d4a733ca7b76e9cac0a56c3f4",
-+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
-+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
-                 "shasum": ""
-             },
-             "require": {
--                "symfony/config": ">=2.4",
--                "symfony/dependency-injection": ">=2.4",
--                "symfony/filesystem": ">=2.4"
-+                "php": "^7.0",
-+                "sebastian/recursion-context": "^3.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "4.*@stable",
--                "squizlabs/php_codesniffer": "@stable"
-+                "ext-mbstring": "*",
-+                "phpunit/phpunit": "^6.0"
-             },
--            "bin": [
--                "src/bin/pdepend"
--            ],
-             "type": "library",
--            "autoload": {
--                "psr-0": {
--                    "PDepend\\": "src/main/php/"
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "3.1.x-dev"
-                 }
-             },
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-+                ]
-+            },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "Official version of pdepend to be handled with Composer",
--            "time": "2015-03-02 08:06:43"
-+            "authors": [
-+                {
-+                    "name": "Jeff Welch",
-+                    "email": "whatthejeff@gmail.com"
-+                },
-+                {
-+                    "name": "Volker Dusch",
-+                    "email": "github@wallbash.com"
-+                },
-+                {
-+                    "name": "Bernhard Schussek",
-+                    "email": "bschussek@2bepublished.at"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                },
-+                {
-+                    "name": "Adam Harvey",
-+                    "email": "aharvey@php.net"
-+                }
-+            ],
-+            "description": "Provides the functionality to export PHP variables for visualization",
-+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-+            "keywords": [
-+                "export",
-+                "exporter"
-+            ],
-+            "time": "2017-04-03T13:19:02+00:00"
-         },
-         {
--            "name": "phpmd/phpmd",
--            "version": "2.2.2",
-+            "name": "sebastian/finder-facade",
-+            "version": "1.2.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/phpmd/phpmd.git",
--                "reference": "7dc4a6b5c07b119ab5da7960b56303fa6855eb84"
-+                "url": "https://github.com/sebastianbergmann/finder-facade.git",
-+                "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/7dc4a6b5c07b119ab5da7960b56303fa6855eb84",
--                "reference": "7dc4a6b5c07b119ab5da7960b56303fa6855eb84",
-+                "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
-+                "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
-                 "shasum": ""
-             },
-             "require": {
--                "pdepend/pdepend": "2.0.*",
--                "php": ">=5.3.0",
--                "symfony/config": ">=2.4",
--                "symfony/dependency-injection": ">=2.4",
--                "symfony/filesystem": ">=2.4"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "*",
--                "squizlabs/php_codesniffer": "*"
-+                "symfony/finder": "~2.3|~3.0|~4.0",
-+                "theseer/fdomdocument": "~1.3"
-             },
--            "bin": [
--                "src/bin/phpmd"
--            ],
--            "type": "project",
-+            "type": "library",
-             "autoload": {
--                "psr-0": {
--                    "PHPMD\\": "src/main/php"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-@@ -6440,63 +17986,42 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Manuel Pichler",
--                    "email": "github@manuel-pichler.de",
--                    "homepage": "https://github.com/manuelpichler",
--                    "role": "Project founder"
--                },
--                {
--                    "name": "Other contributors",
--                    "homepage": "https://github.com/phpmd/phpmd/graphs/contributors",
--                    "role": "Contributors"
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-                 }
-             ],
--            "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
--            "homepage": "http://phpmd.org/",
--            "keywords": [
--                "mess detection",
--                "mess detector",
--                "pdepend",
--                "phpmd",
--                "pmd"
--            ],
--            "time": "2015-03-26 07:47:05"
-+            "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
-+            "homepage": "https://github.com/sebastianbergmann/finder-facade",
-+            "time": "2017-11-18T17:31:49+00:00"
-         },
-         {
--            "name": "phpunit/php-code-coverage",
--            "version": "2.0.16",
-+            "name": "sebastian/global-state",
-+            "version": "2.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
--                "reference": "934fd03eb6840508231a7f73eb8940cf32c3b66c"
-+                "url": "https://github.com/sebastianbergmann/global-state.git",
-+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/934fd03eb6840508231a7f73eb8940cf32c3b66c",
--                "reference": "934fd03eb6840508231a7f73eb8940cf32c3b66c",
-+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3",
--                "phpunit/php-file-iterator": "~1.3",
--                "phpunit/php-text-template": "~1.2",
--                "phpunit/php-token-stream": "~1.3",
--                "sebastian/environment": "~1.0",
--                "sebastian/version": "~1.0"
-+                "php": "^7.0"
-             },
-             "require-dev": {
--                "ext-xdebug": ">=2.1.4",
--                "phpunit/phpunit": "~4"
-+                "phpunit/phpunit": "^6.0"
-             },
-             "suggest": {
--                "ext-dom": "*",
--                "ext-xdebug": ">=2.2.1",
--                "ext-xmlwriter": "*"
-+                "ext-uopz": "*"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.0.x-dev"
-+                    "dev-master": "2.0-dev"
-                 }
-             },
-             "autoload": {
-@@ -6511,177 +18036,182 @@
-             "authors": [
-                 {
-                     "name": "Sebastian Bergmann",
--                    "email": "sb@sebastian-bergmann.de",
--                    "role": "lead"
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
--            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-+            "description": "Snapshotting of global state",
-+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-             "keywords": [
--                "coverage",
--                "testing",
--                "xunit"
-+                "global state"
-             ],
--            "time": "2015-04-11 04:35:00"
-+            "time": "2017-04-27T15:39:26+00:00"
-         },
-         {
--            "name": "phpunit/php-file-iterator",
--            "version": "1.3.4",
-+            "name": "sebastian/object-enumerator",
-+            "version": "3.0.3",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
--                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
-+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
--                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
-+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^7.0",
-+                "sebastian/object-reflector": "^1.1.1",
-+                "sebastian/recursion-context": "^3.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^6.0"
-             },
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "3.0.x-dev"
-+                }
-+            },
-             "autoload": {
-                 "classmap": [
--                    "File/"
-+                    "src/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
--            "include-path": [
--                ""
--            ],
-             "license": [
-                 "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Sebastian Bergmann",
--                    "email": "sb@sebastian-bergmann.de",
--                    "role": "lead"
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
--            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
--            "keywords": [
--                "filesystem",
--                "iterator"
--            ],
--            "time": "2013-10-10 15:34:57"
-+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-+            "time": "2017-08-03T12:35:26+00:00"
-         },
-         {
--            "name": "phpunit/php-text-template",
--            "version": "1.2.0",
-+            "name": "sebastian/object-reflector",
-+            "version": "1.1.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-text-template.git",
--                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
-+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-+                "reference": "773f97c67f28de00d397be301821b06708fca0be"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
--                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
-+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
-+                "reference": "773f97c67f28de00d397be301821b06708fca0be",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^6.0"
-             },
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.1-dev"
-+                }
-+            },
-             "autoload": {
-                 "classmap": [
--                    "Text/"
-+                    "src/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
--            "include-path": [
--                ""
--            ],
-             "license": [
-                 "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
-                     "name": "Sebastian Bergmann",
--                    "email": "sb@sebastian-bergmann.de",
--                    "role": "lead"
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "Simple template engine.",
--            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
--            "keywords": [
--                "template"
--            ],
--            "time": "2014-01-30 17:20:04"
-+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-+            "time": "2017-03-29T09:07:27+00:00"
-         },
-         {
--            "name": "phpunit/php-timer",
--            "version": "1.0.5",
-+            "name": "sebastian/phpcpd",
-+            "version": "3.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-timer.git",
--                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
-+                "url": "https://github.com/sebastianbergmann/phpcpd.git",
-+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
--                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
-+                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564",
-+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^5.6|^7.0",
-+                "phpunit/php-timer": "^1.0.6",
-+                "sebastian/finder-facade": "^1.1",
-+                "sebastian/version": "^1.0|^2.0",
-+                "symfony/console": "^2.7|^3.0|^4.0"
-             },
-+            "bin": [
-+                "phpcpd"
-+            ],
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "3.0-dev"
-+                }
-+            },
-             "autoload": {
-                 "classmap": [
--                    "PHP/"
-+                    "src/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
--            "include-path": [
--                ""
--            ],
-             "license": [
-                 "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
-                     "name": "Sebastian Bergmann",
--                    "email": "sb@sebastian-bergmann.de",
-+                    "email": "sebastian@phpunit.de",
-                     "role": "lead"
-                 }
-             ],
--            "description": "Utility class for timing",
--            "homepage": "https://github.com/sebastianbergmann/php-timer/",
--            "keywords": [
--                "timer"
--            ],
--            "time": "2013-08-02 07:42:54"
-+            "description": "Copy/Paste Detector (CPD) for PHP code.",
-+            "homepage": "https://github.com/sebastianbergmann/phpcpd",
-+            "time": "2017-11-16T08:49:28+00:00"
-         },
-         {
--            "name": "phpunit/php-token-stream",
--            "version": "1.4.1",
-+            "name": "sebastian/recursion-context",
-+            "version": "3.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
--                "reference": "eab81d02569310739373308137284e0158424330"
-+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/eab81d02569310739373308137284e0158424330",
--                "reference": "eab81d02569310739373308137284e0158424330",
-+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                 "shasum": ""
-             },
-             "require": {
--                "ext-tokenizer": "*",
--                "php": ">=5.3.3"
-+                "php": "^7.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.2"
-+                "phpunit/phpunit": "^6.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.4-dev"
-+                    "dev-master": "3.0.x-dev"
-                 }
-             },
-             "autoload": {
-@@ -6694,61 +18224,44 @@
-                 "BSD-3-Clause"
-             ],
-             "authors": [
-+                {
-+                    "name": "Jeff Welch",
-+                    "email": "whatthejeff@gmail.com"
-+                },
-                 {
-                     "name": "Sebastian Bergmann",
-                     "email": "sebastian@phpunit.de"
-+                },
-+                {
-+                    "name": "Adam Harvey",
-+                    "email": "aharvey@php.net"
-                 }
-             ],
--            "description": "Wrapper around PHP's tokenizer extension.",
--            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
--            "keywords": [
--                "tokenizer"
--            ],
--            "time": "2015-04-08 04:46:07"
-+            "description": "Provides functionality to recursively process PHP variables",
-+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-+            "time": "2017-03-03T06:23:57+00:00"
-         },
-         {
--            "name": "phpunit/phpunit",
--            "version": "4.1.0",
-+            "name": "sebastian/resource-operations",
-+            "version": "1.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/phpunit.git",
--                "reference": "efb1b1334605594417a3bd466477772d06d460a8"
-+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/efb1b1334605594417a3bd466477772d06d460a8",
--                "reference": "efb1b1334605594417a3bd466477772d06d460a8",
-+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                 "shasum": ""
-             },
-             "require": {
--                "ext-dom": "*",
--                "ext-json": "*",
--                "ext-pcre": "*",
--                "ext-reflection": "*",
--                "ext-spl": "*",
--                "php": ">=5.3.3",
--                "phpunit/php-code-coverage": "~2.0",
--                "phpunit/php-file-iterator": "~1.3.1",
--                "phpunit/php-text-template": "~1.2",
--                "phpunit/php-timer": "~1.0.2",
--                "phpunit/phpunit-mock-objects": "~2.1",
--                "sebastian/comparator": "~1.0",
--                "sebastian/diff": "~1.1",
--                "sebastian/environment": "~1.0",
--                "sebastian/exporter": "~1.0",
--                "sebastian/version": "~1.0",
--                "symfony/yaml": "~2.0"
--            },
--            "suggest": {
--                "phpunit/php-invoker": "~1.1"
-+                "php": ">=5.6.0"
-             },
--            "bin": [
--                "phpunit"
--            ],
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "4.1.x-dev"
-+                    "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
-@@ -6757,58 +18270,40 @@
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
--            "include-path": [
--                "",
--                "../../symfony/yaml/"
--            ],
-             "license": [
-                 "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
-                     "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de",
--                    "role": "lead"
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "The PHP Unit Testing framework.",
--            "homepage": "http://www.phpunit.de/",
--            "keywords": [
--                "phpunit",
--                "testing",
--                "xunit"
--            ],
--            "time": "2014-05-02 07:13:40"
-+            "description": "Provides a list of PHP built-in functions that operate on resources",
-+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-+            "time": "2015-07-28T20:34:47+00:00"
-         },
-         {
--            "name": "phpunit/phpunit-mock-objects",
--            "version": "2.3.1",
-+            "name": "sebastian/version",
-+            "version": "2.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
--                "reference": "74ffb87f527f24616f72460e54b595f508dccb5c"
-+                "url": "https://github.com/sebastianbergmann/version.git",
-+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/74ffb87f527f24616f72460e54b595f508dccb5c",
--                "reference": "74ffb87f527f24616f72460e54b595f508dccb5c",
-+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                 "shasum": ""
-             },
-             "require": {
--                "doctrine/instantiator": "~1.0,>=1.0.2",
--                "php": ">=5.3.3",
--                "phpunit/php-text-template": "~1.2"
--            },
--            "require-dev": {
--                "phpunit/phpunit": "~4.4"
--            },
--            "suggest": {
--                "ext-soap": "*"
-+                "php": ">=5.6"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3.x-dev"
-+                    "dev-master": "2.0.x-dev"
-                 }
-             },
-             "autoload": {
-@@ -6823,376 +18318,418 @@
-             "authors": [
-                 {
-                     "name": "Sebastian Bergmann",
--                    "email": "sb@sebastian-bergmann.de",
-+                    "email": "sebastian@phpunit.de",
-                     "role": "lead"
-                 }
-             ],
--            "description": "Mock Object library for PHPUnit",
--            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
--            "keywords": [
--                "mock",
--                "xunit"
--            ],
--            "time": "2015-04-02 05:36:41"
-+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-+            "homepage": "https://github.com/sebastianbergmann/version",
-+            "time": "2016-10-03T07:35:21+00:00"
-         },
-         {
--            "name": "sebastian/comparator",
--            "version": "1.1.1",
-+            "name": "squizlabs/php_codesniffer",
-+            "version": "3.3.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/comparator.git",
--                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e"
-+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-+                "reference": "628a481780561150481a9ec74709092b9759b3ec"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e",
--                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e",
-+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/628a481780561150481a9ec74709092b9759b3ec",
-+                "reference": "628a481780561150481a9ec74709092b9759b3ec",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3",
--                "sebastian/diff": "~1.2",
--                "sebastian/exporter": "~1.2"
-+                "ext-simplexml": "*",
-+                "ext-tokenizer": "*",
-+                "ext-xmlwriter": "*",
-+                "php": ">=5.4.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.4"
-+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
-             },
-+            "bin": [
-+                "bin/phpcs",
-+                "bin/phpcbf"
-+            ],
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.1.x-dev"
-+                    "dev-master": "3.x-dev"
-                 }
-             },
--            "autoload": {
--                "classmap": [
--                    "src/"
--                ]
--            },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Jeff Welch",
--                    "email": "whatthejeff@gmail.com"
--                },
--                {
--                    "name": "Volker Dusch",
--                    "email": "github@wallbash.com"
--                },
--                {
--                    "name": "Bernhard Schussek",
--                    "email": "bschussek@2bepublished.at"
--                },
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
-+                    "name": "Greg Sherwood",
-+                    "role": "lead"
-                 }
-             ],
--            "description": "Provides the functionality to compare PHP values for equality",
--            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-+            "homepage": "http://www.squizlabs.com/php-codesniffer",
-             "keywords": [
--                "comparator",
--                "compare",
--                "equality"
-+                "phpcs",
-+                "standards"
-             ],
--            "time": "2015-01-29 16:28:08"
-+            "time": "2018-07-26T23:47:18+00:00"
-         },
-         {
--            "name": "sebastian/diff",
--            "version": "1.3.0",
-+            "name": "symfony/browser-kit",
-+            "version": "v4.2.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/diff.git",
--                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
-+                "url": "https://github.com/symfony/browser-kit.git",
-+                "reference": "61d85c5af2fc058014c7c89504c3944e73a086f0"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
--                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
-+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/61d85c5af2fc058014c7c89504c3944e73a086f0",
-+                "reference": "61d85c5af2fc058014c7c89504c3944e73a086f0",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^7.1.3",
-+                "symfony/dom-crawler": "~3.4|~4.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.2"
-+                "symfony/css-selector": "~3.4|~4.0",
-+                "symfony/process": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/process": ""
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.3-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
--                "classmap": [
--                    "src/"
-+                "psr-4": {
-+                    "Symfony\\Component\\BrowserKit\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Kore Nordmann",
--                    "email": "mail@kore-nordmann.de"
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-                 },
-                 {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Diff implementation",
--            "homepage": "http://www.github.com/sebastianbergmann/diff",
--            "keywords": [
--                "diff"
--            ],
--            "time": "2015-02-22 15:13:53"
-+            "description": "Symfony BrowserKit Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-23T15:17:42+00:00"
-         },
-         {
--            "name": "sebastian/environment",
--            "version": "1.2.2",
-+            "name": "symfony/config",
-+            "version": "v4.2.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/environment.git",
--                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e"
-+                "url": "https://github.com/symfony/config.git",
-+                "reference": "0e745ead307d5dcd4e163e94a47ec04b1428943f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5a8c7d31914337b69923db26c4221b81ff5a196e",
--                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e",
-+                "url": "https://api.github.com/repos/symfony/config/zipball/0e745ead307d5dcd4e163e94a47ec04b1428943f",
-+                "reference": "0e745ead307d5dcd4e163e94a47ec04b1428943f",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^7.1.3",
-+                "symfony/filesystem": "~3.4|~4.0",
-+                "symfony/polyfill-ctype": "~1.8"
-+            },
-+            "conflict": {
-+                "symfony/finder": "<3.4"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.4"
-+                "symfony/dependency-injection": "~3.4|~4.0",
-+                "symfony/event-dispatcher": "~3.4|~4.0",
-+                "symfony/finder": "~3.4|~4.0",
-+                "symfony/yaml": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/yaml": "To use the yaml reference dumper"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.3.x-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
--                "classmap": [
--                    "src/"
-+                "psr-4": {
-+                    "Symfony\\Component\\Config\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Provides functionality to handle HHVM/PHP environments",
--            "homepage": "http://www.github.com/sebastianbergmann/environment",
--            "keywords": [
--                "Xdebug",
--                "environment",
--                "hhvm"
--            ],
--            "time": "2015-01-01 10:01:08"
-+            "description": "Symfony Config Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-04-01T14:03:25+00:00"
-         },
-         {
--            "name": "sebastian/exporter",
--            "version": "1.2.0",
-+            "name": "symfony/contracts",
-+            "version": "v1.0.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/exporter.git",
--                "reference": "84839970d05254c73cde183a721c7af13aede943"
-+                "url": "https://github.com/symfony/contracts.git",
-+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943",
--                "reference": "84839970d05254c73cde183a721c7af13aede943",
-+                "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf",
-+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3",
--                "sebastian/recursion-context": "~1.0"
-+                "php": "^7.1.3"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.4"
-+                "psr/cache": "^1.0",
-+                "psr/container": "^1.0"
-+            },
-+            "suggest": {
-+                "psr/cache": "When using the Cache contracts",
-+                "psr/container": "When using the Service contracts",
-+                "symfony/cache-contracts-implementation": "",
-+                "symfony/service-contracts-implementation": "",
-+                "symfony/translation-contracts-implementation": ""
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.2.x-dev"
-+                    "dev-master": "1.0-dev"
-                 }
-             },
-             "autoload": {
--                "classmap": [
--                    "src/"
-+                "psr-4": {
-+                    "Symfony\\Contracts\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "**/Tests/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Jeff Welch",
--                    "email": "whatthejeff@gmail.com"
--                },
--                {
--                    "name": "Volker Dusch",
--                    "email": "github@wallbash.com"
--                },
--                {
--                    "name": "Bernhard Schussek",
--                    "email": "bschussek@2bepublished.at"
--                },
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-                 },
-                 {
--                    "name": "Adam Harvey",
--                    "email": "aharvey@php.net"
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Provides the functionality to export PHP variables for visualization",
--            "homepage": "http://www.github.com/sebastianbergmann/exporter",
--            "keywords": [
--                "export",
--                "exporter"
-+            "description": "A set of abstractions extracted out of the Symfony components",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "abstractions",
-+                "contracts",
-+                "decoupling",
-+                "interfaces",
-+                "interoperability",
-+                "standards"
-             ],
--            "time": "2015-01-27 07:23:06"
-+            "time": "2018-12-05T08:06:11+00:00"
-         },
-         {
--            "name": "sebastian/recursion-context",
--            "version": "1.0.0",
-+            "name": "symfony/dependency-injection",
-+            "version": "v4.2.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/recursion-context.git",
--                "reference": "3989662bbb30a29d20d9faa04a846af79b276252"
-+                "url": "https://github.com/symfony/dependency-injection.git",
-+                "reference": "1806e43ff6bff57398d33b326cd753a12d9f434f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252",
--                "reference": "3989662bbb30a29d20d9faa04a846af79b276252",
-+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1806e43ff6bff57398d33b326cd753a12d9f434f",
-+                "reference": "1806e43ff6bff57398d33b326cd753a12d9f434f",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^7.1.3",
-+                "psr/container": "^1.0",
-+                "symfony/contracts": "^1.0"
-+            },
-+            "conflict": {
-+                "symfony/config": "<4.2",
-+                "symfony/finder": "<3.4",
-+                "symfony/proxy-manager-bridge": "<3.4",
-+                "symfony/yaml": "<3.4"
-+            },
-+            "provide": {
-+                "psr/container-implementation": "1.0",
-+                "symfony/service-contracts-implementation": "1.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~4.4"
-+                "symfony/config": "~4.2",
-+                "symfony/expression-language": "~3.4|~4.0",
-+                "symfony/yaml": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/config": "",
-+                "symfony/expression-language": "For using expressions in service container configuration",
-+                "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
-+                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-+                "symfony/yaml": ""
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.0.x-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
--                "classmap": [
--                    "src/"
-+                "psr-4": {
-+                    "Symfony\\Component\\DependencyInjection\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Jeff Welch",
--                    "email": "whatthejeff@gmail.com"
--                },
--                {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de"
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-                 },
-                 {
--                    "name": "Adam Harvey",
--                    "email": "aharvey@php.net"
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Provides functionality to recursively process PHP variables",
--            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
--            "time": "2015-01-24 09:48:32"
-+            "description": "Symfony DependencyInjection Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-03-30T15:58:42+00:00"
-         },
-         {
--            "name": "sebastian/version",
--            "version": "1.0.5",
-+            "name": "symfony/dom-crawler",
-+            "version": "v4.2.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sebastianbergmann/version.git",
--                "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4"
-+                "url": "https://github.com/symfony/dom-crawler.git",
-+                "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/ab931d46cd0d3204a91e1b9a40c4bc13032b58e4",
--                "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4",
-+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/53c97769814c80a84a8403efcf3ae7ae966d53bb",
-+                "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb",
-                 "shasum": ""
-             },
-+            "require": {
-+                "php": "^7.1.3",
-+                "symfony/polyfill-ctype": "~1.8",
-+                "symfony/polyfill-mbstring": "~1.0"
-+            },
-+            "require-dev": {
-+                "symfony/css-selector": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/css-selector": ""
-+            },
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-             "autoload": {
--                "classmap": [
--                    "src/"
-+                "psr-4": {
-+                    "Symfony\\Component\\DomCrawler\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Sebastian Bergmann",
--                    "email": "sebastian@phpunit.de",
--                    "role": "lead"
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
--            "homepage": "https://github.com/sebastianbergmann/version",
--            "time": "2015-02-24 06:35:25"
-+            "description": "Symfony DomCrawler Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-23T15:17:42+00:00"
-         },
-         {
--            "name": "sjparkinson/static-review",
--            "version": "4.1.1",
-+            "name": "symfony/http-foundation",
-+            "version": "v4.2.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/sjparkinson/static-review.git",
--                "reference": "493c3410cf146a12fca84209bad126c494e125f0"
-+                "url": "https://github.com/symfony/http-foundation.git",
-+                "reference": "5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/sjparkinson/static-review/zipball/493c3410cf146a12fca84209bad126c494e125f0",
--                "reference": "493c3410cf146a12fca84209bad126c494e125f0",
-+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1",
-+                "reference": "5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1",
-                 "shasum": ""
-             },
-             "require": {
--                "league/climate": "~2.0",
--                "php": ">=5.4.0",
--                "symfony/console": "~2.0",
--                "symfony/process": "~2.0"
-+                "php": "^7.1.3",
-+                "symfony/polyfill-mbstring": "~1.1"
-             },
-             "require-dev": {
--                "mockery/mockery": "~0.9",
--                "phpunit/phpunit": "~4.0",
--                "sensiolabs/security-checker": "~2.0",
--                "squizlabs/php_codesniffer": "~1.0"
-+                "predis/predis": "~1.0",
-+                "symfony/expression-language": "~3.4|~4.0"
-             },
--            "suggest": {
--                "sensiolabs/security-checker": "Required for ComposerSecurityReview.",
--                "squizlabs/php_codesniffer": "Required for PhpCodeSnifferReview."
--            },
--            "bin": [
--                "bin/static-review.php"
--            ],
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-             "autoload": {
-                 "psr-4": {
--                    "StaticReview\\": "src/"
--                }
-+                    "Symfony\\Component\\HttpFoundation\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-@@ -7200,121 +18737,107 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Samuel Parkinson",
--                    "email": "sam.james.parkinson@gmail.com",
--                    "homepage": "http://samp.im"
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "An extendable framework for version control hooks.",
--            "time": "2014-09-22 08:40:36"
-+            "description": "Symfony HttpFoundation Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-03-30T15:58:42+00:00"
-         },
-         {
--            "name": "squizlabs/php_codesniffer",
--            "version": "1.5.3",
-+            "name": "symfony/polyfill-php70",
-+            "version": "v1.11.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
--                "reference": "396178ada8499ec492363587f037125bf7b07fcc"
-+                "url": "https://github.com/symfony/polyfill-php70.git",
-+                "reference": "bc4858fb611bda58719124ca079baff854149c89"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/396178ada8499ec492363587f037125bf7b07fcc",
--                "reference": "396178ada8499ec492363587f037125bf7b07fcc",
-+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89",
-+                "reference": "bc4858fb611bda58719124ca079baff854149c89",
-                 "shasum": ""
-             },
-             "require": {
--                "ext-tokenizer": "*",
--                "php": ">=5.1.2"
--            },
--            "suggest": {
--                "phpunit/php-timer": "dev-master"
-+                "paragonie/random_compat": "~1.0|~2.0|~9.99",
-+                "php": ">=5.3.3"
-             },
--            "bin": [
--                "scripts/phpcs"
--            ],
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-phpcs-fixer": "2.0.x-dev"
-+                    "dev-master": "1.11-dev"
-                 }
-             },
-             "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Php70\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-+                ],
-                 "classmap": [
--                    "CodeSniffer.php",
--                    "CodeSniffer/CLI.php",
--                    "CodeSniffer/Exception.php",
--                    "CodeSniffer/File.php",
--                    "CodeSniffer/Report.php",
--                    "CodeSniffer/Reporting.php",
--                    "CodeSniffer/Sniff.php",
--                    "CodeSniffer/Tokens.php",
--                    "CodeSniffer/Reports/",
--                    "CodeSniffer/CommentParser/",
--                    "CodeSniffer/Tokenizers/",
--                    "CodeSniffer/DocGenerators/",
--                    "CodeSniffer/Standards/AbstractPatternSniff.php",
--                    "CodeSniffer/Standards/AbstractScopeSniff.php",
--                    "CodeSniffer/Standards/AbstractVariableSniff.php",
--                    "CodeSniffer/Standards/IncorrectPatternException.php",
--                    "CodeSniffer/Standards/Generic/Sniffs/",
--                    "CodeSniffer/Standards/MySource/Sniffs/",
--                    "CodeSniffer/Standards/PEAR/Sniffs/",
--                    "CodeSniffer/Standards/PSR1/Sniffs/",
--                    "CodeSniffer/Standards/PSR2/Sniffs/",
--                    "CodeSniffer/Standards/Squiz/Sniffs/",
--                    "CodeSniffer/Standards/Zend/Sniffs/"
-+                    "Resources/stubs"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Greg Sherwood",
--                    "role": "lead"
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
--            "homepage": "http://www.squizlabs.com/php-codesniffer",
-+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-+            "homepage": "https://symfony.com",
-             "keywords": [
--                "phpcs",
--                "standards"
-+                "compatibility",
-+                "polyfill",
-+                "portable",
-+                "shim"
-             ],
--            "time": "2014-05-01 03:07:07"
-+            "time": "2019-02-06T07:57:58+00:00"
-         },
-         {
--            "name": "symfony/config",
--            "version": "v2.6.7",
--            "target-dir": "Symfony/Component/Config",
-+            "name": "symfony/polyfill-php72",
-+            "version": "v1.11.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Config.git",
--                "reference": "b6fddb4aa2daaa2b06f0040071ac131b4a1ecf25"
-+                "url": "https://github.com/symfony/polyfill-php72.git",
-+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Config/zipball/b6fddb4aa2daaa2b06f0040071ac131b4a1ecf25",
--                "reference": "b6fddb4aa2daaa2b06f0040071ac131b4a1ecf25",
-+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c",
-+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3",
--                "symfony/filesystem": "~2.3"
--            },
--            "require-dev": {
--                "symfony/phpunit-bridge": "~2.7"
-+                "php": ">=5.3.3"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.6-dev"
-+                    "dev-master": "1.11-dev"
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Symfony\\Component\\Config\\": ""
--                }
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Php72\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-@@ -7322,60 +18845,55 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-                 },
-                 {
-                     "name": "Symfony Community",
-                     "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Symfony Config Component",
-+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-             "homepage": "https://symfony.com",
--            "time": "2015-05-02 15:18:45"
-+            "keywords": [
-+                "compatibility",
-+                "polyfill",
-+                "portable",
-+                "shim"
-+            ],
-+            "time": "2019-02-06T07:57:58+00:00"
-         },
-         {
--            "name": "symfony/dependency-injection",
--            "version": "v2.6.7",
--            "target-dir": "Symfony/Component/DependencyInjection",
-+            "name": "symfony/stopwatch",
-+            "version": "v4.2.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/DependencyInjection.git",
--                "reference": "b575c160af001d3525ee733085bcc4ec7c8e1b51"
-+                "url": "https://github.com/symfony/stopwatch.git",
-+                "reference": "b1a5f646d56a3290230dbc8edf2a0d62cda23f67"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/b575c160af001d3525ee733085bcc4ec7c8e1b51",
--                "reference": "b575c160af001d3525ee733085bcc4ec7c8e1b51",
-+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b1a5f646d56a3290230dbc8edf2a0d62cda23f67",
-+                "reference": "b1a5f646d56a3290230dbc8edf2a0d62cda23f67",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
--            },
--            "conflict": {
--                "symfony/expression-language": "<2.6"
--            },
--            "require-dev": {
--                "symfony/config": "~2.2",
--                "symfony/expression-language": "~2.6",
--                "symfony/phpunit-bridge": "~2.7",
--                "symfony/yaml": "~2.1"
--            },
--            "suggest": {
--                "symfony/config": "",
--                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
--                "symfony/yaml": ""
-+                "php": "^7.1.3",
-+                "symfony/contracts": "^1.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.6-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Symfony\\Component\\DependencyInjection\\": ""
--                }
-+                "psr-4": {
-+                    "Symfony\\Component\\Stopwatch\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-@@ -7391,50 +18909,50 @@
-                     "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Symfony DependencyInjection Component",
-+            "description": "Symfony Stopwatch Component",
-             "homepage": "https://symfony.com",
--            "time": "2015-05-02 15:18:45"
-+            "time": "2019-01-16T20:31:39+00:00"
-         },
-         {
--            "name": "symfony/event-dispatcher",
--            "version": "v2.6.7",
--            "target-dir": "Symfony/Component/EventDispatcher",
-+            "name": "symfony/yaml",
-+            "version": "v3.4.24",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/EventDispatcher.git",
--                "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02"
-+                "url": "https://github.com/symfony/yaml.git",
-+                "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/672593bc4b0043a0acf91903bb75a1c82d8f2e02",
--                "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02",
-+                "url": "https://api.github.com/repos/symfony/yaml/zipball/212a27b731e5bfb735679d1ffaac82bd6a1dc996",
-+                "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^5.5.9|>=7.0.8",
-+                "symfony/polyfill-ctype": "~1.8"
-+            },
-+            "conflict": {
-+                "symfony/console": "<3.4"
-             },
-             "require-dev": {
--                "psr/log": "~1.0",
--                "symfony/config": "~2.0,>=2.0.5",
--                "symfony/dependency-injection": "~2.6",
--                "symfony/expression-language": "~2.6",
--                "symfony/phpunit-bridge": "~2.7",
--                "symfony/stopwatch": "~2.3"
-+                "symfony/console": "~3.4|~4.0"
-             },
-             "suggest": {
--                "symfony/dependency-injection": "",
--                "symfony/http-kernel": ""
-+                "symfony/console": "For validating YAML files using the lint command"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.6-dev"
-+                    "dev-master": "3.4-dev"
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Symfony\\Component\\EventDispatcher\\": ""
--                }
-+                "psr-4": {
-+                    "Symfony\\Component\\Yaml\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-@@ -7450,80 +18968,110 @@
-                     "homepage": "https://symfony.com/contributors"
-                 }
-             ],
--            "description": "Symfony EventDispatcher Component",
-+            "description": "Symfony Yaml Component",
-             "homepage": "https://symfony.com",
--            "time": "2015-05-02 15:18:45"
-+            "time": "2019-03-25T07:48:46+00:00"
-         },
-         {
--            "name": "symfony/filesystem",
--            "version": "v2.6.7",
--            "target-dir": "Symfony/Component/Filesystem",
-+            "name": "theseer/fdomdocument",
-+            "version": "1.6.6",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Filesystem.git",
--                "reference": "f73904bd2dae525c42ea1f0340c7c98480ecacde"
-+                "url": "https://github.com/theseer/fDOMDocument.git",
-+                "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/f73904bd2dae525c42ea1f0340c7c98480ecacde",
--                "reference": "f73904bd2dae525c42ea1f0340c7c98480ecacde",
-+                "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/6e8203e40a32a9c770bcb62fe37e68b948da6dca",
-+                "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca",
-                 "shasum": ""
-             },
-             "require": {
-+                "ext-dom": "*",
-+                "lib-libxml": "*",
-                 "php": ">=5.3.3"
-             },
--            "require-dev": {
--                "symfony/phpunit-bridge": "~2.7"
--            },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.6-dev"
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Arne Blankerts",
-+                    "email": "arne@blankerts.de",
-+                    "role": "lead"
-                 }
-+            ],
-+            "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
-+            "homepage": "https://github.com/theseer/fDOMDocument",
-+            "time": "2017-06-30T11:53:12+00:00"
-+        },
-+        {
-+            "name": "theseer/tokenizer",
-+            "version": "1.1.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/theseer/tokenizer.git",
-+                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/1c42705be2b6c1de5904f8afacef5895cab44bf8",
-+                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-dom": "*",
-+                "ext-tokenizer": "*",
-+                "ext-xmlwriter": "*",
-+                "php": "^7.0"
-             },
-+            "type": "library",
-             "autoload": {
--                "psr-0": {
--                    "Symfony\\Component\\Filesystem\\": ""
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Arne Blankerts",
-+                    "email": "arne@blankerts.de",
-+                    "role": "Developer"
-                 }
-             ],
--            "description": "Symfony Filesystem Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-05-08 00:09:07"
-+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-+            "time": "2019-04-04T09:56:43+00:00"
-         },
-         {
--            "name": "symfony/stopwatch",
--            "version": "v2.6.7",
--            "target-dir": "Symfony/Component/Stopwatch",
-+            "name": "vlucas/phpdotenv",
-+            "version": "v2.6.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Stopwatch.git",
--                "reference": "b470f87c69837cb71115f1fa720388bb19b63635"
-+                "url": "https://github.com/vlucas/phpdotenv.git",
-+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/b470f87c69837cb71115f1fa720388bb19b63635",
--                "reference": "b470f87c69837cb71115f1fa720388bb19b63635",
-+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
-+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": ">=5.3.9",
-+                "symfony/polyfill-ctype": "^1.9"
-             },
-             "require-dev": {
--                "symfony/phpunit-bridge": "~2.7"
-+                "phpunit/phpunit": "^4.8.35 || ^5.0"
-             },
-             "type": "library",
-             "extra": {
-@@ -7532,58 +19080,60 @@
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Symfony\\Component\\Stopwatch\\": ""
-+                "psr-4": {
-+                    "Dotenv\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Vance Lucas",
-+                    "email": "vance@vancelucas.com",
-+                    "homepage": "http://www.vancelucas.com"
-                 }
-             ],
--            "description": "Symfony Stopwatch Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-05-02 15:18:45"
-+            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
-+            "keywords": [
-+                "dotenv",
-+                "env",
-+                "environment"
-+            ],
-+            "time": "2019-01-29T11:11:52+00:00"
-         },
-         {
--            "name": "symfony/yaml",
--            "version": "v2.6.7",
--            "target-dir": "Symfony/Component/Yaml",
-+            "name": "webmozart/assert",
-+            "version": "1.4.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Yaml.git",
--                "reference": "f157ab074e453ecd4c0fa775f721f6e67a99d9e2"
-+                "url": "https://github.com/webmozart/assert.git",
-+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Yaml/zipball/f157ab074e453ecd4c0fa775f721f6e67a99d9e2",
--                "reference": "f157ab074e453ecd4c0fa775f721f6e67a99d9e2",
-+                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
-+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.3"
-+                "php": "^5.3.3 || ^7.0",
-+                "symfony/polyfill-ctype": "^1.8"
-             },
-             "require-dev": {
--                "symfony/phpunit-bridge": "~2.7"
-+                "phpunit/phpunit": "^4.6",
-+                "sebastian/version": "^1.0.1"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.6-dev"
-+                    "dev-master": "1.3-dev"
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Symfony\\Component\\Yaml\\": ""
-+                "psr-4": {
-+                    "Webmozart\\Assert\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -7592,38 +19142,26 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Bernhard Schussek",
-+                    "email": "bschussek@gmail.com"
-                 }
-             ],
--            "description": "Symfony Yaml Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-05-02 15:18:45"
-+            "description": "Assertions to validate method input/output with nice error messages.",
-+            "keywords": [
-+                "assert",
-+                "check",
-+                "validate"
-+            ],
-+            "time": "2018-12-25T11:19:39+00:00"
-         }
-     ],
-     "aliases": [],
--    "minimum-stability": "alpha",
-+    "minimum-stability": "stable",
-     "stability-flags": {
-         "phpmd/phpmd": 0
-     },
--    "prefer-stable": true,
-+    "prefer-stable": false,
-     "prefer-lowest": false,
-     "platform": [],
--    "platform-dev": {
--        "lib-libxml": "*",
--        "ext-ctype": "*",
--        "ext-gd": "*",
--        "ext-spl": "*",
--        "ext-dom": "*",
--        "ext-simplexml": "*",
--        "ext-mcrypt": "*",
--        "ext-hash": "*",
--        "ext-curl": "*",
--        "ext-iconv": "*",
--        "ext-intl": "*"
--    }
-+    "platform-dev": []
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
-index 48fa6d0d0cd..36a98e6cd95 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
-@@ -1,4677 +1,17821 @@
- {
-     "_readme": [
-         "This file locks the dependencies of your project to a known state",
--        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-+        "Read  more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-         "This file is @generated automatically"
-     ],
--    "hash": "8601c8b464025318475d28dbabf9ee67",
-+    "content-hash": "758832dca53cba659d813c126f37d8a1",
-     "packages": [
-         {
--            "name": "composer/composer",
--            "version": "1.0.0-alpha8",
-+            "name": "amzn/amazon-pay-and-login-magento-2-module",
-+            "version": "3.1.4",
-+            "require": {
-+                "amzn/amazon-pay-and-login-with-amazon-core-module": "3.1.4",
-+                "amzn/amazon-pay-module": "3.1.4",
-+                "amzn/login-with-amazon-module": "3.1.4"
-+            },
-+            "type": "metapackage",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "description": "Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon"
-+        },
-+        {
-+            "name": "amzn/amazon-pay-and-login-with-amazon-core-module",
-+            "version": "3.1.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/amzn/amazon-pay-and-login-with-amazon-core-module/amzn-amazon-pay-and-login-with-amazon-core-module-3.1.4.0.zip",
-+                "reference": null,
-+                "shasum": "1ad5fdd9a997284f005d933b1fead3a746f158bb"
-+            },
-+            "require": {
-+                "amzn/amazon-pay-sdk-php": "^3.2.0",
-+                "magento/framework": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-checkout": "*",
-+                "magento/module-config": "*",
-+                "magento/module-customer": "*",
-+                "magento/module-developer": "*",
-+                "magento/module-payment": "*",
-+                "magento/module-paypal": "*",
-+                "magento/module-quote": "*",
-+                "magento/module-sales": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Amazon\\Core\\": ""
-+                }
-+            },
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "description": "Shared functionality for Amazon Pay and Login with Amazon modules"
-+        },
-+        {
-+            "name": "amzn/amazon-pay-module",
-+            "version": "3.1.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/amzn/amazon-pay-module/amzn-amazon-pay-module-3.1.4.0.zip",
-+                "reference": null,
-+                "shasum": "03cec957586f9e14f0914b58f651c661c509d08d"
-+            },
-+            "require": {
-+                "amzn/amazon-pay-and-login-with-amazon-core-module": "^3.1.4",
-+                "amzn/login-with-amazon-module": "^3.1.4",
-+                "magento/module-backend": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-checkout": "*",
-+                "magento/module-customer": "*",
-+                "magento/module-directory": "*",
-+                "magento/module-eav": "*",
-+                "magento/module-payment": "*",
-+                "magento/module-paypal": "*",
-+                "magento/module-quote": "*",
-+                "magento/module-sales": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-customer": "*",
-+                "magento/module-scalable-checkout": "*",
-+                "magento/module-scalable-oms": "*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Amazon\\Payment\\": ""
-+                }
-+            },
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "description": "Amazon Pay module"
-+        },
-+        {
-+            "name": "amzn/amazon-pay-sdk-php",
-+            "version": "3.4.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/composer/composer.git",
--                "reference": "1eb1df44a97fb2daca1bb8b007f3bee012f0aa46"
-+                "url": "https://github.com/amzn/amazon-pay-sdk-php.git",
-+                "reference": "aff849d831b95469d68708ac1bdb316a56896e4c"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/composer/composer/zipball/1eb1df44a97fb2daca1bb8b007f3bee012f0aa46",
--                "reference": "1eb1df44a97fb2daca1bb8b007f3bee012f0aa46",
-+                "url": "https://api.github.com/repos/amzn/amazon-pay-sdk-php/zipball/aff849d831b95469d68708ac1bdb316a56896e4c",
-+                "reference": "aff849d831b95469d68708ac1bdb316a56896e4c",
-                 "shasum": ""
-             },
-             "require": {
--                "justinrainbow/json-schema": "1.1.*",
--                "php": ">=5.3.2",
--                "seld/jsonlint": "1.*",
--                "symfony/console": "~2.3",
--                "symfony/finder": "~2.2",
--                "symfony/process": "~2.1"
-+                "ext-curl": "*",
-+                "php": ">=5.5.0"
-             },
-             "require-dev": {
--                "phpunit/phpunit": "~3.7.10"
--            },
--            "suggest": {
--                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
--                "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic"
-+                "phpunit/phpunit": "^4"
-             },
--            "bin": [
--                "bin/composer"
--            ],
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.0-dev"
--                }
--            },
-             "autoload": {
--                "psr-0": {
--                    "Composer": "src/"
-+                "psr-4": {
-+                    "AmazonPay\\": "AmazonPay/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "Apache OSL-2"
-             ],
-             "authors": [
-                 {
--                    "name": "Jordi Boggiano",
--                    "email": "j.boggiano@seld.be",
--                    "homepage": "http://seld.be",
--                    "role": "Developer"
--                },
--                {
--                    "name": "Nils Adermann",
--                    "email": "naderman@naderman.de",
--                    "homepage": "http://www.naderman.de",
--                    "role": "Developer"
-+                    "name": "Amazon Pay SDK",
-+                    "email": "amazon-pay-sdk@amazon.com"
-                 }
-             ],
--            "description": "Dependency Manager",
--            "homepage": "http://getcomposer.org/",
-+            "description": "Amazon Pay SDK (PHP)",
-+            "homepage": "https://github.com/amzn/amazon-pay-sdk-php",
-             "keywords": [
--                "autoload",
--                "dependency",
--                "package"
-+                "amazon",
-+                "amazon pay",
-+                "amazon payments",
-+                "pay",
-+                "pay with amazon",
-+                "payment",
-+                "payments"
-             ],
--            "time": "2014-01-06 18:39:59"
-+            "time": "2019-02-11T16:32:17+00:00"
-         },
-         {
--            "name": "justinrainbow/json-schema",
--            "version": "1.1.0",
-+            "name": "amzn/login-with-amazon-module",
-+            "version": "3.1.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/amzn/login-with-amazon-module/amzn-login-with-amazon-module-3.1.4.0.zip",
-+                "reference": null,
-+                "shasum": "d927403b521e59d36d42a29998c774986c65398b"
-+            },
-+            "require": {
-+                "amzn/amazon-pay-and-login-with-amazon-core-module": "^3.1.4",
-+                "magento/module-checkout": "*",
-+                "magento/module-checkout-agreements": "*",
-+                "magento/module-customer": "*",
-+                "magento/module-eav": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-sales": "*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Amazon\\Login\\": ""
-+                }
-+            },
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "description": "Login with Amazon module"
-+        },
-+        {
-+            "name": "bacon/bacon-qr-code",
-+            "version": "1.0.3",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/justinrainbow/json-schema.git",
--                "reference": "05ff6d8d79fe3ad190b0663d80d3f9deee79416c"
-+                "url": "https://github.com/Bacon/BaconQrCode.git",
-+                "reference": "5a91b62b9d37cee635bbf8d553f4546057250bee"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/05ff6d8d79fe3ad190b0663d80d3f9deee79416c",
--                "reference": "05ff6d8d79fe3ad190b0663d80d3f9deee79416c",
-+                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/5a91b62b9d37cee635bbf8d553f4546057250bee",
-+                "reference": "5a91b62b9d37cee635bbf8d553f4546057250bee",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.0"
-+                "ext-iconv": "*",
-+                "php": "^5.4|^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8"
-+            },
-+            "suggest": {
-+                "ext-gd": "to generate QR code images"
-             },
-             "type": "library",
-             "autoload": {
-                 "psr-0": {
--                    "JsonSchema": "src/"
-+                    "BaconQrCode": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "NewBSD"
-+                "BSD-2-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Igor Wiedler",
--                    "email": "igor@wiedler.ch",
--                    "homepage": "http://wiedler.ch/igor/"
--                },
--                {
--                    "name": "Bruno Prieto Reis",
--                    "email": "bruno.p.reis@gmail.com"
-+                    "name": "Ben Scholzen 'DASPRiD'",
-+                    "email": "mail@dasprids.de",
-+                    "homepage": "http://www.dasprids.de",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "BaconQrCode is a QR code generator for PHP.",
-+            "homepage": "https://github.com/Bacon/BaconQrCode",
-+            "time": "2017-10-17T09:59:25+00:00"
-+        },
-+        {
-+            "name": "beberlei/assert",
-+            "version": "v2.9.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/beberlei/assert.git",
-+                "reference": "ec9e4cf0b63890edce844ee3922e2b95a526e936"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/beberlei/assert/zipball/ec9e4cf0b63890edce844ee3922e2b95a526e936",
-+                "reference": "ec9e4cf0b63890edce844ee3922e2b95a526e936",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-mbstring": "*",
-+                "php": ">=5.3"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "^2.1.1",
-+                "phpunit/phpunit": "^4.8.35|^5.7"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Assert\\": "lib/Assert"
-                 },
-+                "files": [
-+                    "lib/Assert/functions.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-2-Clause"
-+            ],
-+            "authors": [
-                 {
--                    "name": "Justin Rainbow",
--                    "email": "justin.rainbow@gmail.com"
-+                    "name": "Benjamin Eberlei",
-+                    "email": "kontakt@beberlei.de",
-+                    "role": "Lead Developer"
-                 },
-                 {
--                    "name": "Robert Schönthal",
--                    "email": "robert.schoenthal@gmail.com",
--                    "homepage": "http://digitalkaoz.net"
-+                    "name": "Richard Quadling",
-+                    "email": "rquadling@gmail.com",
-+                    "role": "Collaborator"
-                 }
-             ],
--            "description": "A library to validate a json schema.",
--            "homepage": "https://github.com/justinrainbow/json-schema",
-+            "description": "Thin assertion library for input validation in business models.",
-             "keywords": [
--                "json",
--                "schema"
-+                "assert",
-+                "assertion",
-+                "validation"
-             ],
--            "time": "2012-01-03 00:33:17"
-+            "time": "2018-06-11T17:15:25+00:00"
-         },
-         {
--            "name": "magento/framework",
--            "version": "0.74.0-beta2",
-+            "name": "braintree/braintree_php",
-+            "version": "3.35.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/braintree/braintree_php.git",
-+                "reference": "6c4388199ce379432804a5c18b88585157ef2ed7"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_framework-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "ebb865d9aae1b48e41706a7d2fe080b7735a1a0c"
-+                "url": "https://api.github.com/repos/braintree/braintree_php/zipball/6c4388199ce379432804a5c18b88585157ef2ed7",
-+                "reference": "6c4388199ce379432804a5c18b88585157ef2ed7",
-+                "shasum": ""
-             },
-             "require": {
-                 "ext-curl": "*",
-                 "ext-dom": "*",
--                "ext-gd": "*",
-                 "ext-hash": "*",
--                "ext-iconv": "*",
--                "ext-mcrypt": "*",
--                "ext-simplexml": "*",
--                "ext-spl": "*",
--                "lib-libxml": "*",
--                "magento/magento-composer-installer": "*",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-openssl": "*",
-+                "ext-xmlwriter": "*",
-+                "php": ">=5.4.0"
-             },
--            "suggest": {
--                "ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library"
--            },
--            "type": "magento2-library",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Framework"
--                    ]
--                ]
-+            "require-dev": {
-+                "phpunit/phpunit": "3.7.*"
-             },
-+            "type": "library",
-             "autoload": {
-+                "psr-0": {
-+                    "Braintree": "lib/"
-+                },
-                 "psr-4": {
--                    "Magento\\Framework\\": ""
-+                    "Braintree\\": "lib/Braintree"
-                 }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Braintree",
-+                    "homepage": "https://www.braintreepayments.com"
-+                }
-+            ],
-+            "description": "Braintree PHP Client Library",
-+            "time": "2018-07-26T14:37:38+00:00"
-         },
-         {
--            "name": "magento/language-de_de",
--            "version": "0.74.0-beta2",
-+            "name": "christian-riesen/base32",
-+            "version": "1.3.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/ChristianRiesen/base32.git",
-+                "reference": "80ff0e3b2124e61b4b39e2535709452f70bff367"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-de_de-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "574416a036e55513a6437b287b77426c291d9051"
-+                "url": "https://api.github.com/repos/ChristianRiesen/base32/zipball/80ff0e3b2124e61b4b39e2535709452f70bff367",
-+                "reference": "80ff0e3b2124e61b4b39e2535709452f70bff367",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*"
-+                "php": ">=5.3"
-             },
--            "type": "magento2-language",
-+            "require-dev": {
-+                "php": ">=5.6",
-+                "phpunit/phpunit": "^5.0",
-+                "satooshi/php-coveralls": "^1.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/de_de"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Base32\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "German (Germany) language"
-+            "authors": [
-+                {
-+                    "name": "Christian Riesen",
-+                    "email": "chris.riesen@gmail.com",
-+                    "homepage": "http://christianriesen.com",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "Base32 encoder/decoder according to RFC 4648",
-+            "homepage": "https://github.com/ChristianRiesen/base32",
-+            "keywords": [
-+                "base32",
-+                "decode",
-+                "encode",
-+                "rfc4648"
-+            ],
-+            "time": "2018-11-02T09:03:50+00:00"
-         },
-         {
--            "name": "magento/language-en_us",
--            "version": "0.74.0-beta2",
-+            "name": "colinmollenhour/cache-backend-file",
-+            "version": "v1.4.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git",
-+                "reference": "184171cc79933a828c3f9b1a1054724cea22a216"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-en_us-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "6246a6a773d86c078bb4f0bc5cee50e2eeab639f"
--            },
--            "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*"
-+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/184171cc79933a828c3f9b1a1054724cea22a216",
-+                "reference": "184171cc79933a828c3f9b1a1054724cea22a216",
-+                "shasum": ""
-             },
--            "type": "magento2-language",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/en_us"
--                    ]
-+            "type": "magento-module",
-+            "autoload": {
-+                "classmap": [
-+                    "File.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "English (United States) language"
-+            "authors": [
-+                {
-+                    "name": "Colin Mollenhour"
-+                }
-+            ],
-+            "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
-+            "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
-+            "time": "2018-04-05T15:28:43+00:00"
-         },
-         {
--            "name": "magento/language-es_es",
--            "version": "0.74.0-beta2",
-+            "name": "colinmollenhour/cache-backend-redis",
-+            "version": "1.10.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git",
-+                "reference": "cc941a5f4cc017e11d3eab9061811ba9583ed6bf"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-es_es-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "da8197a083474993b935bd16d8b001160475b97e"
-+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/cc941a5f4cc017e11d3eab9061811ba9583ed6bf",
-+                "reference": "cc941a5f4cc017e11d3eab9061811ba9583ed6bf",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*"
-+                "magento-hackathon/magento-composer-installer": "*"
-             },
--            "type": "magento2-language",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/es_es"
--                    ]
-+            "type": "magento-module",
-+            "autoload": {
-+                "classmap": [
-+                    "Cm/Cache/Backend/Redis.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "Spanish (Spain) language"
-+            "authors": [
-+                {
-+                    "name": "Colin Mollenhour"
-+                }
-+            ],
-+            "description": "Zend_Cache backend using Redis with full support for tags.",
-+            "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
-+            "time": "2018-09-24T16:02:07+00:00"
-         },
-         {
--            "name": "magento/language-fr_fr",
--            "version": "0.74.0-beta2",
-+            "name": "colinmollenhour/credis",
-+            "version": "1.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/colinmollenhour/credis.git",
-+                "reference": "8ab6db707c821055f9856b8cf76d5f44beb6fd8a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-fr_fr-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "e3d58180b96a709e0b2fb8dccaee95b3be5dadd4"
-+                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/8ab6db707c821055f9856b8cf76d5f44beb6fd8a",
-+                "reference": "8ab6db707c821055f9856b8cf76d5f44beb6fd8a",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*"
-+                "php": ">=5.4.0"
-             },
--            "type": "magento2-language",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/fr_fr"
--                    ]
-+            "type": "library",
-+            "autoload": {
-+                "classmap": [
-+                    "Client.php",
-+                    "Cluster.php",
-+                    "Sentinel.php",
-+                    "Module.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "French (France) language"
-+            "authors": [
-+                {
-+                    "name": "Colin Mollenhour",
-+                    "email": "colin@mollenhour.com"
-+                }
-+            ],
-+            "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
-+            "homepage": "https://github.com/colinmollenhour/credis",
-+            "time": "2018-05-07T14:45:04+00:00"
-         },
-         {
--            "name": "magento/language-nl_nl",
--            "version": "0.74.0-beta2",
-+            "name": "colinmollenhour/php-redis-session-abstract",
-+            "version": "v1.4.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
-+                "reference": "4949ca28b86037abb44984c77bab9d0a4e075643"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-nl_nl-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "d7b29b6275aefa26e7a6d9fb4bcdb62a8ee34332"
-+                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4949ca28b86037abb44984c77bab9d0a4e075643",
-+                "reference": "4949ca28b86037abb44984c77bab9d0a4e075643",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*"
-+                "colinmollenhour/credis": "~1.6",
-+                "php": "^5.5 || ^7.0"
-             },
--            "type": "magento2-language",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/nl_nl"
--                    ]
--                ]
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Cm\\RedisSession\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "Dutch (Netherlands) language"
-+            "authors": [
-+                {
-+                    "name": "Colin Mollenhour"
-+                }
-+            ],
-+            "description": "A Redis-based session handler with optimistic locking",
-+            "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
-+            "time": "2019-03-18T14:43:14+00:00"
-         },
-         {
--            "name": "magento/language-pt_br",
--            "version": "0.74.0-beta2",
-+            "name": "composer/ca-bundle",
-+            "version": "1.1.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/composer/ca-bundle.git",
-+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-pt_br-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "7b6bc50f18adc85d524cc549accd05752beb8858"
-+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
-+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*"
-+                "ext-openssl": "*",
-+                "ext-pcre": "*",
-+                "php": "^5.3.2 || ^7.0"
-             },
--            "type": "magento2-language",
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
-+                "psr/log": "^1.0",
-+                "symfony/process": "^2.5 || ^3.0 || ^4.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/pt_br"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Composer\\CaBundle\\": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "Portuguese (Brazil) language"
-+            "authors": [
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-+                }
-+            ],
-+            "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
-+            "keywords": [
-+                "cabundle",
-+                "cacert",
-+                "certificate",
-+                "ssl",
-+                "tls"
-+            ],
-+            "time": "2019-01-28T09:30:10+00:00"
-         },
-         {
--            "name": "magento/language-zh_cn",
--            "version": "0.74.0-beta2",
-+            "name": "composer/composer",
-+            "version": "1.8.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/composer/composer.git",
-+                "reference": "949b116f9e7d98d8d276594fed74b580d125c0e6"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_language-zh_cn-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "f9a151b4d1bbc6620289e9e91fb8bee023d14c5f"
-+                "url": "https://api.github.com/repos/composer/composer/zipball/949b116f9e7d98d8d276594fed74b580d125c0e6",
-+                "reference": "949b116f9e7d98d8d276594fed74b580d125c0e6",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*"
-+                "composer/ca-bundle": "^1.0",
-+                "composer/semver": "^1.0",
-+                "composer/spdx-licenses": "^1.2",
-+                "composer/xdebug-handler": "^1.1",
-+                "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
-+                "php": "^5.3.2 || ^7.0",
-+                "psr/log": "^1.0",
-+                "seld/jsonlint": "^1.4",
-+                "seld/phar-utils": "^1.0",
-+                "symfony/console": "^2.7 || ^3.0 || ^4.0",
-+                "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
-+                "symfony/finder": "^2.7 || ^3.0 || ^4.0",
-+                "symfony/process": "^2.7 || ^3.0 || ^4.0"
-+            },
-+            "conflict": {
-+                "symfony/console": "2.8.38"
-             },
--            "type": "magento2-language",
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35 || ^5.7",
-+                "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
-+            },
-+            "suggest": {
-+                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
-+                "ext-zip": "Enabling the zip extension allows you to unzip archives",
-+                "ext-zlib": "Allow gzip compression of HTTP requests"
-+            },
-+            "bin": [
-+                "bin/composer"
-+            ],
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "magento/zh_cn"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.8-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Composer\\": "src/Composer"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "Chinese (China) language"
-+            "authors": [
-+                {
-+                    "name": "Nils Adermann",
-+                    "email": "naderman@naderman.de",
-+                    "homepage": "http://www.naderman.de"
-+                },
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-+                }
-+            ],
-+            "description": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.",
-+            "homepage": "https://getcomposer.org/",
-+            "keywords": [
-+                "autoload",
-+                "dependency",
-+                "package"
-+            ],
-+            "time": "2019-04-09T15:46:48+00:00"
-         },
-         {
--            "name": "magento/magento-composer-installer",
--            "version": "dev-master",
-+            "name": "composer/semver",
-+            "version": "1.5.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/magento/magento-composer-installer.git",
--                "reference": "7f03451f71e55d52c2bb07325d56a4e6df322f30"
-+                "url": "https://github.com/composer/semver.git",
-+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/7f03451f71e55d52c2bb07325d56a4e6df322f30",
--                "reference": "7f03451f71e55d52c2bb07325d56a4e6df322f30",
-+                "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
-+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
-                 "shasum": ""
-             },
-             "require": {
--                "composer-plugin-api": "1.0.0"
-+                "php": "^5.3.2 || ^7.0"
-             },
-             "require-dev": {
--                "composer/composer": "*@dev",
--                "firegento/phpcs": "dev-patch-1",
--                "mikey179/vfsstream": "*",
--                "phpunit/phpunit": "*",
--                "phpunit/phpunit-mock-objects": "dev-master",
--                "squizlabs/php_codesniffer": "1.4.7",
--                "symfony/process": "*"
-+                "phpunit/phpunit": "^4.5 || ^5.0.5",
-+                "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
-             },
--            "type": "composer-plugin",
-+            "type": "library",
-             "extra": {
--                "composer-command-registry": [
--                    "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand"
--                ],
--                "class": "MagentoHackathon\\Composer\\Magento\\Plugin"
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-             },
-             "autoload": {
--                "psr-0": {
--                    "MagentoHackathon\\Composer\\Magento": "src/"
-+                "psr-4": {
-+                    "Composer\\Semver\\": "src"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0"
-+                "MIT"
-             ],
-             "authors": [
-                 {
--                    "name": "Vinai Kopp",
--                    "email": "vinai@netzarbeiter.com"
-+                    "name": "Nils Adermann",
-+                    "email": "naderman@naderman.de",
-+                    "homepage": "http://www.naderman.de"
-                 },
-                 {
--                    "name": "Daniel Fahlke aka Flyingmana",
--                    "email": "flyingmana@googlemail.com"
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-                 },
-                 {
--                    "name": "Jörg Weller",
--                    "email": "weller@flagbit.de"
--                },
-+                    "name": "Rob Bast",
-+                    "email": "rob.bast@gmail.com",
-+                    "homepage": "http://robbast.nl"
-+                }
-+            ],
-+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
-+            "keywords": [
-+                "semantic",
-+                "semver",
-+                "validation",
-+                "versioning"
-+            ],
-+            "time": "2019-03-19T17:25:45+00:00"
-+        },
-+        {
-+            "name": "composer/spdx-licenses",
-+            "version": "1.5.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/composer/spdx-licenses.git",
-+                "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
-+                "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.3.2 || ^7.0 || ^8.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Composer\\Spdx\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-                 {
--                    "name": "Karl Spies",
--                    "email": "karl.spies@gmx.net"
-+                    "name": "Nils Adermann",
-+                    "email": "naderman@naderman.de",
-+                    "homepage": "http://www.naderman.de"
-                 },
-                 {
--                    "name": "Tobias Vogt",
--                    "email": "tobi@webguys.de"
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-                 },
-                 {
--                    "name": "David Fuhr",
--                    "email": "fuhr@flagbit.de"
-+                    "name": "Rob Bast",
-+                    "email": "rob.bast@gmail.com",
-+                    "homepage": "http://robbast.nl"
-                 }
-             ],
--            "description": "Composer installer for Magento modules",
--            "homepage": "https://github.com/magento/magento-composer-installer",
-+            "description": "SPDX licenses list and validation library.",
-             "keywords": [
--                "composer-installer",
--                "magento"
-+                "license",
-+                "spdx",
-+                "validator"
-             ],
--            "time": "2015-03-05 21:40:30"
-+            "time": "2019-03-26T10:23:26+00:00"
-         },
-         {
--            "name": "magento/magento2-base",
--            "version": "0.74.0-beta2",
-+            "name": "composer/xdebug-handler",
-+            "version": "1.3.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/composer/xdebug-handler.git",
-+                "reference": "d17708133b6c276d6e42ef887a877866b909d892"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_magento2-base-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "be10c634940670ff0cecf5f952f57891c626c652"
-+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/d17708133b6c276d6e42ef887a877866b909d892",
-+                "reference": "d17708133b6c276d6e42ef887a877866b909d892",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/magento-composer-installer": "*"
-+                "php": "^5.3.2 || ^7.0",
-+                "psr/log": "^1.0"
-             },
--            "replace": {
--                "blueimp/jquery-file-upload": "5.6.14",
--                "colinmollenhour/cache-backend-redis": "dev-master#193d377b7fb2e88595578b282fa01a62d1185abc",
--                "colinmollenhour/credis": "dev-master#f07bbfd4117294f462f0fb19c49221d350bf396f",
--                "components/jquery": "1.11.0",
--                "components/jqueryui": "1.10.4",
--                "linkorb/jsmin-php": "1.1.2",
--                "tinymce/tinymce": "3.4.7",
--                "trentrichardson/jquery-timepicker-addon": "1.4.3",
--                "twbs/bootstrap": "3.1.0"
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
-             },
--            "type": "magento2-component",
--            "extra": {
--                "component_paths": {
--                    "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js",
--                    "colinmollenhour/cache-backend-redis": "lib/internal/Cm/Cache/Backend/Redis.php",
--                    "colinmollenhour/credis": "lib/internal/Credis",
--                    "linkorb/jsmin-php": "lib/internal/JSMin",
--                    "components/jquery": [
--                        "lib/web/jquery.js",
--                        "lib/web/jquery/jquery.min.js",
--                        "lib/web/jquery/jquery-migrate.js",
--                        "lib/web/jquery/jquery-migrate.min.js"
--                    ],
--                    "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader",
--                    "components/jqueryui": [
--                        "lib/web/jquery/jquery-ui.js",
--                        "lib/web/jquery/jquery-ui.min.js"
--                    ],
--                    "twbs/bootstrap": [
--                        "lib/web/jquery/jquery.tabs.js"
--                    ],
--                    "tinymce/tinymce": "lib/web/tiny_mce"
--                },
--                "map": [
--                    [
--                        "lib/internal/Cm",
--                        "lib/internal/Cm"
--                    ],
--                    [
--                        "lib/internal/LinLibertineFont",
--                        "lib/internal/LinLibertineFont"
--                    ],
--                    [
--                        "lib/internal/Credis",
--                        "lib/internal/Credis"
--                    ],
--                    [
--                        "lib/internal/CardinalCommerce",
--                        "lib/internal/CardinalCommerce"
--                    ],
--                    [
--                        "lib/internal/JSMin",
--                        "lib/internal/JSMin"
--                    ],
--                    [
--                        "lib/.htaccess",
--                        "lib/.htaccess"
--                    ],
--                    [
--                        "lib/web/lib",
--                        "lib/web/lib"
--                    ],
--                    [
--                        "lib/web/requirejs",
--                        "lib/web/requirejs"
--                    ],
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Composer\\XdebugHandler\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "John Stevenson",
-+                    "email": "john-stevenson@blueyonder.co.uk"
-+                }
-+            ],
-+            "description": "Restarts a process without xdebug.",
-+            "keywords": [
-+                "Xdebug",
-+                "performance"
-+            ],
-+            "time": "2019-01-28T20:25:53+00:00"
-+        },
-+        {
-+            "name": "container-interop/container-interop",
-+            "version": "1.2.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/container-interop/container-interop.git",
-+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "psr/container": "^1.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Interop\\Container\\": "src/Interop/Container/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-+            "homepage": "https://github.com/container-interop/container-interop",
-+            "time": "2017-02-14T19:40:03+00:00"
-+        },
-+        {
-+            "name": "donatj/phpuseragentparser",
-+            "version": "v0.13.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/donatj/PhpUserAgent.git",
-+                "reference": "5f2da266d2a386f9b231d4344ae37baf7a467c2d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/donatj/PhpUserAgent/zipball/5f2da266d2a386f9b231d4344ae37baf7a467c2d",
-+                "reference": "5f2da266d2a386f9b231d4344ae37baf7a467c2d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0"
-+            },
-+            "require-dev": {
-+                "camspiers/json-pretty": "0.1.*",
-+                "donatj/drop": "*",
-+                "phpunit/phpunit": "~4.8"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "src/UserAgentParser.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jesse G. Donat",
-+                    "email": "donatj@gmail.com",
-+                    "homepage": "http://donatstudios.com",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "Lightning fast, minimalist PHP UserAgent string parser.",
-+            "homepage": "http://donatstudios.com/PHP-Parser-HTTP_USER_AGENT",
-+            "keywords": [
-+                "browser",
-+                "browser detection",
-+                "parser",
-+                "user agent",
-+                "useragent"
-+            ],
-+            "time": "2019-03-08T20:52:23+00:00"
-+        },
-+        {
-+            "name": "dotmailer/dotmailer-magento2-extension",
-+            "version": "3.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/dotmailer/dotmailer-magento2-extension/dotmailer-dotmailer-magento2-extension-3.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "2ede8827f7faacf72f6bc2004f9d4325f61cbd3f"
-+            },
-+            "require": {
-+                "magento/framework": ">=100 <103",
-+                "magento/module-backend": ">=100 <102",
-+                "magento/module-catalog": ">=101 <104",
-+                "magento/module-catalog-inventory": "100.*",
-+                "magento/module-catalog-rule": ">=100 <102",
-+                "magento/module-checkout": "100.*",
-+                "magento/module-config": ">=100 <103",
-+                "magento/module-cron": "100.*",
-+                "magento/module-customer": ">=100 <103",
-+                "magento/module-directory": "100.*",
-+                "magento/module-eav": ">=100 <103",
-+                "magento/module-email": ">=100 <102",
-+                "magento/module-newsletter": "100.*",
-+                "magento/module-payment": "100.*",
-+                "magento/module-product-alert": "100.*",
-+                "magento/module-quote": ">=100 <102",
-+                "magento/module-reports": "100.*",
-+                "magento/module-review": ">=100 <102",
-+                "magento/module-sales": ">=100 <103",
-+                "magento/module-sales-rule": ">=100 <102",
-+                "magento/module-send-friend": "100.*",
-+                "magento/module-shipping": "100.*",
-+                "magento/module-store": ">=100 <102",
-+                "magento/module-ui": ">=100 <102",
-+                "magento/module-user": ">=100 <102",
-+                "magento/module-wishlist": ">=100 <102"
-+            },
-+            "require-dev": {
-+                "magento/marketplace-eqp": "dev-master",
-+                "phpmd/phpmd": "@stable",
-+                "squizlabs/php_codesniffer": "@stable"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Dotdigitalgroup\\Email\\": ""
-+                }
-+            },
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Calin Diacon",
-+                    "email": "calin.diacon@dotmailer.com"
-+                },
-+                {
-+                    "name": "Adeel Qamar",
-+                    "email": "adeel.qamar@dotmailer.com"
-+                },
-+                {
-+                    "name": "Zygimantas",
-+                    "email": "zygimantas.simkus@dotmailer.com"
-+                }
-+            ],
-+            "description": "dotmailer integration for magento 2"
-+        },
-+        {
-+            "name": "elasticsearch/elasticsearch",
-+            "version": "v6.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/elastic/elasticsearch-php.git",
-+                "reference": "b237a37b2cdf23a5a17fd3576cdea771394ad00d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/b237a37b2cdf23a5a17fd3576cdea771394ad00d",
-+                "reference": "b237a37b2cdf23a5a17fd3576cdea771394ad00d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-json": ">=1.3.7",
-+                "guzzlehttp/ringphp": "~1.0",
-+                "php": "^7.0",
-+                "psr/log": "~1.0"
-+            },
-+            "require-dev": {
-+                "cpliakas/git-wrapper": "~1.0",
-+                "doctrine/inflector": "^1.1",
-+                "mockery/mockery": "0.9.4",
-+                "phpstan/phpstan-shim": "0.8.3",
-+                "phpunit/phpunit": "6.3.0",
-+                "squizlabs/php_codesniffer": "3.0.2",
-+                "symfony/finder": "^2.8",
-+                "symfony/yaml": "^2.8"
-+            },
-+            "suggest": {
-+                "ext-curl": "*",
-+                "monolog/monolog": "Allows for client-level logging and tracing"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Elasticsearch\\": "src/Elasticsearch/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Zachary Tong"
-+                }
-+            ],
-+            "description": "PHP Client for Elasticsearch",
-+            "keywords": [
-+                "client",
-+                "elasticsearch",
-+                "search"
-+            ],
-+            "time": "2019-01-08T18:53:46+00:00"
-+        },
-+        {
-+            "name": "endroid/qr-code",
-+            "version": "2.5.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/endroid/qr-code.git",
-+                "reference": "a9a57ab57ac75928fcdcfb2a71179963ff6fe573"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/endroid/qr-code/zipball/a9a57ab57ac75928fcdcfb2a71179963ff6fe573",
-+                "reference": "a9a57ab57ac75928fcdcfb2a71179963ff6fe573",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "bacon/bacon-qr-code": "^1.0.3",
-+                "ext-gd": "*",
-+                "khanamiryan/qrcode-detector-decoder": "^1.0",
-+                "myclabs/php-enum": "^1.5",
-+                "php": ">=5.6",
-+                "symfony/options-resolver": ">=2.7",
-+                "symfony/property-access": ">=2.7"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": ">=5.7",
-+                "symfony/asset": ">=2.7",
-+                "symfony/browser-kit": ">=2.7",
-+                "symfony/finder": ">=2.7",
-+                "symfony/framework-bundle": ">=2.7",
-+                "symfony/http-kernel": ">=2.7",
-+                "symfony/templating": ">=2.7",
-+                "symfony/yaml": ">=2.7"
-+            },
-+            "type": "symfony-bundle",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Endroid\\QrCode\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jeroen van den Enden",
-+                    "email": "info@endroid.nl",
-+                    "homepage": "http://endroid.nl/"
-+                }
-+            ],
-+            "description": "Endroid QR Code",
-+            "homepage": "https://github.com/endroid/QrCode",
-+            "keywords": [
-+                "bundle",
-+                "code",
-+                "endroid",
-+                "flex",
-+                "qr",
-+                "qrcode",
-+                "symfony"
-+            ],
-+            "time": "2017-10-22T18:56:00+00:00"
-+        },
-+        {
-+            "name": "google/recaptcha",
-+            "version": "1.2.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/google/recaptcha.git",
-+                "reference": "e7add3be59211482ecdb942288f52da64a35f61a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/google/recaptcha/zipball/e7add3be59211482ecdb942288f52da64a35f61a",
-+                "reference": "e7add3be59211482ecdb942288f52da64a35f61a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.5"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "^2.2.20|^2.12",
-+                "php-coveralls/php-coveralls": "^2.1",
-+                "phpunit/phpunit": "^4.8.36|^5.7.27|^6.59|^7"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "ReCaptcha\\": "src/ReCaptcha"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Client library for reCAPTCHA, a free service that protects websites from spam and abuse.",
-+            "homepage": "https://www.google.com/recaptcha/",
-+            "keywords": [
-+                "Abuse",
-+                "captcha",
-+                "recaptcha",
-+                "spam"
-+            ],
-+            "time": "2018-08-05T09:31:53+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/guzzle",
-+            "version": "6.3.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/guzzle.git",
-+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "guzzlehttp/promises": "^1.0",
-+                "guzzlehttp/psr7": "^1.4",
-+                "php": ">=5.5"
-+            },
-+            "require-dev": {
-+                "ext-curl": "*",
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-+                "psr/log": "^1.0"
-+            },
-+            "suggest": {
-+                "psr/log": "Required for using the Log middleware"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "6.3-dev"
-+                }
-+            },
-+            "autoload": {
-+                "files": [
-+                    "src/functions_include.php"
-+                ],
-+                "psr-4": {
-+                    "GuzzleHttp\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                }
-+            ],
-+            "description": "Guzzle is a PHP HTTP client library",
-+            "homepage": "http://guzzlephp.org/",
-+            "keywords": [
-+                "client",
-+                "curl",
-+                "framework",
-+                "http",
-+                "http client",
-+                "rest",
-+                "web service"
-+            ],
-+            "time": "2018-04-22T15:46:56+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/promises",
-+            "version": "v1.3.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/promises.git",
-+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.5.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.4-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "GuzzleHttp\\Promise\\": "src/"
-+                },
-+                "files": [
-+                    "src/functions_include.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                }
-+            ],
-+            "description": "Guzzle promises library",
-+            "keywords": [
-+                "promise"
-+            ],
-+            "time": "2016-12-20T10:07:11+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/psr7",
-+            "version": "1.5.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/psr7.git",
-+                "reference": "9f83dded91781a01c63574e387eaa769be769115"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
-+                "reference": "9f83dded91781a01c63574e387eaa769be769115",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.4.0",
-+                "psr/http-message": "~1.0",
-+                "ralouphie/getallheaders": "^2.0.5"
-+            },
-+            "provide": {
-+                "psr/http-message-implementation": "1.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.5-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "GuzzleHttp\\Psr7\\": "src/"
-+                },
-+                "files": [
-+                    "src/functions_include.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                },
-+                {
-+                    "name": "Tobias Schultze",
-+                    "homepage": "https://github.com/Tobion"
-+                }
-+            ],
-+            "description": "PSR-7 message implementation that also provides common utility methods",
-+            "keywords": [
-+                "http",
-+                "message",
-+                "psr-7",
-+                "request",
-+                "response",
-+                "stream",
-+                "uri",
-+                "url"
-+            ],
-+            "time": "2018-12-04T20:46:45+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/ringphp",
-+            "version": "1.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/RingPHP.git",
-+                "reference": "5e2a174052995663dd68e6b5ad838afd47dd615b"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/5e2a174052995663dd68e6b5ad838afd47dd615b",
-+                "reference": "5e2a174052995663dd68e6b5ad838afd47dd615b",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "guzzlehttp/streams": "~3.0",
-+                "php": ">=5.4.0",
-+                "react/promise": "~2.0"
-+            },
-+            "require-dev": {
-+                "ext-curl": "*",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "suggest": {
-+                "ext-curl": "Guzzle will use specific adapters if cURL is present"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "GuzzleHttp\\Ring\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                }
-+            ],
-+            "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
-+            "time": "2018-07-31T13:22:33+00:00"
-+        },
-+        {
-+            "name": "guzzlehttp/streams",
-+            "version": "3.0.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/guzzle/streams.git",
-+                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
-+                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.4.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "3.0-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "GuzzleHttp\\Stream\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Michael Dowling",
-+                    "email": "mtdowling@gmail.com",
-+                    "homepage": "https://github.com/mtdowling"
-+                }
-+            ],
-+            "description": "Provides a simple abstraction over streams of data",
-+            "homepage": "http://guzzlephp.org/",
-+            "keywords": [
-+                "Guzzle",
-+                "stream"
-+            ],
-+            "time": "2014-10-12T19:18:40+00:00"
-+        },
-+        {
-+            "name": "justinrainbow/json-schema",
-+            "version": "5.2.8",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/justinrainbow/json-schema.git",
-+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4",
-+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "~2.2.20",
-+                "json-schema/json-schema-test-suite": "1.2.0",
-+                "phpunit/phpunit": "^4.8.35"
-+            },
-+            "bin": [
-+                "bin/validate-json"
-+            ],
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "5.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "JsonSchema\\": "src/JsonSchema/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Bruno Prieto Reis",
-+                    "email": "bruno.p.reis@gmail.com"
-+                },
-+                {
-+                    "name": "Justin Rainbow",
-+                    "email": "justin.rainbow@gmail.com"
-+                },
-+                {
-+                    "name": "Igor Wiedler",
-+                    "email": "igor@wiedler.ch"
-+                },
-+                {
-+                    "name": "Robert Schönthal",
-+                    "email": "seroscho@googlemail.com"
-+                }
-+            ],
-+            "description": "A library to validate a json schema.",
-+            "homepage": "https://github.com/justinrainbow/json-schema",
-+            "keywords": [
-+                "json",
-+                "schema"
-+            ],
-+            "time": "2019-01-14T23:55:14+00:00"
-+        },
-+        {
-+            "name": "khanamiryan/qrcode-detector-decoder",
-+            "version": "1.0.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/khanamiryan/php-qrcode-detector-decoder.git",
-+                "reference": "a75482d3bc804e3f6702332bfda6cccbb0dfaa76"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/khanamiryan/php-qrcode-detector-decoder/zipball/a75482d3bc804e3f6702332bfda6cccbb0dfaa76",
-+                "reference": "a75482d3bc804e3f6702332bfda6cccbb0dfaa76",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6|^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Zxing\\": "lib/"
-+                },
-+                "files": [
-+                    "lib/Common/customFunctions.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Ashot Khanamiryan",
-+                    "email": "a.khanamiryan@gmail.com",
-+                    "homepage": "https://github.com/khanamiryan",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "QR code decoder / reader",
-+            "homepage": "https://github.com/khanamiryan/php-qrcode-detector-decoder/",
-+            "keywords": [
-+                "barcode",
-+                "qr",
-+                "zxing"
-+            ],
-+            "time": "2018-04-26T11:41:33+00:00"
-+        },
-+        {
-+            "name": "klarna/m2-payments",
-+            "version": "7.1.0",
-+            "require": {
-+                "klarna/module-core": "5.1.0",
-+                "klarna/module-kp": "6.1.0",
-+                "klarna/module-ordermanagement": "5.0.3"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "~2.10.1",
-+                "jakub-onderka/php-console-highlighter": "^0.3.2",
-+                "jakub-onderka/php-parallel-lint": "^0.9.2",
-+                "lusitanian/oauth": "~0.8.10",
-+                "magento-ecg/coding-standard": "^3.1",
-+                "mikey179/vfsstream": "^1.6",
-+                "pdepend/pdepend": "^2.5",
-+                "phploc/phploc": "^4.0",
-+                "phpmd/phpmd": "@stable",
-+                "phpro/grumphp": "^0.14",
-+                "phpunit/phpunit": "~6.2.0",
-+                "sebastian/phpcpd": "~3.0.0",
-+                "squizlabs/php_codesniffer": "^3.2",
-+                "theseer/phpdox": "^0.10.1"
-+            },
-+            "type": "metapackage",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "description": "Klarna Payments for Magento 2 (CE & EE)"
-+        },
-+        {
-+            "name": "klarna/module-core",
-+            "version": "5.1.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/klarna/module-core/klarna-module-core-5.1.0.0.zip",
-+                "reference": null,
-+                "shasum": "050cc44c0077880e6a364e93f60d607cfd33c813"
-+            },
-+            "require": {
-+                "guzzlehttp/guzzle": "^6.0",
-+                "magento/framework": "^100.1||^101.0||^102.0",
-+                "magento/module-bundle": "^100.1",
-+                "magento/module-catalog": "^102.0||^103.0",
-+                "magento/module-config": "^101.0||^102.0",
-+                "magento/module-customer": "^101.0||^102.0",
-+                "magento/module-directory": "^100.1",
-+                "magento/module-payment": "^100.2",
-+                "magento/module-quote": "^101.0",
-+                "magento/module-sales": "^101.0||^102.0",
-+                "magento/module-store": "^100.1||^101.0",
-+                "magento/module-tax": "^100.1",
-+                "php": "~7.0.13|~7.1.0|~7.2.0",
-+                "psr/log": "^1.0",
-+                "ramsey/uuid": "3.6.1||^3.7"
-+            },
-+            "conflict": {
-+                "magento/module-payment": "100.0.8 || 100.1.3"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "~2.10.1",
-+                "jakub-onderka/php-console-highlighter": "^0.3.2",
-+                "jakub-onderka/php-parallel-lint": "^0.9.2",
-+                "lusitanian/oauth": "~0.8.10",
-+                "magento-ecg/coding-standard": "^3.1",
-+                "mikey179/vfsstream": "^1.6",
-+                "pdepend/pdepend": "^2.5",
-+                "phploc/phploc": "^4.0",
-+                "phpmd/phpmd": "@stable",
-+                "phpro/grumphp": "^0.14",
-+                "phpunit/phpunit": "~6.2.0",
-+                "sebastian/phpcpd": "~3.0",
-+                "squizlabs/php_codesniffer": "^3.2",
-+                "theseer/phpdox": "^0.10.1"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "psr-4": {
-+                    "Klarna\\Core\\": "."
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Joe Constant",
-+                    "email": "joe.constant@klarna.com"
-+                },
-+                {
-+                    "name": "Jason Grim",
-+                    "email": "jason.grim@klarna.com"
-+                },
-+                {
-+                    "name": "Fei Chen",
-+                    "email": "fei.chen@klarna.com"
-+                }
-+            ],
-+            "description": "Klarna Core Magento 2 Extension"
-+        },
-+        {
-+            "name": "klarna/module-kp",
-+            "version": "6.1.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/klarna/module-kp/klarna-module-kp-6.1.0.0.zip",
-+                "reference": null,
-+                "shasum": "cf1911ce01da43e226fced1d3d72baec66875393"
-+            },
-+            "require": {
-+                "klarna/module-core": "^4.0||^5.0",
-+                "klarna/module-ordermanagement": "^4.0||^5.0",
-+                "magento/framework": "^100.1||^101.0||^102.0",
-+                "magento/module-checkout": "^100.1",
-+                "magento/module-customer": "^100.1||^101.0||^102.0",
-+                "magento/module-directory": "^100.1",
-+                "magento/module-payment": "^100.1",
-+                "magento/module-quote": "^100.1||^101.0",
-+                "magento/module-sales": "^100.1||^101.0||^102.0",
-+                "magento/module-store": "^100.1||^101.0",
-+                "php": "~7.0.13|~7.1.0|~7.2.0"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "~2.10.1",
-+                "jakub-onderka/php-console-highlighter": "^0.3.2",
-+                "jakub-onderka/php-parallel-lint": "^0.9.2",
-+                "lusitanian/oauth": "~0.8.10",
-+                "magento-ecg/coding-standard": "^3.1",
-+                "magento/framework": "^101.0.0",
-+                "mikey179/vfsstream": "^1.6",
-+                "pdepend/pdepend": "^2.5",
-+                "phploc/phploc": "^4.0",
-+                "phpmd/phpmd": "@stable",
-+                "phpro/grumphp": "^0.14",
-+                "phpunit/phpunit": "~6.2.0",
-+                "sebastian/phpcpd": "~3.0",
-+                "squizlabs/php_codesniffer": "^3.2",
-+                "theseer/phpdox": "^0.10.1"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "psr-4": {
-+                    "Klarna\\Kp\\": ""
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Joe Constant",
-+                    "email": "joe.constant@klarna.com"
-+                },
-+                {
-+                    "name": "Jason Grim",
-+                    "email": "jason.grim@klarna.com"
-+                },
-+                {
-+                    "name": "Fei Chen",
-+                    "email": "fei.chen@klarna.com"
-+                },
-+                {
-+                    "name": "Dario Kassler",
-+                    "email": "dario.kassler@klarna.com"
-+                }
-+            ],
-+            "description": "Klarna Payments Magento 2 Extension"
-+        },
-+        {
-+            "name": "klarna/module-ordermanagement",
-+            "version": "5.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/klarna/module-ordermanagement/klarna-module-ordermanagement-5.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "5a73ab885349d4c7f9a56dc9465c4ff712e808ca"
-+            },
-+            "require": {
-+                "klarna/module-core": "^4.0||^5.0",
-+                "magento/framework": "^102.0",
-+                "magento/module-payment": "^100.1",
-+                "magento/module-quote": "^100.1||^101.0||^102.0",
-+                "magento/module-sales": "^100.1||^101.0||^102.0",
-+                "magento/module-store": "^100.1||^101.0",
-+                "php": "~7.1.0|~7.2.0"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "~2.10.1",
-+                "jakub-onderka/php-console-highlighter": "^0.3.2",
-+                "jakub-onderka/php-parallel-lint": "^0.9.2",
-+                "lusitanian/oauth": "~0.8.10",
-+                "magento-ecg/coding-standard": "^3.1",
-+                "magento/framework": "^101.0.0",
-+                "mikey179/vfsstream": "^1.6",
-+                "pdepend/pdepend": "^2.5",
-+                "phploc/phploc": "^4.0",
-+                "phpmd/phpmd": "@stable",
-+                "phpro/grumphp": "^0.14",
-+                "phpunit/phpunit": "~6.2.0",
-+                "sebastian/phpcpd": "~3.0",
-+                "squizlabs/php_codesniffer": "^3.2",
-+                "theseer/phpdox": "^0.10.1"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "psr-4": {
-+                    "Klarna\\Ordermanagement\\": "."
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Joe Constant",
-+                    "email": "joe.constant@klarna.com"
-+                },
-+                {
-+                    "name": "Jason Grim",
-+                    "email": "jason.grim@klarna.com"
-+                },
-+                {
-+                    "name": "Fei Chen",
-+                    "email": "fei.chen@klarna.com"
-+                },
-+                {
-+                    "name": "Dario Kassler",
-+                    "email": "dario.kassler@klarna.com"
-+                }
-+            ],
-+            "description": "Klarna Order Management Magento 2 Extension"
-+        },
-+        {
-+            "name": "magento/composer",
-+            "version": "1.4.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/magento/composer.git",
-+                "reference": "6fb9eb3dd72a5e70aa53983f132f8e1883e79978"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/magento/composer/zipball/6fb9eb3dd72a5e70aa53983f132f8e1883e79978",
-+                "reference": "6fb9eb3dd72a5e70aa53983f132f8e1883e79978",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "composer/composer": "^1.6",
-+                "php": "~7.1.3|~7.2.0",
-+                "symfony/console": "~4.0.0 || ~4.1.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~7.0.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Magento\\Composer\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-+            "time": "2018-06-29T18:46:51+00:00"
-+        },
-+        {
-+            "name": "magento/framework",
-+            "version": "102.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/framework/magento-framework-102.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "399d85904a005db76ce518a265cfdaff68d02984"
-+            },
-+            "require": {
-+                "colinmollenhour/php-redis-session-abstract": "~1.4.0",
-+                "composer/composer": "^1.6",
-+                "ext-bcmath": "*",
-+                "ext-curl": "*",
-+                "ext-dom": "*",
-+                "ext-gd": "*",
-+                "ext-hash": "*",
-+                "ext-iconv": "*",
-+                "ext-openssl": "*",
-+                "ext-simplexml": "*",
-+                "ext-spl": "*",
-+                "ext-xsl": "*",
-+                "lib-libxml": "*",
-+                "magento/zendframework1": "~1.14.0",
-+                "monolog/monolog": "^1.17",
-+                "oyejorge/less.php": "~1.7.0",
-+                "php": "~7.1.3||~7.2.0",
-+                "symfony/console": "~4.1.0",
-+                "symfony/process": "~4.1.0",
-+                "tedivm/jshrink": "~1.3.0",
-+                "zendframework/zend-code": "~3.3.0",
-+                "zendframework/zend-crypt": "^2.6.0",
-+                "zendframework/zend-http": "^2.6.0",
-+                "zendframework/zend-mvc": "~2.7.0",
-+                "zendframework/zend-stdlib": "^2.7.7",
-+                "zendframework/zend-uri": "^2.5.1",
-+                "zendframework/zend-validator": "^2.6.0"
-+            },
-+            "suggest": {
-+                "ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library"
-+            },
-+            "type": "magento2-library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Magento\\Framework\\": ""
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/framework-amqp",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/framework-amqp/magento-framework-amqp-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "40a4d6799c43dd9eed1f7dba4ca2eb6b26518966"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0",
-+                "php-amqplib/php-amqplib": "~2.7.0"
-+            },
-+            "type": "magento2-library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Magento\\Framework\\Amqp\\": ""
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/framework-bulk",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/framework-bulk/magento-framework-bulk-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "efa487ceac1c91824797e1f8a87d9b6bd2fdfa3a"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Magento\\Framework\\Bulk\\": ""
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/framework-message-queue",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/framework-message-queue/magento-framework-message-queue-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "51901caed892f2e26241677df2f72deaa010a1a3"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Magento\\Framework\\MessageQueue\\": ""
-+                },
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/inventory-composer-installer",
-+            "version": "1.1.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/inventory-composer-installer/magento-inventory-composer-installer-1.1.0.0.zip",
-+                "reference": null,
-+                "shasum": "c52566b82926bb37487a2b3cb2c8ae091be9be9e"
-+            },
-+            "require": {
-+                "composer-plugin-api": "^1.1",
-+                "magento/framework": "*"
-+            },
-+            "require-dev": {
-+                "composer/composer": "*"
-+            },
-+            "type": "composer-plugin",
-+            "extra": {
-+                "class": "Magento\\InventoryComposerInstaller\\Plugin"
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Magento\\InventoryComposerInstaller\\": "src"
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Composer plugin for Magento Multi Source Inventory"
-+        },
-+        {
-+            "name": "magento/inventory-composer-metapackage",
-+            "version": "1.1.1",
-+            "require": {
-+                "magento/inventory-composer-installer": "1.1.0",
-+                "magento/module-inventory": "1.0.4",
-+                "magento/module-inventory-admin-ui": "1.0.4",
-+                "magento/module-inventory-api": "1.0.4",
-+                "magento/module-inventory-bundle-product": "1.0.3",
-+                "magento/module-inventory-bundle-product-admin-ui": "1.0.3",
-+                "magento/module-inventory-cache": "1.0.3",
-+                "magento/module-inventory-catalog": "1.0.4",
-+                "magento/module-inventory-catalog-admin-ui": "1.0.4",
-+                "magento/module-inventory-catalog-api": "1.0.4",
-+                "magento/module-inventory-catalog-search": "1.0.4",
-+                "magento/module-inventory-configurable-product": "1.0.4",
-+                "magento/module-inventory-configurable-product-admin-ui": "1.0.4",
-+                "magento/module-inventory-configurable-product-indexer": "1.0.3",
-+                "magento/module-inventory-configuration": "1.0.4",
-+                "magento/module-inventory-configuration-api": "1.0.4",
-+                "magento/module-inventory-distance-based-source-selection": "1.0.0",
-+                "magento/module-inventory-distance-based-source-selection-admin-ui": "1.0.0",
-+                "magento/module-inventory-distance-based-source-selection-api": "1.0.0",
-+                "magento/module-inventory-elasticsearch": "1.0.0",
-+                "magento/module-inventory-grouped-product": "1.0.3",
-+                "magento/module-inventory-grouped-product-admin-ui": "1.0.4",
-+                "magento/module-inventory-grouped-product-indexer": "1.0.3",
-+                "magento/module-inventory-import-export": "1.0.4",
-+                "magento/module-inventory-indexer": "1.0.4",
-+                "magento/module-inventory-low-quantity-notification": "1.0.4",
-+                "magento/module-inventory-low-quantity-notification-admin-ui": "1.0.4",
-+                "magento/module-inventory-low-quantity-notification-api": "1.0.3",
-+                "magento/module-inventory-multi-dimensional-indexer-api": "1.0.4",
-+                "magento/module-inventory-product-alert": "1.0.4",
-+                "magento/module-inventory-reservations": "1.0.4",
-+                "magento/module-inventory-reservations-api": "1.0.3",
-+                "magento/module-inventory-sales": "1.0.4",
-+                "magento/module-inventory-sales-admin-ui": "1.0.4",
-+                "magento/module-inventory-sales-api": "1.0.4",
-+                "magento/module-inventory-sales-frontend-ui": "1.0.3",
-+                "magento/module-inventory-setup-fixture-generator": "1.0.0",
-+                "magento/module-inventory-shipping": "1.0.4",
-+                "magento/module-inventory-shipping-admin-ui": "1.0.4",
-+                "magento/module-inventory-source-deduction-api": "1.0.4",
-+                "magento/module-inventory-source-selection": "1.0.4",
-+                "magento/module-inventory-source-selection-api": "1.1.0"
-+            },
-+            "type": "metapackage",
-+            "description": "Metapackage with Magento Inventory modules for simple installation"
-+        },
-+        {
-+            "name": "magento/language-de_de",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-de_de/magento-language-de_de-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "4fa504af2bb938cadea2376cb17caa0832791bfa"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "German (Germany) language"
-+        },
-+        {
-+            "name": "magento/language-en_us",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-en_us/magento-language-en_us-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "13e74a7d83dbd49dec496aeaedc5ad0dc82dacd8"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "English (United States) language"
-+        },
-+        {
-+            "name": "magento/language-es_es",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-es_es/magento-language-es_es-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ea3dd068fe9caad30835e9dff5a2aab96032e4c0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Spanish (Spain) language"
-+        },
-+        {
-+            "name": "magento/language-fr_fr",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-fr_fr/magento-language-fr_fr-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "9ab44b7845abb6f1b031864c815de6ae836dbaf7"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "French (France) language"
-+        },
-+        {
-+            "name": "magento/language-nl_nl",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-nl_nl/magento-language-nl_nl-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "060a175c553e80abf77f877a6d92746658e270f0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Dutch (Netherlands) language"
-+        },
-+        {
-+            "name": "magento/language-pt_br",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-pt_br/magento-language-pt_br-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "50c59308621d44fe8def4a93253087fa69bdae70"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Portuguese (Brazil) language"
-+        },
-+        {
-+            "name": "magento/language-zh_hans_cn",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/language-zh_hans_cn/magento-language-zh_hans_cn-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "8b2e9a40c956bc05c50b02ea54e10c00d9d24d78"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*"
-+            },
-+            "type": "magento2-language",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Chinese (China) language"
-+        },
-+        {
-+            "name": "magento/magento-composer-installer",
-+            "version": "0.1.13",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/magento/magento-composer-installer.git",
-+                "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/8b6c32f53b4944a5d6656e86344cd0f9784709a1",
-+                "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "composer-plugin-api": "^1.0"
-+            },
-+            "replace": {
-+                "magento-hackathon/magento-composer-installer": "*"
-+            },
-+            "require-dev": {
-+                "composer/composer": "*@dev",
-+                "firegento/phpcs": "dev-patch-1",
-+                "mikey179/vfsstream": "*",
-+                "phpunit/phpunit": "*",
-+                "phpunit/phpunit-mock-objects": "dev-master",
-+                "squizlabs/php_codesniffer": "1.4.7",
-+                "symfony/process": "*"
-+            },
-+            "type": "composer-plugin",
-+            "extra": {
-+                "composer-command-registry": [
-+                    "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand"
-+                ],
-+                "class": "MagentoHackathon\\Composer\\Magento\\Plugin"
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "MagentoHackathon\\Composer\\Magento": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "OSL-3.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Vinai Kopp",
-+                    "email": "vinai@netzarbeiter.com"
-+                },
-+                {
-+                    "name": "Daniel Fahlke aka Flyingmana",
-+                    "email": "flyingmana@googlemail.com"
-+                },
-+                {
-+                    "name": "Jörg Weller",
-+                    "email": "weller@flagbit.de"
-+                },
-+                {
-+                    "name": "Karl Spies",
-+                    "email": "karl.spies@gmx.net"
-+                },
-+                {
-+                    "name": "Tobias Vogt",
-+                    "email": "tobi@webguys.de"
-+                },
-+                {
-+                    "name": "David Fuhr",
-+                    "email": "fuhr@flagbit.de"
-+                }
-+            ],
-+            "description": "Composer installer for Magento modules",
-+            "homepage": "https://github.com/magento/magento-composer-installer",
-+            "keywords": [
-+                "composer-installer",
-+                "magento"
-+            ],
-+            "time": "2017-12-29T16:45:24+00:00"
-+        },
-+        {
-+            "name": "magento/magento2-base",
-+            "version": "2.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/magento2-base/magento-magento2-base-2.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "7877828bb63a7cfca5c62c6c6caf6a9c05ab154b"
-+            },
-+            "require": {
-+                "braintree/braintree_php": "3.35.0",
-+                "composer/composer": "^1.6",
-+                "ext-intl": "*",
-+                "ext-mbstring": "*",
-+                "magento/composer": "~1.4.0",
-+                "magento/magento-composer-installer": "*",
-+                "magento/zendframework1": "~1.14.1",
-+                "monolog/monolog": "^1.17",
-+                "oyejorge/less.php": "~1.7.0",
-+                "pelago/emogrifier": "^2.0.0",
-+                "php": "~7.1.3||~7.2.0",
-+                "phpseclib/phpseclib": "2.0.*",
-+                "symfony/console": "~4.1.0",
-+                "symfony/event-dispatcher": "~4.1.0",
-+                "tedivm/jshrink": "~1.3.0",
-+                "tubalmartin/cssmin": "4.1.1",
-+                "zendframework/zend-code": "~3.3.0",
-+                "zendframework/zend-config": "^2.6.0",
-+                "zendframework/zend-console": "^2.6.0",
-+                "zendframework/zend-crypt": "^2.6.0",
-+                "zendframework/zend-di": "^2.6.1",
-+                "zendframework/zend-eventmanager": "^2.6.3",
-+                "zendframework/zend-form": "^2.10.0",
-+                "zendframework/zend-http": "^2.6.0",
-+                "zendframework/zend-i18n": "^2.7.3",
-+                "zendframework/zend-json": "^2.6.1",
-+                "zendframework/zend-log": "^2.9.1",
-+                "zendframework/zend-modulemanager": "^2.7",
-+                "zendframework/zend-mvc": "~2.7.0",
-+                "zendframework/zend-serializer": "^2.7.2",
-+                "zendframework/zend-server": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.8",
-+                "zendframework/zend-soap": "^2.7.0",
-+                "zendframework/zend-stdlib": "^2.7.7",
-+                "zendframework/zend-text": "^2.6.0",
-+                "zendframework/zend-uri": "^2.5.1",
-+                "zendframework/zend-validator": "^2.6.0",
-+                "zendframework/zend-view": "~2.10.0"
-+            },
-+            "conflict": {
-+                "gene/bluefoot": "*"
-+            },
-+            "replace": {
-+                "blueimp/jquery-file-upload": "5.6.14",
-+                "components/jquery": "1.11.0",
-+                "components/jqueryui": "1.10.4",
-+                "tinymce/tinymce": "3.4.7",
-+                "trentrichardson/jquery-timepicker-addon": "1.4.3",
-+                "twbs/bootstrap": "3.1.0"
-+            },
-+            "type": "magento2-component",
-+            "extra": {
-+                "component_paths": {
-+                    "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js",
-+                    "components/jquery": [
-+                        "lib/web/jquery.js",
-+                        "lib/web/jquery/jquery.min.js",
-+                        "lib/web/jquery/jquery-migrate.js"
-+                    ],
-+                    "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader",
-+                    "components/jqueryui": "lib/web/jquery/jquery-ui.js",
-+                    "twbs/bootstrap": "lib/web/jquery/jquery.tabs.js",
-+                    "tinymce/tinymce": "lib/web/tiny_mce_4"
-+                },
-+                "map": [
-                     [
--                        "lib/web/prototype",
--                        "lib/web/prototype"
-+                        ".github",
-+                        ".github"
-                     ],
-                     [
--                        "lib/web/moment.js",
--                        "lib/web/moment.js"
-+                        ".htaccess",
-+                        ".htaccess"
-                     ],
-                     [
--                        "lib/web/i18n",
--                        "lib/web/i18n"
-+                        ".htaccess.sample",
-+                        ".htaccess.sample"
-                     ],
-                     [
--                        "lib/web/varien",
--                        "lib/web/varien"
-+                        ".php_cs.dist",
-+                        ".php_cs.dist"
-                     ],
-                     [
--                        "lib/web/blank.html",
--                        "lib/web/blank.html"
-+                        ".travis.yml",
-+                        ".travis.yml"
-                     ],
-                     [
--                        "lib/web/scriptaculous",
--                        "lib/web/scriptaculous"
-+                        ".user.ini",
-+                        ".user.ini"
-                     ],
-                     [
--                        "lib/web/ko",
--                        "lib/web/ko"
-+                        "COPYING.txt",
-+                        "COPYING.txt"
-                     ],
-                     [
--                        "lib/web/modernizr",
--                        "lib/web/modernizr"
-+                        "Gruntfile.js.sample",
-+                        "Gruntfile.js.sample"
-                     ],
-                     [
--                        "lib/web/date-format-normalizer.js",
--                        "lib/web/date-format-normalizer.js"
-+                        "LICENSE.txt",
-+                        "LICENSE.txt"
-                     ],
-                     [
--                        "lib/web/spacer.gif",
--                        "lib/web/spacer.gif"
-+                        "LICENSE_AFL.txt",
-+                        "LICENSE_AFL.txt"
-                     ],
-                     [
--                        "lib/web/images",
--                        "lib/web/images"
-+                        "app/.htaccess",
-+                        "app/.htaccess"
-                     ],
-                     [
--                        "lib/web/matchMedia.js",
--                        "lib/web/matchMedia.js"
-+                        "app/autoload.php",
-+                        "app/autoload.php"
-                     ],
-                     [
--                        "lib/web/extjs",
--                        "lib/web/extjs"
-+                        "app/bootstrap.php",
-+                        "app/bootstrap.php"
-                     ],
-                     [
--                        "lib/web/css",
--                        "lib/web/css"
-+                        "app/design/adminhtml/Magento",
-+                        "app/design/adminhtml/Magento"
-                     ],
-                     [
--                        "lib/web/fonts",
--                        "lib/web/fonts"
-+                        "app/design/frontend/Magento",
-+                        "app/design/frontend/Magento"
-                     ],
-                     [
--                        "lib/web/jquery",
--                        "lib/web/jquery"
-+                        "app/etc/NonComposerComponentRegistration.php",
-+                        "app/etc/NonComposerComponentRegistration.php"
-                     ],
-                     [
--                        "lib/web/less",
--                        "lib/web/less"
-+                        "app/etc/db_schema.xml",
-+                        "app/etc/db_schema.xml"
-                     ],
-                     [
--                        "lib/web/jquery.js",
--                        "lib/web/jquery.js"
-+                        "app/etc/di.xml",
-+                        "app/etc/di.xml"
-                     ],
-                     [
--                        "lib/web/underscore.js",
--                        "lib/web/underscore.js"
-+                        "app/etc/registration_globlist.php",
-+                        "app/etc/registration_globlist.php"
-                     ],
-                     [
--                        "lib/web/legacy-build.min.js",
--                        "lib/web/legacy-build.min.js"
-+                        "app/functions.php",
-+                        "app/functions.php"
-                     ],
-                     [
--                        "lib/web/mage",
--                        "lib/web/mage"
-+                        "auth.json.sample",
-+                        "auth.json.sample"
-                     ],
-                     [
--                        "lib/web/tiny_mce",
--                        "lib/web/tiny_mce"
-+                        "bin/.htaccess",
-+                        "bin/.htaccess"
-                     ],
-                     [
--                        ".htaccess.sample",
--                        ".htaccess.sample"
-+                        "bin/magento",
-+                        "bin/magento"
-                     ],
-                     [
--                        "CONTRIBUTING.md",
--                        "CONTRIBUTING.md"
-+                        "dev/.htaccess",
-+                        "dev/.htaccess"
-                     ],
-                     [
--                        "package.json",
--                        "package.json"
-+                        "dev/tests/acceptance",
-+                        "dev/tests/acceptance"
-                     ],
-                     [
--                        "nginx.conf.sample",
--                        "nginx.conf.sample"
-+                        "dev/tests/api-functional/.gitignore",
-+                        "dev/tests/api-functional/.gitignore"
-                     ],
-                     [
--                        "var/.htaccess",
--                        "var/.htaccess"
-+                        "dev/tests/api-functional/_files",
-+                        "dev/tests/api-functional/_files"
-                     ],
-                     [
--                        "pub/media/downloadable/.htaccess",
--                        "pub/media/downloadable/.htaccess"
-+                        "dev/tests/api-functional/config",
-+                        "dev/tests/api-functional/config"
-                     ],
-                     [
--                        "pub/media/theme_customization/.htaccess",
--                        "pub/media/theme_customization/.htaccess"
-+                        "dev/tests/api-functional/framework",
-+                        "dev/tests/api-functional/framework"
-                     ],
-                     [
--                        "pub/media/customer/.htaccess",
--                        "pub/media/customer/.htaccess"
-+                        "dev/tests/api-functional/phpunit_graphql.xml.dist",
-+                        "dev/tests/api-functional/phpunit_graphql.xml.dist"
-                     ],
-                     [
--                        "pub/media/.htaccess",
--                        "pub/media/.htaccess"
-+                        "dev/tests/api-functional/phpunit_rest.xml.dist",
-+                        "dev/tests/api-functional/phpunit_rest.xml.dist"
-                     ],
-                     [
--                        "pub/errors",
--                        "pub/errors"
-+                        "dev/tests/api-functional/phpunit_soap.xml.dist",
-+                        "dev/tests/api-functional/phpunit_soap.xml.dist"
-                     ],
-                     [
--                        "pub/opt",
--                        "pub/opt"
-+                        "dev/tests/api-functional/testsuite/Magento",
-+                        "dev/tests/api-functional/testsuite/Magento"
-                     ],
-                     [
--                        "pub/get.php",
--                        "pub/get.php"
-+                        "dev/tests/error_handler.php",
-+                        "dev/tests/error_handler.php"
-+                    ],
-+                    [
-+                        "dev/tests/functional/.gitignore",
-+                        "dev/tests/functional/.gitignore"
-+                    ],
-+                    [
-+                        "dev/tests/functional/.htaccess.sample",
-+                        "dev/tests/functional/.htaccess.sample"
-+                    ],
-+                    [
-+                        "dev/tests/functional/bootstrap.php",
-+                        "dev/tests/functional/bootstrap.php"
-+                    ],
-+                    [
-+                        "dev/tests/functional/composer.json",
-+                        "dev/tests/functional/composer.json"
-+                    ],
-+                    [
-+                        "dev/tests/functional/credentials.xml.dist",
-+                        "dev/tests/functional/credentials.xml.dist"
-+                    ],
-+                    [
-+                        "dev/tests/functional/etc",
-+                        "dev/tests/functional/etc"
-+                    ],
-+                    [
-+                        "dev/tests/functional/isolation.php",
-+                        "dev/tests/functional/isolation.php"
-+                    ],
-+                    [
-+                        "dev/tests/functional/lib",
-+                        "dev/tests/functional/lib"
-+                    ],
-+                    [
-+                        "dev/tests/functional/phpunit.xml.dist",
-+                        "dev/tests/functional/phpunit.xml.dist"
-+                    ],
-+                    [
-+                        "dev/tests/functional/tests",
-+                        "dev/tests/functional/tests"
-+                    ],
-+                    [
-+                        "dev/tests/functional/testsuites/Magento",
-+                        "dev/tests/functional/testsuites/Magento"
-+                    ],
-+                    [
-+                        "dev/tests/functional/utils",
-+                        "dev/tests/functional/utils"
-+                    ],
-+                    [
-+                        "dev/tests/integration/.gitignore",
-+                        "dev/tests/integration/.gitignore"
-+                    ],
-+                    [
-+                        "dev/tests/integration/_files",
-+                        "dev/tests/integration/_files"
-+                    ],
-+                    [
-+                        "dev/tests/integration/bin",
-+                        "dev/tests/integration/bin"
-+                    ],
-+                    [
-+                        "dev/tests/integration/etc",
-+                        "dev/tests/integration/etc"
-+                    ],
-+                    [
-+                        "dev/tests/integration/framework",
-+                        "dev/tests/integration/framework"
-+                    ],
-+                    [
-+                        "dev/tests/integration/phpunit.xml.dist",
-+                        "dev/tests/integration/phpunit.xml.dist"
-+                    ],
-+                    [
-+                        "dev/tests/integration/testsuite/Magento",
-+                        "dev/tests/integration/testsuite/Magento"
-+                    ],
-+                    [
-+                        "dev/tests/integration/tmp",
-+                        "dev/tests/integration/tmp"
-+                    ],
-+                    [
-+                        "dev/tests/js",
-+                        "dev/tests/js"
-+                    ],
-+                    [
-+                        "dev/tests/setup-integration",
-+                        "dev/tests/setup-integration"
-+                    ],
-+                    [
-+                        "dev/tests/static/.gitignore",
-+                        "dev/tests/static/.gitignore"
-+                    ],
-+                    [
-+                        "dev/tests/static/framework",
-+                        "dev/tests/static/framework"
-+                    ],
-+                    [
-+                        "dev/tests/static/get_github_changes.php",
-+                        "dev/tests/static/get_github_changes.php"
-+                    ],
-+                    [
-+                        "dev/tests/static/phpunit-all.xml.dist",
-+                        "dev/tests/static/phpunit-all.xml.dist"
-+                    ],
-+                    [
-+                        "dev/tests/static/phpunit.xml.dist",
-+                        "dev/tests/static/phpunit.xml.dist"
-+                    ],
-+                    [
-+                        "dev/tests/static/testsuite/Magento",
-+                        "dev/tests/static/testsuite/Magento"
-+                    ],
-+                    [
-+                        "dev/tests/static/tmp",
-+                        "dev/tests/static/tmp"
-                     ],
-                     [
--                        "pub/static/.htaccess",
--                        "pub/static/.htaccess"
-+                        "dev/tests/unit/.gitignore",
-+                        "dev/tests/unit/.gitignore"
-                     ],
-                     [
--                        "pub/.htaccess",
--                        "pub/.htaccess"
-+                        "dev/tests/unit/framework",
-+                        "dev/tests/unit/framework"
-                     ],
-                     [
--                        "pub/static.php",
--                        "pub/static.php"
-+                        "dev/tests/unit/phpunit.xml.dist",
-+                        "dev/tests/unit/phpunit.xml.dist"
-                     ],
-                     [
--                        "pub/cron.php",
--                        "pub/cron.php"
-+                        "dev/tests/unit/tmp",
-+                        "dev/tests/unit/tmp"
-                     ],
-                     [
--                        "pub/index.php",
--                        "pub/index.php"
-+                        "dev/tools",
-+                        "dev/tools"
-                     ],
-                     [
--                        ".php_cs",
--                        ".php_cs"
-+                        "dev/travis",
-+                        "dev/travis"
-                     ],
-                     [
--                        "COPYING.txt",
--                        "COPYING.txt"
-+                        "generated",
-+                        "generated"
-                     ],
-                     [
--                        "dev/shell",
--                        "dev/shell"
-+                        "grunt-config.json.sample",
-+                        "grunt-config.json.sample"
-                     ],
-                     [
--                        "dev/tools",
--                        "dev/tools"
-+                        "index.php",
-+                        "index.php"
-                     ],
-                     [
--                        "dev/tests/integration/phpunit.xml.dist",
--                        "dev/tests/integration/phpunit.xml.dist"
-+                        "lib/.htaccess",
-+                        "lib/.htaccess"
-                     ],
-                     [
--                        "dev/tests/integration/etc",
--                        "dev/tests/integration/etc"
-+                        "lib/internal/GnuFreeFont",
-+                        "lib/internal/GnuFreeFont"
-                     ],
-                     [
--                        "dev/tests/integration/tmp",
--                        "dev/tests/integration/tmp"
-+                        "lib/internal/LinLibertineFont",
-+                        "lib/internal/LinLibertineFont"
-                     ],
-                     [
--                        "dev/tests/integration/framework",
--                        "dev/tests/integration/framework"
-+                        "lib/web/FormData.js",
-+                        "lib/web/FormData.js"
-                     ],
-                     [
--                        "dev/tests/integration/testsuite/Magento",
--                        "dev/tests/integration/testsuite/Magento"
-+                        "lib/web/MutationObserver.js",
-+                        "lib/web/MutationObserver.js"
-                     ],
-                     [
--                        "dev/tests/integration/.gitignore",
--                        "dev/tests/integration/.gitignore"
-+                        "lib/web/blank.html",
-+                        "lib/web/blank.html"
-                     ],
-                     [
--                        "dev/tests/functional/composer.json",
--                        "dev/tests/functional/composer.json"
-+                        "lib/web/css",
-+                        "lib/web/css"
-                     ],
-                     [
--                        "dev/tests/functional/lib",
--                        "dev/tests/functional/lib"
-+                        "lib/web/es6-collections.js",
-+                        "lib/web/es6-collections.js"
-                     ],
-                     [
--                        "dev/tests/functional/phpunit.xml.dist",
--                        "dev/tests/functional/phpunit.xml.dist"
-+                        "lib/web/extjs",
-+                        "lib/web/extjs"
-                     ],
-                     [
--                        "dev/tests/functional/composer.json.dist",
--                        "dev/tests/functional/composer.json.dist"
-+                        "lib/web/fonts",
-+                        "lib/web/fonts"
-                     ],
-                     [
--                        "dev/tests/functional/bootstrap.php",
--                        "dev/tests/functional/bootstrap.php"
-+                        "lib/web/fotorama",
-+                        "lib/web/fotorama"
-                     ],
-                     [
--                        "dev/tests/functional/credentials.xml.dist",
--                        "dev/tests/functional/credentials.xml.dist"
-+                        "lib/web/i18n",
-+                        "lib/web/i18n"
-                     ],
-                     [
--                        "dev/tests/functional/tests",
--                        "dev/tests/functional/tests"
-+                        "lib/web/images",
-+                        "lib/web/images"
-                     ],
-                     [
--                        "dev/tests/functional/utils",
--                        "dev/tests/functional/utils"
-+                        "lib/web/jquery.js",
-+                        "lib/web/jquery.js"
-                     ],
-                     [
--                        "dev/tests/functional/isolation.php",
--                        "dev/tests/functional/isolation.php"
-+                        "lib/web/jquery",
-+                        "lib/web/jquery"
-                     ],
-                     [
--                        "dev/tests/functional/etc",
--                        "dev/tests/functional/etc"
-+                        "lib/web/knockoutjs",
-+                        "lib/web/knockoutjs"
-                     ],
-                     [
--                        "dev/tests/functional/.htaccess",
--                        "dev/tests/functional/.htaccess"
-+                        "lib/web/legacy-build.min.js",
-+                        "lib/web/legacy-build.min.js"
-                     ],
-                     [
--                        "dev/tests/functional/testsuites/Magento",
--                        "dev/tests/functional/testsuites/Magento"
-+                        "lib/web/less",
-+                        "lib/web/less"
-                     ],
-                     [
--                        "dev/tests/functional/.gitignore",
--                        "dev/tests/functional/.gitignore"
-+                        "lib/web/lib",
-+                        "lib/web/lib"
-                     ],
-                     [
--                        "dev/tests/js/spec",
--                        "dev/tests/js/spec"
-+                        "lib/web/mage",
-+                        "lib/web/mage"
-                     ],
-                     [
--                        "dev/tests/js/framework",
--                        "dev/tests/js/framework"
-+                        "lib/web/magnifier",
-+                        "lib/web/magnifier"
-                     ],
-                     [
--                        "dev/tests/js/testsuite/lib",
--                        "dev/tests/js/testsuite/lib"
-+                        "lib/web/matchMedia.js",
-+                        "lib/web/matchMedia.js"
-                     ],
-                     [
--                        "dev/tests/js/testsuite/mage",
--                        "dev/tests/js/testsuite/mage"
-+                        "lib/web/modernizr",
-+                        "lib/web/modernizr"
-                     ],
-                     [
--                        "dev/tests/js/.gitignore",
--                        "dev/tests/js/.gitignore"
-+                        "lib/web/moment-timezone-with-data.js",
-+                        "lib/web/moment-timezone-with-data.js"
-                     ],
-                     [
--                        "dev/tests/api-functional/phpunit.xml.dist",
--                        "dev/tests/api-functional/phpunit.xml.dist"
-+                        "lib/web/moment.js",
-+                        "lib/web/moment.js"
-                     ],
-                     [
--                        "dev/tests/api-functional/config",
--                        "dev/tests/api-functional/config"
-+                        "lib/web/prototype",
-+                        "lib/web/prototype"
-                     ],
-                     [
--                        "dev/tests/api-functional/framework",
--                        "dev/tests/api-functional/framework"
-+                        "lib/web/requirejs",
-+                        "lib/web/requirejs"
-                     ],
-                     [
--                        "dev/tests/api-functional/_files",
--                        "dev/tests/api-functional/_files"
-+                        "lib/web/scriptaculous",
-+                        "lib/web/scriptaculous"
-                     ],
-                     [
--                        "dev/tests/api-functional/testsuite/Magento",
--                        "dev/tests/api-functional/testsuite/Magento"
-+                        "lib/web/spacer.gif",
-+                        "lib/web/spacer.gif"
-                     ],
-                     [
--                        "dev/tests/api-functional/.gitignore",
--                        "dev/tests/api-functional/.gitignore"
-+                        "lib/web/tiny_mce_4",
-+                        "lib/web/tiny_mce_4"
-                     ],
-                     [
--                        "dev/tests/unit/phpunit.xml.dist",
--                        "dev/tests/unit/phpunit.xml.dist"
-+                        "lib/web/underscore.js",
-+                        "lib/web/underscore.js"
-                     ],
-                     [
--                        "dev/tests/unit/tmp",
--                        "dev/tests/unit/tmp"
-+                        "lib/web/varien",
-+                        "lib/web/varien"
-                     ],
-                     [
--                        "dev/tests/unit/framework",
--                        "dev/tests/unit/framework"
-+                        "nginx.conf.sample",
-+                        "nginx.conf.sample"
-                     ],
-                     [
--                        "dev/tests/unit/.gitignore",
--                        "dev/tests/unit/.gitignore"
-+                        "package.json.sample",
-+                        "package.json.sample"
-                     ],
-                     [
--                        "dev/tests/static/phpunit-all.xml.dist",
--                        "dev/tests/static/phpunit-all.xml.dist"
-+                        "phpserver",
-+                        "phpserver"
-                     ],
-                     [
--                        "dev/tests/static/phpunit.xml.dist",
--                        "dev/tests/static/phpunit.xml.dist"
-+                        "pub/.htaccess",
-+                        "pub/.htaccess"
-                     ],
-                     [
--                        "dev/tests/static/framework",
--                        "dev/tests/static/framework"
-+                        "pub/.user.ini",
-+                        "pub/.user.ini"
-                     ],
-                     [
--                        "dev/tests/static/testsuite/Magento",
--                        "dev/tests/static/testsuite/Magento"
-+                        "pub/cron.php",
-+                        "pub/cron.php"
-                     ],
-                     [
--                        "dev/tests/static/.gitignore",
--                        "dev/tests/static/.gitignore"
-+                        "pub/errors",
-+                        "pub/errors"
-                     ],
-                     [
--                        "dev/.htaccess",
--                        "dev/.htaccess"
-+                        "pub/get.php",
-+                        "pub/get.php"
-                     ],
-                     [
--                        "Gruntfile.js",
--                        "Gruntfile.js"
-+                        "pub/health_check.php",
-+                        "pub/health_check.php"
-                     ],
-                     [
--                        "setup",
--                        "setup"
-+                        "pub/index.php",
-+                        "pub/index.php"
-                     ],
-                     [
--                        "LICENSE.txt",
--                        "LICENSE.txt"
-+                        "pub/media/.htaccess",
-+                        "pub/media/.htaccess"
-                     ],
-                     [
--                        ".travis.yml",
--                        ".travis.yml"
-+                        "pub/media/customer/.htaccess",
-+                        "pub/media/customer/.htaccess"
-                     ],
-                     [
--                        "app/bootstrap.php",
--                        "app/bootstrap.php"
-+                        "pub/media/downloadable/.htaccess",
-+                        "pub/media/downloadable/.htaccess"
-                     ],
-                     [
--                        "app/etc/di.xml",
--                        "app/etc/di.xml"
-+                        "pub/media/import",
-+                        "pub/media/import"
-                     ],
-                     [
--                        "app/.htaccess",
--                        "app/.htaccess"
-+                        "pub/media/theme_customization/.htaccess",
-+                        "pub/media/theme_customization/.htaccess"
-                     ],
-                     [
--                        "app/functions.php",
--                        "app/functions.php"
-+                        "pub/opt",
-+                        "pub/opt"
-                     ],
-                     [
--                        "app/autoload.php",
--                        "app/autoload.php"
-+                        "pub/static.php",
-+                        "pub/static.php"
-                     ],
-                     [
--                        ".htaccess",
--                        ".htaccess"
-+                        "pub/static/.htaccess",
-+                        "pub/static/.htaccess"
-                     ],
-                     [
--                        "php.ini.sample",
--                        "php.ini.sample"
-+                        "setup",
-+                        "setup"
-                     ],
-                     [
--                        "index.php",
--                        "index.php"
-+                        "var/.htaccess",
-+                        "var/.htaccess"
-                     ],
-                     [
--                        "LICENSE_AFL.txt",
--                        "LICENSE_AFL.txt"
-+                        "vendor/.htaccess",
-+                        "vendor/.htaccess"
-                     ]
-+                ],
-+                "chmod": [
-+                    {
-+                        "mask": "0755",
-+                        "path": "bin/magento"
-+                    }
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Magento 2 Base (Community Edition)"
-+        },
-+        {
-+            "name": "magento/module-admin-notification",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-admin-notification/magento-module-admin-notification-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "e7aea76407406c35e6505d4fce2cb06be409ec64"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\AdminNotification\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-advanced-pricing-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-advanced-pricing-import-export/magento-module-advanced-pricing-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "fbb58c6284f6eba01927bdcf2be6460650a8eef7"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-import-export": "101.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\AdvancedPricingImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-advanced-search",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-advanced-search/magento-module-advanced-search-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "3dbf902fa79a08b136205c7b2681ad91425a97b5"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-search": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-search": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\AdvancedSearch\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-amqp",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-amqp/magento-module-amqp-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "fdf734b25eb5fd29a7a8743b3d1e575ba29aa947"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/framework-amqp": "100.3.*",
-+                "magento/framework-message-queue": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Amqp\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-analytics/magento-module-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "c17c1d3353335fb9c9197e715ad7ec117700755c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-integration": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Analytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-asynchronous-operations",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-asynchronous-operations/magento-module-asynchronous-operations-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "9666e0949545697e66d13df886e16915ddfd3ffa"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/framework-bulk": "100.3.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-admin-notification": "100.3.*",
-+                "magento/module-logging": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\AsynchronousOperations\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-authorization",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-authorization/magento-module-authorization-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "c2a05780a4568e92634a46199c6925fecb4c32e3"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Authorization\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Authorization module provides access to Magento ACL functionality."
-+        },
-+        {
-+            "name": "magento/module-authorizenet",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-authorizenet/magento-module-authorizenet-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ab9dc9018f1a5b71cfaa54c1975d6ee6b5c7610c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Authorizenet\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-authorizenet-acceptjs",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-authorizenet-acceptjs/magento-module-authorizenet-acceptjs-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "16bc1b50a4e7f63bfa3869fa2c3bd4c67cedd8a3"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\AuthorizenetAcceptjs\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-backend",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-backend/magento-module-backend-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "3670764e864583abb604107c13490e239ba094d8"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backup": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-developer": "100.3.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-reports": "100.3.*",
-+                "magento/module-require-js": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-security": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-translation": "100.3.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-theme": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Backend\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-backup",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-backup/magento-module-backup-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "bb5a040e418e42554c0887673e21420479e8bf76"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-cron": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Backup\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-braintree",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-braintree/magento-module-braintree-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "bc99da6e5eef549dc2542cfe914aa7742361e2c6"
-+            },
-+            "require": {
-+                "braintree/braintree_php": "3.35.0",
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-instant-purchase": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-paypal": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-vault": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-checkout-agreements": "100.3.*",
-+                "magento/module-theme": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Braintree\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-bundle",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-bundle/magento-module-bundle-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "b1ce50b01d2d8997e1f6dcfc9b2dc82f47d987db"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-catalog-rule": "101.1.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-gift-message": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-bundle-sample-data": "Sample Data version: 100.3.*",
-+                "magento/module-sales-rule": "101.1.*",
-+                "magento/module-webapi": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Bundle\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-bundle-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-bundle-graph-ql/magento-module-bundle-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "4adf0dc50f886e121dde5f906ceaff8630a96697"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-bundle": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\BundleGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-bundle-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-bundle-import-export/magento-module-bundle-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "bdd21ea7945b87b643de52d93fb63b4c6ee625c9"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-bundle": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-import-export": "101.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\BundleImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cache-invalidate",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cache-invalidate/magento-module-cache-invalidate-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ee84c4c87bc878f08f1c325f82b88a7f8a2b4d85"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CacheInvalidate\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-captcha",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-captcha/magento-module-captcha-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "1d37fe2ce55a611af45abf9a79bf3ab45b18fb41"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0",
-+                "zendframework/zend-captcha": "^2.7.1",
-+                "zendframework/zend-db": "^2.8.2",
-+                "zendframework/zend-session": "^2.7.3"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Captcha\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog",
-+            "version": "103.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog/magento-module-catalog-103.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "9f6308528cd0b385c47300ac96e88a48c7462958"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-catalog-rule": "101.1.*",
-+                "magento/module-catalog-url-rewrite": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-indexer": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-msrp": "100.3.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-product-alert": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-url-rewrite": "101.1.*",
-+                "magento/module-widget": "101.1.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-sample-data": "Sample Data version: 100.3.*",
-+                "magento/module-cookie": "100.3.*",
-+                "magento/module-sales": "102.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Catalog\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-analytics/magento-module-catalog-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "78dad80df624ec870cd1fe528eb6bf23dd2a9174"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-analytics": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-graph-ql/magento-module-catalog-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "cab0f652a82a7011271931cfedbb8c13f362ea8c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-eav-graph-ql": "100.3.*",
-+                "magento/module-search": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*",
-+                "magento/module-store-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-import-export",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-import-export/magento-module-catalog-import-export-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "240b1ea27fb0bdebd2cf674ce280917363463216"
-+            },
-+            "require": {
-+                "ext-ctype": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-catalog-url-rewrite": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-inventory",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-inventory/magento-module-catalog-inventory-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "c7c8e7308fa130fa471cf228537506667473d982"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogInventory\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-inventory-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-inventory-graph-ql/magento-module-catalog-inventory-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5438ed8a7e381b27d5325801f87a6a844005ff08"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogInventoryGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-rule",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-rule/magento-module-catalog-rule-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "9892c5ab997236ed1611d9a02ea9a5be925475d6"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-rule": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-rule-sample-data": "Sample Data version: 100.3.*",
-+                "magento/module-import-export": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogRule\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-rule-configurable",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-rule-configurable/magento-module-catalog-rule-configurable-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "0281e9723bb534ba2e12a55ae11260f6904485d6"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-rule": "101.1.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-rule": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogRuleConfigurable\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-search",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-search/magento-module-catalog-search-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "933c002006e94c91b14203178d694acbe3308f86"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-indexer": "100.3.*",
-+                "magento/module-search": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogSearch\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Catalog search"
-+        },
-+        {
-+            "name": "magento/module-catalog-url-rewrite",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-url-rewrite/magento-module-catalog-url-rewrite-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "7a978d3ff25ffebd252182269ecd18039159af70"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-import-export": "101.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-url-rewrite": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-webapi": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogUrlRewrite\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-url-rewrite-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-url-rewrite-graph-ql/magento-module-catalog-url-rewrite-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "408be2e9c2c72d92f43764bfeeedd0063538fc23"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-catalog-url-rewrite": "100.3.*",
-+                "magento/module-url-rewrite-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogUrlRewriteGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-catalog-widget",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-catalog-widget/magento-module-catalog-widget-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5ff1f431ea8c9453e632e3892afc50f07f45f5a6"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-rule": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-widget": "101.1.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CatalogWidget\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-checkout",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-checkout/magento-module-checkout-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "259dfe67c0b4d6dc00746ac7f004999c58f1fded"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-msrp": "100.3.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-sales-rule": "101.1.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-cookie": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Checkout\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-checkout-agreements",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-checkout-agreements/magento-module-checkout-agreements-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "fe21cdbe902b50a634df92ebe4bac90967140671"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CheckoutAgreements\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cms",
-+            "version": "103.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cms/magento-module-cms-103.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "32b4db597a118386cfe5619f0a39129ab6f28e06"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-email": "101.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-variable": "100.3.*",
-+                "magento/module-widget": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-cms-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Cms\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cms-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cms-graph-ql/magento-module-cms-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "fae2f46721d225970beeb9e1cb26eff1dac6ad7f"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-widget": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*",
-+                "magento/module-store-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CmsGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cms-url-rewrite",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cms-url-rewrite/magento-module-cms-url-rewrite-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "66b9ca23c0af7c8387cfb24028128a64bf3337f4"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-url-rewrite": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CmsUrlRewrite\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cms-url-rewrite-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cms-url-rewrite-graph-ql/magento-module-cms-url-rewrite-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "3b58ec81afb10bbd30a2e011f887635b69803783"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-url-rewrite-graph-ql": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-cms-url-rewrite": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CmsUrlRewriteGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-config",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-config/magento-module-config-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "9458355eb5e383f148fbf503fe75d40d02de60b4"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-cron": "100.3.*",
-+                "magento/module-deploy": "100.3.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-email": "101.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Config\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-configurable-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-configurable-import-export/magento-module-configurable-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ac89ef960f75a7fcdf635dc3691366f7b0f41550"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-import-export": "101.0.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ConfigurableImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-configurable-product",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-configurable-product/magento-module-configurable-product-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "2f0f6c53b969b8b4378e91933ba2fa129fd0763c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-configurable-sample-data": "Sample Data version: 100.3.*",
-+                "magento/module-msrp": "100.3.*",
-+                "magento/module-product-links-sample-data": "Sample Data version: 100.3.*",
-+                "magento/module-product-video": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-sales-rule": "101.1.*",
-+                "magento/module-webapi": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ConfigurableProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-configurable-product-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-configurable-product-graph-ql/magento-module-configurable-product-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "6cf1902c260aa70630b96b806a49844b42136b9c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ConfigurableProductGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-configurable-product-sales",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-configurable-product-sales/magento-module-configurable-product-sales-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ab8e7350ef1fdc6e55f2dfd708d095560afe9d5b"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-configurable-product": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ConfigurableProductSales\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-contact",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-contact/magento-module-contact-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "4aed3599fdc7f885086726076d52e4b800b3d0ec"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Contact\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cookie",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cookie/magento-module-cookie-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "2b52880fe617d8e17746b8c637f56303063f54d0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-backend": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Cookie\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-cron",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-cron/magento-module-cron-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "953c6de628fbf6c2c02943c9fb14df9c384498c6"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Cron\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-currency-symbol",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-currency-symbol/magento-module-currency-symbol-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5967df5328174a24f59bdad5cc8e7a825878b195"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CurrencySymbol\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-customer",
-+            "version": "102.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-customer/magento-module-customer-102.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "9f99c836860ea853b7803e34c40f0874019f2a71"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-integration": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-newsletter": "100.3.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-review": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-cookie": "100.3.*",
-+                "magento/module-customer-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Customer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-customer-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-customer-analytics/magento-module-customer-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "6a055c7b8b46eb899cd5161a1ecc0874e576f3cd"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-analytics": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CustomerAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-customer-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-customer-graph-ql/magento-module-customer-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "127e9dfe4e63721218264c9046272f43ddce13de"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-integration": "100.3.*",
-+                "magento/module-newsletter": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CustomerGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-customer-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-customer-import-export/magento-module-customer-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "f1cdc6d8fe40bb058e76a0a0641230769a59a774"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\CustomerImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-deploy",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-deploy/magento-module-deploy-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "40006c50c2e0d0ee9d17aebb98cc12e9b76a59f9"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-require-js": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "cli_commands.php",
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Deploy\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-developer",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-developer/magento-module-developer-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "007a40f6eaceb427b1a9f24f102bb1c5268c97e0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Developer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-dhl",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-dhl/magento-module-dhl-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "a54951a456d9ae56103fcac8a342fc8104f433e2"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-checkout": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Dhl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-directory",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-directory/magento-module-directory-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "401fd817778dcfb8b7091ede60e3b0bb99267051"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Directory\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-directory-graph-ql",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-directory-graph-ql/magento-module-directory-graph-ql-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "1d9d2307d514ea00d5a8a66cf0556d83986c6189"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\DirectoryGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-downloadable",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-downloadable/magento-module-downloadable-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "c3f2cd868754a23af542b2b19d72c4c4e506c618"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-gift-message": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-downloadable-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Downloadable\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-downloadable-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-downloadable-graph-ql/magento-module-downloadable-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "6324aa9e2f9ba1957778b509b7dcfa7662eb7488"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-downloadable": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\DownloadableGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-downloadable-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-downloadable-import-export/magento-module-downloadable-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "1d8ddfaabe5b6a7a5e5792f09737c0685916417c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-import-export": "101.0.*",
-+                "magento/module-downloadable": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-import-export": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\DownloadableImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-eav",
-+            "version": "102.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-eav/magento-module-eav-102.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "a28509b94e703c3002eeb3238bf3c5eb35b90d5d"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Eav\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-eav-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-eav-graph-ql/magento-module-eav-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "66edb69cdfbce0784166e7f83bf3ecc8adf7ae0e"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\EavGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-elasticsearch",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-elasticsearch/magento-module-elasticsearch-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ed1da1137848560dde1a85f0f54dc2fac262359e"
-+            },
-+            "require": {
-+                "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1",
-+                "magento/framework": "102.0.*",
-+                "magento/module-advanced-search": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-catalog-search": "101.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-search": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Elasticsearch\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-elasticsearch-6",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-elasticsearch-6/magento-module-elasticsearch-6-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "a9da3243900390ad163efc7969b07116d2eb793f"
-+            },
-+            "require": {
-+                "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1",
-+                "magento/framework": "102.0.*",
-+                "magento/module-advanced-search": "100.3.*",
-+                "magento/module-catalog-search": "101.0.*",
-+                "magento/module-elasticsearch": "100.3.*",
-+                "magento/module-search": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Elasticsearch6\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-email",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-email/magento-module-email-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "ebcc5912a5e51f97b8c393638d00ddfcf2f73731"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-variable": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-theme": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Email\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-encryption-key",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-encryption-key/magento-module-encryption-key-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "099f36ac60c8226e0c3c1485d29d336c44744dde"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\EncryptionKey\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-fedex",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-fedex/magento-module-fedex-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "1840c2272127aba6e51599aa2f751c3d250aa1ef"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Fedex\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-gift-message",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-gift-message/magento-module-gift-message-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "b94369cb227d47c934982c8feb06856892c999af"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-multishipping": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GiftMessage\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-google-adwords",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-google-adwords/magento-module-google-adwords-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "6302122da3e9d4084e128ea1a13282bd92ca503a"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GoogleAdwords\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-google-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-google-analytics/magento-module-google-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "f87431addf8245441f53dc88bcb1df6bf9a2b95f"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-cookie": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GoogleAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-google-optimizer",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-google-optimizer/magento-module-google-optimizer-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5239b8174777bdf3fac9f72aad27a604b3febdbb"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-google-analytics": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GoogleOptimizer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-graph-ql/magento-module-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ccb0cfb89c1acbb09c88e01b2c70e924e62a19ce"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-webapi": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-grouped-catalog-inventory",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-grouped-catalog-inventory/magento-module-grouped-catalog-inventory-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "bc0564d1cfb19b3ff7a3a45f287c5fd42749aa83"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-grouped-product": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GroupedCatalogInventory\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-grouped-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-grouped-import-export/magento-module-grouped-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "0d3764973ae6083a9046166bb8f0456b562b638e"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-import-export": "101.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-grouped-product": "100.3.*",
-+                "magento/module-import-export": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GroupedImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-grouped-product",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-grouped-product/magento-module-grouped-product-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "a80950a2b6919304e818ea52e5bbbd450f272130"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-msrp": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-grouped-product-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GroupedProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-grouped-product-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-grouped-product-graph-ql/magento-module-grouped-product-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "4ec0716ff30b242c05ea435ddbd43a4c82802a77"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-grouped-product": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\GroupedProductGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-import-export/magento-module-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "3e09156751856fd6a7d96486687c5b56347672c2"
-+            },
-+            "require": {
-+                "ext-ctype": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-indexer",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-indexer/magento-module-indexer-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "bdd64582681713f6836e03916fbd5f88754480e5"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Indexer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-instant-purchase",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-instant-purchase/magento-module-instant-purchase-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "6a831727392f922a7af24ee282db3d8c0201f7db"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-vault": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InstantPurchase\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-integration",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-integration/magento-module-integration-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "416802c817152d1ceac6c1dd16162f08274f5ee6"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-security": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Integration\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory/magento-module-inventory-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "ce21405c9662b13edd131a3d52c562160f4d9f52"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Inventory\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-admin-ui/magento-module-inventory-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "ccdcdf958be78bf2b73b6d8fa558c42d07b87bbf"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-directory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-api",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-api/magento-module-inventory-api-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "f6da7918669ed256fab8bcf90537a1c853abd612"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-bundle-product",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-bundle-product/magento-module-inventory-bundle-product-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "395b08dcd35f14465f338a9da1cf1953a68ca327"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-bundle": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-configuration-api": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryBundleProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-bundle-product-admin-ui",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-bundle-product-admin-ui/magento-module-inventory-bundle-product-admin-ui-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "295705218a4f38202a3ee913092503dc5ccb9074"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-configuration-api": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryBundleProductAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-cache",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-cache/magento-module-inventory-cache-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "024f1d29d27adab967ae77e8b90ee208a06872e7"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-catalog-api": "1.0.*",
-+                "magento/module-inventory-indexer": "1.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog": "103.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryCache\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-catalog",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-catalog/magento-module-inventory-catalog-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "cf9fc73a20f4d4929c67ffddc5046bcf92437c69"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-indexer": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-reservations-api": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryCatalog\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-catalog-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-catalog-admin-ui/magento-module-inventory-catalog-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "828a6c4961021129eda07527d2d25eedac0e1bfa"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-asynchronous-operations": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-indexer": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-admin-ui": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryCatalogAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-catalog-api",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-catalog-api/magento-module-inventory-catalog-api-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "edc148f4419e249b37a316afefeef4b97c73bad1"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryCatalogApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-catalog-search",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-catalog-search/magento-module-inventory-catalog-search-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "cbe649fee67d9740d1cf2f3d9ce874d1a6413f76"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-indexer": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-search": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryCatalogSearch\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-configurable-product",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-configurable-product/magento-module-inventory-configurable-product-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "8d4c12fcdaa863c47893664e38fa1ad60e90ffb8"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-indexer": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-configurable-product": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryConfigurableProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-configurable-product-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-configurable-product-admin-ui/magento-module-inventory-configurable-product-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "18dfb9d8cb702ba1d2f465cbe0a5b8b57db07207"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-configurable-product": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-admin-ui": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryConfigurableProductAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-configurable-product-indexer",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-configurable-product-indexer/magento-module-inventory-configurable-product-indexer-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "540f1a1687b90b81168dca0f463fe12dae5e4e84"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-inventory-api": "1.0.*",
-+                "magento/module-inventory-catalog-api": "1.0.*",
-+                "magento/module-inventory-indexer": "1.0.*",
-+                "magento/module-inventory-multi-dimensional-indexer-api": "1.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryConfigurableProductIndexer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-configuration",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-configuration/magento-module-inventory-configuration-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "a9869aeddeede17ba0e442a989b809f86f0a86fe"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryConfiguration\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-configuration-api",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-configuration-api/magento-module-inventory-configuration-api-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "d091e7523a1d18099360d9e49f86a3e04dba71b4"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryConfigurationApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-distance-based-source-selection",
-+            "version": "1.0.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-distance-based-source-selection/magento-module-inventory-distance-based-source-selection-1.0.0.0.zip",
-+                "reference": null,
-+                "shasum": "c9b93cdfd600a3b493753313ac617dfc0ce8f19c"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-config": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-distance-based-source-selection-api": "*",
-+                "magento/module-inventory-source-selection-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryDistanceBasedSourceSelection\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-distance-based-source-selection-admin-ui",
-+            "version": "1.0.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-distance-based-source-selection-admin-ui/magento-module-inventory-distance-based-source-selection-admin-ui-1.0.0.0.zip",
-+                "reference": null,
-+                "shasum": "b75ca632a07386dc60c5572e353fe4ba47e22d01"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryDistanceBasedSourceSelectionAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-distance-based-source-selection-api",
-+            "version": "1.0.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-distance-based-source-selection-api/magento-module-inventory-distance-based-source-selection-api-1.0.0.0.zip",
-+                "reference": null,
-+                "shasum": "79d9c3f965d14612e95a4723000b1200d5a55b6c"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-source-selection-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryDistanceBasedSourceSelectionApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-elasticsearch",
-+            "version": "1.0.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-elasticsearch/magento-module-inventory-elasticsearch-1.0.0.0.zip",
-+                "reference": null,
-+                "shasum": "b46ff3807763c9967e60f67b155b47658387457b"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-catalog-search": "*",
-+                "magento/module-elasticsearch": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-indexer": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryElasticsearch\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-grouped-product",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-grouped-product/magento-module-inventory-grouped-product-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "19c3284175d75dafd8ad97cc35e1e47a527c82da"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-grouped-product": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-configuration-api": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryGroupedProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-grouped-product-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-grouped-product-admin-ui/magento-module-inventory-grouped-product-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "d15af53f7bbdd213fdb0af1a16f0e50d968c7240"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-grouped-product": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-admin-ui": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-configuration-api": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryGroupedProductAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-grouped-product-indexer",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-grouped-product-indexer/magento-module-inventory-grouped-product-indexer-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "f8aeffd329e1b556ebf1dfcb3ce23103ae724980"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-grouped-product": "*",
-+                "magento/module-inventory-api": "1.0.*",
-+                "magento/module-inventory-catalog-api": "1.0.*",
-+                "magento/module-inventory-indexer": "1.0.*",
-+                "magento/module-inventory-multi-dimensional-indexer-api": "1.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-inventory": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryGroupedProductIndexer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-import-export",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-import-export/magento-module-inventory-import-export-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "deefee73fd3c2bb9132e102cc272e4e2dce71088"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-eav": "*",
-+                "magento/module-import-export": "*",
-+                "magento/module-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-import-export": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-indexer",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-indexer/magento-module-inventory-indexer-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "61bc4572359a82e85b10d2a60a2ec15b9e917a9d"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-multi-dimensional-indexer-api": "*",
-+                "magento/module-inventory-sales": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog": "103.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryIndexer\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-low-quantity-notification",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-low-quantity-notification/magento-module-inventory-low-quantity-notification-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "d6779810c096678fa838aff0dc1d5d4c04cb3af6"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-eav": "*",
-+                "magento/module-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-low-quantity-notification-api": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryLowQuantityNotification\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-low-quantity-notification-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-low-quantity-notification-admin-ui/magento-module-inventory-low-quantity-notification-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "c61e759363d9cd39f6deae99ffcc2b8248831477"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-low-quantity-notification": "*",
-+                "magento/module-inventory-low-quantity-notification-api": "*",
-+                "magento/module-reports": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryLowQuantityNotificationAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-low-quantity-notification-api",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-low-quantity-notification-api/magento-module-inventory-low-quantity-notification-api-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "08c2657ee45ff0db1ca949437d7dd2da0da956a1"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryLowQuantityNotificationApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-multi-dimensional-indexer-api",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-multi-dimensional-indexer-api/magento-module-inventory-multi-dimensional-indexer-api-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "630ab27e5d236a5f0d061a76f80656a248c36000"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryMultiDimensionalIndexerApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-product-alert",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-product-alert/magento-module-inventory-product-alert-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "e21d973d4e58ffa137824b1856cb4ea028fb5135"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-product-alert": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-product-alert": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryProductAlert\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-reservations",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-reservations/magento-module-inventory-reservations-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "e527a03b2f48c13cea4081da2c7261bd69c4c92d"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-reservations-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryReservations\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-reservations-api",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-reservations-api/magento-module-inventory-reservations-api-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "3955de482006ccbf8d823ec28e042a69862059da"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryReservationsApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-sales",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-sales/magento-module-inventory-sales-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "d0a9a3d09d41dc3c1e7cce3a07335935ae2b7fc6"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-reservations-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-inventory-source-deduction-api": "*",
-+                "magento/module-sales": "*",
-+                "magento/module-sales-inventory": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "require-dev": {
-+                "magento/module-inventory-indexer": "*"
-+            },
-+            "suggest": {
-+                "magento/module-inventory-catalog": "1.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySales\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-sales-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-sales-admin-ui/magento-module-inventory-sales-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "13daf51ba16c09101f2574eb3dabf2221e81cb0a"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-catalog": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory-admin-ui": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-store": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySalesAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-sales-api",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-sales-api/magento-module-inventory-sales-api-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "6b8847fc22bd04015a9fc5717dfa94f6154d14b4"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-sales": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySalesApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-sales-frontend-ui",
-+            "version": "1.0.3",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-sales-frontend-ui/magento-module-inventory-sales-frontend-ui-1.0.3.0.zip",
-+                "reference": null,
-+                "shasum": "ef1f4e1d67c0add33fa1a5b6da08bed1fd6a7b97"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-catalog-inventory": "*",
-+                "magento/module-inventory-configuration-api": "1.0.*",
-+                "magento/module-inventory-sales-api": "1.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySalesFrontendUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-setup-fixture-generator",
-+            "version": "1.0.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-setup-fixture-generator/magento-module-inventory-setup-fixture-generator-1.0.0.0.zip",
-+                "reference": null,
-+                "shasum": "207fe21748b53ad44330a5abc5dc79f1f2a24bed"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySetupFixtureGenerator\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-shipping",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-shipping/magento-module-inventory-shipping-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "338a6df150d1ad1107cedba355c896b50275c431"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-catalog-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-inventory-source-deduction-api": "*",
-+                "magento/module-inventory-source-selection-api": "*",
-+                "magento/module-sales": "*",
-+                "magento/module-shipping": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryShipping\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-shipping-admin-ui",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-shipping-admin-ui/magento-module-inventory-shipping-admin-ui-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "faa48dd7930974c8fd4c792d70f9ab71fd971b78"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-backend": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-inventory-source-selection-api": "*",
-+                "magento/module-sales": "*",
-+                "magento/module-shipping": "*",
-+                "magento/module-ui": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventoryShippingAdminUi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-source-deduction-api",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-source-deduction-api/magento-module-inventory-source-deduction-api-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "4f3167eb248232b18483dae7cde986cb4170239e"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-configuration-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySourceDeductionApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-source-selection",
-+            "version": "1.0.4",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-source-selection/magento-module-inventory-source-selection-1.0.4.0.zip",
-+                "reference": null,
-+                "shasum": "3b8465fcb2f094c82eb86226581a74f8f6a23424"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-source-selection-api": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySourceSelection\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-inventory-source-selection-api",
-+            "version": "1.1.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-inventory-source-selection-api/magento-module-inventory-source-selection-api-1.1.0.0.zip",
-+                "reference": null,
-+                "shasum": "b7cf97c809075fe6fc2d95535a61c44f11440b77"
-+            },
-+            "require": {
-+                "magento/framework": "*",
-+                "magento/module-inventory-api": "*",
-+                "magento/module-inventory-sales-api": "*",
-+                "magento/module-sales": "*",
-+                "magento/module-store": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\InventorySourceSelectionApi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-layered-navigation",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-layered-navigation/magento-module-layered-navigation-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "32c5d1e9d21dd98adabe7083ddb3b39ab49d2bde"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\LayeredNavigation\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-marketplace",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-marketplace/magento-module-marketplace-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "81415a17e166c349e179e79fe8bb891a5cb63283"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Marketplace\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-media-storage",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-media-storage/magento-module-media-storage-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "dbf17a763cbf65cae32bb86fc1a0584fc51b00a0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\MediaStorage\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-message-queue",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-message-queue/magento-module-message-queue-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "e7a221ac13a53fc8e428bce254620f2d318ffd9c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\MessageQueue\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-msrp",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-msrp/magento-module-msrp-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "45cee25e493e4b43f1f10fc732f9967c62d36656"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-downloadable": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-bundle": "100.3.*",
-+                "magento/module-msrp-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Msrp\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-msrp-configurable-product",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-msrp-configurable-product/magento-module-msrp-configurable-product-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "cf76e419dad2243cd680b38e4d85aa48a1ea9ac9"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "magento/module-msrp": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\MsrpConfigurableProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-msrp-grouped-product",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-msrp-grouped-product/magento-module-msrp-grouped-product-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "083080ce31393078e30cb6fb17b274c865839b0c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-grouped-product": "100.3.*",
-+                "magento/module-msrp": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\MsrpGroupedProduct\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-multishipping",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-multishipping/magento-module-multishipping-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "2da74e0371ddccaca808e55dc81863dd65e3fa6f"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Multishipping\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-mysql-mq",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-mysql-mq/magento-module-mysql-mq-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "dda5a554028c56847a1ce717f92927b453708cfd"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\MysqlMq\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-new-relic-reporting",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-new-relic-reporting/magento-module-new-relic-reporting-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ee8dbe8627dbadf731cb2f8a9182971b530b54b2"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\NewRelicReporting\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-newsletter",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-newsletter/magento-module-newsletter-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "fad2941ec1d5451f5adc492d298eeef4e2410fe4"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-email": "101.0.*",
-+                "magento/module-require-js": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-widget": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Newsletter\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-offline-payments",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-offline-payments/magento-module-offline-payments-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "1299eb55d0cabd756610f1f091f5a57b71d4813c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\OfflinePayments\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-offline-shipping",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-offline-shipping/magento-module-offline-shipping-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "2d4ae255389cf87a50ed8bfe9af7e7cabdd6e664"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-sales-rule": "101.1.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-offline-shipping-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\OfflineShipping\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-page-cache",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-page-cache/magento-module-page-cache-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "4e2729548eee3283f06d3ed3bd0aac2c2c012a2f"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\PageCache\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-payment",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-payment/magento-module-payment-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "3a5dc59dc2f36c28e1b84701d2deb444a1110373"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Payment\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-paypal",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-paypal/magento-module-paypal-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "1c9210c8fd9354d89d580ddc2d29121f0ffc8c20"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-instant-purchase": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-vault": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-checkout-agreements": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Paypal\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-persistent",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-persistent/magento-module-persistent-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "bb6e14bbf0d568563cf1dc2e4aafdedaa31709de"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-cron": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Persistent\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-product-alert",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-product-alert/magento-module-product-alert-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "324a647bc52ff96f365e0be0e9628f1d36829026"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ProductAlert\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-product-video",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-product-video/magento-module-product-video-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "c6cb19d8f73d44399dde39e72d79bf6b7ff8e029"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ProductVideo\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Add Video to Products"
-+        },
-+        {
-+            "name": "magento/module-quote",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-quote/magento-module-quote-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "e2b39264ded8af41839229e7ce6dc1e13f41dab1"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-sales-sequence": "100.3.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-webapi": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Quote\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-quote-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-quote-analytics/magento-module-quote-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "04b120e37bfe9d985dcf1b1eb90b5d8044dd4d77"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-analytics": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\QuoteAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-quote-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-quote-graph-ql/magento-module-quote-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "232b4284ed0ccd26c715fcc23a089b3a011c5639"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-customer-graph-ql": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\QuoteGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-release-notification",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-release-notification/magento-module-release-notification-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "b6f40a4a0a6328fdf5dde3dd18d702190d5c2347"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ReleaseNotification\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-reports",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-reports/magento-module-reports-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "56df5dc26d25298d608a2e130073aa46c51d7a45"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-downloadable": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-review": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-sales-rule": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-widget": "101.1.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Reports\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-require-js",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-require-js/magento-module-require-js-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "348fa995170de7f4d508a600d8ca2b73cddfc17f"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\RequireJs\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-review",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-review/magento-module-review-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5d226e5ddf781537a69ef6bf648cf2be7621d0a8"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-newsletter": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-cookie": "100.3.*",
-+                "magento/module-review-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Review\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-review-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-review-analytics/magento-module-review-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "eb26fb256b43d77b4da00e16d9e76d0cb7078c96"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-analytics": "100.3.*",
-+                "magento/module-review": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ReviewAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-robots",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-robots/magento-module-robots-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "52129625db7928a4723a47fed097c843a27663d8"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-theme": "101.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Robots\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-rss",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-rss/magento-module-rss-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "1f792762c259e85590143df883323534611dc299"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Rss\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-rule",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-rule/magento-module-rule-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "2eec15c18c6ab5983a61e768f114c6dc96ec883d"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Rule\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sales",
-+            "version": "102.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sales/magento-module-sales-102.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "f7e58a0a0bcb551e96dde31c9de350e20e4d7ff5"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-bundle": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-gift-message": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-reports": "100.3.*",
-+                "magento/module-sales-rule": "101.1.*",
-+                "magento/module-sales-sequence": "100.3.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-widget": "101.1.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-sales-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Sales\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sales-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sales-analytics/magento-module-sales-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "f2d5d1dd165e3ea17667a5eaa105bd4757ac5844"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-analytics": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SalesAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sales-graph-ql",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sales-graph-ql/magento-module-sales-graph-ql-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "e10599dcbd5dd7866bfdaf8af7065577ce1e7ebc"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-customer-graph-ql": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SalesGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sales-inventory",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sales-inventory/magento-module-sales-inventory-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "6982aab2739a7ec5df5b25b5cac28dc70fea4c6b"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SalesInventory\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sales-rule",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sales-rule/magento-module-sales-rule-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "043d64f9e5a5b1564473532a1599c2fd58deed6e"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-rule": "101.1.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-reports": "100.3.*",
-+                "magento/module-rule": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-widget": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-sales-rule-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SalesRule\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sales-sequence",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sales-sequence/magento-module-sales-sequence-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "d045268eeef55a7d66f98c1ec77569ccc52b6683"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SalesSequence\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-sample-data",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sample-data/magento-module-sample-data-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "da0800d6ed74b8956ef00ee080230a18f048ed8f"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/sample-data-media": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "cli_commands.php",
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SampleData\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Sample Data fixtures"
-+        },
-+        {
-+            "name": "magento/module-search",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-search/magento-module-search-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "a9486668c87a5ba4bb4aa6c9f8060637f7027ca1"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog-search": "101.0.*",
-+                "magento/module-reports": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Search\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-security",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-security/magento-module-security-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "17018cf2303e60994bf28daa52fa6f7180f182da"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-customer": "102.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Security\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Security management module"
-+        },
-+        {
-+            "name": "magento/module-send-friend",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-send-friend/magento-module-send-friend-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "547e26b8d3570b3f0969b9f5802725e8d8651714"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-captcha": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SendFriend\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-send-friend-graph-ql",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-send-friend-graph-ql/magento-module-send-friend-graph-ql-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "ef5fbfcd51beb3ad8225fa03320cc45012b0bd70"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-send-friend": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SendFriendGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-shipping",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-shipping/magento-module-shipping-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "dd53451df643e7d4513cb3102f182eb1f96bbc36"
-+            },
-+            "require": {
-+                "ext-gd": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-contact": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*",
-+                "magento/module-fedex": "100.3.*",
-+                "magento/module-ups": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Shipping\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-signifyd",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-signifyd/magento-module-signifyd-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "768442b807e31bacfb5bbf914e155bac3ca88dde"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Signifyd\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Submitting Case Entry to Signifyd on Order Creation"
-+        },
-+        {
-+            "name": "magento/module-sitemap",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-sitemap/magento-module-sitemap-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "2f4535120d0551397680bdbd2365c08dd175f5f1"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-url-rewrite": "100.3.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-robots": "101.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Sitemap\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-store",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-store/magento-module-store-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "aa4a2db8d42094f5978782138eb16e3adcf6798c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-deploy": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Store\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-store-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-store-graph-ql/magento-module-store-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "7c00e21d6f4c5c45bf2cc4bf0dd9dfdaa83ccad3"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\StoreGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-swagger",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-swagger/magento-module-swagger-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "f17474413c08f94ca5f704d9eff5b6ad268a0440"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Swagger\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-swagger-webapi",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-swagger-webapi/magento-module-swagger-webapi-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "7e4ee0f77d30c0e358771d2815ed1065bcfea7a2"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-swagger": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SwaggerWebapi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-swagger-webapi-async",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-swagger-webapi-async/magento-module-swagger-webapi-async-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "8e47ef5ab81bf92742b100c75879871e5d356095"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-swagger": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SwaggerWebapiAsync\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-swatches",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-swatches/magento-module-swatches-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "e8f12b8f0935403f693e78d60633da666162cb5a"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-layered-navigation": "100.3.*",
-+                "magento/module-swatches-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Swatches\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "Add Swatches to Products"
-+        },
-+        {
-+            "name": "magento/module-swatches-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-swatches-graph-ql/magento-module-swatches-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "81636dcec8824fd41c6287203e25dd850afab20b"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-swatches": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SwatchesGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-swatches-layered-navigation",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-swatches-layered-navigation/magento-module-swatches-layered-navigation-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "0ba7397b12656fa9db3faee319ca64e65504cffa"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/magento-composer-installer": "*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\SwatchesLayeredNavigation\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-tax",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-tax/magento-module-tax-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ec9848f312abb6c03393aae776b086b1d4177ab0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-reports": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-tax-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Tax\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-tax-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-tax-graph-ql/magento-module-tax-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "eabd499aaf645826ac644dce948bba133d76aaf0"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-tax": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\TaxGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-tax-import-export",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-tax-import-export/magento-module-tax-import-export-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "8027abc153f14886965525539f873c8a4120cf8c"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\TaxImportExport\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-theme",
-+            "version": "101.0.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-theme/magento-module-theme-101.0.1.0.zip",
-+                "reference": null,
-+                "shasum": "e6fed3b1a3a3f21452f151e1eb2aa36510cb1b50"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-media-storage": "100.3.*",
-+                "magento/module-require-js": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-widget": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-deploy": "100.3.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-theme-sample-data": "Sample Data version: 100.3.*",
-+                "magento/module-translation": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Theme\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-theme-graph-ql",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-theme-graph-ql/magento-module-theme-graph-ql-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "cd9d5fd79db5547f5a5b1e4761b901451b2fc013"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-store-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\ThemeGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-tinymce-3",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-tinymce-3/magento-module-tinymce-3-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5153d30d5f5e5a8d99182a65dce142569f22861e"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "magento/module-variable": "100.3.*",
-+                "magento/module-widget": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-cms": "103.0.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Tinymce3\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-translation",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-translation/magento-module-translation-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "dbc9a6bd9d8aa234c5809103e6ac93372fa33c81"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-developer": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-deploy": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Translation\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-ui",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-ui/magento-module-ui-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "fc1e9663747d2f40f9a3278983598d9098ffca1a"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-user": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Ui\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-ups",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-ups/magento-module-ups-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "34c0f3f7c03bd533aff334fb88750fc109a71d1d"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-config": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Ups\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-url-rewrite",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-url-rewrite/magento-module-url-rewrite-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "f21c8619cec00fda18dd3dcb51cb2a4e8d451aee"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-url-rewrite": "100.3.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-cms-url-rewrite": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\UrlRewrite\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-url-rewrite-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-url-rewrite-graph-ql/magento-module-url-rewrite-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ba563f2348277b9f06cd2f4e3118fa756f453d6e"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-url-rewrite": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-graph-ql": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\UrlRewriteGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-user",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-user/magento-module-user-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "28a050491e3e447c8460f42b0f0549ad6adca190"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-email": "101.0.*",
-+                "magento/module-integration": "100.3.*",
-+                "magento/module-security": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\User\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-usps",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-usps/magento-module-usps-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "cf9a786445d64b36c1d4bc32666213225821d84d"
-+            },
-+            "require": {
-+                "lib-libxml": "*",
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-shipping": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Usps\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-variable",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-variable/magento-module-variable-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "7b8faefa05dc6e563ac5663db86b86a2dc3c02e8"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-config": "101.1.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Variable\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-vault",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-vault/magento-module-vault-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "c8702e4f0ec7fa9538194203be7e5bbf0bc8077b"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-payment": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Vault\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ]
-+        },
-+        {
-+            "name": "magento/module-version",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-version/magento-module-version-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "f35d618be8f999ec653c83de3e364d4eea5eb796"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Version\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-webapi",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-webapi/magento-module-webapi-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "9aee9870a6296462ed7b834383725b6f8cbfd8fe"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-authorization": "100.3.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-integration": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-user": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Webapi\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-webapi-async",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-webapi-async/magento-module-webapi-async-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "061d2e2ffd3476b78dedef5d078227fae7869019"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-asynchronous-operations": "100.3.*",
-+                "magento/module-webapi": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-user": "101.1.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\WebapiAsync\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-webapi-security",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-webapi-security/magento-module-webapi-security-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "ddc3201ecae4ff4fd0179fc387c69fe7af902caf"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-webapi": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\WebapiSecurity\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "WebapiSecurity module provides option to loosen security on some webapi resources."
-+        },
-+        {
-+            "name": "magento/module-weee",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-weee/magento-module-weee-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "665d507e1d1baad1769f91ad021a0484f811c745"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-directory": "100.3.*",
-+                "magento/module-eav": "102.0.*",
-+                "magento/module-page-cache": "100.3.*",
-+                "magento/module-quote": "101.1.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-tax": "100.3.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-bundle": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Weee\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-weee-graph-ql",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-weee-graph-ql/magento-module-weee-graph-ql-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "8cd539c61f3f52683cdf1d081d03ba1ab198da43"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-weee": "100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\WeeeGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-widget",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-widget/magento-module-widget-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "f7c8f6136274aee6ec623112981505475b36ea04"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-cms": "103.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-variable": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-widget-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Widget\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-wishlist",
-+            "version": "101.1.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-wishlist/magento-module-wishlist-101.1.1.0.zip",
-+                "reference": null,
-+                "shasum": "e73a999d11356a60646ccf7bc753d8ee04ed7035"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-backend": "101.0.*",
-+                "magento/module-captcha": "100.3.*",
-+                "magento/module-catalog": "103.0.*",
-+                "magento/module-catalog-inventory": "100.3.*",
-+                "magento/module-checkout": "100.3.*",
-+                "magento/module-customer": "102.0.*",
-+                "magento/module-rss": "100.3.*",
-+                "magento/module-sales": "102.0.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-theme": "101.0.*",
-+                "magento/module-ui": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "suggest": {
-+                "magento/module-bundle": "100.3.*",
-+                "magento/module-configurable-product": "100.3.*",
-+                "magento/module-cookie": "100.3.*",
-+                "magento/module-downloadable": "100.3.*",
-+                "magento/module-grouped-product": "100.3.*",
-+                "magento/module-wishlist-sample-data": "Sample Data version: 100.3.*"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\Wishlist\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-wishlist-analytics",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-wishlist-analytics/magento-module-wishlist-analytics-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "65852d6f8437a52706906c7c529398e60bf9052d"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-analytics": "100.3.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\WishlistAnalytics\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/module-wishlist-graph-ql",
-+            "version": "100.3.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/module-wishlist-graph-ql/magento-module-wishlist-graph-ql-100.3.0.0.zip",
-+                "reference": null,
-+                "shasum": "6b63731e8f68755b22f29e0b29febc8c3c374842"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/module-catalog-graph-ql": "100.3.*",
-+                "magento/module-store": "101.0.*",
-+                "magento/module-wishlist": "101.1.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\WishlistGraphQl\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/product-community-edition",
-+            "version": "2.3.1",
-+            "require": {
-+                "amzn/amazon-pay-and-login-magento-2-module": "3.1.4",
-+                "braintree/braintree_php": "3.35.0",
-+                "colinmollenhour/cache-backend-file": "~1.4.1",
-+                "colinmollenhour/cache-backend-redis": "1.10.6",
-+                "colinmollenhour/credis": "1.10.0",
-+                "colinmollenhour/php-redis-session-abstract": "~1.4.0",
-+                "composer/composer": "^1.6",
-+                "dotmailer/dotmailer-magento2-extension": "3.1.1",
-+                "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1",
-+                "ext-bcmath": "*",
-+                "ext-ctype": "*",
-+                "ext-curl": "*",
-+                "ext-dom": "*",
-+                "ext-gd": "*",
-+                "ext-hash": "*",
-+                "ext-iconv": "*",
-+                "ext-intl": "*",
-+                "ext-mbstring": "*",
-+                "ext-openssl": "*",
-+                "ext-pdo_mysql": "*",
-+                "ext-simplexml": "*",
-+                "ext-soap": "*",
-+                "ext-spl": "*",
-+                "ext-xsl": "*",
-+                "ext-zip": "*",
-+                "klarna/m2-payments": "7.1.0",
-+                "lib-libxml": "*",
-+                "magento/composer": "~1.4.0",
-+                "magento/framework": "102.0.1",
-+                "magento/framework-amqp": "100.3.1",
-+                "magento/framework-bulk": "100.3.1",
-+                "magento/framework-message-queue": "100.3.1",
-+                "magento/inventory-composer-metapackage": "1.1.1",
-+                "magento/language-de_de": "100.3.1",
-+                "magento/language-en_us": "100.3.1",
-+                "magento/language-es_es": "100.3.1",
-+                "magento/language-fr_fr": "100.3.1",
-+                "magento/language-nl_nl": "100.3.1",
-+                "magento/language-pt_br": "100.3.1",
-+                "magento/language-zh_hans_cn": "100.3.1",
-+                "magento/magento-composer-installer": ">=0.1.11",
-+                "magento/magento2-base": "2.3.1",
-+                "magento/module-admin-notification": "100.3.1",
-+                "magento/module-advanced-pricing-import-export": "100.3.1",
-+                "magento/module-advanced-search": "100.3.1",
-+                "magento/module-amqp": "100.3.1",
-+                "magento/module-analytics": "100.3.1",
-+                "magento/module-asynchronous-operations": "100.3.1",
-+                "magento/module-authorization": "100.3.1",
-+                "magento/module-authorizenet": "100.3.1",
-+                "magento/module-authorizenet-acceptjs": "100.3.0",
-+                "magento/module-backend": "101.0.1",
-+                "magento/module-backup": "100.3.1",
-+                "magento/module-braintree": "100.3.1",
-+                "magento/module-bundle": "100.3.1",
-+                "magento/module-bundle-graph-ql": "100.3.1",
-+                "magento/module-bundle-import-export": "100.3.1",
-+                "magento/module-cache-invalidate": "100.3.1",
-+                "magento/module-captcha": "100.3.1",
-+                "magento/module-catalog": "103.0.1",
-+                "magento/module-catalog-analytics": "100.3.1",
-+                "magento/module-catalog-graph-ql": "100.3.1",
-+                "magento/module-catalog-import-export": "101.0.1",
-+                "magento/module-catalog-inventory": "100.3.1",
-+                "magento/module-catalog-inventory-graph-ql": "100.3.1",
-+                "magento/module-catalog-rule": "101.1.1",
-+                "magento/module-catalog-rule-configurable": "100.3.1",
-+                "magento/module-catalog-search": "101.0.1",
-+                "magento/module-catalog-url-rewrite": "100.3.1",
-+                "magento/module-catalog-url-rewrite-graph-ql": "100.3.1",
-+                "magento/module-catalog-widget": "100.3.1",
-+                "magento/module-checkout": "100.3.1",
-+                "magento/module-checkout-agreements": "100.3.1",
-+                "magento/module-cms": "103.0.1",
-+                "magento/module-cms-graph-ql": "100.3.1",
-+                "magento/module-cms-url-rewrite": "100.3.1",
-+                "magento/module-cms-url-rewrite-graph-ql": "100.3.1",
-+                "magento/module-config": "101.1.1",
-+                "magento/module-configurable-import-export": "100.3.1",
-+                "magento/module-configurable-product": "100.3.1",
-+                "magento/module-configurable-product-graph-ql": "100.3.1",
-+                "magento/module-configurable-product-sales": "100.3.1",
-+                "magento/module-contact": "100.3.1",
-+                "magento/module-cookie": "100.3.1",
-+                "magento/module-cron": "100.3.1",
-+                "magento/module-currency-symbol": "100.3.1",
-+                "magento/module-customer": "102.0.1",
-+                "magento/module-customer-analytics": "100.3.1",
-+                "magento/module-customer-graph-ql": "100.3.1",
-+                "magento/module-customer-import-export": "100.3.1",
-+                "magento/module-deploy": "100.3.1",
-+                "magento/module-developer": "100.3.1",
-+                "magento/module-dhl": "100.3.1",
-+                "magento/module-directory": "100.3.1",
-+                "magento/module-directory-graph-ql": "100.3.0",
-+                "magento/module-downloadable": "100.3.1",
-+                "magento/module-downloadable-graph-ql": "100.3.1",
-+                "magento/module-downloadable-import-export": "100.3.1",
-+                "magento/module-eav": "102.0.1",
-+                "magento/module-eav-graph-ql": "100.3.1",
-+                "magento/module-elasticsearch": "100.3.1",
-+                "magento/module-elasticsearch-6": "100.3.0",
-+                "magento/module-email": "101.0.1",
-+                "magento/module-encryption-key": "100.3.1",
-+                "magento/module-fedex": "100.3.1",
-+                "magento/module-gift-message": "100.3.1",
-+                "magento/module-google-adwords": "100.3.1",
-+                "magento/module-google-analytics": "100.3.1",
-+                "magento/module-google-optimizer": "100.3.1",
-+                "magento/module-graph-ql": "100.3.1",
-+                "magento/module-grouped-catalog-inventory": "100.3.0",
-+                "magento/module-grouped-import-export": "100.3.1",
-+                "magento/module-grouped-product": "100.3.1",
-+                "magento/module-grouped-product-graph-ql": "100.3.1",
-+                "magento/module-import-export": "100.3.1",
-+                "magento/module-indexer": "100.3.1",
-+                "magento/module-instant-purchase": "100.3.1",
-+                "magento/module-integration": "100.3.1",
-+                "magento/module-layered-navigation": "100.3.1",
-+                "magento/module-marketplace": "100.3.1",
-+                "magento/module-media-storage": "100.3.1",
-+                "magento/module-message-queue": "100.3.1",
-+                "magento/module-msrp": "100.3.1",
-+                "magento/module-msrp-configurable-product": "100.3.0",
-+                "magento/module-msrp-grouped-product": "100.3.0",
-+                "magento/module-multishipping": "100.3.1",
-+                "magento/module-mysql-mq": "100.3.1",
-+                "magento/module-new-relic-reporting": "100.3.1",
-+                "magento/module-newsletter": "100.3.1",
-+                "magento/module-offline-payments": "100.3.1",
-+                "magento/module-offline-shipping": "100.3.1",
-+                "magento/module-page-cache": "100.3.1",
-+                "magento/module-payment": "100.3.1",
-+                "magento/module-paypal": "100.3.1",
-+                "magento/module-persistent": "100.3.1",
-+                "magento/module-product-alert": "100.3.1",
-+                "magento/module-product-video": "100.3.1",
-+                "magento/module-quote": "101.1.1",
-+                "magento/module-quote-analytics": "100.3.1",
-+                "magento/module-quote-graph-ql": "100.3.1",
-+                "magento/module-release-notification": "100.3.1",
-+                "magento/module-reports": "100.3.1",
-+                "magento/module-require-js": "100.3.1",
-+                "magento/module-review": "100.3.1",
-+                "magento/module-review-analytics": "100.3.1",
-+                "magento/module-robots": "101.0.1",
-+                "magento/module-rss": "100.3.1",
-+                "magento/module-rule": "100.3.1",
-+                "magento/module-sales": "102.0.1",
-+                "magento/module-sales-analytics": "100.3.1",
-+                "magento/module-sales-graph-ql": "100.3.0",
-+                "magento/module-sales-inventory": "100.3.1",
-+                "magento/module-sales-rule": "101.1.1",
-+                "magento/module-sales-sequence": "100.3.1",
-+                "magento/module-sample-data": "100.3.1",
-+                "magento/module-search": "101.0.1",
-+                "magento/module-security": "100.3.1",
-+                "magento/module-send-friend": "100.3.1",
-+                "magento/module-send-friend-graph-ql": "100.3.0",
-+                "magento/module-shipping": "100.3.1",
-+                "magento/module-signifyd": "100.3.1",
-+                "magento/module-sitemap": "100.3.1",
-+                "magento/module-store": "101.0.1",
-+                "magento/module-store-graph-ql": "100.3.1",
-+                "magento/module-swagger": "100.3.1",
-+                "magento/module-swagger-webapi": "100.3.1",
-+                "magento/module-swagger-webapi-async": "100.3.1",
-+                "magento/module-swatches": "100.3.1",
-+                "magento/module-swatches-graph-ql": "100.3.1",
-+                "magento/module-swatches-layered-navigation": "100.3.1",
-+                "magento/module-tax": "100.3.1",
-+                "magento/module-tax-graph-ql": "100.3.1",
-+                "magento/module-tax-import-export": "100.3.1",
-+                "magento/module-theme": "101.0.1",
-+                "magento/module-theme-graph-ql": "100.3.0",
-+                "magento/module-tinymce-3": "100.3.1",
-+                "magento/module-translation": "100.3.1",
-+                "magento/module-ui": "101.1.1",
-+                "magento/module-ups": "100.3.1",
-+                "magento/module-url-rewrite": "101.1.1",
-+                "magento/module-url-rewrite-graph-ql": "100.3.1",
-+                "magento/module-user": "101.1.1",
-+                "magento/module-usps": "100.3.1",
-+                "magento/module-variable": "100.3.1",
-+                "magento/module-vault": "101.1.1",
-+                "magento/module-version": "100.3.1",
-+                "magento/module-webapi": "100.3.1",
-+                "magento/module-webapi-async": "100.3.1",
-+                "magento/module-webapi-security": "100.3.1",
-+                "magento/module-weee": "100.3.1",
-+                "magento/module-weee-graph-ql": "100.3.1",
-+                "magento/module-widget": "101.1.1",
-+                "magento/module-wishlist": "101.1.1",
-+                "magento/module-wishlist-analytics": "100.3.1",
-+                "magento/module-wishlist-graph-ql": "100.3.0",
-+                "magento/theme-adminhtml-backend": "100.3.1",
-+                "magento/theme-frontend-blank": "100.3.1",
-+                "magento/theme-frontend-luma": "100.3.1",
-+                "magento/zendframework1": "~1.14.1",
-+                "monolog/monolog": "^1.17",
-+                "msp/recaptcha": "2.0.2",
-+                "msp/twofactorauth": "3.0.0",
-+                "oyejorge/less.php": "~1.7.0",
-+                "paragonie/sodium_compat": "^1.6",
-+                "pelago/emogrifier": "^2.0.0",
-+                "php": "~7.1.3||~7.2.0",
-+                "php-amqplib/php-amqplib": "~2.7.0",
-+                "phpseclib/mcrypt_compat": "1.0.8",
-+                "phpseclib/phpseclib": "2.0.*",
-+                "ramsey/uuid": "~3.8.0",
-+                "symfony/console": "~4.1.0",
-+                "symfony/event-dispatcher": "~4.1.0",
-+                "symfony/process": "~4.1.0",
-+                "tedivm/jshrink": "~1.3.0",
-+                "temando/module-shipping-m2": "1.5.1",
-+                "tubalmartin/cssmin": "4.1.1",
-+                "vertex/product-magento-module": "3.1.0",
-+                "webonyx/graphql-php": "^0.12.6",
-+                "zendframework/zend-captcha": "^2.7.1",
-+                "zendframework/zend-code": "~3.3.0",
-+                "zendframework/zend-config": "^2.6.0",
-+                "zendframework/zend-console": "^2.6.0",
-+                "zendframework/zend-crypt": "^2.6.0",
-+                "zendframework/zend-db": "^2.8.2",
-+                "zendframework/zend-di": "^2.6.1",
-+                "zendframework/zend-eventmanager": "^2.6.3",
-+                "zendframework/zend-feed": "^2.9.0",
-+                "zendframework/zend-form": "^2.10.0",
-+                "zendframework/zend-http": "^2.6.0",
-+                "zendframework/zend-i18n": "^2.7.3",
-+                "zendframework/zend-json": "^2.6.1",
-+                "zendframework/zend-log": "^2.9.1",
-+                "zendframework/zend-mail": "^2.9.0",
-+                "zendframework/zend-modulemanager": "^2.7",
-+                "zendframework/zend-mvc": "~2.7.0",
-+                "zendframework/zend-serializer": "^2.7.2",
-+                "zendframework/zend-server": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.8",
-+                "zendframework/zend-session": "^2.7.3",
-+                "zendframework/zend-soap": "^2.7.0",
-+                "zendframework/zend-stdlib": "^2.7.7",
-+                "zendframework/zend-text": "^2.6.0",
-+                "zendframework/zend-uri": "^2.5.1",
-+                "zendframework/zend-validator": "^2.6.0",
-+                "zendframework/zend-view": "~2.10.0"
-+            },
-+            "type": "metapackage",
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "eCommerce Platform for Growth (Community Edition)"
-+        },
-+        {
-+            "name": "magento/theme-adminhtml-backend",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/theme-adminhtml-backend/magento-theme-adminhtml-backend-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "16ba686421c8f62c5adafea59b9348dc3f9f9dc1"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-theme",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/theme-frontend-blank",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/theme-frontend-blank/magento-theme-frontend-blank-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "5d0c6b04a16d20899bb5b70394fe8db257832dd1"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-theme",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/theme-frontend-luma",
-+            "version": "100.3.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/magento/theme-frontend-luma/magento-theme-frontend-luma-100.3.1.0.zip",
-+                "reference": null,
-+                "shasum": "4ecc9f6a9fa4dfc5be7f4dec8fc8a9535ec1f5f3"
-+            },
-+            "require": {
-+                "magento/framework": "102.0.*",
-+                "magento/theme-frontend-blank": "100.3.*",
-+                "php": "~7.1.3||~7.2.0"
-+            },
-+            "type": "magento2-theme",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ]
-+            },
-+            "license": [
-+                "OSL-3.0",
-+                "AFL-3.0"
-+            ],
-+            "description": "N/A"
-+        },
-+        {
-+            "name": "magento/zendframework1",
-+            "version": "1.14.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/magento/zf1.git",
-+                "reference": "4df018254c70b5b998b00a8cb1a30760f831ff0d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/magento/zf1/zipball/4df018254c70b5b998b00a8cb1a30760f831ff0d",
-+                "reference": "4df018254c70b5b998b00a8cb1a30760f831ff0d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.2.11"
-+            },
-+            "require-dev": {
-+                "phpunit/dbunit": "1.3.*",
-+                "phpunit/phpunit": "3.7.*"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.12.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "Zend_": "library/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "include-path": [
-+                "library/"
-+            ],
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "description": "Magento Zend Framework 1",
-+            "homepage": "http://framework.zend.com/",
-+            "keywords": [
-+                "ZF1",
-+                "framework"
-+            ],
-+            "time": "2018-08-09T15:03:40+00:00"
-+        },
-+        {
-+            "name": "monolog/monolog",
-+            "version": "1.24.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Seldaek/monolog.git",
-+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
-+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0",
-+                "psr/log": "~1.0"
-+            },
-+            "provide": {
-+                "psr/log-implementation": "1.0.0"
-+            },
-+            "require-dev": {
-+                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
-+                "doctrine/couchdb": "~1.0@dev",
-+                "graylog2/gelf-php": "~1.0",
-+                "jakub-onderka/php-parallel-lint": "0.9",
-+                "php-amqplib/php-amqplib": "~2.4",
-+                "php-console/php-console": "^3.1.3",
-+                "phpunit/phpunit": "~4.5",
-+                "phpunit/phpunit-mock-objects": "2.3.0",
-+                "ruflin/elastica": ">=0.90 <3.0",
-+                "sentry/sentry": "^0.13",
-+                "swiftmailer/swiftmailer": "^5.3|^6.0"
-+            },
-+            "suggest": {
-+                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-+                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-+                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-+                "ext-mongo": "Allow sending log messages to a MongoDB server",
-+                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-+                "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
-+                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-+                "php-console/php-console": "Allow sending log messages to Google Chrome",
-+                "rollbar/rollbar": "Allow sending log messages to Rollbar",
-+                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
-+                "sentry/sentry": "Allow sending log messages to a Sentry server"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Monolog\\": "src/Monolog"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-+                }
-+            ],
-+            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-+            "homepage": "http://github.com/Seldaek/monolog",
-+            "keywords": [
-+                "log",
-+                "logging",
-+                "psr-3"
-+            ],
-+            "time": "2018-11-05T09:00:11+00:00"
-+        },
-+        {
-+            "name": "msp/recaptcha",
-+            "version": "2.0.2",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/msp/recaptcha/msp-recaptcha-2.0.2.0.zip",
-+                "reference": null,
-+                "shasum": "f037ce5e2b4202117adc4ec0ab93212ef31bff7e"
-+            },
-+            "require": {
-+                "google/recaptcha": "^1.1",
-+                "magento/magento-composer-installer": "*",
-+                "php": "^7.0|^7.1|^7.2"
-+            },
-+            "suggest": {
-+                "msp/security-suite": "Full MageSpecialist Security Suite"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "MSP\\ReCaptcha\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Riccardo Tempesta",
-+                    "email": "riccardo.tempesta@magespecialist.it"
-+                }
-+            ],
-+            "description": "Google reCaptcha integration for Magento2 - Member of MageSpecialist SecuritySuite"
-+        },
-+        {
-+            "name": "msp/twofactorauth",
-+            "version": "3.0.0",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/msp/twofactorauth/msp-twofactorauth-3.0.0.0.zip",
-+                "reference": null,
-+                "shasum": "ba56d984ae834a8e87a76aed81bcaf6fd6d811b1"
-+            },
-+            "require": {
-+                "christian-riesen/base32": "^1.3",
-+                "donatj/phpuseragentparser": "~0.7",
-+                "endroid/qr-code": "^2.5",
-+                "magento/magento-composer-installer": "*",
-+                "php": "^7.0|^7.1|^7.2",
-+                "spomky-labs/otphp": "~8.3",
-+                "yubico/u2flib-server": "^1.0"
-+            },
-+            "suggest": {
-+                "msp/security-suite": "Full MageSpecialist Security Suite"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "MSP\\TwoFactorAuth\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Riccardo Tempesta",
-+                    "email": "riccardo.tempesta@magespecialist.it"
-+                }
-+            ],
-+            "description": "Two Factor Authentication module for Magento2 - Member of MageSpecialist SecuritySuite"
-+        },
-+        {
-+            "name": "myclabs/php-enum",
-+            "version": "1.6.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/myclabs/php-enum.git",
-+                "reference": "32c4202886c51fbe5cc3a7c34ec5c9a4a790345e"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/32c4202886c51fbe5cc3a7c34ec5c9a4a790345e",
-+                "reference": "32c4202886c51fbe5cc3a7c34ec5c9a4a790345e",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-json": "*",
-+                "php": ">=5.4"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
-+                "squizlabs/php_codesniffer": "1.*"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "MyCLabs\\Enum\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "PHP Enum contributors",
-+                    "homepage": "https://github.com/myclabs/php-enum/graphs/contributors"
-+                }
-+            ],
-+            "description": "PHP Enum implementation",
-+            "homepage": "http://github.com/myclabs/php-enum",
-+            "keywords": [
-+                "enum"
-+            ],
-+            "time": "2019-02-04T21:18:49+00:00"
-+        },
-+        {
-+            "name": "oyejorge/less.php",
-+            "version": "v1.7.0.14",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/oyejorge/less.php.git",
-+                "reference": "42925c5a01a07d67ca7e82dfc8fb31814d557bc9"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/oyejorge/less.php/zipball/42925c5a01a07d67ca7e82dfc8fb31814d557bc9",
-+                "reference": "42925c5a01a07d67ca7e82dfc8fb31814d557bc9",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.8.24"
-+            },
-+            "bin": [
-+                "bin/lessc"
-+            ],
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Less": "lib/"
-+                },
-+                "classmap": [
-+                    "lessc.inc.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "Apache-2.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Matt Agar",
-+                    "homepage": "https://github.com/agar"
-+                },
-+                {
-+                    "name": "Martin Jantošovič",
-+                    "homepage": "https://github.com/Mordred"
-+                },
-+                {
-+                    "name": "Josh Schmidt",
-+                    "homepage": "https://github.com/oyejorge"
-+                }
-+            ],
-+            "description": "PHP port of the Javascript version of LESS http://lesscss.org (Originally maintained by Josh Schmidt)",
-+            "homepage": "http://lessphp.gpeasy.com",
-+            "keywords": [
-+                "css",
-+                "less",
-+                "less.js",
-+                "lesscss",
-+                "php",
-+                "stylesheet"
-+            ],
-+            "time": "2017-03-28T22:19:25+00:00"
-+        },
-+        {
-+            "name": "paragonie/constant_time_encoding",
-+            "version": "v2.2.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/paragonie/constant_time_encoding.git",
-+                "reference": "55af0dc01992b4d0da7f6372e2eac097bbbaffdb"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/55af0dc01992b4d0da7f6372e2eac097bbbaffdb",
-+                "reference": "55af0dc01992b4d0da7f6372e2eac097bbbaffdb",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^6|^7",
-+                "vimeo/psalm": "^1|^2"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "ParagonIE\\ConstantTime\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Paragon Initiative",
-+                    "email": "security@paragonie.com",
-+                    "homepage": "https://paragonie.com",
-+                    "role": "Maintainer"
-+                },
-+                {
-+                    "name": "Steve 'Sc00bz' Thomas",
-+                    "email": "steve@tobtu.com",
-+                    "homepage": "https://www.tobtu.com",
-+                    "role": "Original Developer"
-+                }
-+            ],
-+            "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
-+            "keywords": [
-+                "base16",
-+                "base32",
-+                "base32_decode",
-+                "base32_encode",
-+                "base64",
-+                "base64_decode",
-+                "base64_encode",
-+                "bin2hex",
-+                "encoding",
-+                "hex",
-+                "hex2bin",
-+                "rfc4648"
-+            ],
-+            "time": "2019-01-03T20:26:31+00:00"
-+        },
-+        {
-+            "name": "paragonie/random_compat",
-+            "version": "v9.99.99",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/paragonie/random_compat.git",
-+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "4.*|5.*",
-+                "vimeo/psalm": "^1"
-+            },
-+            "suggest": {
-+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-+            },
-+            "type": "library",
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Paragon Initiative",
-+                    "email": "security@paragonie.com",
-+                    "homepage": "https://paragonie.com"
-+                }
-+            ],
-+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-+            "keywords": [
-+                "csprng",
-+                "polyfill",
-+                "pseudorandom",
-+                "random"
-+            ],
-+            "time": "2018-07-02T15:55:56+00:00"
-+        },
-+        {
-+            "name": "paragonie/sodium_compat",
-+            "version": "v1.9.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/paragonie/sodium_compat.git",
-+                "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/87125d5b265f98c4d1b8d83a1f0726607c229421",
-+                "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "paragonie/random_compat": ">=1",
-+                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^3|^4|^5"
-+            },
-+            "suggest": {
-+                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
-+                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "autoload.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "ISC"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Paragon Initiative",
-+                    "email": "security@paragonie.com"
-+                },
-+                {
-+                    "name": "Frank Denis",
-+                    "email": "jedisct1@pureftpd.org"
-+                }
-+            ],
-+            "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
-+            "keywords": [
-+                "Authentication",
-+                "BLAKE2b",
-+                "ChaCha20",
-+                "ChaCha20-Poly1305",
-+                "Chapoly",
-+                "Curve25519",
-+                "Ed25519",
-+                "EdDSA",
-+                "Edwards-curve Digital Signature Algorithm",
-+                "Elliptic Curve Diffie-Hellman",
-+                "Poly1305",
-+                "Pure-PHP cryptography",
-+                "RFC 7748",
-+                "RFC 8032",
-+                "Salpoly",
-+                "Salsa20",
-+                "X25519",
-+                "XChaCha20-Poly1305",
-+                "XSalsa20-Poly1305",
-+                "Xchacha20",
-+                "Xsalsa20",
-+                "aead",
-+                "cryptography",
-+                "ecdh",
-+                "elliptic curve",
-+                "elliptic curve cryptography",
-+                "encryption",
-+                "libsodium",
-+                "php",
-+                "public-key cryptography",
-+                "secret-key cryptography",
-+                "side-channel resistant"
-+            ],
-+            "time": "2019-03-20T17:19:05+00:00"
-+        },
-+        {
-+            "name": "pelago/emogrifier",
-+            "version": "v2.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/MyIntervals/emogrifier.git",
-+                "reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/8ee7fb5ad772915451ed3415c1992bd3697d4983",
-+                "reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-dom": "*",
-+                "ext-libxml": "*",
-+                "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
-+                "symfony/css-selector": "^3.4.0 || ^4.0.0"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "^2.2.0",
-+                "phpmd/phpmd": "^2.6.0",
-+                "phpunit/phpunit": "^4.8.0",
-+                "squizlabs/php_codesniffer": "^3.3.2"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Pelago\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "John Reeve",
-+                    "email": "jreeve@pelagodesign.com"
-+                },
-+                {
-+                    "name": "Cameron Brooks"
-+                },
-+                {
-+                    "name": "Jaime Prado"
-+                },
-+                {
-+                    "name": "Oliver Klee",
-+                    "email": "github@oliverklee.de"
-+                },
-+                {
-+                    "name": "Zoli Szabó",
-+                    "email": "zoli.szabo+github@gmail.com"
-+                },
-+                {
-+                    "name": "Jake Hotson",
-+                    "email": "jake@qzdesign.co.uk"
-+                }
-+            ],
-+            "description": "Converts CSS styles into inline style attributes in your HTML code",
-+            "homepage": "https://www.myintervals.com/emogrifier.php",
-+            "keywords": [
-+                "css",
-+                "email",
-+                "pre-processing"
-+            ],
-+            "time": "2018-12-10T10:36:30+00:00"
-+        },
-+        {
-+            "name": "php-amqplib/php-amqplib",
-+            "version": "v2.7.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/php-amqplib/php-amqplib.git",
-+                "reference": "a8ba54bd35b973fc6861e4c2e105f71e9e95f43f"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/a8ba54bd35b973fc6861e4c2e105f71e9e95f43f",
-+                "reference": "a8ba54bd35b973fc6861e4c2e105f71e9e95f43f",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-bcmath": "*",
-+                "ext-mbstring": "*",
-+                "php": ">=5.3.0"
-+            },
-+            "replace": {
-+                "videlalvaro/php-amqplib": "self.version"
-+            },
-+            "require-dev": {
-+                "phpdocumentor/phpdocumentor": "^2.9",
-+                "phpunit/phpunit": "^4.8",
-+                "scrutinizer/ocular": "^1.1",
-+                "squizlabs/php_codesniffer": "^2.5"
-+            },
-+            "suggest": {
-+                "ext-sockets": "Use AMQPSocketConnection"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "PhpAmqpLib\\": "PhpAmqpLib/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "LGPL-2.1-or-later"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Alvaro Videla",
-+                    "role": "Original Maintainer"
-+                },
-+                {
-+                    "name": "John Kelly",
-+                    "email": "johnmkelly86@gmail.com",
-+                    "role": "Maintainer"
-+                },
-+                {
-+                    "name": "Raúl Araya",
-+                    "email": "nubeiro@gmail.com",
-+                    "role": "Maintainer"
-+                }
-+            ],
-+            "description": "Formerly videlalvaro/php-amqplib.  This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.",
-+            "homepage": "https://github.com/php-amqplib/php-amqplib/",
-+            "keywords": [
-+                "message",
-+                "queue",
-+                "rabbitmq"
-+            ],
-+            "time": "2018-04-30T03:54:54+00:00"
-+        },
-+        {
-+            "name": "phpseclib/mcrypt_compat",
-+            "version": "1.0.8",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/phpseclib/mcrypt_compat.git",
-+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
-+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3",
-+                "phpseclib/phpseclib": ">=2.0.11 <3.0.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0"
-+            },
-+            "suggest": {
-+                "ext-openssl": "Will enable faster cryptographic operations"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "lib/mcrypt.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jim Wigginton",
-+                    "email": "terrafrost@php.net",
-+                    "homepage": "http://phpseclib.sourceforge.net"
-+                }
-+            ],
-+            "description": "PHP 7.1 polyfill for the mcrypt extension from PHP <= 7.0",
-+            "keywords": [
-+                "cryptograpy",
-+                "encryption",
-+                "mcrypt"
-+            ],
-+            "time": "2018-08-22T03:11:43+00:00"
-+        },
-+        {
-+            "name": "phpseclib/phpseclib",
-+            "version": "2.0.15",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/phpseclib/phpseclib.git",
-+                "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
-+                "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3"
-+            },
-+            "require-dev": {
-+                "phing/phing": "~2.7",
-+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
-+                "sami/sami": "~2.0",
-+                "squizlabs/php_codesniffer": "~2.0"
-+            },
-+            "suggest": {
-+                "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
-+                "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
-+                "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-+                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "phpseclib/bootstrap.php"
-+                ],
-+                "psr-4": {
-+                    "phpseclib\\": "phpseclib/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jim Wigginton",
-+                    "email": "terrafrost@php.net",
-+                    "role": "Lead Developer"
-+                },
-+                {
-+                    "name": "Patrick Monnerat",
-+                    "email": "pm@datasphere.ch",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Andreas Fischer",
-+                    "email": "bantu@phpbb.com",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Hans-Jürgen Petrich",
-+                    "email": "petrich@tronic-media.com",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Graham Campbell",
-+                    "email": "graham@alt-three.com",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
-+            "homepage": "http://phpseclib.sourceforge.net",
-+            "keywords": [
-+                "BigInteger",
-+                "aes",
-+                "asn.1",
-+                "asn1",
-+                "blowfish",
-+                "crypto",
-+                "cryptography",
-+                "encryption",
-+                "rsa",
-+                "security",
-+                "sftp",
-+                "signature",
-+                "signing",
-+                "ssh",
-+                "twofish",
-+                "x.509",
-+                "x509"
-+            ],
-+            "time": "2019-03-10T16:53:45+00:00"
-+        },
-+        {
-+            "name": "psr/container",
-+            "version": "1.0.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/php-fig/container.git",
-+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Psr\\Container\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "PHP-FIG",
-+                    "homepage": "http://www.php-fig.org/"
-+                }
-+            ],
-+            "description": "Common Container Interface (PHP FIG PSR-11)",
-+            "homepage": "https://github.com/php-fig/container",
-+            "keywords": [
-+                "PSR-11",
-+                "container",
-+                "container-interface",
-+                "container-interop",
-+                "psr"
-+            ],
-+            "time": "2017-02-14T16:28:37+00:00"
-+        },
-+        {
-+            "name": "psr/http-message",
-+            "version": "1.0.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/php-fig/http-message.git",
-+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Psr\\Http\\Message\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "PHP-FIG",
-+                    "homepage": "http://www.php-fig.org/"
-+                }
-+            ],
-+            "description": "Common interface for HTTP messages",
-+            "homepage": "https://github.com/php-fig/http-message",
-+            "keywords": [
-+                "http",
-+                "http-message",
-+                "psr",
-+                "psr-7",
-+                "request",
-+                "response"
-+            ],
-+            "time": "2016-08-06T14:39:51+00:00"
-+        },
-+        {
-+            "name": "psr/log",
-+            "version": "1.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/php-fig/log.git",
-+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Psr\\Log\\": "Psr/Log/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "PHP-FIG",
-+                    "homepage": "http://www.php-fig.org/"
-+                }
-+            ],
-+            "description": "Common interface for logging libraries",
-+            "homepage": "https://github.com/php-fig/log",
-+            "keywords": [
-+                "log",
-+                "psr",
-+                "psr-3"
-+            ],
-+            "time": "2018-11-20T15:27:04+00:00"
-+        },
-+        {
-+            "name": "ralouphie/getallheaders",
-+            "version": "2.0.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/ralouphie/getallheaders.git",
-+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
-+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~3.7.0",
-+                "satooshi/php-coveralls": ">=1.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "files": [
-+                    "src/getallheaders.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Ralph Khattar",
-+                    "email": "ralph.khattar@gmail.com"
-+                }
-+            ],
-+            "description": "A polyfill for getallheaders.",
-+            "time": "2016-02-11T07:05:27+00:00"
-+        },
-+        {
-+            "name": "ramsey/uuid",
-+            "version": "3.8.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/ramsey/uuid.git",
-+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
-+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "paragonie/random_compat": "^1.0|^2.0|9.99.99",
-+                "php": "^5.4 || ^7.0",
-+                "symfony/polyfill-ctype": "^1.8"
-+            },
-+            "replace": {
-+                "rhumsaa/uuid": "self.version"
-+            },
-+            "require-dev": {
-+                "codeception/aspect-mock": "^1.0 | ~2.0.0",
-+                "doctrine/annotations": "~1.2.0",
-+                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
-+                "ircmaxell/random-lib": "^1.1",
-+                "jakub-onderka/php-parallel-lint": "^0.9.0",
-+                "mockery/mockery": "^0.9.9",
-+                "moontoast/math": "^1.1",
-+                "php-mock/php-mock-phpunit": "^0.3|^1.1",
-+                "phpunit/phpunit": "^4.7|^5.0|^6.5",
-+                "squizlabs/php_codesniffer": "^2.3"
-+            },
-+            "suggest": {
-+                "ext-ctype": "Provides support for PHP Ctype functions",
-+                "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
-+                "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
-+                "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
-+                "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
-+                "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid",
-+                "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "3.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Ramsey\\Uuid\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Marijn Huizendveld",
-+                    "email": "marijn.huizendveld@gmail.com"
-+                },
-+                {
-+                    "name": "Thibaud Fabre",
-+                    "email": "thibaud@aztech.io"
-+                },
-+                {
-+                    "name": "Ben Ramsey",
-+                    "email": "ben@benramsey.com",
-+                    "homepage": "https://benramsey.com"
-+                }
-+            ],
-+            "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
-+            "homepage": "https://github.com/ramsey/uuid",
-+            "keywords": [
-+                "guid",
-+                "identifier",
-+                "uuid"
-+            ],
-+            "time": "2018-07-19T23:38:55+00:00"
-+        },
-+        {
-+            "name": "react/promise",
-+            "version": "v2.7.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/reactphp/promise.git",
-+                "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/reactphp/promise/zipball/31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
-+                "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.4.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.8"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "React\\Promise\\": "src/"
-+                },
-+                "files": [
-+                    "src/functions_include.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jan Sorgalla",
-+                    "email": "jsorgalla@gmail.com"
-+                }
-+            ],
-+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
-+            "keywords": [
-+                "promise",
-+                "promises"
-+            ],
-+            "time": "2019-01-07T21:25:54+00:00"
-+        },
-+        {
-+            "name": "seld/jsonlint",
-+            "version": "1.7.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Seldaek/jsonlint.git",
-+                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
-+                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.3 || ^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-+            },
-+            "bin": [
-+                "bin/jsonlint"
-+            ],
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be",
-+                    "homepage": "http://seld.be"
-+                }
-+            ],
-+            "description": "JSON Linter",
-+            "keywords": [
-+                "json",
-+                "linter",
-+                "parser",
-+                "validator"
-+            ],
-+            "time": "2018-01-24T12:46:19+00:00"
-+        },
-+        {
-+            "name": "seld/phar-utils",
-+            "version": "1.0.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Seldaek/phar-utils.git",
-+                "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/7009b5139491975ef6486545a39f3e6dad5ac30a",
-+                "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Seld\\PharUtils\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jordi Boggiano",
-+                    "email": "j.boggiano@seld.be"
-+                }
-+            ],
-+            "description": "PHAR file format utilities, for when PHP phars you up",
-+            "keywords": [
-+                "phra"
-+            ],
-+            "time": "2015-10-13T18:44:15+00:00"
-+        },
-+        {
-+            "name": "spomky-labs/otphp",
-+            "version": "v8.3.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Spomky-Labs/otphp.git",
-+                "reference": "eb14442699ae6470b29ffd89238a9ccfb9f20788"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Spomky-Labs/otphp/zipball/eb14442699ae6470b29ffd89238a9ccfb9f20788",
-+                "reference": "eb14442699ae6470b29ffd89238a9ccfb9f20788",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "beberlei/assert": "^2.4",
-+                "paragonie/constant_time_encoding": "^1.0|^2.0",
-+                "paragonie/random_compat": ">=2",
-+                "php": "^5.5|^7.0",
-+                "symfony/polyfill-mbstring": "^1.1",
-+                "symfony/polyfill-php56": "^1.1"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.0|^5.0",
-+                "satooshi/php-coveralls": "^1.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "8.2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "OTPHP\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Florent Morselli",
-+                    "homepage": "https://github.com/Spomky"
-+                },
-+                {
-+                    "name": "All contributors",
-+                    "homepage": "https://github.com/Spomky-Labs/otphp/contributors"
-+                }
-+            ],
-+            "description": "A PHP library for generating one time passwords according to RFC 4226 (HOTP Algorithm) and the RFC 6238 (TOTP Algorithm) and compatible with Google Authenticator",
-+            "homepage": "https://github.com/Spomky-Labs/otphp",
-+            "keywords": [
-+                "FreeOTP",
-+                "RFC 4226",
-+                "RFC 6238",
-+                "google authenticator",
-+                "hotp",
-+                "otp",
-+                "totp"
-+            ],
-+            "time": "2018-09-13T19:25:26+00:00"
-+        },
-+        {
-+            "name": "symfony/console",
-+            "version": "v4.1.11",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/console.git",
-+                "reference": "9e87c798f67dc9fceeb4f3d57847b52d945d1a02"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/console/zipball/9e87c798f67dc9fceeb4f3d57847b52d945d1a02",
-+                "reference": "9e87c798f67dc9fceeb4f3d57847b52d945d1a02",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3",
-+                "symfony/polyfill-mbstring": "~1.0"
-+            },
-+            "conflict": {
-+                "symfony/dependency-injection": "<3.4",
-+                "symfony/process": "<3.3"
-+            },
-+            "provide": {
-+                "psr/log-implementation": "1.0"
-+            },
-+            "require-dev": {
-+                "psr/log": "~1.0",
-+                "symfony/config": "~3.4|~4.0",
-+                "symfony/dependency-injection": "~3.4|~4.0",
-+                "symfony/event-dispatcher": "~3.4|~4.0",
-+                "symfony/lock": "~3.4|~4.0",
-+                "symfony/process": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "psr/log": "For using the console logger",
-+                "symfony/event-dispatcher": "",
-+                "symfony/lock": "",
-+                "symfony/process": ""
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Console\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Console Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-25T14:34:37+00:00"
-+        },
-+        {
-+            "name": "symfony/css-selector",
-+            "version": "v4.2.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/css-selector.git",
-+                "reference": "48eddf66950fa57996e1be4a55916d65c10c604a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/48eddf66950fa57996e1be4a55916d65c10c604a",
-+                "reference": "48eddf66950fa57996e1be4a55916d65c10c604a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\CssSelector\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Jean-François Simon",
-+                    "email": "jeanfrancois.simon@sensiolabs.com"
-+                },
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony CssSelector Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-16T20:31:39+00:00"
-+        },
-+        {
-+            "name": "symfony/event-dispatcher",
-+            "version": "v4.1.11",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/event-dispatcher.git",
-+                "reference": "51be1b61dfe04d64a260223f2b81475fa8066b97"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/51be1b61dfe04d64a260223f2b81475fa8066b97",
-+                "reference": "51be1b61dfe04d64a260223f2b81475fa8066b97",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3"
-+            },
-+            "conflict": {
-+                "symfony/dependency-injection": "<3.4"
-+            },
-+            "require-dev": {
-+                "psr/log": "~1.0",
-+                "symfony/config": "~3.4|~4.0",
-+                "symfony/dependency-injection": "~3.4|~4.0",
-+                "symfony/expression-language": "~3.4|~4.0",
-+                "symfony/stopwatch": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/dependency-injection": "",
-+                "symfony/http-kernel": ""
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\EventDispatcher\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony EventDispatcher Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-16T18:35:49+00:00"
-+        },
-+        {
-+            "name": "symfony/filesystem",
-+            "version": "v4.2.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/filesystem.git",
-+                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e16b9e471703b2c60b95f14d31c1239f68f11601",
-+                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3",
-+                "symfony/polyfill-ctype": "~1.8"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Filesystem\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Filesystem Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-07T11:40:08+00:00"
-+        },
-+        {
-+            "name": "symfony/finder",
-+            "version": "v4.2.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/finder.git",
-+                "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/finder/zipball/267b7002c1b70ea80db0833c3afe05f0fbde580a",
-+                "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Finder\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Finder Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-23T15:42:05+00:00"
-+        },
-+        {
-+            "name": "symfony/inflector",
-+            "version": "v4.2.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/inflector.git",
-+                "reference": "275e54941a4f17a471c68d2a00e2513fc1fd4a78"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/inflector/zipball/275e54941a4f17a471c68d2a00e2513fc1fd4a78",
-+                "reference": "275e54941a4f17a471c68d2a00e2513fc1fd4a78",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3",
-+                "symfony/polyfill-ctype": "~1.8"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Inflector\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Bernhard Schussek",
-+                    "email": "bschussek@gmail.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Inflector Component",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "inflection",
-+                "pluralize",
-+                "singularize",
-+                "string",
-+                "symfony",
-+                "words"
-+            ],
-+            "time": "2019-01-16T20:31:39+00:00"
-+        },
-+        {
-+            "name": "symfony/options-resolver",
-+            "version": "v4.2.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/options-resolver.git",
-+                "reference": "3896e5a7d06fd15fa4947694c8dcdd371ff147d1"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3896e5a7d06fd15fa4947694c8dcdd371ff147d1",
-+                "reference": "3896e5a7d06fd15fa4947694c8dcdd371ff147d1",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\OptionsResolver\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony OptionsResolver Component",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "config",
-+                "configuration",
-+                "options"
-+            ],
-+            "time": "2019-02-23T15:17:42+00:00"
-+        },
-+        {
-+            "name": "symfony/polyfill-ctype",
-+            "version": "v1.11.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/polyfill-ctype.git",
-+                "reference": "82ebae02209c21113908c229e9883c419720738a"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
-+                "reference": "82ebae02209c21113908c229e9883c419720738a",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3"
-+            },
-+            "suggest": {
-+                "ext-ctype": "For best performance"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.11-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Ctype\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                },
-+                {
-+                    "name": "Gert de Pagter",
-+                    "email": "backendtea@gmail.com"
-+                }
-+            ],
-+            "description": "Symfony polyfill for ctype functions",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "compatibility",
-+                "ctype",
-+                "polyfill",
-+                "portable"
-+            ],
-+            "time": "2019-02-06T07:57:58+00:00"
-+        },
-+        {
-+            "name": "symfony/polyfill-mbstring",
-+            "version": "v1.11.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/polyfill-mbstring.git",
-+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
-+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3"
-+            },
-+            "suggest": {
-+                "ext-mbstring": "For best performance"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.11-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Mbstring\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony polyfill for the Mbstring extension",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "compatibility",
-+                "mbstring",
-+                "polyfill",
-+                "portable",
-+                "shim"
-+            ],
-+            "time": "2019-02-06T07:57:58+00:00"
-+        },
-+        {
-+            "name": "symfony/polyfill-php56",
-+            "version": "v1.11.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/polyfill-php56.git",
-+                "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
-+                "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3",
-+                "symfony/polyfill-util": "~1.0"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.11-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Php56\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "compatibility",
-+                "polyfill",
-+                "portable",
-+                "shim"
-+            ],
-+            "time": "2019-02-06T07:57:58+00:00"
-+        },
-+        {
-+            "name": "symfony/polyfill-util",
-+            "version": "v1.11.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/polyfill-util.git",
-+                "reference": "b46c6cae28a3106735323f00a0c38eccf2328897"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/b46c6cae28a3106735323f00a0c38eccf2328897",
-+                "reference": "b46c6cae28a3106735323f00a0c38eccf2328897",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.3"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.11-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Polyfill\\Util\\": ""
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony utilities for portability of PHP codes",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "compat",
-+                "compatibility",
-+                "polyfill",
-+                "shim"
-+            ],
-+            "time": "2019-02-08T14:16:39+00:00"
-+        },
-+        {
-+            "name": "symfony/process",
-+            "version": "v4.1.11",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/process.git",
-+                "reference": "72d838aafaa7c790330fe362b9cecec362c64629"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/process/zipball/72d838aafaa7c790330fe362b9cecec362c64629",
-+                "reference": "72d838aafaa7c790330fe362b9cecec362c64629",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3"
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\Process\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony Process Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-16T19:07:26+00:00"
-+        },
-+        {
-+            "name": "symfony/property-access",
-+            "version": "v4.2.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/symfony/property-access.git",
-+                "reference": "5440dd2b5373073beee051bd978b58a0f543b192"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/symfony/property-access/zipball/5440dd2b5373073beee051bd978b58a0f543b192",
-+                "reference": "5440dd2b5373073beee051bd978b58a0f543b192",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^7.1.3",
-+                "symfony/inflector": "~3.4|~4.0"
-+            },
-+            "require-dev": {
-+                "symfony/cache": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "psr/cache-implementation": "To cache access methods."
-+            },
-+            "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "4.2-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Symfony\\Component\\PropertyAccess\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "Symfony PropertyAccess Component",
-+            "homepage": "https://symfony.com",
-+            "keywords": [
-+                "access",
-+                "array",
-+                "extraction",
-+                "index",
-+                "injection",
-+                "object",
-+                "property",
-+                "property path",
-+                "reflection"
-+            ],
-+            "time": "2019-03-04T09:16:25+00:00"
-+        },
-+        {
-+            "name": "tedivm/jshrink",
-+            "version": "v1.3.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/tedious/JShrink.git",
-+                "reference": "21254058dc3ce6aba6bef458cff4bfa25cf8b198"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/tedious/JShrink/zipball/21254058dc3ce6aba6bef458cff4bfa25cf8b198",
-+                "reference": "21254058dc3ce6aba6bef458cff4bfa25cf8b198",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": "^5.6|^7.0"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "^2.8",
-+                "php-coveralls/php-coveralls": "^1.1.0",
-+                "phpunit/phpunit": "^6"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "JShrink": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Robert Hafner",
-+                    "email": "tedivm@tedivm.com"
-+                }
-+            ],
-+            "description": "Javascript Minifier built in PHP",
-+            "homepage": "http://github.com/tedious/JShrink",
-+            "keywords": [
-+                "javascript",
-+                "minifier"
-+            ],
-+            "time": "2018-09-16T00:02:51+00:00"
-+        },
-+        {
-+            "name": "temando/module-shipping-m2",
-+            "version": "1.5.1",
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://repo.magento.com/archives/temando/module-shipping-m2/temando-module-shipping-m2-1.5.1.0.zip",
-+                "reference": null,
-+                "shasum": "7fb7a9164d6bc4a17e9b8869ddbc8c5f79106905"
-+            },
-+            "require": {
-+                "ext-iconv": "*",
-+                "ext-intl": "*",
-+                "ext-json": "*",
-+                "magento/framework": "^102.0.0",
-+                "magento/module-backend": "^101.0.0",
-+                "magento/module-catalog": "^103.0.0",
-+                "magento/module-checkout": "^100.3.0",
-+                "magento/module-config": "^101.1.0||^102.0.0",
-+                "magento/module-customer": "^102.0.0",
-+                "magento/module-directory": "^100.3.0",
-+                "magento/module-eav": "^102.0.0",
-+                "magento/module-email": "^101.0.0",
-+                "magento/module-integration": "^100.3.0",
-+                "magento/module-multishipping": "^100.3.0",
-+                "magento/module-payment": "^100.3.0",
-+                "magento/module-quote": "^101.1.0",
-+                "magento/module-sales": "^102.0.0",
-+                "magento/module-security": "^100.3.0",
-+                "magento/module-shipping": "^100.3.0",
-+                "magento/module-store": "^101.0.0",
-+                "magento/module-tax": "^100.3.0",
-+                "magento/module-ui": "^101.1.0",
-+                "monolog/monolog": "^1.17.0",
-+                "php": "~7.1.3||~7.2.0",
-+                "psr/log": "~1.0",
-+                "zendframework/zend-barcode": "^2.7.0",
-+                "zendframework/zend-http": "^2.6.0"
-+            },
-+            "suggest": {
-+                "magento/module-rma": "^101.1.0",
-+                "magento/module-scalable-checkout": "^100.3.0",
-+                "magento/module-scalable-oms": "^100.3.0"
-+            },
-+            "type": "magento2-module",
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Temando\\Shipping\\": ""
-+                }
-+            },
-+            "license": [
-+                "OSL-3.0"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Christoph Aßmann",
-+                    "email": "christoph.assmann@netresearch.de",
-+                    "homepage": "https://www.netresearch.de/",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "Temando multi-carrier shipping extension for Magento 2"
-+        },
-+        {
-+            "name": "true/punycode",
-+            "version": "v2.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/true/php-punycode.git",
-+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/true/php-punycode/zipball/a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
-+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "php": ">=5.3.0",
-+                "symfony/polyfill-mbstring": "^1.3"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.7",
-+                "squizlabs/php_codesniffer": "~2.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "TrueBV\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Renan Gonçalves",
-+                    "email": "renan.saddam@gmail.com"
-+                }
-+            ],
-+            "description": "A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA)",
-+            "homepage": "https://github.com/true/php-punycode",
-+            "keywords": [
-+                "idna",
-+                "punycode"
-+            ],
-+            "time": "2016-11-16T10:37:54+00:00"
-+        },
-+        {
-+            "name": "tubalmartin/cssmin",
-+            "version": "v4.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
-+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
-+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-pcre": "*",
-+                "php": ">=5.3.2"
-+            },
-+            "require-dev": {
-+                "cogpowered/finediff": "0.3.*",
-+                "phpunit/phpunit": "4.8.*"
-+            },
-+            "bin": [
-+                "cssmin"
-+            ],
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "tubalmartin\\CssMin\\": "src"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "BSD-3-Clause"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Túbal Martín",
-+                    "homepage": "http://tubalmartin.me/"
-+                }
-+            ],
-+            "description": "A PHP port of the YUI CSS compressor",
-+            "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port",
-+            "keywords": [
-+                "compress",
-+                "compressor",
-+                "css",
-+                "cssmin",
-+                "minify",
-+                "yui"
-             ],
--            "description": "Magento 2 Base"
-+            "time": "2018-01-15T15:26:51+00:00"
-         },
-         {
--            "name": "magento/module-admin-notification",
--            "version": "0.74.0-beta2",
-+            "name": "vertex/module-tax",
-+            "version": "3.1.0",
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-admin-notification-0.74.0-beta2.zip",
-+                "url": "https://repo.magento.com/archives/vertex/module-tax/vertex-module-tax-3.1.0.0.zip",
-                 "reference": null,
--                "shasum": "740186bdf97b2161994c10a883211eae76b285e9"
-+                "shasum": "f741436e6732930f69d24f7f8291101b0d3382c6"
-             },
-             "require": {
--                "lib-libxml": "*",
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-json": "*",
-+                "ext-simplexml": "*",
-+                "ext-soap": "*",
-+                "magento/framework": "^100|^101|^102",
-+                "magento/module-backend": "^100|^101",
-+                "magento/module-catalog": "^100|^101|^102|^103",
-+                "magento/module-checkout": "^100",
-+                "magento/module-config": "^100|^101",
-+                "magento/module-cron": "^100",
-+                "magento/module-customer": "^100|^101|^102",
-+                "magento/module-directory": "^100",
-+                "magento/module-eav": "^100|^101|^102",
-+                "magento/module-quote": "^100|^101",
-+                "magento/module-sales": "^100|^101|^102",
-+                "magento/module-shipping": "^100",
-+                "magento/module-store": "^100|^101",
-+                "magento/module-tax": "^100",
-+                "magento/module-ui": "^100|^101",
-+                "php": "^5.6|^7.0",
-+                "vertex/sdk": "^1.1.0"
-+            },
-+            "conflict": {
-+                "magento/module-gift-wrapping": ">=102",
-+                "pixafy/tax": "*",
-+                "pixafy/tax-ee": "*",
-+                "vertex/tax": "*",
-+                "vertex/tax-ee": "*"
-+            },
-+            "require-dev": {
-+                "ext-dom": "*",
-+                "ext-simplexml": "*",
-+                "magento/marketplace-eqp": "^1.0",
-+                "magento/module-offline-shipping": "^100.2",
-+                "magento/module-usps": "^100.2"
-+            },
-+            "suggest": {
-+                "magento/module-gift-card-account": "Vertex Tax Links for Magento 2 also supports Magento's Gift Card Account module",
-+                "magento/module-gift-wrapping": "Vertex Tax Links for Magento 2 also supports Magento's Gift Wrapping module",
-+                "magento/module-multishipping": "Vertex Tax Links for Magento 2 also supports Magento's Multishipping module",
-+                "magento/module-reward": "Vertex Tax Links for Magento 2 also supports Magento's Reward module"
-             },
-             "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/AdminNotification"
--                    ]
--                ]
-+            "autoload": {
-+                "files": [
-+                    "registration.php"
-+                ],
-+                "psr-4": {
-+                    "Vertex\\Tax\\": ""
-+                }
-             },
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "proprietary"
-             ],
--            "description": "N/A"
-+            "description": "Vertex Tax Links for Magento 2"
-         },
-         {
--            "name": "magento/module-authorization",
--            "version": "0.74.0-beta2",
-+            "name": "vertex/product-magento-module",
-+            "version": "3.1.0",
-+            "require": {
-+                "vertex/module-tax": "3.1.0"
-+            },
-+            "type": "metapackage",
-+            "license": [
-+                "proprietary"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Mediotype",
-+                    "email": "diveinto@mediotype.com",
-+                    "homepage": "http://www.mediotype.com/",
-+                    "role": "Development Company"
-+                }
-+            ],
-+            "description": "Vertex Tax Links for Magento 2",
-+            "homepage": "http://go.vertexsmb.com/magento_cbe",
-+            "keywords": [
-+                "tax",
-+                "vertex"
-+            ]
-+        },
-+        {
-+            "name": "vertex/sdk",
-+            "version": "1.1.0",
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-authorization-0.74.0-beta2.zip",
-+                "url": "https://repo.magento.com/archives/vertex/sdk/vertex-sdk-1.1.0.0.zip",
-                 "reference": null,
--                "shasum": "045f8440fe82b38ce228b0be52b011bb02773214"
-+                "shasum": "85c38829f8233c14865912e092a2c5c6c80146ec"
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-mbstring": "*",
-+                "ext-openssl": "*",
-+                "ext-soap": "*",
-+                "php": "^5.4|^7"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Authorization"
--                    ]
--                ]
-+            "require-dev": {
-+                "php": "^7.1",
-+                "phpmd/phpmd": "^2.6",
-+                "phpunit/phpunit": "^7.2",
-+                "squizlabs/php_codesniffer": "^3.3"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Vertex\\": "src/"
-+                }
-             },
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "proprietary"
-             ],
--            "description": "Authorization module provides access to Magento ACL functionality."
-+            "description": "Tools for communicating with Vertex Cloud and Vertex O-Series"
-         },
-         {
--            "name": "magento/module-backend",
--            "version": "0.74.0-beta2",
-+            "name": "webonyx/graphql-php",
-+            "version": "v0.12.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/webonyx/graphql-php.git",
-+                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-backend-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "39ddbf62a11d9be1b16539733c0f66f46a503033"
-+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
-+                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backup": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-cron": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-developer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-reports": "0.74.0-beta2",
--                "magento/module-require-js": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "magento/module-translation": "0.74.0-beta2",
--                "magento/module-user": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-mbstring": "*",
-+                "php": ">=5.6"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Backend"
--                    ]
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8",
-+                "psr/http-message": "^1.0",
-+                "react/promise": "2.*"
-+            },
-+            "suggest": {
-+                "psr/http-message": "To use standard GraphQL server",
-+                "react/promise": "To leverage async resolving on React PHP platform"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "GraphQL\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-+            "license": [
-+                "MIT"
-+            ],
-+            "description": "A PHP port of GraphQL reference implementation",
-+            "homepage": "https://github.com/webonyx/graphql-php",
-+            "keywords": [
-+                "api",
-+                "graphql"
-+            ],
-+            "time": "2018-09-02T14:59:54+00:00"
-+        },
-+        {
-+            "name": "yubico/u2flib-server",
-+            "version": "1.0.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Yubico/php-u2flib-server.git",
-+                "reference": "55d813acf68212ad2cadecde07551600d6971939"
-+            },
-+            "dist": {
-+                "type": "zip",
-+                "url": "https://api.github.com/repos/Yubico/php-u2flib-server/zipball/55d813acf68212ad2cadecde07551600d6971939",
-+                "reference": "55d813acf68212ad2cadecde07551600d6971939",
-+                "shasum": ""
-+            },
-+            "require": {
-+                "ext-openssl": "*",
-+                "paragonie/random_compat": ">= 1",
-+                "php": ">=5.6"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "~5.7",
-+                "vimeo/psalm": "^0|^1|^2"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-2-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Library for U2F implementation",
-+            "homepage": "https://developers.yubico.com/php-u2flib-server",
-+            "time": "2018-09-07T08:16:44+00:00"
-         },
-         {
--            "name": "magento/module-backup",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-barcode",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-barcode.git",
-+                "reference": "50f24f604ef2172a0127efe91e786bc2caf2e8cf"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-backup-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "7188d9a41bd9d4294dfd90c7053c301876d82c48"
-+                "url": "https://api.github.com/repos/zendframework/zend-barcode/zipball/50f24f604ef2172a0127efe91e786bc2caf2e8cf",
-+                "reference": "50f24f604ef2172a0127efe91e786bc2caf2e8cf",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-cron": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1",
-+                "zendframework/zend-validator": "^2.10.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6 || ^3.1",
-+                "zendframework/zendpdf": "^2.0.2"
-+            },
-+            "suggest": {
-+                "zendframework/zendpdf": "ZendPdf component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Backup"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Barcode\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides a generic way to generate barcodes",
-+            "keywords": [
-+                "ZendFramework",
-+                "barcode",
-+                "zf"
-+            ],
-+            "time": "2017-12-11T15:30:02+00:00"
-         },
-         {
--            "name": "magento/module-bundle",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-captcha",
-+            "version": "2.8.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-captcha.git",
-+                "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-bundle-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "849f7fc43f7f9b6a37a922272656c6218c681693"
-+                "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/37e9b6a4f632a9399eecbf2e5e325ad89083f87b",
-+                "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-catalog-rule": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-gift-message": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-math": "^2.7 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-session": "^2.8",
-+                "zendframework/zend-text": "^2.6",
-+                "zendframework/zend-validator": "^2.10.1",
-+                "zendframework/zendservice-recaptcha": "^3.0"
-             },
-             "suggest": {
--                "magento/module-webapi": "0.74.0-beta2"
-+                "zendframework/zend-i18n-resources": "Translations of captcha messages",
-+                "zendframework/zend-session": "Zend\\Session component",
-+                "zendframework/zend-text": "Zend\\Text component",
-+                "zendframework/zend-validator": "Zend\\Validator component",
-+                "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Bundle"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.8.x-dev",
-+                    "dev-develop": "2.9.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Captcha\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Generate and validate CAPTCHAs using Figlets, images, ReCaptcha, and more",
-+            "keywords": [
-+                "ZendFramework",
-+                "captcha",
-+                "zf"
-+            ],
-+            "time": "2018-04-24T17:24:10+00:00"
-         },
-         {
--            "name": "magento/module-captcha",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-code",
-+            "version": "3.3.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-code.git",
-+                "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-captcha-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "a80050a22bad3399e146b242be33f6717fe15d26"
-+                "url": "https://api.github.com/repos/zendframework/zend-code/zipball/c21db169075c6ec4b342149f446e7b7b724f95eb",
-+                "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1",
-+                "zendframework/zend-eventmanager": "^2.6 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "doctrine/annotations": "~1.0",
-+                "ext-phar": "*",
-+                "phpunit/phpunit": "^6.2.3",
-+                "zendframework/zend-coding-standard": "^1.0.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-+            },
-+            "suggest": {
-+                "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
-+                "zendframework/zend-stdlib": "Zend\\Stdlib component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Captcha"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "3.3.x-dev",
-+                    "dev-develop": "3.4.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Code\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides facilities to generate arbitrary code using an object oriented interface",
-+            "homepage": "https://github.com/zendframework/zend-code",
-+            "keywords": [
-+                "code",
-+                "zf2"
-+            ],
-+            "time": "2018-08-13T20:36:59+00:00"
-         },
-         {
--            "name": "magento/module-catalog",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-config",
-+            "version": "2.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-config.git",
-+                "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "d4259a0113a3b8eece9bdf88ad24b5cdee349de0"
-+                "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
-+                "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-catalog-rule": "0.74.0-beta2",
--                "magento/module-catalog-url-rewrite": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-cms": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-indexer": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-msrp": "0.74.0-beta2",
--                "magento/module-page-cache": "0.74.0-beta2",
--                "magento/module-product-alert": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "magento/module-url-rewrite": "0.74.0-beta2",
--                "magento/module-widget": "0.74.0-beta2",
--                "magento/module-wishlist": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
--            },
--            "suggest": {
--                "magento/module-cookie": "0.74.0-beta2"
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0",
-+                "zendframework/zend-filter": "^2.6",
-+                "zendframework/zend-i18n": "^2.5",
-+                "zendframework/zend-json": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-+            },
-+            "suggest": {
-+                "zendframework/zend-filter": "Zend\\Filter component",
-+                "zendframework/zend-i18n": "Zend\\I18n component",
-+                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Catalog"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.6-dev",
-+                    "dev-develop": "2.7-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Config\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-+            ],
-+            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
-+            "homepage": "https://github.com/zendframework/zend-config",
-+            "keywords": [
-+                "config",
-+                "zf2"
-             ],
--            "description": "N/A"
-+            "time": "2016-02-04T23:01:10+00:00"
-         },
-         {
--            "name": "magento/module-catalog-import-export",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-console",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-console.git",
-+                "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-import-export-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "3a26206abf71888d300c9d72b2190ff0f66eafd2"
-+                "url": "https://api.github.com/repos/zendframework/zend-console/zipball/e8aa08da83de3d265256c40ba45cd649115f0e18",
-+                "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18",
-+                "shasum": ""
-             },
-             "require": {
--                "ext-ctype": "*",
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-import-export": "0.74.0-beta2",
--                "magento/module-indexer": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-filter": "^2.7.2",
-+                "zendframework/zend-json": "^2.6 || ^3.0",
-+                "zendframework/zend-validator": "^2.10.1"
-+            },
-+            "suggest": {
-+                "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
-+                "zendframework/zend-validator": "To support DefaultRouteMatcher usage"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CatalogImportExport"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Console\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Build console applications using getopt syntax or routing, complete with prompts",
-+            "keywords": [
-+                "ZendFramework",
-+                "console",
-+                "zf"
-+            ],
-+            "time": "2018-01-25T19:08:04+00:00"
-         },
-         {
--            "name": "magento/module-catalog-inventory",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-crypt",
-+            "version": "2.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-crypt.git",
-+                "reference": "1b2f5600bf6262904167116fa67b58ab1457036d"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-inventory-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "805c2bb2fb2c2f038dd73e4030a02e1208ea23da"
-+                "url": "https://api.github.com/repos/zendframework/zend-crypt/zipball/1b2f5600bf6262904167116fa67b58ab1457036d",
-+                "reference": "1b2f5600bf6262904167116fa67b58ab1457036d",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-indexer": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "container-interop/container-interop": "~1.0",
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-math": "^2.6",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "suggest": {
-+                "ext-mcrypt": "Required for most features of Zend\\Crypt"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CatalogInventory"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.6-dev",
-+                    "dev-develop": "2.7-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Crypt\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-crypt",
-+            "keywords": [
-+                "crypt",
-+                "zf2"
-+            ],
-+            "time": "2016-02-03T23:46:30+00:00"
-         },
-         {
--            "name": "magento/module-catalog-rule",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-db",
-+            "version": "2.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-db.git",
-+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-rule-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "e9fe8b0f65dea1f8feba125e7d2974d48d1e0eef"
-+                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
-+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-import-export": "0.74.0-beta2",
--                "magento/module-indexer": "0.74.0-beta2",
--                "magento/module-rule": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.25 || ^6.4.4",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-+            },
-+            "suggest": {
-+                "zendframework/zend-eventmanager": "Zend\\EventManager component",
-+                "zendframework/zend-hydrator": "Zend\\Hydrator component for using HydratingResultSets",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CatalogRule"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.9-dev",
-+                    "dev-develop": "2.10-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Db",
-+                    "config-provider": "Zend\\Db\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Db\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Database abstraction layer, SQL abstraction, result set abstraction, and RowDataGateway and TableDataGateway implementations",
-+            "keywords": [
-+                "ZendFramework",
-+                "db",
-+                "zf"
-+            ],
-+            "time": "2019-02-25T11:37:45+00:00"
-         },
-         {
--            "name": "magento/module-catalog-search",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-di",
-+            "version": "2.6.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-di.git",
-+                "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-search-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "e8239e3dbbdccda266347d1ca5f286c1e9a2cb4b"
-+                "url": "https://api.github.com/repos/zendframework/zend-di/zipball/1fd1ba85660b5a2718741b38639dc7c4c3194b37",
-+                "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-indexer": "0.74.0-beta2",
--                "magento/module-search": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "container-interop/container-interop": "^1.1",
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-code": "^2.6 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CatalogSearch"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.6-dev",
-+                    "dev-develop": "2.7-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Di\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-di",
-+            "keywords": [
-+                "di",
-+                "zf2"
-+            ],
-+            "time": "2016-04-25T20:58:11+00:00"
-         },
-         {
--            "name": "magento/module-catalog-url-rewrite",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-diactoros",
-+            "version": "1.8.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-diactoros.git",
-+                "reference": "20da13beba0dde8fb648be3cc19765732790f46e"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-url-rewrite-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "c3cc582396cc97970e2d0dd92e5315190cde0971"
-+                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e",
-+                "reference": "20da13beba0dde8fb648be3cc19765732790f46e",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-import-export": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-import-export": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-url-rewrite": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "psr/http-message": "^1.0"
-             },
--            "type": "magento2-module",
-+            "provide": {
-+                "psr/http-message-implementation": "1.0"
-+            },
-+            "require-dev": {
-+                "ext-dom": "*",
-+                "ext-libxml": "*",
-+                "php-http/psr7-integration-tests": "dev-master",
-+                "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
-+                "zendframework/zend-coding-standard": "~1.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CatalogUrlRewrite"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.8.x-dev",
-+                    "dev-develop": "1.9.x-dev",
-+                    "dev-release-2.0": "2.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "files": [
-+                    "src/functions/create_uploaded_file.php",
-+                    "src/functions/marshal_headers_from_sapi.php",
-+                    "src/functions/marshal_method_from_sapi.php",
-+                    "src/functions/marshal_protocol_version_from_sapi.php",
-+                    "src/functions/marshal_uri_from_sapi.php",
-+                    "src/functions/normalize_server.php",
-+                    "src/functions/normalize_uploaded_files.php",
-+                    "src/functions/parse_cookie_header.php"
-+                ],
-+                "psr-4": {
-+                    "Zend\\Diactoros\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-2-Clause"
-             ],
--            "description": "N/A"
-+            "description": "PSR HTTP Message implementations",
-+            "homepage": "https://github.com/zendframework/zend-diactoros",
-+            "keywords": [
-+                "http",
-+                "psr",
-+                "psr-7"
-+            ],
-+            "time": "2018-09-05T19:29:37+00:00"
-         },
-         {
--            "name": "magento/module-catalog-widget",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-escaper",
-+            "version": "2.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-escaper.git",
-+                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-catalog-widget-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "7dad3ad909bc97610211f4f008fa1817f1aac22a"
-+                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/31d8aafae982f9568287cb4dce987e6aff8fd074",
-+                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-rule": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-widget": "0.74.0-beta2",
--                "magento/module-wishlist": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CatalogWidget"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.6.x-dev",
-+                    "dev-develop": "2.7.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Escaper\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
-+            "keywords": [
-+                "ZendFramework",
-+                "escaper",
-+                "zf"
-+            ],
-+            "time": "2018-04-25T15:48:53+00:00"
-         },
-         {
--            "name": "magento/module-centinel",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-eventmanager",
-+            "version": "2.6.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-eventmanager.git",
-+                "reference": "d238c443220dce4b6396579c8ab2200ec25f9108"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-centinel-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "069e94cd124c0d078eeb3174afdc1e49031a7288"
-+                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/d238c443220dce4b6396579c8ab2200ec25f9108",
-+                "reference": "d238c443220dce4b6396579c8ab2200ec25f9108",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "athletic/athletic": "dev-master",
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Centinel"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-release-2.6": "2.6-dev",
-+                    "dev-master": "3.0-dev",
-+                    "dev-develop": "3.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\EventManager\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-eventmanager",
-+            "keywords": [
-+                "eventmanager",
-+                "zf2"
-+            ],
-+            "time": "2017-12-12T17:48:56+00:00"
-         },
-         {
--            "name": "magento/module-checkout",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-feed",
-+            "version": "2.10.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-feed.git",
-+                "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-checkout-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "8161dcc6c2bba44981cb63cd24cf137900d37db7"
-+                "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/6641f4cf3f4586c63f83fd70b6d19966025c8888",
-+                "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-gift-message": "0.74.0-beta2",
--                "magento/module-msrp": "0.74.0-beta2",
--                "magento/module-page-cache": "0.74.0-beta2",
--                "magento/module-payment": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "magento/module-ui": "0.74.0-beta2",
--                "magento/module-wishlist": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
--            },
--            "suggest": {
--                "magento/module-cookie": "0.74.0-beta2"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-escaper": "^2.5.2",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "psr/http-message": "^1.0.1",
-+                "zendframework/zend-cache": "^2.7.2",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-db": "^2.8.2",
-+                "zendframework/zend-http": "^2.7",
-+                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-+                "zendframework/zend-validator": "^2.10.1"
-+            },
-+            "suggest": {
-+                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
-+                "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
-+                "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
-+                "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
-+                "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Checkout"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Feed\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides functionality for consuming RSS and Atom feeds",
-+            "keywords": [
-+                "ZendFramework",
-+                "feed",
-+                "zf"
-+            ],
-+            "time": "2018-08-01T13:53:20+00:00"
-         },
-         {
--            "name": "magento/module-checkout-agreements",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-filter",
-+            "version": "2.9.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-filter.git",
-+                "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-checkout-agreements-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "be00ed9e3c1e3e4bacf7efc00b67c7cbb2065715"
-+                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/1c3e6d02f9cd5f6c929c9859498f5efbe216e86f",
-+                "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
-             },
--            "type": "magento2-module",
-+            "conflict": {
-+                "zendframework/zend-validator": "<2.10.1"
-+            },
-+            "require-dev": {
-+                "pear/archive_tar": "^1.4.3",
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "psr/http-factory": "^1.0",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-crypt": "^3.2.1",
-+                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-+                "zendframework/zend-uri": "^2.6"
-+            },
-+            "suggest": {
-+                "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters",
-+                "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
-+                "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
-+                "zendframework/zend-uri": "Zend\\Uri component, for the UriNormalize filter"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CheckoutAgreements"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.9.x-dev",
-+                    "dev-develop": "2.10.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Filter",
-+                    "config-provider": "Zend\\Filter\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Filter\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides a set of commonly needed data filters",
-+            "keywords": [
-+                "ZendFramework",
-+                "filter",
-+                "zf"
-+            ],
-+            "time": "2018-12-17T16:00:04+00:00"
-         },
-         {
--            "name": "magento/module-cms",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-form",
-+            "version": "2.13.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-form.git",
-+                "reference": "c713a12ccbd43148b71c9339e171ca11e3f8a1da"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-cms-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "15ae95a27b5ff0c82fbdb43ca8570e0cee4b21f5"
-+                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/c713a12ccbd43148b71c9339e171ca11e3f8a1da",
-+                "reference": "c713a12ccbd43148b71c9339e171ca11e3f8a1da",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-email": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "magento/module-ui": "0.74.0-beta2",
--                "magento/module-variable": "0.74.0-beta2",
--                "magento/module-widget": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
-+                "zendframework/zend-inputfilter": "^2.8",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "doctrine/annotations": "~1.0",
-+                "phpunit/phpunit": "^5.7.23 || ^6.5.3",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-captcha": "^2.7.1",
-+                "zendframework/zend-code": "^2.6 || ^3.0",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-escaper": "^2.5",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-filter": "^2.6",
-+                "zendframework/zend-i18n": "^2.6",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-session": "^2.8.1",
-+                "zendframework/zend-text": "^2.6",
-+                "zendframework/zend-validator": "^2.6",
-+                "zendframework/zend-view": "^2.6.2",
-+                "zendframework/zendservice-recaptcha": "^3.0.0"
-+            },
-+            "suggest": {
-+                "zendframework/zend-captcha": "^2.7.1, required for using CAPTCHA form elements",
-+                "zendframework/zend-code": "^2.6 || ^3.0, required to use zend-form annotations support",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, reuired for zend-form annotations support",
-+                "zendframework/zend-i18n": "^2.6, required when using zend-form view helpers",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services",
-+                "zendframework/zend-view": "^2.6.2, required for using the zend-form view helpers",
-+                "zendframework/zendservice-recaptcha": "in order to use the ReCaptcha form element"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Cms"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "2.13.x-dev",
-+                    "dev-develop": "2.14.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Form",
-+                    "config-provider": "Zend\\Form\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Form\\": "src/"
-+                },
-+                "files": [
-+                    "autoload/formElementManagerPolyfill.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Validate and display simple and complex forms, casting forms to business objects and vice versa",
-+            "keywords": [
-+                "ZendFramework",
-+                "form",
-+                "zf"
-+            ],
-+            "time": "2018-12-11T22:51:29+00:00"
-         },
-         {
--            "name": "magento/module-cms-url-rewrite",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-http",
-+            "version": "2.8.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-http.git",
-+                "reference": "d160aedc096be230af0fe9c31151b2b33ad4e807"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-cms-url-rewrite-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "6a3775d7705efcf5b43bfbe327d6ef1db2a1c09c"
-+                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/d160aedc096be230af0fe9c31151b2b33ad4e807",
-+                "reference": "d160aedc096be230af0fe9c31151b2b33ad4e807",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-cms": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-url-rewrite": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-loader": "^2.5.1",
-+                "zendframework/zend-stdlib": "^3.1 || ^2.7.7",
-+                "zendframework/zend-uri": "^2.5.2",
-+                "zendframework/zend-validator": "^2.10.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^3.1 || ^2.6"
-+            },
-+            "suggest": {
-+                "paragonie/certainty": "For automated management of cacert.pem"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CmsUrlRewrite"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.8.x-dev",
-+                    "dev-develop": "2.9.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Http\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
-+            "keywords": [
-+                "ZendFramework",
-+                "http",
-+                "http client",
-+                "zend",
-+                "zf"
-+            ],
-+            "time": "2019-02-07T17:47:08+00:00"
-         },
-         {
--            "name": "magento/module-config",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-hydrator",
-+            "version": "1.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-hydrator.git",
-+                "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-config-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "a4be4800b197ab3a73bbfc0d23d5a1f753a07a57"
-+                "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65",
-+                "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-cron": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-email": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.0",
-+                "squizlabs/php_codesniffer": "^2.0@dev",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-filter": "^2.6",
-+                "zendframework/zend-inputfilter": "^2.6",
-+                "zendframework/zend-serializer": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-+            },
-+            "suggest": {
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
-+                "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage",
-+                "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Config"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-release-1.0": "1.0-dev",
-+                    "dev-release-1.1": "1.1-dev",
-+                    "dev-master": "2.0-dev",
-+                    "dev-develop": "2.1-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Hydrator\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-hydrator",
-+            "keywords": [
-+                "hydrator",
-+                "zf2"
-+            ],
-+            "time": "2016-02-18T22:38:26+00:00"
-         },
-         {
--            "name": "magento/module-configurable-import-export",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-i18n",
-+            "version": "2.9.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-i18n.git",
-+                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-configurable-import-export-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "bb6d242228bcbe7c35253dc244c7977994b24b8e"
-+                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
-+                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-import-export": "0.74.0-beta2",
--                "magento/module-configurable-product": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-import-export": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-filter": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-validator": "^2.6",
-+                "zendframework/zend-view": "^2.6.3"
-+            },
-+            "suggest": {
-+                "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
-+                "zendframework/zend-cache": "Zend\\Cache component",
-+                "zendframework/zend-config": "Zend\\Config component",
-+                "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
-+                "zendframework/zend-filter": "You should install this package to use the provided filters",
-+                "zendframework/zend-i18n-resources": "Translation resources",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-+                "zendframework/zend-validator": "You should install this package to use the provided validators",
-+                "zendframework/zend-view": "You should install this package to use the provided view helpers"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/ConfigurableImportExport"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.9.x-dev",
-+                    "dev-develop": "2.10.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\I18n",
-+                    "config-provider": "Zend\\I18n\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\I18n\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Provide translations for your application, and filter and validate internationalized values",
-+            "keywords": [
-+                "ZendFramework",
-+                "i18n",
-+                "zf"
-+            ],
-+            "time": "2018-05-16T16:39:13+00:00"
-         },
-         {
--            "name": "magento/module-configurable-product",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-inputfilter",
-+            "version": "2.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-inputfilter.git",
-+                "reference": "4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-configurable-product-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "fe8e4536a59f60be79211fc0072e640102d3be06"
-+                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c",
-+                "reference": "4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-catalog-rule": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-filter": "^2.9.1",
-+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-+                "zendframework/zend-validator": "^2.11"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "psr/http-message": "^1.0",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-             },
-             "suggest": {
--                "magento/module-webapi": "0.74.0-beta2"
-+                "psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/ConfigurableProduct"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\InputFilter",
-+                    "config-provider": "Zend\\InputFilter\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\InputFilter\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files",
-+            "keywords": [
-+                "ZendFramework",
-+                "inputfilter",
-+                "zf"
-+            ],
-+            "time": "2019-01-30T16:58:51+00:00"
-         },
-         {
--            "name": "magento/module-contact",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-json",
-+            "version": "2.6.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-json.git",
-+                "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-contact-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "b53d65b91dd1f596d0a4f7b8bacf73e6eaff98c9"
-+                "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28",
-+                "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-cms": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.5 || ^7.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0",
-+                "zendframework/zend-http": "^2.5.4",
-+                "zendframework/zend-server": "^2.6.1",
-+                "zendframework/zend-stdlib": "^2.5 || ^3.0",
-+                "zendframework/zendxml": "^1.0.2"
-+            },
-+            "suggest": {
-+                "zendframework/zend-http": "Zend\\Http component, required to use Zend\\Json\\Server",
-+                "zendframework/zend-server": "Zend\\Server component, required to use Zend\\Json\\Server",
-+                "zendframework/zend-stdlib": "Zend\\Stdlib component, for use with caching Zend\\Json\\Server responses",
-+                "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Contact"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.6-dev",
-+                    "dev-develop": "2.7-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Json\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
-+            "homepage": "https://github.com/zendframework/zend-json",
-+            "keywords": [
-+                "json",
-+                "zf2"
-+            ],
-+            "time": "2016-02-04T21:20:26+00:00"
-         },
-         {
--            "name": "magento/module-cookie",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-loader",
-+            "version": "2.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-loader.git",
-+                "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-cookie-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "a8a4e29967524214fb6af5c12681d7b410a63bc6"
-+                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/78f11749ea340f6ca316bca5958eef80b38f9b6c",
-+                "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.4.11|~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0"
-             },
--            "suggest": {
--                "magento/module-backend": "0.74.0-beta2"
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Cookie"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.6.x-dev",
-+                    "dev-develop": "2.7.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Loader\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Autoloading and plugin loading strategies",
-+            "keywords": [
-+                "ZendFramework",
-+                "loader",
-+                "zf"
-+            ],
-+            "time": "2018-04-30T15:20:54+00:00"
-         },
-         {
--            "name": "magento/module-cron",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-log",
-+            "version": "2.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-log.git",
-+                "reference": "9cec3b092acb39963659c2f32441cccc56b3f430"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-cron-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "0e91ec4ade457797e7db0fe1aa4794747817fa6a"
-+                "url": "https://api.github.com/repos/zendframework/zend-log/zipball/9cec3b092acb39963659c2f32441cccc56b3f430",
-+                "reference": "9cec3b092acb39963659c2f32441cccc56b3f430",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "psr/log": "^1.0",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "provide": {
-+                "psr/log-implementation": "1.0.0"
-+            },
-+            "require-dev": {
-+                "mikey179/vfsstream": "^1.6",
-+                "phpunit/phpunit": "^5.7.15 || ^6.0.8",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-db": "^2.6",
-+                "zendframework/zend-escaper": "^2.5",
-+                "zendframework/zend-filter": "^2.5",
-+                "zendframework/zend-mail": "^2.6.1",
-+                "zendframework/zend-validator": "^2.10.1"
-+            },
-+            "suggest": {
-+                "ext-mongo": "mongo extension to use Mongo writer",
-+                "ext-mongodb": "mongodb extension to use MongoDB writer",
-+                "zendframework/zend-console": "Zend\\Console component to use the RequestID log processor",
-+                "zendframework/zend-db": "Zend\\Db component to use the database log writer",
-+                "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML log formatter",
-+                "zendframework/zend-mail": "Zend\\Mail component to use the email log writer",
-+                "zendframework/zend-validator": "Zend\\Validator component to block invalid log messages"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Cron"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Log",
-+                    "config-provider": "Zend\\Log\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Log\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "component for general purpose logging",
-+            "homepage": "https://github.com/zendframework/zend-log",
-+            "keywords": [
-+                "log",
-+                "logging",
-+                "zf2"
-+            ],
-+            "time": "2018-04-09T21:59:51+00:00"
-         },
-         {
--            "name": "magento/module-currency-symbol",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-mail",
-+            "version": "2.10.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-mail.git",
-+                "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-currency-symbol-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "261c0a4e05295f852a7986ef2d15509e4c2ad26c"
-+                "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/d7beb63d5f7144a21ac100072c453e63860cdab8",
-+                "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-page-cache": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-iconv": "*",
-+                "php": "^5.6 || ^7.0",
-+                "true/punycode": "^2.1",
-+                "zendframework/zend-loader": "^2.5",
-+                "zendframework/zend-mime": "^2.5",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-+                "zendframework/zend-validator": "^2.10.2"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-crypt": "^2.6 || ^3.0",
-+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1"
-+            },
-+            "suggest": {
-+                "zendframework/zend-crypt": "Crammd5 support in SMTP Auth",
-+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CurrencySymbol"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Mail",
-+                    "config-provider": "Zend\\Mail\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Mail\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
-+            "keywords": [
-+                "ZendFramework",
-+                "mail",
-+                "zf"
-+            ],
-+            "time": "2018-06-07T13:37:07+00:00"
-         },
-         {
--            "name": "magento/module-customer",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-math",
-+            "version": "2.7.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-math.git",
-+                "reference": "1abce074004dacac1a32cd54de94ad47ef960d38"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-customer-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "135623f9517f12f4dc17e062280eaf5f5071e7b7"
-+                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/1abce074004dacac1a32cd54de94ad47ef960d38",
-+                "reference": "1abce074004dacac1a32cd54de94ad47ef960d38",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-authorization": "0.74.0-beta2",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-integration": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-newsletter": "0.74.0-beta2",
--                "magento/module-page-cache": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-review": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "magento/module-ui": "0.74.0-beta2",
--                "magento/module-wishlist": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
--            },
--            "suggest": {
--                "magento/module-cookie": "0.74.0-beta2"
-+                "php": "^5.5 || ^7.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "ircmaxell/random-lib": "~1.1",
-+                "phpunit/phpunit": "~4.0"
-+            },
-+            "suggest": {
-+                "ext-bcmath": "If using the bcmath functionality",
-+                "ext-gmp": "If using the gmp functionality",
-+                "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if Mcrypt extensions is unavailable"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Customer"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "2.8-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Math\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-math",
-+            "keywords": [
-+                "math",
-+                "zf2"
-+            ],
-+            "time": "2018-12-04T15:34:17+00:00"
-         },
-         {
--            "name": "magento/module-customer-import-export",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-mime",
-+            "version": "2.7.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-mime.git",
-+                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-customer-import-export-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "9b4f6b059fecce79c7f8ce9fc163858b8a47c7ca"
-+                "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/52ae5fa9f12845cae749271034a2d594f0e4c6f2",
-+                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-import-export": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.21 || ^6.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-mail": "^2.6"
-+            },
-+            "suggest": {
-+                "zendframework/zend-mail": "Zend\\Mail component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/CustomerImportExport"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "2.8-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Mime\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Create and parse MIME messages and parts",
-+            "homepage": "https://github.com/zendframework/zend-mime",
-+            "keywords": [
-+                "ZendFramework",
-+                "mime",
-+                "zf"
-+            ],
-+            "time": "2018-05-14T19:02:50+00:00"
-         },
-         {
--            "name": "magento/module-developer",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-modulemanager",
-+            "version": "2.8.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-modulemanager.git",
-+                "reference": "394df6e12248ac430a312d4693f793ee7120baa6"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-developer-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "1a1077d963ec6310df7080defaadc9bd87ed6e21"
-+                "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/394df6e12248ac430a312d4693f793ee7120baa6",
-+                "reference": "394df6e12248ac430a312d4693f793ee7120baa6",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-config": "^3.1 || ^2.6",
-+                "zendframework/zend-eventmanager": "^3.2 || ^2.6.3",
-+                "zendframework/zend-stdlib": "^3.1 || ^2.7"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-console": "^2.6",
-+                "zendframework/zend-di": "^2.6",
-+                "zendframework/zend-loader": "^2.5",
-+                "zendframework/zend-mvc": "^3.0 || ^2.7",
-+                "zendframework/zend-servicemanager": "^3.0.3 || ^2.7.5"
-+            },
-+            "suggest": {
-+                "zendframework/zend-console": "Zend\\Console component",
-+                "zendframework/zend-loader": "Zend\\Loader component if you are not using Composer autoloading for your modules",
-+                "zendframework/zend-mvc": "Zend\\Mvc component",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Developer"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "2.8-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\ModuleManager\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Modular application system for zend-mvc applications",
-+            "homepage": "https://github.com/zendframework/zend-modulemanager",
-+            "keywords": [
-+                "ZendFramework",
-+                "modulemanager",
-+                "zf"
-+            ],
-+            "time": "2017-12-02T06:11:18+00:00"
-         },
-         {
--            "name": "magento/module-dhl",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-mvc",
-+            "version": "2.7.15",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-mvc.git",
-+                "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-dhl-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "f525d0b48189b60e2c0def9a8804933133995104"
-+                "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
-+                "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
-+                "shasum": ""
-             },
-             "require": {
--                "lib-libxml": "*",
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-shipping": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "container-interop/container-interop": "^1.1",
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-console": "^2.7",
-+                "zendframework/zend-eventmanager": "^2.6.4 || ^3.0",
-+                "zendframework/zend-form": "^2.11",
-+                "zendframework/zend-hydrator": "^1.1 || ^2.4",
-+                "zendframework/zend-psr7bridge": "^0.2",
-+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.0.3",
-+                "zendframework/zend-stdlib": "^2.7.5 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "replace": {
-+                "zendframework/zend-router": "^2.0"
-+            },
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "^4.8.36",
-+                "sebastian/comparator": "^1.2.4",
-+                "sebastian/version": "^1.0.4",
-+                "zendframework/zend-authentication": "^2.6",
-+                "zendframework/zend-cache": "^2.8",
-+                "zendframework/zend-di": "^2.6",
-+                "zendframework/zend-filter": "^2.8",
-+                "zendframework/zend-http": "^2.8",
-+                "zendframework/zend-i18n": "^2.8",
-+                "zendframework/zend-inputfilter": "^2.8",
-+                "zendframework/zend-json": "^2.6.1",
-+                "zendframework/zend-log": "^2.9.3",
-+                "zendframework/zend-modulemanager": "^2.8",
-+                "zendframework/zend-serializer": "^2.8",
-+                "zendframework/zend-session": "^2.8.1",
-+                "zendframework/zend-text": "^2.7",
-+                "zendframework/zend-uri": "^2.6",
-+                "zendframework/zend-validator": "^2.10",
-+                "zendframework/zend-view": "^2.9"
-+            },
-+            "suggest": {
-+                "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
-+                "zendframework/zend-config": "Zend\\Config component",
-+                "zendframework/zend-di": "Zend\\Di component",
-+                "zendframework/zend-filter": "Zend\\Filter component",
-+                "zendframework/zend-http": "Zend\\Http component",
-+                "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
-+                "zendframework/zend-inputfilter": "Zend\\Inputfilter component",
-+                "zendframework/zend-json": "Zend\\Json component",
-+                "zendframework/zend-log": "Zend\\Log component",
-+                "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
-+                "zendframework/zend-serializer": "Zend\\Serializer component",
-+                "zendframework/zend-servicemanager-di": "^1.0.1, if using zend-servicemanager v3 and requiring the zend-di integration",
-+                "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
-+                "zendframework/zend-text": "Zend\\Text component",
-+                "zendframework/zend-uri": "Zend\\Uri component",
-+                "zendframework/zend-validator": "Zend\\Validator component",
-+                "zendframework/zend-view": "Zend\\View component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Dhl"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "3.0-dev"
-+                }
-+            },
-+            "autoload": {
-+                "files": [
-+                    "src/autoload.php"
-+                ],
-+                "psr-4": {
-+                    "Zend\\Mvc\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-mvc",
-+            "keywords": [
-+                "mvc",
-+                "zf2"
-+            ],
-+            "time": "2018-05-03T13:13:41+00:00"
-         },
-         {
--            "name": "magento/module-directory",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-psr7bridge",
-+            "version": "0.2.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-psr7bridge.git",
-+                "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-directory-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "3cb3ed72d237966f9deab3ac0386c3b6701cf66e"
-+                "url": "https://api.github.com/repos/zendframework/zend-psr7bridge/zipball/86c0b53b0c6381391c4add4a93a56e51d5c74605",
-+                "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605",
-+                "shasum": ""
-             },
-             "require": {
--                "lib-libxml": "*",
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.5",
-+                "psr/http-message": "^1.0",
-+                "zendframework/zend-diactoros": "^1.1",
-+                "zendframework/zend-http": "^2.5"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.7",
-+                "squizlabs/php_codesniffer": "^2.3"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Directory"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.0-dev",
-+                    "dev-develop": "1.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Psr7Bridge\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "PSR-7 <-> Zend\\Http bridge",
-+            "homepage": "https://github.com/zendframework/zend-psr7bridge",
-+            "keywords": [
-+                "http",
-+                "psr",
-+                "psr-7"
-+            ],
-+            "time": "2016-05-10T21:44:39+00:00"
-         },
-         {
--            "name": "magento/module-downloadable",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-serializer",
-+            "version": "2.9.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-serializer.git",
-+                "reference": "0172690db48d8935edaf625c4cba38b79719892c"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-downloadable-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "5bd1cabf95a5c44e329f1263f40e165b3aa6070e"
-+                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/0172690db48d8935edaf625c4cba38b79719892c",
-+                "reference": "0172690db48d8935edaf625c4cba38b79719892c",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-gift-message": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-msrp": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "magento/module-wishlist": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-json": "^2.5 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.25 || ^6.4.4",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-math": "^2.6 || ^3.0",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-+            },
-+            "suggest": {
-+                "zendframework/zend-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
-+                "zendframework/zend-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Downloadable"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.9.x-dev",
-+                    "dev-develop": "2.10.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Serializer",
-+                    "config-provider": "Zend\\Serializer\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Serializer\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
-+            "keywords": [
-+                "ZendFramework",
-+                "serializer",
-+                "zf"
-+            ],
-+            "time": "2018-05-14T18:45:18+00:00"
-         },
-         {
--            "name": "magento/module-eav",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-server",
-+            "version": "2.8.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-server.git",
-+                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-eav-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "5594f375105dc1921f38772fbb069ff57c2e8f01"
-+                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/23a2e9a5599c83c05da831cb7c649e8a7809595e",
-+                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-code": "^2.5 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.5 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Eav"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.8.x-dev",
-+                    "dev-develop": "2.9.x-dev"
-+                }
-             },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Server\\": "src/"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Create Reflection-based RPC servers",
-+            "keywords": [
-+                "ZendFramework",
-+                "server",
-+                "zf"
-+            ],
-+            "time": "2018-04-30T22:21:28+00:00"
-         },
-         {
--            "name": "magento/module-email",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-servicemanager",
-+            "version": "2.7.11",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-servicemanager.git",
-+                "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-email-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "8ff7affa3d22107bd5e519dc24c098acccc44bf8"
-+                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/99ec9ed5d0f15aed9876433c74c2709eb933d4c7",
-+                "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-cms": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-variable": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "container-interop/container-interop": "~1.0",
-+                "php": "^5.5 || ^7.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "athletic/athletic": "dev-master",
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0",
-+                "zendframework/zend-di": "~2.5",
-+                "zendframework/zend-mvc": "~2.5"
-+            },
-+            "suggest": {
-+                "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
-+                "zendframework/zend-di": "Zend\\Di component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Email"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7-dev",
-+                    "dev-develop": "3.0-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\ServiceManager\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-servicemanager",
-+            "keywords": [
-+                "servicemanager",
-+                "zf2"
-+            ],
-+            "time": "2018-06-22T14:49:54+00:00"
-         },
-         {
--            "name": "magento/module-fedex",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-session",
-+            "version": "2.8.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-session.git",
-+                "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-fedex-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "cdc61b901b080b14e42b10889c8fb6f639f520af"
-+                "url": "https://api.github.com/repos/zendframework/zend-session/zipball/2cfd90e1a2f6b066b9f908599251d8f64f07021b",
-+                "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b",
-+                "shasum": ""
-             },
-             "require": {
--                "lib-libxml": "*",
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-shipping": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "container-interop/container-interop": "^1.1",
-+                "mongodb/mongodb": "^1.0.1",
-+                "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
-+                "phpunit/phpunit": "^5.7.5 || >=6.0.13 <6.5.0",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-db": "^2.7",
-+                "zendframework/zend-http": "^2.5.4",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-validator": "^2.6"
-+            },
-+            "suggest": {
-+                "mongodb/mongodb": "If you want to use the MongoDB session save handler",
-+                "zendframework/zend-cache": "Zend\\Cache component",
-+                "zendframework/zend-db": "Zend\\Db component",
-+                "zendframework/zend-http": "Zend\\Http component",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-+                "zendframework/zend-validator": "Zend\\Validator component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Fedex"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.8-dev",
-+                    "dev-develop": "2.9-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Session",
-+                    "config-provider": "Zend\\Session\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Session\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "manage and preserve session data, a logical complement of cookie data, across multiple page requests by the same client",
-+            "keywords": [
-+                "ZendFramework",
-+                "session",
-+                "zf"
-+            ],
-+            "time": "2018-02-22T16:33:54+00:00"
-         },
-         {
--            "name": "magento/module-gift-message",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-soap",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-soap.git",
-+                "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-gift-message-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "76ea03167970205295c95d88f871f7ce0547cdbf"
-+                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/af03c32f0db2b899b3df8cfe29aeb2b49857d284",
-+                "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-multishipping": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-soap": "*",
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-server": "^2.6.1",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-+                "zendframework/zend-uri": "^2.5.2"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.21 || ^6.3",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-http": "^2.5.4"
-+            },
-+            "suggest": {
-+                "zendframework/zend-http": "Zend\\Http component"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GiftMessage"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Soap\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-soap",
-+            "keywords": [
-+                "soap",
-+                "zf2"
-+            ],
-+            "time": "2018-01-29T17:51:26+00:00"
-         },
-         {
--            "name": "magento/module-google-adwords",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-stdlib",
-+            "version": "2.7.7",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-stdlib.git",
-+                "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-google-adwords-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "45dfa690b1f183b0a87e6db39e6399ff0024bc66"
-+                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/0e44eb46788f65e09e077eb7f44d2659143bcc1f",
-+                "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.5 || ^7.0",
-+                "zendframework/zend-hydrator": "~1.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "athletic/athletic": "~0.1",
-+                "fabpot/php-cs-fixer": "1.7.*",
-+                "phpunit/phpunit": "~4.0",
-+                "zendframework/zend-config": "~2.5",
-+                "zendframework/zend-eventmanager": "~2.5",
-+                "zendframework/zend-filter": "~2.5",
-+                "zendframework/zend-inputfilter": "~2.5",
-+                "zendframework/zend-serializer": "~2.5",
-+                "zendframework/zend-servicemanager": "~2.5"
-+            },
-+            "suggest": {
-+                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
-+                "zendframework/zend-filter": "To support naming strategy hydrator usage",
-+                "zendframework/zend-serializer": "Zend\\Serializer component",
-+                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GoogleAdwords"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-release-2.7": "2.7-dev",
-+                    "dev-master": "3.0-dev",
-+                    "dev-develop": "3.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Stdlib\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "homepage": "https://github.com/zendframework/zend-stdlib",
-+            "keywords": [
-+                "stdlib",
-+                "zf2"
-+            ],
-+            "time": "2016-04-12T21:17:31+00:00"
-         },
-         {
--            "name": "magento/module-google-analytics",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-text",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-text.git",
-+                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-google-analytics-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "7460860110d6942c3375db4a05cf079134e8ab6a"
-+                "url": "https://api.github.com/repos/zendframework/zend-text/zipball/ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
-+                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-cookie": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GoogleAnalytics"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Text\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Create FIGlets and text-based tables",
-+            "keywords": [
-+                "ZendFramework",
-+                "text",
-+                "zf"
-+            ],
-+            "time": "2018-04-30T14:55:10+00:00"
-         },
-         {
--            "name": "magento/module-google-optimizer",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-uri",
-+            "version": "2.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-uri.git",
-+                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-google-optimizer-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "90565d6ecc18276ef08c324caae5178ca8ba82ed"
-+                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/b2785cd38fe379a784645449db86f21b7739b1ee",
-+                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-cms": "0.74.0-beta2",
--                "magento/module-google-analytics": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-escaper": "^2.5",
-+                "zendframework/zend-validator": "^2.10"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-+                "zendframework/zend-coding-standard": "~1.0.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GoogleOptimizer"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.7.x-dev",
-+                    "dev-develop": "2.8.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Uri\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "A component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
-+            "keywords": [
-+                "ZendFramework",
-+                "uri",
-+                "zf"
-+            ],
-+            "time": "2019-02-27T21:39:04+00:00"
-         },
-         {
--            "name": "magento/module-google-shopping",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-validator",
-+            "version": "2.11.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-validator.git",
-+                "reference": "3c28dfe4e5951ba38059cea895244d9d206190b3"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-google-shopping-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "f86c5696c215900805df27dcc6f8d6df5bd8453a"
-+                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/3c28dfe4e5951ba38059cea895244d9d206190b3",
-+                "reference": "3c28dfe4e5951ba38059cea895244d9d206190b3",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "container-interop/container-interop": "^1.1",
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-stdlib": "^2.7.6 || ^3.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
-+                "psr/http-message": "^1.0",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-db": "^2.7",
-+                "zendframework/zend-filter": "^2.6",
-+                "zendframework/zend-http": "^2.5.4",
-+                "zendframework/zend-i18n": "^2.6",
-+                "zendframework/zend-math": "^2.6",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-session": "^2.8",
-+                "zendframework/zend-uri": "^2.5"
-+            },
-+            "suggest": {
-+                "psr/http-message": "psr/http-message, required when validating PSR-7 UploadedFileInterface instances via the Upload and UploadFile validators",
-+                "zendframework/zend-db": "Zend\\Db component, required by the (No)RecordExists validator",
-+                "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
-+                "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages",
-+                "zendframework/zend-i18n-resources": "Translations of validator messages",
-+                "zendframework/zend-math": "Zend\\Math component, required by the Csrf validator",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
-+                "zendframework/zend-session": "Zend\\Session component, ^2.8; required by the Csrf validator",
-+                "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GoogleShopping"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.11.x-dev",
-+                    "dev-develop": "2.12.x-dev"
-+                },
-+                "zf": {
-+                    "component": "Zend\\Validator",
-+                    "config-provider": "Zend\\Validator\\ConfigProvider"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\Validator\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "provides a set of commonly needed validators",
-+            "homepage": "https://github.com/zendframework/zend-validator",
-+            "keywords": [
-+                "validator",
-+                "zf2"
-+            ],
-+            "time": "2019-01-29T22:26:39+00:00"
-         },
-         {
--            "name": "magento/module-grouped-import-export",
--            "version": "0.74.0-beta2",
-+            "name": "zendframework/zend-view",
-+            "version": "2.10.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/zendframework/zend-view.git",
-+                "reference": "c1a3f2043fb75b5983ab9adfc369ae396601be7e"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-grouped-import-export-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "3cbf803098dd03d361b51f730930c9c3e6a9292c"
-+                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/c1a3f2043fb75b5983ab9adfc369ae396601be7e",
-+                "reference": "c1a3f2043fb75b5983ab9adfc369ae396601be7e",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-import-export": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-grouped-product": "0.74.0-beta2",
--                "magento/module-import-export": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0",
-+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-+                "zendframework/zend-json": "^2.6.1",
-+                "zendframework/zend-loader": "^2.5",
-+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.15 || ^6.0.8",
-+                "zendframework/zend-authentication": "^2.5",
-+                "zendframework/zend-cache": "^2.6.1",
-+                "zendframework/zend-coding-standard": "~1.0.0",
-+                "zendframework/zend-config": "^2.6",
-+                "zendframework/zend-console": "^2.6",
-+                "zendframework/zend-escaper": "^2.5",
-+                "zendframework/zend-feed": "^2.7",
-+                "zendframework/zend-filter": "^2.6.1",
-+                "zendframework/zend-http": "^2.5.4",
-+                "zendframework/zend-i18n": "^2.6",
-+                "zendframework/zend-log": "^2.7",
-+                "zendframework/zend-modulemanager": "^2.7.1",
-+                "zendframework/zend-mvc": "^2.7.14 || ^3.0",
-+                "zendframework/zend-navigation": "^2.5",
-+                "zendframework/zend-paginator": "^2.5",
-+                "zendframework/zend-permissions-acl": "^2.6",
-+                "zendframework/zend-router": "^3.0.1",
-+                "zendframework/zend-serializer": "^2.6.1",
-+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-+                "zendframework/zend-session": "^2.8.1",
-+                "zendframework/zend-uri": "^2.5"
-+            },
-+            "suggest": {
-+                "zendframework/zend-authentication": "Zend\\Authentication component",
-+                "zendframework/zend-escaper": "Zend\\Escaper component",
-+                "zendframework/zend-feed": "Zend\\Feed component",
-+                "zendframework/zend-filter": "Zend\\Filter component",
-+                "zendframework/zend-http": "Zend\\Http component",
-+                "zendframework/zend-i18n": "Zend\\I18n component",
-+                "zendframework/zend-mvc": "Zend\\Mvc component",
-+                "zendframework/zend-mvc-plugin-flashmessenger": "zend-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with zend-mvc versions 3 and up",
-+                "zendframework/zend-navigation": "Zend\\Navigation component",
-+                "zendframework/zend-paginator": "Zend\\Paginator component",
-+                "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
-+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-+                "zendframework/zend-uri": "Zend\\Uri component"
-+            },
-+            "bin": [
-+                "bin/templatemap_generator.php"
-+            ],
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GroupedImportExport"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "2.10.x-dev",
-+                    "dev-develop": "2.11.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Zend\\View\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
--        },
-+            "description": "provides a system of helpers, output filters, and variable escaping",
-+            "homepage": "https://github.com/zendframework/zend-view",
-+            "keywords": [
-+                "view",
-+                "zf2"
-+            ],
-+            "time": "2018-12-06T21:20:01+00:00"
-+        }
-+    ],
-+    "packages-dev": [
-         {
--            "name": "magento/module-grouped-product",
--            "version": "0.74.0-beta2",
-+            "name": "allure-framework/allure-codeception",
-+            "version": "1.3.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/allure-framework/allure-codeception.git",
-+                "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-grouped-product-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "8ad968c974e321d99a9bccfd04721ccfb4bfb86f"
-+                "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/9d31d781b3622b028f1f6210bc76ba88438bd518",
-+                "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-msrp": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "allure-framework/allure-php-api": "~1.1.0",
-+                "codeception/codeception": "~2.1",
-+                "php": ">=5.4.0",
-+                "symfony/filesystem": ">=2.6",
-+                "symfony/finder": ">=2.6"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/GroupedProduct"
--                    ]
--                ]
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Yandex": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "Apache-2.0"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Ivan Krutov",
-+                    "email": "vania-pooh@yandex-team.ru",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "A Codeception adapter for Allure report.",
-+            "homepage": "http://allure.qatools.ru/",
-+            "keywords": [
-+                "allure",
-+                "attachments",
-+                "cases",
-+                "codeception",
-+                "report",
-+                "steps",
-+                "testing"
-+            ],
-+            "time": "2018-12-18T19:47:23+00:00"
-         },
-         {
--            "name": "magento/module-import-export",
--            "version": "0.74.0-beta2",
-+            "name": "allure-framework/allure-php-api",
-+            "version": "1.1.4",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/allure-framework/allure-php-adapter-api.git",
-+                "reference": "a462a0da121681577033e13c123b6cc4e89cdc64"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-import-export-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "c16b13bdf9efb2a9d52b6423ee641ca47d60da36"
-+                "url": "https://api.github.com/repos/allure-framework/allure-php-adapter-api/zipball/a462a0da121681577033e13c123b6cc4e89cdc64",
-+                "reference": "a462a0da121681577033e13c123b6cc4e89cdc64",
-+                "shasum": ""
-             },
-             "require": {
--                "ext-ctype": "*",
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-indexer": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "jms/serializer": ">=0.16.0",
-+                "moontoast/math": ">=1.1.0",
-+                "php": ">=5.4.0",
-+                "phpunit/phpunit": ">=4.0.0",
-+                "ramsey/uuid": ">=3.0.0",
-+                "symfony/http-foundation": ">=2.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/ImportExport"
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Yandex": [
-+                        "src/",
-+                        "test/"
-                     ]
--                ]
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "Apache-2.0"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Ivan Krutov",
-+                    "email": "vania-pooh@yandex-team.ru",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "PHP API for Allure adapter",
-+            "homepage": "http://allure.qatools.ru/",
-+            "keywords": [
-+                "allure",
-+                "api",
-+                "php",
-+                "report"
-+            ],
-+            "time": "2016-12-07T12:15:46+00:00"
-         },
-         {
--            "name": "magento/module-indexer",
--            "version": "0.74.0-beta2",
-+            "name": "allure-framework/allure-phpunit",
-+            "version": "1.2.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/allure-framework/allure-phpunit.git",
-+                "reference": "45504aeba41304cf155a898fa9ac1aae79f4a089"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-indexer-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "d1c6e17c92d766f8f3f578d290da957deb5d9a7c"
-+                "url": "https://api.github.com/repos/allure-framework/allure-phpunit/zipball/45504aeba41304cf155a898fa9ac1aae79f4a089",
-+                "reference": "45504aeba41304cf155a898fa9ac1aae79f4a089",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-page-cache": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "allure-framework/allure-php-api": "~1.1.0",
-+                "mikey179/vfsstream": "1.*",
-+                "php": ">=7.0.0",
-+                "phpunit/phpunit": ">=6.0.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Indexer"
--                    ]
--                ]
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Yandex": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "Apache-2.0"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Ivan Krutov",
-+                    "email": "vania-pooh@yandex-team.ru",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "A PHPUnit adapter for Allure report.",
-+            "homepage": "http://allure.qatools.ru/",
-+            "keywords": [
-+                "allure",
-+                "attachments",
-+                "cases",
-+                "phpunit",
-+                "report",
-+                "steps",
-+                "testing"
-+            ],
-+            "time": "2017-11-03T13:08:21+00:00"
-         },
-         {
--            "name": "magento/module-integration",
--            "version": "0.74.0-beta2",
-+            "name": "behat/gherkin",
-+            "version": "v4.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Behat/Gherkin.git",
-+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-integration-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "8e9a7d4df606513a67a649f63abdd31557061665"
-+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07",
-+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-authorization": "0.74.0-beta2",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-user": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.5|~5",
-+                "symfony/phpunit-bridge": "~2.7|~3|~4",
-+                "symfony/yaml": "~2.3|~3|~4"
-+            },
-+            "suggest": {
-+                "symfony/yaml": "If you want to parse features, represented in YAML files"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Integration"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "4.4-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "Behat\\Gherkin": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Konstantin Kudryashov",
-+                    "email": "ever.zet@gmail.com",
-+                    "homepage": "http://everzet.com"
-+                }
-+            ],
-+            "description": "Gherkin DSL parser for PHP 5.3",
-+            "homepage": "http://behat.org/",
-+            "keywords": [
-+                "BDD",
-+                "Behat",
-+                "Cucumber",
-+                "DSL",
-+                "gherkin",
-+                "parser"
-+            ],
-+            "time": "2019-01-16T14:22:17+00:00"
-         },
-         {
--            "name": "magento/module-layered-navigation",
--            "version": "0.74.0-beta2",
-+            "name": "codeception/codeception",
-+            "version": "2.4.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Codeception/Codeception.git",
-+                "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-layered-navigation-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "a20af59f1ffcf9565e2fab9ead134ee129bdcc8d"
-+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/5fee32d5c82791548931cbc34806b4de6aa1abfc",
-+                "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "behat/gherkin": "^4.4.0",
-+                "codeception/phpunit-wrapper": "^6.0.9|^7.0.6",
-+                "codeception/stub": "^2.0",
-+                "ext-json": "*",
-+                "ext-mbstring": "*",
-+                "facebook/webdriver": ">=1.1.3 <2.0",
-+                "guzzlehttp/guzzle": ">=4.1.4 <7.0",
-+                "guzzlehttp/psr7": "~1.0",
-+                "php": ">=5.6.0 <8.0",
-+                "symfony/browser-kit": ">=2.7 <5.0",
-+                "symfony/console": ">=2.7 <5.0",
-+                "symfony/css-selector": ">=2.7 <5.0",
-+                "symfony/dom-crawler": ">=2.7 <5.0",
-+                "symfony/event-dispatcher": ">=2.7 <5.0",
-+                "symfony/finder": ">=2.7 <5.0",
-+                "symfony/yaml": ">=2.7 <5.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "codeception/specify": "~0.3",
-+                "facebook/graph-sdk": "~5.3",
-+                "flow/jsonpath": "~0.2",
-+                "monolog/monolog": "~1.8",
-+                "pda/pheanstalk": "~3.0",
-+                "php-amqplib/php-amqplib": "~2.4",
-+                "predis/predis": "^1.0",
-+                "squizlabs/php_codesniffer": "~2.0",
-+                "symfony/process": ">=2.7 <5.0",
-+                "vlucas/phpdotenv": "^2.4.0"
-+            },
-+            "suggest": {
-+                "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module",
-+                "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests",
-+                "codeception/specify": "BDD-style code blocks",
-+                "codeception/verify": "BDD-style assertions",
-+                "flow/jsonpath": "For using JSONPath in REST module",
-+                "league/factory-muffin": "For DataFactory module",
-+                "league/factory-muffin-faker": "For Faker support in DataFactory module",
-+                "phpseclib/phpseclib": "for SFTP option in FTP Module",
-+                "stecman/symfony-console-completion": "For BASH autocompletion",
-+                "symfony/phpunit-bridge": "For phpunit-bridge support"
-+            },
-+            "bin": [
-+                "codecept"
-+            ],
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/LayeredNavigation"
--                    ]
--                ]
-+                "branch-alias": []
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Codeception\\": "src\\Codeception",
-+                    "Codeception\\Extension\\": "ext"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Michael Bodnarchuk",
-+                    "email": "davert@mail.ua",
-+                    "homepage": "http://codegyre.com"
-+                }
-+            ],
-+            "description": "BDD-style testing framework",
-+            "homepage": "http://codeception.com/",
-+            "keywords": [
-+                "BDD",
-+                "TDD",
-+                "acceptance testing",
-+                "functional testing",
-+                "unit testing"
-+            ],
-+            "time": "2018-08-01T07:21:49+00:00"
-         },
-         {
--            "name": "magento/module-media-storage",
--            "version": "0.74.0-beta2",
-+            "name": "codeception/phpunit-wrapper",
-+            "version": "6.6.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Codeception/phpunit-wrapper.git",
-+                "reference": "d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-media-storage-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "7c1b9232bf83b123c2a3c6b03973bd637f34e0f6"
-+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c",
-+                "reference": "d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "phpunit/php-code-coverage": ">=4.0.4 <6.0",
-+                "phpunit/phpunit": ">=6.5.13 <7.0",
-+                "sebastian/comparator": ">=1.2.4 <3.0",
-+                "sebastian/diff": ">=1.4 <4.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/MediaStorage"
--                    ]
--                ]
-+            "replace": {
-+                "codeception/phpunit-wrapper": "*"
-+            },
-+            "require-dev": {
-+                "codeception/specify": "*",
-+                "vlucas/phpdotenv": "^3.0"
-             },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Codeception\\PHPUnit\\": "src\\"
-+                }
-+            },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Davert",
-+                    "email": "davert.php@resend.cc"
-+                }
-+            ],
-+            "description": "PHPUnit classes used by Codeception",
-+            "time": "2019-02-26T20:47:39+00:00"
-         },
-         {
--            "name": "magento/module-msrp",
--            "version": "0.74.0-beta2",
-+            "name": "codeception/stub",
-+            "version": "2.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Codeception/Stub.git",
-+                "reference": "853657f988942f7afb69becf3fd0059f192c705a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-msrp-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "16bda583d7a876262fdc740c9513a4fb1739c3eb"
-+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/853657f988942f7afb69becf3fd0059f192c705a",
-+                "reference": "853657f988942f7afb69becf3fd0059f192c705a",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-bundle": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-downloadable": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-grouped-product": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Msrp"
--                    ]
--                ]
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Codeception\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-+            "time": "2019-03-02T15:35:10+00:00"
-         },
-         {
--            "name": "magento/module-multishipping",
--            "version": "0.74.0-beta2",
-+            "name": "consolidation/annotated-command",
-+            "version": "2.12.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/annotated-command.git",
-+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-multishipping-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "53b01c1acc039dec9e603681264a450f708d5fb6"
-+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789",
-+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-payment": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "consolidation/output-formatters": "^3.4",
-+                "php": ">=5.4.5",
-+                "psr/log": "^1",
-+                "symfony/console": "^2.8|^3|^4",
-+                "symfony/event-dispatcher": "^2.5|^3|^4",
-+                "symfony/finder": "^2.5|^3|^4"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/phpunit": "^6",
-+                "squizlabs/php_codesniffer": "^2.7"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Multishipping"
--                    ]
--                ]
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        },
-+                        "scenario-options": {
-+                            "create-lockfile": "false"
-+                        }
-+                    },
-+                    "phpunit4": {
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Consolidation\\AnnotatedCommand\\": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                }
-+            ],
-+            "description": "Initialize Symfony Console commands from annotated command class methods.",
-+            "time": "2019-03-08T16:55:03+00:00"
-         },
-         {
--            "name": "magento/module-newsletter",
--            "version": "0.74.0-beta2",
-+            "name": "consolidation/config",
-+            "version": "1.2.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/config.git",
-+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-newsletter-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "a9e11c0ab106ea0aec8709a5a17169be826680c3"
-+                "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
-+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-cms": "0.74.0-beta2",
--                "magento/module-cron": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-email": "0.74.0-beta2",
--                "magento/module-require-js": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-widget": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "dflydev/dot-access-data": "^1.1.0",
-+                "grasmash/expander": "^1",
-+                "php": ">=5.4.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/phpunit": "^5",
-+                "squizlabs/php_codesniffer": "2.*",
-+                "symfony/console": "^2.5|^3|^4",
-+                "symfony/yaml": "^2.8.11|^3|^4"
-+            },
-+            "suggest": {
-+                "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Newsletter"
--                    ]
--                ]
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require-dev": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require-dev": {
-+                            "symfony/console": "^2.8",
-+                            "symfony/event-dispatcher": "^2.8",
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Consolidation\\Config\\": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                }
-+            ],
-+            "description": "Provide configuration services for a commandline tool.",
-+            "time": "2019-03-03T19:37:04+00:00"
-         },
-         {
--            "name": "magento/module-offline-payments",
--            "version": "0.74.0-beta2",
-+            "name": "consolidation/log",
-+            "version": "1.1.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/log.git",
-+                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-offline-payments-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "d3b7cd008994bef7456496094f397c82a9f3a8ef"
-+                "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
-+                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-payment": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.4.5",
-+                "psr/log": "^1.0",
-+                "symfony/console": "^2.8|^3|^4"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/phpunit": "^6",
-+                "squizlabs/php_codesniffer": "^2"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/OfflinePayments"
--                    ]
--                ]
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    },
-+                    "phpunit4": {
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Consolidation\\Log\\": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                }
-+            ],
-+            "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
-+            "time": "2019-01-01T17:30:51+00:00"
-         },
-         {
--            "name": "magento/module-offline-shipping",
--            "version": "0.74.0-beta2",
-+            "name": "consolidation/output-formatters",
-+            "version": "3.4.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/output-formatters.git",
-+                "reference": "0881112642ad9059071f13f397f571035b527cb9"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-offline-shipping-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "94f097652ea87bc0504837366a51b7065ca864d4"
-+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/0881112642ad9059071f13f397f571035b527cb9",
-+                "reference": "0881112642ad9059071f13f397f571035b527cb9",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-sales-rule": "0.74.0-beta2",
--                "magento/module-shipping": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "dflydev/dot-access-data": "^1.1.0",
-+                "php": ">=5.4.0",
-+                "symfony/console": "^2.8|^3|^4",
-+                "symfony/finder": "^2.5|^3|^4"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "g1a/composer-test-scenarios": "^3",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/phpunit": "^5.7.27",
-+                "squizlabs/php_codesniffer": "^2.7",
-+                "symfony/var-dumper": "^2.8|^3|^4",
-+                "victorjonsson/markdowndocs": "^1.3"
-+            },
-+            "suggest": {
-+                "symfony/var-dumper": "For using the var_dump formatter"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/OfflineShipping"
--                    ]
--                ]
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4.0"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^6"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony3": {
-+                        "require": {
-+                            "symfony/console": "^3.4",
-+                            "symfony/finder": "^3.4",
-+                            "symfony/var-dumper": "^3.4"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.6.32"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "require-dev": {
-+                            "phpunit/phpunit": "^4.8.36"
-+                        },
-+                        "remove": [
-+                            "php-coveralls/php-coveralls"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.4.8"
-+                            }
-+                        },
-+                        "scenario-options": {
-+                            "create-lockfile": "false"
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "3.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Consolidation\\OutputFormatters\\": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                }
-+            ],
-+            "description": "Format text by applying transformations provided by plug-in formatters.",
-+            "time": "2019-03-14T03:45:44+00:00"
-         },
-         {
--            "name": "magento/module-page-cache",
--            "version": "0.74.0-beta2",
-+            "name": "consolidation/robo",
-+            "version": "1.4.9",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/Robo.git",
-+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-page-cache-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "9db7b9c8d035e0eb3f619d37c8ff439b9f225e8f"
-+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
-+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "consolidation/annotated-command": "^2.10.2",
-+                "consolidation/config": "^1.2",
-+                "consolidation/log": "~1",
-+                "consolidation/output-formatters": "^3.1.13",
-+                "consolidation/self-update": "^1",
-+                "grasmash/yaml-expander": "^1.3",
-+                "league/container": "^2.2",
-+                "php": ">=5.5.0",
-+                "symfony/console": "^2.8|^3|^4",
-+                "symfony/event-dispatcher": "^2.5|^3|^4",
-+                "symfony/filesystem": "^2.5|^3|^4",
-+                "symfony/finder": "^2.5|^3|^4",
-+                "symfony/process": "^2.5|^3|^4"
-+            },
-+            "replace": {
-+                "codegyre/robo": "< 1.0"
-+            },
-+            "require-dev": {
-+                "codeception/aspect-mock": "^1|^2.1.1",
-+                "codeception/base": "^2.3.7",
-+                "codeception/verify": "^0.3.2",
-+                "g1a/composer-test-scenarios": "^3",
-+                "goaop/framework": "~2.1.2",
-+                "goaop/parser-reflection": "^1.1.0",
-+                "natxet/cssmin": "3.0.4",
-+                "nikic/php-parser": "^3.1.5",
-+                "patchwork/jsqueeze": "~2",
-+                "pear/archive_tar": "^1.4.4",
-+                "php-coveralls/php-coveralls": "^1",
-+                "phpunit/php-code-coverage": "~2|~4",
-+                "squizlabs/php_codesniffer": "^2.8"
-+            },
-+            "suggest": {
-+                "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch",
-+                "natxet/CssMin": "For minifying CSS files in taskMinify",
-+                "patchwork/jsqueeze": "For minifying JS files in taskMinify",
-+                "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively."
-             },
--            "type": "magento2-module",
-+            "bin": [
-+                "robo"
-+            ],
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/PageCache"
--                    ]
--                ]
-+                "scenarios": {
-+                    "symfony4": {
-+                        "require": {
-+                            "symfony/console": "^4"
-+                        },
-+                        "config": {
-+                            "platform": {
-+                                "php": "7.1.3"
-+                            }
-+                        }
-+                    },
-+                    "symfony2": {
-+                        "require": {
-+                            "symfony/console": "^2.8"
-+                        },
-+                        "remove": [
-+                            "goaop/framework"
-+                        ],
-+                        "config": {
-+                            "platform": {
-+                                "php": "5.5.9"
-+                            }
-+                        },
-+                        "scenario-options": {
-+                            "create-lockfile": "false"
-+                        }
-+                    }
-+                },
-+                "branch-alias": {
-+                    "dev-master": "2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Robo\\": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Davert",
-+                    "email": "davert.php@resend.cc"
-+                }
-+            ],
-+            "description": "Modern task runner",
-+            "time": "2019-03-19T18:07:19+00:00"
-         },
-         {
--            "name": "magento/module-payment",
--            "version": "0.74.0-beta2",
-+            "name": "consolidation/self-update",
-+            "version": "1.1.5",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/consolidation/self-update.git",
-+                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-payment-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "9da0894c984887cf2e3c6c5a32f84616867495ae"
-+                "url": "https://api.github.com/repos/consolidation/self-update/zipball/a1c273b14ce334789825a09d06d4c87c0a02ad54",
-+                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-centinel": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.5.0",
-+                "symfony/console": "^2.8|^3|^4",
-+                "symfony/filesystem": "^2.5|^3|^4"
-             },
--            "type": "magento2-module",
-+            "bin": [
-+                "scripts/release"
-+            ],
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Payment"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "SelfUpdate\\": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Greg Anderson",
-+                    "email": "greg.1.anderson@greenknowe.org"
-+                },
-+                {
-+                    "name": "Alexander Menk",
-+                    "email": "menk@mestrona.net"
-+                }
-+            ],
-+            "description": "Provides a self:update command for Symfony Console applications.",
-+            "time": "2018-10-28T01:52:03+00:00"
-         },
-         {
--            "name": "magento/module-persistent",
--            "version": "0.74.0-beta2",
-+            "name": "dflydev/dot-access-data",
-+            "version": "v1.1.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
-+                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-persistent-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "891f5f3f5c23dd19e2f815754f4c5e8b4da6af1c"
-+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a",
-+                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-cron": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-page-cache": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.2"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Persistent"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.0-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "Dflydev\\DotAccessData": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Dragonfly Development Inc.",
-+                    "email": "info@dflydev.com",
-+                    "homepage": "http://dflydev.com"
-+                },
-+                {
-+                    "name": "Beau Simensen",
-+                    "email": "beau@dflydev.com",
-+                    "homepage": "http://beausimensen.com"
-+                },
-+                {
-+                    "name": "Carlos Frutos",
-+                    "email": "carlos@kiwing.it",
-+                    "homepage": "https://github.com/cfrutos"
-+                }
-+            ],
-+            "description": "Given a deep data structure, access data by dot notation.",
-+            "homepage": "https://github.com/dflydev/dflydev-dot-access-data",
-+            "keywords": [
-+                "access",
-+                "data",
-+                "dot",
-+                "notation"
-+            ],
-+            "time": "2017-01-20T21:14:22+00:00"
-         },
-         {
--            "name": "magento/module-product-alert",
--            "version": "0.74.0-beta2",
-+            "name": "doctrine/annotations",
-+            "version": "v1.6.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/doctrine/annotations.git",
-+                "reference": "53120e0eb10355388d6ccbe462f1fea34ddadb24"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-product-alert-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "43292b34d4078dddc73b7bb4bcdb889292b578a6"
-+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/53120e0eb10355388d6ccbe462f1fea34ddadb24",
-+                "reference": "53120e0eb10355388d6ccbe462f1fea34ddadb24",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "doctrine/lexer": "1.*",
-+                "php": "^7.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "doctrine/cache": "1.*",
-+                "phpunit/phpunit": "^6.4"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/ProductAlert"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.6.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Roman Borschel",
-+                    "email": "roman@code-factory.org"
-+                },
-+                {
-+                    "name": "Benjamin Eberlei",
-+                    "email": "kontakt@beberlei.de"
-+                },
-+                {
-+                    "name": "Guilherme Blanco",
-+                    "email": "guilhermeblanco@gmail.com"
-+                },
-+                {
-+                    "name": "Jonathan Wage",
-+                    "email": "jonwage@gmail.com"
-+                },
-+                {
-+                    "name": "Johannes Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "Docblock Annotations Parser",
-+            "homepage": "http://www.doctrine-project.org",
-+            "keywords": [
-+                "annotations",
-+                "docblock",
-+                "parser"
-+            ],
-+            "time": "2019-03-25T19:12:02+00:00"
-         },
-         {
--            "name": "magento/module-quote",
--            "version": "0.74.0-beta2",
-+            "name": "doctrine/collections",
-+            "version": "v1.6.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/doctrine/collections.git",
-+                "reference": "d2ae4ef05e25197343b6a39bae1d3c427a2f6956"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-quote-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "8c3033317c359e5fc20e9308ed796ae6760fa22f"
-+                "url": "https://api.github.com/repos/doctrine/collections/zipball/d2ae4ef05e25197343b6a39bae1d3c427a2f6956",
-+                "reference": "d2ae4ef05e25197343b6a39bae1d3c427a2f6956",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-authorization": "0.74.0-beta2",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-catalog-rule": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-payment": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1.3"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "doctrine/coding-standard": "^6.0",
-+                "phpstan/phpstan-shim": "^0.9.2",
-+                "phpunit/phpunit": "^7.0",
-+                "vimeo/psalm": "^3.2.2"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Quote"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.6.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Roman Borschel",
-+                    "email": "roman@code-factory.org"
-+                },
-+                {
-+                    "name": "Benjamin Eberlei",
-+                    "email": "kontakt@beberlei.de"
-+                },
-+                {
-+                    "name": "Guilherme Blanco",
-+                    "email": "guilhermeblanco@gmail.com"
-+                },
-+                {
-+                    "name": "Jonathan Wage",
-+                    "email": "jonwage@gmail.com"
-+                },
-+                {
-+                    "name": "Johannes Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "PHP Doctrine Collections library that adds additional functionality on top of PHP arrays.",
-+            "homepage": "https://www.doctrine-project.org/projects/collections.html",
-+            "keywords": [
-+                "array",
-+                "collections",
-+                "iterators",
-+                "php"
-+            ],
-+            "time": "2019-03-25T19:03:48+00:00"
-         },
-         {
--            "name": "magento/module-reports",
--            "version": "0.74.0-beta2",
-+            "name": "doctrine/instantiator",
-+            "version": "1.2.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/doctrine/instantiator.git",
-+                "reference": "a2c590166b2133a4633738648b6b064edae0814a"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-reports-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "38b1c0ddfbd756666cb0bc05e687d01ced515464"
-+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
-+                "reference": "a2c590166b2133a4633738648b6b064edae0814a",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-cms": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-downloadable": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-review": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-sales-rule": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "magento/module-widget": "0.74.0-beta2",
--                "magento/module-wishlist": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "doctrine/coding-standard": "^6.0",
-+                "ext-pdo": "*",
-+                "ext-phar": "*",
-+                "phpbench/phpbench": "^0.13",
-+                "phpstan/phpstan-phpunit": "^0.11",
-+                "phpstan/phpstan-shim": "^0.11",
-+                "phpunit/phpunit": "^7.0"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Reports"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.2.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Marco Pivetta",
-+                    "email": "ocramius@gmail.com",
-+                    "homepage": "http://ocramius.github.com/"
-+                }
-+            ],
-+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
-+            "keywords": [
-+                "constructor",
-+                "instantiate"
-+            ],
-+            "time": "2019-03-17T17:37:11+00:00"
-         },
-         {
--            "name": "magento/module-require-js",
--            "version": "0.74.0-beta2",
-+            "name": "doctrine/lexer",
-+            "version": "v1.0.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/doctrine/lexer.git",
-+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-require-js-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "6e94b63070fd1c174ab55c109d384d5b3bb04131"
-+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
-+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.2"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/RequireJs"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "Doctrine\\Common\\Lexer\\": "lib/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Roman Borschel",
-+                    "email": "roman@code-factory.org"
-+                },
-+                {
-+                    "name": "Guilherme Blanco",
-+                    "email": "guilhermeblanco@gmail.com"
-+                },
-+                {
-+                    "name": "Johannes Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
-+            "homepage": "http://www.doctrine-project.org",
-+            "keywords": [
-+                "lexer",
-+                "parser"
-+            ],
-+            "time": "2014-09-09T13:34:57+00:00"
-         },
-         {
--            "name": "magento/module-review",
--            "version": "0.74.0-beta2",
-+            "name": "epfremme/swagger-php",
-+            "version": "v2.0.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/epfremmer/swagger-php.git",
-+                "reference": "eee28a442b7e6220391ec953d3c9b936354f23bc"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-review-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "45385eac2767e9165bfd88bcbc6a69dccca29f38"
-+                "url": "https://api.github.com/repos/epfremmer/swagger-php/zipball/eee28a442b7e6220391ec953d3c9b936354f23bc",
-+                "reference": "eee28a442b7e6220391ec953d3c9b936354f23bc",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-newsletter": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "magento/module-ui": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "doctrine/annotations": "^1.2",
-+                "doctrine/collections": "^1.3",
-+                "jms/serializer": "^1.1",
-+                "php": ">=5.5",
-+                "phpoption/phpoption": "^1.1",
-+                "symfony/yaml": "^2.7|^3.1"
-             },
--            "suggest": {
--                "magento/module-cookie": "0.74.0-beta2"
-+            "require-dev": {
-+                "mockery/mockery": "^0.9.4",
-+                "phpunit/phpunit": "~4.8|~5.0",
-+                "satooshi/php-coveralls": "^1.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Review"
--                    ]
--                ]
-+            "type": "package",
-+            "autoload": {
-+                "psr-4": {
-+                    "Epfremme\\Swagger\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Edward Pfremmer",
-+                    "email": "epfremme@nerdery.com"
-+                }
-+            ],
-+            "description": "Library for parsing swagger documentation into PHP entities for use in testing and code generation",
-+            "time": "2016-09-26T17:24:17+00:00"
-         },
-         {
--            "name": "magento/module-rss",
--            "version": "0.74.0-beta2",
-+            "name": "facebook/webdriver",
-+            "version": "1.6.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/facebook/php-webdriver.git",
-+                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-rss-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "0706c2102a0003e2f214c35b77c1e628519b727a"
-+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/bd8c740097eb9f2fc3735250fc1912bc811a954e",
-+                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-curl": "*",
-+                "ext-json": "*",
-+                "ext-mbstring": "*",
-+                "ext-zip": "*",
-+                "php": "^5.6 || ~7.0",
-+                "symfony/process": "^2.8 || ^3.1 || ^4.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "^2.0",
-+                "jakub-onderka/php-parallel-lint": "^0.9.2",
-+                "php-coveralls/php-coveralls": "^2.0",
-+                "php-mock/php-mock-phpunit": "^1.1",
-+                "phpunit/phpunit": "^5.7",
-+                "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
-+                "squizlabs/php_codesniffer": "^2.6",
-+                "symfony/var-dumper": "^3.3 || ^4.0"
-+            },
-+            "suggest": {
-+                "ext-SimpleXML": "For Firefox profile creation"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Rss"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-community": "1.5-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Facebook\\WebDriver\\": "lib/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "Apache-2.0"
-             ],
--            "description": "N/A"
-+            "description": "A PHP client for Selenium WebDriver",
-+            "homepage": "https://github.com/facebook/php-webdriver",
-+            "keywords": [
-+                "facebook",
-+                "php",
-+                "selenium",
-+                "webdriver"
-+            ],
-+            "time": "2018-05-16T17:37:13+00:00"
-         },
-         {
--            "name": "magento/module-rule",
--            "version": "0.74.0-beta2",
-+            "name": "flow/jsonpath",
-+            "version": "0.4.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/FlowCommunications/JSONPath.git",
-+                "reference": "f0222818d5c938e4ab668ab2e2c079bd51a27112"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-rule-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "762edf4eabfe082b589b09bcf47a3ef2ac8a7f35"
-+                "url": "https://api.github.com/repos/FlowCommunications/JSONPath/zipball/f0222818d5c938e4ab668ab2e2c079bd51a27112",
-+                "reference": "f0222818d5c938e4ab668ab2e2c079bd51a27112",
-+                "shasum": ""
-             },
-             "require": {
--                "lib-libxml": "*",
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.4.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Rule"
--                    ]
--                ]
-+            "require-dev": {
-+                "peekmo/jsonpath": "dev-master",
-+                "phpunit/phpunit": "^4.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Flow\\JSONPath": "src/",
-+                    "Flow\\JSONPath\\Test": "tests/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Stephen Frank",
-+                    "email": "stephen@flowsa.com"
-+                }
-+            ],
-+            "description": "JSONPath implementation for parsing, searching and flattening arrays",
-+            "time": "2018-03-04T16:39:47+00:00"
-         },
-         {
--            "name": "magento/module-sales",
--            "version": "0.74.0-beta2",
-+            "name": "friendsofphp/php-cs-fixer",
-+            "version": "v2.13.3",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-+                "reference": "38d6f2e9be2aa80bf3c7365612af7f9eb9078719"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-sales-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "bf591f1f3033aa2fd3fe8bfb2732a6e7b81a499c"
-+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/38d6f2e9be2aa80bf3c7365612af7f9eb9078719",
-+                "reference": "38d6f2e9be2aa80bf3c7365612af7f9eb9078719",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-authorization": "0.74.0-beta2",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-email": "0.74.0-beta2",
--                "magento/module-gift-message": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-payment": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-reports": "0.74.0-beta2",
--                "magento/module-sales-rule": "0.74.0-beta2",
--                "magento/module-shipping": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "magento/module-ui": "0.74.0-beta2",
--                "magento/module-widget": "0.74.0-beta2",
--                "magento/module-wishlist": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "composer/semver": "^1.4",
-+                "composer/xdebug-handler": "^1.2",
-+                "doctrine/annotations": "^1.2",
-+                "ext-json": "*",
-+                "ext-tokenizer": "*",
-+                "php": "^5.6 || >=7.0 <7.3",
-+                "php-cs-fixer/diff": "^1.3",
-+                "symfony/console": "^3.4.17 || ^4.1.6",
-+                "symfony/event-dispatcher": "^3.0 || ^4.0",
-+                "symfony/filesystem": "^3.0 || ^4.0",
-+                "symfony/finder": "^3.0 || ^4.0",
-+                "symfony/options-resolver": "^3.0 || ^4.0",
-+                "symfony/polyfill-php70": "^1.0",
-+                "symfony/polyfill-php72": "^1.4",
-+                "symfony/process": "^3.0 || ^4.0",
-+                "symfony/stopwatch": "^3.0 || ^4.0"
-+            },
-+            "conflict": {
-+                "hhvm": "*"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Sales"
--                    ]
-+            "require-dev": {
-+                "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
-+                "justinrainbow/json-schema": "^5.0",
-+                "keradus/cli-executor": "^1.2",
-+                "mikey179/vfsstream": "^1.6",
-+                "php-coveralls/php-coveralls": "^2.1",
-+                "php-cs-fixer/accessible-object": "^1.0",
-+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1",
-+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1",
-+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
-+                "phpunitgoodpractices/traits": "^1.5.1",
-+                "symfony/phpunit-bridge": "^4.0"
-+            },
-+            "suggest": {
-+                "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
-+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
-+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
-+                "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
-+            },
-+            "bin": [
-+                "php-cs-fixer"
-+            ],
-+            "type": "application",
-+            "autoload": {
-+                "psr-4": {
-+                    "PhpCsFixer\\": "src/"
-+                },
-+                "classmap": [
-+                    "tests/Test/AbstractFixerTestCase.php",
-+                    "tests/Test/AbstractIntegrationCaseFactory.php",
-+                    "tests/Test/AbstractIntegrationTestCase.php",
-+                    "tests/Test/Assert/AssertTokensTrait.php",
-+                    "tests/Test/IntegrationCase.php",
-+                    "tests/Test/IntegrationCaseFactory.php",
-+                    "tests/Test/IntegrationCaseFactoryInterface.php",
-+                    "tests/Test/InternalIntegrationCaseFactory.php",
-+                    "tests/TestCase.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Dariusz Rumiński",
-+                    "email": "dariusz.ruminski@gmail.com"
-+                },
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                }
-+            ],
-+            "description": "A tool to automatically fix PHP code style",
-+            "time": "2019-01-04T18:24:28+00:00"
-         },
-         {
--            "name": "magento/module-sales-rule",
--            "version": "0.74.0-beta2",
-+            "name": "fzaninotto/faker",
-+            "version": "v1.8.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/fzaninotto/Faker.git",
-+                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-sales-rule-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "fdb556db9915f50b0bbbc3fd5f004c21fdf144ac"
-+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
-+                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-rule": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-payment": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-reports": "0.74.0-beta2",
--                "magento/module-rule": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-shipping": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-widget": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.3.3 || ^7.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "ext-intl": "*",
-+                "phpunit/phpunit": "^4.8.35 || ^5.7",
-+                "squizlabs/php_codesniffer": "^1.5"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/SalesRule"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.8-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Faker\\": "src/Faker/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "François Zaninotto"
-+                }
-+            ],
-+            "description": "Faker is a PHP library that generates fake data for you.",
-+            "keywords": [
-+                "data",
-+                "faker",
-+                "fixtures"
-+            ],
-+            "time": "2018-07-12T10:23:15+00:00"
-         },
-         {
--            "name": "magento/module-search",
--            "version": "0.74.0-beta2",
-+            "name": "grasmash/expander",
-+            "version": "1.0.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/grasmash/expander.git",
-+                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-search-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "a9605f79153be5e6206e269161ec6b0fe27b4b1a"
-+                "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f",
-+                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog-search": "0.74.0-beta2",
--                "magento/module-reports": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "dflydev/dot-access-data": "^1.1.0",
-+                "php": ">=5.4"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "greg-1-anderson/composer-test-scenarios": "^1",
-+                "phpunit/phpunit": "^4|^5.5.4",
-+                "satooshi/php-coveralls": "^1.0.2|dev-master",
-+                "squizlabs/php_codesniffer": "^2.7"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Search"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Grasmash\\Expander\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Matthew Grasmick"
-+                }
-+            ],
-+            "description": "Expands internal property references in PHP arrays file.",
-+            "time": "2017-12-21T22:14:55+00:00"
-         },
-         {
--            "name": "magento/module-sendfriend",
--            "version": "0.74.0-beta2",
-+            "name": "grasmash/yaml-expander",
-+            "version": "1.4.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/grasmash/yaml-expander.git",
-+                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-sendfriend-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "3830393608a4c34ef05eb26de6543ffe3739e1f4"
-+                "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1",
-+                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "dflydev/dot-access-data": "^1.1.0",
-+                "php": ">=5.4",
-+                "symfony/yaml": "^2.8.11|^3|^4"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "greg-1-anderson/composer-test-scenarios": "^1",
-+                "phpunit/phpunit": "^4.8|^5.5.4",
-+                "satooshi/php-coveralls": "^1.0.2|dev-master",
-+                "squizlabs/php_codesniffer": "^2.7"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Sendfriend"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "Grasmash\\YamlExpander\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Matthew Grasmick"
-+                }
-+            ],
-+            "description": "Expands internal property references in a yaml file.",
-+            "time": "2017-12-16T16:06:03+00:00"
-         },
-         {
--            "name": "magento/module-shipping",
--            "version": "0.74.0-beta2",
-+            "name": "jms/metadata",
-+            "version": "1.7.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/schmittjoh/metadata.git",
-+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-shipping-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "0793baf12096494d141c3e6419f53a9c57aef0df"
-+                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/e5854ab1aa643623dc64adde718a8eec32b957a8",
-+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8",
-+                "shasum": ""
-             },
-             "require": {
--                "ext-gd": "*",
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-contact": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-payment": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.0"
-             },
--            "suggest": {
--                "magento/module-fedex": "0.74.0-beta2",
--                "magento/module-ups": "0.74.0-beta2"
-+            "require-dev": {
-+                "doctrine/cache": "~1.0",
-+                "symfony/cache": "~3.1"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Shipping"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.5.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "Metadata\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Asmir Mustafic",
-+                    "email": "goetas@gmail.com"
-+                },
-+                {
-+                    "name": "Johannes M. Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "Class/method/property metadata management in PHP",
-+            "keywords": [
-+                "annotations",
-+                "metadata",
-+                "xml",
-+                "yaml"
-+            ],
-+            "time": "2018-10-26T12:40:10+00:00"
-         },
-         {
--            "name": "magento/module-sitemap",
--            "version": "0.74.0-beta2",
-+            "name": "jms/parser-lib",
-+            "version": "1.0.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/schmittjoh/parser-lib.git",
-+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-sitemap-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "55e734ce8228a6e0b39eccb1829ae617845f9e53"
-+                "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-url-rewrite": "0.74.0-beta2",
--                "magento/module-cms": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "phpoption/phpoption": ">=0.9,<2.0-dev"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Sitemap"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.0-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "JMS\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "Apache2"
-             ],
--            "description": "N/A"
-+            "description": "A library for easily creating recursive-descent parsers.",
-+            "time": "2012-11-18T18:08:43+00:00"
-         },
-         {
--            "name": "magento/module-store",
--            "version": "0.74.0-beta2",
-+            "name": "jms/serializer",
-+            "version": "1.13.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/schmittjoh/serializer.git",
-+                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-store-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "b53f0f39a5eceb85e0b28bcf32d5bb68314b3027"
-+                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
-+                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-ui": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "doctrine/annotations": "^1.0",
-+                "doctrine/instantiator": "^1.0.3",
-+                "jms/metadata": "^1.3",
-+                "jms/parser-lib": "1.*",
-+                "php": "^5.5|^7.0",
-+                "phpcollection/phpcollection": "~0.1",
-+                "phpoption/phpoption": "^1.1"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "doctrine/orm": "~2.1",
-+                "doctrine/phpcr-odm": "^1.3|^2.0",
-+                "ext-pdo_sqlite": "*",
-+                "jackalope/jackalope-doctrine-dbal": "^1.1.5",
-+                "phpunit/phpunit": "^4.8|^5.0",
-+                "propel/propel1": "~1.7",
-+                "psr/container": "^1.0",
-+                "symfony/dependency-injection": "^2.7|^3.3|^4.0",
-+                "symfony/expression-language": "^2.6|^3.0",
-+                "symfony/filesystem": "^2.1",
-+                "symfony/form": "~2.1|^3.0",
-+                "symfony/translation": "^2.1|^3.0",
-+                "symfony/validator": "^2.2|^3.0",
-+                "symfony/yaml": "^2.1|^3.0"
-+            },
-+            "suggest": {
-+                "doctrine/cache": "Required if you like to use cache functionality.",
-+                "doctrine/collections": "Required if you like to use doctrine collection types as ArrayCollection.",
-+                "symfony/yaml": "Required if you'd like to serialize data to YAML format."
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Store"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-1.x": "1.13-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "JMS\\Serializer": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Asmir Mustafic",
-+                    "email": "goetas@gmail.com"
-+                },
-+                {
-+                    "name": "Johannes M. Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
-+            "homepage": "http://jmsyst.com/libs/serializer",
-+            "keywords": [
-+                "deserialization",
-+                "jaxb",
-+                "json",
-+                "serialization",
-+                "xml"
-+            ],
-+            "time": "2018-07-25T13:58:54+00:00"
-         },
-         {
--            "name": "magento/module-tax",
--            "version": "0.74.0-beta2",
-+            "name": "league/container",
-+            "version": "2.4.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/thephpleague/container.git",
-+                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-tax-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "ed22d2db556957de4ab5406d4d0edce811855b9b"
-+                "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0",
-+                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-reports": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-shipping": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "container-interop/container-interop": "^1.2",
-+                "php": "^5.4.0 || ^7.0"
-             },
--            "type": "magento2-module",
-+            "provide": {
-+                "container-interop/container-interop-implementation": "^1.2",
-+                "psr/container-implementation": "^1.0"
-+            },
-+            "replace": {
-+                "orno/di": "~2.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "4.*"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Tax"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-2.x": "2.x-dev",
-+                    "dev-1.x": "1.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "League\\Container\\": "src"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Phil Bennett",
-+                    "email": "philipobenito@gmail.com",
-+                    "homepage": "http://www.philipobenito.com",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "A fast and intuitive dependency injection container.",
-+            "homepage": "https://github.com/thephpleague/container",
-+            "keywords": [
-+                "container",
-+                "dependency",
-+                "di",
-+                "injection",
-+                "league",
-+                "provider",
-+                "service"
-+            ],
-+            "time": "2017-05-10T09:20:27+00:00"
-         },
-         {
--            "name": "magento/module-tax-import-export",
--            "version": "0.74.0-beta2",
-+            "name": "lusitanian/oauth",
-+            "version": "v0.8.11",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/Lusitanian/PHPoAuthLib.git",
-+                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-tax-import-export-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "90716decbf4c0eb8fb29523530471fc2f8fbb426"
-+                "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/fc11a53db4b66da555a6a11fce294f574a8374f9",
-+                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "3.7.*",
-+                "predis/predis": "0.8.*@dev",
-+                "squizlabs/php_codesniffer": "2.*",
-+                "symfony/http-foundation": "~2.1"
-+            },
-+            "suggest": {
-+                "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.",
-+                "predis/predis": "Allows using the Redis storage backend.",
-+                "symfony/http-foundation": "Allows using the Symfony Session storage backend."
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/TaxImportExport"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "0.1-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "OAuth": "src",
-+                    "OAuth\\Unit": "tests"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "David Desberg",
-+                    "email": "david@daviddesberg.com"
-+                },
-+                {
-+                    "name": "Elliot Chance",
-+                    "email": "elliotchance@gmail.com"
-+                },
-+                {
-+                    "name": "Pieter Hordijk",
-+                    "email": "info@pieterhordijk.com"
-+                }
-+            ],
-+            "description": "PHP 5.3+ oAuth 1/2 Library",
-+            "keywords": [
-+                "Authentication",
-+                "authorization",
-+                "oauth",
-+                "security"
-+            ],
-+            "time": "2018-02-14T22:37:14+00:00"
-         },
-         {
--            "name": "magento/module-theme",
--            "version": "0.74.0-beta2",
-+            "name": "magento/magento2-functional-testing-framework",
-+            "version": "2.3.14",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-+                "reference": "b4002b3fe53884895921b44cf519d42918e3c7c6"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-theme-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "4754e71f25664ca7d010351e63c8c017e3c649dd"
-+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/b4002b3fe53884895921b44cf519d42918e3c7c6",
-+                "reference": "b4002b3fe53884895921b44cf519d42918e3c7c6",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-cms": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-media-storage": "0.74.0-beta2",
--                "magento/module-require-js": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-widget": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "allure-framework/allure-codeception": "~1.3.0",
-+                "codeception/codeception": "~2.3.4 || ~2.4.0 ",
-+                "consolidation/robo": "^1.0.0",
-+                "epfremme/swagger-php": "^2.0",
-+                "ext-curl": "*",
-+                "flow/jsonpath": ">0.2",
-+                "fzaninotto/faker": "^1.6",
-+                "monolog/monolog": "^1.0",
-+                "mustache/mustache": "~2.5",
-+                "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
-+                "symfony/process": "^2.8 || ^3.1 || ^4.0",
-+                "vlucas/phpdotenv": "^2.4"
-             },
--            "suggest": {
--                "magento/module-translation": "0.74.0-beta2"
-+            "require-dev": {
-+                "brainmaestro/composer-git-hooks": "^2.3",
-+                "codacy/coverage": "^1.4",
-+                "codeception/aspect-mock": "^3.0",
-+                "doctrine/cache": "<1.7.0",
-+                "goaop/framework": "2.2.0",
-+                "php-coveralls/php-coveralls": "^1.0",
-+                "phpmd/phpmd": "^2.6.0",
-+                "phpunit/phpunit": "~6.5.0 || ~7.0.0",
-+                "rregeer/phpunit-coverage-check": "^0.1.4",
-+                "sebastian/phpcpd": "~3.0 || ~4.0",
-+                "squizlabs/php_codesniffer": "~3.2",
-+                "symfony/stopwatch": "~3.4.6"
-             },
--            "type": "magento2-module",
-+            "bin": [
-+                "bin/mftf"
-+            ],
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Theme"
--                    ]
--                ]
-+                "hooks": {
-+                    "pre-push": "bin/all-checks"
-+                }
-+            },
-+            "autoload": {
-+                "files": [
-+                    "src/Magento/FunctionalTestingFramework/_bootstrap.php"
-+                ],
-+                "psr-4": {
-+                    "Magento\\FunctionalTestingFramework\\": "src/Magento/FunctionalTestingFramework",
-+                    "MFTF\\": "dev/tests/functional/MFTF"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "AGPL-3.0"
-             ],
--            "description": "N/A"
-+            "description": "Magento2 Functional Testing Framework",
-+            "keywords": [
-+                "automation",
-+                "functional",
-+                "magento",
-+                "testing"
-+            ],
-+            "time": "2019-02-19T16:03:22+00:00"
-         },
-         {
--            "name": "magento/module-translation",
--            "version": "0.74.0-beta2",
-+            "name": "mikey179/vfsStream",
-+            "version": "v1.6.6",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/bovigo/vfsStream.git",
-+                "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-translation-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "68e633ff0380bb3d9660c17149935a0cdeda4edb"
-+                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
-+                "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-developer": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "~4.5"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Translation"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.6.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "org\\bovigo\\vfs\\": "src/main/php"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Frank Kleine",
-+                    "homepage": "http://frankkleine.de/",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "Virtual file system to mock the real file system in unit tests.",
-+            "homepage": "http://vfs.bovigo.org/",
-+            "time": "2019-04-08T13:54:32+00:00"
-         },
-         {
--            "name": "magento/module-ui",
--            "version": "0.74.0-beta2",
-+            "name": "moontoast/math",
-+            "version": "1.1.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/ramsey/moontoast-math.git",
-+                "reference": "c2792a25df5cad4ff3d760dd37078fc5b6fccc79"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-ui-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "6edb28f5c771ccb9e747ea71922ecbea80a32391"
-+                "url": "https://api.github.com/repos/ramsey/moontoast-math/zipball/c2792a25df5cad4ff3d760dd37078fc5b6fccc79",
-+                "reference": "c2792a25df5cad4ff3d760dd37078fc5b6fccc79",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-bcmath": "*",
-+                "php": ">=5.3.3"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Ui"
--                    ]
--                ]
-+            "require-dev": {
-+                "jakub-onderka/php-parallel-lint": "^0.9.0",
-+                "phpunit/phpunit": "^4.7|>=5.0 <5.4",
-+                "satooshi/php-coveralls": "^0.6.1",
-+                "squizlabs/php_codesniffer": "^2.3"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "Moontoast\\Math\\": "src/Moontoast/Math/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "Apache-2.0"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Ben Ramsey",
-+                    "email": "ben@benramsey.com",
-+                    "homepage": "https://benramsey.com"
-+                }
-+            ],
-+            "description": "A mathematics library, providing functionality for large numbers",
-+            "homepage": "https://github.com/ramsey/moontoast-math",
-+            "keywords": [
-+                "bcmath",
-+                "math"
-+            ],
-+            "time": "2017-02-16T16:54:46+00:00"
-         },
-         {
--            "name": "magento/module-ups",
--            "version": "0.74.0-beta2",
-+            "name": "mustache/mustache",
-+            "version": "v2.12.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/bobthecow/mustache.php.git",
-+                "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-ups-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "70a8139468124067bfb07bf1c071638484136883"
-+                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/fe8fe72e9d580591854de404cc59a1b83ca4d19e",
-+                "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-shipping": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.2.4"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Ups"
--                    ]
--                ]
-+            "require-dev": {
-+                "friendsofphp/php-cs-fixer": "~1.11",
-+                "phpunit/phpunit": "~3.7|~4.0|~5.0"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-0": {
-+                    "Mustache": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Justin Hileman",
-+                    "email": "justin@justinhileman.info",
-+                    "homepage": "http://justinhileman.com"
-+                }
-+            ],
-+            "description": "A Mustache implementation in PHP.",
-+            "homepage": "https://github.com/bobthecow/mustache.php",
-+            "keywords": [
-+                "mustache",
-+                "templating"
-+            ],
-+            "time": "2017-07-11T12:54:05+00:00"
-         },
-         {
--            "name": "magento/module-url-rewrite",
--            "version": "0.74.0-beta2",
-+            "name": "myclabs/deep-copy",
-+            "version": "1.9.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/myclabs/DeepCopy.git",
-+                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-url-rewrite-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "8e781525600ff9d43383816283807ebcff07a8bf"
-+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
-+                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-url-rewrite": "0.74.0-beta2",
--                "magento/module-cms": "0.74.0-beta2",
--                "magento/module-cms-url-rewrite": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.1"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/UrlRewrite"
--                    ]
-+            "replace": {
-+                "myclabs/deep-copy": "self.version"
-+            },
-+            "require-dev": {
-+                "doctrine/collections": "^1.0",
-+                "doctrine/common": "^2.6",
-+                "phpunit/phpunit": "^7.1"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "DeepCopy\\": "src/DeepCopy/"
-+                },
-+                "files": [
-+                    "src/DeepCopy/deep_copy.php"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "description": "Create deep copies (clones) of your objects",
-+            "keywords": [
-+                "clone",
-+                "copy",
-+                "duplicate",
-+                "object",
-+                "object graph"
-+            ],
-+            "time": "2019-04-07T13:18:21+00:00"
-         },
-         {
--            "name": "magento/module-user",
--            "version": "0.74.0-beta2",
-+            "name": "pdepend/pdepend",
-+            "version": "2.5.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/pdepend/pdepend.git",
-+                "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-user-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "023375251bc6104b31984e4509d01907f6661c6b"
-+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/9daf26d0368d4a12bed1cacae1a9f3a6f0adf239",
-+                "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-authorization": "0.74.0-beta2",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-integration": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.7",
-+                "symfony/config": "^2.3.0|^3|^4",
-+                "symfony/dependency-injection": "^2.3.0|^3|^4",
-+                "symfony/filesystem": "^2.3.0|^3|^4"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/User"
--                    ]
--                ]
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8|^5.7",
-+                "squizlabs/php_codesniffer": "^2.0.0"
-+            },
-+            "bin": [
-+                "src/bin/pdepend"
-+            ],
-+            "type": "library",
-+            "autoload": {
-+                "psr-4": {
-+                    "PDepend\\": "src/main/php/PDepend"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "description": "Official version of pdepend to be handled with Composer",
-+            "time": "2017-12-13T13:21:38+00:00"
-         },
-         {
--            "name": "magento/module-usps",
--            "version": "0.74.0-beta2",
-+            "name": "phar-io/manifest",
-+            "version": "1.0.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/phar-io/manifest.git",
-+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-usps-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "22eecac7075ca9c6ecaa08e482b59f5c29ba465c"
-+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
-+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
-+                "shasum": ""
-             },
-             "require": {
--                "lib-libxml": "*",
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-config": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-shipping": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "ext-dom": "*",
-+                "ext-phar": "*",
-+                "phar-io/version": "^1.0.1",
-+                "php": "^5.6 || ^7.0"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Usps"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Arne Blankerts",
-+                    "email": "arne@blankerts.de",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Sebastian Heuer",
-+                    "email": "sebastian@phpeople.de",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-+            "time": "2017-03-05T18:14:27+00:00"
-         },
-         {
--            "name": "magento/module-variable",
--            "version": "0.74.0-beta2",
-+            "name": "phar-io/version",
-+            "version": "1.0.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/phar-io/version.git",
-+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-variable-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "73cb1fdc0ff84722f854736a4016e3f5fa331ec1"
-+                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
-+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-email": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.4.11|~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Variable"
--                    ]
-+            "type": "library",
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Arne Blankerts",
-+                    "email": "arne@blankerts.de",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Sebastian Heuer",
-+                    "email": "sebastian@phpeople.de",
-+                    "role": "Developer"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "Developer"
-+                }
-+            ],
-+            "description": "Library for handling version information and constraints",
-+            "time": "2017-03-05T17:38:23+00:00"
-         },
-         {
--            "name": "magento/module-version",
--            "version": "0.74.0-beta2",
-+            "name": "php-cs-fixer/diff",
-+            "version": "v1.3.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/PHP-CS-Fixer/diff.git",
-+                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-version-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "de77cb875f16d6eec9c785df117eddf469bec459"
-+                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756",
-+                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.6 || ^7.0"
-             },
--            "type": "magento2-module",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Version"
--                    ]
-+            "require-dev": {
-+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-+                "symfony/process": "^3.3"
-+            },
-+            "type": "library",
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Kore Nordmann",
-+                    "email": "mail@kore-nordmann.de"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                },
-+                {
-+                    "name": "SpacePossum"
-+                }
-+            ],
-+            "description": "sebastian/diff v2 backport support for PHP5.6",
-+            "homepage": "https://github.com/PHP-CS-Fixer",
-+            "keywords": [
-+                "diff"
-+            ],
-+            "time": "2018-02-15T16:58:55+00:00"
-         },
-         {
--            "name": "magento/module-webapi",
--            "version": "0.74.0-beta2",
-+            "name": "phpcollection/phpcollection",
-+            "version": "0.5.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/schmittjoh/php-collection.git",
-+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-webapi-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "c189f264c1bb186e052a2ed375b4b9e00295f3a6"
-+                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
-+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-authorization": "0.74.0-beta2",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-integration": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "phpoption/phpoption": "1.*"
-             },
--            "suggest": {
--                "magento/module-user": "0.74.0-beta2"
--            },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Webapi"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "0.4-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "PhpCollection": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "Apache2"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Johannes M. Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "General-Purpose Collection Library for PHP",
-+            "keywords": [
-+                "collection",
-+                "list",
-+                "map",
-+                "sequence",
-+                "set"
-+            ],
-+            "time": "2015-05-17T12:39:23+00:00"
-         },
-         {
--            "name": "magento/module-weee",
--            "version": "0.74.0-beta2",
-+            "name": "phpdocumentor/reflection-common",
-+            "version": "1.0.1",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-weee-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "cc524f7211673263beb1f4c6b96bf32ffa04527b"
-+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-directory": "0.74.0-beta2",
--                "magento/module-eav": "0.74.0-beta2",
--                "magento/module-quote": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-tax": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.5"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.6"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Weee"
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "phpDocumentor\\Reflection\\": [
-+                        "src"
-                     ]
--                ]
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Jaap van Otterdijk",
-+                    "email": "opensource@ijaap.nl"
-+                }
-+            ],
-+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-+            "homepage": "http://www.phpdoc.org",
-+            "keywords": [
-+                "FQSEN",
-+                "phpDocumentor",
-+                "phpdoc",
-+                "reflection",
-+                "static analysis"
-+            ],
-+            "time": "2017-09-11T18:02:19+00:00"
-         },
-         {
--            "name": "magento/module-widget",
--            "version": "0.74.0-beta2",
-+            "name": "phpdocumentor/reflection-docblock",
-+            "version": "4.3.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-widget-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "f23668007563d5b7f9122e3eb453359fab9d1249"
-+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
-+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-cms": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "magento/module-variable": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^7.0",
-+                "phpdocumentor/reflection-common": "^1.0.0",
-+                "phpdocumentor/type-resolver": "^0.4.0",
-+                "webmozart/assert": "^1.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "doctrine/instantiator": "~1.0.5",
-+                "mockery/mockery": "^1.0",
-+                "phpunit/phpunit": "^6.4"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Widget"
-+                "branch-alias": {
-+                    "dev-master": "4.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "phpDocumentor\\Reflection\\": [
-+                        "src/"
-                     ]
--                ]
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Mike van Riel",
-+                    "email": "me@mikevanriel.com"
-+                }
-+            ],
-+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-+            "time": "2017-11-30T07:14:17+00:00"
-         },
-         {
--            "name": "magento/module-wishlist",
--            "version": "0.74.0-beta2",
-+            "name": "phpdocumentor/type-resolver",
-+            "version": "0.4.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_module-wishlist-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "fca56783501ad2b8f2c583350cb038f8191634e1"
-+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/module-backend": "0.74.0-beta2",
--                "magento/module-catalog": "0.74.0-beta2",
--                "magento/module-catalog-inventory": "0.74.0-beta2",
--                "magento/module-checkout": "0.74.0-beta2",
--                "magento/module-customer": "0.74.0-beta2",
--                "magento/module-grouped-product": "0.74.0-beta2",
--                "magento/module-rss": "0.74.0-beta2",
--                "magento/module-sales": "0.74.0-beta2",
--                "magento/module-store": "0.74.0-beta2",
--                "magento/module-theme": "0.74.0-beta2",
--                "magento/module-ui": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+                "php": "^5.5 || ^7.0",
-+                "phpdocumentor/reflection-common": "^1.0"
-             },
--            "suggest": {
--                "magento/module-bundle": "0.74.0-beta2",
--                "magento/module-configurable-product": "0.74.0-beta2",
--                "magento/module-cookie": "0.74.0-beta2",
--                "magento/module-downloadable": "0.74.0-beta2"
-+            "require-dev": {
-+                "mockery/mockery": "^0.9.4",
-+                "phpunit/phpunit": "^5.2||^4.8.24"
-             },
--            "type": "magento2-module",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/Wishlist"
-+                "branch-alias": {
-+                    "dev-master": "1.0.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-4": {
-+                    "phpDocumentor\\Reflection\\": [
-+                        "src/"
-                     ]
--                ]
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Mike van Riel",
-+                    "email": "me@mikevanriel.com"
-+                }
-             ],
--            "description": "N/A"
-+            "time": "2017-07-14T14:27:02+00:00"
-         },
-         {
--            "name": "magento/product-community-edition",
--            "version": "0.74.0-beta2",
-+            "name": "phpmd/phpmd",
-+            "version": "2.6.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/magento/magento2-community-edition.git",
--                "reference": "830bba759a180a97375275013b974c4606805466"
-+                "url": "https://github.com/phpmd/phpmd.git",
-+                "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/magento/magento2-community-edition/zipball/830bba759a180a97375275013b974c4606805466",
--                "reference": "830bba759a180a97375275013b974c4606805466",
-+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/4e9924b2c157a3eb64395460fcf56b31badc8374",
-+                "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374",
-                 "shasum": ""
-             },
-             "require": {
--                "composer/composer": "1.0.0-alpha8",
--                "magento/framework": "self.version",
--                "magento/language-de_de": "self.version",
--                "magento/language-en_us": "self.version",
--                "magento/language-es_es": "self.version",
--                "magento/language-fr_fr": "self.version",
--                "magento/language-nl_nl": "self.version",
--                "magento/language-pt_br": "self.version",
--                "magento/language-zh_cn": "self.version",
--                "magento/magento-composer-installer": "*",
--                "magento/magento2-base": "self.version",
--                "magento/module-admin-notification": "self.version",
--                "magento/module-authorization": "self.version",
--                "magento/module-backend": "self.version",
--                "magento/module-backup": "self.version",
--                "magento/module-bundle": "self.version",
--                "magento/module-captcha": "self.version",
--                "magento/module-catalog": "self.version",
--                "magento/module-catalog-import-export": "self.version",
--                "magento/module-catalog-inventory": "self.version",
--                "magento/module-catalog-rule": "self.version",
--                "magento/module-catalog-search": "self.version",
--                "magento/module-catalog-url-rewrite": "self.version",
--                "magento/module-catalog-widget": "self.version",
--                "magento/module-centinel": "self.version",
--                "magento/module-checkout": "self.version",
--                "magento/module-checkout-agreements": "self.version",
--                "magento/module-cms": "self.version",
--                "magento/module-cms-url-rewrite": "self.version",
--                "magento/module-config": "self.version",
--                "magento/module-configurable-import-export": "self.version",
--                "magento/module-configurable-product": "self.version",
--                "magento/module-contact": "self.version",
--                "magento/module-cookie": "self.version",
--                "magento/module-cron": "self.version",
--                "magento/module-currency-symbol": "self.version",
--                "magento/module-customer": "self.version",
--                "magento/module-customer-import-export": "self.version",
--                "magento/module-developer": "self.version",
--                "magento/module-dhl": "self.version",
--                "magento/module-directory": "self.version",
--                "magento/module-downloadable": "self.version",
--                "magento/module-eav": "self.version",
--                "magento/module-email": "self.version",
--                "magento/module-fedex": "self.version",
--                "magento/module-gift-message": "self.version",
--                "magento/module-google-adwords": "self.version",
--                "magento/module-google-analytics": "self.version",
--                "magento/module-google-optimizer": "self.version",
--                "magento/module-google-shopping": "self.version",
--                "magento/module-grouped-import-export": "self.version",
--                "magento/module-grouped-product": "self.version",
--                "magento/module-import-export": "self.version",
--                "magento/module-indexer": "self.version",
--                "magento/module-integration": "self.version",
--                "magento/module-layered-navigation": "self.version",
--                "magento/module-media-storage": "self.version",
--                "magento/module-msrp": "self.version",
--                "magento/module-multishipping": "self.version",
--                "magento/module-newsletter": "self.version",
--                "magento/module-offline-payments": "self.version",
--                "magento/module-offline-shipping": "self.version",
--                "magento/module-page-cache": "self.version",
--                "magento/module-payment": "self.version",
--                "magento/module-persistent": "self.version",
--                "magento/module-product-alert": "self.version",
--                "magento/module-quote": "self.version",
--                "magento/module-reports": "self.version",
--                "magento/module-require-js": "self.version",
--                "magento/module-review": "self.version",
--                "magento/module-rss": "self.version",
--                "magento/module-rule": "self.version",
--                "magento/module-sales": "self.version",
--                "magento/module-sales-rule": "self.version",
--                "magento/module-search": "self.version",
--                "magento/module-sendfriend": "self.version",
--                "magento/module-shipping": "self.version",
--                "magento/module-sitemap": "self.version",
--                "magento/module-store": "self.version",
--                "magento/module-tax": "self.version",
--                "magento/module-tax-import-export": "self.version",
--                "magento/module-theme": "self.version",
--                "magento/module-translation": "self.version",
--                "magento/module-ui": "self.version",
--                "magento/module-ups": "self.version",
--                "magento/module-url-rewrite": "self.version",
--                "magento/module-user": "self.version",
--                "magento/module-usps": "self.version",
--                "magento/module-variable": "self.version",
--                "magento/module-version": "self.version",
--                "magento/module-webapi": "self.version",
--                "magento/module-weee": "self.version",
--                "magento/module-widget": "self.version",
--                "magento/module-wishlist": "self.version",
--                "magento/theme-adminhtml-backend": "self.version",
--                "magento/theme-frontend-blank": "self.version",
--                "magento/theme-frontend-luma": "self.version",
--                "magento/zendframework1": "1.12.10",
--                "monolog/monolog": "1.11.0",
--                "oyejorge/less.php": "1.7.0.3",
--                "php": "~5.5.0|~5.6.0|~7.0.0",
--                "tubalmartin/cssmin": "2.4.8-p4",
--                "zendframework/zend-code": "2.3.1",
--                "zendframework/zend-config": "2.3.1",
--                "zendframework/zend-console": "2.3.1",
--                "zendframework/zend-di": "2.3.1",
--                "zendframework/zend-eventmanager": "2.3.1",
--                "zendframework/zend-form": "2.3.1",
--                "zendframework/zend-http": "2.3.1",
--                "zendframework/zend-json": "2.3.1",
--                "zendframework/zend-log": "2.3.1",
--                "zendframework/zend-modulemanager": "2.3.1",
--                "zendframework/zend-mvc": "2.3.1",
--                "zendframework/zend-serializer": "2.3.1",
--                "zendframework/zend-server": "2.3.1",
--                "zendframework/zend-servicemanager": "2.3.1",
--                "zendframework/zend-soap": "2.3.1",
--                "zendframework/zend-stdlib": "2.3.1",
--                "zendframework/zend-text": "2.3.1",
--                "zendframework/zend-uri": "2.3.1",
--                "zendframework/zend-validator": "2.3.1",
--                "zendframework/zend-view": "2.3.1"
-+                "ext-xml": "*",
-+                "pdepend/pdepend": "^2.5",
-+                "php": ">=5.3.9"
-             },
-             "require-dev": {
--                "ext-ctype": "*",
--                "ext-curl": "*",
--                "ext-dom": "*",
--                "ext-gd": "*",
--                "ext-hash": "*",
--                "ext-iconv": "*",
--                "ext-intl": "*",
--                "ext-mcrypt": "*",
--                "ext-simplexml": "*",
--                "ext-spl": "*",
--                "fabpot/php-cs-fixer": "~1.2",
--                "lib-libxml": "*",
--                "lusitanian/oauth": "~0.3",
--                "pdepend/pdepend": "2.0.6",
--                "phpmd/phpmd": "@stable",
--                "phpunit/phpunit": "4.1.0",
--                "sjparkinson/static-review": "~4.1",
--                "squizlabs/php_codesniffer": "1.5.3"
-+                "phpunit/phpunit": "^4.0",
-+                "squizlabs/php_codesniffer": "^2.0"
-             },
-+            "bin": [
-+                "src/bin/phpmd"
-+            ],
-             "type": "project",
-             "autoload": {
--                "psr-4": {
--                    "Magento\\Framework\\": "lib/internal/Magento/Framework/",
--                    "Magento\\Setup\\": "setup/src/Magento/Setup/"
-+                "psr-0": {
-+                    "PHPMD\\": "src/main/php"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Manuel Pichler",
-+                    "email": "github@manuel-pichler.de",
-+                    "homepage": "https://github.com/manuelpichler",
-+                    "role": "Project Founder"
-+                },
-+                {
-+                    "name": "Other contributors",
-+                    "homepage": "https://github.com/phpmd/phpmd/graphs/contributors",
-+                    "role": "Contributors"
-+                },
-+                {
-+                    "name": "Marc Würth",
-+                    "email": "ravage@bluewin.ch",
-+                    "homepage": "https://github.com/ravage84",
-+                    "role": "Project Maintainer"
-+                }
-             ],
--            "description": "eCommerce Platform for Growth (Community Edition)",
--            "time": "2015-03-27 15:47:02"
-+            "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
-+            "homepage": "http://phpmd.org/",
-+            "keywords": [
-+                "mess detection",
-+                "mess detector",
-+                "pdepend",
-+                "phpmd",
-+                "pmd"
-+            ],
-+            "time": "2017-01-20T14:41:10+00:00"
-         },
-         {
--            "name": "magento/sample-module-minimal",
--            "version": "1.0.0",
-+            "name": "phpoption/phpoption",
-+            "version": "1.5.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/schmittjoh/php-option.git",
-+                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_sample-module-minimal-1.0.0.zip",
--                "reference": null,
--                "shasum": "8c8bd3ee4907a6a91bffeac177628bd4f238d6e4"
-+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed",
-+                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/magento-composer-installer": "*",
--                "php": "~5.5.0|~5.6.0"
-+                "php": ">=5.3.0"
-             },
--            "type": "magento2-module",
-+            "require-dev": {
-+                "phpunit/phpunit": "4.7.*"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "Magento/SampleMinimal"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.3-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "PhpOption\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "Apache2"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Johannes M. Schmitt",
-+                    "email": "schmittjoh@gmail.com"
-+                }
-+            ],
-+            "description": "Option Type for PHP",
-+            "keywords": [
-+                "language",
-+                "option",
-+                "php",
-+                "type"
-             ],
--            "description": "A minimal skeleton Magento 2 module"
-+            "time": "2015-07-25T16:39:46+00:00"
-         },
-         {
--            "name": "magento/theme-adminhtml-backend",
--            "version": "0.74.0-beta2",
-+            "name": "phpspec/prophecy",
-+            "version": "1.8.0",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/phpspec/prophecy.git",
-+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_theme-adminhtml-backend-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "d8bd8d6b70d65d6f38751f7e9f9cbbebf751c97c"
-+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "php": "~5.5.0|~5.6.0"
-+                "doctrine/instantiator": "^1.0.2",
-+                "php": "^5.3|^7.0",
-+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-+                "sebastian/comparator": "^1.1|^2.0|^3.0",
-+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
-             },
--            "type": "magento2-theme",
-+            "require-dev": {
-+                "phpspec/phpspec": "^2.5|^3.2",
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
-+            },
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "adminhtml/Magento/backend"
--                    ]
--                ]
-+                "branch-alias": {
-+                    "dev-master": "1.8.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "psr-0": {
-+                    "Prophecy\\": "src/"
-+                }
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "MIT"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Konstantin Kudryashov",
-+                    "email": "ever.zet@gmail.com",
-+                    "homepage": "http://everzet.com"
-+                },
-+                {
-+                    "name": "Marcello Duarte",
-+                    "email": "marcello.duarte@gmail.com"
-+                }
-+            ],
-+            "description": "Highly opinionated mocking framework for PHP 5.3+",
-+            "homepage": "https://github.com/phpspec/prophecy",
-+            "keywords": [
-+                "Double",
-+                "Dummy",
-+                "fake",
-+                "mock",
-+                "spy",
-+                "stub"
-+            ],
-+            "time": "2018-08-05T17:53:17+00:00"
-         },
-         {
--            "name": "magento/theme-frontend-blank",
--            "version": "0.74.0-beta2",
-+            "name": "phpunit/php-code-coverage",
-+            "version": "5.3.2",
-+            "source": {
-+                "type": "git",
-+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
-+            },
-             "dist": {
-                 "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_theme-frontend-blank-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "e298ae05894e97ba3d94a87b77086dfe0c2d974a"
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
-+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
-+                "shasum": ""
-             },
-             "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "php": "~5.5.0|~5.6.0"
--            },
--            "type": "magento2-theme",
--            "extra": {
--                "map": [
--                    [
--                        "*",
--                        "frontend/Magento/blank"
--                    ]
--                ]
-+                "ext-dom": "*",
-+                "ext-xmlwriter": "*",
-+                "php": "^7.0",
-+                "phpunit/php-file-iterator": "^1.4.2",
-+                "phpunit/php-text-template": "^1.2.1",
-+                "phpunit/php-token-stream": "^2.0.1",
-+                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-+                "sebastian/environment": "^3.0",
-+                "sebastian/version": "^2.0.1",
-+                "theseer/tokenizer": "^1.1"
-             },
--            "license": [
--                "OSL-3.0",
--                "AFL-3.0"
--            ],
--            "description": "N/A"
--        },
--        {
--            "name": "magento/theme-frontend-luma",
--            "version": "0.74.0-beta2",
--            "dist": {
--                "type": "zip",
--                "url": "https://repo.magento.com/_packages/magento_theme-frontend-luma-0.74.0-beta2.zip",
--                "reference": null,
--                "shasum": "82e29e8fd8d928c33f064fb431d06f3968f37327"
-+            "require-dev": {
-+                "phpunit/phpunit": "^6.0"
-             },
--            "require": {
--                "magento/framework": "0.74.0-beta2",
--                "magento/magento-composer-installer": "*",
--                "magento/theme-frontend-blank": "0.74.0-beta2",
--                "php": "~5.5.0|~5.6.0"
-+            "suggest": {
-+                "ext-xdebug": "^2.5.5"
-             },
--            "type": "magento2-theme",
-+            "type": "library",
-             "extra": {
--                "map": [
--                    [
--                        "*",
--                        "frontend/Magento/luma"
--                    ]
-+                "branch-alias": {
-+                    "dev-master": "5.3.x-dev"
-+                }
-+            },
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-                 ]
-             },
-+            "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "OSL-3.0",
--                "AFL-3.0"
-+                "BSD-3-Clause"
-             ],
--            "description": "N/A"
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-+            "keywords": [
-+                "coverage",
-+                "testing",
-+                "xunit"
-+            ],
-+            "time": "2018-04-06T15:36:58+00:00"
-         },
-         {
--            "name": "magento/zendframework1",
--            "version": "1.12.10",
-+            "name": "phpunit/php-file-iterator",
-+            "version": "1.4.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/magento/zf1.git",
--                "reference": "d1e5cd8c9f83229bcdd9bb485c3ce25259c77884"
-+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/magento/zf1/zipball/d1e5cd8c9f83229bcdd9bb485c3ce25259c77884",
--                "reference": "d1e5cd8c9f83229bcdd9bb485c3ce25259c77884",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.2.11"
--            },
--            "require-dev": {
--                "phpunit/dbunit": "1.3.*",
--                "phpunit/phpunit": "3.7.*"
-+                "php": ">=5.3.3"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.12.x-dev"
-+                    "dev-master": "1.4.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-0": {
--                    "Zend_": "library/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
--            "include-path": [
--                "library/"
--            ],
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "Magento Zend Framework 1",
--            "homepage": "http://framework.zend.com/",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sb@sebastian-bergmann.de",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-             "keywords": [
--                "ZF1",
--                "framework"
-+                "filesystem",
-+                "iterator"
-             ],
--            "time": "2015-02-06 17:25:45"
-+            "time": "2017-11-27T13:52:08+00:00"
-         },
-         {
--            "name": "monolog/monolog",
--            "version": "1.11.0",
-+            "name": "phpunit/php-text-template",
-+            "version": "1.2.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/Seldaek/monolog.git",
--                "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa"
-+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
--                "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.0",
--                "psr/log": "~1.0"
--            },
--            "provide": {
--                "psr/log-implementation": "1.0.0"
--            },
--            "require-dev": {
--                "aws/aws-sdk-php": "~2.4, >2.4.8",
--                "doctrine/couchdb": "~1.0@dev",
--                "graylog2/gelf-php": "~1.0",
--                "phpunit/phpunit": "~3.7.0",
--                "raven/raven": "~0.5",
--                "ruflin/elastica": "0.90.*",
--                "videlalvaro/php-amqplib": "~2.4"
--            },
--            "suggest": {
--                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
--                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
--                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
--                "ext-mongo": "Allow sending log messages to a MongoDB server",
--                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
--                "raven/raven": "Allow sending log messages to a Sentry server",
--                "rollbar/rollbar": "Allow sending log messages to Rollbar",
--                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
--                "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
-+                "php": ">=5.3.3"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "1.11.x-dev"
--                }
--            },
-             "autoload": {
--                "psr-4": {
--                    "Monolog\\": "src/Monolog"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Jordi Boggiano",
--                    "email": "j.boggiano@seld.be",
--                    "homepage": "http://seld.be"
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-                 }
-             ],
--            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
--            "homepage": "http://github.com/Seldaek/monolog",
-+            "description": "Simple template engine.",
-+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-             "keywords": [
--                "log",
--                "logging",
--                "psr-3"
-+                "template"
-             ],
--            "time": "2014-09-30 13:30:58"
-+            "time": "2015-06-21T13:50:34+00:00"
-         },
-         {
--            "name": "oyejorge/less.php",
--            "version": "v1.7.0.3",
-+            "name": "phpunit/php-timer",
-+            "version": "1.0.9",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/oyejorge/less.php.git",
--                "reference": "6e08ecb07e6f6d9170c23e8744c58fdd822ad0de"
-+                "url": "https://github.com/sebastianbergmann/php-timer.git",
-+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/oyejorge/less.php/zipball/6e08ecb07e6f6d9170c23e8744c58fdd822ad0de",
--                "reference": "6e08ecb07e6f6d9170c23e8744c58fdd822ad0de",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.2"
-+                "php": "^5.3.3 || ^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-             },
--            "bin": [
--                "bin/lessc"
--            ],
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "1.0-dev"
-+                }
-+            },
-             "autoload": {
--                "psr-0": {
--                    "Less": "lib/"
--                },
-                 "classmap": [
--                    "lessc.inc.php"
-+                    "src/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "Apache-2.0"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Matt Agar",
--                    "homepage": "https://github.com/agar"
--                },
--                {
--                    "name": "Martin Jantošovič",
--                    "homepage": "https://github.com/Mordred"
--                },
--                {
--                    "name": "Josh Schmidt",
--                    "homepage": "https://github.com/oyejorge"
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sb@sebastian-bergmann.de",
-+                    "role": "lead"
-                 }
-             ],
--            "description": "PHP port of the Javascript version of LESS http://lesscss.org",
--            "homepage": "http://lessphp.gpeasy.com",
-+            "description": "Utility class for timing",
-+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-             "keywords": [
--                "css",
--                "less",
--                "less.js",
--                "lesscss",
--                "php",
--                "stylesheet"
-+                "timer"
-             ],
--            "time": "2015-03-10 18:12:59"
-+            "time": "2017-02-26T11:10:40+00:00"
-         },
-         {
--            "name": "psr/log",
--            "version": "dev-master",
-+            "name": "phpunit/php-token-stream",
-+            "version": "2.0.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/php-fig/log.git",
--                "reference": "bf2c13de4300e227d7b2fd08027673a79c519987"
-+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-+                "reference": "791198a2c6254db10131eecfe8c06670700904db"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/php-fig/log/zipball/bf2c13de4300e227d7b2fd08027673a79c519987",
--                "reference": "bf2c13de4300e227d7b2fd08027673a79c519987",
-+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
-+                "reference": "791198a2c6254db10131eecfe8c06670700904db",
-                 "shasum": ""
-             },
-+            "require": {
-+                "ext-tokenizer": "*",
-+                "php": "^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^6.2.4"
-+            },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "1.0.x-dev"
-+                    "dev-master": "2.0-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Psr\\Log\\": "Psr/Log/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "PHP-FIG",
--                    "homepage": "http://www.php-fig.org/"
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "Common interface for logging libraries",
-+            "description": "Wrapper around PHP's tokenizer extension.",
-+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-             "keywords": [
--                "log",
--                "psr",
--                "psr-3"
-+                "tokenizer"
-             ],
--            "time": "2015-03-26 14:39:45"
-+            "time": "2017-11-27T05:48:46+00:00"
-         },
-         {
--            "name": "seld/jsonlint",
--            "version": "1.3.1",
-+            "name": "phpunit/phpunit",
-+            "version": "6.5.14",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/Seldaek/jsonlint.git",
--                "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4"
-+                "url": "https://github.com/sebastianbergmann/phpunit.git",
-+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/863ae85c6d3ef60ca49cb12bd051c4a0648c40c4",
--                "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4",
-+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7",
-+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.0"
-+                "ext-dom": "*",
-+                "ext-json": "*",
-+                "ext-libxml": "*",
-+                "ext-mbstring": "*",
-+                "ext-xml": "*",
-+                "myclabs/deep-copy": "^1.6.1",
-+                "phar-io/manifest": "^1.0.1",
-+                "phar-io/version": "^1.0",
-+                "php": "^7.0",
-+                "phpspec/prophecy": "^1.7",
-+                "phpunit/php-code-coverage": "^5.3",
-+                "phpunit/php-file-iterator": "^1.4.3",
-+                "phpunit/php-text-template": "^1.2.1",
-+                "phpunit/php-timer": "^1.0.9",
-+                "phpunit/phpunit-mock-objects": "^5.0.9",
-+                "sebastian/comparator": "^2.1",
-+                "sebastian/diff": "^2.0",
-+                "sebastian/environment": "^3.1",
-+                "sebastian/exporter": "^3.1",
-+                "sebastian/global-state": "^2.0",
-+                "sebastian/object-enumerator": "^3.0.3",
-+                "sebastian/resource-operations": "^1.0",
-+                "sebastian/version": "^2.0.1"
-+            },
-+            "conflict": {
-+                "phpdocumentor/reflection-docblock": "3.0.2",
-+                "phpunit/dbunit": "<3.0"
-+            },
-+            "require-dev": {
-+                "ext-pdo": "*"
-+            },
-+            "suggest": {
-+                "ext-xdebug": "*",
-+                "phpunit/php-invoker": "^1.1"
-             },
-             "bin": [
--                "bin/jsonlint"
-+                "phpunit"
-             ],
-             "type": "library",
--            "autoload": {
--                "psr-4": {
--                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "6.5.x-dev"
-                 }
-             },
-+            "autoload": {
-+                "classmap": [
-+                    "src/"
-+                ]
-+            },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Jordi Boggiano",
--                    "email": "j.boggiano@seld.be",
--                    "homepage": "http://seld.be"
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-                 }
-             ],
--            "description": "JSON Linter",
-+            "description": "The PHP Unit Testing framework.",
-+            "homepage": "https://phpunit.de/",
-             "keywords": [
--                "json",
--                "linter",
--                "parser",
--                "validator"
-+                "phpunit",
-+                "testing",
-+                "xunit"
-             ],
--            "time": "2015-01-04 21:18:15"
-+            "time": "2019-02-01T05:22:47+00:00"
-         },
-         {
--            "name": "symfony/console",
--            "version": "2.8.x-dev",
-+            "name": "phpunit/phpunit-mock-objects",
-+            "version": "5.0.10",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Console.git",
--                "reference": "7e857a2b52b5833ed27d78a6b1b846bd440ee8bd"
-+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Console/zipball/7e857a2b52b5833ed27d78a6b1b846bd440ee8bd",
--                "reference": "7e857a2b52b5833ed27d78a6b1b846bd440ee8bd",
-+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
-+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.9"
-+                "doctrine/instantiator": "^1.0.5",
-+                "php": "^7.0",
-+                "phpunit/php-text-template": "^1.2.1",
-+                "sebastian/exporter": "^3.1"
-+            },
-+            "conflict": {
-+                "phpunit/phpunit": "<6.0"
-             },
-             "require-dev": {
--                "psr/log": "~1.0",
--                "symfony/event-dispatcher": "~2.1|~3.0.0",
--                "symfony/phpunit-bridge": "~2.7|~3.0.0",
--                "symfony/process": "~2.1|~3.0.0"
-+                "phpunit/phpunit": "^6.5.11"
-             },
-             "suggest": {
--                "psr/log": "For using the console logger",
--                "symfony/event-dispatcher": "",
--                "symfony/process": ""
-+                "ext-soap": "*"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.8-dev"
-+                    "dev-master": "5.0.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\Console\\": ""
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-                 }
-             ],
--            "description": "Symfony Console Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-05-15 14:11:12"
-+            "description": "Mock Object library for PHPUnit",
-+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-+            "keywords": [
-+                "mock",
-+                "xunit"
-+            ],
-+            "abandoned": true,
-+            "time": "2018-08-09T05:50:03+00:00"
-         },
-         {
--            "name": "symfony/finder",
--            "version": "2.8.x-dev",
-+            "name": "sebastian/code-unit-reverse-lookup",
-+            "version": "1.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Finder.git",
--                "reference": "fd26bdbb67bc8753884eff5767a4f1ee90e2284b"
-+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Finder/zipball/fd26bdbb67bc8753884eff5767a4f1ee90e2284b",
--                "reference": "fd26bdbb67bc8753884eff5767a4f1ee90e2284b",
-+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.9"
-+                "php": "^5.6 || ^7.0"
-             },
-             "require-dev": {
--                "symfony/phpunit-bridge": "~2.7|~3.0.0"
-+                "phpunit/phpunit": "^5.7 || ^6.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.8-dev"
-+                    "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\Finder\\": ""
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
--                },
--                {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "Symfony Finder Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-05-15 14:11:12"
-+            "description": "Looks up which function or method a line of code belongs to",
-+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-+            "time": "2017-03-04T06:30:41+00:00"
-         },
-         {
--            "name": "symfony/process",
--            "version": "2.8.x-dev",
-+            "name": "sebastian/comparator",
-+            "version": "2.1.3",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/symfony/Process.git",
--                "reference": "daf96f1491cf0b8d8de60e6d3b5fda8e502b3798"
-+                "url": "https://github.com/sebastianbergmann/comparator.git",
-+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/symfony/Process/zipball/daf96f1491cf0b8d8de60e6d3b5fda8e502b3798",
--                "reference": "daf96f1491cf0b8d8de60e6d3b5fda8e502b3798",
-+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
-+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.9"
-+                "php": "^7.0",
-+                "sebastian/diff": "^2.0 || ^3.0",
-+                "sebastian/exporter": "^3.1"
-             },
-             "require-dev": {
--                "symfony/phpunit-bridge": "~2.7|~3.0.0"
-+                "phpunit/phpunit": "^6.4"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.8-dev"
-+                    "dev-master": "2.1.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Symfony\\Component\\Process\\": ""
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "MIT"
-+                "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
--                    "name": "Fabien Potencier",
--                    "email": "fabien@symfony.com"
-+                    "name": "Jeff Welch",
-+                    "email": "whatthejeff@gmail.com"
-                 },
-                 {
--                    "name": "Symfony Community",
--                    "homepage": "https://symfony.com/contributors"
-+                    "name": "Volker Dusch",
-+                    "email": "github@wallbash.com"
-+                },
-+                {
-+                    "name": "Bernhard Schussek",
-+                    "email": "bschussek@2bepublished.at"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "Symfony Process Component",
--            "homepage": "https://symfony.com",
--            "time": "2015-05-15 14:11:12"
-+            "description": "Provides the functionality to compare PHP values for equality",
-+            "homepage": "https://github.com/sebastianbergmann/comparator",
-+            "keywords": [
-+                "comparator",
-+                "compare",
-+                "equality"
-+            ],
-+            "time": "2018-02-01T13:46:46+00:00"
-         },
-         {
--            "name": "tubalmartin/cssmin",
--            "version": "v2.4.8-p4",
-+            "name": "sebastian/diff",
-+            "version": "2.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
--                "reference": "fe84d71e8420243544c0ce3bd0f5d7c1936b0f90"
-+                "url": "https://github.com/sebastianbergmann/diff.git",
-+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/fe84d71e8420243544c0ce3bd0f5d7c1936b0f90",
--                "reference": "fe84d71e8420243544c0ce3bd0f5d7c1936b0f90",
-+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
-+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.0.0"
-+                "php": "^7.0"
-+            },
-+            "require-dev": {
-+                "phpunit/phpunit": "^6.2"
-             },
-             "type": "library",
-+            "extra": {
-+                "branch-alias": {
-+                    "dev-master": "2.0-dev"
-+                }
-+            },
-             "autoload": {
-                 "classmap": [
--                    "cssmin.php"
-+                    "src/"
-                 ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-@@ -4680,1405 +17824,1342 @@
-             ],
-             "authors": [
-                 {
--                    "name": "Túbal Martín",
--                    "homepage": "http://tubalmartin.me/"
-+                    "name": "Kore Nordmann",
-+                    "email": "mail@kore-nordmann.de"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-                 }
-             ],
--            "description": "A PHP port of the YUI CSS compressor",
--            "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port",
-+            "description": "Diff implementation",
-+            "homepage": "https://github.com/sebastianbergmann/diff",
-             "keywords": [
--                "compress",
--                "compressor",
--                "css",
--                "minify",
--                "yui"
-+                "diff"
-             ],
--            "time": "2014-09-22 08:08:50"
-+            "time": "2017-08-03T08:09:46+00:00"
-         },
-         {
--            "name": "zendframework/zend-code",
--            "version": "2.3.1",
-+            "name": "sebastian/environment",
-+            "version": "3.1.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-code.git",
--                "reference": "a64e90c9ee8c939335ee7e21e39e3342c0e54526"
-+                "url": "https://github.com/sebastianbergmann/environment.git",
-+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-code/zipball/a64e90c9ee8c939335ee7e21e39e3342c0e54526",
--                "reference": "a64e90c9ee8c939335ee7e21e39e3342c0e54526",
-+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-eventmanager": "self.version"
-+                "php": "^7.0"
-             },
-             "require-dev": {
--                "doctrine/common": ">=2.1",
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-stdlib": "self.version"
--            },
--            "suggest": {
--                "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
--                "zendframework/zend-stdlib": "Zend\\Stdlib component"
-+                "phpunit/phpunit": "^6.1"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "3.1.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Code\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides facilities to generate arbitrary code using an object oriented interface",
--            "homepage": "https://github.com/zendframework/zend-code",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                }
-+            ],
-+            "description": "Provides functionality to handle HHVM/PHP environments",
-+            "homepage": "http://www.github.com/sebastianbergmann/environment",
-             "keywords": [
--                "code",
--                "zf2"
-+                "Xdebug",
-+                "environment",
-+                "hhvm"
-             ],
--            "time": "2014-04-15 14:47:18"
-+            "time": "2017-07-01T08:51:00+00:00"
-         },
-         {
--            "name": "zendframework/zend-config",
--            "version": "2.3.1",
-+            "name": "sebastian/exporter",
-+            "version": "3.1.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-config.git",
--                "reference": "698c139707380b29fd09791ec1c21b837e9a3f15"
-+                "url": "https://github.com/sebastianbergmann/exporter.git",
-+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-config/zipball/698c139707380b29fd09791ec1c21b837e9a3f15",
--                "reference": "698c139707380b29fd09791ec1c21b837e9a3f15",
-+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
-+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^7.0",
-+                "sebastian/recursion-context": "^3.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-json": "self.version",
--                "zendframework/zend-servicemanager": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-filter": "Zend\\Filter component",
--                "zendframework/zend-i18n": "Zend\\I18n component",
--                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
-+                "ext-mbstring": "*",
-+                "phpunit/phpunit": "^6.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "3.1.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Config\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
--            "homepage": "https://github.com/zendframework/zend-config",
-+            "authors": [
-+                {
-+                    "name": "Jeff Welch",
-+                    "email": "whatthejeff@gmail.com"
-+                },
-+                {
-+                    "name": "Volker Dusch",
-+                    "email": "github@wallbash.com"
-+                },
-+                {
-+                    "name": "Bernhard Schussek",
-+                    "email": "bschussek@2bepublished.at"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                },
-+                {
-+                    "name": "Adam Harvey",
-+                    "email": "aharvey@php.net"
-+                }
-+            ],
-+            "description": "Provides the functionality to export PHP variables for visualization",
-+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-             "keywords": [
--                "config",
--                "zf2"
-+                "export",
-+                "exporter"
-             ],
--            "time": "2014-04-15 13:59:53"
-+            "time": "2017-04-03T13:19:02+00:00"
-         },
-         {
--            "name": "zendframework/zend-console",
--            "version": "2.3.1",
-+            "name": "sebastian/finder-facade",
-+            "version": "1.2.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-console.git",
--                "reference": "4253efd75a022d97ef326eac38a06c8eebb48a37"
-+                "url": "https://github.com/sebastianbergmann/finder-facade.git",
-+                "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-console/zipball/4253efd75a022d97ef326eac38a06c8eebb48a37",
--                "reference": "4253efd75a022d97ef326eac38a06c8eebb48a37",
-+                "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
-+                "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
--            },
--            "suggest": {
--                "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
--                "zendframework/zend-validator": "To support DefaultRouteMatcher usage"
-+                "symfony/finder": "~2.3|~3.0|~4.0",
-+                "theseer/fdomdocument": "~1.3"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Console\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-console",
--            "keywords": [
--                "console",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-+                }
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
-+            "homepage": "https://github.com/sebastianbergmann/finder-facade",
-+            "time": "2017-11-18T17:31:49+00:00"
-         },
-         {
--            "name": "zendframework/zend-di",
--            "version": "2.3.1",
-+            "name": "sebastian/global-state",
-+            "version": "2.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-di.git",
--                "reference": "7502db10f8023bfd4e860ce83c9cdeda0db42c31"
-+                "url": "https://github.com/sebastianbergmann/global-state.git",
-+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-di/zipball/7502db10f8023bfd4e860ce83c9cdeda0db42c31",
--                "reference": "7502db10f8023bfd4e860ce83c9cdeda0db42c31",
-+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-code": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^7.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-servicemanager": "self.version"
-+                "phpunit/phpunit": "^6.0"
-             },
-             "suggest": {
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-+                "ext-uopz": "*"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "2.0-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Di\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-di",
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                }
-+            ],
-+            "description": "Snapshotting of global state",
-+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-             "keywords": [
--                "di",
--                "zf2"
-+                "global state"
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "time": "2017-04-27T15:39:26+00:00"
-         },
-         {
--            "name": "zendframework/zend-escaper",
--            "version": "2.3.1",
-+            "name": "sebastian/object-enumerator",
-+            "version": "3.0.3",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-escaper.git",
--                "reference": "2b2fcb6141cc2a2c6cc0c596e82771c72ef4ddc1"
-+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2b2fcb6141cc2a2c6cc0c596e82771c72ef4ddc1",
--                "reference": "2b2fcb6141cc2a2c6cc0c596e82771c72ef4ddc1",
-+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
-+                "php": "^7.0",
-+                "sebastian/object-reflector": "^1.1.1",
-+                "sebastian/recursion-context": "^3.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "phpunit/phpunit": "^6.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "3.0.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Escaper\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-escaper",
--            "keywords": [
--                "escaper",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                }
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-+            "time": "2017-08-03T12:35:26+00:00"
-         },
-         {
--            "name": "zendframework/zend-eventmanager",
--            "version": "2.3.1",
-+            "name": "sebastian/object-reflector",
-+            "version": "1.1.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-eventmanager.git",
--                "reference": "ec158e89d0290f988a29ccd6bf179b561efbb702"
-+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-+                "reference": "773f97c67f28de00d397be301821b06708fca0be"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/ec158e89d0290f988a29ccd6bf179b561efbb702",
--                "reference": "ec158e89d0290f988a29ccd6bf179b561efbb702",
-+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
-+                "reference": "773f97c67f28de00d397be301821b06708fca0be",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^7.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "phpunit/phpunit": "^6.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.1-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\EventManager\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-event-manager",
--            "keywords": [
--                "eventmanager",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                }
-             ],
--            "time": "2014-04-15 13:59:53"
-+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-+            "time": "2017-03-29T09:07:27+00:00"
-         },
--        {
--            "name": "zendframework/zend-filter",
--            "version": "2.3.1",
-+        {
-+            "name": "sebastian/phpcpd",
-+            "version": "3.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-filter.git",
--                "reference": "307fe694659e08ffd710c70e4db8bc60187bcc84"
-+                "url": "https://github.com/sebastianbergmann/phpcpd.git",
-+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/307fe694659e08ffd710c70e4db8bc60187bcc84",
--                "reference": "307fe694659e08ffd710c70e4db8bc60187bcc84",
-+                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564",
-+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-crypt": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-uri": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-crypt": "Zend\\Crypt component",
--                "zendframework/zend-i18n": "Zend\\I18n component",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
--                "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter"
-+                "php": "^5.6|^7.0",
-+                "phpunit/php-timer": "^1.0.6",
-+                "sebastian/finder-facade": "^1.1",
-+                "sebastian/version": "^1.0|^2.0",
-+                "symfony/console": "^2.7|^3.0|^4.0"
-             },
-+            "bin": [
-+                "phpcpd"
-+            ],
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "3.0-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Filter\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides a set of commonly needed data filters",
--            "homepage": "https://github.com/zendframework/zend-filter",
--            "keywords": [
--                "filter",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-+                }
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "description": "Copy/Paste Detector (CPD) for PHP code.",
-+            "homepage": "https://github.com/sebastianbergmann/phpcpd",
-+            "time": "2017-11-16T08:49:28+00:00"
-         },
-         {
--            "name": "zendframework/zend-form",
--            "version": "2.3.1",
-+            "name": "sebastian/recursion-context",
-+            "version": "3.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-form.git",
--                "reference": "d7a1f5bc4626b1df990391502a868b28c37ba65d"
-+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/d7a1f5bc4626b1df990391502a868b28c37ba65d",
--                "reference": "d7a1f5bc4626b1df990391502a868b28c37ba65d",
-+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-inputfilter": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^7.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-captcha": "self.version",
--                "zendframework/zend-code": "self.version",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-validator": "self.version",
--                "zendframework/zend-view": "self.version",
--                "zendframework/zendservice-recaptcha": "*"
--            },
--            "suggest": {
--                "zendframework/zend-captcha": "Zend\\Captcha component",
--                "zendframework/zend-code": "Zend\\Code component",
--                "zendframework/zend-eventmanager": "Zend\\EventManager component",
--                "zendframework/zend-filter": "Zend\\Filter component",
--                "zendframework/zend-i18n": "Zend\\I18n component",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
--                "zendframework/zend-validator": "Zend\\Validator component",
--                "zendframework/zend-view": "Zend\\View component",
--                "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
-+                "phpunit/phpunit": "^6.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "3.0.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Form\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-form",
--            "keywords": [
--                "form",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Jeff Welch",
-+                    "email": "whatthejeff@gmail.com"
-+                },
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                },
-+                {
-+                    "name": "Adam Harvey",
-+                    "email": "aharvey@php.net"
-+                }
-             ],
--            "time": "2014-04-15 14:36:41"
-+            "description": "Provides functionality to recursively process PHP variables",
-+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-+            "time": "2017-03-03T06:23:57+00:00"
-         },
-         {
--            "name": "zendframework/zend-http",
--            "version": "2.3.1",
-+            "name": "sebastian/resource-operations",
-+            "version": "1.0.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-http.git",
--                "reference": "869ce7bdf60727e14d85c305d2948fbe831c3534"
-+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/869ce7bdf60727e14d85c305d2948fbe831c3534",
--                "reference": "869ce7bdf60727e14d85c305d2948fbe831c3534",
-+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-loader": "self.version",
--                "zendframework/zend-stdlib": "self.version",
--                "zendframework/zend-uri": "self.version",
--                "zendframework/zend-validator": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "php": ">=5.6.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Http\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
--            "homepage": "https://github.com/zendframework/zend-http",
--            "keywords": [
--                "http",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de"
-+                }
-             ],
--            "time": "2014-04-15 13:59:53"
-+            "description": "Provides a list of PHP built-in functions that operate on resources",
-+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-+            "time": "2015-07-28T20:34:47+00:00"
-         },
-         {
--            "name": "zendframework/zend-inputfilter",
--            "version": "2.3.1",
-+            "name": "sebastian/version",
-+            "version": "2.0.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-inputfilter.git",
--                "reference": "abca740015a856d03542f5b6c535b8874f84b622"
-+                "url": "https://github.com/sebastianbergmann/version.git",
-+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/abca740015a856d03542f5b6c535b8874f84b622",
--                "reference": "abca740015a856d03542f5b6c535b8874f84b622",
-+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-stdlib": "self.version",
--                "zendframework/zend-validator": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-servicemanager": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-servicemanager": "To support plugin manager support"
-+                "php": ">=5.6"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "2.0.x-dev"
-                 }
-             },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\InputFilter\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-input-filter",
--            "keywords": [
--                "inputfilter",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Sebastian Bergmann",
-+                    "email": "sebastian@phpunit.de",
-+                    "role": "lead"
-+                }
-             ],
--            "time": "2014-04-15 13:59:53"
-+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-+            "homepage": "https://github.com/sebastianbergmann/version",
-+            "time": "2016-10-03T07:35:21+00:00"
-         },
-         {
--            "name": "zendframework/zend-json",
--            "version": "2.3.1",
-+            "name": "squizlabs/php_codesniffer",
-+            "version": "3.3.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-json.git",
--                "reference": "5284687fc3aeab27961d2e17ada08973ae6daafe"
-+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-+                "reference": "628a481780561150481a9ec74709092b9759b3ec"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-json/zipball/5284687fc3aeab27961d2e17ada08973ae6daafe",
--                "reference": "5284687fc3aeab27961d2e17ada08973ae6daafe",
-+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/628a481780561150481a9ec74709092b9759b3ec",
-+                "reference": "628a481780561150481a9ec74709092b9759b3ec",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "ext-simplexml": "*",
-+                "ext-tokenizer": "*",
-+                "ext-xmlwriter": "*",
-+                "php": ">=5.4.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-http": "self.version",
--                "zendframework/zend-server": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-http": "Zend\\Http component",
--                "zendframework/zend-server": "Zend\\Server component",
--                "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage"
-+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
-             },
-+            "bin": [
-+                "bin/phpcs",
-+                "bin/phpcbf"
-+            ],
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
--            "autoload": {
--                "psr-4": {
--                    "Zend\\Json\\": "src/"
-+                    "dev-master": "3.x-dev"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
--            "homepage": "https://github.com/zendframework/zend-json",
-+            "authors": [
-+                {
-+                    "name": "Greg Sherwood",
-+                    "role": "lead"
-+                }
-+            ],
-+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-+            "homepage": "http://www.squizlabs.com/php-codesniffer",
-             "keywords": [
--                "json",
--                "zf2"
-+                "phpcs",
-+                "standards"
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "time": "2018-07-26T23:47:18+00:00"
-         },
-         {
--            "name": "zendframework/zend-loader",
--            "version": "2.3.1",
-+            "name": "symfony/browser-kit",
-+            "version": "v4.2.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-loader.git",
--                "reference": "5e0bd7e28c644078685f525cf8ae03d9a01ae292"
-+                "url": "https://github.com/symfony/browser-kit.git",
-+                "reference": "61d85c5af2fc058014c7c89504c3944e73a086f0"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/5e0bd7e28c644078685f525cf8ae03d9a01ae292",
--                "reference": "5e0bd7e28c644078685f525cf8ae03d9a01ae292",
-+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/61d85c5af2fc058014c7c89504c3944e73a086f0",
-+                "reference": "61d85c5af2fc058014c7c89504c3944e73a086f0",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
-+                "php": "^7.1.3",
-+                "symfony/dom-crawler": "~3.4|~4.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "symfony/css-selector": "~3.4|~4.0",
-+                "symfony/process": "~3.4|~4.0"
-+            },
-+            "suggest": {
-+                "symfony/process": ""
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Loader\\": "src/"
--                }
-+                    "Symfony\\Component\\BrowserKit\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "homepage": "https://github.com/zendframework/zend-loader",
--            "keywords": [
--                "loader",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "description": "Symfony BrowserKit Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-23T15:17:42+00:00"
-         },
-         {
--            "name": "zendframework/zend-log",
--            "version": "2.3.1",
-+            "name": "symfony/config",
-+            "version": "v4.2.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-log.git",
--                "reference": "217611433f5cb56d4420a1db8f164e5db85d815d"
-+                "url": "https://github.com/symfony/config.git",
-+                "reference": "0e745ead307d5dcd4e163e94a47ec04b1428943f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-log/zipball/217611433f5cb56d4420a1db8f164e5db85d815d",
--                "reference": "217611433f5cb56d4420a1db8f164e5db85d815d",
-+                "url": "https://api.github.com/repos/symfony/config/zipball/0e745ead307d5dcd4e163e94a47ec04b1428943f",
-+                "reference": "0e745ead307d5dcd4e163e94a47ec04b1428943f",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^7.1.3",
-+                "symfony/filesystem": "~3.4|~4.0",
-+                "symfony/polyfill-ctype": "~1.8"
-+            },
-+            "conflict": {
-+                "symfony/finder": "<3.4"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-console": "self.version",
--                "zendframework/zend-db": "self.version",
--                "zendframework/zend-escaper": "self.version",
--                "zendframework/zend-mail": "self.version",
--                "zendframework/zend-validator": "self.version"
-+                "symfony/dependency-injection": "~3.4|~4.0",
-+                "symfony/event-dispatcher": "~3.4|~4.0",
-+                "symfony/finder": "~3.4|~4.0",
-+                "symfony/yaml": "~3.4|~4.0"
-             },
-             "suggest": {
--                "ext-mongo": "*",
--                "zendframework/zend-console": "Zend\\Console component",
--                "zendframework/zend-db": "Zend\\Db component",
--                "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML formatter",
--                "zendframework/zend-mail": "Zend\\Mail component",
--                "zendframework/zend-validator": "Zend\\Validator component"
-+                "symfony/yaml": "To use the yaml reference dumper"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Log\\": "src/"
--                }
-+                    "Symfony\\Component\\Config\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "description": "component for general purpose logging",
--            "homepage": "https://github.com/zendframework/zend-log",
--            "keywords": [
--                "log",
--                "logging",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-             ],
--            "time": "2014-04-15 13:59:53"
-+            "description": "Symfony Config Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-04-01T14:03:25+00:00"
-         },
-         {
--            "name": "zendframework/zend-math",
--            "version": "2.3.1",
-+            "name": "symfony/contracts",
-+            "version": "v1.0.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-math.git",
--                "reference": "63225fcebb196fc6e20094f5f01e9354779ec31e"
-+                "url": "https://github.com/symfony/contracts.git",
-+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/63225fcebb196fc6e20094f5f01e9354779ec31e",
--                "reference": "63225fcebb196fc6e20094f5f01e9354779ec31e",
-+                "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf",
-+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
-+                "php": "^7.1.3"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "psr/cache": "^1.0",
-+                "psr/container": "^1.0"
-             },
-             "suggest": {
--                "ext-bcmath": "If using the bcmath functionality",
--                "ext-gmp": "If using the gmp functionality",
--                "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
--                "zendframework/zend-servicemanager": ">= current version, if using the BigInteger::factory functionality"
-+                "psr/cache": "When using the Cache contracts",
-+                "psr/container": "When using the Service contracts",
-+                "symfony/cache-contracts-implementation": "",
-+                "symfony/service-contracts-implementation": "",
-+                "symfony/translation-contracts-implementation": ""
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.0-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Math\\": "src/"
--                }
-+                    "Symfony\\Contracts\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "**/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "homepage": "https://github.com/zendframework/zend-math",
-+            "authors": [
-+                {
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-+            ],
-+            "description": "A set of abstractions extracted out of the Symfony components",
-+            "homepage": "https://symfony.com",
-             "keywords": [
--                "math",
--                "zf2"
-+                "abstractions",
-+                "contracts",
-+                "decoupling",
-+                "interfaces",
-+                "interoperability",
-+                "standards"
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "time": "2018-12-05T08:06:11+00:00"
-         },
-         {
--            "name": "zendframework/zend-modulemanager",
--            "version": "2.3.1",
-+            "name": "symfony/dependency-injection",
-+            "version": "v4.2.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-modulemanager.git",
--                "reference": "d4591b958e40b8f5ae8110d9b203331437aa19f2"
-+                "url": "https://github.com/symfony/dependency-injection.git",
-+                "reference": "1806e43ff6bff57398d33b326cd753a12d9f434f"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/d4591b958e40b8f5ae8110d9b203331437aa19f2",
--                "reference": "d4591b958e40b8f5ae8110d9b203331437aa19f2",
-+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1806e43ff6bff57398d33b326cd753a12d9f434f",
-+                "reference": "1806e43ff6bff57398d33b326cd753a12d9f434f",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^7.1.3",
-+                "psr/container": "^1.0",
-+                "symfony/contracts": "^1.0"
-+            },
-+            "conflict": {
-+                "symfony/config": "<4.2",
-+                "symfony/finder": "<3.4",
-+                "symfony/proxy-manager-bridge": "<3.4",
-+                "symfony/yaml": "<3.4"
-+            },
-+            "provide": {
-+                "psr/container-implementation": "1.0",
-+                "symfony/service-contracts-implementation": "1.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-config": "self.version",
--                "zendframework/zend-console": "self.version",
--                "zendframework/zend-loader": "self.version",
--                "zendframework/zend-mvc": "self.version",
--                "zendframework/zend-servicemanager": "self.version"
-+                "symfony/config": "~4.2",
-+                "symfony/expression-language": "~3.4|~4.0",
-+                "symfony/yaml": "~3.4|~4.0"
-             },
-             "suggest": {
--                "zendframework/zend-config": "Zend\\Config component",
--                "zendframework/zend-console": "Zend\\Console component",
--                "zendframework/zend-loader": "Zend\\Loader component",
--                "zendframework/zend-mvc": "Zend\\Mvc component",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-+                "symfony/config": "",
-+                "symfony/expression-language": "For using expressions in service container configuration",
-+                "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
-+                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-+                "symfony/yaml": ""
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\ModuleManager\\": "src/"
--                }
-+                    "Symfony\\Component\\DependencyInjection\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "homepage": "https://github.com/zendframework/zend-module-manager",
--            "keywords": [
--                "modulemanager",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "description": "Symfony DependencyInjection Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-03-30T15:58:42+00:00"
-         },
-         {
--            "name": "zendframework/zend-mvc",
--            "version": "2.3.1",
-+            "name": "symfony/dom-crawler",
-+            "version": "v4.2.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-mvc.git",
--                "reference": "ee76ddd009ecb0c507bb8ab396fbe719aea8f1ff"
-+                "url": "https://github.com/symfony/dom-crawler.git",
-+                "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/ee76ddd009ecb0c507bb8ab396fbe719aea8f1ff",
--                "reference": "ee76ddd009ecb0c507bb8ab396fbe719aea8f1ff",
-+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/53c97769814c80a84a8403efcf3ae7ae966d53bb",
-+                "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-form": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^7.1.3",
-+                "symfony/polyfill-ctype": "~1.8",
-+                "symfony/polyfill-mbstring": "~1.0"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-authentication": "self.version",
--                "zendframework/zend-console": "self.version",
--                "zendframework/zend-di": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-form": "self.version",
--                "zendframework/zend-http": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-inputfilter": "self.version",
--                "zendframework/zend-json": "self.version",
--                "zendframework/zend-log": "self.version",
--                "zendframework/zend-modulemanager": "self.version",
--                "zendframework/zend-serializer": "self.version",
--                "zendframework/zend-session": "self.version",
--                "zendframework/zend-text": "self.version",
--                "zendframework/zend-uri": "self.version",
--                "zendframework/zend-validator": "self.version",
--                "zendframework/zend-version": "self.version",
--                "zendframework/zend-view": "self.version"
-+                "symfony/css-selector": "~3.4|~4.0"
-             },
-             "suggest": {
--                "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
--                "zendframework/zend-config": "Zend\\Config component",
--                "zendframework/zend-console": "Zend\\Console component",
--                "zendframework/zend-di": "Zend\\Di component",
--                "zendframework/zend-filter": "Zend\\Filter component",
--                "zendframework/zend-form": "Zend\\Form component",
--                "zendframework/zend-http": "Zend\\Http component",
--                "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
--                "zendframework/zend-inputfilter": "Zend\\Inputfilter component",
--                "zendframework/zend-json": "Zend\\Json component",
--                "zendframework/zend-log": "Zend\\Log component",
--                "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
--                "zendframework/zend-serializer": "Zend\\Serializer component",
--                "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
--                "zendframework/zend-stdlib": "Zend\\Stdlib component",
--                "zendframework/zend-text": "Zend\\Text component",
--                "zendframework/zend-uri": "Zend\\Uri component",
--                "zendframework/zend-validator": "Zend\\Validator component",
--                "zendframework/zend-version": "Zend\\Version component",
--                "zendframework/zend-view": "Zend\\View component"
-+                "symfony/css-selector": ""
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Mvc\\": "src/"
--                }
-+                    "Symfony\\Component\\DomCrawler\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "homepage": "https://github.com/zendframework/zend-mvc",
--            "keywords": [
--                "mvc",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "description": "Symfony DomCrawler Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-02-23T15:17:42+00:00"
-         },
-         {
--            "name": "zendframework/zend-serializer",
--            "version": "2.3.1",
-+            "name": "symfony/http-foundation",
-+            "version": "v4.2.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-serializer.git",
--                "reference": "22f73b0d0ff1158216bd5bcacf6bd00f7be1a0f6"
-+                "url": "https://github.com/symfony/http-foundation.git",
-+                "reference": "5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/22f73b0d0ff1158216bd5bcacf6bd00f7be1a0f6",
--                "reference": "22f73b0d0ff1158216bd5bcacf6bd00f7be1a0f6",
-+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1",
-+                "reference": "5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-json": "self.version",
--                "zendframework/zend-math": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^7.1.3",
-+                "symfony/polyfill-mbstring": "~1.1"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-servicemanager": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-servicemanager": "To support plugin manager support"
-+                "predis/predis": "~1.0",
-+                "symfony/expression-language": "~3.4|~4.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Serializer\\": "src/"
--                }
-+                    "Symfony\\Component\\HttpFoundation\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
--            "homepage": "https://github.com/zendframework/zend-serializer",
--            "keywords": [
--                "serializer",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "description": "Symfony HttpFoundation Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-03-30T15:58:42+00:00"
-         },
-         {
--            "name": "zendframework/zend-server",
--            "version": "2.3.1",
-+            "name": "symfony/polyfill-php70",
-+            "version": "v1.11.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-server.git",
--                "reference": "bc5fb97f4ac48a5dc54bd18dded21a3e1eea552c"
-+                "url": "https://github.com/symfony/polyfill-php70.git",
-+                "reference": "bc4858fb611bda58719124ca079baff854149c89"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/bc5fb97f4ac48a5dc54bd18dded21a3e1eea552c",
--                "reference": "bc5fb97f4ac48a5dc54bd18dded21a3e1eea552c",
-+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89",
-+                "reference": "bc4858fb611bda58719124ca079baff854149c89",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-code": "self.version",
--                "zendframework/zend-stdlib": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "paragonie/random_compat": "~1.0|~2.0|~9.99",
-+                "php": ">=5.3.3"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.11-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Server\\": "src/"
--                }
-+                    "Symfony\\Polyfill\\Php70\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-+                ],
-+                "classmap": [
-+                    "Resources/stubs"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-             ],
--            "homepage": "https://github.com/zendframework/zend-server",
-+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-+            "homepage": "https://symfony.com",
-             "keywords": [
--                "server",
--                "zf2"
-+                "compatibility",
-+                "polyfill",
-+                "portable",
-+                "shim"
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "time": "2019-02-06T07:57:58+00:00"
-         },
-         {
--            "name": "zendframework/zend-servicemanager",
--            "version": "2.3.1",
-+            "name": "symfony/polyfill-php72",
-+            "version": "v1.11.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-servicemanager.git",
--                "reference": "7a428b595a1fcd4c2a8026ee5d5f89a56036f682"
-+                "url": "https://github.com/symfony/polyfill-php72.git",
-+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/7a428b595a1fcd4c2a8026ee5d5f89a56036f682",
--                "reference": "7a428b595a1fcd4c2a8026ee5d5f89a56036f682",
-+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c",
-+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-di": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-di": "Zend\\Di component"
-+                "php": ">=5.3.3"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.11-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\ServiceManager\\": "src/"
--                }
-+                    "Symfony\\Polyfill\\Php72\\": ""
-+                },
-+                "files": [
-+                    "bootstrap.php"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-+            ],
-+            "authors": [
-+                {
-+                    "name": "Nicolas Grekas",
-+                    "email": "p@tchwork.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-             ],
--            "homepage": "https://github.com/zendframework/zend-service-manager",
-+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-+            "homepage": "https://symfony.com",
-             "keywords": [
--                "servicemanager",
--                "zf2"
-+                "compatibility",
-+                "polyfill",
-+                "portable",
-+                "shim"
-             ],
--            "time": "2014-04-15 13:59:53"
-+            "time": "2019-02-06T07:57:58+00:00"
-         },
-         {
--            "name": "zendframework/zend-soap",
--            "version": "2.3.1",
-+            "name": "symfony/stopwatch",
-+            "version": "v4.2.5",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-soap.git",
--                "reference": "fab9f5309be04cacf01af54f694aed5102592c5c"
-+                "url": "https://github.com/symfony/stopwatch.git",
-+                "reference": "b1a5f646d56a3290230dbc8edf2a0d62cda23f67"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/fab9f5309be04cacf01af54f694aed5102592c5c",
--                "reference": "fab9f5309be04cacf01af54f694aed5102592c5c",
-+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b1a5f646d56a3290230dbc8edf2a0d62cda23f67",
-+                "reference": "b1a5f646d56a3290230dbc8edf2a0d62cda23f67",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-server": "self.version",
--                "zendframework/zend-stdlib": "self.version",
--                "zendframework/zend-uri": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-http": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-http": "Zend\\Http component"
-+                "php": "^7.1.3",
-+                "symfony/contracts": "^1.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "4.2-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Soap\\": "src/"
--                }
-+                    "Symfony\\Component\\Stopwatch\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "homepage": "https://github.com/zendframework/zend-soap",
--            "keywords": [
--                "soap",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "description": "Symfony Stopwatch Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-01-16T20:31:39+00:00"
-         },
-         {
--            "name": "zendframework/zend-stdlib",
--            "version": "2.3.1",
-+            "name": "symfony/yaml",
-+            "version": "v3.4.24",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-stdlib.git",
--                "reference": "6079302963d57f36a9ba92ed3f38b992997aa78d"
-+                "url": "https://github.com/symfony/yaml.git",
-+                "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/6079302963d57f36a9ba92ed3f38b992997aa78d",
--                "reference": "6079302963d57f36a9ba92ed3f38b992997aa78d",
-+                "url": "https://api.github.com/repos/symfony/yaml/zipball/212a27b731e5bfb735679d1ffaac82bd6a1dc996",
-+                "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23"
-+                "php": "^5.5.9|>=7.0.8",
-+                "symfony/polyfill-ctype": "~1.8"
-+            },
-+            "conflict": {
-+                "symfony/console": "<3.4"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-serializer": "self.version",
--                "zendframework/zend-servicemanager": "self.version"
-+                "symfony/console": "~3.4|~4.0"
-             },
-             "suggest": {
--                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
--                "zendframework/zend-filter": "To support naming strategy hydrator usage",
--                "zendframework/zend-serializer": "Zend\\Serializer component",
--                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
-+                "symfony/console": "For validating YAML files using the lint command"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "3.4-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Stdlib\\": "src/"
--                }
-+                    "Symfony\\Component\\Yaml\\": ""
-+                },
-+                "exclude-from-classmap": [
-+                    "/Tests/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "homepage": "https://github.com/zendframework/zend-stdlib",
--            "keywords": [
--                "stdlib",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Fabien Potencier",
-+                    "email": "fabien@symfony.com"
-+                },
-+                {
-+                    "name": "Symfony Community",
-+                    "homepage": "https://symfony.com/contributors"
-+                }
-             ],
--            "time": "2014-04-15 13:59:53"
-+            "description": "Symfony Yaml Component",
-+            "homepage": "https://symfony.com",
-+            "time": "2019-03-25T07:48:46+00:00"
-         },
-         {
--            "name": "zendframework/zend-text",
--            "version": "2.3.1",
-+            "name": "theseer/fdomdocument",
-+            "version": "1.6.6",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-text.git",
--                "reference": "e9b3fffcc6241f7cfdb33282ed10979cd8ba9b90"
-+                "url": "https://github.com/theseer/fDOMDocument.git",
-+                "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-text/zipball/e9b3fffcc6241f7cfdb33282ed10979cd8ba9b90",
--                "reference": "e9b3fffcc6241f7cfdb33282ed10979cd8ba9b90",
-+                "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/6e8203e40a32a9c770bcb62fe37e68b948da6dca",
-+                "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-stdlib": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "ext-dom": "*",
-+                "lib-libxml": "*",
-+                "php": ">=5.3.3"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Text\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "homepage": "https://github.com/zendframework/zend-text",
--            "keywords": [
--                "text",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Arne Blankerts",
-+                    "email": "arne@blankerts.de",
-+                    "role": "lead"
-+                }
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
-+            "homepage": "https://github.com/theseer/fDOMDocument",
-+            "time": "2017-06-30T11:53:12+00:00"
-         },
-         {
--            "name": "zendframework/zend-uri",
--            "version": "2.3.1",
-+            "name": "theseer/tokenizer",
-+            "version": "1.1.2",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-uri.git",
--                "reference": "0de6ba8c166a235588783ff8e88a19b364630d89"
-+                "url": "https://github.com/theseer/tokenizer.git",
-+                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/0de6ba8c166a235588783ff8e88a19b364630d89",
--                "reference": "0de6ba8c166a235588783ff8e88a19b364630d89",
-+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/1c42705be2b6c1de5904f8afacef5895cab44bf8",
-+                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-escaper": "self.version",
--                "zendframework/zend-validator": "self.version"
--            },
--            "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master"
-+                "ext-dom": "*",
-+                "ext-tokenizer": "*",
-+                "ext-xmlwriter": "*",
-+                "php": "^7.0"
-             },
-             "type": "library",
--            "extra": {
--                "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
--                }
--            },
-             "autoload": {
--                "psr-4": {
--                    "Zend\\Uri\\": "src/"
--                }
-+                "classmap": [
-+                    "src/"
-+                ]
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
--            "homepage": "https://github.com/zendframework/zend-uri",
--            "keywords": [
--                "uri",
--                "zf2"
-+            "authors": [
-+                {
-+                    "name": "Arne Blankerts",
-+                    "email": "arne@blankerts.de",
-+                    "role": "Developer"
-+                }
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-+            "time": "2019-04-04T09:56:43+00:00"
-         },
-         {
--            "name": "zendframework/zend-validator",
--            "version": "2.3.1",
-+            "name": "vlucas/phpdotenv",
-+            "version": "v2.6.1",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-validator.git",
--                "reference": "a5f97f6c3a27a27b1235f724ad0048715459f013"
-+                "url": "https://github.com/vlucas/phpdotenv.git",
-+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/a5f97f6c3a27a27b1235f724ad0048715459f013",
--                "reference": "a5f97f6c3a27a27b1235f724ad0048715459f013",
-+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
-+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": ">=5.3.9",
-+                "symfony/polyfill-ctype": "^1.9"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-db": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-math": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-session": "self.version",
--                "zendframework/zend-uri": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-db": "Zend\\Db component",
--                "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
--                "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators",
--                "zendframework/zend-math": "Zend\\Math component",
--                "zendframework/zend-resources": "Translations of validator messages",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
--                "zendframework/zend-session": "Zend\\Session component",
--                "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
-+                "phpunit/phpunit": "^4.8.35 || ^5.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "2.6-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\Validator\\": "src/"
-+                    "Dotenv\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "BSD-3-Clause"
-             ],
--            "description": "provides a set of commonly needed validators",
--            "homepage": "https://github.com/zendframework/zend-validator",
-+            "authors": [
-+                {
-+                    "name": "Vance Lucas",
-+                    "email": "vance@vancelucas.com",
-+                    "homepage": "http://www.vancelucas.com"
-+                }
-+            ],
-+            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
-             "keywords": [
--                "validator",
--                "zf2"
-+                "dotenv",
-+                "env",
-+                "environment"
-             ],
--            "time": "2014-04-14 19:50:30"
-+            "time": "2019-01-29T11:11:52+00:00"
-         },
-         {
--            "name": "zendframework/zend-view",
--            "version": "2.3.1",
-+            "name": "webmozart/assert",
-+            "version": "1.4.0",
-             "source": {
-                 "type": "git",
--                "url": "https://github.com/zendframework/zend-view.git",
--                "reference": "e308d498fa7851f26bd639bfe3ebbfba397c47bc"
-+                "url": "https://github.com/webmozart/assert.git",
-+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
-             },
-             "dist": {
-                 "type": "zip",
--                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/e308d498fa7851f26bd639bfe3ebbfba397c47bc",
--                "reference": "e308d498fa7851f26bd639bfe3ebbfba397c47bc",
-+                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
-+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
-                 "shasum": ""
-             },
-             "require": {
--                "php": ">=5.3.23",
--                "zendframework/zend-eventmanager": "self.version",
--                "zendframework/zend-loader": "self.version",
--                "zendframework/zend-stdlib": "self.version"
-+                "php": "^5.3.3 || ^7.0",
-+                "symfony/polyfill-ctype": "^1.8"
-             },
-             "require-dev": {
--                "fabpot/php-cs-fixer": "1.7.*",
--                "phpunit/phpunit": "~4.0",
--                "satooshi/php-coveralls": "dev-master",
--                "zendframework/zend-authentication": "self.version",
--                "zendframework/zend-escaper": "self.version",
--                "zendframework/zend-feed": "self.version",
--                "zendframework/zend-filter": "self.version",
--                "zendframework/zend-http": "self.version",
--                "zendframework/zend-i18n": "self.version",
--                "zendframework/zend-json": "self.version",
--                "zendframework/zend-mvc": "self.version",
--                "zendframework/zend-navigation": "self.version",
--                "zendframework/zend-paginator": "self.version",
--                "zendframework/zend-permissions-acl": "self.version",
--                "zendframework/zend-servicemanager": "self.version",
--                "zendframework/zend-uri": "self.version"
--            },
--            "suggest": {
--                "zendframework/zend-authentication": "Zend\\Authentication component",
--                "zendframework/zend-escaper": "Zend\\Escaper component",
--                "zendframework/zend-feed": "Zend\\Feed component",
--                "zendframework/zend-filter": "Zend\\Filter component",
--                "zendframework/zend-http": "Zend\\Http component",
--                "zendframework/zend-i18n": "Zend\\I18n component",
--                "zendframework/zend-json": "Zend\\Json component",
--                "zendframework/zend-mvc": "Zend\\Mvc component",
--                "zendframework/zend-navigation": "Zend\\Navigation component",
--                "zendframework/zend-paginator": "Zend\\Paginator component",
--                "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
--                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
--                "zendframework/zend-uri": "Zend\\Uri component"
-+                "phpunit/phpunit": "^4.6",
-+                "sebastian/version": "^1.0.1"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
--                    "dev-master": "2.3-dev",
--                    "dev-develop": "2.4-dev"
-+                    "dev-master": "1.3-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-4": {
--                    "Zend\\View\\": "src/"
-+                    "Webmozart\\Assert\\": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
--                "BSD-3-Clause"
-+                "MIT"
-             ],
--            "description": "provides a system of helpers, output filters, and variable escaping",
--            "homepage": "https://github.com/zendframework/zend-view",
-+            "authors": [
-+                {
-+                    "name": "Bernhard Schussek",
-+                    "email": "bschussek@gmail.com"
-+                }
-+            ],
-+            "description": "Assertions to validate method input/output with nice error messages.",
-             "keywords": [
--                "view",
--                "zf2"
-+                "assert",
-+                "check",
-+                "validate"
-             ],
--            "time": "2014-04-15 14:36:41"
-+            "time": "2018-12-25T11:19:39+00:00"
-         }
-     ],
--    "packages-dev": [],
-     "aliases": [],
--    "minimum-stability": "dev",
--    "stability-flags": [],
-+    "minimum-stability": "stable",
-+    "stability-flags": {
-+        "phpmd/phpmd": 0
-+    },
-     "prefer-stable": false,
-     "prefer-lowest": false,
-     "platform": [],
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php b/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php
-new file mode 100644
-index 00000000000..7a439d84ce5
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php
-@@ -0,0 +1,129 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Console;
-+
-+use Magento\Framework\App\DeploymentConfig;
-+use Magento\Framework\App\DeploymentConfig\FileReader;
-+use Magento\Framework\App\DeploymentConfig\Writer;
-+use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\Framework\Config\File\ConfigFilePool;
-+use Magento\Framework\Filesystem;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+class CliTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var Filesystem
-+     */
-+    private $filesystem;
-+
-+    /**
-+     * @var ConfigFilePool
-+     */
-+    private $configFilePool;
-+
-+    /**
-+     * @var FileReader
-+     */
-+    private $reader;
-+
-+    /**
-+     * @var Writer
-+     */
-+    private $writer;
-+
-+    /**
-+     * @var array
-+     */
-+    private $envConfig;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->configFilePool = $this->objectManager->get(ConfigFilePool::class);
-+        $this->filesystem = $this->objectManager->get(Filesystem::class);
-+        $this->reader = $this->objectManager->get(FileReader::class);
-+        $this->writer = $this->objectManager->get(Writer::class);
-+
-+        $this->envConfig = $this->reader->load(ConfigFilePool::APP_ENV);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function tearDown()
-+    {
-+        $this->filesystem->getDirectoryWrite(DirectoryList::CONFIG)->writeFile(
-+            $this->configFilePool->getPath(ConfigFilePool::APP_ENV),
-+            "<?php\n return array();\n"
-+        );
-+
-+        $this->writer->saveConfig([ConfigFilePool::APP_ENV => $this->envConfig], true);
-+    }
-+
-+    /**
-+     * Checks that settings from env.php config file are applied
-+     * to created application instance.
-+     *
-+     * @param bool $isPub
-+     * @param array $params
-+     * @dataProvider documentRootIsPubProvider
-+     */
-+    public function testDocumentRootIsPublic($isPub, $params)
-+    {
-+        $config = include __DIR__ . '/_files/env.php';
-+        $config['directories']['document_root_is_pub'] = $isPub;
-+        $this->writer->saveConfig([ConfigFilePool::APP_ENV => $config], true);
-+
-+        $cli = new Cli();
-+        $cliReflection = new \ReflectionClass($cli);
-+
-+        $serviceManagerProperty = $cliReflection->getProperty('serviceManager');
-+        $serviceManagerProperty->setAccessible(true);
-+        $serviceManager = $serviceManagerProperty->getValue($cli);
-+        $deploymentConfig = $this->objectManager->get(DeploymentConfig::class);
-+        $serviceManager->setAllowOverride(true);
-+        $serviceManager->setService(DeploymentConfig::class, $deploymentConfig);
-+        $serviceManagerProperty->setAccessible(false);
-+
-+        $documentRootResolver = $cliReflection->getMethod('documentRootResolver');
-+        $documentRootResolver->setAccessible(true);
-+
-+        self::assertEquals($params, $documentRootResolver->invoke($cli));
-+    }
-+
-+    /**
-+     * Provides document root setting and expecting
-+     * properties for object manager creation.
-+     *
-+     * @return array
-+     */
-+    public function documentRootIsPubProvider(): array
-+    {
-+        return [
-+            [true, [
-+                'MAGE_DIRS' => [
-+                    'pub' => ['uri' => ''],
-+                    'media' => ['uri' => 'media'],
-+                    'static' => ['uri' => 'static'],
-+                    'upload' => ['uri' => 'media/upload']
-+                ]
-+            ]],
-+            [false, []]
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Console/_files/env.php b/dev/tests/integration/testsuite/Magento/Framework/Console/_files/env.php
-new file mode 100644
-index 00000000000..e314e7638c2
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Console/_files/env.php
-@@ -0,0 +1,46 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+return [
-+    'backend' => [
-+        'frontName' => 'admin',
-+    ],
-+    'crypt' => [
-+        'key' => 'some_key',
-+    ],
-+    'session' => [
-+        'save' => 'files',
-+    ],
-+    'db' => [
-+        'table_prefix' => '',
-+        'connection' => [],
-+    ],
-+    'resource' => [],
-+    'x-frame-options' => 'SAMEORIGIN',
-+    'MAGE_MODE' => 'default',
-+    'cache_types' => [
-+        'config' => 1,
-+        'layout' => 1,
-+        'block_html' => 1,
-+        'collections' => 1,
-+        'reflection' => 1,
-+        'db_ddl' => 1,
-+        'eav' => 1,
-+        'customer_notification' => 1,
-+        'config_integration' => 1,
-+        'config_integration_api' => 1,
-+        'full_page' => 1,
-+        'translate' => 1,
-+        'config_webservice' => 1,
-+    ],
-+    'install' => [
-+        'date' => 'Thu, 09 Feb 2017 14:28:00 +0000',
-+    ],
-+    'directories' => [
-+        'document_root_is_pub' => true
-+    ]
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php b/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
-index cf3b9f05cbe..403c45dde71 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
-@@ -8,6 +8,7 @@ namespace Magento\Framework\DB\Adapter\Pdo;
- use Magento\Framework\App\ResourceConnection;
- use Magento\TestFramework\Helper\CacheCleaner;
- use Magento\Framework\DB\Ddl\Table;
-+use Magento\TestFramework\Helper\Bootstrap;
- 
- class MysqlTest extends \PHPUnit\Framework\TestCase
- {
-@@ -19,7 +20,7 @@ class MysqlTest extends \PHPUnit\Framework\TestCase
-     protected function setUp()
-     {
-         set_error_handler(null);
--        $this->resourceConnection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+        $this->resourceConnection = Bootstrap::getObjectManager()
-             ->get(ResourceConnection::class);
-         CacheCleaner::cleanAll();
-     }
-@@ -40,7 +41,6 @@ class MysqlTest extends \PHPUnit\Framework\TestCase
-             $this->markTestSkipped('This test is for \Magento\Framework\DB\Adapter\Pdo\Mysql');
-         }
-         try {
--            $defaultWaitTimeout = $this->getWaitTimeout();
-             $minWaitTimeout = 1;
-             $this->setWaitTimeout($minWaitTimeout);
-             $this->assertEquals($minWaitTimeout, $this->getWaitTimeout(), 'Wait timeout was not changed');
-@@ -49,17 +49,8 @@ class MysqlTest extends \PHPUnit\Framework\TestCase
-             sleep($minWaitTimeout + 1);
-             $result = $this->executeQuery('SELECT 1');
-             $this->assertInstanceOf(\Magento\Framework\DB\Statement\Pdo\Mysql::class, $result);
--            // Restore wait_timeout
--            $this->setWaitTimeout($defaultWaitTimeout);
--            $this->assertEquals(
--                $defaultWaitTimeout,
--                $this->getWaitTimeout(),
--                'Default wait timeout was not restored'
--            );
--        } catch (\Exception $e) {
--            // Reset connection on failure to restore global variables
-+        } finally {
-             $this->getDbAdapter()->closeConnection();
--            throw $e;
-         }
-     }
- 
-@@ -87,30 +78,14 @@ class MysqlTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Execute SQL query and return result statement instance
-      *
--     * @param string $sql
--     * @return \Zend_Db_Statement_Interface
--     * @throws \Exception
-+     * @param $sql
-+     * @return void|\Zend_Db_Statement_Pdo
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Zend_Db_Adapter_Exception
-      */
-     private function executeQuery($sql)
-     {
--        /**
--         * Suppress PDO warnings to work around the bug https://bugs.php.net/bug.php?id=63812
--         */
--        $phpErrorReporting = error_reporting();
--        /** @var $pdoConnection \PDO */
--        $pdoConnection = $this->getDbAdapter()->getConnection();
--        $pdoWarningsEnabled = $pdoConnection->getAttribute(\PDO::ATTR_ERRMODE) & \PDO::ERRMODE_WARNING;
--        if (!$pdoWarningsEnabled) {
--            error_reporting($phpErrorReporting & ~E_WARNING);
--        }
--        try {
--            $result = $this->getDbAdapter()->query($sql);
--            error_reporting($phpErrorReporting);
--        } catch (\Exception $e) {
--            error_reporting($phpErrorReporting);
--            throw $e;
--        }
--        return $result;
-+        return $this->getDbAdapter()->query($sql);
-     }
- 
-     /**
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
-index a934372bfd9..9980f40239f 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
-@@ -4,41 +4,51 @@
-  * See COPYING.txt for license details.
-  */
- 
-+namespace Magento\Framework\Data\Form\Element;
-+
-+use Magento\Framework\Data\Form\ElementFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
- /**
-  * Tests for \Magento\Framework\Data\Form\Element\Date
-  */
--namespace Magento\Framework\Data\Form\Element;
--
- class DateTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\Framework\Data\Form\ElementFactory
-+     * @var ElementFactory
-      */
--    protected $_elementFactory;
-+    private $elementFactory;
- 
-     /**
--     * SetUp method
-+     * @inheritdoc
-      */
-     protected function setUp()
-     {
--        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
--        $this->_elementFactory = $objectManager->create(\Magento\Framework\Data\Form\ElementFactory::class);
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->elementFactory = $objectManager->create(ElementFactory::class);
-     }
- 
-     /**
-+     * Test get value
-+     *
-+     * @param array $data
-+     * @param string $expect
-+     * @return void
-      * @dataProvider getValueDataProvider
-      */
--    public function testGetValue(array $data, $expect)
-+    public function testGetValue(array $data, string $expect): void
-     {
--        /** @var $date \Magento\Framework\Data\Form\Element\Date */
--        $date = $this->_elementFactory->create(\Magento\Framework\Data\Form\Element\Date::class, $data);
-+        /** @var $date Date */
-+        $date = $this->elementFactory->create(Date::class, $data);
-         $this->assertEquals($expect, $date->getValue());
-     }
- 
-     /**
-+     * Get value test data provider
-+     *
-      * @return array
-      */
--    public function getValueDataProvider()
-+    public function getValueDataProvider(): array
-     {
-         $testTimestamp = strtotime('2014-05-18 12:08:16');
-         $date = new \DateTime('@' . $testTimestamp);
-@@ -56,15 +66,22 @@ class DateTest extends \PHPUnit\Framework\TestCase
-                     'time_format' => 'h:mm a',
-                     'value' => $testTimestamp,
-                 ],
--                $date->format('g:i A')
-+                $date->format('g:i A'),
-             ],
-             [
-                 [
-                     'date_format' => 'MM/d/yy',
-                     'value' => $testTimestamp,
-                 ],
--                $date->format('m/j/y')
--            ]
-+                $date->format('m/j/y'),
-+            ],
-+            [
-+                [
-+                    'date_format' => 'd-MM-Y',
-+                    'value' => $date->format('d-m-Y'),
-+                ],
-+                $date->format('d-m-Y'),
-+            ],
-         ];
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Encryption/EncryptorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Encryption/EncryptorTest.php
-index 2ba9109df86..88c567da752 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Encryption/EncryptorTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Encryption/EncryptorTest.php
-@@ -10,18 +10,64 @@ class EncryptorTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @var \Magento\Framework\Encryption\Encryptor
-      */
--    protected $_model;
-+    private $encryptor;
- 
-     protected function setUp()
-     {
--        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+        $this->encryptor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-             \Magento\Framework\Encryption\Encryptor::class
-         );
-     }
- 
-     public function testEncryptDecrypt()
-     {
--        $this->assertEquals('', $this->_model->decrypt($this->_model->encrypt('')));
--        $this->assertEquals('test', $this->_model->decrypt($this->_model->encrypt('test')));
-+        $this->assertEquals('', $this->encryptor->decrypt($this->encryptor->encrypt('')));
-+        $this->assertEquals('test', $this->encryptor->decrypt($this->encryptor->encrypt('test')));
-+    }
-+
-+    /**
-+     * @param string $key
-+     * @dataProvider validEncryptionKeyDataProvider
-+     */
-+    public function testValidateKey($key)
-+    {
-+        $this->encryptor->validateKey($key);
-+    }
-+
-+    public function validEncryptionKeyDataProvider()
-+    {
-+        return [
-+            '32 numbers' => ['12345678901234567890123456789012'],
-+            '32 characters' => ['aBcdeFghIJKLMNOPQRSTUvwxYzabcdef'],
-+            '32 special characters' => ['!@#$%^&*()_+~`:;"<>,.?/|*&^%$#@!'],
-+            '32 combination' =>['1234eFghI1234567^&*(890123456789'],
-+        ];
-+    }
-+
-+    /**
-+     * @expectedException \Exception
-+     * @expectedExceptionMessage Encryption key must be 32 character string without any white space.
-+     *
-+     * @param string $key
-+     * @dataProvider invalidEncryptionKeyDataProvider
-+     */
-+    public function testValidateKeyInvalid($key)
-+    {
-+        $this->encryptor->validateKey($key);
-+    }
-+
-+    public function invalidEncryptionKeyDataProvider()
-+    {
-+        return [
-+            'empty string' => [''],
-+            'leading space' => [' 1234567890123456789012345678901'],
-+            'tailing space' => ['1234567890123456789012345678901 '],
-+            'space in the middle' => ['12345678901 23456789012345678901'],
-+            'tab in the middle' => ['12345678901    23456789012345678'],
-+            'return in the middle' => ['12345678901
-+            23456789012345678901'],
-+            '31 characters' => ['1234567890123456789012345678901'],
-+            '33 characters' => ['123456789012345678901234567890123'],
-+        ];
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php
-index 26401c782ef..5f53e621655 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php
-@@ -7,22 +7,27 @@
-  */
- namespace Magento\Framework\Filesystem\Driver;
- 
--use Magento\Framework\Filesystem\DriverInterface;
-+use Magento\Framework\Exception\FileSystemException;
- 
- class FileTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\Framework\Filesystem\Driver\File
-+     * @var File
-      */
--    protected $driver;
-+    private $driver;
- 
-     /**
--     * @var string
-+     * @var String
-      */
--    protected $absolutePath;
-+    private $absolutePath;
- 
-     /**
--     * get relative path for test
-+     * @var String
-+     */
-+    private $generatedPath;
-+
-+    /**
-+     * Returns relative path for the test.
-      *
-      * @param $relativePath
-      * @return string
-@@ -33,16 +38,26 @@ class FileTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * Set up
-+     * @inheritdoc
-      */
-     public function setUp()
-     {
--        $this->driver = new \Magento\Framework\Filesystem\Driver\File();
-+        $this->driver = new File();
-         $this->absolutePath = dirname(__DIR__) . '/_files/';
-+        $this->generatedPath = $this->getTestPath('generated');
-+        $this->removeGeneratedDirectory();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function tearDown()
-+    {
-+        $this->removeGeneratedDirectory();
-     }
- 
-     /**
--     * test read recursively read
-+     * Tests directory recursive read.
-      */
-     public function testReadDirectoryRecursively()
-     {
-@@ -60,7 +75,7 @@ class FileTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * test exception
-+     * Tests directory reading exception.
-      *
-      * @expectedException \Magento\Framework\Exception\FileSystemException
-      */
-@@ -69,6 +84,11 @@ class FileTest extends \PHPUnit\Framework\TestCase
-         $this->driver->readDirectoryRecursively($this->getTestPath('not-existing-directory'));
-     }
- 
-+    /**
-+     * Tests of directory creating.
-+     *
-+     * @throws FileSystemException
-+     */
-     public function testCreateDirectory()
-     {
-         $generatedPath = $this->getTestPath('generated/roo/bar/baz/foo');
-@@ -80,4 +100,39 @@ class FileTest extends \PHPUnit\Framework\TestCase
-         $this->assertTrue($this->driver->createDirectory($generatedPath));
-         $this->assertTrue(is_dir($generatedPath));
-     }
-+
-+    /**
-+     * Tests creation and removing of symlinks.
-+     *
-+     * @throws FileSystemException
-+     * @return void
-+     */
-+    public function testSymlinks(): void
-+    {
-+        $sourceDirectory = $this->generatedPath . '/source';
-+        $destinationDirectory = $this->generatedPath . '/destination';
-+
-+        $this->driver->createDirectory($sourceDirectory);
-+        $this->driver->createDirectory($destinationDirectory);
-+
-+        $linkName = $destinationDirectory . '/link';
-+
-+        self::assertTrue($this->driver->isWritable($destinationDirectory));
-+        self::assertTrue($this->driver->symlink($sourceDirectory, $linkName));
-+        self::assertTrue($this->driver->isExists($linkName));
-+        self::assertTrue($this->driver->deleteDirectory($linkName));
-+    }
-+
-+    /**
-+     * Remove generated directories.
-+     *
-+     * @throws FileSystemException
-+     * @return void
-+     */
-+    private function removeGeneratedDirectory(): void
-+    {
-+        if (is_dir($this->generatedPath)) {
-+            $this->driver->deleteDirectory($this->generatedPath);
-+        }
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
-index 8583dcf3e4c..af8d1c7af13 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
-@@ -8,6 +8,7 @@ declare(strict_types=1);
- namespace Magento\Framework\GraphQl\Config;
- 
- use Magento\Framework\App\Cache;
-+use Magento\Framework\App\Request\Http;
- use Magento\Framework\GraphQl\Config;
- use Magento\Framework\GraphQl\Schema\SchemaGenerator;
- use Magento\Framework\ObjectManagerInterface;
-@@ -34,6 +35,9 @@ class GraphQlReaderTest extends \PHPUnit\Framework\TestCase
-     /** @var  SerializerInterface */
-     private $jsonSerializer;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-@@ -175,12 +179,14 @@ QUERY;
-             'operationName' => 'IntrospectionQuery'
-         ];
-         /** @var Http $request */
--        $request = $this->objectManager->get(\Magento\Framework\App\Request\Http::class);
-+        $request = $this->objectManager->get(Http::class);
-         $request->setPathInfo('/graphql');
-+        $request->setMethod('POST');
-         $request->setContent(json_encode($postData));
-         $headers = $this->objectManager->create(\Zend\Http\Headers::class)
-             ->addHeaders(['Content-Type' => 'application/json']);
-         $request->setHeaders($headers);
-+
-         $response = $this->graphQlController->dispatch($request);
-         $output = $this->jsonSerializer->unserialize($response->getContent());
-         $expectedOutput = require __DIR__ . '/../_files/schema_response_sdl_description.php';
-@@ -191,6 +197,16 @@ QUERY;
-         $mergedSchemaResponseFields = array_merge($schemaResponseFieldsFirstHalf, $schemaResponseFieldsSecondHalf);
- 
-         foreach ($expectedOutput as $searchTerm) {
-+            $sortFields = ['inputFields', 'fields'];
-+            foreach ($sortFields as $sortField) {
-+                isset($searchTerm[$sortField]) && is_array($searchTerm[$sortField])
-+                    ? usort($searchTerm[$sortField], function ($a, $b) {
-+                        $cmpField = 'name';
-+                        return isset($a[$cmpField]) && isset($b[$cmpField])
-+                            ? strcmp($a[$cmpField], $b[$cmpField]) : 0;
-+                    }) : null;
-+            }
-+
-             $this->assertTrue(
-                 (in_array($searchTerm, $mergedSchemaResponseFields)),
-                 'Missing type in the response'
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
-index ef4612ea357..5668c1bef66 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
-@@ -7,11 +7,8 @@ declare(strict_types=1);
- 
- namespace Magento\Framework\GraphQl;
- 
--use Magento\Framework\App\Bootstrap;
- use Magento\Framework\App\Cache;
--use Magento\Framework\Config\FileResolverInterface;
- use Magento\Framework\GraphQl\Config\Config;
--use Magento\Framework\GraphQl\Config\ConfigElementInterface;
- use Magento\Framework\GraphQl\Config\Data\Argument;
- use Magento\Framework\GraphQl\Config\Data\Enum;
- use Magento\Framework\GraphQl\Config\Data\Field;
-@@ -19,9 +16,11 @@ use Magento\Framework\GraphQl\Config\Data\StructureInterface;
- use Magento\Framework\GraphQl\Config\Data\Type;
- use Magento\Framework\GraphQl\Config\Element\EnumValue;
- use Magento\Framework\GraphQl\Config\Element\InterfaceType;
--use Magento\Framework\GraphQl\Config\Element\TypeFactory;
- use Magento\Framework\ObjectManagerInterface;
- 
-+/**
-+ * Test of schema configuration reading and parsing
-+ */
- class GraphQlConfigTest extends \PHPUnit\Framework\TestCase
- {
-    /** @var \Magento\Framework\GraphQl\Config  */
-@@ -76,7 +75,12 @@ class GraphQlConfigTest extends \PHPUnit\Framework\TestCase
-                 ['response_field' => 'required', 'expected_value' => $queryFields[$fieldKey]->isRequired()],
-                 ['response_field' => 'isList', 'expected_value' => $queryFields[$fieldKey]->isList()],
-                 ['response_field' => 'resolver', 'expected_value' => $queryFields[$fieldKey]->getResolver()],
--                ['response_field' => 'description', 'expected_value' => $queryFields[$fieldKey]->getDescription()]
-+                ['response_field' => 'description', 'expected_value' => $queryFields[$fieldKey]->getDescription()],
-+                [
-+                    'response_field' => 'cache',
-+                    'expected_value' => $queryFields[$fieldKey]->getCache(),
-+                    'optional' => true
-+                ]
-             ];
-             $this->assertResponseFields($expectedOutputArray['Query']['fields'][$fieldKey], $fieldAssertionMap);
-             /** @var \Magento\Framework\GraphQl\Config\Element\Argument $queryFieldArguments */
-@@ -212,12 +216,15 @@ class GraphQlConfigTest extends \PHPUnit\Framework\TestCase
-                 $expectedValue,
-                 "Value of '{$responseField}' field must not be NULL"
-             );
--            $this->assertEquals(
--                $expectedValue,
--                $actualResponse[$responseField],
--                "Value of '{$responseField}' field in response does not match expected value: "
--                . var_export($expectedValue, true)
--            );
-+            $optionalField = isset($assertionData['optional']) ? $assertionData['optional'] : false;
-+            if (!$optionalField || isset($actualResponse[$responseField])) {
-+                $this->assertEquals(
-+                    $expectedValue,
-+                    $actualResponse[$responseField],
-+                    "Value of '{$responseField}' field in response does not match expected value: "
-+                    . var_export($expectedValue, true)
-+                );
-+            }
-         }
-     }
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/query_array_output.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/query_array_output.php
-index 9ebd0160240..c37632fe3e2 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/query_array_output.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/query_array_output.php
-@@ -31,8 +31,13 @@ return [
-                                 ],
-                                 'required' => false,
-                                 'isList' => false,
--                                'resolver' => 'Magento\\EavGraphQl\\Model\\Resolver\\CustomAttributeMetadata',
--                                'description' => 'Returns the attribute type, given an attribute code and entity type'
-+                                'resolver' => Magento\EavGraphQl\Model\Resolver\CustomAttributeMetadata::class,
-+                                'description' => 'Returns the attribute type, given an attribute code and entity type',
-+                                'cache' => [
-+                                    'cacheTag' => 'cat_test',
-+                                    'cacheIdentity' =>
-+                                        Magento\EavGraphQl\Model\Resolver\CustomAttributeMetadata::class
-+                                ]
-                         ],
-                         'products' => [
-                         'name' => 'products',
-@@ -95,7 +100,7 @@ return [
-                             ],
-                             'required' => false,
-                             'isList' => false,
--                            'resolver' => 'Magento\\CatalogGraphQl\\Model\\Resolver\\Products',
-+                            'resolver' => Magento\CatalogGraphQl\Model\Resolver\Products::class,
-                             'description' => 'comment for products fields'
-                         ]
-                 ]
-@@ -274,7 +279,7 @@ return [
- 
-                         ]
-                 ],
--                'typeResolver' => 'Magento\\CatalogGraphQl\\Model\\ProductLinkTypeResolverComposite',
-+                'typeResolver' => Magento\CatalogGraphQl\Model\ProductLinkTypeResolverComposite::class,
-                 'description' => 'description for ProductLinksInterface'
-         ]
- ];
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaA.graphqls b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaA.graphqls
-index 6c832e5f122..0ebe4caa94a 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaA.graphqls
-+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaA.graphqls
-@@ -8,7 +8,6 @@ type Mutation {
- 
- input FilterTypeInput @doc(description:"Comment for FilterTypeInput") {
-     eq: String @doc(description:"Equal")
--    finset: [String]
-     from: String
-     gt: String
-     gteq: String
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaC.graphqls b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaC.graphqls
-index 84609293f31..d1d69870355 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaC.graphqls
-+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaC.graphqls
-@@ -1,6 +1,6 @@
- type Query {
-     customAttributeMetadata(attributes: [AttributeInput!]!): CustomAttributeMetadata @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\CustomAttributeMetadata")
--    @doc(description: "Returns the attribute type, given an attribute code and entity type")
-+    @doc(description: "Returns the attribute type, given an attribute code and entity type") @cache(cacheTag: "cat_test", cacheIdentity: "Magento\\EavGraphQl\\Model\\Resolver\\CustomAttributeMetadata")
- }
- 
- type CustomAttributeMetadata {
-@@ -19,7 +19,6 @@ type Attribute @doc(description: "Attribute contains the attribute_type of the s
- }
- input FilterTypeInput @doc(description:"Comment for FilterTypeInput") {
-     eq: String @doc(description:"Equal")
--    finset: [String]
-     from: String
-     gt: String
-     gteq: String
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_response_sdl_description.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_response_sdl_description.php
-index 0a73b8ed445..03dbac44744 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_response_sdl_description.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_response_sdl_description.php
-@@ -505,20 +505,6 @@ return [
-                 ],
-                 'defaultValue' =>  null
-             ],
--            [
--                'name' =>  'finset',
--                'description' =>  '',
--                'type' =>  [
--                    'kind' =>  'LIST',
--                    'name' =>  null,
--                    'ofType' =>  [
--                        'kind' =>  'SCALAR',
--                        'name' =>  'String',
--                        'ofType' =>  null
--                    ]
--                ],
--                'defaultValue' =>  null
--            ],
-             [
-                 'name' =>  'from',
-                 'description' =>  '',
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_with_description_sdl.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_with_description_sdl.php
-index 2aeb8f3d144..969c2cceb0a 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_with_description_sdl.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_with_description_sdl.php
-@@ -505,20 +505,6 @@ return [
-                 ],
-                 'defaultValue' =>  null
-             ],
--            [
--                'name' =>  'finset',
--                'description' =>  '',
--                'type' =>  [
--                    'kind' =>  'LIST',
--                    'name' =>  null,
--                    'ofType' =>  [
--                        'kind' =>  'SCALAR',
--                        'name' =>  'String',
--                        'ofType' =>  null
--                    ]
--                ],
--                'defaultValue' =>  null
--            ],
-             [
-                 'name' =>  'from',
-                 'description' =>  '',
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/HTTP/AsyncClientInterfaceTest.php b/dev/tests/integration/testsuite/Magento/Framework/HTTP/AsyncClientInterfaceTest.php
-new file mode 100644
-index 00000000000..c439122209f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Framework/HTTP/AsyncClientInterfaceTest.php
-@@ -0,0 +1,77 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\HTTP;
-+
-+use Magento\Framework\HTTP\AsyncClient\Request;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Testing asynchronous HTTP client.
-+ */
-+class AsyncClientInterfaceTest extends TestCase
-+{
-+    /**
-+     * @var AsyncClientInterface
-+     */
-+    private $client;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->client = Bootstrap::getObjectManager()->get(AsyncClientInterface::class);
-+    }
-+
-+    /**
-+     * Making a request.
-+     */
-+    public function testRequest(): void
-+    {
-+        $request = new Request('https://magento.com/home-page', Request::METHOD_GET, [], null);
-+        $response1 = $this->client->request($request);
-+        $response2 = $this->client->request($request);
-+        $this->assertEquals(200, $response2->get()->getStatusCode());
-+        $this->assertEquals(200, $response1->get()->getStatusCode());
-+        $this->assertContains('Magento. All Rights Reserved', $response1->get()->getBody());
-+        $this->assertContains('Magento. All Rights Reserved', $response2->get()->getBody());
-+        $date1 = new \DateTime($response1->get()->getHeaders()['date']);
-+        $date2 = new \DateTime($response2->get()->getHeaders()['date']);
-+        $this->assertLessThanOrEqual(1, abs($date1->format('U') - $date2->format('U')));
-+    }
-+
-+    /**
-+     * Test cancelling a request.
-+     *
-+     * @expectedException \Magento\Framework\Async\CancelingDeferredException
-+     * @expectedExceptionMessage Deferred is canceled
-+     */
-+    public function testCancel(): void
-+    {
-+        $request = new Request('https://magento.com/home-page', Request::METHOD_GET, [], null);
-+        $response = $this->client->request($request);
-+        $response->cancel(true);
-+        $this->assertTrue($response->isCancelled());
-+        $response->get();
-+    }
-+
-+    /**
-+     * Test failing cancelling a request.
-+     *
-+     * @expectedException \Magento\Framework\Async\CancelingDeferredException
-+     * @expectedExceptionMessage Failed to cancel HTTP request
-+     */
-+    public function testCancelFail(): void
-+    {
-+        $request = new Request('https://magento.com/home-page', Request::METHOD_GET, [], null);
-+        $response = $this->client->request($request);
-+        $response->cancel();
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
-index a85e5e7c894..281a038a5a9 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
-@@ -7,25 +7,35 @@ namespace Magento\Framework\Interception;
- 
- /**
-  * Class GeneralTest
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- abstract class AbstractPlugin extends \PHPUnit\Framework\TestCase
- {
-     /**
-+     * Config reader
-+     *
-      * @var \PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $_configReader;
- 
-     /**
-+     * Object Manager
-+     *
-      * @var \Magento\Framework\ObjectManagerInterface
-      */
-     protected $_objectManager;
- 
-     /**
-+     * Applicartion Object Manager
-+     *
-      * @var \Magento\Framework\ObjectManagerInterface
-      */
-     private $applicationObjectManager;
- 
-+    /**
-+     * Set up
-+     */
-     public function setUp()
-     {
-         if (!$this->_objectManager) {
-@@ -36,11 +46,19 @@ abstract class AbstractPlugin extends \PHPUnit\Framework\TestCase
-         \Magento\Framework\App\ObjectManager::setInstance($this->_objectManager);
-     }
- 
-+    /**
-+     * Tear down
-+     */
-     public function tearDown()
-     {
-         \Magento\Framework\App\ObjectManager::setInstance($this->applicationObjectManager);
-     }
- 
-+    /**
-+     * Set up Interception Config
-+     *
-+     * @param array $pluginConfig
-+     */
-     public function setUpInterceptionConfig($pluginConfig)
-     {
-         $config = new \Magento\Framework\Interception\ObjectManager\Config\Developer();
-@@ -59,7 +77,8 @@ abstract class AbstractPlugin extends \PHPUnit\Framework\TestCase
-         $areaList->expects($this->any())->method('getCodes')->will($this->returnValue([]));
-         $configScope = new \Magento\Framework\Config\Scope($areaList, 'global');
-         $cache = $this->createMock(\Magento\Framework\Config\CacheInterface::class);
--        $cache->expects($this->any())->method('load')->will($this->returnValue(false));
-+        $cacheManager = $this->createMock(\Magento\Framework\Interception\Config\CacheManager::class);
-+        $cacheManager->method('load')->willReturn(null);
-         $definitions = new \Magento\Framework\ObjectManager\Definition\Runtime();
-         $relations = new \Magento\Framework\ObjectManager\Relations\Runtime();
-         $interceptionConfig = new Config\Config(
-@@ -68,7 +87,10 @@ abstract class AbstractPlugin extends \PHPUnit\Framework\TestCase
-             $cache,
-             $relations,
-             $config,
--            $definitions
-+            $definitions,
-+            'interception',
-+            null,
-+            $cacheManager
-         );
-         $interceptionDefinitions = new Definition\Runtime();
-         $json = new \Magento\Framework\Serialize\Serializer\Json();
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Config/CacheManagerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Config/CacheManagerTest.php
-new file mode 100644
-index 00000000000..75737f01472
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Config/CacheManagerTest.php
-@@ -0,0 +1,135 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Interception\Config;
-+
-+use Magento\Framework\App\Filesystem\DirectoryList;
-+
-+class CacheManagerTest extends \PHPUnit\Framework\TestCase
-+{
-+    const CACHE_ID = 'interceptiontest';
-+
-+    /**
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var \Magento\Framework\Serialize\SerializerInterface
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @var \Magento\Framework\Cache\FrontendInterface
-+     */
-+    private $cache;
-+
-+    /**
-+     * @var \Magento\Framework\App\ObjectManager\ConfigWriterInterface
-+     */
-+    private $configWriter;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+        $this->serializer = $this->objectManager->get(\Magento\Framework\Serialize\SerializerInterface::class);
-+        $this->cache = $this->objectManager->get(\Magento\Framework\App\CacheInterface::class);
-+        $this->configWriter =
-+            $this->objectManager->get(\Magento\Framework\App\ObjectManager\ConfigWriter\Filesystem::class);
-+
-+        $this->initializeMetadataDirectory();
-+    }
-+
-+    /**
-+     * Delete compiled file if it was created and clear cache data
-+     */
-+    protected function tearDown()
-+    {
-+        $compiledPath = \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled::getFilePath(self::CACHE_ID);
-+        if (file_exists($compiledPath)) {
-+            unlink($compiledPath);
-+        }
-+
-+        $this->cache->remove(self::CACHE_ID);
-+    }
-+
-+    /**
-+     * Test load interception cache from generated/metadata
-+     * @dataProvider interceptionCompiledConfigDataProvider
-+     * @param array $testConfig
-+     */
-+    public function testInstantiateFromCompiled(array $testConfig)
-+    {
-+        $this->configWriter->write(self::CACHE_ID, $testConfig);
-+        $config = $this->getConfig();
-+
-+        $this->assertEquals($testConfig, $config->load(self::CACHE_ID));
-+    }
-+
-+    /**
-+     * Test load interception cache from backend cache
-+     * @dataProvider interceptionCacheConfigDataProvider
-+     * @param array $testConfig
-+     */
-+    public function testInstantiateFromCache(array $testConfig)
-+    {
-+        $this->cache->save($this->serializer->serialize($testConfig), self::CACHE_ID);
-+        $config = $this->getConfig();
-+
-+        $this->assertEquals($testConfig, $config->load(self::CACHE_ID));
-+    }
-+
-+    public function interceptionCompiledConfigDataProvider()
-+    {
-+        return [
-+            [['classA' => true, 'classB' => false]],
-+            [['classA' => false, 'classB' => true]],
-+        ];
-+    }
-+
-+    public function interceptionCacheConfigDataProvider()
-+    {
-+        return [
-+            [['classC' => true, 'classD' => false]],
-+            [['classC' => false, 'classD' => true]],
-+        ];
-+    }
-+
-+    /**
-+     * Ensure generated/metadata exists
-+     */
-+    private function initializeMetadataDirectory()
-+    {
-+        $diPath = DirectoryList::getDefaultConfig()[DirectoryList::GENERATED_METADATA][DirectoryList::PATH];
-+        $fullPath = BP . DIRECTORY_SEPARATOR . $diPath;
-+        if (!file_exists($fullPath)) {
-+            mkdir($fullPath);
-+        }
-+    }
-+
-+    /**
-+     * Create instance of Config class with specific cacheId. This is done to prevent our test
-+     * from altering the interception config that may have been generated during application
-+     * installation. Inject a new instance of the compileLoaded to bypass it's caching.
-+     *
-+     * @return \Magento\Framework\Interception\Config\CacheManager
-+     */
-+    private function getConfig()
-+    {
-+        return $this->objectManager->create(
-+            \Magento\Framework\Interception\Config\CacheManager::class,
-+            [
-+                'cacheId' => self::CACHE_ID,
-+                'compiledLoader' => $this->objectManager->create(
-+                    \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled::class
-+                ),
-+            ]
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php
-index 0a75aba5c9c..a35596cf0f9 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php
-@@ -8,7 +8,7 @@
- namespace Magento\Framework\Interception\Fixture;
- 
- /**
-- * @codingStandardsIgnoreStart
-+ * phpcs:ignoreFile
-  */
- class Intercepted extends InterceptedParent implements InterceptedInterface
- {
-@@ -49,7 +49,6 @@ class Intercepted extends InterceptedParent implements InterceptedInterface
- 
-     /**
-      * @SuppressWarnings(PHPMD.ShortMethodName)
--     * @SuppressWarnings(PHPMD.FinalImplementation) Suppressed as is a fixture but not a real code
-      */
-     final public function E($param1)
-     {
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/DatabaseTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/DatabaseTest.php
-new file mode 100644
-index 00000000000..f2a77db40ba
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/DatabaseTest.php
-@@ -0,0 +1,51 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock\Backend;
-+
-+/**
-+ * \Magento\Framework\Lock\Backend\Database test case
-+ */
-+class DatabaseTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Framework\Lock\Backend\Database
-+     */
-+    private $model;
-+
-+    /**
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $this->model = $this->objectManager->create(\Magento\Framework\Lock\Backend\Database::class);
-+    }
-+
-+    public function testLockAndUnlock()
-+    {
-+        $name = 'test_lock';
-+
-+        $this->assertFalse($this->model->isLocked($name));
-+
-+        $this->assertTrue($this->model->lock($name));
-+        $this->assertTrue($this->model->isLocked($name));
-+
-+        $this->assertTrue($this->model->unlock($name));
-+        $this->assertFalse($this->model->isLocked($name));
-+    }
-+
-+    public function testUnlockWithoutExistingLock()
-+    {
-+        $name = 'test_lock';
-+
-+        $this->assertFalse($this->model->isLocked($name));
-+        $this->assertFalse($this->model->unlock($name));
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileLockTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileLockTest.php
-new file mode 100644
-index 00000000000..e64b3c505ac
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileLockTest.php
-@@ -0,0 +1,55 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock\Backend;
-+
-+/**
-+ * \Magento\Framework\Lock\Backend\File test case
-+ */
-+class FileLockTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Framework\Lock\Backend\FileLock
-+     */
-+    private $model;
-+
-+    /**
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $this->model = $this->objectManager->create(
-+            \Magento\Framework\Lock\Backend\FileLock::class,
-+            ['path' => '/tmp']
-+        );
-+    }
-+
-+    public function testLockAndUnlock()
-+    {
-+        $name = 'test_lock';
-+
-+        $this->assertFalse($this->model->isLocked($name));
-+
-+        $this->assertTrue($this->model->lock($name));
-+        $this->assertTrue($this->model->isLocked($name));
-+        $this->assertFalse($this->model->lock($name, 2));
-+
-+        $this->assertTrue($this->model->unlock($name));
-+        $this->assertFalse($this->model->isLocked($name));
-+    }
-+
-+    public function testUnlockWithoutExistingLock()
-+    {
-+        $name = 'test_lock';
-+
-+        $this->assertFalse($this->model->isLocked($name));
-+        $this->assertFalse($this->model->unlock($name));
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
-new file mode 100644
-index 00000000000..8d0caad5d55
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
-@@ -0,0 +1,90 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock\Backend;
-+
-+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
-+use Magento\Framework\Lock\LockBackendFactory;
-+use Magento\Framework\Config\File\ConfigFilePool;
-+use Magento\Framework\App\DeploymentConfig\FileReader;
-+use Magento\Framework\Stdlib\ArrayManager;
-+
-+/**
-+ * \Magento\Framework\Lock\Backend\Zookeeper test case
-+ */
-+class ZookeeperTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var FileReader
-+     */
-+    private $configReader;
-+
-+    /**
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var LockBackendFactory
-+     */
-+    private $lockBackendFactory;
-+
-+    /**
-+     * @var ArrayManager
-+     */
-+    private $arrayManager;
-+
-+    /**
-+     * @var ZookeeperLock
-+     */
-+    private $model;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        if (!extension_loaded('zookeeper')) {
-+            $this->markTestSkipped('php extension Zookeeper is not installed.');
-+        }
-+
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $this->configReader = $this->objectManager->get(FileReader::class);
-+        $this->lockBackendFactory = $this->objectManager->create(LockBackendFactory::class);
-+        $this->arrayManager = $this->objectManager->create(ArrayManager::class);
-+        $config = $this->configReader->load(ConfigFilePool::APP_ENV);
-+
-+        if ($this->arrayManager->get('lock/provider', $config) !== 'zookeeper') {
-+            $this->markTestSkipped('Zookeeper is not configured during installation.');
-+        }
-+
-+        $this->model = $this->lockBackendFactory->create();
-+        $this->assertInstanceOf(ZookeeperLock::class, $this->model);
-+    }
-+
-+    public function testLockAndUnlock()
-+    {
-+        $name = 'test_lock';
-+
-+        $this->assertFalse($this->model->isLocked($name));
-+
-+        $this->assertTrue($this->model->lock($name));
-+        $this->assertTrue($this->model->isLocked($name));
-+        $this->assertFalse($this->model->lock($name, 2));
-+
-+        $this->assertTrue($this->model->unlock($name));
-+        $this->assertFalse($this->model->isLocked($name));
-+    }
-+
-+    public function testUnlockWithoutExistingLock()
-+    {
-+        $name = 'test_lock';
-+
-+        $this->assertFalse($this->model->isLocked($name));
-+        $this->assertFalse($this->model->unlock($name));
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php
-index 189d189d32c..c2521c27a0c 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Framework\MessageQueue;
- 
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\MessageQueue\PreconditionFailedException;
-+
- /**
-  * @see dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration
-  * @see dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride
-@@ -25,7 +28,12 @@ class TopologyTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
--        $this->helper = new \Magento\TestFramework\Helper\Amqp();
-+        $this->helper = Bootstrap::getObjectManager()->create(\Magento\TestFramework\Helper\Amqp::class);
-+
-+        if (!$this->helper->isAvailable()) {
-+            $this->fail('This test relies on RabbitMQ Management Plugin.');
-+        }
-+
-         $this->declaredExchanges = $this->helper->getExchanges();
-     }
- 
-@@ -39,6 +47,7 @@ class TopologyTest extends \PHPUnit\Framework\TestCase
-         $name = $expectedConfig['name'];
-         $this->assertArrayHasKey($name, $this->declaredExchanges);
-         unset($this->declaredExchanges[$name]['message_stats']);
-+        unset($this->declaredExchanges[$name]['user_who_performed_action']);
-         $this->assertEquals(
-             $expectedConfig,
-             $this->declaredExchanges[$name],
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/communication.xml b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/communication.xml
-index 0fc50f0432b..1cc5d6cd3b7 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/communication.xml
-+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/communication.xml
-@@ -7,6 +7,6 @@
- -->
- <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
-     <topic name="topic.broker.test" request="string" response="string">
--        <handler name="topicBrokerHandler" type="Magento\MysqlMq\Model\Processor" method="processMessage"/>
-+        <handler name="topicBrokerHandler" type="Magento\TestModuleMysqlMq\Model\Processor" method="processMessage"/>
-     </topic>
- </config>
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_expected_queue.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_expected_queue.php
-index b5f5145c32c..9a813b4424e 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_expected_queue.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_expected_queue.php
-@@ -40,7 +40,7 @@ return [
-             "name" => "publisher5.topic",
-             "schema" => [
-                 "schema_type" => "object",
--                "schema_value" => '\\' . \Magento\MysqlMq\Model\DataObject::class
-+                "schema_value" => '\\' . \Magento\TestModuleMysqlMq\Model\DataObject::class
-             ],
-             "response_schema" => [
-                 "schema_type" => "object",
-@@ -58,7 +58,7 @@ return [
-             "handlers" => [
-                 "topic.broker.test" => [
-                     "0" => [
--                        "type" => \Magento\MysqlMq\Model\Processor::class,
-+                        "type" => \Magento\TestModuleMysqlMq\Model\Processor::class,
-                         "method" => "processMessage"
-                     ]
-                 ]
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_queue_input.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_queue_input.php
-index fdd4a7d3007..ed6e13cfe9f 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_queue_input.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_queue_input.php
-@@ -23,11 +23,11 @@ return [
-                 "name" => "publisher5.topic",
-                 "schema" => [
-                     "schema_type" => "object",
--                    "schema_value" => "Magento\\MysqlMq\\Model\\DataObject"
-+                    "schema_value" => \Magento\TestModuleMysqlMq\Model\DataObject::class
-                 ],
-                 "response_schema" => [
-                     "schema_type" => "object",
--                    "schema_value" => "Magento\\Customer\\Api\\Data\\CustomerInterface"
-+                    "schema_value" => \Magento\Customer\Api\Data\CustomerInterface::class
-                 ],
-                 "publisher" => "test-publisher-5"
-             ]
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractTest.php
-index 419a7d04b77..2ee0953dcdb 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractTest.php
-@@ -72,4 +72,42 @@ class AbstractTest extends \PHPUnit\Framework\TestCase
-         $this->_model->addBindParam('code', 'admin');
-         $this->assertEquals(['0'], $this->_model->getAllIds());
-     }
-+
-+    /**
-+     * Check add field to select doesn't remove expression field from select.
-+     *
-+     * @return void
-+     */
-+    public function testAddExpressionFieldToSelectWithAdditionalFields()
-+    {
-+        $expectedColumns = ['code', 'test_field'];
-+        $actualColumns = [];
-+
-+        $testExpression = new \Zend_Db_Expr('(sort_order + group_id)');
-+        $this->_model->addExpressionFieldToSelect('test_field', $testExpression, ['sort_order', 'group_id']);
-+        $this->_model->addFieldToSelect('code', 'code');
-+        $columns = $this->_model->getSelect()->getPart(\Magento\Framework\DB\Select::COLUMNS);
-+        foreach ($columns as $columnEntry) {
-+            $actualColumns[] = $columnEntry[2];
-+        }
-+
-+        $this->assertEquals($expectedColumns, $actualColumns);
-+    }
-+
-+    /**
-+     * Check add expression field doesn't remove all fields from select.
-+     *
-+     * @return void
-+     */
-+    public function testAddExpressionFieldToSelectWithoutAdditionalFields()
-+    {
-+        $expectedColumns = ['*', 'test_field'];
-+
-+        $testExpression = new \Zend_Db_Expr('(sort_order + group_id)');
-+        $this->_model->addExpressionFieldToSelect('test_field', $testExpression, ['sort_order', 'group_id']);
-+        $columns = $this->_model->getSelect()->getPart(\Magento\Framework\DB\Select::COLUMNS);
-+        $actualColumns = [$columns[0][1], $columns[1][2]];
-+
-+        $this->assertEquals($expectedColumns, $actualColumns);
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php
-index b09af48b5f9..f4f3337a253 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php
-@@ -20,6 +20,10 @@ $installer = Bootstrap::getObjectManager()->create(
-     CategorySetup::class,
-     ['resourceName' => 'catalog_setup']
- );
-+$productEntityTypeId = $installer->getEntityTypeId(
-+    \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE
-+);
-+
- $selectOptions = [];
- $selectAttributes = [];
- foreach (range(1, 2) as $index) {
-@@ -30,7 +34,7 @@ foreach (range(1, 2) as $index) {
-     $selectAttribute->setData(
-         [
-             'attribute_code' => 'select_attribute_' . $index,
--            'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
-+            'entity_type_id' => $productEntityTypeId,
-             'is_global' => 1,
-             'is_user_defined' => 1,
-             'frontend_input' => 'select',
-@@ -56,7 +60,8 @@ foreach (range(1, 2) as $index) {
-     );
-     $selectAttribute->save();
-     /* Assign attribute to attribute set */
--    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $selectAttribute->getId());
-+    $installer->addAttributeToGroup($productEntityTypeId, 'Default', 'General', $selectAttribute->getId());
-+
-     /** @var $selectOptions Collection */
-     $selectOption = Bootstrap::getObjectManager()->create(
-         Collection::class
-@@ -65,6 +70,26 @@ foreach (range(1, 2) as $index) {
-     $selectAttributes[$index] = $selectAttribute;
-     $selectOptions[$index] = $selectOption;
- }
-+
-+$dateAttribute = Bootstrap::getObjectManager()->create(Attribute::class);
-+$dateAttribute->setData(
-+    [
-+        'attribute_code' => 'date_attribute',
-+        'entity_type_id' => $productEntityTypeId,
-+        'is_global' => 1,
-+        'is_filterable' => 1,
-+        'backend_type' => 'datetime',
-+        'frontend_input' => 'date',
-+        'frontend_label' => 'Test Date',
-+        'is_searchable' => 1,
-+        'is_filterable_in_search' => 1,
-+    ]
-+);
-+$dateAttribute->save();
-+/* Assign attribute to attribute set */
-+$installer->addAttributeToGroup($productEntityTypeId, 'Default', 'General', $dateAttribute->getId());
-+
-+$productAttributeSetId = $installer->getAttributeSetId($productEntityTypeId, 'Default');
- /* Create simple products per each first attribute option */
- foreach ($selectOptions[1] as $option) {
-     /** @var $product Product */
-@@ -74,7 +99,7 @@ foreach ($selectOptions[1] as $option) {
-     $product->setTypeId(
-         Type::TYPE_SIMPLE
-     )->setAttributeSetId(
--        $installer->getAttributeSetId('catalog_product', 'Default')
-+        $productAttributeSetId
-     )->setWebsiteIds(
-         [1]
-     )->setName(
-@@ -92,6 +117,7 @@ foreach ($selectOptions[1] as $option) {
-     )->setStockData(
-         ['use_config_manage_stock' => 1, 'qty' => 5, 'is_in_stock' => 1]
-     )->save();
-+
-     Bootstrap::getObjectManager()->get(
-         Action::class
-     )->updateAttributes(
-@@ -99,6 +125,7 @@ foreach ($selectOptions[1] as $option) {
-         [
-             $selectAttributes[1]->getAttributeCode() => $option->getId(),
-             $selectAttributes[2]->getAttributeCode() => $selectOptions[2]->getLastItem()->getId(),
-+            $dateAttribute->getAttributeCode() => '10/30/2000',
-         ],
-         $product->getStoreId()
-     );
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes_rollback.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes_rollback.php
-index 18a5372d06d..fd413726b26 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes_rollback.php
-@@ -13,6 +13,7 @@ use Magento\TestFramework\Helper\Bootstrap;
- $registry = Bootstrap::getObjectManager()->get(Registry::class);
- $registry->unregister('isSecureArea');
- $registry->register('isSecureArea', true);
-+
- /** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product\Collection */
- $productCollection = Bootstrap::getObjectManager()
-     ->create(Product::class)
-@@ -20,17 +21,26 @@ $productCollection = Bootstrap::getObjectManager()
- foreach ($productCollection as $product) {
-     $product->delete();
- }
-+
- /** @var $attribute Attribute */
- $attribute = Bootstrap::getObjectManager()->create(
-     Attribute::class
- );
- /** @var $installer CategorySetup */
- $installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
-+$productEntityTypeId = $installer->getEntityTypeId(
-+    \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE
-+);
- foreach (range(1, 2) as $index) {
--    $attribute->loadByCode($installer->getEntityTypeId('catalog_product'), 'select_attribute_' . $index);
-+    $attribute->loadByCode($productEntityTypeId, 'select_attribute_' . $index);
-     if ($attribute->getId()) {
-         $attribute->delete();
-     }
- }
-+$attribute->loadByCode($productEntityTypeId, 'date_attribute');
-+if ($attribute->getId()) {
-+    $attribute->delete();
-+}
-+
- $registry->unregister('isSecureArea');
- $registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
-index 8586f47a0f7..0aaa3f4e15b 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
-@@ -35,6 +35,7 @@ return [
-             'match_query' => [
-                 'value' => '$match_term_override$',
-                 'name' => 'match_query',
-+                'boost' => '1',
-                 'match' => [
-                     0 => [
-                         'field' => 'match_field',
-@@ -50,6 +51,7 @@ return [
-             ],
-             'must_query' => [
-                 'name' => 'must_query',
-+                'boost' => '1',
-                 'filterReference' =>  [
-                     0 => [
-                         'clause' => 'must',
-@@ -60,6 +62,7 @@ return [
-             ],
-             'should_query' => [
-                 'name' => 'should_query',
-+                'boost' => '1',
-                 'filterReference' => [
-                     0 => [
-                         'clause' => 'should',
-@@ -70,6 +73,7 @@ return [
-             ],
-             'not_query' => [
-                 'name' => 'not_query',
-+                'boost' => '1',
-                 'filterReference' => [
-                     0 => [
-                         'clause' => 'not',
-@@ -80,6 +84,7 @@ return [
-             ],
-             'match_query_2' => [
-                 'value' => '$match_term_override$',
-+                'boost' => '1',
-                 'name' => 'match_query_2',
-                 'match' => [
-                     0 => [
-@@ -163,6 +168,7 @@ return [
-         'queries' => [
-             'filter_query' => [
-                 'name' => 'filter_query',
-+                'boost' => '1',
-                 'filterReference' => [
-                     0 =>
-                         [
-@@ -230,6 +236,7 @@ return [
-             'new_match_query' => [
-                 'value' => '$match_term$',
-                 'name' => 'new_match_query',
-+                'boost' => '1',
-                 'match' => [
-                     0 =>
-                         [
-diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
-index e9284225284..5e70eb491b5 100644
---- a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
-@@ -114,7 +114,7 @@ class SidResolverTest extends \PHPUnit\Framework\TestCase
-         $this->scopeConfig->expects(
-             $this->any()
-         )->method(
--            'getValue'
-+            'isSetFlag'
-         )->with(
-             \Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
-             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-@@ -195,7 +195,7 @@ class SidResolverTest extends \PHPUnit\Framework\TestCase
-         $this->scopeConfig->expects(
-             $this->any()
-         )->method(
--            'getValue'
-+            'isSetFlag'
-         )->with(
-             \Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
-             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-diff --git a/dev/tests/integration/testsuite/Magento/GiftMessage/Observer/SalesEventQuoteMergeTest.php b/dev/tests/integration/testsuite/Magento/GiftMessage/Observer/SalesEventQuoteMergeTest.php
-new file mode 100644
-index 00000000000..0902c35568e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GiftMessage/Observer/SalesEventQuoteMergeTest.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GiftMessage\Observer;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\Event\ManagerInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\Quote;
-+
-+class SalesEventQuoteMergeTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @magentoAppArea frontend
-+     */
-+    public function testQuoteMerge()
-+    {
-+        $giftMessageId = 6;
-+        $objectManager = Bootstrap::getObjectManager();
-+        $eventManager = $objectManager->get(ManagerInterface::class);
-+        /** @var Quote $sourceQuote */
-+        $sourceQuote = $objectManager->create(QuoteFactory::class)->create();
-+        $targetQuote = clone($sourceQuote);
-+        $sourceQuote->setGiftMessageId($giftMessageId);
-+
-+        $eventManager->dispatch(
-+            'sales_quote_merge_after',
-+            [
-+                'quote' => $targetQuote,
-+                'source' => $sourceQuote
-+            ]
-+        );
-+
-+        self::assertEquals($giftMessageId, $targetQuote->getGiftMessageId());
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message_rollback.php b/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message_rollback.php
-index 22307b4d839..cd17183be7f 100644
---- a/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message_rollback.php
-@@ -20,7 +20,7 @@ foreach ($quote->getAllItems() as $item) {
-     if ($product->getId()) {
-         $product->delete();
-     }
--};
-+}
- $quote->delete();
- $registry->unregister('isSecureArea');
- $registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
-new file mode 100644
-index 00000000000..9968704517e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
-@@ -0,0 +1,26 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Tax\Model\ClassModel as TaxClassModel;
-+use Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory as TaxClassCollectionFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+$product = $productRepository->get('simple_product');
-+
-+/** @var TaxClassCollectionFactory $taxClassCollectionFactory */
-+$taxClassCollectionFactory = $objectManager->get(TaxClassCollectionFactory::class);
-+$taxClassCollection = $taxClassCollectionFactory->create();
-+
-+/** @var TaxClassModel $taxClass */
-+$taxClassCollection->addFieldToFilter('class_type', TaxClassModel::TAX_CLASS_TYPE_PRODUCT);
-+$taxClass = $taxClassCollection->getFirstItem();
-+
-+$product->setCustomAttribute('tax_class_id', $taxClass->getClassId());
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_custom_options_simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_custom_options_simple_product.php
-new file mode 100644
-index 00000000000..618ed0e2560
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_custom_options_simple_product.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-+use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+$productCustomOptions = [];
-+$optionsSet = [
-+    [
-+        'title' => 'test_option_code_1',
-+        'type' => 'field',
-+        'is_require' => false,
-+        'sort_order' => 1,
-+        'price' => -10.0,
-+        'price_type' => 'fixed',
-+        'sku' => 'sku1',
-+        'max_characters' => 100,
-+    ],
-+    [
-+        'title' => 'area option',
-+        'type' => 'area',
-+        'is_require' => false,
-+        'sort_order' => 2,
-+        'price' => 20.0,
-+        'price_type' => 'percent',
-+        'sku' => 'sku2',
-+        'max_characters' => 100
-+    ]
-+];
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+$product = $productRepository->get('simple_product');
-+/** @var ProductCustomOptionInterfaceFactory $customOptionFactory */
-+$customOptionFactory = $objectManager->get(ProductCustomOptionInterfaceFactory::class);
-+
-+foreach ($optionsSet as $option) {
-+    /** @var ProductCustomOptionInterface $customOption */
-+    $customOption = $customOptionFactory->create(['data' => $option]);
-+    $customOption->setProductSku($product->getSku());
-+
-+    $productCustomOptions[] = $customOption;
-+}
-+
-+$product->setOptions($productCustomOptions);
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
-new file mode 100644
-index 00000000000..f465f482275
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+
-+$product = $productRepository->get('simple_product');
-+$extensionAttributes = $product->getExtensionAttributes();
-+$stockItem = $extensionAttributes->getStockItem();
-+$stockItem->setIsInStock(false);
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_weight_to_simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_weight_to_simple_product.php
-new file mode 100644
-index 00000000000..a9a1f617970
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_weight_to_simple_product.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+
-+$product = $productRepository->get('simple_product');
-+$product->setWeight(1.0);
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product.php
-new file mode 100644
-index 00000000000..732c18d4d73
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product.php
-@@ -0,0 +1,45 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\Catalog\Model\Product\Type;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ProductInterfaceFactory $productFactory */
-+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
-+/** @var DataObjectHelper $dataObjectHelper */
-+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+
-+$product = $productFactory->create();
-+$productData = [
-+    ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
-+    ProductInterface::ATTRIBUTE_SET_ID => 4,
-+    ProductInterface::SKU => 'simple_product',
-+    ProductInterface::NAME => 'Simple Product',
-+    ProductInterface::PRICE => 10,
-+    ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH,
-+    ProductInterface::STATUS => Status::STATUS_ENABLED,
-+];
-+$dataObjectHelper->populateWithArray($product, $productData, ProductInterface::class);
-+/** Out of interface */
-+$product
-+    ->setWebsiteIds([1])
-+    ->setStockData([
-+        'qty' => 85.5,
-+        'is_in_stock' => true,
-+        'manage_stock' => true,
-+        'is_qty_decimal' => true
-+    ]);
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_rollback.php
-new file mode 100644
-index 00000000000..9a54f663c9c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_rollback.php
-@@ -0,0 +1,31 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+/** @var Registry $registry */
-+$registry = $objectManager->get(Registry::class);
-+
-+$currentArea = $registry->registry('isSecureArea');
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+try {
-+    $productRepository->deleteById('simple_product');
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+    /**
-+     * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
-+     */
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', $currentArea);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_without_visibility.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_without_visibility.php
-new file mode 100644
-index 00000000000..e43a546e4f4
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_without_visibility.php
-@@ -0,0 +1,47 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\Catalog\Model\Product\Type;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ProductInterfaceFactory $productFactory */
-+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
-+/** @var DataObjectHelper $dataObjectHelper */
-+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+
-+$product = $productFactory->create();
-+$productData = [
-+    ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
-+    ProductInterface::ATTRIBUTE_SET_ID => 4,
-+    ProductInterface::SKU => 'simple_product_without_visibility',
-+    ProductInterface::NAME => 'Simple Product Not Visible',
-+    ProductInterface::PRICE => 10,
-+    ProductInterface::VISIBILITY => Visibility::VISIBILITY_NOT_VISIBLE,
-+    ProductInterface::STATUS => Status::STATUS_ENABLED,
-+];
-+$dataObjectHelper->populateWithArray($product, $productData, ProductInterface::class);
-+/** Out of interface */
-+$product
-+    ->setWebsiteIds([1])
-+    ->setStockData(
-+        [
-+            'qty' => 85.5,
-+            'is_in_stock' => true,
-+            'manage_stock' => true,
-+            'is_qty_decimal' => true
-+        ]
-+    );
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_without_visibility_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_without_visibility_rollback.php
-new file mode 100644
-index 00000000000..47f3ad6c5d4
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_without_visibility_rollback.php
-@@ -0,0 +1,32 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+/** @var Registry $registry */
-+$registry = $objectManager->get(Registry::class);
-+
-+$currentArea = $registry->registry('isSecureArea');
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+try {
-+    $productRepository->deleteById('simple_product_without_visibility');
-+// phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+    /**
-+     * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
-+     */
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', $currentArea);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/virtual_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/virtual_product.php
-new file mode 100644
-index 00000000000..e4472464e17
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/virtual_product.php
-@@ -0,0 +1,45 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\Catalog\Model\Product\Type;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ProductInterfaceFactory $productFactory */
-+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
-+/** @var DataObjectHelper $dataObjectHelper */
-+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+
-+$product = $productFactory->create();
-+$productData = [
-+    ProductInterface::TYPE_ID => Type::TYPE_VIRTUAL,
-+    ProductInterface::ATTRIBUTE_SET_ID => 4,
-+    ProductInterface::SKU => 'virtual_product',
-+    ProductInterface::NAME => 'Virtual Product',
-+    ProductInterface::PRICE => 10,
-+    ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH,
-+    ProductInterface::STATUS => Status::STATUS_ENABLED,
-+];
-+$dataObjectHelper->populateWithArray($product, $productData, ProductInterface::class);
-+/** Out of interface */
-+$product
-+    ->setWebsiteIds([1])
-+    ->setStockData([
-+        'qty' => 85.5,
-+        'is_in_stock' => true,
-+        'manage_stock' => true,
-+        'is_qty_decimal' => true
-+    ]);
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/virtual_product_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/virtual_product_rollback.php
-new file mode 100644
-index 00000000000..f8d329f5746
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/virtual_product_rollback.php
-@@ -0,0 +1,31 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+/** @var Registry $registry */
-+$registry = $objectManager->get(Registry::class);
-+
-+$currentArea = $registry->registry('isSecureArea');
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+try {
-+    $productRepository->deleteById('virtual_product');
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+    /**
-+     * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
-+     */
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', $currentArea);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
-index 16a15cfcd2e..d0d746812ec 100644
---- a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
-@@ -38,6 +38,9 @@ class GraphQlControllerTest extends \Magento\TestFramework\Indexer\TestCase
-     /** @var MetadataPool */
-     private $metadataPool;
- 
-+    /** @var Http */
-+    private $request;
-+
-     public static function setUpBeforeClass()
-     {
-         $db = Bootstrap::getInstance()->getBootstrap()
-@@ -57,6 +60,7 @@ class GraphQlControllerTest extends \Magento\TestFramework\Indexer\TestCase
-         $this->graphql = $this->objectManager->get(\Magento\GraphQl\Controller\GraphQl::class);
-         $this->jsonSerializer = $this->objectManager->get(SerializerInterface::class);
-         $this->metadataPool = $this->objectManager->get(MetadataPool::class);
-+        $this->request = $this->objectManager->get(Http::class);
-     }
- 
-     /**
-@@ -86,27 +90,120 @@ class GraphQlControllerTest extends \Magento\TestFramework\Indexer\TestCase
-        }
- QUERY;
-         $postData = [
--            'query'         => $query,
--            'variables'     => null,
-+            'query' => $query,
-+            'variables' => null,
-             'operationName' => null
-         ];
--        /** @var Http $request */
--        $request = $this->objectManager->get(\Magento\Framework\App\Request\Http::class);
--        $request->setPathInfo('/graphql');
--        $request->setContent(json_encode($postData));
-+
-+        $this->request->setPathInfo('/graphql');
-+        $this->request->setMethod('POST');
-+        $this->request->setContent(json_encode($postData));
-         $headers = $this->objectManager->create(\Zend\Http\Headers::class)
-             ->addHeaders(['Content-Type' => 'application/json']);
--        $request->setHeaders($headers);
--        $response = $this->graphql->dispatch($request);
-+        $this->request->setHeaders($headers);
-+        $response = $this->graphql->dispatch($this->request);
-         $output = $this->jsonSerializer->unserialize($response->getContent());
-         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
- 
-         $this->assertArrayNotHasKey('errors', $output, 'Response has errors');
--        $this->assertTrue(!empty($output['data']['products']['items']), 'Products array has items');
--        $this->assertTrue(!empty($output['data']['products']['items'][0]), 'Products array has items');
--        $this->assertEquals($output['data']['products']['items'][0]['id'], $product->getData($linkField));
--        $this->assertEquals($output['data']['products']['items'][0]['sku'], $product->getSku());
--        $this->assertEquals($output['data']['products']['items'][0]['name'], $product->getName());
-+        $this->assertNotEmpty($output['data']['products']['items'], 'Products array has items');
-+        $this->assertNotEmpty($output['data']['products']['items'][0], 'Products array has items');
-+        $this->assertEquals($product->getData($linkField), $output['data']['products']['items'][0]['id']);
-+        $this->assertEquals($product->getSku(), $output['data']['products']['items'][0]['sku']);
-+        $this->assertEquals($product->getName(), $output['data']['products']['items'][0]['name']);
-+    }
-+
-+    /**
-+     * Test request is dispatched and response generated when using GET request with query string
-+     *
-+     * @return void
-+     */
-+    public function testDispatchWithGet() : void
-+    {
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-+
-+        /** @var ProductInterface $product */
-+        $product = $productRepository->get('simple1');
-+
-+        $query
-+            = <<<QUERY
-+ {
-+           products(filter: {sku: {eq: "simple1"}})
-+           {
-+               items {
-+                   id
-+                   name
-+                   sku
-+               }
-+           }
-+       }
-+QUERY;
-+
-+        $this->request->setPathInfo('/graphql');
-+        $this->request->setMethod('GET');
-+        $this->request->setQueryValue('query', $query);
-+        $response = $this->graphql->dispatch($this->request);
-+        $output = $this->jsonSerializer->unserialize($response->getContent());
-+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-+
-+        $this->assertArrayNotHasKey('errors', $output, 'Response has errors');
-+        $this->assertNotEmpty($output['data']['products']['items'], 'Products array has items');
-+        $this->assertNotEmpty($output['data']['products']['items'][0], 'Products array has items');
-+        $this->assertEquals($product->getData($linkField), $output['data']['products']['items'][0]['id']);
-+        $this->assertEquals($product->getSku(), $output['data']['products']['items'][0]['sku']);
-+        $this->assertEquals($product->getName(), $output['data']['products']['items'][0]['name']);
-+    }
-+
-+    /** Test request is dispatched and response generated when using GET request with parameterized query string
-+     *
-+     * @return void
-+     */
-+    public function testDispatchGetWithParameterizedVariables() : void
-+    {
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-+
-+        /** @var ProductInterface $product */
-+        $product = $productRepository->get('simple1');
-+        $query = <<<QUERY
-+query GetProducts(\$filterInput:ProductFilterInput){
-+    products(
-+        filter:\$filterInput
-+    ){
-+        items{
-+            id
-+            name
-+            sku
-+        }  
-+    }
-+}
-+QUERY;
-+
-+        $variables = [
-+            'filterInput' => [
-+                'sku' => ['eq' => 'simple1']
-+            ]
-+        ];
-+        $queryParams = [
-+            'query' => $query,
-+            'variables' => json_encode($variables),
-+            'operationName' => 'GetProducts'
-+        ];
-+
-+        $this->request->setPathInfo('/graphql');
-+        $this->request->setMethod('GET');
-+        $this->request->setParams($queryParams);
-+        $response = $this->graphql->dispatch($this->request);
-+        $output = $this->jsonSerializer->unserialize($response->getContent());
-+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-+
-+        $this->assertArrayNotHasKey('errors', $output, 'Response has errors');
-+        $this->assertNotEmpty($output['data']['products']['items'], 'Products array has items');
-+        $this->assertNotEmpty($output['data']['products']['items'][0], 'Products array has items');
-+        $this->assertEquals($product->getData($linkField), $output['data']['products']['items'][0]['id']);
-+        $this->assertEquals($product->getSku(), $output['data']['products']['items'][0]['sku']);
-+        $this->assertEquals($product->getName(), $output['data']['products']['items'][0]['name']);
-     }
- 
-     /**
-@@ -116,7 +213,6 @@ QUERY;
-      */
-     public function testError() : void
-     {
--        $this->markTestSkipped('Causes failiure with php unit and php 7.2');
-         $query
-             = <<<QUERY
-   {
-@@ -137,25 +233,25 @@ QUERY;
- QUERY;
- 
-         $postData = [
--            'query'         => $query,
--            'variables'     => null,
-+            'query' => $query,
-+            'variables' => null,
-             'operationName' => null
-         ];
--        /** @var Http $request */
--        $request = $this->objectManager->get(\Magento\Framework\App\Request\Http::class);
--        $request->setPathInfo('/graphql');
--        $request->setContent(json_encode($postData));
-+
-+        $this->request->setPathInfo('/graphql');
-+        $this->request->setMethod('POST');
-+        $this->request->setContent(json_encode($postData));
-         $headers = $this->objectManager->create(\Zend\Http\Headers::class)
-             ->addHeaders(['Content-Type' => 'application/json']);
--        $request->setHeaders($headers);
--        $response = $this->graphql->dispatch($request);
-+        $this->request->setHeaders($headers);
-+        $response = $this->graphql->dispatch($this->request);
-         $outputResponse = $this->jsonSerializer->unserialize($response->getContent());
-         if (isset($outputResponse['errors'][0])) {
-             if (is_array($outputResponse['errors'][0])) {
-                 foreach ($outputResponse['errors'] as $error) {
-                     $this->assertEquals(
--                        $error['category'],
--                        \Magento\Framework\GraphQl\Exception\GraphQlInputException::EXCEPTION_CATEGORY
-+                        \Magento\Framework\GraphQl\Exception\GraphQlInputException::EXCEPTION_CATEGORY,
-+                        $error['category']
-                     );
-                     if (isset($error['message'])) {
-                         $this->assertEquals($error['message'], 'Invalid entity_type specified: invalid');
-@@ -169,12 +265,4 @@ QUERY;
-             }
-         }
-     }
--
--    /**
--     * teardown
--     */
--    public function tearDown()
--    {
--        parent::tearDown();
--    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Customer/_files/enable_customer_account_confirmation.php b/dev/tests/integration/testsuite/Magento/GraphQl/Customer/_files/enable_customer_account_confirmation.php
-new file mode 100644
-index 00000000000..41f2b210b32
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Customer/_files/enable_customer_account_confirmation.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Customer\Model\AccountConfirmation;
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer $configWriter */
-+$configWriter = $objectManager->get(WriterInterface::class);
-+
-+$configWriter->save(AccountConfirmation::XML_PATH_IS_CONFIRM, 1);
-+
-+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-+$scopeConfig->clean();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Customer/_files/enable_customer_account_confirmation_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Customer/_files/enable_customer_account_confirmation_rollback.php
-new file mode 100644
-index 00000000000..72db06406b4
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Customer/_files/enable_customer_account_confirmation_rollback.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer  $configWriter */
-+$configWriter = $objectManager->create(WriterInterface::class);
-+
-+$configWriter->delete('customer/create_account/confirm');
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/FedEx/_files/enable_fedex_shipping_method.php b/dev/tests/integration/testsuite/Magento/GraphQl/FedEx/_files/enable_fedex_shipping_method.php
-new file mode 100644
-index 00000000000..1c977dacc6c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/FedEx/_files/enable_fedex_shipping_method.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer $configWriter */
-+$configWriter = $objectManager->get(WriterInterface::class);
-+
-+$configWriter->save('carriers/fedex/active', '1');
-+$configWriter->save('carriers/fedex/sandbox_mode', '1');
-+$configWriter->save(\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_ZIP, '90210');
-+
-+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-+$scopeConfig->clean();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/FedEx/_files/enable_fedex_shipping_method_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/FedEx/_files/enable_fedex_shipping_method_rollback.php
-new file mode 100644
-index 00000000000..daba4803f8b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/FedEx/_files/enable_fedex_shipping_method_rollback.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer  $configWriter */
-+$configWriter = $objectManager->create(WriterInterface::class);
-+
-+$configWriter->delete('carriers/fedex/active');
-+$configWriter->delete('carriers/fedex/account');
-+$configWriter->delete('carriers/fedex/meter_number');
-+$configWriter->delete('carriers/fedex/key');
-+$configWriter->delete('carriers/fedex/password');
-+$configWriter->delete('carriers/fedex/sandbox_mode');
-+$configWriter->delete(\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_ZIP);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
-new file mode 100644
-index 00000000000..9bb9bef9bdb
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
-@@ -0,0 +1,64 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Quote;
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+
-+/**
-+ * Get masked quote id by reserved order id
-+ */
-+class GetMaskedQuoteIdByReservedOrderId
-+{
-+    /**
-+     * @var QuoteFactory
-+     */
-+    private $quoteFactory;
-+
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteIdInterface
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    /**
-+     * @param QuoteFactory $quoteFactory
-+     * @param QuoteResource $quoteResource
-+     * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedId
-+     */
-+    public function __construct(
-+        QuoteFactory $quoteFactory,
-+        QuoteResource $quoteResource,
-+        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedId
-+    ) {
-+        $this->quoteFactory = $quoteFactory;
-+        $this->quoteResource = $quoteResource;
-+        $this->quoteIdToMaskedId = $quoteIdToMaskedId;
-+    }
-+
-+    /**
-+     * Get masked quote id by reserved order id
-+     *
-+     * @param string $reservedOrderId
-+     * @return string
-+     * @throws NoSuchEntityException
-+     */
-+    public function execute(string $reservedOrderId): string
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-+
-+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php
-new file mode 100644
-index 00000000000..f62b463d940
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var CartRepositoryInterface $cartRepository */
-+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-+
-+$product = $productRepository->get('simple_product');
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$quote->addProduct($product, 2);
-+$cartRepository->save($quote);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product_with_options.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product_with_options.php
-new file mode 100644
-index 00000000000..ecd1428a5d6
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product_with_options.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product\Option as ProductOption;
-+use Magento\Catalog\Model\Product\OptionFactory;
-+use Magento\Framework\DataObjectFactory;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var CartRepositoryInterface $cartRepository */
-+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-+/** @var OptionFactory  $productOptionFactory */
-+$productOptionFactory = Bootstrap::getObjectManager()->get(OptionFactory::class);
-+/** @var DataObjectFactory $dataObjectFactory */
-+$dataObjectFactory = Bootstrap::getObjectManager()->get(DataObjectFactory::class);
-+
-+/** @var ProductOption $productOption */
-+$productOption = $productOptionFactory->create();
-+$product = $productRepository->get('simple_product');
-+$productOptions = $productOption->getProductOptionCollection($product);
-+$cartItemCustomOptions = [];
-+
-+/** @var ProductOption  $productOption */
-+foreach ($productOptions as $productOption) {
-+    $cartItemCustomOptions[$productOption->getId()] = 'initial value';
-+}
-+
-+$request = $dataObjectFactory->create(
-+    [
-+        'data' => [
-+            'qty' => 1.0,
-+            'options' => $cartItemCustomOptions,
-+        ],
-+    ]
-+);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$quote->addProduct($product, $request);
-+$cartRepository->save($quote);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_virtual_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_virtual_product.php
-new file mode 100644
-index 00000000000..f597d0bffa7
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_virtual_product.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var CartRepositoryInterface $cartRepository */
-+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-+
-+$product = $productRepository->get('virtual-product');
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$quote->addProduct($product, 2);
-+$cartRepository->save($quote);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon.php
-new file mode 100644
-index 00000000000..c70efa9a12a
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Api\CouponManagementInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var CouponManagementInterface $couponManagement */
-+$couponManagement = Bootstrap::getObjectManager()->get(CouponManagementInterface::class);
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$couponManagement->set($quote->getId(), '2?ds5!2d');
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon_rollback.php
-new file mode 100644
-index 00000000000..5431c25b7df
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon_rollback.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Api\CouponManagementInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var CouponManagementInterface $couponManagement */
-+$couponManagement = Bootstrap::getObjectManager()->get(CouponManagementInterface::class);
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$couponManagement->remove($quote->getId());
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/cart_rule_discount_no_coupon.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/cart_rule_discount_no_coupon.php
-new file mode 100644
-index 00000000000..0735307b0bf
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/cart_rule_discount_no_coupon.php
-@@ -0,0 +1,55 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Customer\Model\GroupManagement as CustomerGroupManagement;
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\SalesRule\Api\Data\RuleInterface;
-+use Magento\SalesRule\Api\Data\RuleLabelInterface;
-+use Magento\SalesRule\Api\RuleRepositoryInterface;
-+use Magento\SalesRule\Model\Data\Rule as RuleData;
-+use Magento\SalesRule\Model\Data\RuleLabelFactory;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var RuleRepositoryInterface $ruleRepository */
-+$ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
-+/** @var DataObjectHelper $dataObjectHelper */
-+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
-+$ruleLabel = $objectManager->create(RuleLabelInterface::class);
-+$ruleLabelFactory = $objectManager->get(RuleLabelFactory::class);
-+
-+
-+/** @var RuleData $salesRule */
-+$salesRule = $objectManager->create(RuleData::class);
-+/** @var RuleLabelInterface $ruleLabel */
-+$ruleLabel = $ruleLabelFactory->create();
-+$ruleLabel->setStoreId(0);
-+$ruleLabel->setStoreLabel('50% Off for all orders');
-+$ruleData = [
-+        'name' => '50% Off for all orders',
-+        'is_active' => 1,
-+        'customer_group_ids' => [CustomerGroupManagement::NOT_LOGGED_IN_ID, 1],
-+        'coupon_type' => RuleData::COUPON_TYPE_NO_COUPON,
-+        'conditions' => [],
-+        'simple_action' => 'by_percent',
-+        'discount_amount' => 50,
-+        'discount_step' => 0,
-+        'website_ids' => [
-+            $objectManager->get(
-+                StoreManagerInterface::class
-+            )->getWebsite()->getId(),
-+        ],
-+        'discount_qty' => 0,
-+        'apply_to_shipping' => 1,
-+        'simple_free_shipping' => 1,
-+        'stop_rules_processing' => 0
-+];
-+$dataObjectHelper->populateWithArray($salesRule, $ruleData, RuleInterface::class);
-+$salesRule->setStoreLabels([$ruleLabel]);
-+
-+$ruleRepository->save($salesRule);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/cart_rule_discount_no_coupon_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/cart_rule_discount_no_coupon_rollback.php
-new file mode 100644
-index 00000000000..b94365c4a2c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/cart_rule_discount_no_coupon_rollback.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\SalesRule\Api\RuleRepositoryInterface;
-+use Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory as RuleCollectionFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var RuleRepositoryInterface $ruleRepository */
-+$ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
-+/** @var RuleCollectionFactory  $ruleCollectionFactory */
-+$ruleCollectionFactory = $objectManager->get(RuleCollectionFactory::class);
-+$ruleCollection = $ruleCollectionFactory->create();
-+
-+foreach ($ruleCollection->getItems() as $rule) {
-+    $ruleRepository->deleteById($rule->getRuleId());
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-new file mode 100644
-index 00000000000..86174a7753f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-@@ -0,0 +1,29 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Api\CartManagementInterface;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\QuoteIdMask;
-+use Magento\Quote\Model\QuoteIdMaskFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var CartManagementInterface $cartManagement */
-+$cartManagement = Bootstrap::getObjectManager()->get(CartManagementInterface::class);
-+/** @var CartRepositoryInterface $cartRepository */
-+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-+/** @var QuoteIdMaskFactory $quoteIdMaskFactory */
-+$quoteIdMaskFactory = Bootstrap::getObjectManager()->get(QuoteIdMaskFactory::class);
-+
-+$cartId = $cartManagement->createEmptyCartForCustomer(1);
-+$cart = $cartRepository->get($cartId);
-+$cart->setReservedOrderId('test_quote');
-+$cartRepository->save($cart);
-+
-+/** @var QuoteIdMask $quoteIdMask */
-+$quoteIdMask = $quoteIdMaskFactory->create();
-+$quoteIdMask->setQuoteId($cartId)
-+    ->save();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_rollback.php
-new file mode 100644
-index 00000000000..0d5d5f067e3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_rollback.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\Quote\Model\QuoteIdMask;
-+use Magento\Quote\Model\QuoteIdMaskFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var QuoteIdMaskFactory $quoteIdMaskFactory */
-+$quoteIdMaskFactory = Bootstrap::getObjectManager()->get(QuoteIdMaskFactory::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$quoteResource->delete($quote);
-+
-+/** @var QuoteIdMask $quoteIdMask */
-+$quoteIdMask = $quoteIdMaskFactory->create();
-+$quoteIdMask->setQuoteId($quote->getId())
-+    ->delete();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php
-new file mode 100644
-index 00000000000..8e6d4b8f74b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php
-@@ -0,0 +1,35 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Config\Model\Config;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Store\Model\Store;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+$paymentMethodList = $objectManager->get(\Magento\Payment\Api\PaymentMethodListInterface::class);
-+$rollbackConfigKey = 'test/payment/disabled_payment_methods';
-+$configData = [];
-+$disabledPaymentMethods = [];
-+
-+// Get all active Payment Methods
-+foreach ($paymentMethodList->getActiveList(Store::DEFAULT_STORE_ID) as $paymentMethod) {
-+    $configData['payment/' . $paymentMethod->getCode() . '/active'] = 0;
-+    $disabledPaymentMethods[] = $paymentMethod->getCode();
-+}
-+// Remember all manually disabled Payment Methods for rollback
-+$configData[$rollbackConfigKey] = implode(',', $disabledPaymentMethods);
-+
-+/** @var Config $defConfig */
-+$defConfig = $objectManager->create(Config::class);
-+$defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
-+
-+foreach ($configData as $key => $value) {
-+    $defConfig->setDataByPath($key, $value);
-+    $defConfig->save();
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods_rollback.php
-new file mode 100644
-index 00000000000..092826d1fd3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods_rollback.php
-@@ -0,0 +1,34 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+$rollbackConfigKey = 'test/payment/disabled_payment_methods';
-+
-+$configWriter = $objectManager->create(WriterInterface::class);
-+$rollbackConfigValue = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
-+    ->getStore(\Magento\Store\Model\Store::DEFAULT_STORE_ID)
-+    ->getConfig($rollbackConfigKey);
-+
-+$disabledPaymentMethods = [];
-+if (!empty($rollbackConfigValue)) {
-+    $disabledPaymentMethods = explode(',', $rollbackConfigValue);
-+}
-+
-+if (count($disabledPaymentMethods)) {
-+    foreach ($disabledPaymentMethods as $keyToRemove) {
-+        $configWriter->delete(sprintf('payment/%s/active', $keyToRemove));
-+    }
-+}
-+$configWriter->delete($rollbackConfigKey);
-+
-+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-+$scopeConfig->clean();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_guest_checkout.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_guest_checkout.php
-new file mode 100644
-index 00000000000..957c8831a3c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_guest_checkout.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer $configWriter */
-+$configWriter = $objectManager->get(WriterInterface::class);
-+
-+$configWriter->save('checkout/options/guest_checkout', 0);
-+
-+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-+$scopeConfig->clean();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_guest_checkout_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_guest_checkout_rollback.php
-new file mode 100644
-index 00000000000..ed7941435dd
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_guest_checkout_rollback.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer  $configWriter */
-+$configWriter = $objectManager->create(WriterInterface::class);
-+
-+$configWriter->delete('checkout/options/guest_checkout');
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php
-new file mode 100644
-index 00000000000..c5d0468dbfa
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php
-@@ -0,0 +1,23 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer $configWriter */
-+$configWriter = $objectManager->get(WriterInterface::class);
-+
-+$configWriter->save('carriers/flatrate/active', 0);
-+$configWriter->save('carriers/tablerate/active', 0);
-+$configWriter->save('carriers/freeshipping/active', 0);
-+
-+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-+$scopeConfig->clean();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods_rollback.php
-new file mode 100644
-index 00000000000..384ffbdf51f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods_rollback.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer  $configWriter */
-+$configWriter = $objectManager->create(WriterInterface::class);
-+
-+$configWriter->delete('carriers/flatrate/active');
-+$configWriter->delete('carriers/tablerate/active');
-+$configWriter->delete('carriers/freeshipping/active');
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-new file mode 100644
-index 00000000000..79d61cf32b9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer $configWriter */
-+$configWriter = $objectManager->get(WriterInterface::class);
-+
-+$configWriter->save('payment/banktransfer/active', 1);
-+$configWriter->save('payment/cashondelivery/active', 1);
-+$configWriter->save('payment/checkmo/active', 1);
-+$configWriter->save('payment/purchaseorder/active', 1);
-+$configWriter->save('payment/authorizenet_acceptjs/active', 1);
-+
-+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-+$scopeConfig->clean();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods_rollback.php
-new file mode 100644
-index 00000000000..6c41e3ebabf
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods_rollback.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer  $configWriter */
-+$configWriter = $objectManager->create(WriterInterface::class);
-+
-+$configWriter->delete('payment/banktransfer/active');
-+$configWriter->delete('payment/cashondelivery/active');
-+$configWriter->delete('payment/checkmo/active');
-+$configWriter->delete('payment/purchaseorder/active');
-+$configWriter->delete('payment/authorizenet_acceptjs/active');
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-new file mode 100644
-index 00000000000..ebc41da9b1b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-@@ -0,0 +1,23 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer $configWriter */
-+$configWriter = $objectManager->get(WriterInterface::class);
-+
-+$configWriter->save('carriers/flatrate/active', 1);
-+$configWriter->save('carriers/tablerate/active', 1);
-+$configWriter->save('carriers/freeshipping/active', 1);
-+
-+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-+$scopeConfig->clean();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods_rollback.php
-new file mode 100644
-index 00000000000..384ffbdf51f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods_rollback.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer  $configWriter */
-+$configWriter = $objectManager->create(WriterInterface::class);
-+
-+$configWriter->delete('carriers/flatrate/active');
-+$configWriter->delete('carriers/tablerate/active');
-+$configWriter->delete('carriers/freeshipping/active');
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-new file mode 100644
-index 00000000000..6a9ed898c31
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Api\GuestCartManagementInterface;
-+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var GuestCartManagementInterface $guestCartManagement */
-+$guestCartManagement = Bootstrap::getObjectManager()->get(GuestCartManagementInterface::class);
-+/** @var CartRepositoryInterface $cartRepository */
-+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-+/** @var MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId */
-+$maskedQuoteIdToQuoteId = Bootstrap::getObjectManager()->get(MaskedQuoteIdToQuoteIdInterface::class);
-+
-+$cartHash = $guestCartManagement->createEmptyCart();
-+$cartId = $maskedQuoteIdToQuoteId->execute($cartHash);
-+$cart = $cartRepository->get($cartId);
-+$cart->setReservedOrderId('test_quote');
-+$cartRepository->save($cart);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart_rollback.php
-new file mode 100644
-index 00000000000..0d5d5f067e3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart_rollback.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\Quote\Model\QuoteIdMask;
-+use Magento\Quote\Model\QuoteIdMaskFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var QuoteIdMaskFactory $quoteIdMaskFactory */
-+$quoteIdMaskFactory = Bootstrap::getObjectManager()->get(QuoteIdMaskFactory::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$quoteResource->delete($quote);
-+
-+/** @var QuoteIdMask $quoteIdMask */
-+$quoteIdMask = $quoteIdMaskFactory->create();
-+$quoteIdMask->setQuoteId($quote->getId())
-+    ->delete();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address.php
-new file mode 100644
-index 00000000000..60d2f1c49d2
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Api\Data\AddressInterface;
-+use Magento\Quote\Api\Data\AddressInterfaceFactory;
-+use Magento\Quote\Api\GuestCartManagementInterface;
-+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
-+use Magento\Quote\Model\ShippingAddressManagementInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\Api\DataObjectHelper;
-+
-+/** @var GuestCartManagementInterface $guestCartManagement */
-+$guestCartManagement = Bootstrap::getObjectManager()->get(GuestCartManagementInterface::class);
-+/** @var CartRepositoryInterface $cartRepository */
-+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-+/** @var MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId */
-+$maskedQuoteIdToQuoteId = Bootstrap::getObjectManager()->get(MaskedQuoteIdToQuoteIdInterface::class);
-+/** @var AddressInterfaceFactory $quoteAddressFactory */
-+$quoteAddressFactory = Bootstrap::getObjectManager()->get(AddressInterfaceFactory::class);
-+/** @var DataObjectHelper $dataObjectHelper */
-+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
-+/** @var ShippingAddressManagementInterface $shippingAddressManagement */
-+$shippingAddressManagement = Bootstrap::getObjectManager()->get(ShippingAddressManagementInterface::class);
-+
-+$cartHash = $guestCartManagement->createEmptyCart();
-+$cartId = $maskedQuoteIdToQuoteId->execute($cartHash);
-+$cart = $cartRepository->get($cartId);
-+$cart->setReservedOrderId('guest_quote_with_address');
-+$cartRepository->save($cart);
-+
-+$quoteAddressData = [
-+    AddressInterface::KEY_TELEPHONE => 4435555,
-+    AddressInterface::KEY_POSTCODE => 78717,
-+    AddressInterface::KEY_COUNTRY_ID => 'US',
-+    AddressInterface::KEY_CITY => 'CityA',
-+    AddressInterface::KEY_COMPANY => 'CompanyName',
-+    AddressInterface::KEY_STREET => 'Andora str, 121',
-+    AddressInterface::KEY_LASTNAME => 'Smith',
-+    AddressInterface::KEY_FIRSTNAME => 'John',
-+    AddressInterface::KEY_REGION_ID => 1,
-+];
-+$quoteAddress = $quoteAddressFactory->create();
-+$dataObjectHelper->populateWithArray($quoteAddress, $quoteAddressData, AddressInterfaceFactory::class);
-+$shippingAddressManagement->assign($cartId, $quoteAddress);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address_rollback.php
-new file mode 100644
-index 00000000000..d9f894abf45
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address_rollback.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\Quote\Model\QuoteIdMask;
-+use Magento\Quote\Model\QuoteIdMaskFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var QuoteIdMaskFactory $quoteIdMaskFactory */
-+$quoteIdMaskFactory = Bootstrap::getObjectManager()->get(QuoteIdMaskFactory::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'guest_quote_with_address', 'reserved_order_id');
-+$quoteResource->delete($quote);
-+
-+/** @var QuoteIdMask $quoteIdMask */
-+$quoteIdMask = $quoteIdMaskFactory->create();
-+$quoteIdMask->setQuoteId($quote->getId())
-+    ->delete();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/set_guest_email.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-new file mode 100644
-index 00000000000..c8084b25523
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var CartRepositoryInterface  $cartRepository */
-+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+
-+$quote->setCustomerEmail('guest@example.com');
-+$cartRepository->save($quote);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_cart_inactive.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_cart_inactive.php
-new file mode 100644
-index 00000000000..b5704f82879
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_cart_inactive.php
-@@ -0,0 +1,23 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var CartRepositoryInterface $cartRepository */
-+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$quote->setIsActive(false);
-+$cartRepository->save($quote);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
-new file mode 100644
-index 00000000000..e58c6b21d8d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\SalesRule\Api\Data\ConditionInterface;
-+use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
-+use Magento\SalesRule\Api\RuleRepositoryInterface;
-+use Magento\SalesRule\Model\CouponFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var CouponFactory $couponFactory */
-+$couponFactory = Bootstrap::getObjectManager()->get(CouponFactory::class);
-+/** @var ConditionInterfaceFactory $conditionFactory */
-+$conditionFactory = Bootstrap::getObjectManager()->get(ConditionInterfaceFactory::class);
-+/** @var RuleRepositoryInterface $ruleRepository */
-+$ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class);
-+
-+$couponCode = '2?ds5!2d';
-+$sku = 'simple_product';
-+
-+$coupon = $couponFactory->create();
-+$coupon->loadByCode($couponCode);
-+$ruleId = $coupon->getRuleId();
-+$salesRule = $ruleRepository->getById($ruleId);
-+
-+/** @var ConditionInterface $conditionProductSku */
-+$conditionProductSku = $conditionFactory->create();
-+$conditionProductSku->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product::class);
-+$conditionProductSku->setAttributeName('sku');
-+$conditionProductSku->setValue('1');
-+$conditionProductSku->setOperator('!=');
-+$conditionProductSku->setValue($sku);
-+
-+/** @var ConditionInterface $conditionProductFound */
-+$conditionProductFound = $conditionFactory->create();
-+$conditionProductFound->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product\Found::class);
-+$conditionProductFound->setValue('1');
-+$conditionProductFound->setAggregatorType('all');
-+$conditionProductFound->setConditions([$conditionProductSku]);
-+
-+/** @var ConditionInterface $conditionCombine */
-+$conditionCombine = $conditionFactory->create();
-+$conditionCombine->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Combine::class);
-+$conditionCombine->setValue('1');
-+$conditionCombine->setAggregatorType('all');
-+$conditionCombine->setConditions([$conditionProductFound]);
-+
-+$salesRule->setCondition($conditionCombine);
-+$ruleRepository->save($salesRule);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php
-new file mode 100644
-index 00000000000..86ab253f1d3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php
-@@ -0,0 +1,37 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\SalesRule\Api\Data\ConditionInterface;
-+use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
-+use Magento\SalesRule\Api\RuleRepositoryInterface;
-+use Magento\SalesRule\Model\CouponFactory;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var CouponFactory $couponFactory */
-+$couponFactory = Bootstrap::getObjectManager()->get(CouponFactory::class);
-+/** @var ConditionInterfaceFactory $conditionFactory */
-+$conditionFactory = Bootstrap::getObjectManager()->get(ConditionInterfaceFactory::class);
-+/** @var RuleRepositoryInterface $ruleRepository */
-+$ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class);
-+
-+$couponCode = '2?ds5!2d';
-+$sku = 'simple_product';
-+
-+$coupon = $couponFactory->create();
-+$coupon->loadByCode($couponCode);
-+
-+if ($coupon->getId()) {
-+    $ruleId = $coupon->getRuleId();
-+    $salesRule = $ruleRepository->getById($ruleId);
-+
-+    /** @var ConditionInterface $conditionCombine */
-+    $conditionCombine = $conditionFactory->create();
-+    $conditionCombine->setConditions([]);
-+
-+    $salesRule->setCondition($conditionCombine);
-+    $ruleRepository->save($salesRule);
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-new file mode 100644
-index 00000000000..a973a982b11
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
-@@ -0,0 +1,33 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\OfflinePayments\Model\Checkmo;
-+use Magento\Quote\Api\Data\PaymentInterface;
-+use Magento\Quote\Api\Data\PaymentInterfaceFactory;
-+use Magento\Quote\Api\PaymentMethodManagementInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var PaymentInterfaceFactory $paymentFactory */
-+$paymentFactory = Bootstrap::getObjectManager()->get(PaymentInterfaceFactory::class);
-+/** @var PaymentMethodManagementInterface $paymentMethodManagement */
-+$paymentMethodManagement = Bootstrap::getObjectManager()->get(PaymentMethodManagementInterface::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+
-+$payment = $paymentFactory->create([
-+    'data' => [
-+        PaymentInterface::KEY_METHOD => Checkmo::PAYMENT_METHOD_CHECKMO_CODE,
-+    ]
-+]);
-+$paymentMethodManagement->set($quote->getId(), $payment);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-new file mode 100644
-index 00000000000..1e7c10d251b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-@@ -0,0 +1,36 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Checkout\Api\Data\ShippingInformationInterface;
-+use Magento\Checkout\Api\Data\ShippingInformationInterfaceFactory;
-+use Magento\Checkout\Api\ShippingInformationManagementInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var ShippingInformationInterfaceFactory $shippingInformationFactory */
-+$shippingInformationFactory = Bootstrap::getObjectManager()->get(ShippingInformationInterfaceFactory::class);
-+/** @var ShippingInformationManagementInterface $shippingInformationManagement */
-+$shippingInformationManagement = Bootstrap::getObjectManager()->get(ShippingInformationManagementInterface::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$quoteAddress = $quote->getShippingAddress();
-+
-+/** @var ShippingInformationInterface $shippingInformation */
-+$shippingInformation = $shippingInformationFactory->create([
-+    'data' => [
-+        ShippingInformationInterface::SHIPPING_ADDRESS => $quoteAddress,
-+        ShippingInformationInterface::SHIPPING_CARRIER_CODE => 'flatrate',
-+        ShippingInformationInterface::SHIPPING_METHOD_CODE => 'flatrate',
-+    ],
-+]);
-+$shippingInformationManagement->saveAddressInformation($quote->getId(), $shippingInformation);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_multishipping_with_two_shipping_addresses.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_multishipping_with_two_shipping_addresses.php
-new file mode 100644
-index 00000000000..8c9641d6fdc
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_multishipping_with_two_shipping_addresses.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+
-+// phpcs:disable
-+require __DIR__ . '/../../../Multishipping/Fixtures/shipping_address_list.php';
-+// phpcs:enable
-+
-+/** @var CartRepositoryInterface $quoteRepository */
-+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
-+$quote->collectTotals();
-+$quoteRepository->save($quote);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_billing_address.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_billing_address.php
-new file mode 100644
-index 00000000000..2e15ef218d0
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_billing_address.php
-@@ -0,0 +1,44 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\Quote\Api\Data\AddressInterface;
-+use Magento\Quote\Api\Data\AddressInterfaceFactory;
-+use Magento\Quote\Api\BillingAddressManagementInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var AddressInterfaceFactory $quoteAddressFactory */
-+$quoteAddressFactory = Bootstrap::getObjectManager()->get(AddressInterfaceFactory::class);
-+/** @var DataObjectHelper $dataObjectHelper */
-+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
-+/** @var BillingAddressManagementInterface $billingAddressManagement */
-+$billingAddressManagement = Bootstrap::getObjectManager()->get(BillingAddressManagementInterface::class);
-+
-+$quoteAddressData = [
-+    AddressInterface::KEY_TELEPHONE => 3468676,
-+    AddressInterface::KEY_POSTCODE => 75477,
-+    AddressInterface::KEY_COUNTRY_ID => 'US',
-+    AddressInterface::KEY_CITY => 'CityM',
-+    AddressInterface::KEY_COMPANY => 'CompanyName',
-+    AddressInterface::KEY_STREET => 'Green str, 67',
-+    AddressInterface::KEY_LASTNAME => 'Smith',
-+    AddressInterface::KEY_FIRSTNAME => 'John',
-+    AddressInterface::KEY_REGION_ID => 1,
-+];
-+$quoteAddress = $quoteAddressFactory->create();
-+$dataObjectHelper->populateWithArray($quoteAddress, $quoteAddressData, AddressInterfaceFactory::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$billingAddressManagement->assign($quote->getId(), $quoteAddress);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_address.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-new file mode 100644
-index 00000000000..54f4d8d0c6e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-@@ -0,0 +1,43 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\Quote\Api\Data\AddressInterface;
-+use Magento\Quote\Api\Data\AddressInterfaceFactory;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\Quote\Model\ShippingAddressManagementInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var AddressInterfaceFactory $quoteAddressFactory */
-+$quoteAddressFactory = Bootstrap::getObjectManager()->get(AddressInterfaceFactory::class);
-+/** @var DataObjectHelper $dataObjectHelper */
-+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
-+/** @var ShippingAddressManagementInterface $shippingAddressManagement */
-+$shippingAddressManagement = Bootstrap::getObjectManager()->get(ShippingAddressManagementInterface::class);
-+
-+$quoteAddressData = [
-+    AddressInterface::KEY_TELEPHONE => 3468676,
-+    AddressInterface::KEY_POSTCODE => '75477',
-+    AddressInterface::KEY_COUNTRY_ID => 'US',
-+    AddressInterface::KEY_CITY => 'CityM',
-+    AddressInterface::KEY_COMPANY => 'CompanyName',
-+    AddressInterface::KEY_STREET => 'Green str, 67',
-+    AddressInterface::KEY_LASTNAME => 'Smith',
-+    AddressInterface::KEY_FIRSTNAME => 'John',
-+    AddressInterface::KEY_REGION_ID => 1,
-+];
-+$quoteAddress = $quoteAddressFactory->create();
-+$dataObjectHelper->populateWithArray($quoteAddress, $quoteAddressData, AddressInterfaceFactory::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$shippingAddressManagement->assign($quote->getId(), $quoteAddress);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
-new file mode 100644
-index 00000000000..8e60dc904bd
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
-@@ -0,0 +1,43 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Api\DataObjectHelper;
-+use Magento\Quote\Api\Data\AddressInterface;
-+use Magento\Quote\Api\Data\AddressInterfaceFactory;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\Quote\Model\ShippingAddressManagementInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var AddressInterfaceFactory $quoteAddressFactory */
-+$quoteAddressFactory = Bootstrap::getObjectManager()->get(AddressInterfaceFactory::class);
-+/** @var DataObjectHelper $dataObjectHelper */
-+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
-+/** @var ShippingAddressManagementInterface $shippingAddressManagement */
-+$shippingAddressManagement = Bootstrap::getObjectManager()->get(ShippingAddressManagementInterface::class);
-+
-+$quoteAddressData = [
-+    AddressInterface::KEY_TELEPHONE => 3468676,
-+    AddressInterface::KEY_POSTCODE => 'M4L 1V3',
-+    AddressInterface::KEY_COUNTRY_ID => 'CA',
-+    AddressInterface::KEY_CITY => 'Toronto',
-+    AddressInterface::KEY_COMPANY => 'CompanyName',
-+    AddressInterface::KEY_STREET => '500 Kingston Rd',
-+    AddressInterface::KEY_LASTNAME => 'Smith',
-+    AddressInterface::KEY_FIRSTNAME => 'John',
-+    AddressInterface::KEY_REGION_CODE => 'ON',
-+];
-+$quoteAddress = $quoteAddressFactory->create();
-+$dataObjectHelper->populateWithArray($quoteAddress, $quoteAddressData, AddressInterfaceFactory::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$shippingAddressManagement->assign($quote->getId(), $quoteAddress);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/SendFriend/_files/disable_send_friend_guest.php b/dev/tests/integration/testsuite/Magento/GraphQl/SendFriend/_files/disable_send_friend_guest.php
-new file mode 100644
-index 00000000000..80fcc2079a0
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/SendFriend/_files/disable_send_friend_guest.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer $configWriter */
-+$configWriter = $objectManager->get(WriterInterface::class);
-+
-+$configWriter->save('sendfriend/email/allow_guest', '0');
-+
-+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-+$scopeConfig->clean();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/SendFriend/_files/enable_send_friend_guest.php b/dev/tests/integration/testsuite/Magento/GraphQl/SendFriend/_files/enable_send_friend_guest.php
-new file mode 100644
-index 00000000000..aaf9a447aea
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/SendFriend/_files/enable_send_friend_guest.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer $configWriter */
-+$configWriter = $objectManager->get(WriterInterface::class);
-+
-+$configWriter->save('sendfriend/email/allow_guest', '1');
-+
-+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-+$scopeConfig->clean();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Service/GraphQlRequest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Service/GraphQlRequest.php
-new file mode 100644
-index 00000000000..e9a4dea968e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Service/GraphQlRequest.php
-@@ -0,0 +1,169 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQl\Service;
-+
-+use Magento\Framework\App\Request\Http;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\GraphQl\Controller\GraphQl;
-+use Magento\Framework\App\Response\Http as HttpResponse;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\Framework\Webapi\Request;
-+
-+/**
-+ * Service class to simplify GraphQl requests for integration tests
-+ */
-+class GraphQlRequest
-+{
-+    /**
-+     * @var string
-+     */
-+    private $controllerPath = '/graphql';
-+
-+    /**
-+     * @var Http
-+     */
-+    private $httpRequest;
-+
-+    /**
-+     * @var array
-+     */
-+    private $defaultHeaders = ['Content-Type' => 'application/json'];
-+
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $json;
-+
-+    /**
-+     * @var GraphQl
-+     */
-+    private $controller;
-+
-+    /**
-+     * @param Http $httpRequest
-+     * @param SerializerInterface $json
-+     * @param GraphQl $controller
-+     */
-+    public function __construct(
-+        Http $httpRequest,
-+        SerializerInterface $json,
-+        GraphQl $controller
-+    ) {
-+        $this->httpRequest = $httpRequest;
-+        $this->json = $json;
-+        $this->controller = $controller;
-+    }
-+
-+    /**
-+     * Send request and return response
-+     *
-+     * @param string $query
-+     * @param array $variables
-+     * @param string $operation
-+     * @param array $headers
-+     * @return HttpResponse
-+     */
-+    public function send(
-+        string $query,
-+        array $variables = [],
-+        string $operation = '',
-+        array $headers = []
-+    ) {
-+        $this->httpRequest->setPathInfo($this->controllerPath);
-+        $this->setQuery($query, $variables, $operation)
-+            ->setHeaders($headers);
-+
-+        /** @var HttpResponse $response */
-+        $response = $this->controller->dispatch($this->httpRequest);
-+        return $response;
-+    }
-+
-+    /**
-+     * Set query data on request
-+     *
-+     * @param string $query
-+     * @param array $variables
-+     * @param string $operation
-+     * @return GraphQlRequest
-+     */
-+    private function setQuery(string $query, array $variables = [], string $operation = ''): self
-+    {
-+        if (strpos(trim($query), 'mutation') === 0) {
-+            $this->httpRequest->setMethod('POST');
-+            $this->setPostContent($query, $variables, $operation);
-+        } else {
-+            $this->httpRequest->setMethod('GET');
-+            $this->setGetContent($query, $variables, $operation);
-+        }
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * Set headers on request
-+     *
-+     * @param array $headers
-+     * @return GraphQlRequest
-+     */
-+    private function setHeaders(array $headers): self
-+    {
-+        $allHeaders = array_merge($this->defaultHeaders, $headers);
-+
-+        $webApiRequest = ObjectManager::getInstance()->get(Request::class);
-+        $requestHeaders = $webApiRequest->getHeaders();
-+        foreach ($allHeaders as $key => $value) {
-+            $requestHeaders->addHeaderLine($key, $value);
-+        }
-+
-+        $this->httpRequest->setHeaders($webApiRequest->getHeaders());
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * Set POST body for request
-+     *
-+     * @param string $query
-+     * @param array $variables
-+     * @param string $operation
-+     * @return GraphQlRequest
-+     */
-+    private function setPostContent(string $query, array $variables = [], string $operation = ''): self
-+    {
-+        $content = [
-+            'query' => $query,
-+            'variables' => !empty($variables) ? $this->json->serialize($variables) : null,
-+            'operationName' => !empty($operation) ? $operation : null
-+        ];
-+        $this->httpRequest->setContent($this->json->serialize($content));
-+
-+        return $this;
-+    }
-+
-+    /**
-+     * Set GET parameters for request
-+     *
-+     * @param string $query
-+     * @param array $variables
-+     * @param string $operation
-+     * @return GraphQlRequest
-+     */
-+    private function setGetContent(string $query, array $variables = [], string $operation = ''): self
-+    {
-+        $this->httpRequest->setQueryValue('query', $query);
-+
-+        if (!empty($variables)) {
-+            $this->httpRequest->setQueryValue('variables', $variables);
-+        }
-+        if (!empty($operation)) {
-+            $this->httpRequest->setQueryValue('operationName', $operation);
-+        }
-+
-+        return $this;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
-new file mode 100644
-index 00000000000..aca55bd8414
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Tax\Api\Data\TaxRateInterface;
-+use Magento\Tax\Api\Data\TaxRuleInterface;
-+use Magento\Tax\Api\TaxRateRepositoryInterface;
-+use Magento\Tax\Api\TaxRuleRepositoryInterface;
-+use Magento\Tax\Model\Calculation\Rate;
-+use Magento\Tax\Model\Calculation\RateFactory;
-+use Magento\Tax\Model\Calculation\RateRepository;
-+use Magento\Tax\Model\Calculation\Rule;
-+use Magento\Tax\Model\Calculation\RuleFactory;
-+use Magento\Tax\Model\TaxRuleRepository;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\Api\DataObjectHelper;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var DataObjectHelper $dataObjectHelper */
-+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
-+/** @var RateFactory $rateFactory */
-+$rateFactory = $objectManager->get(RateFactory::class);
-+/** @var RuleFactory $ruleFactory */
-+$ruleFactory = $objectManager->get(RuleFactory::class);
-+/** @var RateRepository $rateRepository */
-+$rateRepository = $objectManager->get(TaxRateRepositoryInterface::class);
-+/** @var TaxRuleRepository $ruleRepository */
-+$ruleRepository = $objectManager->get(TaxRuleRepositoryInterface::class);
-+/** @var Rate $rate */
-+$rate = $rateFactory->create();
-+$rateData = [
-+    Rate::KEY_COUNTRY_ID => 'US',
-+    Rate::KEY_REGION_ID => '1',
-+    Rate::KEY_POSTCODE => '*',
-+    Rate::KEY_CODE => 'US-TEST-*-Rate-1',
-+    Rate::KEY_PERCENTAGE_RATE => '7.5',
-+];
-+$dataObjectHelper->populateWithArray($rate, $rateData, TaxRateInterface::class);
-+$rateRepository->save($rate);
-+
-+$rule = $ruleFactory->create();
-+$ruleData = [
-+    Rule::KEY_CODE=> 'GraphQl Test Rule',
-+    Rule::KEY_PRIORITY => '0',
-+    Rule::KEY_POSITION => '0',
-+    Rule::KEY_CUSTOMER_TAX_CLASS_IDS => [3],
-+    Rule::KEY_PRODUCT_TAX_CLASS_IDS => [2],
-+    Rule::KEY_TAX_RATE_IDS => [$rate->getId()],
-+];
-+$dataObjectHelper->populateWithArray($rule, $ruleData, TaxRuleInterface::class);
-+$ruleRepository->save($rule);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1_rollback.php
-new file mode 100644
-index 00000000000..aba1960624e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1_rollback.php
-@@ -0,0 +1,38 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Tax\Api\TaxRateRepositoryInterface;
-+use Magento\Tax\Api\TaxRuleRepositoryInterface;
-+use Magento\Tax\Model\Calculation\Rate;
-+use Magento\Tax\Model\Calculation\RateFactory;
-+use Magento\Tax\Model\Calculation\RateRepository;
-+use Magento\Tax\Model\Calculation\Rule;
-+use Magento\Tax\Model\Calculation\RuleFactory;
-+use Magento\Tax\Model\TaxRuleRepository;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Tax\Model\ResourceModel\Calculation\Rate as RateResource;
-+use Magento\Tax\Model\ResourceModel\Calculation\Rule as RuleResource;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var RateFactory $rateFactory */
-+$rateFactory = $objectManager->get(RateFactory::class);
-+/** @var RuleFactory $ruleFactory */
-+$ruleFactory = $objectManager->get(RuleFactory::class);
-+/** @var RateRepository $rateRepository */
-+$rateRepository = $objectManager->get(TaxRateRepositoryInterface::class);
-+/** @var TaxRuleRepository $ruleRepository */
-+$ruleRepository = $objectManager->get(TaxRuleRepositoryInterface::class);
-+/** @var RateResource $rateResource */
-+$rateResource = $objectManager->get(RateResource::class);
-+/** @var RuleResource $ruleResource */
-+$ruleResource = $objectManager->get(RuleResource::class);
-+
-+$rate = $rateFactory->create();
-+$rateResource->load($rate, 'US-TEST-*-Rate-1', Rate::KEY_CODE);
-+$rule = $ruleFactory->create();
-+$ruleResource->load($rule, 'GraphQl Test Rule', Rule::KEY_CODE);
-+$ruleRepository->delete($rule);
-+$rateRepository->delete($rate);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php b/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
-new file mode 100644
-index 00000000000..42931db75a4
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer $configWriter */
-+$configWriter = $objectManager->get(WriterInterface::class);
-+
-+$configWriter->save('carriers/ups/active', 1);
-+$configWriter->save('carriers/ups/type', "UPS");
-+
-+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-+$scopeConfig->clean();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method_rollback.php
-new file mode 100644
-index 00000000000..cf6dc08dd91
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method_rollback.php
-@@ -0,0 +1,18 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer  $configWriter */
-+$configWriter = $objectManager->create(WriterInterface::class);
-+
-+$configWriter->delete('carriers/ups/active');
-+$configWriter->delete('carriers/ups/type');
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Usps/_files/enable_usps_shipping_method.php b/dev/tests/integration/testsuite/Magento/GraphQl/Usps/_files/enable_usps_shipping_method.php
-new file mode 100644
-index 00000000000..7a616764ba0
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Usps/_files/enable_usps_shipping_method.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer $configWriter */
-+$configWriter = $objectManager->get(WriterInterface::class);
-+
-+$configWriter->save('carriers/usps/active', 1);
-+$configWriter->save(\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_ZIP, '90210');
-+
-+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-+$scopeConfig->clean();
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Usps/_files/enable_usps_shipping_method_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Usps/_files/enable_usps_shipping_method_rollback.php
-new file mode 100644
-index 00000000000..bab687849f9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Usps/_files/enable_usps_shipping_method_rollback.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\Writer;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var Writer  $configWriter */
-+$configWriter = $objectManager->create(WriterInterface::class);
-+
-+$configWriter->delete('carriers/usps/active');
-+$configWriter->delete(\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_ZIP);
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/AbstractGraphqlCacheTest.php b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/AbstractGraphqlCacheTest.php
-new file mode 100644
-index 00000000000..4cc46a8e745
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/AbstractGraphqlCacheTest.php
-@@ -0,0 +1,42 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Controller;
-+
-+use PHPUnit\Framework\TestCase;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Abstract test class for Graphql cache tests
-+ */
-+abstract class AbstractGraphqlCacheTest extends TestCase
-+{
-+    /**
-+     * @var ObjectManager
-+     */
-+    protected $objectManager;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->usePageCachePlugin();
-+    }
-+
-+    /**
-+     * Enable full page cache plugin
-+     */
-+    protected function usePageCachePlugin(): void
-+    {
-+        /** @var  $registry \Magento\Framework\Registry */
-+        $registry = $this->objectManager->get(\Magento\Framework\Registry::class);
-+        $registry->register('use_page_cache_plugin', true, true);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/CategoriesWithProductsCacheTest.php b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/CategoriesWithProductsCacheTest.php
-new file mode 100644
-index 00000000000..62cda28a449
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/CategoriesWithProductsCacheTest.php
-@@ -0,0 +1,103 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Controller\Catalog;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\App\Request\Http;
-+use Magento\GraphQl\Controller\GraphQl;
-+use Magento\GraphQlCache\Controller\AbstractGraphqlCacheTest;
-+
-+/**
-+ * Tests cache debug headers and cache tag validation for a category with product query
-+ *
-+ * @magentoAppArea graphql
-+ * @magentoCache full_page enabled
-+ * @magentoDbIsolation disabled
-+ */
-+class CategoriesWithProductsCacheTest extends AbstractGraphqlCacheTest
-+{
-+    /**
-+     * @var GraphQl
-+     */
-+    private $graphqlController;
-+
-+    /**
-+     * @var Http
-+     */
-+    private $request;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-+    {
-+        parent::setUp();
-+        $this->graphqlController = $this->objectManager->get(\Magento\GraphQl\Controller\GraphQl::class);
-+        $this->request = $this->objectManager->create(Http::class);
-+    }
-+    /**
-+     * Test cache tags and debug header for category with products querying for products and category
-+     *
-+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
-+     */
-+    public function testToCheckRequestCacheTagsForCategoryWithProducts(): void
-+    {
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-+        /** @var ProductInterface $product */
-+        $product = $productRepository->get('simple333');
-+        $categoryId ='333';
-+        $query
-+            = <<<QUERY
-+query GetCategoryWithProducts(\$id: Int!, \$pageSize: Int!, \$currentPage: Int!) {
-+        category(id: \$id) {
-+            id
-+            description
-+            name
-+            product_count
-+            products(
-+                      pageSize: \$pageSize, 
-+                      currentPage: \$currentPage) {
-+                items {
-+                    id
-+                    name
-+                    attribute_set_id
-+                    url_key
-+                    sku
-+                    type_id
-+                    updated_at
-+                    url_key
-+                    url_path
-+                }
-+                total_count
-+            }
-+        }
-+    }
-+QUERY;
-+        $variables =[
-+            'id' => $categoryId,
-+            'pageSize'=> 10,
-+            'currentPage' => 1
-+        ];
-+        $queryParams = [
-+            'query' => $query,
-+            'variables' => json_encode($variables),
-+            'operationName' => 'GetCategoryWithProducts'
-+        ];
-+
-+        $this->request->setPathInfo('/graphql');
-+        $this->request->setMethod('GET');
-+        $this->request->setParams($queryParams);
-+        $response = $this->graphqlController->dispatch($this->request);
-+        $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
-+        $expectedCacheTags = ['cat_c','cat_c_' . $categoryId,'cat_p','cat_p_' . $product->getId(),'FPC'];
-+        $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
-+        $this->assertEquals($expectedCacheTags, $actualCacheTags);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/CategoryCacheTest.php b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/CategoryCacheTest.php
-new file mode 100644
-index 00000000000..96f6685233f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/CategoryCacheTest.php
-@@ -0,0 +1,71 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Controller\Catalog;
-+
-+use Magento\Framework\App\Request\Http;
-+use Magento\GraphQl\Controller\GraphQl;
-+use Magento\GraphQlCache\Controller\AbstractGraphqlCacheTest;
-+
-+/**
-+ * Tests cache debug headers and cache tag validation for a simple category query
-+ *
-+ * @magentoAppArea graphql
-+ * @magentoCache full_page enabled
-+ * @magentoDbIsolation disabled
-+ */
-+class CategoryCacheTest extends AbstractGraphqlCacheTest
-+{
-+    /**
-+     * @var GraphQl
-+     */
-+    private $graphqlController;
-+
-+    /**
-+     * @var Http
-+     */
-+    private $request;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-+    {
-+        parent::setUp();
-+        $this->graphqlController = $this->objectManager->get(\Magento\GraphQl\Controller\GraphQl::class);
-+        $this->request = $this->objectManager->create(Http::class);
-+    }
-+    /**
-+     * Test cache tags and debug header for category and querying only for category
-+     *
-+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
-+     */
-+    public function testToCheckRequestCacheTagsForForCategory(): void
-+    {
-+        $categoryId ='333';
-+        $query
-+            = <<<QUERY
-+        {
-+            category(id: $categoryId) {
-+            id
-+            name
-+            url_key
-+            description
-+            product_count
-+           }
-+       }
-+QUERY;
-+        $this->request->setPathInfo('/graphql');
-+        $this->request->setMethod('GET');
-+        $this->request->setQueryValue('query', $query);
-+        $response = $this->graphqlController->dispatch($this->request);
-+        $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
-+        $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
-+        $expectedCacheTags = ['cat_c','cat_c_' . $categoryId,'FPC'];
-+        $this->assertEquals($expectedCacheTags, $actualCacheTags);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/DeepNestedCategoriesAndProductsTest.php b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/DeepNestedCategoriesAndProductsTest.php
-new file mode 100644
-index 00000000000..7f992a0843f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/DeepNestedCategoriesAndProductsTest.php
-@@ -0,0 +1,128 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Controller\Catalog;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Api\CategoryRepositoryInterface;
-+use Magento\Framework\App\Request\Http;
-+use Magento\GraphQlCache\Controller\AbstractGraphqlCacheTest;
-+
-+/**
-+ * Tests cache debug headers and cache tag validation for a deep nested category and product query
-+ *
-+ * @magentoAppArea graphql
-+ * @magentoDbIsolation disabled
-+ */
-+class DeepNestedCategoriesAndProductsTest extends AbstractGraphqlCacheTest
-+{
-+    /** @var \Magento\GraphQl\Controller\GraphQl */
-+    private $graphql;
-+
-+    /** @var Http */
-+    private $request;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-+    {
-+        parent::setUp();
-+        $this->graphql = $this->objectManager->get(\Magento\GraphQl\Controller\GraphQl::class);
-+        $this->request = $this->objectManager->get(Http::class);
-+    }
-+
-+    /**
-+     * Test cache tags and debug header for deep nested queries involving category and products
-+     *
-+     * @magentoCache all enabled
-+     * @magentoDataFixture Magento/Catalog/_files/product_in_multiple_categories.php
-+     *
-+     */
-+    public function testDispatchForCacheHeadersOnDeepNestedQueries(): void
-+    {
-+        $baseCategoryId ='333';
-+        $query
-+            = <<<QUERY
-+        {
-+  category(id: $baseCategoryId) {
-+    products {
-+      items {
-+        attribute_set_id
-+        country_of_manufacture
-+        created_at
-+        description {
-+            html
-+        }
-+        gift_message_available
-+        id
-+        categories {
-+          name
-+          url_path
-+          available_sort_by
-+          level
-+          products {
-+            items {
-+              name
-+              id
-+            }
-+          }
-+        }
-+              }
-+    }
-+  }
-+}
-+QUERY;
-+        /** @var CategoryRepositoryInterface $categoryRepository */
-+        $categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-+
-+        $resolvedCategoryIds = [];
-+        $category = $categoryRepository->get($baseCategoryId);
-+
-+        $productIdsFromCategory = $category->getProductCollection()->getAllIds();
-+        foreach ($productIdsFromCategory as $productId) {
-+            $resolvedCategoryIds = array_merge(
-+                $resolvedCategoryIds,
-+                $productRepository->getById($productId)->getCategoryIds()
-+            );
-+        }
-+
-+        $resolvedCategoryIds = array_merge($resolvedCategoryIds, [$baseCategoryId]);
-+        foreach ($resolvedCategoryIds as $categoryId) {
-+            $category = $categoryRepository->get($categoryId);
-+            $productIdsFromCategory= array_merge(
-+                $productIdsFromCategory,
-+                $category->getProductCollection()->getAllIds()
-+            );
-+        }
-+
-+        $uniqueProductIds = array_unique($productIdsFromCategory);
-+        $uniqueCategoryIds = array_unique($resolvedCategoryIds);
-+        $expectedCacheTags = ['cat_c', 'cat_p', 'FPC'];
-+        foreach ($uniqueProductIds as $uniqueProductId) {
-+            $expectedCacheTags = array_merge($expectedCacheTags, ['cat_p_'.$uniqueProductId]);
-+        }
-+        foreach ($uniqueCategoryIds as $uniqueCategoryId) {
-+            $expectedCacheTags = array_merge($expectedCacheTags, ['cat_c_'.$uniqueCategoryId]);
-+        }
-+
-+        $this->request->setPathInfo('/graphql');
-+        $this->request->setMethod('GET');
-+        $this->request->setQueryValue('query', $query);
-+        $response = $this->graphql->dispatch($this->request);
-+        $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
-+        $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
-+        $this->assertEmpty(
-+            array_merge(
-+                array_diff($expectedCacheTags, $actualCacheTags),
-+                array_diff($actualCacheTags, $expectedCacheTags)
-+            )
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/ProductsCacheTest.php b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/ProductsCacheTest.php
-new file mode 100644
-index 00000000000..78534176a35
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/ProductsCacheTest.php
-@@ -0,0 +1,115 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Controller\Catalog;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\App\Request\Http;
-+use Magento\GraphQl\Controller\GraphQl;
-+use Magento\GraphQlCache\Controller\AbstractGraphqlCacheTest;
-+
-+/**
-+ * Tests cache debug headers and cache tag validation for a simple product query
-+ *
-+ * @magentoAppArea graphql
-+ * @magentoCache full_page enabled
-+ * @magentoDbIsolation disabled
-+ */
-+class ProductsCacheTest extends AbstractGraphqlCacheTest
-+{
-+    /**
-+     * @var GraphQl
-+     */
-+    private $graphqlController;
-+
-+    /**
-+     * @var Http
-+     */
-+    private $request;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-+    {
-+        parent::setUp();
-+        $this->graphqlController = $this->objectManager->get(\Magento\GraphQl\Controller\GraphQl::class);
-+        $this->request = $this->objectManager->create(Http::class);
-+    }
-+
-+    /**
-+     * Test request is dispatched and response is checked for debug headers and cache tags
-+     *
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
-+     */
-+    public function testToCheckRequestCacheTagsForProducts(): void
-+    {
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-+
-+        /** @var ProductInterface $product */
-+        $product = $productRepository->get('simple1');
-+
-+        $query
-+            = <<<QUERY
-+ {
-+           products(filter: {sku: {eq: "simple1"}})
-+           {
-+               items {
-+                   id
-+                   name
-+                   sku
-+                   description {
-+                   html
-+                   }
-+               }
-+           }
-+       }
-+QUERY;
-+
-+        $this->request->setPathInfo('/graphql');
-+        $this->request->setMethod('GET');
-+        $this->request->setQueryValue('query', $query);
-+        $response = $this->graphqlController->dispatch($this->request);
-+        $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
-+        $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
-+        $expectedCacheTags = ['cat_p', 'cat_p_' . $product->getId(), 'FPC'];
-+        $this->assertEquals($expectedCacheTags, $actualCacheTags);
-+    }
-+
-+    /**
-+     * Test request is checked for debug headers and no cache tags for not existing product
-+     */
-+    public function testToCheckRequestNoTagsForProducts(): void
-+    {
-+        $query
-+            = <<<QUERY
-+            {
-+           products(filter: {sku: {eq: "simple10"}})
-+           {
-+               items {
-+                   id
-+                   name
-+                   sku
-+                   description {
-+                   html
-+                   }
-+               }
-+           }
-+       }
-+
-+QUERY;
-+        $this->request->setPathInfo('/graphql');
-+        $this->request->setMethod('GET');
-+        $this->request->setQueryValue('query', $query);
-+        $response = $this->graphqlController->dispatch($this->request);
-+        $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
-+        $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
-+        $expectedCacheTags = ['FPC'];
-+        $this->assertEquals($expectedCacheTags, $actualCacheTags);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Cms/BlockCacheTest.php b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Cms/BlockCacheTest.php
-new file mode 100644
-index 00000000000..160f5f9109f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Cms/BlockCacheTest.php
-@@ -0,0 +1,78 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Controller\Cms;
-+
-+use Magento\Cms\Model\BlockRepository;
-+use Magento\Framework\App\Request\Http;
-+use Magento\GraphQl\Controller\GraphQl;
-+use Magento\GraphQlCache\Controller\AbstractGraphqlCacheTest;
-+
-+/**
-+ * Test caching works for CMS blocks
-+ *
-+ * @magentoAppArea graphql
-+ * @magentoCache full_page enabled
-+ * @magentoDbIsolation disabled
-+ */
-+class BlockCacheTest extends AbstractGraphqlCacheTest
-+{
-+    /**
-+     * @var GraphQl
-+     */
-+    private $graphqlController;
-+
-+    /**
-+     * @var Http
-+     */
-+    private $request;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-+    {
-+        parent::setUp();
-+        $this->graphqlController = $this->objectManager->get(\Magento\GraphQl\Controller\GraphQl::class);
-+        $this->request = $this->objectManager->create(Http::class);
-+    }
-+
-+    /**
-+     * Test that the correct cache tags get added to request for cmsBlocks
-+     *
-+     * @magentoDataFixture Magento/Cms/_files/block.php
-+     */
-+    public function testCmsBlocksRequestHasCorrectTags(): void
-+    {
-+        $blockIdentifier = 'fixture_block';
-+        $blockRepository = $this->objectManager->get(BlockRepository::class);
-+        $block = $blockRepository->getById($blockIdentifier);
-+
-+        $query
-+            = <<<QUERY
-+ {
-+    cmsBlocks(identifiers: ["$blockIdentifier"]) {
-+        items {
-+            title
-+    	    identifier
-+            content
-+        }
-+    }
-+}
-+QUERY;
-+
-+        $this->request->setPathInfo('/graphql');
-+        $this->request->setMethod('GET');
-+        $this->request->setQueryValue('query', $query);
-+        $response = $this->graphqlController->dispatch($this->request);
-+        $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
-+        $expectedCacheTags = ['cms_b', 'cms_b_' . $block->getId(), 'cms_b_' . $block->getIdentifier(), 'FPC'];
-+        $rawActualCacheTags = $response->getHeader('X-Magento-Tags')->getFieldValue();
-+        $actualCacheTags = explode(',', $rawActualCacheTags);
-+        $this->assertEquals($expectedCacheTags, $actualCacheTags);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Cms/CmsPageCacheTest.php b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Cms/CmsPageCacheTest.php
-new file mode 100644
-index 00000000000..8d4bbfc0f2b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Cms/CmsPageCacheTest.php
-@@ -0,0 +1,80 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\GraphQlCache\Controller\Cms;
-+
-+use Magento\Cms\Model\GetPageByIdentifier;
-+use Magento\Framework\App\Request\Http;
-+use Magento\GraphQl\Controller\GraphQl;
-+use Magento\GraphQlCache\Controller\AbstractGraphqlCacheTest;
-+
-+/**
-+ * Test caching works for CMS page
-+ *
-+ * @magentoAppArea graphql
-+ * @magentoCache full_page enabled
-+ * @magentoDbIsolation disabled
-+ *
-+ */
-+class CmsPageCacheTest extends AbstractGraphqlCacheTest
-+{
-+    /**
-+     * @var GraphQl
-+     */
-+    private $graphqlController;
-+
-+    /**
-+     * @var Http
-+     */
-+    private $request;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-+    {
-+        parent::setUp();
-+        $this->graphqlController = $this->objectManager->get(\Magento\GraphQl\Controller\GraphQl::class);
-+        $this->request = $this->objectManager->create(Http::class);
-+    }
-+
-+    /**
-+     * Test that the correct cache tags get added to request for cmsPage query
-+     *
-+     * @magentoDataFixture Magento/Cms/_files/pages.php
-+     */
-+    public function testToCheckCmsPageRequestCacheTags(): void
-+    {
-+        $cmsPage = $this->objectManager->get(GetPageByIdentifier::class)->execute('page100', 0);
-+        $pageId = $cmsPage->getId();
-+
-+        $query =
-+            <<<QUERY
-+        {
-+         cmsPage(id: $pageId) {
-+                   url_key
-+                   title
-+                   content
-+                   content_heading
-+                   page_layout
-+                   meta_title
-+                   meta_description
-+                   meta_keywords
-+                   }
-+         }
-+QUERY;
-+
-+        $this->request->setPathInfo('/graphql');
-+        $this->request->setMethod('GET');
-+        $this->request->setQueryValue('query', $query);
-+        $response = $this->graphqlController->dispatch($this->request);
-+        $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
-+        $requestedCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
-+        $expectedCacheTags = ['cms_p', 'cms_p_' .$pageId , 'FPC'];
-+        $this->assertEquals($expectedCacheTags, $requestedCacheTags);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/GroupedImportExport/Model/GroupedTest.php b/dev/tests/integration/testsuite/Magento/GroupedImportExport/Model/GroupedTest.php
-index 67817b068ff..afd515757ae 100644
---- a/dev/tests/integration/testsuite/Magento/GroupedImportExport/Model/GroupedTest.php
-+++ b/dev/tests/integration/testsuite/Magento/GroupedImportExport/Model/GroupedTest.php
-@@ -9,7 +9,10 @@ use Magento\CatalogImportExport\Model\AbstractProductExportImportTestCase;
- 
- class GroupedTest extends AbstractProductExportImportTestCase
- {
--    public function exportImportDataProvider()
-+    /**
-+     * @return array
-+     */
-+    public function exportImportDataProvider(): array
-     {
-         return [
-             'grouped-product' => [
-@@ -23,17 +26,13 @@ class GroupedTest extends AbstractProductExportImportTestCase
-         ];
-     }
- 
--    public function importReplaceDataProvider()
--    {
--        return $this->exportImportDataProvider();
--    }
--
-     /**
--     * @param \Magento\Catalog\Model\Product $expectedProduct
--     * @param \Magento\Catalog\Model\Product $actualProduct
-+     * @inheritdoc
-      */
--    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
--    {
-+    protected function assertEqualsSpecificAttributes(
-+        \Magento\Catalog\Model\Product $expectedProduct,
-+        \Magento\Catalog\Model\Product $actualProduct
-+    ): void {
-         $expectedAssociatedProducts = $expectedProduct->getTypeInstance()->getAssociatedProducts($expectedProduct);
-         $actualAssociatedProducts = $actualProduct->getTypeInstance()->getAssociatedProducts($actualProduct);
- 
-diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
-index dcf4565873e..ed283d196e6 100644
---- a/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
-+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
-@@ -5,8 +5,19 @@
-  */
- namespace Magento\GroupedProduct\Model\Product\Type;
- 
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\CatalogInventory\Model\Configuration;
-+use Magento\Framework\App\Config\ReinitableConfigInterface;
-+use Magento\Framework\App\Config\Value;
-+
- class GroupedTest extends \PHPUnit\Framework\TestCase
- {
-+    /**
-+     * @var ReinitableConfigInterface
-+     */
-+    private $reinitableConfig;
-+
-     /**
-      * @var \Magento\Framework\ObjectManagerInterface
-      */
-@@ -20,16 +31,21 @@ class GroupedTest extends \PHPUnit\Framework\TestCase
-     protected function setUp()
-     {
-         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
--
-         $this->_productType = $this->objectManager->get(\Magento\Catalog\Model\Product\Type::class);
-+        $this->reinitableConfig = $this->objectManager->get(ReinitableConfigInterface::class);
-+    }
-+
-+    protected function tearDown()
-+    {
-+        $this->dropConfigValue(Configuration::XML_PATH_SHOW_OUT_OF_STOCK);
-     }
- 
-     public function testFactory()
-     {
-         $product = new \Magento\Framework\DataObject();
--        $product->setTypeId(\Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE);
-+        $product->setTypeId(Grouped::TYPE_CODE);
-         $type = $this->_productType->factory($product);
--        $this->assertInstanceOf(\Magento\GroupedProduct\Model\Product\Type\Grouped::class, $type);
-+        $this->assertInstanceOf(Grouped::class, $type);
-     }
- 
-     /**
-@@ -38,12 +54,12 @@ class GroupedTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testGetAssociatedProducts()
-     {
--        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
- 
--        /** @var \Magento\Catalog\Model\Product $product */
-+        /** @var Product $product */
-         $product = $productRepository->get('grouped-product');
-         $type = $product->getTypeInstance();
--        $this->assertInstanceOf(\Magento\GroupedProduct\Model\Product\Type\Grouped::class, $type);
-+        $this->assertInstanceOf(Grouped::class, $type);
- 
-         $associatedProducts = $type->getAssociatedProducts($product);
-         $this->assertCount(2, $associatedProducts);
-@@ -53,7 +69,7 @@ class GroupedTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @param \Magento\Catalog\Model\Product $product
-+     * @param Product $product
-      */
-     private function assertProductInfo($product)
-     {
-@@ -92,25 +108,25 @@ class GroupedTest extends \PHPUnit\Framework\TestCase
-             \Magento\Framework\DataObject::class,
-             ['data' => ['value' => ['qty' => 2]]]
-         );
--        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
--        $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-         $product = $productRepository->get('grouped-product');
- 
--        /** @var \Magento\GroupedProduct\Model\Product\Type\Grouped $type */
--        $type = $this->objectManager->get(\Magento\GroupedProduct\Model\Product\Type\Grouped::class);
-+        /** @var Grouped $type */
-+        $type = $this->objectManager->get(Grouped::class);
- 
-         $processModes = [
--            \Magento\GroupedProduct\Model\Product\Type\Grouped::PROCESS_MODE_FULL,
--            \Magento\GroupedProduct\Model\Product\Type\Grouped::PROCESS_MODE_LITE
-+            Grouped::PROCESS_MODE_FULL,
-+            Grouped::PROCESS_MODE_LITE
-         ];
-         $expectedData = [
--            \Magento\GroupedProduct\Model\Product\Type\Grouped::PROCESS_MODE_FULL => [
-+            Grouped::PROCESS_MODE_FULL => [
-                 1  => '{"super_product_config":{"product_type":"grouped","product_id":"'
-                     . $product->getId() . '"}}',
-                 21 => '{"super_product_config":{"product_type":"grouped","product_id":"'
-                     . $product->getId() . '"}}',
-             ],
--            \Magento\GroupedProduct\Model\Product\Type\Grouped::PROCESS_MODE_LITE => [
-+            Grouped::PROCESS_MODE_LITE => [
-                 $product->getId() => '{"value":{"qty":2}}',
-             ]
-         ];
-@@ -127,4 +143,152 @@ class GroupedTest extends \PHPUnit\Framework\TestCase
-             }
-         }
-     }
-+
-+    /**
-+     * Test adding grouped product to cart when one of subproducts is out of stock.
-+     *
-+     * @magentoDataFixture Magento/GroupedProduct/_files/product_grouped_with_out_of_stock.php
-+     * @magentoAppArea frontend
-+     * @magentoAppIsolation enabled
-+     * @magentoDbIsolation enabled
-+     * @dataProvider outOfStockSubProductDataProvider
-+     * @param bool $outOfStockShown
-+     * @param array $data
-+     * @param array $expected
-+     */
-+    public function testOutOfStockSubProduct(bool $outOfStockShown, array $data, array $expected)
-+    {
-+        $this->changeConfigValue(Configuration::XML_PATH_SHOW_OUT_OF_STOCK, $outOfStockShown);
-+        $buyRequest = new \Magento\Framework\DataObject($data);
-+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-+        /** @var Product $product */
-+        $product = $productRepository->get('grouped-product');
-+        /** @var Grouped $groupedProduct */
-+        $groupedProduct = $this->objectManager->get(Grouped::class);
-+        $actual = $groupedProduct->prepareForCartAdvanced($buyRequest, $product, Grouped::PROCESS_MODE_FULL);
-+        self::assertEquals(
-+            count($expected),
-+            count($actual)
-+        );
-+        /** @var Product $product */
-+        foreach ($actual as $product) {
-+            $sku = $product->getSku();
-+            self::assertEquals(
-+                $expected[$sku],
-+                $product->getCartQty(),
-+                "Failed asserting that Product Cart Quantity matches expected"
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Data provider for testOutOfStockSubProduct.
-+     *
-+     * @return array
-+     */
-+    public function outOfStockSubProductDataProvider()
-+    {
-+        return [
-+            'Out of stock product are shown #1' => [
-+                true,
-+                [
-+                    'product' => 3,
-+                    'qty' => 1,
-+                    'super_group' => [
-+                        1 => 4,
-+                        21 => 5,
-+                    ],
-+                ],
-+                [
-+                    'virtual-product' => 5,
-+                    'simple' => 4
-+                ],
-+            ],
-+            'Out of stock product are shown #2' => [
-+                true,
-+                [
-+                    'product' => 3,
-+                    'qty' => 1,
-+                    'super_group' => [
-+                        1 => 0,
-+                    ],
-+                ],
-+                [
-+                    'virtual-product' => 2.5, // This is a default quantity.
-+                ],
-+            ],
-+            'Out of stock product are hidden #1' => [
-+                false,
-+                [
-+                    'product' => 3,
-+                    'qty' => 1,
-+                    'super_group' => [
-+                        1 => 4,
-+                        21 => 5,
-+                    ],
-+                ],
-+                [
-+                    'virtual-product' => 5,
-+                    'simple' => 4,
-+                ],
-+            ],
-+            'Out of stock product are hidden #2' => [
-+                false,
-+                [
-+                    'product' => 3,
-+                    'qty' => 1,
-+                    'super_group' => [
-+                        1 => 0,
-+                    ],
-+                ],
-+                [
-+                    'virtual-product' => 2.5, // This is a default quantity.
-+                ],
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Write config value to database.
-+     *
-+     * @param string $path
-+     * @param string $value
-+     * @param string $scope
-+     * @param int $scopeId
-+     */
-+    private function changeConfigValue(string $path, string $value, string $scope = 'default', int $scopeId = 0)
-+    {
-+        $configValue = $this->objectManager->create(Value::class);
-+        $configValue->setPath($path)
-+            ->setValue($value)
-+            ->setScope($scope)
-+            ->setScopeId($scopeId)
-+            ->save();
-+        $this->reinitConfig();
-+    }
-+
-+    /**
-+     * Delete config value from database.
-+     *
-+     * @param string $path
-+     */
-+    private function dropConfigValue(string $path)
-+    {
-+        $configValue = $this->objectManager->create(Value::class);
-+        try {
-+            $configValue->load($path, 'path');
-+            $configValue->delete();
-+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+            // do nothing
-+        }
-+        $this->reinitConfig();
-+    }
-+
-+    /**
-+     * Reinit config.
-+     */
-+    private function reinitConfig()
-+    {
-+        $this->reinitableConfig->reinit();
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_out_of_stock.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_out_of_stock.php
-new file mode 100644
-index 00000000000..369ce7d490e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_out_of_stock.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_associated.php';
-+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_virtual_in_stock.php';
-+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_virtual_out_of_stock.php';
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+
-+/** @var $product \Magento\Catalog\Model\Product */
-+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-+$product->isObjectNew(true);
-+$product->setTypeId(
-+    \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
-+)->setAttributeSetId(
-+    4
-+)->setWebsiteIds(
-+    [1]
-+)->setName(
-+    'Grouped Product'
-+)->setSku(
-+    'grouped-product'
-+)->setPrice(
-+    100
-+)->setTaxClassId(
-+    0
-+)->setVisibility(
-+    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
-+)->setStatus(
-+    \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
-+);
-+
-+$newLinks = [];
-+$productLinkFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class);
-+
-+/** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
-+$productLink = $productLinkFactory->create();
-+$linkedProduct = $productRepository->getById(1);
-+$productLink->setSku($product->getSku())
-+    ->setLinkType('associated')
-+    ->setLinkedProductSku($linkedProduct->getSku())
-+    ->setLinkedProductType($linkedProduct->getTypeId())
-+    ->setPosition(1)
-+    ->getExtensionAttributes()
-+    ->setQty(1);
-+$newLinks[] = $productLink;
-+
-+$subProductsSkus = ['virtual-product', 'virtual-product-out'];
-+foreach ($subProductsSkus as $sku) {
-+    /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
-+    $productLink = $productLinkFactory->create();
-+    $linkedProduct = $productRepository->get($sku);
-+    $productLink->setSku($product->getSku())
-+        ->setLinkType('associated')
-+        ->setLinkedProductSku($sku)
-+        ->setLinkedProductType($linkedProduct->getTypeId())
-+        ->getExtensionAttributes()
-+        ->setQty(2.5);
-+    $newLinks[] = $productLink;
-+}
-+$product->setProductLinks($newLinks);
-+$product->save();
-+
-+/** @var \Magento\Catalog\Api\CategoryLinkManagementInterface $categoryLinkManagement */
-+$categoryLinkManagement = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->create(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
-+
-+$categoryLinkManagement->assignProductToCategories(
-+    $product->getSku(),
-+    [2]
-+);
-diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_out_of_stock_rollback.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_out_of_stock_rollback.php
-new file mode 100644
-index 00000000000..26a7487077e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_out_of_stock_rollback.php
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+require 'product_grouped_rollback.php';
-+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_virtual_out_of_stock_rollback.php';
-+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_virtual_in_stock_rollback.php';
-+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_associated_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock.php
-new file mode 100644
-index 00000000000..6ef9b5cd5b0
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\Catalog\Model\Product\Type;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\GroupedProduct\Model\Product\Type\Grouped;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = Bootstrap::getObjectManager()
-+    ->get(ProductRepositoryInterface::class);
-+
-+$productLinkFactory = Bootstrap::getObjectManager()
-+    ->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class);
-+$productConfigs = [
-+    [
-+        'id' => '100000001',
-+        'stock_config' => ['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]
-+    ],
-+    [
-+        'id' => '100000002',
-+        'stock_config' =>  ['use_config_manage_stock' => 1, 'qty' => 0, 'is_qty_decimal' => 0, 'is_in_stock' => 0]
-+    ]
-+];
-+
-+foreach ($productConfigs as $productConfig) {
-+    /** @var $product Product */
-+    $product = Bootstrap::getObjectManager()->create(Product::class);
-+    $product->setTypeId(Type::TYPE_SIMPLE)
-+        ->setId($productConfig['id'])
-+        ->setWebsiteIds([1])
-+        ->setAttributeSetId(4)
-+        ->setName('Simple ' . $productConfig['id'])
-+        ->setSku('simple_' . $productConfig['id'])
-+        ->setPrice(100)
-+        ->setVisibility(Visibility::VISIBILITY_BOTH)
-+        ->setStatus(Status::STATUS_ENABLED)
-+        ->setStockData($productConfig['stock_config']);
-+
-+    $linkedProducts[] = $productRepository->save($product);
-+}
-+
-+/** @var $product Product */
-+$product = Bootstrap::getObjectManager()->create(Product::class);
-+
-+$product->setTypeId(Grouped::TYPE_CODE)
-+    ->setId('100000003')
-+    ->setWebsiteIds([1])
-+    ->setAttributeSetId(4)
-+    ->setName('Grouped Product')
-+    ->setSku('grouped')
-+    ->setVisibility(Visibility::VISIBILITY_BOTH)
-+    ->setStatus(Status::STATUS_ENABLED)
-+    ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
-+
-+foreach ($linkedProducts as $linkedProduct) {
-+    /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
-+    $productLink = $productLinkFactory->create();
-+    $productLink->setSku($product->getSku())
-+        ->setLinkType('associated')
-+        ->setLinkedProductSku($linkedProduct->getSku())
-+        ->setLinkedProductType($linkedProduct->getTypeId())
-+        ->getExtensionAttributes()
-+        ->setQty(1);
-+    $newLinks[] = $productLink;
-+}
-+
-+$product->setProductLinks($newLinks);
-+
-+$productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock_rollback.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock_rollback.php
-new file mode 100644
-index 00000000000..b81c008cf1a
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock_rollback.php
-@@ -0,0 +1,34 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+$skuList = ['simple_100000001', 'simple_100000002', 'grouped'];
-+foreach ($skuList as $sku) {
-+    try {
-+        $product = $productRepository->get($sku, false, null, true);
-+
-+        $stockStatus = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Status::class);
-+        $stockStatus->load($product->getData('entity_id'), 'product_id');
-+        $stockStatus->delete();
-+
-+        $productRepository->delete($product);
-+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-+        //Product already removed
-+    }
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php
-index 552a23a0c1f..a3cf42b4848 100644
---- a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php
-+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php
-@@ -3,9 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\ImportExport\Controller\Adminhtml\Import;
- 
- use Magento\Framework\Filesystem\DirectoryList;
-+use Magento\Framework\HTTP\Adapter\FileTransferFactory;
- use Magento\ImportExport\Model\Import;
- use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
- 
-@@ -17,12 +19,15 @@ class ValidateTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
-     /**
-      * @dataProvider validationDataProvider
-      * @param string $fileName
-+     * @param string $mimeType
-      * @param string $message
-      * @param string $delimiter
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      * @backupGlobals enabled
-      * @magentoDbIsolation enabled
-+     * @SuppressWarnings(PHPMD.Superglobals)
-      */
--    public function testValidationReturn($fileName, $message, $delimiter)
-+    public function testValidationReturn(string $fileName, string $mimeType, string $message, string $delimiter): void
-     {
-         $validationStrategy = ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_STOP_ON_ERROR;
- 
-@@ -50,7 +55,7 @@ class ValidateTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
-         $_FILES = [
-             'import_file' => [
-                 'name' => $fileName,
--                'type' => 'text/csv',
-+                'type' => $mimeType,
-                 'tmp_name' => $target,
-                 'error' => 0,
-                 'size' => filesize($target)
-@@ -59,10 +64,7 @@ class ValidateTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
- 
-         $this->_objectManager->configure(
-             [
--                'preferences' => [
--                    \Magento\Framework\HTTP\Adapter\FileTransferFactory::class =>
--                        \Magento\ImportExport\Controller\Adminhtml\Import\HttpFactoryMock::class
--                ]
-+                'preferences' => [FileTransferFactory::class => HttpFactoryMock::class]
-             ]
-         );
- 
-@@ -79,29 +81,39 @@ class ValidateTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
-     /**
-      * @return array
-      */
--    public function validationDataProvider()
-+    public function validationDataProvider(): array
-     {
-         return [
-             [
-                 'file_name' => 'catalog_product.csv',
-+                'mime-type' => 'text/csv',
-                 'message' => 'File is valid',
-                 'delimiter' => ',',
-             ],
-             [
-                 'file_name' => 'test.txt',
-+                'mime-type' => 'text/csv',
-                 'message' => '\'txt\' file extension is not supported',
-                 'delimiter' => ',',
-             ],
-             [
-                 'file_name' => 'incorrect_catalog_product_comma.csv',
-+                'mime-type' => 'text/csv',
-                 'message' => 'Download full report',
-                 'delimiter' => ',',
-             ],
-             [
-                 'file_name' => 'incorrect_catalog_product_semicolon.csv',
-+                'mime-type' => 'text/csv',
-                 'message' => 'Download full report',
-                 'delimiter' => ';',
-             ],
-+            [
-+                'file_name' => 'catalog_product.zip',
-+                'mime-type' => 'application/zip',
-+                'message' => 'File is valid',
-+                'delimiter' => ',',
-+            ],
-         ];
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/catalog_product.zip b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/catalog_product.zip
-new file mode 100644
-index 00000000000..812beae22b7
-Binary files /dev/null and b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/catalog_product.zip differ
-diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/ImportTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/ImportTest.php
-index 5ba95543002..93fa04806d5 100644
---- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/ImportTest.php
-+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/ImportTest.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\ImportExport\Model;
- 
-+use Magento\Framework\Phrase;
- use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
- 
- /**
-@@ -33,9 +34,7 @@ class ImportTest extends \PHPUnit\Framework\TestCase
-         'catalog_product' => [
-             'token' => \Magento\ImportExport\Model\Source\Import\Behavior\Basic::class,
-             'code' => 'basic_behavior',
--            'notes' => [
--                \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE => "Note: Product IDs will be regenerated."
--            ],
-+            'notes' => [],
-         ],
-         'customer_composite' => [
-             'token' => \Magento\ImportExport\Model\Source\Import\Behavior\Basic::class,
-@@ -70,7 +69,7 @@ class ImportTest extends \PHPUnit\Framework\TestCase
-             \Magento\ImportExport\Model\Import\Config::class
-         );
-         $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\ImportExport\Model\Import::class,
-+            Import::class,
-             ['importConfig' => $this->_importConfig]
-         );
-     }
-@@ -108,8 +107,8 @@ class ImportTest extends \PHPUnit\Framework\TestCase
-         $validationStrategy = ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_STOP_ON_ERROR;
- 
-         $this->_model->setEntity('catalog_product');
--        $this->_model->setData(\Magento\ImportExport\Model\Import::FIELD_NAME_VALIDATION_STRATEGY, $validationStrategy);
--        $this->_model->setData(\Magento\ImportExport\Model\Import::FIELD_NAME_ALLOWED_ERROR_COUNT, 0);
-+        $this->_model->setData(Import::FIELD_NAME_VALIDATION_STRATEGY, $validationStrategy);
-+        $this->_model->setData(Import::FIELD_NAME_ALLOWED_ERROR_COUNT, 0);
- 
-         /** @var \Magento\ImportExport\Model\Import\AbstractSource|\PHPUnit_Framework_MockObject_MockObject $source */
-         $source = $this->getMockForAbstractClass(
-@@ -159,6 +158,8 @@ class ImportTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testGetEntityBehaviors()
-     {
-+        $this->prepareProductNotes();
-+
-         $importModel = $this->_model;
-         $actualBehaviors = $importModel->getEntityBehaviors();
- 
-@@ -200,4 +201,24 @@ class ImportTest extends \PHPUnit\Framework\TestCase
-             $this->assertEquals($behaviorClass, $actualBehaviors[$behaviorCode]);
-         }
-     }
-+
-+    /**
-+     * Add Catalog Product Notes to expected results.
-+     *
-+     * @return void
-+     * @ SuppressWarnings(PHPMD.)
-+     */
-+    private function prepareProductNotes(): void
-+    {
-+        $this->_entityBehaviors['catalog_product']['notes'] =
-+            [
-+                Import::BEHAVIOR_APPEND => new Phrase('New product data is added to the existing product data for'
-+                    . ' the existing entries in the database. All fields except sku can be updated.'),
-+                Import::BEHAVIOR_REPLACE => new Phrase('The existing product data is replaced with new data.'
-+                    . ' <b>Exercise caution when replacing data because the existing product data will be completely'
-+                    . ' cleared and all references in the system will be lost.</b>'),
-+                Import::BEHAVIOR_DELETE => new  Phrase('Any entities in the import data that already exist in the'
-+                    . ' database are deleted from the database.'),
-+            ];
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/System/Config/OauthSectionTest.php b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/System/Config/OauthSectionTest.php
-new file mode 100644
-index 00000000000..ac5d8005180
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/System/Config/OauthSectionTest.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+
-+namespace Magento\Integration\Block\Adminhtml\System\Config;
-+
-+class OauthSectionTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-+{
-+    /**
-+     * Checks that OAuth Section in the system config is loaded
-+     */
-+    public function testOAuthSection()
-+    {
-+        $this->dispatch('backend/admin/system_config/edit/section/oauth/');
-+        $body = $this->getResponse()->getBody();
-+        $this->assertContains('id="oauth_access_token_lifetime-head"', $body);
-+        $this->assertContains('id="oauth_cleanup-head"', $body);
-+        $this->assertContains('id="oauth_consumer-head"', $body);
-+        $this->assertContains('id="oauth_authentication_lock-head"', $body);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/DeleteTest.php b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/DeleteTest.php
-index 92ae76b0d9a..c6cc68582ae 100644
---- a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/DeleteTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/DeleteTest.php
-@@ -39,8 +39,8 @@ class DeleteTest extends \PHPUnit\Framework\TestCase
-         $buttonHtml = $this->deleteButtonBlock->render($integration);
-         $this->assertContains('title="Remove"', $buttonHtml);
-         $this->assertContains(
--            'onclick="this.setAttribute(\'data-url\', '
--            . '\'http://localhost/index.php/backend/admin/integration/delete/id/'
-+            'onclick="this.setAttribute(&#039;data-url&#039;, '
-+            . '&#039;http://localhost/index.php/backend/admin/integration/delete/id/'
-             . $integration->getId(),
-             $buttonHtml
-         );
-@@ -54,8 +54,8 @@ class DeleteTest extends \PHPUnit\Framework\TestCase
-         $buttonHtml = $this->deleteButtonBlock->render($integration);
-         $this->assertContains('title="Uninstall the extension to remove this integration"', $buttonHtml);
-         $this->assertContains(
--            'onclick="this.setAttribute(\'data-url\', '
--            . '\'http://localhost/index.php/backend/admin/integration/delete/id/'
-+            'onclick="this.setAttribute(&#039;data-url&#039;, '
-+            . '&#039;http://localhost/index.php/backend/admin/integration/delete/id/'
-             . $integration->getId(),
-             $buttonHtml
-         );
-diff --git a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/EditTest.php b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/EditTest.php
-index df180d02088..0463053e6b5 100644
---- a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/EditTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/EditTest.php
-@@ -40,7 +40,7 @@ class EditTest extends \PHPUnit\Framework\TestCase
-         $this->assertContains('title="Edit"', $buttonHtml);
-         $this->assertContains('class="action edit"', $buttonHtml);
-         $this->assertContains(
--            'onclick="window.location.href=\'http://localhost/index.php/backend/admin/integration/edit/id/'
-+            'onclick="window.location.href=&#039;http://localhost/index.php/backend/admin/integration/edit/id/'
-             . $integration->getId(),
-             $buttonHtml
-         );
-diff --git a/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php b/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
-index 8011873577d..4da0c12c608 100644
---- a/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
-@@ -7,6 +7,7 @@
- namespace Magento\Integration\Controller\Adminhtml;
- 
- use Magento\TestFramework\Bootstrap;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- 
- /**
-  * \Magento\Integration\Controller\Adminhtml\Integration
-@@ -20,6 +21,9 @@ class IntegrationTest extends \Magento\TestFramework\TestCase\AbstractBackendCon
-     /** @var \Magento\Integration\Model\Integration  */
-     private $_integration;
- 
-+    /**
-+     * @inheritDoc
-+     */
-     protected function setUp()
-     {
-         parent::setUp();
-@@ -29,6 +33,9 @@ class IntegrationTest extends \Magento\TestFramework\TestCase\AbstractBackendCon
-         $this->_integration = $integration->load('Fixture Integration', 'name');
-     }
- 
-+    /**
-+     * Test view page.
-+     */
-     public function testIndexAction()
-     {
-         $this->dispatch('backend/admin/integration/index');
-@@ -44,6 +51,9 @@ class IntegrationTest extends \Magento\TestFramework\TestCase\AbstractBackendCon
-         );
-     }
- 
-+    /**
-+     * Test creation form.
-+     */
-     public function testNewAction()
-     {
-         $this->dispatch('backend/admin/integration/new');
-@@ -61,6 +71,9 @@ class IntegrationTest extends \Magento\TestFramework\TestCase\AbstractBackendCon
-         );
-     }
- 
-+    /**
-+     * Test update form.
-+     */
-     public function testEditAction()
-     {
-         $integrationId = $this->_integration->getId();
-@@ -88,12 +101,16 @@ class IntegrationTest extends \Magento\TestFramework\TestCase\AbstractBackendCon
-         );
-     }
- 
-+    /**
-+     * Test saving.
-+     */
-     public function testSaveActionUpdateIntegration()
-     {
-         $integrationId = $this->_integration->getId();
-         $integrationName = $this->_integration->getName();
-         $this->getRequest()->setParam('id', $integrationId);
-         $url = 'http://magento.ll/endpoint_url';
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue(
-             [
-                 'name' => $integrationName,
-@@ -111,10 +128,14 @@ class IntegrationTest extends \Magento\TestFramework\TestCase\AbstractBackendCon
-         $this->assertRedirect($this->stringContains('backend/admin/integration/index/'));
-     }
- 
-+    /**
-+     * Test saving.
-+     */
-     public function testSaveActionNewIntegration()
-     {
-         $url = 'http://magento.ll/endpoint_url';
-         $integrationName = md5(rand());
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue(
-             [
-                 'name' => $integrationName,
-diff --git a/dev/tests/integration/testsuite/Magento/Integration/Model/Config/Consolidated/_files/integration.php b/dev/tests/integration/testsuite/Magento/Integration/Model/Config/Consolidated/_files/integration.php
-index cc2841f1acf..d72a1359dfa 100644
---- a/dev/tests/integration/testsuite/Magento/Integration/Model/Config/Consolidated/_files/integration.php
-+++ b/dev/tests/integration/testsuite/Magento/Integration/Model/Config/Consolidated/_files/integration.php
-@@ -9,6 +9,7 @@ return [
-         'endpoint_url' => 'http://example.com/endpoint1',
-         'identity_link_url' => 'http://www.example.com/identity1',
-         'resource' => [
-+            'Magento_Backend::admin',
-             'Magento_Customer::customer',
-             'Magento_Customer::manage',
-             'Magento_Sales::sales',
-@@ -26,6 +27,7 @@ return [
-         'endpoint_url' => 'http://example.com/integration2',
-         'identity_link_url' => 'http://www.example.com/identity2',
-         'resource' => [
-+            'Magento_Backend::admin',
-             'Magento_Sales::sales',
-             'Magento_Sales::sales_operation',
-             'Magento_Sales::sales_order',
-@@ -40,6 +42,7 @@ return [
-     'TestIntegration3' => [
-         'email' => 'test-integration3@example.com',
-         'resource' => [
-+            'Magento_Backend::admin',
-             'Magento_Sales::sales',
-             'Magento_Sales::sales_operation',
-             'Magento_Sales::sales_order',
-diff --git a/dev/tests/integration/testsuite/Magento/Integration/Model/ConfigBasedIntegrationManagerTest.php b/dev/tests/integration/testsuite/Magento/Integration/Model/ConfigBasedIntegrationManagerTest.php
-new file mode 100644
-index 00000000000..ee14b3ba53d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Integration/Model/ConfigBasedIntegrationManagerTest.php
-@@ -0,0 +1,126 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Integration\Model;
-+
-+/**
-+ * Test class for \Magento\Integration\Model\ConfigBasedIntegrationManager.php.
-+ */
-+class ConfigBasedIntegrationManagerTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $consolidatedMock;
-+
-+    /**
-+     * @var \Magento\Integration\Model\ConfigBasedIntegrationManager
-+     */
-+    protected $integrationManager;
-+
-+    /**
-+     * @var \Magento\Integration\Api\IntegrationServiceInterface
-+     */
-+    protected $integrationService;
-+
-+    /**
-+     * @var \Magento\TestFramework\ObjectManager
-+     */
-+    protected $objectManager;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $this->consolidatedMock = $this->createMock(\Magento\Integration\Model\ConsolidatedConfig::class);
-+        $this->objectManager->addSharedInstance(
-+            $this->consolidatedMock,
-+            \Magento\Integration\Model\ConsolidatedConfig::class
-+        );
-+        $this->integrationManager = $this->objectManager->create(
-+            \Magento\Integration\Model\ConfigBasedIntegrationManager::class,
-+            []
-+        );
-+        $this->integrationService = $this->objectManager->create(
-+            \Magento\Integration\Api\IntegrationServiceInterface::class,
-+            []
-+        );
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function tearDown()
-+    {
-+        $this->objectManager->removeSharedInstance(\Magento\Integration\Model\ConsolidatedConfig::class);
-+        parent::tearDown();
-+    }
-+
-+    /**
-+     * @magentoDbIsolation enabled
-+     */
-+    public function testProcessConfigBasedIntegrations()
-+    {
-+        $newIntegrations = require __DIR__ . '/Config/Consolidated/_files/integration.php';
-+        $this->consolidatedMock
-+            ->expects($this->any())
-+            ->method('getIntegrations')
-+            ->willReturn($newIntegrations);
-+
-+        // Check that the integrations do not exist already
-+        foreach ($newIntegrations as $integrationName => $integrationData) {
-+            $integration = $this->integrationService->findByName($integrationName);
-+            $this->assertEquals(null, $integration->getId(), 'Integration already exists');
-+        }
-+
-+        // Create new integrations
-+        $this->assertEquals(
-+            $newIntegrations,
-+            $this->integrationManager->processConfigBasedIntegrations($newIntegrations),
-+            'Error processing config based integrations.'
-+        );
-+        $createdIntegrations = [];
-+
-+        // Check that the integrations are new with "inactive" status
-+        foreach ($newIntegrations as $integrationName => $integrationData) {
-+            $integration = $this->integrationService->findByName($integrationName);
-+            $this->assertNotEmpty($integration->getId(), 'Integration was not created');
-+            $this->assertEquals(
-+                $integration::STATUS_INACTIVE,
-+                $integration->getStatus(),
-+                'Integration is not created with "inactive" status'
-+            );
-+            $createdIntegrations[$integrationName] = $integration;
-+        }
-+
-+        // Rerun integration creation with the same data (data has not changed)
-+        $this->assertEquals(
-+            $newIntegrations,
-+            $this->integrationManager->processConfigBasedIntegrations($newIntegrations),
-+            'Error processing config based integrations.'
-+        );
-+
-+        // Check that the integrations are not recreated when data has not actually changed
-+        foreach ($newIntegrations as $integrationName => $integrationData) {
-+            $integration = $this->integrationService->findByName($integrationName);
-+            $this->assertEquals(
-+                $createdIntegrations[$integrationName]->getId(),
-+                $integration->getId(),
-+                'Integration ID has changed'
-+            );
-+            $this->assertEquals(
-+                $createdIntegrations[$integrationName]->getStatus(),
-+                $integration->getStatus(),
-+                'Integration status has changed'
-+            );
-+        }
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/MediaStorage/Console/Command/ImageResizeCommandTest.php b/dev/tests/integration/testsuite/Magento/MediaStorage/Console/Command/ImageResizeCommandTest.php
-new file mode 100644
-index 00000000000..2cdfb5e7e4e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/MediaStorage/Console/Command/ImageResizeCommandTest.php
-@@ -0,0 +1,107 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\MediaStorage\Console\Command;
-+
-+use Magento\Catalog\Model\Product\Gallery\Processor;
-+use Magento\Catalog\Model\ProductRepository;
-+use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\Framework\Filesystem;
-+use Magento\Framework\Filesystem\Directory\WriteInterface;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Symfony\Component\Console\Tester\CommandTester;
-+
-+/**
-+ * Test for \Magento\MediaStorage\Console\Command\ImagesResizeCommand.
-+ *
-+ */
-+class ImageResizeCommandTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var CommandTester
-+     */
-+    private $tester;
-+
-+    /**
-+     * @var ImagesResizeCommand
-+     */
-+    private $command;
-+
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var WriteInterface
-+     */
-+    private $mediaDirectory;
-+
-+    /**
-+     * @var Filesystem
-+     */
-+    private $filesystem;
-+
-+    /**
-+     * @var string
-+     */
-+    private $fileName;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setUp()
-+    {
-+        $this->fileName = 'image.jpg';
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->command = $this->objectManager->get(ImagesResizeCommand::class);
-+        $this->tester = new CommandTester($this->command);
-+        $this->filesystem = $this->objectManager->get(Filesystem::class);
-+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-+    }
-+
-+    /**
-+     * Test command with zero byte file
-+     *
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-+     * @magentoDataFixture Magento/Catalog/_files/product_image.php
-+     *
-+     * @return void
-+     */
-+    public function testExecuteWithZeroByteImage()
-+    {
-+        $this->mediaDirectory->writeFile($this->fileName, '');
-+
-+        /** @var ProductRepository $productRepository */
-+        $productRepository = $this->objectManager->create(ProductRepository::class);
-+        $product = $productRepository->getById(1);
-+
-+        /** @var Processor $mediaGalleryProcessor */
-+        $mediaGalleryProcessor = $this->objectManager->get(Processor::class);
-+        $mediaGalleryProcessor->addImage(
-+            $product,
-+            $this->mediaDirectory->getAbsolutePath($this->fileName),
-+            ['image','thumbnail','small_image'],
-+            false,
-+            false
-+        );
-+
-+        $product->save();
-+
-+        $this->tester->execute([]);
-+        $this->assertContains('Wrong file', $this->tester->getDisplay());
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function tearDown()
-+    {
-+        $this->mediaDirectory->getDriver()->deleteFile($this->mediaDirectory->getAbsolutePath($this->fileName));
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
-index 4acba63d98e..2eda32e894d 100644
---- a/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
-+++ b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
-@@ -109,19 +109,6 @@ class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
-             });
-     }
- 
--    /**
--     * Checks that pid files are created
--     *
--     * @return void
--     */
--    public function testCheckThatPidFilesWasCreated()
--    {
--        $this->consumersRunner->run();
--        foreach ($this->consumerConfig->getConsumers() as $consumer) {
--            $this->waitConsumerPidFile($consumer->getName());
--        }
--    }
--
-     /**
-      * Tests running of specific consumer and his re-running when it is working
-      *
-@@ -185,23 +172,6 @@ class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
-         }
-     }
- 
--    /**
--     * @param string $consumerName
--     * @return void
--     */
--    private function waitConsumerPidFile($consumerName)
--    {
--        $pidFileFullPath = $this->getPidFileFullPath($consumerName);
--        $i = 0;
--        do {
--            sleep(1);
--        } while (!file_exists($pidFileFullPath) && ($i++ < 60));
--
--        if (!file_exists($pidFileFullPath)) {
--            $this->fail($consumerName . ' pid file does not exist.');
--        }
--    }
--
-     /**
-      * @return array
-      */
-diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObject.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObject.php
-deleted file mode 100644
-index 31843be00a5..00000000000
---- a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObject.php
-+++ /dev/null
-@@ -1,43 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\MysqlMq\Model;
--
--class DataObject extends \Magento\Framework\Api\AbstractExtensibleObject
--{
--    /**
--     * @return string
--     */
--    public function getName()
--    {
--        return $this->_get('name');
--    }
--
--    /**
--     * @param string $name
--     * @return $this
--     */
--    public function setName($name)
--    {
--        return $this->setData('name', $name);
--    }
--
--    /**
--     * @return int|null
--     */
--    public function getEntityId()
--    {
--        return $this->_get('entity_id');
--    }
--
--    /**
--     * @param int $entityId
--     * @return $this
--     */
--    public function setEntityId($entityId)
--    {
--        return $this->setData('entity_id', $entityId);
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObjectRepository.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObjectRepository.php
-deleted file mode 100644
-index 879872315ec..00000000000
---- a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObjectRepository.php
-+++ /dev/null
-@@ -1,25 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\MysqlMq\Model;
--
--class DataObjectRepository
--{
--    /**
--     * @param DataObject $dataObject
--     * @param string $requiredParam
--     * @param int|null $optionalParam
--     * @return bool
--     */
--    public function delayedOperation(
--        \Magento\MysqlMq\Model\DataObject $dataObject,
--        $requiredParam,
--        $optionalParam = null
--    ) {
--        echo "Processed '{$dataObject->getEntityId()}'; "
--            . "Required param '{$requiredParam}'; Optional param '{$optionalParam}'\n";
--        return true;
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Processor.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Processor.php
-deleted file mode 100644
-index 3b2a76104a2..00000000000
---- a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Processor.php
-+++ /dev/null
-@@ -1,28 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\MysqlMq\Model;
--
--/**
-- * Test message processor is used by \Magento\MysqlMq\Model\PublisherTest
-- */
--class Processor
--{
--    /**
--     * @param \Magento\MysqlMq\Model\DataObject $message
--     */
--    public function processMessage($message)
--    {
--        echo "Processed {$message->getEntityId()}\n";
--    }
--
--    /**
--     * @param \Magento\MysqlMq\Model\DataObject $message
--     */
--    public function processMessageWithException($message)
--    {
--        throw new \LogicException("Exception during message processing happened. Entity: {{$message->getEntityId()}}");
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/PublisherConsumerTest.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/PublisherConsumerTest.php
-index f03d03d3a25..f911165bd27 100644
---- a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/PublisherConsumerTest.php
-+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/PublisherConsumerTest.php
-@@ -3,87 +3,45 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\MysqlMq\Model;
- 
--use Magento\Framework\MessageQueue\PublisherInterface;
-+use Magento\Framework\MessageQueue\UseCase\QueueTestCaseAbstract;
-+use Magento\MysqlMq\Model\ResourceModel\MessageCollection;
-+use Magento\MysqlMq\Model\ResourceModel\MessageStatusCollection;
- 
- /**
-  * Test for MySQL publisher class.
-  *
-  * @magentoDbIsolation disabled
-  */
--class PublisherConsumerTest extends \PHPUnit\Framework\TestCase
-+class PublisherConsumerTest extends QueueTestCaseAbstract
- {
-     const MAX_NUMBER_OF_TRIALS = 3;
- 
-     /**
--     * @var \Magento\Framework\MessageQueue\PublisherInterface
-+     * @var string[]
-      */
--    protected $publisher;
--
--    /**
--     * @var \Magento\Framework\ObjectManagerInterface
--     */
--    protected $objectManager;
--
--    protected function setUp()
--    {
--        $this->markTestIncomplete('Should be converted to queue config v2.');
--        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
--
--        $configPath = __DIR__ . '/../etc/queue.xml';
--        $fileResolverMock = $this->createMock(\Magento\Framework\Config\FileResolverInterface::class);
--        $fileResolverMock->expects($this->any())
--            ->method('get')
--            ->willReturn([$configPath => file_get_contents(($configPath))]);
--
--        /** @var \Magento\Framework\MessageQueue\Config\Reader\Xml $xmlReader */
--        $xmlReader = $this->objectManager->create(
--            \Magento\Framework\MessageQueue\Config\Reader\Xml::class,
--            ['fileResolver' => $fileResolverMock]
--        );
--
--        $newData = $xmlReader->read();
--
--        /** @var \Magento\Framework\MessageQueue\Config\Data $configData */
--        $configData = $this->objectManager->get(\Magento\Framework\MessageQueue\Config\Data::class);
--        $configData->reset();
--        $configData->merge($newData);
--
--        $this->publisher = $this->objectManager->create(\Magento\Framework\MessageQueue\PublisherInterface::class);
--    }
--
--    protected function tearDown()
--    {
--        $this->markTestIncomplete('Should be converted to queue config v2.');
--        $this->consumeMessages('demoConsumerQueueOne', PHP_INT_MAX);
--        $this->consumeMessages('demoConsumerQueueTwo', PHP_INT_MAX);
--        $this->consumeMessages('demoConsumerQueueThree', PHP_INT_MAX);
--        $this->consumeMessages('demoConsumerQueueFour', PHP_INT_MAX);
--        $this->consumeMessages('demoConsumerQueueFive', PHP_INT_MAX);
--        $this->consumeMessages('demoConsumerQueueOneWithException', PHP_INT_MAX);
--
--        $objectManagerConfiguration = [\Magento\Framework\MessageQueue\Config\Reader\Xml::class => [
--                'arguments' => [
--                    'fileResolver' => ['instance' => \Magento\Framework\Config\FileResolverInterface::class],
--                ],
--            ],
--        ];
--        $this->objectManager->configure($objectManagerConfiguration);
--        /** @var \Magento\Framework\MessageQueue\Config\Data $queueConfig */
--        $queueConfig = $this->objectManager->get(\Magento\Framework\MessageQueue\Config\Data::class);
--        $queueConfig->reset();
--    }
-+    protected $consumers = [
-+        'demoConsumerQueueOne',
-+        'demoConsumerQueueTwo',
-+        'demoConsumerQueueThree',
-+        'delayedOperationConsumer',
-+        'demoConsumerWithException'
-+    ];
- 
-     /**
-      * @magentoDataFixture Magento/MysqlMq/_files/queues.php
-      */
-     public function testPublishConsumeFlow()
-     {
--        /** @var \Magento\MysqlMq\Model\DataObjectFactory $objectFactory */
--        $objectFactory = $this->objectManager->create(\Magento\MysqlMq\Model\DataObjectFactory::class);
--        /** @var \Magento\MysqlMq\Model\DataObject $object */
-+        /** @var \Magento\TestModuleMysqlMq\Model\DataObjectFactory $objectFactory */
-+        $objectFactory = $this->objectManager->create(\Magento\TestModuleMysqlMq\Model\DataObjectFactory::class);
-+        /** @var \Magento\TestModuleMysqlMq\Model\DataObject $object */
-         $object = $objectFactory->create();
-+        $object->setOutputPath($this->logFilePath);
-+        file_put_contents($this->logFilePath, '');
-         for ($i = 0; $i < 10; $i++) {
-             $object->setName('Object name ' . $i)->setEntityId($i);
-             $this->publisher->publish('demo.object.created', $object);
-@@ -96,105 +54,87 @@ class PublisherConsumerTest extends \PHPUnit\Framework\TestCase
-             $object->setName('Object name ' . $i)->setEntityId($i);
-             $this->publisher->publish('demo.object.custom.created', $object);
-         }
--
--        $outputPattern = '/(Processed \d+\s)/';
--        /** There are total of 10 messages in the first queue, total expected consumption is 7, 3 then 0 */
--        $this->consumeMessages('demoConsumerQueueOne', 7, 7, $outputPattern);
--        /** Consumer all messages which left in this queue */
--        $this->consumeMessages('demoConsumerQueueOne', PHP_INT_MAX, 3, $outputPattern);
--        $this->consumeMessages('demoConsumerQueueOne', 7, 0, $outputPattern);
--
--        /** Verify that messages were added correctly to second queue for update and create topics */
--        $this->consumeMessages('demoConsumerQueueTwo', 20, 15, $outputPattern);
--
--        /** Verify that messages were NOT added to fourth queue */
--        $this->consumeMessages('demoConsumerQueueFour', 11, 0, $outputPattern);
--
--        /** Verify that messages were added correctly by '*' pattern in bind config to third queue */
--        $this->consumeMessages('demoConsumerQueueThree', 20, 15, $outputPattern);
--
--        /** Verify that messages were added correctly by '#' pattern in bind config to fifth queue */
--        $this->consumeMessages('demoConsumerQueueFive', 20, 18, $outputPattern);
-+        $this->waitForAsynchronousResult(18, $this->logFilePath);
-+
-+        //Check lines in file
-+        $createdPattern = '/Processed object created \d+/';
-+        $updatedPattern = '/Processed object updated \d+/';
-+        $customCreatedPattern = '/Processed custom object created \d+/';
-+        $logFileContents = file_get_contents($this->logFilePath);
-+
-+        preg_match_all($createdPattern, $logFileContents, $createdMatches);
-+        $this->assertEquals(10, count($createdMatches[0]));
-+        preg_match_all($updatedPattern, $logFileContents, $updatedMatches);
-+        $this->assertEquals(5, count($updatedMatches[0]));
-+        preg_match_all($customCreatedPattern, $logFileContents, $customCreatedMatches);
-+        $this->assertEquals(3, count($customCreatedMatches[0]));
-     }
- 
-     /**
-      * @magentoDataFixture Magento/MysqlMq/_files/queues.php
-      */
--    public function testPublishAndConsumeWithFailedJobs()
-+    public function testPublishAndConsumeSchemaDefinedByMethod()
-     {
--        /** @var \Magento\MysqlMq\Model\DataObjectFactory $objectFactory */
--        $objectFactory = $this->objectManager->create(\Magento\MysqlMq\Model\DataObjectFactory::class);
--        /** @var \Magento\MysqlMq\Model\DataObject $object */
--        /** Try consume messages for MAX_NUMBER_OF_TRIALS and then consumer them without exception */
-+        $topic = 'test.schema.defined.by.method';
-+        /** @var \Magento\TestModuleMysqlMq\Model\DataObjectFactory $objectFactory */
-+        $objectFactory = $this->objectManager->create(\Magento\TestModuleMysqlMq\Model\DataObjectFactory::class);
-+        /** @var \Magento\TestModuleMysqlMq\Model\DataObject $object */
-         $object = $objectFactory->create();
--        for ($i = 0; $i < 5; $i++) {
--            $object->setName('Object name ' . $i)->setEntityId($i);
--            $this->publisher->publish('demo.object.created', $object);
--        }
--        $outputPattern = '/(Processed \d+\s)/';
--        for ($i = 0; $i < self::MAX_NUMBER_OF_TRIALS; $i++) {
--            $this->consumeMessages('demoConsumerQueueOneWithException', PHP_INT_MAX, 0, $outputPattern);
--        }
--        $this->consumeMessages('demoConsumerQueueOne', PHP_INT_MAX, 0, $outputPattern);
-+        $id = 33;
-+        $object->setName('Object name ' . $id)->setEntityId($id);
-+        $object->setOutputPath($this->logFilePath);
-+        $requiredStringParam = 'Required value';
-+        $optionalIntParam = 44;
-+        $this->publisher->publish($topic, [$object, $requiredStringParam, $optionalIntParam]);
- 
--        /** Try consume messages for MAX_NUMBER_OF_TRIALS+1 and then consumer them without exception */
--        for ($i = 0; $i < 5; $i++) {
--            $object->setName('Object name ' . $i)->setEntityId($i);
--            $this->publisher->publish('demo.object.created', $object);
--        }
--        /** Try consume messages for MAX_NUMBER_OF_TRIALS and then consumer them without exception */
--        for ($i = 0; $i < self::MAX_NUMBER_OF_TRIALS + 1; $i++) {
--            $this->consumeMessages('demoConsumerQueueOneWithException', PHP_INT_MAX, 0, $outputPattern);
--        }
--        /** Make sure that messages are not accessible anymore after number of trials is exceeded */
--        $this->consumeMessages('demoConsumerQueueOne', PHP_INT_MAX, 0, $outputPattern);
-+        $expectedOutput = "Processed '{$object->getEntityId()}'; "
-+            . "Required param '{$requiredStringParam}'; Optional param '{$optionalIntParam}'";
-+
-+        $this->waitForAsynchronousResult(1, $this->logFilePath);
-+
-+        $this->assertEquals($expectedOutput, trim(file_get_contents($this->logFilePath)));
-     }
- 
-     /**
-      * @magentoDataFixture Magento/MysqlMq/_files/queues.php
-      */
--    public function testPublishAndConsumeSchemaDefinedByMethod()
-+    public function testConsumeWithException()
-     {
--        /** @var \Magento\MysqlMq\Model\DataObjectFactory $objectFactory */
--        $objectFactory = $this->objectManager->create(\Magento\MysqlMq\Model\DataObjectFactory::class);
--        /** @var \Magento\MysqlMq\Model\DataObject $object */
-+        $topic = 'demo.exception';
-+        /** @var \Magento\TestModuleMysqlMq\Model\DataObjectFactory $objectFactory */
-+        $objectFactory = $this->objectManager->create(\Magento\TestModuleMysqlMq\Model\DataObjectFactory::class);
-+        /** @var \Magento\TestModuleMysqlMq\Model\DataObject $object */
-         $object = $objectFactory->create();
--        $id = 33;
-+        $id = 99;
-+
-         $object->setName('Object name ' . $id)->setEntityId($id);
--        $requiredStringParam = 'Required value';
--        $optionalIntParam = 44;
--        $this->publisher->publish('test.schema.defined.by.method', [$object, $requiredStringParam, $optionalIntParam]);
--        $outputPattern = "/Processed '{$object->getEntityId()}'; "
--            . "Required param '{$requiredStringParam}'; Optional param '{$optionalIntParam}'/";
--        $this->consumeMessages('delayedOperationConsumer', PHP_INT_MAX, 1, $outputPattern);
-+        $object->setOutputPath($this->logFilePath);
-+        $this->publisher->publish($topic, $object);
-+        $expectedOutput = "Exception processing {$id}";
-+        $this->waitForAsynchronousResult(1, $this->logFilePath);
-+        $message = $this->getTopicLatestMessage($topic);
-+        $this->assertEquals($expectedOutput, trim(file_get_contents($this->logFilePath)));
-+        $this->assertEquals(QueueManagement::MESSAGE_STATUS_ERROR, $message->getStatus());
-     }
- 
-     /**
--     * Make sure that consumers consume correct number of messages.
--     *
--     * @param string $consumerName
--     * @param int|null $messagesToProcess
--     * @param int|null $expectedNumberOfProcessedMessages
--     * @param string|null $outputPattern
-+     * @param string $topic
-+     * @return Message
-      */
--    protected function consumeMessages(
--        $consumerName,
--        $messagesToProcess,
--        $expectedNumberOfProcessedMessages = null,
--        $outputPattern = null
--    ) {
--        /** @var \Magento\Framework\MessageQueue\ConsumerFactory $consumerFactory */
--        $consumerFactory = $this->objectManager->create(\Magento\Framework\MessageQueue\ConsumerFactory::class);
--        $consumer = $consumerFactory->get($consumerName);
--        ob_start();
--        $consumer->process($messagesToProcess);
--        $consumersOutput = ob_get_contents();
--        ob_end_clean();
--        if ($outputPattern) {
--            $this->assertEquals(
--                $expectedNumberOfProcessedMessages,
--                preg_match_all($outputPattern, $consumersOutput)
--            );
--        }
-+    private function getTopicLatestMessage(string $topic) : Message
-+    {
-+        // Assert message status is error
-+        $messageCollection = $this->objectManager->create(MessageCollection::class);
-+        $messageStatusCollection = $this->objectManager->create(MessageStatusCollection::class);
-+
-+        $messageCollection->addFilter('topic_name', $topic);
-+        $messageCollection->join(
-+            ['status' => $messageStatusCollection->getMainTable()],
-+            "status.message_id = main_table.id"
-+        );
-+        $messageCollection->addOrder('updated_at', MessageCollection::SORT_ORDER_DESC);
-+
-+        $message = $messageCollection->getFirstItem();
-+        return $message;
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php
-index 197df292332..56dd77d3da1 100644
---- a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php
-+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php
-@@ -5,8 +5,6 @@
-  */
- namespace Magento\MysqlMq\Model;
- 
--use Magento\MysqlMq\Model\QueueManagement;
--
- /**
-  * Test for Queue Management class.
-  */
-diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/etc/queue.xml b/dev/tests/integration/testsuite/Magento/MysqlMq/etc/queue.xml
-deleted file mode 100644
-index fd618d504df..00000000000
---- a/dev/tests/integration/testsuite/Magento/MysqlMq/etc/queue.xml
-+++ /dev/null
-@@ -1,67 +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-message-queue:etc/queue.xsd">
--    <publisher name="demo-publisher-1" connection="db" exchange="magento"/>
--    <publisher name="demo-publisher-2" connection="db" exchange="magento"/>
--
--    <publisher name="test-publisher-1" connection="amqp" exchange="magento"/>
--    <publisher name="test-publisher-3" connection="amqp" exchange="test-exchange-1"/>
--
--    <topic name="demo.object.created" schema="Magento\MysqlMq\Model\DataObject" publisher="demo-publisher-1"/>
--    <topic name="demo.object.updated" schema="Magento\MysqlMq\Model\DataObject" publisher="demo-publisher-2"/>
--    <topic name="demo.object.custom.created" schema="Magento\MysqlMq\Model\DataObject" publisher="demo-publisher-2"/>
--
--    <topic name="test.schema.defined.by.method" schema="Magento\MysqlMq\Model\DataObjectRepository::delayedOperation" publisher="demo-publisher-2"/>
--
--    <topic name="customer.created" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="test-publisher-1"/>
--    <topic name="customer.created.one" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="test-publisher-1"/>
--    <topic name="customer.created.one.two" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="test-publisher-1"/>
--    <topic name="customer.created.two" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="test-publisher-1"/>
--    <topic name="customer.updated" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="demo-publisher-2"/>
--    <topic name="customer.deleted" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="demo-publisher-2"/>
--    <topic name="cart.created" schema="Magento\Quote\Api\Data\CartInterface" publisher="test-publisher-3"/>
--    <topic name="cart.created.one" schema="Magento\Quote\Api\Data\CartInterface" publisher="test-publisher-3"/>
--
--    <consumer name="demoConsumerQueueOne" queue="demo-queue-1" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
--    <consumer name="demoConsumerQueueOneWithException" queue="demo-queue-1" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessageWithException"/>
--    <consumer name="demoConsumerQueueTwo" queue="demo-queue-2" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
--    <consumer name="demoConsumerQueueThree" queue="demo-queue-3" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
--    <consumer name="demoConsumerQueueFour" queue="demo-queue-4" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
--    <consumer name="demoConsumerQueueFive" queue="demo-queue-5" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
--
--    <consumer name="customerCreatedListener" queue="test-queue-1" connection="amqp" class="Magento\MysqlMq\Model\Processor" method="processMessage"/>
--    <consumer name="customerDeletedListener" queue="test-queue-2" connection="db" class="Magento\MysqlMq\Model\Processor" method="processMessage" max_messages="98765"/>
--    <consumer name="cartCreatedListener" queue="test-queue-3" connection="amqp" class="Magento\MysqlMq\Model\Processor" method="processMessage"/>
--
--    <consumer name="delayedOperationConsumer" queue="demo-queue-6" connection="db" class="Magento\MysqlMq\Model\DataObjectRepository" method="delayedOperation"/>
--
--    <bind queue="demo-queue-1" exchange="magento" topic="demo.object.created"/>
--    <bind queue="demo-queue-2" exchange="magento" topic="demo.object.created"/>
--    <bind queue="demo-queue-2" exchange="magento" topic="demo.object.updated"/>
--    <bind queue="demo-queue-3" exchange="magento" topic="demo.object.*"/>
--    <bind queue="demo-queue-5" exchange="magento" topic="demo.object.#"/>
--
--    <bind queue="demo-queue-6" exchange="magento" topic="test.schema.defined.by.method"/>
--
--    <bind queue="test-queue-1" exchange="magento" topic="customer.created"/>
--    <bind queue="test-queue-1" exchange="magento" topic="customer.created.one"/>
--    <bind queue="test-queue-1" exchange="magento" topic="customer.created.one.two"/>
--    <bind queue="test-queue-1" exchange="magento" topic="customer.created.two"/>
--    <bind queue="test-queue-1" exchange="magento" topic="customer.updated"/>
--    <bind queue="test-queue-1" exchange="test-exchange-1" topic="cart.created"/>
--    <bind queue="test-queue-2" exchange="magento" topic="customer.created"/>
--    <bind queue="test-queue-2" exchange="magento" topic="customer.deleted"/>
--    <bind queue="test-queue-3" exchange="magento" topic="cart.created"/>
--    <bind queue="test-queue-3" exchange="magento" topic="cart.created.one"/>
--    <bind queue="test-queue-3" exchange="test-exchange-1" topic="cart.created"/>
--    <bind queue="test-queue-4" exchange="magento" topic="customer.*"/>
--    <bind queue="test-queue-5" exchange="magento" topic="customer.#"/>
--    <bind queue="test-queue-7" exchange="magento" topic="*.created.*"/>
--    <bind queue="test-queue-8" exchange="magento" topic="*.created.#"/>
--    <bind queue="test-queue-9" exchange="magento" topic="#"/>
--</config>
-diff --git a/dev/tests/integration/testsuite/Magento/NewRelicReporting/Model/Module/CollectTest.php b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Model/Module/CollectTest.php
-new file mode 100644
-index 00000000000..5e5051163cc
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Model/Module/CollectTest.php
-@@ -0,0 +1,38 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\NewRelicReporting\Model\Module;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use PHPUnit\Framework\TestCase;
-+
-+/***
-+ * Class CollectTest
-+ */
-+class CollectTest extends TestCase
-+{
-+    /**
-+     * @var Collect
-+     */
-+    private $collect;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->collect = Bootstrap::getObjectManager()->create(Collect::class);
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testReport()
-+    {
-+        $this->collect->getModuleData();
-+        $moduleData = $this->collect->getModuleData();
-+        $this->assertEmpty($moduleData['changes']);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php
-new file mode 100644
-index 00000000000..9271e089422
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php
-@@ -0,0 +1,76 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\NewRelicReporting\Plugin;
-+
-+use Magento\Framework\App\State;
-+use Magento\NewRelicReporting\Model\NewRelicWrapper;
-+use Magento\TestFramework\ObjectManager;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Class SeparateAppsTest
-+ */
-+class SeparateAppsTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+    }
-+
-+    /**
-+     * @magentoConfigFixture default/newrelicreporting/general/enable 1
-+     * @magentoConfigFixture default/newrelicreporting/general/app_name beverly_hills
-+     * @magentoConfigFixture default/newrelicreporting/general/separate_apps 1
-+     */
-+    public function testAppNameIsSetWhenConfiguredCorrectly()
-+    {
-+        $newRelicWrapper = $this->getMockBuilder(NewRelicWrapper::class)
-+            ->setMethods(['setAppName'])
-+            ->getMock();
-+
-+        $this->objectManager->configure([NewRelicWrapper::class => ['shared' => true]]);
-+        $this->objectManager->addSharedInstance($newRelicWrapper, NewRelicWrapper::class);
-+
-+        $newRelicWrapper->expects($this->once())
-+            ->method('setAppName')
-+            ->with($this->equalTo('beverly_hills;beverly_hills_90210'));
-+
-+        $state = $this->objectManager->get(State::class);
-+
-+        $state->setAreaCode('90210');
-+    }
-+
-+    /**
-+     * @magentoConfigFixture default/newrelicreporting/general/enable 1
-+     * @magentoConfigFixture default/newrelicreporting/general/app_name beverly_hills
-+     * @magentoConfigFixture default/newrelicreporting/general/separate_apps 0
-+     */
-+    public function testAppNameIsNotSetWhenDisabled()
-+    {
-+        $newRelicWrapper = $this->getMockBuilder(NewRelicWrapper::class)
-+            ->setMethods(['setAppName'])
-+            ->getMock();
-+
-+        $this->objectManager->configure([NewRelicWrapper::class => ['shared' => true]]);
-+        $this->objectManager->addSharedInstance($newRelicWrapper, NewRelicWrapper::class);
-+
-+        $newRelicWrapper->expects($this->never())->method('setAppName');
-+
-+        $state = $this->objectManager->get(State::class);
-+
-+        $state->setAreaCode('90210');
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php
-new file mode 100644
-index 00000000000..48d3356525f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php
-@@ -0,0 +1,105 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Newsletter\Block\Adminhtml\Subscriber;
-+
-+/**
-+ * @magentoAppArea adminhtml
-+ * @magentoDbIsolation enabled
-+ *
-+ * @see \Magento\Newsletter\Block\Adminhtml\Subscriber\Grid
-+ */
-+class GridTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var null|\Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager = null;
-+    /**
-+     * @var null|\Magento\Framework\View\LayoutInterface
-+     */
-+    private $layout = null;
-+
-+    /**
-+     * Set up layout.
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+        $this->layout = $this->objectManager->create(\Magento\Framework\View\LayoutInterface::class);
-+        $this->layout->getUpdate()->load('newsletter_subscriber_grid');
-+        $this->layout->generateXml();
-+        $this->layout->generateElements();
-+    }
-+
-+    /**
-+     * Check if mass action block exists.
-+     */
-+    public function testMassActionBlockExists()
-+    {
-+        $this->assertNotFalse(
-+            $this->getMassActionBlock(),
-+            'Mass action block does not exist in the grid, or it name was changed.'
-+        );
-+    }
-+
-+    /**
-+     * Check if mass action id field is correct.
-+     */
-+    public function testMassActionFieldIdIsCorrect()
-+    {
-+        $this->assertEquals(
-+            'subscriber_id',
-+            $this->getMassActionBlock()->getMassactionIdField(),
-+            'Mass action id field is incorrect.'
-+        );
-+    }
-+
-+    /**
-+     * Check if function returns correct result.
-+     *
-+     * @magentoDataFixture Magento/Newsletter/_files/subscribers.php
-+     */
-+    public function testMassActionBlockContainsCorrectIdList()
-+    {
-+        $this->assertEquals(
-+            implode(',', $this->getAllSubscriberIdList()),
-+            $this->getMassActionBlock()->getGridIdsJson(),
-+            'Function returns incorrect result.'
-+        );
-+    }
-+
-+    /**
-+     * Retrieve mass action block.
-+     *
-+     * @return bool|\Magento\Backend\Block\Widget\Grid\Massaction
-+     */
-+    private function getMassActionBlock()
-+    {
-+        return $this->layout->getBlock('adminhtml.newslettrer.subscriber.grid.massaction');
-+    }
-+
-+    /**
-+     * Retrieve list of id of all subscribers.
-+     *
-+     * @return array
-+     */
-+    private function getAllSubscriberIdList()
-+    {
-+        /** @var \Magento\Framework\App\ResourceConnection $resourceConnection */
-+        $resourceConnection = $this->objectManager->get(\Magento\Framework\App\ResourceConnection::class);
-+        $select = $resourceConnection->getConnection()
-+            ->select()
-+            ->from($resourceConnection->getTableName('newsletter_subscriber'))
-+            ->columns(['subscriber_id' => 'subscriber_id']);
-+
-+        return $resourceConnection->getConnection()->fetchCol($select);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
-index 5c1a11756c1..7a0ac030d12 100644
---- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Newsletter\Controller\Adminhtml;
- 
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+
- /**
-  * @magentoAppArea adminhtml
-  */
-@@ -15,6 +17,9 @@ class NewsletterQueueTest extends \Magento\TestFramework\TestCase\AbstractBacken
-      */
-     protected $_model;
- 
-+    /**
-+     * @inheritDoc
-+     */
-     protected function setUp()
-     {
-         parent::setUp();
-@@ -23,6 +28,9 @@ class NewsletterQueueTest extends \Magento\TestFramework\TestCase\AbstractBacken
-         );
-     }
- 
-+    /**
-+     * @inheritDoc
-+     */
-     protected function tearDown()
-     {
-         /**
-@@ -47,6 +55,7 @@ class NewsletterQueueTest extends \Magento\TestFramework\TestCase\AbstractBacken
-             'subject' => 'test subject',
-             'text' => 'newsletter text',
-         ];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($postForQueue);
- 
-         // Loading by code, since ID will vary. template_code is not actually used to load anywhere else.
-diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
-index 50e89d92e43..ae57703f9e8 100644
---- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
-@@ -20,6 +20,9 @@ class NewsletterTemplateTest extends \Magento\TestFramework\TestCase\AbstractBac
-      */
-     protected $model;
- 
-+    /**
-+     * @inheritDoc
-+     */
-     protected function setUp()
-     {
-         parent::setUp();
-@@ -39,6 +42,9 @@ class NewsletterTemplateTest extends \Magento\TestFramework\TestCase\AbstractBac
-         );
-     }
- 
-+    /**
-+     * @inheritDoc
-+     */
-     protected function tearDown()
-     {
-         /**
-@@ -138,19 +144,6 @@ class NewsletterTemplateTest extends \Magento\TestFramework\TestCase\AbstractBac
-         $this->getRequest()->setMethod(\Zend\Http\Request::METHOD_GET)->setParam('id', $this->model->getId());
-         $this->dispatch('backend/newsletter/template/save');
- 
--        /**
--         * Check that errors was generated and set to session
--         */
--        $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
--
--        /**
--         * Check that correct redirect performed.
--         */
--        $backendUrlModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
--            \Magento\Backend\Model\UrlInterface::class
--        );
--        $backendUrlModel->turnOffSecretKey();
--        $url = $backendUrlModel->getUrl('newsletter');
--        $this->assertRedirect($this->stringStartsWith($url));
-+        $this->assertEquals(404, $this->getResponse()->getStatusCode());
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/ManageTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/ManageTest.php
-index 5a094eb05c7..175c1c7c6c6 100644
---- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/ManageTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/ManageTest.php
-@@ -40,7 +40,7 @@ class ManageTest extends \Magento\TestFramework\TestCase\AbstractController
-     protected function tearDown()
-     {
-         $this->customerSession->setCustomerId(null);
--        $this->coreSession->unsData('_form_key');
-+        $this->coreSession->unsetData('_form_key');
-     }
- 
-     /**
-diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
-index 5347881f5e7..9dbf5c4d2a2 100644
---- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
-@@ -57,7 +57,7 @@ class SubscriberTest extends AbstractController
-         $this->dispatch('newsletter/subscriber/new');
- 
-         $this->assertSessionMessages($this->equalTo([
--                'There was a problem with the subscription: This email address is already assigned to another user.',
-+                'Thank you for your subscription.',
-             ]));
-         $this->assertRedirect($this->anything());
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/Plugin/PluginTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/Plugin/PluginTest.php
-index 39db400d2d6..dbc666e49b6 100644
---- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/Plugin/PluginTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/Plugin/PluginTest.php
-@@ -167,4 +167,42 @@ class PluginTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(0, (int)$subscriber->getId());
-         return $subscriber;
-     }
-+
-+    /**
-+     * @magentoAppArea adminhtml
-+     * @magentoDbIsolation enabled
-+     */
-+    public function testCustomerWithZeroStoreIdIsSubscribed()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+
-+        $currentStore = $objectManager->get(
-+            \Magento\Store\Model\StoreManagerInterface::class
-+        )->getStore()->getId();
-+
-+        $subscriber = $objectManager->create(\Magento\Newsletter\Model\Subscriber::class);
-+        /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
-+        $subscriber->setStoreId($currentStore)
-+            ->setCustomerId(0)
-+            ->setSubscriberEmail('customer@example.com')
-+            ->setSubscriberStatus(\Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED)
-+            ->save();
-+
-+        /** @var \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory */
-+        $customerFactory = $objectManager->get(\Magento\Customer\Api\Data\CustomerInterfaceFactory::class);
-+        $customerDataObject = $customerFactory->create()
-+            ->setFirstname('Firstname')
-+            ->setLastname('Lastname')
-+            ->setStoreId(0)
-+            ->setEmail('customer@example.com');
-+        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
-+        $customer = $this->accountManagement->createAccount($customerDataObject);
-+
-+        $this->customerRepository->save($customer);
-+
-+        $subscriber->loadByEmail('customer@example.com');
-+
-+        $this->assertEquals($customer->getId(), (int)$subscriber->getCustomerId());
-+        $this->assertEquals($currentStore, (int)$subscriber->getStoreId());
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_second_website.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_second_website.php
-new file mode 100644
-index 00000000000..52551e6dc96
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_second_website.php
-@@ -0,0 +1,40 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\ResourceConnection;
-+use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate;
-+use Magento\Store\Api\WebsiteRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var WebsiteRepositoryInterface $websiteRepository */
-+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
-+$website = $websiteRepository->get('test');
-+
-+/** @var ResourceConnection $resource */
-+$resource = $objectManager->get(ResourceConnection::class);
-+$connection = $resource->getConnection();
-+$resourceModel = $objectManager->create(Tablerate::class);
-+$entityTable = $resourceModel->getTable('shipping_tablerate');
-+$data =
-+    [
-+        'website_id' => $website->getId(),
-+        'dest_country_id' => 'US',
-+        'dest_region_id' => 0,
-+        'dest_zip' => '*',
-+        'condition_name' => 'package_qty',
-+        'condition_value' => 1,
-+        'price' => 20,
-+        'cost' => 20
-+    ];
-+$connection->query(
-+    "INSERT INTO {$entityTable} (`website_id`,  `dest_country_id`, `dest_region_id`, `dest_zip`, `condition_name`,"
-+    . "`condition_value`, `price`, `cost`) VALUES (:website_id,  :dest_country_id, :dest_region_id, :dest_zip,"
-+    . " :condition_name, :condition_value, :price, :cost);",
-+    $data
-+);
-diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_second_website_rollback.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_second_website_rollback.php
-new file mode 100644
-index 00000000000..9606b0eb605
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_second_website_rollback.php
-@@ -0,0 +1,13 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+$resource = $objectManager->get(\Magento\Framework\App\ResourceConnection::class);
-+$connection = $resource->getConnection();
-+$resourceModel = $objectManager->create(\Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate::class);
-+$entityTable = $resourceModel->getTable('shipping_tablerate');
-+$connection->query("DELETE FROM {$entityTable};");
-diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight.php
-new file mode 100644
-index 00000000000..40e01a81ac8
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight.php
-@@ -0,0 +1,29 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+$resource = $objectManager->get(\Magento\Framework\App\ResourceConnection::class);
-+$connection = $resource->getConnection();
-+$resourceModel = $objectManager->create(\Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate::class);
-+$entityTable = $resourceModel->getTable('shipping_tablerate');
-+$data =
-+    [
-+        'website_id' => 1,
-+        'dest_country_id' => 'US',
-+        'dest_region_id' => 0,
-+        'dest_zip' => '*',
-+        'condition_name' => 'package_weight',
-+        'condition_value' => 0,
-+        'price' => 10,
-+        'cost' => 0
-+    ];
-+$connection->query(
-+    "INSERT INTO {$entityTable} (`website_id`,  `dest_country_id`, `dest_region_id`, `dest_zip`, `condition_name`,"
-+    . "`condition_value`, `price`, `cost`) VALUES (:website_id,  :dest_country_id, :dest_region_id, :dest_zip,"
-+    . " :condition_name, :condition_value, :price, :cost);",
-+    $data
-+);
-diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight_rollback.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight_rollback.php
-new file mode 100644
-index 00000000000..cb6e9353b89
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require 'tablerates_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheStateTest.php b/dev/tests/integration/testsuite/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheStateTest.php
-new file mode 100644
-index 00000000000..dc2447e8b4c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheStateTest.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ *
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\PageCache\Observer\SwitchPageCacheOnMaintenance;
-+
-+use PHPUnit\Framework\TestCase;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Page Cache state test.
-+ */
-+class PageCacheStateTest extends TestCase
-+{
-+    /**
-+     * @var PageCacheState
-+     */
-+    private $pageCacheStateStorage;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->pageCacheStateStorage = $objectManager->get(PageCacheState::class);
-+    }
-+
-+    /**
-+     * Tests save state.
-+     *
-+     * @param bool $state
-+     * @return void
-+     * @dataProvider saveStateProvider
-+     */
-+    public function testSave(bool $state): void
-+    {
-+        $this->pageCacheStateStorage->save($state);
-+        $this->assertEquals($state, $this->pageCacheStateStorage->isEnabled());
-+    }
-+
-+    /**
-+     * Tests flush state.
-+     *
-+     * @return void
-+     */
-+    public function testFlush(): void
-+    {
-+        $this->pageCacheStateStorage->save(true);
-+        $this->assertTrue($this->pageCacheStateStorage->isEnabled());
-+        $this->pageCacheStateStorage->flush();
-+        $this->assertFalse($this->pageCacheStateStorage->isEnabled());
-+    }
-+
-+    /**
-+     * Save state provider.
-+     *
-+     * @return array
-+     */
-+    public function saveStateProvider(): array
-+    {
-+        return [[true], [false]];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Payment/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Payment/Helper/DataTest.php
-index e6689b37151..8b0eb4ecc9b 100644
---- a/dev/tests/integration/testsuite/Magento/Payment/Helper/DataTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Payment/Helper/DataTest.php
-@@ -3,22 +3,59 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+namespace Magento\Payment\Helper;
-+
-+use PHPUnit\Framework\TestCase;
-+use Magento\OfflinePayments\Block\Info\Checkmo;
-+use Magento\Payment\Model\Info;
-+use Magento\TestFramework\Helper\Bootstrap;
- 
- /**
-  * Test class for \Magento\Payment\Helper\Data
-  */
--namespace Magento\Payment\Helper;
--
--class DataTest extends \PHPUnit\Framework\TestCase
-+class DataTest extends TestCase
- {
-+    /**
-+     * @var Data
-+     */
-+    private $helper;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->helper = Bootstrap::getObjectManager()->get(Data::class);
-+    }
-+
-+    /**
-+     * @return void
-+     */
-     public function testGetInfoBlock()
-     {
--        $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Payment\Helper\Data::class);
--        $paymentInfo = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
--            \Magento\Payment\Model\Info::class
-+        $paymentInfo = Bootstrap::getObjectManager()->create(
-+            Info::class
-         );
-         $paymentInfo->setMethod('checkmo');
--        $result = $helper->getInfoBlock($paymentInfo);
--        $this->assertInstanceOf(\Magento\OfflinePayments\Block\Info\Checkmo::class, $result);
-+        $result = $this->helper->getInfoBlock($paymentInfo);
-+        $this->assertInstanceOf(Checkmo::class, $result);
-+    }
-+
-+    /**
-+     * Test to load Payment method title from store config
-+     *
-+     * @magentoConfigFixture current_store payment/cashondelivery/title Cash On Delivery Title Of The Method
-+     */
-+    public function testPaymentMethodLabelByStore()
-+    {
-+        $result = $this->helper->getPaymentMethodList(true, true);
-+        $this->assertArrayHasKey('cashondelivery', $result, 'Payment info does not exist');
-+        $this->assertEquals(
-+            'Cash On Delivery Title Of The Method',
-+            $result['cashondelivery']['label'],
-+            'Payment method title is not loaded from store config'
-+        );
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
-index 3d30f836659..157999224d7 100644
---- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
-@@ -140,12 +140,11 @@ class ExpressTest extends \Magento\TestFramework\TestCase\AbstractController
- 
-     /**
-      * Test return action with configurable product.
-+     *
-+     * @magentoDataFixture Magento/Paypal/_files/quote_express_configurable.php
-      */
-     public function testReturnAction()
-     {
--        // Skipped due to MAGETWO-87333
--        //@magentoDataFixture Magento/Paypal/_files/quote_express_configurable.php
--        $this->markTestSkipped('MAGETWO-87333');
-         $quote = $this->_objectManager->create(Quote::class);
-         $quote->load('test_cart_with_configurable', 'reserved_order_id');
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Payflow/SilentPostTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Payflow/SilentPostTest.php
-index 2bebb5bd95b..81a9587d36f 100644
---- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Payflow/SilentPostTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Payflow/SilentPostTest.php
-@@ -93,7 +93,7 @@ class SilentPostTest extends AbstractController
-     public function responseCodeDataProvider()
-     {
-         return [
--            [Payflowlink::RESPONSE_CODE_APPROVED, Order::STATE_PROCESSING, Order::STATE_PROCESSING],
-+            [Payflowlink::RESPONSE_CODE_APPROVED, Order::STATE_COMPLETE, Order::STATE_COMPLETE],
-             [Payflowlink::RESPONSE_CODE_FRAUDSERVICE_FILTER, Order::STATE_PAYMENT_REVIEW, Order::STATUS_FRAUD],
-         ];
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Transparent/ResponseTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Transparent/ResponseTest.php
-new file mode 100644
-index 00000000000..7311a50818c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Transparent/ResponseTest.php
-@@ -0,0 +1,134 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Paypal\Controller\Transparent;
-+
-+use Magento\Checkout\Model\Session;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Intl\DateTimeFactory;
-+use Magento\Framework\Session\Generic as GenericSession;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Api\Data\CartInterface;
-+use Magento\Quote\Api\PaymentMethodManagementInterface;
-+
-+/**
-+ * Tests PayPal transparent response controller.
-+ */
-+class ResponseTest extends \Magento\TestFramework\TestCase\AbstractController
-+{
-+    /**
-+     * Tests setting credit card expiration month and year to payment from PayPal response.
-+     *
-+     * @param string $currentDateTime
-+     * @param string $paypalExpDate
-+     * @param string $expectedCcMonth
-+     * @param string $expectedCcYear
-+     * @throws NoSuchEntityException
-+     *
-+     * @magentoConfigFixture current_store payment/payflowpro/active 1
-+     * @magentoDataFixture Magento/Sales/_files/quote.php
-+     * @dataProvider paymentCcExpirationDateDataProvider
-+     */
-+    public function testPaymentCcExpirationDate(
-+        string $currentDateTime,
-+        string $paypalExpDate,
-+        string $expectedCcMonth,
-+        string $expectedCcYear
-+    ) {
-+        $reservedOrderId = 'test01';
-+        $postData = [
-+            'EXPDATE' => $paypalExpDate,
-+            'AMT' => '0.00',
-+            'RESPMSG' => 'Verified',
-+            'CVV2MATCH' => 'Y',
-+            'PNREF' => 'A10AAD866C87',
-+            'SECURETOKEN' => '3HYEHfG06skydAdBXbpIl8QJZ',
-+            'AVSDATA' => 'YNY',
-+            'RESULT' => '0',
-+            'IAVS' => 'N',
-+            'AVSADDR' => 'Y',
-+            'SECURETOKENID' => 'yqanLisRZbI0HAG8q3SbbKbhiwjNZAGf',
-+        ];
-+
-+        $quote = $this->getQuote($reservedOrderId);
-+        $this->getRequest()->setPostValue($postData);
-+        $this->getRequest()->setMethod('POST');
-+        /** @var Session $checkoutSession */
-+        $checkoutSession = $this->_objectManager->get(GenericSession::class);
-+        $checkoutSession->setQuoteId($quote->getId());
-+        $this->setCurrentDateTime($currentDateTime);
-+
-+        $this->dispatch('paypal/transparent/response');
-+
-+        /** @var PaymentMethodManagementInterface $paymentManagment */
-+        $paymentManagment = $this->_objectManager->get(PaymentMethodManagementInterface::class);
-+        $payment = $paymentManagment->get($quote->getId());
-+
-+        $this->assertEquals($expectedCcMonth, $payment->getCcExpMonth());
-+        $this->assertEquals($expectedCcYear, $payment->getCcExpYear());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function paymentCcExpirationDateDataProvider(): array
-+    {
-+        return [
-+            'Expiration year in current century' => [
-+                'currentDateTime' => '2019-07-05 00:00:00',
-+                'paypalExpDate' => '0321',
-+                'expectedCcMonth' => 3,
-+                'expectedCcYear' => 2021
-+            ],
-+            'Expiration year in next century' => [
-+                'currentDateTime' => '2099-01-01 00:00:00',
-+                'paypalExpDate' => '1002',
-+                'expectedCcMonth' => 10,
-+                'expectedCcYear' => 2102
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * Sets current date and time.
-+     *
-+     * @param string $date
-+     */
-+    private function setCurrentDateTime(string $dateTime): void
-+    {
-+        $dateTime = new \DateTime($dateTime, new \DateTimeZone('UTC'));
-+        $dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $dateTimeFactory->method('create')
-+            ->willReturn($dateTime);
-+
-+        $this->_objectManager->addSharedInstance($dateTimeFactory, DateTimeFactory::class);
-+    }
-+
-+    /**
-+     * Gets quote by reserved order ID.
-+     *
-+     * @param string $reservedOrderId
-+     * @return CartInterface
-+     */
-+    private function getQuote(string $reservedOrderId): CartInterface
-+    {
-+        $searchCriteria = $this->_objectManager->get(SearchCriteriaBuilder::class)
-+            ->addFilter('reserved_order_id', $reservedOrderId)
-+            ->create();
-+
-+        /** @var CartRepositoryInterface $quoteRepository */
-+        $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
-+        $items = $quoteRepository->getList($searchCriteria)
-+            ->getItems();
-+
-+        return array_pop($items);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ConverterStub.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ConverterStub.php
-deleted file mode 100644
-index 223ef35c0dc..00000000000
---- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ConverterStub.php
-+++ /dev/null
-@@ -1,32 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Paypal\Model\Config\Structure\Reader;
--
--/**
-- * Class ConverterStub
-- */
--class ConverterStub extends \Magento\Config\Model\Config\Structure\Converter
--{
--    /**
--     * @param \DOMDocument $document
--     * @return array|null
--     */
--    public function getArrayData(\DOMDocument $document)
--    {
--        return $this->_convertDOMDocument($document);
--    }
--
--    /**
--     * Convert dom document
--     *
--     * @param \DOMNode $source
--     * @return array
--     */
--    public function convert($source)
--    {
--        return $this->_convertDOMDocument($source);
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderStub.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderStub.php
-deleted file mode 100644
-index ed1366ad737..00000000000
---- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderStub.php
-+++ /dev/null
-@@ -1,22 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Paypal\Model\Config\Structure\Reader;
--
--/**
-- * Class ReaderStub
-- */
--class ReaderStub extends \Magento\Config\Model\Config\Structure\Reader
--{
--    /**
--     * @param array $fileList
--     * @return array
--     * @throws \Magento\Framework\Exception\LocalizedException
--     */
--    public function readFiles(array $fileList)
--    {
--        return $this->_readFiles($fileList);
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php
-deleted file mode 100644
-index 6b966a045c9..00000000000
---- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php
-+++ /dev/null
-@@ -1,135 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Paypal\Model\Config\Structure\Reader;
--
--use Magento\Framework\ObjectManagerInterface;
--
--/**
-- * Class ReaderTest
-- */
--class ReaderTest extends \PHPUnit\Framework\TestCase
--{
--    const EXPECTED = '/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected';
--
--    const ACTUAL = '/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual';
--
--    /**
--     * @var ObjectManagerInterface
--     */
--    protected $objectManager;
--
--    /**
--     * @var \Magento\Framework\App\Utility\Files
--     */
--    protected $fileUtility;
--
--    /**
--     * @var \Magento\Framework\Config\ValidationStateInterface
--     */
--    protected $validationStateMock;
--
--    /**
--     * @var \Magento\Framework\Config\SchemaLocatorInterface
--     */
--    protected $schemaLocatorMock;
--
--    /**
--     * @var \Magento\Framework\Config\FileResolverInterface
--     */
--    protected $fileResolverMock;
--
--    /**
--     * @var \Magento\Paypal\Model\Config\Structure\Reader\ReaderStub
--     */
--    protected $reader;
--
--    /**
--     * @var \Magento\Paypal\Model\Config\Structure\Reader\ConverterStub
--     */
--    protected $converter;
--
--    /**
--     * Set up
--     *
--     * @return void
--     */
--    protected function setUp()
--    {
--        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
--        $this->fileUtility = \Magento\Framework\App\Utility\Files::init();
--
--        $this->validationStateMock = $this->getMockBuilder(\Magento\Framework\Config\ValidationStateInterface::class)
--            ->setMethods(['isValidationRequired'])
--            ->getMockForAbstractClass();
--        $this->schemaLocatorMock = $this->getMockBuilder(\Magento\Config\Model\Config\SchemaLocator::class)
--            ->disableOriginalConstructor()
--            ->setMethods(['getPerFileSchema'])
--            ->getMock();
--        $this->fileResolverMock = $this->getMockBuilder(\Magento\Framework\Config\FileResolverInterface::class)
--            ->getMockForAbstractClass();
--
--        $this->validationStateMock->expects($this->atLeastOnce())
--            ->method('isValidationRequired')
--            ->willReturn(false);
--        $this->schemaLocatorMock->expects($this->atLeastOnce())
--            ->method('getPerFileSchema')
--            ->willReturn(false);
--
--        /** @var \Magento\Paypal\Model\Config\Structure\Reader\ConverterStub $converter */
--        $this->converter = $this->objectManager->create(
--            \Magento\Paypal\Model\Config\Structure\Reader\ConverterStub::class
--        );
--
--        $this->reader = $this->objectManager->create(
--            \Magento\Paypal\Model\Config\Structure\Reader\ReaderStub::class,
--            [
--                'fileResolver' => $this->fileResolverMock,
--                'converter' => $this->converter,
--                'schemaLocator' => $this->schemaLocatorMock,
--                'validationState' => $this->validationStateMock,
--                'fileName' => 'no_existing_file.xml',
--                'domDocumentClass' => \Magento\Framework\Config\Dom::class
--            ]
--        );
--    }
--
--    /**
--     *  The test checks the file structure after processing the nodes responsible for inserting content
--     *
--     * @return void
--     */
--    public function testXmlConvertedConfigurationAndCompereStructure()
--    {
--        $actual = $this->reader->readFiles(['actual' => $this->getActualContent()]);
--
--        $document = new \DOMDocument();
--        $document->loadXML($this->getExpectedContent());
--
--        $expected = $this->converter->getArrayData($document);
--
--        $this->assertEquals($expected, $actual);
--    }
--
--    /**
--     * @return string
--     */
--    protected function getActualContent()
--    {
--        $files = $this->fileUtility->getFiles([BP . static::ACTUAL], 'config.xml');
--
--        return file_get_contents(reset($files));
--    }
--
--    /**
--     * @return string
--     */
--    protected function getExpectedContent()
--    {
--        $files = $this->fileUtility->getFiles([BP . static::EXPECTED], 'config.xml');
--
--        return file_get_contents(reset($files));
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml
-deleted file mode 100644
-index 95b9c7bd73e..00000000000
---- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml
-+++ /dev/null
-@@ -1,373 +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_Config:etc/system_file.xsd">
--    <system>
--        <section id="payment">
--            <group id="account" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
--                <label>Merchant Location</label>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <field id="merchant_country" type="select" translate="label comment" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
--                    <label>Merchant Country</label>
--                    <comment>If not specified, Default Country from General Config will be used</comment>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Country</frontend_model>
--                    <source_model>Magento\Paypal\Model\System\Config\Source\MerchantCountry</source_model>
--                    <backend_model>Magento\Paypal\Model\System\Config\Backend\MerchantCountry</backend_model>
--                    <config_path>paypal/general/merchant_country</config_path>
--                </field>
--            </group>
--            <group id="recommended_solutions" translate="label" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label>Recommended Solutions:</label>
--                <fieldset_css>paypal-top-section paypal-recommended-header</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--            </group>
--            <group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label>Other PayPal Payment Solutions:</label>
--                <fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
--                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
--            </group>
--            <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label>Other Payment Methods:</label>
--                <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
--                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
--            </group>
--        </section>
--        <section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">
--            <include path="Magento_Paypal::system/paypal_payflowpro.xml"/>
--            <include path="Magento_Paypal::system/payflow_link.xml"/>
--            <include path="Magento_Paypal::system/express_checkout.xml"/>
--            <include path="Magento_Paypal::system/payments_pro_hosted_solution.xml"/>
--            <group id="payments_pro_hosted_solution_without_bml" extends="payments_pro_hosted_solution">
--                <group id="pphs_required_settings">
--                    <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                    <group id="pphs_advertise_bml" showInDefault="0" showInWebsite="0"/>
--                </group>
--            </group>
--        </section>
--        <section id="payment_us" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
--            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
--                <group id="express_checkout_us" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
--                    <label>PayPal Express Checkout</label>
--                    <fieldset_css>complex paypal-express-section</fieldset_css>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
--                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
--                    <attribute type="shared">0</attribute>
--                    <attribute type="activity_path">payment/paypal_express/active</attribute>
--                    <attribute type="activity_path">payment/payflow_express/active</attribute>
--                    <attribute type="displayIn">recommended_solutions</attribute>
--                </group>
--            </group>
--            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
--                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <comment>Choose a secure bundled payment solution for your business.</comment>
--                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
--                <include path="Magento_Paypal::system/payflow_advanced.xml"/>
--                <group id="wpp_usuk" translate="label" sortOrder="40" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout">
--                    <label>Payments Pro</label>
--                    <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
--                    <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
--                    </group>
--                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                        <field id="enable_paypal_payflow">
--                            <attribute type="shared">0</attribute>
--                            <config_path>payment/paypal_payment_pro/active</config_path>
--                        </field>
--                        <group id="paypal_payflow_api_settings" translate="label">
--                            <label>Payments Pro and Express Checkout</label>
--                        </group>
--                    </group>
--                    <group id="settings_paypal_payflow" translate="label">
--                        <label>Basic Settings - PayPal Payments Pro</label>
--                    </group>
--                </group>
--                <group id="wps_express" extends="payment_all_paypal/express_checkout">
--                    <label>Payments Standard</label>
--                    <comment>Accept credit card and PayPal payments securely.</comment>
--                    <attribute type="activity_path">payment/wps_express/active</attribute>
--                    <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
--                    </group>
--                    <group id="express_checkout_required">
--                        <group id="express_checkout_required_express_checkout">
--                            <label>Payments Standard</label>
--                        </group>
--                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
--                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
--                        <field id="enable_express_checkout">
--                            <config_path>payment/wps_express/active</config_path>
--                        </field>
--                        <field id="enable_express_checkout_bml">
--                            <config_path>payment/wps_express_bml/active</config_path>
--                        </field>
--                    </group>
--                    <group id="settings_ec">
--                        <label>Basic Settings - PayPal Website Payments Standard</label>
--                    </group>
--                </group>
--            </group>
--            <group id="paypal_payment_gateways" translate="label" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
--                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
--                <include path="Magento_Paypal::system/paypal_payflowpro_with_express_checkout.xml"/>
--                <group id="payflow_link_us" extends="payment_all_paypal/payflow_link"/>
--            </group>
--        </section>
--        <section id="payment_gb" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
--            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
--                <group id="express_checkout_gb" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
--                    <label>PayPal Express Checkout</label>
--                    <fieldset_css>complex paypal-express-section</fieldset_css>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
--                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
--                    <attribute type="displayIn">recommended_solutions</attribute>
--                    <group id="express_checkout_required">
--                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
--                    </group>
--                </group>
--            </group>
--            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
--                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <comment>Choose a secure bundled payment solution for your business.</comment>
--                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
--                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
--                <group id="wpp_usuk" translate="comment" sortOrder="20">
--                    <fieldset_css>pp-general-uk</fieldset_css>
--                    <demo_link>http://www.youtube.com/watch?v=LBe-TW87eGI&amp;list=PLF18B1094ABCD7CE8&amp;index=1&amp;feature=plpp_video</demo_link>
--                    <comment>Accept payments with a completely customizable checkout page.</comment>
--                    <group id="wpp_required_settings">
--                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                        <group id="wpp_advertise_bml" showInDefault="0" showInWebsite="0"/>
--                    </group>
--                </group>
--                <include path="Magento_Paypal::system/payments_pro_hosted_solution_with_express_checkout.xml"/>
--                <group id="wps_express" extends="payment_all_paypal/express_checkout" sortOrder="50">
--                    <label>Website Payments Standard</label>
--                    <comment>Accept credit card and PayPal payments securely.</comment>
--                    <attribute type="activity_path">payment/wps_express/active</attribute>
--                    <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
--                    </group>
--                    <group id="express_checkout_required">
--                        <group id="express_checkout_required_express_checkout">
--                            <label>Website Payments Standard</label>
--                        </group>
--                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
--                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
--                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                        <field id="enable_express_checkout">
--                            <config_path>payment/wps_express/active</config_path>
--                        </field>
--                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
--                    </group>
--                    <group id="settings_ec">
--                        <label>Basic Settings - PayPal Website Payments Standard</label>
--                    </group>
--                </group>
--            </group>
--        </section>
--        <section id="payment_de" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
--            <group id="paypal_payment_solutions" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
--                <group id="express_checkout_de" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
--                    <label>PayPal Express Checkout</label>
--                    <fieldset_css>complex paypal-express-section</fieldset_css>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
--                    <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
--                    <attribute type="displayIn">recommended_solutions</attribute>
--                    <group id="express_checkout_required">
--                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
--                    </group>
--                    <group id="settings_ec">
--                        <group id="settings_ec_advanced">
--                            <field id="solution_type" showInDefault="0" showInWebsite="0"/>
--                        </group>
--                    </group>
--                </group>
--            </group>
--        </section>
--        <section id="payment_other" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
--            <group id="express_checkout_other" translate="label comment" sortOrder="5" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label>PayPal Express Checkout</label>
--                <fieldset_css>complex paypal-express-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
--                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
--                <attribute type="displayIn">recommended_solutions</attribute>
--                <group id="express_checkout_required">
--                    <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                    <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
--                </group>
--            </group>
--            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
--                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <comment>Choose a secure bundled payment solution for your business.</comment>
--                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
--                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
--                <group id="wps_other" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
--                    <label>Website Payments Standard</label>
--                    <fieldset_css>complex</fieldset_css>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                    <comment>Accept credit card and PayPal payments securely.</comment>
--                    <attribute type="activity_path">payment/wps_express/active</attribute>
--                    <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
--                    </group>
--                    <group id="express_checkout_required">
--                        <group id="express_checkout_required_express_checkout">
--                            <label>Website Payments Standard</label>
--                        </group>
--                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
--                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
--                        <field id="enable_express_checkout">
--                            <config_path>payment/wps_express/active</config_path>
--                        </field>
--                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
--                    </group>
--                    <group id="settings_ec">
--                        <label>Basic Settings - PayPal Website Payments Standard</label>
--                    </group>
--                </group>
--            </group>
--            <group id="paypal_payment_gateways" translate="label comment" sortOrder="8" showInDefault="0" showInWebsite="0" showInStore="0">
--                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
--                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <comment>Process payments using your own internet merchant account.</comment>
--                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
--                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
--            </group>
--        </section>
--        <section id="payment_ca" extends="payment_other">
--            <group id="express_checkout_other">
--                <attribute type="activity_path">payment/paypal_express/active</attribute>
--                <attribute type="activity_path">payment/payflow_express/active</attribute>
--            </group>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="20"/>
--            </group>
--            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
--                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
--                <group id="wpp_ca" translate="label" extends="payment_all_paypal/paypal_payflowpro" sortOrder="30">
--                    <label>Website Payments Pro</label>
--                    <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
--                    <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
--                    </group>
--                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                        <group id="paypal_payflow_api_settings">
--                            <label>Payments Pro</label>
--                        </group>
--                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
--                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
--                        <field id="enable_paypal_payflow">
--                            <frontend_class>paypal-enabler paypal-ec-pe</frontend_class>
--                            <attribute type="shared">0</attribute>
--                            <config_path>payment/paypal_payment_pro/active</config_path>
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
--                        </field>
--                    </group>
--                    <group id="settings_paypal_payflow">
--                        <label>Basic Settings - PayPal Payments Pro</label>
--                    </group>
--                </group>
--                <group id="paypal_payflowpro_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="40"/>
--                <group id="payflow_link_ca" extends="payment_all_paypal/payflow_link" sortOrder="50">
--                    <group id="payflow_link_required">
--                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                        <group id="payflow_link_advertise_bml" showInDefault="0" showInWebsite="0"/>
--                    </group>
--                </group>
--            </group>
--        </section>
--        <section id="payment_au" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="12"/>
--                <group id="payments_pro_hosted_solution_au" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
--            </group>
--            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
--                <group id="paypal_payflowpro_au" extends="payment_all_paypal/paypal_payflowpro" sortOrder="20"/>
--            </group>
--        </section>
--        <section id="payment_jp" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="12"/>
--                <group id="payments_pro_hosted_solution_jp" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
--                    <label>Website Payments Plus</label>
--                </group>
--            </group>
--        </section>
--        <section id="payment_fr" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="12"/>
--                <group id="payments_pro_hosted_solution_fr" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
--                    <label>Integral Evolution</label>
--                </group>
--            </group>
--        </section>
--        <section id="payment_it" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="12"/>
--                <group id="payments_pro_hosted_solution_it" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
--                    <label>Pro</label>
--                </group>
--            </group>
--        </section>
--        <section id="payment_es" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="12"/>
--                <group id="payments_pro_hosted_solution_es" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
--                    <label>Pasarela integral</label>
--                </group>
--            </group>
--        </section>
--        <section id="payment_hk" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="12"/>
--                <group id="payments_pro_hosted_solution_hk" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
--            </group>
--        </section>
--        <section id="payment_nz" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other"/>
--            </group>
--            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
--                <group id="paypal_payflowpro_nz" extends="payment_all_paypal/paypal_payflowpro"/>
--            </group>
--        </section>
--    </system>
--</config>
-diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
-deleted file mode 100644
-index 2bd346a6e8f..00000000000
---- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
-+++ /dev/null
-@@ -1,2369 +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_Config:etc/system_file.xsd">
--    <system>
--        <section id="payment">
--            <group id="account" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
--                <label>Merchant Location</label>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <field id="merchant_country" type="select" translate="label comment" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
--                    <label>Merchant Country</label>
--                    <comment>If not specified, Default Country from General Config will be used</comment>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Country</frontend_model>
--                    <source_model>Magento\Paypal\Model\System\Config\Source\MerchantCountry</source_model>
--                    <backend_model>Magento\Paypal\Model\System\Config\Backend\MerchantCountry</backend_model>
--                    <config_path>paypal/general/merchant_country</config_path>
--                </field>
--            </group>
--            <group id="recommended_solutions" translate="label" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label>Recommended Solutions:</label>
--                <fieldset_css>paypal-top-section paypal-recommended-header</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--            </group>
--            <group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label>Other PayPal Payment Solutions:</label>
--                <fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
--                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
--            </group>
--            <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label>Other Payment Methods:</label>
--                <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
--                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
--            </group>
--        </section>
--        <section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">
--            <group id="paypal_payflowpro" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
--                <label>Payflow Pro</label>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                <fieldset_css>paypal-other-section</fieldset_css>
--                <comment><![CDATA[Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)]]></comment>
--                <attribute type="activity_path">payment/payflowpro/active</attribute>
--                <attribute type="paypal_ec_separate">1</attribute>
--                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
--                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-pro.html</comment>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
--                </group>
--                <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                    <label>Required PayPal Settings</label>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                    <group id="paypal_payflow_api_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                        <label>Payflow Pro</label>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                        <field id="partner" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1">
--                            <label>Partner</label>
--                            <config_path>payment/payflowpro/partner</config_path>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="user" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
--                            <label>User</label>
--                            <config_path>payment/payflowpro/user</config_path>
--                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="vendor" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1">
--                            <label>Vendor</label>
--                            <config_path>payment/payflowpro/vendor</config_path>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="pwd" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1">
--                            <label>Password</label>
--                            <config_path>payment/payflowpro/pwd</config_path>
--                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="sandbox_flag" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
--                            <label>Test Mode</label>
--                            <config_path>payment/payflowpro/sandbox_flag</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="use_proxy" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
--                            <label>Use Proxy</label>
--                            <config_path>payment/payflowpro/use_proxy</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="proxy_host" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1">
--                            <label>Proxy Host</label>
--                            <config_path>payment/payflowpro/proxy_host</config_path>
--                            <depends>
--                                <field id="use_proxy">1</field>
--                            </depends>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="proxy_port" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
--                            <label>Proxy Port</label>
--                            <config_path>payment/payflowpro/proxy_port</config_path>
--                            <depends>
--                                <field id="use_proxy">1</field>
--                            </depends>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                    </group>
--                    <field id="enable_paypal_payflow" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
--                        <label>Enable this Solution</label>
--                        <config_path>payment/payflowpro/active</config_path>
--                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
--                        <requires>
--                            <group id="paypal_payflow_api_settings"/>
--                        </requires>
--                    </field>
--                    <field id="payflowpro_cc_vault_active" translate="label" type="select" sortOrder="22" showInDefault="1" showInWebsite="1" showInStore="0">
--                        <label>Vault Enabled</label>
--                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                        <config_path>payment/payflowpro_cc_vault/active</config_path>
--                        <attribute type="shared">1</attribute>
--                        <requires>
--                            <group id="paypal_payflow_api_settings"/>
--                        </requires>
--                    </field>
--                </group>
--                <group id="settings_paypal_payflow" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
--                    <label>Basic Settings - PayPal Payflow Pro</label>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                    <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
--                        <label>Title</label>
--                        <comment>It is recommended to set this value to "Debit or Credit Card" per store views.</comment>
--                        <config_path>payment/payflowpro/title</config_path>
--                        <attribute type="shared">1</attribute>
--                    </field>
--                    <field id="payflowpro_cc_vault_title" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
--                        <label>Vault Title</label>
--                        <config_path>payment/payflowpro_cc_vault/title</config_path>
--                    </field>
--                    <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
--                        <label>Sort Order</label>
--                        <config_path>payment/payflowpro/sort_order</config_path>
--                        <frontend_class>validate-number</frontend_class>
--                        <attribute type="shared">1</attribute>
--                    </field>
--                    <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
--                        <label>Payment Action</label>
--                        <config_path>payment/payflowpro/payment_action</config_path>
--                        <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
--                        <attribute type="shared">1</attribute>
--                    </field>
--                    <field id="heading_cc" translate="label" sortOrder="40" showInDefault="1" showInWebsite="1">
--                        <label>Credit Card Settings</label>
--                        <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
--                        <attribute type="shared">1</attribute>
--                    </field>
--                    <field id="cctypes" translate="label comment" type="multiselect" sortOrder="50" showInDefault="1" showInWebsite="1">
--                        <label>Allowed Credit Card Types</label>
--                        <comment>
--                            <![CDATA[Supporting of American Express cards require additional agreement. Learn more at <a href="http://www.paypal.com/amexupdate">http://www.paypal.com/amexupdate</a>.]]>
--                        </comment>
--                        <config_path>payment/payflowpro/cctypes</config_path>
--                        <source_model>Magento\Paypal\Model\Config::getPayflowproCcTypesAsOptionArray</source_model>
--                        <attribute type="shared">1</attribute>
--                    </field>
--                    <group id="settings_paypal_payflow_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
--                        <label>Advanced Settings</label>
--                        <fieldset_css>config-advanced</fieldset_css>
--                        <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
--                            <label>Payment Applicable From</label>
--                            <config_path>payment/payflowpro/allowspecific</config_path>
--                            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
--                            <label>Countries Payment Applicable From</label>
--                            <config_path>payment/payflowpro/specificcountry</config_path>
--                            <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
--                            <depends>
--                                <field id="allowspecific">1</field>
--                            </depends>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
--                            <label>Debug Mode</label>
--                            <config_path>payment/payflowpro/debug</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
--                            <label>Enable SSL verification</label>
--                            <config_path>payment/payflowpro/verify_peer</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="useccv" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
--                            <label>Require CVV Entry</label>
--                            <config_path>payment/payflowpro/useccv</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <group id="paypal_payflow_avs_check" translate="label" showInDefault="1" showInWebsite="1" sortOrder="80">
--                            <label>CVV and AVS Settings</label>
--                            <field id="heading_avs_settings" translate="label" sortOrder="0" showInDefault="1" showInWebsite="1">
--                                <label>Reject Transaction if:</label>
--                                <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="avs_street" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1">
--                                <label>AVS Street Does Not Match</label>
--                                <config_path>payment/payflowpro/avs_street</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="avs_zip" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1">
--                                <label>AVS Zip Does Not Match</label>
--                                <config_path>payment/payflowpro/avs_zip</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="avs_international" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1">
--                                <label>Card Issuer Is Outside The United States</label>
--                                <config_path>payment/payflowpro/avs_international</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="avs_security_code" translate="label" type="select" sortOrder="4" showInDefault="1" showInWebsite="1">
--                                <label>Card Security Code Does Not Match</label>
--                                <config_path>payment/payflowpro/avs_security_code</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">0</attribute>
--                            </field>
--                        </group>
--                        <group id="paypal_payflow_settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="90">
--                            <label>Settlement Report Settings</label>
--                            <field id="heading_sftp" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_sftp"/>
--                            <field id="settlement_reports_ftp_login" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_login"/>
--                            <field id="settlement_reports_ftp_password" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_password"/>
--                            <field id="settlement_reports_ftp_sandbox" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_sandbox"/>
--                            <field id="settlement_reports_ftp_ip" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_ip"/>
--                            <field id="settlement_reports_ftp_path" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_path"/>
--                            <field id="heading_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_schedule"/>
--                            <field id="settlement_reports_active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_active"/>
--                            <field id="settlement_reports_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_schedule"/>
--                            <field id="settlement_reports_time" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_time"/>
--                        </group>
--                    </group>
--                </group>
--            </group>
--            <group id="payflow_link" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
--                <label>Payflow Link</label>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                <fieldset_css>paypal-other-section</fieldset_css>
--                <comment><![CDATA[Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)]]></comment>
--                <attribute type="activity_path">payment/payflow_link/active</attribute>
--                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
--                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-link.html</comment>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
--                </group>
--                <group id="payflow_link_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                    <label>Required PayPal Settings</label>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                    <group id="payflow_link_payflow_link" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                        <label>Payflow Link and Express Checkout</label>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                        <field id="business_account" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/business_account" translate="label" sortOrder="5">
--                            <frontend_class>not-required</frontend_class>
--                            <label>Email Associated with PayPal Merchant Account (Optional)</label>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="partner" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1">
--                            <label>Partner</label>
--                            <config_path>payment/payflow_link/partner</config_path>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="vendor" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1">
--                            <label>Vendor</label>
--                            <config_path>payment/payflow_link/vendor</config_path>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="user" translate="label comment" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
--                            <label>User</label>
--                            <comment>If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.</comment>
--                            <config_path>payment/payflow_link/user</config_path>
--                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="pwd" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1">
--                            <label>Password</label>
--                            <config_path>payment/payflow_link/pwd</config_path>
--                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="sandbox_flag" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
--                            <label>Test Mode</label>
--                            <config_path>payment/payflow_link/sandbox_flag</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="use_proxy" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
--                            <label>Use Proxy</label>
--                            <config_path>payment/payflow_link/use_proxy</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="proxy_host" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1">
--                            <label>Proxy Host</label>
--                            <config_path>payment/payflow_link/proxy_host</config_path>
--                            <depends>
--                                <field id="use_proxy">1</field>
--                            </depends>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="proxy_port" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1">
--                            <label>Proxy Port</label>
--                            <config_path>payment/payflow_link/proxy_port</config_path>
--                            <depends>
--                                <field id="use_proxy">1</field>
--                            </depends>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="payflowlink_info" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Info</frontend_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                    </group>
--
--
--
--                    <field id="enable_payflow_link" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
--                        <label>Enable Payflow Link</label>
--                        <config_path>payment/payflow_link/active</config_path>
--                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
--                        <requires>
--                            <group id="payflow_link_payflow_link"/>
--                        </requires>
--                    </field>
--                    <field id="enable_express_checkout_basic" translate="label" type="select" sortOrder="40">
--                        <label>Enable Express Checkout</label>
--                        <config_path>payment/payflow_express/active</config_path>
--                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Express</frontend_model>
--                    </field>
--                    <field id="enable_express_checkout" extends="payment_all_paypal/payflow_link/payflow_link_required/enable_express_checkout_basic" showInDefault="1" showInWebsite="1">
--                        <requires>
--                            <field id="enable_payflow_link"/>
--                        </requires>
--                    </field>
--                    <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="41">
--                        <comment><![CDATA[Payflow Link lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
--                        You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
--                        <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
--                        </comment>
--                        <config_path>payment/payflow_express_bml/active</config_path>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml</frontend_model>
--                        <requires>
--                            <field id="enable_express_checkout"/>
--                        </requires>
--                    </field>
--                    <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
--                        <config_path>payment/payflow_express_bml/sort_order</config_path>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
--                        <depends>
--                            <field id="enable_express_checkout_bml">1</field>
--                        </depends>
--                    </field>
--
--
--
--                    <group id="payflow_link_advertise_bml"  translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="60">
--                        <label>Advertise PayPal Credit</label>
--                        <comment>
--                            <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
--                        <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
--                        from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
--                        Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
--                        The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
--                        or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
--                        </comment>
--                        <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
--                        <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
--                        <group id="payflow_link_settings_bml_homepage"  translate="label" showInWebsite="1" sortOrder="20" showInDefault="1" showInStore="1">
--                            <label>Home Page</label>
--                            <field id="bml_homepage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_display"/>
--                            <field id="payflow_link_bml_homepage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_position"/>
--                            <field id="payflow_link_bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
--                                <label>Size</label>
--                                <config_path>payment/paypal_express_bml/homepage_size</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="payflow_link_bml_homepage_position">0</field>
--                                </depends>
--                            </field>
--                            <field id="payflow_link_bml_homepage_size2" extends="payment_all_paypal/payflow_link/payflow_link_required/payflow_link_advertise_bml/payflow_link_settings_bml_homepage/payflow_link_bml_homepage_size1">
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
--                                <depends>
--                                    <field id="payflow_link_bml_homepage_position">1</field>
--                                </depends>
--                            </field>
--                        </group>
--                        <group id="payflow_link_settings_bml_categorypage"  translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
--                            <label>Catalog Category Page</label>
--                            <field id="bml_categorypage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_display"/>
--                            <field id="payflow_link_bml_categorypage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_position" />
--                            <field id="payflow_link_bml_categorypage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
--                                <label>Size</label>
--                                <config_path>payment/paypal_express_bml/categorypage_size</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="payflow_link_bml_categorypage_position">0</field>
--                                </depends>
--                            </field>
--                            <field id="payflow_link_bml_categorypage_size2" extends="payment_all_paypal/payflow_link/payflow_link_required/payflow_link_advertise_bml/payflow_link_settings_bml_categorypage/payflow_link_bml_categorypage_size1">
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
--                                <depends>
--                                    <field id="payflow_link_bml_categorypage_position">1</field>
--                                </depends>
--                            </field>
--                        </group>
--                        <group id="payflow_link_settings_bml_productpage"  translate="label" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="50">
--                            <label>Catalog Product Page</label>
--                            <field id="bml_productpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_display" />
--                            <field id="payflow_link_bml_productpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_position" />
--                            <field id="payflow_link_bml_productpage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
--                                <label>Size</label>
--                                <config_path>payment/paypal_express_bml/productpage_size</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="payflow_link_bml_productpage_position">0</field>
--                                </depends>
--                            </field>
--                            <field id="payflow_link_bml_productpage_size2" extends="payment_all_paypal/payflow_link/payflow_link_required/payflow_link_advertise_bml/payflow_link_settings_bml_productpage/payflow_link_bml_productpage_size1">
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
--                                <depends>
--                                    <field id="payflow_link_bml_productpage_position">1</field>
--                                </depends>
--                            </field>
--                        </group>
--                        <group id="payflow_link_settings_bml_checkout"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
--                            <label>Checkout Cart Page</label>
--                            <field id="bml_checkout_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_display" />
--                            <field id="payflow_link_bml_checkout_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_position" />
--                            <field id="payflow_link_bml_checkout_size1" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
--                                <label>Size</label>
--                                <config_path>payment/paypal_express_bml/checkout_size</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="payflow_link_bml_checkout_position">0</field>
--                                </depends>
--                            </field>
--                            <field id="payflow_link_bml_checkout_size2" extends="payment_all_paypal/payflow_link/payflow_link_required/payflow_link_advertise_bml/payflow_link_settings_bml_checkout/payflow_link_bml_checkout_size1">
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="payflow_link_bml_checkout_position">1</field>
--                                </depends>
--                            </field>
--                        </group>
--                    </group>
--                </group>
--                <group id="settings_payflow_link" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
--                    <label>Basic Settings - PayPal Payflow Link</label>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                    <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
--                        <label>Title</label>
--                        <comment>It is recommended to set this value to "Debit or Credit Card" per store views.</comment>
--                        <config_path>payment/payflow_link/title</config_path>
--                        <attribute type="shared">1</attribute>
--                    </field>
--                    <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
--                        <label>Sort Order</label>
--                        <config_path>payment/payflow_link/sort_order</config_path>
--                        <frontend_class>validate-number</frontend_class>
--                        <attribute type="shared">1</attribute>
--                    </field>
--                    <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
--                        <label>Payment Action</label>
--                        <config_path>payment/payflow_link/payment_action</config_path>
--                        <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
--                        <attribute type="shared">1</attribute>
--                    </field>
--                    <group id="settings_payflow_link_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
--                        <label>Advanced Settings</label>
--                        <fieldset_css>config-advanced</fieldset_css>
--                        <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
--                            <label>Payment Applicable From</label>
--                            <config_path>payment/payflow_link/allowspecific</config_path>
--                            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
--                            <label>Countries Payment Applicable From</label>
--                            <config_path>payment/payflow_link/specificcountry</config_path>
--                            <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
--                            <depends>
--                                <field id="allowspecific">1</field>
--                            </depends>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
--                            <label>Debug Mode</label>
--                            <config_path>payment/payflow_link/debug</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
--                            <label>Enable SSL verification</label>
--                            <config_path>payment/payflow_link/verify_peer</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="csc_editable" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
--                            <label>CVV Entry is Editable</label>
--                            <config_path>payment/payflow_link/csc_editable</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="csc_required" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
--                            <label>Require CVV Entry</label>
--                            <config_path>payment/payflow_link/csc_required</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <depends>
--                                <field id="csc_editable">1</field>
--                            </depends>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="email_confirmation" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
--                            <label>Send Email Confirmation</label>
--                            <config_path>payment/payflow_link/email_confirmation</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="url_method" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
--                            <label>URL method for Cancel URL and Return URL</label>
--                            <config_path>payment/payflow_link/url_method</config_path>
--                            <source_model>Magento\Paypal\Model\System\Config\Source\UrlMethod</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <group id="payflow_link_settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="80">
--                            <label>Settlement Report Settings</label>
--                            <field id="heading_sftp" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_sftp"/>
--                            <field id="settlement_reports_ftp_login" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_login"/>
--                            <field id="settlement_reports_ftp_password" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_password"/>
--                            <field id="settlement_reports_ftp_sandbox" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_sandbox"/>
--                            <field id="settlement_reports_ftp_ip" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_ip"/>
--                            <field id="settlement_reports_ftp_path" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_path"/>
--                            <field id="heading_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_schedule"/>
--                            <field id="settlement_reports_active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_active"/>
--                            <field id="settlement_reports_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_schedule"/>
--                            <field id="settlement_reports_time" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_time"/>
--                        </group>
--                        <group id="payflow_link_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
--                            <label>Frontend Experience Settings</label>
--                            <field id="logo" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/logo"/>
--                            <field id="paypal_pages" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_pages"/>
--                            <field id="page_style" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/page_style"/>
--                            <field id="paypal_hdrimg" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrimg"/>
--                            <field id="paypal_hdrbackcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbackcolor"/>
--                            <field id="paypal_hdrbordercolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbordercolor"/>
--                            <field id="paypal_payflowcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_payflowcolor"/>
--                        </group>
--                    </group>
--                </group>
--                <group id="settings_payflow_link_express_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
--                    <label>Basic Settings - PayPal Express Checkout</label>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                    <field id="title" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/title" />
--                    <field id="sort_order" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/sort_order" />
--                    <field id="payment_action" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/payment_action" />
--                    <field id="visible_on_product" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/visible_on_product" />
--                    <group id="settings_payflow_link_express_checkout_advanced" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/paypal_payflow_express_checkout_advanced"/>
--                </group>
--            </group>
--            <group id="express_checkout" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
--                <label>Express Checkout</label>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                <fieldset_css>paypal-other-section</fieldset_css>
--                <comment>Add PayPal as an additional payment method to your checkout page.</comment>
--                <attribute type="activity_path">payment/paypal_express/active</attribute>
--                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
--                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-express-checkout.html</comment>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
--                </group>
--                <group id="express_checkout_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                    <label>Required PayPal Settings</label>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                    <group id="express_checkout_required_express_checkout" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                        <label>Express Checkout</label>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                        <field id="business_account" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="5">
--                            <label>Email Associated with PayPal Merchant Account (Optional)</label>
--                            <frontend_class>not-required</frontend_class>
--                            <comment>
--                                <![CDATA[<a href="http://www.magentocommerce.com/paypal">Start accepting payments via PayPal!</a>]]>
--                            </comment>
--                            <tooltip>Don't have a PayPal account? Simply enter your email address.</tooltip>
--                            <config_path>paypal/general/business_account</config_path>
--                            <validate>validate-email</validate>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="api_authentication" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
--                            <label>API Authentication Methods</label>
--                            <config_path>paypal/wpp/api_authentication</config_path>
--                            <source_model>Magento\Paypal\Model\Config::getApiAuthenticationMethods</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="api_username" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
--                            <label>API Username</label>
--                            <config_path>paypal/wpp/api_username</config_path>
--                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="api_password" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1">
--                            <label>API Password</label>
--                            <config_path>paypal/wpp/api_password</config_path>
--                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="api_signature" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1">
--                            <label>API Signature</label>
--                            <config_path>paypal/wpp/api_signature</config_path>
--                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
--                            <attribute type="shared">1</attribute>
--                            <depends>
--                                <field id="api_authentication">0</field>
--                            </depends>
--                        </field>
--                        <field id="api_cert" translate="label" type="file" sortOrder="60" showInDefault="1" showInWebsite="1">
--                            <label>API Certificate</label>
--                            <config_path>paypal/wpp/api_cert</config_path>
--                            <backend_model>Magento\Paypal\Model\System\Config\Backend\Cert</backend_model>
--                            <attribute type="shared">1</attribute>
--                            <depends>
--                                <field id="api_authentication">1</field>
--                            </depends>
--                        </field>
--                        <field id="api_wizard" translate="button_label attribute sandbox_button_label" sortOrder="70" showInDefault="1" showInWebsite="1">
--                            <attribute type="button_label">Get Credentials from PayPal</attribute>
--                            <attribute type="button_url">
--                                <![CDATA[https://www.paypal.com/webapps/merchantboarding/webflow/externalpartnerflow]]>
--                            </attribute>
--
--                            <attribute type="sandbox_button_label">Sandbox Credentials</attribute>
--                            <attribute type="sandbox_button_url">
--                                <![CDATA[https://www.sandbox.paypal.com/webapps/merchantboarding/webflow/externalpartnerflow]]>
--                            </attribute>
--
--                            <!-- partnerId -->
--                            <attribute type="partner_id">NB9WWHYEMVUMS</attribute>
--                            <!-- partnerLogoUrl -->
--                            <attribute type="partner_logo_url">Magento_Backend/web/images/logo-magento.png</attribute>
--                            <!-- receiveCredentials -->
--                            <attribute type="receive_credentials">FALSE</attribute>
--                            <!-- showPermissions -->
--                            <attribute type="show_permissions">FALSE</attribute>
--                            <!-- displayMode -->
--                            <attribute type="display_mode">embedded</attribute>
--                            <!-- productIntentID -->
--                            <attribute type="product_intent_id">pp_express</attribute>
--
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\ApiWizard</frontend_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="sandbox_flag" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
--                            <label>Sandbox Mode</label>
--                            <config_path>paypal/wpp/sandbox_flag</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="use_proxy" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
--                            <label>API Uses Proxy</label>
--                            <config_path>paypal/wpp/use_proxy</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="proxy_host" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1">
--                            <label>Proxy Host</label>
--                            <config_path>paypal/wpp/proxy_host</config_path>
--                            <attribute type="shared">1</attribute>
--                            <depends>
--                                <field id="use_proxy">1</field>
--                            </depends>
--                        </field>
--                        <field id="proxy_port" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1">
--                            <label>Proxy Port</label>
--                            <config_path>paypal/wpp/proxy_port</config_path>
--                            <attribute type="shared">1</attribute>
--                            <depends>
--                                <field id="use_proxy">1</field>
--                            </depends>
--                        </field>
--                    </group>
--                    <field id="enable_express_checkout" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
--                        <label>Enable this Solution</label>
--                        <config_path>payment/paypal_express/active</config_path>
--                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
--                        <requires>
--                            <group id="express_checkout_required_express_checkout"/>
--                        </requires>
--                    </field>
--                    <field id="enable_in_context_checkout" translate="label comment" type="select" sortOrder="21" showInDefault="1" showInWebsite="1">
--                        <label>Enable In-Context Checkout Experience</label>
--                        <comment>
--                            <![CDATA[See PayPal Feature Support details and list of supported regions
--                    <a href="https://developer.paypal.com/docs/classic/express-checkout/in-context/" target="_blank">here</a>.]]>
--                        </comment>
--                        <config_path>payment/paypal_express/in_context</config_path>
--                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\InContextApi</frontend_model>
--                        <requires>
--                            <field id="enable_express_checkout"/>
--                        </requires>
--                    </field>
--                    <field id="merchant_id" translate="label" type="text" sortOrder="22" showInDefault="1" showInWebsite="1">
--                        <label>Merchant Account ID</label>
--                        <tooltip>You can look up your merchant ID by logging into https://www.paypal.com/. Click the profile icon on the top right side of the page and then select Profile and settings in the Business Profile menu. (If you do not see the profile icon at the top of the page, click Profile, which appears in the top menu when the My Account tab is selected.) Click My business info on the left, and the Merchant account ID is displayed in the list of profile items on the right.</tooltip>
--                        <config_path>payment/paypal_express/merchant_id</config_path>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\MerchantId</frontend_model>
--                        <depends>
--                            <field id="enable_in_context_checkout">1</field>
--                        </depends>
--                        <validate>required-entry</validate>
--                    </field>
--                    <field id="enable_express_checkout_bml" translate="label comment" type="select" sortOrder="23" showInDefault="1" showInWebsite="1">
--                        <label>Enable PayPal Credit</label>
--                        <comment><![CDATA[PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
--                        You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
--                        <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
--                        </comment>
--                        <config_path>payment/paypal_express_bml/active</config_path>
--                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\BmlApi</frontend_model>
--                        <requires>
--                            <field id="enable_express_checkout"/>
--                        </requires>
--                    </field>
--                    <field id="express_checkout_bml_sort_order" translate="label" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
--                        <label>Sort Order PayPal Credit</label>
--                        <config_path>payment/paypal_express_bml/sort_order</config_path>
--                        <frontend_class>validate-number</frontend_class>
--                        <attribute type="shared">1</attribute>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlApiSortOrder</frontend_model>
--                        <depends>
--                            <field id="enable_express_checkout_bml">1</field>
--                        </depends>
--                    </field>
--                    <group id="advertise_bml" translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="30">
--                        <label>Advertise PayPal Credit</label>
--                        <comment>
--                            <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
--                        <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
--                        from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
--                        Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
--                        The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
--                        or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
--                        </comment>
--                        <field id="bml_publisher_id" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="10">
--                            <label>Publisher ID</label>
--                            <comment><![CDATA[Required to display a banner]]></comment>
--                            <config_path>payment/paypal_express_bml/publisher_id</config_path>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="bml_wizard" translate="button_label" sortOrder="15" showInDefault="1" showInWebsite="1">
--                            <button_label>Get Publisher ID from PayPal</button_label>
--                            <button_url><![CDATA[https://financing.paypal.com/ppfinportal/cart/index?dcp=4eff8563b9cc505e0b9afaff3256705081553c79]]></button_url>
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\BmlApiWizard</frontend_model>
--                        </field>
--                        <group id="settings_bml_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
--                            <label>Home Page</label>
--                            <field id="bml_homepage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
--                                <label>Display</label>
--                                <config_path>payment/paypal_express_bml/homepage_display</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="bml_homepage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
--                                <label>Position</label>
--                                <config_path>payment/paypal_express_bml/homepage_position</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsHP</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
--                                <label>Size</label>
--                                <config_path>payment/paypal_express_bml/homepage_size</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="bml_homepage_position">0</field>
--                                </depends>
--                            </field>
--                            <field id="bml_homepage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_size1">
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
--                                <depends>
--                                    <field id="bml_homepage_position">1</field>
--                                </depends>
--                            </field>
--                        </group>
--                        <group id="settings_bml_categorypage" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
--                            <label>Catalog Category Page</label>
--                            <field id="bml_categorypage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
--                                <label>Display</label>
--                                <config_path>payment/paypal_express_bml/categorypage_display</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="bml_categorypage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
--                                <label>Position</label>
--                                <config_path>payment/paypal_express_bml/categorypage_position</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCCP</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="bml_categorypage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
--                                <label>Size</label>
--                                <config_path>payment/paypal_express_bml/categorypage_size</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends><field id="bml_categorypage_position">0</field></depends>
--                            </field>
--                            <field id="bml_categorypage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_size1">
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
--                                <depends><field id="bml_categorypage_position">1</field></depends>
--                            </field>
--                        </group>
--                        <group id="settings_bml_productpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
--                            <label>Catalog Product Page</label>
--                            <field id="bml_productpage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
--                                <label>Display</label>
--                                <config_path>payment/paypal_express_bml/productpage_display</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="bml_productpage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
--                                <label>Position</label>
--                                <config_path>payment/paypal_express_bml/productpage_position</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCPP</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="bml_productpage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
--                                <label>Size</label>
--                                <config_path>payment/paypal_express_bml/productpage_size</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends><field id="bml_productpage_position">0</field></depends>
--                            </field>
--                            <field id="bml_productpage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_size1">
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
--                                <depends><field id="bml_productpage_position">1</field></depends>
--                            </field>
--                        </group>
--                        <group id="settings_bml_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
--                            <label>Checkout Cart Page</label>
--                            <field id="bml_checkout_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
--                                <label>Display</label>
--                                <config_path>payment/paypal_express_bml/checkout_display</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="bml_checkout_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
--                                <label>Position</label>
--                                <config_path>payment/paypal_express_bml/checkout_position</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCheckout</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="bml_checkout_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
--                                <label>Size</label>
--                                <config_path>payment/paypal_express_bml/checkout_size</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends><field id="bml_checkout_position">0</field></depends>
--                            </field>
--                            <field id="bml_checkout_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_size1">
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends><field id="bml_checkout_position">1</field></depends>
--                            </field>
--                        </group>
--                    </group>
--                </group>
--                <group id="settings_ec" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
--                    <label>Basic Settings - PayPal Express Checkout</label>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                    <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
--                        <label>Title</label>
--                        <comment>It is recommended to set this value to "PayPal" per store views.</comment>
--                        <config_path>payment/paypal_express/title</config_path>
--                        <attribute type="shared">1</attribute>
--                    </field>
--                    <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
--                        <label>Sort Order</label>
--                        <config_path>payment/paypal_express/sort_order</config_path>
--                        <frontend_class>validate-number</frontend_class>
--                        <attribute type="shared">1</attribute>
--                    </field>
--                    <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
--                        <label>Payment Action</label>
--                        <config_path>payment/paypal_express/payment_action</config_path>
--                        <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions\Express</source_model>
--                        <attribute type="shared">1</attribute>
--                    </field>
--                    <field id="visible_on_product" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
--                        <label>Display on Product Details Page</label>
--                        <config_path>payment/paypal_express/visible_on_product</config_path>
--                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                        <attribute type="shared">1</attribute>
--                    </field>
--                    <field id="authorization_honor_period" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1">
--                        <label>Authorization Honor Period (days)</label>
--                        <comment>Specifies what the Authorization Honor Period is on the merchant&#8217;s PayPal account. It must mirror the setting in PayPal.</comment>
--                        <config_path>payment/paypal_express/authorization_honor_period</config_path>
--                        <attribute type="shared">1</attribute>
--                        <depends>
--                            <field id="payment_action">Order</field>
--                        </depends>
--                    </field>
--                    <field id="order_valid_period" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
--                        <label>Order Valid Period (days)</label>
--                        <comment>Specifies what the Order Valid Period is on the merchant&#x2019;s PayPal account. It must mirror the setting in PayPal.</comment>
--                        <config_path>payment/paypal_express/order_valid_period</config_path>
--                        <attribute type="shared">1</attribute>
--                        <depends>
--                            <field id="payment_action">Order</field>
--                        </depends>
--                    </field>
--                    <field id="child_authorization_number" translate="label comment" type="text" sortOrder="70" showInDefault="1" showInWebsite="1">
--                        <label>Number of Child Authorizations</label>
--                        <comment>The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.</comment>
--                        <config_path>payment/paypal_express/child_authorization_number</config_path>
--                        <attribute type="shared">1</attribute>
--                        <depends>
--                            <field id="payment_action">Order</field>
--                        </depends>
--                    </field>
--                    <group id="settings_ec_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="80">
--                        <label>Advanced Settings</label>
--                        <fieldset_css>config-advanced</fieldset_css>
--                        <field id="visible_on_cart" translate="label comment" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
--                            <label>Display on Shopping Cart</label>
--                            <config_path>payment/paypal_express/visible_on_cart</config_path>
--                            <comment>Also affects mini-shopping cart.</comment>
--                            <source_model>Magento\Paypal\Model\System\Config\Source\Yesnoshortcut</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
--                            <label>Payment Applicable From</label>
--                            <config_path>payment/paypal_express/allowspecific</config_path>
--                            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
--                            <label>Countries Payment Applicable From</label>
--                            <config_path>payment/paypal_express/specificcountry</config_path>
--                            <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
--                            <attribute type="shared">1</attribute>
--                            <depends>
--                                <field id="allowspecific">1</field>
--                            </depends>
--                        </field>
--                        <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
--                            <label>Debug Mode</label>
--                            <config_path>payment/paypal_express/debug</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
--                            <label>Enable SSL verification</label>
--                            <config_path>payment/paypal_express/verify_peer</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="line_items_enabled" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
--                            <label>Transfer Cart Line Items</label>
--                            <config_path>payment/paypal_express/line_items_enabled</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="transfer_shipping_options" translate="label tooltip comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
--                            <label>Transfer Shipping Options</label>
--                            <config_path>payment/paypal_express/transfer_shipping_options</config_path>
--                            <tooltip>If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.</tooltip>
--                            <comment>Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.</comment>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                            <depends>
--                                <field id="line_items_enabled">1</field>
--                            </depends>
--                        </field>
--                        <field id="button_flavor" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
--                            <label>Shortcut Buttons Flavor</label>
--                            <config_path>paypal/wpp/button_flavor</config_path>
--                            <source_model>Magento\Paypal\Model\Config::getExpressCheckoutButtonFlavors</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="solution_type" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
--                            <label>Enable PayPal Guest Checkout</label>
--                            <comment>Ability for buyer to purchase without PayPal account.</comment>
--                            <config_path>payment/paypal_express/solution_type</config_path>
--                            <source_model>Magento\Paypal\Model\Config::getExpressCheckoutSolutionTypes</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="require_billing_address" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
--                            <label>Require Customer's Billing Address</label>
--                            <comment>This feature needs be enabled first for the merchant account through PayPal technical support.</comment>
--                            <config_path>payment/paypal_express/require_billing_address</config_path>
--                            <source_model>Magento\Paypal\Model\System\Config\Source\RequireBillingAddress</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="allow_ba_signup" translate="label comment tooltip" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
--                            <label>Billing Agreement Signup</label>
--                            <comment>Whether to create a billing agreement, if there are no active billing agreements available.</comment>
--                            <tooltip>
--                                <![CDATA[Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.]]>
--                            </tooltip>
--                            <config_path>payment/paypal_express/allow_ba_signup</config_path>
--                            <source_model>Magento\Paypal\Model\Config::getExpressCheckoutBASignupOptions</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="skip_order_review_step" translate="label" type="select" sortOrder="95" showInDefault="1" showInWebsite="1">
--                            <label>Skip Order Review Step</label>
--                            <config_path>payment/paypal_express/skip_order_review_step</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <group id="express_checkout_billing_agreement" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
--                            <label>PayPal Billing Agreement Settings</label>
--                            <field id="active" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
--                                <label>Enabled</label>
--                                <comment>
--                                    <![CDATA[Will appear as a payment option only for customers who have at least one active billing agreement.]]>
--                                </comment>
--                                <config_path>payment/paypal_billing_agreement/active</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
--                                <label>Title</label>
--                                <config_path>payment/paypal_billing_agreement/title</config_path>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
--                                <label>Sort Order</label>
--                                <config_path>payment/paypal_billing_agreement/sort_order</config_path>
--                                <frontend_class>validate-number</frontend_class>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="payment_action" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
--                                <label>Payment Action</label>
--                                <config_path>payment/paypal_billing_agreement/payment_action</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="allowspecific" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
--                                <label>Payment Applicable From</label>
--                                <config_path>payment/paypal_billing_agreement/allowspecific</config_path>
--                                <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="specificcountry" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1">
--                                <label>Countries Payment Applicable From</label>
--                                <config_path>payment/paypal_billing_agreement/specificcountry</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="allowspecific">1</field>
--                                </depends>
--                            </field>
--                            <field id="debug" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
--                                <label>Debug Mode</label>
--                                <config_path>payment/paypal_billing_agreement/debug</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="verify_peer" translate="label" type="select" sortOrder="75" showInDefault="1" showInWebsite="1">
--                                <label>Enable SSL verification</label>
--                                <config_path>payment/paypal_billing_agreement/verify_peer</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="line_items_enabled" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
--                                <label>Transfer Cart Line Items</label>
--                                <config_path>payment/paypal_billing_agreement/line_items_enabled</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="allow_billing_agreement_wizard" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
--                                <label>Allow in Billing Agreement Wizard</label>
--                                <config_path>payment/paypal_billing_agreement/allow_billing_agreement_wizard</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                        </group>
--                        <group id="express_checkout_settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="110">
--                            <label>Settlement Report Settings</label>
--                            <field id="heading_sftp" translate="label" sortOrder="10" showInDefault="1" showInWebsite="1">
--                                <label>SFTP Credentials</label>
--                                <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="settlement_reports_ftp_login" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1">
--                                <label>Login</label>
--                                <config_path>paypal/fetch_reports/ftp_login</config_path>
--                                <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="settlement_reports_ftp_password" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
--                                <label>Password</label>
--                                <config_path>paypal/fetch_reports/ftp_password</config_path>
--                                <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="settlement_reports_ftp_sandbox" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
--                                <label>Sandbox Mode</label>
--                                <config_path>paypal/fetch_reports/ftp_sandbox</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="settlement_reports_ftp_ip" translate="label comment tooltip" type="text" sortOrder="50" showInDefault="1" showInWebsite="1">
--                                <label>Custom Endpoint Hostname or IP-Address</label>
--                                <comment>By default it is "reports.paypal.com".</comment>
--                                <tooltip>Use colon to specify port. For example: "test.example.com:5224".</tooltip>
--                                <config_path>paypal/fetch_reports/ftp_ip</config_path>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="settlement_reports_ftp_sandbox">0</field>
--                                </depends>
--                            </field>
--                            <field id="settlement_reports_ftp_path" translate="label comeent" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
--                                <label>Custom Path</label>
--                                <comment>By default it is "/ppreports/outgoing".</comment>
--                                <config_path>paypal/fetch_reports/ftp_path</config_path>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="settlement_reports_ftp_sandbox">0</field>
--                                </depends>
--                            </field>
--                            <field id="heading_schedule" translate="label" sortOrder="70" showInDefault="1" showInWebsite="1">
--                                <label>Scheduled Fetching</label>
--                                <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="settlement_reports_active" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
--                                <label>Enable Automatic Fetching</label>
--                                <config_path>paypal/fetch_reports/active</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="settlement_reports_schedule" translate="label comment" type="select" sortOrder="90" showInDefault="1">
--                                <label>Schedule</label>
--                                <comment>PayPal retains reports for 45 days.</comment>
--                                <config_path>paypal/fetch_reports/schedule</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\FetchingSchedule</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="settlement_reports_time" translate="label" type="time" sortOrder="100" showInDefault="1">
--                                <label>Time of Day</label>
--                                <config_path>paypal/fetch_reports/time</config_path>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                        </group>
--                        <group id="express_checkout_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
--                            <label>Frontend Experience Settings</label>
--                            <field id="logo" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
--                                <label>PayPal Product Logo</label>
--                                <comment>Displays on catalog pages and homepage.</comment>
--                                <config_path>paypal/style/logo</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\Logo</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="paypal_pages" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
--                                <label>PayPal Merchant Pages Style</label>
--                                <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="page_style" translate="label tooltip" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
--                                <label>Page Style</label>
--                                <config_path>paypal/style/page_style</config_path>
--                                <tooltip>
--                                    <![CDATA[Allowable values: "paypal", "primary" (default), your_custom_value (a custom payment page style from your merchant account profile).]]>
--                                </tooltip>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="paypal_hdrimg" translate="label tooltip" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
--                                <label>Header Image URL</label>
--                                <config_path>paypal/style/paypal_hdrimg</config_path>
--                                <tooltip>
--                                    <![CDATA[The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style="color:red">https</strong> is highly encouraged.]]>
--                                </tooltip>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="paypal_hdrbackcolor" translate="label tooltip" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
--                                <label>Header Background Color</label>
--                                <config_path>paypal/style/paypal_hdrbackcolor</config_path>
--                                <tooltip>
--                                    <![CDATA[The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.]]>
--                                </tooltip>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="paypal_hdrbordercolor" translate="label tooltip" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
--                                <label>Header Border Color</label>
--                                <config_path>paypal/style/paypal_hdrbordercolor</config_path>
--                                <tooltip>2-pixel perimeter around the header space.</tooltip>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="paypal_payflowcolor" translate="label tooltip" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
--                                <label>Page Background Color</label>
--                                <config_path>paypal/style/paypal_payflowcolor</config_path>
--                                <tooltip>
--                                    <![CDATA[The background color for the checkout page around the header and payment form.]]>
--                                </tooltip>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                        </group>
--                    </group>
--                </group>
--            </group>
--            <group id="payments_pro_hosted_solution" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
--                <label>Website Payments Pro Hosted Solution</label>
--                <fieldset_css>paypal-other-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                <attribute type="activity_path">payment/hosted_pro/active</attribute>
--                <comment><![CDATA[Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)]]></comment>
--                <attribute type="paypal_ec_separate">1</attribute>
--                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
--                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
--                </group>
--                <group id="pphs_required_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                    <label>Required PayPal Settings</label>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                    <group id="pphs_required_settings_pphs" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                        <label>Payments Pro Hosted Solution</label>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                        <field id="business_account" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/business_account"/>
--                        <field id="api_authentication" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_authentication"/>
--                        <field id="api_username" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_username" />
--                        <field id="api_password" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_password" />
--                        <field id="api_signature" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_signature" />
--                        <field id="api_cert" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_cert" />
--                        <field id="api_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_wizard" />
--                        <field id="sandbox_flag" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/sandbox_flag" />
--                        <field id="use_proxy" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/use_proxy" />
--                        <field id="proxy_host" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/proxy_host" />
--                        <field id="proxy_port" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/proxy_port" />
--                    </group>
--                    <field id="pphs_enable" type="select" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1">
--                        <label>Enable this Solution</label>
--                        <config_path>payment/hosted_pro/active</config_path>
--                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
--                        <requires>
--                            <group id="pphs_required_settings_pphs"/>
--                        </requires>
--                        <frontend_class>paypal-enabler paypal-ec-separate</frontend_class>
--                    </field>
--
--                    <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="21">
--                        <comment><![CDATA[Payments Pro Hosted Solution lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
--                        You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
--                        <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
--                        </comment>
--                        <requires>
--                            <field id="pphs_enable"/>
--                        </requires>
--                    </field>
--                    <group id="pphs_advertise_bml"  translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="22">
--                        <label>Advertise PayPal Credit</label>
--                        <comment>
--                            <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
--                            <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
--                            from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
--                            Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
--                            The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
--                            or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
--                        </comment>
--                        <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
--                        <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
--                        <group id="pphs_settings_bml_homepage"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
--                            <label>Home Page</label>
--                            <field id="bml_homepage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_display"/>
--                            <field id="pphs_bml_homepage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_position"/>
--                            <field id="pphs_bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
--                                <label>Size</label>
--                                <config_path>payment/paypal_express_bml/homepage_size</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="pphs_bml_homepage_position">0</field>
--                                </depends>
--                            </field>
--                            <field id="pphs_bml_homepage_size2" extends="payment_all_paypal/payments_pro_hosted_solution/pphs_required_settings/pphs_advertise_bml/pphs_settings_bml_homepage/pphs_bml_homepage_size1">
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
--                                <depends>
--                                    <field id="pphs_bml_homepage_position">1</field>
--                                </depends>
--                            </field>
--                        </group>
--                        <group id="pphs_settings_bml_categorypage"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
--                            <label>Catalog Category Page</label>
--                            <field id="bml_categorypage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_display"/>
--                            <field id="pphs_bml_categorypage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_position" />
--                            <field id="pphs_bml_categorypage_size1" translate="label" showInDefault="1" showInWebsite="1" sortOrder="30" type="select">
--                                <label>Size</label>
--                                <config_path>payment/paypal_express_bml/categorypage_size</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="pphs_bml_categorypage_position">0</field>
--                                </depends>
--                            </field>
--                            <field id="pphs_bml_categorypage_size2" extends="payment_all_paypal/payments_pro_hosted_solution/pphs_required_settings/pphs_advertise_bml/pphs_settings_bml_categorypage/pphs_bml_categorypage_size1">
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
--                                <depends>
--                                    <field id="pphs_bml_categorypage_position">1</field>
--                                </depends>
--                            </field>
--                        </group>
--                        <group id="pphs_settings_bml_productpage"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
--                            <label>Catalog Product Page</label>
--                            <field id="bml_productpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_display" />
--                            <field id="pphs_bml_productpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_position" />
--                            <field id="pphs_bml_productpage_size1" translate="label" type="select" showInWebsite="1" showInDefault="1" sortOrder="30">
--                                <label>Size</label>
--                                <config_path>payment/paypal_express_bml/productpage_size</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="pphs_bml_productpage_position">0</field>
--                                </depends>
--                            </field>
--                            <field id="pphs_bml_productpage_size2" extends="payment_all_paypal/payments_pro_hosted_solution/pphs_required_settings/pphs_advertise_bml/pphs_settings_bml_productpage/pphs_bml_productpage_size1">
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
--                                <depends>
--                                    <field id="pphs_bml_productpage_position">1</field>
--                                </depends>
--                            </field>
--                        </group>
--                        <group id="pphs_settings_bml_checkout"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
--                            <label>Checkout Cart Page</label>
--                            <field id="bml_checkout_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_display" />
--                            <field id="pphs_bml_checkout_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_position" />
--                            <field id="pphs_bml_checkout_size1" translate="label" type="select" showInWebsite="1" showInDefault="1" sortOrder="30">
--                                <label>Size</label>
--                                <config_path>payment/paypal_express_bml/checkout_size</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="pphs_bml_checkout_position">0</field>
--                                </depends>
--                            </field>
--                            <field id="pphs_bml_checkout_size2" extends="payment_all_paypal/payments_pro_hosted_solution/pphs_required_settings/pphs_advertise_bml/pphs_settings_bml_checkout/pphs_bml_checkout_size1">
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
--                                <attribute type="shared">1</attribute>
--                                <depends>
--                                    <field id="pphs_bml_checkout_position">1</field>
--                                </depends>
--                            </field>
--                        </group>
--                    </group>
--                </group>
--                <group id="pphs_settings" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
--                    <label>Basic Settings - PayPal Payments Pro Hosted Solution</label>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                    <field id="title" type="text" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10" translate="label comment">
--                        <label>Title</label>
--                        <comment>It is recommended to set this value to "PayPal" per store views.</comment>
--                        <config_path>payment/hosted_pro/title</config_path>
--                    </field>
--                    <field id="sort_order" type="text" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20" translate="label">
--                        <label>Sort Order</label>
--                        <config_path>payment/hosted_pro/sort_order</config_path>
--                        <frontend_class>validate-number</frontend_class>
--                    </field>
--                    <field id="payment_action" type="select" showInDefault="1" showInWebsite="1" sortOrder="30" translate="label">
--                        <label>Payment Action</label>
--                        <config_path>payment/hosted_pro/payment_action</config_path>
--                        <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
--                    </field>
--                    <field id="display_ec" type="select" showInDefault="1" showInWebsite="1" sortOrder="40" translate="label">
--                        <label>Display Express Checkout in the Payment Information step</label>
--                        <config_path>payment/hosted_pro/display_ec</config_path>
--                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                    </field>
--                    <group id="pphs_settings_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
--                        <label>Advanced Settings</label>
--                        <fieldset_css>config-advanced</fieldset_css>
--                        <field id="allowspecific" type="select" showInDefault="1" showInWebsite="1" sortOrder="10" translate="label">
--                            <label>Payment Applicable From</label>
--                            <config_path>payment/hosted_pro/allowspecific</config_path>
--                            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
--                        </field>
--                        <field id="specificcountry" type="multiselect" showInDefault="1" showInWebsite="1" sortOrder="20" translate="label">
--                            <label>Countries Payment Applicable From</label>
--                            <config_path>payment/hosted_pro/specificcountry</config_path>
--                            <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
--                            <depends>
--                                <field id="allowspecific">1</field>
--                            </depends>
--                        </field>
--                        <field id="debug" type="select" showInDefault="1" showInWebsite="1" sortOrder="30" translate="label">
--                            <label>Debug Mode</label>
--                            <config_path>payment/hosted_pro/debug</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                        </field>
--                        <field id="verify_peer" type="select" showInDefault="1" showInWebsite="1" sortOrder="35" translate="label">
--                            <label>Enable SSL verification</label>
--                            <config_path>payment/hosted_pro/verify_peer</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                        </field>
--                        <group id="pphs_settlement_report" showInDefault="1" showInWebsite="1" sortOrder="50" translate="label">
--                            <label>Settlement Report Settings</label>
--                            <field id="heading_sftp" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_sftp"/>
--                            <field id="settlement_reports_ftp_login" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_login" />
--                            <field id="settlement_reports_ftp_password" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_password" />
--                            <field id="settlement_reports_ftp_sandbox" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_sandbox" />
--                            <field id="settlement_reports_ftp_ip" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_ip" />
--                            <field id="settlement_reports_ftp_path" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_path" />
--                            <field id="heading_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_schedule" />
--                            <field id="settlement_reports_active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_active" />
--                            <field id="settlement_reports_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_schedule" />
--                            <field id="settlement_reports_time" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_time" />
--                        </group>
--                    </group>
--                </group>
--            </group>
--            <group id="payments_pro_hosted_solution_without_bml" extends="payments_pro_hosted_solution">
--                <group id="pphs_required_settings">
--                    <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                    <group id="pphs_advertise_bml" showInDefault="0" showInWebsite="0"/>
--                </group>
--            </group>
--        </section>
--        <section id="payment_us" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
--            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
--                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <comment>Choose a secure bundled payment solution for your business.</comment>
--                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
--                <group id="payflow_advanced" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
--                    <label>Payments Advanced</label>
--                    <fieldset_css>paypal-other-section</fieldset_css>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                    <comment><![CDATA[Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)]]></comment>
--                    <attribute type="activity_path">payment/payflow_advanced/active</attribute>
--                    <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-advanced.html</comment>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
--                    </group>
--                    <group id="required_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                        <label>Required PayPal Settings</label>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                        <group id="payments_advanced" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                            <label>Payments Advanced and Express Checkout</label>
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                            <field id="business_account" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/business_account">
--                                <label>Email Associated with PayPal Merchant Account (Optional)</label>
--                            </field>
--                            <field id="partner" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1">
--                                <label>Partner</label>
--                                <config_path>payment/payflow_advanced/partner</config_path>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="vendor" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1">
--                                <label>Vendor</label>
--                                <config_path>payment/payflow_advanced/vendor</config_path>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="user" translate="label comment tooltip" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1">
--                                <label>User</label>
--                                <comment>PayPal recommends that you set up an additional User on your account at manager.paypal.com</comment>
--                                <tooltip>PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.</tooltip>
--                                <config_path>payment/payflow_advanced/user</config_path>
--                                <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="pwd" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1">
--                                <label>Password</label>
--                                <config_path>payment/payflow_advanced/pwd</config_path>
--                                <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="sandbox_flag" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
--                                <label>Test Mode</label>
--                                <config_path>payment/payflow_advanced/sandbox_flag</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="use_proxy" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
--                                <label>Use Proxy</label>
--                                <config_path>payment/payflow_advanced/use_proxy</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="proxy_host" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1">
--                                <label>Proxy Host</label>
--                                <config_path>payment/payflow_advanced/proxy_host</config_path>
--                                <depends>
--                                    <field id="use_proxy">1</field>
--                                </depends>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="proxy_port" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
--                                <label>Proxy Port</label>
--                                <config_path>payment/payflow_advanced/proxy_port</config_path>
--                                <depends>
--                                    <field id="use_proxy">1</field>
--                                </depends>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="payflow_advanced_info" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
--                                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Advanced</frontend_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                        </group>
--                        <field id="enable_payflow_advanced" translate="label comment" type="select" sortOrder="41" showInDefault="1" showInWebsite="1">
--                            <label>Enable this Solution</label>
--                            <config_path>payment/payflow_advanced/active</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
--                            <requires>
--                                <group id="payments_advanced"/>
--                            </requires>
--                        </field>
--                        <field id="enable_express_checkout" extends="payment_all_paypal/payflow_link/payflow_link_required/enable_express_checkout_basic" showInDefault="1" showInWebsite="1">
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Hidden</frontend_model>
--                            <requires>
--                                <field id="enable_payflow_advanced"/>
--                            </requires>
--                        </field>
--                        <field id="enable_express_checkout_bml" sortOrder="42" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml">
--                            <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
--                            You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
--                            <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
--                            </comment>
--                            <config_path>payment/payflow_express_bml/active</config_path>
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml</frontend_model>
--                            <requires>
--                                <field id="enable_payflow_advanced"/>
--                            </requires>
--                        </field>
--                        <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
--                            <config_path>payment/payflow_express_bml/sort_order</config_path>
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
--                            <depends>
--                                <field id="enable_express_checkout_bml">1</field>
--                            </depends>
--                        </field>
--                        <group id="advanced_advertise_bml" showInDefault="1" showInWebsite="1" sortOrder="60" translate="label comment">
--                            <label>Advertise PayPal Credit</label>
--                            <comment>
--                                <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
--                                            <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
--                                            from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
--                                            Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
--                                            The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
--                                            or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
--                            </comment>
--                            <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
--                            <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
--                            <group id="advanced_settings_bml_homepage" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20" translate="label">
--                                <label>Home Page</label>
--                                <field id="bml_homepage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_display"/>
--                                <field id="advanced_bml_homepage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_position"/>
--                                <field id="advanced_bml_homepage_size1" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
--                                    <label>Size</label>
--                                    <config_path>payment/paypal_express_bml/homepage_size</config_path>
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
--                                    <depends>
--                                        <field id="advanced_bml_homepage_position">0</field>
--                                    </depends>
--                                </field>
--                                <field id="advanced_bml_homepage_size2" extends="payment_us/paypal_group_all_in_one/payflow_advanced/required_settings/advanced_advertise_bml/advanced_settings_bml_homepage/advanced_bml_homepage_size1">
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
--                                    <depends>
--                                        <field id="advanced_bml_homepage_position">1</field>
--                                    </depends>
--                                </field>
--                            </group>
--                            <group id="advanced_settings_bml_categorypage" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30" translate="label">
--                                <label>Catalog Category Page</label>
--                                <field id="bml_categorypage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_display"/>
--                                <field id="advanced_bml_categorypage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_position"/>
--                                <field id="advanced_bml_categorypage_size1" type="select" showInDefault="1" showInWebsite="1" sortOrder="30" translate="label">
--                                    <label>Size</label>
--                                    <config_path>payment/paypal_express_bml/categorypage_size</config_path>
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
--                                    <attribute type="shared">1</attribute>
--                                    <depends>
--                                        <field id="advanced_bml_categorypage_position">0</field>
--                                    </depends>
--                                </field>
--                                <field id="advanced_bml_categorypage_size2" extends="payment_us/paypal_group_all_in_one/payflow_advanced/required_settings/advanced_advertise_bml/advanced_settings_bml_categorypage/advanced_bml_categorypage_size1">
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
--                                    <depends>
--                                        <field id="advanced_bml_categorypage_position">1</field>
--                                    </depends>
--                                </field>
--                            </group>
--                            <group id="advanced_settings_bml_productpage" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40" translate="label">
--                                <label>Catalog Product Page</label>
--                                <field id="bml_productpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_display" />
--                                <field id="advanced_bml_productpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_position" />
--                                <field id="advanced_bml_productpage_size1" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" translate="label">
--                                    <label>Size</label>
--                                    <config_path>payment/paypal_express_bml/productpage_size</config_path>
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
--                                    <attribute type="shared">1</attribute>
--                                    <depends>
--                                        <field id="advanced_bml_productpage_position">0</field>
--                                    </depends>
--                                </field>
--                                <field id="advanced_bml_productpage_size2" extends="payment_us/paypal_group_all_in_one/payflow_advanced/required_settings/advanced_advertise_bml/advanced_settings_bml_productpage/advanced_bml_productpage_size1">
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
--                                    <depends>
--                                        <field id="advanced_bml_productpage_position">1</field>
--                                    </depends>
--                                </field>
--
--                            </group>
--                            <group id="advanced_settings_bml_checkout" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50" translate="label">
--                                <label>Checkout Cart Page</label>
--                                <field id="bml_checkout_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_display"/>
--                                <field id="advanced_bml_checkout_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_position"/>
--                                <field id="advanced_bml_checkout_size1" type="select" showInDefault="1" showInWebsite="1" sortOrder="30" translate="label">
--                                    <label>Size</label>
--                                    <config_path>payment/paypal_express_bml/checkout_size</config_path>
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
--                                    <attribute type="shared">1</attribute>
--                                    <depends>
--                                        <field id="advanced_bml_checkout_position">0</field>
--                                    </depends>
--                                </field>
--                                <field id="advanced_bml_checkout_size2" extends="payment_us/paypal_group_all_in_one/payflow_advanced/required_settings/advanced_advertise_bml/advanced_settings_bml_checkout/advanced_bml_checkout_size1">
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
--                                    <attribute type="shared">1</attribute>
--                                    <depends>
--                                        <field id="advanced_bml_checkout_position">1</field>
--                                    </depends>
--                                </field>
--                            </group>
--                        </group>
--                    </group>
--                    <group id="settings_payments_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
--                        <label>Basic Settings - PayPal Payments Advanced</label>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                        <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
--                            <label>Title</label>
--                            <comment>It is recommended to set this value to "Debit or Credit Card" per store views.</comment>
--                            <config_path>payment/payflow_advanced/title</config_path>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
--                            <label>Sort Order</label>
--                            <config_path>payment/payflow_advanced/sort_order</config_path>
--                            <frontend_class>validate-number</frontend_class>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
--                            <label>Payment Action</label>
--                            <config_path>payment/payflow_advanced/payment_action</config_path>
--                            <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <group id="settings_payments_advanced_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
--                            <label>Advanced Settings</label>
--                            <fieldset_css>config-advanced</fieldset_css>
--                            <field id="allowspecific" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
--                                <label>Payment Applicable From</label>
--                                <config_path>payment/payflow_advanced/allowspecific</config_path>
--                                <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="specificcountry" translate="label" type="multiselect" sortOrder="25" showInDefault="1" showInWebsite="1">
--                                <label>Countries Payment Applicable From</label>
--                                <config_path>payment/payflow_advanced/specificcountry</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
--                                <depends>
--                                    <field id="allowspecific">1</field>
--                                </depends>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
--                                <label>Debug Mode</label>
--                                <config_path>payment/payflow_advanced/debug</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
--                                <label>Enable SSL verification</label>
--                                <config_path>payment/payflow_advanced/verify_peer</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="csc_editable" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
--                                <label>CVV Entry is Editable</label>
--                                <config_path>payment/payflow_advanced/csc_editable</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="csc_required" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
--                                <label>Require CVV Entry</label>
--                                <config_path>payment/payflow_advanced/csc_required</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <depends>
--                                    <field id="csc_editable">1</field>
--                                </depends>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="email_confirmation" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
--                                <label>Send Email Confirmation</label>
--                                <config_path>payment/payflow_advanced/email_confirmation</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="url_method" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
--                                <label>URL method for Cancel URL and Return URL</label>
--                                <config_path>payment/payflow_advanced/url_method</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\UrlMethod</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <group id="settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="80">
--                                <label>Settlement Report Settings</label>
--                                <field id="heading_sftp" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_sftp"/>
--                                <field id="settlement_reports_ftp_login" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_login"/>
--                                <field id="settlement_reports_ftp_password" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_password"/>
--                                <field id="settlement_reports_ftp_sandbox" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_sandbox"/>
--                                <field id="settlement_reports_ftp_ip" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_ip"/>
--                                <field id="settlement_reports_ftp_path" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_path"/>
--                                <field id="heading_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_schedule"/>
--                                <field id="settlement_reports_active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_active"/>
--                                <field id="settlement_reports_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_schedule"/>
--                                <field id="settlement_reports_time" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_time"/>
--                            </group>
--                            <group id="frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
--                                <label>Frontend Experience Settings</label>
--                                <field id="logo" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/logo"/>
--                                <field id="paypal_pages" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_pages"/>
--                                <field id="page_style" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/page_style"/>
--                                <field id="paypal_hdrimg" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrimg"/>
--                                <field id="paypal_hdrbackcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbackcolor"/>
--                                <field id="paypal_hdrbordercolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbordercolor"/>
--                                <field id="paypal_payflowcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_payflowcolor"/>
--                            </group>
--                        </group>
--                    </group>
--                    <group id="settings_express_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
--                        <label>Basic Settings - PayPal Express Checkout</label>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                        <field id="title" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/title" />
--                        <field id="sort_order" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/sort_order" />
--                        <field id="payment_action" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/payment_action" />
--                        <field id="visible_on_product" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/visible_on_product" />
--                        <group id="settings_express_checkout_advanced" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/paypal_payflow_express_checkout_advanced"/>
--                    </group>
--                </group>
--                <group id="wpp_usuk" translate="label" sortOrder="40" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout">
--                    <label>Payments Pro</label>
--                    <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
--                    <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
--                    </group>
--                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                        <field id="enable_paypal_payflow">
--                            <attribute type="shared">0</attribute>
--                            <config_path>payment/paypal_payment_pro/active</config_path>
--                        </field>
--                        <group id="paypal_payflow_api_settings" translate="label">
--                            <label>Payments Pro and Express Checkout</label>
--                        </group>
--                    </group>
--                    <group id="settings_paypal_payflow" translate="label">
--                        <label>Basic Settings - PayPal Payments Pro</label>
--                    </group>
--                </group>
--                <group id="wps_express" extends="payment_all_paypal/express_checkout">
--                    <label>Payments Standard</label>
--                    <comment>Accept credit card and PayPal payments securely.</comment>
--                    <attribute type="activity_path">payment/wps_express/active</attribute>
--                    <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
--                    </group>
--                    <group id="express_checkout_required">
--                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
--                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
--                        <group id="express_checkout_required_express_checkout">
--                            <label>Payments Standard</label>
--                        </group>
--                        <field id="enable_express_checkout">
--                            <config_path>payment/wps_express/active</config_path>
--                        </field>
--                        <field id="enable_express_checkout_bml">
--                            <config_path>payment/wps_express_bml/active</config_path>
--                        </field>
--                    </group>
--                    <group id="settings_ec">
--                        <label>Basic Settings - PayPal Website Payments Standard</label>
--                    </group>
--                </group>
--            </group>
--            <group id="paypal_payment_gateways" translate="label" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
--                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
--                <group id="paypal_payflowpro_with_express_checkout" translate="label comment" extends="payment_all_paypal/paypal_payflowpro">
--                    <label>Payflow Pro</label>
--                    <attribute type="paypal_ec_separate">0</attribute>
--                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                        <label>Required PayPal Settings</label>
--                        <field id="enable_paypal_payflow">
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
--                        </field>
--                        <group id="paypal_payflow_api_settings" translate="label">
--                            <label>Payflow Pro and Express Checkout</label>
--                            <field id="business_account" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/business_account" translate="label" sortOrder="10">
--                                <frontend_class>not-required</frontend_class>
--                                <label>Email Associated with PayPal Merchant Account (Optional)</label>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                        </group>
--                        <field id="enable_express_checkout" extends="payment_all_paypal/payflow_link/payflow_link_required/enable_express_checkout_basic" showInDefault="1" showInWebsite="1">
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Hidden</frontend_model>
--                            <requires>
--                                <field id="enable_paypal_payflow"/>
--                            </requires>
--                        </field>
--                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
--                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
--                        <field id="enable_express_checkout_bml_payflow" translate="label" type="select" sortOrder="21" showInWebsite="1" showInDefault="1">
--                            <label>Enable PayPal Credit</label>
--                            <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
--                            You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
--                            <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
--                            </comment>
--                            <config_path>payment/payflow_express_bml/active</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml</frontend_model>
--                            <requires>
--                                <field id="enable_paypal_payflow"/>
--                            </requires>
--                        </field>
--                        <field id="express_checkout_bml_sort_order" sortOrder="30" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
--                            <config_path>payment/payflow_express_bml/sort_order</config_path>
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
--                            <depends>
--                                <field id="enable_express_checkout_bml_payflow">1</field>
--                            </depends>
--                        </field>
--                        <group id="paypal_payflow_advertise_bml" translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="40">
--                            <label>Advertise PayPal Credit</label>
--                            <comment>
--                                <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
--                                <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
--                                from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
--                                Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
--                                The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
--                                or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
--                            </comment>
--                            <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
--                            <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
--                            <group id="paypal_payflow_settings_bml_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
--                                <label>Home Page</label>
--                                <field id="bml_homepage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_display"/>
--                                <field id="paypal_payflow_bml_homepage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_position"/>
--                                <field id="paypal_payflow_bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
--                                    <label>Size</label>
--                                    <config_path>payment/paypal_express_bml/homepage_size</config_path>
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
--                                    <attribute type="shared">1</attribute>
--                                    <depends>
--                                        <field id="paypal_payflow_bml_homepage_position">0</field>
--                                    </depends>
--                                </field>
--                                <field id="paypal_payflow_bml_homepage_size2" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_advertise_bml/paypal_payflow_settings_bml_homepage/paypal_payflow_bml_homepage_size1">
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
--                                    <depends>
--                                        <field id="paypal_payflow_bml_homepage_position">1</field>
--                                    </depends>
--                                </field>
--                            </group>
--                            <group id="paypal_payflow_settings_bml_categorypage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
--                                <label>Catalog Category Page</label>
--                                <field id="bml_categorypage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_display"/>
--                                <field id="paypal_payflow_bml_categorypage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_position" />
--                                <field id="paypal_payflow_bml_categorypage_size1" translate="label" sortOrder="30" showInWebsite="1" showInDefault="1" type="select">
--                                    <label>Size</label>
--                                    <config_path>payment/paypal_express_bml/categorypage_size</config_path>
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
--                                    <attribute type="shared">1</attribute>
--                                    <depends>
--                                        <field id="paypal_payflow_bml_categorypage_position">0</field>
--                                    </depends>
--                                </field>
--                                <field id="paypal_payflow_bml_categorypage_size2" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_advertise_bml/paypal_payflow_settings_bml_categorypage/paypal_payflow_bml_categorypage_size1">
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
--                                    <depends>
--                                        <field id="paypal_payflow_bml_categorypage_position">1</field>
--                                    </depends>
--                                </field>
--                            </group>
--                            <group id="paypal_payflow_settings_bml_productpage" translate="label" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="40">
--                                <label>Catalog Product Page</label>
--                                <field id="bml_productpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_display" />
--                                <field id="paypal_payflow_bml_productpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_position" />
--                                <field id="paypal_payflow_bml_productpage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
--                                    <label>Size</label>
--                                    <config_path>payment/paypal_express_bml/productpage_size</config_path>
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
--                                    <attribute type="shared">1</attribute>
--                                    <depends>
--                                        <field id="paypal_payflow_bml_productpage_position">0</field>
--                                    </depends>
--                                </field>
--                                <field id="paypal_payflow_bml_productpage_size2" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_advertise_bml/paypal_payflow_settings_bml_productpage/paypal_payflow_bml_productpage_size1">
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
--                                    <depends>
--                                        <field id="paypal_payflow_bml_productpage_position">1</field>
--                                    </depends>
--                                </field>
--                            </group>
--                            <group id="paypal_payflow_settings_bml_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
--                                <label>Checkout Cart Page</label>
--                                <field id="bml_checkout_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_display" />
--                                <field id="paypal_payflow_bml_checkout_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_position" />
--                                <field id="paypal_payflow_bml_checkout_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
--                                    <label>Size</label>
--                                    <config_path>payment/paypal_express_bml/checkout_size</config_path>
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
--                                    <attribute type="shared">1</attribute>
--                                    <depends>
--                                        <field id="paypal_payflow_bml_checkout_position">0</field>
--                                    </depends>
--                                </field>
--                                <field id="paypal_payflow_bml_checkout_size2" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_advertise_bml/paypal_payflow_settings_bml_checkout/paypal_payflow_bml_checkout_size1">
--                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
--                                    <attribute type="shared">1</attribute>
--                                    <depends>
--                                        <field id="paypal_payflow_bml_checkout_position">1</field>
--                                    </depends>
--                                </field>
--                            </group>
--                        </group>
--                    </group>
--                    <group id="settings_paypal_payflow" translate="label">
--                        <group id="settings_paypal_payflow_advanced" translate="label">
--                            <group id="paypal_payflow_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
--                                <label>Frontend Experience Settings</label>
--                                <field id="logo" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/logo"/>
--                                <field id="paypal_pages" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_pages"/>
--                                <field id="page_style" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/page_style"/>
--                                <field id="paypal_hdrimg" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrimg"/>
--                                <field id="paypal_hdrbackcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbackcolor"/>
--                                <field id="paypal_hdrbordercolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbordercolor"/>
--                                <field id="paypal_payflowcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_payflowcolor"/>
--                            </group>
--                        </group>
--                    </group>
--                    <group id="paypal_payflow_express_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
--                        <label>Basic Settings - PayPal Express Checkout</label>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                        <field id="title" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
--                            <label>Title</label>
--                            <config_path>payment/payflow_express/title</config_path>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
--                            <label>Sort Order</label>
--                            <config_path>payment/payflow_express/sort_order</config_path>
--                            <frontend_class>validate-number</frontend_class>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
--                            <label>Payment Action</label>
--                            <config_path>payment/payflow_express/payment_action</config_path>
--                            <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <field id="visible_on_product" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
--                            <label>Display on Product Details Page</label>
--                            <config_path>payment/payflow_express/visible_on_product</config_path>
--                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                            <attribute type="shared">1</attribute>
--                        </field>
--                        <group id="paypal_payflow_express_checkout_advanced" translate="label" showInDefault="1" showInWebsite="1" sortOrder="60">
--                            <label>Advanced Settings</label>
--                            <fieldset_css>config-advanced</fieldset_css>
--                            <field id="visible_on_cart" translate="label comment" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
--                                <label>Display on Shopping Cart</label>
--                                <comment>Also affects mini-shopping cart.</comment>
--                                <config_path>payment/payflow_express/visible_on_cart</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\Yesnoshortcut</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
--                                <label>Payment Applicable From</label>
--                                <config_path>payment/payflow_express/allowspecific</config_path>
--                                <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
--                                <label>Countries Payment Applicable From</label>
--                                <config_path>payment/payflow_express/specificcountry</config_path>
--                                <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
--                                <depends>
--                                    <field id="allowspecific">1</field>
--                                </depends>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
--                                <label>Debug Mode</label>
--                                <config_path>payment/payflow_express/debug</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
--                                <label>Enable SSL verification</label>
--                                <config_path>payment/payflow_express/verify_peer</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="line_items_enabled" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
--                                <label>Transfer Cart Line Items</label>
--                                <config_path>payment/payflow_express/line_items_enabled</config_path>
--                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
--                                <attribute type="shared">1</attribute>
--                            </field>
--                            <field id="skip_order_review_step" sortOrder="50" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/skip_order_review_step"/>
--                        </group>
--                    </group>
--                </group>
--                <group id="payflow_link_us" extends="payment_all_paypal/payflow_link"/>
--            </group>
--            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
--                <group id="express_checkout_us" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
--                    <label>PayPal Express Checkout</label>
--                    <fieldset_css>complex paypal-express-section</fieldset_css>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
--                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
--                    <attribute type="shared">0</attribute>
--                    <attribute type="activity_path">payment/paypal_express/active</attribute>
--                    <attribute type="activity_path">payment/payflow_express/active</attribute>
--                    <attribute type="displayIn">recommended_solutions</attribute>
--                </group>
--            </group>
--        </section>
--        <section id="payment_gb" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
--            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
--                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <comment>Choose a secure bundled payment solution for your business.</comment>
--                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
--                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
--                <group id="wpp_usuk" translate="comment" sortOrder="20">
--                    <fieldset_css>pp-general-uk</fieldset_css>
--                    <demo_link>http://www.youtube.com/watch?v=LBe-TW87eGI&amp;list=PLF18B1094ABCD7CE8&amp;index=1&amp;feature=plpp_video</demo_link>
--                    <comment>Accept payments with a completely customizable checkout page.</comment>
--                    <group id="wpp_required_settings">
--                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                        <group id="wpp_advertise_bml" showInDefault="0" showInWebsite="0"/>
--                    </group>
--                </group>
--                <group id="payments_pro_hosted_solution_with_express_checkout" translate="label comment" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="30">
--                    <label>Website Payments Pro Hosted Solution</label>
--                    <attribute type="paypal_ec_separate">0</attribute>
--                    <group id="pphs_required_settings">
--                        <group id="pphs_required_settings_pphs" translate="label">
--                            <label>Website Payments Pro Hosted Solution and Express Checkout</label>
--                        </group>
--                        <field id="pphs_enable">
--                            <requires>
--                                <group id="pphs_required_settings_pphs"/>
--                            </requires>
--                            <frontend_class>paypal-enabler</frontend_class>
--                        </field>
--                    </group>
--                    <group id="pphs_settings" translate="label">
--                        <label>Basic Settings - PayPal Website Payments Pro Hosted Solution</label>
--                        <group id="pphs_settings_advanced">
--                            <group id="pphs_billing_agreement" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
--                                <label>PayPal Billing Agreement Settings</label>
--                                <field id="active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/active" />
--                                <field id="title" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/title" />
--                                <field id="sort_order" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/sort_order" />
--                                <field id="payment_action" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/payment_action" />
--                                <field id="allowspecific" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/allowspecific" />
--                                <field id="specificcountry" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/specificcountry" />
--                                <field id="debug" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/debug" />
--                                <field id="verify_peer" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/verify_peer" />
--                                <field id="line_items_enabled" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/line_items_enabled" />
--                                <field id="allow_billing_agreement_wizard" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/allow_billing_agreement_wizard" />
--                            </group>
--                            <group id="pphs_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
--                                <label>Frontend Experience Settings</label>
--                                <field id="logo" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/logo" />
--                                <field id="paypal_pages" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_pages" />
--                                <field id="page_style" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/page_style" />
--                                <field id="paypal_hdrimg" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrimg" />
--                                <field id="paypal_hdrbackcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbackcolor" />
--                                <field id="paypal_hdrbordercolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbordercolor" />
--                                <field id="paypal_payflowcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_payflowcolor" />
--                            </group>
--                        </group>
--                    </group>
--                    <group id="pphs_settings_express_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
--                        <label>Basic Settings - PayPal Express Checkout</label>
--                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                        <field id="title" extends="payment_all_paypal/express_checkout/settings_ec/title" />
--                        <field id="sort_order" extends="payment_all_paypal/express_checkout/settings_ec/sort_order" />
--                        <field id="payment_action" extends="payment_all_paypal/express_checkout/settings_ec/payment_action" />
--                        <field id="visible_on_product" extends="payment_all_paypal/express_checkout/settings_ec/visible_on_product" />
--                        <field id="authorization_honor_period" extends="payment_all_paypal/express_checkout/settings_ec/authorization_honor_period" />
--                        <field id="order_valid_period" extends="payment_all_paypal/express_checkout/settings_ec/order_valid_period" />
--                        <field id="child_authorization_number" extends="payment_all_paypal/express_checkout/settings_ec/child_authorization_number" />
--                        <group id="pphs_settings_express_checkout_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="80">
--                            <label>Advanced Settings</label>
--                            <fieldset_css>config-advanced</fieldset_css>
--                            <field id="visible_on_cart" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/visible_on_cart" />
--                            <field id="allowspecific" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/allowspecific" />
--                            <field id="specificcountry" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/specificcountry" />
--                            <field id="debug" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/debug" />
--                            <field id="verify_peer" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/verify_peer" />
--                            <field id="line_items_enabled" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/line_items_enabled" />
--                            <field id="transfer_shipping_options" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/transfer_shipping_options" />
--                            <field id="button_flavor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/button_flavor" />
--                            <field id="solution_type" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/solution_type" />
--                            <field id="require_billing_address" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/require_billing_address" />
--                            <field id="allow_ba_signup" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/allow_ba_signup" />
--                            <field id="skip_order_review_step" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/skip_order_review_step" />
--                        </group>
--                    </group>
--                </group>
--                <group id="wps_express" extends="payment_all_paypal/express_checkout" sortOrder="50">
--                    <label>Website Payments Standard</label>
--                    <comment>Accept credit card and PayPal payments securely.</comment>
--                    <attribute type="activity_path">payment/wps_express/active</attribute>
--                    <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
--                    </group>
--                    <group id="express_checkout_required">
--                        <group id="express_checkout_required_express_checkout">
--                            <label>Website Payments Standard</label>
--                        </group>
--                        <field id="enable_express_checkout">
--                            <config_path>payment/wps_express/active</config_path>
--                        </field>
--                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
--                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
--                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
--                    </group>
--                    <group id="settings_ec">
--                        <label>Basic Settings - PayPal Website Payments Standard</label>
--                    </group>
--                </group>
--            </group>
--            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
--                <group id="express_checkout_gb" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
--                    <label>PayPal Express Checkout</label>
--                    <fieldset_css>complex paypal-express-section</fieldset_css>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
--                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
--                    <attribute type="displayIn">recommended_solutions</attribute>
--                    <group id="express_checkout_required">
--                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
--                    </group>
--                </group>
--            </group>
--        </section>
--        <section id="payment_de" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
--            <group id="paypal_payment_solutions" showInDefault="0" showInWebsite="0" showInStore="0" sortOrder="5">
--                <group id="express_checkout_de" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
--                    <label>PayPal Express Checkout</label>
--                    <fieldset_css>complex paypal-express-section</fieldset_css>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
--                    <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
--                    <attribute type="displayIn">recommended_solutions</attribute>
--                    <group id="express_checkout_required">
--                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
--                    </group>
--                    <group id="settings_ec">
--                        <group id="settings_ec_advanced">
--                            <field id="solution_type" showInDefault="0" showInWebsite="0"/>
--                        </group>
--                    </group>
--                </group>
--            </group>
--        </section>
--        <section id="payment_other" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
--            <group id="express_checkout_other" translate="label comment" sortOrder="5" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label>PayPal Express Checkout</label>
--                <fieldset_css>complex paypal-express-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
--                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
--                <attribute type="displayIn">recommended_solutions</attribute>
--                <group id="express_checkout_required">
--                    <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                    <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
--                </group>
--            </group>
--            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
--                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
--                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <comment>Choose a secure bundled payment solution for your business.</comment>
--                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
--                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
--                <group id="wps_other" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
--                    <label>Website Payments Standard</label>
--                    <fieldset_css>complex</fieldset_css>
--                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
--                    <comment>Accept credit card and PayPal payments securely.</comment>
--                    <attribute type="activity_path">payment/wps_express/active</attribute>
--                    <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
--                    </group>
--                    <group id="express_checkout_required">
--                        <group id="express_checkout_required_express_checkout">
--                            <label>Website Payments Standard</label>
--                        </group>
--                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
--                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
--                        <field id="enable_express_checkout">
--                            <config_path>payment/wps_express/active</config_path>
--                        </field>
--                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
--                    </group>
--                    <group id="settings_ec">
--                        <label>Basic Settings - PayPal Website Payments Standard</label>
--                    </group>
--                </group>
--            </group>
--            <group id="paypal_payment_gateways" translate="label comment" sortOrder="8" showInDefault="0" showInWebsite="0" showInStore="0">
--                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
--                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <comment>Process payments using your own internet merchant account.</comment>
--                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
--                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
--            </group>
--        </section>
--        <section id="payment_ca" extends="payment_other">
--            <group id="express_checkout_other">
--                <attribute type="activity_path">payment/paypal_express/active</attribute>
--                <attribute type="activity_path">payment/payflow_express/active</attribute>
--            </group>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="20"/>
--            </group>
--            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
--                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
--                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
--                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
--                <group id="wpp_ca" translate="label" extends="payment_all_paypal/paypal_payflowpro" sortOrder="30">
--                    <label>Website Payments Pro</label>
--                    <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
--                    <group id="configuration_details">
--                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
--                    </group>
--                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
--                        <group id="paypal_payflow_api_settings">
--                            <label>Payments Pro</label>
--                        </group>
--                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
--                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
--                        <field id="enable_paypal_payflow">
--                            <frontend_class>paypal-enabler paypal-ec-pe</frontend_class>
--                            <attribute type="shared">0</attribute>
--                            <config_path>payment/paypal_payment_pro/active</config_path>
--                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
--                        </field>
--                    </group>
--                    <group id="settings_paypal_payflow">
--                        <label>Basic Settings - PayPal Payments Pro</label>
--                    </group>
--                </group>
--                <group id="paypal_payflowpro_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="40"/>
--                <group id="payflow_link_ca" extends="payment_all_paypal/payflow_link" sortOrder="50">
--                    <group id="payflow_link_required">
--                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
--                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
--                        <group id="payflow_link_advertise_bml" showInDefault="0" showInWebsite="0"/>
--                    </group>
--                </group>
--            </group>
--        </section>
--        <section id="payment_au" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="12"/>
--                <group id="payments_pro_hosted_solution_au" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
--            </group>
--            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
--                <group id="paypal_payflowpro_au" extends="payment_all_paypal/paypal_payflowpro" sortOrder="20"/>
--            </group>
--        </section>
--        <section id="payment_jp" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="12"/>
--                <group id="payments_pro_hosted_solution_jp" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
--                    <label>Website Payments Plus</label>
--                </group>
--            </group>
--        </section>
--        <section id="payment_fr" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="12"/>
--                <group id="payments_pro_hosted_solution_fr" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
--                    <label>Integral Evolution</label>
--                </group>
--            </group>
--        </section>
--        <section id="payment_it" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="12"/>
--                <group id="payments_pro_hosted_solution_it" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
--                    <label>Pro</label>
--                </group>
--            </group>
--        </section>
--        <section id="payment_es" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="12"/>
--                <group id="payments_pro_hosted_solution_es" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
--                    <label>Pasarela integral</label>
--                </group>
--            </group>
--        </section>
--        <section id="payment_hk" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other" sortOrder="12"/>
--                <group id="payments_pro_hosted_solution_hk" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
--            </group>
--        </section>
--        <section id="payment_nz" extends="payment_other">
--            <group id="express_checkout_other"/>
--            <group id="paypal_group_all_in_one">
--                <group id="wps_other"/>
--            </group>
--            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
--                <group id="paypal_payflowpro_nz" extends="payment_all_paypal/paypal_payflowpro"/>
--            </group>
--        </section>
--    </system>
--</config>
-diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
-index bd641dab26c..3f7f8719fd5 100644
---- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
-@@ -72,7 +72,7 @@ class CheckoutTest extends \PHPUnit\Framework\TestCase
- 
-         $this->api = $this->getMockBuilder(Nvp::class)
-             ->disableOriginalConstructor()
--            ->setMethods(['call', 'getExportedShippingAddress', 'getExportedBillingAddress'])
-+            ->setMethods(['call', 'getExportedShippingAddress', 'getExportedBillingAddress', 'getShippingRateCode'])
-             ->getMock();
- 
-         $this->api->expects($this->any())
-@@ -293,6 +293,7 @@ class CheckoutTest extends \PHPUnit\Framework\TestCase
-     /**
-      * The case when handling address data from Paypal button.
-      * System's address fields are replacing from export Paypal data.
-+     * Billing and Shipping address are the same
-      *
-      * @magentoDataFixture Magento/Paypal/_files/quote_payment_express_with_customer.php
-      * @magentoAppIsolation enabled
-@@ -301,24 +302,75 @@ class CheckoutTest extends \PHPUnit\Framework\TestCase
-     public function testReturnFromPaypalButton()
-     {
-         $quote = $this->getFixtureQuote();
-+        $quote->getShippingAddress()->setShippingMethod('');
-+
-         $this->prepareCheckoutModel($quote);
-         $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 1);
- 
-         $this->checkoutModel->returnFromPaypal('token');
- 
-         $shippingAddress = $quote->getShippingAddress();
--        $prefix = '';
-+        $billingAddress = $quote->getBillingAddress();
-+        $exportedShippingData = $this->getExportedData()['shipping'];
-+
-+        $this->assertEquals([$exportedShippingData['street']], $shippingAddress->getStreet());
-+        $this->assertEquals($exportedShippingData['firstname'], $shippingAddress->getFirstname());
-+        $this->assertEquals($exportedShippingData['city'], $shippingAddress->getCity());
-+        $this->assertEquals($exportedShippingData['telephone'], $shippingAddress->getTelephone());
-+        $this->assertEquals($exportedShippingData['email'], $shippingAddress->getEmail());
- 
--        $this->assertEquals([$prefix . $this->getExportedData()['street']], $shippingAddress->getStreet());
--        $this->assertEquals($prefix . $this->getExportedData()['firstname'], $shippingAddress->getFirstname());
--        $this->assertEquals($prefix . $this->getExportedData()['city'], $shippingAddress->getCity());
--        $this->assertEquals($prefix . $this->getExportedData()['telephone'], $shippingAddress->getTelephone());
--        $this->assertEquals($prefix . $this->getExportedData()['email'], $shippingAddress->getEmail());
-+        $this->assertEquals('flatrate_flatrate', $shippingAddress->getShippingMethod());
-+
-+        $this->assertEquals([$exportedShippingData['street']], $billingAddress->getStreet());
-+        $this->assertEquals($exportedShippingData['firstname'], $billingAddress->getFirstname());
-+        $this->assertEquals($exportedShippingData['city'], $billingAddress->getCity());
-+        $this->assertEquals($exportedShippingData['telephone'], $billingAddress->getTelephone());
-+        $this->assertEquals($exportedShippingData['email'], $billingAddress->getEmail());
-+    }
-+
-+    /**
-+     * The case when handling address data from Paypal button.
-+     * System's address fields are replacing from export Paypal data.
-+     * Billing and Shipping address are different
-+     *
-+     * @magentoDataFixture Magento/Paypal/_files/quote_payment_express_with_customer.php
-+     * @magentoAppIsolation enabled
-+     * @magentoDbIsolation enabled
-+     */
-+    public function testReturnFromPaypalButtonWithReturnBillingAddress()
-+    {
-+        $quote = $this->getFixtureQuote();
-+        $this->paypalConfig->expects($this->exactly(2))
-+            ->method('getValue')
-+            ->with('requireBillingAddress')
-+            ->willReturn(1);
-+        $this->prepareCheckoutModel($quote);
-+        $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 1);
-+
-+        $this->checkoutModel->returnFromPaypal('token');
-+
-+        $shippingAddress = $quote->getShippingAddress();
-+        $billingAddress = $quote->getBillingAddress();
-+        $exportedBillingData = $this->getExportedData()['billing'];
-+        $exportedShippingData = $this->getExportedData()['shipping'];
-+
-+        $this->assertEquals([$exportedShippingData['street']], $shippingAddress->getStreet());
-+        $this->assertEquals($exportedShippingData['firstname'], $shippingAddress->getFirstname());
-+        $this->assertEquals($exportedShippingData['city'], $shippingAddress->getCity());
-+        $this->assertEquals($exportedShippingData['telephone'], $shippingAddress->getTelephone());
-+        $this->assertEquals($exportedShippingData['email'], $shippingAddress->getEmail());
-+
-+        $this->assertEquals([$exportedBillingData['street']], $billingAddress->getStreet());
-+        $this->assertEquals($exportedBillingData['firstname'], $billingAddress->getFirstname());
-+        $this->assertEquals($exportedBillingData['city'], $billingAddress->getCity());
-+        $this->assertEquals($exportedBillingData['telephone'], $billingAddress->getTelephone());
-+        $this->assertEquals($exportedBillingData['email'], $billingAddress->getEmail());
-     }
- 
-     /**
-      * The case when handling address data from the checkout.
-      * System's address fields are not replacing from export PayPal data.
-+     * Billing and Shipping address are the same
-      *
-      * @magentoDataFixture Magento/Paypal/_files/quote_payment_express_with_customer.php
-      * @magentoAppIsolation enabled
-@@ -326,20 +378,67 @@ class CheckoutTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testReturnFromPaypalIfCheckout()
-     {
-+        $prefix = 'exported';
-         $quote = $this->getFixtureQuote();
--        $this->prepareCheckoutModel($quote);
-+        $this->prepareCheckoutModel($quote, $prefix);
-         $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 0);
- 
-+        $originalShippingAddress = $quote->getShippingAddress();
-+        $originalBillingAddress = $quote->getBillingAddress();
-+
-         $this->checkoutModel->returnFromPaypal('token');
- 
-         $shippingAddress = $quote->getShippingAddress();
-+        $billingAddress = $quote->getBillingAddress();
-+
-+        $this->assertEquals($originalShippingAddress->getStreet(), $shippingAddress->getStreet());
-+        $this->assertEquals($originalShippingAddress->getFirstname(), $shippingAddress->getFirstname());
-+        $this->assertEquals($originalShippingAddress->getCity(), $shippingAddress->getCity());
-+        $this->assertEquals($originalShippingAddress->getTelephone(), $shippingAddress->getTelephone());
- 
-+        $this->assertEquals($originalBillingAddress->getStreet(), $billingAddress->getStreet());
-+        $this->assertEquals($originalBillingAddress->getFirstname(), $billingAddress->getFirstname());
-+        $this->assertEquals($originalBillingAddress->getCity(), $billingAddress->getCity());
-+        $this->assertEquals($originalBillingAddress->getTelephone(), $billingAddress->getTelephone());
-+    }
-+
-+    /**
-+     * The case when handling address data from the checkout.
-+     * System's address fields are replacing billing address from export PayPal data.
-+     * Billing and Shipping address are different
-+     *
-+     * @magentoDataFixture Magento/Paypal/_files/quote_payment_express_with_customer.php
-+     * @magentoAppIsolation enabled
-+     * @magentoDbIsolation enabled
-+     */
-+    public function testReturnFromPaypalIfCheckoutWithReturnBillingAddress()
-+    {
-         $prefix = 'exported';
-+        $quote = $this->getFixtureQuote();
-+        $this->paypalConfig->expects($this->exactly(2))
-+            ->method('getValue')
-+            ->with('requireBillingAddress')
-+            ->willReturn(1);
-+        $this->prepareCheckoutModel($quote, $prefix);
-+        $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 0);
-+
-+        $originalShippingAddress = $quote->getShippingAddress();
-+
-+        $this->checkoutModel->returnFromPaypal('token');
- 
--        $this->assertNotEquals([$prefix . $this->getExportedData()['street']], $shippingAddress->getStreet());
--        $this->assertNotEquals($prefix . $this->getExportedData()['firstname'], $shippingAddress->getFirstname());
--        $this->assertNotEquals($prefix . $this->getExportedData()['city'], $shippingAddress->getCity());
--        $this->assertNotEquals($prefix . $this->getExportedData()['telephone'], $shippingAddress->getTelephone());
-+        $shippingAddress = $quote->getShippingAddress();
-+        $billingAddress = $quote->getBillingAddress();
-+        $exportedBillingData = $this->getExportedData()['billing'];
-+
-+        $this->assertEquals($originalShippingAddress->getStreet(), $shippingAddress->getStreet());
-+        $this->assertEquals($originalShippingAddress->getFirstname(), $shippingAddress->getFirstname());
-+        $this->assertEquals($originalShippingAddress->getCity(), $shippingAddress->getCity());
-+        $this->assertEquals($originalShippingAddress->getTelephone(), $shippingAddress->getTelephone());
-+
-+        $this->assertEquals([$prefix . $exportedBillingData['street']], $billingAddress->getStreet());
-+        $this->assertEquals($prefix . $exportedBillingData['firstname'], $billingAddress->getFirstname());
-+        $this->assertEquals($prefix . $exportedBillingData['city'], $billingAddress->getCity());
-+        $this->assertEquals($prefix . $exportedBillingData['telephone'], $billingAddress->getTelephone());
-     }
- 
-     /**
-@@ -363,7 +462,7 @@ class CheckoutTest extends \PHPUnit\Framework\TestCase
- 
-         $billingAddress = $quote->getBillingAddress();
- 
--        $this->performQuoteAddressAssertions($billingAddress, $this->getExportedData());
-+        $this->performQuoteAddressAssertions($billingAddress, $this->getExportedData()['billing']);
-     }
- 
-     /**
-@@ -437,7 +536,7 @@ class CheckoutTest extends \PHPUnit\Framework\TestCase
-      *
-      * @param Quote $quote
-      */
--    private function prepareCheckoutModel(Quote $quote)
-+    private function prepareCheckoutModel(Quote $quote, $prefix = '')
-     {
-         $this->checkoutModel = $this->objectManager->create(
-             Checkout::class,
-@@ -448,14 +547,17 @@ class CheckoutTest extends \PHPUnit\Framework\TestCase
-             ]
-         );
- 
--        $exportedBillingAddress = $this->getExportedAddressFixture($this->getExportedData());
-+        $exportedBillingAddress = $this->getExportedAddressFixture($this->getExportedData()['billing'], $prefix);
-         $this->api->method('getExportedBillingAddress')
-             ->willReturn($exportedBillingAddress);
- 
--        $exportedShippingAddress = $this->getExportedAddressFixture($this->getExportedData());
-+        $exportedShippingAddress = $this->getExportedAddressFixture($this->getExportedData()['shipping'], $prefix);
-         $this->api->method('getExportedShippingAddress')
-             ->willReturn($exportedShippingAddress);
- 
-+        $this->api->method('getShippingRateCode')
-+            ->willReturn('flatrate_flatrate Flat Rate - Fixed');
-+
-         $this->paypalInfo->method('importToPayment')
-             ->with($this->api, $quote->getPayment());
-     }
-@@ -468,16 +570,30 @@ class CheckoutTest extends \PHPUnit\Framework\TestCase
-     private function getExportedData(): array
-     {
-         return [
--            'email'      => 'customer@example.com',
--            'firstname'  => 'John',
--            'lastname'   => 'Doe',
--            'country'    => 'US',
--            'region'     => 'Colorado',
--            'region_id'  => '13',
--            'city'       => 'Denver',
--            'street'     => '66 Pearl St',
--            'postcode'   => '80203',
--            'telephone'  => '555-555-555',
-+            'shipping' => [
-+                'email'      => 'customer@example.com',
-+                'firstname'  => 'John',
-+                'lastname'   => 'Doe',
-+                'country'    => 'US',
-+                'region'     => 'Colorado',
-+                'region_id'  => '13',
-+                'city'       => 'Denver',
-+                'street'     => '66 Pearl St',
-+                'postcode'   => '80203',
-+                'telephone'  => '555-555-555',
-+            ],
-+            'billing' => [
-+                'email'      => 'customer@example.com',
-+                'firstname'  => 'Jane',
-+                'lastname'   => 'Doe',
-+                'country'    => 'US',
-+                'region'     => 'Texas',
-+                'region_id'  => '13',
-+                'city'       => 'Austin',
-+                'street'     => '1100 Congress Ave',
-+                'postcode'   => '78701',
-+                'telephone'  => '555-555-555'
-+            ]
-         ];
-     }
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php
-index 2318edbb80b..04fb36312f3 100644
---- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php
-@@ -22,6 +22,8 @@ use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
- /**
-  * @magentoAppIsolation enabled
-+ * @magentoDbIsolation disabled
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class SecureTokenTest extends TestCase
- {
-diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflow_link.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflow_link.php
-index b3fd8c6388c..7a90612a53c 100644
---- a/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflow_link.php
-+++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflow_link.php
-@@ -34,10 +34,11 @@ $quoteRepository->save($quote);
- $payment = $objManager->create(Payment::class);
- $payment->setMethod(Config::METHOD_PAYFLOWLINK)
-     ->setBaseAmountAuthorized(100)
--    ->setAdditionalInformation([
-+    ->setAdditionalInformation(
-+        [
-         'secure_silent_post_hash' => 'cf7i85d01ed7c92223031afb4rdl2f1f'
--    ]);
--
-+        ]
-+    );
- 
- /** @var OrderInterface $order */
- $order = $objManager->create(OrderInterface::class);
-diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflow_link_with_payment.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflow_link_with_payment.php
-new file mode 100644
-index 00000000000..a1d3947a57d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflow_link_with_payment.php
-@@ -0,0 +1,72 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+include __DIR__ . '/../../GraphQl/Quote/_files/guest/create_empty_cart.php';
-+include __DIR__ . '/../../PaypalGraphQl/_files/add_simple_product_payflowLink.php';
-+include __DIR__ . '/../../GraphQl/Quote/_files/guest/set_guest_email.php';
-+include __DIR__ . '/../../GraphQl/Quote/_files/set_new_shipping_address.php';
-+include __DIR__ . '/../../GraphQl/Quote/_files/set_new_billing_address.php';
-+include __DIR__ . '/../../GraphQl/Quote/_files/set_flatrate_shipping_method.php';
-+
-+use Magento\Paypal\Model\Config;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objManager = Bootstrap::getObjectManager();
-+
-+/** @var \Magento\Framework\UrlInterface $url */
-+$url = $objManager->get(\Magento\Framework\UrlInterface::class);
-+$baseUrl = $url->getBaseUrl();
-+
-+/** @var StoreInterface $store */
-+$store = $objManager->get(StoreManagerInterface::class)
-+    ->getStore();
-+
-+/** @var \Magento\Quote\Model\QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(\Magento\Quote\Model\QuoteFactory::class);
-+/** @var CartRepositoryInterface  $cartRepository */
-+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$quote->setStoreId($store->getId());
-+$cartRepository->save($quote);
-+
-+/** @var Payment $payment */
-+$payment = $objManager->create(Payment::class);
-+$payment->setMethod(Config::METHOD_PAYFLOWLINK)
-+    ->setBaseAmountAuthorized(30)
-+    ->setAdditionalInformation(
-+        [
-+        'cancel_url'=> $baseUrl .'paypal/payflow/cancelPayment',
-+        'return_url'=> $baseUrl .'paypal/payflow/returnUrl',
-+        'secure_token_id' => 'mysecuretokenId',
-+        'secure_token' => 'mysecuretoken'
-+        ]
-+    );
-+
-+/** @var OrderInterface $order */
-+$order = $objManager->create(OrderInterface::class);
-+$order->setIncrementId('test_quote')
-+    ->setBaseGrandTotal(30)
-+    ->setQuoteId($quote->getId())
-+    ->setStoreId($store->getId())
-+    ->setState(Order::STATE_PENDING_PAYMENT)
-+    ->setStatus(Order::STATE_PENDING_PAYMENT)
-+    ->setPayment($payment);
-+
-+/** @var OrderRepositoryInterface $orderRepository */
-+$orderRepository = $objManager->get(OrderRepositoryInterface::class);
-+$orderRepository->save($order);
-diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflow_link_with_payment_rollback.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflow_link_with_payment_rollback.php
-new file mode 100644
-index 00000000000..5afb275f5a9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflow_link_with_payment_rollback.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Sales\Model\ResourceModel\Order\Collection;
-+use Magento\Framework\Registry;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = Bootstrap::getObjectManager()->get(Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var $order \Magento\Sales\Model\Order */
-+$orderCollection = $objectManager->create(Collection::class);
-+foreach ($orderCollection as $order) {
-+    $order->delete();
-+}
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PaypalExpressSetPaymentMethodTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PaypalExpressSetPaymentMethodTest.php
-new file mode 100644
-index 00000000000..f367c0242fd
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PaypalExpressSetPaymentMethodTest.php
-@@ -0,0 +1,234 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver\Customer;
-+
-+use Magento\Paypal\Model\Api\Nvp;
-+use Magento\PaypalGraphQl\PaypalExpressAbstractTest;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
-+use Magento\Framework\UrlInterface;
-+
-+/**
-+ * Test ExpressSetPaymentMethodTest graphql endpoint for customer
-+ *
-+ * @magentoAppArea graphql
-+ */
-+class PaypalExpressSetPaymentMethodTest extends PaypalExpressAbstractTest
-+{
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $json;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteId
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->json = $this->objectManager->get(SerializerInterface::class);
-+        $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-+    }
-+
-+    /**
-+     * Test end to end test to process a paypal express order
-+     *
-+     * @param string $paymentMethod
-+     * @return void
-+     * @dataProvider getPaypalCodesProvider
-+     * @magentoConfigFixture default_store paypal/wpp/sandbox_flag 1
-+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testResolve(string $paymentMethod): void
-+    {
-+        $this->enablePaymentMethod($paymentMethod);
-+        if ($paymentMethod === 'payflow_express') {
-+            $this->enablePaymentMethod('payflow_link');
-+        }
-+
-+        $payerId = 'PAYER123456';
-+        $token = 'EC-TOKEN1234';
-+        $correlationId = 'c123456789';
-+        $reservedQuoteId = 'test_quote';
-+
-+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
-+        $cartId = $cart->getId();
-+        $maskedCartId = $this->quoteIdToMaskedId->execute((int) $cartId);
-+
-+        $url = $this->objectManager->get(UrlInterface::class);
-+        $baseUrl = $url->getBaseUrl();
-+
-+        $query = <<<QUERY
-+mutation {
-+    createPaypalExpressToken(input: {
-+        cart_id: "{$maskedCartId}",
-+        code: "{$paymentMethod}",
-+        urls: {
-+            return_url: "{$baseUrl}paypal/express/return/",
-+            cancel_url: "{$baseUrl}paypal/express/cancel/"
-+            success_url: "{$baseUrl}checkout/onepage/success/",
-+            pending_url: "{$baseUrl}checkout/onepage/pending/"
-+        }
-+        express_button: false
-+    })
-+    {
-+        __typename
-+        token
-+        paypal_urls{
-+            start
-+            edit
-+        }
-+    }
-+    setPaymentMethodOnCart(input: {
-+        payment_method: {
-+          code: "{$paymentMethod}",
-+          additional_data: {
-+            paypal_express: {
-+              payer_id: "$payerId",
-+              token: "$token"
-+            }
-+            payflow_express: {
-+              payer_id: "$payerId",
-+              token: "$token"
-+            }
-+          }
-+        },
-+        cart_id: "{$maskedCartId}"})
-+      {
-+        cart {
-+          selected_payment_method {
-+            code
-+          }
-+        }
-+      }
-+      placeOrder(input: {cart_id: "{$maskedCartId}"}) {
-+        order {
-+          order_id
-+        }
-+      }
-+}
-+QUERY;
-+
-+        /** @var \Magento\Integration\Model\Oauth\Token $tokenModel */
-+        $tokenModel = $this->objectManager->create(\Magento\Integration\Model\Oauth\Token::class);
-+        $customerToken = $tokenModel->createCustomerToken(1)->getToken();
-+
-+        $requestHeaders = [
-+            'Content-Type' => 'application/json',
-+            'Accept' => 'application/json',
-+            'Authorization' => 'Bearer ' . $customerToken
-+        ];
-+
-+        $paypalRequest = include __DIR__ . '/../../../_files/customer_paypal_create_token_request.php';
-+        $paypalResponse = [
-+            'TOKEN' => $payerId,
-+            'CORRELATIONID' => $correlationId,
-+            'ACK' => 'Success'
-+        ];
-+
-+        if ($paymentMethod == 'payflow_express') {
-+            $paypalRequest['SOLUTIONTYPE'] = null;
-+        }
-+
-+        $paypalRequest['AMT'] = '30.00';
-+        $paypalRequest['SHIPPINGAMT'] = '10.00';
-+
-+        $this->nvpMock
-+            ->expects($this->at(0))
-+            ->method('call')
-+            ->with(Nvp::SET_EXPRESS_CHECKOUT, $paypalRequest)
-+            ->willReturn($paypalResponse);
-+
-+        $paypalRequestDetails = [
-+            'TOKEN' => $token,
-+        ];
-+
-+        $paypalRequestDetailsResponse = include __DIR__ . '/../../../_files/paypal_set_payer_id_repsonse.php';
-+
-+        $this->nvpMock
-+            ->expects($this->at(1))
-+            ->method('call')
-+            ->with(Nvp::GET_EXPRESS_CHECKOUT_DETAILS, $paypalRequestDetails)
-+            ->willReturn($paypalRequestDetailsResponse);
-+
-+        $paypalRequestPlaceOrder = include __DIR__ . '/../../../_files/paypal_place_order_request.php';
-+
-+        $paypalRequestPlaceOrder['EMAIL'] = 'customer@example.com';
-+
-+        $this->nvpMock
-+            ->expects($this->at(2))
-+            ->method('call')
-+            ->with(Nvp::DO_EXPRESS_CHECKOUT_PAYMENT, $paypalRequestPlaceOrder)
-+            ->willReturn(
-+                [
-+                    'RESULT' => '0',
-+                    'PNREF' => 'B7PPAC033FF2',
-+                    'RESPMSG' => 'Approved',
-+                    'AVSADDR' => 'Y',
-+                    'AVSZIP' => 'Y',
-+                    'TOKEN' => $token,
-+                    'PAYERID' => $payerId,
-+                    'PPREF' => '7RK43642T8939154L',
-+                    'CORRELATIONID' => $correlationId,
-+                    'PAYMENTTYPE' => 'instant',
-+                    'PENDINGREASON' => 'authorization',
-+                ]
-+            );
-+
-+        $response = $this->graphQlRequest->send($query, [], '', $requestHeaders);
-+        $responseData = $this->json->unserialize($response->getContent());
-+
-+        $this->assertArrayHasKey('data', $responseData);
-+        $this->assertArrayHasKey('createPaypalExpressToken', $responseData['data']);
-+        $createTokenData = $responseData['data']['createPaypalExpressToken'];
-+
-+        $this->assertArrayNotHasKey('errors', $responseData);
-+        $this->assertEquals($paypalResponse['TOKEN'], $createTokenData['token']);
-+        $this->assertArrayHasKey('paypal_urls', $createTokenData);
-+
-+        $this->assertTrue(
-+            isset($responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code'])
-+        );
-+        $this->assertEquals(
-+            $paymentMethod,
-+            $responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
-+        );
-+
-+        $this->assertTrue(
-+            isset($responseData['data']['placeOrder']['order']['order_id'])
-+        );
-+        $this->assertEquals(
-+            'test_quote',
-+            $responseData['data']['placeOrder']['order']['order_id']
-+        );
-+    }
-+
-+    /**
-+     * Paypal method codes provider
-+     *
-+     * @return array
-+     */
-+    public function getPaypalCodesProvider(): array
-+    {
-+        return [
-+            ['paypal_express'],
-+            ['payflow_express'],
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PaypalExpressTokenTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PaypalExpressTokenTest.php
-new file mode 100644
-index 00000000000..8a48ddd0acf
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PaypalExpressTokenTest.php
-@@ -0,0 +1,115 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver\Customer;
-+
-+use Magento\Paypal\Model\Api\Nvp;
-+use Magento\PaypalGraphQl\PaypalExpressAbstractTest;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
-+
-+/**
-+ * Test createPaypalExpressToken graphql endpoint for customer
-+ *
-+ * @magentoAppArea graphql
-+ */
-+class PaypalExpressTokenTest extends PaypalExpressAbstractTest
-+{
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $json;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteId
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->json = $this->objectManager->get(SerializerInterface::class);
-+        $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-+    }
-+
-+    /**
-+     * Test create paypal token for customer
-+     *
-+     * @param string $paymentMethod
-+     * @dataProvider getPaypalCodesProvider
-+     * @magentoConfigFixture default_store paypal/wpp/sandbox_flag 1
-+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testResolve($paymentMethod): void
-+    {
-+        $this->enablePaymentMethod($paymentMethod);
-+        if ($paymentMethod === 'payflow_express') {
-+            $this->enablePaymentMethod('payflow_link');
-+        }
-+
-+        $reservedQuoteId = 'test_quote';
-+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
-+        $cartId = $cart->getId();
-+        $maskedCartId = $this->quoteIdToMaskedId->execute((int) $cartId);
-+
-+        $query = $this->getCreateTokenMutation($maskedCartId, $paymentMethod);
-+
-+        $paypalRequest = include __DIR__ . '/../../../_files/customer_paypal_create_token_request.php';
-+        if ($paymentMethod == 'payflow_express') {
-+            $paypalRequest['SOLUTIONTYPE'] = null;
-+        }
-+
-+        $paypalResponse = [
-+            'TOKEN' => 'EC-TOKEN1234',
-+            'CORRELATIONID' => 'c123456789',
-+            'ACK' => 'Success'
-+        ];
-+
-+        $this->nvpMock
-+            ->expects($this->once())
-+            ->method('call')
-+            ->with(Nvp::SET_EXPRESS_CHECKOUT, $paypalRequest)
-+            ->willReturn($paypalResponse);
-+
-+        /** @var \Magento\Integration\Model\Oauth\Token $tokenModel */
-+        $tokenModel = $this->objectManager->create(\Magento\Integration\Model\Oauth\Token::class);
-+        $customerToken = $tokenModel->createCustomerToken(1)->getToken();
-+
-+        $requestHeaders = [
-+            'Accept' => 'application/json',
-+            'Authorization' => 'Bearer ' . $customerToken
-+        ];
-+
-+        $response = $this->graphQlRequest->send($query, [], '', $requestHeaders);
-+        $responseData = $this->json->unserialize($response->getContent());
-+        $createTokenData = $responseData['data']['createPaypalExpressToken'];
-+        $this->assertArrayNotHasKey('errors', $responseData);
-+        $this->assertEquals($paypalResponse['TOKEN'], $createTokenData['token']);
-+        $this->assertArrayHasKey('paypal_urls', $createTokenData);
-+    }
-+
-+    /**
-+     * Paypal method codes provider
-+     *
-+     * @return array
-+     */
-+    public function getPaypalCodesProvider(): array
-+    {
-+        return [
-+            ['paypal_express'],
-+            ['payflow_express'],
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php
-new file mode 100644
-index 00000000000..b5d2aeb0803
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php
-@@ -0,0 +1,207 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver\Customer;
-+
-+use Magento\Framework\App\ProductMetadataInterface;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\Math\Random;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\GraphQl\Service\GraphQlRequest;
-+use Magento\Integration\Model\Oauth\Token;
-+use Magento\Paypal\Model\Payflow\Request;
-+use Magento\Paypal\Model\Payflow\Service\Gateway;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\UrlInterface;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Paypal\Model\Payflow\RequestFactory;
-+
-+/**
-+ * End to end place order test using payflow_link via graphql endpoint for registered customer
-+ *
-+ * @magentoAppArea graphql
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class PlaceOrderWithPayflowLinkTest extends TestCase
-+{
-+    /** @var GraphQlRequest */
-+    private $graphQlRequest;
-+
-+    /** @var SerializerInterface */
-+    private $json;
-+
-+    /** @var QuoteIdToMaskedQuoteId */
-+    private $quoteIdToMaskedId;
-+
-+    /** @var GetMaskedQuoteIdByReservedOrderId */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /** @var ObjectManager */
-+    private $objectManager;
-+
-+    /** @var Gateway|MockObject */
-+    private $gateway;
-+
-+    /** @var Random|MockObject */
-+    private $mathRandom;
-+
-+    /** @var Request|MockObject */
-+    private $payflowRequest;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->json = $this->objectManager->get(SerializerInterface::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $this->objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-+        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
-+
-+        $this->mathRandom = $this->getMockBuilder(Random::class)
-+            ->getMock();
-+        $this->gateway = $this->getMockBuilder(Gateway::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['postRequest'])
-+            ->getMock();
-+
-+        $requestFactory = $this->getMockBuilder(RequestFactory::class)
-+            ->setMethods(['create'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->payflowRequest = $this->getMockBuilder(Request::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $requestFactory->expects($this->any())->method('create')->will($this->returnValue($this->payflowRequest));
-+
-+        $this->objectManager->addSharedInstance($this->gateway, Gateway::class);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function tearDown()
-+    {
-+        $this->objectManager->removeSharedInstance(Gateway::class);
-+    }
-+
-+    /**
-+     * Test place order with payflow link
-+     *
-+     * @magentoConfigFixture default_store payment/payflow_link/active 1
-+     * @magentoConfigFixture default_store payment/payflow_link/sandbox_flag 1
-+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @return void
-+     */
-+    public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void
-+    {
-+        $paymentMethod = 'payflow_link';
-+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $url = $this->objectManager->get(UrlInterface::class);
-+        $baseUrl = $url->getBaseUrl();
-+
-+        $query
-+            = <<<QUERY
-+ mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$cartId"
-+      payment_method: {
-+          code: "$paymentMethod"
-+          additional_data: {
-+            payflow_link: 
-+            {
-+           cancel_url:"{$baseUrl}paypal/payflow/cancelPayment"
-+           return_url:"{$baseUrl}paypal/payflow/returnUrl"
-+          }
-+        }
-+      }
-+  }) {    
-+       cart {
-+          selected_payment_method {
-+          code
-+      }
-+    }
-+  }
-+    placeOrder(input: {cart_id: "$cartId"}) {
-+      order {
-+        order_id
-+      }
-+    }
-+}
-+QUERY;
-+
-+        $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-+        $button = 'Magento_Cart_' . $productMetadata->getEdition();
-+
-+        $payflowLinkResponse = new DataObject(
-+            [
-+            'result' => '0',
-+            'respmsg' => 'Approved',
-+            'pnref' => 'V19A3D27B61E',
-+            'result_code' => '0'
-+            ]
-+        );
-+        $this->gateway->expects($this->once())
-+            ->method('postRequest')
-+            ->willReturn($payflowLinkResponse);
-+
-+        $this->payflowRequest->method('setData')
-+            ->willReturnMap(
-+                [
-+                    [
-+                        'user' => null,
-+                        'vendor' => null,
-+                        'partner' => null,
-+                        'pwd' => null,
-+                        'verbosity' => null,
-+                        'BUTTONSOURCE' => $button,
-+                        'tender' => 'C',
-+                    ],
-+                    $this->returnSelf()
-+                ],
-+                ['USER1', 1, $this->returnSelf()],
-+                ['USER2', 'USER2SilentPostHash', $this->returnSelf()]
-+            );
-+
-+        /** @var Token $tokenModel */
-+        $tokenModel = $this->objectManager->create(Token::class);
-+        $customerToken = $tokenModel->createCustomerToken(1)->getToken();
-+
-+        $requestHeaders = [
-+            'Accept' => 'application/json',
-+            'Authorization' => 'Bearer ' . $customerToken
-+        ];
-+        $response = $this->graphQlRequest->send($query, [], '', $requestHeaders);
-+        $responseData = $this->json->unserialize($response->getContent());
-+        $this->assertArrayNotHasKey('errors', $responseData);
-+        $this->assertArrayHasKey('data', $responseData);
-+        $this->assertEquals(
-+            $paymentMethod,
-+            $responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
-+        );
-+        $this->assertTrue(
-+            isset($responseData['data']['placeOrder']['order']['order_id'])
-+        );
-+        $this->assertEquals(
-+            'test_quote',
-+            $responseData['data']['placeOrder']['order']['order_id']
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php
-new file mode 100644
-index 00000000000..444588195e0
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php
-@@ -0,0 +1,223 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver\Customer;
-+
-+use Magento\PaypalGraphQl\PaypalPayflowProAbstractTest;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
-+use Magento\Framework\UrlInterface;
-+use Magento\Framework\DataObject;
-+
-+/**
-+ * End to end place order test using payflowpro via graphql endpoint for customer
-+ *
-+ * @magentoAppArea graphql
-+ */
-+class PlaceOrderWithPayflowProTest extends PaypalPayflowProAbstractTest
-+{
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $json;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteId
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->json = $this->objectManager->get(SerializerInterface::class);
-+        $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-+    }
-+
-+    /**
-+     * Test end to end test to process a paypal payflow pro order
-+     *
-+     * @return void
-+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testResolveCustomer(): void
-+    {
-+        $paymentMethod = 'payflowpro';
-+        $this->enablePaymentMethod($paymentMethod);
-+        $reservedQuoteId = 'test_quote';
-+
-+        $payload = 'BILLTOCITY=CityM&AMT=0.00&BILLTOSTREET=Green+str,+67&VISACARDLEVEL=12&SHIPTOCITY=CityM'
-+            . '&NAMETOSHIP=John+Smith&ZIP=75477&BILLTOLASTNAME=Smith&BILLTOFIRSTNAME=John'
-+            . '&RESPMSG=Verified&PROCCVV2=M&STATETOSHIP=AL&NAME=John+Smith&BILLTOZIP=75477&CVV2MATCH=Y'
-+            . '&PNREF=B70CCC236815&ZIPTOSHIP=75477&SHIPTOCOUNTRY=US&SHIPTOSTREET=Green+str,+67&CITY=CityM'
-+            . '&HOSTCODE=A&LASTNAME=Smith&STATE=AL&SECURETOKEN=MYSECURETOKEN&CITYTOSHIP=CityM&COUNTRYTOSHIP=US'
-+            . '&AVSDATA=YNY&ACCT=1111&AUTHCODE=111PNI&FIRSTNAME=John&RESULT=0&IAVS=N&POSTFPSMSG=No+Rules+Triggered&'
-+            . 'BILLTOSTATE=AL&BILLTOCOUNTRY=US&EXPDATE=0222&CARDTYPE=0&PREFPSMSG=No+Rules+Triggered&SHIPTOZIP=75477&'
-+            . 'PROCAVS=A&COUNTRY=US&AVSZIP=N&ADDRESS=Green+str,+67&BILLTONAME=John+Smith&'
-+            . 'ADDRESSTOSHIP=Green+str,+67&'
-+            . 'AVSADDR=Y&SECURETOKENID=MYSECURETOKENID&SHIPTOSTATE=AL&TRANSTIME=2019-06-24+07%3A53%3A10';
-+
-+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
-+        $cartId = $this->quoteIdToMaskedId->execute((int)$cart->getId());
-+
-+        $url = $this->objectManager->get(UrlInterface::class);
-+        $baseUrl = $url->getBaseUrl();
-+
-+        $query = <<<QUERY
-+mutation {
-+    setPaymentMethodOnCart(input: {
-+        payment_method: {
-+          code: "{$paymentMethod}",
-+          additional_data: {
-+            payflowpro: {
-+              cc_details: {
-+                 cc_exp_month: 12,
-+                 cc_exp_year: 2030,
-+                 cc_last_4: 1111,
-+                 cc_type: "IV",
-+              }
-+            }
-+          }
-+        },
-+        cart_id: "{$cartId}"})
-+      {
-+        cart {
-+          selected_payment_method {
-+            code
-+          }
-+        }
-+      }
-+      createPayflowProToken(
-+        input: {
-+          cart_id:"{$cartId}",
-+          urls: {
-+            cancel_url: "{$baseUrl}paypal/transparent/cancel/"
-+            error_url: "{$baseUrl}paypal/transparent/error/"
-+            return_url: "{$baseUrl}paypal/transparent/response/"
-+          }
-+        }
-+      ) {
-+          response_message
-+          result
-+          result_code
-+          secure_token
-+          secure_token_id
-+        }
-+      handlePayflowProResponse(input: {
-+          paypal_payload: "$payload",
-+          cart_id: "{$cartId}"
-+        })
-+      {
-+        cart {
-+          selected_payment_method {
-+            code
-+          }
-+        }
-+      }
-+      placeOrder(input: {cart_id: "{$cartId}"}) {
-+        order {
-+          order_id
-+        }
-+      }
-+}
-+QUERY;
-+
-+        /** @var \Magento\Integration\Model\Oauth\Token $tokenModel */
-+        $tokenModel = $this->objectManager->create(\Magento\Integration\Model\Oauth\Token::class);
-+        $customerToken = $tokenModel->createCustomerToken(1)->getToken();
-+
-+        $requestHeaders = [
-+            'Content-Type' => 'application/json',
-+            'Accept' => 'application/json',
-+            'Authorization' => 'Bearer ' . $customerToken
-+        ];
-+        $paypalResponse = new DataObject(
-+            [
-+                'result' => '0',
-+                'securetoken' => 'mysecuretoken',
-+                'securetokenid' => 'mysecuretokenid',
-+                'respmsg' => 'Approved',
-+                'result_code' => '0',
-+            ]
-+        );
-+
-+        $this->gatewayMock
-+            ->expects($this->at(0))
-+            ->method('postRequest')
-+            ->willReturn($paypalResponse);
-+
-+        $this->gatewayMock
-+            ->expects($this->at(1))
-+            ->method('postRequest')
-+            ->willReturn(
-+                new DataObject(
-+                    [
-+                        'result' => '0',
-+                        'pnref' => 'A70AAC2378BA',
-+                        'respmsg' => 'Approved',
-+                        'authcode' => '647PNI',
-+                        'avsaddr' => 'Y',
-+                        'avszip' => 'N',
-+                        'hostcode' => 'A',
-+                        'procavs' => 'A',
-+                        'visacardlevel' => '12',
-+                        'transtime' => '2019-06-24 10:12:03',
-+                        'firstname' => 'Cristian',
-+                        'lastname' => 'Partica',
-+                        'amt' => '14.99',
-+                        'acct' => '1111',
-+                        'expdate' => '0221',
-+                        'cardtype' => '0',
-+                        'iavs' => 'N',
-+                        'result_code' => '0',
-+                    ]
-+                )
-+            );
-+
-+        $response = $this->graphQlRequest->send($query, [], '', $requestHeaders);
-+        $responseData = $this->json->unserialize($response->getContent());
-+
-+        $this->assertArrayHasKey('data', $responseData);
-+        $this->assertArrayHasKey('createPayflowProToken', $responseData['data']);
-+        $createTokenData = $responseData['data']['createPayflowProToken'];
-+        $this->assertArrayNotHasKey('errors', $responseData);
-+        $this->assertEquals($paypalResponse->getData('securetoken'), $createTokenData['secure_token']);
-+        $this->assertEquals($paypalResponse->getData('securetokenid'), $createTokenData['secure_token_id']);
-+
-+        $this->assertTrue(
-+            isset($responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code'])
-+        );
-+        $this->assertEquals(
-+            $paymentMethod,
-+            $responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
-+        );
-+
-+        $this->assertTrue(
-+            isset($responseData['data']['handlePayflowProResponse']['cart']['selected_payment_method']['code'])
-+        );
-+        $this->assertEquals(
-+            $paymentMethod,
-+            $responseData['data']['handlePayflowProResponse']['cart']['selected_payment_method']['code']
-+        );
-+
-+        $this->assertTrue(
-+            isset($responseData['data']['placeOrder']['order']['order_id'])
-+        );
-+        $this->assertEquals(
-+            'test_quote',
-+            $responseData['data']['placeOrder']['order']['order_id']
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/GetPayflowLinkTokenTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/GetPayflowLinkTokenTest.php
-new file mode 100644
-index 00000000000..662beab7a36
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/GetPayflowLinkTokenTest.php
-@@ -0,0 +1,81 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver\Guest;
-+
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\GraphQl\Service\GraphQlRequest;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Test getPayflowLinkToken graphql endpoint for non-registered customer
-+ *
-+ * @magentoAppArea graphql
-+ */
-+class GetPayflowLinkTokenTest extends TestCase
-+{
-+    /** @var GraphQlRequest */
-+    private $graphQlRequest;
-+
-+    /** @var SerializerInterface */
-+    private $json;
-+
-+    /** @var ObjectManager */
-+    private $objectManager;
-+
-+    /** @var GetMaskedQuoteIdByReservedOrderId */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->getMaskedQuoteIdByReservedOrderId = $this->objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->json = $this->objectManager->get(SerializerInterface::class);
-+        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
-+    }
-+
-+    /**
-+     * Test get payflowLink secure token
-+     *
-+     * @magentoConfigFixture default_store payment/payflow_link/active 1
-+     * @magentoConfigFixture default_store payment/payflow_link/sandbox_flag 1
-+     * @magentoDataFixture Magento/Paypal/_files/order_payflow_link_with_payment.php
-+     * @return void
-+     */
-+    public function testResolvePayflowLinkToken() : void
-+    {
-+        $reservedQuoteId = 'test_quote';
-+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedQuoteId);
-+
-+        $payflowLinkTokenQuery
-+            = <<<QUERY
-+ {
-+   getPayflowLinkToken(input: {cart_id:"$cartId"})
-+   {
-+       secure_token
-+       secure_token_id
-+       mode
-+       paypal_url
-+  }
-+}
-+QUERY;
-+
-+        $response = $this->graphQlRequest->send($payflowLinkTokenQuery);
-+        $responseData = $this->json->unserialize($response->getContent());
-+        $this->assertArrayNotHasKey('errors', $responseData);
-+        $this->assertArrayHasKey('data', $responseData);
-+
-+        $payflowLinkTokenResponse = $responseData['data']['getPayflowLinkToken'];
-+        $this->assertArrayHasKey('secure_token', $payflowLinkTokenResponse);
-+        $this->assertArrayHasKey('secure_token_id', $payflowLinkTokenResponse);
-+        $this->assertEquals('TEST', $payflowLinkTokenResponse['mode']);
-+        $this->assertEquals('https://pilot-payflowlink.paypal.com', $payflowLinkTokenResponse['paypal_url']);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressSetPaymentMethodTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressSetPaymentMethodTest.php
-new file mode 100644
-index 00000000000..0b8b18d88e0
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressSetPaymentMethodTest.php
-@@ -0,0 +1,219 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver\Guest;
-+
-+use Magento\Paypal\Model\Api\Nvp;
-+use Magento\PaypalGraphQl\PaypalExpressAbstractTest;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
-+use Magento\Framework\UrlInterface;
-+
-+/**
-+ * Test ExpressSetPaymentMethodTest graphql endpoint for guest
-+ *
-+ * @magentoAppArea graphql
-+ */
-+class PaypalExpressSetPaymentMethodTest extends PaypalExpressAbstractTest
-+{
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $json;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteId
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->json = $this->objectManager->get(SerializerInterface::class);
-+        $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-+    }
-+
-+    /**
-+     * Test end to end test to process a paypal express order
-+     *
-+     * @param string $paymentMethod
-+     * @return void
-+     * @dataProvider getPaypalCodesProvider
-+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testResolveGuest(string $paymentMethod): void
-+    {
-+        $this->enablePaymentMethod($paymentMethod);
-+        if ($paymentMethod === 'payflow_express') {
-+            $this->enablePaymentMethod('payflow_link');
-+        }
-+
-+        $reservedQuoteId = 'test_quote';
-+        $payerId = 'PAYER123456';
-+        $token = 'EC-TOKEN1234';
-+        $correlationId = 'c123456789';
-+
-+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
-+        $cartId = $this->quoteIdToMaskedId->execute((int)$cart->getId());
-+
-+        $url = $this->objectManager->get(UrlInterface::class);
-+        $baseUrl = $url->getBaseUrl();
-+
-+        $query = <<<QUERY
-+mutation {
-+    createPaypalExpressToken(input: {
-+        cart_id: "{$cartId}",
-+        code: "{$paymentMethod}",
-+        urls: {
-+            return_url: "{$baseUrl}paypal/express/return/",
-+            cancel_url: "{$baseUrl}paypal/express/cancel/"
-+            success_url: "{$baseUrl}checkout/onepage/success/",
-+            pending_url: "{$baseUrl}checkout/onepage/pending/"
-+        }
-+        express_button: false
-+    })
-+    {
-+        __typename
-+        token
-+        paypal_urls{
-+            start
-+            edit
-+        }
-+    }
-+    setPaymentMethodOnCart(input: {
-+        payment_method: {
-+          code: "{$paymentMethod}",
-+          additional_data: {
-+            paypal_express: {
-+              payer_id: "$payerId",
-+              token: "$token"
-+            }
-+            payflow_express: {
-+              payer_id: "$payerId",
-+              token: "$token"
-+            }
-+          }
-+        },
-+        cart_id: "{$cartId}"})
-+      {
-+        cart {
-+          selected_payment_method {
-+            code
-+          }
-+        }
-+      }
-+      placeOrder(input: {cart_id: "{$cartId}"}) {
-+        order {
-+          order_id
-+        }
-+      }
-+}
-+QUERY;
-+
-+        $paypalRequest = include __DIR__ . '/../../../_files/guest_paypal_create_token_request.php';
-+        $paypalResponse = [
-+            'TOKEN' => $token,
-+            'CORRELATIONID' => $correlationId,
-+            'ACK' => 'Success'
-+        ];
-+
-+        if ($paymentMethod == 'payflow_express') {
-+            $paypalRequest['SOLUTIONTYPE'] = null;
-+        }
-+
-+        $paypalRequest['AMT'] = '30.00';
-+        $paypalRequest['SHIPPINGAMT'] = '10.00';
-+
-+        $this->nvpMock
-+            ->expects($this->at(0))
-+            ->method('call')
-+            ->with(Nvp::SET_EXPRESS_CHECKOUT, $paypalRequest)
-+            ->willReturn($paypalResponse);
-+
-+        $paypalRequestDetails = [
-+            'TOKEN' => $token,
-+        ];
-+
-+        $paypalRequestDetailsResponse = include __DIR__ . '/../../../_files/paypal_set_payer_id_repsonse.php';
-+
-+        $this->nvpMock
-+            ->expects($this->at(1))
-+            ->method('call')
-+            ->with(Nvp::GET_EXPRESS_CHECKOUT_DETAILS, $paypalRequestDetails)
-+            ->willReturn($paypalRequestDetailsResponse);
-+
-+        $paypalRequestPlaceOrder = include __DIR__ . '/../../../_files/paypal_place_order_request.php';
-+
-+        $this->nvpMock
-+            ->expects($this->at(2))
-+            ->method('call')
-+            ->with(Nvp::DO_EXPRESS_CHECKOUT_PAYMENT, $paypalRequestPlaceOrder)
-+            ->willReturn(
-+                [
-+                    'RESULT' => '0',
-+                    'PNREF' => 'B7PPAC033FF2',
-+                    'RESPMSG' => 'Approved',
-+                    'AVSADDR' => 'Y',
-+                    'AVSZIP' => 'Y',
-+                    'TOKEN' => $token,
-+                    'PAYERID' => $payerId,
-+                    'PPREF' => '7RK43642T8939154L',
-+                    'CORRELATIONID' => $correlationId,
-+                    'PAYMENTTYPE' => 'instant',
-+                    'PENDINGREASON' => 'authorization',
-+                ]
-+            );
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $responseData = $this->json->unserialize($response->getContent());
-+
-+        $this->assertArrayHasKey('data', $responseData);
-+        $this->assertArrayHasKey('createPaypalExpressToken', $responseData['data']);
-+        $createTokenData = $responseData['data']['createPaypalExpressToken'];
-+        $this->assertArrayNotHasKey('errors', $responseData);
-+        $this->assertEquals($paypalResponse['TOKEN'], $createTokenData['token']);
-+        $this->assertArrayHasKey('paypal_urls', $createTokenData);
-+
-+        $this->assertTrue(
-+            isset($responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code'])
-+        );
-+        $this->assertEquals(
-+            $paymentMethod,
-+            $responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
-+        );
-+
-+        $this->assertTrue(
-+            isset($responseData['data']['placeOrder']['order']['order_id'])
-+        );
-+        $this->assertEquals(
-+            'test_quote',
-+            $responseData['data']['placeOrder']['order']['order_id']
-+        );
-+    }
-+
-+    /**
-+     * Paypal method codes provider
-+     *
-+     * @return array
-+     */
-+    public function getPaypalCodesProvider(): array
-+    {
-+        return [
-+            ['paypal_express'],
-+            ['payflow_express'],
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressTokenTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressTokenTest.php
-new file mode 100644
-index 00000000000..f91ffd4089d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressTokenTest.php
-@@ -0,0 +1,201 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver\Guest;
-+
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Paypal\Model\Api\Nvp;
-+use Magento\PaypalGraphQl\PaypalExpressAbstractTest;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
-+
-+/**
-+ * Test createPaypalExpressToken graphql endpoint for guest
-+ *
-+ * @magentoAppArea graphql
-+ */
-+class PaypalExpressTokenTest extends PaypalExpressAbstractTest
-+{
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $json;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteId
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->json = $this->objectManager->get(SerializerInterface::class);
-+        $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-+    }
-+
-+    /**
-+     * Test create paypal token for guest
-+     *
-+     * @param string $paymentMethod
-+     * @return void
-+     * @dataProvider getPaypalCodesProvider
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testResolve($paymentMethod): void
-+    {
-+        $this->enablePaymentMethod($paymentMethod);
-+        if ($paymentMethod === 'payflow_express') {
-+            $this->enablePaymentMethod('payflow_link');
-+        }
-+        $reservedQuoteId = 'test_quote';
-+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
-+
-+        $cartId = $this->quoteIdToMaskedId->execute((int)$cart->getId());
-+        $query = $this->getCreateTokenMutation($cartId, $paymentMethod);
-+
-+        $paypalRequest = include __DIR__ . '/../../../_files/guest_paypal_create_token_request.php';
-+        if ($paymentMethod == 'payflow_express') {
-+            $paypalRequest['SOLUTIONTYPE'] = null;
-+        }
-+        $paypalResponse = [
-+            'TOKEN' => 'EC-TOKEN1234',
-+            'CORRELATIONID' => 'c123456789',
-+            'ACK' => 'Success'
-+        ];
-+
-+        $this->nvpMock
-+            ->expects($this->once())
-+            ->method('call')
-+            ->with(Nvp::SET_EXPRESS_CHECKOUT, $paypalRequest)
-+            ->willReturn($paypalResponse);
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $responseData = $this->json->unserialize($response->getContent());
-+        $createTokenData = $responseData['data']['createPaypalExpressToken'];
-+
-+        $this->assertArrayNotHasKey('errors', $responseData);
-+        $this->assertEquals($paypalResponse['TOKEN'], $createTokenData['token']);
-+        $this->assertArrayHasKey('paypal_urls', $createTokenData);
-+    }
-+
-+    /**
-+     * Test create paypal token for guest
-+     *
-+     * @param string $paymentMethod
-+     * @return void
-+     * @dataProvider getPaypalCodesProvider
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testResolveWithPaypalError($paymentMethod): void
-+    {
-+        $this->enablePaymentMethod($paymentMethod);
-+        if ($paymentMethod === 'payflow_express') {
-+            $this->enablePaymentMethod('payflow_link');
-+        }
-+        $reservedQuoteId = 'test_quote';
-+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
-+
-+        $cartId = $this->quoteIdToMaskedId->execute((int)$cart->getId());
-+        $query = $this->getCreateTokenMutation($cartId, $paymentMethod);
-+
-+        $paypalRequest = include __DIR__ . '/../../../_files/guest_paypal_create_token_request.php';
-+        if ($paymentMethod == 'payflow_express') {
-+            $paypalRequest['SOLUTIONTYPE'] = null;
-+        }
-+        $expectedExceptionMessage = "PayPal gateway has rejected request. Sample PayPal Error.";
-+        $expectedException = new LocalizedException(__($expectedExceptionMessage));
-+
-+        $this->nvpMock
-+            ->expects($this->once())
-+            ->method('call')
-+            ->with(Nvp::SET_EXPRESS_CHECKOUT, $paypalRequest)
-+            ->willThrowException($expectedException);
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $responseData = $this->json->unserialize($response->getContent());
-+        $this->assertArrayHasKey('createPaypalExpressToken', $responseData['data']);
-+        $this->assertEmpty($responseData['data']['createPaypalExpressToken']);
-+        $this->assertArrayHasKey('errors', $responseData);
-+        $actualError = $responseData['errors'][0];
-+        $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
-+    }
-+
-+    /**
-+     * Test redirect Urls are validated
-+     *
-+     * @return void
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     */
-+    public function testResolveWithInvalidRedirectUrl(): void
-+    {
-+        $paymentMethod = 'paypal_express';
-+        $this->enablePaymentMethod($paymentMethod);
-+        $reservedQuoteId = 'test_quote';
-+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
-+
-+        $cartId = $this->quoteIdToMaskedId->execute((int)$cart->getId());
-+        $query = <<<QUERY
-+mutation {
-+    createPaypalExpressToken(input: {
-+        cart_id: "{$cartId}",
-+        code: "{$paymentMethod}",
-+        urls: {
-+            return_url: "http://mangeto.test/paypal/express/return/",
-+            cancel_url: "http://mangeto.test/paypal/express/cancel/"
-+            success_url: "not/a/url",
-+            pending_url: "http://mangeto.test/checkout/onepage/pending/"
-+        }
-+    })
-+    {
-+        __typename
-+        token
-+        paypal_urls{
-+            start
-+            edit
-+        }
-+    }
-+}
-+QUERY;
-+
-+        $expectedExceptionMessage = "Invalid URL 'not/a/url'.";
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $responseData = $this->json->unserialize($response->getContent());
-+        $this->assertArrayHasKey('errors', $responseData);
-+        $actualError = $responseData['errors'][0];
-+        $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
-+    }
-+
-+    /**
-+     * Paypal method codes provider
-+     *
-+     * @return array
-+     */
-+    public function getPaypalCodesProvider(): array
-+    {
-+        return [
-+            ['paypal_express'],
-+            ['payflow_express'],
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProSetPaymentMethodTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProSetPaymentMethodTest.php
-new file mode 100644
-index 00000000000..8121facaf0f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProSetPaymentMethodTest.php
-@@ -0,0 +1,214 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver\Guest;
-+
-+use Magento\PaypalGraphQl\PaypalPayflowProAbstractTest;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
-+use Magento\Framework\UrlInterface;
-+use Magento\Framework\DataObject;
-+
-+/**
-+ * Test ExpressSetPaymentMethodTest graphql endpoint for guest
-+ *
-+ * @magentoAppArea graphql
-+ */
-+class PaypalPayflowProSetPaymentMethodTest extends PaypalPayflowProAbstractTest
-+{
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $json;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteId
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->json = $this->objectManager->get(SerializerInterface::class);
-+        $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-+    }
-+
-+    /**
-+     * Test end to end test to process a paypal payflow pro order
-+     *
-+     * @return void
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testResolveGuest(): void
-+    {
-+        $paymentMethod = 'payflowpro';
-+        $this->enablePaymentMethod($paymentMethod);
-+
-+        $reservedQuoteId = 'test_quote';
-+
-+        $payload = 'BILLTOCITY=CityM&AMT=0.00&BILLTOSTREET=Green+str,+67&VISACARDLEVEL=12&SHIPTOCITY=CityM'
-+            . '&NAMETOSHIP=John+Smith&ZIP=75477&BILLTOLASTNAME=Smith&BILLTOFIRSTNAME=John'
-+            . '&RESPMSG=Verified&PROCCVV2=M&STATETOSHIP=AL&NAME=John+Smith&BILLTOZIP=75477&CVV2MATCH=Y'
-+            . '&PNREF=B70CCC236815&ZIPTOSHIP=75477&SHIPTOCOUNTRY=US&SHIPTOSTREET=Green+str,+67&CITY=CityM'
-+            . '&HOSTCODE=A&LASTNAME=Smith&STATE=AL&SECURETOKEN=MYSECURETOKEN&CITYTOSHIP=CityM&COUNTRYTOSHIP=US'
-+            . '&AVSDATA=YNY&ACCT=1111&AUTHCODE=111PNI&FIRSTNAME=John&RESULT=0&IAVS=N&POSTFPSMSG=No+Rules+Triggered&'
-+            . 'BILLTOSTATE=AL&BILLTOCOUNTRY=US&EXPDATE=0222&CARDTYPE=0&PREFPSMSG=No+Rules+Triggered&SHIPTOZIP=75477&'
-+            . 'PROCAVS=A&COUNTRY=US&AVSZIP=N&ADDRESS=Green+str,+67&BILLTONAME=John+Smith&'
-+            . 'ADDRESSTOSHIP=Green+str,+67&'
-+            . 'AVSADDR=Y&SECURETOKENID=MYSECURETOKENID&SHIPTOSTATE=AL&TRANSTIME=2019-06-24+07%3A53%3A10';
-+
-+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
-+        $cartId = $this->quoteIdToMaskedId->execute((int)$cart->getId());
-+
-+        $url = $this->objectManager->get(UrlInterface::class);
-+        $baseUrl = $url->getBaseUrl();
-+
-+        $query = <<<QUERY
-+mutation {
-+    setPaymentMethodOnCart(input: {
-+        payment_method: {
-+          code: "{$paymentMethod}",
-+          additional_data: {
-+            payflowpro: {
-+              cc_details: {
-+                 cc_exp_month: 12,
-+                 cc_exp_year: 2030,
-+                 cc_last_4: 1111,
-+                 cc_type: "IV",
-+              }
-+            }
-+          }
-+        },
-+        cart_id: "{$cartId}"})
-+      {
-+        cart {
-+          selected_payment_method {
-+            code
-+          }
-+        }
-+      }
-+      createPayflowProToken(
-+        input: {
-+          cart_id:"{$cartId}",
-+          urls: {
-+            cancel_url: "{$baseUrl}paypal/transparent/cancel/"
-+            error_url: "{$baseUrl}paypal/transparent/error/"
-+            return_url: "{$baseUrl}paypal/transparent/response/"
-+          }
-+        }
-+      ) {
-+          response_message
-+          result
-+          result_code
-+          secure_token
-+          secure_token_id
-+        }
-+      handlePayflowProResponse(input: {
-+          paypal_payload: "$payload",
-+          cart_id: "{$cartId}"
-+        })
-+      {
-+        cart {
-+          selected_payment_method {
-+            code
-+          }
-+        }
-+      }
-+      placeOrder(input: {cart_id: "{$cartId}"}) {
-+        order {
-+          order_id
-+        }
-+      }
-+}
-+QUERY;
-+
-+        $paypalResponse = new DataObject(
-+            [
-+                'result' => '0',
-+                'securetoken' => 'mysecuretoken',
-+                'securetokenid' => 'mysecuretokenid',
-+                'respmsg' => 'Approved',
-+                'result_code' => '0',
-+            ]
-+        );
-+
-+        $this->gatewayMock
-+            ->expects($this->at(0))
-+            ->method('postRequest')
-+            ->willReturn($paypalResponse);
-+
-+        $this->gatewayMock
-+            ->expects($this->at(1))
-+            ->method('postRequest')
-+            ->willReturn(
-+                new DataObject(
-+                    [
-+                        'result' => '0',
-+                        'pnref' => 'A70AAC2378BA',
-+                        'respmsg' => 'Approved',
-+                        'authcode' => '647PNI',
-+                        'avsaddr' => 'Y',
-+                        'avszip' => 'N',
-+                        'hostcode' => 'A',
-+                        'procavs' => 'A',
-+                        'visacardlevel' => '12',
-+                        'transtime' => '2019-06-24 10:12:03',
-+                        'firstname' => 'Cristian',
-+                        'lastname' => 'Partica',
-+                        'amt' => '14.99',
-+                        'acct' => '1111',
-+                        'expdate' => '0221',
-+                        'cardtype' => '0',
-+                        'iavs' => 'N',
-+                        'result_code' => '0',
-+                    ]
-+                )
-+            );
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $responseData = $this->json->unserialize($response->getContent());
-+
-+        $this->assertArrayHasKey('data', $responseData);
-+        $this->assertArrayHasKey('createPayflowProToken', $responseData['data']);
-+        $createTokenData = $responseData['data']['createPayflowProToken'];
-+        $this->assertArrayNotHasKey('errors', $responseData);
-+        $this->assertEquals($paypalResponse->getData('securetoken'), $createTokenData['secure_token']);
-+        $this->assertEquals($paypalResponse->getData('securetokenid'), $createTokenData['secure_token_id']);
-+
-+        $this->assertTrue(
-+            isset($responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code'])
-+        );
-+        $this->assertEquals(
-+            $paymentMethod,
-+            $responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
-+        );
-+
-+        $this->assertTrue(
-+            isset($responseData['data']['handlePayflowProResponse']['cart']['selected_payment_method']['code'])
-+        );
-+        $this->assertEquals(
-+            $paymentMethod,
-+            $responseData['data']['handlePayflowProResponse']['cart']['selected_payment_method']['code']
-+        );
-+
-+        $this->assertTrue(
-+            isset($responseData['data']['placeOrder']['order']['order_id'])
-+        );
-+        $this->assertEquals(
-+            'test_quote',
-+            $responseData['data']['placeOrder']['order']['order_id']
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProTokenExceptionTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProTokenExceptionTest.php
-new file mode 100644
-index 00000000000..b5de225b7ab
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProTokenExceptionTest.php
-@@ -0,0 +1,78 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver\Guest;
-+
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\PaypalGraphQl\PaypalPayflowProAbstractTest;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
-+
-+/**
-+ * Test PaypalPayflowProTokenExceptionTest graphql endpoint for guest
-+ *
-+ * @magentoAppArea graphql
-+ */
-+class PaypalPayflowProTokenExceptionTest extends PaypalPayflowProAbstractTest
-+{
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $json;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteId
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->json = $this->objectManager->get(SerializerInterface::class);
-+        $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-+    }
-+
-+    /**
-+     * Test create paypal token for guest
-+     *
-+     * @return void
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testResolveWithPaypalError(): void
-+    {
-+        $this->enablePaymentMethod('payflowpro');
-+
-+        $reservedQuoteId = 'test_quote';
-+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
-+
-+        $cartId = $this->quoteIdToMaskedId->execute((int)$cart->getId());
-+        $query = $this->getCreatePayflowTokenMutation($cartId);
-+
-+        $expectedExceptionMessage = "Payment Gateway is unreachable at the moment. Please use another payment option.";
-+        $expectedException = new \Zend_Http_Client_Exception($expectedExceptionMessage);
-+
-+        $this->gatewayMock
-+            ->method('postRequest')
-+            ->willThrowException($expectedException);
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $responseData = $this->json->unserialize($response->getContent());
-+        $this->assertArrayHasKey('createPayflowProToken', $responseData['data']);
-+        $this->assertEmpty($responseData['data']['createPayflowProToken']);
-+        $this->assertArrayHasKey('errors', $responseData);
-+        $actualError = $responseData['errors'][0];
-+        $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProTokenTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProTokenTest.php
-new file mode 100644
-index 00000000000..8bbb0dff2d6
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProTokenTest.php
-@@ -0,0 +1,134 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver\Guest;
-+
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\PaypalGraphQl\PaypalPayflowProAbstractTest;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
-+use Magento\Framework\DataObject;
-+
-+/**
-+ * Test PaypalPayflowProTokenTest graphql endpoint for guest
-+ *
-+ * @magentoAppArea graphql
-+ */
-+class PaypalPayflowProTokenTest extends PaypalPayflowProAbstractTest
-+{
-+    /**
-+     * @var SerializerInterface
-+     */
-+    private $json;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteId
-+     */
-+    private $quoteIdToMaskedId;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->json = $this->objectManager->get(SerializerInterface::class);
-+        $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-+    }
-+
-+    /**
-+     * Test create paypal token for guest
-+     *
-+     * @return void
-+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     */
-+    public function testResolve(): void
-+    {
-+        $this->enablePaymentMethod('payflowpro');
-+        $reservedQuoteId = 'test_quote';
-+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
-+
-+        $cartId = $this->quoteIdToMaskedId->execute((int)$cart->getId());
-+        $query = $this->getCreatePayflowTokenMutation($cartId);
-+
-+        $paypalResponse = new DataObject(
-+            [
-+                'result' => '0',
-+                'securetoken' => 'mysecuretoken',
-+                'securetokenid' => 'mysecuretokenid',
-+                'respmsg' => 'Approved',
-+                'result_code' => '0',
-+            ]
-+        );
-+
-+        $this->gatewayMock
-+            ->method('postRequest')
-+            ->willReturn($paypalResponse);
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $responseData = $this->json->unserialize($response->getContent());
-+        $this->assertArrayHasKey('data', $responseData);
-+        $this->assertArrayHasKey('createPayflowProToken', $responseData['data']);
-+        $createTokenData = $responseData['data']['createPayflowProToken'];
-+
-+        $this->assertArrayNotHasKey('errors', $responseData);
-+        $this->assertEquals($paypalResponse->getData('securetoken'), $createTokenData['secure_token']);
-+        $this->assertEquals($paypalResponse->getData('securetokenid'), $createTokenData['secure_token_id']);
-+        $this->assertEquals($paypalResponse->getData('result'), $createTokenData['result']);
-+        $this->assertEquals($paypalResponse->getData('result_code'), $createTokenData['result_code']);
-+        $this->assertEquals($paypalResponse->getData('respmsg'), $createTokenData['response_message']);
-+    }
-+
-+    /**
-+     * Test redirect Urls are validated
-+     *
-+     * @return void
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     */
-+    public function testResolveWithInvalidRedirectUrl(): void
-+    {
-+        $this->enablePaymentMethod('payflowpro');
-+        $reservedQuoteId = 'test_quote';
-+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
-+
-+        $cartId = $this->quoteIdToMaskedId->execute((int)$cart->getId());
-+        $query = <<<QUERY
-+mutation {
-+  createPayflowProToken(
-+    input: {
-+      cart_id:"{$cartId}",
-+      urls: {
-+        cancel_url: "http://domain/paypal/transparent/cancel/"
-+        error_url: "not/a/url"
-+        return_url: "http://domain/paypal/transparent/response/"
-+      }
-+    }
-+  ) {
-+    response_message
-+    result
-+    result_code
-+    secure_token
-+    secure_token_id
-+  }
-+}
-+QUERY;
-+
-+        $expectedExceptionMessage = "Invalid URL 'not/a/url'.";
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $responseData = $this->json->unserialize($response->getContent());
-+        $this->assertArrayHasKey('errors', $responseData);
-+        $actualError = $responseData['errors'][0];
-+        $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php
-new file mode 100644
-index 00000000000..789d4b34c8c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php
-@@ -0,0 +1,282 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver\Guest;
-+
-+use Magento\Framework\App\ProductMetadataInterface;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\GraphQl\Service\GraphQlRequest;
-+use Magento\Paypal\Model\Payflow\Request;
-+use Magento\Paypal\Model\Payflow\RequestFactory;
-+use Magento\Paypal\Model\Payflow\Service\Gateway;
-+use Magento\Paypal\Model\Payflowlink;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * End to end place order test using payflow_link via graphql endpoint for guest
-+ *
-+ * @magentoAppArea graphql
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class PlaceOrderWithPayflowLinkTest extends TestCase
-+{
-+    /** @var GraphQlRequest */
-+    private $graphQlRequest;
-+
-+    /** @var SerializerInterface */
-+    private $json;
-+
-+    /** @var GetMaskedQuoteIdByReservedOrderId */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /** @var ObjectManager */
-+    private $objectManager;
-+
-+    /** @var Gateway|MockObject */
-+    private $gateway;
-+
-+    /** @var Request|MockObject */
-+    private $payflowRequest;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
-+        $this->json = $this->objectManager->get(SerializerInterface::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $this->objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->gateway = $this->getMockBuilder(Gateway::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['postRequest'])
-+            ->getMock();
-+
-+        $requestFactory = $this->getMockBuilder(RequestFactory::class)
-+            ->setMethods(['create'])
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->payflowRequest = $this->getMockBuilder(Request::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['__call','setData'])
-+            ->getMock();
-+        $this->payflowRequest->method('__call')
-+            ->willReturnCallback(
-+                function ($method) {
-+                    if (strpos($method, 'set') === 0) {
-+                        return $this->payflowRequest;
-+                    }
-+                    return null;
-+                }
-+            );
-+
-+        $requestFactory->expects($this->any())->method('create')->willReturn($this->payflowRequest);
-+        $this->objectManager->addSharedInstance($this->gateway, Gateway::class);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function tearDown()
-+    {
-+        $this->objectManager->removeSharedInstance(Gateway::class);
-+    }
-+
-+    /**
-+     * Test successful place Order with Payflow link
-+     *
-+     * @magentoConfigFixture default_store payment/payflow_link/active 1
-+     * @magentoConfigFixture default_store payment/payflow_link/sandbox_flag 1
-+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @return void
-+     */
-+    public function testResolvePlaceOrderWithPayflowLink(): void
-+    {
-+        $paymentMethod = 'payflow_link';
-+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query
-+            = <<<QUERY
-+ mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$cartId"
-+      payment_method: {
-+          code: "$paymentMethod"
-+          additional_data: {
-+            payflow_link: 
-+            {
-+           cancel_url:"http://mage.test/paypal/payflow/cancel"
-+           return_url:"http://mage.test/paypal/payflow/return"
-+           error_url:"http://mage.test/paypal/payflow/error"
-+          }
-+        }
-+      }
-+  }) {    
-+       cart {
-+          selected_payment_method {
-+          code
-+      }
-+    }
-+  }
-+    placeOrder(input: {cart_id: "$cartId"}) {
-+      order {
-+        order_id
-+      }
-+    }
-+}
-+QUERY;
-+
-+        $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-+        $button = 'Magento_Cart_' . $productMetadata->getEdition();
-+
-+        $payflowLinkResponse = new DataObject(
-+            [
-+            'result' => '0',
-+            'respmsg' => 'Approved',
-+            'pnref' => 'V19A3D27B61E',
-+            'result_code' => '0'
-+            ]
-+        );
-+        $this->gateway->expects($this->once())
-+            ->method('postRequest')
-+            ->willReturn($payflowLinkResponse);
-+
-+        $this->payflowRequest
-+            ->method('setData')
-+            ->willReturnMap(
-+                [
-+                    [
-+                        'user' => null,
-+                        'vendor' => null,
-+                        'partner' => null,
-+                        'pwd' => null,
-+                        'verbosity' => null,
-+                        'BUTTONSOURCE' => $button,
-+                        'tender' => 'C',
-+                    ],
-+                    $this->returnSelf()
-+                ],
-+                ['USER1', 1, $this->returnSelf()],
-+                ['USER2', 'USER2SilentPostHash', $this->returnSelf()]
-+            );
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $responseData = $this->json->unserialize($response->getContent());
-+
-+        $this->assertArrayNotHasKey('errors', $responseData);
-+        $this->assertArrayHasKey('data', $responseData);
-+        $this->assertEquals(
-+            $paymentMethod,
-+            $responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
-+        );
-+        $this->assertTrue(
-+            isset($responseData['data']['placeOrder']['order']['order_id'])
-+        );
-+        $this->assertEquals(
-+            'test_quote',
-+            $responseData['data']['placeOrder']['order']['order_id']
-+        );
-+    }
-+
-+    /**
-+     * Test place Order with Payflow link with a declined status
-+     *
-+     * @magentoConfigFixture default_store payment/payflow_link/active 1
-+     * @magentoConfigFixture default_store payment/payflow_link/sandbox_flag 1
-+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @return void
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function testResolveWithPayflowLinkDeclined(): void
-+    {
-+        $paymentMethod = 'payflow_link';
-+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query
-+            = <<<QUERY
-+ mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$cartId"
-+      payment_method: {
-+          code: "$paymentMethod"
-+          additional_data: {
-+            payflow_link: 
-+            {
-+           cancel_url:"http://mage.test/paypal/payflow/cancelPayment"
-+           return_url:"http://mage.test/paypal/payflow/returnUrl"
-+           error_url:"http://mage.test/paypal/payflow/returnUrl"
-+          }
-+        }
-+      }
-+  }) {    
-+       cart {
-+          selected_payment_method {
-+          code
-+      }
-+    }
-+  }
-+    placeOrder(input: {cart_id: "$cartId"}) {
-+      order {
-+        order_id
-+      }
-+    }
-+}
-+QUERY;
-+
-+        $resultCode = Payflowlink::RESPONSE_CODE_DECLINED_BY_FILTER;
-+        $exception = new \Zend_Http_Client_Exception(__('Declined response message from PayPal gateway'));
-+        //Exception message is transformed into more controlled message
-+        $expectedExceptionMessage =
-+            "Unable to place order: Payment Gateway is unreachable at the moment. Please use another payment option.";
-+
-+        $this->payflowRequest->method('setData')
-+            ->with(
-+                [
-+                    [
-+                        'invnum' => 'test_quote',
-+                        'amt' => '30.00',
-+                        'pnref' => 'TEST123PNREF',
-+                        'USER2' => '1EncryptedSilentPostHash',
-+                        'result' => $resultCode,
-+                        'trxtype' => 'A',
-+
-+                    ]
-+                ]
-+            )
-+            ->willReturnSelf();
-+
-+        $this->gateway->method('postRequest')->willThrowException($exception);
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $responseData = $this->json->unserialize($response->getContent());
-+        $this->assertArrayHasKey('errors', $responseData);
-+        $actualError = $responseData['errors'][0];
-+        $this->assertEquals(
-+            $expectedExceptionMessage,
-+            $actualError['message']
-+        );
-+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/SetPaymentMethodAsPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/SetPaymentMethodAsPayflowLinkTest.php
-new file mode 100644
-index 00000000000..91e5b06e56e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/SetPaymentMethodAsPayflowLinkTest.php
-@@ -0,0 +1,177 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl\Model\Resolver\Guest;
-+
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-+use Magento\GraphQl\Service\GraphQlRequest;
-+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
-+use Magento\Quote\Model\QuoteRepository;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Test SetPayment method for payflow_link and validate the additional information
-+ *
-+ * @magentoAppArea graphql
-+ */
-+class SetPaymentMethodAsPayflowLinkTest extends TestCase
-+{
-+    /** @var GraphQlRequest */
-+    private $graphQlRequest;
-+
-+    /** @var SerializerInterface */
-+    private $json;
-+
-+    /** @var GetMaskedQuoteIdByReservedOrderId */
-+    private $getMaskedQuoteIdByReservedOrderId;
-+
-+    /** @var ObjectManager */
-+    private $objectManager;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->json = $this->objectManager->get(SerializerInterface::class);
-+        $this->getMaskedQuoteIdByReservedOrderId = $this->objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-+        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
-+    }
-+
-+    /**
-+     * Test SetPayment method for payflow_link and validate that the additional information is set on the quote
-+     *
-+     * @magentoConfigFixture default_store payment/payflow_link/active 1
-+     * @magentoConfigFixture default_store payment/payflow_link/sandbox_flag 1
-+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @return void
-+     */
-+    public function testSetPayflowLinkAsPaymentMethod(): void
-+    {
-+        $paymentMethod = 'payflow_link';
-+        $maskedCartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query
-+            = <<<QUERY
-+ mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$maskedCartId"
-+      payment_method: {
-+          code: "$paymentMethod"
-+          additional_data: {
-+            payflow_link: {           
-+               return_url:"http://magento.com/paypal/payflow/link/success"
-+               cancel_url:"http://magento.com/paypal/payflow/link/cancel"
-+               error_url:"http://magento.com/paypal/payflow/link/error"
-+            }
-+          }
-+      }
-+  }) {    
-+       cart {
-+          selected_payment_method {
-+          code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $responseData = $this->json->unserialize($response->getContent());
-+
-+        $this->assertArrayNotHasKey('errors', $responseData);
-+        $this->assertArrayHasKey('data', $responseData);
-+        $this->assertEquals(
-+            $paymentMethod,
-+            $responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
-+        );
-+
-+        $maskedQuoteIdToQuoteId = $this->objectManager->get(MaskedQuoteIdToQuoteIdInterface::class);
-+        $quoteId = $maskedQuoteIdToQuoteId->execute($maskedCartId);
-+        /** @var QuoteRepository $quoteRepository */
-+        $quoteRepository = $this->objectManager->get(QuoteRepository::class);
-+        $quote = $quoteRepository->get($quoteId);
-+
-+        $payment = $quote->getPayment();
-+        $this->assertEquals(
-+            "http://magento.com/paypal/payflow/link/cancel",
-+            $payment->getAdditionalInformation('cancel_url')
-+        );
-+        $this->assertEquals(
-+            "http://magento.com/paypal/payflow/link/success",
-+            $payment->getAdditionalInformation('return_url')
-+        );
-+        $this->assertEquals(
-+            "http://magento.com/paypal/payflow/link/error",
-+            $payment->getAdditionalInformation('error_url')
-+        );
-+    }
-+
-+    /**
-+     * Test invalid redirect url
-+     *
-+     * @magentoConfigFixture default_store payment/payflow_link/active 1
-+     * @magentoConfigFixture default_store payment/payflow_link/sandbox_flag 1
-+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
-+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
-+     * @return void
-+     */
-+    public function testInvalidUrl(): void
-+    {
-+        $paymentMethod = 'payflow_link';
-+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-+
-+        $query
-+            = <<<QUERY
-+ mutation {
-+  setPaymentMethodOnCart(input: {
-+      cart_id: "$cartId"
-+      payment_method: {
-+          code: "$paymentMethod"
-+          additional_data: {
-+            payflow_link: {           
-+               return_url:"http://magento.com/paypal/payflow/link/sucess"
-+               cancel_url:"http://magento.com/paypal/payflow/link/cancel"
-+               error_url:"/not/a/validUrl"
-+            }
-+        }
-+      }
-+  }) {    
-+       cart {
-+          selected_payment_method {
-+          code
-+      }
-+    }
-+  }
-+}
-+QUERY;
-+
-+        $response = $this->graphQlRequest->send($query);
-+        $responseData = $this->json->unserialize($response->getContent());
-+
-+        $this->assertArrayHasKey('errors', $responseData);
-+        $expectedExceptionMessage = "Invalid URL '/not/a/validUrl'.";
-+        $actualError = $responseData['errors'][0];
-+        $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/PaypalExpressAbstractTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/PaypalExpressAbstractTest.php
-new file mode 100644
-index 00000000000..936bbcf6503
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/PaypalExpressAbstractTest.php
-@@ -0,0 +1,211 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl;
-+
-+use Magento\Customer\Helper\Address;
-+use Magento\Directory\Model\CountryFactory;
-+use Magento\Directory\Model\RegionFactory;
-+use Magento\Framework\Exception\LocalizedExceptionFactory;
-+use Magento\Framework\HTTP\Adapter\CurlFactory;
-+use Magento\Framework\Locale\ResolverInterface;
-+use Magento\GraphQl\Controller\GraphQl;
-+use Magento\GraphQl\Service\GraphQlRequest;
-+use Magento\Payment\Model\Method\Logger;
-+use Magento\Paypal\Model\Api\Nvp;
-+use Magento\Paypal\Model\Api\PayflowNvp;
-+use Magento\Paypal\Model\Api\AbstractApi;
-+use Magento\Paypal\Model\Api\ProcessableExceptionFactory;
-+use Magento\Quote\Model\Quote;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Paypal\Model\Api\Type\Factory as ApiFactory;
-+use Psr\Log\LoggerInterface;
-+use Magento\Config\Model\Config;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\UrlInterface;
-+
-+/**
-+ * Abstract class with common logic for Paypal GraphQl tests
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+abstract class PaypalExpressAbstractTest extends TestCase
-+{
-+    /**
-+     * @var AbstractApi|MockObject
-+     */
-+    protected $nvpMock;
-+
-+    /**
-+     * @var ObjectManager
-+     */
-+    protected $objectManager;
-+
-+    /**
-+     * @var GraphQl
-+     */
-+    protected $graphqlController;
-+
-+    /**
-+     * @var GraphQlRequest
-+     */
-+    protected $graphQlRequest;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+
-+        $apiFactoryMock = $this->getMockBuilder(ApiFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMock();
-+        $apiFactoryMock->method('create')
-+            ->willReturnMap(
-+                [
-+                    [Nvp::class, [], $this->getNvpMock(Nvp::class)],
-+                    [PayflowNvp::class, [], $this->getNvpMock(PayflowNvp::class)]
-+                ]
-+            );
-+
-+        $this->objectManager->addSharedInstance($apiFactoryMock, ApiFactory::class);
-+
-+        $this->graphqlController = $this->objectManager->get(GraphQl::class);
-+
-+        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
-+    }
-+
-+    protected function tearDown()
-+    {
-+        $this->disablePaypalPaymentMethods();
-+        $this->objectManager->removeSharedInstance(ApiFactory::class);
-+    }
-+
-+    /**
-+     * Get quote by reserved order id
-+     *
-+     * @param $reservedOrderId
-+     * @return Quote
-+     */
-+    protected function getQuoteByReservedOrderId($reservedOrderId): Quote
-+    {
-+        $quoteFactory = $this->objectManager->get(QuoteFactory::class);
-+        /** @var Quote $quote */
-+        $quote = $quoteFactory->create();
-+
-+        $quote->load($reservedOrderId, 'reserved_order_id');
-+        return $quote;
-+    }
-+
-+    /**
-+     * Enables Paypal payment method by payment code
-+     *
-+     * @return void
-+     */
-+    protected function enablePaymentMethod($methodCode): void
-+    {
-+        $config = $this->objectManager->get(Config::class);
-+        $config->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
-+
-+        $paymentMethodActive = 'payment/' . $methodCode . '/active';
-+
-+        $config->setDataByPath($paymentMethodActive, '1');
-+        $config->save();
-+    }
-+
-+    /**
-+     * Disables list of Paypal payment methods
-+     *
-+     * @return void
-+     */
-+    protected function disablePaypalPaymentMethods(): void
-+    {
-+        $paypalMethods = [
-+            'paypal_express',
-+            'payflow_express',
-+            'payflow_link'
-+        ];
-+        $config = $this->objectManager->get(Config::class);
-+        $config->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
-+
-+        foreach ($paypalMethods as $method) {
-+            $paymentMethodActive = 'payment/' . $method . '/active';
-+            $config->setDataByPath($paymentMethodActive, '0');
-+            $config->save();
-+        }
-+    }
-+
-+    /**
-+     * Get mock of Nvp class
-+     *
-+     * @param string $nvpClass
-+     * @return AbstractApi|MockObject
-+     */
-+    private function getNvpMock(string $nvpClass)
-+    {
-+        if (empty($this->nvpMock)) {
-+            $this->nvpMock = $this->getMockBuilder($nvpClass)
-+                ->setConstructorArgs(
-+                    [
-+                        'customerAddress' => $this->objectManager->get(Address::class),
-+                        'logger' => $this->objectManager->get(LoggerInterface::class),
-+                        'customerLogger' => $this->objectManager->get(Logger::class),
-+                        'resolverInterface' => $this->objectManager->get(ResolverInterface::class),
-+                        'regionFactory' => $this->objectManager->get(RegionFactory::class),
-+                        'countryFactory' => $this->objectManager->get(CountryFactory::class),
-+                        'processableExceptionFactory' => $this->objectManager->get(ProcessableExceptionFactory::class),
-+                        'frameworkExceptionFactory' => $this->objectManager->get(LocalizedExceptionFactory::class),
-+                        'curlFactory' => $this->objectManager->get(CurlFactory::class),
-+                        'data' => []
-+                    ]
-+                )
-+                ->setMethods(['call'])
-+                ->getMock();
-+        }
-+        return $this->nvpMock;
-+    }
-+
-+    /**
-+     * Get GraphQl query for creating Paypal token
-+     *
-+     * @param string $cartId
-+     * @param string $paymentMethod
-+     * @return string
-+     */
-+    protected function getCreateTokenMutation(string $cartId, string $paymentMethod): string
-+    {
-+        $url = $this->objectManager->get(UrlInterface::class);
-+        $baseUrl = $url->getBaseUrl();
-+
-+        return <<<QUERY
-+mutation {
-+    createPaypalExpressToken(input: {
-+        cart_id: "{$cartId}",
-+        code: "{$paymentMethod}",
-+        urls: {
-+            return_url: "{$baseUrl}paypal/express/return/",
-+            cancel_url: "{$baseUrl}paypal/express/cancel/"
-+            success_url: "{$baseUrl}checkout/onepage/success/",
-+            pending_url: "{$baseUrl}checkout/onepage/pending/"
-+        }
-+        express_button: true
-+    })
-+    {
-+        __typename
-+        token
-+        paypal_urls{
-+            start
-+            edit
-+        }
-+    }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/PaypalPayflowProAbstractTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/PaypalPayflowProAbstractTest.php
-new file mode 100644
-index 00000000000..e5a94c1f103
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/PaypalPayflowProAbstractTest.php
-@@ -0,0 +1,170 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\PaypalGraphQl;
-+
-+use Magento\GraphQl\Controller\GraphQl;
-+use Magento\GraphQl\Service\GraphQlRequest;
-+use Magento\Paypal\Model\Payflow\Service\Gateway;
-+use Magento\Quote\Model\Quote;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Config\Model\Config;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\UrlInterface;
-+
-+use Magento\Payment\Model\Method\Online\GatewayInterface;
-+
-+/**
-+ * Abstract class with common logic for Paypal GraphQl tests
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+abstract class PaypalPayflowProAbstractTest extends TestCase
-+{
-+    /**
-+     * @var GatewayInterface|MockObject
-+     */
-+    protected $gatewayMock;
-+
-+    /**
-+     * @var ObjectManager
-+     */
-+    protected $objectManager;
-+
-+    /**
-+     * @var GraphQl
-+     */
-+    protected $graphqlController;
-+
-+    /**
-+     * @var GraphQlRequest
-+     */
-+    protected $graphQlRequest;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+
-+        $this->objectManager->addSharedInstance($this->getGatewayMock(), Gateway::class);
-+
-+        $this->graphqlController = $this->objectManager->get(GraphQl::class);
-+
-+        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
-+    }
-+
-+    protected function tearDown()
-+    {
-+        $this->disablePaypalPaymentMethods();
-+        $this->objectManager->removeSharedInstance(Gateway::class);
-+    }
-+
-+    /**
-+     * Get quote by reserved order id
-+     *
-+     * @param $reservedOrderId
-+     * @return Quote
-+     */
-+    protected function getQuoteByReservedOrderId($reservedOrderId): Quote
-+    {
-+        $quoteFactory = $this->objectManager->get(QuoteFactory::class);
-+        /** @var Quote $quote */
-+        $quote = $quoteFactory->create();
-+
-+        $quote->load($reservedOrderId, 'reserved_order_id');
-+        return $quote;
-+    }
-+
-+    /**
-+     * Enables Paypal payment method by payment code
-+     *
-+     * @return void
-+     */
-+    protected function enablePaymentMethod($methodCode): void
-+    {
-+        $config = $this->objectManager->get(Config::class);
-+        $config->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
-+
-+        $paymentMethodActive = 'payment/' . $methodCode . '/active';
-+
-+        $config->setDataByPath($paymentMethodActive, '1');
-+        $config->save();
-+    }
-+
-+    /**
-+     * Disables list of Paypal payment methods
-+     *
-+     * @return void
-+     */
-+    protected function disablePaypalPaymentMethods(): void
-+    {
-+        $paypalMethods = [
-+            'payflowpro',
-+        ];
-+        $config = $this->objectManager->get(Config::class);
-+        $config->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
-+
-+        foreach ($paypalMethods as $method) {
-+            $paymentMethodActive = 'payment/' . $method . '/active';
-+            $config->setDataByPath($paymentMethodActive, '0');
-+            $config->save();
-+        }
-+    }
-+
-+    /**
-+     * Get mock of Gateway class
-+     *
-+     * @return GatewayInterface|MockObject
-+     */
-+    private function getGatewayMock()
-+    {
-+        if (empty($this->gatewayMock)) {
-+            $this->gatewayMock = $this->getMockBuilder(Gateway::class)
-+                ->disableOriginalConstructor()
-+                ->setMethods(['postRequest'])
-+                ->getMock();
-+        }
-+        return $this->gatewayMock;
-+    }
-+
-+    /**
-+     * Get GraphQl query for creating Paypal token
-+     *
-+     * @param string $cartId
-+     * @param string $paymentMethod
-+     * @return string
-+     */
-+    protected function getCreatePayflowTokenMutation(string $cartId): string
-+    {
-+        $url = $this->objectManager->get(UrlInterface::class);
-+        $baseUrl = $url->getBaseUrl();
-+
-+        return <<<QUERY
-+mutation {
-+  createPayflowProToken(
-+    input: {
-+      cart_id:"{$cartId}",
-+      urls: {
-+        cancel_url: "{$baseUrl}paypal/transparent/cancel/"
-+        error_url: "{$baseUrl}paypal/transparent/error/"
-+        return_url: "{$baseUrl}paypal/transparent/response/"
-+      }
-+    }
-+  ) {
-+    response_message
-+    result
-+    result_code
-+    secure_token
-+    secure_token_id
-+  }
-+}
-+QUERY;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/add_simple_product_payflowLink.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/add_simple_product_payflowLink.php
-new file mode 100644
-index 00000000000..7fc598e8717
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/add_simple_product_payflowLink.php
-@@ -0,0 +1,31 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+include __DIR__ . '/../../GraphQl/Catalog/_files/simple_product.php';
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\QuoteFactory;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-+/** @var QuoteFactory $quoteFactory */
-+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
-+/** @var QuoteResource $quoteResource */
-+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
-+/** @var CartRepositoryInterface $cartRepository */
-+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-+
-+$product = $productRepository->get('simple_product');
-+
-+$quote = $quoteFactory->create();
-+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-+$quote->addProduct($product, 2);
-+$cartRepository->save($quote);
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/customer_paypal_create_token_request.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/customer_paypal_create_token_request.php
-new file mode 100644
-index 00000000000..342074daec1
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/customer_paypal_create_token_request.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\UrlInterface;
-+use Magento\TestFramework\ObjectManager;
-+
-+$url = ObjectManager::getInstance()->get(UrlInterface::class);
-+$baseUrl = $url->getBaseUrl();
-+
-+return [
-+        'PAYMENTACTION' => 'Authorization',
-+        'AMT' => '30.00',
-+        'CURRENCYCODE' => 'USD',
-+        'RETURNURL' => $baseUrl . 'paypal/express/return/',
-+        'CANCELURL' => $baseUrl . 'paypal/express/cancel/',
-+        'INVNUM' => 'test_quote',
-+        'SOLUTIONTYPE' => 'Mark',
-+        'GIROPAYCANCELURL' => $baseUrl . 'paypal/express/cancel/',
-+        'GIROPAYSUCCESSURL' => $baseUrl . 'checkout/onepage/success/',
-+        'BANKTXNPENDINGURL' => $baseUrl . 'checkout/onepage/pending/',
-+        'SHIPPINGAMT' => '10.00',
-+        'ITEMAMT' => '20.00',
-+        'TAXAMT' => '0.00',
-+        'L_NUMBER0' => null,
-+        'L_NAME0' => 'Simple Product',
-+        'L_QTY0' => 2,
-+        'L_AMT0' => '10.00',
-+        'BUSINESS' => 'CompanyName',
-+        'NOTETEXT' => null,
-+        'EMAIL' => 'customer@example.com',
-+        'FIRSTNAME' => 'John',
-+        'LASTNAME' => 'Smith',
-+        'MIDDLENAME' => null,
-+        'SALUTATION' => null,
-+        'SUFFIX' => null,
-+        'COUNTRYCODE' => 'US',
-+        'STATE' => 'AL',
-+        'CITY' => 'CityM',
-+        'STREET' => 'Green str, 67',
-+        'ZIP' => '75477',
-+        'PHONENUM' => '3468676',
-+        'SHIPTOCOUNTRYCODE' => 'US',
-+        'SHIPTOSTATE' => 'AL',
-+        'SHIPTOCITY' => 'CityM',
-+        'SHIPTOSTREET' => 'Green str, 67',
-+        'SHIPTOZIP' => '75477',
-+        'SHIPTOPHONENUM' => '3468676',
-+        'SHIPTOSTREET2' => '',
-+        'STREET2' => '',
-+        'SHIPTONAME' => 'John Smith',
-+        'ADDROVERRIDE' => 1
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/guest_paypal_create_token_request.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/guest_paypal_create_token_request.php
-new file mode 100644
-index 00000000000..37bb11e3f07
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/guest_paypal_create_token_request.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\UrlInterface;
-+use Magento\TestFramework\ObjectManager;
-+
-+$url = ObjectManager::getInstance()->get(UrlInterface::class);
-+$baseUrl = $url->getBaseUrl();
-+
-+return [
-+        'PAYMENTACTION' => 'Authorization',
-+        'AMT' => '30.00',
-+        'CURRENCYCODE' => 'USD',
-+        'RETURNURL' => $baseUrl . 'paypal/express/return/',
-+        'CANCELURL' => $baseUrl . 'paypal/express/cancel/',
-+        'INVNUM' => 'test_quote',
-+        'SOLUTIONTYPE' => 'Mark',
-+        'GIROPAYCANCELURL' => $baseUrl . 'paypal/express/cancel/',
-+        'GIROPAYSUCCESSURL' => $baseUrl . 'checkout/onepage/success/',
-+        'BANKTXNPENDINGURL' => $baseUrl . 'checkout/onepage/pending/',
-+        'SHIPPINGAMT' => '10.00',
-+        'ITEMAMT' => '20.00',
-+        'TAXAMT' => '0.00',
-+        'L_NUMBER0' => null,
-+        'L_NAME0' => 'Simple Product',
-+        'L_QTY0' => 2,
-+        'L_AMT0' => '10.00',
-+        'BUSINESS' => 'CompanyName',
-+        'NOTETEXT' => null,
-+        'EMAIL' => 'guest@example.com',
-+        'FIRSTNAME' => 'John',
-+        'LASTNAME' => 'Smith',
-+        'MIDDLENAME' => null,
-+        'SALUTATION' => null,
-+        'SUFFIX' => null,
-+        'COUNTRYCODE' => 'US',
-+        'STATE' => 'AL',
-+        'CITY' => 'CityM',
-+        'STREET' => 'Green str, 67',
-+        'ZIP' => '75477',
-+        'PHONENUM' => '3468676',
-+        'SHIPTOCOUNTRYCODE' => 'US',
-+        'SHIPTOSTATE' => 'AL',
-+        'SHIPTOCITY' => 'CityM',
-+        'SHIPTOSTREET' => 'Green str, 67',
-+        'SHIPTOZIP' => '75477',
-+        'SHIPTOPHONENUM' => '3468676',
-+        'SHIPTOSTREET2' => '',
-+        'STREET2' => '',
-+        'SHIPTONAME' => 'John Smith',
-+        'ADDROVERRIDE' => 1
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_place_order_request.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_place_order_request.php
-new file mode 100644
-index 00000000000..e74409485c7
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_place_order_request.php
-@@ -0,0 +1,57 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\ProductMetadataInterface;
-+use Magento\Framework\UrlInterface;
-+use Magento\TestFramework\ObjectManager;
-+
-+$url = ObjectManager::getInstance()->get(UrlInterface::class);
-+$baseUrl = $url->getBaseUrl();
-+
-+$productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-+$button = 'Magento_Cart_' . $productMetadata->getEdition();
-+
-+return [
-+    'TOKEN' => $token,
-+    'PAYERID' => $payerId,
-+    'PAYMENTACTION' => 'Authorization',
-+    'AMT' => '30.00',
-+    'CURRENCYCODE' => 'USD',
-+    'BUTTONSOURCE' => $button,
-+    'NOTIFYURL' => $baseUrl . 'paypal/ipn/',
-+    'RETURNFMFDETAILS' => 1,
-+    'SHIPPINGAMT' => '10.00',
-+    'ITEMAMT' => '20.00',
-+    'TAXAMT' => '0.00',
-+    'L_NUMBER0' => null,
-+    'L_NAME0' => 'Simple Product',
-+    'L_QTY0' => 2,
-+    'L_AMT0' => '10.00',
-+    'BUSINESS' => 'CompanyName',
-+    'EMAIL' => 'guest@example.com',
-+    'FIRSTNAME' => 'John',
-+    'LASTNAME' => 'Smith',
-+    'MIDDLENAME' => null,
-+    'SALUTATION' => null,
-+    'SUFFIX' => null,
-+    'COUNTRYCODE' => 'US',
-+    'STATE' => 'AL',
-+    'CITY' => 'CityM',
-+    'STREET' => 'Green str, 67',
-+    'ZIP' => '75477',
-+    'PHONENUM' => '3468676',
-+    'SHIPTOCOUNTRYCODE' => 'US',
-+    'SHIPTOSTATE' => 'AL',
-+    'SHIPTOCITY' => 'CityM',
-+    'SHIPTOSTREET' => 'Green str, 67',
-+    'SHIPTOZIP' => '75477',
-+    'SHIPTOPHONENUM' => '3468676',
-+    'SHIPTOSTREET2' => '',
-+    'STREET2' => '',
-+    'SHIPTONAME' => 'John Smith',
-+    'ADDROVERRIDE' => 1,
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_set_payer_id_repsonse.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_set_payer_id_repsonse.php
-new file mode 100644
-index 00000000000..a3fa6e55334
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_set_payer_id_repsonse.php
-@@ -0,0 +1,35 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+return [
-+    'RESULT' => '0',
-+    'RESPMSG' => 'Approved',
-+    'AVSADDR' => 'Y',
-+    'AVSZIP' => 'Y',
-+    'TOKEN' => $token,
-+    'PAYERID' => $payerId,
-+    'CORRELATIONID' => $correlationId,
-+    'EMAIL' => 'guest@example.com',
-+    'PAYERSTATUS' => 'verified',
-+    'INVNUM' => 'test_quote',
-+    'FIRSTNAME' => 'John',
-+    'LASTNAME' => 'Smith',
-+    'SHIPTOBUSINESS' => 'Magento',
-+    'SHIPTOSTREET' => 'Green str, 67',
-+    'SHIPTOCITY' => 'CityM',
-+    'SHIPTOSTATE' => 'AL',
-+    'SHIPTOZIP' => '75477',
-+    'SHIPTOCOUNTRY' => 'US',
-+    'SHIPTOPHONENUM' => '3468676',
-+    'SHIPTONAME' => 'John Smith',
-+    'STREET' => 'Green str, 67',
-+    'CITY' => 'CityM',
-+    'STATE' => 'TX',
-+    'ZIP' => '75477',
-+    'COUNTRYCODE' => 'US',
-+    'ADDRESSSTATUS' => 'Y',
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php b/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
-index fba5354b691..2e447e7854a 100644
---- a/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
-@@ -56,8 +56,8 @@ class AdditionalTest extends \PHPUnit\Framework\TestCase
-         $this->_customerSession->loginById(1);
-         $translation = __('Not you?');
- 
--        $this->assertStringMatchesFormat(
--            '%A<span>%A<a%Ahref="' . $this->_block->getHref() . '"%A>' . $translation . '</a>%A</span>%A',
-+        $this->assertContains(
-+            '<a href="' . $this->_block->getHref() . '">' . $translation . '</a>',
-             $this->_block->toHtml()
-         );
-         $this->_customerSession->logout();
-diff --git a/dev/tests/integration/testsuite/Magento/Persistent/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Persistent/Model/ObserverTest.php
-index ecf2cd77a13..d0c253fc7a6 100644
---- a/dev/tests/integration/testsuite/Magento/Persistent/Model/ObserverTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Persistent/Model/ObserverTest.php
-@@ -9,7 +9,6 @@ namespace Magento\Persistent\Model;
- use Magento\Customer\Model\Context;
- 
- /**
-- * @magentoDataFixture Magento/Persistent/_files/persistent.php
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class ObserverTest extends \PHPUnit\Framework\TestCase
-@@ -29,11 +28,6 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $customerRepository;
- 
--    /**
--     * @var \Magento\Persistent\Helper\Session
--     */
--    protected $_persistentSessionHelper;
--
-     /**
-      * @var \Magento\Framework\ObjectManagerInterface
-      */
-@@ -44,11 +38,6 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $_observer;
- 
--    /**
--     * @var \Magento\Customer\Model\Session
--     */
--    protected $_customerSession;
--
-     /**
-      * @var \Magento\Checkout\Model\Session | \PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -58,8 +47,6 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- 
--        $this->_customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
--
-         $this->_customerViewHelper = $this->_objectManager->create(
-             \Magento\Customer\Helper\View::class
-         );
-@@ -75,8 +62,6 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-             \Magento\Checkout\Model\Session::class
-         )->disableOriginalConstructor()->setMethods([])->getMock();
- 
--        $this->_persistentSessionHelper = $this->_objectManager->create(\Magento\Persistent\Helper\Session::class);
--
-         $this->_observer = $this->_objectManager->create(
-             \Magento\Persistent\Model\Observer::class,
-             [
-@@ -89,16 +74,11 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @magentoConfigFixture current_store persistent/options/enabled 1
--     * @magentoConfigFixture current_store persistent/options/remember_enabled 1
--     * @magentoConfigFixture current_store persistent/options/remember_default 1
-      * @magentoAppArea frontend
-      * @magentoAppIsolation enabled
-      */
-     public function testEmulateWelcomeBlock()
-     {
--        $this->_customerSession->loginById(1);
--
-         $httpContext = new \Magento\Framework\App\Http\Context();
-         $httpContext->setValue(Context::CONTEXT_AUTH, 1, 1);
-         $block = $this->_objectManager->create(
-@@ -108,15 +88,7 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
-             ]
-         );
-         $this->_observer->emulateWelcomeBlock($block);
--        $customerName = $this->_escaper->escapeHtml(
--            $this->_customerViewHelper->getCustomerName(
--                $this->customerRepository->getById(
--                    $this->_persistentSessionHelper->getSession()->getCustomerId()
--                )
--            )
--        );
--        $translation = __('Welcome, %1!', $customerName)->__toString();
--        $this->assertStringMatchesFormat('%A' . $translation . '%A', $block->getWelcome()->__toString());
--        $this->_customerSession->logout();
-+
-+        $this->assertEquals('&nbsp;', $block->getWelcome());
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_sec_website.php b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_sec_website.php
-new file mode 100644
-index 00000000000..e0dfba50fcd
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_sec_website.php
-@@ -0,0 +1,63 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Model\Quote;
-+use Magento\Quote\Model\Quote\Address;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+
-+/**
-+ * @var CustomerInterface $customer
-+ * @var StoreInterface $store
-+ * @var ProductInterface $product
-+ */
-+require __DIR__ . '/../../Customer/Fixtures/customer_sec_website.php';
-+require __DIR__ . '/simple_product.php';
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+$addressData = include __DIR__ . '/../../Customer/Fixtures/address_data.php';
-+/** @var Address $shippingAddress */
-+$shippingAddress = $objectManager->create(Address::class, ['data' => $addressData[0]]);
-+$shippingAddress->setAddressType('shipping');
-+
-+$billingAddress = clone $shippingAddress;
-+$billingAddress->setId(null)
-+    ->setAddressType('billing');
-+
-+/** @var Quote $quote */
-+$quote = $objectManager->create(
-+    Quote::class,
-+    [
-+        'data' => [
-+            'customer_id' => $customer->getId(),
-+            'store_id' => $store->getId(),
-+            'reserved_order_id' => '0000032134',
-+            'is_active' => true,
-+            'is_multishipping' => false
-+        ]
-+    ]
-+);
-+$quote->setShippingAddress($shippingAddress)
-+    ->setBillingAddress($billingAddress)
-+    ->addProduct($product);
-+
-+$quote->getPayment()
-+    ->setMethod('checkmo');
-+$quote->getShippingAddress()
-+    ->setShippingMethod('flatrate_flatrate')
-+    ->setCollectShippingRates(true);
-+$quote->collectTotals();
-+
-+/** @var CartRepositoryInterface $repository */
-+$repository = $objectManager->get(CartRepositoryInterface::class);
-+$repository->save($quote);
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_sec_website_rollback.php b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_sec_website_rollback.php
-new file mode 100644
-index 00000000000..2244a1f22b1
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_sec_website_rollback.php
-@@ -0,0 +1,38 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Registry;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var Registry $registry */
-+$registry = $objectManager->get(Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var CartRepositoryInterface $quoteRepository */
-+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
-+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
-+$searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', '0000032134')
-+    ->create();
-+$items = $quoteRepository->getList($searchCriteria)
-+    ->getItems();
-+foreach ($items as $item) {
-+    $quoteRepository->delete($item);
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-+
-+require __DIR__ . '/simple_product_rollback.php';
-+require __DIR__ . '/../../Customer/Fixtures/customer_sec_website_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_without_customer_email.php b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_without_customer_email.php
-new file mode 100644
-index 00000000000..49fd11593c7
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_without_customer_email.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+
-+require __DIR__ . '/../../Sales/_files/quote_with_customer.php';
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+$quote->getPayment()
-+    ->setMethod('checkmo');
-+$quote->getShippingAddress()
-+    ->setShippingMethod('flatrate_flatrate')
-+    ->setCollectShippingRates(true);
-+$quote->collectTotals();
-+
-+$quote->setCustomerEmail('');
-+
-+/** @var CartRepositoryInterface $repository */
-+$repository = $objectManager->get(CartRepositoryInterface::class);
-+$repository->save($quote);
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Fixtures/simple_product.php b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/simple_product.php
-new file mode 100644
-index 00000000000..49cb0501fe2
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/simple_product.php
-@@ -0,0 +1,39 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\Catalog\Model\Product\Visibility;
-+use Magento\CatalogInventory\Api\Data\StockItemInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var Product $product */
-+$product = $objectManager->create(Product::class);
-+$product->setTypeId('simple')
-+    ->setAttributeSetId(4)
-+    ->setName('Simple Product')
-+    ->setSku('simple002')
-+    ->setPrice(10)
-+    ->setQty(100)
-+    ->setVisibility(Visibility::VISIBILITY_BOTH)
-+    ->setStatus(Status::STATUS_ENABLED);
-+
-+/** @var StockItemInterface $stockItem */
-+$stockItem = $objectManager->create(StockItemInterface::class);
-+$stockItem->setQty(100)
-+    ->setIsInStock(true);
-+$extensionAttributes = $product->getExtensionAttributes();
-+$extensionAttributes->setStockItem($stockItem);
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+$product = $productRepository->save($product);
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Fixtures/simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/simple_product_rollback.php
-new file mode 100644
-index 00000000000..331615020ed
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/simple_product_rollback.php
-@@ -0,0 +1,35 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Registry;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+
-+/** @var ObjectManager $objectManager */
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var Registry $registry */
-+$registry = $objectManager->get(Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
-+$searchCriteria = $searchCriteriaBuilder->addFilter('sku', 'simple002')
-+    ->create();
-+$items = $productRepository->getList($searchCriteria)
-+    ->getItems();
-+foreach ($items as $product) {
-+    $productRepository->delete($product);
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/MaskedQuoteIdToQuoteIdTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/MaskedQuoteIdToQuoteIdTest.php
-new file mode 100644
-index 00000000000..8d4a2ab4899
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/MaskedQuoteIdToQuoteIdTest.php
-@@ -0,0 +1,46 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model;
-+
-+use Magento\TestFramework\Helper\Bootstrap as BootstrapHelper;
-+use Magento\Quote\Api\GuestCartManagementInterface;
-+
-+class MaskedQuoteIdToQuoteIdTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var MaskedQuoteIdToQuoteIdInterface
-+     */
-+    private $maskedQuoteIdToQuoteId;
-+
-+    /**
-+     * @var GuestCartManagementInterface
-+     */
-+    private $guestCartManagement;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = BootstrapHelper::getObjectManager();
-+        $this->maskedQuoteIdToQuoteId = $objectManager->create(MaskedQuoteIdToQuoteIdInterface::class);
-+        $this->guestCartManagement = $objectManager->create(GuestCartManagementInterface::class);
-+    }
-+
-+    public function testMaskedIdToQuoteId()
-+    {
-+        $maskedQuoteId = $this->guestCartManagement->createEmptyCart();
-+        $quoteId = $this->maskedQuoteIdToQuoteId->execute($maskedQuoteId);
-+
-+        self::assertGreaterThan(0, $quoteId);
-+    }
-+
-+    public function testMaskedQuoteIdToQuoteIdForNonExistentQuote()
-+    {
-+        self::expectException(\Magento\Framework\Exception\NoSuchEntityException::class);
-+
-+        $this->maskedQuoteIdToQuoteId->execute('test');
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php
-index 62e417d27c5..545638bcb0c 100644
---- a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php
-@@ -25,6 +25,15 @@ class AddressTest extends \Magento\TestFramework\Indexer\TestCase
-     /**@var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
-     protected $customerRepository;
- 
-+    /** @var \Magento\Customer\Api\AddressRepositoryInterface $addressRepository */
-+    protected $addressRepository;
-+
-+    /** @var \Magento\Framework\Reflection\DataObjectProcessor */
-+    protected $dataProcessor;
-+
-+    /**
-+     * phpcs:ignoreFile
-+     */
-     public static function setUpBeforeClass()
-     {
-         $db = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getBootstrap()
-@@ -61,6 +70,14 @@ class AddressTest extends \Magento\TestFramework\Indexer\TestCase
-         $this->_address->setId(1);
-         $this->_address->load($this->_address->getId());
-         $this->_address->setQuote($this->_quote);
-+
-+        $this->addressRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+            \Magento\Customer\Api\AddressRepositoryInterface::class
-+        );
-+
-+        $this->dataProcessor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+            \Magento\Framework\Reflection\DataObjectProcessor::class
-+        );
-     }
- 
-     protected function tearDown()
-@@ -322,4 +339,23 @@ class AddressTest extends \Magento\TestFramework\Indexer\TestCase
-             [[123, true], [123, true]]
-         ];
-     }
-+
-+    public function testSaveShippingAddressWithEmptyRegionId()
-+    {
-+        $customerAddress = $this->addressRepository->getById(1);
-+        $customerAddress->setRegionId(0);
-+
-+        $address = $this->dataProcessor->buildOutputDataArray(
-+            $customerAddress,
-+            \Magento\Customer\Api\Data\AddressInterface::class
-+        );
-+
-+        $shippingAddress = $this->_quote->getShippingAddress();
-+        $shippingAddress->addData($address);
-+
-+        $shippingAddress->save();
-+
-+        $this->assertEquals(0, $shippingAddress->getRegionId());
-+        $this->assertEquals(0, $shippingAddress->getRegion());
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/UpdaterTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/UpdaterTest.php
-new file mode 100644
-index 00000000000..a375b3c665f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/UpdaterTest.php
-@@ -0,0 +1,63 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model\Quote\Item;
-+
-+use Magento\Quote\Api\CartItemRepositoryInterface;
-+use Magento\Quote\Api\Data\CartItemInterface;
-+use Magento\Quote\Model\Quote;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Tests \Magento\Quote\Model\Quote\Item\Updater
-+ */
-+class UpdaterTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var Updater
-+     */
-+    private $updater;
-+
-+    /**
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->updater = $this->objectManager->create(Updater::class);
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Sales/_files/quote_with_custom_price.php
-+     * @return void
-+     */
-+    public function testUpdate(): void
-+    {
-+        /** @var CartItemRepositoryInterface $quoteItemRepository */
-+        $quoteItemRepository = $this->objectManager->create(CartItemRepositoryInterface::class);
-+        /** @var Quote $quote */
-+        $quote = $this->objectManager->create(Quote::class);
-+        $quoteId = $quote->load('test01', 'reserved_order_id')->getId();
-+        /** @var CartItemInterface[] $quoteItems */
-+        $quoteItems = $quoteItemRepository->getList($quoteId);
-+        /** @var CartItemInterface $actualQuoteItem */
-+        $actualQuoteItem = array_pop($quoteItems);
-+        $this->assertInstanceOf(CartItemInterface::class, $actualQuoteItem);
-+
-+        $this->updater->update($actualQuoteItem, ['qty' => 1]);
-+
-+        $this->assertNull(
-+            $actualQuoteItem->getCustomPrice(),
-+            'Item custom price has to be null'
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteIdToMaskedQuoteIdTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteIdToMaskedQuoteIdTest.php
-new file mode 100644
-index 00000000000..9301b76104d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteIdToMaskedQuoteIdTest.php
-@@ -0,0 +1,57 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model;
-+
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\TestFramework\Helper\Bootstrap as BootstrapHelper;
-+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-+
-+class QuoteIdToMaskedQuoteIdTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var QuoteResource
-+     */
-+    private $quoteResource;
-+
-+    /**
-+     * @var QuoteFactory
-+     */
-+    private $quoteFactory;
-+
-+    /**
-+     * @var QuoteIdToMaskedQuoteIdInterface
-+     */
-+    private $quoteIdToMaskedQuoteId;
-+
-+    protected function setUp()
-+    {
-+        $objectManager = BootstrapHelper::getObjectManager();
-+        $this->quoteIdToMaskedQuoteId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
-+        $this->quoteFactory = $objectManager->create(QuoteFactory::class);
-+        $this->quoteResource = $objectManager->create(QuoteResource::class);
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Sales/_files/quote.php
-+     */
-+    public function testMaskedQuoteId()
-+    {
-+        $quote = $this->quoteFactory->create();
-+        $this->quoteResource->load($quote, 'test01', 'reserved_order_id');
-+        $maskedQuoteId = $this->quoteIdToMaskedQuoteId->execute((int) $quote->getId());
-+
-+        self::assertNotEmpty($maskedQuoteId);
-+    }
-+
-+    public function testMaskedQuoteIdWithNonExistentQuoteId()
-+    {
-+        self::expectException(NoSuchEntityException::class);
-+
-+        $this->quoteIdToMaskedQuoteId->execute(0);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
-index 0b0071beb51..dc784aa55ef 100644
---- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
-@@ -3,10 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Quote\Model;
- 
-+use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Catalog\Model\Product\Type;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Quote\Api\CartManagementInterface;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Sales\Api\OrderManagementInterface;
-+use Magento\Sales\Api\OrderRepositoryInterface;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\ExpectationFailedException;
- 
- /**
-  * Class for testing QuoteManagement model
-@@ -14,79 +24,147 @@ use Magento\TestFramework\Helper\Bootstrap;
- class QuoteManagementTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * Create order with product that has child items
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var CartManagementInterface
-+     */
-+    private $cartManagement;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+
-+        $this->cartManagement = $this->objectManager->create(CartManagementInterface::class);
-+    }
-+
-+    /**
-+     * Creates order with product that has child items.
-      *
-      * @magentoAppIsolation enabled
-      * @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php
-      */
-     public function testSubmit()
-     {
--        /**
--         * Preconditions:
--         * Load quote with Bundle product that has at least two child products
--         */
--        $objectManager = Bootstrap::getObjectManager();
--        /** @var \Magento\Quote\Model\Quote $quote */
--        $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
--        $quote->load('test01', 'reserved_order_id');
--
--        /** Execute SUT */
--        /** @var \Magento\Quote\Api\CartManagementInterface $model */
--        $cartManagement = $objectManager->create(\Magento\Quote\Api\CartManagementInterface::class);
--        /** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */
--        $orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
--        $orderId = $cartManagement->placeOrder($quote->getId());
-+        $quote = $this->getQuote('test01');
-+        $orderId = $this->cartManagement->placeOrder($quote->getId());
-+
-+        /** @var OrderRepositoryInterface $orderRepository */
-+        $orderRepository = $this->objectManager->create(OrderRepositoryInterface::class);
-         $order = $orderRepository->get($orderId);
- 
--        /** Check if SUT caused expected effects */
-         $orderItems = $order->getItems();
--        $this->assertCount(3, $orderItems);
-+        self::assertCount(3, $orderItems);
-         foreach ($orderItems as $orderItem) {
-             if ($orderItem->getProductType() == Type::TYPE_SIMPLE) {
--                $this->assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product');
--                $this->assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product');
-+                self::assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product');
-+                self::assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product');
-             }
-         }
-     }
- 
-     /**
--     * Create order with product that has child items and one of them was deleted
-+     * Tries to create order with product that has child items and one of them was deleted.
-      *
-      * @magentoAppArea adminhtml
-      * @magentoAppIsolation enabled
-      * @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Some of the products below do not have all the required options.
-      */
-     public function testSubmitWithDeletedItem()
-     {
--        /**
--         * Preconditions:
--         * Load quote with Bundle product that have at least to child products
--         */
--        $objectManager = Bootstrap::getObjectManager();
--        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
--        $productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-         $product = $productRepository->get('simple-2');
-         $productRepository->delete($product);
--        /** @var \Magento\Quote\Model\Quote $quote */
--        $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
--        $quote->load('test01', 'reserved_order_id');
--
--        /** Execute SUT */
--        /** @var \Magento\Quote\Api\CartManagementInterface $model */
--        $cartManagement = $objectManager->create(\Magento\Quote\Api\CartManagementInterface::class);
--        /** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */
--        $orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
--        $orderId = $cartManagement->placeOrder($quote->getId());
--        $order = $orderRepository->get($orderId);
-+        $quote = $this->getQuote('test01');
- 
--        /** Check if SUT caused expected effects */
--        $orderItems = $order->getItems();
--        $this->assertCount(2, $orderItems);
--        foreach ($orderItems as $orderItem) {
--            if ($orderItem->getProductType() == Type::TYPE_SIMPLE) {
--                $this->assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product');
--                $this->assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product');
--            }
-+        $this->cartManagement->placeOrder($quote->getId());
-+    }
-+
-+    /**
-+     * Tries to create order with item of stock during checkout.
-+     *
-+     * @magentoDataFixture Magento/Sales/_files/quote.php
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Some of the products are out of stock.
-+     * @magentoDbIsolation enabled
-+     */
-+    public function testSubmitWithItemOutOfStock()
-+    {
-+        $this->makeProductOutOfStock('simple');
-+        $quote = $this->getQuote('test01');
-+        $this->cartManagement->placeOrder($quote->getId());
-+    }
-+
-+    /**
-+     * Tries to create an order using quote with empty customer email.
-+     *
-+     * Order should not start placing if order validation is failed.
-+     *
-+     * @magentoDataFixture Magento/Quote/Fixtures/quote_without_customer_email.php
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Email has a wrong format
-+     */
-+    public function testSubmitWithEmptyCustomerEmail()
-+    {
-+        $quote = $this->getQuote('test01');
-+        $orderManagement = $this->createMock(OrderManagementInterface::class);
-+        $orderManagement->expects($this->never())
-+            ->method('place');
-+        $cartManagement = $this->objectManager->create(
-+            CartManagementInterface::class,
-+            ['orderManagement' => $orderManagement]
-+        );
-+
-+        try {
-+            $cartManagement->placeOrder($quote->getId());
-+        } catch (ExpectationFailedException $e) {
-+            $this->fail('Place order method was not expected to be called if order validation is failed');
-         }
-     }
-+
-+    /**
-+     * Gets quote by reserved order ID.
-+     *
-+     * @param string $reservedOrderId
-+     * @return Quote
-+     */
-+    private function getQuote(string $reservedOrderId): Quote
-+    {
-+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
-+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
-+            ->create();
-+
-+        /** @var CartRepositoryInterface $quoteRepository */
-+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
-+        $items = $quoteRepository->getList($searchCriteria)
-+            ->getItems();
-+
-+        return array_pop($items);
-+    }
-+
-+    /**
-+     * Makes provided product as out of stock.
-+     *
-+     * @param string $sku
-+     * @return void
-+     */
-+    private function makeProductOutOfStock(string $sku)
-+    {
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-+        $product = $productRepository->get($sku);
-+        $extensionAttributes = $product->getExtensionAttributes();
-+        $stockItem = $extensionAttributes->getStockItem();
-+        $stockItem->setIsInStock(false);
-+        $productRepository->save($product);
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
-index 3e093876349..39759191812 100644
---- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
-@@ -20,6 +20,7 @@ use Magento\Quote\Model\Quote\Address as QuoteAddress;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @magentoDbIsolation disabled
-  */
- class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
- {
-@@ -43,6 +44,9 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-      */
-     private $filterBuilder;
- 
-+    /**
-+     * Set up
-+     */
-     protected function setUp()
-     {
-         $this->objectManager = BootstrapHelper::getObjectManager();
-@@ -104,7 +108,6 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @magentoDbIsolation enabled
-      * @magentoAppIsolation enabled
-      */
-     public function testSaveWithNotExistingCustomerAddress()
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
-index 5df185cad7a..be3f647b822 100644
---- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
-@@ -3,11 +3,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Quote\Model;
- 
-+use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Catalog\Model\ProductRepository;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
- use Magento\Customer\Api\Data\CustomerInterfaceFactory;
-+use Magento\Customer\Model\Data\Customer;
- use Magento\Framework\Exception\LocalizedException;
-+use Magento\Quote\Api\Data\AddressInterface;
- use Magento\TestFramework\Helper\Bootstrap;
- use Magento\TestFramework\ObjectManager;
- use Magento\Framework\Api\SearchCriteriaBuilder;
-@@ -54,7 +61,7 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
-         $quote->load('test01', 'reserved_order_id');
- 
-         $productRepository = $this->objectManager->create(
--            \Magento\Catalog\Api\ProductRepositoryInterface::class
-+            ProductRepositoryInterface::class
-         );
-         $product = $productRepository->get('virtual-product', false, null, true);
-         $quote->addProduct($product);
-@@ -66,6 +73,46 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(20, $quote->getBaseGrandTotal());
-     }
- 
-+    /**
-+     * @magentoDataFixture Magento/Catalog/_files/product_virtual.php
-+     * @magentoDataFixture Magento/Quote/_files/empty_quote.php
-+     * @return void
-+     */
-+    public function testGetAddressWithVirtualProduct()
-+    {
-+        /** @var Quote $quote */
-+        $quote = $this->objectManager->create(Quote::class);
-+        $quote->load('reserved_order_id_1', 'reserved_order_id');
-+        $billingAddress = $this->objectManager->create(AddressInterface::class);
-+        $billingAddress->setFirstname('Joe')
-+            ->setLastname('Doe')
-+            ->setCountryId('US')
-+            ->setRegion('TX')
-+            ->setCity('Austin')
-+            ->setStreet('1000 West Parmer Line')
-+            ->setPostcode('11501')
-+            ->setTelephone('123456789');
-+        $quote->setBillingAddress($billingAddress);
-+        $shippingAddress = $this->objectManager->create(AddressInterface::class);
-+        $shippingAddress->setFirstname('Joe')
-+            ->setLastname('Doe')
-+            ->setCountryId('US')
-+            ->setRegion('NJ')
-+            ->setCity('Newark')
-+            ->setStreet('2775  Granville Lane')
-+            ->setPostcode('07102')
-+            ->setTelephone('9734685221');
-+        $quote->setShippingAddress($shippingAddress);
-+        $productRepository = $this->objectManager->create(
-+            ProductRepositoryInterface::class
-+        );
-+        $product = $productRepository->get('virtual-product', false, null, true);
-+        $quote->addProduct($product);
-+        $quote->save();
-+        $expectedAddress = $quote->getBillingAddress();
-+        $this->assertEquals($expectedAddress, $quote->getAllItems()[0]->getAddress());
-+    }
-+
-     /**
-      * @return void
-      */
-@@ -89,10 +136,12 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
- 
-         $this->assertEquals($expected, $this->convertToArray($customer));
-         $quote->setCustomer($customer);
--        //
-         $customer = $quote->getCustomer();
-         $this->assertEquals($expected, $this->convertToArray($customer));
-         $this->assertEquals('qa@example.com', $quote->getCustomerEmail());
-+        $this->assertEquals('Joe', $quote->getCustomerFirstname());
-+        $this->assertEquals('Dou', $quote->getCustomerLastname());
-+        $this->assertEquals('Ivan', $quote->getCustomerMiddlename());
-     }
- 
-     /**
-@@ -322,6 +371,26 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
-         }
-     }
- 
-+    /**
-+     * Customer has address with country which not allowed in website
-+     *
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
-+     * @magentoDataFixture Magento/Backend/_files/allowed_countries_fr.php
-+     * @return void
-+     */
-+    public function testAssignCustomerWithAddressChangeWithNotAllowedCountry()
-+    {
-+        /** @var Quote $quote */
-+        $quote = $this->objectManager->create(Quote::class);
-+        $customerData = $this->_prepareQuoteForTestAssignCustomerWithAddressChange($quote);
-+        $quote->assignCustomerWithAddressChange($customerData);
-+
-+        /** Check that addresses are empty */
-+        $this->assertNull($quote->getBillingAddress()->getCountryId());
-+        $this->assertNull($quote->getShippingAddress()->getCountryId());
-+    }
-+
-     /**
-      * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
-      * @return void
-@@ -335,7 +404,7 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
-         $productStockQty = 100;
- 
-         $productRepository = $this->objectManager->create(
--            \Magento\Catalog\Api\ProductRepositoryInterface::class
-+            ProductRepositoryInterface::class
-         );
-         $product = $productRepository->get('simple-1', false, null, true);
- 
-@@ -357,7 +426,8 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(1, $quote->getItemsQty());
- 
-         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
--        $this->expectExceptionMessage('The requested qty is not available');
-+        // TODO: fix test or implementation as described in https://github.com/magento-engcom/msi/issues/1037
-+//        $this->expectExceptionMessage('The requested qty is not available');
-         $updateParams['qty'] = $productStockQty + 1;
-         $quote->updateItem($updateParams['id'], $updateParams);
-     }
-@@ -368,14 +438,12 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
-      * Customer with two addresses created. First address is default billing, second is default shipping.
-      *
-      * @param Quote $quote
--     * @return \Magento\Customer\Api\Data\CustomerInterface
-+     * @return CustomerInterface
-      */
--    protected function _prepareQuoteForTestAssignCustomerWithAddressChange(
--        Quote $quote
--    ): \Magento\Customer\Api\Data\CustomerInterface {
--        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
-+    protected function _prepareQuoteForTestAssignCustomerWithAddressChange(Quote $quote): CustomerInterface
-+    {
-         $customerRepository = $this->objectManager->create(
--            \Magento\Customer\Api\CustomerRepositoryInterface::class
-+            CustomerRepositoryInterface::class
-         );
-         $fixtureCustomerId = 1;
-         /** @var \Magento\Customer\Model\Customer $customer */
-@@ -421,25 +489,24 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
-     protected function _getCustomerDataArray(): array
-     {
-         return [
--            \Magento\Customer\Model\Data\Customer::CONFIRMATION => 'test',
--            \Magento\Customer\Model\Data\Customer::CREATED_AT => '2/3/2014',
--            \Magento\Customer\Model\Data\Customer::CREATED_IN => 'Default',
--            \Magento\Customer\Model\Data\Customer::DEFAULT_BILLING => 'test',
--            \Magento\Customer\Model\Data\Customer::DEFAULT_SHIPPING => 'test',
--            \Magento\Customer\Model\Data\Customer::DOB => '2014-02-03 00:00:00',
--            \Magento\Customer\Model\Data\Customer::EMAIL => 'qa@example.com',
--            \Magento\Customer\Model\Data\Customer::FIRSTNAME => 'Joe',
--            \Magento\Customer\Model\Data\Customer::GENDER => 0,
--            \Magento\Customer\Model\Data\Customer::GROUP_ID =>
--                \Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID,
--            \Magento\Customer\Model\Data\Customer::ID => 1,
--            \Magento\Customer\Model\Data\Customer::LASTNAME => 'Dou',
--            \Magento\Customer\Model\Data\Customer::MIDDLENAME => 'Ivan',
--            \Magento\Customer\Model\Data\Customer::PREFIX => 'Dr.',
--            \Magento\Customer\Model\Data\Customer::STORE_ID => 1,
--            \Magento\Customer\Model\Data\Customer::SUFFIX => 'Jr.',
--            \Magento\Customer\Model\Data\Customer::TAXVAT => 1,
--            \Magento\Customer\Model\Data\Customer::WEBSITE_ID => 1
-+            Customer::CONFIRMATION => 'test',
-+            Customer::CREATED_AT => '2/3/2014',
-+            Customer::CREATED_IN => 'Default',
-+            Customer::DEFAULT_BILLING => 'test',
-+            Customer::DEFAULT_SHIPPING => 'test',
-+            Customer::DOB => '2014-02-03 00:00:00',
-+            Customer::EMAIL => 'qa@example.com',
-+            Customer::FIRSTNAME => 'Joe',
-+            Customer::GENDER => 0,
-+            Customer::GROUP_ID => \Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID,
-+            Customer::ID => 1,
-+            Customer::LASTNAME => 'Dou',
-+            Customer::MIDDLENAME => 'Ivan',
-+            Customer::PREFIX => 'Dr.',
-+            Customer::STORE_ID => 1,
-+            Customer::SUFFIX => 'Jr.',
-+            Customer::TAXVAT => 1,
-+            Customer::WEBSITE_ID => 1
-         ];
-     }
- 
-@@ -496,7 +563,7 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
- 
-         $quoteItem = $this->objectManager->create(\Magento\Quote\Model\Quote\Item::class);
- 
--        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-         $product = $productRepository->get('simple');
- 
-         $quoteItem->setProduct($product);
-@@ -510,22 +577,78 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Tests of quotes merging.
-      *
-+     * @param int|null $guestItemGiftMessageId
-+     * @param int|null $customerItemGiftMessageId
-+     * @param int|null $guestOrderGiftMessageId
-+     * @param int|null $customerOrderGiftMessageId
-+     * @param int|null $expectedItemGiftMessageId
-+     * @param int|null $expectedOrderGiftMessageId
-+     *
-      * @magentoDataFixture Magento/Sales/_files/quote.php
-+     * @dataProvider giftMessageDataProvider
-+     * @throws LocalizedException
-      * @return void
-      */
--    public function testMerge(): void
--    {
--        $giftMessageId = 1;
-+    public function testMerge(
-+        $guestItemGiftMessageId,
-+        $customerItemGiftMessageId,
-+        $guestOrderGiftMessageId,
-+        $customerOrderGiftMessageId,
-+        $expectedItemGiftMessageId,
-+        $expectedOrderGiftMessageId
-+    ): void {
-+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-+        $product = $productRepository->get('simple', false, null, true);
- 
-         /** @var Quote  $quote */
-         $guestQuote = $this->getQuote('test01');
--        $guestQuote->setGiftMessageId($giftMessageId);
-+        $guestQuote->setGiftMessageId($guestOrderGiftMessageId);
- 
-         /** @var Quote  $customerQuote */
-         $customerQuote = $this->objectManager->create(Quote::class);
-+        $customerQuote->setReservedOrderId('test02')
-+            ->setStoreId($guestQuote->getStoreId())
-+            ->addProduct($product);
-+        $customerQuote->setGiftMessageId($customerOrderGiftMessageId);
-+
-+        $guestItem = $guestQuote->getItemByProduct($product);
-+        $guestItem->setGiftMessageId($guestItemGiftMessageId);
-+
-+        $customerItem = $customerQuote->getItemByProduct($product);
-+        $customerItem->setGiftMessageId($customerItemGiftMessageId);
-+
-         $customerQuote->merge($guestQuote);
-+        $mergedItemItem = $customerQuote->getItemByProduct($product);
-+
-+        self::assertEquals($expectedOrderGiftMessageId, $customerQuote->getGiftMessageId());
-+        self::assertEquals($expectedItemGiftMessageId, $mergedItemItem->getGiftMessageId());
-+    }
- 
--        self::assertEquals($giftMessageId, $customerQuote->getGiftMessageId());
-+    /**
-+     * Provides order- and item-level gift message Id.
-+     *
-+     * @return array
-+     */
-+    public function giftMessageDataProvider(): array
-+    {
-+        return [
-+            [
-+                'guestItemId' => null,
-+                'customerItemId' => 1,
-+                'guestOrderId' => null,
-+                'customerOrderId' => 11,
-+                'expectedItemId' => 1,
-+                'expectedOrderId' => 11
-+            ],
-+            [
-+                'guestItemId' => 1,
-+                'customerItemId' => 2,
-+                'guestOrderId' => 11,
-+                'customerOrderId' => 22,
-+                'expectedItemId' => 1,
-+                'expectedOrderId' => 11
-+            ]
-+        ];
-     }
- 
-     /**
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteValidatorTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteValidatorTest.php
-new file mode 100644
-index 00000000000..34b709509e4
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteValidatorTest.php
-@@ -0,0 +1,224 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Quote\Model;
-+
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Quote\Api\Data\AddressInterface;
-+use Magento\Quote\Model\Quote\Address\Rate;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Class QuoteValidatorTest.
-+ *
-+ * @magentoDbIsolation enabled
-+ */
-+class QuoteValidatorTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var QuoteValidator
-+     */
-+    private $quoteValidator;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setUp()
-+    {
-+        $this->quoteValidator = Bootstrap::getObjectManager()->create(QuoteValidator::class);
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Please check the shipping address information.
-+     */
-+    public function testValidateBeforeSubmitShippingAddressInvalid()
-+    {
-+        $quote = $this->getQuote();
-+        $quote->getShippingAddress()->setPostcode('');
-+
-+        $this->quoteValidator->validateBeforeSubmit($quote);
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Some addresses can't be used due to the configurations for specific countries.
-+     */
-+    public function testValidateBeforeSubmitCountryIsNotAllowed()
-+    {
-+        /** @magentoConfigFixture does not allow to change the value for the website scope */
-+        Bootstrap::getObjectManager()->get(
-+            \Magento\Framework\App\Config\MutableScopeConfigInterface::class
-+        )->setValue(
-+            'general/country/allow',
-+            'US',
-+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-+        );
-+        $quote = $this->getQuote();
-+        $quote->getShippingAddress()->setCountryId('AF');
-+
-+        $this->quoteValidator->validateBeforeSubmit($quote);
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage The shipping method is missing. Select the shipping method and try again.
-+     */
-+    public function testValidateBeforeSubmitShippingMethodInvalid()
-+    {
-+        $quote = $this->getQuote();
-+        $quote->getShippingAddress()->setShippingMethod('NONE');
-+
-+        $this->quoteValidator->validateBeforeSubmit($quote);
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Please check the billing address information.
-+     */
-+    public function testValidateBeforeSubmitBillingAddressInvalid()
-+    {
-+        $quote = $this->getQuote();
-+        $quote->getBillingAddress()->setTelephone('');
-+
-+        $this->quoteValidator->validateBeforeSubmit($quote);
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @expectedExceptionMessage Enter a valid payment method and try again.
-+     */
-+    public function testValidateBeforeSubmitPaymentMethodInvalid()
-+    {
-+        $quote = $this->getQuote();
-+        $quote->getPayment()->setMethod('');
-+
-+        $this->quoteValidator->validateBeforeSubmit($quote);
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\LocalizedException
-+     * @magentoConfigFixture current_store sales/minimum_order/active 1
-+     * @magentoConfigFixture current_store sales/minimum_order/amount 100
-+     */
-+    public function testValidateBeforeSubmitMinimumAmountInvalid()
-+    {
-+        $quote = $this->getQuote();
-+        $quote->getShippingAddress()
-+            ->setBaseSubtotal(0);
-+        $this->quoteValidator->validateBeforeSubmit($quote);
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testValidateBeforeSubmitWithoutMinimumOrderAmount()
-+    {
-+        $this->quoteValidator->validateBeforeSubmit($this->getQuote());
-+    }
-+
-+    /**
-+     * @magentoConfigFixture current_store sales/minimum_order/active 1
-+     * @magentoConfigFixture current_store sales/minimum_order/amount 100
-+     */
-+    public function testValidateBeforeSubmitWithMinimumOrderAmount()
-+    {
-+        $quote = $this->getQuote();
-+        $quote->getShippingAddress()
-+            ->setBaseSubtotal(200);
-+        $this->quoteValidator->validateBeforeSubmit($quote);
-+    }
-+
-+    /**
-+     * Checks a case when the default website has country restrictions and the quote created
-+     * for the another website with different country restrictions.
-+     *
-+     * @magentoDataFixture Magento/Quote/Fixtures/quote_sec_website.php
-+     * @magentoDbIsolation disabled
-+     */
-+    public function testValidateBeforeSubmit()
-+    {
-+        $quote = $this->getQuoteById('0000032134');
-+        $this->quoteValidator->validateBeforeSubmit($quote);
-+    }
-+
-+    /**
-+     * @return Quote
-+     */
-+    private function getQuote(): Quote
-+    {
-+        /** @var Quote $quote */
-+        $quote = Bootstrap::getObjectManager()->create(Quote::class);
-+
-+        /** @var AddressInterface $billingAddress */
-+        $billingAddress = Bootstrap::getObjectManager()->create(AddressInterface::class);
-+        $billingAddress->setFirstname('Joe')
-+            ->setLastname('Doe')
-+            ->setCountryId('US')
-+            ->setRegion('TX')
-+            ->setCity('Austin')
-+            ->setStreet('1000 West Parmer Line')
-+            ->setPostcode('11501')
-+            ->setTelephone('123456789');
-+        $quote->setBillingAddress($billingAddress);
-+
-+        /** @var AddressInterface $shippingAddress */
-+        $shippingAddress = Bootstrap::getObjectManager()->create(AddressInterface::class);
-+        $shippingAddress->setFirstname('Joe')
-+        ->setLastname('Doe')
-+        ->setCountryId('US')
-+        ->setRegion('TX')
-+        ->setCity('Austin')
-+        ->setStreet('1000 West Parmer Line')
-+        ->setPostcode('11501')
-+        ->setTelephone('123456789');
-+        $quote->setShippingAddress($shippingAddress);
-+
-+        $quote->getShippingAddress()
-+            ->setShippingMethod('flatrate_flatrate')
-+            ->setCollectShippingRates(true);
-+        /** @var Rate $shippingRate */
-+        $shippingRate = Bootstrap::getObjectManager()->create(Rate::class);
-+        $shippingRate->setMethod('flatrate')
-+            ->setCarrier('flatrate')
-+            ->setPrice('5')
-+            ->setCarrierTitle('Flat Rate')
-+            ->setCode('flatrate_flatrate');
-+        $quote->getShippingAddress()
-+            ->addShippingRate($shippingRate);
-+
-+        $quote->getPayment()->setMethod('CC');
-+
-+        /** @var QuoteRepository $quoteRepository */
-+        $quoteRepository = Bootstrap::getObjectManager()->create(QuoteRepository::class);
-+        $quoteRepository->save($quote);
-+
-+        return $quote;
-+    }
-+
-+    /**
-+     * Gets quote entity by reserved order id.
-+     *
-+     * @param string $reservedOrderId
-+     * @return Quote
-+     */
-+    private function getQuoteById(string $reservedOrderId): Quote
-+    {
-+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+        $searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
-+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
-+            ->create();
-+
-+        /** @var CartRepositoryInterface $repository */
-+        $repository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-+        $items = $repository->getList($searchCriteria)
-+            ->getItems();
-+
-+        return array_pop($items);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php
-index e2c25e76cea..8db7b65d014 100644
---- a/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php
-@@ -28,6 +28,57 @@ class ShippingMethodManagementTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(0, $customerQuote->getBaseGrandTotal());
-     }
- 
-+    /**
-+     * @magentoConfigFixture current_store carriers/tablerate/active 1
-+     * @magentoConfigFixture current_store carriers/flatrate/active 0
-+     * @magentoConfigFixture current_store carriers/freeshipping/active 0
-+     * @magentoConfigFixture current_store carriers/tablerate/condition_name package_qty
-+     * @magentoDataFixture Magento/SalesRule/_files/cart_rule_free_shipping_by_cart.php
-+     * @magentoDataFixture Magento/Sales/_files/quote.php
-+     * @magentoDataFixture Magento/OfflineShipping/_files/tablerates.php
-+     * @return void
-+     */
-+    public function testTableRateFreeShipping()
-+    {
-+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        /** @var \Magento\Quote\Model\Quote $quote */
-+        $quote = $objectManager->get(\Magento\Quote\Model\Quote::class);
-+        $quote->load('test01', 'reserved_order_id');
-+        $cartId = $quote->getId();
-+        if (!$cartId) {
-+            $this->fail('quote fixture failed');
-+        }
-+        /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
-+        $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+            ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
-+            ->create();
-+        $quoteIdMask->load($cartId, 'quote_id');
-+        //Use masked cart Id
-+        $cartId = $quoteIdMask->getMaskedId();
-+        $data = [
-+            'data' => [
-+                'country_id' => "US",
-+                'postcode' => null,
-+                'region' => null,
-+                'region_id' => null
-+            ]
-+        ];
-+        /** @var \Magento\Quote\Api\Data\EstimateAddressInterface $address */
-+        $address = $objectManager->create(\Magento\Quote\Api\Data\EstimateAddressInterface::class, $data);
-+        /** @var  \Magento\Quote\Api\GuestShippingMethodManagementInterface $shippingEstimation */
-+        $shippingEstimation = $objectManager->get(\Magento\Quote\Api\GuestShippingMethodManagementInterface::class);
-+        $result = $shippingEstimation->estimateByAddress($cartId, $address);
-+        $this->assertNotEmpty($result);
-+        $expectedResult = [
-+            'method_code' => 'bestway',
-+            'amount' => 0
-+        ];
-+        foreach ($result as $rate) {
-+            $this->assertEquals($expectedResult['amount'], $rate->getAmount());
-+            $this->assertEquals($expectedResult['method_code'], $rate->getMethodCode());
-+        }
-+    }
-+
-     /**
-      * @magentoConfigFixture current_store carriers/tablerate/active 1
-      * @magentoConfigFixture current_store carriers/tablerate/condition_name package_qty
-@@ -51,6 +102,7 @@ class ShippingMethodManagementTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testEstimateByAddressWithCartPriceRuleByShipment()
-     {
-+        $this->markTestSkipped('According to MAGETWO-69940 it is an incorrect behavior');
-         // Rule applied to entire shipment should not overwrite flat or table rate shipping prices
-         // Only rules applied to specific items should modify those prices (MAGETWO-63844)
-         $this->executeTestFlow(5, 10);
-diff --git a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/GridTest.php
-index bc9d0f89594..7398d9c2392 100644
---- a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/GridTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/GridTest.php
-@@ -5,18 +5,84 @@
-  */
- namespace Magento\Reports\Block\Adminhtml;
- 
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\Locale\ResolverInterface;
-+use Magento\Framework\App\RequestInterface;
-+use Magento\Reports\Model\ResourceModel\Product\Sold\Collection\Initial;
-+
- /**
-  * Test class for \Magento\Reports\Block\Adminhtml\Grid
-  * @magentoAppArea adminhtml
-  */
- class GridTest extends \PHPUnit\Framework\TestCase
- {
--    public function testGetDateFormat()
-+    /**
-+     * @var $block \Magento\Reports\Block\Adminhtml\Grid
-+     */
-+    private $block;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-     {
--        /** @var $block \Magento\Reports\Block\Adminhtml\Grid */
--        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+        $this->block = Bootstrap::getObjectManager()->get(
-             \Magento\Reports\Block\Adminhtml\Grid::class
-         );
--        $this->assertNotEmpty($block->getDateFormat());
-+    }
-+
-+    public function testGetDateFormat()
-+    {
-+        $this->assertNotEmpty($this->block->getDateFormat());
-+    }
-+
-+    /**
-+     *  Test apply filtering to collection
-+     *
-+     * @param string $from
-+     * @param string $to
-+     * @param string $period
-+     * @param string $locale
-+     * @param int $expected
-+     * @dataProvider getSalesRepresentativeIdDataProvider
-+     */
-+    public function testGetPreparedCollection($from, $to, $period, $locale, $expected)
-+    {
-+        $encodedFilter = base64_encode('report_from='. $from . '&report_to=' . $to . '&report_period=' . $period);
-+
-+        $this->block->setVarNameFilter('filtername');
-+        /** @var $request RequestInterface */
-+        $request = Bootstrap::getObjectManager()->get(RequestInterface::class);
-+        $request->setParams(['filtername' => $encodedFilter]);
-+        $request->setParams(['locale' => $locale]);
-+
-+        /** @var $localeResolver ResolverInterface */
-+        $localeResolver = Bootstrap::getObjectManager()->get(ResolverInterface::class);
-+        $localeResolver->setLocale();
-+
-+        /** @var $initialCollection Initial */
-+        $initialCollection = Bootstrap::getObjectManager()->create(
-+            Initial::class
-+        );
-+        $this->block->setData(['dataSource' => $initialCollection]);
-+
-+        /** @var $collection Initial */
-+        $collection = $this->block->getPreparedCollection();
-+        $items = $collection->getItems();
-+        $this->assertCount($expected, $items);
-+    }
-+
-+    /**
-+     * Data provider for testGetPreparedCollection method.
-+     *
-+     * @return array
-+     */
-+    public function getSalesRepresentativeIdDataProvider()
-+    {
-+        return [
-+            'Data for US locale' =>             ['08/15/2018', '08/20/2018', 'day', 'en_US', 6],
-+            'Data for Australian locale' =>     ['15/08/2018', '31/08/2018', 'day', 'en_AU', 17],
-+            'Data for French locale' =>         ['20.08.2018', '30.08.2018', 'day', 'fr_FR', 11],
-+        ];
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php
-index b8446839c8c..0af32b32c7d 100644
---- a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php
-@@ -3,10 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Reports\Block\Adminhtml\Shopcart\Abandoned;
- 
- use Magento\Quote\Model\Quote;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\View\LayoutInterface;
- 
- /**
-  * Test class for \Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid
-@@ -20,12 +23,12 @@ class GridTest extends \Magento\Reports\Block\Adminhtml\Shopcart\GridTestAbstrac
-     /**
-      * @return void
-      */
--    public function testGridContent()
-+    public function testGridContent(): void
-     {
--        /** @var \Magento\Framework\View\LayoutInterface $layout */
--        $layout = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class);
-+        /** @var LayoutInterface $layout */
-+        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
-         /** @var Grid $grid */
--        $grid = $layout->createBlock(\Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid::class);
-+        $grid = $layout->createBlock(Grid::class);
-         $grid->getRequest()->setParams(['filter' => base64_encode(urlencode('email=customer@example.com'))]);
-         $result = $grid->getPreparedCollection();
- 
-@@ -35,4 +38,17 @@ class GridTest extends \Magento\Reports\Block\Adminhtml\Shopcart\GridTestAbstrac
-         $this->assertEquals('customer@example.com', $quote->getCustomerEmail());
-         $this->assertEquals(10.00, $quote->getSubtotal());
-     }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testPageSizeIsSetToNullWhenExportCsvFile(): void
-+    {
-+        /** @var LayoutInterface $layout */
-+        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
-+        /** @var Grid $grid */
-+        $grid = $layout->createBlock(Grid::class);
-+        $grid->getCsvFile();
-+        $this->assertNull($grid->getCollection()->getPageSize());
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/SoldTest.php b/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/SoldTest.php
-new file mode 100644
-index 00000000000..951ec465123
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/SoldTest.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Reports\Controller\Adminhtml\Report\Product;
-+
-+/**
-+ * @magentoAppArea adminhtml
-+ */
-+class SoldTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-+{
-+    public function testExecute()
-+    {
-+        $this->dispatch('backend/reports/report_product/sold');
-+        $actual = $this->getResponse()->getBody();
-+        $this->assertContains('Ordered Products Report', $actual);
-+        //verify if SKU column is presented on grid
-+        $this->assertContains('SKU', $actual);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Report/Sold/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Report/Sold/CollectionTest.php
-new file mode 100644
-index 00000000000..4623fa803d3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Report/Sold/CollectionTest.php
-@@ -0,0 +1,41 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Reports\Model\ResourceModel\Report\Sold;
-+
-+/**
-+ * Class CollectionTest
-+ */
-+class CollectionTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Reports\Model\ResourceModel\Product\Sold\Collection
-+     */
-+    private $collection;
-+
-+    protected function setUp()
-+    {
-+        /**
-+         * @var \Magento\Reports\Model\ResourceModel\Product\Sold\Collection
-+         */
-+        $this->collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+            \Magento\Reports\Model\ResourceModel\Product\Sold\Collection::class
-+        );
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Sales/_files/order_item_with_configurable_for_reorder.php
-+     */
-+    public function testFilterByProductTypeException()
-+    {
-+        $items = $this->collection->addOrderedQty()->getItems();
-+        $this->assertEquals(1, count($items));
-+        $orderItem = array_shift($items);
-+        $this->assertEquals('1.0000', $orderItem['ordered_qty']);
-+        $this->assertEquals('Configurable Product', $orderItem['order_items_name']);
-+        //verify if order_item_sku exists in return data
-+        $this->assertEquals('simple_20', $orderItem['order_items_sku']);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Review/Block/Product/ReviewRendererTest.php b/dev/tests/integration/testsuite/Magento/Review/Block/Product/ReviewRendererTest.php
-new file mode 100644
-index 00000000000..164bb14361c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Review/Block/Product/ReviewRendererTest.php
-@@ -0,0 +1,34 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Review\Block\Product;
-+
-+/**
-+ * Class ReviewRendererTest
-+ */
-+class ReviewRendererTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Test verifies ReviewRenderer::getReviewsSummaryHtml call with $displayIfNoReviews = false
-+     * The reviews summary will be shown as expected only if there is at least one review available
-+     *
-+     * @magentoDataFixture Magento/Review/_files/different_reviews.php
-+     * @magentoAppArea frontend
-+     */
-+    public function testGetReviewSummaryHtml()
-+    {
-+        $productSku = 'simple';
-+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+        $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+        $product = $productRepository->get($productSku);
-+        /** @var  ReviewRenderer $reviewRenderer */
-+        $reviewRenderer = $objectManager->create(ReviewRenderer::class);
-+        $actualResult = $reviewRenderer->getReviewsSummaryHtml($product);
-+        $this->assertEquals(2, $reviewRenderer->getReviewsCount());
-+        $this->assertContains('<span itemprop="reviewCount">2</span>', $actualResult);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Product/EditTest.php b/dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Product/EditTest.php
-new file mode 100644
-index 00000000000..ad39928f9f3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Product/EditTest.php
-@@ -0,0 +1,91 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Review\Controller\Adminhtml\Product;
-+
-+use Magento\Review\Model\Review;
-+use Magento\TestFramework\TestCase\AbstractBackendController;
-+use Magento\Framework\Acl\Builder;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\UrlInterface;
-+use Magento\Review\Model\ResourceModel\Review\CollectionFactory;
-+
-+/**
-+ * Test Edit action.
-+ *
-+ * @magentoAppArea adminhtml
-+ */
-+class EditTest extends AbstractBackendController
-+{
-+    /**
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var Builder
-+     */
-+    private $aclBuilder;
-+
-+    /**
-+     * @var UrlInterface
-+     */
-+    private $urlBuilder;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $collectionFactory;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->aclBuilder = $this->objectManager->get(Builder::class);
-+        $this->urlBuilder = $this->objectManager->get(UrlInterface::class);
-+        $this->collectionFactory = $this->objectManager->get(CollectionFactory::class);
-+        $this->aclBuilder->resetRuntimeAcl();
-+    }
-+
-+    /**
-+     * Tests Edit action without reviews_all resource when manipulating Pending review.
-+     *
-+     * @return void
-+     * @magentoDataFixture Magento/Review/_files/reviews.php
-+     */
-+    public function testAclHasAccess(): void
-+    {
-+        $collection = $this->collectionFactory->create();
-+        $collection->addFilter('detail.nickname', 'Nickname');
-+        /** @var Review $review */
-+        $review = $collection->getItemByColumnValue('status_id', Review::STATUS_PENDING);
-+
-+        // Exclude resource from ACL.
-+        $this->aclBuilder->getAcl()->deny(null, 'Magento_Review::reviews_all');
-+        $this->uri = 'backend/review/product/edit/id/' . $review->getId();
-+
-+        parent::testAclHasAccess();
-+    }
-+
-+    /**
-+     * Tests Edit action without pending and reviews_all resources.
-+     *
-+     * @return void
-+     */
-+    public function testAclNoAccess(): void
-+    {
-+        // Exclude resource from ACL.
-+        $this->resource = ['Magento_Review::reviews_all', 'Magento_Review::pending'];
-+        $this->uri = 'backend/review/product/edit/id/' . 'doesn\'t matter';
-+
-+        parent::testAclNoAccess();
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Product/MassUpdateTest.php b/dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Product/MassUpdateTest.php
-new file mode 100644
-index 00000000000..d6664d1fbb7
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Product/MassUpdateTest.php
-@@ -0,0 +1,93 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Review\Controller\Adminhtml\Product;
-+
-+use Magento\Review\Model\Review;
-+use Magento\TestFramework\TestCase\AbstractBackendController;
-+use Magento\Framework\Acl\Builder;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\UrlInterface;
-+use Magento\Review\Model\ResourceModel\Review\CollectionFactory;
-+use Zend\Http\Request;
-+
-+/**
-+ * Test Mass Update action.
-+ *
-+ * @magentoAppArea adminhtml
-+ */
-+class MassUpdateTest extends AbstractBackendController
-+{
-+    /**
-+     * @var \Magento\Framework\ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var Builder
-+     */
-+    private $aclBuilder;
-+
-+    /**
-+     * @var UrlInterface
-+     */
-+    private $urlBuilder;
-+
-+    /**
-+     * @var CollectionFactory
-+     */
-+    private $collectionFactory;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->aclBuilder = $this->objectManager->get(Builder::class);
-+        $this->urlBuilder = $this->objectManager->get(UrlInterface::class);
-+        $this->collectionFactory = $this->objectManager->get(CollectionFactory::class);
-+        $this->aclBuilder->resetRuntimeAcl();
-+        $this->httpMethod = Request::METHOD_POST;
-+        $this->uri = 'backend/review/product/massUpdateStatus';
-+    }
-+
-+    /**
-+     * Tests Mass Update action without reviews_all resource when manipulating Pending reviews.
-+     *
-+     * @return void
-+     * @magentoDataFixture Magento/Review/_files/reviews.php
-+     */
-+    public function testAclHasAccess(): void
-+    {
-+        $collection = $this->collectionFactory->create();
-+        $collection->addFilter('detail.nickname', 'Nickname');
-+        /** @var Review $review */
-+        $review = $collection->getItemByColumnValue('status_id', Review::STATUS_PENDING);
-+
-+        // Exclude resource from ACL.
-+        $this->aclBuilder->getAcl()->deny(null, 'Magento_Review::reviews_all');
-+        $this->getRequest()->setPostValue(['reviews' => $review->getId()]);
-+
-+        parent::testAclHasAccess();
-+    }
-+
-+    /**
-+     * Tests Mass Update action without pending and reviews_all resources.
-+     *
-+     * @return void
-+     */
-+    public function testAclNoAccess(): void
-+    {
-+        // Exclude resource from ACL.
-+        $this->resource = ['Magento_Review::reviews_all', 'Magento_Review::pending'];
-+
-+        parent::testAclNoAccess();
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Review/Controller/CaseCheckAddingProductReviewTest.php b/dev/tests/integration/testsuite/Magento/Review/Controller/CaseCheckAddingProductReviewTest.php
-new file mode 100644
-index 00000000000..49e980ed536
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Review/Controller/CaseCheckAddingProductReviewTest.php
-@@ -0,0 +1,120 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Review\Controller;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Framework\Data\Form\FormKey;
-+use Magento\Framework\Message\MessageInterface;
-+use Magento\TestFramework\Request;
-+use Magento\TestFramework\TestCase\AbstractController;
-+
-+/**
-+ * Test review product controller behavior
-+ *
-+ * @magentoAppArea frontend
-+ */
-+class CaseCheckAddingProductReviewTest extends AbstractController
-+{
-+    /**
-+     * Test adding a review for allowed guests with incomplete data by a not logged in user
-+     *
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/Review/_files/config.php
-+     * @magentoDataFixture Magento/Catalog/_files/products.php
-+     */
-+    public function testAttemptForGuestToAddReviewsWithIncompleteData()
-+    {
-+        $product = $this->getProduct();
-+        /** @var FormKey $formKey */
-+        $formKey = $this->_objectManager->get(FormKey::class);
-+        $post = [
-+            'nickname' => 'Test nick',
-+            'title' => 'Summary',
-+            'form_key' => $formKey->getFormKey(),
-+        ];
-+        $this->prepareRequestData($post);
-+        $this->dispatch('review/product/post/id/' . $product->getId());
-+        $this->assertSessionMessages(
-+            $this->equalTo(['Please enter a review.']),
-+            MessageInterface::TYPE_ERROR
-+        );
-+    }
-+
-+    /**
-+     * Test adding a review for not allowed guests by a guest
-+     *
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/Review/_files/disable_config.php
-+     * @magentoDataFixture Magento/Catalog/_files/products.php
-+     */
-+    public function testAttemptForGuestToAddReview()
-+    {
-+        $product = $this->getProduct();
-+        /** @var FormKey $formKey */
-+        $formKey = $this->_objectManager->get(FormKey::class);
-+        $post = [
-+            'nickname' => 'Test nick',
-+            'title' => 'Summary',
-+            'detail' => 'Test Details',
-+            'form_key' => $formKey->getFormKey(),
-+        ];
-+
-+        $this->prepareRequestData($post);
-+        $this->dispatch('review/product/post/id/' . $product->getId());
-+
-+        $this->assertRedirect($this->stringContains('customer/account/login'));
-+    }
-+
-+    /**
-+     * Test successfully adding a product review by a guest
-+     *
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/Review/_files/config.php
-+     * @magentoDataFixture Magento/Catalog/_files/products.php
-+     */
-+    public function testSuccessfullyAddingProductReviewForGuest()
-+    {
-+        $product = $this->getProduct();
-+        /** @var FormKey $formKey */
-+        $formKey = $this->_objectManager->get(FormKey::class);
-+        $post = [
-+            'nickname' => 'Test nick',
-+            'title' => 'Summary',
-+            'detail' => 'Test Details',
-+            'form_key' => $formKey->getFormKey(),
-+        ];
-+
-+        $this->prepareRequestData($post);
-+        $this->dispatch('review/product/post/id/' . $product->getId());
-+
-+        $this->assertSessionMessages(
-+            $this->equalTo(['You submitted your review for moderation.']),
-+            MessageInterface::TYPE_SUCCESS
-+        );
-+    }
-+
-+    /**
-+     * @return ProductInterface
-+     */
-+    private function getProduct()
-+    {
-+        return $this->_objectManager->get(ProductRepositoryInterface::class)->get('custom-design-simple-product');
-+    }
-+
-+    /**
-+     * @param array $postData
-+     * @return void
-+     */
-+    private function prepareRequestData($postData)
-+    {
-+        $this->getRequest()->setMethod(Request::METHOD_POST);
-+        $this->getRequest()->setPostValue($postData);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/Review/Product/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/Review/Product/CollectionTest.php
-index a7f859b23df..559c62e42de 100644
---- a/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/Review/Product/CollectionTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/Review/Product/CollectionTest.php
-@@ -3,20 +3,88 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Review\Model\ResourceModel\Review\Product;
- 
-+/**
-+ * Tests some functionality of the Product Review collection
-+ */
- class CollectionTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-+     * @param string $status
-+     * @param int $expectedCount
-+     * @param string $sortAttribute
-+     * @param string $dir
-+     * @param callable $assertion
-+     * @dataProvider sortOrderAssertionsDataProvider
-      * @magentoDataFixture Magento/Review/_files/different_reviews.php
-      */
--    public function testGetResultingIds()
--    {
-+    public function testGetResultingIds(
-+        ?string $status,
-+        int $expectedCount,
-+        string $sortAttribute,
-+        string $dir,
-+        callable $assertion
-+    ) {
-+        /**
-+         * @var $collection \Magento\Review\Model\ResourceModel\Review\Product\Collection
-+         */
-         $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-             \Magento\Review\Model\ResourceModel\Review\Product\Collection::class
-         );
--        $collection->addStatusFilter(\Magento\Review\Model\Review::STATUS_APPROVED);
-+        if ($status) {
-+            $collection->addStatusFilter($status);
-+        }
-+        $collection->setOrder($sortAttribute, $dir);
-         $actual = $collection->getResultingIds();
--        $this->assertCount(2, $actual);
-+        $this->assertCount($expectedCount, $actual);
-+        $assertion($actual);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function sortOrderAssertionsDataProvider() :array
-+    {
-+        return [
-+            [
-+                \Magento\Review\Model\Review::STATUS_APPROVED,
-+                2,
-+                'rt.review_id',
-+                'DESC',
-+                function (array $actual) :void {
-+                    $this->assertLessThan($actual[0], $actual[1]);
-+                }
-+            ],
-+            [
-+                \Magento\Review\Model\Review::STATUS_APPROVED,
-+                2,
-+                'rt.review_id',
-+                'ASC',
-+                function (array $actual) :void {
-+                    $this->assertLessThan($actual[1], $actual[0]);
-+                }
-+            ],
-+            [
-+                \Magento\Review\Model\Review::STATUS_APPROVED,
-+                2,
-+                'rt.created_at',
-+                'ASC',
-+                function (array $actual) :void {
-+                    $this->assertLessThan($actual[1], $actual[0]);
-+                }
-+            ],
-+            [
-+                null,
-+                3,
-+                'rt.review_id',
-+                'ASC',
-+                function (array $actual) :void {
-+                    $this->assertLessThan($actual[1], $actual[0]);
-+                }
-+            ]
-+        ];
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Review/Observer/ProcessProductAfterDeleteEventObserverTest.php b/dev/tests/integration/testsuite/Magento/Review/Observer/ProcessProductAfterDeleteEventObserverTest.php
-new file mode 100644
-index 00000000000..8c1fd8eca70
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Review/Observer/ProcessProductAfterDeleteEventObserverTest.php
-@@ -0,0 +1,43 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Review\Observer;
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Review\Model\ResourceModel\Review\Collection as ReviewCollection;
-+use Magento\Review\Model\ResourceModel\Review\CollectionFactory as ReviewCollectionFactory;
-+use Magento\TestFramework\TestCase\AbstractController;
-+
-+/**
-+ * Test checks that product review is removed when the corresponding product is removed
-+ */
-+class ProcessProductAfterDeleteEventObserverTest extends AbstractController
-+{
-+    /**
-+     * @magentoDataFixture Magento/Review/_files/customer_review.php
-+     */
-+    public function testReviewIsRemovedWhenProductDeleted()
-+    {
-+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+        /** @var ProductRepositoryInterface $productRepository */
-+        $productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+        $product = $productRepository->get('simple');
-+
-+        /** @var ReviewCollection $reviewsCollection */
-+        $reviewsCollection = $objectManager->get(ReviewCollectionFactory::class)->create();
-+        $reviewsCollection->addEntityFilter('product', $product->getId());
-+
-+        self::assertEquals(1, $reviewsCollection->count());
-+
-+        /* Remove product and ensure that the product review is removed as well */
-+        $productRepository->delete($product);
-+        $reviewsCollection->clear();
-+
-+        self::assertEquals(0, $reviewsCollection->count());
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php b/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php
-index 627434111fe..67d7dd961d4 100644
---- a/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php
-+++ b/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php
-@@ -4,6 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
-+// phpcs:ignore Magento2.Security.IncludeFile
- require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
- 
- $review = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-@@ -71,3 +72,4 @@ $review->setEntityId(
-         )->getStore()->getId()
-     ]
- )->save();
-+$review->aggregate();
-diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/disable_config.php b/dev/tests/integration/testsuite/Magento/Review/_files/disable_config.php
-new file mode 100644
-index 00000000000..ee21150bd61
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Review/_files/disable_config.php
-@@ -0,0 +1,15 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/** @var Value $config */
-+use Magento\Framework\App\Config\Value;
-+
-+$config = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Value::class);
-+$config->setPath('catalog/review/allow_guest');
-+$config->setScope('default');
-+$config->setScopeId(0);
-+$config->setValue(0);
-+$config->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php b/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php
-new file mode 100644
-index 00000000000..9a611b8f2b9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php
-@@ -0,0 +1,91 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Rss\Controller\Feed;
-+
-+class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-+{
-+    /**
-+     * @var \Magento\Rss\Model\UrlBuilder
-+     */
-+    private $urlBuilder;
-+
-+    /**
-+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
-+     */
-+    private $customerRepository;
-+
-+    /**
-+     * @var \Magento\Wishlist\Model\Wishlist
-+     */
-+    private $wishlist;
-+
-+    /**
-+     * @var
-+     */
-+    private $customerSession;
-+
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $this->urlBuilder = $this->_objectManager->get(\Magento\Rss\Model\UrlBuilder::class);
-+        $this->customerRepository = $this->_objectManager->get(
-+            \Magento\Customer\Api\CustomerRepositoryInterface::class
-+        );
-+        $this->wishlist = $this->_objectManager->get(\Magento\Wishlist\Model\Wishlist::class);
-+        $this->customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
-+    }
-+
-+    /**
-+     * Check Rss response.
-+     *
-+     * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
-+     * @magentoConfigFixture current_store rss/wishlist/active 1
-+     * @magentoConfigFixture current_store rss/config/active 1
-+     */
-+    public function testRssResponse()
-+    {
-+        $firstCustomerId = 1;
-+        $this->customerSession->setCustomerId($firstCustomerId);
-+        $customer = $this->customerRepository->getById($firstCustomerId);
-+        $customerEmail = $customer->getEmail();
-+        $wishlistId = $this->wishlist->loadByCustomerId($firstCustomerId)->getId();
-+        $this->dispatch($this->getLink($firstCustomerId, $customerEmail, $wishlistId));
-+        $body = $this->getResponse()->getBody();
-+        $this->assertContains('<title>John Smith\'s Wishlist</title>', $body);
-+    }
-+
-+    /**
-+     * Check Rss with incorrect wishlist id.
-+     *
-+     * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
-+     * @magentoConfigFixture current_store rss/wishlist/active 1
-+     * @magentoConfigFixture current_store rss/config/active 1
-+     */
-+    public function testRssResponseWithIncorrectWishlistId()
-+    {
-+        $firstCustomerId = 1;
-+        $secondCustomerId = 2;
-+        $this->customerSession->setCustomerId($firstCustomerId);
-+        $customer = $this->customerRepository->getById($firstCustomerId);
-+        $customerEmail = $customer->getEmail();
-+        $wishlistId = $this->wishlist->loadByCustomerId($secondCustomerId, true)->getId();
-+        $this->dispatch($this->getLink($firstCustomerId, $customerEmail, $wishlistId));
-+        $body = $this->getResponse()->getBody();
-+        $this->assertContains('<title>404 Not Found</title>', $body);
-+    }
-+
-+    private function getLink($customerId, $customerEmail, $wishlistId)
-+    {
-+
-+        return 'rss/feed/index/type/wishlist/data/'
-+            . base64_encode($customerId . ',' . $customerEmail)
-+            . '/wishlist_id/' . $wishlistId;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
-index 999522a49e0..b75501911be 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
-@@ -5,104 +5,166 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- declare(strict_types=1);
- 
- namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
- 
- use Magento\Backend\Model\Session\Quote as SessionQuote;
-+use Magento\Customer\Api\Data\AttributeMetadataInterface;
- use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
-+use Magento\Customer\Model\Data\Option;
- use Magento\Customer\Model\Metadata\Form;
- use Magento\Customer\Model\Metadata\FormFactory;
- use Magento\Framework\View\LayoutInterface;
- use Magento\Quote\Model\Quote;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit\Framework\MockObject\MockObject;
- 
- /**
-+ * Class for test Account
-+ *
-  * @magentoAppArea adminhtml
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class AccountTest extends \PHPUnit\Framework\TestCase
- {
--    /** @var Account */
-+    /**
-+     * @var Account
-+     */
-     private $accountBlock;
- 
-     /**
--     * @var Bootstrap
-+     * @var ObjectManager
-      */
-     private $objectManager;
- 
-     /**
--     * @magentoDataFixture Magento/Sales/_files/quote.php
-+     * @var SessionQuote|MockObject
-+     */
-+    private $session;
-+
-+    /**
-+     * @inheritdoc
-      */
-     protected function setUp()
-     {
-         $this->objectManager = Bootstrap::getObjectManager();
--        $quote = $this->objectManager->create(Quote::class)->load(1);
--        $sessionQuoteMock = $this->getMockBuilder(
--            SessionQuote::class
--        )->disableOriginalConstructor()->setMethods(
--            ['getCustomerId', 'getStore', 'getStoreId', 'getQuote']
--        )->getMock();
--        $sessionQuoteMock->expects($this->any())->method('getCustomerId')->will($this->returnValue(1));
--        $sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quote));
--        /** @var LayoutInterface $layout */
--        $layout = $this->objectManager->get(LayoutInterface::class);
--        $this->accountBlock = $layout->createBlock(
--            Account::class,
--            'address_block' . rand(),
--            ['sessionQuote' => $sessionQuoteMock]
--        );
-         parent::setUp();
-     }
- 
-     /**
-+     * Test for get form with existing customer
-+     *
-      * @magentoDataFixture Magento/Customer/_files/customer.php
-      */
--    public function testGetForm()
-+    public function testGetFormWithCustomer()
-     {
-+        $customerGroup = 2;
-+        $quote = $this->objectManager->create(Quote::class);
-+
-+        $this->session = $this->getMockBuilder(SessionQuote::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getCustomerId','getQuote'])
-+            ->getMock();
-+        $this->session->method('getQuote')
-+            ->willReturn($quote);
-+        $this->session->method('getCustomerId')
-+            ->willReturn(1);
-+
-+        /** @var LayoutInterface $layout */
-+        $layout = $this->objectManager->get(LayoutInterface::class);
-+        $this->accountBlock = $layout->createBlock(
-+            Account::class,
-+            'address_block' . rand(),
-+            ['sessionQuote' => $this->session]
-+        );
-+
-+        $fixtureCustomerId = 1;
-+        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
-+        $customerRepository = $this->objectManager->get(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-+        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
-+        $customer = $customerRepository->getById($fixtureCustomerId);
-+        $customer->setGroupId($customerGroup);
-+        $customerRepository->save($customer);
-+
-         $expectedFields = ['group_id', 'email'];
-         $form = $this->accountBlock->getForm();
--        $this->assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
-+        self::assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
-         $fieldset = $form->getElements()[0];
-+        $content = $form->toHtml();
- 
--        $this->assertEquals(count($expectedFields), $fieldset->getElements()->count());
-+        self::assertEquals(count($expectedFields), $fieldset->getElements()->count());
- 
-         foreach ($fieldset->getElements() as $element) {
--            $this->assertTrue(
-+            self::assertTrue(
-                 in_array($element->getId(), $expectedFields),
-                 sprintf('Unexpected field "%s" in form.', $element->getId())
-             );
-         }
-+
-+        self::assertContains(
-+            '<option value="'.$customerGroup.'" selected="selected">Wholesale</option>',
-+            $content,
-+            'The Customer Group specified for the chosen customer should be selected.'
-+        );
-+
-+        self::assertContains(
-+            'value="'.$customer->getEmail().'"',
-+            $content,
-+            'The Customer Email specified for the chosen customer should be input '
-+        );
-     }
- 
-     /**
-      * Tests a case when user defined custom attribute has default value.
-      *
--     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/Store/_files/core_second_third_fixturestore.php
-+     * @magentoConfigFixture current_store customer/create_account/default_group 2
-+     * @magentoConfigFixture secondstore_store customer/create_account/default_group 3
-      */
-     public function testGetFormWithUserDefinedAttribute()
-     {
-+        /** @var \Magento\Store\Model\StoreManagerInterface  $storeManager */
-+        $storeManager = Bootstrap::getObjectManager()->get(\Magento\Store\Model\StoreManagerInterface::class);
-+        $secondStore = $storeManager->getStore('secondstore');
-+
-+        $quoteSession = $this->objectManager->get(SessionQuote::class);
-+        $quoteSession->setStoreId($secondStore->getId());
-+
-         $formFactory = $this->getFormFactoryMock();
-         $this->objectManager->addSharedInstance($formFactory, FormFactory::class);
- 
-         /** @var LayoutInterface $layout */
-         $layout = $this->objectManager->get(LayoutInterface::class);
--        $accountBlock = $layout->createBlock(Account::class, 'address_block' . rand());
-+        $accountBlock = $layout->createBlock(
-+            Account::class,
-+            'address_block' . rand()
-+        );
- 
-         $form = $accountBlock->getForm();
-         $form->setUseContainer(true);
-+        $content = $form->toHtml();
- 
--        $this->assertContains(
-+        self::assertContains(
-             '<option value="1" selected="selected">Yes</option>',
--            $form->toHtml(),
--            'Default value for user defined custom attribute should be selected'
-+            $content,
-+            'Default value for user defined custom attribute should be selected.'
-+        );
-+
-+        self::assertContains(
-+            '<option value="3" selected="selected">Retailer</option>',
-+            $content,
-+            'The Customer Group specified for the chosen store should be selected.'
-         );
-     }
- 
-     /**
--     * @return \PHPUnit_Framework_MockObject_MockObject
-+     * Creates a mock for Form object.
-+     *
-+     * @return MockObject
-      */
--    private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
-+    private function getFormFactoryMock(): MockObject
-     {
-         /** @var AttributeMetadataInterfaceFactory $attributeMetadataFactory */
-         $attributeMetadataFactory = $this->objectManager->create(AttributeMetadataInterfaceFactory::class);
-@@ -113,11 +175,12 @@ class AccountTest extends \PHPUnit\Framework\TestCase
-             ->setDefaultValue('1')
-             ->setFrontendLabel('Yes/No');
- 
-+        /** @var Form|MockObject $form */
-         $form = $this->getMockBuilder(Form::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-         $form->method('getUserAttributes')->willReturn([$booleanAttribute]);
--        $form->method('getSystemAttributes')->willReturn([]);
-+        $form->method('getSystemAttributes')->willReturn([$this->createCustomerGroupAttribute()]);
- 
-         $formFactory = $this->getMockBuilder(FormFactory::class)
-             ->disableOriginalConstructor()
-@@ -126,4 +189,33 @@ class AccountTest extends \PHPUnit\Framework\TestCase
- 
-         return $formFactory;
-     }
-+
-+    /**
-+     * Creates a customer group attribute object.
-+     *
-+     * @return AttributeMetadataInterface
-+     */
-+    private function createCustomerGroupAttribute(): AttributeMetadataInterface
-+    {
-+        /** @var Option $option1 */
-+        $option1 = $this->objectManager->create(Option::class);
-+        $option1->setValue(2);
-+        $option1->setLabel('Wholesale');
-+
-+        /** @var Option $option2 */
-+        $option2 = $this->objectManager->create(Option::class);
-+        $option2->setValue(3);
-+        $option2->setLabel('Retailer');
-+
-+        /** @var AttributeMetadataInterfaceFactory $attributeMetadataFactory */
-+        $attributeMetadataFactory = $this->objectManager->create(AttributeMetadataInterfaceFactory::class);
-+        $attribute = $attributeMetadataFactory->create()
-+            ->setAttributeCode('group_id')
-+            ->setBackendType('static')
-+            ->setFrontendInput('select')
-+            ->setOptions([$option1, $option2])
-+            ->setIsRequired(true);
-+
-+        return $attribute;
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php
-index 18b54e77124..b908e870cbd 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php
-@@ -3,159 +3,175 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
- 
-+use Magento\Backend\Model\Session\Quote as QuoteSession;
-+use Magento\Customer\Api\CustomerRepositoryInterface;
-+use Magento\Customer\Api\Data\AddressInterface;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Directory\Model\ResourceModel\Country\Collection;
-+use Magento\Framework\Data\Form\Element\AbstractElement;
-+use Magento\Framework\Data\Form\Element\Fieldset;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Store\Api\Data\WebsiteInterface;
-+use Magento\Store\Api\StoreRepositoryInterface;
-+use Magento\Store\Api\WebsiteRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\Helper\Xpath;
-+use Magento\TestFramework\ObjectManager;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+
- /**
-- * Test class for \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
-- *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @magentoAppArea adminhtml
-  */
- class AddressTest extends \PHPUnit\Framework\TestCase
- {
--    /** @var \Magento\Framework\ObjectManagerInterface */
--    protected $_objectManager;
--
--    /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address */
--    protected $_addressBlock;
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
- 
--    /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Customer\Api\AddressRepositoryInterface */
--    protected $addressRepository;
-+    /**
-+     * @var Address
-+     */
-+    private $block;
- 
-     /**
--     * @return int
-+     * @var QuoteSession|MockObject
-      */
--    private function getNumberOfCountryOptions()
--    {
--        /** @var \Magento\Directory\Model\ResourceModel\Country\Collection $countryCollection */
--        $countryCollection = $this->_objectManager->create(
--            \Magento\Directory\Model\ResourceModel\Country\Collection::class
--        );
--        return count($countryCollection->toOptionArray());
--    }
-+    private $quoteSession;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
--        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
--        $this->addressRepository = $this->getMockForAbstractClass(
--            \Magento\Customer\Api\AddressRepositoryInterface::class,
--            [],
--            '',
--            false,
--            true,
--            true,
--            ['getList']
--        );
--        /** @var \Magento\Framework\View\LayoutInterface $layout */
--        $layout = $this->_objectManager->get(\Magento\Framework\View\LayoutInterface::class);
--        $sessionQuoteMock = $this->getMockBuilder(\Magento\Backend\Model\Session\Quote::class)
--            ->disableOriginalConstructor()->setMethods(['getCustomerId', 'getStore', 'getStoreId', 'getQuote'])
-+        $this->objectManager = Bootstrap::getObjectManager();
-+
-+        $this->quoteSession = $this->getMockBuilder(QuoteSession::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getCustomerId', 'getStore', 'getStoreId', 'getQuote'])
-             ->getMock();
--        $sessionQuoteMock->expects($this->any())->method('getCustomerId')->will($this->returnValue(1));
- 
--        $this->_addressBlock = $layout->createBlock(
--            \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address::class,
--            'address_block' . rand(),
--            ['addressService' => $this->addressRepository, 'sessionQuote' => $sessionQuoteMock]
-+        $this->block = $this->objectManager->create(
-+            Address::class,
-+            ['sessionQuote' => $this->quoteSession]
-         );
--        parent::setUp();
-     }
- 
-+    /**
-+     * Checks address collection.
-+     *
-+     * @magentoDataFixture Magento/Customer/Fixtures/customer_2_addresses.php
-+     */
-     public function testGetAddressCollection()
-     {
--        $addressData = $this->_getAddresses();
--        $searchResult = $this->getMockForAbstractClass(
--            \Magento\Customer\Api\Data\AddressSearchResultsInterface::class,
--            [],
--            '',
--            false,
--            true,
--            true,
--            ['getItems']
--        );
--        $searchResult->expects($this->any())
--            ->method('getItems')
--            ->will($this->returnValue($addressData));
--        $this->addressRepository->expects($this->any())
--            ->method('getList')
--            ->will($this->returnValue($searchResult));
--        $this->assertEquals($addressData, $this->_addressBlock->getAddressCollection());
-+        $website = $this->getWebsite('base');
-+        $customer = $this->getCustomer('customer@example.com', (int)$website->getId());
-+        $addresses = $customer->getAddresses();
-+        $this->quoteSession->method('getCustomerId')
-+            ->willReturn($customer->getId());
-+
-+        $actual = $this->block->getAddressCollection();
-+        self::assertNotEmpty($actual);
-+        self::assertEquals($addresses, $actual);
-     }
- 
-+    /**
-+     * Checks address collection output encoded to json.
-+     *
-+     * @magentoDataFixture Magento/Customer/Fixtures/customer_sec_website_2_addresses.php
-+     */
-     public function testGetAddressCollectionJson()
-     {
--        $addressData = $this->_getAddresses();
--        $searchResult = $this->getMockForAbstractClass(
--            \Magento\Customer\Api\Data\AddressSearchResultsInterface::class,
--            [],
--            '',
--            false,
--            true,
--            true,
--            ['getItems']
--        );
--        $searchResult->expects($this->any())
--            ->method('getItems')
--            ->will($this->returnValue($addressData));
--        $this->addressRepository->expects($this->any())
--            ->method('getList')
--            ->will($this->returnValue($searchResult));
--        $expectedOutput = '[
--            {
--                "firstname": false,
--                "lastname": false,
--                "company": false,
--                "street": "",
--                "city": false,
--                "country_id": "US",
--                "region": false,
--                "region_id": false,
--                "postcode": false,
--                "telephone": false,
--                "vat_id": false
--            },
--            {
--                "firstname": "FirstName1",
--                "lastname": "LastName1",
--                "company": false,
--                "street": "Street1",
--                "city": false,
--                "country_id": false,
--                "region": false,
--                "region_id": false,
--                "postcode": false,
--                "telephone": false,
--                "vat_id": false
--            },
--            {
--                "firstname": "FirstName2",
--                "lastname": "LastName2",
--                "company": false,
--                "street": "Street2",
--                "city": false,
--                "country_id": false,
--                "region": false,
--                "region_id": false,
--                "postcode": false,
--                "telephone": false,
--                "vat_id": false
--            }
--        ]';
--        $expectedOutput = str_replace(['    ', "\n", "\r"], '', $expectedOutput);
--        $expectedOutput = str_replace(': ', ':', $expectedOutput);
--
--        $this->assertEquals($expectedOutput, $this->_addressBlock->getAddressCollectionJson());
-+        $website = $this->getWebsite('test');
-+        $customer = $this->getCustomer('customer.web@example.com', (int)$website->getId());
-+
-+        $store = $this->getStore('fixture_second_store');
-+        $this->quoteSession->method('getStore')
-+            ->willReturn($store);
-+        $this->quoteSession->method('getCustomerId')
-+            ->willReturn($customer->getId());
-+        $addresses = $customer->getAddresses();
-+        $expected = [
-+            0 => [
-+                'firstname' => false,
-+                'lastname' => false,
-+                'company' => false,
-+                'street' => '',
-+                'city' => false,
-+                'country_id' => 'US',
-+                'region' => false,
-+                'region_id' => false,
-+                'postcode' => false,
-+                'telephone' => false,
-+                'vat_id' => false,
-+            ],
-+            $addresses[0]->getId() => [
-+                'firstname' => 'John',
-+                'lastname' => 'Smith',
-+                'company' => false,
-+                'street' => 'Green str, 67',
-+                'city' => 'Culver City',
-+                'country_id' => 'US',
-+                'region' => 'California',
-+                'region_id' => 12,
-+                'postcode' => '90230',
-+                'telephone' => '3468676',
-+                'vat_id' => false,
-+                'prefix' => false,
-+                'middlename' => false,
-+                'suffix' => false,
-+                'fax' => false
-+            ],
-+            $addresses[1]->getId() => [
-+                'telephone' => '845454465',
-+                'postcode' => '10178',
-+                'country_id' => 'DE',
-+                'city' => 'Berlin',
-+                'street' => 'Tunnel Alexanderpl',
-+                'firstname' => 'John',
-+                'lastname' => 'Smith',
-+                'company' => false,
-+                'region' => false,
-+                'region_id' => 0,
-+                'vat_id' => false,
-+                'prefix' => false,
-+                'middlename' => false,
-+                'suffix' => false,
-+                'fax' => false
-+            ]
-+        ];
-+
-+        $actual = json_decode($this->block->getAddressCollectionJson(), true);
-+        self::assertEquals($expected, $actual);
-     }
- 
-+    /**
-+     * Checks one line address formatting
-+     */
-     public function testGetAddressAsString()
-     {
--        $address = $this->_getAddresses()[0];
--        $expectedResult = "FirstName1 LastName1, Street1, ,  , ";
--        $this->assertEquals($expectedResult, $this->_addressBlock->getAddressAsString($address));
-+        $data = [
-+            'firstname' => 'John',
-+            'lastname' => 'Smith',
-+            'company' => 'Test Company',
-+            'street' => 'Green str, 67',
-+            'city' => 'Culver City',
-+            'country_id' => 'US',
-+            'region' => 'California',
-+            'region_id' => 12,
-+            'postcode' => '90230',
-+            'telephone' => '3468676',
-+        ];
-+        $address = $this->objectManager->create(AddressInterface::class, ['data' => $data]);
-+        $expected = 'John Smith, Green str, 67, Culver City, California 90230, United States';
-+        self::assertEquals($expected, $this->block->getAddressAsString($address));
-     }
- 
--    /**
--     * Test \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address::_prepareForm() indirectly.
--     */
-     public function testGetForm()
-     {
-         $expectedFields = [
-@@ -175,18 +191,21 @@ class AddressTest extends \PHPUnit\Framework\TestCase
-             'fax',
-             'vat_id',
-         ];
--        $form = $this->_addressBlock->getForm();
--        $this->assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
--        /** @var \Magento\Framework\Data\Form\Element\Fieldset $fieldset */
-+
-+        $form = $this->block->getForm();
-+        self::assertEquals(1, $form->getElements()->count(), 'Form has invalid number of fieldsets');
-+
-+        /** @var Fieldset $fieldset */
-         $fieldset = $form->getElements()[0];
--        $this->assertEquals(
-+        self::assertEquals(
-             count($expectedFields),
-             $fieldset->getElements()->count(),
--            "Form has invalid number of fields"
-+            'Form has invalid number of fields'
-         );
--        /** @var \Magento\Framework\Data\Form\Element\AbstractElement $element */
-+
-+        /** @var AbstractElement $element */
-         foreach ($fieldset->getElements() as $element) {
--            $this->assertTrue(
-+            self::assertTrue(
-                 in_array($element->getId(), $expectedFields),
-                 sprintf('Unexpected field "%s" in form.', $element->getId())
-             );
-@@ -194,32 +213,61 @@ class AddressTest extends \PHPUnit\Framework\TestCase
- 
-         /** @var \Magento\Framework\Data\Form\Element\Select $countryIdField */
-         $countryIdField = $fieldset->getElements()->searchById('country_id');
--        $this->assertEquals(
--            $this->getNumberOfCountryOptions(),
--            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
--                '//option',
--                $countryIdField->getElementHtml()
--            )
--        );
-+        $actual = Xpath::getElementsCountForXpath('//option', $countryIdField->getElementHtml());
-+        self::assertEquals($this->getNumberOfCountryOptions(), $actual);
-+    }
-+
-+    /**
-+     * Gets customer entity.
-+     *
-+     * @param string $email
-+     * @param int $websiteId
-+     * @return CustomerInterface
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    private function getCustomer(string $email, int $websiteId): CustomerInterface
-+    {
-+        /** @var CustomerRepositoryInterface $repository */
-+        $repository = $this->objectManager->get(CustomerRepositoryInterface::class);
-+        return $repository->get($email, $websiteId);
-     }
- 
-     /**
--     * @return \Magento\Customer\Api\Data\AddressInterface[]
-+     * Gets website by code.
-+     *
-+     * @param string $code
-+     * @return WebsiteInterface
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-      */
--    protected function _getAddresses()
-+    private function getWebsite(string $code): WebsiteInterface
-     {
--        /** @var \Magento\Customer\Api\Data\AddressInterfaceFactory $addressFactory */
--        $addressFactory = $this->_objectManager->create(\Magento\Customer\Api\Data\AddressInterfaceFactory::class);
--        $addressData[] = $addressFactory->create()
--            ->setId(1)
--            ->setStreet(['Street1'])
--            ->setFirstname('FirstName1')
--            ->setLastname('LastName1');
--        $addressData[] = $addressFactory->create()
--            ->setId(2)
--            ->setStreet(['Street2'])
--            ->setFirstname('FirstName2')
--            ->setLastname('LastName2');
--        return $addressData;
-+        /** @var WebsiteRepositoryInterface $repository */
-+        $repository = $this->objectManager->get(WebsiteRepositoryInterface::class);
-+        return $repository->get($code);
-+    }
-+
-+    /**
-+     * Gets store by code.
-+     *
-+     * @param string $code
-+     * @return StoreInterface
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    private function getStore(string $code): StoreInterface
-+    {
-+        /** @var StoreRepositoryInterface $repository */
-+        $repository = $this->objectManager->get(StoreRepositoryInterface::class);
-+        return $repository->get($code);
-+    }
-+
-+    /**
-+     * @return int
-+     */
-+    private function getNumberOfCountryOptions()
-+    {
-+        /** @var Collection $countryCollection */
-+        $countryCollection = $this->objectManager->create(Collection::class);
-+        return count($countryCollection->toOptionArray());
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
-new file mode 100644
-index 00000000000..1125fc17307
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
-@@ -0,0 +1,59 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Block\Adminhtml;
-+
-+use Magento\Framework\View\LayoutInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\OrderFactory;
-+
-+/**
-+ * Test class for \Magento\Sales\Block\Adminhtml\Totals
-+ */
-+class TotalsTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-+{
-+    /** @var LayoutInterface */
-+    private $layout;
-+
-+    /** @var Totals */
-+    private $block;
-+
-+    /** @var OrderFactory */
-+    private $orderFactory;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $this->layout = $this->_objectManager->get(LayoutInterface::class);
-+        $this->block = $this->layout->createBlock(Totals::class, 'totals_block');
-+        $this->orderFactory = $this->_objectManager->get(OrderFactory::class);
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Sales/_files/order_with_free_shipping_by_coupon.php
-+     */
-+    public function testShowShippingCoupon()
-+    {
-+        /** @var Order $order */
-+        $order = $this->orderFactory->create();
-+        $order->loadByIncrementId('100000001');
-+
-+        $this->block->setOrder($order);
-+        $this->block->toHtml();
-+
-+        $shippingTotal = $this->block->getTotal('shipping');
-+        $this->assertNotFalse($shippingTotal, 'Shipping method is absent on the total\'s block.');
-+        $this->assertContains(
-+            '1234567890',
-+            $shippingTotal->getLabel(),
-+            'Coupon code is absent in the shipping method label name.'
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddCommentTest.php
-deleted file mode 100644
-index 020c9f51bb1..00000000000
---- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddCommentTest.php
-+++ /dev/null
-@@ -1,16 +0,0 @@
--<?php
--/***
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sales\Controller\Adminhtml\Order;
--
--class AddCommentTest extends \Magento\TestFramework\TestCase\AbstractBackendController
--{
--    public function setUp()
--    {
--        $this->resource = 'Magento_Sales::comment';
--        $this->uri = 'backend/sales/order/addcomment';
--        parent::setUp();
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php
-deleted file mode 100644
-index 9cdd84a5971..00000000000
---- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php
-+++ /dev/null
-@@ -1,16 +0,0 @@
--<?php
--/***
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sales\Controller\Adminhtml\Order;
--
--class AddressSaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
--{
--    public function setUp()
--    {
--        $this->resource = 'Magento_Sales::actions_edit';
--        $this->uri = 'backend/sales/order/addresssave';
--        parent::setUp();
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressTest.php
-deleted file mode 100644
-index 73e46b51328..00000000000
---- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressTest.php
-+++ /dev/null
-@@ -1,16 +0,0 @@
--<?php
--/***
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sales\Controller\Adminhtml\Order;
--
--class AddressTest extends \Magento\TestFramework\TestCase\AbstractBackendController
--{
--    public function setUp()
--    {
--        $this->resource = 'Magento_Sales::actions_edit';
--        $this->uri = 'backend/sales/order/address';
--        parent::setUp();
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php
-deleted file mode 100644
-index c24191fe5e4..00000000000
---- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php
-+++ /dev/null
-@@ -1,16 +0,0 @@
--<?php
--/***
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sales\Controller\Adminhtml\Order;
--
--class CancelTest extends \Magento\TestFramework\TestCase\AbstractBackendController
--{
--    public function setUp()
--    {
--        $this->resource = 'Magento_Sales::cancel';
--        $this->uri = 'backend/sales/order/cancel';
--        parent::setUp();
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
-index b9573c99b44..f863edd0492 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
-@@ -8,21 +8,62 @@ namespace Magento\Sales\Controller\Adminhtml\Order\Create;
- use Magento\Backend\Model\Session\Quote;
- use Magento\Customer\Api\CustomerRepositoryInterface;
- use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\App\Request\Http;
-+use Magento\Framework\Data\Form\FormKey;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Message\MessageInterface;
- use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Model\OrderRepository;
- use Magento\Sales\Model\Service\OrderService;
-+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
- use Magento\TestFramework\TestCase\AbstractBackendController;
-+use PHPUnit\Framework\Constraint\StringContains;
- use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
-+/**
-+ * Class test backend order save.
-+ *
-+ * @magentoAppArea adminhtml
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class SaveTest extends AbstractBackendController
- {
-+    /**
-+     * @var TransportBuilderMock
-+     */
-+    private $transportBuilder;
-+
-+    /**
-+     * @var FormKey
-+     */
-+    private $formKey;
-+
-+    /**
-+     * @var string
-+     */
-+    protected $resource = 'Magento_Sales::create';
-+
-+    /**
-+     * @var string
-+     */
-+    protected $uri = 'backend/sales/order_create/save';
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
-+        $this->formKey = $this->_objectManager->get(FormKey::class);
-+    }
-+
-     /**
-      * Checks a case when order creation is failed on payment method processing but new customer already created
-      * in the database and after new controller dispatching the customer should be already loaded in session
-      * to prevent invalid validation.
-      *
--     * @magentoAppArea adminhtml
-      * @magentoDataFixture Magento/Sales/_files/quote_with_new_customer.php
-      */
-     public function testExecuteWithPaymentOperation()
-@@ -35,9 +76,10 @@ class SaveTest extends AbstractBackendController
-         $email = 'john.doe001@test.com';
-         $data = [
-             'account' => [
--                'email' => $email
-+                'email' => $email,
-             ]
-         ];
-+        $this->getRequest()->setMethod(Http::METHOD_POST);
-         $this->getRequest()->setPostValue(['order' => $data]);
- 
-         /** @var OrderService|MockObject $orderService */
-@@ -64,13 +106,52 @@ class SaveTest extends AbstractBackendController
-         $this->_objectManager->removeSharedInstance(OrderService::class);
-     }
- 
-+    /**
-+     * @magentoDbIsolation enabled
-+     * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-+     *
-+     * @return void
-+     */
-+    public function testSendEmailOnOrderSave(): void
-+    {
-+        $this->prepareRequest(['send_confirmation' => true]);
-+        $this->dispatch('backend/sales/order_create/save');
-+        $this->assertSessionMessages(
-+            $this->equalTo([(string)__('You created the order.')]),
-+            MessageInterface::TYPE_SUCCESS
-+        );
-+
-+        $this->assertRedirect($this->stringContains('sales/order/view/'));
-+
-+        $orderId = $this->getOrderId();
-+        if ($orderId === false) {
-+            $this->fail('Order is not created.');
-+        }
-+        $order = $this->getOrder($orderId);
-+
-+        $message = $this->transportBuilder->getSentMessage();
-+        $subject = __('Your %1 order confirmation', $order->getStore()->getFrontendName())->render();
-+        $assert = $this->logicalAnd(
-+            new StringContains($order->getBillingAddress()->getName()),
-+            new StringContains(
-+                'Thank you for your order from ' . $order->getStore()->getFrontendName()
-+            ),
-+            new StringContains(
-+                "Your Order <span class=\"no-link\">#{$order->getIncrementId()}</span>"
-+            )
-+        );
-+
-+        $this->assertEquals($message->getSubject(), $subject);
-+        $this->assertThat($message->getRawMessage(), $assert);
-+    }
-+
-     /**
-      * Gets quote by reserved order id.
-      *
-      * @param string $reservedOrderId
-      * @return \Magento\Quote\Api\Data\CartInterface
-      */
--    private function getQuote($reservedOrderId)
-+    private function getQuote(string $reservedOrderId): \Magento\Quote\Api\Data\CartInterface
-     {
-         /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-         $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
-@@ -80,6 +161,81 @@ class SaveTest extends AbstractBackendController
-         /** @var CartRepositoryInterface $quoteRepository */
-         $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
-         $items = $quoteRepository->getList($searchCriteria)->getItems();
-+
-         return array_pop($items);
-     }
-+
-+    /**
-+     * @inheritdoc
-+     * @magentoDbIsolation enabled
-+     * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-+     */
-+    public function testAclHasAccess()
-+    {
-+        $this->prepareRequest();
-+
-+        parent::testAclHasAccess();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     * @magentoDbIsolation enabled
-+     * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-+     */
-+    public function testAclNoAccess()
-+    {
-+        $this->prepareRequest();
-+
-+        parent::testAclNoAccess();
-+    }
-+
-+    /**
-+     * @param int $orderId
-+     * @return OrderInterface
-+     */
-+    private function getOrder(int $orderId): OrderInterface
-+    {
-+        return $this->_objectManager->get(OrderRepository::class)->get($orderId);
-+    }
-+
-+    /**
-+     * @param array $params
-+     * @return void
-+     */
-+    private function prepareRequest(array $params = []): void
-+    {
-+        $quote = $this->getQuote('guest_quote');
-+        $session = $this->_objectManager->get(Quote::class);
-+        $session->setQuoteId($quote->getId());
-+        $session->setCustomerId(0);
-+
-+        $email = 'john.doe001@test.com';
-+        $data = [
-+            'account' => [
-+                'email' => $email,
-+            ],
-+        ];
-+
-+        $data = array_replace_recursive($data, $params);
-+
-+        $this->getRequest()
-+            ->setMethod('POST')
-+            ->setParams(['form_key' => $this->formKey->getFormKey()])
-+            ->setPostValue(['order' => $data]);
-+    }
-+
-+    /**
-+     * @return string|bool
-+     */
-+    protected function getOrderId()
-+    {
-+        $currentUrl = $this->getResponse()->getHeader('Location');
-+        $orderId = false;
-+
-+        if (preg_match('/order_id\/(?<order_id>\d+)/', $currentUrl, $matches)) {
-+            $orderId = $matches['order_id'] ?? '';
-+        }
-+
-+        return $orderId;
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
-index e071dde26a2..a07616474a4 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
-@@ -6,12 +6,26 @@
- namespace Magento\Sales\Controller\Adminhtml\Order;
- 
- use Magento\Customer\Api\CustomerRepositoryInterface;
--use Magento\Backend\Model\Session\Quote;
-+use Magento\Backend\Model\Session\Quote as SessionQuote;
-+use Magento\Customer\Api\Data\CustomerInterface;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\App\Config\MutableScopeConfigInterface;
-+use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Quote\Api\CartRepositoryInterface;
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+use Magento\Quote\Model\Quote;
-+use Magento\Store\Api\Data\StoreInterface;
-+use Magento\Store\Api\Data\WebsiteInterface;
-+use Magento\Store\Api\StoreRepositoryInterface;
-+use Magento\Store\Api\WebsiteRepositoryInterface;
-+use Magento\Store\Model\ScopeInterface;
- 
- /**
-  * @magentoAppArea adminhtml
-  * @magentoDbIsolation enabled
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
-  */
- class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
-@@ -20,6 +34,11 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-      */
-     protected $productRepository;
- 
-+    /**
-+     * @inheritDoc
-+     *
-+     * @throws \Magento\Framework\Exception\AuthenticationException
-+     */
-     protected function setUp()
-     {
-         parent::setUp();
-@@ -27,8 +46,12 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-             ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-     }
- 
-+    /**
-+     * Test LoadBlock being dispatched.
-+     */
-     public function testLoadBlockAction()
-     {
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setParam('block', ',');
-         $this->getRequest()->setParam('json', 1);
-         $this->dispatch('backend/sales/order_create/loadBlock');
-@@ -46,6 +69,7 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-         )->addProducts(
-             [$product->getId() => ['qty' => 1]]
-         );
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setParam('block', 'data');
-         $this->getRequest()->setParam('json', 1);
-         $this->dispatch('backend/sales/order_create/loadBlock');
-@@ -57,10 +81,65 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-     }
- 
-     /**
-+     * Tests that shipping method 'Table rates' shows rates according to selected website.
-+     *
-+     * @magentoAppArea adminhtml
-+     * @magentoDataFixture Magento/Quote/Fixtures/quote_sec_website.php
-+     * @magentoDataFixture Magento/OfflineShipping/_files/tablerates_second_website.php
-+     * @magentoDbIsolation disabled
-+     */
-+    public function testLoadBlockShippingMethod()
-+    {
-+        $store = $this->getStore('fixture_second_store');
-+
-+        /** @var MutableScopeConfigInterface $mutableScopeConfig */
-+        $mutableScopeConfig = $this->_objectManager->get(MutableScopeConfigInterface::class);
-+        $mutableScopeConfig->setValue(
-+            'carriers/tablerate/active',
-+            1,
-+            ScopeInterface::SCOPE_STORE,
-+            $store->getCode()
-+        );
-+        $mutableScopeConfig->setValue(
-+            'carriers/tablerate/condition_name',
-+            'package_qty',
-+            ScopeInterface::SCOPE_STORE,
-+            $store->getCode()
-+        );
-+
-+        $website = $this->getWebsite('test');
-+        $customer = $this->getCustomer('customer.web@example.com', (int)$website->getId());
-+        $quote = $this->getQuoteById('0000032134');
-+        $session = $this->_objectManager->get(SessionQuote::class);
-+        $session->setQuoteId($quote->getId());
-+
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-+        $this->getRequest()->setPostValue(
-+            [
-+                'customer_id' => $customer->getId(),
-+                'collect_shipping_rates' => 1,
-+                'store_id' => $store->getId(),
-+                'json' => true
-+            ]
-+        );
-+        $this->dispatch('backend/sales/order_create/loadBlock/block/shipping_method');
-+        $body = $this->getResponse()->getBody();
-+        $expectedTableRatePrice = '<span class=\"price\">$20.00<\/span>';
-+
-+        $this->assertContains($expectedTableRatePrice, $body, '');
-+    }
-+
-+    /**
-+     * Tests LoadBlock actions.
-+     *
-+     * @param string $block Block name.
-+     * @param string $expected Contains HTML.
-+     *
-      * @dataProvider loadBlockActionsDataProvider
-      */
-     public function testLoadBlockActions($block, $expected)
-     {
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setParam('block', $block);
-         $this->getRequest()->setParam('json', 1);
-         $this->dispatch('backend/sales/order_create/loadBlock');
-@@ -68,6 +147,9 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-         $this->assertContains($expected, $html);
-     }
- 
-+    /**
-+     * @return array
-+     */
-     public function loadBlockActionsDataProvider()
-     {
-         return [
-@@ -80,6 +162,8 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-     }
- 
-     /**
-+     * Tests action items.
-+     *
-      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-      */
-     public function testLoadBlockActionItems()
-@@ -90,6 +174,7 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-         )->addProducts(
-             [$product->getId() => ['qty' => 1]]
-         );
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setParam('block', 'items');
-         $this->getRequest()->setParam('json', 1);
-         $this->dispatch('backend/sales/order_create/loadBlock');
-@@ -153,6 +238,8 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-     }
- 
-     /**
-+     * Tests ACL.
-+     *
-      * @param string $actionName
-      * @param boolean $reordered
-      * @param string $expectedResult
-@@ -162,7 +249,7 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-      */
-     public function testGetAclResource($actionName, $reordered, $expectedResult)
-     {
--        $this->_objectManager->get(Quote::class)->setReordered($reordered);
-+        $this->_objectManager->get(SessionQuote::class)->setReordered($reordered);
-         $orderController = $this->_objectManager->get(
-             \Magento\Sales\Controller\Adminhtml\Order\Stub\OrderCreateStub::class
-         );
-@@ -215,6 +302,11 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-         $this->assertContains(sprintf('"productId":"%s"', $product->getEntityId()), $body);
-     }
- 
-+    /**
-+     * Test not allowing to save.
-+     *
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-     public function testDeniedSaveAction()
-     {
-         $this->_objectManager->configure(
-@@ -230,6 +322,7 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-         \Magento\TestFramework\Helper\Bootstrap::getInstance()
-             ->loadArea('adminhtml');
- 
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/sales/order_create/save');
-         $this->assertEquals('403', $this->getResponse()->getHttpResponseCode());
-     }
-@@ -251,7 +344,7 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-         $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
-         $quote = $quoteRepository->getActiveForCustomer($customer->getId());
- 
--        $session = $this->_objectManager->get(Quote::class);
-+        $session = $this->_objectManager->get(SessionQuote::class);
-         $session->setQuoteId($quote->getId());
- 
-         $data = [
-@@ -263,6 +356,7 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-             'region' => 'Kyivska',
-             'region_id' => 1
-         ];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue(
-             [
-                 'order' => ['billing_address' => $data],
-@@ -286,4 +380,69 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-         self::assertEquals($data['city'], $shippingAddress->getCity());
-         self::assertEquals($data['street'], $shippingAddress->getStreet());
-     }
-+
-+    /**
-+     * Gets quote entity by reserved order id.
-+     *
-+     * @param string $reservedOrderId
-+     * @return Quote
-+     */
-+    private function getQuoteById(string $reservedOrderId): Quote
-+    {
-+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
-+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
-+            ->create();
-+
-+        /** @var CartRepositoryInterface $repository */
-+        $repository = $this->_objectManager->get(CartRepositoryInterface::class);
-+        $items = $repository->getList($searchCriteria)
-+            ->getItems();
-+
-+        return array_pop($items);
-+    }
-+
-+    /**
-+     * Gets website entity.
-+     *
-+     * @param string $code
-+     * @return WebsiteInterface
-+     * @throws NoSuchEntityException
-+     */
-+    private function getWebsite(string $code): WebsiteInterface
-+    {
-+        /** @var WebsiteRepositoryInterface $repository */
-+        $repository = $this->_objectManager->get(WebsiteRepositoryInterface::class);
-+        return $repository->get($code);
-+    }
-+
-+    /**
-+     * Gets customer entity.
-+     *
-+     * @param string $email
-+     * @param int $websiteId
-+     * @return CustomerInterface
-+     * @throws NoSuchEntityException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    private function getCustomer(string $email, int $websiteId): CustomerInterface
-+    {
-+        /** @var CustomerRepositoryInterface $repository */
-+        $repository = $this->_objectManager->get(CustomerRepositoryInterface::class);
-+        return $repository->get($email, $websiteId);
-+    }
-+
-+    /**
-+     * Gets store by code.
-+     *
-+     * @param string $code
-+     * @return StoreInterface
-+     * @throws \Magento\Framework\Exception\NoSuchEntityException
-+     */
-+    private function getStore(string $code): StoreInterface
-+    {
-+        /** @var StoreRepositoryInterface $repository */
-+        $repository = $this->_objectManager->get(StoreRepositoryInterface::class);
-+        return $repository->get($code);
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AbstractCreditmemoControllerTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AbstractCreditmemoControllerTest.php
-new file mode 100644
-index 00000000000..2a773171502
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AbstractCreditmemoControllerTest.php
-@@ -0,0 +1,92 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
-+
-+use Magento\Framework\Api\SearchCriteria;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Data\Form\FormKey;
-+use Magento\Sales\Api\Data\CreditmemoInterface;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Model\OrderRepository;
-+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
-+use Magento\TestFramework\TestCase\AbstractBackendController;
-+
-+/**
-+ * Abstract backend creditmemo test.
-+ */
-+class AbstractCreditmemoControllerTest extends AbstractBackendController
-+{
-+    /**
-+     * @var TransportBuilderMock
-+     */
-+    protected $transportBuilder;
-+
-+    /**
-+     * @var OrderRepository
-+     */
-+    protected $orderRepository;
-+
-+    /**
-+     * @var FormKey
-+     */
-+    protected $formKey;
-+
-+    /**
-+     * @var string
-+     */
-+    protected $resource = 'Magento_Sales::sales_creditmemo';
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
-+        $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
-+        $this->formKey = $this->_objectManager->get(FormKey::class);
-+    }
-+
-+    /**
-+     * @param string $incrementalId
-+     * @return OrderInterface|null
-+     */
-+    protected function getOrder(string $incrementalId)
-+    {
-+        /** @var SearchCriteria $searchCriteria */
-+        $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
-+            ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
-+            ->create();
-+
-+        $orders = $this->orderRepository->getList($searchCriteria)->getItems();
-+        /** @var OrderInterface|null $order */
-+        $order = reset($orders);
-+
-+        return $order;
-+    }
-+
-+    /**
-+     * @param OrderInterface $order
-+     * @return CreditmemoInterface
-+     */
-+    protected function getCreditMemo(OrderInterface $order): CreditmemoInterface
-+    {
-+        /** @var \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection $creditMemoCollection */
-+        $creditMemoCollection = $this->_objectManager->create(
-+            \Magento\Sales\Model\ResourceModel\Order\Creditmemo\CollectionFactory::class
-+        )->create();
-+
-+        /** @var CreditmemoInterface $creditMemo */
-+        $creditMemo = $creditMemoCollection
-+            ->setOrderFilter($order)
-+            ->setPageSize(1)
-+            ->getFirstItem();
-+
-+        return $creditMemo;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
-new file mode 100644
-index 00000000000..2f23da8b3db
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
-@@ -0,0 +1,102 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
-+
-+use PHPUnit\Framework\Constraint\RegularExpression;
-+use PHPUnit\Framework\Constraint\StringContains;
-+
-+/**
-+ * Class verifies creditmemo add comment functionality.
-+ *
-+ * @magentoDbIsolation enabled
-+ * @magentoAppArea adminhtml
-+ * @magentoDataFixture Magento/Sales/_files/creditmemo_for_get.php
-+ */
-+class AddCommentTest extends AbstractCreditmemoControllerTest
-+{
-+    /**
-+     * @var string
-+     */
-+    protected $uri = 'backend/sales/order_creditmemo/addComment';
-+
-+    /**
-+     * @return void
-+     */
-+    public function testSendEmailOnAddCreditmemoComment(): void
-+    {
-+        $comment = 'Test Credit Memo Comment';
-+        $order = $this->prepareRequest(
-+            [
-+                'comment' => ['comment' => $comment, 'is_customer_notified' => true],
-+            ]
-+        );
-+        $this->dispatch('backend/sales/order_creditmemo/addComment');
-+        $html = $this->getResponse()->getBody();
-+        $this->assertContains($comment, $html);
-+
-+        $message = $this->transportBuilder->getSentMessage();
-+        $subject =__('Update to your %1 credit memo', $order->getStore()->getFrontendName())->render();
-+        $messageConstraint = $this->logicalAnd(
-+            new StringContains($order->getBillingAddress()->getName()),
-+            new RegularExpression(
-+                sprintf(
-+                    "/Your order #%s has been updated with a status of.*%s/",
-+                    $order->getIncrementId(),
-+                    $order->getFrontendStatusLabel()
-+                )
-+            ),
-+            new StringContains($comment)
-+        );
-+
-+        $this->assertEquals($message->getSubject(), $subject);
-+        $this->assertThat($message->getRawMessage(), $messageConstraint);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclHasAccess()
-+    {
-+        $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
-+
-+        parent::testAclHasAccess();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclNoAccess()
-+    {
-+        $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
-+
-+        parent::testAclNoAccess();
-+    }
-+
-+    /**
-+     * @param array $params
-+     * @return \Magento\Sales\Api\Data\OrderInterface|null
-+     */
-+    private function prepareRequest(array $params = [])
-+    {
-+        $order = $this->getOrder('100000001');
-+        $creditmemo = $this->getCreditMemo($order);
-+
-+        $this->getRequest()->setMethod('POST');
-+        $this->getRequest()->setParams(
-+            [
-+                'id' => $creditmemo->getEntityId(),
-+                'form_key' => $this->formKey->getFormKey(),
-+            ]
-+        );
-+
-+        $data = $params ?? [];
-+        $this->getRequest()->setPostValue($data);
-+
-+        return $order;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
-new file mode 100644
-index 00000000000..f589a0f5a1c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
-@@ -0,0 +1,189 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
-+
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+use Magento\Sales\Api\Data\OrderItemInterface;
-+use Magento\Sales\Model\Order;
-+use PHPUnit\Framework\Constraint\StringContains;
-+
-+/**
-+ * Provide tests for CreditMemo save controller.
-+ *
-+ * @magentoDbIsolation enabled
-+ * @magentoAppArea adminhtml
-+ * @magentoDataFixture Magento/Sales/_files/invoice.php
-+ */
-+class SaveTest extends AbstractCreditmemoControllerTest
-+{
-+    /**
-+     * @var string
-+     */
-+    protected $uri = 'backend/sales/order_creditmemo/save';
-+
-+    /**
-+     * @magentoDbIsolation enabled
-+     * @magentoDataFixture Magento/Sales/_files/invoice.php
-+     * @return void
-+     */
-+    public function testSendEmailOnCreditmemoSave(): void
-+    {
-+        $order = $this->prepareRequest(['creditmemo' => ['send_email' => true]]);
-+        $this->dispatch('backend/sales/order_creditmemo/save');
-+
-+        $this->assertSessionMessages(
-+            $this->equalTo([(string)__('You created the credit memo.')]),
-+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-+        );
-+        $this->assertRedirect($this->stringContains('sales/order/view/order_id/' . $order->getEntityId()));
-+
-+        $creditMemo = $this->getCreditMemo($order);
-+        $message = $this->transportBuilder->getSentMessage();
-+        $subject = __('Credit memo for your %1 order', $order->getStore()->getFrontendName())->render();
-+        $messageConstraint = $this->logicalAnd(
-+            new StringContains($order->getBillingAddress()->getName()),
-+            new StringContains(
-+                'Thank you for your order from ' . $creditMemo->getStore()->getFrontendName()
-+            ),
-+            new StringContains(
-+                "Your Credit Memo #{$creditMemo->getIncrementId()} for Order #{$order->getIncrementId()}"
-+            )
-+        );
-+
-+        $this->assertEquals($message->getSubject(), $subject);
-+        $this->assertThat($message->getRawMessage(), $messageConstraint);
-+    }
-+
-+    /**
-+     * Test order will keep same(custom) status after partial refund, if state has not been changed.
-+     *
-+     * @magentoDataFixture Magento/Sales/_files/order_with_invoice_and_custom_status.php
-+     */
-+    public function testOrderStatusPartialRefund()
-+    {
-+        /** @var Order $existingOrder */
-+        $existingOrder = $this->_objectManager->create(Order::class)->loadByIncrementId('100000001');
-+        $items = $this->getOrderItems($existingOrder, 1);
-+        $requestParams = [
-+            'creditmemo' => [
-+                'items' => $items,
-+                'do_offline' => '1',
-+                'comment_text' => '',
-+                'shipping_amount' => '0',
-+                'adjustment_positive' => '0',
-+                'adjustment_negative' => '0',
-+            ],
-+            'order_id' => $existingOrder->getId(),
-+        ];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-+        $this->getRequest()->setParams($requestParams);
-+        $this->dispatch('backend/sales/order_creditmemo/save');
-+
-+        /** @var Order $updatedOrder */
-+        $updatedOrder = $this->_objectManager->create(Order::class)
-+            ->loadByIncrementId($existingOrder->getIncrementId());
-+
-+        $this->assertSame('custom_processing', $updatedOrder->getStatus());
-+        $this->assertSame('processing', $updatedOrder->getState());
-+    }
-+
-+    /**
-+     * Test order will change custom status after total refund, when state has been changed.
-+     *
-+     * @magentoDataFixture Magento/Sales/_files/order_with_invoice_and_custom_status.php
-+     */
-+    public function testOrderStatusTotalRefund()
-+    {
-+        /** @var Order $existingOrder */
-+        $existingOrder = $this->_objectManager->create(Order::class)->loadByIncrementId('100000001');
-+        $requestParams = [
-+            'creditmemo' => [
-+                'items' => $this->getOrderItems($existingOrder),
-+                'do_offline' => '1',
-+                'comment_text' => '',
-+                'shipping_amount' => '0',
-+                'adjustment_positive' => '0',
-+                'adjustment_negative' => '0',
-+            ],
-+            'order_id' => $existingOrder->getId(),
-+        ];
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-+        $this->getRequest()->setParams($requestParams);
-+        $this->dispatch('backend/sales/order_creditmemo/save');
-+
-+        /** @var Order $updatedOrder */
-+        $updatedOrder = $this->_objectManager->create(Order::class)
-+            ->loadByIncrementId($existingOrder->getIncrementId());
-+
-+        $this->assertSame('complete', $updatedOrder->getStatus());
-+        $this->assertSame('complete', $updatedOrder->getState());
-+    }
-+
-+    /**
-+     * Gets all items of given Order in proper format.
-+     *
-+     * @param Order $order
-+     * @param int $subQty
-+     * @return array
-+     */
-+    private function getOrderItems(Order $order, int $subQty = 0)
-+    {
-+        $items = [];
-+        /** @var OrderItemInterface $item */
-+        foreach ($order->getAllItems() as $item) {
-+            $items[$item->getItemId()] = [
-+                'qty' => $item->getQtyOrdered() - $subQty,
-+            ];
-+        }
-+
-+        return $items;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclHasAccess()
-+    {
-+        $this->prepareRequest();
-+
-+        parent::testAclHasAccess();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclNoAccess()
-+    {
-+        $this->prepareRequest();
-+
-+        parent::testAclNoAccess();
-+    }
-+
-+    /**
-+     * @param array $params
-+     * @return \Magento\Sales\Api\Data\OrderInterface|null
-+     */
-+    private function prepareRequest(array $params = [])
-+    {
-+        $order = $this->getOrder('100000001');
-+        $this->getRequest()->setMethod('POST');
-+        $this->getRequest()->setParams(
-+            [
-+                'order_id' => $order->getEntityId(),
-+                'form_key' => $this->formKey->getFormKey(),
-+            ]
-+        );
-+
-+        $data = ['creditmemo' => ['do_offline' => true]];
-+        $data = array_replace_recursive($data, $params);
-+
-+        $this->getRequest()->setPostValue($data);
-+
-+        return $order;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php
-index 2cbd9b863ce..2de06558ab6 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php
-@@ -16,6 +16,7 @@ class CreditmemoTest extends \Magento\TestFramework\TestCase\AbstractBackendCont
-      */
-     public function testAddCommentAction()
-     {
-+        $this->markTestIncomplete('https://github.com/magento-engcom/msi/issues/393');
-         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-         /** @var \Magento\CatalogInventory\Api\StockIndexInterface $stockIndex */
-         $stockIndex = $objectManager->get(\Magento\CatalogInventory\Api\StockIndexInterface::class);
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
-index 70fbb2ee9a5..4d19106ad8e 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
-@@ -1,16 +1,136 @@
- <?php
--/***
-+/**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Controller\Adminhtml\Order;
- 
-+use Magento\Framework\Api\SearchCriteria;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Model\OrderRepository;
-+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
-+use PHPUnit\Framework\Constraint\StringContains;
-+
-+/**
-+ * Class verifies order send email functionality.
-+ *
-+ * @magentoDbIsolation enabled
-+ * @magentoAppArea adminhtml
-+ * @magentoDataFixture Magento/Sales/_files/order.php
-+ */
- class EmailTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
--    public function setUp()
-+    /**
-+     * @var OrderRepository
-+     */
-+    private $orderRepository;
-+
-+    /**
-+     * @var TransportBuilderMock
-+     */
-+    private $transportBuilder;
-+
-+    /**
-+     * @var string
-+     */
-+    protected $resource = 'Magento_Sales::email';
-+
-+    /**
-+     * @var string
-+     */
-+    protected $uri = 'backend/sales/order/email';
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-     {
--        $this->resource = 'Magento_Sales::email';
--        $this->uri = 'backend/sales/order/email';
-         parent::setUp();
-+        $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
-+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testSendOrderEmail(): void
-+    {
-+        $order = $this->prepareRequest();
-+        $this->dispatch('backend/sales/order/email');
-+
-+        $this->assertSessionMessages(
-+            $this->equalTo([(string)__('You sent the order email.')]),
-+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-+        );
-+
-+        $redirectUrl = 'sales/order/view/order_id/' . $order->getEntityId();
-+        $this->assertRedirect($this->stringContains($redirectUrl));
-+
-+        $message = $this->transportBuilder->getSentMessage();
-+        $subject = __('Your %1 order confirmation', $order->getStore()->getFrontendName())->render();
-+        $assert = $this->logicalAnd(
-+            new StringContains($order->getBillingAddress()->getName()),
-+            new StringContains(
-+                'Thank you for your order from ' . $order->getStore()->getFrontendName()
-+            ),
-+            new StringContains(
-+                "Your Order <span class=\"no-link\">#{$order->getIncrementId()}</span>"
-+            )
-+        );
-+
-+        $this->assertEquals($message->getSubject(), $subject);
-+        $this->assertThat($message->getRawMessage(), $assert);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclHasAccess()
-+    {
-+        $this->prepareRequest();
-+
-+        parent::testAclHasAccess();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclNoAccess()
-+    {
-+        $this->prepareRequest();
-+
-+        parent::testAclNoAccess();
-+    }
-+
-+    /**
-+     * @param string $incrementalId
-+     * @return OrderInterface|null
-+     */
-+    private function getOrder(string $incrementalId)
-+    {
-+        /** @var SearchCriteria $searchCriteria */
-+        $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
-+            ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
-+            ->create();
-+
-+        $orders = $this->orderRepository->getList($searchCriteria)->getItems();
-+        /** @var OrderInterface|null $order */
-+        $order = reset($orders);
-+
-+        return $order;
-+    }
-+
-+    /**
-+     * @return OrderInterface|null
-+     */
-+    private function prepareRequest()
-+    {
-+        $order = $this->getOrder('100000001');
-+        $this->getRequest()->setParams(['order_id' => $order->getEntityId()]);
-+
-+        return $order;
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/HoldTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/HoldTest.php
-deleted file mode 100644
-index 4c90939d75b..00000000000
---- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/HoldTest.php
-+++ /dev/null
-@@ -1,16 +0,0 @@
--<?php
--/***
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sales\Controller\Adminhtml\Order;
--
--class HoldTest extends \Magento\TestFramework\TestCase\AbstractBackendController
--{
--    public function setUp()
--    {
--        $this->resource = 'Magento_Sales::hold';
--        $this->uri = 'backend/sales/order/hold';
--        parent::setUp();
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AbstractInvoiceControllerTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AbstractInvoiceControllerTest.php
-new file mode 100644
-index 00000000000..3ba54418b6c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AbstractInvoiceControllerTest.php
-@@ -0,0 +1,92 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
-+
-+use Magento\Framework\Api\SearchCriteria;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Data\Form\FormKey;
-+use Magento\Sales\Api\Data\InvoiceInterface;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Model\OrderRepository;
-+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
-+use Magento\TestFramework\TestCase\AbstractBackendController;
-+
-+/**
-+ * Abstract backend invoice test.
-+ */
-+class AbstractInvoiceControllerTest extends AbstractBackendController
-+{
-+    /**
-+     * @var TransportBuilderMock
-+     */
-+    protected $transportBuilder;
-+
-+    /**
-+     * @var OrderRepository
-+     */
-+    protected $orderRepository;
-+
-+    /**
-+     * @var FormKey
-+     */
-+    protected $formKey;
-+
-+    /**
-+     * @var string
-+     */
-+    protected $resource = 'Magento_Sales::sales_invoice';
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
-+        $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
-+        $this->formKey = $this->_objectManager->get(FormKey::class);
-+    }
-+
-+    /**
-+     * @param string $incrementalId
-+     * @return OrderInterface|null
-+     */
-+    protected function getOrder(string $incrementalId)
-+    {
-+        /** @var SearchCriteria $searchCriteria */
-+        $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
-+            ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
-+            ->create();
-+
-+        $orders = $this->orderRepository->getList($searchCriteria)->getItems();
-+        /** @var OrderInterface $order */
-+        $order = reset($orders);
-+
-+        return $order;
-+    }
-+
-+    /**
-+     * @param OrderInterface $order
-+     * @return InvoiceInterface
-+     */
-+    protected function getInvoiceByOrder(OrderInterface $order): InvoiceInterface
-+    {
-+        /** @var \Magento\Sales\Model\ResourceModel\Order\Invoice\Collection $invoiceCollection */
-+        $invoiceCollection = $this->_objectManager->create(
-+            \Magento\Sales\Model\ResourceModel\Order\Invoice\CollectionFactory::class
-+        )->create();
-+
-+        /** @var InvoiceInterface $invoice */
-+        $invoice = $invoiceCollection
-+            ->setOrderFilter($order)
-+            ->setPageSize(1)
-+            ->getFirstItem();
-+
-+        return $invoice;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
-new file mode 100644
-index 00000000000..81e1dd7afc4
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
-@@ -0,0 +1,103 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
-+
-+use PHPUnit\Framework\Constraint\RegularExpression;
-+use PHPUnit\Framework\Constraint\StringContains;
-+
-+/**
-+ * Class verifies invoice add comment functionality.
-+ *
-+ * @magentoDbIsolation enabled
-+ * @magentoAppArea adminhtml
-+ * @magentoDataFixture Magento/Sales/_files/invoice.php
-+ */
-+class AddCommentTest extends AbstractInvoiceControllerTest
-+{
-+    /**
-+     * @var string
-+     */
-+    protected $uri = 'backend/sales/order_invoice/addComment';
-+
-+    /**
-+     * @return void
-+     */
-+    public function testSendEmailOnAddInvoiceComment(): void
-+    {
-+        $comment = 'Test Invoice Comment';
-+        $order = $this->prepareRequest(
-+            [
-+                'comment' => ['comment' => $comment, 'is_customer_notified' => true],
-+            ]
-+        );
-+        $this->dispatch('backend/sales/order_invoice/addComment');
-+
-+        $html = $this->getResponse()->getBody();
-+        $this->assertContains($comment, $html);
-+
-+        $message = $this->transportBuilder->getSentMessage();
-+        $subject = __('Update to your %1 invoice', $order->getStore()->getFrontendName())->render();
-+        $messageConstraint = $this->logicalAnd(
-+            new StringContains($order->getBillingAddress()->getName()),
-+            new RegularExpression(
-+                sprintf(
-+                    "/Your order #%s has been updated with a status of.*%s/",
-+                    $order->getIncrementId(),
-+                    $order->getFrontendStatusLabel()
-+                )
-+            ),
-+            new StringContains($comment)
-+        );
-+
-+        $this->assertEquals($message->getSubject(), $subject);
-+        $this->assertThat($message->getRawMessage(), $messageConstraint);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclHasAccess()
-+    {
-+        $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
-+
-+        parent::testAclHasAccess();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclNoAccess()
-+    {
-+        $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
-+
-+        parent::testAclNoAccess();
-+    }
-+
-+    /**
-+     * @param array $params
-+     * @return \Magento\Sales\Api\Data\OrderInterface|null
-+     */
-+    private function prepareRequest(array $params = [])
-+    {
-+        $order = $this->getOrder('100000001');
-+        $invoice = $this->getInvoiceByOrder($order);
-+
-+        $this->getRequest()->setMethod('POST');
-+        $this->getRequest()->setParams(
-+            [
-+                'id' => $invoice->getEntityId(),
-+                'form_key' => $this->formKey->getFormKey(),
-+            ]
-+        );
-+
-+        $data = $params ?? [];
-+        $this->getRequest()->setPostValue($data);
-+
-+        return $order;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php
-new file mode 100644
-index 00000000000..85223528ec8
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php
-@@ -0,0 +1,88 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
-+
-+use PHPUnit\Framework\Constraint\StringContains;
-+
-+/**
-+ * Class verifies invoice send email functionality.
-+ *
-+ * @magentoDbIsolation enabled
-+ * @magentoAppArea adminhtml
-+ * @magentoDataFixture Magento/Sales/_files/invoice.php
-+ */
-+class EmailTest extends AbstractInvoiceControllerTest
-+{
-+    /**
-+     * @var string
-+     */
-+    protected $uri = 'backend/sales/order_invoice/email';
-+
-+    /**
-+     * @return void
-+     */
-+    public function testSendInvoiceEmail(): void
-+    {
-+        $order = $this->getOrder('100000001');
-+        $invoice = $this->getInvoiceByOrder($order);
-+
-+        $this->getRequest()->setParams(['invoice_id' => $invoice->getEntityId()]);
-+        $this->dispatch('backend/sales/order_invoice/email');
-+
-+        $this->assertSessionMessages(
-+            $this->equalTo([(string)__('You sent the message.')]),
-+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-+        );
-+
-+        $redirectUrl = sprintf(
-+            'sales/invoice/view/order_id/%s/invoice_id/%s',
-+            $order->getEntityId(),
-+            $invoice->getEntityId()
-+        );
-+        $this->assertRedirect($this->stringContains($redirectUrl));
-+
-+        $message = $this->transportBuilder->getSentMessage();
-+        $subject = __('Invoice for your %1 order', $order->getStore()->getFrontendName())->render();
-+        $messageConstraint = $this->logicalAnd(
-+            new StringContains($invoice->getBillingAddress()->getName()),
-+            new StringContains(
-+                'Thank you for your order from ' . $invoice->getStore()->getFrontendName()
-+            ),
-+            new StringContains(
-+                "Your Invoice #{$invoice->getIncrementId()} for Order #{$order->getIncrementId()}"
-+            )
-+        );
-+
-+        $this->assertEquals($message->getSubject(), $subject);
-+        $this->assertThat($message->getRawMessage(), $messageConstraint);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclHasAccess()
-+    {
-+        $order = $this->getOrder('100000001');
-+        $invoice = $this->getInvoiceByOrder($order);
-+        $this->uri .= '/invoice_id/' . $invoice->getEntityId();
-+
-+        parent::testAclHasAccess();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclNoAccess()
-+    {
-+        $order = $this->getOrder('100000001');
-+        $invoice = $this->getInvoiceByOrder($order);
-+        $this->uri .= '/invoice_id/' . $invoice->getEntityId();
-+
-+        parent::testAclNoAccess();
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php
-new file mode 100644
-index 00000000000..68074e38d9a
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php
-@@ -0,0 +1,97 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
-+
-+use PHPUnit\Framework\Constraint\StringContains;
-+
-+/**
-+ * Class tests invoice creation in backend.
-+ *
-+ * @magentoDbIsolation enabled
-+ * @magentoAppArea adminhtml
-+ * @magentoDataFixture Magento/Sales/_files/order.php
-+ */
-+class SaveTest extends AbstractInvoiceControllerTest
-+{
-+    /**
-+     * @var string
-+     */
-+    protected $uri = 'backend/sales/order_invoice/save';
-+
-+    /**
-+     * @return void
-+     */
-+    public function testSendEmailOnInvoiceSave(): void
-+    {
-+        $order = $this->prepareRequest(['invoice' => ['send_email' => true]]);
-+        $this->dispatch('backend/sales/order_invoice/save');
-+
-+        $this->assertSessionMessages(
-+            $this->equalTo([(string)__('The invoice has been created.')]),
-+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-+        );
-+        $this->assertRedirect($this->stringContains('sales/order/view/order_id/' . $order->getEntityId()));
-+
-+        $invoice = $this->getInvoiceByOrder($order);
-+        $message = $this->transportBuilder->getSentMessage();
-+        $subject = __('Invoice for your %1 order', $order->getStore()->getFrontendName())->render();
-+        $messageConstraint = $this->logicalAnd(
-+            new StringContains($invoice->getBillingAddress()->getName()),
-+            new StringContains(
-+                'Thank you for your order from ' . $invoice->getStore()->getFrontendName()
-+            ),
-+            new StringContains(
-+                "Your Invoice #{$invoice->getIncrementId()} for Order #{$order->getIncrementId()}"
-+            )
-+        );
-+
-+        $this->assertEquals($message->getSubject(), $subject);
-+        $this->assertThat($message->getRawMessage(), $messageConstraint);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclHasAccess()
-+    {
-+        $this->prepareRequest();
-+
-+        parent::testAclHasAccess();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclNoAccess()
-+    {
-+        $this->prepareRequest();
-+
-+        parent::testAclNoAccess();
-+    }
-+
-+    /**
-+     * @param array $params
-+     * @return \Magento\Sales\Api\Data\OrderInterface|null
-+     */
-+    private function prepareRequest(array $params = [])
-+    {
-+        $order = $this->getOrder('100000001');
-+        $this->getRequest()->setMethod('POST');
-+        $this->getRequest()->setParams(
-+            [
-+                'order_id' => $order->getEntityId(),
-+                'form_key' => $this->formKey->getFormKey(),
-+            ]
-+        );
-+
-+        $data = $params ?? [];
-+        $this->getRequest()->setPostValue($data);
-+
-+        return $order;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ReviewPaymentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ReviewPaymentTest.php
-deleted file mode 100644
-index 96d19762858..00000000000
---- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ReviewPaymentTest.php
-+++ /dev/null
-@@ -1,16 +0,0 @@
--<?php
--/***
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sales\Controller\Adminhtml\Order;
--
--class ReviewPaymentTest extends \Magento\TestFramework\TestCase\AbstractBackendController
--{
--    public function setUp()
--    {
--        $this->resource = 'Magento_Sales::review_payment';
--        $this->uri = 'backend/sales/order/reviewpayment';
--        parent::setUp();
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/UnholdTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/UnholdTest.php
-deleted file mode 100644
-index 351801d8a05..00000000000
---- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/UnholdTest.php
-+++ /dev/null
-@@ -1,16 +0,0 @@
--<?php
--/***
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sales\Controller\Adminhtml\Order;
--
--class UnholdTest extends \Magento\TestFramework\TestCase\AbstractBackendController
--{
--    public function setUp()
--    {
--        $this->resource = 'Magento_Sales::unhold';
--        $this->uri = 'backend/sales/order/unhold';
--        parent::setUp();
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ViewTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ViewTest.php
-deleted file mode 100644
-index 0374edfaad9..00000000000
---- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ViewTest.php
-+++ /dev/null
-@@ -1,16 +0,0 @@
--<?php
--/***
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sales\Controller\Adminhtml\Order;
--
--class ViewTest extends \Magento\TestFramework\TestCase\AbstractBackendController
--{
--    public function setUp()
--    {
--        $this->resource = 'Magento_Sales::actions_view';
--        $this->uri = 'backend/sales/order/view';
--        parent::setUp();
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Transactions/FetchTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Transactions/FetchTest.php
-deleted file mode 100644
-index 7b9481db799..00000000000
---- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Transactions/FetchTest.php
-+++ /dev/null
-@@ -1,18 +0,0 @@
--<?php
--/***
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sales\Controller\Adminhtml\Transactions;
--
--use Magento\TestFramework\TestCase\AbstractBackendController;
--
--class FetchTest extends \Magento\TestFramework\TestCase\AbstractBackendController
--{
--    public function setUp()
--    {
--        $this->resource = 'Magento_Sales::transactions_fetch';
--        $this->uri = 'backend/sales/transactions/fetch';
--        parent::setUp();
--    }
--}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Guest/FormTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Guest/FormTest.php
-new file mode 100644
-index 00000000000..1067a474e19
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Guest/FormTest.php
-@@ -0,0 +1,109 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Controller\Guest;
-+
-+use Magento\Customer\Model\Session;
-+use Magento\Framework\Data\Form\FormKey;
-+use Magento\Framework\Message\MessageInterface;
-+use Magento\TestFramework\Request;
-+use Magento\TestFramework\TestCase\AbstractController;
-+
-+/**
-+ * @magentoAppIsolation enabled
-+ */
-+class FormTest extends AbstractController
-+{
-+    /**
-+     * Test view order as guest with correct data
-+     *
-+     * @magentoDataFixture Magento/Sales/_files/order.php
-+     */
-+    public function testViewOrderAsGuest()
-+    {
-+        $this->prepareRequestData();
-+        $this->dispatch('sales/guest/view/');
-+        $content = $this->getResponse()->getBody();
-+        $this->assertContains('Order # 100000001', $content);
-+    }
-+
-+    /**
-+     * View order as logged in customer
-+     *
-+     * @magentoDataFixture Magento/Sales/_files/order.php
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testViewOrderAsLoggedIn()
-+    {
-+        $this->login(1);
-+        $this->dispatch('sales/guest/view/');
-+        $this->assertRedirect($this->stringContains('sales/order/history/'));
-+    }
-+
-+    /**
-+     * Test attempting to open the Returns form as logged in customer
-+     *
-+     * @magentoDataFixture Magento/Sales/_files/order.php
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     */
-+    public function testAttemptToOpenTheFormAsLoggedIn()
-+    {
-+        $this->login(1);
-+        $this->dispatch('sales/guest/form/');
-+        $this->assertRedirect($this->stringContains('customer/account'));
-+    }
-+
-+    /**
-+     * Test Return Order for guest with incorrect data
-+     */
-+    public function testViewOrderAsGuestWithIncorrectData()
-+    {
-+        $this->prepareRequestData(true);
-+        $this->dispatch('sales/guest/view/');
-+        $this->assertSessionMessages(
-+            $this->equalTo(['You entered incorrect data. Please try again.']),
-+            MessageInterface::TYPE_ERROR
-+        );
-+    }
-+
-+    /**
-+     * Login the user
-+     *
-+     * @param string $customerId Customer to mark as logged in for the session
-+     * @return void
-+     */
-+    protected function login($customerId)
-+    {
-+        /** @var Session $session */
-+        $session = $this->_objectManager->get(Session::class);
-+        $session->loginById($customerId);
-+    }
-+
-+    /**
-+     * @param bool $invalidData
-+     * @return void
-+     */
-+    private function prepareRequestData($invalidData = false)
-+    {
-+        $orderId = 100000001;
-+        $email = $invalidData ? 'wrong@example.com' : 'customer@null.com';
-+
-+        /** @var FormKey $formKey */
-+        $formKey = $this->_objectManager->get(FormKey::class);
-+        $post = [
-+            'oar_order_id' => $orderId,
-+            'oar_billing_lastname' => 'lastname',
-+            'oar_type' => 'email',
-+            'oar_email' => $email,
-+            'oar_zip' => '',
-+            'form_key' => $formKey->getFormKey(),
-+        ];
-+
-+        $this->getRequest()->setMethod(Request::METHOD_POST);
-+        $this->getRequest()->setPostValue($post);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php b/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php
-new file mode 100644
-index 00000000000..7800d2363b3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\CustomerData;
-+
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Customer\Model\Session;
-+
-+/**
-+ * @magentoAppIsolation enabled
-+ */
-+class LastOrderedItemsTest extends TestCase
-+{
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    public function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Sales/_files/order_with_customer_and_multiple_order_items.php
-+     */
-+    public function testDefaultFormatterIsAppliedWhenBasicIntegration()
-+    {
-+        /** @var Session $customerSession */
-+        $customerSession = $this->objectManager->get(Session::class);
-+        $customerSession->loginById(1);
-+
-+        /** @var LastOrderedItems $customerDataSectionSource */
-+        $customerDataSectionSource = $this->objectManager->get(LastOrderedItems::class);
-+        $data = $customerDataSectionSource->getSectionData();
-+        $this->assertEquals(
-+            LastOrderedItems::SIDEBAR_ORDER_LIMIT,
-+            count($data['items']),
-+            'Section items count should not be greater then ' . LastOrderedItems::SIDEBAR_ORDER_LIMIT
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Address/RendererTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Address/RendererTest.php
-index 1bad0eec7d1..d9c38d5697d 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Address/RendererTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Address/RendererTest.php
-@@ -36,6 +36,9 @@ class RendererTest extends \PHPUnit\Framework\TestCase
-      */
-     private $config;
- 
-+    /**
-+     * Set up
-+     */
-     protected function setUp()
-     {
-         $this->objectManager = Bootstrap::getObjectManager();
-@@ -46,7 +49,7 @@ class RendererTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @magentoDataFixture Magento/Sales/_files/order_fixture_store.php
--     * @magentoDbIsolation enabled
-+     * @magentoDbIsolation disabled
-      * @magentoAppIsolation enabled
-      */
-     public function testFormat()
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/AddressRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/AddressRepositoryTest.php
-index 7a38c146850..deb4e09009d 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/AddressRepositoryTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/AddressRepositoryTest.php
-@@ -3,19 +3,23 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Sales\Model\Order;
- 
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Sales\Api\Data\OrderAddressInterface;
-+use Magento\Sales\Api\OrderAddressRepositoryInterface;
- use Magento\TestFramework\Helper\Bootstrap;
- use Magento\Framework\Api\FilterBuilder;
- use Magento\Framework\Api\SearchCriteriaBuilder;
- use Magento\Framework\Api\SortOrderBuilder;
-+use PHPUnit\Framework\TestCase;
- 
- /**
-  * Class AddressRepositoryTest
-- * @package Magento\Sales\Model\Order]
-- * @magentoDbIsolation enabled
-  */
--class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-+class AddressRepositoryTest extends TestCase
- {
-     /** @var AddressRepository */
-     protected $repository;
-@@ -29,25 +33,28 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-     /** @var SearchCriteriaBuilder */
-     private $searchCriteriaBuilder;
- 
-+    /** @var ObjectManagerInterface */
-+    private $objectManager;
-+
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
--        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
--        $this->repository = $objectManager->create(AddressRepository::class);
--        $this->searchCriteriaBuilder = $objectManager->create(
--            \Magento\Framework\Api\SearchCriteriaBuilder::class
--        );
--        $this->filterBuilder = $objectManager->get(
--            \Magento\Framework\Api\FilterBuilder::class
--        );
--        $this->sortOrderBuilder = $objectManager->get(
--            \Magento\Framework\Api\SortOrderBuilder::class
--        );
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->repository = $this->objectManager->get(AddressRepository::class);
-+        $this->searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
-+        $this->filterBuilder = $this->objectManager->get(FilterBuilder::class);
-+        $this->sortOrderBuilder = $this->objectManager->get(SortOrderBuilder::class);
-     }
- 
-     /**
-+     * Test for get list with multiple filters and sorting
-+     *
-+     * @return void
-      * @magentoDataFixture Magento/Sales/_files/address_list.php
-      */
--    public function testGetListWithMultipleFiltersAndSorting()
-+    public function testGetListWithMultipleFiltersAndSorting(): void
-     {
-         $filter1 = $this->filterBuilder
-             ->setField('postcode')
-@@ -78,4 +85,23 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals('ZX0789', array_shift($items)->getPostcode());
-         $this->assertEquals('47676', array_shift($items)->getPostcode());
-     }
-+
-+    /**
-+     * Test for formatting custom sales address multi-attribute
-+     *
-+     * @return void
-+     * @magentoDataFixture Magento/Sales/_files/order_address_with_multi_attribute.php
-+     */
-+    public function testFormatSalesAddressCustomMultiAttribute(): void
-+    {
-+        $address = $this->objectManager->get(OrderAddressInterface::class)
-+            ->load('multiattribute@example.com', 'email');
-+        $address->setData('fixture_address_multiselect_attribute', ['dog', 'cat']);
-+        $address->setData('fixture_address_multiline_attribute', ['dog', 'cat']);
-+
-+        $this->objectManager->get(OrderAddressRepositoryInterface::class)
-+            ->save($address);
-+        $this->assertEquals('dog,cat', $address->getData('fixture_address_multiselect_attribute'));
-+        $this->assertEquals('dog'.PHP_EOL.'cat', $address->getData('fixture_address_multiline_attribute'));
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php
-new file mode 100644
-index 00000000000..b1c9b22772c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Model\Order;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\ObjectManager;
-+
-+/**
-+ * Test class for \Magento\Sales\Model\Order\Config
-+ */
-+class ConfigTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var Config
-+     */
-+    private $orderConfig;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->orderConfig = $this->objectManager->create(Config::class);
-+    }
-+
-+    /**
-+     * Correct display of the list of "Order States" after assigning
-+     * the state "complete" to a custom order status.
-+     *
-+     * @magentoDataFixture Magento/Sales/_files/order_status_assign_state_complete.php
-+     */
-+    public function testCorrectCompleteStatusInStatesList()
-+    {
-+        $allStates = $this->orderConfig->getStates();
-+        /** @var Status $completeStatus */
-+        $completeStatus = $this->objectManager->create(Status::class)
-+            ->load(\Magento\Sales\Model\Order::STATE_COMPLETE);
-+        $completeState = $allStates[$completeStatus->getStatus()];
-+
-+        $this->assertEquals($completeStatus->getLabel(), $completeState->getText());
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php
-new file mode 100644
-index 00000000000..1035ce15923
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php
-@@ -0,0 +1,100 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Model\Order;
-+
-+use Magento\Checkout\Model\Session as CheckoutSession;
-+use Magento\Framework\Data\Form\FormKey;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Quote\Api\GuestCartManagementInterface;
-+use Magento\Quote\Model\Quote;
-+use Magento\Quote\Model\QuoteIdMask;
-+use Magento\Quote\Model\QuoteIdMaskFactory;
-+use Magento\Sales\Model\OrderRepository;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
-+use PHPUnit\Framework\Constraint\StringContains;
-+
-+/**
-+ * Class verifies order creation.
-+ *
-+ * @magentoDbIsolation enabled
-+ * @magentoAppArea frontend
-+ */
-+class CreateTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var TransportBuilderMock
-+     */
-+    private $transportBuilder;
-+
-+    /**
-+     * @var QuoteIdMaskFactory
-+     */
-+    private $quoteIdMaskFactory;
-+
-+    /**
-+     * @var FormKey
-+     */
-+    private $formKey;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->transportBuilder = $this->objectManager->get(TransportBuilderMock::class);
-+        $this->quoteIdMaskFactory = $this->objectManager->get(QuoteIdMaskFactory::class);
-+        $this->formKey = $this->objectManager->get(FormKey::class);
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-+     * @return void
-+     */
-+    public function testSendEmailOnOrderPlace(): void
-+    {
-+        /** @var Quote $quote */
-+        $quote = $this->objectManager->create(Quote::class);
-+        $quote->load('guest_quote', 'reserved_order_id');
-+
-+        $checkoutSession = $this->objectManager->get(CheckoutSession::class);
-+        $checkoutSession->setQuoteId($quote->getId());
-+
-+        /** @var QuoteIdMask $quoteIdMask */
-+        $quoteIdMask = $this->quoteIdMaskFactory->create();
-+        $quoteIdMask->load($quote->getId(), 'quote_id');
-+        $cartId = $quoteIdMask->getMaskedId();
-+
-+        /** @var GuestCartManagementInterface $cartManagement */
-+        $cartManagement = $this->objectManager->get(GuestCartManagementInterface::class);
-+        $orderId = $cartManagement->placeOrder($cartId);
-+        $order = $this->objectManager->get(OrderRepository::class)->get($orderId);
-+
-+        $message = $this->transportBuilder->getSentMessage();
-+        $subject = __('Your %1 order confirmation', $order->getStore()->getFrontendName())->render();
-+        $assert = $this->logicalAnd(
-+            new StringContains($order->getBillingAddress()->getName()),
-+            new StringContains(
-+                'Thank you for your order from ' . $order->getStore()->getFrontendName()
-+            ),
-+            new StringContains(
-+                "Your Order <span class=\"no-link\">#{$order->getIncrementId()}</span>"
-+            )
-+        );
-+
-+        $this->assertEquals($message->getSubject(), $subject);
-+        $this->assertThat($message->getRawMessage(), $assert);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentDocumentFactoryTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentDocumentFactoryTest.php
-new file mode 100644
-index 00000000000..7f0ec2ae92f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentDocumentFactoryTest.php
-@@ -0,0 +1,80 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Model\Order;
-+
-+use Magento\Sales\Api\Data\ShipmentCreationArgumentsExtensionInterfaceFactory;
-+use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Provide tests for shipment document factory.
-+ */
-+class ShipmentDocumentFactoryTest extends TestCase
-+{
-+    /**
-+     * @var Order
-+     */
-+    private $order;
-+
-+    /**
-+     * @var ShipmentDocumentFactory
-+     */
-+    private $shipmentDocumentFactory;
-+
-+    /**
-+     * @var ShipmentCreationArgumentsInterface
-+     */
-+    private $shipmentCreationArgumentsInterface;
-+
-+    /**
-+     * @var ShipmentCreationArgumentsExtensionInterfaceFactory
-+     */
-+    private $shipmentCreationArgumentsExtensionInterfaceFactory;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp(): void
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+
-+        $this->order = $objectManager->create(Order::class);
-+        $this->shipmentDocumentFactory = $objectManager->create(ShipmentDocumentFactory::class);
-+        $this->shipmentCreationArgumentsInterface = $objectManager
-+            ->create(ShipmentCreationArgumentsInterface::class);
-+        $this->shipmentCreationArgumentsExtensionInterfaceFactory = $objectManager
-+            ->create(ShipmentCreationArgumentsExtensionInterfaceFactory::class);
-+    }
-+
-+    /**
-+     * Create shipment with shipment creation arguments.
-+     *
-+     * @magentoDataFixture Magento/Sales/_files/order.php
-+     */
-+    public function testCreate(): void
-+    {
-+        $order = $this->order->loadByIncrementId('100000001');
-+        $argumentsExtensionAttributes = $this->shipmentCreationArgumentsExtensionInterfaceFactory->create([
-+            'data' => ['test_attribute_value' => 'test_value']
-+        ]);
-+        $this->shipmentCreationArgumentsInterface->setExtensionAttributes($argumentsExtensionAttributes);
-+        $shipment = $this->shipmentDocumentFactory->create(
-+            $order,
-+            [],
-+            [],
-+            null,
-+            false,
-+            [],
-+            $this->shipmentCreationArgumentsInterface
-+        );
-+        $shipmentExtensionAttributes = $shipment->getExtensionAttributes();
-+        self::assertEquals('test_value', $shipmentExtensionAttributes->getTestAttributeValue());
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php
-index 0679fc6ffe6..1d04a79ae3f 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php
-@@ -90,10 +90,11 @@ class ShipmentTest extends \PHPUnit\Framework\TestCase
-             $items[$item->getId()] = $item->getQtyOrdered();
-         }
-         /** @var \Magento\Sales\Model\Order\Shipment $shipment */
--        $shipment = $this->objectManager->get(ShipmentFactory::class)->create($order, $items);
-+        $shipment = $this->objectManager->get(ShipmentFactory::class)
-+            ->create($order, $items);
-         $shipment->addTrack($track);
--        $shipment->save();
--        $saved = $this->shipmentRepository->save($shipment);
-+        $this->shipmentRepository->save($shipment);
-+        $saved = $this->shipmentRepository->get((int)$shipment->getEntityId());
-         self::assertNotEmpty($saved->getTracks());
-     }
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Grid/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Grid/CollectionTest.php
-new file mode 100644
-index 00000000000..1649706a51f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Grid/CollectionTest.php
-@@ -0,0 +1,45 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Model\ResourceModel\Order\Grid;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+class CollectionTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * Tests collection properties.
-+     *
-+     * @throws \ReflectionException
-+     * @return void
-+     */
-+    public function testCollectionCreate(): void
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+
-+        /** @var Collection $gridCollection */
-+        $gridCollection = $objectManager->get(Collection::class);
-+        $tableDescription = $gridCollection->getConnection()
-+            ->describeTable($gridCollection->getMainTable());
-+
-+        $mapper = new \ReflectionMethod(
-+            Collection::class,
-+            '_getMapper'
-+        );
-+        $mapper->setAccessible(true);
-+        $map = $mapper->invoke($gridCollection);
-+
-+        self::assertInternalType('array', $map);
-+        self::assertArrayHasKey('fields', $map);
-+        self::assertInternalType('array', $map['fields']);
-+        self::assertCount(count($tableDescription), $map['fields']);
-+
-+        foreach ($map['fields'] as $mappedName) {
-+            self::assertContains('main_table.', $mappedName);
-+        }
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Service/InvoiceServiceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/InvoiceServiceTest.php
-new file mode 100644
-index 00000000000..c9a2c065b0c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/InvoiceServiceTest.php
-@@ -0,0 +1,186 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sales\Model\Service;
-+
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Tests \Magento\Sales\Model\Service\InvoiceService
-+ */
-+class InvoiceServiceTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var InvoiceService
-+     */
-+    private $invoiceService;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->invoiceService = Bootstrap::getObjectManager()->create(InvoiceService::class);
-+    }
-+
-+    /**
-+     * @param int $invoiceQty
-+     * @magentoDataFixture Magento/Sales/_files/order_configurable_product.php
-+     * @return void
-+     * @dataProvider prepareInvoiceConfigurableProductDataProvider
-+     */
-+    public function testPrepareInvoiceConfigurableProduct(int $invoiceQty): void
-+    {
-+        /** @var OrderInterface $order */
-+        $order = Bootstrap::getObjectManager()->create(Order::class)->load('100000001', 'increment_id');
-+        $orderItems = $order->getItems();
-+        foreach ($orderItems as $orderItem) {
-+            if ($orderItem->getParentItemId()) {
-+                $parentItemId = $orderItem->getParentItemId();
-+            }
-+        }
-+        $invoice = $this->invoiceService->prepareInvoice($order, [$parentItemId => $invoiceQty]);
-+        $invoiceItems = $invoice->getItems();
-+        foreach ($invoiceItems as $invoiceItem) {
-+            $this->assertEquals($invoiceQty, $invoiceItem->getQty());
-+        }
-+    }
-+
-+    public function prepareInvoiceConfigurableProductDataProvider()
-+    {
-+        return [
-+            'full invoice' => [2],
-+            'partial invoice' => [1]
-+        ];
-+    }
-+
-+    /**
-+     * @param int $invoiceQty
-+     * @magentoDataFixture Magento/Sales/_files/order.php
-+     * @return void
-+     * @dataProvider prepareInvoiceSimpleProductDataProvider
-+     */
-+    public function testPrepareInvoiceSimpleProduct(int $invoiceQty): void
-+    {
-+        /** @var OrderInterface $order */
-+        $order = Bootstrap::getObjectManager()->create(Order::class)->load('100000001', 'increment_id');
-+        $orderItems = $order->getItems();
-+        $invoiceQtys = [];
-+        foreach ($orderItems as $orderItem) {
-+            $invoiceQtys[$orderItem->getItemId()] = $invoiceQty;
-+        }
-+        $invoice = $this->invoiceService->prepareInvoice($order, $invoiceQtys);
-+        $invoiceItems = $invoice->getItems();
-+        foreach ($invoiceItems as $invoiceItem) {
-+            $this->assertEquals($invoiceQty, $invoiceItem->getQty());
-+        }
-+    }
-+
-+    public function prepareInvoiceSimpleProductDataProvider()
-+    {
-+        return [
-+            'full invoice' => [2],
-+            'partial invoice' => [1]
-+        ];
-+    }
-+
-+    /**
-+     * Checks if ordered and invoiced qty of bundle product does match.
-+     *
-+     * @param array $qtyToInvoice
-+     * @param array $qtyInvoiced
-+     * @param string $errorMsg
-+     * @return void
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @magentoDataFixture Magento/Sales/_files/order_with_bundle.php
-+     * @dataProvider bundleProductQtyOrderedDataProvider
-+     */
-+    public function testPrepareInvoiceBundleProduct(
-+        array $qtyToInvoice,
-+        array $qtyInvoiced,
-+        string $errorMsg
-+    ): void {
-+        /** @var Order $order */
-+        $order = Bootstrap::getObjectManager()->create(Order::class)
-+            ->load('100000001', 'increment_id');
-+
-+        $predefinedQtyToInvoice = $this->getPredefinedQtyToInvoice($order, $qtyToInvoice);
-+        $invoice = $this->invoiceService->prepareInvoice($order, $predefinedQtyToInvoice);
-+
-+        foreach ($invoice->getItems() as $invoiceItem) {
-+            if (isset($qtyInvoiced[$invoiceItem->getSku()])) {
-+                $this->assertEquals(
-+                    $qtyInvoiced[$invoiceItem->getSku()],
-+                    $invoiceItem->getQty(),
-+                    sprintf($errorMsg, $invoiceItem->getSku())
-+                );
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Data provider for invoice creation with and w/o predefined qty to invoice.
-+     *
-+     * @return array
-+     */
-+    public function bundleProductQtyOrderedDataProvider(): array
-+    {
-+        return [
-+            'Create invoice w/o predefined qty' => [
-+                'Qty to invoice' => [],
-+                'Qty ordered' => [
-+                    'bundle_1' => 2,
-+                    'bundle_simple_1' => 10,
-+                ],
-+                'Error msg' => 'Invoiced qty for product %s does not match.',
-+            ],
-+            'Create invoice with predefined qty' => [
-+                'Qty to invoice' => [
-+                    'bundle_1' => 2,
-+                    'bundle_simple_1' => 10,
-+                ],
-+                'Qty ordered' => [
-+                    'bundle_1' => 2,
-+                    'bundle_simple_1' => 10,
-+                ],
-+                'Error msg' => 'Invoiced qty for product %s does not match.',
-+            ],
-+            'Create invoice with partial predefined qty for bundle' => [
-+                'Qty to invoice' => [
-+                    'bundle_1' => 1,
-+                ],
-+                'Qty ordered' => [
-+                    'bundle_1' => 1,
-+                    'bundle_simple_1' => 5,
-+                ],
-+                'Error msg' => 'Invoiced qty for product %s does not match.',
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Associate product qty to invoice to order item id.
-+     *
-+     * @param Order $order
-+     * @param array $qtyToInvoice
-+     * @return array
-+     */
-+    private function getPredefinedQtyToInvoice(Order $order, array $qtyToInvoice): array
-+    {
-+        $predefinedQtyToInvoice = [];
-+
-+        foreach ($order->getAllItems() as $orderItem) {
-+            if (array_key_exists($orderItem->getSku(), $qtyToInvoice)) {
-+                $predefinedQtyToInvoice[$orderItem->getId()] = $qtyToInvoice[$orderItem->getSku()];
-+            }
-+        }
-+
-+        return $predefinedQtyToInvoice;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php
-new file mode 100644
-index 00000000000..1d03170d5b1
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php
-@@ -0,0 +1,71 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+
-+require __DIR__ . '/address_list.php';
-+
-+\Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea(\Magento\Framework\App\Area::AREA_FRONTEND);
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+/** @var ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-+
-+/** @var \Magento\Catalog\Model\Product $product */
-+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-+$product->setTypeId('simple')
-+    ->setAttributeSetId($product->getDefaultAttributeSetId())
-+    ->setName('Simple Product')
-+    ->setSku('simple-product-guest-quote')
-+    ->setPrice(10)
-+    ->setTaxClassId(0)
-+    ->setMetaTitle('meta title')
-+    ->setMetaKeyword('meta keyword')
-+    ->setMetaDescription('meta description')
-+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-+    ->setStockData(
-+        [
-+            'qty' => 100,
-+            'is_in_stock' => 1,
-+        ]
-+    )->save();
-+$product = $productRepository->get('simple-product-guest-quote');
-+
-+$addressData = reset($addresses);
-+
-+$billingAddress = $objectManager->create(
-+    \Magento\Quote\Model\Quote\Address::class,
-+    ['data' => $addressData]
-+);
-+$billingAddress->setAddressType('billing');
-+
-+$shippingAddress = clone $billingAddress;
-+$shippingAddress->setId(null)->setAddressType('shipping');
-+
-+$store = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore();
-+
-+/** @var \Magento\Quote\Model\Quote $quote */
-+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
-+$quote->setCustomerIsGuest(true)
-+    ->setStoreId($store->getId())
-+    ->setReservedOrderId('guest_quote')
-+    ->setBillingAddress($billingAddress)
-+    ->setShippingAddress($shippingAddress)
-+    ->addProduct($product);
-+$quote->getPayment()->setMethod('checkmo');
-+$quote->getShippingAddress()->setShippingMethod('flatrate_flatrate')->setCollectShippingRates(true);
-+$quote->collectTotals();
-+
-+$quoteRepository = $objectManager->create(\Magento\Quote\Api\CartRepositoryInterface::class);
-+$quoteRepository->save($quote);
-+
-+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
-+$quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)->create();
-+$quoteIdMask->setQuoteId($quote->getId());
-+$quoteIdMask->setDataChanges(true);
-+$quoteIdMask->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses_rollback.php
-new file mode 100644
-index 00000000000..e8992aec3c9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses_rollback.php
-@@ -0,0 +1,43 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+$registry = $objectManager->get(\Magento\Framework\Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var $quote \Magento\Quote\Model\Quote */
-+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
-+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
-+$quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMask::class);
-+
-+$quote->load('guest_quote', 'reserved_order_id');
-+
-+$quoteId = $quote->getId();
-+if (null !== $quoteId) {
-+    $quote->delete();
-+    $quoteIdMask->delete($quoteId);
-+}
-+
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+
-+try {
-+    $product = $productRepository->get('simple-product-guest-quote', false, null, true);
-+    $productRepository->delete($product);
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-+    //Product already removed
-+}
-+
-+/** @var \Magento\CatalogInventory\Model\StockRegistryStorage $stockRegistryStorage */
-+$stockRegistryStorage = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+    ->get(\Magento\CatalogInventory\Model\StockRegistryStorage::class);
-+$stockRegistryStorage->clean();
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
-index a1c5f827776..6b9cf3bc613 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
-@@ -44,7 +44,8 @@ $orderItem->setProductId($product->getId())
-     ->setBasePrice($product->getPrice())
-     ->setPrice($product->getPrice())
-     ->setRowTotal($product->getPrice())
--    ->setProductType('simple');
-+    ->setProductType('simple')
-+    ->setName($product->getName());
- 
- /** @var Order $order */
- $order = $objectManager->create(Order::class);
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute.php
-new file mode 100644
-index 00000000000..be454aef872
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute.php
-@@ -0,0 +1,100 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Eav\Model\Config;
-+use Magento\Eav\Model\Entity\Attribute\Set;
-+use Magento\Customer\Model\Attribute;
-+use Magento\Eav\Model\Entity\Type;
-+use Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend;
-+use Magento\Sales\Model\Order\Address;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+$addressData = [
-+    'region' => 'CA',
-+    'region_id' => '12',
-+    'postcode' => '11111',
-+    'lastname' => 'lastname',
-+    'firstname' => 'firstname',
-+    'street' => 'street',
-+    'city' => 'Los Angeles',
-+    'email' => 'multiattribute@example.com',
-+    'telephone' => '2222222',
-+    'country_id' => 'US'
-+];
-+
-+/** @var $entityType Type */
-+$entityType = $objectManager->get(Config::class)
-+    ->getEntityType('customer_address');
-+/** @var $attributeSet Set */
-+$attributeSet = $objectManager->get(Set::class);
-+
-+$attributeMultiselect = $objectManager->create(
-+    Attribute::class,
-+    [
-+        'data' => [
-+            'frontend_input' => 'multiselect',
-+            'frontend_label' => ['Multiselect Attribute'],
-+            'sort_order' => '0',
-+            'backend_type' => 'varchar',
-+            'is_user_defined' => 1,
-+            'is_system' => 0,
-+            'is_required' => '0',
-+            'is_visible' => '0',
-+            'attribute_set_id' => $entityType->getDefaultAttributeSetId(),
-+            'attribute_group_id' => $attributeSet->getDefaultGroupId($entityType->getDefaultAttributeSetId()),
-+            'entity_type_id' => $entityType->getId(),
-+            'backend_model' => ArrayBackend::class,
-+            'used_in_forms' => ['customer_register_address'],
-+            'option' => [
-+                'value' => [
-+                    'dog' => ['Dog'],
-+                    'cat' => ['Cat'],
-+                ],
-+                'order' => [
-+                    'dog' => 1,
-+                    'cat' => 2,
-+                ],
-+            ],
-+        ]
-+    ]
-+);
-+
-+$attributeMultiselect->setAttributeCode('fixture_address_multiselect_attribute');
-+$attributeMultiselect->save();
-+
-+$attributeMultiline = $objectManager->create(
-+    Attribute::class,
-+    [
-+        'data' => [
-+            'frontend_input' => 'multiline',
-+            'frontend_label' => ['Multiline Attribute'],
-+            'multiline_count' => 2,
-+            'sort_order' => '0',
-+            'backend_type' => 'varchar',
-+            'is_user_defined' => 1,
-+            'is_system' => 0,
-+            'is_required' => '0',
-+            'is_visible' => '0',
-+            'attribute_set_id' => $entityType->getDefaultAttributeSetId(),
-+            'attribute_group_id' => $attributeSet->getDefaultGroupId($entityType->getDefaultAttributeSetId()),
-+            'entity_type_id' => $entityType->getId(),
-+            'backend_model' => ArrayBackend::class,
-+            'used_in_forms' => ['customer_register_address'],
-+        ]
-+    ]
-+);
-+
-+$attributeMultiline->setAttributeCode('fixture_address_multiline_attribute');
-+$attributeMultiline->save();
-+
-+$billingAddress = $objectManager->create(
-+    Address::class,
-+    ['data' => $addressData]
-+);
-+$billingAddress->setAddressType('billing');
-+$billingAddress->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute_rollback.php
-new file mode 100644
-index 00000000000..28e5fb2f818
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute_rollback.php
-@@ -0,0 +1,62 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Api\FilterBuilder;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Sales\Api\OrderAddressRepositoryInterface;
-+use Magento\Sales\Api\Data\OrderAddressInterface;
-+use Magento\Eav\Api\AttributeRepositoryInterface;
-+
-+$attributeCodes = [
-+    'fixture_address_multiselect_attribute',
-+    'fixture_address_multiline_attribute',
-+];
-+$eavConfigType = 'customer_address';
-+
-+$objectManager = Bootstrap::getObjectManager();
-+/** @var OrderAddressRepositoryInterface $salesAddressRepository */
-+$salesAddressRepository = $objectManager->get(OrderAddressRepositoryInterface::class);
-+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
-+/** @var FilterBuilder $filterBuilder */
-+$filterBuilder = $objectManager->get(FilterBuilder::class);
-+$filters = [
-+    $filterBuilder->setField(OrderAddressInterface::EMAIL)
-+        ->setValue('multiattribute@example.com')
-+        ->create(),
-+];
-+$searchCriteria = $searchCriteriaBuilder->addFilters($filters)
-+    ->create();
-+$saleAddresses = $salesAddressRepository->getList($searchCriteria)
-+    ->getItems();
-+foreach ($saleAddresses as $saleAddress) {
-+    $salesAddressRepository->delete($saleAddress);
-+}
-+
-+/** @var AttributeRepositoryInterface $attributerepository */
-+$attributeRepository = $objectManager->get(AttributeRepositoryInterface::class);
-+/** @var FilterBuilder $filterBuilder */
-+$filterBuilder = $objectManager->get(FilterBuilder::class);
-+$filters = [
-+    $filterBuilder->setField('attribute_code')
-+        ->setValue(
-+            [
-+                'fixture_address_multiline_attribute',
-+                'fixture_address_multiselect_attribute',
-+            ]
-+        )
-+        ->setConditionType('IN')
-+        ->create(),
-+];
-+$searchCriteria = $searchCriteriaBuilder->addFilters($filters)
-+    ->create();
-+$attributes = $attributeRepository->getList($eavConfigType, $searchCriteria)
-+    ->getItems();
-+foreach ($attributes as $attribute) {
-+    $attributeRepository->delete($attribute);
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_item_with_configurable_for_reorder.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_item_with_configurable_for_reorder.php
-index 67f80ca9b2d..8f25b066fa3 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_item_with_configurable_for_reorder.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_item_with_configurable_for_reorder.php
-@@ -7,10 +7,11 @@
- use Magento\Catalog\Api\ProductRepositoryInterface;
- use Magento\Catalog\Model\ProductRepository;
- 
-+// phpcs:ignore Magento2.Security.IncludeFile
- require __DIR__ . '/../../../Magento/ConfigurableProduct/_files/product_configurable.php';
- 
- $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
--
-+// phpcs:ignore Magento2.Security.IncludeFile
- $addressData = include __DIR__ . '/../../../Magento/Sales/_files/address_data.php';
- 
- $billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
-@@ -62,6 +63,8 @@ $orderItem->setRowTotal($product->getPrice());
- $orderItem->setProductType($product->getTypeId());
- $orderItem->setProductOptions(['info_buyRequest' => $requestInfo]);
- $orderItemSimple->setProductId($simpleProduct->getId());
-+$orderItem->setName($product->getName());
-+$orderItem->setSku($simpleProduct->getSku());
- $orderItemSimple->setParentItem($orderItem);
- $orderItemSimple->setStoreId(0);
- $orderItemSimple->setProductType($simpleProduct->getTypeId());
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
-index 43e98419798..99122d72df4 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
-@@ -5,7 +5,11 @@
-  */
- 
- use Magento\Sales\Model\Order;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\Order\Address as OrderAddress;
-+use Magento\Sales\Model\Order\Payment;
- 
-+// phpcs:ignore Magento2.Security.IncludeFile
- require 'order.php';
- /** @var Order $order */
- /** @var  Order\Payment $payment */
-@@ -21,8 +25,7 @@ $orders = [
-         'subtotal' => 120.00,
-         'base_grand_total' => 120.00,
-         'store_id' => 1,
--        'website_id' => 1,
--        'payment' => $payment
-+        'website_id' => 1
-     ],
-     [
-         'increment_id' => '100000003',
-@@ -32,8 +35,7 @@ $orders = [
-         'base_grand_total' => 140.00,
-         'subtotal' => 140.00,
-         'store_id' => 0,
--        'website_id' => 0,
--        'payment' => $payment
-+        'website_id' => 0
-     ],
-     [
-         'increment_id' => '100000004',
-@@ -43,21 +45,49 @@ $orders = [
-         'base_grand_total' => 140.00,
-         'subtotal' => 140.00,
-         'store_id' => 1,
--        'website_id' => 1,
--        'payment' => $payment
-+        'website_id' => 1
-     ],
- ];
- 
-+$orderList = [];
-+/** @var OrderRepositoryInterface $orderRepository */
-+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
- /** @var array $orderData */
- foreach ($orders as $orderData) {
-     /** @var $order \Magento\Sales\Model\Order */
-     $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-         \Magento\Sales\Model\Order::class
-     );
-+
-+    // Reset addresses
-+    /** @var Order\Address $billingAddress */
-+    $billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]);
-+    $billingAddress->setAddressType('billing');
-+
-+    $shippingAddress = clone $billingAddress;
-+    $shippingAddress->setId(null)->setAddressType('shipping');
-+
-+    /** @var Payment $payment */
-+    $payment = $objectManager->create(Payment::class);
-+    $payment->setMethod('checkmo')
-+        ->setAdditionalInformation('last_trans_id', '11122')
-+        ->setAdditionalInformation(
-+            'metadata',
-+            [
-+                'type' => 'free',
-+                'fraudulent' => false,
-+            ]
-+        );
-+
-     $order
-         ->setData($orderData)
-         ->addItem($orderItem)
-+        ->setCustomerIsGuest(true)
-+        ->setCustomerEmail('customer@null.com')
-         ->setBillingAddress($billingAddress)
--        ->setBillingAddress($shippingAddress)
--        ->save();
-+        ->setShippingAddress($shippingAddress)
-+        ->setPayment($payment);
-+
-+    $orderRepository->save($order);
-+    $orderList[] = $order;
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_rollback.php
-index aae4a557ba1..6e24cee501f 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_rollback.php
-@@ -4,6 +4,4 @@
-  * See COPYING.txt for license details.
-  */
- 
--use Magento\Sales\Model\Order;
--
- require 'default_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax.php
-new file mode 100644
-index 00000000000..48f6ccfead2
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax.php
-@@ -0,0 +1,55 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Model\Order\Tax\ItemFactory;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Tax\Model\Sales\Order\TaxFactory;
-+
-+require 'default_rollback.php';
-+require 'order_list.php';
-+
-+/** @var array $orderList */
-+foreach ($orderList as $order) {
-+    $amount = 45;
-+    $taxFactory = $objectManager->create(TaxFactory::class);
-+
-+    /** @var \Magento\Tax\Model\Sales\Order\Tax  $tax */
-+    $tax = $taxFactory->create();
-+    $tax->setOrderId($order->getId())
-+        ->setCode('US-NY-*-Rate 1')
-+        ->setTitle('US-NY-*-Rate 1')
-+        ->setPercent(8.37)
-+        ->setAmount($amount)
-+        ->setBaseAmount($amount)
-+        ->setBaseRealAmount($amount);
-+    $tax->save();
-+
-+    $salesOrderFactory = $objectManager->create(ItemFactory::class);
-+
-+    /** @var \Magento\Sales\Model\Order\Tax\Item $salesOrderItem */
-+    $salesOrderItem = $salesOrderFactory->create();
-+    $salesOrderItem->setOrderId($order->getId())
-+        ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
-+        ->setProductOptions([]);
-+    $salesCollection = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Item::class);
-+    $salesCollection->save($salesOrderItem);
-+
-+    /** @var \Magento\Sales\Model\Order\Tax\Item $salesOrderItem */
-+    $salesOrderTaxItem = $salesOrderFactory->create();
-+    $salesOrderTaxItem->setTaxId($tax->getId())
-+        ->setTaxPercent(8.37)
-+        ->setTaxAmount($amount)
-+        ->setBaseAmount($amount)
-+        ->setRealAmount($amount)
-+        ->setRealBaseAmount($amount)
-+        ->setAppliedTaxes([$tax])
-+        ->setTaxableItemType('shipping')
-+        ->setItemId($salesOrderItem->getId());
-+
-+    $taxItemCollection = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Tax\Item::class);
-+    $taxItemCollection->save($salesOrderTaxItem);
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax_rollback.php
-new file mode 100644
-index 00000000000..dd52deab825
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require 'order_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete.php
-new file mode 100644
-index 00000000000..4f217603678
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete.php
-@@ -0,0 +1,18 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Model\Order\Status;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var Status $orderStatus */
-+$orderStatus = Bootstrap::getObjectManager()->create(Status::class);
-+$data = [
-+    'status' => 'custom_complete',
-+    'label' => 'Custom Complete Status',
-+];
-+$orderStatus->setData($data)->save();
-+$orderStatus->assignState(\Magento\Sales\Model\Order::STATE_COMPLETE, false, true);
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete_rollback.php
-new file mode 100644
-index 00000000000..99187116db9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete_rollback.php
-@@ -0,0 +1,14 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Model\Order\Status;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var Status $orderStatus */
-+$orderStatus = Bootstrap::getObjectManager()->create(Status::class);
-+$orderStatus->load('custom_complete', 'status');
-+$orderStatus->delete();
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle.php
-new file mode 100644
-index 00000000000..a962548f7a9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle.php
-@@ -0,0 +1,87 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Api\Data\OrderItemInterface;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Item;
-+use Magento\TestFramework\ObjectManager;
-+
-+$objectManager = ObjectManager::getInstance();
-+
-+require 'order.php';
-+/** @var Order $order */
-+
-+$orderItems = [
-+    [
-+        OrderItemInterface::SKU => 'bundle_1',
-+        OrderItemInterface::NAME => 'bundle_1',
-+        OrderItemInterface::PRODUCT_ID => 2,
-+        OrderItemInterface::BASE_PRICE => 100,
-+        OrderItemInterface::ORDER_ID => $order->getId(),
-+        OrderItemInterface::QTY_ORDERED => 2,
-+        OrderItemInterface::PRICE => 100,
-+        OrderItemInterface::ROW_TOTAL => 102,
-+        OrderItemInterface::PRODUCT_TYPE => 'bundle',
-+        'product_options' => [
-+            'product_calculations' => 0,
-+            'info_buyRequest' => [
-+                'bundle_option' => [1 => 1],
-+                'bundle_option_qty' => 1,
-+            ]
-+        ],
-+        'children' => [
-+            [
-+                OrderItemInterface::SKU => 'bundle_simple_1',
-+                OrderItemInterface::NAME => 'bundle_simple_1',
-+                OrderItemInterface::PRODUCT_ID => 13,
-+                OrderItemInterface::ORDER_ID => $order->getId(),
-+                OrderItemInterface::QTY_ORDERED => 10,
-+                OrderItemInterface::BASE_PRICE => 90,
-+                OrderItemInterface::PRICE => 90,
-+                OrderItemInterface::ROW_TOTAL => 92,
-+                OrderItemInterface::PRODUCT_TYPE => 'simple',
-+                'product_options' => [
-+                    'bundle_selection_attributes' => '{"qty":5}',
-+                ],
-+            ],
-+        ],
-+    ],
-+];
-+
-+if (!function_exists('saveOrderItems')) {
-+    /**
-+     * Save Order Items.
-+     *
-+     * @param array $orderItems
-+     * @param Item|null $parentOrderItem [optional]
-+     * @return void
-+     */
-+    function saveOrderItems(array $orderItems, Order $order, $parentOrderItem = null)
-+    {
-+        $objectManager = ObjectManager::getInstance();
-+
-+        foreach ($orderItems as $orderItemData) {
-+            /** @var Item $orderItem */
-+            $orderItem = $objectManager->create(Item::class);
-+            if (null !== $parentOrderItem) {
-+                $orderItemData['parent_item'] = $parentOrderItem;
-+            }
-+            $orderItem->setData($orderItemData);
-+            $order->addItem($orderItem);
-+
-+            if (isset($orderItemData['children'])) {
-+                saveOrderItems($orderItemData['children'], $order, $orderItem);
-+            }
-+        }
-+    }
-+}
-+
-+saveOrderItems($orderItems, $order);
-+/** @var OrderRepositoryInterface $orderRepository */
-+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-+$order = $orderRepository->save($order);
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_rollback.php
-new file mode 100644
-index 00000000000..dd52deab825
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require 'order_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_and_multiple_order_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_and_multiple_order_items.php
-new file mode 100644
-index 00000000000..08c54844f27
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_and_multiple_order_items.php
-@@ -0,0 +1,13 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+include __DIR__ . '/order_with_multiple_items.php';
-+include __DIR__ . '/../../../Magento/Customer/_files/customer.php';
-+
-+$customerIdFromFixture = 1;
-+/** @var $order \Magento\Sales\Model\Order */
-+$order->setCustomerId($customerIdFromFixture)->setCustomerIsGuest(false)->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php
-new file mode 100644
-index 00000000000..29a7aa4d903
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php
-@@ -0,0 +1,73 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Address as OrderAddress;
-+use Magento\Sales\Model\Order\Item as OrderItem;
-+use Magento\Sales\Model\Order\Payment;
-+use Magento\Store\Model\StoreManagerInterface;
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
-+/** @var \Magento\Catalog\Model\Product $product */
-+
-+$addressData = include __DIR__ . '/address_data.php';
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+$billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]);
-+$billingAddress->setAddressType('billing');
-+
-+$shippingAddress = clone $billingAddress;
-+$shippingAddress->setId(null)->setAddressType('shipping');
-+
-+/** @var Payment $payment */
-+$payment = $objectManager->create(Payment::class);
-+$payment->setMethod('checkmo')
-+    ->setAdditionalInformation('last_trans_id', '11122')
-+    ->setAdditionalInformation(
-+        'metadata',
-+        [
-+            'type' => 'free',
-+            'fraudulent' => false,
-+        ]
-+    );
-+
-+/** @var OrderItem $orderItem */
-+$orderItem = $objectManager->create(OrderItem::class);
-+$orderItem->setProductId($product->getId())
-+    ->setQtyOrdered(2)
-+    ->setBasePrice($product->getPrice())
-+    ->setPrice($product->getPrice())
-+    ->setRowTotal($product->getPrice())
-+    ->setProductType('simple')
-+    ->setDiscountAmount(2)
-+    ->setBaseRowTotal($product->getPrice())
-+    ->setBaseDiscountAmount(2)
-+    ->setTaxAmount(1)
-+    ->setBaseTaxAmount(1);
-+
-+/** @var Order $order */
-+$order = $objectManager->create(Order::class);
-+$order->setIncrementId('100000001')
-+    ->setState(Order::STATE_PROCESSING)
-+    ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING))
-+    ->setSubtotal(100)
-+    ->setGrandTotal(100)
-+    ->setBaseSubtotal(100)
-+    ->setBaseGrandTotal(100)
-+    ->setCustomerIsGuest(true)
-+    ->setCustomerEmail('customer@null.com')
-+    ->setBillingAddress($billingAddress)
-+    ->setShippingAddress($shippingAddress)
-+    ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
-+    ->addItem($orderItem)
-+    ->setPayment($payment);
-+
-+/** @var OrderRepositoryInterface $orderRepository */
-+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
-+$orderRepository->save($order);
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount_rollback.php
-new file mode 100644
-index 00000000000..1fb4b4636ab
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require 'default_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php
-new file mode 100644
-index 00000000000..57ccffadaa4
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php
-@@ -0,0 +1,35 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Model\Order\Item as OrderItem;
-+
-+require __DIR__ . '/../../../Magento/Sales/_files/order.php';
-+/** @var \Magento\Catalog\Model\Product $product */
-+
-+/** @var OrderItem $orderItem */
-+$orderItem = $objectManager->create(OrderItem::class);
-+$orderItem->setProductId($product->getId())
-+    ->setQtyOrdered(2)
-+    ->setBasePrice($product->getPrice())
-+    ->setPrice($product->getPrice())
-+    ->setRowTotal($product->getPrice())
-+    ->setProductType('simple')
-+    ->setName($product->getName())
-+    ->setFreeShipping('1');
-+
-+/** @var Order $order */
-+$order->setShippingDescription('Flat Rate - Fixed')
-+    ->setShippingAmount(0)
-+    ->setCouponCode('1234567890')
-+    ->setDiscountDescription('1234567890')
-+    ->addItem($orderItem);
-+
-+/** @var OrderRepositoryInterface $orderRepository */
-+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
-+$orderRepository->save($order);
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_rollback.php
-new file mode 100644
-index 00000000000..1fb4b4636ab
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require 'default_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_invoice_and_custom_status.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_invoice_and_custom_status.php
-new file mode 100644
-index 00000000000..46d3fb547cd
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_invoice_and_custom_status.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Model\Order\Status;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+// phpcs:ignore Magento2.Security.IncludeFile
-+require 'invoice.php';
-+
-+$orderStatus = Bootstrap::getObjectManager()->create(Status::class);
-+$data = [
-+    'status' => 'custom_processing',
-+    'label' => 'Custom Processing Status',
-+];
-+$orderStatus->setData($data)->setStatus('custom_processing');
-+$orderStatus->save();
-+$orderStatus->assignState('processing');
-+
-+$order->setStatus('custom_processing');
-+$order->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_invoice_and_custom_status_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_invoice_and_custom_status_rollback.php
-new file mode 100644
-index 00000000000..274cb3c7439
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_invoice_and_custom_status_rollback.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Model\Order\Status;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+// phpcs:ignore Magento2.Security.IncludeFile
-+require 'default_rollback.php';
-+
-+/** @var Status $orderStatus */
-+$orderStatus = Bootstrap::getObjectManager()->create(Status::class);
-+$orderStatus->load('custom_processing', 'status');
-+$orderStatus->delete();
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_multiple_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_multiple_items.php
-new file mode 100644
-index 00000000000..ae0523d34fd
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_multiple_items.php
-@@ -0,0 +1,82 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require 'order.php';
-+/** @var \Magento\Catalog\Model\Product $product */
-+/** @var \Magento\Sales\Model\Order $order */
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
-+$orderItems[] = [
-+    'product_id' => $product->getId(),
-+    'base_price' => 123,
-+    'order_id' => $order->getId(),
-+    'price' => 123,
-+    'row_total' => 126,
-+    'product_type' => 'simple'
-+];
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_duplicated.php';
-+$orderItems[] = [
-+    'product_id' => $product->getId(),
-+    'base_price' => 123,
-+    'order_id' => $order->getId(),
-+    'price' => 123,
-+    'row_total' => 126,
-+    'product_type' => 'simple'
-+];
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_full_option_set.php';
-+$orderItems[] = [
-+    'product_id' => $product->getId(),
-+    'base_price' => 123,
-+    'order_id' => $order->getId(),
-+    'price' => 123,
-+    'row_total' => 126,
-+    'product_type' => 'simple'
-+];
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_url_key.php';
-+$orderItems[] = [
-+        'product_id' => $product->getId(),
-+        'base_price' => 123,
-+        'order_id' => $order->getId(),
-+        'price' => 123,
-+        'row_total' => 126,
-+        'product_type' => 'simple'
-+];
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_all_fields.php';
-+$orderItems[] = [
-+    'product_id' => $product->getId(),
-+    'base_price' => 123,
-+    'order_id' => $order->getId(),
-+    'price' => 123,
-+    'row_total' => 126,
-+    'product_type' => 'simple'
-+];
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_custom_attribute.php';
-+$orderItems[] = [
-+    'product_id' => $product->getId(),
-+    'base_price' => 123,
-+    'order_id' => $order->getId(),
-+    'price' => 123,
-+    'row_total' => 126,
-+    'product_type' => 'simple'
-+];
-+
-+/** @var array $orderItemData */
-+foreach ($orderItems as $orderItemData) {
-+    /** @var $orderItem \Magento\Sales\Model\Order\Item */
-+    $orderItem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+        \Magento\Sales\Model\Order\Item::class
-+    );
-+    $orderItem
-+        ->setData($orderItemData)
-+        ->save();
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
-index 4c892904b3c..61d8be98bdd 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
-@@ -44,5 +44,6 @@ foreach ($order->getItems() as $orderItem) {
-     $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
- }
- $shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items);
-+$shipment->register();
- 
- $transaction->addObject($invoice)->addObject($shipment)->addObject($order)->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax.php
-new file mode 100644
-index 00000000000..0c7dc522f57
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Model\Order\Tax\ItemFactory;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\Tax\Model\Sales\Order\TaxFactory;
-+
-+require 'default_rollback.php';
-+require 'order.php';
-+
-+$amount = 45;
-+$taxFactory = $objectManager->create(TaxFactory::class);
-+
-+/** @var \Magento\Tax\Model\Sales\Order\Tax  $tax */
-+$tax = $taxFactory->create();
-+$tax->setOrderId($order->getId())
-+    ->setCode('US-NY-*-Rate 1')
-+    ->setTitle('US-NY-*-Rate 1')
-+    ->setPercent(8.37)
-+    ->setAmount($amount)
-+    ->setBaseAmount($amount)
-+    ->setBaseRealAmount($amount);
-+$tax->save();
-+
-+$salesOrderFactory = $objectManager->create(ItemFactory::class);
-+
-+/** @var \Magento\Sales\Model\Order\Tax\Item $salesOrderItem */
-+$salesOrderItem = $salesOrderFactory->create();
-+$salesOrderItem->setOrderId($order->getId())
-+    ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
-+    ->setProductOptions([]);
-+$salesCollection = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Item::class);
-+$salesCollection->save($salesOrderItem);
-+
-+/** @var \Magento\Sales\Model\Order\Tax\Item $salesOrderTaxItem */
-+$salesOrderTaxItem = $salesOrderFactory->create();
-+$salesOrderTaxItem->setTaxId($tax->getId())
-+    ->setTaxPercent(8.37)
-+    ->setTaxAmount($amount)
-+    ->setBaseAmount($amount)
-+    ->setRealAmount($amount)
-+    ->setRealBaseAmount($amount)
-+    ->setAppliedTaxes([$tax])
-+    ->setTaxableItemType('shipping')
-+    ->setItemId($salesOrderItem->getId());
-+
-+$taxItemCollection = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Tax\Item::class);
-+$taxItemCollection->save($salesOrderTaxItem);
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax_rollback.php
-new file mode 100644
-index 00000000000..dd52deab825
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require 'order_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer.php b/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer.php
-new file mode 100644
-index 00000000000..1a0a94b0ca9
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer.php
-@@ -0,0 +1,114 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Sales\Model\Order;
-+use Magento\Sales\Api\OrderRepositoryInterface;
-+use Magento\Sales\Model\Order\Address as OrderAddress;
-+
-+require 'order.php';
-+/** @var Order $order */
-+/** @var Order\Payment $payment */
-+/** @var Order\Item $orderItem */
-+/** @var array $addressData Data for creating addresses for the orders. */
-+$orders = [
-+    [
-+        'increment_id' => '100000002',
-+        'state' => \Magento\Sales\Model\Order::STATE_NEW,
-+        'status' => 'processing',
-+        'grand_total' => 120.00,
-+        'subtotal' => 120.00,
-+        'base_grand_total' => 120.00,
-+        'store_id' => 1,
-+        'website_id' => 1,
-+        'payment' => $payment
-+    ],
-+    [
-+        'increment_id' => '100000003',
-+        'state' => \Magento\Sales\Model\Order::STATE_PROCESSING,
-+        'status' => 'processing',
-+        'grand_total' => 130.00,
-+        'base_grand_total' => 130.00,
-+        'subtotal' => 130.00,
-+        'total_paid' => 130.00,
-+        'store_id' => 0,
-+        'website_id' => 0,
-+        'payment' => $payment
-+    ],
-+    [
-+        'increment_id' => '100000004',
-+        'state' => \Magento\Sales\Model\Order::STATE_PROCESSING,
-+        'status' => 'closed',
-+        'grand_total' => 140.00,
-+        'base_grand_total' => 140.00,
-+        'subtotal' => 140.00,
-+        'store_id' => 1,
-+        'website_id' => 1,
-+        'payment' => $payment
-+    ],
-+    [
-+        'increment_id' => '100000005',
-+        'state' => \Magento\Sales\Model\Order::STATE_COMPLETE,
-+        'status' => 'complete',
-+        'grand_total' => 150.00,
-+        'base_grand_total' => 150.00,
-+        'subtotal' => 150.00,
-+        'total_paid' => 150.00,
-+        'store_id' => 1,
-+        'website_id' => 1,
-+        'payment' => $payment
-+    ],
-+    [
-+        'increment_id' => '100000006',
-+        'state' => \Magento\Sales\Model\Order::STATE_COMPLETE,
-+        'status' => 'complete',
-+        'grand_total' => 160.00,
-+        'base_grand_total' => 160.00,
-+        'subtotal' => 160.00,
-+        'total_paid' => 160.00,
-+        'store_id' => 1,
-+        'website_id' => 1,
-+        'payment' => $payment
-+    ],
-+];
-+
-+/** @var OrderRepositoryInterface $orderRepository */
-+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
-+/** @var array $orderData */
-+foreach ($orders as $orderData) {
-+    /** @var $order \Magento\Sales\Model\Order */
-+    $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+        \Magento\Sales\Model\Order::class
-+    );
-+
-+    // Reset addresses
-+    /** @var Order\Address $billingAddress */
-+    $billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]);
-+    $billingAddress->setAddressType('billing');
-+
-+    $shippingAddress = clone $billingAddress;
-+    $shippingAddress->setId(null)->setAddressType('shipping');
-+
-+    /** @var Order\Item $orderItem */
-+    $orderItem = $objectManager->create(Order\Item::class);
-+    $orderItem->setProductId($product->getId())
-+        ->setQtyOrdered(2)
-+        ->setBasePrice($product->getPrice())
-+        ->setPrice($product->getPrice())
-+        ->setRowTotal($product->getPrice())
-+        ->setProductType('simple');
-+
-+    $order
-+        ->setData($orderData)
-+        ->addItem($orderItem)
-+        ->setCustomerIsGuest(false)
-+        ->setCustomerId(1)
-+        ->setCustomerEmail('customer@example.com')
-+        ->setBillingAddress($billingAddress)
-+        ->setShippingAddress($shippingAddress);
-+
-+    $orderRepository->save($order);
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer_rollback.php
-new file mode 100644
-index 00000000000..1fb4b4636ab
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require 'default_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price.php
-new file mode 100644
-index 00000000000..97fb4f7a8fc
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+include __DIR__ . '/quote.php';
-+
-+$buyRequest = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    \Magento\Framework\DataObject::class,
-+    [
-+        'data' => [
-+            'qty' => 1,
-+            'custom_price' => 12,
-+        ],
-+    ]
-+);
-+/** @var \Magento\Quote\Model\Quote $items */
-+$items = $quote->getItemsCollection()->getItems();
-+$quoteItem = reset($items);
-+$quote->updateItem($quoteItem->getId(), $buyRequest)->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price_rollback.php
-new file mode 100644
-index 00000000000..2bcbb636b97
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price_rollback.php
-@@ -0,0 +1,8 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+include __DIR__ . '/quote_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_list.php b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_list.php
-index 1fc40d48476..60f4cadbaf5 100644
---- a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_list.php
-+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_list.php
-@@ -20,24 +20,28 @@ $shipments = [
-         'shipping_address_id' => 1,
-         'shipment_status' => \Magento\Sales\Model\Order\Shipment::STATUS_NEW,
-         'store_id' => 1,
-+        'shipping_label' => 'shipping_label_100000001',
-     ],
-     [
-         'increment_id' => '100000002',
-         'shipping_address_id' => 3,
-         'shipment_status' => \Magento\Sales\Model\Order\Shipment::STATUS_NEW,
-         'store_id' => 1,
-+        'shipping_label' => 'shipping_label_100000002',
-     ],
-     [
-         'increment_id' => '100000003',
-         'shipping_address_id' => 3,
-         'shipment_status' => \Magento\Sales\Model\Order\Shipment::STATUS_NEW,
-         'store_id' => 1,
-+        'shipping_label' => 'shipping_label_100000003',
-     ],
-     [
-         'increment_id' => '100000004',
-         'shipping_address_id' => 4,
-         'shipment_status' => 'closed',
-         'store_id' => 1,
-+        'shipping_label' => 'shipping_label_100000004',
-     ],
- ];
- 
-@@ -53,5 +57,6 @@ foreach ($shipments as $shipmentData) {
-     $shipment->setShippingAddressId($shipmentData['shipping_address_id']);
-     $shipment->setShipmentStatus($shipmentData['shipment_status']);
-     $shipment->setStoreId($shipmentData['store_id']);
-+    $shipment->setShippingLabel($shipmentData['shipping_label']);
-     $shipment->save();
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Sales/etc/extension_attributes.xml b/dev/tests/integration/testsuite/Magento/Sales/etc/extension_attributes.xml
-new file mode 100644
-index 00000000000..abefb087024
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Sales/etc/extension_attributes.xml
-@@ -0,0 +1,16 @@
-+<?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:Api/etc/extension_attributes.xsd">
-+    <extension_attributes for="Magento\Sales\Api\Data\ShipmentInterface">
-+        <attribute code="test_attribute_value" type="string"/>
-+    </extension_attributes>
-+    <extension_attributes for="Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface">
-+        <attribute code="test_attribute_value" type="string"/>
-+    </extension_attributes>
-+</config>
-diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Coupon/UsageTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Coupon/UsageTest.php
-new file mode 100644
-index 00000000000..9bb263b225d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Coupon/UsageTest.php
-@@ -0,0 +1,81 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\SalesRule\Model\ResourceModel\Coupon;
-+
-+use Magento\Framework\DataObject;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\SalesRule\Model\Coupon;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Tests accounting of coupon usages.
-+ *
-+ * @magentoDbIsolation enabled
-+ * @magentoAppIsolation enabled
-+ */
-+class UsageTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var Coupon
-+     */
-+    private $coupon;
-+
-+    /**
-+     * @var Usage
-+     */
-+    private $usage;
-+
-+    /**
-+     * @var DataObject
-+     */
-+    private $couponUsage;
-+
-+    /**
-+     * Tests incrementing and decrementing of coupon usages.
-+     *
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/SalesRule/_files/coupons_limited.php
-+     */
-+    public function testUpdateCustomerCouponTimesUsed()
-+    {
-+        $customerId = 1;
-+        $couponCode = 'one_usage';
-+
-+        $this->coupon->loadByCode($couponCode);
-+
-+        $testCases = [
-+            ['increment' => true, 'expected' => 1],
-+            ['increment' => false, 'expected' => 0],
-+            ['increment' => false, 'expected' => 0],
-+            ['increment' => true, 'expected' => 1],
-+            ['increment' => true, 'expected' => 2],
-+        ];
-+
-+        foreach ($testCases as $testCase) {
-+            $this->usage->updateCustomerCouponTimesUsed($customerId, $this->coupon->getId(), $testCase['increment']);
-+            $this->usage->loadByCustomerCoupon($this->couponUsage, $customerId, $this->coupon->getId());
-+
-+            self::assertEquals(
-+                $testCase['expected'],
-+                $this->couponUsage->getTimesUsed()
-+            );
-+        }
-+    }
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->coupon = $this->objectManager->get(Coupon::class);
-+        $this->usage = $this->objectManager->get(Usage::class);
-+        $this->couponUsage = $this->objectManager->get(DataObject::class);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/ProductTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/ProductTest.php
-index 00f1b1f4518..70fa11fc78c 100644
---- a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/ProductTest.php
-+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/ProductTest.php
-@@ -36,15 +36,14 @@ class ProductTest extends \PHPUnit\Framework\TestCase
-      * @magentoAppIsolation enabled
-      * @param int $categoryId
-      * @param bool $expectedResult
-+     *
-+     * @magentoDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product.php
-+     * @magentoDataFixture Magento/SalesRule/_files/rules_category.php
-      * @dataProvider validateProductConditionDataProvider
-      * @magentoDbIsolation disabled
-      */
-     public function testValidateCategorySalesRuleIncludesChildren($categoryId, $expectedResult)
-     {
--        //* @magentoDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product.php
--        //* @magentoDataFixture Magento/SalesRule/_files/rules_category.php
--        $this->markTestSkipped('MAGETWO-87436');
--
-         // Load the quote that contains a child of a configurable product
-         /** @var \Magento\Quote\Model\Quote  $quote */
-         $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class)
-diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Plugin/CouponUsagesTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Plugin/CouponUsagesTest.php
-new file mode 100644
-index 00000000000..e0477993eea
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Plugin/CouponUsagesTest.php
-@@ -0,0 +1,101 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\SalesRule\Plugin;
-+
-+use Magento\Framework\DataObject;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Sales\Model\Order;
-+use Magento\SalesRule\Model\Coupon;
-+use Magento\SalesRule\Model\ResourceModel\Coupon\Usage;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/**
-+ * Test increasing coupon usages after after order placing and decreasing after order cancellation.
-+ *
-+ * @magentoDbIsolation enabled
-+ * @magentoAppIsolation enabled
-+ */
-+class CouponUsagesTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var Coupon
-+     */
-+    private $coupon;
-+
-+    /**
-+     * @var Usage
-+     */
-+    private $usage;
-+
-+    /**
-+     * @var DataObject
-+     */
-+    private $couponUsage;
-+
-+    /**
-+     * @var Order
-+     */
-+    private $order;
-+
-+    /**
-+     * Test increasing coupon usages after after order placing and decreasing after order cancellation.
-+     *
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/SalesRule/_files/coupons_limited_order.php
-+     */
-+    public function testOrderCancellation()
-+    {
-+        $customerId = 1;
-+        $couponCode = 'one_usage';
-+        $orderId = '100000001';
-+
-+        $this->coupon->loadByCode($couponCode);
-+        $this->order->loadByIncrementId($orderId);
-+
-+        // Make sure coupon usages value is incremented then order is placed.
-+        $this->order->place();
-+        $this->usage->loadByCustomerCoupon($this->couponUsage, $customerId, $this->coupon->getId());
-+        $this->coupon->loadByCode($couponCode);
-+
-+        self::assertEquals(
-+            1,
-+            $this->coupon->getTimesUsed()
-+        );
-+        self::assertEquals(
-+            1,
-+            $this->couponUsage->getTimesUsed()
-+        );
-+
-+        // Make sure order coupon usages value is decremented then order is cancelled.
-+        $this->order->cancel();
-+        $this->usage->loadByCustomerCoupon($this->couponUsage, $customerId, $this->coupon->getId());
-+        $this->coupon->loadByCode($couponCode);
-+
-+        self::assertEquals(
-+            0,
-+            $this->coupon->getTimesUsed()
-+        );
-+        self::assertEquals(
-+            0,
-+            $this->couponUsage->getTimesUsed()
-+        );
-+    }
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = Bootstrap::getObjectManager();
-+        $this->coupon = $this->objectManager->get(Coupon::class);
-+        $this->usage = $this->objectManager->get(Usage::class);
-+        $this->couponUsage = $this->objectManager->get(DataObject::class);
-+        $this->order = $this->objectManager->get(Order::class);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_100_percent_off_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_100_percent_off_rollback.php
-index c7d95455c78..b6a98416142 100644
---- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_100_percent_off_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_100_percent_off_rollback.php
-@@ -5,11 +5,27 @@
-  */
- declare(strict_types=1);
- 
-+use Magento\Framework\Exception\NoSuchEntityException;
-+use Magento\Framework\Registry;
-+use Magento\SalesRule\Api\RuleRepositoryInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+$objectManager = Bootstrap::getObjectManager();
- /** @var Magento\Framework\Registry $registry */
--$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+$registry = Bootstrap::getObjectManager()->get(Registry::class);
-+/** @var RuleRepositoryInterface $ruleRepository */
-+$ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
- 
- /** @var Magento\SalesRule\Model\Rule $rule */
--$rule = $registry->registry('cart_rule_100_percent_off');
--if ($rule) {
--    $rule->delete();
-+$ruleId = $registry->registry('Magento/SalesRule/_files/cart_rule_100_percent_off');
-+
-+if ($ruleId) {
-+    try {
-+        $ruleRepository->deleteById($ruleId);
-+        // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-+    } catch (NoSuchEntityException $e) {
-+        /**
-+         * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
-+         */
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount_rollback.php
-new file mode 100644
-index 00000000000..33a8b4285d8
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount_rollback.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var Magento\Framework\Registry $registry */
-+$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+
-+/** @var Magento\SalesRule\Model\Rule $rule */
-+$rule = $registry->registry('cart_rule_fixed_discount_coupon');
-+if ($rule) {
-+    $rule->delete();
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard.php
-index 9005284f984..61fe3e9ea74 100644
---- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard.php
-+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard.php
-@@ -27,6 +27,7 @@ $salesRule->setData(
-         'discount_amount' => 5,
-         'discount_step' => 0,
-         'stop_rules_processing' => 1,
-+        'store_labels' => [0 => '5$ fixed discount on whole cart'],
-         'website_ids' => [
-             $objectManager->get(StoreManagerInterface::class)->getWebsite()->getId(),
-         ],
-diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php
-index 776c3022103..c9613c371bb 100644
---- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php
-@@ -14,8 +14,19 @@ use Magento\TestFramework\Helper\Bootstrap;
- 
- $objectManager = Bootstrap::getObjectManager();
- 
-+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-+$searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
-+$searchCriteria = $searchCriteriaBuilder->addFilter('name', '5$ fixed discount on whole cart')
-+    ->create();
-+
-+/** @var RuleRepositoryInterface $ruleRepository */
-+$ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class);
-+$items = $ruleRepository->getList($searchCriteria)
-+    ->getItems();
-+
-+$salesRule = array_pop($items);
-+
- /** @var Rule $salesRule */
--$salesRule = getSalesRule('5$ fixed discount on whole cart');
- if ($salesRule !== null) {
-     /** @var RuleRepositoryInterface $ruleRepository */
-     $ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
-@@ -29,18 +40,3 @@ if ($coupon->getCouponId()) {
-     $couponRepository = $objectManager->get(CouponRepositoryInterface::class);
-     $couponRepository->deleteById($coupon->getCouponId());
- }
--
--function getSalesRule(string $name)
--{
--    /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
--    $searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
--    $searchCriteria = $searchCriteriaBuilder->addFilter('name', $name)
--        ->create();
--
--    /** @var RuleRepositoryInterface $ruleRepository */
--    $ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class);
--    $items = $ruleRepository->getList($searchCriteria)
--        ->getItems();
--
--    return array_pop($items);
--}
-diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited.php
-new file mode 100644
-index 00000000000..2199b3b24d3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited.php
-@@ -0,0 +1,30 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\SalesRule\Model\Coupon;
-+
-+// phpcs:ignore Magento2.Security.IncludeFile
-+require 'rules.php';
-+
-+$collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
-+);
-+$items = array_values($collection->getItems());
-+
-+/** @var Coupon $coupon */
-+$coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Coupon::class);
-+$coupon->setRuleId($items[0]->getId())
-+    ->setCode('one_usage')
-+    ->setType(0)
-+    ->setUsageLimit(1)
-+    ->save();
-+
-+$coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Coupon::class);
-+$coupon->setRuleId($items[1]->getId())
-+    ->setCode('one_usage_per_customer')
-+    ->setType(0)
-+    ->setUsagePerCustomer(1)
-+    ->save();
-diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order.php
-new file mode 100644
-index 00000000000..29178430171
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order.php
-@@ -0,0 +1,28 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Sales\Model\Order;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+// phpcs:disable Magento2.Security.IncludeFile
-+require 'coupons_limited.php';
-+require __DIR__ . '/../../../Magento/Sales/_files/order.php';
-+// phpcs:enable
-+
-+$collection = Bootstrap::getObjectManager()->create(
-+    \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
-+);
-+$items = array_values($collection->getItems());
-+
-+/** @var Order $order */
-+$order = Bootstrap::getObjectManager()->create(Order::class);
-+
-+$order->loadByIncrementId('100000001')
-+    ->setCouponCode('one_usage')
-+    ->setAppliedRuleIds("{$items[0]->getId()}")
-+    ->setCreatedAt('2014-10-25 10:10:10')
-+    ->setCustomerId(1)
-+    ->save();
-diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order_rollback.php
-new file mode 100644
-index 00000000000..eba9ecbd9ed
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order_rollback.php
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+// phpcs:disable Magento2.Security.IncludeFile
-+require __DIR__ . '/../../../Magento/Sales/_files/order_rollback.php';
-+require 'coupons_limited_rollback.php';
-+// phpcs:enable
-diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_rollback.php
-new file mode 100644
-index 00000000000..584f714d4c2
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_rollback.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+use Magento\SalesRule\Model\Coupon;
-+
-+$couponCodes = [
-+    'one_usage',
-+    'one_usage_per_customer',
-+];
-+
-+/** @var Coupon $coupon */
-+$coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Coupon::class);
-+
-+foreach ($couponCodes as $couponCode) {
-+    $coupon->loadByCode($couponCode);
-+    $coupon->delete();
-+}
-+
-+// phpcs:ignore Magento2.Security.IncludeFile
-+require 'rules_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
-index b9ba89ba531..90540a1d637 100644
---- a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
-@@ -25,7 +25,7 @@ class SynonymReaderTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @return array
-      */
--    public static function loadByPhraseDataProvider()
-+    public function loadByPhraseDataProvider(): array
-     {
-         return [
-             [
-@@ -48,7 +48,31 @@ class SynonymReaderTest extends \PHPUnit\Framework\TestCase
-                 ['synonyms' => 'queen,monarch', 'store_id' => 1, 'website_id' => 0],
-                 ['synonyms' => 'british,english', 'store_id' => 1, 'website_id' => 0]
-                 ]
--            ]
-+            ],
-+            [
-+                'query_value', []
-+            ],
-+            [
-+                'query_value+', []
-+            ],
-+            [
-+                'query_value-', []
-+            ],
-+            [
-+                'query_@value', []
-+            ],
-+            [
-+                'query_value+@', []
-+            ],
-+            [
-+                '<', []
-+            ],
-+            [
-+                '>', []
-+            ],
-+            [
-+                '<english>', [['synonyms' => 'british,english', 'store_id' => 1, 'website_id' => 0]]
-+            ],
-         ];
-     }
- 
-@@ -57,7 +81,7 @@ class SynonymReaderTest extends \PHPUnit\Framework\TestCase
-      * @param array $expectedResult
-      * @dataProvider loadByPhraseDataProvider
-      */
--    public function testLoadByPhrase($phrase, $expectedResult)
-+    public function testLoadByPhrase(string $phrase, array $expectedResult)
-     {
-         $data = $this->model->loadByPhrase($phrase)->getData();
- 
-diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
-new file mode 100644
-index 00000000000..8794dfdff8f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
-@@ -0,0 +1,171 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\SendFriend\Controller\Product;
-+
-+use Magento\Captcha\Model\DefaultModel;
-+use Magento\TestFramework\TestCase\AbstractController;
-+use Magento\Framework\Data\Form\FormKey;
-+use Magento\Customer\Api\AccountManagementInterface;
-+use Magento\Customer\Model\Session;
-+use Psr\Log\LoggerInterface;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Message\MessageInterface;
-+use Magento\Captcha\Helper\Data as CaptchaHelper;
-+
-+class CustomerSendmailTest extends AbstractController
-+{
-+    /**
-+     * @var AccountManagementInterface
-+     */
-+    private $accountManagement;
-+
-+    /**
-+     * @var FormKey
-+     */
-+    private $formKey;
-+
-+    /**
-+     * @var Session
-+     */
-+    private $session;
-+
-+    /**
-+     * @var CaptchaHelper
-+     */
-+    private $captchaHelper;
-+
-+    /**
-+     * @throws LocalizedException
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $this->accountManagement = $this->_objectManager->create(AccountManagementInterface::class);
-+        $this->formKey = $this->_objectManager->create(FormKey::class);
-+        $logger = $this->createMock(LoggerInterface::class);
-+        $this->session = $this->_objectManager->create(
-+            Session::class,
-+            [$logger]
-+        );
-+        $this->captchaHelper = $this->_objectManager->create(CaptchaHelper::class);
-+        $customer = $this->accountManagement->authenticate('customer@example.com', 'password');
-+        $this->session->setCustomerDataAsLoggedIn($customer);
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-+     */
-+    public function testExecute()
-+    {
-+        $this->getRequest()
-+            ->setMethod('POST')
-+            ->setPostValue(
-+                [
-+                    'form_key' => $this->formKey->getFormKey(),
-+                    'sender' => [
-+                        'name' => 'customer',
-+                        'email' => 'customer@example.com',
-+                        'message' => 'example message'
-+                    ],
-+                    'id' => 1,
-+                    'recipients' => [
-+                        'name' => ['John'],
-+                        'email' => ['example1@gmail.com']
-+                    ]
-+
-+                ]
-+            );
-+
-+        $this->dispatch('sendfriend/product/sendmail');
-+        $this->assertSessionMessages(
-+            $this->equalTo(['The link to a friend was sent.']),
-+            MessageInterface::TYPE_SUCCESS
-+        );
-+    }
-+
-+    /**
-+     * @magentoConfigFixture default_store customer/captcha/enable 1
-+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_login 0
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-+     * @magentoConfigFixture default_store customer/captcha/forms product_sendtofriend_form
-+     */
-+    public function testWithCaptchaFailed()
-+    {
-+        $this->getRequest()
-+            ->setMethod('POST')
-+            ->setPostValue(
-+                [
-+                    'form_key' => $this->formKey->getFormKey(),
-+                    'sender' => [
-+                        'name' => 'customer',
-+                        'email' => 'customer@example.com',
-+                        'message' => 'example message'
-+                    ],
-+                    'id' => 1,
-+                    'captcha' => [
-+                        'product_sendtofriend_form' => 'test'
-+                    ],
-+                    'recipients' => [
-+                        'name' => ['John'],
-+                        'email' => ['example1@gmail.com']
-+                    ]
-+
-+                ]
-+            );
-+
-+        $this->dispatch('sendfriend/product/sendmail');
-+        $this->assertSessionMessages(
-+            $this->equalTo(['Incorrect CAPTCHA']),
-+            MessageInterface::TYPE_ERROR
-+        );
-+    }
-+
-+    /**
-+     * @magentoConfigFixture default_store customer/captcha/enable 1
-+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_login 0
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-+     * @magentoConfigFixture default_store customer/captcha/forms product_sendtofriend_form
-+     *
-+     */
-+    public function testWithCaptchaSuccess()
-+    {
-+        /** @var DefaultModel $captchaModel */
-+        $captchaModel = $this->captchaHelper->getCaptcha('product_sendtofriend_form');
-+        $captchaModel->generate();
-+        $word = $captchaModel->getWord();
-+        $this->getRequest()
-+            ->setMethod('POST')
-+            ->setPostValue(
-+                [
-+                    'form_key' => $this->formKey->getFormKey(),
-+                    'sender' => [
-+                        'name' => 'customer',
-+                        'email' => 'customer@example.com',
-+                        'message' => 'example message'
-+                    ],
-+                    'id' => 1,
-+                    'captcha' => [
-+                        'product_sendtofriend_form' => $word
-+                    ],
-+                    'recipients' => [
-+                        'name' => ['John'],
-+                        'email' => ['example1@gmail.com']
-+                    ]
-+                ]
-+            );
-+
-+        $this->dispatch('sendfriend/product/sendmail');
-+        $this->assertSessionMessages(
-+            $this->equalTo(['The link to a friend was sent.']),
-+            MessageInterface::TYPE_SUCCESS
-+        );
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
-new file mode 100644
-index 00000000000..f5851a55d76
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
-@@ -0,0 +1,169 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\SendFriend\Controller;
-+
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Customer\Model\Session;
-+use Magento\Framework\Data\Form\FormKey;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\Message\MessageInterface;
-+use Magento\TestFramework\Request;
-+use Magento\TestFramework\TestCase\AbstractController;
-+
-+/**
-+ * Class SendmailTest
-+ */
-+class SendmailTest extends AbstractController
-+{
-+    /**
-+     * Share the product to friend as logged in customer
-+     *
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     * @magentoDataFixture Magento/SendFriend/_files/disable_allow_guest_config.php
-+     * @magentoDataFixture Magento/Customer/_files/customer.php
-+     * @magentoDataFixture Magento/Catalog/_files/products.php
-+     */
-+    public function testSendActionAsLoggedIn()
-+    {
-+        $product = $this->getProduct();
-+        $this->login(1);
-+        $this->prepareRequestData();
-+
-+        $this->dispatch('sendfriend/product/sendmail/id/' . $product->getId());
-+        $this->assertSessionMessages(
-+            $this->equalTo(['The link to a friend was sent.']),
-+            MessageInterface::TYPE_SUCCESS
-+        );
-+    }
-+
-+    /**
-+     * Share the product to friend as guest customer
-+     *
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
-+     * @magentoConfigFixture default_store sendfriend/email/allow_guest 1
-+     * @magentoDataFixture Magento/Catalog/_files/products.php
-+     */
-+    public function testSendActionAsGuest()
-+    {
-+        $product = $this->getProduct();
-+        $this->prepareRequestData();
-+
-+        $this->dispatch('sendfriend/product/sendmail/id/' . $product->getId());
-+        $this->assertSessionMessages(
-+            $this->equalTo(['The link to a friend was sent.']),
-+            MessageInterface::TYPE_SUCCESS
-+        );
-+    }
-+
-+    /**
-+     * Share the product to friend as guest customer with invalid post data
-+     *
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
-+     * @magentoConfigFixture default_store sendfriend/email/allow_guest 1
-+     * @magentoDataFixture Magento/Catalog/_files/products.php
-+     */
-+    public function testSendActionAsGuestWithInvalidData()
-+    {
-+        $product = $this->getProduct();
-+        $this->prepareRequestData(true);
-+
-+        $this->dispatch('sendfriend/product/sendmail/id/' . $product->getId());
-+        $this->assertSessionMessages(
-+            $this->equalTo(['Invalid Sender Email']),
-+            MessageInterface::TYPE_ERROR
-+        );
-+    }
-+
-+    /**
-+     * Share the product invisible in catalog to friend as guest customer
-+     *
-+     * @magentoDbIsolation enabled
-+     * @magentoAppIsolation enabled
-+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
-+     * @magentoConfigFixture default_store sendfriend/email/allow_guest 1
-+     * @magentoDataFixture Magento/Catalog/_files/simple_products_not_visible_individually.php
-+     */
-+    public function testSendInvisibleProduct()
-+    {
-+        $product = $this->getInvisibleProduct();
-+        $this->prepareRequestData();
-+
-+        $this->dispatch('sendfriend/product/sendmail/id/' . $product->getId());
-+        $this->assert404NotFound();
-+    }
-+
-+    /**
-+     * @return ProductInterface
-+     */
-+    private function getProduct()
-+    {
-+        return $this->_objectManager->get(ProductRepositoryInterface::class)->get('custom-design-simple-product');
-+    }
-+
-+    /**
-+     * @return ProductInterface
-+     */
-+    private function getInvisibleProduct()
-+    {
-+        return $this->_objectManager->get(ProductRepositoryInterface::class)->get('simple_not_visible_1');
-+    }
-+
-+    /**
-+     * Login the user
-+     *
-+     * @param string $customerId Customer to mark as logged in for the session
-+     * @return void
-+     */
-+    protected function login($customerId)
-+    {
-+        /** @var Session $session */
-+        $session = Bootstrap::getObjectManager()
-+            ->get(Session::class);
-+        $session->loginById($customerId);
-+    }
-+
-+    /**
-+     * @param bool $invalidData
-+     * @return void
-+     */
-+    private function prepareRequestData($invalidData = false)
-+    {
-+        /** @var FormKey $formKey */
-+        $formKey = $this->_objectManager->get(FormKey::class);
-+        $post = [
-+            'sender' => [
-+                'name' => 'Test',
-+                'email' => 'test@example.com',
-+                'message' => 'Message',
-+            ],
-+            'recipients' => [
-+                'name' => [
-+                    'Recipient 1',
-+                    'Recipient 2'
-+                ],
-+                'email' => [
-+                    'r1@example.com',
-+                    'r2@example.com'
-+                ]
-+            ],
-+            'form_key' => $formKey->getFormKey(),
-+        ];
-+        if ($invalidData) {
-+            unset($post['sender']['email']);
-+        }
-+
-+        $this->getRequest()->setMethod(Request::METHOD_POST);
-+        $this->getRequest()->setPostValue($post);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Fixtures/process_config_data.php b/dev/tests/integration/testsuite/Magento/SendFriend/Fixtures/process_config_data.php
-new file mode 100644
-index 00000000000..2c672378fb8
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Fixtures/process_config_data.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Config\Model\Config;
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+
-+$processConfigData = function (Config $config, array $data) {
-+    foreach ($data as $key => $value) {
-+        $config->setDataByPath($key, $value);
-+        $config->save();
-+    }
-+};
-+
-+$deleteConfigData = function (WriterInterface $writer, array $configData, string $scope, int $scopeId) {
-+    foreach ($configData as $path) {
-+        $writer->delete($path, $scope, $scopeId);
-+    }
-+};
-diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Fixtures/sendfriend_configuration.php b/dev/tests/integration/testsuite/Magento/SendFriend/Fixtures/sendfriend_configuration.php
-new file mode 100644
-index 00000000000..229d6eddb49
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Fixtures/sendfriend_configuration.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Config\Model\Config;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+require __DIR__ . '/process_config_data.php';
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+$configData = [
-+    'sendfriend/email/max_per_hour' => 1,
-+    'sendfriend/email/check_by' => 1,
-+
-+];
-+$objectManager = Bootstrap::getObjectManager();
-+$defConfig = $objectManager->create(Config::class);
-+$defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
-+$processConfigData($defConfig, $configData);
-diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Fixtures/sendfriend_configuration_rollback.php b/dev/tests/integration/testsuite/Magento/SendFriend/Fixtures/sendfriend_configuration_rollback.php
-new file mode 100644
-index 00000000000..9265e032bbc
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Fixtures/sendfriend_configuration_rollback.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\App\Config\Storage\WriterInterface;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+require __DIR__ . '/process_config_data.php';
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+$configData = [
-+    'sendfriend/email/max_per_hour',
-+    'sendfriend/email/check_by'
-+];
-+/** @var WriterInterface $configWriter */
-+$configWriter = $objectManager->get(WriterInterface::class);
-+$deleteConfigData($configWriter, $configData, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, 0);
-diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/_files/disable_allow_guest_config.php b/dev/tests/integration/testsuite/Magento/SendFriend/_files/disable_allow_guest_config.php
-new file mode 100644
-index 00000000000..202a3961324
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SendFriend/_files/disable_allow_guest_config.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\Framework\App\Config\Value;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
-+/** @var Value $config */
-+$config = Bootstrap::getObjectManager()->create(Value::class);
-+$config->setPath('sendfriend/email/enabled');
-+$config->setScope('default');
-+$config->setScopeId(0);
-+$config->setValue(1);
-+$config->save();
-+
-+/** @var Value $config */
-+$config = Bootstrap::getObjectManager()->create(Value::class);
-+$config->setPath('sendfriend/email/allow_guest');
-+$config->setScope('default');
-+$config->setScopeId(0);
-+$config->setValue(0);
-+$config->save();
-diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/_files/product_simple_rollback.php b/dev/tests/integration/testsuite/Magento/SendFriend/_files/product_simple_rollback.php
-new file mode 100644
-index 00000000000..ed98732fc87
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/SendFriend/_files/product_simple_rollback.php
-@@ -0,0 +1,26 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-+
-+try {
-+    $product = $productRepository->get('simple', false, null, true);
-+    $productRepository->delete($product);
-+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-+    //Product already removed
-+}
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/PriceIndexerDimensionsModeSetCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/PriceIndexerDimensionsModeSetCommandTest.php
-index 79028a159d1..c25dc65ccd7 100644
---- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/PriceIndexerDimensionsModeSetCommandTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/PriceIndexerDimensionsModeSetCommandTest.php
-@@ -3,8 +3,6 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--declare(strict_types=1);
--
- namespace Magento\Setup\Console\Command;
- 
- use Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration;
-@@ -12,18 +10,16 @@ use Symfony\Component\Console\Tester\CommandTester;
- use Magento\Framework\Console\Cli;
- use Magento\Framework\ObjectManagerInterface;
- use Magento\TestFramework\Helper\Bootstrap;
--use Magento\Catalog\Console\Command\PriceIndexerDimensionsModeSetCommand;
- 
- /**
-- * Class PriceIndexerDimensionsModeSetCommand
-- * @package Magento\Setup\Console\Command
-+ * Test command that sets indexer mode for catalog_product_price indexer
-  */
- class PriceIndexerDimensionsModeSetCommandTest extends \Magento\TestFramework\Indexer\TestCase
- {
-     /** @var  ObjectManagerInterface */
-     private $objectManager;
- 
--    /** @var  GenerateFixturesCommand */
-+    /** @var  \Magento\Indexer\Console\Command\IndexerSetDimensionsModeCommand */
-     private $command;
- 
-     /** @var  CommandTester */
-@@ -39,7 +35,7 @@ class PriceIndexerDimensionsModeSetCommandTest extends \Magento\TestFramework\In
-         $this->objectManager->get(\Magento\TestFramework\App\Config::class)->clean();
- 
-         $this->command = $this->objectManager->create(
--            \Magento\Catalog\Console\Command\PriceIndexerDimensionsModeSetCommand::class
-+            \Magento\Indexer\Console\Command\IndexerSetDimensionsModeCommand::class
-         );
- 
-         $this->commandTester = new CommandTester($this->command);
-@@ -47,14 +43,6 @@ class PriceIndexerDimensionsModeSetCommandTest extends \Magento\TestFramework\In
-         parent::setUp();
-     }
- 
--    /**
--     * tearDown
--     */
--    public function tearDown()
--    {
--        parent::tearDown();
--    }
--
-     /**
-      * setUpBeforeClass
-      */
-@@ -75,19 +63,20 @@ class PriceIndexerDimensionsModeSetCommandTest extends \Magento\TestFramework\In
-      * @magentoAppArea adminhtml
-      * @magentoAppIsolation enabled
-      *
--     * @param $previousMode
--     * @param $currentMode
-+     * @param string $previousMode
-+     * @param string $currentMode
-      * @dataProvider modesDataProvider
-      */
-     public function testSwitchMode($previousMode, $currentMode)
-     {
-         $this->commandTester->execute(
-             [
--                PriceIndexerDimensionsModeSetCommand::INPUT_KEY_MODE => $currentMode
-+                'indexer' => 'catalog_product_price',
-+                'mode'    => $currentMode,
-             ]
-         );
--        $expectedOutput = 'Dimensions mode for indexer Product Price was changed from \''
--            . $previousMode . '\' to \'' . $currentMode . '\'';
-+        $expectedOutput = 'Dimensions mode for indexer "Product Price" was changed from \''
-+            . $previousMode . '\' to \'' . $currentMode . '\'' . PHP_EOL;
- 
-         $actualOutput = $this->commandTester->getDisplay();
- 
-@@ -100,6 +89,10 @@ class PriceIndexerDimensionsModeSetCommandTest extends \Magento\TestFramework\In
-         );
-     }
- 
-+    /**
-+     * Modes data provider
-+     * @return array
-+     */
-     public function modesDataProvider()
-     {
-         return [
-@@ -134,10 +127,11 @@ class PriceIndexerDimensionsModeSetCommandTest extends \Magento\TestFramework\In
-     {
-         $this->commandTester->execute(
-             [
--                PriceIndexerDimensionsModeSetCommand::INPUT_KEY_MODE => DimensionModeConfiguration::DIMENSION_NONE
-+                'indexer' => 'catalog_product_price',
-+                'mode' => DimensionModeConfiguration::DIMENSION_NONE
-             ]
-         );
--        $expectedOutput = 'Dimensions mode for indexer Product Price has not been changed';
-+        $expectedOutput = 'Dimensions mode for indexer "Product Price" has not been changed' . PHP_EOL;
- 
-         $actualOutput = $this->commandTester->getDisplay();
- 
-@@ -160,8 +154,7 @@ class PriceIndexerDimensionsModeSetCommandTest extends \Magento\TestFramework\In
-     {
-         $this->commandTester->execute(
-             [
--                PriceIndexerDimensionsModeSetCommand::INPUT_KEY_MODE => DimensionModeConfiguration::DIMENSION_NONE .
--                    '_not_valid'
-+                'indexer' => 'indexer_not_valid'
-             ]
-         );
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php b/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php
-index 6b92e687284..04f25f231c9 100644
---- a/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php
-@@ -47,7 +47,7 @@ class WhitelistDeclarationTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Checks that all declared table elements also declared into whitelist declaration.
-      *
--     * @appIsolation
-+     * @magentoAppIsolation enabled
-      * @throws \Exception
-      */
-     public function testConstraintsAndIndexesAreWhitelisted()
-diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AbstractShipmentControllerTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AbstractShipmentControllerTest.php
-new file mode 100644
-index 00000000000..0a1926d5862
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AbstractShipmentControllerTest.php
-@@ -0,0 +1,92 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
-+
-+use Magento\Framework\Api\SearchCriteria;
-+use Magento\Framework\Api\SearchCriteriaBuilder;
-+use Magento\Framework\Data\Form\FormKey;
-+use Magento\Sales\Api\Data\OrderInterface;
-+use Magento\Sales\Api\Data\ShipmentInterface;
-+use Magento\Sales\Model\OrderRepository;
-+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
-+use Magento\TestFramework\TestCase\AbstractBackendController;
-+
-+/**
-+ * Abstract backend shipment test.
-+ */
-+class AbstractShipmentControllerTest extends AbstractBackendController
-+{
-+    /**
-+     * @var TransportBuilderMock
-+     */
-+    protected $transportBuilder;
-+
-+    /**
-+     * @var OrderRepository
-+     */
-+    protected $orderRepository;
-+
-+    /**
-+     * @var FormKey
-+     */
-+    protected $formKey;
-+
-+    /**
-+     * @var string
-+     */
-+    protected $resource = 'Magento_Sales::shipment';
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
-+        $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
-+        $this->formKey = $this->_objectManager->get(FormKey::class);
-+    }
-+
-+    /**
-+     * @param string $incrementalId
-+     * @return OrderInterface|null
-+     */
-+    protected function getOrder(string $incrementalId)
-+    {
-+        /** @var SearchCriteria $searchCriteria */
-+        $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
-+            ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
-+            ->create();
-+
-+        $orders = $this->orderRepository->getList($searchCriteria)->getItems();
-+        /** @var OrderInterface|null $order */
-+        $order = reset($orders);
-+
-+        return $order;
-+    }
-+
-+    /**
-+     * @param OrderInterface $order
-+     * @return ShipmentInterface
-+     */
-+    protected function getShipment(OrderInterface $order): ShipmentInterface
-+    {
-+        /** @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Collection $shipmentCollection */
-+        $shipmentCollection = $this->_objectManager->create(
-+            \Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory::class
-+        )->create();
-+
-+        /** @var ShipmentInterface $shipment */
-+        $shipment = $shipmentCollection
-+            ->setOrderFilter($order)
-+            ->setPageSize(1)
-+            ->getFirstItem();
-+
-+        return $shipment;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
-new file mode 100644
-index 00000000000..25a44bab629
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
-@@ -0,0 +1,102 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
-+
-+use PHPUnit\Framework\Constraint\RegularExpression;
-+use PHPUnit\Framework\Constraint\StringContains;
-+
-+/**
-+ * Class verifies shipment add comment functionality.
-+ *
-+ * @magentoDbIsolation enabled
-+ * @magentoAppArea adminhtml
-+ * @magentoDataFixture Magento/Sales/_files/shipment.php
-+ */
-+class AddCommentTest extends AbstractShipmentControllerTest
-+{
-+    /**
-+     * @var string
-+     */
-+    protected $uri = 'backend/admin/order_shipment/addComment';
-+
-+    /**
-+     * @return void
-+     */
-+    public function testSendEmailOnShipmentCommentAdd(): void
-+    {
-+        $comment = 'Test Shipment Comment';
-+        $order = $this->prepareRequest(
-+            [
-+                'comment' => ['comment' => $comment, 'is_customer_notified' => true],
-+            ]
-+        );
-+        $this->dispatch('backend/admin/order_shipment/addComment');
-+        $html = $this->getResponse()->getBody();
-+        $this->assertContains($comment, $html);
-+
-+        $message = $this->transportBuilder->getSentMessage();
-+        $subject =__('Update to your %1 shipment', $order->getStore()->getFrontendName())->render();
-+        $messageConstraint = $this->logicalAnd(
-+            new StringContains($order->getBillingAddress()->getName()),
-+            new RegularExpression(
-+                sprintf(
-+                    "/Your order #%s has been updated with a status of.*%s/",
-+                    $order->getIncrementId(),
-+                    $order->getFrontendStatusLabel()
-+                )
-+            ),
-+            new StringContains($comment)
-+        );
-+
-+        $this->assertEquals($message->getSubject(), $subject);
-+        $this->assertThat($message->getRawMessage(), $messageConstraint);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclHasAccess()
-+    {
-+        $this->prepareRequest(['comment', ['comment' => 'Comment']]);
-+
-+        parent::testAclHasAccess();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclNoAccess()
-+    {
-+        $this->prepareRequest(['comment', ['comment' => 'Comment']]);
-+
-+        parent::testAclNoAccess();
-+    }
-+
-+    /**
-+     * @param array $params
-+     * @return \Magento\Sales\Api\Data\OrderInterface|null
-+     */
-+    private function prepareRequest(array $params = [])
-+    {
-+        $order = $this->getOrder('100000001');
-+        $shipment = $this->getShipment($order);
-+
-+        $this->getRequest()->setMethod('POST');
-+        $this->getRequest()->setParams(
-+            [
-+                'id' => $shipment->getEntityId(),
-+                'form_key' => $this->formKey->getFormKey(),
-+            ]
-+        );
-+
-+        $data = $params ?? [];
-+        $this->getRequest()->setPostValue($data);
-+
-+        return $order;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php
-new file mode 100644
-index 00000000000..27b5bb02d4b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php
-@@ -0,0 +1,97 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
-+
-+use PHPUnit\Framework\Constraint\StringContains;
-+
-+/**
-+ * Class verifies shipment creation functionality.
-+ *
-+ * @magentoDbIsolation enabled
-+ * @magentoAppArea adminhtml
-+ * @magentoDataFixture Magento/Sales/_files/order.php
-+ */
-+class SaveTest extends AbstractShipmentControllerTest
-+{
-+    /**
-+     * @var string
-+     */
-+    protected $uri = 'backend/admin/order_shipment/save';
-+
-+    /**
-+     * @return void
-+     */
-+    public function testSendEmailOnShipmentSave(): void
-+    {
-+        $order = $this->prepareRequest(['shipment' => ['send_email' => true]]);
-+        $this->dispatch('backend/admin/order_shipment/save');
-+
-+        $this->assertSessionMessages(
-+            $this->equalTo([(string)__('The shipment has been created.')]),
-+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-+        );
-+        $this->assertRedirect($this->stringContains('sales/order/view/order_id/' . $order->getEntityId()));
-+
-+        $shipment = $this->getShipment($order);
-+        $message = $this->transportBuilder->getSentMessage();
-+        $subject = __('Your %1 order has shipped', $order->getStore()->getFrontendName())->render();
-+        $messageConstraint = $this->logicalAnd(
-+            new StringContains($order->getBillingAddress()->getName()),
-+            new StringContains(
-+                'Thank you for your order from ' . $shipment->getStore()->getFrontendName()
-+            ),
-+            new StringContains(
-+                "Your Shipment #{$shipment->getIncrementId()} for Order #{$order->getIncrementId()}"
-+            )
-+        );
-+
-+        $this->assertEquals($message->getSubject(), $subject);
-+        $this->assertThat($message->getRawMessage(), $messageConstraint);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclHasAccess()
-+    {
-+        $this->prepareRequest();
-+
-+        parent::testAclHasAccess();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function testAclNoAccess()
-+    {
-+        $this->prepareRequest();
-+
-+        parent::testAclNoAccess();
-+    }
-+
-+    /**
-+     * @param array $params
-+     * @return \Magento\Sales\Api\Data\OrderInterface|null
-+     */
-+    private function prepareRequest(array $params = [])
-+    {
-+        $order = $this->getOrder('100000001');
-+        $this->getRequest()->setMethod('POST');
-+        $this->getRequest()->setParams(
-+            [
-+                'order_id' => $order->getEntityId(),
-+                'form_key' => $this->formKey->getFormKey(),
-+            ]
-+        );
-+
-+        $data = $params ?? [];
-+        $this->getRequest()->setPostValue($data);
-+
-+        return $order;
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Store/App/FrontController/Plugin/RequestPreprocessorTest.php b/dev/tests/integration/testsuite/Magento/Store/App/FrontController/Plugin/RequestPreprocessorTest.php
-index ebf302c16bd..0e158821f18 100644
---- a/dev/tests/integration/testsuite/Magento/Store/App/FrontController/Plugin/RequestPreprocessorTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Store/App/FrontController/Plugin/RequestPreprocessorTest.php
-@@ -56,7 +56,7 @@ class RequestPreprocessorTest extends \Magento\TestFramework\TestCase\AbstractCo
-         $this->prepareRequest(true);
-         $this->dispatch('customer/account/loginPost/');
-         $redirectUrl = str_replace('http://', 'https://', $this->baseUrl) .
--            'index.php/customer/account/';
-+            'customer/account/';
-         $this->assertResponseRedirect($this->getResponse(), $redirectUrl);
-         $this->assertTrue($this->_objectManager->get(Session::class)->isLoggedIn());
-         $this->setFrontendCompletelySecureRollback();
-diff --git a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php
-index 90ceaa4fcc5..e0a1321092a 100644
---- a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php
-@@ -14,7 +14,7 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @var \Magento\Store\App\Request\PathInfoProcessor
-      */
--    protected $pathProcessor;
-+    private $pathProcessor;
- 
-     protected function setUp()
-     {
-@@ -31,7 +31,11 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase
-     {
-         /** @var \Magento\Framework\App\RequestInterface $request */
-         $request = Bootstrap::getObjectManager()->create(\Magento\Framework\App\RequestInterface::class);
--        $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo));
-+        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
-+        $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-+        $config->setValue(Store::XML_PATH_STORE_IN_URL, true);
-+        $info = $this->pathProcessor->process($request, $pathInfo);
-+        $this->assertEquals($pathInfo, $info);
-     }
- 
-     public function notValidStoreCodeDataProvider()
-@@ -46,7 +50,7 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase
-      * @covers \Magento\Store\App\Request\PathInfoProcessor::process
-      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
-      */
--    public function testProcessValidStoreCodeCase1()
-+    public function testProcessValidStoreDisabledStoreUrl()
-     {
-         /** @var \Magento\Store\Model\Store $store */
-         $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class);
-@@ -57,6 +61,7 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase
- 
-         /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
-         $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-+        $config->setValue(Store::XML_PATH_STORE_IN_URL, true);
-         $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode());
-         $pathInfo = sprintf('/%s/m/c/a', $store->getCode());
-         $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo));
-@@ -66,7 +71,7 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase
-      * @covers \Magento\Store\App\Request\PathInfoProcessor::process
-      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
-      */
--    public function testProcessValidStoreCodeCase2()
-+    public function testProcessValidStoreCodeCaseProcessStoreName()
-     {
-         /** @var \Magento\Store\Model\Store $store */
-         $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class);
-@@ -77,6 +82,7 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase
- 
-         /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
-         $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-+        $config->setValue(Store::XML_PATH_STORE_IN_URL, true);
-         $config->setValue(Store::XML_PATH_STORE_IN_URL, true, ScopeInterface::SCOPE_STORE, $store->getCode());
-         $pathInfo = sprintf('/%s/m/c/a', $store->getCode());
-         $this->assertEquals('/m/c/a', $this->pathProcessor->process($request, $pathInfo));
-@@ -86,7 +92,7 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase
-      * @covers \Magento\Store\App\Request\PathInfoProcessor::process
-      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
-      */
--    public function testProcessValidStoreCodeCase3()
-+    public function testProcessValidStoreCodeWhenStoreIsDirectFrontNameWithFrontName()
-     {
-         /** @var \Magento\Store\Model\Store $store */
-         $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class);
-@@ -100,9 +106,77 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase
- 
-         /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
-         $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-+        $config->setValue(Store::XML_PATH_STORE_IN_URL, true);
-         $config->setValue(Store::XML_PATH_STORE_IN_URL, true, ScopeInterface::SCOPE_STORE, $store->getCode());
-         $pathInfo = sprintf('/%s/m/c/a', $store->getCode());
-         $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo));
--        $this->assertEquals('noroute', $request->getActionName());
-+        $this->assertEquals(\Magento\Framework\App\Router\Base::NO_ROUTE, $request->getActionName());
-+    }
-+
-+    /**
-+     * @covers \Magento\Store\App\Request\PathInfoProcessor::process
-+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
-+     */
-+    public function testProcessValidStoreCodeWhenStoreCodeInUrlIsDisabledWithFrontName()
-+    {
-+        /** @var \Magento\Store\Model\Store $store */
-+        $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class);
-+        $store->load('fixturestore', 'code');
-+
-+        /** @var \Magento\Framework\App\RequestInterface $request */
-+        $request = Bootstrap::getObjectManager()->create(
-+            \Magento\Framework\App\RequestInterface::class,
-+            ['directFrontNames' => ['someFrontName' => true]]
-+        );
-+
-+        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
-+        $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-+        $config->setValue(Store::XML_PATH_STORE_IN_URL, true);
-+        $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode());
-+        $pathInfo = sprintf('/%s/m/c/a', $store->getCode());
-+        $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo));
-+    }
-+
-+    /**
-+     * @covers \Magento\Store\App\Request\PathInfoProcessor::process
-+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
-+     */
-+    public function testProcessValidStoreCodeWhenStoreCodeisAdmin()
-+    {
-+        /** @var \Magento\Store\Model\Store $store */
-+        $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class);
-+        $store->load('fixturestore', 'code');
-+
-+        /** @var \Magento\Framework\App\RequestInterface $request */
-+        $request = Bootstrap::getObjectManager()->create(
-+            \Magento\Framework\App\RequestInterface::class,
-+            ['directFrontNames' => ['someFrontName' => true]]
-+        );
-+
-+        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
-+        $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-+        $config->setValue(Store::XML_PATH_STORE_IN_URL, true);
-+        $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode());
-+        $pathInfo = sprintf('/%s/m/c/a', 'admin');
-+        $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo));
-+    }
-+
-+    /**
-+     * @covers \Magento\Store\App\Request\PathInfoProcessor::process
-+     */
-+    public function testProcessValidStoreCodeWhenUrlConfigIsDisabled()
-+    {
-+        /** @var \Magento\Framework\App\RequestInterface $request */
-+        $request = Bootstrap::getObjectManager()->create(
-+            \Magento\Framework\App\RequestInterface::class,
-+            ['directFrontNames' => ['someFrontName' => true]]
-+        );
-+
-+        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
-+        $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-+        $config->setValue(Store::XML_PATH_STORE_IN_URL, false);
-+        $pathInfo = sprintf('/%s/m/c/a', 'whatever');
-+        $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo));
-+        $this->assertEquals(null, $request->getActionName());
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
-index 9690199eeb8..00de5544d8f 100644
---- a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
-@@ -6,13 +6,16 @@
- 
- namespace Magento\Store\Model;
- 
-+use Magento\Catalog\Model\ProductRepository;
- use Magento\Framework\App\Bootstrap;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\UrlInterface;
-+use Magento\Store\Api\StoreRepositoryInterface;
- use Zend\Stdlib\Parameters;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * phpcs:disable Magento2.Security.Superglobal
-  */
- class StoreTest extends \PHPUnit\Framework\TestCase
- {
-@@ -198,7 +201,7 @@ class StoreTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testGetBaseUrlForCustomEntryPoint($type, $useCustomEntryPoint, $useStoreCode, $expected)
-     {
--         /* config operations require store to be loaded */
-+        /* config operations require store to be loaded */
-         $this->model->load('default');
-         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-             ->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
-@@ -210,6 +213,10 @@ class StoreTest extends \PHPUnit\Framework\TestCase
- 
-         // emulate custom entry point
-         $_SERVER['SCRIPT_FILENAME'] = 'custom_entry.php';
-+        $request = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-+            ->get(\Magento\Framework\App\RequestInterface::class);
-+        $request->setServer(new Parameters($_SERVER));
-+
-         if ($useCustomEntryPoint) {
-             $property = new \ReflectionProperty($this->model, '_isCustomEntryPoint');
-             $property->setAccessible(true);
-@@ -267,12 +274,89 @@ class StoreTest extends \PHPUnit\Framework\TestCase
-         $this->assertFalse($this->model->isCanDelete());
-     }
- 
-+    /**
-+     * @magentoDataFixture Magento/Store/_files/core_second_third_fixturestore.php
-+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-+     * @magentoDbIsolation disabled
-+     */
-     public function testGetCurrentUrl()
-     {
-+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
-+        ->setValue('web/url/use_store', true, ScopeInterface::SCOPE_STORE, 'secondstore');
-+
-         $this->model->load('admin');
--        $this->model->expects($this->any())->method('getUrl')->will($this->returnValue('http://localhost/index.php'));
-+        $this->model
-+            ->expects($this->any())->method('getUrl')
-+            ->will($this->returnValue('http://localhost/index.php'));
-         $this->assertStringEndsWith('default', $this->model->getCurrentUrl());
-         $this->assertStringEndsNotWith('default', $this->model->getCurrentUrl(false));
-+
-+        /** @var \Magento\Store\Model\Store $secondStore */
-+        $secondStore = $objectManager->get(StoreRepositoryInterface::class)->get('secondstore');
-+
-+        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
-+        $productRepository = $objectManager->create(ProductRepository::class);
-+        $product = $productRepository->get('simple');
-+        $product->setStoreId($secondStore->getId());
-+        $url = $product->getUrlInStore();
-+
-+        $this->assertEquals(
-+            $secondStore->getBaseUrl() . 'catalog/product/view/id/1/s/simple-product/',
-+            $url
-+        );
-+        $this->assertEquals(
-+            $secondStore->getBaseUrl() . '?___from_store=default',
-+            $secondStore->getCurrentUrl()
-+        );
-+        $this->assertEquals(
-+            $secondStore->getBaseUrl(),
-+            $secondStore->getCurrentUrl(false)
-+        );
-+    }
-+
-+    /**
-+     * @magentoDataFixture Magento/Store/_files/second_store.php
-+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
-+     * @magentoDbIsolation disabled
-+     */
-+    public function testGetCurrentUrlWithUseStoreInUrlFalse()
-+    {
-+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $objectManager->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class)
-+            ->setValue('web/url/use_store', false, ScopeInterface::SCOPE_STORE, 'default');
-+
-+        /** @var \Magento\Store\Model\Store $secondStore */
-+        $secondStore = $objectManager->get(StoreRepositoryInterface::class)->get('fixture_second_store');
-+
-+        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
-+        $productRepository = $objectManager->create(ProductRepository::class);
-+        $product = $productRepository->get('simple333');
-+
-+        $product->setStoreId($secondStore->getId());
-+        $url = $product->getUrlInStore();
-+
-+        /** @var \Magento\Catalog\Model\CategoryRepository $categoryRepository */
-+        $categoryRepository = $objectManager->get(\Magento\Catalog\Model\CategoryRepository::class);
-+        $category = $categoryRepository->get(333, $secondStore->getStoreId());
-+
-+        $this->assertEquals(
-+            $secondStore->getBaseUrl() . 'catalog/category/view/s/category-1/id/333/',
-+            $category->getUrl()
-+        );
-+        $this->assertEquals(
-+            $secondStore->getBaseUrl() .
-+            'catalog/product/view/id/333/s/simple-product-three/?___store=fixture_second_store',
-+            $url
-+        );
-+        $this->assertEquals(
-+            $secondStore->getBaseUrl() . '?___store=fixture_second_store&___from_store=default',
-+            $secondStore->getCurrentUrl()
-+        );
-+        $this->assertEquals(
-+            $secondStore->getBaseUrl() . '?___store=fixture_second_store',
-+            $secondStore->getCurrentUrl(false)
-+        );
-     }
- 
-     /**
-@@ -325,7 +409,7 @@ class StoreTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @return array
-      */
--    public static function saveValidationDataProvider()
-+    public function saveValidationDataProvider()
-     {
-         return [
-             'empty store name' => [['name' => '']],
-diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
-index 3cb429822eb..912e8e895f9 100644
---- a/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
-+++ b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
-@@ -13,7 +13,7 @@ $groupId = $website->getDefaultGroupId();
- 
- /** @var \Magento\Store\Model\Store $store */
- $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
--$store->setCode('secondstore')->setName('Second Store')->setSortOrder(10)->setIsActive(1);
-+$store->setCode('secondstore')->setWebsiteId($websiteId)->setName('Second Store')->setSortOrder(10)->setIsActive(1);
- $store->save();
- 
- /** @var \Magento\Store\Model\Website $website */
-@@ -25,5 +25,5 @@ $groupId = $website->getDefaultGroupId();
- 
- /** @var \Magento\Store\Model\Store $store */
- $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
--$store->setCode('thirdstore')->setName('Third Store')->setSortOrder(10)->setIsActive(1);
-+$store->setCode('thirdstore')->setWebsiteId($websiteId)->setName('Third Store')->setSortOrder(10)->setIsActive(1);
- $store->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_currency.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_currency.php
-new file mode 100644
-index 00000000000..773ae52943f
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_currency.php
-@@ -0,0 +1,44 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+// phpcs:ignore Magento2.Security.IncludeFile
-+require_once __DIR__ . '/second_store.php';
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+$store = $objectManager->create(\Magento\Store\Model\Store::class);
-+if ($storeId = $store->load('fixture_second_store', 'code')->getId()) {
-+    /** @var \Magento\Config\Model\ResourceModel\Config $configResource */
-+    $configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
-+    $configResource->saveConfig(
-+        \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT,
-+        'EUR',
-+        \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
-+        $storeId
-+    );
-+    $configResource->saveConfig(
-+        \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
-+        'EUR',
-+        \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
-+        $storeId
-+    );
-+    /**
-+     * Configuration cache clean is required to reload currency setting
-+     */
-+    /** @var Magento\Config\App\Config\Type\System $config */
-+    $config = $objectManager->get(\Magento\Config\App\Config\Type\System::class);
-+    $config->clean();
-+}
-+
-+
-+/** @var \Magento\Directory\Model\ResourceModel\Currency $rate */
-+$rate = $objectManager->create(\Magento\Directory\Model\ResourceModel\Currency::class);
-+$rate->saveRates(
-+    [
-+        'USD' => ['EUR' => 2],
-+        'EUR' => ['USD' => 0.5]
-+    ]
-+);
-diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_currency_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_currency_rollback.php
-new file mode 100644
-index 00000000000..6af1b0a5fed
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_currency_rollback.php
-@@ -0,0 +1,27 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+$store = $objectManager->create(\Magento\Store\Model\Store::class);
-+$storeId = $store->load('fixture_second_store', 'code')->getId();
-+
-+if ($storeId) {
-+    $configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
-+    $configResource->deleteConfig(
-+        \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT,
-+        \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
-+        $storeId
-+    );
-+    $configResource->deleteConfig(
-+        \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
-+        \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
-+        $storeId
-+    );
-+}
-+
-+// phpcs:ignore Magento2.Security.IncludeFile
-+require_once 'second_store_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/store.php b/dev/tests/integration/testsuite/Magento/Store/_files/store.php
-index 94ea5a9364b..7e30978af48 100644
---- a/dev/tests/integration/testsuite/Magento/Store/_files/store.php
-+++ b/dev/tests/integration/testsuite/Magento/Store/_files/store.php
-@@ -22,7 +22,18 @@ if (!$store->load('test', 'code')->getId()) {
-     $store->save();
- } else {
-     if ($store->getId()) {
-+        /** @var \Magento\TestFramework\Helper\Bootstrap $registry */
-+        $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-+            \Magento\Framework\Registry::class
-+        );
-+        $registry->unregister('isSecureArea');
-+        $registry->register('isSecureArea', true);
-+
-         $store->delete();
-+
-+        $registry->unregister('isSecureArea');
-+        $registry->register('isSecureArea', false);
-+
-         $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
-         $store->setData(
-             [
-diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries.php b/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries.php
-index 13a43d0a710..970b1619f02 100644
---- a/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries.php
-+++ b/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries.php
-@@ -10,6 +10,7 @@ use Magento\Store\Model\Website;
- use Magento\Store\Model\Store;
- use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndex;
- use Magento\Framework\App\Config\ReinitableConfigInterface;
-+use Magento\Store\Model\Group;
- 
- $objectManager = Bootstrap::getObjectManager();
- //Creating second website with a store.
-@@ -21,12 +22,23 @@ if (!$website->getId()) {
-     $website->setData([
-         'code' => 'test',
-         'name' => 'Test Website',
--        'default_group_id' => '1',
-         'is_default' => '0',
-     ]);
-     $website->save();
- }
- 
-+/**
-+ * @var Group $storeGroup
-+ */
-+$storeGroup = $objectManager->create(Group::class);
-+$storeGroup->setCode('some_group')
-+    ->setName('custom store group')
-+    ->setWebsite($website);
-+$storeGroup->save($storeGroup);
-+
-+$website->setDefaultGroupId($storeGroup->getId());
-+$website->save($website);
-+
- $websiteId = $website->getId();
- $store = $objectManager->create(Store::class);
- $store->load('fixture_second_store', 'code');
-@@ -56,7 +68,7 @@ $configResource->saveConfig(
- //Allowed countries for second website
- $configResource->saveConfig(
-     'general/country/allow',
--    'ES',
-+    'ES,US,UK,DE',
-     \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES,
-     $websiteId
- );
-diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries_rollback.php
-index 0e4de1595bb..97f7db97aa2 100644
---- a/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries_rollback.php
-@@ -13,6 +13,11 @@ use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndex;
- use Magento\Framework\App\Config\ReinitableConfigInterface;
- 
- $objectManager = Bootstrap::getObjectManager();
-+/** @var Registry $registry */
-+$registry = $objectManager->get(Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
- //Deleting second website's store.
- $store = $objectManager->create(Store::class);
- if ($store->load('fixture_second_store', 'code')->getId()) {
-@@ -20,10 +25,6 @@ if ($store->load('fixture_second_store', 'code')->getId()) {
- }
- 
- //Deleting the second website.
--/** @var Registry $registry */
--$registry = $objectManager->get(Registry::class);
--$registry->unregister('isSecureArea');
--$registry->register('isSecureArea', true);
- 
- $configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
- //Restoring allowed countries.
-diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php
-index 969d9530ae5..f806674d297 100644
---- a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php
-@@ -7,6 +7,8 @@ declare(strict_types=1);
- 
- namespace Magento\Swatches\Controller\Adminhtml\Product;
- 
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+use Magento\Framework\Data\Form\FormKey;
- use Magento\Framework\Exception\LocalizedException;
- 
- /**
-@@ -17,6 +19,21 @@ use Magento\Framework\Exception\LocalizedException;
-  */
- class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
-+    /**
-+     * @var FormKey
-+     */
-+    private $formKey;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-+    {
-+        parent::setUp();
-+
-+        $this->formKey = $this->_objectManager->get(FormKey::class);
-+    }
-+
-     /**
-      * Generate random hex color.
-      *
-@@ -38,22 +55,26 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-         $optionsData = [];
-         $expectedOptionsLabels = [];
-         for ($i = 0; $i < $optionsCount; $i++) {
--            $order = $i + 1;
--            $expectedOptionLabelOnStoreView = "value_{$i}_store_1";
-+            $expectedOptionLabelOnStoreView = 'value_' . $i .'_store_1';
-             $expectedOptionsLabels[$i+1] = $expectedOptionLabelOnStoreView;
--            $optionsData []= "optionvisual[order][option_{$i}]={$order}";
--            $optionsData []= "defaultvisual[]=option_{$i}";
--            $optionsData []= "swatchvisual[value][option_{$i}]={$this->getRandomColor()}";
--            $optionsData []= "optionvisual[value][option_{$i}][0]=value_{$i}_admin";
--            $optionsData []= "optionvisual[value][option_{$i}][1]={$expectedOptionLabelOnStoreView}";
--            $optionsData []= "optionvisual[delete][option_{$i}]=";
-+            $optionId = 'option_' .$i;
-+            $optionRowData = [];
-+            $optionRowData['optionvisual']['order'][$optionId] = $i + 1;
-+            $optionRowData['defaultvisual'][] = $optionId;
-+            $optionRowData['swatchvisual']['value'][$optionId] = $this->getRandomColor();
-+            $optionRowData['optionvisual']['value'][$optionId][0] = 'value_' . $i .'_admin';
-+            $optionRowData['optionvisual']['value'][$optionId][1] = $expectedOptionLabelOnStoreView;
-+            $optionRowData['optionvisual']['delete'][$optionId] = '';
-+            $optionsData[] = http_build_query($optionRowData);
-         }
--        $optionsData []= "visual_swatch_validation=";
--        $optionsData []= "visual_swatch_validation_unique=";
-         return [
-             'attribute_data' => array_merge_recursive(
-                 [
--                    'serialized_swatch_values' => json_encode($optionsData),
-+                    'serialized_options' => json_encode($optionsData),
-+                ],
-+                [
-+                    'visual_swatch_validation' => '',
-+                    'visual_swatch_validation_unique' => '',
-                 ],
-                 $this->getAttributePreset(),
-                 [
-@@ -76,22 +97,26 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-         $optionsData = [];
-         $expectedOptionsLabels = [];
-         for ($i = 0; $i < $optionsCount; $i++) {
--            $order = $i + 1;
--            $expectedOptionLabelOnStoreView = "value_{$i}_store_1";
-+            $expectedOptionLabelOnStoreView = 'value_' . $i . '_store_1';
-             $expectedOptionsLabels[$i+1] = $expectedOptionLabelOnStoreView;
--            $optionsData []= "optiontext[order][option_{$i}]={$order}";
--            $optionsData []= "defaulttext[]=option_{$i}";
--            $optionsData []= "swatchtext[value][option_{$i}]=x{$i}";
--            $optionsData []= "optiontext[value][option_{$i}][0]=value_{$i}_admin";
--            $optionsData []= "optiontext[value][option_{$i}][1]={$expectedOptionLabelOnStoreView}";
--            $optionsData []= "optiontext[delete][option_{$i}]=";
-+            $optionId = 'option_' . $i;
-+            $optionRowData = [];
-+            $optionRowData['optiontext']['order'][$optionId] = $i + 1;
-+            $optionRowData['defaulttext'][] = $optionId;
-+            $optionRowData['swatchtext']['value'][$optionId] = 'x' . $i ;
-+            $optionRowData['optiontext']['value'][$optionId][0] = 'value_' . $i . '_admin';
-+            $optionRowData['optiontext']['value'][$optionId][1]= $expectedOptionLabelOnStoreView;
-+            $optionRowData['optiontext']['delete'][$optionId]='';
-+            $optionsData[] = http_build_query($optionRowData);
-         }
--        $optionsData []= "text_swatch_validation=";
--        $optionsData []= "text_swatch_validation_unique=";
-         return [
-             'attribute_data' => array_merge_recursive(
-                 [
--                    'serialized_swatch_values' => json_encode($optionsData),
-+                    'serialized_options' => json_encode($optionsData),
-+                ],
-+                [
-+                    'text_swatch_validation' => '',
-+                    'text_swatch_validation_unique' => '',
-                 ],
-                 $this->getAttributePreset(),
-                 [
-@@ -111,7 +136,6 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-     private function getAttributePreset() : array
-     {
-         return [
--            'serialized_options' => '[]',
-             'form_key' => 'XxtpPYjm2YPYUlAt',
-             'frontend_label' => [
-                 0 => 'asdasd',
-@@ -175,7 +199,9 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
-         int $expectedOptionsCount,
-         array $expectedLabels
-     ) : void {
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($attributeData);
-+        $this->getRequest()->setPostValue('form_key', $this->formKey->getFormKey());
-         $this->dispatch('backend/catalog/product_attribute/save');
-         $entityTypeId = $this->_objectManager->create(
-             \Magento\Eav\Model\Entity::class
-diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Observer/AddSwatchAttributeTypeObserverTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Observer/AddSwatchAttributeTypeObserverTest.php
-new file mode 100644
-index 00000000000..15d10c2ddff
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Swatches/Observer/AddSwatchAttributeTypeObserverTest.php
-@@ -0,0 +1,48 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Swatches\Observer;
-+
-+use Magento\Framework\DataObject;
-+use Magento\Swatches\Model\Swatch;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\Event\ManagerInterface;
-+
-+/**
-+ * Test checks that swatch types are added to the other attribute types
-+ */
-+class AddSwatchAttributeTypeObserverTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @magentoAppArea adminhtml
-+     */
-+    public function testAddSwatchAttributeTypes()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $eventManager = $objectManager->get(ManagerInterface::class);
-+        $response = new DataObject();
-+        $response->setTypes([]);
-+
-+        $eventManager->dispatch(
-+            'adminhtml_product_attribute_types',
-+            ['response' => $response]
-+        );
-+
-+        $responseTypes = $response->getTypes();
-+
-+        self::assertGreaterThan(0, count($responseTypes));
-+
-+        /* Iterate through values since other types (not swatches) might be added by observers */
-+        $responseTypeValues = [];
-+        foreach ($responseTypes as $responseType) {
-+            $responseTypeValues[] = $responseType['value'];
-+        }
-+
-+        self::assertTrue(in_array(Swatch::SWATCH_TYPE_VISUAL_ATTRIBUTE_FRONTEND_INPUT, $responseTypeValues));
-+        self::assertTrue(in_array(Swatch::SWATCH_TYPE_TEXTUAL_ATTRIBUTE_FRONTEND_INPUT, $responseTypeValues));
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php b/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
-index c2f7b498e63..ae5f81817dd 100644
---- a/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
-@@ -17,7 +17,7 @@ class RateTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-      */
-     public function testAjaxSaveAction($postData, $expectedData)
-     {
--        $this->getRequest()->setPostValue($postData);
-+        $this->getRequest()->setPostValue($postData)->setMethod('POST');
- 
-         $this->dispatch('backend/tax/rate/ajaxSave');
- 
-@@ -85,7 +85,7 @@ class RateTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-      */
-     public function testAjaxSaveActionInvalidData($postData, $expectedData)
-     {
--        $this->getRequest()->setPostValue($postData);
-+        $this->getRequest()->setPostValue($postData)->setMethod('POST');
- 
-         $this->dispatch('backend/tax/rate/ajaxSave');
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
-index bd505fd4db0..985019b687c 100644
---- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
-+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
-@@ -7,10 +7,19 @@
- namespace Magento\Tax\Model\Sales\Total\Quote;
- 
- use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Quote\Model\Quote;
- use Magento\Tax\Model\Config;
- use Magento\Tax\Model\Calculation;
-+use Magento\Quote\Model\Quote\Item\Updater;
-+use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Api\Data\ProductInterface;
-+use Magento\Framework\Api\Filter;
-+use Magento\Framework\Api\Search\FilterGroup;
-+use Magento\Framework\Api\SearchCriteriaInterface;
- 
- /**
-+ * Setup utility for quote
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class SetupUtil
-@@ -594,7 +603,7 @@ class SetupUtil
-      *
-      * @param array $quoteData
-      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
--     * @return \Magento\Quote\Model\Quote
-+     * @return Quote
-      */
-     protected function createQuote($quoteData, $customer)
-     {
-@@ -619,8 +628,8 @@ class SetupUtil
-         $quoteBillingAddress = $this->objectManager->create(\Magento\Quote\Model\Quote\Address::class);
-         $quoteBillingAddress->importCustomerAddressData($addressService->getById($billingAddress->getId()));
- 
--        /** @var \Magento\Quote\Model\Quote $quote */
--        $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class);
-+        /** @var Quote $quote */
-+        $quote = $this->objectManager->create(Quote::class);
-         $quote->setStoreId(1)
-             ->setIsActive(true)
-             ->setIsMultiShipping(false)
-@@ -634,7 +643,7 @@ class SetupUtil
-     /**
-      * Add products to quote
-      *
--     * @param \Magento\Quote\Model\Quote $quote
-+     * @param Quote $quote
-      * @param array $itemsData
-      * @return $this
-      */
-@@ -657,7 +666,8 @@ class SetupUtil
-      * Create a quote based on given data
-      *
-      * @param array $quoteData
--     * @return \Magento\Quote\Model\Quote
-+     *
-+     * @return Quote
-      */
-     public function setupQuote($quoteData)
-     {
-@@ -666,7 +676,9 @@ class SetupUtil
-         $quote = $this->createQuote($quoteData, $customer);
- 
-         $this->addProductToQuote($quote, $quoteData['items']);
--
-+        if (isset($quoteData['update_items'])) {
-+            $this->updateItems($quote, $quoteData['update_items']);
-+        }
-         //Set shipping amount
-         if (isset($quoteData['shipping_method'])) {
-             $quote->getShippingAddress()->setShippingMethod($quoteData['shipping_method']);
-@@ -683,4 +695,33 @@ class SetupUtil
- 
-         return $quote;
-     }
-+
-+    /**
-+     * Update quote items
-+     *
-+     * @param Quote $quote
-+     * @param array $items
-+     *
-+     * @return void
-+     */
-+    private function updateItems(Quote $quote, array $items): void
-+    {
-+        $updater = $this->objectManager->get(Updater::class);
-+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-+        $filter = $this->objectManager->create(Filter::class);
-+        $filter->setField('sku')->setValue(array_keys($items));
-+        $filterGroup = $this->objectManager->create(FilterGroup::class);
-+        $filterGroup->setFilters([$filter]);
-+        $searchCriteria = $this->objectManager->create(SearchCriteriaInterface::class);
-+        $searchCriteria->setFilterGroups([$filterGroup]);
-+        $products = $productRepository->getList($searchCriteria)->getItems();
-+        /** @var ProductInterface $product */
-+        foreach ($products as $product) {
-+            $quoteItem = $quote->getItemByProduct($product);
-+            $updater->update(
-+                $quoteItem,
-+                $items[$product->getSku()]
-+            );
-+        }
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php
-new file mode 100644
-index 00000000000..290c133f455
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php
-@@ -0,0 +1,93 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Tax\Model\Config;
-+use Magento\Tax\Model\Sales\Total\Quote\SetupUtil;
-+
-+$taxCalculationData['including_tax_with_custom_price'] = [
-+    'config_data' => [
-+        SetupUtil::CONFIG_OVERRIDES => [
-+            Config::CONFIG_XML_PATH_PRICE_INCLUDES_TAX => 1,
-+            Config::CONFIG_XML_PATH_APPLY_ON => 0,
-+        ],
-+        SetupUtil::TAX_RATE_OVERRIDES => [
-+            SetupUtil::TAX_RATE_TX => 8.25,
-+            SetupUtil::TAX_STORE_RATE => 8.25,
-+        ],
-+        SetupUtil::TAX_RULE_OVERRIDES => [
-+        ],
-+    ],
-+    'quote_data' => [
-+        'billing_address' => [
-+            'region_id' => SetupUtil::REGION_TX,
-+        ],
-+        'shipping_address' => [
-+            'region_id' => SetupUtil::REGION_TX,
-+        ],
-+        'items' => [
-+            [
-+                'sku' => 'simple1',
-+                'price' => 16.24,
-+                'qty' => 1,
-+            ],
-+        ],
-+        'update_items' => [
-+            'simple1' => [
-+                'custom_price' => 14,
-+                'qty' => 1,
-+            ],
-+        ],
-+    ],
-+    'expected_results' => [
-+        'address_data' => [
-+            'subtotal' => 12.93,
-+            'base_subtotal' => 12.93,
-+            'subtotal_incl_tax' => 14,
-+            'base_subtotal_incl_tax' => 14,
-+            'tax_amount' => 1.07,
-+            'base_tax_amount' => 1.07,
-+            'shipping_amount' => 0,
-+            'base_shipping_amount' => 0,
-+            'shipping_incl_tax' => 0,
-+            'base_shipping_incl_tax' => 0,
-+            'shipping_taxable' => 0,
-+            'base_shipping_taxable' => 0,
-+            'shipping_tax_amount' => 0,
-+            'base_shipping_tax_amount' => 0,
-+            'discount_amount' => 0,
-+            'base_discount_amount' => 0,
-+            'discount_tax_compensation_amount' => 0,
-+            'base_discount_tax_compensation_amount' => 0,
-+            'shipping_discount_tax_compensation_amount' => 0,
-+            'base_shipping_discount_tax_compensation_amount' => 0,
-+            'grand_total' => 14,
-+            'base_grand_total' => 14,
-+        ],
-+        'items_data' => [
-+            'simple1' => [
-+                'row_total' => 12.93,
-+                'base_row_total' => 12.93,
-+                'tax_percent' => 8.25,
-+                'price' => 12.93,
-+                'custom_price' => 12.93,
-+                'original_custom_price' => 14,
-+                'base_price' => 12.93,
-+                'price_incl_tax' => 14,
-+                'base_price_incl_tax' => 14,
-+                'row_total_incl_tax' => 14,
-+                'base_row_total_incl_tax' => 14,
-+                'tax_amount' => 1.07,
-+                'base_tax_amount' => 1.07,
-+                'discount_amount' => 0,
-+                'base_discount_amount' => 0,
-+                'discount_percent' => 0,
-+                'discount_tax_compensation_amount' => 0,
-+                'base_discount_tax_compensation_amount' => 0,
-+            ],
-+        ],
-+    ],
-+];
-diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
-index f22b48a2596..3c56b1bf815 100644
---- a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
-+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
-@@ -3,14 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- /**
-- * Global array that holds test scenarios data
-+ * Global array that holds test scenarios data.
-  *
-  * @var array
-  */
- $taxCalculationData = [];
--
-+//phpcs:disable Magento2.Security.IncludeFile
- require_once __DIR__ . '/scenarios/excluding_tax_apply_tax_after_discount.php';
- require_once __DIR__ . '/scenarios/excluding_tax_apply_tax_after_discount_discount_tax.php';
- require_once __DIR__ . '/scenarios/excluding_tax_apply_tax_before_discount.php';
-@@ -31,3 +32,4 @@ require_once __DIR__ . '/scenarios/multi_tax_rule_total_calculate_subtotal_yes.p
- require_once __DIR__ . '/scenarios/multi_tax_rule_two_row_calculate_subtotal_yes_row.php';
- require_once __DIR__ . '/scenarios/multi_tax_rule_two_row_calculate_subtotal_yes_total.php';
- require_once __DIR__ . '/scenarios/including_tax_apply_tax_after_discount.php';
-+require_once __DIR__ . '/scenarios/including_tax_with_custom_price.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
-index a11cd4b73b5..32a58e285d7 100644
---- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
-@@ -77,9 +77,8 @@ class LayoutFilesTest extends \PHPUnit\Framework\TestCase
-      */
-     protected function isSkippedArgument(array $argumentData)
-     {
--        // Do not take into account argument name and parameters
--        unset($argumentData['name']);
--        unset($argumentData['param']);
-+        // Do not take into account argument name, shared and parameters
-+        unset($argumentData['name'], $argumentData['param'], $argumentData['shared']);
- 
-         $isUpdater = isset($argumentData['updater']);
-         unset($argumentData['updater']);
-diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php
-index 2afb6e90667..eee166ab341 100644
---- a/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php
-@@ -76,7 +76,7 @@ class StaticFilesTest extends \PHPUnit\Framework\TestCase
-     /**
-      * Scan references to files from other static files and assert they are correct
-      *
--     * The CSS or LESS files may refer to other resources using @import or url() notation
-+     * The CSS or LESS files may refer to other resources using `import` or url() notation
-      * We want to check integrity of all these references
-      * Note that the references may have syntax specific to the Magento preprocessing subsystem
-      *
-diff --git a/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php b/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php
-index 95fcf24894c..cb684c02168 100644
---- a/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\Theme\Controller\Adminhtml\System\Design\Config;
- 
-+use Magento\Framework\App\Request\Http;
- use Magento\Framework\Data\Form\FormKey;
- use Magento\TestFramework\TestCase\AbstractBackendController;
- 
-@@ -29,6 +30,9 @@ class SaveTest extends AbstractBackendController
-      */
-     protected $uri = 'backend/theme/design_config/save';
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
-         parent::setUp();
-@@ -36,6 +40,7 @@ class SaveTest extends AbstractBackendController
-         $this->formKey = $this->_objectManager->get(
-             FormKey::class
-         );
-+        $this->httpMethod = Http::METHOD_POST;
-     }
- 
-     /**
-@@ -107,12 +112,11 @@ class SaveTest extends AbstractBackendController
-         ];
-     }
- 
-+    /**
-+     * @inheritDoc
-+     */
-     public function testAclHasAccess()
-     {
--        $this->getRequest()->setMethod(
--            \Zend\Http\Request::METHOD_POST
--        );
--
-         $this->getRequest()->setParams(
-             [
-                 'form_key' => $this->formKey->getFormKey()
-diff --git a/dev/tests/integration/testsuite/Magento/Translation/Model/Js/PreProcessorTest.php b/dev/tests/integration/testsuite/Magento/Translation/Model/Js/PreProcessorTest.php
-new file mode 100644
-index 00000000000..f844f3c271e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Translation/Model/Js/PreProcessorTest.php
-@@ -0,0 +1,189 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Translation\Model\Js;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\View\FileSystem;
-+use Magento\TestFramework\Helper\CacheCleaner;
-+use Magento\Framework\Translate;
-+use Magento\Framework\App\AreaList;
-+use Magento\Framework\Phrase;
-+use Magento\Framework\Phrase\RendererInterface;
-+
-+/**
-+ * Class for testing translation.
-+ */
-+class PreProcessorTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var PreProcessor
-+     */
-+    private $model;
-+
-+    /**
-+     * @var RendererInterface
-+     */
-+    private $origRenderer;
-+
-+    /**
-+     * Set up.
-+     */
-+    protected function setUp()
-+    {
-+        $viewFileSystem = $this->createPartialMock(FileSystem::class, ['getLocaleFileName']);
-+        $viewFileSystem->expects($this->any())->method('getLocaleFileName')
-+            ->willReturn(
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-+                dirname(__DIR__) . '/_files/Magento/Store/i18n/en_AU.csv'
-+            );
-+
-+        $objectManager = Bootstrap::getObjectManager();
-+        $objectManager->addSharedInstance($viewFileSystem, FileSystem::class);
-+        $translator = $objectManager->create(Translate::class);
-+        $objectManager->addSharedInstance($translator, Translate::class);
-+        $areaList = $this->getMockBuilder(AreaList::class)->disableOriginalConstructor()->getMock();
-+        $this->origRenderer = Phrase::getRenderer();
-+        Phrase::setRenderer(
-+            $objectManager->get(RendererInterface::class)
-+        );
-+
-+        $this->model = $objectManager->create(
-+            PreProcessor::class,
-+            [
-+                'translate' => $translator,
-+                'areaList' => $areaList
-+            ]
-+        );
-+
-+        $translator->setLocale('en_AU');
-+        $translator->loadData();
-+    }
-+
-+    /**
-+     * Tear down.
-+     */
-+    protected function tearDown()
-+    {
-+        Phrase::setRenderer($this->origRenderer);
-+    }
-+
-+    /**
-+     * Test for backend translation strategy.
-+     *
-+     * @param string $content
-+     * @param string $translation
-+     * @return void
-+     * @dataProvider contentForTranslateDataProvider
-+     */
-+    public function testProcess(string $content, string $translation)
-+    {
-+        CacheCleaner::cleanAll();
-+        $this->assertEquals($translation, $this->model->translate($content));
-+    }
-+
-+    /**
-+     * Data provider for translation.
-+     *
-+     * @return array
-+     */
-+    public function contentForTranslateDataProvider()
-+    {
-+        return [
-+            'i18n_js_file_error' => [
-+                'setTranslateProp = function (el, original) {
-+            var location = $(el).prop(\'tagName\').toLowerCase(),
-+                translated = $.mage.__(original),
-+                translationData = {
-+                    shown: translated,
-+                    translated: translated,
-+                    original: original
-+                },
-+                translateAttr = composeTranslateAttr(translationData, location);
-+
-+            $(el).attr(\'data-translate\', translateAttr);
-+
-+            setText(el, translationData.shown);
-+        },',
-+                'setTranslateProp = function (el, original) {
-+            var location = $(el).prop(\'tagName\').toLowerCase(),
-+                translated = $.mage.__(original),
-+                translationData = {
-+                    shown: translated,
-+                    translated: translated,
-+                    original: original
-+                },
-+                translateAttr = composeTranslateAttr(translationData, location);
-+
-+            $(el).attr(\'data-translate\', translateAttr);
-+
-+            setText(el, translationData.shown);
-+        },'
-+            ],
-+            'checkTranslationWithWhiteSpaces' => [
-+                <<<i18n
-+                title: $.mage.__(
-+                    'Original value for Magento_Store module'
-+                ),
-+                title: \$t(
-+                    'Original value for Magento_Store module'
-+                );
-+                title: jQuery.mage.__(
-+                    'Original value for Magento_Store module'
-+                );
-+i18n
-+                ,
-+                <<<i18n
-+                title: 'Translated value for Magento_Store module in en_AU',
-+                title: 'Translated value for Magento_Store module in en_AU';
-+                title: 'Translated value for Magento_Store module in en_AU';
-+i18n
-+            ],
-+            'checkTranslationWithReplace' => [
-+                <<<i18n
-+                $.mage.__('The maximum you may purchase is %1.').replace('%1', params.maxAllowed);
-+                \$t('The maximum you may purchase is %1.').replace('%1', params.maxAllowed);
-+i18n
-+                ,
-+                <<<i18n
-+                'The maximum you may purchase is %1.'.replace('%1', params.maxAllowed);
-+                'The maximum you may purchase is %1.'.replace('%1', params.maxAllowed);
-+i18n
-+            ],
-+            'checkAvoidingMatchingWithJsInString' => [
-+                <<<i18n
-+                \$t('Payment ' + this.getTitle() + ' can\'t be initialized')
-+                \$t(
-+                    'Set unique country-state combinations within the same fixed product tax. ' +
-+                    'Verify the combinations and try again.'
-+                )
-+i18n
-+                ,
-+                <<<i18n
-+                \$t('Payment ' + this.getTitle() + ' can\'t be initialized')
-+                \$t(
-+                    'Set unique country-state combinations within the same fixed product tax. ' +
-+                    'Verify the combinations and try again.'
-+                )
-+i18n
-+            ],
-+            'checkAvoidMatchingPhtml' => [
-+                <<<i18n
-+                globalMessageList.addErrorMessage({
-+                        message: \$t(<?= /* @noEscape */ json_encode(\$params['error_msg'])?>)
-+                    });
-+i18n
-+                ,
-+                <<<i18n
-+                globalMessageList.addErrorMessage({
-+                        message: \$t(<?= /* @noEscape */ json_encode(\$params['error_msg'])?>)
-+                    });
-+i18n
-+            ]
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Ui/Controller/Adminhtml/Index/Renderer/HandleTest.php b/dev/tests/integration/testsuite/Magento/Ui/Controller/Adminhtml/Index/Renderer/HandleTest.php
-new file mode 100644
-index 00000000000..dbe721a76e2
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Ui/Controller/Adminhtml/Index/Renderer/HandleTest.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Ui\Controller\Adminhtml\Index\Renderer;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\Framework\AuthorizationInterface;
-+
-+/**
-+ * @magentoAppArea adminhtml
-+ */
-+class HandleTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-+{
-+    /**
-+     * @magentoDataFixture  Magento/Customer/_files/customer.php
-+     */
-+    public function testExecuteWhenUserDoesNotHavePermission()
-+    {
-+        Bootstrap::getObjectManager()->configure([
-+            'preferences' => [
-+                AuthorizationInterface::class => \Magento\Ui\Model\AuthorizationMock::class
-+            ]
-+        ]);
-+        $this->getRequest()->setParam('handle', 'customer_index_index');
-+        $this->getRequest()->setParam('namespace', 'customer_listing');
-+        $this->getRequest()->setParam('sorting%5Bfield%5D', 'entity_id');
-+        $this->getRequest()->setParam('paging%5BpageSize%5D', 20);
-+        $this->getRequest()->setParam('isAjax', 1);
-+        $this->dispatch('backend/mui/index/render_handle');
-+        $output = $this->getResponse()->getBody();
-+        $this->assertEmpty($output, 'The acl restriction wasn\'t applied properly');
-+    }
-+
-+    /**
-+     * @magentoDataFixture  Magento/Customer/_files/customer.php
-+     */
-+    public function testExecuteWhenUserHasPermission()
-+    {
-+        $this->getRequest()->setParam('handle', 'customer_index_index');
-+        $this->getRequest()->setParam('namespace', 'customer_listing');
-+        $this->getRequest()->setParam('sorting%5Bfield%5D', 'entity_id');
-+        $this->getRequest()->setParam('paging%5BpageSize%5D', 20);
-+        $this->getRequest()->setParam('isAjax', 1);
-+        $this->dispatch('backend/mui/index/render_handle');
-+        $output = $this->getResponse()->getBody();
-+        $this->assertNotEmpty($output, 'The acl restriction wasn\'t applied properly');
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Ui/Model/AuthorizationMock.php b/dev/tests/integration/testsuite/Magento/Ui/Model/AuthorizationMock.php
-new file mode 100644
-index 00000000000..76f472f30eb
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Ui/Model/AuthorizationMock.php
-@@ -0,0 +1,27 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Ui\Model;
-+
-+/**
-+ * Class AuthorizationMock
-+ */
-+class AuthorizationMock extends \Magento\Framework\Authorization
-+{
-+    /**
-+     * Check current user permission on resource and privilege
-+     *
-+     * @param   string $resource
-+     * @param   string $privilege
-+     * @return  boolean
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+     */
-+    public function isAllowed($resource, $privilege = null)
-+    {
-+        return $resource !== 'Magento_Customer::manage';
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
-index aa301e8d3e4..dfe12f825c3 100644
---- a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
-@@ -3,12 +3,25 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Ups\Model;
- 
-+use Magento\Framework\App\Config\ReinitableConfigInterface;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\HTTP\AsyncClient\Response;
-+use Magento\Framework\HTTP\AsyncClientInterface;
-+use Magento\Quote\Model\Quote\Address\RateRequest;
- use Magento\TestFramework\Helper\Bootstrap;
- use Magento\Quote\Model\Quote\Address\RateRequestFactory;
-+use Magento\TestFramework\HTTP\AsyncClientInterfaceMock;
-+use PHPUnit\Framework\TestCase;
-+use Magento\Shipping\Model\Shipment\Request;
- 
--class CarrierTest extends \PHPUnit\Framework\TestCase
-+/**
-+ * Integration tests for Carrier model class
-+ */
-+class CarrierTest extends TestCase
- {
-     /**
-      * @var Carrier
-@@ -16,11 +29,23 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-     private $carrier;
- 
-     /**
--     * @return void
-+     * @var AsyncClientInterfaceMock
-+     */
-+    private $httpClient;
-+
-+    /**
-+     * @var ReinitableConfigInterface
-+     */
-+    private $config;
-+
-+    /**
-+     * @inheritDoc
-      */
-     protected function setUp()
-     {
-         $this->carrier = Bootstrap::getObjectManager()->create(Carrier::class);
-+        $this->httpClient = Bootstrap::getObjectManager()->get(AsyncClientInterface::class);
-+        $this->config = Bootstrap::getObjectManager()->get(ReinitableConfigInterface::class);
-     }
- 
-     /**
-@@ -63,7 +88,10 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Collect free rates.
-+     *
-      * @magentoConfigFixture current_store carriers/ups/active 1
-+     * @magentoConfigFixture current_store carriers/ups/type UPS
-      * @magentoConfigFixture current_store carriers/ups/allowed_methods 1DA,GND
-      * @magentoConfigFixture current_store carriers/ups/free_method GND
-      */
-@@ -84,4 +112,142 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(0, $methods['GND']['price']);
-         $this->assertNotEquals(0, $methods['1DA']['price']);
-     }
-+
-+    /**
-+     * Test processing rates response.
-+     *
-+     * @param int $negotiable
-+     * @param int $tax
-+     * @param int $responseId
-+     * @param string $method
-+     * @param float $price
-+     * @return void
-+     * @dataProvider collectRatesDataProvider
-+     * @magentoConfigFixture default_store shipping/origin/country_id GB
-+     * @magentoConfigFixture default_store carriers/ups/type UPS_XML
-+     * @magentoConfigFixture default_store carriers/ups/active 1
-+     * @magentoConfigFixture default_store carriers/ups/shipper_number 12345
-+     * @magentoConfigFixture default_store carriers/ups/origin_shipment Shipments Originating in the European Union
-+     * @magentoConfigFixture default_store carriers/ups/username user
-+     * @magentoConfigFixture default_store carriers/ups/password pass
-+     * @magentoConfigFixture default_store carriers/ups/access_license_number acn
-+     * @magentoConfigFixture default_store currency/options/allow GBP,USD,EUR
-+     * @magentoConfigFixture default_store currency/options/base GBP
-+     */
-+    public function testCollectRates(int $negotiable, int $tax, int $responseId, string $method, float $price): void
-+    {
-+        $request = Bootstrap::getObjectManager()->create(
-+            RateRequest::class,
-+            [
-+                'data' => [
-+                    'dest_country' => 'GB',
-+                    'dest_postal' => '01104',
-+                    'product' => '11',
-+                    'action' => 'Rate',
-+                    'unit_measure' => 'KGS',
-+                    'base_currency' => new DataObject(['code' => 'GBP'])
-+                ]
-+            ]
-+        );
-+        //phpcs:disable Magento2.Functions.DiscouragedFunction
-+        $this->httpClient->nextResponses(
-+            [
-+                new Response(
-+                    200,
-+                    [],
-+                    file_get_contents(__DIR__ ."/../_files/ups_rates_response_option$responseId.xml")
-+                )
-+            ]
-+        );
-+        //phpcs:enable Magento2.Functions.DiscouragedFunction
-+        $this->config->setValue('carriers/ups/negotiated_active', $negotiable, 'store');
-+        $this->config->setValue('carriers/ups/include_taxes', $tax, 'store');
-+        $this->config->setValue('carriers/ups/allowed_methods', $method, 'store');
-+
-+        $rates = $this->carrier->collectRates($request)->getAllRates();
-+        $this->assertEquals($price, $rates[0]->getPrice());
-+        $this->assertEquals($method, $rates[0]->getMethod());
-+    }
-+
-+    /**
-+     * Get list of rates variations
-+     *
-+     * @return array
-+     */
-+    public function collectRatesDataProvider()
-+    {
-+        return [
-+            [0, 0, 1, '11', 6.45 ],
-+            [0, 0, 2, '65', 29.59 ],
-+            [0, 1, 3, '11', 7.74 ],
-+            [0, 1, 4, '65', 29.59 ],
-+            [1, 0, 5, '11', 9.35 ],
-+            [1, 0, 6, '65', 41.61 ],
-+            [1, 1, 7, '11', 11.22 ],
-+            [1, 1, 8, '65', 41.61 ],
-+        ];
-+    }
-+
-+    /**
-+     * Test shipping a package.
-+     *
-+     *
-+     * @magentoConfigFixture default_store shipping/origin/country_id GB
-+     * @magentoConfigFixture default_store carriers/ups/type UPS_XML
-+     * @magentoConfigFixture default_store carriers/ups/active 1
-+     * @magentoConfigFixture default_store carriers/ups/shipper_number 12345
-+     * @magentoConfigFixture default_store carriers/ups/origin_shipment Shipments Originating in the European Union
-+     * @magentoConfigFixture default_store carriers/ups/username user
-+     * @magentoConfigFixture default_store carriers/ups/password pass
-+     * @magentoConfigFixture default_store carriers/ups/access_license_number acn
-+     * @magentoConfigFixture default_store currency/options/allow GBP,USD,EUR
-+     * @magentoConfigFixture default_store currency/options/base GBP
-+     * @magentoConfigFixture default_store carriers/ups/min_package_weight 2
-+     * @magentoConfigFixture default_store carriers/ups/debug 1
-+     */
-+    public function testRequestToShipment(): void
-+    {
-+        //phpcs:disable Magento2.Functions.DiscouragedFunction
-+        $shipmentResponse = file_get_contents(__DIR__ .'/../_files/ShipmentConfirmResponse.xml');
-+        $acceptResponse = file_get_contents(__DIR__ .'/../_files/ShipmentAcceptResponse.xml');
-+        //phpcs:enable Magento2.Functions.DiscouragedFunction
-+        $this->httpClient->nextResponses(
-+            [
-+                new Response(200, [], $shipmentResponse),
-+                new Response(200, [], $acceptResponse)
-+            ]
-+        );
-+        $request = new Request(
-+            [
-+                'packages' => [
-+                    'package' => [
-+                        'params' => [
-+                            'width' => '3',
-+                            'length' => '3',
-+                            'height' => '3',
-+                            'dimension_units' => 'INCH',
-+                            'weight_units' => 'POUND',
-+                            'weight' => '0.454000000001',
-+                            'customs_value' => '10.00',
-+                            'container' => 'Small Express Box',
-+                        ],
-+                        'items' => [
-+                            'item1' => [
-+                                'name' => 'item_name',
-+                            ],
-+                        ],
-+                    ],
-+                ]
-+            ]
-+        );
-+
-+        $result = $this->carrier->requestToShipment($request);
-+        $this->assertEmpty($result->getErrors());
-+        $this->assertNotEmpty($result->getInfo());
-+        $this->assertEquals(
-+            '1Z207W886698856557',
-+            $result->getInfo()[0]['tracking_number'],
-+            'Tracking Number must match.'
-+        );
-+    }
- }
-diff --git a/app/code/Magento/Ups/Test/Unit/Fixtures/ShipmentAcceptResponse.xml b/dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentAcceptResponse.xml
-similarity index 100%
-rename from app/code/Magento/Ups/Test/Unit/Fixtures/ShipmentAcceptResponse.xml
-rename to dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentAcceptResponse.xml
-diff --git a/app/code/Magento/Ups/Test/Unit/Fixtures/ShipmentConfirmResponse.xml b/dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentConfirmResponse.xml
-similarity index 100%
-rename from app/code/Magento/Ups/Test/Unit/Fixtures/ShipmentConfirmResponse.xml
-rename to dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentConfirmResponse.xml
-diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option1.xml b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option1.xml
-new file mode 100644
-index 00000000000..658bf756aac
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option1.xml
-@@ -0,0 +1,164 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<RatingServiceSelectionResponse>
-+    <Response>
-+        <TransactionReference>
-+            <CustomerContext>Rating and Service</CustomerContext>
-+            <XpciVersion>1.0</XpciVersion>
-+        </TransactionReference>
-+        <ResponseStatusCode>1</ResponseStatusCode>
-+        <ResponseStatusDescription>Success</ResponseStatusDescription>
-+    </Response>
-+    <RatedShipment>
-+        <Service>
-+            <Code>11</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>6.45</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>6.45</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery/>
-+        <ScheduledDeliveryTime/>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Service>
-+            <Code>65</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>10.25</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>10.25</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>12:00 Noon</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Service>
-+            <Code>54</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>15.02</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>15.02</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>9:00 A.M.</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+</RatingServiceSelectionResponse>
-diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option2.xml b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option2.xml
-new file mode 100644
-index 00000000000..88fe2de81a3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option2.xml
-@@ -0,0 +1,213 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<RatingServiceSelectionResponse>
-+    <Response>
-+        <TransactionReference>
-+            <CustomerContext>Rating and Service</CustomerContext>
-+            <XpciVersion>1.0</XpciVersion>
-+        </TransactionReference>
-+        <ResponseStatusCode>1</ResponseStatusCode>
-+        <ResponseStatusDescription>Success</ResponseStatusDescription>
-+    </Response>
-+    <RatedShipment>
-+        <Service>
-+            <Code>07</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>35.16</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>35.16</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>10:30 A.M.</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Service>
-+            <Code>08</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>34.15</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>34.15</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery/>
-+        <ScheduledDeliveryTime/>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Service>
-+            <Code>65</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>29.59</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>29.59</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime/>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Service>
-+            <Code>54</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>45.18</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>45.18</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>8:30 A.M.</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+</RatingServiceSelectionResponse>
-diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option3.xml b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option3.xml
-new file mode 100644
-index 00000000000..1732594c57e
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option3.xml
-@@ -0,0 +1,209 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<RatingServiceSelectionResponse>
-+    <Response>
-+        <TransactionReference>
-+            <CustomerContext>Rating and Service</CustomerContext>
-+            <XpciVersion>1.0</XpciVersion>
-+        </TransactionReference>
-+        <ResponseStatusCode>1</ResponseStatusCode>
-+        <ResponseStatusDescription>Success</ResponseStatusDescription>
-+    </Response>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>01</Code>
-+            <Description>Taxes are included in the shipping cost and apply to the transportation charges
-+                but additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>11</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>6.45</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TaxCharges>
-+            <Type>VAT</Type>
-+            <MonetaryValue>1.29</MonetaryValue>
-+        </TaxCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>6.45</MonetaryValue>
-+        </TotalCharges>
-+        <TotalChargesWithTaxes>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>7.74</MonetaryValue>
-+        </TotalChargesWithTaxes>
-+        <GuaranteedDaysToDelivery/>
-+        <ScheduledDeliveryTime/>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>01</Code>
-+            <Description>Taxes are included in the shipping cost and apply to the transportation charges
-+                but additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>65</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>10.25</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TaxCharges>
-+            <Type>VAT</Type>
-+            <MonetaryValue>2.05</MonetaryValue>
-+        </TaxCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>10.25</MonetaryValue>
-+        </TotalCharges>
-+        <TotalChargesWithTaxes>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>12.30</MonetaryValue>
-+        </TotalChargesWithTaxes>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>12:00 Noon</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>01</Code>
-+            <Description>Taxes are included in the shipping cost and apply to the transportation charges
-+                but additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>54</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>15.02</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TaxCharges>
-+            <Type>VAT</Type>
-+            <MonetaryValue>3.00</MonetaryValue>
-+        </TaxCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>15.02</MonetaryValue>
-+        </TotalCharges>
-+        <TotalChargesWithTaxes>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>18.02</MonetaryValue>
-+        </TotalChargesWithTaxes>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>9:00 A.M.</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+</RatingServiceSelectionResponse>
-diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option4.xml b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option4.xml
-new file mode 100644
-index 00000000000..8de6b459827
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option4.xml
-@@ -0,0 +1,237 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<RatingServiceSelectionResponse>
-+    <Response>
-+        <TransactionReference>
-+            <CustomerContext>Rating and Service</CustomerContext>
-+            <XpciVersion>1.0</XpciVersion>
-+        </TransactionReference>
-+        <ResponseStatusCode>1</ResponseStatusCode>
-+        <ResponseStatusDescription>Success</ResponseStatusDescription>
-+    </Response>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>03</Code>
-+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>07</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>35.16</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>35.16</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>10:30 A.M.</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>03</Code>
-+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>08</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>34.15</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>34.15</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery/>
-+        <ScheduledDeliveryTime/>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>03</Code>
-+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>65</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>29.59</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>29.59</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime/>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>03</Code>
-+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>54</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>45.18</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>45.18</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>8:30 A.M.</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+    </RatedShipment>
-+</RatingServiceSelectionResponse>
-diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option5.xml b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option5.xml
-new file mode 100644
-index 00000000000..7b8b3a90678
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option5.xml
-@@ -0,0 +1,188 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<RatingServiceSelectionResponse>
-+    <Response>
-+        <TransactionReference>
-+            <CustomerContext>Rating and Service</CustomerContext>
-+            <XpciVersion>1.0</XpciVersion>
-+        </TransactionReference>
-+        <ResponseStatusCode>1</ResponseStatusCode>
-+        <ResponseStatusDescription>Success</ResponseStatusDescription>
-+    </Response>
-+    <RatedShipment>
-+        <Service>
-+            <Code>11</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>6.45</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>6.45</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery/>
-+        <ScheduledDeliveryTime/>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>9.35</MonetaryValue>
-+                </GrandTotal>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Service>
-+            <Code>65</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>10.25</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>10.25</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>12:00 Noon</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>13.33</MonetaryValue>
-+                </GrandTotal>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Service>
-+            <Code>54</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>15.02</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>15.02</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>9:00 A.M.</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>74.83</MonetaryValue>
-+                </GrandTotal>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+</RatingServiceSelectionResponse>
-diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option6.xml b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option6.xml
-new file mode 100644
-index 00000000000..97a19e5086d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option6.xml
-@@ -0,0 +1,245 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<RatingServiceSelectionResponse>
-+    <Response>
-+        <TransactionReference>
-+            <CustomerContext>Rating and Service</CustomerContext>
-+            <XpciVersion>1.0</XpciVersion>
-+        </TransactionReference>
-+        <ResponseStatusCode>1</ResponseStatusCode>
-+        <ResponseStatusDescription>Success</ResponseStatusDescription>
-+    </Response>
-+    <RatedShipment>
-+        <Service>
-+            <Code>07</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>35.16</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>35.16</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>10:30 A.M.</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>44.37</MonetaryValue>
-+                </GrandTotal>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Service>
-+            <Code>08</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>34.15</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>34.15</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery/>
-+        <ScheduledDeliveryTime/>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>60.57</MonetaryValue>
-+                </GrandTotal>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Service>
-+            <Code>65</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>29.59</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>29.59</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime/>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>41.61</MonetaryValue>
-+                </GrandTotal>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Service>
-+            <Code>54</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>45.18</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>45.18</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>8:30 A.M.</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>157.47</MonetaryValue>
-+                </GrandTotal>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+</RatingServiceSelectionResponse>
-diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option7.xml b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option7.xml
-new file mode 100644
-index 00000000000..e84e3aa7aef
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option7.xml
-@@ -0,0 +1,233 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<RatingServiceSelectionResponse>
-+    <Response>
-+        <TransactionReference>
-+            <CustomerContext>Rating and Service</CustomerContext>
-+            <XpciVersion>1.0</XpciVersion>
-+        </TransactionReference>
-+        <ResponseStatusCode>1</ResponseStatusCode>
-+        <ResponseStatusDescription>Success</ResponseStatusDescription>
-+    </Response>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>01</Code>
-+            <Description>Taxes are included in the shipping cost and apply to the transportation charges
-+                but additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>11</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>6.45</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>6.45</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery/>
-+        <ScheduledDeliveryTime/>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <TaxCharges>
-+                <Type>VAT</Type>
-+                <MonetaryValue>1.87</MonetaryValue>
-+            </TaxCharges>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>9.35</MonetaryValue>
-+                </GrandTotal>
-+                <TotalChargesWithTaxes>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>11.22</MonetaryValue>
-+                </TotalChargesWithTaxes>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>01</Code>
-+            <Description>Taxes are included in the shipping cost and apply to the transportation charges
-+                but additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>65</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>10.25</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>10.25</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>12:00 Noon</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <TaxCharges>
-+                <Type>VAT</Type>
-+                <MonetaryValue>2.66</MonetaryValue>
-+            </TaxCharges>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>13.33</MonetaryValue>
-+                </GrandTotal>
-+                <TotalChargesWithTaxes>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>15.99</MonetaryValue>
-+                </TotalChargesWithTaxes>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>01</Code>
-+            <Description>Taxes are included in the shipping cost and apply to the transportation charges
-+                but additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>54</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>15.02</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>15.02</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>9:00 A.M.</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <TaxCharges>
-+                <Type>VAT</Type>
-+                <MonetaryValue>14.97</MonetaryValue>
-+            </TaxCharges>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>74.83</MonetaryValue>
-+                </GrandTotal>
-+                <TotalChargesWithTaxes>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>89.80</MonetaryValue>
-+                </TotalChargesWithTaxes>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+</RatingServiceSelectionResponse>
-diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option8.xml b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option8.xml
-new file mode 100644
-index 00000000000..b5711f9f12b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/ups_rates_response_option8.xml
-@@ -0,0 +1,269 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<RatingServiceSelectionResponse>
-+    <Response>
-+        <TransactionReference>
-+            <CustomerContext>Rating and Service</CustomerContext>
-+            <XpciVersion>1.0</XpciVersion>
-+        </TransactionReference>
-+        <ResponseStatusCode>1</ResponseStatusCode>
-+        <ResponseStatusDescription>Success</ResponseStatusDescription>
-+    </Response>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>03</Code>
-+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>07</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>35.16</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>35.16</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>10:30 A.M.</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>44.37</MonetaryValue>
-+                </GrandTotal>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>03</Code>
-+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>08</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>34.15</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>34.15</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery/>
-+        <ScheduledDeliveryTime/>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>60.57</MonetaryValue>
-+                </GrandTotal>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>03</Code>
-+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>65</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>29.59</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>29.59</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime/>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>41.61</MonetaryValue>
-+                </GrandTotal>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+    <RatedShipment>
-+        <Disclaimer>
-+            <Code>03</Code>
-+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
-+                due.
-+            </Description>
-+        </Disclaimer>
-+        <Service>
-+            <Code>54</Code>
-+        </Service>
-+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
-+            rates
-+        </RatedShipmentWarning>
-+        <BillingWeight>
-+            <UnitOfMeasurement>
-+                <Code>KGS</Code>
-+            </UnitOfMeasurement>
-+            <Weight>2.0</Weight>
-+        </BillingWeight>
-+        <TransportationCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>45.18</MonetaryValue>
-+        </TransportationCharges>
-+        <ServiceOptionsCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>0.00</MonetaryValue>
-+        </ServiceOptionsCharges>
-+        <TotalCharges>
-+            <CurrencyCode>GBP</CurrencyCode>
-+            <MonetaryValue>45.18</MonetaryValue>
-+        </TotalCharges>
-+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
-+        <ScheduledDeliveryTime>8:30 A.M.</ScheduledDeliveryTime>
-+        <RatedPackage>
-+            <TransportationCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TransportationCharges>
-+            <ServiceOptionsCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </ServiceOptionsCharges>
-+            <TotalCharges>
-+                <CurrencyCode/>
-+                <MonetaryValue/>
-+            </TotalCharges>
-+            <Weight>2.0</Weight>
-+            <BillingWeight>
-+                <UnitOfMeasurement>
-+                    <Code/>
-+                </UnitOfMeasurement>
-+                <Weight/>
-+            </BillingWeight>
-+        </RatedPackage>
-+        <NegotiatedRates>
-+            <NetSummaryCharges>
-+                <GrandTotal>
-+                    <CurrencyCode>GBP</CurrencyCode>
-+                    <MonetaryValue>157.47</MonetaryValue>
-+                </GrandTotal>
-+            </NetSummaryCharges>
-+        </NegotiatedRates>
-+    </RatedShipment>
-+</RatingServiceSelectionResponse>
-diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
-index 5593cecb10d..74d6edaef84 100644
---- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
-+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
-@@ -8,11 +8,13 @@ namespace Magento\UrlRewrite\Controller;
- use Magento\TestFramework\TestCase\AbstractController;
- use Magento\Framework\App\Response\Http as HttpResponse;
- 
-+/**
-+ * Class to test Match corresponding URL Rewrite
-+ */
- class UrlRewriteTest extends AbstractController
- {
-     /**
-      * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrite.php
--     * @magentoAppIsolation enabled
-      *
-      * @covers \Magento\UrlRewrite\Controller\Router::match
-      * @covers \Magento\UrlRewrite\Model\Storage\DbStorage::doFindOneByData
-@@ -32,14 +34,16 @@ class UrlRewriteTest extends AbstractController
-         /** @var HttpResponse $response */
-         $response = $this->getResponse();
-         $code = $response->getHttpResponseCode();
--        $location = $response->getHeader('Location')->getFieldValue();
--
-         $this->assertEquals($expectedCode, $code, 'Invalid response code');
--        $this->assertStringEndsWith(
--            $redirect,
--            $location,
--            'Invalid location header'
--        );
-+
-+        if ($expectedCode !== 200) {
-+            $location = $response->getHeader('Location')->getFieldValue();
-+            $this->assertStringEndsWith(
-+                $redirect,
-+                $location,
-+                'Invalid location header'
-+            );
-+        }
-     }
- 
-     /**
-@@ -72,6 +76,11 @@ class UrlRewriteTest extends AbstractController
-                 'request' => '/page-similar/',
-                 'redirect' => '/page-b',
-             ],
-+            'Use Case #7: Request with query params' => [
-+                'request' => '/enable-cookies/?test-param',
-+                'redirect' => '',
-+                200,
-+            ],
-         ];
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php
-index 2cb86358667..a8ff9e41178 100644
---- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php
-+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php
-@@ -92,7 +92,8 @@ class RewriteUrlTest extends \PHPUnit\Framework\TestCase
-         $storeRepository = $this->objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
-         $toStore = $storeRepository->get($toStoreCode);
- 
--        $redirectUrl = $expectedUrl = "http://localhost/page-c";
-+        $redirectUrl = "http://localhost/index.php/page-c/";
-+        $expectedUrl = "http://localhost/index.php/page-c-on-2nd-store";
- 
-         $this->assertEquals($expectedUrl, $this->storeSwitcher->switch($fromStore, $toStore, $redirectUrl));
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/UrlFinderInterfaceTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/UrlFinderInterfaceTest.php
-new file mode 100644
-index 00000000000..b6055f14e79
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/UrlFinderInterfaceTest.php
-@@ -0,0 +1,71 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\UrlRewrite\Model;
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-+
-+/**
-+ * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrites.php
-+ */
-+class UrlFinderInterfaceTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var UrlFinderInterface
-+     */
-+    private $urlFinder;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->urlFinder = Bootstrap::getObjectManager()->create(UrlFinderInterface::class);
-+    }
-+
-+    /**
-+     * @dataProvider findOneDataProvider
-+     * @param string $requestPath
-+     * @param string $targetPath
-+     * @param int $redirectType
-+     */
-+    public function testFindOneByData(string $requestPath, string $targetPath, int $redirectType)
-+    {
-+        $data = [
-+            UrlRewrite::REQUEST_PATH => $requestPath,
-+        ];
-+        $urlRewrite = $this->urlFinder->findOneByData($data);
-+        $this->assertEquals($targetPath, $urlRewrite->getTargetPath());
-+        $this->assertEquals($redirectType, $urlRewrite->getRedirectType());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function findOneDataProvider(): array
-+    {
-+        return [
-+            ['string', 'test_page1', 0],
-+            ['string/', 'string', 301],
-+            ['string_permanent', 'test_page1', 301],
-+            ['string_permanent/', 'test_page1', 301],
-+            ['string_temporary', 'test_page1', 302],
-+            ['string_temporary/', 'test_page1', 302],
-+            ['строка', 'test_page1', 0],
-+            ['строка/', 'строка', 301],
-+            [urlencode('строка'), 'test_page2', 0],
-+            [urlencode('строка') . '/', urlencode('строка'), 301],
-+            ['другая_строка', 'test_page1', 302],
-+            ['другая_строка/', 'test_page1', 302],
-+            [urlencode('другая_строка'), 'test_page1', 302],
-+            [urlencode('другая_строка') . '/', 'test_page1', 302],
-+            ['السلسلة', 'test_page1', 0],
-+            [urlencode('السلسلة'), 'test_page1', 0],
-+        ];
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_not_existing_entity.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_not_existing_entity.php
-new file mode 100644
-index 00000000000..052eac6f79d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_not_existing_entity.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\UrlRewrite\Model\UrlRewrite;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var int Product Id */
-+$productId = 708579;
-+
-+/** @var UrlRewrite $urlRewrite */
-+$urlRewrite = $objectManager->create(UrlRewrite::class);
-+$urlRewrite->setEntityType('custom')
-+    ->setRequestPath('non-exist-entity.html')
-+    ->setTargetPath('catalog/product/view/id/' . $productId)
-+    ->setRedirectType(0)
-+    ->setStoreId(1)
-+    ->setDescription(null)
-+    ->setIsAutogenerated(0);
-+
-+$urlRewrite->save();
-diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_not_existing_entity_rollback.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_not_existing_entity_rollback.php
-new file mode 100644
-index 00000000000..12cbd2c704b
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_not_existing_entity_rollback.php
-@@ -0,0 +1,15 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\UrlRewrite\Model\UrlRewrite;
-+
-+$objectManager = Bootstrap::getObjectManager();
-+
-+/** @var UrlRewrite $urlRewrite */
-+$urlRewrite = $objectManager->create(UrlRewrite::class);
-+$urlRewrite->load('non-exist-entity.html', 'request_path');
-+$urlRewrite->delete();
-diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php
-index 19cce769b1c..8fec06284a7 100644
---- a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php
-+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php
-@@ -21,7 +21,6 @@ $urlRewriteCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManage
- $collection = $urlRewriteCollection
-     ->addFieldToFilter('entity_type', 'custom')
-     ->addFieldToFilter('request_path', ['page-a', 'page-b', 'page-c'])
--    ->addFieldToFilter('entity_id', '333')
-     ->load()
-     ->walk('delete');
- 
-diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites.php
-new file mode 100644
-index 00000000000..9edc6507308
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites.php
-@@ -0,0 +1,42 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+$rewritesData = [
-+    [
-+        'string', 'test_page1', 0
-+    ],
-+    [
-+        'string_permanent', 'test_page1', \Magento\UrlRewrite\Model\OptionProvider::PERMANENT
-+    ],
-+    [
-+        'string_temporary', 'test_page1', \Magento\UrlRewrite\Model\OptionProvider::TEMPORARY
-+    ],
-+    [
-+        'строка', 'test_page1', 0
-+    ],
-+    [
-+        urlencode('строка'), 'test_page2', 0
-+    ],
-+    [
-+        'другая_строка', 'test_page1', \Magento\UrlRewrite\Model\OptionProvider::TEMPORARY
-+    ],
-+    [
-+        'السلسلة', 'test_page1', 0
-+    ],
-+];
-+
-+$rewriteResource = $objectManager->create(\Magento\UrlRewrite\Model\ResourceModel\UrlRewrite::class);
-+foreach ($rewritesData as $rewriteData) {
-+    list ($requestPath, $targetPath, $redirectType) = $rewriteData;
-+    $rewrite = $objectManager->create(\Magento\UrlRewrite\Model\UrlRewrite::class);
-+    $rewrite->setEntityType('custom')
-+        ->setRequestPath($requestPath)
-+        ->setTargetPath($targetPath)
-+        ->setRedirectType($redirectType);
-+    $rewriteResource->save($rewrite);
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites_rollback.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites_rollback.php
-new file mode 100644
-index 00000000000..a98f947d614
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites_rollback.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+$registry = $objectManager->get(\Magento\Framework\Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+$urlRewriteCollection = $objectManager->create(\Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection::class);
-+$collection = $urlRewriteCollection
-+    ->addFieldToFilter('target_path', ['test_page1', 'test_page2'])
-+    ->load()
-+    ->walk('delete');
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php
-index 1a726c4e2c1..5f4964d042d 100644
---- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php
-+++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\User\Controller\Adminhtml;
- 
-+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
-+use Magento\TestFramework\Helper\Bootstrap;
-+
- /**
-  * Test class for \Magento\User\Controller\Adminhtml\Auth
-  *
-@@ -35,7 +38,7 @@ class AuthTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-         $this->dispatch('backend/admin/auth/forgotpassword');
-         $this->assertRedirect(
-             $this->equalTo(
--                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-+                Bootstrap::getObjectManager()->get(
-                     \Magento\Backend\Helper\Data::class
-                 )->getHomePageUrl()
-             )
-@@ -51,22 +54,25 @@ class AuthTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-      */
-     public function testEmailSendForgotPasswordAction()
-     {
--        $transportBuilderMock = $this->prepareEmailMock(
--            1,
--            'admin_emails_forgot_email_template',
--            'general'
-+        /** @var TransportBuilderMock $transportMock */
-+        $transportMock = Bootstrap::getObjectManager()->get(
-+            TransportBuilderMock::class
-         );
--        $this->addMockToClass($transportBuilderMock, \Magento\User\Model\User::class);
--
-         $this->getRequest()->setPostValue('email', 'adminUser@example.com');
-         $this->dispatch('backend/admin/auth/forgotpassword');
-         $this->assertRedirect(
-             $this->equalTo(
--                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-+                Bootstrap::getObjectManager()->get(
-                     \Magento\Backend\Helper\Data::class
-                 )->getHomePageUrl()
-             )
-         );
-+        $message = $transportMock->getSentMessage();
-+        $this->assertNotEmpty($message);
-+        $this->assertEquals(
-+            __('Password Reset Confirmation for %1', ['John Doe'])->render(),
-+            $message->getSubject()
-+        );
-     }
- 
-     /**
-@@ -79,13 +85,13 @@ class AuthTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-     public function testResetPasswordAction()
-     {
-         /** @var $user \Magento\User\Model\User */
--        $user = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+        $user = Bootstrap::getObjectManager()->create(
-             \Magento\User\Model\User::class
-         )->loadByUsername(
-             'dummy_username'
-         );
-         $this->assertNotEmpty($user->getId(), 'Broken fixture');
--        $resetPasswordToken = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-+        $resetPasswordToken = Bootstrap::getObjectManager()->get(
-             \Magento\User\Helper\Data::class
-         )->generateResetPasswordLinkToken();
-         $user->changeResetPasswordLinkToken($resetPasswordToken);
-@@ -123,7 +129,7 @@ class AuthTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-      */
-     public function testResetPasswordPostAction($password, $passwordConfirmation, $isPasswordChanged)
-     {
--        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $objectManager = Bootstrap::getObjectManager();
- 
-         /** @var $user \Magento\User\Model\User */
-         $user = $objectManager->create(\Magento\User\Model\User::class);
-@@ -203,7 +209,7 @@ class AuthTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
-         );
- 
--        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $objectManager = Bootstrap::getObjectManager();
- 
-         /** @var \Magento\Backend\Helper\Data $backendHelper */
-         $backendHelper = $objectManager->get(\Magento\Backend\Helper\Data::class);
-@@ -218,7 +224,7 @@ class AuthTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-      */
-     public function testResetPasswordPostActionWithInvalidPassword()
-     {
--        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+        $objectManager = Bootstrap::getObjectManager();
- 
-         $user = $objectManager->create(\Magento\User\Model\User::class);
-         $user->loadByUsername('dummy_username');
-diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/Locks/GridTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/Locks/GridTest.php
-index 4a1c8c722b1..69265f33b30 100644
---- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/Locks/GridTest.php
-+++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/Locks/GridTest.php
-@@ -5,7 +5,12 @@
-  */
- namespace Magento\User\Controller\Adminhtml\Locks;
- 
--class GridTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-+use Magento\TestFramework\TestCase\AbstractBackendController;
-+
-+/**
-+ * Testing the list of locked users.
-+ */
-+class GridTest extends AbstractBackendController
- {
-     /**
-      * Test index action
-@@ -24,11 +29,11 @@ class GridTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-         $this->assertContains('data-column="failures_num"', $body);
-         $this->assertContains('data-column="lock_expires"', $body);
-         $this->assertRegExp(
--            '/<td data-column\="username"\s*class\="\s*col-name\s*col-username\s*"\s*>\s*adminUser1\s*<\/td>/',
-+            '/<td data-column\="username"\s*class\="[^"]*col-name[^"]*col-username[^"]*"\s*>\s*adminUser1\s*<\/td>/',
-             $body
-         );
-         $this->assertRegExp(
--            '/<td data-column\="username"\s*class\="\s*col-name\s*col-username\s*"\s*>\s*adminUser2\s*<\/td>/',
-+            '/<td data-column\="username"\s*class\="[^"]*col-name[^"]*col-username[^"]*"\s*>\s*adminUser2\s*<\/td>/',
-             $body
-         );
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/Locks/IndexTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/Locks/IndexTest.php
-index c43bd1ef3f7..59cb49c7831 100644
---- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/Locks/IndexTest.php
-+++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/Locks/IndexTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\User\Controller\Adminhtml\Locks;
- 
-+/**
-+ * Testing locked users list.
-+ */
- class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendController
- {
-     /**
-@@ -20,11 +23,11 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
-         $body = $this->getResponse()->getBody();
-         $this->assertContains('<h1 class="page-title">Locked Users</h1>', $body);
-         $this->assertRegExp(
--            '/<td data-column\="username"\s*class\="\s*col-name\s*col-username\s*"\s*>\s*adminUser1\s*<\/td>/',
-+            '/<td data-column\="username"\s*class\="[^"]*col-name[^"]*col-username[^"]*"\s*>\s*adminUser1\s*<\/td>/',
-             $body
-         );
-         $this->assertRegExp(
--            '/<td data-column\="username"\s*class\="\s*col-name\s*col-username\s*"\s*>\s*adminUser2\s*<\/td>/',
-+            '/<td data-column\="username"\s*class\="[^"]*col-name[^"]*col-username\s*"[^"]*>\s*adminUser2\s*<\/td>/',
-             $body
-         );
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php
-index 672cbd7a586..937a26fdf0a 100644
---- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php
-+++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php
-@@ -89,10 +89,6 @@ class InvalidateTokenTest extends \Magento\TestFramework\TestCase\AbstractBacken
-         // invalidate token
-         $this->getRequest()->setParam('user_id', $adminUserId);
-         $this->dispatch('backend/admin/user/invalidateToken');
--        $this->assertSessionMessages(
--            $this->equalTo(['This user has no tokens.']),
--            MessageInterface::TYPE_ERROR
--        );
-     }
- 
-     public function testInvalidateTokenNoUser()
-@@ -110,9 +106,5 @@ class InvalidateTokenTest extends \Magento\TestFramework\TestCase\AbstractBacken
-         // invalidate token
-         $this->getRequest()->setParam('user_id', $adminUserId);
-         $this->dispatch('backend/admin/user/invalidateToken');
--        $this->assertSessionMessages(
--            $this->equalTo(['This user has no tokens.']),
--            MessageInterface::TYPE_ERROR
--        );
-     }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php
-index 995ec5f6bed..9cf8fc43951 100644
---- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php
-+++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php
-@@ -6,6 +6,7 @@
- 
- namespace Magento\User\Controller\Adminhtml;
- 
-+use Magento\Framework\App\Request\Http as HttpRequest;
- use Magento\TestFramework\Bootstrap;
- 
- /**
-@@ -35,6 +36,7 @@ class UserTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-      */
-     public function testSaveActionNoData()
-     {
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->dispatch('backend/admin/user/save');
-         $this->assertRedirect($this->stringContains('backend/admin/user/index/'));
-     }
-@@ -55,6 +57,7 @@ class UserTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-         $userId = $user->getId();
-         $this->assertNotEmpty($userId, 'Broken fixture');
-         $user->delete();
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue('user_id', $userId);
-         $this->dispatch('backend/admin/user/save');
-         $this->assertSessionMessages(
-@@ -72,6 +75,7 @@ class UserTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-     public function testSaveActionMissingCurrentAdminPassword()
-     {
-         $fixture = uniqid();
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue(
-             [
-                 'username' => $fixture,
-@@ -99,6 +103,7 @@ class UserTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-     public function testSaveAction()
-     {
-         $fixture = uniqid();
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue(
-             [
-                 'username' => $fixture,
-@@ -126,6 +131,7 @@ class UserTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-      */
-     public function testSaveActionDuplicateUser()
-     {
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue(
-             [
-                 'username' => 'adminUser',
-@@ -147,13 +153,17 @@ class UserTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-     }
- 
-     /**
--     * Verify password change properly updates fields when the request is valid
-+     * Verify password change properly updates fields when the request is valid.
-+     *
-+     * @param array $postData
-+     * @param bool $isPasswordCorrect
-      *
-      * @magentoDbIsolation enabled
-      * @dataProvider saveActionPasswordChangeDataProvider
-      */
-     public function testSaveActionPasswordChange($postData, $isPasswordCorrect)
-     {
-+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-         $this->getRequest()->setPostValue($postData);
-         $this->dispatch('backend/admin/user/save');
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Usps/Api/GuestCouponManagementTest.php b/dev/tests/integration/testsuite/Magento/Usps/Api/GuestCouponManagementTest.php
-index c4656a4801e..6e1862376e4 100644
---- a/dev/tests/integration/testsuite/Magento/Usps/Api/GuestCouponManagementTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Usps/Api/GuestCouponManagementTest.php
-@@ -8,9 +8,8 @@ declare(strict_types=1);
- namespace Magento\Usps\Api;
- 
- use Magento\Catalog\Model\Product\Type;
--use Magento\Framework\DataObject;
--use Magento\Framework\HTTP\ZendClient;
--use Magento\Framework\HTTP\ZendClientFactory;
-+use Magento\Framework\HTTP\AsyncClient\Response;
-+use Magento\Framework\HTTP\AsyncClientInterface;
- use Magento\Quote\Api\Data\AddressInterface;
- use Magento\Quote\Api\Data\AddressInterfaceFactory;
- use Magento\Quote\Api\Data\CartItemInterface;
-@@ -21,9 +20,9 @@ use Magento\Quote\Api\GuestCartManagementInterface;
- use Magento\Quote\Api\GuestCouponManagementInterface;
- use Magento\Quote\Api\GuestShipmentEstimationInterface;
- use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\HTTP\AsyncClientInterfaceMock;
- use Magento\TestFramework\ObjectManager;
- use PHPUnit\Framework\TestCase;
--use PHPUnit_Framework_MockObject_MockObject as MockObject;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -41,7 +40,7 @@ class GuestCouponManagementTest extends TestCase
-     private $objectManager;
- 
-     /**
--     * @var ZendClient|MockObject
-+     * @var AsyncClientInterfaceMock
-      */
-     private $httpClient;
- 
-@@ -52,25 +51,7 @@ class GuestCouponManagementTest extends TestCase
-     {
-         $this->objectManager = Bootstrap::getObjectManager();
-         $this->management = $this->objectManager->get(GuestCouponManagementInterface::class);
--        $clientFactory = $this->getMockBuilder(ZendClientFactory::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->httpClient = $this->getMockBuilder(ZendClient::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $clientFactory->method('create')
--            ->willReturn($this->httpClient);
--
--        $this->objectManager->addSharedInstance($clientFactory, ZendClientFactory::class);
--    }
--
--    /**
--     * @inheritdoc
--     */
--    protected function tearDown()
--    {
--        $this->objectManager->removeSharedInstance(ZendClientFactory::class);
-+        $this->httpClient = $this->objectManager->get(AsyncClientInterface::class);
-     }
- 
-     /**
-@@ -87,9 +68,13 @@ class GuestCouponManagementTest extends TestCase
-         $couponCode = 'IMPHBR852R61';
-         $cartId = $this->createGuestCart();
- 
--        $request = new DataObject(['body' => file_get_contents(__DIR__ . '/../Fixtures/rates_response.xml')]);
--        $this->httpClient->method('request')
--            ->willReturn($request);
-+        //phpcs:disable
-+        $this->httpClient->nextResponses(
-+            [
-+                new Response(200, [], file_get_contents(__DIR__ . '/../Fixtures/rates_response.xml'))
-+            ]
-+        );
-+        //phpcs:enable
- 
-         self::assertTrue($this->management->set($cartId, $couponCode));
- 
-diff --git a/dev/tests/integration/testsuite/Magento/Usps/Fixtures/response_rates.xml b/dev/tests/integration/testsuite/Magento/Usps/Fixtures/response_rates.xml
-new file mode 100644
-index 00000000000..88a9dfe4d4d
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Usps/Fixtures/response_rates.xml
-@@ -0,0 +1,83 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<IntlRateV2Response>
-+    <Package>
-+        <Service ID="12">
-+            <Pounds>3</Pounds>
-+            <Ounces>0</Ounces>
-+            <Postage>80.45</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <Available>True</Available>
-+                </ExtraService>
-+            </ExtraServices>
-+            <SvcDescription>USPS GXG&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Envelopes</SvcDescription>
-+        </Service>
-+        <Service ID="1">
-+            <Pounds>3</Pounds>
-+            <Ounces>0</Ounces>
-+            <Postage>54.25</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <Available>True</Available>
-+                </ExtraService>
-+            </ExtraServices>
-+            <SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</SvcDescription>
-+        </Service>
-+        <Service ID="10">
-+            <Pounds>3</Pounds>
-+            <Ounces>0</Ounces>
-+            <Postage>41.50</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <ServiceID>1</ServiceID>
-+                    <Available>True</Available>
-+                </ExtraService>
-+            </ExtraServices>
-+            <SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Flat Rate Envelope</SvcDescription>
-+        </Service>
-+        <Service ID="11">
-+            <Pounds>3</Pounds>
-+            <Ounces>0</Ounces>
-+            <Postage>59.95</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <Available>True</Available>
-+                </ExtraService>
-+                <ExtraService>
-+                    <Available>True</Available>
-+                </ExtraService>
-+            </ExtraServices>
-+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Large Flat Rate Box</SvcDescription>
-+        </Service>
-+        <Service ID="15">
-+            <Pounds>3</Pounds>
-+            <Ounces>0</Ounces>
-+            <Postage>24.50</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <Available>False</Available>
-+                </ExtraService>
-+                <ExtraService>
-+                    <Available>True</Available>
-+                </ExtraService>
-+            </ExtraServices>
-+            <SvcDescription>First-Class Package International Service&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</SvcDescription>
-+        </Service>
-+        <Service ID="2">
-+            <Pounds>3</Pounds>
-+            <Ounces>0</Ounces>
-+            <Postage>0.00</Postage>
-+            <ExtraServices>
-+                <ExtraService>
-+                    <Available>False</Available>
-+                </ExtraService>
-+            </ExtraServices>
-+        </Service>
-+    </Package>
-+</IntlRateV2Response>
-\ No newline at end of file
-diff --git a/dev/tests/integration/testsuite/Magento/Usps/Fixtures/success_usps_response_rates.xml b/dev/tests/integration/testsuite/Magento/Usps/Fixtures/success_usps_response_rates.xml
-new file mode 100644
-index 00000000000..0009a04ffac
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Usps/Fixtures/success_usps_response_rates.xml
-@@ -0,0 +1,151 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<RateV4Response>
-+   <Package ID="0">
-+      <ZipOrigination>90034</ZipOrigination>
-+      <ZipDestination>90032</ZipDestination>
-+      <Pounds>5</Pounds>
-+      <Ounces>0</Ounces>
-+      <Size>REGULAR</Size>
-+      <Machinable>TRUE</Machinable>
-+      <Zone>1</Zone>
-+      <Postage CLASSID="3">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</MailService>
-+         <Rate>24.85</Rate>
-+      </Postage>
-+      <Postage CLASSID="2">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;Hold For Pickup</MailService>
-+         <Rate>24.85</Rate>
-+      </Postage>
-+      <Postage CLASSID="23">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Sunday/Holiday Delivery</MailService>
-+         <Rate>37.35</Rate>
-+      </Postage>
-+      <Postage CLASSID="55">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Flat Rate Boxes</MailService>
-+         <Rate>39.95</Rate>
-+      </Postage>
-+      <Postage CLASSID="56">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Flat Rate Boxes Hold For Pickup</MailService>
-+         <Rate>39.95</Rate>
-+      </Postage>
-+      <Postage CLASSID="57">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Sunday/Holiday Delivery Flat Rate Boxes</MailService>
-+         <Rate>52.45</Rate>
-+      </Postage>
-+      <Postage CLASSID="13">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Flat Rate Envelope</MailService>
-+         <Rate>19.95</Rate>
-+      </Postage>
-+      <Postage CLASSID="27">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Flat Rate Envelope Hold For Pickup</MailService>
-+         <Rate>19.95</Rate>
-+      </Postage>
-+      <Postage CLASSID="25">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Sunday/Holiday Delivery Flat Rate Envelope</MailService>
-+         <Rate>32.45</Rate>
-+      </Postage>
-+      <Postage CLASSID="30">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Legal Flat Rate Envelope</MailService>
-+         <Rate>19.95</Rate>
-+      </Postage>
-+      <Postage CLASSID="31">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Legal Flat Rate Envelope Hold For Pickup</MailService>
-+         <Rate>19.95</Rate>
-+      </Postage>
-+      <Postage CLASSID="32">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Sunday/Holiday Delivery Legal Flat Rate Envelope</MailService>
-+         <Rate>32.45</Rate>
-+      </Postage>
-+      <Postage CLASSID="62">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Padded Flat Rate Envelope</MailService>
-+         <Rate>19.95</Rate>
-+      </Postage>
-+      <Postage CLASSID="63">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Padded Flat Rate Envelope Hold For Pickup</MailService>
-+         <Rate>19.95</Rate>
-+      </Postage>
-+      <Postage CLASSID="64">
-+         <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Sunday/Holiday Delivery Padded Flat Rate Envelope</MailService>
-+         <Rate>32.45</Rate>
-+      </Postage>
-+      <Postage CLASSID="1">
-+         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</MailService>
-+         <Rate>8.85</Rate>
-+      </Postage>
-+      <Postage CLASSID="22">
-+         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Large Flat Rate Box</MailService>
-+         <Rate>16.85</Rate>
-+      </Postage>
-+      <Postage CLASSID="17">
-+         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Medium Flat Rate Box</MailService>
-+         <Rate>12.35</Rate>
-+      </Postage>
-+      <Postage CLASSID="28">
-+         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Small Flat Rate Box</MailService>
-+         <Rate>5.80</Rate>
-+      </Postage>
-+      <Postage CLASSID="16">
-+         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Flat Rate Envelope</MailService>
-+         <Rate>5.60</Rate>
-+      </Postage>
-+      <Postage CLASSID="44">
-+         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Legal Flat Rate Envelope</MailService>
-+         <Rate>5.75</Rate>
-+      </Postage>
-+      <Postage CLASSID="29">
-+         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Padded Flat Rate Envelope</MailService>
-+         <Rate>5.95</Rate>
-+      </Postage>
-+      <Postage CLASSID="38">
-+         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Gift Card Flat Rate Envelope</MailService>
-+         <Rate>5.60</Rate>
-+      </Postage>
-+      <Postage CLASSID="42">
-+         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;&#10;Small Flat Rate Envelope</MailService>
-+         <Rate>5.60</Rate>
-+      </Postage>
-+      <Postage CLASSID="40">
-+         <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
-+         Window Flat Rate Envelope</MailService>
-+         <Rate>5.60</Rate>
-+      </Postage>
-+      <Postage CLASSID="4">
-+         <MailService>Retail Ground&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt;</MailService>
-+         <Rate>8.85</Rate>
-+      </Postage>
-+      <Postage CLASSID="6">
-+         <MailService>Media Mail&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt;</MailService>
-+         <Rate>4.33</Rate>
-+      </Postage>
-+      <Postage CLASSID="7">
-+         <MailService>Library Mail</MailService>
-+         <Rate>4.12</Rate>
-+      </Postage>
-+   </Package>
-+</RateV4Response>
-diff --git a/dev/tests/integration/testsuite/Magento/Usps/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Usps/Model/CarrierTest.php
-new file mode 100644
-index 00000000000..332a11af323
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Usps/Model/CarrierTest.php
-@@ -0,0 +1,179 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Usps\Model;
-+
-+use Magento\Framework\HTTP\AsyncClient\Response;
-+use Magento\Framework\HTTP\AsyncClientInterface;
-+use Magento\Quote\Model\Quote\Address\RateRequest;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\HTTP\AsyncClientInterfaceMock;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Test for USPS integration.
-+ */
-+class CarrierTest extends TestCase
-+{
-+    /**
-+     * @var Carrier
-+     */
-+    private $carrier;
-+
-+    /**
-+     * @var AsyncClientInterfaceMock
-+     */
-+    private $httpClient;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->carrier = Bootstrap::getObjectManager()->get(Carrier::class);
-+        $this->httpClient = Bootstrap::getObjectManager()->get(AsyncClientInterface::class);
-+    }
-+
-+    /**
-+     * Test collecting rates from the provider.
-+     *
-+     * @magentoConfigFixture default_store carriers/usps/allowed_methods 0_FCLE,0_FCL,0_FCP,1,2,3,4,6,7,13,16,17,22,23,25,27,28,33,34,35,36,37,42,43,53,55,56,57,61,INT_1,INT_2,INT_4,INT_6,INT_7,INT_8,INT_9,INT_10,INT_11,INT_12,INT_13,INT_14,INT_15,INT_16,INT_20,INT_26
-+     * @magentoConfigFixture default_store carriers/usps/showmethod 1
-+     * @magentoConfigFixture default_store carriers/usps/debug 1
-+     * @magentoConfigFixture default_store carriers/usps/userid test
-+     * @magentoConfigFixture default_store carriers/usps/mode 0
-+     * @magentoConfigFixture default_store carriers/usps/active 1
-+     * @magentoConfigFixture default_store shipping/origin/country_id US
-+     * @magentoConfigFixture default_store shipping/origin/postcode 90034
-+     * @magentoConfigFixture default_store carriers/usps/machinable true
-+     */
-+    public function testCollectRates(): void
-+    {
-+        $requestXml = '<?xml version="1.0" encoding="UTF-8"?><RateV4Request USERID="213MAGEN6752">'
-+            .'<Revision>2</Revision><Package ID="0"><Service>ALL</Service><ZipOrigination>90034</ZipOrigination>'
-+            .'<ZipDestination>90032</ZipDestination><Pounds>4</Pounds><Ounces>4.2512000000</Ounces>'
-+            .'<Container>VARIABLE</Container><Size>REGULAR</Size><Machinable>true</Machinable></Package>'
-+            .'</RateV4Request>';
-+        $requestXml = (new \SimpleXMLElement($requestXml))->asXml();
-+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
-+        $responseBody = file_get_contents(__DIR__ .'/../Fixtures/success_usps_response_rates.xml');
-+        $this->httpClient->nextResponses([new Response(200, [], $responseBody)]);
-+        /** @var RateRequest $request */
-+        $request = Bootstrap::getObjectManager()->create(
-+            RateRequest::class,
-+            [
-+                'data' => [
-+                    'dest_country_id' => 'US',
-+                    'dest_region_id' => '12',
-+                    'dest_region_code' => 'CA',
-+                    'dest_street' => 'main st1',
-+                    'dest_city' => 'Los Angeles',
-+                    'dest_postcode' => '90032',
-+                    'package_value' => '5',
-+                    'package_value_with_discount' => '5',
-+                    'package_weight' => '4.2657',
-+                    'package_qty' => '1',
-+                    'package_physical_value' => '5',
-+                    'free_method_weight' => '5',
-+                    'store_id' => '1',
-+                    'website_id' => '1',
-+                    'free_shipping' => '0',
-+                    'limit_carrier' => 'null',
-+                    'base_subtotal_incl_tax' => '5',
-+                    'orig_country_id' => 'US',
-+                    'country_id' => 'US',
-+                    'region_id' => '12',
-+                    'city' => 'Culver City',
-+                    'postcode' => '90034',
-+                    'usps_userid' => '213MAGEN6752',
-+                    'usps_container' => 'VARIABLE',
-+                    'usps_size' => 'REGULAR',
-+                    'girth' => null,
-+                    'height' => null,
-+                    'length' => null,
-+                    'width' => null,
-+                ]
-+            ]
-+        );
-+
-+        $rates = $this->carrier->collectRates($request);
-+        $httpRequest = $this->httpClient->getLastRequest();
-+        $this->assertNotEmpty($httpRequest);
-+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
-+        $uri = parse_url($httpRequest->getUrl(), PHP_URL_QUERY);
-+        $this->assertNotEmpty(preg_match('/API\=([A-z0-9]+)/', $uri, $matches));
-+        $apiV = $matches[1];
-+        unset($matches);
-+        $this->assertEquals('RateV4', $apiV);
-+        $this->assertNotEmpty(preg_match('/XML\=([^\&]+)/', $uri, $matches));
-+        $xml = urldecode($matches[1]);
-+        $this->assertEquals($requestXml, $xml);
-+        $this->assertNotEmpty($rates->getAllRates());
-+        $this->assertEquals(5.6, $rates->getAllRates()[2]->getPrice());
-+        $this->assertEquals(
-+            "Priority Mail 1-Day\nSmall Flat Rate Envelope",
-+            $rates->getAllRates()[2]->getMethodTitle()
-+        );
-+    }
-+
-+    /**
-+     * Test collecting rates only for available services.
-+     *
-+     * @magentoConfigFixture default_store carriers/usps/allowed_methods 0_FCLE,0_FCL,0_FCP,1,2,3,4,6,7,13,16,17,22,23,25,27,28,33,34,35,36,37,42,43,53,55,56,57,61,INT_1,INT_2,INT_4,INT_6,INT_7,INT_8,INT_9,INT_10,INT_11,INT_12,INT_13,INT_14,INT_15,INT_16,INT_20,INT_26
-+     * @magentoConfigFixture default_store carriers/usps/showmethod 1
-+     * @magentoConfigFixture default_store carriers/usps/debug 1
-+     * @magentoConfigFixture default_store carriers/usps/userid test
-+     * @magentoConfigFixture default_store carriers/usps/mode 0
-+     * @magentoConfigFixture default_store carriers/usps/active 1
-+     * @magentoConfigFixture default_store shipping/origin/country_id US
-+     * @magentoConfigFixture default_store shipping/origin/postcode 90034
-+     * @magentoConfigFixture default_store carriers/usps/machinable true
-+     */
-+    public function testCollectUnavailableRates(): void
-+    {
-+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
-+        $responseBody = file_get_contents(__DIR__ .'/../Fixtures/response_rates.xml');
-+        $this->httpClient->nextResponses([new Response(200, [], $responseBody)]);
-+        /** @var RateRequest $request */
-+        $request = Bootstrap::getObjectManager()->create(
-+            RateRequest::class,
-+            [
-+                'data' => [
-+                    'dest_country_id' => 'CA',
-+                    'dest_postcode' => 'M5V 3G5',
-+                    'dest_country_name' => 'Canada',
-+                    'package_value' => '3.2568',
-+                    'package_value_with_discount' => '5',
-+                    'package_weight' => '5',
-+                    'package_qty' => '1',
-+                    'package_physical_value' => '5',
-+                    'free_method_weight' => '5',
-+                    'store_id' => '1',
-+                    'website_id' => '1',
-+                    'free_shipping' => '0',
-+                    'limit_carrier' => 'null',
-+                    'base_subtotal_incl_tax' => '5',
-+                    'orig_country_id' => 'US',
-+                    'country_id' => 'US',
-+                    'region_id' => '12',
-+                    'city' => 'Culver City',
-+                    'postcode' => '90034',
-+                    'usps_userid' => '213MAGEN6752',
-+                    'usps_container' => 'VARIABLE',
-+                    'usps_size' => 'REGULAR',
-+                    'girth' => null,
-+                    'height' => null,
-+                    'length' => null,
-+                    'width' => null,
-+                ]
-+            ]
-+        );
-+
-+        $rates = $this->carrier->collectRates($request);
-+        $this->assertCount(5, $rates->getAllRates());
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Vault/_files/payment_tokens.php b/dev/tests/integration/testsuite/Magento/Vault/_files/payment_tokens.php
-index 2af563b35a3..f23a8fcd1bc 100644
---- a/dev/tests/integration/testsuite/Magento/Vault/_files/payment_tokens.php
-+++ b/dev/tests/integration/testsuite/Magento/Vault/_files/payment_tokens.php
-@@ -43,6 +43,22 @@ $paymentTokens = [
-         'expires_at' => '2016-12-04 10:18:15',
-         'is_active' => 0
-     ],
-+    [
-+        'customer_id' => 1,
-+        'public_hash' => '34567',
-+        'payment_method_code' => 'fifth',
-+        'type' => 'card',
-+        'expires_at' => date('Y-m-d h:i:s', strtotime('+1 month')),
-+        'is_active' => 1
-+    ],
-+    [
-+        'customer_id' => 1,
-+        'public_hash' => '345678',
-+        'payment_method_code' => 'sixth',
-+        'type' => 'account',
-+        'expires_at' => date('Y-m-d h:i:s', strtotime('+1 month')),
-+        'is_active' => 1
-+    ],
- ];
- /** @var array $tokenData */
- foreach ($paymentTokens as $tokenData) {
-diff --git a/dev/tests/integration/testsuite/Magento/Vault/_files/token.php b/dev/tests/integration/testsuite/Magento/Vault/_files/token.php
-index 396b2a5c205..e1e0a31da4f 100644
---- a/dev/tests/integration/testsuite/Magento/Vault/_files/token.php
-+++ b/dev/tests/integration/testsuite/Magento/Vault/_files/token.php
-@@ -23,4 +23,4 @@ $token->setGatewayToken('gateway_token')
- 
- /** @var PaymentTokenRepository $tokenRepository */
- $tokenRepository = $objectManager->create(PaymentTokenRepository::class);
--$tokenRepository->save($token);
-+$token = $tokenRepository->save($token);
-diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Controller/PathProcessorTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Controller/PathProcessorTest.php
-index 932ad03d691..14fbc2ffc67 100644
---- a/dev/tests/integration/testsuite/Magento/Webapi/Controller/PathProcessorTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Webapi/Controller/PathProcessorTest.php
-@@ -8,6 +8,9 @@ namespace Magento\Webapi\Controller;
- 
- use Magento\Store\Model\Store;
- 
-+/**
-+ * Test for Magento\Webapi\Controller\PathProcessor class.
-+ */
- class PathProcessorTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -15,6 +18,11 @@ class PathProcessorTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $storeManager;
- 
-+    /**
-+     * @var \Magento\Framework\Locale\ResolverInterface::class
-+     */
-+    private $localeResolver;
-+
-     /**
-      * @var \Magento\Webapi\Controller\PathProcessor
-      */
-@@ -25,6 +33,7 @@ class PathProcessorTest extends \PHPUnit\Framework\TestCase
-         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-         $this->storeManager = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
-         $this->storeManager->reinitStores();
-+        $this->localeResolver = $objectManager->get(\Magento\Framework\Locale\ResolverInterface::class);
-         $this->pathProcessor = $objectManager->get(\Magento\Webapi\Controller\PathProcessor::class);
-     }
- 
-@@ -59,4 +68,20 @@ class PathProcessorTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($path, $result);
-         $this->assertEquals('default', $this->storeManager->getStore()->getCode());
-     }
-+
-+    /**
-+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
-+     * @magentoConfigFixture default_store general/locale/code en_US
-+     * @magentoConfigFixture fixturestore_store general/locale/code de_DE
-+     */
-+    public function testProcessWithValidStoreCodeApplyLocale()
-+    {
-+        $locale = 'de_DE';
-+        $storeCode = 'fixturestore';
-+        $basePath = "rest/{$storeCode}";
-+        $path = $basePath . '/V1/customerAccounts/createCustomer';
-+        $this->pathProcessor->process($path);
-+        $this->assertEquals($locale, $this->localeResolver->getLocale());
-+        $this->assertNotEquals('en_US', $this->localeResolver->getLocale());
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/InstanceTest.php b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/InstanceTest.php
-index 5a07bdcfca3..cc6f2793fcf 100644
---- a/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/InstanceTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/InstanceTest.php
-@@ -38,6 +38,12 @@ class InstanceTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
- 
-     public function testBlocksAction()
-     {
-+        \Magento\TestFramework\Helper\Bootstrap::getInstance()
-+            ->loadArea(\Magento\Framework\App\Area::AREA_FRONTEND);
-+        $theme = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-+            \Magento\Framework\View\DesignInterface::class
-+        )->setDefaultDesignTheme()->getDesignTheme();
-+        $this->getRequest()->setParam('theme_id', $theme->getId());
-         $this->dispatch('backend/admin/widget_instance/blocks');
-         $this->assertStringStartsWith('<select name="block" id=""', $this->getResponse()->getBody());
-     }
-diff --git a/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/WidgetTest.php b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/WidgetTest.php
-index 26ed706e3ec..f5b5fe533e1 100644
---- a/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/WidgetTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/WidgetTest.php
-@@ -15,7 +15,7 @@ class WidgetTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
-      */
-     public function testLoadOptionsAction()
-     {
--        $this->getRequest()->setPostValue(
-+        $this->getRequest()->setParam(
-             'widget',
-             '{"widget_type":"Magento\\\\Cms\\\\Block\\\\Widget\\\\Page\\\\Link","values":{}}'
-         );
-diff --git a/dev/tests/integration/testsuite/Magento/Widget/Setup/LayoutUpdateConverterTest.php b/dev/tests/integration/testsuite/Magento/Widget/Setup/LayoutUpdateConverterTest.php
-index 43c0bd202cc..3d43fb5a445 100644
---- a/dev/tests/integration/testsuite/Magento/Widget/Setup/LayoutUpdateConverterTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Widget/Setup/LayoutUpdateConverterTest.php
-@@ -34,7 +34,7 @@ class LayoutUpdateConverterTest extends \PHPUnit\Framework\TestCase
-         // @codingStandardsIgnoreStart
-         $beginning = '<body><referenceContainer name="content"><block class="Magento\CatalogWidget\Block\Product\ProductsList" name="23e38bbfa7cc6474454570e51aeffcc3" template="Magento_CatalogWidget::product/widget/content/grid.phtml"><action method="setData"><argument name="name" xsi:type="string">show_pager</argument><argument name="value" xsi:type="string">0</argument></action><action method="setData"><argument name="name" xsi:type="string">products_count</argument><argument name="value" xsi:type="string">10</argument></action><action method="setData">';
-         $serializedWidgetXml = '<argument name="name" xsi:type="string">conditions_encoded</argument><argument name="value" xsi:type="string">a:3:[i:1;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Combine`;s:10:`aggregator`;s:3:`all`;s:5:`value`;s:1:`1`;s:9:`new_child`;s:0:``;]s:4:`1--1`;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Product`;s:9:`attribute`;s:3:`sku`;s:8:`operator`;s:2:`()`;s:5:`value`;s:15:`simple, simple1`;]s:4:`1--2`;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Product`;s:9:`attribute`;s:5:`price`;s:8:`operator`;s:2:`&lt;=`;s:5:`value`;s:2:`10`;]]</argument>';
--        $jsonEncodedWidgetXml = '<argument name="name" xsi:type="string">conditions_encoded</argument><argument name="value" xsi:type="string">^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`simple, simple1`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`price`,`operator`:`&lt;=`,`value`:`10`^]^]</argument>';
-+        $jsonEncodedWidgetXml = '<argument name="name" xsi:type="string">conditions_encoded</argument><argument name="value" xsi:type="string">^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`simple, simple1`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`price`,`operator`:`^(=`,`value`:`10`^]^]</argument>';
-         $ending = '</action><action method="setData"><argument name="name" xsi:type="string">page_var_name</argument><argument name="value" xsi:type="string">pobqks</argument></action></block></referenceContainer></body>';
-         // @codingStandardsIgnoreEnd
-         return [
-diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
-index 8edc916f2af..e020d31838f 100644
---- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
-@@ -122,11 +122,13 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractController
-     }
- 
-     /**
-+     * @magentoDbIsolation disabled
-      * @magentoDataFixture Magento/Wishlist/_files/wishlist_with_product_qty_increments.php
-      */
-     public function testAllcartAction()
-     {
-         $formKey = $this->_objectManager->get(\Magento\Framework\Data\Form\FormKey::class)->getFormKey();
-+        $this->getRequest()->setMethod('POST');
-         $this->getRequest()->setParam('form_key', $formKey);
-         $this->dispatch('wishlist/index/allcart');
- 
-@@ -157,6 +159,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractController
-         ];
- 
-         $this->getRequest()->setPostValue($request);
-+        $this->getRequest()->setMethod('POST');
- 
-         $this->_objectManager->get(\Magento\Framework\Registry::class)->register(
-             'wishlist',
-diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php
-new file mode 100644
-index 00000000000..47705262caa
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php
-@@ -0,0 +1,92 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Wishlist\Controller;
-+
-+use Magento\Customer\Model\Session;
-+use Magento\Framework\App\Area;
-+use Magento\Framework\Data\Form\FormKey;
-+use Magento\Framework\Message\MessageInterface;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\Request;
-+use Magento\TestFramework\TestCase\AbstractController;
-+
-+/**
-+ * @magentoAppIsolation enabled
-+ */
-+class ShareTest extends AbstractController
-+{
-+    /**
-+     * Test share wishlist with correct data
-+     *
-+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
-+     */
-+    public function testSuccessfullyShareWishlist()
-+    {
-+        $this->login(1);
-+        $this->prepareRequestData();
-+        $this->dispatch('wishlist/index/send/');
-+
-+        $this->assertSessionMessages(
-+            $this->equalTo(['Your wish list has been shared.']),
-+            MessageInterface::TYPE_SUCCESS
-+        );
-+    }
-+
-+    /**
-+     * Test share wishlist with incorrect data
-+     *
-+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
-+     */
-+    public function testShareWishlistWithoutEmails()
-+    {
-+        $this->login(1);
-+        $this->prepareRequestData(true);
-+        $this->dispatch('wishlist/index/send/');
-+
-+        $this->assertSessionMessages(
-+            $this->equalTo(['Please enter an email address.']),
-+            MessageInterface::TYPE_ERROR
-+        );
-+    }
-+
-+    /**
-+     * Login the user
-+     *
-+     * @param string $customerId Customer to mark as logged in for the session
-+     * @return void
-+     */
-+    protected function login($customerId)
-+    {
-+        /** @var Session $session */
-+        $session = $this->_objectManager->get(Session::class);
-+        $session->loginById($customerId);
-+    }
-+
-+    /**
-+     * Prepares the request with data
-+     *
-+     * @param bool $invalidData
-+     * @return void
-+     */
-+    private function prepareRequestData($invalidData = false)
-+    {
-+        Bootstrap::getInstance()->loadArea(Area::AREA_FRONTEND);
-+        $emails = !$invalidData ? 'email-1@example.com,email-2@example.com' : '';
-+
-+        /** @var FormKey $formKey */
-+        $formKey = $this->_objectManager->get(FormKey::class);
-+        $post = [
-+            'emails' => $emails,
-+            'message' => '',
-+            'form_key' => $formKey->getFormKey(),
-+        ];
-+
-+        $this->getRequest()->setMethod(Request::METHOD_POST);
-+        $this->getRequest()->setPostValue($post);
-+    }
-+}
-diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
-index 99f9aa4991b..b684da05dd2 100644
---- a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
-+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
-@@ -6,6 +6,7 @@
- namespace Magento\Wishlist\Model;
- 
- use Magento\Catalog\Api\ProductRepositoryInterface;
-+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\DataObject;
- 
-@@ -85,4 +86,39 @@ class WishlistTest extends \PHPUnit\Framework\TestCase
-         );
-         $this->wishlist->addNewItem($product);
-     }
-+
-+    /**
-+     * @magentoDbIsolation disabled
-+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
-+     */
-+    public function testGetItemCollection()
-+    {
-+        $productSku = 'simple';
-+        $customerId = 1;
-+
-+        $this->wishlist->loadByCustomerId($customerId, true);
-+        $itemCollection = $this->wishlist->getItemCollection();
-+        /** @var \Magento\Wishlist\Model\Item $item */
-+        $item = $itemCollection->getFirstItem();
-+        $this->assertEquals($productSku, $item->getProduct()->getSku());
-+    }
-+
-+    /**
-+     * @magentoDbIsolation disabled
-+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
-+     */
-+    public function testGetItemCollectionWithDisabledProduct()
-+    {
-+        $productSku = 'simple';
-+        $customerId = 1;
-+
-+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-+        $product = $productRepository->get($productSku);
-+        $product->setStatus(ProductStatus::STATUS_DISABLED);
-+        $productRepository->save($product);
-+
-+        $this->wishlist->loadByCustomerId($customerId, true);
-+        $itemCollection = $this->wishlist->getItemCollection();
-+        $this->assertEmpty($itemCollection->getItems());
-+    }
- }
-diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
-new file mode 100644
-index 00000000000..a71c9c9ba3c
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+require __DIR__ . '/../../../Magento/Customer/_files/two_customers.php';
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
-+
-+$firstCustomerIdFromFixture = 1;
-+$wishlistForFirstCustomer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    \Magento\Wishlist\Model\Wishlist::class
-+);
-+$wishlistForFirstCustomer->loadByCustomerId($firstCustomerIdFromFixture, true);
-+$item = $wishlistForFirstCustomer->addNewItem($product, new \Magento\Framework\DataObject([]));
-+$wishlistForFirstCustomer->save();
-+
-+$secondCustomerIdFromFixture = 2;
-+$wishlistForSecondCustomer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-+    \Magento\Wishlist\Model\Wishlist::class
-+);
-+$wishlistForSecondCustomer->loadByCustomerId($secondCustomerIdFromFixture, true);
-+$item = $wishlistForSecondCustomer->addNewItem($product, new \Magento\Framework\DataObject([]));
-+$wishlistForSecondCustomer->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers_rollback.php
-new file mode 100644
-index 00000000000..4baba3b9f77
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers_rollback.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+/** @var \Magento\Wishlist\Model\Wishlist $wishlist */
-+$wishlist = $objectManager->create(\Magento\Wishlist\Model\Wishlist::class);
-+$wishlist->loadByCustomerId(1);
-+$wishlist->delete();
-+$wishlist->loadByCustomerId(2);
-+$wishlist->delete();
-+
-+require __DIR__ . '/../../../Magento/Customer/_files/two_customers_rollback.php';
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
-index 4c183ad6368..73ced4d5462 100644
---- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
-+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
-@@ -12,14 +12,4 @@ $wishlist = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- );
- $wishlist->loadByCustomerId($customer->getId(), true);
- $item = $wishlist->addNewItem($product, new \Magento\Framework\DataObject([]));
--//    'product' => '1',
--//    'related_product' => '',
--//    'options' => array(
--//        1 => '1-text',
--//        2 => array('month' => 1, 'day' => 1, 'year' => 2001, 'hour' => 1, 'minute' => 1),
--//        3 => '1',
--//        4 => '1',
--//    ),
--//    'validate_datetime_2' => '',
--//    'qty' => '1',
- $wishlist->setSharingCode('fixture_unique_code')->save();
-diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php
-new file mode 100644
-index 00000000000..61b5bbb7bd3
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = $objectManager->get(\Magento\Framework\Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var \Magento\Wishlist\Model\Wishlist $wishlist */
-+$wishlist = $objectManager->create(\Magento\Wishlist\Model\Wishlist::class);
-+$wishlist->loadByCustomerId(1);
-+$wishlist->delete();
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
-+require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php';
-diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_increments_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_increments_rollback.php
-new file mode 100644
-index 00000000000..91392fec6b7
---- /dev/null
-+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_increments_rollback.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
-+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-+
-+/** @var \Magento\Framework\Registry $registry */
-+$registry = $objectManager->get(\Magento\Framework\Registry::class);
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', true);
-+
-+/** @var \Magento\Wishlist\Model\Wishlist $wishlist */
-+$wishlist = $objectManager->create(\Magento\Wishlist\Model\Wishlist::class);
-+$wishlist->loadByCustomerId(1);
-+$wishlist->delete();
-+
-+$registry->unregister('isSecureArea');
-+$registry->register('isSecureArea', false);
-+
-+require __DIR__ . '/../../../Magento/Catalog/_files/product_special_price_rollback.php';
-+require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php';
-diff --git a/dev/tests/js/jasmine/assets/gallery/config.json b/dev/tests/js/jasmine/assets/gallery/config.json
-index d1d8e94d7f2..72c36293bc1 100644
---- a/dev/tests/js/jasmine/assets/gallery/config.json
-+++ b/dev/tests/js/jasmine/assets/gallery/config.json
-@@ -59,8 +59,7 @@
-         "arrows": "false",
-         "thumbwidth": "90",
-         "thumbheight": "90",
--        "ratio": "1",
--        "allowfullscreen": true
-+        "ratio": "1"
-     },
-     "fullscreen": {
-         "nav": false
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js
-deleted file mode 100644
-index 5614a9a1bc6..00000000000
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js
-+++ /dev/null
-@@ -1,93 +0,0 @@
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--/* eslint-disable max-nested-callbacks */
--define([
--    'squire',
--    'jquery'
--], function (Squire) {
--    'use strict';
--
--    describe('Magento_Braintree/js/paypal/button', function () {
--        var injector,
--            mocks,
--            braintree,
--            component,
--            registry,
--            btnId = 'braintree_paypal_btn',
--            tplElement = jQuery('<button id="' + btnId + '"></button>')[0];
--
--        require.config({
--            map: {
--                '*': {
--                    'braintree': 'braintree'
--                }
--            }
--        });
--
--        injector = new Squire();
--        mocks = {
--            'braintree': {
--                paypal: {
--                    /** Stub */
--                    initAuthFlow: function () {}
--                },
--
--                /** Stub */
--                setup: function () {}
--            }
--        };
--
--        beforeEach(function (done) {
--            injector.mock(mocks);
--
--            injector.require([
--                'braintree',
--                'uiRegistry',
--                'Magento_Braintree/js/paypal/button'
--            ], function (adapter, reg, Constr) {
--                braintree = adapter;
--                registry = reg;
--                jQuery(document.body).append(tplElement);
--
--                spyOn(braintree, 'setup').and.callFake(function () {
--                    registry.set('braintreePaypal.currentIntegration', braintree);
--                    jQuery('#' + btnId).removeAttr('disabled');
--                });
--
--                component = new Constr({
--                    id: btnId
--                });
--                done();
--            });
--        });
--
--        afterEach(function () {
--            try {
--                injector.clean();
--                injector.remove();
--            } catch (e) {}
--        });
--
--        afterAll(function (done) {
--            tplElement.remove();
--            registry.remove(component.integrationName);
--
--            done();
--        });
--
--        it('The PayPal::initAuthFlow throws an exception.', function () {
--            var $selector = jQuery('#' + component.id);
--
--            spyOn(braintree.paypal, 'initAuthFlow').and.callFake(function () {
--                throw new TypeError('Cannot read property of undefined');
--            });
--
--            $selector.trigger('click');
--
--            expect($selector.prop('disabled')).toEqual(true);
--        });
--    });
--});
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
-deleted file mode 100644
-index 84db685c029..00000000000
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
-+++ /dev/null
-@@ -1,95 +0,0 @@
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--/* eslint-disable max-nested-callbacks */
--define([
--    'jquery',
--    'squire',
--    'ko',
--    'Magento_Ui/js/model/messages'
--], function ($, Squire, ko, Messages) {
--    'use strict';
--
--    describe('Magento_Braintree/js/view/payment/method-renderer/cc-form', function () {
--        var injector = new Squire(),
--            mocks = {
--                'Magento_Checkout/js/model/quote': {
--                    billingAddress: ko.observable(),
--                    shippingAddress: ko.observable(),
--                    paymentMethod: ko.observable(),
--                    totals: ko.observable({})
--                },
--                'Magento_Braintree/js/view/payment/validator-handler': jasmine.createSpyObj(
--                    'validator-handler',
--                    ['initialize']
--                ),
--                'Magento_Braintree/js/view/payment/adapter':  jasmine.createSpyObj(
--                    'adapter',
--                    ['setup', 'setConfig', 'showError']
--                )
--            },
--            braintreeCcForm;
--
--        beforeAll(function (done) {
--            window.checkoutConfig = {
--                quoteData: {},
--                payment: {
--                    braintree: {
--                        hasFraudProtection: true
--                    }
--                }
--            };
--            injector.mock(mocks);
--            injector.require(['Magento_Braintree/js/view/payment/method-renderer/cc-form'], function (Constr) {
--                braintreeCcForm = new Constr({
--                    provider: 'provName',
--                    name: 'test',
--                    index: 'test',
--                    item: {
--                        title: 'Braintree'
--                    }
--                });
--
--                done();
--            });
--        });
--
--        afterEach(function () {
--            try {
--                injector.clean();
--                injector.remove();
--            } catch (e) {}
--        });
--
--        it('Check if payment code and message container are restored after onActiveChange call.', function () {
--            var expectedMessageContainer = braintreeCcForm.messageContainer,
--                expectedCode = braintreeCcForm.code;
--
--            braintreeCcForm.code = 'braintree-vault';
--            braintreeCcForm.messageContainer = new Messages();
--
--            braintreeCcForm.onActiveChange(true);
--
--            expect(braintreeCcForm.getCode()).toEqual(expectedCode);
--            expect(braintreeCcForm.messageContainer).toEqual(expectedMessageContainer);
--        });
--
--        it('Check if form validation fails when "Place Order" button should be active.', function () {
--            var errorMessage = 'Something went wrong.',
--
--                /**
--                 * Anonymous wrapper
--                 */
--                func = function () {
--                    braintreeCcForm.clientConfig.onError({
--                        'message': errorMessage
--                    });
--                };
--
--            expect(func).toThrow(errorMessage);
--            expect(braintreeCcForm.isPlaceOrderActionAllowed()).toBeTruthy();
--        });
--    });
--});
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
-deleted file mode 100644
-index 6fabc513da9..00000000000
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
-+++ /dev/null
-@@ -1,103 +0,0 @@
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--/* eslint-disable max-nested-callbacks */
--define([
--    'squire',
--    'ko'
--], function (Squire, ko) {
--    'use strict';
--
--    describe('Magento_Braintree/js/view/payment/method-renderer/paypal', function () {
--
--        var injector = new Squire(),
--            mocks = {
--                'Magento_Checkout/js/model/quote': {
--                    billingAddress: ko.observable(),
--                    shippingAddress: ko.observable({
--                        postcode: '',
--                        street: [],
--                        canUseForBilling: ko.observable()
--                    }),
--                    paymentMethod: ko.observable(),
--                    totals: ko.observable({
--                        'base_grand_total': 0
--                    })
--                },
--                'Magento_Braintree/js/view/payment/adapter': {
--                    config: {},
--
--                    /** Stub */
--                    onReady: function () {},
--
--                    /** Stub */
--                    setConfig: function (config) {
--                        this.config = config;
--                    },
--
--                    /** Stub */
--                    setup: function () {
--                        this.config.onReady(this.checkout);
--                    },
--
--                    checkout: {
--                        /** Stub */
--                        teardown: function () {},
--                        paypal: {
--                            /** Stub */
--                            initAuthFlow: function () {}
--                        }
--                    }
--                }
--            },
--            braintreeAdapter,
--            component,
--            additionalValidator;
--
--        beforeEach(function (done) {
--            window.checkoutConfig = {
--                quoteData: {},
--                payment: {
--                    'braintree_paypal': {
--                        title: 'Braintree PayPal'
--                    }
--                },
--                vault: {}
--            };
--
--            injector.mock(mocks);
--
--            injector.require([
--                'Magento_Braintree/js/view/payment/adapter',
--                'Magento_Checkout/js/model/payment/additional-validators',
--                'Magento_Braintree/js/view/payment/method-renderer/paypal'
--            ], function (adapter, validator, Constr) {
--                braintreeAdapter = adapter;
--                additionalValidator = validator;
--                component = new Constr();
--                done();
--            });
--        });
--
--        afterEach(function () {
--            try {
--                injector.clean();
--                injector.remove();
--            } catch (e) {}
--        });
--
--        it('The PayPal::initAuthFlow throws an exception.', function () {
--
--            spyOn(additionalValidator, 'validate').and.returnValue(true);
--            spyOn(braintreeAdapter.checkout.paypal, 'initAuthFlow').and.callFake(function () {
--                throw new TypeError('Cannot read property of undefined');
--            });
--            spyOn(component.messageContainer, 'addErrorMessage');
--
--            component.payWithPayPal();
--            expect(component.messageContainer.addErrorMessage).toHaveBeenCalled();
--        });
--    });
--});
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js
-index fdd0b70997f..0ab6b5fdf2b 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js
-@@ -49,6 +49,7 @@ define([
-             injector.clean();
-             injector.remove();
-         } catch (e) {}
-+        window.localStorage.clear();
-     });
- 
-     describe('Magento_Catalog/js/product/storage/data-storage', function () {
-@@ -88,18 +89,20 @@ define([
-                 };
-             });
- 
-+            afterEach(function () {
-+                window.localStorage.clear();
-+            });
-+
-             it('check calls "dataHandler" method with data', function () {
-                 var data = {
-                     property: 'value'
-                 };
- 
-                 obj.dataHandler(data);
--                expect(obj.localStorage.set).toHaveBeenCalledWith(data);
--                expect(obj.localStorage.removeAll).not.toHaveBeenCalled();
-+                expect(window.localStorage.getItem(obj.namespace)).toBe(JSON.stringify(data));
-             });
-             it('check calls "dataHandler" method with empty data', function () {
-                 obj.dataHandler({});
--                expect(obj.localStorage.set).not.toHaveBeenCalled();
-                 expect(obj.localStorage.removeAll).toHaveBeenCalled();
-             });
-         });
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js
-index c394a2463f5..624b159163b 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js
-@@ -27,6 +27,7 @@ define([
-             injector.clean();
-             injector.remove();
-         } catch (e) {}
-+        window.localStorage.clear();
-     });
- 
-     describe('Magento_Catalog/js/product/storage/ids-storage', function () {
-@@ -40,13 +41,6 @@ define([
-                 expect(obj.localStorage.get).toHaveBeenCalled();
-             });
-         });
--        describe('"cachesDataFromLocalStorage" method', function () {
--            it('check calls localStorage get method', function () {
--                obj.getDataFromLocalStorage = jasmine.createSpy().and.returnValue({});
--
--                expect(obj.localStorage.get).toHaveBeenCalled();
--            });
--        });
-         describe('"initLocalStorage" method', function () {
-             it('check returned value', function () {
-                 obj.namespace = 'test';
-@@ -80,17 +74,16 @@ define([
-             it('check calls with data that equal with data in localStorage', function () {
-                 obj.internalDataHandler(data);
- 
--                expect(obj.localStorage.get).toHaveBeenCalled();
--                expect(obj.localStorage.set).not.toHaveBeenCalled();
-+                expect(window.localStorage.getItem(obj.namespace)).toBe(JSON.stringify(data));
-             });
- 
-             it('check calls with data that not equal with data in localStorage', function () {
-                 var emptyData = {};
- 
-+                obj.internalDataHandler(data);
-                 obj.internalDataHandler(emptyData);
- 
--                expect(obj.localStorage.get).toHaveBeenCalled();
--                expect(obj.localStorage.set).toHaveBeenCalledWith(emptyData);
-+                expect(window.localStorage.getItem(obj.namespace)).toBe(JSON.stringify(emptyData));
-             });
-         });
-         describe('"externalDataHandler" method', function () {
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/view/product-ids-resolver.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/view/product-ids-resolver.test.js
-new file mode 100644
-index 00000000000..be92b6814da
---- /dev/null
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/view/product-ids-resolver.test.js
-@@ -0,0 +1,62 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/* eslint-disable max-nested-callbacks */
-+define([
-+    'squire',
-+    'jquery',
-+    'ko',
-+    'jquery/ui'
-+], function (Squire, $, ko) {
-+    'use strict';
-+
-+    var injector = new Squire(),
-+        mocks = {
-+            'Magento_Catalog/js/product/view/product-ids': ko.observableArray([])
-+        },
-+        form = $(
-+            '<form>' +
-+            '<input type="hidden" name="product" value="1">' +
-+            '</form>'
-+        ),
-+        productIdResolver;
-+
-+    beforeAll(function (done) {
-+
-+        injector.mock(mocks);
-+        injector.require(
-+            [
-+                'Magento_Catalog/js/product/view/product-ids-resolver'
-+            ], function (resolver) {
-+                productIdResolver = resolver;
-+                done();
-+            }
-+        );
-+    });
-+
-+    describe('Magento_Catalog/js/product/view/product-ids-resolver', function () {
-+        var dataProvider = [
-+            {
-+                ids: [],
-+                expected: ['1']
-+            },
-+            {
-+                ids: ['2', '3'],
-+                expected: ['2', '3', '1']
-+            },
-+            {
-+                ids: ['3', '1', '5'],
-+                expected: ['3', '1', '5']
-+            }
-+        ];
-+
-+        dataProvider.forEach(function (data) {
-+            it('resolved product id\'s', function () {
-+                mocks['Magento_Catalog/js/product/view/product-ids'](data.ids);
-+                expect(productIdResolver(form)).toEqual(data.expected);
-+            });
-+        });
-+    });
-+});
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js
-index 3d8325a3ecd..ce9c98c9d25 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js
-@@ -150,5 +150,12 @@ define([
-             });
-             expect(mocks['Magento_Checkout/js/model/cart/totals-processor/default'].estimateTotals).toHaveBeenCalled();
-         });
-+
-+        it('test subscribe when cart data was changed', function () {
-+            mocks['Magento_Customer/js/customer-data'].get('cart')({
-+                dataId: 2
-+            });
-+            expect(mocks['Magento_Checkout/js/model/cart/totals-processor/default'].estimateTotals).toHaveBeenCalled();
-+        });
-     });
- });
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/error-processor.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/error-processor.test.js
-new file mode 100644
-index 00000000000..93731646aad
---- /dev/null
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/error-processor.test.js
-@@ -0,0 +1,75 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/*eslint max-nested-callbacks: 0*/
-+define([
-+    'squire'
-+], function (Squire) {
-+    'use strict';
-+
-+    describe('Magento_Checkout/js/model/error-processor', function () {
-+        var injector = new Squire(),
-+            mocks = {
-+                'mage/url': {
-+                    /** Method stub. */
-+                    build: jasmine.createSpy()
-+                },
-+                'Magento_Ui/js/model/messageList': jasmine.createSpy('globalList')
-+            },
-+            model;
-+
-+        beforeEach(function (done) {
-+            injector.mock(mocks);
-+            injector.require([
-+                'Magento_Checkout/js/model/error-processor'
-+            ], function (processor) {
-+                model = processor;
-+
-+                done();
-+            });
-+        });
-+
-+        describe('Check process method', function () {
-+            it('check on success response with valid response data', function () {
-+                var messageObject = {
-+                        message: 'Valid error message!'
-+                    },
-+                    messageContainer = jasmine.createSpyObj('globalMessageList', ['addErrorMessage']);
-+
-+                model.process({
-+                    status: 200,
-+                    responseText: JSON.stringify(messageObject)
-+                }, messageContainer);
-+                expect(messageContainer.addErrorMessage).toHaveBeenCalledWith(messageObject);
-+            });
-+
-+            it('check on success response with invalid response data', function () {
-+                var messageContainer = jasmine.createSpyObj('globalMessageList', ['addErrorMessage']),
-+                    messageObject = {
-+                        message: 'Something went wrong with your request. Please try again later.'
-+                    };
-+
-+                model.process({
-+                    status: 200,
-+                    responseText: ''
-+                }, messageContainer);
-+                expect(messageContainer.addErrorMessage)
-+                    .toHaveBeenCalledWith(messageObject);
-+            });
-+
-+            it('check on failed status', function () {
-+                var messageContainer = jasmine.createSpyObj('globalMessageList', ['addErrorMessage']);
-+
-+                spyOn(window.location, 'replace').and.callFake(function () {});
-+                model.process({
-+                    status: 401,
-+                    responseText: ''
-+                }, messageContainer);
-+                expect(mocks['mage/url'].build)
-+                    .toHaveBeenCalled();
-+            });
-+        });
-+    });
-+});
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js
-index 8b4fae5a694..7c21a8aae2f 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js
-@@ -26,15 +26,18 @@ define([
-                 'items': [
-                     {
-                         'item_id': 1,
--                        'product_sku': 'bundle'
-+                        'product_sku': 'bundle',
-+                        'product_id': '1'
-                     },
-                     {
-                         'item_id': 5,
--                        'product_sku': 'simple'
-+                        'product_sku': 'simple',
-+                        'product_id': '5'
-                     },
-                     {
-                         'item_id': 7,
--                        'product_sku': 'configurable'
-+                        'product_sku': 'configurable',
-+                        'product_id': '7'
-                     }
-                 ]
-             },
-@@ -63,7 +66,9 @@ define([
- 
-                 sidebar._removeItemAfter(elem);
-                 expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
--                expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:removeFromCart', 'simple');
-+                expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:removeFromCart', {
-+                    'productIds': ['5']
-+                });
-             });
- 
-             it('Cart item doesn\'t exists', function () {
-@@ -91,7 +96,7 @@ define([
- 
-                 sidebar._updateItemQtyAfter(elem);
-                 expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
--                expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:updateCartItemQty', 'simple');
-+                expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:updateCartItemQty');
-                 expect(sidebar._hideItemButton).toHaveBeenCalledWith(elem);
-             });
- 
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
-index ff420c48304..9b9b1ce5b16 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
-@@ -12,7 +12,7 @@ require.config({
-     }
- });
- 
--define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
-+define(['squire', 'ko', 'jquery', 'uiRegistry', 'jquery/validate'], function (Squire, ko, $, registry) {
-     'use strict';
- 
-     var injector = new Squire(),
-@@ -28,7 +28,17 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
-             'Magento_Checkout/js/model/address-converter': jasmine.createSpy(),
-             'Magento_Checkout/js/model/quote': {
-                 isVirtual: jasmine.createSpy(),
--                shippingMethod: ko.observable()
-+                shippingMethod: ko.observable(),
-+
-+                /**
-+                 * Stub
-+                 */
-+                shippingAddress: function () {
-+
-+                    return {
-+                        'countryId': 'AD'
-+                    };
-+                }
-             },
-             'Magento_Checkout/js/action/create-shipping-address': jasmine.createSpy().and.returnValue(
-                 jasmine.createSpyObj('newShippingAddress', ['getKey'])
-@@ -52,7 +62,7 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
-                 'checkoutData',
-                 ['setSelectedShippingAddress', 'setNewCustomerShippingAddress', 'setSelectedShippingRate']
-             ),
--            'uiRegistry': jasmine.createSpy(),
-+            'Magento_Ui/js/lib/registry/registry': registry,
-             'Magento_Checkout/js/model/shipping-rate-service': jasmine.createSpy()
-         },
-         obj;
-@@ -63,6 +73,7 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
-             obj = new Constr({
-                 provider: 'provName',
-                 name: '',
-+                parentName: 'test',
-                 index: '',
-                 popUpForm: {
-                     options: {
-@@ -156,12 +167,26 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
- 
-         describe('"setShippingInformation" method', function () {
-             it('Check method call.', function () {
-+                spyOn(obj, 'validateShippingInformation').and.returnValue(false);
-                 expect(obj.setShippingInformation()).toBeUndefined();
-             });
-         });
- 
-         describe('"validateShippingInformation" method', function () {
-             it('Check method call on negative cases.', function () {
-+                var country = {
-+                    'indexedOptions': {
-+                        'AD':
-+                            {
-+                                label: 'Andorra',
-+                                labeltitle: 'Andorra',
-+                                value: 'AD'
-+                            }
-+                    }
-+                };
-+
-+                registry.set('test.shippingAddress.shipping-address-fieldset.country_id', country);
-+                registry.set('checkout.errors', {});
-                 obj.source = {
-                     get: jasmine.createSpy().and.returnValue(true),
-                     set: jasmine.createSpy(),
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js
-index ed2e29f4baf..6b68978380e 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js
-@@ -46,8 +46,8 @@ define([
- 
-             variation.serializeData();
- 
--            expect(variation.source.data['configurable-matrix']).toBeUndefined();
--            expect(variation.source.data['associated_product_ids']).toBeUndefined();
-+            expect(variation.source.data['configurable-matrix']).toEqual(matrix);
-+            expect(variation.source.data['associated_product_ids']).toEqual(ids);
-             expect(variation.source.data['configurable-matrix-serialized']).toEqual(resultMatrix);
-             expect(variation.source.data['associated_product_ids_serialized']).toEqual(resultIds);
-         });
-@@ -112,10 +112,69 @@ define([
-             variation.source.data['associated_product_ids_serialized'] = JSON.stringify(['some old data']);
-             variation.serializeData();
- 
--            expect(variation.source.data['configurable-matrix']).toBeUndefined();
--            expect(variation.source.data['associated_product_ids']).toBeUndefined();
-+            expect(variation.source.data['configurable-matrix']).toEqual(matrix);
-+            expect(variation.source.data['associated_product_ids']).toEqual(ids);
-             expect(variation.source.data['configurable-matrix-serialized']).toEqual(resultMatrix);
-             expect(variation.source.data['associated_product_ids_serialized']).toEqual(resultIds);
-         });
-+
-+        it('checks that "unserializeData" unserializes data', function () {
-+            var matrixString = '[{"name":"Small Product","attributes":"Size: small","price":5.5},' +
-+                '{"name":"Medium Product","attributes":"Size: medium","price":10.99},' +
-+                '{"name":"Large Product","attributes":"Size: large","price":25}]',
-+            idString = '[100, 101, 102]',
-+            resultMatrix = JSON.parse(matrixString),
-+            resultIds = JSON.parse(idString);
-+
-+            variation.source.data['configurable-matrix-serialized'] = matrixString;
-+            variation.source.data['associated_product_ids_serialized'] = idString;
-+
-+            variation.unserializeData();
-+
-+            expect(variation.source.data['configurable-matrix-serialized']).toBeUndefined();
-+            expect(variation.source.data['associated_product_ids_serialized']).toBeUndefined();
-+            expect(variation.source.data['configurable-matrix']).toEqual(resultMatrix);
-+            expect(variation.source.data['associated_product_ids']).toEqual(resultIds);
-+        });
-+
-+        it('checks that "serializeData" and "unserializeData" give proper result', function () {
-+            var matrix = [
-+                    {
-+                        name: 'Small Product',
-+                        attributes: 'Size: small',
-+                        price: 5.50
-+                    },
-+                    {
-+                        name: 'Medium Product',
-+                        attributes: 'Size: medium',
-+                        price: 10.99
-+                    },
-+                    {
-+                        name: 'Large Product',
-+                        attributes: 'Size: large',
-+                        price: 25
-+                    }
-+                ],
-+                ids = [1, 2, 3],
-+                resultMatrix = JSON.stringify(matrix),
-+                resultIds = JSON.stringify(ids);
-+
-+            variation.source.data['configurable-matrix'] = matrix;
-+            variation.source.data['associated_product_ids'] = ids;
-+
-+            variation.serializeData();
-+
-+            expect(variation.source.data['configurable-matrix']).toEqual(matrix);
-+            expect(variation.source.data['associated_product_ids']).toEqual(ids);
-+            expect(variation.source.data['configurable-matrix-serialized']).toEqual(resultMatrix);
-+            expect(variation.source.data['associated_product_ids_serialized']).toEqual(resultIds);
-+
-+            variation.unserializeData();
-+
-+            expect(variation.source.data['configurable-matrix']).toEqual(matrix);
-+            expect(variation.source.data['associated_product_ids']).toEqual(ids);
-+            expect(variation.source.data['configurable-matrix-serialized']).toBeUndefined();
-+            expect(variation.source.data['associated_product_ids_serialized']).toBeUndefined();
-+        });
-     });
- });
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/adminhtml/js/view/form/components/form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/adminhtml/js/view/form/components/form.test.js
-new file mode 100644
-index 00000000000..2ef8736b4f0
---- /dev/null
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/adminhtml/js/view/form/components/form.test.js
-@@ -0,0 +1,71 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'underscore',
-+    'uiRegistry',
-+    'Magento_Customer/js/form/components/form',
-+    'jquery'
-+], function (_, registry, Constr, $) {
-+    'use strict';
-+
-+    describe('Magento_Customer/js/form/components/form', function () {
-+
-+        var obj,
-+            originaljQueryAjax;
-+
-+        beforeEach(function () {
-+            originaljQueryAjax = $.ajax;
-+            obj = new Constr({
-+                provider: 'provName',
-+                name: '',
-+                index: ''
-+            });
-+        });
-+
-+        afterEach(function () {
-+            $.ajax = originaljQueryAjax;
-+        });
-+
-+        registry.set('provName', {
-+            /** Stub */
-+            on: function () {},
-+
-+            /** Stub */
-+            get: function () {},
-+
-+            /** Stub */
-+            set: function () {}
-+        });
-+
-+        describe('"deleteAddress" method', function () {
-+            it('Check for defined ', function () {
-+                expect(obj.hasOwnProperty('deleteAddress')).toBeDefined();
-+            });
-+            it('Check method type', function () {
-+                var type = typeof obj.deleteAddress;
-+
-+                expect(type).toEqual('function');
-+            });
-+            it('Check returned value if method called without arguments', function () {
-+                expect(obj.deleteAddress()).toBeUndefined();
-+            });
-+            it('Check returned value type if method called without arguments', function () {
-+                var type = typeof obj.deleteAddress();
-+
-+                expect(type).toEqual('undefined');
-+            });
-+            it('Should call not call ajax if arguments are empty', function () {
-+                $.ajax = jasmine.createSpy();
-+
-+                spyOn(obj, 'deleteAddress');
-+
-+                expect(obj.deleteAddress()).toBeUndefined();
-+
-+                expect($.ajax).not.toHaveBeenCalled();
-+            });
-+        });
-+    });
-+});
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js
-index 395dd96822e..c2a20c8339c 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js
-@@ -25,17 +25,7 @@ define([
-                 'Magento_Checkout/js/model/payment/additional-validators': {
-                     validate: jasmine.createSpy().and.returnValue(true)
-                 },
--                'Magento_Ui/js/model/messageList': {
--                    addErrorMessage: jasmine.createSpy(),
--                    addSuccessMessage: jasmine.createSpy()
--                },
--                'paypalInContextExpressCheckout': {
--                    checkout: {
--                        initXO: jasmine.createSpy(),
--                        closeFlow: jasmine.createSpy(),
--                        startFlow: jasmine.createSpy()
--                    }
--                },
-+                'Magento_Paypal/js/in-context/express-checkout-smart-buttons': jasmine.createSpy(),
-                 'Magento_Customer/js/customer-data': {
-                     invalidate: jasmine.createSpy()
-                 }
-@@ -43,6 +33,15 @@ define([
-             obj;
- 
-         beforeAll(function (done) {
-+            window.checkoutConfig = {
-+                quoteData: {
-+                    entityId: 1
-+                },
-+                formKey: 'formKey'
-+            };
-+            window.customerData = {
-+                id: 1
-+            };
-             injector.mock(mocks);
-             injector.require(
-                 ['Magento_Paypal/js/view/payment/method-renderer/in-context/checkout-express'],
-@@ -51,9 +50,11 @@ define([
-                         provider: 'provName',
-                         name: 'test',
-                         index: 'test',
--                        selectPaymentMethod: jasmine.createSpy()
-+                        item: {
-+                            method: 'payflow_express_bml'
-+                        },
-+                        clientConfig: {}
-                     });
--
-                     done();
-                 });
-         });
-@@ -65,77 +66,11 @@ define([
-             } catch (e) {}
-         });
- 
--        describe('"click" method checks', function () {
--            it('check success request', function () {
--                mocks['Magento_Paypal/js/action/set-payment-method'].and.callFake(function () {
--                    var promise = $.Deferred();
--
--                    promise.resolve();
--
--                    return promise;
--                });
--                spyOn(jQuery, 'get').and.callFake(function () {
--                    var promise = $.Deferred();
--
--                    promise.resolve({
--                        url: 'url'
--                    });
--
--                    return promise;
--                });
--
--                obj.clientConfig.click(new Event('event'));
--
--                expect(mocks.paypalInContextExpressCheckout.checkout.initXO).toHaveBeenCalled();
--                expect(mocks.paypalInContextExpressCheckout.checkout.startFlow).toHaveBeenCalledWith('url');
--                expect(mocks.paypalInContextExpressCheckout.checkout.closeFlow).not.toHaveBeenCalled();
--                expect(mocks['Magento_Customer/js/customer-data'].invalidate).toHaveBeenCalled();
--            });
--
--            it('check request with error message', function () {
--                mocks['Magento_Paypal/js/action/set-payment-method'].and.callFake(function () {
--                    var promise = $.Deferred();
--
--                    promise.resolve();
--
--                    return promise;
--                });
--                spyOn(jQuery, 'get').and.callFake(function () {
--                    var promise = $.Deferred();
--
--                    promise.resolve({
--                        message: {
--                            text: 'Text',
--                            type: 'error'
--                        }
--                    });
--
--                    return promise;
--                });
--
--                obj.clientConfig.click(new Event('event'));
--
--                expect(mocks['Magento_Ui/js/model/messageList'].addErrorMessage).toHaveBeenCalledWith({
--                    message: 'Text'
--                });
--                expect(mocks.paypalInContextExpressCheckout.checkout.initXO).toHaveBeenCalled();
--                expect(mocks.paypalInContextExpressCheckout.checkout.closeFlow).toHaveBeenCalled();
--                expect(mocks['Magento_Customer/js/customer-data'].invalidate).toHaveBeenCalled();
--            });
--
--            it('check on fail request', function () {
--                mocks['Magento_Paypal/js/action/set-payment-method'].and.callFake(function () {
--                    var promise = $.Deferred();
--
--                    promise.reject();
--
--                    return promise;
--                });
--                spyOn(jQuery, 'get');
--
--                obj.clientConfig.click(new Event('event'));
-+        describe('check smart button initialization', function () {
-+            it('express-checkout-smart-buttons is initialized', function () {
- 
--                expect(jQuery.get).not.toHaveBeenCalled();
-+                obj.renderPayPalButtons();
-+                expect(mocks['Magento_Paypal/js/in-context/express-checkout-smart-buttons']).toHaveBeenCalled();
-             });
-         });
-     });
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
-index f05338ad1e7..7bc9a2a0113 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
-@@ -24,12 +24,28 @@ define([
-                 return true;
-             }).and.callThrough(),
-             mocks = {
-+                'Magento_Checkout/js/model/checkout-data-resolver': {
-+
-+                    /** Stub */
-+                    applyBillingAddress: function () {
-+                        return true;
-+                    },
-+
-+                    /** Stub */
-+                    resolveBillingAddress: function () {
-+                        return true;
-+                    }
-+                },
-                 'Magento_Checkout/js/model/quote': {
-                     billingAddress: ko.observable(),
-                     shippingAddress: ko.observable(),
-                     paymentMethod: ko.observable(),
--                    totals: ko.observable({})
-+                    totals: ko.observable({}),
- 
-+                    /** Stub */
-+                    isVirtual: function () {
-+                        return false;
-+                    }
-                 },
-                 'Magento_Checkout/js/action/set-payment-information': setPaymentMock,
-                 'Magento_Checkout/js/model/payment/additional-validators': {
-@@ -61,7 +77,7 @@ define([
-                         name: 'test',
-                         index: 'test',
-                         item: {
--                            method: 'paypal_express_bml'
-+                            method: 'payflow_express_bml'
-                         }
-                     });
- 
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/adminhtml/js/form/insert.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/adminhtml/js/form/insert.test.js
-new file mode 100644
-index 00000000000..dbe76f0dc26
---- /dev/null
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/adminhtml/js/form/insert.test.js
-@@ -0,0 +1,45 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/* eslint-disable max-nested-callbacks */
-+define([
-+    'jquery',
-+    'Magento_Ui/js/form/components/insert'
-+], function ($, Insert) {
-+    'use strict';
-+
-+    describe('Magento_Ui/js/form/components/insert', function () {
-+        var obj, params;
-+
-+        beforeEach(function () {
-+            params = {
-+                isRendered: false,
-+                autoRender: false
-+            };
-+            obj = new Insert(params);
-+        });
-+
-+        describe('"onRender" method', function () {
-+            it('Check method call with not JSON response', function () {
-+                var data = '<Not JSON>';
-+
-+                obj.onRender(data);
-+
-+                expect(obj.content()).toBe(data);
-+                expect(obj.isRendered).toBeTruthy();
-+                expect(obj.startRender).toBeFalsy();
-+            });
-+
-+            it('Check method call with ajaxExpired JSON', function () {
-+                var data = '{"ajaxExpired": 1, "ajaxRedirect": "#test"}';
-+
-+                obj.onRender(data);
-+
-+                expect(obj.content()).toBe('');
-+                expect(window.location.href).toContain('#test');
-+            });
-+        });
-+    });
-+});
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js
-index 2e238eb9930..fc60fbb0bdc 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js
-@@ -151,12 +151,14 @@ define([
-                     }
-                 }],
-                 result = [{
-+                    defaultLabelVisible: true,
-                     label: 'Label 2',
-                     name: 'Name 2',
-                     required: false,
-                     columnsHeaderClasses: '',
-                     sortOrder: 5
-                 }, {
-+                    defaultLabelVisible: true,
-                     label: 'Label 1',
-                     name: 'Name 1',
-                     required: false,
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js
-index 390c5aa89fc..e1d853e0b1b 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js
-@@ -5,19 +5,50 @@
- 
- /*eslint max-nested-callbacks: 0*/
- define([
--    'Magento_Ui/js/form/element/abstract'
--], function (Abstract) {
-+    'squire'
-+], function (Squire) {
-     'use strict';
- 
-     describe('Magento_Ui/js/form/element/abstract', function () {
--        var params, model;
--
--        beforeEach(function () {
-+        var injector = new Squire(),
-+            providerMock = {
-+                get: jasmine.createSpy(),
-+                set: jasmine.createSpy()
-+            },
-+            mocks = {
-+                'Magento_Ui/js/lib/registry/registry': {
-+                    /** Method stub. */
-+                    get: function () {
-+                        return providerMock;
-+                    },
-+                    create: jasmine.createSpy(),
-+                    set: jasmine.createSpy(),
-+                    async: jasmine.createSpy()
-+                },
-+                '/mage/utils/wrapper': jasmine.createSpy()
-+            },
-+            dataScope = 'abstract',
-             params = {
--                dataScope: 'abstract'
--            };
--            model = new Abstract(params);
--            model.source = jasmine.createSpyObj('model.source', ['set']);
-+                provider: 'provName',
-+                name: '',
-+                index: 'testIndex',
-+                dataScope: dataScope,
-+                service: {
-+                    template: 'ui/form/element/helper/service'
-+                }
-+            },
-+            model;
-+
-+        beforeEach(function (done) {
-+            injector.mock(mocks);
-+            injector.require([
-+                'Magento_Ui/js/form/element/abstract',
-+                'knockoutjs/knockout-es5'
-+            ], function (Constr) {
-+                model = new Constr(params);
-+
-+                done();
-+            });
-         });
- 
-         describe('initialize method', function () {
-@@ -50,8 +81,10 @@ define([
-                 var expectedValue = 1;
- 
-                 spyOn(model, 'getInitialValue').and.returnValue(expectedValue);
-+                model.service = true;
-                 expect(model.setInitialValue()).toEqual(model);
-                 expect(model.getInitialValue).toHaveBeenCalled();
-+                expect(model.source.set).toHaveBeenCalledWith('data.use_default.' + model.index, 0);
-                 expect(model.value()).toEqual(expectedValue);
-             });
-         });
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/boolean.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/boolean.test.js
-index 4f64d1f53aa..282badea088 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/boolean.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/boolean.test.js
-@@ -6,18 +6,45 @@
- /*eslint max-nested-callbacks: 0*/
- 
- define([
--    'Magento_Ui/js/form/element/boolean'
--], function (BooleanElement) {
-+    'squire'
-+], function (Squire) {
-     'use strict';
- 
-     describe('Magento_Ui/js/form/element/boolean', function () {
--        var params, model;
-+        var injector = new Squire(),
-+            mocks = {
-+                'Magento_Ui/js/lib/registry/registry': {
-+                    /** Method stub. */
-+                    get: function () {
-+                        return {
-+                            get: jasmine.createSpy(),
-+                            set: jasmine.createSpy()
-+                        };
-+                    },
-+                    create: jasmine.createSpy(),
-+                    set: jasmine.createSpy(),
-+                    async: jasmine.createSpy()
-+                },
-+                '/mage/utils/wrapper': jasmine.createSpy()
-+            },
-+            model,
-+            dataScope = 'dataScope';
- 
--        beforeEach(function () {
--            params = {
--                dataScope: 'abstract'
--            };
--            model = new BooleanElement(params);
-+        beforeEach(function (done) {
-+            injector.mock(mocks);
-+            injector.require([
-+                'Magento_Ui/js/form/element/boolean',
-+                'knockoutjs/knockout-es5'
-+            ], function (Constr) {
-+                model = new Constr({
-+                    provider: 'provName',
-+                    name: '',
-+                    index: '',
-+                    dataScope: dataScope
-+                });
-+
-+                done();
-+            });
-         });
- 
-         describe('getInitialValue method', function () {
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js
-index bd314bcc857..01208a083a6 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js
-@@ -6,23 +6,52 @@
- /*eslint max-nested-callbacks: 0*/
- 
- define([
--    'Magento_Ui/js/form/element/date',
--    'mageUtils',
--    'moment'
--], function (DateElement, utils, moment) {
-+    'squire'
-+], function (Squire) {
-     'use strict';
- 
--    describe('Magento_Ui/js/form/element/date', function () {
--        var params, model;
--
--        beforeEach(function () {
--            params = {
--                dataScope: 'abstract',
--                options: {
--                    showsTime: true
--                }
--            };
--            model = new DateElement(params);
-+    describe('Magento_Ui/js/form/element/date-time', function () {
-+        var injector = new Squire(),
-+            mocks = {
-+                'Magento_Ui/js/lib/registry/registry': {
-+                    /** Method stub. */
-+                    get: function () {
-+                        return {
-+                            get: jasmine.createSpy(),
-+                            set: jasmine.createSpy()
-+                        };
-+                    },
-+                    create: jasmine.createSpy(),
-+                    set: jasmine.createSpy(),
-+                    async: jasmine.createSpy()
-+                },
-+                '/mage/utils/wrapper': jasmine.createSpy()
-+            },
-+            model, utils, moment,
-+            dataScope = 'abstract';
-+
-+        beforeEach(function (done) {
-+            injector.mock(mocks);
-+            injector.require([
-+                'Magento_Ui/js/form/element/date',
-+                'mageUtils',
-+                'moment',
-+                'knockoutjs/knockout-es5'
-+            ], function (Constr, mageUtils, m) {
-+                model = new Constr({
-+                    provider: 'provName',
-+                    name: '',
-+                    index: '',
-+                    dataScope: dataScope,
-+                    options: {
-+                        showsTime: true
-+                    }
-+                });
-+                utils = mageUtils;
-+                moment = m;
-+
-+                done();
-+            });
-         });
- 
-         it('Check prepareDateTimeFormats function', function () {
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js
-index 0b2290ba7a8..f9d379407fc 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js
-@@ -4,19 +4,50 @@
-  */
- 
- define([
--    'Magento_Ui/js/form/element/date',
--    'mageUtils'
--], function (DateElement, utils) {
-+    'squire'
-+], function (Squire) {
-     'use strict';
- 
-     describe('Magento_Ui/js/form/element/date', function () {
--        var params, model;
-+        var injector = new Squire(),
-+            mocks = {
-+                'Magento_Ui/js/lib/registry/registry': {
-+                    /** Method stub. */
-+                    get: function () {
-+                        return {
-+                            get: jasmine.createSpy(),
-+                            set: jasmine.createSpy()
-+                        };
-+                    },
-+                    create: jasmine.createSpy(),
-+                    set: jasmine.createSpy(),
-+                    async: jasmine.createSpy()
-+                },
-+                '/mage/utils/wrapper': jasmine.createSpy()
-+            },
-+            model, utils,
-+            dataScope = 'abstract';
- 
--        beforeEach(function () {
--            params = {
--                dataScope: 'abstract'
--            };
--            model = new DateElement(params);
-+        beforeEach(function (done) {
-+            injector.mock(mocks);
-+            injector.require([
-+                'Magento_Ui/js/form/element/date',
-+                'mageUtils',
-+                'knockoutjs/knockout-es5'
-+            ], function (Constr, mageUtils) {
-+                model = new Constr({
-+                    provider: 'provName',
-+                    name: '',
-+                    index: '',
-+                    dataScope: dataScope,
-+                    options: {
-+                        showsTime: true
-+                    }
-+                });
-+                utils = mageUtils;
-+
-+                done();
-+            });
-         });
- 
-         it('Check prepareDateTimeFormats function', function () {
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js
-index 916733fd2b0..46916054a29 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js
-@@ -7,28 +7,65 @@
- 
- define([
-     'jquery',
--    'Magento_Ui/js/form/element/file-uploader'
--], function ($, FileUploader) {
-+    'squire'
-+], function ($, Squire) {
-     'use strict';
- 
-     describe('Magento_Ui/js/form/element/file-uploader', function () {
--        var component;
-+        var injector = new Squire(),
-+            mocks = {
-+                'Magento_Ui/js/lib/core/events': {
-+                    on: jasmine.createSpy()
-+                },
-+                'Magento_Ui/js/lib/registry/registry': {
-+                    /** Method stub. */
-+                    get: function () {
-+                        return {
-+                            get: jasmine.createSpy(),
-+                            set: jasmine.createSpy()
-+                        };
-+                    },
-+                    create: jasmine.createSpy(),
-+                    set: jasmine.createSpy(),
-+                    async: jasmine.createSpy()
-+                },
-+                '/mage/utils/wrapper': jasmine.createSpy()
-+            },
-+            component,
-+            dataScope = 'dataScope',
-+            originalJQuery = jQuery.fn;
-+
-+        beforeEach(function (done) {
-+            injector.mock(mocks);
-+            injector.require([
-+                'Magento_Ui/js/form/element/file-uploader',
-+                'knockoutjs/knockout-es5'
-+            ], function (Constr) {
-+                component = new Constr({
-+                    provider: 'provName',
-+                    name: '',
-+                    index: '',
-+                    dataScope: dataScope
-+                });
- 
--        beforeEach(function () {
--            component = new FileUploader({
--                dataScope: 'abstract'
-+                done();
-             });
-         });
- 
-+        afterEach(function () {
-+            jQuery.fn = originalJQuery;
-+        });
-+
-         describe('initUploader method', function () {
-             it('creates instance of file uploader', function () {
-                 var elem = document.createElement('input');
- 
--                spyOn($.fn, 'fileupload');
-+                spyOn(jQuery.fn, 'fileupload');
- 
-                 component.initUploader(elem);
- 
--                expect($.fn.fileupload).toHaveBeenCalled();
-+                expect(jQuery.fn.fileupload).toHaveBeenCalled();
-+
-             });
-         });
- 
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/post-code.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/post-code.test.js
-index 9bddfcd3564..96bca1bbd8c 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/post-code.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/post-code.test.js
-@@ -5,19 +5,45 @@
- 
- /*eslint max-nested-callbacks: 0*/
- define([
--    'uiRegistry',
--    'Magento_Ui/js/form/element/post-code'
--], function (registry, PostCodeElement) {
-+    'squire'
-+], function (Squire) {
-     'use strict';
- 
-     describe('Magento_Ui/js/form/element/post-code', function () {
--        var params, model;
-+        var injector = new Squire(),
-+            mocks = {
-+                'Magento_Ui/js/lib/registry/registry': {
-+                    /** Method stub. */
-+                    get: function () {
-+                        return {
-+                            get: jasmine.createSpy(),
-+                            set: jasmine.createSpy()
-+                        };
-+                    },
-+                    create: jasmine.createSpy(),
-+                    set: jasmine.createSpy(),
-+                    async: jasmine.createSpy()
-+                },
-+                '/mage/utils/wrapper': jasmine.createSpy()
-+            },
-+            model,
-+            dataScope = 'post-code';
- 
--        beforeEach(function () {
--            params = {
--                dataScope: 'post-code'
--            };
--            model = new PostCodeElement(params);
-+        beforeEach(function (done) {
-+            injector.mock(mocks);
-+            injector.require([
-+                'Magento_Ui/js/form/element/post-code',
-+                'knockoutjs/knockout-es5'
-+            ], function (Constr) {
-+                model = new Constr({
-+                    provider: 'provName',
-+                    name: '',
-+                    index: '',
-+                    dataScope: dataScope
-+                });
-+
-+                done();
-+            });
-         });
- 
-         describe('update method', function () {
-@@ -31,9 +57,9 @@ define([
-                         }
-                     };
- 
--                spyOn(registry, 'get').and.returnValue(country);
-+                spyOn(mocks['Magento_Ui/js/lib/registry/registry'], 'get').and.returnValue(country);
-                 model.update(value);
--                expect(registry.get).toHaveBeenCalled();
-+                expect(mocks['Magento_Ui/js/lib/registry/registry'].get).toHaveBeenCalled();
-                 expect(model.error()).toEqual(false);
-                 expect(model.required()).toEqual(false);
-             });
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/region.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/region.test.js
-index 8e76d8e9072..a36d3b0b7fe 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/region.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/region.test.js
-@@ -5,19 +5,46 @@
- 
- /*eslint max-nested-callbacks: 0*/
- define([
--    'uiRegistry',
--    'Magento_Ui/js/form/element/region'
--], function (registry, RegionElement) {
-+    'squire'
-+], function (Squire) {
-     'use strict';
- 
-     describe('Magento_Ui/js/form/element/region', function () {
--        var params, model;
-+        var injector = new Squire(),
-+            mocks = {
-+                'Magento_Ui/js/lib/registry/registry': {
-+                    /** Method stub. */
-+                    get: function () {
-+                        return {
-+                            get: jasmine.createSpy(),
-+                            set: jasmine.createSpy()
-+                        };
-+                    },
-+                    create: jasmine.createSpy(),
-+                    set: jasmine.createSpy(),
-+                    async: jasmine.createSpy()
-+                },
-+                '/mage/utils/wrapper': jasmine.createSpy()
-+            },
-+            model,
-+            dataScope = 'dataScope';
- 
--        beforeEach(function () {
--            params = {
--                dataScope: 'region'
--            };
--            model = new RegionElement(params);
-+        beforeEach(function (done) {
-+            injector.mock(mocks);
-+            injector.require([
-+                'Magento_Ui/js/form/element/region',
-+                'knockoutjs/knockout-es5',
-+                'Magento_Ui/js/lib/knockout/extender/observable_array'
-+            ], function (Constr) {
-+                model = new Constr({
-+                    provider: 'provName',
-+                    name: '',
-+                    index: '',
-+                    dataScope: dataScope
-+                });
-+
-+                done();
-+            });
-         });
- 
-         describe('update method', function () {
-@@ -31,9 +58,9 @@ define([
-                         }
-                     };
- 
--                spyOn(registry, 'get').and.returnValue(country);
-+                spyOn(mocks['Magento_Ui/js/lib/registry/registry'], 'get').and.returnValue(country);
-                 model.update(value);
--                expect(registry.get).toHaveBeenCalled();
-+                expect(mocks['Magento_Ui/js/lib/registry/registry'].get).toHaveBeenCalled();
-                 expect(model.error()).toEqual(false);
-                 expect(model.required()).toEqual(false);
-             });
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js
-index 6eac9369745..fffb045e8ce 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js
-@@ -5,18 +5,49 @@
- 
- /*eslint max-nested-callbacks: 0*/
- define([
--    'Magento_Ui/js/form/element/select'
--], function (SelectElement) {
-+    'squire'
-+], function (Squire) {
-     'use strict';
- 
-     describe('Magento_Ui/js/form/element/select', function () {
--        var params, model;
--
--        beforeEach(function () {
-+        var injector = new Squire(),
-+            mocks = {
-+                'Magento_Ui/js/lib/registry/registry': {
-+                    /** Method stub. */
-+                    get: function () {
-+                        return {
-+                            get: jasmine.createSpy(),
-+                            set: jasmine.createSpy()
-+                        };
-+                    },
-+                    options: jasmine.createSpy(),
-+                    create: jasmine.createSpy(),
-+                    set: jasmine.createSpy(),
-+                    async: jasmine.createSpy()
-+                },
-+                '/mage/utils/wrapper': jasmine.createSpy(),
-+                'Magento_Ui/js/core/renderer/layout': jasmine.createSpy()
-+            },
-+            dataScope = 'select',
-             params = {
--                dataScope: 'select'
--            };
--            model = new SelectElement(params);
-+                provider: 'provName',
-+                name: '',
-+                index: '',
-+                dataScope: dataScope
-+            },
-+            model;
-+
-+        beforeEach(function (done) {
-+            injector.mock(mocks);
-+            injector.require([
-+                'Magento_Ui/js/form/element/select',
-+                'knockoutjs/knockout-es5',
-+                'Magento_Ui/js/lib/knockout/extender/observable_array'
-+            ], function (Constr) {
-+                model = new Constr(params);
-+
-+                done();
-+            });
-         });
- 
-         describe('initialize method', function () {
-@@ -24,26 +55,20 @@ define([
-                 expect(model).toBeDefined();
-             });
-             it('check for chainable', function () {
--                spyOn(model, 'initInput');
-                 spyOn(model, 'initFilter');
-                 expect(model.initialize(params)).toEqual(model);
--                expect(model.initInput).not.toHaveBeenCalled();
-                 expect(model.initFilter).not.toHaveBeenCalled();
-             });
-             it('check for call initInput', function () {
--                spyOn(model, 'initInput');
-                 spyOn(model, 'initFilter');
-                 model.customEntry = true;
-                 expect(model.initialize(params)).toEqual(model);
--                expect(model.initInput).toHaveBeenCalled();
-                 expect(model.initFilter).not.toHaveBeenCalled();
-             });
-             it('check for call initFilter', function () {
--                spyOn(model, 'initInput');
-                 spyOn(model, 'initFilter');
-                 model.filterBy = true;
-                 expect(model.initialize(params)).toEqual(model);
--                expect(model.initInput).not.toHaveBeenCalled();
-                 expect(model.initFilter).toHaveBeenCalled();
-             });
-         });
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/single-checkbox-use-config.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/single-checkbox-use-config.test.js
-new file mode 100644
-index 00000000000..f63e0adda1e
---- /dev/null
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/single-checkbox-use-config.test.js
-@@ -0,0 +1,78 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+/*eslint max-nested-callbacks: 0*/
-+
-+define([
-+    'squire'
-+], function (Squire) {
-+    'use strict';
-+
-+    describe('Magento_Ui/js/form/element/single-checkbox-use-config', function () {
-+        var injector = new Squire(),
-+            mocks = {
-+                'Magento_Ui/js/lib/registry/registry': {
-+                    /** Method stub. */
-+                    get: function () {
-+                        return {
-+                            get: jasmine.createSpy(),
-+                            set: jasmine.createSpy()
-+                        };
-+                    },
-+                    create: jasmine.createSpy(),
-+                    set: jasmine.createSpy(),
-+                    async: jasmine.createSpy()
-+                },
-+                '/mage/utils/wrapper': jasmine.createSpy()
-+            },
-+            dataScope = 'dataScope',
-+            params = {
-+                provider: 'provName',
-+                name: '',
-+                index: '',
-+                dataScope: dataScope
-+            },
-+            model;
-+
-+        beforeEach(function (done) {
-+            injector.mock(mocks);
-+            injector.require([
-+                'Magento_Ui/js/form/element/single-checkbox-use-config',
-+                'knockoutjs/knockout-es5'
-+            ], function (Constr) {
-+                model = new Constr(params);
-+                done();
-+            });
-+        });
-+
-+        describe('initObservable method', function () {
-+            it('check for chainable', function () {
-+                expect(model.initObservable({})).toEqual(model);
-+            });
-+            it('check for validation', function () {
-+                spyOn(model, 'observe').and.returnValue(model);
-+                expect(model.initObservable()).toEqual(model);
-+                expect(model.validation).toEqual({});
-+            });
-+        });
-+
-+        describe('toggleElement method', function () {
-+            it('check with isUseDefault false', function () {
-+                spyOn(model, 'isUseDefault').and.returnValue(false);
-+                spyOn(model, 'isUseConfig').and.returnValue(false);
-+                expect(model.toggleElement()).toEqual(undefined);
-+                expect(model.disabled()).toEqual(false);
-+                expect(model.source.set).toHaveBeenCalledWith('data.use_default.' + model.index, 0);
-+            });
-+            it('check with isUseDefault true', function () {
-+                spyOn(model, 'isUseDefault').and.returnValue(true);
-+                spyOn(model, 'isUseConfig').and.returnValue(false);
-+                expect(model.toggleElement()).toEqual(undefined);
-+                expect(model.disabled()).toEqual(true);
-+                expect(model.source.set).toHaveBeenCalledWith('data.use_default.' + model.index, 1);
-+            });
-+        });
-+    });
-+});
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/textarea.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/textarea.test.js
-index 03b00f0c3a8..60beff8d9b6 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/textarea.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/textarea.test.js
-@@ -4,18 +4,46 @@
-  */
- 
- define([
--    'Magento_Ui/js/form/element/textarea'
--], function (TextareaElement) {
-+    'squire'
-+], function (Squire) {
-     'use strict';
- 
-     describe('Magento_Ui/js/form/element/textarea', function () {
--        var params, model;
-+        var injector = new Squire(),
-+            mocks = {
-+                'Magento_Ui/js/lib/registry/registry': {
-+                    /** Method stub. */
-+                    get: function () {
-+                        return {
-+                            get: jasmine.createSpy(),
-+                            set: jasmine.createSpy()
-+                        };
-+                    },
-+                    options: jasmine.createSpy(),
-+                    create: jasmine.createSpy(),
-+                    set: jasmine.createSpy(),
-+                    async: jasmine.createSpy()
-+                },
-+                '/mage/utils/wrapper': jasmine.createSpy()
-+            },
-+            model,
-+            dataScope = 'dataScope';
- 
--        beforeEach(function () {
--            params = {
--                dataScope: 'textarea'
--            };
--            model = new TextareaElement(params);
-+        beforeEach(function (done) {
-+            injector.mock(mocks);
-+            injector.require([
-+                'Magento_Ui/js/form/element/textarea',
-+                'knockoutjs/knockout-es5'
-+            ], function (Constr) {
-+                model = new Constr({
-+                    provider: 'provName',
-+                    name: '',
-+                    index: '',
-+                    dataScope: dataScope
-+                });
-+
-+                done();
-+            });
-         });
- 
-         it('check if component defined', function () {
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js
-index 52a410ffbf6..ac6e230e7ed 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js
-@@ -7,29 +7,59 @@
- define([
-     'underscore',
-     'uiRegistry',
--    'Magento_Ui/js/form/element/ui-select',
--    'ko',
--    'jquery'
--], function (_, registry, Constr, ko, $) {
-+    'squire',
-+    'ko'
-+], function (_, registry, Squire, ko) {
-     'use strict';
- 
-     describe('Magento_Ui/js/form/element/ui-select', function () {
--        var obj, originaljQueryAjax;
-+        var obj, jq, originaljQueryAjax,
-+            injector = new Squire(),
-+            mocks = {
-+                'Magento_Ui/js/lib/registry/registry': {
-+                    /** Method stub. */
-+                    get: function () {
-+                        return {
-+                            get: jasmine.createSpy(),
-+                            set: jasmine.createSpy()
-+                        };
-+                    },
-+                    create: jasmine.createSpy(),
-+                    set: jasmine.createSpy(),
-+                    async: jasmine.createSpy()
-+                },
-+                '/mage/utils/wrapper': jasmine.createSpy()
-+            },
-+            dataScope = 'abstract';
-+
-+        beforeEach(function (done) {
-+            injector.mock(mocks);
-+            injector.require([
-+                'Magento_Ui/js/form/element/ui-select',
-+                'jquery',
-+                'knockoutjs/knockout-es5'
-+            ], function (Constr, $) {
-+                obj = new Constr({
-+                    provider: 'provName',
-+                    name: '',
-+                    index: '',
-+                    dataScope: dataScope,
-+                    options: {
-+                        showsTime: true
-+                    }
-+                });
- 
--        beforeEach(function () {
--            obj = new Constr({
--                name: 'uiSelect',
--                dataScope: '',
--                provider: 'provider'
-+                obj.value = ko.observableArray([]);
-+                obj.cacheOptions.plain = [];
-+                originaljQueryAjax = $.ajax;
-+                jq = $;
-+                done();
-             });
--
--            obj.value = ko.observableArray([]);
--            obj.cacheOptions.plain = [];
--            originaljQueryAjax = $.ajax;
-         });
- 
-         afterEach(function () {
--            $.ajax = originaljQueryAjax;
-+            jq.ajax = originaljQueryAjax;
-+            injector.clean();
-         });
- 
-         describe('"initialize" method', function () {
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/expandable.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/expandable.test.js
-index 1c3b51919f5..b8b6dce52c0 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/expandable.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/expandable.test.js
-@@ -69,5 +69,22 @@ define([
-                 expect(expandable.getLabel).toHaveBeenCalled();
-             });
-         });
-+
-+        describe('getLabelsArray method', function () {
-+            it('check if label array sort alphabetically case insensitive', function () {
-+                record['shared_catalog'].push(1, 2, 3);
-+                expandable.options.push({
-+                    label: 'Default',
-+                    value: '1'
-+                }, {
-+                    label: 'Label',
-+                    value: '2'
-+                }, {
-+                    label: 'default',
-+                    value: '3'
-+                });
-+                expect(expandable.getLabelsArray(record)).toEqual(['Default', 'default', 'Label']);
-+            });
-+        });
-     });
- });
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/select.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/select.test.js
-index 057b22a7529..b36a075c9a7 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/select.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/select.test.js
-@@ -1,5 +1,5 @@
- /**
-- * Copyright © 2016 Magento. All rights reserved.
-+ * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- /*eslint max-nested-callbacks: 0*/
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/datepicker.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/datepicker.test.js
-index 7d042ffcf3c..38728bca391 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/datepicker.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/datepicker.test.js
-@@ -53,5 +53,23 @@ define([
- 
-             expect(todayDate).toEqual(result);
-         });
-+
-+        it('update picked date\'s value after update observable value', function () {
-+            var date = '06/21/2019',
-+                inputFormat = 'M/d/yy',
-+                expectedDate;
-+
-+            expectedDate = moment(date, utils.convertToMomentFormat(inputFormat)).toDate();
-+            observable(date);
-+
-+            expect(expectedDate.valueOf()).toEqual(element.datepicker('getDate').valueOf());
-+        });
-+
-+        it('clear picked date\'s value after clear observable value', function () {
-+            element.datepicker('setTimezoneDate').blur().trigger('change');
-+            observable('');
-+
-+            expect(null).toEqual(element.datepicker('getDate'));
-+        });
-     });
- });
-diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js
-index 0703374aaa9..692c843d18e 100644
---- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js
-+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js
-@@ -15,7 +15,7 @@ define([
-                 var value = '',
-                     params = [1,3];
- 
--                expect(rules['range-words'].handler(value, params)).toBe(false);
-+                expect(rules['range-words'].handler(value, params)).toBe(true);
-             });
- 
-             it('Check on redundant words', function () {
-diff --git a/dev/tests/js/jasmine/tests/lib/mage/collapsible.test.js b/dev/tests/js/jasmine/tests/lib/mage/collapsible.test.js
-index d6c95d2887e..1f34e48f8ae 100644
---- a/dev/tests/js/jasmine/tests/lib/mage/collapsible.test.js
-+++ b/dev/tests/js/jasmine/tests/lib/mage/collapsible.test.js
-@@ -26,7 +26,8 @@ define([
- 
-         describe('Test enable, disable, activate and deactivate methods', function () {
-             var group = $('<div id="2"></div>'),
--                content = $('<div data-role="content"></div>').appendTo(group);
-+                content = $('<div data-role="content"></div>').appendTo(group),
-+                emptyGroup = $('<div></div>');
- 
-             $('<div data-role="title"></div>').prependTo(group);
- 
-@@ -65,6 +66,15 @@ define([
-                 group.collapsible('destroy');
-                 expect(group.is(':mage-collapsible')).toBeFalsy();
-             });
-+
-+            it('check activate method on empty group', function () {
-+                emptyGroup.collapsible();
-+                expect(emptyGroup.is(':mage-collapsible')).toBeTruthy();
-+
-+                expect(function () {
-+                    emptyGroup.collapsible('activate');
-+                }).not.toThrow();
-+            });
-         });
- 
-         it('check if the widget gets expanded/collapsed when the title is clicked', function () {
-diff --git a/dev/tests/js/jasmine/tests/lib/mage/validation.test.js b/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
-index 1e1203d22a1..ca9ec877013 100644
---- a/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
-+++ b/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
-@@ -1142,4 +1142,24 @@ define([
-             )).toEqual(true);
-         });
-     });
-+
-+    describe('Testing validate-forbidden-extensions', function () {
-+        it('validate-forbidden-extensions', function () {
-+            var el1 = $('<input type="text" value="" ' +
-+                'class="validate-extensions" data-validation-params="php,phtml">').get(0);
-+
-+            expect($.validator.methods['validate-forbidden-extensions']
-+                .call($.validator.prototype, 'php', el1, null)).toEqual(false);
-+            expect($.validator.methods['validate-forbidden-extensions']
-+                .call($.validator.prototype, 'php,phtml', el1, null)).toEqual(false);
-+            expect($.validator.methods['validate-forbidden-extensions']
-+                .call($.validator.prototype, 'html', el1, null)).toEqual(true);
-+            expect($.validator.methods['validate-forbidden-extensions']
-+                .call($.validator.prototype, 'html,png', el1, null)).toEqual(true);
-+            expect($.validator.methods['validate-forbidden-extensions']
-+                .call($.validator.prototype, 'php,html', el1, null)).toEqual(false);
-+            expect($.validator.methods['validate-forbidden-extensions']
-+                .call($.validator.prototype, 'html,php', el1, null)).toEqual(false);
-+        });
-+    });
- });
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema.xml
-index 5b8a4c8f37c..ae6c98e4627 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema.xml
-@@ -21,7 +21,7 @@
-         <column xsi:type="bigint" name="bigint_default_nullable" padding="2" nullable="true" default="1"
-                 unsigned="true"/>
-         <column xsi:type="bigint" name="bigint_not_default_not_nullable" padding="2" nullable="false" unsigned="true"/>
--        <constraint xsi:type="primary" name="tinyint_primary">
-+        <constraint xsi:type="primary" referenceId="tinyint_primary">
-             <column name="tinyint_ref"/>
-         </constraint>
-     </table>
-@@ -30,7 +30,7 @@
-                 nullable="true"/>
-         <column xsi:type="smallint" name="int_disabled_auto_increment" default="0" identity="false" padding="12"
-                 unsigned="true" nullable="true"/>
--        <constraint xsi:type="unique" name="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
-+        <constraint xsi:type="unique" referenceId="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
-             <column name="int_auto_increment_with_nullable"/>
-         </constraint>
-     </table>
-@@ -53,15 +53,15 @@
-         <column xsi:type="boolean" name="boolean"/>
-         <column xsi:type="varbinary" name="varbinary_rename" default="10101" disabled="true"/>
-         <!--Constraints-->
--        <constraint xsi:type="unique" name="TEST_TABLE_SMALLINT_BIGINT">
-+        <constraint xsi:type="unique" referenceId="TEST_TABLE_UNIQUE">
-             <column name="smallint"/>
-             <column name="bigint"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE"
-                     column="tinyint" table="test_table"
-                     referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="NO ACTION"/>
-         <!--Indexes-->
--        <index name="TEST_TABLE_TINYINT_BIGINT" indexType="btree">
-+        <index referenceId="TEST_TABLE_INDEX" indexType="btree">
-             <column name="tinyint"/>
-             <column name="bigint"/>
-         </index>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/foreign_key_interpreter_result.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/foreign_key_interpreter_result.php
-index 76fcf6b2fad..e3068c1bd76 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/foreign_key_interpreter_result.php
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/foreign_key_interpreter_result.php
-@@ -33,7 +33,7 @@ return [
-             'constraint' => [
-                 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF' => [
-                     'type' => 'foreign',
--                    'name' => 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF',
-+                    'referenceId' => 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF',
-                     'column' => 'tinyint',
-                     'table' => 'test_table',
-                     'referenceTable' => 'reference_table',
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/valid_xml_revision_1.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/valid_xml_revision_1.php
-index cd42a1e8fc3..a064d096f6d 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/valid_xml_revision_1.php
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/valid_xml_revision_1.php
-@@ -93,7 +93,7 @@ return [
-                         'tinyint_ref' => 'tinyint_ref',
-                     ],
-                     'type' => 'primary',
--                    'name' => 'tinyint_primary',
-+                    'referenceId' => 'tinyint_primary',
-                 ],
-             ],
-             'name' => 'reference_table',
-@@ -125,7 +125,7 @@ return [
-                         'int_auto_increment_with_nullable' => 'int_auto_increment_with_nullable',
-                     ],
-                     'type' => 'unique',
--                    'name' => 'AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE',
-+                    'referenceId' => 'AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE',
-                 ],
-             ],
-             'name' => 'auto_increment_test',
-@@ -225,17 +225,17 @@ return [
-                 ],
-             ],
-             'constraint' => [
--                'TEST_TABLE_SMALLINT_BIGINT' => [
-+                'TEST_TABLE_UNIQUE' => [
-                     'column' => [
-                         'smallint' => 'smallint',
-                         'bigint' => 'bigint',
-                     ],
-                     'type' => 'unique',
--                    'name' => 'TEST_TABLE_SMALLINT_BIGINT',
-+                    'referenceId' => 'TEST_TABLE_UNIQUE',
-                 ],
--                'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF' => [
-+                'TEST_TABLE_TINYINT_REFERENCE' => [
-                     'type' => 'foreign',
--                    'name' => 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF',
-+                    'referenceId' => 'TEST_TABLE_TINYINT_REFERENCE',
-                     'column' => 'tinyint',
-                     'table' => 'test_table',
-                     'referenceTable' => 'reference_table',
-@@ -244,12 +244,12 @@ return [
-                 ],
-             ],
-             'index' => [
--                'TEST_TABLE_TINYINT_BIGINT' => [
-+                'TEST_TABLE_INDEX' => [
-                     'column' => [
-                         'tinyint' => 'tinyint',
-                         'bigint' => 'bigint',
-                     ],
--                    'name' => 'TEST_TABLE_TINYINT_BIGINT',
-+                    'referenceId' => 'TEST_TABLE_INDEX',
-                     'indexType' => 'btree',
-                 ],
-             ],
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/base_update/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/base_update/db_schema.xml
-index 7384c4ed7ba..af66686e77b 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/base_update/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/base_update/db_schema.xml
-@@ -9,7 +9,7 @@
-         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-     <table name="reference_table" resource="default" comment="Reference table">
-         <column xsi:type="smallint" name="smallint_ref" padding="6" nullable="false" unsigned="false" identity="true" comment="Smallint"/>
--        <constraint xsi:type="primary" name="tinyint_primary">
-+        <constraint xsi:type="primary" referenceId="tinyint_primary">
-             <column name="smallint_ref"/>
-         </constraint>
-     </table>
-@@ -22,14 +22,14 @@
-         <column xsi:type="mediumtext" name="mediumtext" comment="Mediumtext"/>
-         <column xsi:type="varchar" name="varchar" length="254" nullable="true" comment="Varchar"/>
-         <column xsi:type="boolean" name="boolean" comment="Boolean"/>
--        <constraint xsi:type="unique" name="TEST_TABLE_SMALLINT_BIGINT">
-+        <constraint xsi:type="unique" referenceId="TEST_TABLE_SMALLINT_BIGINT">
-             <column name="smallint"/>
-             <column name="bigint"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-                     column="smallint" table="test_table"
-                     referenceTable="reference_table" referenceColumn="smallint_ref" onDelete="CASCADE"/>
--        <index name="TEST_TABLE_BIGINT" indexType="btree">
-+        <index referenceId="TEST_TABLE_BIGINT" indexType="btree">
-             <column name="bigint"/>
-         </index>
-     </table>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/before_rollback/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/before_rollback/db_schema.xml
-index 4d3d51b9c02..8c42f9efd12 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/before_rollback/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/before_rollback/db_schema.xml
-@@ -20,7 +20,7 @@
-     <table name="store_owner" comment="Store owner information" engine="innodb" resource="default">
-         <column name="owner_id" xsi:type="smallint" nullable="false" unsigned="false" identity="true" />
-         <column name="store_owner_name" onCreate="migrateDataFrom(label)" xsi:type="varchar" length="255" comment="Store Owner Name" />
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="owner_id" />
-         </constraint>
-     </table>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_modifications/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_modifications/db_schema.xml
-index 0adcd5c52f9..4f9a5ab6d5a 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_modifications/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_modifications/db_schema.xml
-@@ -21,7 +21,7 @@
-         <column xsi:type="bigint" name="bigint_default_nullable" padding="2" nullable="true" default="123"
-                 unsigned="true"/>
-         <column xsi:type="bigint" name="bigint_not_default_not_nullable" nullable="false" unsigned="false"/>
--        <constraint xsi:type="primary" name="tinyint_primary">
-+        <constraint xsi:type="primary" referenceId="tinyint_primary">
-             <column name="tinyint_ref"/>
-         </constraint>
-     </table>
-@@ -29,7 +29,7 @@
-         <column xsi:type="int" name="int_auto_increment_with_nullable" padding="15" unsigned="true" nullable="true"/>
-         <column xsi:type="smallint" name="int_disabled_auto_increment" default="0" identity="false" padding="12"
-                 unsigned="true" nullable="true"/>
--        <constraint xsi:type="unique" name="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
-+        <constraint xsi:type="unique" referenceId="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
-             <column name="int_auto_increment_with_nullable"/>
-         </constraint>
-     </table>
-@@ -52,15 +52,15 @@
-         <column xsi:type="boolean" name="boolean" default="true"/>
-         <column xsi:type="varbinary" name="varbinary_rename" default="10101" disabled="true"/>
-         <!--Constraints-->
--        <constraint xsi:type="unique" name="TEST_TABLE_SMALLINT_BIGINT">
-+        <constraint xsi:type="unique" referenceId="TEST_TABLE_SMALLINT_BIGINT">
-             <column name="smallint"/>
-             <column name="bigint"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-                     column="tinyint" table="test_table"
-                     referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="NO ACTION"/>
-         <!--Indexes-->
--        <index name="TEST_TABLE_TINYINT_BIGINT" indexType="btree">
-+        <index referenceId="TEST_TABLE_TINYINT_BIGINT" indexType="btree">
-             <column name="tinyint"/>
-             <column name="bigint"/>
-         </index>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema.xml
-index 4b78f436eab..a3c4fe010fd 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema.xml
-@@ -20,14 +20,14 @@
-         <column xsi:type="bigint" name="bigint_default_nullable" padding="2" nullable="true" default="1"
-                 unsigned="true"/>
-         <column xsi:type="bigint" name="bigint_not_default_not_nullable" padding="2" nullable="false" unsigned="true"/>
--        <constraint xsi:type="primary" name="tinyint_primary">
-+        <constraint xsi:type="primary" referenceId="tinyint_primary">
-             <column name="tinyint_ref"/>
-         </constraint>
-     </table>
-     <table name="auto_increment_test" resource="default">
-         <column xsi:type="int" name="int_auto_increment_with_nullable" identity="true" padding="12" unsigned="true"
-                 nullable="true"/>
--        <constraint xsi:type="unique" name="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
-+        <constraint xsi:type="unique" referenceId="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
-             <column name="int_auto_increment_with_nullable"/>
-         </constraint>
-     </table>
-@@ -50,15 +50,15 @@
-         <column xsi:type="boolean" name="boolean"/>
-         <column xsi:type="varbinary" name="varbinary_rename" default="10101" disabled="false"/>
-         <!--Constraints-->
--        <constraint xsi:type="unique" name="TEST_TABLE_SMALLINT_BIGINT">
-+        <constraint xsi:type="unique" referenceId="TEST_TABLE_SMALLINT_BIGINT">
-             <column name="smallint"/>
-             <column name="bigint"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-                     column="tinyint" table="test_table"
-                     referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="NO ACTION"/>
-         <!--Indexes-->
--        <index name="TEST_TABLE_TINYINT_BIGINT" indexType="btree">
-+        <index referenceId="TEST_TABLE_TINYINT_BIGINT" indexType="btree">
-             <column name="tinyint"/>
-             <column name="bigint"/>
-         </index>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema.xml
-index 68f2810e8ee..93e6e13eb36 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema.xml
-@@ -22,11 +22,11 @@
-         <column xsi:type="bigint" name="bigint_default_nullable" padding="2" nullable="true" default="1"
-                 unsigned="true"/>
-         <column xsi:type="bigint" name="bigint_not_default_not_nullable" padding="2" nullable="false" unsigned="true"/>
--        <constraint xsi:type="primary" name="tinyint_primary">
-+        <constraint xsi:type="primary" referenceId="tinyint_primary">
-             <column name="tinyint_ref"/>
-             <column name="smallint_ref"/>
-         </constraint>
--        <constraint xsi:type="unique" name="REFERENCE_TABLE_SMALLINT_REF">
-+        <constraint xsi:type="unique" referenceId="REFERENCE_TABLE_SMALLINT_REF">
-             <column name="smallint_ref"/>
-         </constraint>
-     </table>
-@@ -35,7 +35,7 @@
-                 nullable="true"/>
-         <column xsi:type="smallint" name="int_disabled_auto_increment" default="0" identity="false" padding="12"
-                 unsigned="true" nullable="true"/>
--        <constraint xsi:type="unique" name="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
-+        <constraint xsi:type="unique" referenceId="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
-             <column name="int_auto_increment_with_nullable"/>
-         </constraint>
-     </table>
-@@ -60,23 +60,23 @@
-         <column xsi:type="boolean" name="boolean"/>
-         <column xsi:type="varbinary" name="varbinary_rename" default="10101" disabled="true"/>
-         <!--Constraints-->
--        <constraint xsi:type="unique" name="TEST_TABLE_SMALLINT_FLOAT">
-+        <constraint xsi:type="unique" referenceId="TEST_TABLE_SMALLINT_FLOAT">
-             <column name="smallint"/>
-             <column name="float"/>
-         </constraint>
--        <constraint xsi:type="unique" name="TEST_TABLE_DOUBLE">
-+        <constraint xsi:type="unique" referenceId="TEST_TABLE_DOUBLE">
-             <column name="double"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="some_foreign_key_new" column="smallint_main" table="test_table"
-+        <constraint xsi:type="foreign" referenceId="some_foreign_key_new" column="smallint_main" table="test_table"
-                     referenceTable="reference_table" referenceColumn="smallint_ref" onDelete="CASCADE"/>
--        <constraint xsi:type="foreign" name="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-                     column="tinyint" table="test_table"
-                     referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="SET NULL"/>
--        <constraint xsi:type="foreign" name="FK_FB77604C299EB8612D01E4AF8D9931F2"
-+        <constraint xsi:type="foreign" referenceId="FK_FB77604C299EB8612D01E4AF8D9931F2"
-                     column="integer_main" table="test_table"
-                     referenceTable="auto_increment_test" referenceColumn="int_auto_increment_with_nullable"/>
-         <!--Indexes-->
--        <index name="TEST_TABLE_TINYINT_BIGINT" indexType="btree">
-+        <index referenceId="TEST_TABLE_TINYINT_BIGINT" indexType="btree">
-             <column name="tinyint"/>
-             <column name="bigint"/>
-         </index>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/db_schema.xml
-index 0a0131e5006..8a73d9e2255 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/db_schema.xml
-@@ -12,7 +12,7 @@
-                 nullable="true"/>
-         <column xsi:type="smallint" name="int_disabled_auto_increment" default="0" identity="false" padding="12"
-                 unsigned="true" nullable="true"/>
--        <constraint xsi:type="unique" name="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
-+        <constraint xsi:type="unique" referenceId="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
-             <column name="int_auto_increment_with_nullable"/>
-         </constraint>
-     </table>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/foreign_key_interpreter/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/foreign_key_interpreter/db_schema.xml
-index e4a5ca05d02..479c4c87f61 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/foreign_key_interpreter/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/foreign_key_interpreter/db_schema.xml
-@@ -12,7 +12,7 @@
-     </table>
-     <table name="test_table" resource="default">
-         <column xsi:type="tinyint" name="tinyint" default="0" padding="7" nullable="true" unsigned="false"/>
--        <constraint xsi:type="foreign" name="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-                     column="tinyint" table="test_table"
-                     referenceTable="reference_table" referenceColumn="tinyint_ref"/>
-     </table>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/index_to_disable/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/index_to_disable/db_schema.xml
-new file mode 100644
-index 00000000000..e10803af248
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/index_to_disable/db_schema.xml
-@@ -0,0 +1,30 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="test_table" resource="default">
-+        <!--Columns-->
-+        <column xsi:type="smallint" identity="true" name="smallint" padding="3" nullable="true"/>
-+        <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
-+        <column xsi:type="bigint" name="bigint" default="0" padding="13" nullable="true" unsigned="false"/>
-+        <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
-+        <!--Constraints-->
-+        <constraint xsi:type="unique" referenceId="TEST_TABLE_UNIQUE">
-+            <column name="smallint"/>
-+            <column name="bigint"/>
-+        </constraint>
-+        <!--Indexes-->
-+        <index referenceId="TEST_TABLE_INDEX" indexType="btree">
-+            <column name="tinyint"/>
-+            <column name="bigint"/>
-+        </index>
-+        <index referenceId="TEST_TABLE_INDEX_VARCHAR" indexType="btree">
-+            <column name="varchar"/>
-+        </index>
-+    </table>
-+</schema>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/db_schema.xml
-index 6b92440ca92..1347a1ba8e3 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/db_schema.xml
-@@ -9,7 +9,7 @@
-         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-     <table name="reference_table" resource="default" comment="Reference table">
-         <column xsi:type="smallint" name="smallint_ref" padding="6" nullable="false" unsigned="false" identity="true" comment="Smallint"/>
--        <constraint xsi:type="primary" name="tinyint_primary">
-+        <constraint xsi:type="primary" referenceId="tinyint_primary">
-             <column name="smallint_ref"/>
-         </constraint>
-     </table>
-@@ -22,14 +22,14 @@
-         <column xsi:type="mediumtext" name="mediumtext" comment="Mediumtext"/>
-         <column xsi:type="varchar" name="varchar" length="254" nullable="true" comment="Varchar"/>
-         <column xsi:type="boolean" name="boolean" comment="Boolean"/>
--        <constraint xsi:type="unique" name="TEST_TABLE_SMALLINT_BIGINT">
-+        <constraint xsi:type="unique" referenceId="TEST_TABLE_SMALLINT_BIGINT">
-             <column name="smallint"/>
-             <column name="bigint"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-                     column="smallint" table="test_table"
-                     referenceTable="reference_table" referenceColumn="smallint_ref" onDelete="CASCADE"/>
--        <index name="TEST_TABLE_BIGINT" indexType="btree">
-+        <index referenceId="TEST_TABLE_BIGINT" indexType="btree">
-             <column name="bigint"/>
-         </index>
-     </table>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/whitelist_upgrade/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/whitelist_upgrade/db_schema.xml
-new file mode 100644
-index 00000000000..90eaf91b107
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/whitelist_upgrade/db_schema.xml
-@@ -0,0 +1,60 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="reference_table" resource="default">
-+        <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
-+        <column xsi:type="tinyint" name="tinyint_without_padding" default="0" nullable="false" unsigned="false"/>
-+        <column xsi:type="bigint" name="bigint_without_padding" default="0" nullable="false" unsigned="false"/>
-+        <column xsi:type="smallint" name="smallint_without_padding" default="0" nullable="false" unsigned="false"/>
-+        <column xsi:type="int" name="integer_without_padding" default="0" nullable="false" unsigned="false"/>
-+        <column xsi:type="smallint" name="smallint_with_big_padding" padding="254" default="0" nullable="false"
-+                unsigned="false"/>
-+        <column xsi:type="smallint" name="smallint_without_default" padding="2" nullable="true" unsigned="false"/>
-+        <column xsi:type="int" name="int_without_unsigned" padding="2" nullable="true"/>
-+        <column xsi:type="int" name="int_unsigned" padding="2" nullable="true" unsigned="true"/>
-+        <column xsi:type="bigint" name="bigint_default_nullable" padding="2" nullable="true" default="1"
-+                unsigned="true"/>
-+        <column xsi:type="bigint" name="bigint_not_default_not_nullable" padding="2" nullable="false" unsigned="true"/>
-+        <constraint xsi:type="primary" referenceId="tinyint_primary">
-+            <column name="tinyint_ref"/>
-+        </constraint>
-+    </table>
-+    <table name="test_table" resource="default">
-+        <!--Columns-->
-+        <column xsi:type="smallint" identity="true" name="smallint" padding="3" nullable="true"/>
-+        <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
-+        <column xsi:type="bigint" name="bigint" default="0" padding="13" nullable="true" unsigned="false"/>
-+        <column xsi:type="float" name="float" default="0" scale="4" precision="12"/>
-+        <column xsi:type="decimal" name="double" default="11111111.111111" precision="14" scale="6"/>
-+        <column xsi:type="decimal" name="decimal" default="0" scale="4" precision="15"/>
-+        <column xsi:type="date" name="date"/>
-+        <column xsi:type="timestamp" name="timestamp" default="CURRENT_TIMESTAMP" on_update="true"/>
-+        <column xsi:type="datetime" name="datetime" default="0"/>
-+        <column xsi:type="longtext" name="longtext"/>
-+        <column xsi:type="mediumtext" name="mediumtext"/>
-+        <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
-+        <column xsi:type="mediumblob" name="mediumblob"/>
-+        <column xsi:type="blob" name="blob"/>
-+        <column xsi:type="boolean" name="boolean"/>
-+        <column xsi:type="varbinary" name="varbinary_rename" default="10101" disabled="true"/>
-+        <!--Constraints-->
-+        <constraint xsi:type="unique" referenceId="TEST_TABLE_UNIQUE">
-+            <column name="smallint"/>
-+            <column name="bigint"/>
-+        </constraint>
-+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE"
-+                    column="tinyint" table="test_table"
-+                    referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="NO ACTION"/>
-+        <!--Indexes-->
-+        <index referenceId="TEST_TABLE_INDEX" indexType="btree">
-+            <column name="tinyint"/>
-+            <column name="bigint"/>
-+        </index>
-+    </table>
-+</schema>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/without_setup_version/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/without_setup_version/module.xml
-new file mode 100644
-index 00000000000..ed831eb6e93
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/without_setup_version/module.xml
-@@ -0,0 +1,10 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_TestSetupDeclarationModule1"/>
-+</config>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/db_schema.xml
-index b6ff634e6ef..9bd6c438455 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/db_schema.xml
-@@ -11,7 +11,7 @@
-         <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
-         <column xsi:type="int" name="some_integer" default="0" nullable="false" unsigned="false"/>
-         <column xsi:type="varchar" name="for_patch_testing" comment="For patch testing" />
--        <constraint xsi:type="primary" name="tinyint_primary">
-+        <constraint xsi:type="primary" referenceId="tinyint_primary">
-             <column name="tinyint_ref"/>
-         </constraint>
-     </table>
-@@ -21,10 +21,10 @@
-         <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
-         <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
-         <column xsi:type="varbinary" name="varbinary" default="10101" />
--        <constraint xsi:type="foreign" name="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-                     column="tinyint" table="test_table"
-                     referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="CASCADE"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="smallint" />
-         </constraint>
-     </table>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/drop_table_with_external_dependency/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/drop_table_with_external_dependency/db_schema.xml
-new file mode 100644
-index 00000000000..c22c41b7a5c
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/drop_table_with_external_dependency/db_schema.xml
-@@ -0,0 +1,11 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="reference_table" disabled="true"/>
-+</schema>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/without_setup_version/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/without_setup_version/module.xml
-new file mode 100644
-index 00000000000..27e21dc3fe8
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/without_setup_version/module.xml
-@@ -0,0 +1,10 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_TestSetupDeclarationModule3"/>
-+</config>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema.xml
-index 4520cd9e4d4..8082157524a 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema.xml
-@@ -11,7 +11,7 @@
-         <column xsi:type="int" name="page_id" nullable="false" />
-         <column xsi:type="varchar" name="email" nullable="false" />
-         <column xsi:type="varchar" name="title" />
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="page_id" />
-             <column name="email" />
-         </constraint>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/remove_title_column/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/remove_title_column/db_schema.xml
-index 9d868c01688..0eeff417487 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/remove_title_column/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/remove_title_column/db_schema.xml
-@@ -10,7 +10,7 @@
-     <table name="test_table" resource="default" comment="Test Table">
-         <column xsi:type="int" name="page_id" nullable="false"  />
-         <column xsi:type="varchar" name="email" nullable="false" />
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="page_id" />
-             <column name="email" />
-         </constraint>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/restore_title_column/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/restore_title_column/db_schema.xml
-index 4520cd9e4d4..8082157524a 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/restore_title_column/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/restore_title_column/db_schema.xml
-@@ -11,7 +11,7 @@
-         <column xsi:type="int" name="page_id" nullable="false" />
-         <column xsi:type="varchar" name="email" nullable="false" />
-         <column xsi:type="varchar" name="title" />
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="page_id" />
-             <column name="email" />
-         </constraint>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/db_schema.xml
-index b6ff634e6ef..9bd6c438455 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/db_schema.xml
-@@ -11,7 +11,7 @@
-         <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
-         <column xsi:type="int" name="some_integer" default="0" nullable="false" unsigned="false"/>
-         <column xsi:type="varchar" name="for_patch_testing" comment="For patch testing" />
--        <constraint xsi:type="primary" name="tinyint_primary">
-+        <constraint xsi:type="primary" referenceId="tinyint_primary">
-             <column name="tinyint_ref"/>
-         </constraint>
-     </table>
-@@ -21,10 +21,10 @@
-         <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
-         <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
-         <column xsi:type="varbinary" name="varbinary" default="10101" />
--        <constraint xsi:type="foreign" name="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-                     column="tinyint" table="test_table"
-                     referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="CASCADE"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="smallint" />
-         </constraint>
-     </table>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema.xml
-index 9263004c6e7..d6be9376cb4 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema.xml
-@@ -21,7 +21,7 @@
-         <column xsi:type="bigint" name="bigint_default_nullable" padding="2" nullable="true" default="1"
-                 unsigned="true"/>
-         <column xsi:type="bigint" name="bigint_not_default_not_nullable" padding="2" nullable="false" unsigned="true"/>
--        <constraint xsi:type="primary" name="tinyint_primary">
-+        <constraint xsi:type="primary" referenceId="tinyint_primary">
-             <column name="tinyint_ref"/>
-         </constraint>
-     </table>
-@@ -30,7 +30,7 @@
-                 nullable="true"/>
-         <column xsi:type="smallint" name="int_disabled_auto_increment" default="0" identity="false" padding="12"
-                 unsigned="true" nullable="true"/>
--        <constraint xsi:type="unique" name="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
-+        <constraint xsi:type="unique" referenceId="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
-             <column name="int_auto_increment_with_nullable"/>
-         </constraint>
-     </table>
-@@ -53,15 +53,15 @@
-         <column xsi:type="boolean" name="boolean"/>
-         <column xsi:type="varbinary" name="varbinary_rename" default="10101" disabled="true"/>
-         <!--Constraints-->
--        <constraint xsi:type="unique" name="TEST_TABLE_SMALLINT_BIGINT">
-+        <constraint xsi:type="unique" referenceId="TEST_TABLE_SMALLINT_BIGINT">
-             <column name="smallint"/>
-             <column name="bigint"/>
-         </constraint>
--        <constraint xsi:type="foreign" name="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
-                     column="tinyint" table="test_table"
-                     referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="NO ACTION"/>
-         <!--Indexes-->
--        <index name="TEST_TABLE_TINYINT_BIGINT" indexType="btree">
-+        <index referenceId="TEST_TABLE_TINYINT_BIGINT" indexType="btree">
-             <column name="tinyint"/>
-             <column name="bigint"/>
-         </index>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/db_schema.xml
-new file mode 100644
-index 00000000000..f8860731aa8
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/db_schema.xml
-@@ -0,0 +1,13 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="test_table" resource="default">
-+        <index referenceId="TEST_TABLE_INDEX_VARCHAR" disabled="1"/>
-+    </table>
-+</schema>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/db_schema_whitelist.json b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/db_schema_whitelist.json
-new file mode 100644
-index 00000000000..a65bb6aab1c
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/db_schema_whitelist.json
-@@ -0,0 +1,7 @@
-+{
-+  "test_table": {
-+    "index": {
-+      "TEST_TABLE_VARCHAR": true
-+    }
-+  }
-+}
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/module.xml
-new file mode 100644
-index 00000000000..a0b9bbe483b
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/module.xml
-@@ -0,0 +1,14 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_TestSetupDeclarationModule8">
-+        <sequence>
-+            <module name="Magento_TestSetupDeclarationModule1" />
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disabling_tables/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disabling_tables/db_schema.xml
-new file mode 100644
-index 00000000000..5ea5816b1df
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disabling_tables/db_schema.xml
-@@ -0,0 +1,35 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="reference_table" resource="default">
-+        <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
-+        <column xsi:type="tinyint" name="tinyint_without_padding" default="0" nullable="false" unsigned="false"/>
-+        <column xsi:type="bigint" name="bigint_without_padding" default="0" nullable="false" unsigned="false"/>
-+        <column xsi:type="smallint" name="smallint_without_padding" default="0" nullable="false" unsigned="false"/>
-+        <column xsi:type="int" name="integer_without_padding" default="0" nullable="false" unsigned="false"/>
-+        <column xsi:type="smallint" name="smallint_with_big_padding" padding="254" default="0" nullable="false"
-+                unsigned="false"/>
-+        <constraint xsi:type="primary" referenceId="tinyint_primary">
-+            <column name="tinyint_ref"/>
-+        </constraint>
-+        <index referenceId="COMPLEX_INDEX" indexType="btree">
-+            <column name="tinyint_without_padding"/>
-+            <column name="bigint_without_padding"/>
-+        </index>
-+    </table>
-+    <table name="auto_increment_test" resource="default">
-+        <column xsi:type="int" name="int_auto_increment_with_nullable" identity="true" padding="12" unsigned="true"
-+                nullable="true"/>
-+        <column xsi:type="smallint" name="int_disabled_auto_increment" default="0" identity="false" padding="12"
-+                unsigned="true" nullable="true"/>
-+        <constraint xsi:type="unique" referenceId="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
-+            <column name="int_auto_increment_with_nullable"/>
-+        </constraint>
-+    </table>
-+</schema>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/incosistence_reference_definition/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/incosistence_reference_definition/db_schema.xml
-index e39f0a04bcf..1b7d0dcb93c 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/incosistence_reference_definition/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/incosistence_reference_definition/db_schema.xml
-@@ -9,13 +9,13 @@
-         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-     <table name="test_table" resource="default" comment="Test Table">
-         <column xsi:type="int" name="page_id" nullable="false" unsigned="false" identity="true"/>
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="page_id"/>
-         </constraint>
-     </table>
-     <table name="dependent" resource="default" comment="Lol">
-         <column xsi:type="int" name="page_id_on" nullable="true" unsigned="true"/>
--        <constraint xsi:type="foreign" name="FOREIGN" table="dependent" column="page_id_on" referenceColumn="page_id"
-+        <constraint xsi:type="foreign" referenceId="FOREIGN" table="dependent" column="page_id_on" referenceColumn="page_id"
-                     referenceTable="test_table"/>
-     </table>
- </schema>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_primary_key/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_primary_key/db_schema.xml
-index 4ecee622864..b42d74aea06 100644
---- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_primary_key/db_schema.xml
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_primary_key/db_schema.xml
-@@ -11,7 +11,7 @@
-         <column xsi:type="int" name="page_id" nullable="false" identity="true" />
-         <column xsi:type="varchar" name="email" nullable="true" />
-         <column xsi:type="varchar" name="title" />
--        <constraint xsi:type="primary" name="PRIMARY">
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-             <column name="page_id" />
-             <column name="email" />
-         </constraint>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/setup_install_with_converting/InstallSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/setup_install_with_converting/InstallSchema.php
-new file mode 100644
-index 00000000000..c1eaff264df
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/setup_install_with_converting/InstallSchema.php
-@@ -0,0 +1,334 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestSetupDeclarationModule8\Setup;
-+
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+use Magento\Framework\DB\Ddl\Table;
-+use Magento\Framework\Setup\InstallSchemaInterface;
-+use Magento\Framework\Setup\ModuleContextInterface;
-+use Magento\Framework\Setup\SchemaSetupInterface;
-+
-+/**
-+ * Install schema script for the TestSetupDeclarationModule8 module.
-+ */
-+class InstallSchema implements InstallSchemaInterface
-+{
-+    /**
-+     * The name of the main table of Module8.
-+     */
-+    const MAIN_TABLE = 'module8_test_main_table';
-+
-+    /**
-+     * The name of the second table of Module8.
-+     */
-+    const SECOND_TABLE = 'module8_test_second_table';
-+
-+    /**
-+     * The name of the second table of Module8.
-+     */
-+    const TEMP_TABLE = 'module8_test_install_temp_table';
-+
-+    /**
-+     * @inheritdoc
-+     * @throws \Zend_Db_Exception
-+     */
-+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-+    {
-+        $setup->startSetup();
-+
-+        $this->createTables($setup);
-+
-+        $setup->endSetup();
-+    }
-+
-+    /**
-+     * Create tables.
-+     *
-+     * @param SchemaSetupInterface $installer
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function createTables(SchemaSetupInterface $installer)
-+    {
-+        $mainTableName = $installer->getTable(self::MAIN_TABLE);
-+        $this->dropTableIfExists($installer, $mainTableName);
-+        $mainTable = $installer->getConnection()->newTable($mainTableName);
-+        $mainTable->setComment('Main Test Table for Module8');
-+        $this->addColumnsToMainTable($mainTable);
-+        $this->addIndexesToMainTable($mainTable);
-+        $installer->getConnection()->createTable($mainTable);
-+
-+        $secondTableName = $installer->getTable(self::SECOND_TABLE);
-+        $this->dropTableIfExists($installer, $secondTableName);
-+        $secondTable = $installer->getConnection()->newTable($secondTableName);
-+        $secondTable->setComment('Second Test Table for Module8');
-+        $this->addColumnsToSecondTable($secondTable);
-+        $this->addIndexesToSecondTable($secondTable);
-+        $this->addConstraintsToSecondTable($secondTable);
-+        $installer->getConnection()->createTable($secondTable);
-+
-+        $this->createSimpleTable($installer, self::TEMP_TABLE);
-+    }
-+
-+    /**
-+     * Drop existing tables.
-+     *
-+     * @param SchemaSetupInterface $installer
-+     * @param string $table
-+     */
-+    private function dropTableIfExists($installer, $table)
-+    {
-+        $connection = $installer->getConnection();
-+        if ($connection->isTableExists($installer->getTable($table))) {
-+            $connection->dropTable(
-+                $installer->getTable($table)
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Add tables to main table.
-+     *
-+     * @param Table $table
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function addColumnsToMainTable($table)
-+    {
-+        $table
-+            ->addColumn(
-+                'module8_email_contact_id',
-+                Table::TYPE_INTEGER,
-+                10,
-+                [
-+                    'primary' => true,
-+                    'identity' => true,
-+                    'unsigned' => true,
-+                    'nullable' => false
-+                ],
-+                'Email Contact ID'
-+            )->addColumn(
-+                'module8_contact_group_id',
-+                Table::TYPE_INTEGER,
-+                10,
-+                [
-+                    'unsigned' => true,
-+                    'nullable' => false
-+                ],
-+                'Contact Group ID'
-+            )->addColumn(
-+                'module8_is_guest',
-+                Table::TYPE_SMALLINT,
-+                null,
-+                [
-+                    'unsigned' => true,
-+                    'nullable' => true
-+                ],
-+                'Is Guest'
-+            )->addColumn(
-+                'module8_contact_id',
-+                Table::TYPE_TEXT,
-+                15,
-+                [
-+                    'unsigned' => true,
-+                    'nullable' => true
-+                ],
-+                'Contact ID'
-+            )->addColumn(
-+                'module8_content',
-+                Table::TYPE_TEXT,
-+                15,
-+                [
-+                    'nullable' => false,
-+                ],
-+                'Content'
-+            );
-+    }
-+
-+    /**
-+     * Add indexes to main table.
-+     *
-+     * @param Table $table
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function addIndexesToMainTable($table)
-+    {
-+        $table
-+            ->addIndex(
-+                'MODULE8_INSTALL_INDEX_1',
-+                ['module8_email_contact_id']
-+            )->addIndex(
-+                'MODULE8_INSTALL_UNIQUE_INDEX_2',
-+                ['module8_email_contact_id', 'module8_is_guest'],
-+                ['type' => AdapterInterface::INDEX_TYPE_UNIQUE]
-+            )->addIndex(
-+                'MODULE8_INSTALL_INDEX_3',
-+                ['module8_is_guest']
-+            )->addIndex(
-+                'MODULE8_INSTALL_INDEX_4',
-+                ['module8_contact_id']
-+            )->addIndex(
-+                'MODULE8_INSTALL_INDEX_TEMP',
-+                ['module8_content']
-+            )->addIndex(
-+                'MODULE8_INSTALL_UNIQUE_INDEX_TEMP',
-+                ['module8_contact_group_id'],
-+                ['type' => AdapterInterface::INDEX_TYPE_UNIQUE]
-+            );
-+    }
-+
-+    /**
-+     * Add tables to second table.
-+     *
-+     * @param Table $table
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function addColumnsToSecondTable($table)
-+    {
-+        $table
-+            ->addColumn(
-+                'module8_entity_id',
-+                Table::TYPE_INTEGER,
-+                10,
-+                [
-+                    'primary' => true,
-+                    'identity' => true,
-+                    'unsigned' => true,
-+                    'nullable' => false
-+                ],
-+                'Entity ID'
-+            )->addColumn(
-+                'module8_contact_id',
-+                Table::TYPE_INTEGER,
-+                null,
-+                [],
-+                'Contact ID'
-+            )->addColumn(
-+                'module8_address',
-+                Table::TYPE_TEXT,
-+                15,
-+                [
-+                    'nullable' => false,
-+                ],
-+                'Address'
-+            )->addColumn(
-+                'module8_counter_with_multiline_comment',
-+                Table::TYPE_SMALLINT,
-+                null,
-+                [
-+                    'unsigned' => true,
-+                    'nullable' => true,
-+                    'default' => 0
-+                ],
-+                'Empty
-+                Counter
-+                Multiline
-+                Comment'
-+            )->addColumn(
-+                'module8_second_address',
-+                Table::TYPE_TEXT,
-+                15,
-+                [
-+                    'unsigned' => true,
-+                    'nullable' => true
-+                ],
-+                'Second Address'
-+            )->addColumn(
-+                'module8_temp_column',
-+                Table::TYPE_TEXT,
-+                15,
-+                [
-+                    'unsigned' => true,
-+                    'nullable' => true
-+                ],
-+                'Temp column for remove'
-+            );
-+    }
-+
-+    /**
-+     * Add indexes to second table.
-+     *
-+     * @param Table $table
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function addIndexesToSecondTable($table)
-+    {
-+        $table
-+            ->addIndex(
-+                'MODULE8_INSTALL_SECOND_TABLE_INDEX_1',
-+                ['module8_entity_id']
-+            )->addIndex(
-+                'MODULE8_INSTALL_SECOND_TABLE_INDEX_2',
-+                ['module8_address']
-+            )->addIndex(
-+                'MODULE8_INSTALL_SECOND_TABLE_INDEX_3_TEMP',
-+                ['module8_second_address']
-+            );
-+    }
-+
-+    /**
-+     * Add constraints to second table.
-+     *
-+     * @param Table $table
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function addConstraintsToSecondTable($table)
-+    {
-+        $table
-+            ->addForeignKey(
-+                'MODULE8_INSTALL_FK_ENTITY_ID_TEST_MAIN_TABLE_EMAIL_CONTACT_ID',
-+                'module8_entity_id',
-+                self::MAIN_TABLE,
-+                'module8_email_contact_id'
-+            )->addForeignKey(
-+                'MODULE8_INSTALL_FK_ADDRESS_TEST_MAIN_TABLE_CONTACT_ID',
-+                'module8_address',
-+                self::MAIN_TABLE,
-+                'module8_contact_id'
-+            )->addForeignKey(
-+                'MODULE8_INSTALL_FK_ADDRESS_TEST_MAIN_TABLE_MODULE8_CONTENT_TEMP',
-+                'module8_address',
-+                self::MAIN_TABLE,
-+                'module8_content'
-+            );
-+    }
-+
-+    /**
-+     * Create a simple table.
-+     *
-+     * @param SchemaSetupInterface $setup
-+     * @param $tableName
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function createSimpleTable(SchemaSetupInterface $setup, $tableName): void
-+    {
-+        $table = $setup->getConnection()->newTable($tableName);
-+        $table
-+            ->addColumn(
-+                'module8_entity_id',
-+                Table::TYPE_INTEGER,
-+                null,
-+                [
-+                    'primary' => true,
-+                    'identity' => true,
-+                    'nullable' => false,
-+                    'unsigned' => true,
-+                ],
-+                'Entity ID'
-+            )->addColumn(
-+                'module8_counter',
-+                Table::TYPE_INTEGER,
-+                null,
-+                [
-+                    'unsigned' => true,
-+                    'nullable' => true,
-+                    'default' => 100
-+                ],
-+                'Counter'
-+            );
-+        $setup->getConnection()->createTable($table);
-+    }
-+}
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/setup_install_with_converting/UpgradeSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/setup_install_with_converting/UpgradeSchema.php
-new file mode 100644
-index 00000000000..2dc8667a75d
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/setup_install_with_converting/UpgradeSchema.php
-@@ -0,0 +1,242 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\TestSetupDeclarationModule8\Setup;
-+
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+use Magento\Framework\DB\Ddl\Table;
-+use Magento\Framework\Setup\ModuleContextInterface;
-+use Magento\Framework\Setup\SchemaSetupInterface;
-+use Magento\Framework\Setup\UpgradeSchemaInterface;
-+
-+/**
-+ * Upgrade schema script for the TestSetupDeclarationModule8 module.
-+ */
-+class UpgradeSchema implements UpgradeSchemaInterface
-+{
-+    /**
-+     * The name of the main table of the Module8.
-+     */
-+    const UPDATE_TABLE = 'module8_test_update_table';
-+
-+    /**
-+     * The name of the temporary table of the Module8.
-+     */
-+    const TEMP_TABLE = 'module8_test_temp_table';
-+
-+    /**
-+     * @inheritdoc
-+     * @throws \Zend_Db_Exception
-+     */
-+    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-+    {
-+        $setup->startSetup();
-+
-+        if (version_compare($context->getVersion(), '1.0.1', '<')) {
-+            $tableName = $setup->getTable(self::UPDATE_TABLE);
-+            $table = $setup->getConnection()->newTable($tableName);
-+            $table->setComment('Update Test Table for Module8');
-+
-+            $this->addColumns($setup, $table);
-+            $this->addIndexes($table);
-+            $this->addConstraints($table);
-+            $setup->getConnection()->createTable($table);
-+
-+            $this->createSimpleTable($setup, $setup->getTable(self::TEMP_TABLE));
-+        }
-+
-+        if (version_compare($context->getVersion(), '1.0.2', '<')) {
-+            $connection = $setup->getConnection();
-+            $connection
-+                ->dropTable(
-+                    InstallSchema::TEMP_TABLE
-+                );
-+            $connection
-+                ->dropColumn(
-+                    InstallSchema::SECOND_TABLE,
-+                    'module8_temp_column'
-+                );
-+            $connection
-+                ->dropForeignKey(
-+                    InstallSchema::SECOND_TABLE,
-+                    'MODULE8_INSTALL_FK_ADDRESS_TEST_MAIN_TABLE_MODULE8_CONTENT_TEMP'
-+                );
-+            $connection
-+                ->dropIndex(
-+                    InstallSchema::MAIN_TABLE,
-+                    'MODULE8_INSTALL_INDEX_TEMP'
-+                );
-+            $connection
-+                ->dropIndex(
-+                    InstallSchema::MAIN_TABLE,
-+                    'MODULE8_INSTALL_UNIQUE_INDEX_TEMP'
-+                );
-+        }
-+
-+        $setup->endSetup();
-+    }
-+
-+    /**
-+     * Create columns for tables.
-+     *
-+     * @param SchemaSetupInterface $setup
-+     * @param Table $table
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function addColumns(SchemaSetupInterface $setup, Table $table): void
-+    {
-+        $table
-+            ->addColumn(
-+                'module8_entity_id',
-+                Table::TYPE_INTEGER,
-+                10,
-+                [
-+                    'primary' => true,
-+                    'unsigned' => true,
-+                    'nullable' => false
-+                ],
-+                'Entity ID'
-+            )->addColumn(
-+                'module8_entity_row_id',
-+                Table::TYPE_INTEGER,
-+                null,
-+                [
-+                    'unsigned' => true,
-+                    'nullable' => false
-+                ]
-+            )->addColumn(
-+                'module8_is_guest',
-+                Table::TYPE_SMALLINT,
-+                null,
-+                [
-+                    'unsigned' => true,
-+                    'nullable' => true
-+                ],
-+                'Is Guest'
-+            )->addColumn(
-+                'module8_guest_browser_id',
-+                Table::TYPE_SMALLINT,
-+                null,
-+                [
-+                    'unsigned' => true,
-+                    'nullable' => true
-+                ],
-+                'Guest Browser ID'
-+            )->addColumn(
-+                'module8_column_for_remove',
-+                Table::TYPE_SMALLINT,
-+                null,
-+                [
-+                    'unsigned' => true,
-+                    'nullable' => true
-+                ],
-+                'For remove'
-+            );
-+
-+        $setup->getConnection()->addColumn(
-+            InstallSchema::MAIN_TABLE,
-+            'module8_update_column',
-+            [
-+                'type' => Table::TYPE_INTEGER,
-+                'nullable' => false,
-+                'comment' => 'Module_8 Update Column',
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Add indexes.
-+     *
-+     * @param Table $table
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function addIndexes(Table $table): void
-+    {
-+        $table
-+            ->addIndex(
-+                'MODULE8_UPDATE_IS_GUEST_INDEX',
-+                [
-+                    'module8_is_guest'
-+                ]
-+            )->addIndex(
-+                'MODULE8_UPDATE_UNIQUE_INDEX_TEMP',
-+                [
-+                    'module8_entity_id',
-+                    'module8_is_guest',
-+
-+                ],
-+                ['type' => AdapterInterface::INDEX_TYPE_UNIQUE]
-+            )->addIndex(
-+                'MODULE8_UPDATE_TEMP_INDEX',
-+                [
-+                    'module8_column_for_remove',
-+                    'module8_guest_browser_id'
-+                ]
-+            );
-+    }
-+
-+    /**
-+     * Add constraints.
-+     *
-+     * @param Table $table
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function addConstraints(Table $table): void
-+    {
-+        $table
-+            ->addForeignKey(
-+                'MODULE8_UPDATE_FK_MODULE8_IS_GUEST',
-+                'module8_is_guest',
-+                InstallSchema::MAIN_TABLE,
-+                'module8_is_guest',
-+                Table::ACTION_CASCADE
-+            )->addForeignKey(
-+                'MODULE8_UPDATE_FK_TEMP',
-+                'module8_column_for_remove',
-+                InstallSchema::MAIN_TABLE,
-+                'module8_is_guest',
-+                Table::ACTION_CASCADE
-+            );
-+    }
-+
-+    /**
-+     * Create a simple table.
-+     *
-+     * @param SchemaSetupInterface $setup
-+     * @param $tableName
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function createSimpleTable(SchemaSetupInterface $setup, $tableName): void
-+    {
-+        $table = $setup->getConnection()->newTable($tableName);
-+        $table
-+            ->addColumn(
-+                'module8_entity_id',
-+                Table::TYPE_INTEGER,
-+                null,
-+                [
-+                    'primary' => true,
-+                    'identity' => true,
-+                    'nullable' => false,
-+                    'unsigned' => true,
-+                ],
-+                'Entity ID'
-+            )->addColumn(
-+                'module8_counter',
-+                Table::TYPE_INTEGER,
-+                null,
-+                [
-+                    'unsigned' => true,
-+                    'nullable' => true,
-+                    'default' => 100
-+                ],
-+                'Counter'
-+            );
-+        $setup->getConnection()->createTable($table);
-+    }
-+}
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/setup_install_with_converting/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/setup_install_with_converting/module.xml
-new file mode 100644
-index 00000000000..b6a57fcb476
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/setup_install_with_converting/module.xml
-@@ -0,0 +1,11 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_TestSetupDeclarationModule8" setup_version="1.0.2"/>
-+</config>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/unpatterned_fk_name/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/unpatterned_fk_name/db_schema.xml
-new file mode 100644
-index 00000000000..eebeb154adf
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/unpatterned_fk_name/db_schema.xml
-@@ -0,0 +1,32 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="test_table" resource="default" comment="Test Table">
-+        <column xsi:type="int" name="page_id" nullable="false" unsigned="false" identity="true"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="page_id"/>
-+        </constraint>
-+    </table>
-+    <table name="test_scope_table" resource="default" comment="Test Scope Table">
-+        <column xsi:type="int" name="scope_id" nullable="false" unsigned="false" identity="true"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="scope_id"/>
-+        </constraint>
-+    </table>
-+    <table name="dependent" resource="default" comment="Lol">
-+        <column xsi:type="int" name="page_id_on" nullable="false" unsigned="false"/>
-+        <column xsi:type="int" name="scope_id_on" nullable="false" unsigned="false"/>
-+        <!-- Expected name in DB: DEPENDENT_PAGE_ID_ON_TEST_TABLE_PAGE_ID -->
-+        <constraint xsi:type="foreign" referenceId="DEPENDENT_PAGE_ID_ON_TEST_TABLE_PAGE_ID" table="dependent" column="page_id_on" referenceColumn="page_id"
-+                    referenceTable="test_table"/>
-+        <!-- Expected name in DB: DEPENDENT_SCOPE_ID_ON_TEST_SCOPE_TABLE_SCOPE_ID -->
-+        <constraint xsi:type="foreign" referenceId="ScopeIDOnTOScopeTableAndScopeId" table="dependent" column="scope_id_on" referenceColumn="scope_id"
-+                    referenceTable="test_scope_table"/>
-+    </table>
-+</schema>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/whitelist_upgrade/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/whitelist_upgrade/db_schema.xml
-new file mode 100644
-index 00000000000..05ce3318ef7
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/whitelist_upgrade/db_schema.xml
-@@ -0,0 +1,28 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="reference_test" resource="default">
-+        <column xsi:type="smallint" identity="true" name="entity_id" padding="3" nullable="true"/>
-+        <column xsi:type="smallint" identity="true" name="product_id" padding="3" nullable="true"/>
-+        <index referenceId="ENTITY_ID_INDEX" indexType="btree">
-+            <column name="entity_id"/>
-+        </index>
-+        <constraint xsi:type="unique" referenceId="UNIQUE_PAIR">
-+            <column name="entity_id"/>
-+            <column name="product_id"/>
-+        </constraint>
-+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE"
-+                    column="entity_id" table="reference_test"
-+                    referenceTable="test_table" referenceColumn="smallint" onDelete="NO ACTION"/>
-+    </table>
-+    <table name="auto_increment_test" resource="default">
-+        <column xsi:type="int" name="int_counter" padding="12" unsigned="true"
-+                nullable="true"/>
-+    </table>
-+</schema>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/etc/module.xml
-new file mode 100644
-index 00000000000..e472f951b08
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/etc/module.xml
-@@ -0,0 +1,11 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_TestSetupDeclarationModule9" setup_version="1.0.0" />
-+</config>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/fixture/declarative_installer/disabling_tables.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/fixture/declarative_installer/disabling_tables.php
-new file mode 100644
-index 00000000000..633185390ae
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/fixture/declarative_installer/disabling_tables.php
-@@ -0,0 +1,14 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+return [
-+    'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
-+  `int_auto_increment_with_nullable` int(12) unsigned NOT NULL AUTO_INCREMENT,
-+  `int_disabled_auto_increment` smallint(12) unsigned DEFAULT \'0\',
-+  UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
-+) ENGINE=InnoDB DEFAULT CHARSET=utf8'
-+];
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/registration.php
-new file mode 100644
-index 00000000000..f021af556bb
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/registration.php
-@@ -0,0 +1,13 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+$registrar = new ComponentRegistrar();
-+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule9') === null) {
-+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule9', __DIR__);
-+}
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/revisions/disabling_tables/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/revisions/disabling_tables/db_schema.xml
-new file mode 100644
-index 00000000000..c22c41b7a5c
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/revisions/disabling_tables/db_schema.xml
-@@ -0,0 +1,11 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="reference_table" disabled="true"/>
-+</schema>
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/revisions/setup_install_with_converting/InstallSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/revisions/setup_install_with_converting/InstallSchema.php
-new file mode 100644
-index 00000000000..d78a8e25230
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/revisions/setup_install_with_converting/InstallSchema.php
-@@ -0,0 +1,134 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestSetupDeclarationModule9\Setup;
-+
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+use Magento\Framework\DB\Ddl\Table;
-+use Magento\Framework\Setup\InstallSchemaInterface;
-+use Magento\Framework\Setup\ModuleContextInterface;
-+use Magento\Framework\Setup\SchemaSetupInterface;
-+
-+/**
-+ * Install schema script for the TestSetupDeclarationModule9 module.
-+ */
-+class InstallSchema implements InstallSchemaInterface
-+{
-+    /**
-+     * The name of the main table of Module9.
-+     */
-+    const MAIN_TABLE = 'module9_test_main_table';
-+
-+    /**
-+     * @inheritdoc
-+     * @throws \Zend_Db_Exception
-+     */
-+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-+    {
-+        $setup->startSetup();
-+
-+        $this->createTables($setup);
-+
-+        $setup->endSetup();
-+    }
-+
-+    /**
-+     * Create tables.
-+     *
-+     * @param SchemaSetupInterface $installer
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function createTables(SchemaSetupInterface $installer)
-+    {
-+        $mainTableName = $installer->getTable(self::MAIN_TABLE);
-+        $this->dropTableIfExists($installer, $mainTableName);
-+        $mainTable = $installer->getConnection()->newTable($mainTableName);
-+        $mainTable->setComment('Main Test Table for Module9');
-+        $this->addColumnsToMainTable($mainTable);
-+        $this->addIndexesToMainTable($mainTable);
-+        $installer->getConnection()->createTable($mainTable);
-+    }
-+
-+    /**
-+     * Drop existing tables.
-+     *
-+     * @param SchemaSetupInterface $installer
-+     * @param string $table
-+     */
-+    private function dropTableIfExists($installer, $table)
-+    {
-+        $connection = $installer->getConnection();
-+        if ($connection->isTableExists($installer->getTable($table))) {
-+            $connection->dropTable(
-+                $installer->getTable($table)
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Add tables to main table.
-+     *
-+     * @param Table $table
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function addColumnsToMainTable($table)
-+    {
-+        $table
-+            ->addColumn(
-+                'module9_email_contact_id',
-+                Table::TYPE_INTEGER,
-+                10,
-+                [
-+                    'primary' => true,
-+                    'identity' => true,
-+                    'unsigned' => true,
-+                    'nullable' => false
-+                ],
-+                'Entity ID'
-+            )->addColumn(
-+                'module9_is_guest',
-+                Table::TYPE_SMALLINT,
-+                null,
-+                [
-+                    'unsigned' => true,
-+                    'nullable' => true
-+                ],
-+                'Is Guest'
-+            )->addColumn(
-+                'module9_guest_id',
-+                Table::TYPE_INTEGER,
-+                null,
-+                [
-+                    'unsigned' => true
-+                ],
-+                'Guest ID'
-+            )
-+            ->addColumn(
-+                'module9_created_at',
-+                Table::TYPE_DATE,
-+                null,
-+                [],
-+                'Created At'
-+            );
-+    }
-+
-+    /**
-+     * Add indexes to main table.
-+     *
-+     * @param Table $table
-+     * @throws \Zend_Db_Exception
-+     */
-+    private function addIndexesToMainTable($table)
-+    {
-+        $table
-+            ->addIndex(
-+                'MODULE9_INSTALL_UNIQUE_INDEX_1',
-+                ['module9_email_contact_id', 'module9_guest_id'],
-+                ['type' => AdapterInterface::INDEX_TYPE_UNIQUE]
-+            );
-+    }
-+}
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/revisions/setup_install_with_converting/UpgradeSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/revisions/setup_install_with_converting/UpgradeSchema.php
-new file mode 100644
-index 00000000000..0a493496999
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/revisions/setup_install_with_converting/UpgradeSchema.php
-@@ -0,0 +1,173 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\TestSetupDeclarationModule9\Setup;
-+
-+use Magento\Framework\DB\Ddl\Table;
-+use Magento\Framework\Setup\ModuleContextInterface;
-+use Magento\Framework\Setup\SchemaSetupInterface;
-+use Magento\Framework\Setup\UpgradeSchemaInterface;
-+use Magento\TestSetupDeclarationModule8\Setup\InstallSchema as Module8InstallSchema;
-+use Magento\TestSetupDeclarationModule8\Setup\UpgradeSchema as Module8UpgradeSchema;
-+
-+/**
-+ * Upgrade schema script for the TestSetupDeclarationModule9 module.
-+ */
-+class UpgradeSchema implements UpgradeSchemaInterface
-+{
-+    /**
-+     * The name of the main table of Module9.
-+     */
-+    const REPLICA_TABLE = 'module9_test_update_replica_table';
-+
-+    /**
-+     * @inheritdoc
-+     * @throws \Zend_Db_Exception
-+     */
-+    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-+    {
-+        $setup->startSetup();
-+
-+        if (version_compare($context->getVersion(), '2.0.0', '<')) {
-+            $this->addColumns($setup);
-+            $this->addIndexes($setup);
-+            $this->addConstraints($setup);
-+            $this->removeColumns($setup);
-+            $this->removeIndexes($setup);
-+            $this->removeConstraints($setup);
-+            $this->removeTables($setup);
-+            $replicaTable = $setup->getConnection()
-+                ->createTableByDdl(Module8InstallSchema::SECOND_TABLE, self::REPLICA_TABLE);
-+            $setup->getConnection()->createTable($replicaTable);
-+        }
-+
-+        $setup->endSetup();
-+    }
-+
-+    /**
-+     * Create columns for tables.
-+     *
-+     * @param SchemaSetupInterface $setup
-+     */
-+    private function addColumns(SchemaSetupInterface $setup): void
-+    {
-+        $setup->getConnection()->addColumn(
-+            InstallSchema::MAIN_TABLE,
-+            'module9_update_column',
-+            [
-+                'type' => Table::TYPE_INTEGER,
-+                'nullable' => false,
-+                'comment' => 'Module_9 Update Column',
-+            ]
-+        );
-+
-+        $setup->getConnection()->addColumn(
-+            Module8InstallSchema::MAIN_TABLE,
-+            'module9_update_column',
-+            [
-+                'type' => Table::TYPE_INTEGER,
-+                'nullable' => false,
-+                'comment' => 'Module_9 Update Column',
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * Add indexes.
-+     *
-+     * @param SchemaSetupInterface $setup
-+     */
-+    private function addIndexes(SchemaSetupInterface $setup): void
-+    {
-+        $setup->getConnection()
-+            ->addIndex(
-+                Module8UpgradeSchema::UPDATE_TABLE,
-+                'MODULE9_UPDATE_MODULE8_GUEST_BROWSER_ID',
-+                [
-+                    'module8_guest_browser_id'
-+                ]
-+            );
-+    }
-+
-+    /**
-+     * Add constraints.
-+     *
-+     * @param SchemaSetupInterface $setup
-+     */
-+    private function addConstraints(SchemaSetupInterface $setup): void
-+    {
-+        $setup->getConnection()
-+            ->addForeignKey(
-+                'MODULE9_UPDATE_FK_MODULE9_IS_GUEST',
-+                InstallSchema::MAIN_TABLE,
-+                'module9_is_guest',
-+                Module8InstallSchema::MAIN_TABLE,
-+                'module8_is_guest',
-+                Table::ACTION_CASCADE
-+            );
-+    }
-+
-+    /**
-+     * Remove columns.
-+     *
-+     * @param SchemaSetupInterface $setup
-+     */
-+    private function removeColumns(SchemaSetupInterface $setup): void
-+    {
-+        $setup->getConnection()
-+            ->dropColumn(
-+                Module8UpgradeSchema::UPDATE_TABLE,
-+                'module8_column_for_remove'
-+            );
-+    }
-+
-+    /**
-+     * Remove indexes.
-+     *
-+     * @param SchemaSetupInterface $setup
-+     */
-+    private function removeIndexes(SchemaSetupInterface $setup): void
-+    {
-+        $connection = $setup->getConnection();
-+        $connection
-+            ->dropIndex(
-+                Module8InstallSchema::SECOND_TABLE,
-+                'MODULE8_INSTALL_SECOND_TABLE_INDEX_3_TEMP'
-+            );
-+    }
-+
-+    /**
-+     * Remove constraints.
-+     *
-+     * @param SchemaSetupInterface $setup
-+     */
-+    private function removeConstraints(SchemaSetupInterface $setup): void
-+    {
-+        $setup->getConnection()
-+            ->dropForeignKey(
-+                Module8InstallSchema::SECOND_TABLE,
-+                'MODULE8_INSTALL_FK_ADDRESS_TEST_MAIN_TABLE_CONTACT_ID'
-+            )->dropIndex(
-+                Module8UpgradeSchema::UPDATE_TABLE,
-+                'MODULE8_UPDATE_UNIQUE_INDEX_TEMP'
-+            );
-+    }
-+
-+    /**
-+     * Remove tables.
-+     *
-+     * @param SchemaSetupInterface $setup
-+     */
-+    private function removeTables(SchemaSetupInterface $setup): void
-+    {
-+        $setup->getConnection()
-+            ->dropTable(
-+                Module8UpgradeSchema::TEMP_TABLE
-+            );
-+    }
-+}
-diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/revisions/setup_install_with_converting/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/revisions/setup_install_with_converting/module.xml
-new file mode 100644
-index 00000000000..a553b82d781
---- /dev/null
-+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/revisions/setup_install_with_converting/module.xml
-@@ -0,0 +1,15 @@
-+<?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:Module/etc/module.xsd">
-+    <module name="Magento_TestSetupDeclarationModule9" setup_version="2.0.0">
-+        <sequence>
-+            <module name="Magento_TestSetupDeclarationModule8"/>
-+        </sequence>
-+    </module>
-+</config>
-diff --git a/dev/tests/setup-integration/etc/install-config-mysql.php.dist b/dev/tests/setup-integration/etc/install-config-mysql.php.dist
-index c5757b00110..d355100c446 100644
---- a/dev/tests/setup-integration/etc/install-config-mysql.php.dist
-+++ b/dev/tests/setup-integration/etc/install-config-mysql.php.dist
-@@ -17,8 +17,8 @@ return [
-         'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
-         'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
-         'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
--        'enable_modules' => 'Magento_TestSetupModule2,Magento_TestSetupModule1,Magento_Backend',
--        'disable_modules' => 'all'
-+        'enable-modules' => 'Magento_TestSetupModule2,Magento_TestSetupModule1,Magento_Backend',
-+        'disable-modules' => 'all'
-     ],
-     'checkout' => [
-         'host' => '{{db-host}}',
-diff --git a/dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist b/dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist
-index b52ca37987c..1a93397caaa 100644
---- a/dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist
-+++ b/dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist
-@@ -21,4 +21,32 @@
-     <php>
-         <ini name="date.timezone" value="America/Los_Angeles"/>
-     </php>
-+    <listeners>
-+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
-+            <arguments>
-+                <string>var/allure-results</string> <!-- XML files output directory -->
-+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
-+                <array> <!-- A list of custom annotations to ignore (optional) -->
-+                    <element key="magentoAdminConfigFixture">
-+                        <string>magentoAdminConfigFixture</string>
-+                    </element>
-+                    <element key="magentoAppIsolation">
-+                        <string>magentoAppIsolation</string>
-+                    </element>
-+                    <element key="magentoComponentsDir">
-+                        <string>magentoComponentsDir</string>
-+                    </element>
-+                    <element key="magentoConfigFixture">
-+                        <string>magentoConfigFixture</string>
-+                    </element>
-+                    <element key="@magentoDbIsolation">
-+                        <string>magentoDataFixture</string>
-+                    </element>
-+                    <element key="magentoDbIsolation">
-+                        <string>magentoDbIsolation</string>
-+                    </element>
-+                </array>
-+            </arguments>
-+        </listener>
-+    </listeners>
- </phpunit>
-diff --git a/dev/tests/setup-integration/phpunit.xml.dist b/dev/tests/setup-integration/phpunit.xml.dist
-index 7dd8609bdca..620ebbb5b8f 100644
---- a/dev/tests/setup-integration/phpunit.xml.dist
-+++ b/dev/tests/setup-integration/phpunit.xml.dist
-@@ -43,5 +43,61 @@
-     <listeners>
-         <listener class="Magento\TestFramework\Event\PhpUnit"/>
-         <listener class="Magento\TestFramework\ErrorLog\Listener"/>
-+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
-+            <arguments>
-+                <string>var/allure-results</string> <!-- XML files output directory -->
-+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
-+                <array> <!-- A list of custom annotations to ignore (optional) -->
-+                    <element key="codingStandardsIgnoreStart">
-+                        <string>codingStandardsIgnoreStart</string>
-+                    </element>
-+                    <element key="codingStandardsIgnoreEnd">
-+                        <string>codingStandardsIgnoreEnd</string>
-+                    </element>
-+                    <element key="expectedExceptionMessageRegExp">
-+                        <string>expectedExceptionMessageRegExp</string>
-+                    </element>
-+                    <element key="magentoAdminConfigFixture">
-+                        <string>magentoAdminConfigFixture</string>
-+                    </element>
-+                    <element key="magentoAppArea">
-+                        <string>magentoAppArea</string>
-+                    </element>
-+                    <element key="magentoAppIsolation">
-+                        <string>magentoAppIsolation</string>
-+                    </element>
-+                    <element key="magentoCache">
-+                        <string>magentoCache</string>
-+                    </element>
-+                    <element key="magentoComponentsDir">
-+                        <string>magentoComponentsDir</string>
-+                    </element>
-+                    <element key="magentoConfigFixture">
-+                        <string>magentoConfigFixture</string>
-+                    </element>
-+                    <element key="magentoDataFixture">
-+                        <string>magentoDataFixture</string>
-+                    </element>
-+                    <element key="magentoDataFixtureBeforeTransaction">
-+                        <string>magentoDataFixtureBeforeTransaction</string>
-+                    </element>
-+                    <element key="magentoDbIsolation">
-+                        <string>magentoDbIsolation</string>
-+                    </element>
-+                    <element key="magentoIndexerDimensionMode">
-+                        <string>magentoIndexerDimensionMode</string>
-+                    </element>
-+                    <element key="moduleName">
-+                        <string>moduleName</string>
-+                    </element>
-+                    <element key="dataProviderFromFile">
-+                        <string>dataProviderFromFile</string>
-+                    </element>
-+                    <element key="magentoSchemaFixture">
-+                        <string>magentoSchemaFixture</string>
-+                    </element>
-+                </array>
-+            </arguments>
-+        </listener>
-     </listeners>
- </phpunit>
-diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/Console/Command/SetupInstallTest.php b/dev/tests/setup-integration/testsuite/Magento/Developer/Console/Command/SetupInstallTest.php
-new file mode 100644
-index 00000000000..cf137233ead
---- /dev/null
-+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/Console/Command/SetupInstallTest.php
-@@ -0,0 +1,126 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Developer\Console\Command;
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+use Magento\TestFramework\Deploy\CliCommand;
-+use Magento\TestFramework\Deploy\TestModuleManager;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\SetupTestCase;
-+
-+/**
-+ * Test for Install command.
-+ */
-+class SetupInstallTest extends SetupTestCase
-+{
-+    /**
-+     * @var TestModuleManager
-+     */
-+    private $moduleManager;
-+
-+    /**
-+     * @var CliCommand
-+     */
-+    private $cliCommand;
-+
-+    /**
-+     * @var ComponentRegistrar
-+     */
-+    private $componentRegistrar;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->cliCommand = $objectManager->get(CliCommand::class);
-+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
-+        $this->componentRegistrar = $objectManager->create(
-+            ComponentRegistrar::class
-+        );
-+    }
-+
-+    /**
-+     * @moduleName Magento_TestSetupDeclarationModule8
-+     * @moduleName Magento_TestSetupDeclarationModule9
-+     * @throws \Exception
-+     */
-+    public function testInstallWithConverting()
-+    {
-+        $modules = [
-+            'Magento_TestSetupDeclarationModule8',
-+            'Magento_TestSetupDeclarationModule9',
-+        ];
-+
-+        foreach ($modules as $moduleName) {
-+            $this->moduleManager->updateRevision(
-+                $moduleName,
-+                'setup_install_with_converting',
-+                'InstallSchema.php',
-+                'Setup'
-+            );
-+            $this->moduleManager->updateRevision(
-+                $moduleName,
-+                'setup_install_with_converting',
-+                'UpgradeSchema.php',
-+                'Setup'
-+            );
-+
-+            $this->moduleManager->updateRevision(
-+                $moduleName,
-+                'setup_install_with_converting',
-+                'module.xml',
-+                'etc'
-+            );
-+        }
-+
-+        $this->cliCommand->install($modules, ['convert-old-scripts' => true]);
-+
-+        foreach ($modules as $moduleName) {
-+            $modulePath = $this->componentRegistrar->getPath('module', $moduleName);
-+            $schemaFileName = $modulePath
-+                . DIRECTORY_SEPARATOR
-+                . \Magento\Framework\Module\Dir::MODULE_ETC_DIR
-+                . DIRECTORY_SEPARATOR
-+                . 'db_schema.xml';
-+            $generatedSchema = $this->getSchemaDocument($schemaFileName);
-+
-+            $expectedSchemaFileName = dirname(__DIR__, 2)
-+                . DIRECTORY_SEPARATOR
-+                . implode(
-+                    DIRECTORY_SEPARATOR,
-+                    [
-+                        '_files',
-+                        'SetupInstall',
-+                        str_replace('Magento_', '', $moduleName),
-+                        'db_schema.xml'
-+                    ]
-+                );
-+            $expectedSchema = $this->getSchemaDocument($expectedSchemaFileName);
-+
-+            $this->assertEquals($expectedSchema->saveXML(), $generatedSchema->saveXML());
-+        }
-+    }
-+
-+    /**
-+     * Convert file content in the DOM document.
-+     *
-+     * @param $schemaFileName
-+     * @return \DOMDocument
-+     */
-+    private function getSchemaDocument($schemaFileName): \DOMDocument
-+    {
-+        $schemaDocument = new \DOMDocument();
-+        $schemaDocument->preserveWhiteSpace = false;
-+        $schemaDocument->formatOutput = true;
-+        $schemaDocument->loadXML(file_get_contents($schemaFileName));
-+
-+        return $schemaDocument;
-+    }
-+}
-diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/Console/Command/SetupUpgradeTest.php b/dev/tests/setup-integration/testsuite/Magento/Developer/Console/Command/SetupUpgradeTest.php
-new file mode 100644
-index 00000000000..932662b58f3
---- /dev/null
-+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/Console/Command/SetupUpgradeTest.php
-@@ -0,0 +1,173 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Developer\Console\Command;
-+
-+use Magento\Framework\Component\ComponentRegistrar;
-+use Magento\TestFramework\Deploy\CliCommand;
-+use Magento\TestFramework\Deploy\TestModuleManager;
-+use Magento\TestFramework\Helper\Bootstrap;
-+use Magento\TestFramework\TestCase\SetupTestCase;
-+
-+/**
-+ * Test for Upgrade command.
-+ */
-+class SetupUpgradeTest extends SetupTestCase
-+{
-+    /**
-+     * @var TestModuleManager
-+     */
-+    private $moduleManager;
-+
-+    /**
-+     * @var CliCommand
-+     */
-+    private $cliCommand;
-+
-+    /**
-+     * @var ComponentRegistrar
-+     */
-+    private $componentRegistrar;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setUp()
-+    {
-+        $objectManager = Bootstrap::getObjectManager();
-+        $this->cliCommand = $objectManager->get(CliCommand::class);
-+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
-+        $this->componentRegistrar = $objectManager->create(
-+            ComponentRegistrar::class
-+        );
-+    }
-+
-+    /**
-+     * @moduleName Magento_TestSetupDeclarationModule8
-+     * @moduleName Magento_TestSetupDeclarationModule9
-+     * @throws \Exception
-+     */
-+    public function testUpgradeWithConverting()
-+    {
-+        $modules = [
-+            'Magento_TestSetupDeclarationModule8',
-+            'Magento_TestSetupDeclarationModule9',
-+        ];
-+
-+        foreach ($modules as $moduleName) {
-+            $this->moduleManager->updateRevision(
-+                $moduleName,
-+                'setup_install_with_converting',
-+                'InstallSchema.php',
-+                'Setup'
-+            );
-+        }
-+
-+        $this->cliCommand->install($modules, ['convert-old-scripts' => true]);
-+        foreach ($modules as $moduleName) {
-+            $this->assertInstallScriptChanges($moduleName);
-+        }
-+
-+        foreach ($modules as $moduleName) {
-+            $this->moduleManager->updateRevision(
-+                $moduleName,
-+                'setup_install_with_converting',
-+                'UpgradeSchema.php',
-+                'Setup'
-+            );
-+
-+            $this->moduleManager->updateRevision(
-+                $moduleName,
-+                'setup_install_with_converting',
-+                'module.xml',
-+                'etc'
-+            );
-+        }
-+
-+        $this->cliCommand->upgrade(['convert-old-scripts' => true]);
-+
-+        foreach ($modules as $moduleName) {
-+            $this->assertUpgradeScriptChanges($moduleName);
-+        }
-+    }
-+
-+    /**
-+     * Convert file content in the DOM document.
-+     *
-+     * @param string $schemaFileName
-+     * @return \DOMDocument
-+     */
-+    private function getSchemaDocument(string $schemaFileName): \DOMDocument
-+    {
-+        $schemaDocument = new \DOMDocument();
-+        $schemaDocument->preserveWhiteSpace = false;
-+        $schemaDocument->formatOutput = true;
-+        $schemaDocument->loadXML(file_get_contents($schemaFileName));
-+
-+        return $schemaDocument;
-+    }
-+
-+    /**
-+     * @param string $moduleName
-+     */
-+    private function assertInstallScriptChanges(string $moduleName): void
-+    {
-+        $generatedSchema = $this->getGeneratedSchema($moduleName);
-+        $expectedSchema = $this->getSchemaDocument($this->getSchemaFixturePath($moduleName, 'install'));
-+
-+        $this->assertEquals($expectedSchema->saveXML(), $generatedSchema->saveXML());
-+    }
-+
-+    /**
-+     * @param string $moduleName
-+     */
-+    private function assertUpgradeScriptChanges(string $moduleName): void
-+    {
-+        $generatedSchema = $this->getGeneratedSchema($moduleName);
-+        $expectedSchema = $this->getSchemaDocument($this->getSchemaFixturePath($moduleName, 'upgrade'));
-+
-+        $this->assertEquals($expectedSchema->saveXML(), $generatedSchema->saveXML());
-+    }
-+
-+    /**
-+     * @param string $moduleName
-+     * @return \DOMDocument
-+     */
-+    private function getGeneratedSchema(string $moduleName): \DOMDocument
-+    {
-+        $modulePath = $this->componentRegistrar->getPath('module', $moduleName);
-+        $schemaFileName = $modulePath
-+            . DIRECTORY_SEPARATOR
-+            . \Magento\Framework\Module\Dir::MODULE_ETC_DIR
-+            . DIRECTORY_SEPARATOR
-+            . 'db_schema.xml';
-+
-+        return $this->getSchemaDocument($schemaFileName);
-+    }
-+
-+    /**
-+     * @param string $moduleName
-+     * @param string $suffix
-+     * @return string
-+     */
-+    private function getSchemaFixturePath(string $moduleName, string $suffix): string
-+    {
-+        $schemaFixturePath = dirname(__DIR__, 2)
-+            . DIRECTORY_SEPARATOR
-+            . implode(
-+                DIRECTORY_SEPARATOR,
-+                [
-+                    '_files',
-+                    'SetupUpgrade',
-+                    str_replace('Magento_', '', $moduleName),
-+                    'db_schema_' . $suffix . '.xml'
-+                ]
-+            );
-+
-+        return $schemaFixturePath;
-+    }
-+}
-diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/Console/Command/TablesWhitelistGenerateCommandTest.php b/dev/tests/setup-integration/testsuite/Magento/Developer/Console/Command/TablesWhitelistGenerateCommandTest.php
-index 77f2d741fc6..434c99cb987 100644
---- a/dev/tests/setup-integration/testsuite/Magento/Developer/Console/Command/TablesWhitelistGenerateCommandTest.php
-+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/Console/Command/TablesWhitelistGenerateCommandTest.php
-@@ -11,6 +11,7 @@ use Symfony\Component\Console\Tester\CommandTester;
- use Magento\TestFramework\TestCase\SetupTestCase;
- use Magento\Framework\Console\Cli;
- use Magento\TestFramework\Deploy\CliCommand;
-+use Magento\TestFramework\Deploy\TestModuleManager;
- 
- /**
-  * The purpose of this test is to verify the declaration:generate:whitelist command.
-@@ -42,6 +43,11 @@ class TablesWhitelistGenerateCommandTest extends SetupTestCase
-      */
-     private $cliCommand;
- 
-+    /**
-+     * @var TestModuleManager
-+     */
-+    private $moduleManager;
-+
-     /**
-      * {@inheritdoc}
-      */
-@@ -56,20 +62,43 @@ class TablesWhitelistGenerateCommandTest extends SetupTestCase
-         );
-         $this->cliCommand = $this->objectManager->get(CliCommand::class);
-         $this->tester = new CommandTester($this->command);
-+        $this->moduleManager = $this->objectManager->get(TestModuleManager::class);
-     }
- 
-     /**
--     * Execute generate command for whitelist on module Magento_TestSetupDeclarationModule1.
--     *
--     * @param array $expectedWhitelistContent
-+     * Execute generate command for whitelist.
-      *
-      * @moduleName Magento_TestSetupDeclarationModule1
--     * @dataProvider contentsDataProvider
-+     * @moduleName Magento_TestSetupDeclarationModule8
-+     * @throws \Exception
-+     */
-+    public function testExecute()
-+    {
-+        $modules = [
-+            'Magento_TestSetupDeclarationModule1',
-+            'Magento_TestSetupDeclarationModule8',
-+        ];
-+
-+        $this->cliCommand->install($modules);
-+        foreach ($modules as $moduleName) {
-+            $this->moduleManager->updateRevision(
-+                $moduleName,
-+                'whitelist_upgrade',
-+                'db_schema.xml',
-+                'etc'
-+            );
-+        }
-+
-+        foreach ($modules as $moduleName) {
-+            $this->checkWhitelistFile($moduleName);
-+        }
-+    }
-+
-+    /**
-+     * @param string $moduleName
-      */
--    public function testExecute(array $expectedWhitelistContent)
-+    private function checkWhitelistFile(string $moduleName)
-     {
--        $moduleName = 'Magento_TestSetupDeclarationModule1';
--        $this->cliCommand->install([$moduleName]);
-         $modulePath = $this->componentRegistrar->getPath('module', $moduleName);
-         $whiteListFileName = $modulePath
-             . DIRECTORY_SEPARATOR
-@@ -79,124 +108,25 @@ class TablesWhitelistGenerateCommandTest extends SetupTestCase
- 
-         //run bin/magento declaration:generate:whitelist Magento_TestSetupDeclarationModule1 command.
-         $this->tester->execute(['--module-name' => $moduleName], ['interactive' => false]);
--
-         $this->assertSame(Cli::RETURN_SUCCESS, $this->tester->getStatusCode());
- 
-         $this->assertFileExists($whiteListFileName);
-         $this->assertContains('', $this->tester->getDisplay());
- 
--        $whitelistContent = json_decode(file_get_contents($whiteListFileName), true);
--        $this->assertEquals($expectedWhitelistContent, $whitelistContent);
--    }
--
--    /**
--     * Data provider for whitelist contents.
--     *
--     * @return array
--     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
--     */
--    public function contentsDataProvider(): array
--    {
--        return [
--            [
--                'content' => [
--                    'reference_table' =>
--                        [
--                            'column' =>
--                                [
--                                    'tinyint_ref' => true,
--                                    'tinyint_without_padding' => true,
--                                    'bigint_without_padding' => true,
--                                    'integer_without_padding' => true,
--                                    'smallint_with_big_padding' => true,
--                                    'smallint_without_default' => true,
--                                    'int_without_unsigned' => true,
--                                    'int_unsigned' => true,
--                                    'bigint_default_nullable' => true,
--                                    'bigint_not_default_not_nullable' => true,
--                                    'smallint_without_padding' => true,
--                                ],
--                            'constraint' =>
--                                [
--                                    'tinyint_primary' => true,
--                                ],
--                        ],
--                    'auto_increment_test' =>
--                        [
--                            'column' =>
--                                [
--                                    'int_auto_increment_with_nullable' => true,
--                                    'int_disabled_auto_increment' => true,
--                                ],
--                            'constraint' =>
--                                [
--                                    'AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE' => true,
--                                ],
--                        ],
--                    'test_table' =>
--                        [
--                            'column' =>
--                                [
--                                    'smallint' => true,
--                                    'tinyint' => true,
--                                    'bigint' => true,
--                                    'float' => true,
--                                    'double' => true,
--                                    'decimal' => true,
--                                    'date' => true,
--                                    'timestamp' => true,
--                                    'datetime' => true,
--                                    'longtext' => true,
--                                    'mediumtext' => true,
--                                    'varchar' => true,
--                                    'mediumblob' => true,
--                                    'blob' => true,
--                                    'boolean' => true,
--                                    'varbinary_rename' => true,
--                                ],
--                            'index' =>
--                                [
--                                    'TEST_TABLE_TINYINT_BIGINT' => true,
--                                ],
--                            'constraint' =>
--                                [
--                                    'TEST_TABLE_SMALLINT_BIGINT' => true,
--                                    'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF' => true,
--                                ],
--                        ],
--                    'store' =>
--                        [
--                            'column' =>
--                                [
--                                    'store_owner_id' => true,
--                                    'store_owner' => true,
--                                ],
--                            'constraint' =>
--                                [
--                                    'STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID' => true,
--                                ],
--                        ],
--                    'store_owner' =>
--                        [
--                            'column' =>
--                                [
--                                    'owner_id' => true,
--                                    'label' => true,
--                                ],
--                            'constraint' =>
--                                [
--                                    '' => true,
--                                ],
--                        ],
--                    'some_table' =>
--                        [
--                            'column' =>
--                                [
--                                    'some_column' => true,
--                                ],
--                        ],
--                ],
--            ],
--        ];
-+        $whitelistFileContent = file_get_contents($whiteListFileName);
-+        $expectedWhitelistContent = file_get_contents(
-+            dirname(__DIR__, 2)
-+            . DIRECTORY_SEPARATOR
-+            . implode(
-+                DIRECTORY_SEPARATOR,
-+                [
-+                    '_files',
-+                    'WhitelistGenerate',
-+                    str_replace('Magento_', '', $moduleName),
-+                    'db_schema_whitelist.json'
-+                ]
-+            )
-+        );
-+        $this->assertEquals($expectedWhitelistContent, $whitelistFileContent);
-     }
- }
-diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupInstall/TestSetupDeclarationModule8/db_schema.xml b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupInstall/TestSetupDeclarationModule8/db_schema.xml
-new file mode 100644
-index 00000000000..cdc71980bf5
---- /dev/null
-+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupInstall/TestSetupDeclarationModule8/db_schema.xml
-@@ -0,0 +1,114 @@
-+<?xml version="1.0"?>
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="module8_test_main_table" resource="default" engine="innodb" comment="Main Test Table for Module8">
-+        <column xsi:type="int" name="module8_email_contact_id" padding="10" unsigned="true" nullable="false"
-+                identity="true" comment="Email Contact ID"/>
-+        <column xsi:type="int" name="module8_contact_group_id" padding="10" unsigned="true" nullable="false"
-+                identity="false" comment="Contact Group ID"/>
-+        <column xsi:type="smallint" name="module8_is_guest" padding="5" unsigned="true" nullable="true"
-+                identity="false" comment="Is Guest"/>
-+        <column xsi:type="varchar" name="module8_contact_id" nullable="true" length="15" comment="Contact ID"/>
-+        <column xsi:type="varchar" name="module8_content" nullable="false" length="15" comment="Content"/>
-+        <column xsi:type="int" name="module8_update_column" padding="11" unsigned="false" nullable="false"
-+                identity="false" comment="Module_8 Update Column"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_email_contact_id"/>
-+        </constraint>
-+        <constraint xsi:type="unique" referenceId="MODULE8_INSTALL_UNIQUE_INDEX_2">
-+            <column name="module8_email_contact_id"/>
-+            <column name="module8_is_guest"/>
-+        </constraint>
-+        <constraint xsi:type="unique" referenceId="MODULE8_INSTALL_UNIQUE_INDEX_TEMP" disabled="true">
-+            <column name="module8_contact_group_id"/>
-+        </constraint>
-+        <index referenceId="MODULE8_INSTALL_INDEX_1" indexType="btree">
-+            <column name="module8_email_contact_id"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_INDEX_3" indexType="btree">
-+            <column name="module8_is_guest"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_INDEX_4" indexType="btree">
-+            <column name="module8_contact_id"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_INDEX_TEMP" indexType="btree" disabled="true">
-+            <column name="module8_content"/>
-+        </index>
-+    </table>
-+    <table name="module8_test_second_table" resource="default" engine="innodb" comment="Second Test Table for Module8">
-+        <column xsi:type="int" name="module8_entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-+                comment="Entity ID"/>
-+        <column xsi:type="int" name="module8_contact_id" padding="11" unsigned="false" nullable="true"
-+                identity="false" comment="Contact ID"/>
-+        <column xsi:type="varchar" name="module8_address" nullable="false" length="15" comment="Address"/>
-+        <column xsi:type="smallint" name="module8_counter_with_multiline_comment" padding="5" unsigned="true"
-+                nullable="true" identity="false" default="0"
-+                comment="Empty&#10;                Counter&#10;                Multiline&#10;                Comment"/>
-+        <column xsi:type="varchar" name="module8_second_address" nullable="true" length="15" comment="Second Address"/>
-+        <column xsi:type="varchar" name="module8_temp_column" nullable="true" length="15"
-+                comment="Temp column for remove" disabled="true"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_entity_id"/>
-+        </constraint>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_INSTALL_FK_ENTITY_ID_TEST_MAIN_TABLE_EMAIL_CONTACT_ID"
-+                    table="module8_test_second_table" column="module8_entity_id"
-+                    referenceTable="module8_test_main_table" referenceColumn="module8_email_contact_id"
-+                    onDelete="NO ACTION"/>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_INSTALL_FK_ADDRESS_TEST_MAIN_TABLE_CONTACT_ID"
-+                    table="module8_test_second_table" column="module8_address" referenceTable="module8_test_main_table"
-+                    referenceColumn="module8_contact_id" onDelete="NO ACTION"/>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_INSTALL_FK_ADDRESS_TEST_MAIN_TABLE_MODULE8_CONTENT_TEMP"
-+                    table="module8_test_second_table" column="module8_address" referenceTable="module8_test_main_table"
-+                    referenceColumn="module8_content" onDelete="NO ACTION" disabled="true"/>
-+        <index referenceId="MODULE8_INSTALL_SECOND_TABLE_INDEX_1" indexType="btree">
-+            <column name="module8_entity_id"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_SECOND_TABLE_INDEX_2" indexType="btree">
-+            <column name="module8_address"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_SECOND_TABLE_INDEX_3_TEMP" indexType="btree">
-+            <column name="module8_second_address"/>
-+        </index>
-+    </table>
-+    <table name="module8_test_update_table" resource="default" engine="innodb" comment="Update Test Table for Module8">
-+        <column xsi:type="int" name="module8_entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-+                comment="Entity ID"/>
-+        <column xsi:type="int" name="module8_entity_row_id" padding="10" unsigned="true" nullable="false"
-+                identity="false" comment="Module8_entity_row_id"/>
-+        <column xsi:type="smallint" name="module8_is_guest" padding="5" unsigned="true" nullable="true"
-+                identity="false" comment="Is Guest"/>
-+        <column xsi:type="smallint" name="module8_guest_browser_id" padding="5" unsigned="true" nullable="true"
-+                identity="false" comment="Guest Browser ID"/>
-+        <column xsi:type="smallint" name="module8_column_for_remove" padding="5" unsigned="true" nullable="true"
-+                identity="false" comment="For remove"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_entity_id"/>
-+        </constraint>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_UPDATE_FK_MODULE8_IS_GUEST"
-+                    table="module8_test_update_table" column="module8_is_guest" referenceTable="module8_test_main_table"
-+                    referenceColumn="module8_is_guest" onDelete="CASCADE"/>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_UPDATE_FK_TEMP" table="module8_test_update_table"
-+                    column="module8_column_for_remove" referenceTable="module8_test_main_table"
-+                    referenceColumn="module8_is_guest" onDelete="CASCADE"/>
-+        <constraint xsi:type="unique" referenceId="MODULE8_UPDATE_UNIQUE_INDEX_TEMP">
-+            <column name="module8_entity_id"/>
-+            <column name="module8_is_guest"/>
-+        </constraint>
-+        <index referenceId="MODULE8_UPDATE_IS_GUEST_INDEX" indexType="btree">
-+            <column name="module8_is_guest"/>
-+        </index>
-+        <index referenceId="MODULE8_UPDATE_TEMP_INDEX" indexType="btree">
-+            <column name="module8_column_for_remove"/>
-+            <column name="module8_guest_browser_id"/>
-+        </index>
-+    </table>
-+    <table name="module8_test_temp_table" resource="default" engine="innodb" comment="module8_test_temp_table">
-+        <column xsi:type="int" name="module8_entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-+                comment="Entity ID"/>
-+        <column xsi:type="int" name="module8_counter" padding="10" unsigned="true" nullable="true" identity="false"
-+                default="100" comment="Counter"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_entity_id"/>
-+        </constraint>
-+    </table>
-+</schema>
-diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupInstall/TestSetupDeclarationModule9/db_schema.xml b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupInstall/TestSetupDeclarationModule9/db_schema.xml
-new file mode 100644
-index 00000000000..3ded03c9e79
---- /dev/null
-+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupInstall/TestSetupDeclarationModule9/db_schema.xml
-@@ -0,0 +1,68 @@
-+<?xml version="1.0"?>
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="module9_test_main_table" resource="default" engine="innodb" comment="Main Test Table for Module9">
-+        <column xsi:type="int" name="module9_email_contact_id" padding="10" unsigned="true" nullable="false"
-+                identity="true" comment="Entity ID"/>
-+        <column xsi:type="smallint" name="module9_is_guest" padding="5" unsigned="true" nullable="true"
-+                identity="false" comment="Is Guest"/>
-+        <column xsi:type="int" name="module9_guest_id" padding="10" unsigned="true" nullable="true" identity="false"
-+                comment="Guest ID"/>
-+        <column xsi:type="date" name="module9_created_at" comment="Created At"/>
-+        <column xsi:type="int" name="module9_update_column" padding="11" unsigned="false" nullable="false"
-+                identity="false" comment="Module_9 Update Column"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module9_email_contact_id"/>
-+        </constraint>
-+        <constraint xsi:type="unique" referenceId="MODULE9_INSTALL_UNIQUE_INDEX_1">
-+            <column name="module9_email_contact_id"/>
-+            <column name="module9_guest_id"/>
-+        </constraint>
-+        <constraint xsi:type="foreign" referenceId="MODULE9_UPDATE_FK_MODULE9_IS_GUEST" table="module9_test_main_table"
-+                    column="module9_is_guest" referenceTable="module8_test_main_table"
-+                    referenceColumn="module8_is_guest" onDelete="CASCADE"/>
-+    </table>
-+    <table name="module8_test_main_table" resource="default">
-+        <column xsi:type="int" name="module9_update_column" padding="11" unsigned="false" nullable="false"
-+                identity="false" comment="Module_9 Update Column"/>
-+    </table>
-+    <table name="module8_test_update_table" resource="default">
-+        <column name="module8_column_for_remove" disabled="true"/>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_UPDATE_FK_TEMP" disabled="true"/>
-+        <index referenceId="MODULE9_UPDATE_MODULE8_GUEST_BROWSER_ID" indexType="btree">
-+            <column name="module8_guest_browser_id"/>
-+        </index>
-+        <index referenceId="MODULE8_UPDATE_UNIQUE_INDEX_TEMP" disabled="true"/>
-+    </table>
-+    <table name="module8_test_second_table" resource="default">
-+        <constraint xsi:type="foreign" referenceId="MODULE8_INSTALL_FK_ADDRESS_TEST_MAIN_TABLE_CONTACT_ID"
-+                    disabled="true"/>
-+        <index referenceId="MODULE8_INSTALL_SECOND_TABLE_INDEX_3_TEMP" disabled="true"/>
-+    </table>
-+    <table name="module8_test_temp_table" disabled="true" resource="default"/>
-+    <table name="module9_test_update_replica_table" resource="default" engine="innodb"
-+           comment="Module9 Test Update Replica Table">
-+        <column xsi:type="int" name="module8_entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-+                comment="Module8 Entity Id"/>
-+        <column xsi:type="int" name="module8_contact_id" padding="11" unsigned="false" nullable="true"
-+                identity="false" comment="Module8 Contact Id"/>
-+        <column xsi:type="varchar" name="module8_address" nullable="false" length="15" comment="Module8 Address"/>
-+        <column xsi:type="smallint" name="module8_counter_with_multiline_comment" padding="5" unsigned="true"
-+                nullable="true" identity="false" default="0" comment="Module8 Counter With Multiline Comment"/>
-+        <column xsi:type="varchar" name="module8_second_address" nullable="true" length="15"
-+                comment="Module8 Second Address"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_entity_id"/>
-+        </constraint>
-+        <constraint xsi:type="foreign" referenceId="FK_8914AF398964FAFB4ED2E382866ABBF4"
-+                    table="module9_test_update_replica_table" column="module8_entity_id"
-+                    referenceTable="module8_test_main_table" referenceColumn="module8_email_contact_id"
-+                    onDelete="NO ACTION"/>
-+        <index referenceId="MODULE9_TEST_UPDATE_REPLICA_TABLE_MODULE8_ENTITY_ID" indexType="btree">
-+            <column name="module8_entity_id"/>
-+        </index>
-+        <index referenceId="MODULE9_TEST_UPDATE_REPLICA_TABLE_MODULE8_ADDRESS" indexType="btree">
-+            <column name="module8_address"/>
-+        </index>
-+    </table>
-+</schema>
-diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule8/db_schema_install.xml b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule8/db_schema_install.xml
-new file mode 100644
-index 00000000000..2da9901cf96
---- /dev/null
-+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule8/db_schema_install.xml
-@@ -0,0 +1,81 @@
-+<?xml version="1.0"?>
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="module8_test_main_table" resource="default" engine="innodb" comment="Main Test Table for Module8">
-+        <column xsi:type="int" name="module8_email_contact_id" padding="10" unsigned="true" nullable="false"
-+                identity="true" comment="Email Contact ID"/>
-+        <column xsi:type="int" name="module8_contact_group_id" padding="10" unsigned="true" nullable="false"
-+                identity="false" comment="Contact Group ID"/>
-+        <column xsi:type="smallint" name="module8_is_guest" padding="5" unsigned="true" nullable="true"
-+                identity="false" comment="Is Guest"/>
-+        <column xsi:type="varchar" name="module8_contact_id" nullable="true" length="15" comment="Contact ID"/>
-+        <column xsi:type="varchar" name="module8_content" nullable="false" length="15" comment="Content"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_email_contact_id"/>
-+        </constraint>
-+        <constraint xsi:type="unique" referenceId="MODULE8_INSTALL_UNIQUE_INDEX_2">
-+            <column name="module8_email_contact_id"/>
-+            <column name="module8_is_guest"/>
-+        </constraint>
-+        <constraint xsi:type="unique" referenceId="MODULE8_INSTALL_UNIQUE_INDEX_TEMP">
-+            <column name="module8_contact_group_id"/>
-+        </constraint>
-+        <index referenceId="MODULE8_INSTALL_INDEX_1" indexType="btree">
-+            <column name="module8_email_contact_id"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_INDEX_3" indexType="btree">
-+            <column name="module8_is_guest"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_INDEX_4" indexType="btree">
-+            <column name="module8_contact_id"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_INDEX_TEMP" indexType="btree">
-+            <column name="module8_content"/>
-+        </index>
-+    </table>
-+    <table name="module8_test_second_table" resource="default" engine="innodb" comment="Second Test Table for Module8">
-+        <column xsi:type="int" name="module8_entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-+                comment="Entity ID"/>
-+        <column xsi:type="int" name="module8_contact_id" padding="11" unsigned="false" nullable="true"
-+                identity="false" comment="Contact ID"/>
-+        <column xsi:type="varchar" name="module8_address" nullable="false" length="15" comment="Address"/>
-+        <column xsi:type="smallint" name="module8_counter_with_multiline_comment" padding="5" unsigned="true"
-+                nullable="true" identity="false" default="0"
-+                comment="Empty&#10;                Counter&#10;                Multiline&#10;                Comment"/>
-+        <column xsi:type="varchar" name="module8_second_address" nullable="true" length="15" comment="Second Address"/>
-+        <column xsi:type="varchar" name="module8_temp_column" nullable="true" length="15"
-+                comment="Temp column for remove"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_entity_id"/>
-+        </constraint>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_INSTALL_FK_ENTITY_ID_TEST_MAIN_TABLE_EMAIL_CONTACT_ID"
-+                    table="module8_test_second_table" column="module8_entity_id"
-+                    referenceTable="module8_test_main_table" referenceColumn="module8_email_contact_id"
-+                    onDelete="NO ACTION"/>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_INSTALL_FK_ADDRESS_TEST_MAIN_TABLE_CONTACT_ID"
-+                    table="module8_test_second_table" column="module8_address" referenceTable="module8_test_main_table"
-+                    referenceColumn="module8_contact_id" onDelete="NO ACTION"/>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_INSTALL_FK_ADDRESS_TEST_MAIN_TABLE_MODULE8_CONTENT_TEMP"
-+                    table="module8_test_second_table" column="module8_address" referenceTable="module8_test_main_table"
-+                    referenceColumn="module8_content" onDelete="NO ACTION"/>
-+        <index referenceId="MODULE8_INSTALL_SECOND_TABLE_INDEX_1" indexType="btree">
-+            <column name="module8_entity_id"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_SECOND_TABLE_INDEX_2" indexType="btree">
-+            <column name="module8_address"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_SECOND_TABLE_INDEX_3_TEMP" indexType="btree">
-+            <column name="module8_second_address"/>
-+        </index>
-+    </table>
-+    <table name="module8_test_install_temp_table" resource="default" engine="innodb"
-+           comment="module8_test_install_temp_table">
-+        <column xsi:type="int" name="module8_entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-+                comment="Entity ID"/>
-+        <column xsi:type="int" name="module8_counter" padding="10" unsigned="true" nullable="true" identity="false"
-+                default="100" comment="Counter"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_entity_id"/>
-+        </constraint>
-+    </table>
-+</schema>
-diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule8/db_schema_upgrade.xml b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule8/db_schema_upgrade.xml
-new file mode 100644
-index 00000000000..6deed3105f2
---- /dev/null
-+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule8/db_schema_upgrade.xml
-@@ -0,0 +1,124 @@
-+<?xml version="1.0"?>
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="module8_test_main_table" resource="default" engine="innodb" comment="Main Test Table for Module8">
-+        <column xsi:type="int" name="module8_email_contact_id" padding="10" unsigned="true" nullable="false"
-+                identity="true" comment="Email Contact ID"/>
-+        <column xsi:type="int" name="module8_contact_group_id" padding="10" unsigned="true" nullable="false"
-+                identity="false" comment="Contact Group ID"/>
-+        <column xsi:type="smallint" name="module8_is_guest" padding="5" unsigned="true" nullable="true"
-+                identity="false" comment="Is Guest"/>
-+        <column xsi:type="varchar" name="module8_contact_id" nullable="true" length="15" comment="Contact ID"/>
-+        <column xsi:type="varchar" name="module8_content" nullable="false" length="15" comment="Content"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_email_contact_id"/>
-+        </constraint>
-+        <constraint xsi:type="unique" referenceId="MODULE8_INSTALL_UNIQUE_INDEX_2">
-+            <column name="module8_email_contact_id"/>
-+            <column name="module8_is_guest"/>
-+        </constraint>
-+        <constraint xsi:type="unique" referenceId="MODULE8_INSTALL_UNIQUE_INDEX_TEMP" disabled="true">
-+            <column name="module8_contact_group_id"/>
-+        </constraint>
-+        <index referenceId="MODULE8_INSTALL_INDEX_1" indexType="btree">
-+            <column name="module8_email_contact_id"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_INDEX_3" indexType="btree">
-+            <column name="module8_is_guest"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_INDEX_4" indexType="btree">
-+            <column name="module8_contact_id"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_INDEX_TEMP" indexType="btree" disabled="true">
-+            <column name="module8_content"/>
-+        </index>
-+        <column xsi:type="int" name="module8_update_column" padding="11" unsigned="false" nullable="false"
-+                identity="false" comment="Module_8 Update Column"/>
-+    </table>
-+    <table name="module8_test_second_table" resource="default" engine="innodb" comment="Second Test Table for Module8">
-+        <column xsi:type="int" name="module8_entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-+                comment="Entity ID"/>
-+        <column xsi:type="int" name="module8_contact_id" padding="11" unsigned="false" nullable="true"
-+                identity="false" comment="Contact ID"/>
-+        <column xsi:type="varchar" name="module8_address" nullable="false" length="15" comment="Address"/>
-+        <column xsi:type="smallint" name="module8_counter_with_multiline_comment" padding="5" unsigned="true"
-+                nullable="true" identity="false" default="0"
-+                comment="Empty&#10;                Counter&#10;                Multiline&#10;                Comment"/>
-+        <column xsi:type="varchar" name="module8_second_address" nullable="true" length="15" comment="Second Address"/>
-+        <column xsi:type="varchar" name="module8_temp_column" nullable="true" length="15"
-+                comment="Temp column for remove" disabled="true"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_entity_id"/>
-+        </constraint>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_INSTALL_FK_ENTITY_ID_TEST_MAIN_TABLE_EMAIL_CONTACT_ID"
-+                    table="module8_test_second_table" column="module8_entity_id"
-+                    referenceTable="module8_test_main_table" referenceColumn="module8_email_contact_id"
-+                    onDelete="NO ACTION"/>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_INSTALL_FK_ADDRESS_TEST_MAIN_TABLE_CONTACT_ID"
-+                    table="module8_test_second_table" column="module8_address" referenceTable="module8_test_main_table"
-+                    referenceColumn="module8_contact_id" onDelete="NO ACTION"/>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_INSTALL_FK_ADDRESS_TEST_MAIN_TABLE_MODULE8_CONTENT_TEMP"
-+                    table="module8_test_second_table" column="module8_address" referenceTable="module8_test_main_table"
-+                    referenceColumn="module8_content" onDelete="NO ACTION" disabled="true"/>
-+        <index referenceId="MODULE8_INSTALL_SECOND_TABLE_INDEX_1" indexType="btree">
-+            <column name="module8_entity_id"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_SECOND_TABLE_INDEX_2" indexType="btree">
-+            <column name="module8_address"/>
-+        </index>
-+        <index referenceId="MODULE8_INSTALL_SECOND_TABLE_INDEX_3_TEMP" indexType="btree">
-+            <column name="module8_second_address"/>
-+        </index>
-+    </table>
-+    <table name="module8_test_install_temp_table" resource="default" engine="innodb"
-+           comment="module8_test_install_temp_table" disabled="true">
-+        <column xsi:type="int" name="module8_entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-+                comment="Entity ID"/>
-+        <column xsi:type="int" name="module8_counter" padding="10" unsigned="true" nullable="true" identity="false"
-+                default="100" comment="Counter"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_entity_id"/>
-+        </constraint>
-+    </table>
-+    <table name="module8_test_update_table" resource="default" engine="innodb" comment="Update Test Table for Module8">
-+        <column xsi:type="int" name="module8_entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-+                comment="Entity ID"/>
-+        <column xsi:type="int" name="module8_entity_row_id" padding="10" unsigned="true" nullable="false"
-+                identity="false" comment="Module8_entity_row_id"/>
-+        <column xsi:type="smallint" name="module8_is_guest" padding="5" unsigned="true" nullable="true"
-+                identity="false" comment="Is Guest"/>
-+        <column xsi:type="smallint" name="module8_guest_browser_id" padding="5" unsigned="true" nullable="true"
-+                identity="false" comment="Guest Browser ID"/>
-+        <column xsi:type="smallint" name="module8_column_for_remove" padding="5" unsigned="true" nullable="true"
-+                identity="false" comment="For remove"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_entity_id"/>
-+        </constraint>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_UPDATE_FK_MODULE8_IS_GUEST"
-+                    table="module8_test_update_table" column="module8_is_guest" referenceTable="module8_test_main_table"
-+                    referenceColumn="module8_is_guest" onDelete="CASCADE"/>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_UPDATE_FK_TEMP" table="module8_test_update_table"
-+                    column="module8_column_for_remove" referenceTable="module8_test_main_table"
-+                    referenceColumn="module8_is_guest" onDelete="CASCADE"/>
-+        <constraint xsi:type="unique" referenceId="MODULE8_UPDATE_UNIQUE_INDEX_TEMP">
-+            <column name="module8_entity_id"/>
-+            <column name="module8_is_guest"/>
-+        </constraint>
-+        <index referenceId="MODULE8_UPDATE_IS_GUEST_INDEX" indexType="btree">
-+            <column name="module8_is_guest"/>
-+        </index>
-+        <index referenceId="MODULE8_UPDATE_TEMP_INDEX" indexType="btree">
-+            <column name="module8_column_for_remove"/>
-+            <column name="module8_guest_browser_id"/>
-+        </index>
-+    </table>
-+    <table name="module8_test_temp_table" resource="default" engine="innodb" comment="module8_test_temp_table">
-+        <column xsi:type="int" name="module8_entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-+                comment="Entity ID"/>
-+        <column xsi:type="int" name="module8_counter" padding="10" unsigned="true" nullable="true" identity="false"
-+                default="100" comment="Counter"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_entity_id"/>
-+        </constraint>
-+    </table>
-+</schema>
-diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule9/db_schema_install.xml b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule9/db_schema_install.xml
-new file mode 100644
-index 00000000000..2ac2cc607f0
---- /dev/null
-+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule9/db_schema_install.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0"?>
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="module9_test_main_table" resource="default" engine="innodb" comment="Main Test Table for Module9">
-+        <column xsi:type="int" name="module9_email_contact_id" padding="10" unsigned="true" nullable="false"
-+                identity="true" comment="Entity ID"/>
-+        <column xsi:type="smallint" name="module9_is_guest" padding="5" unsigned="true" nullable="true"
-+                identity="false" comment="Is Guest"/>
-+        <column xsi:type="int" name="module9_guest_id" padding="10" unsigned="true" nullable="true" identity="false"
-+                comment="Guest ID"/>
-+        <column xsi:type="date" name="module9_created_at" comment="Created At"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module9_email_contact_id"/>
-+        </constraint>
-+        <constraint xsi:type="unique" referenceId="MODULE9_INSTALL_UNIQUE_INDEX_1">
-+            <column name="module9_email_contact_id"/>
-+            <column name="module9_guest_id"/>
-+        </constraint>
-+    </table>
-+</schema>
-diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule9/db_schema_upgrade.xml b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule9/db_schema_upgrade.xml
-new file mode 100644
-index 00000000000..b522224ca07
---- /dev/null
-+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule9/db_schema_upgrade.xml
-@@ -0,0 +1,77 @@
-+<?xml version="1.0"?>
-+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-+    <table name="module9_test_main_table" resource="default" engine="innodb" comment="Main Test Table for Module9">
-+        <column xsi:type="int" name="module9_email_contact_id" padding="10" unsigned="true" nullable="false"
-+                identity="true" comment="Entity ID"/>
-+        <column xsi:type="smallint" name="module9_is_guest" padding="5" unsigned="true" nullable="true"
-+                identity="false" comment="Is Guest"/>
-+        <column xsi:type="int" name="module9_guest_id" padding="10" unsigned="true" nullable="true" identity="false"
-+                comment="Guest ID"/>
-+        <column xsi:type="date" name="module9_created_at" comment="Created At"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module9_email_contact_id"/>
-+        </constraint>
-+        <constraint xsi:type="unique" referenceId="MODULE9_INSTALL_UNIQUE_INDEX_1">
-+            <column name="module9_email_contact_id"/>
-+            <column name="module9_guest_id"/>
-+        </constraint>
-+        <column xsi:type="int" name="module9_update_column" padding="11" unsigned="false" nullable="false"
-+                identity="false" comment="Module_9 Update Column"/>
-+        <constraint xsi:type="foreign" referenceId="MODULE9_UPDATE_FK_MODULE9_IS_GUEST" table="module9_test_main_table"
-+                    column="module9_is_guest" referenceTable="module8_test_main_table"
-+                    referenceColumn="module8_is_guest" onDelete="CASCADE"/>
-+    </table>
-+    <table name="module8_test_main_table" resource="default">
-+        <column xsi:type="int" name="module9_update_column" padding="11" unsigned="false" nullable="false"
-+                identity="false" comment="Module_9 Update Column"/>
-+    </table>
-+    <table name="module8_test_update_table" resource="default">
-+        <column name="module8_column_for_remove" disabled="true"/>
-+        <constraint xsi:type="foreign" referenceId="MODULE8_UPDATE_FK_TEMP" disabled="true"/>
-+        <index referenceId="MODULE9_UPDATE_MODULE8_GUEST_BROWSER_ID" indexType="btree">
-+            <column name="module8_guest_browser_id"/>
-+        </index>
-+        <index referenceId="MODULE8_UPDATE_UNIQUE_INDEX_TEMP" disabled="true"/>
-+    </table>
-+    <table name="module8_test_second_table" resource="default">
-+        <constraint xsi:type="foreign" referenceId="MODULE8_INSTALL_FK_ADDRESS_TEST_MAIN_TABLE_CONTACT_ID"
-+                    disabled="true"/>
-+        <index referenceId="MODULE8_INSTALL_SECOND_TABLE_INDEX_3_TEMP" disabled="true"/>
-+    </table>
-+    <table name="module8_test_temp_table" disabled="true" resource="default"/>
-+    <table name="module9_test_update_replica_table" resource="default" engine="innodb"
-+           comment="Module9 Test Update Replica Table">
-+        <column xsi:type="int" name="module8_entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-+                comment="Module8 Entity Id"/>
-+        <column xsi:type="int" name="module8_contact_id" padding="11" unsigned="false" nullable="true"
-+                identity="false" comment="Module8 Contact Id"/>
-+        <column xsi:type="varchar" name="module8_address" nullable="false" length="15" comment="Module8 Address"/>
-+        <column xsi:type="smallint" name="module8_counter_with_multiline_comment" padding="5" unsigned="true"
-+                nullable="true" identity="false" default="0" comment="Module8 Counter With Multiline Comment"/>
-+        <column xsi:type="varchar" name="module8_second_address" nullable="true" length="15"
-+                comment="Module8 Second Address"/>
-+        <constraint xsi:type="primary" referenceId="PRIMARY">
-+            <column name="module8_entity_id"/>
-+        </constraint>
-+        <constraint xsi:type="foreign" referenceId="FK_F205D8789B56A8E75BBFC0C68C041E98"
-+                    table="module9_test_update_replica_table" column="module8_address"
-+                    referenceTable="module8_test_main_table" referenceColumn="module8_content" onDelete="NO ACTION"/>
-+        <constraint xsi:type="foreign" referenceId="FK_C7075560727757663A51EC925F4032C9"
-+                    table="module9_test_update_replica_table" column="module8_address"
-+                    referenceTable="module8_test_main_table" referenceColumn="module8_contact_id" onDelete="NO ACTION"/>
-+        <constraint xsi:type="foreign" referenceId="FK_8914AF398964FAFB4ED2E382866ABBF4"
-+                    table="module9_test_update_replica_table" column="module8_entity_id"
-+                    referenceTable="module8_test_main_table" referenceColumn="module8_email_contact_id"
-+                    onDelete="NO ACTION"/>
-+        <index referenceId="MODULE9_TEST_UPDATE_REPLICA_TABLE_MODULE8_ENTITY_ID" indexType="btree">
-+            <column name="module8_entity_id"/>
-+        </index>
-+        <index referenceId="MODULE9_TEST_UPDATE_REPLICA_TABLE_MODULE8_ADDRESS" indexType="btree">
-+            <column name="module8_address"/>
-+        </index>
-+        <index referenceId="MODULE9_TEST_UPDATE_REPLICA_TABLE_MODULE8_SECOND_ADDRESS" indexType="btree">
-+            <column name="module8_second_address"/>
-+        </index>
-+    </table>
-+</schema>
-diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/_files/WhitelistGenerate/TestSetupDeclarationModule1/db_schema_whitelist.json b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/WhitelistGenerate/TestSetupDeclarationModule1/db_schema_whitelist.json
-new file mode 100644
-index 00000000000..55005b82ab8
---- /dev/null
-+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/WhitelistGenerate/TestSetupDeclarationModule1/db_schema_whitelist.json
-@@ -0,0 +1,80 @@
-+{
-+    "reference_table": {
-+        "column": {
-+            "tinyint_ref": true,
-+            "tinyint_without_padding": true,
-+            "bigint_without_padding": true,
-+            "integer_without_padding": true,
-+            "smallint_with_big_padding": true,
-+            "smallint_without_default": true,
-+            "int_without_unsigned": true,
-+            "int_unsigned": true,
-+            "bigint_default_nullable": true,
-+            "bigint_not_default_not_nullable": true,
-+            "smallint_without_padding": true
-+        },
-+        "constraint": {
-+            "tinyint_primary": true,
-+            "PRIMARY": true
-+        }
-+    },
-+    "auto_increment_test": {
-+        "column": {
-+            "int_auto_increment_with_nullable": true,
-+            "int_disabled_auto_increment": true
-+        },
-+        "constraint": {
-+            "AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE": true
-+        }
-+    },
-+    "test_table": {
-+        "column": {
-+            "smallint": true,
-+            "tinyint": true,
-+            "bigint": true,
-+            "float": true,
-+            "double": true,
-+            "decimal": true,
-+            "date": true,
-+            "timestamp": true,
-+            "datetime": true,
-+            "longtext": true,
-+            "mediumtext": true,
-+            "varchar": true,
-+            "mediumblob": true,
-+            "blob": true,
-+            "boolean": true,
-+            "varbinary_rename": true
-+        },
-+        "index": {
-+            "TEST_TABLE_TINYINT_BIGINT": true
-+        },
-+        "constraint": {
-+            "TEST_TABLE_SMALLINT_BIGINT": true,
-+            "TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF": true
-+        }
-+    },
-+    "store": {
-+        "column": {
-+            "store_owner_id": true,
-+            "store_owner": true
-+        },
-+        "constraint": {
-+            "STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID": true
-+        }
-+    },
-+    "store_owner": {
-+        "column": {
-+            "owner_id": true,
-+            "label": true
-+        },
-+        "constraint": {
-+            "": true
-+        }
-+    },
-+    "some_table": {
-+        "column": {
-+            "some_column": true
-+        }
-+    }
-+}
-\ No newline at end of file
-diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/_files/WhitelistGenerate/TestSetupDeclarationModule8/db_schema_whitelist.json b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/WhitelistGenerate/TestSetupDeclarationModule8/db_schema_whitelist.json
-new file mode 100644
-index 00000000000..b4209edfe47
---- /dev/null
-+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/WhitelistGenerate/TestSetupDeclarationModule8/db_schema_whitelist.json
-@@ -0,0 +1,20 @@
-+{
-+    "reference_test": {
-+        "column": {
-+            "entity_id": true,
-+            "product_id": true
-+        },
-+        "index": {
-+            "REFERENCE_TEST_ENTITY_ID": true
-+        },
-+        "constraint": {
-+            "REFERENCE_TEST_ENTITY_ID_PRODUCT_ID": true,
-+            "REFERENCE_TEST_ENTITY_ID_TEST_TABLE_SMALLINT": true
-+        }
-+    },
-+    "auto_increment_test": {
-+        "column": {
-+            "int_counter": true
-+        }
-+    }
-+}
-\ No newline at end of file
-diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
-index 34d432e566f..e8698965de0 100644
---- a/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
-+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
-@@ -29,7 +29,7 @@ class DeclarativeInstallerTest extends SetupTestCase
-     /**
-      * @var CliCommand
-      */
--    private $cliCommad;
-+    private $cliCommand;
- 
-     /**
-      * @var SchemaDiff
-@@ -51,11 +51,14 @@ class DeclarativeInstallerTest extends SetupTestCase
-      */
-     private $describeTable;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     public function setUp()
-     {
-         $objectManager = Bootstrap::getObjectManager();
-         $this->moduleManager = $objectManager->get(TestModuleManager::class);
--        $this->cliCommad = $objectManager->get(CliCommand::class);
-+        $this->cliCommand = $objectManager->get(CliCommand::class);
-         $this->describeTable = $objectManager->get(DescribeTable::class);
-         $this->schemaDiff = $objectManager->get(SchemaDiff::class);
-         $this->schemaConfig = $objectManager->get(SchemaConfigInterface::class);
-@@ -68,7 +71,7 @@ class DeclarativeInstallerTest extends SetupTestCase
-      */
-     public function testInstallation()
-     {
--        $this->cliCommad->install(
-+        $this->cliCommand->install(
-             ['Magento_TestSetupDeclarationModule1']
-         );
- 
-@@ -79,17 +82,36 @@ class DeclarativeInstallerTest extends SetupTestCase
- 
-         //Second time installation should not find anything as we do not change anything
-         self::assertNull($diff->getAll());
-+        $this->compareStructures();
-+    }
-+
-+    /**
-+     * Compare structure of DB and declared structure.
-+     */
-+    private function compareStructures()
-+    {
-         $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
--        self::assertEquals($this->getTrimmedData(), $shardData);
-+        foreach ($this->getTrimmedData() as $tableName => $sql) {
-+            $this->assertArrayHasKey($tableName, $shardData);
-+            /**
-+             * MySQL 8.0 and above does not provide information about the ON DELETE instruction
-+             * if ON DELETE NO ACTION
-+             */
-+            if (preg_match('#ON DELETE\s+NO ACTION#i', $shardData[$tableName] === 1)) {
-+                preg_replace('#ON DELETE\s+NO ACTION#i', '', $sql);
-+                self::assertEquals($sql, $shardData[$tableName]);
-+            }
-+        }
-     }
- 
-     /**
-      * @moduleName Magento_TestSetupDeclarationModule1
-      * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/column_modification.php
-+     * @throws \Exception
-      */
-     public function testInstallationWithColumnsModification()
-     {
--        $this->cliCommad->install(
-+        $this->cliCommand->install(
-             ['Magento_TestSetupDeclarationModule1']
-         );
- 
-@@ -101,7 +123,7 @@ class DeclarativeInstallerTest extends SetupTestCase
-             'etc'
-         );
- 
--        $this->cliCommad->install(
-+        $this->cliCommand->install(
-             ['Magento_TestSetupDeclarationModule1']
-         );
- 
-@@ -110,8 +132,7 @@ class DeclarativeInstallerTest extends SetupTestCase
-             $this->schemaConfig->getDbConfig()
-         );
-         self::assertNull($diff->getAll());
--        $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
--        self::assertEquals($this->getTrimmedData(), $shardData);
-+        $this->compareStructures();
-     }
- 
-     /**
-@@ -140,14 +161,15 @@ class DeclarativeInstallerTest extends SetupTestCase
-     /**
-      * @moduleName Magento_TestSetupDeclarationModule1
-      * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/column_removal.php
-+     * @throws \Exception
-      */
-     public function testInstallationWithColumnsRemoval()
-     {
--        $this->cliCommad->install(
-+        $this->cliCommand->install(
-             ['Magento_TestSetupDeclarationModule1']
-         );
-         $this->updateDbSchemaRevision('column_removals');
--        $this->cliCommad->install(
-+        $this->cliCommand->install(
-             ['Magento_TestSetupDeclarationModule1']
-         );
- 
-@@ -156,8 +178,7 @@ class DeclarativeInstallerTest extends SetupTestCase
-             $this->schemaConfig->getDbConfig()
-         );
-         self::assertNull($diff->getAll());
--        $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
--        self::assertEquals($this->getTrimmedData(), $shardData);
-+        $this->compareStructures();
-     }
- 
-     /**
-@@ -179,14 +200,15 @@ class DeclarativeInstallerTest extends SetupTestCase
-     /**
-      * @moduleName Magento_TestSetupDeclarationModule1
-      * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/constraint_modification.php
-+     * @throws \Exception
-      */
-     public function testInstallationWithConstraintsModification()
-     {
--        $this->cliCommad->install(
-+        $this->cliCommand->install(
-             ['Magento_TestSetupDeclarationModule1']
-         );
-         $this->updateDbSchemaRevision('constraint_modifications');
--        $this->cliCommad->upgrade();
-+        $this->cliCommand->upgrade();
- 
-         $diff = $this->schemaDiff->diff(
-             $this->schemaConfig->getDeclarationConfig(),
-@@ -200,10 +222,11 @@ class DeclarativeInstallerTest extends SetupTestCase
-     /**
-      * @moduleName Magento_TestSetupDeclarationModule1
-      * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_removal.php
-+     * @throws \Exception
-      */
-     public function testInstallationWithDroppingTables()
-     {
--        $this->cliCommad->install(
-+        $this->cliCommand->install(
-             ['Magento_TestSetupDeclarationModule1']
-         );
- 
-@@ -215,7 +238,7 @@ class DeclarativeInstallerTest extends SetupTestCase
-             'etc'
-         );
- 
--        $this->cliCommad->upgrade();
-+        $this->cliCommand->upgrade();
- 
-         $diff = $this->schemaDiff->diff(
-             $this->schemaConfig->getDeclarationConfig(),
-@@ -226,9 +249,49 @@ class DeclarativeInstallerTest extends SetupTestCase
-         self::assertEquals($this->getData(), $shardData);
-     }
- 
-+    /**
-+     * @moduleName Magento_TestSetupDeclarationModule1
-+     * @moduleName Magento_TestSetupDeclarationModule3
-+     */
-+    public function testInstallationWithDroppingTablesFromSecondaryModule()
-+    {
-+        $modules = [
-+            'Magento_TestSetupDeclarationModule1',
-+            'Magento_TestSetupDeclarationModule3',
-+        ];
-+
-+        $this->moduleManager->updateRevision(
-+            'Magento_TestSetupDeclarationModule3',
-+            'drop_table_with_external_dependency',
-+            'db_schema.xml',
-+            'etc'
-+        );
-+
-+        foreach ($modules as $moduleName) {
-+            $this->moduleManager->updateRevision(
-+                $moduleName,
-+                'without_setup_version',
-+                'module.xml',
-+                'etc'
-+            );
-+        }
-+
-+        try {
-+            $this->cliCommand->install($modules);
-+        } catch (\Exception $e) {
-+            $installException = $e->getPrevious();
-+            self::assertSame(1, $installException->getCode());
-+            self::assertContains(
-+                'The reference table named "reference_table" is disabled',
-+                $installException->getMessage()
-+            );
-+        }
-+    }
-+
-     /**
-      * @moduleName Magento_TestSetupDeclarationModule1
-      * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.php
-+     * @throws \Exception
-      */
-     public function testInstallWithCodeBaseRollback()
-     {
-@@ -239,7 +302,7 @@ class DeclarativeInstallerTest extends SetupTestCase
-             'db_schema.xml',
-             'etc'
-         );
--        $this->cliCommad->install(
-+        $this->cliCommand->install(
-             ['Magento_TestSetupDeclarationModule1']
-         );
-         $beforeRollback = $this->describeTable->describeShard('default');
-@@ -252,7 +315,7 @@ class DeclarativeInstallerTest extends SetupTestCase
-             'etc'
-         );
- 
--        $this->cliCommad->upgrade();
-+        $this->cliCommand->upgrade();
-         $afterRollback = $this->describeTable->describeShard('default');
-         self::assertEquals($this->getData()['after'], $afterRollback);
-     }
-@@ -260,6 +323,7 @@ class DeclarativeInstallerTest extends SetupTestCase
-     /**
-      * @moduleName Magento_TestSetupDeclarationModule1
-      * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_rename.php
-+     * @throws \Exception
-      */
-     public function testTableRename()
-     {
-@@ -271,7 +335,7 @@ class DeclarativeInstallerTest extends SetupTestCase
-             'db_schema.xml',
-             'etc'
-         );
--        $this->cliCommad->install(
-+        $this->cliCommand->install(
-             ['Magento_TestSetupDeclarationModule1']
-         );
-         $before = $this->describeTable->describeShard('default');
-@@ -289,11 +353,109 @@ class DeclarativeInstallerTest extends SetupTestCase
-             'etc'
-         );
- 
--        $this->cliCommad->upgrade();
-+        $this->cliCommand->upgrade();
-         $after = $this->describeTable->describeShard('default');
-         self::assertEquals($this->getData()['after'], $after['some_table_renamed']);
-         $select = $adapter->select()
-             ->from($this->resourceConnection->getTableName('some_table_renamed'));
-         self::assertEquals([$dataToMigrate], $adapter->fetchAll($select));
-     }
-+
-+    /**
-+     * @moduleName Magento_TestSetupDeclarationModule8
-+     * @throws \Exception
-+     */
-+    public function testForeignKeyReferenceId()
-+    {
-+        $this->cliCommand->install(
-+            ['Magento_TestSetupDeclarationModule8']
-+        );
-+        $this->moduleManager->updateRevision(
-+            'Magento_TestSetupDeclarationModule8',
-+            'unpatterned_fk_name',
-+            'db_schema.xml',
-+            'etc'
-+        );
-+        $this->cliCommand->upgrade();
-+        $tableStatements = $this->describeTable->describeShard('default');
-+        $tableSql = $tableStatements['dependent'];
-+        $this->assertRegExp('/CONSTRAINT\s`DEPENDENT_PAGE_ID_ON_TEST_TABLE_PAGE_ID`/', $tableSql);
-+        $this->assertRegExp('/CONSTRAINT\s`DEPENDENT_SCOPE_ID_ON_TEST_SCOPE_TABLE_SCOPE_ID`/', $tableSql);
-+    }
-+
-+    /**
-+     * @moduleName Magento_TestSetupDeclarationModule1
-+     * @moduleName Magento_TestSetupDeclarationModule8
-+     * @throws \Exception
-+     */
-+    public function testDisableIndexByExternalModule()
-+    {
-+        $this->cliCommand->install(
-+            ['Magento_TestSetupDeclarationModule1', 'Magento_TestSetupDeclarationModule8']
-+        );
-+        $this->moduleManager->updateRevision(
-+            'Magento_TestSetupDeclarationModule1',
-+            'index_to_disable',
-+            'db_schema.xml',
-+            'etc'
-+        );
-+        $this->moduleManager->updateRevision(
-+            'Magento_TestSetupDeclarationModule8',
-+            'disable_index_by_external_module',
-+            'db_schema.xml',
-+            'etc'
-+        );
-+        $this->moduleManager->updateRevision(
-+            'Magento_TestSetupDeclarationModule8',
-+            'disable_index_by_external_module',
-+            'db_schema_whitelist.json',
-+            'etc'
-+        );
-+        $this->moduleManager->updateRevision(
-+            'Magento_TestSetupDeclarationModule8',
-+            'disable_index_by_external_module',
-+            'module.xml',
-+            'etc'
-+        );
-+        $this->cliCommand->upgrade();
-+        $tableStatements = $this->describeTable->describeShard('default');
-+        $tableSql = $tableStatements['test_table'];
-+        $this->assertNotRegExp(
-+            '/KEY\s+`TEST_TABLE_VARCHAR`\s+\(`varchar`\)/',
-+            $tableSql,
-+            'Index is not being disabled by external module'
-+        );
-+    }
-+
-+    /**
-+     * @moduleName Magento_TestSetupDeclarationModule8
-+     * @moduleName Magento_TestSetupDeclarationModule9
-+     * @dataProviderFromFile Magento/TestSetupDeclarationModule9/fixture/declarative_installer/disabling_tables.php
-+     * @throws \Exception
-+     */
-+    public function testInstallationWithDisablingTables()
-+    {
-+        $modules = [
-+            'Magento_TestSetupDeclarationModule8',
-+            'Magento_TestSetupDeclarationModule9',
-+        ];
-+
-+        foreach ($modules as $moduleName) {
-+            $this->moduleManager->updateRevision(
-+                $moduleName,
-+                'disabling_tables',
-+                'db_schema.xml',
-+                'etc'
-+            );
-+        }
-+        $this->cliCommand->install($modules);
-+
-+        $diff = $this->schemaDiff->diff(
-+            $this->schemaConfig->getDeclarationConfig(),
-+            $this->schemaConfig->getDbConfig()
-+        );
-+        self::assertNull($diff->getAll());
-+        $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
-+        self::assertEquals($this->getData(), $shardData);
-+    }
- }
-diff --git a/dev/tests/static/.gitignore b/dev/tests/static/.gitignore
-index 651969a59ce..175be896e8d 100644
---- a/dev/tests/static/.gitignore
-+++ b/dev/tests/static/.gitignore
-@@ -1,4 +1,6 @@
- /*.xml
--framework/tests/unit/*.xml
--report/
--tmp/
-+/framework/tests/unit/*.xml
-+/framework/tests/unit/var/allure-results/
-+/report/
-+/tmp/
-+/var/allure-results/
-diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php
-new file mode 100644
-index 00000000000..ca257c1f6eb
---- /dev/null
-+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\CodeMessDetector\Rule\Design;
-+
-+use PDepend\Source\AST\ASTClass;
-+use PHPMD\AbstractNode;
-+use PHPMD\AbstractRule;
-+use PHPMD\Node\ClassNode;
-+use PHPMD\Rule\ClassAware;
-+use Magento\Framework\App\ActionInterface;
-+
-+/**
-+ * Actions must process a defined list of HTTP methods.
-+ */
-+class AllPurposeAction extends AbstractRule implements ClassAware
-+{
-+    /**
-+     * @inheritdoc
-+     *
-+     * @param ClassNode|ASTClass $node
-+     */
-+    public function apply(AbstractNode $node)
-+    {
-+        // Skip validation for Abstract Controllers
-+        if ($node->isAbstract()) {
-+            return;
-+        }
-+        try {
-+            $impl = class_implements($node->getFullQualifiedName(), true);
-+        } catch (\Throwable $exception) {
-+            //Couldn't load a class.
-+            return;
-+        }
-+
-+        if (in_array(ActionInterface::class, $impl, true)) {
-+            $methodsDefined = false;
-+            foreach ($impl as $i) {
-+                if (preg_match('/\\\Http[a-z]+ActionInterface$/i', $i)) {
-+                    $methodsDefined = true;
-+                    break;
-+                }
-+            }
-+            if (!$methodsDefined) {
-+                $this->addViolation($node, [$node->getFullQualifiedName()]);
-+            }
-+        }
-+    }
-+}
-diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
-new file mode 100644
-index 00000000000..707c3442d40
---- /dev/null
-+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
-@@ -0,0 +1,199 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\CodeMessDetector\Rule\Design;
-+
-+use PDepend\Source\AST\ASTClass;
-+use PHPMD\AbstractNode;
-+use PHPMD\AbstractRule;
-+use PHPMD\Node\ClassNode;
-+use PHPMD\Rule\ClassAware;
-+
-+/**
-+ * Session and Cookies must be used only in HTML Presentation layer.
-+ */
-+class CookieAndSessionMisuse extends AbstractRule implements ClassAware
-+{
-+    /**
-+     * Is given class a controller?
-+     *
-+     * @param \ReflectionClass $class
-+     * @return bool
-+     */
-+    private function isController(\ReflectionClass $class): bool
-+    {
-+        return $class->isSubclassOf(\Magento\Framework\App\ActionInterface::class);
-+    }
-+
-+    /**
-+     * Is given class a block?
-+     *
-+     * @param \ReflectionClass $class
-+     * @return bool
-+     */
-+    private function isBlock(\ReflectionClass $class): bool
-+    {
-+        return $class->isSubclassOf(\Magento\Framework\View\Element\BlockInterface::class);
-+    }
-+
-+    /**
-+     * Is given class an HTML UI data provider?
-+     *
-+     * @param \ReflectionClass $class
-+     * @return bool
-+     */
-+    private function isUiDataProvider(\ReflectionClass $class): bool
-+    {
-+        return $class->isSubclassOf(
-+            \Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface::class
-+        );
-+    }
-+
-+    /**
-+     * Is given class a Layout Processor?
-+     *
-+     * @param \ReflectionClass $class
-+     * @return bool
-+     */
-+    private function isLayoutProcessor(\ReflectionClass $class): bool
-+    {
-+        return $class->isSubclassOf(
-+            \Magento\Checkout\Block\Checkout\LayoutProcessorInterface::class
-+        );
-+    }
-+
-+    /**
-+     * Is given class an HTML UI Document?
-+     *
-+     * @param \ReflectionClass $class
-+     * @return bool
-+     */
-+    private function isUiDocument(\ReflectionClass $class): bool
-+    {
-+        return $class->isSubclassOf(\Magento\Framework\View\Element\UiComponent\DataProvider\Document::class)
-+            || $class->getName() === \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class;
-+    }
-+
-+    /**
-+     * Is given class a plugin for controllers?
-+     *
-+     * @param \ReflectionClass $class
-+     * @return bool
-+     */
-+    private function isControllerPlugin(\ReflectionClass $class): bool
-+    {
-+        foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
-+            if (preg_match('/^(after|around|before).+/i', $method->getName())) {
-+                try {
-+                    $argument = $method->getParameters()[0]->getClass();
-+                } catch (\Throwable $exception) {
-+                    //Non-existing class (autogenerated perhaps) or doesn't have an argument.
-+                    continue;
-+                }
-+                if ($argument) {
-+                    $isAction = $argument->isSubclassOf(\Magento\Framework\App\ActionInterface::class)
-+                        || $argument->getName() === \Magento\Framework\App\ActionInterface::class;
-+                    if ($isAction) {
-+                        return true;
-+                    }
-+                }
-+            }
-+        }
-+
-+        return false;
-+    }
-+
-+    /**
-+     * Is given class a plugin for blocks?
-+     *
-+     * @param \ReflectionClass $class
-+     * @return bool
-+     */
-+    private function isBlockPlugin(\ReflectionClass $class): bool
-+    {
-+        foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
-+            if (preg_match('/^(after|around|before).+/i', $method->getName())) {
-+                try {
-+                    $argument = $method->getParameters()[0]->getClass();
-+                } catch (\Throwable $exception) {
-+                    //Non-existing class (autogenerated perhaps) or doesn't have an argument.
-+                    continue;
-+                }
-+                if ($argument) {
-+                    $isBlock = $argument->isSubclassOf(\Magento\Framework\View\Element\BlockInterface::class)
-+                        || $argument->getName() === \Magento\Framework\View\Element\BlockInterface::class;
-+                    if ($isBlock) {
-+                        return true;
-+                    }
-+                }
-+            }
-+        }
-+
-+        return false;
-+    }
-+
-+    /**
-+     * Whether given class depends on classes to pay attention to.
-+     *
-+     * @param \ReflectionClass $class
-+     * @return bool
-+     */
-+    private function doesUseRestrictedClasses(\ReflectionClass $class): bool
-+    {
-+        $constructor = $class->getConstructor();
-+        if ($constructor) {
-+            foreach ($constructor->getParameters() as $argument) {
-+                try {
-+                    if ($class = $argument->getClass()) {
-+                        if ($class->isSubclassOf(\Magento\Framework\Session\SessionManagerInterface::class)
-+                            || $class->getName() === \Magento\Framework\Session\SessionManagerInterface::class
-+                            || $class->isSubclassOf(\Magento\Framework\Stdlib\Cookie\CookieReaderInterface::class)
-+                            || $class->getName() === \Magento\Framework\Stdlib\Cookie\CookieReaderInterface::class
-+                        ) {
-+                            return true;
-+                        }
-+                    }
-+                } catch (\ReflectionException $exception) {
-+                    //Failed to load the argument's class information
-+                    continue;
-+                }
-+            }
-+        }
-+
-+        return false;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * @param ClassNode|ASTClass $node
-+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-+     */
-+    public function apply(AbstractNode $node)
-+    {
-+        try {
-+            $class = new \ReflectionClass($node->getFullQualifiedName());
-+        } catch (\Throwable $exception) {
-+            //Failed to load class, nothing we can do
-+            return;
-+        }
-+
-+        if ($this->doesUseRestrictedClasses($class)) {
-+            if (!$this->isController($class)
-+                && !$this->isBlock($class)
-+                && !$this->isUiDataProvider($class)
-+                && !$this->isUiDocument($class)
-+                && !$this->isControllerPlugin($class)
-+                && !$this->isBlockPlugin($class)
-+                && !$this->isLayoutProcessor($class)
-+            ) {
-+                $this->addViolation($node, [$node->getFullQualifiedName()]);
-+            }
-+        }
-+    }
-+}
-diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/FinalImplementation.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/FinalImplementation.php
-deleted file mode 100644
-index 22c008b0580..00000000000
---- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/FinalImplementation.php
-+++ /dev/null
-@@ -1,29 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\CodeMessDetector\Rule\Design;
--
--use PHPMD\AbstractNode;
--use PHPMD\AbstractRule;
--use PHPMD\Rule\ClassAware;
--use PHPMD\Rule\MethodAware;
--
--/**
-- * Magento is a highly extensible and customizable platform.
-- * Usage of final classes and methods is prohibited.
-- */
--class FinalImplementation extends AbstractRule implements ClassAware, MethodAware
--{
--    /**
--     * @inheritdoc
--     */
--    public function apply(AbstractNode $node)
--    {
--        if ($node->isFinal()) {
--            $this->addViolation($node, [$node->getType(), $node->getFullQualifiedName()]);
--        }
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/SerializationAware.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/SerializationAware.php
-new file mode 100644
-index 00000000000..e38fba8558b
---- /dev/null
-+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/SerializationAware.php
-@@ -0,0 +1,34 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\CodeMessDetector\Rule\Design;
-+
-+use PHPMD\AbstractNode;
-+use PHPMD\AbstractRule;
-+use PHPMD\Node\ClassNode;
-+use PHPMD\Node\MethodNode;
-+use PDepend\Source\AST\ASTMethod;
-+use PHPMD\Rule\MethodAware;
-+
-+/**
-+ * Detect PHP serialization aware methods.
-+ */
-+class SerializationAware extends AbstractRule implements MethodAware
-+{
-+    /**
-+     * @inheritDoc
-+     *
-+     * @param ASTMethod|MethodNode $method
-+     */
-+    public function apply(AbstractNode $method)
-+    {
-+        if ($method->getName() === '__wakeup' || $method->getName() === '__sleep') {
-+            $this->addViolation($method, [$method->getName(), $method->getParent()->getFullQualifiedName()]);
-+        }
-+    }
-+}
-diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php
-new file mode 100644
-index 00000000000..408853141e5
---- /dev/null
-+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php
-@@ -0,0 +1,134 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\CodeMessDetector\Test\Unit\Rule\Design;
-+
-+use Magento\CodeMessDetector\Rule\Design\AllPurposeAction;
-+use Magento\Framework\App\Action\HttpGetActionInterface;
-+use Magento\Framework\App\ActionInterface;
-+use PHPUnit\Framework\TestCase as TestCase;
-+use PHPUnit_Framework_MockObject_MockObject as MockObject;
-+use PHPUnit\Framework\MockObject\Builder\InvocationMocker as InvocationMocker;
-+use PHPMD\Report;
-+use PHPMD\Node\ClassNode;
-+
-+class AllPurposeActionTest extends TestCase
-+{
-+    /**
-+     * @param object $fakeAction
-+     * @param bool $violates
-+     *
-+     * @dataProvider getCases
-+     */
-+    public function testApply($fakeAction, bool $violates)
-+    {
-+        $node = $this->createNodeMock($fakeAction);
-+        $rule = new AllPurposeAction();
-+        $this->expectsRuleViolation($rule, $violates);
-+        $rule->apply($node);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getCases(): array
-+    {
-+        return [
-+            [
-+                new class implements ActionInterface, HttpGetActionInterface {
-+                    /**
-+                     * @inheritDoc
-+                     */
-+                    public function execute()
-+                    {
-+                        return null;
-+                    }
-+                },
-+                false
-+            ],
-+            [
-+                new class implements ActionInterface {
-+                    /**
-+                     * @inheritDoc
-+                     */
-+                    public function execute()
-+                    {
-+                        return null;
-+                    }
-+                },
-+                true
-+            ],
-+            [
-+                new class implements HttpGetActionInterface {
-+                    /**
-+                     * @inheritDoc
-+                     */
-+                    public function execute()
-+                    {
-+                        return null;
-+                    }
-+                },
-+                false
-+            ],
-+            [
-+                new class {
-+
-+                },
-+                false
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * @param object $dynamicObject
-+     *
-+     * @return ClassNode|MockObject
-+     */
-+    private function createNodeMock($dynamicObject): MockObject
-+    {
-+        $node = $this->getMockBuilder(ClassNode::class)
-+            ->disableOriginalConstructor()
-+            ->disableProxyingToOriginalMethods()
-+            ->setMethods([
-+                // disable name lookup from AST artifact
-+                'getNamespaceName',
-+                'getParentName',
-+                'getName',
-+                'getFullQualifiedName',
-+            ])
-+            ->getMock();
-+        $node->expects($this->any())
-+            ->method('getFullQualifiedName')
-+            ->willReturn(get_class($dynamicObject));
-+
-+        return $node;
-+    }
-+
-+    /**
-+     * @param AllPurposeAction $rule
-+     * @param bool $expects
-+     * @return InvocationMocker
-+     */
-+    private function expectsRuleViolation(
-+        AllPurposeAction $rule,
-+        bool $expects
-+    ): InvocationMocker {
-+        /** @var Report|MockObject $report */
-+        $report = $this->getMockBuilder(Report::class)->getMock();
-+        if ($expects) {
-+            $violationExpectation = $this->atLeastOnce();
-+        } else {
-+            $violationExpectation = $this->never();
-+        }
-+        $invokation = $report->expects($violationExpectation)
-+            ->method('addRuleViolation');
-+        $rule->setReport($report);
-+
-+        return $invokation;
-+    }
-+}
-diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php
-deleted file mode 100644
-index ca944b5c60e..00000000000
---- a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php
-+++ /dev/null
-@@ -1,128 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\CodeMessDetector\Test\Unit\Rule\Design;
--
--use PHPUnit\Framework\TestCase as TestCase;
--use PHPUnit_Framework_MockObject_MockObject as MockObject;
--use PHPUnit\Framework\MockObject\Matcher\InvokedRecorder as InvokedRecorder;
--use PHPUnit\Framework\MockObject\Builder\InvocationMocker as InvocationMocker;
--use Magento\CodeMessDetector\Rule\Design\FinalImplementation;
--use PHPMD\Report;
--use PHPMD\AbstractNode;
--use PHPMD\Node\ClassNode;
--use PHPMD\Node\MethodNode;
--use BadMethodCallException;
--
--class FinalImplementationTest extends TestCase
--{
--    /**
--     * @param string $nodeType
--     *
--     * @dataProvider finalizableNodeTypesProvider
--     */
--    public function testRuleNotAppliesToNotFinalFinalizable($nodeType)
--    {
--        $finalizableNode = $this->createFinalizableNodeMock($nodeType);
--        $finalizableNode->method('isFinal')->willReturn(false);
--
--        $rule = new FinalImplementation();
--        $this->expectsRuleViolation($rule, $this->never());
--        $rule->apply($finalizableNode);
--    }
--
--    /**
--     * @param string $nodeType
--     *
--     * @dataProvider finalizableNodeTypesProvider
--     */
--    public function testRuleAppliesToFinalFinalizable($nodeType)
--    {
--        $finalizableNode = $this->createFinalizableNodeMock($nodeType);
--        $finalizableNode->method('isFinal')->willReturn(true);
--
--        $rule = new FinalImplementation();
--        $this->expectsRuleViolation($rule, $this->once());
--        $rule->apply($finalizableNode);
--    }
--
--    /**
--     * @param string $nodeType
--     *
--     * @dataProvider finalizableNodeTypesProvider
--     */
--    public function testRuleVerifiesFinalizableNodes($nodeType)
--    {
--        $finalizableNode = $this->createFinalizableNodeMock($nodeType);
--
--        $finalizableNode->expects($this->atLeastOnce())
--            ->method('isFinal');
--
--        $rule = new FinalImplementation();
--        $rule->apply($finalizableNode);
--    }
--
--    /**
--     * @expectedException BadMethodCallException
--     */
--    public function testRuleFailsOnNotFinalizableNodes()
--    {
--        $someNode = $this->getMockBuilder(AbstractNode::class)
--            ->disableOriginalConstructor()
--            ->getMockForAbstractClass();
--
--        $rule = new FinalImplementation();
--        $rule->apply($someNode);
--    }
--
--    /**
--     * "final" keyword may be applied only to classes and methods
--     *
--     * @return array
--     */
--    public function finalizableNodeTypesProvider()
--    {
--        return [
--            [ClassNode::class],
--            [MethodNode::class],
--        ];
--    }
--
--    /**
--     * If node is finalizable it has "isFinal" magic PHP method
--     *
--     * @param string $nodeType
--     * @return ClassNode|MethodNode|MockObject
--     */
--    private function createFinalizableNodeMock($nodeType)
--    {
--        $finalizableNode = $this->getMockBuilder($nodeType)
--            ->disableOriginalConstructor()
--            ->disableProxyingToOriginalMethods()
--            ->setMethods([
--                'isFinal',
--                // disable name lookup from AST artifact
--                'getNamespaceName',
--                'getParentName',
--                'getName',
--            ])
--            ->getMock();
--        return $finalizableNode;
--    }
--
--    /**
--     * @param FinalImplementation $rule
--     * @param InvokedRecorder $violationExpectation
--     * @return InvocationMocker
--     */
--    private function expectsRuleViolation(FinalImplementation $rule, InvokedRecorder $violationExpectation)
--    {
--        $report = $this->getMockBuilder(Report::class)->getMock();
--        $invokation = $report->expects($violationExpectation)->method('addRuleViolation');
--        $rule->setReport($report);
--        return $invokation;
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
-index 61d4f7b3be8..5f2461812ba 100644
---- a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
-+++ b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
-@@ -10,25 +10,81 @@
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-          xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
--    <rule name="FinalImplementation"
--          class="Magento\CodeMessDetector\Rule\Design\FinalImplementation"
--          message= "The {0} {1} declared as final.">
-+    <rule name="AllPurposeAction"
-+          class="Magento\CodeMessDetector\Rule\Design\AllPurposeAction"
-+          message= "The class {0} does not restrict processed HTTP methods by implementing a Http*Method name*ActionInterface">
-         <description>
-             <![CDATA[
--Final keyword is prohibited in Magento as this decreases extensibility and customizability.
--Final classes and method are not compatible with plugins and proxies.
-+Controllers (classes implementing ActionInterface) have to implement marker Http<Method>ActionInterface
-+to restrict incoming requests by methods.
-             ]]>
-         </description>
--        <priority>1</priority>
-+        <priority>2</priority>
-         <properties />
-         <example>
-             <![CDATA[
--final class Foo
-+class PostOrder implements ActionInterface
- {
--    public function bar() {}
-+    public function execute()
-+    {
-+        //I process GET, POST, PATCH etc. while only intended for POST
-+        ...
-+        return $response;
-+    }
- }
--class Baz {
--    final public function bad() {}
-+            ]]>
-+        </example>
-+    </rule>
-+    <rule name="CookieAndSessionMisuse"
-+          class="Magento\CodeMessDetector\Rule\Design\CookieAndSessionMisuse"
-+          message= "The class {0} uses sessions or cookies while not being a part of HTML Presentation layer">
-+        <description>
-+            <![CDATA[
-+Sessions and cookies must only be used in classes directly responsible for HTML presentation because Web APIs do not
-+rely on cookies and sessions. If you need to get current user use Magento\Authorization\Model\UserContextInterface
-+            ]]>
-+        </description>
-+        <priority>2</priority>
-+        <properties />
-+        <example>
-+            <![CDATA[
-+class OrderProcessor
-+{
-+    public function __construct(SessionManagerInterface $session) {
-+        $this->session = $session;
-+    }
-+
-+    public function place(OrderInterface $order)
-+    {
-+        //Will not be present if processing a WebAPI request
-+        $currentOrder = $this->session->get('current_order');
-+        ...
-+    }
-+}
-+            ]]>
-+        </example>
-+    </rule>
-+    <rule name="SerializationAware"
-+          class="Magento\CodeMessDetector\Rule\Design\SerializationAware"
-+          message="{1} has {0} method and is PHP serialization aware - PHP serialization must be avoided.">
-+        <description>
-+            <![CDATA[
-+Using PHP serialization must be avoided in Magento for security reasons and for prevention of unexpected behaviour.
-+            ]]>
-+        </description>
-+        <priority>2</priority>
-+        <properties />
-+        <example>
-+            <![CDATA[
-+class MyModel extends AbstractModel
-+{
-+
-+    .......
-+
-+    public function __sleep()
-+    {
-+        .....
-+    }
- }
-             ]]>
-         </example>
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php
-new file mode 100644
-index 00000000000..20442f93882
---- /dev/null
-+++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php
-@@ -0,0 +1,374 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sniffs\Annotation;
-+
-+use PHP_CodeSniffer\Files\File;
-+
-+/**
-+ * Class to validate annotation format
-+ */
-+class AnnotationFormatValidator
-+{
-+    /**
-+     * Gets the short description end pointer position
-+     *
-+     * @param File $phpcsFile
-+     * @param int $shortPtr
-+     * @param int $commentEndPtr
-+     * @return int
-+     */
-+    private function getShortDescriptionEndPosition(File $phpcsFile, int $shortPtr, $commentEndPtr): int
-+    {
-+        $tokens = $phpcsFile->getTokens();
-+        $shortPtrEnd = $shortPtr;
-+        for ($i = ($shortPtr + 1); $i < $commentEndPtr; $i++) {
-+            if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) {
-+                if ($tokens[$i]['line'] === $tokens[$shortPtrEnd]['line'] + 1) {
-+                    $shortPtrEnd = $i;
-+                } else {
-+                    break;
-+                }
-+            }
-+        }
-+        return $shortPtrEnd;
-+    }
-+
-+    /**
-+     * Validates whether the short description has multi lines in description
-+     *
-+     * @param File $phpcsFile
-+     * @param int $shortPtr
-+     * @param int $commentEndPtr
-+     */
-+    private function validateMultiLinesInShortDescription(
-+        File $phpcsFile,
-+        int $shortPtr,
-+        int $commentEndPtr
-+    ): void {
-+        $tokens = $phpcsFile->getTokens();
-+        $shortPtrEnd = $this->getShortDescriptionEndPosition(
-+            $phpcsFile,
-+            (int)$shortPtr,
-+            $commentEndPtr
-+        );
-+        $shortPtrEndContent = $tokens[$shortPtrEnd]['content'];
-+        if (preg_match('/^[a-z]/', $shortPtrEndContent)
-+            && $shortPtrEnd != $shortPtr
-+            && !preg_match('/\bSee\b/', $shortPtrEndContent)
-+            && $tokens[$shortPtr]['line'] + 1 === $tokens[$shortPtrEnd]['line']
-+            && $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
-+        ) {
-+            $error = 'Short description should not be in multi lines';
-+            $phpcsFile->addFixableError($error, $shortPtrEnd + 1, 'MethodAnnotation');
-+        }
-+    }
-+
-+    /**
-+     * Validates whether the spacing between short and long descriptions
-+     *
-+     * @param File $phpcsFile
-+     * @param int $shortPtr
-+     * @param int $commentEndPtr
-+     * @param array $emptyTypeTokens
-+     */
-+    private function validateSpacingBetweenShortAndLongDescriptions(
-+        File $phpcsFile,
-+        int $shortPtr,
-+        int $commentEndPtr,
-+        array $emptyTypeTokens
-+    ): void {
-+        $tokens = $phpcsFile->getTokens();
-+        $shortPtrEnd = $this->getShortDescriptionEndPosition(
-+            $phpcsFile,
-+            (int)$shortPtr,
-+            $commentEndPtr
-+        );
-+        $shortPtrEndContent = $tokens[$shortPtrEnd]['content'];
-+        if (preg_match('/^[A-Z]/', $shortPtrEndContent)
-+            && !preg_match('/\bSee\b/', $shortPtrEndContent)
-+            && $tokens[$shortPtr]['line'] + 1 === $tokens[$shortPtrEnd]['line']
-+            && $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
-+        ) {
-+            $error = 'There must be exactly one blank line between lines';
-+            $phpcsFile->addFixableError($error, $shortPtrEnd + 1, 'MethodAnnotation');
-+        }
-+        if ($shortPtrEnd != $shortPtr) {
-+            $this->validateLongDescriptionFormat($phpcsFile, $shortPtrEnd, $commentEndPtr, $emptyTypeTokens);
-+        } else {
-+            $this->validateLongDescriptionFormat($phpcsFile, $shortPtr, $commentEndPtr, $emptyTypeTokens);
-+        }
-+    }
-+
-+    /**
-+     * Validates short description format
-+     *
-+     * @param File $phpcsFile
-+     * @param int $shortPtr
-+     * @param int $stackPtr
-+     * @param int $commentEndPtr
-+     * @param array $emptyTypeTokens
-+     */
-+    private function validateShortDescriptionFormat(
-+        File $phpcsFile,
-+        int $shortPtr,
-+        int $stackPtr,
-+        int $commentEndPtr,
-+        array $emptyTypeTokens
-+    ): void {
-+        $tokens = $phpcsFile->getTokens();
-+        if ($tokens[$shortPtr]['line'] !== $tokens[$stackPtr]['line'] + 1) {
-+            $error = 'No blank lines are allowed before short description';
-+            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
-+        }
-+        if (strtolower($tokens[$shortPtr]['content']) === '{@inheritdoc}') {
-+            $error = 'If the @inheritdoc not inline it shouldn’t have braces';
-+            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
-+        }
-+        $shortPtrContent = $tokens[$shortPtr]['content'];
-+        if (preg_match('/^\p{Ll}/u', $shortPtrContent) === 1) {
-+            $error = 'Short description must start with a capital letter';
-+            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
-+        }
-+        $this->validateNoExtraNewLineBeforeShortDescription(
-+            $phpcsFile,
-+            $stackPtr,
-+            $commentEndPtr,
-+            $emptyTypeTokens
-+        );
-+        $this->validateSpacingBetweenShortAndLongDescriptions(
-+            $phpcsFile,
-+            $shortPtr,
-+            $commentEndPtr,
-+            $emptyTypeTokens
-+        );
-+        $this->validateMultiLinesInShortDescription(
-+            $phpcsFile,
-+            $shortPtr,
-+            $commentEndPtr
-+        );
-+    }
-+
-+    /**
-+     * Validates long description format
-+     *
-+     * @param File $phpcsFile
-+     * @param int $shortPtrEnd
-+     * @param int $commentEndPtr
-+     * @param array $emptyTypeTokens
-+     */
-+    private function validateLongDescriptionFormat(
-+        File $phpcsFile,
-+        int $shortPtrEnd,
-+        int $commentEndPtr,
-+        array $emptyTypeTokens
-+    ): void {
-+        $tokens = $phpcsFile->getTokens();
-+        $longPtr = $phpcsFile->findNext($emptyTypeTokens, $shortPtrEnd + 1, $commentEndPtr - 1, true);
-+        if (strtolower($tokens[$longPtr]['content']) === '@inheritdoc') {
-+            $error = '@inheritdoc imports only short description, annotation must have long description';
-+            $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
-+        }
-+        if ($longPtr !== false && $tokens[$longPtr]['code'] === T_DOC_COMMENT_STRING) {
-+            if ($tokens[$longPtr]['line'] !== $tokens[$shortPtrEnd]['line'] + 2) {
-+                $error = 'There must be exactly one blank line between descriptions';
-+                $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
-+            }
-+            if (preg_match('/^\p{Ll}/u', $tokens[$longPtr]['content']) === 1) {
-+                $error = 'Long description must start with a capital letter';
-+                $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Validates tags spacing format
-+     *
-+     * @param File $phpcsFile
-+     * @param int $commentStartPtr
-+     * @param array $emptyTypeTokens
-+     */
-+    public function validateTagsSpacingFormat(File $phpcsFile, int $commentStartPtr, array $emptyTypeTokens): void
-+    {
-+        $tokens = $phpcsFile->getTokens();
-+        if (isset($tokens[$commentStartPtr]['comment_tags'][0])) {
-+            $firstTagPtr = $tokens[$commentStartPtr]['comment_tags'][0];
-+            $commentTagPtrContent = $tokens[$firstTagPtr]['content'];
-+            $prevPtr = $phpcsFile->findPrevious($emptyTypeTokens, $firstTagPtr - 1, $commentStartPtr, true);
-+            if ($tokens[$firstTagPtr]['line'] !== $tokens[$prevPtr]['line'] + 2
-+                && strtolower($commentTagPtrContent) !== '@inheritdoc'
-+            ) {
-+                $error = 'There must be exactly one blank line before tags';
-+                $phpcsFile->addFixableError($error, $firstTagPtr, 'MethodAnnotation');
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Validates tag grouping format
-+     *
-+     * @param File $phpcsFile
-+     * @param int $commentStartPtr
-+     */
-+    public function validateTagGroupingFormat(File $phpcsFile, int $commentStartPtr): void
-+    {
-+        $tokens = $phpcsFile->getTokens();
-+        $tagGroups = [];
-+        $groupId = 0;
-+        $paramGroupId = null;
-+        foreach ($tokens[$commentStartPtr]['comment_tags'] as $position => $tag) {
-+            if ($position > 0) {
-+                $prevPtr = $phpcsFile->findPrevious(
-+                    T_DOC_COMMENT_STRING,
-+                    $tag - 1,
-+                    $tokens[$commentStartPtr]['comment_tags'][$position - 1]
-+                );
-+                if ($prevPtr === false) {
-+                    $prevPtr = $tokens[$commentStartPtr]['comment_tags'][$position - 1];
-+                }
-+
-+                if ($tokens[$prevPtr]['line'] !== $tokens[$tag]['line'] - 1) {
-+                    $groupId++;
-+                }
-+            }
-+
-+            if (strtolower($tokens[$tag]['content']) === '@param') {
-+                if ($paramGroupId !== null
-+                    && $paramGroupId !== $groupId) {
-+                    $error = 'Parameter tags must be grouped together';
-+                    $phpcsFile->addFixableError($error, $tag, 'MethodAnnotation');
-+                }
-+                if ($paramGroupId === null) {
-+                    $paramGroupId = $groupId;
-+                }
-+            }
-+            $tagGroups[$groupId][] = $tag;
-+        }
-+    }
-+
-+    /**
-+     * Validates tag aligning format
-+     *
-+     * @param File $phpcsFile
-+     * @param int $commentStartPtr
-+     */
-+    public function validateTagAligningFormat(File $phpcsFile, int $commentStartPtr): void
-+    {
-+        $tokens = $phpcsFile->getTokens();
-+        $noAlignmentPositions = [];
-+        $actualPositions = [];
-+        $stackPtr = null;
-+        foreach ($tokens[$commentStartPtr]['comment_tags'] as $tag) {
-+            $content = $tokens[$tag]['content'];
-+            if (preg_match('/^@/', $content) && ($tokens[$tag]['line'] === $tokens[$tag + 2]['line'])) {
-+                $noAlignmentPositions[] = $tokens[$tag + 1]['column'] + 1;
-+                $actualPositions[] = $tokens[$tag + 2]['column'];
-+                $stackPtr = $stackPtr ?? $tag;
-+            }
-+        }
-+
-+        if (!$this->allTagsAligned($actualPositions)
-+            && !$this->noneTagsAligned($actualPositions, $noAlignmentPositions)) {
-+            $phpcsFile->addFixableError(
-+                'Tags visual alignment must be consistent',
-+                $stackPtr,
-+                'MethodArguments'
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Check whether all docblock params are aligned.
-+     *
-+     * @param array $actualPositions
-+     * @return bool
-+     */
-+    private function allTagsAligned(array $actualPositions): bool
-+    {
-+        return count(array_unique($actualPositions)) === 1;
-+    }
-+
-+    /**
-+     * Check whether all docblock params are not aligned.
-+     *
-+     * @param array $actualPositions
-+     * @param array $noAlignmentPositions
-+     * @return bool
-+     */
-+    private function noneTagsAligned(array $actualPositions, array $noAlignmentPositions): bool
-+    {
-+        return $actualPositions === $noAlignmentPositions;
-+    }
-+
-+    /**
-+     * Validates extra newline before short description
-+     *
-+     * @param File $phpcsFile
-+     * @param int $commentStartPtr
-+     * @param int $commentEndPtr
-+     * @param array $emptyTypeTokens
-+     */
-+    private function validateNoExtraNewLineBeforeShortDescription(
-+        File $phpcsFile,
-+        int $commentStartPtr,
-+        int $commentEndPtr,
-+        array $emptyTypeTokens
-+    ): void {
-+        $tokens = $phpcsFile->getTokens();
-+        $prevPtr = $phpcsFile->findPrevious($emptyTypeTokens, $commentEndPtr - 1, $commentStartPtr, true);
-+        if ($tokens[$prevPtr]['line'] < ($tokens[$commentEndPtr]['line'] - 1)) {
-+            $error = 'Additional blank lines found at end of the annotation block';
-+            $phpcsFile->addFixableError($error, $commentEndPtr, 'MethodAnnotation');
-+        }
-+    }
-+
-+    /**
-+     * Validates structure description format
-+     *
-+     * @param File $phpcsFile
-+     * @param int $commentStartPtr
-+     * @param int $shortPtr
-+     * @param int $commentEndPtr
-+     * @param array $emptyTypeTokens
-+     */
-+    public function validateDescriptionFormatStructure(
-+        File $phpcsFile,
-+        int $commentStartPtr,
-+        int $shortPtr,
-+        int $commentEndPtr,
-+        array $emptyTypeTokens
-+    ): void {
-+        $tokens = $phpcsFile->getTokens();
-+        if (isset($tokens[$commentStartPtr]['comment_tags'][0])
-+        ) {
-+            $commentTagPtr = $tokens[$commentStartPtr]['comment_tags'][0];
-+            $commentTagPtrContent = $tokens[$commentTagPtr]['content'];
-+            if ($tokens[$shortPtr]['code'] !== T_DOC_COMMENT_STRING
-+                && strtolower($commentTagPtrContent) !== '@inheritdoc'
-+            ) {
-+                $error = 'Missing short description';
-+                $phpcsFile->addFixableError($error, $commentStartPtr, 'MethodAnnotation');
-+            } else {
-+                $this->validateShortDescriptionFormat(
-+                    $phpcsFile,
-+                    (int)$shortPtr,
-+                    (int)$commentStartPtr,
-+                    (int)$commentEndPtr,
-+                    $emptyTypeTokens
-+                );
-+            }
-+        } else {
-+            $this->validateShortDescriptionFormat(
-+                $phpcsFile,
-+                (int)$shortPtr,
-+                $commentStartPtr,
-+                $commentEndPtr,
-+                $emptyTypeTokens
-+            );
-+        }
-+    }
-+}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php
-new file mode 100644
-index 00000000000..43df5658bbe
---- /dev/null
-+++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php
-@@ -0,0 +1,125 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+namespace Magento\Sniffs\Annotation;
-+
-+use PHP_CodeSniffer\Sniffs\Sniff;
-+use PHP_CodeSniffer\Files\File;
-+
-+/**
-+ * Sniff to validate structure of class, interface annotations
-+ */
-+class ClassAnnotationStructureSniff implements Sniff
-+{
-+    /**
-+     * @var AnnotationFormatValidator
-+     */
-+    private $annotationFormatValidator;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function register()
-+    {
-+        return [
-+            T_CLASS
-+        ];
-+    }
-+
-+    /**
-+     * AnnotationStructureSniff constructor.
-+     */
-+    public function __construct()
-+    {
-+        $this->annotationFormatValidator = new AnnotationFormatValidator();
-+    }
-+
-+    /**
-+     * Validates whether annotation block exists for interface, abstract or final classes
-+     *
-+     * @param File $phpcsFile
-+     * @param int $previousCommentClosePtr
-+     * @param int $stackPtr
-+     */
-+    private function validateInterfaceOrAbstractOrFinalClassAnnotationBlockExists(
-+        File $phpcsFile,
-+        int $previousCommentClosePtr,
-+        int $stackPtr
-+    ) : void {
-+        $tokens = $phpcsFile->getTokens();
-+        if ($tokens[$stackPtr]['type'] === 'T_CLASS') {
-+            if ($tokens[$stackPtr - 2]['type'] === 'T_ABSTRACT' &&
-+                $tokens[$stackPtr - 4]['content'] != $tokens[$previousCommentClosePtr]['content']
-+            ) {
-+                $error = 'Interface or abstract class is missing annotation block';
-+                $phpcsFile->addFixableError($error, $stackPtr, 'ClassAnnotation');
-+            }
-+            if ($tokens[$stackPtr - 2]['type'] === 'T_FINAL' &&
-+                $tokens[$stackPtr - 4]['content'] != $tokens[$previousCommentClosePtr]['content']
-+            ) {
-+                $error = 'Final class is missing annotation block';
-+                $phpcsFile->addFixableError($error, $stackPtr, 'ClassAnnotation');
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Validates whether annotation block exists
-+     *
-+     * @param File $phpcsFile
-+     * @param int $previousCommentClosePtr
-+     * @param int $stackPtr
-+     */
-+    private function validateAnnotationBlockExists(File $phpcsFile, int $previousCommentClosePtr, int $stackPtr) : void
-+    {
-+        $tokens = $phpcsFile->getTokens();
-+        $this->validateInterfaceOrAbstractOrFinalClassAnnotationBlockExists(
-+            $phpcsFile,
-+            $previousCommentClosePtr,
-+            $stackPtr
-+        );
-+        if ($tokens[$stackPtr - 2]['content'] != 'class' && $tokens[$stackPtr - 2]['content'] != 'abstract'
-+            && $tokens[$stackPtr - 2]['content'] != 'final'
-+            && $tokens[$stackPtr - 2]['content'] !== $tokens[$previousCommentClosePtr]['content']
-+        ) {
-+            $error = 'Class is missing annotation block';
-+            $phpcsFile->addFixableError($error, $stackPtr, 'ClassAnnotation');
-+        }
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function process(File $phpcsFile, $stackPtr)
-+    {
-+        $tokens = $phpcsFile->getTokens();
-+        $previousCommentClosePtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, $stackPtr - 1, 0);
-+        if (!$previousCommentClosePtr) {
-+            $phpcsFile->addError('Comment block is missing', $stackPtr -1, 'MethodArguments');
-+            return;
-+        }
-+        $this->validateAnnotationBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr);
-+        $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr - 1, 0);
-+        $commentCloserPtr = $tokens[$commentStartPtr]['comment_closer'];
-+        $emptyTypeTokens = [
-+            T_DOC_COMMENT_WHITESPACE,
-+            T_DOC_COMMENT_STAR
-+        ];
-+        $shortPtr = $phpcsFile->findNext($emptyTypeTokens, $commentStartPtr +1, $commentCloserPtr, true);
-+        if ($shortPtr === false) {
-+            $error = 'Annotation block is empty';
-+            $phpcsFile->addError($error, $commentStartPtr, 'MethodAnnotation');
-+        } else {
-+            $this->annotationFormatValidator->validateDescriptionFormatStructure(
-+                $phpcsFile,
-+                $commentStartPtr,
-+                (int) $shortPtr,
-+                $previousCommentClosePtr,
-+                $emptyTypeTokens
-+            );
-+        }
-+    }
-+}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodAnnotationStructureSniff.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodAnnotationStructureSniff.php
-new file mode 100644
-index 00000000000..3df07533494
---- /dev/null
-+++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodAnnotationStructureSniff.php
-@@ -0,0 +1,86 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Sniffs\Annotation;
-+
-+use PHP_CodeSniffer\Files\File;
-+use PHP_CodeSniffer\Sniffs\Sniff;
-+
-+/**
-+ * Sniff to validate structure of public, private, protected method annotations
-+ */
-+class MethodAnnotationStructureSniff implements Sniff
-+{
-+    /**
-+     * @var AnnotationFormatValidator
-+     */
-+    private $annotationFormatValidator;
-+
-+    /**
-+     * AnnotationStructureSniff constructor.
-+     */
-+    public function __construct()
-+    {
-+        $this->annotationFormatValidator = new AnnotationFormatValidator();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function register()
-+    {
-+        return [
-+            T_FUNCTION
-+        ];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function process(File $phpcsFile, $stackPtr)
-+    {
-+        $tokens = $phpcsFile->getTokens();
-+        $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, ($stackPtr), 0);
-+        $commentEndPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, ($stackPtr), 0);
-+        if (!$commentStartPtr) {
-+            $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
-+            return;
-+        }
-+        $commentCloserPtr = $tokens[$commentStartPtr]['comment_closer'];
-+        $functionPtrContent = $tokens[$stackPtr + 2]['content'];
-+        if (preg_match('/(?i)__construct/', $functionPtrContent)) {
-+            return;
-+        }
-+        $emptyTypeTokens = [
-+            T_DOC_COMMENT_WHITESPACE,
-+            T_DOC_COMMENT_STAR
-+        ];
-+        $shortPtr = $phpcsFile->findNext($emptyTypeTokens, $commentStartPtr + 1, $commentCloserPtr, true);
-+        if ($shortPtr === false) {
-+            $error = 'Annotation block is empty';
-+            $phpcsFile->addError($error, $commentStartPtr, 'MethodAnnotation');
-+        } else {
-+            $this->annotationFormatValidator->validateDescriptionFormatStructure(
-+                $phpcsFile,
-+                $commentStartPtr,
-+                (int)$shortPtr,
-+                $commentEndPtr,
-+                $emptyTypeTokens
-+            );
-+            if (empty($tokens[$commentStartPtr]['comment_tags'])) {
-+                return;
-+            }
-+            $this->annotationFormatValidator->validateTagsSpacingFormat(
-+                $phpcsFile,
-+                $commentStartPtr,
-+                $emptyTypeTokens
-+            );
-+            $this->annotationFormatValidator->validateTagGroupingFormat($phpcsFile, $commentStartPtr);
-+            $this->annotationFormatValidator->validateTagAligningFormat($phpcsFile, $commentStartPtr);
-+        }
-+    }
-+}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodArgumentsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodArgumentsSniff.php
-index 879334d8c55..9bc90ff883a 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodArgumentsSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodArgumentsSniff.php
-@@ -3,13 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--
- declare(strict_types=1);
- 
- namespace Magento\Sniffs\Annotation;
- 
--use PHP_CodeSniffer\Sniffs\Sniff;
- use PHP_CodeSniffer\Files\File;
-+use PHP_CodeSniffer\Sniffs\Sniff;
- 
- /**
-  * Sniff to validate method arguments annotations
-@@ -42,7 +41,7 @@ class MethodArgumentsSniff implements Sniff
-     /**
-      * @inheritdoc
-      */
--    public function register() : array
-+    public function register(): array
-     {
-         return [
-             T_FUNCTION
-@@ -55,7 +54,7 @@ class MethodArgumentsSniff implements Sniff
-      * @param string $type
-      * @return bool
-      */
--    private function isTokenBeforeClosingCommentTagValid(string $type) : bool
-+    private function isTokenBeforeClosingCommentTagValid(string $type): bool
-     {
-         return in_array($type, $this->validTokensBeforeClosingCommentTag);
-     }
-@@ -68,7 +67,7 @@ class MethodArgumentsSniff implements Sniff
-      * @param int $stackPtr
-      * @return bool
-      */
--    private function validateCommentBlockExists(File $phpcsFile, int $previousCommentClosePtr, int $stackPtr) : bool
-+    private function validateCommentBlockExists(File $phpcsFile, int $previousCommentClosePtr, int $stackPtr): bool
-     {
-         $tokens = $phpcsFile->getTokens();
-         for ($tempPtr = $previousCommentClosePtr + 1; $tempPtr < $stackPtr; $tempPtr++) {
-@@ -85,7 +84,7 @@ class MethodArgumentsSniff implements Sniff
-      * @param string $type
-      * @return bool
-      */
--    private function isInvalidType(string $type) : bool
-+    private function isInvalidType(string $type): bool
-     {
-         return in_array(strtolower($type), $this->invalidTypes);
-     }
-@@ -98,7 +97,7 @@ class MethodArgumentsSniff implements Sniff
-      * @param int $closedParenthesisPtr
-      * @return array
-      */
--    private function getMethodArguments(File $phpcsFile, int $openParenthesisPtr, int $closedParenthesisPtr) : array
-+    private function getMethodArguments(File $phpcsFile, int $openParenthesisPtr, int $closedParenthesisPtr): array
-     {
-         $tokens = $phpcsFile->getTokens();
-         $methodArguments = [];
-@@ -121,12 +120,12 @@ class MethodArgumentsSniff implements Sniff
-      * @param array $paramDefinitions
-      * @return array
-      */
--    private function getMethodParameters(array $paramDefinitions) : array
-+    private function getMethodParameters(array $paramDefinitions): array
-     {
-         $paramName = [];
--        for ($i = 0; $i < count($paramDefinitions); $i++) {
--            if (isset($paramDefinitions[$i]['paramName'])) {
--                $paramName[] = $paramDefinitions[$i]['paramName'];
-+        foreach ($paramDefinitions as $paramDefinition) {
-+            if (isset($paramDefinition['paramName'])) {
-+                $paramName[] = $paramDefinition['paramName'];
-             }
-         }
-         return $paramName;
-@@ -143,7 +142,7 @@ class MethodArgumentsSniff implements Sniff
-         File $phpcsFile,
-         int $previousCommentOpenPtr,
-         int $previousCommentClosePtr
--    ) : bool {
-+    ): bool {
-         return $this->validateInheritdocAnnotationExists(
-             $phpcsFile,
-             $previousCommentOpenPtr,
-@@ -163,7 +162,7 @@ class MethodArgumentsSniff implements Sniff
-         File $phpcsFile,
-         int $previousCommentOpenPtr,
-         int $previousCommentClosePtr
--    ) : bool {
-+    ): bool {
-         return $this->validateInheritdocAnnotationExists(
-             $phpcsFile,
-             $previousCommentOpenPtr,
-@@ -186,7 +185,7 @@ class MethodArgumentsSniff implements Sniff
-         int $previousCommentOpenPtr,
-         int $previousCommentClosePtr,
-         string $inheritdocAnnotation
--    ) : bool {
-+    ): bool {
-         $tokens = $phpcsFile->getTokens();
-         for ($ptr = $previousCommentOpenPtr; $ptr < $previousCommentClosePtr; $ptr++) {
-             if (strtolower($tokens[$ptr]['content']) === $inheritdocAnnotation) {
-@@ -213,7 +212,7 @@ class MethodArgumentsSniff implements Sniff
-         int $previousCommentOpenPtr,
-         int $previousCommentClosePtr,
-         int $stackPtr
--    ) : void {
-+    ): void {
-         if ($argumentsCount > 0 && $parametersCount === 0) {
-             $inheritdocAnnotationWithoutBracesExists = $this->validateInheritdocAnnotationWithoutBracesExists(
-                 $phpcsFile,
-@@ -256,7 +255,7 @@ class MethodArgumentsSniff implements Sniff
-         int $argumentsCount,
-         int $parametersCount,
-         int $stackPtr
--    ) : void {
-+    ): void {
-         if ($argumentsCount < $parametersCount && $argumentsCount > 0) {
-             $phpcsFile->addFixableError(
-                 'Extra @param found in method annotation',
-@@ -287,10 +286,10 @@ class MethodArgumentsSniff implements Sniff
-         File $phpcsFile,
-         array $methodArguments,
-         array $paramDefinitions
--    ) : void {
-+    ): void {
-         $parameterNames = $this->getMethodParameters($paramDefinitions);
-         if (!in_array($methodArguments[$ptr], $parameterNames)) {
--            $error = $methodArguments[$ptr]. ' parameter is missing in method annotation';
-+            $error = $methodArguments[$ptr] . ' parameter is missing in method annotation';
-             $phpcsFile->addFixableError($error, $stackPtr, 'MethodArguments');
-         }
-     }
-@@ -310,7 +309,7 @@ class MethodArgumentsSniff implements Sniff
-         array $methodArguments,
-         File $phpcsFile,
-         array $paramPointers
--    ) : void {
-+    ): void {
-         if (!in_array($paramDefinitionsArguments, $methodArguments)) {
-             $phpcsFile->addFixableError(
-                 $paramDefinitionsArguments . ' parameter is missing in method arguments signature',
-@@ -333,7 +332,7 @@ class MethodArgumentsSniff implements Sniff
-         array $methodArguments,
-         File $phpcsFile,
-         array $paramPointers
--    ) : void {
-+    ): void {
-         $parameterNames = $this->getMethodParameters($paramDefinitions);
-         $paramDefinitionsCount = count($paramDefinitions);
-         for ($ptr = 0; $ptr < $paramDefinitionsCount; $ptr++) {
-@@ -342,7 +341,7 @@ class MethodArgumentsSniff implements Sniff
-             ) {
-                 if ($methodArguments[$ptr] != $parameterNames[$ptr]) {
-                     $phpcsFile->addFixableError(
--                        $methodArguments[$ptr].' parameter is not in order',
-+                        $methodArguments[$ptr] . ' parameter is not in order',
-                         $paramPointers[$ptr],
-                         'MethodArguments'
-                     );
-@@ -366,17 +365,17 @@ class MethodArgumentsSniff implements Sniff
-         array $paramPointers,
-         File $phpcsFile,
-         array $methodArguments
--    ) : void {
-+    ): void {
-         $argumentsCount = count($methodArguments);
-         $parametersCount = count($paramPointers);
-         if ($argumentsCount <= $parametersCount && $argumentsCount > 0) {
-             $duplicateParameters = [];
--            for ($i = 0; $i < sizeof($paramDefinitions); $i++) {
--                if (isset($paramDefinitions[$i]['paramName'])) {
--                    $parameterContent = $paramDefinitions[$i]['paramName'];
--                    for ($j = $i + 1; $j < count($paramDefinitions); $j++) {
--                        if (isset($paramDefinitions[$j]['paramName'])
--                            && $parameterContent === $paramDefinitions[$j]['paramName']
-+            foreach ($paramDefinitions as $i => $paramDefinition) {
-+                if (isset($paramDefinition['paramName'])) {
-+                    $parameterContent = $paramDefinition['paramName'];
-+                    foreach (array_slice($paramDefinitions, $i + 1) as $nextParamDefinition) {
-+                        if (isset($nextParamDefinition['paramName'])
-+                            && $parameterContent === $nextParamDefinition['paramName']
-                         ) {
-                             $duplicateParameters[] = $parameterContent;
-                         }
-@@ -408,7 +407,7 @@ class MethodArgumentsSniff implements Sniff
-         array $methodArguments,
-         array $paramDefinitions,
-         array $paramPointers
--    ) : void {
-+    ): void {
-         switch (count($paramDefinitions)) {
-             case 0:
-                 $phpcsFile->addFixableError(
-@@ -429,7 +428,7 @@ class MethodArgumentsSniff implements Sniff
-             case 2:
-                 if ($this->isInvalidType($paramDefinitions[0])) {
-                     $phpcsFile->addFixableError(
--                        $paramDefinitions[0].' is not a valid PHP type',
-+                        $paramDefinitions[0] . ' is not a valid PHP type',
-                         $paramPointers[$ptr],
-                         'MethodArguments'
-                     );
-@@ -451,7 +450,7 @@ class MethodArgumentsSniff implements Sniff
-                     );
-                     if ($this->isInvalidType($paramDefinitions[0])) {
-                         $phpcsFile->addFixableError(
--                            $paramDefinitions[0].' is not a valid PHP type',
-+                            $paramDefinitions[0] . ' is not a valid PHP type',
-                             $paramPointers[$ptr],
-                             'MethodArguments'
-                         );
-@@ -471,6 +470,8 @@ class MethodArgumentsSniff implements Sniff
-      * @param array $methodArguments
-      * @param int $previousCommentOpenPtr
-      * @param int $previousCommentClosePtr
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      */
-     private function validateMethodParameterAnnotations(
-         int $stackPtr,
-@@ -480,7 +481,7 @@ class MethodArgumentsSniff implements Sniff
-         array $methodArguments,
-         int $previousCommentOpenPtr,
-         int $previousCommentClosePtr
--    ) : void {
-+    ): void {
-         $argumentCount = count($methodArguments);
-         $paramCount = count($paramPointers);
-         $this->validateParameterAnnotationForArgumentExists(
-@@ -510,8 +511,15 @@ class MethodArgumentsSniff implements Sniff
-             $phpcsFile,
-             $paramPointers
-         );
--        for ($ptr = 0; $ptr < count($methodArguments); $ptr++) {
--            $tokens = $phpcsFile->getTokens();
-+        $this->validateFormattingConsistency(
-+            $paramDefinitions,
-+            $methodArguments,
-+            $phpcsFile,
-+            $paramPointers
-+        );
-+        $tokens = $phpcsFile->getTokens();
-+
-+        foreach ($methodArguments as $ptr => $methodArgument) {
-             if (isset($paramPointers[$ptr])) {
-                 $this->validateArgumentNameInParameterAnnotationExists(
-                     $stackPtr,
-@@ -520,7 +528,7 @@ class MethodArgumentsSniff implements Sniff
-                     $methodArguments,
-                     $paramDefinitions
-                 );
--                $paramContent = $tokens[$paramPointers[$ptr]+2]['content'];
-+                $paramContent = $tokens[$paramPointers[$ptr] + 2]['content'];
-                 $paramContentExplode = explode(' ', $paramContent);
-                 $this->validateParameterAnnotationFormatIsCorrect(
-                     $ptr,
-@@ -540,36 +548,44 @@ class MethodArgumentsSniff implements Sniff
-     {
-         $tokens = $phpcsFile->getTokens();
-         $numTokens = count($tokens);
--        $previousCommentOpenPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr-1, 0);
--        $previousCommentClosePtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, $stackPtr-1, 0);
--        if (!$this->validateCommentBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr)) {
--            $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
-+        $previousCommentOpenPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr - 1, 0);
-+        $previousCommentClosePtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, $stackPtr - 1, 0);
-+        if ($previousCommentClosePtr && $previousCommentOpenPtr) {
-+            if (!$this->validateCommentBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr)) {
-+                $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
-+                return;
-+            }
-+        } else {
-             return;
-         }
--        $openParenthesisPtr = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $stackPtr+1, $numTokens);
--        $closedParenthesisPtr = $phpcsFile->findNext(T_CLOSE_PARENTHESIS, $stackPtr+1, $numTokens);
-+        $openParenthesisPtr = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $stackPtr + 1, $numTokens);
-+        $closedParenthesisPtr = $phpcsFile->findNext(T_CLOSE_PARENTHESIS, $stackPtr + 1, $numTokens);
-         $methodArguments = $this->getMethodArguments($phpcsFile, $openParenthesisPtr, $closedParenthesisPtr);
-         $paramPointers = $paramDefinitions = [];
-         for ($tempPtr = $previousCommentOpenPtr; $tempPtr < $previousCommentClosePtr; $tempPtr++) {
-             if (strtolower($tokens[$tempPtr]['content']) === '@param') {
-                 $paramPointers[] = $tempPtr;
--                $paramAnnotationParts = explode(' ', $tokens[$tempPtr+2]['content']);
-+                $content = preg_replace('/\s+/', ' ', $tokens[$tempPtr + 2]['content'], 2);
-+                $paramAnnotationParts = explode(' ', $content, 3);
-                 if (count($paramAnnotationParts) === 1) {
-                     if ((preg_match('/^\$.*/', $paramAnnotationParts[0]))) {
-                         $paramDefinitions[] = [
-                             'type' => null,
--                            'paramName' => rtrim(ltrim($tokens[$tempPtr+2]['content'], '&'), ',')
-+                            'paramName' => rtrim(ltrim($tokens[$tempPtr + 2]['content'], '&'), ','),
-+                            'comment' => null
-                         ];
-                     } else {
-                         $paramDefinitions[] = [
--                            'type' => $tokens[$tempPtr+2]['content'],
--                            'paramName' => null
-+                            'type' => $tokens[$tempPtr + 2]['content'],
-+                            'paramName' => null,
-+                            'comment' => null
-                         ];
-                     }
-                 } else {
-                     $paramDefinitions[] = [
-                         'type' => $paramAnnotationParts[0],
--                        'paramName' => rtrim(ltrim($paramAnnotationParts[1], '&'), ',')
-+                        'paramName' => rtrim(ltrim($paramAnnotationParts[1], '&'), ','),
-+                        'comment' => $paramAnnotationParts[2] ?? null,
-                     ];
-                 }
-             }
-@@ -584,4 +600,85 @@ class MethodArgumentsSniff implements Sniff
-             $previousCommentClosePtr
-         );
-     }
-+
-+    /**
-+     * Validates function params format consistency.
-+     *
-+     * @param array $paramDefinitions
-+     * @param array $methodArguments
-+     * @param File $phpcsFile
-+     * @param array $paramPointers
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-+     *
-+     * @see https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#format-consistency
-+     */
-+    private function validateFormattingConsistency(
-+        array $paramDefinitions,
-+        array $methodArguments,
-+        File $phpcsFile,
-+        array $paramPointers
-+    ): void {
-+        $argumentPositions = [];
-+        $commentPositions = [];
-+        $tokens = $phpcsFile->getTokens();
-+        foreach ($methodArguments as $ptr => $methodArgument) {
-+            if (isset($paramPointers[$ptr])) {
-+                $paramContent = $tokens[$paramPointers[$ptr] + 2]['content'];
-+                $paramDefinition = $paramDefinitions[$ptr];
-+                $argumentPositions[] = strpos($paramContent, $paramDefinition['paramName']);
-+                $commentPositions[] = $paramDefinition['comment']
-+                    ? strrpos($paramContent, $paramDefinition['comment']) : null;
-+            }
-+        }
-+        if (!$this->allParamsAligned($argumentPositions, $commentPositions)
-+            && !$this->noneParamsAligned($argumentPositions, $commentPositions, $paramDefinitions)) {
-+            $phpcsFile->addFixableError(
-+                'Method arguments visual alignment must be consistent',
-+                $paramPointers[0],
-+                'MethodArguments'
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Check all params are aligned.
-+     *
-+     * @param array $argumentPositions
-+     * @param array $commentPositions
-+     * @return bool
-+     */
-+    private function allParamsAligned(array $argumentPositions, array $commentPositions): bool
-+    {
-+        return count(array_unique($argumentPositions)) === 1
-+            && count(array_unique(array_filter($commentPositions))) <= 1;
-+    }
-+
-+    /**
-+     * Check none of params are aligned.
-+     *
-+     * @param array $argumentPositions
-+     * @param array $commentPositions
-+     * @param array $paramDefinitions
-+     * @return bool
-+     */
-+    private function noneParamsAligned(array $argumentPositions, array $commentPositions, array $paramDefinitions): bool
-+    {
-+        $flag = true;
-+        foreach ($argumentPositions as $index => $argumentPosition) {
-+            $commentPosition = $commentPositions[$index];
-+            $type = $paramDefinitions[$index]['type'];
-+            if ($type === null) {
-+                continue;
-+            }
-+            $paramName = $paramDefinitions[$index]['paramName'];
-+            if (($argumentPosition !== strlen($type) + 1) ||
-+                (isset($commentPosition) && ($commentPosition !== $argumentPosition + strlen($paramName) + 1))) {
-+                $flag = false;
-+                break;
-+            }
-+        }
-+
-+        return $flag;
-+    }
- }
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php b/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php
-deleted file mode 100644
-index 9013f12b6b4..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php
-+++ /dev/null
-@@ -1,32 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\Arrays;
--
--use PHP_CodeSniffer\Sniffs\Sniff;
--use PHP_CodeSniffer\Files\File;
--
--class ShortArraySyntaxSniff implements Sniff
--{
--    /**
--     * {@inheritdoc}
--     */
--    public function register()
--    {
--        return [T_ARRAY];
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function process(File $sourceFile, $stackPtr)
--    {
--        $sourceFile->addError(
--            'Short array syntax must be used; expected "[]" but found "array()"',
--            $stackPtr,
--            'ShortArraySyntax'
--        );
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php b/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php
-deleted file mode 100644
-index 694905cb37a..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php
-+++ /dev/null
-@@ -1,44 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\EchoTags;
--
--use PHP_CodeSniffer\Sniffs\Sniff;
--use PHP_CodeSniffer\Files\File;
--use PHP_CodeSniffer\Util\Tokens;
--
--class ShortEchoSyntaxSniff implements Sniff
--{
--    /**
--     * {@inheritdoc}
--     */
--    public function register()
--    {
--        return [T_OPEN_TAG];
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function process(File $phpcsFile, $stackPtr)
--    {
--        $tokens  = $phpcsFile->getTokens();
--        $openTag = $tokens[$stackPtr];
--
--        // HHVM Will classify <?= as a T_OPEN_TAG
--        if ($openTag['content'] === '<?=') {
--            return;
--        }
--
--        $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
--        if ($tokens[$nextToken]['code'] == T_ECHO) {
--            $phpcsFile->addError(
--                'Short echo tag syntax must be used; expected "<?=" but found "<?php echo"',
--                $stackPtr,
--                'ShortEchoTag'
--            );
--        }
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php b/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php
-deleted file mode 100644
-index 2abcf0531b0..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php
-+++ /dev/null
-@@ -1,36 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\Files;
--
--use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff as FilesLineLengthSniff;
--
--/**
-- * Line length sniff which ignores long lines in case they contain strings intended for translation.
-- */
--class LineLengthSniff extends FilesLineLengthSniff
--{
--    /**
--     * Having previous line content allows to ignore long lines in case of multi-line declaration.
--     *
--     * @var string
--     */
--    protected $previousLineContent = '';
--
--    /**
--     * {@inheritdoc}
--     */
--    protected function checkLineLength($phpcsFile, $stackPtr, $lineContent)
--    {
--        $previousLineRegexp = '~__\($|\bPhrase\($~';
--        $currentLineRegexp = '~__\(.+\)|\bPhrase\(.+\)~';
--        $currentLineMatch = preg_match($currentLineRegexp, $lineContent) !== 0;
--        $previousLineMatch = preg_match($previousLineRegexp, $this->previousLineContent) !== 0;
--        $this->previousLineContent = $lineContent;
--        if (! $currentLineMatch && !$previousLineMatch) {
--            parent::checkLineLength($phpcsFile, $stackPtr, $lineContent);
--        }
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Functions/OutputBufferingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Functions/OutputBufferingSniff.php
-deleted file mode 100644
-index d2bf2de418c..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/Functions/OutputBufferingSniff.php
-+++ /dev/null
-@@ -1,31 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Sniffs\Functions;
--
--/**
-- * Sniff prohibiting usage of output buffering functions.
-- */
--class OutputBufferingSniff extends \PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\ForbiddenFunctionsSniff
--{
--    public $forbiddenFunctions = ['ob_start' => null];
--
--    /**
--     * @inheritdoc
--     */
--    protected function addError($phpcsFile, $stackPtr, $function, $pattern = null)
--    {
--        $data = [$function];
--        $error = 'The usage of %s() is forbidden';
--        $type = 'Found';
--
--        if ($this->error === true) {
--            $phpcsFile->addError($error, $stackPtr, $type, $data);
--        } else {
--            $phpcsFile->addWarning($error, $stackPtr, $type, $data);
--        }
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/LanguageConstructs/LanguageConstructsSniff.php b/dev/tests/static/framework/Magento/Sniffs/LanguageConstructs/LanguageConstructsSniff.php
-deleted file mode 100644
-index a3a49adf62a..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/LanguageConstructs/LanguageConstructsSniff.php
-+++ /dev/null
-@@ -1,77 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\LanguageConstructs;
--
--use PHP_CodeSniffer\Sniffs\Sniff;
--use PHP_CodeSniffer\Files\File;
--
--/**
-- * Detects possible usage of discouraged language constructs. Is not applicable to *.phtml files.
-- *
-- * Examples:
-- * echo 'echo text';
-- * print('print text');
-- * $string = `back quotes`;
-- */
--class LanguageConstructsSniff implements Sniff
--{
--    /**
--     * String representation of error.
--     *
--     * @var string
--     */
--    protected $errorMessage = 'Use of %s language construct is discouraged.';
--
--    /**
--     * String representation of backtick error.
--     *
--     * @var string
--     */
--    // @codingStandardsIgnoreLine
--    protected $errorMessageBacktick = 'Incorrect usage of back quote string constant. Back quotes should be always inside strings.';
--
--    /**
--     * Backtick violation code.
--     *
--     * @var string
--     */
--    protected $backtickCode = 'WrongBackQuotesUsage';
--
--    /**
--     * Direct output code.
--     *
--     * @var string
--     */
--    protected $directOutput = 'DirectOutput';
--
--    /**
--     * {@inheritdoc}
--     */
--    public function register()
--    {
--        return [
--            T_ECHO,
--            T_PRINT,
--            T_BACKTICK,
--        ];
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function process(File $phpcsFile, $stackPtr)
--    {
--        $tokens = $phpcsFile->getTokens();
--        if ($tokens[$stackPtr]['code'] === T_BACKTICK) {
--            if ($phpcsFile->findNext(T_BACKTICK, $stackPtr + 1)) {
--                return;
--            }
--            $phpcsFile->addError($this->errorMessageBacktick, $stackPtr, $this->backtickCode);
--            return;
--        }
--        $phpcsFile->addError($this->errorMessage, $stackPtr, $this->directOutput, [$tokens[$stackPtr]['content']]);
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php
-index f9cec6404dc..4f94e335e03 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php
-@@ -13,8 +13,7 @@ use PHP_CodeSniffer\Files\File;
-  *
-  * Ensure that id selector is not used
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#types
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#types
-  */
- class AvoidIdSniff implements Sniff
- {
-@@ -26,15 +25,36 @@ class AvoidIdSniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
-+     * Tokens that can appear in a selector
-+     *
-      * @var array
-      */
--    private $symbolsBeforeId = [
--        TokenizerSymbolsInterface::INDENT_SPACES,
--        TokenizerSymbolsInterface::NEW_LINE,
-+    private $selectorTokens = [
-+        T_HASH,
-+        T_WHITESPACE,
-+        T_STRING_CONCAT,
-+        T_OPEN_PARENTHESIS,
-+        T_CLOSE_PARENTHESIS,
-+        T_OPEN_SQUARE_BRACKET,
-+        T_CLOSE_SQUARE_BRACKET,
-+        T_DOUBLE_QUOTED_STRING,
-+        T_CONSTANT_ENCAPSED_STRING,
-+        T_DOUBLE_COLON,
-+        T_COLON,
-+        T_EQUAL,
-+        T_MUL_EQUAL,
-+        T_OR_EQUAL,
-+        T_STRING,
-+        T_NONE,
-+        T_DOLLAR,
-+        T_GREATER_THAN,
-+        T_PLUS,
-+        T_NS_SEPARATOR,
-+        T_LNUMBER,
-     ];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -42,15 +62,38 @@ class AvoidIdSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-+     * Will flag any selector that looks like the following:
-+     * #foo[bar],
-+     * #foo[bar=bash],
-+     * #foo[bar~=bash],
-+     * #foo[bar$=bash],
-+     * #foo[bar*=bash],
-+     * #foo[bar|=bash],
-+     * #foo[bar='bash'],
-+     * #foo:hover,
-+     * #foo:nth-last-of-type(n),
-+     * #foo::before,
-+     * #foo + div,
-+     * #foo > div,
-+     * #foo ~ div,
-+     * #foo\3Abar ~ div,
-+     * #foo\:bar ~ div,
-+     * #foo.bar .baz,
-+     * div#foo {
-+     *     blah: 'abc';
-+     * }
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-         $tokens = $phpcsFile->getTokens();
- 
--        if (T_WHITESPACE === $tokens[$stackPtr - 1]['code']
--            && in_array($tokens[$stackPtr - 1]['content'], $this->symbolsBeforeId)
--        ) {
-+        // Find the next non-selector token
-+        $nextToken = $phpcsFile->findNext($this->selectorTokens, $stackPtr + 1, null, true);
-+
-+        // Anything except a { or a , means this is not a selector
-+        if ($nextToken !== false && in_array($tokens[$nextToken]['code'], [T_OPEN_CURLY_BRACKET, T_COMMA])) {
-             $phpcsFile->addError('Id selector is used', $stackPtr, 'IdSelectorUsage');
-         }
-     }
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php
-index 435eea118af..61e2e69eeb8 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php
-@@ -15,7 +15,7 @@ use PHP_CodeSniffer\Util\Tokens;
-  * Ensure there is a single blank line after the closing brace of a class definition
-  *
-  * @see Squiz_Sniffs_CSS_ClassDefinitionClosingBraceSpaceSniff
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#braces
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#braces
-  */
- class BracesFormattingSniff implements Sniff
- {
-@@ -27,7 +27,7 @@ class BracesFormattingSniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -35,7 +35,7 @@ class BracesFormattingSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
-index 798c13ff269..8c55edc13af 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
-@@ -17,8 +17,7 @@ use PHP_CodeSniffer\Files\File;
-  * - start with a letter (except helper classes);
-  * - words should be separated with dash '-';
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#standard-classes
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#standard-classes
-  */
- class ClassNamingSniff implements Sniff
- {
-@@ -35,7 +34,7 @@ class ClassNamingSniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -43,7 +42,7 @@ class ClassNamingSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php
-index 39753544cf2..b5f61a64327 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php
-@@ -14,8 +14,7 @@ use PHP_CodeSniffer\Util\Tokens;
-  *
-  * Ensure that single quotes are used
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#properties-colon-indents
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#properties-colon-indents
-  */
- class ColonSpacingSniff implements Sniff
- {
-@@ -27,7 +26,7 @@ class ColonSpacingSniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -35,7 +34,7 @@ class ColonSpacingSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php
-index 83f2e8f5d94..83e3da698f0 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php
-@@ -13,8 +13,7 @@ use PHP_CodeSniffer\Files\File;
-  *
-  * Ensure that hexadecimal values are used for variables not for properties
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#hexadecimal-notation
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#hexadecimal-notation
-  */
- class ColourDefinitionSniff implements Sniff
- {
-@@ -26,7 +25,7 @@ class ColourDefinitionSniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -34,7 +33,7 @@ class ColourDefinitionSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php
-index d27c853ab78..a8ce4cfe547 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php
-@@ -13,8 +13,7 @@ use PHP_CodeSniffer\Files\File;
-  *
-  * Ensure that spaces are used before and after combinators
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#combinator-indents
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#combinator-indents
-  */
- class CombinatorIndentationSniff implements Sniff
- {
-@@ -26,7 +25,7 @@ class CombinatorIndentationSniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -34,7 +33,7 @@ class CombinatorIndentationSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
-index abf15dd3748..41c970d4cb4 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
-@@ -15,8 +15,7 @@ use PHP_CodeSniffer\Files\File;
-  * First, second and third level comments should have two spaces after "//".
-  * Inline comments should have one space after "//".
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#comments
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#comments
-  */
- class CommentLevelsSniff implements Sniff
- {
-@@ -42,7 +41,7 @@ class CommentLevelsSniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -50,7 +49,7 @@ class CommentLevelsSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php
-index 54bd8b70d5c..db03440699f 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php
-@@ -13,8 +13,7 @@ use PHP_CodeSniffer\Files\File;
-  *
-  * Ensure that single quotes are used
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#important-property
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#important-property
-  */
- class ImportantPropertySniff implements Sniff
- {
-@@ -26,7 +25,7 @@ class ImportantPropertySniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -34,7 +33,7 @@ class ImportantPropertySniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php
-index 3ff268acf0c..f0f994131e6 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php
-@@ -14,7 +14,7 @@ use PHP_CodeSniffer\Files\File;
-  * Ensures styles are indented 4 spaces.
-  *
-  * @see Squiz_Sniffs_CSS_IndentationSniff
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#indentation
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#indentation
-  */
- class IndentationSniff implements Sniff
- {
-@@ -46,7 +46,7 @@ class IndentationSniff implements Sniff
-     private $styleCodesToSkip = [T_ASPERAND, T_COLON, T_OPEN_PARENTHESIS, T_CLOSE_PARENTHESIS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -54,7 +54,7 @@ class IndentationSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
-index 3f33d0b2c69..e9bd1f7942e 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
-@@ -13,8 +13,7 @@ use PHP_CodeSniffer\Files\File;
-  *
-  * Start each property declaration in a new line
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#properties-line-break
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#properties-line-break
-  */
- class PropertiesLineBreakSniff implements Sniff
- {
-@@ -26,7 +25,7 @@ class PropertiesLineBreakSniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -34,7 +33,7 @@ class PropertiesLineBreakSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
-index e59b5da37d0..a39974f2b38 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
-@@ -13,8 +13,7 @@ use PHP_CodeSniffer\Files\File;
-  *
-  * Ensure that properties are sorted alphabetically
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#sorting
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#sorting
-  */
- class PropertiesSortingSniff implements Sniff
- {
-@@ -43,7 +42,7 @@ class PropertiesSortingSniff implements Sniff
-     ];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -57,7 +56,7 @@ class PropertiesSortingSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php
-index 92ea5b42065..8127d267704 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php
-@@ -13,8 +13,7 @@ use PHP_CodeSniffer\Files\File;
-  *
-  * Ensure that single quotes are used
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#quotes
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#quotes
-  */
- class QuotesSniff implements Sniff
- {
-@@ -26,7 +25,7 @@ class QuotesSniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -34,7 +33,7 @@ class QuotesSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
-index 46607866698..99b91b63d88 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
-@@ -14,8 +14,7 @@ use PHP_CodeSniffer\Files\File;
-  * Ensure that a line break exists after each selector delimiter.
-  * No spaces should be before or after delimiters.
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#selector-delimiters
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#selector-delimiters
-  */
- class SelectorDelimiterSniff implements Sniff
- {
-@@ -27,7 +26,7 @@ class SelectorDelimiterSniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -35,7 +34,7 @@ class SelectorDelimiterSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-@@ -50,6 +49,8 @@ class SelectorDelimiterSniff implements Sniff
-     }
- 
-     /**
-+     * Parenthesis validation.
-+     *
-      * @param File $phpcsFile
-      * @param int $stackPtr
-      * @param array $tokens
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php
-index c1cd6cde334..de30d9cdbf4 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php
-@@ -13,8 +13,7 @@ use PHP_CodeSniffer\Files\File;
-  *
-  * Property should have a semicolon at the end of line
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#end-of-the-property-line
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#end-of-the-property-line
-  */
- class SemicolonSpacingSniff implements Sniff
- {
-@@ -44,7 +43,7 @@ class SemicolonSpacingSniff implements Sniff
-     private $styleCodesToSkip = [T_ASPERAND, T_COLON, T_OPEN_PARENTHESIS, T_CLOSE_PARENTHESIS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -52,7 +51,7 @@ class SemicolonSpacingSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-@@ -72,6 +71,8 @@ class SemicolonSpacingSniff implements Sniff
-     }
- 
-     /**
-+     * Semicolon validation.
-+     *
-      * @param File $phpcsFile
-      * @param int $stackPtr
-      * @param array $tokens
-@@ -90,6 +91,8 @@ class SemicolonSpacingSniff implements Sniff
-     }
- 
-     /**
-+     * Spaces validation.
-+     *
-      * @param File $phpcsFile
-      * @param int $stackPtr
-      * @param array $tokens
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/TokenizerSymbolsInterface.php b/dev/tests/static/framework/Magento/Sniffs/Less/TokenizerSymbolsInterface.php
-index 9da92913b40..db6a2fe1169 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/TokenizerSymbolsInterface.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/TokenizerSymbolsInterface.php
-@@ -7,7 +7,6 @@ namespace Magento\Sniffs\Less;
- 
- /**
-  * Interface TokenizerSymbolsInterface
-- *
-  */
- interface TokenizerSymbolsInterface
- {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php
-index 88a275baec2..16ebb71c728 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php
-@@ -13,8 +13,7 @@ use PHP_CodeSniffer\Files\File;
-  *
-  * Ensure that selector in one line, concatenation is not used
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#formatting-1
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#formatting-1
-  */
- class TypeSelectorConcatenationSniff implements Sniff
- {
-@@ -34,7 +33,7 @@ class TypeSelectorConcatenationSniff implements Sniff
-     ];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -42,7 +41,7 @@ class TypeSelectorConcatenationSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php
-index 3983cf54e05..3cd0f5d1679 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php
-@@ -18,8 +18,7 @@ use PHP_CodeSniffer\Files\File;
-  * - Type selectors must be lowercase
-  * - Write selector in one line, do not use concatenation
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#selectors-naming
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#selectors-naming
-  */
- class TypeSelectorsSniff implements Sniff
- {
-@@ -56,7 +55,7 @@ class TypeSelectorsSniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -64,7 +63,7 @@ class TypeSelectorsSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php
-index 8a559da88e6..433c256c5bd 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php
-@@ -16,9 +16,8 @@ use PHP_CodeSniffer\Files\File;
-  *   they should be located in the module file, in the beginning of the general comment.
-  * - All variable names must be lowercase
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#local-variables
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#naming
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#local-variables
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#naming
-  */
- class VariablesSniff implements Sniff
- {
-@@ -30,7 +29,7 @@ class VariablesSniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -38,7 +37,7 @@ class VariablesSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
-index 1b4fb53c450..a19a0a8eb70 100644
---- a/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
-+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
-@@ -14,9 +14,8 @@ use PHP_CodeSniffer\Files\File;
-  * Ensure that units for 0 is not specified
-  * Omit leading "0"s in values, use dot instead
-  *
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#and-units
-- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#floating-values
-- *
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#and-units
-+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#floating-values
-  */
- class ZeroUnitsSniff implements Sniff
- {
-@@ -43,7 +42,7 @@ class ZeroUnitsSniff implements Sniff
-     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function register()
-     {
-@@ -51,7 +50,7 @@ class ZeroUnitsSniff implements Sniff
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(File $phpcsFile, $stackPtr)
-     {
-diff --git a/dev/tests/static/framework/Magento/Sniffs/LiteralNamespaces/LiteralNamespacesSniff.php b/dev/tests/static/framework/Magento/Sniffs/LiteralNamespaces/LiteralNamespacesSniff.php
-deleted file mode 100644
-index b6af3f37cf1..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/LiteralNamespaces/LiteralNamespacesSniff.php
-+++ /dev/null
-@@ -1,75 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\LiteralNamespaces;
--
--use PHP_CodeSniffer\Sniffs\Sniff;
--use PHP_CodeSniffer\Files\File;
--
--/**
-- * Custom phpcs sniff to detect usages of literal class and interface names.
-- */
--class LiteralNamespacesSniff implements Sniff
--{
--    /**
--     * @var string
--     */
--    private $literalNamespacePattern = '/^[\\\]{0,2}[A-Z][A-Za-z]+([\\\]{1,2}[A-Z][A-Za-z]+){2,}(?!\\\+)$/';
--
--    /**
--     * @var array
--     */
--    private $classNames = [];
--
--    /**
--     * @inheritdoc
--     */
--    public function register()
--    {
--        return [
--            T_CONSTANT_ENCAPSED_STRING,
--            T_DOUBLE_QUOTED_STRING,
--        ];
--    }
--
--    /**
--     * @inheritdoc
--     */
--    public function process(File $sourceFile, $stackPtr)
--    {
--        $tokens = $sourceFile->getTokens();
--        if ($sourceFile->findPrevious(T_STRING_CONCAT, $stackPtr, $stackPtr - 3) ||
--            $sourceFile->findNext(T_STRING_CONCAT, $stackPtr, $stackPtr + 3)
--        ) {
--            return;
--        }
--
--        $content = trim($tokens[$stackPtr]['content'], "\"'");
--        // replace double slashes from class name for avoiding problems with class autoload
--        if (strpos($content, '\\') !== false) {
--            $content = preg_replace('|\\\{2,}|', '\\', $content);
--        }
--
--        if (preg_match($this->literalNamespacePattern, $content) === 1 && $this->classExists($content)) {
--            $sourceFile->addError(
--                "Use ::class notation instead.",
--                $stackPtr,
--                'LiteralClassUsage'
--            );
--        }
--    }
--
--    /**
--     * @param string $className
--     * @return bool
--     */
--    private function classExists($className)
--    {
--        if (!isset($this->classNames[$className])) {
--            $this->classNames[$className] = class_exists($className) || interface_exists($className);
--        }
--        return $this->classNames[$className];
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/MicroOptimizations/IsNullSniff.php b/dev/tests/static/framework/Magento/Sniffs/MicroOptimizations/IsNullSniff.php
-deleted file mode 100644
-index 928fc3a0def..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/MicroOptimizations/IsNullSniff.php
-+++ /dev/null
-@@ -1,40 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\MicroOptimizations;
--
--use PHP_CodeSniffer\Sniffs\Sniff;
--use PHP_CodeSniffer\Files\File;
--
--class IsNullSniff implements Sniff
--{
--    /**
--     * @var string
--     */
--    protected $blacklist = 'is_null';
--
--    /**
--     * @inheritdoc
--     */
--    public function register()
--    {
--        return [T_STRING];
--    }
--
--    /**
--     * @inheritdoc
--     */
--    public function process(File $sourceFile, $stackPtr)
--    {
--        $tokens = $sourceFile->getTokens();
--        if ($tokens[$stackPtr]['content'] === $this->blacklist) {
--            $sourceFile->addError(
--                "is_null must be avoided. Use strict comparison instead.",
--                $stackPtr,
--                'IsNullUsage'
--            );
--        }
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php
-deleted file mode 100644
-index 1618beb665d..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php
-+++ /dev/null
-@@ -1,46 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\NamingConventions;
--
--use PHP_CodeSniffer\Sniffs\Sniff;
--use PHP_CodeSniffer\Files\File;
--
--class InterfaceNameSniff implements Sniff
--{
--    const INTERFACE_SUFFIX = 'Interface';
--
--    /**
--     * {@inheritdoc}
--     */
--    public function register()
--    {
--        return [T_INTERFACE];
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function process(File $sourceFile, $stackPtr)
--    {
--        $tokens = $sourceFile->getTokens();
--        $declarationLine = $tokens[$stackPtr]['line'];
--        $suffixLength = strlen(self::INTERFACE_SUFFIX);
--        // Find first T_STRING after 'interface' keyword in the line and verify it
--        while ($tokens[$stackPtr]['line'] == $declarationLine) {
--            if ($tokens[$stackPtr]['type'] == 'T_STRING') {
--                if (substr($tokens[$stackPtr]['content'], 0 - $suffixLength) != self::INTERFACE_SUFFIX) {
--                    $sourceFile->addError(
--                        'Interface should have name that ends with "Interface" suffix.',
--                        $stackPtr,
--                        'WrongInterfaceName'
--                    );
--                }
--                break;
--            }
--            $stackPtr++;
--        }
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
-deleted file mode 100644
-index e3cfdf53243..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
-+++ /dev/null
-@@ -1,113 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\NamingConventions;
--
--use PHP_CodeSniffer\Sniffs\Sniff;
--use PHP_CodeSniffer\Files\File;
--
--class ReservedWordsSniff implements Sniff
--{
--    /**
--     * The following words cannot be used to name a class, interface or trait,
--     * and they are also prohibited from being used in namespaces.
--     *
--     * @link http://php.net/manual/en/reserved.other-reserved-words.php
--     *
--     * @var string[]
--     */
--    protected $reservedWords = [
--        'int' => '7',
--        'float' => '7',
--        'bool' => '7',
--        'string' => '7',
--        'true' => '7',
--        'false' => '7',
--        'null' => '7',
--        'void' => '7.1',
--        'iterable' => '7.1',
--        'resource' => '7',
--        'object' => '7',
--        'mixed' => '7',
--        'numeric' => '7',
--    ];
--
--    /**
--     * {@inheritdoc}
--     */
--    public function register()
--    {
--        return [T_CLASS, T_INTERFACE, T_TRAIT, T_NAMESPACE];
--    }
--
--    /**
--     * Check all namespace parts
--     *
--     * @param File $sourceFile
--     * @param int $stackPtr
--     * @return void
--     */
--    protected function validateNamespace(File $sourceFile, $stackPtr)
--    {
--        $stackPtr += 2;
--        $tokens = $sourceFile->getTokens();
--        while ($stackPtr < $sourceFile->numTokens && $tokens[$stackPtr]['code'] !== T_SEMICOLON) {
--            if ($tokens[$stackPtr]['code'] === T_WHITESPACE || $tokens[$stackPtr]['code'] === T_NS_SEPARATOR) {
--                $stackPtr++; //skip "namespace" and whitespace
--                continue;
--            }
--            $namespacePart = $tokens[$stackPtr]['content'];
--            if (isset($this->reservedWords[strtolower($namespacePart)])) {
--                $sourceFile->addError(
--                    'Cannot use "%s" in namespace as it is reserved since PHP %s',
--                    $stackPtr,
--                    'Namespace',
--                    [$namespacePart, $this->reservedWords[strtolower($namespacePart)]]
--                );
--            }
--            $stackPtr++;
--        }
--    }
--
--    /**
--     * Check class name not having reserved words
--     *
--     * @param File $sourceFile
--     * @param int $stackPtr
--     * @return void
--     */
--    protected function validateClass(File $sourceFile, $stackPtr)
--    {
--        $tokens = $sourceFile->getTokens();
--        $stackPtr += 2; //skip "class" and whitespace
--        $className = strtolower($tokens[$stackPtr]['content']);
--        if (isset($this->reservedWords[$className])) {
--            $sourceFile->addError(
--                'Cannot use "%s" as class name as it is reserved since PHP %s',
--                $stackPtr,
--                'Class',
--                [$className, $this->reservedWords[$className]]
--            );
--        }
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function process(File $sourceFile, $stackPtr)
--    {
--        $tokens = $sourceFile->getTokens();
--        switch ($tokens[$stackPtr]['code']) {
--            case T_CLASS:
--            case T_INTERFACE:
--            case T_TRAIT:
--                $this->validateClass($sourceFile, $stackPtr);
--                break;
--            case T_NAMESPACE:
--                $this->validateNamespace($sourceFile, $stackPtr);
--                break;
--        }
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Security/ExecutableRegExSniff.php b/dev/tests/static/framework/Magento/Sniffs/Security/ExecutableRegExSniff.php
-deleted file mode 100644
-index 0482f574f28..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/Security/ExecutableRegExSniff.php
-+++ /dev/null
-@@ -1,87 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\Security;
--
--use PHP_CodeSniffer\Sniffs\Sniff;
--use PHP_CodeSniffer\Files\File;
--use PHP_CodeSniffer\Util\Tokens;
--
--/**
-- * Detects executable regular expressions.
-- *
-- * Example: echo preg_replace('|^(.*)$|ei', '"\1"', 'get_input');
-- */
--class ExecutableRegExSniff implements Sniff
--{
--    /**
--     * String representation of error.
--     *
--     * @var string
--     */
--    // @codingStandardsIgnoreLine
--    protected $errorMessage = "Possible executable regular expression in %s. Make sure that the pattern doesn't contain 'e' modifier";
--
--    /**
--     * Error violation code.
--     *
--     * @var string
--     */
--    protected $errorCode = 'PossibleExecutableRegEx';
--
--    /**
--     * Observed function.
--     *
--     * @var array
--     */
--    protected $function = 'preg_replace';
--
--    /**
--     * List of ignored tokens.
--     *
--     * @var array
--     */
--    protected $ignoreTokens = [
--        T_DOUBLE_COLON,
--        T_OBJECT_OPERATOR,
--        T_FUNCTION,
--        T_CONST,
--        T_CLASS,
--    ];
--
--    /**
--     * {@inheritdoc}
--     */
--    public function register()
--    {
--        return [T_STRING];
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function process(File $phpcsFile, $stackPtr)
--    {
--        $tokens = $phpcsFile->getTokens();
--        if ($tokens[$stackPtr]['content'] !== $this->function) {
--            return;
--        }
--        $prevToken = $phpcsFile->findPrevious(T_WHITESPACE, $stackPtr - 1, null, true);
--        if (in_array($tokens[$prevToken]['code'], $this->ignoreTokens)) {
--            return;
--        }
--        $nextToken = $phpcsFile->findNext([T_WHITESPACE, T_OPEN_PARENTHESIS], $stackPtr + 1, null, true);
--        if (in_array($tokens[$nextToken]['code'], Tokens::$stringTokens)
--            && preg_match('/[#\/|~\}\)][imsxADSUXJu]*e[imsxADSUXJu]*.$/', $tokens[$nextToken]['content'])
--        ) {
--            $phpcsFile->addError(
--                $this->errorMessage,
--                $stackPtr,
--                $this->errorCode,
--                [$tokens[$stackPtr]['content']]
--            );
--        }
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Strings/StringPositionSniff.php b/dev/tests/static/framework/Magento/Sniffs/Strings/StringPositionSniff.php
-deleted file mode 100644
-index d98a55a6f3e..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/Strings/StringPositionSniff.php
-+++ /dev/null
-@@ -1,168 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\Strings;
--
--use PHP_CodeSniffer\Sniffs\Sniff;
--use PHP_CodeSniffer\Files\File;
--
--/**
-- * Detects misusing of IS_IDENTICAL operators when `strpos` and `stripos` functions are used in a condition.
-- *
-- * Examples:
-- * if (!strpos($haystack, $needle)) {}
-- * if (stripos($haystack, $needle) == false) {}
-- */
--class StringPositionSniff implements Sniff
--{
--    /**
--     * String representation of error.
--     *
--     * @var string
--     */
--    protected $errorMessage = 'Identical operator === is not used for testing the return value of %s function';
--
--    /**
--     * Error violation code.
--     *
--     * @var string
--     */
--    protected $errorCode = 'ImproperValueTesting';
--
--    /**
--     * Searched functions.
--     *
--     * @var array
--     */
--    protected $functions = [
--        'strpos',
--        'stripos',
--    ];
--
--    /**
--     * All tokens from current file.
--     *
--     * @var array
--     */
--    protected $tokens = [];
--
--    /**
--     * PHP_CodeSniffer file.
--     *
--     * @var File
--     */
--    protected $file;
--
--    /**
--     * Left limit for search of identical operators.
--     *
--     * @var int
--     */
--    protected $leftLimit;
--
--    /**
--     * Right limit for search of identical operators.
--     *
--     * @var int
--     */
--    protected $rightLimit;
--
--    /**
--     * List of tokens which declares left bound of current scope.
--     *
--     * @var array
--     */
--    protected $leftRangeTokens = [
--        T_IS_IDENTICAL,
--        T_IS_NOT_IDENTICAL,
--        T_OPEN_PARENTHESIS,
--        T_BOOLEAN_AND,
--        T_BOOLEAN_OR,
--    ];
--
--    /**
--     * List of tokens which declares right bound of current scope.
--     *
--     * @var array
--     */
--    protected $rightRangeTokens = [
--        T_IS_IDENTICAL,
--        T_IS_NOT_IDENTICAL,
--        T_CLOSE_PARENTHESIS,
--        T_BOOLEAN_AND,
--        T_BOOLEAN_OR,
--    ];
--
--    /**
--     * List of tokens which declares identical operators.
--     *
--     * @var array
--     */
--    protected $identical = [
--        T_IS_IDENTICAL,
--        T_IS_NOT_IDENTICAL,
--    ];
--
--    /**
--     * {@inheritdoc}
--     */
--    public function register()
--    {
--        return [T_IF, T_ELSEIF];
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function process(File $phpcsFile, $stackPtr)
--    {
--        $this->tokens = $phpcsFile->getTokens();
--        $this->file = $phpcsFile;
--        $this->leftLimit = $open = $this->tokens[$stackPtr]['parenthesis_opener'];
--        $this->rightLimit = $close = $this->tokens[$stackPtr]['parenthesis_closer'];
--        for ($i = ($open + 1); $i < $close; $i++) {
--            if (($this->tokens[$i]['code'] === T_STRING && in_array($this->tokens[$i]['content'], $this->functions))
--                && (!$this->findIdentical($i - 1, $this->findFunctionParenthesisCloser($i) + 1))
--            ) {
--                $foundFunctionName = $this->tokens[$i]['content'];
--                $phpcsFile->addError($this->errorMessage, $i, $this->errorCode, [$foundFunctionName]);
--            }
--        }
--    }
--
--    /**
--     * Recursively finds identical operators in current scope.
--     *
--     * @param int $leftCurrentPosition
--     * @param int $rightCurrentPosition
--     * @return bool
--     */
--    protected function findIdentical($leftCurrentPosition, $rightCurrentPosition)
--    {
--        $leftBound = $this->file->findPrevious($this->leftRangeTokens, $leftCurrentPosition, $this->leftLimit - 1);
--        $rightBound = $this->file->findNext($this->rightRangeTokens, $rightCurrentPosition, $this->rightLimit + 1);
--        $leftToken = $this->tokens[$leftBound];
--        $rightToken = $this->tokens[$rightBound];
--        if ($leftToken['code'] === T_OPEN_PARENTHESIS && $rightToken['code'] === T_CLOSE_PARENTHESIS) {
--            return $this->findIdentical($leftBound - 1, $rightBound + 1);
--        } else {
--            return (
--                in_array($leftToken['code'], $this->identical) || in_array($rightToken['code'], $this->identical)
--            ) ?: false;
--        }
--    }
--
--    /**
--     * Finds the position of close parenthesis of detected function.
--     *
--     * @param int $currentPosition
--     * @return mixed
--     */
--    protected function findFunctionParenthesisCloser($currentPosition)
--    {
--        $nextOpenParenthesis = $this->file->findNext(T_OPEN_PARENTHESIS, $currentPosition, $this->rightLimit);
--        return $nextOpenParenthesis ? $this->tokens[$nextOpenParenthesis]['parenthesis_closer'] : false;
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php b/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
-deleted file mode 100644
-index b1e358e4048..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
-+++ /dev/null
-@@ -1,95 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\Translation;
--
--use PHP_CodeSniffer\Sniffs\Sniff;
--use PHP_CodeSniffer\Files\File;
--
--/**
-- * Make sure that constants are not used as the first argument of translation function.
-- */
--class ConstantUsageSniff implements Sniff
--{
--    /**
--     * Having previous line content allows to process multi-line declaration.
--     *
--     * @var string
--     */
--    protected $previousLineContent = '';
--
--    /**
--     * {@inheritDoc}
--     */
--    public function register()
--    {
--        return [T_OPEN_TAG];
--    }
--
--    /**
--     * Copied from \Generic_Sniffs_Files_LineLengthSniff, minor changes made
--     *
--     * {@inheritDoc}
--     */
--    public function process(File $phpcsFile, $stackPtr)
--    {
--        $tokens = $phpcsFile->getTokens();
--
--        // Make sure this is the first open tag
--        $previousOpenTag = $phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1));
--        if ($previousOpenTag !== false) {
--            return;
--        }
--
--        $tokenCount = 0;
--        $currentLineContent = '';
--        $currentLine = 1;
--
--        for (; $tokenCount < $phpcsFile->numTokens; $tokenCount++) {
--            if ($tokens[$tokenCount]['line'] === $currentLine) {
--                $currentLineContent .= $tokens[$tokenCount]['content'];
--            } else {
--                $this->checkIfFirstArgumentConstant($phpcsFile, ($tokenCount - 1), $currentLineContent);
--                $currentLineContent = $tokens[$tokenCount]['content'];
--                $currentLine++;
--            }
--        }
--
--        $this->checkIfFirstArgumentConstant($phpcsFile, ($tokenCount - 1), $currentLineContent);
--    }
--
--    /**
--     * Checks if first argument of \Magento\Framework\Phrase or translation function is a constant
--     *
--     * @param File $phpcsFile
--     * @param int $stackPtr
--     * @param string $lineContent
--     * @return void
--     */
--    private function checkIfFirstArgumentConstant(
--        File $phpcsFile,
--        $stackPtr,
--        $lineContent
--    ) {
--        $previousLineRegexp = '/(__|Phrase)\($/im';
--        $currentLineRegexp = '/(__|Phrase)\(.+\)/';
--        $currentLineMatch = preg_match($currentLineRegexp, $lineContent) !== 0;
--        $previousLineMatch = preg_match($previousLineRegexp, $this->previousLineContent) !== 0;
--        $this->previousLineContent = $lineContent;
--        $error = 'Constants are not allowed as the first argument of translation function, use string literal instead';
--        $constantRegexp = '[^\$\'"]+::[A-Z_0-9]+.*';
--        if ($currentLineMatch) {
--            $variableRegexp = "/(__|Phrase)\({$constantRegexp}\)/";
--            if (preg_match($variableRegexp, $lineContent) !== 0) {
--                $phpcsFile->addError($error, $stackPtr, 'VariableTranslation');
--            }
--        } elseif ($previousLineMatch) {
--            $variableRegexp = "/^{$constantRegexp}/";
--            if (preg_match($variableRegexp, $lineContent) !== 0) {
--                $phpcsFile->addError($error, $stackPtr, 'VariableTranslation');
--            }
--        }
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Variables/GlobalVariablesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Variables/GlobalVariablesSniff.php
-deleted file mode 100644
-index 2c4ce8f94af..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/Variables/GlobalVariablesSniff.php
-+++ /dev/null
-@@ -1,40 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Sniffs\Variables;
--
--use PHP_CodeSniffer\Sniffs\Sniff;
--use PHP_CodeSniffer\Files\File;
--
--/**
-- * Sniff prohibiting usage of global variables.
-- */
--class GlobalVariablesSniff implements Sniff
--{
--    /**
--     * @inheritdoc
--     */
--    public function register()
--    {
--        return [T_VARIABLE];
--    }
--
--    /**
--     * @inheritdoc
--     */
--    public function process(File $phpcsFile, $stackPtr)
--    {
--        $tokens = $phpcsFile->getTokens();
--        if (preg_match('/^\$[_A-Z0-9]+$/', $tokens[$stackPtr]['content'])) {
--            $phpcsFile->addError(
--                'Usage of global variables is not allowed: ' . $tokens[$stackPtr]['content'],
--                $stackPtr,
--                'ERROR'
--            );
--            return;
--        }
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php b/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php
-deleted file mode 100644
-index de3cfc50bbb..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php
-+++ /dev/null
-@@ -1,66 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\Whitespace;
--
--use PHP_CodeSniffer\Sniffs\Sniff;
--use PHP_CodeSniffer\Files\File;
--
--/**
-- * Class EmptyLineMissedSniff
-- */
--class EmptyLineMissedSniff implements Sniff
--{
--    /**
--     * {@inheritdoc}
--     */
--    public function register()
--    {
--        return [T_DOC_COMMENT];
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function process(File $phpcsFile, $stackPtr)
--    {
--        $tokens = $phpcsFile->getTokens();
--        if ($this->doCheck($phpcsFile, $stackPtr, $tokens)) {
--            $previous = $phpcsFile->findPrevious(T_WHITESPACE, $stackPtr - 1, null, true);
--            if ($tokens[$stackPtr]['line'] - $tokens[$previous]['line'] < 2) {
--                $error = 'Empty line missed';
--                $phpcsFile->addError($error, $stackPtr, '', null);
--            }
--        }
--    }
--
--    /**
--     * @param File $phpcsFile
--     * @param int $stackPtr
--     * @param array $tokens
--     * @return bool
--     */
--    private function doCheck(File $phpcsFile, $stackPtr, $tokens)
--    {
--        $result = false;
--        if ($phpcsFile->hasCondition($stackPtr, T_CLASS) || $phpcsFile->hasCondition($stackPtr, T_INTERFACE)) {
--            $result = true;
--        }
--
--        if ($phpcsFile->hasCondition($stackPtr, T_FUNCTION)) {
--            $result = false;
--        }
--        $previous = $phpcsFile->findPrevious(T_WHITESPACE, $stackPtr - 1, null, true);
--        if ($tokens[$previous]['type'] === 'T_OPEN_CURLY_BRACKET') {
--            $result = false;
--        }
--
--        if (strpos($tokens[$stackPtr]['content'], '/**') === false) {
--            $result = false;
--        }
--
--        return $result;
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
-deleted file mode 100644
-index f276426efad..00000000000
---- a/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
-+++ /dev/null
-@@ -1,49 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\Whitespace;
--
--use PHP_CodeSniffer\Sniffs\Sniff;
--use PHP_CodeSniffer\Files\File;
--
--/**
-- * Class MultipleEmptyLinesSniff
-- */
--class MultipleEmptyLinesSniff implements Sniff
--{
--    /**
--     * {@inheritdoc}
--     */
--    public function register()
--    {
--        return [T_WHITESPACE];
--    }
--
--    /**
--     * {@inheritdoc}
--     */
--    public function process(File $phpcsFile, $stackPtr)
--    {
--        $tokens = $phpcsFile->getTokens();
--        if ($phpcsFile->hasCondition($stackPtr, T_FUNCTION)
--            || $phpcsFile->hasCondition($stackPtr, T_CLASS)
--            || $phpcsFile->hasCondition($stackPtr, T_INTERFACE)
--        ) {
--            if ($tokens[($stackPtr - 1)]['line'] < $tokens[$stackPtr]['line']
--                && $tokens[($stackPtr - 2)]['line'] === $tokens[($stackPtr - 1)]['line']
--            ) {
--                // This is an empty line and the line before this one is not
--                // empty, so this could be the start of a multiple empty line block
--                $next  = $phpcsFile->findNext(T_WHITESPACE, $stackPtr, null, true);
--                $lines = $tokens[$next]['line'] - $tokens[$stackPtr]['line'];
--                if ($lines > 1) {
--                    $error = 'Code must not contain multiple empty lines in a row; found %s empty lines';
--                    $data  = [$lines];
--                    $phpcsFile->addError($error, $stackPtr, 'MultipleEmptyLines', $data);
--                }
--            }
--        }
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
-index 225be94958d..2cd1d0969c4 100644
---- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
-+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
-@@ -54,6 +54,7 @@ class CodeSniffer implements ToolInterface, ExtensionInterface
-     public function __construct($rulesetDir, $reportFile, Wrapper $wrapper)
-     {
-         $this->rulesetDir = $rulesetDir;
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         if (!file_exists($rulesetDir) && file_exists($fullPath = realpath(__DIR__ . '/../../../../' . $rulesetDir))) {
-             $this->rulesetDir = $fullPath;
-         }
-@@ -62,7 +63,7 @@ class CodeSniffer implements ToolInterface, ExtensionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setExtensions(array $extensions)
-     {
-@@ -80,7 +81,7 @@ class CodeSniffer implements ToolInterface, ExtensionInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function run(array $whiteList)
-     {
-@@ -97,10 +98,10 @@ class CodeSniffer implements ToolInterface, ExtensionInterface
-         $settings['files'] = $whiteList;
-         $settings['standards'] = [$this->rulesetDir];
-         $settings['extensions'] = $this->extensions;
--        $settings['warningSeverity'] = 0;
-         $settings['reports']['full'] = $this->reportFile;
-         $this->wrapper->setSettings($settings);
- 
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         ob_start();
-         $result = $this->wrapper->runPHPCS();
-         ob_end_clean();
-diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/Wrapper.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/Wrapper.php
-index cb186f7cb80..e11b85a6c20 100644
---- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/Wrapper.php
-+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/Wrapper.php
-@@ -12,6 +12,9 @@ namespace Magento\TestFramework\CodingStandard\Tool\CodeSniffer;
- use PHP_CodeSniffer\Config;
- use PHP_CodeSniffer\Runner;
- 
-+/**
-+ * PHP Code Sniffer wrapper class
-+ */
- class Wrapper extends Runner
- {
-     /**
-@@ -33,10 +36,21 @@ class Wrapper extends Runner
-         return $version;
-     }
- 
-+    /**
-+     * Initialize PHPCS runner and modifies the configuration settings
-+     *
-+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
-+     */
-     public function init()
-     {
-         $this->config->extensions = $this->settings['extensions'];
-         unset($this->settings['extensions']);
-+
-+        $settings = $this->config->getSettings();
-+        unset($settings['files']);
-+
-+        $this->config->setSettings($settings);
-+
-         $this->config->setSettings(array_replace_recursive(
-             $this->config->getSettings(),
-             $this->settings
-@@ -45,6 +59,8 @@ class Wrapper extends Runner
-     }
- 
-     /**
-+     * Sets the settings
-+     *
-      * @param array $settings
-      */
-     public function setSettings($settings)
-diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/AnalyticsConfigRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/AnalyticsConfigRule.php
-new file mode 100644
-index 00000000000..b1a6da5e438
---- /dev/null
-+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/AnalyticsConfigRule.php
-@@ -0,0 +1,43 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\TestFramework\Dependency;
-+
-+/**
-+ * Class provides dependency rule for analytics.xml config file.
-+ */
-+class AnalyticsConfigRule implements RuleInterface
-+{
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
-+    {
-+        if ('config' != $fileType || !preg_match('#.*/analytics\.xml$#', $file)) {
-+            return [];
-+        }
-+
-+        $dependenciesInfo = [];
-+        if (preg_match_all('#<[customProvider|reportProvider][^>]*class=[\'"]([^\'"]+)[\'"]#i', $contents, $matches)) {
-+            $classes = array_pop($matches);
-+            foreach ($classes as $class) {
-+                $classParts = explode('\\', $class);
-+                $module = implode('\\', array_slice($classParts, 0, 2));
-+                if (strtolower($currentModule) !== strtolower($module)) {
-+                    $dependenciesInfo[] = [
-+                        'module' => $module,
-+                        'type' => RuleInterface::TYPE_HARD,
-+                        'source' => $file,
-+                    ];
-+                }
-+            }
-+        }
-+
-+        return $dependenciesInfo;
-+    }
-+}
-diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/DeclarativeSchemaRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/DeclarativeSchemaRule.php
-deleted file mode 100644
-index 72e4fff7e51..00000000000
---- a/dev/tests/static/framework/Magento/TestFramework/Dependency/DeclarativeSchemaRule.php
-+++ /dev/null
-@@ -1,101 +0,0 @@
--<?php
--/**
-- * Rule for searching DB dependency
-- *
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\TestFramework\Dependency;
--
--/**
-- * Rule for testing integrity within declarative schema.
-- *
-- * @package Magento\TestFramework\Dependency
-- */
--class DeclarativeSchemaRule implements RuleInterface
--{
--    /**
--     * Map of tables and modules
--     *
--     * @var array
--     */
--    protected $_moduleTableMap;
--
--    /**
--     * Constructor
--     *
--     * @param array $tables
--     */
--    public function __construct(array $tables)
--    {
--        $this->_moduleTableMap = $tables;
--    }
--
--    /**
--     * Gets external dependencies information for current module by analyzing db_schema.xml files contents.
--     *
--     * @param string $currentModule
--     * @param string $fileType
--     * @param string $file
--     * @param string $contents
--     * @return array
--     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
--     * @SuppressWarnings(PHPMD.NPathComplexity)
--     */
--    public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
--    {
--        if ('db_schema' != $fileType || !preg_match('#.*/db_schema\.xml$#', $file)) {
--            return [];
--        }
--
--        $dependenciesInfo = [];
--        $unKnowTables = [];
--
--        $dom = new \DOMDocument();
--        $dom->loadXML($contents);
--        $tables = $dom->getElementsByTagName('table');
--        $constraints = $dom->getElementsByTagName('constraint');
--
--        $tableNames = [];
--        $foreignKeyTables = [];
--        $foreignKeyReferenceTables = [];
--
--        /** @var \DOMElement $table */
--        foreach ($tables as $table) {
--            $tableNames[] = $table->getAttribute('name');
--        }
--
--        /** @var \DOMElement $constraint */
--        foreach ($constraints as $constraint) {
--            $xsiType = $constraint->getAttribute('xsi:type');
--            if (strtolower($xsiType) == 'foreign' && $constraint->getAttribute('disabled') !== '1') {
--                $foreignKeyTables[] = $constraint->getAttribute('table');
--                $foreignKeyReferenceTables[] = $constraint->getAttribute('referenceTable');
--            }
--        }
--
--        $tableNames = array_unique(array_merge($tableNames, $foreignKeyReferenceTables, $foreignKeyTables));
--
--        /** @var string $table */
--        foreach ($tableNames as $table) {
--            if (!isset($this->_moduleTableMap[$table])) {
--                $unKnowTables[$file][$table] = $table;
--                continue;
--            }
--            if (strtolower($currentModule) !== strtolower($this->_moduleTableMap[$table])) {
--                $dependenciesInfo[] = [
--                    'module' => $this->_moduleTableMap[$table],
--                    'type' => RuleInterface::TYPE_HARD,
--                    'source' => $table,
--                ];
--            }
--        }
--
--        foreach ($unKnowTables as $tables) {
--            foreach ($tables as $table) {
--                $dependenciesInfo[] = ['module' => 'Unknown', 'source' => $table];
--            }
--        }
--        return $dependenciesInfo;
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
-index cdaa49e8d37..b3ee0a28803 100644
---- a/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
-+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
-@@ -7,11 +7,13 @@
-  */
- namespace Magento\TestFramework\Dependency;
- 
--use DOMDocument;
--use DOMXPath;
-+use Magento\Framework\App\Utility\Classes;
- use Magento\Framework\App\Utility\Files;
- use Magento\TestFramework\Dependency\VirtualType\VirtualTypeMapper;
- 
-+/**
-+ * Class provide dependency rule for di.xml config files.
-+ */
- class DiRule implements RuleInterface
- {
-     /**
-@@ -33,6 +35,8 @@ class DiRule implements RuleInterface
-     }
- 
-     /**
-+     * Get class name pattern.
-+     *
-      * @return string
-      * @throws \Exception
-      */
-@@ -73,6 +77,7 @@ class DiRule implements RuleInterface
-      */
-     public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
-     {
-+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
-         if (pathinfo($file, PATHINFO_BASENAME) !== 'di.xml') {
-             return [];
-         }
-@@ -99,12 +104,14 @@ class DiRule implements RuleInterface
-     }
- 
-     /**
-+     * Fetch all possible dependencies.
-+     *
-      * @param string $contents
-      * @return array
-      */
-     private function fetchPossibleDependencies($contents)
-     {
--        $doc = new DOMDocument();
-+        $doc = new \DOMDocument();
-         $doc->loadXML($contents);
-         return [
-             RuleInterface::TYPE_SOFT => $this->getSoftDependencies($doc),
-@@ -113,16 +120,22 @@ class DiRule implements RuleInterface
-     }
- 
-     /**
--     * @param DOMDocument $doc
-+     * Collect soft dependencies.
-+     *
-+     * @param \DOMDocument $doc
-      * @return array
-      */
--    private function getSoftDependencies(DOMDocument $doc)
-+    private function getSoftDependencies(\DOMDocument $doc)
-     {
-         $result = [];
-         foreach (self::$tagNameMap as $tagName => $attributeNames) {
-             $nodes = $doc->getElementsByTagName($tagName);
-         /** @var \DOMElement $node */
-             foreach ($nodes as $node) {
-+                if ($tagName === 'virtualType' && !$node->getAttribute('type')) {
-+                    $result[] = Classes::resolveVirtualType($node->getAttribute('name'));
-+                    continue;
-+                }
-                 foreach ($attributeNames as $attributeName) {
-                     $result[] = $node->getAttribute($attributeName);
-                 }
-@@ -133,13 +146,15 @@ class DiRule implements RuleInterface
-     }
- 
-     /**
--     * @param DOMDocument $doc
-+     * Collect hard dependencies.
-+     *
-+     * @param \DOMDocument $doc
-      * @return array
-      */
--    private function getHardDependencies(DOMDocument $doc)
-+    private function getHardDependencies(\DOMDocument $doc)
-     {
-         $result = [];
--        $xpath = new DOMXPath($doc);
-+        $xpath = new \DOMXPath($doc);
-         $textNodes = $xpath->query('//*[@xsi:type="object"]');
-         /** @var \DOMElement $node */
-         foreach ($textNodes as $node) {
-diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
-index 800bba2a880..49587954126 100644
---- a/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
-+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
-@@ -5,10 +5,19 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\TestFramework\Dependency;
- 
- use Magento\Framework\App\Utility\Files;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\UrlInterface;
-+use Magento\TestFramework\Dependency\Route\RouteMapper;
-+use Magento\TestFramework\Exception\NoSuchActionException;
- 
-+/**
-+ * Rule to check the dependencies between modules based on references, getUrl and layout blocks
-+ */
- class PhpRule implements RuleInterface
- {
-     /**
-@@ -34,7 +43,7 @@ class PhpRule implements RuleInterface
-      *
-      * @var array
-      */
--    protected $_mapRouters = [];
-+    private $_mapRouters = [];
- 
-     /**
-      * List of layout blocks
-@@ -59,18 +68,36 @@ class PhpRule implements RuleInterface
-     ];
- 
-     /**
--     * Constructor
-+     * @var RouteMapper
-+     */
-+    private $routeMapper;
-+
-+    /**
-+     * Whitelists for dependency check
-      *
-+     * @var array
-+     */
-+    private $whitelists;
-+
-+    /**
-      * @param array $mapRouters
-      * @param array $mapLayoutBlocks
-      * @param array $pluginMap
-+     * @param array $whitelists
-+     * @throws \Exception
-      */
--    public function __construct(array $mapRouters, array $mapLayoutBlocks, array $pluginMap = [])
--    {
-+    public function __construct(
-+        array $mapRouters,
-+        array $mapLayoutBlocks,
-+        array $pluginMap = [],
-+        array $whitelists = []
-+    ) {
-         $this->_mapRouters = $mapRouters;
-         $this->_mapLayoutBlocks = $mapLayoutBlocks;
-         $this->_namespaces = implode('|', \Magento\Framework\App\Utility\Files::init()->getNamespaces());
-         $this->pluginMap = $pluginMap ?: null;
-+        $this->routeMapper = new RouteMapper();
-+        $this->whitelists = $whitelists;
-     }
- 
-     /**
-@@ -81,6 +108,7 @@ class PhpRule implements RuleInterface
-      * @param string $file
-      * @param string $contents
-      * @return array
-+     * @throws \Exception
-      */
-     public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
-     {
-@@ -104,6 +132,16 @@ class PhpRule implements RuleInterface
-         return $dependenciesInfo;
-     }
- 
-+    /**
-+     * Get routes whitelist
-+     *
-+     * @return array
-+     */
-+    private function getRoutesWhitelist(): array
-+    {
-+        return $this->whitelists['routes'] ?? [];
-+    }
-+
-     /**
-      * Check references to classes and identifiers defined in other modules
-      *
-@@ -111,6 +149,7 @@ class PhpRule implements RuleInterface
-      * @param string $file
-      * @param string $contents
-      * @return array
-+     * @throws \Exception
-      */
-     private function caseClassesAndIdentifiers($currentModule, $file, &$contents)
-     {
-@@ -169,6 +208,8 @@ class PhpRule implements RuleInterface
-     }
- 
-     /**
-+     * Load DI configuration files
-+     *
-      * @return array
-      * @throws \Exception
-      */
-@@ -184,12 +225,14 @@ class PhpRule implements RuleInterface
-      * Generate an array of plugin info
-      *
-      * @return array
-+     * @throws \Exception
-      */
-     private function loadPluginMap()
-     {
-         if (!$this->pluginMap) {
-             foreach ($this->loadDiFiles() as $filepath) {
-                 $dom = new \DOMDocument();
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                 $dom->loadXML(file_get_contents($filepath));
-                 $typeNodes = $dom->getElementsByTagName('type');
-                 /** @var \DOMElement $type */
-@@ -214,6 +257,7 @@ class PhpRule implements RuleInterface
-      * @param string $dependent
-      * @param string $dependency
-      * @return bool
-+     * @throws \Exception
-      */
-     private function isPluginDependency($dependent, $dependency)
-     {
-@@ -236,47 +280,59 @@ class PhpRule implements RuleInterface
-      *
-      * Ex.: getUrl('{path}')
-      *
--     * @param $currentModule
--     * @param $contents
-+     * @param string $currentModule
-+     * @param string $contents
-      * @return array
-+     * @throws LocalizedException
-+     * @throws \Exception
-      */
--    protected function _caseGetUrl($currentModule, &$contents)
-+    protected function _caseGetUrl(string $currentModule, string &$contents): array
-     {
--        $pattern = '/[\->:]+(?<source>getUrl\([\'"](?<router>[\w\/*]+)[\'"])/';
-+        $pattern = '#(\->|:)(?<source>getUrl\(([\'"])(?<route_id>[a-z0-9\-_]{3,})'
-+            .'(/(?<controller_name>[a-z0-9\-_]+))?(/(?<action_name>[a-z0-9\-_]+))?\3)#i';
- 
-         $dependencies = [];
-         if (!preg_match_all($pattern, $contents, $matches, PREG_SET_ORDER)) {
-             return $dependencies;
-         }
- 
--        foreach ($matches as $item) {
--            $router = str_replace('/', '\\', $item['router']);
--            if (isset($this->_mapRouters[$router])) {
--                $modules = $this->_mapRouters[$router];
-+        try {
-+            foreach ($matches as $item) {
-+                $modules = $this->routeMapper->getDependencyByRoutePath(
-+                    $item['route_id'],
-+                    $item['controller_name'] ?? UrlInterface::DEFAULT_CONTROLLER_NAME,
-+                    $item['action_name'] ?? UrlInterface::DEFAULT_ACTION_NAME
-+                );
-                 if (!in_array($currentModule, $modules)) {
--                    foreach ($modules as $module) {
--                        $dependencies[] = [
--                            'module' => $module,
--                            'type' => RuleInterface::TYPE_HARD,
--                            'source' => $item['source'],
--                        ];
-+                    if (count($modules) === 1) {
-+                        $modules = reset($modules);
-                     }
-+                    $dependencies[] = [
-+                        'module' => $modules,
-+                        'type' => RuleInterface::TYPE_HARD,
-+                        'source' => $item['source'],
-+                    ];
-                 }
-             }
-+        } catch (NoSuchActionException $e) {
-+            if (array_search($e->getMessage(), $this->getRoutesWhitelist()) === false) {
-+                throw new LocalizedException(__('Invalid URL path: %1', $e->getMessage()), $e);
-+            }
-         }
-+
-         return $dependencies;
-     }
- 
-     /**
-      * Check layout blocks
-      *
--     * @param $currentModule
--     * @param $fileType
--     * @param $file
--     * @param $contents
-+     * @param string $currentModule
-+     * @param string $fileType
-+     * @param string $file
-+     * @param string $contents
-      * @return array
-      */
--    protected function _caseLayoutBlock($currentModule, $fileType, $file, &$contents)
-+    protected function _caseLayoutBlock(string $currentModule, string $fileType, string $file, string &$contents): array
-     {
-         $pattern = '/[\->:]+(?<source>(?:getBlock|getBlockHtml)\([\'"](?<block>[\w\.\-]+)[\'"]\))/';
- 
-@@ -306,11 +362,11 @@ class PhpRule implements RuleInterface
-     /**
-      * Get area from file path
-      *
--     * @param $file
--     * @param $fileType
-+     * @param string $file
-+     * @param string $fileType
-      * @return string|null
-      */
--    protected function _getAreaByFile($file, $fileType)
-+    protected function _getAreaByFile(string $file, string $fileType): ?string
-     {
-         if ($fileType == 'php') {
-             return null;
-@@ -330,12 +386,12 @@ class PhpRule implements RuleInterface
-      *  'source'  // source text
-      * )
-      *
--     * @param $currentModule
--     * @param $area
--     * @param $block
-+     * @param string $currentModule
-+     * @param string|null $area
-+     * @param string $block
-      * @return array
-      */
--    protected function _checkDependencyLayoutBlock($currentModule, $area, $block)
-+    protected function _checkDependencyLayoutBlock(string $currentModule, ?string $area, string $block): array
-     {
-         if (isset($this->_mapLayoutBlocks[$area][$block]) || $area === null) {
-             // CASE 1: No dependencies
-@@ -396,6 +452,8 @@ class PhpRule implements RuleInterface
-     }
- 
-     /**
-+     * Merge dependencies
-+     *
-      * @param array $known
-      * @param array $new
-      * @return array
-diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/Route/RouteMapper.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/Route/RouteMapper.php
-new file mode 100644
-index 00000000000..a3e5b6927e7
---- /dev/null
-+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/Route/RouteMapper.php
-@@ -0,0 +1,334 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestFramework\Dependency\Route;
-+
-+use Magento\Framework\App\Area;
-+use Magento\Framework\App\Utility\Files;
-+use Magento\TestFramework\Exception\NoSuchActionException;
-+
-+/**
-+ * Route mapper based on routes.xml declarations
-+ */
-+class RouteMapper
-+{
-+    /**
-+     * List of routers
-+     *
-+     * Format: array(
-+     *  '{Router_Id}' => '{Route_Id}' => ['{Module_Name}']
-+     * )
-+     *
-+     * @var array
-+     */
-+    private $routers = [];
-+
-+    /**
-+     * List of routes.xml files by modules
-+     *
-+     * Format: array(
-+     *  '{Module_Name}' => ['{Filename}']
-+     * )
-+     *
-+     * @var array
-+     */
-+    private $routeConfigFiles = [];
-+
-+    /**
-+     * List of controllers actions
-+     *
-+     * Format: array(
-+     *  '{Router_Id}' => '{Route_Id}' => '{Controller_Name}' => '{Action_Name}' => [{'Module_Name'}]
-+     * )
-+     *
-+     * @var array
-+     */
-+    private $actions = [];
-+
-+    /**
-+     * List of reserved words
-+     *
-+     * @see \Magento\Framework\App\Router\ActionList
-+     * @var array
-+     */
-+    private $reservedWords = [
-+        'abstract' => 1,
-+        'and' => 1,
-+        'array' => 1,
-+        'as' => 1,
-+        'break' => 1,
-+        'callable' => 1,
-+        'case' => 1,
-+        'catch' => 1,
-+        'class' => 1,
-+        'clone' => 1,
-+        'const' => 1,
-+        'continue' => 1,
-+        'declare' => 1,
-+        'default' => 1,
-+        'die' => 1,
-+        'do' => 1,
-+        'echo' => 1,
-+        'else' => 1,
-+        'elseif' => 1,
-+        'empty' => 1,
-+        'enddeclare' => 1,
-+        'endfor' => 1,
-+        'endforeach' => 1,
-+        'endif' => 1,
-+        'endswitch' => 1,
-+        'endwhile' => 1,
-+        'eval' => 1,
-+        'exit' => 1,
-+        'extends' => 1,
-+        'final' => 1,
-+        'for' => 1,
-+        'foreach' => 1,
-+        'function' => 1,
-+        'global' => 1,
-+        'goto' => 1,
-+        'if' => 1,
-+        'implements' => 1,
-+        'include' => 1,
-+        'instanceof' => 1,
-+        'insteadof' => 1,
-+        'interface' => 1,
-+        'isset' => 1,
-+        'list' => 1,
-+        'namespace' => 1,
-+        'new' => 1,
-+        'or' => 1,
-+        'print' => 1,
-+        'private' => 1,
-+        'protected' => 1,
-+        'public' => 1,
-+        'require' => 1,
-+        'return' => 1,
-+        'static' => 1,
-+        'switch' => 1,
-+        'throw' => 1,
-+        'trait' => 1,
-+        'try' => 1,
-+        'unset' => 1,
-+        'use' => 1,
-+        'var' => 1,
-+        'while' => 1,
-+        'xor' => 1,
-+        'void' => 1,
-+    ];
-+
-+    /**
-+     * Provide routing declaration by router_id
-+     *
-+     * @param string $routerId
-+     * @return array
-+     * @throws \Exception
-+     */
-+    public function getRoutes(string $routerId = ''): array
-+    {
-+        $routes = [];
-+        if (!$routerId) {
-+            foreach ($this->getRoutersMap() as $routesByRouterType) {
-+                $routes = array_merge_recursive($routes, $routesByRouterType);
-+            }
-+            array_walk(
-+                $routes,
-+                function (&$modules) {
-+                    $modules = array_unique($modules);
-+                }
-+            );
-+        } else {
-+            $routes = $this->getRoutersMap()[$routerId] ?? [];
-+        }
-+        return $routes;
-+    }
-+
-+    /**
-+     * Provide dependencies for a specific URL path
-+     *
-+     * @param string $routeId
-+     * @param string $controllerName
-+     * @param string $actionName
-+     * @return array
-+     * @throws NoSuchActionException
-+     * @throws \Exception
-+     */
-+    public function getDependencyByRoutePath(
-+        string $routeId,
-+        string $controllerName,
-+        string $actionName
-+    ): array {
-+        $routeId = strtolower($routeId);
-+        $controllerName = strtolower($controllerName);
-+        $actionName = strtolower($actionName);
-+
-+        if (isset($this->reservedWords[$actionName])) {
-+            $actionName .= 'action';
-+        }
-+
-+        $dependencies = [];
-+        foreach ($this->getRouterTypes() as $routerId) {
-+            if (isset($this->getActionsMap()[$routerId][$routeId][$controllerName][$actionName])) {
-+                $dependencies = array_merge(
-+                    $dependencies,
-+                    $this->getActionsMap()[$routerId][$routeId][$controllerName][$actionName]
-+                );
-+            }
-+        }
-+
-+        if (empty($dependencies)) {
-+            throw new NoSuchActionException(implode('/', [$routeId, $controllerName, $actionName]));
-+        } else {
-+            $dependencies = array_unique($dependencies);
-+        }
-+        return $dependencies;
-+    }
-+
-+    /**
-+     * Provide a list of router type
-+     *
-+     * @return array
-+     * @throws \Exception
-+     */
-+    private function getRouterTypes()
-+    {
-+        return array_keys($this->getActionsMap());
-+    }
-+
-+    /**
-+     * Provide routing declaration
-+     *
-+     * @return array
-+     * @throws \Exception
-+     */
-+    private function getRoutersMap()
-+    {
-+        if (empty($this->routers)) {
-+            foreach ($this->getListRoutesXml() as $module => $configFiles) {
-+                foreach ($configFiles as $configFile) {
-+                    $this->processConfigFile($module, $configFile);
-+                }
-+            }
-+        }
-+
-+        return $this->routers;
-+    }
-+
-+    /**
-+     * Update routers map for the module basing on the routing config file
-+     *
-+     * @param string $module
-+     * @param string $configFile
-+     *
-+     * @return void
-+     */
-+    private function processConfigFile(string $module, string $configFile)
-+    {
-+        // Read module's routes.xml file
-+        $config = simplexml_load_file($configFile);
-+
-+        $routers  = $config->xpath("/config/router");
-+        foreach ($routers as $router) {
-+            $routerId = (string)$router['id'];
-+            foreach ($router->xpath('route') as $route) {
-+                $routeId = (string)$route['id'];
-+                if (!isset($this->routers[$routerId][$routeId])) {
-+                    $this->routers[$routerId][$routeId] = [];
-+                }
-+                if (!in_array($module, $this->routers[$routerId][$routeId])) {
-+                    $this->routers[$routerId][$routeId][] = $module;
-+                }
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Prepare the list of routes.xml files (by modules)
-+     *
-+     * @throws \Exception
-+     */
-+    private function getListRoutesXml()
-+    {
-+        if (empty($this->routeConfigFiles)) {
-+            $files = Files::init()->getConfigFiles('*/routes.xml', [], false);
-+            $pattern = '/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)/';
-+            foreach ($files as $file) {
-+                if (preg_match($pattern, $file, $matches)) {
-+                    $module = $matches['namespace'] . '\\' . $matches['module'];
-+                    $this->routeConfigFiles[$module][] = $file;
-+                }
-+            }
-+        }
-+        return $this->routeConfigFiles;
-+    }
-+
-+    /**
-+     * Provide a list of available actions
-+     *
-+     * @return array
-+     * @throws \Exception
-+     */
-+    private function getActionsMap(): array
-+    {
-+        if (empty($this->actions)) {
-+            $files = Files::init()->getPhpFiles(Files::INCLUDE_APP_CODE);
-+            $actionsMap = [];
-+            foreach ($this->getRoutersMap() as $routerId => $routes) {
-+                foreach ($routes as $routeId => $dependencies) {
-+                    $actionsMapPerArea[$routeId] = [];
-+                    foreach ($dependencies as $module) {
-+                        $moduleActions = $this->getModuleActionsMapping($module, $routerId, $files);
-+                        $actionsMapPerArea[$routeId] =
-+                            array_merge_recursive($actionsMapPerArea[$routeId], $moduleActions);
-+                    }
-+                }
-+                $actionsMap[$routerId] = $actionsMapPerArea;
-+            }
-+            $this->actions = $actionsMap;
-+        }
-+
-+        return $this->actions;
-+    }
-+
-+    /**
-+     * Provide a list of available module actions by router_id
-+     *
-+     * @param string $module
-+     * @param string $routerId
-+     * @param array $files
-+     * @return array
-+     */
-+    private function getModuleActionsMapping(string $module, string $routerId, array $files): array
-+    {
-+        $subdirectoryPattern = str_replace('\\', DIRECTORY_SEPARATOR, $module);
-+        $subdirectoryPattern .= DIRECTORY_SEPARATOR . 'Controller/';
-+        if (array_search($routerId, [Area::AREA_ADMINHTML, Area::AREA_ADMIN], true) !== false) {
-+            $subdirectoryPattern .= ucfirst(Area::AREA_ADMINHTML) . DIRECTORY_SEPARATOR;
-+        } else {
-+            $subdirectoryPattern .= '(?!' . ucfirst(Area::AREA_ADMINHTML) . ')';
-+        }
-+
-+        $actions = preg_grep('~' . $subdirectoryPattern . '~', $files);
-+
-+        $actionsPattern = '#' . $subdirectoryPattern . '(?<controller>\S+)/'
-+            . '(?<action_name>\w+)\.php$#';
-+
-+        $moduleActionsMapping = [];
-+        foreach ($actions as $action) {
-+            if (preg_match($actionsPattern, $action, $matches)) {
-+                $controllerName = strtolower(str_replace('/', '_', $matches['controller']));
-+                $actionName = strtolower($matches['action_name']);
-+                if (!isset($moduleActionsMapping[$controllerName][$actionName])) {
-+                    $moduleActionsMapping[$controllerName][$actionName] = [];
-+                }
-+                $moduleActionsMapping[$controllerName][$actionName][] = $module;
-+            }
-+        }
-+
-+        return $moduleActionsMapping;
-+    }
-+}
-diff --git a/dev/tests/static/framework/Magento/TestFramework/Exception/NoSuchActionException.php b/dev/tests/static/framework/Magento/TestFramework/Exception/NoSuchActionException.php
-new file mode 100644
-index 00000000000..5ce432f8a18
---- /dev/null
-+++ b/dev/tests/static/framework/Magento/TestFramework/Exception/NoSuchActionException.php
-@@ -0,0 +1,16 @@
-+<?php
-+
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\TestFramework\Exception;
-+
-+/**
-+ * An exception is thrown if such a controller action does not exist
-+ */
-+class NoSuchActionException extends \Exception
-+{
-+}
-diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php b/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php
-deleted file mode 100644
-index 516f169227a..00000000000
---- a/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php
-+++ /dev/null
-@@ -1,441 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\TestFramework\Utility;
--
--/**
-- * A helper find not escaped output in phtml templates
-- */
--class XssOutputValidator
--{
--    const ESCAPE_NOT_VERIFIED_PATTERN = '/\* @escapeNotVerified \*/';
--
--    const ESCAPED_PATTERN = '/\* @noEscape \*/';
--
--    /**
--     * Store origin for replacements
--     *
--     * @var array
--     */
--    private $origins = [];
--
--    /**
--     * Store replacements
--     *
--     * @var array
--     */
--    private $replacements = [];
--
--    /**
--     * Array of escape functions
--     *
--     * @var string[]
--     */
--    private $escapeFunctions = ['escapeHtml', 'escapeHtmlAttr', 'escapeUrl', 'escapeJs', 'escapeCss'];
--
--    /**
--     *
--     * @param string $file
--     * @return string
--     */
--    public function getLinesWithXssSensitiveOutput($file)
--    {
--        $fileContent = file_get_contents($file);
--        $xssUnsafeBlocks = $this->getXssUnsafeBlocks($fileContent);
--
--        $lines = [];
--        foreach ($xssUnsafeBlocks as $block) {
--            $lines = array_merge($lines, $this->findBlockLineNumbers($block, $fileContent));
--        }
--
--        if (count($lines)) {
--            $lines = array_unique($lines);
--            sort($lines);
--            return implode(',', $lines);
--        }
--
--        return '';
--    }
--
--    /**
--     * Find block line numbers
--     *
--     * @param string $block
--     * @param string $content
--     * @return array
--     */
--    private function findBlockLineNumbers($block, $content)
--    {
--        $results = [];
--        $pos = strpos($content, $block, 0);
--        while ($pos !== false) {
--            $contentBeforeString = substr($content, 0, $pos);
--            if ($this->isNotEscapeMarkedBlock($contentBeforeString)
--                && $this->isNotInCommentBlock($contentBeforeString)
--            ) {
--                $results[] = count(explode(PHP_EOL, $contentBeforeString));
--            }
--            $pos = strpos($content, $block, $pos + 1);
--        }
--
--        return $results;
--    }
--
--    /**
--     * Get XSS unsafe output blocks
--     *
--     * @param string $fileContent
--     * @return array
--     */
--    public function getXssUnsafeBlocks($fileContent)
--    {
--        $results = [];
--
--        $fileContent = $this->replacePhpQuoteWithPlaceholders($fileContent);
--        $fileContent = $this->replacePhpCommentsWithPlaceholders($fileContent);
--
--        $this->addOriginReplacement('\'\'', "'-*=single=*-'");
--        $this->addOriginReplacement('""', '"-*=double=*-"');
--
--        if (preg_match_all('/<[?](php|=)(.*?)[?]>/sm', $fileContent, $phpBlockMatches)) {
--            foreach ($phpBlockMatches[2] as $index => $phpBlock) {
--                $phpCommands = explode(';', $phpBlock);
--                if ($phpBlockMatches[1][$index] == 'php') {
--                    $echoCommands = preg_grep('#( |^|/\*.*?\*/)echo[\s(]+.*#sm', $phpCommands);
--                } else {
--                    $echoCommands[] = $phpBlockMatches[0][$index];
--                }
--                $results = array_merge(
--                    $results,
--                    $this->getEchoUnsafeCommands($echoCommands)
--                );
--            }
--        }
--
--        $this->clearOriginReplacements();
--        $results = array_unique($results);
--
--        return $results;
--    }
--
--    /**
--     * @param array $echoCommands
--     * @return array
--     */
--    private function getEchoUnsafeCommands(array $echoCommands)
--    {
--        $results = [];
--        foreach ($echoCommands as $echoCommand) {
--            if ($this->isNotEscapeMarkedCommand($echoCommand)) {
--                $echoCommand = preg_replace('/^(.*?)echo/sim', 'echo', $echoCommand);
--                $preparedEchoCommand = $this->prepareEchoCommand($echoCommand);
--                $isEscapeFunctionArgument = preg_match(
--                    '/->(' . implode('|', $this->escapeFunctions) . ')\(.*?\)$/sim',
--                    $preparedEchoCommand
--                );
--                $xssUnsafeCommands = array_filter(
--                    $isEscapeFunctionArgument ? [$preparedEchoCommand] : explode('.', $preparedEchoCommand),
--                    [$this, 'isXssUnsafeCommand']
--                );
--                if (count($xssUnsafeCommands)) {
--                    $results[] = str_replace(
--                        $this->getReplacements(),
--                        $this->getOrigins(),
--                        $echoCommand
--                    );
--                }
--            }
--        }
--
--        return $results;
--    }
--
--    /**
--     * @param string $command
--     * @return string
--     */
--    private function prepareEchoCommand($command)
--    {
--        $command = preg_replace('/<[?]=(.*?)[?]>/sim', '\1', $command);
--        return trim(ltrim(explode(';', $command)[0], 'echo'));
--    }
--
--    /**
--     * @param string $contentBeforeString
--     * @return bool
--     */
--    private function isNotEscapeMarkedBlock($contentBeforeString)
--    {
--        return !preg_match(
--            '%(' . self::ESCAPE_NOT_VERIFIED_PATTERN . '|' . self::ESCAPED_PATTERN . ')$%sim',
--            trim($contentBeforeString)
--        );
--    }
--
--    /**
--     * @param string $contentBeforeString
--     * @return bool
--     */
--    private function isNotInCommentBlock($contentBeforeString)
--    {
--        $contentBeforeString = explode('<?php', $contentBeforeString);
--        $contentBeforeString = preg_replace(
--            '%/\*.*?\*/%si',
--            '',
--            end($contentBeforeString)
--        );
--
--        return (strpos($contentBeforeString, '/*') === false);
--    }
--
--    /**
--     * @param string $command
--     * @return bool
--     */
--    private function isNotEscapeMarkedCommand($command)
--    {
--        return !preg_match(
--            '%' . self::ESCAPE_NOT_VERIFIED_PATTERN . '|' . self::ESCAPED_PATTERN . '%sim',
--            $command
--        );
--    }
--
--    /**
--     * Check if command is xss unsafe
--     *
--     * @param string $command
--     * @return bool
--     */
--    public function isXssUnsafeCommand($command)
--    {
--        $command = trim($command);
--
--        switch (true) {
--            case preg_match(
--                '/->(' . implode('|', $this->escapeFunctions) . '|.*html.*)\(/simU',
--                $this->getLastMethod($command)
--            ):
--                return false;
--            case preg_match('/^\((int|bool|float)\)/sim', $command):
--                return false;
--            case preg_match('/^count\(/sim', $command):
--                return false;
--            case preg_match("/^'.*'$/sim", $command):
--                return false;
--            case preg_match('/^".*?"$/sim', $command, $matches):
--                return $this->isContainPhpVariables($this->getOrigin($matches[0]));
--            default:
--                return true;
--        }
--    }
--
--    /**
--     * @param string $command
--     * @return string
--     */
--    private function getLastMethod($command)
--    {
--        if (preg_match_all(
--            '/->.*?\(.*?\)/sim',
--            $this->clearMethodBracketContent($command),
--            $matches
--        )) {
--            $command = end($matches[0]);
--            $command = substr($command, 0, strpos($command, '(') + 1);
--        }
--
--        return $command;
--    }
--
--    /**
--     * @param string $command
--     * @return string
--     */
--    private function clearMethodBracketContent($command)
--    {
--        $bracketInterval = [];
--        $bracketOpenPos = [];
--        $command = str_split($command);
--        foreach ($command as $index => $character) {
--            if ($character == '(') {
--                array_push($bracketOpenPos, $index);
--            }
--            if (count($bracketOpenPos)) {
--                if ($character == ')') {
--                    $lastOpenPos = array_pop($bracketOpenPos);
--                    if (count($bracketOpenPos) == 0) {
--                        $bracketInterval[] = [$lastOpenPos, $index];
--                    }
--                }
--            }
--        }
--        foreach ($bracketInterval as $interval) {
--            for ($i = $interval[0] + 1; $i < $interval[1]; $i++) {
--                unset($command[$i]);
--            }
--        }
--        $command = implode('', $command);
--
--        return $command;
--    }
--
--    /**
--     * @param string $content
--     * @return int
--     */
--    private function isContainPhpVariables($content)
--    {
--        return preg_match('/[^\\\\]\$[a-z_\x7f-\xff]/sim', $content);
--    }
--
--    /**
--     * @param string $fileContent
--     * @return string
--     */
--    private function replacePhpQuoteWithPlaceholders($fileContent)
--    {
--        $origins = [];
--        $replacements = [];
--        if (preg_match_all('/<[?](php|=)(.*?)[?]>/sm', $fileContent, $phpBlockMatches)) {
--            foreach ($phpBlockMatches[2] as $phpBlock) {
--                $phpBlockQuoteReplaced = preg_replace(
--                    ['/([^\\\\])\'\'/si', '/([^\\\\])""/si'],
--                    ["\1'-*=single=*-'", '\1"-*=double=*-"'],
--                    $phpBlock
--                );
--
--                $this->addQuoteOriginsReplacements(
--                    $phpBlockQuoteReplaced,
--                    [
--                        '/([^\\\\])([\'])(.*?)([^\\\\])([\'])/sim'
--                    ]
--                );
--                $this->addQuoteOriginsReplacements(
--                    $phpBlockQuoteReplaced,
--                    [
--                        '/([^\\\\])(["])(.*?)([^\\\\])(["])/sim',
--                    ]
--                );
--
--                $origins[] = $phpBlock;
--                $replacements[]  = str_replace(
--                    $this->getOrigins(),
--                    $this->getReplacements(),
--                    $phpBlockQuoteReplaced
--                );
--            }
--        }
--
--        return str_replace($origins, $replacements, $fileContent);
--    }
--
--    /**
--     * @param string $fileContent
--     * @return string
--     */
--    private function replacePhpCommentsWithPlaceholders($fileContent)
--    {
--        $origins= [];
--        $replacements = [];
--        if (preg_match_all('%/\*.*?\*/%simu', $fileContent, $docCommentMatches, PREG_SET_ORDER)) {
--            foreach ($docCommentMatches as $docCommentMatch) {
--                if ($this->isNotEscapeMarkedCommand($docCommentMatch[0])
--                    && !$this->issetOrigin($docCommentMatch[0])) {
--                    $origin = $docCommentMatch[0];
--                    $replacement = '-*!' . count($this->getOrigins()) . '!*-';
--                    $origins[] = $origin;
--                    $replacements[] = $replacement;
--                    $this->addOriginReplacement(
--                        $origin,
--                        $replacement
--                    );
--                }
--            }
--        }
--
--        return str_replace($origins, $replacements, $fileContent);
--    }
--
--    /**
--     * Add replacements for expressions in single and double quotes
--     *
--     * @param string $phpBlock
--     * @param array $patterns
--     * @return void
--     */
--    private function addQuoteOriginsReplacements($phpBlock, array $patterns)
--    {
--        foreach ($patterns as $pattern) {
--            if (preg_match_all($pattern, $phpBlock, $quoteMatches, PREG_SET_ORDER)) {
--                foreach ($quoteMatches as $quoteMatch) {
--                    $origin = $quoteMatch[2] . $quoteMatch[3] . $quoteMatch[4] . $quoteMatch[5];
--                    if (!$this->issetOrigin($origin)) {
--                        $this->addOriginReplacement(
--                            $origin,
--                            $quoteMatch[2] . '-*=' . count($this->getOrigins()) . '=*-' . $quoteMatch[5]
--                        );
--                    }
--                }
--            }
--        }
--    }
--
--    /**
--     * @param string $origin
--     * @param string $replacement
--     * @return void
--     */
--    private function addOriginReplacement($origin, $replacement)
--    {
--        $this->origins[$replacement] = $origin;
--        $this->replacements[$replacement] = $replacement;
--    }
--
--    /**
--     * Clear origins and replacements
--     *
--     * @return void
--     */
--    private function clearOriginReplacements()
--    {
--        $this->origins = [];
--        $this->replacements = [];
--    }
--
--    /**
--     * @return array
--     */
--    private function getOrigins()
--    {
--        return $this->origins;
--    }
--
--    /**
--     * @param string $key
--     * @return string|null
--     */
--    private function getOrigin($key)
--    {
--        return array_key_exists($key, $this->origins) ? $this->origins[$key] : null;
--    }
--
--    /**
--     * @param string $origin
--     * @return bool
--     */
--    private function issetOrigin($origin)
--    {
--        return in_array($origin, $this->origins);
--    }
--
--    /**
--     * @return array
--     */
--    private function getReplacements()
--    {
--        return $this->replacements;
--    }
--}
-diff --git a/dev/tests/static/framework/Magento/ruleset.xml b/dev/tests/static/framework/Magento/ruleset.xml
-index f3e4893ba75..89020150035 100644
---- a/dev/tests/static/framework/Magento/ruleset.xml
-+++ b/dev/tests/static/framework/Magento/ruleset.xml
-@@ -7,62 +7,33 @@
- -->
- <ruleset name="Magento">
-     <description>Custom Magento coding standard.</description>
-+    <rule ref="./../../../../../vendor/magento/magento-coding-standard/Magento2"/>
- 
--    <rule ref="PSR2"/>
--
--    <rule ref="Magento.Files.LineLength">
--        <properties>
--            <property name="lineLimit" value="120"/>
--            <property name="absoluteLineLimit" value="120"/>
--        </properties>
-+    <!-- ToDo: Improve Annotation sniffs in magento/magento-coding-standard and remove from here. -->
-+    <rule ref="Magento.Annotation">
-+        <exclude-pattern>*/_files/*</exclude-pattern>
-+        <exclude-pattern>*/Test/*</exclude-pattern>
-+        <exclude-pattern>*Test.php</exclude-pattern>
-     </rule>
--    <rule ref="Magento.LanguageConstructs.LanguageConstructs">
--        <include-pattern>*/app/code/*\.(?!phtml)</include-pattern>
-+    <rule ref="Magento2.Files.LineLength.MaxExceeded">
-+        <exclude-pattern>*.phtml</exclude-pattern>
-     </rule>
--    <rule ref="Magento.LiteralNamespaces.LiteralNamespaces">
--        <exclude-pattern>*/_files/*</exclude-pattern>
-+    <rule ref="Squiz.Operators.IncrementDecrementUsage">
-+        <exclude-pattern>*.phtml</exclude-pattern>
-     </rule>
--    <rule ref="Magento.Annotation.MethodArguments">
--        <!--Disabled due to MAGETWO-94083-->
--        <exclude-pattern>*</exclude-pattern>
-+    <rule ref="PEAR.ControlStructures.ControlSignature">
-+        <exclude-pattern>*.phtml</exclude-pattern>
-     </rule>
--    <rule ref="Magento.Functions.OutputBuffering">
--        <include-pattern>*/(app/code|vendor|setup/src|lib/internal/Magento)/*</include-pattern>
--        <exclude-pattern>*/lib/internal/Magento/Framework/Image/Adapter/Gd2.php</exclude-pattern>
--        <exclude-pattern>*/lib/internal/Magento/Framework/View/Result/Page.php</exclude-pattern>
--        <exclude-pattern>*/lib/internal/Magento/Framework/View/TemplateEngine/Php.php</exclude-pattern>
--        <exclude-pattern>*/Test/Unit/*</exclude-pattern>
-+    <rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
-+        <exclude-pattern>*.phtml</exclude-pattern>
-     </rule>
--    <rule ref="Magento.Variables.GlobalVariables">
--        <include-pattern>*/(app/code|vendor|setup/src)/*</include-pattern>
--        <exclude-pattern>*/setup/src/Magento/Setup/Controller/WebConfiguration.php</exclude-pattern>
--        <exclude-pattern>*/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Eav/Model/Attribute/Data/File.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Backend/App/Area/FrontNameResolver.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Indexer/Console/Command/AbstractIndexerCommand.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Cron/Console/Command/CronCommand.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Store/Model/Store.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Config/Model/Config/Processor/EnvironmentPlaceholder.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Config/Model/Config/Backend/File/RequestData.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Config/App/Config/Source/EnvironmentConfigSource.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/FileUploader/Save.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Customer/Model/Metadata/Form/File.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Customer/Model/FileUploader.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php</exclude-pattern>
--        <exclude-pattern>*/app/code/Magento/Customer/Controller/Adminhtml/File/Customer/Upload.php</exclude-pattern>
--        <exclude-pattern>*/Test/Unit/*</exclude-pattern>
-+    <rule ref="PEAR.Functions.FunctionCallSignature">
-+        <exclude-pattern>*.phtml</exclude-pattern>
-+    </rule>
-+    <rule ref="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace">
-+        <exclude-pattern>*.phtml</exclude-pattern>
-+    </rule>
-+    <rule ref="Magento2.Security.LanguageConstruct.DirectOutput">
-+        <exclude-pattern>*.phtml</exclude-pattern>
-     </rule>
--
--    <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag"/>
--    <rule ref="Generic.Functions.CallTimePassByReference"/>
--    <rule ref="Generic.PHP.DeprecatedFunctions"/>
--
--    <rule ref="Squiz.Commenting.DocCommentAlignment"/>
--    <rule ref="Squiz.Functions.GlobalFunction"/>
--    <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
- </ruleset>
-diff --git a/dev/tests/static/framework/autoload.php b/dev/tests/static/framework/autoload.php
-index 8066c23c5b3..21b3734e227 100644
---- a/dev/tests/static/framework/autoload.php
-+++ b/dev/tests/static/framework/autoload.php
-@@ -6,8 +6,11 @@
- 
- use \Magento\Framework\App\Filesystem\DirectoryList;
- 
-+//phpcs:ignore Magento2.Functions.DiscouragedFunction
- $baseDir = realpath(__DIR__ . '/../../../../');
-+// phpcs:ignore Magento2.Security.IncludeFile.FoundIncludeFile
- require $baseDir . '/app/autoload.php';
-+// phpcs:ignore Magento2.Security.IncludeFile.FoundIncludeFile
- require $baseDir . '/vendor/squizlabs/php_codesniffer/autoload.php';
- $testsBaseDir = $baseDir . '/dev/tests/static';
- $autoloadWrapper = \Magento\Framework\Autoload\AutoloaderRegistry::getAutoloader();
-@@ -17,6 +20,7 @@ $autoloadWrapper->addPsr4(
-     [
-         $testsBaseDir . '/framework/Magento/TestFramework/',
-         $testsBaseDir . '/../integration/framework/Magento/TestFramework/',
-+        $testsBaseDir . '/../api-functional/framework/Magento/TestFramework/',
-     ]
- );
- $autoloadWrapper->addPsr4('Magento\\CodeMessDetector\\', $testsBaseDir . '/framework/Magento/CodeMessDetector');
-diff --git a/dev/tests/static/framework/bootstrap.php b/dev/tests/static/framework/bootstrap.php
-index 1fe48e5a36c..5e3336ebc28 100644
---- a/dev/tests/static/framework/bootstrap.php
-+++ b/dev/tests/static/framework/bootstrap.php
-@@ -14,6 +14,10 @@ use Magento\Framework\View\Design\Theme\ThemePackageFactory;
- 
- require __DIR__ . '/autoload.php';
- 
-+if (!defined('TESTS_TEMP_DIR')) {
-+    define('TESTS_TEMP_DIR', __DIR__ . DIRECTORY_SEPARATOR . 'tmp');
-+}
-+
- setCustomErrorHandler();
- 
- $componentRegistrar = new ComponentRegistrar();
-diff --git a/dev/tests/static/framework/tests/unit/phpunit.xml.dist b/dev/tests/static/framework/tests/unit/phpunit.xml.dist
-index 57c13a6b393..aca48f6f8d1 100644
---- a/dev/tests/static/framework/tests/unit/phpunit.xml.dist
-+++ b/dev/tests/static/framework/tests/unit/phpunit.xml.dist
-@@ -20,4 +20,32 @@
-     <php>
-         <ini name="date.timezone" value="America/Los_Angeles"/>
-     </php>
-+    <listeners>
-+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
-+            <arguments>
-+                <string>var/allure-results</string> <!-- XML files output directory -->
-+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
-+                <array> <!-- A list of custom annotations to ignore (optional) -->
-+                    <element key="magentoAdminConfigFixture">
-+                        <string>magentoAdminConfigFixture</string>
-+                    </element>
-+                    <element key="magentoAppIsolation">
-+                        <string>magentoAppIsolation</string>
-+                    </element>
-+                    <element key="magentoComponentsDir">
-+                        <string>magentoComponentsDir</string>
-+                    </element>
-+                    <element key="magentoConfigFixture">
-+                        <string>magentoConfigFixture</string>
-+                    </element>
-+                    <element key="@magentoDbIsolation">
-+                        <string>magentoDataFixture</string>
-+                    </element>
-+                    <element key="magentoDbIsolation">
-+                        <string>magentoDbIsolation</string>
-+                    </element>
-+                </array>
-+            </arguments>
-+        </listener>
-+    </listeners>
- </phpunit>
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/ClassAnnotationStructureSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/ClassAnnotationStructureSniffTest.php
-new file mode 100644
-index 00000000000..b12cb1fbfcb
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/ClassAnnotationStructureSniffTest.php
-@@ -0,0 +1,85 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+namespace Magento\Sniffs\Annotation;
-+
-+class ClassAnnotationStructureSniffTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @return array
-+     */
-+    public function processDataProvider()
-+    {
-+        return [
-+            [
-+                'ClassAnnotationFixture.php',
-+                'class_annotation_errors.txt',
-+            ],
-+            [
-+                'AbstractClassAnnotationFixture.php',
-+                'abstract_class_annotation_errors.txt',
-+            ],
-+            [
-+                'ClassAnnotationNoShortDescriptionFixture.php',
-+                'class_annotation_noshortdescription_errors.txt',
-+            ],
-+            [
-+                'ClassAnnotationNoSpacingBetweenLinesFixture.php',
-+                'class_annotation_nospacingbetweenLines_errors.txt',
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * Copy a file
-+     *
-+     * @param string $source
-+     * @param string $destination
-+     */
-+    private function copyFile($source, $destination) : void
-+    {
-+        $sourcePath = $source;
-+        $destinationPath = $destination;
-+        $sourceDirectory = opendir($sourcePath);
-+        while ($readFile = readdir($sourceDirectory)) {
-+            if ($readFile != '.' && $readFile != '..') {
-+                if (!file_exists($destinationPath . $readFile)) {
-+                    copy($sourcePath . $readFile, $destinationPath . $readFile);
-+                }
-+            }
-+        }
-+        closedir($sourceDirectory);
-+    }
-+
-+    /**
-+     * @param string $fileUnderTest
-+     * @param string $expectedReportFile
-+     * @dataProvider processDataProvider
-+     */
-+    public function testProcess($fileUnderTest, $expectedReportFile)
-+    {
-+        $reportFile = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'phpcs_report.txt';
-+        $this->copyFile(
-+            __DIR__ . DIRECTORY_SEPARATOR . '_files'. DIRECTORY_SEPARATOR,
-+            TESTS_TEMP_DIR
-+        );
-+        $codeSniffer = new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer(
-+            'Magento',
-+            $reportFile,
-+            new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper()
-+        );
-+        $result = $codeSniffer->run(
-+            [TESTS_TEMP_DIR . $fileUnderTest]
-+        );
-+        $actual = file_get_contents($reportFile);
-+        $expected = file_get_contents(
-+            TESTS_TEMP_DIR . $expectedReportFile
-+        );
-+        unlink($reportFile);
-+        $this->assertEquals(2, $result);
-+        $this->assertEquals($expected, $actual);
-+    }
-+}
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/MethodAnnotationStructureSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/MethodAnnotationStructureSniffTest.php
-new file mode 100644
-index 00000000000..b56239f4df8
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/MethodAnnotationStructureSniffTest.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Sniffs\Annotation;
-+
-+class MethodAnnotationStructureSniffTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @return array
-+     */
-+    public function processDataProvider()
-+    {
-+        return [
-+            [
-+                'MethodAnnotationFixture.php',
-+                'method_annotation_errors.txt'
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * Copy a file
-+     *
-+     * @param string $source
-+     * @param string $destination
-+     */
-+    private function copyFile($source, $destination): void
-+    {
-+        $sourcePath = $source;
-+        $destinationPath = $destination;
-+        $sourceDirectory = opendir($sourcePath);
-+        while ($readFile = readdir($sourceDirectory)) {
-+            if ($readFile != '.' && $readFile != '..') {
-+                if (!file_exists($destinationPath . $readFile)) {
-+                    copy($sourcePath . $readFile, $destinationPath . $readFile);
-+                }
-+            }
-+        }
-+        closedir($sourceDirectory);
-+    }
-+
-+    /**
-+     * @param string $fileUnderTest
-+     * @param string $expectedReportFile
-+     * @dataProvider processDataProvider
-+     */
-+    public function testProcess($fileUnderTest, $expectedReportFile)
-+    {
-+        $reportFile = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'phpcs_report.txt';
-+        $this->copyFile(
-+            __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR,
-+            TESTS_TEMP_DIR
-+        );
-+        $codeSniffer = new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer(
-+            'Magento',
-+            $reportFile,
-+            new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper()
-+        );
-+        $result = $codeSniffer->run(
-+            [TESTS_TEMP_DIR . $fileUnderTest]
-+        );
-+        $actual = file_get_contents($reportFile);
-+        $expected = file_get_contents(
-+            TESTS_TEMP_DIR . $expectedReportFile
-+        );
-+        unlink($reportFile);
-+        $this->assertEquals(2, $result);
-+        $this->assertEquals($expected, $actual);
-+    }
-+}
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/AbstractClassAnnotationFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/AbstractClassAnnotationFixture.php
-new file mode 100644
-index 00000000000..43973b3083e
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/AbstractClassAnnotationFixture.php
-@@ -0,0 +1,13 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Sniffs\Annotation;
-+
-+abstract class AbstractClassAnnotationFixture
-+{
-+}
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationFixture.php
-new file mode 100644
-index 00000000000..f9a997dcfeb
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationFixture.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Sniffs\Annotation;
-+
-+class ClassAnnotationFixture
-+{
-+    /**
-+     *
-+     * @inheritdoc
-+     */
-+    public function getProductListDefaultSortBy1()
-+    {
-+    }
-+}
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoShortDescriptionFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoShortDescriptionFixture.php
-new file mode 100644
-index 00000000000..be49cc6c788
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoShortDescriptionFixture.php
-@@ -0,0 +1,16 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Sniffs\Annotation;
-+
-+/**
-+ * @SuppressWarnings(PHPMD.NumberOfChildren)
-+ */
-+class ClassAnnotationNoShortDescriptionFixture
-+{
-+}
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoSpacingBetweenLinesFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoSpacingBetweenLinesFixture.php
-new file mode 100644
-index 00000000000..382185734c2
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoSpacingBetweenLinesFixture.php
-@@ -0,0 +1,18 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Sniffs\Annotation;
-+
-+/**
-+ * Class ClassAnnotationNoSpacingBetweenLinesFixture
-+ * @see Magento\Sniffs\Annotation\_files
-+ */
-+class ClassAnnotationNoSpacingBetweenLinesFixture
-+{
-+
-+}
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/MethodAnnotationFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/MethodAnnotationFixture.php
-new file mode 100644
-index 00000000000..5ba185aba64
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/MethodAnnotationFixture.php
-@@ -0,0 +1,317 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Sniffs\Annotation\_files;
-+
-+/**
-+ * Class for method structure for annotations test cases
-+ */
-+class MethodAnnotationFixture
-+{
-+    /**
-+     *
-+     * @inheritdoc
-+     */
-+    public function getProductListDefaultSortBy1()
-+    {
-+    }
-+
-+    /**
-+     *
-+     * @inheritdoc
-+     */
-+    public function getProductListDefaultSortBy10($store = null)
-+    {
-+        return $store;
-+    }
-+
-+    /**
-+     * Block for short
-+     *
-+     * {@inheritdoc}
-+     *
-+     */
-+    public function getProductListDefaultSortBy102()
-+    {
-+    }
-+
-+    /**
-+     * {@inheritdoc}
-+     */
-+    public function getProductListDefaultBy()
-+    {
-+        return;
-+    }
-+
-+    /**
-+     *
-+     * {@inheritdoc}
-+     *
-+     */
-+    public function getProductListDefaultSortBy13()
-+    {
-+        return;
-+    }
-+
-+    /**
-+     * ProductVisibilityCondition constructor
-+     * @param \Magento\Catalog\Model\Product\Visibility $productVisibility
-+     */
-+    public function content(\Magento\Catalog\Model\Product\Visibility $productVisibility)
-+    {
-+        $this->productVisibility = $productVisibility;
-+    }
-+
-+    /**
-+     * block description
-+     *
-+     * {@inheritdoc}
-+     *
-+     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
-+     * @return void
-+     */
-+    public function construct(AbstractDb $collection)
-+    {
-+        /** @var */
-+        $collection->setVisibility($this->productVisibility->getVisibleInCatalogIds());
-+    }
-+
-+    /**
-+     * Move category
-+     *
-+     *
-+     * @param int $parentId new parent category id
-+     *
-+     * @return $this
-+     * @throws \Magento\Framework\Exception\LocalizedException|\Exception
-+     */
-+    public function move($parentId)
-+    {
-+        /**
-+         * Validate new parent category id. (category model is used for backward
-+         * compatibility in event params)
-+         */
-+        try {
-+            $this->categoryRepository->get($parentId, $this->getStoreId());
-+        } catch (NoSuchEntityException $e) {
-+            throw new \Magento\Framework\Exception\LocalizedException(
-+                __('Sorry, but we can\'t find the new parent category you selected.'),
-+                $e
-+            );
-+        }
-+        return true;
-+    }
-+
-+    /**
-+     * Block for short description
-+     *
-+     * This a long description {@inheritdoc} consists more lines as part of the long description
-+     * on multi line.
-+     *
-+     * @param int $store
-+     *
-+     *
-+     */
-+    public function getProductListDefaultSortBy26032($store)
-+    {
-+        return $store;
-+    }
-+
-+    /**
-+     *
-+     *
-+     *
-+     */
-+    public function getProductListDefaultSortBy2632()
-+    {
-+    }
-+
-+    /**
-+     * Block for short description
-+     *
-+     * This a long description {@inheritdoc} consists more lines as part of the long description
-+     * on multi line.
-+     *
-+     * @param int $store
-+     *
-+     *
-+     *
-+     */
-+    public function getProductListDefaultSortBy2002($store)
-+    {
-+        return $store;
-+    }
-+
-+    /**
-+     *
-+     * block for short description
-+     *
-+     * @param int $store
-+     * @return int
-+     */
-+    public function getProductListDefaultSortBy3002($store)
-+    {
-+        return $store;
-+    }
-+
-+    /**
-+     * Block for short description
-+     *
-+     * @see consists more lines as part of the long description
-+     * on multi line.
-+     *
-+     * @param string $store
-+     * @param string $foo
-+     */
-+    public function getProductListDefaultSortBy12($store, $foo)
-+    {
-+        return $store === $foo;
-+    }
-+
-+    /**
-+     * Block for short description
-+     *
-+     * {@inheritdoc}
-+     *
-+     * @param string $store
-+     * @param string $foo
-+     */
-+    public function getProductListDefaultSort2($store, $foo)
-+    {
-+        return $store === $foo;
-+    }
-+
-+    /**
-+     * Block for short description
-+     *
-+     * a long description {@inheritdoc} consists more lines as part of the long description
-+     * on multi line.
-+     *
-+     * @param string $store
-+     * @param string $foo
-+     */
-+    public function getProductListDefault($store, $foo)
-+    {
-+        return $store === $foo;
-+    }
-+
-+    /**
-+     * Retrieve custom options
-+     *
-+     * @param ProductOptionInterface $productOption
-+     *
-+     * @return array
-+     */
-+    protected function getCustomOptions(ProductOptionInterface $productOption)
-+    {
-+        if ($productOption
-+            && $productOption->getExtensionAttributes()
-+            && $productOption->getExtensionAttributes()->getCustomOptions()
-+        ) {
-+            return $productOption->getExtensionAttributes()
-+                ->getCustomOptions();
-+        }
-+        return [];
-+    }
-+
-+    /**
-+     * This is the summary for a DocBlock.
-+     *
-+     * This is the description for a DocBlock. This text may contain
-+     * multiple lines and even some _markdown_.
-+     * * Markdown style lists function too
-+     * * Just try this out once
-+     * The section after the description contains the tags; which provide
-+     * structured meta-data concerning the given element.
-+     *
-+     * @param int $example  This is an example function/method parameter description.
-+     * @param string $example2 This is a second example.
-+     *
-+     */
-+    public function getProductListDefaultSortBy2($example, $example2)
-+    {
-+        return $example === $example2;
-+    }
-+
-+    /**
-+     * Returns the content of the tokens from the specified start position in
-+     * the token stack for the specified length.
-+     *
-+     * @param int $start
-+     * @param int $length
-+     *
-+     * @return string The token contents.
-+     */
-+    public function getProductListDefaultSortBy($start, $length)
-+    {
-+        return $start === $length;
-+    }
-+
-+    /**
-+     * Some text about this step/method returns the content of the tokens the token stack for the specified length
-+     *
-+     * @param string $name
-+     * @param string $folder
-+     *
-+     * @see this file
-+     * @When I create a file called :name in :folder
-+     */
-+    public function getProductListDefaultSortBy222($name, $folder)
-+    {
-+        return $name === $folder;
-+    }
-+
-+    public function setExtensionAs(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
-+    {
-+        return $this->_setExtensionAttributes($extensionAttributes);
-+    }
-+
-+    /**
-+     *
-+     * short description
-+     * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes
-+     * @return mixed
-+     */
-+    public function setEn(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
-+    {
-+        return $this->_setExtensionAttributes($extensionAttributes);
-+    }
-+
-+    /**
-+     * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes
-+     * @return mixed
-+     */
-+    public function setExtenw(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
-+    {
-+        return $this->_setExtensionAttributes($extensionAttributes);
-+    }
-+
-+    /**
-+     *
-+     * Short description
-+     * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes
-+     * @return mixed
-+     */
-+    public function setExff(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
-+    {
-+        return $this->_setExtensionAttributes($extensionAttributes);
-+    }
-+
-+    /**
-+     * {@inheritdoc}
-+     *
-+     * @param int $start
-+     * @param int $length
-+     *
-+     * @return string The token contents.
-+     */
-+    public function getProductSortBy($start, $length)
-+    {
-+        return $start === $length;
-+    }
-+}
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/abstract_class_annotation_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/abstract_class_annotation_errors.txt
-new file mode 100644
-index 00000000000..23698cfb72e
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/abstract_class_annotation_errors.txt
-@@ -0,0 +1,10 @@
-+FILE: ...o/Sniffs/Annotation/_fixtures/AbstractClassAnnotationFixture.php
-+----------------------------------------------------------------------
-+FOUND 1 ERROR AFFECTING 1 LINE
-+----------------------------------------------------------------------
-+ 11 | ERROR | [x] Interface or abstract class is missing annotation
-+    |       |     block
-+----------------------------------------------------------------------
-+PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY\n
-+
-+
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_errors.txt
-new file mode 100644
-index 00000000000..aca27211316
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_errors.txt
-@@ -0,0 +1,11 @@
-+
-+FILE: ...Magento/Sniffs/Annotation/_fixtures/class_annotation_fixture.php
-+----------------------------------------------------------------------
-+FOUND 1 ERROR AFFECTING 1 LINE
-+----------------------------------------------------------------------
-+ 11 | ERROR | [x] Class is missing annotation block
-+----------------------------------------------------------------------
-+PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
-+----------------------------------------------------------------------
-+
-+
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_noshortdescription_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_noshortdescription_errors.txt
-new file mode 100644
-index 00000000000..ecc702c5689
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_noshortdescription_errors.txt
-@@ -0,0 +1,14 @@
-+'\n
-+FILE: ...nnotation/_fixtures/ClassAnnotationNoShortDescriptionFixture.php\n
-+----------------------------------------------------------------------\n
-+FOUND 1 ERROR AFFECTING 1 LINE\n
-+----------------------------------------------------------------------\n
-+ 11 | ERROR | [x] Missing short description\n
-+----------------------------------------------------------------------\n
-+PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY\n
-+----------------------------------------------------------------------\n
-+\n
-+\n
-+'
-+
-+
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_nospacingbetweenLines_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_nospacingbetweenLines_errors.txt
-new file mode 100644
-index 00000000000..01c145ad6c2
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_nospacingbetweenLines_errors.txt
-@@ -0,0 +1,12 @@
-+'\n
-+FILE: ...tation/_fixtures/ClassAnnotationNoSpacingBetweenLinesFixture.php\n
-+----------------------------------------------------------------------\n
-+FOUND 1 ERROR AFFECTING 1 LINE\n
-+----------------------------------------------------------------------\n
-+ 13 | ERROR | [x] There must be exactly one blank line between lines\n
-+----------------------------------------------------------------------\n
-+PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY\n
-+----------------------------------------------------------------------\n
-+\n
-+\n
-+'
-\ No newline at end of file
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/method_annotation_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/method_annotation_errors.txt
-new file mode 100644
-index 00000000000..65f75f6564a
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/method_annotation_errors.txt
-@@ -0,0 +1,55 @@
-+FILE: .../Magento/Sniffs/Annotation/_fixtures/MethodAnnotationFixture.php\n
-+----------------------------------------------------------------------\n
-+FOUND 29 ERRORS AFFECTING 26 LINES
-+----------------------------------------------------------------------
-+  18 | ERROR | [x] No blank lines are allowed before short
-+     |       |     description
-+  27 | ERROR | [x] {@inheritdoc} imports only short description,
-+     |       |     annotation must have long description
-+  29 | ERROR | [x] Additional blank lines found at end of the
-+     |       |     annotation block
-+  35 | ERROR | [x] {@inheritdoc} imports only short description,
-+     |       |     annotation must have long description
-+  44 | ERROR | [x] No blank lines are allowed before short
-+     |       |     description
-+  44 | ERROR | [x] {@inheritdoc} imports only short description,
-+     |       |     annotation must have long description
-+  46 | ERROR | [x] Additional blank lines found at end of the
-+     |       |     annotation block
-+  54 | ERROR | [x] There must be exactly one blank line before tags
-+  62 | ERROR | [x] Short description must start with a capital letter
-+  64 | ERROR | [x] {@inheritdoc} imports only short description,
-+     |       |     annotation must have long description
-+  79 | ERROR | [x] There must be exactly one blank line before tags
-+ 110 | ERROR | [x] Additional blank lines found at end of the
-+     |       |     annotation block
-+ 116 | ERROR | [ ] Annotation block is empty
-+ 135 | ERROR | [x] Additional blank lines found at end of the
-+     |       |     annotation block
-+ 143 | ERROR | [x] No blank lines are allowed before short
-+     |       |     description
-+ 143 | ERROR | [x] Short description must start with a capital letter
-+ 170 | ERROR | [x] {@inheritdoc} imports only short description,
-+     |       |     annotation must have long description
-+ 183 | ERROR | [x] Long description must start with a capital letter
-+ 226 | ERROR | [x] Additional blank lines found at end of the
-+     |       |     annotation block
-+ 234 | ERROR | [x] Short description should not be in multi lines
-+ 260 | ERROR | [ ] Comment block is missing
-+ 267 | ERROR | [x] No blank lines are allowed before short
-+     |       |     description
-+ 267 | ERROR | [x] Short description must start with a capital letter
-+ 268 | ERROR | [x] There must be exactly one blank line before tags
-+ 276 | ERROR | [x] Missing short description
-+ 277 | ERROR | [x] There must be exactly one blank line before tags
-+ 287 | ERROR | [x] No blank lines are allowed before short
-+     |       |     description
-+ 288 | ERROR | [x] There must be exactly one blank line before tags
-+ 297 | ERROR | [x] {@inheritdoc} imports only short description,
-+     |       |     annotation must have long description
-+----------------------------------------------------------------------
-+PHPCBF CAN FIX THE 27 MARKED SNIFF VIOLATIONS AUTOMATICALLY
-+----------------------------------------------------------------------
-+\n
-+\n
-+'
-\ No newline at end of file
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php
-deleted file mode 100644
-index 0601c3eb266..00000000000
---- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php
-+++ /dev/null
-@@ -1,82 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\EchoTags;
--
--class ShortEchoSyntaxSniffTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var \PHP_CodeSniffer_File|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $fileMock;
--
--    /**
--     * @var ShortEchoSyntaxSniff
--     */
--    private $shortEchoUsageSniff;
--
--    protected function setUp()
--    {
--        $this->fileMock = $this->getMock(\PHP_CodeSniffer_File::class, [], [], '', false);
--        $this->shortEchoUsageSniff = new ShortEchoSyntaxSniff();
--    }
--
--    /**
--     * @param string $file
--     * @param int $incorrectUsages
--     * @dataProvider processDataProvider
--     */
--    public function testEchoTagSniff($file, $stackPtr, $incorrectUsages)
--    {
--        $fileContent = file_get_contents(__DIR__ . '/_files/' . $file);
--        $tokens = $this->tokenizeString($fileContent);
--
--        $this->fileMock->expects($this->any())
--            ->method('findNext')
--            ->with([T_WHITESPACE, T_COMMENT, T_DOC_COMMENT], $stackPtr + 1, null, true)
--            ->willReturn($stackPtr + 1);
--
--        $this->fileMock->expects($this->once())
--            ->method('getTokens')
--            ->willReturn($tokens);
--
--        $this->fileMock->expects($this->exactly($incorrectUsages))
--            ->method('addError')
--            ->with('Short echo tag syntax must be used; expected "<?=" but found "<?php echo"');
--
--        $this->shortEchoUsageSniff->process($this->fileMock, $stackPtr);
--    }
--
--    /**
--     * Get tokens for a string
--     *
--     * @param string $fileContent
--     * @return array
--     */
--    private function tokenizeString($fileContent)
--    {
--        $tokens = token_get_all($fileContent);
--        $snifferTokens = [];
--        for ($i = 0; $i < count($tokens); $i++) {
--            $code = is_array($tokens[$i]) ? $tokens[$i][0] : $tokens[$i];
--            $content = is_array($tokens[$i]) ? $tokens[$i][1] : $tokens[$i];
--            $snifferTokens[$i]['code'] = $code;
--            $snifferTokens[$i]['content'] = $content;
--        }
--        return $snifferTokens;
--    }
--
--    /**
--     * @return array
--     */
--    public function processDataProvider()
--    {
--        return [
--            ['incorrect_echotag.txt', 1, 1],
--            ['correct_noecho.txt', 1, 0],
--            ['correct_echotag.txt', 1, 0]
--        ];
--    }
--}
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.txt
-deleted file mode 100644
-index fd8027e1e23..00000000000
---- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.txt
-+++ /dev/null
-@@ -1,6 +0,0 @@
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--<?= "foo" ?>
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.txt
-deleted file mode 100644
-index 5b003e1e5cf..00000000000
---- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.txt
-+++ /dev/null
-@@ -1,6 +0,0 @@
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--<?php $foo = bar; ?>
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.txt
-deleted file mode 100644
-index 84d72334bf8..00000000000
---- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.txt
-+++ /dev/null
-@@ -1,6 +0,0 @@
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--<?php echo "foo" ?>
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/AvoidIdSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/AvoidIdSniffTest.php
-new file mode 100644
-index 00000000000..ad9e8edd4d1
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/AvoidIdSniffTest.php
-@@ -0,0 +1,55 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Sniffs\Less;
-+
-+use Magento\TestFramework\CodingStandard\Tool\CodeSniffer\LessWrapper;
-+
-+class AvoidIdSniffTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @return array
-+     */
-+    public function processDataProvider()
-+    {
-+        return [
-+            [
-+                'avoid-ids.less',
-+                'avoid-ids-errors.txt'
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * @param string $fileUnderTest
-+     * @param string $expectedReportFile
-+     * @dataProvider processDataProvider
-+     */
-+    public function testProcess($fileUnderTest, $expectedReportFile)
-+    {
-+        $reportFile = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'phpcs_report.txt';
-+        $wrapper = new LessWrapper();
-+        $codeSniffer = new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer(
-+            'Magento',
-+            $reportFile,
-+            $wrapper
-+        );
-+        $codeSniffer->setExtensions([LessWrapper::LESS_FILE_EXTENSION]);
-+        $result = $codeSniffer->run(
-+            [__DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $fileUnderTest]
-+        );
-+        // Remove the absolute path to the file from the output
-+        $actual = preg_replace('/^.+\n/', '', ltrim(file_get_contents($reportFile)));
-+        $expected = file_get_contents(
-+            __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $expectedReportFile
-+        );
-+        unlink($reportFile);
-+        $this->assertEquals(1, $result);
-+        $this->assertEquals($expected, $actual);
-+    }
-+}
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/_files/avoid-ids-errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/_files/avoid-ids-errors.txt
-new file mode 100644
-index 00000000000..ebc01c4e085
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/_files/avoid-ids-errors.txt
-@@ -0,0 +1,26 @@
-+---------------------------------------------------------------------------------------------------------------------------------
-+FOUND 20 ERRORS AFFECTING 20 LINES
-+---------------------------------------------------------------------------------------------------------------------------------
-+  6 | ERROR | Id selector is used
-+  7 | ERROR | Id selector is used
-+  8 | ERROR | Id selector is used
-+  9 | ERROR | Id selector is used
-+ 10 | ERROR | Id selector is used
-+ 11 | ERROR | Id selector is used
-+ 12 | ERROR | Id selector is used
-+ 13 | ERROR | Id selector is used
-+ 14 | ERROR | Id selector is used
-+ 15 | ERROR | Id selector is used
-+ 16 | ERROR | Id selector is used
-+ 17 | ERROR | Id selector is used
-+ 18 | ERROR | Id selector is used
-+ 19 | ERROR | Id selector is used
-+ 20 | ERROR | Id selector is used
-+ 21 | ERROR | Id selector is used
-+ 22 | ERROR | Id selector is used
-+ 26 | ERROR | Id selector is used
-+ 27 | ERROR | Id selector is used
-+ 28 | ERROR | Id selector is used
-+---------------------------------------------------------------------------------------------------------------------------------
-+
-+
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/_files/avoid-ids.less b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/_files/avoid-ids.less
-new file mode 100644
-index 00000000000..dd37677b5b5
---- /dev/null
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/_files/avoid-ids.less
-@@ -0,0 +1,39 @@
-+// /**
-+//  * Copyright © Magento, Inc. All rights reserved.
-+//  * See COPYING.txt for license details.
-+//  */
-+
-+#foo[bar],
-+#foo[bar=bash],
-+#foo[bar~=bash],
-+#foo[bar$=bash],
-+#foo[bar*=bash],
-+#foo[bar|=bash],
-+#foo[bar='bash'],
-+#foo:hover,
-+#foo:nth-last-of-type(n),
-+#foo::before,
-+#foo + div,
-+#foo > div,
-+#foo ~ div,
-+#foo\3Abar ~ div,
-+#foo\:bar ~ div,
-+#foo.bar .baz,
-+div#foo {
-+    blah: 'abc';
-+}
-+
-+.my #foo,
-+#foo .blah,
-+.my #foo .blah {
-+    some: 'stuff';
-+}
-+.blah {
-+    #bar .baz();
-+    .foo #bar .baz();
-+    #bar .baz();
-+
-+    #bar .baz;
-+    .foo #bar .baz;
-+    #bar .baz;
-+}
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
-deleted file mode 100644
-index 39ad80850dd..00000000000
---- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
-+++ /dev/null
-@@ -1,98 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Sniffs\Translation;
--
--use PHP_CodeSniffer\Files\File;
--
--class ConstantUsageSniffTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var File|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $fileMock;
--
--    /**
--     * @var ConstantUsageSniff
--     */
--    private $constantUsageSniff;
--
--    protected function setUp()
--    {
--        $this->fileMock = $this->createMock(File::class);
--        $this->constantUsageSniff = new ConstantUsageSniff();
--    }
--
--    /**
--     * @param string $file
--     * @param int $numIncorrectUsages
--     * @dataProvider processDataProvider
--     */
--    public function testProcessIncorrectArguments($file, $numIncorrectUsages)
--    {
--        $stackPtr = 10;
--        $fileContent = file_get_contents(__DIR__ . '/_files/' . $file);
--        $tokens = $this->tokenizeString($fileContent);
--        $this->fileMock->expects($this->once())
--            ->method('findPrevious')
--            ->with(
--                T_OPEN_TAG,
--                $stackPtr - 1
--            )
--            ->willReturn(false);
--        $this->fileMock->expects($this->once())
--            ->method('getTokens')
--            ->willReturn($tokens);
--        $this->fileMock->numTokens = count($tokens);
--        $this->fileMock->expects($this->exactly($numIncorrectUsages))
--            ->method('addError')
--            ->with(
--                'Constants are not allowed as the first argument of translation function, use string literal instead',
--                $this->anything(),
--                'VariableTranslation'
--            );
--        $this->constantUsageSniff->process($this->fileMock, $stackPtr);
--    }
--
--    /**
--     * Get tokens for a string
--     *
--     * @param string $fileContent
--     * @return array
--     */
--    private function tokenizeString($fileContent)
--    {
--        $lineNumber = 1;
--        $tokens = token_get_all($fileContent);
--        $snifferTokens = [];
--        for ($i = 0; $i < count($tokens); $i++) {
--            $content = is_array($tokens[$i]) ? $tokens[$i][1] : $tokens[$i];
--            $snifferTokens[$i]['line'] = $lineNumber;
--            $snifferTokens[$i]['content'] = $content;
--            $trimmedContent = trim($content, ' ');
--            if ($trimmedContent == PHP_EOL || $trimmedContent == PHP_EOL . PHP_EOL) {
--                $lineNumber++;
--            }
--        }
--        return $snifferTokens;
--    }
--
--    /**
--     * @return array
--     */
--    public function processDataProvider()
--    {
--        return [
--            [
--                'incorrect_arguments.txt',
--                9
--            ],
--            [
--                'correct_arguments.txt',
--                0
--            ]
--        ];
--    }
--}
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/correct_arguments.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/correct_arguments.txt
-deleted file mode 100644
-index 8446fe75cf1..00000000000
---- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/correct_arguments.txt
-+++ /dev/null
-@@ -1,29 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--__($variable)
--
--__($variable[Class::CONSTANT])
--
--__($variable[\Namespace\Class::CONSTANT])
--
--__($variable['value'])
--
--__(
--    $variable
--)
--
--Phrase($variable)
--
--Phrase($variable[Class::CONSTANT])
--
--Phrase($variable[\Namespace\Class::CONSTANT])
--
--\Magento\Framework\Phrase($variable['value'])
--
--\Magento\Framework\Phrase(
--    $variable[Class::CONSTANT]
--)
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/incorrect_arguments.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/incorrect_arguments.txt
-deleted file mode 100644
-index 536e715b511..00000000000
---- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/incorrect_arguments.txt
-+++ /dev/null
-@@ -1,27 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--__(Class::CONSTANT)
--
--__(self::CONSTANT)
--
--__(\Namespace\Class::CONSTANT)
--
--__(
--    Class::CONSTANT
--)
--
--Phrase(Class::CONSTANT)
--
--Phrase(self::CONSTANT)
--
--Phrase(\Namespace\Class::CONSTANT)
--
--\Magento\Framework\Phrase(Class::CONSTANT)
--
--\Magento\Framework\Phrase(
--    Class::CONSTANT
--)
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
-index 85380066cc7..ffa99ec8e6a 100644
---- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
-@@ -7,6 +7,9 @@ namespace Magento\TestFramework\CodingStandard\Tool;
- 
- use PHP_CodeSniffer\Runner;
- 
-+/**
-+ * Unit test to check CodeSniffer tool.
-+ */
- class CodeSnifferTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -48,7 +51,6 @@ class CodeSnifferTest extends \PHPUnit\Framework\TestCase
-             'files' => $whiteList,
-             'standards' => [self::RULE_SET],
-             'extensions' => $extensions,
--            'warningSeverity' => 0,
-             'reports' => ['full' => self::REPORT_FILE],
-         ];
- 
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php
-deleted file mode 100644
-index 269eff8087a..00000000000
---- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php
-+++ /dev/null
-@@ -1,98 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\TestFramework\Dependency;
--
--/**
-- * Test for declarative schema integrity rule.
-- *
-- * @package Magento\TestFramework\Dependency
-- */
--class DeclarativeSchemaRuleTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var DeclarativeSchemaRule
--     */
--    protected $model;
--
--    protected function setUp()
--    {
--        $this->model = new DeclarativeSchemaRule(['some_table' => 'SomeModule']);
--    }
--
--    /**
--     * @param string $module
--     * @param string $file
--     * @param string $contents
--     * @param array $expected
--     * @dataProvider getDependencyInfoDataProvider
--     */
--    public function testGetDependencyInfo($module, $file, $contents, array $expected)
--    {
--        $actualDependencies = $this->model->getDependencyInfo($module, 'db_schema', $file, $contents);
--        $this->assertEquals(
--            $expected,
--            $actualDependencies
--        );
--    }
--
--    public function getDependencyInfoDataProvider()
--    {
--        return [
--            ['any', 'non-db-schema-file.php', 'any', []],
--            [
--                'any',
--                '/app/Magento/Module/etc/db_schema.xml',
--                '<table name="unknown_table"></table>',
--                [['module' => 'Unknown', 'source' => 'unknown_table']]
--            ],
--            [
--                'SomeModule',
--                '/app/some/path/etc/db_schema.xml',
--                '<table name="some_table"></table>',
--                []
--            ],
--            [
--                'any',
--                '/app/some/path/etc/db_schema.xml',
--                '<table name="some_table"></table>',
--                [
--                    [
--                        'module' => 'SomeModule',
--                        'type' => \Magento\TestFramework\Dependency\RuleInterface::TYPE_HARD,
--                        'source' => 'some_table',
--                    ]
--                ]
--            ],
--            [
--                'any',
--                '/app/some/path/etc/db_schema.xml',
--                '<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--                    xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
--                    <table name="some_table">
--                        <constraint xsi:type="foreign" 
--                        name="FK_NAME" 
--                        table="some_table" 
--                        column="some_col" 
--                        referenceTable="ref_table" 
--                        referenceColumn="ref_col"
--                        onDelete="CASCADE"/>
--                    </table>
--                </schema>',
--                [
--                    [
--                        'module' => 'SomeModule',
--                        'type' => \Magento\TestFramework\Dependency\RuleInterface::TYPE_HARD,
--                        'source' => 'some_table',
--                    ],
--                    [
--                        'module' => 'Unknown',
--                        'source' => 'ref_table',
--                    ]
--                ]
--            ]
--        ];
--    }
--}
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/PhpRuleTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/PhpRuleTest.php
-index 8fb883f79bf..a636aa81800 100644
---- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/PhpRuleTest.php
-+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/PhpRuleTest.php
-@@ -5,6 +5,13 @@
-  */
- namespace Magento\TestFramework\Dependency;
- 
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\TestFramework\Exception\NoSuchActionException;
-+
-+/**
-+ * Test for PhpRule dependency check
-+ */
- class PhpRuleTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -12,6 +19,15 @@ class PhpRuleTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $model;
- 
-+    /**
-+     * @var ObjectManagerHelper
-+     */
-+    private $objectManagerHelper;
-+
-+    /**
-+     * @inheritDoc
-+     * @throws \Exception
-+     */
-     protected function setUp()
-     {
-         $mapRoutes = ['someModule' => ['Magento\SomeModule'], 'anotherModule' => ['Magento\OneModule']];
-@@ -20,9 +36,23 @@ class PhpRuleTest extends \PHPUnit\Framework\TestCase
-             'Magento\Module1\Plugin1' => 'Magento\Module1\Subject',
-             'Magento\Module1\Plugin2' => 'Magento\Module2\Subject',
-         ];
--        $this->model = new PhpRule($mapRoutes, $mapLayoutBlocks, $pluginMap);
-+        $whitelist = [];
-+
-+        $this->objectManagerHelper = new ObjectManagerHelper($this);
-+        $this->model = $this->objectManagerHelper->getObject(
-+            PhpRule::class,
-+            [
-+                'mapRouters' => $mapRoutes,
-+                'mapLayoutBlocks' => $mapLayoutBlocks,
-+                'pluginMap' => $pluginMap,
-+                'whitelists' => $whitelist,
-+            ]
-+        );
-     }
- 
-+    /**
-+     * @throws \Exception
-+     */
-     public function testNonPhpGetDependencyInfo()
-     {
-         $content = 'any content';
-@@ -34,6 +64,7 @@ class PhpRuleTest extends \PHPUnit\Framework\TestCase
-      * @param string $content
-      * @param array $expected
-      * @dataProvider getDependencyInfoDataProvider
-+     * @throws \Exception
-      */
-     public function testGetDependencyInfo($class, $content, array $expected)
-     {
-@@ -96,22 +127,6 @@ class PhpRuleTest extends \PHPUnit\Framework\TestCase
-                     ]
-                 ]
-             ],
--            'getUrl from same module' => [
--                'Magento\SomeModule\SomeClass',
--                '$this->getUrl("someModule")',
--                []
--            ],
--            'getUrl from another module' => [
--                'Magento\SomeModule\SomeClass',
--                '$this->getUrl("anotherModule")',
--                [
--                    [
--                        'module' => 'Magento\OneModule',
--                        'type' => \Magento\TestFramework\Dependency\RuleInterface::TYPE_HARD,
--                        'source' => 'getUrl("anotherModule"',
--                    ]
--                ]
--            ],
-             'getBlock from same module' => [
-                 'Magento\SomeModule\SomeClass',
-                 '$this->getLayout()->getBlock(\'block.name\');', []
-@@ -173,11 +188,88 @@ class PhpRuleTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
-+    /**
-+     * @param string $class
-+     * @param string $content
-+     * @param array $expected
-+     * @throws \Exception
-+     * @dataProvider getDependencyInfoDataCaseGetUrlDataProvider
-+     */
-+    public function testGetDependencyInfoCaseGetUrl(
-+        string $class,
-+        string $content,
-+        array $expected
-+    ) {
-+        $file = $this->makeMockFilepath($class);
-+        $module = $this->getModuleFromClass($class);
-+
-+        $this->assertEquals($expected, $this->model->getDependencyInfo($module, 'php', $file, $content));
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getDependencyInfoDataCaseGetUrlDataProvider()
-+    {
-+        return [
-+            'getUrl from same module' => [
-+                'Magento\Cms\SomeClass',
-+                '$this->getUrl("cms/index/index")',
-+                []
-+            ],
-+            'getUrl from another module' => [
-+                'Magento\SomeModule\SomeClass',
-+                '$this->getUrl("cms/index/index")',
-+                [
-+                    [
-+                        'module' => 'Magento\Cms',
-+                        'type' => \Magento\TestFramework\Dependency\RuleInterface::TYPE_HARD,
-+                        'source' => 'getUrl("cms/index/index"',
-+                    ]
-+                ]
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * @param string $class
-+     * @param string $content
-+     * @param \Exception $expected
-+     * @throws \Exception
-+     * @dataProvider getDependencyInfoDataCaseGetUrlExceptionDataProvider
-+     */
-+    public function testGetDependencyInfoCaseGetUrlException(
-+        string $class,
-+        string $content,
-+        \Exception $expected
-+    ) {
-+        $file = $this->makeMockFilepath($class);
-+        $module = $this->getModuleFromClass($class);
-+        $this->expectExceptionObject($expected);
-+
-+        $this->model->getDependencyInfo($module, 'php', $file, $content);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getDependencyInfoDataCaseGetUrlExceptionDataProvider()
-+    {
-+        return [
-+            'getUrl from same module' => [
-+                'Magento\SomeModule\SomeClass',
-+                '$this->getUrl("someModule")',
-+                new LocalizedException(__('Invalid URL path: %1', 'somemodule/index/index')),
-+            ],
-+        ];
-+    }
-+
-     /**
-      * @param string $module
-      * @param string $content
-      * @param array $expected
-      * @dataProvider getDefaultModelDependencyDataProvider
-+     * @throws \Exception
-      */
-     public function testGetDefaultModelDependency($module, $content, array $expected)
-     {
-@@ -192,6 +284,9 @@ class PhpRuleTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($expected, $this->model->getDependencyInfo($module, 'template', 'any', $content));
-     }
- 
-+    /**
-+     * @return array
-+     */
-     public function getDefaultModelDependencyDataProvider()
-     {
-         return [
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/XssOutputValidatorTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/XssOutputValidatorTest.php
-deleted file mode 100644
-index ed9d8115cca..00000000000
---- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/XssOutputValidatorTest.php
-+++ /dev/null
-@@ -1,33 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\TestFramework\Utility;
--
--class XssOutputValidatorTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @param string $file
--     * @param string $expectedResults
--     * @dataProvider getLinesWithXssSensitiveOutputDataProvider
--     */
--    public function testGetLinesWithXssSensitiveOutput($file, $expectedResults)
--    {
--        $xssOutputValidator = new XssOutputValidator();
--        $lines = $xssOutputValidator->getLinesWithXssSensitiveOutput($file);
--        static::assertEquals($expectedResults, $lines);
--    }
--
--    /**
--     * @return array
--     */
--    public function getLinesWithXssSensitiveOutputDataProvider()
--    {
--        $fixturePath = __DIR__ . '/_files/';
--        return [
--            'xss_safe' => [$fixturePath . 'xss_safe.phtml', ''],
--            'xss_unsafe' => [$fixturePath . 'xss_unsafe.phtml', '9,10,11,12,13,14,15,16,18,22,23'],
--        ];
--    }
--}
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_safe.phtml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_safe.phtml
-deleted file mode 100644
-index 50d2503514d..00000000000
---- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_safe.phtml
-+++ /dev/null
-@@ -1,48 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--// @codingStandardsIgnoreFile
--?>
--
--<?= /* @escapeNotVerified */ $block->getSomeData() ?>
--<?= /* @noEscape */ $block->getSomeData() ?>
--<input name="form_key" type="hidden" value="<?= $block->escapeUrl($var) ?>" />
--<input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr('value') ?>" />
--<input name="form_key" type="hidden" value="<?= $block->escapeJs('value') ?>" />
--<?= $block->escapeCss('value') ?>
--echo $var;
--<?= $block->getHtmlId("some value") ?>
--<?= $block->getIdHtml("some value") ?>
--<?= $block->getIdHtml("some value") ?>
--<?= "\$var1" ?>
--<?= '$var' ?>
--<?= "value" ?>
--<?= 'value' ?>
--<?= (int)$var ?>
--<?= (bool)$var ?>
--<?= count($var) ?>
--<?= $object->methodHtml() ?>
--<?php pecho($var);?>
--<?= $object->methodHtml() .
--    (bool)$var .
--    $block->escapeUrl("some value");
--?>
--<?= /* @noEscape */ '\'' . $code . '\',\'' . $block->escapeHtml($data['parentSymbol']) . '\'' ?>
--<?= $block->getExtendedElement($switchAttributeCode)->toHtml() ?>
--<?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>
--<?php
--/**
-- * echo $someVar;
-- */
--?>
--
--<?php
--/* This part is commented to remove all <col> tags from the code. */
--/* foreach ($block->getColumns() as $_column): ?>
--    <col <?= $_column->getProperty() ?> />
--<?php endforeach; */ ?>
--
--<?= $block->escapeHtmlAttr($block->getParamValue('title_' . $store['value'])) ?>
-diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_unsafe.phtml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_unsafe.phtml
-deleted file mode 100644
-index bf3aec540b8..00000000000
---- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_unsafe.phtml
-+++ /dev/null
-@@ -1,29 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--// @codingStandardsIgnoreFile
--?>
--<?= $block->getSomeData() ?>
--<?= $block->getTitle() ?>
--<?= $object->getSomeMethod($block->getHtmlId()) ?>
--<?= "Title: $title" ?>
--<?= $block->escapeUrl($var) . $var . 'value' ?>
--<?= $var ?>
--<?= $someVar ?>
--<?= __("value") ?>
--
--<?= $object->methodHtml() .
--    $var .
--    $block->getSomeData();
--?>
--<?= '\'' . $code . '\',\'' . $block->escapeHtml($data['parentSymbol']) . '\'' ?>
--<?= "\"" . $code . "\",\"" . $block->escapeHtml($data['parentSymbol']) . "\"" ?>
--
--<?php
--/* This part is commented to remove all <col> tags from the code. */
--/* foreach ($block->getColumns() as $_column): ?>
--    <col <?= $_column->getProperty() ?> />
--<?php endforeach; */ ?>
-diff --git a/dev/tests/static/get_github_changes.php b/dev/tests/static/get_github_changes.php
-index dba235c184e..a619f951dac 100644
---- a/dev/tests/static/get_github_changes.php
-+++ b/dev/tests/static/get_github_changes.php
-@@ -147,6 +147,8 @@ function getRepo($options, $mainline)
- }
- 
- /**
-+ * Combine list of changed files based on comparison between forks.
-+ *
-  * @param string $mainline
-  * @param GitRepo $repo
-  * @param string $branchName
-@@ -158,6 +160,8 @@ function retrieveChangesAcrossForks($mainline, GitRepo $repo, $branchName)
- }
- 
- /**
-+ * Combine list of new files based on comparison between forks.
-+ *
-  * @param string $mainline
-  * @param GitRepo $repo
-  * @param string $branchName
-@@ -172,7 +176,7 @@ function retrieveNewFilesAcrossForks($mainline, GitRepo $repo, $branchName)
-  * Deletes temporary "base" repo
-  *
-  * @param GitRepo $repo
-- * @param string $repo
-+ * @param string $mainline
-  */
- function cleanup($repo, $mainline)
- {
-@@ -392,6 +396,7 @@ class GitRepo
- 
-     /**
-      * Find one of the allowed modification mask returned by git diff.
-+     *
-      * Example of change record: "A path/to/added_file"
-      *
-      * @param string $changeRecord
-@@ -427,7 +432,7 @@ class GitRepo
-                 'diff HEAD %s/%s -- %s',
-                 $remoteAlias,
-                 $remoteBranch,
--                $this->workTree . '/' . $fileName
-+                $fileName
-             )
-         );
- 
-diff --git a/dev/tests/static/phpunit-all.xml.dist b/dev/tests/static/phpunit-all.xml.dist
-index 3020889e606..7f067d9290f 100644
---- a/dev/tests/static/phpunit-all.xml.dist
-+++ b/dev/tests/static/phpunit-all.xml.dist
-@@ -23,4 +23,12 @@
-         <!-- TESTCODESTYLE_IS_FULL_SCAN - specify if full scan should be performed for test code style test -->
-         <const name="TESTCODESTYLE_IS_FULL_SCAN" value="0"/>
-     </php>
-+    <listeners>
-+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
-+            <arguments>
-+                <string>var/allure-results</string> <!-- XML files output directory -->
-+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
-+            </arguments>
-+        </listener>
-+    </listeners>
- </phpunit>
-diff --git a/dev/tests/static/phpunit.xml.dist b/dev/tests/static/phpunit.xml.dist
-index ec581ec992f..6c02ec13825 100644
---- a/dev/tests/static/phpunit.xml.dist
-+++ b/dev/tests/static/phpunit.xml.dist
-@@ -24,9 +24,6 @@
-         <testsuite name="Code Integrity Tests">
-             <directory>testsuite/Magento/Test/Integrity</directory>
-         </testsuite>
--        <testsuite name="Xss Unsafe Output Test">
--            <file>testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php</file>
--        </testsuite>
-     </testsuites>
-     <php>
-         <ini name="date.timezone" value="America/Los_Angeles"/>
-@@ -35,4 +32,12 @@
-         <!-- TESTS_COMPOSER_PATH - specify the path to composer binary, if a relative reference cannot be resolved -->
-         <!--<const name="TESTS_COMPOSER_PATH" value="/usr/local/bin/composer"/>-->
-     </php>
-+    <listeners>
-+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
-+            <arguments>
-+                <string>var/allure-results</string> <!-- XML files output directory -->
-+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
-+            </arguments>
-+        </listener>
-+    </listeners>
- </phpunit>
-diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
-index 6d627574a3a..b5a4e41b632 100644
---- a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
-@@ -194,7 +194,7 @@ class ClassesTest extends \PHPUnit\Framework\TestCase
-         foreach ($classes as $class) {
-             $class = trim($class, '\\');
-             try {
--                if (strrchr($class, '\\') === false and !Classes::isVirtual($class)) {
-+                if (strrchr($class, '\\') === false && !Classes::isVirtual($class)) {
-                     $badUsages[] = $class;
-                     continue;
-                 } else {
-diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
-new file mode 100644
-index 00000000000..e090338f90c
---- /dev/null
-+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
-@@ -0,0 +1,146 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Test\Integrity;
-+
-+use Magento\Test\Integrity\Dependency\DeclarativeSchemaDependencyProvider;
-+use Magento\Framework\App\Utility\Files;
-+use Magento\Framework\Component\ComponentRegistrar;
-+
-+/**
-+ * Class DeclarativeDependencyTest
-+ */
-+class DeclarativeDependencyTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var DeclarativeSchemaDependencyProvider
-+     */
-+    private $dependencyProvider;
-+
-+    /**
-+     * Sets up data
-+     *
-+     * @throws \Exception
-+     */
-+    protected function setUp()
-+    {
-+        $root = BP;
-+        $rootJson = $this->readJsonFile($root . '/composer.json', true);
-+        if (preg_match('/magento\/project-*/', $rootJson['name']) == 1) {
-+            // The Dependency test is skipped for vendor/magento build
-+            self::markTestSkipped(
-+                'MAGETWO-43654: The build is running from vendor/magento. DependencyTest is skipped.'
-+            );
-+        }
-+        $this->dependencyProvider = new DeclarativeSchemaDependencyProvider();
-+    }
-+
-+    /**
-+     * @throws \Exception
-+     */
-+    public function testUndeclaredDependencies()
-+    {
-+        $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
-+        $invoker(
-+            /**
-+             * Check undeclared modules dependencies for specified file
-+             *
-+             * @param string $fileType
-+             * @param string $file
-+             */
-+            function ($file) {
-+                $componentRegistrar = new ComponentRegistrar();
-+                $foundModuleName = '';
-+                foreach ($componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleName => $moduleDir) {
-+                    if (strpos($file, $moduleDir . '/') !== false) {
-+                        $foundModuleName = str_replace('_', '\\', $moduleName);
-+                        break;
-+                    }
-+                }
-+                if (empty($foundModuleName)) {
-+                    return;
-+                }
-+
-+                $undeclaredDependency = $this->dependencyProvider->getUndeclaredModuleDependencies($foundModuleName);
-+
-+                $result = [];
-+                foreach ($undeclaredDependency as $name => $modules) {
-+                    $modules = array_unique($modules);
-+                    $result[] = $this->getErrorMessage($name) . "\n" . implode("\t\n", $modules) . "\n";
-+                }
-+                if (!empty($result)) {
-+                    $this->fail(
-+                        'Module ' . $moduleName . ' has undeclared dependencies: ' . "\n" . implode("\t\n", $result)
-+                    );
-+                }
-+            },
-+            $this->prepareFiles(Files::init()->getDbSchemaFiles())
-+        );
-+    }
-+
-+    /**
-+     * Convert file list to data provider structure.
-+     *
-+     * @param string[] $files
-+     * @return array
-+     */
-+    private function prepareFiles(array $files): array
-+    {
-+        $result = [];
-+        foreach ($files as $relativePath => $file) {
-+            $absolutePath = reset($file);
-+            $result[$relativePath] = [$absolutePath];
-+        }
-+        return $result;
-+    }
-+
-+    /**
-+     * Retrieve error message for dependency.
-+     *
-+     * @param string $id
-+     * @return string
-+     */
-+    private function getErrorMessage(string $id): string
-+    {
-+        $decodedId = $this->dependencyProvider->decodeDependencyId($id);
-+        $entityType = $decodedId['entityType'];
-+        if ($entityType === DeclarativeSchemaDependencyProvider::SCHEMA_ENTITY_TABLE) {
-+            $message = sprintf(
-+                'Table %s has undeclared dependency on one of the following modules:',
-+                $decodedId['tableName']
-+            );
-+        } else {
-+            $message = sprintf(
-+                '%s %s from %s table has undeclared dependency on one of the following modules:',
-+                ucfirst($entityType),
-+                $decodedId['entityName'],
-+                $decodedId['tableName']
-+            );
-+        }
-+
-+        return $message;
-+    }
-+
-+    /**
-+     * Read data from json file.
-+     *
-+     * @param string $file
-+     * @return mixed
-+     * @throws \Exception
-+     */
-+    private function readJsonFile(string $file, bool $asArray = false)
-+    {
-+        $decodedJson = json_decode(file_get_contents($file), $asArray);
-+        if (null == $decodedJson) {
-+            //phpcs:ignore Magento2.Exceptions.DirectThrow
-+            throw new \Exception("Invalid Json: $file");
-+        }
-+
-+        return $decodedJson;
-+    }
-+}
-diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
-new file mode 100644
-index 00000000000..965bc618414
---- /dev/null
-+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
-@@ -0,0 +1,758 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Test\Integrity\Dependency;
-+
-+use Magento\Framework\App\Utility\Files;
-+use Magento\Framework\Component\ComponentRegistrar;
-+use Magento\Framework\Setup\Declaration\Schema\Config\Converter;
-+
-+/**
-+ * Provide information on the dependency between the modules according to the declarative schema.
-+ *
-+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-+ */
-+class DeclarativeSchemaDependencyProvider
-+{
-+    /**
-+     * Types of dependency between modules.
-+     */
-+    const TYPE_HARD = 'hard';
-+
-+    /**
-+     * The identifier of dependency for mapping.
-+     */
-+    const MAP_TYPE_DECLARED = 'declared';
-+
-+    /**
-+     * The identifier of dependency for mapping.
-+     */
-+    const MAP_TYPE_FOUND = 'found';
-+
-+    /**
-+     * Declarative name for table entity of the declarative schema.
-+     */
-+    const SCHEMA_ENTITY_TABLE = 'table';
-+
-+    /**
-+     * Declarative name for column entity of the declarative schema.
-+     */
-+    const SCHEMA_ENTITY_COLUMN = 'column';
-+
-+    /**
-+     * Declarative name for constraint entity of the declarative schema.
-+     */
-+    const SCHEMA_ENTITY_CONSTRAINT = 'constraint';
-+
-+    /**
-+     * Declarative name for index entity of the declarative schema.
-+     */
-+    const SCHEMA_ENTITY_INDEX = 'index';
-+
-+    /**
-+     * @var array
-+     */
-+    private $mapDependencies = [];
-+
-+    /**
-+     * @var array
-+     */
-+    private $dbSchemaDeclaration = [];
-+
-+    /**
-+     * @var array
-+     */
-+    private $packageModuleMapping = [];
-+
-+    /**
-+     * @var array
-+     */
-+    private $moduleSchemaFileMapping = [];
-+
-+    /**
-+     * Provide declared dependencies between modules based on the declarative schema configuration.
-+     *
-+     * @param string $moduleName
-+     * @return array
-+     * @throws \Exception
-+     */
-+    public function getDeclaredExistingModuleDependencies(string $moduleName): array
-+    {
-+        $this->initDeclaredDependencies();
-+        $dependencies = $this->getDependenciesFromFiles($this->getSchemaFileNameByModuleName($moduleName));
-+        $dependencies = $this->filterSelfDependency($moduleName, $dependencies);
-+        $declared = $this->getDeclaredDependencies($moduleName, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
-+
-+        $existingDeclared = [];
-+        foreach ($dependencies as $dependency) {
-+            $checkResult = array_intersect($declared, $dependency);
-+            if ($checkResult) {
-+                $existingDeclared = array_merge($existingDeclared, array_values($checkResult));
-+            }
-+        }
-+
-+        return array_unique($existingDeclared);
-+    }
-+
-+    /**
-+     * Provide undeclared dependencies between modules based on the declarative schema configuration.
-+     *
-+     * [
-+     *     $dependencyId => [$module1, $module2, $module3 ...],
-+     *     ...
-+     * ]
-+     *
-+     * @param string $moduleName
-+     * @return array
-+     * @throws \Exception
-+     */
-+    public function getUndeclaredModuleDependencies(string $moduleName): array
-+    {
-+        $this->initDeclaredDependencies();
-+        $dependencies = $this->getDependenciesFromFiles($this->getSchemaFileNameByModuleName($moduleName));
-+        $dependencies = $this->filterSelfDependency($moduleName, $dependencies);
-+        return $this->collectDependencies($moduleName, $dependencies);
-+    }
-+
-+    /**
-+     * Provide schema file name by module name.
-+     *
-+     * @param string $module
-+     * @return string
-+     * @throws \Exception
-+     */
-+    private function getSchemaFileNameByModuleName(string $module): string
-+    {
-+        if (empty($this->moduleSchemaFileMapping)) {
-+            $componentRegistrar = new ComponentRegistrar();
-+            foreach (array_values(Files::init()->getDbSchemaFiles()) as $filePath) {
-+                $filePath = reset($filePath);
-+                foreach ($componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleName => $moduleDir) {
-+                    if (strpos($filePath, $moduleDir . '/') !== false) {
-+                        $foundModuleName = str_replace('_', '\\', $moduleName);
-+                        $this->moduleSchemaFileMapping[$foundModuleName] = $filePath;
-+                        break;
-+                    }
-+                }
-+            }
-+        }
-+
-+        return $this->moduleSchemaFileMapping[$module] ?? '';
-+    }
-+
-+    /**
-+     * Initialise map of dependencies.
-+     *
-+     * @throws \Exception
-+     */
-+    private function initDeclaredDependencies()
-+    {
-+        if (empty($this->mapDependencies)) {
-+            $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
-+            foreach ($jsonFiles as $file) {
-+                $json = new \Magento\Framework\Config\Composer\Package($this->readJsonFile($file));
-+                $moduleName = $this->convertModuleName($json->get('name'));
-+                $require = array_keys((array)$json->get('require'));
-+                $this->presetDependencies($moduleName, $require, self::TYPE_HARD);
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Read data from json file.
-+     *
-+     * @param string $file
-+     * @return mixed
-+     * @throws \Exception
-+     */
-+    private function readJsonFile(string $file, bool $asArray = false)
-+    {
-+        $decodedJson = json_decode(file_get_contents($file), $asArray);
-+        if (null == $decodedJson) {
-+            //phpcs:ignore Magento2.Exceptions.DirectThrow
-+            throw new \Exception("Invalid Json: $file");
-+        }
-+
-+        return $decodedJson;
-+    }
-+
-+    /**
-+     * Remove self dependencies.
-+     *
-+     * @param string $moduleName
-+     * @param array $dependencies
-+     * @return array
-+     */
-+    private function filterSelfDependency(string $moduleName, array $dependencies):array
-+    {
-+        foreach ($dependencies as $id => $modules) {
-+            $decodedId = $this->decodeDependencyId($id);
-+            $entityType = $decodedId['entityType'];
-+            if ($entityType === self::SCHEMA_ENTITY_TABLE || $entityType === "column") {
-+                if (array_search($moduleName, $modules) !== false) {
-+                    unset($dependencies[$id]);
-+                }
-+            } else {
-+                $dependencies[$id] = $this->filterComplexDependency($moduleName, $modules);
-+            }
-+        }
-+
-+        return array_filter($dependencies);
-+    }
-+
-+    /**
-+     * Remove already declared dependencies.
-+     *
-+     * @param string $moduleName
-+     * @param array $modules
-+     * @return array
-+     */
-+    private function filterComplexDependency(string $moduleName, array $modules): array
-+    {
-+        $resultDependencies = [];
-+        if (!is_array(reset($modules))) {
-+            if (array_search($moduleName, $modules) === false) {
-+                $resultDependencies = $modules;
-+            }
-+        } else {
-+            foreach ($modules as $dependencySet) {
-+                if (array_search($moduleName, $dependencySet) === false) {
-+                    $resultDependencies = array_merge(
-+                        $resultDependencies,
-+                        $dependencySet
-+                    );
-+                }
-+            }
-+        }
-+
-+        return array_values(array_unique($resultDependencies));
-+    }
-+
-+    /**
-+     * Retrieve declarative schema declaration.
-+     *
-+     * @return array
-+     * @throws \Exception
-+     */
-+    private function getDeclarativeSchema(): array
-+    {
-+        if ($this->dbSchemaDeclaration) {
-+            return $this->dbSchemaDeclaration;
-+        }
-+
-+        $entityTypes = [self::SCHEMA_ENTITY_COLUMN, self::SCHEMA_ENTITY_CONSTRAINT, self::SCHEMA_ENTITY_INDEX];
-+        $declaration = [];
-+        foreach (Files::init()->getDbSchemaFiles() as $filePath) {
-+            $filePath = reset($filePath);
-+            preg_match('#app/code/(\w+/\w+)#', $filePath, $result);
-+            $moduleName = str_replace('/', '\\', $result[1]);
-+            $moduleDeclaration = $this->getDbSchemaDeclaration($filePath);
-+
-+            foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
-+                if (!isset($tableDeclaration['modules'])) {
-+                    $tableDeclaration['modules'] = [];
-+                }
-+                array_push($tableDeclaration['modules'], $moduleName);
-+                $moduleDeclaration = array_replace_recursive(
-+                    $moduleDeclaration,
-+                    [self::SCHEMA_ENTITY_TABLE =>
-+                        [
-+                            $tableName => $tableDeclaration,
-+                        ]
-+                    ]
-+                );
-+                foreach ($entityTypes as $entityType) {
-+                    if (!isset($tableDeclaration[$entityType])) {
-+                        continue;
-+                    }
-+                    $moduleDeclaration = array_replace_recursive(
-+                        $moduleDeclaration,
-+                        [self::SCHEMA_ENTITY_TABLE =>
-+                            [
-+                                $tableName =>
-+                                    $this->addModuleAssigment($tableDeclaration, $entityType, $moduleName)
-+                            ]
-+                        ]
-+                    );
-+                }
-+            }
-+            $declaration = array_merge_recursive($declaration, $moduleDeclaration);
-+        }
-+        $this->dbSchemaDeclaration = $declaration;
-+
-+        return $this->dbSchemaDeclaration;
-+    }
-+
-+    /**
-+     * Get declared dependencies.
-+     *
-+     * @param string $tableName
-+     * @param string $entityType
-+     * @param null|string $entityName
-+     * @return array
-+     * @throws \Exception
-+     */
-+    private function resolveEntityDependencies(string $tableName, string $entityType, ?string $entityName = null): array
-+    {
-+        switch ($entityType) {
-+            case self::SCHEMA_ENTITY_COLUMN:
-+            case self::SCHEMA_ENTITY_CONSTRAINT:
-+            case self::SCHEMA_ENTITY_INDEX:
-+                return $this->getDeclarativeSchema()
-+                [self::SCHEMA_ENTITY_TABLE][$tableName][$entityType][$entityName]['modules'];
-+            case self::SCHEMA_ENTITY_TABLE:
-+                return $this->getDeclarativeSchema()[self::SCHEMA_ENTITY_TABLE][$tableName]['modules'];
-+            default:
-+                return [];
-+        }
-+    }
-+
-+    /**
-+     * @param string $filePath
-+     * @return array
-+     */
-+    private function getDbSchemaDeclaration(string $filePath): array
-+    {
-+        $dom = new \DOMDocument();
-+        $dom->loadXML(file_get_contents($filePath));
-+        return (new Converter())->convert($dom);
-+    }
-+
-+    /**
-+     * Add dependency on the current module.
-+     *
-+     * @param array $tableDeclaration
-+     * @param string $entityType
-+     * @param string $moduleName
-+     * @return array
-+     */
-+    private function addModuleAssigment(
-+        array $tableDeclaration,
-+        string $entityType,
-+        string $moduleName
-+    ): array {
-+        $declarationWithAssigment = [];
-+        foreach ($tableDeclaration[$entityType] as $entityName => $entityDeclaration) {
-+            if (!isset($entityDeclaration['modules'])) {
-+                $entityDeclaration['modules'] = [];
-+            }
-+            if (!$this->isEntityDisabled($entityDeclaration)) {
-+                array_push($entityDeclaration['modules'], $moduleName);
-+            }
-+
-+            $declarationWithAssigment[$entityType][$entityName] = $entityDeclaration;
-+        }
-+
-+        return $declarationWithAssigment;
-+    }
-+
-+    /**
-+     * Retrieve dependencies from files.
-+     *
-+     * @param string $file
-+     * @return string[]
-+     * @throws \Exception
-+     */
-+    private function getDependenciesFromFiles($file)
-+    {
-+        if (!$file) {
-+            return [];
-+        }
-+
-+        $moduleDbSchema = $this->getDbSchemaDeclaration($file);
-+        $dependencies = array_merge_recursive(
-+            $this->getDisabledDependencies($moduleDbSchema),
-+            $this->getConstraintDependencies($moduleDbSchema),
-+            $this->getIndexDependencies($moduleDbSchema)
-+        );
-+        return $dependencies;
-+    }
-+
-+    /**
-+     * Retrieve dependencies for disabled entities.
-+     *
-+     * @param array $moduleDeclaration
-+     * @return array
-+     * @throws \Exception
-+     */
-+    private function getDisabledDependencies(array $moduleDeclaration): array
-+    {
-+        $disabledDependencies = [];
-+        $entityTypes = [self::SCHEMA_ENTITY_COLUMN, self::SCHEMA_ENTITY_CONSTRAINT, self::SCHEMA_ENTITY_INDEX];
-+        foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
-+            foreach ($entityTypes as $entityType) {
-+                if (!isset($tableDeclaration[$entityType])) {
-+                    continue;
-+                }
-+                foreach ($tableDeclaration[$entityType] as $entityName => $entityDeclaration) {
-+                    if ($this->isEntityDisabled($entityDeclaration)) {
-+                        $dependencyIdentifier = $this->getDependencyId($tableName, $entityType, $entityName);
-+                        $disabledDependencies[$dependencyIdentifier] =
-+                            $this->resolveEntityDependencies($tableName, $entityType, $entityName);
-+                    }
-+                }
-+            }
-+            if ($this->isEntityDisabled($tableDeclaration)) {
-+                $disabledDependencies[$this->getDependencyId($tableName)] =
-+                    $this->resolveEntityDependencies($tableName, self::SCHEMA_ENTITY_TABLE);
-+            }
-+        }
-+
-+        return $disabledDependencies;
-+    }
-+
-+    /**
-+     * Retrieve dependencies for foreign entities.
-+     *
-+     * @param array $constraintDeclaration
-+     * @return array
-+     * @throws \Exception
-+     */
-+    private function getFKDependencies(array $constraintDeclaration): array
-+    {
-+        $referenceDependencyIdentifier =
-+            $this->getDependencyId(
-+                $constraintDeclaration['referenceTable'],
-+                self::SCHEMA_ENTITY_CONSTRAINT,
-+                $constraintDeclaration['referenceId']
-+            );
-+        $dependencyIdentifier =
-+            $this->getDependencyId(
-+                $constraintDeclaration[self::SCHEMA_ENTITY_TABLE],
-+                self::SCHEMA_ENTITY_CONSTRAINT,
-+                $constraintDeclaration['referenceId']
-+            );
-+
-+        $constraintDependencies = [];
-+        $constraintDependencies[$referenceDependencyIdentifier] =
-+            $this->resolveEntityDependencies(
-+                $constraintDeclaration['referenceTable'],
-+                self::SCHEMA_ENTITY_COLUMN,
-+                $constraintDeclaration['referenceColumn']
-+            );
-+        $constraintDependencies[$dependencyIdentifier] =
-+            $this->resolveEntityDependencies(
-+                $constraintDeclaration[self::SCHEMA_ENTITY_TABLE],
-+                self::SCHEMA_ENTITY_COLUMN,
-+                $constraintDeclaration[self::SCHEMA_ENTITY_COLUMN]
-+            );
-+
-+        return $constraintDependencies;
-+    }
-+
-+    /**
-+     * Retrieve dependencies for constraint entities.
-+     *
-+     * @param array $moduleDeclaration
-+     * @return array
-+     * @throws \Exception
-+     */
-+    private function getConstraintDependencies(array $moduleDeclaration): array
-+    {
-+        $constraintDependencies = [];
-+        foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
-+            if (empty($tableDeclaration[self::SCHEMA_ENTITY_CONSTRAINT])) {
-+                continue;
-+            }
-+            foreach ($tableDeclaration[self::SCHEMA_ENTITY_CONSTRAINT] as $constraintName => $constraintDeclaration) {
-+                if ($this->isEntityDisabled($constraintDeclaration)) {
-+                    continue;
-+                }
-+                $dependencyIdentifier =
-+                    $this->getDependencyId($tableName, self::SCHEMA_ENTITY_CONSTRAINT, $constraintName);
-+                switch ($constraintDeclaration['type']) {
-+                    case 'foreign':
-+                        $constraintDependencies = array_merge(
-+                            $constraintDependencies,
-+                            $this->getFKDependencies($constraintDeclaration)
-+                        );
-+                        break;
-+                    case 'primary':
-+                    case 'unique':
-+                        $constraintDependencies[$dependencyIdentifier] = $this->getComplexDependency(
-+                            $tableName,
-+                            $constraintDeclaration
-+                        );
-+                }
-+            }
-+        }
-+        return $constraintDependencies;
-+    }
-+
-+    /**
-+     * Calculate complex dependency.
-+     *
-+     * @param string $tableName
-+     * @param array $entityDeclaration
-+     * @return array
-+     * @throws \Exception
-+     */
-+    private function getComplexDependency(string $tableName, array $entityDeclaration): array
-+    {
-+        $complexDependency = [];
-+        if (empty($entityDeclaration[self::SCHEMA_ENTITY_COLUMN])) {
-+            return $complexDependency;
-+        }
-+
-+        if (!is_array($entityDeclaration[self::SCHEMA_ENTITY_COLUMN])) {
-+            $entityDeclaration[self::SCHEMA_ENTITY_COLUMN] = [$entityDeclaration[self::SCHEMA_ENTITY_COLUMN]];
-+        }
-+
-+        foreach (array_keys($entityDeclaration[self::SCHEMA_ENTITY_COLUMN]) as $columnName) {
-+            $complexDependency[] =
-+                $this->resolveEntityDependencies($tableName, self::SCHEMA_ENTITY_COLUMN, $columnName);
-+        }
-+
-+        return array_values($complexDependency);
-+    }
-+
-+    /**
-+     * Retrieve dependencies for index entities.
-+     *
-+     * @param array $moduleDeclaration
-+     * @return array
-+     * @throws \Exception
-+     */
-+    private function getIndexDependencies(array $moduleDeclaration): array
-+    {
-+        $indexDependencies = [];
-+        foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
-+            if (empty($tableDeclaration[self::SCHEMA_ENTITY_INDEX])) {
-+                continue;
-+            }
-+            foreach ($tableDeclaration[self::SCHEMA_ENTITY_INDEX] as $indexName => $indexDeclaration) {
-+                if ($this->isEntityDisabled($indexDeclaration)) {
-+                    continue;
-+                }
-+                $dependencyIdentifier =
-+                    $this->getDependencyId($tableName, self::SCHEMA_ENTITY_INDEX, $indexName);
-+                $indexDependencies[$dependencyIdentifier] =
-+                    $this->getComplexDependency($tableName, $indexDeclaration);
-+            }
-+        }
-+
-+        return $indexDependencies;
-+    }
-+
-+    /**
-+     * Check status of the entity declaration.
-+     *
-+     * @param array $entityDeclaration
-+     * @return bool
-+     */
-+    private function isEntityDisabled(array $entityDeclaration): bool
-+    {
-+        return isset($entityDeclaration['disabled']) && $entityDeclaration['disabled'] == true;
-+    }
-+
-+    /**
-+     * Retrieve dependency id.
-+     *
-+     * @param string $tableName
-+     * @param string $entityType
-+     * @param null|string $entityName
-+     * @return string
-+     */
-+    private function getDependencyId(
-+        string $tableName,
-+        string $entityType = self::SCHEMA_ENTITY_TABLE,
-+        ?string $entityName = null
-+    ) {
-+        return implode('___', [$tableName, $entityType, $entityName ?: $tableName]);
-+    }
-+
-+    /**
-+     * Retrieve dependency parameters from dependency id.
-+     *
-+     * @param string $id
-+     * @return array
-+     */
-+    public static function decodeDependencyId(string $id): array
-+    {
-+        $decodedValues = explode('___', $id);
-+        $result = [
-+            'tableName' => $decodedValues[0],
-+            'entityType' => $decodedValues[1],
-+            'entityName' => $decodedValues[2],
-+        ];
-+        return $result;
-+    }
-+
-+    /**
-+     * Collect module dependencies.
-+     *
-+     * @param string $currentModuleName
-+     * @param array $dependencies
-+     * @return array
-+     */
-+    private function collectDependencies($currentModuleName, $dependencies = [])
-+    {
-+        if (empty($dependencies)) {
-+            return [];
-+        }
-+        foreach ($dependencies as $dependencyName => $dependency) {
-+            $this->collectDependency($dependencyName, $dependency, $currentModuleName);
-+        }
-+
-+        return $this->getDeclaredDependencies($currentModuleName, self::TYPE_HARD, self::MAP_TYPE_FOUND);
-+    }
-+
-+    /**
-+     * Collect a module dependency.
-+     *
-+     * @param string $dependencyName
-+     * @param array $dependency
-+     * @param string $currentModule
-+     */
-+    private function collectDependency(
-+        string $dependencyName,
-+        array $dependency,
-+        string $currentModule
-+    ) {
-+        $declared = $this->getDeclaredDependencies($currentModule, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
-+        $checkResult = array_intersect($declared, $dependency);
-+
-+        if (empty($checkResult)) {
-+            $this->addDependencies(
-+                $currentModule,
-+                self::TYPE_HARD,
-+                self::MAP_TYPE_FOUND,
-+                [
-+                    $dependencyName => $dependency,
-+                ]
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Add dependencies to dependency list.
-+     *
-+     * @param string $moduleName
-+     * @param array $packageNames
-+     * @param string $type
-+     *
-+     * @return void
-+     * @throws \Exception
-+     */
-+    private function presetDependencies(
-+        string $moduleName,
-+        array $packageNames,
-+        string $type
-+    ): void {
-+        $packageNames = array_filter($packageNames, function ($packageName) {
-+            return $this->getModuleName($packageName) ||
-+                0 === strpos($packageName, 'magento/') && 'magento/magento-composer-installer' != $packageName;
-+        });
-+
-+        foreach ($packageNames as $packageName) {
-+            $this->addDependencies(
-+                $moduleName,
-+                $type,
-+                self::MAP_TYPE_DECLARED,
-+                [$this->convertModuleName($packageName)]
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Returns package name on module name mapping.
-+     *
-+     * @return array
-+     * @throws \Exception
-+     */
-+    private function getPackageModuleMapping(): array
-+    {
-+        if (!$this->packageModuleMapping) {
-+            $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
-+
-+            $packageModuleMapping = [];
-+            foreach ($jsonFiles as $file) {
-+                $moduleXml = simplexml_load_file(dirname($file) . '/etc/module.xml');
-+                $moduleName = str_replace('_', '\\', (string)$moduleXml->module->attributes()->name);
-+                $composerJson = $this->readJsonFile($file);
-+                $packageName = $composerJson->name;
-+                $packageModuleMapping[$packageName] = $moduleName;
-+            }
-+
-+            $this->packageModuleMapping = $packageModuleMapping;
-+        }
-+
-+        return $this->packageModuleMapping;
-+    }
-+
-+    /**
-+     * Retrieve Magento style module name.
-+     *
-+     * @param string $packageName
-+     * @return null|string
-+     * @throws \Exception
-+     */
-+    private function getModuleName(string $packageName): ?string
-+    {
-+        return $this->getPackageModuleMapping()[$packageName] ?? null;
-+    }
-+
-+    /**
-+     * Retrieve array of dependency items.
-+     *
-+     * @param $module
-+     * @param $type
-+     * @param $mapType
-+     * @return array
-+     */
-+    private function getDeclaredDependencies(string $module, string $type, string $mapType)
-+    {
-+        return $this->mapDependencies[$module][$type][$mapType] ?? [];
-+    }
-+
-+    /**
-+     * Add dependency map items.
-+     *
-+     * @param $module
-+     * @param $type
-+     * @param $mapType
-+     * @param $dependencies
-+     */
-+    protected function addDependencies(string $module, string $type, string $mapType, array $dependencies)
-+    {
-+        $this->mapDependencies[$module][$type][$mapType] = array_merge_recursive(
-+            $this->getDeclaredDependencies($module, $type, $mapType),
-+            $dependencies
-+        );
-+    }
-+
-+    /**
-+     * Converts a composer json component name into the Magento Module form.
-+     *
-+     * @param string $jsonName The name of a composer json component or dependency e.g. 'magento/module-theme'
-+     * @return string The corresponding Magento Module e.g. 'Magento\Theme'
-+     * @throws \Exception
-+     */
-+    private function convertModuleName(string $jsonName): string
-+    {
-+        $moduleName = $this->getModuleName($jsonName);
-+        if ($moduleName) {
-+            return $moduleName;
-+        }
-+
-+        if (strpos($jsonName, 'magento/magento') !== false
-+            || strpos($jsonName, 'magento/framework') !== false
-+        ) {
-+            $moduleName = str_replace('/', "\t", $jsonName);
-+            $moduleName = str_replace('framework-', "Framework\t", $moduleName);
-+            $moduleName = str_replace('-', ' ', $moduleName);
-+            $moduleName = ucwords($moduleName);
-+            $moduleName = str_replace("\t", '\\', $moduleName);
-+            $moduleName = str_replace(' ', '', $moduleName);
-+        } else {
-+            $moduleName = $jsonName;
-+        }
-+
-+        return $moduleName;
-+    }
-+}
-diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
-index a4113abed80..16ba295588b 100644
---- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
-@@ -10,12 +10,15 @@ namespace Magento\Test\Integrity;
- 
- use Magento\Framework\App\Utility\Files;
- use Magento\Framework\Component\ComponentRegistrar;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Test\Integrity\Dependency\DeclarativeSchemaDependencyProvider;
- use Magento\TestFramework\Dependency\DbRule;
--use Magento\TestFramework\Dependency\DeclarativeSchemaRule;
- use Magento\TestFramework\Dependency\DiRule;
- use Magento\TestFramework\Dependency\LayoutRule;
- use Magento\TestFramework\Dependency\PhpRule;
- use Magento\TestFramework\Dependency\ReportsConfigRule;
-+use Magento\TestFramework\Dependency\AnalyticsConfigRule;
-+use Magento\TestFramework\Dependency\Route\RouteMapper;
- use Magento\TestFramework\Dependency\VirtualType\VirtualTypeMapper;
- 
- /**
-@@ -25,19 +28,28 @@ use Magento\TestFramework\Dependency\VirtualType\VirtualTypeMapper;
- class DependencyTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * Types of dependencies between modules
-+     * Soft dependency between modules
-      */
-     const TYPE_SOFT = 'soft';
- 
-+    /**
-+     * Hard dependency between modules
-+     */
-     const TYPE_HARD = 'hard';
- 
-     /**
--     * Types of dependencies map arrays
-+     * The identifier of dependency for mapping.
-      */
-     const MAP_TYPE_DECLARED = 'declared';
- 
-+    /**
-+     * The identifier of dependency for mapping.
-+     */
-     const MAP_TYPE_FOUND = 'found';
- 
-+    /**
-+     * The identifier of dependency for mapping.
-+     */
-     const MAP_TYPE_REDUNDANT = 'redundant';
- 
-     /**
-@@ -57,18 +69,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-     protected static $_listConfigXml = [];
- 
-     /**
--     * List of db_schema.xml files by modules
--     *
--     * Format: array(
--     *  '{Module_Name}' => '{Filename}'
--     * )
--     *
--     * @var array
--     */
--    protected static $_listDbSchemaXml = [];
--
--    /**
--     * List of routes.xml files by modules
-+     * List of analytics.xml
-      *
-      * Format: array(
-      *  '{Module_Name}' => '{Filename}'
-@@ -76,18 +77,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-      *
-      * @var array
-      */
--    protected static $_listRoutesXml = [];
--
--    /**
--     * List of routers
--     *
--     * Format: array(
--     *  '{Router}' => '{Module_Name}'
--     * )
--     *
--     * @var array
--     */
--    protected static $_mapRouters = [];
-+    protected static $_listAnalyticsXml = [];
- 
-     /**
-      * List of layout blocks
-@@ -157,8 +147,22 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-      */
-     private static $whiteList = [];
- 
-+    /**
-+     * Routes whitelist
-+     *
-+     * @var array|null
-+     */
-+    private static $routesWhitelist = null;
-+
-+    /**
-+     * @var RouteMapper
-+     */
-+    private static $routeMapper = null;
-+
-     /**
-      * Sets up data
-+     *
-+     * @throws \Exception
-      */
-     public static function setUpBeforeClass()
-     {
-@@ -171,13 +175,12 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-             );
-         }
- 
-+        self::$routeMapper = new RouteMapper();
-         self::$_namespaces = implode('|', Files::init()->getNamespaces());
- 
-         self::_prepareListConfigXml();
--        self::_prepareListDbSchemaXml();
--        self::_prepareListRoutesXml();
-+        self::_prepareListAnalyticsXml();
- 
--        self::_prepareMapRouters();
-         self::_prepareMapLayoutBlocks();
-         self::_prepareMapLayoutHandles();
- 
-@@ -211,6 +214,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-         $defaultThemes = [];
-         foreach (self::$_listConfigXml as $file) {
-             $config = simplexml_load_file($file);
-+            //phpcs:ignore Generic.PHP.NoSilencedErrors
-             $nodes = @($config->xpath("/config/*/design/theme/full_name") ?: []);
-             foreach ($nodes as $node) {
-                 $defaultThemes[] = (string)$node;
-@@ -221,28 +225,56 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * Create rules objects
-+     *
-+     * @throws \Exception
-      */
-     protected static function _initRules()
-     {
--        $replaceFilePattern = str_replace('\\', '/', realpath(__DIR__)) . '/_files/dependency_test/*.php';
-+        $replaceFilePattern = str_replace('\\', '/', realpath(__DIR__))
-+            . '/_files/dependency_test/tables_*.php';
-         $dbRuleTables = [];
-         foreach (glob($replaceFilePattern) as $fileName) {
-+            //phpcs:ignore Generic.PHP.NoSilencedErrors
-             $dbRuleTables = array_merge($dbRuleTables, @include $fileName);
-         }
-         self::$_rulesInstances = [
--            new DeclarativeSchemaRule($dbRuleTables),
--            new PhpRule(self::$_mapRouters, self::$_mapLayoutBlocks),
-+            new PhpRule(
-+                self::$routeMapper->getRoutes(),
-+                self::$_mapLayoutBlocks,
-+                [],
-+                ['routes' => self::getRoutesWhitelist()]
-+            ),
-             new DbRule($dbRuleTables),
-             new LayoutRule(
--                self::$_mapRouters,
-+                self::$routeMapper->getRoutes(),
-                 self::$_mapLayoutBlocks,
-                 self::$_mapLayoutHandles
-             ),
-             new DiRule(new VirtualTypeMapper()),
-             new ReportsConfigRule($dbRuleTables),
-+            new AnalyticsConfigRule(),
-         ];
-     }
- 
-+    /**
-+     * Initialize routes whitelist
-+     *
-+     * @return array
-+     */
-+    private static function getRoutesWhitelist(): array
-+    {
-+        if (is_null(self::$routesWhitelist)) {
-+            $routesWhitelistFilePattern = realpath(__DIR__) . '/_files/dependency_test/whitelist/routes_*.php';
-+            $routesWhitelist = [];
-+            foreach (glob($routesWhitelistFilePattern) as $fileName) {
-+                $routesWhitelist = array_merge($routesWhitelist, include $fileName);
-+            }
-+            self::$routesWhitelist = $routesWhitelist;
-+        }
-+
-+        return self::$routesWhitelist;
-+    }
-+
-     /**
-      * Return cleaned file contents
-      *
-@@ -256,12 +288,12 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-         switch ($fileType) {
-             case 'php':
-                 //Removing php comments
--                $contents = preg_replace('~/\*.*?\*/~s', '', $contents);
-+                $contents = preg_replace('~/\*.*?\*/~m', '', $contents);
-+                $contents = preg_replace('~^\s*/\*.*?\*/~sm', '', $contents);
-                 $contents = preg_replace('~^\s*//.*$~m', '', $contents);
-                 break;
-             case 'layout':
-             case 'config':
--            case 'db_schema':
-                 //Removing xml comments
-                 $contents = preg_replace('~\<!\-\-/.*?\-\-\>~s', '', $contents);
-                 break;
-@@ -285,6 +317,10 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-         return $contents;
-     }
- 
-+    /**
-+     * @inheritdoc
-+     * @throws \Exception
-+     */
-     public function testUndeclared()
-     {
-         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
-@@ -327,12 +363,12 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-                 $result = [];
-                 foreach ($undeclaredDependency as $type => $modules) {
-                     $modules = array_unique($modules);
--                    if (!count($modules)) {
-+                    if (empty($modules)) {
-                         continue;
-                     }
-                     $result[] = sprintf("%s [%s]", $type, implode(', ', $modules));
-                 }
--                if (count($result)) {
-+                if (!empty($result)) {
-                     $this->fail('Module ' . $module . ' has undeclared dependencies: ' . implode(', ', $result));
-                 }
-             },
-@@ -348,6 +384,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-      * @param string $file
-      * @param string $contents
-      * @return string[]
-+     * @throws LocalizedException
-      */
-     protected function getDependenciesFromFiles($module, $fileType, $file, $contents)
-     {
-@@ -358,6 +395,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-             $newDependencies = $rule->getDependencyInfo($module, $fileType, $file, $contents);
-             $dependencies = array_merge($dependencies, $newDependencies);
-         }
-+
-         foreach ($dependencies as $key => $dependency) {
-             foreach (self::$whiteList as $namespace) {
-                 if (strpos($dependency['source'], $namespace) !== false) {
-@@ -378,7 +416,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-      */
-     protected function _collectDependencies($currentModuleName, $dependencies = [])
-     {
--        if (!count($dependencies)) {
-+        if (empty($dependencies)) {
-             return [];
-         }
-         $undeclared = [];
-@@ -397,37 +435,86 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-      */
-     private function collectDependency($dependency, $currentModule, &$undeclared)
-     {
--        $module = $dependency['module'];
--        $nsModule = str_replace('_', '\\', $module);
-         $type = isset($dependency['type']) ? $dependency['type'] : self::TYPE_HARD;
- 
-         $soft = $this->_getDependencies($currentModule, self::TYPE_SOFT, self::MAP_TYPE_DECLARED);
-         $hard = $this->_getDependencies($currentModule, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
- 
-         $declared = $type == self::TYPE_SOFT ? array_merge($soft, $hard) : $hard;
--        if (!in_array($module, $declared) && !in_array($nsModule, $declared) && !$this->_isFake($nsModule)) {
--            $undeclared[$type][] = $module;
--        } elseif ((in_array($module, $declared) || in_array($nsModule, $declared)) && $this->_isFake($nsModule)) {
--            $this->_setDependencies($currentModule, $type, self::MAP_TYPE_REDUNDANT, $module);
-+
-+        $module = $dependency['module'];
-+        if (is_array($module)) {
-+            $this->collectConditionalDependencies($module, $type, $currentModule, $declared, $undeclared);
-+        } else {
-+            $nsModule = str_replace('_', '\\', $module);
-+
-+            if (!in_array($nsModule, $declared) && !$this->_isFake($nsModule)) {
-+                $undeclared[$type][] = $module;
-+            } elseif (in_array($nsModule, $declared) && $this->_isFake($nsModule)) {
-+                $this->_setDependencies($currentModule, $type, self::MAP_TYPE_REDUNDANT, $module);
-+            }
-+
-+            $this->addDependency($currentModule, $type, self::MAP_TYPE_FOUND, $nsModule);
-+        }
-+    }
-+
-+    /**
-+     * Collect non-strict dependencies when the module depends on one of modules
-+     *
-+     * @param array $conditionalDependencies
-+     * @param string $type
-+     * @param string $currentModule
-+     * @param array $declared
-+     * @param array $undeclared
-+     */
-+    private function collectConditionalDependencies(
-+        array $conditionalDependencies,
-+        string $type,
-+        string $currentModule,
-+        array $declared,
-+        array &$undeclared
-+    ) {
-+        array_walk(
-+            $conditionalDependencies,
-+            function (&$moduleName) {
-+                $moduleName = str_replace('_', '\\', $moduleName);
-+            }
-+        );
-+        $declaredDependencies = array_intersect($conditionalDependencies, $declared);
-+
-+        foreach ($declaredDependencies as $moduleName) {
-+            if ($this->_isFake($moduleName)) {
-+                $this->_setDependencies($currentModule, $type, self::MAP_TYPE_REDUNDANT, $moduleName);
-+            }
-+
-+            $this->addDependency($currentModule, $type, self::MAP_TYPE_FOUND, $moduleName);
-         }
- 
--        $this->addDependency($currentModule, $type, self::MAP_TYPE_FOUND, $nsModule);
-+        if (empty($declaredDependencies)) {
-+            $undeclared[$type][] = implode(" || ", $conditionalDependencies);
-+        }
-     }
- 
-     /**
-      * Collect redundant dependencies
-+     *
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      * @test
-      * @depends testUndeclared
-+     * @throws \Exception
-      */
-     public function collectRedundant()
-     {
-+        $schemaDependencyProvider = new DeclarativeSchemaDependencyProvider();
-+
-         foreach (array_keys(self::$mapDependencies) as $module) {
-             $declared = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
-             $found = array_merge(
-                 $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_FOUND),
--                $this->_getDependencies($module, self::TYPE_SOFT, self::MAP_TYPE_FOUND)
-+                $this->_getDependencies($module, self::TYPE_SOFT, self::MAP_TYPE_FOUND),
-+                $schemaDependencyProvider->getDeclaredExistingModuleDependencies($module)
-             );
-+
-             $found['Magento\Framework'] = 'Magento\Framework';
-             $this->_setDependencies($module, self::TYPE_HARD, self::MAP_TYPE_REDUNDANT, array_diff($declared, $found));
-         }
-@@ -444,7 +531,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-         foreach (array_keys(self::$mapDependencies) as $module) {
-             $result = [];
-             $redundant = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_REDUNDANT);
--            if (count($redundant)) {
-+            if (!empty($redundant)) {
-                 $result[] = sprintf(
-                     "\r\nModule %s: %s [%s]",
-                     $module,
-@@ -453,11 +540,11 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-                 );
-             }
- 
--            if (count($result)) {
-+            if (!empty($result)) {
-                 $output[] = implode(', ', $result);
-             }
-         }
--        if (count($output)) {
-+        if (!empty($output)) {
-             $this->fail("Redundant dependencies found!\r\n" . implode(' ', $output));
-         }
-     }
-@@ -487,6 +574,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-      * Return all files
-      *
-      * @return array
-+     * @throws \Exception
-      */
-     public function getAllFiles()
-     {
-@@ -508,12 +596,6 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-             $this->_prepareFiles('config', Files::init()->getConfigFiles())
-         );
- 
--        // Get all configuration files
--        $files = array_merge(
--            $files,
--            $this->_prepareFiles('db_schema', Files::init()->getDbSchemaFiles())
--        );
--
-         //Get all layout updates files
-         $files = array_merge(
-             $files,
-@@ -531,6 +613,8 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * Prepare list of config.xml files (by modules).
-+     *
-+     * @throws \Exception
-      */
-     protected static function _prepareListConfigXml()
-     {
-@@ -544,84 +628,25 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * Prepare list of db_schema.xml files (by modules)
--     */
--    protected static function _prepareListDbSchemaXml()
--    {
--        $files = Files::init()->getDbSchemaFiles('db_schema.xml', [], false);
--        foreach ($files as $file) {
--            if (preg_match('/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)/', $file, $matches)) {
--                $module = $matches['namespace'] . '\\' . $matches['module'];
--                self::$_listDbSchemaXml[$module] = $file;
--            }
--        }
--    }
--
--    /**
--     * Prepare list of routes.xml files (by modules)
-+     * Prepare list of analytics.xml files
-+     *
-+     * @throws \Exception
-      */
--    protected static function _prepareListRoutesXml()
-+    protected static function _prepareListAnalyticsXml()
-     {
--        $files = Files::init()->getConfigFiles('*/routes.xml', [], false);
-+        $files = Files::init()->getDbSchemaFiles('analytics.xml', [], false);
-         foreach ($files as $file) {
-             if (preg_match('/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)/', $file, $matches)) {
-                 $module = $matches['namespace'] . '\\' . $matches['module'];
--                self::$_listRoutesXml[$module][] = $file;
--            }
--        }
--    }
--
--    /**
--     * Prepare map of routers
--     */
--    protected static function _prepareMapRouters()
--    {
--        $pattern = '/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)\/Controller\/' .
--            '(?<path>[\/\w]*).php/';
--
--        $files = Files::init()->getPhpFiles(Files::INCLUDE_APP_CODE | Files::INCLUDE_NON_CLASSES);
--        foreach ($files as $file) {
--            if (preg_match($pattern, $file, $matches)) {
--                $module = $matches['namespace'] . '\\' . $matches['module'];
--                if (!empty(self::$_listRoutesXml[$module])) {
--                    foreach (self::$_listRoutesXml[$module] as $configFile) {
--                        self::updateRoutersMap($module, $configFile);
--                    }
--                }
--            }
--        }
--    }
--
--    /**
--     * Update routers map for the module basing on the routing config file
--     *
--     * @param string $module
--     * @param string $configFile
--     *
--     * @return void
--     */
--    private static function updateRoutersMap($module, $configFile)
--    {
--        // Read module's routes.xml file
--        $config = simplexml_load_file($configFile);
--        $nodes  = $config->xpath("/config/router/*");
--        foreach ($nodes as $node) {
--            $id = (string)$node['id'];
--            if ($id != 'adminhtml' && '' == (string)$node['frontName']) {
--                // Exclude overridden routers
--                continue;
--            }
--            if (!isset(self::$_mapRouters[$id])) {
--                self::$_mapRouters[$id] = [];
--            }
--            if (!in_array($module, self::$_mapRouters[$id])) {
--                self::$_mapRouters[$id][] = $module;
-+                self::$_listAnalyticsXml[$module] = $file;
-             }
-         }
-     }
- 
-     /**
-      * Prepare map of layout blocks
-+     *
-+     * @throws \Exception
-      */
-     protected static function _prepareMapLayoutBlocks()
-     {
-@@ -630,7 +655,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-             $area = 'default';
-             if (preg_match('/[\/](?<area>adminhtml|frontend)[\/]/', $file, $matches)) {
-                 $area = $matches['area'];
--                self::$_mapLayoutBlocks[$area] = @(self::$_mapLayoutBlocks[$area] ?: []);
-+                self::$_mapLayoutBlocks[$area] = self::$_mapLayoutBlocks[$area] ?? [];
-             }
-             if (preg_match('/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)/', $file, $matches)) {
-                 $module = $matches['namespace'] . '\\' . $matches['module'];
-@@ -640,7 +665,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-                     $attributes = $element->attributes();
-                     $block = (string)$attributes->name;
-                     if (!empty($block)) {
--                        self::$_mapLayoutBlocks[$area][$block] = @(self::$_mapLayoutBlocks[$area][$block] ?: []);
-+                        self::$_mapLayoutBlocks[$area][$block] = self::$_mapLayoutBlocks[$area][$block] ?? [];
-                         self::$_mapLayoutBlocks[$area][$block][$module] = $module;
-                     }
-                 }
-@@ -650,6 +675,8 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * Prepare map of layout handles
-+     *
-+     * @throws \Exception
-      */
-     protected static function _prepareMapLayoutHandles()
-     {
-@@ -658,7 +685,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-             $area = 'default';
-             if (preg_match('/\/(?<area>adminhtml|frontend)\//', $file, $matches)) {
-                 $area = $matches['area'];
--                self::$_mapLayoutHandles[$area] = @(self::$_mapLayoutHandles[$area] ?: []);
-+                self::$_mapLayoutHandles[$area] = self::$_mapLayoutHandles[$area] ?? [];
-             }
-             if (preg_match('/app\/code\/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)/', $file, $matches)
-             ) {
-@@ -667,7 +694,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-                 foreach ((array)$xml->xpath('/layout/child::*') as $element) {
-                     /** @var \SimpleXMLElement $element */
-                     $handle = $element->getName();
--                    self::$_mapLayoutHandles[$area][$handle] = @(self::$_mapLayoutHandles[$area][$handle] ?: []);
-+                    self::$_mapLayoutHandles[$area][$handle] = self::$_mapLayoutHandles[$area][$handle] ?? [];
-                     self::$_mapLayoutHandles[$area][$handle][$module] = $module;
-                 }
-             }
-@@ -727,6 +754,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-             $contents = file_get_contents($file);
-             $decodedJson = json_decode($contents);
-             if (null == $decodedJson) {
-+                //phpcs:ignore Magento2.Exceptions.DirectThrow
-                 throw new \Exception("Invalid Json: $file");
-             }
-             $json = new \Magento\Framework\Config\Composer\Package(json_decode($contents));
-@@ -768,10 +796,14 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-         string $type,
-         array $packageModuleMap
-     ): void {
--        $packageNames = array_filter($packageNames, function ($packageName) use ($packageModuleMap) {
--            return isset($packageModuleMap[$packageName]) ||
--                0 === strpos($packageName, 'magento/') && 'magento/magento-composer-installer' != $packageName;
--        });
-+        $packageNames = array_filter(
-+            $packageNames,
-+            function ($packageName) use ($packageModuleMap) {
-+                return isset($packageModuleMap[$packageName]) ||
-+                    0 === strpos($packageName, 'magento/')
-+                    && 'magento/magento-composer-installer' != $packageName;
-+            }
-+        );
- 
-         foreach ($packageNames as $packageName) {
-             self::addDependency(
-@@ -815,6 +847,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-             $contents = file_get_contents($file);
-             $composerJson = json_decode($contents);
-             if (null == $composerJson) {
-+                //phpcs:ignore Magento2.Exceptions.DirectThrow
-                 throw new \Exception("Invalid Json: $file");
-             }
-             $moduleXml = simplexml_load_file(dirname($file) . '/etc/module.xml');
-diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php
-index 81088522bcc..a4baacbe4d1 100644
---- a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php
-@@ -96,35 +96,6 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testAppCodeUsage()
--    {
--        $files = Files::init();
--        $componentRegistrar = new ComponentRegistrar();
--        $libPaths = $componentRegistrar->getPaths(ComponentRegistrar::LIBRARY);
--        $invoker = new AggregateInvoker($this);
--        $invoker(
--            function ($file) use ($libPaths) {
--                $content = file_get_contents($file);
--                foreach ($libPaths as $libPath) {
--                    if (strpos($file, $libPath) === 0) {
--                        $this->assertSame(
--                            0,
--                            preg_match('~(?<![a-z\\d_:]|->|function\\s)__\\s*\\(~iS', $content),
--                            'Function __() is defined outside of the library and must not be used there. ' .
--                            'Replacement suggestion: new \\Magento\\Framework\\Phrase()'
--                        );
--                    }
--                }
--            },
--            $files->getPhpFiles(
--                Files::INCLUDE_PUB_CODE |
--                Files::INCLUDE_LIBS |
--                Files::AS_DATA_SET |
--                Files::INCLUDE_NON_CLASSES
--            )
--        );
--    }
--
-     /**
-      * @inheritdoc
-      */
-diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
-index f204019988b..46bdd3dd666 100644
---- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
-@@ -97,7 +97,7 @@ class ControllerAclTest extends \PHPUnit\Framework\TestCase
-                 $inheritanceMessage = "Backend controller $className have to inherit " . AbstractAction::class;
-                 $errorMessages[] = $inheritanceMessage;
-                 continue;
--            };
-+            }
- 
-             $isAclRedefinedInTheChildClass = $this->isConstantOverwritten($controllerClass)
-                 || $this->isMethodOverwritten($controllerClass);
-diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/_files/controller_acl_test_whitelist_ce.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/_files/controller_acl_test_whitelist_ce.txt
-index a819654b35b..1119824f217 100644
---- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/_files/controller_acl_test_whitelist_ce.txt
-+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/_files/controller_acl_test_whitelist_ce.txt
-@@ -32,3 +32,4 @@ Magento\Inventory\Controller\Adminhtml\Source\SourceCarrierDataProcessor
- Magento\Inventory\Controller\Adminhtml\Source\SourceHydrator
- Magento\Inventory\Controller\Adminhtml\Stock\StockSaveProcessor
- Magento\Inventory\Controller\Adminhtml\Stock\StockSourceLinkProcessor
-+Magento\InventoryCatalogAdminUi\Controller\Adminhtml\Bulk\BulkPageProcessor
-diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/_files/ExtensibleInterfacesTest/blacklist_ce.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/_files/ExtensibleInterfacesTest/blacklist_ce.txt
-index 0fd245561e6..e9b1e6e428e 100644
---- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/_files/ExtensibleInterfacesTest/blacklist_ce.txt
-+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/_files/ExtensibleInterfacesTest/blacklist_ce.txt
-@@ -1,3 +1,4 @@
- module Magento_Payment Model/Info.php
- module Magento_Customer Model/Address/AbstractAddress.php
--library magento/framework MessageQueue/Rpc/Publisher.php
-\ No newline at end of file
-+library magento/framework MessageQueue/Rpc/Publisher.php
-+module Magento_GraphQl Model/Query/ContextInterface.php
-\ No newline at end of file
-diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/RequestConfigTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/RequestConfigTest.php
-index 4c0fed148ae..f0177c449a3 100644
---- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/RequestConfigTest.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/RequestConfigTest.php
-@@ -102,8 +102,7 @@ Element 'filter': The attribute 'field' is required but missing.
- Element 'metric', attribute 'type': [facet 'enumeration'] " .
-                 "The value 'sumasdasd' is not an element of the set {'sum', 'count', 'min', 'max', 'avg'}.
- Element 'metric', attribute 'type': 'sumasdasd' is not a valid value of the local atomic type.
--Element 'bucket': Missing child element(s). Expected is one of ( metrics, ranges ).
--Element 'request': Missing child element(s). Expected is ( from )."
-+Element 'bucket': Missing child element(s). Expected is one of ( metrics, ranges )."
-             )
-         );
-         parent::testFileSchemaUsingInvalidXml($expectedErrors);
-diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
-index 530f55504d0..3fb53be2ec4 100644
---- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
-@@ -96,7 +96,7 @@ return [
-     'catalogrule_website'                         => 'Magento\CatalogRule',
-     'catalogsearch_fulltext'                      => 'Magento\CatalogSearch',
-     'catalogsearch_result'                        => 'Magento\CatalogSearch',
--    'search_query'                                => 'Magento\CatalogSearch',
-+    'search_query'                                => 'Magento\Search',
-     'checkout_agreement'                          => 'Magento\Checkout',
-     'checkout_agreement_store'                    => 'Magento\Checkout',
-     'cms_block'                                   => 'Magento\Cms',
-diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/whitelist/routes_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/whitelist/routes_ce.php
-new file mode 100644
-index 00000000000..9ebc951a3a3
---- /dev/null
-+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/whitelist/routes_ce.php
-@@ -0,0 +1,10 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+return [
-+    'privacy-policy-cookie-restriction-mode/index/index',
-+];
-diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
-index 1ee599a0446..dd222996837 100644
---- a/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
-@@ -3,14 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
--/**
-- * Coverage of obsolete nodes in layout
-- */
- namespace Magento\Test\Legacy;
- 
- use Magento\Framework\Component\ComponentRegistrar;
- 
-+/**
-+ * Coverage of obsolete nodes in layout
-+ */
- class LayoutTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -85,6 +86,9 @@ class LayoutTest extends \PHPUnit\Framework\TestCase
-         ],
-     ];
- 
-+    /**
-+     * @throws \Exception
-+     */
-     public function testLayoutFile()
-     {
-         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
-@@ -141,6 +145,11 @@ class LayoutTest extends \PHPUnit\Framework\TestCase
-                     $componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_Shipping')
-                     . '/view/adminhtml/layout/adminhtml_order'
-                 )
-+                    || false !== strpos(
-+                        $layoutFile,
-+                        $componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_Catalog')
-+                        . '/view/adminhtml/layout/catalog_product_grid.xml'
-+                    )
-                 ) {
-                     $this->markTestIncomplete(
-                         "The file {$layoutFile} has to use \\Magento\\Core\\Block\\Text\\List, \n" .
-@@ -204,6 +213,9 @@ class LayoutTest extends \PHPUnit\Framework\TestCase
-         }
-     }
- 
-+    /**
-+     * @throws \Exception
-+     */
-     public function testActionNodeMethods()
-     {
-         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
-@@ -356,8 +368,6 @@ class LayoutTest extends \PHPUnit\Framework\TestCase
-             'unsetChildren',
-             'updateButton',
-             'setIsProductListingContext',
--            'checkCompanyStatus', // MAGETWO-88965
--            'setRendererType', // MAGETWO-88965
-         ];
-     }
- }
-diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
-index 2a6079d619d..fe15c06bdea 100644
---- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
-@@ -501,8 +501,8 @@ class ObsoleteCodeTest extends \PHPUnit\Framework\TestCase
-     {
-         $classPathParts = explode('\\', $class);
-         $classPartialPath = '';
--        for ($i = count($classPathParts) - 1; $i >= 0; $i--) {
--            if ($i === (count($classPathParts) - 1)) {
-+        for ($count = count($classPathParts), $i = $count - 1; $i >= 0; $i--) {
-+            if ($i === ($count - 1)) {
-                 $classPartialPath = $classPathParts[$i] . $classPartialPath;
-             } else {
-                 $classPartialPath = $classPathParts[$i] . '\\' . $classPartialPath;
-diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
-index 6edc46090d5..2ce9934c6c1 100644
---- a/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Test\Legacy;
- 
- use Magento\Framework\App\Utility\Files;
-@@ -42,7 +44,6 @@ class UnsecureFunctionsUsageTest extends \PHPUnit\Framework\TestCase
-      */
-     public static function setUpBeforeClass()
-     {
--        self::loadData(self::$phpUnsecureFunctions, 'unsecure_php_functions*.php');
-         self::loadData(self::$jsUnsecureFunctions, 'unsecure_js_functions*.php');
-     }
- 
-diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
-index 4ff5d001389..242e4ebb22a 100644
---- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
-@@ -8,5 +8,6 @@ return [
-     '/pub\/opt\/magento\/var/',
-     '/COPYING\.txt/',
-     '/setup\/src\/Zend\/Mvc\/Controller\/LazyControllerAbstractFactory\.php/',
--    '/app\/code\/(?!Magento)[^\/]*/'
-+    '/app\/code\/(?!Magento)[^\/]*/',
-+    '#dev/tests/setup-integration/testsuite/Magento/Developer/_files/\S*\.xml$#',
- ];
-diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
-index 12c10990a3a..8e1a99e6553 100755
---- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
-@@ -4,6 +4,8 @@
-  *
-  * Format: array(<class_name>[, <replacement>])
-  *
-+ * @codingStandardsIgnoreFile
-+ *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-@@ -1790,7 +1792,7 @@ return [
-     ],
-     ['Magento\Adminhtml\Block\Report\Shopcart\Product', 'Magento\Reports\Block\Adminhtml\Shopcart\Product'],
-     ['Magento\Adminhtml\Block\Report\Wishlist\Grid', 'Magento\Reports\Block\Adminhtml\Wishlist\Grid'],
--    ['Magento\Adminhtml\Block\Report\Wishlist', 'Magento\Reports\Block\Adminhtml\Wishlist'],
-+    ['Magento\Adminhtml\Block\Report\Wishlist'],
-     ['Magento\Backend\Helper\Addresses'],
-     ['Magento\Backend\Controller\Adminhtml\System\Variable', 'Magento\Variable\Controller\Adminhtml\System\Variable'],
-     [
-@@ -3198,6 +3200,8 @@ return [
-     ['Magento\Tax\Model\ResourceModel\Sales\Order\Tax\Item', 'Magento\Sales\Model\ResourceModel\Order\Tax\Item'],
-     ['Magento\Tax\Model\Sales\Order\Tax\Item', 'Magento\Sales\Model\Order\Tax\Item'],
-     ['Magento\Reports\Block\Adminhtml\Product\Grid'],
-+    ['Magento\Reports\Block\Adminhtml\Product\Widget\Viewed\Item'],
-+    ['Magento\Reports\Block\Adminhtml\Wishlist'],
-     ['Magento\Reports\Model\Totals'],
-     ['Magento\Log\Model\Shell'],
-     ['Magento\Log\App\Shell'],
-diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
-index cbf499c8dad..5bcc712be6f 100644
---- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
-@@ -712,7 +712,6 @@ return [
-         'Magento\Sales\Block\Reorder\Sidebar',
-         '\Magento\Sales\CustomerData\LastOrderedItems::SIDEBAR_ORDER_LIMIT',
-     ],
--    ['ENTITY', 'Magento\Framework\App\Config\ValueInterface'],
-     ['XML_PATH_ALLOW_CURRENCIES_INSTALLED', 'Magento\Framework\Locale\CurrencyInterface'],
-     [
-         'DEFAULT_CURRENCY',
-diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
-index 8b811cc6b3f..9417baea67b 100644
---- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
-@@ -1982,8 +1982,8 @@ return [
-     ['_escapeDefaultValue', 'Magento\Framework\Code\Generator\EntityAbstract'],
-     ['urlEncode', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Url\EncoderInterface::encode'],
-     ['urlDecode', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Url\DecoderInterface::decode'],
--    ['isModuleEnabled', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Module\Manager::isEnabled()'],
--    ['isModuleOutputEnabled', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Module\Manager::isOutputEnabled()'],
-+    ['isModuleEnabled', 'Magento\Framework\App\Helper\AbstractHelper', '\Magento\Framework\Module\ModuleManagerInterface::isEnabled()'],
-+    ['isModuleOutputEnabled', 'Magento\Framework\App\Helper\AbstractHelper', '\Magento\Framework\Module\ModuleManagerInterface::isOutputEnabled()'],
-     ['_packToTar', 'Magento\Framework\Archive\Tar'],
-     ['_parseHeader', 'Magento\Framework\Archive\Tar'],
-     ['getIdentities', 'Magento\Wishlist\Block\Link'],
-@@ -2528,6 +2528,7 @@ return [
-     ['_isAttributeValueEmpty', 'Magento\Catalog\Model\ResourceModel\AbstractResource'],
-     ['var_dump', ''],
-     ['each', ''],
-+    ['strval', ''],
-     ['create_function', ''],
-     ['configure', 'Magento\Framework\MessageQueue\BatchConsumer'],
-     [
-diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
-deleted file mode 100644
-index 1c23f8d8ccf..00000000000
---- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
-+++ /dev/null
-@@ -1,77 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--/**
-- * Functions that are not secure to use.
-- * A <replacement> will be suggested to be used instead.
-- * Use <exclude> to specify files and directories that are allowed to use function.
-- *
-- * Format: [
-- *      <class_name> => [
-- *          'replacement' => <replacement>,
-- *          'exclude' => [
-- *              <exclude>,
-- *              <exclude>,
-- *          ]
-- *      ]
-- */
--return [
--    'unserialize' => [
--        'replacement' => '\Magento\Framework\Serialize\SerializerInterface::unserialize',
--        'exclude' => [
--            ['type' => 'library', 'name' => 'magento/framework', 'path' => 'DB/Adapter/Pdo/Mysql.php'],
--            ['type' => 'library', 'name' => 'magento/framework', 'path' => 'Serialize/Serializer/Serialize.php'],
--        ]
--    ],
--    'serialize' => [
--        'replacement' => '\Magento\Framework\Serialize\SerializerInterface::serialize',
--        'exclude' => [
--            ['type' => 'library', 'name' => 'magento/framework', 'path' => 'DB/Adapter/Pdo/Mysql.php'],
--            ['type' => 'library', 'name' => 'magento/framework', 'path' => 'Serialize/Serializer/Serialize.php'],
--        ]
--    ],
--    'eval' => [
--        'replacement' => '',
--        'exclude' => []
--    ],
--    'md5' => [
--        'replacement' => '',
--        'exclude' => [
--            /*
--             * Usage of md5 in MessageQueue key generation algorithm
--             * added to exclude list to avoid backward incompatible changes
--             */
--            [
--                'type' => 'library',
--                'name' => 'magento/framework',
--                'path' => 'MessageQueue/Rpc/Publisher.php',
--            ],
--            [
--                'type' => 'library',
--                'name' => 'magento/framework',
--                'path' => 'MessageQueue/MessageController.php',
--            ],
--            [
--                'type' => 'library',
--                'name' => 'magento/framework',
--                'path' => 'MessageQueue/Publisher.php',
--            ],
--            [
--                'type' => 'module',
--                'name' => 'Magento_AsynchronousOperations',
--                'path' => 'Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php'
--            ]
--        ]
--    ],
--    'srand' => [
--        'replacement' => '',
--        'exclude' => []
--    ],
--    'mt_srand' => [
--        'replacement' => '',
--        'exclude' => []
--    ],
--];
-diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
-index 4790ce24fd8..92e7b15efed 100644
---- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
-+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
-@@ -53,7 +53,7 @@
-             <word>overriden</word>
-         </item>
-         <item>
--            <path>composer.lock</path>
-+            <path>dev/composer.lock</path>
-         </item>
-         <item>
-             <path>app/code/Magento/Customer/view/frontend/web/js/zxcvbn.js</path>
-@@ -69,5 +69,9 @@
-         <item>
-             <path>dev/build/publication/sanity/ce.xml</path>
-         </item>
-+        <item>
-+            <path>app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less</path>
-+            <word>rma</word>
-+        </item>
-     </whitelist>
- </config>
-diff --git a/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt b/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
-index db5c1cab066..4c00371faed 100644
---- a/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
-+++ b/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
-@@ -4,6 +4,7 @@ app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/
- app/design/adminhtml/Magento/backend/Magento_Developer/web/css/source/_module-old.less
- app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
- app/design/adminhtml/Magento/backend/Magento_Msrp/web/css/source/_module-old.less
-+app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
- app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/_module-old.less
- app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/_module-old.less
- app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
-@@ -22,4 +23,4 @@ app/design/adminhtml/Magento/backend/web/mui/clearless/_settings.less
- app/design/adminhtml/Magento/backend/web/mui/clearless/_sprites.less
- app/design/adminhtml/Magento/backend/web/mui/styles/_abstract.less
- app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
--app/design/adminhtml/Magento/backend/web/mui/styles/_vars.less
-+app/design/adminhtml/Magento/backend/web/mui/styles/_vars.less
-\ No newline at end of file
-diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
-index 21ca0a495dd..76c0d047bcb 100644
---- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
-+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Test\Php;
- 
-@@ -116,8 +117,10 @@ class LiveCodeTest extends \PHPUnit\Framework\TestCase
-             'changed_files*',
-             function () {
-                 // if no list files, probably, this is the dev environment
-+                // phpcs:disable Generic.PHP.NoSilencedErrors,Magento2.Security.InsecureFunction
-                 @exec('git diff --name-only', $changedFiles);
-                 @exec('git diff --cached --name-only', $addedFiles);
-+                // phpcs:enable
-                 $changedFiles = array_unique(array_merge($changedFiles, $addedFiles));
-                 return $changedFiles;
-             }
-@@ -137,6 +140,7 @@ class LiveCodeTest extends \PHPUnit\Framework\TestCase
-             'changed_files*.added.*',
-             function () {
-                 // if no list files, probably, this is the dev environment
-+                // phpcs:ignore Generic.PHP.NoSilencedErrors,Magento2.Security.InsecureFunction
-                 @exec('git diff --cached --name-only', $addedFiles);
-                 return $addedFiles;
-             }
-@@ -158,7 +162,7 @@ class LiveCodeTest extends \PHPUnit\Framework\TestCase
-         $globFilesListPattern = ($listsBaseDir ?: self::getChangedFilesBaseDir())
-             . '/_files/' . $listFilePattern;
-         $listFiles = glob($globFilesListPattern);
--        if (count($listFiles)) {
-+        if (!empty($listFiles)) {
-             foreach ($listFiles as $listFile) {
-                 $filesDefinedInList = array_merge(
-                     $filesDefinedInList,
-diff --git a/dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php b/dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php
-deleted file mode 100644
-index fac14af5eca..00000000000
---- a/dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php
-+++ /dev/null
-@@ -1,89 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Test\Php;
--
--use Magento\Framework\App\Utility\Files;
--use Magento\TestFramework\Utility\XssOutputValidator;
--use Magento\Framework\Component\ComponentRegistrar;
--
--/**
-- * Find not escaped output in phtml templates
-- */
--class XssPhtmlTemplateTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @return void
--     */
--    public function testXssSensitiveOutput()
--    {
--        $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
--        $xssOutputValidator = new XssOutputValidator();
--        $invoker(
--            /**
--             * Static test will cover the following cases:
--             *
--             * 1. /\* @noEscape \*\/ before output. Output doesn't require escaping. Test is green.
--             * 2. Methods which contains "html" in their names (e.g. echo $object->{suffix}Html{postfix}() ).
--             *    Data is ready for the HTML output. Test is green.
--             * 3. AbstractBlock methods escapeHtml, escapeUrl, escapeQuote, escapeXssInUrl are allowed. Test is green.
--             * 4. Type casting and php function count() are allowed
--             *    (e.g. echo (int)$var, echo (float)$var, echo (bool)$var, echo count($var)). Test is green.
--             * 5. Output in single quotes (e.g. echo 'some text'). Test is green.
--             * 6. Output in double quotes without variables (e.g. echo "some text"). Test is green.
--             * 7. Other of p.1-6. Output is not escaped. Test is red.
--             *
--             * @param string $file
--             */
--            function ($file) use ($xssOutputValidator) {
--                $lines = $xssOutputValidator->getLinesWithXssSensitiveOutput($file);
--                $this->assertEmpty(
--                    $lines,
--                    "Potentially XSS vulnerability. " .
--                    "Please verify that output is escaped at lines " . $lines
--                );
--            },
--            Files::init()->getPhtmlFiles()
--        );
--    }
--
--    /**
--     * @return void
--     */
--    public function testAbsenceOfEscapeNotVerifiedAnnotationInRefinedModules()
--    {
--        $componentRegistrar = new ComponentRegistrar();
--        $exemptModules = [];
--        foreach (array_diff(scandir(__DIR__ . '/_files/whitelist/exempt_modules'), ['..', '.']) as $file) {
--            $exemptModules = array_merge(
--                $exemptModules,
--                include(__DIR__ . '/_files/whitelist/exempt_modules/' . $file)
--            );
--        }
--
--        $result = "";
--        foreach ($componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleName => $modulePath) {
--            if (in_array($moduleName, $exemptModules)) {
--                continue;
--            }
--            foreach (Files::init()->getFiles([$modulePath], '*.phtml') as $file) {
--                $fileContents = file_get_contents($file);
--                $pattern = "/\\/* @escapeNotVerified \\*\\/ echo (?!__).+/";
--                $instances = preg_grep($pattern, explode("\n", $fileContents));
--                if (!empty($instances)) {
--                    foreach (array_keys($instances) as $line) {
--                        $result .= $file . ':' . ($line + 1) . "\n";
--                    }
--                }
--            }
--        }
--        $this->assertEmpty(
--            $result,
--            "@escapeNotVerified annotation detected.\n" .
--            "Please use the correct escape strategy and remove annotation at:\n" . $result
--        );
--    }
--}
-diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
-index fd8c09907e0..e59cd0983da 100644
---- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
-+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
-@@ -202,3 +202,17 @@ setup/performance-toolkit/aggregate-report
- Magento/MessageQueue/Setup
- Magento/Elasticsearch/Elasticsearch5
- Test/_files
-+Magento/InventoryCatalogAdminUi/Controller/Adminhtml
-+Magento/InventoryConfigurableProductIndexer/Indexer
-+Magento/InventoryGroupedProductIndexer/Indexer
-+Magento/Customer/Model/FileUploaderDataResolver.php
-+Magento/Customer/Model/Customer/DataProvider.php
-+Magento/InventoryShippingAdminUi/Ui/DataProvider
-+Magento/Elasticsearch6/Model/Client
-+Magento/CatalogSearch/Model/ResourceModel/Fulltext
-+Magento/Elasticsearch/Model/Layer/Search
-+Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver
-+Magento/Elasticsearch6/Model/Client
-+Magento/Config/App/Config/Type
-+Magento/InventoryReservationCli/Test/Integration
-+Magento/InventoryAdminUi/Controller/Adminhtml
-diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
-index 76f76e2b23c..e65a9a089da 100644
---- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
-+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
-@@ -29,9 +29,6 @@
-     <rule ref="rulesets/unusedcode.xml" />
- 
-     <!-- Code design rules -->
--    <rule ref="rulesets/design.xml/ExitExpression" />
--    <rule ref="rulesets/design.xml/EvalExpression" />
--    <rule ref="rulesets/design.xml/GotoStatement" />
-     <rule ref="rulesets/design.xml/NumberOfChildren" />
-     <rule ref="rulesets/design.xml/DepthOfInheritance">
-         <properties>
-@@ -46,6 +43,8 @@
-     <rule ref="rulesets/naming.xml/BooleanGetMethodName" />
- 
-     <!-- Magento Specific Rules -->
--    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/FinalImplementation" />
-+    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/AllPurposeAction" />
-+    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/CookieAndSessionMisuse" />
-+    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/SerializationAware" />
- 
- </ruleset>
-diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
-deleted file mode 100644
-index 0d99320b15e..00000000000
---- a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
-+++ /dev/null
-@@ -1,51 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--/* These are the modules that have not been refactored from @escapeNotVerified yet. */
--return [
--    'Magento_AdminNotification',
--    'Magento_AdvancedSearch',
--    'Magento_Backend',
--    'Magento_Backup',
--    'Magento_Bundle',
--    'Magento_Catalog',
--    'Magento_CatalogInventory',
--    'Magento_CatalogRule',
--    'Magento_CatalogSearch',
--    'Magento_Checkout',
--    'Magento_CheckoutAgreements',
--    'Magento_Config',
--    'Magento_ConfigurableProduct',
--    'Magento_CurrencySymbol',
--    'Magento_Downloadable',
--    'Magento_GiftMessage',
--    'Magento_GoogleAdwords',
--    'Magento_GoogleAnalytics',
--    'Magento_GroupedProduct',
--    'Magento_ImportExport',
--    'Magento_Integration',
--    'Magento_LayeredNavigation',
--    'Magento_Marketplace',
--    'Magento_MediaStorage',
--    'Magento_Msrp',
--    'Magento_Multishipping',
--    'Magento_PageCache',
--    'Magento_Paypal',
--    'Magento_ProductVideo',
--    'Magento_Reports',
--    'Magento_Sales',
--    'Magento_Search',
--    'Magento_Shipping',
--    'Magento_Store',
--    'Magento_Swagger',
--    'Magento_Swatches',
--    'Magento_Tax',
--    'Magento_TaxImportExport',
--    'Magento_Theme',
--    'Magento_Translation',
--    'Magento_Ui',
--    'Magento_User',
--    'Magento_Weee',
--];
-diff --git a/dev/tests/static/tmp/.gitignore b/dev/tests/static/tmp/.gitignore
-new file mode 100644
-index 00000000000..a68d087bfe5
---- /dev/null
-+++ b/dev/tests/static/tmp/.gitignore
-@@ -0,0 +1,2 @@
-+/*
-+!/.gitignore
-diff --git a/dev/tests/unit/.gitignore b/dev/tests/unit/.gitignore
-index 319b3826f93..944850d1660 100644
---- a/dev/tests/unit/.gitignore
-+++ b/dev/tests/unit/.gitignore
-@@ -1 +1,2 @@
- /phpunit.xml
-+/var/allure-results/
-diff --git a/dev/tests/unit/framework/bootstrap.php b/dev/tests/unit/framework/bootstrap.php
-index 68dba4e2ce0..06aee53dafb 100644
---- a/dev/tests/unit/framework/bootstrap.php
-+++ b/dev/tests/unit/framework/bootstrap.php
-@@ -11,7 +11,6 @@ if (!defined('TESTS_TEMP_DIR')) {
- }
- 
- require_once __DIR__ . '/autoload.php';
--require BP . '/app/functions.php';
- 
- setCustomErrorHandler();
- 
-diff --git a/dev/tests/unit/phpunit.xml.dist b/dev/tests/unit/phpunit.xml.dist
-index d35f7fc1819..94500ff7bdc 100644
---- a/dev/tests/unit/phpunit.xml.dist
-+++ b/dev/tests/unit/phpunit.xml.dist
-@@ -12,8 +12,10 @@
-          beStrictAboutTestsThatDoNotTestAnything="false"
-          bootstrap="./framework/bootstrap.php"
-         >
--    <testsuite name="Magento Unit Tests">
-+    <testsuite name="Magento_Unit_Tests_App_Code">
-         <directory suffix="Test.php">../../../app/code/*/*/Test/Unit</directory>
-+    </testsuite>
-+    <testsuite name="Magento_Unit_Tests_Other">
-         <directory suffix="Test.php">../../../lib/internal/*/*/Test/Unit</directory>
-         <directory suffix="Test.php">../../../lib/internal/*/*/*/Test/Unit</directory>
-         <directory suffix="Test.php">../../../setup/src/*/*/Test/Unit</directory>
-@@ -40,6 +42,26 @@
-         </whitelist>
-     </filter>
-     <listeners>
-+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
-+            <arguments>
-+                <string>var/allure-results</string> <!-- XML files output directory -->
-+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
-+                <array> <!-- A list of custom annotations to ignore (optional) -->
-+                    <element key="codingStandardsIgnoreStart">
-+                        <string>codingStandardsIgnoreStart</string>
-+                    </element>
-+                    <element key="codingStandardsIgnoreEnd">
-+                        <string>codingStandardsIgnoreEnd</string>
-+                    </element>
-+                    <element key="cover">
-+                        <string>cover</string>
-+                    </element>
-+                    <element key="expectedExceptionMessageRegExp">
-+                        <string>expectedExceptionMessageRegExp</string>
-+                    </element>
-+                </array>
-+            </arguments>
-+        </listener>
-         <listener class="Magento\Framework\TestFramework\Unit\Listener\ReplaceObjectManager"/>
-     </listeners>
-     <logging>
-diff --git a/dev/tools/UpgradeScripts/pre_composer_update_2.3.php b/dev/tools/UpgradeScripts/pre_composer_update_2.3.php
-index 6fe629e717b..04e64ba45ba 100644
---- a/dev/tools/UpgradeScripts/pre_composer_update_2.3.php
-+++ b/dev/tools/UpgradeScripts/pre_composer_update_2.3.php
-@@ -148,7 +148,7 @@ try {
-     }
-     else {
-         foreach ($composerData['repositories'] as $label => $repo) {
--            if (strpos(strtolower($label), 'mage') !== false || strpos($repo['url'], '.mage') !== false) {
-+            if (is_string($label) && strpos(strtolower($label), 'mage') !== false || strpos($repo['url'], '.mage') !== false) {
-                 $mageUrls[] = $repo['url'];
-             }
-         }
-diff --git a/dev/tools/grunt/configs/watch.js b/dev/tools/grunt/configs/watch.js
-index 356d0b4b7b2..c85ecb00f78 100644
---- a/dev/tools/grunt/configs/watch.js
-+++ b/dev/tools/grunt/configs/watch.js
-@@ -11,11 +11,8 @@ var combo  = require('./combo'),
- 
- var themeOptions = {};
- 
--_.each(themes, function(theme, name) {
-+_.each(themes, function (theme, name) {
-     themeOptions[name] = {
--        'options': {
--            livereload: true
--        },
-         'files': [
-             '<%= combo.autopath(\''+name+'\', path.pub) %>/**/*.less'
-         ],
-diff --git a/dev/travis/before_install.sh b/dev/travis/before_install.sh
-index c9302f3b667..845d70e4e79 100755
---- a/dev/travis/before_install.sh
-+++ b/dev/travis/before_install.sh
-@@ -34,7 +34,7 @@ if [ $TEST_SUITE == "js" ]; then
-     yarn global add grunt-cli
- fi
- 
--if [ $TEST_SUITE = "functional" ]; then
-+if [ $TEST_SUITE = "functional" ] || [ $TEST_SUITE = "graphql-api-functional" ]; then
-     # Install apache
-     sudo apt-get update
-     sudo apt-get install apache2 libapache2-mod-fastcgi
-diff --git a/dev/travis/before_script.sh b/dev/travis/before_script.sh
-index 1dccc310c7a..5d091efbb30 100755
---- a/dev/travis/before_script.sh
-+++ b/dev/travis/before_script.sh
-@@ -13,9 +13,9 @@ case $TEST_SUITE in
- 
-         test_set_list=$(find testsuite/* -maxdepth 1 -mindepth 1 -type d | sort)
-         test_set_count=$(printf "$test_set_list" | wc -l)
--        test_set_size[1]=$(printf "%.0f" $(echo "$test_set_count*0.17" | bc))  #17%
--        test_set_size[2]=$(printf "%.0f" $(echo "$test_set_count*0.27" | bc))  #27%
--        test_set_size[3]=$((test_set_count-test_set_size[1]-test_set_size[2])) #56%
-+        test_set_size[1]=$(printf "%.0f" $(echo "$test_set_count*0.13" | bc))  #13%
-+        test_set_size[2]=$(printf "%.0f" $(echo "$test_set_count*0.30" | bc))  #30%
-+        test_set_size[3]=$((test_set_count-test_set_size[1]-test_set_size[2])) #55%
-         echo "Total = ${test_set_count}; Batch #1 = ${test_set_size[1]}; Batch #2 = ${test_set_size[2]}; Batch #3 = ${test_set_size[3]};";
- 
-         echo "==> preparing integration testsuite on index $INTEGRATION_INDEX with set size of ${test_set_size[$INTEGRATION_INDEX]}"
-@@ -72,7 +72,7 @@ case $TEST_SUITE in
-             --base-path="$TRAVIS_BUILD_DIR" \
-             --repo='https://github.com/magento/magento2.git' \
-             --branch="$TRAVIS_BRANCH"
--        cat "$changed_files_ce" | sed 's/^/  + including /'
-+        sed 's/^/  + including /' "$changed_files_ce"
- 
-         cd ../../..
-         ;;
-@@ -134,4 +134,35 @@ case $TEST_SUITE in
- 
-         cd ../../..
-         ;;
-+
-+    graphql-api-functional)
-+        echo "Installing Magento"
-+        mysql -uroot -e 'CREATE DATABASE magento2;'
-+        php bin/magento setup:install -q \
-+            --language="en_US" \
-+            --timezone="UTC" \
-+            --currency="USD" \
-+            --base-url="http://${MAGENTO_HOST_NAME}/" \
-+            --admin-firstname="John" \
-+            --admin-lastname="Doe" \
-+            --backend-frontname="backend" \
-+            --admin-email="admin@example.com" \
-+            --admin-user="admin" \
-+            --use-rewrites=1 \
-+            --admin-use-security-key=0 \
-+            --admin-password="123123q"
-+
-+        echo "Prepare api-functional tests for running"
-+        cd dev/tests/api-functional
-+        cp -r _files/Magento/TestModuleGraphQl* ../../../app/code/Magento # Deploy and enable test modules before running tests
-+
-+        cp ./phpunit_graphql.xml.dist ./phpunit.xml
-+        sed -e "s?magento.url?${MAGENTO_HOST_NAME}?g" --in-place ./phpunit.xml
-+
-+        cd ../../..
-+        php bin/magento setup:upgrade
-+
-+        echo "Enabling production mode"
-+        php bin/magento deploy:mode:set production
-+        ;;
- esac
-diff --git a/lib/internal/LinLibertineFont/ChangeLog.txt b/lib/internal/LinLibertineFont/ChangeLog.txt
-index 8dc2c56567a..83b8792e71e 100644
---- a/lib/internal/LinLibertineFont/ChangeLog.txt
-+++ b/lib/internal/LinLibertineFont/ChangeLog.txt
-@@ -952,7 +952,7 @@ Changes to version 0.5.8 regular(|) & italic(/) (20040315)
- Changes to version 0.5.7 regular(|) & italic(/) (20040315)
- -N is now 66pt wider
- -^ {Ascicircum} is now better
--- {exclamdown} is now availible
-+- {exclamdown} is now available
- - {currency} has been added
- | "-" hyphen is the same as softhyphen. length is now 510pt
- -bars have been made
-diff --git a/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php b/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
-index 8a4ad39d785..af781e19d04 100644
---- a/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
-+++ b/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
-@@ -12,12 +12,15 @@ use Magento\Framework\Acl\AclResource as AclResource;
- use Magento\Framework\Acl\AclResource\ProviderInterface;
- use Magento\Framework\Acl\AclResourceFactory;
- 
-+/**
-+ * ACL Loader
-+ */
- class ResourceLoader implements \Magento\Framework\Acl\LoaderInterface
- {
-     /**
-      * Acl resource config
-      *
--     * @var ProviderInterface $resourceProvider
-+     * @var ProviderInterface
-      */
-     protected $_resourceProvider;
- 
-diff --git a/lib/internal/Magento/Framework/Amqp/Config.php b/lib/internal/Magento/Framework/Amqp/Config.php
-index 8fb827d9eb0..684c5cd38b1 100644
---- a/lib/internal/Magento/Framework/Amqp/Config.php
-+++ b/lib/internal/Magento/Framework/Amqp/Config.php
-@@ -131,10 +131,12 @@ class Config
-     public function getValue($key)
-     {
-         $this->load();
--        return isset($this->data[$key]) ? $this->data[$key] : null;
-+        return $this->data[$key] ?? null;
-     }
- 
-     /**
-+     * Create amqp connection
-+     *
-      * @return AbstractConnection
-      */
-     private function createConnection(): AbstractConnection
-diff --git a/lib/internal/Magento/Framework/Amqp/Queue.php b/lib/internal/Magento/Framework/Amqp/Queue.php
-index edd57339b84..ff5bae5017f 100644
---- a/lib/internal/Magento/Framework/Amqp/Queue.php
-+++ b/lib/internal/Magento/Framework/Amqp/Queue.php
-@@ -37,7 +37,7 @@ class Queue implements QueueInterface
-     private $envelopeFactory;
- 
-     /**
--     * @var LoggerInterface $logger
-+     * @var LoggerInterface
-      */
-     private $logger;
- 
-@@ -63,7 +63,7 @@ class Queue implements QueueInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.0.0
-      */
-     public function dequeue()
-@@ -98,7 +98,7 @@ class Queue implements QueueInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.0.0
-      */
-     public function acknowledge(EnvelopeInterface $envelope)
-@@ -119,7 +119,7 @@ class Queue implements QueueInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @since 100.0.0
-      */
-     public function subscribe($callback)
-@@ -153,7 +153,7 @@ class Queue implements QueueInterface
-     }
- 
-     /**
--     * (@inheritdoc)
-+     * @inheritdoc
-      * @since 100.0.0
-      */
-     public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionMessage = null)
-@@ -172,7 +172,7 @@ class Queue implements QueueInterface
-     }
- 
-     /**
--     * (@inheritdoc)
-+     * @inheritdoc
-      * @since 100.0.0
-      */
-     public function push(EnvelopeInterface $envelope)
-diff --git a/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php b/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
-index 538f4e646d0..e51788ad9ec 100644
---- a/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
-+++ b/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
-@@ -45,6 +45,30 @@ class ExtensibleDataObjectConverter
-         }
-         $dataObjectArray = $this->dataObjectProcessor->buildOutputDataArray($dataObject, $dataObjectType);
-         //process custom attributes if present
-+        $dataObjectArray = $this->processCustomAttributes($dataObjectArray, $skipAttributes);
-+
-+        if (!empty($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
-+            /** @var array $extensionAttributes */
-+            $extensionAttributes = $dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY];
-+            unset($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
-+            foreach ($extensionAttributes as $attributeKey => $attributeValue) {
-+                if (!in_array($attributeKey, $skipAttributes)) {
-+                    $dataObjectArray[$attributeKey] = $attributeValue;
-+                }
-+            }
-+        }
-+        return $dataObjectArray;
-+    }
-+
-+    /**
-+     * Recursive process array to process customer attributes
-+     *
-+     * @param array $dataObjectArray
-+     * @param array $skipAttributes
-+     * @return array
-+     */
-+    private function processCustomAttributes(array $dataObjectArray, array $skipAttributes): array
-+    {
-         if (!empty($dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY])) {
-             /** @var AttributeValue[] $customAttributes */
-             $customAttributes = $dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY];
-@@ -56,14 +80,9 @@ class ExtensibleDataObjectConverter
-                 }
-             }
-         }
--        if (!empty($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
--            /** @var array $extensionAttributes */
--            $extensionAttributes = $dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY];
--            unset($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
--            foreach ($extensionAttributes as $attributeKey => $attributeValue) {
--                if (!in_array($attributeKey, $skipAttributes)) {
--                    $dataObjectArray[$attributeKey] = $attributeValue;
--                }
-+        foreach ($dataObjectArray as $key => $value) {
-+            if (is_array($value)) {
-+                $dataObjectArray[$key] = $this->processCustomAttributes($value, $skipAttributes);
-             }
-         }
-         return $dataObjectArray;
-diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php
-index 207325042c7..29029ab6efa 100644
---- a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php
-+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php
-@@ -10,6 +10,9 @@ use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
- use Magento\Framework\Api\SearchCriteriaInterface;
- use Magento\Framework\Data\Collection\AbstractDb;
- 
-+/**
-+ * Search criteria join processor
-+ */
- class JoinProcessor implements CollectionProcessorInterface
- {
-     /**
-@@ -28,7 +31,7 @@ class JoinProcessor implements CollectionProcessorInterface
-     private $appliedFields = [];
- 
-     /**
--     * @param CustomJoinInterface[] $customFilters
-+     * @param CustomJoinInterface[] $customJoins
-      * @param array $fieldMapping
-      */
-     public function __construct(
-diff --git a/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php b/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php
-index a1f5acb4e60..4dbf4680f89 100644
---- a/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php
-+++ b/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php
-@@ -8,6 +8,9 @@ namespace Magento\Framework\Api;
- use Magento\Framework\Convert\ConvertArray;
- use Magento\Framework\Reflection\DataObjectProcessor;
- 
-+/**
-+ * Data object converter.
-+ */
- class SimpleDataObjectConverter
- {
-     /**
-@@ -55,7 +58,7 @@ class SimpleDataObjectConverter
-             if (is_array($fieldValue) && !$this->_isSimpleSequentialArray($fieldValue)) {
-                 $fieldValue = $this->convertKeysToCamelCase($fieldValue);
-             }
--            $fieldName = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $fieldName))));
-+            $fieldName = lcfirst(str_replace('_', '', ucwords($fieldName, '_')));
-             $response[$fieldName] = $fieldValue;
-         }
-         return $response;
-@@ -145,7 +148,7 @@ class SimpleDataObjectConverter
-      */
-     public static function snakeCaseToUpperCamelCase($input)
-     {
--        return str_replace(' ', '', ucwords(str_replace('_', ' ', $input)));
-+        return str_replace('_', '', ucwords($input, '_'));
-     }
- 
-     /**
-@@ -156,14 +159,13 @@ class SimpleDataObjectConverter
-      */
-     public static function snakeCaseToCamelCase($input)
-     {
--        return lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $input))));
-+        return lcfirst(self::snakeCaseToUpperCamelCase($input));
-     }
- 
-     /**
-      * Convert a CamelCase string read from method into field key in snake_case
-      *
--     * e.g. DefaultShipping => default_shipping
--     *      Postcode => postcode
-+     * For example [DefaultShipping => default_shipping, Postcode => postcode]
-      *
-      * @param string $name
-      * @return string
-diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/ExtensibleDataObjectConverterTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/ExtensibleDataObjectConverterTest.php
-index f0e333aa5e1..08fad90fe2f 100644
---- a/lib/internal/Magento/Framework/Api/Test/Unit/ExtensibleDataObjectConverterTest.php
-+++ b/lib/internal/Magento/Framework/Api/Test/Unit/ExtensibleDataObjectConverterTest.php
-@@ -10,6 +10,9 @@ use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- use Magento\Framework\Api\AbstractExtensibleObject;
- use Magento\Framework\Api\AttributeValue;
- 
-+/**
-+ * Class ExtensibleDataObjectConverterTest
-+ */
- class ExtensibleDataObjectConverterTest extends \PHPUnit\Framework\TestCase
- {
-     /** @var  \Magento\Framework\Api\ExtensibleDataObjectConverter */
-@@ -83,6 +86,17 @@ class ExtensibleDataObjectConverterTest extends \PHPUnit\Framework\TestCase
-                     AttributeValue::VALUE => 'custom_attribute_value_skip',
-                 ],
-             ],
-+            'test' => [
-+                0 => [
-+                    '3rd_attribute_key' => '3rd_attribute_value',
-+                    AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY => [
-+                        [
-+                            AttributeValue::ATTRIBUTE_CODE => 'another_custom_attribute_code',
-+                            AttributeValue::VALUE => 'another_custom_attribute_value',
-+                        ]
-+                    ]
-+                ]
-+            ]
-         ];
- 
-         $resultArray = [
-@@ -92,6 +106,12 @@ class ExtensibleDataObjectConverterTest extends \PHPUnit\Framework\TestCase
-                 'custom_attribute_value_multi_1',
-                 'custom_attribute_value_multi_2',
-             ],
-+            'test' => [
-+                0 => [
-+                    '3rd_attribute_key' => '3rd_attribute_value',
-+                    'another_custom_attribute_code' => 'another_custom_attribute_value',
-+                ]
-+            ]
-         ];
- 
-         $this->processor->expects($this->any())
-diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/ExtensionAttribute/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/ExtensionAttribute/Config/SchemaLocatorTest.php
-index d874f155b16..972b165d8f3 100644
---- a/lib/internal/Magento/Framework/Api/Test/Unit/ExtensionAttribute/Config/SchemaLocatorTest.php
-+++ b/lib/internal/Magento/Framework/Api/Test/Unit/ExtensionAttribute/Config/SchemaLocatorTest.php
-@@ -15,7 +15,7 @@ class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $model;
- 
--    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
-+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
-     protected $urnResolver;
- 
-     protected function setUp()
-diff --git a/lib/internal/Magento/Framework/App/Action/Forward.php b/lib/internal/Magento/Framework/App/Action/Forward.php
-index 7d6f956545b..c81bc48ace4 100644
---- a/lib/internal/Magento/Framework/App/Action/Forward.php
-+++ b/lib/internal/Magento/Framework/App/Action/Forward.php
-@@ -10,6 +10,11 @@ namespace Magento\Framework\App\Action;
- use Magento\Framework\App\RequestInterface;
- use Magento\Framework\App\ResponseInterface;
- 
-+/**
-+ * Forward request further.
-+ *
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-+ */
- class Forward extends AbstractAction
- {
-     /**
-diff --git a/lib/internal/Magento/Framework/App/Action/HttpConnectActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpConnectActionInterface.php
-new file mode 100644
-index 00000000000..426fe584bad
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Action/HttpConnectActionInterface.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Action;
-+
-+use Magento\Framework\App\ActionInterface;
-+
-+/**
-+ * Marker for actions processing CONNECT requests.
-+ */
-+interface HttpConnectActionInterface extends ActionInterface
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/App/Action/HttpDeleteActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpDeleteActionInterface.php
-new file mode 100644
-index 00000000000..174f21cc57b
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Action/HttpDeleteActionInterface.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Action;
-+
-+use Magento\Framework\App\ActionInterface;
-+
-+/**
-+ * Marker for actions processing DELETE requests.
-+ */
-+interface HttpDeleteActionInterface extends ActionInterface
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/App/Action/HttpGetActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpGetActionInterface.php
-new file mode 100644
-index 00000000000..308b77aa8db
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Action/HttpGetActionInterface.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Action;
-+
-+use Magento\Framework\App\ActionInterface;
-+
-+/**
-+ * Marker for actions processing GET requests.
-+ */
-+interface HttpGetActionInterface extends ActionInterface
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/App/Action/HttpHeadActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpHeadActionInterface.php
-new file mode 100644
-index 00000000000..389bd808996
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Action/HttpHeadActionInterface.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Action;
-+
-+use Magento\Framework\App\ActionInterface;
-+
-+/**
-+ * Marker for actions processing HEAD requests.
-+ *
-+ * @deprecated Both GET and HEAD requests map to HttpGetActionInterface
-+ */
-+interface HttpHeadActionInterface extends ActionInterface
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/App/Action/HttpOptionsActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpOptionsActionInterface.php
-new file mode 100644
-index 00000000000..fa768885a3d
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Action/HttpOptionsActionInterface.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Action;
-+
-+use Magento\Framework\App\ActionInterface;
-+
-+/**
-+ * Marker for actions processing OPTIONS requests.
-+ */
-+interface HttpOptionsActionInterface extends ActionInterface
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/App/Action/HttpPatchActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpPatchActionInterface.php
-new file mode 100644
-index 00000000000..bfc1ec94adc
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Action/HttpPatchActionInterface.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Action;
-+
-+use Magento\Framework\App\ActionInterface;
-+
-+/**
-+ * Marker for actions processing PATCH requests.
-+ */
-+interface HttpPatchActionInterface extends ActionInterface
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/App/Action/HttpPostActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpPostActionInterface.php
-new file mode 100644
-index 00000000000..a4b87ecfe84
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Action/HttpPostActionInterface.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Action;
-+
-+use Magento\Framework\App\ActionInterface;
-+
-+/**
-+ * Marker for actions processing POST requests.
-+ */
-+interface HttpPostActionInterface extends ActionInterface
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/App/Action/HttpPropfindActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpPropfindActionInterface.php
-new file mode 100644
-index 00000000000..7ddd32c4727
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Action/HttpPropfindActionInterface.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Action;
-+
-+use Magento\Framework\App\ActionInterface;
-+
-+/**
-+ * Marker for actions processing PROPFIND requests.
-+ */
-+interface HttpPropfindActionInterface extends ActionInterface
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/App/Action/HttpPutActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpPutActionInterface.php
-new file mode 100644
-index 00000000000..a83e946d9a9
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Action/HttpPutActionInterface.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Action;
-+
-+use Magento\Framework\App\ActionInterface;
-+
-+/**
-+ * Marker for actions processing PUT requests.
-+ */
-+interface HttpPutActionInterface extends ActionInterface
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/App/Action/HttpTraceActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpTraceActionInterface.php
-new file mode 100644
-index 00000000000..b776ab061e6
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Action/HttpTraceActionInterface.php
-@@ -0,0 +1,19 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Action;
-+
-+use Magento\Framework\App\ActionInterface;
-+
-+/**
-+ * Marker for actions processing TRACE requests.
-+ */
-+interface HttpTraceActionInterface extends ActionInterface
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/App/Action/Redirect.php b/lib/internal/Magento/Framework/App/Action/Redirect.php
-index 702d78c84f6..9e211edfc00 100644
---- a/lib/internal/Magento/Framework/App/Action/Redirect.php
-+++ b/lib/internal/Magento/Framework/App/Action/Redirect.php
-@@ -10,6 +10,11 @@ namespace Magento\Framework\App\Action;
- use Magento\Framework\App\RequestInterface;
- use Magento\Framework\App\ResponseInterface;
- 
-+/**
-+ * Issue a redirect.
-+ *
-+ * @SuppressWarnings(PHPMD.AllPurposeAction)
-+ */
- class Redirect extends AbstractAction
- {
-     /**
-diff --git a/lib/internal/Magento/Framework/App/AreaList/Proxy.php b/lib/internal/Magento/Framework/App/AreaList/Proxy.php
-index d3b26ee9a41..09115add571 100644
---- a/lib/internal/Magento/Framework/App/AreaList/Proxy.php
-+++ b/lib/internal/Magento/Framework/App/AreaList/Proxy.php
-@@ -1,12 +1,14 @@
- <?php
- /**
-- * Application area list
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\App\AreaList;
- 
-+/**
-+ * Proxy for area list.
-+ */
- class Proxy extends \Magento\Framework\App\AreaList implements
-     \Magento\Framework\ObjectManager\NoninterceptableInterface
- {
-@@ -56,10 +58,17 @@ class Proxy extends \Magento\Framework\App\AreaList implements
-     }
- 
-     /**
-+     * Remove links to other objects.
-+     *
-      * @return array
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return ['_subject', '_isShared'];
-     }
- 
-@@ -67,9 +76,14 @@ class Proxy extends \Magento\Framework\App\AreaList implements
-      * Retrieve ObjectManager from global scope
-      *
-      * @return void
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $this->_objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-     }
- 
-diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
-index 904c41ab9ec..717b810cffd 100644
---- a/lib/internal/Magento/Framework/App/Bootstrap.php
-+++ b/lib/internal/Magento/Framework/App/Bootstrap.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Framework\App;
- 
-@@ -245,6 +246,8 @@ class Bootstrap
-      *
-      * @param \Magento\Framework\AppInterface $application
-      * @return void
-+     *
-+     * phpcs:disable Magento2.Exceptions,Squiz.Commenting.FunctionCommentThrowTag
-      */
-     public function run(AppInterface $application)
-     {
-@@ -267,13 +270,15 @@ class Bootstrap
-         } catch (\Exception $e) {
-             $this->terminate($e);
-         }
--    }
-+    } // phpcs:enable
- 
-     /**
-      * Asserts maintenance mode
-      *
-      * @return void
-      * @throws \Exception
-+     *
-+     * phpcs:disable Magento2.Exceptions
-      */
-     protected function assertMaintenance()
-     {
-@@ -299,7 +304,7 @@ class Bootstrap
-             $this->errorCode = self::ERR_MAINTENANCE;
-             throw new \Exception('Unable to proceed: the maintenance mode must be enabled first. ');
-         }
--    }
-+    } // phpcs:enable
- 
-     /**
-      * Asserts whether application is installed
-@@ -316,10 +321,12 @@ class Bootstrap
-         $isInstalled = $this->isInstalled();
-         if (!$isInstalled && $isExpected) {
-             $this->errorCode = self::ERR_IS_INSTALLED;
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception('Error: Application is not installed yet. ');
-         }
-         if ($isInstalled && !$isExpected) {
-             $this->errorCode = self::ERR_IS_INSTALLED;
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception('Error: Application is already installed. ');
-         }
-     }
-@@ -413,10 +420,12 @@ class Bootstrap
-      *
-      * @param \Exception $e
-      * @return void
--     * @SuppressWarnings(PHPMD.ExitExpression)
-+     *
-+     * phpcs:disable Magento2.Security.LanguageConstruct, Squiz.Commenting.FunctionCommentThrowTag
-      */
-     protected function terminate(\Exception $e)
-     {
-+
-         if ($this->isDeveloperMode()) {
-             echo $e;
-         } else {
-@@ -433,4 +442,5 @@ class Bootstrap
-         }
-         exit(1);
-     }
-+    // phpcs:enable
- }
-diff --git a/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php b/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
-index e2392b19849..8f8dfd3baf1 100644
---- a/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
-+++ b/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
-@@ -1,18 +1,24 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\App\Cache;
- 
-+use Magento\Framework\App\Cache\Tag\Resolver;
-+use Magento\Framework\App\Cache\Type\FrontendPool;
-+use Magento\Framework\Model\AbstractModel;
-+use Magento\Framework\Model\ResourceModel\AbstractResource;
-+
- /**
-  * Automatic cache cleaner plugin
-  */
- class FlushCacheByTags
- {
-     /**
--     * @var Type\FrontendPool
-+     * @var FrontendPool
-      */
-     private $cachePool;
- 
-@@ -27,23 +33,21 @@ class FlushCacheByTags
-     private $cacheState;
- 
-     /**
--     * @var Tag\Resolver
-+     * @var Resolver
-      */
-     private $tagResolver;
- 
-     /**
--     * FlushCacheByTags constructor.
--     *
--     * @param Type\FrontendPool $cachePool
-+     * @param FrontendPool $cachePool
-      * @param StateInterface $cacheState
--     * @param array $cacheList
--     * @param Tag\Resolver $tagResolver
-+     * @param string[] $cacheList
-+     * @param Resolver $tagResolver
-      */
-     public function __construct(
--        \Magento\Framework\App\Cache\Type\FrontendPool $cachePool,
--        \Magento\Framework\App\Cache\StateInterface $cacheState,
-+        FrontendPool $cachePool,
-+        StateInterface $cacheState,
-         array $cacheList,
--        \Magento\Framework\App\Cache\Tag\Resolver $tagResolver
-+        Resolver $tagResolver
-     ) {
-         $this->cachePool = $cachePool;
-         $this->cacheState = $cacheState;
-@@ -54,17 +58,14 @@ class FlushCacheByTags
-     /**
-      * Clean cache on save object
-      *
--     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $subject
-+     * @param AbstractResource $subject
-      * @param \Closure $proceed
--     * @param \Magento\Framework\Model\AbstractModel $object
--     * @return \Magento\Framework\Model\ResourceModel\AbstractResource
-+     * @param AbstractModel $object
-+     * @return AbstractResource
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    public function aroundSave(
--        \Magento\Framework\Model\ResourceModel\AbstractResource $subject,
--        \Closure $proceed,
--        \Magento\Framework\Model\AbstractModel $object
--    ) {
-+    public function aroundSave(AbstractResource $subject, \Closure $proceed, AbstractModel $object): AbstractResource
-+    {
-         $result = $proceed($object);
-         $tags = $this->tagResolver->getTags($object);
-         $this->cleanCacheByTags($tags);
-@@ -75,39 +76,37 @@ class FlushCacheByTags
-     /**
-      * Clean cache on delete object
-      *
--     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $subject
-+     * @param AbstractResource $subject
-      * @param \Closure $proceed
--     * @param \Magento\Framework\Model\AbstractModel $object
--     * @return \Magento\Framework\Model\ResourceModel\AbstractResource
-+     * @param AbstractModel $object
-+     * @return AbstractResource
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
--    public function aroundDelete(
--        \Magento\Framework\Model\ResourceModel\AbstractResource $subject,
--        \Closure $proceed,
--        \Magento\Framework\Model\AbstractModel $object
--    ) {
-+    public function aroundDelete(AbstractResource $subject, \Closure $proceed, AbstractModel $object): AbstractResource
-+    {
-         $tags = $this->tagResolver->getTags($object);
-         $result = $proceed($object);
-         $this->cleanCacheByTags($tags);
-+
-         return $result;
-     }
- 
-     /**
-      * Clean cache by tags
-      *
--     * @param  string[] $tags
-+     * @param string[] $tags
-      * @return void
-      */
--    private function cleanCacheByTags($tags)
-+    private function cleanCacheByTags(array $tags): void
-     {
--        if (empty($tags)) {
-+        if (!$tags) {
-             return;
-         }
-         foreach ($this->cacheList as $cacheType) {
-             if ($this->cacheState->isEnabled($cacheType)) {
-                 $this->cachePool->get($cacheType)->clean(
--                    \Zend_Cache::CLEANING_MODE_MATCHING_TAG,
--                    array_unique($tags)
-+                    \Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG,
-+                    \array_unique($tags)
-                 );
-             }
-         }
-diff --git a/lib/internal/Magento/Framework/App/Cache/State.php b/lib/internal/Magento/Framework/App/Cache/State.php
-index 08c1fca66ea..9d268ac2d1b 100644
---- a/lib/internal/Magento/Framework/App/Cache/State.php
-+++ b/lib/internal/Magento/Framework/App/Cache/State.php
-@@ -11,6 +11,9 @@ use Magento\Framework\App\DeploymentConfig;
- use Magento\Framework\App\DeploymentConfig\Writer;
- use Magento\Framework\Config\File\ConfigFilePool;
- 
-+/**
-+ * Cache State
-+ */
- class State implements StateInterface
- {
-     /**
-@@ -74,7 +77,7 @@ class State implements StateInterface
-     public function isEnabled($cacheType)
-     {
-         $this->load();
--        return isset($this->statuses[$cacheType]) ? (bool)$this->statuses[$cacheType] : false;
-+        return (bool)($this->statuses[$cacheType] ?? false);
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/App/Config.php b/lib/internal/Magento/Framework/App/Config.php
-index d489029c2b2..5d8d50bcb90 100644
---- a/lib/internal/Magento/Framework/App/Config.php
-+++ b/lib/internal/Magento/Framework/App/Config.php
-@@ -50,7 +50,7 @@ class Config implements ScopeConfigInterface
-      *
-      * @param string $path
-      * @param string $scope
--     * @param null|string $scopeCode
-+     * @param null|int|string $scopeCode
-      * @return mixed
-      */
-     public function getValue(
-@@ -85,7 +85,7 @@ class Config implements ScopeConfigInterface
-      *
-      * @param string $path
-      * @param string $scope
--     * @param null|string $scopeCode
-+     * @param null|int|string $scopeCode
-      * @return bool
-      */
-     public function isSetFlag($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null)
-@@ -95,6 +95,7 @@ class Config implements ScopeConfigInterface
- 
-     /**
-      * Invalidate cache by type
-+     *
-      * Clean scopeCodeResolver
-      *
-      * @return void
-diff --git a/lib/internal/Magento/Framework/App/Config/Initial/Reader.php b/lib/internal/Magento/Framework/App/Config/Initial/Reader.php
-index 161d8a8da70..076d6f11943 100644
---- a/lib/internal/Magento/Framework/App/Config/Initial/Reader.php
-+++ b/lib/internal/Magento/Framework/App/Config/Initial/Reader.php
-@@ -1,12 +1,13 @@
- <?php
- /**
-- * Default configuration data reader. Reads configuration data from storage
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Framework\App\Config\Initial;
- 
-+/**
-+ * Default configuration data reader. Reads configuration data from storage
-+ */
- class Reader
- {
-     /**
-@@ -51,13 +52,17 @@ class Reader
-      */
-     protected $_schemaFile;
- 
-+    /**
-+     * @var \Magento\Framework\Config\DomFactory
-+     */
-+    private $domFactory;
-+
-     /**
-      * @param \Magento\Framework\Config\FileResolverInterface $fileResolver
-      * @param \Magento\Framework\Config\ConverterInterface $converter
-      * @param SchemaLocator $schemaLocator
-      * @param \Magento\Framework\Config\DomFactory $domFactory
-      * @param string $fileName
--     * @param string $domDocumentClass
-      */
-     public function __construct(
-         \Magento\Framework\Config\FileResolverInterface $fileResolver,
-@@ -103,6 +108,7 @@ class Reader
-                 } else {
-                     $domDocument->merge($file);
-                 }
-+                // phpcs:ignore Magento2.Exceptions.ThrowCatch.ThrowCatch
-             } catch (\Magento\Framework\Config\Dom\ValidationException $e) {
-                 throw new \Magento\Framework\Exception\LocalizedException(
-                     new \Magento\Framework\Phrase(
-diff --git a/lib/internal/Magento/Framework/App/Config/MetadataConfigTypeProcessor.php b/lib/internal/Magento/Framework/App/Config/MetadataConfigTypeProcessor.php
-index 6eb5fd7e9d3..bc23032903d 100644
---- a/lib/internal/Magento/Framework/App/Config/MetadataConfigTypeProcessor.php
-+++ b/lib/internal/Magento/Framework/App/Config/MetadataConfigTypeProcessor.php
-@@ -11,6 +11,9 @@ use Magento\Framework\App\Config\Data\ProcessorFactory;
- use Magento\Framework\App\Config\Spi\PostProcessorInterface;
- use Magento\Framework\App\ObjectManager;
- 
-+/**
-+ * Post-process config values using their backend models.
-+ */
- class MetadataConfigTypeProcessor implements PostProcessorInterface
- {
-     /**
-@@ -114,9 +117,14 @@ class MetadataConfigTypeProcessor implements PostProcessorInterface
-         $scopeCode = null
-     ) {
-         foreach ($this->_metadata as $path => $metadata) {
--            $configPath = $this->configPathResolver->resolve($path, $scope, $scopeCode);
--            if (!empty($this->configSource->get($configPath))) {
--                continue;
-+            try {
-+                $configPath = $this->configPathResolver->resolve($path, $scope, $scopeCode);
-+                if (!empty($this->configSource->get($configPath))) {
-+                    continue;
-+                }
-+            } catch (\Throwable $exception) {
-+                //Failed to load scopes or config source, perhaps config data received is outdated.
-+                return $data;
-             }
-             /** @var \Magento\Framework\App\Config\Data\ProcessorInterface $processor */
-             $processor = $this->_processorFactory->get($metadata['backendModel']);
-diff --git a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
-index 321997afdba..681af359446 100644
---- a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
-+++ b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
-@@ -5,6 +5,7 @@
-  */
- namespace Magento\Framework\App\Config;
- 
-+use Magento\Framework\App\ScopeInterface;
- use Magento\Framework\App\ScopeResolverPool;
- 
- /**
-@@ -34,7 +35,7 @@ class ScopeCodeResolver
-      * Resolve scope code
-      *
-      * @param string $scopeType
--     * @param string $scopeCode
-+     * @param string|null $scopeCode
-      * @return string
-      */
-     public function resolve($scopeType, $scopeCode)
-@@ -42,20 +43,24 @@ class ScopeCodeResolver
-         if (isset($this->resolvedScopeCodes[$scopeType][$scopeCode])) {
-             return $this->resolvedScopeCodes[$scopeType][$scopeCode];
-         }
--        if (($scopeCode === null || is_numeric($scopeCode))
--            && $scopeType !== ScopeConfigInterface::SCOPE_TYPE_DEFAULT
--        ) {
-+
-+        if ($scopeType !== ScopeConfigInterface::SCOPE_TYPE_DEFAULT) {
-             $scopeResolver = $this->scopeResolverPool->get($scopeType);
-             $resolverScopeCode = $scopeResolver->getScope($scopeCode);
-         } else {
-             $resolverScopeCode = $scopeCode;
-         }
- 
--        if ($resolverScopeCode instanceof \Magento\Framework\App\ScopeInterface) {
-+        if ($resolverScopeCode instanceof ScopeInterface) {
-             $resolverScopeCode = $resolverScopeCode->getCode();
-         }
- 
-+        if ($scopeCode === null) {
-+            $scopeCode = $resolverScopeCode;
-+        }
-+
-         $this->resolvedScopeCodes[$scopeType][$scopeCode] = $resolverScopeCode;
-+
-         return $resolverScopeCode;
-     }
- 
-diff --git a/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php b/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
-index 48cabd74895..122e6801ed1 100644
---- a/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
-+++ b/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
-@@ -23,7 +23,7 @@ interface ScopeConfigInterface
-      *
-      * @param string $path The path through the tree of configuration values, e.g., 'general/store_information/name'
-      * @param string $scopeType The scope to use to determine config value, e.g., 'store' or 'default'
--     * @param null|string $scopeCode
-+     * @param null|int|string $scopeCode
-      * @return mixed
-      */
-     public function getValue($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null);
-@@ -33,7 +33,7 @@ interface ScopeConfigInterface
-      *
-      * @param string $path The path through the tree of configuration values, e.g., 'general/store_information/name'
-      * @param string $scopeType The scope to use to determine config value, e.g., 'store' or 'default'
--     * @param null|string $scopeCode
-+     * @param null|int|string $scopeCode
-      * @return bool
-      */
-     public function isSetFlag($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null);
-diff --git a/lib/internal/Magento/Framework/App/Config/Value.php b/lib/internal/Magento/Framework/App/Config/Value.php
-index c85b484d51c..6fde4dded46 100644
---- a/lib/internal/Magento/Framework/App/Config/Value.php
-+++ b/lib/internal/Magento/Framework/App/Config/Value.php
-@@ -8,6 +8,10 @@ namespace Magento\Framework\App\Config;
- /**
-  * Config data model
-  *
-+ * This model is temporarily marked as API since {@see \Magento\Framework\App\Config\ValueInterface} doesn't fit
-+ * developers' needs of extensibility. In 2.4 we are going to introduce a new interface which should cover all needs
-+ * and deprecate the mentioned together with the model
-+ *
-  * @method string getScope()
-  * @method \Magento\Framework\App\Config\ValueInterface setScope(string $value)
-  * @method int getScopeId()
-@@ -17,6 +21,8 @@ namespace Magento\Framework\App\Config;
-  * @method string getValue()
-  * @method \Magento\Framework\App\Config\ValueInterface setValue(string $value)
-  *
-+ * @api
-+ *
-  * @SuppressWarnings(PHPMD.NumberOfChildren)
-  */
- class Value extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\App\Config\ValueInterface
-@@ -107,7 +113,7 @@ class Value extends \Magento\Framework\Model\AbstractModel implements \Magento\F
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Processing object after save data
-      *
-      * {@inheritdoc}. In addition, it sets status 'invalidate' for config caches
-      *
-@@ -123,7 +129,7 @@ class Value extends \Magento\Framework\Model\AbstractModel implements \Magento\F
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Processing object after delete data
-      *
-      * {@inheritdoc}. In addition, it sets status 'invalidate' for config caches
-      *
-diff --git a/lib/internal/Magento/Framework/App/Config/ValueInterface.php b/lib/internal/Magento/Framework/App/Config/ValueInterface.php
-index 1e0747acc36..0aa600b84dc 100644
---- a/lib/internal/Magento/Framework/App/Config/ValueInterface.php
-+++ b/lib/internal/Magento/Framework/App/Config/ValueInterface.php
-@@ -10,16 +10,22 @@ namespace Magento\Framework\App\Config;
- /**
-  * Interface \Magento\Framework\App\Config\ValueInterface
-  *
-+ * This interface cannot be marked as API since doesn't fit developers' needs of extensibility. In 2.4 we are going
-+ * to introduce a new interface which should cover all needs and deprecate the this one with the model
-+ * {@see \Magento\Framework\App\Config\Value}
-  */
- interface ValueInterface
- {
-     /**
-      * Table name
-+     *
-+     * @deprecated since it is not used
-      */
-     const ENTITY = 'config_data';
- 
-     /**
-      * Check if config data value was changed
-+     *
-      * @todo this method should be make as protected
-      * @return bool
-      */
-diff --git a/lib/internal/Magento/Framework/App/Console/Response.php b/lib/internal/Magento/Framework/App/Console/Response.php
-index 6255aaa3d87..853c3d5ca26 100644
---- a/lib/internal/Magento/Framework/App/Console/Response.php
-+++ b/lib/internal/Magento/Framework/App/Console/Response.php
-@@ -3,10 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\App\Console;
- 
- /**
-- * @SuppressWarnings(PHPMD.ExitExpression)
-+ * HTTP response implementation.
-  */
- class Response implements \Magento\Framework\App\ResponseInterface
- {
-@@ -53,9 +55,11 @@ class Response implements \Magento\Framework\App\ResponseInterface
-     public function sendResponse()
-     {
-         if (!empty($this->body)) {
-+            // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
-             echo $this->body;
-         }
-         if ($this->terminateOnSend) {
-+            // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-             exit($this->code);
-         }
-         return $this->code;
-diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
-index f83f89ee4ca..40b03b068d6 100644
---- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
-+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
-@@ -70,6 +70,11 @@ class DeploymentConfig
-         if ($key === null) {
-             return $this->flatData;
-         }
-+
-+        if (array_key_exists($key, $this->flatData) && $this->flatData[$key] === null) {
-+            return '';
-+        }
-+
-         return $this->flatData[$key] ?? $defaultValue;
-     }
- 
-@@ -117,7 +122,7 @@ class DeploymentConfig
-     }
- 
-     /**
--     * Check if data from deploy files is avaiable
-+     * Check if data from deploy files is available
-      *
-      * @return bool
-      * @since 100.1.3
-@@ -146,6 +151,8 @@ class DeploymentConfig
-     }
- 
-     /**
-+     * Array keys conversion
-+     *
-      * Convert associative array of arbitrary depth to a flat associative array with concatenated key path as keys
-      * each level of array is accessible by path key
-      *
-diff --git a/lib/internal/Magento/Framework/App/DocRootLocator.php b/lib/internal/Magento/Framework/App/DocRootLocator.php
-index 6fb35c42f13..d73baf8e4e7 100644
---- a/lib/internal/Magento/Framework/App/DocRootLocator.php
-+++ b/lib/internal/Magento/Framework/App/DocRootLocator.php
-@@ -3,10 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Framework\App;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\Framework\Filesystem;
- use Magento\Framework\Filesystem\Directory\ReadFactory;
- 
- /**
-@@ -20,18 +22,26 @@ class DocRootLocator
-     private $request;
- 
-     /**
-+     * @deprecated
-      * @var ReadFactory
-      */
-     private $readFactory;
- 
-+    /**
-+     * @var Filesystem
-+     */
-+    private $filesystem;
-+
-     /**
-      * @param RequestInterface $request
-      * @param ReadFactory $readFactory
-+     * @param Filesystem|null $filesystem
-      */
--    public function __construct(RequestInterface $request, ReadFactory $readFactory)
-+    public function __construct(RequestInterface $request, ReadFactory $readFactory, Filesystem $filesystem = null)
-     {
-         $this->request = $request;
-         $this->readFactory = $readFactory;
-+        $this->filesystem = $filesystem ?: ObjectManager::getInstance()->get(Filesystem::class);
-     }
- 
-     /**
-@@ -42,7 +52,8 @@ class DocRootLocator
-     public function isPub()
-     {
-         $rootBasePath = $this->request->getServer('DOCUMENT_ROOT');
--        $readDirectory = $this->readFactory->create(DirectoryList::ROOT);
--        return (substr($rootBasePath, -strlen('/pub')) === '/pub') && !$readDirectory->isExist($rootBasePath . 'setup');
-+        $readDirectory = $this->filesystem->getDirectoryRead(DirectoryList::ROOT);
-+
-+        return (substr($rootBasePath, -\strlen('/pub')) === '/pub') && ! $readDirectory->isExist('setup');
-     }
- }
-diff --git a/lib/internal/Magento/Framework/App/FrontController.php b/lib/internal/Magento/Framework/App/FrontController.php
-index 03d6ad7ab3f..ba23e010e3e 100644
---- a/lib/internal/Magento/Framework/App/FrontController.php
-+++ b/lib/internal/Magento/Framework/App/FrontController.php
-@@ -13,6 +13,8 @@ use Magento\Framework\App\Request\ValidatorInterface as RequestValidator;
- use Magento\Framework\Exception\NotFoundException;
- use Magento\Framework\Message\ManagerInterface as MessageManager;
- use Magento\Framework\App\Action\AbstractAction;
-+use Psr\Log\LoggerInterface;
-+use Magento\Framework\App\Request\Http as HttpRequest;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -39,17 +41,29 @@ class FrontController implements FrontControllerInterface
-      */
-     private $messages;
- 
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-+    /**
-+     * @var bool
-+     */
-+    private $validatedRequest = false;
-+
-     /**
-      * @param RouterListInterface $routerList
-      * @param ResponseInterface $response
-      * @param RequestValidator|null $requestValidator
-      * @param MessageManager|null $messageManager
-+     * @param LoggerInterface|null $logger
-      */
-     public function __construct(
-         RouterListInterface $routerList,
-         ResponseInterface $response,
-         ?RequestValidator $requestValidator = null,
--        ?MessageManager $messageManager = null
-+        ?MessageManager $messageManager = null,
-+        ?LoggerInterface $logger = null
-     ) {
-         $this->_routerList = $routerList;
-         $this->response = $response;
-@@ -57,18 +71,21 @@ class FrontController implements FrontControllerInterface
-             ?? ObjectManager::getInstance()->get(RequestValidator::class);
-         $this->messages = $messageManager
-             ?? ObjectManager::getInstance()->get(MessageManager::class);
-+        $this->logger = $logger
-+            ?? ObjectManager::getInstance()->get(LoggerInterface::class);
-     }
- 
-     /**
-      * Perform action and generate response
-      *
--     * @param RequestInterface $request
-+     * @param RequestInterface|HttpRequest $request
-      * @return ResponseInterface|ResultInterface
-      * @throws \LogicException
-      */
-     public function dispatch(RequestInterface $request)
-     {
-         \Magento\Framework\Profiler::start('routers_match');
-+        $this->validatedRequest = false;
-         $routingCycleCounter = 0;
-         $result = null;
-         while (!$request->isDispatched() && $routingCycleCounter++ < 100) {
-@@ -99,40 +116,56 @@ class FrontController implements FrontControllerInterface
-     }
- 
-     /**
--     * @param RequestInterface $request
-+     * @param HttpRequest $request
-      * @param ActionInterface $actionInstance
-      * @throws NotFoundException
-      *
-      * @return ResponseInterface|ResultInterface
-      */
-     private function processRequest(
--        RequestInterface $request,
-+        HttpRequest $request,
-         ActionInterface $actionInstance
-     ) {
-         $request->setDispatched(true);
-         $this->response->setNoCacheHeaders();
--        //Validating request.
--        try {
--            $this->requestValidator->validate(
--                $request,
--                $actionInstance
--            );
-+        $result = null;
- 
-+        //Validating a request only once.
-+        if (!$this->validatedRequest) {
-+            try {
-+                $this->requestValidator->validate(
-+                    $request,
-+                    $actionInstance
-+                );
-+            } catch (InvalidRequestException $exception) {
-+                //Validation failed - processing validation results.
-+                $this->logger->debug(
-+                    'Request validation failed for action "'
-+                    .get_class($actionInstance) .'"'
-+                );
-+                $result = $exception->getReplaceResult();
-+                if ($messages = $exception->getMessages()) {
-+                    foreach ($messages as $message) {
-+                        $this->messages->addErrorMessage($message);
-+                    }
-+                }
-+            }
-+            $this->validatedRequest = true;
-+        }
-+
-+        //Validation did not produce a result to replace the action's.
-+        if (!$result) {
-             if ($actionInstance instanceof AbstractAction) {
-                 $result = $actionInstance->dispatch($request);
-             } else {
-                 $result = $actionInstance->execute();
-             }
--        } catch (InvalidRequestException $exception) {
--            //Validation failed - processing validation results.
--            $result = $exception->getReplaceResult();
--            if ($messages = $exception->getMessages()) {
--                foreach ($messages as $message) {
--                    $this->messages->addErrorMessage($message);
--                }
--            }
-         }
- 
-+        //handling redirect to 404
-+        if ($result instanceof NotFoundException) {
-+            throw $result;
-+        }
-         return $result;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/App/FrontControllerInterface.php b/lib/internal/Magento/Framework/App/FrontControllerInterface.php
-index a552d88e68f..afd3091097d 100644
---- a/lib/internal/Magento/Framework/App/FrontControllerInterface.php
-+++ b/lib/internal/Magento/Framework/App/FrontControllerInterface.php
-@@ -8,7 +8,7 @@ namespace Magento\Framework\App;
- /**
-  * Application front controller responsible for dispatching application requests.
-  * Front controller contains logic common for all actions.
-- * Evary application area has own front controller
-+ * Every application area has own front controller.
-  *
-  * @api
-  */
-diff --git a/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php b/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
-index 1a76610bc08..7875e0c8885 100644
---- a/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
-+++ b/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
-@@ -27,7 +27,7 @@ abstract class AbstractHelper
-     protected $_request;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $_moduleManager;
- 
-@@ -125,7 +125,7 @@ abstract class AbstractHelper
-      *
-      * @param string $moduleName Full module name
-      * @return boolean
--     * use \Magento\Framework\Module\Manager::isOutputEnabled()
-+     * use \Magento\Framework\Module\ModuleManagerInterface::isOutputEnabled()
-      */
-     public function isModuleOutputEnabled($moduleName = null)
-     {
-diff --git a/lib/internal/Magento/Framework/App/Helper/Context.php b/lib/internal/Magento/Framework/App/Helper/Context.php
-index dc8afd061cb..cc57f109cc8 100644
---- a/lib/internal/Magento/Framework/App/Helper/Context.php
-+++ b/lib/internal/Magento/Framework/App/Helper/Context.php
-@@ -21,7 +21,7 @@ namespace Magento\Framework\App\Helper;
- class Context implements \Magento\Framework\ObjectManager\ContextInterface
- {
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     protected $_moduleManager;
- 
-@@ -79,7 +79,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
-      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
-      * @param \Psr\Log\LoggerInterface $logger
--     * @param \Magento\Framework\Module\Manager $moduleManager
-+     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-      * @param \Magento\Framework\App\RequestInterface $httpRequest
-      * @param \Magento\Framework\Cache\ConfigInterface $cacheConfig
-      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-@@ -94,7 +94,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-         \Magento\Framework\Url\EncoderInterface $urlEncoder,
-         \Magento\Framework\Url\DecoderInterface $urlDecoder,
-         \Psr\Log\LoggerInterface $logger,
--        \Magento\Framework\Module\Manager $moduleManager,
-+        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
-         \Magento\Framework\App\RequestInterface $httpRequest,
-         \Magento\Framework\Cache\ConfigInterface $cacheConfig,
-         \Magento\Framework\Event\ManagerInterface $eventManager,
-@@ -117,7 +117,9 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
--     * @return \Magento\Framework\Module\Manager
-+     * Get module manager.
-+     *
-+     * @return \Magento\Framework\Module\ModuleManagerInterface
-      */
-     public function getModuleManager()
-     {
-@@ -125,6 +127,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Get url builder.
-+     *
-      * @return \Magento\Framework\UrlInterface
-      */
-     public function getUrlBuilder()
-@@ -133,6 +137,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Get request.
-+     *
-      * @return \Magento\Framework\App\RequestInterface
-      */
-     public function getRequest()
-@@ -141,6 +147,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Get cache configs.
-+     *
-      * @return \Magento\Framework\Cache\ConfigInterface
-      */
-     public function getCacheConfig()
-@@ -149,6 +157,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Get event manager.
-+     *
-      * @return \Magento\Framework\Event\ManagerInterface
-      */
-     public function getEventManager()
-@@ -157,6 +167,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Get logger.
-+     *
-      * @return \Psr\Log\LoggerInterface
-      */
-     public function getLogger()
-@@ -165,6 +177,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Get http header.
-+     *
-      * @return \Magento\Framework\HTTP\Header
-      */
-     public function getHttpHeader()
-@@ -173,6 +187,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Get remote address.
-+     *
-      * @return \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress
-      */
-     public function getRemoteAddress()
-@@ -181,6 +197,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Get url encoder.
-+     *
-      * @return \Magento\Framework\Url\EncoderInterface
-      */
-     public function getUrlEncoder()
-@@ -189,6 +207,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Get url decoder.
-+     *
-      * @return \Magento\Framework\Url\DecoderInterface
-      */
-     public function getUrlDecoder()
-@@ -197,6 +217,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Get scope config.
-+     *
-      * @return \Magento\Framework\App\Config\ScopeConfigInterface
-      */
-     public function getScopeConfig()
-diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php
-index 3c6dee49f97..ca3976da1df 100644
---- a/lib/internal/Magento/Framework/App/Http.php
-+++ b/lib/internal/Magento/Framework/App/Http.php
-@@ -3,16 +3,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\App;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
--use Magento\Framework\ObjectManager\ConfigLoaderInterface;
- use Magento\Framework\App\Request\Http as RequestHttp;
- use Magento\Framework\App\Response\Http as ResponseHttp;
- use Magento\Framework\App\Response\HttpInterface;
- use Magento\Framework\Controller\ResultInterface;
-+use Magento\Framework\Debug;
- use Magento\Framework\Event;
- use Magento\Framework\Filesystem;
-+use Magento\Framework\ObjectManager\ConfigLoaderInterface;
- 
- /**
-  * HTTP web application. Called from webroot index.php to serve web requests.
-@@ -79,7 +81,7 @@ class Http implements \Magento\Framework\AppInterface
-      * @param ResponseHttp $response
-      * @param ConfigLoaderInterface $configLoader
-      * @param State $state
--     * @param Filesystem $filesystem,
-+     * @param Filesystem $filesystem
-      * @param \Magento\Framework\Registry $registry
-      */
-     public function __construct(
-@@ -142,6 +144,9 @@ class Http implements \Magento\Framework\AppInterface
-         } else {
-             throw new \InvalidArgumentException('Invalid return type');
-         }
-+        if ($this->_request->isHead() && $this->_response->getHttpResponseCode() == 200) {
-+            $this->handleHeadRequest();
-+        }
-         // This event gives possibility to launch something before sending output (allow cookie setting)
-         $eventParams = ['request' => $this->_request, 'response' => $this->_response];
-         $this->_eventManager->dispatch('controller_front_send_response_before', $eventParams);
-@@ -149,7 +154,23 @@ class Http implements \Magento\Framework\AppInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Handle HEAD requests by adding the Content-Length header and removing the body from the response.
-+     *
-+     * @return void
-+     */
-+    private function handleHeadRequest()
-+    {
-+        // It is possible that some PHP installations have overloaded strlen to use mb_strlen instead.
-+        // This means strlen might return the actual number of characters in a non-ascii string instead
-+        // of the number of bytes. Use mb_strlen explicitly with a single byte character encoding to ensure
-+        // that the content length is calculated in bytes.
-+        $contentLength = mb_strlen($this->_response->getContent(), '8bit');
-+        $this->_response->clearBody();
-+        $this->_response->setHeader('Content-Length', $contentLength);
-+    }
-+
-+    /**
-+     * @inheritdoc
-      */
-     public function catchException(Bootstrap $bootstrap, \Exception $exception)
-     {
-@@ -198,6 +219,7 @@ class Http implements \Magento\Framework\AppInterface
-     {
-         /** @var \Exception[] $exceptions */
-         $exceptions = [];
-+
-         do {
-             $exceptions[] = $exception;
-         } while ($exception = $exception->getPrevious());
-@@ -214,7 +236,12 @@ class Http implements \Magento\Framework\AppInterface
-                 $index,
-                 get_class($exception),
-                 $exception->getMessage(),
--                $exception->getTraceAsString()
-+                Debug::trace(
-+                    $exception->getTrace(),
-+                    true,
-+                    true,
-+                    (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
-+                )
-             );
-         }
- 
-@@ -241,7 +268,7 @@ class Http implements \Magento\Framework\AppInterface
-                 . "because the Magento setup directory cannot be accessed. \n"
-                 . 'You can install Magento using either the command line or you must restore access '
-                 . 'to the following directory: ' . $setupInfo->getDir($projectRoot) . "\n";
--
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception($newMessage, 0, $exception);
-         }
-     }
-@@ -250,13 +277,14 @@ class Http implements \Magento\Framework\AppInterface
-      * Handler for bootstrap errors
-      *
-      * @param Bootstrap $bootstrap
--     * @param \Exception &$exception
-+     * @param \Exception $exception
-      * @return bool
-      */
-     private function handleBootstrapErrors(Bootstrap $bootstrap, \Exception &$exception)
-     {
-         $bootstrapCode = $bootstrap->getErrorCode();
-         if (Bootstrap::ERR_MAINTENANCE == $bootstrapCode) {
-+            // phpcs:ignore Magento2.Security.IncludeFile
-             require $this->_filesystem->getDirectoryRead(DirectoryList::PUB)->getAbsolutePath('errors/503.php');
-             return true;
-         }
-@@ -297,6 +325,7 @@ class Http implements \Magento\Framework\AppInterface
-     {
-         if ($exception instanceof \Magento\Framework\Exception\State\InitException) {
-             $this->getLogger()->critical($exception);
-+            // phpcs:ignore Magento2.Security.IncludeFile
-             require $this->_filesystem->getDirectoryRead(DirectoryList::PUB)->getAbsolutePath('errors/404.php');
-             return true;
-         }
-@@ -312,7 +341,15 @@ class Http implements \Magento\Framework\AppInterface
-      */
-     private function handleGenericReport(Bootstrap $bootstrap, \Exception $exception)
-     {
--        $reportData = [$exception->getMessage(), $exception->getTraceAsString()];
-+        $reportData = [
-+            $exception->getMessage(),
-+            Debug::trace(
-+                $exception->getTrace(),
-+                true,
-+                true,
-+                (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
-+            )
-+        ];
-         $params = $bootstrap->getParams();
-         if (isset($params['REQUEST_URI'])) {
-             $reportData['url'] = $params['REQUEST_URI'];
-@@ -320,6 +357,7 @@ class Http implements \Magento\Framework\AppInterface
-         if (isset($params['SCRIPT_NAME'])) {
-             $reportData['script_name'] = $params['SCRIPT_NAME'];
-         }
-+        // phpcs:ignore Magento2.Security.IncludeFile
-         require $this->_filesystem->getDirectoryRead(DirectoryList::PUB)->getAbsolutePath('errors/report.php');
-         return true;
-     }
-diff --git a/lib/internal/Magento/Framework/App/Language/Dictionary.php b/lib/internal/Magento/Framework/App/Language/Dictionary.php
-index 294490a665c..d9a5ccb00d8 100644
---- a/lib/internal/Magento/Framework/App/Language/Dictionary.php
-+++ b/lib/internal/Magento/Framework/App/Language/Dictionary.php
-@@ -111,7 +111,9 @@ class Dictionary
-             /** @var Config $languageConfig */
-             $languageConfig = $packInfo['language'];
-             $dictionary = $this->readPackCsv($languageConfig->getVendor(), $languageConfig->getPackage());
--            $result = array_merge($result, $dictionary);
-+            foreach ($dictionary as $key => $value) {
-+                $result[$key] = $value;
-+            }
-         }
-         return $result;
-     }
-diff --git a/lib/internal/Magento/Framework/App/MaintenanceMode.php b/lib/internal/Magento/Framework/App/MaintenanceMode.php
-index 4e4328cb72a..e813522a015 100644
---- a/lib/internal/Magento/Framework/App/MaintenanceMode.php
-+++ b/lib/internal/Magento/Framework/App/MaintenanceMode.php
-@@ -7,6 +7,7 @@ namespace Magento\Framework\App;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\Filesystem;
-+use Magento\Framework\Event\Manager;
- 
- /**
-  * Application Maintenance Mode
-@@ -39,13 +40,18 @@ class MaintenanceMode
-     protected $flagDir;
- 
-     /**
--     * Constructor
--     *
-+     * @var Manager
-+     */
-+    private $eventManager;
-+
-+    /**
-      * @param \Magento\Framework\Filesystem $filesystem
-+     * @param Manager|null $eventManager
-      */
--    public function __construct(Filesystem $filesystem)
-+    public function __construct(Filesystem $filesystem, ?Manager $eventManager = null)
-     {
-         $this->flagDir = $filesystem->getDirectoryWrite(self::FLAG_DIR);
-+        $this->eventManager = $eventManager ?: ObjectManager::getInstance()->get(Manager::class);
-     }
- 
-     /**
-@@ -73,6 +79,8 @@ class MaintenanceMode
-      */
-     public function set($isOn)
-     {
-+        $this->eventManager->dispatch('maintenance_mode_changed', ['isOn' => $isOn]);
-+
-         if ($isOn) {
-             return $this->flagDir->touch(self::FLAG_FILENAME);
-         }
-diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriter/Filesystem.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriter/Filesystem.php
-new file mode 100644
-index 00000000000..2b1cdd2a9c1
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriter/Filesystem.php
-@@ -0,0 +1,61 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\ObjectManager\ConfigWriter;
-+
-+use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\Framework\App\ObjectManager\ConfigWriterInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class Filesystem implements ConfigWriterInterface
-+{
-+    /**
-+     * @var DirectoryList
-+     */
-+    private $directoryList;
-+
-+    /**
-+     * @param DirectoryList $directoryList
-+     */
-+    public function __construct(
-+        DirectoryList $directoryList
-+    ) {
-+        $this->directoryList = $directoryList;
-+    }
-+
-+    /**
-+     * Writes config in storage
-+     *
-+     * @param string $key
-+     * @param array $config
-+     * @return void
-+     */
-+    public function write(string $key, array $config)
-+    {
-+        $this->initialize();
-+        $configuration = sprintf('<?php return %s;', var_export($config, true));
-+        file_put_contents(
-+            $this->directoryList->getPath(DirectoryList::GENERATED_METADATA) . '/' . $key  . '.php',
-+            $configuration
-+        );
-+    }
-+
-+    /**
-+     * Initializes writer
-+     *
-+     * @return void
-+     */
-+    private function initialize()
-+    {
-+        if (!file_exists($this->directoryList->getPath(DirectoryList::GENERATED_METADATA))) {
-+            mkdir($this->directoryList->getPath(DirectoryList::GENERATED_METADATA));
-+        }
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriterInterface.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriterInterface.php
-new file mode 100644
-index 00000000000..cccbb0ae30b
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriterInterface.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\ObjectManager;
-+
-+/**
-+ * Write compiled object manager configuration to storage
-+ */
-+interface ConfigWriterInterface
-+{
-+    /**
-+     * Writes config in storage
-+     *
-+     * @param string $key
-+     * @param array $config
-+     * @return void
-+     */
-+    public function write(string $key, array $config);
-+}
-diff --git a/lib/internal/Magento/Framework/App/PageCache/Kernel.php b/lib/internal/Magento/Framework/App/PageCache/Kernel.php
-index 13e18ed28fd..b507e2e5ca4 100644
---- a/lib/internal/Magento/Framework/App/PageCache/Kernel.php
-+++ b/lib/internal/Magento/Framework/App/PageCache/Kernel.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Framework\App\PageCache;
- 
-+use Magento\Framework\App\State as AppState;
-+use Magento\Framework\App\ObjectManager;
-+
- /**
-  * Builtin cache processor
-  */
-@@ -52,6 +55,11 @@ class Kernel
-      */
-     private $httpFactory;
- 
-+    /**
-+     * @var AppState
-+     */
-+    private $state;
-+
-     /**
-      * @param Cache $cache
-      * @param Identifier $identifier
-@@ -60,6 +68,8 @@ class Kernel
-      * @param \Magento\Framework\App\Http\ContextFactory|null $contextFactory
-      * @param \Magento\Framework\App\Response\HttpFactory|null $httpFactory
-      * @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
-+     * @param AppState|null $state
-+     * @param \Magento\PageCache\Model\Cache\Type|null $fullPageCache
-      */
-     public function __construct(
-         \Magento\Framework\App\PageCache\Cache $cache,
-@@ -68,40 +78,27 @@ class Kernel
-         \Magento\Framework\App\Http\Context $context = null,
-         \Magento\Framework\App\Http\ContextFactory $contextFactory = null,
-         \Magento\Framework\App\Response\HttpFactory $httpFactory = null,
--        \Magento\Framework\Serialize\SerializerInterface $serializer = null
-+        \Magento\Framework\Serialize\SerializerInterface $serializer = null,
-+        AppState $state = null,
-+        \Magento\PageCache\Model\Cache\Type $fullPageCache = null
-     ) {
-         $this->cache = $cache;
-         $this->identifier = $identifier;
-         $this->request = $request;
--
--        if ($context) {
--            $this->context = $context;
--        } else {
--            $this->context = \Magento\Framework\App\ObjectManager::getInstance()->get(
--                \Magento\Framework\App\Http\Context::class
--            );
--        }
--        if ($contextFactory) {
--            $this->contextFactory = $contextFactory;
--        } else {
--            $this->contextFactory = \Magento\Framework\App\ObjectManager::getInstance()->get(
--                \Magento\Framework\App\Http\ContextFactory::class
--            );
--        }
--        if ($httpFactory) {
--            $this->httpFactory = $httpFactory;
--        } else {
--            $this->httpFactory = \Magento\Framework\App\ObjectManager::getInstance()->get(
--                \Magento\Framework\App\Response\HttpFactory::class
--            );
--        }
--        if ($serializer) {
--            $this->serializer = $serializer;
--        } else {
--            $this->serializer = \Magento\Framework\App\ObjectManager::getInstance()->get(
--                \Magento\Framework\Serialize\SerializerInterface::class
--            );
--        }
-+        $this->context = $context ?? ObjectManager::getInstance()->get(\Magento\Framework\App\Http\Context::class);
-+        $this->contextFactory = $contextFactory ?? ObjectManager::getInstance()->get(
-+            \Magento\Framework\App\Http\ContextFactory::class
-+        );
-+        $this->httpFactory = $httpFactory ?? ObjectManager::getInstance()->get(
-+            \Magento\Framework\App\Response\HttpFactory::class
-+        );
-+        $this->serializer = $serializer ?? ObjectManager::getInstance()->get(
-+            \Magento\Framework\Serialize\SerializerInterface::class
-+        );
-+        $this->state = $state ?? ObjectManager::getInstance()->get(AppState::class);
-+        $this->fullPageCache = $fullPageCache ?? ObjectManager::getInstance()->get(
-+            \Magento\PageCache\Model\Cache\Type::class
-+        );
-     }
- 
-     /**
-@@ -112,7 +109,7 @@ class Kernel
-     public function load()
-     {
-         if ($this->request->isGet() || $this->request->isHead()) {
--            $responseData = $this->getCache()->load($this->identifier->getValue());
-+            $responseData = $this->fullPageCache->load($this->identifier->getValue());
-             if (!$responseData) {
-                 return false;
-             }
-@@ -144,12 +141,14 @@ class Kernel
-                 $tags = $tagsHeader ? explode(',', $tagsHeader->getFieldValue()) : [];
- 
-                 $response->clearHeader('Set-Cookie');
--                $response->clearHeader('X-Magento-Tags');
-+                if ($this->state->getMode() != AppState::MODE_DEVELOPER) {
-+                    $response->clearHeader('X-Magento-Tags');
-+                }
-                 if (!headers_sent()) {
-                     header_remove('Set-Cookie');
-                 }
- 
--                $this->getCache()->save(
-+                $this->fullPageCache->save(
-                     $this->serializer->serialize($this->getPreparedData($response)),
-                     $this->identifier->getValue(),
-                     $tags,
-@@ -203,19 +202,4 @@ class Kernel
- 
-         return $response;
-     }
--
--    /**
--     * TODO: Workaround to support backwards compatibility, will rework to use Dependency Injection in MAGETWO-49547
--     *
--     * @return \Magento\PageCache\Model\Cache\Type
--     */
--    private function getCache()
--    {
--        if (!$this->fullPageCache) {
--            $this->fullPageCache = \Magento\Framework\App\ObjectManager::getInstance()->get(
--                \Magento\PageCache\Model\Cache\Type::class
--            );
--        }
--        return $this->fullPageCache;
--    }
- }
-diff --git a/lib/internal/Magento/Framework/App/Request/CompositeValidator.php b/lib/internal/Magento/Framework/App/Request/CompositeValidator.php
-new file mode 100644
-index 00000000000..2b5205fddc9
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Request/CompositeValidator.php
-@@ -0,0 +1,43 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Request;
-+
-+use Magento\Framework\App\ActionInterface;
-+use Magento\Framework\App\RequestInterface;
-+
-+/**
-+ * Use sequence of validators to validate requests.
-+ */
-+class CompositeValidator implements ValidatorInterface
-+{
-+    /**
-+     * @var ValidatorInterface[]
-+     */
-+    private $validators;
-+
-+    /**
-+     * @param ValidatorInterface[] $validators
-+     */
-+    public function __construct(array $validators)
-+    {
-+        $this->validators = $validators;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function validate(
-+        RequestInterface $request,
-+        ActionInterface $action
-+    ): void {
-+        foreach ($this->validators as $validator) {
-+            $validator->validate($request, $action);
-+        }
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/App/Request/DataPersistor.php b/lib/internal/Magento/Framework/App/Request/DataPersistor.php
-index bb3740aceb0..f0b8819621a 100644
---- a/lib/internal/Magento/Framework/App/Request/DataPersistor.php
-+++ b/lib/internal/Magento/Framework/App/Request/DataPersistor.php
-@@ -5,8 +5,12 @@
-  */
- namespace Magento\Framework\App\Request;
- 
-+use Magento\Framework\Api\SimpleDataObjectConverter;
- use Magento\Framework\Session\SessionManagerInterface;
- 
-+/**
-+ * Persist data to session.
-+ */
- class DataPersistor implements DataPersistorInterface
- {
-     /**
-@@ -32,7 +36,7 @@ class DataPersistor implements DataPersistorInterface
-      */
-     public function set($key, $data)
-     {
--        $method = 'set' . ucfirst($key) . 'Data';
-+        $method = 'set' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($key) . 'Data';
-         call_user_func_array([$this->session, $method], [$data]);
-     }
- 
-@@ -44,7 +48,7 @@ class DataPersistor implements DataPersistorInterface
-      */
-     public function get($key)
-     {
--        $method = 'get' . ucfirst($key) . 'Data';
-+        $method = 'get' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($key) . 'Data';
-         return call_user_func_array([$this->session, $method], []);
-     }
- 
-@@ -56,7 +60,7 @@ class DataPersistor implements DataPersistorInterface
-      */
-     public function clear($key)
-     {
--        $method = 'uns' . ucfirst($key) . 'Data';
-+        $method = 'uns' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($key) . 'Data';
-         call_user_func_array([$this->session, $method], []);
-     }
- }
-diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
-index 03a7200fbe2..4e709ed2769 100644
---- a/lib/internal/Magento/Framework/App/Request/Http.php
-+++ b/lib/internal/Magento/Framework/App/Request/Http.php
-@@ -95,6 +95,11 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
-      */
-     private $distroBaseUrl;
- 
-+    /**
-+     * @var PathInfo
-+     */
-+    private $pathInfoService;
-+
-     /**
-      * @param CookieReaderInterface $cookieReader
-      * @param StringUtils $converter
-@@ -103,6 +108,7 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
-      * @param ObjectManagerInterface $objectManager
-      * @param \Zend\Uri\UriInterface|string|null $uri
-      * @param array $directFrontNames
-+     * @param PathInfo|null $pathInfoService
-      */
-     public function __construct(
-         CookieReaderInterface $cookieReader,
-@@ -111,94 +117,71 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
-         PathInfoProcessorInterface $pathInfoProcessor,
-         ObjectManagerInterface $objectManager,
-         $uri = null,
--        $directFrontNames = []
-+        $directFrontNames = [],
-+        PathInfo $pathInfoService = null
-     ) {
-         parent::__construct($cookieReader, $converter, $uri);
-         $this->routeConfig = $routeConfig;
-         $this->pathInfoProcessor = $pathInfoProcessor;
-         $this->objectManager = $objectManager;
-         $this->directFrontNames = $directFrontNames;
-+        $this->pathInfoService = $pathInfoService ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-+            PathInfo::class
-+        );
-     }
- 
-     /**
--     * Returns ORIGINAL_PATH_INFO.
--     * This value is calculated instead of reading PATH_INFO
--     * directly from $_SERVER due to cross-platform differences.
-+     * Return the ORIGINAL_PATH_INFO.
-+     * This value is calculated and processed from $_SERVER due to cross-platform differences.
-+     * instead of reading PATH_INFO
-      *
-      * @return string
-      */
-     public function getOriginalPathInfo()
-     {
-         if (empty($this->originalPathInfo)) {
--            $this->setPathInfo();
-+            $originalPathInfoFromRequest = $this->pathInfoService->getPathInfo(
-+                $this->getRequestUri(),
-+                $this->getBaseUrl()
-+            );
-+            $this->originalPathInfo = (string)$this->pathInfoProcessor->process($this, $originalPathInfoFromRequest);
-+            $this->requestString = $this->originalPathInfo
-+                . $this->pathInfoService->getQueryString($this->getRequestUri());
-         }
-         return $this->originalPathInfo;
-     }
- 
-     /**
--     * Set the PATH_INFO string
--     * Set the ORIGINAL_PATH_INFO string
--     *
--     * @param string|null $pathInfo
--     * @return $this
--     */
--    public function setPathInfo($pathInfo = null)
--    {
--        if ($pathInfo === null) {
--            $requestUri = $this->getRequestUri();
--            if ('/' === $requestUri) {
--                return $this;
--            }
--
--            $requestUri = $this->removeRepeatedSlashes($requestUri);
--            $parsedRequestUri = explode('?', $requestUri, 2);
--            $queryString = !isset($parsedRequestUri[1]) ? '' : '?' . $parsedRequestUri[1];
--            $baseUrl = $this->getBaseUrl();
--            $pathInfo = (string)substr($parsedRequestUri[0], (int)strlen($baseUrl));
--
--            if ($this->isNoRouteUri($baseUrl, $pathInfo)) {
--                $pathInfo = 'noroute';
--            }
--            $pathInfo = $this->pathInfoProcessor->process($this, $pathInfo);
--            $this->originalPathInfo = (string)$pathInfo;
--            $this->requestString = $pathInfo . $queryString;
--        }
--        $this->pathInfo = (string)$pathInfo;
--        return $this;
--    }
--
--    /**
--     * Remove repeated slashes from the start of the path.
-+     * Return the path info
-      *
--     * @param string $pathInfo
-      * @return string
-      */
--    private function removeRepeatedSlashes($pathInfo)
-+    public function getPathInfo()
-     {
--        $firstChar = (string)substr($pathInfo, 0, 1);
--        if ($firstChar == '/') {
--            $pathInfo = '/' . ltrim($pathInfo, '/');
-+        if (empty($this->pathInfo)) {
-+            $this->pathInfo = $this->getOriginalPathInfo();
-         }
--
--        return $pathInfo;
-+        return $this->pathInfo;
-     }
- 
-     /**
--     * Check is URI should be marked as no route, helps route to 404 URI like `index.phpadmin`.
-+     * Set the PATH_INFO string.
-+     *
-+     * Set the ORIGINAL_PATH_INFO string.
-      *
--     * @param string $baseUrl
--     * @param string $pathInfo
--     * @return bool
-+     * @param string|null $pathInfo
-+     * @return $this
-      */
--    private function isNoRouteUri($baseUrl, $pathInfo)
-+    public function setPathInfo($pathInfo = null)
-     {
--        $firstChar = (string)substr($pathInfo, 0, 1);
--        return $baseUrl !== '' && !in_array($firstChar, ['/', '']);
-+        $this->pathInfo = (string)$pathInfo;
-+        return $this;
-     }
- 
-     /**
--     * Check if code declared as direct access frontend name
--     * this mean what this url can be used without store code
-+     * Check if code declared as direct access frontend name.
-+     *
-+     * This means what this url can be used without store code.
-      *
-      * @param   string $code
-      * @return  bool
-@@ -284,8 +267,7 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
-     }
- 
-     /**
--     * Collect properties changed by _forward in protected storage
--     * before _forward was called first time.
-+     * Collect properties changed by _forward in protected storage before _forward was called first time.
-      *
-      * @return $this
-      */
-@@ -427,6 +409,8 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
-     }
- 
-     /**
-+     * Sleep
-+     *
-      * @return array
-      */
-     public function __sleep()
-@@ -435,7 +419,7 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isSafeMethod()
-     {
-diff --git a/lib/internal/Magento/Framework/App/Request/HttpMethodMap.php b/lib/internal/Magento/Framework/App/Request/HttpMethodMap.php
-new file mode 100644
-index 00000000000..4e7216954b0
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Request/HttpMethodMap.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Request;
-+
-+/**
-+ * Map of HTTP methods and interfaces that an action implements in order to process them.
-+ */
-+class HttpMethodMap
-+{
-+    /**
-+     * @var string[]
-+     */
-+    private $map;
-+
-+    /**
-+     * @param string[] $map
-+     */
-+    public function __construct(array $map)
-+    {
-+        $this->map = $this->processMap($map);
-+    }
-+
-+    /**
-+     * Filter given map.
-+     *
-+     * @param array $map
-+     * @throws \InvalidArgumentException
-+     *
-+     * @return string[]
-+     */
-+    private function processMap(array $map): array
-+    {
-+        $filtered = [];
-+        foreach ($map as $method => $interface) {
-+            $interface = trim(preg_replace('/^\\\+/', '', $interface));
-+            if (!(interface_exists($interface) || class_exists($interface))) {
-+                throw new \InvalidArgumentException(
-+                    "Interface '$interface' does not exist"
-+                );
-+            }
-+            if (!$method) {
-+                throw new \InvalidArgumentException('Invalid method given');
-+            }
-+
-+            $filtered[$method] = $interface;
-+        }
-+
-+        return $filtered;
-+    }
-+
-+    /**
-+     * Where keys are methods' names and values are interfaces' names.
-+     *
-+     * @return string[]
-+     *
-+     * @see \Zend\Http\Request Has list of methods as METHOD_* constants.
-+     */
-+    public function getMap(): array
-+    {
-+        return $this->map;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php
-new file mode 100644
-index 00000000000..d3eb514caad
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php
-@@ -0,0 +1,96 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Request;
-+
-+use Magento\Framework\App\ActionInterface;
-+use Magento\Framework\App\RequestInterface;
-+use Magento\Framework\Exception\NotFoundException;
-+use Magento\Framework\Interception\InterceptorInterface;
-+use Magento\Framework\Phrase;
-+use Psr\Log\LoggerInterface;
-+
-+/**
-+ * Make sure that a request's method can be processed by an action.
-+ */
-+class HttpMethodValidator implements ValidatorInterface
-+{
-+    /**
-+     * @var HttpMethodMap
-+     */
-+    private $map;
-+
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $log;
-+
-+    /**
-+     * @param HttpMethodMap $map
-+     * @param LoggerInterface $logger
-+     */
-+    public function __construct(
-+        HttpMethodMap $map,
-+        LoggerInterface $logger
-+    ) {
-+        $this->map = $map;
-+        $this->log = $logger;
-+    }
-+
-+    /**
-+     * Create exception when invalid HTTP method used.
-+     *
-+     * @param Http $request
-+     * @param ActionInterface $action
-+     * @throws InvalidRequestException
-+     *
-+     * @return void
-+     */
-+    private function throwException(
-+        Http $request,
-+        ActionInterface $action
-+    ): void {
-+        $uri = $request->getRequestUri();
-+        $method = $request->getMethod();
-+        if ($action instanceof InterceptorInterface) {
-+            $actionClass = get_parent_class($action);
-+        } else {
-+            $actionClass = get_class($action);
-+        }
-+        $this->log->debug(
-+            "URI '$uri'' cannot be accessed with $method method ($actionClass)"
-+        );
-+
-+        throw new InvalidRequestException(
-+            new NotFoundException(new Phrase('Page not found.'))
-+        );
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function validate(
-+        RequestInterface $request,
-+        ActionInterface $action
-+    ): void {
-+        if ($request instanceof Http) {
-+            $method = $request->getMethod();
-+            $map = $this->map->getMap();
-+            //If we don't have an interface for the HTTP method or
-+            //the action has HTTP method limitations and doesn't allow the
-+            //received one then the request is invalid.
-+            if (!array_key_exists($method, $map)
-+                || (array_intersect($map, class_implements($action, true))
-+                    && !$action instanceof $map[$method]
-+                )
-+            ) {
-+                $this->throwException($request, $action);
-+            }
-+        }
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
-index 3d408b00506..f15ce494e9b 100644
---- a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
-+++ b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
-@@ -10,6 +10,7 @@ namespace Magento\Framework\App\Request;
- 
- use Magento\Framework\App\ResponseInterface;
- use Magento\Framework\Controller\ResultInterface;
-+use Magento\Framework\Exception\NotFoundException;
- use Magento\Framework\Exception\RuntimeException;
- use Magento\Framework\Phrase;
- 
-@@ -29,8 +30,9 @@ class InvalidRequestException extends RuntimeException
-     private $messages;
- 
-     /**
--     * @param ResponseInterface|ResultInterface $replaceResult Use this result
--     * instead of calling action instance.
-+     * @param ResponseInterface|ResultInterface|NotFoundException $replaceResult
-+     * Use this result instead of calling an action instance,
-+     * if NotFoundException is given the the default 404 mechanism will be triggered.
-      * @param Phrase[]|null $messages Messages to show to client
-      * as error messages.
-      */
-@@ -43,7 +45,7 @@ class InvalidRequestException extends RuntimeException
-     }
- 
-     /**
--     * @return ResponseInterface|ResultInterface
-+     * @return ResponseInterface|ResultInterface|NotFoundException
-      */
-     public function getReplaceResult()
-     {
-diff --git a/lib/internal/Magento/Framework/App/Request/PathInfo.php b/lib/internal/Magento/Framework/App/Request/PathInfo.php
-new file mode 100644
-index 00000000000..76a12d6aefe
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Request/PathInfo.php
-@@ -0,0 +1,80 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Request;
-+
-+/**
-+ * Computes path info and query string from request
-+ */
-+class PathInfo
-+{
-+    /**
-+     * Get path info using from the request URI and base URL
-+     *
-+     * @param string $requestUri
-+     * @param string $baseUrl
-+     * @return string
-+     */
-+    public function getPathInfo(string $requestUri, string $baseUrl) : string
-+    {
-+        if ($requestUri === '/') {
-+            return '';
-+        }
-+
-+        $requestUri = $this->removeRepeatedSlashes($requestUri);
-+        $parsedRequestUri = explode('?', $requestUri, 2);
-+        $pathInfo = (string)substr(current($parsedRequestUri), (int)strlen($baseUrl));
-+
-+        if ($this->isNoRouteUri($baseUrl, $pathInfo)) {
-+            $pathInfo = \Magento\Framework\App\Router\Base::NO_ROUTE;
-+        }
-+        return $pathInfo;
-+    }
-+
-+    /**
-+     * Get query string using from the request URI
-+     *
-+     * @param string $requestUri
-+     * @return string
-+     */
-+    public function getQueryString(string $requestUri) : string
-+    {
-+        $requestUri = $this->removeRepeatedSlashes($requestUri);
-+        $parsedRequestUri = explode('?', $requestUri, 2);
-+        $queryString = !isset($parsedRequestUri[1]) ? '' : '?' . $parsedRequestUri[1];
-+        return $queryString;
-+    }
-+
-+    /**
-+     * Remove repeated slashes from the start of the path.
-+     *
-+     * @param string $pathInfo
-+     * @return string
-+     */
-+    private function removeRepeatedSlashes($pathInfo) : string
-+    {
-+        $firstChar = (string)substr($pathInfo, 0, 1);
-+        if ($firstChar == '/') {
-+            $pathInfo = '/' . ltrim($pathInfo, '/');
-+        }
-+
-+        return $pathInfo;
-+    }
-+
-+    /**
-+     * Check is URI should be marked as no route, helps route to 404 URI like `index.phpadmin`.
-+     *
-+     * @param string $baseUrl
-+     * @param string $pathInfo
-+     * @return bool
-+     */
-+    private function isNoRouteUri($baseUrl, $pathInfo) : bool
-+    {
-+        $firstChar = (string)substr($pathInfo, 0, 1);
-+        return $baseUrl !== '' && !in_array($firstChar, ['/', '']);
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/App/ResourceConnection.php b/lib/internal/Magento/Framework/App/ResourceConnection.php
-index 148053fa44e..b543cc970f6 100644
---- a/lib/internal/Magento/Framework/App/ResourceConnection.php
-+++ b/lib/internal/Magento/Framework/App/ResourceConnection.php
-@@ -11,7 +11,9 @@ use Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactoryInterface;
- 
- /**
-  * Application provides ability to configure multiple connections to persistent storage.
-+ *
-  * This class provides access to all these connections.
-+ *
-  * @api
-  */
- class ResourceConnection
-@@ -53,7 +55,7 @@ class ResourceConnection
-     protected $connectionFactory;
- 
-     /**
--     * @var DeploymentConfig $deploymentConfig
-+     * @var DeploymentConfig
-      */
-     private $deploymentConfig;
- 
-diff --git a/lib/internal/Magento/Framework/App/Response/Http.php b/lib/internal/Magento/Framework/App/Response/Http.php
-index 62ff94e7043..a80d9cbdd66 100644
---- a/lib/internal/Magento/Framework/App/Response/Http.php
-+++ b/lib/internal/Magento/Framework/App/Response/Http.php
-@@ -1,10 +1,9 @@
- <?php
- /**
-- * HTTP response
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\App\Response;
- 
- use Magento\Framework\App\Http\Context;
-@@ -16,6 +15,11 @@ use Magento\Framework\Stdlib\DateTime;
- use Magento\Framework\App\Request\Http as HttpRequest;
- use Magento\Framework\Session\Config\ConfigInterface;
- 
-+/**
-+ * HTTP Response.
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-+ */
- class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
- {
-     /** Cookie to store page vary string */
-@@ -113,8 +117,9 @@ class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
-     }
- 
-     /**
--     * Set headers for public cache
--     * Accepts the time-to-live (max-age) parameter
-+     * Set headers for public cache.
-+     *
-+     * Also accepts the time-to-live (max-age) parameter.
-      *
-      * @param int $ttl
-      * @return void
-@@ -174,11 +179,18 @@ class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
-     }
- 
-     /**
-+     * Remove links to other objects.
-+     *
-      * @return string[]
-      * @codeCoverageIgnore
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return ['content', 'isRedirect', 'statusCode', 'context', 'headers'];
-     }
- 
-@@ -187,9 +199,14 @@ class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
-      *
-      * @return void
-      * @codeCoverageIgnore
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $objectManager = ObjectManager::getInstance();
-         $this->cookieManager = $objectManager->create(\Magento\Framework\Stdlib\CookieManagerInterface::class);
-         $this->cookieMetadataFactory = $objectManager->get(
-diff --git a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
-index 19a89681a2d..d599f91ca8c 100644
---- a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
-+++ b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
-@@ -1,13 +1,17 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\App\Response\Http;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
- 
-+/**
-+ * Class FileFactory serves to declare file content in response for download.
-+ */
- class FileFactory
- {
-     /**
-@@ -47,7 +51,6 @@ class FileFactory
-      *
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     public function create(
-         $fileName,
-@@ -68,6 +71,7 @@ class FileFactory
-                 $isFile = true;
-                 $file = $content['value'];
-                 if (!$dir->isFile($file)) {
-+                    // phpcs:ignore Magento2.Exceptions.DirectThrow
-                     throw new \Exception((string)new \Magento\Framework\Phrase('File not found'));
-                 }
-                 $contentLength = $dir->stat($file)['size'];
-@@ -86,6 +90,7 @@ class FileFactory
-             if ($isFile) {
-                 $stream = $dir->openFile($file, 'r');
-                 while (!$stream->eof()) {
-+                    // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
-                     echo $stream->read(1024);
-                 }
-             } else {
-@@ -93,6 +98,7 @@ class FileFactory
-                 $file = $fileName;
-                 $stream = $dir->openFile($fileName, 'r');
-                 while (!$stream->eof()) {
-+                    // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
-                     echo $stream->read(1024);
-                 }
-             }
-diff --git a/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php b/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php
-index fd37590bb77..5e79315238f 100644
---- a/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php
-+++ b/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php
-@@ -60,10 +60,17 @@ class Proxy implements
-     }
- 
-     /**
-+     * Remove links to other objects.
-+     *
-      * @return array
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return ['_subject', '_isShared'];
-     }
- 
-@@ -71,9 +78,14 @@ class Proxy implements
-      * Retrieve ObjectManager from global scope
-      *
-      * @return void
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $this->_objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-     }
- 
-diff --git a/lib/internal/Magento/Framework/App/Router/Base.php b/lib/internal/Magento/Framework/App/Router/Base.php
-index ed9def8e1cf..fcce821858e 100644
---- a/lib/internal/Magento/Framework/App/Router/Base.php
-+++ b/lib/internal/Magento/Framework/App/Router/Base.php
-@@ -5,14 +5,23 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\App\Router;
- 
- /**
-+ * Base router implementation.
-+ *
-  * @SuppressWarnings(PHPMD.TooManyFields)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Base implements \Magento\Framework\App\RouterInterface
- {
-+    /**
-+     * No route constant used for request
-+     */
-+    const NO_ROUTE = 'noroute';
-+
-     /**
-      * @var \Magento\Framework\App\ActionFactory
-      */
-@@ -303,7 +312,7 @@ class Base implements \Magento\Framework\App\RouterInterface
-             if ($actionInstance === null) {
-                 return null;
-             }
--            $action = 'noroute';
-+            $action = self::NO_ROUTE;
-         }
- 
-         // set values only after all the checks are done
-@@ -333,12 +342,12 @@ class Base implements \Magento\Framework\App\RouterInterface
- 
-     /**
-      * Check that request uses https protocol if it should.
-+     *
-      * Function redirects user to correct URL if needed.
-      *
-      * @param \Magento\Framework\App\RequestInterface $request
-      * @param string $path
-      * @return void
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     protected function _checkShouldBeSecure(\Magento\Framework\App\RequestInterface $request, $path = '')
-     {
-@@ -353,6 +362,7 @@ class Base implements \Magento\Framework\App\RouterInterface
-             }
- 
-             $this->_responseFactory->create()->setRedirect($url)->sendResponse();
-+            // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-             exit;
-         }
-     }
-diff --git a/lib/internal/Magento/Framework/App/RouterList.php b/lib/internal/Magento/Framework/App/RouterList.php
-index ae14f1ad3d2..75ea8766c96 100644
---- a/lib/internal/Magento/Framework/App/RouterList.php
-+++ b/lib/internal/Magento/Framework/App/RouterList.php
-@@ -119,14 +119,6 @@ class RouterList implements RouterListInterface
-      */
-     protected function compareRoutersSortOrder($routerDataFirst, $routerDataSecond)
-     {
--        if ((int)$routerDataFirst['sortOrder'] == (int)$routerDataSecond['sortOrder']) {
--            return 0;
--        }
--
--        if ((int)$routerDataFirst['sortOrder'] < (int)$routerDataSecond['sortOrder']) {
--            return -1;
--        } else {
--            return 1;
--        }
-+        return (int)$routerDataFirst['sortOrder'] <=> (int)$routerDataSecond['sortOrder'];
-     }
- }
-diff --git a/lib/internal/Magento/Framework/App/ScopeDefault.php b/lib/internal/Magento/Framework/App/ScopeDefault.php
-index 2ea62387145..e62d19f9ffb 100644
---- a/lib/internal/Magento/Framework/App/ScopeDefault.php
-+++ b/lib/internal/Magento/Framework/App/ScopeDefault.php
-@@ -17,7 +17,7 @@ class ScopeDefault implements ScopeInterface
-      */
-     public function getCode()
-     {
--        return 'default';
-+        return '';
-     }
- 
-     /**
-@@ -27,7 +27,7 @@ class ScopeDefault implements ScopeInterface
-      */
-     public function getId()
-     {
--        return 1;
-+        return 0;
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/App/StaticResource.php b/lib/internal/Magento/Framework/App/StaticResource.php
-index 575074fdb58..86b2b15d3c4 100644
---- a/lib/internal/Magento/Framework/App/StaticResource.php
-+++ b/lib/internal/Magento/Framework/App/StaticResource.php
-@@ -10,6 +10,7 @@ use Magento\Framework\ObjectManager\ConfigLoaderInterface;
- use Magento\Framework\Filesystem;
- use Magento\Framework\Config\ConfigOptionsListConstants;
- use Psr\Log\LoggerInterface;
-+use Magento\Framework\Debug;
- 
- /**
-  * Entry point for retrieving static resources like JS, CSS, images by requested public path
-@@ -138,7 +139,7 @@ class StaticResource implements \Magento\Framework\AppInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function catchException(Bootstrap $bootstrap, \Exception $exception)
-     {
-@@ -146,7 +147,15 @@ class StaticResource implements \Magento\Framework\AppInterface
-         if ($bootstrap->isDeveloperMode()) {
-             $this->response->setHttpResponseCode(404);
-             $this->response->setHeader('Content-Type', 'text/plain');
--            $this->response->setBody($exception->getMessage() . "\n" . $exception->getTraceAsString());
-+            $this->response->setBody(
-+                $exception->getMessage() . "\n" .
-+                Debug::trace(
-+                    $exception->getTrace(),
-+                    true,
-+                    true,
-+                    (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
-+                )
-+            );
-             $this->response->sendResponse();
-         } else {
-             require $this->getFilesystem()->getDirectoryRead(DirectoryList::PUB)->getAbsolutePath('errors/404.php');
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php b/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
-index 32e495ed00a..b9f0023f2b6 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
-@@ -298,4 +298,13 @@ class BootstrapTest extends \PHPUnit\Framework\TestCase
-             [true, false],
-         ];
-     }
-+
-+    /**
-+     * Restore error handler after Bootstrap->run method
-+     */
-+    public function tearDown()
-+    {
-+        restore_error_handler();
-+        setCustomErrorHandler();
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php
-index e05399cd0bf..60dba582177 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php
-@@ -3,9 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Framework\App\Test\Unit\Cache;
- 
-+use Magento\Framework\App\Cache\FlushCacheByTags;
-+use Magento\Framework\App\Cache\StateInterface;
-+use Magento\Framework\App\Cache\Tag\Resolver;
-+use Magento\Framework\App\Cache\Type\FrontendPool;
-+use Magento\Framework\Model\AbstractModel;
-+use Magento\Framework\Model\ResourceModel\AbstractResource;
-+
-+/**
-+ * Unit tests for the \Magento\Framework\App\Cache\FlushCacheByTags class.
-+ */
- class FlushCacheByTagsTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -28,13 +39,16 @@ class FlushCacheByTagsTest extends \PHPUnit\Framework\TestCase
-      */
-     private $plugin;
- 
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setUp()
-     {
--        $this->cacheState = $this->getMockForAbstractClass(\Magento\Framework\App\Cache\StateInterface::class);
--        $this->frontendPool = $this->createMock(\Magento\Framework\App\Cache\Type\FrontendPool::class);
--        $this->tagResolver = $this->createMock(\Magento\Framework\App\Cache\Tag\Resolver::class);
-+        $this->cacheState = $this->getMockForAbstractClass(StateInterface::class);
-+        $this->frontendPool = $this->createMock(FrontendPool::class);
-+        $this->tagResolver = $this->createMock(Resolver::class);
- 
--        $this->plugin = new \Magento\Framework\App\Cache\FlushCacheByTags(
-+        $this->plugin = new FlushCacheByTags(
-             $this->frontendPool,
-             $this->cacheState,
-             ['test'],
-@@ -42,14 +56,19 @@ class FlushCacheByTagsTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testAroundSave()
-+    /**
-+     * @return void
-+     */
-+    public function testAroundSave(): void
-     {
--        $resource = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\AbstractResource::class)
-+        $resource = $this->getMockBuilder(AbstractResource::class)
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
--        $model = $this->getMockBuilder(\Magento\Framework\Model\AbstractModel::class)
-+        $model = $this->getMockBuilder(AbstractModel::class)
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
-+        $this->tagResolver->expects($this->atLeastOnce())->method('getTags')->with($model)->willReturn([]);
-+
-         $result = $this->plugin->aroundSave(
-             $resource,
-             function () use ($resource) {
-@@ -57,17 +76,23 @@ class FlushCacheByTagsTest extends \PHPUnit\Framework\TestCase
-             },
-             $model
-         );
-+
-         $this->assertSame($resource, $result);
-     }
- 
--    public function testAroundDelete()
-+    /**
-+     * @return void
-+     */
-+    public function testAroundDelete(): void
-     {
--        $resource = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\AbstractResource::class)
-+        $resource = $this->getMockBuilder(AbstractResource::class)
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
--        $model = $this->getMockBuilder(\Magento\Framework\Model\AbstractModel::class)
-+        $model = $this->getMockBuilder(AbstractModel::class)
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
-+        $this->tagResolver->expects($this->atLeastOnce())->method('getTags')->with($model)->willReturn([]);
-+
-         $result = $this->plugin->aroundDelete(
-             $resource,
-             function () use ($resource) {
-@@ -75,25 +100,7 @@ class FlushCacheByTagsTest extends \PHPUnit\Framework\TestCase
-             },
-             $model
-         );
--        $this->assertSame($resource, $result);
--    }
- 
--    public function testAroundSaveWithInterface()
--    {
--        $resource = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\AbstractResource::class)
--
--            ->disableOriginalConstructor()
--            ->getMockForAbstractClass();
--        $model = $this->getMockBuilder(\Magento\Framework\Model\AbstractModel::class)
--            ->disableOriginalConstructor()
--            ->getMockForAbstractClass();
--        $result = $this->plugin->aroundSave(
--            $resource,
--            function () use ($resource) {
--                return $resource;
--            },
--            $model
--        );
-         $this->assertSame($resource, $result);
-     }
- }
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Console/CommandListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Console/CommandListTest.php
-index 4ba981aaa14..00007c5c7fb 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/Console/CommandListTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/Console/CommandListTest.php
-@@ -9,6 +9,11 @@ namespace Magento\Framework\App\Test\Unit\Console;
- use Magento\Framework\Console\CommandList;
- use Symfony\Component\Console\Command\Command;
- 
-+/**
-+ * Test for
-+ *
-+ * @see Magento\Framework\Console\CommandList
-+ */
- class CommandListTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -17,7 +22,7 @@ class CommandListTest extends \PHPUnit\Framework\TestCase
-     private $commandList;
- 
-     /**
--     * @var Symfony\Component\Console\Command\Command
-+     * @var Command
-      */
-     private $testCommand;
- 
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
-index 23afbbc73d2..ef4152ba2e4 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
-@@ -8,6 +8,9 @@ namespace Magento\Framework\App\Test\Unit;
- 
- use Magento\Framework\App\DocRootLocator;
- 
-+/**
-+ * Test for Magento\Framework\App\DocRootLocator class.
-+ */
- class DocRootLocatorTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -21,11 +24,15 @@ class DocRootLocatorTest extends \PHPUnit\Framework\TestCase
-     {
-         $request = $this->createMock(\Magento\Framework\App\Request\Http::class);
-         $request->expects($this->once())->method('getServer')->willReturn($path);
-+
-+        $readFactory = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadFactory::class);
-+
-         $reader = $this->createMock(\Magento\Framework\Filesystem\Directory\Read::class);
-+        $filesystem = $this->createMock(\Magento\Framework\Filesystem::class);
-+        $filesystem->expects($this->once())->method('getDirectoryRead')->willReturn($reader);
-         $reader->expects($this->any())->method('isExist')->willReturn($isExist);
--        $readFactory = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadFactory::class);
--        $readFactory->expects($this->once())->method('create')->willReturn($reader);
--        $model = new DocRootLocator($request, $readFactory);
-+
-+        $model = new DocRootLocator($request, $readFactory, $filesystem);
-         $this->assertSame($result, $model->isPub());
-     }
- 
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php
-index 4b904cc2b55..bba4d67ddd1 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php
-@@ -56,9 +56,9 @@ class ErrorHandlerTest extends \PHPUnit\Framework\TestCase
-         $errorFile = 'test_file';
-         $errorLine = 'test_error_line';
- 
--        $exceptedExceptionMessage = sprintf('%s: %s in %s on line %s', $errorPhrase, $errorStr, $errorFile, $errorLine);
-+        $expectedExceptionMessage = sprintf('%s: %s in %s on line %s', $errorPhrase, $errorStr, $errorFile, $errorLine);
-         $this->expectException('Exception');
--        $this->expectExceptionMessage($exceptedExceptionMessage);
-+        $this->expectExceptionMessage($expectedExceptionMessage);
- 
-         $this->object->handler($errorNo, $errorStr, $errorFile, $errorLine);
-     }
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/HttpTest.php
-index a299e04e152..dbb315e88a5 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/HttpTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/HttpTest.php
-@@ -92,7 +92,7 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-                 'pathInfoProcessor' => $pathInfoProcessorMock,
-                 'objectManager' => $objectManagerMock
-             ])
--            ->setMethods(['getFrontName'])
-+            ->setMethods(['getFrontName', 'isHead'])
-             ->getMock();
-         $this->areaListMock = $this->getMockBuilder(\Magento\Framework\App\AreaList::class)
-             ->disableOriginalConstructor()
-@@ -135,12 +135,17 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-     {
-         $frontName = 'frontName';
-         $areaCode = 'areaCode';
--        $this->requestMock->expects($this->once())->method('getFrontName')->will($this->returnValue($frontName));
-+        $this->requestMock->expects($this->once())
-+            ->method('getFrontName')
-+            ->willReturn($frontName);
-         $this->areaListMock->expects($this->once())
-             ->method('getCodeByFrontName')
--            ->with($frontName)->will($this->returnValue($areaCode));
-+            ->with($frontName)
-+            ->willReturn($areaCode);
-         $this->configLoaderMock->expects($this->once())
--            ->method('load')->with($areaCode)->will($this->returnValue([]));
-+            ->method('load')
-+            ->with($areaCode)
-+            ->willReturn([]);
-         $this->objectManagerMock->expects($this->once())->method('configure')->with([]);
-         $this->objectManagerMock->expects($this->once())
-             ->method('get')
-@@ -149,12 +154,15 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-         $this->frontControllerMock->expects($this->once())
-             ->method('dispatch')
-             ->with($this->requestMock)
--            ->will($this->returnValue($this->responseMock));
-+            ->willReturn($this->responseMock);
-     }
- 
-     public function testLaunchSuccess()
-     {
-         $this->setUpLaunch();
-+        $this->requestMock->expects($this->once())
-+            ->method('isHead')
-+            ->willReturn(false);
-         $this->eventManagerMock->expects($this->once())
-             ->method('dispatch')
-             ->with(
-@@ -171,33 +179,101 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-     public function testLaunchException()
-     {
-         $this->setUpLaunch();
--        $this->frontControllerMock->expects($this->once())->method('dispatch')->with($this->requestMock)->will(
--            $this->returnCallback(
--                function () {
--                    throw new \Exception('Message');
--                }
--            )
--        );
-+        $this->frontControllerMock->expects($this->once())
-+            ->method('dispatch')
-+            ->with($this->requestMock)
-+            ->willThrowException(
-+                new \Exception('Message')
-+            );
-         $this->http->launch();
-     }
- 
-+    /**
-+     * Test that HEAD requests lead to an empty body and a Content-Length header matching the original body size.
-+     * @dataProvider dataProviderForTestLaunchHeadRequest
-+     * @param string $body
-+     * @param int $expectedLength
-+     */
-+    public function testLaunchHeadRequest($body, $expectedLength)
-+    {
-+        $this->setUpLaunch();
-+        $this->requestMock->expects($this->once())
-+            ->method('isHead')
-+            ->willReturn(true);
-+        $this->responseMock->expects($this->once())
-+            ->method('getHttpResponseCode')
-+            ->willReturn(200);
-+        $this->responseMock->expects($this->once())
-+            ->method('getContent')
-+            ->willReturn($body);
-+        $this->responseMock->expects($this->once())
-+            ->method('clearBody')
-+            ->willReturn($this->responseMock);
-+        $this->responseMock->expects($this->once())
-+            ->method('setHeader')
-+            ->with('Content-Length', $expectedLength)
-+            ->willReturn($this->responseMock);
-+        $this->eventManagerMock->expects($this->once())
-+            ->method('dispatch')
-+            ->with(
-+                'controller_front_send_response_before',
-+                ['request' => $this->requestMock, 'response' => $this->responseMock]
-+            );
-+        $this->assertSame($this->responseMock, $this->http->launch());
-+    }
-+
-+    /**
-+     * Different test content for responseMock with their expected lengths in bytes.
-+     * @return array
-+     */
-+    public function dataProviderForTestLaunchHeadRequest(): array
-+    {
-+        return [
-+            [
-+                "<html><head></head><body>Test</body></html>",                // Ascii text
-+                43                                                            // Expected Content-Length
-+            ],
-+            [
-+                "<html><head></head><body>部落格</body></html>",               // Multi-byte characters
-+                48                                                            // Expected Content-Length
-+            ],
-+            [
-+                "<html><head></head><body>\0</body></html>",     // Null byte
-+                40                                                            // Expected Content-Length
-+            ],
-+            [
-+                "<html><head></head>خرید<body></body></html>",                // LTR text
-+                47                                                            // Expected Content-Length
-+            ]
-+        ];
-+    }
-+
-     public function testHandleDeveloperModeNotInstalled()
-     {
-         $dir = $this->getMockForAbstractClass(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
--        $dir->expects($this->once())->method('getAbsolutePath')->willReturn(__DIR__);
-+        $dir->expects($this->once())
-+            ->method('getAbsolutePath')
-+            ->willReturn(__DIR__);
-         $this->filesystemMock->expects($this->once())
-             ->method('getDirectoryRead')
-             ->with(DirectoryList::ROOT)
-             ->willReturn($dir);
--        $this->responseMock->expects($this->once())->method('setRedirect')->with('/_files/');
--        $this->responseMock->expects($this->once())->method('sendHeaders');
-+        $this->responseMock->expects($this->once())
-+            ->method('setRedirect')
-+            ->with('/_files/');
-+        $this->responseMock->expects($this->once())
-+            ->method('sendHeaders');
-         $bootstrap = $this->getBootstrapNotInstalled();
--        $bootstrap->expects($this->once())->method('getParams')->willReturn([
--            'SCRIPT_NAME' => '/index.php',
--            'DOCUMENT_ROOT' => __DIR__,
--            'SCRIPT_FILENAME' => __DIR__ . '/index.php',
--            SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files',
--        ]);
-+        $bootstrap->expects($this->once())
-+            ->method('getParams')
-+            ->willReturn(
-+                [
-+                    'SCRIPT_NAME' => '/index.php',
-+                    'DOCUMENT_ROOT' => __DIR__,
-+                    'SCRIPT_FILENAME' => __DIR__ . '/index.php',
-+                    SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files',
-+                ]
-+            );
-         $this->assertTrue($this->http->catchException($bootstrap, new \Exception('Test Message')));
-     }
- 
-@@ -206,24 +282,37 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-         $this->filesystemMock->expects($this->once())
-             ->method('getDirectoryRead')
-             ->will($this->throwException(new \Exception('strange error')));
--        $this->responseMock->expects($this->once())->method('setHttpResponseCode')->with(500);
--        $this->responseMock->expects($this->once())->method('setHeader')->with('Content-Type', 'text/plain');
-+        $this->responseMock->expects($this->once())
-+            ->method('setHttpResponseCode')
-+            ->with(500);
-+        $this->responseMock->expects($this->once())
-+            ->method('setHeader')
-+            ->with('Content-Type', 'text/plain');
-         $constraint = new \PHPUnit\Framework\Constraint\StringStartsWith('1 exception(s):');
--        $this->responseMock->expects($this->once())->method('setBody')->with($constraint);
--        $this->responseMock->expects($this->once())->method('sendResponse');
-+        $this->responseMock->expects($this->once())
-+            ->method('setBody')
-+            ->with($constraint);
-+        $this->responseMock->expects($this->once())
-+            ->method('sendResponse');
-         $bootstrap = $this->getBootstrapNotInstalled();
--        $bootstrap->expects($this->once())->method('getParams')->willReturn(
--            ['DOCUMENT_ROOT' => 'something', 'SCRIPT_FILENAME' => 'something/else']
--        );
-+        $bootstrap->expects($this->once())
-+            ->method('getParams')
-+            ->willReturn(
-+                ['DOCUMENT_ROOT' => 'something', 'SCRIPT_FILENAME' => 'something/else']
-+            );
-         $this->assertTrue($this->http->catchException($bootstrap, new \Exception('Test')));
-     }
- 
-     public function testCatchExceptionSessionException()
-     {
--        $this->responseMock->expects($this->once())->method('setRedirect');
--        $this->responseMock->expects($this->once())->method('sendHeaders');
-+        $this->responseMock->expects($this->once())
-+            ->method('setRedirect');
-+        $this->responseMock->expects($this->once())
-+            ->method('sendHeaders');
-         $bootstrap = $this->createMock(\Magento\Framework\App\Bootstrap::class);
--        $bootstrap->expects($this->once())->method('isDeveloperMode')->willReturn(false);
-+        $bootstrap->expects($this->once())
-+            ->method('isDeveloperMode')
-+            ->willReturn(false);
-         $this->assertTrue($this->http->catchException(
-             $bootstrap,
-             new \Magento\Framework\Exception\SessionException(new \Magento\Framework\Phrase('Test'))
-@@ -238,8 +327,12 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-     private function getBootstrapNotInstalled()
-     {
-         $bootstrap = $this->createMock(\Magento\Framework\App\Bootstrap::class);
--        $bootstrap->expects($this->once())->method('isDeveloperMode')->willReturn(true);
--        $bootstrap->expects($this->once())->method('getErrorCode')->willReturn(Bootstrap::ERR_IS_INSTALLED);
-+        $bootstrap->expects($this->once())
-+            ->method('isDeveloperMode')
-+            ->willReturn(true);
-+        $bootstrap->expects($this->once())
-+            ->method('getErrorCode')
-+            ->willReturn(Bootstrap::ERR_IS_INSTALLED);
-         return $bootstrap;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php
-index 472fff4f4f2..748337443d7 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php
-@@ -52,7 +52,7 @@ class DictionaryTest extends \PHPUnit\Framework\TestCase
-         }
- 
-         $file = $this->getMockForAbstractClass(\Magento\Framework\Filesystem\File\ReadInterface::class);
--        for ($i = 0; $i < count($data); $i++) {
-+        for ($i = 0, $count = count($data); $i < $count; $i++) {
-             $file->expects($this->at($i))->method('readCsv')->will($this->returnValue($data[$i]));
-         }
-         $file->expects($this->at($i))->method('readCsv')->will($this->returnValue(false));
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/MaintenanceModeTest.php b/lib/internal/Magento/Framework/App/Test/Unit/MaintenanceModeTest.php
-index 5d1c22a38af..5970d256166 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/MaintenanceModeTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/MaintenanceModeTest.php
-@@ -6,9 +6,17 @@
- 
- namespace Magento\Framework\App\Test\Unit;
- 
--use \Magento\Framework\App\MaintenanceMode;
-+use Magento\Framework\App\MaintenanceMode;
-+use Magento\Framework\Event\Manager;
-+use Magento\Framework\Filesystem\Directory\WriteInterface;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+use Magento\Framework\Filesystem;
-+use PHPUnit\Framework\TestCase;
- 
--class MaintenanceModeTest extends \PHPUnit\Framework\TestCase
-+/**
-+ * MaintenanceMode Test
-+ */
-+class MaintenanceModeTest extends TestCase
- {
-     /**
-      * @var MaintenanceMode
-@@ -16,141 +24,213 @@ class MaintenanceModeTest extends \PHPUnit\Framework\TestCase
-     protected $model;
- 
-     /**
--     * @var \Magento\Framework\Filesystem\Directory\WriteInterface  | \PHPUnit_Framework_MockObject_MockObject
-+     * @var WriteInterface|\PHPUnit\Framework\MockObject\MockObject
-      */
-     protected $flagDir;
- 
-+    /**
-+     * @var Manager|\PHPUnit\Framework\MockObject\MockObject
-+     */
-+    private $eventManager;
-+
-+    /**
-+     * @inheritdoc
-+     */
-     protected function setup()
-     {
--        $this->flagDir = $this->getMockForAbstractClass(\Magento\Framework\Filesystem\Directory\WriteInterface::class);
--        $filesystem = $this->createMock(\Magento\Framework\Filesystem::class);
--        $filesystem->expects($this->any())
--            ->method('getDirectoryWrite')
--            ->will($this->returnValue($this->flagDir));
-+        $this->flagDir = $this->getMockForAbstractClass(WriteInterface::class);
-+        $filesystem = $this->createMock(Filesystem::class);
-+        $filesystem->method('getDirectoryWrite')
-+            ->willReturn($this->flagDir);
-+        $this->eventManager = $this->createMock(Manager::class);
- 
--        $this->model = new MaintenanceMode($filesystem);
-+        $objectManager = new ObjectManager($this);
-+        $this->model = $objectManager->getObject(MaintenanceMode::class, [
-+            'filesystem' => $filesystem,
-+            'eventManager' => $this->eventManager,
-+        ]);
-     }
- 
-+    /**
-+     * Is On initial test
-+     *
-+     * @return void
-+     */
-     public function testIsOnInitial()
-     {
--        $this->flagDir->expects($this->once())->method('isExist')
-+        $this->flagDir->expects($this->once())
-+            ->method('isExist')
-             ->with(MaintenanceMode::FLAG_FILENAME)
--            ->will($this->returnValue(false));
-+            ->willReturn(false);
-         $this->assertFalse($this->model->isOn());
-     }
- 
-+    /**
-+     * Is On without ip test
-+     *
-+     * @return void
-+     */
-     public function testisOnWithoutIP()
-     {
-         $mapisExist = [
-             [MaintenanceMode::FLAG_FILENAME, true],
-             [MaintenanceMode::IP_FILENAME, false],
-         ];
--        $this->flagDir->expects($this->exactly(2))->method('isExist')
--            ->will(($this->returnValueMap($mapisExist)));
-+        $this->flagDir->expects($this->exactly(2))
-+            ->method('isExist')
-+            ->willReturnMap($mapisExist);
-         $this->assertTrue($this->model->isOn());
-     }
- 
-+    /**
-+     * Is On with IP test
-+     *
-+     * @return void
-+     */
-     public function testisOnWithIP()
-     {
-         $mapisExist = [
-             [MaintenanceMode::FLAG_FILENAME, true],
-             [MaintenanceMode::IP_FILENAME, true],
-         ];
--        $this->flagDir->expects($this->exactly(2))->method('isExist')
--            ->will(($this->returnValueMap($mapisExist)));
-+        $this->flagDir->expects($this->exactly(2))
-+            ->method('isExist')
-+            ->willReturnMap($mapisExist);
-         $this->assertFalse($this->model->isOn());
-     }
- 
-+    /**
-+     * Is On with IP but no Maintenance files test
-+     *
-+     * @return void
-+     */
-     public function testisOnWithIPNoMaintenance()
-     {
--        $this->flagDir->expects($this->once())->method('isExist')
-+        $this->flagDir->expects($this->once())
-+            ->method('isExist')
-             ->with(MaintenanceMode::FLAG_FILENAME)
-             ->willReturn(false);
-         $this->assertFalse($this->model->isOn());
-     }
- 
-+    /**
-+     * Maintenance Mode On test
-+     *
-+     * Tests common scenario with Full Page Cache is set to On
-+     *
-+     * @return void
-+     */
-     public function testMaintenanceModeOn()
-     {
--        $this->flagDir->expects($this->at(0))->method('isExist')->with(MaintenanceMode::FLAG_FILENAME)
--            ->will($this->returnValue(false));
--        $this->flagDir->expects($this->at(1))->method('touch')->will($this->returnValue(true));
--        $this->flagDir->expects($this->at(2))->method('isExist')->with(MaintenanceMode::FLAG_FILENAME)
--            ->will($this->returnValue(true));
--        $this->flagDir->expects($this->at(3))->method('isExist')->with(MaintenanceMode::IP_FILENAME)
--            ->will($this->returnValue(false));
-+        $this->eventManager->expects($this->once())
-+            ->method('dispatch')
-+            ->with('maintenance_mode_changed', ['isOn' => true]);
- 
--        $this->assertFalse($this->model->isOn());
--        $this->assertTrue($this->model->set(true));
--        $this->assertTrue($this->model->isOn());
-+        $this->flagDir->expects($this->once())
-+            ->method('touch')
-+            ->with(MaintenanceMode::FLAG_FILENAME);
-+
-+        $this->model->set(true);
-     }
- 
-+    /**
-+     * Maintenance Mode Off test
-+     *
-+     * Tests common scenario when before Maintenance Mode Full Page Cache was setted to on
-+     *
-+     * @return void
-+     */
-     public function testMaintenanceModeOff()
-     {
--        $this->flagDir->expects($this->at(0))->method('isExist')->with(MaintenanceMode::FLAG_FILENAME)
--            ->will($this->returnValue(true));
--        $this->flagDir->expects($this->at(1))->method('delete')->with(MaintenanceMode::FLAG_FILENAME)
--            ->will($this->returnValue(false));
--        $this->flagDir->expects($this->at(2))->method('isExist')->with(MaintenanceMode::FLAG_FILENAME)
--            ->will($this->returnValue(false));
--
--        $this->assertFalse($this->model->set(false));
--        $this->assertFalse($this->model->isOn());
-+        $this->eventManager->expects($this->once())
-+            ->method('dispatch')
-+            ->with('maintenance_mode_changed', ['isOn' => false]);
-+
-+        $this->flagDir->method('isExist')
-+            ->with(MaintenanceMode::FLAG_FILENAME)
-+            ->willReturn(true);
-+
-+        $this->flagDir->expects($this->once())
-+            ->method('delete')
-+            ->with(MaintenanceMode::FLAG_FILENAME);
-+
-+        $this->model->set(false);
-     }
- 
-+    /**
-+     * Set empty addresses test
-+     *
-+     * @return void
-+     */
-     public function testSetAddresses()
-     {
-         $mapisExist = [
-             [MaintenanceMode::FLAG_FILENAME, true],
-             [MaintenanceMode::IP_FILENAME, true],
-         ];
--        $this->flagDir->expects($this->any())->method('isExist')->will($this->returnValueMap($mapisExist));
--        $this->flagDir->expects($this->any())->method('writeFile')
-+        $this->flagDir->method('isExist')
-+            ->willReturnMap($mapisExist);
-+        $this->flagDir->method('writeFile')
-             ->with(MaintenanceMode::IP_FILENAME)
--            ->will($this->returnValue(true));
-+            ->willReturn(true);
- 
--        $this->flagDir->expects($this->any())->method('readFile')
-+        $this->flagDir->method('readFile')
-             ->with(MaintenanceMode::IP_FILENAME)
--            ->will($this->returnValue(''));
-+            ->willReturn('');
- 
-         $this->model->setAddresses('');
-         $this->assertEquals([''], $this->model->getAddressInfo());
-     }
- 
-+    /**
-+     * Set single address test
-+     *
-+     * @return void
-+     */
-     public function testSetSingleAddresses()
-     {
-         $mapisExist = [
-             [MaintenanceMode::FLAG_FILENAME, true],
-             [MaintenanceMode::IP_FILENAME, true],
-         ];
--        $this->flagDir->expects($this->any())->method('isExist')->will($this->returnValueMap($mapisExist));
--        $this->flagDir->expects($this->any())->method('delete')->will($this->returnValueMap($mapisExist));
-+        $this->flagDir->method('isExist')
-+            ->willReturnMap($mapisExist);
-+        $this->flagDir->method('delete')
-+            ->willReturnMap($mapisExist);
- 
--        $this->flagDir->expects($this->any())->method('writeFile')
--            ->will($this->returnValue(10));
-+        $this->flagDir->method('writeFile')
-+            ->willReturn(10);
- 
--        $this->flagDir->expects($this->any())->method('readFile')
-+        $this->flagDir->method('readFile')
-             ->with(MaintenanceMode::IP_FILENAME)
--            ->will($this->returnValue('address1'));
-+            ->willReturn('address1');
- 
-         $this->model->setAddresses('address1');
-         $this->assertEquals(['address1'], $this->model->getAddressInfo());
-     }
- 
-+    /**
-+     * Is On when multiple addresses test was setted
-+     *
-+     * @return void
-+     */
-     public function testOnSetMultipleAddresses()
-     {
-         $mapisExist = [
-             [MaintenanceMode::FLAG_FILENAME, true],
-             [MaintenanceMode::IP_FILENAME, true],
-         ];
--        $this->flagDir->expects($this->any())->method('isExist')->will($this->returnValueMap($mapisExist));
--        $this->flagDir->expects($this->any())->method('delete')->will($this->returnValueMap($mapisExist));
-+        $this->flagDir->method('isExist')
-+            ->willReturnMap($mapisExist);
-+        $this->flagDir->method('delete')
-+            ->willReturnMap($mapisExist);
- 
--        $this->flagDir->expects($this->any())->method('writeFile')
--            ->will($this->returnValue(10));
-+        $this->flagDir->method('writeFile')
-+            ->willReturn(10);
- 
--        $this->flagDir->expects($this->any())->method('readFile')
-+        $this->flagDir->method('readFile')
-             ->with(MaintenanceMode::IP_FILENAME)
--            ->will($this->returnValue('address1,10.50.60.123'));
-+            ->willReturn('address1,10.50.60.123');
- 
-         $expectedArray = ['address1', '10.50.60.123'];
-         $this->model->setAddresses('address1,10.50.60.123');
-@@ -159,18 +239,25 @@ class MaintenanceModeTest extends \PHPUnit\Framework\TestCase
-         $this->assertTrue($this->model->isOn('address3'));
-     }
- 
-+    /**
-+     * Is Off when multiple addresses test was setted
-+     *
-+     * @return void
-+     */
-     public function testOffSetMultipleAddresses()
-     {
-         $mapisExist = [
-             [MaintenanceMode::FLAG_FILENAME, false],
-             [MaintenanceMode::IP_FILENAME, true],
-         ];
--        $this->flagDir->expects($this->any())->method('isExist')->will($this->returnValueMap($mapisExist));
--        $this->flagDir->expects($this->any())->method('delete')->will($this->returnValueMap($mapisExist));
-+        $this->flagDir->method('isExist')
-+            ->willReturnMap($mapisExist);
-+        $this->flagDir->method('delete')
-+            ->willReturnMap($mapisExist);
- 
--        $this->flagDir->expects($this->any())->method('readFile')
-+        $this->flagDir->method('readFile')
-             ->with(MaintenanceMode::IP_FILENAME)
--            ->will($this->returnValue('address1,10.50.60.123'));
-+            ->willReturn('address1,10.50.60.123');
- 
-         $expectedArray = ['address1', '10.50.60.123'];
-         $this->model->setAddresses('address1,10.50.60.123');
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php
-new file mode 100644
-index 00000000000..6215da3ae90
---- /dev/null
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php
-@@ -0,0 +1,49 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\App\Test\Unit\Request;
-+
-+use Magento\Framework\App\Request\HttpMethodMap;
-+use PHPUnit\Framework\TestCase;
-+
-+class HttpMethodMapTest extends TestCase
-+{
-+    /**
-+     * Test filtering of interface names.
-+     */
-+    public function testFilter()
-+    {
-+        $map = new HttpMethodMap(
-+            ['method1' => '\\Throwable', 'method2' => 'DateTime']
-+        );
-+        $this->assertEquals(
-+            ['method1' => \Throwable::class, 'method2' => \DateTime::class],
-+            $map->getMap()
-+        );
-+    }
-+
-+    /**
-+     * Test validation of interface names.
-+     *
-+     * @expectedException \InvalidArgumentException
-+     */
-+    public function testExisting()
-+    {
-+        new HttpMethodMap(['method1' => 'NonExistingClass']);
-+    }
-+
-+    /**
-+     * Test validation of method names.
-+     *
-+     * @expectedException \InvalidArgumentException
-+     */
-+    public function testMethod()
-+    {
-+        new HttpMethodMap([\Throwable::class]);
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
-index 62445d4244f..81805e2df96 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
-@@ -10,32 +10,41 @@ namespace Magento\Framework\App\Test\Unit\Request;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\Request\Http;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.TooManyMethods)
-+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
-+ */
- class HttpTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-      * @var \Magento\Framework\App\Request\Http
-      */
--    protected $_model;
-+    private $model;
- 
-     /**
-      * @var \Magento\Framework\App\Route\ConfigInterface\Proxy | \PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $_routerListMock;
-+    private $routerListMock;
- 
-     /**
-      * @var \Magento\Framework\App\Request\PathInfoProcessorInterface | \PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $_infoProcessorMock;
-+    private $infoProcessorMock;
-+
-+    /**
-+     * @var \Magento\Framework\App\Request\PathInfo
-+     */
-+    private $pathInfo;
- 
-     /**
-      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager | \PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $objectManagerMock;
-+    private $objectManagerMock;
- 
-     /**
-      * @var \Magento\Framework\Stdlib\StringUtils | \PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $converterMock;
-+    private $converterMock;
- 
-     /**
-      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-@@ -49,12 +58,12 @@ class HttpTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
--        $this->_routerListMock = $this->createPartialMock(
-+        $this->routerListMock = $this->createPartialMock(
-             \Magento\Framework\App\Route\ConfigInterface\Proxy::class,
-             ['getRouteFrontName', 'getRouteByFrontName', '__wakeup']
-         );
--        $this->_infoProcessorMock = $this->createMock(\Magento\Framework\App\Request\PathInfoProcessorInterface::class);
--        $this->_infoProcessorMock->expects($this->any())->method('process')->will($this->returnArgument(1));
-+        $this->infoProcessorMock = $this->createMock(\Magento\Framework\App\Request\PathInfoProcessorInterface::class);
-+        $this->infoProcessorMock->expects($this->any())->method('process')->will($this->returnArgument(1));
-         $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-         $this->converterMock = $this->getMockBuilder(\Magento\Framework\Stdlib\StringUtils::class)
-             ->disableOriginalConstructor()
-@@ -66,6 +75,7 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-         $this->serverArray = $_SERVER;
- 
-         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $this->pathInfo =  $this->objectManager->getObject(\Magento\Framework\App\Request\PathInfo::class);
-     }
- 
-     public function tearDown()
-@@ -81,8 +91,9 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-         $model = $this->objectManager->getObject(
-             \Magento\Framework\App\Request\Http::class,
-             [
--                'routeConfig' => $this->_routerListMock,
--                'pathInfoProcessor' => $this->_infoProcessorMock,
-+                'routeConfig' => $this->routerListMock,
-+                'pathInfoProcessor' => $this->infoProcessorMock,
-+                'pathInfoService' => $this->pathInfo,
-                 'objectManager' => $this->objectManagerMock,
-                 'converter' => $this->converterMock,
-                 'uri' => $uri,
-@@ -100,91 +111,91 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-     public function testGetOriginalPathInfoWithTestUri()
-     {
-         $uri = 'http://test.com/value?key=value';
--        $this->_model = $this->getModel($uri);
--        $this->assertEquals('/value', $this->_model->getOriginalPathInfo());
-+        $this->model = $this->getModel($uri);
-+        $this->assertEquals('/value', $this->model->getOriginalPathInfo());
-     }
- 
-     public function testGetOriginalPathInfoWithEmptyUri()
-     {
--        $this->_model = $this->getModel();
--        $this->assertEmpty($this->_model->getOriginalPathInfo());
-+        $this->model = $this->getModel();
-+        $this->assertEmpty($this->model->getOriginalPathInfo());
-     }
- 
-     public function testGetBasePathWithPath()
-     {
--        $this->_model = $this->getModel();
--        $this->_model->setBasePath('http:\/test.com\one/two');
--        $this->assertEquals('http://test.com/one/two', $this->_model->getBasePath());
-+        $this->model = $this->getModel();
-+        $this->model->setBasePath('http:\/test.com\one/two');
-+        $this->assertEquals('http://test.com/one/two', $this->model->getBasePath());
-     }
- 
-     public function testGetBasePathWithoutPath()
-     {
--        $this->_model = $this->getModel();
--        $this->_model->setBasePath(null);
--        $this->assertEquals('/', $this->_model->getBasePath());
-+        $this->model = $this->getModel();
-+        $this->model->setBasePath(null);
-+        $this->assertEquals('/', $this->model->getBasePath());
-     }
- 
-     public function testSetRouteNameWithRouter()
-     {
-         $router = $this->createMock(\Magento\Framework\App\Route\ConfigInterface::class);
--        $this->_routerListMock->expects($this->any())->method('getRouteFrontName')->will($this->returnValue($router));
--        $this->_model = $this->getModel();
--        $this->_model->setRouteName('RouterName');
--        $this->assertEquals('RouterName', $this->_model->getRouteName());
-+        $this->routerListMock->expects($this->any())->method('getRouteFrontName')->will($this->returnValue($router));
-+        $this->model = $this->getModel();
-+        $this->model->setRouteName('RouterName');
-+        $this->assertEquals('RouterName', $this->model->getRouteName());
-     }
- 
-     public function testSetRouteNameWithNullRouterValue()
-     {
--        $this->_model = $this->getModel();
--        $this->_routerListMock->expects($this->once())->method('getRouteFrontName')->will($this->returnValue(null));
--        $this->_model->setRouteName('RouterName');
-+        $this->model = $this->getModel();
-+        $this->routerListMock->expects($this->once())->method('getRouteFrontName')->will($this->returnValue(null));
-+        $this->model->setRouteName('RouterName');
-     }
- 
-     public function testGetFrontName()
-     {
-         $uri = 'http://test.com/one/two';
--        $this->_model = $this->getModel($uri);
--        $this->assertEquals('one', $this->_model->getFrontName());
-+        $this->model = $this->getModel($uri);
-+        $this->assertEquals('one', $this->model->getFrontName());
-     }
- 
-     public function testGetRouteNameWithNullValueRouteName()
-     {
--        $this->_model = $this->getModel();
--        $this->_model->setRouteName('RouteName');
--        $this->assertEquals('RouteName', $this->_model->getRouteName());
-+        $this->model = $this->getModel();
-+        $this->model->setRouteName('RouteName');
-+        $this->assertEquals('RouteName', $this->model->getRouteName());
-     }
- 
-     public function testGetRouteName()
-     {
--        $this->_model = $this->getModel();
-+        $this->model = $this->getModel();
-         $expected = 'RouteName';
--        $this->_model->setRouteName($expected);
--        $this->assertEquals($expected, $this->_model->getRouteName());
-+        $this->model->setRouteName($expected);
-+        $this->assertEquals($expected, $this->model->getRouteName());
-     }
- 
-     public function testGetFullActionName()
-     {
--        $this->_model = $this->getModel();
-+        $this->model = $this->getModel();
-         /* empty request */
--        $this->assertEquals('__', $this->_model->getFullActionName());
--        $this->_model->setRouteName('test')->setControllerName('controller')->setActionName('action');
--        $this->assertEquals('test/controller/action', $this->_model->getFullActionName('/'));
-+        $this->assertEquals('__', $this->model->getFullActionName());
-+        $this->model->setRouteName('test')->setControllerName('controller')->setActionName('action');
-+        $this->assertEquals('test/controller/action', $this->model->getFullActionName('/'));
-     }
- 
-     public function testInitForward()
-     {
--        $expected = $this->_initForward();
--        $this->assertEquals($expected, $this->_model->getBeforeForwardInfo());
-+        $expected = $this->initForward();
-+        $this->assertEquals($expected, $this->model->getBeforeForwardInfo());
-     }
- 
-     public function testGetBeforeForwardInfo()
-     {
--        $beforeForwardInfo = $this->_initForward();
--        $this->assertNull($this->_model->getBeforeForwardInfo('not_existing_forward_info_key'));
-+        $beforeForwardInfo = $this->initForward();
-+        $this->assertNull($this->model->getBeforeForwardInfo('not_existing_forward_info_key'));
-         foreach (array_keys($beforeForwardInfo) as $key) {
--            $this->assertEquals($beforeForwardInfo[$key], $this->_model->getBeforeForwardInfo($key));
-+            $this->assertEquals($beforeForwardInfo[$key], $this->model->getBeforeForwardInfo($key));
-         }
--        $this->assertEquals($beforeForwardInfo, $this->_model->getBeforeForwardInfo());
-+        $this->assertEquals($beforeForwardInfo, $this->model->getBeforeForwardInfo());
-     }
- 
-     /**
-@@ -192,9 +203,9 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-      *
-      * @return array Contents of $_beforeForwardInfo
-      */
--    protected function _initForward()
-+    private function initForward()
-     {
--        $this->_model = $this->getModel();
-+        $this->model = $this->getModel();
-         $beforeForwardInfo = [
-             'params' => ['one' => '111', 'two' => '222'],
-             'action_name' => 'ActionName',
-@@ -202,49 +213,49 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-             'module_name' => 'ModuleName',
-             'route_name' => 'RouteName'
-         ];
--        $this->_model->setParams($beforeForwardInfo['params']);
--        $this->_model->setActionName($beforeForwardInfo['action_name']);
--        $this->_model->setControllerName($beforeForwardInfo['controller_name']);
--        $this->_model->setModuleName($beforeForwardInfo['module_name']);
--        $this->_model->setRouteName($beforeForwardInfo['route_name']);
--        $this->_model->initForward();
-+        $this->model->setParams($beforeForwardInfo['params']);
-+        $this->model->setActionName($beforeForwardInfo['action_name']);
-+        $this->model->setControllerName($beforeForwardInfo['controller_name']);
-+        $this->model->setModuleName($beforeForwardInfo['module_name']);
-+        $this->model->setRouteName($beforeForwardInfo['route_name']);
-+        $this->model->initForward();
-         return $beforeForwardInfo;
-     }
- 
-     public function testIsAjax()
-     {
--        $this->_model = $this->getModel();
-+        $this->model = $this->getModel();
- 
--        $this->assertFalse($this->_model->isAjax());
-+        $this->assertFalse($this->model->isAjax());
- 
--        $this->_model->clearParams();
--        $this->_model->setParam('ajax', 1);
--        $this->assertTrue($this->_model->isAjax());
-+        $this->model->clearParams();
-+        $this->model->setParam('ajax', 1);
-+        $this->assertTrue($this->model->isAjax());
- 
--        $this->_model->clearParams();
--        $this->_model->setParam('isAjax', 1);
--        $this->assertTrue($this->_model->isAjax());
-+        $this->model->clearParams();
-+        $this->model->setParam('isAjax', 1);
-+        $this->assertTrue($this->model->isAjax());
- 
--        $this->_model->clearParams();
--        $this->_model->getHeaders()->addHeaderLine('X-Requested-With', 'XMLHttpRequest');
--        $this->assertTrue($this->_model->isAjax());
-+        $this->model->clearParams();
-+        $this->model->getHeaders()->addHeaderLine('X-Requested-With', 'XMLHttpRequest');
-+        $this->assertTrue($this->model->isAjax());
- 
--        $this->_model->getHeaders()->clearHeaders();
--        $this->_model->getHeaders()->addHeaderLine('X-Requested-With', 'NotXMLHttpRequest');
--        $this->assertFalse($this->_model->isAjax());
-+        $this->model->getHeaders()->clearHeaders();
-+        $this->model->getHeaders()->addHeaderLine('X-Requested-With', 'NotXMLHttpRequest');
-+        $this->assertFalse($this->model->isAjax());
-     }
- 
-     /**
--     * @param $serverVariables array
--     * @param $expectedResult string
-+     * @param array $serverVariables
-+     * @param string $expectedResult
-      * @dataProvider serverVariablesProvider
-      */
-     public function testGetDistroBaseUrl($serverVariables, $expectedResult)
-     {
-         $originalServerValue = $_SERVER;
-         $_SERVER = $serverVariables;
--        $this->_model = $this->getModel();
--        $this->assertEquals($expectedResult, $this->_model->getDistroBaseUrl());
-+        $this->model = $this->getModel();
-+        $this->assertEquals($expectedResult, $this->model->getDistroBaseUrl());
- 
-         $_SERVER = $originalServerValue;
-     }
-@@ -338,7 +349,7 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testIsSecure($isSecure, $serverHttps, $headerOffloadKey, $headerOffloadValue, $configCall)
-     {
--        $this->_model = $this->getModel(null, false);
-+        $this->model = $this->getModel(null, false);
-         $configOffloadHeader = 'Header-From-Proxy';
-         $configMock = $this->getMockBuilder(\Magento\Framework\App\Config::class)
-             ->disableOriginalConstructor()
-@@ -351,37 +362,37 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-                 ScopeConfigInterface::SCOPE_TYPE_DEFAULT
-             )->willReturn($configOffloadHeader);
- 
--        $this->objectManager->setBackwardCompatibleProperty($this->_model, 'appConfig', $configMock);
--        $this->objectManager->setBackwardCompatibleProperty($this->_model, 'sslOffloadHeader', null);
-+        $this->objectManager->setBackwardCompatibleProperty($this->model, 'appConfig', $configMock);
-+        $this->objectManager->setBackwardCompatibleProperty($this->model, 'sslOffloadHeader', null);
- 
--        $this->_model->getServer()->set($headerOffloadKey, $headerOffloadValue);
--        $this->_model->getServer()->set('HTTPS', $serverHttps);
-+        $this->model->getServer()->set($headerOffloadKey, $headerOffloadValue);
-+        $this->model->getServer()->set('HTTPS', $serverHttps);
- 
--        $this->assertSame($isSecure, $this->_model->isSecure());
-+        $this->assertSame($isSecure, $this->model->isSecure());
-     }
- 
-     /**
-      * @dataProvider httpSafeMethodProvider
-      * @backupGlobals enabled
--     * @param string $method value of $_SERVER['REQUEST_METHOD']
-+     * @param string $httpMethod value of $_SERVER['REQUEST_METHOD']
-      */
-     public function testIsSafeMethodTrue($httpMethod)
-     {
--        $this->_model = $this->getModel();
-+        $this->model = $this->getModel();
-         $_SERVER['REQUEST_METHOD'] = $httpMethod;
--        $this->assertEquals(true, $this->_model->isSafeMethod());
-+        $this->assertEquals(true, $this->model->isSafeMethod());
-     }
- 
-     /**
-      * @dataProvider httpNotSafeMethodProvider
-      * @backupGlobals enabled
--     * @param string $method value of $_SERVER['REQUEST_METHOD']
-+     * @param string $httpMethod value of $_SERVER['REQUEST_METHOD']
-      */
-     public function testIsSafeMethodFalse($httpMethod)
-     {
--        $this->_model = $this->getModel();
-+        $this->model = $this->getModel();
-         $_SERVER['REQUEST_METHOD'] = $httpMethod;
--        $this->assertEquals(false, $this->_model->isSafeMethod());
-+        $this->assertEquals(false, $this->model->isSafeMethod());
-     }
- 
-     /**
-@@ -449,12 +460,25 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-      * @param string $basePath$
-      * @param string $expected
-      */
--    public function testSetPathInfo($requestUri, $basePath, $expected)
-+    public function testGetPathInfo($requestUri, $basePath, $expected)
-+    {
-+        $this->model = $this->getModel($requestUri);
-+        $this->model->setBaseUrl($basePath);
-+        $this->assertEquals($expected, $this->model->getPathInfo());
-+        $this->assertEquals($expected, $this->model->getOriginalPathInfo());
-+    }
-+
-+    public function testSetPathInfo()
-     {
--        $this->_model = $this->getModel($requestUri);
--        $this->_model->setBaseUrl($basePath);
--        $this->_model->setPathInfo();
--        $this->assertEquals($expected, $this->_model->getPathInfo());
-+        $requestUri = 'http://svr.com//module/route/mypage/myproduct?param1=1';
-+        $basePath = '/module/route/';
-+        $this->model = $this->getModel($requestUri);
-+        $this->model->setBaseUrl($basePath);
-+        $expected = '/mypage/myproduct';
-+        $this->assertEquals($expected, $this->model->getOriginalPathInfo());
-+        $this->model->setPathInfo('http://svr.com/something/route?param1=1');
-+        $this->assertEquals('http://svr.com/something/route?param1=1', $this->model->getPathInfo());
-+        $this->assertEquals($expected, $this->model->getOriginalPathInfo());
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/Config/SchemaLocatorTest.php
-index 8a5c071e8c4..921fcf2e61e 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/Config/SchemaLocatorTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/Config/SchemaLocatorTest.php
-@@ -13,7 +13,7 @@ class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $model;
- 
--    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
-+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
-     protected $urnResolver;
- 
-     protected function setUp()
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php
-index 11e305f806b..7ad2f21c89d 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php
-@@ -67,7 +67,7 @@ class FileFactoryTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \Exception
--     * @exceptedExceptionMessage File not found
-+     * @expectedExceptionMessage File not found
-      */
-     public function testCreateIfFileNotExist()
-     {
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
-index efb35b7321c..9be68b37990 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
-@@ -290,45 +290,6 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals('json_string', $this->model->getBody('default'));
-     }
- 
--    /**
--     *
--     * @expectedException \RuntimeException
--     * @expectedExceptionMessage ObjectManager isn't initialized
--     */
--    public function testWakeUpWithException()
--    {
--        /* ensure that the test preconditions are met */
--        $objectManagerClass = new \ReflectionClass(\Magento\Framework\App\ObjectManager::class);
--        $instanceProperty = $objectManagerClass->getProperty('_instance');
--        $instanceProperty->setAccessible(true);
--        $instanceProperty->setValue(null);
--
--        $this->model->__wakeup();
--        $this->assertNull($this->cookieMetadataFactoryMock);
--        $this->assertNull($this->cookieManagerMock);
--    }
--
--    /**
--     * Test for the magic method __wakeup
--     *
--     * @covers \Magento\Framework\App\Response\Http::__wakeup
--     */
--    public function testWakeUpWith()
--    {
--        $objectManagerMock = $this->createMock(\Magento\Framework\App\ObjectManager::class);
--        $objectManagerMock->expects($this->once())
--            ->method('create')
--            ->with(\Magento\Framework\Stdlib\CookieManagerInterface::class)
--            ->will($this->returnValue($this->cookieManagerMock));
--        $objectManagerMock->expects($this->at(1))
--            ->method('get')
--            ->with(\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory::class)
--            ->will($this->returnValue($this->cookieMetadataFactoryMock));
--
--        \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
--        $this->model->__wakeup();
--    }
--
-     public function testSetXFrameOptions()
-     {
-         $value = 'DENY';
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Route/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Route/Config/SchemaLocatorTest.php
-index 143de5ee47f..61938b45529 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/Route/Config/SchemaLocatorTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/Route/Config/SchemaLocatorTest.php
-@@ -12,10 +12,10 @@ class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $config;
- 
--    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
-+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
-     protected $urnResolver;
- 
--    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
-+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
-     protected $urnResolverMock;
- 
-     protected function setUp()
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php
-index 3d44073a24b..94a7330c322 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php
-@@ -7,6 +7,9 @@
-  */
- namespace Magento\Framework\App\Test\Unit\Router;
- 
-+/**
-+ * Base router unit test.
-+ */
- class BaseTest extends \Magento\Framework\TestFramework\Unit\BaseTestCase
- {
-     /**
-@@ -83,11 +86,13 @@ class BaseTest extends \Magento\Framework\TestFramework\Unit\BaseTestCase
-         $actionClassName = \Magento\Framework\App\Action\Action::class;
-         $moduleName = 'module name';
-         $moduleList = [$moduleName];
-+        $paramList = $moduleFrontName . '/' . $actionPath . '/' . $actionName . '/key/val/key2/val2/';
- 
-         // Stubs
-         $this->requestMock->expects($this->any())->method('getModuleName')->willReturn($moduleFrontName);
-         $this->requestMock->expects($this->any())->method('getControllerName')->willReturn($actionPath);
-         $this->requestMock->expects($this->any())->method('getActionName')->willReturn($actionName);
-+        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($paramList);
-         $this->routeConfigMock->expects($this->any())->method('getModulesByFrontName')->willReturn($moduleList);
-         $this->appStateMock->expects($this->any())->method('isInstalled')->willReturn(true);
-         $this->actionListMock->expects($this->any())->method('get')->willReturn($actionClassName);
-@@ -140,6 +145,7 @@ class BaseTest extends \Magento\Framework\TestFramework\Unit\BaseTestCase
-         $actionClassName = \Magento\Framework\App\Action\Action::class;
-         $moduleName = 'module name';
-         $moduleList = [$moduleName];
-+        $paramList = $moduleFrontName . '/' . $actionPath . '/' . $actionName . '/key/val/key2/val2/';
- 
-         // Stubs
-         $defaultReturnMap = [
-@@ -147,6 +153,7 @@ class BaseTest extends \Magento\Framework\TestFramework\Unit\BaseTestCase
-             ['controller', $actionPath],
-             ['action', $actionName],
-         ];
-+        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($paramList);
-         $this->defaultPathMock->expects($this->any())->method('getPart')->willReturnMap($defaultReturnMap);
-         $this->routeConfigMock->expects($this->any())->method('getModulesByFrontName')->willReturn($moduleList);
-         $this->appStateMock->expects($this->any())->method('isInstalled')->willReturn(false);
-@@ -171,9 +178,11 @@ class BaseTest extends \Magento\Framework\TestFramework\Unit\BaseTestCase
-         $actionName = 'action name';
-         $actionClassName = \Magento\Framework\App\Action\Action::class;
-         $emptyModuleList = [];
-+        $paramList = $moduleFrontName . '/' . $actionPath . '/' . $actionName . '/key/val/key2/val2/';
- 
-         // Stubs
-         $this->requestMock->expects($this->any())->method('getModuleName')->willReturn($moduleFrontName);
-+        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($paramList);
-         $this->routeConfigMock->expects($this->any())->method('getModulesByFrontName')->willReturn($emptyModuleList);
-         $this->requestMock->expects($this->any())->method('getControllerName')->willReturn($actionPath);
-         $this->requestMock->expects($this->any())->method('getActionName')->willReturn($actionName);
-@@ -195,9 +204,11 @@ class BaseTest extends \Magento\Framework\TestFramework\Unit\BaseTestCase
-         $actionClassName = \Magento\Framework\App\Action\Action::class;
-         $moduleName = 'module name';
-         $moduleList = [$moduleName];
-+        $paramList = $moduleFrontName . '/' . $actionPath . '/' . $actionName . '/key/val/key2/val2/';
- 
-         // Stubs
-         $this->requestMock->expects($this->any())->method('getModuleName')->willReturn($moduleFrontName);
-+        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($paramList);
-         $this->routeConfigMock->expects($this->any())->method('getModulesByFrontName')->willReturn($moduleList);
-         $this->requestMock->expects($this->any())->method('getControllerName')->willReturn($actionPath);
-         $this->requestMock->expects($this->any())->method('getActionName')->willReturn($actionName);
-diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ViewTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ViewTest.php
-index 807a70ecd75..f39a91161c1 100644
---- a/lib/internal/Magento/Framework/App/Test/Unit/ViewTest.php
-+++ b/lib/internal/Magento/Framework/App/Test/Unit/ViewTest.php
-@@ -122,7 +122,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \RuntimeException
--     * @exceptedExceptionMessage 'Layout must be loaded only once.'
-+     * @expectedExceptionMessage Layout must be loaded only once.
-      */
-     public function testLoadLayoutWhenLayoutAlreadyLoaded()
-     {
-diff --git a/lib/internal/Magento/Framework/App/Utility/Classes.php b/lib/internal/Magento/Framework/App/Utility/Classes.php
-index 7cd36f0e37f..3518264e1ab 100644
---- a/lib/internal/Magento/Framework/App/Utility/Classes.php
-+++ b/lib/internal/Magento/Framework/App/Utility/Classes.php
-@@ -9,6 +9,9 @@ namespace Magento\Framework\App\Utility;
- 
- use Magento\Framework\Component\ComponentRegistrar;
- 
-+/**
-+ * Utility for class names processing
-+ */
- class Classes
- {
-     /**
-@@ -236,7 +239,7 @@ class Classes
-     /**
-      * Check if instance is virtual type
-      *
--     * @param $className string
-+     * @param string $className
-      * @return bool
-      */
-     public static function isVirtual($className)
-diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
-index b0dfc50e9f9..8bb59bb42ff 100644
---- a/lib/internal/Magento/Framework/App/Utility/Files.php
-+++ b/lib/internal/Magento/Framework/App/Utility/Files.php
-@@ -9,6 +9,7 @@ use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Component\ComponentRegistrar;
- use Magento\Framework\Component\DirSearch;
- use Magento\Framework\Serialize\Serializer\Json;
-+use Magento\Framework\View\Design\Theme\ThemePackage;
- use Magento\Framework\View\Design\Theme\ThemePackageList;
- use Magento\Framework\Filesystem\Glob;
- 
-@@ -147,6 +148,7 @@ class Files
-     public static function init()
-     {
-         if (!self::$_instance) {
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow.FoundDirectThrow
-             throw new \Exception('Instance is not set yet.');
-         }
-         return self::$_instance;
-@@ -590,6 +592,8 @@ class Files
-     }
- 
-     /**
-+     * Collect layout files
-+     *
-      * @param string $location
-      * @param array $incomingParams
-      * @param bool $asDataSet
-@@ -611,6 +615,7 @@ class Files
-                 $params[$key] = $incomingParams[$key];
-             }
-         }
-+        //phpcs:ignore Magento2.Security.InsecureFunction
-         $cacheKey = md5($location . '|' . implode('|', $params));
- 
-         if (!isset(self::$_cache[__METHOD__][$cacheKey])) {
-@@ -712,6 +717,8 @@ class Files
-     }
- 
-     /**
-+     * Parse theme layout files
-+     *
-      * @param array $themeFiles
-      * @param string $currentThemePath
-      * @param ThemePackage $theme
-@@ -762,6 +769,7 @@ class Files
-                 $params[$key] = $incomingParams[$key];
-             }
-         }
-+        //phpcs:ignore Magento2.Security.InsecureFunction
-         $cacheKey = md5(implode('|', $params));
- 
-         if (!isset(self::$_cache[__METHOD__][$cacheKey])) {
-@@ -840,6 +848,8 @@ class Files
-     }
- 
-     /**
-+     * Returns list of all theme paths
-+     *
-      * @param string $area
-      * @param string $module
-      * @param string $subFolder
-diff --git a/lib/internal/Magento/Framework/Archive.php b/lib/internal/Magento/Framework/Archive.php
-index d43c976431b..3b706f8e97d 100644
---- a/lib/internal/Magento/Framework/Archive.php
-+++ b/lib/internal/Magento/Framework/Archive.php
-@@ -96,14 +96,14 @@ class Archive
-     {
-         $archivers = $this->_getArchivers($destination);
-         $interimSource = '';
--        for ($i = 0; $i < count($archivers); $i++) {
--            if ($i == count($archivers) - 1) {
-+        for ($i = 0, $count = count($archivers); $i < $count; $i++) {
-+            if ($i == $count - 1) {
-                 $packed = $destination;
-             } else {
-                 $packed = dirname($destination) . '/~tmp-' . microtime(true) . $archivers[$i] . '.' . $archivers[$i];
-             }
-             $source = $this->_getArchiver($archivers[$i])->pack($source, $packed, $skipRoot);
--            if ($interimSource && $i < count($archivers)) {
-+            if ($interimSource && $i < $count) {
-                 unlink($interimSource);
-             }
-             $interimSource = $source;
-diff --git a/lib/internal/Magento/Framework/Archive/Tar.php b/lib/internal/Magento/Framework/Archive/Tar.php
-index 7fe1255e5b8..a858b241151 100644
---- a/lib/internal/Magento/Framework/Archive/Tar.php
-+++ b/lib/internal/Magento/Framework/Archive/Tar.php
-@@ -4,15 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
-+namespace Magento\Framework\Archive;
-+
-+use Magento\Framework\Archive\Helper\File;
-+
- /**
-  * Class to work with tar archives
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
--namespace Magento\Framework\Archive;
--
--use Magento\Framework\Archive\Helper\File;
--
- class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento\Framework\Archive\ArchiveInterface
- {
-     /**
-@@ -259,10 +259,7 @@ class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento
-                 );
-             }
- 
--            array_shift($dirFiles);
--            /* remove  './'*/
--            array_shift($dirFiles);
--            /* remove  '../'*/
-+            $dirFiles = array_diff($dirFiles, ['..', '.']);
- 
-             foreach ($dirFiles as $item) {
-                 $this->_setCurrentFile($file . $item)->_createTar();
-diff --git a/lib/internal/Magento/Framework/Archive/Zip.php b/lib/internal/Magento/Framework/Archive/Zip.php
-index f33ad8700f0..c41f8b28ce3 100644
---- a/lib/internal/Magento/Framework/Archive/Zip.php
-+++ b/lib/internal/Magento/Framework/Archive/Zip.php
-@@ -4,13 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Class to work with zip archives
-- *
-- * @author      Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Framework\Archive;
- 
-+/**
-+ * Zip compressed file archive.
-+ */
- class Zip extends AbstractArchive implements ArchiveInterface
- {
-     /**
-@@ -54,11 +52,34 @@ class Zip extends AbstractArchive implements ArchiveInterface
-     public function unpack($source, $destination)
-     {
-         $zip = new \ZipArchive();
--        $zip->open($source);
--        $filename = $zip->getNameIndex(0);
--        $zip->extractTo(dirname($destination), $filename);
--        rename(dirname($destination).'/'.$filename, $destination);
--        $zip->close();
-+        if ($zip->open($source) === true) {
-+            $filename = $this->filterRelativePaths($zip->getNameIndex(0) ?: '');
-+            if ($filename) {
-+                $zip->extractTo(dirname($destination), $filename);
-+                rename(dirname($destination).'/'.$filename, $destination);
-+            } else {
-+                $destination = '';
-+            }
-+            $zip->close();
-+        } else {
-+            $destination = '';
-+        }
-+
-         return $destination;
-     }
-+
-+    /**
-+     * Filter file names with relative paths.
-+     *
-+     * @param string $path
-+     * @return string
-+     */
-+    private function filterRelativePaths(string $path): string
-+    {
-+        if ($path && preg_match('#^\s*(../)|(/../)#i', $path)) {
-+            $path = '';
-+        }
-+
-+        return $path;
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Async/CallbackDeferred.php b/lib/internal/Magento/Framework/Async/CallbackDeferred.php
-new file mode 100644
-index 00000000000..971ae4ad244
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Async/CallbackDeferred.php
-@@ -0,0 +1,116 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Async;
-+
-+/**
-+ * Executes given callback when get() is used.
-+ */
-+class CallbackDeferred implements CancelableDeferredInterface
-+{
-+    /**
-+     * @var callable
-+     */
-+    private $callback;
-+
-+    /**
-+     * @var bool
-+     */
-+    private $canceled = false;
-+
-+    /**
-+     * @var bool
-+     */
-+    private $done = false;
-+
-+    /**
-+     * @var mixed
-+     */
-+    private $value;
-+
-+    /**
-+     * @var \Throwable
-+     */
-+    private $exception;
-+
-+    /**
-+     * CallbackDeferred constructor.
-+     * @param callable $callback
-+     */
-+    public function __construct(callable $callback)
-+    {
-+        $this->callback = $callback;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function cancel(bool $force = false): void
-+    {
-+        if ($this->isDone()) {
-+            throw new CancelingDeferredException('Already executed');
-+        }
-+        if ($this->isCancelled()) {
-+            throw new CancelingDeferredException('Already canceled');
-+        }
-+
-+        $this->canceled = true;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function isCancelled(): bool
-+    {
-+        return $this->canceled;
-+    }
-+
-+    /**
-+     * Return deferred value.
-+     *
-+     * @return mixed
-+     * @throws \Throwable
-+     */
-+    private function returnResults()
-+    {
-+        if ($this->exception) {
-+            throw $this->exception;
-+        }
-+
-+        return $this->value;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function get()
-+    {
-+        if ($this->isCancelled()) {
-+            throw new CancelingDeferredException('Deferred operation is canceled');
-+        }
-+
-+        if (!$this->isDone()) {
-+            try {
-+                $this->value = ($this->callback)();
-+            } catch (\Throwable $exception) {
-+                $this->exception = $exception;
-+            }
-+            $this->done = true;
-+        }
-+
-+        return $this->returnResults();
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function isDone(): bool
-+    {
-+        return $this->done;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Async/CancelableDeferredInterface.php b/lib/internal/Magento/Framework/Async/CancelableDeferredInterface.php
-new file mode 100644
-index 00000000000..9b328273595
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Async/CancelableDeferredInterface.php
-@@ -0,0 +1,33 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Async;
-+
-+/**
-+ * Described deferred operation that can be canceled.
-+ */
-+interface CancelableDeferredInterface extends DeferredInterface
-+{
-+    /**
-+     * Cancels the operation.
-+     *
-+     * Will not cancel the operation when it has already started and given $force is not true.
-+     *
-+     * @param bool $force Cancel operation even if it's already started.
-+     * @return void
-+     * @throws CancelingDeferredException When failed to cancel.
-+     */
-+    public function cancel(bool $force = false): void;
-+
-+    /**
-+     * Whether the operation has been cancelled already.
-+     *
-+     * @return bool
-+     */
-+    public function isCancelled(): bool;
-+}
-diff --git a/lib/internal/Magento/Framework/Async/CancelingDeferredException.php b/lib/internal/Magento/Framework/Async/CancelingDeferredException.php
-new file mode 100644
-index 00000000000..131a1fe6587
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Async/CancelingDeferredException.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Async;
-+
-+/**
-+ * Exception related to canceling a deferred operation.
-+ */
-+class CancelingDeferredException extends \RuntimeException
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/Async/Code/Generator/ProxyDeferredGenerator.php b/lib/internal/Magento/Framework/Async/Code/Generator/ProxyDeferredGenerator.php
-new file mode 100644
-index 00000000000..7d64a92ab7f
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Async/Code/Generator/ProxyDeferredGenerator.php
-@@ -0,0 +1,254 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Async\Code\Generator;
-+
-+use Magento\Framework\Async\DeferredInterface;
-+use Magento\Framework\Code\Generator\EntityAbstract;
-+use Magento\Framework\ObjectManager\DefinitionFactory;
-+use Magento\Framework\ObjectManager\NoninterceptableInterface;
-+
-+/**
-+ * Generator for proxies for late values resolving.
-+ */
-+class ProxyDeferredGenerator extends EntityAbstract
-+{
-+    /**
-+     * Entity type
-+     */
-+    public const ENTITY_TYPE = 'proxyDeferred';
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function _getDefaultResultClassName($modelClassName)
-+    {
-+        return $modelClassName . '_' . ucfirst(static::ENTITY_TYPE);
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function _getClassProperties()
-+    {
-+        $properties[] = [
-+            'name' => 'instance',
-+            'visibility' => 'private',
-+            'docblock' => [
-+                'shortDescription' => 'Proxied instance',
-+                'tags' => [['name' => 'var', 'description' => 'string']],
-+            ],
-+        ];
-+        $properties[] = [
-+            'name' => 'deferred',
-+            'visibility' => 'private',
-+            'docblock' => [
-+                'shortDescription' => 'Deferred to wait for',
-+                'tags' => [['name' => 'var', 'description' => 'string']],
-+            ],
-+        ];
-+
-+        return $properties;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function _getClassMethods()
-+    {
-+        $construct = $this->_getDefaultConstructorDefinition();
-+        $sourceClassName = $this->getSourceClassName();
-+
-+        // create proxy methods for all non-static and non-final public methods (excluding constructor)
-+        $methods = [$construct];
-+        //Only serializing the result.
-+        $methods[] = [
-+            'name' => '__sleep',
-+            'body' => "\$this->wait();\nreturn ['instance'];",
-+            'docblock' => [
-+                'shortDescription' => 'Serialize only the instance',
-+                'tags' => [['name' => 'return', 'description' => 'array']]
-+            ],
-+        ];
-+        //Only cloning the result.
-+        $methods[] = [
-+            'name' => '__clone',
-+            'body' => "\$this->wait();\n\$this->instance = clone \$this->instance;",
-+            'docblock' => ['shortDescription' => 'Clone proxied instance'],
-+        ];
-+        //Getting deferred value.
-+        $methods[] = [
-+            'name' => 'wait',
-+            'visibility' => 'private',
-+            'body' => "if (!\$this->instance) {\n" .
-+                "    \$this->instance = \$this->deferred->get();\n" .
-+                "    if (!\$this->instance instanceof $sourceClassName) {\n" .
-+                "        throw new \\RuntimeException('Wrong instance returned by deferred');\n" .
-+                "    }\n" .
-+                "}\n" .
-+                "return \$this->instance;",
-+            'docblock' => [
-+                'shortDescription' => 'Get proxied instance',
-+                'tags' => [['name' => 'return', 'description' => $sourceClassName]],
-+            ],
-+        ];
-+        $reflectionClass = new \ReflectionClass($sourceClassName);
-+        $publicMethods = $reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC);
-+        foreach ($publicMethods as $method) {
-+            if (!(
-+                    $method->isConstructor() ||
-+                    $method->isFinal() ||
-+                    $method->isStatic() ||
-+                    $method->isDestructor()
-+                )
-+                && !in_array(
-+                    $method->getName(),
-+                    ['__sleep', '__wakeup', '__clone']
-+                )
-+            ) {
-+                $methods[] = $this->_getMethodInfo($method);
-+            }
-+        }
-+
-+        return $methods;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function _generateCode()
-+    {
-+        $typeName = $this->getSourceClassName();
-+        $reflection = new \ReflectionClass($typeName);
-+
-+        if ($reflection->isInterface()) {
-+            $this->_classGenerator->setImplementedInterfaces([$typeName, '\\' . NoninterceptableInterface::class]);
-+        } else {
-+            $this->_classGenerator->setExtendedClass($typeName);
-+            $this->_classGenerator->setImplementedInterfaces(['\\' . NoninterceptableInterface::class]);
-+        }
-+        return parent::_generateCode();
-+    }
-+
-+    /**
-+     * Collect method info
-+     *
-+     * @param \ReflectionMethod $method
-+     * @return array
-+     */
-+    protected function _getMethodInfo(\ReflectionMethod $method)
-+    {
-+        $parameterNames = [];
-+        $parameters = [];
-+        foreach ($method->getParameters() as $parameter) {
-+            $name = $parameter->isVariadic() ? '... $' . $parameter->getName() : '$' . $parameter->getName();
-+            $parameterNames[] = $name;
-+            $parameters[] = $this->_getMethodParameterInfo($parameter);
-+        }
-+
-+        $returnTypeValue = $this->getReturnTypeValue($method->getReturnType());
-+        $methodInfo = [
-+            'name' => $method->getName(),
-+            'parameters' => $parameters,
-+            'body' => $this->_getMethodBody(
-+                $method->getName(),
-+                $parameterNames,
-+                $returnTypeValue === 'void'
-+            ),
-+            'docblock' => ['shortDescription' => '@inheritDoc'],
-+            'returntype' => $returnTypeValue,
-+        ];
-+
-+        return $methodInfo;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function _getDefaultConstructorDefinition()
-+    {
-+        return [
-+            'name' => '__construct',
-+            'parameters' => [
-+                ['name' => 'deferred', 'type' => '\\' . DeferredInterface::class],
-+            ],
-+            'body' => "\$this->deferred = \$deferred;",
-+            'docblock' => [
-+                'shortDescription' => ucfirst(static::ENTITY_TYPE) . ' constructor',
-+                'tags' => [
-+                    [
-+                        'name' => 'param',
-+                        'description' => '\\' . DefinitionFactory::class .' $objectManager',
-+                    ],
-+                ],
-+            ]
-+        ];
-+    }
-+
-+    /**
-+     * Build proxy method body
-+     *
-+     * @param string $name
-+     * @param array $parameters
-+     * @param bool $withoutReturn
-+     * @return string
-+     */
-+    protected function _getMethodBody(
-+        $name,
-+        array $parameters = [],
-+        bool $withoutReturn = false
-+    ) {
-+        if (count($parameters) == 0) {
-+            $methodCall = sprintf('%s()', $name);
-+        } else {
-+            $methodCall = sprintf('%s(%s)', $name, implode(', ', $parameters));
-+        }
-+        //Waiting for deferred result and using it's methods.
-+        return "\$this->wait();\n"
-+            .($withoutReturn ? '' : 'return ')."\$this->instance->$methodCall;";
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function _validateData()
-+    {
-+        $result = parent::_validateData();
-+        if ($result) {
-+            $sourceClassName = $this->getSourceClassName();
-+            $resultClassName = $this->_getResultClassName();
-+
-+            if ($resultClassName !== $sourceClassName . '\\ProxyDeferred') {
-+                $this->_addError(
-+                    'Invalid ProxyDeferred class name [' . $resultClassName. ']. Use '
-+                    . $sourceClassName . '\\ProxyDeferred'
-+                );
-+                $result = false;
-+            }
-+        }
-+        return $result;
-+    }
-+
-+    /**
-+     * Returns return type
-+     *
-+     * @param mixed $returnType
-+     * @return null|string
-+     */
-+    private function getReturnTypeValue($returnType): ?string
-+    {
-+        $returnTypeValue = null;
-+        if ($returnType) {
-+            $returnTypeValue = ($returnType->allowsNull() ? '?' : '');
-+            $returnTypeValue .= ($returnType->getName() === 'self')
-+                ? $this->getSourceClassName()
-+                : $returnType->getName();
-+        }
-+        return $returnTypeValue;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Async/DeferredInterface.php b/lib/internal/Magento/Framework/Async/DeferredInterface.php
-new file mode 100644
-index 00000000000..8c925fd95a3
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Async/DeferredInterface.php
-@@ -0,0 +1,30 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Async;
-+
-+/**
-+ * Describes a value that will be available at later time.
-+ */
-+interface DeferredInterface
-+{
-+    /**
-+     * Wait for and return the value.
-+     *
-+     * @return mixed Value.
-+     * @throws \Throwable When it was impossible to get the value.
-+     */
-+    public function get();
-+
-+    /**
-+     * Is the process of getting the value is done?
-+     *
-+     * @return bool
-+     */
-+    public function isDone(): bool;
-+}
-diff --git a/lib/internal/Magento/Framework/Async/ProxyDeferredFactory.php b/lib/internal/Magento/Framework/Async/ProxyDeferredFactory.php
-new file mode 100644
-index 00000000000..4f97ef777ae
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Async/ProxyDeferredFactory.php
-@@ -0,0 +1,42 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Async;
-+
-+use Magento\Framework\ObjectManagerInterface;
-+
-+/**
-+ * Create deferred proxy for a class.
-+ */
-+class ProxyDeferredFactory
-+{
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @param ObjectManagerInterface $objectManager
-+     */
-+    public function __construct(ObjectManagerInterface $objectManager)
-+    {
-+        $this->objectManager = $objectManager;
-+    }
-+
-+    /**
-+     * Create deferred proxy for given class.
-+     *
-+     * @param string $className
-+     * @param DeferredInterface $deferred
-+     * @return object Instance of $className.
-+     */
-+    public function createFor(string $className, DeferredInterface $deferred)
-+    {
-+        return $this->objectManager->create($className .'\\ProxyDeferred', ['deferred' => $deferred]);
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Async/README.md b/lib/internal/Magento/Framework/Async/README.md
-new file mode 100644
-index 00000000000..f7159863760
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Async/README.md
-@@ -0,0 +1 @@
-+Async library provides classes to work with asynchronous/deferred operations, for instance sending an HTTP request.
-\ No newline at end of file
-diff --git a/lib/internal/Magento/Framework/Async/Test/Unit/CallbackDeferredTest.php b/lib/internal/Magento/Framework/Async/Test/Unit/CallbackDeferredTest.php
-new file mode 100644
-index 00000000000..af2efb4e097
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Async/Test/Unit/CallbackDeferredTest.php
-@@ -0,0 +1,139 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Async\Test\Unit;
-+
-+use Magento\Framework\Async\CallbackDeferred;
-+use Magento\Framework\Async\CancelingDeferredException;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * Test for deferred callbacks.
-+ */
-+class CallbackDeferredTest extends TestCase
-+{
-+    /**
-+     * @var string|null
-+     */
-+    private $value;
-+
-+    /**
-+     * @var callable
-+     */
-+    private $function;
-+
-+    /**
-+     * @var \Throwable
-+     */
-+    private $exception;
-+
-+    /**
-+     * @var CallbackDeferred
-+     */
-+    private $deferred;
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->value = null;
-+        $this->function = function () {
-+            if ($this->exception) {
-+                throw $this->exception;
-+            }
-+            $this->value = 'success';
-+
-+            return $this->value;
-+        };
-+        $this->deferred = new CallbackDeferred($this->function);
-+    }
-+
-+    /**
-+     * Test successfully executing a function.
-+     */
-+    public function testSuccess(): void
-+    {
-+        $this->assertFalse($this->deferred->isDone());
-+        $this->assertFalse($this->deferred->isCancelled());
-+        $this->assertEmpty($this->value);
-+        $value = $this->deferred->get();
-+        $this->assertNotEmpty($value);
-+        $this->assertEquals($this->value, $value);
-+        $this->assertTrue($this->deferred->isDone());
-+        $this->assertFalse($this->deferred->isCancelled());
-+
-+        //Function is not being executed.
-+        $this->value = null;
-+        $value = $this->deferred->get();
-+        $this->assertEmpty($this->value);
-+        $this->assertNotEmpty($value);
-+        $exception = null;
-+        try {
-+            $this->deferred->cancel(true);
-+        } catch (CancelingDeferredException $ex) {
-+            $exception = $ex;
-+        }
-+        $this->assertNotEmpty($exception);
-+        $this->assertFalse($this->deferred->isCancelled());
-+    }
-+
-+    /**
-+     * Test function with exception;
-+     */
-+    public function testException(): void
-+    {
-+        $this->exception = new \RuntimeException();
-+
-+        $this->assertFalse($this->deferred->isDone());
-+        $this->assertFalse($this->deferred->isCancelled());
-+        $this->assertEmpty($this->value);
-+        $exception = null;
-+        try {
-+            $this->deferred->get();
-+        } catch (\RuntimeException $ex) {
-+            $exception = $ex;
-+        }
-+        $this->assertEquals($this->exception, $exception);
-+        $this->assertTrue($this->deferred->isDone());
-+        $this->assertFalse($this->deferred->isCancelled());
-+        $this->assertEmpty($this->value);
-+
-+        //Continues to throw the exception.
-+        try {
-+            $this->deferred->get();
-+        } catch (\RuntimeException $ex) {
-+            $exception = $ex;
-+        }
-+        $this->assertEquals($this->exception, $exception);
-+    }
-+
-+    /**
-+     * Test canceling the deferred.
-+     */
-+    public function testCanceling(): void
-+    {
-+        $this->assertFalse($this->deferred->isDone());
-+        $this->assertFalse($this->deferred->isCancelled());
-+
-+        $this->deferred->cancel();
-+        $this->assertEmpty($this->value);
-+        $this->assertTrue($this->deferred->isCancelled());
-+        $this->assertFalse($this->deferred->isDone());
-+        $exception = null;
-+        try {
-+            $this->deferred->get();
-+        } catch (CancelingDeferredException $ex) {
-+            $exception = $ex;
-+        }
-+        $this->assertNotEmpty($exception);
-+        $this->assertEmpty($this->value);
-+        $this->assertTrue($this->deferred->isCancelled());
-+        $this->assertFalse($this->deferred->isDone());
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Backup/BackupInterface.php b/lib/internal/Magento/Framework/Backup/BackupInterface.php
-index 3d054bdbd1a..16aada9689c 100644
---- a/lib/internal/Magento/Framework/Backup/BackupInterface.php
-+++ b/lib/internal/Magento/Framework/Backup/BackupInterface.php
-@@ -13,6 +13,8 @@ namespace Magento\Framework\Backup;
- 
- /**
-  * @api
-+ *
-+ * @deprecated Backups should be done using other means.
-  */
- interface BackupInterface
- {
-diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php b/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
-index 13e3c562bb5..a019ccac06b 100644
---- a/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
-+++ b/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
-@@ -7,6 +7,8 @@ namespace Magento\Framework\Backup\Db;
- 
- /**
-  * @api
-+ *
-+ * @deprecated Backups should be done using other means.
-  */
- interface BackupDbInterface
- {
-diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php b/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
-index f7459f629cb..ae5879290eb 100644
---- a/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
-+++ b/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
-@@ -7,6 +7,8 @@ namespace Magento\Framework\Backup\Db;
- 
- /**
-  * @api
-+ *
-+ * @deprecated Backups should be done using other means.
-  */
- interface BackupInterface
- {
-diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
-index 14531deda45..4820b83ceb7 100644
---- a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
-+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
-@@ -75,7 +75,7 @@ class Fs extends AbstractRollback
- 
-         /**
-          * we need these fake initializations because all magento's files in filesystem will be deleted and autoloader
--         * wont be able to load classes that we need for unpacking
-+         * won't be able to load classes that we need for unpacking
-          */
-         new Tar();
-         new Gz();
-@@ -94,6 +94,8 @@ class Fs extends AbstractRollback
-     }
- 
-     /**
-+     * Get file system helper instance
-+     *
-      * @return Helper
-      * @deprecated 100.2.0
-      */
-diff --git a/lib/internal/Magento/Framework/Cache/Backend/Database.php b/lib/internal/Magento/Framework/Cache/Backend/Database.php
-index 29107838301..231a8584cc8 100644
---- a/lib/internal/Magento/Framework/Cache/Backend/Database.php
-+++ b/lib/internal/Magento/Framework/Cache/Backend/Database.php
-@@ -27,11 +27,11 @@
-  * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-  */
- 
--/**
-- * Database cache backend
-- */
- namespace Magento\Framework\Cache\Backend;
- 
-+/**
-+ * Database cache backend.
-+ */
- class Database extends \Zend_Cache_Backend implements \Zend_Cache_Backend_ExtendedInterface
- {
-     /**
-@@ -139,7 +139,7 @@ class Database extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Extend
-      *
-      * Note : return value is always "string" (unserialization is done by the core not by the backend)
-      *
--     * @param  string  $id                     Cache id
-+     * @param  string $id Cache id
-      * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-      * @return string|false cached datas
-      */
-@@ -432,7 +432,7 @@ class Database extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Extend
-             return $this->_getConnection()->update(
-                 $this->_getDataTable(),
-                 ['expire_time' => new \Zend_Db_Expr('expire_time+' . $extraLifetime)],
--                ['id=?' => $id, 'expire_time = 0 OR expire_time>' => time()]
-+                ['id=?' => $id, 'expire_time = 0 OR expire_time>?' => time()]
-             );
-         } else {
-             return true;
-diff --git a/lib/internal/Magento/Framework/Cache/Backend/Memcached.php b/lib/internal/Magento/Framework/Cache/Backend/Memcached.php
-index c5e7a7e9e7c..0621c63acbd 100644
---- a/lib/internal/Magento/Framework/Cache/Backend/Memcached.php
-+++ b/lib/internal/Magento/Framework/Cache/Backend/Memcached.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Framework\Cache\Backend;
- 
-+/**
-+ * Memcached cache model
-+ */
- class Memcached extends \Zend_Cache_Backend_Memcached implements \Zend_Cache_Backend_ExtendedInterface
- {
-     /**
-@@ -46,7 +49,7 @@ class Memcached extends \Zend_Cache_Backend_Memcached implements \Zend_Cache_Bac
-      * Returns ID of a specific chunk on the basis of data's ID
-      *
-      * @param string $id    Main data's ID
--     * @param int    $index Particular chunk number to return ID for
-+     * @param int $index Particular chunk number to return ID for
-      * @return string
-      */
-     protected function _getChunkId($id, $index)
-@@ -58,7 +61,7 @@ class Memcached extends \Zend_Cache_Backend_Memcached implements \Zend_Cache_Bac
-      * Remove saved chunks in case something gone wrong (e.g. some chunk from the chain can not be found)
-      *
-      * @param string $id     ID of data's info cell
--     * @param int    $chunks Number of chunks to remove (basically, the number after '{splitted}|')
-+     * @param int $chunks Number of chunks to remove (basically, the number after '{splitted}|')
-      * @return null
-      */
-     protected function _cleanTheMess($id, $chunks)
-@@ -84,7 +87,7 @@ class Memcached extends \Zend_Cache_Backend_Memcached implements \Zend_Cache_Bac
-         if (is_string($data) && strlen($data) > $this->_options['slab_size']) {
-             $dataChunks = str_split($data, $this->_options['slab_size']);
- 
--            for ($i = 0, $cnt = count($dataChunks); $i < $cnt; $i++) {
-+            for ($i = 0, $count = count($dataChunks); $i < $count; $i++) {
-                 $chunkId = $this->_getChunkId($id, $i);
- 
-                 if (!parent::save($dataChunks[$i], $chunkId, $tags, $specificLifetime)) {
-@@ -103,7 +106,7 @@ class Memcached extends \Zend_Cache_Backend_Memcached implements \Zend_Cache_Bac
-      * Load data from memcached, glue from several chunks if it was splitted upon save.
-      *
-      * @param string $id                     @see \Zend_Cache_Backend_Memcached::load()
--     * @param bool   $doNotTestCacheValidity @see \Zend_Cache_Backend_Memcached::load()
-+     * @param bool $doNotTestCacheValidity @see \Zend_Cache_Backend_Memcached::load()
-      * @return bool|false|string
-      */
-     public function load($id, $doNotTestCacheValidity = false)
-diff --git a/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Logger.php b/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Logger.php
-index d57946a07f1..181148b3a77 100644
---- a/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Logger.php
-+++ b/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Logger.php
-@@ -30,7 +30,7 @@ class Logger extends Bare
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function remove($identifier)
-     {
-@@ -40,16 +40,18 @@ class Logger extends Bare
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
-     {
--        $result = parent::clean($mode, $tags, $mode);
-+        $result = parent::clean($mode, $tags);
-         $this->log(compact('tags', 'mode'));
-         return $result;
-     }
- 
-     /**
-+     * Log cache invalidation
-+     *
-      * @param mixed $args
-      * @return void
-      */
-diff --git a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php
-index 10886f911e2..08f9930a81b 100644
---- a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php
-+++ b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php
-@@ -10,6 +10,9 @@ namespace Magento\Framework\Cache;
- use Magento\Framework\App\Request\Http as HttpRequest;
- use Psr\Log\LoggerInterface as Logger;
- 
-+/**
-+ * Invalidate logger cache.
-+ */
- class InvalidateLogger
- {
-     /**
-@@ -34,6 +37,7 @@ class InvalidateLogger
- 
-     /**
-      * Logger invalidate cache
-+     *
-      * @param mixed $invalidateInfo
-      * @return void
-      */
-@@ -44,6 +48,7 @@ class InvalidateLogger
- 
-     /**
-      * Make extra data to logger message
-+     *
-      * @param mixed $invalidateInfo
-      * @return array
-      */
-@@ -65,4 +70,16 @@ class InvalidateLogger
-     {
-         $this->logger->critical($message, $this->makeParams($params));
-     }
-+
-+    /**
-+     * Log warning
-+     *
-+     * @param string $message
-+     * @param mixed $params
-+     * @return void
-+     */
-+    public function warning($message, $params)
-+    {
-+        $this->logger->warning($message, $this->makeParams($params));
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
-new file mode 100644
-index 00000000000..216d8e9a0a0
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
-@@ -0,0 +1,116 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Framework\Cache;
-+
-+use Magento\Framework\Lock\LockManagerInterface;
-+
-+/**
-+ * Default mutex that provide concurrent access to cache storage.
-+ */
-+class LockGuardedCacheLoader
-+{
-+    /**
-+     * @var LockManagerInterface
-+     */
-+    private $locker;
-+
-+    /**
-+     * Lifetime of the lock for write in cache.
-+     *
-+     * Value of the variable in milliseconds.
-+     *
-+     * @var int
-+     */
-+    private $lockTimeout;
-+
-+    /**
-+     * Timeout between retrieves to load the configuration from the cache.
-+     *
-+     * Value of the variable in milliseconds.
-+     *
-+     * @var int
-+     */
-+    private $delayTimeout;
-+
-+    /**
-+     * @param LockManagerInterface $locker
-+     * @param int $lockTimeout
-+     * @param int $delayTimeout
-+     */
-+    public function __construct(
-+        LockManagerInterface $locker,
-+        int $lockTimeout = 10000,
-+        int $delayTimeout = 20
-+    ) {
-+        $this->locker = $locker;
-+        $this->lockTimeout = $lockTimeout;
-+        $this->delayTimeout = $delayTimeout;
-+    }
-+
-+    /**
-+     * Load data.
-+     *
-+     * @param string $lockName
-+     * @param callable $dataLoader
-+     * @param callable $dataCollector
-+     * @param callable $dataSaver
-+     * @return mixed
-+     */
-+    public function lockedLoadData(
-+        string $lockName,
-+        callable $dataLoader,
-+        callable $dataCollector,
-+        callable $dataSaver
-+    ) {
-+        $cachedData = $dataLoader(); //optimistic read
-+
-+        while ($cachedData === false && $this->locker->isLocked($lockName)) {
-+            usleep($this->delayTimeout * 1000);
-+            $cachedData = $dataLoader();
-+        }
-+
-+        while ($cachedData === false) {
-+            try {
-+                if ($this->locker->lock($lockName, $this->lockTimeout / 1000)) {
-+                    $data = $dataCollector();
-+                    $dataSaver($data);
-+                    $cachedData = $data;
-+                }
-+            } finally {
-+                $this->locker->unlock($lockName);
-+            }
-+
-+            if ($cachedData === false) {
-+                usleep($this->delayTimeout * 1000);
-+                $cachedData = $dataLoader();
-+            }
-+        }
-+
-+        return $cachedData;
-+    }
-+
-+    /**
-+     * Clean data.
-+     *
-+     * @param string $lockName
-+     * @param callable $dataCleaner
-+     * @return void
-+     */
-+    public function lockedCleanData(string $lockName, callable $dataCleaner)
-+    {
-+        while ($this->locker->isLocked($lockName)) {
-+            usleep($this->delayTimeout * 1000);
-+        }
-+        try {
-+            if ($this->locker->lock($lockName, $this->lockTimeout / 1000)) {
-+                $dataCleaner();
-+            }
-+        } finally {
-+            $this->locker->unlock($lockName);
-+        }
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/DecoratorAbstractTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/DecoratorAbstractTest.php
-index ba75b7eed52..03ce339e90b 100644
---- a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/DecoratorAbstractTest.php
-+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/DecoratorAbstractTest.php
-@@ -54,7 +54,7 @@ class DecoratorAbstractTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @param array options
-+     * @param array $options
-      * @expectedException \Zend_Cache_Exception
-      * @dataProvider constructorExceptionDataProvider
-      */
-diff --git a/lib/internal/Magento/Framework/Code/GeneratedFiles.php b/lib/internal/Magento/Framework/Code/GeneratedFiles.php
-index f660b3d6982..bc44b361c57 100644
---- a/lib/internal/Magento/Framework/Code/GeneratedFiles.php
-+++ b/lib/internal/Magento/Framework/Code/GeneratedFiles.php
-@@ -180,7 +180,7 @@ class GeneratedFiles
-     }
- 
-     /**
--     * Enables apppropriate cache types in app/etc/env.php based on the passed in $cacheTypes array
-+     * Enables appropriate cache types in app/etc/env.php based on the passed in $cacheTypes array
-      * TODO: to be removed in scope of MAGETWO-53476
-      *
-      * @param string[] $cacheTypes
-diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
-index 4dec7d1a281..b46c8c681bb 100644
---- a/lib/internal/Magento/Framework/Code/Generator.php
-+++ b/lib/internal/Magento/Framework/Code/Generator.php
-@@ -8,11 +8,15 @@ namespace Magento\Framework\Code;
- use Magento\Framework\Code\Generator\DefinedClasses;
- use Magento\Framework\Code\Generator\EntityAbstract;
- use Magento\Framework\Code\Generator\Io;
-+use Magento\Framework\ObjectManager\ConfigInterface;
- use Magento\Framework\ObjectManagerInterface;
- use Magento\Framework\Phrase;
- use Magento\Framework\Filesystem\Driver\File;
- use Psr\Log\LoggerInterface;
- 
-+/**
-+ * Class code generator.
-+ */
- class Generator
- {
-     const GENERATION_SUCCESS = 'success';
-@@ -232,7 +236,21 @@ class Generator
-     {
-         if (!$resultEntityType || !$sourceClassName) {
-             return self::GENERATION_ERROR;
--        } elseif ($this->definedClasses->isClassLoadableFromDisk($resultClass)) {
-+        }
-+
-+        /** @var ConfigInterface $omConfig */
-+        $omConfig = $this->objectManager->get(ConfigInterface::class);
-+        $virtualTypes = $omConfig->getVirtualTypes();
-+
-+        /**
-+         * Do not try to autogenerate virtual types
-+         * For example virtual types with names overlapping autogenerated suffixes
-+         */
-+        if (isset($virtualTypes[$resultClass])) {
-+            return self::GENERATION_SKIP;
-+        }
-+
-+        if ($this->definedClasses->isClassLoadableFromDisk($resultClass)) {
-             $generatedFileName = $this->_ioObject->generateResultFileName($resultClass);
-             /**
-              * Must handle two edge cases: a competing process has generated the class and written it to disc already,
-@@ -244,9 +262,12 @@ class Generator
-                 $this->_ioObject->includeFile($generatedFileName);
-             }
-             return self::GENERATION_SKIP;
--        } elseif (!isset($this->_generatedEntities[$resultEntityType])) {
-+        }
-+
-+        if (!isset($this->_generatedEntities[$resultEntityType])) {
-             throw new \InvalidArgumentException('Unknown generation entity.');
-         }
-+
-         return false;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Code/Generator/Autoloader.php b/lib/internal/Magento/Framework/Code/Generator/Autoloader.php
-index c2140083936..35c138147e9 100644
---- a/lib/internal/Magento/Framework/Code/Generator/Autoloader.php
-+++ b/lib/internal/Magento/Framework/Code/Generator/Autoloader.php
-@@ -3,37 +3,94 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\Code\Generator;
- 
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Code\Generator;
-+use Psr\Log\LoggerInterface;
- 
-+/**
-+ * Class loader and generator.
-+ */
- class Autoloader
- {
-     /**
--     * @var \Magento\Framework\Code\Generator
-+     * @var Generator
-      */
-     protected $_generator;
- 
-     /**
--     * @param \Magento\Framework\Code\Generator $generator
-+     * Enables guarding against spamming the debug log with duplicate messages, as
-+     * the generation exception will be thrown multiple times within a single request.
-+     *
-+     * @var string
-+     */
-+    private $lastGenerationErrorMessage;
-+
-+    /**
-+     * @param Generator $generator
-      */
--    public function __construct(
--        \Magento\Framework\Code\Generator $generator
--    ) {
-+    public function __construct(Generator $generator)
-+    {
-         $this->_generator = $generator;
-     }
- 
-     /**
-      * Load specified class name and generate it if necessary
-      *
-+     * According to PSR-4 section 2.4 an autoloader MUST NOT throw an exception and SHOULD NOT return a value.
-+     *
-+     * @see https://www.php-fig.org/psr/psr-4/
-+     *
-      * @param string $className
--     * @return bool True if class was loaded
-+     * @return void
-      */
-     public function load($className)
-     {
--        if (!class_exists($className)) {
--            return Generator::GENERATION_ERROR != $this->_generator->generateClass($className);
-+        if (! class_exists($className)) {
-+            try {
-+                $this->_generator->generateClass($className);
-+            } catch (\Exception $exception) {
-+                $this->tryToLogExceptionMessageIfNotDuplicate($exception);
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Log exception.
-+     *
-+     * @param \Exception $exception
-+     */
-+    private function tryToLogExceptionMessageIfNotDuplicate(\Exception $exception): void
-+    {
-+        if ($this->lastGenerationErrorMessage !== $exception->getMessage()) {
-+            $this->lastGenerationErrorMessage = $exception->getMessage();
-+            $this->tryToLogException($exception);
-+        }
-+    }
-+
-+    /**
-+     * Try to capture the exception message.
-+     *
-+     * The Autoloader is instantiated before the ObjectManager, so the LoggerInterface can not be injected.
-+     * The Logger is instantiated in the try/catch block because ObjectManager might still not be initialized.
-+     * In that case the exception message can not be captured.
-+     *
-+     * The debug level is used for logging in case class generation fails for a common class, but a custom
-+     * autoloader is used later in the stack. A more severe log level would fill the logs with messages on production.
-+     * The exception message now can be accessed in developer mode if debug logging is enabled.
-+     *
-+     * @param \Exception $exception
-+     * @return void
-+     */
-+    private function tryToLogException(\Exception $exception): void
-+    {
-+        try {
-+            $logger = ObjectManager::getInstance()->get(LoggerInterface::class);
-+            $logger->debug($exception->getMessage(), ['exception' => $exception]);
-+        } catch (\Exception $ignoreThisException) {
-+            // Do not take an action here, since the original exception might have been caused by logger
-         }
--        return true;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Code/NameBuilder.php b/lib/internal/Magento/Framework/Code/NameBuilder.php
-index c27a896b65f..993235054e4 100644
---- a/lib/internal/Magento/Framework/Code/NameBuilder.php
-+++ b/lib/internal/Magento/Framework/Code/NameBuilder.php
-@@ -1,12 +1,15 @@
- <?php
- /**
-- * Name builder
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Framework\Code;
- 
-+/**
-+ * Builds namespace with classname out of the parts.
-+ *
-+ * @api
-+ */
- class NameBuilder
- {
-     /**
-@@ -23,7 +26,7 @@ class NameBuilder
-         $separator = '\\';
-         $string = join($separator, $parts);
-         $string = str_replace('_', $separator, $string);
--        $className = str_replace(' ', $separator, ucwords(str_replace($separator, ' ', $string)));
-+        $className = ucwords($string, $separator);
-         return $className;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/ParentClass.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/ParentClass.php
-index be34b2f8c69..4565620a755 100644
---- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/ParentClass.php
-+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/ParentClass.php
-@@ -7,6 +7,9 @@ namespace Magento\Framework\Code\Test\Unit\Generator\TestAsset;
- 
- use Zend\Code\Generator\DocBlockGenerator;
- 
-+/**
-+ * phpcs:ignoreFile
-+ */
- class ParentClass
- {
-     /**
-@@ -78,9 +81,6 @@ class ParentClass
-     {
-     }
- 
--    /**
--     * @SuppressWarnings(PHPMD.FinalImplementation) Suppressed as is a fixture but not a real code
--     */
-     final public function publicParentFinal()
-     {
-     }
-diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/SourceClass.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/SourceClass.php
-index 6d0e28db65f..5ba3031a2ae 100644
---- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/SourceClass.php
-+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/SourceClass.php
-@@ -7,6 +7,9 @@ namespace Magento\Framework\Code\Test\Unit\Generator\TestAsset;
- 
- use Zend\Code\Generator\ClassGenerator;
- 
-+/**
-+ * phpcs:ignoreFile
-+ */
- class SourceClass extends ParentClass
- {
-     /**
-@@ -111,10 +114,7 @@ class SourceClass extends ParentClass
-     public static function publicChildStatic()
-     {
-     }
--
--    /**
--     * @SuppressWarnings(PHPMD.FinalImplementation) Suppressed as is a fixture but not a real code
--     */
-+    
-     final public function publicChildFinal()
-     {
-     }
-diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
-index 9cc93f7620b..27535616833 100644
---- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
-+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
-@@ -3,11 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Code\Test\Unit;
- 
- use Magento\Framework\Code\Generator;
- use Magento\Framework\Code\Generator\DefinedClasses;
- use Magento\Framework\Code\Generator\Io;
-+use Magento\Framework\ObjectManager\ConfigInterface;
-+use PHPUnit\Framework\MockObject\MockObject;
- use Psr\Log\LoggerInterface;
- use Magento\Framework\ObjectManager\Code\Generator\Factory;
- use Magento\Framework\ObjectManager\Code\Generator\Proxy;
-@@ -17,13 +21,19 @@ use PHPUnit\Framework\TestCase;
- use Magento\Framework\ObjectManagerInterface;
- use Magento\Framework\Code\Generator\EntityAbstract;
- use Magento\GeneratedClass\Factory as GeneratedClassFactory;
-+use RuntimeException;
- 
-+/**
-+ * Tests for code generator.
-+ *
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class GeneratorTest extends TestCase
- {
-     /**
-      * Class name parameter value
-      */
--    const SOURCE_CLASS = 'testClassName';
-+    private const SOURCE_CLASS = 'testClassName';
- 
-     /**
-      * Expected generated entities
-@@ -58,6 +68,19 @@ class GeneratorTest extends TestCase
-      */
-     private $loggerMock;
- 
-+    /**
-+     * @var ObjectManagerInterface|MockObject
-+     */
-+    private $objectManagerMock;
-+
-+    /**
-+     * @var ConfigInterface|MockObject
-+     */
-+    private $objectManagerConfigMock;
-+
-+    /**
-+     * @inheritDoc
-+     */
-     protected function setUp()
-     {
-         $this->definedClassesMock = $this->createMock(DefinedClasses::class);
-@@ -65,6 +88,12 @@ class GeneratorTest extends TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
-+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->objectManagerConfigMock = $this->getMockBuilder(ConfigInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
- 
-         $this->model = new Generator(
-             $this->ioObjectMock,
-@@ -78,7 +107,7 @@ class GeneratorTest extends TestCase
-         );
-     }
- 
--    public function testGetGeneratedEntities()
-+    public function testGetGeneratedEntities(): void
-     {
-         $this->model = new Generator(
-             $this->ioObjectMock,
-@@ -91,22 +120,58 @@ class GeneratorTest extends TestCase
-     /**
-      * @param string $className
-      * @param string $entityType
--     * @expectedException \RuntimeException
-+     * @expectedException RuntimeException
-      * @dataProvider generateValidClassDataProvider
-      */
--    public function testGenerateClass($className, $entityType)
-+    public function testGenerateClass($className, $entityType): void
-     {
--        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
-         $fullClassName = $className . $entityType;
-+
-         $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $objectManagerMock->expects($this->once())->method('create')->willReturn($entityGeneratorMock);
--        $this->model->setObjectManager($objectManagerMock);
--        $this->model->generateClass($fullClassName);
-+        $this->objectManagerMock
-+            ->expects($this->once())
-+            ->method('create')
-+            ->willReturn($entityGeneratorMock);
-+
-+        $this->objectManagerConfigMock
-+            ->expects($this->once())
-+            ->method('getVirtualTypes')
-+            ->willReturn([]);
-+        $this->objectManagerMock
-+            ->expects($this->once())
-+            ->method('get')
-+            ->with(ConfigInterface::class)
-+            ->willReturn($this->objectManagerConfigMock);
-+        $this->model->setObjectManager($this->objectManagerMock);
-+
-+        $this->assertSame(
-+            Generator::GENERATION_SUCCESS,
-+            $this->model->generateClass($fullClassName)
-+        );
-     }
- 
--    public function testGenerateClassWithWrongName()
-+    public function testShouldNotGenerateVirtualType(): void
-+    {
-+        $this->objectManagerConfigMock
-+            ->expects($this->once())
-+            ->method('getVirtualTypes')
-+            ->willReturn([GeneratedClassFactory::class => GeneratedClassFactory::class]);
-+        $this->objectManagerMock
-+            ->expects($this->once())
-+            ->method('get')
-+            ->with(ConfigInterface::class)
-+            ->willReturn($this->objectManagerConfigMock);
-+        $this->model->setObjectManager($this->objectManagerMock);
-+
-+        $this->assertSame(
-+            Generator::GENERATION_SKIP,
-+            $this->model->generateClass(GeneratedClassFactory::class)
-+        );
-+    }
-+
-+    public function testGenerateClassWithWrongName(): void
-     {
-         $this->assertEquals(
-             Generator::GENERATION_ERROR,
-@@ -115,25 +180,42 @@ class GeneratorTest extends TestCase
-     }
- 
-     /**
--     * @expectedException \RuntimeException
-+     * @expectedException RuntimeException
-      */
--    public function testGenerateClassWhenClassIsNotGenerationSuccess()
-+    public function testGenerateClassWhenClassIsNotGenerationSuccess(): void
-     {
-         $expectedEntities = array_values($this->expectedEntities);
-         $resultClassName = self::SOURCE_CLASS . ucfirst(array_shift($expectedEntities));
--        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
-+
-         $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $objectManagerMock->expects($this->once())->method('create')->willReturn($entityGeneratorMock);
--        $this->model->setObjectManager($objectManagerMock);
--        $this->model->generateClass($resultClassName);
-+        $this->objectManagerMock
-+            ->expects($this->once())
-+            ->method('create')
-+            ->willReturn($entityGeneratorMock);
-+
-+        $this->objectManagerConfigMock
-+            ->expects($this->once())
-+            ->method('getVirtualTypes')
-+            ->willReturn([]);
-+        $this->objectManagerMock
-+            ->expects($this->once())
-+            ->method('get')
-+            ->with(ConfigInterface::class)
-+            ->willReturn($this->objectManagerConfigMock);
-+        $this->model->setObjectManager($this->objectManagerMock);
-+
-+        $this->assertSame(
-+            Generator::GENERATION_SUCCESS,
-+            $this->model->generateClass($resultClassName)
-+        );
-     }
- 
-     /**
-      * @inheritdoc
-      */
--    public function testGenerateClassWithErrors()
-+    public function testGenerateClassWithErrors(): void
-     {
-         $expectedEntities = array_values($this->expectedEntities);
-         $resultClassName = self::SOURCE_CLASS . ucfirst(array_shift($expectedEntities));
-@@ -148,17 +230,15 @@ class GeneratorTest extends TestCase
-             . 'directory permission is set to write --- the requested class did not generate properly, then '
-             . 'you must add the generated class object to the signature of the related construct method, only.';
-         $FinalErrorMessage = implode(PHP_EOL, $errorMessages) . "\n" . $mainErrorMessage;
--        $this->expectException(\RuntimeException::class);
-+        $this->expectException(RuntimeException::class);
-         $this->expectExceptionMessage($FinalErrorMessage);
- 
--        /** @var ObjectManagerInterface|Mock $objectManagerMock */
--        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
-         /** @var EntityAbstract|Mock $entityGeneratorMock */
-         $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $objectManagerMock->expects($this->once())
-+        $this->objectManagerMock->expects($this->once())
-             ->method('create')
-             ->willReturn($entityGeneratorMock);
-         $entityGeneratorMock->expects($this->once())
-@@ -177,26 +257,62 @@ class GeneratorTest extends TestCase
-         $this->loggerMock->expects($this->once())
-             ->method('critical')
-             ->with($FinalErrorMessage);
--        $this->model->setObjectManager($objectManagerMock);
--        $this->model->generateClass($resultClassName);
-+
-+        $this->objectManagerConfigMock
-+            ->expects($this->once())
-+            ->method('getVirtualTypes')
-+            ->willReturn([]);
-+        $this->objectManagerMock
-+            ->expects($this->once())
-+            ->method('get')
-+            ->with(ConfigInterface::class)
-+            ->willReturn($this->objectManagerConfigMock);
-+        $this->model->setObjectManager($this->objectManagerMock);
-+
-+        $this->assertSame(
-+            Generator::GENERATION_SUCCESS,
-+            $this->model->generateClass($resultClassName)
-+        );
-     }
- 
-     /**
-      * @dataProvider trueFalseDataProvider
-+     * @param $fileExists
-      */
--    public function testGenerateClassWithExistName($fileExists)
-+    public function testGenerateClassWithExistName($fileExists): void
-     {
-         $this->definedClassesMock->expects($this->any())
-             ->method('isClassLoadableFromDisk')
-             ->willReturn(true);
- 
-         $resultClassFileName = '/Magento/Path/To/Class.php';
--        $this->ioObjectMock->expects($this->once())->method('generateResultFileName')->willReturn($resultClassFileName);
--        $this->ioObjectMock->expects($this->once())->method('fileExists')->willReturn($fileExists);
-+
-+        $this->objectManagerConfigMock
-+            ->expects($this->once())
-+            ->method('getVirtualTypes')
-+            ->willReturn([]);
-+        $this->objectManagerMock
-+            ->expects($this->once())
-+            ->method('get')
-+            ->with(ConfigInterface::class)
-+            ->willReturn($this->objectManagerConfigMock);
-+        $this->model->setObjectManager($this->objectManagerMock);
-+
-+        $this->ioObjectMock
-+            ->expects($this->once())
-+            ->method('generateResultFileName')
-+            ->willReturn($resultClassFileName);
-+        $this->ioObjectMock
-+            ->expects($this->once())
-+            ->method('fileExists')
-+            ->willReturn($fileExists);
-+
-         $includeFileInvokeCount = $fileExists ? 1 : 0;
--        $this->ioObjectMock->expects($this->exactly($includeFileInvokeCount))->method('includeFile');
-+        $this->ioObjectMock
-+            ->expects($this->exactly($includeFileInvokeCount))
-+            ->method('includeFile');
- 
--        $this->assertEquals(
-+        $this->assertSame(
-             Generator::GENERATION_SKIP,
-             $this->model->generateClass(GeneratedClassFactory::class)
-         );
-@@ -205,7 +321,7 @@ class GeneratorTest extends TestCase
-     /**
-      * @return array
-      */
--    public function trueFalseDataProvider()
-+    public function trueFalseDataProvider(): array
-     {
-         return [[true], [false]];
-     }
-@@ -215,7 +331,7 @@ class GeneratorTest extends TestCase
-      *
-      * @return array
-      */
--    public function generateValidClassDataProvider()
-+    public function generateValidClassDataProvider(): array
-     {
-         $data = [];
-         foreach ($this->expectedEntities as $generatedEntity) {
-diff --git a/lib/internal/Magento/Framework/Communication/Config/CompositeReader.php b/lib/internal/Magento/Framework/Communication/Config/CompositeReader.php
-index f3af6914269..2ca64bf14d3 100644
---- a/lib/internal/Magento/Framework/Communication/Config/CompositeReader.php
-+++ b/lib/internal/Magento/Framework/Communication/Config/CompositeReader.php
-@@ -27,12 +27,10 @@ class CompositeReader implements ReaderInterface
-         usort(
-             $readers,
-             function ($firstItem, $secondItem) {
--                if (!isset($firstItem['sortOrder']) || !isset($secondItem['sortOrder'])
--                    || $firstItem['sortOrder'] == $secondItem['sortOrder']
--                ) {
-+                if (!isset($firstItem['sortOrder']) || !isset($secondItem['sortOrder'])) {
-                     return 0;
-                 }
--                return $firstItem['sortOrder'] < $secondItem['sortOrder'] ? -1 : 1;
-+                return $firstItem['sortOrder'] <=> $secondItem['sortOrder'];
-             }
-         );
-         $this->readers = [];
-diff --git a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
-index 8fcbd74c884..b79ba49a24d 100644
---- a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
-+++ b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
-@@ -124,20 +124,22 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
-                 $requestSchema,
-                 $responseSchema
-             );
-+            $isSynchronous = $this->extractTopicIsSynchronous($topicNode);
-             if ($serviceMethod) {
-                 $output[$topicName] = $this->reflectionGenerator->generateTopicConfigForServiceMethod(
-                     $topicName,
-                     $serviceMethod[ConfigParser::TYPE_NAME],
-                     $serviceMethod[ConfigParser::METHOD_NAME],
--                    $handlers
-+                    $handlers,
-+                    $isSynchronous
-                 );
-             } elseif ($requestSchema && $responseSchema) {
-                 $output[$topicName] = [
-                     Config::TOPIC_NAME => $topicName,
--                    Config::TOPIC_IS_SYNCHRONOUS => true,
-+                    Config::TOPIC_IS_SYNCHRONOUS => $isSynchronous,
-                     Config::TOPIC_REQUEST => $requestSchema,
-                     Config::TOPIC_REQUEST_TYPE => Config::TOPIC_REQUEST_TYPE_CLASS,
--                    Config::TOPIC_RESPONSE => $responseSchema,
-+                    Config::TOPIC_RESPONSE => ($isSynchronous) ? $responseSchema: null,
-                     Config::TOPIC_HANDLERS => $handlers
-                 ];
-             } elseif ($requestSchema) {
-@@ -258,4 +260,20 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
-         );
-         return $parsedServiceMethod;
-     }
-+
-+    /**
-+     * Extract is_synchronous topic value.
-+     *
-+     * @param \DOMNode $topicNode
-+     * @return bool
-+     */
-+    private function extractTopicIsSynchronous($topicNode): bool
-+    {
-+        $attributeName = Config::TOPIC_IS_SYNCHRONOUS;
-+        $topicAttributes = $topicNode->attributes;
-+        if (!$topicAttributes->getNamedItem($attributeName)) {
-+            return true;
-+        }
-+        return $this->booleanUtils->toBoolean($topicAttributes->getNamedItem($attributeName)->nodeValue);
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php b/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php
-index d1bc62464f2..7ef84f1c43b 100644
---- a/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php
-+++ b/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php
-@@ -42,7 +42,10 @@ class ReflectionGenerator
-         $result = [
-             Config::SCHEMA_METHOD_PARAMS => [],
-             Config::SCHEMA_METHOD_RETURN_TYPE => $this->methodsMap->getMethodReturnType($className, $methodName),
--            Config::SCHEMA_METHOD_HANDLER => [Config::HANDLER_TYPE => $className, Config::HANDLER_METHOD => $methodName]
-+            Config::SCHEMA_METHOD_HANDLER => [
-+                Config::HANDLER_TYPE => $className,
-+                Config::HANDLER_METHOD => $methodName
-+            ]
-         ];
-         $paramsMeta = $this->methodsMap->getMethodParams($className, $methodName);
-         foreach ($paramsMeta as $paramPosition => $paramMeta) {
-@@ -63,16 +66,27 @@ class ReflectionGenerator
-      * @param string $serviceType
-      * @param string $serviceMethod
-      * @param array|null $handlers
-+     * @param bool|null $isSynchronous
-      * @return array
-      */
--    public function generateTopicConfigForServiceMethod($topicName, $serviceType, $serviceMethod, $handlers = [])
--    {
-+    public function generateTopicConfigForServiceMethod(
-+        $topicName,
-+        $serviceType,
-+        $serviceMethod,
-+        $handlers = [],
-+        $isSynchronous = null
-+    ) {
-         $methodMetadata = $this->extractMethodMetadata($serviceType, $serviceMethod);
-         $returnType = $methodMetadata[Config::SCHEMA_METHOD_RETURN_TYPE];
-         $returnType = ($returnType != 'void' && $returnType != 'null') ? $returnType : null;
-+        if (!isset($isSynchronous)) {
-+            $isSynchronous = $returnType ? true : false;
-+        } else {
-+            $returnType = ($isSynchronous) ? $returnType : null;
-+        }
-         return [
-             Config::TOPIC_NAME => $topicName,
--            Config::TOPIC_IS_SYNCHRONOUS => $returnType ? true : false,
-+            Config::TOPIC_IS_SYNCHRONOUS => $isSynchronous,
-             Config::TOPIC_REQUEST => $methodMetadata[Config::SCHEMA_METHOD_PARAMS],
-             Config::TOPIC_REQUEST_TYPE => Config::TOPIC_REQUEST_TYPE_METHOD,
-             Config::TOPIC_RESPONSE => $returnType,
-@@ -85,7 +99,8 @@ class ReflectionGenerator
-      * Generate topic name based on service type and method name.
-      *
-      * Perform the following conversion:
--     * \Magento\Customer\Api\RepositoryInterface + getById => magento.customer.api.repositoryInterface.getById
-+     * \Magento\Customer\Api\RepositoryInterface + getById =>
-+     * magento.customer.api.repositoryInterface.getById
-      *
-      * @param string $typeName
-      * @param string $methodName
-diff --git a/lib/internal/Magento/Framework/Communication/Config/Validator.php b/lib/internal/Magento/Framework/Communication/Config/Validator.php
-index 5e2687c3b08..76ef1b85b63 100644
---- a/lib/internal/Magento/Framework/Communication/Config/Validator.php
-+++ b/lib/internal/Magento/Framework/Communication/Config/Validator.php
-@@ -38,6 +38,8 @@ class Validator
-     }
- 
-     /**
-+     * Validate response schema definition for topic
-+     *
-      * @param string $responseSchema
-      * @param string $topicName
-      * @return void
-@@ -46,6 +48,12 @@ class Validator
-     {
-         try {
-             $this->validateType($responseSchema);
-+        } catch (\InvalidArgumentException $e) {
-+            throw new \LogicException(
-+                'Response schema definition has service class with wrong annotated methods',
-+                $e->getCode(),
-+                $e
-+            );
-         } catch (\Exception $e) {
-             throw new \LogicException(
-                 sprintf(
-@@ -59,6 +67,8 @@ class Validator
-     }
- 
-     /**
-+     * Validate request schema definition for topic
-+     *
-      * @param string $requestSchema
-      * @param string $topicName
-      * @return void
-@@ -67,6 +77,12 @@ class Validator
-     {
-         try {
-             $this->validateType($requestSchema);
-+        } catch (\InvalidArgumentException $e) {
-+            throw new \LogicException(
-+                'Request schema definition has service class with wrong annotated methods',
-+                $e->getCode(),
-+                $e
-+            );
-         } catch (\Exception $e) {
-             throw new \LogicException(
-                 sprintf(
-@@ -80,6 +96,8 @@ class Validator
-     }
- 
-     /**
-+     * Validate service method specified in the definition of handler
-+     *
-      * @param string $serviceName
-      * @param string $methodName
-      * @param string $handlerName
-@@ -109,6 +127,7 @@ class Validator
-      * @param string $typeName
-      * @return $this
-      * @throws \Exception In case when type is invalid
-+     * @throws \InvalidArgumentException if methods don't have annotation
-      */
-     protected function validateType($typeName)
-     {
-diff --git a/lib/internal/Magento/Framework/Communication/etc/communication.xsd b/lib/internal/Magento/Framework/Communication/etc/communication.xsd
-index 12ee56371ce..678d89f30c5 100644
---- a/lib/internal/Magento/Framework/Communication/etc/communication.xsd
-+++ b/lib/internal/Magento/Framework/Communication/etc/communication.xsd
-@@ -40,6 +40,7 @@
-         <xs:attribute type="schemaType" name="schema" use="optional"/>
-         <xs:attribute type="xs:string" name="request" use="optional"/>
-         <xs:attribute type="xs:string" name="response" use="optional"/>
-+        <xs:attribute type="xs:boolean" name="is_synchronous" use="optional"/>
-     </xs:complexType>
-     <xs:complexType name="handlerType">
-         <xs:attribute type="xs:string" name="name" use="required"/>
-diff --git a/lib/internal/Magento/Framework/Composer/ComposerInformation.php b/lib/internal/Magento/Framework/Composer/ComposerInformation.php
-index 93fb9070cdd..5ed5b0892d5 100755
---- a/lib/internal/Magento/Framework/Composer/ComposerInformation.php
-+++ b/lib/internal/Magento/Framework/Composer/ComposerInformation.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\Composer;
- 
- use Composer\Package\Link;
-@@ -126,6 +127,7 @@ class ComposerInformation
-         }
- 
-         if (!isset($requiredPhpVersion)) {
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception('Cannot find php version requirement in \'composer.lock\' file');
-         }
-         return $requiredPhpVersion;
-@@ -148,7 +150,6 @@ class ComposerInformation
-             /** @var CompletePackageInterface $package */
-             foreach ($this->getLocker()->getLockedRepository()->getPackages() as $package) {
-                 $requires = array_keys($package->getRequires());
--                $requires = array_merge($requires, array_keys($package->getDevRequires()));
-                 $allPlatformReqs = array_merge($allPlatformReqs, $requires);
-             }
-         }
-@@ -301,6 +302,8 @@ class ComposerInformation
-     }
- 
-     /**
-+     * Retrieve magento packages types.
-+     *
-      * @return array
-      */
-     public function getPackagesTypes()
-@@ -309,6 +312,8 @@ class ComposerInformation
-     }
- 
-     /**
-+     * Retrieve magento packages requirements.
-+     *
-      * @param string $name
-      * @param string $version
-      * @return array
-diff --git a/lib/internal/Magento/Framework/Composer/ComposerJsonFinder.php b/lib/internal/Magento/Framework/Composer/ComposerJsonFinder.php
-index 259fcd323b3..2a641a41377 100644
---- a/lib/internal/Magento/Framework/Composer/ComposerJsonFinder.php
-+++ b/lib/internal/Magento/Framework/Composer/ComposerJsonFinder.php
-@@ -13,7 +13,7 @@ use Magento\Framework\App\Filesystem\DirectoryList;
- class ComposerJsonFinder
- {
-     /**
--     * @var DirectoryList $directoryList
-+     * @var DirectoryList
-      */
-     private $directoryList;
- 
-diff --git a/lib/internal/Magento/Framework/Composer/Remove.php b/lib/internal/Magento/Framework/Composer/Remove.php
-index b7a9a20333d..b7cea7769a1 100644
---- a/lib/internal/Magento/Framework/Composer/Remove.php
-+++ b/lib/internal/Magento/Framework/Composer/Remove.php
-@@ -46,7 +46,7 @@ class Remove
-             [
-                 'command' => 'remove',
-                 'packages' => $packages,
--                '--no-update' => true,
-+                '--no-update-with-dependencies' => true,
-             ]
-         );
-     }
-diff --git a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
-index 92f0302d93b..ab32504baaa 100644
---- a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
-+++ b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
-@@ -21,6 +21,7 @@ class ConfigOptionsListConstants
-     const CONFIG_PATH_CRYPT_KEY = 'crypt/key';
-     const CONFIG_PATH_SESSION_SAVE = 'session/save';
-     const CONFIG_PATH_RESOURCE_DEFAULT_SETUP = 'resource/default_setup/connection';
-+    const CONFIG_PATH_DB_CONNECTION_DEFAULT_DRIVER_OPTIONS = 'db/connection/default/driver_options';
-     const CONFIG_PATH_DB_CONNECTION_DEFAULT = 'db/connection/default';
-     const CONFIG_PATH_DB_CONNECTIONS = 'db/connection';
-     const CONFIG_PATH_DB_PREFIX = 'db/table_prefix';
-@@ -47,7 +48,7 @@ class ConfigOptionsListConstants
-     const CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION = 'static_content_on_demand_in_production';
- 
-     /**
--     * Paramater for forcing HTML minification even if file is already minified.
-+     * Parameter for forcing HTML minification even if file is already minified.
-      */
-     const CONFIG_PATH_FORCE_HTML_MINIFICATION = 'force_html_minification';
- 
-@@ -64,6 +65,10 @@ class ConfigOptionsListConstants
-     const INPUT_KEY_DB_MODEL = 'db-model';
-     const INPUT_KEY_DB_INIT_STATEMENTS = 'db-init-statements';
-     const INPUT_KEY_DB_ENGINE = 'db-engine';
-+    const INPUT_KEY_DB_SSL_KEY = 'db-ssl-key';
-+    const INPUT_KEY_DB_SSL_CERT = 'db-ssl-cert';
-+    const INPUT_KEY_DB_SSL_CA = 'db-ssl-ca';
-+    const INPUT_KEY_DB_SSL_VERIFY = 'db-ssl-verify';
-     const INPUT_KEY_RESOURCE = 'resource';
-     const INPUT_KEY_SKIP_DB_VALIDATION = 'skip-db-validation';
-     const INPUT_KEY_CACHE_HOSTS = 'http-cache-hosts';
-@@ -104,6 +109,20 @@ class ConfigOptionsListConstants
-     const KEY_MODEL = 'model';
-     const KEY_INIT_STATEMENTS = 'initStatements';
-     const KEY_ACTIVE = 'active';
-+    const KEY_DRIVER_OPTIONS = 'driver_options';
-+    /**#@-*/
-+
-+    /**#@+
-+     * Array keys for database driver options configurations
-+     */
-+    const KEY_MYSQL_SSL_KEY = \PDO::MYSQL_ATTR_SSL_KEY;
-+    const KEY_MYSQL_SSL_CERT = \PDO::MYSQL_ATTR_SSL_CERT;
-+    const KEY_MYSQL_SSL_CA = \PDO::MYSQL_ATTR_SSL_CA;
-+    /**
-+     * Constant \PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT cannot be used as it was introduced in PHP 7.1.4
-+     * and Magento 2 is currently supporting PHP 7.1.3.
-+     */
-+    const KEY_MYSQL_SSL_VERIFY = 1014;
-     /**#@-*/
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/Config/Dom.php b/lib/internal/Magento/Framework/Config/Dom.php
-index 1d995bab007..5c97c996634 100644
---- a/lib/internal/Magento/Framework/Config/Dom.php
-+++ b/lib/internal/Magento/Framework/Config/Dom.php
-@@ -190,9 +190,20 @@ class Dom
-             /* override node value */
-             if ($this->_isTextNode($node)) {
-                 /* skip the case when the matched node has children, otherwise they get overridden */
--                if (!$matchedNode->hasChildNodes() || $this->_isTextNode($matchedNode)) {
-+                if (!$matchedNode->hasChildNodes()
-+                    || $this->_isTextNode($matchedNode)
-+                    || $this->isCdataNode($matchedNode)
-+                ) {
-                     $matchedNode->nodeValue = $node->childNodes->item(0)->nodeValue;
-                 }
-+            } elseif ($this->isCdataNode($node) && $this->_isTextNode($matchedNode)) {
-+                /* Replace text node with CDATA section */
-+                if ($this->findCdataSection($node)) {
-+                    $matchedNode->nodeValue = $this->findCdataSection($node)->nodeValue;
-+                }
-+            } elseif ($this->isCdataNode($node) && $this->isCdataNode($matchedNode)) {
-+                /* Replace CDATA with new one */
-+                $this->replaceCdataNode($matchedNode, $node);
-             } else {
-                 /* recursive merge for all child nodes */
-                 foreach ($node->childNodes as $childNode) {
-@@ -220,6 +231,56 @@ class Dom
-         return $node->childNodes->length == 1 && $node->childNodes->item(0) instanceof \DOMText;
-     }
- 
-+    /**
-+     * Check if the node content is CDATA (probably surrounded with text nodes) or just text node
-+     *
-+     * @param \DOMNode $node
-+     * @return bool
-+     */
-+    private function isCdataNode($node)
-+    {
-+        // If every child node of current is NOT \DOMElement
-+        // It is arbitrary combination of text nodes and CDATA sections.
-+        foreach ($node->childNodes as $childNode) {
-+            if ($childNode instanceof \DOMElement) {
-+                return false;
-+            }
-+        }
-+
-+        return true;
-+    }
-+
-+    /**
-+     * Finds CDATA section from given node children
-+     *
-+     * @param \DOMNode $node
-+     * @return \DOMCdataSection|null
-+     */
-+    private function findCdataSection($node)
-+    {
-+        foreach ($node->childNodes as $childNode) {
-+            if ($childNode instanceof \DOMCdataSection) {
-+                return $childNode;
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Replaces CDATA section in $oldNode with $newNode's
-+     *
-+     * @param \DOMNode $oldNode
-+     * @param \DOMNode $newNode
-+     */
-+    private function replaceCdataNode($oldNode, $newNode)
-+    {
-+        $oldCdata = $this->findCdataSection($oldNode);
-+        $newCdata = $this->findCdataSection($newNode);
-+
-+        if ($oldCdata && $newCdata) {
-+            $oldCdata->nodeValue = $newCdata->nodeValue;
-+        }
-+    }
-+
-     /**
-      * Merges attributes of the merge node to the base node
-      *
-@@ -318,7 +379,7 @@ class Dom
-         libxml_set_external_entity_loader([self::$urnResolver, 'registerEntityLoader']);
-         $errors = [];
-         try {
--            $result = $dom->schemaValidate($schema);
-+            $result = $dom->schemaValidate($schema, LIBXML_SCHEMA_CREATE);
-             if (!$result) {
-                 $errors = self::getXmlErrors($errorFormat);
-             }
-diff --git a/lib/internal/Magento/Framework/Config/Reader.php b/lib/internal/Magento/Framework/Config/Reader.php
-index c7ec5f32743..9ace14ad9d8 100644
---- a/lib/internal/Magento/Framework/Config/Reader.php
-+++ b/lib/internal/Magento/Framework/Config/Reader.php
-@@ -63,10 +63,7 @@ class Reader implements \Magento\Framework\App\Config\Scope\ReaderInterface
-         uasort(
-             $array,
-             function ($firstItem, $nexItem) {
--                if ((int)$firstItem['sortOrder'] == (int)$nexItem['sortOrder']) {
--                    return 0;
--                }
--                return (int)$firstItem['sortOrder'] < (int)$nexItem['sortOrder'] ? -1 : 1;
-+                return (int)$firstItem['sortOrder'] <=> (int)$nexItem['sortOrder'];
-             }
-         );
- 
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/ArrayNodeConfigTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/ArrayNodeConfigTest.php
-index fc161b5b55b..38171a568ba 100644
---- a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/ArrayNodeConfigTest.php
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/ArrayNodeConfigTest.php
-@@ -5,8 +5,14 @@
-  */
- namespace Magento\Framework\Config\Test\Unit\Dom;
- 
--use \Magento\Framework\Config\Dom\ArrayNodeConfig;
-+use Magento\Framework\Config\Dom\ArrayNodeConfig;
-+use Magento\Framework\Config\Dom\NodePathMatcher;
- 
-+/**
-+ * Test for
-+ *
-+ * @see ArrayNodeConfig
-+ */
- class ArrayNodeConfigTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -21,7 +27,7 @@ class ArrayNodeConfigTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
--        $this->nodePathMatcher = $this->createMock(\Magento\Framework\Config\Dom\NodePathMatcher::class);
-+        $this->nodePathMatcher = $this->createMock(NodePathMatcher::class);
-         $this->object = new ArrayNodeConfig(
-             $this->nodePathMatcher,
-             ['/root/assoc/one' => 'name', '/root/assoc/two' => 'id', '/root/assoc/three' => 'key'],
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodeMergingConfigTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodeMergingConfigTest.php
-index a782e23da83..b0daf3ef359 100644
---- a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodeMergingConfigTest.php
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodeMergingConfigTest.php
-@@ -5,8 +5,14 @@
-  */
- namespace Magento\Framework\Config\Test\Unit\Dom;
- 
--use \Magento\Framework\Config\Dom\NodeMergingConfig;
-+use Magento\Framework\Config\Dom\NodeMergingConfig;
-+use Magento\Framework\Config\Dom\NodePathMatcher;
- 
-+/**
-+ * Test for
-+ *
-+ * @see NodeMergingConfig
-+ */
- class NodeMergingConfigTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -21,7 +27,7 @@ class NodeMergingConfigTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
--        $this->nodePathMatcher = $this->createMock(\Magento\Framework\Config\Dom\NodePathMatcher::class);
-+        $this->nodePathMatcher = $this->createMock(NodePathMatcher::class);
-         $this->object = new NodeMergingConfig(
-             $this->nodePathMatcher,
-             ['/root/one' => 'name', '/root/two' => 'id', '/root/three' => 'key']
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php
-index 5c8f6668387..73968ac1ed8 100644
---- a/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Framework\Config\Test\Unit;
- 
-+/**
-+ * Test for \Magento\Framework\Config\Dom class.
-+ */
- class DomTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -62,6 +65,37 @@ class DomTest extends \PHPUnit\Framework\TestCase
-             ['override_node.xml', 'override_node_new.xml', [], null, 'override_node_merged.xml'],
-             ['override_node_new.xml', 'override_node.xml', [], null, 'override_node_merged.xml'],
-             ['text_node.xml', 'text_node_new.xml', [], null, 'text_node_merged.xml'],
-+            'text node replaced with cdata' => [
-+                'text_node_cdata.xml',
-+                'text_node_cdata_new.xml',
-+                [],
-+                null,
-+                'text_node_cdata_merged.xml'
-+            ],
-+            'cdata' => ['cdata.xml', 'cdata_new.xml', [], null, 'cdata_merged.xml'],
-+            'cdata with html' => ['cdata_html.xml', 'cdata_html_new.xml', [], null, 'cdata_html_merged.xml'],
-+            'cdata replaced with text node' => [
-+                'cdata_text.xml',
-+                'cdata_text_new.xml',
-+                [],
-+                null,
-+                'cdata_text_merged.xml'
-+            ],
-+            'big cdata' => ['big_cdata.xml', 'big_cdata_new.xml', [], null, 'big_cdata_merged.xml'],
-+            'big cdata with attribute' => [
-+                'big_cdata_attribute.xml',
-+                'big_cdata_attribute_new.xml',
-+                [],
-+                null,
-+                'big_cdata_attribute_merged.xml'
-+            ],
-+            'big cdata replaced with text' => [
-+                'big_cdata_text.xml',
-+                'big_cdata_text_new.xml',
-+                [],
-+                null,
-+                'big_cdata_text_merged.xml'
-+            ],
-             [
-                 'recursive.xml',
-                 'recursive_new.xml',
-@@ -135,6 +169,48 @@ class DomTest extends \PHPUnit\Framework\TestCase
-         ];
-     }
- 
-+    /**
-+     * @param string $xml
-+     * @param string $expectedValue
-+     * @dataProvider validateWithDefaultValueDataProvider
-+     */
-+    public function testValidateWithDefaultValue($xml, $expectedValue)
-+    {
-+        if (!function_exists('libxml_set_external_entity_loader')) {
-+            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-+        }
-+
-+        $actualErrors = [];
-+
-+        $dom = new \Magento\Framework\Config\Dom($xml, $this->validationStateMock);
-+        $dom->validate(__DIR__ . '/_files/sample.xsd', $actualErrors);
-+
-+        $actualValue = $dom->getDom()
-+            ->getElementsByTagName('root')->item(0)
-+            ->getElementsByTagName('node')->item(0)
-+            ->getAttribute('attribute_with_default_value');
-+
-+        $this->assertEmpty($actualErrors);
-+        $this->assertEquals($expectedValue, $actualValue);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function validateWithDefaultValueDataProvider()
-+    {
-+        return [
-+            'default_value' => [
-+                '<root><node id="id1"/></root>',
-+                'default_value'
-+            ],
-+            'custom_value' => [
-+                '<root><node id="id1" attribute_with_default_value="non_default_value"/></root>',
-+                'non_default_value'
-+            ],
-+        ];
-+    }
-+
-     public function testValidateCustomErrorFormat()
-     {
-         $xml = '<root><unknown_node/></root>';
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php
-index d48b9be4276..dbc68628ec8 100644
---- a/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php
-@@ -5,8 +5,13 @@
-  */
- namespace Magento\Framework\Config\Test\Unit\Reader;
- 
--use \Magento\Framework\Config\Reader\Filesystem;
-+use Magento\Framework\Config\Reader\Filesystem;
- 
-+/**
-+ * Test for
-+ *
-+ * @see Filesystem
-+ */
- class FilesystemTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -64,7 +69,7 @@ class FilesystemTest extends \PHPUnit\Framework\TestCase
-         );
-         $this->_fileResolverMock->expects($this->once())->method('get')->will($this->returnValue([$this->_file]));
- 
--        $dom = new \DomDocument();
-+        $dom = new \DOMDocument();
-         $dom->loadXML($this->_file);
-         $this->_converterMock->expects($this->once())->method('convert')->with($dom);
-         $model->read('scope');
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/ThemeTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/ThemeTest.php
-index 17fa8906836..4966a45c7b4 100644
---- a/lib/internal/Magento/Framework/Config/Test/Unit/ThemeTest.php
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/ThemeTest.php
-@@ -7,10 +7,10 @@ namespace Magento\Framework\Config\Test\Unit;
- 
- class ThemeTest extends \PHPUnit\Framework\TestCase
- {
--    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
-+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
-     protected $urnResolver;
- 
--    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
-+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
-     protected $urnResolverMock;
- 
-     protected function setUp()
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata.xml
-new file mode 100644
-index 00000000000..69eb0035958
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode>
-+            <![CDATA[Some Phrase]]>
-+        </subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_attribute.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_attribute.xml
-new file mode 100644
-index 00000000000..12a9389e3d2
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_attribute.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode attr="text">
-+            <![CDATA[Some Phrase]]>
-+        </subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_attribute_merged.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_attribute_merged.xml
-new file mode 100644
-index 00000000000..6e95d843e34
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_attribute_merged.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode attr="text">
-+            <![CDATA[Some Other Phrase]]>
-+        </subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_attribute_new.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_attribute_new.xml
-new file mode 100644
-index 00000000000..b905781a9fe
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_attribute_new.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode>
-+            <![CDATA[Some Other Phrase]]>
-+        </subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_merged.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_merged.xml
-new file mode 100644
-index 00000000000..b905781a9fe
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_merged.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode>
-+            <![CDATA[Some Other Phrase]]>
-+        </subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_new.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_new.xml
-new file mode 100644
-index 00000000000..b905781a9fe
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_new.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode>
-+            <![CDATA[Some Other Phrase]]>
-+        </subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_text.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_text.xml
-new file mode 100644
-index 00000000000..69eb0035958
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_text.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode>
-+            <![CDATA[Some Phrase]]>
-+        </subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_text_merged.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_text_merged.xml
-new file mode 100644
-index 00000000000..3e37e67ffcf
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_text_merged.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode>Some Other Phrase</subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_text_new.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_text_new.xml
-new file mode 100644
-index 00000000000..3e37e67ffcf
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/big_cdata_text_new.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode>Some Other Phrase</subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata.xml
-new file mode 100644
-index 00000000000..f65a21e1223
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode><![CDATA[Some Phrase]]></subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_html.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_html.xml
-new file mode 100644
-index 00000000000..15294f46445
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_html.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode><![CDATA[Some <br /> Phrase]]></subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_html_merged.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_html_merged.xml
-new file mode 100644
-index 00000000000..709d921f737
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_html_merged.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode><![CDATA[Some <br /> Other <br /> Phrase]]></subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_html_new.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_html_new.xml
-new file mode 100644
-index 00000000000..709d921f737
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_html_new.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode><![CDATA[Some <br /> Other <br /> Phrase]]></subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_merged.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_merged.xml
-new file mode 100644
-index 00000000000..e6d2d809d7f
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_merged.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode><![CDATA[Some Other Phrase]]></subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_new.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_new.xml
-new file mode 100644
-index 00000000000..e6d2d809d7f
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_new.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode><![CDATA[Some Other Phrase]]></subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_text.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_text.xml
-new file mode 100644
-index 00000000000..f65a21e1223
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_text.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode><![CDATA[Some Phrase]]></subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_text_merged.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_text_merged.xml
-new file mode 100644
-index 00000000000..3e37e67ffcf
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_text_merged.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode>Some Other Phrase</subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_text_new.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_text_new.xml
-new file mode 100644
-index 00000000000..3e37e67ffcf
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/cdata_text_new.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode>Some Other Phrase</subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/text_node_cdata.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/text_node_cdata.xml
-new file mode 100644
-index 00000000000..6807872aa3d
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/text_node_cdata.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode>Some Phrase</subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/text_node_cdata_merged.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/text_node_cdata_merged.xml
-new file mode 100644
-index 00000000000..b905781a9fe
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/text_node_cdata_merged.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode>
-+            <![CDATA[Some Other Phrase]]>
-+        </subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/text_node_cdata_new.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/text_node_cdata_new.xml
-new file mode 100644
-index 00000000000..b905781a9fe
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/dom/text_node_cdata_new.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!--
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+-->
-+<root>
-+    <node>
-+        <subnode>
-+            <![CDATA[Some Other Phrase]]>
-+        </subnode>
-+    </node>
-+</root>
-diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd b/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd
-index 1f635b7081e..701a2eb18c2 100644
---- a/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd
-+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd
-@@ -21,6 +21,7 @@
-         <xs:simpleContent>
-             <xs:extension base="xs:string">
-                 <xs:attribute name="id" type="xs:string" use="required"/>
-+                <xs:attribute name="attribute_with_default_value" type="xs:string" default="default_value"/>
-             </xs:extension>
-         </xs:simpleContent>
-     </xs:complexType>
-diff --git a/lib/internal/Magento/Framework/Config/etc/view.xsd b/lib/internal/Magento/Framework/Config/etc/view.xsd
-index 20b6a7d4fbf..b908862b021 100644
---- a/lib/internal/Magento/Framework/Config/etc/view.xsd
-+++ b/lib/internal/Magento/Framework/Config/etc/view.xsd
-@@ -49,13 +49,13 @@
-             <xs:element name="image" minOccurs="1" maxOccurs="unbounded">
-                 <xs:complexType>
-                     <xs:sequence>
--                        <xs:element name="width" type="xs:positiveInteger" minOccurs="0"/>
--                        <xs:element name="height" type="xs:positiveInteger" minOccurs="0"/>
--                        <xs:element name="constrain" type="xs:boolean" minOccurs="0"/>
--                        <xs:element name="aspect_ratio" type="xs:boolean" minOccurs="0"/>
--                        <xs:element name="frame" type="xs:boolean" minOccurs="0"/>
--                        <xs:element name="transparency" type="xs:boolean" minOccurs="0"/>
--                        <xs:element name="background" minOccurs="0">
-+                        <xs:element name="width" type="xs:positiveInteger" minOccurs="0" nillable="true"/>
-+                        <xs:element name="height" type="xs:positiveInteger" minOccurs="0" nillable="true"/>
-+                        <xs:element name="constrain" type="xs:boolean" minOccurs="0" nillable="true"/>
-+                        <xs:element name="aspect_ratio" type="xs:boolean" minOccurs="0" nillable="true"/>
-+                        <xs:element name="frame" type="xs:boolean" minOccurs="0" nillable="true"/>
-+                        <xs:element name="transparency" type="xs:boolean" minOccurs="0" nillable="true"/>
-+                        <xs:element name="background" minOccurs="0" nillable="true">
-                             <xs:simpleType>
-                                 <xs:restriction base="xs:string">
-                                     <xs:pattern value="\[(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\]"/>
-diff --git a/lib/internal/Magento/Framework/Console/Cli.php b/lib/internal/Magento/Framework/Console/Cli.php
-index c90d8a9acae..fac588f1fbc 100644
---- a/lib/internal/Magento/Framework/Console/Cli.php
-+++ b/lib/internal/Magento/Framework/Console/Cli.php
-@@ -3,13 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Console;
- 
- use Magento\Framework\App\Bootstrap;
- use Magento\Framework\App\DeploymentConfig;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\App\ProductMetadata;
--use Magento\Framework\App\State;
- use Magento\Framework\Composer\ComposerJsonFinder;
- use Magento\Framework\Console\Exception\GenerationDirectoryAccessException;
- use Magento\Framework\Filesystem\Driver\File;
-@@ -19,12 +20,14 @@ use Magento\Setup\Application;
- use Magento\Setup\Console\CompilerPreparation;
- use Magento\Setup\Model\ObjectManagerProvider;
- use Symfony\Component\Console;
-+use Magento\Framework\Config\ConfigOptionsListConstants;
- 
- /**
-  * Magento 2 CLI Application.
-+ *
-  * This is the hood for all command line tools supported by Magento.
-  *
-- * {@inheritdoc}
-+ * @inheritdoc
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Cli extends Console\Application
-@@ -61,11 +64,11 @@ class Cli extends Console\Application
-     /**
-      * @param string $name the application name
-      * @param string $version the application version
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
-     {
-         try {
-+            // phpcs:ignore Magento2.Security.IncludeFile
-             $configuration = require BP . '/setup/config/application.config.php';
-             $bootstrapApplication = new Application();
-             $application = $bootstrapApplication->bootstrap($configuration);
-@@ -73,13 +76,12 @@ class Cli extends Console\Application
- 
-             $this->assertCompilerPreparation();
-             $this->initObjectManager();
--            $this->assertGenerationPermissions();
-         } catch (\Exception $exception) {
-             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-             $output->writeln(
-                 '<error>' . $exception->getMessage() . '</error>'
-             );
--
-+            // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-             exit(static::RETURN_FAILURE);
-         }
- 
-@@ -94,7 +96,7 @@ class Cli extends Console\Application
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @throws \Exception The exception in case of unexpected error
-      */
-@@ -110,7 +112,7 @@ class Cli extends Console\Application
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function getDefaultCommands()
-     {
-@@ -157,6 +159,7 @@ class Cli extends Console\Application
-     {
-         $params = (new ComplexParameter(self::INPUT_KEY_BOOTSTRAP))->mergeFromArgv($_SERVER, $_SERVER);
-         $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
-+        $params = $this->documentRootResolver($params);
-         $requestParams = $this->serviceManager->get('magento-init-params');
-         $appBootstrapKey = Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS;
- 
-@@ -171,33 +174,6 @@ class Cli extends Console\Application
-         $omProvider->setObjectManager($this->objectManager);
-     }
- 
--    /**
--     * Checks whether generation directory is read-only.
--     * Depends on the current mode:
--     *      production - application will proceed
--     *      default - application will be terminated
--     *      developer - application will be terminated
--     *
--     * @return void
--     * @throws GenerationDirectoryAccessException If generation directory is read-only in developer mode
--     */
--    private function assertGenerationPermissions()
--    {
--        /** @var GenerationDirectoryAccess $generationDirectoryAccess */
--        $generationDirectoryAccess = $this->objectManager->create(
--            GenerationDirectoryAccess::class,
--            ['serviceManager' => $this->serviceManager]
--        );
--        /** @var State $state */
--        $state = $this->objectManager->get(State::class);
--
--        if ($state->getMode() !== State::MODE_PRODUCTION
--            && !$generationDirectoryAccess->check()
--        ) {
--            throw new GenerationDirectoryAccessException();
--        }
--    }
--
-     /**
-      * Checks whether compiler is being prepared.
-      *
-@@ -242,4 +218,26 @@ class Cli extends Console\Application
- 
-         return $commands;
-     }
-+
-+    /**
-+     * Provides updated configuration in accordance to document root settings.
-+     *
-+     * @param array $config
-+     * @return array
-+     */
-+    private function documentRootResolver(array $config = []): array
-+    {
-+        $params = [];
-+        $deploymentConfig = $this->serviceManager->get(DeploymentConfig::class);
-+        if ((bool)$deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DOCUMENT_ROOT_IS_PUB)) {
-+            $params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS] = [
-+                DirectoryList::PUB => [DirectoryList::URL_PATH => ''],
-+                DirectoryList::MEDIA => [DirectoryList::URL_PATH => 'media'],
-+                DirectoryList::STATIC_VIEW => [DirectoryList::URL_PATH => 'static'],
-+                DirectoryList::UPLOAD => [DirectoryList::URL_PATH => 'media/upload'],
-+            ];
-+        }
-+
-+        return array_merge_recursive($config, $params);
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Convert/Excel.php b/lib/internal/Magento/Framework/Convert/Excel.php
-index 09acd88b38a..e201978a8cb 100644
---- a/lib/internal/Magento/Framework/Convert/Excel.php
-+++ b/lib/internal/Magento/Framework/Convert/Excel.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Framework\Convert;
- 
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Filesystem\File\WriteInterface;
- 
- /**
-@@ -12,6 +14,11 @@ use Magento\Framework\Filesystem\File\WriteInterface;
-  */
- class Excel
- {
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * \ArrayIterator Object
-      *
-@@ -45,15 +52,23 @@ class Excel
-      *
-      * @param \Iterator $iterator
-      * @param array $rowCallback
-+     * @param Escaper|null $escaper
-      */
--    public function __construct(\Iterator $iterator, $rowCallback = [])
--    {
-+    public function __construct(
-+        \Iterator $iterator,
-+        $rowCallback = [],
-+        Escaper $escaper = null
-+    ) {
-         $this->_iterator = $iterator;
-         $this->_rowCallback = $rowCallback;
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-     }
- 
-     /**
-      * Retrieve Excel XML Document Header XML Fragment
-+     *
-      * Append data header if it is available
-      *
-      * @param string $sheetName
-@@ -65,7 +80,7 @@ class Excel
-             $sheetName = 'Sheet 1';
-         }
- 
--        $sheetName = htmlspecialchars($sheetName);
-+        $sheetName = $this->escaper->escapeHtml($sheetName);
- 
-         $xmlHeader = '<' .
-             '?xml version="1.0"?' .
-@@ -98,6 +113,7 @@ class Excel
- 
-     /**
-      * Retrieve Excel XML Document Footer XML Fragment
-+     *
-      * Append data footer if it is available
-      *
-      * @return string
-@@ -133,7 +149,7 @@ class Excel
-         $xmlData[] = '<Row>';
- 
-         foreach ($row as $value) {
--            $value = htmlspecialchars($value);
-+            $value = $this->escaper->escapeHtml($value);
-             $dataType = is_numeric($value) && $value[0] !== '+' && $value[0] !== '0' ? 'Number' : 'String';
- 
-             /**
-diff --git a/lib/internal/Magento/Framework/Crontab/CrontabManager.php b/lib/internal/Magento/Framework/Crontab/CrontabManager.php
-index 6049b7fba6d..da81540faf4 100644
---- a/lib/internal/Magento/Framework/Crontab/CrontabManager.php
-+++ b/lib/internal/Magento/Framework/Crontab/CrontabManager.php
-@@ -4,6 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
-+
- namespace Magento\Framework\Crontab;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
-@@ -40,31 +41,35 @@ class CrontabManager implements CrontabManagerInterface
-     }
- 
-     /**
-+     * Build tasks block start text.
-+     *
-      * @return string
-      */
-     private function getTasksBlockStart()
-     {
-         $tasksBlockStart = self::TASKS_BLOCK_START;
-         if (defined('BP')) {
--            $tasksBlockStart .= ' ' . md5(BP);
-+            $tasksBlockStart .= ' ' . hash("sha256", BP);
-         }
-         return $tasksBlockStart;
-     }
- 
-     /**
-+     * Build tasks block end text.
-+     *
-      * @return string
-      */
-     private function getTasksBlockEnd()
-     {
-         $tasksBlockEnd = self::TASKS_BLOCK_END;
-         if (defined('BP')) {
--            $tasksBlockEnd .= ' ' . md5(BP);
-+            $tasksBlockEnd .= ' ' . hash("sha256", BP);
-         }
-         return $tasksBlockEnd;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getTasks()
-     {
-@@ -82,7 +87,7 @@ class CrontabManager implements CrontabManagerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function saveTasks(array $tasks)
-     {
-@@ -118,8 +123,7 @@ class CrontabManager implements CrontabManagerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
--     * @throws LocalizedException
-+     * @inheritdoc
-      */
-     public function removeTasks()
-     {
-@@ -182,7 +186,7 @@ class CrontabManager implements CrontabManagerInterface
-     private function getCrontabContent()
-     {
-         try {
--            $content = (string)$this->shell->execute('crontab -l');
-+            $content = (string)$this->shell->execute('crontab -l 2>/dev/null');
-         } catch (LocalizedException $e) {
-             return '';
-         }
-@@ -203,6 +207,7 @@ class CrontabManager implements CrontabManagerInterface
- 
-         try {
-             $this->shell->execute('echo "' . $content . '" | crontab -');
-+            // phpcs:disable Magento2.Exceptions.ThrowCatch
-         } catch (LocalizedException $e) {
-             throw new LocalizedException(
-                 new Phrase('Error during saving of crontab: %1', [$e->getPrevious()->getMessage()]),
-diff --git a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
-index b160eb0a7f9..f6c863d9d9f 100644
---- a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
-+++ b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
-@@ -4,6 +4,7 @@
-  * See COPYING.txt for license details.
-  */
- 
-+
- namespace Magento\Framework\Crontab\Test\Unit;
- 
- use Magento\Framework\Crontab\CrontabManager;
-@@ -16,6 +17,9 @@ use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\Filesystem\Directory\ReadInterface;
- use Magento\Framework\Filesystem\DriverPool;
- 
-+/**
-+ * Tests crontab manager functionality.
-+ */
- class CrontabManagerTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -58,7 +62,7 @@ class CrontabManagerTest extends \PHPUnit\Framework\TestCase
- 
-         $this->shellMock->expects($this->once())
-             ->method('execute')
--            ->with('crontab -l', [])
-+            ->with('crontab -l 2>/dev/null', [])
-             ->willThrowException($localizedException);
- 
-         $this->assertEquals([], $this->crontabManager->getTasks());
-@@ -74,7 +78,7 @@ class CrontabManagerTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->shellMock->expects($this->once())
-             ->method('execute')
--            ->with('crontab -l', [])
-+            ->with('crontab -l 2>/dev/null', [])
-             ->willReturn($content);
- 
-         $this->assertEquals($tasks, $this->crontabManager->getTasks());
-@@ -88,17 +92,17 @@ class CrontabManagerTest extends \PHPUnit\Framework\TestCase
-         return [
-             [
-                 'content' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
-+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
-                     . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
-+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
-                 'tasks' => ['* * * * * /bin/php /var/www/magento/bin/magento cron:run'],
-             ],
-             [
-                 'content' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
-+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
-                     . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL
-                     . '* * * * * /bin/php /var/www/magento/bin/magento setup:cron:run' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
-+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
-                 'tasks' => [
-                     '* * * * * /bin/php /var/www/magento/bin/magento cron:run',
-                     '* * * * * /bin/php /var/www/magento/bin/magento setup:cron:run',
-@@ -127,7 +131,7 @@ class CrontabManagerTest extends \PHPUnit\Framework\TestCase
- 
-         $this->shellMock->expects($this->at(0))
-             ->method('execute')
--            ->with('crontab -l', [])
-+            ->with('crontab -l 2>/dev/null', [])
-             ->willReturn('');
- 
-         $this->shellMock->expects($this->at(1))
-@@ -148,7 +152,7 @@ class CrontabManagerTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->shellMock->expects($this->at(0))
-             ->method('execute')
--            ->with('crontab -l', [])
-+            ->with('crontab -l 2>/dev/null', [])
-             ->willReturn($contentBefore);
- 
-         $this->shellMock->expects($this->at(1))
-@@ -166,17 +170,17 @@ class CrontabManagerTest extends \PHPUnit\Framework\TestCase
-         return [
-             [
-                 'contentBefore' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
-+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
-                     . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
-+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
-                 'contentAfter' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
-             ],
-             [
-                 'contentBefore' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
-+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
-                     . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL
-                     . '* * * * * /bin/php /var/www/magento/bin/magento setup:cron:run' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
-+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
-                 'contentAfter' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
-             ],
-             [
-@@ -276,7 +280,7 @@ class CrontabManagerTest extends \PHPUnit\Framework\TestCase
- 
-         $this->shellMock->expects($this->at(0))
-             ->method('execute')
--            ->with('crontab -l', [])
-+            ->with('crontab -l 2>/dev/null', [])
-             ->willReturn($content);
- 
-         $this->shellMock->expects($this->at(1))
-@@ -292,9 +296,9 @@ class CrontabManagerTest extends \PHPUnit\Framework\TestCase
-     public function saveTasksDataProvider()
-     {
-         $content = '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
--            . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
-+            . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
-             . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL
--            . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL;
-+            . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL;
- 
-         return [
-             [
-@@ -303,9 +307,9 @@ class CrontabManagerTest extends \PHPUnit\Framework\TestCase
-                 ],
-                 'content' => $content,
-                 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
-+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
-                     . '* * * * * ' . PHP_BINARY . ' run.php' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
-+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
-             ],
-             [
-                 'tasks' => [
-@@ -313,9 +317,9 @@ class CrontabManagerTest extends \PHPUnit\Framework\TestCase
-                 ],
-                 'content' => $content,
-                 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
-+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
-                     . '1 2 3 4 5 ' . PHP_BINARY . ' run.php' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
-+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
-             ],
-             [
-                 'tasks' => [
-@@ -323,10 +327,10 @@ class CrontabManagerTest extends \PHPUnit\Framework\TestCase
-                 ],
-                 'content' => $content,
-                 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
-+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
-                     . '* * * * * ' . PHP_BINARY . ' /var/www/magento2/run.php >>'
-                     . ' /var/www/magento2/var/log/cron.log' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
-+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
-             ],
-             [
-                 'tasks' => [
-@@ -334,10 +338,10 @@ class CrontabManagerTest extends \PHPUnit\Framework\TestCase
-                 ],
-                 'content' => $content,
-                 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
-+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
-                     . '* * * * * ' . PHP_BINARY . ' /var/www/magento2/run.php'
-                     . ' %% cron:run | grep -v \"Ran \'jobs\' by schedule\"' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
-+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
-             ],
-             [
-                 'tasks' => [
-@@ -345,10 +349,10 @@ class CrontabManagerTest extends \PHPUnit\Framework\TestCase
-                 ],
-                 'content' => '* * * * * /bin/php /var/www/cron.php',
-                 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
-+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
-                     . '* * * * * ' . PHP_BINARY . ' /var/www/magento2/run.php'
-                     . ' %% cron:run | grep -v \"Ran \'jobs\' by schedule\"' . PHP_EOL
--                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
-+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
-             ],
-         ];
-     }
-diff --git a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/AggregatedTest.php b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/AggregatedTest.php
-index c1c2a4f4a1d..cdf7a1ec373 100644
---- a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/AggregatedTest.php
-+++ b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/AggregatedTest.php
-@@ -98,9 +98,9 @@ class AggregatedTest extends \PHPUnit\Framework\TestCase
-      *
-      * @dataProvider getFilesDataProvider
-      *
--     * @param $libraryFiles array Files in lib directory
--     * @param $baseFiles array Files in base directory
--     * @param $themeFiles array Files in theme
-+     * @param array $libraryFiles Files in lib directory
-+     * @param array $baseFiles Files in base directory
-+     * @param array $themeFiles Files in theme
-      * *
-      * @return void
-      */
-diff --git a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/LibraryTest.php b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/LibraryTest.php
-index 962734feea1..6080652a4ad 100644
---- a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/LibraryTest.php
-+++ b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/LibraryTest.php
-@@ -129,8 +129,8 @@ class LibraryTest extends \PHPUnit\Framework\TestCase
-      *
-      * @dataProvider getFilesDataProvider
-      *
--     * @param $libraryFiles array Files in lib directory
--     * @param $themeFiles array Files in theme
-+     * @param array $libraryFiles Files in lib directory
-+     * @param array $themeFiles Files in theme
-      * *
-      * @return void
-      */
-diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
-index 5c9bc9c2fb2..f654fd263f6 100644
---- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
-+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\DB\Adapter;
- 
- use Magento\Framework\DB\Ddl\Table;
-@@ -365,6 +366,7 @@ interface AdapterInterface
- 
-     /**
-      * Add new Foreign Key to table
-+     *
-      * If Foreign Key with same name is exist - it will be deleted
-      *
-      * @param string $fkName
-@@ -373,7 +375,6 @@ interface AdapterInterface
-      * @param string $refTableName
-      * @param string $refColumnName
-      * @param string $onDelete
--     * @param string $onUpdate
-      * @param boolean $purge trying remove invalid data
-      * @param string $schemaName
-      * @param string $refSchemaName
-@@ -484,6 +485,7 @@ interface AdapterInterface
- 
-     /**
-      * Inserts a table row with specified data
-+     *
-      * Special for Zero values to identity column
-      *
-      * @param string $table
-@@ -502,9 +504,9 @@ interface AdapterInterface
-      * If the $where parameter is an array of multiple clauses, they will be joined by AND, with each clause wrapped in
-      * parenthesis.  If you wish to use an OR, you must give a single clause that is an instance of {@see Zend_Db_Expr}
-      *
--     * @param  mixed        $table The table to update.
--     * @param  array        $bind  Column-value pairs.
--     * @param  mixed        $where UPDATE WHERE clause(s).
-+     * @param  mixed $table The table to update.
-+     * @param  array $bind Column-value pairs.
-+     * @param  mixed $where UPDATE WHERE clause(s).
-      * @return int          The number of affected rows.
-      */
-     public function update($table, array $bind, $where = '');
-@@ -512,8 +514,8 @@ interface AdapterInterface
-     /**
-      * Deletes table rows based on a WHERE clause.
-      *
--     * @param  mixed        $table The table to update.
--     * @param  mixed        $where DELETE WHERE clause(s).
-+     * @param  mixed $table The table to update.
-+     * @param  mixed $where DELETE WHERE clause(s).
-      * @return int          The number of affected rows.
-      */
-     public function delete($table, $where = '');
-@@ -521,31 +523,33 @@ interface AdapterInterface
-     /**
-      * Prepares and executes an SQL statement with bound data.
-      *
--     * @param  mixed  $sql  The SQL statement with placeholders.
-+     * @param  mixed $sql The SQL statement with placeholders.
-      *                      May be a string or \Magento\Framework\DB\Select.
--     * @param  mixed  $bind An array of data or data itself to bind to the placeholders.
-+     * @param  mixed $bind An array of data or data itself to bind to the placeholders.
-      * @return \Zend_Db_Statement_Interface
-      */
-     public function query($sql, $bind = []);
- 
-     /**
-      * Fetches all SQL result rows as a sequential array.
-+     *
-      * Uses the current fetchMode for the adapter.
-      *
--     * @param string|\Magento\Framework\DB\Select $sql  An SQL SELECT statement.
--     * @param mixed                 $bind Data to bind into SELECT placeholders.
--     * @param mixed                 $fetchMode Override current fetch mode.
-+     * @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
-+     * @param mixed $bind Data to bind into SELECT placeholders.
-+     * @param mixed $fetchMode Override current fetch mode.
-      * @return array
-      */
-     public function fetchAll($sql, $bind = [], $fetchMode = null);
- 
-     /**
-      * Fetches the first row of the SQL result.
-+     *
-      * Uses the current fetchMode for the adapter.
-      *
-      * @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
-      * @param mixed $bind Data to bind into SELECT placeholders.
--     * @param mixed                 $fetchMode Override current fetch mode.
-+     * @param mixed $fetchMode Override current fetch mode.
-      * @return array
-      */
-     public function fetchRow($sql, $bind = [], $fetchMode = null);
-@@ -622,9 +626,9 @@ interface AdapterInterface
-      * // $safe = "WHERE date < '2005-01-02'"
-      * </code>
-      *
--     * @param string  $text  The text with a placeholder.
--     * @param mixed   $value The value to quote.
--     * @param string  $type  OPTIONAL SQL datatype
-+     * @param string $text The text with a placeholder.
-+     * @param mixed $value The value to quote.
-+     * @param string $type OPTIONAL SQL datatype
-      * @param integer $count OPTIONAL count of placeholders to replace
-      * @return string An SQL-safe quoted value placed into the original text.
-      */
-@@ -633,7 +637,7 @@ interface AdapterInterface
-     /**
-      * Quotes an identifier.
-      *
--     * Accepts a string representing a qualified indentifier. For Example:
-+     * Accepts a string representing a qualified identifier. For Example:
-      * <code>
-      * $adapter->quoteIdentifier('myschema.mytable')
-      * </code>
-@@ -721,7 +725,8 @@ interface AdapterInterface
- 
-     /**
-      * Reset cached DDL data from cache
--     * if table name is null - reset all cached DDL data
-+     *
-+     * If table name is null - reset all cached DDL data
-      *
-      * @param string $tableName
-      * @param string $schemaName OPTIONAL
-@@ -741,6 +746,7 @@ interface AdapterInterface
- 
-     /**
-      * Load DDL data from cache
-+     *
-      * Return false if cache does not exists
-      *
-      * @param string $tableCacheKey the table cache key
-@@ -784,6 +790,7 @@ interface AdapterInterface
- 
-     /**
-      * Prepare value for save in column
-+     *
-      * Return converted to column data type value
-      *
-      * @param array $column     the column describe array
-@@ -813,6 +820,7 @@ interface AdapterInterface
- 
-     /**
-      * Generate fragment of SQL, that combine together (concatenate) the results from data array
-+     *
-      * All arguments in data must be quoted
-      *
-      * @param array $data
-@@ -823,6 +831,7 @@ interface AdapterInterface
- 
-     /**
-      * Generate fragment of SQL that returns length of character string
-+     *
-      * The string argument must be quoted
-      *
-      * @param string $string
-@@ -931,6 +940,7 @@ interface AdapterInterface
- 
-     /**
-      * Retrieve valid table name
-+     *
-      * Check table name length and allowed symbols
-      *
-      * @param string $tableName
-@@ -950,6 +960,7 @@ interface AdapterInterface
- 
-     /**
-      * Retrieve valid index name
-+     *
-      * Check index name length and allowed symbols
-      *
-      * @param string $tableName
-@@ -961,6 +972,7 @@ interface AdapterInterface
- 
-     /**
-      * Retrieve valid foreign key name
-+     *
-      * Check foreign key name length and allowed symbols
-      *
-      * @param string $priTableName
-@@ -1047,6 +1059,7 @@ interface AdapterInterface
- 
-     /**
-      * Adds order by random to select object
-+     *
-      * Possible using integer field for optimization
-      *
-      * @param \Magento\Framework\DB\Select $select
-@@ -1074,6 +1087,7 @@ interface AdapterInterface
- 
-     /**
-      * Converts fetched blob into raw binary PHP data.
-+     *
-      * Some DB drivers return blobs as hex-coded strings, so we need to process them.
-      *
-      * @param mixed $value
-@@ -1114,6 +1128,8 @@ interface AdapterInterface
-     public function getTables($likeCondition = null);
- 
-     /**
-+     * Generates case SQL fragment
-+     *
-      * Generate fragment of SQL, that check value against multiple condition cases
-      * and return different result depends on them
-      *
-diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
-index 441da10253a..480af45e40a 100644
---- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
-+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
-@@ -274,6 +274,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-     public function beginTransaction()
-     {
-         if ($this->_isRolledBack) {
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow.FoundDirectThrow
-             throw new \Exception(AdapterInterface::ERROR_ROLLBACK_INCOMPLETE_MESSAGE);
-         }
-         if ($this->_transactionLevel === 0) {
-@@ -298,8 +299,10 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-             parent::commit();
-             $this->logger->logStats(LoggerInterface::TYPE_TRANSACTION, 'COMMIT');
-         } elseif ($this->_transactionLevel === 0) {
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow.FoundDirectThrow
-             throw new \Exception(AdapterInterface::ERROR_ASYMMETRIC_COMMIT_MESSAGE);
-         } elseif ($this->_isRolledBack) {
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow.FoundDirectThrow
-             throw new \Exception(AdapterInterface::ERROR_ROLLBACK_INCOMPLETE_MESSAGE);
-         }
-         --$this->_transactionLevel;
-@@ -320,6 +323,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-             $this->_isRolledBack = false;
-             $this->logger->logStats(LoggerInterface::TYPE_TRANSACTION, 'ROLLBACK');
-         } elseif ($this->_transactionLevel === 0) {
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow.FoundDirectThrow
-             throw new \Exception(AdapterInterface::ERROR_ASYMMETRIC_ROLLBACK_MESSAGE);
-         } else {
-             $this->_isRolledBack = true;
-@@ -352,7 +356,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-     /**
-      * Convert date and time to DB format
-      *
--     * @param   int|string|\DateTimeInterface $datetime
-+     * @param int|string|\DateTimeInterface $datetime
-      * @return \Zend_Db_Expr
-      */
-     public function convertDateTime($datetime)
-@@ -515,6 +519,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Special handling for PDO query().
-+     *
-      * All bind parameter names must begin with ':'.
-      *
-      * @param string|\Magento\Framework\DB\Select $sql The SQL statement with placeholders.
-@@ -595,6 +600,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Special handling for PDO query().
-+     *
-      * All bind parameter names must begin with ':'.
-      *
-      * @param string|\Magento\Framework\DB\Select $sql The SQL statement with placeholders.
-@@ -615,9 +621,10 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-     }
- 
-     /**
-+     * Allows multiple queries
-+     *
-      * Allows multiple queries -- to safeguard against SQL injection, USE CAUTION and verify that input
-      * cannot be tampered with.
--     *
-      * Special handling for PDO query().
-      * All bind parameter names must begin with ':'.
-      *
-@@ -953,12 +960,12 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      * Using string as $definition is allowed only for concrete DB adapter.
-      * Adds primary key if needed
-      *
--     * @param   string $tableName
--     * @param   string $columnName
--     * @param   array|string $definition  string specific or universal array DB Server definition
--     * @param   string $schemaName
--     * @return  true|\Zend_Db_Statement_Pdo
--     * @throws  \Zend_Db_Exception
-+     * @param string $tableName
-+     * @param string $columnName
-+     * @param array|string $definition string specific or universal array DB Server definition
-+     * @param string $schemaName
-+     * @return true|\Zend_Db_Statement_Pdo
-+     * @throws \Zend_Db_Exception
-      */
-     public function addColumn($tableName, $columnName, $definition, $schemaName = null)
-     {
-@@ -1073,7 +1080,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      * @param string $oldColumnName
-      * @param string $newColumnName
-      * @param array $definition
--     * @param boolean $flushData        flush table statistic
-+     * @param boolean $flushData flush table statistic
-      * @param string $schemaName
-      * @return \Zend_Db_Statement_Pdo
-      * @throws \Zend_Db_Exception
-@@ -1278,6 +1285,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Modify tables, used for upgrade process
-+     *
-      * Change columns definitions, reset foreign keys, change tables comments and engines.
-      *
-      * The value of each array element is an associative array
-@@ -1469,9 +1477,9 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      *
-      * Method revrited for handle empty arrays in value param
-      *
--     * @param string  $text  The text with a placeholder.
--     * @param mixed   $value The value to quote.
--     * @param string  $type  OPTIONAL SQL datatype
-+     * @param string $text The text with a placeholder.
-+     * @param mixed $value The value to quote.
-+     * @param string $type OPTIONAL SQL datatype
-      * @param integer $count OPTIONAL count of placeholders to replace
-      * @return string An SQL-safe quoted value placed into the orignal text.
-      */
-@@ -1514,10 +1522,11 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Load DDL data from cache
-+     *
-      * Return false if cache does not exists
-      *
-      * @param string $tableCacheKey the table cache key
--     * @param int $ddlType          the DDL constant
-+     * @param int $ddlType the DDL constant
-      * @return string|array|int|false
-      */
-     public function loadDdlCache($tableCacheKey, $ddlType)
-@@ -1568,7 +1577,8 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Reset cached DDL data from cache
--     * if table name is null - reset all cached DDL data
-+     *
-+     * If table name is null - reset all cached DDL data
-      *
-      * @param string $tableName
-      * @param string $schemaName OPTIONAL
-@@ -1605,6 +1615,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Disallow DDL caching
-+     *
-      * @return $this
-      */
-     public function disallowDdlCache()
-@@ -1615,6 +1626,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Allow DDL caching
-+     *
-      * @return $this
-      */
-     public function allowDdlCache()
-@@ -1675,9 +1687,10 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Format described column to definition, ready to be added to ddl table.
-+     *
-      * Return array with keys: name, type, length, options, comment
-      *
--     * @param  array $columnData
-+     * @param array $columnData
-      * @return array
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-@@ -1892,6 +1905,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Inserts a table row with specified data
-+     *
-      * Special for Zero values to identity column
-      *
-      * @param string $table
-@@ -2025,10 +2039,10 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      * - array of values, if $columns contains only one column
-      *      array('value1', 'value2')
-      *
--     * @param   string $table
--     * @param   string[] $columns
--     * @param   array $data
--     * @param   int $strategy
-+     * @param string $table
-+     * @param string[] $columns
-+     * @param array $data
-+     * @param int $strategy
-      * @return int
-      * @throws \Zend_Db_Exception
-      */
-@@ -2139,12 +2153,11 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      *
-      * @param \Magento\Framework\DB\Ddl\Table $table
-      * @throws \Zend_Db_Exception
--     * @return \Zend_Db_Pdo_Statement
-+     * @return \Zend_Db_Statement_Pdo|void
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      */
-     public function createTemporaryTable(\Magento\Framework\DB\Ddl\Table $table)
-     {
--        $columns = $table->getColumns();
-         $sqlFragment    = array_merge(
-             $this->_getColumnsDefinition($table),
-             $this->_getIndexesDefinition($table),
-@@ -2650,8 +2663,8 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      *
-      * @param string $tableName
-      * @param string $indexName
--     * @param string|array $fields  the table column name or array of ones
--     * @param string $indexType     the index type
-+     * @param string|array $fields the table column name or array of ones
-+     * @param string $indexType the index type
-      * @param string $schemaName
-      * @return \Zend_Db_Statement_Interface
-      * @throws \Zend_Db_Exception
-@@ -2782,6 +2795,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Add new Foreign Key to table
-+     *
-      * If Foreign Key with same name is exist - it will be deleted
-      *
-      * @param string $fkName
-@@ -2790,7 +2804,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      * @param string $refTableName
-      * @param string $refColumnName
-      * @param string $onDelete
--     * @param bool $purge            trying remove invalid data
-+     * @param bool $purge trying remove invalid data
-      * @param string $schemaName
-      * @param string $refSchemaName
-      * @return \Zend_Db_Statement_Interface
-@@ -2904,6 +2918,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      * - array("gteq" => $greaterOrEqualValue)
-      * - array("lteq" => $lessOrEqualValue)
-      * - array("finset" => $valueInSet)
-+     * - array("nfinset" => $valueNotInSet)
-      * - array("regexp" => $regularExpression)
-      * - array("seq" => $stringValue)
-      * - array("sneq" => $stringValue)
-@@ -2933,6 +2948,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-             'gteq'          => "{{fieldName}} >= ?",
-             'lteq'          => "{{fieldName}} <= ?",
-             'finset'        => "FIND_IN_SET(?, {{fieldName}})",
-+            'nfinset'       => "NOT FIND_IN_SET(?, {{fieldName}})",
-             'regexp'        => "{{fieldName}} REGEXP ?",
-             'from'          => "{{fieldName}} >= ?",
-             'to'            => "{{fieldName}} <= ?",
-@@ -2954,7 +2970,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-                 if (isset($condition['to'])) {
-                     $query .= empty($query) ? '' : ' AND ';
-                     $to     = $this->_prepareSqlDateCondition($condition, 'to');
--                    $query = $this->_prepareQuotedSqlCondition($query . $conditionKeyMap['to'], $to, $fieldName);
-+                    $query = $query . $this->_prepareQuotedSqlCondition($conditionKeyMap['to'], $to, $fieldName);
-                 }
-             } elseif (array_key_exists($key, $conditionKeyMap)) {
-                 $value = $condition[$key];
-@@ -3016,9 +3032,10 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Prepare value for save in column
-+     *
-      * Return converted to column data type value
-      *
--     * @param array $column     the column describe array
-+     * @param array $column the column describe array
-      * @param mixed $value
-      * @return mixed
-      *
-@@ -3105,7 +3122,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      * Generate fragment of SQL, that check condition and return true or false value
-      *
-      * @param \Zend_Db_Expr|\Magento\Framework\DB\Select|string $expression
--     * @param string $true  true value
-+     * @param string $true true value
-      * @param string $false false value
-      * @return \Zend_Db_Expr
-      */
-@@ -3139,6 +3156,8 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-     }
- 
-     /**
-+     * Generates case SQL fragment
-+     *
-      * Generate fragment of SQL, that check value against multiple condition cases
-      * and return different result depends on them
-      *
-@@ -3163,6 +3182,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Generate fragment of SQL, that combine together (concatenate) the results from data array
-+     *
-      * All arguments in data must be quoted
-      *
-      * @param string[] $data
-@@ -3177,6 +3197,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Generate fragment of SQL that returns length of character string
-+     *
-      * The string argument must be quoted
-      *
-      * @param string $string
-@@ -3188,6 +3209,8 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-     }
- 
-     /**
-+     * Generate least SQL fragment
-+     *
-      * Generate fragment of SQL, that compare with two or more arguments, and returns the smallest
-      * (minimum-valued) argument
-      * All arguments in data must be quoted
-@@ -3201,6 +3224,8 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-     }
- 
-     /**
-+     * Generate greatest SQL fragment
-+     *
-      * Generate fragment of SQL, that compare with two or more arguments, and returns the largest
-      * (maximum-valued) argument
-      * All arguments in data must be quoted
-@@ -3235,7 +3260,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      *
-      * @see INTERVAL_* constants for $unit
-      *
--     * @param \Zend_Db_Expr|string $date   quoted field name or SQL statement
-+     * @param \Zend_Db_Expr|string $date quoted field name or SQL statement
-      * @param int $interval
-      * @param string $unit
-      * @return \Zend_Db_Expr
-@@ -3251,7 +3276,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      *
-      * @see INTERVAL_* constants for $expr
-      *
--     * @param \Zend_Db_Expr|string $date   quoted field name or SQL statement
-+     * @param \Zend_Db_Expr|string $date quoted field name or SQL statement
-      * @param int|string $interval
-      * @param string $unit
-      * @return \Zend_Db_Expr
-@@ -3274,7 +3299,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      * %m   Month, numeric (00..12)
-      * %Y   Year, numeric, four digits
-      *
--     * @param string $date  quoted date value or non quoted SQL statement(field)
-+     * @param string $date quoted date value or non quoted SQL statement(field)
-      * @param string $format
-      * @return \Zend_Db_Expr
-      */
-@@ -3287,7 +3312,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-     /**
-      * Extract the date part of a date or datetime expression
-      *
--     * @param \Zend_Db_Expr|string $date   quoted field name or SQL statement
-+     * @param \Zend_Db_Expr|string $date quoted field name or SQL statement
-      * @return \Zend_Db_Expr
-      */
-     public function getDatePartSql($date)
-@@ -3314,7 +3339,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-     /**
-      * Prepare standard deviation sql function
-      *
--     * @param \Zend_Db_Expr|string $expressionField   quoted field name or SQL statement
-+     * @param \Zend_Db_Expr|string $expressionField quoted field name or SQL statement
-      * @return \Zend_Db_Expr
-      */
-     public function getStandardDeviationSql($expressionField)
-@@ -3327,7 +3352,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      *
-      * @see INTERVAL_* constants for $unit
-      *
--     * @param \Zend_Db_Expr|string $date   quoted field name or SQL statement
-+     * @param \Zend_Db_Expr|string $date quoted field name or SQL statement
-      * @param string $unit
-      * @return \Zend_Db_Expr
-      * @throws \Zend_Db_Exception
-@@ -3357,9 +3382,9 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-     /**
-      * Build a trigger name based on table name and trigger details
-      *
--     * @param string $tableName  The table which is the subject of the trigger
--     * @param string $time  Either "before" or "after"
--     * @param string $event  The DB level event which activates the trigger, i.e. "update" or "insert"
-+     * @param string $tableName The table which is the subject of the trigger
-+     * @param string $time Either "before" or "after"
-+     * @param string $event The DB level event which activates the trigger, i.e. "update" or "insert"
-      * @return string
-      * @codeCoverageIgnore
-      */
-@@ -3371,10 +3396,11 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Retrieve valid index name
-+     *
-      * Check index name length and allowed symbols
-      *
-      * @param string $tableName
--     * @param string|string[] $fields  the columns list
-+     * @param string|string[] $fields the columns list
-      * @param string $indexType
-      * @return string
-      */
-@@ -3400,6 +3426,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Retrieve valid foreign key name
-+     *
-      * Check foreign key name length and allowed symbols
-      *
-      * @param string $priTableName
-@@ -3451,7 +3478,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-      * Get insert from Select object query
-      *
-      * @param Select $select
--     * @param string $table     insert into table
-+     * @param string $table insert into table
-      * @param array $fields
-      * @param int|false $mode
-      * @return string
-@@ -3668,6 +3695,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Adds order by random to select object
-+     *
-      * Possible using integer field for optimization
-      *
-      * @param Select $select
-@@ -3845,6 +3873,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-     /**
-      * Parse text size
-+     *
-      * Returns max allowed size if value great it
-      *
-      * @param string|int $size
-@@ -3857,13 +3886,13 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
- 
-         switch ($last) {
-             case 'k':
--                $size = intval($size) * 1024;
-+                $size = (int)$size * 1024;
-                 break;
-             case 'm':
--                $size = intval($size) * 1024 * 1024;
-+                $size = (int)$size * 1024 * 1024;
-                 break;
-             case 'g':
--                $size = intval($size) * 1024 * 1024 * 1024;
-+                $size = (int)$size * 1024 * 1024 * 1024;
-                 break;
-         }
- 
-@@ -3874,11 +3903,12 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
-             return Table::MAX_TEXT_SIZE;
-         }
- 
--        return intval($size);
-+        return (int)$size;
-     }
- 
-     /**
-      * Converts fetched blob into raw binary PHP data.
-+     *
-      * The MySQL drivers do it nice, no processing required.
-      *
-      * @param mixed $value
-diff --git a/lib/internal/Magento/Framework/DB/Helper.php b/lib/internal/Magento/Framework/DB/Helper.php
-index 4cb8304cded..4d4eac62978 100644
---- a/lib/internal/Magento/Framework/DB/Helper.php
-+++ b/lib/internal/Magento/Framework/DB/Helper.php
-@@ -8,6 +8,9 @@
- 
- namespace Magento\Framework\DB;
- 
-+/**
-+ * DataBase Helper
-+ */
- class Helper extends \Magento\Framework\DB\Helper\AbstractHelper
- {
-     /**
-@@ -52,7 +55,7 @@ class Helper extends \Magento\Framework\DB\Helper\AbstractHelper
-      * Field can be with 'dot' delimiter.
-      *
-      * @param string $field
--     * @param bool   $reverse OPTIONAL
-+     * @param bool $reverse OPTIONAL
-      * @return string
-      */
-     protected function _truncateAliasName($field, $reverse = false)
-@@ -143,6 +146,7 @@ class Helper extends \Magento\Framework\DB\Helper\AbstractHelper
-     }
- 
-     /**
-+     * Assemble limit
-      *
-      * @param string $query
-      * @param int $limitCount
-@@ -153,12 +157,12 @@ class Helper extends \Magento\Framework\DB\Helper\AbstractHelper
-     protected function _assembleLimit($query, $limitCount, $limitOffset, $columnList = [])
-     {
-         if ($limitCount !== null) {
--            $limitCount = intval($limitCount);
-+            $limitCount = (int)$limitCount;
-             if ($limitCount <= 0) {
-                 //throw new \Exception("LIMIT argument count={$limitCount} is not valid");
-             }
- 
--            $limitOffset = intval($limitOffset);
-+            $limitOffset = (int)$limitOffset;
-             if ($limitOffset < 0) {
-                 //throw new \Exception("LIMIT argument offset={$limitOffset} is not valid");
-             }
-diff --git a/lib/internal/Magento/Framework/DB/Query.php b/lib/internal/Magento/Framework/DB/Query.php
-index 04ac2006b5e..36aab54df39 100644
---- a/lib/internal/Magento/Framework/DB/Query.php
-+++ b/lib/internal/Magento/Framework/DB/Query.php
-@@ -142,7 +142,7 @@ class Query implements QueryInterface
-             $sql = $this->getSelectCountSql();
-             $this->totalRecords = $this->getConnection()->fetchOne($sql, $this->bindParams);
-         }
--        return intval($this->totalRecords);
-+        return (int)$this->totalRecords;
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/DB/Query/BatchIterator.php b/lib/internal/Magento/Framework/DB/Query/BatchIterator.php
-index 7b4406fd9ad..6485973ec35 100644
---- a/lib/internal/Magento/Framework/DB/Query/BatchIterator.php
-+++ b/lib/internal/Magento/Framework/DB/Query/BatchIterator.php
-@@ -88,6 +88,8 @@ class BatchIterator implements BatchIteratorInterface
-     }
- 
-     /**
-+     * Returns current select
-+     *
-      * @return Select
-      */
-     public function current()
-@@ -101,6 +103,8 @@ class BatchIterator implements BatchIteratorInterface
-     }
- 
-     /**
-+     * Returns next select
-+     *
-      * @return Select
-      */
-     public function next()
-@@ -121,6 +125,8 @@ class BatchIterator implements BatchIteratorInterface
-     }
- 
-     /**
-+     * Returns key
-+     *
-      * @return int
-      */
-     public function key()
-@@ -129,6 +135,8 @@ class BatchIterator implements BatchIteratorInterface
-     }
- 
-     /**
-+     * Returns is valid
-+     *
-      * @return bool
-      */
-     public function valid()
-@@ -137,6 +145,8 @@ class BatchIterator implements BatchIteratorInterface
-     }
- 
-     /**
-+     * Rewind
-+     *
-      * @return void
-      */
-     public function rewind()
-@@ -165,7 +175,7 @@ class BatchIterator implements BatchIteratorInterface
-         );
-         $row = $this->connection->fetchRow($wrapperSelect);
-         $this->minValue = $row['max'];
--        return intval($row['cnt']);
-+        return (int)$row['cnt'];
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
-index 5176c85cfa7..e2ef4ae530a 100644
---- a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
-+++ b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
-@@ -201,7 +201,7 @@ class BatchRangeIterator implements BatchIteratorInterface
-             );
-             $row = $this->connection->fetchRow($wrapperSelect);
- 
--            $this->totalItemCount = intval($row['cnt']);
-+            $this->totalItemCount = (int)$row['cnt'];
-         }
- 
-         $rangeField = is_array($this->rangeField) ? $this->rangeField : [$this->rangeField];
-diff --git a/lib/internal/Magento/Framework/DB/Select.php b/lib/internal/Magento/Framework/DB/Select.php
-index 4d178b81af6..273d940babb 100644
---- a/lib/internal/Magento/Framework/DB/Select.php
-+++ b/lib/internal/Magento/Framework/DB/Select.php
-@@ -400,7 +400,7 @@ class Select extends \Zend_Db_Select
-     /**
-      * Render STRAIGHT_JOIN clause
-      *
--     * @param string   $sql SQL query
-+     * @param string $sql SQL query
-      * @return string
-      */
-     protected function _renderStraightjoin($sql)
-@@ -434,7 +434,7 @@ class Select extends \Zend_Db_Select
-             }
-         }
- 
--        return parent::_tableCols($correlationName, $cols, $afterCorrelationName);
-+        parent::_tableCols($correlationName, $cols, $afterCorrelationName);
-     }
- 
-     /**
-@@ -452,7 +452,7 @@ class Select extends \Zend_Db_Select
-     /**
-      * Render FOR UPDATE clause
-      *
--     * @param string   $sql SQL query
-+     * @param string $sql SQL query
-      * @return string
-      */
-     protected function _renderForupdate($sql)
-@@ -467,9 +467,9 @@ class Select extends \Zend_Db_Select
-     /**
-      * Add EXISTS clause
-      *
--     * @param  Select $select
--     * @param  string           $joinCondition
--     * @param   bool            $isExists
-+     * @param Select $select
-+     * @param string $joinCondition
-+     * @param bool $isExists
-      * @return $this
-      */
-     public function exists($select, $joinCondition, $isExists = true)
-@@ -509,11 +509,18 @@ class Select extends \Zend_Db_Select
-     }
- 
-     /**
-+     * Remove links to other objects.
-+     *
-      * @return string[]
-      * @since 100.0.11
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $properties = array_keys(get_object_vars($this));
-         $properties = array_diff(
-             $properties,
-@@ -530,9 +537,14 @@ class Select extends \Zend_Db_Select
-      *
-      * @return void
-      * @since 100.0.11
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         $this->_adapter = $objectManager->get(ResourceConnection::class)->getConnection();
-         $this->selectRenderer = $objectManager->get(\Magento\Framework\DB\Select\SelectRenderer::class);
-diff --git a/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php b/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php
-index 36a075b9af8..dfe9c8949c3 100644
---- a/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php
-+++ b/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php
-@@ -40,12 +40,12 @@ class OrderRenderer implements RendererInterface
-             $order = [];
-             foreach ($select->getPart(Select::ORDER) as $term) {
-                 if (is_array($term)) {
--                    if (is_numeric($term[0]) && strval(intval($term[0])) == $term[0]) {
-+                    if (is_numeric($term[0]) && (string)(int)$term[0] == $term[0]) {
-                         $order[] = (int)trim($term[0]) . ' ' . $term[1];
-                     } else {
-                         $order[] = $this->quote->quoteIdentifier($term[0]) . ' ' . $term[1];
-                     }
--                } elseif (is_numeric($term) && strval(intval($term)) == $term) {
-+                } elseif (is_numeric($term) && (string)(int)$term == $term) {
-                     $order[] = (int)trim($term);
-                 } else {
-                     $order[] = $this->quote->quoteIdentifier($term);
-diff --git a/lib/internal/Magento/Framework/DB/Select/RendererProxy.php b/lib/internal/Magento/Framework/DB/Select/RendererProxy.php
-index 3626f6a07fa..dc69b96b790 100644
---- a/lib/internal/Magento/Framework/DB/Select/RendererProxy.php
-+++ b/lib/internal/Magento/Framework/DB/Select/RendererProxy.php
-@@ -56,10 +56,17 @@ class RendererProxy extends SelectRenderer
-     }
- 
-     /**
-+     * Remove links to other objects.
-+     *
-      * @return array
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return ['_subject', '_isShared'];
-     }
- 
-@@ -67,9 +74,14 @@ class RendererProxy extends SelectRenderer
-      * Retrieve ObjectManager from global scope
-      *
-      * @return void
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $this->_objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-     }
- 
-@@ -99,7 +111,7 @@ class RendererProxy extends SelectRenderer
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function render(\Magento\Framework\DB\Select $select, $sql = '')
-     {
-diff --git a/lib/internal/Magento/Framework/DB/Sql/LimitExpression.php b/lib/internal/Magento/Framework/DB/Sql/LimitExpression.php
-index 9e875e485c6..3c5cb65e898 100644
---- a/lib/internal/Magento/Framework/DB/Sql/LimitExpression.php
-+++ b/lib/internal/Magento/Framework/DB/Sql/LimitExpression.php
-@@ -41,19 +41,19 @@ class LimitExpression extends Expression
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function __toString()
-     {
-         $sql = $this->sql;
--        $count = intval($this->count);
-+        $count = (int)$this->count;
-         if ($count <= 0) {
-             /** @see Zend_Db_Adapter_Exception */
-             #require_once 'Zend/Db/Adapter/Exception.php';
-             throw new \Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid");
-         }
- 
--        $offset = intval($this->offset);
-+        $offset = (int)$this->offset;
-         if ($offset < 0) {
-             /** @see Zend_Db_Adapter_Exception */
-             #require_once 'Zend/Db/Adapter/Exception.php';
-diff --git a/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php b/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php
-index 3ce78177d87..f1d093b7dea 100644
---- a/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php
-+++ b/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php
-@@ -22,18 +22,25 @@ class UnionExpression extends Expression
-      */
-     protected $type;
- 
-+    /**
-+     * @var string
-+     */
-+    protected $pattern;
-+
-     /**
-      * @param Select[] $parts
--     * @param string $type
-+     * @param string $type (optional)
-+     * @param string $pattern (optional)
-      */
--    public function __construct(array $parts, $type = Select::SQL_UNION)
-+    public function __construct(array $parts, $type = Select::SQL_UNION, $pattern = '')
-     {
-         $this->parts = $parts;
-         $this->type = $type;
-+        $this->pattern = $pattern;
-     }
- 
-     /**
--     * @return string
-+     * @inheritdoc
-      */
-     public function __toString()
-     {
-@@ -45,6 +52,10 @@ class UnionExpression extends Expression
-                 $parts[] = $part;
-             }
-         }
--        return implode($parts, $this->type);
-+        $sql = implode($parts, $this->type);
-+        if ($this->pattern) {
-+            return sprintf($this->pattern, $sql);
-+        }
-+        return $sql;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
-index 7b8314a76f3..d24bc5fef6e 100644
---- a/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
-+++ b/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
-@@ -3,21 +3,20 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+namespace Magento\Framework\DB\Statement\Pdo;
-+
-+use Magento\Framework\DB\Statement\Parameter;
- 
- /**
-  * Mysql DB Statement
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
--namespace Magento\Framework\DB\Statement\Pdo;
--
--use Magento\Framework\DB\Statement\Parameter;
--
- class Mysql extends \Zend_Db_Statement_Pdo
- {
-+
-     /**
--     * Executes statement with binding values to it.
--     * Allows transferring specific options to DB driver.
-+     * Executes statement with binding values to it. Allows transferring specific options to DB driver.
-      *
-      * @param array $params Array of values to bind to parameter placeholders.
-      * @return bool
-@@ -61,11 +60,9 @@ class Mysql extends \Zend_Db_Statement_Pdo
-             $statement->bindParam($paramName, $bindValues[$name], $dataType, $length, $driverOptions);
-         }
- 
--        try {
-+        return $this->tryExecute(function () use ($statement) {
-             return $statement->execute();
--        } catch (\PDOException $e) {
--            throw new \Zend_Db_Statement_Exception($e->getMessage(), (int)$e->getCode(), $e);
--        }
-+        });
-     }
- 
-     /**
-@@ -90,7 +87,29 @@ class Mysql extends \Zend_Db_Statement_Pdo
-         if ($specialExecute) {
-             return $this->_executeWithBinding($params);
-         } else {
--            return parent::_execute($params);
-+            return $this->tryExecute(function () use ($params) {
-+                return $params !== null ? $this->_stmt->execute($params) : $this->_stmt->execute();
-+            });
-+        }
-+    }
-+
-+    /**
-+     * Executes query and avoid warnings.
-+     *
-+     * @param callable $callback
-+     * @return bool
-+     * @throws \Zend_Db_Statement_Exception
-+     */
-+    private function tryExecute($callback)
-+    {
-+        $previousLevel = error_reporting(\E_ERROR); // disable warnings for PDO bugs #63812, #74401
-+        try {
-+            return $callback();
-+        } catch (\PDOException $e) {
-+            $message = sprintf('%s, query was: %s', $e->getMessage(), $this->_stmt->queryString);
-+            throw new \Zend_Db_Statement_Exception($message, (int)$e->getCode(), $e);
-+        } finally {
-+            error_reporting($previousLevel);
-         }
-     }
- }
-diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
-index 0ca9f6846f7..98fcdc626a9 100644
---- a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
-+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
-@@ -315,7 +315,7 @@ class MysqlTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * Test successfull nested transaction
-+     * Test successful nested transaction
-      */
-     public function testNestedTransactionCommitSuccess()
-     {
-@@ -337,7 +337,7 @@ class MysqlTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * Test successfull nested transaction
-+     * Test successful nested transaction
-      */
-     public function testNestedTransactionRollBackSuccess()
-     {
-@@ -359,7 +359,7 @@ class MysqlTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * Test successfull nested transaction
-+     * Test successful nested transaction
-      */
-     public function testNestedTransactionLastRollBack()
-     {
-diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php
-new file mode 100644
-index 00000000000..714dfe6bb10
---- /dev/null
-+++ b/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php
-@@ -0,0 +1,154 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Framework\DB\Test\Unit\DB\Statement;
-+
-+use Magento\Framework\DB\Statement\Parameter;
-+use Magento\Framework\DB\Statement\Pdo\Mysql;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class MysqlTest extends TestCase
-+{
-+    /**
-+     * @var \Zend_Db_Adapter_Abstract|MockObject
-+     */
-+    private $adapterMock;
-+
-+    /**
-+     * @var \PDO|MockObject
-+     */
-+    private $pdoMock;
-+
-+    /**
-+     * @var \Zend_Db_Profiler|MockObject
-+     */
-+    private $zendDbProfilerMock;
-+
-+    /**
-+     * @var \PDOStatement|MockObject
-+     */
-+    private $pdoStatementMock;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setUp()
-+    {
-+        $this->adapterMock = $this->getMockForAbstractClass(
-+            \Zend_Db_Adapter_Abstract::class,
-+            [],
-+            '',
-+            false,
-+            true,
-+            true,
-+            ['getConnection', 'getProfiler']
-+        );
-+        $this->pdoMock = $this->createMock(\PDO::class);
-+        $this->adapterMock->expects($this->once())
-+            ->method('getConnection')
-+            ->willReturn($this->pdoMock);
-+        $this->zendDbProfilerMock = $this->createMock(\Zend_Db_Profiler::class);
-+        $this->adapterMock->expects($this->once())
-+            ->method('getProfiler')
-+            ->willReturn($this->zendDbProfilerMock);
-+        $this->pdoStatementMock = $this->createMock(\PDOStatement::class);
-+    }
-+
-+    public function testExecuteWithoutParams()
-+    {
-+        $query = 'SET @a=1;';
-+        $this->pdoMock->expects($this->once())
-+            ->method('prepare')
-+            ->with($query)
-+            ->willReturn($this->pdoStatementMock);
-+        $this->pdoStatementMock->expects($this->once())
-+            ->method('execute');
-+        (new Mysql($this->adapterMock, $query))->_execute();
-+    }
-+
-+    public function testExecuteWhenThrowPDOException()
-+    {
-+        $this->expectException(\Zend_Db_Statement_Exception::class);
-+        $this->expectExceptionMessage('test message, query was:');
-+        $errorReporting = error_reporting();
-+        $query = 'SET @a=1;';
-+        $this->pdoMock->expects($this->once())
-+            ->method('prepare')
-+            ->with($query)
-+            ->willReturn($this->pdoStatementMock);
-+        $this->pdoStatementMock->expects($this->once())
-+            ->method('execute')
-+            ->willThrowException(new \PDOException('test message'));
-+
-+        $this->assertEquals($errorReporting, error_reporting(), 'Error report level was\'t restored');
-+
-+        (new Mysql($this->adapterMock, $query))->_execute();
-+    }
-+
-+    public function testExecuteWhenParamsAsPrimitives()
-+    {
-+        $params = [':param1' => 'value1', ':param2' => 'value2'];
-+        $query = 'UPDATE `some_table1` SET `col1`=\'val1\' WHERE `param1`=\':param1\' AND `param2`=\':param2\';';
-+        $this->pdoMock->expects($this->once())
-+            ->method('prepare')
-+            ->with($query)
-+            ->willReturn($this->pdoStatementMock);
-+        $this->pdoStatementMock->expects($this->never())
-+            ->method('bindParam');
-+        $this->pdoStatementMock->expects($this->once())
-+            ->method('execute')
-+            ->with($params);
-+
-+        (new Mysql($this->adapterMock, $query))->_execute($params);
-+    }
-+
-+    public function testExecuteWhenParamsAsParameterObject()
-+    {
-+        $param1 = $this->createMock(Parameter::class);
-+        $param1Value = 'SomeValue';
-+        $param1DataType = 'dataType';
-+        $param1Length = '9';
-+        $param1DriverOptions = 'some driver options';
-+        $param1->expects($this->once())
-+            ->method('getIsBlob')
-+            ->willReturn(false);
-+        $param1->expects($this->once())
-+            ->method('getDataType')
-+            ->willReturn($param1DataType);
-+        $param1->expects($this->once())
-+            ->method('getLength')
-+            ->willReturn($param1Length);
-+        $param1->expects($this->once())
-+            ->method('getDriverOptions')
-+            ->willReturn($param1DriverOptions);
-+        $param1->expects($this->once())
-+            ->method('getValue')
-+            ->willReturn($param1Value);
-+        $params = [
-+            ':param1' => $param1,
-+            ':param2' => 'value2',
-+        ];
-+        $query = 'UPDATE `some_table1` SET `col1`=\'val1\' WHERE `param1`=\':param1\' AND `param2`=\':param2\';';
-+        $this->pdoMock->expects($this->once())
-+            ->method('prepare')
-+            ->with($query)
-+            ->willReturn($this->pdoStatementMock);
-+        $this->pdoStatementMock->expects($this->exactly(2))
-+            ->method('bindParam')
-+            ->withConsecutive(
-+                [':param1', $param1Value, $param1DataType, $param1Length, $param1DriverOptions],
-+                [':param2', 'value2', \PDO::PARAM_STR, null, null]
-+            );
-+        $this->pdoStatementMock->expects($this->once())
-+            ->method('execute');
-+
-+        (new Mysql($this->adapterMock, $query))->_execute($params);
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php
-index 2be211a6c3d..47772d32b6b 100644
---- a/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php
-+++ b/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php
-@@ -97,7 +97,7 @@ class SelectTest extends \PHPUnit\Framework\TestCase
-      *
-      * @param int $callCount
-      * @param string|null $returnValue
--     * @return \Magento\Framework\DB\Adapter\Pdo\Mysql|PHPUnit_Framework_MockObject_MockObject
-+     * @return \Magento\Framework\DB\Adapter\Pdo\Mysql|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected function _getConnectionMockWithMockedQuote($callCount, $returnValue = null)
-     {
-diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php
-deleted file mode 100644
-index 93abeae644f..00000000000
---- a/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php
-+++ /dev/null
-@@ -1,116 +0,0 @@
--<?php
--/**
-- * \Magento\Framework\DB\Tree\Node test case
-- *
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Framework\DB\Test\Unit\Tree;
--
--class NodeTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @param array $data
--     * @param $expectedException
--     * @param $expectedExceptionMessage
--     * @dataProvider constructorDataProvider
--     */
--    public function testConstructorWithInvalidArgumentsThrowsException(
--        array $data,
--        $expectedException,
--        $expectedExceptionMessage
--    ) {
--        $this->expectException($expectedException);
--        $this->expectExceptionMessage($expectedExceptionMessage);
--        new \Magento\Framework\DB\Tree\Node($data['node_data'], $data['keys']);
--    }
--
--    /**
--     * @param array $data
--     * @param string $assertMethod
--     * @dataProvider isParentDataProvider
--     */
--    public function testIsParent(array $data, $assertMethod)
--    {
--        $model = new \Magento\Framework\DB\Tree\Node($data['node_data'], $data['keys']);
--        $this->$assertMethod($model->isParent());
--    }
--
--    /**
--     * @return array
--     */
--    public function isParentDataProvider()
--    {
--        return [
--            [
--                [
--                    'node_data' => [
--                        'id' => 'id',
--                        'pid' => 'pid',
--                        'level' => 'level',
--                        'right_key' => 10,
--                        'left_key' => 5,
--                    ],
--                    'keys' => [
--                        'id' => 'id',
--                        'pid' => 'pid',
--                        'level' => 'level',
--                        'right' => 'right_key',
--                        'left' => 'left_key',
--                    ],
--                ],
--                'assertTrue',
--            ],
--            [
--                [
--                    'node_data' => [
--                        'id' => 'id',
--                        'pid' => 'pid',
--                        'level' => 'level',
--                        'right_key' => 5,
--                        'left_key' => 10,
--                    ],
--                    'keys' => [
--                        'id' => 'id',
--                        'pid' => 'pid',
--                        'level' => 'level',
--                        'right' => 'right_key',
--                        'left' => 'left_key',
--                    ],
--                ],
--                'assertFalse'
--            ]
--        ];
--    }
--
--    /**
--     * @return array
--     */
--    public function constructorDataProvider()
--    {
--        return [
--            [
--                [
--                    'node_data' => null,
--                    'keys' => null,
--                ], \Magento\Framework\Exception\LocalizedException::class,
--                'The node information is empty. Enter the information and try again.',
--            ],
--            [
--                [
--                    'node_data' => null,
--                    'keys' => true,
--                ], \Magento\Framework\Exception\LocalizedException::class,
--                'The node information is empty. Enter the information and try again.'
--            ],
--            [
--                [
--                    'node_data' => true,
--                    'keys' => null,
--                ], \Magento\Framework\Exception\LocalizedException::class,
--                'The encryption key can\'t be empty. Enter the key and try again.'
--            ]
--        ];
--    }
--}
-diff --git a/lib/internal/Magento/Framework/DB/Transaction.php b/lib/internal/Magento/Framework/DB/Transaction.php
-index e5c4741dd0d..8d3fc8fff9f 100644
---- a/lib/internal/Magento/Framework/DB/Transaction.php
-+++ b/lib/internal/Magento/Framework/DB/Transaction.php
-@@ -1,13 +1,13 @@
- <?php
- /**
-- * DB transaction model
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Framework\DB;
- 
- /**
-+ * DB transaction model
-+ *
-  * @todo need collect connection by name
-  */
- class Transaction
-@@ -104,7 +104,7 @@ class Transaction
-     /**
-      * Add callback function which will be called before commit transactions
-      *
--     * @param callback $callback
-+     * @param callable $callback
-      * @return $this
-      */
-     public function addCommitCallback($callback)
-diff --git a/lib/internal/Magento/Framework/DB/Tree.php b/lib/internal/Magento/Framework/DB/Tree.php
-index a162640e5aa..1aeaf122131 100644
---- a/lib/internal/Magento/Framework/DB/Tree.php
-+++ b/lib/internal/Magento/Framework/DB/Tree.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Framework\DB;
- 
-@@ -15,6 +16,9 @@ use Magento\Framework\Phrase;
-  * Magento Library
-  *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * phpcs:ignoreFile
-+ *
-+ * @deprecated Not used anymore.
-  */
- class Tree
- {
-@@ -77,6 +81,8 @@ class Tree
-      * @throws LocalizedException
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function __construct($config = [])
-     {
-@@ -149,6 +155,8 @@ class Tree
-      *
-      * @param string $name
-      * @return $this
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function setIdField($name)
-     {
-@@ -161,6 +169,8 @@ class Tree
-      *
-      * @param string $name
-      * @return $this
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function setLeftField($name)
-     {
-@@ -173,6 +183,8 @@ class Tree
-      *
-      * @param string $name
-      * @return $this
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function setRightField($name)
-     {
-@@ -185,6 +197,8 @@ class Tree
-      *
-      * @param string $name
-      * @return $this
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function setLevelField($name)
-     {
-@@ -197,6 +211,8 @@ class Tree
-      *
-      * @param string $name
-      * @return $this
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function setPidField($name)
-     {
-@@ -209,6 +225,8 @@ class Tree
-      *
-      * @param string $name
-      * @return $this
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function setTable($name)
-     {
-@@ -218,6 +236,8 @@ class Tree
- 
-     /**
-      * @return array
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function getKeys()
-     {
-@@ -235,6 +255,8 @@ class Tree
-      *
-      * @param array $data
-      * @return string
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function clear($data = [])
-     {
-@@ -260,6 +282,8 @@ class Tree
-      *
-      * @param string|int $nodeId
-      * @return array
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function getNodeInfo($nodeId)
-     {
-@@ -278,7 +302,8 @@ class Tree
-      * @param string|int $nodeId
-      * @param array $data
-      * @return false|string
--     * @SuppressWarnings(PHPMD.ExitExpression)
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function appendChild($nodeId, $data)
-     {
-@@ -345,6 +370,8 @@ class Tree
- 
-     /**
-      * @return array
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function checkNodes()
-     {
-@@ -375,6 +402,8 @@ class Tree
-     /**
-      * @param string|int $nodeId
-      * @return bool|Node|void
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function removeNode($nodeId)
-     {
-@@ -449,7 +478,8 @@ class Tree
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
--     * @SuppressWarnings(PHPMD.ExitExpression)
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function moveNode($eId, $pId, $aId = 0)
-     {
-@@ -784,7 +814,8 @@ class Tree
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
--     * @SuppressWarnings(PHPMD.ExitExpression)
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function moveNodes($eId, $pId, $aId = 0)
-     {
-@@ -983,6 +1014,8 @@ class Tree
-      * @param string $joinCondition
-      * @param string $fields
-      * @return void
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function addTable($tableName, $joinCondition, $fields = '*')
-     {
-@@ -992,6 +1025,8 @@ class Tree
-     /**
-      * @param Select $select
-      * @return void
-+     *
-+     * @deprecated Not used anymore.
-      */
-     protected function _addExtTablesToSelect(Select &$select)
-     {
-@@ -1005,7 +1040,8 @@ class Tree
-      * @param int $startLevel
-      * @param int $endLevel
-      * @return NodeSet
--     * @SuppressWarnings(PHPMD.ExitExpression)
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function getChildren($nodeId, $startLevel = 0, $endLevel = 0)
-     {
-@@ -1051,6 +1087,8 @@ class Tree
-     /**
-      * @param string|int $nodeId
-      * @return Node
-+     *
-+     * @deprecated Not used anymore.
-      */
-     public function getNode($nodeId)
-     {
-diff --git a/lib/internal/Magento/Framework/DB/Tree/Node.php b/lib/internal/Magento/Framework/DB/Tree/Node.php
-index 8088718be5e..eb954a696e2 100644
---- a/lib/internal/Magento/Framework/DB/Tree/Node.php
-+++ b/lib/internal/Magento/Framework/DB/Tree/Node.php
-@@ -10,6 +10,8 @@ use Magento\Framework\Exception\LocalizedException;
- 
- /**
-  * @SuppressWarnings(PHPMD.UnusedPrivateField)
-+ *
-+ * @deprecated Not used anymore.
-  */
- class Node
- {
-@@ -50,11 +52,15 @@ class Node
- 
-     /**
-      * @var bool
-+     *
-+     * @deprecated
-      */
-     public $hasChild = false;
- 
-     /**
-      * @var float|int
-+     *
-+     * @deprecated
-      */
-     public $numChild = 0;
- 
-@@ -62,6 +68,8 @@ class Node
-      * @param array $nodeData
-      * @param array $keys
-      * @throws LocalizedException
-+     *
-+     * @deprecated
-      */
-     public function __construct($nodeData, $keys)
-     {
-@@ -94,6 +102,8 @@ class Node
-     /**
-      * @param string $name
-      * @return null|array
-+     *
-+     * @deprecated
-      */
-     public function getData($name)
-     {
-@@ -106,6 +116,8 @@ class Node
- 
-     /**
-      * @return int
-+     *
-+     * @deprecated
-      */
-     public function getLevel()
-     {
-@@ -114,6 +126,8 @@ class Node
- 
-     /**
-      * @return int
-+     *
-+     * @deprecated
-      */
-     public function getLeft()
-     {
-@@ -122,6 +136,8 @@ class Node
- 
-     /**
-      * @return int
-+     *
-+     * @deprecated
-      */
-     public function getRight()
-     {
-@@ -130,6 +146,8 @@ class Node
- 
-     /**
-      * @return string|int
-+     *
-+     * @deprecated
-      */
-     public function getPid()
-     {
-@@ -138,6 +156,8 @@ class Node
- 
-     /**
-      * @return string|int
-+     *
-+     * @deprecated
-      */
-     public function getId()
-     {
-@@ -148,6 +168,8 @@ class Node
-      * Return true if node has child
-      *
-      * @return bool
-+     *
-+     * @deprecated
-      */
-     public function isParent()
-     {
-diff --git a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
-index 46a2497a834..75e677b77ae 100644
---- a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
-+++ b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
-@@ -8,6 +8,7 @@ namespace Magento\Framework\DB\Tree;
- /**
-  * TODO implements iterators
-  *
-+ * @deprecated Not used anymore.
-  */
- class NodeSet implements \Iterator, \Countable
- {
-@@ -33,6 +34,8 @@ class NodeSet implements \Iterator, \Countable
- 
-     /**
-      * Constructor
-+     *
-+     * @deprecated
-      */
-     public function __construct()
-     {
-@@ -45,6 +48,8 @@ class NodeSet implements \Iterator, \Countable
-     /**
-      * @param Node $node
-      * @return int
-+     *
-+     * @deprecated
-      */
-     public function addNode(Node $node)
-     {
-@@ -55,6 +60,8 @@ class NodeSet implements \Iterator, \Countable
- 
-     /**
-      * @return int
-+     *
-+     * @deprecated
-      */
-     public function count()
-     {
-@@ -63,6 +70,8 @@ class NodeSet implements \Iterator, \Countable
- 
-     /**
-      * @return bool
-+     *
-+     * @deprecated
-      */
-     public function valid()
-     {
-@@ -71,6 +80,8 @@ class NodeSet implements \Iterator, \Countable
- 
-     /**
-      * @return false|int
-+     *
-+     * @deprecated
-      */
-     public function next()
-     {
-@@ -83,6 +94,8 @@ class NodeSet implements \Iterator, \Countable
- 
-     /**
-      * @return int
-+     *
-+     * @deprecated
-      */
-     public function key()
-     {
-@@ -91,6 +104,8 @@ class NodeSet implements \Iterator, \Countable
- 
-     /**
-      * @return Node
-+     *
-+     * @deprecated
-      */
-     public function current()
-     {
-@@ -99,6 +114,8 @@ class NodeSet implements \Iterator, \Countable
- 
-     /**
-      * @return void
-+     *
-+     * @deprecated
-      */
-     public function rewind()
-     {
-diff --git a/lib/internal/Magento/Framework/Data/AbstractSearchCriteriaBuilder.php b/lib/internal/Magento/Framework/Data/AbstractSearchCriteriaBuilder.php
-index a3bf4d52a13..867bf3b0178 100644
---- a/lib/internal/Magento/Framework/Data/AbstractSearchCriteriaBuilder.php
-+++ b/lib/internal/Magento/Framework/Data/AbstractSearchCriteriaBuilder.php
-@@ -9,6 +9,7 @@ use Psr\Log\LoggerInterface as Logger;
- 
- /**
-  * Class AbstractSearchCriteriaBuilder
-+ *
-  * @package Magento\Framework\Data
-  */
- abstract class AbstractSearchCriteriaBuilder
-@@ -23,9 +24,14 @@ abstract class AbstractSearchCriteriaBuilder
-      */
-     protected $resultObjectInterface;
- 
-+    /**
-+     * @var Logger
-+     */
-+    private $logger;
-+
-     /**
-      * @param Logger $logger
--     * @param ObjectFactory $objectFactory,
-+     * @param ObjectFactory $objectFactory
-      */
-     public function __construct(
-         Logger $logger,
-@@ -37,11 +43,15 @@ abstract class AbstractSearchCriteriaBuilder
-     }
- 
-     /**
-+     * Initialization
-+     *
-      * @return string
-      */
-     abstract protected function init();
- 
-     /**
-+     * Retrieve interface for result
-+     *
-      * @return string
-      */
-     protected function getResultObjectInterface()
-@@ -50,6 +60,8 @@ abstract class AbstractSearchCriteriaBuilder
-     }
- 
-     /**
-+     * Create result object
-+     *
-      * @return SearchResultInterface
-      */
-     public function make()
-diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/ArrayType.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/ArrayType.php
-index b6426a8d263..9a881ccf515 100644
---- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/ArrayType.php
-+++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/ArrayType.php
-@@ -28,7 +28,7 @@ class ArrayType implements InterpreterInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @return array
-      * @throws \InvalidArgumentException
-      */
-@@ -90,11 +90,11 @@ class ArrayType implements InterpreterInterface
-         $firstValue = 0;
-         $secondValue = 0;
-         if (isset($firstItem['sortOrder'])) {
--            $firstValue = intval($firstItem['sortOrder']);
-+            $firstValue = (int)$firstItem['sortOrder'];
-         }
- 
-         if (isset($secondItem['sortOrder'])) {
--            $secondValue = intval($secondItem['sortOrder']);
-+            $secondValue = (int)$secondItem['sortOrder'];
-         }
- 
-         if ($firstValue == $secondValue) {
-diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
-index 71ec8c1aa83..2f3aaad98df 100644
---- a/lib/internal/Magento/Framework/Data/Collection.php
-+++ b/lib/internal/Magento/Framework/Data/Collection.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\Data;
- 
- use Magento\Framework\Data\Collection\EntityFactoryInterface;
-@@ -285,7 +286,7 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-         if ($this->_totalRecords === null) {
-             $this->_totalRecords = count($this->getItems());
-         }
--        return intval($this->_totalRecords);
-+        return (int)$this->_totalRecords;
-     }
- 
-     /**
-@@ -391,7 +392,7 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     /**
-      * Adding item to item array
-      *
--     * @param   \Magento\Framework\DataObject $item
-+     * @param \Magento\Framework\DataObject $item
-      * @return $this
-      * @throws \Exception
-      */
-@@ -401,6 +402,7 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
- 
-         if ($itemId !== null) {
-             if (isset($this->_items[$itemId])) {
-+                //phpcs:ignore Magento2.Exceptions.DirectThrow
-                 throw new \Exception(
-                     'Item (' . get_class($item) . ') with the same ID "' . $item->getId() . '" already exists.'
-                 );
-@@ -452,7 +454,7 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     /**
-      * Remove item from collection by item key
-      *
--     * @param   mixed $key
-+     * @param mixed $key
-      * @return $this
-      */
-     public function removeItemByKey($key)
-@@ -483,12 +485,12 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     {
-         $this->_setIsLoaded(false);
-         $this->_items = [];
-+        $this->_totalRecords = null;
-         return $this;
-     }
- 
-     /**
--     * Walk through the collection and run model method or external callback
--     * with optional arguments
-+     * Walk through the collection and run model method or external callback with optional arguments
-      *
-      * Returns array with results of callback for each item
-      *
-@@ -540,8 +542,8 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     /**
-      * Setting data for all collection items
-      *
--     * @param   mixed $key
--     * @param   mixed $value
-+     * @param mixed $key
-+     * @param mixed $value
-      * @return $this
-      */
-     public function setDataToAll($key, $value = null)
-@@ -561,7 +563,7 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     /**
-      * Set current page
-      *
--     * @param   int $page
-+     * @param int $page
-      * @return $this
-      */
-     public function setCurPage($page)
-@@ -573,7 +575,7 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     /**
-      * Set collection page size
-      *
--     * @param   int $size
-+     * @param int $size
-      * @return $this
-      */
-     public function setPageSize($size)
-@@ -585,8 +587,8 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     /**
-      * Set select order
-      *
--     * @param   string $field
--     * @param   string $direction
-+     * @param string $field
-+     * @param string $direction
-      * @return $this
-      */
-     public function setOrder($field, $direction = self::SORT_ORDER_DESC)
-@@ -598,7 +600,7 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     /**
-      * Set collection item class name
-      *
--     * @param  string $className
-+     * @param string $className
-      * @return $this
-      * @throws \InvalidArgumentException
-      */
-@@ -743,7 +745,7 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     /**
-      * Convert items array to array for select options
-      *
--     * return items array
-+     * Return items array
-      * array(
-      *      $index => array(
-      *          'value' => mixed
-@@ -772,6 +774,8 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     }
- 
-     /**
-+     * Returns option array
-+     *
-      * @return array
-      */
-     public function toOptionArray()
-@@ -780,6 +784,8 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     }
- 
-     /**
-+     * Returns options hash
-+     *
-      * @return array
-      */
-     public function toOptionHash()
-@@ -790,12 +796,12 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     /**
-      * Convert items array to hash for select options
-      *
--     * return items hash
-+     * Return items hash
-      * array($value => $label)
-      *
--     * @param   string $valueField
--     * @param   string $labelField
--     * @return  array
-+     * @param string $valueField
-+     * @param string $labelField
-+     * @return array
-      */
-     protected function _toOptionHash($valueField = 'id', $labelField = 'name')
-     {
-@@ -809,8 +815,8 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     /**
-      * Retrieve item by id
-      *
--     * @param   mixed $idValue
--     * @return  \Magento\Framework\DataObject
-+     * @param mixed $idValue
-+     * @return \Magento\Framework\DataObject
-      */
-     public function getItemById($idValue)
-     {
-@@ -879,11 +885,18 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-     }
- 
-     /**
-+     * Sleep handler
-+     *
-      * @return string[]
-      * @since 100.0.11
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $properties = array_keys(get_object_vars($this));
-         $properties = array_diff(
-             $properties,
-@@ -899,9 +912,14 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
-      *
-      * @return void
-      * @since 100.0.11
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         $this->_entityFactory = $objectManager->get(EntityFactoryInterface::class);
-     }
-diff --git a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
-index 63ba6824e5a..6082c2c6c52 100644
---- a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
-+++ b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
-@@ -16,6 +16,7 @@ use Psr\Log\LoggerInterface as Logger;
- /**
-  * Base items collection class
-  *
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
-@@ -217,9 +218,9 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
-     {
-         if ($this->_totalRecords === null) {
-             $sql = $this->getSelectCountSql();
--            $this->_totalRecords = $this->getConnection()->fetchOne($sql, $this->_bindParams);
-+            $this->_totalRecords = $this->_totalRecords ?? $this->getConnection()->fetchOne($sql, $this->_bindParams);
-         }
--        return intval($this->_totalRecords);
-+        return (int)$this->_totalRecords;
-     }
- 
-     /**
-@@ -276,7 +277,7 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * self::setOrder() alias
-+     * Sets order and direction.
-      *
-      * @param string $field
-      * @param string $direction
-@@ -365,11 +366,14 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
- 
-     /**
-      * Hook for operations before rendering filters
-+     *
-      * @return void
-+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
-      */
-     protected function _renderFiltersBefore()
-     {
-     }
-+    // phpcs:enable
- 
-     /**
-      * Add field filter to collection
-@@ -602,6 +606,7 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
-+     * Returns an items collection.
-      * Returns a collection item that corresponds to the fetched row
-      * and moves the internal data pointer ahead
-      *
-@@ -728,6 +733,7 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
-     public function printLogQuery($printQuery = false, $logQuery = false, $sql = null)
-     {
-         if ($printQuery || $this->getFlag('print_query')) {
-+            // phpcs:ignore Magento2.Security.LanguageConstruct
-             echo $sql === null ? $this->getSelect()->__toString() : $sql;
-         }
- 
-@@ -820,11 +826,13 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
-      * Init select
-      *
-      * @return void
-+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
-      */
-     protected function _initSelect()
-     {
-         // no implementation, should be overridden in children classes
-     }
-+    // phpcs:enable
- 
-     /**
-      * Join extension attribute.
-@@ -888,9 +896,14 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
-     /**
-      * @inheritdoc
-      * @since 100.0.11
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return array_diff(
-             parent::__sleep(),
-             ['_fetchStrategy', '_logger', '_conn', 'extensionAttributesJoinProcessor']
-@@ -900,9 +913,14 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
-     /**
-      * @inheritdoc
-      * @since 100.0.11
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
-         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         $this->_logger = $objectManager->get(Logger::class);
-diff --git a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
-index 330ff4e975e..629b992b32c 100644
---- a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
-+++ b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Data\Collection;
- 
- use Magento\Framework\Data\Collection;
-@@ -27,63 +29,63 @@ use Magento\Framework\Data\Collection;
- class Filesystem extends \Magento\Framework\Data\Collection
- {
-     /**
--     * Target directory
-+     * Target directory.
-      *
-      * @var string
-      */
-     protected $_targetDirs = [];
- 
-     /**
--     * Whether to collect files
-+     * Whether to collect files.
-      *
-      * @var bool
-      */
-     protected $_collectFiles = true;
- 
-     /**
--     * Whether to collect directories before files
-+     * Whether to collect directories before files.
-      *
-      * @var bool
-      */
-     protected $_dirsFirst = true;
- 
-     /**
--     * Whether to collect recursively
-+     * Whether to collect recursively.
-      *
-      * @var bool
-      */
-     protected $_collectRecursively = true;
- 
-     /**
--     * Whether to collect dirs
-+     * Whether to collect dirs.
-      *
-      * @var bool
-      */
-     protected $_collectDirs = false;
- 
-     /**
--     * \Directory names regex pre-filter
-+     * \Directory names regex pre-filter.
-      *
-      * @var string
-      */
-     protected $_allowedDirsMask = '/^[a-z0-9\.\-\_]+$/i';
- 
-     /**
--     * Filenames regex pre-filter
-+     * Filenames regex pre-filter.
-      *
-      * @var string
-      */
-     protected $_allowedFilesMask = '/^[a-z0-9\.\-\_]+\.[a-z0-9]+$/i';
- 
-     /**
--     * Disallowed filenames regex pre-filter match for better versatility
-+     * Disallowed filenames regex pre-filter match for better versatility.
-      *
-      * @var string
-      */
-     protected $_disallowedFilesMask = '';
- 
-     /**
--     * Filter rendering helper variable
-+     * Filter rendering helper variable.
-      *
-      * @var int
-      * @see Collection::$_filter
-@@ -92,7 +94,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     private $_filterIncrement = 0;
- 
-     /**
--     * Filter rendering helper variable
-+     * Filter rendering helper variable.
-      *
-      * @var array
-      * @see Collection::$_filter
-@@ -101,7 +103,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     private $_filterBrackets = [];
- 
-     /**
--     * Filter rendering helper variable
-+     * Filter rendering helper variable.
-      *
-      * @var string
-      * @see Collection::$_filter
-@@ -110,22 +112,21 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     private $_filterEvalRendered = '';
- 
-     /**
--     * Collecting items helper variable
-+     * Collecting items helper variable.
-      *
-      * @var array
-      */
-     protected $_collectedDirs = [];
- 
-     /**
--     * Collecting items helper variable
-+     * Collecting items helper variable.
-      *
-      * @var array
-      */
-     protected $_collectedFiles = [];
- 
-     /**
--     * Allowed dirs mask setter
--     * Set empty to not filter
-+     * Allowed dirs mask setter. Set empty to not filter.
-      *
-      * @param string $regex
-      * @return $this
-@@ -137,8 +138,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Allowed files mask setter
--     * Set empty to not filter
-+     * Allowed files mask setter. Set empty to not filter.
-      *
-      * @param string $regex
-      * @return $this
-@@ -150,8 +150,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Disallowed files mask setter
--     * Set empty value to not use this filter
-+     * Disallowed files mask setter. Set empty value to not use this filter.
-      *
-      * @param string $regex
-      * @return $this
-@@ -163,7 +162,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Set whether to collect dirs
-+     * Set whether to collect dirs.
-      *
-      * @param bool $value
-      * @return $this
-@@ -175,7 +174,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Set whether to collect files
-+     * Set whether to collect files.
-      *
-      * @param bool $value
-      * @return $this
-@@ -187,7 +186,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Set whether to collect recursively
-+     * Set whether to collect recursively.
-      *
-      * @param bool $value
-      * @return $this
-@@ -199,7 +198,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Target directory setter. Adds directory to be scanned
-+     * Target directory setter. Adds directory to be scanned.
-      *
-      * @param string $value
-      * @return $this
-@@ -209,6 +208,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     {
-         $value = (string)$value;
-         if (!is_dir($value)) {
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception('Unable to set target directory.');
-         }
-         $this->_targetDirs[$value] = $value;
-@@ -216,8 +216,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Set whether to collect directories before files
--     * Works *before* sorting.
-+     * Set whether to collect directories before files. Works *before* sorting.
-      *
-      * @param bool $value
-      * @return $this
-@@ -229,7 +228,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Get files from specified directory recursively (if needed)
-+     * Get files from specified directory recursively (if needed).
-      *
-      * @param string|array $dir
-      * @return void
-@@ -281,7 +280,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Lauch data collecting
-+     * Launch data collecting.
-      *
-      * @param bool $printQuery
-      * @param bool $logQuery
-@@ -295,6 +294,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-             return $this;
-         }
-         if (empty($this->_targetDirs)) {
-+            // phpcs:disable Magento2.Exceptions.DirectThrow
-             throw new \Exception('Please specify at least one target directory.');
-         }
- 
-@@ -364,25 +364,22 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Callback for sorting items
--     * Currently supports only sorting by one column
-+     * Callback for sorting items. Currently supports only sorting by one column.
-      *
-      * @param array $a
-      * @param array $b
--     * @return int|void
-+     * @return int
-      */
-     protected function _usort($a, $b)
-     {
-         foreach ($this->_orders as $key => $direction) {
-             $result = $a[$key] > $b[$key] ? 1 : ($a[$key] < $b[$key] ? -1 : 0);
-             return self::SORT_ORDER_ASC === strtoupper($direction) ? $result : -$result;
--            break;
-         }
-     }
- 
-     /**
--     * Set select order
--     * Currently supports only sorting by one column
-+     * Set select order. Currently supports only sorting by one column.
-      *
-      * @param   string $field
-      * @param   string $direction
-@@ -395,7 +392,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Generate item row basing on the filename
-+     * Generate item row basing on the filename.
-      *
-      * @param string $filename
-      * @return array
-@@ -415,7 +412,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-      * @param string $field
-      * @param mixed $value
-      * @param string $type 'and'|'or'
--     * @param callback $callback
-+     * @param callable $callback
-      * @param bool $isInverted
-      * @return $this
-      */
-@@ -433,13 +430,11 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * The filters renderer and caller
--     * Applies to each row, renders once.
-+     * The filters renderer and caller. Applies to each row, renders once.
-      *
-      * @param array $row
-      * @return bool
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
--     * @SuppressWarnings(PHPMD.EvalExpression)
-      */
-     protected function _filterRow($row)
-     {
-@@ -469,16 +464,16 @@ class Filesystem extends \Magento\Framework\Data\Collection
-         }
-         $result = false;
-         if ($this->_filterEvalRendered) {
-+            // phpcs:ignore Squiz.PHP.Eval
-             eval('$result = ' . $this->_filterEvalRendered . ';');
-         }
-         return $result;
-     }
- 
-     /**
--     * Invokes specified callback
--     * Skips, if there is no filtered key in the row
-+     * Invokes specified callback. Skips, if there is no filtered key in the row.
-      *
--     * @param callback $callback
-+     * @param callable $callback
-      * @param array $callbackParams
-      * @return bool
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-@@ -493,7 +488,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Fancy field filter
-+     * Fancy field filter.
-      *
-      * @param string $field
-      * @param mixed $cond
-@@ -626,7 +621,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Prepare a bracket into filters
-+     * Prepare a bracket into filters.
-      *
-      * @param string $bracket
-      * @param bool $isAnd
-@@ -643,7 +638,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Render condition sign before element, if required
-+     * Render condition sign before element, if required.
-      *
-      * @param int $increment
-      * @param bool $isAnd
-@@ -666,7 +661,8 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Does nothing. Intentionally disabled parent method
-+     * Does nothing. Intentionally disabled parent method.
-+     *
-      * @param string $field
-      * @param string $value
-      * @param string $type
-@@ -679,7 +675,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Get all ids of collected items
-+     * Get all ids of collected items.
-      *
-      * @return array
-      */
-@@ -689,7 +685,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Callback method for 'like' fancy filter
-+     * Callback method for 'like' fancy filter.
-      *
-      * @param string $field
-      * @param mixed $filterValue
-@@ -700,6 +696,9 @@ class Filesystem extends \Magento\Framework\Data\Collection
-      */
-     public function filterCallbackLike($field, $filterValue, $row)
-     {
-+        // Forced to do this in order to keep backward compatibility for @api class.
-+        // Strict typing must be added to this method next major release.
-+        $filterValue = (string)$filterValue;
-         $filterValue = trim(stripslashes($filterValue), '\'');
-         $filterValue = trim($filterValue, '%');
-         $filterValueRegex = '(.*?)' . preg_quote($filterValue, '/') . '(.*?)';
-@@ -708,7 +707,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Callback method for 'eq' fancy filter
-+     * Callback method for 'eq' fancy filter.
-      *
-      * @param string $field
-      * @param mixed $filterValue
-@@ -723,7 +722,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Callback method for 'in' fancy filter
-+     * Callback method for 'in' fancy filter.
-      *
-      * @param string $field
-      * @param mixed $filterValue
-@@ -738,7 +737,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Callback method for 'isnull' fancy filter
-+     * Callback method for 'isnull' fancy filter.
-      *
-      * @param string $field
-      * @param mixed $filterValue
-@@ -754,7 +753,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Callback method for 'moreq' fancy filter
-+     * Callback method for 'moreq' fancy filter.
-      *
-      * @param string $field
-      * @param mixed $filterValue
-@@ -769,7 +768,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
-     }
- 
-     /**
--     * Callback method for 'lteq' fancy filter
-+     * Callback method for 'lteq' fancy filter.
-      *
-      * @param string $field
-      * @param mixed $filterValue
-diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
-index a8451e43ade..ff1e3ba63ba 100644
---- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
-+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
-@@ -13,6 +13,7 @@ use Magento\Framework\Escaper;
- /**
-  * Data form abstract class
-  *
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  * @author     Magento Core Team <core@magentocommerce.com>
-  * @SuppressWarnings(PHPMD.NumberOfChildren)
-@@ -170,7 +171,11 @@ abstract class AbstractElement extends AbstractForm
-      */
-     public function getHtmlId()
-     {
--        return $this->getForm()->getHtmlIdPrefix() . $this->getData('html_id') . $this->getForm()->getHtmlIdSuffix();
-+        return $this->_escaper->escapeHtml(
-+            $this->getForm()->getHtmlIdPrefix() .
-+            $this->getData('html_id') .
-+            $this->getForm()->getHtmlIdSuffix()
-+        );
-     }
- 
-     /**
-@@ -180,7 +185,7 @@ abstract class AbstractElement extends AbstractForm
-      */
-     public function getName()
-     {
--        $name = $this->getData('name');
-+        $name = $this->_escaper->escapeHtml($this->getData('name'));
-         if ($suffix = $this->getForm()->getFieldNameSuffix()) {
-             $name = $this->getForm()->addSuffixToName($name, $suffix);
-         }
-@@ -201,6 +206,8 @@ abstract class AbstractElement extends AbstractForm
-     }
- 
-     /**
-+     * Set form.
-+     *
-      * @param AbstractForm $form
-      * @return $this
-      */
-@@ -238,6 +245,7 @@ abstract class AbstractElement extends AbstractForm
-             'onchange',
-             'disabled',
-             'readonly',
-+            'autocomplete',
-             'tabindex',
-             'placeholder',
-             'data-form-part',
-@@ -284,7 +292,7 @@ abstract class AbstractElement extends AbstractForm
-      */
-     protected function _escape($string)
-     {
--        return htmlspecialchars($string, ENT_COMPAT);
-+        return $this->_escaper->escapeHtml($string);
-     }
- 
-     /**
-@@ -326,6 +334,8 @@ abstract class AbstractElement extends AbstractForm
-     }
- 
-     /**
-+     * Get Ui Id.
-+     *
-      * @param null|string $suffix
-      * @return string
-      */
-@@ -334,7 +344,7 @@ abstract class AbstractElement extends AbstractForm
-         if ($this->_renderer instanceof \Magento\Framework\View\Element\AbstractBlock) {
-             return $this->_renderer->getUiId($this->getType(), $this->getName(), $suffix);
-         } else {
--            return ' data-ui-id="form-element-' . $this->getName() . ($suffix ?: '') . '"';
-+            return ' data-ui-id="form-element-' . $this->_escaper->escapeHtml($this->getName()) . ($suffix ?: '') . '"';
-         }
-     }
- 
-diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
-index 3048be4d5dc..2a68432207b 100644
---- a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
-+++ b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
-@@ -121,13 +121,13 @@ class Checkboxes extends AbstractElement
-             return;
-         }
-         if (!is_array($checked)) {
--            $checked = [strval($checked)];
-+            $checked = [(string)$checked];
-         } else {
-             foreach ($checked as $k => $v) {
--                $checked[$k] = strval($v);
-+                $checked[$k] = (string)$v;
-             }
-         }
--        if (in_array(strval($value), $checked)) {
-+        if (in_array((string)$value, $checked)) {
-             return 'checked';
-         }
-         return;
-@@ -141,13 +141,13 @@ class Checkboxes extends AbstractElement
-     {
-         if ($disabled = $this->getData('disabled')) {
-             if (!is_array($disabled)) {
--                $disabled = [strval($disabled)];
-+                $disabled = [(string)$disabled];
-             } else {
-                 foreach ($disabled as $k => $v) {
--                    $disabled[$k] = strval($v);
-+                    $disabled[$k] = (string)$v;
-                 }
-             }
--            if (in_array(strval($value), $disabled)) {
-+            if (in_array((string)$value, $disabled)) {
-                 return 'disabled';
-             }
-         }
-diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
-index ed5457edc7f..6e4e97dbac7 100644
---- a/lib/internal/Magento/Framework/Data/Form/Element/Date.php
-+++ b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
-@@ -9,11 +9,15 @@
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
-+
- namespace Magento\Framework\Data\Form\Element;
- 
- use Magento\Framework\Escaper;
- use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
- 
-+/**
-+ * Date element
-+ */
- class Date extends AbstractElement
- {
-     /**
-@@ -50,8 +54,20 @@ class Date extends AbstractElement
-     }
- 
-     /**
--     * If script executes on x64 system, converts large
--     * numeric values to timestamp limit
-+     * Check if a string is a date value
-+     *
-+     * @param string $value
-+     * @return bool
-+     */
-+    private function isDate(string $value): bool
-+    {
-+        $date = date_parse($value);
-+
-+        return !empty($date['year']) && !empty($date['month']) && !empty($date['day']);
-+    }
-+
-+    /**
-+     * If script executes on x64 system, converts large numeric values to timestamp limit
-      *
-      * @param int $value
-      * @return int
-@@ -82,13 +98,14 @@ class Date extends AbstractElement
-             $this->_value = $value;
-             return $this;
-         }
--        if (preg_match('/^[0-9]+$/', $value)) {
--            $this->_value = (new \DateTime())->setTimestamp($this->_toTimestamp($value));
--            return $this;
--        }
--
-         try {
--            $this->_value = new \DateTime($value, new \DateTimeZone($this->localeDate->getConfigTimezone()));
-+            if (preg_match('/^[0-9]+$/', $value)) {
-+                $this->_value = (new \DateTime())->setTimestamp($this->_toTimestamp($value));
-+            } elseif (is_string($value) && $this->isDate($value)) {
-+                $this->_value = new \DateTime($value, new \DateTimeZone($this->localeDate->getConfigTimezone()));
-+            } else {
-+                $this->_value = '';
-+            }
-         } catch (\Exception $e) {
-             $this->_value = '';
-         }
-@@ -97,6 +114,7 @@ class Date extends AbstractElement
- 
-     /**
-      * Get date value as string.
-+     *
-      * Format can be specified, or it will be taken from $this->getFormat()
-      *
-      * @param string $format (compatible with \DateTime)
-@@ -146,7 +164,7 @@ class Date extends AbstractElement
-      */
-     public function getElementHtml()
-     {
--        $this->addClass('admin__control-text  input-text');
-+        $this->addClass('admin__control-text input-text input-date');
-         $dateFormat = $this->getDateFormat() ?: $this->getFormat();
-         $timeFormat = $this->getTimeFormat();
-         if (empty($dateFormat)) {
-diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
-index 39a0479f754..b5f2017501c 100644
---- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
-+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
-@@ -50,6 +50,8 @@ class Editor extends Textarea
-     }
- 
-     /**
-+     * Returns buttons translation
-+     *
-      * @return array
-      */
-     protected function getButtonTranslations()
-@@ -64,6 +66,8 @@ class Editor extends Textarea
-     }
- 
-     /**
-+     * Returns JS config
-+     *
-      * @return bool|string
-      * @throws \InvalidArgumentException
-      */
-@@ -80,8 +84,9 @@ class Editor extends Textarea
- 
-     /**
-      * Fetch config options from plugin.  If $key is passed, return only that option key's value
-+     *
-      * @param string $pluginName
--     * @param null $key
-+     * @param string|null $key
-      * @return mixed all options or single option if $key is passed; null if nonexistent
-      */
-     public function getPluginConfigOptions($pluginName, $key = null)
-@@ -101,13 +106,15 @@ class Editor extends Textarea
-         $pluginOptions = $plugins[$pluginArrIndex]['options'];
- 
-         if ($key !== null) {
--            return isset($pluginOptions[$key]) ? $pluginOptions[$key] : null;
-+            return $pluginOptions[$key] ?? null;
-         } else {
-             return $pluginOptions;
-         }
-     }
- 
-     /**
-+     * Returns element html
-+     *
-      * @return string
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-@@ -200,6 +207,8 @@ class Editor extends Textarea
-     }
- 
-     /**
-+     * Returns theme
-+     *
-      * @return mixed
-      */
-     public function getTheme()
-@@ -343,6 +352,8 @@ class Editor extends Textarea
-     }
- 
-     /**
-+     * Convert options
-+     *
-      * Convert options by replacing template constructions ( like {{var_name}} )
-      * with data from this element object
-      *
-@@ -389,6 +400,7 @@ class Editor extends Textarea
- 
-     /**
-      * Wraps Editor HTML into div if 'use_container' config option is set to true
-+     *
-      * If 'no_display' config option is set to true, the div will be invisible
-      *
-      * @param string $html HTML code to wrap
-@@ -463,6 +475,8 @@ class Editor extends Textarea
-     }
- 
-     /**
-+     * Is Toggle Button Visible
-+     *
-      * @return bool
-      */
-     protected function isToggleButtonVisible()
-@@ -528,4 +542,13 @@ class Editor extends Textarea
-                 </script>';
-         return $jsString;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getHtmlId()
-+    {
-+        $suffix = $this->getConfig('dynamic_id') ? '${ $.wysiwygUniqueSuffix }' : '';
-+        return parent::getHtmlId() . $suffix;
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Factory.php b/lib/internal/Magento/Framework/Data/Form/Element/Factory.php
-index 69f9fb18411..582b0c8cf65 100644
---- a/lib/internal/Magento/Framework/Data/Form/Element/Factory.php
-+++ b/lib/internal/Magento/Framework/Data/Form/Element/Factory.php
-@@ -4,13 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * @author     Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Framework\Data\Form\Element;
- 
- use Magento\Framework\ObjectManagerInterface;
- 
-+/**
-+ * Form element Factory
-+ */
- class Factory
- {
-     /**
-@@ -81,7 +81,7 @@ class Factory
-         $element = $this->_objectManager->create($className, $config);
-         if (!$element instanceof AbstractElement) {
-             throw new \InvalidArgumentException(
--                $className . ' doesn\'n extend \Magento\Framework\Data\Form\Element\AbstractElement'
-+                $className . ' doesn\'t extend \Magento\Framework\Data\Form\Element\AbstractElement'
-             );
-         }
-         return $element;
-diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php b/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
-index 66b1299b986..90482ab55fc 100644
---- a/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
-+++ b/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
-@@ -43,7 +43,8 @@ class Fieldset extends AbstractElement
-      */
-     public function getElementHtml()
-     {
--        $html = '<fieldset id="' . $this->getHtmlId() . '"' . $this->serialize(
-+        $html = $this->getBeforeElementHtml();
-+        $html .= '<fieldset area-hidden="false" id="' . $this->getHtmlId() . '"' . $this->serialize(
-             ['class']
-         ) . $this->_getUiId() . '>' . "\n";
-         if ($this->getLegend()) {
-diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Label.php b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
-index 901dcb5289e..70b7885e7a0 100644
---- a/lib/internal/Magento/Framework/Data/Form/Element/Label.php
-+++ b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
-@@ -4,13 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Data form abstract class
-- *
-- * @author      Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Framework\Data\Form\Element;
- 
-+use Magento\Framework\Phrase;
-+
-+/**
-+ * Label form element.
-+ */
- class Label extends \Magento\Framework\Data\Form\Element\AbstractElement
- {
-     /**
-@@ -37,8 +37,13 @@ class Label extends \Magento\Framework\Data\Form\Element\AbstractElement
-     public function getElementHtml()
-     {
-         $html = $this->getBold() ? '<div class="control-value special">' : '<div class="control-value">';
--        $html .= $this->getEscapedValue() . '</div>';
-+        if (is_string($this->getValue()) || $this->getValue() instanceof Phrase) {
-+            $html .= $this->getEscapedValue();
-+        }
-+
-+        $html .= '</div>';
-         $html .= $this->getAfterElementHtml();
-+
-         return $html;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Text.php b/lib/internal/Magento/Framework/Data/Form/Element/Text.php
-index eb157c7279a..2f001eb1030 100644
---- a/lib/internal/Magento/Framework/Data/Form/Element/Text.php
-+++ b/lib/internal/Magento/Framework/Data/Form/Element/Text.php
-@@ -4,15 +4,13 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Form text element
-- *
-- * @author      Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Framework\Data\Form\Element;
- 
- use Magento\Framework\Escaper;
- 
-+/**
-+ * Form text element
-+ */
- class Text extends AbstractElement
- {
-     /**
-@@ -65,6 +63,7 @@ class Text extends AbstractElement
-             'placeholder',
-             'data-form-part',
-             'data-role',
-+            'data-validation-params',
-             'data-action'
-         ];
-     }
-diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Textarea.php b/lib/internal/Magento/Framework/Data/Form/Element/Textarea.php
-index 7cd3fb1f7fb..1970ebeb954 100644
---- a/lib/internal/Magento/Framework/Data/Form/Element/Textarea.php
-+++ b/lib/internal/Magento/Framework/Data/Form/Element/Textarea.php
-@@ -4,15 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Form textarea element
-- *
-- * @author      Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Framework\Data\Form\Element;
- 
- use Magento\Framework\Escaper;
- 
-+/**
-+ * Form textarea element.
-+ *
-+ * @author      Magento Core Team <core@magentocommerce.com>
-+ */
- class Textarea extends AbstractElement
- {
-     /**
-@@ -64,6 +64,7 @@ class Textarea extends AbstractElement
-             'rows',
-             'cols',
-             'readonly',
-+            'maxlength',
-             'disabled',
-             'onkeyup',
-             'tabindex',
-diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Time.php b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
-index 68f32823d7a..f56dbedb744 100644
---- a/lib/internal/Magento/Framework/Data/Form/Element/Time.php
-+++ b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
-@@ -4,15 +4,15 @@
-  * See COPYING.txt for license details.
-  */
- 
-+namespace Magento\Framework\Data\Form\Element;
-+
-+use Magento\Framework\Escaper;
-+
- /**
-  * Form time element
-  *
-  * @author      Magento Core Team <core@magentocommerce.com>
-  */
--namespace Magento\Framework\Data\Form\Element;
--
--use Magento\Framework\Escaper;
--
- class Time extends AbstractElement
- {
-     /**
-@@ -32,7 +32,7 @@ class Time extends AbstractElement
-     }
- 
-     /**
--     * @return mixed
-+     * @inheritDoc
-      */
-     public function getName()
-     {
-@@ -44,7 +44,7 @@ class Time extends AbstractElement
-     }
- 
-     /**
--     * @return string
-+     * @inheritDoc
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-@@ -76,7 +76,8 @@ class Time extends AbstractElement
-         }
-         $html .= '</select>' . "\n";
- 
--        $html .= ':&nbsp;<select name="' . $this->getName() . '" style="width:80px" '
-+        $html .= '<span class="time-separator">:&nbsp;</span><select name="'
-+            . $this->getName() . '" style="width:80px" '
-             . $this->serialize($this->getHtmlAttributes())
-             . $this->_getUiId('minute') . '>' . "\n";
-         for ($i = 0; $i < 60; $i++) {
-@@ -86,7 +87,8 @@ class Time extends AbstractElement
-         }
-         $html .= '</select>' . "\n";
- 
--        $html .= ':&nbsp;<select name="' . $this->getName() . '" style="width:80px" '
-+        $html .= '<span class="time-separator">:&nbsp;</span><select name="'
-+            . $this->getName() . '" style="width:80px" '
-             . $this->serialize($this->getHtmlAttributes())
-             . $this->_getUiId('second') . '>' . "\n";
-         for ($i = 0; $i < 60; $i++) {
-diff --git a/lib/internal/Magento/Framework/Data/Form/Filter/Escapehtml.php b/lib/internal/Magento/Framework/Data/Form/Filter/Escapehtml.php
-index 6feca703f15..5f9f3ea6d08 100644
---- a/lib/internal/Magento/Framework/Data/Form/Filter/Escapehtml.php
-+++ b/lib/internal/Magento/Framework/Data/Form/Filter/Escapehtml.php
-@@ -11,8 +11,30 @@
-  */
- namespace Magento\Framework\Data\Form\Filter;
- 
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\ObjectManager;
-+
-+/**
-+ * EscapeHtml Form Filter Data
-+ */
- class Escapehtml implements \Magento\Framework\Data\Form\Filter\FilterInterface
- {
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-+    /**
-+     * @param Escaper|null $escaper
-+     */
-+    public function __construct(
-+        Escaper $escaper = null
-+    ) {
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-+    }
-+
-     /**
-      * Returns the result of filtering $value
-      *
-@@ -32,6 +54,6 @@ class Escapehtml implements \Magento\Framework\Data\Form\Filter\FilterInterface
-      */
-     public function outputFilter($value)
-     {
--        return htmlspecialchars($value);
-+        return $this->escaper->escapeHtml($value);
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Data/Form/FormKey.php b/lib/internal/Magento/Framework/Data/Form/FormKey.php
-index 75b3311b4ff..355460902ee 100644
---- a/lib/internal/Magento/Framework/Data/Form/FormKey.php
-+++ b/lib/internal/Magento/Framework/Data/Form/FormKey.php
-@@ -3,10 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Data\Form;
- 
- /**
-+ * Class FormKey
-+ *
-  * @api
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class FormKey
- {
-@@ -50,24 +56,29 @@ class FormKey
-      * Retrieve Session Form Key
-      *
-      * @return string A 16 bit unique key for forms
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getFormKey()
-     {
-         if (!$this->isPresent()) {
-             $this->set($this->mathRandom->getRandomString(16));
-         }
--        return $this->escaper->escapeHtmlAttr($this->session->getData(self::FORM_KEY));
-+        return $this->escaper->escapeJs($this->session->getData(self::FORM_KEY));
-     }
- 
-     /**
-+     * Determine if the form key is present in the session
-+     *
-      * @return bool
-      */
-     public function isPresent()
-     {
--        return (bool)$this->session->getData(self::FORM_KEY);
-+        return (bool) $this->session->getData(self::FORM_KEY);
-     }
- 
-     /**
-+     * Set the value of the form key
-+     *
-      * @param string $value
-      * @return void
-      */
-diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
-index 5608959c110..daadeae2ac0 100644
---- a/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
-+++ b/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Framework\Data\Test\Unit;
- 
-+/**
-+ * Class for Collection test.
-+ */
- class CollectionTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -12,6 +15,9 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $_model;
- 
-+    /**
-+     * Set up.
-+     */
-     protected function setUp()
-     {
-         $this->_model = new \Magento\Framework\Data\Collection(
-@@ -19,6 +25,11 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * Test for method removeAllItems.
-+     *
-+     * @return void
-+     */
-     public function testRemoveAllItems()
-     {
-         $this->_model->addItem(new \Magento\Framework\DataObject());
-@@ -30,6 +41,7 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * Test loadWithFilter()
-+     *
-      * @return void
-      */
-     public function testLoadWithFilter()
-@@ -42,6 +54,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test for method etItemObjectClass
-+     *
-      * @dataProvider setItemObjectClassDataProvider
-      */
-     public function testSetItemObjectClass($class)
-@@ -51,6 +65,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Data provider.
-+     *
-      * @return array
-      */
-     public function setItemObjectClassDataProvider()
-@@ -59,6 +75,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test for method setItemObjectClass with exception.
-+     *
-      * @expectedException \InvalidArgumentException
-      * @expectedExceptionMessage Incorrect_ClassName does not extend \Magento\Framework\DataObject
-      */
-@@ -67,12 +85,22 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         $this->_model->setItemObjectClass('Incorrect_ClassName');
-     }
- 
-+    /**
-+     * Test for method addFilter.
-+     *
-+     * @return void
-+     */
-     public function testAddFilter()
-     {
-         $this->_model->addFilter('field1', 'value');
-         $this->assertEquals('field1', $this->_model->getFilter('field1')->getData('field'));
-     }
- 
-+    /**
-+     * Test for method getFilters.
-+     *
-+     * @return void
-+     */
-     public function testGetFilters()
-     {
-         $this->_model->addFilter('field1', 'value');
-@@ -81,12 +109,22 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals('field2', $this->_model->getFilter(['field1', 'field2'])[1]->getData('field'));
-     }
- 
-+    /**
-+     * Test for method get non existion filters.
-+     *
-+     * @return void
-+     */
-     public function testGetNonExistingFilters()
-     {
-         $this->assertEmpty($this->_model->getFilter([]));
-         $this->assertEmpty($this->_model->getFilter('non_existing_filter'));
-     }
- 
-+    /**
-+     * Test for lag.
-+     *
-+     * @return void
-+     */
-     public function testFlag()
-     {
-         $this->_model->setFlag('flag_name', 'flag_value');
-@@ -95,12 +133,22 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         $this->assertNull($this->_model->getFlag('non_existing_flag'));
-     }
- 
-+    /**
-+     * Test for method getCurPage.
-+     *
-+     * @return void
-+     */
-     public function testGetCurPage()
-     {
--        $this->_model->setCurPage(10);
-+        $this->_model->setCurPage(1);
-         $this->assertEquals(1, $this->_model->getCurPage());
-     }
- 
-+    /**
-+     * Test for method possibleFlowWithItem.
-+     *
-+     * @return void
-+     */
-     public function testPossibleFlowWithItem()
-     {
-         $firstItemMock = $this->createPartialMock(
-@@ -168,6 +216,11 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals([], $this->_model->getItems());
-     }
- 
-+    /**
-+     * Test for method eachCallsMethodOnEachItemWithNoArgs.
-+     *
-+     * @return void
-+     */
-     public function testEachCallsMethodOnEachItemWithNoArgs()
-     {
-         for ($i = 0; $i < 3; $i++) {
-@@ -177,7 +230,12 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         }
-         $this->_model->each('testCallback');
-     }
--    
-+
-+    /**
-+     * Test for method eachCallsMethodOnEachItemWithArgs.
-+     *
-+     * @return void
-+     */
-     public function testEachCallsMethodOnEachItemWithArgs()
-     {
-         for ($i = 0; $i < 3; $i++) {
-@@ -188,6 +246,11 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         $this->_model->each('testCallback', ['a', 'b', 'c']);
-     }
- 
-+    /**
-+     * Test for method callsClosureWithEachItemAndNoArgs.
-+     *
-+     * @return void
-+     */
-     public function testCallsClosureWithEachItemAndNoArgs()
-     {
-         for ($i = 0; $i < 3; $i++) {
-@@ -200,6 +263,11 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         });
-     }
- 
-+    /**
-+     * Test for method callsClosureWithEachItemAndArgs.
-+     *
-+     * @return void
-+     */
-     public function testCallsClosureWithEachItemAndArgs()
-     {
-         for ($i = 0; $i < 3; $i++) {
-@@ -212,6 +280,11 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         }, ['a', 'b', 'c']);
-     }
- 
-+    /**
-+     * Test for method callsCallableArrayWithEachItemNoArgs.
-+     *
-+     * @return void
-+     */
-     public function testCallsCallableArrayWithEachItemNoArgs()
-     {
-         $mockCallbackObject = $this->getMockBuilder('DummyEachCallbackInstance')
-@@ -230,6 +303,11 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         $this->_model->each([$mockCallbackObject, 'testObjCallback']);
-     }
- 
-+    /**
-+     * Test for method callsCallableArrayWithEachItemAndArgs.
-+     *
-+     * @return void
-+     */
-     public function testCallsCallableArrayWithEachItemAndArgs()
-     {
-         $mockCallbackObject = $this->getMockBuilder('DummyEachCallbackInstance')
-diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
-index e29b1dcf441..2bd6a294770 100644
---- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
-+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
-@@ -3,12 +3,11 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+namespace Magento\Framework\Data\Test\Unit\Form\Element;
- 
- /**
-  * Tests for \Magento\Framework\Data\Form\Element\AbstractElement
-  */
--namespace Magento\Framework\Data\Test\Unit\Form\Element;
--
- class AbstractElementTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -33,11 +32,12 @@ class AbstractElementTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
-+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->_factoryMock =
-             $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
-         $this->_collectionFactoryMock =
-             $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
--        $this->_escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
-+        $this->_escaperMock = $objectManager->getObject(\Magento\Framework\Escaper::class);
- 
-         $this->_model = $this->getMockForAbstractClass(
-             \Magento\Framework\Data\Form\Element\AbstractElement::class,
-@@ -195,6 +195,7 @@ class AbstractElementTest extends \PHPUnit\Framework\TestCase
-             'onchange',
-             'disabled',
-             'readonly',
-+            'autocomplete',
-             'tabindex',
-             'placeholder',
-             'data-form-part',
-@@ -240,9 +241,9 @@ class AbstractElementTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testGetEscapedValueWithoutFilter()
-     {
--        $this->_model->setValue('<a href="#hash_tag">my \'quoted\' string</a>');
-+        $this->_model->setValue('<a href="#hash_tag">my &#039;quoted&#039; string</a>');
-         $this->assertEquals(
--            '&lt;a href=&quot;#hash_tag&quot;&gt;my \'quoted\' string&lt;/a&gt;',
-+            '&lt;a href=&quot;#hash_tag&quot;&gt;my &#039;quoted&#039; string&lt;/a&gt;',
-             $this->_model->getEscapedValue()
-         );
-     }
-@@ -252,8 +253,8 @@ class AbstractElementTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testGetEscapedValueWithFilter()
-     {
--        $value = '<a href="#hash_tag">my \'quoted\' string</a>';
--        $expectedValue = '&lt;a href=&quot;#hash_tag&quot;&gt;my \'quoted\' string&lt;/a&gt;';
-+        $value = '<a href="#hash_tag">my &#039;quoted&#039; string</a>';
-+        $expectedValue = '&lt;a href=&quot;#hash_tag&quot;&gt;my &#039;quoted&#039; string&lt;/a&gt;';
- 
-         $filterMock = $this->createPartialMock(\Magento\Framework\DataObject::class, ['filter']);
-         $filterMock->expects($this->once())
-@@ -422,9 +423,6 @@ class AbstractElementTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testAddElementValues(array $initialData, $expectedValue)
-     {
--        $this->_escaperMock->expects($this->any())
--            ->method('escapeHtml')
--            ->will($this->returnArgument(0));
-         $this->_model->setValues($initialData['initial_values']);
-         $this->_model->addElementValues($initialData['add_values'], $initialData['overwrite']);
- 
-diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LabelTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LabelTest.php
-index 8420f8e421f..ec625a1cdd4 100644
---- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LabelTest.php
-+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LabelTest.php
-@@ -3,18 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+namespace Magento\Framework\Data\Test\Unit\Form\Element;
- 
- /**
-  * Tests for \Magento\Framework\Data\Form\Element\Label
-  */
--namespace Magento\Framework\Data\Test\Unit\Form\Element;
--
- class LabelTest extends \PHPUnit\Framework\TestCase
- {
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $_objectManagerMock;
-+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
-+    private $objectManager;
- 
-     /**
-      * @var \Magento\Framework\Data\Form\Element\Label
-@@ -25,11 +22,14 @@ class LabelTest extends \PHPUnit\Framework\TestCase
-     {
-         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
-         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
--        $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
-+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $escaper = $this->objectManager->getObject(
-+            \Magento\Framework\Escaper::class
-+        );
-         $this->_label = new \Magento\Framework\Data\Form\Element\Label(
-             $factoryMock,
-             $collectionFactoryMock,
--            $escaperMock
-+            $escaper
-         );
-     }
- 
-diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
-index a2a40ee03b0..cf3cd0345e1 100644
---- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
-+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
-@@ -23,9 +23,10 @@ class LinkTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
-+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
-         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
--        $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
-+        $escaperMock = $objectManager->getObject(\Magento\Framework\Escaper::class);
-         $this->_link = new \Magento\Framework\Data\Form\Element\Link(
-             $factoryMock,
-             $collectionFactoryMock,
-diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultilineTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultilineTest.php
-index 9a391da4d65..85482e05188 100644
---- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultilineTest.php
-+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultilineTest.php
-@@ -5,8 +5,14 @@
-  */
- namespace Magento\Framework\Data\Test\Unit\Form\Element;
- 
-+/**
-+ * Test for \Magento\Framework\Data\Form\Element\Multiline
-+ */
- class MultilineTest extends \PHPUnit\Framework\TestCase
- {
-+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
-+    private $objectManager;
-+
-     /**
-      * @var \Magento\Framework\Data\Form\Element\Multiline
-      */
-@@ -37,9 +43,11 @@ class MultilineTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
- 
--        $this->escaper = $this->getMockBuilder(\Magento\Framework\Escaper::class)
--            ->disableOriginalConstructor()
--            ->getMock();
-+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+
-+        $this->escaper = $this->objectManager->getObject(
-+            \Magento\Framework\Escaper::class
-+        );
- 
-         $this->element = new \Magento\Framework\Data\Form\Element\Multiline(
-             $this->elementFactory,
-diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
-index 47eae73d8cd..c515e0aca01 100644
---- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
-+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
-@@ -5,6 +5,8 @@
-  */
- namespace Magento\Framework\Data\Test\Unit\Form\Element;
- 
-+use Magento\Framework\Escaper;
-+
- class MultiselectTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -15,7 +17,13 @@ class MultiselectTest extends \PHPUnit\Framework\TestCase
-     protected function setUp()
-     {
-         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--        $this->_model = $testHelper->getObject(\Magento\Framework\Data\Form\Element\Editablemultiselect::class);
-+        $escaper = new Escaper();
-+        $this->_model = $testHelper->getObject(
-+            \Magento\Framework\Data\Form\Element\Editablemultiselect::class,
-+            [
-+                '_escaper' => $escaper
-+            ]
-+        );
-         $this->_model->setForm(new \Magento\Framework\DataObject());
-     }
- 
-diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
-index f77f4a816a1..ad7d20fdc0a 100644
---- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
-+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
-@@ -23,9 +23,10 @@ class NoteTest extends \PHPUnit\Framework\TestCase
- 
-     protected function setUp()
-     {
-+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
-         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
--        $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
-+        $escaperMock = $objectManager->getObject(\Magento\Framework\Escaper::class);
-         $this->_model = new \Magento\Framework\Data\Form\Element\Note(
-             $factoryMock,
-             $collectionFactoryMock,
-diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ObscureTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ObscureTest.php
-index bb0b67a40ab..cec024fd407 100644
---- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ObscureTest.php
-+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ObscureTest.php
-@@ -3,18 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+namespace Magento\Framework\Data\Test\Unit\Form\Element;
- 
- /**
-  * Tests for \Magento\Framework\Data\Form\Element\Obscure
-  */
--namespace Magento\Framework\Data\Test\Unit\Form\Element;
--
- class ObscureTest extends \PHPUnit\Framework\TestCase
- {
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $_objectManagerMock;
-+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
-+    private $objectManager;
- 
-     /**
-      * @var \Magento\Framework\Data\Form\Element\Obscure
-@@ -25,11 +22,14 @@ class ObscureTest extends \PHPUnit\Framework\TestCase
-     {
-         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
-         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
--        $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
-+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $escaper = $this->objectManager->getObject(
-+            \Magento\Framework\Escaper::class
-+        );
-         $this->_model = new \Magento\Framework\Data\Form\Element\Obscure(
-             $factoryMock,
-             $collectionFactoryMock,
--            $escaperMock
-+            $escaper
-         );
-         $formMock = new \Magento\Framework\DataObject();
-         $formMock->getHtmlIdPrefix('id_prefix');
-diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/TextareaTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/TextareaTest.php
-index e99df6c4c6e..eec85ca3577 100644
---- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/TextareaTest.php
-+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/TextareaTest.php
-@@ -4,11 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Tests for \Magento\Framework\Data\Form\Element\Textarea
-- */
- namespace Magento\Framework\Data\Test\Unit\Form\Element;
- 
-+/**
-+ * Tests for \Magento\Framework\Data\Form\Element\Textarea class.
-+ */
- class TextareaTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -76,6 +76,7 @@ class TextareaTest extends \PHPUnit\Framework\TestCase
-                     'rows',
-                     'cols',
-                     'readonly',
-+                    'maxlength',
-                     'disabled',
-                     'onkeyup',
-                     'tabindex',
-diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKeyTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKeyTest.php
-index 5d765955f36..eb642278694 100644
---- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKeyTest.php
-+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKeyTest.php
-@@ -10,6 +10,9 @@ use Magento\Framework\Data\Form\FormKey;
- use Magento\Framework\Math\Random;
- use Magento\Framework\Session\SessionManager;
- 
-+/**
-+ * Class FormKeyTest
-+ */
- class FormKeyTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -38,7 +41,7 @@ class FormKeyTest extends \PHPUnit\Framework\TestCase
-         $methods = ['setData', 'getData'];
-         $this->sessionMock = $this->createPartialMock(\Magento\Framework\Session\SessionManager::class, $methods);
-         $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
--        $this->escaperMock->expects($this->any())->method('escapeHtmlAttr')->willReturnArgument(0);
-+        $this->escaperMock->expects($this->any())->method('escapeJs')->willReturnArgument(0);
-         $this->formKey = new FormKey(
-             $this->mathRandomMock,
-             $this->sessionMock,
-diff --git a/lib/internal/Magento/Framework/Data/Wysiwyg/Normalizer.php b/lib/internal/Magento/Framework/Data/Wysiwyg/Normalizer.php
-index 62e7500a302..bbf10e9f574 100644
---- a/lib/internal/Magento/Framework/Data/Wysiwyg/Normalizer.php
-+++ b/lib/internal/Magento/Framework/Data/Wysiwyg/Normalizer.php
-@@ -10,12 +10,13 @@ namespace Magento\Framework\Data\Wysiwyg;
-  */
- class Normalizer
- {
--
-     const WYSIWYG_RESERVED_CHARACTERS_REPLACEMENT_MAP = [
-         '{' => '^[',
-         '}' => '^]',
-         '"' => '`',
-         '\\' => '|',
-+        '<' => '^(',
-+        '>' => '^)'
-     ];
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/DataObject.php b/lib/internal/Magento/Framework/DataObject.php
-index 9ff004c53bb..6ecbca133e2 100644
---- a/lib/internal/Magento/Framework/DataObject.php
-+++ b/lib/internal/Magento/Framework/DataObject.php
-@@ -64,8 +64,8 @@ class DataObject implements \ArrayAccess
-      *
-      * If $key is an array, it will overwrite all the data in the object.
-      *
--     * @param string|array  $key
--     * @param mixed         $value
-+     * @param string|array $key
-+     * @param mixed $value
-      * @return $this
-      */
-     public function setData($key, $value = null)
-@@ -111,7 +111,7 @@ class DataObject implements \ArrayAccess
-      * and retrieve corresponding member. If data is the string - it will be explode
-      * by new line character and converted to array.
-      *
--     * @param string     $key
-+     * @param string $key
-      * @param string|int $index
-      * @return mixed
-      */
-@@ -202,7 +202,7 @@ class DataObject implements \ArrayAccess
-      */
-     public function setDataUsingMethod($key, $args = [])
-     {
--        $method = 'set' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
-+        $method = 'set' . str_replace('_', '', ucwords($key, '_'));
-         $this->{$method}($args);
-         return $this;
-     }
-@@ -216,12 +216,13 @@ class DataObject implements \ArrayAccess
-      */
-     public function getDataUsingMethod($key, $args = null)
-     {
--        $method = 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
-+        $method = 'get' . str_replace('_', '', ucwords($key, '_'));
-         return $this->{$method}($args);
-     }
- 
-     /**
-      * If $key is empty, checks whether there's any data in the object
-+     *
-      * Otherwise checks if the specified attribute is set.
-      *
-      * @param string $key
-@@ -272,8 +273,8 @@ class DataObject implements \ArrayAccess
-     /**
-      * Convert object data into XML string
-      *
--     * @param array   $keys array of keys that must be represented
--     * @param string  $rootName root node name
-+     * @param array $keys array of keys that must be represented
-+     * @param string $rootName root node name
-      * @param bool $addOpenTag flag that allow to add initial xml node
-      * @param bool $addCdata flag that require wrap all values in CDATA
-      * @return string
-@@ -436,7 +437,7 @@ class DataObject implements \ArrayAccess
-      *
-      * Example: key1="value1" key2="value2" ...
-      *
--     * @param   array  $keys array of accepted keys
-+     * @param   array $keys array of accepted keys
-      * @param   string $valueSeparator separator between key and value
-      * @param   string $fieldSeparator separator between key/value pairs
-      * @param   string $quote quoting sign
-diff --git a/lib/internal/Magento/Framework/DataObject/Copy.php b/lib/internal/Magento/Framework/DataObject/Copy.php
-index 728f72e713d..e8bc194a1d9 100644
---- a/lib/internal/Magento/Framework/DataObject/Copy.php
-+++ b/lib/internal/Magento/Framework/DataObject/Copy.php
-@@ -3,40 +3,48 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\DataObject;
-+
-+use Magento\Framework\Api\AbstractSimpleObject;
-+use Magento\Framework\Api\ExtensibleDataInterface;
-+use Magento\Framework\Api\ExtensionAttributesFactory;
-+use Magento\Framework\DataObject;
-+use Magento\Framework\DataObject\Copy\Config;
-+use Magento\Framework\Event\ManagerInterface;
- 
- /**
-  * Utility class for copying data sets between objects
-  */
--namespace Magento\Framework\DataObject;
--
- class Copy
- {
-     /**
--     * @var \Magento\Framework\DataObject\Copy\Config
-+     * @var Config
-      */
-     protected $fieldsetConfig;
- 
-     /**
-      * Core event manager proxy
-      *
--     * @var \Magento\Framework\Event\ManagerInterface
-+     * @var ManagerInterface
-      */
-     protected $eventManager = null;
- 
-     /**
--     * @var \Magento\Framework\Api\ExtensionAttributesFactory
-+     * @var ExtensionAttributesFactory
-      */
-     protected $extensionAttributesFactory;
- 
-     /**
--     * @param \Magento\Framework\Event\ManagerInterface $eventManager
--     * @param \Magento\Framework\DataObject\Copy\Config $fieldsetConfig
--     * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionAttributesFactory
-+     * @param ManagerInterface $eventManager
-+     * @param Config $fieldsetConfig
-+     * @param ExtensionAttributesFactory $extensionAttributesFactory
-      */
-     public function __construct(
--        \Magento\Framework\Event\ManagerInterface $eventManager,
--        \Magento\Framework\DataObject\Copy\Config $fieldsetConfig,
--        \Magento\Framework\Api\ExtensionAttributesFactory $extensionAttributesFactory
-+        ManagerInterface $eventManager,
-+        Config $fieldsetConfig,
-+        ExtensionAttributesFactory $extensionAttributesFactory
-     ) {
-         $this->eventManager = $eventManager;
-         $this->fieldsetConfig = $fieldsetConfig;
-@@ -51,10 +59,11 @@ class Copy
-      *
-      * @param string $fieldset
-      * @param string $aspect
--     * @param array|\Magento\Framework\DataObject $source
--     * @param array|\Magento\Framework\DataObject $target
-+     * @param array|DataObject|ExtensibleDataInterface|AbstractSimpleObject $source
-+     * @param array|DataObject|ExtensibleDataInterface|AbstractSimpleObject $target
-      * @param string $root
--     * @return array|\Magento\Framework\DataObject|null the value of $target
-+     *
-+     * @return array|DataObject|null the value of $target
-      * @throws \InvalidArgumentException
-      *
-      * @api
-@@ -93,17 +102,18 @@ class Copy
-      *
-      * @param string $fieldset
-      * @param string $aspect
--     * @param array|\Magento\Framework\DataObject $source
--     * @param array|\Magento\Framework\DataObject $target
-+     * @param array|DataObject|ExtensibleDataInterface|AbstractSimpleObject $source
-+     * @param array|DataObject|ExtensibleDataInterface|AbstractSimpleObject $target
-      * @param string $root
-      * @param bool $targetIsArray
--     * @return \Magento\Framework\DataObject|mixed
-+     *
-+     * @return DataObject|mixed
-      */
-     protected function dispatchCopyFieldSetEvent($fieldset, $aspect, $source, $target, $root, $targetIsArray)
-     {
-         $eventName = sprintf('core_copy_fieldset_%s_%s', $fieldset, $aspect);
-         if ($targetIsArray) {
--            $target = new \Magento\Framework\DataObject($target);
-+            $target = new DataObject($target);
-         }
-         $this->eventManager->dispatch(
-             $eventName,
-@@ -116,22 +126,23 @@ class Copy
-     }
- 
-     /**
--     * Get data from object|array to object|array containing fields
--     * from fieldset matching an aspect.
-+     * Get data from object|array to object|array containing fields from fieldset matching an aspect.
-      *
-      * @param string $fieldset
-      * @param string $aspect a field name
--     * @param array|\Magento\Framework\DataObject $source
-+     * @param array|DataObject|ExtensibleDataInterface|AbstractSimpleObject $source
-      * @param string $root
--     * @return array $data
-+     *
-+     * @return array
-      *
-      * @api
-      */
-     public function getDataFromFieldset($fieldset, $aspect, $source, $root = 'global')
-     {
--        if (!(is_array($source) || $source instanceof \Magento\Framework\DataObject)) {
-+        if ((!$this->isInputArgumentValid($source))) {
-             return null;
-         }
-+
-         $fields = $this->fieldsetConfig->getFieldset($fieldset, $root);
-         if ($fields === null) {
-             return null;
-@@ -156,24 +167,34 @@ class Copy
-     /**
-      * Check if source and target are valid input for converting using fieldset
-      *
--     * @param array|\Magento\Framework\DataObject $source
--     * @param array|\Magento\Framework\DataObject $target
-+     * @param array|DataObject|ExtensibleDataInterface|AbstractSimpleObject $source
-+     * @param array|DataObject|ExtensibleDataInterface|AbstractSimpleObject $target
-+     *
-      * @return bool
-      */
-     protected function _isFieldsetInputValid($source, $target)
-     {
--        return (is_array($source) || $source instanceof \Magento\Framework\DataObject ||
--            $source instanceof \Magento\Framework\Api\ExtensibleDataInterface ||
--            $source instanceof \Magento\Framework\Api\AbstractSimpleObject) && (
--            is_array($target) || $target instanceof \Magento\Framework\DataObject ||
--            $target instanceof \Magento\Framework\Api\ExtensibleDataInterface ||
--            $target instanceof \Magento\Framework\Api\AbstractSimpleObject);
-+        return $this->isInputArgumentValid($source) && $this->isInputArgumentValid($target);
-+    }
-+
-+    /**
-+     * Verify that we can access data from input object.
-+     *
-+     * @param array|DataObject|ExtensibleDataInterface|AbstractSimpleObject $object
-+     *
-+     * @return bool
-+     */
-+    private function isInputArgumentValid($object): bool
-+    {
-+        return (is_array($object) || $object instanceof DataObject ||
-+            $object instanceof ExtensibleDataInterface ||
-+            $object instanceof AbstractSimpleObject);
-     }
- 
-     /**
-      * Get value of source by code
-      *
--     * @param mixed $source
-+     * @param array|DataObject|ExtensibleDataInterface|AbstractSimpleObject $source
-      * @param string $code
-      *
-      * @return mixed
-@@ -181,49 +202,58 @@ class Copy
-      */
-     protected function _getFieldsetFieldValue($source, $code)
-     {
--        if (is_array($source)) {
--            $value = isset($source[$code]) ? $source[$code] : null;
--        } elseif ($source instanceof \Magento\Framework\DataObject) {
--            $value = $source->getDataUsingMethod($code);
--        } elseif ($source instanceof \Magento\Framework\Api\ExtensibleDataInterface) {
--            $value = $this->getAttributeValueFromExtensibleDataObject($source, $code);
--        } elseif ($source instanceof \Magento\Framework\Api\AbstractSimpleObject) {
--            $sourceArray = $source->__toArray();
--            $value = isset($sourceArray[$code]) ? $sourceArray[$code] : null;
--        } else {
--            throw new \InvalidArgumentException(
--                'Source should be array, Magento Object, ExtensibleDataInterface, or AbstractSimpleObject'
--            );
-+        switch (true) {
-+            case is_array($source):
-+                $value = isset($source[$code]) ? $source[$code] : null;
-+                break;
-+            case $source instanceof ExtensibleDataInterface:
-+                $value = $this->getAttributeValueFromExtensibleObject($source, $code);
-+                break;
-+            case $source instanceof DataObject:
-+                $value = $source->getDataUsingMethod($code);
-+                break;
-+            case $source instanceof AbstractSimpleObject:
-+                $sourceArray = $source->__toArray();
-+                $value = isset($sourceArray[$code]) ? $sourceArray[$code] : null;
-+                break;
-+            default:
-+                throw new \InvalidArgumentException(
-+                    'Source should be array, Magento Object, ExtensibleDataInterface, or AbstractSimpleObject'
-+                );
-         }
-+
-         return $value;
-     }
- 
-     /**
-      * Set value of target by code
-      *
--     * @param mixed $target
-+     * @param array|DataObject|ExtensibleDataInterface|AbstractSimpleObject $target
-      * @param string $targetCode
-      * @param mixed $value
-      *
--     * @return mixed
-+     * @return array|DataObject|ExtensibleDataInterface|AbstractSimpleObject
-      * @throws \InvalidArgumentException
-      */
-     protected function _setFieldsetFieldValue($target, $targetCode, $value)
-     {
--        $targetIsArray = is_array($target);
--
--        if ($targetIsArray) {
--            $target[$targetCode] = $value;
--        } elseif ($target instanceof \Magento\Framework\DataObject) {
--            $target->setDataUsingMethod($targetCode, $value);
--        } elseif ($target instanceof \Magento\Framework\Api\ExtensibleDataInterface) {
--            $this->setAttributeValueFromExtensibleDataObject($target, $targetCode, $value);
--        } elseif ($target instanceof \Magento\Framework\Api\AbstractSimpleObject) {
--            $target->setData($targetCode, $value);
--        } else {
--            throw new \InvalidArgumentException(
--                'Source should be array, Magento Object, ExtensibleDataInterface, or AbstractSimpleObject'
--            );
-+        switch (true) {
-+            case is_array($target):
-+                $target[$targetCode] = $value;
-+                break;
-+            case $target instanceof ExtensibleDataInterface:
-+                $this->setAttributeValueFromExtensibleObject($target, $targetCode, $value);
-+                break;
-+            case $target instanceof DataObject:
-+                $target->setDataUsingMethod($targetCode, $value);
-+                break;
-+            case $target instanceof AbstractSimpleObject:
-+                $target->setData($targetCode, $value);
-+                break;
-+            default:
-+                throw new \InvalidArgumentException(
-+                    'Source should be array, Magento Object, ExtensibleDataInterface, or AbstractSimpleObject'
-+                );
-         }
- 
-         return $target;
-@@ -232,68 +262,118 @@ class Copy
-     /**
-      * Access the extension get method
-      *
--     * @param \Magento\Framework\Api\ExtensibleDataInterface $object
-+     * @param ExtensibleDataInterface $source
-      * @param string $code
-      *
-      * @return mixed
-      * @throws \InvalidArgumentException
-+     *
-+     * @deprecated
-+     * @see \Magento\Framework\DataObject\Copy::getAttributeValueFromExtensibleObject
-      */
-     protected function getAttributeValueFromExtensibleDataObject($source, $code)
-     {
--        $method = 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $code)));
-+        return $this->getAttributeValueFromExtensibleObject($source, $code);
-+    }
-+
-+    /**
-+     * Get Attribute Value from Extensible Object Data with fallback to DataObject or AbstractSimpleObject.
-+     *
-+     * @param ExtensibleDataInterface $source
-+     * @param string $code
-+     *
-+     * @return mixed|null
-+     */
-+    private function getAttributeValueFromExtensibleObject(ExtensibleDataInterface $source, string $code)
-+    {
-+        $method = 'get' . str_replace('_', '', ucwords($code, '_'));
- 
-         $methodExists = method_exists($source, $method);
--        if ($methodExists == true) {
--            $value = $source->{$method}();
--        } else {
--            // If we couldn't find the method, check if we can get it from the extension attributes
--            $extensionAttributes = $source->getExtensionAttributes();
--            if ($extensionAttributes == null) {
--                throw new \InvalidArgumentException('Method in extension does not exist.');
--            } else {
--                $extensionMethodExists = method_exists($extensionAttributes, $method);
--                if ($extensionMethodExists == true) {
--                    $value = $extensionAttributes->{$method}();
--                } else {
--                    throw new \InvalidArgumentException('Attribute in object does not exist.');
--                }
-+
-+        if ($methodExists === true) {
-+            return $source->{$method}();
-+        }
-+
-+        $extensionAttributes = $source->getExtensionAttributes();
-+
-+        if ($extensionAttributes) {
-+            $methodExists = method_exists($extensionAttributes, $method);
-+            if ($methodExists) {
-+                return $extensionAttributes->{$method}();
-             }
-         }
--        return $value;
-+
-+        if ($source instanceof DataObject) {
-+            return $source->getDataUsingMethod($code);
-+        }
-+
-+        if ($source instanceof AbstractSimpleObject) {
-+            $sourceArray = $source->__toArray();
-+            return isset($sourceArray[$code]) ? $sourceArray[$code] : null;
-+        }
-+
-+        throw new \InvalidArgumentException('Attribute in object does not exist.');
-     }
- 
-     /**
-      * Access the extension set method
-      *
--     * @param \Magento\Framework\Api\ExtensibleDataInterface $object
-+     * @param ExtensibleDataInterface $target
-+     * @param string $code
-+     * @param mixed $value
-+     *
-+     * @return void
-+     * @throws \InvalidArgumentException
-+     *
-+     * @deprecated
-+     * @see \Magento\Framework\DataObject\Copy::setAttributeValueFromExtensibleObject
-+     */
-+    protected function setAttributeValueFromExtensibleDataObject(ExtensibleDataInterface $target, $code, $value)
-+    {
-+        $this->setAttributeValueFromExtensibleObject($target, $code, $value);
-+    }
-+
-+    /**
-+     * Set Attribute Value for Extensible Object Data with fallback to DataObject or AbstractSimpleObject.
-+     *
-+     * @param ExtensibleDataInterface $target
-      * @param string $code
-      * @param mixed $value
-      *
--     * @return null
-+     * @return void
-      * @throws \InvalidArgumentException
-      */
--    protected function setAttributeValueFromExtensibleDataObject($target, $code, $value)
-+    private function setAttributeValueFromExtensibleObject(ExtensibleDataInterface $target, string $code, $value): void
-     {
--        $method = 'set' . str_replace(' ', '', ucwords(str_replace('_', ' ', $code)));
-+        $method = 'set' . str_replace('_', '', ucwords($code, '_'));
- 
-         $methodExists = method_exists($target, $method);
--        if ($methodExists == true) {
-+        if ($methodExists) {
-             $target->{$method}($value);
--        } else {
--            // If we couldn't find the method, check if we can set it from the extension attributes
--            $extensionAttributes = $target->getExtensionAttributes();
--            if ($extensionAttributes == null) {
--                $extensionAttributes = $this->extensionAttributesFactory->create(get_class($target));
--            }
--            $extensionMethodExists = method_exists($extensionAttributes, $method);
--            if ($extensionMethodExists == true) {
--                $extensionAttributes->{$method}($value);
--                $target->setExtensionAttributes($extensionAttributes);
--            } else {
--                throw new \InvalidArgumentException('Attribute in object does not exist.');
--            }
-+            return;
-+        }
-+
-+        $extensionAttributes = $target->getExtensionAttributes();
-+        if ($extensionAttributes === null) {
-+            $extensionAttributes = $this->extensionAttributesFactory->create(get_class($target));
-+        }
-+
-+        if (method_exists($extensionAttributes, $method)) {
-+            $extensionAttributes->{$method}($value);
-+            $target->setExtensionAttributes($extensionAttributes);
-+            return;
-+        }
-+
-+        if ($target instanceof DataObject) {
-+            $target->setDataUsingMethod($code, $value);
-+            return;
-+        }
-+
-+        if ($target instanceof AbstractSimpleObject) {
-+            $target->setData($code, $value);
-+            return;
-         }
- 
--        return null;
-+        throw new \InvalidArgumentException('Attribute in object does not exist.');
-     }
- }
-diff --git a/lib/internal/Magento/Framework/DataObject/Copy/Config.php b/lib/internal/Magento/Framework/DataObject/Copy/Config.php
-index 2ad80321eb1..fa3ab6e2f7c 100644
---- a/lib/internal/Magento/Framework/DataObject/Copy/Config.php
-+++ b/lib/internal/Magento/Framework/DataObject/Copy/Config.php
-@@ -44,6 +44,6 @@ class Config
-         if (empty($fieldsets)) {
-             return null;
-         }
--        return isset($fieldsets[$name]) ? $fieldsets[$name] : null;
-+        return $fieldsets[$name] ?? null;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php b/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php
-index 880da5db771..b0f5742afef 100644
---- a/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php
-+++ b/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php
-@@ -57,10 +57,17 @@ class Proxy extends \Magento\Framework\DataObject\Copy\Config\Data implements
-     }
- 
-     /**
-+     * Remove links to other objects.
-+     *
-      * @return array
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return ['_subject', '_isShared'];
-     }
- 
-@@ -68,9 +75,14 @@ class Proxy extends \Magento\Framework\DataObject\Copy\Config\Data implements
-      * Retrieve ObjectManager from global scope
-      *
-      * @return void
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $this->_objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-     }
- 
-@@ -100,7 +112,7 @@ class Proxy extends \Magento\Framework\DataObject\Copy\Config\Data implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function merge(array $config)
-     {
-@@ -108,7 +120,7 @@ class Proxy extends \Magento\Framework\DataObject\Copy\Config\Data implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function get($path = null, $default = null)
-     {
-@@ -116,7 +128,7 @@ class Proxy extends \Magento\Framework\DataObject\Copy\Config\Data implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function reset()
-     {
-diff --git a/lib/internal/Magento/Framework/DataObject/Mapper.php b/lib/internal/Magento/Framework/DataObject/Mapper.php
-index 0b00564a454..168f7f82d61 100644
---- a/lib/internal/Magento/Framework/DataObject/Mapper.php
-+++ b/lib/internal/Magento/Framework/DataObject/Mapper.php
-@@ -4,12 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * Utility class for mapping data between objects or arrays
-- */
- namespace Magento\Framework\DataObject;
- 
- /**
-+ * Utility class for mapping data between objects or arrays
-+ *
-  * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-  * @SuppressWarnings(PHPMD.NPathComplexity)
-  */
-@@ -36,8 +35,8 @@ class Mapper
-      *     <\Magento\Framework\DataObject> => $from->setData($key, <from>)
-      *     array(<\Magento\Framework\DataObject>, <method>) => $from->$method($key, <from>)
-      *
--     * @param array|\Magento\Framework\DataObject|callback $from
--     * @param array|\Magento\Framework\DataObject|callback $to
-+     * @param array|\Magento\Framework\DataObject|callable $from
-+     * @param array|\Magento\Framework\DataObject|callable $to
-      * @param array $map
-      * @param array $defaults
-      * @return array|object
-diff --git a/lib/internal/Magento/Framework/DataObject/Test/Unit/CopyTest.php b/lib/internal/Magento/Framework/DataObject/Test/Unit/CopyTest.php
-index 1d27628448b..c6f86fd9d4c 100644
---- a/lib/internal/Magento/Framework/DataObject/Test/Unit/CopyTest.php
-+++ b/lib/internal/Magento/Framework/DataObject/Test/Unit/CopyTest.php
-@@ -6,6 +6,11 @@
- 
- namespace Magento\Framework\DataObject\Test\Unit;
- 
-+use Magento\Quote\Model\Quote\Address;
-+
-+/**
-+ * Unit tests coverage for @see \Magento\Framework\DataObject\Copy
-+ */
- class CopyTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -89,7 +94,7 @@ class CopyTest extends \PHPUnit\Framework\TestCase
-         $data = [
-             'target' => new \Magento\Framework\DataObject([$this->targetMock]),
-             'source' => $this->sourceMock,
--            'root'   => 'global',
-+            'root' => 'global',
-         ];
-         $this->eventManagerMock->expects($this->once())->method('dispatch')->with($eventName, $data);
-         $this->assertEquals(
-@@ -122,7 +127,7 @@ class CopyTest extends \PHPUnit\Framework\TestCase
-         $data = [
-             'target' => $this->targetMock,
-             'source' => $this->sourceMock,
--            'root'   => 'global',
-+            'root' => 'global',
-         ];
-         $this->eventManagerMock->expects($this->once())->method('dispatch')->with($eventName, $data);
-         $this->assertEquals(
-@@ -158,7 +163,7 @@ class CopyTest extends \PHPUnit\Framework\TestCase
-         $data = [
-             'target' => new \Magento\Framework\DataObject($newTarget),
-             'source' => $this->sourceMock,
--            'root'   => 'global',
-+            'root' => 'global',
-         ];
-         $this->eventManagerMock->expects($this->once())->method('dispatch')->with($eventName, $data);
-         $this->assertEquals(
-@@ -176,14 +181,21 @@ class CopyTest extends \PHPUnit\Framework\TestCase
-             ->with('fieldset', 'global')
-             ->will($this->returnValue($fields));
- 
--        $sourceMock = $this->createPartialMock(\Magento\Framework\Api\ExtensibleDataInterface::class, [
--                'getExtensionAttributes', 'getCode'
--            ]);
--        $targetMock = $this->createPartialMock(\Magento\Framework\Api\ExtensibleDataInterface::class, [
-+        $sourceMock = $this->createPartialMock(
-+            \Magento\Framework\Api\ExtensibleDataInterface::class,
-+            [
-+                'getExtensionAttributes',
-+                'getCode'
-+            ]
-+        );
-+        $targetMock = $this->createPartialMock(
-+            \Magento\Framework\Api\ExtensibleDataInterface::class,
-+            [
-                 'getExtensionAttributes',
-                 'setCode',
-                 'setExtensionAttributes'
--            ]);
-+            ]
-+        );
- 
-         $sourceMock
-             ->expects($this->any())
-@@ -222,12 +234,18 @@ class CopyTest extends \PHPUnit\Framework\TestCase
-             ->with('fieldset', 'global')
-             ->will($this->returnValue($fields));
- 
--        $sourceMock = $this->createPartialMock(\Magento\Framework\Api\AbstractSimpleObject::class, [
-+        $sourceMock = $this->createPartialMock(
-+            \Magento\Framework\Api\AbstractSimpleObject::class,
-+            [
-                 '__toArray'
--            ]);
--        $targetMock = $this->createPartialMock(\Magento\Framework\Api\AbstractSimpleObject::class, [
-+            ]
-+        );
-+        $targetMock = $this->createPartialMock(
-+            \Magento\Framework\Api\AbstractSimpleObject::class,
-+            [
-                 'setData'
--            ]);
-+            ]
-+        );
- 
-         $sourceMock
-             ->expects($this->once())
-@@ -300,4 +318,96 @@ class CopyTest extends \PHPUnit\Framework\TestCase
-             $this->copy->getDataFromFieldset('fieldset', 'aspect', $this->sourceMock)
-         );
-     }
-+
-+    public function testGetExtensionAttributeForDataObjectChild()
-+    {
-+        $fields['code']['aspect'] = '*';
-+        $this->fieldsetConfigMock
-+            ->expects($this->once())
-+            ->method('getFieldset')
-+            ->with('fieldset', 'global')
-+            ->will($this->returnValue($fields));
-+
-+        $sourceMock = $this->createPartialMock(
-+            Address::class,
-+            [
-+                'getExtensionAttributes',
-+                'getCode'
-+            ]
-+        );
-+        $targetMock = $this->createPartialMock(
-+            Address::class,
-+            [
-+                'getExtensionAttributes',
-+                'setCode',
-+                'setExtensionAttributes'
-+            ]
-+        );
-+
-+        $sourceMock
-+            ->expects($this->any())
-+            ->method('getExtensionAttributes')
-+            ->willReturnSelf();
-+        $sourceMock
-+            ->expects($this->once())
-+            ->method('getCode')
-+            ->willReturn('code');
-+
-+        $targetMock
-+            ->expects($this->any())
-+            ->method('getExtensionAttributes')
-+            ->willReturnSelf();
-+        $targetMock
-+            ->expects($this->any())
-+            ->method('setExtensionAttributes')
-+            ->willReturnSelf();
-+        $targetMock
-+            ->expects($this->once())
-+            ->method('setCode')
-+            ->with('code');
-+
-+        $this->eventManagerMock->expects($this->once())->method('dispatch');
-+        $result = $this->copy->copyFieldsetToTarget('fieldset', 'aspect', $sourceMock, $targetMock);
-+        $this->assertEquals($result, $targetMock);
-+    }
-+
-+    public function testGetDataObjectFieldFromExtensibleEntity()
-+    {
-+        $fields['code']['aspect'] = '*';
-+        $this->fieldsetConfigMock
-+            ->expects($this->once())
-+            ->method('getFieldset')
-+            ->with('fieldset', 'global')
-+            ->will($this->returnValue($fields));
-+
-+        $sourceMock = $this->createPartialMock(
-+            Address::class,
-+            [
-+                'getExtensionAttributes'
-+            ]
-+        );
-+        $targetMock = $this->createPartialMock(
-+            Address::class,
-+            [
-+                'getExtensionAttributes'
-+            ]
-+        );
-+
-+        $sourceMock
-+            ->expects($this->any())
-+            ->method('getExtensionAttributes')
-+            ->willReturn(null);
-+        $value = 'code';
-+        $sourceMock->setData('code', $value);
-+
-+        $targetMock
-+            ->expects($this->any())
-+            ->method('getExtensionAttributes')
-+            ->willReturn(null);
-+
-+        $this->eventManagerMock->expects($this->once())->method('dispatch');
-+        $result = $this->copy->copyFieldsetToTarget('fieldset', 'aspect', $sourceMock, $targetMock);
-+        $this->assertEquals($result, $targetMock);
-+        $this->assertEquals($value, $result->getCode());
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Encryption/Adapter/Mcrypt.php b/lib/internal/Magento/Framework/Encryption/Adapter/Mcrypt.php
-index 3660b28657b..c2e82a6a7f6 100644
---- a/lib/internal/Magento/Framework/Encryption/Adapter/Mcrypt.php
-+++ b/lib/internal/Magento/Framework/Encryption/Adapter/Mcrypt.php
-@@ -144,9 +144,11 @@ class Mcrypt implements EncryptionAdapterInterface
-      */
-     public function encrypt(string $data): string
-     {
--        throw new \Exception(
--            (string)new \Magento\Framework\Phrase('Mcrypt cannot be used for encryption. Use Sodium instead')
--        );
-+        if (strlen($data) == 0) {
-+            return $data;
-+        }
-+        // @codingStandardsIgnoreLine
-+        return @mcrypt_generic($this->getHandle(), $data);
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/Encryption/Adapter/SodiumChachaIetf.php b/lib/internal/Magento/Framework/Encryption/Adapter/SodiumChachaIetf.php
-index 9f9facf98ff..0c56c221766 100644
---- a/lib/internal/Magento/Framework/Encryption/Adapter/SodiumChachaIetf.php
-+++ b/lib/internal/Magento/Framework/Encryption/Adapter/SodiumChachaIetf.php
-@@ -33,6 +33,7 @@ class SodiumChachaIetf implements EncryptionAdapterInterface
-      *
-      * @param string $data
-      * @return string string
-+     * @throws \SodiumException
-      */
-     public function encrypt(string $data): string
-     {
-@@ -58,13 +59,17 @@ class SodiumChachaIetf implements EncryptionAdapterInterface
-         $nonce = mb_substr($data, 0, SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES, '8bit');
-         $payload = mb_substr($data, SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES, null, '8bit');
- 
--        $plainText = sodium_crypto_aead_chacha20poly1305_ietf_decrypt(
--            $payload,
--            $nonce,
--            $nonce,
--            $this->key
--        );
-+        try {
-+            $plainText = sodium_crypto_aead_chacha20poly1305_ietf_decrypt(
-+                $payload,
-+                $nonce,
-+                $nonce,
-+                $this->key
-+            );
-+        } catch (\SodiumException $e) {
-+            $plainText = '';
-+        }
- 
--        return $plainText;
-+        return $plainText !== false ? $plainText : '';
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php
-index f7d52d5474a..791e6d72b95 100644
---- a/lib/internal/Magento/Framework/Encryption/Encryptor.php
-+++ b/lib/internal/Magento/Framework/Encryption/Encryptor.php
-@@ -9,6 +9,7 @@ declare(strict_types=1);
- namespace Magento\Framework\Encryption;
- 
- use Magento\Framework\App\DeploymentConfig;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Encryption\Adapter\EncryptionAdapterInterface;
- use Magento\Framework\Encryption\Helper\Security;
- use Magento\Framework\Math\Random;
-@@ -115,20 +116,28 @@ class Encryptor implements EncryptorInterface
-      */
-     private $random;
- 
-+    /**
-+     * @var KeyValidator
-+     */
-+    private $keyValidator;
-+
-     /**
-      * Encryptor constructor.
-      * @param Random $random
-      * @param DeploymentConfig $deploymentConfig
-+     * @param KeyValidator|null $keyValidator
-      */
-     public function __construct(
-         Random $random,
--        DeploymentConfig $deploymentConfig
-+        DeploymentConfig $deploymentConfig,
-+        KeyValidator $keyValidator = null
-     ) {
-         $this->random = $random;
- 
-         // load all possible keys
-         $this->keys = preg_split('/\s+/s', trim((string)$deploymentConfig->get(self::PARAM_CRYPT_KEY)));
-         $this->keyVersion = count($this->keys) - 1;
-+        $this->keyValidator = $keyValidator ?: ObjectManager::getInstance()->get(KeyValidator::class);
-     }
- 
-     /**
-@@ -228,6 +237,8 @@ class Encryptor implements EncryptorInterface
-     }
- 
-     /**
-+     * Explode password hash
-+     *
-      * @param string $hash
-      * @return array
-      */
-@@ -243,6 +254,8 @@ class Encryptor implements EncryptorInterface
-     }
- 
-     /**
-+     * Get password hash
-+     *
-      * @return string
-      */
-     private function getPasswordHash()
-@@ -251,6 +264,8 @@ class Encryptor implements EncryptorInterface
-     }
- 
-     /**
-+     * Get password salt
-+     *
-      * @return string
-      */
-     private function getPasswordSalt()
-@@ -259,11 +274,19 @@ class Encryptor implements EncryptorInterface
-     }
- 
-     /**
-+     * Get password version
-+     *
-      * @return array
-      */
-     private function getPasswordVersion()
-     {
--        return array_map('intval', explode(self::DELIMITER, $this->passwordHashMap[self::PASSWORD_VERSION]));
-+        return array_map(
-+            'intval',
-+            explode(
-+                self::DELIMITER,
-+                (string)$this->passwordHashMap[self::PASSWORD_VERSION]
-+            )
-+        );
-     }
- 
-     /**
-@@ -281,6 +304,22 @@ class Encryptor implements EncryptorInterface
-             ':' . base64_encode($crypt->encrypt($data));
-     }
- 
-+    /**
-+     * Encrypt data using the fastest available algorithm
-+     *
-+     * @param string $data
-+     * @return string
-+     */
-+    public function encryptWithFastestAvailableAlgorithm($data)
-+    {
-+        $crypt = $this->getCrypt();
-+        if (null === $crypt) {
-+            return $data;
-+        }
-+        return $this->keyVersion .
-+            ':' . $this->getCipherVersion() .
-+            ':' . base64_encode($crypt->encrypt($data));
-+    }
-     /**
-      * Look for key and crypt versions in encrypted data before decrypting
-      *
-@@ -344,8 +383,12 @@ class Encryptor implements EncryptorInterface
-      */
-     public function validateKey($key)
-     {
--        if (preg_match('/\s/s', $key)) {
--            throw new \Exception((string)new \Magento\Framework\Phrase('The encryption key format is invalid.'));
-+        if (!$this->keyValidator->isValid($key)) {
-+            throw new \Exception(
-+                (string)new \Magento\Framework\Phrase(
-+                    'Encryption key must be 32 character string without any white space.'
-+                )
-+            );
-         }
-     }
- 
-@@ -391,7 +434,7 @@ class Encryptor implements EncryptorInterface
-         string $initVector = null
-     ): ?EncryptionAdapterInterface {
-         if (null === $key && null === $cipherVersion) {
--            $cipherVersion = self::CIPHER_RIJNDAEL_256;
-+            $cipherVersion = $this->getCipherVersion();
-         }
- 
-         if (null === $key) {
-@@ -424,4 +467,18 @@ class Encryptor implements EncryptorInterface
- 
-         return new Mcrypt($key, $cipher, $mode, $initVector);
-     }
-+
-+    /**
-+     * Get cipher version
-+     *
-+     * @return int
-+     */
-+    private function getCipherVersion()
-+    {
-+        if (extension_loaded('sodium')) {
-+            return $this->cipher;
-+        } else {
-+            return self::CIPHER_RIJNDAEL_256;
-+        }
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Encryption/KeyValidator.php b/lib/internal/Magento/Framework/Encryption/KeyValidator.php
-new file mode 100644
-index 00000000000..79d592bec2a
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Encryption/KeyValidator.php
-@@ -0,0 +1,33 @@
-+<?php
-+/**
-+ * Protocol validator
-+ *
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Encryption;
-+
-+use Magento\Framework\Config\ConfigOptionsListConstants;
-+
-+/**
-+ * Encryption Key Validator
-+ */
-+class KeyValidator
-+{
-+    /**
-+     * Validate encryption key
-+     *
-+     * Validate that encryption key is exactly 32 characters long and has
-+     * no trailing spaces, no invisible characters (tabs, new lines, etc.)
-+     *
-+     * @param string $value
-+     * @return bool
-+     */
-+    public function isValid($value) : bool
-+    {
-+        return strlen($value) === ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE
-+            && preg_match('/^\S+$/', $value);
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php
-index 2622441aa08..45235700363 100644
---- a/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php
-+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php
-@@ -160,15 +160,6 @@ class McryptTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($expectedData, $actualData);
-     }
- 
--    /**
--     * @expectedException \Exception
--     */
--    public function testEncrypt()
--    {
--        $crypt = new \Magento\Framework\Encryption\Adapter\Mcrypt($this->key);
--        $crypt->encrypt('Hello World!!');
--    }
--
-     /**
-      * @dataProvider getCipherModeCombinations
-      */
-diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/SodiumChachaIetfTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/SodiumChachaIetfTest.php
-index 8092ce55b42..f90cd4eea5a 100644
---- a/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/SodiumChachaIetfTest.php
-+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/SodiumChachaIetfTest.php
-@@ -11,13 +11,17 @@ declare(strict_types=1);
-  */
- namespace Magento\Framework\Encryption\Test\Unit\Adapter;
- 
--class SodiumChachaIetfTest extends \PHPUnit\Framework\TestCase
-+use Magento\Framework\Encryption\Adapter\SodiumChachaIetf;
-+use PHPUnit\Framework\TestCase;
-+
-+class SodiumChachaIetfTest extends TestCase
- {
-+    /**
-+     * @return array
-+     */
-     public function getCryptData(): array
-     {
--        $fixturesFilename = __DIR__ . '/../Crypt/_files/_sodium_chachaieft_fixtures.php';
--
--        $result = include $fixturesFilename;
-+        $result = include __DIR__ . '/../Crypt/_files/_sodium_chachaieft_fixtures.php';
-         /* Restore encoded string back to binary */
-         foreach ($result as &$cryptParams) {
-             $cryptParams['encrypted'] = base64_decode($cryptParams['encrypted']);
-@@ -29,10 +33,15 @@ class SodiumChachaIetfTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @dataProvider getCryptData
-+     *
-+     * @param string $key
-+     * @param string $encrypted
-+     * @param string $decrypted
-+     * @throws \SodiumException
-      */
--    public function testEncrypt(string $key, string $encrypted, string $decrypted)
-+    public function testEncrypt(string $key, string $encrypted, string $decrypted): void
-     {
--        $crypt = new \Magento\Framework\Encryption\Adapter\SodiumChachaIetf($key);
-+        $crypt = new SodiumChachaIetf($key);
-         $result = $crypt->encrypt($decrypted);
- 
-         $this->assertNotEquals($encrypted, $result);
-@@ -40,10 +49,14 @@ class SodiumChachaIetfTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @dataProvider getCryptData
-+     *
-+     * @param string $key
-+     * @param string $encrypted
-+     * @param string $decrypted
-      */
--    public function testDecrypt(string $key, string $encrypted, string $decrypted)
-+    public function testDecrypt(string $key, string $encrypted, string $decrypted): void
-     {
--        $crypt = new \Magento\Framework\Encryption\Adapter\SodiumChachaIetf($key);
-+        $crypt = new SodiumChachaIetf($key);
-         $result = $crypt->decrypt($encrypted);
- 
-         $this->assertEquals($decrypted, $result);
-diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_sodium_chachaieft_fixtures.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_sodium_chachaieft_fixtures.php
-index 7917bd9ba83..8498f9a1a87 100644
---- a/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_sodium_chachaieft_fixtures.php
-+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_sodium_chachaieft_fixtures.php
-@@ -32,4 +32,14 @@ return [
-         'encrypted' => 'UglO9dEgslFpwPwejJmrK89PmBicv+I1pfdaXaEI69IrETD8LpdzOLF7',
-         'decrypted' => 'Hello World!!!',
-     ],
-+    5 => [
-+        'key' => '6wRADHwwCBGgdxbcHhovGB0upmg0mbsN',
-+        'encrypted' => '',
-+        'decrypted' => '',
-+    ],
-+    6 => [
-+        'key' => '6wRADHwwCBGgdxbcHhovGB0upmg0mbsN',
-+        'encrypted' => 'bWFsZm9ybWVkLWlucHV0',
-+        'decrypted' => '',
-+    ],
- ];
-diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
-index f3853a123c1..3feb4b41228 100644
---- a/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
-+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
-@@ -8,75 +8,92 @@ declare(strict_types=1);
- 
- namespace Magento\Framework\Encryption\Test\Unit;
- 
--use Magento\Framework\Encryption\Adapter\Mcrypt;
-+use Magento\Framework\App\DeploymentConfig;
- use Magento\Framework\Encryption\Adapter\SodiumChachaIetf;
--use Magento\Framework\Encryption\Encryptor;
- use Magento\Framework\Encryption\Crypt;
-+use Magento\Framework\Encryption\Encryptor;
-+use Magento\Framework\Math\Random;
-+use Magento\Framework\Encryption\KeyValidator;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- 
- class EncryptorTest extends \PHPUnit\Framework\TestCase
- {
--    const CRYPT_KEY_1 = 'g9mY9KLrcuAVJfsmVUSRkKFLDdUPVkaZ';
--    const CRYPT_KEY_2 = '7wEjmrliuqZQ1NQsndSa8C8WHvddeEbN';
-+    private const CRYPT_KEY_1 = 'g9mY9KLrcuAVJfsmVUSRkKFLDdUPVkaZ';
-+    private const CRYPT_KEY_2 = '7wEjmrliuqZQ1NQsndSa8C8WHvddeEbN';
-+
-+    /**
-+     * @var Encryptor
-+     */
-+    private $encryptor;
- 
-     /**
--     * @var \Magento\Framework\Encryption\Encryptor
-+     * @var Random | \PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $_model;
-+    private $randomGeneratorMock;
- 
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
-+     * @var KeyValidator | \PHPUnit_Framework_MockObject_MockObject
-      */
--    protected $_randomGenerator;
-+    private $keyValidatorMock;
- 
-     protected function setUp()
-     {
--        $this->_randomGenerator = $this->createMock(\Magento\Framework\Math\Random::class);
--        $deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-+        $this->randomGeneratorMock = $this->createMock(Random::class);
-+        /** @var DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject $deploymentConfigMock */
-+        $deploymentConfigMock = $this->createMock(DeploymentConfig::class);
-         $deploymentConfigMock->expects($this->any())
-             ->method('get')
-             ->with(Encryptor::PARAM_CRYPT_KEY)
--            ->will($this->returnValue(self::CRYPT_KEY_1));
--        $this->_model = new \Magento\Framework\Encryption\Encryptor($this->_randomGenerator, $deploymentConfigMock);
-+            ->willReturn(self::CRYPT_KEY_1);
-+        $this->keyValidatorMock = $this->createMock(KeyValidator::class);
-+        $this->encryptor = (new ObjectManager($this))->getObject(
-+            Encryptor::class,
-+            [
-+                'random' => $this->randomGeneratorMock,
-+                'deploymentConfig' => $deploymentConfigMock,
-+                'keyValidator' => $this->keyValidatorMock
-+            ]
-+        );
-     }
- 
--    public function testGetHashNoSalt()
-+    public function testGetHashNoSalt(): void
-     {
--        $this->_randomGenerator->expects($this->never())->method('getRandomString');
-+        $this->randomGeneratorMock->expects($this->never())->method('getRandomString');
-         $expected = '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8';
--        $actual = $this->_model->getHash('password');
-+        $actual = $this->encryptor->getHash('password');
-         $this->assertEquals($expected, $actual);
-     }
- 
--    public function testGetHashSpecifiedSalt()
-+    public function testGetHashSpecifiedSalt(): void
-     {
--        $this->_randomGenerator->expects($this->never())->method('getRandomString');
-+        $this->randomGeneratorMock->expects($this->never())->method('getRandomString');
-         $expected = '13601bda4ea78e55a07b98866d2be6be0744e3866f13c00c811cab608a28f322:salt:1';
--        $actual = $this->_model->getHash('password', 'salt');
-+        $actual = $this->encryptor->getHash('password', 'salt');
-         $this->assertEquals($expected, $actual);
-     }
- 
--    public function testGetHashRandomSaltDefaultLength()
-+    public function testGetHashRandomSaltDefaultLength(): void
-     {
-         $salt = '-----------random_salt----------';
--        $this->_randomGenerator
-+        $this->randomGeneratorMock
-             ->expects($this->once())
-             ->method('getRandomString')
-             ->with(32)
--            ->will($this->returnValue($salt));
-+            ->willReturn($salt);
-         $expected = 'a1c7fc88037b70c9be84d3ad12522c7888f647915db78f42eb572008422ba2fa:' . $salt . ':1';
--        $actual = $this->_model->getHash('password', true);
-+        $actual = $this->encryptor->getHash('password', true);
-         $this->assertEquals($expected, $actual);
-     }
- 
--    public function testGetHashRandomSaltSpecifiedLength()
-+    public function testGetHashRandomSaltSpecifiedLength(): void
-     {
--        $this->_randomGenerator
-+        $this->randomGeneratorMock
-             ->expects($this->once())
-             ->method('getRandomString')
-             ->with(11)
--            ->will($this->returnValue('random_salt'));
-+            ->willReturn('random_salt');
-         $expected = '4c5cab8dd00137d11258f8f87b93fd17bd94c5026fc52d3c5af911dd177a2611:random_salt:1';
--        $actual = $this->_model->getHash('password', 11);
-+        $actual = $this->encryptor->getHash('password', 11);
-         $this->assertEquals($expected, $actual);
-     }
- 
-@@ -87,16 +104,16 @@ class EncryptorTest extends \PHPUnit\Framework\TestCase
-      *
-      * @dataProvider validateHashDataProvider
-      */
--    public function testValidateHash($password, $hash, $expected)
-+    public function testValidateHash($password, $hash, $expected): void
-     {
--        $actual = $this->_model->validateHash($password, $hash);
-+        $actual = $this->encryptor->validateHash($password, $hash);
-         $this->assertEquals($expected, $actual);
-     }
- 
-     /**
-      * @return array
-      */
--    public function validateHashDataProvider()
-+    public function validateHashDataProvider(): array
-     {
-         return [
-             ['password', 'hash:salt:1', false],
-@@ -111,14 +128,14 @@ class EncryptorTest extends \PHPUnit\Framework\TestCase
-      * @dataProvider encryptWithEmptyKeyDataProvider
-      * @expectedException \SodiumException
-      */
--    public function testEncryptWithEmptyKey($key)
-+    public function testEncryptWithEmptyKey($key): void
-     {
--        $deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-+        $deploymentConfigMock = $this->createMock(DeploymentConfig::class);
-         $deploymentConfigMock->expects($this->any())
-             ->method('get')
-             ->with(Encryptor::PARAM_CRYPT_KEY)
--            ->will($this->returnValue($key));
--        $model = new Encryptor($this->_randomGenerator, $deploymentConfigMock);
-+            ->willReturn($key);
-+        $model = new Encryptor($this->randomGeneratorMock, $deploymentConfigMock);
-         $value = 'arbitrary_string';
-         $this->assertEquals($value, $model->encrypt($value));
-     }
-@@ -126,7 +143,7 @@ class EncryptorTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @return array
-      */
--    public function encryptWithEmptyKeyDataProvider()
-+    public function encryptWithEmptyKeyDataProvider(): array
-     {
-         return [[null], [0], [''], ['0']];
-     }
-@@ -136,14 +153,14 @@ class EncryptorTest extends \PHPUnit\Framework\TestCase
-      *
-      * @dataProvider decryptWithEmptyKeyDataProvider
-      */
--    public function testDecryptWithEmptyKey($key)
-+    public function testDecryptWithEmptyKey($key): void
-     {
--        $deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-+        $deploymentConfigMock = $this->createMock(DeploymentConfig::class);
-         $deploymentConfigMock->expects($this->any())
-             ->method('get')
-             ->with(Encryptor::PARAM_CRYPT_KEY)
--            ->will($this->returnValue($key));
--        $model = new Encryptor($this->_randomGenerator, $deploymentConfigMock);
-+            ->willReturn($key);
-+        $model = new Encryptor($this->randomGeneratorMock, $deploymentConfigMock);
-         $value = 'arbitrary_string';
-         $this->assertEquals('', $model->decrypt($value));
-     }
-@@ -151,46 +168,44 @@ class EncryptorTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @return array
-      */
--    public function decryptWithEmptyKeyDataProvider()
-+    public function decryptWithEmptyKeyDataProvider(): array
-     {
-         return [[null], [0], [''], ['0']];
-     }
- 
--    public function testEncrypt()
-+    public function testEncrypt(): void
-     {
-         // sample data to encrypt
-         $data = 'Mares eat oats and does eat oats, but little lambs eat ivy.';
- 
--        $actual = $this->_model->encrypt($data);
-+        $actual = $this->encryptor->encrypt($data);
- 
-         // Extract the initialization vector and encrypted data
--        $parts = explode(':', $actual, 3);
--        list(, , $encryptedData) = $parts;
-+        [, , $encryptedData] = explode(':', $actual, 3);
- 
-         $crypt = new SodiumChachaIetf(self::CRYPT_KEY_1);
-         // Verify decrypted matches original data
-         $this->assertEquals($data, $crypt->decrypt(base64_decode((string)$encryptedData)));
-     }
- 
--    public function testDecrypt()
-+    public function testDecrypt(): void
-     {
-         $message = 'Mares eat oats and does eat oats, but little lambs eat ivy.';
--        $encrypted = $this->_model->encrypt($message);
-+        $encrypted = $this->encryptor->encrypt($message);
- 
--        $this->assertEquals($message, $this->_model->decrypt($encrypted));
-+        $this->assertEquals($message, $this->encryptor->decrypt($encrypted));
-     }
- 
--    public function testLegacyDecrypt()
-+    public function testLegacyDecrypt(): void
-     {
-         // sample data to encrypt
-         $data = '0:2:z3a4ACpkU35W6pV692U4ueCVQP0m0v0p:' .
-             'DhEG8/uKGGq92ZusqrGb6X/9+2Ng0QZ9z2UZwljgJbs5/A3LaSnqcK0oI32yjHY49QJi+Z7q1EKu2yVqB8EMpA==';
- 
--        $actual = $this->_model->decrypt($data);
-+        $actual = $this->encryptor->decrypt($data);
- 
-         // Extract the initialization vector and encrypted data
--        $parts = explode(':', $data, 4);
--        list(, , $iv, $encrypted) = $parts;
-+        [, , $iv, $encrypted] = explode(':', $data, 4);
- 
-         // Decrypt returned data with RIJNDAEL_256 cipher, cbc mode
-         $crypt = new Crypt(self::CRYPT_KEY_1, MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC, $iv);
-@@ -198,20 +213,20 @@ class EncryptorTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($encrypted, base64_encode($crypt->encrypt($actual)));
-     }
- 
--    public function testEncryptDecryptNewKeyAdded()
-+    public function testEncryptDecryptNewKeyAdded(): void
-     {
--        $deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-+        $deploymentConfigMock = $this->createMock(DeploymentConfig::class);
-         $deploymentConfigMock->expects($this->at(0))
-             ->method('get')
-             ->with(Encryptor::PARAM_CRYPT_KEY)
--            ->will($this->returnValue(self::CRYPT_KEY_1));
-+            ->willReturn(self::CRYPT_KEY_1);
-         $deploymentConfigMock->expects($this->at(1))
-             ->method('get')
-             ->with(Encryptor::PARAM_CRYPT_KEY)
--            ->will($this->returnValue(self::CRYPT_KEY_1 . "\n" . self::CRYPT_KEY_2));
--        $model1 = new Encryptor($this->_randomGenerator, $deploymentConfigMock);
-+            ->willReturn(self::CRYPT_KEY_1 . "\n" . self::CRYPT_KEY_2);
-+        $model1 = new Encryptor($this->randomGeneratorMock, $deploymentConfigMock);
-         // simulate an encryption key is being added
--        $model2 = new Encryptor($this->_randomGenerator, $deploymentConfigMock);
-+        $model2 = new Encryptor($this->randomGeneratorMock, $deploymentConfigMock);
- 
-         // sample data to encrypt
-         $data = 'Mares eat oats and does eat oats, but little lambs eat ivy.';
-@@ -222,23 +237,25 @@ class EncryptorTest extends \PHPUnit\Framework\TestCase
-         $this->assertSame($data, $decryptedData, 'Encryptor failed to decrypt data encrypted by old keys.');
-     }
- 
--    public function testValidateKey()
-+    public function testValidateKey(): void
-     {
--        $this->_model->validateKey(self::CRYPT_KEY_1);
-+        $this->keyValidatorMock->method('isValid')->willReturn(true);
-+        $this->encryptor->validateKey(self::CRYPT_KEY_1);
-     }
- 
-     /**
-      * @expectedException \Exception
-      */
--    public function testValidateKeyInvalid()
-+    public function testValidateKeyInvalid(): void
-     {
--        $this->_model->validateKey('-----    ');
-+        $this->keyValidatorMock->method('isValid')->willReturn(false);
-+        $this->encryptor->validateKey('-----    ');
-     }
- 
-     /**
-      * @return array
-      */
--    public function testUseSpecifiedHashingAlgoDataProvider()
-+    public function useSpecifiedHashingAlgoDataProvider(): array
-     {
-         return [
-             ['password', 'salt', Encryptor::HASH_VERSION_MD5,
-@@ -253,16 +270,16 @@ class EncryptorTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @dataProvider testUseSpecifiedHashingAlgoDataProvider
-+     * @dataProvider useSpecifiedHashingAlgoDataProvider
-      *
-      * @param $password
-      * @param $salt
-      * @param $hashAlgo
-      * @param $expected
-      */
--    public function testGetHashMustUseSpecifiedHashingAlgo($password, $salt, $hashAlgo, $expected)
-+    public function testGetHashMustUseSpecifiedHashingAlgo($password, $salt, $hashAlgo, $expected): void
-     {
--        $hash = $this->_model->getHash($password, $salt, $hashAlgo);
-+        $hash = $this->encryptor->getHash($password, $salt, $hashAlgo);
-         $this->assertEquals($expected, $hash);
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/KeyValidatorTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/KeyValidatorTest.php
-new file mode 100644
-index 00000000000..85faa0aa467
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/KeyValidatorTest.php
-@@ -0,0 +1,54 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Encryption\Test\Unit;
-+
-+use Magento\Framework\Encryption\KeyValidator;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+
-+class KeyValidatorTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var KeyValidator
-+     */
-+    private $keyValidator;
-+
-+    protected function setUp()
-+    {
-+        $this->keyValidator = (new ObjectManager($this))->getObject(KeyValidator::class);
-+    }
-+
-+    /**
-+     * @param $key
-+     * @param bool $expected
-+     * @dataProvider isValidDataProvider
-+     */
-+    public function testIsValid($key, $expected = true)
-+    {
-+        $this->assertEquals($expected, $this->keyValidator->isValid($key));
-+    }
-+
-+    public function isValidDataProvider() : array
-+    {
-+        return [
-+            '32 numbers' => ['12345678901234567890123456789012'],
-+            '32 characters' => ['aBcdeFghIJKLMNOPQRSTUvwxYzabcdef'],
-+            '32 special characters' => ['!@#$%^&*()_+~`:;"<>,.?/|*&^%$#@!'],
-+            '32 combination' =>['1234eFghI1234567^&*(890123456789'],
-+            'empty string' => ['', false],
-+            'leading space' => [' 1234567890123456789012345678901', false],
-+            'tailing space' => ['1234567890123456789012345678901 ', false],
-+            'space in the middle' => ['12345678901 23456789012345678901', false],
-+            'tab in the middle' => ['12345678901    23456789012345678', false],
-+            'return in the middle' => ['12345678901
-+            23456789012345678901', false],
-+            '31 characters' => ['1234567890123456789012345678901', false],
-+            '33 characters' => ['123456789012345678901234567890123', false],
-+        ];
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Delete.php b/lib/internal/Magento/Framework/EntityManager/Operation/Delete.php
-index aadc968370b..b9c0de5f4c5 100644
---- a/lib/internal/Magento/Framework/EntityManager/Operation/Delete.php
-+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Delete.php
-@@ -118,7 +118,7 @@ class Delete implements DeleteInterface
-             $entity = $this->deleteMain->execute($entity, $arguments);
-             $this->eventManager->dispatchEntityEvent($entityType, 'delete_after', ['entity' => $entity]);
-             $this->eventManager->dispatch(
--                'entity_manager_delete_before',
-+                'entity_manager_delete_after',
-                 [
-                     'entity_type' => $entityType,
-                     'entity' => $entity
-diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/ValidatorPool.php b/lib/internal/Magento/Framework/EntityManager/Operation/ValidatorPool.php
-index 0dc7aa36609..f28de6485f6 100644
---- a/lib/internal/Magento/Framework/EntityManager/Operation/ValidatorPool.php
-+++ b/lib/internal/Magento/Framework/EntityManager/Operation/ValidatorPool.php
-@@ -23,6 +23,11 @@ class ValidatorPool
-      */
-     protected $validators;
- 
-+    /**
-+     * @var array
-+     */
-+    private $actions;
-+
-     /**
-      * @param ObjectManagerInterface $objectManager
-      * @param array $extensionActions
-@@ -36,6 +41,8 @@ class ValidatorPool
-     }
- 
-     /**
-+     * Get list of validators
-+     *
-      * @param string $entityType
-      * @param string $actionName
-      * @return object[]
-diff --git a/lib/internal/Magento/Framework/EntityManager/Test/Unit/TypeResolverTest.php b/lib/internal/Magento/Framework/EntityManager/Test/Unit/TypeResolverTest.php
-index 1ab6074d6a3..9b90e373de8 100644
---- a/lib/internal/Magento/Framework/EntityManager/Test/Unit/TypeResolverTest.php
-+++ b/lib/internal/Magento/Framework/EntityManager/Test/Unit/TypeResolverTest.php
-@@ -32,7 +32,7 @@ class TypeResolverTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @param object $dataObject
--     * @param string $interfaceNames
-+     * @param string $interfaceName
-      * @dataProvider resolveDataProvider
-      */
-     public function testResolve($dataObject, $interfaceName)
-diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
-index fec64378189..216afc0409b 100644
---- a/lib/internal/Magento/Framework/Escaper.php
-+++ b/lib/internal/Magento/Framework/Escaper.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework;
- 
- /**
-@@ -12,6 +13,11 @@ namespace Magento\Framework;
-  */
- class Escaper
- {
-+    /**
-+     * HTML special characters flag
-+     */
-+    private $htmlSpecialCharsFlag = ENT_QUOTES | ENT_SUBSTITUTE;
-+
-     /**
-      * @var \Magento\Framework\ZendEscaper
-      */
-@@ -32,13 +38,23 @@ class Escaper
-      */
-     private $allowedAttributes = ['id', 'class', 'href', 'target', 'title', 'style'];
- 
-+    /**
-+     * @var string
-+     */
-+    private static $xssFiltrationPattern =
-+        '/((javascript(\\\\x3a|:|%3A))|(data(\\\\x3a|:|%3A))|(vbscript:))|'
-+        . '((\\\\x6A\\\\x61\\\\x76\\\\x61\\\\x73\\\\x63\\\\x72\\\\x69\\\\x70\\\\x74(\\\\x3a|:|%3A))|'
-+        . '(\\\\x64\\\\x61\\\\x74\\\\x61(\\\\x3a|:|%3A)))/i';
-+
-     /**
-      * @var string[]
-      */
-     private $escapeAsUrlAttributes = ['href'];
- 
-     /**
--     * Escape string for HTML context. allowedTags will not be escaped, except the following: script, img, embed,
-+     * Escape string for HTML context.
-+     *
-+     * AllowedTags will not be escaped, except the following: script, img, embed,
-      * iframe, video, source, object, audio
-      *
-      * @param string|array $data
-@@ -47,6 +63,10 @@ class Escaper
-      */
-     public function escapeHtml($data, $allowedTags = null)
-     {
-+        if (!is_array($data)) {
-+            $data = (string)$data;
-+        }
-+
-         if (is_array($data)) {
-             $result = [];
-             foreach ($data as $item) {
-@@ -54,28 +74,22 @@ class Escaper
-             }
-         } elseif (strlen($data)) {
-             if (is_array($allowedTags) && !empty($allowedTags)) {
--                $notAllowedTags = array_intersect(
--                    array_map('strtolower', $allowedTags),
--                    $this->notAllowedTags
--                );
--                if (!empty($notAllowedTags)) {
--                    $this->getLogger()->critical(
--                        'The following tag(s) are not allowed: ' . implode(', ', $notAllowedTags)
--                    );
--                    $allowedTags = array_diff($allowedTags, $this->notAllowedTags);
--                }
-+                $allowedTags = $this->filterProhibitedTags($allowedTags);
-                 $wrapperElementId = uniqid();
-                 $domDocument = new \DOMDocument('1.0', 'UTF-8');
-                 set_error_handler(
-                     function ($errorNumber, $errorString) {
-+                        // phpcs:ignore Magento2.Exceptions.DirectThrow
-                         throw new \Exception($errorString, $errorNumber);
-                     }
-                 );
-+                $data = $this->prepareUnescapedCharacters($data);
-                 $string = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');
-                 try {
-                     $domDocument->loadHTML(
-                         '<html><body id="' . $wrapperElementId . '">' . $string . '</body></html>'
-                     );
-+                    // phpcs:disable Magento2.Exceptions.ThrowCatch
-                 } catch (\Exception $e) {
-                     restore_error_handler();
-                     $this->getLogger()->critical($e);
-@@ -91,7 +105,7 @@ class Escaper
-                 preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);
-                 return !empty($matches) ? $matches[1] : '';
-             } else {
--                $result = htmlspecialchars($data, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8', false);
-+                $result = htmlspecialchars($data, $this->htmlSpecialCharsFlag, 'UTF-8', false);
-             }
-         } else {
-             $result = $data;
-@@ -99,6 +113,19 @@ class Escaper
-         return $result;
-     }
- 
-+    /**
-+     * Used to replace characters, that mb_convert_encoding will not process
-+     *
-+     * @param string $data
-+     * @return string|null
-+     */
-+    private function prepareUnescapedCharacters(string $data): ?string
-+    {
-+        $patterns = ['/\&/u'];
-+        $replacements = ['&amp;'];
-+        return \preg_replace($patterns, $replacements, $data);
-+    }
-+
-     /**
-      * Remove not allowed tags
-      *
-@@ -197,7 +224,7 @@ class Escaper
-         if ($escapeSingleQuote) {
-             return $this->getEscaper()->escapeHtmlAttr((string) $string);
-         }
--        return htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false);
-+        return htmlspecialchars((string)$string, $this->htmlSpecialCharsFlag, 'UTF-8', false);
-     }
- 
-     /**
-@@ -278,14 +305,13 @@ class Escaper
-                 $result[] = $this->escapeJsQuote($item, $quote);
-             }
-         } else {
--            $result = str_replace($quote, '\\' . $quote, $data);
-+            $result = str_replace($quote, '\\' . $quote, (string)$data);
-         }
-         return $result;
-     }
- 
-     /**
-      * Escape xss in urls
--     * Remove `javascript:`, `vbscript:`, `data:` words from url
-      *
-      * @param string $data
-      * @return string
-@@ -293,15 +319,33 @@ class Escaper
-      */
-     public function escapeXssInUrl($data)
-     {
--        $pattern = '/((javascript(\\\\x3a|:|%3A))|(data(\\\\x3a|:|%3A))|(vbscript:))|'
--            . '((\\\\x6A\\\\x61\\\\x76\\\\x61\\\\x73\\\\x63\\\\x72\\\\x69\\\\x70\\\\x74(\\\\x3a|:|%3A))|'
--            . '(\\\\x64\\\\x61\\\\x74\\\\x61(\\\\x3a|:|%3A)))/i';
--        $result = preg_replace($pattern, ':', $data);
--        return htmlspecialchars($result, ENT_COMPAT | ENT_HTML5 | ENT_HTML401, 'UTF-8', false);
-+        return htmlspecialchars(
-+            $this->escapeScriptIdentifiers((string)$data),
-+            $this->htmlSpecialCharsFlag | ENT_HTML5 | ENT_HTML401,
-+            'UTF-8',
-+            false
-+        );
-+    }
-+
-+    /**
-+     * Remove `javascript:`, `vbscript:`, `data:` words from the string.
-+     *
-+     * @param string $data
-+     * @return string
-+     */
-+    private function escapeScriptIdentifiers(string $data): string
-+    {
-+        $filteredData = preg_replace(self::$xssFiltrationPattern, ':', $data) ?: '';
-+        if (preg_match(self::$xssFiltrationPattern, $filteredData)) {
-+            $filteredData = $this->escapeScriptIdentifiers($filteredData);
-+        }
-+
-+        return $filteredData;
-     }
- 
-     /**
-      * Escape quotes inside html attributes
-+     *
-      * Use $addSlashes = false for escaping js that inside html attribute (onClick, onSubmit etc)
-      *
-      * @param string $data
-@@ -314,7 +358,7 @@ class Escaper
-         if ($addSlashes === true) {
-             $data = addslashes($data);
-         }
--        return htmlspecialchars($data, ENT_QUOTES, null, false);
-+        return htmlspecialchars($data, $this->htmlSpecialCharsFlag, null, false);
-     }
- 
-     /**
-@@ -346,4 +390,27 @@ class Escaper
-         }
-         return $this->logger;
-     }
-+
-+    /**
-+     * Filter prohibited tags.
-+     *
-+     * @param string[] $allowedTags
-+     * @return string[]
-+     */
-+    private function filterProhibitedTags(array $allowedTags): array
-+    {
-+        $notAllowedTags = array_intersect(
-+            array_map('strtolower', $allowedTags),
-+            $this->notAllowedTags
-+        );
-+
-+        if (!empty($notAllowedTags)) {
-+            $this->getLogger()->critical(
-+                'The following tag(s) are not allowed: ' . implode(', ', $notAllowedTags)
-+            );
-+            $allowedTags = array_diff($allowedTags, $this->notAllowedTags);
-+        }
-+
-+        return $allowedTags;
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php b/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
-index a7a387b5def..acd0a616335 100644
---- a/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
-+++ b/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
-@@ -9,7 +9,12 @@
- namespace Magento\Framework\Event\Invoker;
- 
- use Magento\Framework\Event\Observer;
-+use Psr\Log\LoggerInterface;
-+use Magento\Framework\App\State;
- 
-+/**
-+ * Default Invoker.
-+ */
- class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
- {
-     /**
-@@ -22,20 +27,29 @@ class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
-     /**
-      * Application state
-      *
--     * @var \Magento\Framework\App\State
-+     * @var State
-      */
-     protected $_appState;
- 
-+    /**
-+     * @var LoggerInterface
-+     */
-+    private $logger;
-+
-     /**
-      * @param \Magento\Framework\Event\ObserverFactory $observerFactory
--     * @param \Magento\Framework\App\State $appState
-+     * @param State $appState
-+     * @param LoggerInterface $logger
-      */
-     public function __construct(
-         \Magento\Framework\Event\ObserverFactory $observerFactory,
--        \Magento\Framework\App\State $appState
-+        State $appState,
-+        LoggerInterface $logger = null
-     ) {
-         $this->_observerFactory = $observerFactory;
-         $this->_appState = $appState;
-+        $this->logger = $logger ?: \Magento\Framework\App\ObjectManager::getInstance()
-+            ->get(LoggerInterface::class);
-     }
- 
-     /**
-@@ -61,6 +75,8 @@ class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
-     }
- 
-     /**
-+     * Execute Observer.
-+     *
-      * @param \Magento\Framework\Event\ObserverInterface $object
-      * @param Observer $observer
-      * @return $this
-@@ -70,7 +86,7 @@ class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
-     {
-         if ($object instanceof \Magento\Framework\Event\ObserverInterface) {
-             $object->execute($observer);
--        } elseif ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
-+        } elseif ($this->_appState->getMode() == State::MODE_DEVELOPER) {
-             throw new \LogicException(
-                 sprintf(
-                     'Observer "%s" must implement interface "%s"',
-@@ -78,6 +94,12 @@ class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
-                     \Magento\Framework\Event\ObserverInterface::class
-                 )
-             );
-+        } else {
-+            $this->logger->warning(sprintf(
-+                'Observer "%s" must implement interface "%s"',
-+                get_class($object),
-+                \Magento\Framework\Event\ObserverInterface::class
-+            ));
-         }
-         return $this;
-     }
-diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Config/SchemaLocatorTest.php
-index cd8a16b5c2c..66651174a87 100644
---- a/lib/internal/Magento/Framework/Event/Test/Unit/Config/SchemaLocatorTest.php
-+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Config/SchemaLocatorTest.php
-@@ -12,10 +12,10 @@ class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $model;
- 
--    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
-+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
-     protected $urnResolver;
- 
--    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
-+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
-     protected $urnResolverMock;
- 
-     protected function setUp()
-diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php b/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php
-index 33007b7295b..e0dc7494cca 100644
---- a/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php
-+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php
-@@ -4,10 +4,6 @@
-  * See COPYING.txt for license details.
-  */
- return [
--    'without_event_handle' => [
--        '<?xml version="1.0"?><config></config>',
--        ["Element 'config': Missing child element(s). Expected is ( event ).\nLine: 1\n"],
--    ],
-     'event_without_required_name_attribute' => [
-         '<?xml version="1.0"?><config><event name="some_name"></event></config>',
-         ["Element 'event': Missing child element(s). Expected is ( observer ).\nLine: 1\n"],
-diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
-index 37f650dbef6..5d142fe6f1f 100644
---- a/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
-+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Framework\Event\Test\Unit\Invoker;
- 
-+/**
-+ * Test for Magento\Framework\Event\Invoker\InvokerDefault.
-+ */
- class InvokerDefaultTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -13,7 +16,7 @@ class InvokerDefaultTest extends \PHPUnit\Framework\TestCase
-     protected $_observerFactoryMock;
- 
-     /**
--     * @var \Magento\Framework\Event\Observer|PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject
-      */
-     protected $_observerMock;
- 
-@@ -32,6 +35,11 @@ class InvokerDefaultTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $_invokerDefault;
- 
-+    /**
-+     * @var |Psr\Log|LoggerInterface
-+     */
-+    private $loggerMock;
-+
-     protected function setUp()
-     {
-         $this->_observerFactoryMock = $this->createMock(\Magento\Framework\Event\ObserverFactory::class);
-@@ -41,10 +49,12 @@ class InvokerDefaultTest extends \PHPUnit\Framework\TestCase
-             ['execute']
-         );
-         $this->_appStateMock = $this->createMock(\Magento\Framework\App\State::class);
-+        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
- 
-         $this->_invokerDefault = new \Magento\Framework\Event\Invoker\InvokerDefault(
-             $this->_observerFactoryMock,
--            $this->_appStateMock
-+            $this->_appStateMock,
-+            $this->loggerMock
-         );
-     }
- 
-@@ -166,13 +176,15 @@ class InvokerDefaultTest extends \PHPUnit\Framework\TestCase
-             $this->returnValue($notObserver)
-         );
-         $this->_appStateMock->expects(
--            $this->once()
-+            $this->exactly(1)
-         )->method(
-             'getMode'
-         )->will(
-             $this->returnValue(\Magento\Framework\App\State::MODE_PRODUCTION)
-         );
- 
-+        $this->loggerMock->expects($this->once())->method('warning');
-+
-         $this->_invokerDefault->dispatch(
-             [
-                 'shared' => $shared,
-diff --git a/lib/internal/Magento/Framework/Event/etc/events.xsd b/lib/internal/Magento/Framework/Event/etc/events.xsd
-index d656b7fdb6e..cac62af3567 100644
---- a/lib/internal/Magento/Framework/Event/etc/events.xsd
-+++ b/lib/internal/Magento/Framework/Event/etc/events.xsd
-@@ -9,7 +9,7 @@
-     <xs:element name="config">
-         <xs:complexType>
-             <xs:sequence>
--                <xs:element name="event" type="eventDeclaration" minOccurs="1" maxOccurs="unbounded">
-+                <xs:element name="event" type="eventDeclaration" minOccurs="0" maxOccurs="unbounded">
-                     <xs:unique name="uniqueObserverName">
-                         <xs:annotation>
-                             <xs:documentation>
-diff --git a/lib/internal/Magento/Framework/Exception/BulkException.php b/lib/internal/Magento/Framework/Exception/BulkException.php
-index b2e91da211f..168e910e0d3 100644
---- a/lib/internal/Magento/Framework/Exception/BulkException.php
-+++ b/lib/internal/Magento/Framework/Exception/BulkException.php
-@@ -39,7 +39,9 @@ class BulkException extends AbstractAggregateException
-     }
- 
-     /**
--     * @param $data array
-+     * Add data
-+     *
-+     * @param array $data
-      */
-     public function addData($data)
-     {
-@@ -47,6 +49,8 @@ class BulkException extends AbstractAggregateException
-     }
- 
-     /**
-+     * Retrieve data
-+     *
-      * @return array
-      */
-     public function getData()
-diff --git a/lib/internal/Magento/Framework/Exception/LocalizedException.php b/lib/internal/Magento/Framework/Exception/LocalizedException.php
-index 0b1d5f1998b..977c69db77b 100644
---- a/lib/internal/Magento/Framework/Exception/LocalizedException.php
-+++ b/lib/internal/Magento/Framework/Exception/LocalizedException.php
-@@ -11,6 +11,8 @@ use Magento\Framework\Phrase;
- use Magento\Framework\Phrase\Renderer\Placeholder;
- 
- /**
-+ * Localized exception
-+ *
-  * @api
-  */
- class LocalizedException extends \Exception
-@@ -33,7 +35,7 @@ class LocalizedException extends \Exception
-     public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)
-     {
-         $this->phrase = $phrase;
--        parent::__construct($phrase->render(), intval($code), $cause);
-+        parent::__construct($phrase->render(), (int)$code, $cause);
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/File/Mime.php b/lib/internal/Magento/Framework/File/Mime.php
-index d42b536f450..ed370b1beae 100644
---- a/lib/internal/Magento/Framework/File/Mime.php
-+++ b/lib/internal/Magento/Framework/File/Mime.php
-@@ -6,6 +6,9 @@
- 
- namespace Magento\Framework\File;
- 
-+/**
-+ * Utility for mime type retrieval
-+ */
- class Mime
- {
-     /**
-@@ -61,7 +64,7 @@ class Mime
-     /**
-      * List of mime types that can be defined by file extension.
-      *
--     * @var array $defineByExtensionList
-+     * @var array
-      */
-     private $defineByExtensionList = [
-         'txt'  => 'text/plain',
-@@ -106,6 +109,7 @@ class Mime
- 
-     /**
-      * Get mime type by the native mime_content_type function.
-+     *
-      * Search for extended mime type if mime_content_type() returned 'application/octet-stream' or 'text/plain'
-      *
-      * @param string $file
-diff --git a/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php b/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php
-index d945791282a..023c4cc4ddb 100644
---- a/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php
-+++ b/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php
-@@ -3,24 +3,37 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\File\Test\Unit\Transfer\Adapter;
- 
--use \Magento\Framework\File\Transfer\Adapter\Http;
-+use Magento\Framework\File\Transfer\Adapter\Http;
-+use Magento\Framework\File\Mime;
-+use Magento\Framework\HTTP\PhpEnvironment\Response;
-+use Magento\Framework\App\Request\Http as RequestHttp;
-+use PHPUnit\Framework\MockObject\MockObject;
- 
-+/**
-+ * Tests http transfer adapter.
-+ */
- class HttpTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \Magento\Framework\HTTP\PhpEnvironment\Response|\PHPUnit_Framework_MockObject_MockObject
-+     * @var RequestHttp|MockObject
-+     */
-+    private $request;
-+
-+    /**
-+     * @var Response|MockObject
-      */
-     private $response;
- 
-     /**
--     * @var Http|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Http|MockObject
-      */
-     private $object;
- 
-     /**
--     * @var \Magento\Framework\File\Mime|\PHPUnit_Framework_MockObject_MockObject
-+     * @var Mime|MockObject
-      */
-     private $mime;
- 
-@@ -30,11 +43,15 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-     protected function setUp()
-     {
-         $this->response = $this->createPartialMock(
--            \Magento\Framework\HTTP\PhpEnvironment\Response::class,
-+            Response::class,
-             ['setHeader', 'sendHeaders', 'setHeaders']
-         );
--        $this->mime = $this->createMock(\Magento\Framework\File\Mime::class);
--        $this->object = new Http($this->response, $this->mime);
-+        $this->mime = $this->createMock(Mime::class);
-+        $this->request = $this->createPartialMock(
-+            RequestHttp::class,
-+            ['isHead']
-+        );
-+        $this->object = new Http($this->response, $this->mime, $this->request);
-     }
- 
-     /**
-@@ -56,7 +73,10 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-         $this->mime->expects($this->once())
-             ->method('getMimeType')
-             ->with($file)
--            ->will($this->returnValue($contentType));
-+            ->willReturn($contentType);
-+        $this->request->expects($this->once())
-+            ->method('isHead')
-+            ->willReturn(false);
-         $this->expectOutputString(file_get_contents($file));
- 
-         $this->object->send($file);
-@@ -82,7 +102,10 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-         $this->mime->expects($this->once())
-             ->method('getMimeType')
-             ->with($file)
--            ->will($this->returnValue($contentType));
-+            ->willReturn($contentType);
-+        $this->request->expects($this->once())
-+            ->method('isHead')
-+            ->willReturn(false);
-         $this->expectOutputString(file_get_contents($file));
- 
-         $this->object->send(['filepath' => $file, 'headers' => $headers]);
-@@ -106,4 +129,32 @@ class HttpTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->object->send('nonexistent.file');
-     }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testSendHeadRequest(): void
-+    {
-+        $file = __DIR__ . '/../../_files/javascript.js';
-+        $contentType = 'content/type';
-+
-+        $this->response->expects($this->at(0))
-+            ->method('setHeader')
-+            ->with('Content-length', filesize($file));
-+        $this->response->expects($this->at(1))
-+            ->method('setHeader')
-+            ->with('Content-Type', $contentType);
-+        $this->response->expects($this->once())
-+            ->method('sendHeaders');
-+        $this->mime->expects($this->once())
-+            ->method('getMimeType')
-+            ->with($file)
-+            ->willReturn($contentType);
-+        $this->request->expects($this->once())
-+            ->method('isHead')
-+            ->willReturn(true);
-+
-+        $this->object->send($file);
-+        $this->assertEquals(false, $this->hasOutput());
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php b/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
-index aa527866eff..cd42c8d04b4 100644
---- a/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
-+++ b/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
-@@ -6,28 +6,46 @@
- 
- namespace Magento\Framework\File\Transfer\Adapter;
- 
-+use Magento\Framework\HTTP\PhpEnvironment\Response;
-+use Magento\Framework\File\Mime;
-+use Magento\Framework\App\Request\Http as HttpRequest;
-+use Magento\Framework\App\ObjectManager;
-+use Zend\Http\Headers;
-+
-+/**
-+ * File adapter to send the file to the client.
-+ */
- class Http
- {
-     /**
--     * @var \Magento\Framework\HTTP\PhpEnvironment\Response
-+     * @var Response
-      */
-     private $response;
- 
-     /**
--     * @var \Magento\Framework\File\Mime
-+     * @var Mime
-      */
-     private $mime;
- 
-     /**
--     * @param \Magento\Framework\App\Response\Http $response
--     * @param \Magento\Framework\File\Mime $mime
-+     * @var HttpRequest
-+     */
-+    private $request;
-+
-+    /**
-+     * @param Response $response
-+     * @param Mime $mime
-+     * @param HttpRequest|null $request
-      */
-     public function __construct(
--        \Magento\Framework\HTTP\PhpEnvironment\Response $response,
--        \Magento\Framework\File\Mime $mime
-+        Response $response,
-+        Mime $mime,
-+        HttpRequest $request = null
-     ) {
-         $this->response = $response;
-         $this->mime = $mime;
-+        $objectManager = ObjectManager::getInstance();
-+        $this->request = $request ?: $objectManager->get(HttpRequest::class);
-     }
- 
-     /**
-@@ -46,18 +64,17 @@ class Http
-             throw new \InvalidArgumentException("File '{$filepath}' does not exists.");
-         }
- 
--        $mimeType = $this->mime->getMimeType($filepath);
--        if (is_array($options) && isset($options['headers']) && $options['headers'] instanceof \Zend\Http\Headers) {
--            $this->response->setHeaders($options['headers']);
--        }
--        $this->response->setHeader('Content-length', filesize($filepath));
--        $this->response->setHeader('Content-Type', $mimeType);
-+        $this->prepareResponse($options, $filepath);
- 
--        $this->response->sendHeaders();
-+        if ($this->request->isHead()) {
-+            // Do not send the body on HEAD requests.
-+            return;
-+        }
- 
-         $handle = fopen($filepath, 'r');
-         if ($handle) {
-             while (($buffer = fgets($handle, 4096)) !== false) {
-+                // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
-                 echo $buffer;
-             }
-             if (!feof($handle)) {
-@@ -88,4 +105,22 @@ class Http
- 
-         return $filePath;
-     }
-+
-+    /**
-+     * Set and send all necessary headers.
-+     *
-+     * @param array $options
-+     * @param string $filepath
-+     */
-+    private function prepareResponse($options, string $filepath): void
-+    {
-+        $mimeType = $this->mime->getMimeType($filepath);
-+        if (is_array($options) && isset($options['headers']) && $options['headers'] instanceof Headers) {
-+            $this->response->setHeaders($options['headers']);
-+        }
-+        $this->response->setHeader('Content-length', filesize($filepath));
-+        $this->response->setHeader('Content-Type', $mimeType);
-+
-+        $this->response->sendHeaders();
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
-index 33f458d2082..328a748cfd5 100644
---- a/lib/internal/Magento/Framework/File/Uploader.php
-+++ b/lib/internal/Magento/Framework/File/Uploader.php
-@@ -136,12 +136,16 @@ class Uploader
-     const TMP_NAME_EMPTY = 666;
- 
-     /**
--     * Max Image Width resolution in pixels. For image resizing on client side
-+     * Maximum Image Width resolution in pixels. For image resizing on client side
-+     * @deprecated
-+     * @see \Magento\Framework\Image\Adapter\UploadConfigInterface::getMaxWidth()
-      */
-     const MAX_IMAGE_WIDTH = 1920;
- 
-     /**
--     * Max Image Height resolution in pixels. For image resizing on client side
-+     * Maximum Image Height resolution in pixels. For image resizing on client side
-+     * @deprecated
-+     * @see \Magento\Framework\Image\Adapter\UploadConfigInterface::getMaxHeight()
-      */
-     const MAX_IMAGE_HEIGHT = 1200;
- 
-@@ -187,8 +191,7 @@ class Uploader
-     }
- 
-     /**
--     * Used to save uploaded file into destination folder with
--     * original or new file name (if specified)
-+     * Used to save uploaded file into destination folder with original or new file name (if specified).
-      *
-      * @param string $destinationFolder
-      * @param string $newFileName
-@@ -204,20 +207,22 @@ class Uploader
-         $this->_result = false;
-         $destinationFile = $destinationFolder;
-         $fileName = isset($newFileName) ? $newFileName : $this->_file['name'];
--        $fileName = self::getCorrectFileName($fileName);
-+        $fileName = static::getCorrectFileName($fileName);
-         if ($this->_enableFilesDispersion) {
-             $fileName = $this->correctFileNameCase($fileName);
-             $this->setAllowCreateFolders(true);
--            $this->_dispretionPath = self::getDispersionPath($fileName);
-+            $this->_dispretionPath = static::getDispersionPath($fileName);
-             $destinationFile .= $this->_dispretionPath;
-             $this->_createDestinationFolder($destinationFile);
-         }
- 
-         if ($this->_allowRenameFiles) {
--            $fileName = self::getNewFileName(self::_addDirSeparator($destinationFile) . $fileName);
-+            $fileName = static::getNewFileName(
-+                static::_addDirSeparator($destinationFile) . $fileName
-+            );
-         }
- 
--        $destinationFile = self::_addDirSeparator($destinationFile) . $fileName;
-+        $destinationFile = static::_addDirSeparator($destinationFile) . $fileName;
- 
-         try {
-             $this->_result = $this->_moveFile($this->_file['tmp_name'], $destinationFile);
-@@ -265,6 +270,8 @@ class Uploader
-     }
- 
-     /**
-+     * Set access permissions to file.
-+     *
-      * @param string $file
-      * @return void
-      *
-@@ -541,7 +548,7 @@ class Uploader
- 
-             preg_match("/^(.*?)\[(.*?)\]$/", $fileId, $file);
- 
--            if (is_array($file) && count($file) > 0 && count($file[0]) > 0 && count($file[1]) > 0) {
-+            if (is_array($file) && count($file) > 0 && !empty($file[0]) && !empty($file[1])) {
-                 array_shift($file);
-                 $this->_uploadType = self::MULTIPLE_STYLE;
- 
-diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php b/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
-index 5519245ec24..85d41b69326 100644
---- a/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
-+++ b/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
-@@ -7,7 +7,7 @@ namespace Magento\Framework\Filesystem\Directory;
- 
- /**
-  * Interface \Magento\Framework\Filesystem\Directory\ReadInterface
-- *
-+ * @api
-  */
- interface ReadInterface
- {
-@@ -89,6 +89,7 @@ interface ReadInterface
-      *
-      * @param string $path
-      * @return \Magento\Framework\Filesystem\File\ReadInterface
-+     * @throws \Magento\Framework\Exception\FileSystemException
-      */
-     public function openFile($path);
- 
-diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
-index 78732d73456..3c6d2b7321b 100644
---- a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
-+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
-@@ -9,6 +9,9 @@ namespace Magento\Framework\Filesystem\Directory;
- use Magento\Framework\Exception\FileSystemException;
- use Magento\Framework\Exception\ValidatorException;
- 
-+/**
-+ * Write Interface implementation
-+ */
- class Write extends Read implements WriteInterface
- {
-     /**
-@@ -175,6 +178,7 @@ class Write extends Read implements WriteInterface
-      */
-     public function delete($path = null)
-     {
-+        $exceptionMessages = [];
-         $this->validatePath($path);
-         if (!$this->isExist($path)) {
-             return true;
-@@ -183,11 +187,59 @@ class Write extends Read implements WriteInterface
-         if ($this->driver->isFile($absolutePath)) {
-             $this->driver->deleteFile($absolutePath);
-         } else {
--            $this->driver->deleteDirectory($absolutePath);
-+            try {
-+                $this->deleteFilesRecursively($absolutePath);
-+            } catch (FileSystemException $e) {
-+                $exceptionMessages[] = $e->getMessage();
-+            }
-+            try {
-+                $this->driver->deleteDirectory($absolutePath);
-+            } catch (FileSystemException $e) {
-+                $exceptionMessages[] = $e->getMessage();
-+            }
-+
-+            if (!empty($exceptionMessages)) {
-+                throw new FileSystemException(
-+                    new \Magento\Framework\Phrase(
-+                        \implode(' ', $exceptionMessages)
-+                    )
-+                );
-+            }
-         }
-         return true;
-     }
- 
-+    /**
-+     * Delete files recursively
-+     *
-+     * Implemented in order to delete as much files as possible and collect all exceptions
-+     *
-+     * @param string $path
-+     * @return void
-+     * @throws FileSystemException
-+     */
-+    private function deleteFilesRecursively(string $path)
-+    {
-+        $exceptionMessages = [];
-+        $entitiesList = $this->driver->readDirectoryRecursively($path);
-+        foreach ($entitiesList as $entityPath) {
-+            if ($this->driver->isFile($entityPath)) {
-+                try {
-+                    $this->driver->deleteFile($entityPath);
-+                } catch (FileSystemException $e) {
-+                    $exceptionMessages[] = $e->getMessage();
-+                }
-+            }
-+        }
-+        if (!empty($exceptionMessages)) {
-+            throw new FileSystemException(
-+                new \Magento\Framework\Phrase(
-+                    \implode(' ', $exceptionMessages)
-+                )
-+            );
-+        }
-+    }
-+
-     /**
-      * Change permissions of given path
-      *
-@@ -245,7 +297,7 @@ class Write extends Read implements WriteInterface
-     /**
-      * Check if given path is writable
-      *
--     * @param null $path
-+     * @param string|null $path
-      * @return bool
-      * @throws \Magento\Framework\Exception\FileSystemException
-      * @throws ValidatorException
-diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php b/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
-index c72651a78da..186cbcb81bf 100644
---- a/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
-+++ b/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
-@@ -7,7 +7,7 @@ namespace Magento\Framework\Filesystem\Directory;
- 
- /**
-  * Interface \Magento\Framework\Filesystem\Directory\WriteInterface
-- *
-+ * @api
-  */
- interface WriteInterface extends ReadInterface
- {
-diff --git a/lib/internal/Magento/Framework/Filesystem/DirectoryList.php b/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
-index 20874f60791..b3ab51b9481 100644
---- a/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
-+++ b/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
-@@ -8,6 +8,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\Filesystem;
- 
- /**
-@@ -96,7 +97,8 @@ class DirectoryList
-         static::validate($config);
-         $this->root = $this->normalizePath($root);
-         $this->directories = static::getDefaultConfig();
--        $this->directories[self::SYS_TMP] = [self::PATH => realpath(sys_get_temp_dir())];
-+        $sysTmpPath = get_cfg_var('upload_tmp_dir') ?: sys_get_temp_dir();
-+        $this->directories[self::SYS_TMP] = [self::PATH => realpath($sysTmpPath)];
- 
-         // inject custom values from constructor
-         foreach ($this->directories as $code => $dir) {
-diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/File.php b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
-index b54b02bd6de..59c9775d73a 100644
---- a/lib/internal/Magento/Framework/Filesystem/Driver/File.php
-+++ b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
-@@ -14,6 +14,7 @@ use Magento\Framework\Filesystem\Glob;
- 
- /**
-  * Class File
-+ *
-  * @package Magento\Framework\Filesystem\Driver
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  */
-@@ -399,17 +400,36 @@ class File implements DriverInterface
-      */
-     public function deleteDirectory($path)
-     {
-+        $exceptionMessages = [];
-         $flags = \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS;
-         $iterator = new \FilesystemIterator($path, $flags);
-         /** @var \FilesystemIterator $entity */
-         foreach ($iterator as $entity) {
--            if ($entity->isDir()) {
--                $this->deleteDirectory($entity->getPathname());
--            } else {
--                $this->deleteFile($entity->getPathname());
-+            try {
-+                if ($entity->isDir()) {
-+                    $this->deleteDirectory($entity->getPathname());
-+                } else {
-+                    $this->deleteFile($entity->getPathname());
-+                }
-+            } catch (FileSystemException $exception) {
-+                $exceptionMessages[] = $exception->getMessage();
-             }
-         }
--        $result = @rmdir($this->getScheme() . $path);
-+
-+        if (!empty($exceptionMessages)) {
-+            throw new FileSystemException(
-+                new \Magento\Framework\Phrase(
-+                    \implode(' ', $exceptionMessages)
-+                )
-+            );
-+        }
-+
-+        $fullPath = $this->getScheme() . $path;
-+        if (is_link($fullPath)) {
-+            $result = @unlink($fullPath);
-+        } else {
-+            $result = @rmdir($fullPath);
-+        }
-         if (!$result) {
-             throw new FileSystemException(
-                 new \Magento\Framework\Phrase(
-@@ -843,6 +863,8 @@ class File implements DriverInterface
-     }
- 
-     /**
-+     * Returns an absolute path for the given one.
-+     *
-      * @param string $basePath
-      * @param string $path
-      * @param string|null $scheme
-@@ -879,7 +901,8 @@ class File implements DriverInterface
-     }
- 
-     /**
--     * Fixes path separator
-+     * Fixes path separator.
-+     *
-      * Utility method.
-      *
-      * @param string $path
-diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
-index 236585fa613..f32624f4e75 100644
---- a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
-+++ b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
-@@ -12,7 +12,6 @@ use Magento\Framework\Exception\FileSystemException;
- 
- /**
-  * Class Http
-- *
-  */
- class Http extends File
- {
-@@ -28,21 +27,18 @@ class Http extends File
-      *
-      * @param string $path
-      * @return bool
--     * @throws FileSystemException
-      */
-     public function isExists($path)
-     {
-         $headers = array_change_key_case(get_headers($this->getScheme() . $path, 1), CASE_LOWER);
--
-         $status = $headers[0];
- 
--        if (strpos($status, '200 OK') === false) {
--            $result = false;
--        } else {
--            $result = true;
-+        /* Handling 301 or 302 redirection */
-+        if (isset($headers[1]) && preg_match('/30[12]/', $status)) {
-+            $status = $headers[1];
-         }
- 
--        return $result;
-+        return !(strpos($status, '200 OK') === false);
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
-index 38b581da752..5d9badf4207 100644
---- a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
-+++ b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
-@@ -8,6 +8,10 @@ namespace Magento\Framework\Filesystem\File;
- use Magento\Framework\Filesystem\DriverInterface;
- use Magento\Framework\Filesystem\DriverPool;
- 
-+/**
-+ * Opens a file for reading
-+ * @api
-+ */
- class ReadFactory
- {
-     /**
-@@ -28,7 +32,7 @@ class ReadFactory
-     }
- 
-     /**
--     * Create a readable file
-+     * Create a {@see ReaderInterface}
-      *
-      * @param string $path
-      * @param DriverInterface|string $driver Driver or driver code
-diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
-index a45d6a62488..af2a43ceaed 100644
---- a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
-+++ b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
-@@ -8,6 +8,10 @@ namespace Magento\Framework\Filesystem\File;
- use Magento\Framework\Filesystem\DriverInterface;
- use Magento\Framework\Filesystem\DriverPool;
- 
-+/**
-+ * Opens a file for reading and/or writing
-+ * @api
-+ */
- class WriteFactory extends ReadFactory
- {
-     /**
-@@ -29,12 +33,12 @@ class WriteFactory extends ReadFactory
-     }
- 
-     /**
--     * Create a readable file.
-+     * Create a {@see WriterInterface}
-      *
-      * @param string $path
-      * @param DriverInterface|string $driver Driver or driver code
-      * @param string $mode [optional]
--     * @return Write
-+     * @return WriteInterface
-      */
-     public function create($path, $driver, $mode = 'r')
-     {
-diff --git a/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php b/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php
-index a04e4fcbb12..119c89f0334 100644
---- a/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php
-+++ b/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php
-@@ -17,7 +17,7 @@ class Sftp extends AbstractIo
-     const SSH2_PORT = 22;
- 
-     /**
--     * @var \phpseclib\Net\SFTP $_connection
-+     * @var \phpseclib\Net\SFTP
-      */
-     protected $_connection = null;
- 
-diff --git a/lib/internal/Magento/Framework/Filter/NormalizedToLocalized.php b/lib/internal/Magento/Framework/Filter/NormalizedToLocalized.php
-new file mode 100644
-index 00000000000..bd42c79486e
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Filter/NormalizedToLocalized.php
-@@ -0,0 +1,13 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Framework\Filter;
-+
-+/**
-+ * Class NormalizedToLocalized
-+ */
-+class NormalizedToLocalized extends \Zend_Filter_NormalizedToLocalized
-+{
-+}
-diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
-index 10b6a17ea57..d3a8d5334ab 100644
---- a/lib/internal/Magento/Framework/Filter/Template.php
-+++ b/lib/internal/Magento/Framework/Filter/Template.php
-@@ -9,7 +9,12 @@
-  */
- namespace Magento\Framework\Filter;
- 
-+use Magento\Framework\Model\AbstractExtensibleModel;
-+use Magento\Framework\Model\AbstractModel;
-+
- /**
-+ * Template filter
-+ *
-  * @api
-  */
- class Template implements \Zend_Filter_Interface
-@@ -61,6 +66,18 @@ class Template implements \Zend_Filter_Interface
-      */
-     protected $string;
- 
-+    /**
-+     * @var string[]
-+     */
-+    private $restrictedMethods = [
-+        'addafterfiltercallback',
-+        'getresourcecollection',
-+        'load',
-+        'save',
-+        'getcollection',
-+        'getresource'
-+    ];
-+
-     /**
-      * @param \Magento\Framework\Stdlib\StringUtils $string
-      * @param array $variables
-@@ -228,8 +245,9 @@ class Template implements \Zend_Filter_Interface
-     }
- 
-     /**
--     * Adds a callback to run after main filtering has happened. Callback must accept a single argument and return
--     * a string of the processed value.
-+     * Adds a callback to run after main filtering has happened.
-+     *
-+     * Callback must accept a single argument and return a string of the processed value.
-      *
-      * @param callable $afterFilterCallback
-      * @return $this
-@@ -257,6 +275,8 @@ class Template implements \Zend_Filter_Interface
-     }
- 
-     /**
-+     * Get var directive
-+     *
-      * @param string[] $construction
-      * @return string
-      */
-@@ -288,7 +308,7 @@ class Template implements \Zend_Filter_Interface
-     {
-         // Processing of {template config_path=... [...]} statement
-         $templateParameters = $this->getParameters($construction[2]);
--        if (!isset($templateParameters['config_path']) or !$this->getTemplateProcessor()) {
-+        if (!isset($templateParameters['config_path']) || !$this->getTemplateProcessor()) {
-             // Not specified template or not set include processor
-             $replacedValue = '{Error in template processing}';
-         } else {
-@@ -302,6 +322,8 @@ class Template implements \Zend_Filter_Interface
-     }
- 
-     /**
-+     * Get depend directive
-+     *
-      * @param string[] $construction
-      * @return string
-      */
-@@ -320,6 +342,8 @@ class Template implements \Zend_Filter_Interface
-     }
- 
-     /**
-+     * If directive
-+     *
-      * @param string[] $construction
-      * @return string
-      */
-@@ -358,6 +382,46 @@ class Template implements \Zend_Filter_Interface
-         return $params;
-     }
- 
-+    /**
-+     * Validate method call initiated in a template.
-+     *
-+     * Deny calls for methods that may disrupt template processing.
-+     *
-+     * @param object $object
-+     * @param string $method
-+     * @return void
-+     * @throws \InvalidArgumentException
-+     */
-+    private function validateVariableMethodCall($object, string $method): void
-+    {
-+        if ($object === $this) {
-+            if (in_array(mb_strtolower($method), $this->restrictedMethods)) {
-+                throw new \InvalidArgumentException("Method $method cannot be called from template.");
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Check allowed methods for data objects.
-+     *
-+     * Deny calls for methods that may disrupt template processing.
-+     *
-+     * @param object $object
-+     * @param string $method
-+     * @return bool
-+     * @throws \InvalidArgumentException
-+     */
-+    private function isAllowedDataObjectMethod($object, string $method): bool
-+    {
-+        if ($object instanceof AbstractExtensibleModel || $object instanceof AbstractModel) {
-+            if (in_array(mb_strtolower($method), $this->restrictedMethods)) {
-+                throw new \InvalidArgumentException("Method $method cannot be called from template.");
-+            }
-+        }
-+
-+        return true;
-+    }
-+
-     /**
-      * Return variable value for var construction
-      *
-@@ -374,7 +438,7 @@ class Template implements \Zend_Filter_Interface
-         $stackVars = $tokenizer->tokenize();
-         $result = $default;
-         $last = 0;
--        for ($i = 0; $i < count($stackVars); $i++) {
-+        for ($i = 0, $count = count($stackVars); $i < $count; $i++) {
-             if ($i == 0 && isset($this->templateVars[$stackVars[$i]['name']])) {
-                 // Getting of template value
-                 $stackVars[$i]['variable'] = & $this->templateVars[$stackVars[$i]['name']];
-@@ -396,21 +460,27 @@ class Template implements \Zend_Filter_Interface
-                             || substr($stackVars[$i]['name'], 0, 3) == 'get'
-                     ) {
-                         $stackVars[$i]['args'] = $this->getStackArgs($stackVars[$i]['args']);
--                        $stackVars[$i]['variable'] = call_user_func_array(
--                            [$stackVars[$i - 1]['variable'], $stackVars[$i]['name']],
--                            $stackVars[$i]['args']
--                        );
-+
-+                        if ($this->isAllowedDataObjectMethod($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])) {
-+                            $stackVars[$i]['variable'] = call_user_func_array(
-+                                [$stackVars[$i - 1]['variable'], $stackVars[$i]['name']],
-+                                $stackVars[$i]['args']
-+                            );
-+                        }
-                     }
-                 }
-                 $last = $i;
--            } elseif (isset($stackVars[$i - 1]['variable']) && $stackVars[$i]['type'] == 'method') {
-+            } elseif (isset($stackVars[$i - 1]['variable'])
-+                && is_object($stackVars[$i - 1]['variable'])
-+                && $stackVars[$i]['type'] == 'method'
-+            ) {
-                 // Calling object methods
--                if (method_exists($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])) {
--                    $stackVars[$i]['args'] = $this->getStackArgs($stackVars[$i]['args']);
--                    $stackVars[$i]['variable'] = call_user_func_array(
--                        [$stackVars[$i - 1]['variable'], $stackVars[$i]['name']],
--                        $stackVars[$i]['args']
--                    );
-+                $object = $stackVars[$i - 1]['variable'];
-+                $method = $stackVars[$i]['name'];
-+                if (method_exists($object, $method)) {
-+                    $args = $this->getStackArgs($stackVars[$i]['args']);
-+                    $this->validateVariableMethodCall($object, $method);
-+                    $stackVars[$i]['variable'] = call_user_func_array([$object, $method], $args);
-                 }
-                 $last = $i;
-             }
-diff --git a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/AbstractTokenizer.php b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/AbstractTokenizer.php
-index 20fd7c2669c..b72305c6f5b 100644
---- a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/AbstractTokenizer.php
-+++ b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/AbstractTokenizer.php
-@@ -94,7 +94,7 @@ abstract class AbstractTokenizer
-      */
-     public function setString($value)
-     {
--        $this->_string = urldecode($value);
-+        $this->_string = rawurldecode($value);
-         $this->reset();
-     }
- 
-diff --git a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php
-index 67c2d17abe2..574ef9faf74 100644
---- a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php
-+++ b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php
-@@ -313,6 +313,6 @@ class Variable extends \Magento\Framework\Filter\Template\Tokenizer\AbstractToke
-         if (!$this->isNumeric()) {
-             $this->prev();
-         }
--        return floatval($value);
-+        return (float)$value;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
-index 4883dc5fbe3..e4a2dc48d11 100644
---- a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
-+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
-@@ -6,6 +6,8 @@
- 
- namespace Magento\Framework\Filter\Test\Unit;
- 
-+use Magento\Store\Model\Store;
-+
- class TemplateTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -13,10 +15,16 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
-      */
-     private $templateFilter;
- 
-+    /**
-+     * @var Store
-+     */
-+    private $store;
-+
-     protected function setUp()
-     {
-         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->templateFilter = $objectManager->getObject(\Magento\Framework\Filter\Template::class);
-+        $this->store = $objectManager->getObject(Store::class);
-     }
- 
-     public function testFilter()
-@@ -380,4 +388,55 @@ TEMPLATE;
-         $dataObject->setAllVisibleItems($visibleItems);
-         return $dataObject;
-     }
-+
-+    /**
-+     * Check that if calling a method of an object fails expected result is returned.
-+     */
-+    public function testInvalidMethodCall()
-+    {
-+        $this->templateFilter->setVariables(['dateTime' => '\DateTime']);
-+        $this->assertEquals(
-+            '\DateTime',
-+            $this->templateFilter->filter('{{var dateTime.createFromFormat(\'d\',\'1548201468\')}}')
-+        );
-+    }
-+
-+    /**
-+     * Test adding callbacks when already filtering.
-+     *
-+     * @expectedException \InvalidArgumentException
-+     */
-+    public function testInappropriateCallbacks()
-+    {
-+        $this->templateFilter->setVariables(['filter' => $this->templateFilter]);
-+        $this->templateFilter->filter('Test {{var filter.addAfterFilterCallback(\'mb_strtolower\')}}');
-+    }
-+
-+    /**
-+     * Test adding callbacks when already filtering.
-+     *
-+     * @expectedException \InvalidArgumentException
-+     * @dataProvider disallowedMethods
-+     */
-+    public function testDisallowedMethods($method)
-+    {
-+        $this->templateFilter->setVariables(['store' => $this->store]);
-+        $this->templateFilter->filter('{{var store.'.$method.'()}}');
-+    }
-+
-+    /**
-+     * Data for testDisallowedMethods method
-+     *
-+     * @return array
-+     */
-+    public function disallowedMethods()
-+    {
-+        return [
-+            ['getResourceCollection'],
-+            ['load'],
-+            ['save'],
-+            ['getCollection'],
-+            ['getResource'],
-+        ];
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TranslitTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TranslitTest.php
-index dd78fb35599..1fa243219df 100644
---- a/lib/internal/Magento/Framework/Filter/Test/Unit/TranslitTest.php
-+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/TranslitTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Framework\Filter\Test\Unit;
- 
-+/**
-+ * Translit test.
-+ */
- class TranslitTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TranslitUrlTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TranslitUrlTest.php
-index 166edd36df6..012c540e6ab 100644
---- a/lib/internal/Magento/Framework/Filter/Test/Unit/TranslitUrlTest.php
-+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/TranslitUrlTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Framework\Filter\Test\Unit;
- 
-+/**
-+ * Translit url test.
-+ */
- class TranslitUrlTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-diff --git a/lib/internal/Magento/Framework/Filter/Translit.php b/lib/internal/Magento/Framework/Filter/Translit.php
-index 7a84a6e33af..a6162aa7a7f 100644
---- a/lib/internal/Magento/Framework/Filter/Translit.php
-+++ b/lib/internal/Magento/Framework/Filter/Translit.php
-@@ -409,7 +409,7 @@ class Translit implements \Zend_Filter_Interface
-         $convertConfig = $config->getValue('url/convert', 'default');
-         if ($convertConfig) {
-             foreach ($convertConfig as $configValue) {
--                $this->convertTable[strval($configValue['from'])] = strval($configValue['to']);
-+                $this->convertTable[(string)$configValue['from']] = (string)$configValue['to'];
-             }
-         }
-     }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Config.php b/lib/internal/Magento/Framework/GraphQl/Config.php
-index 8d40d7fa6bb..ec22b742b1d 100644
---- a/lib/internal/Magento/Framework/GraphQl/Config.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Config.php
-@@ -10,6 +10,7 @@ namespace Magento\Framework\GraphQl;
- use Magento\Framework\Config\DataInterface;
- use Magento\Framework\GraphQl\Config\ConfigElementFactoryInterface;
- use Magento\Framework\GraphQl\Config\ConfigElementInterface;
-+use Magento\Framework\GraphQl\Query\Fields as QueryFields;
- 
- /**
-  * Provides access to typing information for a configured GraphQL schema.
-@@ -26,24 +27,28 @@ class Config implements ConfigInterface
-      */
-     private $configElementFactory;
- 
-+    /**
-+     * @var QueryFields
-+     */
-+    private $queryFields;
-+
-     /**
-      * @param DataInterface $data
-      * @param ConfigElementFactoryInterface $configElementFactory
-+     * @param QueryFields $queryFields
-      */
-     public function __construct(
-         DataInterface $data,
--        ConfigElementFactoryInterface $configElementFactory
-+        ConfigElementFactoryInterface $configElementFactory,
-+        QueryFields $queryFields
-     ) {
-         $this->configData = $data;
-         $this->configElementFactory = $configElementFactory;
-+        $this->queryFields = $queryFields;
-     }
- 
-     /**
--     * Get a data object with data pertaining to a GraphQL type's structural makeup.
--     *
--     * @param string $configElementName
--     * @return ConfigElementInterface
--     * @throws \LogicException
-+     * @inheritdoc
-      */
-     public function getConfigElement(string $configElementName) : ConfigElementInterface
-     {
-@@ -53,22 +58,38 @@ class Config implements ConfigInterface
-                 sprintf('Config element "%s" is not declared in GraphQL schema', $configElementName)
-             );
-         }
-+
-+        $fieldsInQuery = $this->queryFields->getFieldsUsedInQuery();
-+        if (isset($data['fields'])) {
-+            if (!empty($fieldsInQuery)) {
-+                foreach (array_keys($data['fields']) as $fieldName) {
-+                    if (!isset($fieldsInQuery[$fieldName])) {
-+                        unset($data['fields'][$fieldName]);
-+                    }
-+                }
-+            }
-+
-+            ksort($data['fields']);
-+        }
-+
-         return $this->configElementFactory->createFromConfigData($data);
-     }
- 
-     /**
--     * Return all type names declared in a GraphQL schema's configuration.
--     *
--     * @return string[]
-+     * @inheritdoc
-      */
--    public function getDeclaredTypeNames() : array
-+    public function getDeclaredTypes() : array
-     {
-         $types = [];
-         foreach ($this->configData->get(null) as $item) {
--            if (isset($item['type']) && $item['type'] == 'graphql_type') {
--                $types[] = $item['name'];
-+            if (isset($item['type'])) {
-+                $types[] = [
-+                    'name' => $item['name'],
-+                    'type' => $item['type'],
-+                ];
-             }
-         }
-+
-         return $types;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/Enum.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/Enum.php
-index b1210e986b7..994ae489af1 100644
---- a/lib/internal/Magento/Framework/GraphQl/Config/Element/Enum.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/Enum.php
-@@ -37,7 +37,7 @@ class Enum implements ConfigElementInterface
-     public function __construct(
-         string $name,
-         array $values,
--        string $description = ""
-+        string $description
-     ) {
-         $this->name = $name;
-         $this->values = $values;
-diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/Field.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/Field.php
-index 76cfa06f9c1..0fc51e4ecd0 100644
---- a/lib/internal/Magento/Framework/GraphQl/Config/Element/Field.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/Field.php
-@@ -48,6 +48,11 @@ class Field implements OutputFieldInterface
-      */
-     private $description;
- 
-+    /**
-+     * @var array
-+     */
-+    private $cache;
-+
-     /**
-      * @param string $name
-      * @param string $type
-@@ -57,6 +62,7 @@ class Field implements OutputFieldInterface
-      * @param string $resolver
-      * @param string $description
-      * @param array $arguments
-+     * @param array $cache
-      */
-     public function __construct(
-         string $name,
-@@ -66,7 +72,8 @@ class Field implements OutputFieldInterface
-         string $itemType = '',
-         string $resolver = '',
-         string $description = '',
--        array $arguments = []
-+        array $arguments = [],
-+        array $cache = []
-     ) {
-         $this->name = $name;
-         $this->type = $isList ? $itemType : $type;
-@@ -75,6 +82,7 @@ class Field implements OutputFieldInterface
-         $this->resolver = $resolver;
-         $this->description = $description;
-         $this->arguments = $arguments;
-+        $this->cache = $cache;
-     }
- 
-     /**
-@@ -146,4 +154,14 @@ class Field implements OutputFieldInterface
-     {
-         return $this->description;
-     }
-+
-+    /**
-+     * Return the cache tag for the field.
-+     *
-+     * @return array|null
-+     */
-+    public function getCache() : array
-+    {
-+        return $this->cache;
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldFactory.php
-index 1a022e92c82..60191b69be4 100644
---- a/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldFactory.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldFactory.php
-@@ -42,10 +42,11 @@ class FieldFactory
-         array $fieldData,
-         array $arguments = []
-     ) : Field {
--        $arraySign = '/^.*(\[\])$/';
-+        $fieldType = $fieldData['type'];
-         $isList = false;
- 
--        if (preg_match($arraySign, $fieldData['type'])) {
-+        //check if type ends with []
-+        if ($fieldType{strlen($fieldType) - 2} == '[' && $fieldType{strlen($fieldType) - 1} == ']') {
-             $isList = true;
-             $fieldData['type'] = str_replace('[]', '', $fieldData['type']);
-             $fieldData['itemType'] = str_replace('[]', '', $fieldData['type']);
-@@ -61,7 +62,8 @@ class FieldFactory
-                 'itemType' => isset($fieldData['itemType']) ? $fieldData['itemType'] : '',
-                 'resolver' => isset($fieldData['resolver']) ? $fieldData['resolver'] : '',
-                 'description' => isset($fieldData['description']) ? $fieldData['description'] : '',
--                'arguments' => $arguments
-+                'cache' => isset($fieldData['cache']) ? $fieldData['cache'] : [],
-+                'arguments' => $arguments,
-             ]
-         );
-     }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldsFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldsFactory.php
-new file mode 100644
-index 00000000000..ca6b67eac3d
---- /dev/null
-+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldsFactory.php
-@@ -0,0 +1,62 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\GraphQl\Config\Element;
-+
-+/**
-+ * Fields object factory
-+ */
-+class FieldsFactory
-+{
-+    /**
-+     * @var ArgumentFactory
-+     */
-+    private $argumentFactory;
-+
-+    /**
-+     * @var FieldFactory
-+     */
-+    private $fieldFactory;
-+
-+    /**
-+     * @param ArgumentFactory $argumentFactory
-+     * @param FieldFactory $fieldFactory
-+     */
-+    public function __construct(
-+        ArgumentFactory $argumentFactory,
-+        FieldFactory $fieldFactory
-+    ) {
-+        $this->argumentFactory = $argumentFactory;
-+        $this->fieldFactory = $fieldFactory;
-+    }
-+
-+    /**
-+     * Create a fields object from a configured array with optional arguments.
-+     *
-+     * Field data must contain name and type. Other values are optional and include required, itemType, description,
-+     * and resolver. Arguments array must be in the format of [$argumentData['name'] => $argumentData].
-+     *
-+     * @param array $fieldsData
-+     * @return Field[]
-+     */
-+    public function createFromConfigData(
-+        array $fieldsData
-+    ) : array {
-+        $fields = [];
-+        foreach ($fieldsData as $fieldData) {
-+            $arguments = [];
-+            foreach ($fieldData['arguments'] as $argumentData) {
-+                $arguments[$argumentData['name']] = $this->argumentFactory->createFromConfigData($argumentData);
-+            }
-+            $fields[$fieldData['name']] = $this->fieldFactory->createFromConfigData(
-+                $fieldData,
-+                $arguments
-+            );
-+        }
-+        return $fields;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/Input.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/Input.php
-new file mode 100644
-index 00000000000..8e86f701672
---- /dev/null
-+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/Input.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\GraphQl\Config\Element;
-+
-+/**
-+ * Class representing 'input' GraphQL config element.
-+ */
-+class Input implements TypeInterface
-+{
-+    /**
-+     * @var string
-+     */
-+    private $name;
-+
-+    /**
-+     * @var Field[]
-+     */
-+    private $fields;
-+
-+    /**
-+     * @var string
-+     */
-+    private $description;
-+
-+    /**
-+     * @param string $name
-+     * @param Field[] $fields
-+     * @param string $description
-+     */
-+    public function __construct(
-+        string $name,
-+        array $fields,
-+        string $description
-+    ) {
-+        $this->name = $name;
-+        $this->fields = $fields;
-+        $this->description = $description;
-+    }
-+
-+    /**
-+     * Get the type name.
-+     *
-+     * @return string
-+     */
-+    public function getName(): string
-+    {
-+        return $this->name;
-+    }
-+
-+    /**
-+     * Get a list of fields that make up the possible return or input values of a type.
-+     *
-+     * @return Field[]
-+     */
-+    public function getFields(): array
-+    {
-+        return $this->fields;
-+    }
-+
-+    /**
-+     * Get a human-readable description of the type.
-+     *
-+     * @return string
-+     */
-+    public function getDescription(): string
-+    {
-+        return $this->description;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php
-new file mode 100644
-index 00000000000..0e7ccb831a5
---- /dev/null
-+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php
-@@ -0,0 +1,79 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\GraphQl\Config\Element;
-+
-+use Magento\Framework\GraphQl\Config\ConfigElementFactoryInterface;
-+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
-+use Magento\Framework\ObjectManagerInterface;
-+
-+/**
-+ * Factory for config elements of 'input' type.
-+ */
-+class InputFactory implements ConfigElementFactoryInterface
-+{
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var FieldsFactory
-+     */
-+    private $fieldsFactory;
-+
-+    /**
-+     * @param ObjectManagerInterface $objectManager
-+     * @param FieldsFactory $fieldsFactory
-+     */
-+    public function __construct(
-+        ObjectManagerInterface $objectManager,
-+        FieldsFactory $fieldsFactory
-+    ) {
-+        $this->objectManager = $objectManager;
-+        $this->fieldsFactory = $fieldsFactory;
-+    }
-+
-+    /**
-+     * Instantiate an object representing 'input' GraphQL config element.
-+     *
-+     * @param array $data
-+     * @return ConfigElementInterface
-+     */
-+    public function createFromConfigData(array $data): ConfigElementInterface
-+    {
-+        $fields = isset($data['fields']) ? $this->fieldsFactory->createFromConfigData($data['fields']) : [];
-+
-+        return $this->create(
-+            $data,
-+            $fields
-+        );
-+    }
-+
-+    /**
-+     * Create input type object based off array of configured GraphQL InputType data.
-+     *
-+     * Type data must contain name and the type's fields. Optional data includes description.
-+     *
-+     * @param array $typeData
-+     * @param array $fields
-+     * @return Input
-+     */
-+    private function create(
-+        array $typeData,
-+        array $fields
-+    ): Input {
-+        return $this->objectManager->create(
-+            Input::class,
-+            [
-+                'name' => $typeData['name'],
-+                'fields' => $fields,
-+                'description' => isset($typeData['description']) ? $typeData['description'] : ''
-+            ]
-+        );
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceType.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceType.php
-index 320199c14a6..73ebd42acfb 100644
---- a/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceType.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceType.php
-@@ -8,7 +8,7 @@ declare(strict_types=1);
- namespace Magento\Framework\GraphQl\Config\Element;
- 
- /**
-- * Describes the configured data for a GraphQL interface type.
-+ * Class representing 'interface' GraphQL config element.
-  */
- class InterfaceType implements TypeInterface
- {
-@@ -42,7 +42,7 @@ class InterfaceType implements TypeInterface
-         string $name,
-         string $typeResolver,
-         array $fields,
--        string $description = ""
-+        string $description
-     ) {
-         $this->name = $name;
-         $this->fields = $fields;
-diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
-index 24ff439db03..20d017cc710 100644
---- a/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
-@@ -8,7 +8,7 @@ declare(strict_types=1);
- namespace Magento\Framework\GraphQl\Config\Element;
- 
- /**
-- * Describes all the configured data of an Output or Input type in GraphQL.
-+ * Class representing 'type' GraphQL config element.
-  */
- class Type implements TypeInterface
- {
-diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
-index c5f3187b048..5dd477a0508 100644
---- a/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
-@@ -22,28 +22,20 @@ class TypeFactory implements ConfigElementFactoryInterface
-     private $objectManager;
- 
-     /**
--     * @var ArgumentFactory
-+     * @var FieldsFactory
-      */
--    private $argumentFactory;
--
--    /**
--     * @var FieldFactory
--     */
--    private $fieldFactory;
-+    private $fieldsFactory;
- 
-     /**
-      * @param ObjectManagerInterface $objectManager
--     * @param ArgumentFactory $argumentFactory
--     * @param FieldFactory $fieldFactory
-+     * @param FieldsFactory $fieldsFactory
-      */
-     public function __construct(
-         ObjectManagerInterface $objectManager,
--        ArgumentFactory $argumentFactory,
--        FieldFactory $fieldFactory
-+        FieldsFactory $fieldsFactory
-     ) {
-         $this->objectManager = $objectManager;
--        $this->argumentFactory = $argumentFactory;
--        $this->fieldFactory = $fieldFactory;
-+        $this->fieldsFactory = $fieldsFactory;
-     }
- 
-     /**
-@@ -54,18 +46,8 @@ class TypeFactory implements ConfigElementFactoryInterface
-      */
-     public function createFromConfigData(array $data): ConfigElementInterface
-     {
--        $fields = [];
--        $data['fields'] = isset($data['fields']) ? $data['fields'] : [];
--        foreach ($data['fields'] as $field) {
--            $arguments = [];
--            foreach ($field['arguments'] as $argument) {
--                $arguments[$argument['name']] = $this->argumentFactory->createFromConfigData($argument);
--            }
--            $fields[$field['name']] = $this->fieldFactory->createFromConfigData(
--                $field,
--                $arguments
--            );
--        }
-+        $fields = isset($data['fields']) ? $this->fieldsFactory->createFromConfigData($data['fields']) : [];
-+
-         return $this->create(
-             $data,
-             $fields
-@@ -73,10 +55,10 @@ class TypeFactory implements ConfigElementFactoryInterface
-     }
- 
-     /**
--     * Create type object based off array of configured GraphQL Output/InputType data.
-+     * Create type object based off array of configured GraphQL Type data.
-      *
-      * Type data must contain name and the type's fields. Optional data includes 'implements' (i.e. the interfaces
--     * implemented by the types), and description. An InputType cannot implement an interface.
-+     * implemented by the types), and description.
-      *
-      * @param array $typeData
-      * @param array $fields
-diff --git a/lib/internal/Magento/Framework/GraphQl/ConfigInterface.php b/lib/internal/Magento/Framework/GraphQl/ConfigInterface.php
-index c2670967f1d..f7d6cf49e18 100644
---- a/lib/internal/Magento/Framework/GraphQl/ConfigInterface.php
-+++ b/lib/internal/Magento/Framework/GraphQl/ConfigInterface.php
-@@ -25,9 +25,11 @@ interface ConfigInterface
-     public function getConfigElement(string $configElementName) : ConfigElementInterface;
- 
-     /**
--     * Return all type names from a GraphQL schema's configuration.
-+     * Return all type names declared in a GraphQL schema's configuration and their type.
-      *
--     * @return string[]
-+     * Format is ['name' => 'example value', 'type' = 'example value']
-+     *
-+     * @return array $types
-      */
--    public function getDeclaredTypeNames() : array;
-+    public function getDeclaredTypes() : array;
- }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAlreadyExistsException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAlreadyExistsException.php
-new file mode 100644
-index 00000000000..8275219e9e5
---- /dev/null
-+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAlreadyExistsException.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\GraphQl\Exception;
-+
-+use GraphQL\Error\ClientAware;
-+use Magento\Framework\Exception\AlreadyExistsException;
-+use Magento\Framework\Phrase;
-+
-+/**
-+ * Exception for GraphQL to be thrown when data already exists
-+ */
-+class GraphQlAlreadyExistsException extends AlreadyExistsException implements ClientAware
-+{
-+    /**
-+     * Describing a category of the error
-+     */
-+    const EXCEPTION_CATEGORY = 'graphql-already-exists';
-+
-+    /**
-+     * @var boolean
-+     */
-+    private $isSafe;
-+
-+    /**
-+     * @param Phrase $phrase
-+     * @param \Exception $cause
-+     * @param int $code
-+     * @param boolean $isSafe
-+     */
-+    public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0, $isSafe = true)
-+    {
-+        $this->isSafe = $isSafe;
-+        parent::__construct($phrase, $cause, $code);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function isClientSafe(): bool
-+    {
-+        return $this->isSafe;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getCategory(): string
-+    {
-+        return self::EXCEPTION_CATEGORY;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthenticationException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthenticationException.php
-new file mode 100644
-index 00000000000..44c3d07bd18
---- /dev/null
-+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthenticationException.php
-@@ -0,0 +1,56 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\GraphQl\Exception;
-+
-+use GraphQL\Error\ClientAware;
-+use Magento\Framework\Exception\AuthenticationException;
-+use Magento\Framework\Phrase;
-+
-+/**
-+ * Exception for GraphQL to be thrown when authentication fails
-+ */
-+class GraphQlAuthenticationException extends AuthenticationException implements ClientAware
-+{
-+    /**
-+     * Describing a category of the error
-+     */
-+    const EXCEPTION_CATEGORY = 'graphql-authentication';
-+
-+    /**
-+     * @var boolean
-+     */
-+    private $isSafe;
-+
-+    /**
-+     * @param Phrase $phrase
-+     * @param \Exception $cause
-+     * @param int $code
-+     * @param boolean $isSafe
-+     */
-+    public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0, $isSafe = true)
-+    {
-+        $this->isSafe = $isSafe;
-+        parent::__construct($phrase, $cause, $code);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function isClientSafe(): bool
-+    {
-+        return $this->isSafe;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getCategory(): string
-+    {
-+        return self::EXCEPTION_CATEGORY;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthorizationException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthorizationException.php
-index 5b76e0ab9f5..f1232ebd4d1 100644
---- a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthorizationException.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthorizationException.php
-@@ -11,7 +11,7 @@ use Magento\Framework\Phrase;
- use Magento\Framework\Exception\AuthorizationException;
- 
- /**
-- * Class GraphQlAuthorizationException
-+ * Exception for GraphQL to be thrown when authorization fails
-  */
- class GraphQlAuthorizationException extends AuthorizationException implements \GraphQL\Error\ClientAware
- {
-@@ -37,7 +37,7 @@ class GraphQlAuthorizationException extends AuthorizationException implements \G
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function isClientSafe() : bool
-     {
-@@ -45,7 +45,7 @@ class GraphQlAuthorizationException extends AuthorizationException implements \G
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function getCategory() : string
-     {
-diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php
-index 6f97f062613..429b7c04b74 100644
---- a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php
-@@ -37,7 +37,7 @@ class GraphQlInputException extends InputException implements \GraphQL\Error\Cli
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function isClientSafe() : bool
-     {
-@@ -45,7 +45,7 @@ class GraphQlInputException extends InputException implements \GraphQL\Error\Cli
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function getCategory() : string
-     {
-diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlNoSuchEntityException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlNoSuchEntityException.php
-index 05c5925e8d1..2a0b9d3bc2e 100644
---- a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlNoSuchEntityException.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlNoSuchEntityException.php
-@@ -11,7 +11,7 @@ use Magento\Framework\Exception\NoSuchEntityException;
- use Magento\Framework\Phrase;
- 
- /**
-- * Class GraphQlNoSuchEntityException
-+ * Exception for GraphQL to be thrown when entity does not exists
-  */
- class GraphQlNoSuchEntityException extends NoSuchEntityException implements \GraphQL\Error\ClientAware
- {
-@@ -37,7 +37,7 @@ class GraphQlNoSuchEntityException extends NoSuchEntityException implements \Gra
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function isClientSafe() : bool
-     {
-@@ -45,7 +45,7 @@ class GraphQlNoSuchEntityException extends NoSuchEntityException implements \Gra
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function getCategory() : string
-     {
-diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
-new file mode 100644
-index 00000000000..a34c0a9d421
---- /dev/null
-+++ b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
-@@ -0,0 +1,90 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\GraphQl\Query;
-+
-+use GraphQL\Language\AST\Node;
-+use GraphQL\Language\AST\NodeKind;
-+
-+/**
-+ * This class holds a list of all queried fields and is used to enable performance optimization for schema loading.
-+ */
-+class Fields
-+{
-+    /**
-+     * @var string[]
-+     */
-+    private $fieldsUsedInQuery = [];
-+
-+    /**
-+     * Set Query for extracting list of fields.
-+     *
-+     * @param string $query
-+     * @param array|null $variables
-+     *
-+     * @return void
-+     */
-+    public function setQuery($query, array $variables = null)
-+    {
-+        $queryFields = [];
-+        try {
-+            $queryAst = \GraphQL\Language\Parser::parse(new \GraphQL\Language\Source($query ?: '', 'GraphQL'));
-+            \GraphQL\Language\Visitor::visit(
-+                $queryAst,
-+                [
-+                    'leave' => [
-+                        NodeKind::NAME => function (Node $node) use (&$queryFields) {
-+                            $queryFields[$node->value] = $node->value;
-+                        }
-+                    ]
-+                ]
-+            );
-+            if (isset($variables)) {
-+                $queryFields = array_merge($queryFields, $this->extractVariables($variables));
-+            }
-+        } catch (\Exception $e) {
-+            // If a syntax error is encountered do not collect fields
-+        }
-+        if (isset($queryFields['IntrospectionQuery'])) {
-+            // It must be possible to query any fields during introspection query
-+            $queryFields = [];
-+        }
-+        $this->fieldsUsedInQuery = $queryFields;
-+    }
-+
-+    /**
-+     * Get list of fields used in GraphQL query.
-+     *
-+     * This method is stateful and relies on the query being set with setQuery.
-+     *
-+     * @return string[]
-+     */
-+    public function getFieldsUsedInQuery()
-+    {
-+        return $this->fieldsUsedInQuery;
-+    }
-+
-+    /**
-+     * Extract and return list of all used fields in GraphQL query's variables
-+     *
-+     * @param array $variables
-+     *
-+     * @return string[]
-+     */
-+    private function extractVariables(array $variables): array
-+    {
-+        $fields = [];
-+        foreach ($variables as $key => $value) {
-+            if (is_array($value)) {
-+                $fields = array_merge($fields, $this->extractVariables($value));
-+            }
-+            $fields[$key] = $key;
-+        }
-+
-+        return $fields;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php b/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
-new file mode 100644
-index 00000000000..2fdb3df5f6d
---- /dev/null
-+++ b/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
-@@ -0,0 +1,42 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\GraphQl\Query;
-+
-+use Magento\Framework\App\DeploymentConfig;
-+
-+/**
-+ * Class for fetching the availability of introspection queries
-+ */
-+class IntrospectionConfiguration
-+{
-+    private const CONFIG_PATH_DISABLE_INTROSPECTION = 'graphql/disable_introspection';
-+
-+    /**
-+     * @var DeploymentConfig
-+     */
-+    private $deploymentConfig;
-+
-+    /**
-+     * @param DeploymentConfig $deploymentConfig
-+     */
-+    public function __construct(
-+        DeploymentConfig $deploymentConfig
-+    ) {
-+        $this->deploymentConfig = $deploymentConfig;
-+    }
-+
-+    /**
-+     * Check the the environment config to determine if introspection should be disabled.
-+     *
-+     * @return bool
-+     */
-+    public function isIntrospectionDisabled(): bool
-+    {
-+        return (bool)$this->deploymentConfig->get(self::CONFIG_PATH_DISABLE_INTROSPECTION);
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php b/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
-new file mode 100644
-index 00000000000..2b9ce9b01b5
---- /dev/null
-+++ b/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\GraphQl\Query;
-+
-+use GraphQL\Validator\DocumentValidator;
-+use GraphQL\Validator\Rules\DisableIntrospection;
-+use GraphQL\Validator\Rules\QueryDepth;
-+use GraphQL\Validator\Rules\QueryComplexity;
-+
-+/**
-+ * QueryComplexityLimiter
-+ *
-+ * Sets limits for query complexity. A single GraphQL query can potentially
-+ * generate thousands of database operations so, the very complex queries
-+ * should be filtered and rejected.
-+ *
-+ * https://github.com/webonyx/graphql-php/blob/master/docs/security.md#query-complexity-analysis
-+ */
-+class QueryComplexityLimiter
-+{
-+    /**
-+     * @var int
-+     */
-+    private $queryDepth;
-+
-+    /**
-+     * @var int
-+     */
-+    private $queryComplexity;
-+
-+    /**
-+     * @var IntrospectionConfiguration
-+     */
-+    private $introspectionConfig;
-+
-+    /**
-+     * @param int $queryDepth
-+     * @param int $queryComplexity
-+     * @param IntrospectionConfiguration $introspectionConfig
-+     */
-+    public function __construct(
-+        int $queryDepth,
-+        int $queryComplexity,
-+        IntrospectionConfiguration $introspectionConfig
-+    ) {
-+        $this->queryDepth = $queryDepth;
-+        $this->queryComplexity = $queryComplexity;
-+        $this->introspectionConfig = $introspectionConfig;
-+    }
-+
-+    /**
-+     * Sets limits for query complexity
-+     *
-+     * @return void
-+     */
-+    public function execute(): void
-+    {
-+        DocumentValidator::addRule(new QueryComplexity($this->queryComplexity));
-+        DocumentValidator::addRule(
-+            new DisableIntrospection((int) $this->introspectionConfig->isIntrospectionDisabled())
-+        );
-+        DocumentValidator::addRule(new QueryDepth($this->queryDepth));
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/GraphQl/Query/QueryProcessor.php b/lib/internal/Magento/Framework/GraphQl/Query/QueryProcessor.php
-index 94a0e5a1c1a..0a0dba36ef0 100644
---- a/lib/internal/Magento/Framework/GraphQl/Query/QueryProcessor.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Query/QueryProcessor.php
-@@ -7,9 +7,6 @@ declare(strict_types=1);
- 
- namespace Magento\Framework\GraphQl\Query;
- 
--use GraphQL\Validator\DocumentValidator;
--use GraphQL\Validator\Rules\DisableIntrospection;
--use GraphQL\Validator\Rules\QueryDepth;
- use Magento\Framework\GraphQl\Exception\ExceptionFormatter;
- use Magento\Framework\GraphQl\Schema;
- use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
-@@ -24,12 +21,21 @@ class QueryProcessor
-      */
-     private $exceptionFormatter;
- 
-+    /**
-+     * @var QueryComplexityLimiter
-+     */
-+    private $queryComplexityLimiter;
-+
-     /**
-      * @param ExceptionFormatter $exceptionFormatter
-+     * @param QueryComplexityLimiter $queryComplexityLimiter
-      */
--    public function __construct(ExceptionFormatter $exceptionFormatter)
--    {
-+    public function __construct(
-+        ExceptionFormatter $exceptionFormatter,
-+        QueryComplexityLimiter $queryComplexityLimiter
-+    ) {
-         $this->exceptionFormatter = $exceptionFormatter;
-+        $this->queryComplexityLimiter = $queryComplexityLimiter;
-     }
- 
-     /**
-@@ -50,9 +56,9 @@ class QueryProcessor
-         string $operationName = null
-     ) : array {
-         if (!$this->exceptionFormatter->shouldShowDetail()) {
--            DocumentValidator::addRule(new QueryDepth(10));
--            DocumentValidator::addRule(new DisableIntrospection());
-+            $this->queryComplexityLimiter->execute();
-         }
-+
-         $rootValue = null;
-         return \GraphQL\GraphQL::executeQuery(
-             $schema,
-@@ -63,7 +69,7 @@ class QueryProcessor
-             $operationName
-         )->toArray(
-             $this->exceptionFormatter->shouldShowDetail() ?
--                \GraphQL\Error\Debug::INCLUDE_DEBUG_MESSAGE | \GraphQL\Error\Debug::INCLUDE_TRACE : false
-+                \GraphQL\Error\Debug::INCLUDE_DEBUG_MESSAGE : false
-         );
-     }
- }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesPool.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesPool.php
-index e7d14a81b9d..f1226469e49 100644
---- a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesPool.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesPool.php
-@@ -38,7 +38,7 @@ class FieldEntityAttributesPool
-         if (isset($this->attributesInstances[$fieldName])) {
-             return $this->attributesInstances[$fieldName]->getEntityAttributes();
-         } else {
--            throw new \LogicException(sprintf('There is no attrribute class assigned to field %1', $fieldName));
-+            throw new \LogicException(sprintf('There is no attribute class assigned to field %s', $fieldName));
-         }
-     }
- }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ContextInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ContextInterface.php
-index 9bf708539ef..7cece8dd7e3 100644
---- a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ContextInterface.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ContextInterface.php
-@@ -7,7 +7,6 @@ declare(strict_types=1);
- 
- namespace Magento\Framework\GraphQl\Query\Resolver;
- 
--use Magento\Framework\Api\ExtensibleDataInterface;
- use Magento\Framework\GraphQl\Query\ResolverInterface;
- 
- /**
-@@ -16,56 +15,6 @@ use Magento\Framework\GraphQl\Query\ResolverInterface;
-  * GraphQL will pass the same instance of this interface to each field resolver, so these resolvers could have
-  * shared access to the same data for ease of implementation purposes.
-  */
--interface ContextInterface extends ExtensibleDataInterface
-+interface ContextInterface
- {
--    /**
--     * Get the type of a user
--     *
--     * @see \Magento\Authorization\Model\UserContextInterface for corespondent values
--     *
--     * @return int
--     */
--    public function getUserType() : int;
--
--    /**
--     * Set type of a user
--     *
--     * @see \Magento\Authorization\Model\UserContextInterface for corespondent values
--     *
--     * @param int $typeId
--     * @return ContextInterface
--     */
--    public function setUserType(int $typeId) : ContextInterface;
--
--    /**
--     * Get id of the user
--     *
--     * @return int
--     */
--    public function getUserId() : int;
--
--    /**
--     * Set id of a user
--     *
--     * @param int $userId
--     * @return ContextInterface
--     */
--    public function setUserId(int $userId) : ContextInterface;
--
--    /**
--     * Retrieve existing extension attributes object or create a new one.
--     *
--     * @return \Magento\Framework\GraphQl\Query\Resolver\ContextExtensionInterface
--     */
--    public function getExtensionAttributes();
--
--    /**
--     * Set an extension attributes object.
--     *
--     * @param \Magento\Framework\GraphQl\Query\Resolver\ContextExtensionInterface $extensionAttributes
--     * @return ContextInterface
--     */
--    public function setExtensionAttributes(
--        \Magento\Framework\GraphQl\Query\Resolver\ContextExtensionInterface $extensionAttributes
--    ) : ContextInterface;
- }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/IdentityInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/IdentityInterface.php
-new file mode 100644
-index 00000000000..d65e86a3755
---- /dev/null
-+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/IdentityInterface.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\GraphQl\Query\Resolver;
-+
-+interface IdentityInterface
-+{
-+
-+    /**
-+     * Get identities from resolved data
-+     *
-+     * @param array $resolvedData
-+     * @return string[]
-+     */
-+    public function getIdentities(array $resolvedData) : array;
-+}
-diff --git a/lib/internal/Magento/Framework/GraphQl/Query/ResolverInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/ResolverInterface.php
-index ec59f132cc7..c7b4c7688b9 100644
---- a/lib/internal/Magento/Framework/GraphQl/Query/ResolverInterface.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Query/ResolverInterface.php
-@@ -10,6 +10,7 @@ namespace Magento\Framework\GraphQl\Query;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
- use Magento\Framework\GraphQl\Config\Element\Field;
- use Magento\Framework\GraphQl\Query\Resolver\Value;
-+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
- 
- /**
-  * Resolver fetches the data and formats it according to the GraphQL schema.
-@@ -20,12 +21,12 @@ interface ResolverInterface
-      * Fetches the data from persistence models and format it according to the GraphQL schema.
-      *
-      * @param \Magento\Framework\GraphQl\Config\Element\Field $field
--     * @param $context
-+     * @param ContextInterface $context
-      * @param ResolveInfo $info
-      * @param array|null $value
-      * @param array|null $args
-      * @throws \Exception
--     * @return Value
-+     * @return mixed|Value
-      */
-     public function resolve(
-         Field $field,
-@@ -33,5 +34,5 @@ interface ResolverInterface
-         ResolveInfo $info,
-         array $value = null,
-         array $args = null
--    ) : Value;
-+    );
- }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php b/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
-index 63fef73186b..250b80defa6 100644
---- a/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
-@@ -8,9 +8,8 @@ declare(strict_types=1);
- namespace Magento\Framework\GraphQl\Schema;
- 
- use Magento\Framework\GraphQl\ConfigInterface;
--use Magento\Framework\GraphQl\Schema\SchemaGeneratorInterface;
--use Magento\Framework\GraphQl\Schema\Type\Output\OutputMapper;
- use Magento\Framework\GraphQl\Schema;
-+use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
- use Magento\Framework\GraphQl\SchemaFactory;
- 
- /**
-@@ -24,47 +23,46 @@ class SchemaGenerator implements SchemaGeneratorInterface
-     private $schemaFactory;
- 
-     /**
--     * @var OutputMapper
-+     * @var ConfigInterface
-      */
--    private $outputMapper;
-+    private $config;
- 
-     /**
--     * @var ConfigInterface
-+     * @var TypeRegistry
-      */
--    private $config;
-+    private $typeRegistry;
- 
-     /**
-      * @param SchemaFactory $schemaFactory
--     * @param OutputMapper $outputMapper
-      * @param ConfigInterface $config
-+     * @param TypeRegistry $typeRegistry
-      */
-     public function __construct(
-         SchemaFactory $schemaFactory,
--        OutputMapper $outputMapper,
--        ConfigInterface $config
-+        ConfigInterface $config,
-+        TypeRegistry $typeRegistry
-     ) {
-         $this->schemaFactory = $schemaFactory;
--        $this->outputMapper = $outputMapper;
-         $this->config = $config;
-+        $this->typeRegistry = $typeRegistry;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function generate() : Schema
-     {
-         $schema = $this->schemaFactory->create(
-             [
--                'query' => $this->outputMapper->getOutputType('Query'),
--                'mutation' => $this->outputMapper->getOutputType('Mutation'),
-+                'query' => $this->typeRegistry->get('Query'),
-+                'mutation' => $this->typeRegistry->get('Mutation'),
-                 'typeLoader' => function ($name) {
--                    return $this->outputMapper->getOutputType($name);
-+                    return $this->typeRegistry->get($name);
-                 },
-                 'types' => function () {
--                    //all types should be generated only on introspection
-                     $typesImplementors = [];
--                    foreach ($this->config->getDeclaredTypeNames() as $name) {
--                        $typesImplementors [] = $this->outputMapper->getOutputType($name);
-+                    foreach ($this->config->getDeclaredTypes() as $type) {
-+                        $typesImplementors [] = $this->typeRegistry->get($type['name']);
-                     }
-                     return $typesImplementors;
-                 }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php
-index 7e3f2ac6db6..cacc1f9e28c 100644
---- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php
-@@ -26,10 +26,10 @@ class DefaultMapper implements MapperInterface
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function getMappedTypes(string $entityName) : array
-     {
--        return isset($this->map[$entityName]) ? $this->map[$entityName] : [];
-+        return $this->map[$entityName] ?? [];
-     }
- }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php
-index f7b39ba6420..f560fcb0de7 100644
---- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php
-@@ -26,10 +26,10 @@ class DefaultDataMapper implements DataMapperInterface
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function getMappedEnums(string $enumName) : array
-     {
--        return isset($this->map[$enumName]) ? $this->map[$enumName] : [];
-+        return $this->map[$enumName] ?? [];
-     }
- }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputFactory.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputFactory.php
-deleted file mode 100644
-index cbbd97cfdb8..00000000000
---- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputFactory.php
-+++ /dev/null
-@@ -1,60 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\Framework\GraphQl\Schema\Type\Input;
--
--use Magento\Framework\GraphQl\Config\ConfigElementInterface;
--use Magento\Framework\GraphQl\Schema\Type\InputTypeInterface;
--use Magento\Framework\ObjectManagerInterface;
--
--class InputFactory
--{
--    /**
--     * @var ObjectManagerInterface
--     */
--    private $objectManager;
--
--    /**
--     * @var string
--     */
--    private $prototypes;
--
--    /**
--     * @var array
--     */
--    private $typeRegistry;
--
--    /**
--     * @param ObjectManagerInterface $objectManager
--     * @param array $prototypes
--     */
--    public function __construct(
--        ObjectManagerInterface $objectManager,
--        array $prototypes
--    ) {
--        $this->objectManager = $objectManager;
--        $this->prototypes = $prototypes;
--    }
--
--    /**
--     * @param ConfigElementInterface $configElement
--     * @return InputTypeInterface
--     */
--    public function create(ConfigElementInterface $configElement) : InputTypeInterface
--    {
--        if (!isset($this->typeRegistry[$configElement->getName()])) {
--            $this->typeRegistry[$configElement->getName()] =
--                $this->objectManager->create(
--                    $this->prototypes[get_class($configElement)],
--                    [
--                        'configElement' => $configElement
--                    ]
--                );
--        }
--        return $this->typeRegistry[$configElement->getName()];
--    }
--}
-diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
-index d806c0b3e68..d1f48dada2c 100644
---- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
-@@ -9,27 +9,15 @@ namespace Magento\Framework\GraphQl\Schema\Type\Input;
- 
- use Magento\Framework\GraphQl\Config\Data\WrappedTypeProcessor;
- use Magento\Framework\GraphQl\Config\Element\Argument;
--use Magento\Framework\GraphQl\ConfigInterface;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
- use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
--use Magento\Framework\GraphQl\Schema\TypeFactory;
-+use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
- 
-+/**
-+ * Prepare argument's metadata for GraphQL schema generation
-+ */
- class InputMapper
- {
--    /**
--     * @var InputFactory
--     */
--    private $inputFactory;
--
--    /**
--     * @var ConfigInterface
--     */
--    private $config;
--
--    /**
--     * @var TypeFactory
--     */
--    private $typeFactory;
--
-     /**
-      * @var ScalarTypes
-      */
-@@ -41,24 +29,23 @@ class InputMapper
-     private $wrappedTypeProcessor;
- 
-     /**
--     * @param InputFactory $inputFactory
--     * @param ConfigInterface $config
--     * @param TypeFactory $typeFactory
-+     * @var TypeRegistry
-+     */
-+    private $typeRegistry;
-+
-+    /**
-      * @param ScalarTypes $scalarTypes
-      * @param WrappedTypeProcessor $wrappedTypeProcessor
-+     * @param TypeRegistry $typeRegistry
-      */
-     public function __construct(
--        InputFactory $inputFactory,
--        ConfigInterface $config,
--        TypeFactory $typeFactory,
-         ScalarTypes $scalarTypes,
--        WrappedTypeProcessor $wrappedTypeProcessor
-+        WrappedTypeProcessor $wrappedTypeProcessor,
-+        TypeRegistry $typeRegistry
-     ) {
--        $this->inputFactory = $inputFactory;
--        $this->config = $config;
--        $this->typeFactory = $typeFactory;
-         $this->scalarTypes = $scalarTypes;
-         $this->wrappedTypeProcessor = $wrappedTypeProcessor;
-+        $this->typeRegistry = $typeRegistry;
-     }
- 
-     /**
-@@ -66,6 +53,7 @@ class InputMapper
-      *
-      * @param Argument $argument
-      * @return array
-+     * @throws GraphQlInputException
-      */
-     public function getRepresentation(Argument $argument) : array
-     {
-@@ -73,8 +61,7 @@ class InputMapper
-         if ($this->scalarTypes->isScalarType($typeName)) {
-             $instance = $this->wrappedTypeProcessor->processScalarWrappedType($argument);
-         } else {
--            $configElement = $this->config->getConfigElement($typeName);
--            $instance = $this->inputFactory->create($configElement);
-+            $instance = $this->typeRegistry->get($typeName);
-             $instance = $this->wrappedTypeProcessor->processWrappedType($argument, $instance);
-         }
- 
-diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputObjectType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputObjectType.php
-index ae2d07ade2a..fa0327f79bc 100644
---- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputObjectType.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputObjectType.php
-@@ -8,21 +8,16 @@ declare(strict_types=1);
- namespace Magento\Framework\GraphQl\Schema\Type\Input;
- 
- use Magento\Framework\GraphQl\Config\Data\WrappedTypeProcessor;
--use Magento\Framework\GraphQl\Config\Element\Type as TypeConfigElement;
--use Magento\Framework\GraphQl\ConfigInterface;
-+use Magento\Framework\GraphQl\Config\Element\Input as InputConfigElement;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
- use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
--use Magento\Framework\GraphQl\Schema\TypeFactory;
-+use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
- 
- /**
-  * Class InputObjectType
-  */
- class InputObjectType extends \Magento\Framework\GraphQl\Schema\Type\InputObjectType
- {
--    /**
--     * @var TypeFactory
--     */
--    private $typeFactory;
--
-     /**
-      * @var ScalarTypes
-      */
-@@ -34,36 +29,27 @@ class InputObjectType extends \Magento\Framework\GraphQl\Schema\Type\InputObject
-     private $wrappedTypeProcessor;
- 
-     /**
--     * @var InputFactory
-+     * @var TypeRegistry
-      */
--    private $inputFactory;
-+    private $typeRegistry;
- 
-     /**
--     * @var ConfigInterface
--     */
--    public $graphQlConfig;
--
--    /**
--     * @param TypeConfigElement $configElement
--     * @param TypeFactory $typeFactory
-+     * @param InputConfigElement $configElement
-      * @param ScalarTypes $scalarTypes
-      * @param WrappedTypeProcessor $wrappedTypeProcessor
--     * @param InputFactory $inputFactory
--     * @param ConfigInterface $graphQlConfig
-+     * @param TypeRegistry $typeRegistry
-+     * @throws GraphQlInputException
-      */
-     public function __construct(
--        TypeConfigElement $configElement,
--        TypeFactory $typeFactory,
-+        InputConfigElement $configElement,
-         ScalarTypes $scalarTypes,
-         WrappedTypeProcessor $wrappedTypeProcessor,
--        InputFactory $inputFactory,
--        ConfigInterface $graphQlConfig
-+        TypeRegistry $typeRegistry
-     ) {
--        $this->typeFactory = $typeFactory;
-         $this->scalarTypes = $scalarTypes;
-         $this->wrappedTypeProcessor = $wrappedTypeProcessor;
--        $this->inputFactory = $inputFactory;
--        $this->graphQlConfig = $graphQlConfig;
-+        $this->typeRegistry = $typeRegistry;
-+
-         $config = [
-             'name' => $configElement->getName(),
-             'description' => $configElement->getDescription()
-@@ -75,8 +61,7 @@ class InputObjectType extends \Magento\Framework\GraphQl\Schema\Type\InputObject
-                 if ($field->getTypeName() == $configElement->getName()) {
-                     $type = $this;
-                 } else {
--                    $fieldConfigElement = $this->graphQlConfig->getConfigElement($field->getTypeName());
--                    $type = $this->inputFactory->create($fieldConfigElement);
-+                    $type = $this->typeRegistry->get($field->getTypeName());
-                 }
-                 $type = $this->wrappedTypeProcessor->processWrappedType($field, $type);
-             }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
-index b54cd4d8ca2..034a5702090 100644
---- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
-@@ -16,7 +16,6 @@ use Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\FormatterInterfac
- use Magento\Framework\GraphQl\Schema\Type\Output\OutputMapper;
- use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
- use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
--use Magento\Framework\GraphQl\Schema\TypeFactory;
- use Magento\Framework\ObjectManagerInterface;
- use Magento\Framework\GraphQl\Schema\Type\ResolveInfoFactory;
- 
-@@ -40,11 +39,6 @@ class Fields implements FormatterInterface
-      */
-     private $inputMapper;
- 
--    /**
--     * @var TypeFactory
--     */
--    private $typeFactory;
--
-     /**
-      * @var ScalarTypes
-      */
-@@ -64,7 +58,6 @@ class Fields implements FormatterInterface
-      * @param ObjectManagerInterface $objectManager
-      * @param OutputMapper $outputMapper
-      * @param InputMapper $inputMapper
--     * @param TypeFactory $typeFactory
-      * @param ScalarTypes $scalarTypes
-      * @param WrappedTypeProcessor $wrappedTypeProcessor
-      * @param ResolveInfoFactory $resolveInfoFactory
-@@ -73,7 +66,6 @@ class Fields implements FormatterInterface
-         ObjectManagerInterface $objectManager,
-         OutputMapper $outputMapper,
-         InputMapper $inputMapper,
--        TypeFactory $typeFactory,
-         ScalarTypes $scalarTypes,
-         WrappedTypeProcessor $wrappedTypeProcessor,
-         ResolveInfoFactory $resolveInfoFactory
-@@ -81,14 +73,13 @@ class Fields implements FormatterInterface
-         $this->objectManager = $objectManager;
-         $this->outputMapper = $outputMapper;
-         $this->inputMapper = $inputMapper;
--        $this->typeFactory = $typeFactory;
-         $this->scalarTypes = $scalarTypes;
-         $this->wrappedTypeProcessor = $wrappedTypeProcessor;
-         $this->resolveInfoFactory = $resolveInfoFactory;
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritdoc
-      */
-     public function format(TypeInterface $configElement, OutputTypeInterface $outputType): array
-     {
-diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputFactory.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputFactory.php
-deleted file mode 100644
-index 81dad11774b..00000000000
---- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputFactory.php
-+++ /dev/null
-@@ -1,65 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\Framework\GraphQl\Schema\Type\Output;
--
--use Magento\Framework\GraphQl\Config\ConfigElementInterface;
--use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
--use Magento\Framework\ObjectManagerInterface;
--
--/**
-- * Factory for 'output type' objects compatible with GraphQL schema generator.
-- */
--class OutputFactory
--{
--    /**
--     * @var ObjectManagerInterface
--     */
--    private $objectManager;
--
--    /**
--     * @var string
--     */
--    private $prototypes;
--
--    /**
--     * @var array
--     */
--    private $typeRegistry;
--
--    /**
--     * @param ObjectManagerInterface $objectManager
--     * @param array $prototypes
--     */
--    public function __construct(
--        ObjectManagerInterface $objectManager,
--        array $prototypes
--    ) {
--        $this->objectManager = $objectManager;
--        $this->prototypes = $prototypes;
--    }
--
--    /**
--     * Create output type.
--     *
--     * @param ConfigElementInterface $configElement
--     * @return OutputTypeInterface
--     */
--    public function create(ConfigElementInterface $configElement) : OutputTypeInterface
--    {
--        if (!isset($this->typeRegistry[$configElement->getName()])) {
--            $this->typeRegistry[$configElement->getName()] =
--                $this->objectManager->create(
--                    $this->prototypes[get_class($configElement)],
--                    [
--                        'configElement' => $configElement
--                    ]
--                );
--        }
--        return $this->typeRegistry[$configElement->getName()];
--    }
--}
-diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
-index b7f4b8a1f60..046eeb5b1f9 100644
---- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
-+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
-@@ -7,50 +7,28 @@ declare(strict_types=1);
- 
- namespace Magento\Framework\GraphQl\Schema\Type\Output;
- 
--use Magento\Framework\GraphQl\ConfigInterface;
- use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
--use Magento\Framework\GraphQl\Schema\TypeFactory;
-+use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
- use Magento\Framework\GraphQl\Exception\GraphQlInputException;
- use Magento\Framework\Phrase;
- 
- /**
-- * Map type names to their output type/interface classes.
-+ * Map type names to their output type/interface/enum classes.
-  */
- class OutputMapper
- {
-     /**
--     * @var OutputFactory
-+     * @var TypeRegistry
-      */
--    private $outputFactory;
-+    private $typeRegistry;
- 
-     /**
--     * @var OutputTypeInterface[]
--     */
--    private $outputTypes;
--
--    /**
--     * @var TypeFactory
--     */
--    private $typeFactory;
--
--    /**
--     * @var ConfigInterface
--     */
--    private $config;
--
--    /**
--     * @param OutputFactory $outputFactory
--     * @param TypeFactory $typeFactory
--     * @param ConfigInterface $config
-+     * @param TypeRegistry $typeRegistry
-      */
-     public function __construct(
--        OutputFactory $outputFactory,
--        TypeFactory $typeFactory,
--        ConfigInterface $config
-+        TypeRegistry $typeRegistry
-     ) {
--        $this->outputFactory = $outputFactory;
--        $this->config = $config;
--        $this->typeFactory = $typeFactory;
-+        $this->typeRegistry = $typeRegistry;
-     }
- 
-     /**
-@@ -62,16 +40,13 @@ class OutputMapper
-      */
-     public function getOutputType($typeName)
-     {
--        if (!isset($this->outputTypes[$typeName])) {
--            $configElement = $this->config->getConfigElement($typeName);
--            $this->outputTypes[$typeName] = $this->outputFactory->create($configElement);
--            if (!($this->outputTypes[$typeName] instanceof OutputTypeInterface)) {
--                throw new GraphQlInputException(
--                    new Phrase("Type '{$typeName}' was requested but is not declared in the GraphQL schema.")
--                );
--            }
--        }
-+        $outputType = $this->typeRegistry->get($typeName);
- 
--        return $this->outputTypes[$typeName];
-+        if (!$outputType instanceof OutputTypeInterface) {
-+            throw new GraphQlInputException(
-+                new Phrase("Type '{$typeName}' was requested but is not declared in the GraphQL schema.")
-+            );
-+        }
-+        return $outputType;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php
-new file mode 100644
-index 00000000000..cde8b6b3e44
---- /dev/null
-+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php
-@@ -0,0 +1,95 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\GraphQl\Schema\Type;
-+
-+use Magento\Framework\GraphQl\ConfigInterface;
-+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-+use Magento\Framework\GraphQl\Schema\TypeInterface;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\Phrase;
-+
-+/**
-+ * GraphQL type object registry
-+ */
-+class TypeRegistry
-+{
-+    /**
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var ConfigInterface
-+     */
-+    private $config;
-+
-+    /**
-+     * Key is config class name, value is related type class name
-+     *
-+     * @var array
-+     */
-+    private $configToTypeMap;
-+
-+    /**
-+     * @var TypeInterface[]
-+     */
-+    private $types;
-+
-+    /**
-+     * @param ObjectManagerInterface $objectManager
-+     * @param ConfigInterface $config
-+     * @param array $configToTypeMap
-+     */
-+    public function __construct(
-+        ObjectManagerInterface $objectManager,
-+        ConfigInterface $config,
-+        array $configToTypeMap
-+    ) {
-+        $this->objectManager = $objectManager;
-+        $this->config = $config;
-+        $this->configToTypeMap = $configToTypeMap;
-+    }
-+
-+    /**
-+     * Get GraphQL type object by type name
-+     *
-+     * @param string $typeName
-+     * @return TypeInterface|InputTypeInterface|OutputTypeInterface
-+     * @throws GraphQlInputException
-+     */
-+    public function get(string $typeName): TypeInterface
-+    {
-+        if (!isset($this->types[$typeName])) {
-+            $configElement = $this->config->getConfigElement($typeName);
-+
-+            $configElementClass = get_class($configElement);
-+            if (!isset($this->configToTypeMap[$configElementClass])) {
-+                throw new GraphQlInputException(
-+                    new Phrase(
-+                        "No mapping to Webonyx type is declared for '%1' config element type.",
-+                        [$configElementClass]
-+                    )
-+                );
-+            }
-+
-+            $this->types[$typeName] = $this->objectManager->create(
-+                $this->configToTypeMap[$configElementClass],
-+                [
-+                    'configElement' => $configElement,
-+                ]
-+            );
-+
-+            if (!($this->types[$typeName] instanceof TypeInterface)) {
-+                throw new GraphQlInputException(
-+                    new Phrase("Type '{$typeName}' was requested but is not declared in the GraphQL schema.")
-+                );
-+            }
-+        }
-+        return $this->types[$typeName];
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/CacheTagReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/CacheTagReader.php
-new file mode 100644
-index 00000000000..2613b2829e7
---- /dev/null
-+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/CacheTagReader.php
-@@ -0,0 +1,50 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader;
-+
-+/**
-+ * Reads documentation from the annotation @cache of an AST node
-+ */
-+class CacheTagReader
-+{
-+    /**
-+     * Read documentation annotation for a specific node if exists
-+     *
-+     * @param \GraphQL\Language\AST\NodeList $directives
-+     * @return array
-+     */
-+    public function read(\GraphQL\Language\AST\NodeList $directives) : array
-+    {
-+        $argMap = [];
-+        foreach ($directives as $directive) {
-+            if ($directive->name->value == 'cache') {
-+                foreach ($directive->arguments as $directiveArgument) {
-+                    if ($directiveArgument->name->value == 'cacheTag') {
-+                        $argMap = array_merge(
-+                            $argMap,
-+                            ["cacheTag" => $directiveArgument->value->value]
-+                        );
-+                    }
-+                    if ($directiveArgument->name->value == 'cacheable') {
-+                        $argMap = array_merge(
-+                            $argMap,
-+                            ["cacheable" => $directiveArgument->value->value]
-+                        );
-+                    }
-+                    if ($directiveArgument->name->value == 'cacheIdentity') {
-+                        $argMap = array_merge(
-+                            $argMap,
-+                            ["cacheIdentity" => $directiveArgument->value->value]
-+                        );
-+                    }
-+                }
-+            }
-+        }
-+        return $argMap;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/FieldMetaReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/FieldMetaReader.php
-index 736a9447110..554d2636cf8 100644
---- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/FieldMetaReader.php
-+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/FieldMetaReader.php
-@@ -7,8 +7,6 @@ declare(strict_types=1);
- 
- namespace Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader;
- 
--use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\TypeMetaWrapperReader;
--
- /**
-  * Reads fields and possible arguments from a meta field
-  */
-@@ -24,14 +22,25 @@ class FieldMetaReader
-      */
-     private $docReader;
- 
-+    /**
-+     * @var CacheTagReader
-+     */
-+    private $cacheTagReader;
-+
-     /**
-      * @param TypeMetaWrapperReader $typeMetaReader
-      * @param DocReader $docReader
-+     * @param CacheTagReader|null $cacheTagReader
-      */
--    public function __construct(TypeMetaWrapperReader $typeMetaReader, DocReader $docReader)
--    {
-+    public function __construct(
-+        TypeMetaWrapperReader $typeMetaReader,
-+        DocReader $docReader,
-+        CacheTagReader $cacheTagReader = null
-+    ) {
-         $this->typeMetaReader = $typeMetaReader;
-         $this->docReader = $docReader;
-+        $this->cacheTagReader = $cacheTagReader ?? \Magento\Framework\App\ObjectManager::getInstance()
-+                ->get(CacheTagReader::class);
-     }
- 
-     /**
-@@ -63,6 +72,10 @@ class FieldMetaReader
-             $result['description'] = $this->docReader->read($fieldMeta->astNode->directives);
-         }
- 
-+        if ($this->docReader->read($fieldMeta->astNode->directives)) {
-+            $result['cache'] = $this->cacheTagReader->read($fieldMeta->astNode->directives);
-+        }
-+
-         $arguments = $fieldMeta->args;
-         foreach ($arguments as $argumentMeta) {
-             $argumentName = $argumentMeta->name;
-diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php
-index 3aea555e67f..2eda79ce68b 100644
---- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php
-+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php
-@@ -10,6 +10,7 @@ namespace Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader;
- use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface;
- use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\TypeMetaWrapperReader;
- use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\DocReader;
-+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\CacheTagReader;
- 
- /**
-  * Composite configuration reader to handle the input object type meta
-@@ -26,18 +27,29 @@ class InputObjectType implements TypeMetaReaderInterface
-      */
-     private $docReader;
- 
-+    /**
-+     * @var CacheTagReader
-+     */
-+    private $cacheTagReader;
-+
-     /**
-      * @param TypeMetaWrapperReader $typeMetaReader
-      * @param DocReader $docReader
-+     * @param CacheTagReader|null $cacheTagReader
-      */
--    public function __construct(TypeMetaWrapperReader $typeMetaReader, DocReader $docReader)
--    {
-+    public function __construct(
-+        TypeMetaWrapperReader $typeMetaReader,
-+        DocReader $docReader,
-+        CacheTagReader $cacheTagReader = null
-+    ) {
-         $this->typeMetaReader = $typeMetaReader;
-         $this->docReader = $docReader;
-+        $this->cacheTagReader = $cacheTagReader ?? \Magento\Framework\App\ObjectManager::getInstance()
-+                ->get(CacheTagReader::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
-     {
-@@ -56,6 +68,10 @@ class InputObjectType implements TypeMetaReaderInterface
-             if ($this->docReader->read($typeMeta->astNode->directives)) {
-                 $result['description'] = $this->docReader->read($typeMeta->astNode->directives);
-             }
-+
-+            if ($this->docReader->read($typeMeta->astNode->directives)) {
-+                $result['cache'] = $this->cacheTagReader->read($typeMeta->astNode->directives);
-+            }
-             return $result;
-         } else {
-             return [];
-@@ -63,6 +79,8 @@ class InputObjectType implements TypeMetaReaderInterface
-     }
- 
-     /**
-+     * Read the input's meta data
-+     *
-      * @param \GraphQL\Type\Definition\InputObjectField $fieldMeta
-      * @return array
-      */
-diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php
-index dd934ffebc2..7c040cd2e10 100644
---- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php
-+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php
-@@ -10,6 +10,7 @@ namespace Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader;
- use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface;
- use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\FieldMetaReader;
- use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\DocReader;
-+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\CacheTagReader;
- 
- /**
-  * Composite configuration reader to handle the interface object type meta
-@@ -26,18 +27,29 @@ class InterfaceType implements TypeMetaReaderInterface
-      */
-     private $docReader;
- 
-+    /**
-+     * @var CacheTagReader
-+     */
-+    private $cacheTagReader;
-+
-     /**
-      * @param FieldMetaReader $fieldMetaReader
-      * @param DocReader $docReader
-+     * @param CacheTagReader|null $cacheTagReader
-      */
--    public function __construct(FieldMetaReader $fieldMetaReader, DocReader $docReader)
--    {
-+    public function __construct(
-+        FieldMetaReader $fieldMetaReader,
-+        DocReader $docReader,
-+        CacheTagReader $cacheTagReader = null
-+    ) {
-         $this->fieldMetaReader = $fieldMetaReader;
-         $this->docReader = $docReader;
-+        $this->cacheTagReader = $cacheTagReader ?? \Magento\Framework\App\ObjectManager::getInstance()
-+                ->get(CacheTagReader::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
-     {
-@@ -63,6 +75,10 @@ class InterfaceType implements TypeMetaReaderInterface
-                 $result['description'] = $this->docReader->read($typeMeta->astNode->directives);
-             }
- 
-+            if ($this->docReader->read($typeMeta->astNode->directives)) {
-+                $result['cache'] = $this->cacheTagReader->read($typeMeta->astNode->directives);
-+            }
-+
-             return $result;
-         } else {
-             return [];
-diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php
-index fb015922087..77a44460f00 100644
---- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php
-+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php
-@@ -11,6 +11,7 @@ use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterfa
- use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\FieldMetaReader;
- use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\DocReader;
- use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\ImplementsReader;
-+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\CacheTagReader;
- 
- /**
-  * Composite configuration reader to handle the object type meta
-@@ -33,22 +34,32 @@ class ObjectType implements TypeMetaReaderInterface
-     private $implementsAnnotation;
- 
-     /**
-+     * @var CacheTagReader
-+     */
-+    private $cacheTagReader;
-+
-+    /**
-+     * ObjectType constructor.
-      * @param FieldMetaReader $fieldMetaReader
-      * @param DocReader $docReader
-      * @param ImplementsReader $implementsAnnotation
-+     * @param CacheTagReader|null $cacheTagReader
-      */
-     public function __construct(
-         FieldMetaReader $fieldMetaReader,
-         DocReader $docReader,
--        ImplementsReader $implementsAnnotation
-+        ImplementsReader $implementsAnnotation,
-+        CacheTagReader $cacheTagReader = null
-     ) {
-         $this->fieldMetaReader = $fieldMetaReader;
-         $this->docReader = $docReader;
-         $this->implementsAnnotation = $implementsAnnotation;
-+        $this->cacheTagReader = $cacheTagReader ?? \Magento\Framework\App\ObjectManager::getInstance()
-+                ->get(CacheTagReader::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
-     {
-@@ -77,6 +88,10 @@ class ObjectType implements TypeMetaReaderInterface
-                     $result['description'] = $this->docReader->read($typeMeta->astNode->directives);
-             }
- 
-+            if ($this->docReader->read($typeMeta->astNode->directives)) {
-+                $result['cache'] = $this->cacheTagReader->read($typeMeta->astNode->directives);
-+            }
-+
-             return $result;
-         } else {
-             return [];
-diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
-index 15f09b85052..f2a703a193e 100644
---- a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
-+++ b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
-@@ -4,13 +4,11 @@
-  * See COPYING.txt for license details.
-  */
- 
--/**
-- * HTTP CURL Adapter
-- *
-- * @author      Magento Core Team <core@magentocommerce.com>
-- */
- namespace Magento\Framework\HTTP\Adapter;
- 
-+/**
-+ * Curl http adapter
-+ */
- class Curl implements \Zend_Http_Client_Adapter_Interface
- {
-     /**
-@@ -112,8 +110,8 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
-     /**
-      * Add additional option to cURL
-      *
--     * @param  int $option      the CURLOPT_* constants
--     * @param  mixed $value
-+     * @param int $option the CURLOPT_* constants
-+     * @param mixed $value
-      * @return $this
-      */
-     public function addOption($option, $value)
-@@ -139,8 +137,8 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
-     /**
-      * Connect to the remote server
-      *
--     * @param string  $host
--     * @param int     $port
-+     * @param string $host
-+     * @param int $port
-      * @param boolean $secure
-      * @return $this
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-@@ -180,6 +178,12 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
-             curl_setopt($this->_getResource(), CURLOPT_CUSTOMREQUEST, 'GET');
-         }
- 
-+        if ($http_ver === \Zend_Http_Client::HTTP_1) {
-+            curl_setopt($this->_getResource(), CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
-+        } elseif ($http_ver === \Zend_Http_Client::HTTP_0) {
-+            curl_setopt($this->_getResource(), CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
-+        }
-+
-         if (is_array($headers)) {
-             curl_setopt($this->_getResource(), CURLOPT_HTTPHEADER, $headers);
-         }
-@@ -273,7 +277,7 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
-     }
- 
-     /**
--     * curl_multi_* requests support
-+     * Curl_multi_* requests support
-      *
-      * @param array $urls
-      * @param array $options
-diff --git a/lib/internal/Magento/Framework/HTTP/AsyncClient/GuzzleAsyncClient.php b/lib/internal/Magento/Framework/HTTP/AsyncClient/GuzzleAsyncClient.php
-new file mode 100644
-index 00000000000..60e3d6550a5
---- /dev/null
-+++ b/lib/internal/Magento/Framework/HTTP/AsyncClient/GuzzleAsyncClient.php
-@@ -0,0 +1,52 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\HTTP\AsyncClient;
-+
-+use GuzzleHttp\Client;
-+use GuzzleHttp\RequestOptions;
-+use Magento\Framework\HTTP\AsyncClientInterface;
-+
-+/**
-+ * Client based on Guzzle HTTP client.
-+ */
-+class GuzzleAsyncClient implements AsyncClientInterface
-+{
-+    /**
-+     * @var Client
-+     */
-+    private $client;
-+
-+    /**
-+     * @param Client $client
-+     */
-+    public function __construct(Client $client)
-+    {
-+        $this->client = $client;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function request(Request $request): HttpResponseDeferredInterface
-+    {
-+        $options = [];
-+        $options[RequestOptions::HEADERS] = $request->getHeaders();
-+        if ($request->getBody() !== null) {
-+            $options[RequestOptions::BODY] = $request->getBody();
-+        }
-+
-+        return new GuzzleWrapDeferred(
-+            $this->client->requestAsync(
-+                $request->getMethod(),
-+                $request->getUrl(),
-+                $options
-+            )
-+        );
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/HTTP/AsyncClient/GuzzleWrapDeferred.php b/lib/internal/Magento/Framework/HTTP/AsyncClient/GuzzleWrapDeferred.php
-new file mode 100644
-index 00000000000..f19fa0c78f9
---- /dev/null
-+++ b/lib/internal/Magento/Framework/HTTP/AsyncClient/GuzzleWrapDeferred.php
-@@ -0,0 +1,139 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\HTTP\AsyncClient;
-+
-+use GuzzleHttp\Exception\BadResponseException;
-+use GuzzleHttp\Exception\RequestException;
-+use GuzzleHttp\Promise\CancellationException;
-+use GuzzleHttp\Promise\PromiseInterface;
-+use Magento\Framework\Async\CancelingDeferredException;
-+use Psr\Http\Message\ResponseInterface;
-+
-+/**
-+ * Wrapper around guzzle's response promise.
-+ */
-+class GuzzleWrapDeferred implements HttpResponseDeferredInterface
-+{
-+    /**
-+     * @var PromiseInterface
-+     */
-+    private $promise;
-+
-+    /**
-+     * @var Response
-+     */
-+    private $response;
-+
-+    /**
-+     * @var HttpException
-+     */
-+    private $exception;
-+
-+    /**
-+     * @var bool
-+     */
-+    private $canceled = false;
-+
-+    /**
-+     * @param PromiseInterface $promise
-+     */
-+    public function __construct(PromiseInterface $promise)
-+    {
-+        $this->promise = $promise;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function isDone(): bool
-+    {
-+        return $this->response || $this->exception;
-+    }
-+
-+    /**
-+     * Convert guzzle response to Magento response.
-+     *
-+     * @param ResponseInterface $response
-+     * @return Response
-+     */
-+    private function convertResponse(ResponseInterface $response): Response
-+    {
-+        /** @var string[] $headers */
-+        $headers = [];
-+        foreach ($response->getHeaders() as $name => $values) {
-+            $headers[$name] = implode(', ', $values);
-+        }
-+        return new Response($response->getStatusCode(), $headers, $response->getBody()->getContents());
-+    }
-+
-+    /**
-+     * Unwrap guzzle's promise.
-+     */
-+    private function unwrap(): void
-+    {
-+        try {
-+            /** @var ResponseInterface $response */
-+            $response = $this->promise->wait();
-+            $this->response = $this->convertResponse($response);
-+        } catch (RequestException $requestException) {
-+            if ($requestException instanceof BadResponseException) {
-+                $this->response = $this->convertResponse($requestException->getResponse());
-+            } else {
-+                $this->exception = new HttpException($requestException->getMessage(), 0, $requestException);
-+            }
-+        } catch (\Throwable $exception) {
-+            $this->exception = $exception;
-+        }
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function get(): Response
-+    {
-+        if ($this->isCancelled()) {
-+            throw new CancelingDeferredException('Deferred is canceled');
-+        }
-+        if (!$this->isDone()) {
-+            $this->unwrap();
-+        }
-+
-+        if ($this->exception) {
-+            throw $this->exception;
-+        }
-+        return $this->response;
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function cancel(bool $force = false): void
-+    {
-+        if ($force) {
-+            $this->promise->cancel();
-+            if ($this->promise->getState() === PromiseInterface::REJECTED) {
-+                $this->unwrap();
-+                if ($this->exception instanceof CancellationException) {
-+                    $this->canceled = true;
-+                    return;
-+                }
-+            }
-+        }
-+
-+        throw new CancelingDeferredException('Failed to cancel HTTP request');
-+    }
-+
-+    /**
-+     * @inheritDoc
-+     */
-+    public function isCancelled(): bool
-+    {
-+        return $this->canceled;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/HTTP/AsyncClient/HttpException.php b/lib/internal/Magento/Framework/HTTP/AsyncClient/HttpException.php
-new file mode 100644
-index 00000000000..5ff73c28694
---- /dev/null
-+++ b/lib/internal/Magento/Framework/HTTP/AsyncClient/HttpException.php
-@@ -0,0 +1,17 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\HTTP\AsyncClient;
-+
-+/**
-+ * Failed to send HTTP request.
-+ */
-+class HttpException extends \RuntimeException
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/HTTP/AsyncClient/HttpResponseDeferredInterface.php b/lib/internal/Magento/Framework/HTTP/AsyncClient/HttpResponseDeferredInterface.php
-new file mode 100644
-index 00000000000..7293cd571dc
---- /dev/null
-+++ b/lib/internal/Magento/Framework/HTTP/AsyncClient/HttpResponseDeferredInterface.php
-@@ -0,0 +1,25 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\HTTP\AsyncClient;
-+
-+use Magento\Framework\Async\CancelableDeferredInterface;
-+
-+/**
-+ * Deferred HTTP response.
-+ */
-+interface HttpResponseDeferredInterface extends CancelableDeferredInterface
-+{
-+    /**
-+     * @inheritdoc
-+     * @return Response HTTP response.
-+     * @throws HttpException When failed to send the request,
-+     * if response has 400+ status code it will not be treated as an exception.
-+     */
-+    public function get(): Response;
-+}
-diff --git a/lib/internal/Magento/Framework/HTTP/AsyncClient/Request.php b/lib/internal/Magento/Framework/HTTP/AsyncClient/Request.php
-new file mode 100644
-index 00000000000..871bb910e3a
---- /dev/null
-+++ b/lib/internal/Magento/Framework/HTTP/AsyncClient/Request.php
-@@ -0,0 +1,111 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\HTTP\AsyncClient;
-+
-+/**
-+ * Request to send.
-+ */
-+class Request
-+{
-+    public const METHOD_GET = 'GET';
-+
-+    public const METHOD_POST = 'POST';
-+
-+    public const METHOD_HEAD = 'HEAD';
-+
-+    public const METHOD_PUT = 'PUT';
-+
-+    public const METHOD_DELETE = 'DELETE';
-+
-+    public const METHOD_CONNECT = 'CONNECT';
-+
-+    public const METHOD_PATCH = 'PATCH';
-+
-+    public const METHOD_OPTIONS = 'OPTIONS';
-+
-+    public const METHOD_PROPFIND = 'PROPFIND';
-+
-+    public const METHOD_TRACE = 'TRACE';
-+
-+    /**
-+     * @var string
-+     */
-+    private $url;
-+
-+    /**
-+     * @var string
-+     */
-+    private $method;
-+
-+    /**
-+     * @var string[]
-+     */
-+    private $headers;
-+
-+    /**
-+     * @var string|null
-+     */
-+    private $body;
-+
-+    /**
-+     * @param string $url
-+     * @param string $method
-+     * @param string[] $headers
-+     * @param string $body
-+     */
-+    public function __construct(string $url, string $method, array $headers, ?string $body)
-+    {
-+        $this->url = $url;
-+        $this->method = $method;
-+        $this->headers = $headers;
-+        $this->body = $body;
-+    }
-+
-+    /**
-+     * URL to send request to.
-+     *
-+     * @return string
-+     */
-+    public function getUrl(): string
-+    {
-+        return $this->url;
-+    }
-+
-+    /**
-+     * HTTP method to use.
-+     *
-+     * @return string
-+     */
-+    public function getMethod(): string
-+    {
-+        return $this->method;
-+    }
-+
-+    /**
-+     * Headers to send.
-+     *
-+     * Keys - header names, values - array of header values.
-+     *
-+     * @return string[][]
-+     */
-+    public function getHeaders(): array
-+    {
-+        return $this->headers;
-+    }
-+
-+    /**
-+     * Body to send
-+     *
-+     * @return string|null
-+     */
-+    public function getBody(): ?string
-+    {
-+        return $this->body;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/HTTP/AsyncClient/Response.php b/lib/internal/Magento/Framework/HTTP/AsyncClient/Response.php
-new file mode 100644
-index 00000000000..e92515f74b5
---- /dev/null
-+++ b/lib/internal/Magento/Framework/HTTP/AsyncClient/Response.php
-@@ -0,0 +1,75 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\HTTP\AsyncClient;
-+
-+/**
-+ * Http response.
-+ */
-+class Response
-+{
-+    /**
-+     * @var int
-+     */
-+    private $statusCode;
-+
-+    /**
-+     * @var string[]
-+     */
-+    private $headers;
-+
-+    /**
-+     * @var string
-+     */
-+    private $body;
-+
-+    /**
-+     * @param int $statusCode
-+     * @param string[] $headers
-+     * @param string $body
-+     */
-+    public function __construct(int $statusCode, array $headers, string $body)
-+    {
-+        $this->statusCode = $statusCode;
-+        $this->headers = array_change_key_case($headers, CASE_LOWER);
-+        $this->body = $body;
-+    }
-+
-+    /**
-+     * Status code returned.
-+     *
-+     * @return int
-+     */
-+    public function getStatusCode(): int
-+    {
-+        return $this->statusCode;
-+    }
-+
-+    /**
-+     * With header names as keys (case preserved) and values as header values.
-+     *
-+     * If a header's value had multiple values they will be shown like "val1, val2, val3".
-+     * Header names are all lower-case.
-+     *
-+     * @return string[]
-+     */
-+    public function getHeaders(): array
-+    {
-+        return $this->headers;
-+    }
-+
-+    /**
-+     * Response body.
-+     *
-+     * @return string
-+     */
-+    public function getBody(): string
-+    {
-+        return $this->body;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/HTTP/AsyncClientInterface.php b/lib/internal/Magento/Framework/HTTP/AsyncClientInterface.php
-new file mode 100644
-index 00000000000..ff739c58090
---- /dev/null
-+++ b/lib/internal/Magento/Framework/HTTP/AsyncClientInterface.php
-@@ -0,0 +1,26 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\HTTP;
-+
-+use Magento\Framework\HTTP\AsyncClient\HttpResponseDeferredInterface;
-+use Magento\Framework\HTTP\AsyncClient\Request;
-+
-+/**
-+ * Asynchronous HTTP client.
-+ */
-+interface AsyncClientInterface
-+{
-+    /**
-+     * Perform an HTTP request.
-+     *
-+     * @param Request $request
-+     * @return HttpResponseDeferredInterface
-+     */
-+    public function request(Request $request): HttpResponseDeferredInterface;
-+}
-diff --git a/lib/internal/Magento/Framework/HTTP/Client/Curl.php b/lib/internal/Magento/Framework/HTTP/Client/Curl.php
-index 788439aa4ff..0ac65a420dd 100644
---- a/lib/internal/Magento/Framework/HTTP/Client/Curl.php
-+++ b/lib/internal/Magento/Framework/HTTP/Client/Curl.php
-@@ -161,6 +161,7 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
- 
-     /**
-      * Authorization: Basic header
-+     *
-      * Login credentials support
-      *
-      * @param string $login username
-@@ -209,6 +210,7 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
- 
-     /**
-      * Clear cookies
-+     *
-      * @return void
-      */
-     public function removeCookies()
-@@ -293,6 +295,7 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
-     /**
-      * Get cookies array with details
-      * (domain, expire time etc)
-+     *
-      * @return array
-      */
-     public function getCookiesFull()
-@@ -327,6 +330,7 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
- 
-     /**
-      * Get response status code
-+     *
-      * @see lib\Magento\Framework\HTTP\Client#getStatus()
-      *
-      * @return int
-@@ -345,6 +349,7 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
-      * @param string $method
-      * @param string $uri
-      * @param array|string $params - use $params as a string in case of JSON or XML POST request.
-+     *
-      * @return void
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-@@ -410,6 +415,7 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
- 
-     /**
-      * Throw error exception
-+     *
-      * @param string $string
-      * @return void
-      * @throws \Exception
-@@ -432,10 +438,10 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
-     {
-         if ($this->_headerCount == 0) {
-             $line = explode(" ", trim($data), 3);
--            if (count($line) != 3) {
-+            if (count($line) < 2) {
-                 $this->doError("Invalid response line returned from server: " . $data);
-             }
--            $this->_responseStatus = intval($line[1]);
-+            $this->_responseStatus = (int)$line[1];
-         } else {
-             $name = $value = '';
-             $out = explode(": ", trim($data), 2);
-@@ -474,6 +480,7 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
- 
-     /**
-      * Set curl options array directly
-+     *
-      * @param array $arr
-      * @return void
-      */
-@@ -484,6 +491,7 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
- 
-     /**
-      * Set CURL options overrides array
-+     *
-      * @param array $arr
-      * @return void
-      */
-diff --git a/lib/internal/Magento/Framework/HTTP/Client/Socket.php b/lib/internal/Magento/Framework/HTTP/Client/Socket.php
-index d229baa5dd4..eba182b98b9 100644
---- a/lib/internal/Magento/Framework/HTTP/Client/Socket.php
-+++ b/lib/internal/Magento/Framework/HTTP/Client/Socket.php
-@@ -12,9 +12,8 @@
- namespace Magento\Framework\HTTP\Client;
- 
- /**
-- * @SuppressWarnings(PHPMD.UnusedPrivateField)
-- */
--/**
-+ * Socket client
-+ *
-  * @SuppressWarnings(PHPMD.UnusedPrivateField)
-  */
- class Socket implements \Magento\Framework\HTTP\ClientInterface
-@@ -134,6 +133,7 @@ class Socket implements \Magento\Framework\HTTP\ClientInterface
- 
-     /**
-      * Set headers from hash
-+     *
-      * @param array $headers
-      * @return void
-      */
-@@ -167,6 +167,7 @@ class Socket implements \Magento\Framework\HTTP\ClientInterface
- 
-     /**
-      * Authorization: Basic header
-+     *
-      * Login credentials support
-      *
-      * @param string $login username
-@@ -235,8 +236,7 @@ class Socket implements \Magento\Framework\HTTP\ClientInterface
-     }
- 
-     /**
--     * Set host, port from full url
--     * and return relative url
-+     * Set host, port from full url and return relative url
-      *
-      * @param string $uri ex. http://google.com/index.php?a=b
-      * @return string ex. /index.php?a=b
-@@ -330,6 +330,7 @@ class Socket implements \Magento\Framework\HTTP\ClientInterface
-     /**
-      * Get cookies array with details
-      * (domain, expire time etc)
-+     *
-      * @return array
-      */
-     public function getCookiesFull()
-@@ -424,7 +425,7 @@ class Socket implements \Magento\Framework\HTTP\ClientInterface
-         if (count($line) != 3) {
-             return $this->doError("Invalid response line returned from server: " . $responseLine);
-         }
--        $this->_responseStatus = intval($line[1]);
-+        $this->_responseStatus = (int)$line[1];
-         $this->processResponseHeaders();
- 
-         $this->processRedirect();
-@@ -444,6 +445,7 @@ class Socket implements \Magento\Framework\HTTP\ClientInterface
- 
-     /**
-      * Get response status code
-+     *
-      * @see \Magento\Framework\HTTP\Client#getStatus()
-      *
-      * @return int
-@@ -494,6 +496,7 @@ class Socket implements \Magento\Framework\HTTP\ClientInterface
- 
-     /**
-      * Throw error exception
-+     *
-      * @param string $string
-      * @return void
-      * @throws \Exception
-@@ -505,6 +508,7 @@ class Socket implements \Magento\Framework\HTTP\ClientInterface
- 
-     /**
-      * Convert headers hash to string
-+     *
-      * @param array $append
-      * @return string
-      */
-diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php
-index 4dd358783a5..3ecf360f368 100644
---- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php
-+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php
-@@ -14,7 +14,10 @@ use Zend\Uri\UriFactory;
- use Zend\Uri\UriInterface;
- 
- /**
-+ * HTTP Request for current PHP environment.
-+ *
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class Request extends \Zend\Http\PhpEnvironment\Request
- {
-@@ -586,6 +589,7 @@ class Request extends \Zend\Http\PhpEnvironment\Request
- 
-     /**
-      * Access values contained in the superglobals as public members
-+     *
-      * Order of precedence: 1. GET, 2. POST, 3. COOKIE, 4. SERVER, 5. ENV
-      *
-      * @see http://msdn.microsoft.com/en-us/library/system.web.httprequest.item.aspx
-@@ -683,7 +687,7 @@ class Request extends \Zend\Http\PhpEnvironment\Request
-      *
-      * @param string $name Header name to retrieve.
-      * @param mixed|null $default Default value to use when the requested header is missing.
--     * @return bool|HeaderInterface
-+     * @return bool|string
-      */
-     public function getHeader($name, $default = false)
-     {
-@@ -795,6 +799,8 @@ class Request extends \Zend\Http\PhpEnvironment\Request
-     }
- 
-     /**
-+     * Get flag value for whether the request is forwarded or not.
-+     *
-      * @return bool
-      * @codeCoverageIgnore
-      */
-@@ -804,6 +810,8 @@ class Request extends \Zend\Http\PhpEnvironment\Request
-     }
- 
-     /**
-+     * Set flag value for whether the request is forwarded or not.
-+     *
-      * @param bool $forwarded
-      * @return $this
-      * @codeCoverageIgnore
-diff --git a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php
-index 538359edd43..147505371ba 100644
---- a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php
-+++ b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php
-@@ -9,10 +9,15 @@ use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
- use Magento\Framework\App\Request\Http as HttpRequest;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
- 
-+/**
-+ * Test for
-+ *
-+ * @see RemoteAddress
-+ */
- class RemoteAddressTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|\HttpRequest
-+     * @var \PHPUnit_Framework_MockObject_MockObject|HttpRequest
-      */
-     protected $_request;
- 
-diff --git a/lib/internal/Magento/Framework/Image.php b/lib/internal/Magento/Framework/Image.php
-index 5dc1969559f..b3867c0197b 100644
---- a/lib/internal/Magento/Framework/Image.php
-+++ b/lib/internal/Magento/Framework/Image.php
-@@ -262,7 +262,7 @@ class Image
-     public function setImageBackgroundColor($color)
-     {
-         /** @noinspection PhpUndefinedFieldInspection */
--        $this->_adapter->imageBackgroundColor = intval($color);
-+        $this->_adapter->imageBackgroundColor = (int)$color;
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
-index 6042e4eee49..42f7e42960e 100644
---- a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
-+++ b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
-@@ -3,11 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Image\Adapter;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
- 
- /**
-+ * Image abstract adapter
-+ *
-  * @file        Abstract.php
-  * @author      Magento Core Team <core@magentocommerce.com>
-  * @SuppressWarnings(PHPMD.TooManyFields)
-@@ -169,6 +174,7 @@ abstract class AbstractAdapter implements AdapterInterface
- 
-     /**
-      * Save image to specific path.
-+     *
-      * If some folders of path does not exist they will be created
-      *
-      * @param null|string $destination
-@@ -620,7 +626,7 @@ abstract class AbstractAdapter implements AdapterInterface
-             $frameHeight !== null && $frameHeight <= 0 ||
-             empty($frameWidth) && empty($frameHeight)
-         ) {
--            throw new \Exception('Invalid image dimensions.');
-+            throw new \InvalidArgumentException('Invalid image dimensions.');
-         }
-     }
- 
-@@ -687,7 +693,9 @@ abstract class AbstractAdapter implements AdapterInterface
-                 $this->directoryWrite->create($this->directoryWrite->getRelativePath($destination));
-             } catch (\Magento\Framework\Exception\FileSystemException $e) {
-                 $this->logger->critical($e);
--                throw new \Exception('Unable to write file into directory ' . $destination . '. Access forbidden.');
-+                throw new \DomainException(
-+                    'Unable to write file into directory ' . $destination . '. Access forbidden.'
-+                );
-             }
-         }
- 
-@@ -701,7 +709,7 @@ abstract class AbstractAdapter implements AdapterInterface
-      */
-     protected function _canProcess()
-     {
--        return !empty($this->_fileName);
-+        return !empty($this->_fileName) && filesize($this->_fileName) > 0;
-     }
- 
-     /**
-@@ -710,12 +718,19 @@ abstract class AbstractAdapter implements AdapterInterface
-      * @param string $filePath
-      * @return bool
-      * @throws \InvalidArgumentException
-+     * @throws \DomainException
-+     * @throws \BadFunctionCallException
-+     * @throws \RuntimeException
-+     * @throws \OverflowException
-      */
-     public function validateUploadFile($filePath)
-     {
-         if (!file_exists($filePath)) {
-             throw new \InvalidArgumentException("File '{$filePath}' does not exists.");
-         }
-+        if (filesize($filePath) === 0) {
-+            throw new \InvalidArgumentException('Wrong file size.');
-+        }
-         if (!getimagesize($filePath)) {
-             throw new \InvalidArgumentException('Disallowed file type.');
-         }
-diff --git a/lib/internal/Magento/Framework/Image/Adapter/Config.php b/lib/internal/Magento/Framework/Image/Adapter/Config.php
-index ecba84b28bb..636bbcdcbdb 100644
---- a/lib/internal/Magento/Framework/Image/Adapter/Config.php
-+++ b/lib/internal/Magento/Framework/Image/Adapter/Config.php
-@@ -3,14 +3,31 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Image\Adapter;
- 
--class Config implements \Magento\Framework\Image\Adapter\ConfigInterface
-+/**
-+ * Image config provider.
-+ */
-+class Config implements ConfigInterface, UploadConfigInterface
- {
-     const XML_PATH_IMAGE_ADAPTER = 'dev/image/default_adapter';
- 
-     const XML_PATH_IMAGE_ADAPTERS = 'dev/image/adapters';
- 
-+    /**
-+     * Config path for the maximal image width value
-+     * @deprecated
-+     */
-+    const XML_PATH_MAX_WIDTH_IMAGE = 'system/upload_configuration/max_width';
-+
-+    /**
-+     * Config path for the maximal image height value
-+     * @deprecated
-+     */
-+    const XML_PATH_MAX_HEIGHT_IMAGE = 'system/upload_configuration/max_height';
-+
-     /**
-      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-      */
-@@ -43,4 +60,28 @@ class Config implements \Magento\Framework\Image\Adapter\ConfigInterface
-     {
-         return $this->config->getValue(self::XML_PATH_IMAGE_ADAPTERS);
-     }
-+
-+    /**
-+     * Get Maximum Image Width resolution in pixels. For image resizing on client side.
-+     *
-+     * @return int
-+     * @deprecated
-+     * @see \Magento\Backend\Model\Image\UploadResizeConfigInterface::getMaxHeight()
-+     */
-+    public function getMaxWidth(): int
-+    {
-+        return (int)$this->config->getValue(self::XML_PATH_MAX_WIDTH_IMAGE);
-+    }
-+
-+    /**
-+     * Get Maximum Image Height resolution in pixels. For image resizing on client side.
-+     *
-+     * @return int
-+     * @deprecated
-+     * @see \Magento\Backend\Model\Image\UploadResizeConfigInterface::getMaxHeight()
-+     */
-+    public function getMaxHeight(): int
-+    {
-+        return (int)$this->config->getValue(self::XML_PATH_MAX_HEIGHT_IMAGE);
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
-index ea21faf3f34..d52e70ef56a 100644
---- a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
-+++ b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
-@@ -3,8 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\Image\Adapter;
- 
-+/**
-+ * Gd2 adapter.
-+ *
-+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-+ */
- class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
- {
-     /**
-@@ -54,6 +60,9 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
-      */
-     public function open($filename)
-     {
-+        if (!$filename || filesize($filename) === 0) {
-+            throw new \InvalidArgumentException('Wrong file');
-+        }
-         $this->_fileName = $filename;
-         $this->_reset();
-         $this->getMimeType();
-@@ -66,6 +75,16 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
-             $this->_getCallback('create', null, sprintf('Unsupported image format. File: %s', $this->_fileName)),
-             $this->_fileName
-         );
-+        $fileType = $this->getImageType();
-+        if (in_array($fileType, [IMAGETYPE_PNG, IMAGETYPE_GIF])) {
-+            $this->_keepTransparency = true;
-+            if ($this->_imageHandler) {
-+                $isAlpha = $this->checkAlpha($this->_fileName);
-+                if ($isAlpha) {
-+                    $this->_fillBackgroundColor($this->_imageHandler);
-+                }
-+            }
-+        }
-     }
- 
-     /**
-@@ -112,6 +131,7 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
- 
-     /**
-      * Converts memory value (e.g. 64M, 129K) to bytes.
-+     *
-      * Case insensitive value might be used.
-      *
-      * @param string $memoryValue
-@@ -132,6 +152,7 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
- 
-     /**
-      * Save image to specific path.
-+     *
-      * If some folders of path does not exist they will be created
-      *
-      * @param null|string $destination
-@@ -188,7 +209,10 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
-     }
- 
-     /**
-+     * Render image and return its binary contents.
-+     *
-      * @see \Magento\Framework\Image\Adapter\AbstractAdapter::getImage
-+     *
-      * @return string
-      */
-     public function getImage()
-@@ -205,7 +229,8 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
-      * @param null|int $fileType
-      * @param string $unsupportedText
-      * @return string
--     * @throws \Exception
-+     * @throws \InvalidArgumentException
-+     * @throws \BadFunctionCallException
-      */
-     private function _getCallback($callbackType, $fileType = null, $unsupportedText = 'Unsupported image format.')
-     {
-@@ -213,21 +238,22 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
-             $fileType = $this->_fileType;
-         }
-         if (empty(self::$_callbacks[$fileType])) {
--            throw new \Exception($unsupportedText);
-+            throw new \InvalidArgumentException($unsupportedText);
-         }
-         if (empty(self::$_callbacks[$fileType][$callbackType])) {
--            throw new \Exception('Callback not found.');
-+            throw new \BadFunctionCallException('Callback not found.');
-         }
-         return self::$_callbacks[$fileType][$callbackType];
-     }
- 
-     /**
-      * Fill image with main background color.
-+     *
-      * Returns a color identifier.
-      *
-      * @param resource &$imageResourceTo
-      * @return int
--     * @throws \Exception
-+     * @throws \InvalidArgumentException
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-     private function _fillBackgroundColor(&$imageResourceTo)
-@@ -240,17 +266,17 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
-                 // fill truecolor png with alpha transparency
-                 if ($isAlpha) {
-                     if (!imagealphablending($imageResourceTo, false)) {
--                        throw new \Exception('Failed to set alpha blending for PNG image.');
-+                        throw new \InvalidArgumentException('Failed to set alpha blending for PNG image.');
-                     }
-                     $transparentAlphaColor = imagecolorallocatealpha($imageResourceTo, 0, 0, 0, 127);
-                     if (false === $transparentAlphaColor) {
--                        throw new \Exception('Failed to allocate alpha transparency for PNG image.');
-+                        throw new \InvalidArgumentException('Failed to allocate alpha transparency for PNG image.');
-                     }
-                     if (!imagefill($imageResourceTo, 0, 0, $transparentAlphaColor)) {
--                        throw new \Exception('Failed to fill PNG image with alpha transparency.');
-+                        throw new \InvalidArgumentException('Failed to fill PNG image with alpha transparency.');
-                     }
-                     if (!imagesavealpha($imageResourceTo, true)) {
--                        throw new \Exception('Failed to save alpha transparency into PNG image.');
-+                        throw new \InvalidArgumentException('Failed to save alpha transparency into PNG image.');
-                     }
- 
-                     return $transparentAlphaColor;
-@@ -262,22 +288,22 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
-                         $transparentColor = imagecolorallocate($imageResourceTo, $r, $g, $b);
-                     }
-                     if (false === $transparentColor) {
--                        throw new \Exception('Failed to allocate transparent color for image.');
-+                        throw new \InvalidArgumentException('Failed to allocate transparent color for image.');
-                     }
-                     if (!imagefill($imageResourceTo, 0, 0, $transparentColor)) {
--                        throw new \Exception('Failed to fill image with transparency.');
-+                        throw new \InvalidArgumentException('Failed to fill image with transparency.');
-                     }
-                     imagecolortransparent($imageResourceTo, $transparentColor);
-                     return $transparentColor;
-                 }
-             } catch (\Exception $e) {
--                // fallback to default background color
-+                throw new \DomainException('Failed to fill image.');
-             }
-         }
-         list($r, $g, $b) = $this->_backgroundColor;
-         $color = imagecolorallocate($imageResourceTo, $r, $g, $b);
-         if (!imagefill($imageResourceTo, 0, 0, $color)) {
--            throw new \Exception("Failed to fill image background with color {$r} {$g} {$b}.");
-+            throw new \InvalidArgumentException("Failed to fill image background with color {$r} {$g} {$b}.");
-         }
- 
-         return $color;
-@@ -298,10 +324,12 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
-      * Checks if image has alpha transparency
-      *
-      * @param resource $imageResource
--     * @param int $fileType one of the constants IMAGETYPE_*
--     * @param bool &$isAlpha
--     * @param bool &$isTrueColor
-+     * @param int $fileType
-+     * @param bool $isAlpha
-+     * @param bool $isTrueColor
-+     *
-      * @return boolean
-+     *
-      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-      */
-     private function _getTransparency($imageResource, $fileType, &$isAlpha = false, &$isTrueColor = false)
-@@ -425,7 +453,6 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
-             $col = imagecolorallocate($newWatermark, 255, 255, 255);
-             imagecolortransparent($newWatermark, $col);
-             imagefilledrectangle($newWatermark, 0, 0, $this->getWatermarkWidth(), $this->getWatermarkHeight(), $col);
--            imagealphablending($newWatermark, true);
-             imagesavealpha($newWatermark, true);
-             imagecopyresampled(
-                 $newWatermark,
-@@ -450,7 +477,6 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
-             $col = imagecolorallocate($newWatermark, 255, 255, 255);
-             imagecolortransparent($newWatermark, $col);
-             imagefilledrectangle($newWatermark, 0, 0, $this->_imageSrcWidth, $this->_imageSrcHeight, $col);
--            imagealphablending($newWatermark, true);
-             imagesavealpha($newWatermark, true);
-             imagecopyresampled(
-                 $newWatermark,
-@@ -618,13 +644,13 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
-      * Checks required dependencies
-      *
-      * @return void
--     * @throws \Exception If some of dependencies are missing
-+     * @throws \RuntimeException If some of dependencies are missing
-      */
-     public function checkDependencies()
-     {
-         foreach ($this->_requiredExtensions as $value) {
-             if (!extension_loaded($value)) {
--                throw new \Exception("Required PHP extension '{$value}' was not loaded.");
-+                throw new \RuntimeException("Required PHP extension '{$value}' was not loaded.");
-             }
-         }
-     }
-@@ -730,12 +756,13 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
- 
-     /**
-      * Create Image using ttf font
-+     *
-      * Note: This function requires both the GD library and the FreeType library
-      *
-      * @param string $text
-      * @param string $font
-      * @return void
--     * @throws \Exception
-+     * @throws \InvalidArgumentException
-      */
-     protected function _createImageFromTtfText($text, $font)
-     {
-@@ -757,7 +784,7 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
-             $text
-         );
-         if ($result === false) {
--            throw new \Exception('Unable to create TTF text');
-+            throw new \InvalidArgumentException('Unable to create TTF text');
-         }
-     }
- 
-diff --git a/lib/internal/Magento/Framework/Image/Adapter/UploadConfigInterface.php b/lib/internal/Magento/Framework/Image/Adapter/UploadConfigInterface.php
-new file mode 100644
-index 00000000000..0a2dbefff8e
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Image/Adapter/UploadConfigInterface.php
-@@ -0,0 +1,30 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Image\Adapter;
-+
-+/**
-+ * Interface UploadConfigInterface
-+ * @deprecated moved to proper namespace and extended
-+ * @see \Magento\Backend\Model\Image\UploadResizeConfigInterface;
-+ */
-+interface UploadConfigInterface
-+{
-+    /**
-+     * Get maximum image width.
-+     *
-+     * @return int
-+     */
-+    public function getMaxWidth(): int;
-+
-+    /**
-+     * Get maximum image height.
-+     *
-+     * @return int
-+     */
-+    public function getMaxHeight(): int;
-+}
-diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
-index 41281c96e1b..ccf52c7c59c 100644
---- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
-+++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
-@@ -3,6 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Image\Test\Unit\Adapter;
- 
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-@@ -24,6 +27,13 @@ class Gd2Test extends \PHPUnit\Framework\TestCase
-      */
-     public static $imageData = [];
- 
-+    /**
-+     * Simulation of filesize() function
-+     *
-+     * @var int
-+     */
-+    public static $imageSize = 1;
-+
-     /**
-      * Adapter for testing
-      * @var \Magento\Framework\Image\Adapter\Gd2
-diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/_files/global_php_mock.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/_files/global_php_mock.php
-index 3e90359b97b..a62909b495a 100644
---- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/_files/global_php_mock.php
-+++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/_files/global_php_mock.php
-@@ -3,6 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Image\Adapter;
- 
- use Magento\Framework\Image\Test\Unit\Adapter\Gd2Test;
-@@ -35,6 +38,16 @@ function getimagesize($file)
-     return Gd2Test::$imageData;
- }
- 
-+/**
-+ * @param $file
-+ * @return mixed
-+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-+ */
-+function filesize($file)
-+{
-+    return Gd2Test::$imageSize;
-+}
-+
- /**
-  * @param $real
-  * @return int
-diff --git a/lib/internal/Magento/Framework/Indexer/Config/DependencyInfoProvider.php b/lib/internal/Magento/Framework/Indexer/Config/DependencyInfoProvider.php
-index c9d7c8a35b2..661f9f9c0ff 100644
---- a/lib/internal/Magento/Framework/Indexer/Config/DependencyInfoProvider.php
-+++ b/lib/internal/Magento/Framework/Indexer/Config/DependencyInfoProvider.php
-@@ -49,7 +49,7 @@ class DependencyInfoProvider implements DependencyInfoProviderInterface
-             if (array_search($indexerId, $indexerData['dependencies']) !== false) {
-                 $result[] = $id;
-             }
--        };
-+        }
- 
-         return $result;
-     }
-diff --git a/lib/internal/Magento/Framework/Indexer/IndexStructure.php b/lib/internal/Magento/Framework/Indexer/IndexStructure.php
-index c9376f00b71..a39de2d5b8a 100644
---- a/lib/internal/Magento/Framework/Indexer/IndexStructure.php
-+++ b/lib/internal/Magento/Framework/Indexer/IndexStructure.php
-@@ -13,6 +13,12 @@ use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
- use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
- use Magento\Framework\Search\Request\Dimension;
- 
-+/**
-+ * Full text search index structure.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class IndexStructure implements IndexStructureInterface
- {
-     /**
-@@ -58,9 +64,7 @@ class IndexStructure implements IndexStructureInterface
-     }
- 
-     /**
--     * @param string $index
--     * @param Dimension[] $dimensions
--     * @return void
-+     * @inheritdoc
-      */
-     public function delete($index, array $dimensions = [])
-     {
-@@ -69,10 +73,7 @@ class IndexStructure implements IndexStructureInterface
-     }
- 
-     /**
--     * @param string $index
--     * @param array $fields
--     * @param Dimension[] $dimensions
--     * @return void
-+     * @inheritdoc
-      */
-     public function create($index, array $fields, array $dimensions = [])
-     {
-@@ -83,6 +84,8 @@ class IndexStructure implements IndexStructureInterface
-     }
- 
-     /**
-+     * Create full text index.
-+     *
-      * @param string $tableName
-      * @throws \Zend_Db_Exception
-      * @return void
-@@ -94,6 +97,8 @@ class IndexStructure implements IndexStructureInterface
-     }
- 
-     /**
-+     * Configure full text index table.
-+     *
-      * @param Table $table
-      * @return Table
-      */
-@@ -129,6 +134,8 @@ class IndexStructure implements IndexStructureInterface
-     }
- 
-     /**
-+     * Create flat index.
-+     *
-      * @param string $tableName
-      * @param array $fields
-      * @throws \Zend_Db_Exception
-@@ -160,6 +167,8 @@ class IndexStructure implements IndexStructureInterface
-     }
- 
-     /**
-+     * Drop table.
-+     *
-      * @param AdapterInterface $connection
-      * @param string $tableName
-      * @return void
-diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php
-index c3ab971c992..3483eb004be 100644
---- a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php
-+++ b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php
-@@ -13,6 +13,9 @@ use Magento\Framework\Indexer\IndexStructureInterface;
- use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
- use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
- 
-+/**
-+ * Save handler for indexer.
-+ */
- class IndexerHandler implements IndexerInterface
- {
-     /**
-@@ -93,7 +96,7 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function saveIndex($dimensions, \Traversable $documents)
-     {
-@@ -104,7 +107,7 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function deleteIndex($dimensions, \Traversable $documents)
-     {
-@@ -117,7 +120,7 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function cleanIndex($dimensions)
-     {
-@@ -126,14 +129,16 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
--    public function isAvailable()
-+    public function isAvailable($dimensions = [])
-     {
-         return true;
-     }
- 
-     /**
-+     * Returns table name.
-+     *
-      * @param string $dataType
-      * @param Dimension[] $dimensions
-      * @return string
-@@ -144,6 +149,8 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
-+     * Returns index name
-+     *
-      * @return string
-      */
-     protected function getIndexName()
-@@ -152,6 +159,8 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
-+     * Save searchable documents to storage.
-+     *
-      * @param array $documents
-      * @param Dimension[] $dimensions
-      * @return void
-@@ -166,6 +175,8 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
-+     * Save filterable documents to storage.
-+     *
-      * @param array $documents
-      * @param Dimension[] $dimensions
-      * @return void
-@@ -187,6 +198,8 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
-+     * Prepare filterable fields.
-+     *
-      * @param array $documents
-      * @return array
-      */
-@@ -206,6 +219,8 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
-+     * Prepare searchable fields.
-+     *
-      * @param array $documents
-      * @return array
-      */
-@@ -228,6 +243,8 @@ class IndexerHandler implements IndexerInterface
-     }
- 
-     /**
-+     * Prepare fields.
-+     *
-      * @return void
-      */
-     private function prepareFields()
-diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php
-index 047539d28be..e03404d3eb8 100644
---- a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php
-+++ b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php
-@@ -47,7 +47,8 @@ interface IndexerInterface
-     /**
-      * Define if engine is available
-      *
-+     * @param Dimension[] $dimensions
-      * @return bool
-      */
--    public function isAvailable();
-+    public function isAvailable($dimensions = []);
- }
-diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/Config/SchemaLocatorTest.php
-index ee193da3f0b..5b09c558a90 100644
---- a/lib/internal/Magento/Framework/Indexer/Test/Unit/Config/SchemaLocatorTest.php
-+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/Config/SchemaLocatorTest.php
-@@ -13,10 +13,10 @@ class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $model;
- 
--    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
-+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
-     protected $urnResolver;
- 
--    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
-+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
-     protected $urnResolverMock;
- 
-     protected function setUp()
-diff --git a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
-index 7d4026af6c0..9297ca25928 100644
---- a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
-+++ b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
-@@ -6,6 +6,11 @@
- 
- namespace Magento\Framework\Interception\Code\Generator;
- 
-+/**
-+ * Class Interceptor
-+ ˚*
-+ * @package Magento\Framework\Interception\Code\Generator
-+ */
- class Interceptor extends \Magento\Framework\Code\Generator\EntityAbstract
- {
-     /**
-@@ -14,6 +19,8 @@ class Interceptor extends \Magento\Framework\Code\Generator\EntityAbstract
-     const ENTITY_TYPE = 'interceptor';
- 
-     /**
-+     * Returns default result class name
-+     *
-      * @param string $modelClassName
-      * @return string
-      */
-@@ -102,10 +109,7 @@ class Interceptor extends \Magento\Framework\Code\Generator\EntityAbstract
-             $parameters[] = $this->_getMethodParameterInfo($parameter);
-         }
- 
--        $returnType = $method->getReturnType();
--        $returnTypeValue = $returnType
--            ? ($returnType->allowsNull() ? '?' : '') .$returnType->getName()
--            : null;
-+        $returnTypeValue = $this->getReturnTypeValue($method->getReturnType());
-         $methodInfo = [
-             'name' => ($method->returnsReference() ? '& ' : '') . $method->getName(),
-             'parameters' => $parameters,
-@@ -137,6 +141,8 @@ METHOD_BODY
-     }
- 
-     /**
-+     * Return parameters list
-+     *
-      * @param array $parameters
-      * @return string
-      */
-@@ -175,14 +181,16 @@ METHOD_BODY
-         } else {
-             $this->_classGenerator->setExtendedClass($typeName);
-         }
--        $this->_classGenerator->addTrait('\\'. \Magento\Framework\Interception\Interceptor::class);
--        $interfaces[] =  '\\'. \Magento\Framework\Interception\InterceptorInterface::class;
-+        $this->_classGenerator->addTrait('\\' . \Magento\Framework\Interception\Interceptor::class);
-+        $interfaces[] = '\\' . \Magento\Framework\Interception\InterceptorInterface::class;
-         $this->_classGenerator->setImplementedInterfaces($interfaces);
-         return parent::_generateCode();
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Validates data
-+     *
-+     * @return bool
-      */
-     protected function _validateData()
-     {
-@@ -205,4 +213,22 @@ METHOD_BODY
-         }
-         return $result;
-     }
-+
-+    /**
-+     * Returns return type
-+     *
-+     * @param mixed $returnType
-+     * @return null|string
-+     */
-+    private function getReturnTypeValue($returnType): ?string
-+    {
-+        $returnTypeValue = null;
-+        if ($returnType) {
-+            $returnTypeValue = ($returnType->allowsNull() ? '?' : '');
-+            $returnTypeValue .= ($returnType->getName() === 'self')
-+                ? $this->getSourceClassName()
-+                : $returnType->getName();
-+        }
-+        return $returnTypeValue;
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Interception/Config/CacheManager.php b/lib/internal/Magento/Framework/Interception/Config/CacheManager.php
-new file mode 100644
-index 00000000000..fd612370d07
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Interception/Config/CacheManager.php
-@@ -0,0 +1,114 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Interception\Config;
-+
-+/**
-+ * Interception cache manager.
-+ *
-+ * Responsible for handling interaction with compiled and uncompiled interception data
-+ */
-+class CacheManager
-+{
-+    /**
-+     * @var \Magento\Framework\Cache\FrontendInterface
-+     */
-+    private $cache;
-+
-+    /**
-+     * @var \Magento\Framework\Serialize\SerializerInterface
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @var \Magento\Framework\App\ObjectManager\ConfigWriterInterface
-+     */
-+    private $configWriter;
-+
-+    /**
-+     * @var \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled
-+     */
-+    private $compiledLoader;
-+
-+    /**
-+     * @param \Magento\Framework\Cache\FrontendInterface $cache
-+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
-+     * @param \Magento\Framework\App\ObjectManager\ConfigWriterInterface $configWriter
-+     * @param \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled $compiledLoader
-+     */
-+    public function __construct(
-+        \Magento\Framework\Cache\FrontendInterface $cache,
-+        \Magento\Framework\Serialize\SerializerInterface $serializer,
-+        \Magento\Framework\App\ObjectManager\ConfigWriterInterface $configWriter,
-+        \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled $compiledLoader
-+    ) {
-+        $this->cache = $cache;
-+        $this->serializer = $serializer;
-+        $this->configWriter = $configWriter;
-+        $this->compiledLoader = $compiledLoader;
-+    }
-+
-+    /**
-+     * Load the interception config from cache
-+     *
-+     * @param string $key
-+     * @return array|null
-+     */
-+    public function load(string $key): ?array
-+    {
-+        if ($this->isCompiled($key)) {
-+            return $this->compiledLoader->load($key);
-+        }
-+
-+        $intercepted = $this->cache->load($key);
-+        return $intercepted ? $this->serializer->unserialize($intercepted) : null;
-+    }
-+
-+    /**
-+     * Save config to cache backend
-+     *
-+     * @param string $key
-+     * @param array $data
-+     */
-+    public function save(string $key, array $data)
-+    {
-+        $this->cache->save($this->serializer->serialize($data), $key);
-+    }
-+
-+    /**
-+     * Save config to filesystem
-+     *
-+     * @param string $key
-+     * @param array $data
-+     */
-+    public function saveCompiled(string $key, array $data)
-+    {
-+        $this->configWriter->write($key, $data);
-+    }
-+
-+    /**
-+     * Purge interception cache
-+     *
-+     * @param string $key
-+     */
-+    public function clean(string $key)
-+    {
-+        $this->cache->remove($key);
-+    }
-+
-+    /**
-+     * Check for the compiled config with the generated metadata
-+     *
-+     * @param string $key
-+     * @return bool
-+     */
-+    private function isCompiled(string $key): bool
-+    {
-+        return file_exists(\Magento\Framework\App\ObjectManager\ConfigLoader\Compiled::getFilePath($key));
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Interception/Config/Config.php b/lib/internal/Magento/Framework/Interception/Config/Config.php
-index 7c80051537b..3f16e9275bd 100644
---- a/lib/internal/Magento/Framework/Interception/Config/Config.php
-+++ b/lib/internal/Magento/Framework/Interception/Config/Config.php
-@@ -1,15 +1,17 @@
- <?php
- /**
-- * Interception config. Responsible for providing list of plugins configured for instance
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
- namespace Magento\Framework\Interception\Config;
- 
- use Magento\Framework\Serialize\SerializerInterface;
--use Magento\Framework\Serialize\Serializer\Serialize;
- 
-+/**
-+ * Interception config.
-+ *
-+ * Responsible for providing list of plugins configured for instance
-+ */
- class Config implements \Magento\Framework\Interception\ConfigInterface
- {
-     /**
-@@ -35,7 +37,7 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
- 
-     /**
-      * Cache
--     *
-+     * @deprecated
-      * @var \Magento\Framework\Cache\FrontendInterface
-      */
-     protected $_cache;
-@@ -74,21 +76,24 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
-     protected $_scopeList;
- 
-     /**
--     * @var SerializerInterface
-+     * @var CacheManager
-      */
--    private $serializer;
-+    private $cacheManager;
- 
-     /**
-      * Config constructor
-      *
-      * @param \Magento\Framework\Config\ReaderInterface $reader
-      * @param \Magento\Framework\Config\ScopeListInterface $scopeList
--     * @param \Magento\Framework\Cache\FrontendInterface $cache
-+     * @param \Magento\Framework\Cache\FrontendInterface $cache @deprecated
-      * @param \Magento\Framework\ObjectManager\RelationsInterface $relations
-      * @param \Magento\Framework\Interception\ObjectManager\ConfigInterface $omConfig
-      * @param \Magento\Framework\ObjectManager\DefinitionInterface $classDefinitions
-      * @param string $cacheId
--     * @param SerializerInterface|null $serializer
-+     * @param SerializerInterface|null $serializer @deprecated
-+     * @param CacheManager $cacheManager
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         \Magento\Framework\Config\ReaderInterface $reader,
-@@ -98,7 +103,8 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
-         \Magento\Framework\Interception\ObjectManager\ConfigInterface $omConfig,
-         \Magento\Framework\ObjectManager\DefinitionInterface $classDefinitions,
-         $cacheId = 'interception',
--        SerializerInterface $serializer = null
-+        SerializerInterface $serializer = null,
-+        CacheManager $cacheManager = null
-     ) {
-         $this->_omConfig = $omConfig;
-         $this->_relations = $relations;
-@@ -107,13 +113,13 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
-         $this->_cacheId = $cacheId;
-         $this->_reader = $reader;
-         $this->_scopeList = $scopeList;
--        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
--            ->get(Serialize::class);
--        $intercepted = $this->_cache->load($this->_cacheId);
--        if ($intercepted !== false) {
--            $this->_intercepted = $this->serializer->unserialize($intercepted);
-+        $this->cacheManager =
-+            $cacheManager ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CacheManager::class);
-+        $intercepted = $this->cacheManager->load($cacheId);
-+        if ($intercepted !== null) {
-+            $this->_intercepted = $intercepted;
-         } else {
--            $this->initialize($this->_classDefinitions->getClasses());
-+            $this->initializeUncompiled($this->_classDefinitions->getClasses());
-         }
-     }
- 
-@@ -125,24 +131,9 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
-      */
-     public function initialize($classDefinitions = [])
-     {
--        $this->_cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [$this->_cacheId]);
--        $config = [];
--        foreach ($this->_scopeList->getAllScopes() as $scope) {
--            $config = array_replace_recursive($config, $this->_reader->read($scope));
--        }
--        unset($config['preferences']);
--        foreach ($config as $typeName => $typeConfig) {
--            if (!empty($typeConfig['plugins'])) {
--                $this->_intercepted[ltrim($typeName, '\\')] = true;
--            }
--        }
--        foreach ($config as $typeName => $typeConfig) {
--            $this->hasPlugins($typeName);
--        }
--        foreach ($classDefinitions as $class) {
--            $this->hasPlugins($class);
--        }
--        $this->_cache->save($this->serializer->serialize($this->_intercepted), $this->_cacheId);
-+        $this->generateIntercepted($classDefinitions);
-+
-+        $this->cacheManager->saveCompiled($this->_cacheId, $this->_intercepted);
-     }
- 
-     /**
-@@ -179,7 +170,7 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function hasPlugins($type)
-     {
-@@ -188,4 +179,43 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
-         }
-         return $this->_inheritInterception($type);
-     }
-+
-+    /**
-+     * Write interception config to cache
-+     *
-+     * @param array $classDefinitions
-+     */
-+    private function initializeUncompiled($classDefinitions = [])
-+    {
-+        $this->cacheManager->clean($this->_cacheId);
-+
-+        $this->generateIntercepted($classDefinitions);
-+
-+        $this->cacheManager->save($this->_cacheId, $this->_intercepted);
-+    }
-+
-+    /**
-+     * Generate intercepted array to store in compiled metadata or frontend cache
-+     *
-+     * @param array $classDefinitions
-+     */
-+    private function generateIntercepted($classDefinitions)
-+    {
-+        $config = [];
-+        foreach ($this->_scopeList->getAllScopes() as $scope) {
-+            $config = array_replace_recursive($config, $this->_reader->read($scope));
-+        }
-+        unset($config['preferences']);
-+        foreach ($config as $typeName => $typeConfig) {
-+            if (!empty($typeConfig['plugins'])) {
-+                $this->_intercepted[ltrim($typeName, '\\')] = true;
-+            }
-+        }
-+        foreach ($config as $typeName => $typeConfig) {
-+            $this->hasPlugins($typeName);
-+        }
-+        foreach ($classDefinitions as $class) {
-+            $this->hasPlugins($class);
-+        }
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Interception/Interceptor.php b/lib/internal/Magento/Framework/Interception/Interceptor.php
-index 07600c51681..df1b6802342 100644
---- a/lib/internal/Magento/Framework/Interception/Interceptor.php
-+++ b/lib/internal/Magento/Framework/Interception/Interceptor.php
-@@ -62,9 +62,14 @@ trait Interceptor
-      * Calls parent class sleep if defined, otherwise provides own implementation
-      *
-      * @return array
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         if (method_exists(get_parent_class($this), '__sleep')) {
-             $properties = parent::__sleep();
-         } else {
-@@ -78,9 +83,14 @@ trait Interceptor
-      * Causes Interceptor to be initialized
-      *
-      * @return void
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         if (method_exists(get_parent_class($this), '__wakeup')) {
-             parent::__wakeup();
-         }
-diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
-index e21841b48bc..a4f728454a5 100644
---- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
-+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
-@@ -30,7 +30,7 @@ class PluginList extends Scoped implements InterceptionPluginList
-      *
-      * @var array
-      */
--    protected $_inherited;
-+    protected $_inherited = [];
- 
-     /**
-      * Inherited plugin data, preprocessed for read
-diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
-index fe8d29bd0d5..61eb2e62091 100644
---- a/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
-+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
-@@ -31,11 +31,6 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-      */
-     private $readerMock;
- 
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    private $cacheMock;
--
-     /**
-      * @var \PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -51,8 +46,10 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-      */
-     private $relationsMock;
- 
--    /** @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject */
--    private $serializerMock;
-+    /**
-+     * @var \Magento\Framework\Interception\Config\CacheManager|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $cacheManagerMock;
- 
-     /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
-     private $objectManagerHelper;
-@@ -61,7 +58,6 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->readerMock = $this->createMock(\Magento\Framework\ObjectManager\Config\Reader\Dom::class);
-         $this->configScopeMock = $this->createMock(\Magento\Framework\Config\ScopeListInterface::class);
--        $this->cacheMock = $this->createMock(\Magento\Framework\Cache\FrontendInterface::class);
-         $this->omConfigMock = $this->getMockForAbstractClass(
-             \Magento\Framework\Interception\ObjectManager\ConfigInterface::class
-         );
-@@ -69,7 +65,7 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-         $this->relationsMock = $this->getMockForAbstractClass(
-             \Magento\Framework\ObjectManager\RelationsInterface::class
-         );
--        $this->serializerMock = $this->createMock(SerializerInterface::class);
-+        $this->cacheManagerMock = $this->createMock(\Magento\Framework\Interception\Config\CacheManager::class);
-         $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-     }
- 
-@@ -88,9 +84,9 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-             ->method('getAllScopes')
-             ->will($this->returnValue(['global', 'backend', 'frontend']));
-         // turn cache off
--        $this->cacheMock->expects($this->any())
-+        $this->cacheManagerMock->expects($this->any())
-             ->method('load')
--            ->will($this->returnValue(false));
-+            ->will($this->returnValue(null));
-         $this->omConfigMock->expects($this->any())
-             ->method('getOriginalInstanceType')
-             ->will($this->returnValueMap(
-@@ -138,21 +134,15 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-         $this->relationsMock->expects($this->any())->method('has')->will($this->returnValue($expectedResult));
-         $this->relationsMock->expects($this->any())->method('getParents')->will($this->returnValue($entityParents));
- 
--        $this->serializerMock->expects($this->once())
--            ->method('serialize');
--
--        $this->serializerMock->expects($this->never())->method('unserialize');
--
-         $model = $this->objectManagerHelper->getObject(
-             \Magento\Framework\Interception\Config\Config::class,
-             [
-                 'reader' => $this->readerMock,
-                 'scopeList' => $this->configScopeMock,
--                'cache' => $this->cacheMock,
-+                'cacheManager' => $this->cacheManagerMock,
-                 'relations' => $this->relationsMock,
-                 'omConfig' => $this->omConfigMock,
-                 'classDefinitions' => $this->definitionMock,
--                'serializer' => $this->serializerMock
-             ]
-         );
- 
-@@ -177,32 +167,24 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-             'virtual_custom_item' => true
-         ];
-         $this->readerMock->expects($this->never())->method('read');
--        $this->cacheMock->expects($this->never())->method('save');
--        $serializedValue = 'serializedData';
--        $this->cacheMock->expects($this->any())
-+        $this->cacheManagerMock->expects($this->never())->method('save');
-+        $this->cacheManagerMock->expects($this->any())
-             ->method('load')
-             ->with($cacheId)
--            ->will($this->returnValue($serializedValue));
--
--        $this->serializerMock->expects($this->never())->method('serialize');
--        $this->serializerMock->expects($this->once())
--            ->method('unserialize')
--            ->with($serializedValue)
--            ->willReturn($interceptionData);
-+            ->will($this->returnValue($interceptionData));
- 
-         $model = $this->objectManagerHelper->getObject(
-             \Magento\Framework\Interception\Config\Config::class,
-             [
-                 'reader' => $this->readerMock,
-                 'scopeList' => $this->configScopeMock,
--                'cache' => $this->cacheMock,
-+                'cacheManager' => $this->cacheManagerMock,
-                 'relations' => $this->objectManagerHelper->getObject(
-                     \Magento\Framework\ObjectManager\Relations\Runtime::class
-                 ),
-                 'omConfig' => $this->omConfigMock,
-                 'classDefinitions' => $this->definitionMock,
-                 'cacheId' => $cacheId,
--                'serializer' => $this->serializerMock
-             ]
-         );
- 
-diff --git a/lib/internal/Magento/Framework/Locale/Config.php b/lib/internal/Magento/Framework/Locale/Config.php
-index 8767bd515db..fe685fdf35b 100644
---- a/lib/internal/Magento/Framework/Locale/Config.php
-+++ b/lib/internal/Magento/Framework/Locale/Config.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Framework\Locale;
- 
-+/**
-+ * Allowed locale and currency configuration.
-+ */
- class Config implements \Magento\Framework\Locale\ConfigInterface
- {
-     /**
-@@ -90,6 +93,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
-         'sq_AL', /*Albanian (Albania)*/
-         'sr_Cyrl_RS', /*Serbian (Serbia)*/
-         'sv_SE', /*Swedish (Sweden)*/
-+        'sv_FI', /*Swedish (Finland)*/
-         'sw_KE', /*Swahili (Kenya)*/
-         'th_TH', /*Thai (Thailand)*/
-         'tr_TR', /*Turkish (Turkey)*/
-diff --git a/lib/internal/Magento/Framework/Locale/Format.php b/lib/internal/Magento/Framework/Locale/Format.php
-index ca50cdb2440..934c9638c73 100644
---- a/lib/internal/Magento/Framework/Locale/Format.php
-+++ b/lib/internal/Magento/Framework/Locale/Format.php
-@@ -5,8 +5,16 @@
-  */
- namespace Magento\Framework\Locale;
- 
-+/**
-+ * Price locale format.
-+ */
- class Format implements \Magento\Framework\Locale\FormatInterface
- {
-+    /**
-+     * Japan locale code
-+     */
-+    private const JAPAN_LOCALE_CODE = 'ja_JP';
-+
-     /**
-      * @var \Magento\Framework\App\ScopeResolverInterface
-      */
-@@ -38,7 +46,8 @@ class Format implements \Magento\Framework\Locale\FormatInterface
-     }
- 
-     /**
--     * Returns the first found number from a string
-+     * Returns the first found number from a string.
-+     *
-      * Parsing depends on given locale (grouping and decimal)
-      *
-      * Examples for input:
-@@ -77,7 +86,16 @@ class Format implements \Magento\Framework\Locale\FormatInterface
-                 $value = str_replace(',', '', $value);
-             }
-         } elseif ($separatorComa !== false) {
--            $value = str_replace(',', '.', $value);
-+            $locale = $this->_localeResolver->getLocale();
-+            /**
-+             * It's hard code for Japan locale.
-+             * Comma separator uses as group separator: 4,000 saves as 4,000.00
-+             */
-+            $value = str_replace(
-+                ',',
-+                $locale === self::JAPAN_LOCALE_CODE ? '' : '.',
-+                $value
-+            );
-         }
- 
-         return (float)$value;
-@@ -100,7 +118,7 @@ class Format implements \Magento\Framework\Locale\FormatInterface
-         }
- 
-         $formatter = new \NumberFormatter(
--            $localeCode . '@currency=' . $currency->getCode(),
-+            $currency->getCode() ? $localeCode . '@currency=' . $currency->getCode() : $localeCode,
-             \NumberFormatter::CURRENCY
-         );
-         $format = $formatter->getPattern();
-diff --git a/lib/internal/Magento/Framework/Locale/Resolver.php b/lib/internal/Magento/Framework/Locale/Resolver.php
-index b401da8960f..d058bfd41ab 100644
---- a/lib/internal/Magento/Framework/Locale/Resolver.php
-+++ b/lib/internal/Magento/Framework/Locale/Resolver.php
-@@ -6,7 +6,12 @@
- namespace Magento\Framework\Locale;
- 
- use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Framework\App\DeploymentConfig;
-+use Magento\Framework\App\ObjectManager;
- 
-+/**
-+ * Manages locale config information.
-+ */
- class Resolver implements ResolverInterface
- {
-     /**
-@@ -52,26 +57,34 @@ class Resolver implements ResolverInterface
-      */
-     private $defaultLocalePath;
- 
-+    /**
-+     * @var DeploymentConfig
-+     */
-+    private $deploymentConfig;
-+
-     /**
-      * @param ScopeConfigInterface $scopeConfig
-      * @param string $defaultLocalePath
-      * @param string $scopeType
-      * @param mixed $locale
-+     * @param DeploymentConfig|null $deploymentConfig
-      */
-     public function __construct(
-         ScopeConfigInterface $scopeConfig,
-         $defaultLocalePath,
-         $scopeType,
--        $locale = null
-+        $locale = null,
-+        DeploymentConfig $deploymentConfig = null
-     ) {
-         $this->scopeConfig = $scopeConfig;
-         $this->defaultLocalePath = $defaultLocalePath;
-         $this->scopeType = $scopeType;
-+        $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->create(DeploymentConfig::class);
-         $this->setLocale($locale);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDefaultLocalePath()
-     {
-@@ -79,7 +92,7 @@ class Resolver implements ResolverInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDefaultLocale($locale)
-     {
-@@ -88,12 +101,15 @@ class Resolver implements ResolverInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDefaultLocale()
-     {
-         if (!$this->defaultLocale) {
--            $locale = $this->scopeConfig->getValue($this->getDefaultLocalePath(), $this->scopeType);
-+            $locale = false;
-+            if ($this->deploymentConfig->isAvailable() && $this->deploymentConfig->isDbAvailable()) {
-+                $locale = $this->scopeConfig->getValue($this->getDefaultLocalePath(), $this->scopeType);
-+            }
-             if (!$locale) {
-                 $locale = self::DEFAULT_LOCALE;
-             }
-@@ -103,7 +119,7 @@ class Resolver implements ResolverInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setLocale($locale = null)
-     {
-@@ -116,7 +132,7 @@ class Resolver implements ResolverInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getLocale()
-     {
-@@ -127,7 +143,7 @@ class Resolver implements ResolverInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function emulate($scopeId)
-     {
-@@ -147,7 +163,7 @@ class Resolver implements ResolverInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function revert()
-     {
-diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
-index 1141f451c13..69ff02beb8d 100644
---- a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
-+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
-@@ -6,6 +6,9 @@
- 
- namespace Magento\Framework\Locale\Test\Unit;
- 
-+/**
-+ * Tests class for Number locale format
-+ */
- class FormatTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -68,15 +71,17 @@ class FormatTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @param string $localeCode
-+     * @param string $currencyCode
-      * @param array $expectedResult
-      * @dataProvider getPriceFormatDataProvider
-      */
--    public function testGetPriceFormat($localeCode, array $expectedResult): void
-+    public function testGetPriceFormat($localeCode, $currencyCode, array $expectedResult): void
-     {
-         $this->scope->expects($this->once())
-             ->method('getCurrentCurrency')
-             ->willReturn($this->currency);
- 
-+        $this->currency->method('getCode')->willReturn($currencyCode);
-         $result = $this->formatModel->getPriceFormat($localeCode);
-         $intersection = array_intersect_assoc($result, $expectedResult);
-         $this->assertCount(count($expectedResult), $intersection);
-@@ -88,22 +93,27 @@ class FormatTest extends \PHPUnit\Framework\TestCase
-      */
-     public function getPriceFormatDataProvider(): array
-     {
-+        $swissGroupSymbol = INTL_ICU_VERSION >= 59.1 ? '’' : '\'';
-         return [
--            ['en_US', ['decimalSymbol' => '.', 'groupSymbol' => ',']],
--            ['de_DE', ['decimalSymbol' => ',', 'groupSymbol' => '.']],
--            ['de_CH', ['decimalSymbol' => '.', 'groupSymbol' => '\'']],
--            ['uk_UA', ['decimalSymbol' => ',', 'groupSymbol' => ' ']]
-+            ['en_US', 'USD', ['decimalSymbol' => '.', 'groupSymbol' => ',']],
-+            ['de_DE', 'EUR', ['decimalSymbol' => ',', 'groupSymbol' => '.']],
-+            ['de_CH', 'CHF', ['decimalSymbol' => '.', 'groupSymbol' => $swissGroupSymbol]],
-+            ['uk_UA', 'UAH', ['decimalSymbol' => ',', 'groupSymbol' => ' ']]
-         ];
-     }
- 
-     /**
-      *
--     * @param        mixed $value
--     * @param        float $expected
-+     * @param mixed $value
-+     * @param float $expected
-+     * @param string $locale
-      * @dataProvider provideNumbers
-      */
--    public function testGetNumber($value, $expected): void
-+    public function testGetNumber(string $value, float $expected, string $locale = null): void
-     {
-+        if ($locale !== null) {
-+            $this->localeResolver->method('getLocale')->willReturn($locale);
-+        }
-         $this->assertEquals($expected, $this->formatModel->getNumber($value));
-     }
- 
-@@ -124,6 +134,8 @@ class FormatTest extends \PHPUnit\Framework\TestCase
-             ['2 054.52', 2054.52],
-             ['2,46 GB', 2.46],
-             ['2,054.00', 2054],
-+            ['4,000', 4000.0, 'ja_JP'],
-+            ['4,000', 4.0, 'en_US'],
-         ];
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Lock/Backend/Cache.php b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
-new file mode 100644
-index 00000000000..dfe6bbb8283
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock\Backend;
-+
-+use Magento\Framework\Cache\FrontendInterface;
-+
-+/**
-+ * Implementation of the lock manager on the basis of the caching system.
-+ */
-+class Cache implements \Magento\Framework\Lock\LockManagerInterface
-+{
-+    /**
-+     * Prefix for marking that key is locked or not.
-+     */
-+    const LOCK_PREFIX = 'LOCKED_RECORD_INFO_';
-+
-+    /**
-+     * @var FrontendInterface
-+     */
-+    private $cache;
-+
-+    /**
-+     * @param FrontendInterface $cache
-+     */
-+    public function __construct(FrontendInterface $cache)
-+    {
-+        $this->cache = $cache;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function lock(string $name, int $timeout = -1): bool
-+    {
-+        return $this->cache->save('1', $this->getIdentifier($name), [], $timeout);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function unlock(string $name): bool
-+    {
-+        return $this->cache->remove($this->getIdentifier($name));
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function isLocked(string $name): bool
-+    {
-+        return (bool)$this->cache->test($this->getIdentifier($name));
-+    }
-+
-+    /**
-+     * Get cache locked identifier based on cache identifier.
-+     *
-+     * @param string $cacheIdentifier
-+     * @return string
-+     */
-+    private function getIdentifier(string $cacheIdentifier): string
-+    {
-+        return self::LOCK_PREFIX . $cacheIdentifier;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Lock/Backend/Database.php b/lib/internal/Magento/Framework/Lock/Backend/Database.php
-new file mode 100644
-index 00000000000..efdba63e7a0
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Lock/Backend/Database.php
-@@ -0,0 +1,188 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock\Backend;
-+
-+use Magento\Framework\App\DeploymentConfig;
-+use Magento\Framework\App\ResourceConnection;
-+use Magento\Framework\Config\ConfigOptionsListConstants;
-+use Magento\Framework\Exception\AlreadyExistsException;
-+use Magento\Framework\Exception\InputException;
-+use Magento\Framework\Phrase;
-+
-+/**
-+ * Implementation of the lock manager on the basis of MySQL.
-+ */
-+class Database implements \Magento\Framework\Lock\LockManagerInterface
-+{
-+    /**
-+     * @var ResourceConnection
-+     */
-+    private $resource;
-+
-+    /**
-+     * @var DeploymentConfig
-+     */
-+    private $deploymentConfig;
-+
-+    /**
-+     * @var string Lock prefix
-+     */
-+    private $prefix;
-+
-+    /**
-+     * @var string|false Holds current lock name if set, otherwise false
-+     */
-+    private $currentLock = false;
-+
-+    /**
-+     * @param ResourceConnection $resource
-+     * @param DeploymentConfig $deploymentConfig
-+     * @param string|null $prefix
-+     */
-+    public function __construct(
-+        ResourceConnection $resource,
-+        DeploymentConfig $deploymentConfig,
-+        string $prefix = null
-+    ) {
-+        $this->resource = $resource;
-+        $this->deploymentConfig = $deploymentConfig;
-+        $this->prefix = $prefix;
-+    }
-+
-+    /**
-+     * Sets a lock for name
-+     *
-+     * @param string $name lock name
-+     * @param int $timeout How long to wait lock acquisition in seconds, negative value means infinite timeout
-+     * @return bool
-+     * @throws InputException
-+     * @throws AlreadyExistsException
-+     * @throws \Zend_Db_Statement_Exception
-+     */
-+    public function lock(string $name, int $timeout = -1): bool
-+    {
-+        if (!$this->deploymentConfig->isDbAvailable()) {
-+            return true;
-+        };
-+        $name = $this->addPrefix($name);
-+
-+        /**
-+         * Before MySQL 5.7.5, only a single simultaneous lock per connection can be acquired.
-+         * This limitation can be removed once MySQL minimum requirement has been raised,
-+         * currently we support MySQL 5.6 way only.
-+         */
-+        if ($this->currentLock) {
-+            throw new AlreadyExistsException(
-+                new Phrase(
-+                    'Current connection is already holding lock for %1, only single lock allowed',
-+                    [$this->currentLock]
-+                )
-+            );
-+        }
-+
-+        $result = (bool)$this->resource->getConnection()->query(
-+            "SELECT GET_LOCK(?, ?);",
-+            [(string)$name, (int)$timeout]
-+        )->fetchColumn();
-+
-+        if ($result === true) {
-+            $this->currentLock = $name;
-+        }
-+
-+        return $result;
-+    }
-+
-+    /**
-+     * Releases a lock for name
-+     *
-+     * @param string $name lock name
-+     * @return bool
-+     * @throws InputException
-+     * @throws \Zend_Db_Statement_Exception
-+     */
-+    public function unlock(string $name): bool
-+    {
-+        if (!$this->deploymentConfig->isDbAvailable()) {
-+            return true;
-+        };
-+
-+        $name = $this->addPrefix($name);
-+
-+        $result = (bool)$this->resource->getConnection()->query(
-+            "SELECT RELEASE_LOCK(?);",
-+            [(string)$name]
-+        )->fetchColumn();
-+
-+        if ($result === true) {
-+            $this->currentLock = false;
-+        }
-+
-+        return $result;
-+    }
-+
-+    /**
-+     * Tests of lock is set for name
-+     *
-+     * @param string $name lock name
-+     * @return bool
-+     * @throws InputException
-+     * @throws \Zend_Db_Statement_Exception
-+     */
-+    public function isLocked(string $name): bool
-+    {
-+        if (!$this->deploymentConfig->isDbAvailable()) {
-+            return false;
-+        };
-+
-+        $name = $this->addPrefix($name);
-+
-+        return (bool)$this->resource->getConnection()->query(
-+            "SELECT IS_USED_LOCK(?);",
-+            [(string)$name]
-+        )->fetchColumn();
-+    }
-+
-+    /**
-+     * Adds prefix and checks for max length of lock name
-+     *
-+     * Limited to 64 characters in MySQL.
-+     *
-+     * @param string $name
-+     * @return string
-+     * @throws InputException
-+     */
-+    private function addPrefix(string $name): string
-+    {
-+        $name = $this->getPrefix() . '|' . $name;
-+
-+        if (strlen($name) > 64) {
-+            throw new InputException(new Phrase('Lock name too long: %1...', [substr($name, 0, 64)]));
-+        }
-+
-+        return $name;
-+    }
-+
-+    /**
-+     * Get installation specific lock prefix to avoid lock conflicts
-+     *
-+     * @return string lock prefix
-+     */
-+    private function getPrefix(): string
-+    {
-+        if ($this->prefix === null) {
-+            $this->prefix = (string)$this->deploymentConfig->get(
-+                ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT
-+                . '/'
-+                . ConfigOptionsListConstants::KEY_NAME,
-+                ''
-+            );
-+        }
-+
-+        return $this->prefix;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Lock/Backend/FileLock.php b/lib/internal/Magento/Framework/Lock/Backend/FileLock.php
-new file mode 100644
-index 00000000000..d168e910a4a
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Lock/Backend/FileLock.php
-@@ -0,0 +1,194 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock\Backend;
-+
-+use Magento\Framework\Lock\LockManagerInterface;
-+use Magento\Framework\Filesystem\Driver\File as FileDriver;
-+use Magento\Framework\Exception\RuntimeException;
-+use Magento\Framework\Exception\FileSystemException;
-+use Magento\Framework\Phrase;
-+
-+/**
-+ * LockManager using the file system for locks
-+ */
-+class FileLock implements LockManagerInterface
-+{
-+    /**
-+     * The file driver instance
-+     *
-+     * @var FileDriver
-+     */
-+    private $fileDriver;
-+
-+    /**
-+     * The path to the locks storage folder
-+     *
-+     * @var string
-+     */
-+    private $path;
-+
-+    /**
-+     * How many microseconds to wait before re-try to acquire a lock
-+     *
-+     * @var int
-+     */
-+    private $sleepCycle = 100000;
-+
-+    /**
-+     * The mapping list of the path lock with the file resource
-+     *
-+     * @var array
-+     */
-+    private $locks = [];
-+
-+    /**
-+     * @param FileDriver $fileDriver The file driver
-+     * @param string $path The path to the locks storage folder
-+     * @throws RuntimeException Throws RuntimeException if $path is empty
-+     *         or cannot create the directory for locks
-+     */
-+    public function __construct(FileDriver $fileDriver, string $path)
-+    {
-+        if (!$path) {
-+            throw new RuntimeException(new Phrase('The path needs to be a non-empty string.'));
-+        }
-+
-+        $this->fileDriver = $fileDriver;
-+        $this->path = rtrim($path, '/') . '/';
-+
-+        try {
-+            if (!$this->fileDriver->isExists($this->path)) {
-+                $this->fileDriver->createDirectory($this->path);
-+            }
-+        } catch (FileSystemException $exception) {
-+            throw new RuntimeException(
-+                new Phrase('Cannot create the directory for locks: %1', [$this->path]),
-+                $exception
-+            );
-+        }
-+    }
-+
-+    /**
-+     * Acquires a lock by name
-+     *
-+     * @param string $name The lock name
-+     * @param int $timeout Timeout in seconds. A negative timeout value means infinite timeout
-+     * @return bool Returns true if the lock is acquired, otherwise returns false
-+     * @throws RuntimeException Throws RuntimeException if cannot acquires the lock because FS problems
-+     */
-+    public function lock(string $name, int $timeout = -1): bool
-+    {
-+        try {
-+            $lockFile = $this->getLockPath($name);
-+            $fileResource = $this->fileDriver->fileOpen($lockFile, 'w+');
-+            $skipDeadline = $timeout < 0;
-+            $deadline = microtime(true) + $timeout;
-+
-+            while (!$this->tryToLock($fileResource)) {
-+                if (!$skipDeadline && $deadline <= microtime(true)) {
-+                    $this->fileDriver->fileClose($fileResource);
-+                    return false;
-+                }
-+                usleep($this->sleepCycle);
-+            }
-+        } catch (FileSystemException $exception) {
-+            throw new RuntimeException(new Phrase('Cannot acquire a lock.'), $exception);
-+        }
-+
-+        $this->locks[$lockFile] = $fileResource;
-+        return true;
-+    }
-+
-+    /**
-+     * Checks if a lock exists by name
-+     *
-+     * @param string $name The lock name
-+     * @return bool Returns true if the lock exists, otherwise returns false
-+     * @throws RuntimeException Throws RuntimeException if cannot check that the lock exists
-+     */
-+    public function isLocked(string $name): bool
-+    {
-+        $lockFile = $this->getLockPath($name);
-+        $result = false;
-+
-+        try {
-+            if ($this->fileDriver->isExists($lockFile)) {
-+                $fileResource = $this->fileDriver->fileOpen($lockFile, 'w+');
-+                if ($this->tryToLock($fileResource)) {
-+                    $result = false;
-+                } else {
-+                    $result = true;
-+                }
-+                $this->fileDriver->fileClose($fileResource);
-+            }
-+        } catch (FileSystemException $exception) {
-+            throw new RuntimeException(new Phrase('Cannot verify that the lock exists.'), $exception);
-+        }
-+
-+        return $result;
-+    }
-+
-+    /**
-+     * Remove the lock by name
-+     *
-+     * @param string $name The lock name
-+     * @return bool If the lock is removed returns true, otherwise returns false
-+     */
-+    public function unlock(string $name): bool
-+    {
-+        $lockFile = $this->getLockPath($name);
-+
-+        if (isset($this->locks[$lockFile]) && $this->tryToUnlock($this->locks[$lockFile])) {
-+            unset($this->locks[$lockFile]);
-+            return true;
-+        }
-+
-+        return false;
-+    }
-+
-+    /**
-+     * Returns the full path to the lock file by name
-+     *
-+     * @param string $name The lock name
-+     * @return string The path to the lock file
-+     */
-+    private function getLockPath(string $name): string
-+    {
-+        return $this->path . $name;
-+    }
-+
-+    /**
-+     * Tries to lock a file resource
-+     *
-+     * @param resource $resource The file resource
-+     * @return bool If the lock is acquired returns true, otherwise returns false
-+     */
-+    private function tryToLock($resource): bool
-+    {
-+        try {
-+            return $this->fileDriver->fileLock($resource, LOCK_EX | LOCK_NB);
-+        } catch (FileSystemException $exception) {
-+            return false;
-+        }
-+    }
-+
-+    /**
-+     * Tries to unlock a file resource
-+     *
-+     * @param resource $resource The file resource
-+     * @return bool If the lock is removed returns true, otherwise returns false
-+     */
-+    private function tryToUnlock($resource): bool
-+    {
-+        try {
-+            return $this->fileDriver->fileLock($resource, LOCK_UN | LOCK_NB);
-+        } catch (FileSystemException $exception) {
-+            return false;
-+        }
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
-new file mode 100644
-index 00000000000..cbba981ae1b
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
-@@ -0,0 +1,280 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock\Backend;
-+
-+use Magento\Framework\Lock\LockManagerInterface;
-+use Magento\Framework\Exception\RuntimeException;
-+use Magento\Framework\Phrase;
-+
-+/**
-+ * LockManager using the Zookeeper for locks
-+ */
-+class Zookeeper implements LockManagerInterface
-+{
-+    /**
-+     * Zookeeper provider
-+     *
-+     * @var \Zookeeper
-+     */
-+    private $zookeeper;
-+
-+    /**
-+     * The base path to locks in Zookeeper
-+     *
-+     * @var string
-+     */
-+    private $path;
-+
-+    /**
-+     * The name of sequence nodes
-+     *
-+     * @var string
-+     */
-+    private $lockName = 'lock-';
-+
-+    /**
-+     * The host to connect to Zookeeper
-+     *
-+     * @var string
-+     */
-+    private $host;
-+
-+    /**
-+     * How many seconds to wait before timing out on connections
-+     *
-+     * @var int
-+     */
-+    private $connectionTimeout = 2;
-+
-+    /**
-+     * How many microseconds to wait before recheck connections or nodes
-+     *
-+     * @var int
-+     */
-+    private $sleepCycle = 100000;
-+
-+    /**
-+     * The default permissions for Zookeeper nodes
-+     *
-+     * @var array
-+     */
-+    private $acl = [['perms'=>\Zookeeper::PERM_ALL, 'scheme' => 'world', 'id' => 'anyone']];
-+
-+    /**
-+     * The mapping list of the lock name with the full lock path
-+     *
-+     * @var array
-+     */
-+    private $locks = [];
-+
-+    /**
-+     * The default path to storage locks
-+     */
-+    const DEFAULT_PATH = '/magento/locks';
-+
-+    /**
-+     * @param string $host The host to connect to Zookeeper
-+     * @param string $path The base path to locks in Zookeeper
-+     * @throws RuntimeException
-+     */
-+    public function __construct(string $host, string $path = self::DEFAULT_PATH)
-+    {
-+        if (!$path) {
-+            throw new RuntimeException(
-+                new Phrase('The path needs to be a non-empty string.')
-+            );
-+        }
-+
-+        if (!$host) {
-+            throw new RuntimeException(
-+                new Phrase('The host needs to be a non-empty string.')
-+            );
-+        }
-+
-+        $this->host = $host;
-+        $this->path = rtrim($path, '/') . '/';
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * You can see the lock algorithm by the link
-+     * @link https://zookeeper.apache.org/doc/r3.1.2/recipes.html#sc_recipes_Locks
-+     *
-+     * @throws RuntimeException
-+     */
-+    public function lock(string $name, int $timeout = -1): bool
-+    {
-+        $skipDeadline = $timeout < 0;
-+        $lockPath = $this->getFullPathToLock($name);
-+        $deadline = microtime(true) + $timeout;
-+
-+        if (!$this->checkAndCreateParentNode($lockPath)) {
-+            throw new RuntimeException(new Phrase('Failed creating the path %1', [$lockPath]));
-+        }
-+
-+        $lockKey = $this->getProvider()
-+            ->create($lockPath, '1', $this->acl, \Zookeeper::EPHEMERAL | \Zookeeper::SEQUENCE);
-+
-+        if (!$lockKey) {
-+            throw new RuntimeException(new Phrase('Failed creating lock %1', [$lockPath]));
-+        }
-+
-+        while ($this->isAnyLock($lockKey, $this->getIndex($lockKey))) {
-+            if (!$skipDeadline && $deadline <= microtime(true)) {
-+                $this->getProvider()->delete($lockKey);
-+                return false;
-+            }
-+
-+            usleep($this->sleepCycle);
-+        }
-+
-+        $this->locks[$name] = $lockKey;
-+
-+        return true;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * @throws RuntimeException
-+     */
-+    public function unlock(string $name): bool
-+    {
-+        if (!isset($this->locks[$name])) {
-+            return false;
-+        }
-+
-+        return $this->getProvider()->delete($this->locks[$name]);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * @throws RuntimeException
-+     */
-+    public function isLocked(string $name): bool
-+    {
-+        return $this->isAnyLock($this->getFullPathToLock($name));
-+    }
-+
-+    /**
-+     * Gets full path to lock by its name
-+     *
-+     * @param string $name
-+     * @return string
-+     */
-+    private function getFullPathToLock(string $name): string
-+    {
-+        return $this->path . $name . '/' . $this->lockName;
-+    }
-+
-+    /**
-+     * Initiolizes and returns Zookeeper provider
-+     *
-+     * @return \Zookeeper
-+     * @throws RuntimeException
-+     */
-+    private function getProvider(): \Zookeeper
-+    {
-+        if (!$this->zookeeper) {
-+            $this->zookeeper = new \Zookeeper($this->host);
-+        }
-+
-+        $deadline = microtime(true) + $this->connectionTimeout;
-+        while ($this->zookeeper->getState() != \Zookeeper::CONNECTED_STATE) {
-+            if ($deadline <= microtime(true)) {
-+                throw new RuntimeException(new Phrase('Zookeeper connection timed out!'));
-+            }
-+            usleep($this->sleepCycle);
-+        }
-+
-+        return $this->zookeeper;
-+    }
-+
-+    /**
-+     * Checks and creates base path recursively
-+     *
-+     * @param string $path
-+     * @return bool
-+     * @throws RuntimeException
-+     */
-+    private function checkAndCreateParentNode(string $path): bool
-+    {
-+        $path = dirname($path);
-+        if ($this->getProvider()->exists($path)) {
-+            return true;
-+        }
-+
-+        if (!$this->checkAndCreateParentNode($path)) {
-+            return false;
-+        }
-+
-+        if ($this->getProvider()->create($path, '1', $this->acl)) {
-+            return true;
-+        }
-+
-+        return $this->getProvider()->exists($path);
-+    }
-+
-+    /**
-+     * Gets int increment of lock key
-+     *
-+     * @param string $key
-+     * @return int|null
-+     */
-+    private function getIndex(string $key)
-+    {
-+        if (!preg_match('/' . $this->lockName . '([0-9]+)$/', $key, $matches)) {
-+            return null;
-+        }
-+
-+        return intval($matches[1]);
-+    }
-+
-+    /**
-+     * Checks if there is any sequence node under parent of $fullKey.
-+     *
-+     * At first checks that the $fullKey node is present, if not - returns false.
-+     * If $indexKey is non-null and there is a smaller index than $indexKey then returns true,
-+     * otherwise returns false.
-+     *
-+     * @param string $fullKey The full path without any sequence info
-+     * @param int|null $indexKey The index to compare
-+     * @return bool
-+     * @throws RuntimeException
-+     */
-+    private function isAnyLock(string $fullKey, int $indexKey = null): bool
-+    {
-+        $parent = dirname($fullKey);
-+
-+        if (!$this->getProvider()->exists($parent)) {
-+            return false;
-+        }
-+
-+        $children = $this->getProvider()->getChildren($parent);
-+
-+        if (null === $indexKey && !empty($children)) {
-+            return true;
-+        }
-+
-+        foreach ($children as $childKey) {
-+            $childIndex = $this->getIndex($childKey);
-+
-+            if (null === $childIndex) {
-+                continue;
-+            }
-+
-+            if ($childIndex < $indexKey) {
-+                return true;
-+            }
-+        }
-+
-+        return false;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
-new file mode 100644
-index 00000000000..b142085ef65
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
-@@ -0,0 +1,111 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock;
-+
-+use Magento\Framework\Phrase;
-+use Magento\Framework\Exception\RuntimeException;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\App\DeploymentConfig;
-+use Magento\Framework\Lock\Backend\Database as DatabaseLock;
-+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
-+use Magento\Framework\Lock\Backend\Cache as CacheLock;
-+use Magento\Framework\Lock\Backend\FileLock;
-+
-+/**
-+ * The factory to create object that implements LockManagerInterface
-+ */
-+class LockBackendFactory
-+{
-+    /**
-+     * The Object Manager instance
-+     *
-+     * @var ObjectManagerInterface
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * The Application deployment configuration
-+     *
-+     * @var DeploymentConfig
-+     */
-+    private $deploymentConfig;
-+
-+    /**
-+     * DB lock provider name
-+     *
-+     * @const string
-+     */
-+    const LOCK_DB = 'db';
-+
-+    /**
-+     * Zookeeper lock provider name
-+     *
-+     * @const string
-+     */
-+    const LOCK_ZOOKEEPER = 'zookeeper';
-+
-+    /**
-+     * Cache lock provider name
-+     *
-+     * @const string
-+     */
-+    const LOCK_CACHE = 'cache';
-+
-+    /**
-+     * File lock provider name
-+     *
-+     * @const string
-+     */
-+    const LOCK_FILE = 'file';
-+
-+    /**
-+     * The list of lock providers with mapping on classes
-+     *
-+     * @var array
-+     */
-+    private $lockers = [
-+        self::LOCK_DB => DatabaseLock::class,
-+        self::LOCK_ZOOKEEPER => ZookeeperLock::class,
-+        self::LOCK_CACHE => CacheLock::class,
-+        self::LOCK_FILE => FileLock::class,
-+    ];
-+
-+    /**
-+     * @param ObjectManagerInterface $objectManager The Object Manager instance
-+     * @param DeploymentConfig $deploymentConfig The Application deployment configuration
-+     */
-+    public function __construct(
-+        ObjectManagerInterface $objectManager,
-+        DeploymentConfig $deploymentConfig
-+    ) {
-+        $this->objectManager = $objectManager;
-+        $this->deploymentConfig = $deploymentConfig;
-+    }
-+
-+    /**
-+     * Creates an instance of LockManagerInterface using information from deployment config
-+     *
-+     * @return LockManagerInterface
-+     * @throws RuntimeException
-+     */
-+    public function create(): LockManagerInterface
-+    {
-+        $provider = $this->deploymentConfig->get('lock/provider', self::LOCK_DB);
-+        $config = $this->deploymentConfig->get('lock/config', []);
-+
-+        if (!isset($this->lockers[$provider])) {
-+            throw new RuntimeException(new Phrase('Unknown locks provider: %1', [$provider]));
-+        }
-+
-+        if (self::LOCK_ZOOKEEPER === $provider && !extension_loaded(self::LOCK_ZOOKEEPER)) {
-+            throw new RuntimeException(new Phrase('php extension Zookeeper is not installed.'));
-+        }
-+
-+        return $this->objectManager->create($this->lockers[$provider], $config);
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Lock/LockManagerInterface.php b/lib/internal/Magento/Framework/Lock/LockManagerInterface.php
-new file mode 100644
-index 00000000000..76cc8506eb1
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Lock/LockManagerInterface.php
-@@ -0,0 +1,44 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock;
-+
-+/**
-+ * Interface of a lock manager
-+ *
-+ * @api
-+ */
-+interface LockManagerInterface
-+{
-+    /**
-+     * Sets a lock
-+     *
-+     * @param string $name lock name
-+     * @param int $timeout How long to wait lock acquisition in seconds, negative value means infinite timeout
-+     * @return bool
-+     * @api
-+     */
-+    public function lock(string $name, int $timeout = -1): bool;
-+
-+    /**
-+     * Releases a lock
-+     *
-+     * @param string $name lock name
-+     * @return bool
-+     * @api
-+     */
-+    public function unlock(string $name): bool;
-+
-+    /**
-+     * Tests if lock is set
-+     *
-+     * @param string $name lock name
-+     * @return bool
-+     * @api
-+     */
-+    public function isLocked(string $name): bool;
-+}
-diff --git a/lib/internal/Magento/Framework/Lock/Proxy.php b/lib/internal/Magento/Framework/Lock/Proxy.php
-new file mode 100644
-index 00000000000..2718bf6cb34
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Lock/Proxy.php
-@@ -0,0 +1,83 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock;
-+
-+use Magento\Framework\Exception\RuntimeException;
-+
-+/**
-+ * Proxy for LockManagers
-+ */
-+class Proxy implements LockManagerInterface
-+{
-+    /**
-+     * The factory to create LockManagerInterface implementation
-+     *
-+     * @var LockBackendFactory
-+     */
-+    private $factory;
-+
-+    /**
-+     * A LockManagerInterface implementation
-+     *
-+     * @var LockManagerInterface
-+     */
-+    private $locker;
-+
-+    /**
-+     * @param LockBackendFactory $factory The factory to create LockManagerInterface implementation
-+     */
-+    public function __construct(LockBackendFactory $factory)
-+    {
-+        $this->factory = $factory;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * @throws RuntimeException
-+     */
-+    public function isLocked(string $name): bool
-+    {
-+        return $this->getLocker()->isLocked($name);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * @throws RuntimeException
-+     */
-+    public function lock(string $name, int $timeout = -1): bool
-+    {
-+        return $this->getLocker()->lock($name, $timeout);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * @throws RuntimeException
-+     */
-+    public function unlock(string $name): bool
-+    {
-+        return $this->getLocker()->unlock($name);
-+    }
-+
-+    /**
-+     * Gets LockManagerInterface implementation using Factory
-+     *
-+     * @return LockManagerInterface
-+     * @throws RuntimeException
-+     */
-+    private function getLocker(): LockManagerInterface
-+    {
-+        if (!$this->locker) {
-+            $this->locker = $this->factory->create();
-+        }
-+
-+        return $this->locker;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Lock/README.md b/lib/internal/Magento/Framework/Lock/README.md
-new file mode 100644
-index 00000000000..cd5ae425b94
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Lock/README.md
-@@ -0,0 +1,8 @@
-+# Lock library
-+
-+Lock library provides mechanism to acquire Magento system-wide lock. Default implementation is based on MySQL locks, where any locks are automatically released on connection close.
-+
-+The library provides interface *LockManagerInterface* which provides following methods:
-+* *lock* - Acquires a named lock
-+* *unlock* - Releases a named lock
-+* *isLocked* - Tests if a named lock exists
-diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php
-new file mode 100644
-index 00000000000..e2a95030bbd
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php
-@@ -0,0 +1,182 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock\Test\Unit\Backend;
-+
-+use Magento\Framework\App\DeploymentConfig;
-+use Magento\Framework\Lock\Backend\Database;
-+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class DatabaseTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\ResourceConnection
-+     */
-+    private $resource;
-+
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\DB\Adapter\AdapterInterface
-+     */
-+    private $connection;
-+
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject|\Zend_Db_Statement_Interface
-+     */
-+    private $statement;
-+
-+    /**
-+     * @var ObjectManager
-+     */
-+    private $objectManager;
-+
-+    /**
-+     * @var Database
-+     */
-+    private $database;
-+
-+    /**
-+     * @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $deploymentConfig;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+        $this->resource = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->statement = $this->getMockBuilder(\Zend_Db_Statement_Interface::class)
-+            ->disableOriginalConstructor()
-+            ->getMockForAbstractClass();
-+
-+        $this->resource->expects($this->any())
-+            ->method('getConnection')
-+            ->willReturn($this->connection);
-+
-+        $this->connection->expects($this->any())
-+            ->method('query')
-+            ->willReturn($this->statement);
-+
-+        $this->objectManager = new ObjectManager($this);
-+        $this->deploymentConfig = $this->getMockBuilder(DeploymentConfig::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        /** @var Database $database */
-+        $this->database = $this->objectManager->getObject(
-+            Database::class,
-+            [
-+                'resource' => $this->resource,
-+                'deploymentConfig' => $this->deploymentConfig,
-+            ]
-+        );
-+    }
-+
-+    /**
-+     * @throws \Magento\Framework\Exception\AlreadyExistsException
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Zend_Db_Statement_Exception
-+     */
-+    public function testLock()
-+    {
-+        $this->deploymentConfig
-+            ->method('isDbAvailable')
-+            ->with()
-+            ->willReturn(true);
-+        $this->statement->expects($this->once())
-+            ->method('fetchColumn')
-+            ->willReturn(true);
-+
-+        $this->assertTrue($this->database->lock('testLock'));
-+    }
-+
-+    /**
-+     * @throws \Magento\Framework\Exception\AlreadyExistsException
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Zend_Db_Statement_Exception
-+     * @expectedException \Magento\Framework\Exception\InputException
-+     */
-+    public function testlockWithTooLongName()
-+    {
-+        $this->deploymentConfig
-+            ->method('isDbAvailable')
-+            ->with()
-+            ->willReturn(true);
-+        $this->database->lock('BbXbyf9rIY5xuAVdviQJmh76FyoeeVHTDpcjmcImNtgpO4Hnz4xk76ZGEyYALvrQu');
-+    }
-+
-+    /**
-+     * @throws \Magento\Framework\Exception\AlreadyExistsException
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Zend_Db_Statement_Exception
-+     * @expectedException \Magento\Framework\Exception\AlreadyExistsException
-+     */
-+    public function testlockWithAlreadyAcquiredLockInSameSession()
-+    {
-+        $this->deploymentConfig
-+            ->method('isDbAvailable')
-+            ->with()
-+            ->willReturn(true);
-+        $this->statement->expects($this->any())
-+            ->method('fetchColumn')
-+            ->willReturn(true);
-+
-+        $this->database->lock('testLock');
-+        $this->database->lock('differentLock');
-+    }
-+
-+    /**
-+     * @throws \Magento\Framework\Exception\AlreadyExistsException
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Zend_Db_Statement_Exception
-+     */
-+    public function testLockWithUnavailableDeploymentConfig()
-+    {
-+        $this->deploymentConfig
-+            ->expects($this->atLeast(1))
-+            ->method('isDbAvailable')
-+            ->with()
-+            ->willReturn(false);
-+        $this->assertTrue($this->database->lock('testLock'));
-+    }
-+
-+    /**
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Zend_Db_Statement_Exception
-+     */
-+    public function testUnlockWithUnavailableDeploymentConfig()
-+    {
-+        $this->deploymentConfig
-+            ->expects($this->atLeast(1))
-+            ->method('isDbAvailable')
-+            ->with()
-+            ->willReturn(false);
-+        $this->assertTrue($this->database->unlock('testLock'));
-+    }
-+
-+    /**
-+     * @throws \Magento\Framework\Exception\InputException
-+     * @throws \Zend_Db_Statement_Exception
-+     */
-+    public function testIsLockedWithUnavailableDB()
-+    {
-+        $this->deploymentConfig
-+            ->expects($this->atLeast(1))
-+            ->method('isDbAvailable')
-+            ->with()
-+            ->willReturn(false);
-+        $this->assertFalse($this->database->isLocked('testLock'));
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
-new file mode 100644
-index 00000000000..62521b9de30
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
-@@ -0,0 +1,68 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock\Test\Unit\Backend;
-+
-+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperProvider;
-+use PHPUnit\Framework\TestCase;
-+use PHPUnit\Framework\MockObject\MockObject;
-+
-+class ZookeeperTest extends TestCase
-+{
-+    /**
-+     * @var ZookeeperProvider
-+     */
-+    private $zookeeperProvider;
-+
-+    /**
-+     * @var string
-+     */
-+    private $host = 'localhost:123';
-+
-+    /**
-+     * @var string
-+     */
-+    private $path = '/some/path';
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        if (!extension_loaded('zookeeper')) {
-+            $this->markTestSkipped('Test was skipped because php extension Zookeeper is not installed.');
-+        }
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\RuntimeException
-+     * @expectedExceptionMessage The path needs to be a non-empty string.
-+     * @return void
-+     */
-+    public function testConstructionWithPathException()
-+    {
-+        $this->zookeeperProvider = new ZookeeperProvider($this->host, '');
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\RuntimeException
-+     * @expectedExceptionMessage The host needs to be a non-empty string.
-+     * @return void
-+     */
-+    public function testConstructionWithHostException()
-+    {
-+        $this->zookeeperProvider = new ZookeeperProvider('', $this->path);
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testConstructionWithoutException()
-+    {
-+        $this->zookeeperProvider = new ZookeeperProvider($this->host, $this->path);
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
-new file mode 100644
-index 00000000000..ebf2f54f3e0
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
-@@ -0,0 +1,116 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock\Test\Unit;
-+
-+use Magento\Framework\Lock\Backend\Database as DatabaseLock;
-+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
-+use Magento\Framework\Lock\Backend\Cache as CacheLock;
-+use Magento\Framework\Lock\Backend\FileLock;
-+use Magento\Framework\Lock\LockBackendFactory;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\Lock\LockManagerInterface;
-+use Magento\Framework\App\DeploymentConfig;
-+use PHPUnit\Framework\TestCase;
-+use PHPUnit\Framework\MockObject\MockObject;
-+
-+class LockBackendFactoryTest extends TestCase
-+{
-+    /**
-+     * @var ObjectManagerInterface|MockObject
-+     */
-+    private $objectManagerMock;
-+
-+    /**
-+     * @var DeploymentConfig|MockObject
-+     */
-+    private $deploymentConfigMock;
-+
-+    /**
-+     * @var LockBackendFactory
-+     */
-+    private $factory;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
-+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
-+        $this->factory = new LockBackendFactory($this->objectManagerMock, $this->deploymentConfigMock);
-+    }
-+
-+    /**
-+     * @expectedException \Magento\Framework\Exception\RuntimeException
-+     * @expectedExceptionMessage Unknown locks provider: someProvider
-+     */
-+    public function testCreateWithException()
-+    {
-+        $this->deploymentConfigMock->expects($this->exactly(2))
-+            ->method('get')
-+            ->withConsecutive(['lock/provider', LockBackendFactory::LOCK_DB], ['lock/config', []])
-+            ->willReturnOnConsecutiveCalls('someProvider', []);
-+
-+        $this->factory->create();
-+    }
-+
-+    /**
-+     * @param string $lockProvider
-+     * @param string $lockProviderClass
-+     * @param array $config
-+     * @dataProvider createDataProvider
-+     */
-+    public function testCreate(string $lockProvider, string $lockProviderClass, array $config)
-+    {
-+        $lockManagerMock = $this->getMockForAbstractClass(LockManagerInterface::class);
-+        $this->deploymentConfigMock->expects($this->exactly(2))
-+            ->method('get')
-+            ->withConsecutive(['lock/provider', LockBackendFactory::LOCK_DB], ['lock/config', []])
-+            ->willReturnOnConsecutiveCalls($lockProvider, $config);
-+        $this->objectManagerMock->expects($this->once())
-+            ->method('create')
-+            ->with($lockProviderClass, $config)
-+            ->willReturn($lockManagerMock);
-+
-+        $this->assertSame($lockManagerMock, $this->factory->create());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function createDataProvider(): array
-+    {
-+        $data = [
-+            'db' => [
-+                'lockProvider' => LockBackendFactory::LOCK_DB,
-+                'lockProviderClass' => DatabaseLock::class,
-+                'config' => ['prefix' => 'somePrefix'],
-+            ],
-+            'cache' => [
-+                'lockProvider' => LockBackendFactory::LOCK_CACHE,
-+                'lockProviderClass' => CacheLock::class,
-+                'config' => [],
-+            ],
-+            'file' => [
-+                'lockProvider' => LockBackendFactory::LOCK_FILE,
-+                'lockProviderClass' => FileLock::class,
-+                'config' => ['path' => '/my/path'],
-+            ],
-+        ];
-+
-+        if (extension_loaded('zookeeper')) {
-+            $data['zookeeper'] = [
-+                'lockProvider' => LockBackendFactory::LOCK_ZOOKEEPER,
-+                'lockProviderClass' => ZookeeperLock::class,
-+                'config' => ['host' => 'some host'],
-+            ];
-+        }
-+
-+        return $data;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/ProxyTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/ProxyTest.php
-new file mode 100644
-index 00000000000..c71dad701d7
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/ProxyTest.php
-@@ -0,0 +1,106 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Lock\Test\Unit;
-+
-+use PHPUnit\Framework\TestCase;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use Magento\Framework\Lock\Proxy;
-+use Magento\Framework\Lock\LockBackendFactory;
-+use Magento\Framework\Lock\LockManagerInterface;
-+
-+/**
-+ * @inheritdoc
-+ */
-+class ProxyTest extends TestCase
-+{
-+    /**
-+     * @var LockBackendFactory|MockObject
-+     */
-+    private $factoryMock;
-+
-+    /**
-+     * @var LockManagerInterface|MockObject
-+     */
-+    private $lockerMock;
-+
-+    /**
-+     * @var Proxy
-+     */
-+    private $proxy;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->factoryMock = $this->createMock(LockBackendFactory::class);
-+        $this->lockerMock = $this->getMockForAbstractClass(LockManagerInterface::class);
-+        $this->proxy = new Proxy($this->factoryMock);
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testIsLocked()
-+    {
-+        $lockName = 'testLock';
-+        $this->factoryMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($this->lockerMock);
-+        $this->lockerMock->expects($this->exactly(2))
-+            ->method('isLocked')
-+            ->with($lockName)
-+            ->willReturn(true);
-+
-+        $this->assertTrue($this->proxy->isLocked($lockName));
-+
-+        // Call one more time to check that method Factory::create is called one time
-+        $this->assertTrue($this->proxy->isLocked($lockName));
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testLock()
-+    {
-+        $lockName = 'testLock';
-+        $timeout = 123;
-+        $this->factoryMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($this->lockerMock);
-+        $this->lockerMock->expects($this->exactly(2))
-+            ->method('lock')
-+            ->with($lockName, $timeout)
-+            ->willReturn(true);
-+
-+        $this->assertTrue($this->proxy->lock($lockName, $timeout));
-+
-+        // Call one more time to check that method Factory::create is called one time
-+        $this->assertTrue($this->proxy->lock($lockName, $timeout));
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testUnlock()
-+    {
-+        $lockName = 'testLock';
-+        $this->factoryMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($this->lockerMock);
-+        $this->lockerMock->expects($this->exactly(2))
-+            ->method('unlock')
-+            ->with($lockName)
-+            ->willReturn(true);
-+
-+        $this->assertTrue($this->proxy->unlock($lockName));
-+
-+        // Call one more time to check that method Factory::create is called one time
-+        $this->assertTrue($this->proxy->unlock($lockName));
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Logger/Handler/Base.php b/lib/internal/Magento/Framework/Logger/Handler/Base.php
-index 46c707a9254..4c136fd65a5 100644
---- a/lib/internal/Magento/Framework/Logger/Handler/Base.php
-+++ b/lib/internal/Magento/Framework/Logger/Handler/Base.php
-@@ -11,6 +11,9 @@ use Monolog\Formatter\LineFormatter;
- use Monolog\Handler\StreamHandler;
- use Monolog\Logger;
- 
-+/**
-+ * Base stream handler
-+ */
- class Base extends StreamHandler
- {
-     /**
-@@ -32,6 +35,7 @@ class Base extends StreamHandler
-      * @param DriverInterface $filesystem
-      * @param string $filePath
-      * @param string $fileName
-+     * @throws \Exception
-      */
-     public function __construct(
-         DriverInterface $filesystem,
-@@ -51,8 +55,9 @@ class Base extends StreamHandler
-     }
- 
-     /**
--     * @param string $fileName
-+     * Remove dots from file name
-      *
-+     * @param string $fileName
-      * @return string
-      * @throws \InvalidArgumentException
-      */
-@@ -71,11 +76,7 @@ class Base extends StreamHandler
-     }
- 
-     /**
--     * {@inheritDoc}
--     *
--     * @param $record array
--     *
--     * @return void
-+     * @inheritDoc
-      */
-     public function write(array $record)
-     {
-diff --git a/lib/internal/Magento/Framework/Logger/Handler/System.php b/lib/internal/Magento/Framework/Logger/Handler/System.php
-index b30195e9797..c519e320a25 100644
---- a/lib/internal/Magento/Framework/Logger/Handler/System.php
-+++ b/lib/internal/Magento/Framework/Logger/Handler/System.php
-@@ -9,6 +9,9 @@ namespace Magento\Framework\Logger\Handler;
- use Magento\Framework\Filesystem\DriverInterface;
- use Monolog\Logger;
- 
-+/**
-+ * System stream handler
-+ */
- class System extends Base
- {
-     /**
-@@ -43,7 +46,7 @@ class System extends Base
-     /**
-      * Writes formatted record through the handler.
-      *
--     * @param $record array The record metadata
-+     * @param array $record The record metadata
-      * @return void
-      */
-     public function write(array $record)
-diff --git a/lib/internal/Magento/Framework/Mail/Message.php b/lib/internal/Magento/Framework/Mail/Message.php
-index 6f156e42dfd..a9996c0a4f1 100644
---- a/lib/internal/Magento/Framework/Mail/Message.php
-+++ b/lib/internal/Magento/Framework/Mail/Message.php
-@@ -8,6 +8,9 @@ namespace Magento\Framework\Mail;
- use Zend\Mime\Mime;
- use Zend\Mime\Part;
- 
-+/**
-+ * Class Message for email transportation
-+ */
- class Message implements MailMessageInterface
- {
-     /**
-@@ -20,7 +23,7 @@ class Message implements MailMessageInterface
-      *
-      * @var string
-      */
--    private $messageType = self::TYPE_TEXT;
-+    private $messageType = Mime::TYPE_TEXT;
- 
-     /**
-      * Initialize dependencies.
-@@ -34,7 +37,7 @@ class Message implements MailMessageInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @deprecated
-      * @see \Magento\Framework\Mail\Message::setBodyText
-@@ -47,7 +50,7 @@ class Message implements MailMessageInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * @deprecated
-      * @see \Magento\Framework\Mail\Message::setBodyText
-@@ -55,15 +58,15 @@ class Message implements MailMessageInterface
-      */
-     public function setBody($body)
-     {
--        if (is_string($body) && $this->messageType === MailMessageInterface::TYPE_HTML) {
--            $body = self::createHtmlMimeFromString($body);
-+        if (is_string($body)) {
-+            $body = self::createMimeFromString($body, $this->messageType);
-         }
-         $this->zendMessage->setBody($body);
-         return $this;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setSubject($subject)
-     {
-@@ -72,7 +75,7 @@ class Message implements MailMessageInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSubject()
-     {
-@@ -80,7 +83,7 @@ class Message implements MailMessageInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getBody()
-     {
-@@ -88,16 +91,29 @@ class Message implements MailMessageInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-+     *
-+     * @deprecated This function is missing the from name. The
-+     * setFromAddress() function sets both from address and from name.
-+     * @see setFromAddress()
-      */
-     public function setFrom($fromAddress)
-     {
--        $this->zendMessage->setFrom($fromAddress);
-+        $this->setFromAddress($fromAddress, null);
-+        return $this;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function setFromAddress($fromAddress, $fromName = null)
-+    {
-+        $this->zendMessage->setFrom($fromAddress, $fromName);
-         return $this;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function addTo($toAddress)
-     {
-@@ -106,7 +122,7 @@ class Message implements MailMessageInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function addCc($ccAddress)
-     {
-@@ -115,7 +131,7 @@ class Message implements MailMessageInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function addBcc($bccAddress)
-     {
-@@ -124,7 +140,7 @@ class Message implements MailMessageInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setReplyTo($replyToAddress)
-     {
-@@ -133,7 +149,7 @@ class Message implements MailMessageInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getRawMessage()
-     {
-@@ -141,36 +157,37 @@ class Message implements MailMessageInterface
-     }
- 
-     /**
--     * Create HTML mime message from the string.
-+     * Create mime message from the string.
-      *
--     * @param string $htmlBody
-+     * @param string $body
-+     * @param string $messageType
-      * @return \Zend\Mime\Message
-      */
--    private function createHtmlMimeFromString($htmlBody)
-+    private function createMimeFromString($body, $messageType)
-     {
--        $htmlPart = new Part($htmlBody);
--        $htmlPart->setCharset($this->zendMessage->getEncoding());
--        $htmlPart->setType(Mime::TYPE_HTML);
-+        $part = new Part($body);
-+        $part->setCharset($this->zendMessage->getEncoding());
-+        $part->setType($messageType);
-         $mimeMessage = new \Zend\Mime\Message();
--        $mimeMessage->addPart($htmlPart);
-+        $mimeMessage->addPart($part);
-         return $mimeMessage;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBodyHtml($html)
-     {
--        $this->setMessageType(self::TYPE_HTML);
-+        $this->setMessageType(Mime::TYPE_HTML);
-         return $this->setBody($html);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBodyText($text)
-     {
--        $this->setMessageType(self::TYPE_TEXT);
-+        $this->setMessageType(Mime::TYPE_TEXT);
-         return $this->setBody($text);
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
-index a8374be59ff..b9271c0209f 100644
---- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
-+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
-@@ -11,12 +11,16 @@ namespace Magento\Framework\Mail\Template;
- use Magento\Framework\App\TemplateTypesInterface;
- use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\Mail\MessageInterface;
-+use Magento\Framework\Mail\MessageInterfaceFactory;
- use Magento\Framework\Mail\TransportInterfaceFactory;
- use Magento\Framework\ObjectManagerInterface;
- use Magento\Framework\Phrase;
- 
- /**
-+ * TransportBuilder
-+ *
-  * @api
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class TransportBuilder
- {
-@@ -88,25 +92,35 @@ class TransportBuilder
-      */
-     protected $mailTransportFactory;
- 
-+    /**
-+     * @var \Magento\Framework\Mail\MessageInterfaceFactory
-+     */
-+    private $messageFactory;
-+
-     /**
-      * @param FactoryInterface $templateFactory
-      * @param MessageInterface $message
-      * @param SenderResolverInterface $senderResolver
-      * @param ObjectManagerInterface $objectManager
-      * @param TransportInterfaceFactory $mailTransportFactory
-+     * @param MessageInterfaceFactory $messageFactory
-+     *
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
-         FactoryInterface $templateFactory,
-         MessageInterface $message,
-         SenderResolverInterface $senderResolver,
-         ObjectManagerInterface $objectManager,
--        TransportInterfaceFactory $mailTransportFactory
-+        TransportInterfaceFactory $mailTransportFactory,
-+        MessageInterfaceFactory $messageFactory = null
-     ) {
-         $this->templateFactory = $templateFactory;
--        $this->message = $message;
-         $this->objectManager = $objectManager;
-         $this->_senderResolver = $senderResolver;
-         $this->mailTransportFactory = $mailTransportFactory;
-+        $this->messageFactory = $messageFactory ?: $this->objectManager->get(MessageInterfaceFactory::class);
-+        $this->message = $this->messageFactory->create();
-     }
- 
-     /**
-@@ -163,13 +177,31 @@ class TransportBuilder
-     /**
-      * Set mail from address
-      *
-+     * @deprecated This function sets the from address but does not provide
-+     * a way of setting the correct from addresses based on the scope.
-+     * @see setFromByScope()
-+     *
-      * @param string|array $from
-      * @return $this
-+     * @throws \Magento\Framework\Exception\MailException
-      */
-     public function setFrom($from)
-     {
--        $result = $this->_senderResolver->resolve($from);
--        $this->message->setFrom($result['email'], $result['name']);
-+        return $this->setFromByScope($from, null);
-+    }
-+
-+    /**
-+     * Set mail from address by scopeId
-+     *
-+     * @param string|array $from
-+     * @param string|int $scopeId
-+     * @return $this
-+     * @throws \Magento\Framework\Exception\MailException
-+     */
-+    public function setFromByScope($from, $scopeId = null)
-+    {
-+        $result = $this->_senderResolver->resolve($from, $scopeId);
-+        $this->message->setFromAddress($result['email'], $result['name']);
-         return $this;
-     }
- 
-@@ -225,6 +257,7 @@ class TransportBuilder
-      * Get mail transport
-      *
-      * @return \Magento\Framework\Mail\TransportInterface
-+     * @throws LocalizedException
-      */
-     public function getTransport()
-     {
-@@ -242,7 +275,7 @@ class TransportBuilder
-      */
-     protected function reset()
-     {
--        $this->message = $this->objectManager->create(\Magento\Framework\Mail\Message::class);
-+        $this->message = $this->messageFactory->create();
-         $this->templateIdentifier = null;
-         $this->templateVars = null;
-         $this->templateOptions = null;
-diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
-index 785c93824a5..85b1b181d4f 100644
---- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
-+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
-@@ -8,6 +8,13 @@ namespace Magento\Framework\Mail\Template;
- 
- use Magento\Framework\Mail\MessageInterface;
- 
-+/**
-+ * Class TransportBuilderByStore
-+ *
-+ * @deprecated The ability to set From address based on store is now available
-+ * in the \Magento\Framework\Mail\Template\TransportBuilder class
-+ * @see \Magento\Framework\Mail\Template\TransportBuilder::setFromByStore
-+ */
- class TransportBuilderByStore
- {
-     /**
-@@ -47,7 +54,7 @@ class TransportBuilderByStore
-     public function setFromByStore($from, $store)
-     {
-         $result = $this->senderResolver->resolve($from, $store);
--        $this->message->setFrom($result['email'], $result['name']);
-+        $this->message->setFromAddress($result['email'], $result['name']);
- 
-         return $this;
-     }
-diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php
-index 0c33e25e0d9..bea2a9ea91d 100644
---- a/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php
-+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php
-@@ -5,44 +5,40 @@
-  */
- namespace Magento\Framework\Mail\Test\Unit;
- 
-+/**
-+ * test Magento\Framework\Mail\Message
-+ */
- class MessageTest extends \PHPUnit\Framework\TestCase
- {
-     /**
--     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Mail\Message
-+     * @var \Magento\Framework\Mail\Message
-      */
--    protected $_messageMock;
-+    protected $message;
- 
-     protected function setUp()
-     {
--        $this->_messageMock = $this->createPartialMock(
--            \Magento\Framework\Mail\Message::class,
--            ['setBody', 'setMessageType']
--        );
-+        $this->message = new \Magento\Framework\Mail\Message();
-     }
- 
-     public function testSetBodyHtml()
-     {
--        $this->_messageMock->expects($this->once())
--            ->method('setMessageType')
--            ->with('text/html');
-+        $this->message->setBodyHtml('body');
- 
--        $this->_messageMock->expects($this->once())
--            ->method('setBody')
--            ->with('body');
--
--        $this->_messageMock->setBodyHtml('body');
-+        $part = $this->message->getBody()->getParts()[0];
-+        $this->assertEquals('text/html', $part->getType());
-+        $this->assertEquals('8bit', $part->getEncoding());
-+        $this->assertEquals('utf-8', $part->getCharset());
-+        $this->assertEquals('body', $part->getContent());
-     }
- 
-     public function testSetBodyText()
-     {
--        $this->_messageMock->expects($this->once())
--            ->method('setMessageType')
--            ->with('text/plain');
--
--        $this->_messageMock->expects($this->once())
--            ->method('setBody')
--            ->with('body');
-+        $this->message->setBodyText('body');
- 
--        $this->_messageMock->setBodyText('body');
-+        $part = $this->message->getBody()->getParts()[0];
-+        $this->assertEquals('text/plain', $part->getType());
-+        $this->assertEquals('8bit', $part->getEncoding());
-+        $this->assertEquals('utf-8', $part->getCharset());
-+        $this->assertEquals('body', $part->getContent());
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
-index 80df2887a3a..a28dbcd291b 100644
---- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
-+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
-@@ -55,8 +55,8 @@ class TransportBuilderByStoreTest extends \PHPUnit\Framework\TestCase
-             ->with($sender, $store)
-             ->willReturn($sender);
-         $this->messageMock->expects($this->once())
--            ->method('setFrom')
--            ->with('from@example.com', 'name')
-+            ->method('setFromAddress')
-+            ->with($sender['email'], $sender['name'])
-             ->willReturnSelf();
- 
-         $this->model->setFromByStore($sender, $store);
-diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
-index e79d1231043..5e3309af649 100644
---- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
-+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
-@@ -8,7 +8,11 @@ namespace Magento\Framework\Mail\Test\Unit\Template;
- 
- use Magento\Framework\App\TemplateTypesInterface;
- use Magento\Framework\Mail\MessageInterface;
-+use Magento\Framework\Mail\MessageInterfaceFactory;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class TransportBuilderTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -41,6 +45,11 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $senderResolverMock;
- 
-+    /**
-+     * @var \Magento\Framework\Mail\MessageInterfaceFactory| \PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $messageFactoryMock;
-+
-     /**
-      * @var \PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -60,7 +69,12 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
-             \Magento\Framework\Mail\TransportInterfaceFactory::class
-         )->disableOriginalConstructor()
-             ->setMethods(['create'])
--            ->getMock();
-+            ->getMockForAbstractClass();
-+        $this->messageFactoryMock = $this->getMockBuilder(\Magento\Framework\Mail\MessageInterfaceFactory::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['create'])
-+            ->getMockForAbstractClass();
-+        $this->messageFactoryMock->expects($this->atLeastOnce())->method('create')->willReturn($this->messageMock);
-         $this->builder = $objectManagerHelper->getObject(
-             $this->builderClassName,
-             [
-@@ -68,7 +82,8 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
-                 'message' => $this->messageMock,
-                 'objectManager' => $this->objectManagerMock,
-                 'senderResolver' => $this->senderResolverMock,
--                'mailTransportFactory' => $this->mailTransportFactoryMock
-+                'mailTransportFactory' => $this->mailTransportFactoryMock,
-+                'messageFactory' => $this->messageFactoryMock
-             ]
-         );
-     }
-@@ -105,12 +120,12 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
-             ->with($this->equalTo('Email Subject'))
-             ->willReturnSelf();
- 
--        $this->messageMock->expects($this->exactly(intval($messageType == MessageInterface::TYPE_TEXT)))
-+        $this->messageMock->expects($this->exactly((int)($messageType == MessageInterface::TYPE_TEXT)))
-             ->method('setBodyText')
-             ->with($this->equalTo($bodyText))
-             ->willReturnSelf();
- 
--        $this->messageMock->expects($this->exactly(intval($messageType == MessageInterface::TYPE_HTML)))
-+        $this->messageMock->expects($this->exactly((int)($messageType == MessageInterface::TYPE_HTML)))
-             ->method('setBodyHtml')
-             ->with($this->equalTo($bodyText))
-             ->willReturnSelf();
-@@ -122,10 +137,7 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
-             ->with($this->equalTo(['message' => $this->messageMock]))
-             ->willReturn($transport);
- 
--        $this->objectManagerMock->expects($this->at(0))
--            ->method('create')
--            ->with($this->equalTo(\Magento\Framework\Mail\Message::class))
--            ->willReturn($transport);
-+        $this->messageFactoryMock->expects($this->once())->method('create')->willReturn($transport);
- 
-         $this->builder->setTemplateIdentifier('identifier')->setTemplateVars($vars)->setTemplateOptions($options);
-         $this->assertInstanceOf(\Magento\Framework\Mail\TransportInterface::class, $this->builder->getTransport());
-@@ -155,19 +167,20 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @return void
-      */
--    public function testSetFrom()
-+    public function testSetFromByScope()
-     {
-         $sender = ['email' => 'from@example.com', 'name' => 'name'];
-+        $scopeId = 1;
-         $this->senderResolverMock->expects($this->once())
-             ->method('resolve')
--            ->with($sender)
-+            ->with($sender, $scopeId)
-             ->willReturn($sender);
-         $this->messageMock->expects($this->once())
--            ->method('setFrom')
--            ->with('from@example.com', 'name')
-+            ->method('setFromAddress')
-+            ->with($sender['email'], $sender['name'])
-             ->willReturnSelf();
- 
--        $this->builder->setFrom($sender);
-+        $this->builder->setFromByScope($sender, $scopeId);
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/Math/Random.php b/lib/internal/Magento/Framework/Math/Random.php
-index 7cb70c9a822..c2059e1935a 100644
---- a/lib/internal/Magento/Framework/Math/Random.php
-+++ b/lib/internal/Magento/Framework/Math/Random.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Framework\Math;
- 
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Framework\Phrase;
-+
- /**
-  * Random data generator
-  *
-@@ -24,41 +27,24 @@ class Random
-     /**#@-*/
- 
-     /**
--     * Get random string
-+     * Get random string.
-      *
-      * @param int $length
-      * @param null|string $chars
-+     *
-      * @return string
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @throws LocalizedException
-      */
-     public function getRandomString($length, $chars = null)
-     {
-         $str = '';
-         if (null === $chars) {
--            $chars = self::CHARS_LOWERS . self::CHARS_UPPERS . self::CHARS_DIGITS;
-+            $chars = self::CHARS_LOWERS.self::CHARS_UPPERS.self::CHARS_DIGITS;
-         }
- 
--        if (function_exists('openssl_random_pseudo_bytes')) {
--            // use openssl lib if it is installed
--            for ($i = 0, $lc = strlen($chars) - 1; $i < $length; $i++) {
--                $bytes = openssl_random_pseudo_bytes(PHP_INT_SIZE);
--                $hex = bin2hex($bytes); // hex() doubles the length of the string
--                $rand = abs(hexdec($hex) % $lc); // random integer from 0 to $lc
--                $str .= $chars[$rand]; // random character in $chars
--            }
--        } elseif ($fp = @fopen('/dev/urandom', 'rb')) {
--            // attempt to use /dev/urandom if it exists but openssl isn't available
--            for ($i = 0, $lc = strlen($chars) - 1; $i < $length; $i++) {
--                $bytes = @fread($fp, PHP_INT_SIZE);
--                $hex = bin2hex($bytes); // hex() doubles the length of the string
--                $rand = abs(hexdec($hex) % $lc); // random integer from 0 to $lc
--                $str .= $chars[$rand]; // random character in $chars
--            }
--            fclose($fp);
--        } else {
--            throw new \Magento\Framework\Exception\LocalizedException(
--                new \Magento\Framework\Phrase("Please make sure you have 'openssl' extension installed")
--            );
-+        $charsMaxKey = mb_strlen($chars) - 1;
-+        for ($i = 0; $i < $length; $i++) {
-+            $str .= $chars[self::getRandomNumber(0, $charsMaxKey)];
-         }
- 
-         return $str;
-@@ -67,47 +53,33 @@ class Random
-     /**
-      * Return a random number in the specified range
-      *
--     * @param $min [optional]
--     * @param $max [optional]
--     * @return int A random integer value between min (or 0) and max
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @param int $min
-+     * @param int $max
-+     * @return int  A random integer value between min (or 0) and max
-+     * @throws LocalizedException
-      */
-     public static function getRandomNumber($min = 0, $max = null)
-     {
-         if (null === $max) {
-             $max = mt_getrandmax();
-         }
--        $range = $max - $min + 1;
--        $offset = 0;
- 
--        if (function_exists('openssl_random_pseudo_bytes')) {
--            // use openssl lib if it is installed
--            $bytes = openssl_random_pseudo_bytes(PHP_INT_SIZE);
--            $hex = bin2hex($bytes); // hex() doubles the length of the string
--            $offset = abs(hexdec($hex) % $range); // random integer from 0 to $range
--        } elseif ($fp = @fopen('/dev/urandom', 'rb')) {
--            // attempt to use /dev/urandom if it exists but openssl isn't available
--            $bytes = @fread($fp, PHP_INT_SIZE);
--            $hex = bin2hex($bytes); // hex() doubles the length of the string
--            $offset = abs(hexdec($hex) % $range); // random integer from 0 to $range
--            fclose($fp);
--        } else {
--            throw new \Magento\Framework\Exception\LocalizedException(
--                new \Magento\Framework\Phrase("Please make sure you have 'openssl' extension installed")
--            );
-+        if ($max < $min) {
-+            throw new LocalizedException(new Phrase('Invalid range given.'));
-         }
- 
--        return $min + $offset; // random integer from $min to $max
-+        return random_int($min, $max);
-     }
- 
-     /**
--     * Generate a hash from unique ID
-+     * Generate a hash from unique ID.
-      *
-      * @param string $prefix
-      * @return string
-+     * @throws LocalizedException
-      */
-     public function getUniqueHash($prefix = '')
-     {
--        return $prefix . md5(uniqid(microtime() . self::getRandomNumber(), true));
-+        return $prefix . $this->getRandomString(32);
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
-index f31892a938f..d71e196deea 100644
---- a/lib/internal/Magento/Framework/Message/Manager.php
-+++ b/lib/internal/Magento/Framework/Message/Manager.php
-@@ -8,9 +8,12 @@ namespace Magento\Framework\Message;
- use Magento\Framework\Event;
- use Psr\Log\LoggerInterface;
- use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Debug;
- 
- /**
-  * Message manager model
-+ *
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Manager implements ManagerInterface
-@@ -67,7 +70,7 @@ class Manager implements ManagerInterface
-      * @param Event\ManagerInterface $eventManager
-      * @param LoggerInterface $logger
-      * @param string $defaultGroup
--     * @param ExceptionMessageFactoryInterface|null exceptionMessageFactory
-+     * @param ExceptionMessageFactoryInterface|null $exceptionMessageFactory
-      */
-     public function __construct(
-         Session $session,
-@@ -89,7 +92,7 @@ class Manager implements ManagerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDefaultGroup()
-     {
-@@ -110,8 +113,8 @@ class Manager implements ManagerInterface
-     /**
-      * @inheritdoc
-      *
--     * @param string|null $group
-      * @param bool $clear
-+     * @param string|null $group
-      * @return Collection
-      */
-     public function getMessages($clear = false, $group = null)
-@@ -226,7 +229,7 @@ class Manager implements ManagerInterface
-         $items = $this->getMessages(false, $group)->getItems();
- 
-         foreach ($messages as $message) {
--            if ($message instanceof MessageInterface and !in_array($message, $items, false)) {
-+            if ($message instanceof MessageInterface && !in_array($message, $items, false)) {
-                 $this->addMessage($message, $group);
-             }
-         }
-@@ -248,7 +251,12 @@ class Manager implements ManagerInterface
-             'Exception message: %s%sTrace: %s',
-             $exception->getMessage(),
-             "\n",
--            $exception->getTraceAsString()
-+            Debug::trace(
-+                $exception->getTrace(),
-+                true,
-+                true,
-+                (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
-+            )
-         );
- 
-         $this->logger->critical($message);
-@@ -286,7 +294,12 @@ class Manager implements ManagerInterface
-             'Exception message: %s%sTrace: %s',
-             $exception->getMessage(),
-             "\n",
--            $exception->getTraceAsString()
-+            Debug::trace(
-+                $exception->getTrace(),
-+                true,
-+                true,
-+                (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
-+            )
-         );
- 
-         $this->logger->critical($message);
-diff --git a/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
-index cb80bc4beca..fe0a84af3ca 100644
---- a/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
-+++ b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
-@@ -6,11 +6,41 @@
- 
- namespace Magento\Framework\MessageQueue;
- 
-+use Magento\Framework\MessageQueue\PoisonPill\PoisonPillCompareInterface;
-+use Magento\Framework\MessageQueue\PoisonPill\PoisonPillReadInterface;
-+
- /**
-  * Class CallbackInvoker to invoke callbacks for consumer classes
-  */
--class CallbackInvoker
-+class CallbackInvoker implements CallbackInvokerInterface
- {
-+    /**
-+     * @var PoisonPillReadInterface $poisonPillRead
-+     */
-+    private $poisonPillRead;
-+
-+    /**
-+     * @var int $poisonPillVersion
-+     */
-+    private $poisonPillVersion;
-+
-+    /**
-+     * @var PoisonPillCompareInterface
-+     */
-+    private $poisonPillCompare;
-+
-+    /**
-+     * @param PoisonPillReadInterface $poisonPillRead
-+     * @param PoisonPillCompareInterface $poisonPillCompare
-+     */
-+    public function __construct(
-+        PoisonPillReadInterface $poisonPillRead,
-+        PoisonPillCompareInterface $poisonPillCompare
-+    ) {
-+        $this->poisonPillRead = $poisonPillRead;
-+        $this->poisonPillCompare = $poisonPillCompare;
-+    }
-+
-     /**
-      * Run short running process
-      *
-@@ -21,10 +51,17 @@ class CallbackInvoker
-      */
-     public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback)
-     {
-+        $this->poisonPillVersion = $this->poisonPillRead->getLatestVersion();
-         for ($i = $maxNumberOfMessages; $i > 0; $i--) {
-             do {
-                 $message = $queue->dequeue();
-+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             } while ($message === null && (sleep(1) === 0));
-+            if (false === $this->poisonPillCompare->isLatestVersion($this->poisonPillVersion)) {
-+                $queue->reject($message);
-+                // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-+                exit(0);
-+            }
-             $callback($message);
-         }
-     }
-diff --git a/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php b/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php
-new file mode 100644
-index 00000000000..36658f2e4ee
---- /dev/null
-+++ b/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php
-@@ -0,0 +1,24 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\MessageQueue;
-+
-+/**
-+ * Callback invoker interface
-+ */
-+interface CallbackInvokerInterface
-+{
-+    /**
-+     * Run short running process
-+     *
-+     * @param QueueInterface $queue
-+     * @param int $maxNumberOfMessages
-+     * @param \Closure $callback
-+     * @return void
-+     */
-+    public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback);
-+}
-diff --git a/lib/internal/Magento/Framework/MessageQueue/Config.php b/lib/internal/Magento/Framework/MessageQueue/Config.php
-index e29b5d06bee..9a925e1417c 100644
---- a/lib/internal/Magento/Framework/MessageQueue/Config.php
-+++ b/lib/internal/Magento/Framework/MessageQueue/Config.php
-@@ -30,18 +30,16 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getExchangeByTopic($topicName)
-     {
-         $publisherConfig = $this->getPublisherConfigByTopic($topicName);
--        return isset($publisherConfig[ConfigInterface::PUBLISHER_EXCHANGE])
--            ? $publisherConfig[ConfigInterface::PUBLISHER_EXCHANGE]
--            : null;
-+        return $publisherConfig[ConfigInterface::PUBLISHER_EXCHANGE] ?? null;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getQueuesByTopic($topic)
-     {
-@@ -67,7 +65,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConnectionByTopic($topic)
-     {
-@@ -76,13 +74,11 @@ class Config implements ConfigInterface
-         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-             return null;
-         }
--        return isset($publisherConfig[ConfigInterface::PUBLISHER_CONNECTION])
--            ? $publisherConfig[ConfigInterface::PUBLISHER_CONNECTION]
--            : null;
-+        return $publisherConfig[ConfigInterface::PUBLISHER_CONNECTION] ?? null;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConnectionByConsumer($consumer)
-     {
-@@ -98,7 +94,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getMessageSchemaType($topic)
-     {
-@@ -109,7 +105,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConsumerNames()
-     {
-@@ -118,7 +114,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConsumer($name)
-     {
-@@ -127,7 +123,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getBinds()
-     {
-@@ -135,7 +131,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getPublishers()
-     {
-@@ -143,7 +139,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConsumers()
-     {
-@@ -151,7 +147,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getTopic($name)
-     {
-@@ -159,7 +155,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getPublisher($name)
-     {
-@@ -167,7 +163,7 @@ class Config implements ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getResponseQueueName($topicName)
-     {
-diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/CompositeReader.php b/lib/internal/Magento/Framework/MessageQueue/Config/CompositeReader.php
-index 37009617286..86e83d678c0 100644
---- a/lib/internal/Magento/Framework/MessageQueue/Config/CompositeReader.php
-+++ b/lib/internal/Magento/Framework/MessageQueue/Config/CompositeReader.php
-@@ -69,17 +69,12 @@ class CompositeReader implements ReaderInterface
-                 $firstValue = 0;
-                 $secondValue = 0;
-                 if (isset($firstItem['sortOrder'])) {
--                    $firstValue = intval($firstItem['sortOrder']);
-+                    $firstValue = (int)$firstItem['sortOrder'];
-                 }
--
-                 if (isset($secondItem['sortOrder'])) {
--                    $secondValue = intval($secondItem['sortOrder']);
--                }
--
--                if ($firstValue == $secondValue) {
--                    return 0;
-+                    $secondValue = (int)$secondItem['sortOrder'];
-                 }
--                return $firstValue < $secondValue ? -1 : 1;
-+                return $firstValue <=> $secondValue;
-             }
-         );
-         return $readers;
-diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php
-index be375c1ac81..0184f720b3b 100644
---- a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php
-+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php
-@@ -43,7 +43,7 @@ class CompositeConverter implements ConverterInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function convert($source)
-     {
-@@ -68,17 +68,12 @@ class CompositeConverter implements ConverterInterface
-                 $firstValue = 0;
-                 $secondValue = 0;
-                 if (isset($firstItem['sortOrder'])) {
--                    $firstValue = intval($firstItem['sortOrder']);
-+                    $firstValue = (int)$firstItem['sortOrder'];
-                 }
--
-                 if (isset($secondItem['sortOrder'])) {
--                    $secondValue = intval($secondItem['sortOrder']);
--                }
--
--                if ($firstValue == $secondValue) {
--                    return 0;
-+                    $secondValue = (int)$secondItem['sortOrder'];
-                 }
--                return $firstValue < $secondValue ? -1 : 1;
-+                return $firstValue <=> $secondValue;
-             }
-         );
-         return $converters;
-diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer.php b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
-index 9bdacfbc1ff..8f65a2d8c5e 100644
---- a/lib/internal/Magento/Framework/MessageQueue/Consumer.php
-+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
-@@ -38,7 +38,7 @@ class Consumer implements ConsumerInterface
-     private $messageEncoder;
- 
-     /**
--     * @var CallbackInvoker
-+     * @var CallbackInvokerInterface
-      */
-     private $invoker;
- 
-@@ -80,7 +80,7 @@ class Consumer implements ConsumerInterface
-     /**
-      * Initialize dependencies.
-      *
--     * @param CallbackInvoker $invoker
-+     * @param CallbackInvokerInterface $invoker
-      * @param MessageEncoder $messageEncoder
-      * @param ResourceConnection $resource
-      * @param ConsumerConfigurationInterface $configuration
-@@ -89,7 +89,7 @@ class Consumer implements ConsumerInterface
-      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
--        CallbackInvoker $invoker,
-+        CallbackInvokerInterface $invoker,
-         MessageEncoder $messageEncoder,
-         ResourceConnection $resource,
-         ConsumerConfigurationInterface $configuration,
-@@ -103,7 +103,7 @@ class Consumer implements ConsumerInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process($maxNumberOfMessages = null)
-     {
-diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php
-index aa318ba5f19..a75aa1ea8ea 100644
---- a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php
-+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php
-@@ -33,8 +33,6 @@ class Reader implements \Magento\Framework\Config\ReaderInterface
-     public function read($scope = null)
-     {
-         $configData = $this->envConfig->read($scope);
--        return isset($configData[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_CONSUMERS])
--            ? $configData[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_CONSUMERS]
--            : [];
-+        return $configData[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_CONSUMERS] ?? [];
-     }
- }
-diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php b/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php
-index d71a527c9cb..ad0201cf56e 100644
---- a/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php
-+++ b/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php
-@@ -12,6 +12,11 @@ use Magento\Framework\App\ResourceConnection;
-  */
- class MessageProcessor implements MessageProcessorInterface
- {
-+    /**
-+     * Maximum number of transaction retries
-+     */
-+    const MAX_TRANSACTION_RETRIES = 10;
-+
-     /**
-      * @var \Magento\Framework\MessageQueue\MessageStatusProcessor
-      */
-@@ -22,6 +27,11 @@ class MessageProcessor implements MessageProcessorInterface
-      */
-     private $resource;
- 
-+    /**
-+     * @var int
-+     */
-+    private $retryCount = 0;
-+
-     /**
-      * @param MessageStatusProcessor $messageStatusProcessor
-      * @param ResourceConnection $resource
-@@ -53,8 +63,19 @@ class MessageProcessor implements MessageProcessorInterface
-         } catch (ConnectionLostException $e) {
-             $this->resource->getConnection()->rollBack();
-         } catch (\Exception $e) {
-+            $retry = false;
-             $this->resource->getConnection()->rollBack();
--            $this->messageStatusProcessor->rejectMessages($queue, $messages);
-+            if (strpos($e->getMessage(), 'Error while sending QUERY packet') !== false
-+                && $this->retryCount < self::MAX_TRANSACTION_RETRIES
-+            ) {
-+                $retry = true;
-+                $this->retryCount++;
-+                $this->resource->closeConnection();
-+                $this->process($queue, $configuration, $messages, $messagesToAcknowledge, $mergedMessages);
-+            }
-+            if (!$retry) {
-+                $this->messageStatusProcessor->rejectMessages($queue, $messages);
-+            }
-         }
-     }
- 
-diff --git a/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillCompare.php b/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillCompare.php
-new file mode 100644
-index 00000000000..0b85fbb6147
---- /dev/null
-+++ b/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillCompare.php
-@@ -0,0 +1,27 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\MessageQueue\PoisonPill;
-+
-+/**
-+ * Describes how to compare given version of poison pill with latest in DB.
-+ */
-+class PoisonPillCompare implements PoisonPillCompareInterface
-+{
-+    /**
-+     * Stub implementation
-+     *
-+     * @todo Will use cache storage after @MC-15997
-+     *
-+     * @param string $poisonPillVersion
-+     * @return bool
-+     */
-+    public function isLatestVersion(string $poisonPillVersion): bool
-+    {
-+        return true;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillCompareInterface.php b/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillCompareInterface.php
-new file mode 100644
-index 00000000000..acf78f5014e
---- /dev/null
-+++ b/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillCompareInterface.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\MessageQueue\PoisonPill;
-+
-+/**
-+ * Interface describes how to compare given version of poison pill with latest in DB.
-+ */
-+interface PoisonPillCompareInterface
-+{
-+    /**
-+     * Check if version of current poison pill is latest.
-+     *
-+     * @param string $poisonPillVersion
-+     * @return bool
-+     */
-+    public function isLatestVersion(string $poisonPillVersion): bool;
-+}
-diff --git a/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillPut.php b/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillPut.php
-new file mode 100644
-index 00000000000..7e6828633ae
---- /dev/null
-+++ b/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillPut.php
-@@ -0,0 +1,33 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\MessageQueue\PoisonPill;
-+
-+/**
-+ * Command interface describes how to create new version on poison pill.
-+ */
-+class PoisonPillPut implements PoisonPillPutInterface
-+{
-+    /**
-+     * First version of poison pill.
-+     *
-+     * @var string
-+     */
-+    private $firstVersion = '';
-+
-+    /**
-+     * Stub implementation.
-+     *
-+     * @todo Will use cache storage after @MC-15997
-+     *
-+     * @return string
-+     */
-+    public function put(): string
-+    {
-+        return $this->firstVersion;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillPutInterface.php b/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillPutInterface.php
-new file mode 100644
-index 00000000000..dbf300101c4
---- /dev/null
-+++ b/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillPutInterface.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\MessageQueue\PoisonPill;
-+
-+/**
-+ * Command interface describes how to create new version on poison pill.
-+ */
-+interface PoisonPillPutInterface
-+{
-+    /**
-+     * Put new version of poison pill inside DB.
-+     *
-+     * @return string
-+     * @throws \Exception
-+     */
-+    public function put(): string;
-+}
-diff --git a/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillRead.php b/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillRead.php
-new file mode 100644
-index 00000000000..0f0ed5a8074
---- /dev/null
-+++ b/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillRead.php
-@@ -0,0 +1,26 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\MessageQueue\PoisonPill;
-+
-+/**
-+ * Describes how to get latest version of poison pill.
-+ */
-+class PoisonPillRead implements PoisonPillReadInterface
-+{
-+    /**
-+     * Stub implementation.
-+     *
-+     * @todo Will use cache storage after @MC-15997
-+     *
-+     * @return string
-+     */
-+    public function getLatestVersion(): string
-+    {
-+        return '';
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillReadInterface.php b/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillReadInterface.php
-new file mode 100644
-index 00000000000..6748e320861
---- /dev/null
-+++ b/lib/internal/Magento/Framework/MessageQueue/PoisonPill/PoisonPillReadInterface.php
-@@ -0,0 +1,21 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\MessageQueue\PoisonPill;
-+
-+/**
-+ * Describes how to get latest version of poison pill.
-+ */
-+interface PoisonPillReadInterface
-+{
-+    /**
-+     * Returns get latest version of poison pill.
-+     *
-+     * @return string
-+     */
-+    public function getLatestVersion(): string;
-+}
-diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
-index 2e0120ad7ea..448a8a3db74 100644
---- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
-+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
-@@ -10,15 +10,26 @@ class XsdTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @var string
-      */
--    protected $_schemaFile;
-+    private $schemaFile;
- 
-+    /**
-+     * @var string
-+     */
-+    private $schemaQueueFile;
-+
-+    /**
-+     * Set up.
-+     *
-+     * @return void
-+     */
-     protected function setUp()
-     {
-         if (!function_exists('libxml_set_external_entity_loader')) {
-             $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-         }
-         $urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
--        $this->_schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/consumer.xsd');
-+        $this->schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/consumer.xsd');
-+        $this->schemaQueueFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/queue.xsd');
-     }
- 
-     /**
-@@ -29,13 +40,13 @@ class XsdTest extends \PHPUnit\Framework\TestCase
-     public function testExemplarXml($fixtureXml, array $expectedErrors)
-     {
-         $validationState = $this->createMock(\Magento\Framework\Config\ValidationStateInterface::class);
--        $validationState->expects($this->any())
-+        $validationState->expects($this->atLeastOnce())
-             ->method('isValidationRequired')
-             ->willReturn(true);
-         $messageFormat = '%message%';
-         $dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationState, [], null, null, $messageFormat);
-         $actualErrors = [];
--        $actualResult = $dom->validate($this->_schemaFile, $actualErrors);
-+        $actualResult = $dom->validate($this->schemaFile, $actualErrors);
-         $this->assertEquals(empty($expectedErrors), $actualResult, "Validation result is invalid.");
-         $this->assertEquals($expectedErrors, $actualErrors, "Validation errors does not match.");
-     }
-@@ -125,4 +136,106 @@ class XsdTest extends \PHPUnit\Framework\TestCase
-         ];
-         // @codingStandardsIgnoreEnd
-     }
-+
-+    /**
-+     * @param string $fixtureXml
-+     * @param array $expectedErrors
-+     * @dataProvider exemplarQueueXmlDataProvider
-+     */
-+    public function testExemplarQueueXml($fixtureXml, array $expectedErrors)
-+    {
-+        $validationState = $this->createMock(\Magento\Framework\Config\ValidationStateInterface::class);
-+        $validationState->expects($this->atLeastOnce())
-+            ->method('isValidationRequired')
-+            ->willReturn(true);
-+        $messageFormat = '%message%';
-+        $dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationState, [], null, null, $messageFormat);
-+        $actualErrors = [];
-+        $actualResult = $dom->validate($this->schemaQueueFile, $actualErrors);
-+        $this->assertEquals(empty($expectedErrors), $actualResult, "Validation result is invalid.");
-+        $this->assertEquals($expectedErrors, $actualErrors, "Validation errors does not match.");
-+    }
-+
-+    /**
-+     * @return array
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-+    public function exemplarQueueXmlDataProvider()
-+    {
-+        // @codingStandardsIgnoreStart
-+        return [
-+            'valid' => [
-+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
-+                     <broker topic="asd" >
-+                        <queue name="queue1" consumer="consumer1" handler="handlerClassOne1::handlerMethod1" consumerInstance="consumerClass1" maxMessages="5"/>
-+                        <queue name="queue2" consumer="consumer2" handler="handlerClassOne2::handlerMethod2" consumerInstance="consumerClass2" maxMessages="5"/>
-+                    </broker>
-+                </config>',
-+                [],
-+            ],
-+            'invalid handler format' => [
-+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
-+                    <broker topic="asd" >
-+                        <queue name="queue1" consumer="consumer1" handler="handlerClass_One1::handlerMethod1" consumerInstance="consumerClass1" maxMessages="5"/>
-+                        <queue name="queue2" consumer="consumer2" handler="handlerClassOne2::handler_Method2" consumerInstance="consumerClass2" maxMessages="5"/>
-+                    </broker>
-+                </config>',
-+                [
-+                    "Element 'queue', attribute 'handler': [facet 'pattern'] The value 'handlerClass_One1::handlerMethod1' is not accepted by the pattern '[a-zA-Z0-9\\\\]+::[a-zA-Z0-9]+'.",
-+                    "Element 'queue', attribute 'handler': 'handlerClass_One1::handlerMethod1' is not a valid value of the atomic type 'handlerType'.",
-+                    "Element 'queue', attribute 'handler': [facet 'pattern'] The value 'handlerClassOne2::handler_Method2' is not accepted by the pattern '[a-zA-Z0-9\\\\]+::[a-zA-Z0-9]+'.",
-+                    "Element 'queue', attribute 'handler': 'handlerClassOne2::handler_Method2' is not a valid value of the atomic type 'handlerType'.",
-+                ],
-+            ],
-+            'invalid instance format' => [
-+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
-+                     <broker topic="asd" >
-+                        <queue name="queue1" consumer="consumer1" handler="handlerClassOne1::handlerMethod1" consumerInstance="consumer_Class1" maxMessages="5"/>
-+                        <queue name="queue2" consumer="consumer2" handler="handlerClassOne2::handlerMethod2" consumerInstance="consumerClass_2" maxMessages="5"/>
-+                    </broker>
-+                </config>',
-+                [
-+                    "Element 'queue', attribute 'consumerInstance': [facet 'pattern'] The value 'consumer_Class1' is not accepted by the pattern '[a-zA-Z0-9\\\\]+'.",
-+                    "Element 'queue', attribute 'consumerInstance': 'consumer_Class1' is not a valid value of the atomic type 'instanceType'.",
-+                    "Element 'queue', attribute 'consumerInstance': [facet 'pattern'] The value 'consumerClass_2' is not accepted by the pattern '[a-zA-Z0-9\\\\]+'.",
-+                    "Element 'queue', attribute 'consumerInstance': 'consumerClass_2' is not a valid value of the atomic type 'instanceType'.",
-+                ],
-+            ],
-+            'invalid maxMessages format' => [
-+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
-+                    <broker topic="asd" >
-+                        <queue name="queue1" consumer="consumer1" handler="handlerClassOne1::handlerMethod1" consumerInstance="consumerClass1" maxMessages="ABC"/>
-+                        <queue name="queue2" consumer="consumer2" handler="handlerClassOne2::handlerMethod2" consumerInstance="consumerClass2" maxMessages="5"/>
-+                    </broker>
-+                </config>',
-+                [
-+                    "Element 'queue', attribute 'maxMessages': 'ABC' is not a valid value of the atomic type 'xs:integer'.",
-+                ],
-+            ],
-+            'unexpected element' => [
-+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
-+                    <broker topic="asd" >
-+                        <queue name="queue1" consumer="consumer1" handler="handlerClassOne1::handlerMethod1" consumerInstance="consumerClass1" maxMessages="2"/>
-+                        <queue name="queue2" consumer="consumer2" handler="handlerClassOne2::handlerMethod2" consumerInstance="consumerClass2" maxMessages="5"/>
-+                        <unexpected name="queue2"/>
-+                    </broker>
-+                </config>',
-+                [
-+                    "Element 'unexpected': This element is not expected. Expected is ( queue ).",
-+                ],
-+            ],
-+            'unexpected attribute' => [
-+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
-+                    <broker topic="asd" >
-+                        <queue name="queue1" consumer="consumer1" handler="handlerClassOne1::handlerMethod1" consumerInstance="consumerClass1" maxMessages="2"/>
-+                        <queue name="queue2" consumer="consumer2" handler="handlerClassOne2::handlerMethod2" consumerInstance="consumerClass2" maxMessages="5" unexpected="unexpected"/>
-+                    </broker>
-+                </config>',
-+                [
-+                    "Element 'queue', attribute 'unexpected': The attribute 'unexpected' is not allowed.",
-+                ],
-+            ],
-+        ];
-+        // @codingStandardsIgnoreEnd
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php
-index 5eb7cd587aa..7a3eb3b16ba 100644
---- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php
-+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php
-@@ -6,6 +6,8 @@
- 
- namespace Magento\Framework\MessageQueue\Test\Unit;
- 
-+use Magento\Framework\MessageQueue\PoisonPill\PoisonPillCompareInterface;
-+use Magento\Framework\MessageQueue\PoisonPill\PoisonPillReadInterface;
- use Magento\Framework\Phrase;
- 
- /**
-@@ -65,6 +67,16 @@ class ConsumerTest extends \PHPUnit\Framework\TestCase
-      */
-     private $consumer;
- 
-+    /**
-+     * @var PoisonPillReadInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $poisonPillRead;
-+
-+    /**
-+     * @var PoisonPillCompareInterface|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $poisonPillCompare;
-+
-     /**
-      * Set up.
-      *
-@@ -85,8 +97,15 @@ class ConsumerTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()->getMock();
- 
-         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $this->poisonPillCompare = $this->getMockBuilder(PoisonPillCompareInterface::class)
-+            ->disableOriginalConstructor()->getMock();
-+        $this->poisonPillRead = $this->getMockBuilder(PoisonPillReadInterface::class)
-+            ->disableOriginalConstructor()->getMock();
-         //Hard dependency used because CallbackInvoker invokes closure logic defined inside of Customer class.
--        $this->callbackInvoker = new \Magento\Framework\MessageQueue\CallbackInvoker();
-+        $this->callbackInvoker = new \Magento\Framework\MessageQueue\CallbackInvoker(
-+            $this->poisonPillRead,
-+            $this->poisonPillCompare
-+        );
-         $this->consumer = $objectManager->getObject(
-             \Magento\Framework\MessageQueue\Consumer::class,
-             [
-@@ -134,7 +153,8 @@ class ConsumerTest extends \PHPUnit\Framework\TestCase
-         $numberOfMessages = 1;
-         $consumerName = 'consumer.name';
-         $exceptionPhrase = new Phrase('Exception successfully thrown');
--
-+        $this->poisonPillRead->expects($this->atLeastOnce())->method('getLatestVersion')->willReturn('version-1');
-+        $this->poisonPillCompare->expects($this->atLeastOnce())->method('isLatestVersion')->willReturn(true);
-         $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
-             ->disableOriginalConstructor()->getMock();
-         $this->configuration->expects($this->once())->method('getQueue')->willReturn($queue);
-diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php
-index 5e64d737034..73841a2a964 100644
---- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php
-+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php
-@@ -75,7 +75,7 @@ class MessageProcessorTest extends \PHPUnit\Framework\TestCase
-             ->getMockForAbstractClass();
-         $configuration->expects($this->atLeastOnce())->method('getHandlers')->willReturn([]);
-         $this->messageStatusProcessor->expects($this->exactly(2))->method('acknowledgeMessages');
--        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\Api\CustomAttributesDataInterface::class)
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
-         $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
-@@ -116,7 +116,7 @@ class MessageProcessorTest extends \PHPUnit\Framework\TestCase
-         $exception = new \Magento\Framework\MessageQueue\ConnectionLostException(__('Exception Message'));
-         $configuration->expects($this->atLeastOnce())->method('getHandlers')->willThrowException($exception);
-         $this->messageStatusProcessor->expects($this->once())->method('acknowledgeMessages');
--        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\Api\CustomAttributesDataInterface::class)
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
-         $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
-@@ -158,7 +158,7 @@ class MessageProcessorTest extends \PHPUnit\Framework\TestCase
-         $configuration->expects($this->atLeastOnce())->method('getHandlers')->willThrowException($exception);
-         $this->messageStatusProcessor->expects($this->once())->method('acknowledgeMessages');
-         $this->messageStatusProcessor->expects($this->atLeastOnce())->method('rejectMessages');
--        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\Api\CustomAttributesDataInterface::class)
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
-         $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
-diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/queue_base.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/queue_base.xsd
-index 4b326d637f2..bede197ec34 100644
---- a/lib/internal/Magento/Framework/MessageQueue/etc/queue_base.xsd
-+++ b/lib/internal/Magento/Framework/MessageQueue/etc/queue_base.xsd
-@@ -41,7 +41,7 @@
-             </xs:documentation>
-         </xs:annotation>
-         <xs:restriction base="xs:string">
--            <xs:pattern value="[a-zA-Z\\]+" />
-+            <xs:pattern value="[a-zA-Z0-9\\]+" />
-             <xs:minLength value="4" />
-         </xs:restriction>
-     </xs:simpleType>
-@@ -53,7 +53,7 @@
-             </xs:documentation>
-         </xs:annotation>
-         <xs:restriction base="xs:string">
--            <xs:pattern value="[a-zA-Z\\]+::[a-zA-Z]+" />
-+            <xs:pattern value="[a-zA-Z0-9\\]+::[a-zA-Z0-9]+" />
-             <xs:minLength value="5" />
-         </xs:restriction>
-     </xs:simpleType>
-diff --git a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
-index 1cffba2543b..e1f6c792c9c 100644
---- a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
-+++ b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
-@@ -158,7 +158,7 @@ abstract class AbstractExtensibleModel extends AbstractModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomAttributes(array $attributes)
-     {
-@@ -166,7 +166,7 @@ abstract class AbstractExtensibleModel extends AbstractModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setCustomAttribute($attributeCode, $attributeValue)
-     {
-@@ -182,7 +182,7 @@ abstract class AbstractExtensibleModel extends AbstractModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * Added custom attributes support.
-      */
-@@ -200,7 +200,7 @@ abstract class AbstractExtensibleModel extends AbstractModel implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      *
-      * Unset customAttributesChanged flag
-      */
-@@ -359,17 +359,27 @@ abstract class AbstractExtensibleModel extends AbstractModel implements
- 
-     /**
-      * @inheritdoc
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return array_diff(parent::__sleep(), ['extensionAttributesFactory', 'customAttributeFactory']);
-     }
- 
-     /**
-      * @inheritdoc
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
-         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         $this->extensionAttributesFactory = $objectManager->get(ExtensionAttributesFactory::class);
-diff --git a/lib/internal/Magento/Framework/Model/AbstractModel.php b/lib/internal/Magento/Framework/Model/AbstractModel.php
-index d8a7c96c639..f5095dbb6e8 100644
---- a/lib/internal/Magento/Framework/Model/AbstractModel.php
-+++ b/lib/internal/Magento/Framework/Model/AbstractModel.php
-@@ -42,7 +42,7 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
- 
-     /**
-      * Data changes flag (true after setData|unsetData call)
--     * @var $_hasDataChange bool
-+     * @var bool
-      */
-     protected $_hasDataChanges = false;
- 
-@@ -216,10 +216,17 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
-     }
- 
-     /**
-+     * Remove unneeded properties from serialization
-+     *
-      * @return string[]
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $properties = array_keys(get_object_vars($this));
-         $properties = array_diff(
-             $properties,
-@@ -241,9 +248,14 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
-      * Init not serializable fields
-      *
-      * @return void
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         $this->_registry = $objectManager->get(\Magento\Framework\Registry::class);
- 
-@@ -337,8 +349,8 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
-      *
-      * If $key is an array, it will overwrite all the data in the object.
-      *
--     * @param string|array  $key
--     * @param mixed         $value
-+     * @param string|array $key
-+     * @param mixed $value
-      * @return $this
-      */
-     public function setData($key, $value = null)
-@@ -616,6 +628,8 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
-     }
- 
-     /**
-+     * Check if save is allowed
-+     *
-      * @return bool
-      */
-     public function isSaveAllowed()
-@@ -624,6 +638,8 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
-     }
- 
-     /**
-+     * Set flag property _hasDataChanges
-+     *
-      * @param bool $flag
-      * @return void
-      */
-@@ -719,6 +735,7 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
- 
-     /**
-      * Returns validator, which contains all rules to validate this model.
-+     *
-      * Returns FALSE, if no validation rules exist.
-      *
-      * @return \Zend_Validate_Interface|false
-@@ -733,6 +750,7 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
- 
-     /**
-      * Creates validator for the model with all validation rules in it.
-+     *
-      * Returns FALSE, if no validation rules exist.
-      *
-      * @return \Zend_Validate_Interface|bool
-@@ -770,6 +788,7 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
- 
-     /**
-      * Get list of cache tags applied to model object.
-+     *
-      * Return false if cache tags are not supported by model
-      *
-      * @return array|false
-diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
-index 1eaed75bcbf..3c88ee9dc5f 100644
---- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
-+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
-@@ -18,6 +18,7 @@ use Magento\Framework\Phrase;
-  * @SuppressWarnings(PHPMD.NumberOfChildren)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-+ * phpcs:disable Magento2.Classes.AbstractApi
-  * @api
-  */
- abstract class AbstractDb extends AbstractResource
-@@ -156,9 +157,14 @@ abstract class AbstractDb extends AbstractResource
-      * Provide variables to serialize
-      *
-      * @return array
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $properties = array_keys(get_object_vars($this));
-         $properties = array_diff($properties, ['_resources', '_connections']);
-         return $properties;
-@@ -168,9 +174,14 @@ abstract class AbstractDb extends AbstractResource
-      * Restore global dependencies
-      *
-      * @return void
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $this->_resources = \Magento\Framework\App\ObjectManager::getInstance()
-             ->get(\Magento\Framework\App\ResourceConnection::class);
-     }
-@@ -219,8 +230,10 @@ abstract class AbstractDb extends AbstractResource
-     }
- 
-     /**
--     * Set main entity table name and primary key field name
--     * If field name is omitted {table_name}_id will be used
-+     * Main table setter.
-+     *
-+     * Set main entity table name and primary key field name.
-+     * If field name is omitted {table_name}_id will be used.
-      *
-      * @param string $mainTable
-      * @param string|null $idFieldName
-@@ -253,8 +266,10 @@ abstract class AbstractDb extends AbstractResource
-     }
- 
-     /**
-+     * Main table getter.
-+     *
-      * Returns main table name - extracted from "module/table" style and
--     * validated by db adapter
-+     * validated by db adapter.
-      *
-      * @throws LocalizedException
-      * @return string
-@@ -542,8 +557,7 @@ abstract class AbstractDb extends AbstractResource
-     }
- 
-     /**
--     * Check that model data fields that can be saved
--     * has really changed comparing with origData
-+     * Check that model data fields that can be saved has really changed comparing with origData.
-      *
-      * @param \Magento\Framework\Model\AbstractModel $object
-      * @return bool
-@@ -591,7 +605,7 @@ abstract class AbstractDb extends AbstractResource
-         $fields = $this->getUniqueFields();
-         if (!empty($fields)) {
-             if (!is_array($fields)) {
--                $this->_uniqueFields = [['field' => $fields, 'title' => $fields]];
-+                $fields = $this->_uniqueFields = [['field' => $fields, 'title' => $fields]];
-             }
- 
-             $data = new \Magento\Framework\DataObject($this->_prepareDataForSave($object));
-diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
-index b57755ed7ea..bc2187f4749 100644
---- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
-+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
-@@ -45,6 +45,13 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-      */
-     protected $_fieldsToSelect = null;
- 
-+    /**
-+     * Expression fields to select in query.
-+     *
-+     * @var array
-+     */
-+    private $expressionFieldsToSelect = [];
-+
-     /**
-      * Fields initial fields to select like id_field
-      *
-@@ -170,7 +177,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _initSelect()
-     {
-@@ -205,7 +212,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-         $columnsToSelect = [];
-         foreach ($columns as $columnEntry) {
-             list($correlationName, $column, $alias) = $columnEntry;
--            if ($correlationName !== 'main_table') {
-+            if ($correlationName !== 'main_table' || isset($this->expressionFieldsToSelect[$alias])) {
-                 // Add joined fields to select
-                 if ($column instanceof \Zend_Db_Expr) {
-                     $column = $column->__toString();
-@@ -347,6 +354,7 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-         }
- 
-         $this->getSelect()->columns([$alias => $fullExpression]);
-+        $this->expressionFieldsToSelect[$alias] = $fullExpression;
- 
-         return $this;
-     }
-@@ -598,9 +606,14 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-     /**
-      * @inheritdoc
-      * @since 100.0.11
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return array_diff(
-             parent::__sleep(),
-             ['_resource', '_eventManager']
-@@ -610,9 +623,14 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
-     /**
-      * @inheritdoc
-      * @since 100.0.11
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         parent::__wakeup();
-         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         $this->_eventManager = $objectManager->get(\Magento\Framework\Event\ManagerInterface::class);
-diff --git a/lib/internal/Magento/Framework/Module/Manager.php b/lib/internal/Magento/Framework/Module/Manager.php
-index a9a3d2294a9..659ada3c20a 100644
---- a/lib/internal/Magento/Framework/Module/Manager.php
-+++ b/lib/internal/Magento/Framework/Module/Manager.php
-@@ -4,20 +4,17 @@
-  * See COPYING.txt for license details.
-  */
- 
-+declare(strict_types=1);
-+
- /**
-  * Module statuses manager
-  */
- namespace Magento\Framework\Module;
- 
- /**
-- * Module status manager.
-- *
-- * Usage:
-- * ```php
-- *  $manager->isEnabled('Vendor_Module');
-- * ```
-+ * @inheritdoc
-  */
--class Manager
-+class Manager implements ModuleManagerInterface
- {
-     /**
-      * @var Output\ConfigInterface
-@@ -52,12 +49,9 @@ class Manager
-     }
- 
-     /**
--     * Whether a module is enabled in the configuration or not
--     *
--     * @param string $moduleName Fully-qualified module name
--     * @return boolean
-+     * @inheritdoc
-      */
--    public function isEnabled($moduleName)
-+    public function isEnabled(string $moduleName): bool
-     {
-         return $this->moduleList->has($moduleName);
-     }
-diff --git a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
-index bdfb77762b4..72421f793f1 100644
---- a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
-+++ b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
-@@ -126,16 +126,21 @@ class Loader
-      *
-      * @param array $origList
-      * @return array
--     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-+     * @throws \Exception
-      */
--    private function sortBySequence($origList)
-+    private function sortBySequence(array $origList): array
-     {
-         ksort($origList);
-+        $modules = $this->prearrangeModules($origList);
-+
-         $expanded = [];
--        foreach ($origList as $moduleName => $value) {
-+        foreach (array_keys($modules) as $moduleName) {
-+            $sequence = $this->expandSequence($origList, $moduleName);
-+            asort($sequence);
-+
-             $expanded[] = [
-                 'name' => $moduleName,
--                'sequence' => $this->expandSequence($origList, $moduleName),
-+                'sequence' => $sequence,
-             ];
-         }
- 
-@@ -143,7 +148,7 @@ class Loader
-         $total = count($expanded);
-         for ($i = 0; $i < $total - 1; $i++) {
-             for ($j = $i; $j < $total; $j++) {
--                if (in_array($expanded[$j]['name'], $expanded[$i]['sequence'])) {
-+                if (in_array($expanded[$j]['name'], $expanded[$i]['sequence'], true)) {
-                     $temp = $expanded[$i];
-                     $expanded[$i] = $expanded[$j];
-                     $expanded[$j] = $temp;
-@@ -159,6 +164,27 @@ class Loader
-         return $result;
-     }
- 
-+    /**
-+     * Prearrange all modules by putting those from Magento before the others
-+     *
-+     * @param array $modules
-+     * @return array
-+     */
-+    private function prearrangeModules(array $modules): array
-+    {
-+        $breakdown = ['magento' => [], 'others' => []];
-+
-+        foreach ($modules as $moduleName => $moduleDetails) {
-+            if (strpos($moduleName, 'Magento_') !== false) {
-+                $breakdown['magento'][$moduleName] = $moduleDetails;
-+            } else {
-+                $breakdown['others'][$moduleName] = $moduleDetails;
-+            }
-+        }
-+
-+        return array_merge($breakdown['magento'], $breakdown['others']);
-+    }
-+
-     /**
-      * Accumulate information about all transitive "sequence" references
-      *
-diff --git a/lib/internal/Magento/Framework/Module/ModuleManagerInterface.php b/lib/internal/Magento/Framework/Module/ModuleManagerInterface.php
-new file mode 100644
-index 00000000000..decc9120035
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Module/ModuleManagerInterface.php
-@@ -0,0 +1,26 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Framework\Module;
-+
-+/**
-+ * Module status manager
-+ *
-+ * Usage:
-+ * ```php
-+ *  $manager->isEnabled('Vendor_Module');
-+ * ```
-+ */
-+interface ModuleManagerInterface
-+{
-+    /**
-+     * Retrieve whether or not a module is enabled by configuration
-+     *
-+     * @param string $moduleName Fully-qualified module name, e.g. Magento_Config
-+     * @return boolean Whether or not the module is enabled in the configuration
-+     */
-+    public function isEnabled(string $moduleName): bool;
-+}
-diff --git a/lib/internal/Magento/Framework/Module/PackageInfo.php b/lib/internal/Magento/Framework/Module/PackageInfo.php
-index 0dce507ba26..1eeb2bafc96 100644
---- a/lib/internal/Magento/Framework/Module/PackageInfo.php
-+++ b/lib/internal/Magento/Framework/Module/PackageInfo.php
-@@ -8,8 +8,9 @@ namespace Magento\Framework\Module;
- use Magento\Framework\Component\ComponentRegistrar;
- 
- /**
-- * Provide information of dependencies and conflicts in composer.json files, mapping of package name to module name,
-- * and mapping of module name to package version
-+ * Provide information of dependencies and conflicts in composer.json files.
-+ *
-+ * Mapping of package name to module name, and mapping of module name to package version.
-  */
- class PackageInfo
- {
-@@ -176,8 +177,7 @@ class PackageInfo
-     protected function convertPackageNameToModuleName($packageName)
-     {
-         $moduleName = str_replace('magento/module-', '', $packageName);
--        $moduleName = str_replace('-', ' ', $moduleName);
--        $moduleName = str_replace(' ', '', ucwords($moduleName));
-+        $moduleName = str_replace('-', '', ucwords($moduleName, '-'));
- 
-         return 'Magento_' . $moduleName;
-     }
-diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
-index 30b2a370bcb..96f9674704e 100644
---- a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
-+++ b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
-@@ -121,7 +121,7 @@ class DbStatusValidator
-             (array)$allDbVersionErrors,
-             function ($carry, $item) {
-                 if ($item[DbVersionInfo::KEY_CURRENT] === 'none'
--                    || $item[DbVersionInfo::KEY_CURRENT] < $item[DbVersionInfo::KEY_REQUIRED]
-+                    || version_compare($item[DbVersionInfo::KEY_CURRENT], $item[DbVersionInfo::KEY_REQUIRED], '<')
-                 ) {
-                     $carry['version_too_low'][] = $item;
-                 } else {
-diff --git a/lib/internal/Magento/Framework/Module/Setup/Context.php b/lib/internal/Magento/Framework/Module/Setup/Context.php
-index 81b93ac447c..4c6240e4c82 100644
---- a/lib/internal/Magento/Framework/Module/Setup/Context.php
-+++ b/lib/internal/Magento/Framework/Module/Setup/Context.php
-@@ -99,6 +99,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Retrieve event manager
-+     *
-      * @return \Magento\Framework\Event\ManagerInterface
-      */
-     public function getEventManager()
-@@ -107,7 +109,9 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
--     * @return \Psr\Log\LoggerInterface $logger
-+     * Retrieve logger
-+     *
-+     * @return \Psr\Log\LoggerInterface
-      */
-     public function getLogger()
-     {
-@@ -115,6 +119,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Retrieve module list
-+     *
-      * @return \Magento\Framework\Module\ModuleListInterface
-      */
-     public function getModuleList()
-@@ -123,6 +129,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Retrieve modules reader
-+     *
-      * @return \Magento\Framework\Module\Dir\Reader
-      */
-     public function getModulesReader()
-@@ -131,6 +139,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Retrieve resource model
-+     *
-      * @return \Magento\Framework\App\ResourceConnection
-      */
-     public function getResourceModel()
-@@ -139,6 +149,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Retrieve migration factory
-+     *
-      * @return \Magento\Framework\Module\Setup\MigrationFactory
-      */
-     public function getMigrationFactory()
-@@ -147,6 +159,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Retrieve resource
-+     *
-      * @return \Magento\Framework\Module\ResourceInterface
-      */
-     public function getResource()
-@@ -155,6 +169,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Retrieve encryptor
-+     *
-      * @return \Magento\Framework\Encryption\EncryptorInterface
-      */
-     public function getEncryptor()
-@@ -163,6 +179,8 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
-     }
- 
-     /**
-+     * Retrieve filesystem
-+     *
-      * @return \Magento\Framework\Filesystem
-      */
-     public function getFilesystem()
-diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
-index 255f5783dbc..e4cf4c41599 100644
---- a/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
-+++ b/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Framework\Module\Test\Unit;
- 
-+/**
-+ * Manager test
-+ */
- class ManagerTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -13,7 +16,7 @@ class ManagerTest extends \PHPUnit\Framework\TestCase
-     const XML_PATH_OUTPUT_ENABLED = 'custom/is_module_output_enabled';
- 
-     /**
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     private $_model;
- 
-@@ -35,11 +38,15 @@ class ManagerTest extends \PHPUnit\Framework\TestCase
-         $this->_moduleList = $this->getMockForAbstractClass(\Magento\Framework\Module\ModuleListInterface::class);
-         $this->_moduleList->expects($this->any())
-             ->method('getOne')
--            ->will($this->returnValueMap([
--                ['Module_One', ['name' => 'One_Module', 'setup_version' => '1']],
--                ['Module_Two', ['name' => 'Two_Module', 'setup_version' => '2']],
--                ['Module_Three', ['name' => 'Two_Three']],
--            ]));
-+            ->will(
-+                $this->returnValueMap(
-+                    [
-+                        ['Module_One', ['name' => 'One_Module', 'setup_version' => '1']],
-+                        ['Module_Two', ['name' => 'Two_Module', 'setup_version' => '2']],
-+                        ['Module_Three', ['name' => 'Two_Three']],
-+                    ]
-+                )
-+            );
-         $this->_outputConfig = $this->getMockForAbstractClass(\Magento\Framework\Module\Output\ConfigInterface::class);
-         $this->_model = new \Magento\Framework\Module\Manager(
-             $this->_outputConfig,
-@@ -52,16 +59,21 @@ class ManagerTest extends \PHPUnit\Framework\TestCase
- 
-     public function testIsEnabled()
-     {
--        $this->_moduleList->expects($this->exactly(2))->method('has')->will($this->returnValueMap([
--            ['Module_Exists', true],
--            ['Module_NotExists', false],
--        ]));
-+        $this->_moduleList->expects($this->exactly(2))->method('has')->will(
-+            $this->returnValueMap(
-+                [
-+                    ['Module_Exists', true],
-+                    ['Module_NotExists', false],
-+                ]
-+            )
-+        );
-         $this->assertTrue($this->_model->isEnabled('Module_Exists'));
-         $this->assertFalse($this->_model->isEnabled('Module_NotExists'));
-     }
- 
-     public function testIsOutputEnabledReturnsFalseForDisabledModule()
-     {
-+        $this->_moduleList->expects($this->once())->method('has')->with('Disabled_Module')->willReturn(false);
-         $this->_outputConfig->expects($this->any())->method('isSetFlag')->will($this->returnValue(true));
-         $this->assertFalse($this->_model->isOutputEnabled('Disabled_Module'));
-     }
-diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php
-index fe613450fd4..a62bb5fa70f 100644
---- a/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php
-+++ b/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php
-@@ -160,4 +160,55 @@ class LoaderTest extends \PHPUnit\Framework\TestCase
-         ]));
-         $this->loader->load();
-     }
-+
-+    /**
-+     * @throws \Magento\Framework\Exception\LocalizedException
-+     */
-+    public function testLoadPrearranged(): void
-+    {
-+        $fixtures = [
-+            'Foo_Bar' => ['name' => 'Foo_Bar', 'sequence' => ['Magento_Store']],
-+            'Magento_Directory' => ['name' => 'Magento_Directory', 'sequence' => ['Magento_Store']],
-+            'Magento_Store' => ['name' => 'Magento_Store', 'sequence' => []],
-+            'Magento_Theme' => ['name' => 'Magento_Theme', 'sequence' => ['Magento_Store', 'Magento_Directory']],
-+            'Test_HelloWorld' => ['name' => 'Test_HelloWorld', 'sequence' => ['Magento_Theme']]
-+        ];
-+
-+        $index = 0;
-+        foreach ($fixtures as $name => $fixture) {
-+            $this->converter->expects($this->at($index++))->method('convert')->willReturn([$name => $fixture]);
-+        }
-+
-+        $this->registry->expects($this->once())
-+            ->method('getPaths')
-+            ->willReturn([
-+                '/path/to/Foo_Bar',
-+                '/path/to/Magento_Directory',
-+                '/path/to/Magento_Store',
-+                '/path/to/Magento_Theme',
-+                '/path/to/Test_HelloWorld'
-+            ]);
-+
-+        $this->driver->expects($this->exactly(5))
-+            ->method('fileGetContents')
-+            ->will($this->returnValueMap([
-+                ['/path/to/Foo_Bar/etc/module.xml', null, null, self::$sampleXml],
-+                ['/path/to/Magento_Directory/etc/module.xml', null, null, self::$sampleXml],
-+                ['/path/to/Magento_Store/etc/module.xml', null, null, self::$sampleXml],
-+                ['/path/to/Magento_Theme/etc/module.xml', null, null, self::$sampleXml],
-+                ['/path/to/Test_HelloWorld/etc/module.xml', null, null, self::$sampleXml],
-+            ]));
-+
-+        // Load the full module list information
-+        $result = $this->loader->load();
-+
-+        $this->assertSame(
-+            ['Magento_Store', 'Magento_Directory', 'Magento_Theme', 'Foo_Bar', 'Test_HelloWorld'],
-+            array_keys($result)
-+        );
-+
-+        foreach ($fixtures as $name => $fixture) {
-+            $this->assertSame($fixture, $result[$name]);
-+        }
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php
-index 72a9ba7df0e..7a631eed1ad 100644
---- a/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php
-+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php
-@@ -9,6 +9,9 @@ use \Magento\Framework\Module\Plugin\DbStatusValidator;
- 
- use Magento\Framework\Module\DbVersionInfo;
- 
-+/**
-+ * DbStatus validator test.
-+ */
- class DbStatusValidatorTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -32,7 +35,7 @@ class DbStatusValidatorTest extends \PHPUnit\Framework\TestCase
-     protected $requestMock;
- 
-     /**
--     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
-+     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $moduleManager;
- 
-diff --git a/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php b/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php
-index a83e9507bda..d67c3802075 100644
---- a/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php
-+++ b/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php
-@@ -55,10 +55,17 @@ class Proxy extends \Magento\Framework\Mview\Config\Data implements
-     }
- 
-     /**
-+     * Remove links to objects.
-+     *
-      * @return array
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return ['subject', 'isShared'];
-     }
- 
-@@ -66,9 +73,14 @@ class Proxy extends \Magento\Framework\Mview\Config\Data implements
-      * Retrieve ObjectManager from global scope
-      *
-      * @return void
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $this->objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-     }
- 
-@@ -100,7 +112,7 @@ class Proxy extends \Magento\Framework\Mview\Config\Data implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function merge(array $config)
-     {
-@@ -108,7 +120,7 @@ class Proxy extends \Magento\Framework\Mview\Config\Data implements
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function get($path = null, $default = null)
-     {
-diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php
-index b16b7c87e87..2d585fe33ab 100644
---- a/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php
-+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php
-@@ -6,6 +6,11 @@
- 
- namespace Magento\Framework\Mview\Test\Unit\View;
- 
-+/**
-+ * Test Coverage for Changelog View.
-+ *
-+ * @see \Magento\Framework\Mview\View\Changelog
-+ */
- class ChangelogTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -45,7 +50,7 @@ class ChangelogTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @expectedException \Exception
-+     * @expectedException \Magento\Framework\DB\Adapter\ConnectionException
-      * @expectedExceptionMessage The write connection to the database isn't available. Please try again later.
-      */
-     public function testCheckConnectionException()
-@@ -74,7 +79,7 @@ class ChangelogTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @expectedException \Exception
-+     * @expectedException \DomainException
-      * @expectedExceptionMessage View's identifier is not set
-      */
-     public function testGetNameWithException()
-@@ -101,6 +106,10 @@ class ChangelogTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals(10, $this->model->getVersion());
-     }
- 
-+    /**
-+     * @expectedException \Magento\Framework\Exception\RuntimeException
-+     * @expectedExceptionMessage Table status for viewIdtest_cl is incorrect. Can`t fetch version id.
-+     */
-     public function testGetVersionWithExceptionNoAutoincrement()
-     {
-         $changelogTableName = 'viewIdtest_cl';
-@@ -111,8 +120,6 @@ class ChangelogTest extends \PHPUnit\Framework\TestCase
-             ->method('fetchRow')
-             ->will($this->returnValue([]));
- 
--        $this->expectException('Exception');
--        $this->expectExceptionMessage("Table status for `{$changelogTableName}` is incorrect. Can`t fetch version id.");
-         $this->model->setViewId('viewIdtest');
-         $this->model->getVersion();
-     }
-@@ -215,10 +222,10 @@ class ChangelogTest extends \PHPUnit\Framework\TestCase
-         $this->connectionMock->expects($this->once())
-             ->method('fetchCol')
-             ->with($selectMock)
--            ->will($this->returnValue(['some_data']));
-+            ->will($this->returnValue([1]));
- 
-         $this->model->setViewId('viewIdtest');
--        $this->assertEquals(['some_data'], $this->model->getList(1, 2));
-+        $this->assertEquals([1], $this->model->getList(1, 2));
-     }
- 
-     public function testGetListWithException()
-diff --git a/lib/internal/Magento/Framework/Mview/View.php b/lib/internal/Magento/Framework/Mview/View.php
-index a937c62dfc2..fa1bfa0d38c 100644
---- a/lib/internal/Magento/Framework/Mview/View.php
-+++ b/lib/internal/Magento/Framework/Mview/View.php
-@@ -6,13 +6,19 @@
- 
- namespace Magento\Framework\Mview;
- 
-+use InvalidArgumentException;
-+use Magento\Framework\DataObject;
- use Magento\Framework\Mview\View\ChangelogTableNotExistsException;
- use Magento\Framework\Mview\View\SubscriptionFactory;
-+use Exception;
-+use Magento\Framework\Mview\View\SubscriptionInterface;
- 
- /**
-+ * Mview
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
--class View extends \Magento\Framework\DataObject implements ViewInterface
-+class View extends DataObject implements ViewInterface
- {
-     /**
-      * Default batch size for partial reindex
-@@ -50,7 +56,7 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-     protected $subscriptionFactory;
- 
-     /**
--     * @var \Magento\Framework\Mview\View\StateInterface
-+     * @var View\StateInterface
-      */
-     protected $state;
- 
-@@ -111,7 +117,7 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-     /**
-      * Id field name setter
-      *
--     * @param  string $name
-+     * @param string $name
-      * @return $this
-      */
-     public function setIdFieldName($name)
-@@ -165,13 +171,13 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-      *
-      * @param string $viewId
-      * @return ViewInterface
--     * @throws \InvalidArgumentException
-+     * @throws InvalidArgumentException
-      */
-     public function load($viewId)
-     {
-         $view = $this->config->getView($viewId);
--        if (empty($view) || empty($view['view_id']) || $view['view_id'] != $viewId) {
--            throw new \InvalidArgumentException("{$viewId} view does not exist.");
-+        if (empty($view) || empty($view['view_id']) || $view['view_id'] !== $viewId) {
-+            throw new InvalidArgumentException("{$viewId} view does not exist.");
-         }
- 
-         $this->setId($viewId);
-@@ -183,37 +189,21 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-     /**
-      * Create subscriptions
-      *
--     * @throws \Exception
-      * @return ViewInterface
-+     * @throws Exception
-      */
-     public function subscribe()
-     {
--        if ($this->getState()->getMode() != View\StateInterface::MODE_ENABLED) {
--            try {
--                // Create changelog table
--                $this->getChangelog()->create();
--
--                // Create subscriptions
--                foreach ($this->getSubscriptions() as $subscriptionConfig) {
--                    /** @var \Magento\Framework\Mview\View\SubscriptionInterface $subscription */
--                    $subscriptionInstance = $this->subscriptionFactory->create(
--                        [
--                            'view' => $this,
--                            'tableName' => $subscriptionConfig['name'],
--                            'columnName' => $subscriptionConfig['column'],
--                            'subscriptionModel' => !empty($subscriptionConfig['subscription_model'])
--                                ? $subscriptionConfig['subscription_model']
--                                : SubscriptionFactory::INSTANCE_NAME,
--                        ]
--                    );
--                    $subscriptionInstance->create();
--                }
-+        if ($this->getState()->getMode() !== View\StateInterface::MODE_ENABLED) {
-+            // Create changelog table
-+            $this->getChangelog()->create();
- 
--                // Update view state
--                $this->getState()->setMode(View\StateInterface::MODE_ENABLED)->save();
--            } catch (\Exception $e) {
--                throw $e;
-+            foreach ($this->getSubscriptions() as $subscriptionConfig) {
-+                $this->initSubscriptionInstance($subscriptionConfig)->create();
-             }
-+
-+            // Update view state
-+            $this->getState()->setMode(View\StateInterface::MODE_ENABLED)->save();
-         }
- 
-         return $this;
-@@ -222,34 +212,19 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-     /**
-      * Remove subscriptions
-      *
--     * @throws \Exception
-      * @return ViewInterface
-+     * @throws Exception
-      */
-     public function unsubscribe()
-     {
-         if ($this->getState()->getMode() != View\StateInterface::MODE_DISABLED) {
--            try {
--                // Remove subscriptions
--                foreach ($this->getSubscriptions() as $subscriptionConfig) {
--                    /** @var \Magento\Framework\Mview\View\SubscriptionInterface $subscription */
--                    $subscriptionInstance = $this->subscriptionFactory->create(
--                        [
--                            'view' => $this,
--                            'tableName' => $subscriptionConfig['name'],
--                            'columnName' => $subscriptionConfig['column'],
--                            'subscriptionModel' => !empty($subscriptionConfig['subscriptionModel'])
--                                ? $subscriptionConfig['subscriptionModel']
--                                : SubscriptionFactory::INSTANCE_NAME,
--                        ]
--                    );
--                    $subscriptionInstance->remove();
--                }
--
--                // Update view state
--                $this->getState()->setMode(View\StateInterface::MODE_DISABLED)->save();
--            } catch (\Exception $e) {
--                throw $e;
-+            // Remove subscriptions
-+            foreach ($this->getSubscriptions() as $subscriptionConfig) {
-+                $this->initSubscriptionInstance($subscriptionConfig)->remove();
-             }
-+
-+            // Update view state
-+            $this->getState()->setMode(View\StateInterface::MODE_DISABLED)->save();
-         }
- 
-         return $this;
-@@ -259,53 +234,56 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-      * Materialize view by IDs in changelog
-      *
-      * @return void
--     * @throws \Exception
-+     * @throws Exception
-      */
-     public function update()
-     {
--        if ($this->getState()->getStatus() == View\StateInterface::STATUS_IDLE) {
--            try {
--                $currentVersionId = $this->getChangelog()->getVersion();
--            } catch (ChangelogTableNotExistsException $e) {
--                return;
--            }
--            $lastVersionId = (int) $this->getState()->getVersionId();
--            $action = $this->actionFactory->get($this->getActionClass());
--
--            try {
--                $this->getState()->setStatus(View\StateInterface::STATUS_WORKING)->save();
--
--                $versionBatchSize = self::$maxVersionQueryBatch;
--                $batchSize = isset($this->changelogBatchSize[$this->getChangelog()->getViewId()])
--                    ? $this->changelogBatchSize[$this->getChangelog()->getViewId()]
--                    : self::DEFAULT_BATCH_SIZE;
--
--                for ($vsFrom = $lastVersionId; $vsFrom < $currentVersionId; $vsFrom += $versionBatchSize) {
--                    // Don't go past the current version for atomicy.
--                    $versionTo = min($currentVersionId, $vsFrom + $versionBatchSize);
--                    $ids = $this->getChangelog()->getList($vsFrom, $versionTo);
--
--                    // We run the actual indexer in batches.
--                    // Chunked AFTER loading to avoid duplicates in separate chunks.
--                    $chunks = array_chunk($ids, $batchSize);
--                    foreach ($chunks as $ids) {
--                        $action->execute($ids);
--                    }
--                }
-+        if ($this->getState()->getStatus() !== View\StateInterface::STATUS_IDLE) {
-+            return;
-+        }
-+
-+        try {
-+            $currentVersionId = $this->getChangelog()->getVersion();
-+        } catch (ChangelogTableNotExistsException $e) {
-+            return;
-+        }
-+
-+        $lastVersionId = (int)$this->getState()->getVersionId();
-+        $action = $this->actionFactory->get($this->getActionClass());
- 
--                $this->getState()->loadByView($this->getId());
--                $statusToRestore = $this->getState()->getStatus() == View\StateInterface::STATUS_SUSPENDED
--                    ? View\StateInterface::STATUS_SUSPENDED
--                    : View\StateInterface::STATUS_IDLE;
--                $this->getState()->setVersionId($currentVersionId)->setStatus($statusToRestore)->save();
--            } catch (\Exception $exception) {
--                $this->getState()->loadByView($this->getId());
--                $statusToRestore = $this->getState()->getStatus() == View\StateInterface::STATUS_SUSPENDED
--                    ? View\StateInterface::STATUS_SUSPENDED
--                    : View\StateInterface::STATUS_IDLE;
--                $this->getState()->setStatus($statusToRestore)->save();
--                throw $exception;
-+        try {
-+            $this->getState()->setStatus(View\StateInterface::STATUS_WORKING)->save();
-+
-+            $versionBatchSize = self::$maxVersionQueryBatch;
-+            $batchSize = isset($this->changelogBatchSize[$this->getChangelog()->getViewId()])
-+                ? $this->changelogBatchSize[$this->getChangelog()->getViewId()]
-+                : self::DEFAULT_BATCH_SIZE;
-+
-+            for ($vsFrom = $lastVersionId; $vsFrom < $currentVersionId; $vsFrom += $versionBatchSize) {
-+                // Don't go past the current version for atomicy.
-+                $versionTo = min($currentVersionId, $vsFrom + $versionBatchSize);
-+                $ids = $this->getChangelog()->getList($vsFrom, $versionTo);
-+
-+                // We run the actual indexer in batches.
-+                // Chunked AFTER loading to avoid duplicates in separate chunks.
-+                $chunks = array_chunk($ids, $batchSize);
-+                foreach ($chunks as $ids) {
-+                    $action->execute($ids);
-+                }
-             }
-+
-+            $this->getState()->loadByView($this->getId());
-+            $statusToRestore = $this->getState()->getStatus() === View\StateInterface::STATUS_SUSPENDED
-+                ? View\StateInterface::STATUS_SUSPENDED
-+                : View\StateInterface::STATUS_IDLE;
-+            $this->getState()->setVersionId($currentVersionId)->setStatus($statusToRestore)->save();
-+        } catch (Exception $exception) {
-+            $this->getState()->loadByView($this->getId());
-+            $statusToRestore = $this->getState()->getStatus() === View\StateInterface::STATUS_SUSPENDED
-+                ? View\StateInterface::STATUS_SUSPENDED
-+                : View\StateInterface::STATUS_IDLE;
-+            $this->getState()->setStatus($statusToRestore)->save();
-+            throw $exception;
-         }
-     }
- 
-@@ -313,10 +291,11 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-      * Suspend view updates and set version ID to changelog's end
-      *
-      * @return void
-+     * @throws Exception
-      */
-     public function suspend()
-     {
--        if ($this->getState()->getMode() == View\StateInterface::MODE_ENABLED) {
-+        if ($this->getState()->getMode() === View\StateInterface::MODE_ENABLED) {
-             $state = $this->getState();
-             $state->setVersionId($this->getChangelog()->getVersion());
-             $state->setStatus(View\StateInterface::STATUS_SUSPENDED);
-@@ -328,11 +307,12 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-      * Resume view updates
-      *
-      * @return void
-+     * @throws Exception
-      */
-     public function resume()
-     {
-         $state = $this->getState();
--        if ($state->getStatus() == View\StateInterface::STATUS_SUSPENDED) {
-+        if ($state->getStatus() === View\StateInterface::STATUS_SUSPENDED) {
-             $state->setStatus(View\StateInterface::STATUS_IDLE);
-             $state->save();
-         }
-@@ -345,7 +325,7 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-      */
-     public function clearChangelog()
-     {
--        if ($this->getState()->getMode() == View\StateInterface::MODE_ENABLED) {
-+        if ($this->getState()->getMode() === View\StateInterface::MODE_ENABLED) {
-             $this->getChangelog()->clear($this->getState()->getVersionId());
-         }
-     }
-@@ -382,7 +362,7 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-      */
-     public function isEnabled()
-     {
--        return $this->getState()->getMode() == View\StateInterface::MODE_ENABLED;
-+        return $this->getState()->getMode() === View\StateInterface::MODE_ENABLED;
-     }
- 
-     /**
-@@ -392,7 +372,7 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-      */
-     public function isIdle()
-     {
--        return $this->getState()->getStatus() == \Magento\Framework\Mview\View\StateInterface::STATUS_IDLE;
-+        return $this->getState()->getStatus() === View\StateInterface::STATUS_IDLE;
-     }
- 
-     /**
-@@ -402,7 +382,7 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-      */
-     public function isWorking()
-     {
--        return $this->getState()->getStatus() == \Magento\Framework\Mview\View\StateInterface::STATUS_WORKING;
-+        return $this->getState()->getStatus() === View\StateInterface::STATUS_WORKING;
-     }
- 
-     /**
-@@ -412,7 +392,7 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-      */
-     public function isSuspended()
-     {
--        return $this->getState()->getStatus() == \Magento\Framework\Mview\View\StateInterface::STATUS_SUSPENDED;
-+        return $this->getState()->getStatus() === View\StateInterface::STATUS_SUSPENDED;
-     }
- 
-     /**
-@@ -437,4 +417,24 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
-         }
-         return $this->changelog;
-     }
-+
-+    /**
-+     * Initializes Subscription instance
-+     *
-+     * @param array $subscriptionConfig
-+     * @return SubscriptionInterface
-+     */
-+    private function initSubscriptionInstance(array $subscriptionConfig): SubscriptionInterface
-+    {
-+        return $this->subscriptionFactory->create(
-+            [
-+                'view' => $this,
-+                'tableName' => $subscriptionConfig['name'],
-+                'columnName' => $subscriptionConfig['column'],
-+                'subscriptionModel' => !empty($subscriptionConfig['subscription_model'])
-+                    ? $subscriptionConfig['subscription_model']
-+                    : SubscriptionFactory::INSTANCE_NAME,
-+            ]
-+        );
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Mview/View/Changelog.php b/lib/internal/Magento/Framework/Mview/View/Changelog.php
-index 4fb06ce3f06..d51f5b13f01 100644
---- a/lib/internal/Magento/Framework/Mview/View/Changelog.php
-+++ b/lib/internal/Magento/Framework/Mview/View/Changelog.php
-@@ -6,8 +6,13 @@
- 
- namespace Magento\Framework\Mview\View;
- 
-+use Magento\Framework\DB\Adapter\ConnectionException;
-+use Magento\Framework\Exception\RuntimeException;
- use Magento\Framework\Phrase;
- 
-+/**
-+ * Class Changelog for manipulations with the mview_state table.
-+ */
- class Changelog implements ChangelogInterface
- {
-     /**
-@@ -41,6 +46,7 @@ class Changelog implements ChangelogInterface
- 
-     /**
-      * @param \Magento\Framework\App\ResourceConnection $resource
-+     * @throws ConnectionException
-      */
-     public function __construct(\Magento\Framework\App\ResourceConnection $resource)
-     {
-@@ -53,12 +59,14 @@ class Changelog implements ChangelogInterface
-      * Check DB connection
-      *
-      * @return void
--     * @throws \Exception
-+     * @throws ConnectionException
-      */
-     protected function checkConnection()
-     {
-         if (!$this->connection) {
--            throw new \Exception("The write connection to the database isn't available. Please try again later.");
-+            throw new ConnectionException(
-+                new Phrase("The write connection to the database isn't available. Please try again later.")
-+            );
-         }
-     }
- 
-@@ -154,14 +162,15 @@ class Changelog implements ChangelogInterface
-             (int)$toVersionId
-         );
- 
--        return $this->connection->fetchCol($select);
-+        return array_map('intval', $this->connection->fetchCol($select));
-     }
- 
-     /**
-      * Get maximum version_id from changelog
-+     *
-      * @return int
-      * @throws ChangelogTableNotExistsException
--     * @throws \Exception
-+     * @throws RuntimeException
-      */
-     public function getVersion()
-     {
-@@ -173,7 +182,9 @@ class Changelog implements ChangelogInterface
-         if (isset($row['Auto_increment'])) {
-             return (int)$row['Auto_increment'] - 1;
-         } else {
--            throw new \Exception("Table status for `{$changelogTableName}` is incorrect. Can`t fetch version id.");
-+            throw new RuntimeException(
-+                new Phrase("Table status for %1 is incorrect. Can`t fetch version id.", [$changelogTableName])
-+            );
-         }
-     }
- 
-@@ -182,13 +193,15 @@ class Changelog implements ChangelogInterface
-      *
-      * Build a changelog name by concatenating view identifier and changelog name suffix.
-      *
--     * @throws \Exception
-+     * @throws \DomainException
-      * @return string
-      */
-     public function getName()
-     {
-         if (strlen($this->viewId) == 0) {
--            throw new \Exception("View's identifier is not set");
-+            throw new \DomainException(
-+                new Phrase("View's identifier is not set")
-+            );
-         }
-         return $this->viewId . '_' . self::NAME_SUFFIX;
-     }
-@@ -216,6 +229,8 @@ class Changelog implements ChangelogInterface
-     }
- 
-     /**
-+     * Get view's identifier
-+     *
-      * @return string
-      */
-     public function getViewId()
-diff --git a/lib/internal/Magento/Framework/Mview/View/Subscription.php b/lib/internal/Magento/Framework/Mview/View/Subscription.php
-index 2f781dcad0a..67dff1a2cc5 100644
---- a/lib/internal/Magento/Framework/Mview/View/Subscription.php
-+++ b/lib/internal/Magento/Framework/Mview/View/Subscription.php
-@@ -10,6 +10,11 @@ use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\DB\Ddl\Trigger;
- use Magento\Framework\Mview\View\StateInterface;
- 
-+/**
-+ * Class Subscription
-+ *
-+ * @package Magento\Framework\Mview\View
-+ */
- class Subscription implements SubscriptionInterface
- {
-     /**
-@@ -193,33 +198,32 @@ class Subscription implements SubscriptionInterface
-      */
-     protected function buildStatement($event, $changelog)
-     {
--        $columns = [];
--        if ($this->connection->isTableExists($this->getTableName())
--            && $describe = $this->connection->describeTable($this->getTableName())
--        ) {
--            foreach ($describe as $column) {
--                if (in_array($column['COLUMN_NAME'], $this->ignoredUpdateColumns)) {
--                    continue;
--                }
--                $columns[] = sprintf(
--                    'NEW.%1$s != OLD.%1$s',
--                    $this->connection->quoteIdentifier($column['COLUMN_NAME'])
--                );
--            }
--        }
--
-         switch ($event) {
-             case Trigger::EVENT_INSERT:
-                 $trigger = "INSERT IGNORE INTO %s (%s) VALUES (NEW.%s);";
-                 break;
-             case Trigger::EVENT_UPDATE:
-+                $tableName = $this->resource->getTableName($this->getTableName());
-                 $trigger = "INSERT IGNORE INTO %s (%s) VALUES (NEW.%s);";
--                if ($columns) {
--                    $trigger = sprintf(
--                        "IF (%s) THEN %s END IF;",
--                        implode(' OR ', $columns),
--                        $trigger
--                    );
-+                if ($this->connection->isTableExists($tableName) &&
-+                    $describe = $this->connection->describeTable($tableName)
-+                ) {
-+                    $columnNames = array_column($describe, 'COLUMN_NAME');
-+                    $columnNames = array_diff($columnNames, $this->ignoredUpdateColumns);
-+                    if ($columnNames) {
-+                        $columns = [];
-+                        foreach ($columnNames as $columnName) {
-+                            $columns[] = sprintf(
-+                                'NEW.%1$s <=> OLD.%1$s',
-+                                $this->connection->quoteIdentifier($columnName)
-+                            );
-+                        }
-+                        $trigger = sprintf(
-+                            "IF (%s) THEN %s END IF;",
-+                            implode(' OR ', $columns),
-+                            $trigger
-+                        );
-+                    }
-                 }
-                 break;
-             case Trigger::EVENT_DELETE:
-diff --git a/lib/internal/Magento/Framework/Oauth/Oauth.php b/lib/internal/Magento/Framework/Oauth/Oauth.php
-index 5e48fb5ed30..919b0e4c86b 100644
---- a/lib/internal/Magento/Framework/Oauth/Oauth.php
-+++ b/lib/internal/Magento/Framework/Oauth/Oauth.php
-@@ -9,6 +9,9 @@ namespace Magento\Framework\Oauth;
- use Magento\Framework\Encryption\Helper\Security;
- use Magento\Framework\Phrase;
- 
-+/**
-+ * Authorization service.
-+ */
- class Oauth implements OauthInterface
- {
-     /**
-@@ -61,7 +64,7 @@ class Oauth implements OauthInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getRequestToken($params, $requestUrl, $httpMethod = 'POST')
-     {
-@@ -74,7 +77,7 @@ class Oauth implements OauthInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAccessToken($params, $requestUrl, $httpMethod = 'POST')
-     {
-@@ -102,7 +105,7 @@ class Oauth implements OauthInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function validateAccessTokenRequest($params, $requestUrl, $httpMethod = 'POST')
-     {
-@@ -125,7 +128,7 @@ class Oauth implements OauthInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function validateAccessToken($accessToken)
-     {
-@@ -133,7 +136,7 @@ class Oauth implements OauthInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function buildAuthorizationHeader(
-         $params,
-@@ -199,7 +202,7 @@ class Oauth implements OauthInterface
-         );
- 
-         if (!Security::compareStrings($calculatedSign, $params['oauth_signature'])) {
--            throw new Exception(new Phrase('The signatire is invalid. Verify and try again.'));
-+            throw new Exception(new Phrase('The signature is invalid. Verify and try again.'));
-         }
-     }
- 
-diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php
-index 96595bc7a07..efa1b4be60c 100644
---- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php
-+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php
-@@ -5,8 +5,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\ObjectManager\Code\Generator;
- 
-+/**
-+ * Class Proxy
-+ *
-+ * @package Magento\Framework\ObjectManager\Code\Generator
-+ */
- class Proxy extends \Magento\Framework\Code\Generator\EntityAbstract
- {
-     /**
-@@ -20,6 +26,8 @@ class Proxy extends \Magento\Framework\Code\Generator\EntityAbstract
-     const NON_INTERCEPTABLE_INTERFACE = \Magento\Framework\ObjectManager\NoninterceptableInterface::class;
- 
-     /**
-+     * Returns default result class name
-+     *
-      * @param string $modelClassName
-      * @return string
-      */
-@@ -112,13 +120,16 @@ class Proxy extends \Magento\Framework\Code\Generator\EntityAbstract
-         $reflectionClass = new \ReflectionClass($this->getSourceClassName());
-         $publicMethods = $reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC);
-         foreach ($publicMethods as $method) {
--            if (!($method->isConstructor() ||
-+            if (!(
-+                    $method->isConstructor() ||
-                     $method->isFinal() ||
-                     $method->isStatic() ||
--                    $method->isDestructor()) && !in_array(
--                        $method->getName(),
--                        ['__sleep', '__wakeup', '__clone']
--                    )
-+                    $method->isDestructor()
-+                )
-+                && !in_array(
-+                    $method->getName(),
-+                    ['__sleep', '__wakeup', '__clone']
-+                )
-             ) {
-                 $methods[] = $this->_getMethodInfo($method);
-             }
-@@ -128,6 +139,8 @@ class Proxy extends \Magento\Framework\Code\Generator\EntityAbstract
-     }
- 
-     /**
-+     * Generates code
-+     *
-      * @return string
-      */
-     protected function _generateCode()
-@@ -160,10 +173,7 @@ class Proxy extends \Magento\Framework\Code\Generator\EntityAbstract
-             $parameters[] = $this->_getMethodParameterInfo($parameter);
-         }
- 
--        $returnType = $method->getReturnType();
--        $returnTypeValue = $returnType
--            ? ($returnType->allowsNull() ? '?' : '') .$returnType->getName()
--            : null;
-+        $returnTypeValue = $this->getReturnTypeValue($method->getReturnType());
-         $methodInfo = [
-             'name' => $method->getName(),
-             'parameters' => $parameters,
-@@ -237,11 +247,13 @@ class Proxy extends \Magento\Framework\Code\Generator\EntityAbstract
-         }
- 
-         return ($withoutReturn ? '' : 'return ')
--            .'$this->_getSubject()->' . $methodCall . ';';
-+            . '$this->_getSubject()->' . $methodCall . ';';
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Validates data
-+     *
-+     * @return bool
-      */
-     protected function _validateData()
-     {
-@@ -259,4 +271,22 @@ class Proxy extends \Magento\Framework\Code\Generator\EntityAbstract
-         }
-         return $result;
-     }
-+
-+    /**
-+     * Returns return type
-+     *
-+     * @param mixed $returnType
-+     * @return null|string
-+     */
-+    private function getReturnTypeValue($returnType): ?string
-+    {
-+        $returnTypeValue = null;
-+        if ($returnType) {
-+            $returnTypeValue = ($returnType->allowsNull() ? '?' : '');
-+            $returnTypeValue .= ($returnType->getName() === 'self')
-+                ? $this->getSourceClassName()
-+                : $returnType->getName();
-+        }
-+        return $returnTypeValue;
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
-index 362cbb2e887..be484f07434 100644
---- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
-+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
-@@ -156,9 +156,6 @@ class Repository extends \Magento\Framework\Code\Generator\EntityAbstract
-     protected function _getPersistorClassName()
-     {
-         $target = $this->getSourceClassName();
--//        if (substr($target, -9) == 'Interface') {
--//            $target = substr($target, 1, strlen($target) -9);
--//        }
-         return $target . 'Persistor';
-     }
- 
-diff --git a/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php b/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php
-index c99170b4112..b56b6361b36 100644
---- a/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php
-+++ b/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php
-@@ -35,15 +35,7 @@ class Composite
-         uasort(
-             $declaredComponents,
-             function ($firstComponent, $secondComponent) {
--                $firstComponentSortOrder = (int)$firstComponent['sortOrder'];
--                $secondComponentSortOrder = (int)$secondComponent['sortOrder'];
--                if ($firstComponentSortOrder == $secondComponentSortOrder) {
--                    return 0;
--                } elseif ($firstComponentSortOrder < $secondComponentSortOrder) {
--                    return -1;
--                } else {
--                    return 1;
--                }
-+                return (int)$firstComponent['sortOrder'] <=> (int)$secondComponent['sortOrder'];
-             }
-         );
-         $declaredComponents = array_values($declaredComponents);
-diff --git a/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php b/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php
-index 9221dad9090..c1c1e7c1770 100644
---- a/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php
-+++ b/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php
-@@ -1,6 +1,5 @@
- <?php
- /**
-- *
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-@@ -8,10 +7,13 @@ namespace Magento\Framework\ObjectManager\Profiler;
- 
- use Magento\Framework\ObjectManager\Profiler\Tree\Item as Item;
- 
-+/**
-+ * Class Log
-+ */
- class Log
- {
-     /**
--     * @var $this
-+     * @var self
-      */
-     protected static $instance;
- 
-diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/Sample.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/Sample.php
-index d63391b9a33..5979bb748ba 100644
---- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/Sample.php
-+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/Sample.php
-@@ -16,6 +16,11 @@ class Sample
-      */
-     protected $messages = [];
- 
-+    /**
-+     * @var array
-+     */
-+    private $config = [];
-+
-     /**
-      * @param array $messages
-      */
-@@ -31,4 +36,20 @@ class Sample
-     {
-         return $this->messages;
-     }
-+
-+    /**
-+     * @param array $config
-+     */
-+    public function setConfig(array $config)
-+    {
-+        $this->config = $config;
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getConfig(): array
-+    {
-+        return $this->config;
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleProxy.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleProxy.txt
-index 7dd12650448..2c56472f323 100644
---- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleProxy.txt
-+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleProxy.txt
-@@ -101,4 +101,20 @@ class Sample_Proxy extends Sample implements \Magento\Framework\ObjectManager\No
-     {
-         return $this->_getSubject()->getMessages();
-     }
-+
-+    /**
-+     * {@inheritdoc}
-+     */
-+    public function setConfig(array $config)
-+    {
-+        return $this->_getSubject()->setConfig($config);
-+    }
-+
-+    /**
-+     * {@inheritdoc}
-+     */
-+    public function getConfig() : array
-+    {
-+        return $this->_getSubject()->getConfig();
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/SchemaLocatorTest.php
-index 1a653992e1e..65018bcd873 100644
---- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/SchemaLocatorTest.php
-+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/SchemaLocatorTest.php
-@@ -12,10 +12,10 @@ class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $model;
- 
--    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
-+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
-     protected $urnResolver;
- 
--    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
-+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
-     protected $urnResolverMock;
- 
-     protected function setUp()
-diff --git a/lib/internal/Magento/Framework/Option/ArrayInterface.php b/lib/internal/Magento/Framework/Option/ArrayInterface.php
-index ecfa71227f9..054d9059b02 100644
---- a/lib/internal/Magento/Framework/Option/ArrayInterface.php
-+++ b/lib/internal/Magento/Framework/Option/ArrayInterface.php
-@@ -6,7 +6,10 @@
- namespace Magento\Framework\Option;
- 
- /**
-- * @todo Remove in favor of the ancestor interface
-+ * Array marker interface
-+ *
-+ * @deprecated please use \Magento\Framework\Data\OptionSourceInterface instead.
-+ * @see \Magento\Framework\Data\OptionSourceInterface
-  */
- interface ArrayInterface extends \Magento\Framework\Data\OptionSourceInterface
- {
-diff --git a/lib/internal/Magento/Framework/Option/ArrayPool.php b/lib/internal/Magento/Framework/Option/ArrayPool.php
-index 5ac349d99b8..11e1b46ff03 100644
---- a/lib/internal/Magento/Framework/Option/ArrayPool.php
-+++ b/lib/internal/Magento/Framework/Option/ArrayPool.php
-@@ -28,13 +28,14 @@ class ArrayPool
-      *
-      * @param string $model
-      * @throws \InvalidArgumentException
--     * @return \Magento\Framework\Option\ArrayInterface
-+     * @return \Magento\Framework\Data\OptionSourceInterface
-      */
-     public function get($model)
-     {
-         $modelInstance = $this->_objectManager->get($model);
--        if (false == $modelInstance instanceof \Magento\Framework\Option\ArrayInterface) {
--            throw new \InvalidArgumentException($model . 'doesn\'t implement \Magento\Framework\Option\ArrayInterface');
-+        if (false == $modelInstance instanceof \Magento\Framework\Data\OptionSourceInterface) {
-+            throw new \InvalidArgumentException($model
-+                . 'doesn\'t implement \Magento\Framework\Data\OptionSourceInterface');
-         }
-         return $modelInstance;
-     }
-diff --git a/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php b/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php
-index 4ba8c747fa1..fd1b0c18ead 100644
---- a/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php
-+++ b/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php
-@@ -40,6 +40,6 @@ class Placeholder implements RendererInterface
-      */
-     private function keyToPlaceholder($key)
-     {
--        return '%' . (is_int($key) ? strval($key + 1) : $key);
-+        return '%' . (is_int($key) ? (string)($key + 1) : $key);
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Phrase/__.php b/lib/internal/Magento/Framework/Phrase/__.php
-new file mode 100644
-index 00000000000..6f3186231e3
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Phrase/__.php
-@@ -0,0 +1,23 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+/**
-+ * Create value-object \Magento\Framework\Phrase
-+ * @SuppressWarnings(PHPMD.ShortMethodName)
-+ * @return \Magento\Framework\Phrase
-+ */
-+function __()
-+{
-+    $argc = func_get_args();
-+
-+    $text = array_shift($argc);
-+    if (!empty($argc) && is_array($argc[0])) {
-+        $argc = $argc[0];
-+    }
-+
-+    return new \Magento\Framework\Phrase($text, $argc);
-+}
-diff --git a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
-index 31f00d8b134..eb379b54d25 100644
---- a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
-+++ b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
-@@ -78,6 +78,7 @@ interface PriceCurrencyInterface
-     /**
-      * Round price
-      *
-+     * @deprecated
-      * @param float $price
-      * @return float
-      */
-@@ -93,6 +94,8 @@ interface PriceCurrencyInterface
-     public function getCurrency($scope = null, $currency = null);
- 
-     /**
-+     * Get currency symbol
-+     *
-      * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
-      * @param \Magento\Framework\Model\AbstractModel|string|null $currency
-      * @return string
-diff --git a/lib/internal/Magento/Framework/Pricing/Render/PriceBox.php b/lib/internal/Magento/Framework/Pricing/Render/PriceBox.php
-index ae572d8fe5f..e43dc0a562d 100644
---- a/lib/internal/Magento/Framework/Pricing/Render/PriceBox.php
-+++ b/lib/internal/Magento/Framework/Pricing/Render/PriceBox.php
-@@ -8,8 +8,8 @@ namespace Magento\Framework\Pricing\Render;
- 
- use Magento\Framework\DataObject\IdentityInterface;
- use Magento\Framework\Pricing\Amount\AmountInterface;
--use Magento\Framework\Pricing\SaleableInterface;
- use Magento\Framework\Pricing\Price\PriceInterface;
-+use Magento\Framework\Pricing\SaleableInterface;
- use Magento\Framework\View\Element\Template;
- 
- /**
-@@ -21,7 +21,7 @@ use Magento\Framework\View\Element\Template;
- class PriceBox extends Template implements PriceBoxRenderInterface, IdentityInterface
- {
-     /** Default block lifetime */
--    const DEFAULT_LIFETIME = 3600;
-+    const DEFAULT_LIFETIME = 86400;
- 
-     /**
-      * @var SaleableInterface
-@@ -39,11 +39,11 @@ class PriceBox extends Template implements PriceBoxRenderInterface, IdentityInte
-     protected $rendererPool;
- 
-     /**
--     * @param Template\Context  $context
-+     * @param Template\Context $context
-      * @param SaleableInterface $saleableItem
--     * @param PriceInterface    $price
--     * @param RendererPool      $rendererPool
--     * @param array             $data
-+     * @param PriceInterface $price
-+     * @param RendererPool $rendererPool
-+     * @param array $data
-      */
-     public function __construct(
-         Template\Context $context,
-@@ -59,7 +59,7 @@ class PriceBox extends Template implements PriceBoxRenderInterface, IdentityInte
-     }
- 
-     /**
--     * @return string
-+     * @inheritdoc
-      */
-     protected function _toHtml()
-     {
-@@ -70,9 +70,7 @@ class PriceBox extends Template implements PriceBoxRenderInterface, IdentityInte
-     }
- 
-     /**
--     * Get Key for caching block content
--     *
--     * @return string
-+     * @inheritdoc
-      */
-     public function getCacheKey()
-     {
-@@ -80,17 +78,15 @@ class PriceBox extends Template implements PriceBoxRenderInterface, IdentityInte
-     }
- 
-     /**
--     * Get block cache life time
--     *
--     * @return int
-+     * @inheritdoc
-      */
-     protected function getCacheLifetime()
-     {
--        return parent::hasCacheLifetime() ? parent::getCacheLifetime() : null;
-+        return parent::hasCacheLifetime() ? parent::getCacheLifetime() : self::DEFAULT_LIFETIME;
-     }
--    
-+
-     /**
--     * @return SaleableInterface
-+     * @inheritdoc
-      */
-     public function getSaleableItem()
-     {
-@@ -98,7 +94,7 @@ class PriceBox extends Template implements PriceBoxRenderInterface, IdentityInte
-     }
- 
-     /**
--     * @return PriceInterface
-+     * @inheritdoc
-      */
-     public function getPrice()
-     {
-@@ -136,9 +132,7 @@ class PriceBox extends Template implements PriceBoxRenderInterface, IdentityInte
-     }
- 
-     /**
--     * @param AmountInterface $amount
--     * @param array $arguments
--     * @return string
-+     * @inheritdoc
-      */
-     public function renderAmount(AmountInterface $amount, array $arguments = [])
-     {
-@@ -149,6 +143,8 @@ class PriceBox extends Template implements PriceBoxRenderInterface, IdentityInte
-     }
- 
-     /**
-+     * Get amount render.
-+     *
-      * @param AmountInterface $amount
-      * @param array $arguments
-      * @return AmountRenderInterface
-@@ -164,6 +160,8 @@ class PriceBox extends Template implements PriceBoxRenderInterface, IdentityInte
-     }
- 
-     /**
-+     * Get renderer pool.
-+     *
-      * @return RendererPool
-      */
-     public function getRendererPool()
-@@ -172,9 +170,7 @@ class PriceBox extends Template implements PriceBoxRenderInterface, IdentityInte
-     }
- 
-     /**
--     * Return unique ID(s) for each object in system
--     *
--     * @return array
-+     * @inheritdoc
-      */
-     public function getIdentities()
-     {
-diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
-index f4588f7d256..1b819f00fa0 100644
---- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
-+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
-@@ -248,17 +248,4 @@ class PriceBoxTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->assertEquals($this->rendererPool, $this->model->getRendererPool());
-     }
--
--    /**
--     * This tests ensures that protected method getCacheLifetime() returns a null value when cacheLifeTime is not
--     * explicitly set in the parent block
--     */
--    public function testCacheLifetime()
--    {
--        $reflectionClass = new \ReflectionClass(get_class($this->model));
--        $methodReflection = $reflectionClass->getMethod('getCacheLifetime');
--        $methodReflection->setAccessible(true);
--        $cacheLifeTime = $methodReflection->invoke($this->model);
--        $this->assertNull($cacheLifeTime, 'Expected null cache lifetime');
--    }
- }
-diff --git a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/StatTest.php b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/StatTest.php
-index d694697284f..df74eeec972 100644
---- a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/StatTest.php
-+++ b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/StatTest.php
-@@ -395,7 +395,7 @@ class StatTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \InvalidArgumentException
--     * @expectedMessage Timer "foo" doesn't exist.
-+     * @expectedExceptionMessage Timer "foo" doesn't exist.
-      */
-     public function testFetchInvalidTimer()
-     {
-@@ -404,7 +404,7 @@ class StatTest extends \PHPUnit\Framework\TestCase
- 
-     /**
-      * @expectedException \InvalidArgumentException
--     * @expectedMessage Timer "foo" doesn't have value for "bar".
-+     * @expectedExceptionMessage Timer "foo" doesn't have value for "bar".
-      */
-     public function testFetchInvalidKey()
-     {
-diff --git a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
-index 6311003bd2a..2f3caf08c53 100644
---- a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
-+++ b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
-@@ -40,25 +40,33 @@ class DataObjectProcessor
-      */
-     private $customAttributesProcessor;
- 
-+    /**
-+     * @var array
-+     */
-+    private $processors;
-+
-     /**
-      * @param MethodsMap $methodsMapProcessor
-      * @param TypeCaster $typeCaster
-      * @param FieldNamer $fieldNamer
-      * @param CustomAttributesProcessor $customAttributesProcessor
-      * @param ExtensionAttributesProcessor $extensionAttributesProcessor
-+     * @param array $processors
-      */
-     public function __construct(
-         MethodsMap $methodsMapProcessor,
-         TypeCaster $typeCaster,
-         FieldNamer $fieldNamer,
-         CustomAttributesProcessor $customAttributesProcessor,
--        ExtensionAttributesProcessor $extensionAttributesProcessor
-+        ExtensionAttributesProcessor $extensionAttributesProcessor,
-+        array $processors = []
-     ) {
-         $this->methodsMapProcessor = $methodsMapProcessor;
-         $this->typeCaster = $typeCaster;
-         $this->fieldNamer = $fieldNamer;
-         $this->extensionAttributesProcessor = $extensionAttributesProcessor;
-         $this->customAttributesProcessor = $customAttributesProcessor;
-+        $this->processors = $processors;
-     }
- 
-     /**
-@@ -121,6 +129,27 @@ class DataObjectProcessor
- 
-             $outputData[$key] = $value;
-         }
-+
-+        $outputData = $this->changeOutputArray($dataObject, $outputData);
-+
-+        return $outputData;
-+    }
-+
-+    /**
-+     * Change output array if needed.
-+     *
-+     * @param mixed $dataObject
-+     * @param array $outputData
-+     * @return array
-+     */
-+    private function changeOutputArray($dataObject, array $outputData): array
-+    {
-+        foreach ($this->processors as $dataObjectClassName => $processor) {
-+            if ($dataObject instanceof $dataObjectClassName) {
-+                $outputData = $processor->execute($dataObject, $outputData);
-+            }
-+        }
-+
-         return $outputData;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Reflection/MethodsMap.php b/lib/internal/Magento/Framework/Reflection/MethodsMap.php
-index 944cd8771ee..6b0ddfbfc21 100644
---- a/lib/internal/Magento/Framework/Reflection/MethodsMap.php
-+++ b/lib/internal/Magento/Framework/Reflection/MethodsMap.php
-@@ -94,6 +94,8 @@ class MethodsMap
-      *  'validatePassword' => 'boolean'
-      * ]
-      * </pre>
-+     * @throws \InvalidArgumentException if methods don't have annotation
-+     * @throws \ReflectionException for missing DocBock or invalid reflection class
-      */
-     public function getMethodsMap($interfaceName)
-     {
-@@ -148,6 +150,8 @@ class MethodsMap
-      *
-      * @param string $interfaceName
-      * @return array
-+     * @throws \ReflectionException for missing DocBock or invalid reflection class
-+     * @throws \InvalidArgumentException if methods don't have annotation
-      */
-     private function getMethodMapViaReflection($interfaceName)
-     {
-diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseClasses/SampleOne.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseClasses/SampleOne.php
-new file mode 100644
-index 00000000000..6382f4b2470
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseClasses/SampleOne.php
-@@ -0,0 +1,13 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Reflection\Test\Unit\Fixture\UseClasses;
-+
-+class SampleOne
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseClasses/SampleOne/SampleThree.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseClasses/SampleOne/SampleThree.php
-new file mode 100644
-index 00000000000..5384bfa6a67
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseClasses/SampleOne/SampleThree.php
-@@ -0,0 +1,13 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Reflection\Test\Unit\Fixture\UseClasses\SampleOne;
-+
-+class SampleThree
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseClasses/SampleTwo.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseClasses/SampleTwo.php
-new file mode 100644
-index 00000000000..02e2c7da30c
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseClasses/SampleTwo.php
-@@ -0,0 +1,13 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Reflection\Test\Unit\Fixture\UseClasses;
-+
-+class SampleTwo
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseClasses/SampleTwo/SampleFour.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseClasses/SampleTwo/SampleFour.php
-new file mode 100644
-index 00000000000..160d4c51322
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseClasses/SampleTwo/SampleFour.php
-@@ -0,0 +1,13 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Reflection\Test\Unit\Fixture\UseClasses\SampleTwo;
-+
-+class SampleFour
-+{
-+
-+}
-diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseSample.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseSample.php
-new file mode 100644
-index 00000000000..88c1b460206
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/UseSample.php
-@@ -0,0 +1,16 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Reflection\Test\Unit\Fixture;
-+
-+use Magento\Framework\Reflection\Test\Unit\Fixture\UseClasses\SampleOne;
-+use Magento\Framework\Reflection\Test\Unit\Fixture\UseClasses\SampleTwo as Sample2;
-+
-+class UseSample
-+{
-+    // ...
-+}
-diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
-index 86a4693d9e5..1a8702c0e1c 100644
---- a/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
-+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
-@@ -8,9 +8,18 @@ namespace Magento\Framework\Reflection\Test\Unit;
- 
- use Magento\Framework\Exception\SerializationException;
- use Magento\Framework\Reflection\Test\Unit\Fixture\TSample;
-+use Magento\Framework\Reflection\Test\Unit\Fixture\TSampleInterface;
-+use Magento\Framework\Reflection\Test\Unit\Fixture\UseClasses\SampleOne;
-+use Magento\Framework\Reflection\Test\Unit\Fixture\UseClasses\SampleOne\SampleThree;
-+use Magento\Framework\Reflection\Test\Unit\Fixture\UseClasses\SampleTwo;
-+use Magento\Framework\Reflection\Test\Unit\Fixture\UseClasses\SampleTwo\SampleFour;
-+use Magento\Framework\Reflection\Test\Unit\Fixture\UseSample;
- use Magento\Framework\Reflection\TypeProcessor;
- use Zend\Code\Reflection\ClassReflection;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class TypeProcessorTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -278,7 +287,7 @@ class TypeProcessorTest extends \PHPUnit\Framework\TestCase
-     {
-         return [
-             ['method name' => 'addData', 'type' => 'array[]'],
--            ['method name' => 'addObjectList', 'type' => 'TSampleInterface[]']
-+            ['method name' => 'addObjectList', 'type' => '\\' . TSampleInterface::class . '[]']
-         ];
-     }
- 
-@@ -354,4 +363,182 @@ class TypeProcessorTest extends \PHPUnit\Framework\TestCase
-         $methodReflection = $classReflection->getMethod('getName');
-         $this->typeProcessor->getGetterReturnType($methodReflection);
-     }
-+
-+    /**
-+     * Simple and complex data provider
-+     *
-+     * @return array
-+     */
-+    public function simpleAndComplexDataProvider(): array
-+    {
-+        return [
-+            ['string', true],
-+            ['array', true],
-+            ['int', true],
-+            ['SomeClass', false],
-+            ['\\My\\Namespace\\Model\\Class', false],
-+            ['Some\\Other\\Class', false],
-+        ];
-+    }
-+
-+    /**
-+     * Test simple type detection method
-+     *
-+     * @dataProvider simpleAndComplexDataProvider
-+     * @param string $type
-+     * @param bool $expectedValue
-+     */
-+    public function testIsSimpleType(string $type, bool $expectedValue)
-+    {
-+        self::assertEquals($expectedValue, $this->typeProcessor->isSimpleType($type));
-+    }
-+
-+    /**
-+     * Simple and complex data provider
-+     *
-+     * @return array
-+     */
-+    public function basicClassNameProvider(): array
-+    {
-+        return [
-+            ['SomeClass[]', 'SomeClass'],
-+            ['\\My\\Namespace\\Model\\Class[]', '\\My\\Namespace\\Model\\Class'],
-+            ['Some\\Other\\Class[]', 'Some\\Other\\Class'],
-+            ['SomeClass', 'SomeClass'],
-+            ['\\My\\Namespace\\Model\\Class', '\\My\\Namespace\\Model\\Class'],
-+            ['Some\\Other\\Class', 'Some\\Other\\Class'],
-+        ];
-+    }
-+
-+    /**
-+     * Extract basic class name
-+     *
-+     * @dataProvider basicClassNameProvider
-+     * @param string $type
-+     * @param string $expectedValue
-+     */
-+    public function testBasicClassName(string $type, string $expectedValue)
-+    {
-+        self::assertEquals($expectedValue, $this->typeProcessor->getBasicClassName($type));
-+    }
-+
-+    /**
-+     * Fully qualified class names data provider
-+     *
-+     * @return array
-+     */
-+    public function isFullyQualifiedClassNamesDataProvider(): array
-+    {
-+        return [
-+            ['SomeClass', false],
-+            ['\\My\\Namespace\\Model\\Class', true],
-+            ['Some\\Other\\Class', false],
-+        ];
-+    }
-+
-+    /**
-+     * Test fully qualified class name detector
-+     *
-+     * @dataProvider isFullyQualifiedClassNamesDataProvider
-+     * @param string $type
-+     * @param bool $expectedValue
-+     */
-+    public function testIsFullyQualifiedClassName(string $type, bool $expectedValue)
-+    {
-+        self::assertEquals($expectedValue, $this->typeProcessor->isFullyQualifiedClassName($type));
-+    }
-+
-+    /**
-+     * Test alias mapping
-+     */
-+    public function testGetAliasMapping()
-+    {
-+        $sourceClass = new ClassReflection(UseSample::class);
-+        $aliasMap = $this->typeProcessor->getAliasMapping($sourceClass);
-+
-+        self::assertEquals([
-+            'SampleOne' => SampleOne::class,
-+            'Sample2' => SampleTwo::class,
-+        ], $aliasMap);
-+    }
-+
-+    /**
-+     * Resolve fully qualified class names data provider
-+     *
-+     * @return array
-+     */
-+    public function resolveFullyQualifiedClassNamesDataProvider(): array
-+    {
-+        return [
-+            [UseSample::class, 'string', 'string'],
-+            [UseSample::class, 'string[]', 'string[]'],
-+
-+            [UseSample::class, 'SampleOne', '\\' . SampleOne::class],
-+            [UseSample::class, 'Sample2', '\\' . SampleTwo::class],
-+            [
-+                UseSample::class,
-+                '\\Magento\\Framework\\Reflection\\Test\\Unit\\Fixture\\UseClasses\\SampleOne',
-+                '\\' . SampleOne::class
-+            ],
-+            [
-+                UseSample::class,
-+                '\\Magento\\Framework\\Reflection\\Test\\Unit\\Fixture\\UseClasses\\SampleTwo',
-+                '\\' . SampleTwo::class
-+            ],
-+            [UseSample::class, 'UseClasses\\SampleOne', '\\' . SampleOne::class],
-+            [UseSample::class, 'UseClasses\\SampleTwo', '\\' . SampleTwo::class],
-+
-+            [UseSample::class, 'SampleOne[]', '\\' . SampleOne::class . '[]'],
-+            [UseSample::class, 'Sample2[]', '\\' . SampleTwo::class . '[]'],
-+            [
-+                UseSample::class,
-+                '\\Magento\\Framework\\Reflection\\Test\\Unit\\Fixture\\UseClasses\\SampleOne[]',
-+                '\\' . SampleOne::class . '[]'
-+            ],
-+            [
-+                UseSample::class,
-+                '\\Magento\\Framework\\Reflection\\Test\\Unit\\Fixture\\UseClasses\\SampleTwo[]',
-+                '\\' . SampleTwo::class . '[]'
-+            ],
-+            [UseSample::class, 'UseClasses\\SampleOne[]', '\\' . SampleOne::class . '[]'],
-+            [UseSample::class, 'UseClasses\\SampleTwo[]', '\\' . SampleTwo::class . '[]'],
-+
-+            [UseSample::class, 'SampleOne\SampleThree', '\\' . SampleThree::class],
-+            [UseSample::class, 'SampleOne\SampleThree[]', '\\' . SampleThree::class . '[]'],
-+
-+            [UseSample::class, 'Sample2\SampleFour', '\\' . SampleFour::class],
-+            [UseSample::class, 'Sample2\SampleFour[]', '\\' . SampleFour::class . '[]'],
-+
-+            [UseSample::class, 'Sample2\NotExisting', 'Sample2\NotExisting'],
-+            [UseSample::class, 'Sample2\NotExisting[]', 'Sample2\NotExisting[]'],
-+
-+            [
-+                UseSample::class,
-+                '\\Magento\\Framework\\Reflection\\Test\\Unit\\Fixture\\UseClasses\\NotExisting',
-+                '\\Magento\\Framework\\Reflection\\Test\\Unit\\Fixture\\UseClasses\\NotExisting'
-+            ],
-+            [
-+                UseSample::class,
-+                '\\Magento\\Framework\\Reflection\\Test\\Unit\\Fixture\\UseClasses\\NotExisting[]',
-+                '\\Magento\\Framework\\Reflection\\Test\\Unit\\Fixture\\UseClasses\\NotExisting[]'
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * Resolve fully qualified class names
-+     *
-+     * @dataProvider resolveFullyQualifiedClassNamesDataProvider
-+     * @param string $className
-+     * @param string $type
-+     * @param string $expectedValue
-+     * @throws \ReflectionException
-+     */
-+    public function testResolveFullyQualifiedClassNames(string $className, string $type, string $expectedValue)
-+    {
-+        $sourceClass = new ClassReflection($className);
-+        $fullyQualified = $this->typeProcessor->resolveFullyQualifiedClassName($sourceClass, $type);
-+
-+        self::assertEquals($expectedValue, $fullyQualified);
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Reflection/TypeProcessor.php b/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
-index d7206032c68..9571fa53547 100644
---- a/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
-+++ b/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
-@@ -512,7 +512,7 @@ class TypeProcessor
-     public function getParamType(ParameterReflection $param)
-     {
-         $type = $param->detectType();
--        if ($type == 'null') {
-+        if ($type === 'null') {
-             throw new \LogicException(sprintf(
-                 '@param annotation is incorrect for the parameter "%s" in the method "%s:%s".'
-                 . ' First declared type should not be null. E.g. string|null',
-@@ -521,14 +521,149 @@ class TypeProcessor
-                 $param->getDeclaringFunction()->name
-             ));
-         }
--        if ($type == 'array') {
-+        if ($type === 'array') {
-             // try to determine class, if it's array of objects
-             $paramDocBlock = $this->getParamDocBlockTag($param);
-             $paramTypes = $paramDocBlock->getTypes();
-             $paramType = array_shift($paramTypes);
-+
-+            $paramType = $this->resolveFullyQualifiedClassName($param->getDeclaringClass(), $paramType);
-+
-             return strpos($paramType, '[]') !== false ? $paramType : "{$paramType}[]";
-         }
--        return $type;
-+
-+        return $this->resolveFullyQualifiedClassName($param->getDeclaringClass(), $type);
-+    }
-+
-+    /**
-+     * Get alias mapping for source class
-+     *
-+     * @param ClassReflection $sourceClass
-+     * @return array
-+     */
-+    public function getAliasMapping(ClassReflection $sourceClass): array
-+    {
-+        $sourceFileName = $sourceClass->getDeclaringFile();
-+        $aliases = [];
-+        foreach ($sourceFileName->getUses() as $use) {
-+            if ($use['as'] !== null) {
-+                $aliases[$use['as']] = $use['use'];
-+            } else {
-+                $pos = strrpos($use['use'], '\\');
-+
-+                $aliasName = substr($use['use'], $pos + 1);
-+                $aliases[$aliasName] = $use['use'];
-+            }
-+        }
-+
-+        return $aliases;
-+    }
-+
-+    /**
-+     * Return true if the passed type is a simple type
-+     *
-+     * Eg.:
-+     * Return true with; array, string, ...
-+     * Return false with: SomeClassName
-+     *
-+     * @param string $typeName
-+     * @return bool
-+     */
-+    public function isSimpleType(string $typeName): bool
-+    {
-+        return strtolower($typeName) === $typeName;
-+    }
-+
-+    /**
-+     * Get basic type for a class name
-+     *
-+     * Eg.:
-+     * SomeClassName[] => SomeClassName
-+     *
-+     * @param string $className
-+     * @return string
-+     */
-+    public function getBasicClassName(string $className): string
-+    {
-+        $pos = strpos($className, '[');
-+        return ($pos === false) ? $className : substr($className, 0, $pos);
-+    }
-+
-+    /**
-+     * Return true if it is a FQ class name
-+     *
-+     * Eg.:
-+     * SomeClassName => false
-+     * \My\NameSpace\SomeClassName => true
-+     *
-+     * @param string $className
-+     * @return bool
-+     */
-+    public function isFullyQualifiedClassName(string $className): bool
-+    {
-+        return strpos($className, '\\') === 0;
-+    }
-+
-+    /**
-+     * Get aliased class name
-+     *
-+     * @param string $className
-+     * @param string $namespace
-+     * @param array $aliases
-+     * @return string
-+     */
-+    private function getAliasedClassName(string $className, string $namespace, array $aliases): string
-+    {
-+        $pos = strpos($className, '\\');
-+        if ($pos === false) {
-+            $namespacePrefix = $className;
-+            $partialClassName = '';
-+        } else {
-+            $namespacePrefix = substr($className, 0, $pos);
-+            $partialClassName = substr($className, $pos);
-+        }
-+
-+        if (isset($aliases[$namespacePrefix])) {
-+            return $aliases[$namespacePrefix] . $partialClassName;
-+        }
-+
-+        return $namespace . '\\' . $className;
-+    }
-+
-+    /**
-+     * Resolve fully qualified type name in the class alias context
-+     *
-+     * @param ClassReflection $sourceClass
-+     * @param string $typeName
-+     * @return string
-+     */
-+    public function resolveFullyQualifiedClassName(ClassReflection $sourceClass, string $typeName): string
-+    {
-+        $typeName = trim($typeName);
-+
-+        // Simple way to understand it is a basic type or a class name
-+        if ($this->isSimpleType($typeName)) {
-+            return $typeName;
-+        }
-+
-+        $basicTypeName = $this->getBasicClassName($typeName);
-+
-+        // Already a FQN class name
-+        if ($this->isFullyQualifiedClassName($basicTypeName)) {
-+            return '\\' . substr($typeName, 1);
-+        }
-+
-+        $isArray = $this->isArrayType($typeName);
-+        $aliases = $this->getAliasMapping($sourceClass);
-+
-+        $namespace = $sourceClass->getNamespaceName();
-+        $fqClassName = '\\' . $this->getAliasedClassName($basicTypeName, $namespace, $aliases);
-+
-+        if (interface_exists($fqClassName) || class_exists($fqClassName)) {
-+            return $fqClassName . ($isArray ? '[]' : '');
-+        }
-+
-+        return $typeName;
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
-index 11bd746eb71..e1b423d738a 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
-@@ -7,6 +7,7 @@ namespace Magento\Framework\Search\Adapter\Mysql;
- 
- use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\DB\Ddl\Table;
-+use Magento\Framework\DB\Select;
- use Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder as AggregationBuilder;
- use Magento\Framework\Search\AdapterInterface;
- use Magento\Framework\Search\RequestInterface;
-@@ -14,6 +15,8 @@ use Magento\Framework\Search\RequestInterface;
- /**
-  * MySQL Search Adapter
-  *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Adapter implements AdapterInterface
-@@ -47,6 +50,16 @@ class Adapter implements AdapterInterface
-      */
-     private $temporaryStorageFactory;
- 
-+    /**
-+     * Query Select Parts to be skipped when prepare query for count
-+     *
-+     * @var array
-+     */
-+    private $countSqlSkipParts = [
-+        \Magento\Framework\DB\Select::LIMIT_COUNT => true,
-+        \Magento\Framework\DB\Select::LIMIT_OFFSET => true,
-+    ];
-+
-     /**
-      * @param Mapper $mapper
-      * @param ResponseFactory $responseFactory
-@@ -84,6 +97,7 @@ class Adapter implements AdapterInterface
-         $response = [
-             'documents' => $documents,
-             'aggregations' => $aggregations,
-+            'total' => $this->getSize($query)
-         ];
-         return $this->responseFactory->create($response);
-     }
-@@ -104,10 +118,47 @@ class Adapter implements AdapterInterface
-     }
- 
-     /**
-+     * Get connection.
-+     *
-      * @return false|\Magento\Framework\DB\Adapter\AdapterInterface
-      */
-     private function getConnection()
-     {
-         return $this->resource->getConnection();
-     }
-+
-+    /**
-+     * Get rows size
-+     *
-+     * @param Select $query
-+     * @return int
-+     */
-+    private function getSize(Select $query): int
-+    {
-+        $sql = $this->getSelectCountSql($query);
-+        $parentSelect = $this->getConnection()->select();
-+        $parentSelect->from(['core_select' => $sql]);
-+        $parentSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
-+        $parentSelect->columns('COUNT(*)');
-+        $totalRecords = $this->getConnection()->fetchOne($parentSelect);
-+
-+        return intval($totalRecords);
-+    }
-+
-+    /**
-+     * Reset limit and offset
-+     *
-+     * @param Select $query
-+     * @return Select
-+     */
-+    private function getSelectCountSql(Select $query): Select
-+    {
-+        foreach ($this->countSqlSkipParts as $part => $toSkip) {
-+            if ($toSkip) {
-+                $query->reset($part);
-+            }
-+        }
-+
-+        return $query;
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php
-index 47d991274b9..4a5802dd44e 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php
-@@ -15,6 +15,10 @@ use Magento\Framework\Search\EntityMetadata;
- use Magento\Framework\Search\RequestInterface;
- 
- /**
-+ * MySQL search aggregation builder.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  * @api
-  */
- class Builder
-@@ -66,6 +70,8 @@ class Builder
-     }
- 
-     /**
-+     * Build aggregations.
-+     *
-      * @param RequestInterface $request
-      * @param Table $documentsTable
-      * @param array $documents
-@@ -77,6 +83,8 @@ class Builder
-     }
- 
-     /**
-+     * Process aggregations.
-+     *
-      * @param RequestInterface $request
-      * @param Table $documentsTable
-      * @param array $documents
-@@ -102,7 +110,7 @@ class Builder
-     }
- 
-     /**
--     * Extract document ids
-+     * Extract document ids.
-      *
-      * @param array $documents
-      * @return array
-@@ -113,7 +121,7 @@ class Builder
-     }
- 
-     /**
--     * Get document ids
-+     * Get document ids.
-      *
-      * @param Table $documentsTable
-      * @return array
-@@ -128,7 +136,7 @@ class Builder
-     }
- 
-     /**
--     * Get Connection
-+     * Get Connection.
-      *
-      * @return AdapterInterface
-      */
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php
-index 90220676e00..4fa2474d225 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php
-@@ -11,12 +11,16 @@ use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
- use Magento\Framework\Search\Request\Dimension;
- 
- /**
-- * Interface \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\BucketInterface
-+ * MySQL search aggregation bucket builder.
-  *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- interface BucketInterface
- {
-     /**
-+     * Build bucket.
-+     *
-      * @param DataProviderInterface $dataProvider
-      * @param Dimension[] $dimensions
-      * @param RequestBucketInterface $bucket
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php
-index cba29ad6287..844cfc9f874 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php
-@@ -5,6 +5,12 @@
-  */
- namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder;
- 
-+/**
-+ * MySQL search aggregation container builder.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class Container
- {
-     /**
-@@ -21,6 +27,8 @@ class Container
-     }
- 
-     /**
-+     * Get bucket by type.
-+     *
-      * @param string $bucketType
-      * @return BucketInterface
-      */
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php
-index 481b2252dbf..46828ab7a8c 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php
-@@ -12,6 +12,12 @@ use Magento\Framework\Search\Dynamic\EntityStorageFactory;
- use Magento\Framework\Search\Request\Aggregation\DynamicBucket;
- use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
- 
-+/**
-+ * MySQL search dynamic aggregation builder.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class Dynamic implements BucketInterface
- {
-     /**
-@@ -37,7 +43,7 @@ class Dynamic implements BucketInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function build(
-         DataProviderInterface $dataProvider,
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php
-index 840f9462218..e4cdb04052e 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php
-@@ -7,6 +7,12 @@ namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder;
- 
- use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
- 
-+/**
-+ * MySQL search aggregation metrics builder.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class Metrics
- {
-     /**
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php
-index 29fc6806b50..aced57c1001 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php
-@@ -14,6 +14,12 @@ use Magento\Framework\Search\Request\Aggregation\RangeBucket;
- use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
- use Magento\Framework\Translate\AdapterInterface;
- 
-+/**
-+ * MySQL search aggregation range builder.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class Range implements BucketInterface
- {
-     const GREATER_THAN = '>=';
-@@ -46,7 +52,7 @@ class Range implements BucketInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function build(
-         DataProviderInterface $dataProvider,
-@@ -70,6 +76,8 @@ class Range implements BucketInterface
-     }
- 
-     /**
-+     * Generate case.
-+     *
-      * @param Select $select
-      * @param AggregationRange[] $ranges
-      * @return Select
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php
-index 78ff7b04fd3..547526be43c 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php
-@@ -9,6 +9,12 @@ use Magento\Framework\DB\Ddl\Table;
- use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface;
- use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
- 
-+/**
-+ * MySQL search aggregation term builder.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class Term implements BucketInterface
- {
-     /**
-@@ -25,7 +31,7 @@ class Term implements BucketInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function build(
-         DataProviderInterface $dataProvider,
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php
-index 6a817bcbddf..565b5eeef33 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php
-@@ -6,6 +6,10 @@
- namespace Magento\Framework\Search\Adapter\Mysql\Aggregation;
- 
- /**
-+ * MySQL search data provider container.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  * @api
-  */
- class DataProviderContainer
-@@ -24,6 +28,8 @@ class DataProviderContainer
-     }
- 
-     /**
-+     * Get data provider by index name.
-+     *
-      * @param string $indexName
-      * @return DataProviderInterface
-      */
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php
-index b18269335bc..c251265c694 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php
-@@ -11,8 +11,10 @@ use Magento\Framework\Search\Request\BucketInterface;
- use Magento\Framework\Search\Request\Dimension;
- 
- /**
-- * Interface \Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface
-+ * MySQL search data provider.
-  *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- interface DataProviderInterface
- {
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
-index ed5640d4227..ba41a535f45 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
-@@ -8,6 +8,12 @@ namespace Magento\Framework\Search\Adapter\Mysql\Aggregation;
- use Magento\Framework\DB\Select;
- use Magento\Framework\Search\Dynamic\IntervalInterface;
- 
-+/**
-+ * MySQL search aggregation interval.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class Interval implements IntervalInterface
- {
-     /**
-@@ -41,7 +47,7 @@ class Interval implements IntervalInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      */
-     public function load($limit, $offset = null, $lower = null, $upper = null)
-@@ -64,7 +70,7 @@ class Interval implements IntervalInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      */
-     public function loadPrevious($data, $index, $lower = null)
-@@ -86,7 +92,7 @@ class Interval implements IntervalInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      */
-     public function loadNext($data, $rightIndex, $upper = null)
-@@ -124,6 +130,8 @@ class Interval implements IntervalInterface
-     }
- 
-     /**
-+     * Convert array values to float.
-+     *
-      * @param array $prices
-      * @return array
-      */
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php
-index 4d255705bf7..756d9edc6fb 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php
-@@ -7,6 +7,9 @@ namespace Magento\Framework\Search\Adapter\Mysql;
- 
- /**
-  * Aggregation Factory
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class AggregationFactory
- {
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
-index 41d6b14b6a4..e56559563c3 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
-@@ -9,7 +9,11 @@ use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\DB\Adapter\AdapterInterface;
- 
- /**
-+ * MySQL search condition manager
-+ *
-  * @api
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class ConditionManager
- {
-@@ -30,6 +34,8 @@ class ConditionManager
-     }
- 
-     /**
-+     * Wrap query with parentheses.
-+     *
-      * @param string $query
-      * @return string
-      */
-@@ -41,6 +47,8 @@ class ConditionManager
-     }
- 
-     /**
-+     * Combine multiple queries.
-+     *
-      * @param string[] $queries
-      * @param string $unionOperator
-      * @return string
-@@ -54,6 +62,8 @@ class ConditionManager
-     }
- 
-     /**
-+     * Generate query condition.
-+     *
-      * @param string $field
-      * @param string $operator
-      * @param mixed $value
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php
-index 3ca0e94852a..4e8854fad35 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php
-@@ -13,7 +13,10 @@ use Magento\Framework\Api\Search\DocumentInterface;
- 
- /**
-  * Document Factory
-+ *
-  * @api
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class DocumentFactory
- {
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php
-index 72495e68a26..0a340e7f76d 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php
-@@ -6,6 +6,11 @@
- 
- namespace Magento\Framework\Search\Adapter\Mysql\Field;
- 
-+/**
-+ * @inheritdoc
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class Field implements FieldInterface
- {
-     /**
-@@ -36,6 +41,8 @@ class Field implements FieldInterface
-     }
- 
-     /**
-+     * Get column.
-+     *
-      * @return string
-      */
-     public function getColumn()
-@@ -44,6 +51,8 @@ class Field implements FieldInterface
-     }
- 
-     /**
-+     * Get attribute ID.
-+     *
-      * @return int|null
-      */
-     public function getAttributeId()
-@@ -52,6 +61,8 @@ class Field implements FieldInterface
-     }
- 
-     /**
-+     * Get type.
-+     *
-      * @return int
-      */
-     public function getType()
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php
-index 9a3c5596574..066d1832aef 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php
-@@ -7,7 +7,11 @@
- namespace Magento\Framework\Search\Adapter\Mysql\Field;
- 
- /**
-+ * MySQL search field factory.
-+ *
-  * @api
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class FieldFactory
- {
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php
-index 5f4e0027a85..7dc74f39709 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php
-@@ -7,8 +7,10 @@
- namespace Magento\Framework\Search\Adapter\Mysql\Field;
- 
- /**
-- * Interface \Magento\Framework\Search\Adapter\Mysql\Field\FieldInterface
-+ * MySQL search field.
-  *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- interface FieldInterface
- {
-@@ -16,19 +18,22 @@ interface FieldInterface
-     const TYPE_FULLTEXT = 2;
- 
-     /**
--     * Get type of index
-+     * Get type of index.
-+     *
-      * @return int
-      */
-     public function getType();
- 
-     /**
--     * Get ID of attribute
-+     * Get ID of attribute.
-+     *
-      * @return int
-      */
-     public function getAttributeId();
- 
-     /**
--     * Get field name
-+     * Get field nam.
-+     *
-      * @return string
-      */
-     public function getColumn();
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Resolver.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Resolver.php
-index 5146177783a..908d6ccc507 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Resolver.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Resolver.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Framework\Search\Adapter\Mysql\Field;
- 
-+/**
-+ * @inheritdoc
-+ */
- class Resolver implements ResolverInterface
- {
-     /**
-@@ -21,7 +24,7 @@ class Resolver implements ResolverInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function resolve(array $fields)
-     {
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/ResolverInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/ResolverInterface.php
-index f275c4f1b1c..5455b91d730 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/ResolverInterface.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/ResolverInterface.php
-@@ -6,13 +6,15 @@
- namespace Magento\Framework\Search\Adapter\Mysql\Field;
- 
- /**
-- * Interface \Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface
-+ * MySQL search field resolver.
-  *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- interface ResolverInterface
- {
-     /**
--     * Resolve field
-+     * Resolve field.
-      *
-      * @param array $fields
-      * @return FieldInterface[]
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder.php
-index 80074ffc5e2..ce02bef244f 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder.php
-@@ -15,6 +15,7 @@ use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
- use Magento\Framework\Search\Request\Query\BoolExpression;
- 
- /**
-+ * @inheritdoc
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Builder implements BuilderInterface
-@@ -58,7 +59,7 @@ class Builder implements BuilderInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function build(RequestFilterInterface $filter, $conditionType)
-     {
-@@ -66,6 +67,8 @@ class Builder implements BuilderInterface
-     }
- 
-     /**
-+     * Process filter.
-+     *
-      * @param RequestFilterInterface $filter
-      * @param bool $isNegation
-      * @return string
-@@ -87,6 +90,8 @@ class Builder implements BuilderInterface
-     }
- 
-     /**
-+     * Process boolean filter.
-+     *
-      * @param RequestFilterInterface|\Magento\Framework\Search\Request\Filter\Bool $filter
-      * @param bool $isNegation
-      * @return string
-@@ -111,6 +116,8 @@ class Builder implements BuilderInterface
-     }
- 
-     /**
-+     * Build filters.
-+     *
-      * @param \Magento\Framework\Search\Request\FilterInterface[] $filters
-      * @param string $unionOperator
-      * @param bool $isNegation
-@@ -127,6 +134,8 @@ class Builder implements BuilderInterface
-     }
- 
-     /**
-+     * Check if condition type is 'negative'.
-+     *
-      * @param string $conditionType
-      * @return bool
-      */
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/FilterInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/FilterInterface.php
-index 787866a2bca..6f8b63955a0 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/FilterInterface.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/FilterInterface.php
-@@ -8,12 +8,16 @@ namespace Magento\Framework\Search\Adapter\Mysql\Filter\Builder;
- use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
- 
- /**
-- * Interface \Magento\Framework\Search\Adapter\Mysql\Filter\Builder\FilterInterface
-+ * MySQL search filter builder.
-  *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- interface FilterInterface
- {
-     /**
-+     * Build filter.
-+     *
-      * @param RequestFilterInterface $filter
-      * @param bool $isNegation
-      * @return string
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Range.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Range.php
-index d4ee9542c59..d14bfdcb548 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Range.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Range.php
-@@ -9,6 +9,12 @@ use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
- use Magento\Framework\Search\Request\Filter\Range as RangeFilterRequest;
- use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
- 
-+/**
-+ * Range filter builder.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class Range implements FilterInterface
- {
-     const CONDITION_PART_GREATER_THAN = '>=';
-@@ -31,7 +37,7 @@ class Range implements FilterInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function buildFilter(
-         RequestFilterInterface $filter,
-@@ -48,6 +54,8 @@ class Range implements FilterInterface
-     }
- 
-     /**
-+     * Get left condition filter part.
-+     *
-      * @param RequestFilterInterface|RangeFilterRequest $filter
-      * @param bool $isNegation
-      * @return string
-@@ -62,6 +70,8 @@ class Range implements FilterInterface
-     }
- 
-     /**
-+     * Get right condition filter part.
-+     *
-      * @param RequestFilterInterface|RangeFilterRequest $filter
-      * @param bool $isNegation
-      * @return string
-@@ -76,6 +86,8 @@ class Range implements FilterInterface
-     }
- 
-     /**
-+     * Get filter part.
-+     *
-      * @param string $field
-      * @param string $operator
-      * @param string $value
-@@ -89,6 +101,8 @@ class Range implements FilterInterface
-     }
- 
-     /**
-+     * Get condition union operator.
-+     *
-      * @param bool $isNegation
-      * @return string
-      */
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Term.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Term.php
-index 3ac755de2b8..c89ef50f3cb 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Term.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Term.php
-@@ -8,6 +8,12 @@ namespace Magento\Framework\Search\Adapter\Mysql\Filter\Builder;
- use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
- use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
- 
-+/**
-+ * Term filter builder.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class Term implements FilterInterface
- {
-     const CONDITION_OPERATOR_EQUALS = '=';
-@@ -30,7 +36,7 @@ class Term implements FilterInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function buildFilter(
-         RequestFilterInterface $filter,
-@@ -46,6 +52,8 @@ class Term implements FilterInterface
-     }
- 
-     /**
-+     * Get condition operator.
-+     *
-      * @param string|array $value
-      * @param bool $isNegation
-      * @return string
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Wildcard.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Wildcard.php
-index 308d1d56430..9a2776ac20b 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Wildcard.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Wildcard.php
-@@ -7,6 +7,12 @@ namespace Magento\Framework\Search\Adapter\Mysql\Filter\Builder;
- 
- use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
- 
-+/**
-+ * Wildcard filter builder.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class Wildcard implements FilterInterface
- {
-     const CONDITION_LIKE = 'LIKE';
-@@ -27,7 +33,7 @@ class Wildcard implements FilterInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function buildFilter(
-         \Magento\Framework\Search\Request\FilterInterface $filter,
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/BuilderInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/BuilderInterface.php
-index ec3b88ad245..3da989333d6 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/BuilderInterface.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/BuilderInterface.php
-@@ -8,12 +8,16 @@ namespace Magento\Framework\Search\Adapter\Mysql\Filter;
- use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
- 
- /**
-- * Interface \Magento\Framework\Search\Adapter\Mysql\Filter\BuilderInterface
-+ * MySQL search filter builder.
-  *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- interface BuilderInterface
- {
-     /**
-+     * Buil filter.
-+     *
-      * @param RequestFilterInterface $filter
-      * @param string $conditionType
-      * @return string
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Preprocessor.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Preprocessor.php
-index a8bb8e255f2..32d134cfe8d 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Preprocessor.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Preprocessor.php
-@@ -8,6 +8,9 @@ namespace Magento\Framework\Search\Adapter\Mysql\Filter;
- use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
- use Magento\Framework\Search\Request\FilterInterface;
- 
-+/**
-+ * @inheritdoc
-+ */
- class Preprocessor implements PreprocessorInterface
- {
-     /**
-@@ -24,7 +27,7 @@ class Preprocessor implements PreprocessorInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function process(FilterInterface $filter, $isNegation, $query)
-     {
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/PreprocessorInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/PreprocessorInterface.php
-index 430b775337b..eb0bbc6f3b5 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/PreprocessorInterface.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/PreprocessorInterface.php
-@@ -8,12 +8,16 @@ namespace Magento\Framework\Search\Adapter\Mysql\Filter;
- use Magento\Framework\Search\Request\FilterInterface;
- 
- /**
-- * Interface \Magento\Framework\Search\Adapter\Mysql\Filter\PreprocessorInterface
-+ * MySQL search filter pre-processor.
-  *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- interface PreprocessorInterface
- {
-     /**
-+     * Process filter.
-+     *
-      * @param FilterInterface $filter
-      * @param bool $isNegation
-      * @param string $query
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/IndexBuilderInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/IndexBuilderInterface.php
-index 73c20406f35..fbd35455c22 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/IndexBuilderInterface.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/IndexBuilderInterface.php
-@@ -10,6 +10,9 @@ use Magento\Framework\Search\RequestInterface;
- 
- /**
-  * Build base Query for Index
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- interface IndexBuilderInterface
- {
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php
-index fb4ff5d298c..e97a6690dbc 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php
-@@ -22,8 +22,11 @@ use Magento\Framework\Search\RequestInterface;
- 
- /**
-  * Mapper class. Maps library request to specific adapter dependent query
-+ *
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  * @api
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class Mapper
- {
-@@ -344,6 +347,8 @@ class Mapper
-     }
- 
-     /**
-+     * Add match queries to select.
-+     *
-      * @param RequestInterface $request
-      * @param QueryContainer $queryContainer
-      * @param ScoreBuilder $scoreBuilder
-@@ -380,6 +385,8 @@ class Mapper
-     }
- 
-     /**
-+     * Get connection.
-+     *
-      * @return false|\Magento\Framework\DB\Adapter\AdapterInterface
-      */
-     private function getConnection()
-@@ -388,6 +395,8 @@ class Mapper
-     }
- 
-     /**
-+     * Add match queries to select.
-+     *
-      * @param RequestInterface $request
-      * @param Select $select
-      * @param IndexBuilderInterface $indexBuilder
-@@ -424,6 +433,8 @@ class Mapper
-     }
- 
-     /**
-+     * Join previous result to select.
-+     *
-      * @param Select $query
-      * @param Table $previousResultTable
-      * @param ScoreBuilder $scoreBuilder
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
-index 8e3758817ad..d4c98cda17e 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Search\Adapter\Mysql\Query\Builder;
- 
- use Magento\Framework\DB\Helper\Mysql\Fulltext;
-@@ -15,13 +17,20 @@ use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface;
- use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
- 
- /**
-+ * MySQL search query match.
-+ *
-  * @api
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class Match implements QueryInterface
- {
-+    /**
-+     * @var string
-+     */
-     const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=%&^';
- 
--    const MINIMAL_CHARACTER_LENGTH = 3;
-+    const MINIMAL_CHARACTER_LENGTH = 1;
- 
-     /**
-      * @var string[]
-@@ -69,7 +78,7 @@ class Match implements QueryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function build(
-         ScoreBuilder $scoreBuilder,
-@@ -113,6 +122,8 @@ class Match implements QueryInterface
-     }
- 
-     /**
-+     * Prepare query value for build function.
-+     *
-      * @param string $queryValue
-      * @param string $conditionType
-      * @return string
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/QueryInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/QueryInterface.php
-index a2446264d48..6796a1f995e 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/QueryInterface.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/QueryInterface.php
-@@ -8,12 +8,16 @@ namespace Magento\Framework\Search\Adapter\Mysql\Query\Builder;
- use Magento\Framework\Search\Adapter\Mysql\ScoreBuilder;
- 
- /**
-- * Interface \Magento\Framework\Search\Adapter\Mysql\Query\Builder\QueryInterface
-+ * MySQL search query builder.
-  *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- interface QueryInterface
- {
-     /**
-+     * Build query.
-+     *
-      * @param \Magento\Framework\Search\Adapter\Mysql\ScoreBuilder $scoreBuilder
-      * @param \Magento\Framework\DB\Select $select
-      * @param \Magento\Framework\Search\Request\QueryInterface $query
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
-index b694cd48a07..6ed3338c040 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
-@@ -10,6 +10,12 @@ use Magento\Framework\Search\Request\QueryInterface;
- 
- // @codeCoverageIgnore
- 
-+/**
-+ * MySQL search query match container.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class MatchContainer
- {
-     /**
-@@ -34,6 +40,8 @@ class MatchContainer
-     }
- 
-     /**
-+     * Get request.
-+     *
-      * @return QueryInterface
-      */
-     public function getRequest()
-@@ -42,6 +50,8 @@ class MatchContainer
-     }
- 
-     /**
-+     * Get condition type.
-+     *
-      * @return string
-      */
-     public function getConditionType()
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainerFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainerFactory.php
-index ba103e060ae..cb10de7bdcb 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainerFactory.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainerFactory.php
-@@ -7,6 +7,9 @@ namespace Magento\Framework\Search\Adapter\Mysql\Query;
- 
- /**
-  * MatchContainer Factory
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class MatchContainerFactory
- {
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php
-index be8507838e4..9161a30f9bc 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php
-@@ -9,6 +9,12 @@ namespace Magento\Framework\Search\Adapter\Mysql\Query;
- use Magento\Framework\DB\Select;
- use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface;
- 
-+/**
-+ * MySQL search query container.
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-+ */
- class QueryContainer
- {
-     const DERIVED_QUERY_PREFIX = 'derived_';
-@@ -32,6 +38,8 @@ class QueryContainer
-     }
- 
-     /**
-+     * Add query to select.
-+     *
-      * @param Select $select
-      * @param RequestQueryInterface $query
-      * @param string $conditionType
-@@ -54,6 +62,8 @@ class QueryContainer
-     }
- 
-     /**
-+     * Get queries.
-+     *
-      * @return MatchContainer[]
-      */
-     public function getMatchQueries()
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainerFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainerFactory.php
-index 70fefec13dd..59ee4bb045b 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainerFactory.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainerFactory.php
-@@ -7,6 +7,9 @@ namespace Magento\Framework\Search\Adapter\Mysql\Query;
- 
- /**
-  * MatchContainer Factory
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class QueryContainerFactory
- {
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php
-index 8a269d8d95b..b41a43883fd 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php
-@@ -7,6 +7,9 @@ namespace Magento\Framework\Search\Adapter\Mysql;
- 
- /**
-  * Response Factory
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class ResponseFactory
- {
-@@ -65,7 +68,8 @@ class ResponseFactory
-             \Magento\Framework\Search\Response\QueryResponse::class,
-             [
-                 'documents' => $documents,
--                'aggregations' => $aggregations
-+                'aggregations' => $aggregations,
-+                'total' => $rawResponse['total']
-             ]
-         );
-     }
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilder.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilder.php
-index 190d3a04ed2..1cc417f891c 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilder.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilder.php
-@@ -9,6 +9,8 @@ namespace Magento\Framework\Search\Adapter\Mysql;
-  * Class for generating sql condition for calculating store manager
-  *
-  * @api
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class ScoreBuilder
- {
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilderFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilderFactory.php
-index 4a7612fcc30..70aa749fd85 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilderFactory.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilderFactory.php
-@@ -7,6 +7,9 @@ namespace Magento\Framework\Search\Adapter\Mysql;
- 
- /**
-  * ScoreBuilder Factory
-+ *
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class ScoreBuilderFactory
- {
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php
-index dcb977bfa2a..60ee2d57060 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php
-@@ -13,7 +13,11 @@ use Magento\Framework\DB\Ddl\Table;
- use Magento\Framework\DB\Select;
- 
- /**
-+ * MySQL search temporary storage.
-+ *
-  * @api
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class TemporaryStorage
- {
-@@ -100,6 +104,8 @@ class TemporaryStorage
-     }
- 
-     /**
-+     * Store select results in temporary table.
-+     *
-      * @param Select $select
-      * @return Table
-      * @throws \Zend_Db_Exception
-@@ -112,6 +118,8 @@ class TemporaryStorage
-     }
- 
-     /**
-+     * Get connection.
-+     *
-      * @return false|AdapterInterface
-      */
-     private function getConnection()
-@@ -120,6 +128,8 @@ class TemporaryStorage
-     }
- 
-     /**
-+     * Create temporary table for search select results.
-+     *
-      * @return Table
-      * @throws \Zend_Db_Exception
-      */
-diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php
-index 4a282faf317..208f6b39b9e 100644
---- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php
-+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php
-@@ -12,6 +12,8 @@ use Magento\Framework\ObjectManagerInterface;
-  *
-  * @codeCoverageIgnore
-  * @api
-+ * @deprecated
-+ * @see \Magento\ElasticSearch
-  */
- class TemporaryStorageFactory
- {
-diff --git a/lib/internal/Magento/Framework/Search/Request.php b/lib/internal/Magento/Framework/Search/Request.php
-index d55b2085e87..60f33380466 100644
---- a/lib/internal/Magento/Framework/Search/Request.php
-+++ b/lib/internal/Magento/Framework/Search/Request.php
-@@ -54,6 +54,11 @@ class Request implements RequestInterface
-      */
-     protected $dimensions;
- 
-+    /**
-+     * @var array
-+     */
-+    private $sort;
-+
-     /**
-      * @param string $name
-      * @param string $indexName
-@@ -62,6 +67,7 @@ class Request implements RequestInterface
-      * @param int|null $size
-      * @param Dimension[] $dimensions
-      * @param RequestBucketInterface[] $buckets
-+     * @param array $sort
-      */
-     public function __construct(
-         $name,
-@@ -70,7 +76,8 @@ class Request implements RequestInterface
-         $from = null,
-         $size = null,
-         array $dimensions = [],
--        array $buckets = []
-+        array $buckets = [],
-+        $sort = []
-     ) {
-         $this->name = $name;
-         $this->index = $indexName;
-@@ -79,10 +86,11 @@ class Request implements RequestInterface
-         $this->size = $size;
-         $this->buckets = $buckets;
-         $this->dimensions = $dimensions;
-+        $this->sort = $sort;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getName()
-     {
-@@ -90,7 +98,7 @@ class Request implements RequestInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getIndex()
-     {
-@@ -98,7 +106,7 @@ class Request implements RequestInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDimensions()
-     {
-@@ -106,7 +114,7 @@ class Request implements RequestInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAggregation()
-     {
-@@ -114,7 +122,7 @@ class Request implements RequestInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getQuery()
-     {
-@@ -122,7 +130,7 @@ class Request implements RequestInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFrom()
-     {
-@@ -130,10 +138,18 @@ class Request implements RequestInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSize()
-     {
-         return $this->size;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getSort()
-+    {
-+        return $this->sort;
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Search/Request/Binder.php b/lib/internal/Magento/Framework/Search/Request/Binder.php
-index 34b5d72005e..9df1ee87eb8 100644
---- a/lib/internal/Magento/Framework/Search/Request/Binder.php
-+++ b/lib/internal/Magento/Framework/Search/Request/Binder.php
-@@ -6,6 +6,8 @@
- namespace Magento\Framework\Search\Request;
- 
- /**
-+ * Data binder for search request.
-+ *
-  * @api
-  */
- class Binder
-@@ -24,6 +26,9 @@ class Binder
-         $data['queries'] = $this->processData($requestData['queries'], $bindData['placeholder']);
-         $data['filters'] = $this->processData($requestData['filters'], $bindData['placeholder']);
-         $data['aggregations'] = $this->processData($requestData['aggregations'], $bindData['placeholder']);
-+        if (isset($bindData['sort']) && isset($requestData['sort'])) {
-+            $data['sort'] = $this->processData($requestData['sort'], $bindData['sort']);
-+        }
- 
-         return $data;
-     }
-@@ -48,6 +53,8 @@ class Binder
-     }
- 
-     /**
-+     * Dimensions process.
-+     *
-      * @param array $data
-      * @param array $bindData
-      * @return array
-diff --git a/lib/internal/Magento/Framework/Search/Request/Builder.php b/lib/internal/Magento/Framework/Search/Request/Builder.php
-index a16b3369cdd..74bc65010a9 100644
---- a/lib/internal/Magento/Framework/Search/Request/Builder.php
-+++ b/lib/internal/Magento/Framework/Search/Request/Builder.php
-@@ -11,7 +11,10 @@ use Magento\Framework\Phrase;
- use Magento\Framework\Search\RequestInterface;
- 
- /**
-+ * Search request builder.
-+ *
-  * @api
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-  */
- class Builder
- {
-@@ -95,6 +98,18 @@ class Builder
-         return $this;
-     }
- 
-+    /**
-+     * Set sort.
-+     *
-+     * @param \Magento\Framework\Api\SortOrder[] $sort
-+     * @return $this
-+     */
-+    public function setSort($sort)
-+    {
-+        $this->data['sort'] = $sort;
-+        return $this;
-+    }
-+
-     /**
-      * Bind dimension data by name
-      *
-@@ -139,6 +154,9 @@ class Builder
-         }
- 
-         $data = $this->binder->bind($data, $this->data);
-+        if (isset($this->data['sort'])) {
-+            $data['sort'] = $this->prepareSorts($this->data['sort']);
-+        }
-         $data = $this->cleaner->clean($data);
- 
-         $this->clear();
-@@ -146,6 +164,25 @@ class Builder
-         return $this->convert($data);
-     }
- 
-+    /**
-+     * Prepare sort data for request.
-+     *
-+     * @param array $sorts
-+     * @return array
-+     */
-+    private function prepareSorts(array $sorts)
-+    {
-+        $sortData = [];
-+        foreach ($sorts as $sortField => $direction) {
-+            $sortData[] = [
-+                'field' => $sortField,
-+                'direction' => $direction,
-+            ];
-+        }
-+
-+        return $sortData;
-+    }
-+
-     /**
-      * Clear data
-      *
-@@ -178,21 +215,27 @@ class Builder
-                 'filters' => $data['filters']
-             ]
-         );
-+        $requestData = [
-+            'name' => $data['query'],
-+            'indexName' => $data['index'],
-+            'from' => $data['from'],
-+            'size' => $data['size'],
-+            'query' => $mapper->getRootQuery(),
-+            'dimensions' => $this->buildDimensions(isset($data['dimensions']) ? $data['dimensions'] : []),
-+            'buckets' => $mapper->getBuckets()
-+        ];
-+        if (isset($data['sort'])) {
-+            $requestData['sort'] = $data['sort'];
-+        }
-         return $this->objectManager->create(
-             \Magento\Framework\Search\Request::class,
--            [
--                'name' => $data['query'],
--                'indexName' => $data['index'],
--                'from' => $data['from'],
--                'size' => $data['size'],
--                'query' => $mapper->getRootQuery(),
--                'dimensions' => $this->buildDimensions(isset($data['dimensions']) ? $data['dimensions'] : []),
--                'buckets' => $mapper->getBuckets()
--            ]
-+            $requestData
-         );
-     }
- 
-     /**
-+     * Build dimensions.
-+     *
-      * @param array $dimensionsData
-      * @return array
-      */
-diff --git a/lib/internal/Magento/Framework/Search/RequestInterface.php b/lib/internal/Magento/Framework/Search/RequestInterface.php
-index 16df80f755c..2de756e754a 100644
---- a/lib/internal/Magento/Framework/Search/RequestInterface.php
-+++ b/lib/internal/Magento/Framework/Search/RequestInterface.php
-@@ -64,4 +64,11 @@ interface RequestInterface
-      * @return int|null
-      */
-     public function getSize();
-+
-+    /**
-+     * Get Sort items
-+     *
-+     * @return array
-+     */
-+    public function getSort();
- }
-diff --git a/lib/internal/Magento/Framework/Search/Response/QueryResponse.php b/lib/internal/Magento/Framework/Search/Response/QueryResponse.php
-index c2328398e53..90c7056ea25 100644
---- a/lib/internal/Magento/Framework/Search/Response/QueryResponse.php
-+++ b/lib/internal/Magento/Framework/Search/Response/QueryResponse.php
-@@ -29,18 +29,26 @@ class QueryResponse implements ResponseInterface
-      */
-     protected $aggregations;
- 
-+    /**
-+     * @var int
-+     */
-+    private $total;
-+
-     /**
-      * @param Document[] $documents
-      * @param AggregationInterface $aggregations
-+     * @param int $total
-      */
--    public function __construct(array $documents, AggregationInterface $aggregations)
-+    public function __construct(array $documents, AggregationInterface $aggregations, int $total = 0)
-     {
-         $this->documents = $documents;
-         $this->aggregations = $aggregations;
-+        $this->total = $total;
-     }
- 
-     /**
--     * Countable: return count of fields in document
-+     * Countable: return count of fields in document.
-+     *
-      * @return int
-      */
-     public function count()
-@@ -59,10 +67,18 @@ class QueryResponse implements ResponseInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAggregations()
-     {
-         return $this->aggregations;
-     }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getTotal(): int
-+    {
-+        return $this->total;
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Search/ResponseInterface.php b/lib/internal/Magento/Framework/Search/ResponseInterface.php
-index 3b895285326..c6c0d0ab59e 100644
---- a/lib/internal/Magento/Framework/Search/ResponseInterface.php
-+++ b/lib/internal/Magento/Framework/Search/ResponseInterface.php
-@@ -16,4 +16,11 @@ interface ResponseInterface extends \IteratorAggregate, \Countable
-      * @return \Magento\Framework\Api\Search\AggregationInterface
-      */
-     public function getAggregations();
-+
-+    /**
-+     * Return total count of items.
-+     *
-+     * @return int
-+     */
-+    public function getTotal(): int;
- }
-diff --git a/lib/internal/Magento/Framework/Search/Search.php b/lib/internal/Magento/Framework/Search/Search.php
-index 16dfc6fdd1d..fe228546b55 100644
---- a/lib/internal/Magento/Framework/Search/Search.php
-+++ b/lib/internal/Magento/Framework/Search/Search.php
-@@ -10,6 +10,9 @@ use Magento\Framework\Api\Search\SearchCriteriaInterface;
- use Magento\Framework\App\ScopeResolverInterface;
- use Magento\Framework\Search\Request\Builder;
- 
-+/**
-+ * Search API for all requests.
-+ */
- class Search implements SearchInterface
- {
-     /**
-@@ -51,7 +54,7 @@ class Search implements SearchInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function search(SearchCriteriaInterface $searchCriteria)
-     {
-@@ -68,6 +71,7 @@ class Search implements SearchInterface
- 
-         $this->requestBuilder->setFrom($searchCriteria->getCurrentPage() * $searchCriteria->getPageSize());
-         $this->requestBuilder->setSize($searchCriteria->getPageSize());
-+        $this->requestBuilder->setSort($searchCriteria->getSortOrders());
-         $request = $this->requestBuilder->create();
-         $searchResponse = $this->searchEngine->search($request);
- 
-diff --git a/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php b/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php
-index 40fcd493861..2314252f460 100644
---- a/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php
-+++ b/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php
-@@ -9,6 +9,9 @@ use Magento\Framework\Api\Search\SearchResultInterface;
- use Magento\Framework\Api\Search\DocumentFactory;
- use Magento\Framework\Api\Search\SearchResultFactory;
- 
-+/**
-+ * Builder for search response.
-+ */
- class SearchResponseBuilder
- {
-     /**
-@@ -35,6 +38,8 @@ class SearchResponseBuilder
-     }
- 
-     /**
-+     * Build search result by search response.
-+     *
-      * @param ResponseInterface $response
-      * @return SearchResultInterface
-      */
-@@ -46,7 +51,7 @@ class SearchResponseBuilder
-         $documents = iterator_to_array($response);
-         $searchResult->setItems($documents);
-         $searchResult->setAggregations($response->getAggregations());
--        $searchResult->setTotalCount(count($documents));
-+        $searchResult->setTotalCount($response->getTotal());
- 
-         return $searchResult;
-     }
-diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
-index 55d26493ca3..fbb56361bfe 100644
---- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
-+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
-@@ -155,15 +155,22 @@ class AdapterTest extends \PHPUnit\Framework\TestCase
-                     'aggregation2' => [2, 4],
-                 ],
-             ],
-+            'total' => 1
-         ];
- 
-         $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->connectionAdapter->expects($this->once())
-+
-+        $this->connectionAdapter->expects($this->exactly(2))
-             ->method('select')
-             ->willReturn($select);
- 
-+        $this->connectionAdapter->expects($this->once())
-+            ->method('fetchOne')
-+            ->with($select)
-+            ->willReturn($selectResult['total']);
-+
-         $table = $this->getMockBuilder(\Magento\Framework\DB\Ddl\Table::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Filter/BuilderTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Filter/BuilderTest.php
-index 2a7aa8561b2..26e6aba1d33 100644
---- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Filter/BuilderTest.php
-+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Filter/BuilderTest.php
-@@ -29,7 +29,7 @@ class BuilderTest extends \PHPUnit\Framework\TestCase
-     private $preprocessor;
- 
-     /**
--     * @var ConditionManager|\PHPUnit_Framework_MockObject_MockObject $conditionManager
-+     * @var ConditionManager|\PHPUnit_Framework_MockObject_MockObject
-      */
-     private $conditionManager;
- 
-diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/ResponseFactoryTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/ResponseFactoryTest.php
-index c0699156dec..3d21064b13d 100644
---- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/ResponseFactoryTest.php
-+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/ResponseFactoryTest.php
-@@ -49,6 +49,7 @@ class ResponseFactoryTest extends \PHPUnit\Framework\TestCase
-                 ['title' => 'twoTitle', 'description' => 'twoDescription'],
-             ],
-             'aggregations' => [],
-+            'total' => 2
-         ];
- 
-         $this->documentFactory->expects($this->at(0))->method('create')
-@@ -61,7 +62,7 @@ class ResponseFactoryTest extends \PHPUnit\Framework\TestCase
-         $this->objectManager->expects($this->once())->method('create')
-             ->with(
-                 $this->equalTo(\Magento\Framework\Search\Response\QueryResponse::class),
--                $this->equalTo(['documents' => ['document1', 'document2'], 'aggregations' => null])
-+                $this->equalTo(['documents' => ['document1', 'document2'], 'aggregations' => null, 'total' => 2])
-             )
-             ->will($this->returnValue('QueryResponseObject'));
- 
-diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Response/QueryResponseTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Response/QueryResponseTest.php
-index a60a280cb60..a994559f28f 100644
---- a/lib/internal/Magento/Framework/Search/Test/Unit/Response/QueryResponseTest.php
-+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Response/QueryResponseTest.php
-@@ -46,6 +46,7 @@ class QueryResponseTest extends \PHPUnit\Framework\TestCase
-             [
-                 'documents' => $this->documents,
-                 'aggregations' => $this->aggregations,
-+                'total' => 1
-             ]
-         );
-     }
-diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/SearchResponseBuilderTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/SearchResponseBuilderTest.php
-index a0b11959a42..9ffafae9622 100644
---- a/lib/internal/Magento/Framework/Search/Test/Unit/SearchResponseBuilderTest.php
-+++ b/lib/internal/Magento/Framework/Search/Test/Unit/SearchResponseBuilderTest.php
-@@ -67,7 +67,7 @@ class SearchResponseBuilderTest extends \PHPUnit\Framework\TestCase
- 
-         /** @var QueryResponse|\PHPUnit_Framework_MockObject_MockObject $response */
-         $response = $this->getMockBuilder(\Magento\Framework\Search\Response\QueryResponse::class)
--            ->setMethods(['getIterator', 'getAggregations'])
-+            ->setMethods(['getIterator', 'getAggregations', 'getTotal'])
-             ->disableOriginalConstructor()
-             ->getMockForAbstractClass();
-         $response->expects($this->any())
-@@ -76,6 +76,9 @@ class SearchResponseBuilderTest extends \PHPUnit\Framework\TestCase
-         $response->expects($this->once())
-             ->method('getAggregations')
-             ->willReturn($aggregations);
-+        $response->expects($this->any())
-+            ->method('getTotal')
-+            ->willReturn(1);
- 
-         $result = $this->model->build($response);
- 
-diff --git a/lib/internal/Magento/Framework/Search/etc/requests.xsd b/lib/internal/Magento/Framework/Search/etc/requests.xsd
-index a49124748b2..7d277382b69 100644
---- a/lib/internal/Magento/Framework/Search/etc/requests.xsd
-+++ b/lib/internal/Magento/Framework/Search/etc/requests.xsd
-@@ -28,8 +28,8 @@
-           <xs:field xpath="@name" />
-         </xs:key>
-       </xs:element>
--      <xs:element type="xs:string" name="from" />
--      <xs:element type="xs:string" name="size" />
-+      <xs:element type="xs:string" name="from" minOccurs="0" />
-+      <xs:element type="xs:string" name="size" minOccurs="0" />
-     </xs:sequence>
-     <xs:attribute type="xs:string" name="query" use="required" />
-     <xs:attribute type="xs:string" name="index" use="required" />
-diff --git a/lib/internal/Magento/Framework/Serialize/README.md b/lib/internal/Magento/Framework/Serialize/README.md
-index 5af8fb7f71b..d900f89208a 100644
---- a/lib/internal/Magento/Framework/Serialize/README.md
-+++ b/lib/internal/Magento/Framework/Serialize/README.md
-@@ -3,6 +3,7 @@
- **Serialize** library provides interface *SerializerInterface* and multiple implementations:
- 
-  * *Json* - default implementation. Uses PHP native json_encode/json_decode functions;
-+ * *JsonHexTag* - default implementation. Uses PHP native json_encode/json_decode functions with `JSON_HEX_TAG` option enabled;
-  * *Serialize* - less secure than *Json*, but gives higher performance on big arrays. Uses PHP native serialize/unserialize functions, does not unserialize objects on PHP 7.
-  
- Using *Serialize* implementation directly is discouraged, always use *SerializerInterface*, using *Serialize* implementation may lead to security vulnerabilities.
-\ No newline at end of file
-diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/FormData.php b/lib/internal/Magento/Framework/Serialize/Serializer/FormData.php
-new file mode 100644
-index 00000000000..a945822d92f
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Serialize/Serializer/FormData.php
-@@ -0,0 +1,53 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Serialize\Serializer;
-+
-+/**
-+ * Class for processing of serialized form data.
-+ */
-+class FormData
-+{
-+    /**
-+     * @var Json
-+     */
-+    private $serializer;
-+
-+    /**
-+     * @param Json $serializer
-+     */
-+    public function __construct(Json $serializer)
-+    {
-+        $this->serializer = $serializer;
-+    }
-+
-+    /**
-+     * Provides form data from the serialized data.
-+     *
-+     * @param string $serializedData
-+     * @return array
-+     * @throws \InvalidArgumentException
-+     */
-+    public function unserialize(string $serializedData): array
-+    {
-+        $encodedFields = $this->serializer->unserialize($serializedData);
-+
-+        if (!is_array($encodedFields)) {
-+            throw new \InvalidArgumentException('Unable to unserialize value.');
-+        }
-+
-+        $formData = [];
-+        foreach ($encodedFields as $item) {
-+            $decodedFieldData = [];
-+            parse_str($item, $decodedFieldData);
-+            $formData = array_replace_recursive($formData, $decodedFieldData);
-+        }
-+
-+        return $formData;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
-index e352d0c2d71..7ce9756ff24 100644
---- a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
-+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
-@@ -16,27 +16,27 @@ use Magento\Framework\Serialize\SerializerInterface;
- class Json implements SerializerInterface
- {
-     /**
--     * {@inheritDoc}
-+     * @inheritDoc
-      * @since 100.2.0
-      */
-     public function serialize($data)
-     {
-         $result = json_encode($data);
-         if (false === $result) {
--            throw new \InvalidArgumentException('Unable to serialize value.');
-+            throw new \InvalidArgumentException("Unable to serialize value. Error: " . json_last_error_msg());
-         }
-         return $result;
-     }
- 
-     /**
--     * {@inheritDoc}
-+     * @inheritDoc
-      * @since 100.2.0
-      */
-     public function unserialize($string)
-     {
-         $result = json_decode($string, true);
-         if (json_last_error() !== JSON_ERROR_NONE) {
--            throw new \InvalidArgumentException('Unable to unserialize value.');
-+            throw new \InvalidArgumentException("Unable to unserialize value. Error: " . json_last_error_msg());
-         }
-         return $result;
-     }
-diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php b/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php
-new file mode 100644
-index 00000000000..4a5406ff3fd
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php
-@@ -0,0 +1,35 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Serialize\Serializer;
-+
-+use Magento\Framework\Serialize\SerializerInterface;
-+
-+/**
-+ * Serialize data to JSON with the JSON_HEX_TAG option enabled
-+ * (All < and > are converted to \u003C and \u003E),
-+ * unserialize JSON encoded data
-+ *
-+ * @api
-+ * @since 100.2.0
-+ */
-+class JsonHexTag extends Json implements SerializerInterface
-+{
-+    /**
-+     * @inheritDoc
-+     * @since 100.2.0
-+     */
-+    public function serialize($data): string
-+    {
-+        $result = json_encode($data, JSON_HEX_TAG);
-+        if (false === $result) {
-+            throw new \InvalidArgumentException('Unable to serialize value.');
-+        }
-+        return $result;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonConverterTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonConverterTest.php
-new file mode 100644
-index 00000000000..a3b914979a4
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonConverterTest.php
-@@ -0,0 +1,32 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Framework\Serialize\Test\Unit\Serializer;
-+
-+/**
-+ * Class JsonConverterTest
-+ */
-+class JsonConverterTest extends \PHPUnit\Framework\TestCase
-+{
-+    public function testConvert()
-+    {
-+        $data = [
-+            'key' => 'value'
-+        ];
-+
-+        $this->assertEquals(json_encode($data), \Magento\Framework\Serialize\JsonConverter::convert($data));
-+    }
-+
-+    /**
-+     * @expectedException \InvalidArgumentException
-+     * @expectedExceptionMessage Unable to serialize value.
-+     */
-+    public function testConvertWithException()
-+    {
-+        //verify that exception will be thrown with invalid UTF8 sequence
-+        \Magento\Framework\Serialize\JsonConverter::convert("\xB1\x31");
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
-new file mode 100644
-index 00000000000..c867dced0fc
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
-@@ -0,0 +1,118 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Serialize\Test\Unit\Serializer;
-+
-+use Magento\Framework\DataObject;
-+use Magento\Framework\Serialize\Serializer\JsonHexTag;
-+
-+class JsonHexTagTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Framework\Serialize\Serializer\Json
-+     */
-+    private $json;
-+    
-+    protected function setUp()
-+    {
-+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $this->json = $objectManager->getObject(JsonHexTag::class);
-+    }
-+
-+    /**
-+     * @param string|int|float|bool|array|null $value
-+     * @param string $expected
-+     * @dataProvider serializeDataProvider
-+     */
-+    public function testSerialize($value, $expected)
-+    {
-+        $this->assertEquals(
-+            $expected,
-+            $this->json->serialize($value)
-+        );
-+    }
-+
-+    public function serializeDataProvider()
-+    {
-+        $dataObject = new DataObject(['something']);
-+        return [
-+            ['', '""'],
-+            ['string', '"string"'],
-+            [null, 'null'],
-+            [false, 'false'],
-+            [['a' => 'b', 'd' => 123], '{"a":"b","d":123}'],
-+            [123, '123'],
-+            [10.56, '10.56'],
-+            [$dataObject, '{}'],
-+            ['< >', '"\u003C \u003E"'],
-+        ];
-+    }
-+
-+    /**
-+     * @param string $value
-+     * @param string|int|float|bool|array|null $expected
-+     * @dataProvider unserializeDataProvider
-+     */
-+    public function testUnserialize($value, $expected)
-+    {
-+        $this->assertEquals(
-+            $expected,
-+            $this->json->unserialize($value)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function unserializeDataProvider(): array
-+    {
-+        return [
-+            ['""', ''],
-+            ['"string"', 'string'],
-+            ['null', null],
-+            ['false', false],
-+            ['{"a":"b","d":123}', ['a' => 'b', 'd' => 123]],
-+            ['123', 123],
-+            ['10.56', 10.56],
-+            ['{}', []],
-+            ['"\u003C \u003E"', '< >'],
-+        ];
-+    }
-+
-+    /**
-+     * @expectedException \InvalidArgumentException
-+     * @expectedExceptionMessage Unable to serialize value.
-+     */
-+    public function testSerializeException()
-+    {
-+        $this->json->serialize(STDOUT);
-+    }
-+
-+    /**
-+     * @expectedException \InvalidArgumentException
-+     * @expectedExceptionMessage Unable to unserialize value.
-+     * @dataProvider unserializeExceptionDataProvider
-+     */
-+    public function testUnserializeException($value)
-+    {
-+        $this->json->unserialize($value);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function unserializeExceptionDataProvider(): array
-+    {
-+        return [
-+            [''],
-+            [false],
-+            [null],
-+            ['{']
-+        ];
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
-index 5a4ed1700da..70b666f8a4e 100644
---- a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
-+++ b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
-@@ -143,7 +143,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     /**
-      * Deployment config
-      *
--     * @var DeploymentConfig $deploymentConfig
-+     * @var DeploymentConfig
-      */
-     private $deploymentConfig;
- 
-@@ -173,7 +173,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getLogLevel()
-     {
-@@ -181,7 +181,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getHost()
-     {
-@@ -189,7 +189,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getPort()
-     {
-@@ -197,7 +197,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDatabase()
-     {
-@@ -205,7 +205,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getPassword()
-     {
-@@ -213,7 +213,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getTimeout()
-     {
-@@ -221,7 +221,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getPersistentIdentifier()
-     {
-@@ -229,7 +229,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCompressionThreshold()
-     {
-@@ -237,7 +237,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getCompressionLibrary()
-     {
-@@ -245,7 +245,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getMaxConcurrency()
-     {
-@@ -253,7 +253,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getMaxLifetime()
-     {
-@@ -261,7 +261,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getMinLifetime()
-     {
-@@ -269,7 +269,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDisableLocking()
-     {
-@@ -277,7 +277,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getBotLifetime()
-     {
-@@ -285,7 +285,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getBotFirstLifetime()
-     {
-@@ -293,7 +293,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFirstLifetime()
-     {
-@@ -301,7 +301,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getBreakAfter()
-     {
-@@ -309,7 +309,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getLifetime()
-     {
-@@ -320,7 +320,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSentinelServers()
-     {
-@@ -328,7 +328,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSentinelMaster()
-     {
-@@ -336,7 +336,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSentinelVerifyMaster()
-     {
-@@ -344,7 +344,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getSentinelConnectRetries()
-     {
-@@ -352,7 +352,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFailAfter()
-     {
-diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
-index 662173ad4a0..c7d201676b2 100644
---- a/lib/internal/Magento/Framework/Session/SessionManager.php
-+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
-@@ -12,6 +12,7 @@ use Magento\Framework\Session\Config\ConfigInterface;
- /**
-  * Session Manager
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  */
- class SessionManager implements SessionManagerInterface
- {
-@@ -36,7 +37,7 @@ class SessionManager implements SessionManagerInterface
-     /**
-      * Validator
-      *
--     * @var \Magento\Framework\Session\ValidatorInterface
-+     * @var ValidatorInterface
-      */
-     protected $validator;
- 
-@@ -50,28 +51,28 @@ class SessionManager implements SessionManagerInterface
-     /**
-      * SID resolver
-      *
--     * @var \Magento\Framework\Session\SidResolverInterface
-+     * @var SidResolverInterface
-      */
-     protected $sidResolver;
- 
-     /**
-      * Session config
-      *
--     * @var \Magento\Framework\Session\Config\ConfigInterface
-+     * @var Config\ConfigInterface
-      */
-     protected $sessionConfig;
- 
-     /**
-      * Save handler
-      *
--     * @var \Magento\Framework\Session\SaveHandlerInterface
-+     * @var SaveHandlerInterface
-      */
-     protected $saveHandler;
- 
-     /**
-      * Storage
-      *
--     * @var \Magento\Framework\Session\StorageInterface
-+     * @var StorageInterface
-      */
-     protected $storage;
- 
-@@ -92,6 +93,11 @@ class SessionManager implements SessionManagerInterface
-      */
-     private $appState;
- 
-+    /**
-+     * @var SessionStartChecker
-+     */
-+    private $sessionStartChecker;
-+
-     /**
-      * @param \Magento\Framework\App\Request\Http $request
-      * @param SidResolverInterface $sidResolver
-@@ -102,7 +108,10 @@ class SessionManager implements SessionManagerInterface
-      * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
-      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
-      * @param \Magento\Framework\App\State $appState
-+     * @param SessionStartChecker|null $sessionStartChecker
-      * @throws \Magento\Framework\Exception\SessionException
-+     *
-+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-         \Magento\Framework\App\Request\Http $request,
-@@ -113,7 +122,8 @@ class SessionManager implements SessionManagerInterface
-         StorageInterface $storage,
-         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
-         \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
--        \Magento\Framework\App\State $appState
-+        \Magento\Framework\App\State $appState,
-+        SessionStartChecker $sessionStartChecker = null
-     ) {
-         $this->request = $request;
-         $this->sidResolver = $sidResolver;
-@@ -124,11 +134,15 @@ class SessionManager implements SessionManagerInterface
-         $this->cookieManager = $cookieManager;
-         $this->cookieMetadataFactory = $cookieMetadataFactory;
-         $this->appState = $appState;
-+        $this->sessionStartChecker = $sessionStartChecker ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-+            SessionStartChecker::class
-+        );
-         $this->start();
-     }
- 
-     /**
--     * This method needs to support sessions with APC enabled
-+     * This method needs to support sessions with APC enabled.
-+     *
-      * @return void
-      */
-     public function writeClose()
-@@ -163,36 +177,49 @@ class SessionManager implements SessionManagerInterface
-      */
-     public function start()
-     {
--        if (!$this->isSessionExists()) {
--            \Magento\Framework\Profiler::start('session_start');
--
--            try {
--                $this->appState->getAreaCode();
--            } catch (\Magento\Framework\Exception\LocalizedException $e) {
--                throw new \Magento\Framework\Exception\SessionException(
--                    new \Magento\Framework\Phrase(
--                        'Area code not set: Area code must be set before starting a session.'
--                    ),
--                    $e
--                );
--            }
-+        if ($this->sessionStartChecker->check()) {
-+            if (!$this->isSessionExists()) {
-+                \Magento\Framework\Profiler::start('session_start');
-+
-+                try {
-+                    $this->appState->getAreaCode();
-+                } catch (\Magento\Framework\Exception\LocalizedException $e) {
-+                    throw new \Magento\Framework\Exception\SessionException(
-+                        new \Magento\Framework\Phrase(
-+                            'Area code not set: Area code must be set before starting a session.'
-+                        ),
-+                        $e
-+                    );
-+                }
- 
--            // Need to apply the config options so they can be ready by session_start
--            $this->initIniOptions();
--            $this->registerSaveHandler();
--            $sid = $this->sidResolver->getSid($this);
--            // potential custom logic for session id (ex. switching between hosts)
--            $this->setSessionId($sid);
--            session_start();
--            $this->validator->validate($this);
--            $this->renewCookie($sid);
-+                // Need to apply the config options so they can be ready by session_start
-+                $this->initIniOptions();
-+                $this->registerSaveHandler();
-+                if (isset($_SESSION['new_session_id'])) {
-+                    // Not fully expired yet. Could be lost cookie by unstable network.
-+                    session_commit();
-+                    session_id($_SESSION['new_session_id']);
-+                }
-+                $sid = $this->sidResolver->getSid($this);
-+                // potential custom logic for session id (ex. switching between hosts)
-+                $this->setSessionId($sid);
-+                session_start();
-+                if (isset($_SESSION['destroyed'])
-+                    && $_SESSION['destroyed'] < time() - $this->sessionConfig->getCookieLifetime()
-+                ) {
-+                    $this->destroy(['clear_storage' => true]);
-+                }
- 
--            register_shutdown_function([$this, 'writeClose']);
-+                $this->validator->validate($this);
-+                $this->renewCookie($sid);
- 
--            $this->_addHost();
--            \Magento\Framework\Profiler::stop('session_start');
-+                register_shutdown_function([$this, 'writeClose']);
-+
-+                $this->_addHost();
-+                \Magento\Framework\Profiler::stop('session_start');
-+            }
-+            $this->storage->init(isset($_SESSION) ? $_SESSION : []);
-         }
--        $this->storage->init(isset($_SESSION) ? $_SESSION : []);
-         return $this;
-     }
- 
-@@ -498,7 +525,33 @@ class SessionManager implements SessionManagerInterface
-             return $this;
-         }
- 
--        $this->isSessionExists() ? session_regenerate_id(true) : session_start();
-+        if ($this->isSessionExists()) {
-+            // Regenerate the session
-+            session_regenerate_id();
-+            $newSessionId = session_id();
-+            $_SESSION['new_session_id'] = $newSessionId;
-+
-+            // Set destroy timestamp
-+            $_SESSION['destroyed'] = time();
-+
-+            // Write and close current session;
-+            session_commit();
-+
-+            // Called after destroy()
-+            $oldSession = $_SESSION;
-+
-+            // Start session with new session ID
-+            session_id($newSessionId);
-+            session_start();
-+            $_SESSION = $oldSession;
-+
-+            // New session does not need them
-+            unset($_SESSION['destroyed']);
-+            unset($_SESSION['new_session_id']);
-+        } else {
-+            session_start();
-+        }
-+
-         $this->storage->init(isset($_SESSION) ? $_SESSION : []);
- 
-         if ($this->sessionConfig->getUseCookies()) {
-diff --git a/lib/internal/Magento/Framework/Session/SessionStartChecker.php b/lib/internal/Magento/Framework/Session/SessionStartChecker.php
-new file mode 100644
-index 00000000000..9cc32268d57
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Session/SessionStartChecker.php
-@@ -0,0 +1,38 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Session;
-+
-+/**
-+ * Class to check if session can be started or not.
-+ */
-+class SessionStartChecker
-+{
-+    /**
-+     * @var bool
-+     */
-+    private $checkSapi;
-+
-+    /**
-+     * @param bool $checkSapi
-+     */
-+    public function __construct(bool $checkSapi = true)
-+    {
-+        $this->checkSapi = $checkSapi;
-+    }
-+
-+    /**
-+     * Can session be started or not.
-+     *
-+     * @return bool
-+     */
-+    public function check() : bool
-+    {
-+        return !($this->checkSapi && PHP_SAPI === 'cli');
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Session/SidResolver.php b/lib/internal/Magento/Framework/Session/SidResolver.php
-index feb4877028d..1208aeb31ea 100644
---- a/lib/internal/Magento/Framework/Session/SidResolver.php
-+++ b/lib/internal/Magento/Framework/Session/SidResolver.php
-@@ -9,6 +9,9 @@ namespace Magento\Framework\Session;
- 
- use Magento\Framework\App\State;
- 
-+/**
-+ * Class SidResolver
-+ */
- class SidResolver implements SidResolverInterface
- {
-     /**
-@@ -86,8 +89,12 @@ class SidResolver implements SidResolverInterface
-     }
- 
-     /**
-+     * Get Sid
-+     *
-      * @param SessionManagerInterface $session
-+     *
-      * @return string|null
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getSid(SessionManagerInterface $session)
-     {
-@@ -169,7 +176,7 @@ class SidResolver implements SidResolverInterface
-         if ($this->_useSessionInUrl === null) {
-             //Using config value by default, can be overridden by using the
-             //setter.
--            $this->_useSessionInUrl = (bool)$this->scopeConfig->getValue(
-+            $this->_useSessionInUrl = $this->scopeConfig->isSetFlag(
-                 self::XML_PATH_USE_FRONTEND_SID,
-                 $this->_scopeType
-             );
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/Converter.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/Converter.php
-index ed3f6326cd6..149ad996a5f 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/Converter.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/Converter.php
-@@ -5,6 +5,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Setup\Declaration\Schema\Config;
- 
- /**
-@@ -23,7 +25,7 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
-      * @param  \DOMDocument $source
-      * @return array
-      */
--    public function convert($source)
-+    public function convert($source): array
-     {
-         $output = $this->recursiveConvert($this->getTablesNode($source));
-         return $output;
-@@ -37,7 +39,7 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
-      * @param  \DOMDocument $element
-      * @return \DOMNodeList
-      */
--    private function getTablesNode(\DOMDocument $element)
-+    private function getTablesNode(\DOMDocument $element): \DOMNodeList
-     {
-         return $element->getElementsByTagName('table');
-     }
-@@ -48,21 +50,21 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
-      * @param \Traversable $source
-      * @return array
-      */
--    private function recursiveConvert(\Traversable $source)
-+    private function recursiveConvert(\Traversable $source): array
-     {
-         $output = [];
-         foreach ($source as $element) {
-             if ($element instanceof \DOMElement) {
--                $key = $element->getAttribute('name');
-+                $key = $this->getIdAttributeValue($element);
- 
-                 if ($element->hasChildNodes()) {
-                     $output[$element->tagName][$key] =
-                         array_replace(
-                             $this->recursiveConvert($element->childNodes),
--                            $this->interpretateAttributes($element)
-+                            $this->interpretAttributes($element)
-                         );
--                } else if ($this->hasAttributesExceptName($element)) {
--                    $output[$element->tagName][$key] = $this->interpretateAttributes($element);
-+                } elseif ($this->hasAttributesExceptIdAttribute($element)) {
-+                    $output[$element->tagName][$key] = $this->interpretAttributes($element);
-                 } else {
-                     $output[$element->tagName][$key] = $key;
-                 }
-@@ -73,25 +75,48 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
-     }
- 
-     /**
--     * Check whether we have any attributes except name XSI:TYPE is in another namespace.
--     * Note: name is mandatory attribute.
-+     * Provide the value of the ID attribute for each element.
-+     *
-+     * @param \DOMElement $element
-+     * @return string
-+     */
-+    private function getIdAttributeValue(\DOMElement $element): string
-+    {
-+        $idAttributeValue = '';
-+        switch ($element->tagName) {
-+            case ('table'):
-+            case ('column'):
-+                $idAttributeValue = $element->getAttribute('name');
-+                break;
-+            case ('index'):
-+            case ('constraint'):
-+                $idAttributeValue = $element->getAttribute('referenceId');
-+                break;
-+        }
-+
-+        return $idAttributeValue;
-+    }
-+
-+    /**
-+     * Check whether we have any attributes except ID attribute.
-      *
-      * @param  \DOMElement $element
-      * @return bool
-      */
--    private function hasAttributesExceptName(\DOMElement $element)
-+    private function hasAttributesExceptIdAttribute(\DOMElement $element)
-     {
-         return $element->hasAttribute('xsi:type') || $element->attributes->length >= 2;
-     }
- 
-     /**
-      * Mix attributes that comes from XML schema with default ones.
-+     *
-      * So if you will not have some attribute in schema - it will be taken from default one.
-      *
-      * @param  \DOMElement $domElement
--     * @return mixed
-+     * @return array
-      */
--    private function interpretateAttributes(\DOMElement $domElement)
-+    private function interpretAttributes(\DOMElement $domElement): array
-     {
-         $attributes = $this->getAttributes($domElement);
-         $xsiType = $domElement->getAttribute('xsi:type');
-@@ -109,7 +134,7 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
-      * @param  \DOMElement $element
-      * @return array
-      */
--    private function getAttributes(\DOMElement $element)
-+    private function getAttributes(\DOMElement $element): array
-     {
-         $attributes = [];
-         $attributeNodes = $element->attributes;
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/SchemaLocator.php
-deleted file mode 100644
-index 5319c469f04..00000000000
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/SchemaLocator.php
-+++ /dev/null
-@@ -1,60 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--namespace Magento\Framework\Setup\Declaration\Schema\Config;
--
--/**
-- * This is system class that provides .xsd file for validation XML schema.
-- */
--class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
--{
--    /**
--     * Path to corresponding XSD file with validation rules for merged config.
--     *
--     * @var string
--     */
--    protected $_schema = null;
--
--    /**
--     * Path to corresponding XSD file with validation rules for separate config files.
--     *
--     * @var string
--     */
--    protected $_perFileSchema = null;
--
--    /**
--     * Constructor.
--     *
--     * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
--     * @param string                                    $schemaUrn
--     */
--    public function __construct(
--        \Magento\Framework\Config\Dom\UrnResolver $urnResolver,
--        $schemaUrn = 'urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd'
--    ) {
--        $this->_schema = $urnResolver->getRealPath($schemaUrn);
--        $this->_perFileSchema = $this->_schema;
--    }
--
--    /**
--     * Get path to merged config schema.
--     *
--     * @return string|null
--     */
--    public function getSchema()
--    {
--        return $this->_schema;
--    }
--
--    /**
--     * Get path to pre file validation schema.
--     *
--     * @return string|null
--     */
--    public function getPerFileSchema()
--    {
--        return $this->_perFileSchema;
--    }
--}
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php
-index 07ba03d0331..1d08c5bea4e 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php
-@@ -76,8 +76,8 @@ class Integer implements DbDefinitionProcessorInterface
-     }
- 
-     /**
--     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer $column
-      * @inheritdoc
-+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer $column
-      */
-     public function toDefinition(ElementInterface $column)
-     {
-@@ -89,7 +89,7 @@ class Integer implements DbDefinitionProcessorInterface
-             $this->unsigned->toDefinition($column),
-             $this->nullable->toDefinition($column),
-             $column->getDefault() !== null ?
--                sprintf('DEFAULT %s', (string) intval($column->getDefault())) : '',
-+                sprintf('DEFAULT %s', (string) (int)$column->getDefault()) : '',
-             $this->identity->toDefinition($column),
-             $this->comment->toDefinition($column)
-         );
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php
-index 1a9b42355f5..6d11542bb49 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php
-@@ -43,7 +43,6 @@ class ForeignKey implements DbDefinitionProcessorInterface
-     }
- 
-     /**
--     * @param Reference $foreignKey
-      * @inheritdoc
-      */
-     public function toDefinition(ElementInterface $foreignKey)
-@@ -95,7 +94,7 @@ class ForeignKey implements DbDefinitionProcessorInterface
-                     'column' => $match[2],
-                     'referenceTable' => $match[5],
-                     'referenceColumn' => $match[6],
--                    'onDelete' => isset($match[7]) ? $match[8] : ''
-+                    'onDelete' => isset($match[7]) ? $match[8] : 'NO ACTION'
-                 ];
-             }
-         }
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregator.php
-index 2003ff18900..6efece3c98f 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregator.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregator.php
-@@ -36,7 +36,7 @@ class StatementAggregator
-         }
- 
-         /**
--         * If we add trigger after some specific statement, than we say that statement is final
-+         * If we add trigger after some specific statement, then we say that statement is final
-          * and can`t be updated anymore. Otherwise trigger can fail.
-          *
-          * Example: while migrating data from one column to another and another column should be removed,
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
-index 830fcb293a8..4c65d8a70be 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
-@@ -3,11 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Setup\Declaration\Schema\Declaration;
- 
--use Magento\Framework\DB\Adapter\AdapterInterface;
- use Magento\Framework\Phrase;
--use Magento\Framework\Setup\Declaration\Schema\TableNameResolver;
-+use Magento\Framework\Setup\Declaration\Schema\Declaration\TableElement\ElementNameResolver;
- use Magento\Framework\Stdlib\BooleanUtils;
- use Magento\Framework\Setup\Exception;
- use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
-@@ -19,8 +20,7 @@ use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
- use Magento\Framework\Setup\Declaration\Schema\Sharding;
- 
- /**
-- * This type of builder is responsible for converting ENTIRE data, that comes from XML
-- * into DTO`s format, with aggregation root: Schema.
-+ * This type of builder is responsible for converting ENTIRE data, that comes from XML into DTO`s format.
-  *
-  * Note: SchemaBuilder can not be used for one structural element, like column or constraint
-  * because it should have references to other DTO objects.
-@@ -69,9 +69,9 @@ class SchemaBuilder
-     private $resourceConnection;
- 
-     /**
--     * @var TableNameResolver
-+     * @var ElementNameResolver
-      */
--    private $tableNameResolver;
-+    private $elementNameResolver;
- 
-     /**
-      * SchemaBuilder constructor.
-@@ -81,8 +81,7 @@ class SchemaBuilder
-      * @param    Sharding $sharding
-      * @param    ValidationComposite $validationComposite
-      * @param \Magento\Framework\App\ResourceConnection $resourceConnection
--     * @param TableNameResolver $tableNameResolver
--     * @internal param array $tablesData
-+     * @param ElementNameResolver $elementNameResolver
-      */
-     public function __construct(
-         ElementFactory $elementFactory,
-@@ -90,18 +89,19 @@ class SchemaBuilder
-         Sharding $sharding,
-         ValidationComposite $validationComposite,
-         \Magento\Framework\App\ResourceConnection $resourceConnection,
--        TableNameResolver $tableNameResolver
-+        ElementNameResolver $elementNameResolver
-     ) {
-         $this->sharding = $sharding;
-         $this->elementFactory = $elementFactory;
-         $this->booleanUtils = $booleanUtils;
-         $this->validationComposite = $validationComposite;
-         $this->resourceConnection = $resourceConnection;
--        $this->tableNameResolver = $tableNameResolver;
-+        $this->elementNameResolver = $elementNameResolver;
-     }
- 
-     /**
-      * Add tables data to builder.
-+     *
-      * Tables data holds tables information: columns, constraints, indexes, attributes.
-      *
-      * @param  array $tablesData
-@@ -140,7 +140,7 @@ class SchemaBuilder
-      * @throws Exception
-      * @return Schema
-      */
--    public function build(Schema $schema)
-+    public function build(Schema $schema): Schema
-     {
-         foreach ($this->tablesData as $tableData) {
-             if (!$schema->getTableByName($tableData['name'])) {
-@@ -161,7 +161,7 @@ class SchemaBuilder
-      * @param array $tableData
-      * @return string
-      */
--    private function getStructuralElementResource(array $tableData)
-+    private function getStructuralElementResource(array $tableData): string
-     {
-         return isset($tableData['resource']) && $this->sharding->canUseResource($tableData['resource']) ?
-             $tableData['resource'] : 'default';
-@@ -173,7 +173,7 @@ class SchemaBuilder
-      * @param  array $structuralElementData
-      * @return bool
-      */
--    private function isDisabled($structuralElementData)
-+    private function isDisabled(array $structuralElementData): bool
-     {
-         return isset($structuralElementData['disabled']) &&
-             $this->booleanUtils->toBoolean($structuralElementData['disabled']);
-@@ -181,14 +181,15 @@ class SchemaBuilder
- 
-     /**
-      * Instantiate column DTO objects from array.
-+     *
-      * If column was renamed new key will be associated to it.
-      *
--     * @param  array  $tableData
--     * @param  string $resource
--     * @param  Table  $table
-+     * @param array $tableData
-+     * @param string $resource
-+     * @param Table $table
-      * @return array
-      */
--    private function processColumns(array $tableData, $resource, Table $table)
-+    private function processColumns(array $tableData, string $resource, Table $table): array
-     {
-         $columns = [];
- 
-@@ -208,12 +209,12 @@ class SchemaBuilder
-     /**
-      * Process generic data that is support by all 3 child types: columns, constraints, indexes.
-      *
--     * @param  array    $elementData
--     * @param  Table    $table
--     * @param  $resource
-+     * @param array $elementData
-+     * @param string $resource
-+     * @param Table $table
-      * @return array
-      */
--    private function processGenericData(array $elementData, $resource, Table $table)
-+    private function processGenericData(array $elementData, string $resource, Table $table): array
-     {
-         $elementData['table'] = $table;
-         $elementData['resource'] = $resource;
-@@ -223,13 +224,14 @@ class SchemaBuilder
- 
-     /**
-      * Process tables and add them to schema.
-+     *
-      * If table already exists - then we need to skip it.
-      *
-      * @param  Schema $schema
--     * @param  array  $tableData
--     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Table
-+     * @param  array $tableData
-+     * @return Table
-      */
--    private function processTable(Schema $schema, array $tableData)
-+    private function processTable(Schema $schema, array $tableData): Table
-     {
-         if (!$schema->getTableByName($tableData['name'])) {
-             $resource = $this->getStructuralElementResource($tableData);
-@@ -250,11 +252,13 @@ class SchemaBuilder
-     }
- 
-     /**
-+     * Provides column by name.
-+     *
-      * @param string $columnName
-      * @param Table $table
-      * @return Column
-      */
--    private function getColumnByName(string $columnName, Table $table)
-+    private function getColumnByName(string $columnName, Table $table): Column
-     {
-         $columnCandidate = $table->getColumnByName($columnName);
- 
-@@ -274,7 +278,7 @@ class SchemaBuilder
-      * @param  Table $table
-      * @return array
-      */
--    private function convertColumnNamesToObjects(array $columnNames, Table $table)
-+    private function convertColumnNamesToObjects(array $columnNames, Table $table): array
-     {
-         $columns = [];
- 
-@@ -285,44 +289,15 @@ class SchemaBuilder
-         return $columns;
-     }
- 
--    /**
--     * Provides the full index name based on the prefix value.
--     *
--     * @param string $name
--     * @param Table $table
--     * @param array $columns
--     * @param string $type
--     * @return string
--     */
--    private function getFullIndexName(
--        string $name,
--        Table $table,
--        array $columns,
--        string $type = AdapterInterface::INDEX_TYPE_INDEX
--    ) {
--        if (AdapterInterface::INDEX_TYPE_PRIMARY === $type) {
--            return $name;
--        }
--
--        $tableName = $this->tableNameResolver->getNameOfOriginTable($table->getName());
--
--        return $this->resourceConnection
--            ->getIdxName(
--                $tableName,
--                $columns,
--                $type
--            );
--    }
--
-     /**
-      * Convert and instantiate index objects.
-      *
--     * @param  array    $tableData
--     * @param  $resource
--     * @param  Table    $table
-+     * @param  array $tableData
-+     * @param  string $resource
-+     * @param  Table $table
-      * @return Index[]
-      */
--    private function processIndexes(array $tableData, $resource, Table $table)
-+    private function processIndexes(array $tableData, string $resource, Table $table): array
-     {
-         if (!isset($tableData['index'])) {
-             return [];
-@@ -335,20 +310,10 @@ class SchemaBuilder
-                 continue;
-             }
- 
--            /**
--             * Temporary solution.
--             * @see MAGETWO-91365
--             */
--            $indexType = AdapterInterface::INDEX_TYPE_INDEX;
--            if (isset($indexData['indexType']) && $indexData['indexType'] === AdapterInterface::INDEX_TYPE_FULLTEXT) {
--                $indexType = $indexData['indexType'];
--            }
--
--            $indexData['name'] = $this->getFullIndexName(
--                $indexData['name'],
-+            $indexData['name'] = $this->elementNameResolver->getFullIndexName(
-                 $table,
-                 $indexData['column'],
--                $indexType
-+                $indexData['indexType'] ?? null
-             );
-             $indexData = $this->processGenericData($indexData, $resource, $table);
-             $indexData['columns'] = $this->convertColumnNamesToObjects($indexData['column'], $table);
-@@ -363,12 +328,12 @@ class SchemaBuilder
-      * Convert and instantiate constraint objects.
-      *
-      * @param  array $tableData
--     * @param  $resource
-+     * @param  string $resource
-      * @param  Schema $schema
-      * @param Table $table
-      * @return Constraint[]
-      */
--    private function processConstraints(array $tableData, $resource, Schema $schema, Table $table)
-+    private function processConstraints(array $tableData, string $resource, Schema $schema, Table $table): array
-     {
-         if (!isset($tableData['constraint'])) {
-             return [];
-@@ -385,6 +350,13 @@ class SchemaBuilder
-             if ($constraintData['type'] === 'foreign') {
-                 $constraintData['column'] = $this->getColumnByName($constraintData['column'], $table);
-                 $referenceTableData = $this->tablesData[$constraintData['referenceTable']];
-+
-+                if ($this->isDisabled($referenceTableData)) {
-+                    throw new \LogicException(
-+                        sprintf('The reference table named "%s" is disabled', $referenceTableData['name'])
-+                    );
-+                }
-+
-                 //If we are referenced to the same table we need to specify it
-                 //Get table name from resource connection regarding prefix settings
-                 $refTableName = $this->resourceConnection->getTableName($referenceTableData['name']);
-@@ -408,21 +380,16 @@ class SchemaBuilder
-                     $constraintData['referenceColumn'],
-                     $constraintData['referenceTable']
-                 );
--                /**
--                 * Calculation of the full name of Foreign Key based on the prefix value.
--                 */
--                $constraintData['name'] = $this->resourceConnection
--                    ->getFkName(
--                        $this->tableNameResolver->getNameOfOriginTable($table->getName()),
--                        $constraintData['column']->getName(),
--                        $constraintData['referenceTable']->getName(),
--                        $constraintData['referenceColumn']->getName()
--                    );
-+                $constraintData['name'] = $this->elementNameResolver->getFullFKName(
-+                    $table,
-+                    $constraintData['column'],
-+                    $constraintData['referenceTable'],
-+                    $constraintData['referenceColumn']
-+                );
-                 $constraint = $this->elementFactory->create($constraintData['type'], $constraintData);
-                 $constraints[$constraint->getName()] = $constraint;
-             } else {
--                $constraintData['name'] = $this->getFullIndexName(
--                    $constraintData['name'],
-+                $constraintData['name'] = $this->elementNameResolver->getFullIndexName(
-                     $table,
-                     $constraintData['column'],
-                     $constraintData['type']
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/TableElement/ElementNameResolver.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/TableElement/ElementNameResolver.php
-new file mode 100644
-index 00000000000..fe7d1a822da
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/TableElement/ElementNameResolver.php
-@@ -0,0 +1,188 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Setup\Declaration\Schema\Declaration\TableElement;
-+
-+use Magento\Framework\App\ResourceConnection;
-+use Magento\Framework\DB\Adapter\AdapterInterface;
-+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
-+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
-+use Magento\Framework\Setup\Declaration\Schema\TableNameResolver;
-+
-+/**
-+ * Provide names of table elements with autogenerated names.
-+ */
-+class ElementNameResolver
-+{
-+    /**
-+     * @var TableNameResolver
-+     */
-+    private $tableNameResolver;
-+
-+    /**
-+     * @var ResourceConnection
-+     */
-+    private $resourceConnection;
-+
-+    /**
-+     * @param TableNameResolver $tableNameResolver
-+     * @param ResourceConnection $resourceConnection
-+     */
-+    public function __construct(TableNameResolver $tableNameResolver, ResourceConnection $resourceConnection)
-+    {
-+        $this->tableNameResolver = $tableNameResolver;
-+        $this->resourceConnection = $resourceConnection;
-+    }
-+
-+    /**
-+     * Provide the full index name based on the prefix value.
-+     *
-+     * @param Table $table
-+     * @param string[] $columns
-+     * @param string $type
-+     * @return string
-+     */
-+    public function getFullIndexName(
-+        Table $table,
-+        array $columns,
-+        ?string $type = AdapterInterface::INDEX_TYPE_INDEX
-+    ): string {
-+        if (AdapterInterface::INDEX_TYPE_PRIMARY === $type) {
-+            return strtoupper(AdapterInterface::INDEX_TYPE_PRIMARY);
-+        }
-+
-+        /**
-+         * Temporary solution.
-+         * @see MAGETWO-91365
-+         */
-+        $isIndexTypeOutOfList = false === array_search(
-+            $type,
-+            [AdapterInterface::INDEX_TYPE_FULLTEXT, AdapterInterface::INDEX_TYPE_UNIQUE]
-+        );
-+        if ($type && $isIndexTypeOutOfList) {
-+            $type = AdapterInterface::INDEX_TYPE_INDEX;
-+        }
-+
-+        $tableName = $this->tableNameResolver->getNameOfOriginTable($table->getName());
-+
-+        return $this->resourceConnection
-+            ->getIdxName(
-+                $tableName,
-+                $columns,
-+                $type
-+            );
-+    }
-+
-+    /**
-+     * Provide the index name without prefix value.
-+     *
-+     * @param string $name
-+     * @param Table $table
-+     * @param string[] $columns
-+     * @param string $type
-+     * @return string
-+     */
-+    public function getIndexNameWithoutPrefix(
-+        string $name,
-+        Table $table,
-+        array $columns,
-+        ?string $type = AdapterInterface::INDEX_TYPE_INDEX
-+    ): string {
-+        if (AdapterInterface::INDEX_TYPE_PRIMARY === $type) {
-+            return strtoupper(AdapterInterface::INDEX_TYPE_PRIMARY);
-+        }
-+
-+        $nameWithoutPrefix = $name;
-+
-+        if ($this->resourceConnection->getTablePrefix()) {
-+            /**
-+             * Temporary solution.
-+             * @see MAGETWO-91365
-+             */
-+            $isIndexTypeOutOfList = false === array_search(
-+                $type,
-+                [AdapterInterface::INDEX_TYPE_FULLTEXT, AdapterInterface::INDEX_TYPE_UNIQUE]
-+            );
-+            if ($type && $isIndexTypeOutOfList) {
-+                $type = AdapterInterface::INDEX_TYPE_INDEX;
-+            }
-+
-+            $nameWithoutPrefix = $this->resourceConnection
-+                ->getConnection($table->getResource())
-+                ->getIndexName(
-+                    $this->tableNameResolver->getNameOfOriginTable(
-+                        $table->getNameWithoutPrefix()
-+                    ),
-+                    $columns,
-+                    $type
-+                );
-+        }
-+
-+        return $nameWithoutPrefix;
-+    }
-+
-+    /**
-+     * Provide the full foreign key name based on the prefix value.
-+     *
-+     * @param Table $table
-+     * @param Column $column
-+     * @param Table $referenceTable
-+     * @param Column $referenceColumn
-+     * @return string
-+     */
-+    public function getFullFKName(
-+        Table $table,
-+        Column $column,
-+        Table $referenceTable,
-+        Column $referenceColumn
-+    ): string {
-+        $fkName = $this->resourceConnection
-+            ->getFkName(
-+                $this->tableNameResolver->getNameOfOriginTable($table->getName()),
-+                $column->getName(),
-+                $referenceTable->getName(),
-+                $referenceColumn->getName()
-+            );
-+
-+        return $fkName;
-+    }
-+
-+    /**
-+     * Provide the foreign key name without prefix value.
-+     *
-+     * @param string $name
-+     * @param Table $table
-+     * @param Column $column
-+     * @param Table $referenceTable
-+     * @param Column $referenceColumn
-+     * @return string
-+     */
-+    public function getFKNameWithoutPrefix(
-+        string $name,
-+        Table $table,
-+        Column $column,
-+        Table $referenceTable,
-+        Column $referenceColumn
-+    ): string {
-+        $nameWithoutPrefix = $name;
-+
-+        if ($this->resourceConnection->getTablePrefix()) {
-+            $nameWithoutPrefix = $this->resourceConnection
-+                ->getConnection($table->getResource())
-+                ->getForeignKeyName(
-+                    $this->tableNameResolver->getNameOfOriginTable(
-+                        $table->getNameWithoutPrefix()
-+                    ),
-+                    $column->getName(),
-+                    $referenceTable->getNameWithoutPrefix(),
-+                    $referenceColumn->getName()
-+                );
-+        }
-+
-+        return $nameWithoutPrefix;
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffInterface.php
-index 4b6e3555256..139e9b90268 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffInterface.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffInterface.php
-@@ -7,9 +7,6 @@
- namespace Magento\Framework\Setup\Declaration\Schema\Diff;
- 
- use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
--use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
--use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
--use Magento\Framework\Setup\Declaration\Schema\Request;
- 
- /**
-  * DiffInterface is type of classes, that holds all information
-@@ -39,9 +36,9 @@ interface DiffInterface
-     /**
-      * Register operation.
-      *
--     * @param  ElementInterface|object $dtoObject
--     * @param  string                  $operation
--     * @param  ElementInterface        $oldDtoObject
-+     * @param ElementInterface|object $dtoObject
-+     * @param string $operation
-+     * @param ElementInterface $oldDtoObject
-      * @return void
-      */
-     public function register(
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnNullableAwareInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnNullableAwareInterface.php
-index 0ae403abd57..086a4466a17 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnNullableAwareInterface.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnNullableAwareInterface.php
-@@ -7,7 +7,7 @@ namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
- 
- /**
-  * Provides nullable flag for element.
-- * If column element implement this interface, than it will have NULL or NOT NULL flag in column definition.
-+ * If column element implement this interface, then it will have NULL or NOT NULL flag in column definition.
-  */
- interface ColumnNullableAwareInterface
- {
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnUnsignedAwareInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnUnsignedAwareInterface.php
-index be5d6bf91ef..c5fc550cf78 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnUnsignedAwareInterface.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnUnsignedAwareInterface.php
-@@ -7,7 +7,7 @@ namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
- 
- /**
-  * Unsigned flag provider for element.
-- * If column element implement this interface, than it will have UNSIGNED flag in column
-+ * If column element implement this interface, then it will have UNSIGNED flag in column
-  * definition.
-  */
- interface ColumnUnsignedAwareInterface
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Foreign.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Foreign.php
-index 0e1ad0768c4..040549a5611 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Foreign.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Foreign.php
-@@ -7,6 +7,7 @@ namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
- 
- use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\Setup\Declaration\Schema\Declaration\TableElement\ElementNameResolver;
- use Magento\Framework\Setup\Declaration\Schema\TableNameResolver;
- 
- /**
-@@ -39,28 +40,36 @@ class Foreign implements FactoryInterface
-      */
-     private $tableNameResolver;
- 
-+    /**
-+     * @var ElementNameResolver
-+     */
-+    private $elementNameResolver;
-+
-     /**
-      * Constructor.
-      *
-      * @param ObjectManagerInterface $objectManager
-      * @param ResourceConnection $resourceConnection
-      * @param TableNameResolver $tableNameResolver
-+     * @param ElementNameResolver $elementNameResolver
-      * @param string $className
-      */
-     public function __construct(
-         ObjectManagerInterface $objectManager,
-         ResourceConnection $resourceConnection,
-         TableNameResolver $tableNameResolver,
-+        ElementNameResolver $elementNameResolver,
-         $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference::class
-     ) {
-         $this->objectManager = $objectManager;
-         $this->resourceConnection = $resourceConnection;
-         $this->className = $className;
-         $this->tableNameResolver = $tableNameResolver;
-+        $this->elementNameResolver = $elementNameResolver;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function create(array $data)
-     {
-@@ -68,22 +77,13 @@ class Foreign implements FactoryInterface
-             $data['onDelete'] = self::DEFAULT_ON_DELETE;
-         }
- 
--        $nameWithoutPrefix = $data['name'];
--
--        if ($this->resourceConnection->getTablePrefix()) {
--            $nameWithoutPrefix = $this->resourceConnection
--                ->getConnection($data['table']->getResource())
--                ->getForeignKeyName(
--                    $this->tableNameResolver->getNameOfOriginTable(
--                        $data['table']->getNameWithoutPrefix()
--                    ),
--                    $data['column']->getName(),
--                    $data['referenceTable']->getNameWithoutPrefix(),
--                    $data['referenceColumn']->getName()
--                );
--        }
--
--        $data['nameWithoutPrefix'] = $nameWithoutPrefix;
-+        $data['nameWithoutPrefix'] = $this->elementNameResolver->getFKNameWithoutPrefix(
-+            $data['name'],
-+            $data['table'],
-+            $data['column'],
-+            $data['referenceTable'],
-+            $data['referenceColumn']
-+        );
- 
-         return $this->objectManager->create($this->className, $data);
-     }
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Index.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Index.php
-index dd2acd76088..211d3885297 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Index.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Index.php
-@@ -8,6 +8,7 @@ namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
- use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\DB\Adapter\AdapterInterface;
- use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\Setup\Declaration\Schema\Declaration\TableElement\ElementNameResolver;
- use Magento\Framework\Setup\Declaration\Schema\TableNameResolver;
- 
- /**
-@@ -18,7 +19,7 @@ class Index implements FactoryInterface
-     /**
-      * Default index type.
-      */
--    const DEFAULT_INDEX_TYPE = "BTREE";
-+    const DEFAULT_INDEX_TYPE = "btree";
- 
-     /**
-      * @var ObjectManagerInterface
-@@ -40,28 +41,36 @@ class Index implements FactoryInterface
-      */
-     private $tableNameResolver;
- 
-+    /**
-+     * @var ElementNameResolver
-+     */
-+    private $elementNameResolver;
-+
-     /**
-      * Constructor.
-      *
-      * @param ObjectManagerInterface $objectManager
-      * @param ResourceConnection $resourceConnection
-      * @param TableNameResolver $tableNameResolver
-+     * @param ElementNameResolver $elementNameResolver
-      * @param string $className
-      */
-     public function __construct(
-         ObjectManagerInterface $objectManager,
-         ResourceConnection $resourceConnection,
-         TableNameResolver $tableNameResolver,
-+        ElementNameResolver $elementNameResolver,
-         $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Index::class
-     ) {
-         $this->objectManager = $objectManager;
-         $this->resourceConnection = $resourceConnection;
-         $this->className = $className;
-         $this->tableNameResolver = $tableNameResolver;
-+        $this->elementNameResolver = $elementNameResolver;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function create(array $data)
-     {
-@@ -69,29 +78,12 @@ class Index implements FactoryInterface
-             $data['indexType'] = self::DEFAULT_INDEX_TYPE;
-         }
- 
--        $nameWithoutPrefix = $data['name'];
--
--        if ($this->resourceConnection->getTablePrefix()) {
--            /**
--             * Temporary solution.
--             * @see MAGETWO-91365
--             */
--            $indexType = AdapterInterface::INDEX_TYPE_INDEX;
--            if ($data['indexType'] === AdapterInterface::INDEX_TYPE_FULLTEXT) {
--                $indexType = $data['indexType'];
--            }
--            $nameWithoutPrefix = $this->resourceConnection
--                ->getConnection($data['table']->getResource())
--                ->getIndexName(
--                    $this->tableNameResolver->getNameOfOriginTable(
--                        $data['table']->getNameWithoutPrefix()
--                    ),
--                    $data['column'],
--                    $indexType
--                );
--        }
--
--        $data['nameWithoutPrefix'] = $nameWithoutPrefix;
-+        $data['nameWithoutPrefix'] = $this->elementNameResolver->getIndexNameWithoutPrefix(
-+            $data['name'],
-+            $data['table'],
-+            $data['column'],
-+            $data['indexType']
-+        );
- 
-         return $this->objectManager->create($this->className, $data);
-     }
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php
-index cdb740ea0a9..e0728b9a34f 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php
-@@ -39,7 +39,7 @@ class Real implements FactoryInterface
-      * Constructor.
-      *
-      * @param ObjectManagerInterface $objectManager
--     * @param string                 $className
-+     * @param string $className
-      */
-     public function __construct(
-         ObjectManagerInterface $objectManager,
-@@ -50,7 +50,7 @@ class Real implements FactoryInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function create(array $data)
-     {
-@@ -63,7 +63,7 @@ class Real implements FactoryInterface
-         }
- 
-         if (isset($data['default'])) {
--            $data['default'] = floatval($data['default']);
-+            $data['default'] = (float)$data['default'];
-         }
- 
-         return $this->objectManager->create($this->className, $data);
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Unique.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Unique.php
-index 57e5270b0c8..141e4a70832 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Unique.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Unique.php
-@@ -7,6 +7,7 @@ namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
- 
- use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\Setup\Declaration\Schema\Declaration\TableElement\ElementNameResolver;
- use Magento\Framework\Setup\Declaration\Schema\TableNameResolver;
- 
- /**
-@@ -34,46 +35,45 @@ class Unique implements FactoryInterface
-      */
-     private $tableNameResolver;
- 
-+    /**
-+     * @var ElementNameResolver
-+     */
-+    private $elementNameResolver;
-+
-     /**
-      * Constructor.
-      *
-      * @param ObjectManagerInterface $objectManager
-      * @param ResourceConnection $resourceConnection
-      * @param TableNameResolver $tableNameResolver
-+     * @param ElementNameResolver $elementNameResolver
-      * @param string $className
-      */
-     public function __construct(
-         ObjectManagerInterface $objectManager,
-         ResourceConnection $resourceConnection,
-         TableNameResolver $tableNameResolver,
-+        ElementNameResolver $elementNameResolver,
-         $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal::class
-     ) {
-         $this->objectManager = $objectManager;
-         $this->resourceConnection = $resourceConnection;
-         $this->className = $className;
-         $this->tableNameResolver = $tableNameResolver;
-+        $this->elementNameResolver = $elementNameResolver;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function create(array $data)
-     {
--        $nameWithoutPrefix = $data['name'];
--
--        if ($this->resourceConnection->getTablePrefix()) {
--            $nameWithoutPrefix = $this->resourceConnection
--                ->getConnection($data['table']->getResource())
--                ->getIndexName(
--                    $this->tableNameResolver->getNameOfOriginTable(
--                        $data['table']->getNameWithoutPrefix()
--                    ),
--                    $data['column'],
--                    $data['type']
--                );
--        }
--
--        $data['nameWithoutPrefix'] = $nameWithoutPrefix;
-+        $data['nameWithoutPrefix'] = $this->elementNameResolver->getIndexNameWithoutPrefix(
-+            $data['name'],
-+            $data['table'],
-+            $data['column'],
-+            $data['type']
-+        );
- 
-         return $this->objectManager->create($this->className, $data);
-     }
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php
-index 3e68b985283..fbbe188d127 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php
-@@ -63,14 +63,15 @@ class Schema
- 
-     /**
-      * Retrieve table by it name.
-+     *
-      * Return false if table is not present in schema.
-      *
--     * @param  $name
-+     * @param string $name
-      * @return bool|Table
-      */
-     public function getTableByName($name)
-     {
-         $name = $this->resourceConnection->getTableName($name);
--        return isset($this->tables[$name]) ? $this->tables[$name] : false;
-+        return $this->tables[$name] ?? false;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php
-index 4f020b1a032..b864a3d927b 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php
-@@ -87,11 +87,11 @@ class Table extends GenericElement implements
-      * @param string $engine
-      * @param string $charset
-      * @param string $collation
-+     * @param string $onCreate
-      * @param string|null $comment
-      * @param array $columns
-      * @param array $indexes
-      * @param array $constraints
--     * @param string $onCreate
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -123,6 +123,7 @@ class Table extends GenericElement implements
- 
-     /**
-      * Return different table constraints.
-+     *
-      * It can be constraint like unique key or reference to another table, etc
-      *
-      * @return Constraint[]
-@@ -133,12 +134,14 @@ class Table extends GenericElement implements
-     }
- 
-     /**
-+     * Get constraint by name.
-+     *
-      * @param string $name
-      * @return Constraint | bool
-      */
-     public function getConstraintByName($name)
-     {
--        return isset($this->constraints[$name]) ? $this->constraints[$name] : false;
-+        return $this->constraints[$name] ?? false;
-     }
- 
-     /**
-@@ -160,6 +163,8 @@ class Table extends GenericElement implements
-     }
- 
-     /**
-+     * Returns primary constraint
-+     *
-      * As primary constraint always have one name
-      * and can be only one for table
-      * it name is allocated into it constraint
-@@ -168,9 +173,7 @@ class Table extends GenericElement implements
-      */
-     public function getPrimaryConstraint()
-     {
--        return isset($this->constraints[Internal::PRIMARY_NAME]) ?
--            $this->constraints[Internal::PRIMARY_NAME] :
--            false;
-+        return $this->constraints[Internal::PRIMARY_NAME] ?? false;
-     }
- 
-     /**
-@@ -191,16 +194,19 @@ class Table extends GenericElement implements
-     }
- 
-     /**
-+     * Get index by name
-+     *
-      * @param string $name
-      * @return Index | bool
-      */
-     public function getIndexByName($name)
-     {
--        return isset($this->indexes[$name]) ? $this->indexes[$name] : false;
-+        return $this->indexes[$name] ?? false;
-     }
- 
-     /**
-      * Return all columns.
-+     *
-      * Note, table always must have columns
-      *
-      * @return Column[]
-@@ -231,6 +237,8 @@ class Table extends GenericElement implements
-     }
- 
-     /**
-+     * Add constraints
-+     *
-      * This is workaround, as any DTO object couldnt be changed after instantiation.
-      * However there is case, when we have 2 tables with constraints in different tables,
-      * that depends to each other table. So we need to setup DTO first and only then pass
-@@ -280,6 +288,7 @@ class Table extends GenericElement implements
- 
-     /**
-      * Retrieve elements by specific type
-+     *
-      * Allowed types: columns, constraints, indexes...
-      *
-      * @param  string $type
-@@ -295,6 +304,8 @@ class Table extends GenericElement implements
-     }
- 
-     /**
-+     * Add indexes
-+     *
-      * This is workaround, as any DTO object couldnt be changed after instantiation.
-      * However there is case, when we depends on column definition we need modify our indexes
-      *
-@@ -314,6 +325,8 @@ class Table extends GenericElement implements
-     }
- 
-     /**
-+     * Get engine name
-+     *
-      * @return string
-      */
-     public function getEngine(): string
-@@ -356,6 +369,8 @@ class Table extends GenericElement implements
-     }
- 
-     /**
-+     * Get name without prefix
-+     *
-      * @return string
-      */
-     public function getNameWithoutPrefix(): string
-@@ -364,6 +379,8 @@ class Table extends GenericElement implements
-     }
- 
-     /**
-+     * Get comment
-+     *
-      * @return null|string
-      */
-     public function getComment()
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/FileSystem/XmlReader.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/FileSystem/XmlReader.php
-deleted file mode 100644
-index bd835c35fd8..00000000000
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/FileSystem/XmlReader.php
-+++ /dev/null
-@@ -1,63 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Framework\Setup\Declaration\Schema\FileSystem;
--
--use Magento\Framework\Config\FileResolverByModule;
--use Magento\Framework\Config\ReaderInterface;
--
--/**
-- * DB Schema XML configuration reader.
-- * Reads schema config from db_schema.xml files in enabled modules.
-- */
--class XmlReader extends \Magento\Framework\Config\Reader\Filesystem implements ReaderInterface
--{
--    /**
--     * Attributes by names of which we will do nodes merge.
--     *
--     * @var array
--     */
--    private $idAttributes = [
--        '/schema/table' => 'name',
--        '/schema/table/column' => 'name',
--        '/schema/table/constraint' => 'name',
--        '/schema/table/index' => 'name',
--        '/schema/table/index/column' => 'name',
--        '/schema/table/constraint/column' => 'name',
--    ];
--
--    /**
--     * XmlReader constructor.
--     *
--     * @param FileResolverByModule $fileResolver
--     * @param \Magento\Framework\Setup\Declaration\Schema\Config\Converter $converter
--     * @param \Magento\Framework\Setup\Declaration\Schema\Config\SchemaLocator $schemaLocator
--     * @param \Magento\Framework\Config\ValidationStateInterface $validationState
--     * @param string $fileName
--     * @param string $domDocumentClass
--     * @param string $defaultScope
--     */
--    public function __construct(
--        FileResolverByModule $fileResolver,
--        \Magento\Framework\Setup\Declaration\Schema\Config\Converter $converter,
--        \Magento\Framework\Setup\Declaration\Schema\Config\SchemaLocator $schemaLocator,
--        \Magento\Framework\Config\ValidationStateInterface $validationState,
--        $fileName = 'db_schema.xml',
--        $domDocumentClass = \Magento\Framework\Config\Dom::class,
--        $defaultScope = 'global'
--    ) {
--        parent::__construct(
--            $fileResolver,
--            $converter,
--            $schemaLocator,
--            $validationState,
--            $fileName,
--            $this->idAttributes,
--            $domDocumentClass,
--            $defaultScope
--        );
--    }
--}
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php
-index 9a42090ad31..2bb19d941fc 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php
-@@ -110,7 +110,7 @@ class AddColumn implements OperationInterface
-             Index::TYPE,
-             [
-                 'name' => self::TEMPORARY_KEY,
--                'column' => $column->getName(),
-+                'column' => [$column->getName()],
-                 'columns' => [$column],
-                 'table' => $column->getTable()
-             ]
-@@ -119,7 +119,7 @@ class AddColumn implements OperationInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getOperationName()
-     {
-@@ -127,7 +127,7 @@ class AddColumn implements OperationInterface
-     }
- 
-     /**
--     * @return bool
-+     * @inheritdoc
-      */
-     public function isOperationDestructive()
-     {
-@@ -164,7 +164,7 @@ class AddColumn implements OperationInterface
-         }
-         $statements = [$statement];
-         /**
--         * If column has triggers, only than we need to create temporary index on it.
-+         * If column has triggers, only then we need to create temporary index on it.
-          * As triggers means, that we will not enable primary key until all data will be transferred,
-          * so column can left without key (as primary key is disabled) and this cause an error.
-          */
-@@ -187,7 +187,7 @@ class AddColumn implements OperationInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function doOperation(ElementHistory $elementHistory)
-     {
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropReference.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropReference.php
-index 4a5f651a108..95fc1c42210 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropReference.php
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropReference.php
-@@ -35,18 +35,15 @@ class DropReference implements OperationInterface
-     }
- 
-     /**
--     * {@inheritdoc}
--     * We can drop references and this will not cause any issues.
--     *
--     * @return bool
-+     * @inheritdoc
-      */
-     public function isOperationDestructive()
-     {
--        return false;
-+        return true;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getOperationName()
-     {
-@@ -54,7 +51,7 @@ class DropReference implements OperationInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function doOperation(ElementHistory $elementHistory)
-     {
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Request.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Request.php
-deleted file mode 100644
-index 2ffe29cc769..00000000000
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Request.php
-+++ /dev/null
-@@ -1,45 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Framework\Setup\Declaration\Schema;
--
--/**
-- * CLI or Ui params transport object.
-- */
--class Request
--{
--    /**
--     * Option to enable dump functionality for safe mode.
--     */
--    const DUMP_ENABLE_OPTIONS = "dump_enable";
--
--    /**
--     * @var  bool
--     */
--    private $dumpEnable = false;
--
--    /**
--     * Constructor.
--     *
--     * @param array $request
--     */
--    public function __construct(array $request)
--    {
--        if (isset($request[static::DUMP_ENABLE_OPTIONS])) {
--            $this->dumpEnable = (bool) $request[static::DUMP_ENABLE_OPTIONS];
--        }
--    }
--
--    /**
--     * Check whether dump is enabled.
--     *
--     * @return boolean
--     */
--    public function isDumpEnabled()
--    {
--        return $this->dumpEnable;
--    }
--}
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/RequestFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/RequestFactory.php
-deleted file mode 100644
-index 8f76815d4dc..00000000000
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/RequestFactory.php
-+++ /dev/null
-@@ -1,49 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--namespace Magento\Framework\Setup\Declaration\Schema;
--
--use Zend\Di\Di;
--
--/**
-- * Request Factory.
-- */
--class RequestFactory
--{
--    /**
--     * @var Di
--     */
--    private $zendDi;
--
--    /**
--     * @var string
--     */
--    private static $instanceName = Request::class;
--
--    /**
--     * RequestFactory constructor.
--     *
--     * @param Di $zendDi
--     */
--    public function __construct(Di $zendDi)
--    {
--        $this->zendDi = $zendDi;
--    }
--
--    /**
--     * Create request object with requestOptions params.
--     *
--     * @param  array $requestOptions
--     * @return Request
--     */
--    public function create(array $requestOptions = [])
--    {
--        return $this->zendDi->newInstance(
--            self::$instanceName,
--            ['request' => $requestOptions]
--        );
--    }
--}
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/constraint.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/constraint.xsd
-index 8c264bd95a0..c379452d65d 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/constraint.xsd
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/constraint.xsd
-@@ -9,7 +9,7 @@
-     <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/operations.xsd" />
- 
-     <xs:attributeGroup name="baseConstraint">
--        <xs:attributeGroup ref="basicOperations" />
--        <xs:attribute name="name" type="nameType" use="required" />
-+        <xs:attribute name="disabled" type="xs:boolean" />
-+        <xs:attribute name="referenceId" type="referenceIdType" use="required" />
-     </xs:attributeGroup>
- </xs:schema>
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/index.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/index.xsd
-index ead4fc5604f..cd08e3f43ad 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/index.xsd
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/index.xsd
-@@ -19,7 +19,7 @@
-         </xs:sequence>
- 
-         <xs:attribute name="indexType" type="indexType" />
--        <xs:attribute name="name" type="nameType" />
-+        <xs:attribute name="referenceId" type="referenceIdType" use="required" />
-         <xs:attribute name="disabled" type="xs:boolean" />
-     </xs:complexType>
- 
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/name.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/name.xsd
-index 82db095d668..dbebdefbda0 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/name.xsd
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/name.xsd
-@@ -16,4 +16,18 @@
-             <xs:maxLength value="64" />
-         </xs:restriction>
-     </xs:simpleType>
-+    <xs:simpleType name="referenceIdType">
-+        <xs:union memberTypes="nameType">
-+            <xs:simpleType>
-+                <xs:annotation>
-+                    <xs:documentation>
-+                        The attribute can contain only [A-Z0-9_].
-+                    </xs:documentation>
-+                </xs:annotation>
-+                <xs:restriction base="xs:string">
-+                    <xs:pattern value="[A-Z0-9_]+" />
-+                </xs:restriction>
-+            </xs:simpleType>
-+        </xs:union>
-+    </xs:simpleType>
- </xs:schema>
-diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd
-index 66cd19d0512..e3c54413f81 100644
---- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd
-+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd
-@@ -39,9 +39,38 @@
-     <xs:element name="schema">
-         <xs:complexType>
-             <xs:sequence minOccurs="0" maxOccurs="unbounded">
--                <xs:element name="table" type="table"/>
-+                <xs:element name="table" type="table">
-+                    <xs:unique name="uniqueColumnName">
-+                        <xs:annotation>
-+                            <xs:documentation>Column name be unique for each table</xs:documentation>
-+                        </xs:annotation>
-+                        <xs:selector xpath="column" />
-+                        <xs:field xpath="@name" />
-+                    </xs:unique>
-+                    <xs:unique name="uniqueIndexReferenceId">
-+                        <xs:annotation>
-+                            <xs:documentation>Reference ID should be unique for indexes</xs:documentation>
-+                        </xs:annotation>
-+                        <xs:selector xpath="index" />
-+                        <xs:field xpath="@referenceId" />
-+                    </xs:unique>
-+                    <xs:unique name="uniqueConstraintReferenceId">
-+                        <xs:annotation>
-+                            <xs:documentation>Reference ID should be unique for constraints</xs:documentation>
-+                        </xs:annotation>
-+                        <xs:selector xpath="constraint" />
-+                        <xs:field xpath="@referenceId" />
-+                    </xs:unique>
-+                </xs:element>
-             </xs:sequence>
-         </xs:complexType>
-+        <xs:unique name="uniqueTableName">
-+            <xs:annotation>
-+                <xs:documentation>Table name should be unique for each module</xs:documentation>
-+            </xs:annotation>
-+            <xs:selector xpath="table" />
-+            <xs:field xpath="@name" />
-+        </xs:unique>
-     </xs:element>
- 
-     <xs:complexType name="table">
-@@ -55,7 +84,8 @@
-             <xs:element name="constraint" />
-             <xs:element name="index" type="index" />
-         </xs:choice>
--        <xs:attribute name="name" type="xs:string" />
-+        <xs:attributeGroup ref="basicOperations" />
-+        <xs:attribute name="name" type="xs:string" use="required" />
-         <xs:attribute name="resource" type="resourceType" />
-         <xs:attribute name="engine" type="engineType" />
-         <xs:attribute name="comment" type="xs:string" />
-diff --git a/lib/internal/Magento/Framework/Setup/OldDbValidator.php b/lib/internal/Magento/Framework/Setup/OldDbValidator.php
-index 005f7bdd713..018b010e8fe 100644
---- a/lib/internal/Magento/Framework/Setup/OldDbValidator.php
-+++ b/lib/internal/Magento/Framework/Setup/OldDbValidator.php
-@@ -11,7 +11,9 @@ use Composer\Package\Version\VersionParser;
- use Magento\Framework\Module\DbVersionInfo;
- 
- /**
-- * Old Validator for database is used in order to support backward compatability of modules that are installed
-+ * Old Validator for database
-+ *
-+ * Used in order to support backward compatibility of modules that are installed
-  * in old way (with Install/Upgrade Schema/Data scripts)
-  */
- class OldDbValidator implements UpToDateValidatorInterface
-@@ -47,7 +49,7 @@ class OldDbValidator implements UpToDateValidatorInterface
-                 $requiredVersion = $versionParser->parseConstraints('>' . $error[DbVersionInfo::KEY_REQUIRED]);
-                 if ($requiredVersion->matches($currentVersion)) {
-                     $codebaseUpdateNeeded = true;
--                };
-+                }
- 
-                 $messages[] = sprintf(
-                     "<info>%20s %10s: %11s  ->  %-11s</info>",
-@@ -63,6 +65,8 @@ class OldDbValidator implements UpToDateValidatorInterface
-     }
- 
-     /**
-+     * Is up to date
-+     *
-      * @return bool
-      */
-     public function isUpToDate(): bool
-diff --git a/lib/internal/Magento/Framework/Setup/Patch/DependentPatchInterface.php b/lib/internal/Magento/Framework/Setup/Patch/DependentPatchInterface.php
-index abda94a0e6f..7573441fa94 100644
---- a/lib/internal/Magento/Framework/Setup/Patch/DependentPatchInterface.php
-+++ b/lib/internal/Magento/Framework/Setup/Patch/DependentPatchInterface.php
-@@ -6,7 +6,7 @@
- namespace Magento\Framework\Setup\Patch;
- 
- /**
-- * Each patch can have dependecies, that should be applied before such patch
-+ * Each patch can have dependencies, that should be applied before such patch
-  *
-  *            /  Patch2 --- Patch3
-  *          /
-@@ -20,7 +20,7 @@ interface DependentPatchInterface
-     /**
-      * Get array of patches that have to be executed prior to this.
-      *
--     * example of implementation:
-+     * Example of implementation:
-      *
-      * [
-      *      \Vendor_Name\Module_Name\Setup\Patch\Patch1::class,
-diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php b/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php
-index d81d36d383f..bdaca77e5b4 100644
---- a/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php
-+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php
-@@ -10,7 +10,7 @@ use Magento\Framework\App\ResourceConnection;
- use Magento\Framework\Module\ModuleList;
- use Magento\Framework\ObjectManagerInterface;
- use Magento\Framework\Phrase;
--use Magento\Framework\Setup\Exception;
-+use Magento\Framework\Setup\Exception as SetupException;
- use Magento\Framework\Setup\ModuleDataSetupInterface;
- 
- /**
-@@ -129,8 +129,8 @@ class PatchApplier
-     /**
-      * Apply all patches for one module
-      *
--     * @param null | string $moduleName
--     * @throws Exception
-+     * @param null|string $moduleName
-+     * @throws SetupException
-      */
-     public function applyDataPatch($moduleName = null)
-     {
-@@ -149,7 +149,7 @@ class PatchApplier
-                 ['moduleDataSetup' => $this->moduleDataSetup]
-             );
-             if (!$dataPatch instanceof DataPatchInterface) {
--                throw new Exception(
-+                throw new SetupException(
-                     new Phrase("Patch %1 should implement DataPatchInterface", [get_class($dataPatch)])
-                 );
-             }
-@@ -164,7 +164,17 @@ class PatchApplier
-                     $this->moduleDataSetup->getConnection()->commit();
-                 } catch (\Exception $e) {
-                     $this->moduleDataSetup->getConnection()->rollBack();
--                    throw new Exception(new Phrase($e->getMessage()));
-+                    throw new SetupException(
-+                        new Phrase(
-+                            'Unable to apply data patch %1 for module %2. Original exception message: %3',
-+                            [
-+                                get_class($dataPatch),
-+                                $moduleName,
-+                                $e->getMessage()
-+                            ]
-+                        ),
-+                        $e
-+                    );
-                 } finally {
-                     unset($dataPatch);
-                 }
-@@ -173,8 +183,7 @@ class PatchApplier
-     }
- 
-     /**
--     * Register all patches in registry in order to manipulate chains and dependencies of patches
--     * of patches
-+     * Register all patches in registry in order to manipulate chains and dependencies of patches of patches
-      *
-      * @param string $moduleName
-      * @param string $patchType
-@@ -207,8 +216,8 @@ class PatchApplier
-      *
-      * Please note: that schema patches are not revertable
-      *
--     * @param null | string $moduleName
--     * @throws Exception
-+     * @param null|string $moduleName
-+     * @throws SetupException
-      */
-     public function applySchemaPatch($moduleName = null)
-     {
-@@ -229,7 +238,7 @@ class PatchApplier
-                 $schemaPatch->apply();
-                 $this->patchHistory->fixPatch(get_class($schemaPatch));
-             } catch (\Exception $e) {
--                throw new Exception(
-+                throw new SetupException(
-                     new Phrase(
-                         'Unable to apply patch %1 for module %2. Original exception message: %3',
-                         [
-@@ -248,8 +257,8 @@ class PatchApplier
-     /**
-      * Revert data patches for specific module
-      *
--     * @param null | string $moduleName
--     * @throws Exception
-+     * @param null|string $moduleName
-+     * @throws SetupException
-      */
-     public function revertDataPatches($moduleName = null)
-     {
-@@ -270,7 +279,7 @@ class PatchApplier
-                     $adapter->commit();
-                 } catch (\Exception $e) {
-                     $adapter->rollBack();
--                    throw new Exception(new Phrase($e->getMessage()));
-+                    throw new SetupException(new Phrase($e->getMessage()));
-                 } finally {
-                     unset($dataPatch);
-                 }
-diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchInterface.php b/lib/internal/Magento/Framework/Setup/Patch/PatchInterface.php
-index c69f754d4b9..7063404276c 100644
---- a/lib/internal/Magento/Framework/Setup/Patch/PatchInterface.php
-+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchInterface.php
-@@ -19,7 +19,7 @@ interface PatchInterface extends DependentPatchInterface
- 
-     /**
-      * Run code inside patch
--     * If code fails, patch must be reverted, in case when we are speaking about schema - than under revert
-+     * If code fails, patch must be reverted, in case when we are speaking about schema - then under revert
-      * means run PatchInterface::revert()
-      *
-      * If we speak about data, under revert means: $transaction->rollback()
-diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchRegistry.php b/lib/internal/Magento/Framework/Setup/Patch/PatchRegistry.php
-index 08e8f96bd5b..25f2bb64d81 100644
---- a/lib/internal/Magento/Framework/Setup/Patch/PatchRegistry.php
-+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchRegistry.php
-@@ -68,7 +68,7 @@ class PatchRegistry implements \IteratorAggregate
-     /**
-      * Register all dependents to patch
-      *
--     * @param string | DependentPatchInterface $patchName
-+     * @param string|DependentPatchInterface $patchName
-      */
-     private function registerDependents(string $patchName)
-     {
-@@ -130,6 +130,8 @@ class PatchRegistry implements \IteratorAggregate
-     }
- 
-     /**
-+     * Get patch dependencies.
-+     *
-      * @param string $patch
-      * @return string[]
-      */
-@@ -146,7 +148,7 @@ class PatchRegistry implements \IteratorAggregate
- 
-             $depInstance = $this->registerPatch($dep);
-             /**
--             * If a patch already have applied dependency - than we definently know
-+             * If a patch already have applied dependency - then we definitely know
-              * that all other dependencies in dependency chain are applied too, so we can skip this dep
-              */
-             if (!$depInstance) {
-@@ -189,7 +191,7 @@ class PatchRegistry implements \IteratorAggregate
-     /**
-      * Retrieve iterator of all patch instances
-      *
--     * If patch have dependencies, than first of all dependencies should be installed and only then desired patch
-+     * If patch have dependencies, then first of all dependencies should be installed and only then desired patch
-      *
-      * @return \ArrayIterator
-      */
-diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php b/lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php
-index 9fca3ffc364..fb2b0e2c379 100644
---- a/lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php
-+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php
-@@ -14,11 +14,10 @@ interface PatchVersionInterface
- {
-     /**
-      * This version associate patch with Magento setup version.
--     * For example, if Magento current setup version is 2.0.3 and patch version is 2.0.2 than
-+     * For example, if Magento current setup version is 2.0.3 and patch version is 2.0.2 then
-      * this patch will be added to registry, but will not be applied, because it is already applied
-      * by old mechanism of UpgradeData.php script
-      *
--     *
-      * @return string
-      * @deprecated since appearance, required for backward compatibility
-      */
-diff --git a/lib/internal/Magento/Framework/Setup/SchemaListener.php b/lib/internal/Magento/Framework/Setup/SchemaListener.php
-index c6407a2569a..aabd7dedc91 100644
---- a/lib/internal/Magento/Framework/Setup/SchemaListener.php
-+++ b/lib/internal/Magento/Framework/Setup/SchemaListener.php
-@@ -12,6 +12,9 @@ use Magento\Framework\Setup\SchemaListenerHandlers\SchemaListenerHandlerInterfac
- 
- /**
-  * Listen for all changes and record them in order to reuse later.
-+ *
-+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
-+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
-  */
- class SchemaListener
- {
-@@ -61,7 +64,8 @@ class SchemaListener
-         'SCALE' => 'scale',
-         'UNSIGNED' => 'unsigned',
-         'IDENTITY' => 'identity',
--        'PRIMARY' => 'primary'
-+        'PRIMARY' => 'primary',
-+        'COMMENT' => 'comment',
-     ];
- 
-     /**
-@@ -71,7 +75,6 @@ class SchemaListener
-         'COLUMN_POSITION',
-         'COLUMN_TYPE',
-         'PRIMARY_POSITION',
--        'COMMENT'
-     ];
- 
-     /**
-@@ -90,8 +93,6 @@ class SchemaListener
-     private $handlers;
- 
-     /**
--     * Constructor.
--     *
-      * @param array $definitionMappers
-      * @param array $handlers
-      */
-@@ -132,7 +133,9 @@ class SchemaListener
-         $definition = $this->doColumnMapping($definition);
-         $definition['name'] = strtolower($columnName);
-         $definitionType = $definition['type'] === 'int' ? 'integer' : $definition['type'];
-+        $columnComment = $definition['comment'] ?? null;
-         $definition = $this->definitionMappers[$definitionType]->convertToDefinition($definition);
-+        $definition['comment'] = $columnComment;
-         if (isset($definition['default']) && $definition['default'] === false) {
-             $definition['default'] = null; //uniform default values
-         }
-@@ -214,7 +217,7 @@ class SchemaListener
-      * @param string $columnName
-      * @param array $definition
-      * @param string $primaryKeyName
--     * @param null $onCreate
-+     * @param string|null $onCreate
-      */
-     public function addColumn($tableName, $columnName, $definition, $primaryKeyName = 'PRIMARY', $onCreate = null)
-     {
-@@ -448,6 +451,7 @@ class SchemaListener
-      * @param array $foreignKeys
-      * @param array $indexes
-      * @param string $tableName
-+     * @param string $engine
-      */
-     private function prepareConstraintsAndIndexes(array $foreignKeys, array $indexes, $tableName, $engine)
-     {
-@@ -478,11 +482,16 @@ class SchemaListener
-      * Create table.
-      *
-      * @param Table $table
-+     * @throws \Zend_Db_Exception
-      */
-     public function createTable(Table $table)
-     {
-         $engine = strtolower($table->getOption('type'));
--        $this->tables[$this->getModuleName()][strtolower($table->getName())]['engine'] = $engine;
-+        $this->tables[$this->getModuleName()][strtolower($table->getName())] =
-+            [
-+                'engine' => $engine,
-+                'comment' => $table->getComment(),
-+            ];
-         $this->prepareColumns($table->getName(), $table->getColumns());
-         $this->prepareConstraintsAndIndexes($table->getForeignKeys(), $table->getIndexes(), $table->getName(), $engine);
-     }
-@@ -510,7 +519,7 @@ class SchemaListener
-     /**
-      * Drop table.
-      *
--     * @param $tableName
-+     * @param string $tableName
-      */
-     public function dropTable($tableName)
-     {
-diff --git a/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/TextBlobDefinition.php b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/TextBlobDefinition.php
-index 10e3b70e61b..9e8d63b26cf 100644
---- a/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/TextBlobDefinition.php
-+++ b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/TextBlobDefinition.php
-@@ -15,6 +15,7 @@ class TextBlobDefinition implements DefinitionConverterInterface
- {
-     /**
-      * Parse text size.
-+     *
-      * Returns max allowed size if value great it.
-      *
-      * @param string|int $size
-@@ -27,13 +28,13 @@ class TextBlobDefinition implements DefinitionConverterInterface
- 
-         switch ($last) {
-             case 'k':
--                $size = intval($size) * 1024;
-+                $size = (int)$size * 1024;
-                 break;
-             case 'm':
--                $size = intval($size) * 1024 * 1024;
-+                $size = (int)$size * 1024 * 1024;
-                 break;
-             case 'g':
--                $size = intval($size) * 1024 * 1024 * 1024;
-+                $size = (int)$size * 1024 * 1024 * 1024;
-                 break;
-         }
- 
-@@ -44,7 +45,7 @@ class TextBlobDefinition implements DefinitionConverterInterface
-             return Table::MAX_TEXT_SIZE;
-         }
- 
--        return intval($size);
-+        return (int)$size;
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/Setup/SchemaPersistor.php b/lib/internal/Magento/Framework/Setup/SchemaPersistor.php
-index f3af56b8ac2..51f61f1dde1 100644
---- a/lib/internal/Magento/Framework/Setup/SchemaPersistor.php
-+++ b/lib/internal/Magento/Framework/Setup/SchemaPersistor.php
-@@ -6,7 +6,7 @@
- namespace Magento\Framework\Setup;
- 
- use Magento\Framework\Component\ComponentRegistrar;
--use Magento\Framework\Shell;
-+use Magento\Framework\Setup\Declaration\Schema\Sharding;
- 
- /**
-  * Persist listened schema to db_schema.xml file.
-@@ -24,8 +24,6 @@ class SchemaPersistor
-     private $xmlPersistor;
- 
-     /**
--     * Constructor.
--     *
-      * @param ComponentRegistrar $componentRegistrar
-      * @param XmlPersistor $xmlPersistor
-      */
-@@ -64,32 +62,88 @@ class SchemaPersistor
-                 continue;
-             }
-             $schemaPatch = sprintf('%s/etc/db_schema.xml', $path);
--            if (file_exists($schemaPatch)) {
--                $dom = new \SimpleXMLElement(file_get_contents($schemaPatch));
--            } else {
--                $dom = $this->initEmptyDom();
--            }
-+            $dom = $this->processTables($schemaPatch, $tablesData);
-+            $this->persistModule($dom, $schemaPatch);
-+        }
-+    }
-+
-+    /**
-+     * Convert tables data into XML document.
-+     *
-+     * @param string $schemaPatch
-+     * @param array $tablesData
-+     * @return \SimpleXMLElement
-+     */
-+    private function processTables(string $schemaPatch, array $tablesData): \SimpleXMLElement
-+    {
-+        if (file_exists($schemaPatch)) {
-+            $dom = new \SimpleXMLElement(file_get_contents($schemaPatch));
-+        } else {
-+            $dom = $this->initEmptyDom();
-+        }
-+        $defaultAttributesValues = [
-+            'resource' => Sharding::DEFAULT_CONNECTION,
-+        ];
- 
--            foreach ($tablesData as $tableName => $tableData) {
--                $tableData = $this->handleDefinition($tableData);
-+        foreach ($tablesData as $tableName => $tableData) {
-+            $tableData = $this->handleDefinition($tableData);
-+            $table = $dom->xpath("//table[@name='" . $tableName . "']");
-+            if (!$table) {
-                 $table = $dom->addChild('table');
-                 $table->addAttribute('name', $tableName);
--                $table->addAttribute('resource', $tableData['resource']);
--                if (isset($tableData['engine']) && $tableData['engine'] !== null) {
--                    $table->addAttribute('engine', $tableData['engine']);
--                }
-+            } else {
-+                $table = reset($table);
-+            }
- 
--                $this->processColumns($tableData, $table);
--                $this->processConstraints($tableData, $table);
--                $this->processIndexes($tableData, $table);
-+            $attributeNames = ['disabled', 'resource', 'engine', 'comment'];
-+            foreach ($attributeNames as $attributeName) {
-+                $this->updateElementAttribute(
-+                    $table,
-+                    $attributeName,
-+                    $tableData,
-+                    $defaultAttributesValues[$attributeName] ?? null
-+                );
-             }
- 
--            $this->persistModule($dom, $schemaPatch);
-+            $this->processColumns($tableData, $table);
-+            $this->processConstraints($tableData, $table);
-+            $this->processIndexes($tableData, $table);
-+        }
-+
-+        return $dom;
-+    }
-+
-+    /**
-+     * Update element attribute value or create new attribute.
-+     *
-+     * @param \SimpleXMLElement $element
-+     * @param string $attributeName
-+     * @param array $elementData
-+     * @param string|null $defaultValue
-+     */
-+    private function updateElementAttribute(
-+        \SimpleXMLElement $element,
-+        string $attributeName,
-+        array $elementData,
-+        ?string $defaultValue = null
-+    ) {
-+        $attributeValue = $elementData[$attributeName] ?? $defaultValue;
-+        if ($attributeValue !== null) {
-+            if (is_bool($attributeValue)) {
-+                $attributeValue = $this->castBooleanToString($attributeValue);
-+            }
-+
-+            if ($element->attributes()[$attributeName]) {
-+                $element->attributes()->$attributeName = $attributeValue;
-+            } else {
-+                $element->addAttribute($attributeName, $attributeValue);
-+            }
-         }
-     }
- 
-     /**
-      * If disabled attribute is set to false it remove it at all.
-+     *
-      * Also handle other generic attributes.
-      *
-      * @param array $definition
-@@ -124,24 +178,30 @@ class SchemaPersistor
-      */
-     private function processColumns(array $tableData, \SimpleXMLElement $table)
-     {
--        if (isset($tableData['columns'])) {
--            foreach ($tableData['columns'] as $columnData) {
--                $columnData = $this->handleDefinition($columnData);
--                $domColumn = $table->addChild('column');
--                $domColumn->addAttribute('xsi:type', $columnData['xsi:type'], 'xsi');
--                unset($columnData['xsi:type']);
--
--                foreach ($columnData as $attributeKey => $attributeValue) {
--                    if ($attributeValue === null) {
--                        continue;
--                    }
--
--                    if (is_bool($attributeValue)) {
--                        $attributeValue = $this->castBooleanToString($attributeValue);
--                    }
-+        if (!isset($tableData['columns'])) {
-+            return $table;
-+        }
- 
--                    $domColumn->addAttribute($attributeKey, $attributeValue);
-+        foreach ($tableData['columns'] as $columnName => $columnData) {
-+            $columnData = $this->handleDefinition($columnData);
-+            $domColumn = $table->xpath("column[@name='" . $columnName . "']");
-+            if (!$domColumn) {
-+                $domColumn = $table->addChild('column');
-+                if (!empty($columnData['xsi:type'])) {
-+                    $domColumn->addAttribute('xsi:type', $columnData['xsi:type'], 'xsi');
-                 }
-+                $domColumn->addAttribute('name', $columnName);
-+            } else {
-+                $domColumn = reset($domColumn);
-+            }
-+
-+            $attributeNames = array_diff(array_keys($columnData), ['name', 'xsi:type']);
-+            foreach ($attributeNames as $attributeName) {
-+                $this->updateElementAttribute(
-+                    $domColumn,
-+                    $attributeName,
-+                    $columnData
-+                );
-             }
-         }
- 
-@@ -160,14 +220,29 @@ class SchemaPersistor
-         if (isset($tableData['indexes'])) {
-             foreach ($tableData['indexes'] as $indexName => $indexData) {
-                 $indexData = $this->handleDefinition($indexData);
--                $domIndex = $table->addChild('index');
--                $domIndex->addAttribute('name', $indexName);
- 
--                if (isset($indexData['disabled']) && $indexData['disabled']) {
--                    $domIndex->addAttribute('disabled', true);
--                } else {
--                    $domIndex->addAttribute('indexType', $indexData['indexType']);
-+                $domIndex = $table->xpath("index[@referenceId='" . $indexName . "']");
-+                if (!$domIndex) {
-+                    $domIndex = $this->getUniqueIndexByName($table, $indexName);
-+                }
-+
-+                if (!$domIndex) {
-+                    $domIndex = $table->addChild('index');
-+                    $domIndex->addAttribute('referenceId', $indexName);
-+                } elseif (is_array($domIndex)) {
-+                    $domIndex = reset($domIndex);
-+                }
- 
-+                $attributeNames = array_diff(array_keys($indexData), ['referenceId', 'columns', 'name']);
-+                foreach ($attributeNames as $attributeName) {
-+                    $this->updateElementAttribute(
-+                        $domIndex,
-+                        $attributeName,
-+                        $indexData
-+                    );
-+                }
-+                
-+                if (!empty($indexData['columns'])) {
-                     foreach ($indexData['columns'] as $column) {
-                         $columnXml = $domIndex->addChild('column');
-                         $columnXml->addAttribute('name', $column);
-@@ -188,37 +263,48 @@ class SchemaPersistor
-      */
-     private function processConstraints(array $tableData, \SimpleXMLElement $table)
-     {
--        if (isset($tableData['constraints'])) {
--            foreach ($tableData['constraints'] as $constraintType => $constraints) {
--                if ($constraintType === 'foreign') {
--                    foreach ($constraints as $name => $constraintData) {
--                        $constraintData = $this->handleDefinition($constraintData);
--                        $constraintDom = $table->addChild('constraint');
--                        $constraintDom->addAttribute('xsi:type', $constraintType, 'xsi');
--                        $constraintDom->addAttribute('name', $name);
--
--                        foreach ($constraintData as $attributeKey => $attributeValue) {
--                            $constraintDom->addAttribute($attributeKey, $attributeValue);
--                        }
--                    }
-+        if (!isset($tableData['constraints'])) {
-+            return $table;
-+        }
-+
-+        foreach ($tableData['constraints'] as $constraintType => $constraints) {
-+            foreach ($constraints as $constraintName => $constraintData) {
-+                $constraintData = $this->handleDefinition($constraintData);
-+                $domConstraint = $table->xpath("constraint[@referenceId='" . $constraintName . "']");
-+                if (!$domConstraint) {
-+                    $domConstraint = $table->addChild('constraint');
-+                    $domConstraint->addAttribute('xsi:type', $constraintType, 'xsi');
-+                    $domConstraint->addAttribute('referenceId', $constraintName);
-                 } else {
--                    foreach ($constraints as $name => $constraintData) {
--                        $constraintData = $this->handleDefinition($constraintData);
--                        $constraintDom = $table->addChild('constraint');
--                        $constraintDom->addAttribute('xsi:type', $constraintType, 'xsi');
--                        $constraintDom->addAttribute('name', $name);
--                        $constraintData['columns'] = $constraintData['columns'] ?? [];
--
--                        if (isset($constraintData['disabled'])) {
--                            $constraintDom->addAttribute('disabled', (bool) $constraintData['disabled']);
--                        }
--
--                        foreach ($constraintData['columns'] as $column) {
--                            $columnXml = $constraintDom->addChild('column');
--                            $columnXml->addAttribute('name', $column);
--                        }
-+                    $domConstraint = reset($domConstraint);
-+                }
-+
-+                $attributeNames = array_diff(
-+                    array_keys($constraintData),
-+                    ['referenceId', 'xsi:type', 'disabled', 'columns', 'name', 'type']
-+                );
-+                foreach ($attributeNames as $attributeName) {
-+                    $this->updateElementAttribute(
-+                        $domConstraint,
-+                        $attributeName,
-+                        $constraintData
-+                    );
-+                }
-+
-+                if (!empty($constraintData['columns'])) {
-+                    foreach ($constraintData['columns'] as $column) {
-+                        $columnXml = $domConstraint->addChild('column');
-+                        $columnXml->addAttribute('name', $column);
-                     }
-                 }
-+
-+                if (!empty($constraintData['disabled'])) {
-+                    $this->updateElementAttribute(
-+                        $domConstraint,
-+                        'disabled',
-+                        $constraintData
-+                    );
-+                }
-             }
-         }
- 
-@@ -236,4 +322,26 @@ class SchemaPersistor
-     {
-         $this->xmlPersistor->persist($simpleXmlElementDom, $path);
-     }
-+
-+    /**
-+     * Retrieve unique index declaration by name.
-+     *
-+     * @param \SimpleXMLElement $table
-+     * @param string $indexName
-+     * @return \SimpleXMLElement|null
-+     */
-+    private function getUniqueIndexByName(\SimpleXMLElement $table, string $indexName): ?\SimpleXMLElement
-+    {
-+        $indexElement = null;
-+        $constraint = $table->xpath("constraint[@referenceId='" . $indexName . "']");
-+        if ($constraint) {
-+            $constraint = reset($constraint);
-+            $type = $constraint->attributes('xsi', true)->type;
-+            if ($type == 'unique') {
-+                $indexElement = $constraint;
-+            }
-+        }
-+
-+        return $indexElement;
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Config/ConverterTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Config/ConverterTest.php
-index 2bb4bbcdb8d..80b0517f7bf 100644
---- a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Config/ConverterTest.php
-+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Config/ConverterTest.php
-@@ -46,7 +46,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
-                 <table name="test_table" resource="default">
-                     <column xsi:type="int" name="id" nullable="false" identity="true" comment="Id"/>
-                     <column xsi:type="varchar" name="data" length="100" identity="false" comment="Data"/>
--                    <constraint xsi:type="primary" name="PRIMARY">
-+                    <constraint xsi:type="primary" referenceId="PRIMARY_INDEX">
-                         <column name="id"/>
-                     </constraint>
-                 </table>
-@@ -74,12 +74,12 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
-                             ],
-                         ],
-                         'constraint' => [
--                            'PRIMARY' => [
-+                            'PRIMARY_INDEX' => [
-                                 'column' => [
-                                     'id' => 'id',
-                                 ],
-                                 'type' => 'primary',
--                                'name' => 'PRIMARY',
-+                                'referenceId' => 'PRIMARY_INDEX',
-                             ],
-                         ],
-                         'name' => 'test_table',
-diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/SchemaBuilderTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/SchemaBuilderTest.php
-index 15dfcc74640..b43a37a4138 100644
---- a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/SchemaBuilderTest.php
-+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/SchemaBuilderTest.php
-@@ -299,9 +299,6 @@ class SchemaBuilderTest extends \PHPUnit\Framework\TestCase
-      * @param array $references
-      * @param array $constraints
-      * @param array $indexes
--     * @expectedException \Exception
--     * @expectedExceptionMessage
--     * User Warning: Column unknown_column does not exist for index/constraint FIRST_INDEX in table second_table
-      */
-     public function testBuildUnknownIndexColumn(array $columns, array $references, array $constraints, array $indexes)
-     {
-@@ -315,6 +312,10 @@ class SchemaBuilderTest extends \PHPUnit\Framework\TestCase
-             Schema::class,
-             ['resourceConnection' => $resourceConnectionMock]
-         );
-+        $this->expectException(\PHPUnit\Framework\Exception::class);
-+        $this->expectExceptionMessage(
-+            'User Warning: Column unknown_column does not exist for index/constraint FIRST_INDEX in table second_table.'
-+        );
-         $this->model->build($schema);
-     }
- 
-diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Dto/Factories/ForeignTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Dto/Factories/ForeignTest.php
-deleted file mode 100644
-index ee4331e7bfc..00000000000
---- a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Dto/Factories/ForeignTest.php
-+++ /dev/null
-@@ -1,187 +0,0 @@
--<?php
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--declare(strict_types=1);
--
--namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Dto\Factories;
--
--use Magento\Framework\App\ResourceConnection;
--use Magento\Framework\DataObject;
--use Magento\Framework\DB\Adapter\AdapterInterface;
--use Magento\Framework\ObjectManagerInterface;
--use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
--use Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Foreign;
--use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
--use Magento\Framework\Setup\Declaration\Schema\TableNameResolver;
--use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
--
--/**
-- * Test foreign factory.
-- */
--class ForeignTest extends \PHPUnit\Framework\TestCase
--{
--    /**
--     * @var ObjectManagerHelper
--     */
--    private $objectManagerHelper;
--
--    /**
--     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $objectManagerMock;
--
--    /**
--     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $resourceConnectionMock;
--
--    /**
--     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $adapterMock;
--
--    /**
--     * @var TableNameResolver|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $tableNameResolver;
--
--    /**
--     * @var Foreign
--     */
--    private $foreignFactory;
--
--    public function setUp()
--    {
--        $this->objectManagerHelper = new ObjectManagerHelper($this);
--        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->adapterMock = $this->getMockBuilder(AdapterInterface::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--        $this->tableNameResolver = $this->getMockBuilder(TableNameResolver::class)
--            ->disableOriginalConstructor()
--            ->getMock();
--
--        $this->foreignFactory = $this->objectManagerHelper->getObject(
--            Foreign::class,
--            [
--                'objectManager' => $this->objectManagerMock,
--                'resourceConnection' => $this->resourceConnectionMock,
--                'tableNameResolver' => $this->tableNameResolver,
--            ]
--        );
--    }
--
--    /**
--     * @param string $prefix
--     * @dataProvider createDataProvider
--     */
--    public function testCreate(string $prefix)
--    {
--        $resource = 'default';
--        $tableNameWithoutPrefix = 'table_name';
--        $tableName = $prefix . $tableNameWithoutPrefix;
--
--        $columnName = 'entity_id';
--        $referenceTableName = 'second_table';
--        $referenceColumnName = 'website_id';
--
--        $foreignKeyNameWithoutPrefix = 'table_name_field_name';
--        $foreignKeyName = $prefix . $foreignKeyNameWithoutPrefix;
--
--        $table = $this->objectManagerHelper->getObject(
--            DataObject::class,
--            [
--                'data' => [
--                    'resource' => $resource,
--                    'name' => $tableName,
--                    'name_without_prefix' => $tableNameWithoutPrefix,
--                ],
--            ]
--        );
--
--        $columnMock = $this->objectManagerHelper->getObject(
--            DataObject::class,
--            [
--                'data' => ['name' => $columnName],
--            ]
--        );
--
--        $referenceTableMock = $this->objectManagerHelper->getObject(
--            DataObject::class,
--            [
--                'data' => ['name_without_prefix' => $referenceTableName],
--            ]
--        );
--
--        $referenceColumnMock = $this->objectManagerHelper->getObject(
--            DataObject::class,
--            [
--                'data' => ['name' => $referenceColumnName],
--            ]
--        );
--
--        $data = [
--            'name' => $foreignKeyName,
--            'table' => $table,
--            'column' => $columnMock,
--            'referenceTable' => $referenceTableMock,
--            'referenceColumn' => $referenceColumnMock,
--        ];
--
--        $expectedData = array_merge(
--            $data,
--            [
--                'onDelete' => Foreign::DEFAULT_ON_DELETE,
--                'nameWithoutPrefix' => $foreignKeyNameWithoutPrefix,
--            ]
--        );
--
--        $this->resourceConnectionMock
--            ->method('getTablePrefix')
--            ->willReturn($prefix);
--
--        $this->resourceConnectionMock
--            ->method('getConnection')
--            ->with($resource)
--            ->willReturn($this->adapterMock);
--
--        $this->tableNameResolver
--            ->method('getNameOfOriginTable')
--            ->with($tableNameWithoutPrefix)
--            ->willReturn($tableNameWithoutPrefix);
--
--        $this->adapterMock
--            ->method('getForeignKeyName')
--            ->with($tableNameWithoutPrefix, $columnName, $referenceTableName, $referenceColumnName)
--            ->willReturn($foreignKeyNameWithoutPrefix);
--
--        $this->objectManagerMock
--            ->expects($this->once())
--            ->method('create')
--            ->with(Reference::class, $expectedData);
--
--        $this->foreignFactory->create($data);
--    }
--
--    /**
--     * @return array
--     */
--    public function createDataProvider(): array
--    {
--        return [
--            'Prefix is defined' => [
--                'pref_',
--            ],
--            'Prefix is not defined' => [
--                '',
--            ],
--        ];
--    }
--}
-diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
-index f89bdc9e137..cb40845bcc4 100644
---- a/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
-+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
-@@ -91,7 +91,7 @@ class PatchApplierTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @var PatchBackwardCompatability |\PHPUnit_Framework_MockObject_MockObject
-      */
--    private $patchBacwardCompatability;
-+    private $patchBackwardCompatability;
- 
-     protected function setUp()
-     {
-@@ -109,7 +109,7 @@ class PatchApplierTest extends \PHPUnit\Framework\TestCase
-         $this->moduleDataSetupMock->expects($this->any())->method('getConnection')->willReturn($this->connectionMock);
- 
-         $objectManager = new ObjectManager($this);
--        $this->patchBacwardCompatability = $objectManager->getObject(
-+        $this->patchBackwardCompatability = $objectManager->getObject(
-             PatchBackwardCompatability::class,
-             [
-                 'moduleResource' => $this->moduleResourceMock
-@@ -128,7 +128,7 @@ class PatchApplierTest extends \PHPUnit\Framework\TestCase
-                 'objectManager' => $this->objectManagerMock,
-                 'schemaSetup' => $this->schemaSetupMock,
-                 'moduleDataSetup' => $this->moduleDataSetupMock,
--                'patchBackwardCompatability' => $this->patchBacwardCompatability
-+                'patchBackwardCompatability' => $this->patchBackwardCompatability
-             ]
-         );
-         require_once __DIR__ . '/../_files/data_patch_classes.php';
-diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaListenerTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaListenerTest.php
-index 4e34b3aebbf..cfde80b12ee 100644
---- a/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaListenerTest.php
-+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaListenerTest.php
-@@ -127,6 +127,7 @@ class SchemaListenerTest extends \PHPUnit\Framework\TestCase
-                         'default' => 'CURRENT_TIMESTAMP',
-                         'disabled' => false,
-                         'onCreate' => null,
-+                        'comment' => 'Column with type timestamp init update',
-                     ],
-                 'integer' =>
-                     [
-@@ -139,6 +140,7 @@ class SchemaListenerTest extends \PHPUnit\Framework\TestCase
-                         'default' => null,
-                         'disabled' => false,
-                         'onCreate' => null,
-+                        'comment' => 'Integer'
-                     ],
-                 'decimal' =>
-                     [
-@@ -151,6 +153,7 @@ class SchemaListenerTest extends \PHPUnit\Framework\TestCase
-                         'default' => null,
-                         'disabled' => false,
-                         'onCreate' => null,
-+                        'comment' => 'Decimal'
-                     ],
-             ],
-             $tables['First_Module']['new_table']['columns']
-diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaPersistorTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaPersistorTest.php
-index cc88af15a26..f65e6c910dc 100644
---- a/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaPersistorTest.php
-+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaPersistorTest.php
-@@ -152,13 +152,13 @@ class SchemaPersistorTest extends \PHPUnit\Framework\TestCase
-                                 <column xmlns:xsi="xsi" xsi:type="integer" name="first_column" nullable="1" 
-                                     unsigned="0"/>
-                                 <column xmlns:xsi="xsi" xsi:type="date" name="second_column" nullable="0"/>
--                                <constraint xmlns:xsi="xsi" xsi:type="foreign" name="some_foreign_constraint" 
-+                                <constraint xmlns:xsi="xsi" xsi:type="foreign" referenceId="some_foreign_constraint" 
-                                     referenceTable="table" referenceColumn="column" 
-                                     table="first_table" column="first_column"/>
--                                <constraint xmlns:xsi="xsi" xsi:type="primary" name="PRIMARY">
-+                                <constraint xmlns:xsi="xsi" xsi:type="primary" referenceId="PRIMARY">
-                                     <column name="second_column"/>
-                                 </constraint>
--                                <index name="TEST_INDEX" indexType="btree">
-+                                <index referenceId="TEST_INDEX" indexType="btree">
-                                     <column name="first_column"/>
-                                 </index>
-                             </table>
-diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
-index 3c2f20fcc18..45c31d367b3 100644
---- a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
-+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
-@@ -85,7 +85,7 @@ class Timezone implements TimezoneInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDefaultTimezonePath()
-     {
-@@ -93,7 +93,7 @@ class Timezone implements TimezoneInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDefaultTimezone()
-     {
-@@ -101,7 +101,7 @@ class Timezone implements TimezoneInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getConfigTimezone($scopeType = null, $scopeCode = null)
-     {
-@@ -113,7 +113,7 @@ class Timezone implements TimezoneInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDateFormat($type = \IntlDateFormatter::SHORT)
-     {
-@@ -125,7 +125,7 @@ class Timezone implements TimezoneInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDateFormatWithLongYear()
-     {
-@@ -137,7 +137,7 @@ class Timezone implements TimezoneInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getTimeFormat($type = \IntlDateFormatter::SHORT)
-     {
-@@ -149,7 +149,7 @@ class Timezone implements TimezoneInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDateTimeFormat($type)
-     {
-@@ -157,7 +157,7 @@ class Timezone implements TimezoneInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function date($date = null, $locale = null, $useTimezone = true, $includeTime = true)
-     {
-@@ -191,12 +191,13 @@ class Timezone implements TimezoneInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function scopeDate($scope = null, $date = null, $includeTime = false)
-     {
-         $timezone = $this->_scopeConfig->getValue($this->getDefaultTimezonePath(), $this->_scopeType, $scope);
--        $date = new \DateTime(is_numeric($date) ? '@' . $date : $date, new \DateTimeZone($timezone));
-+        $date = new \DateTime(is_numeric($date) ? '@' . $date : $date);
-+        $date->setTimezone(new \DateTimeZone($timezone));
-         if (!$includeTime) {
-             $date->setTime(0, 0, 0);
-         }
-@@ -204,7 +205,7 @@ class Timezone implements TimezoneInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function formatDate($date = null, $format = \IntlDateFormatter::SHORT, $showTime = false)
-     {
-@@ -218,7 +219,7 @@ class Timezone implements TimezoneInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function scopeTimeStamp($scope = null)
-     {
-@@ -231,7 +232,7 @@ class Timezone implements TimezoneInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
-     {
-@@ -247,23 +248,12 @@ class Timezone implements TimezoneInterface
-             $toTimeStamp += 86400;
-         }
- 
--        $result = false;
--        if (!$this->_dateTime->isEmptyDate($dateFrom) && $scopeTimeStamp < $fromTimeStamp) {
--        } elseif (!$this->_dateTime->isEmptyDate($dateTo) && $scopeTimeStamp > $toTimeStamp) {
--        } else {
--            $result = true;
--        }
--        return $result;
-+        return !(!$this->_dateTime->isEmptyDate($dateFrom) && $scopeTimeStamp < $fromTimeStamp ||
-+               !$this->_dateTime->isEmptyDate($dateTo) && $scopeTimeStamp > $toTimeStamp);
-     }
- 
-     /**
--     * @param string|\DateTimeInterface $date
--     * @param int $dateType
--     * @param int $timeType
--     * @param string|null $locale
--     * @param string|null $timezone
--     * @param string|null $pattern
--     * @return string
-+     * @inheritdoc
-      */
-     public function formatDateTime(
-         $date,
-@@ -299,13 +289,7 @@ class Timezone implements TimezoneInterface
-     }
- 
-     /**
--     * Convert date from config timezone to Utc.
--     * If pass \DateTime object as argument be sure that timezone is the same with config timezone
--     *
--     * @param string|\DateTimeInterface $date
--     * @param string $format
--     * @throws LocalizedException
--     * @return string
-+     * @inheritdoc
-      */
-     public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s')
-     {
-diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/LocalizedDateToUtcConverter.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/LocalizedDateToUtcConverter.php
-new file mode 100644
-index 00000000000..420fd6e543e
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/LocalizedDateToUtcConverter.php
-@@ -0,0 +1,74 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Stdlib\DateTime\Timezone;
-+
-+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-+use Magento\Framework\Locale\ResolverInterface;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+
-+/**
-+ * Class LocalizedDateToUtcConverter
-+ */
-+class LocalizedDateToUtcConverter implements LocalizedDateToUtcConverterInterface
-+{
-+    /**
-+     * Contains default date format
-+     *
-+     * @var string
-+     */
-+    private $defaultFormat = 'Y-m-d H:i:s';
-+
-+    /**
-+     * @var TimezoneInterface
-+     */
-+    private $timezone;
-+
-+    /**
-+     * @var ResolverInterface
-+     */
-+    private $localeResolver;
-+
-+    /**
-+     * LocalizedDateToUtcConverter constructor.
-+     *
-+     * @param TimezoneInterface $timezone
-+     * @param ResolverInterface $localeResolver
-+     */
-+    public function __construct(
-+        TimezoneInterface $timezone,
-+        ResolverInterface $localeResolver
-+    ) {
-+        $this->timezone = $timezone;
-+        $this->localeResolver = $localeResolver;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function convertLocalizedDateToUtc($date)
-+    {
-+        $configTimezone = $this->timezone->getConfigTimezone();
-+        $locale = $this->localeResolver->getLocale();
-+
-+        $formatter = new \IntlDateFormatter(
-+            $locale,
-+            \IntlDateFormatter::MEDIUM,
-+            \IntlDateFormatter::MEDIUM,
-+            $configTimezone
-+        );
-+
-+        $localTimestamp = $formatter->parse($date);
-+        $gmtTimestamp = $this->timezone->date($localTimestamp)->getTimestamp();
-+        $formattedUniversalTime = date($this->defaultFormat, $gmtTimestamp);
-+
-+        $date = new \DateTime($formattedUniversalTime, new \DateTimeZone($configTimezone));
-+        $date->setTimezone(new \DateTimeZone('UTC'));
-+
-+        return $date->format($this->defaultFormat);
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/LocalizedDateToUtcConverterInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/LocalizedDateToUtcConverterInterface.php
-new file mode 100644
-index 00000000000..d10bd5f2fef
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/LocalizedDateToUtcConverterInterface.php
-@@ -0,0 +1,22 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Stdlib\DateTime\Timezone;
-+
-+/*
-+ * Interface for converting localized date to UTC
-+ */
-+interface LocalizedDateToUtcConverterInterface
-+{
-+    /**
-+     * Convert localized date to UTC
-+     *
-+     * @param string $date
-+     * @return string
-+     */
-+    public function convertLocalizedDateToUtc($date);
-+}
-diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
-index a8b3fb1a81f..d1ac24c84be 100644
---- a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
-+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
-@@ -6,6 +6,8 @@
- 
- namespace Magento\Framework\Stdlib\DateTime;
- 
-+use Magento\Framework\Exception\LocalizedException;
-+
- /**
-  * Timezone Interface
-  * @api
-@@ -80,6 +82,7 @@ interface TimezoneInterface
- 
-     /**
-      * Get scope timestamp
-+     *
-      * Timestamp will be built with scope timezone settings
-      *
-      * @param   mixed $scope
-@@ -121,6 +124,8 @@ interface TimezoneInterface
-     public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null);
- 
-     /**
-+     * Format date according to date and time formats, locale, timezone and pattern.
-+     *
-      * @param string|\DateTimeInterface $date
-      * @param int $dateType
-      * @param int $timeType
-@@ -139,9 +144,14 @@ interface TimezoneInterface
-     );
- 
-     /**
-+     * Convert date from config timezone to UTC.
-+     *
-+     * If pass \DateTime object as argument be sure that timezone is the same with config timezone
-+     *
-      * @param string|\DateTimeInterface $date
-      * @param string $format
-      * @return string
-+     * @throws LocalizedException
-      * @since 100.1.0
-      */
-     public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s');
-diff --git a/lib/internal/Magento/Framework/Stdlib/Parameters.php b/lib/internal/Magento/Framework/Stdlib/Parameters.php
-new file mode 100644
-index 00000000000..dcefaf85d39
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Stdlib/Parameters.php
-@@ -0,0 +1,109 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Stdlib;
-+
-+use Zend\Stdlib\Parameters as ZendParameters;
-+
-+/**
-+ * Class Parameters
-+ */
-+class Parameters
-+{
-+    /**
-+     * @var ZendParameters
-+     */
-+    private $parameters;
-+
-+    /**
-+     * @param ZendParameters $parameters
-+     */
-+    public function __construct(
-+        ZendParameters $parameters
-+    ) {
-+        $this->parameters = $parameters;
-+    }
-+
-+    /**
-+     * Populate from native PHP array
-+     *
-+     * @param  array $values
-+     * @return void
-+     */
-+    public function fromArray(array $values)
-+    {
-+        $this->parameters->fromArray($values);
-+    }
-+
-+    /**
-+     * Populate from query string
-+     *
-+     * @param  string $string
-+     * @return void
-+     */
-+    public function fromString($string)
-+    {
-+        $this->parameters->fromString($string);
-+    }
-+
-+    /**
-+     * Serialize to native PHP array
-+     *
-+     * @return array
-+     */
-+    public function toArray()
-+    {
-+        return $this->parameters->toArray();
-+    }
-+
-+    /**
-+     * Serialize to query string
-+     *
-+     * @return string
-+     */
-+    public function toString()
-+    {
-+        return $this->parameters->toString();
-+    }
-+
-+    /**
-+     * Retrieve by key
-+     *
-+     * Returns null if the key does not exist.
-+     *
-+     * @param  string $name
-+     * @return mixed
-+     */
-+    public function offsetGet($name)
-+    {
-+        return $this->parameters->offsetGet($name);
-+    }
-+
-+    /**
-+     * Get name
-+     *
-+     * @param string $name
-+     * @param mixed $default optional default value
-+     * @return mixed
-+     */
-+    public function get($name, $default = null)
-+    {
-+        return $this->parameters->get($name, $default);
-+    }
-+
-+    /**
-+     * Set name
-+     *
-+     * @param string $name
-+     * @param mixed $value
-+     * @return \Zend\Stdlib\Parameters
-+     */
-+    public function set($name, $value)
-+    {
-+        return $this->parameters->set($name, $value);
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php
-index d57525590b9..3d7d14a3946 100644
---- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php
-+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php
-@@ -253,4 +253,15 @@ class TimezoneTest extends \PHPUnit\Framework\TestCase
-     {
-         $this->scopeConfig->method('getValue')->with('', '', null)->willReturn($configuredTimezone);
-     }
-+
-+    public function testCheckIfScopeDateSetsTimeZone()
-+    {
-+        $scopeDate = new \DateTime('now', new \DateTimeZone('America/Vancouver'));
-+        $this->scopeConfig->method('getValue')->willReturn('America/Vancouver');
-+
-+        $this->assertEquals(
-+            $scopeDate->getTimezone(),
-+            $this->getTimezone()->scopeDate(0, $scopeDate->getTimestamp())->getTimezone()
-+        );
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/System/Ftp.php b/lib/internal/Magento/Framework/System/Ftp.php
-index 8bf898965cb..14f55f32add 100644
---- a/lib/internal/Magento/Framework/System/Ftp.php
-+++ b/lib/internal/Magento/Framework/System/Ftp.php
-@@ -32,7 +32,7 @@ class Ftp
-     }
- 
-     /**
--     * ftp_mkdir wrapper
-+     * Wrapper for ftp_mkdir
-      *
-      * @param string $name
-      * @return string the newly created directory name on success or <b>FALSE</b> on error.
-@@ -56,7 +56,7 @@ class Ftp
-         $dir = explode("/", $path);
-         $path = "";
-         $ret = true;
--        for ($i = 0; $i < count($dir); $i++) {
-+        for ($i = 0, $count = count($dir); $i < $count; $i++) {
-             $path .= "/" . $dir[$i];
-             if (!@ftp_chdir($this->_conn, $path)) {
-                 @ftp_chdir($this->_conn, "/");
-@@ -127,7 +127,7 @@ class Ftp
-     public function connect($string, $timeout = 900)
-     {
-         $params = $this->validateConnectionString($string);
--        $port = isset($params['port']) ? intval($params['port']) : 21;
-+        $port = isset($params['port']) ? (int)$params['port'] : 21;
- 
-         $this->_conn = ftp_connect($params['host'], $port, $timeout);
- 
-@@ -147,7 +147,7 @@ class Ftp
-     }
- 
-     /**
--     * ftp_fput wrapper
-+     * Wrapper for ftp_fput
-      *
-      * @param string $remoteFile
-      * @param resource $handle
-@@ -162,7 +162,7 @@ class Ftp
-     }
- 
-     /**
--     * ftp_put wrapper
-+     * Wrapper for ftp_put
-      *
-      * @param string $remoteFile
-      * @param string $localFile
-@@ -188,7 +188,7 @@ class Ftp
-         if (empty($data[1])) {
-             return false;
-         }
--        if (intval($data[0]) != 257) {
-+        if ((int)$data[0] != 257) {
-             return false;
-         }
-         $out = trim($data[1], '"');
-@@ -199,7 +199,7 @@ class Ftp
-     }
- 
-     /**
--     * ftp_raw wrapper
-+     * Wrapper for ftp_raw
-      *
-      * @param string $cmd
-      * @return array The server's response as an array of strings.
-@@ -272,7 +272,7 @@ class Ftp
-     }
- 
-     /**
--     * ftp_pasv wrapper
-+     * Wrapper for ftp_pasv
-      *
-      * @param bool $pasv
-      * @return bool
-@@ -296,7 +296,7 @@ class Ftp
-     }
- 
-     /**
--     * ftp_chmod wrapper
-+     * Wrapper for ftp_chmod
-      *
-      * @param int $mode
-      * @param string $remoteFile
-@@ -309,7 +309,7 @@ class Ftp
-     }
- 
-     /**
--     * ftp_chdir wrapper
-+     * Wrapper for ftp_chdir
-      *
-      * @param string $dir
-      * @return bool
-@@ -321,7 +321,7 @@ class Ftp
-     }
- 
-     /**
--     * ftp_cdup wrapper
-+     * Wrapper for ftp_cdup
-      *
-      * @return bool
-      */
-@@ -332,7 +332,7 @@ class Ftp
-     }
- 
-     /**
--     * ftp_get wrapper
-+     * Wrapper for ftp_get
-      *
-      * @param string $localFile
-      * @param string $remoteFile
-@@ -349,7 +349,7 @@ class Ftp
-     }
- 
-     /**
--     * ftp_nlist wrapper
-+     * Wrapper for ftp_nlist
-      *
-      * @param string $dir
-      * @return bool
-@@ -362,7 +362,7 @@ class Ftp
-     }
- 
-     /**
--     * ftp_rawlist wrapper
-+     * Wrapper for ftp_rawlist
-      *
-      * @param string $dir
-      * @param bool $recursive
-diff --git a/lib/internal/Magento/Framework/Test/Unit/Communication/Config/ValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Communication/Config/ValidatorTest.php
-new file mode 100644
-index 00000000000..55410af176a
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Test/Unit/Communication/Config/ValidatorTest.php
-@@ -0,0 +1,70 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Test\Unit\Communication\Config;
-+
-+use Magento\Framework\Communication\Config\Validator;
-+use Magento\Framework\Reflection\MethodsMap;
-+use Magento\Framework\Reflection\TypeProcessor;
-+
-+/**
-+ * Unit test for \Magento\Framework\Communication\Config\Validator class
-+ */
-+class ValidatorTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var TypeProcessor|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $typeProcessor;
-+
-+    /**
-+     * @var MethodsMap|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $methodsMap;
-+
-+    public function setUp()
-+    {
-+        $this->methodsMap = $this->createMock(MethodsMap::class);
-+
-+        $this->methodsMap->expects(static::any())
-+            ->method('getMethodsMap')
-+            ->will($this->throwException(new \InvalidArgumentException('message', 333)));
-+
-+        $this->typeProcessor = $this->createMock(TypeProcessor::class);
-+        $this->typeProcessor->expects(static::any())
-+            ->method('isTypeSimple')
-+            ->willReturn(false);
-+
-+        $this->typeProcessor->expects(static::any())
-+            ->method('isTypeSimple')
-+            ->willReturn(false);
-+    }
-+
-+    /**
-+     * @expectedException  \LogicException
-+     * @expectedExceptionCode 333
-+     * @expectedExceptionMessage Response schema definition has service class with wrong annotated methods
-+     */
-+    public function testValidateResponseSchemaType()
-+    {
-+        /** @var Validator $validator */
-+        $validator = new Validator($this->typeProcessor, $this->methodsMap);
-+        $validator->validateResponseSchemaType('123', '123');
-+    }
-+
-+    /**
-+     * @expectedException  \LogicException
-+     * @expectedExceptionCode 333
-+     * @expectedExceptionMessage Request schema definition has service class with wrong annotated methods
-+     */
-+    public function testValidateRequestSchemaType()
-+    {
-+        /** @var Validator $validator */
-+        $validator = new Validator($this->typeProcessor, $this->methodsMap);
-+        $validator->validateRequestSchemaType('123', '123');
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Test/Unit/Data/CollectionTest.php b/lib/internal/Magento/Framework/Test/Unit/Data/CollectionTest.php
-index 75f8b1cd063..913d5a577e6 100644
---- a/lib/internal/Magento/Framework/Test/Unit/Data/CollectionTest.php
-+++ b/lib/internal/Magento/Framework/Test/Unit/Data/CollectionTest.php
-@@ -57,6 +57,27 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * Ensure that getSize works correctly with clear
-+     *
-+     */
-+    public function testClearTotalRecords()
-+    {
-+        $objOne = new \Magento\Framework\DataObject(['id' => 1, 'name' => 'one']);
-+        $objTwo = new \Magento\Framework\DataObject(['id' => 2, 'name' => 'two']);
-+        $objThree = new \Magento\Framework\DataObject(['id' => 3, 'name' => 'three']);
-+
-+        /** @noinspection PhpUnhandledExceptionInspection */
-+        $this->collection->addItem($objOne);
-+        /** @noinspection PhpUnhandledExceptionInspection */
-+        $this->collection->addItem($objTwo);
-+        /** @noinspection PhpUnhandledExceptionInspection */
-+        $this->collection->addItem($objThree);
-+        $this->assertEquals(3, $this->collection->getSize());
-+        $this->collection->clear();
-+        $this->assertEquals(0, $this->collection->getSize());
-+    }
-+
-     /**
-      * Callback function.
-      *
-diff --git a/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php b/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php
-index 7d54337f377..7e80aac1050 100644
---- a/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php
-+++ b/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php
-@@ -21,7 +21,15 @@ class HiddenTest extends \PHPUnit\Framework\TestCase
-     protected function setUp()
-     {
-         $objectManager = new ObjectManager($this);
--        $this->element = $objectManager->getObject(\Magento\Framework\Data\Form\Element\Hidden::class);
-+        $escaper = $objectManager->getObject(
-+            \Magento\Framework\Escaper::class
-+        );
-+        $this->element = $objectManager->getObject(
-+            \Magento\Framework\Data\Form\Element\Hidden::class,
-+            [
-+                'escaper' => $escaper
-+            ]
-+        );
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
-index ec05478b90d..e406994b54c 100644
---- a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
-+++ b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
-@@ -72,9 +72,9 @@ class EscaperTest extends \PHPUnit\Framework\TestCase
-         // Exceptions to escaping ranges
-         $immune = [',', '.', '_'];
-         for ($chr = 0; $chr < 0xFF; $chr++) {
--            if ($chr >= 0x30 && $chr <= 0x39
--                || $chr >= 0x41 && $chr <= 0x5A
--                || $chr >= 0x61 && $chr <= 0x7A
-+            if (($chr >= 0x30 && $chr <= 0x39)
-+                || ($chr >= 0x41 && $chr <= 0x5A)
-+                || ($chr >= 0x61 && $chr <= 0x7A)
-             ) {
-                 $literal = $this->codepointToUtf8($chr);
-                 $this->assertEquals($literal, $this->escaper->escapeJs($literal));
-@@ -174,6 +174,11 @@ class EscaperTest extends \PHPUnit\Framework\TestCase
-                 'data' => '&<>"\'&amp;&lt;&gt;&quot;&#039;&#9;',
-                 'expected' => '&amp;&lt;&gt;&quot;&#039;&amp;&lt;&gt;&quot;&#039;&#9;'
-             ],
-+            'text with special characters and allowed tag' => [
-+                'data' => '&<br/>"\'&amp;&lt;&gt;&quot;&#039;&#9;',
-+                'expected' => '&amp;<br>&quot;&#039;&amp;&lt;&gt;&quot;&#039;&#9;',
-+                'allowedTags' => ['br'],
-+            ],
-             'text with multiple allowed tags, includes self closing tag' => [
-                 'data' => '<span>some text in tags<br /></span>',
-                 'expected' => '<span>some text in tags<br></span>',
-diff --git a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
-index a52c49136d1..5027bfae606 100644
---- a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
-+++ b/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
-@@ -157,29 +157,29 @@ class DbStatusValidatorTest extends \PHPUnit\Framework\TestCase
-                     [
-                         DbVersionInfo::KEY_MODULE => 'Magento_Module4',
-                         DbVersionInfo::KEY_TYPE => 'data',
--                        DbVersionInfo::KEY_CURRENT => '1.0.1',
--                        DbVersionInfo::KEY_REQUIRED => '1.0.0'
-+                        DbVersionInfo::KEY_CURRENT => '1.0.10',
-+                        DbVersionInfo::KEY_REQUIRED => '1.0.9'
-                     ],
-                 ],
-                 'expectedMessage' => "Please update your modules: "
-                     . "Run \"composer install\" from the Magento root directory.\n"
-                     . "The following modules are outdated:\n"
-                     . "Magento_Module3 schema: code version - 1.0.0, database version - 2.0.0\n"
--                    . "Magento_Module4 data: code version - 1.0.0, database version - 1.0.1",
-+                    . "Magento_Module4 data: code version - 1.0.9, database version - 1.0.10",
-             ],
-             'some versions too high, some too low' => [
-                 'errors' => [
-                     [
--                        DbVersionInfo::KEY_MODULE => 'Magento_Module1',
-+                        DbVersionInfo::KEY_MODULE => 'Magento_Module2',
-                         DbVersionInfo::KEY_TYPE => 'schema',
--                        DbVersionInfo::KEY_CURRENT => '2.0.0',
--                        DbVersionInfo::KEY_REQUIRED => '1.0.0'
-+                        DbVersionInfo::KEY_CURRENT => '1.9.0',
-+                        DbVersionInfo::KEY_REQUIRED => '1.12.0'
-                     ],
-                     [
--                        DbVersionInfo::KEY_MODULE => 'Magento_Module2',
-+                        DbVersionInfo::KEY_MODULE => 'Magento_Module1',
-                         DbVersionInfo::KEY_TYPE => 'schema',
--                        DbVersionInfo::KEY_CURRENT => '1.0.0',
--                        DbVersionInfo::KEY_REQUIRED => '2.0.0'
-+                        DbVersionInfo::KEY_CURRENT => '2.0.0',
-+                        DbVersionInfo::KEY_REQUIRED => '1.0.0'
-                     ],
-                 ],
-                 'expectedMessage' => "Please update your modules: "
-diff --git a/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php b/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
-new file mode 100644
-index 00000000000..0ec27d6d053
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
-@@ -0,0 +1,374 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Framework\Test\Unit;
-+
-+use Magento\Framework\Serialize\SerializerInterface;
-+use Magento\Framework\Translate;
-+
-+/**
-+ * @SuppressWarnings(PHPMD.TooManyFields)
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class TranslateTest extends \PHPUnit\Framework\TestCase
-+{
-+    /** @var Translate */
-+    protected $translate;
-+
-+    /** @var \Magento\Framework\View\DesignInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $viewDesign;
-+
-+    /** @var \Magento\Framework\Cache\FrontendInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $cache;
-+
-+    /** @var \Magento\Framework\View\FileSystem|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $viewFileSystem;
-+
-+    /** @var \Magento\Framework\Module\ModuleList|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $moduleList;
-+
-+    /** @var \Magento\Framework\Module\Dir\Reader|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $modulesReader;
-+
-+    /** @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $scopeResolver;
-+
-+    /** @var \Magento\Framework\Translate\ResourceInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $resource;
-+
-+    /** @var \Magento\Framework\Locale\ResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $locale;
-+
-+    /** @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $appState;
-+
-+    /** @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $filesystem;
-+
-+    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $request;
-+
-+    /** @var \Magento\Framework\File\Csv|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $csvParser;
-+
-+    /** @var  \Magento\Framework\App\Language\Dictionary|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $packDictionary;
-+
-+    /** @var \Magento\Framework\Filesystem\Directory\ReadInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $directory;
-+
-+    /** @var \Magento\Framework\Filesystem\DriverInterface|\PHPUnit_Framework_MockObject_MockObject */
-+    protected $fileDriver;
-+
-+    protected function setUp(): void
-+    {
-+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $this->viewDesign = $this->createMock(\Magento\Framework\View\DesignInterface::class);
-+        $this->cache = $this->createMock(\Magento\Framework\Cache\FrontendInterface::class);
-+        $this->viewFileSystem = $this->createMock(\Magento\Framework\View\FileSystem::class);
-+        $this->moduleList = $this->createMock(\Magento\Framework\Module\ModuleList::class);
-+        $this->modulesReader = $this->createMock(\Magento\Framework\Module\Dir\Reader::class);
-+        $this->scopeResolver = $this->createMock(\Magento\Framework\App\ScopeResolverInterface::class);
-+        $this->resource = $this->createMock(\Magento\Framework\Translate\ResourceInterface::class);
-+        $this->locale = $this->createMock(\Magento\Framework\Locale\ResolverInterface::class);
-+        $this->appState = $this->createMock(\Magento\Framework\App\State::class);
-+        $this->request = $this->getMockForAbstractClass(
-+            \Magento\Framework\App\RequestInterface::class,
-+            [],
-+            '',
-+            false,
-+            false,
-+            true,
-+            ['getParam', 'getControllerModule']
-+        );
-+        $this->csvParser = $this->createMock(\Magento\Framework\File\Csv::class);
-+        $this->packDictionary = $this->createMock(\Magento\Framework\App\Language\Dictionary::class);
-+        $this->directory = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
-+        $filesystem = $this->createMock(\Magento\Framework\Filesystem::class);
-+        $filesystem->expects($this->once())->method('getDirectoryRead')->will($this->returnValue($this->directory));
-+        $this->fileDriver = $this->createMock(\Magento\Framework\Filesystem\DriverInterface::class);
-+
-+        $this->translate = new Translate(
-+            $this->viewDesign,
-+            $this->cache,
-+            $this->viewFileSystem,
-+            $this->moduleList,
-+            $this->modulesReader,
-+            $this->scopeResolver,
-+            $this->resource,
-+            $this->locale,
-+            $this->appState,
-+            $filesystem,
-+            $this->request,
-+            $this->csvParser,
-+            $this->packDictionary,
-+            $this->fileDriver
-+        );
-+
-+        $serializerMock = $this->createMock(SerializerInterface::class);
-+        $serializerMock->method('serialize')
-+            ->willReturnCallback(function ($data) {
-+                return json_encode($data);
-+            });
-+        $serializerMock->method('unserialize')
-+            ->willReturnCallback(function ($string) {
-+                return json_decode($string, true);
-+            });
-+        $objectManager->setBackwardCompatibleProperty(
-+            $this->translate,
-+            'serializer',
-+            $serializerMock
-+        );
-+    }
-+
-+    /**
-+     * @param string $area
-+     * @param bool $forceReload
-+     * @param array $cachedData
-+     * @dataProvider dataProviderLoadDataCachedTranslation
-+     */
-+    public function testLoadDataCachedTranslation($area, $forceReload, $cachedData): void
-+    {
-+        $this->expectsSetConfig('Magento/luma');
-+
-+        $this->cache->expects($this->once())
-+            ->method('load')
-+            ->will($this->returnValue(json_encode($cachedData)));
-+
-+        $this->appState->expects($this->exactly($area ? 0 : 1))
-+            ->method('getAreaCode')
-+            ->will($this->returnValue('frontend'));
-+
-+        $this->translate->loadData($area, $forceReload);
-+        $this->assertEquals($cachedData, $this->translate->getData());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderLoadDataCachedTranslation(): array
-+    {
-+        $cachedData = ['cached 1' => 'translated 1', 'cached 2' => 'translated 2'];
-+        return [
-+            ['adminhtml', false, $cachedData],
-+            ['frontend', false, $cachedData],
-+            [null, false, $cachedData],
-+        ];
-+    }
-+
-+    /**
-+     * @param string $area
-+     * @param bool $forceReload
-+     * @dataProvider dataProviderForTestLoadData
-+     * @SuppressWarnings(PHPMD.NPathComplexity)
-+     */
-+    public function testLoadData($area, $forceReload): void
-+    {
-+        $this->expectsSetConfig('Magento/luma');
-+
-+        $this->appState->expects($this->exactly($area ? 0 : 1))
-+            ->method('getAreaCode')
-+            ->will($this->returnValue('frontend'));
-+
-+        $this->cache->expects($this->exactly($forceReload ? 0 : 1))
-+            ->method('load')
-+            ->will($this->returnValue(false));
-+
-+        $this->directory->expects($this->any())->method('isExist')->will($this->returnValue(true));
-+
-+        // _loadModuleTranslation()
-+        $modules = ['some_module', 'other_module', 'another_module', 'current_module'];
-+        $this->request->expects($this->any())
-+            ->method('getControllerModule')
-+            ->willReturn('current_module');
-+        $this->moduleList->expects($this->once())->method('getNames')->will($this->returnValue($modules));
-+        $moduleData = [
-+            'module original' => 'module translated',
-+            'module theme' => 'module-theme original translated',
-+            'module pack' => 'module-pack original translated',
-+            'module db' => 'module-db original translated',
-+        ];
-+        $this->modulesReader->expects($this->any())->method('getModuleDir')->will($this->returnValue('/app/module'));
-+        $themeData = [
-+            'theme original' => 'theme translated',
-+            'module theme' => 'theme translated overwrite',
-+            'module pack' => 'theme-pack translated overwrite',
-+            'module db' => 'theme-db translated overwrite',
-+        ];
-+        $this->csvParser->expects($this->any())
-+            ->method('getDataPairs')
-+            ->will(
-+                $this->returnValueMap(
-+                    [
-+                        ['/app/module/en_US.csv', 0, 1, $moduleData],
-+                        ['/app/module/en_GB.csv', 0, 1, $moduleData],
-+                        ['/theme.csv', 0, 1, $themeData],
-+                    ]
-+                )
-+            );
-+        $this->fileDriver->expects($this->any())
-+            ->method('isExists')
-+            ->will(
-+                $this->returnValueMap(
-+                    [
-+                        ['/app/module/en_US.csv', true],
-+                        ['/app/module/en_GB.csv', true],
-+                        ['/theme.csv', true],
-+                    ]
-+                )
-+            );
-+
-+        // _loadPackTranslation
-+        $packData = [
-+            'pack original' => 'pack translated',
-+            'module pack' => 'pack translated overwrite',
-+            'module db' => 'pack-db translated overwrite',
-+        ];
-+        $this->packDictionary->expects($this->once())->method('getDictionary')->will($this->returnValue($packData));
-+
-+        // _loadThemeTranslation()
-+        $this->viewFileSystem->expects($this->any())
-+            ->method('getLocaleFileName')
-+            ->will($this->returnValue('/theme.csv'));
-+
-+        // _loadDbTranslation()
-+        $dbData = [
-+            'db original' => 'db translated',
-+            'module db' => 'db translated overwrite',
-+        ];
-+        $this->resource->expects($this->any())->method('getTranslationArray')->will($this->returnValue($dbData));
-+
-+        $this->cache->expects($this->exactly($forceReload ? 0 : 1))->method('save');
-+
-+        $this->translate->loadData($area, $forceReload);
-+
-+        $expected = [
-+            'module original' => 'module translated',
-+            'module theme' => 'theme translated overwrite',
-+            'module pack' => 'theme-pack translated overwrite',
-+            'module db' => 'db translated overwrite',
-+            'theme original' => 'theme translated',
-+            'pack original' => 'pack translated',
-+            'db original' => 'db translated',
-+        ];
-+        $this->assertEquals($expected, $this->translate->getData());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderForTestLoadData(): array
-+    {
-+        return [
-+            ['adminhtml', true],
-+            ['adminhtml', false],
-+            ['frontend', true],
-+            ['frontend', false],
-+            [null, true],
-+            [null, false]
-+        ];
-+    }
-+
-+    /**
-+     * @param $data
-+     * @param $result
-+     * @dataProvider dataProviderForTestGetData
-+     */
-+    public function testGetData($data, $result): void
-+    {
-+        $this->cache->expects($this->once())
-+            ->method('load')
-+            ->will($this->returnValue(json_encode($data)));
-+        $this->expectsSetConfig('themeId');
-+        $this->translate->loadData('frontend');
-+        $this->assertEquals($result, $this->translate->getData());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function dataProviderForTestGetData(): array
-+    {
-+        $data = ['original 1' => 'translated 1', 'original 2' => 'translated 2'];
-+        return [
-+            [$data, $data],
-+            [null, []]
-+        ];
-+    }
-+
-+    public function testGetLocale(): void
-+    {
-+        $this->locale->expects($this->once())->method('getLocale')->will($this->returnValue('en_US'));
-+        $this->assertEquals('en_US', $this->translate->getLocale());
-+
-+        $this->locale->expects($this->never())->method('getLocale');
-+        $this->assertEquals('en_US', $this->translate->getLocale());
-+
-+        $this->locale->expects($this->never())->method('getLocale');
-+        $this->translate->setLocale('en_GB');
-+        $this->assertEquals('en_GB', $this->translate->getLocale());
-+    }
-+
-+    public function testSetLocale(): void
-+    {
-+        $this->translate->setLocale('en_GB');
-+        $this->locale->expects($this->never())->method('getLocale');
-+        $this->assertEquals('en_GB', $this->translate->getLocale());
-+    }
-+
-+    public function testGetTheme(): void
-+    {
-+        $this->request->expects($this->at(0))->method('getParam')->with('theme')->will($this->returnValue(''));
-+
-+        $requestTheme = ['theme_title' => 'Theme Title'];
-+        $this->request->expects($this->at(1))->method('getParam')->with('theme')
-+            ->will($this->returnValue($requestTheme));
-+
-+        $this->assertEquals('theme', $this->translate->getTheme());
-+        $this->assertEquals('themeTheme Title', $this->translate->getTheme());
-+    }
-+
-+    public function testLoadDataNoTheme(): void
-+    {
-+        $forceReload = true;
-+        $this->expectsSetConfig(null, null);
-+        $this->moduleList->expects($this->once())->method('getNames')->will($this->returnValue([]));
-+        $this->appState->expects($this->once())->method('getAreaCode')->will($this->returnValue('frontend'));
-+        $this->packDictionary->expects($this->once())->method('getDictionary')->will($this->returnValue([]));
-+        $this->resource->expects($this->any())->method('getTranslationArray')->will($this->returnValue([]));
-+        $this->assertEquals($this->translate, $this->translate->loadData(null, $forceReload));
-+    }
-+
-+    /**
-+     * Declare calls expectation for setConfig() method
-+     */
-+    protected function expectsSetConfig($themeId, $localeCode = 'en_US'): void
-+    {
-+        $this->locale->expects($this->any())->method('getLocale')->will($this->returnValue($localeCode));
-+        $scope = new \Magento\Framework\DataObject(['code' => 'frontendCode', 'id' => 1]);
-+        $scopeAdmin = new \Magento\Framework\DataObject(['code' => 'adminCode', 'id' => 0]);
-+        $this->scopeResolver->expects($this->any())
-+            ->method('getScope')
-+            ->will(
-+                $this->returnValueMap(
-+                    [
-+                        [null, $scope],
-+                        ['admin', $scopeAdmin],
-+                    ]
-+                )
-+            );
-+        $designTheme = $this->getMockBuilder(\Magento\Theme\Model\Theme::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $designTheme->expects($this->once())
-+            ->method('getThemePath')
-+            ->willReturn($themeId);
-+
-+        $this->viewDesign->expects($this->any())->method('getDesignTheme')->will($this->returnValue($designTheme));
-+    }
-+}
-diff --git a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
-index 3713978d0f7..046a9d63fc8 100644
---- a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
-+++ b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
-@@ -149,8 +149,8 @@ class UrlTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @param $httpHost string
--     * @param $url string
-+     * @param string $httpHost
-+     * @param string $url
-      * @dataProvider getCurrentUrlProvider
-      */
-     public function testGetCurrentUrl($httpHost, $url)
-@@ -435,7 +435,7 @@ class UrlTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
--     * @param string $url
-+     * @param string $inputUrl
-      * @dataProvider getRebuiltUrlDataProvider
-      */
-     public function testGetRebuiltUrl($inputUrl, $outputUrl)
-diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php
-index 03c7d85251a..2d8348f64a5 100644
---- a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php
-+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php
-@@ -65,7 +65,7 @@ class GeneratedClassesAutoloader
-                     include $classSourceFile;
-                     return true;
-                 }
--            };
-+            }
-         }
- 
-         return false;
-diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
-index ffa8e250310..e992482609a 100644
---- a/lib/internal/Magento/Framework/Translate.php
-+++ b/lib/internal/Magento/Framework/Translate.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Framework;
- 
-@@ -59,7 +60,7 @@ class Translate implements \Magento\Framework\TranslateInterface
-     protected $_viewDesign;
- 
-     /**
--     * @var \Magento\Framework\Cache\FrontendInterface $cache
-+     * @var \Magento\Framework\Cache\FrontendInterface
-      */
-     protected $_cache;
- 
-@@ -277,6 +278,7 @@ class Translate implements \Magento\Framework\TranslateInterface
- 
-     /**
-      * Retrieve name of the current module
-+     *
-      * @return mixed
-      */
-     protected function getControllerModuleName()
-@@ -339,16 +341,21 @@ class Translate implements \Magento\Framework\TranslateInterface
-     }
- 
-     /**
--     * Load current theme translation
-+     * Load current theme translation according to fallback
-      *
-      * @return $this
-      */
-     protected function _loadThemeTranslation()
-     {
--        $file = $this->_getThemeTranslationFile($this->getLocale());
--        if ($file) {
--            $this->_addData($this->_getFileData($file));
-+        $themeFiles = $this->getThemeTranslationFilesList($this->getLocale());
-+
-+        /** @var string $file */
-+        foreach ($themeFiles as $file) {
-+            if ($file) {
-+                $this->_addData($this->_getFileData($file));
-+            }
-         }
-+
-         return $this;
-     }
- 
-@@ -389,11 +396,74 @@ class Translate implements \Magento\Framework\TranslateInterface
-         return $file;
-     }
- 
-+    /**
-+     * Get theme translation locale file name
-+     *
-+     * @param string|null $locale
-+     * @param array $config
-+     * @return string|null
-+     */
-+    private function getThemeTranslationFileName(?string $locale, array $config): ?string
-+    {
-+        $fileName = $this->_viewFileSystem->getLocaleFileName(
-+            'i18n' . '/' . $locale . '.csv',
-+            $config
-+        );
-+
-+        return $fileName ? $fileName : null;
-+    }
-+
-+    /**
-+     * Get parent themes for the current theme in fallback order
-+     *
-+     * @return array
-+     */
-+    private function getParentThemesList(): array
-+    {
-+        $themes = [];
-+
-+        $parentTheme = $this->_viewDesign->getDesignTheme()->getParentTheme();
-+        while ($parentTheme) {
-+            $themes[] = $parentTheme;
-+            $parentTheme = $parentTheme->getParentTheme();
-+        }
-+        $themes = array_reverse($themes);
-+
-+        return $themes;
-+    }
-+
-+    /**
-+     * Retrieve translation files for themes according to fallback
-+     *
-+     * @param string $locale
-+     *
-+     * @return array
-+     */
-+    private function getThemeTranslationFilesList($locale): array
-+    {
-+        $translationFiles = [];
-+
-+        /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
-+        foreach ($this->getParentThemesList() as $theme) {
-+            $config = $this->_config;
-+            $config['theme'] = $theme->getCode();
-+            $translationFiles[] = $this->getThemeTranslationFileName($locale, $config);
-+        }
-+
-+        $translationFiles[] = $this->getThemeTranslationFileName($locale, $this->_config);
-+
-+        return $translationFiles;
-+    }
-+
-     /**
-      * Retrieve translation file for theme
-      *
-      * @param string $locale
-      * @return string
-+     *
-+     * @deprecated
-+     *
-+     * @see \Magento\Framework\Translate::getThemeTranslationFilesList
-      */
-     protected function _getThemeTranslationFile($locale)
-     {
-diff --git a/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php b/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php
-index e8905f71ea7..4c3bfc1a196 100644
---- a/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php
-+++ b/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php
-@@ -43,7 +43,7 @@ interface ParserInterface
-     /**
-      * Sets the body content that is being parsed passed upon the passed in string.
-      *
--     * @param $content string
-+     * @param string $content
-      * @return void
-      */
-     public function setContent($content);
-diff --git a/lib/internal/Magento/Framework/Translate/Inline/Proxy.php b/lib/internal/Magento/Framework/Translate/Inline/Proxy.php
-index 370a88d6d9a..e6d6cc57c2b 100644
---- a/lib/internal/Magento/Framework/Translate/Inline/Proxy.php
-+++ b/lib/internal/Magento/Framework/Translate/Inline/Proxy.php
-@@ -55,10 +55,17 @@ class Proxy extends \Magento\Framework\Translate\Inline implements
-     }
- 
-     /**
-+     * Remove links to other objects.
-+     *
-      * @return array
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return ['subject', 'isShared'];
-     }
- 
-@@ -66,9 +73,14 @@ class Proxy extends \Magento\Framework\Translate\Inline implements
-      * Retrieve ObjectManager from global scope
-      *
-      * @return void
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $this->objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-     }
- 
-diff --git a/lib/internal/Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php b/lib/internal/Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php
-index f053a9afff7..0cf803be079 100644
---- a/lib/internal/Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php
-+++ b/lib/internal/Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php
-@@ -3,11 +3,16 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Unserialize\Test\Unit;
- 
- use Magento\Framework\Serialize\Serializer\Serialize;
- use Magento\Framework\Unserialize\Unserialize;
- 
-+/**
-+ * Test unserializer that does not unserialize objects.
-+ */
- class UnserializeTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -52,6 +57,10 @@ class UnserializeTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testUnserializeObject($serialized)
-     {
-+        $this->expectException(\PHPUnit\Framework\Exception::class);
-+        $this->expectExceptionMessage(
-+            'String contains serialized object'
-+        );
-         $this->assertFalse($this->unserialize->unserialize($serialized));
-     }
- 
-diff --git a/lib/internal/Magento/Framework/Validator/Factory.php b/lib/internal/Magento/Framework/Validator/Factory.php
-index f2089c662e9..2a296f7cdcb 100644
---- a/lib/internal/Magento/Framework/Validator/Factory.php
-+++ b/lib/internal/Magento/Framework/Validator/Factory.php
-@@ -6,22 +6,33 @@
- 
- namespace Magento\Framework\Validator;
- 
-+use Magento\Framework\Module\Dir\Reader;
-+use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\Phrase;
-+use Magento\Framework\Validator;
- use Magento\Framework\Cache\FrontendInterface;
- 
-+/**
-+ * Factory for \Magento\Framework\Validator and \Magento\Framework\Validator\Builder.
-+ */
- class Factory
- {
--    /** cache key */
-+    /**
-+     * cache key
-+     *
-+     * @deprecated
-+     */
-     const CACHE_KEY = __CLASS__;
- 
-     /**
--     * @var \Magento\Framework\ObjectManagerInterface
-+     * @var ObjectManagerInterface
-      */
-     protected $_objectManager;
- 
-     /**
-      * Validator config files
-      *
--     * @var array|null
-+     * @var iterable|null
-      */
-     protected $_configFiles = null;
- 
-@@ -31,40 +42,25 @@ class Factory
-     private $isDefaultTranslatorInitialized = false;
- 
-     /**
--     * @var \Magento\Framework\Module\Dir\Reader
-+     * @var Reader
-      */
-     private $moduleReader;
- 
--    /**
--     * @var FrontendInterface
--     */
--    private $cache;
--
--    /**
--     * @var \Magento\Framework\Serialize\SerializerInterface
--     */
--    private $serializer;
--
--    /**
--     * @var \Magento\Framework\Config\FileIteratorFactory
--     */
--    private $fileIteratorFactory;
--
-     /**
-      * Initialize dependencies
-      *
--     * @param \Magento\Framework\ObjectManagerInterface $objectManager
--     * @param \Magento\Framework\Module\Dir\Reader $moduleReader
--     * @param FrontendInterface $cache
-+     * @param ObjectManagerInterface $objectManager
-+     * @param Reader $moduleReader
-+     * @param FrontendInterface $cache @deprecated
-+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-      */
-     public function __construct(
--        \Magento\Framework\ObjectManagerInterface $objectManager,
--        \Magento\Framework\Module\Dir\Reader $moduleReader,
-+        ObjectManagerInterface $objectManager,
-+        Reader $moduleReader,
-         FrontendInterface $cache
-     ) {
-         $this->_objectManager = $objectManager;
-         $this->moduleReader = $moduleReader;
--        $this->cache = $cache;
-     }
- 
-     /**
-@@ -75,17 +71,7 @@ class Factory
-     protected function _initializeConfigList()
-     {
-         if (!$this->_configFiles) {
--            $this->_configFiles = $this->cache->load(self::CACHE_KEY);
--            if (!$this->_configFiles) {
--                $this->_configFiles = $this->moduleReader->getConfigurationFiles('validation.xml');
--                $this->cache->save(
--                    $this->getSerializer()->serialize($this->_configFiles->toArray()),
--                    self::CACHE_KEY
--                );
--            } else {
--                $filesArray = $this->getSerializer()->unserialize($this->_configFiles);
--                $this->_configFiles = $this->getFileIteratorFactory()->create(array_keys($filesArray));
--            }
-+            $this->_configFiles = $this->moduleReader->getConfigurationFiles('validation.xml');
-         }
-     }
- 
-@@ -93,6 +79,7 @@ class Factory
-      * Create and set default translator to \Magento\Framework\Validator\AbstractValidator.
-      *
-      * @return void
-+     * @throws \Zend_Translate_Exception
-      */
-     protected function _initializeDefaultTranslator()
-     {
-@@ -100,7 +87,7 @@ class Factory
-             // Pass translations to \Magento\Framework\TranslateInterface from validators
-             $translatorCallback = function () {
-                 $argc = func_get_args();
--                return (string)new \Magento\Framework\Phrase(array_shift($argc), $argc);
-+                return (string)new Phrase(array_shift($argc), $argc);
-             };
-             /** @var \Magento\Framework\Translate\Adapter $translator */
-             $translator = $this->_objectManager->create(\Magento\Framework\Translate\Adapter::class);
-@@ -115,14 +102,15 @@ class Factory
-      *
-      * Will instantiate \Magento\Framework\Validator\Config
-      *
--     * @return \Magento\Framework\Validator\Config
-+     * @return Config
-+     * @throws \Zend_Translate_Exception
-      */
-     public function getValidatorConfig()
-     {
-         $this->_initializeConfigList();
-         $this->_initializeDefaultTranslator();
-         return $this->_objectManager->create(
--            \Magento\Framework\Validator\Config::class,
-+            Config::class,
-             ['configFiles' => $this->_configFiles]
-         );
-     }
-@@ -133,7 +121,8 @@ class Factory
-      * @param string $entityName
-      * @param string $groupName
-      * @param array|null $builderConfig
--     * @return \Magento\Framework\Validator\Builder
-+     * @return Builder
-+     * @throws \Zend_Translate_Exception
-      */
-     public function createValidatorBuilder($entityName, $groupName, array $builderConfig = null)
-     {
-@@ -147,43 +136,12 @@ class Factory
-      * @param string $entityName
-      * @param string $groupName
-      * @param array|null $builderConfig
--     * @return \Magento\Framework\Validator
-+     * @return Validator
-+     * @throws \Zend_Translate_Exception
-      */
-     public function createValidator($entityName, $groupName, array $builderConfig = null)
-     {
-         $this->_initializeDefaultTranslator();
-         return $this->getValidatorConfig()->createValidator($entityName, $groupName, $builderConfig);
-     }
--
--    /**
--     * Get serializer
--     *
--     * @return \Magento\Framework\Serialize\SerializerInterface
--     * @deprecated 100.2.0
--     */
--    private function getSerializer()
--    {
--        if ($this->serializer === null) {
--            $this->serializer = $this->_objectManager->get(
--                \Magento\Framework\Serialize\SerializerInterface::class
--            );
--        }
--        return $this->serializer;
--    }
--
--    /**
--     * Get file iterator factory
--     *
--     * @return \Magento\Framework\Config\FileIteratorFactory
--     * @deprecated 100.2.0
--     */
--    private function getFileIteratorFactory()
--    {
--        if ($this->fileIteratorFactory === null) {
--            $this->fileIteratorFactory = $this->_objectManager->get(
--                \Magento\Framework\Config\FileIteratorFactory::class
--            );
--        }
--        return $this->fileIteratorFactory;
--    }
- }
-diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/FactoryTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/FactoryTest.php
-index 5511627c6dc..73a8c95c9a2 100644
---- a/lib/internal/Magento/Framework/Validator/Test/Unit/FactoryTest.php
-+++ b/lib/internal/Magento/Framework/Validator/Test/Unit/FactoryTest.php
-@@ -25,21 +25,6 @@ class FactoryTest extends \PHPUnit\Framework\TestCase
-      */
-     private $validatorConfigMock;
- 
--    /**
--     * @var \Magento\Framework\Cache\FrontendInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $cacheMock;
--
--    /**
--     * @var \Magento\Framework\Serialize\SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $serializerMock;
--
--    /**
--     * @var \Magento\Framework\Config\FileIteratorFactory|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $fileIteratorFactoryMock;
--
-     /**
-      * @var \Magento\Framework\Config\FileIterator|\PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -55,11 +40,6 @@ class FactoryTest extends \PHPUnit\Framework\TestCase
-      */
-     private $factory;
- 
--    /**
--     * @var string
--     */
--    private $jsonString = '["\/tmp\/moduleOne\/etc\/validation.xml"]';
--
-     /**
-      * @var array
-      */
-@@ -99,23 +79,9 @@ class FactoryTest extends \PHPUnit\Framework\TestCase
-             \Magento\Framework\Validator\Factory::class,
-             [
-                 'objectManager' => $this->objectManagerMock,
--                'moduleReader' => $this->readerMock,
--                'cache' => $this->cacheMock
-+                'moduleReader' => $this->readerMock
-             ]
-         );
--
--        $this->serializerMock = $this->createMock(\Magento\Framework\Serialize\SerializerInterface::class);
--        $this->fileIteratorFactoryMock = $this->createMock(\Magento\Framework\Config\FileIteratorFactory::class);
--        $objectManager->setBackwardCompatibleProperty(
--            $this->factory,
--            'serializer',
--            $this->serializerMock
--        );
--        $objectManager->setBackwardCompatibleProperty(
--            $this->factory,
--            'fileIteratorFactory',
--            $this->fileIteratorFactoryMock
--        );
-     }
- 
-     /**
-@@ -147,46 +113,6 @@ class FactoryTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testGetValidatorConfigCacheNotExist()
--    {
--        $this->cacheMock->expects($this->once())
--            ->method('load')
--            ->willReturn(false);
--        $this->readerMock->expects($this->once())
--            ->method('getConfigurationFiles')
--            ->willReturn($this->fileIteratorMock);
--        $this->fileIteratorMock->method('toArray')
--            ->willReturn($this->data);
--        $this->cacheMock->expects($this->once())
--            ->method('save')
--            ->with($this->jsonString);
--        $this->serializerMock->expects($this->once())
--            ->method('serialize')
--            ->with($this->data)
--            ->willReturn($this->jsonString);
--        $this->factory->getValidatorConfig();
--        $this->factory->getValidatorConfig();
--    }
--
--    public function testGetValidatorConfigCacheExist()
--    {
--        $this->cacheMock->expects($this->once())
--            ->method('load')
--            ->willReturn($this->jsonString);
--        $this->readerMock->expects($this->never())
--            ->method('getConfigurationFiles');
--        $this->cacheMock->expects($this->never())
--            ->method('save');
--        $this->serializerMock->expects($this->once())
--            ->method('unserialize')
--            ->with($this->jsonString)
--            ->willReturn($this->data);
--        $this->fileIteratorFactoryMock->method('create')
--            ->willReturn($this->fileIteratorMock);
--        $this->factory->getValidatorConfig();
--        $this->factory->getValidatorConfig();
--    }
--
-     public function testCreateValidatorBuilder()
-     {
-         $this->readerMock->method('getConfigurationFiles')
-diff --git a/lib/internal/Magento/Framework/View/Asset/Config.php b/lib/internal/Magento/Framework/View/Asset/Config.php
-index 2a3d0d3dad4..6a0548b3395 100644
---- a/lib/internal/Magento/Framework/View/Asset/Config.php
-+++ b/lib/internal/Magento/Framework/View/Asset/Config.php
-@@ -8,7 +8,6 @@ namespace Magento\Framework\View\Asset;
- 
- use Magento\Store\Model\ScopeInterface;
- use Magento\Framework\App\Config\ScopeConfigInterface;
--use Magento\Framework\App\State;
- 
- /**
-  * View asset configuration interface
-@@ -55,7 +54,7 @@ class Config implements \Magento\Framework\View\Asset\ConfigInterface
-      */
-     public function isMergeCssFiles()
-     {
--        return (bool)$this->scopeConfig->isSetFlag(
-+        return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_MERGE_CSS_FILES,
-             ScopeInterface::SCOPE_STORE
-         );
-@@ -68,7 +67,7 @@ class Config implements \Magento\Framework\View\Asset\ConfigInterface
-      */
-     public function isBundlingJsFiles()
-     {
--        return (bool)$this->scopeConfig->isSetFlag(
-+        return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_JS_BUNDLING,
-             ScopeInterface::SCOPE_STORE
-         );
-@@ -81,7 +80,7 @@ class Config implements \Magento\Framework\View\Asset\ConfigInterface
-      */
-     public function isMergeJsFiles()
-     {
--        return (bool)$this->scopeConfig->isSetFlag(
-+        return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_MERGE_JS_FILES,
-             ScopeInterface::SCOPE_STORE
-         );
-@@ -94,7 +93,7 @@ class Config implements \Magento\Framework\View\Asset\ConfigInterface
-      */
-     public function isMinifyHtml()
-     {
--        return (bool)$this->scopeConfig->isSetFlag(
-+        return $this->scopeConfig->isSetFlag(
-             self::XML_PATH_MINIFICATION_HTML,
-             ScopeInterface::SCOPE_STORE
-         );
-diff --git a/lib/internal/Magento/Framework/View/Asset/MergeService.php b/lib/internal/Magento/Framework/View/Asset/MergeService.php
-index a5820a6d765..594235ea2fa 100644
---- a/lib/internal/Magento/Framework/View/Asset/MergeService.php
-+++ b/lib/internal/Magento/Framework/View/Asset/MergeService.php
-@@ -40,6 +40,21 @@ class MergeService
-      */
-     protected $state;
- 
-+    /**
-+     * List of supported types that can be processed by merge service
-+     *
-+     * @var array
-+     */
-+    private const SUPPORTED_MERGE_TYPE = [
-+        'css',
-+        'js',
-+        'eot',
-+        'svg',
-+        'ttf',
-+        'woff',
-+        'woff2',
-+    ];
-+
-     /**
-      * Constructor
-      *
-@@ -72,7 +87,7 @@ class MergeService
-     {
-         $isCss = $contentType == 'css';
-         $isJs = $contentType == 'js';
--        if (!$isCss && !$isJs) {
-+        if (!in_array($contentType, self::SUPPORTED_MERGE_TYPE, true)) {
-             throw new \InvalidArgumentException("Merge for content type '{$contentType}' is not supported.");
-         }
- 
-diff --git a/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Direct.php b/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Direct.php
-index 1e8eb74bf54..315c3ee2048 100644
---- a/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Direct.php
-+++ b/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Direct.php
-@@ -6,6 +6,8 @@
- namespace Magento\Framework\View\Asset\MergeStrategy;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\Framework\App\ObjectManager;
-+use Magento\Framework\Math\Random;
- use Magento\Framework\View\Asset;
- 
- /**
-@@ -30,38 +32,46 @@ class Direct implements \Magento\Framework\View\Asset\MergeStrategyInterface
-      */
-     private $cssUrlResolver;
- 
-+    /**
-+     * @var Random
-+     */
-+    private $mathRandom;
-+
-     /**
-      * @param \Magento\Framework\Filesystem $filesystem
-      * @param \Magento\Framework\View\Url\CssResolver $cssUrlResolver
-+     * @param Random|null $mathRandom
-      */
-     public function __construct(
-         \Magento\Framework\Filesystem $filesystem,
--        \Magento\Framework\View\Url\CssResolver $cssUrlResolver
-+        \Magento\Framework\View\Url\CssResolver $cssUrlResolver,
-+        Random $mathRandom = null
-     ) {
-         $this->filesystem = $filesystem;
-         $this->cssUrlResolver = $cssUrlResolver;
-+        $this->mathRandom = $mathRandom ?: ObjectManager::getInstance()->get(Random::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function merge(array $assetsToMerge, Asset\LocalInterface $resultAsset)
-     {
-         $mergedContent = $this->composeMergedContent($assetsToMerge, $resultAsset);
-         $filePath = $resultAsset->getPath();
-+        $tmpFilePath = $filePath . $this->mathRandom->getUniqueHash('_');
-         $staticDir = $this->filesystem->getDirectoryWrite(DirectoryList::STATIC_VIEW);
-         $tmpDir = $this->filesystem->getDirectoryWrite(DirectoryList::TMP);
--        $tmpDir->writeFile($filePath, $mergedContent);
--        $tmpDir->renameFile($filePath, $filePath, $staticDir);
-+        $tmpDir->writeFile($tmpFilePath, $mergedContent);
-+        $tmpDir->renameFile($tmpFilePath, $filePath, $staticDir);
-     }
- 
-     /**
-      * Merge files together and modify content if needed
-      *
--     * @param \Magento\Framework\View\Asset\MergeableInterface[] $assetsToMerge
--     * @param \Magento\Framework\View\Asset\LocalInterface $resultAsset
--     * @return string
--     * @throws \Magento\Framework\Exception\LocalizedException
-+     * @param array $assetsToMerge
-+     * @param Asset\LocalInterface $resultAsset
-+     * @return array|string
-      */
-     private function composeMergedContent(array $assetsToMerge, Asset\LocalInterface $resultAsset)
-     {
-diff --git a/lib/internal/Magento/Framework/View/Asset/Minification.php b/lib/internal/Magento/Framework/View/Asset/Minification.php
-index 33c82a1810d..087d57ffa41 100644
---- a/lib/internal/Magento/Framework/View/Asset/Minification.php
-+++ b/lib/internal/Magento/Framework/View/Asset/Minification.php
-@@ -64,7 +64,7 @@ class Minification
-         if (!isset($this->configCache[self::XML_PATH_MINIFICATION_ENABLED][$contentType])) {
-             $this->configCache[self::XML_PATH_MINIFICATION_ENABLED][$contentType] =
-                 $this->appState->getMode() != State::MODE_DEVELOPER &&
--                (bool)$this->scopeConfig->isSetFlag(
-+                $this->scopeConfig->isSetFlag(
-                     sprintf(self::XML_PATH_MINIFICATION_ENABLED, $contentType),
-                     $this->scope
-                 );
-@@ -112,6 +112,8 @@ class Minification
-     }
- 
-     /**
-+     * Is Minified Filename
-+     *
-      * @param string $filename
-      * @return bool
-      */
-@@ -121,6 +123,8 @@ class Minification
-     }
- 
-     /**
-+     * Is Excluded
-+     *
-      * @param string $filename
-      * @return boolean
-      */
-@@ -135,6 +139,8 @@ class Minification
-     }
- 
-     /**
-+     * Get Excludes
-+     *
-      * @param string $contentType
-      * @return string[]
-      */
-@@ -162,7 +168,16 @@ class Minification
-     private function getMinificationExcludeValues($key)
-     {
-         $configValues = $this->scopeConfig->getValue($key, $this->scope) ?? [];
--
-+        //value used to be a string separated by 'newline' separator so we need to convert it to array
-+        if (!is_array($configValues)) {
-+            $configValuesFromString = [];
-+            foreach (explode("\n", $configValues) as $exclude) {
-+                if (trim($exclude) != '') {
-+                    $configValuesFromString[] = trim($exclude);
-+                }
-+            }
-+            $configValues = $configValuesFromString;
-+        }
-         return array_values($configValues);
-     }
- }
-diff --git a/lib/internal/Magento/Framework/View/Asset/Repository.php b/lib/internal/Magento/Framework/View/Asset/Repository.php
-index 654d80382f4..15b9a713018 100644
---- a/lib/internal/Magento/Framework/View/Asset/Repository.php
-+++ b/lib/internal/Magento/Framework/View/Asset/Repository.php
-@@ -10,6 +10,7 @@ use Magento\Framework\UrlInterface;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\App\ObjectManager;
- use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
-+use Magento\Framework\Exception\LocalizedException;
- 
- /**
-  * A repository service for view assets
-@@ -126,6 +127,7 @@ class Repository
-      * @return $this
-      *
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-+     * @SuppressWarnings(PHPMD.NPathComplexity)
-      */
-     public function updateDesignParams(array &$params)
-     {
-@@ -146,7 +148,12 @@ class Repository
-         }
- 
-         if ($theme) {
--            $params['themeModel'] = $this->getThemeProvider()->getThemeByFullPath($area . '/' . $theme);
-+            if (is_numeric($theme)) {
-+                $params['themeModel'] = $this->getThemeProvider()->getThemeById($theme);
-+            } else {
-+                $params['themeModel'] = $this->getThemeProvider()->getThemeByFullPath($area . '/' . $theme);
-+            }
-+
-             if (!$params['themeModel']) {
-                 throw new \UnexpectedValueException("Could not find theme '$theme' for area '$area'");
-             }
-@@ -167,6 +174,8 @@ class Repository
-     }
- 
-     /**
-+     * Get theme provider
-+     *
-      * @return ThemeProviderInterface
-      */
-     private function getThemeProvider()
-@@ -196,6 +205,7 @@ class Repository
-      * @param string $fileId
-      * @param array $params
-      * @return File
-+     * @throws LocalizedException
-      */
-     public function createAsset($fileId, array $params = [])
-     {
-@@ -440,6 +450,8 @@ class Repository
-     }
- 
-     /**
-+     * Get repository files map
-+     *
-      * @param string $fileId
-      * @param array $params
-      * @return RepositoryMap
-diff --git a/lib/internal/Magento/Framework/View/Context.php b/lib/internal/Magento/Framework/View/Context.php
-index c3f1c3e691c..508d63d158b 100644
---- a/lib/internal/Magento/Framework/View/Context.php
-+++ b/lib/internal/Magento/Framework/View/Context.php
-@@ -14,6 +14,7 @@ use Magento\Framework\App\State as AppState;
- use Magento\Framework\Event\ManagerInterface;
- use Psr\Log\LoggerInterface as Logger;
- use Magento\Framework\Session\SessionManager;
-+use Magento\Framework\Session\SessionManagerInterface;
- use Magento\Framework\TranslateInterface;
- use Magento\Framework\UrlInterface;
- use Magento\Framework\View\ConfigInterface as ViewConfig;
-@@ -144,6 +145,7 @@ class Context
-      * @param Logger $logger
-      * @param AppState $appState
-      * @param LayoutInterface $layout
-+     * @param SessionManagerInterface|null $sessionManager
-      *
-      * @todo reduce parameter number
-      *
-@@ -163,7 +165,8 @@ class Context
-         CacheState $cacheState,
-         Logger $logger,
-         AppState $appState,
--        LayoutInterface $layout
-+        LayoutInterface $layout,
-+        SessionManagerInterface $sessionManager = null
-     ) {
-         $this->request = $request;
-         $this->eventManager = $eventManager;
-@@ -171,7 +174,7 @@ class Context
-         $this->translator = $translator;
-         $this->cache = $cache;
-         $this->design = $design;
--        $this->session = $session;
-+        $this->session = $sessionManager ?: $session;
-         $this->scopeConfig = $scopeConfig;
-         $this->frontController = $frontController;
-         $this->viewConfig      = $viewConfig;
-@@ -332,6 +335,8 @@ class Context
-     }
- 
-     /**
-+     * Get Front Name
-+     *
-      * @see getModuleName
-      */
-     public function getFrontName()
-diff --git a/lib/internal/Magento/Framework/View/Design/Theme/ThemeList.php b/lib/internal/Magento/Framework/View/Design/Theme/ThemeList.php
-index 000fba24f08..0d6ed2f98b5 100644
---- a/lib/internal/Magento/Framework/View/Design/Theme/ThemeList.php
-+++ b/lib/internal/Magento/Framework/View/Design/Theme/ThemeList.php
-@@ -40,7 +40,7 @@ class ThemeList extends \Magento\Framework\Data\Collection implements ListInterf
-     protected $_itemObjectClass = ThemeInterface::class;
- 
-     /**
--     * @var \Magento\Framework\Config\ThemeFactory $themeConfigFactory
-+     * @var \Magento\Framework\Config\ThemeFactory
-      */
-     protected $themeConfigFactory;
- 
-diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
-index b2f857bf29f..43614e9cae8 100644
---- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
-+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
-@@ -3,9 +3,12 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\View\Element;
- 
-+use Magento\Framework\Cache\LockGuardedCacheLoader;
- use Magento\Framework\DataObject\IdentityInterface;
-+use Magento\Framework\App\ObjectManager;
- 
- /**
-  * Base class for all blocks.
-@@ -175,14 +178,23 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
-      */
-     protected $_cache;
- 
-+    /**
-+     * @var LockGuardedCacheLoader
-+     */
-+    private $lockQuery;
-+
-     /**
-      * Constructor
-      *
-      * @param \Magento\Framework\View\Element\Context $context
-      * @param array $data
-+     * @param LockGuardedCacheLoader|null $lockQuery
-      */
--    public function __construct(\Magento\Framework\View\Element\Context $context, array $data = [])
--    {
-+    public function __construct(
-+        \Magento\Framework\View\Element\Context $context,
-+        array $data = [],
-+        LockGuardedCacheLoader $lockQuery = null
-+    ) {
-         $this->_request = $context->getRequest();
-         $this->_layout = $context->getLayout();
-         $this->_eventManager = $context->getEventManager();
-@@ -204,6 +216,8 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
-             $this->jsLayout = $data['jsLayout'];
-             unset($data['jsLayout']);
-         }
-+        $this->lockQuery = $lockQuery
-+            ?: ObjectManager::getInstance()->get(LockGuardedCacheLoader::class);
-         parent::__construct($data);
-         $this->_construct();
-     }
-@@ -658,19 +672,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
-         }
- 
-         $html = $this->_loadCache();
--        if ($html === false) {
--            if ($this->hasData('translate_inline')) {
--                $this->inlineTranslation->suspend($this->getData('translate_inline'));
--            }
--
--            $this->_beforeToHtml();
--            $html = $this->_toHtml();
--            $this->_saveCache($html);
--
--            if ($this->hasData('translate_inline')) {
--                $this->inlineTranslation->resume();
--            }
--        }
-         $html = $this->_afterToHtml($html);
- 
-         /** @var \Magento\Framework\DataObject */
-@@ -679,10 +680,13 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
-                 'html' => $html,
-             ]
-         );
--        $this->_eventManager->dispatch('view_block_abstract_to_html_after', [
--            'block' => $this,
--            'transport' => $transportObject
--        ]);
-+        $this->_eventManager->dispatch(
-+            'view_block_abstract_to_html_after',
-+            [
-+                'block' => $this,
-+                'transport' => $transportObject
-+            ]
-+        );
-         $html = $transportObject->getHtml();
- 
-         return $html;
-@@ -725,7 +729,7 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
-      */
-     public function getUiId($arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null)
-     {
--        return ' data-ui-id="' . $this->getJsId($arg1, $arg2, $arg3, $arg4, $arg5) . '" ';
-+        return ' data-ui-id="' . $this->escapeHtmlAttr($this->getJsId($arg1, $arg2, $arg3, $arg4, $arg5)) . '" ';
-     }
- 
-     /**
-@@ -952,7 +956,7 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
-      */
-     public function escapeUrl($string)
-     {
--        return $this->_escaper->escapeUrl($string);
-+        return $this->_escaper->escapeUrl((string)$string);
-     }
- 
-     /**
-@@ -972,8 +976,8 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
-      *
-      * Use $addSlashes = false for escaping js that inside html attribute (onClick, onSubmit etc)
-      *
--     * @param  string $data
--     * @param  bool $addSlashes
-+     * @param string $data
-+     * @param bool $addSlashes
-      * @return string
-      * @deprecated 100.2.0
-      */
-@@ -1083,23 +1087,54 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
-     /**
-      * Load block html from cache storage
-      *
--     * @return string|false
-+     * @return string
-      */
-     protected function _loadCache()
-     {
-+        $collectAction = function () {
-+            if ($this->hasData('translate_inline')) {
-+                $this->inlineTranslation->suspend($this->getData('translate_inline'));
-+            }
-+
-+            $this->_beforeToHtml();
-+            return $this->_toHtml();
-+        };
-+
-         if ($this->getCacheLifetime() === null || !$this->_cacheState->isEnabled(self::CACHE_GROUP)) {
--            return false;
--        }
--        $cacheKey = $this->getCacheKey();
--        $cacheData = $this->_cache->load($cacheKey);
--        if ($cacheData) {
--            $cacheData = str_replace(
--                $this->_getSidPlaceholder($cacheKey),
--                $this->_sidResolver->getSessionIdQueryParam($this->_session) . '=' . $this->_session->getSessionId(),
--                $cacheData
--            );
-+            $html = $collectAction();
-+            if ($this->hasData('translate_inline')) {
-+                $this->inlineTranslation->resume();
-+            }
-+            return $html;
-         }
--        return $cacheData;
-+        $loadAction = function () {
-+            $cacheKey = $this->getCacheKey();
-+            $cacheData = $this->_cache->load($cacheKey);
-+            if ($cacheData) {
-+                $cacheData = str_replace(
-+                    $this->_getSidPlaceholder($cacheKey),
-+                    $this->_sidResolver->getSessionIdQueryParam($this->_session)
-+                    . '='
-+                    . $this->_session->getSessionId(),
-+                    $cacheData
-+                );
-+            }
-+            return $cacheData;
-+        };
-+
-+        $saveAction = function ($data) {
-+            $this->_saveCache($data);
-+            if ($this->hasData('translate_inline')) {
-+                $this->inlineTranslation->resume();
-+            }
-+        };
-+
-+        return (string)$this->lockQuery->lockedLoadData(
-+            $this->getCacheKey(),
-+            $loadAction,
-+            $collectAction,
-+            $saveAction
-+        );
-     }
- 
-     /**
-@@ -1156,6 +1191,7 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
- 
-     /**
-      * Determine if the block scope is private or public.
-+     *
-      * Returns true if scope is private, false otherwise
-      *
-      * @return bool
-diff --git a/lib/internal/Magento/Framework/View/Element/ComponentVisibilityInterface.php b/lib/internal/Magento/Framework/View/Element/ComponentVisibilityInterface.php
-new file mode 100644
-index 00000000000..29d14553481
---- /dev/null
-+++ b/lib/internal/Magento/Framework/View/Element/ComponentVisibilityInterface.php
-@@ -0,0 +1,20 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Framework\View\Element;
-+
-+/**
-+ * Interface which allows to modify visibility behavior of UI components
-+ */
-+interface ComponentVisibilityInterface
-+{
-+    /**
-+     * Defines if the component can be shown
-+     *
-+     * @return bool
-+     */
-+    public function isComponentVisible(): bool;
-+}
-diff --git a/lib/internal/Magento/Framework/View/Element/Html/Date.php b/lib/internal/Magento/Framework/View/Element/Html/Date.php
-index 558e39427cb..909938256b1 100644
---- a/lib/internal/Magento/Framework/View/Element/Html/Date.php
-+++ b/lib/internal/Magento/Framework/View/Element/Html/Date.php
-@@ -78,7 +78,7 @@ class Date extends \Magento\Framework\View\Element\Template
-         if ($this->getFormat() && $this->getValue()) {
-             return strftime($this->getFormat(), strtotime($this->getValue()));
-         }
--        return htmlspecialchars($this->getValue());
-+        return $this->escapeHtml($this->getValue());
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
-index ab1bca9f454..7aac210dcab 100644
---- a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
-+++ b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
-@@ -5,6 +5,10 @@
-  */
- namespace Magento\Framework\View\Element\Html\Link;
- 
-+use Magento\Framework\App\DefaultPathInterface;
-+use Magento\Framework\View\Element\Template;
-+use Magento\Framework\View\Element\Template\Context;
-+
- /**
-  * Block representing link with two possible states.
-  * "Current" state means link leads to URL equivalent to URL of currently displayed page.
-@@ -17,25 +21,25 @@ namespace Magento\Framework\View\Element\Html\Link;
-  * @method null|bool                       getCurrent()
-  * @method \Magento\Framework\View\Element\Html\Link\Current setCurrent(bool $value)
-  */
--class Current extends \Magento\Framework\View\Element\Template
-+class Current extends Template
- {
-     /**
-      * Default path
-      *
--     * @var \Magento\Framework\App\DefaultPathInterface
-+     * @var DefaultPathInterface
-      */
-     protected $_defaultPath;
- 
-     /**
-      * Constructor
-      *
--     * @param \Magento\Framework\View\Element\Template\Context $context
--     * @param \Magento\Framework\App\DefaultPathInterface $defaultPath
-+     * @param Context $context
-+     * @param DefaultPathInterface $defaultPath
-      * @param array $data
-      */
-     public function __construct(
--        \Magento\Framework\View\Element\Template\Context $context,
--        \Magento\Framework\App\DefaultPathInterface $defaultPath,
-+        Context $context,
-+        DefaultPathInterface $defaultPath,
-         array $data = []
-     ) {
-         parent::__construct($context, $data);
-@@ -56,18 +60,20 @@ class Current extends \Magento\Framework\View\Element\Template
-      * Get current mca
-      *
-      * @return string
-+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
-      */
-     private function getMca()
-     {
-         $routeParts = [
--            'module' => $this->_request->getModuleName(),
--            'controller' => $this->_request->getControllerName(),
--            'action' => $this->_request->getActionName(),
-+            (string)$this->_request->getModuleName(),
-+            (string)$this->_request->getControllerName(),
-+            (string)$this->_request->getActionName(),
-         ];
- 
-         $parts = [];
-+        $pathParts = explode('/', trim($this->_request->getPathInfo(), '/'));
-         foreach ($routeParts as $key => $value) {
--            if (!empty($value) && $value != $this->_defaultPath->getPart($key)) {
-+            if (isset($pathParts[$key]) && $pathParts[$key] === $value) {
-                 $parts[] = $value;
-             }
-         }
-@@ -104,13 +110,13 @@ class Current extends \Magento\Framework\View\Element\Template
-         if ($this->isCurrent()) {
-             $html = '<li class="nav item current">';
-             $html .= '<strong>'
--                . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getLabel()))
-+                . $this->escapeHtml(__($this->getLabel()))
-                 . '</strong>';
-             $html .= '</li>';
-         } else {
-             $html = '<li class="nav item' . $highlight . '"><a href="' . $this->escapeHtml($this->getHref()) . '"';
-             $html .= $this->getTitle()
--                ? ' title="' . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getTitle())) . '"'
-+                ? ' title="' . $this->escapeHtml(__($this->getTitle())) . '"'
-                 : '';
-             $html .= $this->getAttributesHtml() . '>';
- 
-@@ -118,7 +124,7 @@ class Current extends \Magento\Framework\View\Element\Template
-                 $html .= '<strong>';
-             }
- 
--            $html .= $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getLabel()));
-+            $html .= $this->escapeHtml(__($this->getLabel()));
- 
-             if ($this->getIsHighlighted()) {
-                 $html .= '</strong>';
-diff --git a/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php b/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
-index 4b4e7e1bad4..285c05c9db6 100644
---- a/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
-+++ b/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
-@@ -7,10 +7,10 @@ namespace Magento\Framework\View\Element\Template\File;
- 
- use \Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\Component\ComponentRegistrar;
-+use \Magento\Framework\Filesystem\Driver\File as FileDriver;
- 
- /**
-  * Class Validator
-- * @package Magento\Framework\View\Element\Template\File
-  */
- class Validator
- {
-@@ -68,6 +68,11 @@ class Validator
-      */
-     protected $_compiledDir;
- 
-+    /**
-+     * @var FileDriver
-+     */
-+    private $fileDriver;
-+
-     /**
-      * Class constructor
-      *
-@@ -75,12 +80,14 @@ class Validator
-      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface
-      * @param ComponentRegistrar $componentRegistrar
-      * @param string|null $scope
-+     * @param FileDriver|null $fileDriver
-      */
-     public function __construct(
-         \Magento\Framework\Filesystem $filesystem,
-         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface,
-         ComponentRegistrar $componentRegistrar,
--        $scope = null
-+        $scope = null,
-+        ?FileDriver $fileDriver = null
-     ) {
-         $this->_filesystem = $filesystem;
-         $this->_isAllowSymlinks = $scopeConfigInterface->getValue(self::XML_PATH_TEMPLATE_ALLOW_SYMLINK, $scope);
-@@ -88,6 +95,7 @@ class Validator
-         $this->moduleDirs = $componentRegistrar->getPaths(ComponentRegistrar::MODULE);
-         $this->_compiledDir = $this->_filesystem->getDirectoryRead(DirectoryList::TMP_MATERIALIZATION_DIR)
-             ->getAbsolutePath();
-+        $this->fileDriver = $fileDriver ?: \Magento\Framework\App\ObjectManager::getInstance()->get(FileDriver::class);
-     }
- 
-     /**
-@@ -127,8 +135,9 @@ class Validator
-         if (!is_array($directories)) {
-             $directories = (array)$directories;
-         }
-+        $realPath = $this->fileDriver->getRealPath($path);
-         foreach ($directories as $directory) {
--            if (0 === strpos($path, $directory)) {
-+            if (0 === strpos($realPath, $directory)) {
-                 return true;
-             }
-         }
-diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php
-index b20726b7958..015ecf403b3 100644
---- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php
-+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php
-@@ -341,7 +341,7 @@ class DomMerger implements DomMergerInterface
-      * Validate dom document
-      *
-      * @param \DOMDocument $domDocument
--     * @param string|null $schemaFilePath
-+     * @param string|null $schema
-      * @return array of errors
-      * @throws \Exception
-      */
-diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
-index 48a66b429eb..fbb84712b2a 100644
---- a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
-+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
-@@ -5,7 +5,9 @@
-  */
- namespace Magento\Framework\View\Element\UiComponent;
- 
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\App\RequestInterface;
-+use Magento\Framework\AuthorizationInterface;
- use Magento\Framework\UrlInterface;
- use Magento\Framework\View\Element\UiComponent\ContentType\ContentTypeFactory;
- use Magento\Framework\View\Element\UiComponent\Control\ActionPoolFactory;
-@@ -94,6 +96,11 @@ class Context implements ContextInterface
-      */
-     protected $uiComponentFactory;
- 
-+    /**
-+     * @var AuthorizationInterface
-+     */
-+    private $authorization;
-+
-     /**
-      * @param PageLayoutInterface $pageLayout
-      * @param RequestInterface $request
-@@ -104,7 +111,8 @@ class Context implements ContextInterface
-      * @param Processor $processor
-      * @param UiComponentFactory $uiComponentFactory
-      * @param DataProviderInterface|null $dataProvider
--     * @param null $namespace
-+     * @param string $namespace
-+     * @param AuthorizationInterface|null $authorization
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -117,7 +125,8 @@ class Context implements ContextInterface
-         Processor $processor,
-         UiComponentFactory $uiComponentFactory,
-         DataProviderInterface $dataProvider = null,
--        $namespace = null
-+        $namespace = null,
-+        AuthorizationInterface $authorization = null
-     ) {
-         $this->namespace = $namespace;
-         $this->request = $request;
-@@ -129,6 +138,9 @@ class Context implements ContextInterface
-         $this->urlBuilder = $urlBuilder;
-         $this->processor = $processor;
-         $this->uiComponentFactory = $uiComponentFactory;
-+        $this->authorization = $authorization ?: ObjectManager::getInstance()->get(
-+            AuthorizationInterface::class
-+        );
-         $this->setAcceptType();
-     }
- 
-@@ -152,7 +164,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getComponentsDefinitions()
-     {
-@@ -160,7 +172,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getRenderEngine()
-     {
-@@ -168,7 +180,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getNamespace()
-     {
-@@ -176,7 +188,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAcceptType()
-     {
-@@ -184,7 +196,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getRequestParams()
-     {
-@@ -192,7 +204,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getRequestParam($key, $defaultValue = null)
-     {
-@@ -200,7 +212,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFiltersParams()
-     {
-@@ -208,7 +220,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getFilterParam($key, $defaultValue = null)
-     {
-@@ -217,7 +229,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDataProvider()
-     {
-@@ -225,7 +237,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getDataSourceData(UiComponentInterface $component)
-     {
-@@ -250,7 +262,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getPageLayout()
-     {
-@@ -258,7 +270,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function addButtons(array $buttons, UiComponentInterface $component)
-     {
-@@ -280,6 +292,9 @@ class Context implements ContextInterface
-             uasort($buttons, [$this, 'sortButtons']);
- 
-             foreach ($buttons as $buttonId => $buttonData) {
-+                if (isset($buttonData['aclResource']) && !$this->authorization->isAllowed($buttonData['aclResource'])) {
-+                    continue;
-+                }
-                 if (isset($buttonData['url'])) {
-                     $buttonData['url'] = $this->getUrl($buttonData['url']);
-                 }
-@@ -297,14 +312,14 @@ class Context implements ContextInterface
-      */
-     public function sortButtons(array $itemA, array $itemB)
-     {
--        $sortOrderA = isset($itemA['sort_order']) ? intval($itemA['sort_order']) : 0;
--        $sortOrderB = isset($itemB['sort_order']) ? intval($itemB['sort_order']) : 0;
-+        $sortOrderA = isset($itemA['sort_order']) ? (int)$itemA['sort_order'] : 0;
-+        $sortOrderB = isset($itemB['sort_order']) ? (int)$itemB['sort_order'] : 0;
- 
-         return $sortOrderA - $sortOrderB;
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-      */
-     public function addHtmlBlocks(array $htmlBlocks, UiComponentInterface $component)
-@@ -336,7 +351,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setDataProvider(DataProviderInterface $dataProvider)
-     {
-@@ -344,7 +359,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getUrl($route = '', $params = [])
-     {
-@@ -370,7 +385,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getProcessor()
-     {
-@@ -378,7 +393,7 @@ class Context implements ContextInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getUiComponentFactory()
-     {
-diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
-index f683e248aec..e2920cf400a 100644
---- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
-+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
-@@ -64,12 +64,13 @@ class FulltextFilter implements FilterApplierInterface
- 
-     /**
-      * Escape against value
-+     *
-      * @param string $value
-      * @return string
-      */
-     private function escapeAgainstValue(string $value): string
-     {
--        return preg_replace('/([+\-><\(\)~*\"@]+)/', ' ', $value);
-+        return preg_replace('/([+\-><\(\)~*@]+)/', ' ', $value);
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php b/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php
-index 34f32b2f6b7..71fa8d2c0ae 100644
---- a/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php
-+++ b/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php
-@@ -6,7 +6,7 @@
- 
- namespace Magento\Framework\View\File\Collector\Decorator;
- 
--use Magento\Framework\Module\Manager;
-+use Magento\Framework\Module\ModuleManagerInterface;
- use Magento\Framework\View\Design\ThemeInterface;
- use Magento\Framework\View\File;
- use Magento\Framework\View\File\CollectorInterface;
-@@ -26,7 +26,7 @@ class ModuleOutput implements CollectorInterface
-     /**
-      * Module manager
-      *
--     * @var \Magento\Framework\Module\Manager
-+     * @var \Magento\Framework\Module\ModuleManagerInterface
-      */
-     private $moduleManager;
- 
-@@ -38,7 +38,7 @@ class ModuleOutput implements CollectorInterface
-      */
-     public function __construct(
-         CollectorInterface $subject,
--        Manager $moduleManager
-+        ModuleManagerInterface $moduleManager
-     ) {
-         $this->subject = $subject;
-         $this->moduleManager = $moduleManager;
-diff --git a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/DataObject.php b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/DataObject.php
-index ea9fef369e3..bf607672cae 100644
---- a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/DataObject.php
-+++ b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/DataObject.php
-@@ -3,10 +3,14 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\View\Layout\Argument\Interpreter;
- 
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Data\Argument\InterpreterInterface;
- use Magento\Framework\ObjectManagerInterface;
-+use Magento\Framework\Stdlib\BooleanUtils;
- 
- /**
-  * Interpreter that instantiates object by a class name
-@@ -14,43 +18,54 @@ use Magento\Framework\ObjectManagerInterface;
- class DataObject implements InterpreterInterface
- {
-     /**
--     * @var ObjectManagerInterface
-+     * @var \Magento\Framework\ObjectManagerInterface
-      */
-     private $objectManager;
- 
-+    /**
-+     * @var \Magento\Framework\Stdlib\BooleanUtils
-+     */
-+    private $booleanUtils;
-+
-     /**
-      * @var string|null
-      */
-     private $expectedClass;
- 
-     /**
--     * @param ObjectManagerInterface $objectManager
-+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
-      * @param string|null $expectedClass
-+     * @param \Magento\Framework\Stdlib\BooleanUtils|null $booleanUtils
-      */
--    public function __construct(ObjectManagerInterface $objectManager, $expectedClass = null)
--    {
-+    public function __construct(
-+        ObjectManagerInterface $objectManager,
-+        ?string $expectedClass = null,
-+        ?BooleanUtils $booleanUtils = null
-+    ) {
-         $this->objectManager = $objectManager;
-         $this->expectedClass = $expectedClass;
-+        $this->booleanUtils = $booleanUtils ?? ObjectManager::getInstance()->get(BooleanUtils::class);
-     }
- 
-     /**
--     * {@inheritdoc}
--     * @return object
--     * @throws \InvalidArgumentException
--     * @throws \UnexpectedValueException
-+     * @inheritdoc
-      */
-     public function evaluate(array $data)
-     {
-         if (!isset($data['value'])) {
-             throw new \InvalidArgumentException('Object class name is missing.');
-         }
-+
-+        $shared = isset($data['shared']) ? $this->booleanUtils->toBoolean($data['shared']) : true;
-         $className = $data['value'];
--        $result = $this->objectManager->create($className);
-+        $result = $shared ? $this->objectManager->get($className) : $this->objectManager->create($className);
-+
-         if ($this->expectedClass && !$result instanceof $this->expectedClass) {
-             throw new \UnexpectedValueException(
--                sprintf("Instance of %s is expected, got %s instead.", $this->expectedClass, get_class($result))
-+                \sprintf('Instance of %s is expected, got %s instead.', $this->expectedClass, \get_class($result))
-             );
-         }
-+
-         return $result;
-     }
- }
-diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
-index bc250c54e79..39da65a2d1f 100755
---- a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
-+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
-@@ -6,6 +6,7 @@
- namespace Magento\Framework\View\Layout\Generator;
- 
- use Magento\Framework\App\State;
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\ObjectManager\Config\Reader\Dom;
- use Magento\Framework\View\Element\Template;
- use Magento\Framework\View\Layout;
-@@ -102,9 +103,7 @@ class Block implements Layout\GeneratorInterface
-     }
- 
-     /**
--     * {@inheritdoc}
--     *
--     * @return string
-+     * @inheritdoc
-      */
-     public function getType()
-     {
-@@ -272,7 +271,7 @@ class Block implements Layout\GeneratorInterface
-             }
-         }
-         if (!$block instanceof \Magento\Framework\View\Element\AbstractBlock) {
--            throw new \Magento\Framework\Exception\LocalizedException(
-+            throw new LocalizedException(
-                 new \Magento\Framework\Phrase(
-                     'Invalid block type: %1',
-                     [is_object($block) ? get_class($block) : (string) $block]
-diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php b/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php
-index 1a336f2e398..8a6ea85a9b7 100644
---- a/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php
-+++ b/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php
-@@ -3,6 +3,7 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\View\Layout\Generator;
- 
- use Magento\Framework\View\Element\BlockFactory;
-@@ -65,7 +66,7 @@ class UiComponent implements GeneratorInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getType()
-     {
-@@ -90,8 +91,6 @@ class UiComponent implements GeneratorInterface
-         $layout = $generatorContext->getLayout();
- 
-         // Instantiate blocks and collect all actions data
--        /** @var $blocks \Magento\Framework\View\Element\AbstractBlock[] */
--        $blocks = [];
-         foreach ($scheduledElements as $elementName => $element) {
-             list($elementType, $data) = $element;
- 
-@@ -99,9 +98,10 @@ class UiComponent implements GeneratorInterface
-                 continue;
-             }
- 
--            $block = $this->generateComponent($structure, $elementName, $data, $layout);
--            $blocks[$elementName] = $block;
--            $layout->setBlock($elementName, $block);
-+            $layout->setBlock(
-+                $elementName,
-+                $this->generateComponent($structure, $elementName, $data, $layout)
-+            );
-             $scheduledStructure->unsetElement($elementName);
-         }
- 
-diff --git a/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php b/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
-index 266a1f873f4..a585eda37df 100644
---- a/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
-+++ b/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
-@@ -37,7 +37,7 @@ class GeneratorPool
-      * @param ScheduledStructure\Helper $helper
-      * @param ConditionFactory $conditionFactory
-      * @param \Psr\Log\LoggerInterface $logger
--     * @param array $generators
-+     * @param array|null $generators
-      */
-     public function __construct(
-         ScheduledStructure\Helper $helper,
-@@ -67,7 +67,7 @@ class GeneratorPool
-     }
- 
-     /**
--     * Traverse through all generators and generate all scheduled elements
-+     * Traverse through all generators and generate all scheduled elements.
-      *
-      * @param Reader\Context $readerContext
-      * @param Generator\Context $generatorContext
-@@ -86,11 +86,17 @@ class GeneratorPool
-      * Add generators to pool
-      *
-      * @param GeneratorInterface[] $generators
-+     *
-      * @return void
-      */
-     protected function addGenerators(array $generators)
-     {
-         foreach ($generators as $generator) {
-+            if (!$generator instanceof GeneratorInterface) {
-+                throw new \InvalidArgumentException(
-+                    sprintf('Generator class must be an instance of %s', GeneratorInterface::class)
-+                );
-+            }
-             $this->generators[$generator->getType()] = $generator;
-         }
-     }
-@@ -131,9 +137,9 @@ class GeneratorPool
-     }
- 
-     /**
--     * Reorder a child of a specified element
-+     * Reorder a child of a specified element.
-      *
--     * @param ScheduledStructure $scheduledStructure,
-+     * @param ScheduledStructure $scheduledStructure
-      * @param Data\Structure $structure
-      * @param string $elementName
-      * @return void
-@@ -227,6 +233,8 @@ class GeneratorPool
-     }
- 
-     /**
-+     * Check visibility conditions exists in data.
-+     *
-      * @param array $data
-      *
-      * @return bool
-diff --git a/lib/internal/Magento/Framework/View/Layout/Proxy.php b/lib/internal/Magento/Framework/View/Layout/Proxy.php
-index 03020307c53..a3d89c6ec7a 100644
---- a/lib/internal/Magento/Framework/View/Layout/Proxy.php
-+++ b/lib/internal/Magento/Framework/View/Layout/Proxy.php
-@@ -57,10 +57,17 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
-+     * Remove links to objects.
-+     *
-      * @return array
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __sleep()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         return ['_subject', '_isShared'];
-     }
- 
-@@ -68,9 +75,14 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-      * Retrieve ObjectManager from global scope
-      *
-      * @return void
-+     *
-+     * @SuppressWarnings(PHPMD.SerializationAware)
-+     * @deprecated Do not use PHP serialization.
-      */
-     public function __wakeup()
-     {
-+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-+
-         $this->_objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-     }
- 
-@@ -100,7 +112,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setGeneratorPool(\Magento\Framework\View\Layout\GeneratorPool $generatorPool)
-     {
-@@ -108,7 +120,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBuilder(\Magento\Framework\View\Layout\BuilderInterface $builder)
-     {
-@@ -116,7 +128,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function publicBuild()
-     {
-@@ -124,7 +136,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getUpdate()
-     {
-@@ -132,7 +144,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function generateXml()
-     {
-@@ -140,7 +152,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function generateElements()
-     {
-@@ -148,7 +160,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getChildBlock($parentName, $alias)
-     {
-@@ -156,7 +168,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setChild($parentName, $elementName, $alias)
-     {
-@@ -164,7 +176,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function reorderChild($parentName, $childName, $offsetOrSibling, $after = true)
-     {
-@@ -172,7 +184,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function unsetChild($parentName, $alias)
-     {
-@@ -180,7 +192,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getChildNames($parentName)
-     {
-@@ -188,7 +200,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getChildBlocks($parentName)
-     {
-@@ -196,7 +208,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getChildName($parentName, $alias)
-     {
-@@ -204,7 +216,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function renderElement($name, $useCache = true)
-     {
-@@ -212,7 +224,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function renderNonCachedElement($name)
-     {
-@@ -220,7 +232,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function addToParentGroup($blockName, $parentGroupName)
-     {
-@@ -228,7 +240,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getGroupChildNames($blockName, $groupName)
-     {
-@@ -236,7 +248,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function hasElement($name)
-     {
-@@ -244,7 +256,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getElementProperty($name, $attribute)
-     {
-@@ -252,7 +264,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isBlock($name)
-     {
-@@ -260,7 +272,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isUiComponent($name)
-     {
-@@ -268,7 +280,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isContainer($name)
-     {
-@@ -276,7 +288,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isManipulationAllowed($name)
-     {
-@@ -284,7 +296,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setBlock($name, $block)
-     {
-@@ -292,7 +304,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function unsetElement($name)
-     {
-@@ -300,7 +312,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function createBlock($type, $name = '', array $arguments = [])
-     {
-@@ -308,7 +320,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function addBlock($block, $name = '', $parent = '', $alias = '')
-     {
-@@ -316,7 +328,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function addContainer($name, $label, array $options = [], $parent = '', $alias = '')
-     {
-@@ -324,7 +336,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function renameElement($oldName, $newName)
-     {
-@@ -332,7 +344,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getAllBlocks()
-     {
-@@ -340,7 +352,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getBlock($name)
-     {
-@@ -348,7 +360,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getUiComponent($name)
-     {
-@@ -356,7 +368,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getParentName($childName)
-     {
-@@ -364,7 +376,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getElementAlias($name)
-     {
-@@ -372,7 +384,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function addOutputElement($name)
-     {
-@@ -380,7 +392,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function removeOutputElement($name)
-     {
-@@ -388,7 +400,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getOutput()
-     {
-@@ -396,7 +408,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getMessagesBlock()
-     {
-@@ -404,7 +416,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getBlockSingleton($type)
-     {
-@@ -412,7 +424,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function addAdjustableRenderer($namespace, $staticType, $dynamicType, $type, $template, $data = [])
-     {
-@@ -427,7 +439,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getRendererOptions($namespace, $staticType, $dynamicType)
-     {
-@@ -435,7 +447,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function executeRenderer($namespace, $staticType, $dynamicType, $data = [])
-     {
-@@ -443,7 +455,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function initMessages($messageGroups = [])
-     {
-@@ -451,7 +463,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isCacheable()
-     {
-@@ -459,7 +471,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function isPrivate()
-     {
-@@ -467,7 +479,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setIsPrivate($isPrivate = true)
-     {
-@@ -475,7 +487,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getReaderContext()
-     {
-@@ -483,7 +495,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setXml(\Magento\Framework\Simplexml\Element $node)
-     {
-@@ -491,7 +503,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getNode($path = null)
-     {
-@@ -499,7 +511,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getXpath($xpath)
-     {
-@@ -507,7 +519,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getXmlString()
-     {
-@@ -515,7 +527,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function loadFile($filePath)
-     {
-@@ -523,7 +535,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function loadString($string)
-     {
-@@ -531,7 +543,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function loadDom(\DOMNode $dom)
-     {
-@@ -539,7 +551,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function setNode($path, $value, $overwrite = true)
-     {
-@@ -547,7 +559,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function applyExtends()
-     {
-@@ -555,7 +567,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function processFileData($text)
-     {
-@@ -563,7 +575,7 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function extend(\Magento\Framework\Simplexml\Config $config, $overwrite = true)
-     {
-diff --git a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
-index 39cdec05a65..17857c9ab06 100755
---- a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
-+++ b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
-@@ -17,6 +17,13 @@
-                 </xs:extension>
-             </xs:complexContent>
-         </xs:complexType>
-+        <xs:complexType name="object">
-+            <xs:complexContent>
-+                <xs:extension base="argumentType">
-+                    <xs:attribute name="shared" use="optional" type="xs:boolean"/>
-+                </xs:extension>
-+            </xs:complexContent>
-+        </xs:complexType>
-     </xs:redefine>
-     <!-- Defined the types of elements -->
- 
-@@ -313,6 +320,7 @@
-         </xs:choice>
-         <xs:attribute type="elementNameType" name="name" use="required"/>
-         <xs:attribute type="xs:string" name="template" use="optional"/>
-+        <xs:attribute type="xs:string" name="class" use="optional"/>
-         <xs:attribute type="xs:boolean" name="display" default="true" use="optional"/>
-         <xs:attribute type="xs:boolean" name="remove" use="optional"/>
-     </xs:complexType>
-diff --git a/lib/internal/Magento/Framework/View/Layout/etc/head.xsd b/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
-index d64270a148e..51acc5789a4 100644
---- a/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
-+++ b/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
-@@ -18,7 +18,17 @@
-         <xs:attribute name="sizes" type="xs:string"/>
-         <xs:attribute name="target" type="xs:string"/>
-         <xs:attribute name="type" type="xs:string"/>
-+        <xs:attribute name="order" type="xs:integer"/>
-         <xs:attribute name="src_type" type="xs:string"/>
-+        <xs:attribute name="as">
-+            <xs:simpleType>
-+                <xs:restriction base="xs:string">
-+                    <xs:enumeration value="font" />
-+                    <xs:enumeration value="script" />
-+                    <xs:enumeration value="style" />
-+                </xs:restriction>
-+            </xs:simpleType>
-+        </xs:attribute>
-     </xs:complexType>
- 
-     <xs:complexType name="metaType">
-@@ -57,6 +67,7 @@
-             <xs:element name="script" type="scriptType" minOccurs="0" maxOccurs="unbounded"/>
-             <xs:element name="remove" type="srcRemoveType" minOccurs="0" maxOccurs="unbounded"/>
-             <xs:element name="attribute" type="headAttributeType" minOccurs="0" maxOccurs="unbounded"/>
-+            <xs:element name="font" type="linkType" minOccurs="0" maxOccurs="unbounded"/>
-         </xs:sequence>
-     </xs:complexType>
- </xs:schema>
-diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
-index 1a21e61f867..44f4038860c 100644
---- a/lib/internal/Magento/Framework/View/Page/Config.php
-+++ b/lib/internal/Magento/Framework/View/Page/Config.php
-@@ -7,7 +7,10 @@
- namespace Magento\Framework\View\Page;
- 
- use Magento\Framework\App;
-+use Magento\Framework\App\Area;
- use Magento\Framework\View;
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\ObjectManager;
- 
- /**
-  * An API for page configuration
-@@ -34,6 +37,15 @@ class Config
-     const ELEMENT_TYPE_HEAD = 'head';
-     /**#@-*/
- 
-+    const META_DESCRIPTION = 'description';
-+    const META_CONTENT_TYPE = 'content_type';
-+    const META_MEDIA_TYPE = 'media_type';
-+    const META_CHARSET = 'charset';
-+    const META_TITLE = 'title';
-+    const META_KEYWORDS = 'keywords';
-+    const META_ROBOTS = 'robots';
-+    const META_X_UI_COMPATIBLE = 'x_ua_compatible';
-+
-     /**
-      * Constant body attribute class
-      */
-@@ -44,6 +56,11 @@ class Config
-      */
-     const HTML_ATTRIBUTE_LANG = 'lang';
- 
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * Allowed group of types
-      *
-@@ -114,10 +131,10 @@ class Config
-         'charset' => null,
-         'media_type' => null,
-         'content_type' => null,
-+        'title' => null,
-         'description' => null,
-         'keywords' => null,
-         'robots' => null,
--        'title' => null,
-     ];
- 
-     /**
-@@ -140,7 +157,7 @@ class Config
-     private function getAreaResolver()
-     {
-         if ($this->areaResolver === null) {
--            $this->areaResolver = \Magento\Framework\App\ObjectManager::getInstance()
-+            $this->areaResolver = ObjectManager::getInstance()
-                 ->get(\Magento\Framework\App\State::class);
-         }
-         return $this->areaResolver;
-@@ -154,6 +171,7 @@ class Config
-      * @param Title $title
-      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-      * @param bool $isIncludesAvailable
-+     * @param Escaper|null $escaper
-      */
-     public function __construct(
-         View\Asset\Repository $assetRepo,
-@@ -162,7 +180,8 @@ class Config
-         View\Page\FaviconInterface $favicon,
-         Title $title,
-         \Magento\Framework\Locale\ResolverInterface $localeResolver,
--        $isIncludesAvailable = true
-+        $isIncludesAvailable = true,
-+        Escaper $escaper = null
-     ) {
-         $this->assetRepo = $assetRepo;
-         $this->pageAssets = $pageAssets;
-@@ -176,9 +195,14 @@ class Config
-             self::HTML_ATTRIBUTE_LANG,
-             strstr($this->localeResolver->getLocale(), '_', true)
-         );
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-     }
- 
-     /**
-+     * Set builder.
-+     *
-      * @param View\Layout\BuilderInterface $builder
-      * @return $this
-      */
-@@ -190,6 +214,7 @@ class Config
- 
-     /**
-      * Build page config from page configurations
-+     *
-      * @return void
-      */
-     protected function build()
-@@ -200,7 +225,10 @@ class Config
-     }
- 
-     /**
-+     * Public build action
-+     *
-      * TODO Will be eliminated in MAGETWO-28359
-+     *
-      * @return void
-      */
-     public function publicBuild()
-@@ -220,6 +248,8 @@ class Config
-     }
- 
-     /**
-+     * Set metadata.
-+     *
-      * @param string $name
-      * @param string $content
-      * @return void
-@@ -227,10 +257,12 @@ class Config
-     public function setMetadata($name, $content)
-     {
-         $this->build();
--        $this->metadata[$name] = htmlspecialchars($content);
-+        $this->metadata[$name] = $this->escaper->escapeHtml($content);
-     }
- 
-     /**
-+     * Returns metadata
-+     *
-      * @return array
-      */
-     public function getMetadata()
-@@ -240,12 +272,14 @@ class Config
-     }
- 
-     /**
-+     * Set content type
-+     *
-      * @param string $contentType
-      * @return void
-      */
-     public function setContentType($contentType)
-     {
--        $this->setMetadata('content_type', $contentType);
-+        $this->setMetadata(self::META_CONTENT_TYPE, $contentType);
-     }
- 
-     /**
-@@ -256,19 +290,21 @@ class Config
-     public function getContentType()
-     {
-         $this->build();
--        if (strtolower($this->metadata['content_type']) === 'auto') {
--            $this->metadata['content_type'] = $this->getMediaType() . '; charset=' . $this->getCharset();
-+        if (strtolower($this->metadata[self::META_CONTENT_TYPE]) === 'auto') {
-+            $this->metadata[self::META_CONTENT_TYPE] = $this->getMediaType() . '; charset=' . $this->getCharset();
-         }
--        return $this->metadata['content_type'];
-+        return $this->metadata[self::META_CONTENT_TYPE];
-     }
- 
-     /**
-+     * Set media type
-+     *
-      * @param string $mediaType
-      * @return void
-      */
-     public function setMediaType($mediaType)
-     {
--        $this->setMetadata('media_type', $mediaType);
-+        $this->setMetadata(self::META_MEDIA_TYPE, $mediaType);
-     }
- 
-     /**
-@@ -279,22 +315,24 @@ class Config
-     public function getMediaType()
-     {
-         $this->build();
--        if (empty($this->metadata['media_type'])) {
--            $this->metadata['media_type'] = $this->scopeConfig->getValue(
-+        if (empty($this->metadata[self::META_MEDIA_TYPE])) {
-+            $this->metadata[self::META_MEDIA_TYPE] = $this->scopeConfig->getValue(
-                 'design/head/default_media_type',
-                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-             );
-         }
--        return $this->metadata['media_type'];
-+        return $this->metadata[self::META_MEDIA_TYPE];
-     }
- 
-     /**
-+     * Set charset
-+     *
-      * @param string $charset
-      * @return void
-      */
-     public function setCharset($charset)
-     {
--        $this->setMetadata('charset', $charset);
-+        $this->setMetadata(self::META_CHARSET, $charset);
-     }
- 
-     /**
-@@ -305,22 +343,24 @@ class Config
-     public function getCharset()
-     {
-         $this->build();
--        if (empty($this->metadata['charset'])) {
--            $this->metadata['charset'] = $this->scopeConfig->getValue(
-+        if (empty($this->metadata[self::META_CHARSET])) {
-+            $this->metadata[self::META_CHARSET] = $this->scopeConfig->getValue(
-                 'design/head/default_charset',
-                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-             );
-         }
--        return $this->metadata['charset'];
-+        return $this->metadata[self::META_CHARSET];
-     }
- 
-     /**
-+     * Set description
-+     *
-      * @param string $description
-      * @return void
-      */
-     public function setDescription($description)
-     {
--        $this->setMetadata('description', $description);
-+        $this->setMetadata(self::META_DESCRIPTION, $description);
-     }
- 
-     /**
-@@ -331,22 +371,49 @@ class Config
-     public function getDescription()
-     {
-         $this->build();
--        if (empty($this->metadata['description'])) {
--            $this->metadata['description'] = $this->scopeConfig->getValue(
-+        if (empty($this->metadata[self::META_DESCRIPTION])) {
-+            $this->metadata[self::META_DESCRIPTION] = $this->scopeConfig->getValue(
-                 'design/head/default_description',
-                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-             );
-         }
--        return $this->metadata['description'];
-+        return $this->metadata[self::META_DESCRIPTION];
-+    }
-+
-+    /**
-+     * Set meta title
-+     *
-+     * @param string $title
-+     */
-+    public function setMetaTitle($title)
-+    {
-+        $this->setMetadata(self::META_TITLE, $title);
-+    }
-+
-+    /**
-+     * Retrieve meta title
-+     *
-+     * @return string
-+     */
-+    public function getMetaTitle()
-+    {
-+        $this->build();
-+        if (empty($this->metadata[self::META_TITLE])) {
-+            return '';
-+        }
-+
-+        return $this->metadata[self::META_TITLE];
-     }
- 
-     /**
-+     * Set keywords
-+     *
-      * @param string $keywords
-      * @return void
-      */
-     public function setKeywords($keywords)
-     {
--        $this->setMetadata('keywords', $keywords);
-+        $this->setMetadata(self::META_KEYWORDS, $keywords);
-     }
- 
-     /**
-@@ -357,45 +424,50 @@ class Config
-     public function getKeywords()
-     {
-         $this->build();
--        if (empty($this->metadata['keywords'])) {
--            $this->metadata['keywords'] = $this->scopeConfig->getValue(
-+        if (empty($this->metadata[self::META_KEYWORDS])) {
-+            $this->metadata[self::META_KEYWORDS] = $this->scopeConfig->getValue(
-                 'design/head/default_keywords',
-                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-             );
-         }
--        return $this->metadata['keywords'];
-+        return $this->metadata[self::META_KEYWORDS];
-     }
- 
-     /**
-+     * Set robots content
-+     *
-      * @param string $robots
-      * @return void
-      */
-     public function setRobots($robots)
-     {
--        $this->setMetadata('robots', $robots);
-+        $this->setMetadata(self::META_ROBOTS, $robots);
-     }
- 
-     /**
-      * Retrieve URL to robots file
-      *
-      * @return string
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function getRobots()
-     {
--        if ($this->getAreaResolver()->getAreaCode() !== 'frontend') {
-+        if ($this->getAreaResolver()->getAreaCode() !== Area::AREA_FRONTEND) {
-             return 'NOINDEX,NOFOLLOW';
-         }
-         $this->build();
--        if (empty($this->metadata['robots'])) {
--            $this->metadata['robots'] = $this->scopeConfig->getValue(
-+        if (empty($this->metadata[self::META_ROBOTS])) {
-+            $this->metadata[self::META_ROBOTS] = $this->scopeConfig->getValue(
-                 'design/search_engine_robots/default_robots',
-                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-             );
-         }
--        return $this->metadata['robots'];
-+        return $this->metadata[self::META_ROBOTS];
-     }
- 
-     /**
-+     * Returns collection of the assets
-+     *
-      * @return \Magento\Framework\View\Asset\GroupedCollection
-      */
-     public function getAssetCollection()
-@@ -405,6 +477,8 @@ class Config
-     }
- 
-     /**
-+     * Add asset to page content
-+     *
-      * @param string $file
-      * @param array $properties
-      * @param string|null $name
-@@ -512,6 +586,8 @@ class Config
-     }
- 
-     /**
-+     * Returns element attributes
-+     *
-      * @param string $elementType
-      * @return string[]
-      */
-@@ -544,6 +620,8 @@ class Config
-     }
- 
-     /**
-+     * Returns favicon file
-+     *
-      * @return string
-      */
-     public function getFaviconFile()
-@@ -552,6 +630,8 @@ class Config
-     }
- 
-     /**
-+     * Returns default favicon
-+     *
-      * @return string
-      */
-     public function getDefaultFavicon()
-diff --git a/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php b/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
-index 637d773ddde..3adcac6187f 100644
---- a/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
-+++ b/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
-@@ -42,6 +42,7 @@ class Head implements Layout\GeneratorInterface
-      */
-     protected $assetProperties = [
-         'ie_condition',
-+        'order'
-     ];
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php b/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
-index 71a2951b404..195ba5cd1f3 100644
---- a/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
-+++ b/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
-@@ -7,6 +7,7 @@ namespace Magento\Framework\View\Page\Config\Reader;
- 
- use Magento\Framework\View\Layout;
- use Magento\Framework\View\Page\Config as PageConfig;
-+use Magento\Framework\View\Page\Config\Structure;
- 
- /**
-  * Head structure reader is intended for collecting assets, title and metadata
-@@ -29,12 +30,11 @@ class Head implements Layout\ReaderInterface
-     const HEAD_TITLE = 'title';
-     const HEAD_META = 'meta';
-     const HEAD_ATTRIBUTE = 'attribute';
-+    private const HEAD_FONT = 'font';
-     /**#@-*/
- 
-     /**
--     * {@inheritdoc}
--     *
--     * @return string[]
-+     * @inheritdoc
-      */
-     public function getSupportedNodes()
-     {
-@@ -56,53 +56,37 @@ class Head implements Layout\ReaderInterface
-             case self::HEAD_SCRIPT:
-                 $node->addAttribute('content_type', 'js');
-                 break;
-+            case self::HEAD_FONT:
-+                $node->addAttribute('content_type', 'font');
-+                break;
-         }
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * Read children elements structure and fill scheduled structure
-      *
-      * @param Layout\Reader\Context $readerContext
-      * @param Layout\Element $headElement
--     * @return $this
-+     * @return $this|Layout\ReaderInterface
-      */
-     public function interpret(
-         Layout\Reader\Context $readerContext,
-         Layout\Element $headElement
-     ) {
-         $pageConfigStructure = $readerContext->getPageConfigStructure();
--        /** @var \Magento\Framework\View\Layout\Element $node */
-+
-+        $orderedNodes = [];
-+
-         foreach ($headElement as $node) {
--            switch ($node->getName()) {
--                case self::HEAD_CSS:
--                case self::HEAD_SCRIPT:
--                case self::HEAD_LINK:
--                    $this->addContentTypeByNodeName($node);
--                    $pageConfigStructure->addAssets($node->getAttribute('src'), $this->getAttributes($node));
--                    break;
--
--                case self::HEAD_REMOVE:
--                    $pageConfigStructure->removeAssets($node->getAttribute('src'));
--                    break;
--
--                case self::HEAD_TITLE:
--                    $pageConfigStructure->setTitle(new \Magento\Framework\Phrase($node));
--                    break;
--
--                case self::HEAD_META:
--                    $this->setMetadata($pageConfigStructure, $node);
--                    break;
--
--                case self::HEAD_ATTRIBUTE:
--                    $pageConfigStructure->setElementAttribute(
--                        PageConfig::ELEMENT_TYPE_HEAD,
--                        $node->getAttribute('name'),
--                        $node->getAttribute('value')
--                    );
--                    break;
--
--                default:
--                    break;
-+            $nodeOrder = $node->getAttribute('order') ?: 0;
-+            $orderedNodes[$nodeOrder][] = $node;
-+        }
-+
-+        ksort($orderedNodes);
-+        foreach ($orderedNodes as $nodes) {
-+            /** @var \Magento\Framework\View\Layout\Element $node */
-+            foreach ($nodes as $node) {
-+                $this->processNode($node, $pageConfigStructure);
-             }
-         }
-         return $this;
-@@ -140,4 +124,47 @@ class Head implements Layout\ReaderInterface
- 
-         $pageConfigStructure->setMetadata($metadataName, $node->getAttribute('content'));
-     }
-+
-+    /**
-+     * Process given node based on it's name.
-+     *
-+     * @param Layout\Element $node
-+     * @param Structure $pageConfigStructure
-+     * @return void
-+     */
-+    private function processNode(Layout\Element $node, Structure $pageConfigStructure)
-+    {
-+        switch ($node->getName()) {
-+            case self::HEAD_CSS:
-+            case self::HEAD_SCRIPT:
-+            case self::HEAD_LINK:
-+            case self::HEAD_FONT:
-+                $this->addContentTypeByNodeName($node);
-+                $pageConfigStructure->addAssets($node->getAttribute('src'), $this->getAttributes($node));
-+                break;
-+
-+            case self::HEAD_REMOVE:
-+                $pageConfigStructure->removeAssets($node->getAttribute('src'));
-+                break;
-+
-+            case self::HEAD_TITLE:
-+                $pageConfigStructure->setTitle(new \Magento\Framework\Phrase($node));
-+                break;
-+
-+            case self::HEAD_META:
-+                $this->setMetadata($pageConfigStructure, $node);
-+                break;
-+
-+            case self::HEAD_ATTRIBUTE:
-+                $pageConfigStructure->setElementAttribute(
-+                    PageConfig::ELEMENT_TYPE_HEAD,
-+                    $node->getAttribute('name'),
-+                    $node->getAttribute('value')
-+                );
-+                break;
-+
-+            default:
-+                break;
-+        }
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
-index 93c8c5c3386..b7a1e0b7070 100644
---- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
-+++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
-@@ -3,8 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\View\Page\Config;
- 
-+use Magento\Framework\Exception\LocalizedException;
- use Magento\Framework\View\Asset\GroupedCollection;
- use Magento\Framework\View\Page\Config;
- 
-@@ -18,10 +20,32 @@ class Renderer implements RendererInterface
-     /**
-      * @var array
-      */
--    protected $assetTypeOrder = ['css', 'ico', 'js'];
-+    protected $assetTypeOrder = [
-+        'css',
-+        'ico',
-+        'js',
-+        'eot',
-+        'svg',
-+        'ttf',
-+        'woff',
-+        'woff2',
-+    ];
- 
-     /**
--     * @var \Magento\Framework\View\Page\Config
-+     * Possible fonts type
-+     *
-+     * @var array
-+     */
-+    private const FONTS_TYPE = [
-+        'eot',
-+        'svg',
-+        'ttf',
-+        'woff',
-+        'woff2',
-+    ];
-+
-+    /**
-+     * @var Config
-      */
-     protected $pageConfig;
- 
-@@ -51,7 +75,7 @@ class Renderer implements RendererInterface
-     protected $urlBuilder;
- 
-     /**
--     * @param \Magento\Framework\View\Page\Config $pageConfig
-+     * @param Config $pageConfig
-      * @param \Magento\Framework\View\Asset\MergeService $assetMergeService
-      * @param \Magento\Framework\UrlInterface $urlBuilder
-      * @param \Magento\Framework\Escaper $escaper
-@@ -75,6 +99,8 @@ class Renderer implements RendererInterface
-     }
- 
-     /**
-+     * Render element attributes
-+     *
-      * @param string $elementType
-      * @return string
-      */
-@@ -88,6 +114,8 @@ class Renderer implements RendererInterface
-     }
- 
-     /**
-+     * Render head content
-+     *
-      * @return string
-      */
-     public function renderHeadContent()
-@@ -102,6 +130,8 @@ class Renderer implements RendererInterface
-     }
- 
-     /**
-+     * Render title
-+     *
-      * @return string
-      */
-     public function renderTitle()
-@@ -110,6 +140,8 @@ class Renderer implements RendererInterface
-     }
- 
-     /**
-+     * Render metadata
-+     *
-      * @return string
-      */
-     public function renderMetadata()
-@@ -129,6 +161,8 @@ class Renderer implements RendererInterface
-     }
- 
-     /**
-+     * Process metadata content
-+     *
-      * @param string $name
-      * @param string $content
-      * @return mixed
-@@ -149,6 +183,8 @@ class Renderer implements RendererInterface
-     }
- 
-     /**
-+     * Returns metadata template
-+     *
-      * @param string $name
-      * @return bool|string
-      */
-@@ -159,19 +195,19 @@ class Renderer implements RendererInterface
-         }
- 
-         switch ($name) {
--            case 'charset':
-+            case Config::META_CHARSET:
-                 $metadataTemplate = '<meta charset="%content"/>' . "\n";
-                 break;
- 
--            case 'content_type':
-+            case Config::META_CONTENT_TYPE:
-                 $metadataTemplate = '<meta http-equiv="Content-Type" content="%content"/>' . "\n";
-                 break;
- 
--            case 'x_ua_compatible':
-+            case Config::META_X_UI_COMPATIBLE:
-                 $metadataTemplate = '<meta http-equiv="X-UA-Compatible" content="%content"/>' . "\n";
-                 break;
- 
--            case 'media_type':
-+            case Config::META_MEDIA_TYPE:
-                 $metadataTemplate = false;
-                 break;
- 
-@@ -183,6 +219,8 @@ class Renderer implements RendererInterface
-     }
- 
-     /**
-+     * Favicon preparation
-+     *
-      * @return void
-      */
-     public function prepareFavicon()
-@@ -248,6 +286,8 @@ class Renderer implements RendererInterface
-     }
- 
-     /**
-+     * Process assets merge
-+     *
-      * @param array $groupAssets
-      * @param \Magento\Framework\View\Asset\PropertyGroup $group
-      * @return array
-@@ -264,6 +304,8 @@ class Renderer implements RendererInterface
-     }
- 
-     /**
-+     * Returns group attributes
-+     *
-      * @param \Magento\Framework\View\Asset\PropertyGroup $group
-      * @return string|null
-      */
-@@ -285,6 +327,8 @@ class Renderer implements RendererInterface
-     }
- 
-     /**
-+     * Add default attributes
-+     *
-      * @param string $contentType
-      * @param string $attributes
-      * @return string
-@@ -299,11 +343,17 @@ class Renderer implements RendererInterface
-             case 'css':
-                 $attributes = ' rel="stylesheet" type="text/css" ' . ($attributes ?: ' media="all"');
-                 break;
-+
-+            case $this->canTypeBeFont($contentType):
-+                $attributes = 'rel="preload" as="font" crossorigin="anonymous"';
-+                break;
-         }
-         return $attributes;
-     }
- 
-     /**
-+     * Returns assets template
-+     *
-      * @param string $contentType
-      * @param string|null $attributes
-      * @return string
-@@ -324,6 +374,8 @@ class Renderer implements RendererInterface
-     }
- 
-     /**
-+     * Process IE condition
-+     *
-      * @param string $groupHtml
-      * @param \Magento\Framework\View\Asset\PropertyGroup $group
-      * @return string
-@@ -358,13 +410,24 @@ class Renderer implements RendererInterface
-                 );
-                 $result .= sprintf($template, $asset->getUrl());
-             }
--        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-+        } catch (LocalizedException $e) {
-             $this->logger->critical($e);
-             $result .= sprintf($template, $this->urlBuilder->getUrl('', ['_direct' => 'core/index/notFound']));
-         }
-         return $result;
-     }
- 
-+    /**
-+     * Check if file type can be font
-+     *
-+     * @param string $type
-+     * @return bool
-+     */
-+    private function canTypeBeFont(string $type): bool
-+    {
-+        return in_array($type, self::FONTS_TYPE, true);
-+    }
-+
-     /**
-      * Get asset content type
-      *
-@@ -377,6 +440,8 @@ class Renderer implements RendererInterface
-     }
- 
-     /**
-+     * Returns available groups.
-+     *
-      * @return array
-      */
-     public function getAvailableResultGroups()
-diff --git a/lib/internal/Magento/Framework/View/Page/Config/Structure.php b/lib/internal/Magento/Framework/View/Page/Config/Structure.php
-index 280d62e9c5a..1a181952ed9 100644
---- a/lib/internal/Magento/Framework/View/Page/Config/Structure.php
-+++ b/lib/internal/Magento/Framework/View/Page/Config/Structure.php
-@@ -251,6 +251,6 @@ class Structure
-      */
-     private function getArrayValueByKey($key, array $array)
-     {
--        return isset($array[$key]) ? $array[$key] : [];
-+        return $array[$key] ?? [];
-     }
- }
-diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
-index 94d24124469..eda2e2e4b6d 100644
---- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
-+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
-@@ -122,7 +122,7 @@ class Compiler implements CompilerInterface
-         return preg_replace_callback(
-             '#' . $patternTag . '(.+?)' . $patternTag . '#',
-             function ($match) {
--                return isset($this->data[$match[1]]) ? $this->data[$match[1]] : '';
-+                return $this->data[$match[1]] ?? '';
-             },
-             $content
-         );
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/DirectTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/DirectTest.php
-index 823ad5c8c8b..c23f13745c7 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/DirectTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/DirectTest.php
-@@ -5,13 +5,19 @@
-  */
- namespace Magento\Framework\View\Test\Unit\Asset\MergeStrategy;
- 
--use Magento\Framework\Filesystem\Directory\WriteInterface;
--use \Magento\Framework\View\Asset\MergeStrategy\Direct;
--
- use Magento\Framework\App\Filesystem\DirectoryList;
-+use Magento\Framework\Filesystem\Directory\WriteInterface;
-+use Magento\Framework\View\Asset\MergeStrategy\Direct;
- 
-+/**
-+ * Test for Magento\Framework\View\Asset\MergeStrategy\Direct.
-+ */
- class DirectTest extends \PHPUnit\Framework\TestCase
- {
-+    /**
-+     * @var \Magento\Framework\Math\Random|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    protected $mathRandomMock;
-     /**
-      * @var \Magento\Framework\View\Asset\MergeStrategy\Direct
-      */
-@@ -50,33 +56,47 @@ class DirectTest extends \PHPUnit\Framework\TestCase
-                 [DirectoryList::TMP, \Magento\Framework\Filesystem\DriverPool::FILE, $this->tmpDir],
-             ]);
-         $this->resultAsset = $this->createMock(\Magento\Framework\View\Asset\File::class);
--        $this->object = new Direct($filesystem, $this->cssUrlResolver);
-+        $this->mathRandomMock = $this->getMockBuilder(\Magento\Framework\Math\Random::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $this->object = new Direct($filesystem, $this->cssUrlResolver, $this->mathRandomMock);
-     }
- 
-     public function testMergeNoAssets()
-     {
-+        $uniqId = '_b3bf82fa6e140594420fa90982a8e877';
-         $this->resultAsset->expects($this->once())->method('getPath')->will($this->returnValue('foo/result'));
-         $this->staticDir->expects($this->never())->method('writeFile');
--        $this->tmpDir->expects($this->once())->method('writeFile')->with('foo/result', '');
--        $this->tmpDir->expects($this->once())->method('renameFile')->with('foo/result', 'foo/result', $this->staticDir);
-+        $this->mathRandomMock->expects($this->once())
-+            ->method('getUniqueHash')
-+            ->willReturn($uniqId);
-+        $this->tmpDir->expects($this->once())->method('writeFile')->with('foo/result' . $uniqId, '');
-+        $this->tmpDir->expects($this->once())->method('renameFile')
-+            ->with('foo/result' . $uniqId, 'foo/result', $this->staticDir);
-         $this->object->merge([], $this->resultAsset);
-     }
- 
-     public function testMergeGeneric()
-     {
-+        $uniqId = '_be50ccf992fd81818c1a2645d1a29e92';
-         $this->resultAsset->expects($this->once())->method('getPath')->will($this->returnValue('foo/result'));
-         $assets = $this->prepareAssetsToMerge([' one', 'two']); // note leading space intentionally
-         $this->staticDir->expects($this->never())->method('writeFile');
--        $this->tmpDir->expects($this->once())->method('writeFile')->with('foo/result', 'onetwo');
--        $this->tmpDir->expects($this->once())->method('renameFile')->with('foo/result', 'foo/result', $this->staticDir);
-+        $this->mathRandomMock->expects($this->once())
-+            ->method('getUniqueHash')
-+            ->willReturn($uniqId);
-+        $this->tmpDir->expects($this->once())->method('writeFile')->with('foo/result' . $uniqId, 'onetwo');
-+        $this->tmpDir->expects($this->once())->method('renameFile')
-+            ->with('foo/result' . $uniqId, 'foo/result', $this->staticDir);
-         $this->object->merge($assets, $this->resultAsset);
-     }
- 
-     public function testMergeCss()
-     {
-+        $uniqId = '_f929c374767e00712449660ea673f2f5';
-         $this->resultAsset->expects($this->exactly(3))
-             ->method('getPath')
--            ->will($this->returnValue('foo/result'));
-+            ->willReturn('foo/result');
-         $this->resultAsset->expects($this->any())->method('getContentType')->will($this->returnValue('css'));
-         $assets = $this->prepareAssetsToMerge(['one', 'two']);
-         $this->cssUrlResolver->expects($this->exactly(2))
-@@ -85,10 +105,14 @@ class DirectTest extends \PHPUnit\Framework\TestCase
-         $this->cssUrlResolver->expects($this->once())
-             ->method('aggregateImportDirectives')
-             ->with('12')
--            ->will($this->returnValue('1020'));
-+            ->willReturn('1020');
-+        $this->mathRandomMock->expects($this->once())
-+            ->method('getUniqueHash')
-+            ->willReturn($uniqId);
-         $this->staticDir->expects($this->never())->method('writeFile');
--        $this->tmpDir->expects($this->once())->method('writeFile')->with('foo/result', '1020');
--        $this->tmpDir->expects($this->once())->method('renameFile')->with('foo/result', 'foo/result', $this->staticDir);
-+        $this->tmpDir->expects($this->once())->method('writeFile')->with('foo/result' . $uniqId, '1020');
-+        $this->tmpDir->expects($this->once())->method('renameFile')
-+            ->with('foo/result' . $uniqId, 'foo/result', $this->staticDir);
-         $this->object->merge($assets, $this->resultAsset);
-     }
- 
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php
-index 1cc2a3dd7e2..48fc8d5c775 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php
-@@ -195,6 +195,8 @@ class MinificationTest extends \PHPUnit\Framework\TestCase
-     }
- 
-     /**
-+     * Test dev/js/minify_exclude system value as array
-+     *
-      * @return void
-      */
-     public function testGetExcludes()
-@@ -213,4 +215,38 @@ class MinificationTest extends \PHPUnit\Framework\TestCase
-         /** check cache: */
-         $this->assertEquals($expected, $this->minification->getExcludes('js'));
-     }
-+
-+    /**
-+     * Test dev/js/minify_exclude system value backward compatibility when value was a string
-+     *
-+     * @param string $value
-+     * @param array $expectedValue
-+     * @return void
-+     *
-+     * @dataProvider getExcludesTinyMceAsStringDataProvider
-+     */
-+    public function testGetExcludesTinyMceAsString(string $value, array $expectedValue)
-+    {
-+        $this->scopeConfigMock
-+            ->expects($this->once())
-+            ->method('getValue')
-+            ->with('dev/js/minify_exclude')
-+            ->willReturn($value);
-+
-+        $this->assertEquals($expectedValue, $this->minification->getExcludes('js'));
-+        /** check cache: */
-+        $this->assertEquals($expectedValue, $this->minification->getExcludes('js'));
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getExcludesTinyMceAsStringDataProvider()
-+    {
-+        return [
-+            ["/tiny_mce/  \n  /tiny_mce2/", ['/tiny_mce/', '/tiny_mce2/']],
-+            ['/tiny_mce/', ['/tiny_mce/']],
-+            [' /tiny_mce/', ['/tiny_mce/']],
-+        ];
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/RepositoryTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/RepositoryTest.php
-index a8beb380c51..5654563f879 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/RepositoryTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/RepositoryTest.php
-@@ -164,6 +164,50 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($result, $params);
-     }
- 
-+    /**
-+     * @return void
-+     */
-+    public function testUpdateDesignParamsWithThemePath()
-+    {
-+        $params = ['area' => 'AREA'];
-+        $result = ['area' => 'AREA', 'themeModel' => 'Theme', 'module' => false, 'locale' => null];
-+
-+        $this->designMock
-+            ->expects($this->once())
-+            ->method('getConfigurationDesignTheme')
-+            ->willReturn('themePath');
-+
-+        $this->themeProvider
-+            ->expects($this->once())
-+            ->method('getThemeByFullPath')
-+            ->willReturn('Theme');
-+
-+        $this->repository->updateDesignParams($params);
-+        $this->assertEquals($result, $params);
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testUpdateDesignParamsWithThemeId()
-+    {
-+        $params = ['area' => 'AREA'];
-+        $result = ['area' => 'AREA', 'themeModel' => 'Theme', 'module' => false, 'locale' => null];
-+
-+        $this->designMock
-+            ->expects($this->once())
-+            ->method('getConfigurationDesignTheme')
-+            ->willReturn('1');
-+
-+        $this->themeProvider
-+            ->expects($this->once())
-+            ->method('getThemeById')
-+            ->willReturn('Theme');
-+
-+        $this->repository->updateDesignParams($params);
-+        $this->assertEquals($result, $params);
-+    }
-+
-     /**
-      * @return array
-      */
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
-index 5f7508438a6..fbaa7ec6707 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
-@@ -6,6 +6,8 @@
- 
- namespace Magento\Framework\View\Test\Unit\Element;
- 
-+use Magento\Framework\Cache\LockGuardedCacheLoader;
-+use Magento\Framework\Escaper;
- use Magento\Framework\View\Element\AbstractBlock;
- use Magento\Framework\View\Element\Context;
- use Magento\Framework\Config\View;
-@@ -13,7 +15,6 @@ use Magento\Framework\View\ConfigInterface;
- use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
- use Magento\Framework\App\Config\ScopeConfigInterface;
- use Magento\Framework\App\Cache\StateInterface as CacheStateInterface;
--use Magento\Framework\App\CacheInterface;
- use Magento\Framework\Session\SidResolverInterface;
- use Magento\Framework\Session\SessionManagerInterface;
- 
-@@ -42,11 +43,6 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
-      */
-     private $cacheStateMock;
- 
--    /**
--     * @var CacheInterface|\PHPUnit_Framework_MockObject_MockObject
--     */
--    private $cacheMock;
--
-     /**
-      * @var SidResolverInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
-@@ -57,6 +53,16 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
-      */
-     private $sessionMock;
- 
-+    /**
-+     * @var Escaper|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $escaperMock;
-+
-+    /**
-+     * @var LockGuardedCacheLoader|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $lockQuery;
-+
-     /**
-      * @return void
-      */
-@@ -65,9 +71,15 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
-         $this->eventManagerMock = $this->getMockForAbstractClass(EventManagerInterface::class);
-         $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
-         $this->cacheStateMock = $this->getMockForAbstractClass(CacheStateInterface::class);
--        $this->cacheMock = $this->getMockForAbstractClass(CacheInterface::class);
-+        $this->lockQuery = $this->getMockBuilder(LockGuardedCacheLoader::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['lockedLoadData'])
-+            ->getMockForAbstractClass();
-         $this->sidResolverMock = $this->getMockForAbstractClass(SidResolverInterface::class);
-         $this->sessionMock = $this->getMockForAbstractClass(SessionManagerInterface::class);
-+        $this->escaperMock = $this->getMockBuilder(Escaper::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-         $contextMock = $this->createMock(Context::class);
-         $contextMock->expects($this->once())
-             ->method('getEventManager')
-@@ -78,18 +90,22 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
-         $contextMock->expects($this->once())
-             ->method('getCacheState')
-             ->willReturn($this->cacheStateMock);
--        $contextMock->expects($this->once())
--            ->method('getCache')
--            ->willReturn($this->cacheMock);
-         $contextMock->expects($this->once())
-             ->method('getSidResolver')
-             ->willReturn($this->sidResolverMock);
-         $contextMock->expects($this->once())
-             ->method('getSession')
-             ->willReturn($this->sessionMock);
-+        $contextMock->expects($this->once())
-+            ->method('getEscaper')
-+            ->willReturn($this->escaperMock);
-         $this->block = $this->getMockForAbstractClass(
-             AbstractBlock::class,
--            ['context' => $contextMock]
-+            [
-+                'context' => $contextMock,
-+                'data' => [],
-+                'lockQuery' => $this->lockQuery
-+            ]
-         );
-     }
- 
-@@ -101,6 +117,13 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testGetUiId($expectedResult, $nameInLayout, $methodArguments)
-     {
-+        $this->escaperMock->expects($this->once())
-+            ->method('escapeHtmlAttr')
-+            ->willReturnCallback(
-+                function ($string) {
-+                    return $string;
-+                }
-+            );
-         $this->block->setNameInLayout($nameInLayout);
-         $this->assertEquals($expectedResult, call_user_func_array([$this->block, 'getUiId'], $methodArguments));
-     }
-@@ -147,10 +170,12 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
- 
-         $config->expects($this->any())
-             ->method('getVarValue')
--            ->willReturnMap([
--                ['Magento_Theme', 'v1', 'one'],
--                [$module, 'v2', 'two']
--            ]);
-+            ->willReturnMap(
-+                [
-+                    ['Magento_Theme', 'v1', 'one'],
-+                    [$module, 'v2', 'two']
-+                ]
-+            );
- 
-         $configManager = $this->createMock(ConfigInterface::class);
-         $configManager->expects($this->exactly(2))->method('getViewConfig')->willReturn($config);
-@@ -219,10 +244,7 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
-     /**
-      * @param string|bool $cacheLifetime
-      * @param string|bool $dataFromCache
--     * @param string $dataForSaveCache
-      * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsDispatchEvent
--     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheLoad
--     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheSave
-      * @param string $expectedResult
-      * @return void
-      * @dataProvider getCacheLifetimeDataProvider
-@@ -230,10 +252,7 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
-     public function testGetCacheLifetimeViaToHtml(
-         $cacheLifetime,
-         $dataFromCache,
--        $dataForSaveCache,
-         $expectsDispatchEvent,
--        $expectsCacheLoad,
--        $expectsCacheSave,
-         $expectedResult
-     ) {
-         $moduleName = 'Test';
-@@ -252,13 +271,9 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
-             ->method('isEnabled')
-             ->with(AbstractBlock::CACHE_GROUP)
-             ->willReturn(true);
--        $this->cacheMock->expects($expectsCacheLoad)
--            ->method('load')
--            ->with(AbstractBlock::CACHE_KEY_PREFIX . $cacheKey)
-+        $this->lockQuery->expects($this->any())
-+            ->method('lockedLoadData')
-             ->willReturn($dataFromCache);
--        $this->cacheMock->expects($expectsCacheSave)
--            ->method('save')
--            ->with($dataForSaveCache, AbstractBlock::CACHE_KEY_PREFIX . $cacheKey);
-         $this->sidResolverMock->expects($this->any())
-             ->method('getSessionIdQueryParam')
-             ->with($this->sessionMock)
-@@ -279,46 +294,31 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
-             [
-                 'cacheLifetime' => null,
-                 'dataFromCache' => 'dataFromCache',
--                'dataForSaveCache' => '',
-                 'expectsDispatchEvent' => $this->exactly(2),
--                'expectsCacheLoad' => $this->never(),
--                'expectsCacheSave' => $this->never(),
-                 'expectedResult' => '',
-             ],
-             [
-                 'cacheLifetime' => false,
-                 'dataFromCache' => 'dataFromCache',
--                'dataForSaveCache' => '',
-                 'expectsDispatchEvent' => $this->exactly(2),
--                'expectsCacheLoad' => $this->never(),
--                'expectsCacheSave' => $this->never(),
-                 'expectedResult' => '',
-             ],
-             [
-                 'cacheLifetime' => 120,
-                 'dataFromCache' => 'dataFromCache',
--                'dataForSaveCache' => '',
-                 'expectsDispatchEvent' => $this->exactly(2),
--                'expectsCacheLoad' => $this->once(),
--                'expectsCacheSave' => $this->never(),
-                 'expectedResult' => 'dataFromCache',
-             ],
-             [
-                 'cacheLifetime' => '120string',
-                 'dataFromCache' => 'dataFromCache',
--                'dataForSaveCache' => '',
-                 'expectsDispatchEvent' => $this->exactly(2),
--                'expectsCacheLoad' => $this->once(),
--                'expectsCacheSave' => $this->never(),
-                 'expectedResult' => 'dataFromCache',
-             ],
-             [
-                 'cacheLifetime' => 120,
-                 'dataFromCache' => false,
--                'dataForSaveCache' => '',
-                 'expectsDispatchEvent' => $this->exactly(2),
--                'expectsCacheLoad' => $this->once(),
--                'expectsCacheSave' => $this->once(),
-                 'expectedResult' => '',
-             ],
-         ];
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
-index 909748722a0..7070ec9d48c 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
-@@ -17,11 +17,6 @@ class CurrentTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $_requestMock;
- 
--    /**
--     * @var \PHPUnit_Framework_MockObject_MockObject
--     */
--    protected $_defaultPathMock;
--
-     /**
-      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-      */
-@@ -32,7 +27,6 @@ class CurrentTest extends \PHPUnit\Framework\TestCase
-         $this->_objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->_urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class);
-         $this->_requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
--        $this->_defaultPathMock = $this->createMock(\Magento\Framework\App\DefaultPathInterface::class);
-     }
- 
-     public function testGetUrl()
-@@ -60,29 +54,46 @@ class CurrentTest extends \PHPUnit\Framework\TestCase
-         $this->assertTrue($link->isCurrent());
-     }
- 
-+    /**
-+     * Test if the current url is the same as link path
-+     *
-+     * @return void
-+     */
-     public function testIsCurrent()
-     {
--        $path = 'test/path';
--        $url = 'http://example.com/a/b';
--
--        $this->_requestMock->expects($this->once())->method('getModuleName')->will($this->returnValue('a'));
--        $this->_requestMock->expects($this->once())->method('getControllerName')->will($this->returnValue('b'));
--        $this->_requestMock->expects($this->once())->method('getActionName')->will($this->returnValue('d'));
--        $this->_defaultPathMock->expects($this->atLeastOnce())->method('getPart')->will($this->returnValue('d'));
-+        $path = 'test/index';
-+        $url = 'http://example.com/test/index';
-+
-+        $this->_requestMock->expects($this->once())
-+            ->method('getPathInfo')
-+            ->will($this->returnValue('/test/index/'));
-+        $this->_requestMock->expects($this->once())
-+            ->method('getModuleName')
-+            ->will($this->returnValue('test'));
-+        $this->_requestMock->expects($this->once())
-+            ->method('getControllerName')
-+            ->will($this->returnValue('index'));
-+        $this->_requestMock->expects($this->once())
-+            ->method('getActionName')
-+            ->will($this->returnValue('index'));
-+        $this->_urlBuilderMock->expects($this->at(0))
-+            ->method('getUrl')
-+            ->with($path)
-+            ->will($this->returnValue($url));
-+        $this->_urlBuilderMock->expects($this->at(1))
-+            ->method('getUrl')
-+            ->with('test/index')
-+            ->will($this->returnValue($url));
- 
--        $this->_urlBuilderMock->expects($this->at(0))->method('getUrl')->with($path)->will($this->returnValue($url));
--        $this->_urlBuilderMock->expects($this->at(1))->method('getUrl')->with('a/b')->will($this->returnValue($url));
--
--        $this->_requestMock->expects($this->once())->method('getControllerName')->will($this->returnValue('b'));
-         /** @var \Magento\Framework\View\Element\Html\Link\Current $link */
-         $link = $this->_objectManager->getObject(
-             \Magento\Framework\View\Element\Html\Link\Current::class,
-             [
-                 'urlBuilder' => $this->_urlBuilderMock,
--                'request' => $this->_requestMock,
--                'defaultPath' => $this->_defaultPathMock
-+                'request' => $this->_requestMock
-             ]
-         );
-+
-         $link->setPath($path);
-         $this->assertTrue($link->isCurrent());
-     }
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
-index b911a38dbb4..4c76087bfea 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
-@@ -3,10 +3,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
- namespace Magento\Framework\View\Test\Unit\Element\Html;
- 
- class LinkTest extends \PHPUnit\Framework\TestCase
- {
-+    private $objectManager;
-+
-+    protected function setUp()
-+    {
-+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+    }
-+
-     /**
-      * @var array
-      */
-@@ -24,24 +32,8 @@ class LinkTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $link;
- 
--    /**
--     * @param \Magento\Framework\View\Element\Html\Link $link
--     * @param string $expected
--     *
--     * @dataProvider getLinkAttributesDataProvider
--     */
--    public function testGetLinkAttributes($link, $expected)
--    {
--        $this->assertEquals($expected, $link->getLinkAttributes());
--    }
--
--    /**
--     * @return array
--     */
--    public function getLinkAttributesDataProvider()
-+    public function testGetLinkAttributes()
-     {
--        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
--
-         $escaperMock = $this->getMockBuilder(\Magento\Framework\Escaper::class)
-             ->setMethods(['escapeHtml'])->disableOriginalConstructor()->getMock();
- 
-@@ -54,13 +46,19 @@ class LinkTest extends \PHPUnit\Framework\TestCase
- 
-         $urlBuilderMock->expects($this->any())
-             ->method('getUrl')
--            ->will($this->returnArgument('http://site.com/link.html'));
-+            ->willReturn('http://site.com/link.html');
- 
-         $validtorMock = $this->getMockBuilder(\Magento\Framework\View\Element\Template\File\Validator::class)
-             ->setMethods(['isValid'])->disableOriginalConstructor()->getMock();
-+        $validtorMock->expects($this->any())
-+            ->method('isValid')
-+            ->willReturn(false);
- 
-         $scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config::class)
-             ->setMethods(['isSetFlag'])->disableOriginalConstructor()->getMock();
-+        $scopeConfigMock->expects($this->any())
-+            ->method('isSetFlag')
-+            ->willReturn(true);
- 
-         $resolverMock = $this->getMockBuilder(\Magento\Framework\View\Element\Template\File\Resolver::class)
-             ->setMethods([])->disableOriginalConstructor()->getMock();
-@@ -72,48 +70,48 @@ class LinkTest extends \PHPUnit\Framework\TestCase
- 
-         $contextMock->expects($this->any())
-             ->method('getValidator')
--            ->will($this->returnValue($validtorMock));
-+            ->willReturn($validtorMock);
- 
-         $contextMock->expects($this->any())
-             ->method('getResolver')
--            ->will($this->returnValue($resolverMock));
-+            ->willReturn($resolverMock);
- 
-         $contextMock->expects($this->any())
-             ->method('getEscaper')
--            ->will($this->returnValue($escaperMock));
-+            ->willReturn($escaperMock);
- 
-         $contextMock->expects($this->any())
-             ->method('getUrlBuilder')
--            ->will($this->returnValue($urlBuilderMock));
-+            ->willReturn($urlBuilderMock);
- 
-         $contextMock->expects($this->any())
-             ->method('getScopeConfig')
--            ->will($this->returnValue($scopeConfigMock));
-+            ->willReturn($scopeConfigMock);
- 
-         /** @var \Magento\Framework\View\Element\Html\Link $linkWithAttributes */
--        $linkWithAttributes = $objectManagerHelper->getObject(
-+        $linkWithAttributes = $this->objectManager->getObject(
-             \Magento\Framework\View\Element\Html\Link::class,
-             ['context' => $contextMock]
-         );
-+
-+        $this->assertEquals(
-+            'href="http://site.com/link.html"',
-+            $linkWithAttributes->getLinkAttributes()
-+        );
-+
-         /** @var \Magento\Framework\View\Element\Html\Link $linkWithoutAttributes */
--        $linkWithoutAttributes = $objectManagerHelper->getObject(
-+        $linkWithoutAttributes = $this->objectManager->getObject(
-             \Magento\Framework\View\Element\Html\Link::class,
-             ['context' => $contextMock]
-         );
--
-         foreach ($this->allowedAttributes as $attribute) {
--            $linkWithAttributes->setDataUsingMethod($attribute, $attribute);
-+            $linkWithoutAttributes->setDataUsingMethod($attribute, $attribute);
-         }
- 
--        return [
--            'full' => [
--                'link' => $linkWithAttributes,
--                'expected' => 'shape="shape" tabindex="tabindex" onfocus="onfocus" onblur="onblur" id="id"',
--            ],
--            'empty' => [
--                'link' => $linkWithoutAttributes,
--                'expected' => '',
--            ],
--        ];
-+        $this->assertEquals(
-+            'href="http://site.com/link.html" shape="shape" tabindex="tabindex"'
-+            . ' onfocus="onfocus" onblur="onblur" id="id"',
-+            $linkWithoutAttributes->getLinkAttributes()
-+        );
-     }
- }
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php
-index 57fefe4660c..223b9a364b1 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php
-@@ -9,13 +9,15 @@
-  */
- namespace Magento\Framework\View\Test\Unit\Element;
- 
-+use Magento\Framework\Escaper;
- use Magento\Framework\Message\Manager;
- use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
- use \Magento\Framework\View\Element\Messages;
--
--use Magento\Framework\Message\ManagerInterface;
- use Magento\Framework\Message\MessageInterface;
- 
-+/**
-+ * Unit test for \Magento\Framework\View\Element\Messages
-+ */
- class MessagesTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -38,6 +40,11 @@ class MessagesTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $messageInterpretationStrategy;
- 
-+    /**
-+     * @var Escaper|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $escaperMock;
-+
-     protected function setUp()
-     {
-         $this->collectionFactory = $this->getMockBuilder(\Magento\Framework\Message\CollectionFactory::class)
-@@ -52,13 +59,18 @@ class MessagesTest extends \PHPUnit\Framework\TestCase
-             \Magento\Framework\View\Element\Message\InterpretationStrategyInterface::class
-         );
- 
-+        $this->escaperMock = $this->getMockBuilder(Escaper::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-         $this->messages = $objectManager->getObject(
-             \Magento\Framework\View\Element\Messages::class,
-             [
-                 'collectionFactory' => $this->collectionFactory,
-                 'messageFactory' => $this->messageFactory,
--                'interpretationStrategy' => $this->messageInterpretationStrategy
-+                'interpretationStrategy' => $this->messageInterpretationStrategy,
-+                'escaper' => $this->escaperMock,
-             ]
-         );
-     }
-@@ -317,6 +329,14 @@ class MessagesTest extends \PHPUnit\Framework\TestCase
-                 ]
-             );
- 
-+        $this->escaperMock->expects($this->any())
-+            ->method('escapeHtmlAttr')
-+            ->willReturnCallback(
-+                function ($string) {
-+                    return $string;
-+                }
-+            );
-+
-         $this->assertEquals($resultHtml, $this->messages->getGroupedHtml());
-     }
- }
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php
-index 28d58f4685e..7a3578993f3 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php
-@@ -20,21 +20,21 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-      *
-      * @var \Magento\Framework\View\Element\Template\File\Validator
-      */
--    private $_validator;
-+    private $validator;
- 
-     /**
-      * Mock for view file system
-      *
-      * @var \Magento\Framework\FileSystem|\PHPUnit_Framework_MockObject_MockObject
-      */
--    private $_fileSystemMock;
-+    private $fileSystemMock;
- 
-     /**
-      * Mock for scope config
-      *
-      * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-      */
--    private $_scopeConfigMock;
-+    private $scopeConfigMock;
- 
-     /**
-      * Mock for root directory reader
-@@ -62,12 +62,12 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-      */
-     protected function setUp()
-     {
--        $this->_fileSystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
--        $this->_scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-+        $this->fileSystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
-+        $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-         $this->rootDirectoryMock = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
-         $this->compiledDirectoryMock = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
- 
--        $this->_fileSystemMock->expects($this->any())
-+        $this->fileSystemMock->expects($this->any())
-             ->method('getDirectoryRead')
-             ->will($this->returnValueMap(
-                 [
-@@ -91,10 +91,18 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-                     ]
-                 )
-             );
--        $this->_validator = new \Magento\Framework\View\Element\Template\File\Validator(
--            $this->_fileSystemMock,
--            $this->_scopeConfigMock,
--            $this->componentRegistrar
-+
-+        $fileDriverMock = $this->createMock(\Magento\Framework\Filesystem\Driver\File::class);
-+        $fileDriverMock->expects($this->any())
-+            ->method('getRealPath')
-+            ->willReturnArgument(0);
-+
-+        $this->validator = new \Magento\Framework\View\Element\Template\File\Validator(
-+            $this->fileSystemMock,
-+            $this->scopeConfigMock,
-+            $this->componentRegistrar,
-+            null,
-+            $fileDriverMock
-         );
-     }
- 
-@@ -103,23 +111,22 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
-      *
-      * @param string $file
-      * @param bool $expectedResult
--     *
--     * @dataProvider testIsValidDataProvider
--     *
-      * @return void
-+     *
-+     * @dataProvider isValidDataProvider
-      */
-     public function testIsValid($file, $expectedResult)
-     {
-         $this->rootDirectoryMock->expects($this->any())->method('isFile')->will($this->returnValue(true));
--        $this->assertEquals($expectedResult, $this->_validator->isValid($file));
-+        $this->assertEquals($expectedResult, $this->validator->isValid($file));
-     }
- 
-     /**
-      * Data provider for testIsValid
-      *
--     * @return []
-+     * @return array
-      */
--    public function testIsValidDataProvider()
-+    public function isValidDataProvider()
-     {
-         return [
-             'empty' => ['', false],
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php
-index b7301c4cad5..75c7fc24854 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php
-@@ -11,7 +11,11 @@ namespace Magento\Framework\View\Test\Unit\Element\UiComponent;
- 
- use Magento\Framework\View\Element\UiComponent\Context;
- use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-+use Magento\Framework\View\Element\UiComponent\Control\ActionPoolInterface;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class ContextTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -19,6 +23,16 @@ class ContextTest extends \PHPUnit\Framework\TestCase
-      */
-     protected $context;
- 
-+    /**
-+     * @var ActionPoolInterface
-+     */
-+    private $actionPool;
-+
-+    /**
-+     * @var \Magento\Framework\AuthorizationInterface
-+     */
-+    private $authorization;
-+
-     protected function setUp()
-     {
-         $pageLayout = $this->getMockBuilder(\Magento\Framework\View\LayoutInterface::class)->getMock();
-@@ -33,6 +47,10 @@ class ContextTest extends \PHPUnit\Framework\TestCase
-             $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Control\ActionPoolFactory::class)
-                 ->disableOriginalConstructor()
-                 ->getMock();
-+        $this->actionPool = $this->getMockBuilder(ActionPoolInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+        $actionPoolFactory->method('create')->willReturn($this->actionPool);
-         $contentTypeFactory =
-             $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContentType\ContentTypeFactory::class)
-                 ->disableOriginalConstructor()
-@@ -43,6 +61,9 @@ class ContextTest extends \PHPUnit\Framework\TestCase
-             $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentFactory::class)
-                 ->disableOriginalConstructor()
-                 ->getMock();
-+        $this->authorization = $this->getMockBuilder(\Magento\Framework\AuthorizationInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
- 
-         $objectManagerHelper = new ObjectManagerHelper($this);
-         $this->context = $objectManagerHelper->getObject(
-@@ -55,11 +76,62 @@ class ContextTest extends \PHPUnit\Framework\TestCase
-                 'contentTypeFactory'    => $contentTypeFactory,
-                 'urlBuilder'            => $urlBuilder,
-                 'processor'             => $processor,
--                'uiComponentFactory'    => $uiComponentFactory
-+                'uiComponentFactory'    => $uiComponentFactory,
-+                'authorization'         => $this->authorization,
-             ]
-         );
-     }
- 
-+    public function testAddButtonWithoutAclResource()
-+    {
-+        $component = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->actionPool->expects($this->once())->method('add');
-+        $this->authorization->expects($this->never())->method('isAllowed');
-+
-+        $this->context->addButtons([
-+            'button_1' => [
-+                'name' => 'button_1',
-+            ],
-+        ], $component);
-+    }
-+
-+    public function testAddButtonWithAclResourceAllowed()
-+    {
-+        $component = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->actionPool->expects($this->once())->method('add');
-+        $this->authorization->expects($this->once())->method('isAllowed')->willReturn(true);
-+
-+        $this->context->addButtons([
-+            'button_1' => [
-+                'name' => 'button_1',
-+                'aclResource' => 'Magento_Framwork::acl',
-+            ],
-+        ], $component);
-+    }
-+
-+    public function testAddButtonWithAclResourceDenied()
-+    {
-+        $component = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentInterface::class)
-+            ->disableOriginalConstructor()
-+            ->getMock();
-+
-+        $this->actionPool->expects($this->never())->method('add');
-+        $this->authorization->expects($this->once())->method('isAllowed')->willReturn(false);
-+
-+        $this->context->addButtons([
-+            'button_1' => [
-+                'name' => 'button_1',
-+                'aclResource' => 'Magento_Framwork::acl',
-+            ],
-+        ], $component);
-+    }
-+
-     /**
-      * @dataProvider addComponentDefinitionDataProvider
-      * @param array $components
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php
-index 7cc280a930d..6e3ba94de50 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php
-@@ -3,10 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\View\Test\Unit\Layout\Argument\Interpreter;
- 
--use \Magento\Framework\View\Layout\Argument\Interpreter\DataObject;
-+use Magento\Framework\View\Layout\Argument\Interpreter\DataObject;
- 
-+/**
-+ * Tests layout argument interpreter data object.
-+ */
- class ObjectTest extends \PHPUnit\Framework\TestCase
- {
-     const EXPECTED_CLASS = \Magento\Framework\View\Test\Unit\Layout\Argument\Interpreter\ObjectTest::class;
-@@ -22,19 +27,55 @@ class ObjectTest extends \PHPUnit\Framework\TestCase
-     protected $_interpreter;
- 
-     /**
--     * @var DataObject
-+     * @var \Magento\Framework\Stdlib\BooleanUtils
-+     */
-+    protected $_booleanUtils;
-+
-+    /**
-+     * @var \Magento\Framework\View\Layout\Argument\Interpreter\DataObject
-      */
-     protected $_model;
- 
-     protected function setUp()
-     {
-         $this->_objectManager = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
--        $this->_model = new DataObject($this->_objectManager, self::EXPECTED_CLASS);
-+        $this->_booleanUtils = $this->createMock(\Magento\Framework\Stdlib\BooleanUtils::class);
-+        $this->_model = new DataObject($this->_objectManager, self::EXPECTED_CLASS, $this->_booleanUtils);
-     }
- 
-     public function testEvaluate()
-     {
-         $input = ['name' => 'dataSource', 'value' => self::EXPECTED_CLASS];
-+        $this->_objectManager->expects($this->once())
-+            ->method('get')
-+            ->with(self::EXPECTED_CLASS)
-+            ->willReturn($this);
-+
-+        $actual = $this->_model->evaluate($input);
-+        $this->assertSame($this, $actual);
-+    }
-+
-+    public function textEvaluateShareEnabled()
-+    {
-+        $input = ['name' => 'dataSource', 'value' => self::EXPECTED_CLASS, 'shared' => true];
-+        $this->_booleanUtils->expects($this->once())
-+            ->method('toBoolean')
-+            ->willReturn(true);
-+        $this->_objectManager->expects($this->once())
-+            ->method('get')
-+            ->with(self::EXPECTED_CLASS)
-+            ->willReturn($this);
-+
-+        $actual = $this->_model->evaluate($input);
-+        $this->assertSame($this, $actual);
-+    }
-+
-+    public function textEvaluateShareDisabled()
-+    {
-+        $input = ['name' => 'dataSource', 'value' => self::EXPECTED_CLASS, 'shared' => false];
-+        $this->_booleanUtils->expects($this->once())
-+            ->method('toBoolean')
-+            ->willReturn(false);
-         $this->_objectManager->expects($this->once())
-             ->method('create')
-             ->with(self::EXPECTED_CLASS)
-@@ -52,12 +93,56 @@ class ObjectTest extends \PHPUnit\Framework\TestCase
-         $this->expectException($expectedException);
-         $this->expectExceptionMessage($expectedExceptionMessage);
-         $self = $this;
-+        $this->_objectManager->expects($this->any())->method('get')->willReturnCallback(
-+            function ($className) use ($self) {
-+                return $self->createMock($className);
-+            }
-+        );
-+
-+        $this->_model->evaluate($input);
-+    }
-+
-+    /**
-+     * @dataProvider evaluateWrongClassDataProvider
-+     */
-+    public function testEvaluateShareEnabledWrongClass($input, $expectedException, $expectedExceptionMessage)
-+    {
-+        $this->expectException($expectedException);
-+        $this->expectExceptionMessage($expectedExceptionMessage);
-+        $self = $this;
-+        $this->_booleanUtils->expects($this->any())
-+            ->method('toBoolean')
-+            ->willReturn(true);
-+        $this->_objectManager->expects($this->any())->method('get')->willReturnCallback(
-+            function ($className) use ($self) {
-+                return $self->createMock($className);
-+            }
-+        );
-+
-+        $input['shared'] = true;
-+
-+        $this->_model->evaluate($input);
-+    }
-+
-+    /**
-+     * @dataProvider evaluateWrongClassDataProvider
-+     */
-+    public function testEvaluateShareDisabledWrongClass($input, $expectedException, $expectedExceptionMessage)
-+    {
-+        $this->expectException($expectedException);
-+        $this->expectExceptionMessage($expectedExceptionMessage);
-+        $self = $this;
-+        $this->_booleanUtils->expects($this->any())
-+            ->method('toBoolean')
-+            ->willReturn(false);
-         $this->_objectManager->expects($this->any())->method('create')->willReturnCallback(
-             function ($className) use ($self) {
-                 return $self->createMock($className);
-             }
-         );
- 
-+        $input['shared'] = false;
-+
-         $this->_model->evaluate($input);
-     }
- 
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
-index a22689ae7cc..c1bdc1ea344 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
-@@ -60,6 +60,9 @@ class HeadTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
-+    /**
-+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-+     */
-     public function testProcess()
-     {
-         $generatorContextMock = $this->createMock(Context::class);
-@@ -82,6 +85,20 @@ class HeadTest extends \PHPUnit\Framework\TestCase
-                 'content_type' => 'css',
-                 'media' => 'all',
-             ],
-+            'remoteCssOrderedLast' => [
-+                'src' => 'file-url-css-last',
-+                'src_type' => 'url',
-+                'content_type' => 'css',
-+                'media' => 'all',
-+                'order' => 30,
-+            ],
-+            'remoteCssOrderedFirst' => [
-+                'src' => 'file-url-css-first',
-+                'src_type' => 'url',
-+                'content_type' => 'css',
-+                'media' => 'all',
-+                'order' => 10,
-+            ],
-             'remoteLink' => [
-                 'src' => 'file-url-link',
-                 'src_type' => 'url',
-@@ -106,8 +123,14 @@ class HeadTest extends \PHPUnit\Framework\TestCase
-             ->with('file-url-css', 'css', ['attributes' => ['media' => 'all']]);
-         $this->pageConfigMock->expects($this->at(1))
-             ->method('addRemotePageAsset')
--            ->with('file-url-link', Head::VIRTUAL_CONTENT_TYPE_LINK, ['attributes' => ['media' => 'all']]);
-+            ->with('file-url-css-last', 'css', ['attributes' => ['media' => 'all' ] , 'order' => 30]);
-         $this->pageConfigMock->expects($this->at(2))
-+            ->method('addRemotePageAsset')
-+            ->with('file-url-css-first', 'css', ['attributes' => ['media' => 'all'] , 'order' => 10]);
-+        $this->pageConfigMock->expects($this->at(3))
-+            ->method('addRemotePageAsset')
-+            ->with('file-url-link', Head::VIRTUAL_CONTENT_TYPE_LINK, ['attributes' => ['media' => 'all']]);
-+        $this->pageConfigMock->expects($this->at(4))
-             ->method('addRemotePageAsset')
-             ->with('http://magento.dev/customcss/render/css', 'css', ['attributes' => ['media' => 'all']]);
-         $this->pageConfigMock->expects($this->once())
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Reader/HeadTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Reader/HeadTest.php
-index d1717a9f05b..9fd174bc52d 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Reader/HeadTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Reader/HeadTest.php
-@@ -59,7 +59,7 @@ class HeadTest extends \PHPUnit\Framework\TestCase
- 
-         $structureMock->expects($this->at(4))
-             ->method('addAssets')
--            ->with('path/file.css', ['src' => 'path/file.css', 'media' => 'all', 'content_type' => 'css'])
-+            ->with('path/file-3.css', ['src' => 'path/file-3.css', 'media' => 'all', 'content_type' => 'css'])
-             ->willReturnSelf();
- 
-         $structureMock->expects($this->at(5))
-@@ -82,6 +82,22 @@ class HeadTest extends \PHPUnit\Framework\TestCase
-             ->with(Config::ELEMENT_TYPE_HEAD, 'head_attribute_name', 'head_attribute_value')
-             ->willReturnSelf();
- 
-+        $structureMock->expects($this->at(9))
-+            ->method('addAssets')
-+            ->with(
-+                'path/file-1.css',
-+                ['src' => 'path/file-1.css', 'media' => 'all', 'content_type' => 'css', 'order' => 10]
-+            )
-+            ->willReturnSelf();
-+
-+        $structureMock->expects($this->at(10))
-+            ->method('addAssets')
-+            ->with(
-+                'path/file-2.css',
-+                ['src' => 'path/file-2.css', 'media' => 'all', 'content_type' => 'css', 'order' => 30]
-+            )
-+            ->willReturnSelf();
-+
-         $this->assertEquals($this->model, $this->model->interpret($readerContextMock, $element->children()[0]));
-     }
- }
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/_files/template_head.xml b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/_files/template_head.xml
-index f4f378d7356..4efbef82df4 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/_files/template_head.xml
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/_files/template_head.xml
-@@ -11,7 +11,9 @@
-         <meta name="meta_name" content="meta_content"/>
-         <meta property="og:video:secure_url" content="https://secure.example.com/movie.swf" />
-         <meta property="og:locale:alternate" content="uk_UA" />
--        <css src="path/file.css" media="all" />
-+        <css src="path/file-1.css" order="10" media="all" />
-+        <css src="path/file-2.css" order="30" media="all" />
-+        <css src="path/file-3.css" media="all" />
-         <script src="path/file.js" defer="defer"/>
-         <link src="http://url.com" src_type="url"/>
-         <remove src="path/remove/file.css"/>
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php
-index 44e6e878a18..a1d522032a1 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php
-@@ -19,6 +19,9 @@ use Magento\Framework\View\Page\Config;
-  */
- class ConfigTest extends \PHPUnit\Framework\TestCase
- {
-+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
-+    private $objectManager;
-+
-     /**
-      * @var Config
-      */
-@@ -90,6 +93,10 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-         $this->localeMock->expects($this->any())
-             ->method('getLocale')
-             ->willReturn(Resolver::DEFAULT_LOCALE);
-+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-+        $escaper = $this->objectManager->getObject(
-+            \Magento\Framework\Escaper::class
-+        );
-         $this->model = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
-             ->getObject(
-                 \Magento\Framework\View\Page\Config::class,
-@@ -98,7 +105,8 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
-                     'pageAssets' => $this->pageAssets,
-                     'scopeConfig' => $this->scopeConfig,
-                     'favicon' => $this->favicon,
--                    'localeResolver' => $this->localeMock
-+                    'localeResolver' => $this->localeMock,
-+                    'escaper' => $escaper
-                 ]
-             );
- 
-diff --git a/lib/internal/Magento/Framework/View/Test/Unit/TemplateEngine/PhpTest.php b/lib/internal/Magento/Framework/View/Test/Unit/TemplateEngine/PhpTest.php
-index 5b9f8935a09..b7f60f49856 100644
---- a/lib/internal/Magento/Framework/View/Test/Unit/TemplateEngine/PhpTest.php
-+++ b/lib/internal/Magento/Framework/View/Test/Unit/TemplateEngine/PhpTest.php
-@@ -3,8 +3,13 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\View\Test\Unit\TemplateEngine;
- 
-+/**
-+ * Test template engine that enables PHP templates to be used for rendering.
-+ */
- class PhpTest extends \PHPUnit\Framework\TestCase
- {
-     const TEST_PROP_VALUE = 'TEST_PROP_VALUE';
-@@ -55,7 +60,7 @@ class PhpTest extends \PHPUnit\Framework\TestCase
-      * Test the render() function with a nonexistent filename.
-      *
-      * Expect an exception if the specified file does not exist.
--     * @expectedException \Exception
-+     * @expectedException PHPUnit\Framework\Exception
-      */
-     public function testRenderException()
-     {
-@@ -66,6 +71,7 @@ class PhpTest extends \PHPUnit\Framework\TestCase
-         )->disableOriginalConstructor()->getMock();
- 
-         $filename = 'This_is_not_a_file';
-+
-         $this->_phpEngine->render($blockMock, $filename);
-     }
- 
-diff --git a/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php b/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php
-new file mode 100644
-index 00000000000..8de30e92218
---- /dev/null
-+++ b/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php
-@@ -0,0 +1,36 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+namespace Magento\Framework\Webapi\CustomAttribute;
-+
-+/**
-+ * Interface for attribute preprocessor
-+ */
-+interface PreprocessorInterface
-+{
-+    /**
-+     * Check if this attribute data should be processed
-+     *
-+     * @param string $key
-+     * @param mixed $attribute
-+     * @return bool
-+     */
-+    public function shouldBeProcessed(string $key, $attribute): bool;
-+
-+    /**
-+     * Process attribute object according to type rules
-+     *
-+     * @param string $key
-+     * @param mixed $attribute
-+     */
-+    public function process(string $key, &$attribute);
-+
-+    /**
-+     * Get list of affected attributes for the current preprocessor
-+     *
-+     * @return array
-+     */
-+    public function getAffectedAttributes(): array;
-+}
-diff --git a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
-index b124c417148..f9b6a32fc56 100644
---- a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
-+++ b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Webapi;
- 
- use Magento\Framework\App\Filesystem\DirectoryList;
-@@ -172,7 +174,6 @@ class ErrorProcessor
-      * @param \Exception $exception
-      * @param int $httpCode
-      * @return void
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     public function renderException(\Exception $exception, $httpCode = self::DEFAULT_ERROR_HTTP_CODE)
-     {
-@@ -188,6 +189,7 @@ class ErrorProcessor
-                 $httpCode
-             );
-         }
-+        // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-         exit;
-     }
- 
-@@ -195,7 +197,7 @@ class ErrorProcessor
-      * Log information about exception to exception log.
-      *
-      * @param \Exception $exception
--     * @return string $reportId
-+     * @return string
-      */
-     protected function _critical(\Exception $exception)
-     {
-@@ -232,6 +234,7 @@ class ErrorProcessor
-             header('HTTP/1.1 ' . ($httpCode ? $httpCode : self::DEFAULT_ERROR_HTTP_CODE));
-             header('Content-Type: ' . $mimeType . '; charset=' . self::DEFAULT_RESPONSE_CHARSET);
-         }
-+        // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
-         echo $output;
-     }
- 
-@@ -317,7 +320,7 @@ class ErrorProcessor
-     protected function _saveFatalErrorReport($reportData)
-     {
-         $this->directoryWrite->create('report/api');
--        $reportId = abs(intval(microtime(true) * random_int(100, 1000)));
-+        $reportId = abs((int)(microtime(true) * random_int(100, 1000)));
-         $this->directoryWrite->writeFile('report/api/' . $reportId, $this->serializer->serialize($reportData));
-         return $reportId;
-     }
-diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php
-index 87be46c1115..eb840350127 100644
---- a/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php
-+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php
-@@ -6,6 +6,8 @@
- 
- namespace Magento\Framework\Webapi\Rest\Response;
- 
-+use Magento\Framework\Api\AbstractExtensibleObject;
-+use Magento\Framework\Api\AttributeInterface;
- use Magento\Framework\Webapi\Rest\Request as RestRequest;
- 
- /**
-@@ -178,10 +180,47 @@ class FieldsFilter
-         //If the field in array2 (filter) is not present in array1 (response) it will be removed after intersect
-         $arrayIntersect = array_intersect_key($array1, $array2);
-         foreach ($arrayIntersect as $key => &$value) {
-+            if ($key == AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY
-+                && is_array($array2[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY])
-+            ) {
-+                $value = $this->filterCustomAttributes(
-+                    $value,
-+                    $array2[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY]
-+                );
-+                continue;
-+            }
-             if (is_array($value) && is_array($array2[$key])) {
-                 $value = $this->applyFilter($value, $array2[$key]);
-             }
-         }
-         return $arrayIntersect;
-     }
-+
-+    /**
-+     * Filter for custom attributes.
-+     *
-+     * @param array $item
-+     * @param array $filter
-+     * @return array
-+     */
-+    private function filterCustomAttributes(array $item, array $filter) : array
-+    {
-+        $fieldResult = [];
-+        foreach ($item as $key => $field) {
-+            $filterKeys = array_keys($filter);
-+            if (in_array($field[AttributeInterface::ATTRIBUTE_CODE], $filterKeys)) {
-+                $fieldResult[$key][AttributeInterface::ATTRIBUTE_CODE] = $field[AttributeInterface::ATTRIBUTE_CODE];
-+                $fieldResult[$key][AttributeInterface::VALUE] = $field[AttributeInterface::VALUE];
-+            } else {
-+                if (isset($filter[AttributeInterface::ATTRIBUTE_CODE])) {
-+                    $fieldResult[$key][AttributeInterface::ATTRIBUTE_CODE] = $field[AttributeInterface::ATTRIBUTE_CODE];
-+                }
-+                if (isset($filter[AttributeInterface::VALUE])) {
-+                    $fieldResult[$key][AttributeInterface::VALUE] = $field[AttributeInterface::VALUE];
-+                }
-+            }
-+        }
-+
-+        return $fieldResult;
-+    }
- }
-diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
-index b4cfc61611a..f25cd219e3e 100644
---- a/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
-+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
-@@ -7,6 +7,9 @@
-  */
- namespace Magento\Framework\Webapi\Rest\Response\Renderer;
- 
-+/**
-+ * Renders response data in Xml format.
-+ */
- class Xml implements \Magento\Framework\Webapi\Rest\Response\RendererInterface
- {
-     /**
-@@ -111,8 +114,7 @@ class Xml implements \Magento\Framework\Webapi\Rest\Response\RendererInterface
-             /** Without the following transformation boolean values are rendered incorrectly */
-             $value = $value ? 'true' : 'false';
-         }
--        $replacementMap = ['&' => '&amp;'];
--        return str_replace(array_keys($replacementMap), array_values($replacementMap), $value);
-+        return (string) $value;
-     }
- 
-     /**
-diff --git a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
-index 26102f008c7..c253a400bed 100644
---- a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
-+++ b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
-@@ -20,6 +20,7 @@ use Magento\Framework\Phrase;
- use Magento\Framework\Reflection\MethodsMap;
- use Magento\Framework\Reflection\TypeProcessor;
- use Magento\Framework\Webapi\Exception as WebapiException;
-+use Magento\Framework\Webapi\CustomAttribute\PreprocessorInterface;
- use Zend\Code\Reflection\ClassReflection;
- 
- /**
-@@ -72,6 +73,16 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
-      */
-     private $config;
- 
-+    /**
-+     * @var PreprocessorInterface[]
-+     */
-+    private $customAttributePreprocessors;
-+
-+    /**
-+     * @var array
-+     */
-+    private $attributesPreprocessorsMap = [];
-+
-     /**
-      * Initialize dependencies.
-      *
-@@ -82,6 +93,7 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
-      * @param MethodsMap $methodsMap
-      * @param ServiceTypeToEntityTypeMap $serviceTypeToEntityTypeMap
-      * @param ConfigInterface $config
-+     * @param array $customAttributePreprocessors
-      */
-     public function __construct(
-         TypeProcessor $typeProcessor,
-@@ -90,7 +102,8 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
-         CustomAttributeTypeLocatorInterface $customAttributeTypeLocator,
-         MethodsMap $methodsMap,
-         ServiceTypeToEntityTypeMap $serviceTypeToEntityTypeMap = null,
--        ConfigInterface $config = null
-+        ConfigInterface $config = null,
-+        array $customAttributePreprocessors = []
-     ) {
-         $this->typeProcessor = $typeProcessor;
-         $this->objectManager = $objectManager;
-@@ -101,6 +114,7 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
-             ?: \Magento\Framework\App\ObjectManager::getInstance()->get(ServiceTypeToEntityTypeMap::class);
-         $this->config = $config
-             ?: \Magento\Framework\App\ObjectManager::getInstance()->get(ConfigInterface::class);
-+        $this->customAttributePreprocessors = $customAttributePreprocessors;
-     }
- 
-     /**
-@@ -132,7 +146,6 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
-      * @param string $serviceMethodName name of the method that we are trying to call
-      * @param array $inputArray data to send to method in key-value format
-      * @return array list of parameters that can be used to call the service method
--     * @throws InputException if no value is provided for required parameters
-      * @throws WebapiException
-      */
-     public function process($serviceClassName, $serviceMethodName, array $inputArray)
-@@ -165,17 +178,25 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
-     }
- 
-     /**
-+     * Retrieve constructor data
-+     *
-      * @param string $className
-      * @param array $data
-      * @return array
-      * @throws \ReflectionException
-+     * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     private function getConstructorData(string $className, array $data): array
-     {
-         $preferenceClass = $this->config->getPreference($className);
-         $class = new ClassReflection($preferenceClass ?: $className);
- 
--        $constructor = $class->getConstructor();
-+        try {
-+            $constructor = $class->getMethod('__construct');
-+        } catch (\ReflectionException $e) {
-+            $constructor = null;
-+        }
-+
-         if ($constructor === null) {
-             return [];
-         }
-@@ -184,7 +205,15 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
-         $parameters = $constructor->getParameters();
-         foreach ($parameters as $parameter) {
-             if (isset($data[$parameter->getName()])) {
--                $res[$parameter->getName()] = $data[$parameter->getName()];
-+                $parameterType = $this->typeProcessor->getParamType($parameter);
-+
-+                try {
-+                    $res[$parameter->getName()] = $this->convertValue($data[$parameter->getName()], $parameterType);
-+                } catch (\ReflectionException $e) {
-+                    // Parameter was not correclty declared or the class is uknown.
-+                    // By not returing the contructor value, we will automatically fall back to the "setters" way.
-+                    continue;
-+                }
-             }
-         }
- 
-@@ -200,6 +229,7 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
-      * @param array $data
-      * @return object the newly created and populated object
-      * @throws \Exception
-+     * @throws SerializationException
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      */
-     protected function _createFromArray($className, $data)
-@@ -245,6 +275,7 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
-                     } else {
-                         $setterValue = $this->convertValue($value, $returnType);
-                     }
-+                // phpcs:ignore Magento2.Exceptions.ThrowCatch
-                 } catch (SerializationException $e) {
-                     throw new SerializationException(
-                         new Phrase(
-@@ -273,12 +304,11 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
-         $dataObjectClassName = ltrim($dataObjectClassName, '\\');
- 
-         foreach ($customAttributesValueArray as $key => $customAttribute) {
-+            $this->runCustomAttributePreprocessors($key, $customAttribute);
-             if (!is_array($customAttribute)) {
-                 $customAttribute = [AttributeValue::ATTRIBUTE_CODE => $key, AttributeValue::VALUE => $customAttribute];
-             }
--
-             list($customAttributeCode, $customAttributeValue) = $this->processCustomAttribute($customAttribute);
--
-             $entityType = $this->serviceTypeToEntityTypeMap->getEntityType($dataObjectClassName);
-             if ($entityType) {
-                 $type = $this->customAttributeTypeLocator->getType(
-@@ -294,6 +324,7 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
-             ) {
-                 try {
-                     $attributeValue = $this->convertValue($customAttributeValue, $type);
-+                // phpcs:ignore Magento2.Exceptions.ThrowCatch
-                 } catch (SerializationException $e) {
-                     throw new SerializationException(
-                         new Phrase(
-@@ -315,11 +346,49 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
-         return $result;
-     }
- 
-+    /**
-+     * Get map of preprocessors related to the custom attributes
-+     *
-+     * @return array
-+     */
-+    private function getAttributesPreprocessorsMap(): array
-+    {
-+        if (!$this->attributesPreprocessorsMap) {
-+            foreach ($this->customAttributePreprocessors as $attributePreprocessor) {
-+                foreach ($attributePreprocessor->getAffectedAttributes() as $attributeKey) {
-+                    $this->attributesPreprocessorsMap[$attributeKey][] = $attributePreprocessor;
-+                }
-+            }
-+        }
-+
-+        return $this->attributesPreprocessorsMap;
-+    }
-+
-+    /**
-+     * Prepare attribute value by loaded attribute preprocessors
-+     *
-+     * @param mixed $key
-+     * @param mixed $customAttribute
-+     */
-+    private function runCustomAttributePreprocessors($key, &$customAttribute)
-+    {
-+        $preprocessorsMap = $this->getAttributesPreprocessorsMap();
-+        if ($key && is_array($customAttribute) && array_key_exists($key, $preprocessorsMap)) {
-+            $preprocessorsList = $preprocessorsMap[$key];
-+            foreach ($preprocessorsList as $attributePreprocessor) {
-+                if ($attributePreprocessor->shouldBeProcessed($key, $customAttribute)) {
-+                    $attributePreprocessor->process($key, $customAttribute);
-+                }
-+            }
-+        }
-+    }
-+
-     /**
-      * Derive the custom attribute code and value.
-      *
-      * @param string[] $customAttribute
-      * @return string[]
-+     * @throws SerializationException
-      */
-     private function processCustomAttribute($customAttribute)
-     {
-diff --git a/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
-index cdb6ed799aa..224421d6561 100644
---- a/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
-+++ b/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
-@@ -7,8 +7,11 @@ namespace Magento\Framework\Webapi;
- 
- use Magento\Framework\Api\AbstractExtensibleObject;
- use Magento\Framework\Api\ExtensibleDataObjectConverter;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Reflection\DataObjectProcessor;
- use Magento\Framework\Reflection\MethodsMap;
-+use Magento\Framework\Reflection\TypeProcessor;
-+use Zend\Code\Reflection\ClassReflection;
- 
- /**
-  * Data object converter
-@@ -27,16 +30,24 @@ class ServiceOutputProcessor implements ServicePayloadConverterInterface
-      */
-     protected $methodsMapProcessor;
- 
-+    /**
-+     * @var TypeProcessor|null
-+     */
-+    private $typeProcessor;
-+
-     /**
-      * @param DataObjectProcessor $dataObjectProcessor
-      * @param MethodsMap $methodsMapProcessor
-+     * @param TypeProcessor|null $typeProcessor
-      */
-     public function __construct(
-         DataObjectProcessor $dataObjectProcessor,
--        MethodsMap $methodsMapProcessor
-+        MethodsMap $methodsMapProcessor,
-+        TypeProcessor $typeProcessor = null
-     ) {
-         $this->dataObjectProcessor = $dataObjectProcessor;
-         $this->methodsMapProcessor = $methodsMapProcessor;
-+        $this->typeProcessor = $typeProcessor ?: ObjectManager::getInstance()->get(TypeProcessor::class);
-     }
- 
-     /**
-@@ -57,6 +68,12 @@ class ServiceOutputProcessor implements ServicePayloadConverterInterface
-     {
-         /** @var string $dataType */
-         $dataType = $this->methodsMapProcessor->getMethodReturnType($serviceClassName, $serviceMethodName);
-+
-+        if (class_exists($serviceClassName) || interface_exists($serviceClassName)) {
-+            $sourceClass = new ClassReflection($serviceClassName);
-+            $dataType = $this->typeProcessor->resolveFullyQualifiedClassName($sourceClass, $dataType);
-+        }
-+
-         return $this->convertValue($data, $dataType);
-     }
- 
-diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php
-index 396fbcdb197..71fb41491cc 100644
---- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php
-+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php
-@@ -76,6 +76,11 @@ class XmlTest extends \PHPUnit\Framework\TestCase
-                 '<?xml version="1.0"?><response><item_7key>value</item_7key></response>',
-                 'Invalid XML render with numeric symbol in data index.'
-             ],
-+            [
-+                ['key' => 'test & foo'],
-+                '<?xml version="1.0"?><response><key>test &amp; foo</key></response>',
-+                'Invalid XML render with ampersand symbol in data index.'
-+            ],
-             [
-                 ['.key' => 'value'],
-                 '<?xml version="1.0"?><response><item_key>value</item_key></response>',
-diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
-index c360d57be10..b153cb513af 100644
---- a/lib/internal/Magento/Framework/composer.json
-+++ b/lib/internal/Magento/Framework/composer.json
-@@ -36,7 +36,8 @@
-         "zendframework/zend-mvc": "~2.7.0",
-         "zendframework/zend-stdlib": "^2.7.7",
-         "zendframework/zend-uri": "^2.5.1",
--        "zendframework/zend-validator": "^2.6.0"
-+        "zendframework/zend-validator": "^2.6.0",
-+        "guzzlehttp/guzzle": "^6.3.3"
-     },
-     "archive": {
-         "exclude": [
-diff --git a/lib/internal/Magento/Framework/registration.php b/lib/internal/Magento/Framework/registration.php
-index dfe63ccde35..19012a26434 100644
---- a/lib/internal/Magento/Framework/registration.php
-+++ b/lib/internal/Magento/Framework/registration.php
-@@ -7,3 +7,7 @@
- use \Magento\Framework\Component\ComponentRegistrar;
- 
- ComponentRegistrar::register(ComponentRegistrar::LIBRARY, 'magento/framework', __DIR__);
-+
-+if (!function_exists('__')) {
-+    require 'Phrase/__.php';
-+}
-diff --git a/lib/web/css/docs/forms.html b/lib/web/css/docs/forms.html
-index 211a9bd650b..dc08ddffd20 100644
---- a/lib/web/css/docs/forms.html
-+++ b/lib/web/css/docs/forms.html
-@@ -713,7 +713,7 @@ textarea {
-             <th>@_type</th>
-             <td class="vars_value">@form-element-input-type</td>
-             <td class="vars_value">'' [input-text | select | textarea | input-radio | input-checkbox]</td>
--            <td>Form control type.<br/><b>@form-element-input__[]</b> global variables are used to set up all form elements style. Control-specific global variables use these <b>@form-element-input__[]</b> variables by default. Control-specific global variables can be set up separately.<br/><b>@input-text__[]</b> is used to set up input-text controls style<br/><b>@select__[]</b> is used to set up selects style<br/><b>@textarea__[]</b> is used to set up textarea style</td>
-+            <td>Form control type.<br/><strong>@form-element-input__[]</strong> global variables are used to set up all form elements style. Control-specific global variables use these <strong>@form-element-input__[]</strong> variables by default. Control-specific global variables can be set up separately.<br/><strong>@input-text__[]</strong> is used to set up input-text controls style<br/><strong>@select__[]</strong> is used to set up selects style<br/><strong>@textarea__[]</strong> is used to set up textarea style</td>
-         </tr>
-         <tr>
-             <th>@_background</th>
-diff --git a/lib/web/css/docs/source/_actions-toolbar.less b/lib/web/css/docs/source/_actions-toolbar.less
-index 3fed935aba7..e764326444d 100644
---- a/lib/web/css/docs/source/_actions-toolbar.less
-+++ b/lib/web/css/docs/source/_actions-toolbar.less
-@@ -79,7 +79,7 @@
- //        <td>@actions-toolbar__padding</td>
- //        <td class="vars_value">false</td>
- //        <td class="vars_value">'' | false | value</td>
--//        <td>Paddings of the Actions toolbar</td>
-+//        <td>Padding of the Actions toolbar</td>
- //      </tr>
- //      <tr>
- //        <th>@_actions-toolbar-actions-margin</th>
-@@ -298,7 +298,7 @@
- //
- //  <code>@_actions-toolbar-margin</code> variable controls margins of the actions toolbar wrapper.
- //
--//  <code>@_actions-toolbar-padding</code> variable controls paddings of the actions toolbar wrapper.
-+//  <code>@_actions-toolbar-padding</code> variable controls padding of the actions toolbar wrapper.
- //
- //  ``` html
- //  <div class="example-actions-toolbar-9">
-diff --git a/lib/web/css/docs/source/_breadcrumbs.less b/lib/web/css/docs/source/_breadcrumbs.less
-index 848af20c072..5b5df991e3c 100644
---- a/lib/web/css/docs/source/_breadcrumbs.less
-+++ b/lib/web/css/docs/source/_breadcrumbs.less
-@@ -8,7 +8,7 @@
- //
- //  Breadcrumbs layout with links can be separated by any symbol, for example <code>></code> symbol.
- //
--//  The following markup corresponds to the accesibility demands:
-+//  The following markup corresponds to the accessibility demands:
- //  ```html
- //  <div class="example-breadcrumbs-1">
- //      <span class="label" id="breadcrumb-label">You are here:</span>
-diff --git a/lib/web/css/docs/source/_icons.less b/lib/web/css/docs/source/_icons.less
-index b3d14f5e1fd..367e05ff588 100644
---- a/lib/web/css/docs/source/_icons.less
-+++ b/lib/web/css/docs/source/_icons.less
-@@ -256,7 +256,7 @@
- //        <td>@icon-sprite__grid</td>
- //        <td class="vars_value">26px</td>
- //        <td class="vars_value">'' | false | value</td>
--//        <td>The size of the grid (in pixels) that the individal images are placed on</td>
-+//        <td>The size of the grid (in pixels) that the individual images are placed on</td>
- //      </tr>
- //      <tr>
- //        <th>@_icon-sprite-position</th>
-diff --git a/lib/web/css/docs/source/_layout.less b/lib/web/css/docs/source/_layout.less
-index 799f940b44c..09fd183e30b 100644
---- a/lib/web/css/docs/source/_layout.less
-+++ b/lib/web/css/docs/source/_layout.less
-@@ -361,7 +361,7 @@ footer.footer {
- 
- //  # Layout width
- //
--//  The <code>.lib-layout-width()</code> mixin is used to set default page width of the element the mixin is applied to. It can be used to set width for the whole page wrapper or for the page elements individualy like header, footer, and so on.
-+//  The <code>.lib-layout-width()</code> mixin is used to set default page width of the element the mixin is applied to. It can be used to set width for the whole page wrapper or for the page elements individually like header, footer, and so on.
- 
- //  # Layout width variables
- //
-diff --git a/lib/web/css/docs/source/_pages.less b/lib/web/css/docs/source/_pages.less
-index 6b01fa7549e..59eb121112d 100644
---- a/lib/web/css/docs/source/_pages.less
-+++ b/lib/web/css/docs/source/_pages.less
-@@ -4,7 +4,7 @@
- //  */
- 
- //  # Pagination HTML markup
--//  Pagination is used to display numbers of pages in case content exceeds page limits. The markup corresponds to accesibility demands.
-+//  Pagination is used to display numbers of pages in case content exceeds page limits. The markup corresponds to accessibility demands.
- //
- //  Required HTML markup:
- //  ```html
-diff --git a/lib/web/css/docs/source/_popups.less b/lib/web/css/docs/source/_popups.less
-index b192219b643..7251cde45bc 100644
---- a/lib/web/css/docs/source/_popups.less
-+++ b/lib/web/css/docs/source/_popups.less
-@@ -245,7 +245,7 @@
- //        <td>@popup-title-headings__level</td>
- //        <td class="vars_value">h3</td>
- //        <td class="vars_value">h1 | h2 | h3 | h4 | h5 | h6</td>
--//        <td>What heading style is applyed to the popup title</td>
-+//        <td>What heading style is applied to the popup title</td>
- //      </tr>
- //      <tr>
- //        <th colspan="5" class="vars_section">Popup close button</th>
-diff --git a/lib/web/css/docs/source/_rating.less b/lib/web/css/docs/source/_rating.less
-index 88de27b24cb..6f7ec12b77b 100644
---- a/lib/web/css/docs/source/_rating.less
-+++ b/lib/web/css/docs/source/_rating.less
-@@ -236,7 +236,7 @@
- 
- //  # Accessible rating with vote
- //
--//  The following markup corresponds to **accesibility** demands
-+//  The following markup corresponds to **accessibility** demands
- //  ``` html
- //  <fieldset class="exapmle-ratings-5 fieldset ratings vote">
- //      <legend>How do you rate this product?</legend>
-diff --git a/lib/web/css/docs/source/_responsive.less b/lib/web/css/docs/source/_responsive.less
-index 46c19bc23a6..8e7397d6ad6 100644
---- a/lib/web/css/docs/source/_responsive.less
-+++ b/lib/web/css/docs/source/_responsive.less
-@@ -81,7 +81,7 @@
- //
- //  ## Gathering
- //
--//  Everything that you include in collector mixins above will go in place where they declarated.
-+//  Everything that you include in collector mixins above will go in place where they declared.
- //  As example all
- //  ```css
- //  .media-width(@extremum, @break) {
-diff --git a/lib/web/css/docs/source/_utilities.less b/lib/web/css/docs/source/_utilities.less
-index 312eeffe488..1ce15a9a50e 100644
---- a/lib/web/css/docs/source/_utilities.less
-+++ b/lib/web/css/docs/source/_utilities.less
-@@ -367,66 +367,3 @@
- //        </tr>
- //    </table>
- //  </pre>
--
--// # .lib-url-check()
--//
--//  The <code>.lib-url-check()</code> mixin wraps passed value with 'url( ... )' and returns <code>@lib-url-check-output</code> variable. Can be used with <code>.lib-css()</code> mixin.
--//
--
--.example-url-check {
--    //  Set image path variable
--    @_icon-image: '/images/test.png';
--
--    //  "Call" the mixin
--    .lib-url-check(@_icon-image);
--
--    //  Will return url('/images/test.png')
--    .lib-css(background, #eee @lib-url-check-output no-repeat 0 0);
--}
--
--//
--//  If the variable is set to <code>false</code>, the <code>.lib-url-check()</code> will return false.
--//
--//  ```
--//  <div class="example-url-check">
--//      Block with background.
--//  </div>
--//  ```
--//
--
--.example-url-check-false {
--    //  Set usage image path to false
--    @_icon-image: false;
--
--    //  "Call" the mixin
--    .lib-url-check(@_icon-image);
--
--    //  Will return 'false' and outputs nothing
--    .lib-css(background, #eee @lib-url-check-output no-repeat 0 0);
--}
--
--//  ```
--//  <div class="example-url-check-false">
--//      Block with no background.
--//  </div>
--//  ```
--//
--
--//  # .lib-url-check() variables
--//
--//  <pre>
--//    <table>
--//        <tr>
--//            <th class="vars_head">Mixin variable</th>
--//            <th class="vars_head">Allowed values</th>
--//            <th class="vars_head">Output variable</th>
--//            <th class="vars_head">Comment</th>
--//        </tr>
--//        <tr>
--//            <th>@_path</th>
--//            <td class="vars_value">'' | false | value</td>
--//            <td class="vars_value">@lib-url-check-output</td>
--//            <td>Passed url to wrap in 'url( ... )'. If the 'false' value passed mixin will return 'false'</td>
--//        </tr>
--//    </table>
--//  </pre>
-diff --git a/lib/web/css/docs/variables.html b/lib/web/css/docs/variables.html
-index 4f353dc1554..ebbf2122ab2 100644
---- a/lib/web/css/docs/variables.html
-+++ b/lib/web/css/docs/variables.html
-@@ -3507,7 +3507,7 @@
-             <th>@_type</th>
-             <td class="vars_value">@form-element-input-type</td>
-             <td class="vars_value">'' [input-text | select | textarea | input-radio | input-checkbox]</td>
--            <td>Form control type.<br/><b>@form-element-input__[]</b> global variables are used to set up all form elements style. Control-specific global variables use these <b>@form-element-input__[]</b> variables by default. Control-specific global variables can be set up separately.<br/><b>@input-text__[]</b> is used to set up input-text controls style<br/><b>@select__[]</b> is used to set up selects style<br/><b>@textarea__[]</b> is used to set up textarea style</td>
-+            <td>Form control type.<br/><strong>@form-element-input__[]</strong> global variables are used to set up all form elements style. Control-specific global variables use these <strong>@form-element-input__[]</strong> variables by default. Control-specific global variables can be set up separately.<br/><strong>@input-text__[]</strong> is used to set up input-text controls style<br/><strong>@select__[]</strong> is used to set up selects style<br/><strong>@textarea__[]</strong> is used to set up textarea style</td>
-         </tr>
-         <tr>
-             <th>@_background</th>
-diff --git a/lib/web/css/source/components/_modals.less b/lib/web/css/source/components/_modals.less
-index fb29a74c605..396930cce6d 100644
---- a/lib/web/css/source/components/_modals.less
-+++ b/lib/web/css/source/components/_modals.less
-@@ -102,7 +102,11 @@
- 
-     &.confirm {
-         .modal-inner-wrap {
--            .lib-css(width, @modal-popup-confirm__width);
-+            .lib-css(max-width, @modal-popup-confirm__width);
-+
-+            .modal-content {
-+                padding-right: 7rem;
-+            }
-         }
-     }
- 
-diff --git a/lib/web/css/source/lib/_forms.less b/lib/web/css/source/lib/_forms.less
-index b1c7a49da4a..a22ec5f52db 100644
---- a/lib/web/css/source/lib/_forms.less
-+++ b/lib/web/css/source/lib/_forms.less
-@@ -288,7 +288,7 @@
-         .lib-form-element-input(@_type: select);
-     }
- 
--    select[multiple="multiple"] {
-+    select[multiple] {
-         .lib-css(height, auto);
-         background-image: none;
-     }
-@@ -300,6 +300,8 @@
- 
-     input[type="checkbox"] {
-         .lib-form-element-choice(@_type: input-checkbox);
-+        position: relative;
-+        top: 2px;
-     }
- 
-     input[type="radio"] {
-diff --git a/lib/web/css/source/lib/_icons.less b/lib/web/css/source/lib/_icons.less
-index d113935e2b1..abb8b43368f 100644
---- a/lib/web/css/source/lib/_icons.less
-+++ b/lib/web/css/source/lib/_icons.less
-@@ -25,9 +25,12 @@
-     @_icon-font-text-hide: @icon-font__text-hide,
-     @_icon-font-display: @icon-font__display
- ) when (@_icon-font-position = before) {
--    ._lib-icon-text-hide(@_icon-font-text-hide);
-     .lib-css(display, @_icon-font-display);
--    text-decoration: none;
-+    text-decoration: none; 
-+    
-+    & when not (@_icon-font-content = false) {
-+        ._lib-icon-text-hide(@_icon-font-text-hide);
-+    }
- 
-     &:before {
-         ._lib-icon-font(
-@@ -68,10 +71,13 @@
-     @_icon-font-text-hide: @icon-font__text-hide,
-     @_icon-font-display: @icon-font__display
- ) when (@_icon-font-position = after) {
--    ._lib-icon-text-hide(@_icon-font-text-hide);
-     .lib-css(display, @_icon-font-display);
-     text-decoration: none;
--
-+    
-+    & when not (@_icon-font-content = false) {
-+        ._lib-icon-text-hide(@_icon-font-text-hide);
-+    }
-+    
-     &:after {
-         ._lib-icon-font(
-             @_icon-font-content,
-@@ -151,8 +157,11 @@
-     @_icon-image-text-hide: @icon__text-hide
- ) when (@_icon-image-position = before) {
-     display: inline-block;
--    ._lib-icon-text-hide(@_icon-image-text-hide);
--
-+    
-+    & when not (@_icon-image = false) {
-+        ._lib-icon-text-hide(@_icon-image-text-hide);
-+    }
-+    
-     &:before {
-         ._lib-icon-image(
-             @_icon-image,
-@@ -179,7 +188,10 @@
-     @_icon-image-text-hide: @icon__text-hide
- ) when (@_icon-image-position = after) {
-     display: inline-block;
--    ._lib-icon-text-hide(@_icon-image-text-hide);
-+    
-+    & when not (@_icon-image = false) {
-+        ._lib-icon-text-hide(@_icon-font-text-hide);
-+    }
- 
-     &:after {
-         ._lib-icon-image(
-diff --git a/lib/web/css/source/lib/_navigation.less b/lib/web/css/source/lib/_navigation.less
-index acae3c62950..6232333fca3 100644
---- a/lib/web/css/source/lib/_navigation.less
-+++ b/lib/web/css/source/lib/_navigation.less
-@@ -330,6 +330,19 @@
-                 padding-right: 0;
-             }
- 
-+            &:hover {
-+                &:after {
-+                    content: '';
-+                    display: block;
-+                    position: absolute;
-+                    top: 0;
-+                    left: 100%;
-+                    width: 10px;
-+                    height: calc(100% + 3px);
-+                    z-index: 1;
-+                }
-+            }
-+
-             > .level-top {
-                 .lib-css(background, @_nav-level0-item-background-color);
-                 .lib-css(border, @_nav-level0-item-border);
-@@ -408,6 +421,17 @@
-                     @_left: @_submenu-arrow-left
-                 );
- 
-+                &:before {
-+                    content: '';
-+                    display: block;
-+                    position: absolute;
-+                    width: 100%;
-+                    height: 4px;
-+                    left: 0;
-+                    top: -4px;
-+                    z-index: 1;
-+                }
-+
-                 a {
-                     display: block;
-                     line-height: inherit;
-diff --git a/lib/web/css/source/lib/_resets.less b/lib/web/css/source/lib/_resets.less
-index 8228a07ef92..a680c91af3d 100644
---- a/lib/web/css/source/lib/_resets.less
-+++ b/lib/web/css/source/lib/_resets.less
-@@ -4,7 +4,7 @@
- //  */
- 
- //
--//  Resetes
-+//  Resets
- //  _____________________________________________
- 
- //
-@@ -55,7 +55,7 @@
-     object,
-     video,
-     embed {
--        height: auto;
-+        max-height: 100%;
-         max-width: 100%;
-     }
- 
-diff --git a/lib/web/css/source/lib/_sections.less b/lib/web/css/source/lib/_sections.less
-index 372008d0615..b73e3178359 100644
---- a/lib/web/css/source/lib/_sections.less
-+++ b/lib/web/css/source/lib/_sections.less
-@@ -49,16 +49,16 @@
-     @_tab-control-color: @tab-control__color,
-     @_tab-control-text-decoration: @tab-control__text-decoration,
- 
--    @_tab-control-color-visited: @tab-control__color,
--    @_tab-control-text-decoration-visited: @tab-control__text-decoration,
-+    @_tab-control-color-visited: @tab-control__visited__color,
-+    @_tab-control-text-decoration-visited: @tab-control__visited__text-decoration,
- 
-     @_tab-control-background-color-hover: @tab-control__hover__background-color,
-     @_tab-control-color-hover: @tab-control__hover__color,
--    @_tab-control-text-decoration-hover: @tab-control__text-decoration,
-+    @_tab-control-text-decoration-hover: @tab-control__hover__text-decoration,
- 
-     @_tab-control-background-color-active: @tab-control__active__background-color,
-     @_tab-control-color-active: @tab-control__active__color,
--    @_tab-control-text-decoration-active: @tab-control__text-decoration,
-+    @_tab-control-text-decoration-active: @tab-control__active__text-decoration,
- 
-     @_tab-control-height: @tab-control__height,
-     @_tab-control-margin-right: @tab-control__margin-right,
-@@ -121,6 +121,7 @@
-         &.active > .switch:hover {
-             .lib-css(background, @_tab-control-background-color-active);
-             .lib-css(color, @_tab-control-color-active);
-+            .lib-css(text-decoration, @_tab-control-text-decoration-active);
-         }
- 
-         &.active > .switch,
-@@ -200,8 +201,8 @@
-     @_accordion-control-color: @accordion-control__color,
-     @_accordion-control-text-decoration: @accordion-control__text-decoration,
- 
--    @_accordion-control-color-visited: @accordion-control__color,
--    @_accordion-control-text-decoration-visited: @accordion-control__text-decoration,
-+    @_accordion-control-color-visited: @accordion-control__visited__color,
-+    @_accordion-control-text-decoration-visited: @accordion-control__visited__text-decoration,
- 
-     @_accordion-control-background-color-hover: @accordion-control__hover__background-color,
-     @_accordion-control-color-hover: @accordion-control__hover__color,
-@@ -275,6 +276,8 @@
-         &.active > .switch:focus,
-         &.active > .switch:hover {
-             .lib-css(background, @_accordion-control-background-color-active);
-+            .lib-css(color, @_accordion-control-color-active);
-+            .lib-css(text-decoration, @_accordion-control-text-decoration-active);
-             .lib-css(padding-bottom, @_accordion-control-padding-bottom);
-         }
-     }
-diff --git a/lib/web/css/source/lib/_typography.less b/lib/web/css/source/lib/_typography.less
-index 07128abbf7f..db4eaaf584f 100644
---- a/lib/web/css/source/lib/_typography.less
-+++ b/lib/web/css/source/lib/_typography.less
-@@ -10,15 +10,35 @@
- .lib-font-face(
-     @family-name,
-     @font-path,
-+    @font-format: false,
-     @font-weight: normal,
--    @font-style: normal
--) {
-+    @font-style: normal,
-+    @font-display: auto
-+) when (@font-format = false) {
-     @font-face {
-         font-family: @family-name;
-         src: url('@{font-path}.woff2') format('woff2'),
-         url('@{font-path}.woff') format('woff');
-         font-weight: @font-weight;
-         font-style: @font-style;
-+        font-display: @font-display;
-+    }
-+}
-+
-+.lib-font-face(
-+    @family-name,
-+    @font-path,
-+    @font-format: false,
-+    @font-weight: normal,
-+    @font-style: normal,
-+    @font-display: auto
-+) when not (@font-format = false) {
-+    @font-face {
-+        font-family: @family-name;
-+        src: url('@{font-path}.@{font-format}') format(@font-format);
-+        font-weight: @font-weight;
-+        font-style: @font-style;
-+        font-display: @font-display;
-     }
- }
- 
-@@ -37,7 +57,7 @@
- }
- 
- //  Rem line height
--.lib-line-height(@heightValue) when not (@heightValue = false) and not (ispercentage(@heightValue)) {
-+.lib-line-height(@heightValue) when not (@heightValue = false) and not (@heightValue = normal) and not (ispercentage(@heightValue)) {
-     .lib-font-size-value(@heightValue);
-     .lib-css(line-height, @fontValue);
- }
-@@ -46,6 +66,10 @@
-     .lib-css(line-height, @heightValue);
- }
- 
-+.lib-line-height(@heightValue) when (@heightValue = normal) {
-+    .lib-css(line-height, @heightValue);
-+}
-+
- .lib-wrap-words() {
-     overflow-wrap: break-word;
-     word-wrap: break-word;
-diff --git a/lib/web/css/source/lib/variables/_buttons.less b/lib/web/css/source/lib/variables/_buttons.less
-index 8c31c161438..8729eca6aca 100644
---- a/lib/web/css/source/lib/variables/_buttons.less
-+++ b/lib/web/css/source/lib/variables/_buttons.less
-@@ -57,14 +57,14 @@
- @button-primary__gradient: false;
- @button-primary__gradient-direction: false;
- 
--@button-primary__background: @color-blue1;
--@button-primary__border: 1px solid @color-blue1;
-+@button-primary__background: @theme__color__primary;
-+@button-primary__border: 1px solid @theme__color__primary;
- @button-primary__color: @color-white;
- @button-primary__gradient-color-start: false;
- @button-primary__gradient-color-end: false;
- 
--@button-primary__hover__background: @color-blue2;
--@button-primary__hover__border: 1px solid @color-blue2;
-+@button-primary__hover__background: @theme__color__primary-alt;
-+@button-primary__hover__border: 1px solid @theme__color__primary-alt;
- @button-primary__hover__color: @button-primary__color;
- @button-primary__hover__gradient-color-start: false;
- @button-primary__hover__gradient-color-end: false;
-diff --git a/lib/web/css/source/lib/variables/_colors.less b/lib/web/css/source/lib/variables/_colors.less
-index 01e0db03adc..ffb0e8e797d 100644
---- a/lib/web/css/source/lib/variables/_colors.less
-+++ b/lib/web/css/source/lib/variables/_colors.less
-@@ -7,9 +7,13 @@
- //  Color variables
- //  _____________________________________________
- 
-+@color-blue-dodger: #008bdb;
-+@color-black_dark: #333333;
-+
- @color-white: #fff;
- @color-black: #000;
- 
-+@color-darkie-gray: #8a837f;
- @color-gray19: #303030;
- @color-gray20: #333;
- @color-gray34: #575757;
-@@ -29,12 +33,16 @@
- @color-gray79: #c9c9c9;
- @color-gray80: #ccc;
- @color-gray82: #d1d1d1;
-+@color-gray83: #d4d4d4;
- @color-gray89: #e3e3e3;
- @color-gray90: #e5e5e5;
- @color-gray91: #e8e8e8;
- @color-gray92: #ebebeb;
- @color-gray94: #f0f0f0;
- @color-gray95: #f2f2f2;
-+@color-gray_light: #cccccc;
-+@color-lighter-grayish: #cacaca;
-+@color-very-dark-gray: #666;
- @color-white-smoke: #f5f5f5;
- @color-white-dark-smoke: #efefef;
- @color-white-fog: #f8f8f8;
-@@ -78,8 +86,10 @@
- @color-sky-blue1: #68a8e0;
- 
- @color-pink1: #fae5e5;
--@color-dark-pink1: #800080;
-+@color-dark-pink1: #800080; // Legacy pink
- 
-+@color-brownie: #514943;
-+@color-brownie-vanilla: #736963;
- @color-brownie1: #6f4400;
- @color-brownie-light1: #c07600;
- 
-@@ -92,6 +102,10 @@
- //  Color nesting
- //  ---------------------------------------------
- 
-+@theme__color__primary: @color-blue1;
-+@theme__color__primary-alt: @color-blue2;
-+@theme__color__secondary: @color-orange-red1;
-+
- @primary__color: @color-gray20;
- @primary__color__dark: darken(@primary__color, 35%); // #000
- @primary__color__darker: darken(@primary__color, 13.5%); // #111
-@@ -104,5 +118,5 @@
- @page__background-color: @color-white;
- @panel__background-color: darken(@page__background-color, 6%);
- 
--@active__color: @color-orange-red1;
-+@active__color: @theme__color__secondary;
- @error__color: @color-red10;
-diff --git a/lib/web/css/source/lib/variables/_navigation.less b/lib/web/css/source/lib/variables/_navigation.less
-index 2a4aa11014d..3ef17425474 100644
---- a/lib/web/css/source/lib/variables/_navigation.less
-+++ b/lib/web/css/source/lib/variables/_navigation.less
-@@ -23,7 +23,7 @@
- @navigation-level0-item__text-decoration: none;
- 
- @navigation-level0-item__active__background: '';
--@navigation-level0-item__active__border-color: @color-orange-red1;
-+@navigation-level0-item__active__border-color: @active__color;
- @navigation-level0-item__active__border-style: solid;
- @navigation-level0-item__active__border-width: 0 0 0 8px;
- @navigation-level0-item__active__color: '';
-@@ -47,7 +47,7 @@
- 
- @submenu-item__active__background: '';
- @submenu-item__active__border: 8px;
--@submenu-item__active__border-color: @color-orange-red1;
-+@submenu-item__active__border-color: @active__color;
- @submenu-item__active__border-style: solid;
- @submenu-item__active__border-width: 0 0 0 @submenu-item__active__border;
- @submenu-item__active__color: '';
-@@ -77,7 +77,7 @@
- @navigation-desktop-level0-item__hover__text-decoration: @navigation-desktop-level0-item__text-decoration;
- 
- @navigation-desktop-level0-item__active__background: '';
--@navigation-desktop-level0-item__active__border-color: @color-orange-red1;
-+@navigation-desktop-level0-item__active__border-color: @active__color;
- @navigation-desktop-level0-item__active__border-style: solid;
- @navigation-desktop-level0-item__active__border-width: 0 0 3px;
- @navigation-desktop-level0-item__active__color: @navigation-desktop-level0-item__hover__color;
-@@ -109,7 +109,7 @@
- @submenu-desktop-item__hover__text-decoration: @navigation-desktop-level0-item__text-decoration;
- 
- @submenu-desktop-item__active__background: '';
--@submenu-desktop-item__active__border-color: @color-orange-red1;
-+@submenu-desktop-item__active__border-color: @active__color;
- @submenu-desktop-item__active__border-style: solid;
- @submenu-desktop-item__active__border-width: 0 0 0 3px;
- @submenu-desktop-item__active__color: '';
-diff --git a/lib/web/css/source/lib/variables/_rating.less b/lib/web/css/source/lib/variables/_rating.less
-index 2ffdab8bedd..ec60d591631 100644
---- a/lib/web/css/source/lib/variables/_rating.less
-+++ b/lib/web/css/source/lib/variables/_rating.less
-@@ -14,6 +14,6 @@
- @rating-icon__letter-spacing: -10px;
- @rating-icon__color: @color-gray78;
- 
--@rating-icon__active__color: @color-orange-red1;
-+@rating-icon__active__color: @active__color;
- 
- @rating-label__hide: false;
-diff --git a/lib/web/css/source/lib/variables/_sections.less b/lib/web/css/source/lib/variables/_sections.less
-index 7d961077e6f..05226d8aa3a 100644
---- a/lib/web/css/source/lib/variables/_sections.less
-+++ b/lib/web/css/source/lib/variables/_sections.less
-@@ -40,6 +40,9 @@
- @tab-control__active__color: @text__color;
- @tab-control__active__text-decoration: @tab-control__text-decoration;
- 
-+@tab-control__visited__color: @tab-control__color;
-+@tab-control__visited__text-decoration: @tab-control__text-decoration;
-+
- @tab-content__background-color: @tab-control__active__background-color;
- @tab-content__border-top-status: false;
- @tab-content__border: @tab-control__border-width solid @tab-control__border-color;
-@@ -72,8 +75,8 @@
- @accordion-control__padding-bottom: @tab-control__padding-bottom;
- @accordion-control__padding-left: @accordion-control__padding-right;
- 
--@accordion-control__visited__color: @accordion-control__color;
--@accordion-control__visited__text-decoration: @accordion-control__text-decoration;
-+@accordion-control__visited__color: @tab-control__visited__color;
-+@accordion-control__visited__text-decoration: @tab-control__visited__text-decoration;
- 
- @accordion-control__hover__background-color: @tab-control__hover__background-color;
- @accordion-control__hover__color: @tab-control__hover__color;
-diff --git a/lib/web/css/source/lib/variables/_typography.less b/lib/web/css/source/lib/variables/_typography.less
-index bf88990fe05..205b1fa9c7a 100644
---- a/lib/web/css/source/lib/variables/_typography.less
-+++ b/lib/web/css/source/lib/variables/_typography.less
-@@ -83,13 +83,13 @@
- //  Links
- //  ---------------------------------------------
- 
--@link__color: @color-blue1;
-+@link__color: @theme__color__primary;
- @link__text-decoration: none;
- 
- @link__visited__color: @link__color;
- @link__visited__text-decoration: none;
- 
--@link__hover__color: @color-blue2;
-+@link__hover__color: @theme__color__primary-alt;
- @link__hover__text-decoration: underline;
- 
- @link__active__color: @active__color;
-diff --git a/lib/web/fotorama/fotorama.js b/lib/web/fotorama/fotorama.js
-index c86cd40198b..b38e70d915c 100644
---- a/lib/web/fotorama/fotorama.js
-+++ b/lib/web/fotorama/fotorama.js
-@@ -831,7 +831,7 @@ fotoramaVersion = '4.6.4';
-                 }
-                 type = 'youtube';
-             }
--        } else if (href.host.match(/youtube\.com|youtu\.be/)) {
-+        } else if (href.host.match(/youtube\.com|youtu\.be|youtube-nocookie.com/)) {
-             id = href.pathname.replace(/^\/(embed\/|v\/)?/, '').replace(/\/.*/, '');
-             type = 'youtube';
-         } else if (href.host.match(/vimeo\.com/)) {
-@@ -1399,12 +1399,13 @@ fotoramaVersion = '4.6.4';
-             touchFLAG,
-             targetIsSelectFLAG,
-             targetIsLinkFlag,
-+            isDisabledSwipe,
-             tolerance,
-             moved;
- 
-         function onStart(e) {
-             $target = $(e.target);
--            tail.checked = targetIsSelectFLAG = targetIsLinkFlag = moved = false;
-+            tail.checked = targetIsSelectFLAG = targetIsLinkFlag = isDisabledSwipe = moved = false;
- 
-             if (touchEnabledFLAG
-                 || tail.flow
-@@ -1415,6 +1416,7 @@ fotoramaVersion = '4.6.4';
- 
-             touchFLAG = e.type === 'touchstart';
-             targetIsLinkFlag = $target.is('a, a *', el);
-+            isDisabledSwipe = $target.hasClass('disableSwipe');
-             controlTouch = tail.control;
- 
-             tolerance = (tail.noMove || tail.noSwipe || controlTouch) ? 16 : !tail.snap ? 4 : 0;
-@@ -1428,7 +1430,7 @@ fotoramaVersion = '4.6.4';
- 
-             touchEnabledFLAG = tail.flow = true;
- 
--            if (!touchFLAG || tail.go) stopEvent(e);
-+            if (!isDisabledSwipe && (!touchFLAG || tail.go)) stopEvent(e);
-         }
- 
-         function onMove(e) {
-@@ -1441,6 +1443,12 @@ fotoramaVersion = '4.6.4';
-                 return;
-             }
- 
-+            isDisabledSwipe = $(e.target).hasClass('disableSwipe');
-+
-+            if (isDisabledSwipe) {
-+                return;
-+            }
-+
-             extendEvent(e);
- 
-             var xDiff = Math.abs(e._x - startEvent._x), // opt _x → _pageX
-@@ -1883,7 +1891,7 @@ fotoramaVersion = '4.6.4';
-         fotoramaData.fotorama = this;
- 
-         /**
--         * Search video items in incomming data and transform object for video layout.
-+         * Search video items in incoming data and transform object for video layout.
-          *
-          */
-         function checkForVideo() {
-@@ -1951,10 +1959,10 @@ fotoramaVersion = '4.6.4';
-                             if (e.keyCode === 27) {
-                                 catched = true;
-                                 that.cancelFullScreen();
--                            } else if ((e.shiftKey && e.keyCode === 32 && allowKey('space')) || (e.keyCode === 37 && allowKey('left')) || (e.keyCode === 38 && allowKey('up') && $(':focus').attr('data-gallery-role'))) {
-+                            } else if ((e.shiftKey && e.keyCode === 32 && allowKey('space')) || (!e.altKey && !e.metaKey && e.keyCode === 37 && allowKey('left')) || (e.keyCode === 38 && allowKey('up') && $(':focus').attr('data-gallery-role'))) {
-                                 that.longPress.progress();
-                                 index = '<';
--                            } else if ((e.keyCode === 32 && allowKey('space')) || (e.keyCode === 39 && allowKey('right')) || (e.keyCode === 40 && allowKey('down') && $(':focus').attr('data-gallery-role'))) {
-+                            } else if ((e.keyCode === 32 && allowKey('space')) || (!e.altKey && !e.metaKey && e.keyCode === 39 && allowKey('right')) || (e.keyCode === 40 && allowKey('down') && $(':focus').attr('data-gallery-role'))) {
-                                 that.longPress.progress();
-                                 index = '>';
-                             } else if (e.keyCode === 36 && allowKey('home')) {
-@@ -2022,7 +2030,7 @@ fotoramaVersion = '4.6.4';
-         }
- 
-         /**
--         * Set and install data from incomming @param {JSON} options or takes data attr from data-"name"=... values.
-+         * Set and install data from incoming @param {JSON} options or takes data attr from data-"name"=... values.
-          */
-         function setData() {
-             data = that.data = data || clone(opts.data) || getDataFromHtml($fotorama);
-@@ -2098,7 +2106,7 @@ fotoramaVersion = '4.6.4';
-                 o_navTop = opts.navposition === 'top';
-                 classes.remove.push(selectClass);
- 
--                $arrs.toggle(opts.arrows);
-+                $arrs.toggle(!!opts.arrows);
-             } else {
-                 o_nav = false;
-                 $arrs.hide();
-@@ -2487,11 +2495,11 @@ fotoramaVersion = '4.6.4';
-                         .append($videoPlay.clone());
- 
-                     // This solves tabbing problems
--                    addFocus(frame, function () {
-+                    addFocus(frame, function (e) {
-                         setTimeout(function () {
-                             lockScroll($stage);
-                         }, 0);
--                        clickToShow({index: frameData.eq, user: true});
-+                        clickToShow({index: frameData.eq, user: true}, e);
-                     });
- 
-                     $stageFrame = $stageFrame.add($frame);
-@@ -2568,7 +2576,7 @@ fotoramaVersion = '4.6.4';
-                     thisData.t > rightLimit : thisData.l > rightLimit;
-                 specialMeasures.w = thisData.w;
- 
--                if (thisData.l + thisData.w < leftLimit
-+                if ((opts.navdir !== 'vertical' && thisData.l + thisData.w < leftLimit)
-                     || exceedLimit
-                     || callFit(thisData.$img, specialMeasures)) return;
- 
-@@ -3040,7 +3048,10 @@ fotoramaVersion = '4.6.4';
-             return time;
-         }
- 
--        that.showStage = function (silent, options, time) {
-+        that.showStage = function (silent, options, time, e) {
-+            if (e !== undefined && e.target.tagName == 'IFRAME') {
-+                return;
-+            }
-             unloadVideo($videoPlaying, activeFrame.i !== data[normalizeIndex(repositionIndex)].i);
-             frameDraw(activeIndexes, 'stage');
-             stageFramePosition(SLOW ? [dirtyIndex] : [dirtyIndex, getPrevIndex(dirtyIndex), getNextIndex(dirtyIndex)]);
-@@ -3128,7 +3139,7 @@ fotoramaVersion = '4.6.4';
-             }
-         };
- 
--        that.show = function (options) {
-+        that.show = function (options, e) {
-             that.longPress.singlePressInProgress = true;
- 
-             var index = calcActiveIndex(options);
-@@ -3139,7 +3150,7 @@ fotoramaVersion = '4.6.4';
- 
-             var silent = _activeFrame === activeFrame && !options.user;
- 
--            that.showStage(silent, options, time);
-+            that.showStage(silent, options, time, e);
-             that.showNav(silent, options, time);
- 
-             showedFLAG = typeof lastActiveIndex !== 'undefined' && lastActiveIndex !== activeIndex;
-@@ -3499,7 +3510,7 @@ fotoramaVersion = '4.6.4';
- 
-         $stage.on('mousemove', stageCursor);
- 
--        function clickToShow(showOptions) {
-+        function clickToShow(showOptions, e) {
-             clearTimeout(clickToShow.t);
- 
-             if (opts.clicktransition && opts.clicktransition !== opts.transition) {
-@@ -3516,7 +3527,7 @@ fotoramaVersion = '4.6.4';
-                     }, 10);
-                 }, 0);
-             } else {
--                that.show(showOptions);
-+                that.show(showOptions, e);
-             }
-         }
- 
-@@ -3553,7 +3564,7 @@ fotoramaVersion = '4.6.4';
- 
-                 if ((result.moved || (toggleControlsFLAG && result.pos !== result.newPos && !result.control)) && result.$target[0] !== $fullscreenIcon[0]) {
-                     var index = getIndexByPos(result.newPos, measures.w, opts.margin, repositionIndex);
--                    
-+
-                     that.show({
-                         index: index,
-                         time: o_fade ? o_transitionDuration : result.time,
-diff --git a/lib/web/fotorama/fotorama.min.js b/lib/web/fotorama/fotorama.min.js
-deleted file mode 100644
-index 1f9358e0469..00000000000
---- a/lib/web/fotorama/fotorama.min.js
-+++ /dev/null
-@@ -1 +0,0 @@
--fotoramaVersion="4.6.4";(function(window,document,location,$,undefined){"use strict";var _fotoramaClass="fotorama",_fullscreenClass="fotorama__fullscreen",wrapClass=_fotoramaClass+"__wrap",wrapCss2Class=wrapClass+"--css2",wrapCss3Class=wrapClass+"--css3",wrapVideoClass=wrapClass+"--video",wrapFadeClass=wrapClass+"--fade",wrapSlideClass=wrapClass+"--slide",wrapNoControlsClass=wrapClass+"--no-controls",wrapNoShadowsClass=wrapClass+"--no-shadows",wrapPanYClass=wrapClass+"--pan-y",wrapRtlClass=wrapClass+"--rtl",wrapOnlyActiveClass=wrapClass+"--only-active",wrapNoCaptionsClass=wrapClass+"--no-captions",wrapToggleArrowsClass=wrapClass+"--toggle-arrows",stageClass=_fotoramaClass+"__stage",stageFrameClass=stageClass+"__frame",stageFrameVideoClass=stageFrameClass+"--video",stageShaftClass=stageClass+"__shaft",grabClass=_fotoramaClass+"__grab",pointerClass=_fotoramaClass+"__pointer",arrClass=_fotoramaClass+"__arr",arrDisabledClass=arrClass+"--disabled",arrPrevClass=arrClass+"--prev",arrNextClass=arrClass+"--next",navClass=_fotoramaClass+"__nav",navWrapClass=navClass+"-wrap",navShaftClass=navClass+"__shaft",navShaftVerticalClass=navWrapClass+"--vertical",navShaftListClass=navWrapClass+"--list",navShafthorizontalClass=navWrapClass+"--horizontal",navDotsClass=navClass+"--dots",navThumbsClass=navClass+"--thumbs",navFrameClass=navClass+"__frame",fadeClass=_fotoramaClass+"__fade",fadeFrontClass=fadeClass+"-front",fadeRearClass=fadeClass+"-rear",shadowClass=_fotoramaClass+"__shadow",shadowsClass=shadowClass+"s",shadowsLeftClass=shadowsClass+"--left",shadowsRightClass=shadowsClass+"--right",shadowsTopClass=shadowsClass+"--top",shadowsBottomClass=shadowsClass+"--bottom",activeClass=_fotoramaClass+"__active",selectClass=_fotoramaClass+"__select",hiddenClass=_fotoramaClass+"--hidden",fullscreenClass=_fotoramaClass+"--fullscreen",fullscreenIconClass=_fotoramaClass+"__fullscreen-icon",errorClass=_fotoramaClass+"__error",loadingClass=_fotoramaClass+"__loading",loadedClass=_fotoramaClass+"__loaded",loadedFullClass=loadedClass+"--full",loadedImgClass=loadedClass+"--img",grabbingClass=_fotoramaClass+"__grabbing",imgClass=_fotoramaClass+"__img",imgFullClass=imgClass+"--full",thumbClass=_fotoramaClass+"__thumb",thumbArrLeft=thumbClass+"__arr--left",thumbArrRight=thumbClass+"__arr--right",thumbBorderClass=thumbClass+"-border",htmlClass=_fotoramaClass+"__html",videoContainerClass=_fotoramaClass+"-video-container",videoClass=_fotoramaClass+"__video",videoPlayClass=videoClass+"-play",videoCloseClass=videoClass+"-close",horizontalImageClass=_fotoramaClass+"_horizontal_ratio",verticalImageClass=_fotoramaClass+"_vertical_ratio",fotoramaSpinnerClass=_fotoramaClass+"__spinner",spinnerShowClass=fotoramaSpinnerClass+"--show";var JQUERY_VERSION=$&&$.fn.jquery.split(".");if(!JQUERY_VERSION||JQUERY_VERSION[0]<1||JQUERY_VERSION[0]==1&&JQUERY_VERSION[1]<8){throw"Fotorama requires jQuery 1.8 or later and will not run without it."}var _={};var Modernizr=function(window,document,undefined){var version="2.8.3",Modernizr={},docElement=document.documentElement,mod="modernizr",modElem=document.createElement(mod),mStyle=modElem.style,inputElem,toString={}.toString,prefixes=" -webkit- -moz- -o- -ms- ".split(" "),omPrefixes="Webkit Moz O ms",cssomPrefixes=omPrefixes.split(" "),domPrefixes=omPrefixes.toLowerCase().split(" "),tests={},inputs={},attrs={},classes=[],slice=classes.slice,featureName,injectElementWithStyles=function(rule,callback,nodes,testnames){var style,ret,node,docOverflow,div=document.createElement("div"),body=document.body,fakeBody=body||document.createElement("body");if(parseInt(nodes,10)){while(nodes--){node=document.createElement("div");node.id=testnames?testnames[nodes]:mod+(nodes+1);div.appendChild(node)}}style=["&#173;",'<style id="s',mod,'">',rule,"</style>"].join("");div.id=mod;(body?div:fakeBody).innerHTML+=style;fakeBody.appendChild(div);if(!body){fakeBody.style.background="";fakeBody.style.overflow="hidden";docOverflow=docElement.style.overflow;docElement.style.overflow="hidden";docElement.appendChild(fakeBody)}ret=callback(div,rule);if(!body){fakeBody.parentNode.removeChild(fakeBody);docElement.style.overflow=docOverflow}else{div.parentNode.removeChild(div)}return!!ret},_hasOwnProperty={}.hasOwnProperty,hasOwnProp;if(!is(_hasOwnProperty,"undefined")&&!is(_hasOwnProperty.call,"undefined")){hasOwnProp=function(object,property){return _hasOwnProperty.call(object,property)}}else{hasOwnProp=function(object,property){return property in object&&is(object.constructor.prototype[property],"undefined")}}if(!Function.prototype.bind){Function.prototype.bind=function bind(that){var target=this;if(typeof target!="function"){throw new TypeError}var args=slice.call(arguments,1),bound=function(){if(this instanceof bound){var F=function(){};F.prototype=target.prototype;var self=new F;var result=target.apply(self,args.concat(slice.call(arguments)));if(Object(result)===result){return result}return self}else{return target.apply(that,args.concat(slice.call(arguments)))}};return bound}}function setCss(str){mStyle.cssText=str}function setCssAll(str1,str2){return setCss(prefixes.join(str1+";")+(str2||""))}function is(obj,type){return typeof obj===type}function contains(str,substr){return!!~(""+str).indexOf(substr)}function testProps(props,prefixed){for(var i in props){var prop=props[i];if(!contains(prop,"-")&&mStyle[prop]!==undefined){return prefixed=="pfx"?prop:true}}return false}function testDOMProps(props,obj,elem){for(var i in props){var item=obj[props[i]];if(item!==undefined){if(elem===false)return props[i];if(is(item,"function")){return item.bind(elem||obj)}return item}}return false}function testPropsAll(prop,prefixed,elem){var ucProp=prop.charAt(0).toUpperCase()+prop.slice(1),props=(prop+" "+cssomPrefixes.join(ucProp+" ")+ucProp).split(" ");if(is(prefixed,"string")||is(prefixed,"undefined")){return testProps(props,prefixed)}else{props=(prop+" "+domPrefixes.join(ucProp+" ")+ucProp).split(" ");return testDOMProps(props,prefixed,elem)}}tests["touch"]=function(){var bool;if("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch){bool=true}else{injectElementWithStyles(["@media (",prefixes.join("touch-enabled),("),mod,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(node){bool=node.offsetTop===9})}return bool};tests["csstransforms3d"]=function(){var ret=!!testPropsAll("perspective");if(ret&&"webkitPerspective"in docElement.style){injectElementWithStyles("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(node,rule){ret=node.offsetLeft===9&&node.offsetHeight===3})}return ret};tests["csstransitions"]=function(){return testPropsAll("transition")};for(var feature in tests){if(hasOwnProp(tests,feature)){featureName=feature.toLowerCase();Modernizr[featureName]=tests[feature]();classes.push((Modernizr[featureName]?"":"no-")+featureName)}}Modernizr.addTest=function(feature,test){if(typeof feature=="object"){for(var key in feature){if(hasOwnProp(feature,key)){Modernizr.addTest(key,feature[key])}}}else{feature=feature.toLowerCase();if(Modernizr[feature]!==undefined){return Modernizr}test=typeof test=="function"?test():test;if(typeof enableClasses!=="undefined"&&enableClasses){docElement.className+=" "+(test?"":"no-")+feature}Modernizr[feature]=test}return Modernizr};setCss("");modElem=inputElem=null;Modernizr._version=version;Modernizr._prefixes=prefixes;Modernizr._domPrefixes=domPrefixes;Modernizr._cssomPrefixes=cssomPrefixes;Modernizr.testProp=function(prop){return testProps([prop])};Modernizr.testAllProps=testPropsAll;Modernizr.testStyles=injectElementWithStyles;Modernizr.prefixed=function(prop,obj,elem){if(!obj){return testPropsAll(prop,"pfx")}else{return testPropsAll(prop,obj,elem)}};return Modernizr}(window,document);var fullScreenApi={ok:false,is:function(){return false},request:function(){},cancel:function(){},event:"",prefix:""},browserPrefixes="webkit moz o ms khtml".split(" ");if(typeof document.cancelFullScreen!="undefined"){fullScreenApi.ok=true}else{for(var i=0,il=browserPrefixes.length;i<il;i++){fullScreenApi.prefix=browserPrefixes[i];if(typeof document[fullScreenApi.prefix+"CancelFullScreen"]!="undefined"){fullScreenApi.ok=true;break}}}if(fullScreenApi.ok){fullScreenApi.event=fullScreenApi.prefix+"fullscreenchange";fullScreenApi.is=function(){switch(this.prefix){case"":return document.fullScreen;case"webkit":return document.webkitIsFullScreen;default:return document[this.prefix+"FullScreen"]}};fullScreenApi.request=function(el){return this.prefix===""?el.requestFullScreen():el[this.prefix+"RequestFullScreen"]()};fullScreenApi.cancel=function(el){return this.prefix===""?document.cancelFullScreen():document[this.prefix+"CancelFullScreen"]()}}function bez(coOrdArray){var encodedFuncName="bez_"+$.makeArray(arguments).join("_").replace(".","p");if(typeof $["easing"][encodedFuncName]!=="function"){var polyBez=function(p1,p2){var A=[null,null],B=[null,null],C=[null,null],bezCoOrd=function(t,ax){C[ax]=3*p1[ax];B[ax]=3*(p2[ax]-p1[ax])-C[ax];A[ax]=1-C[ax]-B[ax];return t*(C[ax]+t*(B[ax]+t*A[ax]))},xDeriv=function(t){return C[0]+t*(2*B[0]+3*A[0]*t)},xForT=function(t){var x=t,i=0,z;while(++i<14){z=bezCoOrd(x,0)-t;if(Math.abs(z)<.001)break;x-=z/xDeriv(x)}return x};return function(t){return bezCoOrd(xForT(t),1)}};$["easing"][encodedFuncName]=function(x,t,b,c,d){return c*polyBez([coOrdArray[0],coOrdArray[1]],[coOrdArray[2],coOrdArray[3]])(t/d)+b}}return encodedFuncName}var $WINDOW=$(window),$DOCUMENT=$(document),$HTML,$BODY,QUIRKS_FORCE=location.hash.replace("#","")==="quirks",TRANSFORMS3D=Modernizr.csstransforms3d,CSS3=TRANSFORMS3D&&!QUIRKS_FORCE,COMPAT=TRANSFORMS3D||document.compatMode==="CSS1Compat",FULLSCREEN=fullScreenApi.ok,MOBILE=navigator.userAgent.match(/Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone/i),SLOW=!CSS3||MOBILE,MS_POINTER=navigator.msPointerEnabled,WHEEL="onwheel"in document.createElement("div")?"wheel":document.onmousewheel!==undefined?"mousewheel":"DOMMouseScroll",TOUCH_TIMEOUT=250,TRANSITION_DURATION=300,SCROLL_LOCK_TIMEOUT=1400,AUTOPLAY_INTERVAL=5e3,MARGIN=2,THUMB_SIZE=64,WIDTH=500,HEIGHT=333,STAGE_FRAME_KEY="$stageFrame",NAV_DOT_FRAME_KEY="$navDotFrame",NAV_THUMB_FRAME_KEY="$navThumbFrame",AUTO="auto",BEZIER=bez([.1,0,.25,1]),MAX_WIDTH=1200,thumbsPerSlide=1,OPTIONS={width:null,minwidth:null,maxwidth:"100%",height:null,minheight:null,maxheight:null,ratio:null,margin:MARGIN,nav:"dots",navposition:"bottom",navwidth:null,thumbwidth:THUMB_SIZE,thumbheight:THUMB_SIZE,thumbmargin:MARGIN,thumbborderwidth:MARGIN,allowfullscreen:false,transition:"slide",clicktransition:null,transitionduration:TRANSITION_DURATION,captions:true,startindex:0,loop:false,autoplay:false,stopautoplayontouch:true,keyboard:false,arrows:true,click:true,swipe:false,trackpad:false,shuffle:false,direction:"ltr",shadows:true,showcaption:true,navdir:"horizontal",navarrows:true,navtype:"thumbs"},KEYBOARD_OPTIONS={left:true,right:true,down:true,up:true,space:false,home:false,end:false};function noop(){}function minMaxLimit(value,min,max){return Math.max(isNaN(min)?-Infinity:min,Math.min(isNaN(max)?Infinity:max,value))}function readTransform(css,dir){return css.match(/ma/)&&css.match(/-?\d+(?!d)/g)[css.match(/3d/)?dir==="vertical"?13:12:dir==="vertical"?5:4]}function readPosition($el,dir){if(CSS3){return+readTransform($el.css("transform"),dir)}else{return+$el.css(dir==="vertical"?"top":"left").replace("px","")}}function getTranslate(pos,direction){var obj={};if(CSS3){switch(direction){case"vertical":obj.transform="translate3d(0, "+pos+"px,0)";break;case"list":break;default:obj.transform="translate3d("+pos+"px,0,0)";break}}else{direction==="vertical"?obj.top=pos:obj.left=pos}return obj}function getDuration(time){return{"transition-duration":time+"ms"}}function unlessNaN(value,alternative){return isNaN(value)?alternative:value}function numberFromMeasure(value,measure){return unlessNaN(+String(value).replace(measure||"px",""))}function numberFromPercent(value){return/%$/.test(value)?numberFromMeasure(value,"%"):undefined}function numberFromWhatever(value,whole){return unlessNaN(numberFromPercent(value)/100*whole,numberFromMeasure(value))}function measureIsValid(value){return(!isNaN(numberFromMeasure(value))||!isNaN(numberFromMeasure(value,"%")))&&value}function getPosByIndex(index,side,margin,baseIndex){return(index-(baseIndex||0))*(side+(margin||0))}function getIndexByPos(pos,side,margin,baseIndex){return-Math.round(pos/(side+(margin||0))-(baseIndex||0))}function bindTransitionEnd($el){var elData=$el.data();if(elData.tEnd)return;var el=$el[0],transitionEndEvent={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",msTransition:"MSTransitionEnd",transition:"transitionend"};addEvent(el,transitionEndEvent[Modernizr.prefixed("transition")],function(e){elData.tProp&&e.propertyName.match(elData.tProp)&&elData.onEndFn()});elData.tEnd=true}function afterTransition($el,property,fn,time){var ok,elData=$el.data();if(elData){elData.onEndFn=function(){if(ok)return;ok=true;clearTimeout(elData.tT);fn()};elData.tProp=property;clearTimeout(elData.tT);elData.tT=setTimeout(function(){elData.onEndFn()},time*1.5);bindTransitionEnd($el)}}function stop($el,pos){var dir=$el.navdir||"horizontal";if($el.length){var elData=$el.data();if(CSS3){$el.css(getDuration(0));elData.onEndFn=noop;clearTimeout(elData.tT)}else{$el.stop()}var lockedPos=getNumber(pos,function(){return readPosition($el,dir)});$el.css(getTranslate(lockedPos,dir));return lockedPos}}function getNumber(){var number;for(var _i=0,_l=arguments.length;_i<_l;_i++){number=_i?arguments[_i]():arguments[_i];if(typeof number==="number"){break}}return number}function edgeResistance(pos,edge){return Math.round(pos+(edge-pos)/1.5)}function getProtocol(){getProtocol.p=getProtocol.p||(location.protocol==="https:"?"https://":"http://");return getProtocol.p}function parseHref(href){var a=document.createElement("a");a.href=href;return a}function findVideoId(href,forceVideo){if(typeof href!=="string")return href;href=parseHref(href);var id,type;if(href.host.match(/youtube\.com/)&&href.search){id=href.search.split("v=")[1];if(id){var ampersandPosition=id.indexOf("&");if(ampersandPosition!==-1){id=id.substring(0,ampersandPosition)}type="youtube"}}else if(href.host.match(/youtube\.com|youtu\.be/)){id=href.pathname.replace(/^\/(embed\/|v\/)?/,"").replace(/\/.*/,"");type="youtube"}else if(href.host.match(/vimeo\.com/)){type="vimeo";id=href.pathname.replace(/^\/(video\/)?/,"").replace(/\/.*/,"")}if((!id||!type)&&forceVideo){id=href.href;type="custom"}return id?{id:id,type:type,s:href.search.replace(/^\?/,""),p:getProtocol()}:false}function getVideoThumbs(dataFrame,data,fotorama){var img,thumb,video=dataFrame.video;if(video.type==="youtube"){thumb=getProtocol()+"img.youtube.com/vi/"+video.id+"/default.jpg";img=thumb.replace(/\/default.jpg$/,"/hqdefault.jpg");dataFrame.thumbsReady=true}else if(video.type==="vimeo"){$.ajax({url:getProtocol()+"vimeo.com/api/v2/video/"+video.id+".json",dataType:"jsonp",success:function(json){dataFrame.thumbsReady=true;updateData(data,{img:json[0].thumbnail_large,thumb:json[0].thumbnail_small},dataFrame.i,fotorama)}})}else{dataFrame.thumbsReady=true}return{img:img,thumb:thumb}}function updateData(data,_dataFrame,i,fotorama){for(var _i=0,_l=data.length;_i<_l;_i++){var dataFrame=data[_i];if(dataFrame.i===i&&dataFrame.thumbsReady){var clear={videoReady:true};clear[STAGE_FRAME_KEY]=clear[NAV_THUMB_FRAME_KEY]=clear[NAV_DOT_FRAME_KEY]=false;fotorama.splice(_i,1,$.extend({},dataFrame,clear,_dataFrame));break}}}function getDataFromHtml($el){var data=[];function getDataFromImg($img,imgData,checkVideo){var $child=$img.children("img").eq(0),_imgHref=$img.attr("href"),_imgSrc=$img.attr("src"),_thumbSrc=$child.attr("src"),_video=imgData.video,video=checkVideo?findVideoId(_imgHref,_video===true):false;if(video){_imgHref=false}else{video=_video}getDimensions($img,$child,$.extend(imgData,{video:video,img:imgData.img||_imgHref||_imgSrc||_thumbSrc,thumb:imgData.thumb||_thumbSrc||_imgSrc||_imgHref}))}function getDimensions($img,$child,imgData){var separateThumbFLAG=imgData.thumb&&imgData.img!==imgData.thumb,width=numberFromMeasure(imgData.width||$img.attr("width")),height=numberFromMeasure(imgData.height||$img.attr("height"));$.extend(imgData,{width:width,height:height,thumbratio:getRatio(imgData.thumbratio||numberFromMeasure(imgData.thumbwidth||$child&&$child.attr("width")||separateThumbFLAG||width)/numberFromMeasure(imgData.thumbheight||$child&&$child.attr("height")||separateThumbFLAG||height))})}$el.children().each(function(){var $this=$(this),dataFrame=optionsToLowerCase($.extend($this.data(),{id:$this.attr("id")}));if($this.is("a, img")){getDataFromImg($this,dataFrame,true)}else if(!$this.is(":empty")){getDimensions($this,null,$.extend(dataFrame,{html:this,_html:$this.html()}))}else return;data.push(dataFrame)});return data}function isHidden(el){return el.offsetWidth===0&&el.offsetHeight===0}function isDetached(el){return!$.contains(document.documentElement,el)}function waitFor(test,fn,timeout,i){if(!waitFor.i){waitFor.i=1;waitFor.ii=[true]}i=i||waitFor.i;if(typeof waitFor.ii[i]==="undefined"){waitFor.ii[i]=true}if(test()){fn()}else{waitFor.ii[i]&&setTimeout(function(){waitFor.ii[i]&&waitFor(test,fn,timeout,i)},timeout||100)}return waitFor.i++}waitFor.stop=function(i){waitFor.ii[i]=false};function fit($el,measuresToFit){var elData=$el.data(),measures=elData.measures;if(measures&&(!elData.l||elData.l.W!==measures.width||elData.l.H!==measures.height||elData.l.r!==measures.ratio||elData.l.w!==measuresToFit.w||elData.l.h!==measuresToFit.h)){var height=minMaxLimit(measuresToFit.h,0,measures.height),width=height*measures.ratio;UTIL.setRatio($el,width,height);elData.l={W:measures.width,H:measures.height,r:measures.ratio,w:measuresToFit.w,h:measuresToFit.h}}return true}function setStyle($el,style){var el=$el[0];if(el.styleSheet){el.styleSheet.cssText=style}else{$el.html(style)}}function findShadowEdge(pos,min,max,dir){return min===max?false:dir==="vertical"?pos<=min?"top":pos>=max?"bottom":"top bottom":pos<=min?"left":pos>=max?"right":"left right"}function smartClick($el,fn,_options){_options=_options||{};$el.each(function(){var $this=$(this),thisData=$this.data(),startEvent;if(thisData.clickOn)return;thisData.clickOn=true;$.extend(touch($this,{onStart:function(e){startEvent=e;(_options.onStart||noop).call(this,e)},onMove:_options.onMove||noop,onTouchEnd:_options.onTouchEnd||noop,onEnd:function(result){if(result.moved)return;fn.call(this,startEvent)}}),{noMove:true})})}function div(classes,child){return'<div class="'+classes+'">'+(child||"")+"</div>"}function cls(className){return"."+className}function createVideoFrame(videoItem){var frame='<iframe src="'+videoItem.p+videoItem.type+".com/embed/"+videoItem.id+'" frameborder="0" allowfullscreen></iframe>';return frame}function shuffle(array){var l=array.length;while(l){var i=Math.floor(Math.random()*l--);var t=array[l];array[l]=array[i];array[i]=t}return array}function clone(array){return Object.prototype.toString.call(array)=="[object Array]"&&$.map(array,function(frame){return $.extend({},frame)})}function lockScroll($el,left,top){$el.scrollLeft(left||0).scrollTop(top||0)}function optionsToLowerCase(options){if(options){var opts={};$.each(options,function(key,value){opts[key.toLowerCase()]=value});return opts}}function getRatio(_ratio){if(!_ratio)return;var ratio=+_ratio;if(!isNaN(ratio)){return ratio}else{ratio=_ratio.split("/");return+ratio[0]/+ratio[1]||undefined}}function addEvent(el,e,fn,bool){if(!e)return;el.addEventListener?el.addEventListener(e,fn,!!bool):el.attachEvent("on"+e,fn)}function validateRestrictions(position,restriction){if(position>restriction.max){position=restriction.max}else{if(position<restriction.min){position=restriction.min}}return position}function validateSlidePos(opt,navShaftTouchTail,guessIndex,offsetNav,$guessNavFrame,$navWrap,dir){var position,size,wrapSize;if(dir==="horizontal"){size=opt.thumbwidth;wrapSize=$navWrap.width()}else{size=opt.thumbheight;wrapSize=$navWrap.height()}if((size+opt.margin)*(guessIndex+1)>=wrapSize-offsetNav){if(dir==="horizontal"){position=-$guessNavFrame.position().left}else{position=-$guessNavFrame.position().top}}else{if((size+opt.margin)*guessIndex<=Math.abs(offsetNav)){if(dir==="horizontal"){position=-$guessNavFrame.position().left+wrapSize-(size+opt.margin)}else{position=-$guessNavFrame.position().top+wrapSize-(size+opt.margin)}}else{position=offsetNav}}position=validateRestrictions(position,navShaftTouchTail);return position||0}function elIsDisabled(el){return!!el.getAttribute("disabled")}function disableAttr(FLAG,disable){if(disable){return{disabled:FLAG}}else{return{tabindex:FLAG*-1+"",disabled:FLAG}}}function addEnterUp(el,fn){addEvent(el,"keyup",function(e){elIsDisabled(el)||e.keyCode==13&&fn.call(el,e)})}function addFocus(el,fn){addEvent(el,"focus",el.onfocusin=function(e){fn.call(el,e)},true)}function stopEvent(e,stopPropagation){e.preventDefault?e.preventDefault():e.returnValue=false;stopPropagation&&e.stopPropagation&&e.stopPropagation()}function stubEvent($el,eventType){var isIOS=/ip(ad|hone|od)/i.test(window.navigator.userAgent);if(isIOS&&eventType==="touchend"){$el.on("touchend",function(e){$DOCUMENT.trigger("mouseup",e)})}$el.on(eventType,function(e){stopEvent(e,true);return false})}function getDirectionSign(forward){return forward?">":"<"}var UTIL=function(){function setRatioClass($el,wh,ht){var rateImg=wh/ht;if(rateImg<=1){$el.parent().removeClass(horizontalImageClass);$el.parent().addClass(verticalImageClass)}else{$el.parent().removeClass(verticalImageClass);$el.parent().addClass(horizontalImageClass)}}function setThumbAttr($frame,value,searchAttr){var attr=searchAttr;if(!$frame.attr(attr)&&$frame.attr(attr)!==undefined){$frame.attr(attr,value)}if($frame.find("["+attr+"]").length){$frame.find("["+attr+"]").each(function(){$(this).attr(attr,value)})}}function isExpectedCaption(frameItem,isExpected,undefined){var expected=false,frameExpected;frameItem.showCaption===undefined||frameItem.showCaption===true?frameExpected=true:frameExpected=false;if(!isExpected){return false}if(frameItem.caption&&frameExpected){expected=true}return expected}return{setRatio:setRatioClass,setThumbAttr:setThumbAttr,isExpectedCaption:isExpectedCaption}}(UTIL||{},jQuery);function slide($el,options){var elData=$el.data(),elPos=Math.round(options.pos),onEndFn=function(){if(elData&&elData.sliding){elData.sliding=false}(options.onEnd||noop)()};if(typeof options.overPos!=="undefined"&&options.overPos!==options.pos){elPos=options.overPos}var translate=$.extend(getTranslate(elPos,options.direction),options.width&&{width:options.width},options.height&&{height:options.height});if(elData&&elData.sliding){elData.sliding=true}if(CSS3){$el.css($.extend(getDuration(options.time),translate));if(options.time>10){afterTransition($el,"transform",onEndFn,options.time)}else{onEndFn()}}else{$el.stop().animate(translate,options.time,BEZIER,onEndFn)}}function fade($el1,$el2,$frames,options,fadeStack,chain){var chainedFLAG=typeof chain!=="undefined";if(!chainedFLAG){fadeStack.push(arguments);Array.prototype.push.call(arguments,fadeStack.length);if(fadeStack.length>1)return}$el1=$el1||$($el1);$el2=$el2||$($el2);var _$el1=$el1[0],_$el2=$el2[0],crossfadeFLAG=options.method==="crossfade",onEndFn=function(){if(!onEndFn.done){onEndFn.done=true;var args=(chainedFLAG||fadeStack.shift())&&fadeStack.shift();args&&fade.apply(this,args);(options.onEnd||noop)(!!args)}},time=options.time/(chain||1);$frames.removeClass(fadeRearClass+" "+fadeFrontClass);$el1.stop().addClass(fadeRearClass);$el2.stop().addClass(fadeFrontClass);crossfadeFLAG&&_$el2&&$el1.fadeTo(0,0);$el1.fadeTo(crossfadeFLAG?time:0,1,crossfadeFLAG&&onEndFn);$el2.fadeTo(time,0,onEndFn);_$el1&&crossfadeFLAG||_$el2||onEndFn()}var lastEvent,moveEventType,preventEvent,preventEventTimeout,dragDomEl;function extendEvent(e){var touch=(e.touches||[])[0]||e;e._x=touch.pageX||touch.originalEvent.pageX;e._y=touch.clientY||touch.originalEvent.clientY;e._now=$.now()}function touch($el,options){var el=$el[0],tail={},touchEnabledFLAG,startEvent,$target,controlTouch,touchFLAG,targetIsSelectFLAG,targetIsLinkFlag,tolerance,moved;function onStart(e){$target=$(e.target);tail.checked=targetIsSelectFLAG=targetIsLinkFlag=moved=false;if(touchEnabledFLAG||tail.flow||e.touches&&e.touches.length>1||e.which>1||lastEvent&&lastEvent.type!==e.type&&preventEvent||(targetIsSelectFLAG=options.select&&$target.is(options.select,el)))return targetIsSelectFLAG;touchFLAG=e.type==="touchstart";targetIsLinkFlag=$target.is("a, a *",el);controlTouch=tail.control;tolerance=tail.noMove||tail.noSwipe||controlTouch?16:!tail.snap?4:0;extendEvent(e);startEvent=lastEvent=e;moveEventType=e.type.replace(/down|start/,"move").replace(/Down/,"Move");(options.onStart||noop).call(el,e,{control:controlTouch,$target:$target});touchEnabledFLAG=tail.flow=true;if(!touchFLAG||tail.go)stopEvent(e)}function onMove(e){if(e.touches&&e.touches.length>1||MS_POINTER&&!e.isPrimary||moveEventType!==e.type||!touchEnabledFLAG){touchEnabledFLAG&&onEnd();(options.onTouchEnd||noop)();return}extendEvent(e);var xDiff=Math.abs(e._x-startEvent._x),yDiff=Math.abs(e._y-startEvent._y),xyDiff=xDiff-yDiff,xWin=(tail.go||tail.x||xyDiff>=0)&&!tail.noSwipe,yWin=xyDiff<0;if(touchFLAG&&!tail.checked){if(touchEnabledFLAG=xWin){stopEvent(e)}}else{stopEvent(e);if(movedEnough(xDiff,yDiff)){(options.onMove||noop).call(el,e,{touch:touchFLAG})}}if(!moved&&movedEnough(xDiff,yDiff)&&Math.sqrt(Math.pow(xDiff,2)+Math.pow(yDiff,2))>tolerance){moved=true}tail.checked=tail.checked||xWin||yWin}function movedEnough(xDiff,yDiff){return xDiff>yDiff&&xDiff>1.5}function onEnd(e){(options.onTouchEnd||noop)();var _touchEnabledFLAG=touchEnabledFLAG;tail.control=touchEnabledFLAG=false;if(_touchEnabledFLAG){tail.flow=false}if(!_touchEnabledFLAG||targetIsLinkFlag&&!tail.checked)return;e&&stopEvent(e);preventEvent=true;clearTimeout(preventEventTimeout);preventEventTimeout=setTimeout(function(){preventEvent=false},1e3);(options.onEnd||noop).call(el,{moved:moved,$target:$target,control:controlTouch,touch:touchFLAG,startEvent:startEvent,aborted:!e||e.type==="MSPointerCancel"})}function onOtherStart(){if(tail.flow)return;tail.flow=true}function onOtherEnd(){if(!tail.flow)return;tail.flow=false}if(MS_POINTER){addEvent(el,"MSPointerDown",onStart);addEvent(document,"MSPointerMove",onMove);addEvent(document,"MSPointerCancel",onEnd);addEvent(document,"MSPointerUp",onEnd)}else{addEvent(el,"touchstart",onStart);addEvent(el,"touchmove",onMove);addEvent(el,"touchend",onEnd);addEvent(document,"touchstart",onOtherStart);addEvent(document,"touchend",onOtherEnd);addEvent(document,"touchcancel",onOtherEnd);$WINDOW.on("scroll",onOtherEnd);$el.on("mousedown pointerdown",onStart);$DOCUMENT.on("mousemove pointermove",onMove).on("mouseup pointerup",onEnd)}if(Modernizr.touch){dragDomEl="a"}else{dragDomEl="div"}$el.on("click",dragDomEl,function(e){tail.checked&&stopEvent(e)});return tail}function moveOnTouch($el,options){var el=$el[0],elData=$el.data(),tail={},startCoo,coo,startElPos,moveElPos,edge,moveTrack,startTime,endTime,min,max,snap,dir,slowFLAG,controlFLAG,moved,tracked;function startTracking(e,noStop){tracked=true;startCoo=coo=dir==="vertical"?e._y:e._x;startTime=e._now;moveTrack=[[startTime,startCoo]];startElPos=moveElPos=tail.noMove||noStop?0:stop($el,(options.getPos||noop)());(options.onStart||noop).call(el,e)}function onStart(e,result){min=tail.min;max=tail.max;snap=tail.snap,dir=tail.direction||"horizontal",$el.navdir=dir;slowFLAG=e.altKey;tracked=moved=false;controlFLAG=result.control;if(!controlFLAG&&!elData.sliding){startTracking(e)}}function onMove(e,result){if(!tail.noSwipe){if(!tracked){startTracking(e)}coo=dir==="vertical"?e._y:e._x;moveTrack.push([e._now,coo]);moveElPos=startElPos-(startCoo-coo);edge=findShadowEdge(moveElPos,min,max,dir);if(moveElPos<=min){moveElPos=edgeResistance(moveElPos,min)}else if(moveElPos>=max){moveElPos=edgeResistance(moveElPos,max)}if(!tail.noMove){$el.css(getTranslate(moveElPos,dir));if(!moved){moved=true;result.touch||MS_POINTER||$el.addClass(grabbingClass)}(options.onMove||noop).call(el,e,{pos:moveElPos,edge:edge})}}}function onEnd(result){if(tail.noSwipe&&result.moved)return;if(!tracked){startTracking(result.startEvent,true)}result.touch||MS_POINTER||$el.removeClass(grabbingClass);endTime=$.now();var _backTimeIdeal=endTime-TOUCH_TIMEOUT,_backTime,_timeDiff,_timeDiffLast,backTime=null,backCoo,virtualPos,limitPos,newPos,overPos,time=TRANSITION_DURATION,speed,friction=options.friction;for(var _i=moveTrack.length-1;_i>=0;_i--){_backTime=moveTrack[_i][0];_timeDiff=Math.abs(_backTime-_backTimeIdeal);if(backTime===null||_timeDiff<_timeDiffLast){backTime=_backTime;backCoo=moveTrack[_i][1]}else if(backTime===_backTimeIdeal||_timeDiff>_timeDiffLast){break}_timeDiffLast=_timeDiff}newPos=minMaxLimit(moveElPos,min,max);var cooDiff=backCoo-coo,forwardFLAG=cooDiff>=0,timeDiff=endTime-backTime,longTouchFLAG=timeDiff>TOUCH_TIMEOUT,swipeFLAG=!longTouchFLAG&&moveElPos!==startElPos&&newPos===moveElPos;if(snap){newPos=minMaxLimit(Math[swipeFLAG?forwardFLAG?"floor":"ceil":"round"](moveElPos/snap)*snap,min,max);min=max=newPos}if(swipeFLAG&&(snap||newPos===moveElPos)){speed=-(cooDiff/timeDiff);time*=minMaxLimit(Math.abs(speed),options.timeLow,options.timeHigh);virtualPos=Math.round(moveElPos+speed*time/friction);if(!snap){newPos=virtualPos}if(!forwardFLAG&&virtualPos>max||forwardFLAG&&virtualPos<min){limitPos=forwardFLAG?min:max;overPos=virtualPos-limitPos;if(!snap){newPos=limitPos}overPos=minMaxLimit(newPos+overPos*.03,limitPos-50,limitPos+50);time=Math.abs((moveElPos-overPos)/(speed/friction))}}time*=slowFLAG?10:1;(options.onEnd||noop).call(el,$.extend(result,{moved:result.moved||longTouchFLAG&&snap,pos:moveElPos,newPos:newPos,overPos:overPos,time:time,dir:dir}))}tail=$.extend(touch(options.$wrap,$.extend({},options,{onStart:onStart,onMove:onMove,onEnd:onEnd})),tail);return tail}function wheel($el,options){var el=$el[0],lockFLAG,lastDirection,lastNow,tail={prevent:{}};addEvent(el,WHEEL,function(e){var yDelta=e.wheelDeltaY||-1*e.deltaY||0,xDelta=e.wheelDeltaX||-1*e.deltaX||0,xWin=Math.abs(xDelta)&&!Math.abs(yDelta),direction=getDirectionSign(xDelta<0),sameDirection=lastDirection===direction,now=$.now(),tooFast=now-lastNow<TOUCH_TIMEOUT;lastDirection=direction;lastNow=now;if(!xWin||!tail.ok||tail.prevent[direction]&&!lockFLAG){return}else{stopEvent(e,true);if(lockFLAG&&sameDirection&&tooFast){return}}if(options.shift){lockFLAG=true;clearTimeout(tail.t);tail.t=setTimeout(function(){lockFLAG=false},SCROLL_LOCK_TIMEOUT)}(options.onEnd||noop)(e,options.shift?direction:xDelta)});return tail}jQuery.Fotorama=function($fotorama,opts){$HTML=$("html");$BODY=$("body");var that=this,stamp=$.now(),stampClass=_fotoramaClass+stamp,fotorama=$fotorama[0],data,dataFrameCount=1,fotoramaData=$fotorama.data(),size,$style=$("<style></style>"),$anchor=$(div(hiddenClass)),$wrap=$fotorama.find(cls(wrapClass)),$stage=$wrap.find(cls(stageClass)),stage=$stage[0],$stageShaft=$fotorama.find(cls(stageShaftClass)),$stageFrame=$(),$arrPrev=$fotorama.find(cls(arrPrevClass)),$arrNext=$fotorama.find(cls(arrNextClass)),$arrs=$fotorama.find(cls(arrClass)),$navWrap=$fotorama.find(cls(navWrapClass)),$nav=$navWrap.find(cls(navClass)),$navShaft=$nav.find(cls(navShaftClass)),$navFrame,$navDotFrame=$(),$navThumbFrame=$(),stageShaftData=$stageShaft.data(),navShaftData=$navShaft.data(),$thumbBorder=$fotorama.find(cls(thumbBorderClass)),$thumbArrLeft=$fotorama.find(cls(thumbArrLeft)),$thumbArrRight=$fotorama.find(cls(thumbArrRight)),$fullscreenIcon=$fotorama.find(cls(fullscreenIconClass)),fullscreenIcon=$fullscreenIcon[0],$videoPlay=$(div(videoPlayClass)),$videoClose=$fotorama.find(cls(videoCloseClass)),videoClose=$videoClose[0],$spinner=$fotorama.find(cls(fotoramaSpinnerClass)),$videoPlaying,activeIndex=false,activeFrame,activeIndexes,repositionIndex,dirtyIndex,lastActiveIndex,prevIndex,nextIndex,nextAutoplayIndex,startIndex,o_loop,o_nav,o_navThumbs,o_navTop,o_allowFullScreen,o_nativeFullScreen,o_fade,o_thumbSide,o_thumbSide2,o_transitionDuration,o_transition,o_shadows,o_rtl,o_keyboard,lastOptions={},measures={},measuresSetFLAG,stageShaftTouchTail={},stageWheelTail={},navShaftTouchTail={},navWheelTail={},scrollTop,scrollLeft,showedFLAG,pausedAutoplayFLAG,stoppedAutoplayFLAG,toDeactivate={},toDetach={},measuresStash,touchedFLAG,hoverFLAG,navFrameKey,stageLeft=0,fadeStack=[];$wrap[STAGE_FRAME_KEY]=$('<div class="'+stageFrameClass+'"></div>');$wrap[NAV_THUMB_FRAME_KEY]=$($.Fotorama.jst.thumb());$wrap[NAV_DOT_FRAME_KEY]=$($.Fotorama.jst.dots());toDeactivate[STAGE_FRAME_KEY]=[];toDeactivate[NAV_THUMB_FRAME_KEY]=[];toDeactivate[NAV_DOT_FRAME_KEY]=[];toDetach[STAGE_FRAME_KEY]={};$wrap.addClass(CSS3?wrapCss3Class:wrapCss2Class);fotoramaData.fotorama=this;function checkForVideo(){$.each(data,function(i,dataFrame){if(!dataFrame.i){dataFrame.i=dataFrameCount++;var video=findVideoId(dataFrame.video,true);if(video){var thumbs={};dataFrame.video=video;if(!dataFrame.img&&!dataFrame.thumb){thumbs=getVideoThumbs(dataFrame,data,that)}else{dataFrame.thumbsReady=true}updateData(data,{img:thumbs.img,thumb:thumbs.thumb},dataFrame.i,that)}}})}function allowKey(key){return o_keyboard[key]}function setStagePosition(){if($stage!==undefined){if(opts.navdir=="vertical"){var padding=opts.thumbwidth+opts.thumbmargin;$stage.css("left",padding);$arrNext.css("right",padding);$fullscreenIcon.css("right",padding);$wrap.css("width",$wrap.css("width")+padding);$stageShaft.css("max-width",$wrap.width()-padding)}else{$stage.css("left","");$arrNext.css("right","");$fullscreenIcon.css("right","");$wrap.css("width",$wrap.css("width")+padding);$stageShaft.css("max-width","")}}}function bindGlobalEvents(FLAG){var keydownCommon="keydown."+_fotoramaClass,localStamp=_fotoramaClass+stamp,keydownLocal="keydown."+localStamp,keyupLocal="keyup."+localStamp,resizeLocal="resize."+localStamp+" "+"orientationchange."+localStamp,showParams;if(FLAG){$DOCUMENT.on(keydownLocal,function(e){var catched,index;if($videoPlaying&&e.keyCode===27){catched=true;unloadVideo($videoPlaying,true,true)}else if(that.fullScreen||opts.keyboard&&!that.index){if(e.keyCode===27){catched=true;that.cancelFullScreen()}else if(e.shiftKey&&e.keyCode===32&&allowKey("space")||e.keyCode===37&&allowKey("left")||e.keyCode===38&&allowKey("up")&&$(":focus").attr("data-gallery-role")){that.longPress.progress();index="<"}else if(e.keyCode===32&&allowKey("space")||e.keyCode===39&&allowKey("right")||e.keyCode===40&&allowKey("down")&&$(":focus").attr("data-gallery-role")){that.longPress.progress();index=">"}else if(e.keyCode===36&&allowKey("home")){that.longPress.progress();index="<<"}else if(e.keyCode===35&&allowKey("end")){that.longPress.progress();index=">>"}}(catched||index)&&stopEvent(e);showParams={index:index,slow:e.altKey,user:true};index&&(that.longPress.inProgress?that.showWhileLongPress(showParams):that.show(showParams))});if(FLAG){$DOCUMENT.on(keyupLocal,function(e){if(that.longPress.inProgress){that.showEndLongPress({user:true})}that.longPress.reset()})}if(!that.index){$DOCUMENT.off(keydownCommon).on(keydownCommon,"textarea, input, select",function(e){!$BODY.hasClass(_fullscreenClass)&&e.stopPropagation()})}$WINDOW.on(resizeLocal,that.resize)}else{$DOCUMENT.off(keydownLocal);$WINDOW.off(resizeLocal)}}function appendElements(FLAG){if(FLAG===appendElements.f)return;if(FLAG){$fotorama.addClass(_fotoramaClass+" "+stampClass).before($anchor).before($style);addInstance(that)}else{$anchor.detach();$style.detach();$fotorama.html(fotoramaData.urtext).removeClass(stampClass);hideInstance(that)}bindGlobalEvents(FLAG);appendElements.f=FLAG}function setData(){data=that.data=data||clone(opts.data)||getDataFromHtml($fotorama);size=that.size=data.length;ready.ok&&opts.shuffle&&shuffle(data);checkForVideo();activeIndex=limitIndex(activeIndex);size&&appendElements(true)}function stageNoMove(){var _noMove=size<2||$videoPlaying;stageShaftTouchTail.noMove=_noMove||o_fade;stageShaftTouchTail.noSwipe=_noMove||!opts.swipe;!o_transition&&$stageShaft.toggleClass(grabClass,!opts.click&&!stageShaftTouchTail.noMove&&!stageShaftTouchTail.noSwipe);MS_POINTER&&$wrap.toggleClass(wrapPanYClass,!stageShaftTouchTail.noSwipe)}function setAutoplayInterval(interval){if(interval===true)interval="";opts.autoplay=Math.max(+interval||AUTOPLAY_INTERVAL,o_transitionDuration*1.5)}function updateThumbArrow(opt){if(opt.navarrows&&opt.nav==="thumbs"){$thumbArrLeft.show();$thumbArrRight.show()}else{$thumbArrLeft.hide();$thumbArrRight.hide()}}function getThumbsInSlide($el,opts){return Math.floor($wrap.width()/(opts.thumbwidth+opts.thumbmargin))}function setOptions(){if(!opts.nav||opts.nav==="dots"){opts.navdir="horizontal"}that.options=opts=optionsToLowerCase(opts);thumbsPerSlide=getThumbsInSlide($wrap,opts);o_fade=opts.transition==="crossfade"||opts.transition==="dissolve";o_loop=opts.loop&&(size>2||o_fade&&(!o_transition||o_transition!=="slide"));o_transitionDuration=+opts.transitionduration||TRANSITION_DURATION;o_rtl=opts.direction==="rtl";o_keyboard=$.extend({},opts.keyboard&&KEYBOARD_OPTIONS,opts.keyboard);updateThumbArrow(opts);var classes={add:[],remove:[]};function addOrRemoveClass(FLAG,value){classes[FLAG?"add":"remove"].push(value)}if(size>1){o_nav=opts.nav;o_navTop=opts.navposition==="top";classes.remove.push(selectClass);$arrs.toggle(opts.arrows)}else{o_nav=false;$arrs.hide()}arrsUpdate();stageWheelUpdate();thumbArrUpdate();if(opts.autoplay)setAutoplayInterval(opts.autoplay);o_thumbSide=numberFromMeasure(opts.thumbwidth)||THUMB_SIZE;o_thumbSide2=numberFromMeasure(opts.thumbheight)||THUMB_SIZE;stageWheelTail.ok=navWheelTail.ok=opts.trackpad&&!SLOW;stageNoMove();extendMeasures(opts,[measures]);o_navThumbs=o_nav==="thumbs";if($navWrap.filter(":hidden")&&!!o_nav){$navWrap.show()}if(o_navThumbs){frameDraw(size,"navThumb");$navFrame=$navThumbFrame;navFrameKey=NAV_THUMB_FRAME_KEY;setStyle($style,$.Fotorama.jst.style({w:o_thumbSide,h:o_thumbSide2,b:opts.thumbborderwidth,m:opts.thumbmargin,s:stamp,q:!COMPAT}));$nav.addClass(navThumbsClass).removeClass(navDotsClass)}else if(o_nav==="dots"){frameDraw(size,"navDot");$navFrame=$navDotFrame;navFrameKey=NAV_DOT_FRAME_KEY;$nav.addClass(navDotsClass).removeClass(navThumbsClass)}else{$navWrap.hide();o_nav=false;$nav.removeClass(navThumbsClass+" "+navDotsClass)}if(o_nav){if(o_navTop){$navWrap.insertBefore($stage)}else{$navWrap.insertAfter($stage)}frameAppend.nav=false;frameAppend($navFrame,$navShaft,"nav")}o_allowFullScreen=opts.allowfullscreen;if(o_allowFullScreen){$fullscreenIcon.prependTo($stage);o_nativeFullScreen=FULLSCREEN&&o_allowFullScreen==="native";stubEvent($fullscreenIcon,"touchend")}else{$fullscreenIcon.detach();o_nativeFullScreen=false}addOrRemoveClass(o_fade,wrapFadeClass);addOrRemoveClass(!o_fade,wrapSlideClass);addOrRemoveClass(!opts.captions,wrapNoCaptionsClass);addOrRemoveClass(o_rtl,wrapRtlClass);addOrRemoveClass(opts.arrows,wrapToggleArrowsClass);o_shadows=opts.shadows&&!SLOW;addOrRemoveClass(!o_shadows,wrapNoShadowsClass);$wrap.addClass(classes.add.join(" ")).removeClass(classes.remove.join(" "));lastOptions=$.extend({},opts);setStagePosition()}function normalizeIndex(index){return index<0?(size+index%size)%size:index>=size?index%size:index}function limitIndex(index){return minMaxLimit(index,0,size-1)}function edgeIndex(index){return o_loop?normalizeIndex(index):limitIndex(index)}function getPrevIndex(index){return index>0||o_loop?index-1:false}function getNextIndex(index){return index<size-1||o_loop?index+1:false}function setStageShaftMinmaxAndSnap(){stageShaftTouchTail.min=o_loop?-Infinity:-getPosByIndex(size-1,measures.w,opts.margin,repositionIndex);stageShaftTouchTail.max=o_loop?Infinity:-getPosByIndex(0,measures.w,opts.margin,repositionIndex);stageShaftTouchTail.snap=measures.w+opts.margin}function setNavShaftMinMax(){var isVerticalDir=opts.navdir==="vertical";var param=isVerticalDir?$navShaft.height():$navShaft.width();var mainParam=isVerticalDir?measures.h:measures.nw;navShaftTouchTail.min=Math.min(0,mainParam-param);navShaftTouchTail.max=0;navShaftTouchTail.direction=opts.navdir;$navShaft.toggleClass(grabClass,!(navShaftTouchTail.noMove=navShaftTouchTail.min===navShaftTouchTail.max))}function eachIndex(indexes,type,fn){if(typeof indexes==="number"){indexes=new Array(indexes);var rangeFLAG=true}return $.each(indexes,function(i,index){if(rangeFLAG)index=i;if(typeof index==="number"){var dataFrame=data[normalizeIndex(index)];if(dataFrame){var key="$"+type+"Frame",$frame=dataFrame[key];fn.call(this,i,index,dataFrame,$frame,key,$frame&&$frame.data())}}})}function setMeasures(width,height,ratio,index){if(!measuresSetFLAG||measuresSetFLAG==="*"&&index===startIndex){width=measureIsValid(opts.width)||measureIsValid(width)||WIDTH;height=measureIsValid(opts.height)||measureIsValid(height)||HEIGHT;that.resize({width:width,ratio:opts.ratio||ratio||width/height},0,index!==startIndex&&"*")}}function loadImg(indexes,type,specialMeasures,again){eachIndex(indexes,type,function(i,index,dataFrame,$frame,key,frameData){if(!$frame)return;var fullFLAG=that.fullScreen&&!frameData.$full&&type==="stage";if(frameData.$img&&!again&&!fullFLAG)return;var img=new Image,$img=$(img),imgData=$img.data();frameData[fullFLAG?"$full":"$img"]=$img;var srcKey=type==="stage"?fullFLAG?"full":"img":"thumb",src=dataFrame[srcKey],dummy=fullFLAG?dataFrame["img"]:dataFrame[type==="stage"?"thumb":"img"];if(type==="navThumb")$frame=frameData.$wrap;function triggerTriggerEvent(event){var _index=normalizeIndex(index);triggerEvent(event,{index:_index,src:src,frame:data[_index]})}function error(){$img.remove();$.Fotorama.cache[src]="error";if((!dataFrame.html||type!=="stage")&&dummy&&dummy!==src){dataFrame[srcKey]=src=dummy;frameData.$full=null;loadImg([index],type,specialMeasures,true)}else{if(src&&!dataFrame.html&&!fullFLAG){$frame.trigger("f:error").removeClass(loadingClass).addClass(errorClass);triggerTriggerEvent("error")}else if(type==="stage"){$frame.trigger("f:load").removeClass(loadingClass+" "+errorClass).addClass(loadedClass);triggerTriggerEvent("load");setMeasures()}frameData.state="error";if(size>1&&data[index]===dataFrame&&!dataFrame.html&&!dataFrame.deleted&&!dataFrame.video&&!fullFLAG){dataFrame.deleted=true;that.splice(index,1)}}}function loaded(){$.Fotorama.measures[src]=imgData.measures=$.Fotorama.measures[src]||{width:img.width,height:img.height,ratio:img.width/img.height};setMeasures(imgData.measures.width,imgData.measures.height,imgData.measures.ratio,index);$img.off("load error").addClass(""+(fullFLAG?imgFullClass:imgClass)).attr("aria-hidden","false").prependTo($frame);if($frame.hasClass(stageFrameClass)&&!$frame.hasClass(videoContainerClass)){$frame.attr("href",$img.attr("src"))}fit($img,($.isFunction(specialMeasures)?specialMeasures():specialMeasures)||measures);$.Fotorama.cache[src]=frameData.state="loaded";setTimeout(function(){$frame.trigger("f:load").removeClass(loadingClass+" "+errorClass).addClass(loadedClass+" "+(fullFLAG?loadedFullClass:loadedImgClass));if(type==="stage"){triggerTriggerEvent("load")}else if(dataFrame.thumbratio===AUTO||!dataFrame.thumbratio&&opts.thumbratio===AUTO){dataFrame.thumbratio=imgData.measures.ratio;reset()}},0)}if(!src){error();return}function waitAndLoad(){var _i=10;waitFor(function(){return!touchedFLAG||!_i--&&!SLOW},function(){loaded()})}if(!$.Fotorama.cache[src]){$.Fotorama.cache[src]="*";$img.on("load",waitAndLoad).on("error",error)}else{(function justWait(){if($.Fotorama.cache[src]==="error"){error()}else if($.Fotorama.cache[src]==="loaded"){setTimeout(waitAndLoad,0)}else{setTimeout(justWait,100)}})()}frameData.state="";img.src=src;if(frameData.data.caption){img.alt=frameData.data.caption||""}if(frameData.data.full){$(img).data("original",frameData.data.full)}if(UTIL.isExpectedCaption(dataFrame,opts.showcaption)){$(img).attr("aria-labelledby",dataFrame.labelledby)}})}function updateFotoramaState(){var $frame=activeFrame[STAGE_FRAME_KEY];if($frame&&!$frame.data().state){$spinner.addClass(spinnerShowClass);$frame.on("f:load f:error",function(){$frame.off("f:load f:error");$spinner.removeClass(spinnerShowClass)})}}function addNavFrameEvents(frame){addEnterUp(frame,onNavFrameClick);addFocus(frame,function(){setTimeout(function(){lockScroll($nav)},0);slideNavShaft({time:o_transitionDuration,guessIndex:$(this).data().eq,minMax:navShaftTouchTail})})}function frameDraw(indexes,type){eachIndex(indexes,type,function(i,index,dataFrame,$frame,key,frameData){if($frame)return;$frame=dataFrame[key]=$wrap[key].clone();frameData=$frame.data();frameData.data=dataFrame;var frame=$frame[0],labelledbyValue="labelledby"+$.now();if(type==="stage"){if(dataFrame.html){$('<div class="'+htmlClass+'"></div>').append(dataFrame._html?$(dataFrame.html).removeAttr("id").html(dataFrame._html):dataFrame.html).appendTo($frame)}if(dataFrame.id){labelledbyValue=dataFrame.id||labelledbyValue}dataFrame.labelledby=labelledbyValue;if(UTIL.isExpectedCaption(dataFrame,opts.showcaption)){$($.Fotorama.jst.frameCaption({caption:dataFrame.caption,labelledby:labelledbyValue})).appendTo($frame)}dataFrame.video&&$frame.addClass(stageFrameVideoClass).append($videoPlay.clone());addFocus(frame,function(){setTimeout(function(){lockScroll($stage)},0);clickToShow({index:frameData.eq,user:true})});$stageFrame=$stageFrame.add($frame)}else if(type==="navDot"){addNavFrameEvents(frame);$navDotFrame=$navDotFrame.add($frame)}else if(type==="navThumb"){addNavFrameEvents(frame);frameData.$wrap=$frame.children(":first");$navThumbFrame=$navThumbFrame.add($frame);if(dataFrame.video){frameData.$wrap.append($videoPlay.clone())}}})}function callFit($img,measuresToFit){return $img&&$img.length&&fit($img,measuresToFit)}function stageFramePosition(indexes){eachIndex(indexes,"stage",function(i,index,dataFrame,$frame,key,frameData){if(!$frame)return;var normalizedIndex=normalizeIndex(index);frameData.eq=normalizedIndex;toDetach[STAGE_FRAME_KEY][normalizedIndex]=$frame.css($.extend({left:o_fade?0:getPosByIndex(index,measures.w,opts.margin,repositionIndex)},o_fade&&getDuration(0)));if(isDetached($frame[0])){$frame.appendTo($stageShaft);unloadVideo(dataFrame.$video)}callFit(frameData.$img,measures);callFit(frameData.$full,measures);if($frame.hasClass(stageFrameClass)&&!($frame.attr("aria-hidden")==="false"&&$frame.hasClass(activeClass))){$frame.attr("aria-hidden","true")}})}function thumbsDraw(pos,loadFLAG){var leftLimit,rightLimit,exceedLimit;if(o_nav!=="thumbs"||isNaN(pos))return;leftLimit=-pos;rightLimit=-pos+measures.nw;if(opts.navdir==="vertical"){pos=pos-opts.thumbheight;rightLimit=-pos+measures.h}$navThumbFrame.each(function(){var $this=$(this),thisData=$this.data(),eq=thisData.eq,getSpecialMeasures=function(){return{h:o_thumbSide2,w:thisData.w}},specialMeasures=getSpecialMeasures(),exceedLimit=opts.navdir==="vertical"?thisData.t>rightLimit:thisData.l>rightLimit;specialMeasures.w=thisData.w;if(thisData.l+thisData.w<leftLimit||exceedLimit||callFit(thisData.$img,specialMeasures))return;loadFLAG&&loadImg([eq],"navThumb",getSpecialMeasures)})}function frameAppend($frames,$shaft,type){if(!frameAppend[type]){var thumbsFLAG=type==="nav"&&o_navThumbs,left=0,top=0;$shaft.append($frames.filter(function(){var actual,$this=$(this),frameData=$this.data();for(var _i=0,_l=data.length;_i<_l;_i++){if(frameData.data===data[_i]){actual=true;frameData.eq=_i;break}}return actual||$this.remove()&&false}).sort(function(a,b){return $(a).data().eq-$(b).data().eq}).each(function(){var $this=$(this),frameData=$this.data();UTIL.setThumbAttr($this,frameData.data.caption,"aria-label")}).each(function(){if(!thumbsFLAG)return;var $this=$(this),frameData=$this.data(),thumbwidth=Math.round(o_thumbSide2*frameData.data.thumbratio)||o_thumbSide,thumbheight=Math.round(o_thumbSide/frameData.data.thumbratio)||o_thumbSide2;frameData.t=top;frameData.h=thumbheight;frameData.l=left;frameData.w=thumbwidth;$this.css({width:thumbwidth});top+=thumbheight+opts.thumbmargin;left+=thumbwidth+opts.thumbmargin}));frameAppend[type]=true}}function getDirection(x){return x-stageLeft>measures.w/3}function disableDirrection(i){return!o_loop&&(!(activeIndex+i)||!(activeIndex-size+i))&&!$videoPlaying}function arrsUpdate(){var disablePrev=disableDirrection(0),disableNext=disableDirrection(1);$arrPrev.toggleClass(arrDisabledClass,disablePrev).attr(disableAttr(disablePrev,false));$arrNext.toggleClass(arrDisabledClass,disableNext).attr(disableAttr(disableNext,false))}function thumbArrUpdate(){var isLeftDisable=false,isRightDisable=false;if(opts.navtype==="thumbs"&&!opts.loop){activeIndex==0?isLeftDisable=true:isLeftDisable=false;activeIndex==opts.data.length-1?isRightDisable=true:isRightDisable=false}if(opts.navtype==="slides"){var pos=readPosition($navShaft,opts.navdir);pos>=navShaftTouchTail.max?isLeftDisable=true:isLeftDisable=false;pos<=navShaftTouchTail.min?isRightDisable=true:isRightDisable=false}$thumbArrLeft.toggleClass(arrDisabledClass,isLeftDisable).attr(disableAttr(isLeftDisable,true));$thumbArrRight.toggleClass(arrDisabledClass,isRightDisable).attr(disableAttr(isRightDisable,true))}function stageWheelUpdate(){if(stageWheelTail.ok){stageWheelTail.prevent={"<":disableDirrection(0),">":disableDirrection(1)}}}function getNavFrameBounds($navFrame){var navFrameData=$navFrame.data(),left,top,width,height;if(o_navThumbs){left=navFrameData.l;top=navFrameData.t;width=navFrameData.w;height=navFrameData.h}else{left=$navFrame.position().left;width=$navFrame.width()}var horizontalBounds={c:left+width/2,min:-left+opts.thumbmargin*10,max:-left+measures.w-width-opts.thumbmargin*10};var verticalBounds={c:top+height/2,min:-top+opts.thumbmargin*10,max:-top+measures.h-height-opts.thumbmargin*10};return opts.navdir==="vertical"?verticalBounds:horizontalBounds}function slideThumbBorder(time){var navFrameData=activeFrame[navFrameKey].data();slide($thumbBorder,{time:time*1.2,pos:opts.navdir==="vertical"?navFrameData.t:navFrameData.l,width:navFrameData.w,height:navFrameData.h,direction:opts.navdir})}function slideNavShaft(options){var $guessNavFrame=data[options.guessIndex][navFrameKey],typeOfAnimation=opts.navtype;var overflowFLAG,time,minMax,boundTop,boundLeft,l,pos,x;if($guessNavFrame){if(typeOfAnimation==="thumbs"){overflowFLAG=navShaftTouchTail.min!==navShaftTouchTail.max;minMax=options.minMax||overflowFLAG&&getNavFrameBounds(activeFrame[navFrameKey]);boundTop=overflowFLAG&&(options.keep&&slideNavShaft.t?slideNavShaft.l:minMaxLimit((options.coo||measures.nw/2)-getNavFrameBounds($guessNavFrame).c,minMax.min,minMax.max));boundLeft=overflowFLAG&&(options.keep&&slideNavShaft.l?slideNavShaft.l:minMaxLimit((options.coo||measures.nw/2)-getNavFrameBounds($guessNavFrame).c,minMax.min,minMax.max));l=opts.navdir==="vertical"?boundTop:boundLeft;pos=overflowFLAG&&minMaxLimit(l,navShaftTouchTail.min,navShaftTouchTail.max)||0;time=options.time*1.1;slide($navShaft,{time:time,pos:pos,direction:opts.navdir,onEnd:function(){thumbsDraw(pos,true);thumbArrUpdate()}});setShadow($nav,findShadowEdge(pos,navShaftTouchTail.min,navShaftTouchTail.max,opts.navdir));slideNavShaft.l=l}else{x=readPosition($navShaft,opts.navdir);time=options.time*1.11;pos=validateSlidePos(opts,navShaftTouchTail,options.guessIndex,x,$guessNavFrame,$navWrap,opts.navdir);slide($navShaft,{time:time,pos:pos,direction:opts.navdir,onEnd:function(){thumbsDraw(pos,true);thumbArrUpdate()}});setShadow($nav,findShadowEdge(pos,navShaftTouchTail.min,navShaftTouchTail.max,opts.navdir))}}}function navUpdate(){deactivateFrames(navFrameKey);toDeactivate[navFrameKey].push(activeFrame[navFrameKey].addClass(activeClass).attr("data-active",true))}function deactivateFrames(key){var _toDeactivate=toDeactivate[key];while(_toDeactivate.length){_toDeactivate.shift().removeClass(activeClass).attr("data-active",false)}}function detachFrames(key){var _toDetach=toDetach[key];$.each(activeIndexes,function(i,index){delete _toDetach[normalizeIndex(index)]});$.each(_toDetach,function(index,$frame){delete _toDetach[index];$frame.detach()})}function stageShaftReposition(skipOnEnd){repositionIndex=dirtyIndex=activeIndex;var $frame=activeFrame[STAGE_FRAME_KEY];if($frame){deactivateFrames(STAGE_FRAME_KEY);toDeactivate[STAGE_FRAME_KEY].push($frame.addClass(activeClass).attr("data-active",true));if($frame.hasClass(stageFrameClass)){$frame.attr("aria-hidden","false")}skipOnEnd||that.showStage.onEnd(true);stop($stageShaft,0,true);detachFrames(STAGE_FRAME_KEY);stageFramePosition(activeIndexes);setStageShaftMinmaxAndSnap();setNavShaftMinMax();addEnterUp($stageShaft[0],function(){if(!$fotorama.hasClass(fullscreenClass)){that.requestFullScreen();$fullscreenIcon.focus()}})}}function extendMeasures(options,measuresArray){if(!options)return;$.each(measuresArray,function(i,measures){if(!measures)return;$.extend(measures,{width:options.width||measures.width,height:options.height,minwidth:options.minwidth,maxwidth:options.maxwidth,minheight:options.minheight,maxheight:options.maxheight,ratio:getRatio(options.ratio)})})}function triggerEvent(event,extra){$fotorama.trigger(_fotoramaClass+":"+event,[that,extra])}function onTouchStart(){clearTimeout(onTouchEnd.t);touchedFLAG=1;if(opts.stopautoplayontouch){that.stopAutoplay()}else{pausedAutoplayFLAG=true}}function onTouchEnd(){if(!touchedFLAG)return;if(!opts.stopautoplayontouch){releaseAutoplay();changeAutoplay()}onTouchEnd.t=setTimeout(function(){touchedFLAG=0},TRANSITION_DURATION+TOUCH_TIMEOUT)}function releaseAutoplay(){pausedAutoplayFLAG=!!($videoPlaying||stoppedAutoplayFLAG)}function changeAutoplay(){clearTimeout(changeAutoplay.t);waitFor.stop(changeAutoplay.w);if(!opts.autoplay||pausedAutoplayFLAG){if(that.autoplay){that.autoplay=false;triggerEvent("stopautoplay")}return}if(!that.autoplay){that.autoplay=true;triggerEvent("startautoplay")}var _activeIndex=activeIndex;var frameData=activeFrame[STAGE_FRAME_KEY].data();changeAutoplay.w=waitFor(function(){return frameData.state||_activeIndex!==activeIndex},function(){changeAutoplay.t=setTimeout(function(){if(pausedAutoplayFLAG||_activeIndex!==activeIndex)return;var _nextAutoplayIndex=nextAutoplayIndex,nextFrameData=data[_nextAutoplayIndex][STAGE_FRAME_KEY].data();changeAutoplay.w=waitFor(function(){return nextFrameData.state||_nextAutoplayIndex!==nextAutoplayIndex},function(){if(pausedAutoplayFLAG||_nextAutoplayIndex!==nextAutoplayIndex)return;that.show(o_loop?getDirectionSign(!o_rtl):nextAutoplayIndex)})},opts.autoplay)})}that.startAutoplay=function(interval){if(that.autoplay)return this;pausedAutoplayFLAG=stoppedAutoplayFLAG=false;setAutoplayInterval(interval||opts.autoplay);changeAutoplay();return this};that.stopAutoplay=function(){if(that.autoplay){pausedAutoplayFLAG=stoppedAutoplayFLAG=true;changeAutoplay()}return this};that.showSlide=function(slideDir){var currentPosition=readPosition($navShaft,opts.navdir),pos,time=500*1.1,size=opts.navdir==="horizontal"?opts.thumbwidth:opts.thumbheight,onEnd=function(){thumbArrUpdate()};if(slideDir==="next"){pos=currentPosition-(size+opts.margin)*thumbsPerSlide}if(slideDir==="prev"){pos=currentPosition+(size+opts.margin)*thumbsPerSlide}pos=validateRestrictions(pos,navShaftTouchTail);thumbsDraw(pos,true);slide($navShaft,{time:time,pos:pos,direction:opts.navdir,onEnd:onEnd})};that.showWhileLongPress=function(options){if(that.longPress.singlePressInProgress){return}var index=calcActiveIndex(options);calcGlobalIndexes(index);var time=calcTime(options)/50;var _activeFrame=activeFrame;that.activeFrame=activeFrame=data[activeIndex];var silent=_activeFrame===activeFrame&&!options.user;that.showNav(silent,options,time);return this};that.showEndLongPress=function(options){if(that.longPress.singlePressInProgress){return}var index=calcActiveIndex(options);calcGlobalIndexes(index);var time=calcTime(options)/50;var _activeFrame=activeFrame;that.activeFrame=activeFrame=data[activeIndex];var silent=_activeFrame===activeFrame&&!options.user;that.showStage(silent,options,time);showedFLAG=typeof lastActiveIndex!=="undefined"&&lastActiveIndex!==activeIndex;lastActiveIndex=activeIndex;return this};function calcActiveIndex(options){var index;if(typeof options!=="object"){index=options;options={}}else{index=options.index}index=index===">"?dirtyIndex+1:index==="<"?dirtyIndex-1:index==="<<"?0:index===">>"?size-1:index;index=isNaN(index)?undefined:index;index=typeof index==="undefined"?activeIndex||0:index;return index}function calcGlobalIndexes(index){that.activeIndex=activeIndex=edgeIndex(index);prevIndex=getPrevIndex(activeIndex);nextIndex=getNextIndex(activeIndex);nextAutoplayIndex=normalizeIndex(activeIndex+(o_rtl?-1:1));activeIndexes=[activeIndex,prevIndex,nextIndex];dirtyIndex=o_loop?index:activeIndex}function calcTime(options){var diffIndex=Math.abs(lastActiveIndex-dirtyIndex),time=getNumber(options.time,function(){return Math.min(o_transitionDuration*(1+(diffIndex-1)/12),o_transitionDuration*2)});if(options.slow){time*=10}return time}that.showStage=function(silent,options,time){unloadVideo($videoPlaying,activeFrame.i!==data[normalizeIndex(repositionIndex)].i);frameDraw(activeIndexes,"stage");stageFramePosition(SLOW?[dirtyIndex]:[dirtyIndex,getPrevIndex(dirtyIndex),getNextIndex(dirtyIndex)]);updateTouchTails("go",true);silent||triggerEvent("show",{user:options.user,time:time});pausedAutoplayFLAG=true;var overPos=options.overPos;var onEnd=that.showStage.onEnd=function(skipReposition){if(onEnd.ok)return;onEnd.ok=true;skipReposition||stageShaftReposition(true);if(!silent){triggerEvent("showend",{user:options.user})}if(!skipReposition&&o_transition&&o_transition!==opts.transition){that.setOptions({transition:o_transition});o_transition=false;return}updateFotoramaState();loadImg(activeIndexes,"stage");updateTouchTails("go",false);stageWheelUpdate();stageCursor();releaseAutoplay();changeAutoplay();if(that.fullScreen){activeFrame[STAGE_FRAME_KEY].find("."+imgFullClass).attr("aria-hidden",false);activeFrame[STAGE_FRAME_KEY].find("."+imgClass).attr("aria-hidden",true)}else{activeFrame[STAGE_FRAME_KEY].find("."+imgFullClass).attr("aria-hidden",true);activeFrame[STAGE_FRAME_KEY].find("."+imgClass).attr("aria-hidden",false)}};if(!o_fade){slide($stageShaft,{pos:-getPosByIndex(dirtyIndex,measures.w,opts.margin,repositionIndex),overPos:overPos,time:time,onEnd:onEnd})}else{var $activeFrame=activeFrame[STAGE_FRAME_KEY],$prevActiveFrame=data[lastActiveIndex]&&activeIndex!==lastActiveIndex?data[lastActiveIndex][STAGE_FRAME_KEY]:null;fade($activeFrame,$prevActiveFrame,$stageFrame,{time:time,method:opts.transition,onEnd:onEnd},fadeStack)}arrsUpdate()};that.showNav=function(silent,options,time){thumbArrUpdate();if(o_nav){navUpdate();var guessIndex=limitIndex(activeIndex+minMaxLimit(dirtyIndex-lastActiveIndex,-1,1));slideNavShaft({time:time,coo:guessIndex!==activeIndex&&options.coo,guessIndex:typeof options.coo!=="undefined"?guessIndex:activeIndex,keep:silent});if(o_navThumbs)slideThumbBorder(time)}};that.show=function(options){that.longPress.singlePressInProgress=true;var index=calcActiveIndex(options);calcGlobalIndexes(index);var time=calcTime(options);var _activeFrame=activeFrame;that.activeFrame=activeFrame=data[activeIndex];var silent=_activeFrame===activeFrame&&!options.user;that.showStage(silent,options,time);that.showNav(silent,options,time);showedFLAG=typeof lastActiveIndex!=="undefined"&&lastActiveIndex!==activeIndex;lastActiveIndex=activeIndex;that.longPress.singlePressInProgress=false;return this};that.requestFullScreen=function(){if(o_allowFullScreen&&!that.fullScreen){var isVideo=$((that.activeFrame||{}).$stageFrame||{}).hasClass("fotorama-video-container");if(isVideo){return}scrollTop=$WINDOW.scrollTop();scrollLeft=$WINDOW.scrollLeft();lockScroll($WINDOW);updateTouchTails("x",true);measuresStash=$.extend({},measures);$fotorama.addClass(fullscreenClass).appendTo($BODY.addClass(_fullscreenClass));$HTML.addClass(_fullscreenClass);unloadVideo($videoPlaying,true,true);that.fullScreen=true;if(o_nativeFullScreen){fullScreenApi.request(fotorama)}that.resize();loadImg(activeIndexes,"stage");updateFotoramaState();triggerEvent("fullscreenenter");if(!("ontouchstart"in window)){$fullscreenIcon.focus()}}return this};function cancelFullScreen(){if(that.fullScreen){that.fullScreen=false;if(FULLSCREEN){fullScreenApi.cancel(fotorama)}$BODY.removeClass(_fullscreenClass);$HTML.removeClass(_fullscreenClass);$fotorama.removeClass(fullscreenClass).insertAfter($anchor);measures=$.extend({},measuresStash);unloadVideo($videoPlaying,true,true);updateTouchTails("x",false);that.resize();loadImg(activeIndexes,"stage");lockScroll($WINDOW,scrollLeft,scrollTop);triggerEvent("fullscreenexit")}}that.cancelFullScreen=function(){if(o_nativeFullScreen&&fullScreenApi.is()){fullScreenApi.cancel(document)}else{cancelFullScreen()}return this};that.toggleFullScreen=function(){return that[(that.fullScreen?"cancel":"request")+"FullScreen"]()};that.resize=function(options){if(!data)return this;var time=arguments[1]||0,setFLAG=arguments[2];thumbsPerSlide=getThumbsInSlide($wrap,opts);extendMeasures(!that.fullScreen?optionsToLowerCase(options):{width:$(window).width(),maxwidth:null,minwidth:null,height:$(window).height(),maxheight:null,minheight:null},[measures,setFLAG||that.fullScreen||opts]);var width=measures.width,height=measures.height,ratio=measures.ratio,windowHeight=$WINDOW.height()-(o_nav?$nav.height():0);if(measureIsValid(width)){$wrap.css({width:""});$wrap.css({height:""});$stage.css({width:""});$stage.css({height:""});$stageShaft.css({width:""});$stageShaft.css({height:""});$nav.css({width:""});$nav.css({height:""});$wrap.css({minWidth:measures.minwidth||0,maxWidth:measures.maxwidth||MAX_WIDTH});if(o_nav==="dots"){$navWrap.hide()}width=measures.W=measures.w=$wrap.width();measures.nw=o_nav&&numberFromWhatever(opts.navwidth,width)||width;$stageShaft.css({width:measures.w,marginLeft:(measures.W-measures.w)/2});height=numberFromWhatever(height,windowHeight);height=height||ratio&&width/ratio;if(height){width=Math.round(width);height=measures.h=Math.round(minMaxLimit(height,numberFromWhatever(measures.minheight,windowHeight),numberFromWhatever(measures.maxheight,windowHeight)));$stage.css({width:width,height:height});if(opts.navdir==="vertical"&&!that.fullscreen){$nav.width(opts.thumbwidth+opts.thumbmargin*2)}if(opts.navdir==="horizontal"&&!that.fullscreen){$nav.height(opts.thumbheight+opts.thumbmargin*2)}if(o_nav==="dots"){$nav.width(width).height("auto");$navWrap.show()}if(opts.navdir==="vertical"&&that.fullScreen){$stage.css("height",$WINDOW.height())}if(opts.navdir==="horizontal"&&that.fullScreen){$stage.css("height",$WINDOW.height()-$nav.height())}if(o_nav){switch(opts.navdir){case"vertical":$navWrap.removeClass(navShafthorizontalClass);$navWrap.removeClass(navShaftListClass);$navWrap.addClass(navShaftVerticalClass);$nav.stop().animate({height:measures.h,width:opts.thumbwidth},time);break;case"list":$navWrap.removeClass(navShaftVerticalClass);$navWrap.removeClass(navShafthorizontalClass);$navWrap.addClass(navShaftListClass);break;default:$navWrap.removeClass(navShaftVerticalClass);$navWrap.removeClass(navShaftListClass);$navWrap.addClass(navShafthorizontalClass);$nav.stop().animate({width:measures.nw},time);break}stageShaftReposition();slideNavShaft({guessIndex:activeIndex,time:time,keep:true});if(o_navThumbs&&frameAppend.nav)slideThumbBorder(time)}measuresSetFLAG=setFLAG||true;ready.ok=true;ready()}}stageLeft=$stage.offset().left;setStagePosition();return this};that.setOptions=function(options){$.extend(opts,options);reset();return this};that.shuffle=function(){data&&shuffle(data)&&reset();return this};function setShadow($el,edge){if(o_shadows){$el.removeClass(shadowsLeftClass+" "+shadowsRightClass);$el.removeClass(shadowsTopClass+" "+shadowsBottomClass);edge&&!$videoPlaying&&$el.addClass(edge.replace(/^|\s/g," "+shadowsClass+"--"))}}that.longPress={threshold:1,count:0,thumbSlideTime:20,progress:function(){if(!this.inProgress){this.count++;this.inProgress=this.count>this.threshold}},end:function(){if(this.inProgress){this.isEnded=true}},reset:function(){this.count=0;this.inProgress=false;this.isEnded=false}};that.destroy=function(){that.cancelFullScreen();that.stopAutoplay();data=that.data=null;appendElements();activeIndexes=[];detachFrames(STAGE_FRAME_KEY);reset.ok=false;return this};that.playVideo=function(){var dataFrame=activeFrame,video=dataFrame.video,_activeIndex=activeIndex;if(typeof video==="object"&&dataFrame.videoReady){o_nativeFullScreen&&that.fullScreen&&that.cancelFullScreen();waitFor(function(){return!fullScreenApi.is()||_activeIndex!==activeIndex},function(){if(_activeIndex===activeIndex){dataFrame.$video=dataFrame.$video||$(div(videoClass)).append(createVideoFrame(video));dataFrame.$video.appendTo(dataFrame[STAGE_FRAME_KEY]);$wrap.addClass(wrapVideoClass);$videoPlaying=dataFrame.$video;stageNoMove();$arrs.blur();$fullscreenIcon.blur();triggerEvent("loadvideo")}})}return this};that.stopVideo=function(){unloadVideo($videoPlaying,true,true);return this};that.spliceByIndex=function(index,newImgObj){newImgObj.i=index+1;newImgObj.img&&$.ajax({url:newImgObj.img,type:"HEAD",success:function(){data.splice(index,1,newImgObj);reset()}})};function unloadVideo($video,unloadActiveFLAG,releaseAutoplayFLAG){if(unloadActiveFLAG){$wrap.removeClass(wrapVideoClass);$videoPlaying=false;stageNoMove()}if($video&&$video!==$videoPlaying){$video.remove();triggerEvent("unloadvideo")}if(releaseAutoplayFLAG){releaseAutoplay();changeAutoplay()}}function toggleControlsClass(FLAG){$wrap.toggleClass(wrapNoControlsClass,FLAG)}function stageCursor(e){if(stageShaftTouchTail.flow)return;var x=e?e.pageX:stageCursor.x,pointerFLAG=x&&!disableDirrection(getDirection(x))&&opts.click;if(stageCursor.p!==pointerFLAG&&$stage.toggleClass(pointerClass,pointerFLAG)){stageCursor.p=pointerFLAG;stageCursor.x=x}}$stage.on("mousemove",stageCursor);function clickToShow(showOptions){clearTimeout(clickToShow.t);if(opts.clicktransition&&opts.clicktransition!==opts.transition){setTimeout(function(){var _o_transition=opts.transition;that.setOptions({transition:opts.clicktransition});o_transition=_o_transition;clickToShow.t=setTimeout(function(){that.show(showOptions)},10)},0)}else{that.show(showOptions)}}function onStageTap(e,toggleControlsFLAG){var target=e.target,$target=$(target);if($target.hasClass(videoPlayClass)){that.playVideo()}else if(target===fullscreenIcon){that.toggleFullScreen()}else if($videoPlaying){target===videoClose&&unloadVideo($videoPlaying,true,true)}else if(!$fotorama.hasClass(fullscreenClass)){that.requestFullScreen()}}function updateTouchTails(key,value){stageShaftTouchTail[key]=navShaftTouchTail[key]=value}stageShaftTouchTail=moveOnTouch($stageShaft,{onStart:onTouchStart,onMove:function(e,result){setShadow($stage,result.edge)},onTouchEnd:onTouchEnd,onEnd:function(result){var toggleControlsFLAG;setShadow($stage);toggleControlsFLAG=(MS_POINTER&&!hoverFLAG||result.touch)&&opts.arrows;if((result.moved||toggleControlsFLAG&&result.pos!==result.newPos&&!result.control)&&result.$target[0]!==$fullscreenIcon[0]){var index=getIndexByPos(result.newPos,measures.w,opts.margin,repositionIndex);that.show({index:index,time:o_fade?o_transitionDuration:result.time,overPos:result.overPos,user:true})}else if(!result.aborted&&!result.control){onStageTap(result.startEvent,toggleControlsFLAG)}},timeLow:1,timeHigh:1,friction:2,select:"."+selectClass+", ."+selectClass+" *",$wrap:$stage,direction:"horizontal"});navShaftTouchTail=moveOnTouch($navShaft,{onStart:onTouchStart,onMove:function(e,result){setShadow($nav,result.edge)},onTouchEnd:onTouchEnd,onEnd:function(result){function onEnd(){slideNavShaft.l=result.newPos;releaseAutoplay();changeAutoplay();thumbsDraw(result.newPos,true);thumbArrUpdate()}if(!result.moved){var target=result.$target.closest("."+navFrameClass,$navShaft)[0];target&&onNavFrameClick.call(target,result.startEvent)}else if(result.pos!==result.newPos){pausedAutoplayFLAG=true;slide($navShaft,{time:result.time,pos:result.newPos,overPos:result.overPos,direction:opts.navdir,onEnd:onEnd});thumbsDraw(result.newPos);o_shadows&&setShadow($nav,findShadowEdge(result.newPos,navShaftTouchTail.min,navShaftTouchTail.max,result.dir))}else{onEnd()}},timeLow:.5,timeHigh:2,friction:5,$wrap:$nav,direction:opts.navdir});stageWheelTail=wheel($stage,{shift:true,onEnd:function(e,direction){onTouchStart();onTouchEnd();that.show({index:direction,slow:e.altKey})}});navWheelTail=wheel($nav,{onEnd:function(e,direction){onTouchStart();onTouchEnd();var newPos=stop($navShaft)+direction*.25;$navShaft.css(getTranslate(minMaxLimit(newPos,navShaftTouchTail.min,navShaftTouchTail.max),opts.navdir));o_shadows&&setShadow($nav,findShadowEdge(newPos,navShaftTouchTail.min,navShaftTouchTail.max,opts.navdir));navWheelTail.prevent={"<":newPos>=navShaftTouchTail.max,">":newPos<=navShaftTouchTail.min};clearTimeout(navWheelTail.t);navWheelTail.t=setTimeout(function(){slideNavShaft.l=newPos;thumbsDraw(newPos,true)},TOUCH_TIMEOUT);thumbsDraw(newPos)}});$wrap.hover(function(){setTimeout(function(){if(touchedFLAG)return;toggleControlsClass(!(hoverFLAG=true))},0)},function(){if(!hoverFLAG)return;toggleControlsClass(!(hoverFLAG=false))});function onNavFrameClick(e){var index=$(this).data().eq;if(opts.navtype==="thumbs"){clickToShow({index:index,slow:e.altKey,user:true,coo:e._x-$nav.offset().left})}else{clickToShow({index:index,slow:e.altKey,user:true})}}function onArrClick(e){clickToShow({index:$arrs.index(this)?">":"<",slow:e.altKey,user:true})}smartClick($arrs,function(e){stopEvent(e);onArrClick.call(this,e)},{onStart:function(){onTouchStart();stageShaftTouchTail.control=true},onTouchEnd:onTouchEnd});smartClick($thumbArrLeft,function(e){stopEvent(e);if(opts.navtype==="thumbs"){that.show("<")}else{that.showSlide("prev")}});smartClick($thumbArrRight,function(e){stopEvent(e);if(opts.navtype==="thumbs"){that.show(">")}else{that.showSlide("next")}});function addFocusOnControls(el){addFocus(el,function(){setTimeout(function(){lockScroll($stage)},0);toggleControlsClass(false)})}$arrs.each(function(){addEnterUp(this,function(e){onArrClick.call(this,e)});addFocusOnControls(this)});addEnterUp(fullscreenIcon,function(){if($fotorama.hasClass(fullscreenClass)){that.cancelFullScreen();$stageShaft.focus()}else{that.requestFullScreen();$fullscreenIcon.focus()}});addFocusOnControls(fullscreenIcon);function reset(){setData();setOptions();if(!reset.i){reset.i=true;var _startindex=opts.startindex;activeIndex=repositionIndex=dirtyIndex=lastActiveIndex=startIndex=edgeIndex(_startindex)||0}if(size){if(changeToRtl())return;if($videoPlaying){unloadVideo($videoPlaying,true)}activeIndexes=[];detachFrames(STAGE_FRAME_KEY);reset.ok=true;that.show({index:activeIndex,time:0});that.resize()}else{that.destroy()}}function changeToRtl(){if(!changeToRtl.f===o_rtl){changeToRtl.f=o_rtl;activeIndex=size-1-activeIndex;that.reverse();return true}}$.each("load push pop shift unshift reverse sort splice".split(" "),function(i,method){that[method]=function(){data=data||[];if(method!=="load"){Array.prototype[method].apply(data,arguments)}else if(arguments[0]&&typeof arguments[0]==="object"&&arguments[0].length){data=clone(arguments[0])}reset();return that}});function ready(){if(ready.ok){ready.ok=false;triggerEvent("ready")}}reset()};$.fn.fotorama=function(opts){return this.each(function(){var that=this,$fotorama=$(this),fotoramaData=$fotorama.data(),fotorama=fotoramaData.fotorama;if(!fotorama){waitFor(function(){return!isHidden(that)},function(){fotoramaData.urtext=$fotorama.html();new $.Fotorama($fotorama,$.extend({},OPTIONS,window.fotoramaDefaults,opts,fotoramaData))})}else{fotorama.setOptions(opts,true)}})};$.Fotorama.instances=[];function calculateIndexes(){$.each($.Fotorama.instances,function(index,instance){instance.index=index})}function addInstance(instance){$.Fotorama.instances.push(instance);calculateIndexes()}function hideInstance(instance){$.Fotorama.instances.splice(instance.index,1);calculateIndexes()}$.Fotorama.cache={};$.Fotorama.measures={};$=$||{};$.Fotorama=$.Fotorama||{};$.Fotorama.jst=$.Fotorama.jst||{};$.Fotorama.jst.dots=function(v){var __t,__p="",__e=_.escape;__p+='<div class="fotorama__nav__frame fotorama__nav__frame--dot" tabindex="0" role="button" data-gallery-role="nav-frame" data-nav-type="thumb" aria-label>\r\n    <div class="fotorama__dot"></div>\r\n</div>';return __p};$.Fotorama.jst.frameCaption=function(v){var __t,__p="",__e=_.escape;__p+='<div class="fotorama__caption" aria-hidden="true">\r\n    <div class="fotorama__caption__wrap" id="'+((__t=v.labelledby)==null?"":__t)+'">'+((__t=v.caption)==null?"":__t)+"</div>\r\n</div>\r\n";return __p};$.Fotorama.jst.style=function(v){var __t,__p="",__e=_.escape;__p+=".fotorama"+((__t=v.s)==null?"":__t)+" .fotorama__nav--thumbs .fotorama__nav__frame{\r\npadding:"+((__t=v.m)==null?"":__t)+"px;\r\nheight:"+((__t=v.h)==null?"":__t)+"px}\r\n.fotorama"+((__t=v.s)==null?"":__t)+" .fotorama__thumb-border{\r\nheight:"+((__t=v.h)==null?"":__t)+"px;\r\nborder-width:"+((__t=v.b)==null?"":__t)+"px;\r\nmargin-top:"+((__t=v.m)==null?"":__t)+"px}";return __p};$.Fotorama.jst.thumb=function(v){var __t,__p="",__e=_.escape;__p+='<div class="fotorama__nav__frame fotorama__nav__frame--thumb" tabindex="0" role="button" data-gallery-role="nav-frame" data-nav-type="thumb" aria-label>\r\n    <div class="fotorama__thumb">\r\n    </div>\r\n</div>';return __p}})(window,document,location,typeof jQuery!=="undefined"&&jQuery);
-\ No newline at end of file
-diff --git a/lib/web/i18n/en_US.csv b/lib/web/i18n/en_US.csv
-index 5c63a191420..79380688719 100644
---- a/lib/web/i18n/en_US.csv
-+++ b/lib/web/i18n/en_US.csv
-@@ -27,6 +27,7 @@ Submit,Submit
- "Letters, numbers, spaces or underscores only please","Letters, numbers, spaces or underscores only please"
- "Letters only please","Letters only please"
- "No white space please","No white space please"
-+"No marginal white space please","No marginal white space please"
- "Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx","Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx"
- "A positive or negative non-decimal number please","A positive or negative non-decimal number please"
- "The specified vehicle identification number (VIN) is invalid.","The specified vehicle identification number (VIN) is invalid."
-@@ -95,7 +96,7 @@ Submit,Submit
- "Please enter valid SKU key.","Please enter valid SKU key."
- "Please enter a valid number.","Please enter a valid number."
- "This is required field","This is required field"
--"Admin is a required field in the each row.","Admin is a required field in the each row."
-+"Admin is a required field in each row.","Admin is a required field in each row."
- "Password cannot be the same as email address.","Password cannot be the same as email address."
- "Please fix this field.","Please fix this field."
- "Please enter a valid email address.","Please enter a valid email address."
-diff --git a/lib/web/images/logo.svg b/lib/web/images/logo.svg
-index 013d6e7c5a1..0f29d4e3eef 100644
---- a/lib/web/images/logo.svg
-+++ b/lib/web/images/logo.svg
-@@ -1 +1 @@
--<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="55.139px" viewBox="0 0 189 55.139" width="189px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 189 55.139"><path d="m23.333 0l-23.333 14.135v26.865l6.06 3.568v-26.865l17.278-10.504 17.292 10.488 0.074 0.042-0.008 26.798 6.001-3.527v-26.865l-23.364-14.135zm3.088 16.538v31.407l-3.088 1.889-3.091-1.896v-31.376l-8.003 4.928v26.86l11.094 6.789 11.189-6.837v-26.829l-8.101-4.935z" fill="#ED7402"/><path d="m12.239 21.491l8.003 4.886v-9.814l-8.003 4.928zm14.182-4.953v9.902l8.101-4.967-8.101-4.935zm20.276-2.403l-23.364-14.135-23.333 14.135 6.06 3.568 17.278-10.504 17.365 10.53 5.994-3.594z" fill="#F8B97F"/><path d="m82.328 39.984l-1.608-20.54-8.156 20.651h-2.656l-8.156-20.651-1.571 20.541h-3.293l2.058-25.814h4.34l8.043 21.174 8.044-21.174h4.301l2.021 25.814h-3.367z" fill="#131108"/><path d="m99.91 39.984l-0.375-2.396c-1.421 1.458-3.366 2.769-6.284 2.769-3.218 0-5.237-1.945-5.237-4.977 0-4.452 3.815-6.209 11.261-6.996v-0.748c0-2.244-1.348-3.03-3.406-3.03-2.17 0-4.227 0.673-6.172 1.533l-0.449-2.88c2.133-0.861 4.153-1.496 6.922-1.496 4.339 0 6.436 1.757 6.436 5.723v12.498h-2.7zm-0.635-9.055c-6.586 0.636-7.97 2.432-7.97 4.266 0 1.457 0.973 2.394 2.657 2.394 1.945 0 3.815-0.974 5.312-2.508v-4.152h0.001z" fill="#131108"/><path d="m121.72 21.876l0.485 2.992-3.404 0.336c0.486 0.824 0.712 1.76 0.712 2.769 0 3.817-3.219 6.134-6.848 6.134-0.449 0-0.898-0.037-1.348-0.111-0.523 0.338-0.897 0.75-0.897 1.085 0 0.636 0.634 0.787 3.777 1.349l1.272 0.223c3.778 0.673 6.135 1.871 6.135 4.639 0 3.741-4.078 5.5-8.715 5.5-4.64 0-8.343-1.458-8.343-4.6 0-1.834 1.271-3.256 3.777-4.603-0.784-0.562-1.121-1.198-1.121-1.872 0-0.861 0.672-1.722 1.87-2.432-1.982-0.973-3.33-2.879-3.33-5.312 0-3.852 3.217-6.208 6.846-6.208 1.795 0 3.368 0.522 4.604 1.496l4.53-1.385zm-13.99 20.052c0 1.424 1.834 2.471 5.312 2.471 3.48 0 5.424-1.197 5.424-2.693 0-1.086-0.822-1.832-3.365-2.282l-2.134-0.375c-0.972-0.187-1.495-0.299-2.207-0.448-2.1 1.045-3.03 2.094-3.03 3.327zm4.86-17.733c-2.244 0-3.629 1.722-3.629 3.891 0 2.058 1.421 3.665 3.629 3.665 2.283 0 3.704-1.682 3.704-3.815 0.01-2.132-1.49-3.741-3.7-3.741z" fill="#131108"/><path d="m137.58 31.416h-12.122c0.112 4.15 2.094 6.098 5.2 6.098 2.583 0 4.453-1.009 6.397-2.544l0.484 2.994c-1.907 1.497-4.188 2.394-7.143 2.394-4.642 0-8.271-2.807-8.271-9.354 0-5.724 3.368-9.239 7.856-9.239 5.199 0 7.595 4.002 7.595 8.94v0.711zm-7.63-7.033c-2.059 0-3.817 1.459-4.34 4.526h8.604c-0.41-2.881-1.68-4.526-4.26-4.526z" fill="#131108"/><path d="m151.61 39.984v-12.16c0-1.832-0.786-3.067-2.73-3.067-1.759 0-3.555 1.161-5.163 2.88v12.347h-3.329v-17.846h2.655l0.412 2.582c1.683-1.533 3.78-2.955 6.321-2.955 3.369 0 5.166 2.019 5.166 5.236v12.983h-3.33z" fill="#131108"/><path d="m164.78 40.284c-3.143 0-5.199-1.124-5.199-4.716v-10.624h-2.694v-2.806h2.694v-5.949l3.255-0.485v6.434h3.853l0.449 2.806h-4.302v10.025c0 1.461 0.599 2.357 2.47 2.357 0.598 0 1.121-0.035 1.531-0.112l0.45 2.843c-0.57 0.112-1.35 0.227-2.51 0.227z" fill="#131108"/><path d="m175.82 40.357c-4.752 0-8.194-3.403-8.194-9.278 0-5.874 3.442-9.314 8.194-9.314 4.787 0 8.305 3.44 8.305 9.314 0 5.875-3.52 9.278-8.3 9.278zm0-15.788c-3.217 0-4.826 2.769-4.826 6.51 0 3.668 1.683 6.511 4.826 6.511 3.291 0 4.938-2.77 4.938-6.511-0.01-3.666-1.73-6.51-4.94-6.51z" fill="#131108"/><path d="m186.48 24.81c-1.338 0-2.268-0.929-2.268-2.318 0-1.379 0.95-2.328 2.268-2.328 1.34 0 2.27 0.939 2.27 2.328 0 1.378-0.95 2.318-2.27 2.318zm0-4.376c-1.078 0-1.938 0.739-1.938 2.058 0 1.31 0.859 2.049 1.938 2.049 1.09 0 1.949-0.739 1.949-2.049 0-1.319-0.87-2.058-1.95-2.058zm0.67 3.297l-0.768-1.099h-0.249v1.059h-0.44v-2.568h0.779c0.54 0 0.898 0.27 0.898 0.75 0 0.37-0.201 0.609-0.52 0.709l0.74 1.049-0.44 0.1zm-0.68-2.209h-0.34v0.759h0.319c0.29 0 0.471-0.12 0.471-0.379 0-0.25-0.16-0.38-0.45-0.38z" fill="#131108"/></svg>
-\ No newline at end of file
-+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.073 50"><style>.st0{fill:#f26322}.st1{fill:#4d4d4d}</style><path class="st0" d="M21.432 0L0 12.373v24.713l6.117 3.533-.041-24.713 15.315-8.842 15.313 8.842v24.706l6.118-3.526V12.35z"/><path class="st0" d="M24.47 40.618l-3.058 1.772-3.071-1.759V15.906l-6.116 3.532.01 24.712 9.172 5.298 9.18-5.298V19.438l-6.117-3.532z"/><path class="st1" d="M56.838 12.522l8.415 21.258h.068l8.21-21.258h3.203V36.88h-2.215V15.656h-.068c-.114.386-.239.772-.374 1.158-.115.318-.246.67-.393 1.055-.147.387-.278.75-.391 1.09l-7.052 17.919h-2.01L57.11 18.96a19.913 19.913 0 0 1-.408-1.039 43.558 43.558 0 0 1-.375-1.073 68.067 68.067 0 0 0-.408-1.192h-.069v21.223h-2.112V12.522h3.1zM83.17 36.982a5.205 5.205 0 0 1-1.823-.92 4.327 4.327 0 0 1-1.209-1.533 4.881 4.881 0 0 1-.443-2.145 5.018 5.018 0 0 1 .579-2.556 4.472 4.472 0 0 1 1.568-1.584 7.927 7.927 0 0 1 2.299-.903 24.732 24.732 0 0 1 2.811-.477 36 36 0 0 0 2.198-.29 6.689 6.689 0 0 0 1.465-.392c.329-.123.614-.343.817-.63.187-.325.276-.698.256-1.073v-.34a3.212 3.212 0 0 0-1.09-2.674 4.93 4.93 0 0 0-3.134-.87c-3.135 0-4.781 1.306-4.941 3.918h-2.077a5.748 5.748 0 0 1 1.891-4.089 7.5 7.5 0 0 1 5.127-1.533 7.335 7.335 0 0 1 4.564 1.278 4.923 4.923 0 0 1 1.67 4.173v9.573c-.034.402.069.804.29 1.141.219.251.536.394.868.392.12-.001.24-.012.358-.034.124-.022.266-.057.425-.102h.103v1.533c-.188.077-.382.14-.58.188-.28.062-.566.091-.852.086a2.694 2.694 0 0 1-1.839-.597 2.575 2.575 0 0 1-.75-1.891v-.374h-.102c-.277.372-.578.725-.903 1.056-.38.385-.81.717-1.278.988a7.14 7.14 0 0 1-1.737.715 8.443 8.443 0 0 1-2.249.272 8.186 8.186 0 0 1-2.282-.306m5.195-1.857a5.971 5.971 0 0 0 1.857-1.175 4.767 4.767 0 0 0 1.499-3.441V27.34a7.295 7.295 0 0 1-2.061.732 33.21 33.21 0 0 1-2.504.426c-.749.114-1.441.233-2.077.358a5.237 5.237 0 0 0-1.652.596 3.055 3.055 0 0 0-1.108 1.107 3.579 3.579 0 0 0-.408 1.824c-.018.53.093 1.056.324 1.533.201.392.493.73.851.987a3.35 3.35 0 0 0 1.244.529c.493.104.995.155 1.499.153a6.555 6.555 0 0 0 2.536-.46M99.35 41.734a4.687 4.687 0 0 1-2.009-3.287h2.043c.14.966.763 1.794 1.652 2.197a7.522 7.522 0 0 0 3.288.664 5.688 5.688 0 0 0 4.173-1.345 4.997 4.997 0 0 0 1.345-3.697v-2.793h-.102a7.293 7.293 0 0 1-2.283 2.282 6.297 6.297 0 0 1-3.304.784 7.375 7.375 0 0 1-3.135-.647 6.921 6.921 0 0 1-2.385-1.806 8.095 8.095 0 0 1-1.516-2.777 11.429 11.429 0 0 1-.528-3.56 10.89 10.89 0 0 1 .613-3.799 8.483 8.483 0 0 1 1.636-2.777 6.75 6.75 0 0 1 2.402-1.703 7.45 7.45 0 0 1 2.913-.58 6.234 6.234 0 0 1 3.372.835 6.938 6.938 0 0 1 2.215 2.265h.102v-2.725h2.078v16.931a6.78 6.78 0 0 1-1.636 4.735 7.751 7.751 0 0 1-5.893 2.112 8.337 8.337 0 0 1-5.041-1.309m9.232-8.908a8.565 8.565 0 0 0 1.397-5.11 11.22 11.22 0 0 0-.34-2.862 6.239 6.239 0 0 0-1.056-2.231 4.828 4.828 0 0 0-1.789-1.448 5.772 5.772 0 0 0-2.503-.511 4.782 4.782 0 0 0-4.071 1.941 8.464 8.464 0 0 0-1.448 5.179c-.008.936.107 1.87.34 2.777a6.64 6.64 0 0 0 1.022 2.214 4.81 4.81 0 0 0 1.703 1.465 5.208 5.208 0 0 0 2.42.528 4.967 4.967 0 0 0 4.325-1.942M119.244 36.624a7.19 7.19 0 0 1-2.572-1.941 8.66 8.66 0 0 1-1.583-2.93 11.839 11.839 0 0 1-.546-3.662 11.179 11.179 0 0 1 .58-3.663 9.138 9.138 0 0 1 1.617-2.929 7.307 7.307 0 0 1 2.522-1.942 7.684 7.684 0 0 1 3.321-.698 7.275 7.275 0 0 1 3.56.8 6.678 6.678 0 0 1 2.351 2.146 8.806 8.806 0 0 1 1.278 3.083 16.87 16.87 0 0 1 .374 3.577h-13.422c.013.941.157 1.875.426 2.777a6.968 6.968 0 0 0 1.124 2.231 5.108 5.108 0 0 0 1.857 1.499 5.948 5.948 0 0 0 2.623.546 4.985 4.985 0 0 0 3.424-1.074 5.875 5.875 0 0 0 1.719-2.878h2.044a7.51 7.51 0 0 1-2.385 4.19 7.072 7.072 0 0 1-4.803 1.567 8.386 8.386 0 0 1-3.509-.699m8.312-12.264a5.986 5.986 0 0 0-.988-1.976 4.525 4.525 0 0 0-1.635-1.311 5.362 5.362 0 0 0-2.351-.478 5.623 5.623 0 0 0-2.368.478 5.064 5.064 0 0 0-1.754 1.311 6.566 6.566 0 0 0-1.141 1.96 9.615 9.615 0 0 0-.562 2.453h11.174a9.268 9.268 0 0 0-.375-2.437M134.879 19.267v2.691h.068a7.237 7.237 0 0 1 2.333-2.197 6.798 6.798 0 0 1 3.561-.868 5.834 5.834 0 0 1 4.037 1.413 5.174 5.174 0 0 1 1.584 4.071V36.88h-2.112V24.581a3.716 3.716 0 0 0-1.073-2.947 4.334 4.334 0 0 0-2.948-.937 5.896 5.896 0 0 0-2.111.375 5.558 5.558 0 0 0-1.738 1.039 4.717 4.717 0 0 0-1.601 3.593V36.88h-2.112V19.267h2.112zM151.912 36.284a2.934 2.934 0 0 1-.92-2.436V21.005h-2.657v-1.738h2.657v-5.416h2.112v5.416h3.271v1.738h-3.271v12.502a1.65 1.65 0 0 0 .426 1.312c.371.265.823.391 1.277.357.258-.001.515-.029.766-.085.215-.043.426-.106.63-.188h.103v1.806a5.907 5.907 0 0 1-1.942.306 3.819 3.819 0 0 1-2.452-.731M162.625 36.624a7.368 7.368 0 0 1-2.571-1.942 8.732 8.732 0 0 1-1.618-2.929 12.217 12.217 0 0 1 0-7.324 8.744 8.744 0 0 1 1.618-2.93 7.386 7.386 0 0 1 2.571-1.942 8.106 8.106 0 0 1 3.424-.698 7.989 7.989 0 0 1 3.406.698 7.424 7.424 0 0 1 2.556 1.942 8.504 8.504 0 0 1 1.601 2.93 12.57 12.57 0 0 1 0 7.324 8.5 8.5 0 0 1-1.601 2.929 7.415 7.415 0 0 1-2.556 1.942 7.959 7.959 0 0 1-3.406.698 8.075 8.075 0 0 1-3.424-.698m6.013-1.652a5.308 5.308 0 0 0 1.873-1.601 7.215 7.215 0 0 0 1.124-2.385 11.348 11.348 0 0 0 0-5.792 7.215 7.215 0 0 0-1.124-2.385 5.289 5.289 0 0 0-1.873-1.601 6.109 6.109 0 0 0-5.195 0 5.497 5.497 0 0 0-1.874 1.601 7.046 7.046 0 0 0-1.141 2.385 11.392 11.392 0 0 0 0 5.792c.227.86.614 1.669 1.141 2.385a5.817 5.817 0 0 0 7.069 1.601M176.856 22.191a2.128 2.128 0 0 1-2.213-2.265 2.216 2.216 0 1 1 4.431 0 2.146 2.146 0 0 1-2.218 2.265m0-4.277a1.845 1.845 0 0 0-1.892 2.012 1.9 1.9 0 1 0 3.797 0 1.854 1.854 0 0 0-1.905-2.012m.653 3.222l-.751-1.073h-.243v1.035h-.43v-2.509h.763c.526 0 .877.264.877.732a.681.681 0 0 1-.508.693l.724 1.025-.432.097zm-.661-2.157h-.333v.741h.312c.283 0 .46-.117.46-.371.001-.244-.158-.37-.439-.37"/></svg>
-diff --git a/lib/web/images/magento-logo.svg b/lib/web/images/magento-logo.svg
-index 0d5cc0e6233..0f29d4e3eef 100644
---- a/lib/web/images/magento-logo.svg
-+++ b/lib/web/images/magento-logo.svg
-@@ -1 +1 @@
--<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="214px" xml:space="preserve" height="62px" viewBox="0 0 214 62" baseProfile="tiny" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="m93.166 44.96l-1.809-23.096-9.17 23.221h-2.988l-9.17-23.221-1.767 23.096h-3.702l2.314-29.026h4.88l9.045 23.809 9.045-23.809h4.836l2.271 29.026h-3.785z" fill="#131108"/><path d="m112.94 44.96l-0.421-2.692c-1.597 1.639-3.785 3.112-7.066 3.112-3.619 0-5.889-2.188-5.889-5.596 0-5.006 4.29-6.981 12.663-7.867v-0.841c0-2.523-1.515-3.407-3.83-3.407-2.439 0-4.754 0.757-6.94 1.725l-0.505-3.238c2.398-0.969 4.67-1.682 7.783-1.682 4.88 0 7.236 1.976 7.236 6.435v14.051h-3.02zm-0.72-10.182c-7.406 0.715-8.963 2.735-8.963 4.796 0 1.642 1.095 2.693 2.989 2.693 2.187 0 4.291-1.095 5.974-2.82v-4.669z" fill="#131108"/><path d="m137.46 24.599l0.546 3.364-3.826 0.378c0.546 0.926 0.799 1.979 0.799 3.113 0 4.292-3.618 6.899-7.699 6.899-0.504 0-1.011-0.042-1.514-0.126-0.589 0.38-1.01 0.844-1.01 1.22 0 0.716 0.714 0.886 4.248 1.517l1.432 0.252c4.249 0.757 6.898 2.102 6.898 5.216 0 4.206-4.586 6.183-9.802 6.183s-9.381-1.64-9.381-5.173c0-2.062 1.431-3.66 4.248-5.174-0.882-0.631-1.26-1.348-1.26-2.104 0-0.969 0.756-1.936 2.103-2.734-2.229-1.095-3.744-3.238-3.744-5.974 0-4.332 3.616-6.981 7.697-6.981 2.019 0 3.786 0.587 5.175 1.682l5.08-1.558zm-15.73 22.547c0 1.599 2.06 2.775 5.972 2.775 3.913 0 6.099-1.345 6.099-3.027 0-1.222-0.924-2.061-3.784-2.566l-2.397-0.422c-1.095-0.208-1.682-0.336-2.481-0.502-2.36 1.177-3.41 2.356-3.41 3.742zm5.47-19.939c-2.522 0-4.081 1.936-4.081 4.375 0 2.313 1.6 4.12 4.081 4.12 2.566 0 4.165-1.892 4.165-4.29 0-2.397-1.68-4.205-4.16-4.205z" fill="#131108"/><path d="m155.3 35.325h-13.631c0.125 4.669 2.354 6.856 5.847 6.856 2.904 0 5.007-1.135 7.193-2.86l0.546 3.367c-2.144 1.682-4.709 2.691-8.031 2.691-5.219 0-9.299-3.155-9.299-10.519 0-6.435 3.787-10.388 8.835-10.388 5.846 0 8.54 4.5 8.54 10.052v0.801zm-8.58-7.908c-2.313 0-4.291 1.641-4.879 5.09h9.675c-0.47-3.239-1.9-5.09-4.8-5.09z" fill="#131108"/><path d="m171.07 44.96v-13.673c0-2.06-0.883-3.449-3.07-3.449-1.977 0-3.996 1.305-5.807 3.239v13.883h-3.743v-20.067h2.986l0.463 2.903c1.893-1.724 4.251-3.323 7.108-3.323 3.786 0 5.808 2.271 5.808 5.888v14.599h-3.75z" fill="#131108"/><path d="m185.88 45.298c-3.532 0-5.846-1.265-5.846-5.304v-11.946h-3.03v-3.156h3.03v-6.688l3.66-0.546v7.234h4.332l0.505 3.156h-4.837v11.273c0 1.643 0.675 2.651 2.776 2.651 0.673 0 1.262-0.041 1.724-0.127l0.506 3.196c-0.63 0.128-1.51 0.257-2.81 0.257z" fill="#131108"/><path d="m198.29 45.38c-5.342 0-9.213-3.827-9.213-10.434 0-6.605 3.871-10.473 9.213-10.473 5.383 0 9.339 3.868 9.339 10.473 0 6.607-3.96 10.434-9.34 10.434zm0-17.753c-3.617 0-5.426 3.113-5.426 7.319 0 4.125 1.892 7.321 5.426 7.321 3.702 0 5.553-3.114 5.553-7.321 0-4.122-1.93-7.319-5.55-7.319z" fill="#131108"/><path d="m210.28 27.897c-1.505 0-2.551-1.045-2.551-2.606 0-1.55 1.067-2.618 2.551-2.618 1.505 0 2.55 1.056 2.55 2.618 0 1.55-1.07 2.606-2.55 2.606zm0-4.92c-1.214 0-2.18 0.831-2.18 2.314 0 1.472 0.966 2.303 2.18 2.303 1.225 0 2.191-0.832 2.191-2.303 0-1.483-0.98-2.314-2.19-2.314zm0.75 3.708l-0.863-1.237h-0.281v1.191h-0.495v-2.888h0.878c0.606 0 1.01 0.303 1.01 0.843 0 0.416-0.225 0.686-0.585 0.798l0.833 1.18-0.5 0.113zm-0.76-2.484h-0.383v0.854h0.359c0.325 0 0.53-0.135 0.53-0.427 0-0.281-0.18-0.427-0.51-0.427z" fill="#131108"/><g fill="#E85D22"><path d="m26.845 8.857"/><polygon points="53.692 15.5 53.692 46.5 46.021 50.929 46.021 19.929 26.845 8.857 7.67 19.928 7.67 50.929 0 46.5 0 15.5 26.845 0"/><polygon points="26.847 62 15.341 55.356 15.341 24.357 23.011 19.928 23.011 50.929 26.845 53.257 30.682 50.929 30.682 19.929 38.353 24.357 38.353 55.356"/></g></svg>
-\ No newline at end of file
-+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.073 50"><style>.st0{fill:#f26322}.st1{fill:#4d4d4d}</style><path class="st0" d="M21.432 0L0 12.373v24.713l6.117 3.533-.041-24.713 15.315-8.842 15.313 8.842v24.706l6.118-3.526V12.35z"/><path class="st0" d="M24.47 40.618l-3.058 1.772-3.071-1.759V15.906l-6.116 3.532.01 24.712 9.172 5.298 9.18-5.298V19.438l-6.117-3.532z"/><path class="st1" d="M56.838 12.522l8.415 21.258h.068l8.21-21.258h3.203V36.88h-2.215V15.656h-.068c-.114.386-.239.772-.374 1.158-.115.318-.246.67-.393 1.055-.147.387-.278.75-.391 1.09l-7.052 17.919h-2.01L57.11 18.96a19.913 19.913 0 0 1-.408-1.039 43.558 43.558 0 0 1-.375-1.073 68.067 68.067 0 0 0-.408-1.192h-.069v21.223h-2.112V12.522h3.1zM83.17 36.982a5.205 5.205 0 0 1-1.823-.92 4.327 4.327 0 0 1-1.209-1.533 4.881 4.881 0 0 1-.443-2.145 5.018 5.018 0 0 1 .579-2.556 4.472 4.472 0 0 1 1.568-1.584 7.927 7.927 0 0 1 2.299-.903 24.732 24.732 0 0 1 2.811-.477 36 36 0 0 0 2.198-.29 6.689 6.689 0 0 0 1.465-.392c.329-.123.614-.343.817-.63.187-.325.276-.698.256-1.073v-.34a3.212 3.212 0 0 0-1.09-2.674 4.93 4.93 0 0 0-3.134-.87c-3.135 0-4.781 1.306-4.941 3.918h-2.077a5.748 5.748 0 0 1 1.891-4.089 7.5 7.5 0 0 1 5.127-1.533 7.335 7.335 0 0 1 4.564 1.278 4.923 4.923 0 0 1 1.67 4.173v9.573c-.034.402.069.804.29 1.141.219.251.536.394.868.392.12-.001.24-.012.358-.034.124-.022.266-.057.425-.102h.103v1.533c-.188.077-.382.14-.58.188-.28.062-.566.091-.852.086a2.694 2.694 0 0 1-1.839-.597 2.575 2.575 0 0 1-.75-1.891v-.374h-.102c-.277.372-.578.725-.903 1.056-.38.385-.81.717-1.278.988a7.14 7.14 0 0 1-1.737.715 8.443 8.443 0 0 1-2.249.272 8.186 8.186 0 0 1-2.282-.306m5.195-1.857a5.971 5.971 0 0 0 1.857-1.175 4.767 4.767 0 0 0 1.499-3.441V27.34a7.295 7.295 0 0 1-2.061.732 33.21 33.21 0 0 1-2.504.426c-.749.114-1.441.233-2.077.358a5.237 5.237 0 0 0-1.652.596 3.055 3.055 0 0 0-1.108 1.107 3.579 3.579 0 0 0-.408 1.824c-.018.53.093 1.056.324 1.533.201.392.493.73.851.987a3.35 3.35 0 0 0 1.244.529c.493.104.995.155 1.499.153a6.555 6.555 0 0 0 2.536-.46M99.35 41.734a4.687 4.687 0 0 1-2.009-3.287h2.043c.14.966.763 1.794 1.652 2.197a7.522 7.522 0 0 0 3.288.664 5.688 5.688 0 0 0 4.173-1.345 4.997 4.997 0 0 0 1.345-3.697v-2.793h-.102a7.293 7.293 0 0 1-2.283 2.282 6.297 6.297 0 0 1-3.304.784 7.375 7.375 0 0 1-3.135-.647 6.921 6.921 0 0 1-2.385-1.806 8.095 8.095 0 0 1-1.516-2.777 11.429 11.429 0 0 1-.528-3.56 10.89 10.89 0 0 1 .613-3.799 8.483 8.483 0 0 1 1.636-2.777 6.75 6.75 0 0 1 2.402-1.703 7.45 7.45 0 0 1 2.913-.58 6.234 6.234 0 0 1 3.372.835 6.938 6.938 0 0 1 2.215 2.265h.102v-2.725h2.078v16.931a6.78 6.78 0 0 1-1.636 4.735 7.751 7.751 0 0 1-5.893 2.112 8.337 8.337 0 0 1-5.041-1.309m9.232-8.908a8.565 8.565 0 0 0 1.397-5.11 11.22 11.22 0 0 0-.34-2.862 6.239 6.239 0 0 0-1.056-2.231 4.828 4.828 0 0 0-1.789-1.448 5.772 5.772 0 0 0-2.503-.511 4.782 4.782 0 0 0-4.071 1.941 8.464 8.464 0 0 0-1.448 5.179c-.008.936.107 1.87.34 2.777a6.64 6.64 0 0 0 1.022 2.214 4.81 4.81 0 0 0 1.703 1.465 5.208 5.208 0 0 0 2.42.528 4.967 4.967 0 0 0 4.325-1.942M119.244 36.624a7.19 7.19 0 0 1-2.572-1.941 8.66 8.66 0 0 1-1.583-2.93 11.839 11.839 0 0 1-.546-3.662 11.179 11.179 0 0 1 .58-3.663 9.138 9.138 0 0 1 1.617-2.929 7.307 7.307 0 0 1 2.522-1.942 7.684 7.684 0 0 1 3.321-.698 7.275 7.275 0 0 1 3.56.8 6.678 6.678 0 0 1 2.351 2.146 8.806 8.806 0 0 1 1.278 3.083 16.87 16.87 0 0 1 .374 3.577h-13.422c.013.941.157 1.875.426 2.777a6.968 6.968 0 0 0 1.124 2.231 5.108 5.108 0 0 0 1.857 1.499 5.948 5.948 0 0 0 2.623.546 4.985 4.985 0 0 0 3.424-1.074 5.875 5.875 0 0 0 1.719-2.878h2.044a7.51 7.51 0 0 1-2.385 4.19 7.072 7.072 0 0 1-4.803 1.567 8.386 8.386 0 0 1-3.509-.699m8.312-12.264a5.986 5.986 0 0 0-.988-1.976 4.525 4.525 0 0 0-1.635-1.311 5.362 5.362 0 0 0-2.351-.478 5.623 5.623 0 0 0-2.368.478 5.064 5.064 0 0 0-1.754 1.311 6.566 6.566 0 0 0-1.141 1.96 9.615 9.615 0 0 0-.562 2.453h11.174a9.268 9.268 0 0 0-.375-2.437M134.879 19.267v2.691h.068a7.237 7.237 0 0 1 2.333-2.197 6.798 6.798 0 0 1 3.561-.868 5.834 5.834 0 0 1 4.037 1.413 5.174 5.174 0 0 1 1.584 4.071V36.88h-2.112V24.581a3.716 3.716 0 0 0-1.073-2.947 4.334 4.334 0 0 0-2.948-.937 5.896 5.896 0 0 0-2.111.375 5.558 5.558 0 0 0-1.738 1.039 4.717 4.717 0 0 0-1.601 3.593V36.88h-2.112V19.267h2.112zM151.912 36.284a2.934 2.934 0 0 1-.92-2.436V21.005h-2.657v-1.738h2.657v-5.416h2.112v5.416h3.271v1.738h-3.271v12.502a1.65 1.65 0 0 0 .426 1.312c.371.265.823.391 1.277.357.258-.001.515-.029.766-.085.215-.043.426-.106.63-.188h.103v1.806a5.907 5.907 0 0 1-1.942.306 3.819 3.819 0 0 1-2.452-.731M162.625 36.624a7.368 7.368 0 0 1-2.571-1.942 8.732 8.732 0 0 1-1.618-2.929 12.217 12.217 0 0 1 0-7.324 8.744 8.744 0 0 1 1.618-2.93 7.386 7.386 0 0 1 2.571-1.942 8.106 8.106 0 0 1 3.424-.698 7.989 7.989 0 0 1 3.406.698 7.424 7.424 0 0 1 2.556 1.942 8.504 8.504 0 0 1 1.601 2.93 12.57 12.57 0 0 1 0 7.324 8.5 8.5 0 0 1-1.601 2.929 7.415 7.415 0 0 1-2.556 1.942 7.959 7.959 0 0 1-3.406.698 8.075 8.075 0 0 1-3.424-.698m6.013-1.652a5.308 5.308 0 0 0 1.873-1.601 7.215 7.215 0 0 0 1.124-2.385 11.348 11.348 0 0 0 0-5.792 7.215 7.215 0 0 0-1.124-2.385 5.289 5.289 0 0 0-1.873-1.601 6.109 6.109 0 0 0-5.195 0 5.497 5.497 0 0 0-1.874 1.601 7.046 7.046 0 0 0-1.141 2.385 11.392 11.392 0 0 0 0 5.792c.227.86.614 1.669 1.141 2.385a5.817 5.817 0 0 0 7.069 1.601M176.856 22.191a2.128 2.128 0 0 1-2.213-2.265 2.216 2.216 0 1 1 4.431 0 2.146 2.146 0 0 1-2.218 2.265m0-4.277a1.845 1.845 0 0 0-1.892 2.012 1.9 1.9 0 1 0 3.797 0 1.854 1.854 0 0 0-1.905-2.012m.653 3.222l-.751-1.073h-.243v1.035h-.43v-2.509h.763c.526 0 .877.264.877.732a.681.681 0 0 1-.508.693l.724 1.025-.432.097zm-.661-2.157h-.333v.741h.312c.283 0 .46-.117.46-.371.001-.244-.158-.37-.439-.37"/></svg>
-diff --git a/lib/web/jquery.js b/lib/web/jquery.js
-index e845f7db2ae..6190232d75b 100644
---- a/lib/web/jquery.js
-+++ b/lib/web/jquery.js
-@@ -12,6 +12,11 @@
-  * Date: 2016-05-20T17:17Z
-  */
- 
-+/*
-+ * includes patch for CVE-2019-11358
-+ * prototype pollution vulnerability in jQuery before 3.4.0
-+ */
-+
- (function( global, factory ) {
- 
- 	if ( typeof module === "object" && typeof module.exports === "object" ) {
-@@ -209,8 +214,9 @@
- 					src = target[ name ];
- 					copy = options[ name ];
- 
-+					// Prevent Object.prototype pollution
- 					// Prevent never-ending loop
--					if ( target === copy ) {
-+					if ( name === "__proto__" || target === copy ) {
- 						continue;
- 					}
- 
-@@ -7705,7 +7711,7 @@
- 				value = hooks.expand( value );
- 				delete props[ name ];
- 
--				// not quite $.extend, this wont overwrite keys already present.
-+				// not quite $.extend, this won't overwrite keys already present.
- 				// also - reusing 'index' from above because we have the correct "name"
- 				for ( index in value ) {
- 					if ( !( index in props ) ) {
-diff --git a/lib/web/jquery/editableMultiselect/js/jquery.editable.js b/lib/web/jquery/editableMultiselect/js/jquery.editable.js
-index 87e5049db03..6c9f0a4373d 100644
---- a/lib/web/jquery/editableMultiselect/js/jquery.editable.js
-+++ b/lib/web/jquery/editableMultiselect/js/jquery.editable.js
-@@ -129,7 +129,7 @@
-                     return;
-                 }
- 
--                /* prevent throwing an exeption if edit field is clicked again */
-+                /* prevent throwing an exception if edit field is clicked again */
-                 if (self.editing) {
-                     return;
-                 }
-@@ -191,7 +191,7 @@
-                 if (settings.style) {
-                     if ('inherit' == settings.style) {
-                         form.attr('style', $(self).attr('style'));
--                        /* IE needs the second line or display wont be inherited */
-+                        /* IE needs the second line or display won't be inherited */
-                         form.css('display', $(self).css('display'));
-                     } else {
-                         form.attr('style', settings.style);
-diff --git a/lib/web/jquery/fileUploader/css/jquery.fileupload-ui.css b/lib/web/jquery/fileUploader/css/jquery.fileupload-ui.css
-index e36a93df36b..44b628efb48 100644
---- a/lib/web/jquery/fileUploader/css/jquery.fileupload-ui.css
-+++ b/lib/web/jquery/fileUploader/css/jquery.fileupload-ui.css
-@@ -52,17 +52,6 @@
-   display: block;
- }
- 
--/* Fix for IE 6: */
--*html .fileinput-button {
--  line-height: 22px;
--  margin: 1px -3px 0 0;
--}
--
--/* Fix for IE 7: */
--*+html .fileinput-button {
--  margin: 1px 0 0 0;
--}
--
- @media (max-width: 480px) {
-   .files .btn span {
-     display: none;
-diff --git a/lib/web/jquery/jquery.min.js b/lib/web/jquery/jquery.min.js
-index bfe47d63917..ad2aa21ba94 100644
---- a/lib/web/jquery/jquery.min.js
-+++ b/lib/web/jquery/jquery.min.js
-@@ -1,5 +1,6 @@
- /*! jQuery v1.12.4 | (c) jQuery Foundation | jquery.org/license */
--!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=R.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0;
-+/* includes patch for CVE-2019-11358 - prototype pollution vulnerability in jQuery before 3.4.0 */
-+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],d!=="__proto__"&&g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=R.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0;
- }return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),"object"!=typeof b&&"function"!=typeof b||(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}}),function(){var a;l.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,e;return c=d.getElementsByTagName("body")[0],c&&c.style?(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(d.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(e),a):void 0}}();var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),V=["Top","Right","Bottom","Left"],W=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function X(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&U.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var Y=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)Y(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",l.leadingWhitespace=3===a.firstChild.nodeType,l.tbody=!a.getElementsByTagName("tbody").length,l.htmlSerialize=!!a.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==d.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,b.appendChild(c),l.appendChecked=c.checked,a.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/<tbody/i;function ia(a){Z.test(a.type)&&(a.defaultChecked=a.checked)}function ja(a,b,c,d,e){for(var f,g,h,i,j,k,m,o=a.length,p=ca(b),q=[],r=0;o>r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?"<table>"!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ma.test(f)?this.mouseHooks:la.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=g.srcElement||d),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,h.filter?h.filter(a,g):a},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,e,f,g=b.button,h=b.fromElement;return null==a.pageX&&null!=b.clientX&&(e=a.target.ownerDocument||d,f=e.documentElement,c=e.body,a.pageX=b.clientX+(f&&f.scrollLeft||c&&c.scrollLeft||0)-(f&&f.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(f&&f.scrollTop||c&&c.scrollTop||0)-(f&&f.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&h&&(a.relatedTarget=h===a.target?b.toElement:h),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==ra()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===ra()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b),d.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=d.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)}:function(a,b,c){var d="on"+b;a.detachEvent&&("undefined"==typeof a[d]&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?pa:qa):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={constructor:n.Event,isDefaultPrevented:qa,isPropagationStopped:qa,isImmediatePropagationStopped:qa,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=pa,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=pa,a&&!this.isSimulated&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=pa,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||n.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submit||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?n.prop(b,"form"):void 0;c&&!n._data(c,"submit")&&(n.event.add(c,"submit._submit",function(a){a._submitBubble=!0}),n._data(c,"submit",!0))})},postDispatch:function(a){a._submitBubble&&(delete a._submitBubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.change||(n.event.special.change={setup:function(){return ka.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._justChanged=!0)}),n.event.add(this,"click._change",function(a){this._justChanged&&!a.isTrigger&&(this._justChanged=!1),n.event.simulate("change",this,a)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;ka.test(b.nodeName)&&!n._data(b,"change")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a)}),n._data(b,"change",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!ka.test(this.nodeName)}}),l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d){return sa(this,a,b,c,d)},one:function(a,b,c,d){return sa(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=qa),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var ta=/ jQuery\d+="(?:null|\d+)"/g,ua=new RegExp("<(?:"+ba+")[\\s/>]","i"),va=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,wa=/<script|<style|<link/i,xa=/checked\s*(?:[^=]|=\s*.checked.)/i,ya=/^true\/(.*)/,za=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Ja[0].contentWindow||Ja[0].contentDocument).document,b.write(),b.close(),c=La(a,b),Ja.detach()),Ka[a]=c),c}var Na=/^margin/,Oa=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Pa=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e},Qa=d.documentElement;!function(){var b,c,e,f,g,h,i=d.createElement("div"),j=d.createElement("div");if(j.style){j.style.cssText="float:left;opacity:.5",l.opacity="0.5"===j.style.opacity,l.cssFloat=!!j.style.cssFloat,j.style.backgroundClip="content-box",j.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===j.style.backgroundClip,i=d.createElement("div"),i.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",j.innerHTML="",i.appendChild(j),l.boxSizing=""===j.style.boxSizing||""===j.style.MozBoxSizing||""===j.style.WebkitBoxSizing,n.extend(l,{reliableHiddenOffsets:function(){return null==b&&k(),f},boxSizingReliable:function(){return null==b&&k(),e},pixelMarginRight:function(){return null==b&&k(),c},pixelPosition:function(){return null==b&&k(),b},reliableMarginRight:function(){return null==b&&k(),g},reliableMarginLeft:function(){return null==b&&k(),h}});function k(){var k,l,m=d.documentElement;m.appendChild(i),j.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",b=e=h=!1,c=g=!0,a.getComputedStyle&&(l=a.getComputedStyle(j),b="1%"!==(l||{}).top,h="2px"===(l||{}).marginLeft,e="4px"===(l||{width:"4px"}).width,j.style.marginRight="50%",c="4px"===(l||{marginRight:"4px"}).marginRight,k=j.appendChild(d.createElement("div")),k.style.cssText=j.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",k.style.marginRight=k.style.width="0",j.style.width="1px",g=!parseFloat((a.getComputedStyle(k)||{}).marginRight),j.removeChild(k)),j.style.display="none",f=0===j.getClientRects().length,f&&(j.style.display="",j.innerHTML="<table><tr><td></td><td>t</td></tr></table>",j.childNodes[0].style.borderCollapse="separate",k=j.getElementsByTagName("td"),k[0].style.cssText="margin:0;border:0;padding:0;display:none",f=0===k[0].offsetHeight,f&&(k[0].style.display="",k[1].style.display="none",f=0===k[0].offsetHeight)),m.removeChild(i)}}}();var Ra,Sa,Ta=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ra=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c.getPropertyValue(b)||c[b]:void 0,""!==g&&void 0!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),c&&!l.pixelMarginRight()&&Oa.test(g)&&Na.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f),void 0===g?g:g+""}):Qa.currentStyle&&(Ra=function(a){return a.currentStyle},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Oa.test(g)&&!Ta.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Ua(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Va=/alpha\([^)]*\)/i,Wa=/opacity\s*=\s*([^)]*)/i,Xa=/^(none|table(?!-c[ea]).+)/,Ya=new RegExp("^("+T+")(.*)$","i"),Za={position:"absolute",visibility:"hidden",display:"block"},$a={letterSpacing:"0",fontWeight:"400"},_a=["Webkit","O","Moz","ms"],ab=d.createElement("div").style;function bb(a){if(a in ab)return a;var b=a.charAt(0).toUpperCase()+a.slice(1),c=_a.length;while(c--)if(a=_a[c]+b,a in ab)return a}function cb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&W(d)&&(f[g]=n._data(d,"olddisplay",Ma(d.nodeName)))):(e=W(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function db(a,b,c){var d=Ya.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function eb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+V[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+V[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+V[f]+"Width",!0,e))):(g+=n.css(a,"padding"+V[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+V[f]+"Width",!0,e)));return g}function fb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ra(a),g=l.boxSizing&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Sa(a,b,f),(0>e||null==e)&&(e=a.style[b]),Oa.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+eb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Sa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=U.exec(c))&&e[1]&&(c=X(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Sa(a,b,d)),"normal"===f&&b in $a&&(f=$a[b]),""===c||c?(e=parseFloat(f),c===!0||isFinite(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Xa.test(n.css(a,"display"))&&0===a.offsetWidth?Pa(a,Za,function(){return fb(a,b,d)}):fb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ra(a);return db(a,c,d?eb(a,b,d,l.boxSizing&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Wa.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Va,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Va.test(f)?f.replace(Va,e):f+" "+e)}}),n.cssHooks.marginRight=Ua(l.reliableMarginRight,function(a,b){return b?Pa(a,{display:"inline-block"},Sa,[a,"marginRight"]):void 0}),n.cssHooks.marginLeft=Ua(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Sa(a,"marginLeft"))||(n.contains(a.ownerDocument,a)?a.getBoundingClientRect().left-Pa(a,{
-     marginLeft:0},function(){return a.getBoundingClientRect().left}):0))+"px":void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+V[d]+b]=f[d]||f[d-2]||f[0];return e}},Na.test(a)||(n.cssHooks[a+b].set=db)}),n.fn.extend({css:function(a,b){return Y(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ra(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return cb(this,!0)},hide:function(){return cb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){W(this)?n(this).show():n(this).hide()})}});function gb(a,b,c,d,e){return new gb.prototype.init(a,b,c,d,e)}n.Tween=gb,gb.prototype={constructor:gb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=gb.propHooks[this.prop];return a&&a.get?a.get(this):gb.propHooks._default.get(this)},run:function(a){var b,c=gb.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):gb.propHooks._default.set(this),this}},gb.prototype.init.prototype=gb.prototype,gb.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},gb.propHooks.scrollTop=gb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},n.fx=gb.prototype.init,n.fx.step={};var hb,ib,jb=/^(?:toggle|show|hide)$/,kb=/queueHooks$/;function lb(){return a.setTimeout(function(){hb=void 0}),hb=n.now()}function mb(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=V[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function nb(a,b,c){for(var d,e=(qb.tweeners[b]||[]).concat(qb.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ob(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&W(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k="none"===j?n._data(a,"olddisplay")||Ma(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==Ma(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],jb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(o))"inline"===("none"===j?Ma(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=nb(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function pb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function qb(a,b,c){var d,e,f=0,g=qb.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=hb||lb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:hb||lb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(pb(k,j.opts.specialEasing);g>f;f++)if(d=qb.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,nb,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(qb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return X(c.elem,a,U.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],qb.tweeners[c]=qb.tweeners[c]||[],qb.tweeners[c].unshift(b)},prefilters:[ob],prefilter:function(a,b){b?qb.prefilters.unshift(a):qb.prefilters.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,null!=d.queue&&d.queue!==!0||(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(W).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=qb(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&kb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(mb(b,!0),a,d,e)}}),n.each({slideDown:mb("show"),slideUp:mb("hide"),slideToggle:mb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(hb=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),hb=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ib||(ib=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(ib),ib=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a,b=d.createElement("input"),c=d.createElement("div"),e=d.createElement("select"),f=e.appendChild(d.createElement("option"));c=d.createElement("div"),c.setAttribute("className","t"),c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],b.setAttribute("type","checkbox"),c.appendChild(b),a=c.getElementsByTagName("a")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==c.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=f.selected,l.enctype=!!d.createElement("form").enctype,e.disabled=!0,l.optDisabled=!f.disabled,b=d.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value}();var rb=/\r/g,sb=/[\x20\t\r\n\f]+/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(rb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a)).replace(sb," ")}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],(c.selected||i===e)&&(l.optDisabled?!c.disabled:null===c.getAttribute("disabled"))&&(!c.parentNode.disabled||!n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>-1)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var tb,ub,vb=n.expr.attrHandle,wb=/^(?:checked|selected)$/i,xb=l.getSetAttribute,yb=l.input;n.fn.extend({attr:function(a,b){return Y(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?ub:tb)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?yb&&xb||!wb.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(xb?c:d)}}),ub={set:function(a,b,c){return b===!1?n.removeAttr(a,c):yb&&xb||!wb.test(c)?a.setAttribute(!xb&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=vb[b]||n.find.attr;yb&&xb||!wb.test(b)?vb[b]=function(a,b,d){var e,f;return d||(f=vb[b],vb[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,vb[b]=f),e}:vb[b]=function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),yb&&xb||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):tb&&tb.set(a,b,c)}}),xb||(tb={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},vb.id=vb.name=vb.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:tb.set},n.attrHooks.contenteditable={set:function(a,b,c){tb.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var zb=/^(?:input|select|textarea|button|object)$/i,Ab=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return Y(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):zb.test(a.nodeName)||Ab.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var Bb=/[\t\r\n\f]/g;function Cb(a){return n.attr(a,"class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,Cb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=Cb(c),d=1===c.nodeType&&(" "+e+" ").replace(Bb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&n.attr(c,"class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,Cb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=Cb(c),d=1===c.nodeType&&(" "+e+" ").replace(Bb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&n.attr(c,"class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,Cb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=Cb(this),b&&n._data(this,"__className__",b),n.attr(this,"class",b||a===!1?"":n._data(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+Cb(c)+" ").replace(Bb," ").indexOf(b)>-1)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Db=a.location,Eb=n.now(),Fb=/\?/,Gb=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(Gb,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new a.DOMParser,c=d.parseFromString(b,"text/xml")):(c=new a.ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var Hb=/#.*$/,Ib=/([?&])_=[^&]*/,Jb=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Kb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Lb=/^(?:GET|HEAD)$/,Mb=/^\/\//,Nb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ob={},Pb={},Qb="*/".concat("*"),Rb=Db.href,Sb=Nb.exec(Rb.toLowerCase())||[];function Tb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Ub(a,b,c,d){var e={},f=a===Pb;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Vb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Wb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Xb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Rb,type:"GET",isLocal:Kb.test(Sb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Qb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Vb(Vb(a,n.ajaxSettings),b):Vb(n.ajaxSettings,a)},ajaxPrefilter:Tb(Ob),ajaxTransport:Tb(Pb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var d,e,f,g,h,i,j,k,l=n.ajaxSetup({},c),m=l.context||l,o=l.context&&(m.nodeType||m.jquery)?n(m):n.event,p=n.Deferred(),q=n.Callbacks("once memory"),r=l.statusCode||{},s={},t={},u=0,v="canceled",w={readyState:0,getResponseHeader:function(a){var b;if(2===u){if(!k){k={};while(b=Jb.exec(g))k[b[1].toLowerCase()]=b[2]}b=k[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===u?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return u||(a=t[c]=t[c]||a,s[a]=b),this},overrideMimeType:function(a){return u||(l.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>u)for(b in a)r[b]=[r[b],a[b]];else w.always(a[w.status]);return this},abort:function(a){var b=a||v;return j&&j.abort(b),y(0,b),this}};if(p.promise(w).complete=q.add,w.success=w.done,w.error=w.fail,l.url=((b||l.url||Rb)+"").replace(Hb,"").replace(Mb,Sb[1]+"//"),l.type=c.method||c.type||l.method||l.type,l.dataTypes=n.trim(l.dataType||"*").toLowerCase().match(G)||[""],null==l.crossDomain&&(d=Nb.exec(l.url.toLowerCase()),l.crossDomain=!(!d||d[1]===Sb[1]&&d[2]===Sb[2]&&(d[3]||("http:"===d[1]?"80":"443"))===(Sb[3]||("http:"===Sb[1]?"80":"443")))),l.data&&l.processData&&"string"!=typeof l.data&&(l.data=n.param(l.data,l.traditional)),Ub(Ob,l,c,w),2===u)return w;i=n.event&&l.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),l.type=l.type.toUpperCase(),l.hasContent=!Lb.test(l.type),f=l.url,l.hasContent||(l.data&&(f=l.url+=(Fb.test(f)?"&":"?")+l.data,delete l.data),l.cache===!1&&(l.url=Ib.test(f)?f.replace(Ib,"$1_="+Eb++):f+(Fb.test(f)?"&":"?")+"_="+Eb++)),l.ifModified&&(n.lastModified[f]&&w.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&w.setRequestHeader("If-None-Match",n.etag[f])),(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&w.setRequestHeader("Content-Type",l.contentType),w.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+("*"!==l.dataTypes[0]?", "+Qb+"; q=0.01":""):l.accepts["*"]);for(e in l.headers)w.setRequestHeader(e,l.headers[e]);if(l.beforeSend&&(l.beforeSend.call(m,w,l)===!1||2===u))return w.abort();v="abort";for(e in{success:1,error:1,complete:1})w[e](l[e]);if(j=Ub(Pb,l,c,w)){if(w.readyState=1,i&&o.trigger("ajaxSend",[w,l]),2===u)return w;l.async&&l.timeout>0&&(h=a.setTimeout(function(){w.abort("timeout")},l.timeout));try{u=1,j.send(s,y)}catch(x){if(!(2>u))throw x;y(-1,x)}}else y(-1,"No Transport");function y(b,c,d,e){var k,s,t,v,x,y=c;2!==u&&(u=2,h&&a.clearTimeout(h),j=void 0,g=e||"",w.readyState=b>0?4:0,k=b>=200&&300>b||304===b,d&&(v=Wb(l,w,d)),v=Xb(l,v,w,k),k?(l.ifModified&&(x=w.getResponseHeader("Last-Modified"),x&&(n.lastModified[f]=x),x=w.getResponseHeader("etag"),x&&(n.etag[f]=x)),204===b||"HEAD"===l.type?y="nocontent":304===b?y="notmodified":(y=v.state,s=v.data,t=v.error,k=!t)):(t=y,!b&&y||(y="error",0>b&&(b=0))),w.status=b,w.statusText=(c||y)+"",k?p.resolveWith(m,[s,y,w]):p.rejectWith(m,[w,y,t]),w.statusCode(r),r=void 0,i&&o.trigger(k?"ajaxSuccess":"ajaxError",[w,l,k?s:t]),q.fireWith(m,[w,y]),i&&(o.trigger("ajaxComplete",[w,l]),--n.active||n.event.trigger("ajaxStop")))}return w},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&a))}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}});function Yb(a){return a.style&&a.style.display||n.css(a,"display")}function Zb(a){if(!n.contains(a.ownerDocument||d,a))return!0;while(a&&1===a.nodeType){if("none"===Yb(a)||"hidden"===a.type)return!0;a=a.parentNode}return!1}n.expr.filters.hidden=function(a){return l.reliableHiddenOffsets()?a.offsetWidth<=0&&a.offsetHeight<=0&&!a.getClientRects().length:Zb(a)},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var $b=/%20/g,_b=/\[\]$/,ac=/\r?\n/g,bc=/^(?:submit|button|image|reset|file)$/i,cc=/^(?:input|select|textarea|keygen)/i;function dc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||_b.test(a)?d(a,e):dc(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)dc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)dc(c,a[c],b,e);return d.join("&").replace($b,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&cc.test(this.nodeName)&&!bc.test(a)&&(this.checked||!Z.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(ac,"\r\n")}}):{name:b.name,value:c.replace(ac,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return this.isLocal?ic():d.documentMode>8?hc():/^(get|post|head|put|delete|options)$/i.test(this.type)&&hc()||ic()}:hc;var ec=0,fc={},gc=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in fc)fc[a](void 0,!0)}),l.cors=!!gc&&"withCredentials"in gc,gc=l.ajax=!!gc,gc&&n.ajaxTransport(function(b){if(!b.crossDomain||l.cors){var c;return{send:function(d,e){var f,g=b.xhr(),h=++ec;if(g.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(f in b.xhrFields)g[f]=b.xhrFields[f];b.mimeType&&g.overrideMimeType&&g.overrideMimeType(b.mimeType),b.crossDomain||d["X-Requested-With"]||(d["X-Requested-With"]="XMLHttpRequest");for(f in d)void 0!==d[f]&&g.setRequestHeader(f,d[f]+"");g.send(b.hasContent&&b.data||null),c=function(a,d){var f,i,j;if(c&&(d||4===g.readyState))if(delete fc[h],c=void 0,g.onreadystatechange=n.noop,d)4!==g.readyState&&g.abort();else{j={},f=g.status,"string"==typeof g.responseText&&(j.text=g.responseText);try{i=g.statusText}catch(k){i=""}f||!b.isLocal||b.crossDomain?1223===f&&(f=204):f=j.text?200:404}j&&e(f,i,j,g.getAllResponseHeaders())},b.async?4===g.readyState?a.setTimeout(c):g.onreadystatechange=fc[h]=c:c()},abort:function(){c&&c(void 0,!0)}}}});function hc(){try{return new a.XMLHttpRequest}catch(b){}}function ic(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=d.head||n("head")[0]||d.documentElement;return{send:function(e,f){b=d.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||f(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var jc=[],kc=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=jc.pop()||n.expando+"_"+Eb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(kc.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&kc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(kc,"$1"+e):b.jsonp!==!1&&(b.url+=(Fb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,jc.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||d;var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ja([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var lc=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&lc)return lc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=n.trim(a.slice(h,a.length)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function mc(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?("undefined"!=typeof e.getBoundingClientRect&&(d=e.getBoundingClientRect()),c=mc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Qa})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return Y(this,function(a,d,e){var f=mc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ua(l.pixelPosition,function(a,c){return c?(c=Sa(a,b),Oa.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({
-     padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return Y(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var nc=a.jQuery,oc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=oc),b&&a.jQuery===n&&(a.jQuery=nc),n},b||(a.jQuery=a.$=n),n});
-\ No newline at end of file
-diff --git a/lib/web/jquery/jquery.mobile.custom.js b/lib/web/jquery/jquery.mobile.custom.js
-index 3b02f534648..f289b97b91d 100644
---- a/lib/web/jquery/jquery.mobile.custom.js
-+++ b/lib/web/jquery/jquery.mobile.custom.js
-@@ -1,141 +1,25 @@
- /*
--* jQuery Mobile v1.5.0-alpha.1
-+* jQuery Mobile v1.4.3
- * http://jquerymobile.com
- *
--* Copyright jQuery Foundation, Inc. and other contributors
-+* Copyright 2010, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- */
- 
- (function ( root, doc, factory ) {
--    if ( typeof define === "function" && define.amd ) {
--        // AMD. Register as an anonymous module.
--        define( [ "jquery" ], function ( $ ) {
--            factory( $, root, doc );
--            return $.mobile;
--        });
--    } else {
--        // Browser globals
--        factory( root.jQuery, root, doc );
--    }
--}( this, document, function ( jQuery, window, document, undefined ) {/*!
-- * jQuery Mobile Scroll Events @VERSION
-- * http://jquerymobile.com
-- *
-- * Copyright jQuery Foundation and other contributors
-- * Released under the MIT license.
-- * http://jquery.org/license
-- */
--
--//>>label: Scroll
--//>>group: Events
--//>>description: Scroll events including: scrollstart, scrollstop
--
--    ( function( factory ) {
--        if ( typeof define === "function" && define.amd ) {
--
--            // AMD. Register as an anonymous module.
--            define( 'events/scroll',[ "jquery" ], factory );
--        } else {
--
--            // Browser globals
--            factory( jQuery );
--        }
--    } )( function( $ ) {
--
--        var scrollEvent = "touchmove scroll";
--
--// setup new event shortcuts
--        $.each( [ "scrollstart", "scrollstop" ], function( i, name ) {
--
--            $.fn[ name ] = function( fn ) {
--                return fn ? this.bind( name, fn ) : this.trigger( name );
--            };
--
--            // jQuery < 1.8
--            if ( $.attrFn ) {
--                $.attrFn[ name ] = true;
--            }
--        } );
--
--// also handles scrollstop
--        $.event.special.scrollstart = {
--
--            enabled: true,
--            setup: function() {
--
--                var thisObject = this,
--                    $this = $( thisObject ),
--                    scrolling,
--                    timer;
--
--                function trigger( event, state ) {
--                    var originalEventType = event.type;
--
--                    scrolling = state;
--
--                    event.type = scrolling ? "scrollstart" : "scrollstop";
--                    $.event.dispatch.call( thisObject, event );
--                    event.type = originalEventType;
--                }
--
--                var scrollStartHandler = $.event.special.scrollstart.handler = function ( event ) {
--
--                    if ( !$.event.special.scrollstart.enabled ) {
--                        return;
--                    }
--
--                    if ( !scrolling ) {
--                        trigger( event, true );
--                    }
--
--                    clearTimeout( timer );
--                    timer = setTimeout( function() {
--                        trigger( event, false );
--                    }, 50 );
--                };
--
--                // iPhone triggers scroll after a small delay; use touchmove instead
--                $this.on( scrollEvent, scrollStartHandler );
--            },
--            teardown: function() {
--                $( this ).off( scrollEvent, $.event.special.scrollstart.handler );
--            }
--        };
--
--        $.each( {
--            scrollstop: "scrollstart"
--        }, function( event, sourceEvent ) {
--
--            $.event.special[ event ] = {
--                setup: function() {
--                    $( this ).bind( sourceEvent, $.noop );
--                },
--                teardown: function() {
--                    $( this ).unbind( sourceEvent );
--                }
--            };
--        } );
--
--        return $.event.special;
--    } );
--
--    /*!
--     * jQuery Mobile Virtual Mouse @VERSION
--     * http://jquerymobile.com
--     *
--     * Copyright jQuery Foundation and other contributors
--     * Released under the MIT license.
--     * http://jquery.org/license
--     */
--
--//>>label: Virtual Mouse (vmouse) Bindings
--//>>group: Core
--//>>description: Normalizes touch/mouse events.
--//>>docs: http://api.jquerymobile.com/?s=vmouse
--
--// This plugin is an experiment for abstracting away the touch and mouse
-+	if ( typeof define === "function" && define.amd ) {
-+		// AMD. Register as an anonymous module.
-+		define( [ "jquery" ], function ( $ ) {
-+			factory( $, root, doc );
-+			return $.mobile;
-+		});
-+	} else {
-+		// Browser globals
-+		factory( root.jQuery, root, doc );
-+	}
-+}( this, document, function ( jQuery, window, document, undefined ) {// This plugin is an experiment for abstracting away the touch and mouse
- // events so that developers don't have to worry about which method of input
- // the device their document is loaded on supports.
- //
-@@ -150,912 +34,831 @@
- // The current version exposes the following virtual events to jQuery bind methods:
- // "vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel"
- 
--    ( function( factory ) {
--        if ( typeof define === "function" && define.amd ) {
--
--            // AMD. Register as an anonymous module.
--            define( 'vmouse',[ "jquery" ], factory );
--        } else {
--
--            // Browser globals
--            factory( jQuery );
--        }
--    } )( function( $ ) {
--
--        var dataPropertyName = "virtualMouseBindings",
--            touchTargetPropertyName = "virtualTouchID",
--            touchEventProps = "clientX clientY pageX pageY screenX screenY".split( " " ),
--            virtualEventNames = "vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel".split( " " ),
--            generalProps = ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " +
--                "metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ),
--            mouseHookProps = $.event.mouseHooks ? $.event.mouseHooks.props : [],
--            mouseEventProps = generalProps.concat( mouseHookProps ),
--            activeDocHandlers = {},
--            resetTimerID = 0,
--            startX = 0,
--            startY = 0,
--            didScroll = false,
--            clickBlockList = [],
--            blockMouseTriggers = false,
--            blockTouchTriggers = false,
--            eventCaptureSupported = "addEventListener" in document,
--            $document = $( document ),
--            nextTouchID = 1,
--            lastTouchID = 0, threshold,
--            i;
--
--        $.vmouse = {
--            moveDistanceThreshold: 10,
--            clickDistanceThreshold: 10,
--            resetTimerDuration: 1500,
--            maximumTimeBetweenTouches: 100
--        };
--
--        function getNativeEvent( event ) {
--
--            while ( event && typeof event.originalEvent !== "undefined" ) {
--                event = event.originalEvent;
--            }
--            return event;
--        }
--
--        function createVirtualEvent( event, eventType ) {
--
--            var t = event.type,
--                oe, props, ne, prop, ct, touch, i, j, len;
--
--            event = $.Event( event );
--            event.type = eventType;
--
--            oe = event.originalEvent;
--            props = generalProps;
--
--            // addresses separation of $.event.props in to $.event.mouseHook.props and Issue 3280
--            // https://github.com/jquery/jquery-mobile/issues/3280
--            if ( t.search( /^(mouse|click)/ ) > -1 ) {
--                props = mouseEventProps;
--            }
--
--            // copy original event properties over to the new event
--            // this would happen if we could call $.event.fix instead of $.Event
--            // but we don't have a way to force an event to be fixed multiple times
--            if ( oe ) {
--                for ( i = props.length; i; ) {
--                    prop = props[ --i ];
--                    event[ prop ] = oe[ prop ];
--                }
--            }
--
--            // make sure that if the mouse and click virtual events are generated
--            // without a .which one is defined
--            if ( t.search( /mouse(down|up)|click/ ) > -1 && !event.which ) {
--                event.which = 1;
--            }
--
--            if ( t.search( /^touch/ ) !== -1 ) {
--                ne = getNativeEvent( oe );
--                t = ne.touches;
--                ct = ne.changedTouches;
--                touch = ( t && t.length ) ? t[ 0 ] : ( ( ct && ct.length ) ? ct[ 0 ] : undefined );
--
--                if ( touch ) {
--                    for ( j = 0, len = touchEventProps.length; j < len; j++ ) {
--                        prop = touchEventProps[ j ];
--                        event[ prop ] = touch[ prop ];
--                    }
--                }
--            }
--
--            return event;
--        }
--
--        function getVirtualBindingFlags( element ) {
--
--            var flags = {},
--                b, k;
--
--            while ( element ) {
--
--                b = $.data( element, dataPropertyName );
--
--                for ( k in b ) {
--                    if ( b[ k ] ) {
--                        flags[ k ] = flags.hasVirtualBinding = true;
--                    }
--                }
--                element = element.parentNode;
--            }
--            return flags;
--        }
--
--        function getClosestElementWithVirtualBinding( element, eventType ) {
--            var b;
--            while ( element ) {
--
--                b = $.data( element, dataPropertyName );
--
--                if ( b && ( !eventType || b[ eventType ] ) ) {
--                    return element;
--                }
--                element = element.parentNode;
--            }
--            return null;
--        }
--
--        function enableTouchBindings() {
--            blockTouchTriggers = false;
--        }
--
--        function disableTouchBindings() {
--            blockTouchTriggers = true;
--        }
--
--        function enableMouseBindings() {
--            lastTouchID = 0;
--            clickBlockList.length = 0;
--            blockMouseTriggers = false;
--
--            // When mouse bindings are enabled, our
--            // touch bindings are disabled.
--            disableTouchBindings();
--        }
--
--        function disableMouseBindings() {
--            // When mouse bindings are disabled, our
--            // touch bindings are enabled.
--            enableTouchBindings();
--        }
--
--        function clearResetTimer() {
--            if ( resetTimerID ) {
--                clearTimeout( resetTimerID );
--                resetTimerID = 0;
--            }
--        }
--
--        function startResetTimer() {
--            clearResetTimer();
--            resetTimerID = setTimeout( function() {
--                resetTimerID = 0;
--                enableMouseBindings();
--            }, $.vmouse.resetTimerDuration );
--        }
--
--        function triggerVirtualEvent( eventType, event, flags ) {
--            var ve;
--
--            if ( ( flags && flags[ eventType ] ) ||
--                ( !flags && getClosestElementWithVirtualBinding( event.target, eventType ) ) ) {
--
--                ve = createVirtualEvent( event, eventType );
--
--                $( event.target ).trigger( ve );
--            }
--
--            return ve;
--        }
--
--        function mouseEventCallback( event ) {
--            var touchID = $.data( event.target, touchTargetPropertyName ),
--                ve;
--
--            // It is unexpected if a click event is received before a touchend
--            // or touchmove event, however this is a known behavior in Mobile
--            // Safari when Mobile VoiceOver (as of iOS 8) is enabled and the user
--            // double taps to activate a link element. In these cases if a touch
--            // event is not received within the maximum time between touches,
--            // re-enable mouse bindings and call the mouse event handler again.
--            if ( event.type === "click" && $.data( event.target, "lastTouchType" ) === "touchstart" ) {
--                setTimeout( function() {
--                    if ( $.data( event.target, "lastTouchType" ) === "touchstart" ) {
--                        enableMouseBindings();
--                        delete $.data( event.target ).lastTouchType;
--                        mouseEventCallback( event );
--                    }
--                }, $.vmouse.maximumTimeBetweenTouches );
--            }
--
--            if ( !blockMouseTriggers && ( !lastTouchID || lastTouchID !== touchID ) ) {
--                ve = triggerVirtualEvent( "v" + event.type, event );
--                if ( ve ) {
--                    if ( ve.isDefaultPrevented() ) {
--                        event.preventDefault();
--                    }
--                    if ( ve.isPropagationStopped() ) {
--                        event.stopPropagation();
--                    }
--                    if ( ve.isImmediatePropagationStopped() ) {
--                        event.stopImmediatePropagation();
--                    }
--                }
--            }
--        }
--
--        function handleTouchStart( event ) {
--
--            var touches = getNativeEvent( event ).touches,
--                target, flags, t;
--
--            if ( touches && touches.length === 1 ) {
--
--                target = event.target;
--                flags = getVirtualBindingFlags( target );
--
--                $.data( event.target, "lastTouchType", event.type );
--
--                if ( flags.hasVirtualBinding ) {
--
--                    lastTouchID = nextTouchID++;
--                    $.data( target, touchTargetPropertyName, lastTouchID );
--
--                    clearResetTimer();
--
--                    disableMouseBindings();
--                    didScroll = false;
--
--                    t = getNativeEvent( event ).touches[ 0 ];
--                    startX = t.pageX;
--                    startY = t.pageY;
--
--                    triggerVirtualEvent( "vmouseover", event, flags );
--                    triggerVirtualEvent( "vmousedown", event, flags );
--                }
--            }
--        }
--
--        function handleScroll( event ) {
--            if ( blockTouchTriggers ) {
--                return;
--            }
--
--            if ( !didScroll ) {
--                triggerVirtualEvent( "vmousecancel", event, getVirtualBindingFlags( event.target ) );
--            }
--
--            $.data( event.target, "lastTouchType", event.type );
--
--            didScroll = true;
--            startResetTimer();
--        }
--
--        function handleTouchMove( event ) {
--            if ( blockTouchTriggers ) {
--                return;
--            }
--
--            var t = getNativeEvent( event ).touches[ 0 ],
--                didCancel = didScroll,
--                moveThreshold = $.vmouse.moveDistanceThreshold,
--                flags = getVirtualBindingFlags( event.target );
--
--            $.data( event.target, "lastTouchType", event.type );
--
--            didScroll = didScroll ||
--                ( Math.abs( t.pageX - startX ) > moveThreshold ||
--                    Math.abs( t.pageY - startY ) > moveThreshold );
--
--            if ( didScroll && !didCancel ) {
--                triggerVirtualEvent( "vmousecancel", event, flags );
--            }
--
--            triggerVirtualEvent( "vmousemove", event, flags );
--            startResetTimer();
--        }
--
--        function handleTouchEnd( event ) {
--            if ( blockTouchTriggers || $.data( event.target, "lastTouchType" ) === undefined ) {
--                return;
--            }
--
--            disableTouchBindings();
--            delete $.data( event.target ).lastTouchType;
--
--            var flags = getVirtualBindingFlags( event.target ),
--                ve, t;
--            triggerVirtualEvent( "vmouseup", event, flags );
--
--            if ( !didScroll ) {
--                ve = triggerVirtualEvent( "vclick", event, flags );
--                if ( ve && ve.isDefaultPrevented() ) {
--                    // The target of the mouse events that follow the touchend
--                    // event don't necessarily match the target used during the
--                    // touch. This means we need to rely on coordinates for blocking
--                    // any click that is generated.
--                    t = getNativeEvent( event ).changedTouches[ 0 ];
--                    clickBlockList.push( {
--                        touchID: lastTouchID,
--                        x: t.clientX,
--                        y: t.clientY
--                    } );
--
--                    // Prevent any mouse events that follow from triggering
--                    // virtual event notifications.
--                    blockMouseTriggers = true;
--                }
--            }
--            triggerVirtualEvent( "vmouseout", event, flags );
--            didScroll = false;
--
--            startResetTimer();
--        }
--
--        function hasVirtualBindings( ele ) {
--            var bindings = $.data( ele, dataPropertyName ),
--                k;
--
--            if ( bindings ) {
--                for ( k in bindings ) {
--                    if ( bindings[ k ] ) {
--                        return true;
--                    }
--                }
--            }
--            return false;
--        }
--
--        function dummyMouseHandler() {
--        }
--
--        function getSpecialEventObject( eventType ) {
--            var realType = eventType.substr( 1 );
--
--            return {
--                setup: function( /* data, namespace */ ) {
--                    // If this is the first virtual mouse binding for this element,
--                    // add a bindings object to its data.
--
--                    if ( !hasVirtualBindings( this ) ) {
--                        $.data( this, dataPropertyName, {} );
--                    }
--
--                    // If setup is called, we know it is the first binding for this
--                    // eventType, so initialize the count for the eventType to zero.
--                    var bindings = $.data( this, dataPropertyName );
--                    bindings[ eventType ] = true;
--
--                    // If this is the first virtual mouse event for this type,
--                    // register a global handler on the document.
--
--                    activeDocHandlers[ eventType ] = ( activeDocHandlers[ eventType ] || 0 ) + 1;
--
--                    if ( activeDocHandlers[ eventType ] === 1 ) {
--                        $document.bind( realType, mouseEventCallback );
--                    }
--
--                    // Some browsers, like Opera Mini, won't dispatch mouse/click events
--                    // for elements unless they actually have handlers registered on them.
--                    // To get around this, we register dummy handlers on the elements.
--
--                    $( this ).bind( realType, dummyMouseHandler );
--
--                    // For now, if event capture is not supported, we rely on mouse handlers.
--                    if ( eventCaptureSupported ) {
--                        // If this is the first virtual mouse binding for the document,
--                        // register our touchstart handler on the document.
--
--                        activeDocHandlers[ "touchstart" ] = ( activeDocHandlers[ "touchstart" ] || 0 ) + 1;
--
--                        if ( activeDocHandlers[ "touchstart" ] === 1 ) {
--                            $document.bind( "touchstart", handleTouchStart )
--                                .bind( "touchend", handleTouchEnd )
--
--                                // On touch platforms, touching the screen and then dragging your finger
--                                // causes the window content to scroll after some distance threshold is
--                                // exceeded. On these platforms, a scroll prevents a click event from being
--                                // dispatched, and on some platforms, even the touchend is suppressed. To
--                                // mimic the suppression of the click event, we need to watch for a scroll
--                                // event. Unfortunately, some platforms like iOS don't dispatch scroll
--                                // events until *AFTER* the user lifts their finger (touchend). This means
--                                // we need to watch both scroll and touchmove events to figure out whether
--                                // or not a scroll happenens before the touchend event is fired.
--
--                                .bind( "touchmove", handleTouchMove )
--                                .bind( "scroll", handleScroll );
--                        }
--                    }
--                },
--
--                teardown: function( /* data, namespace */ ) {
--                    // If this is the last virtual binding for this eventType,
--                    // remove its global handler from the document.
--
--                    --activeDocHandlers[eventType];
--
--                    if ( !activeDocHandlers[ eventType ] ) {
--                        $document.unbind( realType, mouseEventCallback );
--                    }
--
--                    if ( eventCaptureSupported ) {
--                        // If this is the last virtual mouse binding in existence,
--                        // remove our document touchstart listener.
--
--                        --activeDocHandlers["touchstart"];
--
--                        if ( !activeDocHandlers[ "touchstart" ] ) {
--                            $document.unbind( "touchstart", handleTouchStart )
--                                .unbind( "touchmove", handleTouchMove )
--                                .unbind( "touchend", handleTouchEnd )
--                                .unbind( "scroll", handleScroll );
--                        }
--                    }
--
--                    var $this = $( this ),
--                        bindings = $.data( this, dataPropertyName );
--
--                    // teardown may be called when an element was
--                    // removed from the DOM. If this is the case,
--                    // jQuery core may have already stripped the element
--                    // of any data bindings so we need to check it before
--                    // using it.
--                    if ( bindings ) {
--                        bindings[ eventType ] = false;
--                    }
-+(function( $, window, document, undefined ) {
-+
-+var dataPropertyName = "virtualMouseBindings",
-+	touchTargetPropertyName = "virtualTouchID",
-+	virtualEventNames = "vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel".split( " " ),
-+	touchEventProps = "clientX clientY pageX pageY screenX screenY".split( " " ),
-+	mouseHookProps = $.event.mouseHooks ? $.event.mouseHooks.props : [],
-+	mouseEventProps = $.event.props.concat( mouseHookProps ),
-+	activeDocHandlers = {},
-+	resetTimerID = 0,
-+	startX = 0,
-+	startY = 0,
-+	didScroll = false,
-+	clickBlockList = [],
-+	blockMouseTriggers = false,
-+	blockTouchTriggers = false,
-+	eventCaptureSupported = "addEventListener" in document,
-+	$document = $( document ),
-+	nextTouchID = 1,
-+	lastTouchID = 0, threshold,
-+	i;
-+
-+$.vmouse = {
-+	moveDistanceThreshold: 10,
-+	clickDistanceThreshold: 10,
-+	resetTimerDuration: 1500
-+};
-+
-+function getNativeEvent( event ) {
-+
-+	while ( event && typeof event.originalEvent !== "undefined" ) {
-+		event = event.originalEvent;
-+	}
-+	return event;
-+}
-+
-+function createVirtualEvent( event, eventType ) {
-+
-+	var t = event.type,
-+		oe, props, ne, prop, ct, touch, i, j, len;
-+
-+	event = $.Event( event );
-+	event.type = eventType;
-+
-+	oe = event.originalEvent;
-+	props = $.event.props;
-+
-+	// addresses separation of $.event.props in to $.event.mouseHook.props and Issue 3280
-+	// https://github.com/jquery/jquery-mobile/issues/3280
-+	if ( t.search( /^(mouse|click)/ ) > -1 ) {
-+		props = mouseEventProps;
-+	}
-+
-+	// copy original event properties over to the new event
-+	// this would happen if we could call $.event.fix instead of $.Event
-+	// but we don't have a way to force an event to be fixed multiple times
-+	if ( oe ) {
-+		for ( i = props.length, prop; i; ) {
-+			prop = props[ --i ];
-+			event[ prop ] = oe[ prop ];
-+		}
-+	}
-+
-+	// make sure that if the mouse and click virtual events are generated
-+	// without a .which one is defined
-+	if ( t.search(/mouse(down|up)|click/) > -1 && !event.which ) {
-+		event.which = 1;
-+	}
-+
-+	if ( t.search(/^touch/) !== -1 ) {
-+		ne = getNativeEvent( oe );
-+		t = ne.touches;
-+		ct = ne.changedTouches;
-+		touch = ( t && t.length ) ? t[0] : ( ( ct && ct.length ) ? ct[ 0 ] : undefined );
-+
-+		if ( touch ) {
-+			for ( j = 0, len = touchEventProps.length; j < len; j++) {
-+				prop = touchEventProps[ j ];
-+				event[ prop ] = touch[ prop ];
-+			}
-+		}
-+	}
-+
-+	return event;
-+}
-+
-+function getVirtualBindingFlags( element ) {
-+
-+	var flags = {},
-+		b, k;
-+
-+	while ( element ) {
-+
-+		b = $.data( element, dataPropertyName );
-+
-+		for (  k in b ) {
-+			if ( b[ k ] ) {
-+				flags[ k ] = flags.hasVirtualBinding = true;
-+			}
-+		}
-+		element = element.parentNode;
-+	}
-+	return flags;
-+}
-+
-+function getClosestElementWithVirtualBinding( element, eventType ) {
-+	var b;
-+	while ( element ) {
-+
-+		b = $.data( element, dataPropertyName );
-+
-+		if ( b && ( !eventType || b[ eventType ] ) ) {
-+			return element;
-+		}
-+		element = element.parentNode;
-+	}
-+	return null;
-+}
-+
-+function enableTouchBindings() {
-+	blockTouchTriggers = false;
-+}
-+
-+function disableTouchBindings() {
-+	blockTouchTriggers = true;
-+}
-+
-+function enableMouseBindings() {
-+	lastTouchID = 0;
-+	clickBlockList.length = 0;
-+	blockMouseTriggers = false;
-+
-+	// When mouse bindings are enabled, our
-+	// touch bindings are disabled.
-+	disableTouchBindings();
-+}
-+
-+function disableMouseBindings() {
-+	// When mouse bindings are disabled, our
-+	// touch bindings are enabled.
-+	enableTouchBindings();
-+}
-+
-+function startResetTimer() {
-+	clearResetTimer();
-+	resetTimerID = setTimeout( function() {
-+		resetTimerID = 0;
-+		enableMouseBindings();
-+	}, $.vmouse.resetTimerDuration );
-+}
-+
-+function clearResetTimer() {
-+	if ( resetTimerID ) {
-+		clearTimeout( resetTimerID );
-+		resetTimerID = 0;
-+	}
-+}
-+
-+function triggerVirtualEvent( eventType, event, flags ) {
-+	var ve;
-+
-+	if ( ( flags && flags[ eventType ] ) ||
-+				( !flags && getClosestElementWithVirtualBinding( event.target, eventType ) ) ) {
-+
-+		ve = createVirtualEvent( event, eventType );
-+
-+		$( event.target).trigger( ve );
-+	}
-+
-+	return ve;
-+}
-+
-+function mouseEventCallback( event ) {
-+	var touchID = $.data( event.target, touchTargetPropertyName ),
-+		ve;
-+
-+	if ( !blockMouseTriggers && ( !lastTouchID || lastTouchID !== touchID ) ) {
-+		ve = triggerVirtualEvent( "v" + event.type, event );
-+		if ( ve ) {
-+			if ( ve.isDefaultPrevented() ) {
-+				event.preventDefault();
-+			}
-+			if ( ve.isPropagationStopped() ) {
-+				event.stopPropagation();
-+			}
-+			if ( ve.isImmediatePropagationStopped() ) {
-+				event.stopImmediatePropagation();
-+			}
-+		}
-+	}
-+}
-+
-+function handleTouchStart( event ) {
-+
-+	var touches = getNativeEvent( event ).touches,
-+		target, flags, t;
-+
-+	if ( touches && touches.length === 1 ) {
-+
-+		target = event.target;
-+		flags = getVirtualBindingFlags( target );
-+
-+		if ( flags.hasVirtualBinding ) {
-+
-+			lastTouchID = nextTouchID++;
-+			$.data( target, touchTargetPropertyName, lastTouchID );
-+
-+			clearResetTimer();
-+
-+			disableMouseBindings();
-+			didScroll = false;
-+
-+			t = getNativeEvent( event ).touches[ 0 ];
-+			startX = t.pageX;
-+			startY = t.pageY;
-+
-+			triggerVirtualEvent( "vmouseover", event, flags );
-+			triggerVirtualEvent( "vmousedown", event, flags );
-+		}
-+	}
-+}
-+
-+function handleScroll( event ) {
-+	if ( blockTouchTriggers ) {
-+		return;
-+	}
-+
-+	if ( !didScroll ) {
-+		triggerVirtualEvent( "vmousecancel", event, getVirtualBindingFlags( event.target ) );
-+	}
-+
-+	didScroll = true;
-+	startResetTimer();
-+}
-+
-+function handleTouchMove( event ) {
-+	if ( blockTouchTriggers ) {
-+		return;
-+	}
-+
-+	var t = getNativeEvent( event ).touches[ 0 ],
-+		didCancel = didScroll,
-+		moveThreshold = $.vmouse.moveDistanceThreshold,
-+		flags = getVirtualBindingFlags( event.target );
-+
-+		didScroll = didScroll ||
-+			( Math.abs( t.pageX - startX ) > moveThreshold ||
-+				Math.abs( t.pageY - startY ) > moveThreshold );
-+
-+	if ( didScroll && !didCancel ) {
-+		triggerVirtualEvent( "vmousecancel", event, flags );
-+	}
-+
-+	triggerVirtualEvent( "vmousemove", event, flags );
-+	startResetTimer();
-+}
-+
-+function handleTouchEnd( event ) {
-+	if ( blockTouchTriggers ) {
-+		return;
-+	}
-+
-+	disableTouchBindings();
-+
-+	var flags = getVirtualBindingFlags( event.target ),
-+		ve, t;
-+	triggerVirtualEvent( "vmouseup", event, flags );
-+
-+	if ( !didScroll ) {
-+		ve = triggerVirtualEvent( "vclick", event, flags );
-+		if ( ve && ve.isDefaultPrevented() ) {
-+			// The target of the mouse events that follow the touchend
-+			// event don't necessarily match the target used during the
-+			// touch. This means we need to rely on coordinates for blocking
-+			// any click that is generated.
-+			t = getNativeEvent( event ).changedTouches[ 0 ];
-+			clickBlockList.push({
-+				touchID: lastTouchID,
-+				x: t.clientX,
-+				y: t.clientY
-+			});
-+
-+			// Prevent any mouse events that follow from triggering
-+			// virtual event notifications.
-+			blockMouseTriggers = true;
-+		}
-+	}
-+	triggerVirtualEvent( "vmouseout", event, flags);
-+	didScroll = false;
-+
-+	startResetTimer();
-+}
-+
-+function hasVirtualBindings( ele ) {
-+	var bindings = $.data( ele, dataPropertyName ),
-+		k;
-+
-+	if ( bindings ) {
-+		for ( k in bindings ) {
-+			if ( bindings[ k ] ) {
-+				return true;
-+			}
-+		}
-+	}
-+	return false;
-+}
-+
-+function dummyMouseHandler() {}
-+
-+function getSpecialEventObject( eventType ) {
-+	var realType = eventType.substr( 1 );
-+
-+	return {
-+		setup: function(/* data, namespace */) {
-+			// If this is the first virtual mouse binding for this element,
-+			// add a bindings object to its data.
-+
-+			if ( !hasVirtualBindings( this ) ) {
-+				$.data( this, dataPropertyName, {} );
-+			}
-+
-+			// If setup is called, we know it is the first binding for this
-+			// eventType, so initialize the count for the eventType to zero.
-+			var bindings = $.data( this, dataPropertyName );
-+			bindings[ eventType ] = true;
-+
-+			// If this is the first virtual mouse event for this type,
-+			// register a global handler on the document.
-+
-+			activeDocHandlers[ eventType ] = ( activeDocHandlers[ eventType ] || 0 ) + 1;
-+
-+			if ( activeDocHandlers[ eventType ] === 1 ) {
-+				$document.bind( realType, mouseEventCallback );
-+			}
-+
-+			// Some browsers, like Opera Mini, won't dispatch mouse/click events
-+			// for elements unless they actually have handlers registered on them.
-+			// To get around this, we register dummy handlers on the elements.
-+
-+			$( this ).bind( realType, dummyMouseHandler );
-+
-+			// For now, if event capture is not supported, we rely on mouse handlers.
-+			if ( eventCaptureSupported ) {
-+				// If this is the first virtual mouse binding for the document,
-+				// register our touchstart handler on the document.
-+
-+				activeDocHandlers[ "touchstart" ] = ( activeDocHandlers[ "touchstart" ] || 0) + 1;
-+
-+				if ( activeDocHandlers[ "touchstart" ] === 1 ) {
-+					$document.bind( "touchstart", handleTouchStart )
-+						.bind( "touchend", handleTouchEnd )
-+
-+						// On touch platforms, touching the screen and then dragging your finger
-+						// causes the window content to scroll after some distance threshold is
-+						// exceeded. On these platforms, a scroll prevents a click event from being
-+						// dispatched, and on some platforms, even the touchend is suppressed. To
-+						// mimic the suppression of the click event, we need to watch for a scroll
-+						// event. Unfortunately, some platforms like iOS don't dispatch scroll
-+						// events until *AFTER* the user lifts their finger (touchend). This means
-+						// we need to watch both scroll and touchmove events to figure out whether
-+						// or not a scroll happenens before the touchend event is fired.
-+
-+						.bind( "touchmove", handleTouchMove )
-+						.bind( "scroll", handleScroll );
-+				}
-+			}
-+		},
-+
-+		teardown: function(/* data, namespace */) {
-+			// If this is the last virtual binding for this eventType,
-+			// remove its global handler from the document.
-+
-+			--activeDocHandlers[ eventType ];
-+
-+			if ( !activeDocHandlers[ eventType ] ) {
-+				$document.unbind( realType, mouseEventCallback );
-+			}
-+
-+			if ( eventCaptureSupported ) {
-+				// If this is the last virtual mouse binding in existence,
-+				// remove our document touchstart listener.
-+
-+				--activeDocHandlers[ "touchstart" ];
-+
-+				if ( !activeDocHandlers[ "touchstart" ] ) {
-+					$document.unbind( "touchstart", handleTouchStart )
-+						.unbind( "touchmove", handleTouchMove )
-+						.unbind( "touchend", handleTouchEnd )
-+						.unbind( "scroll", handleScroll );
-+				}
-+			}
-+
-+			var $this = $( this ),
-+				bindings = $.data( this, dataPropertyName );
-+
-+			// teardown may be called when an element was
-+			// removed from the DOM. If this is the case,
-+			// jQuery core may have already stripped the element
-+			// of any data bindings so we need to check it before
-+			// using it.
-+			if ( bindings ) {
-+				bindings[ eventType ] = false;
-+			}
- 
--                    // Unregister the dummy event handler.
-+			// Unregister the dummy event handler.
- 
--                    $this.unbind( realType, dummyMouseHandler );
-+			$this.unbind( realType, dummyMouseHandler );
- 
--                    // If this is the last virtual mouse binding on the
--                    // element, remove the binding data from the element.
--
--                    if ( !hasVirtualBindings( this ) ) {
--                        $this.removeData( dataPropertyName );
--                    }
--                }
--            };
--        }
-+			// If this is the last virtual mouse binding on the
-+			// element, remove the binding data from the element.
-+
-+			if ( !hasVirtualBindings( this ) ) {
-+				$this.removeData( dataPropertyName );
-+			}
-+		}
-+	};
-+}
- 
- // Expose our custom events to the jQuery bind/unbind mechanism.
- 
--        for ( i = 0; i < virtualEventNames.length; i++ ) {
--            $.event.special[ virtualEventNames[ i ] ] = getSpecialEventObject( virtualEventNames[ i ] );
--        }
-+for ( i = 0; i < virtualEventNames.length; i++ ) {
-+	$.event.special[ virtualEventNames[ i ] ] = getSpecialEventObject( virtualEventNames[ i ] );
-+}
- 
- // Add a capture click handler to block clicks.
- // Note that we require event capture support for this so if the device
- // doesn't support it, we punt for now and rely solely on mouse events.
--        if ( eventCaptureSupported ) {
--            document.addEventListener( "click", function( e ) {
--                var cnt = clickBlockList.length,
--                    target = e.target,
--                    x, y, ele, i, o, touchID;
--
--                if ( cnt ) {
--                    x = e.clientX;
--                    y = e.clientY;
--                    threshold = $.vmouse.clickDistanceThreshold;
--
--                    // The idea here is to run through the clickBlockList to see if
--                    // the current click event is in the proximity of one of our
--                    // vclick events that had preventDefault() called on it. If we find
--                    // one, then we block the click.
--                    //
--                    // Why do we have to rely on proximity?
--                    //
--                    // Because the target of the touch event that triggered the vclick
--                    // can be different from the target of the click event synthesized
--                    // by the browser. The target of a mouse/click event that is synthesized
--                    // from a touch event seems to be implementation specific. For example,
--                    // some browsers will fire mouse/click events for a link that is near
--                    // a touch event, even though the target of the touchstart/touchend event
--                    // says the user touched outside the link. Also, it seems that with most
--                    // browsers, the target of the mouse/click event is not calculated until the
--                    // time it is dispatched, so if you replace an element that you touched
--                    // with another element, the target of the mouse/click will be the new
--                    // element underneath that point.
--                    //
--                    // Aside from proximity, we also check to see if the target and any
--                    // of its ancestors were the ones that blocked a click. This is necessary
--                    // because of the strange mouse/click target calculation done in the
--                    // Android 2.1 browser, where if you click on an element, and there is a
--                    // mouse/click handler on one of its ancestors, the target will be the
--                    // innermost child of the touched element, even if that child is no where
--                    // near the point of touch.
--
--                    ele = target;
--
--                    while ( ele ) {
--                        for ( i = 0; i < cnt; i++ ) {
--                            o = clickBlockList[ i ];
--                            touchID = 0;
--
--                            if ( ( ele === target && Math.abs( o.x - x ) < threshold && Math.abs( o.y - y ) < threshold ) ||
--                                $.data( ele, touchTargetPropertyName ) === o.touchID ) {
--                                // XXX: We may want to consider removing matches from the block list
--                                //      instead of waiting for the reset timer to fire.
--                                e.preventDefault();
--                                e.stopPropagation();
--                                return;
--                            }
--                        }
--                        ele = ele.parentNode;
--                    }
--                }
--            }, true );
--        }
--    } );
--
--    /*!
--     * jQuery Mobile Namespace @VERSION
--     * http://jquerymobile.com
--     *
--     * Copyright jQuery Foundation and other contributors
--     * Released under the MIT license.
--     * http://jquery.org/license
--     */
--
--//>>label: Namespace
--//>>group: Core
--//>>description: The mobile namespace on the jQuery object
--
--    ( function( factory ) {
--        if ( typeof define === "function" && define.amd ) {
--
--            // AMD. Register as an anonymous module.
--            define( 'ns',[ "jquery" ], factory );
--        } else {
--
--            // Browser globals
--            factory( jQuery );
--        }
--    } )( function( $ ) {
--
--        $.mobile = { version: "@VERSION" };
--
--        return $.mobile;
--    } );
--
--    /*!
--     * jQuery Mobile Touch Support Test @VERSION
--     * http://jquerymobile.com
--     *
--     * Copyright jQuery Foundation and other contributors
--     * Released under the MIT license.
--     * http://jquery.org/license
--     */
--
--//>>label: Touch support test
--//>>group: Core
--//>>description: Touch feature test
--
--    ( function( factory ) {
--        if ( typeof define === "function" && define.amd ) {
--
--            // AMD. Register as an anonymous module.
--            define( 'support/touch',[
--                "jquery",
--                "../ns" ], factory );
--        } else {
--
--            // Browser globals
--            factory( jQuery );
--        }
--    } )( function( $ ) {
--
--        var support = {
--            touch: "ontouchend" in document
--        };
--
--        $.mobile.support = $.mobile.support || {};
--        $.extend( $.support, support );
--        $.extend( $.mobile.support, support );
--
--        return $.support;
--    } );
--
--    /*!
--     * jQuery Mobile Touch Events @VERSION
--     * http://jquerymobile.com
--     *
--     * Copyright jQuery Foundation and other contributors
--     * Released under the MIT license.
--     * http://jquery.org/license
--     */
--
--//>>label: Touch
--//>>group: Events
--//>>description: Touch events including: touchstart, touchmove, touchend, tap, taphold, swipe, swipeleft, swiperight
--
--    ( function( factory ) {
--        if ( typeof define === "function" && define.amd ) {
--
--            // AMD. Register as an anonymous module.
--            define( 'events/touch',[
--                "jquery",
--                "../vmouse",
--                "../support/touch" ], factory );
--        } else {
--
--            // Browser globals
--            factory( jQuery );
--        }
--    } )( function( $ ) {
--        var $document = $( document ),
--            supportTouch = $.mobile.support.touch,
--            touchStartEvent = supportTouch ? "touchstart" : "mousedown",
--            touchStopEvent = supportTouch ? "touchend" : "mouseup",
--            touchMoveEvent = supportTouch ? "touchmove" : "mousemove";
--
--// setup new event shortcuts
--        $.each( ( "touchstart touchmove touchend " +
--            "tap taphold " +
--            "swipe swipeleft swiperight" ).split( " " ), function( i, name ) {
--
--            $.fn[ name ] = function( fn ) {
--                return fn ? this.bind( name, fn ) : this.trigger( name );
--            };
--
--            // jQuery < 1.8
--            if ( $.attrFn ) {
--                $.attrFn[ name ] = true;
--            }
--        } );
--
--        function triggerCustomEvent( obj, eventType, event, bubble ) {
--            var originalType = event.type;
--            event.type = eventType;
--            if ( bubble ) {
--                $.event.trigger( event, undefined, obj );
--            } else {
--                $.event.dispatch.call( obj, event );
--            }
--            event.type = originalType;
--        }
--
--// also handles taphold
--        $.event.special.tap = {
--            tapholdThreshold: 750,
--            emitTapOnTaphold: true,
--            setup: function() {
--                var thisObject = this,
--                    $this = $( thisObject ),
--                    isTaphold = false;
--
--                $this.bind( "vmousedown", function( event ) {
--                    isTaphold = false;
--                    if ( event.which && event.which !== 1 ) {
--                        return true;
--                    }
--
--                    var origTarget = event.target,
--                        timer, clickHandler;
--
--                    function clearTapTimer() {
--                        if ( timer ) {
--                            $this.bind( "vclick", clickHandler );
--                            clearTimeout( timer );
--                        }
--                    }
--
--                    function clearTapHandlers() {
--                        clearTapTimer();
--
--                        $this.unbind( "vclick", clickHandler )
--                            .unbind( "vmouseup", clearTapTimer );
--                        $document.unbind( "vmousecancel", clearTapHandlers );
--                    }
--
--                    clickHandler = function( event ) {
--                        clearTapHandlers();
--
--                        // ONLY trigger a 'tap' event if the start target is
--                        // the same as the stop target.
--                        if ( !isTaphold && origTarget === event.target ) {
--                            triggerCustomEvent( thisObject, "tap", event );
--                        } else if ( isTaphold ) {
--                            event.preventDefault();
--                        }
--                    };
--
--                    $this.bind( "vmouseup", clearTapTimer );
--
--                    $document.bind( "vmousecancel", clearTapHandlers );
--
--                    timer = setTimeout( function() {
--                        if ( !$.event.special.tap.emitTapOnTaphold ) {
--                            isTaphold = true;
--                        }
--                        timer = 0;
--                        triggerCustomEvent( thisObject, "taphold", $.Event( "taphold", { target: origTarget } ) );
--                    }, $.event.special.tap.tapholdThreshold );
--                } );
--            },
--            teardown: function() {
--                $( this ).unbind( "vmousedown" ).unbind( "vclick" ).unbind( "vmouseup" );
--                $document.unbind( "vmousecancel" );
--            }
--        };
--
--// Also handles swipeleft, swiperight
--        $.event.special.swipe = {
--
--            // More than this horizontal displacement, and we will suppress scrolling.
--            scrollSupressionThreshold: 30,
--
--            // More time than this, and it isn't a swipe.
--            durationThreshold: 1000,
--
--            // Swipe horizontal displacement must be more than this.
--            horizontalDistanceThreshold: window.devicePixelRatio >= 2 ? 15 : 30,
--
--            // Swipe vertical displacement must be less than this.
--            verticalDistanceThreshold: window.devicePixelRatio >= 2 ? 15 : 30,
--
--            getLocation: function( event ) {
--                var winPageX = window.pageXOffset,
--                    winPageY = window.pageYOffset,
--                    x = event.clientX,
--                    y = event.clientY;
--
--                if ( event.pageY === 0 && Math.floor( y ) > Math.floor( event.pageY ) ||
--                    event.pageX === 0 && Math.floor( x ) > Math.floor( event.pageX ) ) {
--
--                    // iOS4 clientX/clientY have the value that should have been
--                    // in pageX/pageY. While pageX/page/ have the value 0
--                    x = x - winPageX;
--                    y = y - winPageY;
--                } else if ( y < ( event.pageY - winPageY ) || x < ( event.pageX - winPageX ) ) {
--
--                    // Some Android browsers have totally bogus values for clientX/Y
--                    // when scrolling/zooming a page. Detectable since clientX/clientY
--                    // should never be smaller than pageX/pageY minus page scroll
--                    x = event.pageX - winPageX;
--                    y = event.pageY - winPageY;
--                }
--
--                return {
--                    x: x,
--                    y: y
--                };
--            },
--
--            start: function( event ) {
--                var data = event.originalEvent.touches ?
--                    event.originalEvent.touches[ 0 ] : event,
--                    location = $.event.special.swipe.getLocation( data );
--                return {
--                    time: ( new Date() ).getTime(),
--                    coords: [ location.x, location.y ],
--                    origin: $( event.target )
--                };
--            },
--
--            stop: function( event ) {
--                var data = event.originalEvent.touches ?
--                    event.originalEvent.touches[ 0 ] : event,
--                    location = $.event.special.swipe.getLocation( data );
--                return {
--                    time: ( new Date() ).getTime(),
--                    coords: [ location.x, location.y ]
--                };
--            },
--
--            handleSwipe: function( start, stop, thisObject, origTarget ) {
--                if ( stop.time - start.time < $.event.special.swipe.durationThreshold &&
--                    Math.abs( start.coords[ 0 ] - stop.coords[ 0 ] ) > $.event.special.swipe.horizontalDistanceThreshold &&
--                    Math.abs( start.coords[ 1 ] - stop.coords[ 1 ] ) < $.event.special.swipe.verticalDistanceThreshold ) {
--                    var direction = start.coords[ 0 ] > stop.coords[ 0 ] ? "swipeleft" : "swiperight";
--
--                    triggerCustomEvent( thisObject, "swipe", $.Event( "swipe", { target: origTarget, swipestart: start, swipestop: stop } ), true );
--                    triggerCustomEvent( thisObject, direction, $.Event( direction, { target: origTarget, swipestart: start, swipestop: stop } ), true );
--                    return true;
--                }
--                return false;
--
--            },
--
--            // This serves as a flag to ensure that at most one swipe event event is
--            // in work at any given time
--            eventInProgress: false,
--
--            setup: function() {
--                var events,
--                    thisObject = this,
--                    $this = $( thisObject ),
--                    context = {};
--
--                // Retrieve the events data for this element and add the swipe context
--                events = $.data( this, "mobile-events" );
--                if ( !events ) {
--                    events = { length: 0 };
--                    $.data( this, "mobile-events", events );
--                }
--                events.length++;
--                events.swipe = context;
--
--                context.start = function( event ) {
--
--                    // Bail if we're already working on a swipe event
--                    if ( $.event.special.swipe.eventInProgress ) {
--                        return;
--                    }
--                    $.event.special.swipe.eventInProgress = true;
--
--                    var stop,
--                        start = $.event.special.swipe.start( event ),
--                        origTarget = event.target,
--                        emitted = false;
--
--                    context.move = function( event ) {
--                        if ( !start || event.isDefaultPrevented() ) {
--                            return;
--                        }
--
--                        stop = $.event.special.swipe.stop( event );
--                        if ( !emitted ) {
--                            emitted = $.event.special.swipe.handleSwipe( start, stop, thisObject, origTarget );
--                            if ( emitted ) {
--
--                                // Reset the context to make way for the next swipe event
--                                $.event.special.swipe.eventInProgress = false;
--                            }
--                        }
--                        // prevent scrolling
--                        if ( Math.abs( start.coords[ 0 ] - stop.coords[ 0 ] ) > $.event.special.swipe.scrollSupressionThreshold ) {
--                            event.preventDefault();
--                        }
--                    };
--
--                    context.stop = function() {
--                        emitted = true;
--
--                        // Reset the context to make way for the next swipe event
--                        $.event.special.swipe.eventInProgress = false;
--                        $document.off( touchMoveEvent, context.move );
--                        context.move = null;
--                    };
--
--                    $document.on( touchMoveEvent, context.move )
--                        .one( touchStopEvent, context.stop );
--                };
--                $this.on( touchStartEvent, context.start );
--            },
--
--            teardown: function() {
--                var events, context;
--
--                events = $.data( this, "mobile-events" );
--                if ( events ) {
--                    context = events.swipe;
--                    delete events.swipe;
--                    events.length--;
--                    if ( events.length === 0 ) {
--                        $.removeData( this, "mobile-events" );
--                    }
--                }
--
--                if ( context ) {
--                    if ( context.start ) {
--                        $( this ).off( touchStartEvent, context.start );
--                    }
--                    if ( context.move ) {
--                        $document.off( touchMoveEvent, context.move );
--                    }
--                    if ( context.stop ) {
--                        $document.off( touchStopEvent, context.stop );
--                    }
--                }
--            }
--        };
--        $.each( {
--            taphold: "tap",
--            swipeleft: "swipe.left",
--            swiperight: "swipe.right"
--        }, function( event, sourceEvent ) {
--
--            $.event.special[ event ] = {
--                setup: function() {
--                    $( this ).bind( sourceEvent, $.noop );
--                },
--                teardown: function() {
--                    $( this ).unbind( sourceEvent );
--                }
--            };
--        } );
--
--        return $.event.special;
--    } );
--
-+if ( eventCaptureSupported ) {
-+	document.addEventListener( "click", function( e ) {
-+		var cnt = clickBlockList.length,
-+			target = e.target,
-+			x, y, ele, i, o, touchID;
-+
-+		if ( cnt ) {
-+			x = e.clientX;
-+			y = e.clientY;
-+			threshold = $.vmouse.clickDistanceThreshold;
-+
-+			// The idea here is to run through the clickBlockList to see if
-+			// the current click event is in the proximity of one of our
-+			// vclick events that had preventDefault() called on it. If we find
-+			// one, then we block the click.
-+			//
-+			// Why do we have to rely on proximity?
-+			//
-+			// Because the target of the touch event that triggered the vclick
-+			// can be different from the target of the click event synthesized
-+			// by the browser. The target of a mouse/click event that is synthesized
-+			// from a touch event seems to be implementation specific. For example,
-+			// some browsers will fire mouse/click events for a link that is near
-+			// a touch event, even though the target of the touchstart/touchend event
-+			// says the user touched outside the link. Also, it seems that with most
-+			// browsers, the target of the mouse/click event is not calculated until the
-+			// time it is dispatched, so if you replace an element that you touched
-+			// with another element, the target of the mouse/click will be the new
-+			// element underneath that point.
-+			//
-+			// Aside from proximity, we also check to see if the target and any
-+			// of its ancestors were the ones that blocked a click. This is necessary
-+			// because of the strange mouse/click target calculation done in the
-+			// Android 2.1 browser, where if you click on an element, and there is a
-+			// mouse/click handler on one of its ancestors, the target will be the
-+			// innermost child of the touched element, even if that child is no where
-+			// near the point of touch.
-+
-+			ele = target;
-+
-+			while ( ele ) {
-+				for ( i = 0; i < cnt; i++ ) {
-+					o = clickBlockList[ i ];
-+					touchID = 0;
-+
-+					if ( ( ele === target && Math.abs( o.x - x ) < threshold && Math.abs( o.y - y ) < threshold ) ||
-+								$.data( ele, touchTargetPropertyName ) === o.touchID ) {
-+						// XXX: We may want to consider removing matches from the block list
-+						//      instead of waiting for the reset timer to fire.
-+						e.preventDefault();
-+						e.stopPropagation();
-+						return;
-+					}
-+				}
-+				ele = ele.parentNode;
-+			}
-+		}
-+	}, true);
-+}
-+})( jQuery, window, document );
-+
-+(function( $ ) {
-+	$.mobile = {};
-+}( jQuery ));
-+
-+	(function( $, undefined ) {
-+		var support = {
-+			touch: "ontouchend" in document
-+		};
-+
-+		$.mobile.support = $.mobile.support || {};
-+		$.extend( $.support, support );
-+		$.extend( $.mobile.support, support );
-+	}( jQuery ));
-+
-+
-+(function( $, window, undefined ) {
-+	var $document = $( document ),
-+		supportTouch = $.mobile.support.touch,
-+		scrollEvent = "touchmove scroll",
-+		touchStartEvent = supportTouch ? "touchstart" : "mousedown",
-+		touchStopEvent = supportTouch ? "touchend" : "mouseup",
-+		touchMoveEvent = supportTouch ? "touchmove" : "mousemove";
-+
-+	// setup new event shortcuts
-+	$.each( ( "touchstart touchmove touchend " +
-+		"tap taphold " +
-+		"swipe swipeleft swiperight " +
-+		"scrollstart scrollstop" ).split( " " ), function( i, name ) {
-+
-+		$.fn[ name ] = function( fn ) {
-+			return fn ? this.bind( name, fn ) : this.trigger( name );
-+		};
-+
-+		// jQuery < 1.8
-+		if ( $.attrFn ) {
-+			$.attrFn[ name ] = true;
-+		}
-+	});
-+
-+	function triggerCustomEvent( obj, eventType, event, bubble ) {
-+		var originalType = event.type;
-+		event.type = eventType;
-+		if ( bubble ) {
-+			$.event.trigger( event, undefined, obj );
-+		} else {
-+			$.event.dispatch.call( obj, event );
-+		}
-+		event.type = originalType;
-+	}
-+
-+	// also handles scrollstop
-+	$.event.special.scrollstart = {
-+
-+		enabled: true,
-+		setup: function() {
-+
-+			var thisObject = this,
-+				$this = $( thisObject ),
-+				scrolling,
-+				timer;
-+
-+			function trigger( event, state ) {
-+				scrolling = state;
-+				triggerCustomEvent( thisObject, scrolling ? "scrollstart" : "scrollstop", event );
-+			}
-+
-+			// iPhone triggers scroll after a small delay; use touchmove instead
-+			$this.bind( scrollEvent, function( event ) {
-+
-+				if ( !$.event.special.scrollstart.enabled ) {
-+					return;
-+				}
-+
-+				if ( !scrolling ) {
-+					trigger( event, true );
-+				}
-+
-+				clearTimeout( timer );
-+				timer = setTimeout( function() {
-+					trigger( event, false );
-+				}, 50 );
-+			});
-+		},
-+		teardown: function() {
-+			$( this ).unbind( scrollEvent );
-+		}
-+	};
-+
-+	// also handles taphold
-+	$.event.special.tap = {
-+		tapholdThreshold: 750,
-+		emitTapOnTaphold: true,
-+		setup: function() {
-+			var thisObject = this,
-+				$this = $( thisObject ),
-+				isTaphold = false;
-+
-+			$this.bind( "vmousedown", function( event ) {
-+				isTaphold = false;
-+				if ( event.which && event.which !== 1 ) {
-+					return false;
-+				}
-+
-+				var origTarget = event.target,
-+					timer;
-+
-+				function clearTapTimer() {
-+					clearTimeout( timer );
-+				}
-+
-+				function clearTapHandlers() {
-+					clearTapTimer();
-+
-+					$this.unbind( "vclick", clickHandler )
-+						.unbind( "vmouseup", clearTapTimer );
-+					$document.unbind( "vmousecancel", clearTapHandlers );
-+				}
-+
-+				function clickHandler( event ) {
-+					clearTapHandlers();
-+
-+					// ONLY trigger a 'tap' event if the start target is
-+					// the same as the stop target.
-+					if ( !isTaphold && origTarget === event.target ) {
-+						triggerCustomEvent( thisObject, "tap", event );
-+					} else if ( isTaphold ) {
-+						event.preventDefault();
-+					}
-+				}
-+
-+				$this.bind( "vmouseup", clearTapTimer )
-+					.bind( "vclick", clickHandler );
-+				$document.bind( "vmousecancel", clearTapHandlers );
-+
-+				timer = setTimeout( function() {
-+					if ( !$.event.special.tap.emitTapOnTaphold ) {
-+						isTaphold = true;
-+					}
-+					triggerCustomEvent( thisObject, "taphold", $.Event( "taphold", { target: origTarget } ) );
-+				}, $.event.special.tap.tapholdThreshold );
-+			});
-+		},
-+		teardown: function() {
-+			$( this ).unbind( "vmousedown" ).unbind( "vclick" ).unbind( "vmouseup" );
-+			$document.unbind( "vmousecancel" );
-+		}
-+	};
-+
-+	// Also handles swipeleft, swiperight
-+	$.event.special.swipe = {
-+
-+		// More than this horizontal displacement, and we will suppress scrolling.
-+		scrollSupressionThreshold: 30,
-+
-+		// More time than this, and it isn't a swipe.
-+		durationThreshold: 1000,
-+
-+		// Swipe horizontal displacement must be more than this.
-+		horizontalDistanceThreshold: 30,
-+
-+		// Swipe vertical displacement must be less than this.
-+		verticalDistanceThreshold: 30,
-+
-+		getLocation: function ( event ) {
-+			var winPageX = window.pageXOffset,
-+				winPageY = window.pageYOffset,
-+				x = event.clientX,
-+				y = event.clientY;
-+
-+			if ( event.pageY === 0 && Math.floor( y ) > Math.floor( event.pageY ) ||
-+				event.pageX === 0 && Math.floor( x ) > Math.floor( event.pageX ) ) {
-+
-+				// iOS4 clientX/clientY have the value that should have been
-+				// in pageX/pageY. While pageX/page/ have the value 0
-+				x = x - winPageX;
-+				y = y - winPageY;
-+			} else if ( y < ( event.pageY - winPageY) || x < ( event.pageX - winPageX ) ) {
-+
-+				// Some Android browsers have totally bogus values for clientX/Y
-+				// when scrolling/zooming a page. Detectable since clientX/clientY
-+				// should never be smaller than pageX/pageY minus page scroll
-+				x = event.pageX - winPageX;
-+				y = event.pageY - winPageY;
-+			}
-+
-+			return {
-+				x: x,
-+				y: y
-+			};
-+		},
-+
-+		start: function( event ) {
-+			var data = event.originalEvent.touches ?
-+					event.originalEvent.touches[ 0 ] : event,
-+				location = $.event.special.swipe.getLocation( data );
-+			return {
-+						time: ( new Date() ).getTime(),
-+						coords: [ location.x, location.y ],
-+						origin: $( event.target )
-+					};
-+		},
-+
-+		stop: function( event ) {
-+			var data = event.originalEvent.touches ?
-+					event.originalEvent.touches[ 0 ] : event,
-+				location = $.event.special.swipe.getLocation( data );
-+			return {
-+						time: ( new Date() ).getTime(),
-+						coords: [ location.x, location.y ]
-+					};
-+		},
-+
-+		handleSwipe: function( start, stop, thisObject, origTarget ) {
-+			if ( stop.time - start.time < $.event.special.swipe.durationThreshold &&
-+				Math.abs( start.coords[ 0 ] - stop.coords[ 0 ] ) > $.event.special.swipe.horizontalDistanceThreshold &&
-+				Math.abs( start.coords[ 1 ] - stop.coords[ 1 ] ) < $.event.special.swipe.verticalDistanceThreshold ) {
-+				var direction = start.coords[0] > stop.coords[ 0 ] ? "swipeleft" : "swiperight";
-+
-+				triggerCustomEvent( thisObject, "swipe", $.Event( "swipe", { target: origTarget, swipestart: start, swipestop: stop }), true );
-+				triggerCustomEvent( thisObject, direction,$.Event( direction, { target: origTarget, swipestart: start, swipestop: stop } ), true );
-+				return true;
-+			}
-+			return false;
-+
-+		},
-+
-+		// This serves as a flag to ensure that at most one swipe event event is
-+		// in work at any given time
-+		eventInProgress: false,
-+
-+		setup: function() {
-+			var events,
-+				thisObject = this,
-+				$this = $( thisObject ),
-+				context = {};
-+
-+			// Retrieve the events data for this element and add the swipe context
-+			events = $.data( this, "mobile-events" );
-+			if ( !events ) {
-+				events = { length: 0 };
-+				$.data( this, "mobile-events", events );
-+			}
-+			events.length++;
-+			events.swipe = context;
-+
-+			context.start = function( event ) {
-+
-+				// Bail if we're already working on a swipe event
-+				if ( $.event.special.swipe.eventInProgress ) {
-+					return;
-+				}
-+				$.event.special.swipe.eventInProgress = true;
-+
-+				var stop,
-+					start = $.event.special.swipe.start( event ),
-+					origTarget = event.target,
-+					emitted = false;
-+
-+				context.move = function( event ) {
-+					if ( !start ) {
-+						return;
-+					}
-+
-+					stop = $.event.special.swipe.stop( event );
-+					if ( !emitted ) {
-+						emitted = $.event.special.swipe.handleSwipe( start, stop, thisObject, origTarget );
-+						if ( emitted ) {
-+
-+							// Reset the context to make way for the next swipe event
-+							$.event.special.swipe.eventInProgress = false;
-+						}
-+					}
-+					// prevent scrolling
-+					if ( Math.abs( start.coords[ 0 ] - stop.coords[ 0 ] ) > $.event.special.swipe.scrollSupressionThreshold ) {
-+						event.preventDefault();
-+					}
-+				};
-+
-+				context.stop = function() {
-+						emitted = true;
-+
-+						// Reset the context to make way for the next swipe event
-+						$.event.special.swipe.eventInProgress = false;
-+						$document.off( touchMoveEvent, context.move );
-+						context.move = null;
-+				};
-+
-+				$document.on( touchMoveEvent, context.move )
-+					.one( touchStopEvent, context.stop );
-+			};
-+			$this.on( touchStartEvent, context.start );
-+		},
-+
-+		teardown: function() {
-+			var events, context;
-+
-+			events = $.data( this, "mobile-events" );
-+			if ( events ) {
-+				context = events.swipe;
-+				delete events.swipe;
-+				events.length--;
-+				if ( events.length === 0 ) {
-+					$.removeData( this, "mobile-events" );
-+				}
-+			}
-+
-+			if ( context ) {
-+				if ( context.start ) {
-+					$( this ).off( touchStartEvent, context.start );
-+				}
-+				if ( context.move ) {
-+					$document.off( touchMoveEvent, context.move );
-+				}
-+				if ( context.stop ) {
-+					$document.off( touchStopEvent, context.stop );
-+				}
-+			}
-+		}
-+	};
-+	$.each({
-+		scrollstop: "scrollstart",
-+		taphold: "tap",
-+		swipeleft: "swipe.left",
-+		swiperight: "swipe.right"
-+	}, function( event, sourceEvent ) {
-+
-+		$.event.special[ event ] = {
-+			setup: function() {
-+				$( this ).bind( sourceEvent, $.noop );
-+			},
-+			teardown: function() {
-+				$( this ).unbind( sourceEvent );
-+			}
-+		};
-+	});
-+
-+})( jQuery, this );
- 
- 
- }));
-diff --git a/lib/web/jquery/patches/jquery-ui.js b/lib/web/jquery/patches/jquery-ui.js
-new file mode 100644
-index 00000000000..ae2d8da7ece
---- /dev/null
-+++ b/lib/web/jquery/patches/jquery-ui.js
-@@ -0,0 +1,46 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([
-+    'jquery'
-+], function ($) {
-+    'use strict';
-+
-+    /**
-+     * Patch for CVE-2016-7103 (XSS vulnerability).
-+     * Can safely remove only when jQuery UI is upgraded to >= 1.12.x.
-+     * https://www.cvedetails.com/cve/CVE-2016-7103/
-+     */
-+    function dialogPatch() {
-+        $.widget('ui.dialog', $.ui.dialog, {
-+            /** @inheritdoc */
-+            _createTitlebar: function () {
-+                this.options.closeText = $('<a>').text('' + this.options.closeText).html();
-+
-+                this._superApply();
-+            },
-+
-+            /** @inheritdoc */
-+            _setOption: function (key, value) {
-+                if (key === 'closeText') {
-+                    value = $('<a>').text('' + value).html();
-+                }
-+
-+                this._super(key, value);
-+            }
-+        });
-+    }
-+
-+    return function () {
-+        var majorVersion = $.ui.version.split('.')[0],
-+            minorVersion = $.ui.version.split('.')[1];
-+
-+        if (majorVersion === 1 && minorVersion >= 12 || majorVersion >= 2) {
-+            console.warn('jQuery patch for CVE-2016-7103 is no longer necessary, and should be removed');
-+        }
-+
-+        dialogPatch();
-+    };
-+});
-diff --git a/lib/web/jquery/patches/jquery.js b/lib/web/jquery/patches/jquery.js
-new file mode 100644
-index 00000000000..5c741d0832b
---- /dev/null
-+++ b/lib/web/jquery/patches/jquery.js
-@@ -0,0 +1,33 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+define([], function () {
-+    'use strict';
-+
-+    /**
-+     * Patch for CVE-2015-9251 (XSS vulnerability).
-+     * Can safely remove only when jQuery UI is upgraded to >= 3.3.x.
-+     * https://www.cvedetails.com/cve/CVE-2015-9251/
-+     */
-+    function ajaxResponsePatch(jQuery) {
-+        jQuery.ajaxPrefilter(function (s) {
-+            if (s.crossDomain) {
-+                s.contents.script = false;
-+            }
-+        });
-+    }
-+
-+    return function ($) {
-+        var majorVersion = $.fn.jquery.split('.')[0];
-+
-+        if (majorVersion >= 3) {
-+            console.warn('jQuery patch for CVE-2015-9251 is no longer necessary, and should be removed');
-+        }
-+
-+        ajaxResponsePatch($);
-+
-+        return $;
-+    };
-+});
-diff --git a/lib/web/legacy-build.min.js b/lib/web/legacy-build.min.js
-index 52d132d634b..24e8c242986 100644
---- a/lib/web/legacy-build.min.js
-+++ b/lib/web/legacy-build.min.js
-@@ -5,4 +5,4 @@ var Prototype={Version:"1.7",Browser:(function(){var d=navigator.userAgent;var b
-  *  Released under the MIT, BSD, and GPL Licenses.
-  *  More information: http://sizzlejs.com/
-  */
--(function(){var w=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,p=0,g=Object.prototype.toString,u=false,o=true;[0,0].sort(function(){o=false;return 0});var d=function(L,B,I,D){I=I||[];var e=B=B||document;if(B.nodeType!==1&&B.nodeType!==9){return[]}if(!L||typeof L!=="string"){return I}var J=[],K,G,P,O,H,A,z=true,E=v(B),N=L;while((w.exec(""),K=w.exec(N))!==null){N=K[3];J.push(K[1]);if(K[2]){A=K[3];break}}if(J.length>1&&q.exec(L)){if(J.length===2&&h.relative[J[0]]){G=l(J[0]+J[1],B)}else{G=h.relative[J[0]]?[B]:d(J.shift(),B);while(J.length){L=J.shift();if(h.relative[L]){L+=J.shift()}G=l(L,G)}}}else{if(!D&&J.length>1&&B.nodeType===9&&!E&&h.match.ID.test(J[0])&&!h.match.ID.test(J[J.length-1])){var Q=d.find(J.shift(),B,E);B=Q.expr?d.filter(Q.expr,Q.set)[0]:Q.set[0]}if(B){var Q=D?{expr:J.pop(),set:b(D)}:d.find(J.pop(),J.length===1&&(J[0]==="~"||J[0]==="+")&&B.parentNode?B.parentNode:B,E);G=Q.expr?d.filter(Q.expr,Q.set):Q.set;if(J.length>0){P=b(G)}else{z=false}while(J.length){var C=J.pop(),F=C;if(!h.relative[C]){C=""}else{F=J.pop()}if(F==null){F=B}h.relative[C](P,F,E)}}else{P=J=[]}}if(!P){P=G}if(!P){throw"Syntax error, unrecognized expression: "+(C||L)}if(g.call(P)==="[object Array]"){if(!z){I.push.apply(I,P)}else{if(B&&B.nodeType===1){for(var M=0;P[M]!=null;M++){if(P[M]&&(P[M]===true||P[M].nodeType===1&&n(B,P[M]))){I.push(G[M])}}}else{for(var M=0;P[M]!=null;M++){if(P[M]&&P[M].nodeType===1){I.push(G[M])}}}}}else{b(P,I)}if(A){d(A,e,I,D);d.uniqueSort(I)}return I};d.uniqueSort=function(z){if(f){u=o;z.sort(f);if(u){for(var e=1;e<z.length;e++){if(z[e]===z[e-1]){z.splice(e--,1)}}}}return z};d.matches=function(e,z){return d(e,null,null,z)};d.find=function(F,e,G){var E,C;if(!F){return[]}for(var B=0,A=h.order.length;B<A;B++){var D=h.order[B],C;if((C=h.leftMatch[D].exec(F))){var z=C[1];C.splice(1,1);if(z.substr(z.length-1)!=="\\"){C[1]=(C[1]||"").replace(/\\/g,"");E=h.find[D](C,e,G);if(E!=null){F=F.replace(h.match[D],"");break}}}}if(!E){E=e.getElementsByTagName("*")}return{set:E,expr:F}};d.filter=function(I,H,L,B){var A=I,N=[],F=H,D,e,E=H&&H[0]&&v(H[0]);while(I&&H.length){for(var G in h.filter){if((D=h.match[G].exec(I))!=null){var z=h.filter[G],M,K;e=false;if(F==N){N=[]}if(h.preFilter[G]){D=h.preFilter[G](D,F,L,N,B,E);if(!D){e=M=true}else{if(D===true){continue}}}if(D){for(var C=0;(K=F[C])!=null;C++){if(K){M=z(K,D,C,F);var J=B^!!M;if(L&&M!=null){if(J){e=true}else{F[C]=false}}else{if(J){N.push(K);e=true}}}}}if(M!==undefined){if(!L){F=N}I=I.replace(h.match[G],"");if(!e){return[]}break}}}if(I==A){if(e==null){throw"Syntax error, unrecognized expression: "+I}else{break}}A=I}return F};var h=d.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(F,e,E){var C=typeof e==="string",G=C&&!/\W/.test(e),D=C&&!G;if(G&&!E){e=e.toUpperCase()}for(var B=0,A=F.length,z;B<A;B++){if((z=F[B])){while((z=z.previousSibling)&&z.nodeType!==1){}F[B]=D||z&&z.nodeName===e?z||false:z===e}}if(D){d.filter(e,F,true)}},">":function(E,z,F){var C=typeof z==="string";if(C&&!/\W/.test(z)){z=F?z:z.toUpperCase();for(var A=0,e=E.length;A<e;A++){var D=E[A];if(D){var B=D.parentNode;E[A]=B.nodeName===z?B:false}}}else{for(var A=0,e=E.length;A<e;A++){var D=E[A];if(D){E[A]=C?D.parentNode:D.parentNode===z}}if(C){d.filter(z,E,true)}}},"":function(B,z,D){var A=p++,e=y;if(!/\W/.test(z)){var C=z=D?z:z.toUpperCase();e=t}e("parentNode",z,A,B,C,D)},"~":function(B,z,D){var A=p++,e=y;if(typeof z==="string"&&!/\W/.test(z)){var C=z=D?z:z.toUpperCase();e=t}e("previousSibling",z,A,B,C,D)}},find:{ID:function(z,A,B){if(typeof A.getElementById!=="undefined"&&!B){var e=A.getElementById(z[1]);return e?[e]:[]}},NAME:function(A,D,E){if(typeof D.getElementsByName!=="undefined"){var z=[],C=D.getElementsByName(A[1]);for(var B=0,e=C.length;B<e;B++){if(C[B].getAttribute("name")===A[1]){z.push(C[B])}}return z.length===0?null:z}},TAG:function(e,z){return z.getElementsByTagName(e[1])}},preFilter:{CLASS:function(B,z,A,e,E,F){B=" "+B[1].replace(/\\/g,"")+" ";if(F){return B}for(var C=0,D;(D=z[C])!=null;C++){if(D){if(E^(D.className&&(" "+D.className+" ").indexOf(B)>=0)){if(!A){e.push(D)}}else{if(A){z[C]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(z,e){for(var A=0;e[A]===false;A++){}return e[A]&&v(e[A])?z[1]:z[1].toUpperCase()},CHILD:function(e){if(e[1]=="nth"){var z=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]=="even"&&"2n"||e[2]=="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(z[1]+(z[2]||1))-0;e[3]=z[3]-0}e[0]=p++;return e},ATTR:function(C,z,A,e,D,E){var B=C[1].replace(/\\/g,"");if(!E&&h.attrMap[B]){C[1]=h.attrMap[B]}if(C[2]==="~="){C[4]=" "+C[4]+" "}return C},PSEUDO:function(C,z,A,e,D){if(C[1]==="not"){if((w.exec(C[3])||"").length>1||/^\w/.test(C[3])){C[3]=d(C[3],null,null,z)}else{var B=d.filter(C[3],z,A,true^D);if(!A){e.push.apply(e,B)}return false}}else{if(h.match.POS.test(C[0])||h.match.CHILD.test(C[0])){return true}}return C},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(A,z,e){return !!d(e[3],A).length},header:function(e){return/h\d/i.test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toUpperCase()==="BUTTON"},input:function(e){return/input|select|textarea|button/i.test(e.nodeName)}},setFilters:{first:function(z,e){return e===0},last:function(A,z,e,B){return z===B.length-1},even:function(z,e){return e%2===0},odd:function(z,e){return e%2===1},lt:function(A,z,e){return z<e[3]-0},gt:function(A,z,e){return z>e[3]-0},nth:function(A,z,e){return e[3]-0==z},eq:function(A,z,e){return e[3]-0==z}},filter:{PSEUDO:function(E,A,B,F){var z=A[1],C=h.filters[z];if(C){return C(E,B,A,F)}else{if(z==="contains"){return(E.textContent||E.innerText||"").indexOf(A[3])>=0}else{if(z==="not"){var D=A[3];for(var B=0,e=D.length;B<e;B++){if(D[B]===E){return false}}return true}}}},CHILD:function(e,B){var E=B[1],z=e;switch(E){case"only":case"first":while((z=z.previousSibling)){if(z.nodeType===1){return false}}if(E=="first"){return true}z=e;case"last":while((z=z.nextSibling)){if(z.nodeType===1){return false}}return true;case"nth":var A=B[2],H=B[3];if(A==1&&H==0){return true}var D=B[0],G=e.parentNode;if(G&&(G.sizcache!==D||!e.nodeIndex)){var C=0;for(z=G.firstChild;z;z=z.nextSibling){if(z.nodeType===1){z.nodeIndex=++C}}G.sizcache=D}var F=e.nodeIndex-H;if(A==0){return F==0}else{return(F%A==0&&F/A>=0)}}},ID:function(z,e){return z.nodeType===1&&z.getAttribute("id")===e},TAG:function(z,e){return(e==="*"&&z.nodeType===1)||z.nodeName===e},CLASS:function(z,e){return(" "+(z.className||z.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(D,B){var A=B[1],e=h.attrHandle[A]?h.attrHandle[A](D):D[A]!=null?D[A]:D.getAttribute(A),E=e+"",C=B[2],z=B[4];return e==null?C==="!=":C==="="?E===z:C==="*="?E.indexOf(z)>=0:C==="~="?(" "+E+" ").indexOf(z)>=0:!z?E&&e!==false:C==="!="?E!=z:C==="^="?E.indexOf(z)===0:C==="$="?E.substr(E.length-z.length)===z:C==="|="?E===z||E.substr(0,z.length+1)===z+"-":false},POS:function(C,z,A,D){var e=z[2],B=h.setFilters[e];if(B){return B(C,A,z,D)}}}};var q=h.match.POS;for(var s in h.match){h.match[s]=new RegExp(h.match[s].source+/(?![^\[]*\])(?![^\(]*\))/.source);h.leftMatch[s]=new RegExp(/(^(?:.|\r|\n)*?)/.source+h.match[s].source)}var b=function(z,e){z=Array.prototype.slice.call(z,0);if(e){e.push.apply(e,z);return e}return z};try{Array.prototype.slice.call(document.documentElement.childNodes,0)}catch(r){b=function(C,B){var z=B||[];if(g.call(C)==="[object Array]"){Array.prototype.push.apply(z,C)}else{if(typeof C.length==="number"){for(var A=0,e=C.length;A<e;A++){z.push(C[A])}}else{for(var A=0;C[A];A++){z.push(C[A])}}}return z}}var f;if(document.documentElement.compareDocumentPosition){f=function(z,e){if(!z.compareDocumentPosition||!e.compareDocumentPosition){if(z==e){u=true}return 0}var A=z.compareDocumentPosition(e)&4?-1:z===e?0:1;if(A===0){u=true}return A}}else{if("sourceIndex" in document.documentElement){f=function(z,e){if(!z.sourceIndex||!e.sourceIndex){if(z==e){u=true}return 0}var A=z.sourceIndex-e.sourceIndex;if(A===0){u=true}return A}}else{if(document.createRange){f=function(B,z){if(!B.ownerDocument||!z.ownerDocument){if(B==z){u=true}return 0}var A=B.ownerDocument.createRange(),e=z.ownerDocument.createRange();A.setStart(B,0);A.setEnd(B,0);e.setStart(z,0);e.setEnd(z,0);var C=A.compareBoundaryPoints(Range.START_TO_END,e);if(C===0){u=true}return C}}}}(function(){var z=document.createElement("div"),A="script"+(new Date).getTime();z.innerHTML="<a name='"+A+"'/>";var e=document.documentElement;e.insertBefore(z,e.firstChild);if(!!document.getElementById(A)){h.find.ID=function(C,D,E){if(typeof D.getElementById!=="undefined"&&!E){var B=D.getElementById(C[1]);return B?B.id===C[1]||typeof B.getAttributeNode!=="undefined"&&B.getAttributeNode("id").nodeValue===C[1]?[B]:undefined:[]}};h.filter.ID=function(D,B){var C=typeof D.getAttributeNode!=="undefined"&&D.getAttributeNode("id");return D.nodeType===1&&C&&C.nodeValue===B}}e.removeChild(z);e=z=null})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){h.find.TAG=function(z,D){var C=D.getElementsByTagName(z[1]);if(z[1]==="*"){var B=[];for(var A=0;C[A];A++){if(C[A].nodeType===1){B.push(C[A])}}C=B}return C}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){h.attrHandle.href=function(z){return z.getAttribute("href",2)}}e=null})();if(document.querySelectorAll){(function(){var e=d,A=document.createElement("div");A.innerHTML="<p class='TEST'></p>";if(A.querySelectorAll&&A.querySelectorAll(".TEST").length===0){return}d=function(E,D,B,C){D=D||document;if(!C&&D.nodeType===9&&!v(D)){try{return b(D.querySelectorAll(E),B)}catch(F){}}return e(E,D,B,C)};for(var z in e){d[z]=e[z]}A=null})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}h.order.splice(1,0,"CLASS");h.find.CLASS=function(z,A,B){if(typeof A.getElementsByClassName!=="undefined"&&!B){return A.getElementsByClassName(z[1])}};e=null})()}function t(z,E,D,I,F,H){var G=z=="previousSibling"&&!H;for(var B=0,A=I.length;B<A;B++){var e=I[B];if(e){if(G&&e.nodeType===1){e.sizcache=D;e.sizset=B}e=e[z];var C=false;while(e){if(e.sizcache===D){C=I[e.sizset];break}if(e.nodeType===1&&!H){e.sizcache=D;e.sizset=B}if(e.nodeName===E){C=e;break}e=e[z]}I[B]=C}}}function y(z,E,D,I,F,H){var G=z=="previousSibling"&&!H;for(var B=0,A=I.length;B<A;B++){var e=I[B];if(e){if(G&&e.nodeType===1){e.sizcache=D;e.sizset=B}e=e[z];var C=false;while(e){if(e.sizcache===D){C=I[e.sizset];break}if(e.nodeType===1){if(!H){e.sizcache=D;e.sizset=B}if(typeof E!=="string"){if(e===E){C=true;break}}else{if(d.filter(E,[e]).length>0){C=e;break}}}e=e[z]}I[B]=C}}}var n=document.compareDocumentPosition?function(z,e){return z.compareDocumentPosition(e)&16}:function(z,e){return z!==e&&(z.contains?z.contains(e):true)};var v=function(e){return e.nodeType===9&&e.documentElement.nodeName!=="HTML"||!!e.ownerDocument&&e.ownerDocument.documentElement.nodeName!=="HTML"};var l=function(e,F){var B=[],C="",D,A=F.nodeType?[F]:F;while((D=h.match.PSEUDO.exec(e))){C+=D[0];e=e.replace(h.match.PSEUDO,"")}e=h.relative[e]?e+"*":e;for(var E=0,z=A.length;E<z;E++){d(e,A[E],B)}return d.filter(C,B)};window.Sizzle=d})();(function(e){var f=Prototype.Selector.extendElements;function b(g,h){return f(e(g,h||document))}function d(h,g){return e.matches(g,[h]).length==1}Prototype.Selector.engine=e;Prototype.Selector.select=b;Prototype.Selector.match=d})(Sizzle);window.Sizzle=Prototype._original_property;delete Prototype._original_property;var Form={reset:function(b){b=$(b);b.reset();return b},serializeElements:function(n,f){if(typeof f!="object"){f={hash:!!f}}else{if(Object.isUndefined(f.hash)){f.hash=true}}var g,l,b=false,h=f.submit,d,e;if(f.hash){e={};d=function(o,p,q){if(p in o){if(!Object.isArray(o[p])){o[p]=[o[p]]}o[p].push(q)}else{o[p]=q}return o}}else{e="";d=function(o,p,q){return o+(o?"&":"")+encodeURIComponent(p)+"="+encodeURIComponent(q)}}return n.inject(e,function(o,p){if(!p.disabled&&p.name){g=p.name;l=$(p).getValue();if(l!=null&&p.type!="file"&&(p.type!="submit"||(!b&&h!==false&&(!h||g==h)&&(b=true)))){o=d(o,g,l)}}return o})}};Form.Methods={serialize:function(d,b){return Form.serializeElements(Form.getElements(d),b)},getElements:function(g){var h=$(g).getElementsByTagName("*"),f,b=[],e=Form.Element.Serializers;for(var d=0;f=h[d];d++){b.push(f)}return b.inject([],function(l,n){if(e[n.tagName.toLowerCase()]){l.push(Element.extend(n))}return l})},getInputs:function(l,e,f){l=$(l);var b=l.getElementsByTagName("input");if(!e&&!f){return $A(b).map(Element.extend)}for(var g=0,n=[],h=b.length;g<h;g++){var d=b[g];if((e&&d.type!=e)||(f&&d.name!=f)){continue}n.push(Element.extend(d))}return n},disable:function(b){b=$(b);Form.getElements(b).invoke("disable");return b},enable:function(b){b=$(b);Form.getElements(b).invoke("enable");return b},findFirstElement:function(d){var e=$(d).getElements().findAll(function(f){return"hidden"!=f.type&&!f.disabled});var b=e.findAll(function(f){return f.hasAttribute("tabIndex")&&f.tabIndex>=0}).sortBy(function(f){return f.tabIndex}).first();return b?b:e.find(function(f){return/^(?:input|select|textarea)$/i.test(f.tagName)})},focusFirstElement:function(d){d=$(d);var b=d.findFirstElement();if(b){b.activate()}return d},request:function(d,b){d=$(d),b=Object.clone(b||{});var f=b.parameters,e=d.readAttribute("action")||"";if(e.blank()){e=window.location.href}b.parameters=d.serialize(true);if(f){if(Object.isString(f)){f=f.toQueryParams()}Object.extend(b.parameters,f)}if(d.hasAttribute("method")&&!b.method){b.method=d.method}return new Ajax.Request(e,b)}};Form.Element={focus:function(b){$(b).focus();return b},select:function(b){$(b).select();return b}};Form.Element.Methods={serialize:function(b){b=$(b);if(!b.disabled&&b.name){var d=b.getValue();if(d!=undefined){var e={};e[b.name]=d;return Object.toQueryString(e)}}return""},getValue:function(b){b=$(b);var d=b.tagName.toLowerCase();return Form.Element.Serializers[d](b)},setValue:function(b,d){b=$(b);var e=b.tagName.toLowerCase();Form.Element.Serializers[e](b,d);return b},clear:function(b){$(b).value="";return b},present:function(b){return $(b).value!=""},activate:function(b){b=$(b);try{b.focus();if(b.select&&(b.tagName.toLowerCase()!="input"||!(/^(?:button|reset|submit)$/i.test(b.type)))){b.select()}}catch(d){}return b},disable:function(b){b=$(b);b.disabled=true;return b},enable:function(b){b=$(b);b.disabled=false;return b}};var Field=Form.Element;var $F=Form.Element.Methods.getValue;Form.Element.Serializers=(function(){function d(n,o){switch(n.type.toLowerCase()){case"checkbox":case"radio":return h(n,o);default:return g(n,o)}}function h(n,o){if(Object.isUndefined(o)){return n.checked?n.value:null}else{n.checked=!!o}}function g(n,o){if(Object.isUndefined(o)){return n.value}else{n.value=o}}function b(p,s){if(Object.isUndefined(s)){return(p.type==="select-one"?e:f)(p)}var o,q,t=!Object.isArray(s);for(var n=0,r=p.length;n<r;n++){o=p.options[n];q=this.optionValue(o);if(t){if(q==s){o.selected=true;return}}else{o.selected=s.include(q)}}}function e(o){var n=o.selectedIndex;return n>=0?l(o.options[n]):null}function f(q){var n,r=q.length;if(!r){return null}for(var p=0,n=[];p<r;p++){var o=q.options[p];if(o.selected){n.push(l(o))}}return n}function l(n){return Element.hasAttribute(n,"value")?n.value:n.text}return{input:d,inputSelector:h,textarea:g,select:b,selectOne:e,selectMany:f,optionValue:l,button:g}})();Abstract.TimedObserver=Class.create(PeriodicalExecuter,{initialize:function($super,b,d,e){$super(e,d);this.element=$(b);this.lastValue=this.getValue()},execute:function(){var b=this.getValue();if(Object.isString(this.lastValue)&&Object.isString(b)?this.lastValue!=b:String(this.lastValue)!=String(b)){this.callback(this.element,b);this.lastValue=b}}});Form.Element.Observer=Class.create(Abstract.TimedObserver,{getValue:function(){return Form.Element.getValue(this.element)}});Form.Observer=Class.create(Abstract.TimedObserver,{getValue:function(){return Form.serialize(this.element)}});Abstract.EventObserver=Class.create({initialize:function(b,d){this.element=$(b);this.callback=d;this.lastValue=this.getValue();if(this.element.tagName.toLowerCase()=="form"){this.registerFormCallbacks()}else{this.registerCallback(this.element)}},onElementEvent:function(){var b=this.getValue();if(this.lastValue!=b){this.callback(this.element,b);this.lastValue=b}},registerFormCallbacks:function(){Form.getElements(this.element).each(this.registerCallback,this)},registerCallback:function(b){if(b.type){switch(b.type.toLowerCase()){case"checkbox":case"radio":Event.observe(b,"click",this.onElementEvent.bind(this));break;default:Event.observe(b,"change",this.onElementEvent.bind(this));break}}}});Form.Element.EventObserver=Class.create(Abstract.EventObserver,{getValue:function(){return Form.Element.getValue(this.element)}});Form.EventObserver=Class.create(Abstract.EventObserver,{getValue:function(){return Form.serialize(this.element)}});(function(){var J={KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,KEY_HOME:36,KEY_END:35,KEY_PAGEUP:33,KEY_PAGEDOWN:34,KEY_INSERT:45,cache:{}};var h=document.documentElement;var K="onmouseenter" in h&&"onmouseleave" in h;var b=function(L){return false};if(window.attachEvent){if(window.addEventListener){b=function(L){return !(L instanceof window.Event)}}else{b=function(L){return true}}}var y;function H(M,L){return M.which?(M.which===L+1):(M.button===L)}var u={0:1,1:4,2:2};function F(M,L){return M.button===u[L]}function I(M,L){switch(L){case 0:return M.which==1&&!M.metaKey;case 1:return M.which==2||(M.which==1&&M.metaKey);case 2:return M.which==3;default:return false}}if(window.attachEvent){if(!window.addEventListener){y=F}else{y=function(M,L){return b(M)?F(M,L):H(M,L)}}}else{if(Prototype.Browser.WebKit){y=I}else{y=H}}function C(L){return y(L,0)}function A(L){return y(L,1)}function t(L){return y(L,2)}function f(N){N=J.extend(N);var M=N.target,L=N.type,O=N.currentTarget;if(O&&O.tagName){if(L==="load"||L==="error"||(L==="click"&&O.tagName.toLowerCase()==="input"&&O.type==="radio")){M=O}}if(M.nodeType==Node.TEXT_NODE){M=M.parentNode}return Element.extend(M)}function v(M,N){var L=J.element(M);if(!N){return L}while(L){if(Object.isElement(L)&&Prototype.Selector.match(L,N)){return Element.extend(L)}L=L.parentNode}}function z(L){return{x:e(L),y:d(L)}}function e(N){var M=document.documentElement,L=document.body||{scrollLeft:0};return N.pageX||(N.clientX+(M.scrollLeft||L.scrollLeft)-(M.clientLeft||0))}function d(N){var M=document.documentElement,L=document.body||{scrollTop:0};return N.pageY||(N.clientY+(M.scrollTop||L.scrollTop)-(M.clientTop||0))}function w(L){J.extend(L);L.preventDefault();L.stopPropagation();L.stopped=true}J.Methods={isLeftClick:C,isMiddleClick:A,isRightClick:t,element:f,findElement:v,pointer:z,pointerX:e,pointerY:d,stop:w};var E=Object.keys(J.Methods).inject({},function(L,M){L[M]=J.Methods[M].methodize();return L});if(window.attachEvent){function o(M){var L;switch(M.type){case"mouseover":case"mouseenter":L=M.fromElement;break;case"mouseout":case"mouseleave":L=M.toElement;break;default:return null}return Element.extend(L)}var B={stopPropagation:function(){this.cancelBubble=true},preventDefault:function(){this.returnValue=false},inspect:function(){return"[object Event]"}};J.extend=function(M,L){if(!M){return false}if(!b(M)){return M}if(M._extendedByPrototype){return M}M._extendedByPrototype=Prototype.emptyFunction;var N=J.pointer(M);Object.extend(M,{target:M.srcElement||L,relatedTarget:o(M),pageX:N.x,pageY:N.y});Object.extend(M,E);Object.extend(M,B);return M}}else{J.extend=Prototype.K}if(window.addEventListener){J.prototype=window.Event.prototype||document.createEvent("HTMLEvents").__proto__;Object.extend(J.prototype,E)}function s(P,O,Q){var N=Element.retrieve(P,"prototype_event_registry");if(Object.isUndefined(N)){g.push(P);N=Element.retrieve(P,"prototype_event_registry",$H())}var L=N.get(O);if(Object.isUndefined(L)){L=[];N.set(O,L)}if(L.pluck("handler").include(Q)){return false}var M;if(O.include(":")){M=function(R){if(Object.isUndefined(R.eventName)){return false}if(R.eventName!==O){return false}J.extend(R,P);Q.call(P,R)}}else{if(!K&&(O==="mouseenter"||O==="mouseleave")){if(O==="mouseenter"||O==="mouseleave"){M=function(S){J.extend(S,P);var R=S.relatedTarget;while(R&&R!==P){try{R=R.parentNode}catch(T){R=P}}if(R===P){return}Q.call(P,S)}}}else{M=function(R){J.extend(R,P);Q.call(P,R)}}}M.handler=Q;L.push(M);return M}function n(){for(var L=0,M=g.length;L<M;L++){J.stopObserving(g[L]);g[L]=null}}var g=[];if(Prototype.Browser.IE){window.attachEvent("onunload",n)}if(Prototype.Browser.WebKit){window.addEventListener("unload",Prototype.emptyFunction,false)}var r=Prototype.K,l={mouseenter:"mouseover",mouseleave:"mouseout"};if(!K){r=function(L){return(l[L]||L)}}function D(O,N,P){O=$(O);var M=s(O,N,P);if(!M){return O}if(N.include(":")){if(O.addEventListener){O.addEventListener("dataavailable",M,false)}else{O.attachEvent("ondataavailable",M);O.attachEvent("onlosecapture",M)}}else{var L=r(N);if(O.addEventListener){O.addEventListener(L,M,false)}else{O.attachEvent("on"+L,M)}}return O}function q(R,O,S){R=$(R);var N=Element.retrieve(R,"prototype_event_registry");if(!N){return R}if(!O){N.each(function(U){var T=U.key;q(R,T)});return R}var P=N.get(O);if(!P){return R}if(!S){P.each(function(T){q(R,O,T.handler)});return R}var Q=P.length,M;while(Q--){if(P[Q].handler===S){M=P[Q];break}}if(!M){return R}if(O.include(":")){if(R.removeEventListener){R.removeEventListener("dataavailable",M,false)}else{R.detachEvent("ondataavailable",M);R.detachEvent("onlosecapture",M)}}else{var L=r(O);if(R.removeEventListener){R.removeEventListener(L,M,false)}else{R.detachEvent("on"+L,M)}}N.set(O,P.without(M));return R}function G(O,N,M,L){O=$(O);if(Object.isUndefined(L)){L=true}if(O==document&&document.createEvent&&!O.dispatchEvent){O=document.documentElement}var P;if(document.createEvent){P=document.createEvent("HTMLEvents");P.initEvent("dataavailable",L,true)}else{P=document.createEventObject();P.eventType=L?"ondataavailable":"onlosecapture"}P.eventName=N;P.memo=M||{};if(document.createEvent){O.dispatchEvent(P)}else{O.fireEvent(P.eventType,P)}return J.extend(P)}J.Handler=Class.create({initialize:function(N,M,L,O){this.element=$(N);this.eventName=M;this.selector=L;this.callback=O;this.handler=this.handleEvent.bind(this)},start:function(){J.observe(this.element,this.eventName,this.handler);return this},stop:function(){J.stopObserving(this.element,this.eventName,this.handler);return this},handleEvent:function(M){var L=J.findElement(M,this.selector);if(L){this.callback.call(this.element,M,L)}}});function p(N,M,L,O){N=$(N);if(Object.isFunction(L)&&Object.isUndefined(O)){O=L,L=null}return new J.Handler(N,M,L,O).start()}Object.extend(J,J.Methods);Object.extend(J,{fire:G,observe:D,stopObserving:q,on:p});Element.addMethods({fire:G,observe:D,stopObserving:q,on:p});Object.extend(document,{fire:G.methodize(),observe:D.methodize(),stopObserving:q.methodize(),on:p.methodize(),loaded:false});if(window.Event){Object.extend(window.Event,J)}else{window.Event=J}})();(function(){var e;function b(){if(document.loaded){return}if(e){window.clearTimeout(e)}document.loaded=true;document.fire("dom:loaded")}function d(){if(document.readyState==="complete"){document.stopObserving("readystatechange",d);b()}}if(document.addEventListener){document.addEventListener("DOMContentLoaded",b,false)}else{document.observe("readystatechange",d);if(window==top){var e=window.setInterval(function(){try{document.documentElement.doScroll("left")}catch(f){return}window.clearInterval(e);b()},5)}}Event.observe(window,"load",b)})();Element.addMethods();Hash.toQueryString=Object.toQueryString;var Toggle={display:Element.toggle};Element.Methods.childOf=Element.Methods.descendantOf;var Insertion={Before:function(b,d){return Element.insert(b,{before:d})},Top:function(b,d){return Element.insert(b,{top:d})},Bottom:function(b,d){return Element.insert(b,{bottom:d})},After:function(b,d){return Element.insert(b,{after:d})}};var $continue=new Error('"throw $continue" is deprecated, use "return" instead');var Position={includeScrollOffsets:false,prepare:function(){this.deltaX=window.pageXOffset||document.documentElement.scrollLeft||document.body.scrollLeft||0;this.deltaY=window.pageYOffset||document.documentElement.scrollTop||document.body.scrollTop||0},within:function(d,b,e){if(this.includeScrollOffsets){return this.withinIncludingScrolloffsets(d,b,e)}this.xcomp=b;this.ycomp=e;this.offset=Element.cumulativeOffset(d);return(e>=this.offset[1]&&e<this.offset[1]+d.offsetHeight&&b>=this.offset[0]&&b<this.offset[0]+d.offsetWidth)},withinIncludingScrolloffsets:function(d,b,f){var e=Element.cumulativeScrollOffset(d);this.xcomp=b+e[0]-this.deltaX;this.ycomp=f+e[1]-this.deltaY;this.offset=Element.cumulativeOffset(d);return(this.ycomp>=this.offset[1]&&this.ycomp<this.offset[1]+d.offsetHeight&&this.xcomp>=this.offset[0]&&this.xcomp<this.offset[0]+d.offsetWidth)},overlap:function(d,b){if(!d){return 0}if(d=="vertical"){return((this.offset[1]+b.offsetHeight)-this.ycomp)/b.offsetHeight}if(d=="horizontal"){return((this.offset[0]+b.offsetWidth)-this.xcomp)/b.offsetWidth}},cumulativeOffset:Element.Methods.cumulativeOffset,positionedOffset:Element.Methods.positionedOffset,absolutize:function(b){Position.prepare();return Element.absolutize(b)},relativize:function(b){Position.prepare();return Element.relativize(b)},realOffset:Element.Methods.cumulativeScrollOffset,offsetParent:Element.Methods.getOffsetParent,page:Element.Methods.viewportOffset,clone:function(d,e,b){b=b||{};return Element.clonePosition(e,d,b)}};if(!document.getElementsByClassName){document.getElementsByClassName=function(d){function b(e){return e.blank()?null:"[contains(concat(' ', @class, ' '), ' "+e+" ')]"}d.getElementsByClassName=Prototype.BrowserFeatures.XPath?function(e,g){g=g.toString().strip();var f=/\s/.test(g)?$w(g).map(b).join(""):b(g);return f?document._getElementsByXPath(".//*"+f,e):[]}:function(g,h){h=h.toString().strip();var l=[],n=(/\s/.test(h)?$w(h):null);if(!n&&!h){return l}var e=$(g).getElementsByTagName("*");h=" "+h+" ";for(var f=0,p,o;p=e[f];f++){if(p.className&&(o=" "+p.className+" ")&&(o.include(h)||(n&&n.all(function(q){return !q.toString().blank()&&o.include(" "+q+" ")})))){l.push(Element.extend(p))}}return l};return function(f,e){return $(e||document.body).getElementsByClassName(f)}}(Element.Methods)}Element.ClassNames=Class.create();Element.ClassNames.prototype={initialize:function(b){this.element=$(b)},_each:function(b){this.element.className.split(/\s+/).select(function(d){return d.length>0})._each(b)},set:function(b){this.element.className=b},add:function(b){if(this.include(b)){return}this.set($A(this).concat(b).join(" "))},remove:function(b){if(!this.include(b)){return}this.set($A(this).without(b).join(" "))},toString:function(){return $A(this).join(" ")}};Object.extend(Element.ClassNames.prototype,Enumerable);(function(){window.Selector=Class.create({initialize:function(b){this.expression=b.strip()},findElements:function(b){return Prototype.Selector.select(this.expression,b)},match:function(b){return Prototype.Selector.match(b,this.expression)},toString:function(){return this.expression},inspect:function(){return"#<Selector: "+this.expression+">"}});Object.extend(Selector,{matchElements:function(h,l){var b=Prototype.Selector.match,f=[];for(var e=0,g=h.length;e<g;e++){var d=h[e];if(b(d,l)){f.push(Element.extend(d))}}return f},findElement:function(h,l,d){d=d||0;var b=0,f;for(var e=0,g=h.length;e<g;e++){f=h[e];if(Prototype.Selector.match(f,l)&&d===b++){return Element.extend(f)}}},findChildElements:function(d,e){var b=e.toArray().join(", ");return Prototype.Selector.select(b,d||document)}})})();var Window=Class.create();Window.keepMultiModalWindow=false;Window.hasEffectLib=(typeof Effect!="undefined");Window.resizeEffectDuration=0.4;Window.prototype={initialize:function(){var e;var d=0;if(arguments.length>0){if(typeof arguments[0]=="string"){e=arguments[0];d=1}else{e=arguments[0]?arguments[0].id:null}}if(!e){e="window_"+new Date().getTime()}if($(e)){alert("Window "+e+" is already registered in the DOM! Make sure you use setDestroyOnClose() or destroyOnClose: true in the constructor")}this.options=Object.extend({className:"dialog",windowClassName:null,blurClassName:null,minWidth:100,minHeight:20,resizable:true,closable:true,minimizable:true,maximizable:true,draggable:true,userData:null,showEffect:(Window.hasEffectLib?Effect.Appear:Element.show),hideEffect:(Window.hasEffectLib?Effect.Fade:Element.hide),showEffectOptions:{},hideEffectOptions:{},effectOptions:null,parent:document.body,title:"&nbsp;",url:null,onload:Prototype.emptyFunction,width:200,height:300,opacity:1,recenterAuto:true,wiredDrag:false,closeOnEsc:true,closeCallback:null,destroyOnClose:false,gridX:1,gridY:1},arguments[d]||{});if(this.options.blurClassName){this.options.focusClassName=this.options.className}if(typeof this.options.top=="undefined"&&typeof this.options.bottom=="undefined"){this.options.top=this._round(Math.random()*500,this.options.gridY)}if(typeof this.options.left=="undefined"&&typeof this.options.right=="undefined"){this.options.left=this._round(Math.random()*500,this.options.gridX)}if(this.options.effectOptions){Object.extend(this.options.hideEffectOptions,this.options.effectOptions);Object.extend(this.options.showEffectOptions,this.options.effectOptions);if(this.options.showEffect==Element.Appear){this.options.showEffectOptions.to=this.options.opacity}}if(Window.hasEffectLib){if(this.options.showEffect==Effect.Appear){this.options.showEffectOptions.to=this.options.opacity}if(this.options.hideEffect==Effect.Fade){this.options.hideEffectOptions.from=this.options.opacity}}if(this.options.hideEffect==Element.hide){this.options.hideEffect=function(){Element.hide(this.element);if(this.options.destroyOnClose){this.destroy()}}.bind(this)}if(this.options.parent!=document.body){this.options.parent=$(this.options.parent)}this.element=this._createWindow(e);this.element.win=this;this.eventMouseDown=this._initDrag.bindAsEventListener(this);this.eventMouseUp=this._endDrag.bindAsEventListener(this);this.eventMouseMove=this._updateDrag.bindAsEventListener(this);this.eventOnLoad=this._getWindowBorderSize.bindAsEventListener(this);this.eventMouseDownContent=this.toFront.bindAsEventListener(this);this.eventResize=this._recenter.bindAsEventListener(this);this.eventKeyUp=this._keyUp.bindAsEventListener(this);this.topbar=$(this.element.id+"_top");this.bottombar=$(this.element.id+"_bottom");this.content=$(this.element.id+"_content");Event.observe(this.topbar,"mousedown",this.eventMouseDown);Event.observe(this.bottombar,"mousedown",this.eventMouseDown);Event.observe(this.content,"mousedown",this.eventMouseDownContent);Event.observe(window,"load",this.eventOnLoad);Event.observe(window,"resize",this.eventResize);Event.observe(window,"scroll",this.eventResize);Event.observe(document,"keyup",this.eventKeyUp);Event.observe(this.options.parent,"scroll",this.eventResize);if(this.options.draggable){var b=this;[this.topbar,this.topbar.up().previous(),this.topbar.up().next()].each(function(f){f.observe("mousedown",b.eventMouseDown);f.addClassName("top_draggable")});[this.bottombar.up(),this.bottombar.up().previous(),this.bottombar.up().next()].each(function(f){f.observe("mousedown",b.eventMouseDown);f.addClassName("bottom_draggable")})}if(this.options.resizable){this.sizer=$(this.element.id+"_sizer");Event.observe(this.sizer,"mousedown",this.eventMouseDown)}this.useLeft=null;this.useTop=null;if(typeof this.options.left!="undefined"){this.element.setStyle({left:parseFloat(this.options.left)+"px"});this.useLeft=true}else{this.element.setStyle({right:parseFloat(this.options.right)+"px"});this.useLeft=false}if(typeof this.options.top!="undefined"){this.element.setStyle({top:parseFloat(this.options.top)+"px"});this.useTop=true}else{this.element.setStyle({bottom:parseFloat(this.options.bottom)+"px"});this.useTop=false}this.storedLocation=null;this.setOpacity(this.options.opacity);if(this.options.zIndex){this.setZIndex(this.options.zIndex)}else{this.setZIndex(this.getMaxZIndex())}if(this.options.destroyOnClose){this.setDestroyOnClose(true)}this._getWindowBorderSize();this.width=this.options.width;this.height=this.options.height;this.visible=false;this.constraint=false;this.constraintPad={top:0,left:0,bottom:0,right:0};if(this.width&&this.height){this.setSize(this.options.width,this.options.height)}this.setTitle(this.options.title);Windows.register(this)},getMaxZIndex:function(){var b=0,d;var g=document.body.childNodes;for(d=0;d<g.length;d++){var e=g[d];var f=e.nodeType==1?parseInt(e.style.zIndex,10)||0:0;if(f<10000){b=Math.max(b,f)}}return b+10},destroy:function(){this._notify("onDestroy");Event.stopObserving(this.topbar,"mousedown",this.eventMouseDown);Event.stopObserving(this.bottombar,"mousedown",this.eventMouseDown);Event.stopObserving(this.content,"mousedown",this.eventMouseDownContent);Event.stopObserving(window,"load",this.eventOnLoad);Event.stopObserving(window,"resize",this.eventResize);Event.stopObserving(window,"scroll",this.eventResize);Event.stopObserving(this.content,"load",this.options.onload);Event.stopObserving(document,"keyup",this.eventKeyUp);if(this._oldParent){var e=this.getContent();var b=null;for(var d=0;d<e.childNodes.length;d++){b=e.childNodes[d];if(b.nodeType==1){break}b=null}if(b){this._oldParent.appendChild(b)}this._oldParent=null}if(this.sizer){Event.stopObserving(this.sizer,"mousedown",this.eventMouseDown)}if(this.options.url){this.content.src=null}if(this.iefix){Element.remove(this.iefix)}Element.remove(this.element);Windows.unregister(this)},setCloseCallback:function(b){this.options.closeCallback=b},getContent:function(){return this.content},setContent:function(n,l,e){var b=$(n);if(null==b){throw"Unable to find element '"+n+"' in DOM"}this._oldParent=b.parentNode;var h=null;var g=null;if(l){h=Element.getDimensions(b)}if(e){g=Position.cumulativeOffset(b)}var f=this.getContent();this.setHTMLContent("");f=this.getContent();f.appendChild(b);b.show();if(l){this.setSize(h.width,h.height)}if(e){this.setLocation(g[1]-this.heightN,g[0]-this.widthW)}},setHTMLContent:function(b){if(this.options.url){this.content.src=null;this.options.url=null;var d='<div id="'+this.getId()+'_content" class="'+this.options.className+'_content"> </div>';$(this.getId()+"_table_content").innerHTML=d;this.content=$(this.element.id+"_content")}this.getContent().innerHTML=b},setAjaxContent:function(d,b,f,e){this.showFunction=f?"showCenter":"show";this.showModal=e||false;b=b||{};this.setHTMLContent("");this.onComplete=b.onComplete;if(!this._onCompleteHandler){this._onCompleteHandler=this._setAjaxContent.bind(this)}b.onComplete=this._onCompleteHandler;new Ajax.Request(d,b);b.onComplete=this.onComplete},_setAjaxContent:function(b){Element.update(this.getContent(),b.responseText);if(this.onComplete){this.onComplete(b)}this.onComplete=null;this[this.showFunction](this.showModal)},setURL:function(b){if(this.options.url){this.content.src=null}this.options.url=b;var d="<iframe frameborder='0' name='"+this.getId()+"_content'  id='"+this.getId()+"_content' src='"+b+"' width='"+this.width+"' height='"+this.height+"'> </iframe>";$(this.getId()+"_table_content").innerHTML=d;this.content=$(this.element.id+"_content")},getURL:function(){return this.options.url?this.options.url:null},refresh:function(){if(this.options.url){$(this.element.getAttribute("id")+"_content").src=this.options.url}},setCookie:function(d,e,t,g,b){d=d||this.element.id;this.cookie=[d,e,t,g,b];var r=WindowUtilities.getCookie(d);if(r){var s=r.split(",");var p=s[0].split(":");var o=s[1].split(":");var q=parseFloat(s[2]),l=parseFloat(s[3]);var n=s[4];var f=s[5];this.setSize(q,l);if(n=="true"){this.doMinimize=true}else{if(f=="true"){this.doMaximize=true}}this.useLeft=p[0]=="l";this.useTop=o[0]=="t";this.element.setStyle(this.useLeft?{left:p[1]}:{right:p[1]});this.element.setStyle(this.useTop?{top:o[1]}:{bottom:o[1]})}},getId:function(){return this.element.id},setDestroyOnClose:function(){this.options.destroyOnClose=true},setConstraint:function(b,d){this.constraint=b;this.constraintPad=Object.extend(this.constraintPad,d||{});if(this.useTop&&this.useLeft){this.setLocation(parseFloat(this.element.style.top),parseFloat(this.element.style.left))}},_initDrag:function(d){if(Event.element(d)==this.sizer&&this.isMinimized()){return}if(Event.element(d)!=this.sizer&&this.isMaximized()){return}if(Prototype.Browser.IE&&this.heightN==0){this._getWindowBorderSize()}this.pointer=[this._round(Event.pointerX(d),this.options.gridX),this._round(Event.pointerY(d),this.options.gridY)];if(this.options.wiredDrag){this.currentDrag=this._createWiredElement()}else{this.currentDrag=this.element}if(Event.element(d)==this.sizer){this.doResize=true;this.widthOrg=this.width;this.heightOrg=this.height;this.bottomOrg=parseFloat(this.element.getStyle("bottom"));this.rightOrg=parseFloat(this.element.getStyle("right"));this._notify("onStartResize")}else{this.doResize=false;var b=$(this.getId()+"_close");if(b&&Position.within(b,this.pointer[0],this.pointer[1])){this.currentDrag=null;return}this.toFront();if(!this.options.draggable){return}this._notify("onStartMove")}Event.observe(document,"mouseup",this.eventMouseUp,false);Event.observe(document,"mousemove",this.eventMouseMove,false);WindowUtilities.disableScreen("__invisible__","__invisible__",this.overlayOpacity);document.body.ondrag=function(){return false};document.body.onselectstart=function(){return false};this.currentDrag.show();Event.stop(d)},_round:function(d,b){return b==1?d:d=Math.floor(d/b)*b},_updateDrag:function(d){var b=[this._round(Event.pointerX(d),this.options.gridX),this._round(Event.pointerY(d),this.options.gridY)];var q=b[0]-this.pointer[0];var p=b[1]-this.pointer[1];if(this.doResize){var o=this.widthOrg+q;var f=this.heightOrg+p;q=this.width-this.widthOrg;p=this.height-this.heightOrg;if(this.useLeft){o=this._updateWidthConstraint(o)}else{this.currentDrag.setStyle({right:(this.rightOrg-q)+"px"})}if(this.useTop){f=this._updateHeightConstraint(f)}else{this.currentDrag.setStyle({bottom:(this.bottomOrg-p)+"px"})}this.setSize(o,f);this._notify("onResize")}else{this.pointer=b;if(this.useLeft){var e=parseFloat(this.currentDrag.getStyle("left"))+q;var n=this._updateLeftConstraint(e);this.pointer[0]+=n-e;this.currentDrag.setStyle({left:n+"px"})}else{this.currentDrag.setStyle({right:parseFloat(this.currentDrag.getStyle("right"))-q+"px"})}if(this.useTop){var l=parseFloat(this.currentDrag.getStyle("top"))+p;var g=this._updateTopConstraint(l);this.pointer[1]+=g-l;this.currentDrag.setStyle({top:g+"px"})}else{this.currentDrag.setStyle({bottom:parseFloat(this.currentDrag.getStyle("bottom"))-p+"px"})}this._notify("onMove")}if(this.iefix){this._fixIEOverlapping()}this._removeStoreLocation();Event.stop(d)},_endDrag:function(b){WindowUtilities.enableScreen("__invisible__");if(this.doResize){this._notify("onEndResize")}else{this._notify("onEndMove")}Event.stopObserving(document,"mouseup",this.eventMouseUp,false);Event.stopObserving(document,"mousemove",this.eventMouseMove,false);Event.stop(b);this._hideWiredElement();this._saveCookie();document.body.ondrag=null;document.body.onselectstart=null},_updateLeftConstraint:function(d){if(this.constraint&&this.useLeft&&this.useTop){var b=this.options.parent==document.body?WindowUtilities.getPageSize().windowWidth:this.options.parent.getDimensions().width;if(d<this.constraintPad.left){d=this.constraintPad.left}if(d+this.width+this.widthE+this.widthW>b-this.constraintPad.right){d=b-this.constraintPad.right-this.width-this.widthE-this.widthW}}return d},_updateTopConstraint:function(e){if(this.constraint&&this.useLeft&&this.useTop){var b=this.options.parent==document.body?WindowUtilities.getPageSize().windowHeight:this.options.parent.getDimensions().height;var d=this.height+this.heightN+this.heightS;if(e<this.constraintPad.top){e=this.constraintPad.top}if(e+d>b-this.constraintPad.bottom){e=b-this.constraintPad.bottom-d}}return e},_updateWidthConstraint:function(b){if(this.constraint&&this.useLeft&&this.useTop){var d=this.options.parent==document.body?WindowUtilities.getPageSize().windowWidth:this.options.parent.getDimensions().width;var e=parseFloat(this.element.getStyle("left"));if(e+b+this.widthE+this.widthW>d-this.constraintPad.right){b=d-this.constraintPad.right-e-this.widthE-this.widthW}}return b},_updateHeightConstraint:function(d){if(this.constraint&&this.useLeft&&this.useTop){var b=this.options.parent==document.body?WindowUtilities.getPageSize().windowHeight:this.options.parent.getDimensions().height;var e=parseFloat(this.element.getStyle("top"));if(e+d+this.heightN+this.heightS>b-this.constraintPad.bottom){d=b-this.constraintPad.bottom-e-this.heightN-this.heightS}}return d},_createWindow:function(b){var h=this.options.className;var f=document.createElement("div");f.setAttribute("id",b);f.className="dialog";if(this.options.windowClassName){f.className+=" "+this.options.windowClassName}var g;if(this.options.url){g='<iframe frameborder="0" name="'+b+'_content"  id="'+b+'_content" src="'+this.options.url+'"> </iframe>'}else{g='<div id="'+b+'_content" class="'+h+'_content"> </div>'}var l=this.options.closable?"<div class='"+h+"_close' id='"+b+"_close' onclick='Windows.close(\""+b+"\", event)'> </div>":"";var n=this.options.minimizable?"<div class='"+h+"_minimize' id='"+b+"_minimize' onclick='Windows.minimize(\""+b+"\", event)'> </div>":"";var o=this.options.maximizable?"<div class='"+h+"_maximize' id='"+b+"_maximize' onclick='Windows.maximize(\""+b+"\", event)'> </div>":"";var e=this.options.resizable?"class='"+h+"_sizer' id='"+b+"_sizer'":"class='"+h+"_se'";var d="../themes/default/blank.gif";f.innerHTML=l+n+o+"      <a href='#' id='"+b+"_focus_anchor'><!-- --></a>      <table id='"+b+"_row1' class=\"top table_window\">        <tr>          <td class='"+h+"_nw'></td>          <td class='"+h+"_n'><div id='"+b+"_top' class='"+h+"_title title_window'>"+this.options.title+"</div></td>          <td class='"+h+"_ne'></td>        </tr>      </table>      <table id='"+b+"_row2' class=\"mid table_window\">        <tr>          <td class='"+h+"_w'></td>            <td id='"+b+"_table_content' class='"+h+"_content' valign='top'>"+g+"</td>          <td class='"+h+"_e'></td>        </tr>      </table>        <table id='"+b+"_row3' class=\"bot table_window\">        <tr>          <td class='"+h+"_sw'></td>            <td class='"+h+"_s'><div id='"+b+"_bottom' class='status_bar'><span style='float:left; width:1px; height:1px'></span></div></td>            <td "+e+"></td>        </tr>      </table>    ";Element.hide(f);this.options.parent.insertBefore(f,this.options.parent.firstChild);Event.observe($(b+"_content"),"load",this.options.onload);return f},changeClassName:function(b){var d=this.options.className;var e=this.getId();$A(["_close","_minimize","_maximize","_sizer","_content"]).each(function(f){this._toggleClassName($(e+f),d+f,b+f)}.bind(this));this._toggleClassName($(e+"_top"),d+"_title",b+"_title");$$("#"+e+" td").each(function(f){f.className=f.className.sub(d,b)});this.options.className=b},_toggleClassName:function(e,d,b){if(e){e.removeClassName(d);e.addClassName(b)}},setLocation:function(f,d){f=this._updateTopConstraint(f);d=this._updateLeftConstraint(d);var b=this.currentDrag||this.element;b.setStyle({top:f+"px"});b.setStyle({left:d+"px"});this.useLeft=true;this.useTop=true},getLocation:function(){var b={};if(this.useTop){b=Object.extend(b,{top:this.element.getStyle("top")})}else{b=Object.extend(b,{bottom:this.element.getStyle("bottom")})}if(this.useLeft){b=Object.extend(b,{left:this.element.getStyle("left")})}else{b=Object.extend(b,{right:this.element.getStyle("right")})}return b},getSize:function(){return{width:this.width,height:this.height}},setSize:function(f,d,b){f=parseFloat(f);d=parseFloat(d);if(!this.minimized&&f<this.options.minWidth){f=this.options.minWidth}if(!this.minimized&&d<this.options.minHeight){d=this.options.minHeight}if(this.options.maxHeight&&d>this.options.maxHeight){d=this.options.maxHeight}if(this.options.maxWidth&&f>this.options.maxWidth){f=this.options.maxWidth}if(this.useTop&&this.useLeft&&Window.hasEffectLib&&Effect.ResizeWindow&&b){new Effect.ResizeWindow(this,null,null,f,d,{duration:Window.resizeEffectDuration})}else{this.width=f;this.height=d;var h=this.currentDrag?this.currentDrag:this.element;h.setStyle({width:f+this.widthW+this.widthE+"px"});h.setStyle({height:d+this.heightN+this.heightS+"px"});if(!this.currentDrag||this.currentDrag==this.element){var g=$(this.element.id+"_content");g.setStyle({height:d+"px"});g.setStyle({width:f+"px"})}}},updateHeight:function(){this.setSize(this.width,this.content.scrollHeight,true)},updateWidth:function(){this.setSize(this.content.scrollWidth,this.height,true)},toFront:function(){if(this.element.style.zIndex<Windows.maxZIndex){this.setZIndex(Windows.maxZIndex+1)}if(this.iefix){this._fixIEOverlapping()}},getBounds:function(d){if(!this.width||!this.height||!this.visible){this.computeBounds()}var b=this.width;var e=this.height;if(!d){b+=this.widthW+this.widthE;e+=this.heightN+this.heightS}var f=Object.extend(this.getLocation(),{width:b+"px",height:e+"px"});return f},computeBounds:function(){if(!this.width||!this.height){var b=WindowUtilities._computeSize(this.content.innerHTML,this.content.id,this.width,this.height,0,this.options.className);if(this.height){this.width=b+5}else{this.height=b+5}}this.setSize(this.width,this.height);if(this.centered){this._center(this.centerTop,this.centerLeft)}},show:function(d){this.visible=true;if(d){if(typeof this.overlayOpacity=="undefined"){var b=this;setTimeout(function(){b.show(d)},10);return}Windows.addModalWindow(this);this.modal=true;this.setZIndex(Windows.maxZIndex+1);Windows.unsetOverflow(this)}else{if(!this.element.style.zIndex){this.setZIndex(Windows.maxZIndex+1)}}if(this.oldStyle){this.getContent().setStyle({overflow:this.oldStyle})}this.computeBounds();this._notify("onBeforeShow");if(this.options.showEffect!=Element.show&&this.options.showEffectOptions){this.options.showEffect(this.element,this.options.showEffectOptions)}else{this.options.showEffect(this.element)}this._checkIEOverlapping();WindowUtilities.focusedWindow=this;this._notify("onShow");$(this.element.id+"_focus_anchor").focus()},showCenter:function(b,e,d){this.centered=true;this.centerTop=e;this.centerLeft=d;this.show(b)},isVisible:function(){return this.visible},_center:function(e,d){var f=WindowUtilities.getWindowScroll(this.options.parent);var b=WindowUtilities.getPageSize(this.options.parent);if(typeof e=="undefined"){e=(b.windowHeight-(this.height+this.heightN+this.heightS))/2}e+=f.top;if(typeof d=="undefined"){d=(b.windowWidth-(this.width+this.widthW+this.widthE))/2}d+=f.left;this.setLocation(e,d);this.toFront()},_recenter:function(d){if(this.centered){var b=WindowUtilities.getPageSize(this.options.parent);var e=WindowUtilities.getWindowScroll(this.options.parent);if(this.pageSize&&this.pageSize.windowWidth==b.windowWidth&&this.pageSize.windowHeight==b.windowHeight&&this.windowScroll.left==e.left&&this.windowScroll.top==e.top){return}this.pageSize=b;this.windowScroll=e;if($("overlay_modal")){$("overlay_modal").setStyle({height:(b.pageHeight+"px")})}if(this.options.recenterAuto){this._center(this.centerTop,this.centerLeft)}}},hide:function(){this.visible=false;if(this.modal){Windows.removeModalWindow(this);Windows.resetOverflow()}this.oldStyle=this.getContent().getStyle("overflow")||"auto";this.getContent().setStyle({overflow:"hidden"});this.options.hideEffect(this.element,this.options.hideEffectOptions);if(this.iefix){this.iefix.hide()}if(!this.doNotNotifyHide){this._notify("onHide")}},close:function(){if(this.visible){if(this.options.closeCallback&&!this.options.closeCallback(this)){return}if(this.options.destroyOnClose){var b=this.destroy.bind(this);if(this.options.hideEffectOptions.afterFinish){var d=this.options.hideEffectOptions.afterFinish;this.options.hideEffectOptions.afterFinish=function(){d();b()}}else{this.options.hideEffectOptions.afterFinish=function(){b()}}}Windows.updateFocusedWindow();this.doNotNotifyHide=true;this.hide();this.doNotNotifyHide=false;this._notify("onClose")}},minimize:function(){if(this.resizing){return}var b=$(this.getId()+"_row2");if(!this.minimized){this.minimized=true;var f=b.getDimensions().height;this.r2Height=f;var e=this.element.getHeight()-f;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,null,null,null,this.height-f,{duration:Window.resizeEffectDuration})}else{this.height-=f;this.element.setStyle({height:e+"px"});b.hide()}if(!this.useTop){var d=parseFloat(this.element.getStyle("bottom"));this.element.setStyle({bottom:(d+f)+"px"})}}else{this.minimized=false;var f=this.r2Height;this.r2Height=null;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,null,null,null,this.height+f,{duration:Window.resizeEffectDuration})}else{var e=this.element.getHeight()+f;this.height+=f;this.element.setStyle({height:e+"px"});b.show()}if(!this.useTop){var d=parseFloat(this.element.getStyle("bottom"));this.element.setStyle({bottom:(d-f)+"px"})}this.toFront()}this._notify("onMinimize");this._saveCookie()},maximize:function(){if(this.isMinimized()||this.resizing){return}if(Prototype.Browser.IE&&this.heightN==0){this._getWindowBorderSize()}if(this.storedLocation!=null){this._restoreLocation();if(this.iefix){this.iefix.hide()}}else{this._storeLocation();Windows.unsetOverflow(this);var l=WindowUtilities.getWindowScroll(this.options.parent);var d=WindowUtilities.getPageSize(this.options.parent);var h=l.left;var g=l.top;if(this.options.parent!=document.body){l={top:0,left:0,bottom:0,right:0};var f=this.options.parent.getDimensions();d.windowWidth=f.width;d.windowHeight=f.height;g=0;h=0}if(this.constraint){d.windowWidth-=Math.max(0,this.constraintPad.left)+Math.max(0,this.constraintPad.right);d.windowHeight-=Math.max(0,this.constraintPad.top)+Math.max(0,this.constraintPad.bottom);h+=Math.max(0,this.constraintPad.left);g+=Math.max(0,this.constraintPad.top)}var e=d.windowWidth-this.widthW-this.widthE;var b=d.windowHeight-this.heightN-this.heightS;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,g,h,e,b,{duration:Window.resizeEffectDuration})}else{this.setSize(e,b);this.element.setStyle(this.useLeft?{left:h}:{right:h});this.element.setStyle(this.useTop?{top:g}:{bottom:g})}this.toFront();if(this.iefix){this._fixIEOverlapping()}}this._notify("onMaximize");this._saveCookie()},isMinimized:function(){return this.minimized},isMaximized:function(){return(this.storedLocation!=null)},setOpacity:function(b){if(Element.setOpacity){Element.setOpacity(this.element,b)}},setZIndex:function(b){this.element.setStyle({zIndex:b});Windows.updateZindex(b,this)},setTitle:function(b){if(!b||b==""){b="&nbsp;"}Element.update(this.element.id+"_top",b)},getTitle:function(){return $(this.element.id+"_top").innerHTML},setStatusBar:function(d){var b=$(this.getId()+"_bottom");if(typeof(d)=="object"){if(this.bottombar.firstChild){this.bottombar.replaceChild(d,this.bottombar.firstChild)}else{this.bottombar.appendChild(d)}}else{this.bottombar.innerHTML=d}},_checkIEOverlapping:function(){if(!this.iefix&&(navigator.appVersion.indexOf("MSIE")>0)&&(navigator.userAgent.indexOf("Opera")<0)&&(this.element.getStyle("position")=="absolute")){new Insertion.After(this.element.id,'<iframe id="'+this.element.id+'_iefix" style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" src="javascript:false;" frameborder="0" scrolling="no"></iframe>');this.iefix=$(this.element.id+"_iefix")}if(this.iefix){setTimeout(this._fixIEOverlapping.bind(this),50)}},_fixIEOverlapping:function(){Position.clone(this.element,this.iefix);this.iefix.style.zIndex=this.element.style.zIndex-1;this.iefix.show()},_keyUp:function(b){if(27==b.keyCode&&this.options.closeOnEsc){this.close()}},_getWindowBorderSize:function(d){var e=this._createHiddenDiv(this.options.className+"_n");this.heightN=Element.getDimensions(e).height;e.parentNode.removeChild(e);var e=this._createHiddenDiv(this.options.className+"_s");this.heightS=Element.getDimensions(e).height;e.parentNode.removeChild(e);var e=this._createHiddenDiv(this.options.className+"_e");this.widthE=Element.getDimensions(e).width;e.parentNode.removeChild(e);var e=this._createHiddenDiv(this.options.className+"_w");this.widthW=Element.getDimensions(e).width;e.parentNode.removeChild(e);var e=document.createElement("div");e.className="overlay_"+this.options.className;document.body.appendChild(e);var b=this;setTimeout(function(){b.overlayOpacity=($(e).getStyle("opacity"));e.parentNode.removeChild(e)},10);if(Prototype.Browser.IE){this.heightS=$(this.getId()+"_row3").getDimensions().height;this.heightN=$(this.getId()+"_row1").getDimensions().height}if(Prototype.Browser.WebKit&&Prototype.Browser.WebKitVersion<420){this.setSize(this.width,this.height)}if(this.doMaximize){this.maximize()}if(this.doMinimize){this.minimize()}},_createHiddenDiv:function(d){var b=document.body;var e=document.createElement("div");e.setAttribute("id",this.element.id+"_tmp");e.className=d;e.style.display="none";e.innerHTML="";b.insertBefore(e,b.firstChild);return e},_storeLocation:function(){if(this.storedLocation==null){this.storedLocation={useTop:this.useTop,useLeft:this.useLeft,top:this.element.getStyle("top"),bottom:this.element.getStyle("bottom"),left:this.element.getStyle("left"),right:this.element.getStyle("right"),width:this.width,height:this.height}}},_restoreLocation:function(){if(this.storedLocation!=null){this.useLeft=this.storedLocation.useLeft;this.useTop=this.storedLocation.useTop;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,this.storedLocation.top,this.storedLocation.left,this.storedLocation.width,this.storedLocation.height,{duration:Window.resizeEffectDuration})}else{this.element.setStyle(this.useLeft?{left:this.storedLocation.left}:{right:this.storedLocation.right});this.element.setStyle(this.useTop?{top:this.storedLocation.top}:{bottom:this.storedLocation.bottom});this.setSize(this.storedLocation.width,this.storedLocation.height)}Windows.resetOverflow();this._removeStoreLocation()}},_removeStoreLocation:function(){this.storedLocation=null},_saveCookie:function(){if(this.cookie){var b="";if(this.useLeft){b+="l:"+(this.storedLocation?this.storedLocation.left:this.element.getStyle("left"))}else{b+="r:"+(this.storedLocation?this.storedLocation.right:this.element.getStyle("right"))}if(this.useTop){b+=",t:"+(this.storedLocation?this.storedLocation.top:this.element.getStyle("top"))}else{b+=",b:"+(this.storedLocation?this.storedLocation.bottom:this.element.getStyle("bottom"))}b+=","+(this.storedLocation?this.storedLocation.width:this.width);b+=","+(this.storedLocation?this.storedLocation.height:this.height);b+=","+this.isMinimized();b+=","+this.isMaximized();WindowUtilities.setCookie(b,this.cookie)}},_createWiredElement:function(){if(!this.wiredElement){if(Prototype.Browser.IE){this._getWindowBorderSize()}var d=document.createElement("div");d.className="wired_frame "+this.options.className+"_wired_frame";d.style.position="absolute";this.options.parent.insertBefore(d,this.options.parent.firstChild);this.wiredElement=$(d)}if(this.useLeft){this.wiredElement.setStyle({left:this.element.getStyle("left")})}else{this.wiredElement.setStyle({right:this.element.getStyle("right")})}if(this.useTop){this.wiredElement.setStyle({top:this.element.getStyle("top")})}else{this.wiredElement.setStyle({bottom:this.element.getStyle("bottom")})}var b=this.element.getDimensions();this.wiredElement.setStyle({width:b.width+"px",height:b.height+"px"});this.wiredElement.setStyle({zIndex:Windows.maxZIndex+30});return this.wiredElement},_hideWiredElement:function(){if(!this.wiredElement||!this.currentDrag){return}if(this.currentDrag==this.element){this.currentDrag=null}else{if(this.useLeft){this.element.setStyle({left:this.currentDrag.getStyle("left")})}else{this.element.setStyle({right:this.currentDrag.getStyle("right")})}if(this.useTop){this.element.setStyle({top:this.currentDrag.getStyle("top")})}else{this.element.setStyle({bottom:this.currentDrag.getStyle("bottom")})}this.currentDrag.hide();this.currentDrag=null;if(this.doResize){this.setSize(this.width,this.height)}}},_notify:function(b){if(this.options[b]){this.options[b](this)}else{Windows.notify(b,this)}}};var Windows={windows:[],modalWindows:[],observers:[],focusedWindow:null,maxZIndex:0,overlayShowEffectOptions:{duration:0.5},overlayHideEffectOptions:{duration:0.5},addObserver:function(b){this.removeObserver(b);this.observers.push(b)},removeObserver:function(b){this.observers=this.observers.reject(function(d){return d==b})},notify:function(b,d){this.observers.each(function(e){if(e[b]){e[b](b,d)}})},getWindow:function(b){return this.windows.detect(function(e){return e.getId()==b})},getFocusedWindow:function(){return this.focusedWindow},updateFocusedWindow:function(){this.focusedWindow=this.windows.length>=2?this.windows[this.windows.length-2]:null},register:function(b){this.windows.push(b)},addModalWindow:function(b){if(this.modalWindows.length==0){WindowUtilities.disableScreen(b.options.className,"overlay_modal",b.overlayOpacity,b.getId(),b.options.parent)}else{if(Window.keepMultiModalWindow){$("overlay_modal").style.zIndex=Windows.maxZIndex+1;Windows.maxZIndex+=1;WindowUtilities._hideSelect(this.modalWindows.last().getId())}else{this.modalWindows.last().element.hide()}WindowUtilities._showSelect(b.getId())}this.modalWindows.push(b)},removeModalWindow:function(b){this.modalWindows.pop();if(this.modalWindows.length==0){WindowUtilities.enableScreen()}else{if(Window.keepMultiModalWindow){this.modalWindows.last().toFront();WindowUtilities._showSelect(this.modalWindows.last().getId())}else{this.modalWindows.last().element.show()}}},register:function(b){this.windows.push(b)},unregister:function(b){this.windows=this.windows.reject(function(e){return e==b})},closeAll:function(){this.windows.each(function(b){Windows.close(b.getId())})},closeAllModalWindows:function(){WindowUtilities.enableScreen();this.modalWindows.each(function(b){if(b){b.close()}})},minimize:function(e,b){var d=this.getWindow(e);if(d&&d.visible){d.minimize()}Event.stop(b)},maximize:function(e,b){var d=this.getWindow(e);if(d&&d.visible){d.maximize()}Event.stop(b)},close:function(e,b){var d=this.getWindow(e);if(d){d.close()}if(b){Event.stop(b)}},blur:function(d){var b=this.getWindow(d);if(!b){return}if(b.options.blurClassName){b.changeClassName(b.options.blurClassName)}if(this.focusedWindow==b){this.focusedWindow=null}b._notify("onBlur")},focus:function(d){var b=this.getWindow(d);if(!b){return}if(this.focusedWindow){this.blur(this.focusedWindow.getId())}if(b.options.focusClassName){b.changeClassName(b.options.focusClassName)}this.focusedWindow=b;b._notify("onFocus")},unsetOverflow:function(b){this.windows.each(function(e){e.oldOverflow=e.getContent().getStyle("overflow")||"auto";e.getContent().setStyle({overflow:"hidden"})});if(b&&b.oldOverflow){b.getContent().setStyle({overflow:b.oldOverflow})}},resetOverflow:function(){this.windows.each(function(b){if(b.oldOverflow){b.getContent().setStyle({overflow:b.oldOverflow})}})},updateZindex:function(b,d){if(b>this.maxZIndex){this.maxZIndex=b;if(this.focusedWindow){this.blur(this.focusedWindow.getId())}}this.focusedWindow=d;if(this.focusedWindow){this.focus(this.focusedWindow.getId())}}};var Dialog={dialogId:null,onCompleteFunc:null,callFunc:null,parameters:null,confirm:function(f,e){if(f&&typeof f!="string"){Dialog._runAjaxRequest(f,e,Dialog.confirm);return}f=f||"";e=e||{};var h=e.okLabel?e.okLabel:"Ok";var b=e.cancelLabel?e.cancelLabel:"Cancel";e=Object.extend(e,e.windowParameters||{});e.windowParameters=e.windowParameters||{};e.className=e.className||"alert";var d="class ='"+(e.buttonClass?e.buttonClass+" ":"")+" ok_button'";var g="class ='"+(e.buttonClass?e.buttonClass+" ":"")+" cancel_button'";var f="      <div class='"+e.className+"_message'>"+f+"</div>        <div class='"+e.className+"_buttons'>          <button type='button' title='"+h+"' onclick='Dialog.okCallback()' "+d+"><span><span><span>"+h+"</span></span></span></button>          <button type='button' title='"+b+"' onclick='Dialog.cancelCallback()' "+g+"><span><span><span>"+b+"</span></span></span></button>        </div>    ";return this._openDialog(f,e)},alert:function(e,d){if(e&&typeof e!="string"){Dialog._runAjaxRequest(e,d,Dialog.alert);return}e=e||"";d=d||{};var f=d.okLabel?d.okLabel:"Ok";d=Object.extend(d,d.windowParameters||{});d.windowParameters=d.windowParameters||{};d.className=d.className||"alert";var b="class ='"+(d.buttonClass?d.buttonClass+" ":"")+" ok_button'";var e="      <div class='"+d.className+"_message'>"+e+"</div>        <div class='"+d.className+"_buttons'>          <button type='button' title='"+f+"' onclick='Dialog.okCallback()' "+b+"><span><span><span>"+f+"</span></span></span></button>        </div>";return this._openDialog(e,d)},info:function(d,b){if(d&&typeof d!="string"){Dialog._runAjaxRequest(d,b,Dialog.info);return}d=d||"";b=b||{};b=Object.extend(b,b.windowParameters||{});b.windowParameters=b.windowParameters||{};b.className=b.className||"alert";var d="<div id='modal_dialog_message' class='"+b.className+"_message'>"+d+"</div>";if(b.showProgress){d+="<div id='modal_dialog_progress' class='"+b.className+"_progress'>  </div>"}b.ok=null;b.cancel=null;return this._openDialog(d,b)},setInfoMessage:function(b){$("modal_dialog_message").update(b)},closeInfo:function(){Windows.close(this.dialogId)},_openDialog:function(g,f){var e=f.className;if(!f.height&&!f.width){f.width=WindowUtilities.getPageSize(f.options.parent||document.body).pageWidth/2}if(f.id){this.dialogId=f.id}else{var d=new Date();this.dialogId="modal_dialog_"+d.getTime();f.id=this.dialogId}if(!f.height||!f.width){var b=WindowUtilities._computeSize(g,this.dialogId,f.width,f.height,5,e);if(f.height){f.width=b+5}else{f.height=b+5}}f.effectOptions=f.effectOptions;f.resizable=f.resizable||false;f.minimizable=f.minimizable||false;f.maximizable=f.maximizable||false;f.draggable=f.draggable||false;f.closable=f.closable||false;var h=new Window(f);h.getContent().innerHTML=g;h.showCenter(true,f.top,f.left);h.setDestroyOnClose();h.cancelCallback=f.onCancel||f.cancel;h.okCallback=f.onOk||f.ok;return h},_getAjaxContent:function(b){Dialog.callFunc(b.responseText,Dialog.parameters)},_runAjaxRequest:function(e,d,b){if(e.options==null){e.options={}}Dialog.onCompleteFunc=e.options.onComplete;Dialog.parameters=d;Dialog.callFunc=b;e.options.onComplete=Dialog._getAjaxContent;new Ajax.Request(e.url,e.options)},okCallback:function(){var b=Windows.focusedWindow;if(!b.okCallback||b.okCallback(b)){$$("#"+b.getId()+" input").each(function(d){d.onclick=null});b.close()}},cancelCallback:function(){var b=Windows.focusedWindow;$$("#"+b.getId()+" input").each(function(d){d.onclick=null});b.close();if(b.cancelCallback){b.cancelCallback(b)}}};if(Prototype.Browser.WebKit){var array=navigator.userAgent.match(new RegExp(/AppleWebKit\/([\d\.\+]*)/));Prototype.Browser.WebKitVersion=parseFloat(array[1])}var WindowUtilities={getWindowScroll:function(parent){var T,L,W,H;parent=parent||document.body;if(parent!=document.body){T=parent.scrollTop;L=parent.scrollLeft;W=parent.scrollWidth;H=parent.scrollHeight}else{var w=window;with(w.document){if(w.document.documentElement&&documentElement.scrollTop){T=documentElement.scrollTop;L=documentElement.scrollLeft}else{if(w.document.body){T=body.scrollTop;L=body.scrollLeft}}if(w.innerWidth){W=w.innerWidth;H=w.innerHeight}else{if(w.document.documentElement&&documentElement.clientWidth){W=documentElement.clientWidth;H=documentElement.clientHeight}else{W=body.offsetWidth;H=body.offsetHeight}}}}return{top:T,left:L,width:W,height:H}},getPageSize:function(f){f=f||document.body;var e,l;var g,d;if(f!=document.body){e=f.getWidth();l=f.getHeight();d=f.scrollWidth;g=f.scrollHeight}else{var h,b;if(window.innerHeight&&window.scrollMaxY){h=document.body.scrollWidth;b=window.innerHeight+window.scrollMaxY}else{if(document.body.scrollHeight>document.body.offsetHeight){h=document.body.scrollWidth;b=document.body.scrollHeight}else{h=document.body.offsetWidth;b=document.body.offsetHeight}}if(self.innerHeight){e=document.documentElement.clientWidth;l=self.innerHeight}else{if(document.documentElement&&document.documentElement.clientHeight){e=document.documentElement.clientWidth;l=document.documentElement.clientHeight}else{if(document.body){e=document.body.clientWidth;l=document.body.clientHeight}}}if(b<l){g=l}else{g=b}if(h<e){d=e}else{d=h}}return{pageWidth:d,pageHeight:g,windowWidth:e,windowHeight:l}},disableScreen:function(e,b,f,g,d){WindowUtilities.initLightbox(b,e,function(){this._disableScreen(e,b,f,g)}.bind(this),d||document.body)},_disableScreen:function(e,d,g,h){var f=$(d);var b=WindowUtilities.getPageSize(f.parentNode);if(h&&Prototype.Browser.IE){WindowUtilities._hideSelect();WindowUtilities._showSelect(h)}f.style.height=(b.pageHeight+"px");f.style.display="none";if(d=="overlay_modal"&&Window.hasEffectLib&&Windows.overlayShowEffectOptions){f.overlayOpacity=g;new Effect.Appear(f,Object.extend({from:0,to:g},Windows.overlayShowEffectOptions))}else{f.style.display="block"}},enableScreen:function(d){d=d||"overlay_modal";var b=$(d);if(b){if(d=="overlay_modal"&&Window.hasEffectLib&&Windows.overlayHideEffectOptions){new Effect.Fade(b,Object.extend({from:b.overlayOpacity,to:0},Windows.overlayHideEffectOptions))}else{b.style.display="none";b.parentNode.removeChild(b)}if(d!="__invisible__"){WindowUtilities._showSelect()}}},_hideSelect:function(b){if(Prototype.Browser.IE){b=b==null?"":"#"+b+" ";$$(b+"select").each(function(d){if(!WindowUtilities.isDefined(d.oldVisibility)){d.oldVisibility=d.style.visibility?d.style.visibility:"visible";d.style.visibility="hidden"}})}},_showSelect:function(b){if(Prototype.Browser.IE){b=b==null?"":"#"+b+" ";$$(b+"select").each(function(d){if(WindowUtilities.isDefined(d.oldVisibility)){try{d.style.visibility=d.oldVisibility}catch(f){d.style.visibility="visible"}d.oldVisibility=null}else{if(d.style.visibility){d.style.visibility="visible"}}})}},isDefined:function(b){return typeof(b)!="undefined"&&b!=null},initLightbox:function(g,e,b,d){if($(g)){Element.setStyle(g,{zIndex:Windows.maxZIndex+1});Windows.maxZIndex++;b()}else{var f=document.createElement("div");f.setAttribute("id",g);f.className="overlay_"+e;f.style.display="none";f.style.position="absolute";f.style.top="0";f.style.left="0";f.style.zIndex=Windows.maxZIndex+1;Windows.maxZIndex++;f.style.width="100%";d.insertBefore(f,d.firstChild);if(Prototype.Browser.WebKit&&g=="overlay_modal"){setTimeout(function(){b()},10)}else{b()}}},setCookie:function(d,b){document.cookie=b[0]+"="+escape(d)+((b[1])?"; expires="+b[1].toUTCString():"")+((b[2])?"; path="+b[2]:"")+((b[3])?"; domain="+b[3]:"")+((b[4])?"; secure":"")},getCookie:function(e){var d=document.cookie;var g=e+"=";var f=d.indexOf("; "+g);if(f==-1){f=d.indexOf(g);if(f!=0){return null}}else{f+=2}var b=document.cookie.indexOf(";",f);if(b==-1){b=d.length}return unescape(d.substring(f+g.length,b))},_computeSize:function(g,b,d,l,f,h){var o=document.body;var e=document.createElement("div");e.setAttribute("id",b);e.className=h+"_content";if(l){e.style.height=l+"px"}else{e.style.width=d+"px"}e.style.position="absolute";e.style.top="0";e.style.left="0";e.style.display="none";e.innerHTML=g;o.insertBefore(e,o.firstChild);var n;if(l){n=$(e).getDimensions().width+f}else{n=$(e).getDimensions().height+f}o.removeChild(e);return n}};var Builder={NODEMAP:{AREA:"map",CAPTION:"table",COL:"table",COLGROUP:"table",LEGEND:"fieldset",OPTGROUP:"select",OPTION:"select",PARAM:"object",TBODY:"table",TD:"table",TFOOT:"table",TH:"table",THEAD:"table",TR:"table"},node:function(b){b=b.toUpperCase();var l=this.NODEMAP[b]||"div";var d=document.createElement(l);try{d.innerHTML="<"+b+"></"+b+">"}catch(h){}var g=d.firstChild||null;if(g&&(g.tagName.toUpperCase()!=b)){g=g.getElementsByTagName(b)[0]}if(!g){g=document.createElement(b)}if(!g){return}if(arguments[1]){if(this._isStringOrNumber(arguments[1])||(arguments[1] instanceof Array)||arguments[1].tagName){this._children(g,arguments[1])}else{var f=this._attributes(arguments[1]);if(f.length){try{d.innerHTML="<"+b+" "+f+"></"+b+">"}catch(h){}g=d.firstChild||null;if(!g){g=document.createElement(b);for(attr in arguments[1]){g[attr=="class"?"className":attr]=arguments[1][attr]}}if(g.tagName.toUpperCase()!=b){g=d.getElementsByTagName(b)[0]}}}}if(arguments[2]){this._children(g,arguments[2])}return $(g)},_text:function(b){return document.createTextNode(b)},ATTR_MAP:{className:"class",htmlFor:"for"},_attributes:function(b){var d=[];for(attribute in b){d.push((attribute in this.ATTR_MAP?this.ATTR_MAP[attribute]:attribute)+'="'+b[attribute].toString().escapeHTML().gsub(/"/,"&quot;")+'"')}return d.join(" ")},_children:function(d,b){if(b.tagName){d.appendChild(b);return}if(typeof b=="object"){b.flatten().each(function(f){if(typeof f=="object"){d.appendChild(f)}else{if(Builder._isStringOrNumber(f)){d.appendChild(Builder._text(f))}}})}else{if(Builder._isStringOrNumber(b)){d.appendChild(Builder._text(b))}}},_isStringOrNumber:function(b){return(typeof b=="string"||typeof b=="number")},build:function(d){var b=this.node("div");$(b).update(d.strip());return b.down()},dump:function(d){if(typeof d!="object"&&typeof d!="function"){d=window}var b=("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);b.each(function(e){d[e]=function(){return Builder.node.apply(Builder,[e].concat($A(arguments)))}})}};String.prototype.parseColor=function(){var b="#";if(this.slice(0,4)=="rgb("){var e=this.slice(4,this.length-1).split(",");var d=0;do{b+=parseInt(e[d]).toColorPart()}while(++d<3)}else{if(this.slice(0,1)=="#"){if(this.length==4){for(var d=1;d<4;d++){b+=(this.charAt(d)+this.charAt(d)).toLowerCase()}}if(this.length==7){b=this.toLowerCase()}}}return(b.length==7?b:(arguments[0]||this))};Element.collectTextNodes=function(b){return $A($(b).childNodes).collect(function(d){return(d.nodeType==3?d.nodeValue:(d.hasChildNodes()?Element.collectTextNodes(d):""))}).flatten().join("")};Element.collectTextNodesIgnoreClass=function(b,d){return $A($(b).childNodes).collect(function(e){return(e.nodeType==3?e.nodeValue:((e.hasChildNodes()&&!Element.hasClassName(e,d))?Element.collectTextNodesIgnoreClass(e,d):""))}).flatten().join("")};Element.setContentZoom=function(b,d){b=$(b);b.setStyle({fontSize:(d/100)+"em"});if(Prototype.Browser.WebKit){window.scrollBy(0,0)}return b};Element.getInlineOpacity=function(b){return $(b).style.opacity||""};Element.forceRerendering=function(b){try{b=$(b);var f=document.createTextNode(" ");b.appendChild(f);b.removeChild(f)}catch(d){}};var Effect={_elementDoesNotExistError:{name:"ElementDoesNotExistError",message:"The specified DOM element does not exist, but is required for this effect to operate"},Transitions:{linear:Prototype.K,sinoidal:function(b){return(-Math.cos(b*Math.PI)/2)+0.5},reverse:function(b){return 1-b},flicker:function(b){var b=((-Math.cos(b*Math.PI)/4)+0.75)+Math.random()/4;return b>1?1:b},wobble:function(b){return(-Math.cos(b*Math.PI*(9*b))/2)+0.5},pulse:function(d,b){return(-Math.cos((d*((b||5)-0.5)*2)*Math.PI)/2)+0.5},spring:function(b){return 1-(Math.cos(b*4.5*Math.PI)*Math.exp(-b*6))},none:function(b){return 0},full:function(b){return 1}},DefaultOptions:{duration:1,fps:100,sync:false,from:0,to:1,delay:0,queue:"parallel"},tagifyText:function(b){var d="position:relative";if(Prototype.Browser.IE){d+=";zoom:1"}b=$(b);$A(b.childNodes).each(function(e){if(e.nodeType==3){e.nodeValue.toArray().each(function(f){b.insertBefore(new Element("span",{style:d}).update(f==" "?String.fromCharCode(160):f),e)});Element.remove(e)}})},multiple:function(d,e){var g;if(((typeof d=="object")||Object.isFunction(d))&&(d.length)){g=d}else{g=$(d).childNodes}var b=Object.extend({speed:0.1,delay:0},arguments[2]||{});var f=b.delay;$A(g).each(function(l,h){new e(l,Object.extend(b,{delay:h*b.speed+f}))})},PAIRS:{slide:["SlideDown","SlideUp"],blind:["BlindDown","BlindUp"],appear:["Appear","Fade"]},toggle:function(d,e){d=$(d);e=(e||"appear").toLowerCase();var b=Object.extend({queue:{position:"end",scope:(d.id||"global"),limit:1}},arguments[2]||{});Effect[d.visible()?Effect.PAIRS[e][1]:Effect.PAIRS[e][0]](d,b)}};Effect.DefaultOptions.transition=Effect.Transitions.sinoidal;Effect.ScopedQueue=Class.create(Enumerable,{initialize:function(){this.effects=[];this.interval=null},_each:function(b){this.effects._each(b)},add:function(d){var e=new Date().getTime();var b=Object.isString(d.options.queue)?d.options.queue:d.options.queue.position;switch(b){case"front":this.effects.findAll(function(f){return f.state=="idle"}).each(function(f){f.startOn+=d.finishOn;f.finishOn+=d.finishOn});break;case"with-last":e=this.effects.pluck("startOn").max()||e;break;case"end":e=this.effects.pluck("finishOn").max()||e;break}d.startOn+=e;d.finishOn+=e;if(!d.options.queue.limit||(this.effects.length<d.options.queue.limit)){this.effects.push(d)}if(!this.interval){this.interval=setInterval(this.loop.bind(this),15)}},remove:function(b){this.effects=this.effects.reject(function(d){return d==b});if(this.effects.length==0){clearInterval(this.interval);this.interval=null}},loop:function(){var e=new Date().getTime();for(var d=0,b=this.effects.length;d<b;d++){this.effects[d]&&this.effects[d].loop(e)}}});Effect.Queues={instances:$H(),get:function(b){if(!Object.isString(b)){return b}return this.instances.get(b)||this.instances.set(b,new Effect.ScopedQueue())}};Effect.Queue=Effect.Queues.get("global");Effect.Base=Class.create({position:null,start:function(b){function d(f,e){return((f[e+"Internal"]?"this.options."+e+"Internal(this);":"")+(f[e]?"this.options."+e+"(this);":""))}if(b&&b.transition===false){b.transition=Effect.Transitions.linear}this.options=Object.extend(Object.extend({},Effect.DefaultOptions),b||{});this.currentFrame=0;this.state="idle";this.startOn=this.options.delay*1000;this.finishOn=this.startOn+(this.options.duration*1000);this.fromToDelta=this.options.to-this.options.from;this.totalTime=this.finishOn-this.startOn;this.totalFrames=this.options.fps*this.options.duration;this.render=(function(){function e(g,f){if(g.options[f+"Internal"]){g.options[f+"Internal"](g)}if(g.options[f]){g.options[f](g)}}return function(f){if(this.state==="idle"){this.state="running";e(this,"beforeSetup");if(this.setup){this.setup()}e(this,"afterSetup")}if(this.state==="running"){f=(this.options.transition(f)*this.fromToDelta)+this.options.from;this.position=f;e(this,"beforeUpdate");if(this.update){this.update(f)}e(this,"afterUpdate")}}})();this.event("beforeStart");if(!this.options.sync){Effect.Queues.get(Object.isString(this.options.queue)?"global":this.options.queue.scope).add(this)}},loop:function(e){if(e>=this.startOn){if(e>=this.finishOn){this.render(1);this.cancel();this.event("beforeFinish");if(this.finish){this.finish()}this.event("afterFinish");return}var d=(e-this.startOn)/this.totalTime,b=(d*this.totalFrames).round();if(b>this.currentFrame){this.render(d);this.currentFrame=b}}},cancel:function(){if(!this.options.sync){Effect.Queues.get(Object.isString(this.options.queue)?"global":this.options.queue.scope).remove(this)}this.state="finished"},event:function(b){if(this.options[b+"Internal"]){this.options[b+"Internal"](this)}if(this.options[b]){this.options[b](this)}},inspect:function(){var b=$H();for(property in this){if(!Object.isFunction(this[property])){b.set(property,this[property])}}return"#<Effect:"+b.inspect()+",options:"+$H(this.options).inspect()+">"}});Effect.Parallel=Class.create(Effect.Base,{initialize:function(b){this.effects=b||[];this.start(arguments[1])},update:function(b){this.effects.invoke("render",b)},finish:function(b){this.effects.each(function(d){d.render(1);d.cancel();d.event("beforeFinish");if(d.finish){d.finish(b)}d.event("afterFinish")})}});Effect.Tween=Class.create(Effect.Base,{initialize:function(e,h,g){e=Object.isString(e)?$(e):e;var d=$A(arguments),f=d.last(),b=d.length==5?d[3]:null;this.method=Object.isFunction(f)?f.bind(e):Object.isFunction(e[f])?e[f].bind(e):function(l){e[f]=l};this.start(Object.extend({from:h,to:g},b||{}))},update:function(b){this.method(b)}});Effect.Event=Class.create(Effect.Base,{initialize:function(){this.start(Object.extend({duration:0},arguments[0]||{}))},update:Prototype.emptyFunction});Effect.Opacity=Class.create(Effect.Base,{initialize:function(d){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}if(Prototype.Browser.IE&&(!this.element.currentStyle.hasLayout)){this.element.setStyle({zoom:1})}var b=Object.extend({from:this.element.getOpacity()||0,to:1},arguments[1]||{});this.start(b)},update:function(b){this.element.setOpacity(b)}});Effect.Move=Class.create(Effect.Base,{initialize:function(d){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({x:0,y:0,mode:"relative"},arguments[1]||{});this.start(b)},setup:function(){this.element.makePositioned();this.originalLeft=parseFloat(this.element.getStyle("left")||"0");this.originalTop=parseFloat(this.element.getStyle("top")||"0");if(this.options.mode=="absolute"){this.options.x=this.options.x-this.originalLeft;this.options.y=this.options.y-this.originalTop}},update:function(b){this.element.setStyle({left:(this.options.x*b+this.originalLeft).round()+"px",top:(this.options.y*b+this.originalTop).round()+"px"})}});Effect.MoveBy=function(d,b,e){return new Effect.Move(d,Object.extend({x:e,y:b},arguments[3]||{}))};Effect.Scale=Class.create(Effect.Base,{initialize:function(d,e){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({scaleX:true,scaleY:true,scaleContent:true,scaleFromCenter:false,scaleMode:"box",scaleFrom:100,scaleTo:e},arguments[2]||{});this.start(b)},setup:function(){this.restoreAfterFinish=this.options.restoreAfterFinish||false;this.elementPositioning=this.element.getStyle("position");this.originalStyle={};["top","left","width","height","fontSize"].each(function(d){this.originalStyle[d]=this.element.style[d]}.bind(this));this.originalTop=this.element.offsetTop;this.originalLeft=this.element.offsetLeft;var b=this.element.getStyle("font-size")||"100%";["em","px","%","pt"].each(function(d){if(b.indexOf(d)>0){this.fontSize=parseFloat(b);this.fontSizeType=d}}.bind(this));this.factor=(this.options.scaleTo-this.options.scaleFrom)/100;this.dims=null;if(this.options.scaleMode=="box"){this.dims=[this.element.offsetHeight,this.element.offsetWidth]}if(/^content/.test(this.options.scaleMode)){this.dims=[this.element.scrollHeight,this.element.scrollWidth]}if(!this.dims){this.dims=[this.options.scaleMode.originalHeight,this.options.scaleMode.originalWidth]}},update:function(b){var d=(this.options.scaleFrom/100)+(this.factor*b);if(this.options.scaleContent&&this.fontSize){this.element.setStyle({fontSize:this.fontSize*d+this.fontSizeType})}this.setDimensions(this.dims[0]*d,this.dims[1]*d)},finish:function(b){if(this.restoreAfterFinish){this.element.setStyle(this.originalStyle)}},setDimensions:function(b,g){var h={};if(this.options.scaleX){h.width=g.round()+"px"}if(this.options.scaleY){h.height=b.round()+"px"}if(this.options.scaleFromCenter){var f=(b-this.dims[0])/2;var e=(g-this.dims[1])/2;if(this.elementPositioning=="absolute"){if(this.options.scaleY){h.top=this.originalTop-f+"px"}if(this.options.scaleX){h.left=this.originalLeft-e+"px"}}else{if(this.options.scaleY){h.top=-f+"px"}if(this.options.scaleX){h.left=-e+"px"}}}this.element.setStyle(h)}});Effect.Highlight=Class.create(Effect.Base,{initialize:function(d){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({startcolor:"#ffff99"},arguments[1]||{});this.start(b)},setup:function(){if(this.element.getStyle("display")=="none"){this.cancel();return}this.oldStyle={};if(!this.options.keepBackgroundImage){this.oldStyle.backgroundImage=this.element.getStyle("background-image");this.element.setStyle({backgroundImage:"none"})}if(!this.options.endcolor){this.options.endcolor=this.element.getStyle("background-color").parseColor("#ffffff")}if(!this.options.restorecolor){this.options.restorecolor=this.element.getStyle("background-color")}this._base=$R(0,2).map(function(b){return parseInt(this.options.startcolor.slice(b*2+1,b*2+3),16)}.bind(this));this._delta=$R(0,2).map(function(b){return parseInt(this.options.endcolor.slice(b*2+1,b*2+3),16)-this._base[b]}.bind(this))},update:function(b){this.element.setStyle({backgroundColor:$R(0,2).inject("#",function(d,e,f){return d+((this._base[f]+(this._delta[f]*b)).round().toColorPart())}.bind(this))})},finish:function(){this.element.setStyle(Object.extend(this.oldStyle,{backgroundColor:this.options.restorecolor}))}});Effect.ScrollTo=function(e){var d=arguments[1]||{},b=document.viewport.getScrollOffsets(),f=$(e).cumulativeOffset();if(d.offset){f[1]+=d.offset}return new Effect.Tween(null,b.top,f[1],d,function(g){scrollTo(b.left,g.round())})};Effect.Fade=function(e){e=$(e);var b=e.getInlineOpacity();var d=Object.extend({from:e.getOpacity()||1,to:0,afterFinishInternal:function(f){if(f.options.to!=0){return}f.element.hide().setStyle({opacity:b})}},arguments[1]||{});return new Effect.Opacity(e,d)};Effect.Appear=function(d){d=$(d);var b=Object.extend({from:(d.getStyle("display")=="none"?0:d.getOpacity()||0),to:1,afterFinishInternal:function(e){e.element.forceRerendering()},beforeSetup:function(e){e.element.setOpacity(e.options.from).show()}},arguments[1]||{});return new Effect.Opacity(d,b)};Effect.Puff=function(d){d=$(d);var b={opacity:d.getInlineOpacity(),position:d.getStyle("position"),top:d.style.top,left:d.style.left,width:d.style.width,height:d.style.height};return new Effect.Parallel([new Effect.Scale(d,200,{sync:true,scaleFromCenter:true,scaleContent:true,restoreAfterFinish:true}),new Effect.Opacity(d,{sync:true,to:0})],Object.extend({duration:1,beforeSetupInternal:function(e){Position.absolutize(e.effects[0].element)},afterFinishInternal:function(e){e.effects[0].element.hide().setStyle(b)}},arguments[1]||{}))};Effect.BlindUp=function(b){b=$(b);b.makeClipping();return new Effect.Scale(b,0,Object.extend({scaleContent:false,scaleX:false,restoreAfterFinish:true,afterFinishInternal:function(d){d.element.hide().undoClipping()}},arguments[1]||{}))};Effect.BlindDown=function(d){d=$(d);var b=d.getDimensions();return new Effect.Scale(d,100,Object.extend({scaleContent:false,scaleX:false,scaleFrom:0,scaleMode:{originalHeight:b.height,originalWidth:b.width},restoreAfterFinish:true,afterSetup:function(e){e.element.makeClipping().setStyle({height:"0px"}).show()},afterFinishInternal:function(e){e.element.undoClipping()}},arguments[1]||{}))};Effect.SwitchOff=function(d){d=$(d);var b=d.getInlineOpacity();return new Effect.Appear(d,Object.extend({duration:0.4,from:0,transition:Effect.Transitions.flicker,afterFinishInternal:function(e){new Effect.Scale(e.element,1,{duration:0.3,scaleFromCenter:true,scaleX:false,scaleContent:false,restoreAfterFinish:true,beforeSetup:function(f){f.element.makePositioned().makeClipping()},afterFinishInternal:function(f){f.element.hide().undoClipping().undoPositioned().setStyle({opacity:b})}})}},arguments[1]||{}))};Effect.DropOut=function(d){d=$(d);var b={top:d.getStyle("top"),left:d.getStyle("left"),opacity:d.getInlineOpacity()};return new Effect.Parallel([new Effect.Move(d,{x:0,y:100,sync:true}),new Effect.Opacity(d,{sync:true,to:0})],Object.extend({duration:0.5,beforeSetup:function(e){e.effects[0].element.makePositioned()},afterFinishInternal:function(e){e.effects[0].element.hide().undoPositioned().setStyle(b)}},arguments[1]||{}))};Effect.Shake=function(f){f=$(f);var d=Object.extend({distance:20,duration:0.5},arguments[1]||{});var g=parseFloat(d.distance);var e=parseFloat(d.duration)/10;var b={top:f.getStyle("top"),left:f.getStyle("left")};return new Effect.Move(f,{x:g,y:0,duration:e,afterFinishInternal:function(h){new Effect.Move(h.element,{x:-g*2,y:0,duration:e*2,afterFinishInternal:function(l){new Effect.Move(l.element,{x:g*2,y:0,duration:e*2,afterFinishInternal:function(n){new Effect.Move(n.element,{x:-g*2,y:0,duration:e*2,afterFinishInternal:function(o){new Effect.Move(o.element,{x:g*2,y:0,duration:e*2,afterFinishInternal:function(p){new Effect.Move(p.element,{x:-g,y:0,duration:e,afterFinishInternal:function(q){q.element.undoPositioned().setStyle(b)}})}})}})}})}})}})};Effect.SlideDown=function(e){e=$(e).cleanWhitespace();var b=e.down().getStyle("bottom");var d=e.getDimensions();return new Effect.Scale(e,100,Object.extend({scaleContent:false,scaleX:false,scaleFrom:window.opera?0:1,scaleMode:{originalHeight:d.height,originalWidth:d.width},restoreAfterFinish:true,afterSetup:function(f){f.element.makePositioned();f.element.down().makePositioned();if(window.opera){f.element.setStyle({top:""})}f.element.makeClipping().setStyle({height:"0px"}).show()},afterUpdateInternal:function(f){f.element.down().setStyle({bottom:(f.dims[0]-f.element.clientHeight)+"px"})},afterFinishInternal:function(f){f.element.undoClipping().undoPositioned();f.element.down().undoPositioned().setStyle({bottom:b})}},arguments[1]||{}))};Effect.SlideUp=function(e){e=$(e).cleanWhitespace();var b=e.down().getStyle("bottom");var d=e.getDimensions();return new Effect.Scale(e,window.opera?0:1,Object.extend({scaleContent:false,scaleX:false,scaleMode:"box",scaleFrom:100,scaleMode:{originalHeight:d.height,originalWidth:d.width},restoreAfterFinish:true,afterSetup:function(f){f.element.makePositioned();f.element.down().makePositioned();if(window.opera){f.element.setStyle({top:""})}f.element.makeClipping().show()},afterUpdateInternal:function(f){f.element.down().setStyle({bottom:(f.dims[0]-f.element.clientHeight)+"px"})},afterFinishInternal:function(f){f.element.hide().undoClipping().undoPositioned();f.element.down().undoPositioned().setStyle({bottom:b})}},arguments[1]||{}))};Effect.Squish=function(b){return new Effect.Scale(b,window.opera?1:0,{restoreAfterFinish:true,beforeSetup:function(d){d.element.makeClipping()},afterFinishInternal:function(d){d.element.hide().undoClipping()}})};Effect.Grow=function(e){e=$(e);var d=Object.extend({direction:"center",moveTransition:Effect.Transitions.sinoidal,scaleTransition:Effect.Transitions.sinoidal,opacityTransition:Effect.Transitions.full},arguments[1]||{});var b={top:e.style.top,left:e.style.left,height:e.style.height,width:e.style.width,opacity:e.getInlineOpacity()};var l=e.getDimensions();var n,h;var g,f;switch(d.direction){case"top-left":n=h=g=f=0;break;case"top-right":n=l.width;h=f=0;g=-l.width;break;case"bottom-left":n=g=0;h=l.height;f=-l.height;break;case"bottom-right":n=l.width;h=l.height;g=-l.width;f=-l.height;break;case"center":n=l.width/2;h=l.height/2;g=-l.width/2;f=-l.height/2;break}return new Effect.Move(e,{x:n,y:h,duration:0.01,beforeSetup:function(o){o.element.hide().makeClipping().makePositioned()},afterFinishInternal:function(o){new Effect.Parallel([new Effect.Opacity(o.element,{sync:true,to:1,from:0,transition:d.opacityTransition}),new Effect.Move(o.element,{x:g,y:f,sync:true,transition:d.moveTransition}),new Effect.Scale(o.element,100,{scaleMode:{originalHeight:l.height,originalWidth:l.width},sync:true,scaleFrom:window.opera?1:0,transition:d.scaleTransition,restoreAfterFinish:true})],Object.extend({beforeSetup:function(p){p.effects[0].element.setStyle({height:"0px"}).show()},afterFinishInternal:function(p){p.effects[0].element.undoClipping().undoPositioned().setStyle(b)}},d))}})};Effect.Shrink=function(e){e=$(e);var d=Object.extend({direction:"center",moveTransition:Effect.Transitions.sinoidal,scaleTransition:Effect.Transitions.sinoidal,opacityTransition:Effect.Transitions.none},arguments[1]||{});var b={top:e.style.top,left:e.style.left,height:e.style.height,width:e.style.width,opacity:e.getInlineOpacity()};var h=e.getDimensions();var g,f;switch(d.direction){case"top-left":g=f=0;break;case"top-right":g=h.width;f=0;break;case"bottom-left":g=0;f=h.height;break;case"bottom-right":g=h.width;f=h.height;break;case"center":g=h.width/2;f=h.height/2;break}return new Effect.Parallel([new Effect.Opacity(e,{sync:true,to:0,from:1,transition:d.opacityTransition}),new Effect.Scale(e,window.opera?1:0,{sync:true,transition:d.scaleTransition,restoreAfterFinish:true}),new Effect.Move(e,{x:g,y:f,sync:true,transition:d.moveTransition})],Object.extend({beforeStartInternal:function(l){l.effects[0].element.makePositioned().makeClipping()},afterFinishInternal:function(l){l.effects[0].element.hide().undoClipping().undoPositioned().setStyle(b)}},d))};Effect.Pulsate=function(e){e=$(e);var d=arguments[1]||{},b=e.getInlineOpacity(),g=d.transition||Effect.Transitions.linear,f=function(h){return 1-g((-Math.cos((h*(d.pulses||5)*2)*Math.PI)/2)+0.5)};return new Effect.Opacity(e,Object.extend(Object.extend({duration:2,from:0,afterFinishInternal:function(h){h.element.setStyle({opacity:b})}},d),{transition:f}))};Effect.Fold=function(d){d=$(d);var b={top:d.style.top,left:d.style.left,width:d.style.width,height:d.style.height};d.makeClipping();return new Effect.Scale(d,5,Object.extend({scaleContent:false,scaleX:false,afterFinishInternal:function(e){new Effect.Scale(d,1,{scaleContent:false,scaleY:false,afterFinishInternal:function(f){f.element.hide().undoClipping().setStyle(b)}})}},arguments[1]||{}))};Effect.Morph=Class.create(Effect.Base,{initialize:function(e){this.element=$(e);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({style:{}},arguments[1]||{});if(!Object.isString(b.style)){this.style=$H(b.style)}else{if(b.style.include(":")){this.style=b.style.parseStyle()}else{this.element.addClassName(b.style);this.style=$H(this.element.getStyles());this.element.removeClassName(b.style);var d=this.element.getStyles();this.style=this.style.reject(function(f){return f.value==d[f.key]});b.afterFinishInternal=function(f){f.element.addClassName(f.options.style);f.transforms.each(function(g){f.element.style[g.style]=""})}}}this.start(b)},setup:function(){function b(d){if(!d||["rgba(0, 0, 0, 0)","transparent"].include(d)){d="#ffffff"}d=d.parseColor();return $R(0,2).map(function(e){return parseInt(d.slice(e*2+1,e*2+3),16)})}this.transforms=this.style.map(function(l){var h=l[0],g=l[1],f=null;if(g.parseColor("#zzzzzz")!="#zzzzzz"){g=g.parseColor();f="color"}else{if(h=="opacity"){g=parseFloat(g);if(Prototype.Browser.IE&&(!this.element.currentStyle.hasLayout)){this.element.setStyle({zoom:1})}}else{if(Element.CSS_LENGTH.test(g)){var e=g.match(/^([\+\-]?[0-9\.]+)(.*)$/);g=parseFloat(e[1]);f=(e.length==3)?e[2]:null}}}var d=this.element.getStyle(h);return{style:h.camelize(),originalValue:f=="color"?b(d):parseFloat(d||0),targetValue:f=="color"?b(g):g,unit:f}}.bind(this)).reject(function(d){return((d.originalValue==d.targetValue)||(d.unit!="color"&&(isNaN(d.originalValue)||isNaN(d.targetValue))))})},update:function(b){var f={},d,e=this.transforms.length;while(e--){f[(d=this.transforms[e]).style]=d.unit=="color"?"#"+(Math.round(d.originalValue[0]+(d.targetValue[0]-d.originalValue[0])*b)).toColorPart()+(Math.round(d.originalValue[1]+(d.targetValue[1]-d.originalValue[1])*b)).toColorPart()+(Math.round(d.originalValue[2]+(d.targetValue[2]-d.originalValue[2])*b)).toColorPart():(d.originalValue+(d.targetValue-d.originalValue)*b).toFixed(3)+(d.unit===null?"":d.unit)}this.element.setStyle(f,true)}});Effect.Transform=Class.create({initialize:function(b){this.tracks=[];this.options=arguments[1]||{};this.addTracks(b)},addTracks:function(b){b.each(function(d){d=$H(d);var e=d.values().first();this.tracks.push($H({ids:d.keys().first(),effect:Effect.Morph,options:{style:e}}))}.bind(this));return this},play:function(){return new Effect.Parallel(this.tracks.map(function(b){var f=b.get("ids"),e=b.get("effect"),d=b.get("options");var g=[$(f)||$$(f)].flatten();return g.map(function(h){return new e(h,Object.extend({sync:true},d))})}).flatten(),this.options)}});Element.CSS_PROPERTIES=$w("backgroundColor backgroundPosition borderBottomColor borderBottomStyle borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth borderRightColor borderRightStyle borderRightWidth borderSpacing borderTopColor borderTopStyle borderTopWidth bottom clip color fontSize fontWeight height left letterSpacing lineHeight marginBottom marginLeft marginRight marginTop markerOffset maxHeight maxWidth minHeight minWidth opacity outlineColor outlineOffset outlineWidth paddingBottom paddingLeft paddingRight paddingTop right textIndent top width wordSpacing zIndex");Element.CSS_LENGTH=/^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;String.__parseStyleElement=document.createElement("div");String.prototype.parseStyle=function(){var d,b=$H();if(Prototype.Browser.WebKit){d=new Element("div",{style:this}).style}else{String.__parseStyleElement.innerHTML='<div style="'+this+'"></div>';d=String.__parseStyleElement.childNodes[0].style}Element.CSS_PROPERTIES.each(function(e){if(d[e]){b.set(e,d[e])}});if(Prototype.Browser.IE&&this.include("opacity")){b.set("opacity",this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1])}return b};if(document.defaultView&&document.defaultView.getComputedStyle){Element.getStyles=function(d){var b=document.defaultView.getComputedStyle($(d),null);return Element.CSS_PROPERTIES.inject({},function(e,f){e[f]=b[f];return e})}}else{Element.getStyles=function(d){d=$(d);var b=d.currentStyle,e;e=Element.CSS_PROPERTIES.inject({},function(f,g){f[g]=b[g];return f});if(!e.opacity){e.opacity=d.getOpacity()}return e}}Effect.Methods={morph:function(b,d){b=$(b);new Effect.Morph(b,Object.extend({style:d},arguments[2]||{}));return b},visualEffect:function(e,g,d){e=$(e);var f=g.dasherize().camelize(),b=f.charAt(0).toUpperCase()+f.substring(1);new Effect[b](e,d);return e},highlight:function(d,b){d=$(d);new Effect.Highlight(d,b);return d}};$w("fade appear grow shrink fold blindUp blindDown slideUp slideDown pulsate shake puff squish switchOff dropOut").each(function(b){Effect.Methods[b]=function(e,d){e=$(e);Effect[b.charAt(0).toUpperCase()+b.substring(1)](e,d);return e}});$w("getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles").each(function(b){Effect.Methods[b]=Element[b]});Element.addMethods(Effect.Methods);function validateCreditCard(e){var d="0123456789";var b="";for(i=0;i<e.length;i++){x=e.charAt(i);if(d.indexOf(x,0)!=-1){b+=x}}j=b.length/2;k=Math.floor(j);m=Math.ceil(j)-k;c=0;for(i=0;i<k;i++){a=b.charAt(i*2+m)*2;c+=a>9?Math.floor(a/10+a%10):a}for(i=0;i<k+m;i++){c+=b.charAt(i*2+1-m)*1}return(c%10==0)}var Validator=Class.create();Validator.prototype={initialize:function(e,d,f,b){if(typeof f=="function"){this.options=$H(b);this._test=f}else{this.options=$H(f);this._test=function(){return true}}this.error=d||"Validation failed.";this.className=e},test:function(b,d){return(this._test(b,d)&&this.options.all(function(e){return Validator.methods[e.key]?Validator.methods[e.key](b,d,e.value):true}))}};Validator.methods={pattern:function(b,e,d){return Validation.get("IsEmpty").test(b)||d.test(b)},minLength:function(b,e,d){return b.length>=d},maxLength:function(b,e,d){return b.length<=d},min:function(b,e,d){return b>=parseFloat(d)},max:function(b,e,d){return b<=parseFloat(d)},notOneOf:function(b,e,d){return $A(d).all(function(f){return b!=f})},oneOf:function(b,e,d){return $A(d).any(function(f){return b==f})},is:function(b,e,d){return b==d},isNot:function(b,e,d){return b!=d},equalToField:function(b,e,d){return b==$F(d)},notEqualToField:function(b,e,d){return b!=$F(d)},include:function(b,e,d){return $A(d).all(function(f){return Validation.get(f).test(b,e)})}};var Validation=Class.create();Validation.defaultOptions={onSubmit:true,stopOnFirst:false,immediate:false,focusOnError:true,useTitles:false,addClassNameToContainer:false,containerClassName:".input-box",onFormValidate:function(b,d){},onElementValidate:function(b,d){}};Validation.prototype={initialize:function(d,b){this.form=$(d);if(!this.form){return}this.options=Object.extend({onSubmit:Validation.defaultOptions.onSubmit,stopOnFirst:Validation.defaultOptions.stopOnFirst,immediate:Validation.defaultOptions.immediate,focusOnError:Validation.defaultOptions.focusOnError,useTitles:Validation.defaultOptions.useTitles,onFormValidate:Validation.defaultOptions.onFormValidate,onElementValidate:Validation.defaultOptions.onElementValidate},b||{});if(this.options.onSubmit){Event.observe(this.form,"submit",this.onSubmit.bind(this),false)}if(this.options.immediate){Form.getElements(this.form).each(function(e){if(e.tagName.toLowerCase()=="select"){Event.observe(e,"blur",this.onChange.bindAsEventListener(this))}if(e.type.toLowerCase()=="radio"||e.type.toLowerCase()=="checkbox"){Event.observe(e,"click",this.onChange.bindAsEventListener(this))}else{Event.observe(e,"change",this.onChange.bindAsEventListener(this))}},this)}},onChange:function(b){Validation.isOnChange=true;Validation.validate(Event.element(b),{useTitle:this.options.useTitles,onElementValidate:this.options.onElementValidate});Validation.isOnChange=false},onSubmit:function(b){if(!this.validate()){Event.stop(b)}},validate:function(){var b=false;var d=this.options.useTitles;var g=this.options.onElementValidate;try{if(this.options.stopOnFirst){b=Form.getElements(this.form).all(function(e){if(e.hasClassName("local-validation")&&!this.isElementInForm(e,this.form)){return true}return Validation.validate(e,{useTitle:d,onElementValidate:g})},this)}else{b=Form.getElements(this.form).collect(function(e){if(e.hasClassName("local-validation")&&!this.isElementInForm(e,this.form)){return true}if(e.hasClassName("validation-disabled")){return true}return Validation.validate(e,{useTitle:d,onElementValidate:g})},this).all()}}catch(f){}if(!b&&this.options.focusOnError){try{Form.getElements(this.form).findAll(function(e){return $(e).hasClassName("validation-failed")}).first().focus()}catch(f){}}this.options.onFormValidate(b,this.form);return b},reset:function(){Form.getElements(this.form).each(Validation.reset)},isElementInForm:function(e,d){var b=e.up("form");if(b==d){return true}return false}};Object.extend(Validation,{validate:function(e,b){b=Object.extend({useTitle:false,onElementValidate:function(f,g){}},b||{});e=$(e);var d=$w(e.className);return result=d.all(function(f){var g=Validation.test(f,e,b.useTitle);b.onElementValidate(g,e);return g})},insertAdvice:function(f,d){var b=$(f).up(".field-row");if(b){Element.insert(b,{after:d})}else{if(f.up("td.value")){f.up("td.value").insert({bottom:d})}else{if(f.advaiceContainer&&$(f.advaiceContainer)){$(f.advaiceContainer).update(d)}else{switch(f.type.toLowerCase()){case"checkbox":case"radio":var e=f.parentNode;if(e){Element.insert(e,{bottom:d})}else{Element.insert(f,{after:d})}break;default:Element.insert(f,{after:d})}}}}},showAdvice:function(e,d,b){if(!e.advices){e.advices=new Hash()}else{e.advices.each(function(f){if(!d||f.value.id!=d.id){this.hideAdvice(e,f.value)}}.bind(this))}e.advices.set(b,d);if(typeof Effect=="undefined"){d.style.display="block"}else{if(!d._adviceAbsolutize){new Effect.Appear(d,{duration:1})}else{Position.absolutize(d);d.show();d.setStyle({top:d._adviceTop,left:d._adviceLeft,width:d._adviceWidth,"z-index":1000});d.addClassName("advice-absolute")}}},hideAdvice:function(d,b){if(b!=null){new Effect.Fade(b,{duration:1,afterFinishInternal:function(){b.hide()}})}},updateCallback:function(elm,status){if(typeof elm.callbackFunction!="undefined"){eval(elm.callbackFunction+"('"+elm.id+"','"+status+"')")}},ajaxError:function(g,f){var e="validate-ajax";var d=Validation.getAdvice(e,g);if(d==null){d=this.createAdvice(e,g,false,f)}this.showAdvice(g,d,"validate-ajax");this.updateCallback(g,"failed");g.addClassName("validation-failed");g.addClassName("validate-ajax");if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var b=g.up(Validation.defaultOptions.containerClassName);if(b&&this.allowContainerClassName(g)){b.removeClassName("validation-passed");b.addClassName("validation-error")}}},allowContainerClassName:function(b){if(b.type=="radio"||b.type=="checkbox"){return b.hasClassName("change-container-classname")}return true},test:function(g,o,l){var d=Validation.get(g);var n="__advice"+g.camelize();try{if(Validation.isVisible(o)&&!d.test($F(o),o)){var f=Validation.getAdvice(g,o);if(f==null){f=this.createAdvice(g,o,l)}this.showAdvice(o,f,g);this.updateCallback(o,"failed");o[n]=1;if(!o.advaiceContainer){o.removeClassName("validation-passed");o.addClassName("validation-failed")}if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var b=o.up(Validation.defaultOptions.containerClassName);if(b&&this.allowContainerClassName(o)){b.removeClassName("validation-passed");b.addClassName("validation-error")}}return false}else{var f=Validation.getAdvice(g,o);this.hideAdvice(o,f);this.updateCallback(o,"passed");o[n]="";o.removeClassName("validation-failed");o.addClassName("validation-passed");if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var b=o.up(Validation.defaultOptions.containerClassName);if(b&&!b.down(".validation-failed")&&this.allowContainerClassName(o)){if(!Validation.get("IsEmpty").test(o.value)||!this.isVisible(o)){b.addClassName("validation-passed")}else{b.removeClassName("validation-passed")}b.removeClassName("validation-error")}}return true}}catch(h){throw (h)}},isVisible:function(b){while(b.tagName!="BODY"){if(!$(b).visible()){return false}b=b.parentNode}return true},getAdvice:function(b,d){return $("advice-"+b+"-"+Validation.getElmID(d))||$("advice-"+Validation.getElmID(d))},createAdvice:function(e,n,l,d){var b=Validation.get(e);var h=l?((n&&n.title)?n.title:b.error):b.error;if(d){h=d}if(jQuery.mage.__){h=jQuery.mage.__(h)}advice='<div class="validation-advice" id="advice-'+e+"-"+Validation.getElmID(n)+'" style="display:none">'+h+"</div>";Validation.insertAdvice(n,advice);advice=Validation.getAdvice(e,n);if($(n).hasClassName("absolute-advice")){var g=$(n).getDimensions();var f=Position.cumulativeOffset(n);advice._adviceTop=(f[1]+g.height)+"px";advice._adviceLeft=(f[0])+"px";advice._adviceWidth=(g.width)+"px";advice._adviceAbsolutize=true}return advice},getElmID:function(b){return b.id?b.id:b.name},reset:function(d){d=$(d);var b=$w(d.className);b.each(function(g){var h="__advice"+g.camelize();if(d[h]){var f=Validation.getAdvice(g,d);if(f){f.hide()}d[h]=""}d.removeClassName("validation-failed");d.removeClassName("validation-passed");if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var e=d.up(Validation.defaultOptions.containerClassName);if(e){e.removeClassName("validation-passed");e.removeClassName("validation-error")}}})},add:function(f,e,g,d){var b={};b[f]=new Validator(f,e,g,d);Object.extend(Validation.methods,b)},addAllThese:function(b){var d={};$A(b).each(function(e){d[e[0]]=new Validator(e[0],e[1],e[2],(e.length>3?e[3]:{}))});Object.extend(Validation.methods,d)},get:function(b){return Validation.methods[b]?Validation.methods[b]:Validation.methods._LikeNoIDIEverSaw_},methods:{_LikeNoIDIEverSaw_:new Validator("_LikeNoIDIEverSaw_","",{})}});Validation.add("IsEmpty","",function(b){return(b==""||(b==null)||(b.length==0)||/^\s+$/.test(b))});Validation.addAllThese([["validate-no-html-tags","HTML tags are not allowed",function(b){return !/<(\/)?\w+/.test(b)}],["validate-select","Please select an option.",function(b){return((b!="none")&&(b!=null)&&(b.length!=0))}],["required-entry","This is a required field.",function(b){return !Validation.get("IsEmpty").test(b)}],["validate-number","Please enter a valid number in this field.",function(b){return Validation.get("IsEmpty").test(b)||(!isNaN(parseNumber(b))&&/^\s*-?\d*(\.\d*)?\s*$/.test(b))}],["validate-number-range","The value is not within the specified range.",function(e,g){if(Validation.get("IsEmpty").test(e)){return true}var f=parseNumber(e);if(isNaN(f)){return false}var d=/^number-range-(-?[\d.,]+)?-(-?[\d.,]+)?$/,b=true;$w(g.className).each(function(l){var h=d.exec(l);if(h){b=b&&(h[1]==null||h[1]==""||f>=parseNumber(h[1]))&&(h[2]==null||h[2]==""||f<=parseNumber(h[2]))}});return b}],["validate-digits","Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.",function(b){return Validation.get("IsEmpty").test(b)||!/[^\d]/.test(b)}],["validate-digits-range","The value is not within the specified range.",function(e,g){if(Validation.get("IsEmpty").test(e)){return true}var f=parseNumber(e);if(isNaN(f)){return false}var d=/^digits-range-(-?\d+)?-(-?\d+)?$/,b=true;$w(g.className).each(function(l){var h=d.exec(l);if(h){b=b&&(h[1]==null||h[1]==""||f>=parseNumber(h[1]))&&(h[2]==null||h[2]==""||f<=parseNumber(h[2]))}});return b}],["validate-range","The value is not within the specified range.",function(f,l){var g,h;if(Validation.get("IsEmpty").test(f)){return true}else{if(Validation.get("validate-digits").test(f)){g=h=parseNumber(f)}else{var e=/^(-?\d+)?-(-?\d+)?$/.exec(f);if(e){g=parseNumber(e[1]);h=parseNumber(e[2]);if(g>h){return false}}else{return false}}}var d=/^range-(-?\d+)?-(-?\d+)?$/,b=true;$w(l.className).each(function(n){var q=d.exec(n);if(q){var p=parseNumber(q[1]);var o=parseNumber(q[2]);b=b&&(isNaN(p)||g>=p)&&(isNaN(o)||h<=o)}});return b}],["validate-alpha","Please use letters only (a-z or A-Z) in this field.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-zA-Z]+$/.test(b)}],["validate-code","Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-z]+[a-z0-9_]+$/.test(b)}],["validate-alphanum","Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-zA-Z0-9]+$/.test(b)}],["validate-alphanum-with-spaces","Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-zA-Z0-9 ]+$/.test(b)}],["validate-street",'Please use only letters (a-z or A-Z), numbers (0-9), spaces and "#" in this field.',function(b){return Validation.get("IsEmpty").test(b)||/^[ \w]{3,}([A-Za-z]\.)?([ \w]*\#\d+)?(\r\n| )[ \w]{3,}/.test(b)}],["validate-phoneStrict","Please enter a valid phone number (Ex: 123-456-7890).",function(b){return Validation.get("IsEmpty").test(b)||/^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(b)}],["validate-phoneLax","Please enter a valid phone number (Ex: 123-456-7890).",function(b){return Validation.get("IsEmpty").test(b)||/^((\d[-. ]?)?((\(\d{3}\))|\d{3}))?[-. ]?\d{3}[-. ]?\d{4}$/.test(b)}],["validate-fax","Please enter a valid fax number (Ex: 123-456-7890).",function(b){return Validation.get("IsEmpty").test(b)||/^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(b)}],["validate-date","Please enter a valid date.",function(b){var d=new Date(b);return Validation.get("IsEmpty").test(b)||!isNaN(d)}],["validate-date-range","Make sure the To Date is later than or the same as the From Date.",function(e,h){var d=/\bdate-range-(\w+)-(\w+)\b/.exec(h.className);if(!d||d[2]=="to"||Validation.get("IsEmpty").test(e)){return true}var f=new Date().getFullYear()+"";var b=function(l){l=l.split(/[.\/]/);if(l[2]&&l[2].length<4){l[2]=f.substr(0,l[2].length)+l[2]}return new Date(l.join("/")).getTime()};var g=Element.select(h.form,".validate-date-range.date-range-"+d[1]+"-to");return !g.length||Validation.get("IsEmpty").test(g[0].value)||b(e)<=b(g[0].value)}],["validate-email","Please enter a valid email address (Ex: johndoe@domain.com).",function(b){return Validation.get("IsEmpty").test(b)||/^([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*@([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*\.(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]){2,})$/i.test(b)}],["validate-emailSender","Please use only visible characters and spaces.",function(b){return Validation.get("IsEmpty").test(b)||/^[\S ]+$/.test(b)}],["validate-password","Please enter 6 or more characters. Leading and trailing spaces will be ignored.",function(b){var d=b.strip();return !(d.length>0&&d.length<6)}],["validate-admin-password","Please enter 7 or more characters, using both numeric and alphabetic.",function(b){var d=b.strip();if(0==d.length){return true}if(!(/[a-z]/i.test(b))||!(/[0-9]/.test(b))){return false}return !(d.length<7)}],["validate-cpassword","Please make sure your passwords match.",function(b){var d=$("confirmation")?$("confirmation"):$$(".validate-cpassword")[0];var g=false;if($("password")){g=$("password")}var h=$$(".validate-password");for(var e=0;e<h.size();e++){var f=h[e];if(f.up("form").id==d.up("form").id){g=f}}if($$(".validate-admin-password").size()){g=$$(".validate-admin-password")[0]}return(g.value==d.value)}],["validate-both-passwords","Please make sure your passwords match.",function(e,d){var b=$(d.form[d.name=="password"?"confirmation":"password"]),f=d.value==b.value;if(f&&b.hasClassName("validation-failed")){Validation.test(this.className,b)}return b.value==""||f}],["validate-url","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)",function(b){b=(b||"").replace(/^\s+/,"").replace(/\s+$/,"");return Validation.get("IsEmpty").test(b)||/^(http|https|ftp):\/\/(([A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))(\.[A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))*)(:(\d+))?(\/[A-Z0-9~](([A-Z0-9_~-]|\.)*[A-Z0-9~]|))*\/?(.*)?$/i.test(b)}],["validate-clean-url",'Please enter a valid URL (Ex: "http://www.example.com" or "www.example.com").',function(b){return Validation.get("IsEmpty").test(b)||/^(http|https|ftp):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(b)||/^(www)((\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(b)}],["validate-identifier",'Please enter a valid URL Key (Ex: "example-page", "example-page.html" or "anotherlevel/example-page").',function(b){return Validation.get("IsEmpty").test(b)||/^[a-z0-9][a-z0-9_\/-]+(\.[a-z0-9_-]+)?$/.test(b)}],["validate-xml-identifier","Please enter a valid XML-identifier (Ex: something_1, block5, id-4).",function(b){return Validation.get("IsEmpty").test(b)||/^[A-Z][A-Z0-9_\/-]*$/i.test(b)}],["validate-ssn","Please enter a valid social security number (Ex: 123-45-6789).",function(b){return Validation.get("IsEmpty").test(b)||/^\d{3}-?\d{2}-?\d{4}$/.test(b)}],["validate-zip-us","Please enter a valid zip code (Ex: 90602 or 90602-1234).",function(b){return Validation.get("IsEmpty").test(b)||/(^\d{5}$)|(^\d{5}-\d{4}$)/.test(b)}],["validate-zip-international","Please enter a valid zip code.",function(b){return true}],["validate-date-au",'Please use this date format: dd/mm/yyyy (Ex: "17/03/2006" for the 17th of March, 2006).',function(b){if(Validation.get("IsEmpty").test(b)){return true}var e=/^(\d{2})\/(\d{2})\/(\d{4})$/;if(!e.test(b)){return false}var f=new Date(b.replace(e,"$2/$1/$3"));return(parseInt(RegExp.$2,10)==(1+f.getMonth()))&&(parseInt(RegExp.$1,10)==f.getDate())&&(parseInt(RegExp.$3,10)==f.getFullYear())}],["validate-currency-dollar","Please enter a valid $ amount (Ex: $100.00).",function(b){return Validation.get("IsEmpty").test(b)||/^\$?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/.test(b)}],["validate-one-required","Please select one of the options above.",function(b,f){var e=f.parentNode;var d=e.getElementsByTagName("INPUT");return $A(d).any(function(g){return $F(g)})}],["validate-one-required-by-name","Please select one of the options.",function(d,g){var b=$$('input[name="'+g.name.replace(/([\\"])/g,"\\$1")+'"]');var e=1;for(var f=0;f<b.length;f++){if((b[f].type=="checkbox"||b[f].type=="radio")&&b[f].checked==true){e=0}if(Validation.isOnChange&&(b[f].type=="checkbox"||b[f].type=="radio")){Validation.reset(b[f])}}if(e==0){return true}else{return false}}],["validate-not-negative-number","Please enter a number 0 or greater in this field.",function(b){if(Validation.get("IsEmpty").test(b)){return true}b=parseNumber(b);return !isNaN(b)&&b>=0}],["validate-zero-or-greater","Please enter a number 0 or greater in this field.",function(b){return Validation.get("validate-not-negative-number").test(b)}],["validate-greater-than-zero","Please enter a number greater than 0 in this field.",function(b){if(Validation.get("IsEmpty").test(b)){return true}b=parseNumber(b);return !isNaN(b)&&b>0}],["validate-state","Please select State/Province.",function(b){return(b!=0||b=="")}],["validate-new-password","Please enter 6 or more characters. Leading and trailing spaces will be ignored.",function(b){if(!Validation.get("validate-password").test(b)){return false}if(Validation.get("IsEmpty").test(b)&&b!=""){return false}return true}],["validate-cc-number","Please enter a valid credit card number.",function(b,e){var d=$(e.id.substr(0,e.id.indexOf("_cc_number"))+"_cc_type");if(d&&typeof Validation.creditCartTypes.get(d.value)!="undefined"&&Validation.creditCartTypes.get(d.value)[2]==false){if(!Validation.get("IsEmpty").test(b)&&Validation.get("validate-digits").test(b)){return true}else{return false}}return validateCreditCard(b)}],["validate-cc-type","Credit card number does not match credit card type.",function(d,g){g.value=removeDelimiters(g.value);d=removeDelimiters(d);var f=$(g.id.substr(0,g.id.indexOf("_cc_number"))+"_cc_type");if(!f){return true}var e=f.value;if(typeof Validation.creditCartTypes.get(e)=="undefined"){return false}if(Validation.creditCartTypes.get(e)[0]==false){return true}var b="";Validation.creditCartTypes.each(function(h){if(h.value[0]&&d.match(h.value[0])){b=h.key;throw $break}});if(b!=e){return false}if(f.hasClassName("validation-failed")&&Validation.isOnChange){Validation.validate(f)}return true}],["validate-cc-type-select","Card type does not match credit card number.",function(d,e){var b=$(e.id.substr(0,e.id.indexOf("_cc_type"))+"_cc_number");if(Validation.isOnChange&&Validation.get("IsEmpty").test(b.value)){return true}if(Validation.get("validate-cc-type").test(b.value,b)){Validation.validate(b)}return Validation.get("validate-cc-type").test(b.value,b)}],["validate-cc-exp","Incorrect credit card expiration date.",function(b,l){var h=b;var g=$(l.id.substr(0,l.id.indexOf("_expiration"))+"_expiration_yr").value;var f=new Date();var e=f.getMonth()+1;var d=f.getFullYear();if(h<e&&g==d){return false}return true}],["validate-cc-cvn","Please enter a valid credit card verification number.",function(b,g){var f=$(g.id.substr(0,g.id.indexOf("_cc_cid"))+"_cc_type");if(!f){return true}var d=f.value;if(typeof Validation.creditCartTypes.get(d)=="undefined"){return false}var e=Validation.creditCartTypes.get(d)[1];if(b.match(e)){return true}return false}],["validate-ajax","",function(b,d){return true}],["validate-data","Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.",function(b){if(b!=""&&b){return/^[A-Za-z]+[A-Za-z0-9_]+$/.test(b)}return true}],["validate-css-length","Please input a valid CSS-length (Ex: 100px, 77pt, 20em, .5ex or 50%).",function(b){if(b!=""&&b){return/^[0-9\.]+(px|pt|em|ex|%)?$/.test(b)&&(!(/\..*\./.test(b)))&&!(/\.$/.test(b))}return true}],["validate-length","Text length does not meet the specified text range.",function(d,g){var e=new RegExp(/^maximum-length-[0-9]+$/);var f=new RegExp(/^minimum-length-[0-9]+$/);var b=true;$w(g.className).each(function(l,h){if(l.match(e)&&b){var n=l.split("-")[2];b=(d.length<=n)}if(l.match(f)&&b&&!Validation.get("IsEmpty").test(d)){var n=l.split("-")[2];b=(d.length>=n)}});return b}],["validate-percents","Please enter a number lower than 100.",{max:100}],["required-file","Please select a file.",function(d,e){var b=!Validation.get("IsEmpty").test(d);if(b===false){ovId=e.id+"_value";if($(ovId)){b=!Validation.get("IsEmpty").test($(ovId).value)}}return b}],["validate-cc-ukss","Please enter issue number or start date for switch/solo card type.",function(o,g){var b;if(g.id.match(/(.)+_cc_issue$/)){b=g.id.indexOf("_cc_issue")}else{if(g.id.match(/(.)+_start_month$/)){b=g.id.indexOf("_start_month")}else{b=g.id.indexOf("_start_year")}}var f=g.id.substr(0,b);var d=$(f+"_cc_type");if(!d){return true}var n=d.value;if(["SS","SM","SO"].indexOf(n)==-1){return true}$(f+"_cc_issue").advaiceContainer=$(f+"_start_month").advaiceContainer=$(f+"_start_year").advaiceContainer=$(f+"_cc_type_ss_div").down(".adv-container");var h=$(f+"_cc_issue").value;var l=$(f+"_start_month").value;var p=$(f+"_start_year").value;var e=(l&&p)?true:false;if(!e&&!h){return false}return true}]]);function removeDelimiters(b){b=b.replace(/\s/g,"");b=b.replace(/\-/g,"");return b}function parseNumber(b){if(typeof b!="string"){return parseFloat(b)}var e=b.indexOf(".");var d=b.indexOf(",");if(e!=-1&&d!=-1){if(d>e){b=b.replace(".","").replace(",",".")}else{b=b.replace(",","")}}else{if(d!=-1){b=b.replace(",",".")}}return parseFloat(b)}Validation.creditCartTypes=$H({SO:[new RegExp("^(6334[5-9]([0-9]{11}|[0-9]{13,14}))|(6767([0-9]{12}|[0-9]{14,15}))$"),new RegExp("^([0-9]{3}|[0-9]{4})?$"),true],SM:[new RegExp("(^(5[0678])[0-9]{11,18}$)|(^(6[^05])[0-9]{11,18}$)|(^(601)[^1][0-9]{9,16}$)|(^(6011)[0-9]{9,11}$)|(^(6011)[0-9]{13,16}$)|(^(65)[0-9]{11,13}$)|(^(65)[0-9]{15,18}$)|(^(49030)[2-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49033)[5-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49110)[1-2]([0-9]{10}$|[0-9]{12,13}$))|(^(49117)[4-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49118)[0-2]([0-9]{10}$|[0-9]{12,13}$))|(^(4936)([0-9]{12}$|[0-9]{14,15}$))"),new RegExp("^([0-9]{3}|[0-9]{4})?$"),true],VI:[new RegExp("^4[0-9]{12}([0-9]{3})?$"),new RegExp("^[0-9]{3}$"),true],MC:[new RegExp("^5[1-5][0-9]{14}$"),new RegExp("^[0-9]{3}$"),true],AE:[new RegExp("^3[47][0-9]{13}$"),new RegExp("^[0-9]{4}$"),true],DI:[new RegExp("^6(011|4[4-9][0-9]|5[0-9]{2})[0-9]{12}$"),new RegExp("^[0-9]{3}$"),true],JCB:[new RegExp("^(3[0-9]{15}|(2131|1800)[0-9]{11})$"),new RegExp("^[0-9]{3,4}$"),true],OT:[false,new RegExp("^([0-9]{3}|[0-9]{4})?$"),false]});function popWin(d,e,b){var e=window.open(d,e,b);e.focus()}function setLocation(b){window.location.href=b}function setPLocation(d,b){if(b){window.opener.focus()}window.opener.location.href=d}function setLanguageCode(e,f){var b=window.location.href;var h="",g;if(g=b.match(/\#(.*)$/)){b=b.replace(/\#(.*)$/,"");h=g[0]}if(b.match(/[?]/)){var d=/([?&]store=)[a-z0-9_]*/;if(b.match(d)){b=b.replace(d,"$1"+e)}else{b+="&store="+e}var d=/([?&]from_store=)[a-z0-9_]*/;if(b.match(d)){b=b.replace(d,"")}}else{b+="?store="+e}if(typeof f!="undefined"){b+="&from_store="+f}b+=h;setLocation(b)}function decorateGeneric(h,e){var l=["odd","even","first","last"];var d={};var g=h.length;if(g){if(typeof e=="undefined"){e=l}if(!e.length){return}for(var b in l){d[l[b]]=false}for(var b in e){d[e[b]]=true}if(d.first){Element.addClassName(h[0],"first")}if(d.last){Element.addClassName(h[g-1],"last")}for(var f=0;f<g;f++){if((f+1)%2==0){if(d.even){Element.addClassName(h[f],"even")}}else{if(d.odd){Element.addClassName(h[f],"odd")}}}}}function decorateTable(h,e){var h=$(h);if(h){var b={tbody:false,"tbody tr":["odd","even","first","last"],"thead tr":["first","last"],"tfoot tr":["first","last"],"tr td":["last"]};if(typeof e!="undefined"){for(var d in e){b[d]=e[d]}}if(b.tbody){decorateGeneric(h.select("tbody"),b.tbody)}if(b["tbody tr"]){decorateGeneric(h.select("tbody tr"),b["tbody tr"])}if(b["thead tr"]){decorateGeneric(h.select("thead tr"),b["thead tr"])}if(b["tfoot tr"]){decorateGeneric(h.select("tfoot tr"),b["tfoot tr"])}if(b["tr td"]){var g=h.select("tr");if(g.length){for(var f=0;f<g.length;f++){decorateGeneric(g[f].getElementsByTagName("TD"),b["tr td"])}}}}}function decorateList(e,d){if($(e)){if(typeof d=="undefined"){var b=$(e).select("li")}else{var b=$(e).childElements()}decorateGeneric(b,["odd","even","last"])}}function decorateDataList(b){b=$(b);if(b){decorateGeneric(b.select("dt"),["odd","even","last"]);decorateGeneric(b.select("dd"),["odd","even","last"])}}function parseSidUrl(f,e){var d=f.indexOf("/?SID=");var b="";e=e!=undefined?e:"";if(d>-1){b="?"+f.substring(d+2);f=f.substring(0,d+1)}return f+e+b}function formatCurrency(n,q,g){var l=isNaN(q.precision=Math.abs(q.precision))?2:q.precision;var v=isNaN(q.requiredPrecision=Math.abs(q.requiredPrecision))?2:q.requiredPrecision;l=v;var t=isNaN(q.integerRequired=Math.abs(q.integerRequired))?1:q.integerRequired;var p=q.decimalSymbol==undefined?",":q.decimalSymbol;var e=q.groupSymbol==undefined?".":q.groupSymbol;var d=q.groupLength==undefined?3:q.groupLength;var u="";if(g==undefined||g==true){u=n<0?"-":g?"+":""}else{if(g==false){u=""}}var h=parseInt(n=Math.abs(+n||0).toFixed(l))+"";var f=h.length<t?t-h.length:0;while(f){h="0"+h;f--}j=(j=h.length)>d?j%d:0;re=new RegExp("(\\d{"+d+"})(?=\\d)","g");var b=(j?h.substr(0,j)+e:"")+h.substr(j).replace(re,"$1"+e)+(l?p+Math.abs(n-h).toFixed(l).replace(/-/,0).slice(2):"");var o="";if(q.pattern.indexOf("{sign}")==-1){o=u+q.pattern}else{o=q.pattern.replace("{sign}",u)}return o.replace("%s",b).replace(/^\s\s*/,"").replace(/\s\s*$/,"")}function expandDetails(d,b){if(Element.hasClassName(d,"show-details")){$$(b).each(function(e){e.hide()});Element.removeClassName(d,"show-details")}else{$$(b).each(function(e){e.show()});Element.addClassName(d,"show-details")}}var isIE=navigator.appVersion.match(/MSIE/)=="MSIE";if(!window.Varien){var Varien=new Object()}Varien.showLoading=function(){var b=$("loading-process");b&&b.show()};Varien.hideLoading=function(){var b=$("loading-process");b&&b.hide()};Varien.GlobalHandlers={onCreate:function(){Varien.showLoading()},onComplete:function(){if(Ajax.activeRequestCount==0){Varien.hideLoading()}}};Ajax.Responders.register(Varien.GlobalHandlers);Varien.searchForm=Class.create();Varien.searchForm.prototype={initialize:function(d,e,b){this.form=$(d);this.field=$(e);this.emptyText=b;Event.observe(this.form,"submit",this.submit.bind(this));Event.observe(this.field,"focus",this.focus.bind(this));Event.observe(this.field,"blur",this.blur.bind(this));this.blur()},submit:function(b){if(this.field.value==this.emptyText||this.field.value==""){Event.stop(b);return false}return true},focus:function(b){if(this.field.value==this.emptyText){this.field.value=""}},blur:function(b){if(this.field.value==""){this.field.value=this.emptyText}}};Varien.DateElement=Class.create();Varien.DateElement.prototype={initialize:function(b,d,f,e){if(b=="id"){this.day=$(d+"day");this.month=$(d+"month");this.year=$(d+"year");this.full=$(d+"full");this.advice=$(d+"date-advice")}else{if(b=="container"){this.day=d.day;this.month=d.month;this.year=d.year;this.full=d.full;this.advice=d.advice}else{return}}this.required=f;this.format=e;this.day.addClassName("validate-custom");this.day.validate=this.validate.bind(this);this.month.addClassName("validate-custom");this.month.validate=this.validate.bind(this);this.year.addClassName("validate-custom");this.year.validate=this.validate.bind(this);this.setDateRange(false,false);this.year.setAttribute("autocomplete","off");this.advice.hide()},validate:function(){var l=false,o=parseInt(this.day.value,10)||0,f=parseInt(this.month.value,10)||0,h=parseInt(this.year.value,10)||0;if(this.day.value.strip().empty()&&this.month.value.strip().empty()&&this.year.value.strip().empty()){if(this.required){l="Please enter a date."}else{this.full.value=""}}else{if(!o||!f||!h){l="Please enter a valid full date."}else{var d=new Date,n=0,e=null;d.setYear(h);d.setMonth(f-1);d.setDate(32);n=32-d.getDate();if(!n||n>31){n=31}if(o<1||o>n){e="day";l="Please enter a valid day (1-%1)."}else{if(f<1||f>12){e="month";l="Please enter a valid month (1-12)."}else{if(o%10==o){this.day.value="0"+o}if(f%10==f){this.month.value="0"+f}this.full.value=this.format.replace(/%[mb]/i,this.month.value).replace(/%[de]/i,this.day.value).replace(/%y/i,this.year.value);var b=this.month.value+"/"+this.day.value+"/"+this.year.value;var g=new Date(b);if(isNaN(g)){l="Please enter a valid date."}else{this.setFullDate(g)}}}var p=false;if(!l&&!this.validateData()){e=this.validateDataErrorType;p=this.validateDataErrorText;l=p}}}if(l!==false){if(jQuery.mage.__){l=jQuery.mage.__(l)}if(!p){this.advice.innerHTML=l.replace("%1",n)}else{this.advice.innerHTML=this.errorTextModifier(l)}this.advice.show();return false}this.day.removeClassName("validation-failed");this.month.removeClassName("validation-failed");this.year.removeClassName("validation-failed");this.advice.hide();return true},validateData:function(){var d=this.fullDate.getFullYear();var b=new Date;this.curyear=b.getFullYear();return d>=1900&&d<=this.curyear},validateDataErrorType:"year",validateDataErrorText:"Please enter a valid year (1900-%1).",errorTextModifier:function(b){return b.replace("%1",this.curyear)},setDateRange:function(b,d){this.minDate=b;this.maxDate=d},setFullDate:function(b){this.fullDate=b}};Varien.DOB=Class.create();Varien.DOB.prototype={initialize:function(b,g,f){var e=$$(b)[0];var d={};d.day=Element.select(e,".dob-day input")[0];d.month=Element.select(e,".dob-month input")[0];d.year=Element.select(e,".dob-year input")[0];d.full=Element.select(e,".dob-full input")[0];d.advice=Element.select(e,".validation-advice")[0];new Varien.DateElement("container",d,g,f)}};Varien.dateRangeDate=Class.create();Varien.dateRangeDate.prototype=Object.extend(new Varien.DateElement(),{validateData:function(){var b=true;if(this.minDate||this.maxValue){if(this.minDate){this.minDate=new Date(this.minDate);this.minDate.setHours(0);if(isNaN(this.minDate)){this.minDate=new Date("1/1/1900")}b=b&&this.fullDate>=this.minDate}if(this.maxDate){this.maxDate=new Date(this.maxDate);this.minDate.setHours(0);if(isNaN(this.maxDate)){this.maxDate=new Date()}b=b&&this.fullDate<=this.maxDate}if(this.maxDate&&this.minDate){this.validateDataErrorText="Please enter a valid date between %s and %s"}else{if(this.maxDate){this.validateDataErrorText="Please enter a valid date less than or equal to %s"}else{if(this.minDate){this.validateDataErrorText="Please enter a valid date equal to or greater than %s"}else{this.validateDataErrorText=""}}}}return b},validateDataErrorText:"Date should be between %s and %s",errorTextModifier:function(b){if(this.minDate){b=b.sub("%s",this.dateFormat(this.minDate))}if(this.maxDate){b=b.sub("%s",this.dateFormat(this.maxDate))}return b},dateFormat:function(b){return b.getMonth()+1+"/"+b.getDate()+"/"+b.getFullYear()}});Varien.FileElement=Class.create();Varien.FileElement.prototype={initialize:function(b){this.fileElement=$(b);this.hiddenElement=$(b+"_value");this.fileElement.observe("change",this.selectFile.bind(this))},selectFile:function(b){this.hiddenElement.value=this.fileElement.getValue()}};Validation.addAllThese([["validate-custom"," ",function(b,d){return d.validate()}]]);Element.addMethods({getInnerText:function(b){b=$(b);if(b.innerText&&!Prototype.Browser.Opera){return b.innerText}return b.innerHTML.stripScripts().unescapeHTML().replace(/[\n\r\s]+/g," ").strip()}});function fireEvent(d,e){if(document.createEvent){var b=document.createEvent("HTMLEvents");b.initEvent(e,true,true);return d.dispatchEvent(b)}var b=document.createEventObject();return d.fireEvent("on"+e,b)}function modulo(b,f){var e=f/10000;var d=b%f;if(Math.abs(d-f)<e||Math.abs(d)<e){d=0}return d}if(typeof Range!="undefined"&&!Range.prototype.createContextualFragment){Range.prototype.createContextualFragment=function(b){var e=document.createDocumentFragment(),d=document.createElement("div");e.appendChild(d);d.outerHTML=b;return e}}var byteConvert=function(b){if(isNaN(b)){return""}var d=["bytes","KB","MB","GB","TB","PB","EB","ZB","YB"];var f=Math.floor(Math.log(b)/Math.log(2));if(f<1){f=0}var e=Math.floor(f/10);b/=Math.pow(2,10*e);if(b.toString().length>b.toFixed(2).toString().length){b=b.toFixed(2)}return b+" "+d[e]};var SessionError=Class.create();SessionError.prototype={initialize:function(b){this.errorText=b},toString:function(){return"Session Error:"+this.errorText}};Ajax.Request.addMethods({initialize:function($super,d,b){$super(b);this.transport=Ajax.getTransport();if(!d.match(new RegExp("[?&]isAjax=true",""))){d=d.match(new RegExp("\\?","g"))?d+"&isAjax=true":d+"?isAjax=true"}if(Object.isString(this.options.parameters)&&this.options.parameters.indexOf("form_key=")==-1){this.options.parameters+="&"+Object.toQueryString({form_key:FORM_KEY})}else{if(!this.options.parameters){this.options.parameters={form_key:FORM_KEY}}if(!this.options.parameters.form_key){this.options.parameters.form_key=FORM_KEY}}this.request(d)},respondToReadyState:function(b){var g=Ajax.Request.Events[b],d=new Ajax.Response(this);if(g=="Complete"){try{this._complete=true;if(d.responseText.isJSON()){var f=d.responseText.evalJSON();if(f.ajaxExpired&&f.ajaxRedirect){window.location.replace(f.ajaxRedirect);throw new SessionError("session expired")}}(this.options["on"+d.status]||this.options["on"+(this.success()?"Success":"Failure")]||Prototype.emptyFunction)(d,d.headerJSON)}catch(h){this.dispatchException(h);if(h instanceof SessionError){return}}var l=d.getHeader("Content-type");if(this.options.evalJS=="force"||this.options.evalJS&&this.isSameOrigin()&&l&&l.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)){this.evalResponse()}}try{(this.options["on"+g]||Prototype.emptyFunction)(d,d.headerJSON);Ajax.Responders.dispatch("on"+g,this,d,d.headerJSON)}catch(h){this.dispatchException(h)}if(g=="Complete"){this.transport.onreadystatechange=Prototype.emptyFunction}}});Ajax.Updater.respondToReadyState=Ajax.Request.respondToReadyState;var varienLoader=new Class.create();varienLoader.prototype={initialize:function(b){this.callback=false;this.cache=$H();this.caching=b||false;this.url=false},getCache:function(b){if(this.cache.get(b)){return this.cache.get(b)}return false},load:function(b,d,f){this.url=b;this.callback=f;if(this.caching){var e=this.getCache(b);if(e){this.processResult(e);return}}if(typeof d.updaterId!="undefined"){new varienUpdater(d.updaterId,b,{evalScripts:true,onComplete:this.processResult.bind(this),onFailure:this._processFailure.bind(this)})}else{new Ajax.Request(b,{method:"post",parameters:d||{},onComplete:this.processResult.bind(this),onFailure:this._processFailure.bind(this)})}},_processFailure:function(b){location.href=BASE_URL},processResult:function(b){if(this.caching){this.cache.set(this.url,b)}if(this.callback){this.callback(b.responseText)}}};if(!window.varienLoaderHandler){var varienLoaderHandler=new Object()}varienLoaderHandler.handler={onCreate:function(b){if(b.options.loaderArea===false){return}jQuery("body").trigger("processStart")},onException:function(b){jQuery("body").trigger("processStop")},onComplete:function(b){jQuery("body").trigger("processStop")}};function setLoaderPosition(){var e=$("loading_mask_loader");if(e&&Prototype.Browser.IE){var d=e.getDimensions();var f=document.viewport.getDimensions();var b=document.viewport.getScrollOffsets();e.style.left=Math.floor(f.width/2+b.left-d.width/2)+"px";e.style.top=Math.floor(f.height/2+b.top-d.height/2)+"px";e.style.position="absolute"}}function toggleSelectsUnderBlock(f,b){if(Prototype.Browser.IE){var e=document.getElementsByTagName("select");for(var d=0;d<e.length;d++){if(b){if(e[d].needShowOnSuccess){e[d].needShowOnSuccess=false;e[d].style.visibility=""}}else{if(Element.visible(e[d])){e[d].style.visibility="hidden";e[d].needShowOnSuccess=true}}}}}Ajax.Responders.register(varienLoaderHandler.handler);var varienUpdater=Class.create(Ajax.Updater,{updateContent:function($super,b){if(b.isJSON()){var d=b.evalJSON();if(d.ajaxExpired&&d.ajaxRedirect){window.location.replace(d.ajaxRedirect)}}else{$super(b)}}});function setLocation(b){window.location.href=b}function setElementDisable(d,b){if($(d)){$(d).disabled=b}}function toggleParentVis(b){b=$(b).parentNode;if(b.style.display=="none"){b.style.display=""}else{b.style.display="none"}}function toggleFieldsetVis(d){id=d;d=$(d);if(d.style.display=="none"){d.style.display=""}else{d.style.display="none"}d=d.parentNode.childElements();for(var b=0;b<d.length;b++){if(d[b].id!=undefined&&d[b].id==id&&d[b-1].classNames()=="entry-edit-head"){if(d[b-1].style.display=="none"){d[b-1].style.display=""}else{d[b-1].style.display="none"}}}}function toggleVis(b){b=$(b);if(b.style.display=="none"){b.style.display=""}else{b.style.display="none"}}function imagePreview(b){if($(b)){var d=window.open("","preview","width=400,height=400,resizable=1,scrollbars=1");d.document.open();d.document.write('<body style="padding:0;margin:0"><img src="'+$(b).src+'" id="image_preview"/></body>');d.document.close();Event.observe(d,"load",function(){var e=d.document.getElementById("image_preview");d.resizeTo(e.width+40,e.height+80)})}}function checkByProductPriceType(b){if(b.id=="price_type"){this.productPriceType=b.value;return false}if(b.id=="price"&&this.productPriceType==0){return false}return true}function toggleSeveralValueElements(f,e,b,d){if(e&&f){if(Object.prototype.toString.call(e)!="[object Array]"){e=[e]}e.each(function(g){toggleValueElements(f,g,b,d)})}}function toggleValueElements(l,d,f,h){if(d&&l){var n=[l];if(typeof f!="undefined"){if(Object.prototype.toString.call(f)!="[object Array]"){f=[f]}for(var g=0;g<f.length;g++){n.push(f[g])}}var e=Element.select(d,["select","input","textarea","button","img"]).filter(function(o){return o.readAttribute("type")!="hidden"});var b=h!=undefined?h:l.checked;e.each(function(p){if(checkByProductPriceType(p)){var o=n.length;while(o--&&p!=n[o]){}if(o!=-1){return}p.disabled=b;if(b){p.addClassName("disabled")}else{p.removeClassName("disabled")}if(p.nodeName.toLowerCase()=="img"){b?p.hide():p.show()}}})}}function submitAndReloadArea(e,d){if($(e)){var b=$(e).select("input","select","textarea");var f=Form.serializeElements(b,true);d+=d.match(new RegExp("\\?"))?"&isAjax=true":"?isAjax=true";new Ajax.Request(d,{parameters:$H(f),loaderArea:e,onSuccess:function(l){try{if(l.responseText.isJSON()){var g=l.responseText.evalJSON();if(g.error){alert(g.message)}if(g.ajaxExpired&&g.ajaxRedirect){setLocation(g.ajaxRedirect)}}else{$(e).update(l.responseText)}}catch(h){$(e).update(l.responseText)}}})}}function syncOnchangeValue(d,e){var b={baseElem:d,distElem:e};Event.observe(d,"change",function(){if($(this.baseElem)&&$(this.distElem)){$(this.distElem).value=$(this.baseElem).value}}.bind(b))}function updateElementAtCursor(e,f,g){if(g==undefined){g=window.self}if(document.selection){e.focus();sel=g.document.selection.createRange();sel.text=f}else{if(e.selectionStart||e.selectionStart=="0"){var d=e.selectionStart;var b=e.selectionEnd;e.value=e.value.substring(0,d)+f+e.value.substring(b,e.value.length)}else{e.value+=f}}}function firebugEnabled(){if(window.console&&window.console.firebug){return true}return false}function disableElement(b){b.disabled=true;b.addClassName("disabled")}function enableElement(b){b.disabled=false;b.removeClassName("disabled")}function disableElements(b){$$("."+b).each(disableElement)}function enableElements(b){$$("."+b).each(enableElement)}var Cookie={all:function(){var d=document.cookie.split(";");var b={};d.each(function(f,e){var g=f.strip().split("=");b[unescape(g[0])]=unescape(g[1])});return b},read:function(d){var b=this.all();if(b[d]){return b[d]}return null},write:function(h,f,g){var b="";if(g){var e=new Date();e.setTime(e.getTime()+g*1000);b="; expires="+e.toUTCString()}var d="/"+BASE_URL.split("/").slice(3).join("/");document.cookie=escape(h)+"="+escape(f)+b+"; path="+d},clear:function(b){this.write(b,"",-1)}};var Fieldset={cookiePrefix:"fh-",applyCollapse:function(b){if($(b+"-state")){collapsed=$(b+"-state").value==1?0:1}else{collapsed=$(b+"-head").collapsed}if(collapsed==1||collapsed===undefined){$(b+"-head").removeClassName("open");if($(b+"-head").up(".section-config")){$(b+"-head").up(".section-config").removeClassName("active")}$(b).hide()}else{$(b+"-head").addClassName("open");if($(b+"-head").up(".section-config")){$(b+"-head").up(".section-config").addClassName("active")}$(b).show()}},toggleCollapse:function(b,d){if($(b+"-state")){collapsed=$(b+"-state").value==1?0:1}else{collapsed=$(b+"-head").collapsed}if(collapsed==1||collapsed===undefined){if($(b+"-state")){$(b+"-state").value=1}$(b+"-head").collapsed=0}else{if($(b+"-state")){$(b+"-state").value=0}$(b+"-head").collapsed=1}this.applyCollapse(b);if(typeof d!="undefined"){this.saveState(d,{container:b,value:$(b+"-state").value})}},addToPrefix:function(b){this.cookiePrefix+=b+"-"},saveState:function(b,d){new Ajax.Request(b,{method:"get",parameters:Object.toQueryString(d),loaderArea:false})}};var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var b="";var p,n,h,o,l,g,f;var d=0;e=Base64._utf8_encode(e);if(typeof window.btoa==="function"){return window.btoa(e)}while(d<e.length){p=e.charCodeAt(d++);n=e.charCodeAt(d++);h=e.charCodeAt(d++);o=p>>2;l=(p&3)<<4|n>>4;g=(n&15)<<2|h>>6;f=h&63;if(isNaN(n)){g=f=64}else{if(isNaN(h)){f=64}}b=b+this._keyStr.charAt(o)+this._keyStr.charAt(l)+this._keyStr.charAt(g)+this._keyStr.charAt(f)}return b},decode:function(e){var b="";var p,n,h;var o,l,g,f;var d=0;if(typeof window.atob==="function"){return Base64._utf8_decode(window.atob(e))}e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(d<e.length){o=this._keyStr.indexOf(e.charAt(d++));l=this._keyStr.indexOf(e.charAt(d++));g=this._keyStr.indexOf(e.charAt(d++));f=this._keyStr.indexOf(e.charAt(d++));p=o<<2|l>>4;n=(l&15)<<4|g>>2;h=(g&3)<<6|f;b+=String.fromCharCode(p);if(g!=64){b+=String.fromCharCode(n)}if(f!=64){b+=String.fromCharCode(h)}}return Base64._utf8_decode(b)},mageEncode:function(b){return this.encode(b).replace(/\+/g,"-").replace(/\//g,"_").replace(/=/g,",")},mageDecode:function(b){b=b.replace(/\-/g,"+").replace(/_/g,"/").replace(/,/g,"=");return this.decode(b)},idEncode:function(b){return this.encode(b).replace(/\+/g,":").replace(/\//g,"_").replace(/=/g,"-")},idDecode:function(b){b=b.replace(/\-/g,"=").replace(/_/g,"/").replace(/\:/g,"+");return this.decode(b)},_utf8_encode:function(d){d=d.replace(/\r\n/g,"\n");var b="";for(var f=0;f<d.length;f++){var e=d.charCodeAt(f);if(e<128){b+=String.fromCharCode(e)}else{if(e>127&&e<2048){b+=String.fromCharCode(e>>6|192);b+=String.fromCharCode(e&63|128)}else{b+=String.fromCharCode(e>>12|224);b+=String.fromCharCode(e>>6&63|128);b+=String.fromCharCode(e&63|128)}}}return b},_utf8_decode:function(b){var d="";var e=0;var f=c1=c2=0;while(e<b.length){f=b.charCodeAt(e);if(f<128){d+=String.fromCharCode(f);e++}else{if(f>191&&f<224){c2=b.charCodeAt(e+1);d+=String.fromCharCode((f&31)<<6|c2&63);e+=2}else{c2=b.charCodeAt(e+1);c3=b.charCodeAt(e+2);d+=String.fromCharCode((f&15)<<12|(c2&63)<<6|c3&63);e+=3}}}return d}};function sortNumeric(d,b){return d-b}(function(){var globals=["Prototype","Abstract","Try","Class","PeriodicalExecuter","Template","$break","Enumerable","$A","$w","$H","Hash","$R","ObjectRange","Ajax","$","Form","Field","$F","Toggle","Insertion","$continue","Position","Windows","Dialog","array","WindowUtilities","Builder","Effect","validateCreditCard","Validator","Validation","removeDelimiters","parseNumber","popWin","setLocation","setPLocation","setLanguageCode","decorateGeneric","decorateTable","decorateList","decorateDataList","parseSidUrl","formatCurrency","expandDetails","isIE","Varien","fireEvent","modulo","byteConvert","SessionError","varienLoader","varienLoaderHandler","setLoaderPosition","toggleSelectsUnderBlock","varienUpdater","setElementDisable","toggleParentVis","toggleFieldsetVis","toggleVis","imagePreview","checkByProductPriceType","toggleSeveralValueElements","toggleValueElements","submitAndReloadArea","syncOnchangeValue","updateElementAtCursor","firebugEnabled","disableElement","enableElement","disableElements","enableElements","Cookie","Fieldset","Base64","sortNumeric","Element","$$","Sizzle","Selector","Window"];globals.forEach(function(prop){window[prop]=eval(prop)})})();
-\ No newline at end of file
-+(function(){var w=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,p=0,g=Object.prototype.toString,u=false,o=true;[0,0].sort(function(){o=false;return 0});var d=function(L,B,I,D){I=I||[];var e=B=B||document;if(B.nodeType!==1&&B.nodeType!==9){return[]}if(!L||typeof L!=="string"){return I}var J=[],K,G,P,O,H,A,z=true,E=v(B),N=L;while((w.exec(""),K=w.exec(N))!==null){N=K[3];J.push(K[1]);if(K[2]){A=K[3];break}}if(J.length>1&&q.exec(L)){if(J.length===2&&h.relative[J[0]]){G=l(J[0]+J[1],B)}else{G=h.relative[J[0]]?[B]:d(J.shift(),B);while(J.length){L=J.shift();if(h.relative[L]){L+=J.shift()}G=l(L,G)}}}else{if(!D&&J.length>1&&B.nodeType===9&&!E&&h.match.ID.test(J[0])&&!h.match.ID.test(J[J.length-1])){var Q=d.find(J.shift(),B,E);B=Q.expr?d.filter(Q.expr,Q.set)[0]:Q.set[0]}if(B){var Q=D?{expr:J.pop(),set:b(D)}:d.find(J.pop(),J.length===1&&(J[0]==="~"||J[0]==="+")&&B.parentNode?B.parentNode:B,E);G=Q.expr?d.filter(Q.expr,Q.set):Q.set;if(J.length>0){P=b(G)}else{z=false}while(J.length){var C=J.pop(),F=C;if(!h.relative[C]){C=""}else{F=J.pop()}if(F==null){F=B}h.relative[C](P,F,E)}}else{P=J=[]}}if(!P){P=G}if(!P){throw"Syntax error, unrecognized expression: "+(C||L)}if(g.call(P)==="[object Array]"){if(!z){I.push.apply(I,P)}else{if(B&&B.nodeType===1){for(var M=0;P[M]!=null;M++){if(P[M]&&(P[M]===true||P[M].nodeType===1&&n(B,P[M]))){I.push(G[M])}}}else{for(var M=0;P[M]!=null;M++){if(P[M]&&P[M].nodeType===1){I.push(G[M])}}}}}else{b(P,I)}if(A){d(A,e,I,D);d.uniqueSort(I)}return I};d.uniqueSort=function(z){if(f){u=o;z.sort(f);if(u){for(var e=1;e<z.length;e++){if(z[e]===z[e-1]){z.splice(e--,1)}}}}return z};d.matches=function(e,z){return d(e,null,null,z)};d.find=function(F,e,G){var E,C;if(!F){return[]}for(var B=0,A=h.order.length;B<A;B++){var D=h.order[B],C;if((C=h.leftMatch[D].exec(F))){var z=C[1];C.splice(1,1);if(z.substr(z.length-1)!=="\\"){C[1]=(C[1]||"").replace(/\\/g,"");E=h.find[D](C,e,G);if(E!=null){F=F.replace(h.match[D],"");break}}}}if(!E){E=e.getElementsByTagName("*")}return{set:E,expr:F}};d.filter=function(I,H,L,B){var A=I,N=[],F=H,D,e,E=H&&H[0]&&v(H[0]);while(I&&H.length){for(var G in h.filter){if((D=h.match[G].exec(I))!=null){var z=h.filter[G],M,K;e=false;if(F==N){N=[]}if(h.preFilter[G]){D=h.preFilter[G](D,F,L,N,B,E);if(!D){e=M=true}else{if(D===true){continue}}}if(D){for(var C=0;(K=F[C])!=null;C++){if(K){M=z(K,D,C,F);var J=B^!!M;if(L&&M!=null){if(J){e=true}else{F[C]=false}}else{if(J){N.push(K);e=true}}}}}if(M!==undefined){if(!L){F=N}I=I.replace(h.match[G],"");if(!e){return[]}break}}}if(I==A){if(e==null){throw"Syntax error, unrecognized expression: "+I}else{break}}A=I}return F};var h=d.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(F,e,E){var C=typeof e==="string",G=C&&!/\W/.test(e),D=C&&!G;if(G&&!E){e=e.toUpperCase()}for(var B=0,A=F.length,z;B<A;B++){if((z=F[B])){while((z=z.previousSibling)&&z.nodeType!==1){}F[B]=D||z&&z.nodeName===e?z||false:z===e}}if(D){d.filter(e,F,true)}},">":function(E,z,F){var C=typeof z==="string";if(C&&!/\W/.test(z)){z=F?z:z.toUpperCase();for(var A=0,e=E.length;A<e;A++){var D=E[A];if(D){var B=D.parentNode;E[A]=B.nodeName===z?B:false}}}else{for(var A=0,e=E.length;A<e;A++){var D=E[A];if(D){E[A]=C?D.parentNode:D.parentNode===z}}if(C){d.filter(z,E,true)}}},"":function(B,z,D){var A=p++,e=y;if(!/\W/.test(z)){var C=z=D?z:z.toUpperCase();e=t}e("parentNode",z,A,B,C,D)},"~":function(B,z,D){var A=p++,e=y;if(typeof z==="string"&&!/\W/.test(z)){var C=z=D?z:z.toUpperCase();e=t}e("previousSibling",z,A,B,C,D)}},find:{ID:function(z,A,B){if(typeof A.getElementById!=="undefined"&&!B){var e=A.getElementById(z[1]);return e?[e]:[]}},NAME:function(A,D,E){if(typeof D.getElementsByName!=="undefined"){var z=[],C=D.getElementsByName(A[1]);for(var B=0,e=C.length;B<e;B++){if(C[B].getAttribute("name")===A[1]){z.push(C[B])}}return z.length===0?null:z}},TAG:function(e,z){return z.getElementsByTagName(e[1])}},preFilter:{CLASS:function(B,z,A,e,E,F){B=" "+B[1].replace(/\\/g,"")+" ";if(F){return B}for(var C=0,D;(D=z[C])!=null;C++){if(D){if(E^(D.className&&(" "+D.className+" ").indexOf(B)>=0)){if(!A){e.push(D)}}else{if(A){z[C]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(z,e){for(var A=0;e[A]===false;A++){}return e[A]&&v(e[A])?z[1]:z[1].toUpperCase()},CHILD:function(e){if(e[1]=="nth"){var z=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]=="even"&&"2n"||e[2]=="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(z[1]+(z[2]||1))-0;e[3]=z[3]-0}e[0]=p++;return e},ATTR:function(C,z,A,e,D,E){var B=C[1].replace(/\\/g,"");if(!E&&h.attrMap[B]){C[1]=h.attrMap[B]}if(C[2]==="~="){C[4]=" "+C[4]+" "}return C},PSEUDO:function(C,z,A,e,D){if(C[1]==="not"){if((w.exec(C[3])||"").length>1||/^\w/.test(C[3])){C[3]=d(C[3],null,null,z)}else{var B=d.filter(C[3],z,A,true^D);if(!A){e.push.apply(e,B)}return false}}else{if(h.match.POS.test(C[0])||h.match.CHILD.test(C[0])){return true}}return C},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(A,z,e){return !!d(e[3],A).length},header:function(e){return/h\d/i.test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toUpperCase()==="BUTTON"},input:function(e){return/input|select|textarea|button/i.test(e.nodeName)}},setFilters:{first:function(z,e){return e===0},last:function(A,z,e,B){return z===B.length-1},even:function(z,e){return e%2===0},odd:function(z,e){return e%2===1},lt:function(A,z,e){return z<e[3]-0},gt:function(A,z,e){return z>e[3]-0},nth:function(A,z,e){return e[3]-0==z},eq:function(A,z,e){return e[3]-0==z}},filter:{PSEUDO:function(E,A,B,F){var z=A[1],C=h.filters[z];if(C){return C(E,B,A,F)}else{if(z==="contains"){return(E.textContent||E.innerText||"").indexOf(A[3])>=0}else{if(z==="not"){var D=A[3];for(var B=0,e=D.length;B<e;B++){if(D[B]===E){return false}}return true}}}},CHILD:function(e,B){var E=B[1],z=e;switch(E){case"only":case"first":while((z=z.previousSibling)){if(z.nodeType===1){return false}}if(E=="first"){return true}z=e;case"last":while((z=z.nextSibling)){if(z.nodeType===1){return false}}return true;case"nth":var A=B[2],H=B[3];if(A==1&&H==0){return true}var D=B[0],G=e.parentNode;if(G&&(G.sizcache!==D||!e.nodeIndex)){var C=0;for(z=G.firstChild;z;z=z.nextSibling){if(z.nodeType===1){z.nodeIndex=++C}}G.sizcache=D}var F=e.nodeIndex-H;if(A==0){return F==0}else{return(F%A==0&&F/A>=0)}}},ID:function(z,e){return z.nodeType===1&&z.getAttribute("id")===e},TAG:function(z,e){return(e==="*"&&z.nodeType===1)||z.nodeName===e},CLASS:function(z,e){return(" "+(z.className||z.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(D,B){var A=B[1],e=h.attrHandle[A]?h.attrHandle[A](D):D[A]!=null?D[A]:D.getAttribute(A),E=e+"",C=B[2],z=B[4];return e==null?C==="!=":C==="="?E===z:C==="*="?E.indexOf(z)>=0:C==="~="?(" "+E+" ").indexOf(z)>=0:!z?E&&e!==false:C==="!="?E!=z:C==="^="?E.indexOf(z)===0:C==="$="?E.substr(E.length-z.length)===z:C==="|="?E===z||E.substr(0,z.length+1)===z+"-":false},POS:function(C,z,A,D){var e=z[2],B=h.setFilters[e];if(B){return B(C,A,z,D)}}}};var q=h.match.POS;for(var s in h.match){h.match[s]=new RegExp(h.match[s].source+/(?![^\[]*\])(?![^\(]*\))/.source);h.leftMatch[s]=new RegExp(/(^(?:.|\r|\n)*?)/.source+h.match[s].source)}var b=function(z,e){z=Array.prototype.slice.call(z,0);if(e){e.push.apply(e,z);return e}return z};try{Array.prototype.slice.call(document.documentElement.childNodes,0)}catch(r){b=function(C,B){var z=B||[];if(g.call(C)==="[object Array]"){Array.prototype.push.apply(z,C)}else{if(typeof C.length==="number"){for(var A=0,e=C.length;A<e;A++){z.push(C[A])}}else{for(var A=0;C[A];A++){z.push(C[A])}}}return z}}var f;if(document.documentElement.compareDocumentPosition){f=function(z,e){if(!z.compareDocumentPosition||!e.compareDocumentPosition){if(z==e){u=true}return 0}var A=z.compareDocumentPosition(e)&4?-1:z===e?0:1;if(A===0){u=true}return A}}else{if("sourceIndex" in document.documentElement){f=function(z,e){if(!z.sourceIndex||!e.sourceIndex){if(z==e){u=true}return 0}var A=z.sourceIndex-e.sourceIndex;if(A===0){u=true}return A}}else{if(document.createRange){f=function(B,z){if(!B.ownerDocument||!z.ownerDocument){if(B==z){u=true}return 0}var A=B.ownerDocument.createRange(),e=z.ownerDocument.createRange();A.setStart(B,0);A.setEnd(B,0);e.setStart(z,0);e.setEnd(z,0);var C=A.compareBoundaryPoints(Range.START_TO_END,e);if(C===0){u=true}return C}}}}(function(){var z=document.createElement("div"),A="script"+(new Date).getTime();z.innerHTML="<a name='"+A+"'/>";var e=document.documentElement;e.insertBefore(z,e.firstChild);if(!!document.getElementById(A)){h.find.ID=function(C,D,E){if(typeof D.getElementById!=="undefined"&&!E){var B=D.getElementById(C[1]);return B?B.id===C[1]||typeof B.getAttributeNode!=="undefined"&&B.getAttributeNode("id").nodeValue===C[1]?[B]:undefined:[]}};h.filter.ID=function(D,B){var C=typeof D.getAttributeNode!=="undefined"&&D.getAttributeNode("id");return D.nodeType===1&&C&&C.nodeValue===B}}e.removeChild(z);e=z=null})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){h.find.TAG=function(z,D){var C=D.getElementsByTagName(z[1]);if(z[1]==="*"){var B=[];for(var A=0;C[A];A++){if(C[A].nodeType===1){B.push(C[A])}}C=B}return C}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){h.attrHandle.href=function(z){return z.getAttribute("href",2)}}e=null})();if(document.querySelectorAll){(function(){var e=d,A=document.createElement("div");A.innerHTML="<p class='TEST'></p>";if(A.querySelectorAll&&A.querySelectorAll(".TEST").length===0){return}d=function(E,D,B,C){D=D||document;if(!C&&D.nodeType===9&&!v(D)){try{return b(D.querySelectorAll(E),B)}catch(F){}}return e(E,D,B,C)};for(var z in e){d[z]=e[z]}A=null})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}h.order.splice(1,0,"CLASS");h.find.CLASS=function(z,A,B){if(typeof A.getElementsByClassName!=="undefined"&&!B){return A.getElementsByClassName(z[1])}};e=null})()}function t(z,E,D,I,F,H){var G=z=="previousSibling"&&!H;for(var B=0,A=I.length;B<A;B++){var e=I[B];if(e){if(G&&e.nodeType===1){e.sizcache=D;e.sizset=B}e=e[z];var C=false;while(e){if(e.sizcache===D){C=I[e.sizset];break}if(e.nodeType===1&&!H){e.sizcache=D;e.sizset=B}if(e.nodeName===E){C=e;break}e=e[z]}I[B]=C}}}function y(z,E,D,I,F,H){var G=z=="previousSibling"&&!H;for(var B=0,A=I.length;B<A;B++){var e=I[B];if(e){if(G&&e.nodeType===1){e.sizcache=D;e.sizset=B}e=e[z];var C=false;while(e){if(e.sizcache===D){C=I[e.sizset];break}if(e.nodeType===1){if(!H){e.sizcache=D;e.sizset=B}if(typeof E!=="string"){if(e===E){C=true;break}}else{if(d.filter(E,[e]).length>0){C=e;break}}}e=e[z]}I[B]=C}}}var n=document.compareDocumentPosition?function(z,e){return z.compareDocumentPosition(e)&16}:function(z,e){return z!==e&&(z.contains?z.contains(e):true)};var v=function(e){return e.nodeType===9&&e.documentElement.nodeName!=="HTML"||!!e.ownerDocument&&e.ownerDocument.documentElement.nodeName!=="HTML"};var l=function(e,F){var B=[],C="",D,A=F.nodeType?[F]:F;while((D=h.match.PSEUDO.exec(e))){C+=D[0];e=e.replace(h.match.PSEUDO,"")}e=h.relative[e]?e+"*":e;for(var E=0,z=A.length;E<z;E++){d(e,A[E],B)}return d.filter(C,B)};window.Sizzle=d})();(function(e){var f=Prototype.Selector.extendElements;function b(g,h){return f(e(g,h||document))}function d(h,g){return e.matches(g,[h]).length==1}Prototype.Selector.engine=e;Prototype.Selector.select=b;Prototype.Selector.match=d})(Sizzle);window.Sizzle=Prototype._original_property;delete Prototype._original_property;var Form={reset:function(b){b=$(b);b.reset();return b},serializeElements:function(n,f){if(typeof f!="object"){f={hash:!!f}}else{if(Object.isUndefined(f.hash)){f.hash=true}}var g,l,b=false,h=f.submit,d,e;if(f.hash){e={};d=function(o,p,q){if(p in o){if(!Object.isArray(o[p])){o[p]=[o[p]]}o[p].push(q)}else{o[p]=q}return o}}else{e="";d=function(o,p,q){return o+(o?"&":"")+encodeURIComponent(p)+"="+encodeURIComponent(q)}}return n.inject(e,function(o,p){if(!p.disabled&&p.name){g=p.name;l=$(p).getValue();if(l!=null&&p.type!="file"&&(p.type!="submit"||(!b&&h!==false&&(!h||g==h)&&(b=true)))){o=d(o,g,l)}}return o})}};Form.Methods={serialize:function(d,b){return Form.serializeElements(Form.getElements(d),b)},getElements:function(g){var h=$(g).getElementsByTagName("*"),f,b=[],e=Form.Element.Serializers;for(var d=0;f=h[d];d++){b.push(f)}return b.inject([],function(l,n){if(e[n.tagName.toLowerCase()]){l.push(Element.extend(n))}return l})},getInputs:function(l,e,f){l=$(l);var b=l.getElementsByTagName("input");if(!e&&!f){return $A(b).map(Element.extend)}for(var g=0,n=[],h=b.length;g<h;g++){var d=b[g];if((e&&d.type!=e)||(f&&d.name!=f)){continue}n.push(Element.extend(d))}return n},disable:function(b){b=$(b);Form.getElements(b).invoke("disable");return b},enable:function(b){b=$(b);Form.getElements(b).invoke("enable");return b},findFirstElement:function(d){var e=$(d).getElements().findAll(function(f){return"hidden"!=f.type&&!f.disabled});var b=e.findAll(function(f){return f.hasAttribute("tabIndex")&&f.tabIndex>=0}).sortBy(function(f){return f.tabIndex}).first();return b?b:e.find(function(f){return/^(?:input|select|textarea)$/i.test(f.tagName)})},focusFirstElement:function(d){d=$(d);var b=d.findFirstElement();if(b){b.activate()}return d},request:function(d,b){d=$(d),b=Object.clone(b||{});var f=b.parameters,e=d.readAttribute("action")||"";if(e.blank()){e=window.location.href}b.parameters=d.serialize(true);if(f){if(Object.isString(f)){f=f.toQueryParams()}Object.extend(b.parameters,f)}if(d.hasAttribute("method")&&!b.method){b.method=d.method}return new Ajax.Request(e,b)}};Form.Element={focus:function(b){$(b).focus();return b},select:function(b){$(b).select();return b}};Form.Element.Methods={serialize:function(b){b=$(b);if(!b.disabled&&b.name){var d=b.getValue();if(d!=undefined){var e={};e[b.name]=d;return Object.toQueryString(e)}}return""},getValue:function(b){b=$(b);var d=b.tagName.toLowerCase();return Form.Element.Serializers[d](b)},setValue:function(b,d){b=$(b);var e=b.tagName.toLowerCase();Form.Element.Serializers[e](b,d);return b},clear:function(b){$(b).value="";return b},present:function(b){return $(b).value!=""},activate:function(b){b=$(b);try{b.focus();if(b.select&&(b.tagName.toLowerCase()!="input"||!(/^(?:button|reset|submit)$/i.test(b.type)))){b.select()}}catch(d){}return b},disable:function(b){b=$(b);b.disabled=true;return b},enable:function(b){b=$(b);b.disabled=false;return b}};var Field=Form.Element;var $F=Form.Element.Methods.getValue;Form.Element.Serializers=(function(){function d(n,o){switch(n.type.toLowerCase()){case"checkbox":case"radio":return h(n,o);default:return g(n,o)}}function h(n,o){if(Object.isUndefined(o)){return n.checked?n.value:null}else{n.checked=!!o}}function g(n,o){if(Object.isUndefined(o)){return n.value}else{n.value=o}}function b(p,s){if(Object.isUndefined(s)){return(p.type==="select-one"?e:f)(p)}var o,q,t=!Object.isArray(s);for(var n=0,r=p.length;n<r;n++){o=p.options[n];q=this.optionValue(o);if(t){if(q==s){o.selected=true;return}}else{o.selected=s.include(q)}}}function e(o){var n=o.selectedIndex;return n>=0?l(o.options[n]):null}function f(q){var n,r=q.length;if(!r){return null}for(var p=0,n=[];p<r;p++){var o=q.options[p];if(o.selected){n.push(l(o))}}return n}function l(n){return Element.hasAttribute(n,"value")?n.value:n.text}return{input:d,inputSelector:h,textarea:g,select:b,selectOne:e,selectMany:f,optionValue:l,button:g}})();Abstract.TimedObserver=Class.create(PeriodicalExecuter,{initialize:function($super,b,d,e){$super(e,d);this.element=$(b);this.lastValue=this.getValue()},execute:function(){var b=this.getValue();if(Object.isString(this.lastValue)&&Object.isString(b)?this.lastValue!=b:String(this.lastValue)!=String(b)){this.callback(this.element,b);this.lastValue=b}}});Form.Element.Observer=Class.create(Abstract.TimedObserver,{getValue:function(){return Form.Element.getValue(this.element)}});Form.Observer=Class.create(Abstract.TimedObserver,{getValue:function(){return Form.serialize(this.element)}});Abstract.EventObserver=Class.create({initialize:function(b,d){this.element=$(b);this.callback=d;this.lastValue=this.getValue();if(this.element.tagName.toLowerCase()=="form"){this.registerFormCallbacks()}else{this.registerCallback(this.element)}},onElementEvent:function(){var b=this.getValue();if(this.lastValue!=b){this.callback(this.element,b);this.lastValue=b}},registerFormCallbacks:function(){Form.getElements(this.element).each(this.registerCallback,this)},registerCallback:function(b){if(b.type){switch(b.type.toLowerCase()){case"checkbox":case"radio":Event.observe(b,"click",this.onElementEvent.bind(this));break;default:Event.observe(b,"change",this.onElementEvent.bind(this));break}}}});Form.Element.EventObserver=Class.create(Abstract.EventObserver,{getValue:function(){return Form.Element.getValue(this.element)}});Form.EventObserver=Class.create(Abstract.EventObserver,{getValue:function(){return Form.serialize(this.element)}});(function(){var J={KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,KEY_HOME:36,KEY_END:35,KEY_PAGEUP:33,KEY_PAGEDOWN:34,KEY_INSERT:45,cache:{}};var h=document.documentElement;var K="onmouseenter" in h&&"onmouseleave" in h;var b=function(L){return false};if(window.attachEvent){if(window.addEventListener){b=function(L){return !(L instanceof window.Event)}}else{b=function(L){return true}}}var y;function H(M,L){return M.which?(M.which===L+1):(M.button===L)}var u={0:1,1:4,2:2};function F(M,L){return M.button===u[L]}function I(M,L){switch(L){case 0:return M.which==1&&!M.metaKey;case 1:return M.which==2||(M.which==1&&M.metaKey);case 2:return M.which==3;default:return false}}if(window.attachEvent){if(!window.addEventListener){y=F}else{y=function(M,L){return b(M)?F(M,L):H(M,L)}}}else{if(Prototype.Browser.WebKit){y=I}else{y=H}}function C(L){return y(L,0)}function A(L){return y(L,1)}function t(L){return y(L,2)}function f(N){N=J.extend(N);var M=N.target,L=N.type,O=N.currentTarget;if(O&&O.tagName){if(L==="load"||L==="error"||(L==="click"&&O.tagName.toLowerCase()==="input"&&O.type==="radio")){M=O}}if(M.nodeType==Node.TEXT_NODE){M=M.parentNode}return Element.extend(M)}function v(M,N){var L=J.element(M);if(!N){return L}while(L){if(Object.isElement(L)&&Prototype.Selector.match(L,N)){return Element.extend(L)}L=L.parentNode}}function z(L){return{x:e(L),y:d(L)}}function e(N){var M=document.documentElement,L=document.body||{scrollLeft:0};return N.pageX||(N.clientX+(M.scrollLeft||L.scrollLeft)-(M.clientLeft||0))}function d(N){var M=document.documentElement,L=document.body||{scrollTop:0};return N.pageY||(N.clientY+(M.scrollTop||L.scrollTop)-(M.clientTop||0))}function w(L){J.extend(L);L.preventDefault();L.stopPropagation();L.stopped=true}J.Methods={isLeftClick:C,isMiddleClick:A,isRightClick:t,element:f,findElement:v,pointer:z,pointerX:e,pointerY:d,stop:w};var E=Object.keys(J.Methods).inject({},function(L,M){L[M]=J.Methods[M].methodize();return L});if(window.attachEvent){function o(M){var L;switch(M.type){case"mouseover":case"mouseenter":L=M.fromElement;break;case"mouseout":case"mouseleave":L=M.toElement;break;default:return null}return Element.extend(L)}var B={stopPropagation:function(){this.cancelBubble=true},preventDefault:function(){this.returnValue=false},inspect:function(){return"[object Event]"}};J.extend=function(M,L){if(!M){return false}if(!b(M)){return M}if(M._extendedByPrototype){return M}M._extendedByPrototype=Prototype.emptyFunction;var N=J.pointer(M);Object.extend(M,{target:M.srcElement||L,relatedTarget:o(M),pageX:N.x,pageY:N.y});Object.extend(M,E);Object.extend(M,B);return M}}else{J.extend=Prototype.K}if(window.addEventListener){J.prototype=window.Event.prototype||document.createEvent("HTMLEvents").__proto__;Object.extend(J.prototype,E)}function s(P,O,Q){var N=Element.retrieve(P,"prototype_event_registry");if(Object.isUndefined(N)){g.push(P);N=Element.retrieve(P,"prototype_event_registry",$H())}var L=N.get(O);if(Object.isUndefined(L)){L=[];N.set(O,L)}if(L.pluck("handler").include(Q)){return false}var M;if(O.include(":")){M=function(R){if(Object.isUndefined(R.eventName)){return false}if(R.eventName!==O){return false}J.extend(R,P);Q.call(P,R)}}else{if(!K&&(O==="mouseenter"||O==="mouseleave")){if(O==="mouseenter"||O==="mouseleave"){M=function(S){J.extend(S,P);var R=S.relatedTarget;while(R&&R!==P){try{R=R.parentNode}catch(T){R=P}}if(R===P){return}Q.call(P,S)}}}else{M=function(R){J.extend(R,P);Q.call(P,R)}}}M.handler=Q;L.push(M);return M}function n(){for(var L=0,M=g.length;L<M;L++){J.stopObserving(g[L]);g[L]=null}}var g=[];if(Prototype.Browser.IE){window.attachEvent("onunload",n)}if(Prototype.Browser.WebKit){window.addEventListener("unload",Prototype.emptyFunction,false)}var r=Prototype.K,l={mouseenter:"mouseover",mouseleave:"mouseout"};if(!K){r=function(L){return(l[L]||L)}}function D(O,N,P){O=$(O);var M=s(O,N,P);if(!M){return O}if(N.include(":")){if(O.addEventListener){O.addEventListener("dataavailable",M,false)}else{O.attachEvent("ondataavailable",M);O.attachEvent("onlosecapture",M)}}else{var L=r(N);if(O.addEventListener){O.addEventListener(L,M,false)}else{O.attachEvent("on"+L,M)}}return O}function q(R,O,S){R=$(R);var N=Element.retrieve(R,"prototype_event_registry");if(!N){return R}if(!O){N.each(function(U){var T=U.key;q(R,T)});return R}var P=N.get(O);if(!P){return R}if(!S){P.each(function(T){q(R,O,T.handler)});return R}var Q=P.length,M;while(Q--){if(P[Q].handler===S){M=P[Q];break}}if(!M){return R}if(O.include(":")){if(R.removeEventListener){R.removeEventListener("dataavailable",M,false)}else{R.detachEvent("ondataavailable",M);R.detachEvent("onlosecapture",M)}}else{var L=r(O);if(R.removeEventListener){R.removeEventListener(L,M,false)}else{R.detachEvent("on"+L,M)}}N.set(O,P.without(M));return R}function G(O,N,M,L){O=$(O);if(Object.isUndefined(L)){L=true}if(O==document&&document.createEvent&&!O.dispatchEvent){O=document.documentElement}var P;if(document.createEvent){P=document.createEvent("HTMLEvents");P.initEvent("dataavailable",L,true)}else{P=document.createEventObject();P.eventType=L?"ondataavailable":"onlosecapture"}P.eventName=N;P.memo=M||{};if(document.createEvent){O.dispatchEvent(P)}else{O.fireEvent(P.eventType,P)}return J.extend(P)}J.Handler=Class.create({initialize:function(N,M,L,O){this.element=$(N);this.eventName=M;this.selector=L;this.callback=O;this.handler=this.handleEvent.bind(this)},start:function(){J.observe(this.element,this.eventName,this.handler);return this},stop:function(){J.stopObserving(this.element,this.eventName,this.handler);return this},handleEvent:function(M){var L=J.findElement(M,this.selector);if(L){this.callback.call(this.element,M,L)}}});function p(N,M,L,O){N=$(N);if(Object.isFunction(L)&&Object.isUndefined(O)){O=L,L=null}return new J.Handler(N,M,L,O).start()}Object.extend(J,J.Methods);Object.extend(J,{fire:G,observe:D,stopObserving:q,on:p});Element.addMethods({fire:G,observe:D,stopObserving:q,on:p});Object.extend(document,{fire:G.methodize(),observe:D.methodize(),stopObserving:q.methodize(),on:p.methodize(),loaded:false});if(window.Event){Object.extend(window.Event,J)}else{window.Event=J}})();(function(){var e;function b(){if(document.loaded){return}if(e){window.clearTimeout(e)}document.loaded=true;document.fire("dom:loaded")}function d(){if(document.readyState==="complete"){document.stopObserving("readystatechange",d);b()}}if(document.addEventListener){document.addEventListener("DOMContentLoaded",b,false)}else{document.observe("readystatechange",d);if(window==top){var e=window.setInterval(function(){try{document.documentElement.doScroll("left")}catch(f){return}window.clearInterval(e);b()},5)}}Event.observe(window,"load",b)})();Element.addMethods();Hash.toQueryString=Object.toQueryString;var Toggle={display:Element.toggle};Element.Methods.childOf=Element.Methods.descendantOf;var Insertion={Before:function(b,d){return Element.insert(b,{before:d})},Top:function(b,d){return Element.insert(b,{top:d})},Bottom:function(b,d){return Element.insert(b,{bottom:d})},After:function(b,d){return Element.insert(b,{after:d})}};var $continue=new Error('"throw $continue" is deprecated, use "return" instead');var Position={includeScrollOffsets:false,prepare:function(){this.deltaX=window.pageXOffset||document.documentElement.scrollLeft||document.body.scrollLeft||0;this.deltaY=window.pageYOffset||document.documentElement.scrollTop||document.body.scrollTop||0},within:function(d,b,e){if(this.includeScrollOffsets){return this.withinIncludingScrolloffsets(d,b,e)}this.xcomp=b;this.ycomp=e;this.offset=Element.cumulativeOffset(d);return(e>=this.offset[1]&&e<this.offset[1]+d.offsetHeight&&b>=this.offset[0]&&b<this.offset[0]+d.offsetWidth)},withinIncludingScrolloffsets:function(d,b,f){var e=Element.cumulativeScrollOffset(d);this.xcomp=b+e[0]-this.deltaX;this.ycomp=f+e[1]-this.deltaY;this.offset=Element.cumulativeOffset(d);return(this.ycomp>=this.offset[1]&&this.ycomp<this.offset[1]+d.offsetHeight&&this.xcomp>=this.offset[0]&&this.xcomp<this.offset[0]+d.offsetWidth)},overlap:function(d,b){if(!d){return 0}if(d=="vertical"){return((this.offset[1]+b.offsetHeight)-this.ycomp)/b.offsetHeight}if(d=="horizontal"){return((this.offset[0]+b.offsetWidth)-this.xcomp)/b.offsetWidth}},cumulativeOffset:Element.Methods.cumulativeOffset,positionedOffset:Element.Methods.positionedOffset,absolutize:function(b){Position.prepare();return Element.absolutize(b)},relativize:function(b){Position.prepare();return Element.relativize(b)},realOffset:Element.Methods.cumulativeScrollOffset,offsetParent:Element.Methods.getOffsetParent,page:Element.Methods.viewportOffset,clone:function(d,e,b){b=b||{};return Element.clonePosition(e,d,b)}};if(!document.getElementsByClassName){document.getElementsByClassName=function(d){function b(e){return e.blank()?null:"[contains(concat(' ', @class, ' '), ' "+e+" ')]"}d.getElementsByClassName=Prototype.BrowserFeatures.XPath?function(e,g){g=g.toString().strip();var f=/\s/.test(g)?$w(g).map(b).join(""):b(g);return f?document._getElementsByXPath(".//*"+f,e):[]}:function(g,h){h=h.toString().strip();var l=[],n=(/\s/.test(h)?$w(h):null);if(!n&&!h){return l}var e=$(g).getElementsByTagName("*");h=" "+h+" ";for(var f=0,p,o;p=e[f];f++){if(p.className&&(o=" "+p.className+" ")&&(o.include(h)||(n&&n.all(function(q){return !q.toString().blank()&&o.include(" "+q+" ")})))){l.push(Element.extend(p))}}return l};return function(f,e){return $(e||document.body).getElementsByClassName(f)}}(Element.Methods)}Element.ClassNames=Class.create();Element.ClassNames.prototype={initialize:function(b){this.element=$(b)},_each:function(b){this.element.className.split(/\s+/).select(function(d){return d.length>0})._each(b)},set:function(b){this.element.className=b},add:function(b){if(this.include(b)){return}this.set($A(this).concat(b).join(" "))},remove:function(b){if(!this.include(b)){return}this.set($A(this).without(b).join(" "))},toString:function(){return $A(this).join(" ")}};Object.extend(Element.ClassNames.prototype,Enumerable);(function(){window.Selector=Class.create({initialize:function(b){this.expression=b.strip()},findElements:function(b){return Prototype.Selector.select(this.expression,b)},match:function(b){return Prototype.Selector.match(b,this.expression)},toString:function(){return this.expression},inspect:function(){return"#<Selector: "+this.expression+">"}});Object.extend(Selector,{matchElements:function(h,l){var b=Prototype.Selector.match,f=[];for(var e=0,g=h.length;e<g;e++){var d=h[e];if(b(d,l)){f.push(Element.extend(d))}}return f},findElement:function(h,l,d){d=d||0;var b=0,f;for(var e=0,g=h.length;e<g;e++){f=h[e];if(Prototype.Selector.match(f,l)&&d===b++){return Element.extend(f)}}},findChildElements:function(d,e){var b=e.toArray().join(", ");return Prototype.Selector.select(b,d||document)}})})();var Window=Class.create();Window.keepMultiModalWindow=false;Window.hasEffectLib=(typeof Effect!="undefined");Window.resizeEffectDuration=0.4;Window.prototype={initialize:function(){var e;var d=0;if(arguments.length>0){if(typeof arguments[0]=="string"){e=arguments[0];d=1}else{e=arguments[0]?arguments[0].id:null}}if(!e){e="window_"+new Date().getTime()}if($(e)){alert("Window "+e+" is already registered in the DOM! Make sure you use setDestroyOnClose() or destroyOnClose: true in the constructor")}this.options=Object.extend({className:"dialog",windowClassName:null,blurClassName:null,minWidth:100,minHeight:20,resizable:true,closable:true,minimizable:true,maximizable:true,draggable:true,userData:null,showEffect:(Window.hasEffectLib?Effect.Appear:Element.show),hideEffect:(Window.hasEffectLib?Effect.Fade:Element.hide),showEffectOptions:{},hideEffectOptions:{},effectOptions:null,parent:document.body,title:"&nbsp;",url:null,onload:Prototype.emptyFunction,width:200,height:300,opacity:1,recenterAuto:true,wiredDrag:false,closeOnEsc:true,closeCallback:null,destroyOnClose:false,gridX:1,gridY:1},arguments[d]||{});if(this.options.blurClassName){this.options.focusClassName=this.options.className}if(typeof this.options.top=="undefined"&&typeof this.options.bottom=="undefined"){this.options.top=this._round(Math.random()*500,this.options.gridY)}if(typeof this.options.left=="undefined"&&typeof this.options.right=="undefined"){this.options.left=this._round(Math.random()*500,this.options.gridX)}if(this.options.effectOptions){Object.extend(this.options.hideEffectOptions,this.options.effectOptions);Object.extend(this.options.showEffectOptions,this.options.effectOptions);if(this.options.showEffect==Element.Appear){this.options.showEffectOptions.to=this.options.opacity}}if(Window.hasEffectLib){if(this.options.showEffect==Effect.Appear){this.options.showEffectOptions.to=this.options.opacity}if(this.options.hideEffect==Effect.Fade){this.options.hideEffectOptions.from=this.options.opacity}}if(this.options.hideEffect==Element.hide){this.options.hideEffect=function(){Element.hide(this.element);if(this.options.destroyOnClose){this.destroy()}}.bind(this)}if(this.options.parent!=document.body){this.options.parent=$(this.options.parent)}this.element=this._createWindow(e);this.element.win=this;this.eventMouseDown=this._initDrag.bindAsEventListener(this);this.eventMouseUp=this._endDrag.bindAsEventListener(this);this.eventMouseMove=this._updateDrag.bindAsEventListener(this);this.eventOnLoad=this._getWindowBorderSize.bindAsEventListener(this);this.eventMouseDownContent=this.toFront.bindAsEventListener(this);this.eventResize=this._recenter.bindAsEventListener(this);this.eventKeyUp=this._keyUp.bindAsEventListener(this);this.topbar=$(this.element.id+"_top");this.bottombar=$(this.element.id+"_bottom");this.content=$(this.element.id+"_content");Event.observe(this.topbar,"mousedown",this.eventMouseDown);Event.observe(this.bottombar,"mousedown",this.eventMouseDown);Event.observe(this.content,"mousedown",this.eventMouseDownContent);Event.observe(window,"load",this.eventOnLoad);Event.observe(window,"resize",this.eventResize);Event.observe(window,"scroll",this.eventResize);Event.observe(document,"keyup",this.eventKeyUp);Event.observe(this.options.parent,"scroll",this.eventResize);if(this.options.draggable){var b=this;[this.topbar,this.topbar.up().previous(),this.topbar.up().next()].each(function(f){f.observe("mousedown",b.eventMouseDown);f.addClassName("top_draggable")});[this.bottombar.up(),this.bottombar.up().previous(),this.bottombar.up().next()].each(function(f){f.observe("mousedown",b.eventMouseDown);f.addClassName("bottom_draggable")})}if(this.options.resizable){this.sizer=$(this.element.id+"_sizer");Event.observe(this.sizer,"mousedown",this.eventMouseDown)}this.useLeft=null;this.useTop=null;if(typeof this.options.left!="undefined"){this.element.setStyle({left:parseFloat(this.options.left)+"px"});this.useLeft=true}else{this.element.setStyle({right:parseFloat(this.options.right)+"px"});this.useLeft=false}if(typeof this.options.top!="undefined"){this.element.setStyle({top:parseFloat(this.options.top)+"px"});this.useTop=true}else{this.element.setStyle({bottom:parseFloat(this.options.bottom)+"px"});this.useTop=false}this.storedLocation=null;this.setOpacity(this.options.opacity);if(this.options.zIndex){this.setZIndex(this.options.zIndex)}else{this.setZIndex(this.getMaxZIndex())}if(this.options.destroyOnClose){this.setDestroyOnClose(true)}this._getWindowBorderSize();this.width=this.options.width;this.height=this.options.height;this.visible=false;this.constraint=false;this.constraintPad={top:0,left:0,bottom:0,right:0};if(this.width&&this.height){this.setSize(this.options.width,this.options.height)}this.setTitle(this.options.title);Windows.register(this)},getMaxZIndex:function(){var b=0,d;var g=document.body.childNodes;for(d=0;d<g.length;d++){var e=g[d];var f=e.nodeType==1?parseInt(e.style.zIndex,10)||0:0;if(f<10000){b=Math.max(b,f)}}return b+10},destroy:function(){this._notify("onDestroy");Event.stopObserving(this.topbar,"mousedown",this.eventMouseDown);Event.stopObserving(this.bottombar,"mousedown",this.eventMouseDown);Event.stopObserving(this.content,"mousedown",this.eventMouseDownContent);Event.stopObserving(window,"load",this.eventOnLoad);Event.stopObserving(window,"resize",this.eventResize);Event.stopObserving(window,"scroll",this.eventResize);Event.stopObserving(this.content,"load",this.options.onload);Event.stopObserving(document,"keyup",this.eventKeyUp);if(this._oldParent){var e=this.getContent();var b=null;for(var d=0;d<e.childNodes.length;d++){b=e.childNodes[d];if(b.nodeType==1){break}b=null}if(b){this._oldParent.appendChild(b)}this._oldParent=null}if(this.sizer){Event.stopObserving(this.sizer,"mousedown",this.eventMouseDown)}if(this.options.url){this.content.src=null}if(this.iefix){Element.remove(this.iefix)}Element.remove(this.element);Windows.unregister(this)},setCloseCallback:function(b){this.options.closeCallback=b},getContent:function(){return this.content},setContent:function(n,l,e){var b=$(n);if(null==b){throw"Unable to find element '"+n+"' in DOM"}this._oldParent=b.parentNode;var h=null;var g=null;if(l){h=Element.getDimensions(b)}if(e){g=Position.cumulativeOffset(b)}var f=this.getContent();this.setHTMLContent("");f=this.getContent();f.appendChild(b);b.show();if(l){this.setSize(h.width,h.height)}if(e){this.setLocation(g[1]-this.heightN,g[0]-this.widthW)}},setHTMLContent:function(b){if(this.options.url){this.content.src=null;this.options.url=null;var d='<div id="'+this.getId()+'_content" class="'+this.options.className+'_content"> </div>';$(this.getId()+"_table_content").innerHTML=d;this.content=$(this.element.id+"_content")}this.getContent().innerHTML=b},setAjaxContent:function(d,b,f,e){this.showFunction=f?"showCenter":"show";this.showModal=e||false;b=b||{};this.setHTMLContent("");this.onComplete=b.onComplete;if(!this._onCompleteHandler){this._onCompleteHandler=this._setAjaxContent.bind(this)}b.onComplete=this._onCompleteHandler;new Ajax.Request(d,b);b.onComplete=this.onComplete},_setAjaxContent:function(b){Element.update(this.getContent(),b.responseText);if(this.onComplete){this.onComplete(b)}this.onComplete=null;this[this.showFunction](this.showModal)},setURL:function(b){if(this.options.url){this.content.src=null}this.options.url=b;var d="<iframe frameborder='0' name='"+this.getId()+"_content'  id='"+this.getId()+"_content' src='"+b+"' width='"+this.width+"' height='"+this.height+"'> </iframe>";$(this.getId()+"_table_content").innerHTML=d;this.content=$(this.element.id+"_content")},getURL:function(){return this.options.url?this.options.url:null},refresh:function(){if(this.options.url){$(this.element.getAttribute("id")+"_content").src=this.options.url}},setCookie:function(d,e,t,g,b){d=d||this.element.id;this.cookie=[d,e,t,g,b];var r=WindowUtilities.getCookie(d);if(r){var s=r.split(",");var p=s[0].split(":");var o=s[1].split(":");var q=parseFloat(s[2]),l=parseFloat(s[3]);var n=s[4];var f=s[5];this.setSize(q,l);if(n=="true"){this.doMinimize=true}else{if(f=="true"){this.doMaximize=true}}this.useLeft=p[0]=="l";this.useTop=o[0]=="t";this.element.setStyle(this.useLeft?{left:p[1]}:{right:p[1]});this.element.setStyle(this.useTop?{top:o[1]}:{bottom:o[1]})}},getId:function(){return this.element.id},setDestroyOnClose:function(){this.options.destroyOnClose=true},setConstraint:function(b,d){this.constraint=b;this.constraintPad=Object.extend(this.constraintPad,d||{});if(this.useTop&&this.useLeft){this.setLocation(parseFloat(this.element.style.top),parseFloat(this.element.style.left))}},_initDrag:function(d){if(Event.element(d)==this.sizer&&this.isMinimized()){return}if(Event.element(d)!=this.sizer&&this.isMaximized()){return}if(Prototype.Browser.IE&&this.heightN==0){this._getWindowBorderSize()}this.pointer=[this._round(Event.pointerX(d),this.options.gridX),this._round(Event.pointerY(d),this.options.gridY)];if(this.options.wiredDrag){this.currentDrag=this._createWiredElement()}else{this.currentDrag=this.element}if(Event.element(d)==this.sizer){this.doResize=true;this.widthOrg=this.width;this.heightOrg=this.height;this.bottomOrg=parseFloat(this.element.getStyle("bottom"));this.rightOrg=parseFloat(this.element.getStyle("right"));this._notify("onStartResize")}else{this.doResize=false;var b=$(this.getId()+"_close");if(b&&Position.within(b,this.pointer[0],this.pointer[1])){this.currentDrag=null;return}this.toFront();if(!this.options.draggable){return}this._notify("onStartMove")}Event.observe(document,"mouseup",this.eventMouseUp,false);Event.observe(document,"mousemove",this.eventMouseMove,false);WindowUtilities.disableScreen("__invisible__","__invisible__",this.overlayOpacity);document.body.ondrag=function(){return false};document.body.onselectstart=function(){return false};this.currentDrag.show();Event.stop(d)},_round:function(d,b){return b==1?d:d=Math.floor(d/b)*b},_updateDrag:function(d){var b=[this._round(Event.pointerX(d),this.options.gridX),this._round(Event.pointerY(d),this.options.gridY)];var q=b[0]-this.pointer[0];var p=b[1]-this.pointer[1];if(this.doResize){var o=this.widthOrg+q;var f=this.heightOrg+p;q=this.width-this.widthOrg;p=this.height-this.heightOrg;if(this.useLeft){o=this._updateWidthConstraint(o)}else{this.currentDrag.setStyle({right:(this.rightOrg-q)+"px"})}if(this.useTop){f=this._updateHeightConstraint(f)}else{this.currentDrag.setStyle({bottom:(this.bottomOrg-p)+"px"})}this.setSize(o,f);this._notify("onResize")}else{this.pointer=b;if(this.useLeft){var e=parseFloat(this.currentDrag.getStyle("left"))+q;var n=this._updateLeftConstraint(e);this.pointer[0]+=n-e;this.currentDrag.setStyle({left:n+"px"})}else{this.currentDrag.setStyle({right:parseFloat(this.currentDrag.getStyle("right"))-q+"px"})}if(this.useTop){var l=parseFloat(this.currentDrag.getStyle("top"))+p;var g=this._updateTopConstraint(l);this.pointer[1]+=g-l;this.currentDrag.setStyle({top:g+"px"})}else{this.currentDrag.setStyle({bottom:parseFloat(this.currentDrag.getStyle("bottom"))-p+"px"})}this._notify("onMove")}if(this.iefix){this._fixIEOverlapping()}this._removeStoreLocation();Event.stop(d)},_endDrag:function(b){WindowUtilities.enableScreen("__invisible__");if(this.doResize){this._notify("onEndResize")}else{this._notify("onEndMove")}Event.stopObserving(document,"mouseup",this.eventMouseUp,false);Event.stopObserving(document,"mousemove",this.eventMouseMove,false);Event.stop(b);this._hideWiredElement();this._saveCookie();document.body.ondrag=null;document.body.onselectstart=null},_updateLeftConstraint:function(d){if(this.constraint&&this.useLeft&&this.useTop){var b=this.options.parent==document.body?WindowUtilities.getPageSize().windowWidth:this.options.parent.getDimensions().width;if(d<this.constraintPad.left){d=this.constraintPad.left}if(d+this.width+this.widthE+this.widthW>b-this.constraintPad.right){d=b-this.constraintPad.right-this.width-this.widthE-this.widthW}}return d},_updateTopConstraint:function(e){if(this.constraint&&this.useLeft&&this.useTop){var b=this.options.parent==document.body?WindowUtilities.getPageSize().windowHeight:this.options.parent.getDimensions().height;var d=this.height+this.heightN+this.heightS;if(e<this.constraintPad.top){e=this.constraintPad.top}if(e+d>b-this.constraintPad.bottom){e=b-this.constraintPad.bottom-d}}return e},_updateWidthConstraint:function(b){if(this.constraint&&this.useLeft&&this.useTop){var d=this.options.parent==document.body?WindowUtilities.getPageSize().windowWidth:this.options.parent.getDimensions().width;var e=parseFloat(this.element.getStyle("left"));if(e+b+this.widthE+this.widthW>d-this.constraintPad.right){b=d-this.constraintPad.right-e-this.widthE-this.widthW}}return b},_updateHeightConstraint:function(d){if(this.constraint&&this.useLeft&&this.useTop){var b=this.options.parent==document.body?WindowUtilities.getPageSize().windowHeight:this.options.parent.getDimensions().height;var e=parseFloat(this.element.getStyle("top"));if(e+d+this.heightN+this.heightS>b-this.constraintPad.bottom){d=b-this.constraintPad.bottom-e-this.heightN-this.heightS}}return d},_createWindow:function(b){var h=this.options.className;var f=document.createElement("div");f.setAttribute("id",b);f.className="dialog";if(this.options.windowClassName){f.className+=" "+this.options.windowClassName}var g;if(this.options.url){g='<iframe frameborder="0" name="'+b+'_content"  id="'+b+'_content" src="'+this.options.url+'"> </iframe>'}else{g='<div id="'+b+'_content" class="'+h+'_content"> </div>'}var l=this.options.closable?"<div class='"+h+"_close' id='"+b+"_close' onclick='Windows.close(\""+b+"\", event)'> </div>":"";var n=this.options.minimizable?"<div class='"+h+"_minimize' id='"+b+"_minimize' onclick='Windows.minimize(\""+b+"\", event)'> </div>":"";var o=this.options.maximizable?"<div class='"+h+"_maximize' id='"+b+"_maximize' onclick='Windows.maximize(\""+b+"\", event)'> </div>":"";var e=this.options.resizable?"class='"+h+"_sizer' id='"+b+"_sizer'":"class='"+h+"_se'";var d="../themes/default/blank.gif";f.innerHTML=l+n+o+"      <a href='#' id='"+b+"_focus_anchor'><!-- --></a>      <table id='"+b+"_row1' class=\"top table_window\">        <tr>          <td class='"+h+"_nw'></td>          <td class='"+h+"_n'><div id='"+b+"_top' class='"+h+"_title title_window'>"+this.options.title+"</div></td>          <td class='"+h+"_ne'></td>        </tr>      </table>      <table id='"+b+"_row2' class=\"mid table_window\">        <tr>          <td class='"+h+"_w'></td>            <td id='"+b+"_table_content' class='"+h+"_content' valign='top'>"+g+"</td>          <td class='"+h+"_e'></td>        </tr>      </table>        <table id='"+b+"_row3' class=\"bot table_window\">        <tr>          <td class='"+h+"_sw'></td>            <td class='"+h+"_s'><div id='"+b+"_bottom' class='status_bar'><span style='float:left; width:1px; height:1px'></span></div></td>            <td "+e+"></td>        </tr>      </table>    ";Element.hide(f);this.options.parent.insertBefore(f,this.options.parent.firstChild);Event.observe($(b+"_content"),"load",this.options.onload);return f},changeClassName:function(b){var d=this.options.className;var e=this.getId();$A(["_close","_minimize","_maximize","_sizer","_content"]).each(function(f){this._toggleClassName($(e+f),d+f,b+f)}.bind(this));this._toggleClassName($(e+"_top"),d+"_title",b+"_title");$$("#"+e+" td").each(function(f){f.className=f.className.sub(d,b)});this.options.className=b},_toggleClassName:function(e,d,b){if(e){e.removeClassName(d);e.addClassName(b)}},setLocation:function(f,d){f=this._updateTopConstraint(f);d=this._updateLeftConstraint(d);var b=this.currentDrag||this.element;b.setStyle({top:f+"px"});b.setStyle({left:d+"px"});this.useLeft=true;this.useTop=true},getLocation:function(){var b={};if(this.useTop){b=Object.extend(b,{top:this.element.getStyle("top")})}else{b=Object.extend(b,{bottom:this.element.getStyle("bottom")})}if(this.useLeft){b=Object.extend(b,{left:this.element.getStyle("left")})}else{b=Object.extend(b,{right:this.element.getStyle("right")})}return b},getSize:function(){return{width:this.width,height:this.height}},setSize:function(f,d,b){f=parseFloat(f);d=parseFloat(d);if(!this.minimized&&f<this.options.minWidth){f=this.options.minWidth}if(!this.minimized&&d<this.options.minHeight){d=this.options.minHeight}if(this.options.maxHeight&&d>this.options.maxHeight){d=this.options.maxHeight}if(this.options.maxWidth&&f>this.options.maxWidth){f=this.options.maxWidth}if(this.useTop&&this.useLeft&&Window.hasEffectLib&&Effect.ResizeWindow&&b){new Effect.ResizeWindow(this,null,null,f,d,{duration:Window.resizeEffectDuration})}else{this.width=f;this.height=d;var h=this.currentDrag?this.currentDrag:this.element;h.setStyle({width:f+this.widthW+this.widthE+"px"});h.setStyle({height:d+this.heightN+this.heightS+"px"});if(!this.currentDrag||this.currentDrag==this.element){var g=$(this.element.id+"_content");g.setStyle({height:d+"px"});g.setStyle({width:f+"px"})}}},updateHeight:function(){this.setSize(this.width,this.content.scrollHeight,true)},updateWidth:function(){this.setSize(this.content.scrollWidth,this.height,true)},toFront:function(){if(this.element.style.zIndex<Windows.maxZIndex){this.setZIndex(Windows.maxZIndex+1)}if(this.iefix){this._fixIEOverlapping()}},getBounds:function(d){if(!this.width||!this.height||!this.visible){this.computeBounds()}var b=this.width;var e=this.height;if(!d){b+=this.widthW+this.widthE;e+=this.heightN+this.heightS}var f=Object.extend(this.getLocation(),{width:b+"px",height:e+"px"});return f},computeBounds:function(){if(!this.width||!this.height){var b=WindowUtilities._computeSize(this.content.innerHTML,this.content.id,this.width,this.height,0,this.options.className);if(this.height){this.width=b+5}else{this.height=b+5}}this.setSize(this.width,this.height);if(this.centered){this._center(this.centerTop,this.centerLeft)}},show:function(d){this.visible=true;if(d){if(typeof this.overlayOpacity=="undefined"){var b=this;setTimeout(function(){b.show(d)},10);return}Windows.addModalWindow(this);this.modal=true;this.setZIndex(Windows.maxZIndex+1);Windows.unsetOverflow(this)}else{if(!this.element.style.zIndex){this.setZIndex(Windows.maxZIndex+1)}}if(this.oldStyle){this.getContent().setStyle({overflow:this.oldStyle})}this.computeBounds();this._notify("onBeforeShow");if(this.options.showEffect!=Element.show&&this.options.showEffectOptions){this.options.showEffect(this.element,this.options.showEffectOptions)}else{this.options.showEffect(this.element)}this._checkIEOverlapping();WindowUtilities.focusedWindow=this;this._notify("onShow");$(this.element.id+"_focus_anchor").focus()},showCenter:function(b,e,d){this.centered=true;this.centerTop=e;this.centerLeft=d;this.show(b)},isVisible:function(){return this.visible},_center:function(e,d){var f=WindowUtilities.getWindowScroll(this.options.parent);var b=WindowUtilities.getPageSize(this.options.parent);if(typeof e=="undefined"){e=(b.windowHeight-(this.height+this.heightN+this.heightS))/2}e+=f.top;if(typeof d=="undefined"){d=(b.windowWidth-(this.width+this.widthW+this.widthE))/2}d+=f.left;this.setLocation(e,d);this.toFront()},_recenter:function(d){if(this.centered){var b=WindowUtilities.getPageSize(this.options.parent);var e=WindowUtilities.getWindowScroll(this.options.parent);if(this.pageSize&&this.pageSize.windowWidth==b.windowWidth&&this.pageSize.windowHeight==b.windowHeight&&this.windowScroll.left==e.left&&this.windowScroll.top==e.top){return}this.pageSize=b;this.windowScroll=e;if($("overlay_modal")){$("overlay_modal").setStyle({height:(b.pageHeight+"px")})}if(this.options.recenterAuto){this._center(this.centerTop,this.centerLeft)}}},hide:function(){this.visible=false;if(this.modal){Windows.removeModalWindow(this);Windows.resetOverflow()}this.oldStyle=this.getContent().getStyle("overflow")||"auto";this.getContent().setStyle({overflow:"hidden"});this.options.hideEffect(this.element,this.options.hideEffectOptions);if(this.iefix){this.iefix.hide()}if(!this.doNotNotifyHide){this._notify("onHide")}},close:function(){if(this.visible){if(this.options.closeCallback&&!this.options.closeCallback(this)){return}if(this.options.destroyOnClose){var b=this.destroy.bind(this);if(this.options.hideEffectOptions.afterFinish){var d=this.options.hideEffectOptions.afterFinish;this.options.hideEffectOptions.afterFinish=function(){d();b()}}else{this.options.hideEffectOptions.afterFinish=function(){b()}}}Windows.updateFocusedWindow();this.doNotNotifyHide=true;this.hide();this.doNotNotifyHide=false;this._notify("onClose")}},minimize:function(){if(this.resizing){return}var b=$(this.getId()+"_row2");if(!this.minimized){this.minimized=true;var f=b.getDimensions().height;this.r2Height=f;var e=this.element.getHeight()-f;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,null,null,null,this.height-f,{duration:Window.resizeEffectDuration})}else{this.height-=f;this.element.setStyle({height:e+"px"});b.hide()}if(!this.useTop){var d=parseFloat(this.element.getStyle("bottom"));this.element.setStyle({bottom:(d+f)+"px"})}}else{this.minimized=false;var f=this.r2Height;this.r2Height=null;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,null,null,null,this.height+f,{duration:Window.resizeEffectDuration})}else{var e=this.element.getHeight()+f;this.height+=f;this.element.setStyle({height:e+"px"});b.show()}if(!this.useTop){var d=parseFloat(this.element.getStyle("bottom"));this.element.setStyle({bottom:(d-f)+"px"})}this.toFront()}this._notify("onMinimize");this._saveCookie()},maximize:function(){if(this.isMinimized()||this.resizing){return}if(Prototype.Browser.IE&&this.heightN==0){this._getWindowBorderSize()}if(this.storedLocation!=null){this._restoreLocation();if(this.iefix){this.iefix.hide()}}else{this._storeLocation();Windows.unsetOverflow(this);var l=WindowUtilities.getWindowScroll(this.options.parent);var d=WindowUtilities.getPageSize(this.options.parent);var h=l.left;var g=l.top;if(this.options.parent!=document.body){l={top:0,left:0,bottom:0,right:0};var f=this.options.parent.getDimensions();d.windowWidth=f.width;d.windowHeight=f.height;g=0;h=0}if(this.constraint){d.windowWidth-=Math.max(0,this.constraintPad.left)+Math.max(0,this.constraintPad.right);d.windowHeight-=Math.max(0,this.constraintPad.top)+Math.max(0,this.constraintPad.bottom);h+=Math.max(0,this.constraintPad.left);g+=Math.max(0,this.constraintPad.top)}var e=d.windowWidth-this.widthW-this.widthE;var b=d.windowHeight-this.heightN-this.heightS;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,g,h,e,b,{duration:Window.resizeEffectDuration})}else{this.setSize(e,b);this.element.setStyle(this.useLeft?{left:h}:{right:h});this.element.setStyle(this.useTop?{top:g}:{bottom:g})}this.toFront();if(this.iefix){this._fixIEOverlapping()}}this._notify("onMaximize");this._saveCookie()},isMinimized:function(){return this.minimized},isMaximized:function(){return(this.storedLocation!=null)},setOpacity:function(b){if(Element.setOpacity){Element.setOpacity(this.element,b)}},setZIndex:function(b){this.element.setStyle({zIndex:b});Windows.updateZindex(b,this)},setTitle:function(b){if(!b||b==""){b="&nbsp;"}Element.update(this.element.id+"_top",b)},getTitle:function(){return $(this.element.id+"_top").innerHTML},setStatusBar:function(d){var b=$(this.getId()+"_bottom");if(typeof(d)=="object"){if(this.bottombar.firstChild){this.bottombar.replaceChild(d,this.bottombar.firstChild)}else{this.bottombar.appendChild(d)}}else{this.bottombar.innerHTML=d}},_checkIEOverlapping:function(){if(!this.iefix&&(navigator.appVersion.indexOf("MSIE")>0)&&(navigator.userAgent.indexOf("Opera")<0)&&(this.element.getStyle("position")=="absolute")){new Insertion.After(this.element.id,'<iframe id="'+this.element.id+'_iefix" style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" src="javascript:false;" frameborder="0" scrolling="no"></iframe>');this.iefix=$(this.element.id+"_iefix")}if(this.iefix){setTimeout(this._fixIEOverlapping.bind(this),50)}},_fixIEOverlapping:function(){Position.clone(this.element,this.iefix);this.iefix.style.zIndex=this.element.style.zIndex-1;this.iefix.show()},_keyUp:function(b){if(27==b.keyCode&&this.options.closeOnEsc){this.close()}},_getWindowBorderSize:function(d){var e=this._createHiddenDiv(this.options.className+"_n");this.heightN=Element.getDimensions(e).height;e.parentNode.removeChild(e);var e=this._createHiddenDiv(this.options.className+"_s");this.heightS=Element.getDimensions(e).height;e.parentNode.removeChild(e);var e=this._createHiddenDiv(this.options.className+"_e");this.widthE=Element.getDimensions(e).width;e.parentNode.removeChild(e);var e=this._createHiddenDiv(this.options.className+"_w");this.widthW=Element.getDimensions(e).width;e.parentNode.removeChild(e);var e=document.createElement("div");e.className="overlay_"+this.options.className;document.body.appendChild(e);var b=this;setTimeout(function(){b.overlayOpacity=($(e).getStyle("opacity"));e.parentNode.removeChild(e)},10);if(Prototype.Browser.IE){this.heightS=$(this.getId()+"_row3").getDimensions().height;this.heightN=$(this.getId()+"_row1").getDimensions().height}if(Prototype.Browser.WebKit&&Prototype.Browser.WebKitVersion<420){this.setSize(this.width,this.height)}if(this.doMaximize){this.maximize()}if(this.doMinimize){this.minimize()}},_createHiddenDiv:function(d){var b=document.body;var e=document.createElement("div");e.setAttribute("id",this.element.id+"_tmp");e.className=d;e.style.display="none";e.innerHTML="";b.insertBefore(e,b.firstChild);return e},_storeLocation:function(){if(this.storedLocation==null){this.storedLocation={useTop:this.useTop,useLeft:this.useLeft,top:this.element.getStyle("top"),bottom:this.element.getStyle("bottom"),left:this.element.getStyle("left"),right:this.element.getStyle("right"),width:this.width,height:this.height}}},_restoreLocation:function(){if(this.storedLocation!=null){this.useLeft=this.storedLocation.useLeft;this.useTop=this.storedLocation.useTop;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,this.storedLocation.top,this.storedLocation.left,this.storedLocation.width,this.storedLocation.height,{duration:Window.resizeEffectDuration})}else{this.element.setStyle(this.useLeft?{left:this.storedLocation.left}:{right:this.storedLocation.right});this.element.setStyle(this.useTop?{top:this.storedLocation.top}:{bottom:this.storedLocation.bottom});this.setSize(this.storedLocation.width,this.storedLocation.height)}Windows.resetOverflow();this._removeStoreLocation()}},_removeStoreLocation:function(){this.storedLocation=null},_saveCookie:function(){if(this.cookie){var b="";if(this.useLeft){b+="l:"+(this.storedLocation?this.storedLocation.left:this.element.getStyle("left"))}else{b+="r:"+(this.storedLocation?this.storedLocation.right:this.element.getStyle("right"))}if(this.useTop){b+=",t:"+(this.storedLocation?this.storedLocation.top:this.element.getStyle("top"))}else{b+=",b:"+(this.storedLocation?this.storedLocation.bottom:this.element.getStyle("bottom"))}b+=","+(this.storedLocation?this.storedLocation.width:this.width);b+=","+(this.storedLocation?this.storedLocation.height:this.height);b+=","+this.isMinimized();b+=","+this.isMaximized();WindowUtilities.setCookie(b,this.cookie)}},_createWiredElement:function(){if(!this.wiredElement){if(Prototype.Browser.IE){this._getWindowBorderSize()}var d=document.createElement("div");d.className="wired_frame "+this.options.className+"_wired_frame";d.style.position="absolute";this.options.parent.insertBefore(d,this.options.parent.firstChild);this.wiredElement=$(d)}if(this.useLeft){this.wiredElement.setStyle({left:this.element.getStyle("left")})}else{this.wiredElement.setStyle({right:this.element.getStyle("right")})}if(this.useTop){this.wiredElement.setStyle({top:this.element.getStyle("top")})}else{this.wiredElement.setStyle({bottom:this.element.getStyle("bottom")})}var b=this.element.getDimensions();this.wiredElement.setStyle({width:b.width+"px",height:b.height+"px"});this.wiredElement.setStyle({zIndex:Windows.maxZIndex+30});return this.wiredElement},_hideWiredElement:function(){if(!this.wiredElement||!this.currentDrag){return}if(this.currentDrag==this.element){this.currentDrag=null}else{if(this.useLeft){this.element.setStyle({left:this.currentDrag.getStyle("left")})}else{this.element.setStyle({right:this.currentDrag.getStyle("right")})}if(this.useTop){this.element.setStyle({top:this.currentDrag.getStyle("top")})}else{this.element.setStyle({bottom:this.currentDrag.getStyle("bottom")})}this.currentDrag.hide();this.currentDrag=null;if(this.doResize){this.setSize(this.width,this.height)}}},_notify:function(b){if(this.options[b]){this.options[b](this)}else{Windows.notify(b,this)}}};var Windows={windows:[],modalWindows:[],observers:[],focusedWindow:null,maxZIndex:0,overlayShowEffectOptions:{duration:0.5},overlayHideEffectOptions:{duration:0.5},addObserver:function(b){this.removeObserver(b);this.observers.push(b)},removeObserver:function(b){this.observers=this.observers.reject(function(d){return d==b})},notify:function(b,d){this.observers.each(function(e){if(e[b]){e[b](b,d)}})},getWindow:function(b){return this.windows.detect(function(e){return e.getId()==b})},getFocusedWindow:function(){return this.focusedWindow},updateFocusedWindow:function(){this.focusedWindow=this.windows.length>=2?this.windows[this.windows.length-2]:null},register:function(b){this.windows.push(b)},addModalWindow:function(b){if(this.modalWindows.length==0){WindowUtilities.disableScreen(b.options.className,"overlay_modal",b.overlayOpacity,b.getId(),b.options.parent)}else{if(Window.keepMultiModalWindow){$("overlay_modal").style.zIndex=Windows.maxZIndex+1;Windows.maxZIndex+=1;WindowUtilities._hideSelect(this.modalWindows.last().getId())}else{this.modalWindows.last().element.hide()}WindowUtilities._showSelect(b.getId())}this.modalWindows.push(b)},removeModalWindow:function(b){this.modalWindows.pop();if(this.modalWindows.length==0){WindowUtilities.enableScreen()}else{if(Window.keepMultiModalWindow){this.modalWindows.last().toFront();WindowUtilities._showSelect(this.modalWindows.last().getId())}else{this.modalWindows.last().element.show()}}},register:function(b){this.windows.push(b)},unregister:function(b){this.windows=this.windows.reject(function(e){return e==b})},closeAll:function(){this.windows.each(function(b){Windows.close(b.getId())})},closeAllModalWindows:function(){WindowUtilities.enableScreen();this.modalWindows.each(function(b){if(b){b.close()}})},minimize:function(e,b){var d=this.getWindow(e);if(d&&d.visible){d.minimize()}Event.stop(b)},maximize:function(e,b){var d=this.getWindow(e);if(d&&d.visible){d.maximize()}Event.stop(b)},close:function(e,b){var d=this.getWindow(e);if(d){d.close()}if(b){Event.stop(b)}},blur:function(d){var b=this.getWindow(d);if(!b){return}if(b.options.blurClassName){b.changeClassName(b.options.blurClassName)}if(this.focusedWindow==b){this.focusedWindow=null}b._notify("onBlur")},focus:function(d){var b=this.getWindow(d);if(!b){return}if(this.focusedWindow){this.blur(this.focusedWindow.getId())}if(b.options.focusClassName){b.changeClassName(b.options.focusClassName)}this.focusedWindow=b;b._notify("onFocus")},unsetOverflow:function(b){this.windows.each(function(e){e.oldOverflow=e.getContent().getStyle("overflow")||"auto";e.getContent().setStyle({overflow:"hidden"})});if(b&&b.oldOverflow){b.getContent().setStyle({overflow:b.oldOverflow})}},resetOverflow:function(){this.windows.each(function(b){if(b.oldOverflow){b.getContent().setStyle({overflow:b.oldOverflow})}})},updateZindex:function(b,d){if(b>this.maxZIndex){this.maxZIndex=b;if(this.focusedWindow){this.blur(this.focusedWindow.getId())}}this.focusedWindow=d;if(this.focusedWindow){this.focus(this.focusedWindow.getId())}}};var Dialog={dialogId:null,onCompleteFunc:null,callFunc:null,parameters:null,confirm:function(f,e){if(f&&typeof f!="string"){Dialog._runAjaxRequest(f,e,Dialog.confirm);return}f=f||"";e=e||{};var h=e.okLabel?e.okLabel:"Ok";var b=e.cancelLabel?e.cancelLabel:"Cancel";e=Object.extend(e,e.windowParameters||{});e.windowParameters=e.windowParameters||{};e.className=e.className||"alert";var d="class ='"+(e.buttonClass?e.buttonClass+" ":"")+" ok_button'";var g="class ='"+(e.buttonClass?e.buttonClass+" ":"")+" cancel_button'";var f="      <div class='"+e.className+"_message'>"+f+"</div>        <div class='"+e.className+"_buttons'>          <button type='button' title='"+h+"' onclick='Dialog.okCallback()' "+d+"><span><span><span>"+h+"</span></span></span></button>          <button type='button' title='"+b+"' onclick='Dialog.cancelCallback()' "+g+"><span><span><span>"+b+"</span></span></span></button>        </div>    ";return this._openDialog(f,e)},alert:function(e,d){if(e&&typeof e!="string"){Dialog._runAjaxRequest(e,d,Dialog.alert);return}e=e||"";d=d||{};var f=d.okLabel?d.okLabel:"Ok";d=Object.extend(d,d.windowParameters||{});d.windowParameters=d.windowParameters||{};d.className=d.className||"alert";var b="class ='"+(d.buttonClass?d.buttonClass+" ":"")+" ok_button'";var e="      <div class='"+d.className+"_message'>"+e+"</div>        <div class='"+d.className+"_buttons'>          <button type='button' title='"+f+"' onclick='Dialog.okCallback()' "+b+"><span><span><span>"+f+"</span></span></span></button>        </div>";return this._openDialog(e,d)},info:function(d,b){if(d&&typeof d!="string"){Dialog._runAjaxRequest(d,b,Dialog.info);return}d=d||"";b=b||{};b=Object.extend(b,b.windowParameters||{});b.windowParameters=b.windowParameters||{};b.className=b.className||"alert";var d="<div id='modal_dialog_message' class='"+b.className+"_message'>"+d+"</div>";if(b.showProgress){d+="<div id='modal_dialog_progress' class='"+b.className+"_progress'>  </div>"}b.ok=null;b.cancel=null;return this._openDialog(d,b)},setInfoMessage:function(b){$("modal_dialog_message").update(b)},closeInfo:function(){Windows.close(this.dialogId)},_openDialog:function(g,f){var e=f.className;if(!f.height&&!f.width){f.width=WindowUtilities.getPageSize(f.options.parent||document.body).pageWidth/2}if(f.id){this.dialogId=f.id}else{var d=new Date();this.dialogId="modal_dialog_"+d.getTime();f.id=this.dialogId}if(!f.height||!f.width){var b=WindowUtilities._computeSize(g,this.dialogId,f.width,f.height,5,e);if(f.height){f.width=b+5}else{f.height=b+5}}f.effectOptions=f.effectOptions;f.resizable=f.resizable||false;f.minimizable=f.minimizable||false;f.maximizable=f.maximizable||false;f.draggable=f.draggable||false;f.closable=f.closable||false;var h=new Window(f);h.getContent().innerHTML=g;h.showCenter(true,f.top,f.left);h.setDestroyOnClose();h.cancelCallback=f.onCancel||f.cancel;h.okCallback=f.onOk||f.ok;return h},_getAjaxContent:function(b){Dialog.callFunc(b.responseText,Dialog.parameters)},_runAjaxRequest:function(e,d,b){if(e.options==null){e.options={}}Dialog.onCompleteFunc=e.options.onComplete;Dialog.parameters=d;Dialog.callFunc=b;e.options.onComplete=Dialog._getAjaxContent;new Ajax.Request(e.url,e.options)},okCallback:function(){var b=Windows.focusedWindow;if(!b.okCallback||b.okCallback(b)){$$("#"+b.getId()+" input").each(function(d){d.onclick=null});b.close()}},cancelCallback:function(){var b=Windows.focusedWindow;$$("#"+b.getId()+" input").each(function(d){d.onclick=null});b.close();if(b.cancelCallback){b.cancelCallback(b)}}};if(Prototype.Browser.WebKit){var array=navigator.userAgent.match(new RegExp(/AppleWebKit\/([\d\.\+]*)/));Prototype.Browser.WebKitVersion=parseFloat(array[1])}var WindowUtilities={getWindowScroll:function(parent){var T,L,W,H;parent=parent||document.body;if(parent!=document.body){T=parent.scrollTop;L=parent.scrollLeft;W=parent.scrollWidth;H=parent.scrollHeight}else{var w=window;with(w.document){if(w.document.documentElement&&documentElement.scrollTop){T=documentElement.scrollTop;L=documentElement.scrollLeft}else{if(w.document.body){T=body.scrollTop;L=body.scrollLeft}}if(w.innerWidth){W=w.innerWidth;H=w.innerHeight}else{if(w.document.documentElement&&documentElement.clientWidth){W=documentElement.clientWidth;H=documentElement.clientHeight}else{W=body.offsetWidth;H=body.offsetHeight}}}}return{top:T,left:L,width:W,height:H}},getPageSize:function(f){f=f||document.body;var e,l;var g,d;if(f!=document.body){e=f.getWidth();l=f.getHeight();d=f.scrollWidth;g=f.scrollHeight}else{var h,b;if(window.innerHeight&&window.scrollMaxY){h=document.body.scrollWidth;b=window.innerHeight+window.scrollMaxY}else{if(document.body.scrollHeight>document.body.offsetHeight){h=document.body.scrollWidth;b=document.body.scrollHeight}else{h=document.body.offsetWidth;b=document.body.offsetHeight}}if(self.innerHeight){e=document.documentElement.clientWidth;l=self.innerHeight}else{if(document.documentElement&&document.documentElement.clientHeight){e=document.documentElement.clientWidth;l=document.documentElement.clientHeight}else{if(document.body){e=document.body.clientWidth;l=document.body.clientHeight}}}if(b<l){g=l}else{g=b}if(h<e){d=e}else{d=h}}return{pageWidth:d,pageHeight:g,windowWidth:e,windowHeight:l}},disableScreen:function(e,b,f,g,d){WindowUtilities.initLightbox(b,e,function(){this._disableScreen(e,b,f,g)}.bind(this),d||document.body)},_disableScreen:function(e,d,g,h){var f=$(d);var b=WindowUtilities.getPageSize(f.parentNode);if(h&&Prototype.Browser.IE){WindowUtilities._hideSelect();WindowUtilities._showSelect(h)}f.style.height=(b.pageHeight+"px");f.style.display="none";if(d=="overlay_modal"&&Window.hasEffectLib&&Windows.overlayShowEffectOptions){f.overlayOpacity=g;new Effect.Appear(f,Object.extend({from:0,to:g},Windows.overlayShowEffectOptions))}else{f.style.display="block"}},enableScreen:function(d){d=d||"overlay_modal";var b=$(d);if(b){if(d=="overlay_modal"&&Window.hasEffectLib&&Windows.overlayHideEffectOptions){new Effect.Fade(b,Object.extend({from:b.overlayOpacity,to:0},Windows.overlayHideEffectOptions))}else{b.style.display="none";b.parentNode.removeChild(b)}if(d!="__invisible__"){WindowUtilities._showSelect()}}},_hideSelect:function(b){if(Prototype.Browser.IE){b=b==null?"":"#"+b+" ";$$(b+"select").each(function(d){if(!WindowUtilities.isDefined(d.oldVisibility)){d.oldVisibility=d.style.visibility?d.style.visibility:"visible";d.style.visibility="hidden"}})}},_showSelect:function(b){if(Prototype.Browser.IE){b=b==null?"":"#"+b+" ";$$(b+"select").each(function(d){if(WindowUtilities.isDefined(d.oldVisibility)){try{d.style.visibility=d.oldVisibility}catch(f){d.style.visibility="visible"}d.oldVisibility=null}else{if(d.style.visibility){d.style.visibility="visible"}}})}},isDefined:function(b){return typeof(b)!="undefined"&&b!=null},initLightbox:function(g,e,b,d){if($(g)){Element.setStyle(g,{zIndex:Windows.maxZIndex+1});Windows.maxZIndex++;b()}else{var f=document.createElement("div");f.setAttribute("id",g);f.className="overlay_"+e;f.style.display="none";f.style.position="absolute";f.style.top="0";f.style.left="0";f.style.zIndex=Windows.maxZIndex+1;Windows.maxZIndex++;f.style.width="100%";d.insertBefore(f,d.firstChild);if(Prototype.Browser.WebKit&&g=="overlay_modal"){setTimeout(function(){b()},10)}else{b()}}},setCookie:function(d,b){document.cookie=b[0]+"="+escape(d)+((b[1])?"; expires="+b[1].toUTCString():"")+((b[2])?"; path="+b[2]:"")+((b[3])?"; domain="+b[3]:"")+((b[4])?"; secure":"")},getCookie:function(e){var d=document.cookie;var g=e+"=";var f=d.indexOf("; "+g);if(f==-1){f=d.indexOf(g);if(f!=0){return null}}else{f+=2}var b=document.cookie.indexOf(";",f);if(b==-1){b=d.length}return unescape(d.substring(f+g.length,b))},_computeSize:function(g,b,d,l,f,h){var o=document.body;var e=document.createElement("div");e.setAttribute("id",b);e.className=h+"_content";if(l){e.style.height=l+"px"}else{e.style.width=d+"px"}e.style.position="absolute";e.style.top="0";e.style.left="0";e.style.display="none";e.innerHTML=g;o.insertBefore(e,o.firstChild);var n;if(l){n=$(e).getDimensions().width+f}else{n=$(e).getDimensions().height+f}o.removeChild(e);return n}};var Builder={NODEMAP:{AREA:"map",CAPTION:"table",COL:"table",COLGROUP:"table",LEGEND:"fieldset",OPTGROUP:"select",OPTION:"select",PARAM:"object",TBODY:"table",TD:"table",TFOOT:"table",TH:"table",THEAD:"table",TR:"table"},node:function(b){b=b.toUpperCase();var l=this.NODEMAP[b]||"div";var d=document.createElement(l);try{d.innerHTML="<"+b+"></"+b+">"}catch(h){}var g=d.firstChild||null;if(g&&(g.tagName.toUpperCase()!=b)){g=g.getElementsByTagName(b)[0]}if(!g){g=document.createElement(b)}if(!g){return}if(arguments[1]){if(this._isStringOrNumber(arguments[1])||(arguments[1] instanceof Array)||arguments[1].tagName){this._children(g,arguments[1])}else{var f=this._attributes(arguments[1]);if(f.length){try{d.innerHTML="<"+b+" "+f+"></"+b+">"}catch(h){}g=d.firstChild||null;if(!g){g=document.createElement(b);for(attr in arguments[1]){g[attr=="class"?"className":attr]=arguments[1][attr]}}if(g.tagName.toUpperCase()!=b){g=d.getElementsByTagName(b)[0]}}}}if(arguments[2]){this._children(g,arguments[2])}return $(g)},_text:function(b){return document.createTextNode(b)},ATTR_MAP:{className:"class",htmlFor:"for"},_attributes:function(b){var d=[];for(attribute in b){d.push((attribute in this.ATTR_MAP?this.ATTR_MAP[attribute]:attribute)+'="'+b[attribute].toString().escapeHTML().gsub(/"/,"&quot;")+'"')}return d.join(" ")},_children:function(d,b){if(b.tagName){d.appendChild(b);return}if(typeof b=="object"){b.flatten().each(function(f){if(typeof f=="object"){d.appendChild(f)}else{if(Builder._isStringOrNumber(f)){d.appendChild(Builder._text(f))}}})}else{if(Builder._isStringOrNumber(b)){d.appendChild(Builder._text(b))}}},_isStringOrNumber:function(b){return(typeof b=="string"||typeof b=="number")},build:function(d){var b=this.node("div");$(b).update(d.strip());return b.down()},dump:function(d){if(typeof d!="object"&&typeof d!="function"){d=window}var b=("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);b.each(function(e){d[e]=function(){return Builder.node.apply(Builder,[e].concat($A(arguments)))}})}};String.prototype.parseColor=function(){var b="#";if(this.slice(0,4)=="rgb("){var e=this.slice(4,this.length-1).split(",");var d=0;do{b+=parseInt(e[d]).toColorPart()}while(++d<3)}else{if(this.slice(0,1)=="#"){if(this.length==4){for(var d=1;d<4;d++){b+=(this.charAt(d)+this.charAt(d)).toLowerCase()}}if(this.length==7){b=this.toLowerCase()}}}return(b.length==7?b:(arguments[0]||this))};Element.collectTextNodes=function(b){return $A($(b).childNodes).collect(function(d){return(d.nodeType==3?d.nodeValue:(d.hasChildNodes()?Element.collectTextNodes(d):""))}).flatten().join("")};Element.collectTextNodesIgnoreClass=function(b,d){return $A($(b).childNodes).collect(function(e){return(e.nodeType==3?e.nodeValue:((e.hasChildNodes()&&!Element.hasClassName(e,d))?Element.collectTextNodesIgnoreClass(e,d):""))}).flatten().join("")};Element.setContentZoom=function(b,d){b=$(b);b.setStyle({fontSize:(d/100)+"em"});if(Prototype.Browser.WebKit){window.scrollBy(0,0)}return b};Element.getInlineOpacity=function(b){return $(b).style.opacity||""};Element.forceRerendering=function(b){try{b=$(b);var f=document.createTextNode(" ");b.appendChild(f);b.removeChild(f)}catch(d){}};var Effect={_elementDoesNotExistError:{name:"ElementDoesNotExistError",message:"The specified DOM element does not exist, but is required for this effect to operate"},Transitions:{linear:Prototype.K,sinoidal:function(b){return(-Math.cos(b*Math.PI)/2)+0.5},reverse:function(b){return 1-b},flicker:function(b){var b=((-Math.cos(b*Math.PI)/4)+0.75)+Math.random()/4;return b>1?1:b},wobble:function(b){return(-Math.cos(b*Math.PI*(9*b))/2)+0.5},pulse:function(d,b){return(-Math.cos((d*((b||5)-0.5)*2)*Math.PI)/2)+0.5},spring:function(b){return 1-(Math.cos(b*4.5*Math.PI)*Math.exp(-b*6))},none:function(b){return 0},full:function(b){return 1}},DefaultOptions:{duration:1,fps:100,sync:false,from:0,to:1,delay:0,queue:"parallel"},tagifyText:function(b){var d="position:relative";if(Prototype.Browser.IE){d+=";zoom:1"}b=$(b);$A(b.childNodes).each(function(e){if(e.nodeType==3){e.nodeValue.toArray().each(function(f){b.insertBefore(new Element("span",{style:d}).update(f==" "?String.fromCharCode(160):f),e)});Element.remove(e)}})},multiple:function(d,e){var g;if(((typeof d=="object")||Object.isFunction(d))&&(d.length)){g=d}else{g=$(d).childNodes}var b=Object.extend({speed:0.1,delay:0},arguments[2]||{});var f=b.delay;$A(g).each(function(l,h){new e(l,Object.extend(b,{delay:h*b.speed+f}))})},PAIRS:{slide:["SlideDown","SlideUp"],blind:["BlindDown","BlindUp"],appear:["Appear","Fade"]},toggle:function(d,e){d=$(d);e=(e||"appear").toLowerCase();var b=Object.extend({queue:{position:"end",scope:(d.id||"global"),limit:1}},arguments[2]||{});Effect[d.visible()?Effect.PAIRS[e][1]:Effect.PAIRS[e][0]](d,b)}};Effect.DefaultOptions.transition=Effect.Transitions.sinoidal;Effect.ScopedQueue=Class.create(Enumerable,{initialize:function(){this.effects=[];this.interval=null},_each:function(b){this.effects._each(b)},add:function(d){var e=new Date().getTime();var b=Object.isString(d.options.queue)?d.options.queue:d.options.queue.position;switch(b){case"front":this.effects.findAll(function(f){return f.state=="idle"}).each(function(f){f.startOn+=d.finishOn;f.finishOn+=d.finishOn});break;case"with-last":e=this.effects.pluck("startOn").max()||e;break;case"end":e=this.effects.pluck("finishOn").max()||e;break}d.startOn+=e;d.finishOn+=e;if(!d.options.queue.limit||(this.effects.length<d.options.queue.limit)){this.effects.push(d)}if(!this.interval){this.interval=setInterval(this.loop.bind(this),15)}},remove:function(b){this.effects=this.effects.reject(function(d){return d==b});if(this.effects.length==0){clearInterval(this.interval);this.interval=null}},loop:function(){var e=new Date().getTime();for(var d=0,b=this.effects.length;d<b;d++){this.effects[d]&&this.effects[d].loop(e)}}});Effect.Queues={instances:$H(),get:function(b){if(!Object.isString(b)){return b}return this.instances.get(b)||this.instances.set(b,new Effect.ScopedQueue())}};Effect.Queue=Effect.Queues.get("global");Effect.Base=Class.create({position:null,start:function(b){function d(f,e){return((f[e+"Internal"]?"this.options."+e+"Internal(this);":"")+(f[e]?"this.options."+e+"(this);":""))}if(b&&b.transition===false){b.transition=Effect.Transitions.linear}this.options=Object.extend(Object.extend({},Effect.DefaultOptions),b||{});this.currentFrame=0;this.state="idle";this.startOn=this.options.delay*1000;this.finishOn=this.startOn+(this.options.duration*1000);this.fromToDelta=this.options.to-this.options.from;this.totalTime=this.finishOn-this.startOn;this.totalFrames=this.options.fps*this.options.duration;this.render=(function(){function e(g,f){if(g.options[f+"Internal"]){g.options[f+"Internal"](g)}if(g.options[f]){g.options[f](g)}}return function(f){if(this.state==="idle"){this.state="running";e(this,"beforeSetup");if(this.setup){this.setup()}e(this,"afterSetup")}if(this.state==="running"){f=(this.options.transition(f)*this.fromToDelta)+this.options.from;this.position=f;e(this,"beforeUpdate");if(this.update){this.update(f)}e(this,"afterUpdate")}}})();this.event("beforeStart");if(!this.options.sync){Effect.Queues.get(Object.isString(this.options.queue)?"global":this.options.queue.scope).add(this)}},loop:function(e){if(e>=this.startOn){if(e>=this.finishOn){this.render(1);this.cancel();this.event("beforeFinish");if(this.finish){this.finish()}this.event("afterFinish");return}var d=(e-this.startOn)/this.totalTime,b=(d*this.totalFrames).round();if(b>this.currentFrame){this.render(d);this.currentFrame=b}}},cancel:function(){if(!this.options.sync){Effect.Queues.get(Object.isString(this.options.queue)?"global":this.options.queue.scope).remove(this)}this.state="finished"},event:function(b){if(this.options[b+"Internal"]){this.options[b+"Internal"](this)}if(this.options[b]){this.options[b](this)}},inspect:function(){var b=$H();for(property in this){if(!Object.isFunction(this[property])){b.set(property,this[property])}}return"#<Effect:"+b.inspect()+",options:"+$H(this.options).inspect()+">"}});Effect.Parallel=Class.create(Effect.Base,{initialize:function(b){this.effects=b||[];this.start(arguments[1])},update:function(b){this.effects.invoke("render",b)},finish:function(b){this.effects.each(function(d){d.render(1);d.cancel();d.event("beforeFinish");if(d.finish){d.finish(b)}d.event("afterFinish")})}});Effect.Tween=Class.create(Effect.Base,{initialize:function(e,h,g){e=Object.isString(e)?$(e):e;var d=$A(arguments),f=d.last(),b=d.length==5?d[3]:null;this.method=Object.isFunction(f)?f.bind(e):Object.isFunction(e[f])?e[f].bind(e):function(l){e[f]=l};this.start(Object.extend({from:h,to:g},b||{}))},update:function(b){this.method(b)}});Effect.Event=Class.create(Effect.Base,{initialize:function(){this.start(Object.extend({duration:0},arguments[0]||{}))},update:Prototype.emptyFunction});Effect.Opacity=Class.create(Effect.Base,{initialize:function(d){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}if(Prototype.Browser.IE&&(!this.element.currentStyle.hasLayout)){this.element.setStyle({zoom:1})}var b=Object.extend({from:this.element.getOpacity()||0,to:1},arguments[1]||{});this.start(b)},update:function(b){this.element.setOpacity(b)}});Effect.Move=Class.create(Effect.Base,{initialize:function(d){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({x:0,y:0,mode:"relative"},arguments[1]||{});this.start(b)},setup:function(){this.element.makePositioned();this.originalLeft=parseFloat(this.element.getStyle("left")||"0");this.originalTop=parseFloat(this.element.getStyle("top")||"0");if(this.options.mode=="absolute"){this.options.x=this.options.x-this.originalLeft;this.options.y=this.options.y-this.originalTop}},update:function(b){this.element.setStyle({left:(this.options.x*b+this.originalLeft).round()+"px",top:(this.options.y*b+this.originalTop).round()+"px"})}});Effect.MoveBy=function(d,b,e){return new Effect.Move(d,Object.extend({x:e,y:b},arguments[3]||{}))};Effect.Scale=Class.create(Effect.Base,{initialize:function(d,e){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({scaleX:true,scaleY:true,scaleContent:true,scaleFromCenter:false,scaleMode:"box",scaleFrom:100,scaleTo:e},arguments[2]||{});this.start(b)},setup:function(){this.restoreAfterFinish=this.options.restoreAfterFinish||false;this.elementPositioning=this.element.getStyle("position");this.originalStyle={};["top","left","width","height","fontSize"].each(function(d){this.originalStyle[d]=this.element.style[d]}.bind(this));this.originalTop=this.element.offsetTop;this.originalLeft=this.element.offsetLeft;var b=this.element.getStyle("font-size")||"100%";["em","px","%","pt"].each(function(d){if(b.indexOf(d)>0){this.fontSize=parseFloat(b);this.fontSizeType=d}}.bind(this));this.factor=(this.options.scaleTo-this.options.scaleFrom)/100;this.dims=null;if(this.options.scaleMode=="box"){this.dims=[this.element.offsetHeight,this.element.offsetWidth]}if(/^content/.test(this.options.scaleMode)){this.dims=[this.element.scrollHeight,this.element.scrollWidth]}if(!this.dims){this.dims=[this.options.scaleMode.originalHeight,this.options.scaleMode.originalWidth]}},update:function(b){var d=(this.options.scaleFrom/100)+(this.factor*b);if(this.options.scaleContent&&this.fontSize){this.element.setStyle({fontSize:this.fontSize*d+this.fontSizeType})}this.setDimensions(this.dims[0]*d,this.dims[1]*d)},finish:function(b){if(this.restoreAfterFinish){this.element.setStyle(this.originalStyle)}},setDimensions:function(b,g){var h={};if(this.options.scaleX){h.width=g.round()+"px"}if(this.options.scaleY){h.height=b.round()+"px"}if(this.options.scaleFromCenter){var f=(b-this.dims[0])/2;var e=(g-this.dims[1])/2;if(this.elementPositioning=="absolute"){if(this.options.scaleY){h.top=this.originalTop-f+"px"}if(this.options.scaleX){h.left=this.originalLeft-e+"px"}}else{if(this.options.scaleY){h.top=-f+"px"}if(this.options.scaleX){h.left=-e+"px"}}}this.element.setStyle(h)}});Effect.Highlight=Class.create(Effect.Base,{initialize:function(d){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({startcolor:"#ffff99"},arguments[1]||{});this.start(b)},setup:function(){if(this.element.getStyle("display")=="none"){this.cancel();return}this.oldStyle={};if(!this.options.keepBackgroundImage){this.oldStyle.backgroundImage=this.element.getStyle("background-image");this.element.setStyle({backgroundImage:"none"})}if(!this.options.endcolor){this.options.endcolor=this.element.getStyle("background-color").parseColor("#ffffff")}if(!this.options.restorecolor){this.options.restorecolor=this.element.getStyle("background-color")}this._base=$R(0,2).map(function(b){return parseInt(this.options.startcolor.slice(b*2+1,b*2+3),16)}.bind(this));this._delta=$R(0,2).map(function(b){return parseInt(this.options.endcolor.slice(b*2+1,b*2+3),16)-this._base[b]}.bind(this))},update:function(b){this.element.setStyle({backgroundColor:$R(0,2).inject("#",function(d,e,f){return d+((this._base[f]+(this._delta[f]*b)).round().toColorPart())}.bind(this))})},finish:function(){this.element.setStyle(Object.extend(this.oldStyle,{backgroundColor:this.options.restorecolor}))}});Effect.ScrollTo=function(e){var d=arguments[1]||{},b=document.viewport.getScrollOffsets(),f=$(e).cumulativeOffset();if(d.offset){f[1]+=d.offset}return new Effect.Tween(null,b.top,f[1],d,function(g){scrollTo(b.left,g.round())})};Effect.Fade=function(e){e=$(e);var b=e.getInlineOpacity();var d=Object.extend({from:e.getOpacity()||1,to:0,afterFinishInternal:function(f){if(f.options.to!=0){return}f.element.hide().setStyle({opacity:b})}},arguments[1]||{});return new Effect.Opacity(e,d)};Effect.Appear=function(d){d=$(d);var b=Object.extend({from:(d.getStyle("display")=="none"?0:d.getOpacity()||0),to:1,afterFinishInternal:function(e){e.element.forceRerendering()},beforeSetup:function(e){e.element.setOpacity(e.options.from).show()}},arguments[1]||{});return new Effect.Opacity(d,b)};Effect.Puff=function(d){d=$(d);var b={opacity:d.getInlineOpacity(),position:d.getStyle("position"),top:d.style.top,left:d.style.left,width:d.style.width,height:d.style.height};return new Effect.Parallel([new Effect.Scale(d,200,{sync:true,scaleFromCenter:true,scaleContent:true,restoreAfterFinish:true}),new Effect.Opacity(d,{sync:true,to:0})],Object.extend({duration:1,beforeSetupInternal:function(e){Position.absolutize(e.effects[0].element)},afterFinishInternal:function(e){e.effects[0].element.hide().setStyle(b)}},arguments[1]||{}))};Effect.BlindUp=function(b){b=$(b);b.makeClipping();return new Effect.Scale(b,0,Object.extend({scaleContent:false,scaleX:false,restoreAfterFinish:true,afterFinishInternal:function(d){d.element.hide().undoClipping()}},arguments[1]||{}))};Effect.BlindDown=function(d){d=$(d);var b=d.getDimensions();return new Effect.Scale(d,100,Object.extend({scaleContent:false,scaleX:false,scaleFrom:0,scaleMode:{originalHeight:b.height,originalWidth:b.width},restoreAfterFinish:true,afterSetup:function(e){e.element.makeClipping().setStyle({height:"0px"}).show()},afterFinishInternal:function(e){e.element.undoClipping()}},arguments[1]||{}))};Effect.SwitchOff=function(d){d=$(d);var b=d.getInlineOpacity();return new Effect.Appear(d,Object.extend({duration:0.4,from:0,transition:Effect.Transitions.flicker,afterFinishInternal:function(e){new Effect.Scale(e.element,1,{duration:0.3,scaleFromCenter:true,scaleX:false,scaleContent:false,restoreAfterFinish:true,beforeSetup:function(f){f.element.makePositioned().makeClipping()},afterFinishInternal:function(f){f.element.hide().undoClipping().undoPositioned().setStyle({opacity:b})}})}},arguments[1]||{}))};Effect.DropOut=function(d){d=$(d);var b={top:d.getStyle("top"),left:d.getStyle("left"),opacity:d.getInlineOpacity()};return new Effect.Parallel([new Effect.Move(d,{x:0,y:100,sync:true}),new Effect.Opacity(d,{sync:true,to:0})],Object.extend({duration:0.5,beforeSetup:function(e){e.effects[0].element.makePositioned()},afterFinishInternal:function(e){e.effects[0].element.hide().undoPositioned().setStyle(b)}},arguments[1]||{}))};Effect.Shake=function(f){f=$(f);var d=Object.extend({distance:20,duration:0.5},arguments[1]||{});var g=parseFloat(d.distance);var e=parseFloat(d.duration)/10;var b={top:f.getStyle("top"),left:f.getStyle("left")};return new Effect.Move(f,{x:g,y:0,duration:e,afterFinishInternal:function(h){new Effect.Move(h.element,{x:-g*2,y:0,duration:e*2,afterFinishInternal:function(l){new Effect.Move(l.element,{x:g*2,y:0,duration:e*2,afterFinishInternal:function(n){new Effect.Move(n.element,{x:-g*2,y:0,duration:e*2,afterFinishInternal:function(o){new Effect.Move(o.element,{x:g*2,y:0,duration:e*2,afterFinishInternal:function(p){new Effect.Move(p.element,{x:-g,y:0,duration:e,afterFinishInternal:function(q){q.element.undoPositioned().setStyle(b)}})}})}})}})}})}})};Effect.SlideDown=function(e){e=$(e).cleanWhitespace();var b=e.down().getStyle("bottom");var d=e.getDimensions();return new Effect.Scale(e,100,Object.extend({scaleContent:false,scaleX:false,scaleFrom:window.opera?0:1,scaleMode:{originalHeight:d.height,originalWidth:d.width},restoreAfterFinish:true,afterSetup:function(f){f.element.makePositioned();f.element.down().makePositioned();if(window.opera){f.element.setStyle({top:""})}f.element.makeClipping().setStyle({height:"0px"}).show()},afterUpdateInternal:function(f){f.element.down().setStyle({bottom:(f.dims[0]-f.element.clientHeight)+"px"})},afterFinishInternal:function(f){f.element.undoClipping().undoPositioned();f.element.down().undoPositioned().setStyle({bottom:b})}},arguments[1]||{}))};Effect.SlideUp=function(e){e=$(e).cleanWhitespace();var b=e.down().getStyle("bottom");var d=e.getDimensions();return new Effect.Scale(e,window.opera?0:1,Object.extend({scaleContent:false,scaleX:false,scaleMode:"box",scaleFrom:100,scaleMode:{originalHeight:d.height,originalWidth:d.width},restoreAfterFinish:true,afterSetup:function(f){f.element.makePositioned();f.element.down().makePositioned();if(window.opera){f.element.setStyle({top:""})}f.element.makeClipping().show()},afterUpdateInternal:function(f){f.element.down().setStyle({bottom:(f.dims[0]-f.element.clientHeight)+"px"})},afterFinishInternal:function(f){f.element.hide().undoClipping().undoPositioned();f.element.down().undoPositioned().setStyle({bottom:b})}},arguments[1]||{}))};Effect.Squish=function(b){return new Effect.Scale(b,window.opera?1:0,{restoreAfterFinish:true,beforeSetup:function(d){d.element.makeClipping()},afterFinishInternal:function(d){d.element.hide().undoClipping()}})};Effect.Grow=function(e){e=$(e);var d=Object.extend({direction:"center",moveTransition:Effect.Transitions.sinoidal,scaleTransition:Effect.Transitions.sinoidal,opacityTransition:Effect.Transitions.full},arguments[1]||{});var b={top:e.style.top,left:e.style.left,height:e.style.height,width:e.style.width,opacity:e.getInlineOpacity()};var l=e.getDimensions();var n,h;var g,f;switch(d.direction){case"top-left":n=h=g=f=0;break;case"top-right":n=l.width;h=f=0;g=-l.width;break;case"bottom-left":n=g=0;h=l.height;f=-l.height;break;case"bottom-right":n=l.width;h=l.height;g=-l.width;f=-l.height;break;case"center":n=l.width/2;h=l.height/2;g=-l.width/2;f=-l.height/2;break}return new Effect.Move(e,{x:n,y:h,duration:0.01,beforeSetup:function(o){o.element.hide().makeClipping().makePositioned()},afterFinishInternal:function(o){new Effect.Parallel([new Effect.Opacity(o.element,{sync:true,to:1,from:0,transition:d.opacityTransition}),new Effect.Move(o.element,{x:g,y:f,sync:true,transition:d.moveTransition}),new Effect.Scale(o.element,100,{scaleMode:{originalHeight:l.height,originalWidth:l.width},sync:true,scaleFrom:window.opera?1:0,transition:d.scaleTransition,restoreAfterFinish:true})],Object.extend({beforeSetup:function(p){p.effects[0].element.setStyle({height:"0px"}).show()},afterFinishInternal:function(p){p.effects[0].element.undoClipping().undoPositioned().setStyle(b)}},d))}})};Effect.Shrink=function(e){e=$(e);var d=Object.extend({direction:"center",moveTransition:Effect.Transitions.sinoidal,scaleTransition:Effect.Transitions.sinoidal,opacityTransition:Effect.Transitions.none},arguments[1]||{});var b={top:e.style.top,left:e.style.left,height:e.style.height,width:e.style.width,opacity:e.getInlineOpacity()};var h=e.getDimensions();var g,f;switch(d.direction){case"top-left":g=f=0;break;case"top-right":g=h.width;f=0;break;case"bottom-left":g=0;f=h.height;break;case"bottom-right":g=h.width;f=h.height;break;case"center":g=h.width/2;f=h.height/2;break}return new Effect.Parallel([new Effect.Opacity(e,{sync:true,to:0,from:1,transition:d.opacityTransition}),new Effect.Scale(e,window.opera?1:0,{sync:true,transition:d.scaleTransition,restoreAfterFinish:true}),new Effect.Move(e,{x:g,y:f,sync:true,transition:d.moveTransition})],Object.extend({beforeStartInternal:function(l){l.effects[0].element.makePositioned().makeClipping()},afterFinishInternal:function(l){l.effects[0].element.hide().undoClipping().undoPositioned().setStyle(b)}},d))};Effect.Pulsate=function(e){e=$(e);var d=arguments[1]||{},b=e.getInlineOpacity(),g=d.transition||Effect.Transitions.linear,f=function(h){return 1-g((-Math.cos((h*(d.pulses||5)*2)*Math.PI)/2)+0.5)};return new Effect.Opacity(e,Object.extend(Object.extend({duration:2,from:0,afterFinishInternal:function(h){h.element.setStyle({opacity:b})}},d),{transition:f}))};Effect.Fold=function(d){d=$(d);var b={top:d.style.top,left:d.style.left,width:d.style.width,height:d.style.height};d.makeClipping();return new Effect.Scale(d,5,Object.extend({scaleContent:false,scaleX:false,afterFinishInternal:function(e){new Effect.Scale(d,1,{scaleContent:false,scaleY:false,afterFinishInternal:function(f){f.element.hide().undoClipping().setStyle(b)}})}},arguments[1]||{}))};Effect.Morph=Class.create(Effect.Base,{initialize:function(e){this.element=$(e);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({style:{}},arguments[1]||{});if(!Object.isString(b.style)){this.style=$H(b.style)}else{if(b.style.include(":")){this.style=b.style.parseStyle()}else{this.element.addClassName(b.style);this.style=$H(this.element.getStyles());this.element.removeClassName(b.style);var d=this.element.getStyles();this.style=this.style.reject(function(f){return f.value==d[f.key]});b.afterFinishInternal=function(f){f.element.addClassName(f.options.style);f.transforms.each(function(g){f.element.style[g.style]=""})}}}this.start(b)},setup:function(){function b(d){if(!d||["rgba(0, 0, 0, 0)","transparent"].include(d)){d="#ffffff"}d=d.parseColor();return $R(0,2).map(function(e){return parseInt(d.slice(e*2+1,e*2+3),16)})}this.transforms=this.style.map(function(l){var h=l[0],g=l[1],f=null;if(g.parseColor("#zzzzzz")!="#zzzzzz"){g=g.parseColor();f="color"}else{if(h=="opacity"){g=parseFloat(g);if(Prototype.Browser.IE&&(!this.element.currentStyle.hasLayout)){this.element.setStyle({zoom:1})}}else{if(Element.CSS_LENGTH.test(g)){var e=g.match(/^([\+\-]?[0-9\.]+)(.*)$/);g=parseFloat(e[1]);f=(e.length==3)?e[2]:null}}}var d=this.element.getStyle(h);return{style:h.camelize(),originalValue:f=="color"?b(d):parseFloat(d||0),targetValue:f=="color"?b(g):g,unit:f}}.bind(this)).reject(function(d){return((d.originalValue==d.targetValue)||(d.unit!="color"&&(isNaN(d.originalValue)||isNaN(d.targetValue))))})},update:function(b){var f={},d,e=this.transforms.length;while(e--){f[(d=this.transforms[e]).style]=d.unit=="color"?"#"+(Math.round(d.originalValue[0]+(d.targetValue[0]-d.originalValue[0])*b)).toColorPart()+(Math.round(d.originalValue[1]+(d.targetValue[1]-d.originalValue[1])*b)).toColorPart()+(Math.round(d.originalValue[2]+(d.targetValue[2]-d.originalValue[2])*b)).toColorPart():(d.originalValue+(d.targetValue-d.originalValue)*b).toFixed(3)+(d.unit===null?"":d.unit)}this.element.setStyle(f,true)}});Effect.Transform=Class.create({initialize:function(b){this.tracks=[];this.options=arguments[1]||{};this.addTracks(b)},addTracks:function(b){b.each(function(d){d=$H(d);var e=d.values().first();this.tracks.push($H({ids:d.keys().first(),effect:Effect.Morph,options:{style:e}}))}.bind(this));return this},play:function(){return new Effect.Parallel(this.tracks.map(function(b){var f=b.get("ids"),e=b.get("effect"),d=b.get("options");var g=[$(f)||$$(f)].flatten();return g.map(function(h){return new e(h,Object.extend({sync:true},d))})}).flatten(),this.options)}});Element.CSS_PROPERTIES=$w("backgroundColor backgroundPosition borderBottomColor borderBottomStyle borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth borderRightColor borderRightStyle borderRightWidth borderSpacing borderTopColor borderTopStyle borderTopWidth bottom clip color fontSize fontWeight height left letterSpacing lineHeight marginBottom marginLeft marginRight marginTop markerOffset maxHeight maxWidth minHeight minWidth opacity outlineColor outlineOffset outlineWidth paddingBottom paddingLeft paddingRight paddingTop right textIndent top width wordSpacing zIndex");Element.CSS_LENGTH=/^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;String.__parseStyleElement=document.createElement("div");String.prototype.parseStyle=function(){var d,b=$H();if(Prototype.Browser.WebKit){d=new Element("div",{style:this}).style}else{String.__parseStyleElement.innerHTML='<div style="'+this+'"></div>';d=String.__parseStyleElement.childNodes[0].style}Element.CSS_PROPERTIES.each(function(e){if(d[e]){b.set(e,d[e])}});if(Prototype.Browser.IE&&this.include("opacity")){b.set("opacity",this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1])}return b};if(document.defaultView&&document.defaultView.getComputedStyle){Element.getStyles=function(d){var b=document.defaultView.getComputedStyle($(d),null);return Element.CSS_PROPERTIES.inject({},function(e,f){e[f]=b[f];return e})}}else{Element.getStyles=function(d){d=$(d);var b=d.currentStyle,e;e=Element.CSS_PROPERTIES.inject({},function(f,g){f[g]=b[g];return f});if(!e.opacity){e.opacity=d.getOpacity()}return e}}Effect.Methods={morph:function(b,d){b=$(b);new Effect.Morph(b,Object.extend({style:d},arguments[2]||{}));return b},visualEffect:function(e,g,d){e=$(e);var f=g.dasherize().camelize(),b=f.charAt(0).toUpperCase()+f.substring(1);new Effect[b](e,d);return e},highlight:function(d,b){d=$(d);new Effect.Highlight(d,b);return d}};$w("fade appear grow shrink fold blindUp blindDown slideUp slideDown pulsate shake puff squish switchOff dropOut").each(function(b){Effect.Methods[b]=function(e,d){e=$(e);Effect[b.charAt(0).toUpperCase()+b.substring(1)](e,d);return e}});$w("getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles").each(function(b){Effect.Methods[b]=Element[b]});Element.addMethods(Effect.Methods);function validateCreditCard(e){var d="0123456789";var b="";for(i=0;i<e.length;i++){x=e.charAt(i);if(d.indexOf(x,0)!=-1){b+=x}}j=b.length/2;k=Math.floor(j);m=Math.ceil(j)-k;c=0;for(i=0;i<k;i++){a=b.charAt(i*2+m)*2;c+=a>9?Math.floor(a/10+a%10):a}for(i=0;i<k+m;i++){c+=b.charAt(i*2+1-m)*1}return(c%10==0)}var Validator=Class.create();Validator.prototype={initialize:function(e,d,f,b){if(typeof f=="function"){this.options=$H(b);this._test=f}else{this.options=$H(f);this._test=function(){return true}}this.error=d||"Validation failed.";this.className=e},test:function(b,d){return(this._test(b,d)&&this.options.all(function(e){return Validator.methods[e.key]?Validator.methods[e.key](b,d,e.value):true}))}};Validator.methods={pattern:function(b,e,d){return Validation.get("IsEmpty").test(b)||d.test(b)},minLength:function(b,e,d){return b.length>=d},maxLength:function(b,e,d){return b.length<=d},min:function(b,e,d){return b>=parseFloat(d)},max:function(b,e,d){return b<=parseFloat(d)},notOneOf:function(b,e,d){return $A(d).all(function(f){return b!=f})},oneOf:function(b,e,d){return $A(d).any(function(f){return b==f})},is:function(b,e,d){return b==d},isNot:function(b,e,d){return b!=d},equalToField:function(b,e,d){return b==$F(d)},notEqualToField:function(b,e,d){return b!=$F(d)},include:function(b,e,d){return $A(d).all(function(f){return Validation.get(f).test(b,e)})}};var Validation=Class.create();Validation.defaultOptions={onSubmit:true,stopOnFirst:false,immediate:false,focusOnError:true,useTitles:false,addClassNameToContainer:false,containerClassName:".input-box",onFormValidate:function(b,d){},onElementValidate:function(b,d){}};Validation.prototype={initialize:function(d,b){this.form=$(d);if(!this.form){return}this.options=Object.extend({onSubmit:Validation.defaultOptions.onSubmit,stopOnFirst:Validation.defaultOptions.stopOnFirst,immediate:Validation.defaultOptions.immediate,focusOnError:Validation.defaultOptions.focusOnError,useTitles:Validation.defaultOptions.useTitles,onFormValidate:Validation.defaultOptions.onFormValidate,onElementValidate:Validation.defaultOptions.onElementValidate},b||{});if(this.options.onSubmit){Event.observe(this.form,"submit",this.onSubmit.bind(this),false)}if(this.options.immediate){Form.getElements(this.form).each(function(e){if(e.tagName.toLowerCase()=="select"){Event.observe(e,"blur",this.onChange.bindAsEventListener(this))}if(e.type.toLowerCase()=="radio"||e.type.toLowerCase()=="checkbox"){Event.observe(e,"click",this.onChange.bindAsEventListener(this))}else{Event.observe(e,"change",this.onChange.bindAsEventListener(this))}},this)}},onChange:function(b){Validation.isOnChange=true;Validation.validate(Event.element(b),{useTitle:this.options.useTitles,onElementValidate:this.options.onElementValidate});Validation.isOnChange=false},onSubmit:function(b){if(!this.validate()){Event.stop(b)}},validate:function(){var b=false;var d=this.options.useTitles;var g=this.options.onElementValidate;try{if(this.options.stopOnFirst){b=Form.getElements(this.form).all(function(e){if(e.hasClassName("local-validation")&&!this.isElementInForm(e,this.form)){return true}return Validation.validate(e,{useTitle:d,onElementValidate:g})},this)}else{b=Form.getElements(this.form).collect(function(e){if(e.hasClassName("local-validation")&&!this.isElementInForm(e,this.form)){return true}if(e.hasClassName("validation-disabled")){return true}return Validation.validate(e,{useTitle:d,onElementValidate:g})},this).all()}}catch(f){}if(!b&&this.options.focusOnError){try{Form.getElements(this.form).findAll(function(e){return $(e).hasClassName("validation-failed")}).first().focus()}catch(f){}}this.options.onFormValidate(b,this.form);return b},reset:function(){Form.getElements(this.form).each(Validation.reset)},isElementInForm:function(e,d){var b=e.up("form");if(b==d){return true}return false}};Object.extend(Validation,{validate:function(e,b){b=Object.extend({useTitle:false,onElementValidate:function(f,g){}},b||{});e=$(e);var d=$w(e.className);return result=d.all(function(f){var g=Validation.test(f,e,b.useTitle);b.onElementValidate(g,e);return g})},insertAdvice:function(f,d){var b=$(f).up(".field-row");if(b){Element.insert(b,{after:d})}else{if(f.up("td.value")){f.up("td.value").insert({bottom:d})}else{if(f.advaiceContainer&&$(f.advaiceContainer)){$(f.advaiceContainer).update(d)}else{switch(f.type.toLowerCase()){case"checkbox":case"radio":var e=f.parentNode;if(e){Element.insert(e,{bottom:d})}else{Element.insert(f,{after:d})}break;default:Element.insert(f,{after:d})}}}}},showAdvice:function(e,d,b){if(!e.advices){e.advices=new Hash()}else{e.advices.each(function(f){if(!d||f.value.id!=d.id){this.hideAdvice(e,f.value)}}.bind(this))}e.advices.set(b,d);if(typeof Effect=="undefined"){d.style.display="block"}else{if(!d._adviceAbsolutize){new Effect.Appear(d,{duration:1})}else{Position.absolutize(d);d.show();d.setStyle({top:d._adviceTop,left:d._adviceLeft,width:d._adviceWidth,"z-index":1000});d.addClassName("advice-absolute")}}},hideAdvice:function(d,b){if(b!=null){new Effect.Fade(b,{duration:1,afterFinishInternal:function(){b.hide()}})}},updateCallback:function(elm,status){if(typeof elm.callbackFunction!="undefined"){eval(elm.callbackFunction+"('"+elm.id+"','"+status+"')")}},ajaxError:function(g,f){var e="validate-ajax";var d=Validation.getAdvice(e,g);if(d==null){d=this.createAdvice(e,g,false,f)}this.showAdvice(g,d,"validate-ajax");this.updateCallback(g,"failed");g.addClassName("validation-failed");g.addClassName("validate-ajax");if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var b=g.up(Validation.defaultOptions.containerClassName);if(b&&this.allowContainerClassName(g)){b.removeClassName("validation-passed");b.addClassName("validation-error")}}},allowContainerClassName:function(b){if(b.type=="radio"||b.type=="checkbox"){return b.hasClassName("change-container-classname")}return true},test:function(g,o,l){var d=Validation.get(g);var n="__advice"+g.camelize();try{if(Validation.isVisible(o)&&!d.test($F(o),o)){var f=Validation.getAdvice(g,o);if(f==null){f=this.createAdvice(g,o,l)}this.showAdvice(o,f,g);this.updateCallback(o,"failed");o[n]=1;if(!o.advaiceContainer){o.removeClassName("validation-passed");o.addClassName("validation-failed")}if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var b=o.up(Validation.defaultOptions.containerClassName);if(b&&this.allowContainerClassName(o)){b.removeClassName("validation-passed");b.addClassName("validation-error")}}return false}else{var f=Validation.getAdvice(g,o);this.hideAdvice(o,f);this.updateCallback(o,"passed");o[n]="";o.removeClassName("validation-failed");o.addClassName("validation-passed");if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var b=o.up(Validation.defaultOptions.containerClassName);if(b&&!b.down(".validation-failed")&&this.allowContainerClassName(o)){if(!Validation.get("IsEmpty").test(o.value)||!this.isVisible(o)){b.addClassName("validation-passed")}else{b.removeClassName("validation-passed")}b.removeClassName("validation-error")}}return true}}catch(h){throw (h)}},isVisible:function(b){while(b.tagName!="BODY"){if(!$(b).visible()){return false}b=b.parentNode}return true},getAdvice:function(b,d){return $("advice-"+b+"-"+Validation.getElmID(d))||$("advice-"+Validation.getElmID(d))},createAdvice:function(e,n,l,d){var b=Validation.get(e);var h=l?((n&&n.title)?n.title:b.error):b.error;if(d){h=d}if(jQuery.mage.__){h=jQuery.mage.__(h)}advice='<div class="validation-advice" id="advice-'+e+"-"+Validation.getElmID(n)+'" style="display:none">'+h+"</div>";Validation.insertAdvice(n,advice);advice=Validation.getAdvice(e,n);if($(n).hasClassName("absolute-advice")){var g=$(n).getDimensions();var f=Position.cumulativeOffset(n);advice._adviceTop=(f[1]+g.height)+"px";advice._adviceLeft=(f[0])+"px";advice._adviceWidth=(g.width)+"px";advice._adviceAbsolutize=true}return advice},getElmID:function(b){return b.id?b.id:b.name},reset:function(d){d=$(d);var b=$w(d.className);b.each(function(g){var h="__advice"+g.camelize();if(d[h]){var f=Validation.getAdvice(g,d);if(f){f.hide()}d[h]=""}d.removeClassName("validation-failed");d.removeClassName("validation-passed");if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var e=d.up(Validation.defaultOptions.containerClassName);if(e){e.removeClassName("validation-passed");e.removeClassName("validation-error")}}})},add:function(f,e,g,d){var b={};b[f]=new Validator(f,e,g,d);Object.extend(Validation.methods,b)},addAllThese:function(b){var d={};$A(b).each(function(e){d[e[0]]=new Validator(e[0],e[1],e[2],(e.length>3?e[3]:{}))});Object.extend(Validation.methods,d)},get:function(b){return Validation.methods[b]?Validation.methods[b]:Validation.methods._LikeNoIDIEverSaw_},methods:{_LikeNoIDIEverSaw_:new Validator("_LikeNoIDIEverSaw_","",{})}});Validation.add("IsEmpty","",function(b){return(b==""||(b==null)||(b.length==0)||/^\s+$/.test(b))});Validation.addAllThese([["validate-no-html-tags","HTML tags are not allowed",function(b){return !/<(\/)?\w+/.test(b)}],["validate-select","Please select an option.",function(b){return((b!="none")&&(b!=null)&&(b.length!=0))}],["required-entry","This is a required field.",function(b){return !Validation.get("IsEmpty").test(b)}],["validate-number","Please enter a valid number in this field.",function(b){return Validation.get("IsEmpty").test(b)||(!isNaN(parseNumber(b))&&/^\s*-?\d*(\.\d*)?\s*$/.test(b))}],["validate-number-range","The value is not within the specified range.",function(e,g){if(Validation.get("IsEmpty").test(e)){return true}var f=parseNumber(e);if(isNaN(f)){return false}var d=/^number-range-(-?[\d.,]+)?-(-?[\d.,]+)?$/,b=true;$w(g.className).each(function(l){var h=d.exec(l);if(h){b=b&&(h[1]==null||h[1]==""||f>=parseNumber(h[1]))&&(h[2]==null||h[2]==""||f<=parseNumber(h[2]))}});return b}],["validate-digits","Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.",function(b){return Validation.get("IsEmpty").test(b)||!/[^\d]/.test(b)}],["validate-digits-range","The value is not within the specified range.",function(e,g){if(Validation.get("IsEmpty").test(e)){return true}var f=parseNumber(e);if(isNaN(f)){return false}var d=/^digits-range-(-?\d+)?-(-?\d+)?$/,b=true;$w(g.className).each(function(l){var h=d.exec(l);if(h){b=b&&(h[1]==null||h[1]==""||f>=parseNumber(h[1]))&&(h[2]==null||h[2]==""||f<=parseNumber(h[2]))}});return b}],["validate-range","The value is not within the specified range.",function(f,l){var g,h;if(Validation.get("IsEmpty").test(f)){return true}else{if(Validation.get("validate-digits").test(f)){g=h=parseNumber(f)}else{var e=/^(-?\d+)?-(-?\d+)?$/.exec(f);if(e){g=parseNumber(e[1]);h=parseNumber(e[2]);if(g>h){return false}}else{return false}}}var d=/^range-(-?\d+)?-(-?\d+)?$/,b=true;$w(l.className).each(function(n){var q=d.exec(n);if(q){var p=parseNumber(q[1]);var o=parseNumber(q[2]);b=b&&(isNaN(p)||g>=p)&&(isNaN(o)||h<=o)}});return b}],["validate-alpha","Please use letters only (a-z or A-Z) in this field.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-zA-Z]+$/.test(b)}],["validate-code","Please use only lowercase letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-z]+[a-z0-9_]+$/.test(b)}],["validate-alphanum","Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-zA-Z0-9]+$/.test(b)}],["validate-alphanum-with-spaces","Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-zA-Z0-9 ]+$/.test(b)}],["validate-street",'Please use only letters (a-z or A-Z), numbers (0-9), spaces and "#" in this field.',function(b){return Validation.get("IsEmpty").test(b)||/^[ \w]{3,}([A-Za-z]\.)?([ \w]*\#\d+)?(\r\n| )[ \w]{3,}/.test(b)}],["validate-phoneStrict","Please enter a valid phone number (Ex: 123-456-7890).",function(b){return Validation.get("IsEmpty").test(b)||/^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(b)}],["validate-phoneLax","Please enter a valid phone number (Ex: 123-456-7890).",function(b){return Validation.get("IsEmpty").test(b)||/^((\d[-. ]?)?((\(\d{3}\))|\d{3}))?[-. ]?\d{3}[-. ]?\d{4}$/.test(b)}],["validate-fax","Please enter a valid fax number (Ex: 123-456-7890).",function(b){return Validation.get("IsEmpty").test(b)||/^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(b)}],["validate-date","Please enter a valid date.",function(b){var d=new Date(b);return Validation.get("IsEmpty").test(b)||!isNaN(d)}],["validate-date-range","Make sure the To Date is later than or the same as the From Date.",function(e,h){var d=/\bdate-range-(\w+)-(\w+)\b/.exec(h.className);if(!d||d[2]=="to"||Validation.get("IsEmpty").test(e)){return true}var f=new Date().getFullYear()+"";var b=function(l){l=l.split(/[.\/]/);if(l[2]&&l[2].length<4){l[2]=f.substr(0,l[2].length)+l[2]}return new Date(l.join("/")).getTime()};var g=Element.select(h.form,".validate-date-range.date-range-"+d[1]+"-to");return !g.length||Validation.get("IsEmpty").test(g[0].value)||b(e)<=b(g[0].value)}],["validate-email","Please enter a valid email address (Ex: johndoe@domain.com).",function(b){return Validation.get("IsEmpty").test(b)||/^([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*@([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*\.(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]){2,})$/i.test(b)}],["validate-emailSender","Please use only visible characters and spaces.",function(b){return Validation.get("IsEmpty").test(b)||/^[\S ]+$/.test(b)}],["validate-password","Please enter 6 or more characters. Leading and trailing spaces will be ignored.",function(b){var d=b.strip();return !(d.length>0&&d.length<6)}],["validate-admin-password","Please enter 7 or more characters, using both numeric and alphabetic.",function(b){var d=b.strip();if(0==d.length){return true}if(!(/[a-z]/i.test(b))||!(/[0-9]/.test(b))){return false}return !(d.length<7)}],["validate-cpassword","Please make sure your passwords match.",function(b){var d=$("confirmation")?$("confirmation"):$$(".validate-cpassword")[0];var g=false;if($("password")){g=$("password")}var h=$$(".validate-password");for(var e=0;e<h.size();e++){var f=h[e];if(f.up("form").id==d.up("form").id){g=f}}if($$(".validate-admin-password").size()){g=$$(".validate-admin-password")[0]}return(g.value==d.value)}],["validate-both-passwords","Please make sure your passwords match.",function(e,d){var b=$(d.form[d.name=="password"?"confirmation":"password"]),f=d.value==b.value;if(f&&b.hasClassName("validation-failed")){Validation.test(this.className,b)}return b.value==""||f}],["validate-url","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)",function(b){b=(b||"").replace(/^\s+/,"").replace(/\s+$/,"");return Validation.get("IsEmpty").test(b)||/^(http|https|ftp):\/\/(([A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))(\.[A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))*)(:(\d+))?(\/[A-Z0-9~](([A-Z0-9_~-]|\.)*[A-Z0-9~]|))*\/?(.*)?$/i.test(b)}],["validate-clean-url",'Please enter a valid URL (Ex: "http://www.example.com" or "www.example.com").',function(b){return Validation.get("IsEmpty").test(b)||/^(http|https|ftp):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(b)||/^(www)((\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(b)}],["validate-identifier",'Please enter a valid URL Key (Ex: "example-page", "example-page.html" or "anotherlevel/example-page").',function(b){return Validation.get("IsEmpty").test(b)||/^[a-z0-9][a-z0-9_\/-]+(\.[a-z0-9_-]+)?$/.test(b)}],["validate-xml-identifier","Please enter a valid XML-identifier (Ex: something_1, block5, id-4).",function(b){return Validation.get("IsEmpty").test(b)||/^[A-Z][A-Z0-9_\/-]*$/i.test(b)}],["validate-ssn","Please enter a valid social security number (Ex: 123-45-6789).",function(b){return Validation.get("IsEmpty").test(b)||/^\d{3}-?\d{2}-?\d{4}$/.test(b)}],["validate-zip-us","Please enter a valid zip code (Ex: 90602 or 90602-1234).",function(b){return Validation.get("IsEmpty").test(b)||/(^\d{5}$)|(^\d{5}-\d{4}$)/.test(b)}],["validate-zip-international","Please enter a valid zip code.",function(b){return true}],["validate-date-au",'Please use this date format: dd/mm/yyyy (Ex: "17/03/2006" for the 17th of March, 2006).',function(b){if(Validation.get("IsEmpty").test(b)){return true}var e=/^(\d{2})\/(\d{2})\/(\d{4})$/;if(!e.test(b)){return false}var f=new Date(b.replace(e,"$2/$1/$3"));return(parseInt(RegExp.$2,10)==(1+f.getMonth()))&&(parseInt(RegExp.$1,10)==f.getDate())&&(parseInt(RegExp.$3,10)==f.getFullYear())}],["validate-currency-dollar","Please enter a valid $ amount (Ex: $100.00).",function(b){return Validation.get("IsEmpty").test(b)||/^\$?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/.test(b)}],["validate-one-required","Please select one of the options above.",function(b,f){var e=f.parentNode;var d=e.getElementsByTagName("INPUT");return $A(d).any(function(g){return $F(g)})}],["validate-one-required-by-name","Please select one of the options.",function(d,g){var b=$$('input[name="'+g.name.replace(/([\\"])/g,"\\$1")+'"]');var e=1;for(var f=0;f<b.length;f++){if((b[f].type=="checkbox"||b[f].type=="radio")&&b[f].checked==true){e=0}if(Validation.isOnChange&&(b[f].type=="checkbox"||b[f].type=="radio")){Validation.reset(b[f])}}if(e==0){return true}else{return false}}],["validate-not-negative-number","Please enter a number 0 or greater in this field.",function(b){if(Validation.get("IsEmpty").test(b)){return true}b=parseNumber(b);return !isNaN(b)&&b>=0}],["validate-zero-or-greater","Please enter a number 0 or greater in this field.",function(b){return Validation.get("validate-not-negative-number").test(b)}],["validate-greater-than-zero","Please enter a number greater than 0 in this field.",function(b){if(Validation.get("IsEmpty").test(b)){return true}b=parseNumber(b);return !isNaN(b)&&b>0}],["validate-state","Please select State/Province.",function(b){return(b!=0||b=="")}],["validate-new-password","Please enter 6 or more characters. Leading and trailing spaces will be ignored.",function(b){if(!Validation.get("validate-password").test(b)){return false}if(Validation.get("IsEmpty").test(b)&&b!=""){return false}return true}],["validate-cc-number","Please enter a valid credit card number.",function(b,e){var d=$(e.id.substr(0,e.id.indexOf("_cc_number"))+"_cc_type");if(d&&typeof Validation.creditCartTypes.get(d.value)!="undefined"&&Validation.creditCartTypes.get(d.value)[2]==false){if(!Validation.get("IsEmpty").test(b)&&Validation.get("validate-digits").test(b)){return true}else{return false}}return validateCreditCard(b)}],["validate-cc-type","Credit card number does not match credit card type.",function(d,g){g.value=removeDelimiters(g.value);d=removeDelimiters(d);var f=$(g.id.substr(0,g.id.indexOf("_cc_number"))+"_cc_type");if(!f){return true}var e=f.value;if(typeof Validation.creditCartTypes.get(e)=="undefined"){return false}if(Validation.creditCartTypes.get(e)[0]==false){return true}var b="";Validation.creditCartTypes.each(function(h){if(h.value[0]&&d.match(h.value[0])){b=h.key;throw $break}});if(b!=e){return false}if(f.hasClassName("validation-failed")&&Validation.isOnChange){Validation.validate(f)}return true}],["validate-cc-type-select","Card type does not match credit card number.",function(d,e){var b=$(e.id.substr(0,e.id.indexOf("_cc_type"))+"_cc_number");if(Validation.isOnChange&&Validation.get("IsEmpty").test(b.value)){return true}if(Validation.get("validate-cc-type").test(b.value,b)){Validation.validate(b)}return Validation.get("validate-cc-type").test(b.value,b)}],["validate-cc-exp","Incorrect credit card expiration date.",function(b,l){var h=b;var g=$(l.id.substr(0,l.id.indexOf("_expiration"))+"_expiration_yr").value;var f=new Date();var e=f.getMonth()+1;var d=f.getFullYear();if(h<e&&g==d){return false}return true}],["validate-cc-cvn","Please enter a valid credit card verification number.",function(b,g){var f=$(g.id.substr(0,g.id.indexOf("_cc_cid"))+"_cc_type");if(!f){return true}var d=f.value;if(typeof Validation.creditCartTypes.get(d)=="undefined"){return false}var e=Validation.creditCartTypes.get(d)[1];if(b.match(e)){return true}return false}],["validate-ajax","",function(b,d){return true}],["validate-data","Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.",function(b){if(b!=""&&b){return/^[A-Za-z]+[A-Za-z0-9_]+$/.test(b)}return true}],["validate-css-length","Please input a valid CSS-length (Ex: 100px, 77pt, 20em, .5ex or 50%).",function(b){if(b!=""&&b){return/^[0-9\.]+(px|pt|em|ex|%)?$/.test(b)&&(!(/\..*\./.test(b)))&&!(/\.$/.test(b))}return true}],["validate-length","Text length does not meet the specified text range.",function(d,g){var e=new RegExp(/^maximum-length-[0-9]+$/);var f=new RegExp(/^minimum-length-[0-9]+$/);var b=true;$w(g.className).each(function(l,h){if(l.match(e)&&b){var n=l.split("-")[2];b=(d.length<=n)}if(l.match(f)&&b&&!Validation.get("IsEmpty").test(d)){var n=l.split("-")[2];b=(d.length>=n)}});return b}],["validate-percents","Please enter a number lower than 100.",{max:100}],["required-file","Please select a file.",function(d,e){var b=!Validation.get("IsEmpty").test(d);if(b===false){ovId=e.id+"_value";if($(ovId)){b=!Validation.get("IsEmpty").test($(ovId).value)}}return b}],["validate-cc-ukss","Please enter issue number or start date for switch/solo card type.",function(o,g){var b;if(g.id.match(/(.)+_cc_issue$/)){b=g.id.indexOf("_cc_issue")}else{if(g.id.match(/(.)+_start_month$/)){b=g.id.indexOf("_start_month")}else{b=g.id.indexOf("_start_year")}}var f=g.id.substr(0,b);var d=$(f+"_cc_type");if(!d){return true}var n=d.value;if(["SS","SM","SO"].indexOf(n)==-1){return true}$(f+"_cc_issue").advaiceContainer=$(f+"_start_month").advaiceContainer=$(f+"_start_year").advaiceContainer=$(f+"_cc_type_ss_div").down(".adv-container");var h=$(f+"_cc_issue").value;var l=$(f+"_start_month").value;var p=$(f+"_start_year").value;var e=(l&&p)?true:false;if(!e&&!h){return false}return true}]]);function removeDelimiters(b){b=b.replace(/\s/g,"");b=b.replace(/\-/g,"");return b}function parseNumber(b){if(typeof b!="string"){return parseFloat(b)}var e=b.indexOf(".");var d=b.indexOf(",");if(e!=-1&&d!=-1){if(d>e){b=b.replace(".","").replace(",",".")}else{b=b.replace(",","")}}else{if(d!=-1){b=b.replace(",",".")}}return parseFloat(b)}Validation.creditCartTypes=$H({SO:[new RegExp("^(6334[5-9]([0-9]{11}|[0-9]{13,14}))|(6767([0-9]{12}|[0-9]{14,15}))$"),new RegExp("^([0-9]{3}|[0-9]{4})?$"),true],SM:[new RegExp("(^(5[0678])[0-9]{11,18}$)|(^(6[^05])[0-9]{11,18}$)|(^(601)[^1][0-9]{9,16}$)|(^(6011)[0-9]{9,11}$)|(^(6011)[0-9]{13,16}$)|(^(65)[0-9]{11,13}$)|(^(65)[0-9]{15,18}$)|(^(49030)[2-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49033)[5-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49110)[1-2]([0-9]{10}$|[0-9]{12,13}$))|(^(49117)[4-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49118)[0-2]([0-9]{10}$|[0-9]{12,13}$))|(^(4936)([0-9]{12}$|[0-9]{14,15}$))"),new RegExp("^([0-9]{3}|[0-9]{4})?$"),true],VI:[new RegExp("^4[0-9]{12}([0-9]{3})?$"),new RegExp("^[0-9]{3}$"),true],MC:[new RegExp("^5[1-5][0-9]{14}$"),new RegExp("^[0-9]{3}$"),true],AE:[new RegExp("^3[47][0-9]{13}$"),new RegExp("^[0-9]{4}$"),true],DI:[new RegExp("^6(011|4[4-9][0-9]|5[0-9]{2})[0-9]{12}$"),new RegExp("^[0-9]{3}$"),true],JCB:[new RegExp("^(3[0-9]{15}|(2131|1800)[0-9]{11})$"),new RegExp("^[0-9]{3,4}$"),true],OT:[false,new RegExp("^([0-9]{3}|[0-9]{4})?$"),false]});function popWin(d,e,b){var e=window.open(d,e,b);e.focus()}function setLocation(b){window.location.href=b}function setPLocation(d,b){if(b){window.opener.focus()}window.opener.location.href=d}function setLanguageCode(e,f){var b=window.location.href;var h="",g;if(g=b.match(/\#(.*)$/)){b=b.replace(/\#(.*)$/,"");h=g[0]}if(b.match(/[?]/)){var d=/([?&]store=)[a-z0-9_]*/;if(b.match(d)){b=b.replace(d,"$1"+e)}else{b+="&store="+e}var d=/([?&]from_store=)[a-z0-9_]*/;if(b.match(d)){b=b.replace(d,"")}}else{b+="?store="+e}if(typeof f!="undefined"){b+="&from_store="+f}b+=h;setLocation(b)}function decorateGeneric(h,e){var l=["odd","even","first","last"];var d={};var g=h.length;if(g){if(typeof e=="undefined"){e=l}if(!e.length){return}for(var b in l){d[l[b]]=false}for(var b in e){d[e[b]]=true}if(d.first){Element.addClassName(h[0],"first")}if(d.last){Element.addClassName(h[g-1],"last")}for(var f=0;f<g;f++){if((f+1)%2==0){if(d.even){Element.addClassName(h[f],"even")}}else{if(d.odd){Element.addClassName(h[f],"odd")}}}}}function decorateTable(h,e){var h=$(h);if(h){var b={tbody:false,"tbody tr":["odd","even","first","last"],"thead tr":["first","last"],"tfoot tr":["first","last"],"tr td":["last"]};if(typeof e!="undefined"){for(var d in e){b[d]=e[d]}}if(b.tbody){decorateGeneric(h.select("tbody"),b.tbody)}if(b["tbody tr"]){decorateGeneric(h.select("tbody tr"),b["tbody tr"])}if(b["thead tr"]){decorateGeneric(h.select("thead tr"),b["thead tr"])}if(b["tfoot tr"]){decorateGeneric(h.select("tfoot tr"),b["tfoot tr"])}if(b["tr td"]){var g=h.select("tr");if(g.length){for(var f=0;f<g.length;f++){decorateGeneric(g[f].getElementsByTagName("TD"),b["tr td"])}}}}}function decorateList(e,d){if($(e)){if(typeof d=="undefined"){var b=$(e).select("li")}else{var b=$(e).childElements()}decorateGeneric(b,["odd","even","last"])}}function decorateDataList(b){b=$(b);if(b){decorateGeneric(b.select("dt"),["odd","even","last"]);decorateGeneric(b.select("dd"),["odd","even","last"])}}function parseSidUrl(f,e){var d=f.indexOf("/?SID=");var b="";e=e!=undefined?e:"";if(d>-1){b="?"+f.substring(d+2);f=f.substring(0,d+1)}return f+e+b}function formatCurrency(n,q,g){var l=isNaN(q.precision=Math.abs(q.precision))?2:q.precision;var v=isNaN(q.requiredPrecision=Math.abs(q.requiredPrecision))?2:q.requiredPrecision;l=v;var t=isNaN(q.integerRequired=Math.abs(q.integerRequired))?1:q.integerRequired;var p=q.decimalSymbol==undefined?",":q.decimalSymbol;var e=q.groupSymbol==undefined?".":q.groupSymbol;var d=q.groupLength==undefined?3:q.groupLength;var u="";if(g==undefined||g==true){u=n<0?"-":g?"+":""}else{if(g==false){u=""}}var h=parseInt(n=Math.abs(+n||0).toFixed(l))+"";var f=h.length<t?t-h.length:0;while(f){h="0"+h;f--}j=(j=h.length)>d?j%d:0;re=new RegExp("(\\d{"+d+"})(?=\\d)","g");var b=(j?h.substr(0,j)+e:"")+h.substr(j).replace(re,"$1"+e)+(l?p+Math.abs(n-h).toFixed(l).replace(/-/,0).slice(2):"");var o="";if(q.pattern.indexOf("{sign}")==-1){o=u+q.pattern}else{o=q.pattern.replace("{sign}",u)}return o.replace("%s",b).replace(/^\s\s*/,"").replace(/\s\s*$/,"")}function expandDetails(d,b){if(Element.hasClassName(d,"show-details")){$$(b).each(function(e){e.hide()});Element.removeClassName(d,"show-details")}else{$$(b).each(function(e){e.show()});Element.addClassName(d,"show-details")}}var isIE=navigator.appVersion.match(/MSIE/)=="MSIE";if(!window.Varien){var Varien=new Object()}Varien.showLoading=function(){var b=$("loading-process");b&&b.show()};Varien.hideLoading=function(){var b=$("loading-process");b&&b.hide()};Varien.GlobalHandlers={onCreate:function(){Varien.showLoading()},onComplete:function(){if(Ajax.activeRequestCount==0){Varien.hideLoading()}}};Ajax.Responders.register(Varien.GlobalHandlers);Varien.searchForm=Class.create();Varien.searchForm.prototype={initialize:function(d,e,b){this.form=$(d);this.field=$(e);this.emptyText=b;Event.observe(this.form,"submit",this.submit.bind(this));Event.observe(this.field,"focus",this.focus.bind(this));Event.observe(this.field,"blur",this.blur.bind(this));this.blur()},submit:function(b){if(this.field.value==this.emptyText||this.field.value==""){Event.stop(b);return false}return true},focus:function(b){if(this.field.value==this.emptyText){this.field.value=""}},blur:function(b){if(this.field.value==""){this.field.value=this.emptyText}}};Varien.DateElement=Class.create();Varien.DateElement.prototype={initialize:function(b,d,f,e){if(b=="id"){this.day=$(d+"day");this.month=$(d+"month");this.year=$(d+"year");this.full=$(d+"full");this.advice=$(d+"date-advice")}else{if(b=="container"){this.day=d.day;this.month=d.month;this.year=d.year;this.full=d.full;this.advice=d.advice}else{return}}this.required=f;this.format=e;this.day.addClassName("validate-custom");this.day.validate=this.validate.bind(this);this.month.addClassName("validate-custom");this.month.validate=this.validate.bind(this);this.year.addClassName("validate-custom");this.year.validate=this.validate.bind(this);this.setDateRange(false,false);this.year.setAttribute("autocomplete","off");this.advice.hide()},validate:function(){var l=false,o=parseInt(this.day.value,10)||0,f=parseInt(this.month.value,10)||0,h=parseInt(this.year.value,10)||0;if(this.day.value.strip().empty()&&this.month.value.strip().empty()&&this.year.value.strip().empty()){if(this.required){l="Please enter a date."}else{this.full.value=""}}else{if(!o||!f||!h){l="Please enter a valid full date."}else{var d=new Date,n=0,e=null;d.setYear(h);d.setMonth(f-1);d.setDate(32);n=32-d.getDate();if(!n||n>31){n=31}if(o<1||o>n){e="day";l="Please enter a valid day (1-%1)."}else{if(f<1||f>12){e="month";l="Please enter a valid month (1-12)."}else{if(o%10==o){this.day.value="0"+o}if(f%10==f){this.month.value="0"+f}this.full.value=this.format.replace(/%[mb]/i,this.month.value).replace(/%[de]/i,this.day.value).replace(/%y/i,this.year.value);var b=this.month.value+"/"+this.day.value+"/"+this.year.value;var g=new Date(b);if(isNaN(g)){l="Please enter a valid date."}else{this.setFullDate(g)}}}var p=false;if(!l&&!this.validateData()){e=this.validateDataErrorType;p=this.validateDataErrorText;l=p}}}if(l!==false){if(jQuery.mage.__){l=jQuery.mage.__(l)}if(!p){this.advice.innerHTML=l.replace("%1",n)}else{this.advice.innerHTML=this.errorTextModifier(l)}this.advice.show();return false}this.day.removeClassName("validation-failed");this.month.removeClassName("validation-failed");this.year.removeClassName("validation-failed");this.advice.hide();return true},validateData:function(){var d=this.fullDate.getFullYear();var b=new Date;this.curyear=b.getFullYear();return d>=1900&&d<=this.curyear},validateDataErrorType:"year",validateDataErrorText:"Please enter a valid year (1900-%1).",errorTextModifier:function(b){return b.replace("%1",this.curyear)},setDateRange:function(b,d){this.minDate=b;this.maxDate=d},setFullDate:function(b){this.fullDate=b}};Varien.DOB=Class.create();Varien.DOB.prototype={initialize:function(b,g,f){var e=$$(b)[0];var d={};d.day=Element.select(e,".dob-day input")[0];d.month=Element.select(e,".dob-month input")[0];d.year=Element.select(e,".dob-year input")[0];d.full=Element.select(e,".dob-full input")[0];d.advice=Element.select(e,".validation-advice")[0];new Varien.DateElement("container",d,g,f)}};Varien.dateRangeDate=Class.create();Varien.dateRangeDate.prototype=Object.extend(new Varien.DateElement(),{validateData:function(){var b=true;if(this.minDate||this.maxValue){if(this.minDate){this.minDate=new Date(this.minDate);this.minDate.setHours(0);if(isNaN(this.minDate)){this.minDate=new Date("1/1/1900")}b=b&&this.fullDate>=this.minDate}if(this.maxDate){this.maxDate=new Date(this.maxDate);this.minDate.setHours(0);if(isNaN(this.maxDate)){this.maxDate=new Date()}b=b&&this.fullDate<=this.maxDate}if(this.maxDate&&this.minDate){this.validateDataErrorText="Please enter a valid date between %s and %s"}else{if(this.maxDate){this.validateDataErrorText="Please enter a valid date less than or equal to %s"}else{if(this.minDate){this.validateDataErrorText="Please enter a valid date equal to or greater than %s"}else{this.validateDataErrorText=""}}}}return b},validateDataErrorText:"Date should be between %s and %s",errorTextModifier:function(b){if(this.minDate){b=b.sub("%s",this.dateFormat(this.minDate))}if(this.maxDate){b=b.sub("%s",this.dateFormat(this.maxDate))}return b},dateFormat:function(b){return b.getMonth()+1+"/"+b.getDate()+"/"+b.getFullYear()}});Varien.FileElement=Class.create();Varien.FileElement.prototype={initialize:function(b){this.fileElement=$(b);this.hiddenElement=$(b+"_value");this.fileElement.observe("change",this.selectFile.bind(this))},selectFile:function(b){this.hiddenElement.value=this.fileElement.getValue()}};Validation.addAllThese([["validate-custom"," ",function(b,d){return d.validate()}]]);Element.addMethods({getInnerText:function(b){b=$(b);if(b.innerText&&!Prototype.Browser.Opera){return b.innerText}return b.innerHTML.stripScripts().unescapeHTML().replace(/[\n\r\s]+/g," ").strip()}});function fireEvent(d,e){if(document.createEvent){var b=document.createEvent("HTMLEvents");b.initEvent(e,true,true);return d.dispatchEvent(b)}var b=document.createEventObject();return d.fireEvent("on"+e,b)}function modulo(b,f){var e=f/10000;var d=b%f;if(Math.abs(d-f)<e||Math.abs(d)<e){d=0}return d}if(typeof Range!="undefined"&&!Range.prototype.createContextualFragment){Range.prototype.createContextualFragment=function(b){var e=document.createDocumentFragment(),d=document.createElement("div");e.appendChild(d);d.outerHTML=b;return e}}var byteConvert=function(b){if(isNaN(b)){return""}var d=["bytes","KB","MB","GB","TB","PB","EB","ZB","YB"];var f=Math.floor(Math.log(b)/Math.log(2));if(f<1){f=0}var e=Math.floor(f/10);b/=Math.pow(2,10*e);if(b.toString().length>b.toFixed(2).toString().length){b=b.toFixed(2)}return b+" "+d[e]};var SessionError=Class.create();SessionError.prototype={initialize:function(b){this.errorText=b},toString:function(){return"Session Error:"+this.errorText}};Ajax.Request.addMethods({initialize:function($super,d,b){$super(b);this.transport=Ajax.getTransport();if(!d.match(new RegExp("[?&]isAjax=true",""))){d=d.match(new RegExp("\\?","g"))?d+"&isAjax=true":d+"?isAjax=true"}if(Object.isString(this.options.parameters)&&this.options.parameters.indexOf("form_key=")==-1){this.options.parameters+="&"+Object.toQueryString({form_key:FORM_KEY})}else{if(!this.options.parameters){this.options.parameters={form_key:FORM_KEY}}if(!this.options.parameters.form_key){this.options.parameters.form_key=FORM_KEY}}this.request(d)},respondToReadyState:function(b){var g=Ajax.Request.Events[b],d=new Ajax.Response(this);if(g=="Complete"){try{this._complete=true;if(d.responseText.isJSON()){var f=d.responseText.evalJSON();if(f.ajaxExpired&&f.ajaxRedirect){window.location.replace(f.ajaxRedirect);throw new SessionError("session expired")}}(this.options["on"+d.status]||this.options["on"+(this.success()?"Success":"Failure")]||Prototype.emptyFunction)(d,d.headerJSON)}catch(h){this.dispatchException(h);if(h instanceof SessionError){return}}var l=d.getHeader("Content-type");if(this.options.evalJS=="force"||this.options.evalJS&&this.isSameOrigin()&&l&&l.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)){this.evalResponse()}}try{(this.options["on"+g]||Prototype.emptyFunction)(d,d.headerJSON);Ajax.Responders.dispatch("on"+g,this,d,d.headerJSON)}catch(h){this.dispatchException(h)}if(g=="Complete"){this.transport.onreadystatechange=Prototype.emptyFunction}}});Ajax.Updater.respondToReadyState=Ajax.Request.respondToReadyState;var varienLoader=new Class.create();varienLoader.prototype={initialize:function(b){this.callback=false;this.cache=$H();this.caching=b||false;this.url=false},getCache:function(b){if(this.cache.get(b)){return this.cache.get(b)}return false},load:function(b,d,f){this.url=b;this.callback=f;if(this.caching){var e=this.getCache(b);if(e){this.processResult(e);return}}if(typeof d.updaterId!="undefined"){new varienUpdater(d.updaterId,b,{evalScripts:true,onComplete:this.processResult.bind(this),onFailure:this._processFailure.bind(this)})}else{new Ajax.Request(b,{method:"post",parameters:d||{},onComplete:this.processResult.bind(this),onFailure:this._processFailure.bind(this)})}},_processFailure:function(b){location.href=BASE_URL},processResult:function(b){if(this.caching){this.cache.set(this.url,b)}if(this.callback){this.callback(b.responseText)}}};if(!window.varienLoaderHandler){var varienLoaderHandler=new Object()}varienLoaderHandler.handler={onCreate:function(b){if(b.options.loaderArea===false){return}jQuery("body").trigger("processStart")},onException:function(b){jQuery("body").trigger("processStop")},onComplete:function(b){jQuery("body").trigger("processStop")}};function setLoaderPosition(){var e=$("loading_mask_loader");if(e&&Prototype.Browser.IE){var d=e.getDimensions();var f=document.viewport.getDimensions();var b=document.viewport.getScrollOffsets();e.style.left=Math.floor(f.width/2+b.left-d.width/2)+"px";e.style.top=Math.floor(f.height/2+b.top-d.height/2)+"px";e.style.position="absolute"}}function toggleSelectsUnderBlock(f,b){if(Prototype.Browser.IE){var e=document.getElementsByTagName("select");for(var d=0;d<e.length;d++){if(b){if(e[d].needShowOnSuccess){e[d].needShowOnSuccess=false;e[d].style.visibility=""}}else{if(Element.visible(e[d])){e[d].style.visibility="hidden";e[d].needShowOnSuccess=true}}}}}Ajax.Responders.register(varienLoaderHandler.handler);var varienUpdater=Class.create(Ajax.Updater,{updateContent:function($super,b){if(b.isJSON()){var d=b.evalJSON();if(d.ajaxExpired&&d.ajaxRedirect){window.location.replace(d.ajaxRedirect)}}else{$super(b)}}});function setLocation(b){window.location.href=b}function setElementDisable(d,b){if($(d)){$(d).disabled=b}}function toggleParentVis(b){b=$(b).parentNode;if(b.style.display=="none"){b.style.display=""}else{b.style.display="none"}}function toggleFieldsetVis(d){id=d;d=$(d);if(d.style.display=="none"){d.style.display=""}else{d.style.display="none"}d=d.parentNode.childElements();for(var b=0;b<d.length;b++){if(d[b].id!=undefined&&d[b].id==id&&d[b-1].classNames()=="entry-edit-head"){if(d[b-1].style.display=="none"){d[b-1].style.display=""}else{d[b-1].style.display="none"}}}}function toggleVis(b){b=$(b);if(b.style.display=="none"){b.style.display=""}else{b.style.display="none"}}function imagePreview(b){if($(b)){var d=window.open("","preview","width=400,height=400,resizable=1,scrollbars=1");d.document.open();d.document.write('<body style="padding:0;margin:0"><img src="'+$(b).src+'" id="image_preview"/></body>');d.document.close();Event.observe(d,"load",function(){var e=d.document.getElementById("image_preview");d.resizeTo(e.width+40,e.height+80)})}}function checkByProductPriceType(b){if(b.id=="price_type"){this.productPriceType=b.value;return false}if(b.id=="price"&&this.productPriceType==0){return false}return true}function toggleSeveralValueElements(f,e,b,d){if(e&&f){if(Object.prototype.toString.call(e)!="[object Array]"){e=[e]}e.each(function(g){toggleValueElements(f,g,b,d)})}}function toggleValueElements(l,d,f,h){if(d&&l){var n=[l];if(typeof f!="undefined"){if(Object.prototype.toString.call(f)!="[object Array]"){f=[f]}for(var g=0;g<f.length;g++){n.push(f[g])}}var e=Element.select(d,["select","input","textarea","button","img"]).filter(function(o){return o.readAttribute("type")!="hidden"});var b=h!=undefined?h:l.checked;e.each(function(p){if(checkByProductPriceType(p)){var o=n.length;while(o--&&p!=n[o]){}if(o!=-1){return}p.disabled=b;if(b){p.addClassName("disabled")}else{p.removeClassName("disabled")}if(p.nodeName.toLowerCase()=="img"){b?p.hide():p.show()}}})}}function submitAndReloadArea(e,d){if($(e)){var b=$(e).select("input","select","textarea");var f=Form.serializeElements(b,true);d+=d.match(new RegExp("\\?"))?"&isAjax=true":"?isAjax=true";new Ajax.Request(d,{parameters:$H(f),loaderArea:e,onSuccess:function(l){try{if(l.responseText.isJSON()){var g=l.responseText.evalJSON();if(g.error){alert(g.message)}if(g.ajaxExpired&&g.ajaxRedirect){setLocation(g.ajaxRedirect)}}else{$(e).update(l.responseText)}}catch(h){$(e).update(l.responseText)}}})}}function syncOnchangeValue(d,e){var b={baseElem:d,distElem:e};Event.observe(d,"change",function(){if($(this.baseElem)&&$(this.distElem)){$(this.distElem).value=$(this.baseElem).value}}.bind(b))}function updateElementAtCursor(e,f,g){if(g==undefined){g=window.self}if(document.selection){e.focus();sel=g.document.selection.createRange();sel.text=f}else{if(e.selectionStart||e.selectionStart=="0"){var d=e.selectionStart;var b=e.selectionEnd;e.value=e.value.substring(0,d)+f+e.value.substring(b,e.value.length)}else{e.value+=f}}}function firebugEnabled(){if(window.console&&window.console.firebug){return true}return false}function disableElement(b){b.disabled=true;b.addClassName("disabled")}function enableElement(b){b.disabled=false;b.removeClassName("disabled")}function disableElements(b){$$("."+b).each(disableElement)}function enableElements(b){$$("."+b).each(enableElement)}var Cookie={all:function(){var d=document.cookie.split(";");var b={};d.each(function(f,e){var g=f.strip().split("=");b[unescape(g[0])]=unescape(g[1])});return b},read:function(d){var b=this.all();if(b[d]){return b[d]}return null},write:function(h,f,g){var b="";if(g){var e=new Date();e.setTime(e.getTime()+g*1000);b="; expires="+e.toUTCString()}var d="/"+BASE_URL.split("/").slice(3).join("/");document.cookie=escape(h)+"="+escape(f)+b+"; path="+d},clear:function(b){this.write(b,"",-1)}};var Fieldset={cookiePrefix:"fh-",applyCollapse:function(b){if($(b+"-state")){collapsed=$(b+"-state").value==1?0:1}else{collapsed=$(b+"-head").collapsed}if(collapsed==1||collapsed===undefined){$(b+"-head").removeClassName("open");if($(b+"-head").up(".section-config")){$(b+"-head").up(".section-config").removeClassName("active")}$(b).hide()}else{$(b+"-head").addClassName("open");if($(b+"-head").up(".section-config")){$(b+"-head").up(".section-config").addClassName("active")}$(b).show()}},toggleCollapse:function(b,d){if($(b+"-state")){collapsed=$(b+"-state").value==1?0:1}else{collapsed=$(b+"-head").collapsed}if(collapsed==1||collapsed===undefined){if($(b+"-state")){$(b+"-state").value=1}$(b+"-head").collapsed=0}else{if($(b+"-state")){$(b+"-state").value=0}$(b+"-head").collapsed=1}this.applyCollapse(b);if(typeof d!="undefined"){this.saveState(d,{container:b,value:$(b+"-state").value})}},addToPrefix:function(b){this.cookiePrefix+=b+"-"},saveState:function(b,d){new Ajax.Request(b,{method:"get",parameters:Object.toQueryString(d),loaderArea:false})}};var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var b="";var p,n,h,o,l,g,f;var d=0;e=Base64._utf8_encode(e);if(typeof window.btoa==="function"){return window.btoa(e)}while(d<e.length){p=e.charCodeAt(d++);n=e.charCodeAt(d++);h=e.charCodeAt(d++);o=p>>2;l=(p&3)<<4|n>>4;g=(n&15)<<2|h>>6;f=h&63;if(isNaN(n)){g=f=64}else{if(isNaN(h)){f=64}}b=b+this._keyStr.charAt(o)+this._keyStr.charAt(l)+this._keyStr.charAt(g)+this._keyStr.charAt(f)}return b},decode:function(e){var b="";var p,n,h;var o,l,g,f;var d=0;if(typeof window.atob==="function"){return Base64._utf8_decode(window.atob(e))}e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(d<e.length){o=this._keyStr.indexOf(e.charAt(d++));l=this._keyStr.indexOf(e.charAt(d++));g=this._keyStr.indexOf(e.charAt(d++));f=this._keyStr.indexOf(e.charAt(d++));p=o<<2|l>>4;n=(l&15)<<4|g>>2;h=(g&3)<<6|f;b+=String.fromCharCode(p);if(g!=64){b+=String.fromCharCode(n)}if(f!=64){b+=String.fromCharCode(h)}}return Base64._utf8_decode(b)},mageEncode:function(b){return this.encode(b).replace(/\+/g,"-").replace(/\//g,"_").replace(/=/g,",")},mageDecode:function(b){b=b.replace(/\-/g,"+").replace(/_/g,"/").replace(/,/g,"=");return this.decode(b)},idEncode:function(b){return this.encode(b).replace(/\+/g,":").replace(/\//g,"_").replace(/=/g,"-")},idDecode:function(b){b=b.replace(/\-/g,"=").replace(/_/g,"/").replace(/\:/g,"+");return this.decode(b)},_utf8_encode:function(d){d=d.replace(/\r\n/g,"\n");var b="";for(var f=0;f<d.length;f++){var e=d.charCodeAt(f);if(e<128){b+=String.fromCharCode(e)}else{if(e>127&&e<2048){b+=String.fromCharCode(e>>6|192);b+=String.fromCharCode(e&63|128)}else{b+=String.fromCharCode(e>>12|224);b+=String.fromCharCode(e>>6&63|128);b+=String.fromCharCode(e&63|128)}}}return b},_utf8_decode:function(b){var d="";var e=0;var f=c1=c2=0;while(e<b.length){f=b.charCodeAt(e);if(f<128){d+=String.fromCharCode(f);e++}else{if(f>191&&f<224){c2=b.charCodeAt(e+1);d+=String.fromCharCode((f&31)<<6|c2&63);e+=2}else{c2=b.charCodeAt(e+1);c3=b.charCodeAt(e+2);d+=String.fromCharCode((f&15)<<12|(c2&63)<<6|c3&63);e+=3}}}return d}};function sortNumeric(d,b){return d-b}(function(){var globals=["Prototype","Abstract","Try","Class","PeriodicalExecuter","Template","$break","Enumerable","$A","$w","$H","Hash","$R","ObjectRange","Ajax","$","Form","Field","$F","Toggle","Insertion","$continue","Position","Windows","Dialog","array","WindowUtilities","Builder","Effect","validateCreditCard","Validator","Validation","removeDelimiters","parseNumber","popWin","setLocation","setPLocation","setLanguageCode","decorateGeneric","decorateTable","decorateList","decorateDataList","parseSidUrl","formatCurrency","expandDetails","isIE","Varien","fireEvent","modulo","byteConvert","SessionError","varienLoader","varienLoaderHandler","setLoaderPosition","toggleSelectsUnderBlock","varienUpdater","setElementDisable","toggleParentVis","toggleFieldsetVis","toggleVis","imagePreview","checkByProductPriceType","toggleSeveralValueElements","toggleValueElements","submitAndReloadArea","syncOnchangeValue","updateElementAtCursor","firebugEnabled","disableElement","enableElement","disableElements","enableElements","Cookie","Fieldset","Base64","sortNumeric","Element","$$","Sizzle","Selector","Window"];globals.forEach(function(prop){window[prop]=eval(prop)})})();
-\ No newline at end of file
-diff --git a/lib/web/mage/adminhtml/form.js b/lib/web/mage/adminhtml/form.js
-index b363109d806..487c71484e4 100644
---- a/lib/web/mage/adminhtml/form.js
-+++ b/lib/web/mage/adminhtml/form.js
-@@ -494,8 +494,7 @@ define([
-                     inputs.each(function (item) {
-                         // don't touch hidden inputs (and Use Default inputs too), bc they may have custom logic
-                         if ((!item.type || item.type != 'hidden') && !($(item.id + '_inherit') && $(item.id + '_inherit').checked) && //eslint-disable-line
--                            !(currentConfig['can_edit_price'] != undefined && !currentConfig['can_edit_price']) &&  //eslint-disable-line
--                            !item.id.endsWith('_inherit')
-+                            !(currentConfig['can_edit_price'] != undefined && !currentConfig['can_edit_price']) //eslint-disable-line
-                         ) {
-                             item.disabled = false;
-                             jQuery(item).removeClass('ignore-validate');
-diff --git a/lib/web/mage/adminhtml/globals.js b/lib/web/mage/adminhtml/globals.js
-index 12c97fdfcd2..683606e5764 100644
---- a/lib/web/mage/adminhtml/globals.js
-+++ b/lib/web/mage/adminhtml/globals.js
-@@ -12,7 +12,7 @@ define([
- 
-     /**
-      * Set of a temporary methods used to provide
--     * backward compatability with a legacy code.
-+     * backward compatibility with a legacy code.
-      */
-     window.setLocation = function (url) {
-         window.location.href = url;
-diff --git a/lib/web/mage/adminhtml/grid.js b/lib/web/mage/adminhtml/grid.js
-index c9af869d791..1c9319f95a6 100644
---- a/lib/web/mage/adminhtml/grid.js
-+++ b/lib/web/mage/adminhtml/grid.js
-@@ -368,6 +368,51 @@ define([
-             return url;
-         },
- 
-+        /**
-+         * Builds the form with fields containing the and submits
-+         *
-+         * @param {String} url
-+         * @param {String} varName
-+         * @param {String} varValue
-+         * @private
-+         */
-+        _buildFormAndSubmit: function (url, varName, varValue) {
-+            var re = new RegExp('\/(' + varName + '\/.*?\/)'),
-+                parts = url.split(new RegExp('\\?')),
-+                form = jQuery('<form/>'),
-+                inputProps = [
-+                    {
-+                        name: varName,
-+                        value: varValue
-+                    },
-+                    {
-+                        name: 'form_key',
-+                        value: window.FORM_KEY
-+                    }
-+                ],
-+                input;
-+
-+            url = parts[0].replace(re, '/');
-+
-+            if (parts.size() > 1) {
-+                url += '?' + parts[1];
-+            }
-+
-+            form.attr('action', url);
-+            form.attr('method', 'POST');
-+
-+            inputProps.forEach(function (item) {
-+                input = jQuery('<input/>');
-+                input.attr('name', item.name);
-+                input.attr('type', 'hidden');
-+                input.val(item.value);
-+                form.append(input);
-+            });
-+            jQuery('[data-container="body"]').append(form);
-+            form.submit();
-+            form.remove();
-+        },
-+
-         /**
-          * @param {*} varName
-          * @param {*} varValue
-@@ -389,13 +434,14 @@ define([
-                 exportUrl = $(this.containerId + '_export').value;
- 
-                 if (this.massaction && this.massaction.checkedString) {
--                    exportUrl = this._addVarToUrl(
-+                    this._buildFormAndSubmit(
-                         exportUrl,
-                         this.massaction.formFieldNameInternal,
-                         this.massaction.checkedString
-                     );
-+                } else {
-+                    location.href = exportUrl;
-                 }
--                location.href = exportUrl;
-             }
-         },
- 
-@@ -530,13 +576,20 @@ define([
- 
-         /**
-          * @param {Object} event
-+         * @param {*} lastId
-          */
--        inputPage: function (event) {
-+        inputPage: function (event, lastId) {
-             var element = Event.element(event),
--                keyCode = event.keyCode || event.which;
-+                keyCode = event.keyCode || event.which,
-+                enteredValue = parseInt(element.value, 10),
-+                pageId = parseInt(lastId, 10);
- 
-             if (keyCode == Event.KEY_RETURN) { //eslint-disable-line eqeqeq
--                this.setPage(element.value);
-+                if (enteredValue > pageId) {
-+                    this.setPage(pageId);
-+                } else {
-+                    this.setPage(enteredValue);
-+                }
-             }
- 
-             /*if(keyCode>47 && keyCode<58){
-diff --git a/lib/web/mage/adminhtml/tools.js b/lib/web/mage/adminhtml/tools.js
-index ed4bab7102a..27f6efcfc58 100644
---- a/lib/web/mage/adminhtml/tools.js
-+++ b/lib/web/mage/adminhtml/tools.js
-@@ -348,7 +348,7 @@ var Fieldset = {
-     },
-     saveState: function (url, parameters) {
-         new Ajax.Request(url, {
--            method: 'get',
-+            method: 'post',
-             parameters: Object.toQueryString(parameters),
-             loaderArea: false
-         });
-diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js
-index 48960ed3403..98ce6a005db 100644
---- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js
-+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js
-@@ -186,11 +186,19 @@ define([
-         });
- 
-         _.each(compiled, function (node, nodeName) {
--            var attributes  = node.attributes.join('|'),
--                children    = node.children.join('|');
-+            var filteredAttributes = [];
- 
--            validElements.push(nodeName + '[' + attributes + ']');
--            validChildren.push(nodeName + '[' + children + ']');
-+            _.each(node.attributes, function (attribute) { //eslint-disable-line max-nested-callbacks
-+                // Disallowing usage of 'on*' attributes.
-+                if (!/^on/.test(attribute)) {
-+                    filteredAttributes.push(attribute);
-+                }
-+            });
-+
-+            node.attributes = filteredAttributes;
-+
-+            validElements.push(nodeName + '[' + node.attributes.join('|') + ']');
-+            validChildren.push(nodeName + '[' + node.children.join('|') + ']');
-         });
- 
-         return {
-diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
-index e6f12a2e51a..96091e40996 100644
---- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
-+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
-@@ -9,7 +9,8 @@ define([
-     'Magento_Variable/js/config-directive-generator',
-     'Magento_Variable/js/custom-directive-generator',
-     'wysiwygAdapter',
--    'jquery'
-+    'jquery',
-+    'mage/adminhtml/tools'
- ], function (configDirectiveGenerator, customDirectiveGenerator, wysiwyg, jQuery) {
-     return function (config) {
-         tinymce.create('tinymce.plugins.magentovariable', {
-diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
-index 18d71aad207..cfcdef0b701 100644
---- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
-+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
-@@ -132,7 +132,7 @@ define([
-                         attributes.type = attributes.type.replace(/\\\\/g, '\\');
-                         imageSrc = config.placeholders[attributes.type];
- 
--                        if (config.types.indexOf(attributes['type_name']) > -1) {
-+                        if (imageSrc) {
-                             imageHtml += '<span class="magento-placeholder magento-widget mceNonEditable" ' +
-                                 'contenteditable="false">';
-                         } else {
-@@ -147,8 +147,8 @@ define([
-                         imageHtml += ' src="' + imageSrc + '"';
-                         imageHtml += ' />';
- 
--                        if (attributes['type_name']) {
--                            imageHtml += attributes['type_name'];
-+                        if (config.types[attributes.type]) {
-+                            imageHtml += config.types[attributes.type];
-                         }
- 
-                         imageHtml += '</span>';
-diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
-index 223c6d6ab04..06943b25de5 100644
---- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
-+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
-@@ -30,7 +30,7 @@ define([
- 
-             _.bindAll(this, 'openFileBrowser');
- 
--            config = Object.assign({}, baseConfig, config || {});
-+            config = _.extend({}, baseConfig, config || {});
-             this.wysiwygInstance = new WysiwygInstancePrototype(htmlId, config);
-             this.wysiwygInstance.eventBus = this.eventBus = new window.varienEvents();
-         },
-diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
-index 46a09b28c4a..2c00718d97e 100644
---- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
-+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
-@@ -40,7 +40,8 @@ define([
-                 'onChangeContent',
-                 'openFileBrowser',
-                 'updateTextArea',
--                'onUndo'
-+                'onUndo',
-+                'removeEvents'
-             );
- 
-             varienGlobalEvents.attachEventHandler('tinymceChange', this.onChangeContent);
-@@ -110,16 +111,30 @@ define([
-                     tinyMCE4.ui.FloatPanel.zIndex = settings.toolbarZIndex;
-                 }
- 
--                varienGlobalEvents.removeEventHandler('tinymceChange', this.onChangeContent);
-+                this.removeEvents(self.id);
-             }
- 
-             jQuery.when.apply(jQuery, deferreds).done(function () {
-                 tinyMCE4.init(settings);
-                 this.getPluginButtons().hide();
--                this.eventBus.attachEventHandler('open_browser_callback', this.openFileBrowser);
-+                this.eventBus.attachEventHandler('open_browser_callback', tinyMceEditors.get(self.id).openFileBrowser);
-             }.bind(this));
-         },
- 
-+        /**
-+         * Remove events from instance.
-+         *
-+         * @param {String} wysiwygId
-+         */
-+        removeEvents: function (wysiwygId) {
-+            var editor;
-+
-+            if (typeof tinyMceEditors !== 'undefined' && tinyMceEditors.get(wysiwygId)) {
-+                editor = tinyMceEditors.get(wysiwygId);
-+                varienGlobalEvents.removeEventHandler('tinymceChange', editor.onChangeContent);
-+            }
-+        },
-+
-         /**
-          * Add plugin to the toolbar if not added.
-          *
-@@ -335,7 +350,7 @@ define([
-          * @param {String} content
-          */
-         setContent: function (content) {
--            this.get(this.getId()).execCommand('mceSetContent', false, content);
-+            this.get(this.getId()).setContent(content);
-         },
- 
-         /**
-@@ -469,13 +484,22 @@ define([
-          * @return {Boolean}
-          */
-         toggle: function () {
-+            var content;
-+
-             if (!tinyMCE4.get(this.getId())) {
-                 this.turnOn();
- 
-                 return true;
-             }
-+
-+            content = this.get(this.getId()) ? this.get(this.getId()).getContent() : this.getTextArea().val();
-+
-             this.turnOff();
- 
-+            if (content.match(/{{.+?}}/g)) {
-+                this.getTextArea().val(content.replace(/&quot;/g, '"'));
-+            }
-+
-             return false;
-         },
- 
-@@ -544,10 +568,12 @@ define([
-             var selection = editor.selection,
-                 dom = editor.dom,
-                 rng = dom.createRng(),
-+                doc = editor.getDoc(),
-                 markerHtml,
-                 marker;
- 
--            if (!selection.getContent().length) {
-+            // Validate the range we're trying to fix is contained within the current editors document
-+            if (!selection.getContent().length && jQuery.contains(doc, selection.getRng().startContainer)) {
-                 markerHtml = '<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';
-                 selection.setContent(markerHtml);
-                 marker = dom.get('mce_marker');
-@@ -562,10 +588,10 @@ define([
-          * Update text area.
-          */
-         updateTextArea: function () {
--            var editor = tinyMCE4.get(this.getId()),
-+            var editor = this.get(this.getId()),
-                 content;
- 
--            if (!editor) {
-+            if (!editor || editor.id !== this.activeEditor().id) {
-                 return;
-             }
- 
-diff --git a/lib/web/mage/adminhtml/wysiwyg/widget.js b/lib/web/mage/adminhtml/wysiwyg/widget.js
-index 68206fdec62..aa38e2e1875 100644
---- a/lib/web/mage/adminhtml/wysiwyg/widget.js
-+++ b/lib/web/mage/adminhtml/wysiwyg/widget.js
-@@ -456,7 +456,7 @@ define([
-                     parameters: params,
-                     onComplete: function (transport) {
-                         try {
--                            editor = wysiwyg.activeEditor();
-+                            editor = wysiwyg.get(this.widgetTargetId);
- 
-                             widgetTools.onAjaxSuccess(transport);
-                             widgetTools.dialogWindow.modal('closeModal');
-@@ -469,7 +469,7 @@ define([
-                                     editor.selection.select(activeNode);
-                                     editor.selection.setContent(transport.responseText);
-                                 } else if (this.bMark) {
--                                    wysiwyg.activeEditor().selection.moveToBookmark(this.bMark);
-+                                    editor.selection.moveToBookmark(this.bMark);
-                                 }
-                             }
- 
-@@ -513,7 +513,7 @@ define([
-          * @return {null|wysiwyg.Editor|*}
-          */
-         getWysiwyg: function () {
--            return wysiwyg.activeEditor();
-+            return wysiwyg.get(this.widgetTargetId);
-         },
- 
-         /**
-diff --git a/lib/web/mage/backend/floating-header.js b/lib/web/mage/backend/floating-header.js
-index 06861277559..a6f76725948 100644
---- a/lib/web/mage/backend/floating-header.js
-+++ b/lib/web/mage/backend/floating-header.js
-@@ -48,6 +48,7 @@ define([
-             this.element.wrapInner($('<div/>', {
-                 'class': 'page-actions-inner', 'data-title': title
-             }));
-+            this.element.removeClass('floating-header');
-         },
- 
-         /**
-diff --git a/lib/web/mage/backend/validation.js b/lib/web/mage/backend/validation.js
-index d3ab7dd086a..1043f45a740 100644
---- a/lib/web/mage/backend/validation.js
-+++ b/lib/web/mage/backend/validation.js
-@@ -171,6 +171,7 @@
-                 this._submit();
-             } else {
-                 this._showErrors(response);
-+                $(this.element[0]).trigger('afterValidate.error');
-                 $('body').trigger('processStop');
-             }
-         },
-@@ -223,6 +224,7 @@
-          * @protected
-          */
-         _onError: function () {
-+            $(this.element[0]).trigger('afterValidate.error');
-             $('body').trigger('processStop');
- 
-             if (this.options.errorUrl) {
-diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
-index ac154b33380..a9ccf2cf787 100644
---- a/lib/web/mage/calendar.js
-+++ b/lib/web/mage/calendar.js
-@@ -66,6 +66,9 @@
-      * Widget calendar
-      */
-     $.widget('mage.calendar', {
-+        options: {
-+            autoComplete: true
-+        },
- 
-         /**
-          * Merge global options with options passed to widget invoke
-@@ -379,6 +382,9 @@
-                 .addClass('v-middle')
-                 .text('') // Remove jQuery UI datepicker generated image
-                 .append('<span>' + pickerButtonText + '</span>');
-+
-+            $(element).attr('autocomplete', this.options.autoComplete ? 'on' : 'off');
-+
-             this._setCurrentDate(element);
-         },
- 
-diff --git a/lib/web/mage/collapsible.js b/lib/web/mage/collapsible.js
-index 245c4a38a6a..cae6ee01b0d 100644
---- a/lib/web/mage/collapsible.js
-+++ b/lib/web/mage/collapsible.js
-@@ -63,6 +63,12 @@ define([
-                 this.icons = true;
-             }
- 
-+            this.element.on('dimensionsChanged', function (e) {
-+                if (e.target && e.target.classList.contains('active')) {
-+                    this._scrollToTopIfVisible(e.target);
-+                }
-+            }.bind(this));
-+
-             this._bind('click');
-             this._trigger('created');
-         },
-@@ -442,17 +448,20 @@ define([
- 
-         /**
-          * Activate.
-+         *
-+         * @return void;
-          */
-         activate: function () {
--            if (!this.options.disabled) {
--                if (this.options.animate) {
--                    this._animate(showProps);
--                } else {
--                    this._scrollToTopIfVisible(this.content.get(0).parentElement);
--                    this.content.show();
--                }
--                this._open();
-+            if (this.options.disabled) {
-+                return;
-+            }
-+
-+            if (this.options.animate) {
-+                this._animate(showProps);
-+            } else {
-+                this.content.show();
-             }
-+            this._open();
-         },
- 
-         /**
-@@ -561,7 +570,7 @@ define([
-          * @private
-          */
-         _scrollToTopIfVisible: function (elem) {
--            if (this._isElementOutOfViewport(elem)) {
-+            if (!this._isElementOutOfViewport(elem)) {
-                 elem.scrollIntoView();
-             }
-         },
-diff --git a/lib/web/mage/common.js b/lib/web/mage/common.js
-index 4742c77ea86..53f5b748721 100644
---- a/lib/web/mage/common.js
-+++ b/lib/web/mage/common.js
-@@ -18,10 +18,21 @@ define([
-         'form',
-         function (e) {
-             var formKeyElement,
-+                existingFormKeyElement,
-+                isKeyPresentInForm,
-                 form = $(e.target),
-                 formKey = $('input[name="form_key"]').val();
- 
--            if (formKey && !form.find('input[name="form_key"]').length) {
-+            existingFormKeyElement = form.find('input[name="form_key"]');
-+            isKeyPresentInForm = existingFormKeyElement.length;
-+
-+            /* Verifies that existing auto-added form key is a direct form child element,
-+               protection from a case when one form contains another form. */
-+            if (isKeyPresentInForm && existingFormKeyElement.attr('auto-added-form-key') === '1') {
-+                isKeyPresentInForm = form.find('> input[name="form_key"]').length;
-+            }
-+
-+            if (formKey && !isKeyPresentInForm && form[0].method !== 'get') {
-                 formKeyElement = document.createElement('input');
-                 formKeyElement.setAttribute('type', 'hidden');
-                 formKeyElement.setAttribute('name', 'form_key');
-diff --git a/lib/web/mage/dataPost.js b/lib/web/mage/dataPost.js
-index 5d052f12db8..cc56ee266e0 100644
---- a/lib/web/mage/dataPost.js
-+++ b/lib/web/mage/dataPost.js
-@@ -57,7 +57,7 @@ define([
-          */
-         postData: function (params) {
-             var formKey = $(this.options.formKeyInputSelector).val(),
--                $form;
-+                $form, input;
- 
-             if (formKey) {
-                 params.data['form_key'] = formKey;
-@@ -67,6 +67,19 @@ define([
-                 data: params
-             }));
- 
-+            if (params.files) {
-+                $form[0].enctype = 'multipart/form-data';
-+                $.each(params.files, function (key, files) {
-+                    if (files instanceof FileList) {
-+                        input = document.createElement('input');
-+                        input.type = 'file';
-+                        input.name = key;
-+                        input.files = files;
-+                        $form[0].appendChild(input);
-+                    }
-+                });
-+            }
-+
-             if (params.data.confirmation) {
-                 uiConfirm({
-                     content: params.data.confirmationMessage,
-diff --git a/lib/web/mage/gallery/gallery.js b/lib/web/mage/gallery/gallery.js
-index db98a1cc39a..be78856b21f 100644
---- a/lib/web/mage/gallery/gallery.js
-+++ b/lib/web/mage/gallery/gallery.js
-@@ -141,7 +141,7 @@ define([
-             this.setupBreakpoints();
-             this.initFullscreenSettings();
- 
--            this.settings.$element.on('mouseup', '.fotorama__stage__frame', function () {
-+            this.settings.$element.on('click', '.fotorama__stage__frame', function () {
-                 if (
-                     !$(this).parents('.fotorama__shadows--left, .fotorama__shadows--right').length &&
-                     !$(this).hasClass('fotorama-video-container')
-@@ -472,8 +472,18 @@ define([
-                      * @param {Array.<Object>} data - Set of gallery items to update.
-                      */
-                     updateData: function (data) {
-+                        var mainImageIndex;
-+
-                         if (_.isArray(data)) {
-                             settings.fotoramaApi.load(data);
-+                            mainImageIndex = getMainImageIndex(data);
-+
-+                            if (mainImageIndex) {
-+                                settings.fotoramaApi.show({
-+                                    index: mainImageIndex,
-+                                    time: 0
-+                                });
-+                            }
- 
-                             $.extend(false, settings, {
-                                 data: data,
-diff --git a/lib/web/mage/gallery/gallery.less b/lib/web/mage/gallery/gallery.less
-index 3c35a772253..2c3476732ca 100644
---- a/lib/web/mage/gallery/gallery.less
-+++ b/lib/web/mage/gallery/gallery.less
-@@ -181,8 +181,8 @@
- 
- .fotorama__active {
-     .fotorama__dot {
--        background-color: @color-orange-red1;
--        border-color: @color-orange-red1;
-+        background-color: @active__color;
-+        border-color: @active__color;
-     }
- }
- 
-@@ -237,7 +237,7 @@
-     &:extend(.fotorama-print-background);
-     backface-visibility: hidden;
-     background-image: linear-gradient(to bottom right, rgba(255, 255, 255, 0.25), rgba(64, 64, 64, 0.1));
--    border: 1px solid @color-orange-red1;
-+    border: 1px solid @active__color;
-     left: 0;
-     position: absolute;
-     top: 0;
-@@ -764,6 +764,7 @@
-         max-width: inherit;
-         position: absolute;
-         top: 0;
-+        object-fit: scale-down;
-     }
- }
- 
-@@ -976,12 +977,9 @@
- 
- // While first time init
- .gallery-placeholder {
--    .loading-mask {
--        padding: 0 0 50%;
--        position: static;
--    }
--    .loader img {
--        position: absolute;
-+    &__image {
-+        display: block;
-+        margin: auto;
-     }
- }
- 
-@@ -1002,6 +1000,7 @@
-         display: block;
-     }
- }
-+
- .fotorama__product-video--loaded {
-     .fotorama__img, .fotorama__img--full {
-         display: none !important;
-diff --git a/lib/web/mage/gallery/module/_extends.less b/lib/web/mage/gallery/module/_extends.less
-index cfcec776034..ab38cf40f63 100644
---- a/lib/web/mage/gallery/module/_extends.less
-+++ b/lib/web/mage/gallery/module/_extends.less
-@@ -42,7 +42,7 @@
- .fotorama-focus-overlay {
-     &:after {
-         &:extend(.fotorama-stretch);
--        background-color: @color-blue2;
-+        background-color: @theme__color__primary-alt;
-         border-radius: inherit;
-         content: '';
-     }
-diff --git a/lib/web/mage/menu.js b/lib/web/mage/menu.js
-index 86d98181724..4853ba221c2 100644
---- a/lib/web/mage/menu.js
-+++ b/lib/web/mage/menu.js
-@@ -21,8 +21,8 @@ define([
-             expanded: false,
-             showDelay: 42,
-             hideDelay: 300,
--            delay: 300,
--            mediaBreakpoint: '(max-width: 768px)'
-+            delay: 0,
-+            mediaBreakpoint: '(max-width: 767px)'
-         },
- 
-         /**
-@@ -85,12 +85,10 @@ define([
-             var controls = this.controls,
-                 toggle = this.toggle;
- 
--            this._on(controls.toggleBtn, {
--                'click': toggle
--            });
--            this._on(controls.swipeArea, {
--                'swipeleft': toggle
--            });
-+            controls.toggleBtn.off('click');
-+            controls.toggleBtn.on('click', toggle.bind(this));
-+            controls.swipeArea.off('swipeleft');
-+            controls.swipeArea.on('swipeleft', toggle.bind(this));
-         },
- 
-         /**
-@@ -441,6 +439,7 @@ define([
- 
-                     event.preventDefault();
-                     target = $(event.target).closest('.ui-menu-item');
-+                    target.get(0).scrollIntoView();
- 
-                     if (!target.hasClass('level-top') || !target.has('.ui-menu').length) {
-                         window.location.href = target.find('> a').attr('href');
-@@ -463,7 +462,7 @@ define([
- 
-                 this.categoryLink = $('<a>')
-                     .attr('href', categoryUrl)
--                    .text($.mage.__('All ') + category);
-+                    .text($.mage.__('All %1').replace('%1', category));
- 
-                 this.categoryParent = $('<li>')
-                     .addClass('ui-menu-item all-category')
-diff --git a/lib/web/mage/requirejs/resolver.js b/lib/web/mage/requirejs/resolver.js
-index 6927a3205d9..5ba1f1351bc 100644
---- a/lib/web/mage/requirejs/resolver.js
-+++ b/lib/web/mage/requirejs/resolver.js
-@@ -28,13 +28,13 @@ define([
-     }
- 
-     /**
--     * Checks if provided module is registered after load.
-+     * Checks if provided module is rejected during load.
-      *
-      * @param {Object} module - Module to be checked.
-      * @return {Boolean}
-      */
--    function isRegistered(module) {
--        return registry[module.id];
-+    function isRejected(module) {
-+        return registry[module.id] && (registry[module.id].inited || registry[module.id].error);
-     }
- 
-     /**
-@@ -48,7 +48,7 @@ define([
-             return false;
-         }
- 
--        return module.depCount > _.filter(module.depMaps, isRegistered).length;
-+        return module.depCount > _.filter(module.depMaps, isRejected).length;
-     }
- 
-     /**
-diff --git a/lib/web/mage/tabs.js b/lib/web/mage/tabs.js
-index e7e04a26b29..65c452d33bf 100644
---- a/lib/web/mage/tabs.js
-+++ b/lib/web/mage/tabs.js
-@@ -72,7 +72,7 @@ define([
- 
-             if (anchor && isValid) {
-                 $.each(self.contents, function (i) {
--                    if ($(this).attr('id') === anchorId) {
-+                    if ($(this).attr('id') === anchorId || $(this).find('#' + anchorId).length) {
-                         self.collapsibles.not(self.collapsibles.eq(i)).collapsible('forceDeactivate');
- 
-                         return false;
-@@ -83,7 +83,7 @@ define([
- 
-         /**
-          * When the widget gets instantiated, the first tab that is not disabled receive focusable property
--         * Updated: for accessibility all tabs receive tabIndex 0
-+         * All tabs receive tabIndex 0
-          * @private
-          */
-         _processTabIndex: function () {
-@@ -91,17 +91,8 @@ define([
- 
-             self.triggers.attr('tabIndex', 0);
-             $.each(this.collapsibles, function (i) {
--                if (!$(this).collapsible('option', 'disabled')) {
--                    self.triggers.eq(i).attr('tabIndex', 0);
--
--                    return false;
--                }
--            });
--            $.each(this.collapsibles, function (i) {
--                $(this).on('beforeOpen', function () {
--                    self.triggers.attr('tabIndex', 0);
--                    self.triggers.eq(i).attr('tabIndex', 0);
--                });
-+                self.triggers.attr('tabIndex', 0);
-+                self.triggers.eq(i).attr('tabIndex', 0);
-             });
-         },
- 
-diff --git a/lib/web/mage/translate-init.js b/lib/web/mage/translate-init.js
-deleted file mode 100644
-index 1b9defad5e3..00000000000
---- a/lib/web/mage/translate-init.js
-+++ /dev/null
-@@ -1,49 +0,0 @@
--/**
-- * Copyright © Magento, Inc. All rights reserved.
-- * See COPYING.txt for license details.
-- */
--
--define([
--    'jquery',
--    'mage/translate',
--    'jquery/jquery-storageapi'
--], function ($) {
--    'use strict';
--
--    return function (pageOptions) {
--        var dependencies = [],
--            versionObj;
--
--        $.initNamespaceStorage('mage-translation-storage');
--        $.initNamespaceStorage('mage-translation-file-version');
--        versionObj = $.localStorage.get('mage-translation-file-version');
--
--        if (versionObj.version !== pageOptions.version) {
--            dependencies.push(
--              pageOptions.dictionaryFile
--            );
--        }
--
--        require.config({
--            deps: dependencies,
--
--            /**
--             * @param {String} string
--             */
--            callback: function (string) {
--                if (typeof string === 'string') {
--                    $.mage.translate.add(JSON.parse(string));
--                    $.localStorage.set('mage-translation-storage', string);
--                    $.localStorage.set(
--                        'mage-translation-file-version',
--                        {
--                            version: pageOptions.version
--                        }
--                    );
--                } else {
--                    $.mage.translate.add($.localStorage.get('mage-translation-storage'));
--                }
--            }
--        });
--    };
--});
-diff --git a/lib/web/mage/translate-inline.js b/lib/web/mage/translate-inline.js
-index bc3a190a9f7..141af6e141c 100644
---- a/lib/web/mage/translate-inline.js
-+++ b/lib/web/mage/translate-inline.js
-@@ -200,32 +200,5 @@
-         }
-     });
- 
--    $.widget('ui.button', $.ui.button, {
--        /**
--         * @private
--         */
--        _create: function () {
--            this._super();
--            // Decode HTML entities to prevent incorrect rendering of dialog button label
--            this.options.label = this.options.label ?
--                jQuery('<div/>').html(this.options.label).text() : this.options.label;
--            //Reset button to make decoded label visible
--            this._resetButton();
--        }
--    });
--
--    $.widget('ui.dialog', $.ui.dialog, {
--        /**
--         * Prevent rendering of dialog title as escaped HTML
--         */
--        _title: function (title) {
--            this._super(title);
--
--            if (this.options.title) {
--                title.html(this.options.title);
--            }
--        }
--    });
--
-     return $.mage.translateInline;
- }));
-diff --git a/lib/web/mage/trim-input.js b/lib/web/mage/trim-input.js
-index 678192dcf61..d077dad8dc3 100644
---- a/lib/web/mage/trim-input.js
-+++ b/lib/web/mage/trim-input.js
-@@ -41,9 +41,20 @@ define([
-          * @private
-          */
-         _trimInput: function () {
--            var input = this._getInputValue().trim();
-+            // Safari caret position workaround: storing carter position
-+            var caretStart, caretEnd, input;
-+
-+            caretStart = this.options.cache.input.get(0).selectionStart;
-+            caretEnd = this.options.cache.input.get(0).selectionEnd;
-+
-+            input = this._getInputValue().trim();
- 
-             this.options.cache.input.val(input);
-+
-+            // Safari caret position workaround: setting caret position to previously stored values
-+            if (caretStart !== null && caretEnd !== null) {
-+                this.options.cache.input.get(0).setSelectionRange(caretStart, caretEnd);
-+            }
-         },
- 
-         /**
-diff --git a/lib/web/mage/utils/compare.js b/lib/web/mage/utils/compare.js
-index e620677f017..bfc2027d6fb 100644
---- a/lib/web/mage/utils/compare.js
-+++ b/lib/web/mage/utils/compare.js
-@@ -43,7 +43,7 @@ define([
-             }
- 
-             return array.every(function (value, index) {
--                return target.indexOf(value) === index;
-+                return target[index] === value;
-             });
-         });
-     }
-diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
-index d08819ebe94..a7a5ade2ae9 100644
---- a/lib/web/mage/validation.js
-+++ b/lib/web/mage/validation.js
-@@ -204,6 +204,21 @@
-         return empty === 0;
-     }
- 
-+    /**
-+     *
-+     * @param {float} qty
-+     * @param {float} qtyIncrements
-+     * @returns {float}
-+     */
-+    function resolveModulo(qty, qtyIncrements) {
-+        while (qtyIncrements < 1) {
-+            qty *= 10;
-+            qtyIncrements *= 10;
-+        }
-+
-+        return qty % qtyIncrements;
-+    }
-+
-     /**
-      * Collection of validation rules including rules from additional-methods.js
-      * @type {Object}
-@@ -211,7 +226,7 @@
-     rules = {
-         'max-words': [
-             function (value, element, params) {
--                return this.optional(element) || $.mage.stripHtml(value).match(/\b\w+\b/g).length < params;
-+                return this.optional(element) || $.mage.stripHtml(value).match(/\b\w+\b/g).length <= params;
-             },
-             $.mage.__('Please enter {0} words or less.')
-         ],
-@@ -253,6 +268,12 @@
-             },
-             $.mage.__('No white space please')
-         ],
-+        'no-marginal-whitespace': [
-+            function (value, element) {
-+                return this.optional(element) || !/^\s+|\s+$/i.test(value);
-+            },
-+            $.mage.__('No marginal white space please')
-+        ],
-         'zip-range': [
-             function (value, element) {
-                 return this.optional(element) || /^90[2-5]-\d{2}-\d{4}$/.test(value);
-@@ -364,7 +385,7 @@
-         ],
-         'time12h': [
-             function (value, element) {
--                return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\ [AP]M))$/i.test(value);
-+                return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\s[AP]M))$/i.test(value);
-             },
-             $.mage.__('Please enter a valid time, between 00:00 am and 12:00 pm')
-         ],
-@@ -881,6 +902,27 @@
-             },
-             $.mage.__('Please enter a valid number in this field.')
-         ],
-+        'validate-forbidden-extensions': [
-+            function (v, elem) {
-+                var forbiddenExtensions = $(elem).attr('data-validation-params'),
-+                    forbiddenExtensionsArray = forbiddenExtensions.split(','),
-+                    extensionsArray = v.split(','),
-+                    result = true;
-+
-+                this.validateExtensionsMessage = $.mage.__('Forbidden extensions has been used. Avoid usage of ') +
-+                    forbiddenExtensions;
-+
-+                $.each(extensionsArray, function (key, extension) {
-+                    if (forbiddenExtensionsArray.indexOf(extension) !== -1) {
-+                        result = false;
-+                    }
-+                });
-+
-+                return result;
-+            }, function () {
-+                return this.validateExtensionsMessage;
-+            }
-+        ],
-         'validate-digits-range': [
-             function (v, elm, param) {
-                 var numValue, dataAttrRange, classNameRange, result, range, m, classes, ii;
-@@ -963,8 +1005,8 @@
-                         minValidRange = $.mage.parseNumber(validRange[1]);
-                         maxValidRange = $.mage.parseNumber(validRange[2]);
-                         result = result &&
--                        (isNaN(minValidRange) || minValue >= minValidRange) &&
--                        (isNaN(maxValidRange) || maxValue <= maxValidRange);
-+                            (isNaN(minValidRange) || minValue >= minValidRange) &&
-+                            (isNaN(maxValidRange) || maxValue <= maxValidRange);
-                     }
-                 }
- 
-@@ -980,9 +1022,9 @@
-         ],
-         'validate-code': [
-             function (v) {
--                return $.mage.isEmptyNoTrim(v) || /^[a-z]+[a-z0-9_]+$/.test(v);
-+                return $.mage.isEmptyNoTrim(v) || /^[a-zA-Z]+[a-zA-Z0-9_]+$/.test(v);
-             },
--            $.mage.__('Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.') //eslint-disable-line max-len
-+            $.mage.__('Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.') //eslint-disable-line max-len
-         ],
-         'validate-alphanum': [
-             function (v) {
-@@ -1088,8 +1130,8 @@
-                     options = p.find('input');
- 
-                 return options.map(function (el) {
--                        return $(el).val();
--                    }).length > 0;
-+                    return $(el).val();
-+                }).length > 0;
-             },
-             $.mage.__('Please select one of the options above.')
-         ],
-@@ -1105,10 +1147,10 @@
-                     ovId;
- 
-                 if (!result) {
--                    ovId = $(elm).attr('id') + '_value';
-+                    ovId = $('#' + $(elm).attr('id') + '_value');
- 
--                    if ($(ovId)) {
--                        result = !$.mage.isEmptyNoTrim($(ovId).val());
-+                    if (ovId.length > 0) {
-+                        result = !$.mage.isEmptyNoTrim(ovId.val());
-                     }
-                 }
- 
-@@ -1404,10 +1446,14 @@
-         ],
-         'validate-per-page-value-list': [
-             function (v) {
--                var isValid = !$.mage.isEmpty(v),
-+                var isValid = true,
-                     values = v.split(','),
-                     i;
- 
-+                if ($.mage.isEmpty(v)) {
-+                    return isValid;
-+                }
-+
-                 for (i = 0; i < values.length; i++) {
-                     if (!/^[0-9]+$/.test(values[i])) {
-                         isValid = false;
-@@ -1562,15 +1608,15 @@
-         ],
-         'required-text-swatch-entry': [
-             tableSingleValidation,
--            $.mage.__('Admin is a required field in the each row.')
-+            $.mage.__('Admin is a required field in each row.')
-         ],
-         'required-visual-swatch-entry': [
-             tableSingleValidation,
--            $.mage.__('Admin is a required field in the each row.')
-+            $.mage.__('Admin is a required field in each row.')
-         ],
-         'required-dropdown-attribute-entry': [
-             tableSingleValidation,
--            $.mage.__('Admin is a required field in the each row.')
-+            $.mage.__('Admin is a required field in each row.')
-         ],
-         'validate-item-quantity': [
-             function (value, element, params) {
-@@ -1583,7 +1629,7 @@
-                     isMaxAllowedValid = typeof params.maxAllowed === 'undefined' ||
-                         qty <= $.mage.parseNumber(params.maxAllowed),
-                     isQtyIncrementsValid = typeof params.qtyIncrements === 'undefined' ||
--                        qty % $.mage.parseNumber(params.qtyIncrements) === 0;
-+                        resolveModulo(qty, $.mage.parseNumber(params.qtyIncrements)) === 0.0;
- 
-                 result = qty > 0;
- 
-@@ -1750,7 +1796,8 @@
-             valid = true,
-             validateConfig = {
-                 errorElement: 'label',
--                ignore: '.ignore-validate'
-+                ignore: '.ignore-validate',
-+                hideError: false
-             },
-             form, validator, classes, elementValue;
- 
-@@ -1788,7 +1835,10 @@
-                 valid = false;
-                 errors[element.get(0).name] = this.messages[className];
-                 validator.invalid[element.get(0).name] = true;
--                validator.showErrors(errors);
-+
-+                if (!validateConfig.hideError) {
-+                    validator.showErrors(errors);
-+                }
- 
-                 return valid;
-             }
-@@ -1838,6 +1888,10 @@
-                 if (element.siblings('.tooltip').length) {
-                     errorPlacement = element.siblings('.tooltip');
-                 }
-+                //logic for select with tooltip in after element
-+                if (element.next().find('.tooltip').length) {
-+                    errorPlacement = element.next();
-+                }
-                 errorPlacement.after(error);
-             }
-         },
-@@ -1871,6 +1925,7 @@
-          * @protected
-          */
-         _create: function () {
-+            this._prepareArrayInputs();
-             this.validate = this.element.validate(this.options);
- 
-             // ARIA (adding aria-required attribute)
-@@ -1883,8 +1938,53 @@
-             this._listenFormValidate();
-         },
- 
-+        /**
-+         * Validation creation.
-+         *
-+         * @protected
-+         */
-+        _prepareArrayInputs: function () {
-+            /* Store original names for array inputs */
-+            var originalElements = [],
-+                originalSubmitHandler = this.options.submitHandler;
-+
-+            /* For all array inputs, assign index so that validation is proper */
-+            this.element.find('[name$="[]"]').each(function (key, input) {
-+                var originalName, name;
-+
-+                input = $(input);
-+                originalName = input.attr('name');
-+                name = originalName.replace('[]', '[' + key + ']');
-+                $(input).attr('name', name);
-+                $(input).attr('orig-name', originalName);
-+                originalElements.push({
-+                    element: $(input),
-+                    name: originalName
-+                });
-+            });
-+
-+            if (originalElements.length) {
-+                /**
-+                 *  Before submitting the actual form, remove the previously assigned indices
-+                 *  @param {Object} form
-+                 */
-+                this.options.submitHandler = function (form) {
-+                    originalElements.forEach(function (element) {
-+                        element.element.attr('name', element.name);
-+                        element.element.removeAttr('orig-name');
-+                    });
-+
-+                    console.error(this.submit);
-+
-+                    /* Call the originalSubmitHandler if it's a function */
-+                    typeof originalSubmitHandler === 'function' ? originalSubmitHandler(form) : form.submit();
-+                };
-+            }
-+        },
-+
-         /**
-          * Validation listening.
-+         *
-          * @protected
-          */
-         _listenFormValidate: function () {
-@@ -1897,15 +1997,15 @@
-          * @param {jQuery.Event} event
-          * @param {Object} validation
-          */
--        listenFormValidateHandler:  function (event, validation) {
-+        listenFormValidateHandler: function (event, validation) {
-             var firstActive = $(validation.errorList[0].element || []),
-                 lastActive = $(validation.findLastActive() ||
-                     validation.errorList.length && validation.errorList[0].element || []),
--                parent, windowHeight, successList;
-+                windowHeight = $(window).height(),
-+                parent, successList;
- 
-             if (lastActive.is(':hidden')) {
-                 parent = lastActive.parent();
--                windowHeight = $(window).height();
-                 $('html, body').animate({
-                     scrollTop: parent.offset().top - windowHeight / 2
-                 });
-@@ -1923,6 +2023,9 @@
-             }
- 
-             if (firstActive.length) {
-+                $('body').stop().animate({
-+                    scrollTop: firstActive.offset().top - windowHeight / 2
-+                });
-                 firstActive.focus();
-             }
-         }
-diff --git a/lib/web/mage/validation/validation.js b/lib/web/mage/validation/validation.js
-index f3b36fa153c..69cb984b0d8 100644
---- a/lib/web/mage/validation/validation.js
-+++ b/lib/web/mage/validation/validation.js
-@@ -49,10 +49,17 @@
-         'validate-one-checkbox-required-by-name': [
-             function (value, element, params) {
-                 var checkedCount = 0,
--                    container;
-+                    selector,
-+                    container,
-+                    origNameSelector,
-+                    nameSelector;
- 
-                 if (element.type === 'checkbox') {
--                    $('[name="' + element.name + '"]').each(function () {
-+                    /* If orig-name attribute is present, use it for validation. Else use name */
-+                    origNameSelector = '[orig-name="' + element.getAttribute('orig-name') + '"]';
-+                    nameSelector = '[name="' + element.name + '"]';
-+                    selector = element.getAttribute('orig-name') ? origNameSelector : nameSelector;
-+                    $(selector).each(function () {
-                         if ($(this).is(':checked')) {
-                             checkedCount += 1;
- 
-diff --git a/lib/web/magnifier/magnifier.js b/lib/web/magnifier/magnifier.js
-index 150c8adf0b2..06e41377ae3 100644
---- a/lib/web/magnifier/magnifier.js
-+++ b/lib/web/magnifier/magnifier.js
-@@ -542,7 +542,11 @@
-                         showWrapper = true;
-                         bindEvents(eventType, thumb);
-                         data[idx].status = 2;
--                        data[idx].zoom = largeObj.height / largeWrapper.height();
-+                        if (largeObj.width > largeObj.height) {
-+                            data[idx].zoom = largeObj.width / largeWrapper.width();
-+                        } else {
-+                            data[idx].zoom = largeObj.height / largeWrapper.height();
-+                        }
-                         setThumbData(thumb, data[idx]);
-                         updateLensOnLoad(idx, thumb, largeObj, largeWrapper);
-                     }
-@@ -554,6 +558,15 @@
-             thumbObj.src = thumb.src;
-         }
- 
-+        /**
-+         * Hide magnifier when mouse exceeds image bounds.
-+         */
-+        function onMouseLeave() {
-+            onThumbLeave();
-+            isOverThumb = false;
-+            $magnifierPreview.addClass(MagnifyCls.magnifyHidden);
-+        }
-+
-         function onMousemove(e) {
-             pos.x = e.clientX;
-             pos.y = e.clientY;
-@@ -564,20 +577,13 @@
-                 isOverThumb = inBounds;
-             }
- 
--            if (inBounds && isOverThumb) {
--                if(gMode === 'outside'){
--                    $magnifierPreview.removeClass(MagnifyCls.magnifyHidden);
--                }
-+            if (inBounds && isOverThumb && gMode === 'outside') {
-+                $magnifierPreview.removeClass(MagnifyCls.magnifyHidden);
-                 move();
--            } else {
--                onThumbLeave();
--                isOverThumb = false;
--                $magnifierPreview.addClass(MagnifyCls.magnifyHidden);
-             }
-         }
- 
-         function onScroll() {
--
-             if (curThumb !== null) {
-                 setThumbData(curThumb, magnifierOptions);
-             }
-@@ -589,6 +595,8 @@
-         });
- 
-         $box.on('mousemove', onMousemove);
-+        $box.on('mouseleave', onMouseLeave);
-+
-         _init($box, customUserOptions);
-     }
- }(jQuery));
-diff --git a/lib/web/magnifier/magnify.js b/lib/web/magnifier/magnify.js
-index 1fb73ea28bf..9d673092b80 100644
---- a/lib/web/magnifier/magnify.js
-+++ b/lib/web/magnifier/magnify.js
-@@ -35,13 +35,6 @@ define([
-             allowZoomOut = false,
-             allowZoomIn = true;
- 
--        if (isTouchEnabled) {
--            $(element).on('fotorama:showend fotorama:load', function () {
--                $(magnifierSelector).remove();
--                $(magnifierZoomSelector).remove();
--            });
--        }
--
-         (function () {
-             var style = document.documentElement.style,
-                 transitionEnabled = style.transition !== undefined ||
-diff --git a/lib/web/modernizr/modernizr.js b/lib/web/modernizr/modernizr.js
-index d7ddc86f63c..8c826fa18c5 100644
---- a/lib/web/modernizr/modernizr.js
-+++ b/lib/web/modernizr/modernizr.js
-@@ -169,7 +169,7 @@ window.Modernizr = (function( window, document, undefined ) {
-     // isEventSupported determines if a given element supports the given event
-     // kangax.github.com/iseventsupported/
-     //
--    // The following results are known incorrects:
-+    // The following results are known incorrect:
-     //   Modernizr.hasEvent("webkitTransitionEnd", elem) // false negative
-     //   Modernizr.hasEvent("textInput") // in Webkit. github.com/Modernizr/Modernizr/issues/333
-     //   ...
-diff --git a/lib/web/prototype/validation.js b/lib/web/prototype/validation.js
-index 616d49496e2..3cc0f6d8bc6 100644
---- a/lib/web/prototype/validation.js
-+++ b/lib/web/prototype/validation.js
-@@ -513,7 +513,7 @@ Validation.addAllThese([
-     ['validate-alpha', 'Please use letters only (a-z or A-Z) in this field.', function (v) {
-                 return Validation.get('IsEmpty').test(v) ||  /^[a-zA-Z]+$/.test(v)
-             }],
--    ['validate-code', 'Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.', function (v) {
-+    ['validate-code', 'Please use only lowercase letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.', function (v) {
-                 return Validation.get('IsEmpty').test(v) ||  /^[a-z]+[a-z0-9_]+$/.test(v)
-             }],
-     ['validate-alphanum', 'Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.', function(v) {
-diff --git a/lib/web/prototype/windows/themes/darkX.css b/lib/web/prototype/windows/themes/darkX.css
-index 2f83cfd46ad..1d964b1376d 100644
---- a/lib/web/prototype/windows/themes/darkX.css
-+++ b/lib/web/prototype/windows/themes/darkX.css
-@@ -99,23 +99,3 @@
- 	font-size: 14px;
- 	background:#5E5148;
- }
--
--
--/* FOR IE */
--* html .darkX_minimize {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-minimize-focused.png", sizingMethod="crop");
--}
--
--* html .darkX_maximize {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-maximize-focused.png", sizingMethod="scale");
--}
--
--* html .darkX_close {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-close-focused.png", sizingMethod="crop");
--}
-diff --git a/lib/web/prototype/windows/themes/lighting.css b/lib/web/prototype/windows/themes/lighting.css
-index 95ec287a927..60fed4aaa2d 100644
---- a/lib/web/prototype/windows/themes/lighting.css
-+++ b/lib/web/prototype/windows/themes/lighting.css
-@@ -185,79 +185,6 @@
- 	background:transparent url('lighting/spinner.gif') no-repeat center center
- }
- 
--/* FOR IE */
--* html .bluelighting_nw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-blue.png", sizingMethod="crop");
--}
--
--* html .bluelighting_n {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-blue.png", sizingMethod="scale");
--}
--
--* html .bluelighting_ne {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-blue.png", sizingMethod="crop");
--}
--
--* html .bluelighting_w {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-blue.png", sizingMethod="scale");
--}
--
--* html .bluelighting_e {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-blue.png", sizingMethod="scale");
--}
--
--* html .bluelighting_sw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-blue.png", sizingMethod="crop");
--}
--
--* html .bluelighting_s {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-blue.png", sizingMethod="scale");
--}
--
--* html .bluelighting_se, * html .bluelighting_sizer {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-blue.png", sizingMethod="crop");
--}
--
--* html .bluelighting_close {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-blue.png", sizingMethod="crop");
--}
--
--* html .bluelighting_minimize {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-blue.png", sizingMethod="crop");
--}
--
--* html .bluelighting_maximize {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-blue.png", sizingMethod="crop");
--}
--
--* html .bluelighting_content {
--	background:#B8D7FF;
--}
--
--
--
- .overlay_greylighting {
- 	background-color:#FFF;
- 	filter:alpha(opacity=60);
-@@ -419,79 +346,6 @@
- 	background:transparent url('lighting/spinner.gif') no-repeat center center
- }
- 
--/* FOR IE */
--* html .greylighting_nw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-grey.png", sizingMethod="crop");
--}
--
--* html .greylighting_n {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-grey.png", sizingMethod="scale");
--}
--
--* html .greylighting_ne {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-grey.png", sizingMethod="crop");
--}
--
--* html .greylighting_w {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-grey.png", sizingMethod="scale");
--}
--
--* html .greylighting_e {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-grey.png", sizingMethod="scale");
--}
--
--* html .greylighting_sw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-grey.png", sizingMethod="crop");
--}
--
--* html .greylighting_s {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-grey.png", sizingMethod="scale");
--}
--
--* html greylighting_se, * html .greylighting_sizer {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-grey.png", sizingMethod="crop");
--}
--
--* html .greylighting_close {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-grey.png", sizingMethod="crop");
--}
--
--* html .greylighting_minimize {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-grey.png", sizingMethod="crop");
--}
--
--* html .greylighting_maximize {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-grey.png", sizingMethod="crop");
--}
--
--* html .greylighting_content {
--	background:#C7C7C7;
--}
--
--
--
- .overlay_greenlighting {
- 	background-color:#FFF;
- 	filter:alpha(opacity=60);
-@@ -653,79 +507,6 @@
- 	background:transparent url('lighting/spinner.gif') no-repeat center center
- }
- 
--/* FOR IE */
--* html .greenlighting_nw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-green.png", sizingMethod="crop");
--}
--
--* html .greenlighting_n {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-green.png", sizingMethod="scale");
--}
--
--* html .greenlighting_ne {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-green.png", sizingMethod="crop");
--}
--
--* html .greenlighting_w {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-green.png", sizingMethod="scale");
--}
--
--* html .greenlighting_e {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-green.png", sizingMethod="scale");
--}
--
--* html .greenlighting_sw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-green.png", sizingMethod="crop");
--}
--
--* html .greenlighting_s {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-green.png", sizingMethod="scale");
--}
--
--* html greenlighting_se, * html .greenlighting_sizer {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-green.png", sizingMethod="crop");
--}
--
--* html .greenlighting_close {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-green.png", sizingMethod="crop");
--}
--
--* html .greenlighting_minimize {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-green.png", sizingMethod="crop");
--}
--
--* html .greenlighting_maximize {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-green.png", sizingMethod="crop");
--}
--
--* html .greenlighting_content {
--	background:#A4FCA7;
--}
--
--
--
- .overlay_darkbluelighting {
- 	background-color:#FFF;
- 	filter:alpha(opacity=60);
-@@ -885,76 +666,4 @@
- 	width:100%;
- 	height:16px;
- 	background:transparent url('lighting/spinner.gif') no-repeat center center
--}
--
--/* FOR IE */
--* html .darkbluelighting_nw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-darkblue.png", sizingMethod="crop");
--}
--
--* html .darkbluelighting_n {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-darkblue.png", sizingMethod="scale");
--}
--
--* html .darkbluelighting_ne {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-darkblue.png", sizingMethod="crop");
--}
--
--* html .darkbluelighting_w {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-darkblue.png", sizingMethod="scale");
--}
--
--* html .darkbluelighting_e {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-darkblue.png", sizingMethod="scale");
--}
--
--* html .darkbluelighting_sw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-darkblue.png", sizingMethod="crop");
--}
--
--* html .darkbluelighting_s {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-darkblue.png", sizingMethod="scale");
--}
--
--* html darkbluelighting_se, * html .darkbluelighting_sizer {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-darkblue.png", sizingMethod="crop");
--}
--
--* html .darkbluelighting_close {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-darkblue.png", sizingMethod="crop");
--}
--
--* html .darkbluelighting_minimize {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-darkblue.png", sizingMethod="crop");
--}
--
--* html .darkbluelighting_maximize {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-darkblue.png", sizingMethod="crop");
--}
--
--* html .darkbluelighting_content {
--	background:#020EBA;
--}
--
-+}
-\ No newline at end of file
-diff --git a/lib/web/prototype/windows/themes/mac_os_x.css b/lib/web/prototype/windows/themes/mac_os_x.css
-index 24751f86888..d2f556b876e 100644
---- a/lib/web/prototype/windows/themes/mac_os_x.css
-+++ b/lib/web/prototype/windows/themes/mac_os_x.css
-@@ -109,62 +109,6 @@
-   padding-bottom:24px;
- }
- 
--/* FOR IE */
--* html .mac_os_x_nw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL_Main.png", sizingMethod="crop");
--}
--
--* html .mac_os_x_n {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T_Main.png", sizingMethod="scale");
--}
--
--* html .mac_os_x_ne {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR_Main.png", sizingMethod="crop");
--}
--
--* html .mac_os_x_w {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L_Main.png", sizingMethod="scale");
--}
--
--* html .mac_os_x_e {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R_Main.png", sizingMethod="scale");
--}
--
--* html .mac_os_x_sw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL_Main.png", sizingMethod="crop");
--}
--
--* html .mac_os_x_s {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B_Main.png", sizingMethod="scale");
--}
--
--* html .mac_os_x_se {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
--}
--
--* html .mac_os_x_sizer {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
--}
--
--
- /* Focused windows */
- .overlay_blur_os_x {
- 	background-color: #85BBEF;
-@@ -275,59 +219,3 @@
- .blur_os_x_s .status_bar {
-   padding-bottom:24px;
- }
--
--/* FOR IE */
--* html .blur_os_x_nw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL.png", sizingMethod="crop");
--}
--
--* html .blur_os_x_n {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T.png", sizingMethod="scale");
--}
--
--* html .blur_os_x_ne {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR.png", sizingMethod="crop");
--}
--
--* html .blur_os_x_w {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L.png", sizingMethod="scale");
--}
--
--* html .blur_os_x_e {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R.png", sizingMethod="scale");
--}
--
--* html .blur_os_x_sw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL.png", sizingMethod="crop");
--}
--
--* html .blur_os_x_s {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B.png", sizingMethod="scale");
--}
--
--* html .blur_os_x_se {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
--}
--
--* html .blur_os_x_sizer {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
--}
--
-diff --git a/lib/web/prototype/windows/themes/mac_os_x_dialog.css b/lib/web/prototype/windows/themes/mac_os_x_dialog.css
-index e663e3c5e25..5aff20203d0 100644
---- a/lib/web/prototype/windows/themes/mac_os_x_dialog.css
-+++ b/lib/web/prototype/windows/themes/mac_os_x_dialog.css
-@@ -108,53 +108,3 @@
- .mac_os_x_dialog_buttons {
-   text-align: center;
- }
--/* FOR IE */
--* html .mac_os_x_dialog_nw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
--}
--
--
--* html .mac_os_x_dialog_ne {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
--}
--
--* html .mac_os_x_dialog_w {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
--}
--
--* html .mac_os_x_dialog_e {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
--}
--
--* html .mac_os_x_dialog_sw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop");
--}
--
--* html .mac_os_x_dialog_s {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale");
--}
--
--* html .mac_os_x_dialog_se {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
--}
--
--* html .mac_os_x_dialog_sizer {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
--}
--
-diff --git a/lib/web/prototype/windows/themes/nuncio.css b/lib/web/prototype/windows/themes/nuncio.css
-index 2c439bd0019..275ba53436f 100644
---- a/lib/web/prototype/windows/themes/nuncio.css
-+++ b/lib/web/prototype/windows/themes/nuncio.css
-@@ -95,70 +95,3 @@
- .top_draggable, .bottom_draggable {
-   cursor:move
- }
--/* FOR IE */
--* html .nuncio_nw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_left.png", sizingMethod="crop");
--}
--
--* html .nuncio_n {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_mid.png", sizingMethod="scale");
--}
--
--* html .nuncio_ne {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_right.png", sizingMethod="crop");
--}
--
--* html .nuncio_w {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_left.png", sizingMethod="scale");
--}
--
--* html .nuncio_e {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_right.png", sizingMethod="scale");
--}
--
--* html .nuncio_sw {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_left.png", sizingMethod="crop");
--}
--
--* html .nuncio_s {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_mid.png", sizingMethod="scale");
--}
--
--* html .nuncio_se {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
--}
--
--* html .nuncio_sizer {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
--}
--
--* html .nuncio_close {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/close.png", sizingMethod="crop");
--}
--
--* html .nuncio_minimize {
--	background-color: transparent;
--	background-image: none;
--	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/minimize.png", sizingMethod="crop");
--}
--
-diff --git a/lib/web/tiny_mce_4/plugins/lineheight/plugin.min.js b/lib/web/tiny_mce_4/plugins/lineheight/plugin.min.js
-new file mode 100644
-index 00000000000..222e138f7a0
---- /dev/null
-+++ b/lib/web/tiny_mce_4/plugins/lineheight/plugin.min.js
-@@ -0,0 +1 @@
-+(function(e){e.PluginManager.add("lineheight",function(t,n,r){t.on("init",function(){t.formatter.register({lineheight:{inline:"span",styles:{"line-height":"%value"}}})});t.addButton("lineheightselect",function(){var n=[],r="8pt 10pt 12pt 14pt 18pt 24pt 36pt";var i=t.settings.lineheight_formats||r;i.split(" ").forEach(function(e){var t=e,r=e;var i=e.split("=");if(i.length>1){t=i[0];r=i[1]}n.push({text:t,value:r})});return{type:"listbox",text:"Line Height",tooltip:"Line Height",values:n,fixedWidth:true,onPostRender:function(){var e=this;t.on("nodeChange",function(r){var i="lineheight";var s=t.formatter;var o=null;r.parents.forEach(function(e){n.forEach(function(t){if(i){if(s.matchNode(e,i,{value:t.value})){o=t.value}}else{if(s.matchNode(e,t.value)){o=t.value}}if(o){return false}});if(o){return false}});e.value(o)})},onselect:function(t){e.activeEditor.formatter.apply("lineheight",{value:this.value()})}}})});e.PluginManager.requireLangPack("lineheight","de")})(tinymce)
-\ No newline at end of file
-diff --git a/lib/web/varien/js.js b/lib/web/varien/js.js
-index 55e41a1652c..45032829f2f 100644
---- a/lib/web/varien/js.js
-+++ b/lib/web/varien/js.js
-@@ -607,17 +607,11 @@ if (!("console" in window) || !("firebug" in console))
-  * @example fireEvent($('my-input', 'click'));
-  */
- function fireEvent(element, event) {
--    if (document.createEvent) {
--        // dispatch for all browsers except IE before version 9
--        var evt = document.createEvent('HTMLEvents');
-+    // dispatch event
-+    var evt = document.createEvent('HTMLEvents');
- 
--        evt.initEvent(event, true, true); // event type, bubbling, cancelable
--        return element.dispatchEvent(evt);
--    }
--    // dispatch for IE before version 9
--    var evt = document.createEventObject();
--
--    return element.fireEvent('on' + event, evt);
-+    evt.initEvent(event, true, true); // event type, bubbling, cancelable
-+    return element.dispatchEvent(evt);
- 
- }
- 
-diff --git a/nginx.conf.sample b/nginx.conf.sample
-index 6f87a9a0766..979ac0be1f5 100644
---- a/nginx.conf.sample
-+++ b/nginx.conf.sample
-@@ -9,6 +9,7 @@
- #    listen 80;
- #    server_name mage.dev;
- #    set $MAGE_ROOT /var/www/magento2;
-+#    set $MAGE_DEBUG_SHOW_ARGS 1;
- #    include /vagrant/magento2/nginx.conf.sample;
- # }
- #
-@@ -33,6 +34,12 @@ charset UTF-8;
- error_page 404 403 = /errors/404.php;
- #add_header "X-UA-Compatible" "IE=Edge";
- 
-+
-+# Deny access to sensitive files
-+location /.user.ini {
-+    deny all;
-+}
-+
- # PHP entry point for setup application
- location ~* ^/setup($|/) {
-     root $MAGE_ROOT;
-@@ -99,7 +106,7 @@ location /static/ {
- 
-     # Remove signature of the static files that is used to overcome the browser cache
-     location ~ ^/static/version {
--        rewrite ^/static/(version[^/]+/)?(.*)$ /static/$2 last;
-+        rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last;
-     }
- 
-     location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|json)$ {
-@@ -108,7 +115,7 @@ location /static/ {
-         expires +1y;
- 
-         if (!-f $request_filename) {
--            rewrite ^/static/?(.*)$ /static.php?resource=$1 last;
-+            rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
-         }
-     }
-     location ~* \.(zip|gz|gzip|bz2|csv|xml)$ {
-@@ -117,11 +124,11 @@ location /static/ {
-         expires    off;
- 
-         if (!-f $request_filename) {
--           rewrite ^/static/?(.*)$ /static.php?resource=$1 last;
-+           rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
-         }
-     }
-     if (!-f $request_filename) {
--        rewrite ^/static/?(.*)$ /static.php?resource=$1 last;
-+        rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
-     }
-     add_header X-Frame-Options "SAMEORIGIN";
- }
-@@ -159,9 +166,14 @@ location /media/downloadable/ {
- location /media/import/ {
-     deny all;
- }
-+location /errors/ {
-+    location ~* \.xml$ {
-+        deny all;
-+    }
-+}
- 
- # PHP entry point for main application
--location ~ (index|get|static|report|404|503|health_check)\.php$ {
-+location ~ ^/(index|get|static|errors/report|errors/404|errors/503|health_check)\.php$ {
-     try_files $uri =404;
-     fastcgi_pass   fastcgi_backend;
-     fastcgi_buffers 1024 4k;
-@@ -198,6 +210,6 @@ gzip_types
- gzip_vary on;
- 
- # Banned locations (only reached if the earlier PHP entry point regexes don't match)
--location ~* (\.php$|\.htaccess$|\.git) {
-+location ~* (\.php$|\.phtml$|\.htaccess$|\.git) {
-     deny all;
- }
-diff --git a/php.ini.sample b/php.ini.sample
-deleted file mode 100644
-index 8a7d13cf42b..00000000000
---- a/php.ini.sample
-+++ /dev/null
-@@ -1,32 +0,0 @@
--; Copyright © Magento, Inc. All rights reserved.
--; See COPYING.txt for license details.
--; This file is for CGI/FastCGI installations.
--; Try copying it to php5.ini, if it doesn't work
--
--; adjust memory limit
--
--memory_limit = 64M
--
--max_execution_time = 18000
--
--; disable automatic session start
--; before autoload was initialized
--
--flag session.auto_start = off
--
--; enable resulting html compression
--
--zlib.output_compression = on
--
--; disable user agent verification to not break multiple image upload
--
--suhosin.session.cryptua = off
--
--; PHP for some reason ignores this setting in system php.ini
--; and disables mcrypt if this line is missing in local php.ini
--
--extension=mcrypt.so
--
--; Disable PHP errors, notices and warnings output in production mode to prevent exposing sensitive information.
--
--display_errors = Off
-diff --git a/phpserver/README.md b/phpserver/README.md
-index 6bb814fe5f5..563d2ed7c9f 100644
---- a/phpserver/README.md
-+++ b/phpserver/README.md
-@@ -14,7 +14,7 @@ Without a router script, that is not possible via the php built-in server.
- 
- ### How to install Magento
- 
--Magento's web-based Setup Wizard runs from the `setup` subdirectory, which PHP's built-in web server cannot route. Therefore, you must install Magento using the <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/cli/install-cli.html" target="_blank">command line</a>. An example follows:
-+Magento's web-based Setup Wizard runs from the `setup` subdirectory, which PHP's built-in web server cannot route. Therefore, you must install Magento using the <a href="https://devdocs.magento.com/guides/v2.0/install-gde/install/cli/install-cli.html" target="_blank">command line</a>. An example follows:
- 
- ```
- php bin/magento setup:install --base-url=http://127.0.0.1:8082 
-@@ -31,7 +31,7 @@ For more informations about the installation process using the CLI, you can cons
- 
- ### How to run Magento
- 
--Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ../phpserver/router.php```
-+Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ./phpserver/router.php```
- 
- ### What exactly the script does
- 
-diff --git a/pub/.htaccess b/pub/.htaccess
-index 8ba04ff4415..6a97a6d14dc 100644
---- a/pub/.htaccess
-+++ b/pub/.htaccess
-@@ -47,11 +47,6 @@
-     php_flag session.auto_start off
- 
- ############################################
--## Enable resulting html compression
--
--    #php_flag zlib.output_compression on
--
--###########################################
- # Disable user agent verification to not break multiple image upload
- 
-     php_flag suhosin.session.cryptua off
-@@ -220,6 +215,16 @@ ErrorDocument 403 /errors/404.php
-             Require all denied
-         </IfVersion>
-     </Files>
-+## Deny access  to .user.ini
-+    <Files .user.ini>
-+        <IfVersion < 2.4>
-+            order allow,deny
-+            deny from all
-+        </IfVersion>
-+        <IfVersion >= 2.4>
-+            Require all denied
-+        </IfVersion>
-+    </Files>
- 
- <IfModule mod_headers.c>
-     ############################################
-diff --git a/pub/errors/.htaccess b/pub/errors/.htaccess
-index 3692dd439e2..a7b9cbda058 100644
---- a/pub/errors/.htaccess
-+++ b/pub/errors/.htaccess
-@@ -1,4 +1,7 @@
- Options None
-+<FilesMatch "\.(xml|phtml)$">
-+    Deny from all
-+</FilesMatch>
- <IfModule mod_rewrite.c>
-     RewriteEngine Off
- </IfModule>
-diff --git a/pub/errors/default/images/logo.gif b/pub/errors/default/images/logo.gif
-index f1f7fcaf4f0..0cca183e08d 100644
-Binary files a/pub/errors/default/images/logo.gif and b/pub/errors/default/images/logo.gif differ
-diff --git a/pub/errors/processor.php b/pub/errors/processor.php
-index 7240707f642..ab21f791bc0 100644
---- a/pub/errors/processor.php
-+++ b/pub/errors/processor.php
-@@ -3,6 +3,8 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Framework\Error;
- 
- use Magento\Framework\Serialize\Serializer\Json;
-@@ -11,6 +13,7 @@ use Magento\Framework\Serialize\Serializer\Json;
-  * Error processor
-  *
-  * @SuppressWarnings(PHPMD.TooManyFields)
-+ * phpcs:ignoreFile
-  */
- class Processor
- {
-@@ -257,25 +260,38 @@ class Processor
-         /**
-          * Define server http host
-          */
--        if (!empty($_SERVER['HTTP_HOST'])) {
--            $host = $_SERVER['HTTP_HOST'];
--        } elseif (!empty($_SERVER['SERVER_NAME'])) {
--            $host = $_SERVER['SERVER_NAME'];
--        } else {
--            $host = 'localhost';
--        }
-+        $host = $this->resolveHostName();
- 
--        $isSecure = (!empty($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] != 'off');
-+        $isSecure = (!empty($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] !== 'off')
-+            || isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https');
-         $url = ($isSecure ? 'https://' : 'http://') . $host;
- 
--        if (!empty($_SERVER['SERVER_PORT']) && !in_array($_SERVER['SERVER_PORT'], [80, 443])
-+        $port = explode(':', $host);
-+        if (isset($port[1]) && !in_array($port[1], [80, 443])
-             && !preg_match('/.*?\:[0-9]+$/', $url)
-         ) {
--            $url .= ':' . $_SERVER['SERVER_PORT'];
-+            $url .= ':' . $port[1];
-         }
-         return  $url;
-     }
- 
-+    /**
-+     * Resolve hostname
-+     *
-+     * @return string
-+     */
-+    private function resolveHostName() : string
-+    {
-+        if (!empty($_SERVER['HTTP_HOST'])) {
-+            $host = $_SERVER['HTTP_HOST'];
-+        } elseif (!empty($_SERVER['SERVER_NAME'])) {
-+            $host = $_SERVER['SERVER_NAME'];
-+        } else {
-+            $host = 'localhost';
-+        }
-+        return $host;
-+    }
-+
-     /**
-      * Retrieve base URL
-      *
-@@ -379,6 +395,8 @@ class Processor
-     }
- 
-     /**
-+     * Render page
-+     *
-      * @param string $template
-      * @return string
-      */
-@@ -463,7 +481,7 @@ class Processor
-     public function saveReport($reportData)
-     {
-         $this->reportData = $reportData;
--        $this->reportId   = abs(intval(microtime(true) * random_int(100, 1000)));
-+        $this->reportId   = abs((int)(microtime(true) * random_int(100, 1000)));
-         $this->_reportFile = $this->_reportDir . '/' . $this->reportId;
-         $this->_setReportData($reportData);
- 
-@@ -486,7 +504,6 @@ class Processor
-      *
-      * @param int $reportId
-      * @return void
--     * @SuppressWarnings(PHPMD.ExitExpression)
-      */
-     public function loadReport($reportId)
-     {
-diff --git a/pub/health_check.php b/pub/health_check.php
-index c9a4965876b..4bdda68851b 100644
---- a/pub/health_check.php
-+++ b/pub/health_check.php
-@@ -4,11 +4,17 @@
-  * See COPYING.txt for license details.
-  */
- 
-+/**
-+ * phpcs:disable PSR1.Files.SideEffects
-+ * phpcs:disable Squiz.Functions.GlobalFunction
-+ */
- use Magento\Framework\Config\ConfigOptionsListConstants;
- 
-+// phpcs:ignore Magento2.Functions.DiscouragedFunction
- register_shutdown_function("fatalErrorHandler");
- 
- try {
-+    // phpcs:ignore Magento2.Security.IncludeFile
-     require __DIR__ . '/../app/bootstrap.php';
-     /** @var \Magento\Framework\App\ObjectManagerFactory $objectManagerFactory */
-     $objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, []);
-@@ -20,6 +26,7 @@ try {
-     $logger = $objectManager->get(\Psr\Log\LoggerInterface::class);
- } catch (\Exception $e) {
-     http_response_code(500);
-+    // phpcs:ignore Magento2.Security.LanguageConstruct
-     exit(1);
- }
- 
-@@ -35,6 +42,7 @@ foreach ($deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DB_CONNE
-     } catch (\Exception $e) {
-         http_response_code(500);
-         $logger->error("MySQL connection failed: " . $e->getMessage());
-+        // phpcs:ignore Magento2.Security.LanguageConstruct
-         exit(1);
-     }
- }
-@@ -43,10 +51,14 @@ foreach ($deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DB_CONNE
- $cacheConfigs = $deploymentConfig->get(ConfigOptionsListConstants::KEY_CACHE_FRONTEND);
- if ($cacheConfigs) {
-     foreach ($cacheConfigs as $cacheConfig) {
--        if (!isset($cacheConfig[ConfigOptionsListConstants::CONFIG_PATH_BACKEND]) ||
-+        // allow config if only available "id_prefix"
-+        if (count($cacheConfig) === 1 && isset($cacheConfig['id_prefix'])) {
-+            continue;
-+        } elseif (!isset($cacheConfig[ConfigOptionsListConstants::CONFIG_PATH_BACKEND]) ||
-             !isset($cacheConfig[ConfigOptionsListConstants::CONFIG_PATH_BACKEND_OPTIONS])) {
-             http_response_code(500);
-             $logger->error("Cache configuration is invalid");
-+            // phpcs:ignore Magento2.Security.LanguageConstruct
-             exit(1);
-         }
-         $cacheBackendClass = $cacheConfig[ConfigOptionsListConstants::CONFIG_PATH_BACKEND];
-@@ -57,6 +69,7 @@ if ($cacheConfigs) {
-         } catch (\Exception $e) {
-             http_response_code(500);
-             $logger->error("Cache storage is not accessible");
-+            // phpcs:ignore Magento2.Security.LanguageConstruct
-             exit(1);
-         }
-     }
-@@ -70,7 +83,7 @@ if ($cacheConfigs) {
- function fatalErrorHandler()
- {
-     $error = error_get_last();
--    if ($error !== null) {
-+    if ($error !== null && $error['type'] === E_ERROR) {
-         http_response_code(500);
-     }
- }
-diff --git a/pub/index.php b/pub/index.php
-index 457b83c5294..612e1907190 100644
---- a/pub/index.php
-+++ b/pub/index.php
-@@ -25,12 +25,15 @@ HTML;
- }
- 
- $params = $_SERVER;
--$params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS] = [
--    DirectoryList::PUB => [DirectoryList::URL_PATH => ''],
--    DirectoryList::MEDIA => [DirectoryList::URL_PATH => 'media'],
--    DirectoryList::STATIC_VIEW => [DirectoryList::URL_PATH => 'static'],
--    DirectoryList::UPLOAD => [DirectoryList::URL_PATH => 'media/upload'],
--];
-+$params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS] = array_replace_recursive(
-+    $params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS] ?? [],
-+    [
-+        DirectoryList::PUB => [DirectoryList::URL_PATH => ''],
-+        DirectoryList::MEDIA => [DirectoryList::URL_PATH => 'media'],
-+        DirectoryList::STATIC_VIEW => [DirectoryList::URL_PATH => 'static'],
-+        DirectoryList::UPLOAD => [DirectoryList::URL_PATH => 'media/upload'],
-+    ]
-+);
- $bootstrap = \Magento\Framework\App\Bootstrap::create(BP, $params);
- /** @var \Magento\Framework\App\Http $app */
- $app = $bootstrap->createApplication(\Magento\Framework\App\Http::class);
-diff --git a/pub/media/.htaccess b/pub/media/.htaccess
-index 28e65b490fb..d68d163d7a6 100644
---- a/pub/media/.htaccess
-+++ b/pub/media/.htaccess
-@@ -23,12 +23,15 @@ SetHandler default-handler
-     Options +FollowSymLinks
-     RewriteEngine on
- 
-+    ## you can put here your pub/media folder path relative to web root
-+    #RewriteBase /magento/pub/media/
-+
- ############################################
- ## never rewrite for existing files
-     RewriteCond %{REQUEST_FILENAME} !-f
- 
- ############################################
--## rewrite everything else to index.php
-+## rewrite everything else to get.php
- 
-     RewriteRule .* ../get.php [L]
- </IfModule>
-diff --git a/pub/static/.htaccess b/pub/static/.htaccess
-index f49dce25d43..a5aa6fb0d5c 100644
---- a/pub/static/.htaccess
-+++ b/pub/static/.htaccess
-@@ -22,6 +22,11 @@ Options -MultiViews
-     RewriteCond %{REQUEST_FILENAME} !-l
- 
-     RewriteRule .* ../static.php?resource=$0 [L]
-+    # Detects if moxieplayer request with uri params and redirects to uri without params
-+    <Files moxieplayer.swf>
-+     	RewriteCond %{QUERY_STRING} !^$
-+     	RewriteRule ^(.*)$ %{REQUEST_URI}? [R=301,L]
-+     </Files>
- </IfModule>
- 
- ############################################
-diff --git a/setup/performance-toolkit/README.md b/setup/performance-toolkit/README.md
-index bb0a023ab8a..ede66e04075 100644
---- a/setup/performance-toolkit/README.md
-+++ b/setup/performance-toolkit/README.md
-@@ -29,7 +29,7 @@ Splitting generation and indexation processes doesn't reduce total processing ti
-     php bin/magento setup:performance:generate-fixtures -s setup/performance-toolkit/profiles/ce/small.xml
-     php bin/magento indexer:reindex
- 
--For more information about the available profiles and generating fixtures generation, read [Generate data for performance testing](http://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-perf-data.html).
-+For more information about the available profiles and generating fixtures generation, read [Generate data for performance testing](https://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-perf-data.html).
- 
- For run Admin Pool in multithreading mode, please be sure, that:
-   - "Admin Account Sharing" is enabled
-@@ -54,49 +54,139 @@ There are two JMeter scenarios located in `setup/performance-toolkit` folder: `b
- 
- The following parameters can be passed to the `benchmark.jmx` scenario:
- 
-+Main parameters:
-+
- | Parameter Name                                | Default Value       | Description                                                                              |
- | --------------------------------------------- | ------------------- | ---------------------------------------------------------------------------------------- |
- | host                                          |  localhost          | URL component 'host' of application being tested (URL or IP).                            |
- | base_path                                     |       /             | Base path for tested site.                                                               |
-+| files_folder                                  | ./files/            | Path to various files that are used in scenario (`setup/performance-toolkit/files`).     |
-+| request_protocol                              | http                | Hypertext Transfer Protocol (http or https).                                             |
-+| graphql_port_number                           |                     | Port number for GraphQL.                                                                 |
-+| admin_password                                | 123123q             | Admin backend password.                                                                  |
- | admin_path                                    | admin               | Admin backend path.                                                                      |
- | admin_user                                    | admin               | Admin backend user.                                                                      |
--| admin_password                                | 123123q             | Admin backend password.                                                                  |
--| customer_password                             | 123123q             | Storefront customer password.                                                            |
--| customers_page_size                           | 50                  | Page size for customers grid in Magento Admin.                                           |
--| files_folder                                  | ./files/            | Path to various files that are used in scenario (`setup/performance-toolkit/files`).     |
-+| cache_hits_percentage                         | 100                 | Cache hits percentage.                                                                   |
-+| seedForRandom                                 | 1                   | System option for setting random number method                                           |
- | loops                                         | 1                   | Number of loops to run.                                                                  |
--| frontendPoolUsers                             | 1                   | Total number of Frontend threads.                                                        |
--| adminPoolUsers                                | 1                   | Total number of Admin threads.                                                           |
--| browseCatalogByGuestPercentage                | 30                  | Percentage of threads in Frontend Pool that emulate catalog browsing activities.         |
--| browseCatalogByCustomerPercentage             | 0                   | Percentage of threads in Frontend Pool that emulate catalog browsing activities.         |
--| siteSearchPercentage                          | 30                  | Percentage of threads in Frontend Pool that emulate catalog search activities.           |
--| searchQuickPercentage                         | 60                  | Percentage of threads in Frontend Pool that emulate catalog search activities.           |
--| searchQuickFilterPercentage                   | 30                  | Percentage of threads in Frontend Pool that emulate catalog search activities.           |
--| searchAdvancedPercentage                      | 10                  | Percentage of threads in Frontend Pool that emulate catalog search activities.           |
--| checkoutByGuestPercentage                     | 4                   | Percentage of threads in Frontend Pool that emulate checkout by guest.                   |
--| checkoutByCustomerPercentage                  | 4                   | Percentage of threads in Frontend Pool that emulate checkout by customer.                |
--| addToCartByGuestPercentage                    | 28                  | Percentage of threads in Frontend Pool that emulate abandoned cart activities.           |
--| addToWishlistPercentage                       | 2                   | Percentage of threads in Frontend Pool that emulate adding products to Wishlist.         |
--| compareProductsPercentage                     | 2                   | Percentage of threads in Frontend Pool that emulate products comparison.                 |
--| productCompareDelay                           | 0                   | Delay (s) between iterations of product comparison.                                      |
--| promotionRulesPercentage                      | 10                  | Percentage of threads in Admin Pool that emulate creation of promotion rules.            |
--| adminPromotionsManagementDelay                | 0                   | Delay (s) between creation of promotion rules.                                           |
--| adminCategoryManagementPercentage             | 10                   | Percentage of threads in Merchandising Pool that emulate category management activities. |
--| adminProductEditingPercentage                 | 35                  | Percentage of threads in Merchandising Pool that emulate product editing.                |
--| adminProductCreationPercentage                | 25                  | Percentage of threads in Merchandising Pool that emulate creation of products.           |
--| adminPromotionRulesPercentage                 | 15                  | Percentage of threads in Admin Pool that emulate admin rules creating activities.        |
--| adminCategoryManagementDelay                  | 0                   | Delay (s) between iterations of category management activities.                          |
--| apiProcessOrders                              | 5                   | Number of orders for process in Admin API - Process Orders.                              |
--| adminEditOrderPercentage                      | 15                  | Percentage of threads in Admin Pool that emulate order edit.                             |
--| csrPoolUsers                                  | 0                   | Users of Customer Support Request (CSR) Pool.                                            |
--| othersPoolUsers                               | 0                   | Users of Others Pool.                                                                    |
--| browseCustomerGridPercentage                  | 10                  | Percentage of threads in CSR Pool that emulate customers browsing activities.            |
--| adminCreateOrderPercentage                    | 70                  | Percentage of threads in CSR Pool that emulate creation of orders.                       |
--| adminReturnsManagementPercentage              | 20                  | Percentage of threads in CSR Pool that emulate creation/processing of returns.           |
--| adminCreateProcessReturnsDelay                | 0                   | Delay (s) between creation of returns.                                                   |
--| wishlistDelay                                 | 0                   | Delay (s) between adding products to Wishlist.                                           |
--| categories_count                              | 100                 | Total number of categories that are be used in scenario.                                 |
--| simple_products_count                         | 30                  | Total number of simple products that are be used in scenario.                            |
-+| frontendPoolUsers                             | 0                   | Total number of Frontend threads.                                                        |
-+| adminPoolUsers                                | 0                   | Total number of Admin threads.                                                           |
-+| csrPoolUsers                                  | 0                   | Total number of CSR threads.                                                             |
-+| apiPoolUsers                                  | 0                   | Total number of API threads.                                                             |
-+| oneThreadScenariosPoolUsers                   | 0                   | Total number of One Thread Scenarios threads.                                            |
-+| graphQLPoolUsers                              | 0                   | Total number of GraphQL threads.                                                         |
-+| combinedBenchmarkPoolUsers                    | 0                   | Total number of Combined Benchmark threads.                                              |
-+
-+Parameters for Frontend pool:
-+
-+| Parameter Name                                | Default Value       | Description                                                                               |
-+| --------------------------------------------- | ------------------- | ----------------------------------------------------------------------------------------- |
-+| browseCatalogByCustomerPercentage             |  0                  | Percentage of threads in Frontend Pool that emulate customer catalog browsing activities. |
-+| browseCatalogByGuestPercentage                |  0                  | Percentage of threads in Frontend Pool that emulate guest catalog browsing activities.    |
-+| siteSearchPercentage                          |  0                  | Percentage of threads in Frontend Pool that emulate catalog search activities.            |
-+| addToCartByGuestPercentage                    |  0                  | Percentage of threads in Frontend Pool that emulate abandoned cart activities by guest.   |
-+| addToWishlistPercentage                       |  0                  | Percentage of threads in Frontend Pool that emulate adding products to Wishlist.          |
-+| compareProductsPercentage                     |  0                  | Percentage of threads in Frontend Pool that emulate products comparison.                  |
-+| checkoutByGuestPercentage                     |  0                  | Percentage of threads in Frontend Pool that emulate checkout by guest.                    |
-+| checkoutByCustomerPercentage                  |  0                  | Percentage of threads in Frontend Pool that emulate checkout by customer.                 |
-+| reviewByCustomerPercentage                    |  0                  | Percentage of threads in Frontend Pool that emulate reviewing products.                   |
-+| addToCartByCustomerPercentage                 |  0                  | Percentage of threads in Frontend Pool that emulate abandoned cart activities by customer.|
-+| accountManagementPercentage                   |  0                  | Percentage of threads in Frontend Pool that emulate account management.                   |
-+
-+Parameters for Admin pool:
-+
-+| Parameter Name                                | Default Value       | Description                                                                               |
-+| --------------------------------------------- | ------------------- | ----------------------------------------------------------------------------------------- |
-+| adminCMSManagementPercentage                  |  0                  | Percentage of threads in Admin Pool that emulate CMS management activities.               |
-+| browseProductGridPercentage                   |  0                  | Percentage of threads in Admin Pool that emulate products grid browsing activities.       |
-+| browseOrderGridPercentage                     |  0                  | Percentage of threads in Admin Pool that emulate orders grid browsing activities.         |
-+| adminProductCreationPercentage                |  0                  | Percentage of threads in Admin Pool that emulate product creation activities.             |
-+| adminProductEditingPercentage                 |  0                  | Percentage of threads in Admin Pool that emulate product editing activities.              |
-+
-+Parameters for CSR pool:
-+
-+| Parameter Name                                | Default Value       | Description                                                                               |
-+| --------------------------------------------- | ------------------- | ----------------------------------------------------------------------------------------- |
-+| adminReturnsManagementPercentage              |  0                  | Percentage of threads in CSR Pool that emulate admin returns management activities.       |
-+| browseCustomerGridPercentage                  |  0                  | Percentage of threads in CSR Pool that emulate customers grid browsing activities.        |
-+| adminCreateOrderPercentage                    |  0                  | Percentage of threads in CSR Pool that emulate creating orders activities.                |
-+
-+Parameters for API pool:
-+
-+| Parameter Name                                | Default Value       | Description                                                                               |
-+| --------------------------------------------- | ------------------- | ----------------------------------------------------------------------------------------- |
-+| apiBasePercentage                             |  0                  | Percentage of threads in API Pool that emulate API requests activities.                   |
-+
-+Parameters for One Thread Scenarios pool:
-+
-+| Parameter Name                                | Default Value       | Description                                                                   |
-+| --------------------------------------------- | ------------------- | ----------------------------------------------------------------------------- |
-+| productGridMassActionPercentage               |  0                  | Percentage of threads that emulate product mass action activities.            |
-+| importProductsPercentage                      |  0                  | Percentage of threads that emulate products import activities.                |
-+| importCustomersPercentage                     |  0                  | Percentage of threads that emulate customers import activities.               |
-+| exportProductsPercentage                      |  0                  | Percentage of threads that emulate products export activities.                |
-+| exportCustomersPercentage                     |  0                  | Percentage of threads that emulate customers export activities.               |
-+| apiSinglePercentage                           |  0                  | Percentage of threads that emulate API nonparallel requests activities.       |
-+| adminCategoryManagementPercentage             |  0                  | Percentage of threads that emulate category management activities.            |
-+| adminPromotionRulesPercentage                 |  0                  | Percentage of threads that emulate promotion rules activities.                |
-+| adminCustomerManagementPercentage             |  0                  | Percentage of threads that emulate customer management activities.            |
-+| adminEditOrderPercentage                      |  0                  | Percentage of threads that emulate edit order activities.                     |
-+| catalogGraphQLPercentage                      |  0                  | Percentage of threads that emulate nonparallel catalogGraphQL activities.     |
-+
-+Parameters for GraphQL pool:
-+
-+| Parameter Name                                                    | Default Value       | Description                                                                               |
-+| ----------------------------------------------------------------- | ------------------- | ----------------------------------------------------------------------------------------- |
-+| graphqlGetListOfProductsByCategoryIdPercentage                    |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlGetSimpleProductDetailsByProductUrlKeyPercentage           |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlGetSimpleProductDetailsByNamePercentage                    |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlGetConfigurableProductDetailsByProductUrlKeyPercentage     |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlGetConfigurableProductDetailsByNamePercentage              |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlGetProductSearchByTextAndCategoryIdPercentage              |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlGetCategoryListByCategoryIdPercentage                      |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlUrlInfoByUrlKeyPercentage                                  |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlGetCmsPageByIdPercentage                                   |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlGetNavigationMenuByCategoryIdPercentage                    |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlCreateEmptyCartPercentage                                  |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlGetEmptyCartPercentage                                     |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlSetShippingAddressOnCartPercentage                         |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlSetBillingAddressOnCartPercentage                          |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlAddSimpleProductToCartPercentage                           |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlAddConfigurableProductToCartPercentage                     |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlUpdateSimpleProductQtyInCartPercentage                     |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlUpdateConfigurableProductQtyInCartPercentage               |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlRemoveSimpleProductFromCartPercentage                      |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlRemoveConfigurableProductFromCartPercentage                |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlApplyCouponToCartPercentage                                |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlRemoveCouponFromCartPercentage                             |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlCatalogBrowsingByGuestPercentage                           |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+| graphqlCheckoutByGuestPercentage                                  |  0                  | Percentage of threads in GraphQL Pool that emulate GraphQL requests activities.           |
-+
-+Parameters for Combined Benchmark pool:
-+
-+| Parameter Name                                                    | Default Value       | Description                                                                                          |
-+| ----------------------------------------------------------------- | ------------------- | ---------------------------------------------------------------------------------------------------- |
-+| cBrowseCatalogByGuestPercentage                                   |  29                 | Percentage of threads in Combined Benchmark Pool that emulate customer catalog browsing activities.  |
-+| cSiteSearchPercentage                                             |  29                 | Percentage of threads in Combined Benchmark Pool that emulate catalog search activities.             |
-+| cAddToCartByGuestPercentage                                       |  26                 | Percentage of threads in Combined Benchmark Pool that emulate abandoned cart activities.             |
-+| cAddToWishlistPercentage                                          |  1.5                | Percentage of threads in Combined Benchmark Pool that emulate adding products to Wishlist.           |
-+| cCompareProductsPercentage                                        |  1.5                | Percentage of threads in Combined Benchmark Pool that emulate products comparison.                   |
-+| cCheckoutByGuestPercentage                                        |  3.5                | Percentage of threads in Combined Benchmark Pool that emulate checkout by guest.                     |
-+| cCheckoutByCustomerPercentage                                     |  3.5                | Percentage of threads in Combined Benchmark Pool that emulate checkout by customer.                  |
-+| cAccountManagementPercentage                                      |  1                  | Percentage of threads in Combined Benchmark Pool that emulate account management.                    |
-+| cAdminCMSManagementPercentage                                     |  0.35               | Percentage of threads in Combined Benchmark Pool that emulate CMS management activities.             |
-+| cAdminBrowseProductGridPercentage                                 |  0.2                | Percentage of threads in Combined Benchmark Pool that emulate products grid browsing activities.     |
-+| cAdminBrowseOrderGridPercentage                                   |  0.2                | Percentage of threads in Combined Benchmark Pool that emulate orders grid browsing activities.       |
-+| cAdminProductCreationPercentage                                   |  0.5                | Percentage of threads in Combined Benchmark Pool that emulate product creation activities.           |
-+| cAdminProductEditingPercentage                                    |  0.65               | Percentage of threads in Combined Benchmark Pool that emulate product editing activities.            |
-+| cAdminReturnsManagementPercentage                                 |  0.75               | Percentage of threads in Combined Benchmark Pool that emulate admin returns management activities.   |
-+| cAdminBrowseCustomerGridPercentage                                |  0.1                | Percentage of threads in Combined Benchmark Pool that emulate customers grid browsing activities.    |
-+| cAdminCreateOrderPercentage                                       |  0.5                | Percentage of threads in Combined Benchmark Pool that emulate creating orders activities.            |
-+| cAdminCategoryManagementPercentage                                |  0.15               | Percentage of threads in Combined Benchmark Pool that emulate admin category management activities.  |
-+| cAdminPromotionRulesPercentage                                    |  0.2                | Percentage of threads in Combined Benchmark Pool that emulate admin promotion rules activities.      |
-+| cAdminCustomerManagementPercentage                                |  0.4                | Percentage of threads in Combined Benchmark Pool that emulate admin customers management activities. |
-+| cAdminEditOrderPercentage                                         |  1                  | Percentage of threads in Combined Benchmark Pool that emulate admin edit order activities.           |
-+
- 
- Parameters must be passed to the command line with the `J` prefix:
- 
-@@ -113,10 +203,17 @@ There are some options that you should pass to JMeter in the console mode:
- 
- To get more details about available JMeter options, read [Non-GUI Mode](http://jmeter.apache.org/usermanual/get-started.html#non_gui).
- 
--For example, you can run the B2C scenario via console with 90 threads for the Frontend Pool and 10 threads for the Admin Pool:
-+For example, you can run the B2C scenario via console with:
-+90 threads for the Frontend Pool where:
-+- 80% - guest catalog browsing activities.
-+- 20% - checkout by customer.
-+ 
-+10 threads for the Admin Pool where:
-+- 10% - admin products grid browsing activities. 
-+- 90% - admin product creation activities.
- 
-     cd {JMeter path}/bin/
--    jmeter -n -t {path to performance toolkit}/benchmark.jmx -j ./jmeter.log -l ./jmeter-results.jtl -Jhost=magento2.dev -Jbase_path=/ -Jadmin_path=admin -JfrontendPoolUsers=90 -JadminPoolUsers=10
-+    jmeter -n -t {path to performance toolkit}/benchmark.jmx -j ./jmeter.log -l ./jmeter-results.jtl -Jhost=magento2.dev -Jbase_path=/ -Jadmin_path=admin -JfrontendPoolUsers=90 -JadminPoolUsers=10 -JbrowseCatalogByGuestPercentage=80 -JcheckoutByCustomerPercentage=20 -JbrowseProductGridPercentage=10 -JadminProductCreationPercentage=90
- 
- As a result, you will get `jmeter.log` and `jmeter-results.jtl`. The`jmeter.log` contains information about the test run and can be helpful in determining the cause of an error.  The JTL file is a text file containing the results of a test run. It can be opened in the GUI mode to perform analysis of the results (see the *Output* section below).
- 
-@@ -190,42 +287,21 @@ For more details, read [Summary Report](http://jmeter.apache.org/usermanual/comp
- 
- ### Scenarios
- 
--`benchmark.jmx` scenario has the following pools and default percentage breakdown for each scenario:
-+`benchmark.jmx` scenario has the following pools:
- 
- **Frontend Pool** (frontendPoolUsers)
- 
--| Scenario Name             | % of Pool |
--| ------------------------- | --------- |
--| Catalog Browsing By Guest |     30    |
--| Site Search               |     30    |
--| Add To Cart By Guest      |     28    |
--| Add to Wishlist           |     2     |
--| Compare Products          |     2     |
--| Checkout By Guest         |     4     |
--| Checkout By Customer      |     4     |
--
--Site Search thread group contains 3 variations:
--- Quick Search (60%)
--- Quick Search With Filtration (30%)
--- Advanced Search (10%)
--
- **Admin Pool** (adminPoolUsers)
- 
--| Scenario Name               |% of Pool  |
--| ----------------------------| --------- |
--| Admin Promotion Rules       | 15        |
--| Admin Edit Order            | 15        |
--| Admin Category Management   | 10        |
--| Admin Edit Product          | 35        |
--| Admin Create Product        | 25        |
--
- **CSR Pool** (csrPoolUsers)
- 
--| Scenario Name              | % of Pool |
--| -------------------------- | --------- |
--| Browse Customer Grid       | 10        |
--| Admin Create Order         | 70        |
--| Admin Returns Management   | 20        |
-+**API Pool** (apiPoolUsers)
-+
-+**One Thread Scenarios Pool** (oneThreadScenariosPoolUsers)
-+
-+**GraphQL Pool** (graphQLPoolUsers)
-+
-+**Combined Benchmark Pool** (combinedBenchmarkPoolUsers)
- 
- **Legacy Threads**
- 
-diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
-index 1cab68878bc..e92c0bd7381 100644
---- a/setup/performance-toolkit/benchmark.jmx
-+++ b/setup/performance-toolkit/benchmark.jmx
-@@ -34,6 +34,11 @@
-             <stringProp name="Argument.value">${__P(request_protocol,http)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-+          <elementProp name="graphql_port_number" elementType="Argument">
-+            <stringProp name="Argument.name">graphql_port_number</stringProp>
-+            <stringProp name="Argument.value">${__P(graphql_port_number,)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-           <elementProp name="admin_password" elementType="Argument">
-             <stringProp name="Argument.name">admin_password</stringProp>
-             <stringProp name="Argument.value">${__P(admin_password,123123q)}</stringProp>
-@@ -49,6 +54,11 @@
-             <stringProp name="Argument.value">${__P(admin_user,admin)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-+          <elementProp name="cache_hits_percentage" elementType="Argument">
-+            <stringProp name="Argument.name">cache_hits_percentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cache_hits_percentage,100)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-           <elementProp name="seedForRandom" elementType="Argument">
-             <stringProp name="Argument.name">seedForRandom</stringProp>
-             <stringProp name="Argument.value">${__P(seedForRandom,1)}</stringProp>
-@@ -59,6 +69,41 @@
-             <stringProp name="Argument.value">${__P(loops,1)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-+          <elementProp name="frontendPoolUsers" elementType="Argument">
-+            <stringProp name="Argument.name">frontendPoolUsers</stringProp>
-+            <stringProp name="Argument.value">${__P(frontendPoolUsers,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="adminPoolUsers" elementType="Argument">
-+            <stringProp name="Argument.name">adminPoolUsers</stringProp>
-+            <stringProp name="Argument.value">${__P(adminPoolUsers,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="csrPoolUsers" elementType="Argument">
-+            <stringProp name="Argument.name">csrPoolUsers</stringProp>
-+            <stringProp name="Argument.value">${__P(csrPoolUsers,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="apiPoolUsers" elementType="Argument">
-+            <stringProp name="Argument.name">apiPoolUsers</stringProp>
-+            <stringProp name="Argument.value">${__P(apiPoolUsers,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="oneThreadScenariosPoolUsers" elementType="Argument">
-+            <stringProp name="Argument.name">oneThreadScenariosPoolUsers</stringProp>
-+            <stringProp name="Argument.value">${__P(oneThreadScenariosPoolUsers,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphQLPoolUsers" elementType="Argument">
-+            <stringProp name="Argument.name">graphQLPoolUsers</stringProp>
-+            <stringProp name="Argument.value">${__P(graphQLPoolUsers,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="combinedBenchmarkPoolUsers" elementType="Argument">
-+            <stringProp name="Argument.name">combinedBenchmarkPoolUsers</stringProp>
-+            <stringProp name="Argument.value">${__P(combinedBenchmarkPoolUsers,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-           <elementProp name="accountManagementPercentage" elementType="Argument">
-             <stringProp name="Argument.name">accountManagementPercentage</stringProp>
-             <stringProp name="Argument.value">${__P(accountManagementPercentage,0)}</stringProp>
-@@ -71,12 +116,12 @@
-           </elementProp>
-           <elementProp name="addToCartByGuestPercentage" elementType="Argument">
-             <stringProp name="Argument.name">addToCartByGuestPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(addToCartByGuestPercentage,28)}</stringProp>
-+            <stringProp name="Argument.value">${__P(addToCartByGuestPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="addToWishlistPercentage" elementType="Argument">
-             <stringProp name="Argument.name">addToWishlistPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(addToWishlistPercentage,2)}</stringProp>
-+            <stringProp name="Argument.value">${__P(addToWishlistPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="adminCMSManagementDelay" elementType="Argument">
-@@ -101,12 +146,12 @@
-           </elementProp>
-           <elementProp name="adminCategoryManagementPercentage" elementType="Argument">
-             <stringProp name="Argument.name">adminCategoryManagementPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(adminCategoryManagementPercentage,10)}</stringProp>
-+            <stringProp name="Argument.value">${__P(adminCategoryManagementPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="adminCreateOrderPercentage" elementType="Argument">
-             <stringProp name="Argument.name">adminCreateOrderPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(adminCreateOrderPercentage,70)}</stringProp>
-+            <stringProp name="Argument.value">${__P(adminCreateOrderPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="adminCreateProcessReturns" elementType="Argument">
-@@ -129,19 +174,9 @@
-             <stringProp name="Argument.value">${__P(adminCustomerManagementPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
--          <elementProp name="adminEditOrder" elementType="Argument">
--            <stringProp name="Argument.name">adminEditOrder</stringProp>
--            <stringProp name="Argument.value">${__P(adminEditOrder,0)}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
-           <elementProp name="adminEditOrderPercentage" elementType="Argument">
-             <stringProp name="Argument.name">adminEditOrderPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(adminEditOrderPercentage,15)}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
--          <elementProp name="adminEditProduct" elementType="Argument">
--            <stringProp name="Argument.name">adminEditProduct</stringProp>
--            <stringProp name="Argument.value">${__P(adminEditProduct,0)}</stringProp>
-+            <stringProp name="Argument.value">${__P(adminEditOrderPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="adminImportCustomerBehavior" elementType="Argument">
-@@ -164,24 +199,19 @@
-             <stringProp name="Argument.value">${__P(adminImportProductFilePath,import_products/product_import_append_1.csv)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
--          <elementProp name="adminPoolUsers" elementType="Argument">
--            <stringProp name="Argument.name">adminPoolUsers</stringProp>
--            <stringProp name="Argument.value">${__P(adminPoolUsers,1)}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
-           <elementProp name="adminProductCreationPercentage" elementType="Argument">
-             <stringProp name="Argument.name">adminProductCreationPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(adminProductCreationPercentage,25)}</stringProp>
-+            <stringProp name="Argument.value">${__P(adminProductCreationPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="adminProductEditingPercentage" elementType="Argument">
-             <stringProp name="Argument.name">adminProductEditingPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(adminProductEditingPercentage,35)}</stringProp>
-+            <stringProp name="Argument.value">${__P(adminProductEditingPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="adminPromotionRulesPercentage" elementType="Argument">
-             <stringProp name="Argument.name">adminPromotionRulesPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(adminPromotionRulesPercentage,15)}</stringProp>
-+            <stringProp name="Argument.value">${__P(adminPromotionRulesPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="adminPromotionsManagement" elementType="Argument">
-@@ -196,7 +226,7 @@
-           </elementProp>
-           <elementProp name="adminReturnsManagementPercentage" elementType="Argument">
-             <stringProp name="Argument.name">adminReturnsManagementPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(adminReturnsManagementPercentage,20)}</stringProp>
-+            <stringProp name="Argument.value">${__P(adminReturnsManagementPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="admin_browse_customer_filter_text" elementType="Argument">
-@@ -229,16 +259,16 @@
-             <stringProp name="Argument.value">${__P(apiOrderInvoiceShipmentSync,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
--          <elementProp name="apiPoolUsers" elementType="Argument">
--            <stringProp name="Argument.name">apiPoolUsers</stringProp>
--            <stringProp name="Argument.value">${__P(apiPoolUsers,0)}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
-           <elementProp name="apiProcessOrders" elementType="Argument">
-             <stringProp name="Argument.name">apiProcessOrders</stringProp>
-             <stringProp name="Argument.value">${__P(apiProcessOrders,1)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-+          <elementProp name="apiSinglePercentage" elementType="Argument">
-+            <stringProp name="Argument.name">apiSinglePercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(apiSinglePercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-           <elementProp name="bamboo_build_number" elementType="Argument">
-             <stringProp name="Argument.name">bamboo_build_number</stringProp>
-             <stringProp name="Argument.value">${__P(bamboo_build_number,)}</stringProp>
-@@ -251,12 +281,12 @@
-           </elementProp>
-           <elementProp name="browseCatalogByGuestPercentage" elementType="Argument">
-             <stringProp name="Argument.name">browseCatalogByGuestPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(browseCatalogByGuestPercentage,30)}</stringProp>
-+            <stringProp name="Argument.value">${__P(browseCatalogByGuestPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="browseCustomerGridPercentage" elementType="Argument">
-             <stringProp name="Argument.name">browseCustomerGridPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(browseCustomerGridPercentage,10)}</stringProp>
-+            <stringProp name="Argument.value">${__P(browseCustomerGridPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="browseOrderGridPercentage" elementType="Argument">
-@@ -269,9 +299,104 @@
-             <stringProp name="Argument.value">${__P(browseProductGridPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
--          <elementProp name="cache_hits_percentage" elementType="Argument">
--            <stringProp name="Argument.name">cache_hits_percentage</stringProp>
--            <stringProp name="Argument.value">${__P(cache_hits_percentage,100)}</stringProp>
-+          <elementProp name="cAccountManagementPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAccountManagementPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAccountManagementPercentage,1)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAddToCartByGuestPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAddToCartByGuestPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAddToCartByGuestPercentage,26)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAddToWishlistPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAddToWishlistPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAddToWishlistPercentage,1.5)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAdminBrowseCustomerGridPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAdminBrowseCustomerGridPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAdminBrowseCustomerGridPercentage,0.1)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAdminBrowseOrderGridPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAdminBrowseOrderGridPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAdminBrowseOrderGridPercentage,0.2)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAdminBrowseProductGridPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAdminBrowseProductGridPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAdminBrowseProductGridPercentage,0.2)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAdminCMSManagementPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAdminCMSManagementPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAdminCMSManagementPercentage,0.35)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAdminCategoryManagementPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAdminCategoryManagementPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAdminCategoryManagementPercentage,0.15)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAdminCreateOrderPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAdminCreateOrderPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAdminCreateOrderPercentage,0.5)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAdminCustomerManagementPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAdminCustomerManagementPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAdminCustomerManagementPercentage,0.4)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAdminEditOrderPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAdminEditOrderPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAdminEditOrderPercentage,1)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAdminProductCreationPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAdminProductCreationPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAdminProductCreationPercentage,0.5)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAdminProductEditingPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAdminProductEditingPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAdminProductEditingPercentage,0.65)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAdminPromotionRulesPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAdminPromotionRulesPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAdminPromotionRulesPercentage,0.2)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cAdminReturnsManagementPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cAdminReturnsManagementPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cAdminReturnsManagementPercentage,0.75)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cBrowseCatalogByGuestPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cBrowseCatalogByGuestPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cBrowseCatalogByGuestPercentage,29)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cCheckoutByCustomerPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cCheckoutByCustomerPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cCheckoutByCustomerPercentage,3.5)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cCheckoutByGuestPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cCheckoutByGuestPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cCheckoutByGuestPercentage,3.5)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cCompareProductsPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cCompareProductsPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cCompareProductsPercentage,1.5)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="cSiteSearchPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">cSiteSearchPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(cSiteSearchPercentage,29)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="catalogGraphQLPercentage" elementType="Argument">
-@@ -286,17 +411,17 @@
-           </elementProp>
-           <elementProp name="checkoutByCustomerPercentage" elementType="Argument">
-             <stringProp name="Argument.name">checkoutByCustomerPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(checkoutByCustomerPercentage,4)}</stringProp>
-+            <stringProp name="Argument.value">${__P(checkoutByCustomerPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="checkoutByGuestPercentage" elementType="Argument">
-             <stringProp name="Argument.name">checkoutByGuestPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(checkoutByGuestPercentage,4)}</stringProp>
-+            <stringProp name="Argument.value">${__P(checkoutByGuestPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="compareProductsPercentage" elementType="Argument">
-             <stringProp name="Argument.name">compareProductsPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(compareProductsPercentage,2)}</stringProp>
-+            <stringProp name="Argument.value">${__P(compareProductsPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="configurable_products_count" elementType="Argument">
-@@ -304,11 +429,6 @@
-             <stringProp name="Argument.value">${__P(configurable_products_count,15)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
--          <elementProp name="csrPoolUsers" elementType="Argument">
--            <stringProp name="Argument.name">csrPoolUsers</stringProp>
--            <stringProp name="Argument.value">${__P(csrPoolUsers,0)}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
-           <elementProp name="customer_checkout_percent" elementType="Argument">
-             <stringProp name="Argument.name">customer_checkout_percent</stringProp>
-             <stringProp name="Argument.value">${__P(customer_checkout_percent,100)}</stringProp>
-@@ -329,11 +449,6 @@
-             <stringProp name="Argument.value">${__P(dashboard_enabled,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
--          <elementProp name="deadLocksPoolUsers" elementType="Argument">
--            <stringProp name="Argument.name">deadLocksPoolUsers</stringProp>
--            <stringProp name="Argument.value">${__P(deadLocksPoolUsers,1)}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
-           <elementProp name="exportCustomersPercentage" elementType="Argument">
-             <stringProp name="Argument.name">exportCustomersPercentage</stringProp>
-             <stringProp name="Argument.value">${__P(exportCustomersPercentage,0)}</stringProp>
-@@ -349,9 +464,124 @@
-             <stringProp name="Argument.value">${__P(form_key,uVEW54r8kKday8Wk)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
--          <elementProp name="frontendPoolUsers" elementType="Argument">
--            <stringProp name="Argument.name">frontendPoolUsers</stringProp>
--            <stringProp name="Argument.value">${__P(frontendPoolUsers,1)}</stringProp>
-+          <elementProp name="graphqlAddConfigurableProductToCartPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlAddConfigurableProductToCartPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlAddConfigurableProductToCartPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlAddSimpleProductToCartPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlAddSimpleProductToCartPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlAddSimpleProductToCartPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlApplyCouponToCartPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlApplyCouponToCartPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlApplyCouponToCartPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlCatalogBrowsingByGuestPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlCatalogBrowsingByGuestPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlCatalogBrowsingByGuestPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlCheckoutByGuestPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlCheckoutByGuestPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlCheckoutByGuestPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlCreateEmptyCartPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlCreateEmptyCartPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlCreateEmptyCartPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlGetCategoryListByCategoryIdPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlGetCategoryListByCategoryIdPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlGetCategoryListByCategoryIdPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlGetCmsPageByIdPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlGetCmsPageByIdPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlGetCmsPageByIdPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlGetConfigurableProductDetailsByNamePercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlGetConfigurableProductDetailsByNamePercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlGetConfigurableProductDetailsByNamePercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlGetConfigurableProductDetailsByProductUrlKeyPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlGetConfigurableProductDetailsByProductUrlKeyPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlGetConfigurableProductDetailsByProductUrlKeyPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlGetEmptyCartPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlGetEmptyCartPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlGetEmptyCartPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlGetListOfProductsByCategoryIdPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlGetListOfProductsByCategoryIdPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlGetListOfProductsByCategoryIdPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlGetNavigationMenuByCategoryIdPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlGetNavigationMenuByCategoryIdPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlGetNavigationMenuByCategoryIdPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlGetProductSearchByTextAndCategoryIdPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlGetProductSearchByTextAndCategoryIdPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlGetProductSearchByTextAndCategoryIdPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlGetSimpleProductDetailsByNamePercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlGetSimpleProductDetailsByNamePercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlGetSimpleProductDetailsByNamePercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlGetSimpleProductDetailsByProductUrlKeyPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlGetSimpleProductDetailsByProductUrlKeyPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlGetSimpleProductDetailsByProductUrlKeyPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlRemoveConfigurableProductFromCartPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlRemoveConfigurableProductFromCartPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlRemoveConfigurableProductFromCartPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlRemoveCouponFromCartPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlRemoveCouponFromCartPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlRemoveCouponFromCartPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlRemoveSimpleProductFromCartPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlRemoveSimpleProductFromCartPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlRemoveSimpleProductFromCartPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlSetBillingAddressOnCartPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlSetBillingAddressOnCartPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlSetBillingAddressOnCartPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlSetShippingAddressOnCartPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlSetShippingAddressOnCartPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlSetShippingAddressOnCartPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlUpdateConfigurableProductQtyInCartPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlUpdateConfigurableProductQtyInCartPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlUpdateConfigurableProductQtyInCartPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlUpdateSimpleProductQtyInCartPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlUpdateSimpleProductQtyInCartPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlUpdateSimpleProductQtyInCartPercentage,0)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+          <elementProp name="graphqlUrlInfoByUrlKeyPercentage" elementType="Argument">
-+            <stringProp name="Argument.name">graphqlUrlInfoByUrlKeyPercentage</stringProp>
-+            <stringProp name="Argument.value">${__P(graphqlUrlInfoByUrlKeyPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="guest_checkout_percent" elementType="Argument">
-@@ -451,7 +681,7 @@
-           </elementProp>
-           <elementProp name="siteSearchPercentage" elementType="Argument">
-             <stringProp name="Argument.name">siteSearchPercentage</stringProp>
--            <stringProp name="Argument.value">${__P(siteSearchPercentage,30)}</stringProp>
-+            <stringProp name="Argument.value">${__P(siteSearchPercentage,0)}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-           <elementProp name="sprint_identifier" elementType="Argument">
-@@ -658,6 +888,10 @@ props.remove("configurable_products_list");
- props.remove("configurable_products_list_for_edit");
- props.remove("users");
- props.remove("customer_emails_list");
-+props.remove("categories");
-+props.remove("cms_pages");
-+props.remove("cms_blocks");
-+props.remove("coupon_codes");
- 
- /* This is only used when admin is enabled. */
- props.put("activeAdminThread", "");
-@@ -821,367 +1055,463 @@ if (!slash.equals(path.substring(path.length() -1)) || !slash.equals(path.substr
-       </hashTree>
-     </hashTree>
-   
--    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract categories" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_categories.jmx</stringProp>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract admin users" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_admin_users.jmx</stringProp>
- </TestFragmentController>
-     <hashTree>
--      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Extract categories" enabled="true"/>
--      <hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Content-Type</stringProp>
--              <stringProp name="Header.value">application/json</stringProp>
--            </elementProp>
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Accept</stringProp>
--              <stringProp name="Header.value">*/*</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
--          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--            <collectionProp name="Arguments.arguments">
--              <elementProp name="" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--              </elementProp>
--            </collectionProp>
--          </elementProp>
--          <stringProp name="HTTPSampler.domain"/>
--          <stringProp name="HTTPSampler.port"/>
--          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--          <stringProp name="HTTPSampler.contentEncoding"/>
--          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
--          <stringProp name="HTTPSampler.method">POST</stringProp>
--          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--          <boolProp name="HTTPSampler.monitor">false</boolProp>
--          <stringProp name="HTTPSampler.embedded_url_re"/>
--        </HTTPSamplerProxy>
--        <hashTree>
--          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
--            <stringProp name="VAR">admin_token</stringProp>
--            <stringProp name="JSONPATH">$</stringProp>
--            <stringProp name="DEFAULT"/>
--            <stringProp name="VARIABLE"/>
--            <stringProp name="SUBJECT">BODY</stringProp>
--          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--          <hashTree/>
--          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
--            <collectionProp name="Asserion.test_strings">
--              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
--            </collectionProp>
--            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--            <boolProp name="Assertion.assume_success">false</boolProp>
--            <intProp name="Assertion.test_type">1</intProp>
--            <stringProp name="Assertion.scope">variable</stringProp>
--            <stringProp name="Scope.variable">admin_token</stringProp>
--          </ResponseAssertion>
--          <hashTree/>
--        </hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Authorization</stringProp>
--              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Extract Admin Users" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-             </elementProp>
-           </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get Categories Names and skus" enabled="true">
--          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
--            <collectionProp name="Arguments.arguments">
--              <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">path</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
--              </elementProp>
--              <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">1/2/%</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
--              </elementProp>
--              <elementProp name="searchCriteria[filterGroups][0][filters][0][conditionType]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">like</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][conditionType]</stringProp>
--              </elementProp>
--              <elementProp name="searchCriteria[filterGroups][1][filters][0][field]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">level</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][field]</stringProp>
--              </elementProp>
--              <elementProp name="searchCriteria[filterGroups][1][filters][0][value]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">2</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][value]</stringProp>
--              </elementProp>
--              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">${categories_count}</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
--              </elementProp>
--            </collectionProp>
--          </elementProp>
--          <stringProp name="HTTPSampler.domain"/>
--          <stringProp name="HTTPSampler.port"/>
--          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--          <stringProp name="HTTPSampler.contentEncoding"/>
--          <stringProp name="HTTPSampler.path">${base_path}rest/V1/categories/list</stringProp>
--          <stringProp name="HTTPSampler.method">GET</stringProp>
--          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--          <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
--          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--          <boolProp name="HTTPSampler.monitor">false</boolProp>
--          <stringProp name="HTTPSampler.embedded_url_re"/>
--        </HTTPSamplerProxy>
--        <hashTree>
--          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract category url key" enabled="true">
--            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">category_url_keys</stringProp>
--            <stringProp name="RegexExtractor.regex">url_key\",\"value\":\"(.*?)\"</stringProp>
--            <stringProp name="RegexExtractor.template">$1$</stringProp>
--            <stringProp name="RegexExtractor.default"/>
--            <stringProp name="RegexExtractor.match_number">-1</stringProp>
--          </RegexExtractor>
--          <hashTree/>
--          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract category name" enabled="true">
--            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">category_names</stringProp>
--            <stringProp name="RegexExtractor.regex">name\":\"(.*?)\"</stringProp>
--            <stringProp name="RegexExtractor.template">$1$</stringProp>
--            <stringProp name="RegexExtractor.default"/>
--            <stringProp name="RegexExtractor.match_number">-1</stringProp>
--          </RegexExtractor>
--          <hashTree/>
--        </hashTree>
--      </hashTree>
--      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: category url keys loop" enabled="true">
--        <stringProp name="ForeachController.inputVal">category_url_keys</stringProp>
--        <stringProp name="ForeachController.returnVal">category_url_key</stringProp>
--        <boolProp name="ForeachController.useSeparator">true</boolProp>
--      </ForeachController>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/user/roleGrid/limit/200/?ajax=true&amp;isAjax=true</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-       <hashTree>
--        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
--          <stringProp name="CounterConfig.start">1</stringProp>
--          <stringProp name="CounterConfig.end"/>
--          <stringProp name="CounterConfig.incr">1</stringProp>
--          <stringProp name="CounterConfig.name">category_url_key_counter</stringProp>
--          <stringProp name="CounterConfig.format"/>
--          <boolProp name="CounterConfig.per_user">false</boolProp>
--        </CounterConfig>
--        <hashTree/>
--        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect category url keys" enabled="true">
--          <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
-+        <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
-+          <stringProp name="filename"/>
-+          <stringProp name="parameters"/>
-+          <boolProp name="resetInterpreter">false</boolProp>
-+          <stringProp name="script">import java.util.regex.Pattern;
-+                    import java.util.regex.Matcher;
-+                    import java.util.LinkedList;
- 
--// If it is first iteration of cycle then recreate category url key list
--if (1 == Integer.parseInt(vars.get("category_url_key_counter"))) {
--    categoryUrlKeysList = new ArrayList();
--    props.put("category_url_keys_list", categoryUrlKeysList);
--    props.put("category_url_key", vars.get("category_url_key"));
--} else {
--    categoryUrlKeysList = props.get("category_url_keys_list");
--}
--categoryUrlKeysList.add(vars.get("category_url_key"));</stringProp>
--          <stringProp name="BeanShellSampler.filename"/>
--          <stringProp name="BeanShellSampler.parameters"/>
--          <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--        </BeanShellSampler>
--        <hashTree/>
--      </hashTree>
--      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: category names loop" enabled="true">
--        <stringProp name="ForeachController.inputVal">category_names</stringProp>
--        <stringProp name="ForeachController.returnVal">category_name</stringProp>
--        <boolProp name="ForeachController.useSeparator">true</boolProp>
--      </ForeachController>
--      <hashTree>
--        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
--          <stringProp name="CounterConfig.start">1</stringProp>
--          <stringProp name="CounterConfig.end"/>
--          <stringProp name="CounterConfig.incr">1</stringProp>
--          <stringProp name="CounterConfig.name">category_name_counter</stringProp>
--          <stringProp name="CounterConfig.format"/>
--          <boolProp name="CounterConfig.per_user">false</boolProp>
--        </CounterConfig>
--        <hashTree/>
--        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect category names" enabled="true">
--          <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
-+                    LinkedList adminUserList = new LinkedList();
-+                    String response = new String(data);
-+                    Pattern pattern = Pattern.compile("&lt;td\\W*?data-column=.username[^&gt;]*?&gt;\\W*?(\\w+)\\W*?&lt;");
-+                    Matcher matcher = pattern.matcher(response);
- 
--// If it is first iteration of cycle then recreate category name list
--if (1 == Integer.parseInt(vars.get("category_name_counter"))) {
--    categoryNamesList = new ArrayList();
--    props.put("category_names_list",categoryNamesList);
--    props.put("category_name", vars.get("category_name"));
--} else {
--    categoryNamesList = props.get("category_names_list");
--}
-+                    while (matcher.find()) {
-+                    adminUserList.add(matcher.group(1));
-+                    }
- 
--categoryNamesList.add(vars.get("category_name"));</stringProp>
--          <stringProp name="BeanShellSampler.filename"/>
--          <stringProp name="BeanShellSampler.parameters"/>
--          <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--        </BeanShellSampler>
-+                    adminUserList.poll();
-+                    props.put("adminUserList", adminUserList);
-+                    props.put("adminUserListIterator", adminUserList.descendingIterator());
-+                </stringProp>
-+        </BeanShellPostProcessor>
-         <hashTree/>
-       </hashTree>
--      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect category" enabled="true">
--        <stringProp name="BeanShellSampler.query">props.put("category_url_key", vars.get("category_url_key"));
--props.put("category_name", vars.get("category_name"));</stringProp>
--        <stringProp name="BeanShellSampler.filename"/>
--        <stringProp name="BeanShellSampler.parameters"/>
--        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--      </BeanShellSampler>
--      <hashTree/>
-     </hashTree>
-   
--    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract categories id of last level" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_categories_id_of_last_level.jmx</stringProp>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract customers" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_customers.jmx</stringProp>
- </TestFragmentController>
-     <hashTree>
--      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Clear Admin Category Management properties" enabled="true">
--        <stringProp name="BeanShellSampler.query">props.remove("admin_category_ids_list");</stringProp>
--        <stringProp name="BeanShellSampler.filename"/>
--        <stringProp name="BeanShellSampler.parameters"/>
--        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--      </BeanShellSampler>
--      <hashTree/>
--      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Get categories of last level" enabled="true"/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Open Customer Grid" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-       <hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Content-Type</stringProp>
--              <stringProp name="Header.value">application/json</stringProp>
--            </elementProp>
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Accept</stringProp>
--              <stringProp name="Header.value">*/*</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
-+        <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
-+          <stringProp name="filename"/>
-+          <stringProp name="parameters"/>
-+          <boolProp name="resetInterpreter">true</boolProp>
-+          <stringProp name="script">import org.apache.jmeter.protocol.http.control.CookieManager;
-+import org.apache.jmeter.protocol.http.control.Cookie;
-+CookieManager manager = sampler.getCookieManager();
-+Cookie cookie = new Cookie("adminhtml",vars.get("COOKIE_adminhtml"),vars.get("host"),"/",false,0);
-+manager.add(cookie); </stringProp>
-+        </BeanShellPreProcessor>
-         <hashTree/>
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
--          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--            <collectionProp name="Arguments.arguments">
--              <elementProp name="" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--              </elementProp>
--            </collectionProp>
--          </elementProp>
--          <stringProp name="HTTPSampler.domain"/>
--          <stringProp name="HTTPSampler.port"/>
--          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--          <stringProp name="HTTPSampler.contentEncoding"/>
--          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
--          <stringProp name="HTTPSampler.method">POST</stringProp>
--          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--          <boolProp name="HTTPSampler.monitor">false</boolProp>
--          <stringProp name="HTTPSampler.embedded_url_re"/>
--        </HTTPSamplerProxy>
--        <hashTree>
--          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
--            <stringProp name="VAR">admin_token</stringProp>
--            <stringProp name="JSONPATH">$</stringProp>
--            <stringProp name="DEFAULT"/>
--            <stringProp name="VARIABLE"/>
--            <stringProp name="SUBJECT">BODY</stringProp>
--          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--          <hashTree/>
--          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
--            <collectionProp name="Asserion.test_strings">
--              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
--            </collectionProp>
--            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--            <boolProp name="Assertion.assume_success">false</boolProp>
--            <intProp name="Assertion.test_type">1</intProp>
--            <stringProp name="Assertion.scope">variable</stringProp>
--            <stringProp name="Scope.variable">admin_token</stringProp>
--          </ResponseAssertion>
--          <hashTree/>
--        </hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Authorization</stringProp>
--              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
--            </elementProp>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Customer Grid" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-679437259">Customers</stringProp>
-+            <stringProp name="495525733">&lt;title&gt;Customers / Customers / Magento Admin&lt;/title&gt;</stringProp>
-           </collectionProp>
--        </HeaderManager>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-         <hashTree/>
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - API Get categories" enabled="true">
--          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--            <collectionProp name="Arguments.arguments">
--              <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">children_count</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
--              </elementProp>
--              <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">0</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
--              </elementProp>
--              <elementProp name="searchCriteria[filterGroups][1][filters][0][field]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">level</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][field]</stringProp>
--              </elementProp>
--              <elementProp name="searchCriteria[filterGroups][1][filters][0][value]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">2</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][value]</stringProp>
--              </elementProp>
--              <elementProp name="searchCriteria[filterGroups][1][filters][0][conditionType]" elementType="HTTPArgument">
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Search Customers" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="namespace" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">customer_listing</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">namespace</stringProp>
-+            </elementProp>
-+            <elementProp name="sorting[field]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">entity_id</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">sorting[field]</stringProp>
-+            </elementProp>
-+            <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">asc</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            </elementProp>
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-+            </elementProp>
-+            <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">customer_since[locale]=en_US</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+            </elementProp>
-+            <elementProp name="filters[group_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">filters[group_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="filters[website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">filters[website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${customers_page_size}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+            </elementProp>
-+            <elementProp name="paging[current]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">paging[current]</stringProp>
-+            </elementProp>
-+            <elementProp name="sorting[field]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">entity_id</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">sorting[field]</stringProp>
-+            </elementProp>
-+            <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">asc</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            </elementProp>
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
-+          <stringProp name="JSON_PATH">$.totalRecords</stringProp>
-+          <stringProp name="EXPECTED_VALUE">0</stringProp>
-+          <boolProp name="JSONVALIDATION">true</boolProp>
-+          <boolProp name="EXPECT_NULL">false</boolProp>
-+          <boolProp name="INVERT">true</boolProp>
-+          <boolProp name="ISREGEX">true</boolProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+        <hashTree/>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer emails" enabled="true">
-+          <stringProp name="VAR">customer_emails</stringProp>
-+          <stringProp name="JSONPATH">$.items[*].email</stringProp>
-+          <stringProp name="DEFAULT"/>
-+          <stringProp name="VARIABLE"/>
-+          <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer ids" enabled="true">
-+          <stringProp name="VAR">customer_ids</stringProp>
-+          <stringProp name="JSONPATH">$.items[*].entity_id</stringProp>
-+          <stringProp name="DEFAULT"/>
-+          <stringProp name="VARIABLE"/>
-+          <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+        <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Make email list" enabled="true">
-+          <boolProp name="resetInterpreter">false</boolProp>
-+          <stringProp name="parameters"/>
-+          <stringProp name="filename"/>
-+          <stringProp name="script">import java.util.LinkedList;
-+LinkedList emailsList = new LinkedList();
-+props.put("customer_emails_list", emailsList);</stringProp>
-+        </BeanShellPostProcessor>
-+        <hashTree/>
-+      </hashTree>
-+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: customer emails loop (search result)" enabled="true">
-+        <stringProp name="ForeachController.inputVal">customer_emails</stringProp>
-+        <stringProp name="ForeachController.returnVal">customer_email</stringProp>
-+        <boolProp name="ForeachController.useSeparator">true</boolProp>
-+      </ForeachController>
-+      <hashTree>
-+        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+          <stringProp name="CounterConfig.start">1</stringProp>
-+          <stringProp name="CounterConfig.end"/>
-+          <stringProp name="CounterConfig.incr">1</stringProp>
-+          <stringProp name="CounterConfig.name">email_counter</stringProp>
-+          <stringProp name="CounterConfig.format"/>
-+          <boolProp name="CounterConfig.per_user">false</boolProp>
-+        </CounterConfig>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect customer emails" enabled="true">
-+          <stringProp name="BeanShellSampler.query">
-+try {
-+
-+props.get("customer_emails_list").add(vars.get("customer_email"));
-+
-+} catch (java.lang.Exception e) {
-+	log.error("error&#x2026;", e);
-+	SampleResult.setStopThread(true);
-+}
-+          </stringProp>
-+          <stringProp name="BeanShellSampler.filename"/>
-+          <stringProp name="BeanShellSampler.parameters"/>
-+          <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+      </hashTree>
-+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: customer ids loop (search result)" enabled="true">
-+        <stringProp name="ForeachController.inputVal">customer_ids</stringProp>
-+        <stringProp name="ForeachController.returnVal">customer_id</stringProp>
-+        <boolProp name="ForeachController.useSeparator">true</boolProp>
-+      </ForeachController>
-+      <hashTree>
-+        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+          <stringProp name="CounterConfig.start">1</stringProp>
-+          <stringProp name="CounterConfig.end"/>
-+          <stringProp name="CounterConfig.incr">1</stringProp>
-+          <stringProp name="CounterConfig.name">id_counter</stringProp>
-+          <stringProp name="CounterConfig.format"/>
-+          <boolProp name="CounterConfig.per_user">false</boolProp>
-+        </CounterConfig>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect customer ids" enabled="true">
-+          <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
-+
-+// If it is first iteration of cycle then recreate idsList
-+if (1 == Integer.parseInt(vars.get("id_counter"))) {
-+    idsList = new ArrayList();
-+    props.put("customer_ids_list", idsList);
-+} else {
-+    idsList = props.get("customer_ids_list");
-+}
-+idsList.add(vars.get("customer_id"));</stringProp>
-+          <stringProp name="BeanShellSampler.filename"/>
-+          <stringProp name="BeanShellSampler.parameters"/>
-+          <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+      </hashTree>
-+    </hashTree>
-+  
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract region ids" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_region_ids.jmx</stringProp>
-+    </TestFragmentController>
-+    <hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Extract Region ids" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="parent" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+              <stringProp name="Argument.value">US</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">parent</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout"/>
-+        <stringProp name="HTTPSampler.response_timeout"/>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/directory/json/countryRegion/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Parse and put region id into variables" enabled="true">
-+          <stringProp name="scriptLanguage">groovy</stringProp>
-+          <stringProp name="parameters"/>
-+          <stringProp name="filename"/>
-+          <stringProp name="cacheKey"/>
-+          <stringProp name="script">import groovy.json.JsonSlurper
-+def jsonSlurper = new JsonSlurper();
-+def regionResponse = jsonSlurper.parseText(prev.getResponseDataAsString());
-+
-+regionResponse.each { region -&gt;
-+	if (region.label.toString() == "Alabama") {
-+		props.put("alabama_region_id", region.value.toString());
-+	} else if (region.label.toString() == 'California') {
-+		props.put("california_region_id", region.value.toString());
-+	}
-+}</stringProp>
-+        </JSR223PostProcessor>
-+        <hashTree/>
-+      </hashTree>
-+    </hashTree>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Api Data Retrieval" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-+        <stringProp name="VAR">admin_token</stringProp>
-+        <stringProp name="JSONPATH">$</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_token</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Authorization</stringProp>
-+          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="SetUp - Get CMS pages" enabled="true"/>
-+      <hashTree>
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get CMS pages" enabled="true">
-+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+            <collectionProp name="Arguments.arguments">
-+              <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
-                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">gt</stringProp>
-+                <stringProp name="Argument.value">1</stringProp>
-                 <stringProp name="Argument.metadata">=</stringProp>
-                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][conditionType]</stringProp>
-+                <stringProp name="Argument.name">searchCriteria[current_page]</stringProp>
-               </elementProp>
--              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">${adminCategoryCount}</stringProp>
-+              <elementProp name="searchCriteria[page_size]" elementType="HTTPArgument">
-+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+                <stringProp name="Argument.value">20</stringProp>
-                 <stringProp name="Argument.metadata">=</stringProp>
-                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
-+                <stringProp name="Argument.name">searchCriteria[page_size]</stringProp>
-               </elementProp>
-             </collectionProp>
-           </elementProp>
-@@ -1191,7 +1521,7 @@ props.put("category_name", vars.get("category_name"));</stringProp>
-           <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-           <stringProp name="HTTPSampler.contentEncoding"/>
--          <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/categories/list</stringProp>
-+          <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/cmsPage/search</stringProp>
-           <stringProp name="HTTPSampler.method">GET</stringProp>
-           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-@@ -1199,118 +1529,42 @@ props.put("category_name", vars.get("category_name"));</stringProp>
-           <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-           <boolProp name="HTTPSampler.monitor">false</boolProp>
-           <stringProp name="HTTPSampler.embedded_url_re"/>
-+          <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/get_cms_pages.jmx</stringProp>
-         </HTTPSamplerProxy>
-         <hashTree>
--          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
--            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">category_list_id</stringProp>
--            <stringProp name="RegexExtractor.regex">\{\"id\":(\d+),</stringProp>
--            <stringProp name="RegexExtractor.template">$1$</stringProp>
--            <stringProp name="RegexExtractor.default"/>
--            <stringProp name="RegexExtractor.match_number">-1</stringProp>
--          </RegexExtractor>
-+          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert results are present" enabled="true">
-+            <stringProp name="JSON_PATH">$.total_count</stringProp>
-+            <stringProp name="EXPECTED_VALUE">0</stringProp>
-+            <boolProp name="JSONVALIDATION">true</boolProp>
-+            <boolProp name="EXPECT_NULL">false</boolProp>
-+            <boolProp name="INVERT">true</boolProp>
-+            <boolProp name="ISREGEX">false</boolProp>
-+          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-           <hashTree/>
--        </hashTree>
--        <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Category Id" enabled="true">
--          <stringProp name="ForeachController.inputVal">category_list_id</stringProp>
--          <stringProp name="ForeachController.returnVal">category_id</stringProp>
--          <boolProp name="ForeachController.useSeparator">true</boolProp>
--        </ForeachController>
--        <hashTree>
--          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Process categories ids" enabled="true">
--            <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
-+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="PostProcessor" enabled="true">
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+            <stringProp name="parameters"/>
-+            <stringProp name="filename"/>
-+            <stringProp name="cacheKey"/>
-+            <stringProp name="script">var data = JSON.parse(prev.getResponseDataAsString());
- 
--adminCategoryIdsList = props.get("admin_category_ids_list");
--// If it is first iteration of cycle then recreate categories ids list
--if (adminCategoryIdsList == null) {
--    adminCategoryIdsList = new ArrayList();
--    props.put("admin_category_ids_list", adminCategoryIdsList);
--}
--adminCategoryIdsList.add(vars.get("category_id"));</stringProp>
--            <stringProp name="BeanShellSampler.filename"/>
--            <stringProp name="BeanShellSampler.parameters"/>
--            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--          </BeanShellSampler>
-+var cmsPages = [];
-+
-+for (var i in data.items) {
-+    cmsPages.push({"id": data.items[i].id, "identifier": data.items[i].identifier});
-+ }
-+
-+props.put("cms_pages", cmsPages);
-+</stringProp>
-+          </JSR223PostProcessor>
-           <hashTree/>
-         </hashTree>
--      </hashTree>
-     </hashTree>
-   
-     <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract configurable products" enabled="true">
-   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_configurable_products.jmx</stringProp>
- </TestFragmentController>
-     <hashTree>
--      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Retrieve configurable products" enabled="true"/>
--      <hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Content-Type</stringProp>
--              <stringProp name="Header.value">application/json</stringProp>
--            </elementProp>
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Accept</stringProp>
--              <stringProp name="Header.value">*/*</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
--          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--            <collectionProp name="Arguments.arguments">
--              <elementProp name="" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--              </elementProp>
--            </collectionProp>
--          </elementProp>
--          <stringProp name="HTTPSampler.domain"/>
--          <stringProp name="HTTPSampler.port"/>
--          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--          <stringProp name="HTTPSampler.contentEncoding"/>
--          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
--          <stringProp name="HTTPSampler.method">POST</stringProp>
--          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--          <boolProp name="HTTPSampler.monitor">false</boolProp>
--          <stringProp name="HTTPSampler.embedded_url_re"/>
--        </HTTPSamplerProxy>
--        <hashTree>
--          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
--            <stringProp name="VAR">admin_token</stringProp>
--            <stringProp name="JSONPATH">$</stringProp>
--            <stringProp name="DEFAULT"/>
--            <stringProp name="VARIABLE"/>
--            <stringProp name="SUBJECT">BODY</stringProp>
--          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--          <hashTree/>
--          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
--            <collectionProp name="Asserion.test_strings">
--              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
--            </collectionProp>
--            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--            <boolProp name="Assertion.assume_success">false</boolProp>
--            <intProp name="Assertion.test_type">1</intProp>
--            <stringProp name="Assertion.scope">variable</stringProp>
--            <stringProp name="Scope.variable">admin_token</stringProp>
--          </ResponseAssertion>
--          <hashTree/>
--        </hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Authorization</stringProp>
--              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
-         <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get configurable products" enabled="true">
-           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-             <collectionProp name="Arguments.arguments">
-@@ -1365,7 +1619,7 @@ adminCategoryIdsList.add(vars.get("category_id"));</stringProp>
-           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product ids" enabled="true">
-             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-             <stringProp name="RegexExtractor.refname">configurable_product_ids</stringProp>
--            <stringProp name="RegexExtractor.regex">\"id\":(\d+),</stringProp>
-+            <stringProp name="RegexExtractor.regex">\"id\":(\d+),\"sku\"</stringProp>
-             <stringProp name="RegexExtractor.template">$1$</stringProp>
-             <stringProp name="RegexExtractor.default"/>
-             <stringProp name="RegexExtractor.match_number">-1</stringProp>
-@@ -1410,6 +1664,7 @@ adminCategoryIdsList.add(vars.get("category_id"));</stringProp>
-           <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
- import java.util.HashMap;
- import org.apache.commons.codec.binary.Base64;
-+ArrayList productList;
- 
- // If it is first iteration of cycle then recreate productList
- if (1 == Integer.parseInt(vars.get("configurable_products_counter"))) {
-@@ -1437,35 +1692,41 @@ productList.add(productMap);</stringProp>
-         </BeanShellSampler>
-         <hashTree/>
-       </hashTree>
--    </hashTree>
-   
-     <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract configurable products for edit" enabled="true">
-   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_configurable_products_for_edit.jmx</stringProp>
- </TestFragmentController>
-     <hashTree>
--      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Retrieve configurable products for edit" enabled="true"/>
--      <hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Content-Type</stringProp>
--              <stringProp name="Header.value">application/json</stringProp>
--            </elementProp>
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Accept</stringProp>
--              <stringProp name="Header.value">*/*</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
--          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get configurable products for edit" enabled="true">
-+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-             <collectionProp name="Arguments.arguments">
--              <elementProp name="" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-+              <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
-+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                <stringProp name="Argument.value">type_id</stringProp>
-+                <stringProp name="Argument.metadata">=</stringProp>
-+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
-+              </elementProp>
-+              <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
-+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                <stringProp name="Argument.value">configurable</stringProp>
-+                <stringProp name="Argument.metadata">=</stringProp>
-+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
-+              </elementProp>
-+              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
-+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                <stringProp name="Argument.value">${configurable_products_count}</stringProp>
-                 <stringProp name="Argument.metadata">=</stringProp>
-+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
-+              </elementProp>
-+              <elementProp name="searchCriteria[currentPage]" elementType="HTTPArgument">
-+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                <stringProp name="Argument.value">2</stringProp>
-+                <stringProp name="Argument.metadata">=</stringProp>
-+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                <stringProp name="Argument.name">searchCriteria[currentPage]</stringProp>
-               </elementProp>
-             </collectionProp>
-           </elementProp>
-@@ -1475,86 +1736,8 @@ productList.add(productMap);</stringProp>
-           <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-           <stringProp name="HTTPSampler.contentEncoding"/>
--          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
--          <stringProp name="HTTPSampler.method">POST</stringProp>
--          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--          <boolProp name="HTTPSampler.monitor">false</boolProp>
--          <stringProp name="HTTPSampler.embedded_url_re"/>
--        </HTTPSamplerProxy>
--        <hashTree>
--          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
--            <stringProp name="VAR">admin_token</stringProp>
--            <stringProp name="JSONPATH">$</stringProp>
--            <stringProp name="DEFAULT"/>
--            <stringProp name="VARIABLE"/>
--            <stringProp name="SUBJECT">BODY</stringProp>
--          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--          <hashTree/>
--          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
--            <collectionProp name="Asserion.test_strings">
--              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
--            </collectionProp>
--            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--            <boolProp name="Assertion.assume_success">false</boolProp>
--            <intProp name="Assertion.test_type">1</intProp>
--            <stringProp name="Assertion.scope">variable</stringProp>
--            <stringProp name="Scope.variable">admin_token</stringProp>
--          </ResponseAssertion>
--          <hashTree/>
--        </hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Authorization</stringProp>
--              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get configurable products for edit" enabled="true">
--          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
--            <collectionProp name="Arguments.arguments">
--              <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">type_id</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
--              </elementProp>
--              <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">configurable</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
--              </elementProp>
--              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">${configurable_products_count}</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
--              </elementProp>
--              <elementProp name="searchCriteria[currentPage]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">2</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[currentPage]</stringProp>
--              </elementProp>
--            </collectionProp>
--          </elementProp>
--          <stringProp name="HTTPSampler.domain"/>
--          <stringProp name="HTTPSampler.port"/>
--          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--          <stringProp name="HTTPSampler.contentEncoding"/>
--          <stringProp name="HTTPSampler.path">${base_path}rest/V1/products</stringProp>
--          <stringProp name="HTTPSampler.method">GET</stringProp>
-+          <stringProp name="HTTPSampler.path">${base_path}rest/V1/products</stringProp>
-+          <stringProp name="HTTPSampler.method">GET</stringProp>
-           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-           <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-@@ -1575,7 +1758,7 @@ productList.add(productMap);</stringProp>
-           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product ids" enabled="true">
-             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-             <stringProp name="RegexExtractor.refname">configurable_product_for_edit_ids</stringProp>
--            <stringProp name="RegexExtractor.regex">\"id\":(\d+),</stringProp>
-+            <stringProp name="RegexExtractor.regex">\"id\":(\d+),\"sku\"</stringProp>
-             <stringProp name="RegexExtractor.template">$1$</stringProp>
-             <stringProp name="RegexExtractor.default"/>
-             <stringProp name="RegexExtractor.match_number">-1</stringProp>
-@@ -1620,12 +1803,13 @@ productList.add(productMap);</stringProp>
-           <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
- import java.util.HashMap;
- import org.apache.commons.codec.binary.Base64;
-+ArrayList editProductList;
- 
- if (1 == Integer.parseInt(vars.get("configurable_products_counter_for_edit"))) {
-     editProductList = new ArrayList();
-     props.put("configurable_products_list_for_edit", editProductList);
- } else {
--    productList = props.get("configurable_products_list_for_edit");
-+    editProductList = props.get("configurable_products_list_for_edit");
- }
- 
- String productUrl = vars.get("request_protocol") + "://" + vars.get("host") + vars.get("base_path") + vars.get("configurable_products_for_edit_url_keys_" + vars.get("configurable_products_counter_for_edit"))+ vars.get("url_suffix");
-@@ -1645,85 +1829,13 @@ editProductList.add(editProductMap);</stringProp>
-           <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-         </BeanShellSampler>
-         <hashTree/>
--      </hashTree>
-     </hashTree>
-   
--    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract simple products for edit" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_simple_products_for_edit.jmx</stringProp>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract simple products" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_simple_products.jmx</stringProp>
- </TestFragmentController>
-     <hashTree>
--      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Retrieve simple products for edit" enabled="true"/>
--      <hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Content-Type</stringProp>
--              <stringProp name="Header.value">application/json</stringProp>
--            </elementProp>
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Accept</stringProp>
--              <stringProp name="Header.value">*/*</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
--          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--            <collectionProp name="Arguments.arguments">
--              <elementProp name="" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--              </elementProp>
--            </collectionProp>
--          </elementProp>
--          <stringProp name="HTTPSampler.domain"/>
--          <stringProp name="HTTPSampler.port"/>
--          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--          <stringProp name="HTTPSampler.contentEncoding"/>
--          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
--          <stringProp name="HTTPSampler.method">POST</stringProp>
--          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--          <boolProp name="HTTPSampler.monitor">false</boolProp>
--          <stringProp name="HTTPSampler.embedded_url_re"/>
--        </HTTPSamplerProxy>
--        <hashTree>
--          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
--            <stringProp name="VAR">admin_token</stringProp>
--            <stringProp name="JSONPATH">$</stringProp>
--            <stringProp name="DEFAULT"/>
--            <stringProp name="VARIABLE"/>
--            <stringProp name="SUBJECT">BODY</stringProp>
--          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--          <hashTree/>
--          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
--            <collectionProp name="Asserion.test_strings">
--              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
--            </collectionProp>
--            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--            <boolProp name="Assertion.assume_success">false</boolProp>
--            <intProp name="Assertion.test_type">1</intProp>
--            <stringProp name="Assertion.scope">variable</stringProp>
--            <stringProp name="Scope.variable">admin_token</stringProp>
--          </ResponseAssertion>
--          <hashTree/>
--        </hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Authorization</stringProp>
--              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get simple products for edit" enabled="true">
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get simple products" enabled="true">
-           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-             <collectionProp name="Arguments.arguments">
-               <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
-@@ -1747,26 +1859,19 @@ editProductList.add(editProductMap);</stringProp>
-                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                 <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
-               </elementProp>
--              <elementProp name="searchCriteria[currentPage]" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">true</boolProp>
--                <stringProp name="Argument.value">1</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--                <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[currentPage]</stringProp>
--              </elementProp>
--              <elementProp name="searchCriteria[filterGroups][1][filters][1][field]" elementType="HTTPArgument">
-+              <elementProp name="searchCriteria[filterGroups][0][filters][1][field]" elementType="HTTPArgument">
-                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                 <stringProp name="Argument.value">attribute_set_id</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
-+                <stringProp name="Argument.metadata">!=</stringProp>
-                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][1][field]</stringProp>
-+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][field]</stringProp>
-               </elementProp>
--              <elementProp name="searchCriteria[filterGroups][1][filters][1][value]" elementType="HTTPArgument">
-+              <elementProp name="searchCriteria[filterGroups][0][filters][1][value]" elementType="HTTPArgument">
-                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                 <stringProp name="Argument.value">4</stringProp>
-                 <stringProp name="Argument.metadata">=</stringProp>
-                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][1][value]</stringProp>
-+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][value]</stringProp>
-               </elementProp>
-             </collectionProp>
-           </elementProp>
-@@ -1788,7 +1893,7 @@ editProductList.add(editProductMap);</stringProp>
-         <hashTree>
-           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product url keys" enabled="true">
-             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">simple_products_for_edit_url_keys</stringProp>
-+            <stringProp name="RegexExtractor.refname">simple_products_url_keys</stringProp>
-             <stringProp name="RegexExtractor.regex">url_key\",\"value\":\"(.*?)\"</stringProp>
-             <stringProp name="RegexExtractor.template">$1$</stringProp>
-             <stringProp name="RegexExtractor.default"/>
-@@ -1797,8 +1902,8 @@ editProductList.add(editProductMap);</stringProp>
-           <hashTree/>
-           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product ids" enabled="true">
-             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">simple_product_for_edit_ids</stringProp>
--            <stringProp name="RegexExtractor.regex">\"id\":(\d+),</stringProp>
-+            <stringProp name="RegexExtractor.refname">simple_product_ids</stringProp>
-+            <stringProp name="RegexExtractor.regex">\"id\":(\d+),\"sku\"</stringProp>
-             <stringProp name="RegexExtractor.template">$1$</stringProp>
-             <stringProp name="RegexExtractor.default"/>
-             <stringProp name="RegexExtractor.match_number">-1</stringProp>
-@@ -1806,7 +1911,7 @@ editProductList.add(editProductMap);</stringProp>
-           <hashTree/>
-           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product titles" enabled="true">
-             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">simple_product_for_edit_names</stringProp>
-+            <stringProp name="RegexExtractor.refname">simple_product_names</stringProp>
-             <stringProp name="RegexExtractor.regex">name\":\"(.*?)\"</stringProp>
-             <stringProp name="RegexExtractor.template">$1$</stringProp>
-             <stringProp name="RegexExtractor.default"/>
-@@ -1815,7 +1920,7 @@ editProductList.add(editProductMap);</stringProp>
-           <hashTree/>
-           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product skus" enabled="true">
-             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">simple_product_for_edit_skus</stringProp>
-+            <stringProp name="RegexExtractor.refname">simple_product_skus</stringProp>
-             <stringProp name="RegexExtractor.regex">sku\":\"(.*?)\"</stringProp>
-             <stringProp name="RegexExtractor.template">$1$</stringProp>
-             <stringProp name="RegexExtractor.default"/>
-@@ -1824,129 +1929,58 @@ editProductList.add(editProductMap);</stringProp>
-           <hashTree/>
-         </hashTree>
-       </hashTree>
--      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: Prepare simple products for edit" enabled="true">
--        <stringProp name="ForeachController.inputVal">simple_product_for_edit_ids</stringProp>
--        <stringProp name="ForeachController.returnVal">simple_product_for_edit_id</stringProp>
-+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: Prepare simple products" enabled="true">
-+        <stringProp name="ForeachController.inputVal">simple_product_ids</stringProp>
-+        <stringProp name="ForeachController.returnVal">simple_product_id</stringProp>
-         <boolProp name="ForeachController.useSeparator">true</boolProp>
-       </ForeachController>
-       <hashTree>
--        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter for edit" enabled="true">
-+        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-           <stringProp name="CounterConfig.start">1</stringProp>
-           <stringProp name="CounterConfig.end"/>
-           <stringProp name="CounterConfig.incr">1</stringProp>
--          <stringProp name="CounterConfig.name">simple_products_counter_for_edit</stringProp>
-+          <stringProp name="CounterConfig.name">simple_products_counter</stringProp>
-           <stringProp name="CounterConfig.format"/>
-           <boolProp name="CounterConfig.per_user">false</boolProp>
-         </CounterConfig>
-         <hashTree/>
--        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect simple product for edit" enabled="true">
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect simple product" enabled="true">
-           <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
- import java.util.HashMap;
- import org.apache.commons.codec.binary.Base64;
-+ArrayList productList;
- 
--if (1 == Integer.parseInt(vars.get("simple_products_counter_for_edit"))) {
--    editProductList = new ArrayList();
--    props.put("simple_products_list_for_edit", editProductList);
-+// If it is first iteration of cycle then recreate productList
-+if (1 == Integer.parseInt(vars.get("simple_products_counter"))) {
-+    productList = new ArrayList();
-+    props.put("simple_products_list", productList);
- } else {
--    productList = props.get("simple_products_counter_for_edit");
-+    productList = props.get("simple_products_list");
- }
--
--String productUrl = vars.get("request_protocol") + "://" + vars.get("host") + vars.get("base_path") + vars.get("simple_products_for_edit_url_keys_" + vars.get("simple_products_counter_for_edit"))+ vars.get("url_suffix");
-+String productUrl = vars.get("request_protocol") + "://" + vars.get("host") + vars.get("base_path") + vars.get("simple_products_url_keys_" + vars.get("simple_products_counter"))+ vars.get("url_suffix");
- encodedUrl = Base64.encodeBase64(productUrl.getBytes());
- // Create product map
--Map editProductMap = new HashMap();
--editProductMap.put("id", vars.get("simple_product_for_edit_id"));
--editProductMap.put("title", vars.get("simple_product_for_edit_names_" + vars.get("simple_products_counter_for_edit")));
--editProductMap.put("sku", vars.get("simple_product_for_edit_skus_" + vars.get("simple_products_counter_for_edit")));
--editProductMap.put("url_key", vars.get("simple_products_for_edit_url_keys_" + vars.get("simple_products_counter_for_edit")));
--editProductMap.put("uenc", new String(encodedUrl));
-+Map productMap = new HashMap();
-+productMap.put("id", vars.get("simple_product_id"));
-+productMap.put("title", vars.get("simple_product_names_" + vars.get("simple_products_counter")));
-+productMap.put("sku", vars.get("simple_product_skus_" + vars.get("simple_products_counter")));
-+productMap.put("url_key", vars.get("simple_products_url_keys_" + vars.get("simple_products_counter")));
-+productMap.put("uenc", new String(encodedUrl));
- 
- // Collect products map in products list
--editProductList.add(editProductMap);</stringProp>
-+productList.add(productMap);</stringProp>
-           <stringProp name="BeanShellSampler.filename"/>
-           <stringProp name="BeanShellSampler.parameters"/>
-           <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-         </BeanShellSampler>
-         <hashTree/>
-       </hashTree>
--    </hashTree>
-   
--    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract simple products" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_simple_products.jmx</stringProp>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract simple products for edit" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_simple_products_for_edit.jmx</stringProp>
- </TestFragmentController>
-     <hashTree>
--      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Retrieve simple products" enabled="true"/>
--      <hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Content-Type</stringProp>
--              <stringProp name="Header.value">application/json</stringProp>
--            </elementProp>
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Accept</stringProp>
--              <stringProp name="Header.value">*/*</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
--          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--            <collectionProp name="Arguments.arguments">
--              <elementProp name="" elementType="HTTPArgument">
--                <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
--                <stringProp name="Argument.metadata">=</stringProp>
--              </elementProp>
--            </collectionProp>
--          </elementProp>
--          <stringProp name="HTTPSampler.domain"/>
--          <stringProp name="HTTPSampler.port"/>
--          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--          <stringProp name="HTTPSampler.contentEncoding"/>
--          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
--          <stringProp name="HTTPSampler.method">POST</stringProp>
--          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--          <boolProp name="HTTPSampler.monitor">false</boolProp>
--          <stringProp name="HTTPSampler.embedded_url_re"/>
--        </HTTPSamplerProxy>
--        <hashTree>
--          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
--            <stringProp name="VAR">admin_token</stringProp>
--            <stringProp name="JSONPATH">$</stringProp>
--            <stringProp name="DEFAULT"/>
--            <stringProp name="VARIABLE"/>
--            <stringProp name="SUBJECT">BODY</stringProp>
--          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--          <hashTree/>
--          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
--            <collectionProp name="Asserion.test_strings">
--              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
--            </collectionProp>
--            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--            <boolProp name="Assertion.assume_success">false</boolProp>
--            <intProp name="Assertion.test_type">1</intProp>
--            <stringProp name="Assertion.scope">variable</stringProp>
--            <stringProp name="Scope.variable">admin_token</stringProp>
--          </ResponseAssertion>
--          <hashTree/>
--        </hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">Authorization</stringProp>
--              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get simple products" enabled="true">
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get simple products for edit" enabled="true">
-           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-             <collectionProp name="Arguments.arguments">
-               <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
-@@ -1970,19 +2004,26 @@ editProductList.add(editProductMap);</stringProp>
-                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                 <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
-               </elementProp>
--              <elementProp name="searchCriteria[filterGroups][0][filters][1][field]" elementType="HTTPArgument">
-+              <elementProp name="searchCriteria[currentPage]" elementType="HTTPArgument">
-+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                <stringProp name="Argument.value">1</stringProp>
-+                <stringProp name="Argument.metadata">=</stringProp>
-+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                <stringProp name="Argument.name">searchCriteria[currentPage]</stringProp>
-+              </elementProp>
-+              <elementProp name="searchCriteria[filterGroups][1][filters][1][field]" elementType="HTTPArgument">
-                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                 <stringProp name="Argument.value">attribute_set_id</stringProp>
--                <stringProp name="Argument.metadata">!=</stringProp>
-+                <stringProp name="Argument.metadata">=</stringProp>
-                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][field]</stringProp>
-+                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][1][field]</stringProp>
-               </elementProp>
--              <elementProp name="searchCriteria[filterGroups][0][filters][1][value]" elementType="HTTPArgument">
-+              <elementProp name="searchCriteria[filterGroups][1][filters][1][value]" elementType="HTTPArgument">
-                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                 <stringProp name="Argument.value">4</stringProp>
-                 <stringProp name="Argument.metadata">=</stringProp>
-                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
--                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][value]</stringProp>
-+                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][1][value]</stringProp>
-               </elementProp>
-             </collectionProp>
-           </elementProp>
-@@ -2004,7 +2045,7 @@ editProductList.add(editProductMap);</stringProp>
-         <hashTree>
-           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product url keys" enabled="true">
-             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">simple_products_url_keys</stringProp>
-+            <stringProp name="RegexExtractor.refname">simple_products_for_edit_url_keys</stringProp>
-             <stringProp name="RegexExtractor.regex">url_key\",\"value\":\"(.*?)\"</stringProp>
-             <stringProp name="RegexExtractor.template">$1$</stringProp>
-             <stringProp name="RegexExtractor.default"/>
-@@ -2013,8 +2054,8 @@ editProductList.add(editProductMap);</stringProp>
-           <hashTree/>
-           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product ids" enabled="true">
-             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">simple_product_ids</stringProp>
--            <stringProp name="RegexExtractor.regex">\"id\":(\d+),</stringProp>
-+            <stringProp name="RegexExtractor.refname">simple_product_for_edit_ids</stringProp>
-+            <stringProp name="RegexExtractor.regex">\"id\":(\d+),\"sku\"</stringProp>
-             <stringProp name="RegexExtractor.template">$1$</stringProp>
-             <stringProp name="RegexExtractor.default"/>
-             <stringProp name="RegexExtractor.match_number">-1</stringProp>
-@@ -2022,7 +2063,7 @@ editProductList.add(editProductMap);</stringProp>
-           <hashTree/>
-           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product titles" enabled="true">
-             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">simple_product_names</stringProp>
-+            <stringProp name="RegexExtractor.refname">simple_product_for_edit_names</stringProp>
-             <stringProp name="RegexExtractor.regex">name\":\"(.*?)\"</stringProp>
-             <stringProp name="RegexExtractor.template">$1$</stringProp>
-             <stringProp name="RegexExtractor.default"/>
-@@ -2031,7 +2072,7 @@ editProductList.add(editProductMap);</stringProp>
-           <hashTree/>
-           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product skus" enabled="true">
-             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">simple_product_skus</stringProp>
-+            <stringProp name="RegexExtractor.refname">simple_product_for_edit_skus</stringProp>
-             <stringProp name="RegexExtractor.regex">sku\":\"(.*?)\"</stringProp>
-             <stringProp name="RegexExtractor.template">$1$</stringProp>
-             <stringProp name="RegexExtractor.default"/>
-@@ -2040,66 +2081,101 @@ editProductList.add(editProductMap);</stringProp>
-           <hashTree/>
-         </hashTree>
-       </hashTree>
--      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: Prepare simple products" enabled="true">
--        <stringProp name="ForeachController.inputVal">simple_product_ids</stringProp>
--        <stringProp name="ForeachController.returnVal">simple_product_id</stringProp>
-+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: Prepare simple products for edit" enabled="true">
-+        <stringProp name="ForeachController.inputVal">simple_product_for_edit_ids</stringProp>
-+        <stringProp name="ForeachController.returnVal">simple_product_for_edit_id</stringProp>
-         <boolProp name="ForeachController.useSeparator">true</boolProp>
-       </ForeachController>
-       <hashTree>
--        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter for edit" enabled="true">
-           <stringProp name="CounterConfig.start">1</stringProp>
-           <stringProp name="CounterConfig.end"/>
-           <stringProp name="CounterConfig.incr">1</stringProp>
--          <stringProp name="CounterConfig.name">simple_products_counter</stringProp>
-+          <stringProp name="CounterConfig.name">simple_products_counter_for_edit</stringProp>
-           <stringProp name="CounterConfig.format"/>
-           <boolProp name="CounterConfig.per_user">false</boolProp>
-         </CounterConfig>
-         <hashTree/>
--        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect simple product" enabled="true">
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect simple product for edit" enabled="true">
-           <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
- import java.util.HashMap;
- import org.apache.commons.codec.binary.Base64;
-+ArrayList editProductList;
- 
--// If it is first iteration of cycle then recreate productList
--if (1 == Integer.parseInt(vars.get("simple_products_counter"))) {
--    productList = new ArrayList();
--    props.put("simple_products_list", productList);
-+if (1 == Integer.parseInt(vars.get("simple_products_counter_for_edit"))) {
-+    editProductList = new ArrayList();
-+    props.put("simple_products_list_for_edit", editProductList);
- } else {
--    productList = props.get("simple_products_list");
-+    editProductList = props.get("simple_products_list_for_edit");
- }
--String productUrl = vars.get("request_protocol") + "://" + vars.get("host") + vars.get("base_path") + vars.get("simple_products_url_keys_" + vars.get("simple_products_counter"))+ vars.get("url_suffix");
-+
-+String productUrl = vars.get("request_protocol") + "://" + vars.get("host") + vars.get("base_path") + vars.get("simple_products_for_edit_url_keys_" + vars.get("simple_products_counter_for_edit"))+ vars.get("url_suffix");
- encodedUrl = Base64.encodeBase64(productUrl.getBytes());
- // Create product map
--Map productMap = new HashMap();
--productMap.put("id", vars.get("simple_product_id"));
--productMap.put("title", vars.get("simple_product_names_" + vars.get("simple_products_counter")));
--productMap.put("sku", vars.get("simple_product_skus_" + vars.get("simple_products_counter")));
--productMap.put("url_key", vars.get("simple_products_url_keys_" + vars.get("simple_products_counter")));
--productMap.put("uenc", new String(encodedUrl));
-+Map editProductMap = new HashMap();
-+editProductMap.put("id", vars.get("simple_product_for_edit_id"));
-+editProductMap.put("title", vars.get("simple_product_for_edit_names_" + vars.get("simple_products_counter_for_edit")));
-+editProductMap.put("sku", vars.get("simple_product_for_edit_skus_" + vars.get("simple_products_counter_for_edit")));
-+editProductMap.put("url_key", vars.get("simple_products_for_edit_url_keys_" + vars.get("simple_products_counter_for_edit")));
-+editProductMap.put("uenc", new String(encodedUrl));
- 
- // Collect products map in products list
--productList.add(productMap);</stringProp>
-+editProductList.add(editProductMap);</stringProp>
-           <stringProp name="BeanShellSampler.filename"/>
-           <stringProp name="BeanShellSampler.parameters"/>
-           <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-         </BeanShellSampler>
-         <hashTree/>
-       </hashTree>
--    </hashTree>
-   
--    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract admin users" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_admin_users.jmx</stringProp>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract categories (First Level)" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_categories.jmx</stringProp>
- </TestFragmentController>
-     <hashTree>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Extract Admin Users" enabled="true">
--        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get Categories Names and skus" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-           <collectionProp name="Arguments.arguments">
--            <elementProp name="form_key" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">false</boolProp>
--              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">path</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
-+            </elementProp>
-+            <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1/2/%</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
-+            </elementProp>
-+            <elementProp name="searchCriteria[filterGroups][0][filters][0][conditionType]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">like</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][conditionType]</stringProp>
-+            </elementProp>
-+            <elementProp name="searchCriteria[filterGroups][1][filters][0][field]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">level</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][field]</stringProp>
-+            </elementProp>
-+            <elementProp name="searchCriteria[filterGroups][1][filters][0][value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][value]</stringProp>
-+            </elementProp>
-+            <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${categories_count}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
-             </elementProp>
-           </collectionProp>
-         </elementProp>
-@@ -2109,317 +2185,180 @@ productList.add(productMap);</stringProp>
-         <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-         <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/user/roleGrid/limit/200/?ajax=true&amp;isAjax=true</stringProp>
--        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <stringProp name="HTTPSampler.path">${base_path}rest/V1/categories/list</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-         <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-         <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
-         <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-         <boolProp name="HTTPSampler.monitor">false</boolProp>
-         <stringProp name="HTTPSampler.embedded_url_re"/>
-       </HTTPSamplerProxy>
-       <hashTree>
--        <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
--          <stringProp name="filename"/>
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="PostProcessor" enabled="true">
-+          <stringProp name="scriptLanguage">javascript</stringProp>
-           <stringProp name="parameters"/>
--          <boolProp name="resetInterpreter">false</boolProp>
--          <stringProp name="script">import java.util.regex.Pattern;
--                    import java.util.regex.Matcher;
--                    import java.util.LinkedList;
-+          <stringProp name="filename"/>
-+          <stringProp name="cacheKey"/>
-+          <stringProp name="script">var data = JSON.parse(prev.getResponseDataAsString());
- 
--                    LinkedList adminUserList = new LinkedList();
--                    String response = new String(data);
--                    Pattern pattern = Pattern.compile("&lt;td\\W*?data-column=.username[^&gt;]*?&gt;\\W*?(\\w+)\\W*?&lt;");
--                    Matcher matcher = pattern.matcher(response);
-+var categoryData = [], categoryNames = [], categoryUrls = [];
- 
--                    while (matcher.find()) {
--                    adminUserList.add(matcher.group(1));
--                    }
-+for (var i in data.items) {
-+	var cat = data.items[i], urlKey = getUrlKey(cat);
-+     categoryData.push({"id": cat.id, "name": cat.name, "url_key": urlKey, "children": cat.children.split(",")});
-+     categoryNames.push(cat.name);
-+     categoryUrls.push(urlKey);
-+ }
- 
--                    adminUserList.poll();
--                    props.put("adminUserList", adminUserList);
--                    props.put("adminUserListIterator", adminUserList.descendingIterator());
--                </stringProp>
--        </BeanShellPostProcessor>
-+function getUrlKey(cat) {
-+    for (var i in cat.custom_attributes) {
-+        if (cat.custom_attributes[i].attribute_code == "url_key") {
-+            return cat.custom_attributes[i].value;	
-+          }
-+    }
-+    return "";
-+}
-+
-+props.put("categories", categoryData);
-+props.put("category_url_keys_list", categoryUrls);
-+props.put("category_names_list",categoryNames);</stringProp>
-+        </JSR223PostProcessor>
-         <hashTree/>
-       </hashTree>
-     </hashTree>
-   
--    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract customers" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_customers.jmx</stringProp>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract categories id of last level" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_categories_id_of_last_level.jmx</stringProp>
- </TestFragmentController>
-     <hashTree>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Open Customer Grid" enabled="true">
--        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--          <collectionProp name="Arguments.arguments"/>
--        </elementProp>
--        <stringProp name="HTTPSampler.domain"/>
--        <stringProp name="HTTPSampler.port"/>
--        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--        <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/</stringProp>
--        <stringProp name="HTTPSampler.method">GET</stringProp>
--        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--        <boolProp name="HTTPSampler.monitor">false</boolProp>
--        <stringProp name="HTTPSampler.embedded_url_re"/>
--      </HTTPSamplerProxy>
--      <hashTree>
--        <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
--          <stringProp name="filename"/>
--          <stringProp name="parameters"/>
--          <boolProp name="resetInterpreter">true</boolProp>
--          <stringProp name="script">import org.apache.jmeter.protocol.http.control.CookieManager;
--import org.apache.jmeter.protocol.http.control.Cookie;
--CookieManager manager = sampler.getCookieManager();
--Cookie cookie = new Cookie("adminhtml",vars.get("COOKIE_adminhtml"),vars.get("host"),"/",false,0);
--manager.add(cookie); </stringProp>
--        </BeanShellPreProcessor>
--        <hashTree/>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Customer Grid" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="-679437259">Customers</stringProp>
--            <stringProp name="495525733">&lt;title&gt;Customers / Customers / Magento Admin&lt;/title&gt;</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">2</intProp>
--        </ResponseAssertion>
--        <hashTree/>
--      </hashTree>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Search Customers" enabled="true">
--        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--          <collectionProp name="Arguments.arguments">
--            <elementProp name="namespace" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">customer_listing</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">namespace</stringProp>
--            </elementProp>
--            <elementProp name="sorting[field]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">entity_id</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">sorting[field]</stringProp>
--            </elementProp>
--            <elementProp name="sorting[direction]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">asc</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">sorting[direction]</stringProp>
--            </elementProp>
--            <elementProp name="isAjax" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">true</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">isAjax</stringProp>
--            </elementProp>
--            <elementProp name="filters[placeholder]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">customer_since[locale]=en_US</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">filters[placeholder]</stringProp>
--            </elementProp>
--            <elementProp name="filters[group_id]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">1</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">filters[group_id]</stringProp>
--            </elementProp>
--            <elementProp name="filters[website_id]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">1</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">filters[website_id]</stringProp>
--            </elementProp>
--            <elementProp name="paging[pageSize]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">${customers_page_size}</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">paging[pageSize]</stringProp>
--            </elementProp>
--            <elementProp name="paging[current]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">1</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">paging[current]</stringProp>
--            </elementProp>
--            <elementProp name="sorting[field]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">entity_id</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">sorting[field]</stringProp>
--            </elementProp>
--            <elementProp name="sorting[direction]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">asc</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">sorting[direction]</stringProp>
--            </elementProp>
--            <elementProp name="isAjax" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">true</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">isAjax</stringProp>
--            </elementProp>
--          </collectionProp>
--        </elementProp>
--        <stringProp name="HTTPSampler.domain"/>
--        <stringProp name="HTTPSampler.port"/>
--        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--        <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
--        <stringProp name="HTTPSampler.method">GET</stringProp>
--        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--        <boolProp name="HTTPSampler.monitor">false</boolProp>
--        <stringProp name="HTTPSampler.embedded_url_re"/>
--      </HTTPSamplerProxy>
--      <hashTree>
--        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
--          <stringProp name="JSON_PATH">$.totalRecords</stringProp>
--          <stringProp name="EXPECTED_VALUE">0</stringProp>
--          <boolProp name="JSONVALIDATION">true</boolProp>
--          <boolProp name="EXPECT_NULL">false</boolProp>
--          <boolProp name="INVERT">true</boolProp>
--          <boolProp name="ISREGEX">true</boolProp>
--        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
--        <hashTree/>
--        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer emails" enabled="true">
--          <stringProp name="VAR">customer_emails</stringProp>
--          <stringProp name="JSONPATH">$.items[*].email</stringProp>
--          <stringProp name="DEFAULT"/>
--          <stringProp name="VARIABLE"/>
--          <stringProp name="SUBJECT">BODY</stringProp>
--        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--        <hashTree/>
--        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer ids" enabled="true">
--          <stringProp name="VAR">customer_ids</stringProp>
--          <stringProp name="JSONPATH">$.items[*].entity_id</stringProp>
--          <stringProp name="DEFAULT"/>
--          <stringProp name="VARIABLE"/>
--          <stringProp name="SUBJECT">BODY</stringProp>
--        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--        <hashTree/>
--        <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Make email list" enabled="true">
--          <boolProp name="resetInterpreter">false</boolProp>
--          <stringProp name="parameters"/>
--          <stringProp name="filename"/>
--          <stringProp name="script">import java.util.LinkedList;
--LinkedList emailsList = new LinkedList();
--props.put("customer_emails_list", emailsList);</stringProp>
--        </BeanShellPostProcessor>
--        <hashTree/>
--      </hashTree>
--      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: customer emails loop (search result)" enabled="true">
--        <stringProp name="ForeachController.inputVal">customer_emails</stringProp>
--        <stringProp name="ForeachController.returnVal">customer_email</stringProp>
--        <boolProp name="ForeachController.useSeparator">true</boolProp>
--      </ForeachController>
--      <hashTree>
--        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
--          <stringProp name="CounterConfig.start">1</stringProp>
--          <stringProp name="CounterConfig.end"/>
--          <stringProp name="CounterConfig.incr">1</stringProp>
--          <stringProp name="CounterConfig.name">email_counter</stringProp>
--          <stringProp name="CounterConfig.format"/>
--          <boolProp name="CounterConfig.per_user">false</boolProp>
--        </CounterConfig>
--        <hashTree/>
--        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect customer emails" enabled="true">
--          <stringProp name="BeanShellSampler.query">
--try {
--
--props.get("customer_emails_list").add(vars.get("customer_email"));
--
--} catch (java.lang.Exception e) {
--	log.error("error&#x2026;", e);
--	SampleResult.setStopThread(true);
--}
--          </stringProp>
--          <stringProp name="BeanShellSampler.filename"/>
--          <stringProp name="BeanShellSampler.parameters"/>
--          <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--        </BeanShellSampler>
--        <hashTree/>
--      </hashTree>
--      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: customer ids loop (search result)" enabled="true">
--        <stringProp name="ForeachController.inputVal">customer_ids</stringProp>
--        <stringProp name="ForeachController.returnVal">customer_id</stringProp>
--        <boolProp name="ForeachController.useSeparator">true</boolProp>
--      </ForeachController>
--      <hashTree>
--        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
--          <stringProp name="CounterConfig.start">1</stringProp>
--          <stringProp name="CounterConfig.end"/>
--          <stringProp name="CounterConfig.incr">1</stringProp>
--          <stringProp name="CounterConfig.name">id_counter</stringProp>
--          <stringProp name="CounterConfig.format"/>
--          <boolProp name="CounterConfig.per_user">false</boolProp>
--        </CounterConfig>
--        <hashTree/>
--        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect customer ids" enabled="true">
--          <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Clear Admin Category Management properties" enabled="true">
-+        <stringProp name="BeanShellSampler.query">props.remove("admin_category_ids_list");</stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - API Get categories" enabled="true">
-+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+            <collectionProp name="Arguments.arguments">
-+              <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
-+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                <stringProp name="Argument.value">children_count</stringProp>
-+                <stringProp name="Argument.metadata">=</stringProp>
-+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
-+              </elementProp>
-+              <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
-+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                <stringProp name="Argument.value">0</stringProp>
-+                <stringProp name="Argument.metadata">=</stringProp>
-+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
-+              </elementProp>
-+              <elementProp name="searchCriteria[filterGroups][1][filters][0][field]" elementType="HTTPArgument">
-+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                <stringProp name="Argument.value">level</stringProp>
-+                <stringProp name="Argument.metadata">=</stringProp>
-+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][field]</stringProp>
-+              </elementProp>
-+              <elementProp name="searchCriteria[filterGroups][1][filters][0][value]" elementType="HTTPArgument">
-+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                <stringProp name="Argument.value">2</stringProp>
-+                <stringProp name="Argument.metadata">=</stringProp>
-+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][value]</stringProp>
-+              </elementProp>
-+              <elementProp name="searchCriteria[filterGroups][1][filters][0][conditionType]" elementType="HTTPArgument">
-+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                <stringProp name="Argument.value">gt</stringProp>
-+                <stringProp name="Argument.metadata">=</stringProp>
-+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][conditionType]</stringProp>
-+              </elementProp>
-+              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
-+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                <stringProp name="Argument.value">${adminCategoryCount}</stringProp>
-+                <stringProp name="Argument.metadata">=</stringProp>
-+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
-+              </elementProp>
-+            </collectionProp>
-+          </elementProp>
-+          <stringProp name="HTTPSampler.domain"/>
-+          <stringProp name="HTTPSampler.port"/>
-+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+          <stringProp name="HTTPSampler.contentEncoding"/>
-+          <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/categories/list</stringProp>
-+          <stringProp name="HTTPSampler.method">GET</stringProp>
-+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+          <boolProp name="HTTPSampler.monitor">false</boolProp>
-+          <stringProp name="HTTPSampler.embedded_url_re"/>
-+        </HTTPSamplerProxy>
-+        <hashTree>
-+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">category_list_id</stringProp>
-+            <stringProp name="RegexExtractor.regex">\{\"id\":(\d+),</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+          </RegexExtractor>
-+          <hashTree/>
-+        </hashTree>
-+        <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Category Id" enabled="true">
-+          <stringProp name="ForeachController.inputVal">category_list_id</stringProp>
-+          <stringProp name="ForeachController.returnVal">category_id</stringProp>
-+          <boolProp name="ForeachController.useSeparator">true</boolProp>
-+        </ForeachController>
-+        <hashTree>
-+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Process categories ids" enabled="true">
-+            <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
- 
--// If it is first iteration of cycle then recreate idsList
--if (1 == Integer.parseInt(vars.get("id_counter"))) {
--    idsList = new ArrayList();
--    props.put("customer_ids_list", idsList);
--} else {
--    idsList = props.get("customer_ids_list");
-+adminCategoryIdsList = props.get("admin_category_ids_list");
-+// If it is first iteration of cycle then recreate categories ids list
-+if (adminCategoryIdsList == null) {
-+    adminCategoryIdsList = new ArrayList();
-+    props.put("admin_category_ids_list", adminCategoryIdsList);
- }
--idsList.add(vars.get("customer_id"));</stringProp>
--          <stringProp name="BeanShellSampler.filename"/>
--          <stringProp name="BeanShellSampler.parameters"/>
--          <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--        </BeanShellSampler>
--        <hashTree/>
--      </hashTree>
-+adminCategoryIdsList.add(vars.get("category_id"));</stringProp>
-+            <stringProp name="BeanShellSampler.filename"/>
-+            <stringProp name="BeanShellSampler.parameters"/>
-+            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-+          </BeanShellSampler>
-+          <hashTree/>
-+        </hashTree>
-     </hashTree>
-   
--    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract region ids" enabled="true">
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_region_ids.jmx</stringProp>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract coupon codes" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_coupon_codes.jmx</stringProp>
-     </TestFragmentController>
-     <hashTree>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Extract Region ids" enabled="true">
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - API Get coupon codes" enabled="true">
-         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-           <collectionProp name="Arguments.arguments">
--            <elementProp name="parent" elementType="HTTPArgument">
-+            <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">false</boolProp>
--              <stringProp name="Argument.value">US</stringProp>
-+              <stringProp name="Argument.value">10</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">parent</stringProp>
-+              <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
-             </elementProp>
-           </collectionProp>
-         </elementProp>
-         <stringProp name="HTTPSampler.domain"/>
-         <stringProp name="HTTPSampler.port"/>
--        <stringProp name="HTTPSampler.connect_timeout"/>
--        <stringProp name="HTTPSampler.response_timeout"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-         <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/directory/json/countryRegion/</stringProp>
-+        <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/coupons/search</stringProp>
-         <stringProp name="HTTPSampler.method">GET</stringProp>
-         <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-         <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-@@ -2429,26 +2368,27 @@ idsList.add(vars.get("customer_id"));</stringProp>
-         <stringProp name="HTTPSampler.embedded_url_re"/>
-       </HTTPSamplerProxy>
-       <hashTree>
--        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Parse and put region id into variables" enabled="true">
--          <stringProp name="scriptLanguage">groovy</stringProp>
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="PostProcessor" enabled="true">
-+          <stringProp name="scriptLanguage">javascript</stringProp>
-           <stringProp name="parameters"/>
-           <stringProp name="filename"/>
-           <stringProp name="cacheKey"/>
--          <stringProp name="script">import groovy.json.JsonSlurper
--def jsonSlurper = new JsonSlurper();
--def regionResponse = jsonSlurper.parseText(prev.getResponseDataAsString());
-+          <stringProp name="script">var data = JSON.parse(prev.getResponseDataAsString());
- 
--regionResponse.each { region -&gt;
--	if (region.label.toString() == "Alabama") {
--		props.put("alabama_region_id", region.value.toString());
--	} else if (region.label.toString() == 'California') {
--		props.put("california_region_id", region.value.toString());
--	}
--}</stringProp>
-+var couponCodes = [];
-+
-+for (var i in data.items) {
-+	var coupon = data.items[i];
-+	couponCodes.push({"coupon_id":coupon.coupon_id, "rule_id":coupon.rule_id, "code": coupon.code});
-+ }
-+
-+props.put("coupon_codes", couponCodes);
-+</stringProp>
-         </JSR223PostProcessor>
-         <hashTree/>
-       </hashTree>
-     </hashTree>
-+  </hashTree>
-   
-     <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Validate properties and count users" enabled="true">
-       <stringProp name="BeanShellSampler.query">Boolean stopTestOnError (String error) {
-@@ -2474,10 +2414,13 @@ if (props.get("customer_emails_list") == null) {
-     return stopTestOnError("Cannot find customer emails. Test stopped.");
- }
- if (props.get("category_url_keys_list") == null) {
--	return stopTestOnError("Cannot find category url keys. Test stopped.");
-+    return stopTestOnError("Cannot find category url keys. Test stopped.");
- }
- if (props.get("category_names_list") == null) {
--	return stopTestOnError("Cannot find category names. Test stopped.");
-+    return stopTestOnError("Cannot find category names. Test stopped.");
-+}
-+if (props.get("cms_pages") == null) {
-+    return stopTestOnError("Cannot find cms pages. Test stopped.");
- }
- </stringProp>
-       <stringProp name="BeanShellSampler.filename"/>
-@@ -2540,21 +2483,21 @@ if (props.get("category_names_list") == null) {
-       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-         <collectionProp name="Arguments.arguments">
-           <elementProp name="blocks" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">["customer_form_login"]</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">blocks</stringProp>
-           </elementProp>
-           <elementProp name="handles" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">["default","customer_account_login"]</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">handles</stringProp>
-           </elementProp>
-           <elementProp name="originalRequest" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">{"route":"customer","controller":"account","action":"login","uri":"/customer/account/login/"}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-@@ -2719,22 +2662,24 @@ vars.putObject("randomIntGenerator", random);
-       </BeanShellSampler>
-       <hashTree/>
-     
--      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
--        <stringProp name="BeanShellSampler.query">
--import java.util.Random;
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
- 
--Random random = vars.getObject("randomIntGenerator");
--number = random.nextInt(props.get("category_url_keys_list").size());
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
- 
--vars.put("category_url_key", props.get("category_url_keys_list").get(number));
--vars.put("category_name", props.get("category_names_list").get(number));
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-         </stringProp>
--        <stringProp name="BeanShellSampler.filename"/>
--        <stringProp name="BeanShellSampler.parameters"/>
--        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
--      <hashTree/>
--    
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-     <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Get Customer Email" enabled="true">
-         <stringProp name="CriticalSectionController.lockName">get-email</stringProp>
-     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-@@ -2881,12 +2826,12 @@ vars.put("customer_email", customerUser);
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">false</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -3251,22 +3196,24 @@ vars.putObject("randomIntGenerator", random);
-       </BeanShellSampler>
-       <hashTree/>
-     
--      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
--        <stringProp name="BeanShellSampler.query">
--import java.util.Random;
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
- 
--Random random = vars.getObject("randomIntGenerator");
--number = random.nextInt(props.get("category_url_keys_list").size());
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
- 
--vars.put("category_url_key", props.get("category_url_keys_list").get(number));
--vars.put("category_name", props.get("category_names_list").get(number));
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-         </stringProp>
--        <stringProp name="BeanShellSampler.filename"/>
--        <stringProp name="BeanShellSampler.parameters"/>
--        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
--      <hashTree/>
--    
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-       <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
-         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-           <collectionProp name="Arguments.arguments"/>
-@@ -4656,22 +4603,24 @@ vars.put("totalProductsAdded", "0");
-       </BeanShellSampler>
-       <hashTree/>
-     
--      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
--        <stringProp name="BeanShellSampler.query">
--import java.util.Random;
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
- 
--Random random = vars.getObject("randomIntGenerator");
--number = random.nextInt(props.get("category_url_keys_list").size());
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
- 
--vars.put("category_url_key", props.get("category_url_keys_list").get(number));
--vars.put("category_name", props.get("category_names_list").get(number));
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-         </stringProp>
--        <stringProp name="BeanShellSampler.filename"/>
--        <stringProp name="BeanShellSampler.parameters"/>
--        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
--      <hashTree/>
--    
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-       <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
-         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-           <collectionProp name="Arguments.arguments"/>
-@@ -4906,12 +4855,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -4940,7 +4889,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-     <hashTree>
-       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
-@@ -5272,12 +5221,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -5306,7 +5255,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-     <hashTree>
-       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
-@@ -5566,12 +5515,12 @@ vars.put("customer_email", customerUser);
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">false</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -5739,12 +5688,12 @@ vars.put("product_sku", product.get("sku"));
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
-               <stringProp name="Argument.name">sections</stringProp>
-             </elementProp>
--            <elementProp name="update_section_id" elementType="HTTPArgument">
-+            <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-               <stringProp name="Argument.value">false</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">update_section_id</stringProp>
-+              <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-             </elementProp>
-             <elementProp name="_" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -5970,22 +5919,24 @@ vars.put("totalProductsAdded", "0");
-       </BeanShellSampler>
-       <hashTree/>
-     
--      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
--        <stringProp name="BeanShellSampler.query">
--import java.util.Random;
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
- 
--Random random = vars.getObject("randomIntGenerator");
--number = random.nextInt(props.get("category_url_keys_list").size());
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
- 
--vars.put("category_url_key", props.get("category_url_keys_list").get(number));
--vars.put("category_name", props.get("category_names_list").get(number));
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-         </stringProp>
--        <stringProp name="BeanShellSampler.filename"/>
--        <stringProp name="BeanShellSampler.parameters"/>
--        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
--      <hashTree/>
--    
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Category" enabled="true">
-       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-         <collectionProp name="Arguments.arguments"/>
-@@ -6171,12 +6122,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">false</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -6349,12 +6300,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">false</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -6537,22 +6488,24 @@ vars.put("totalProductsAdded", "0");
-       </BeanShellSampler>
-       <hashTree/>
-     
--      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
--        <stringProp name="BeanShellSampler.query">
--import java.util.Random;
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
- 
--Random random = vars.getObject("randomIntGenerator");
--number = random.nextInt(props.get("category_url_keys_list").size());
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
- 
--vars.put("category_url_key", props.get("category_url_keys_list").get(number));
--vars.put("category_name", props.get("category_names_list").get(number));
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-         </stringProp>
--        <stringProp name="BeanShellSampler.filename"/>
--        <stringProp name="BeanShellSampler.parameters"/>
--        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
--      <hashTree/>
--    
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-       <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
-         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-           <collectionProp name="Arguments.arguments"/>
-@@ -6787,12 +6740,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -6821,7 +6774,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-     <hashTree>
-       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
-@@ -7153,12 +7106,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -7187,7 +7140,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-     <hashTree>
-       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
-@@ -7676,22 +7629,24 @@ vars.put("totalProductsAdded", "0");
-       </BeanShellSampler>
-       <hashTree/>
-     
--      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
--        <stringProp name="BeanShellSampler.query">
--import java.util.Random;
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
- 
--Random random = vars.getObject("randomIntGenerator");
--number = random.nextInt(props.get("category_url_keys_list").size());
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
- 
--vars.put("category_url_key", props.get("category_url_keys_list").get(number));
--vars.put("category_name", props.get("category_names_list").get(number));
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-         </stringProp>
--        <stringProp name="BeanShellSampler.filename"/>
--        <stringProp name="BeanShellSampler.parameters"/>
--        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
--      <hashTree/>
--    
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-     <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Get Customer Email" enabled="true">
-         <stringProp name="CriticalSectionController.lockName">get-email</stringProp>
-     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-@@ -7869,12 +7824,12 @@ vars.put("customer_email", customerUser);
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">false</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -8105,12 +8060,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -8139,7 +8094,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-     <hashTree>
-       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
-@@ -8471,12 +8426,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -8505,7 +8460,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-     <hashTree>
-       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
-@@ -9146,12 +9101,12 @@ vars.put("customer_email", customerUser);
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">false</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -9330,12 +9285,12 @@ vars.put("product_sku", product.get("sku"));
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">false</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -9500,22 +9455,24 @@ vars.put("totalProductsAdded", "0");
-       </BeanShellSampler>
-       <hashTree/>
-     
--      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
--        <stringProp name="BeanShellSampler.query">
--import java.util.Random;
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
- 
--Random random = vars.getObject("randomIntGenerator");
--number = random.nextInt(props.get("category_url_keys_list").size());
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
- 
--vars.put("category_url_key", props.get("category_url_keys_list").get(number));
--vars.put("category_name", props.get("category_names_list").get(number));
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-         </stringProp>
--        <stringProp name="BeanShellSampler.filename"/>
--        <stringProp name="BeanShellSampler.parameters"/>
--        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
--      <hashTree/>
--    
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-     <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Get Customer Email" enabled="true">
-         <stringProp name="CriticalSectionController.lockName">get-email</stringProp>
-     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-@@ -9662,12 +9619,12 @@ vars.put("customer_email", customerUser);
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">false</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -9929,12 +9886,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -9963,7 +9920,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-     <hashTree>
-       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
-@@ -10295,12 +10252,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -10329,7 +10286,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
-     <hashTree>
-       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
-@@ -10492,12 +10449,12 @@ vars.put("item_id", vars.get("cart_items_qty_inputs_" + id));
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -10813,12 +10770,12 @@ vars.put("customer_email", customerUser);
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">false</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -13813,7 +13770,7 @@ vars.putObject("product_attributes", attributes);
-       <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
-         <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-         <stringProp name="RegexExtractor.refname">attribute_set_id</stringProp>
--        <stringProp name="RegexExtractor.regex">catalog\/product_set\/edit\/id\/([\d]+)\/"[\D\d]*Attribute Set 1</stringProp>
-+        <stringProp name="RegexExtractor.regex">catalog&amp;#x2F;product_set&amp;#x2F;edit&amp;#x2F;id&amp;#x2F;([\d]+)&amp;#x2F;"[\D\d]*Attribute Set 1</stringProp>
-         <stringProp name="RegexExtractor.template">$1$</stringProp>
-         <stringProp name="RegexExtractor.default"/>
-         <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -25118,6 +25075,39 @@ catch (java.lang.Exception e) {
-         </ResponseAssertion>
-         <hashTree/>
-       </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Filled Order Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/index/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Filled Order Page" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-37823069">Select from existing customer addresses</stringProp>
-+            <stringProp name="-13185722">Submit Order</stringProp>
-+            <stringProp name="-209419315">Items Ordered</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-       <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Order" enabled="true">
-         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-           <collectionProp name="Arguments.arguments">
-@@ -25743,7 +25733,7 @@ catch (java.lang.Exception e) {
-   </hashTree>
- 
-     
--        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="API" enabled="true">
-+        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="API Pool" enabled="true">
-             <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-             <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-                 <boolProp name="LoopController.continue_forever">false</boolProp>
-@@ -27219,13 +27209,13 @@ if (testLabel
-   </hashTree>
- 
-     
--        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="One Thread Scenarios (Vulnerable to deadlocks)" enabled="true">
-+        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="One Thread Scenarios Pool" enabled="true">
-             <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-             <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-                 <boolProp name="LoopController.continue_forever">false</boolProp>
-                 <stringProp name="LoopController.loops">${loops}</stringProp>
-             </elementProp>
--            <stringProp name="ThreadGroup.num_threads">${deadLocksPoolUsers}</stringProp>
-+            <stringProp name="ThreadGroup.num_threads">${oneThreadScenariosPoolUsers}</stringProp>
-             <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp>
-             <longProp name="ThreadGroup.start_time">1505803944000</longProp>
-             <longProp name="ThreadGroup.end_time">1505803944000</longProp>
-@@ -27234,11 +27224,11 @@ if (testLabel
-             <stringProp name="ThreadGroup.delay"/>
-         <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
-         <hashTree>
--    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Product Grid Mass Actions" enabled="true">
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Import Products" enabled="true">
-       <intProp name="ThroughputController.style">1</intProp>
-       <boolProp name="ThroughputController.perThread">false</boolProp>
-       <intProp name="ThroughputController.maxThroughput">1</intProp>
--      <stringProp name="ThroughputController.percentThroughput">${productGridMassActionPercentage}</stringProp>
-+      <stringProp name="ThroughputController.percentThroughput">${importProductsPercentage}</stringProp>
-     <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-     <hashTree>
-         <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-@@ -27259,7 +27249,7 @@ if (testLabel
-         <hashTree/>
-         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-             <stringProp name="BeanShellSampler.query">
--                vars.put("testLabel", "Product Grid Mass Actions");
-+                vars.put("testLabel", "Import Products");
-             </stringProp>
-             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-         </BeanShellSampler>
-@@ -27480,81 +27470,21 @@ vars.put("admin_user", adminUser);
-   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
- </GenericController>
-     <hashTree>
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Product Pages Count" enabled="true">
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-+      <stringProp name="BeanShellSampler.query">vars.put("entity", "catalog_product");
-+String behavior = "${adminImportProductBehavior}";
-+vars.put("adminImportBehavior", behavior);
-+String filepath = "${files_folder}${adminImportProductFilePath}";
-+vars.put("adminImportFilePath", filepath);  </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/import_products/setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Page" enabled="true">
-       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="form_key" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_form_key}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">form_key</stringProp>
--          </elementProp>
--          <elementProp name="namespace" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">product_listing</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">namespace</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="search" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">search</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">true</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">filters[placeholder]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">20</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">paging[pageSize]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="paging[current]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">1</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">paging[current]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="sorting[field]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">entity_id</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">sorting[field]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="sorting[direction]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">asc</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">sorting[direction]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="isAjax" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">true</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">isAjax</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--        </collectionProp>
-+        <collectionProp name="Arguments.arguments"/>
-       </elementProp>
-       <stringProp name="HTTPSampler.domain"/>
-       <stringProp name="HTTPSampler.port"/>
-@@ -27562,7 +27492,7 @@ vars.put("admin_user", adminUser);
-       <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/</stringProp>
-       <stringProp name="HTTPSampler.method">GET</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-@@ -27570,78 +27500,20 @@ vars.put("admin_user", adminUser);
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/get_product_pages_count.jmx</stringProp></HTTPSamplerProxy>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import.jmx</stringProp></HTTPSamplerProxy>
-     <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
--        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
--        <stringProp name="EXPECTED_VALUE">0</stringProp>
--        <boolProp name="JSONVALIDATION">true</boolProp>
--        <boolProp name="EXPECT_NULL">false</boolProp>
--        <boolProp name="INVERT">true</boolProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
--      <hashTree/>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
--        <stringProp name="VAR">products_number</stringProp>
--        <stringProp name="JSONPATH">$.totalRecords</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--      <hashTree/>
--      <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Calculate pages count" enabled="true">
--        <boolProp name="resetInterpreter">false</boolProp>
--        <stringProp name="parameters"/>
--        <stringProp name="filename"/>
--        <stringProp name="script">var productsPageSize = Integer.parseInt(vars.get("products_page_size"));
--var productsTotal = Integer.parseInt(vars.get("products_number"));
--var pageCountProducts = Math.round(productsTotal/productsPageSize);
--
--vars.put("pages_count_product", String.valueOf(pageCountProducts));</stringProp>
--      </BeanShellPostProcessor>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1723813687">Import Settings</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-       <hashTree/>
-     </hashTree>
-   
--    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
--      <stringProp name="BeanShellSampler.query">
--import java.util.Random;
--Random random = new Random();
--if (${seedForRandom} &gt; 0) {
--random.setSeed(${seedForRandom});
--}
--var productsPageSize = Integer.parseInt(vars.get("products_page_size"));
--var totalNumberOfPages = Integer.parseInt(vars.get("pages_count_product"));
--
--// Randomly select a page.
--var randomProductsPage = random.nextInt(totalNumberOfPages) + 1;
--
--// Get the first and last product id on that page.
--var lastProductIdOnPage = randomProductsPage * productsPageSize;
--var firstProductIdOnPage = lastProductIdOnPage - productsPageSize + 1;
--
--var randomProductId1 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
--var randomProductId2 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
--var randomProductId3 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
--
--vars.put("page_number", String.valueOf(randomProductsPage));
--vars.put("productId1", String.valueOf(randomProductId1));
--vars.put("productId2", String.valueOf(randomProductId2));
--vars.put("productId3", String.valueOf(randomProductId3));
--
--var randomQuantity = random.nextInt(1000) + 1;
--var randomPrice = random.nextInt(500) + 10;
--var randomVisibility = random.nextInt(4) + 1;
--
--vars.put("quantity", String.valueOf(randomQuantity));
--vars.put("price", String.valueOf(randomPrice));
--vars.put("visibility", String.valueOf(randomVisibility));
--      </stringProp>
--      <stringProp name="BeanShellSampler.filename"/>
--      <stringProp name="BeanShellSampler.parameters"/>
--      <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/setup.jmx</stringProp></BeanShellSampler>
--    <hashTree/>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Select Products and Update Attributes mass action" enabled="true">
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Validate" enabled="true">
-       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-         <collectionProp name="Arguments.arguments">
-           <elementProp name="form_key" elementType="HTTPArgument">
-@@ -27650,71 +27522,49 @@ vars.put("visibility", String.valueOf(randomVisibility));
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">form_key</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="namespace" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">product_listing</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">namespace</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="search" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">search</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
-+            <stringProp name="Argument.desc">false</stringProp>
-           </elementProp>
--          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+          <elementProp name="entity" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.value">${entity}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">filters[placeholder]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
-+            <stringProp name="Argument.name">entity</stringProp>
-           </elementProp>
--          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+          <elementProp name="behavior" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${products_page_size}</stringProp>
-+            <stringProp name="Argument.value">${adminImportBehavior}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">paging[pageSize]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
-+            <stringProp name="Argument.name">behavior</stringProp>
-           </elementProp>
--          <elementProp name="paging[current]" elementType="HTTPArgument">
-+          <elementProp name="validation_strategy" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${page_number}</stringProp>
-+            <stringProp name="Argument.value">validation-stop-on-errors</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">paging[current]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
-+            <stringProp name="Argument.name">validation_strategy</stringProp>
-           </elementProp>
--          <elementProp name="sorting[field]" elementType="HTTPArgument">
-+          <elementProp name="allowed_error_count" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">entity_id</stringProp>
-+            <stringProp name="Argument.value">10</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">sorting[field]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
-+            <stringProp name="Argument.name">allowed_error_count</stringProp>
-           </elementProp>
--          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+          <elementProp name="_import_field_separator" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">asc</stringProp>
-+            <stringProp name="Argument.value">,</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">sorting[direction]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
-+            <stringProp name="Argument.name">_import_field_separator</stringProp>
-           </elementProp>
--          <elementProp name="isAjax" elementType="HTTPArgument">
-+          <elementProp name="_import_multiple_value_separator" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.value">,</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">isAjax</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
-+            <stringProp name="Argument.name">_import_multiple_value_separator</stringProp>
-           </elementProp>
-         </collectionProp>
-       </elementProp>
-@@ -27724,74 +27574,92 @@ vars.put("visibility", String.valueOf(randomVisibility));
-       <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/validate</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-       <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-+      <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
-+        <collectionProp name="HTTPFileArgs.files">
-+          <elementProp name="${adminImportFilePath}" elementType="HTTPFileArg">
-+            <stringProp name="File.path">${adminImportFilePath}</stringProp>
-+            <stringProp name="File.paramname">import_file</stringProp>
-+            <stringProp name="File.mimetype">application/vnd.ms-excel</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/display_grid.jmx</stringProp></HTTPSamplerProxy>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import_validate.jmx</stringProp></HTTPSamplerProxy>
-     <hashTree>
-       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="1637639774">totalRecords</stringProp>
-+          <stringProp name="37280142">File is valid! To start import process</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">2</intProp>
-+        <intProp name="Assertion.test_type">16</intProp>
-       </ResponseAssertion>
-       <hashTree/>
-     </hashTree>
-   
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Display Update Attributes" enabled="true">
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Start" enabled="true">
-       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-         <collectionProp name="Arguments.arguments">
--          <elementProp name="selected[0]" elementType="HTTPArgument">
-+          <elementProp name="form_key" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${productId1}</stringProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">selected[0]</stringProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+            <stringProp name="Argument.desc">false</stringProp>
-           </elementProp>
--          <elementProp name="selected[1]" elementType="HTTPArgument">
-+          <elementProp name="entity" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${productId2}</stringProp>
-+            <stringProp name="Argument.value">${entity}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">selected[1]</stringProp>
-+            <stringProp name="Argument.name">entity</stringProp>
-           </elementProp>
--          <elementProp name="selected[2]" elementType="HTTPArgument">
-+          <elementProp name="behavior" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${productId3}</stringProp>
-+            <stringProp name="Argument.value">${adminImportBehavior}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">selected[2]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
-+            <stringProp name="Argument.name">behavior</stringProp>
-           </elementProp>
--          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+          <elementProp name="validation_strategy" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.value">validation-stop-on-errors</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+            <stringProp name="Argument.name">validation_strategy</stringProp>
-             <stringProp name="Argument.desc">false</stringProp>
-           </elementProp>
--          <elementProp name="form_key" elementType="HTTPArgument">
-+          <elementProp name="allowed_error_count" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.value">10</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">form_key</stringProp>
-+            <stringProp name="Argument.name">allowed_error_count</stringProp>
-             <stringProp name="Argument.desc">false</stringProp>
-           </elementProp>
--          <elementProp name="namespace" elementType="HTTPArgument">
-+          <elementProp name="_import_field_separator" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">product_listing</stringProp>
-+            <stringProp name="Argument.value">,</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">namespace</stringProp>
-+            <stringProp name="Argument.name">_import_field_separator</stringProp>
-+            <stringProp name="Argument.desc">false</stringProp>
-+          </elementProp>
-+          <elementProp name="_import_multiple_value_separator" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">,</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">_import_multiple_value_separator</stringProp>
-             <stringProp name="Argument.desc">false</stringProp>
-           </elementProp>
-         </collectionProp>
-@@ -27802,280 +27670,81 @@ vars.put("visibility", String.valueOf(randomVisibility));
-       <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/edit</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/start</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-       <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-+      <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
-+        <collectionProp name="HTTPFileArgs.files">
-+          <elementProp name="${adminImportFilePath}" elementType="HTTPFileArg">
-+            <stringProp name="File.path">${adminImportFilePath}</stringProp>
-+            <stringProp name="File.paramname">import_file</stringProp>
-+            <stringProp name="File.mimetype">application/vnd.ms-excel</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/display_update_attributes.jmx</stringProp></HTTPSamplerProxy>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import_save.jmx</stringProp></HTTPSamplerProxy>
-     <hashTree>
-       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="1862384910">Update Attributes</stringProp>
-+          <stringProp name="-1731221824">Import successfully done</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">2</intProp>
-+        <intProp name="Assertion.test_type">16</intProp>
-       </ResponseAssertion>
-       <hashTree/>
-     </hashTree>
-+  </hashTree>
-   
--  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Validate Attributes" enabled="true">
--    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--      <collectionProp name="Arguments.arguments">
--        <elementProp name="isAjax" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">true</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">isAjax</stringProp>
--          <stringProp name="Argument.desc">true</stringProp>
--        </elementProp>
--        <elementProp name="form_key" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">${admin_form_key}</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">form_key</stringProp>
--          <stringProp name="Argument.desc">true</stringProp>
--        </elementProp>
--        <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">1</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">product[product_has_weight]</stringProp>
--          <stringProp name="Argument.desc">true</stringProp>
--        </elementProp>
--        <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">1</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
--          <stringProp name="Argument.desc">true</stringProp>
--        </elementProp>
--        <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">1</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
--          <stringProp name="Argument.desc">true</stringProp>
--        </elementProp>
--        <elementProp name="inventory[qty]" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">${quantity}</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">inventory[qty]</stringProp>
--          <stringProp name="Argument.desc">true</stringProp>
--        </elementProp>
--        <elementProp name="attributes[price]" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">${price}</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">attributes[price]</stringProp>
--        </elementProp>
--        <elementProp name="attributes[visibility]" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">${visibility}</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">attributes[visibility]</stringProp>
--        </elementProp>
--      </collectionProp>
--    </elementProp>
--    <stringProp name="HTTPSampler.domain"/>
--    <stringProp name="HTTPSampler.port"/>
--    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--    <stringProp name="HTTPSampler.contentEncoding"/>
--    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/validate</stringProp>
--    <stringProp name="HTTPSampler.method">POST</stringProp>
--    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--    <boolProp name="HTTPSampler.monitor">false</boolProp>
--    <stringProp name="HTTPSampler.embedded_url_re"/>
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/change_attributes.jmx</stringProp></HTTPSamplerProxy>
--  <hashTree>
--    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
--      <collectionProp name="Asserion.test_strings">
--        <stringProp name="1853918323">{"error":false}</stringProp>
--      </collectionProp>
--      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--      <boolProp name="Assertion.assume_success">false</boolProp>
--      <intProp name="Assertion.test_type">2</intProp>
--    </ResponseAssertion>
--    <hashTree/>
--  </hashTree>
--  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Attributes" enabled="true">
--    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--      <collectionProp name="Arguments.arguments">
--        <elementProp name="isAjax" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">true</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">isAjax</stringProp>
--          <stringProp name="Argument.desc">false</stringProp>
--        </elementProp>
--        <elementProp name="form_key" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">${admin_form_key}</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">form_key</stringProp>
--          <stringProp name="Argument.desc">false</stringProp>
--        </elementProp>
--        <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">1</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">product[product_has_weight]</stringProp>
--          <stringProp name="Argument.desc">true</stringProp>
--        </elementProp>
--        <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">1</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
--        </elementProp>
--        <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">1</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
--          <stringProp name="Argument.desc">true</stringProp>
--        </elementProp>
--        <elementProp name="inventory[qty]" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">${quantity}</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">inventory[qty]</stringProp>
--        </elementProp>
--        <elementProp name="toggle_qty" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">on</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">toggle_price</stringProp>
--          <stringProp name="Argument.desc">true</stringProp>
--        </elementProp>
--        <elementProp name="attributes[price]" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">${price}</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">attributes[price]</stringProp>
--        </elementProp>
--        <elementProp name="toggle_price" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">on</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">toggle_price</stringProp>
--          <stringProp name="Argument.desc">true</stringProp>
--        </elementProp>
--        <elementProp name="attributes[visibility]" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">${visibility}</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">attributes[visibility]</stringProp>
--        </elementProp>
--        <elementProp name="toggle_visibility" elementType="HTTPArgument">
--          <boolProp name="HTTPArgument.always_encode">true</boolProp>
--          <stringProp name="Argument.value">on</stringProp>
--          <stringProp name="Argument.metadata">=</stringProp>
--          <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          <stringProp name="Argument.name">toggle_visibility</stringProp>
--          <stringProp name="Argument.desc">true</stringProp>
--        </elementProp>
--      </collectionProp>
--    </elementProp>
--    <stringProp name="HTTPSampler.domain"/>
--    <stringProp name="HTTPSampler.port"/>
--    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--    <stringProp name="HTTPSampler.contentEncoding"/>
--    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/save/store/0/active_tab/attributes</stringProp>
--    <stringProp name="HTTPSampler.method">POST</stringProp>
--    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--    <boolProp name="HTTPSampler.DO_MULTIPART_POST">true</boolProp>
--    <boolProp name="HTTPSampler.monitor">false</boolProp>
--    <stringProp name="HTTPSampler.embedded_url_re"/>
--  </HTTPSamplerProxy>
--  <hashTree>
--    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
--      <collectionProp name="Asserion.test_strings">
--        <stringProp name="1848809106">were updated.</stringProp>
--      </collectionProp>
--      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--      <boolProp name="Assertion.assume_success">false</boolProp>
--      <intProp name="Assertion.test_type">2</intProp>
--    </ResponseAssertion>
--    <hashTree/>
--  </hashTree>
--</hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments"/>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--    
--    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
--        <boolProp name="resetInterpreter">false</boolProp>
--        <stringProp name="parameters"/>
--        <stringProp name="filename"/>
--        <stringProp name="script">
--        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
--        if (adminUsersDistribution == 1) {
--            adminUserList = props.get("adminUserList");
--            adminUserList.add(vars.get("admin_user"));
--        }
--        </stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-     <hashTree/>
-   </hashTree>
-   </hashTree>
- 
-   
--    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Import Products" enabled="true">
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Import Customers" enabled="true">
-       <intProp name="ThroughputController.style">1</intProp>
-       <boolProp name="ThroughputController.perThread">false</boolProp>
-       <intProp name="ThroughputController.maxThroughput">1</intProp>
--      <stringProp name="ThroughputController.percentThroughput">${importProductsPercentage}</stringProp>
-+      <stringProp name="ThroughputController.percentThroughput">${importCustomersPercentage}</stringProp>
-     <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-     <hashTree>
-         <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-@@ -28096,7 +27765,7 @@ if (testLabel
-         <hashTree/>
-         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-             <stringProp name="BeanShellSampler.query">
--                vars.put("testLabel", "Import Products");
-+                vars.put("testLabel", "Import Customers");
-             </stringProp>
-             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-         </BeanShellSampler>
-@@ -28313,22 +27982,22 @@ vars.put("admin_user", adminUser);
-     </hashTree>
-   </hashTree>
-   
--    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
--</GenericController>
--    <hashTree>
-     <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
--      <stringProp name="BeanShellSampler.query">vars.put("entity", "catalog_product");
--String behavior = "${adminImportProductBehavior}";
-+      <stringProp name="BeanShellSampler.query">vars.put("entity", "customer");
-+String behavior = "${adminImportCustomerBehavior}";
- vars.put("adminImportBehavior", behavior);
--String filepath = "${files_folder}${adminImportProductFilePath}";
-+String filepath = "${files_folder}${adminImportCustomerFilePath}";
- vars.put("adminImportFilePath", filepath);  </stringProp>
-       <stringProp name="BeanShellSampler.filename"/>
-       <stringProp name="BeanShellSampler.parameters"/>
-       <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/import_products/setup.jmx</stringProp></BeanShellSampler>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/import_customers/setup.jmx</stringProp></BeanShellSampler>
-     <hashTree/>
-   
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Page" enabled="true">
-       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-         <collectionProp name="Arguments.arguments"/>
-@@ -28587,11 +28256,11 @@ vars.put("adminImportFilePath", filepath);  </stringProp>
-   </hashTree>
- 
-   
--    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Import Customers" enabled="true">
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API" enabled="true">
-       <intProp name="ThroughputController.style">1</intProp>
-       <boolProp name="ThroughputController.perThread">false</boolProp>
-       <intProp name="ThroughputController.maxThroughput">1</intProp>
--      <stringProp name="ThroughputController.percentThroughput">${importCustomersPercentage}</stringProp>
-+      <stringProp name="ThroughputController.percentThroughput">${apiSinglePercentage}</stringProp>
-     <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-     <hashTree>
-         <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-@@ -28612,111 +28281,36 @@ if (testLabel
-         <hashTree/>
-         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-             <stringProp name="BeanShellSampler.query">
--                vars.put("testLabel", "Import Customers");
-+                vars.put("testLabel", "API");
-             </stringProp>
-             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-         </BeanShellSampler>
-         <hashTree/>
-     
--        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
--        <stringProp name="script">
--        function getFormKeyFromResponse()
--        {
--            var url = prev.getUrlAsString(),
--            responseCode =  prev.getResponseCode(),
--            formKey = null;
--            searchPattern = /var FORM_KEY = '(.+)'/;
--            if (responseCode == "200" &amp;&amp; url) {
--                response = prev.getResponseDataAsString();
--                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
--            }
--            return formKey;
--        }
--
--        formKey = vars.get("form_key_storage");
--
--	   currentFormKey = getFormKeyFromResponse();
--
--	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
--		  vars.put("form_key_storage", currentFormKey);
--	   }
--        </stringProp>
--        <stringProp name="scriptLanguage">javascript</stringProp>
--        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
--        <hashTree/>
--        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
--            <stringProp name="script">
--                formKey =  vars.get("form_key_storage");
--                if (formKey
--                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
--                    &amp;&amp; sampler.getMethod() == "POST")
--                    {
--                        arguments = sampler.getArguments();
--                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
--                        {
--                            argument = arguments.getArgument(i);
--                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
--                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
--                            argument.setValue(formKey);
--                        }
--                    }
--                }
--            </stringProp>
--            <stringProp name="scriptLanguage">javascript</stringProp>
--        </JSR223PreProcessor>
--        <hashTree/>
--    
--    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
--      <collectionProp name="CookieManager.cookies"/>
--      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
--    <hashTree/>
--  
--    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
--</GenericController>
--    <hashTree>
--    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
--        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
--    <hashTree>
--    
--    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
--      <stringProp name="BeanShellSampler.query">
--adminUserList = props.get("adminUserList");
--adminUserListIterator = props.get("adminUserListIterator");
--adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
--
--if (adminUsersDistribution == 1) {
--    adminUser = adminUserList.poll();
--} else {
--    if (!adminUserListIterator.hasNext()) {
--        adminUserListIterator = adminUserList.descendingIterator();
--    }
--
--    adminUser = adminUserListIterator.next();
--}
--
--if (adminUser == null) {
--  SampleResult.setResponseMessage("adminUser list is empty");
--  SampleResult.setResponseData("adminUser list is empty","UTF-8");
--  IsSuccess=false;
--  SampleResult.setSuccessful(false);
--  SampleResult.setStopThread(true);
--}
--vars.put("admin_user", adminUser);
--      </stringProp>
--      <stringProp name="BeanShellSampler.filename"/>
--      <stringProp name="BeanShellSampler.parameters"/>
--      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
--    </BeanShellSampler>
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-     <hashTree/>
--  </hashTree>
-   
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments"/>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-       </elementProp>
-       <stringProp name="HTTPSampler.domain"/>
-       <stringProp name="HTTPSampler.port"/>
-@@ -28724,78 +28318,130 @@ vars.put("admin_user", adminUser);
-       <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-       <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
-     <hashTree>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="-1397214398">Welcome</stringProp>
--          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">2</intProp>
--      </ResponseAssertion>
--      <hashTree/>
--      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
--        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
--        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
--        <stringProp name="RegexExtractor.template">$1$</stringProp>
--        <stringProp name="RegexExtractor.default"/>
--        <stringProp name="RegexExtractor.match_number">1</stringProp>
--      </RegexExtractor>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-+        <stringProp name="VAR">admin_token</stringProp>
-+        <stringProp name="JSONPATH">$</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-       <hashTree/>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="2845929">^.+$</stringProp>
-+          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
-         <intProp name="Assertion.test_type">1</intProp>
-         <stringProp name="Assertion.scope">variable</stringProp>
--        <stringProp name="Scope.variable">admin_form_key</stringProp>
-+        <stringProp name="Scope.variable">admin_token</stringProp>
-       </ResponseAssertion>
-       <hashTree/>
-     </hashTree>
-   
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Authorization</stringProp>
-+          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Process Orders" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "API Process Orders");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-+      <stringProp name="BeanShellSampler.query">// Each thread gets an equal number of orders, based on how many orders are available.
-+
-+      int apiProcessOrders = Integer.parseInt("${apiProcessOrders}");
-+      if (apiProcessOrders &gt; 0) {
-+      ordersPerThread = apiProcessOrders;
-+      } else {
-+      ordersPerThread = 1;
-+      }
-+
-+
-+      threadNum = ${__threadNum};
-+      vars.put("ordersPerThread", String.valueOf(ordersPerThread));
-+      vars.put("threadNum", String.valueOf(threadNum));
-+
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Orders" enabled="true">
-       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-         <collectionProp name="Arguments.arguments">
--          <elementProp name="dummy" elementType="HTTPArgument">
-+          <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.value">status</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">dummy</stringProp>
-+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
-           </elementProp>
--          <elementProp name="form_key" elementType="HTTPArgument">
-+          <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.value">Pending</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">form_key</stringProp>
-+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
-           </elementProp>
--          <elementProp name="login[password]" elementType="HTTPArgument">
-+          <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_password}</stringProp>
-+            <stringProp name="Argument.value">${ordersPerThread}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">login[password]</stringProp>
-+            <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
-           </elementProp>
--          <elementProp name="login[username]" elementType="HTTPArgument">
-+          <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_user}</stringProp>
-+            <stringProp name="Argument.value">${threadNum}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">login[username]</stringProp>
-+            <stringProp name="Argument.name">searchCriteria[current_page]</stringProp>
-           </elementProp>
-         </collectionProp>
-       </elementProp>
-@@ -28805,47 +28451,33 @@ vars.put("admin_user", adminUser);
-       <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/orders</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-       <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
--    </HTTPSamplerProxy>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/get_orders.jmx</stringProp></HTTPSamplerProxy>
-     <hashTree>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
--            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
--            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
--            <stringProp name="RegexExtractor.template">$1$</stringProp>
--            <stringProp name="RegexExtractor.default"/>
--            <stringProp name="RegexExtractor.match_number">1</stringProp>
--        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
--        <hashTree/>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract entity ids" enabled="true">
-+        <stringProp name="VAR">entity_ids</stringProp>
-+        <stringProp name="JSONPATH">$.items[*].entity_id</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-     </hashTree>
--  </hashTree>
--  
--    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
--      <stringProp name="BeanShellSampler.query">vars.put("entity", "customer");
--String behavior = "${adminImportCustomerBehavior}";
--vars.put("adminImportBehavior", behavior);
--String filepath = "${files_folder}${adminImportCustomerFilePath}";
--vars.put("adminImportFilePath", filepath);  </stringProp>
--      <stringProp name="BeanShellSampler.filename"/>
--      <stringProp name="BeanShellSampler.parameters"/>
--      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/import_customers/setup.jmx</stringProp></BeanShellSampler>
--    <hashTree/>
-   
--    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
--</GenericController>
-+    <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Order" enabled="true">
-+      <stringProp name="ForeachController.inputVal">entity_ids</stringProp>
-+      <stringProp name="ForeachController.returnVal">order_id</stringProp>
-+      <boolProp name="ForeachController.useSeparator">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/for_each_order.jmx</stringProp></ForeachController>
-     <hashTree>
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Page" enabled="true">
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Invoice" enabled="true">
-       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-         <collectionProp name="Arguments.arguments"/>
-       </elementProp>
-@@ -28855,19 +28487,19 @@ vars.put("adminImportFilePath", filepath);  </stringProp>
-       <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/order/${order_id}/invoice</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-       <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import.jmx</stringProp></HTTPSamplerProxy>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/create_invoice.jmx</stringProp></HTTPSamplerProxy>
-     <hashTree>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="1723813687">Import Settings</stringProp>
-+          <stringProp name="34237953">"\d+"</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
-@@ -28876,60 +28508,9 @@ vars.put("adminImportFilePath", filepath);  </stringProp>
-       <hashTree/>
-     </hashTree>
-   
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Validate" enabled="true">
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Shipment" enabled="true">
-       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="form_key" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_form_key}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">form_key</stringProp>
--            <stringProp name="Argument.desc">false</stringProp>
--          </elementProp>
--          <elementProp name="entity" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${entity}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">entity</stringProp>
--          </elementProp>
--          <elementProp name="behavior" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${adminImportBehavior}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">behavior</stringProp>
--          </elementProp>
--          <elementProp name="validation_strategy" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">validation-stop-on-errors</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">validation_strategy</stringProp>
--          </elementProp>
--          <elementProp name="allowed_error_count" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">10</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">allowed_error_count</stringProp>
--          </elementProp>
--          <elementProp name="_import_field_separator" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">_import_field_separator</stringProp>
--          </elementProp>
--          <elementProp name="_import_multiple_value_separator" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">_import_multiple_value_separator</stringProp>
--          </elementProp>
--        </collectionProp>
-+        <collectionProp name="Arguments.arguments"/>
-       </elementProp>
-       <stringProp name="HTTPSampler.domain"/>
-       <stringProp name="HTTPSampler.port"/>
-@@ -28937,93 +28518,128 @@ vars.put("adminImportFilePath", filepath);  </stringProp>
-       <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/validate</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/order/${order_id}/ship</stringProp>
-       <stringProp name="HTTPSampler.method">POST</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-       <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
--      <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
--        <collectionProp name="HTTPFileArgs.files">
--          <elementProp name="${adminImportFilePath}" elementType="HTTPFileArg">
--            <stringProp name="File.path">${adminImportFilePath}</stringProp>
--            <stringProp name="File.paramname">import_file</stringProp>
--            <stringProp name="File.mimetype">application/vnd.ms-excel</stringProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import_validate.jmx</stringProp></HTTPSamplerProxy>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/create_shipment.jmx</stringProp></HTTPSamplerProxy>
-     <hashTree>
-       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="37280142">File is valid! To start import process</stringProp>
-+          <stringProp name="34237953">"\d+"</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">16</intProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-       </ResponseAssertion>
-       <hashTree/>
-     </hashTree>
-+  </hashTree>
-+  </hashTree>
-+
-   
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Start" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="form_key" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_form_key}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">form_key</stringProp>
--            <stringProp name="Argument.desc">false</stringProp>
--          </elementProp>
--          <elementProp name="entity" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${entity}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">entity</stringProp>
--          </elementProp>
--          <elementProp name="behavior" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${adminImportBehavior}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">behavior</stringProp>
--          </elementProp>
--          <elementProp name="validation_strategy" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">validation-stop-on-errors</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">validation_strategy</stringProp>
--            <stringProp name="Argument.desc">false</stringProp>
--          </elementProp>
--          <elementProp name="allowed_error_count" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">10</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">allowed_error_count</stringProp>
--            <stringProp name="Argument.desc">false</stringProp>
--          </elementProp>
--          <elementProp name="_import_field_separator" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">,</stringProp>
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Product Attribute Management" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "API Product Attribute Management");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create attribute set" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{&#xD;
-+    "attributeSet": {&#xD;
-+        "attribute_set_name": "new_attribute_set_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-+        "sort_order": 500&#xD;
-+    },&#xD;
-+    "skeletonId": "4"&#xD;
-+}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">_import_field_separator</stringProp>
--            <stringProp name="Argument.desc">false</stringProp>
-           </elementProp>
--          <elementProp name="_import_multiple_value_separator" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">,</stringProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attribute-sets/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_attribute_set.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_set_id" enabled="true">
-+        <stringProp name="VAR">attribute_set_id</stringProp>
-+        <stringProp name="JSONPATH">$.attribute_set_id</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_set_id not null" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="89649215">^\d+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">attribute_set_id</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create attribute group" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{&#xD;
-+    "group": {&#xD;
-+        "attribute_group_name": "empty_attribute_group_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-+        "attribute_set_id": ${attribute_set_id}&#xD;
-+    }&#xD;
-+}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">_import_multiple_value_separator</stringProp>
--            <stringProp name="Argument.desc">false</stringProp>
-           </elementProp>
-         </collectionProp>
-       </elementProp>
-@@ -29033,41 +28649,132 @@ vars.put("adminImportFilePath", filepath);  </stringProp>
-       <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/start</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attribute-sets/groups</stringProp>
-       <stringProp name="HTTPSampler.method">POST</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-       <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
--      <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
--        <collectionProp name="HTTPFileArgs.files">
--          <elementProp name="${adminImportFilePath}" elementType="HTTPFileArg">
--            <stringProp name="File.path">${adminImportFilePath}</stringProp>
--            <stringProp name="File.paramname">import_file</stringProp>
--            <stringProp name="File.mimetype">application/vnd.ms-excel</stringProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_attribute_group.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_group_id" enabled="true">
-+        <stringProp name="VAR">attribute_group_id</stringProp>
-+        <stringProp name="JSONPATH">$.attribute_group_id</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_group_id not null" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="89649215">^\d+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">attribute_set_id</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create attribute" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{&#xD;
-+    "attribute": {&#xD;
-+        "attribute_code": "attr_code_${__time()}",&#xD;
-+        "frontend_labels": [&#xD;
-+            {&#xD;
-+                "store_id": 0,&#xD;
-+                "label": "front_lbl_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}"&#xD;
-+            }&#xD;
-+        ],&#xD;
-+        "default_value": "default value",&#xD;
-+        "frontend_input": "textarea",&#xD;
-+        "is_required": 1&#xD;
-+    }&#xD;
-+}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-           </elementProp>
-         </collectionProp>
-       </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attributes/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import_save.jmx</stringProp></HTTPSamplerProxy>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_attribute.jmx</stringProp></HTTPSamplerProxy>
-     <hashTree>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_id" enabled="true">
-+        <stringProp name="VAR">attribute_id</stringProp>
-+        <stringProp name="JSONPATH">$.attribute_id</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_code" enabled="true">
-+        <stringProp name="VAR">attribute_code</stringProp>
-+        <stringProp name="JSONPATH">$.attribute_code</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_id not null" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="-1731221824">Import successfully done</stringProp>
-+          <stringProp name="89649215">^\d+$</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">16</intProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">attribute_id</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_code not null" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2131456825">^[a-z0-9-_]+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">attribute_code</stringProp>
-       </ResponseAssertion>
-       <hashTree/>
-     </hashTree>
--  </hashTree>
-   
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments"/>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add attribute to attribute set" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{&#xD;
-+    "attributeSetId": "${attribute_set_id}",&#xD;
-+    "attributeGroupId": "${attribute_group_id}",&#xD;
-+    "attributeCode": "${attribute_code}",&#xD;
-+    "sortOrder": 3&#xD;
-+}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-       </elementProp>
-       <stringProp name="HTTPSampler.domain"/>
-       <stringProp name="HTTPSampler.port"/>
-@@ -29075,39 +28782,35 @@ vars.put("adminImportFilePath", filepath);  </stringProp>
-       <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attribute-sets/attributes</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-       <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/add_attribute_to_attribute_set.jmx</stringProp></HTTPSamplerProxy>
-     <hashTree>
--    
--    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
--        <boolProp name="resetInterpreter">false</boolProp>
--        <stringProp name="parameters"/>
--        <stringProp name="filename"/>
--        <stringProp name="script">
--        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
--        if (adminUsersDistribution == 1) {
--            adminUserList = props.get("adminUserList");
--            adminUserList.add(vars.get("admin_user"));
--        }
--        </stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
--    <hashTree/>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert response is not null" enabled="true">
-+        <stringProp name="JSON_PATH">$</stringProp>
-+        <stringProp name="EXPECTED_VALUE">(\d+)</stringProp>
-+        <boolProp name="JSONVALIDATION">true</boolProp>
-+        <boolProp name="EXPECT_NULL">false</boolProp>
-+        <boolProp name="INVERT">false</boolProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <hashTree/>
-+    </hashTree>
-   </hashTree>
-+
-   </hashTree>
- 
-   
--    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Export Products" enabled="true">
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Category Management" enabled="true">
-       <intProp name="ThroughputController.style">1</intProp>
-       <boolProp name="ThroughputController.perThread">false</boolProp>
-       <intProp name="ThroughputController.maxThroughput">1</intProp>
--      <stringProp name="ThroughputController.percentThroughput">${exportProductsPercentage}</stringProp>
-+      <stringProp name="ThroughputController.percentThroughput">${adminCategoryManagementPercentage}</stringProp>
-     <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-     <hashTree>
-         <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-@@ -29128,7 +28831,7 @@ if (testLabel
-         <hashTree/>
-         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-             <stringProp name="BeanShellSampler.query">
--                vars.put("testLabel", "Export Products");
-+                vars.put("testLabel", "Admin Category Management");
-             </stringProp>
-             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-         </BeanShellSampler>
-@@ -29349,1175 +29052,762 @@ vars.put("admin_user", adminUser);
-   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
- </GenericController>
-     <hashTree>
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Export Page" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments"/>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/export/</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/export.jmx</stringProp></HTTPSamplerProxy>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Category Management" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_category_management/admin_category_management.jmx</stringProp>
-+</TestFragmentController>
-     <hashTree>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="1723813687">Export Settings</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">2</intProp>
--      </ResponseAssertion>
-+         <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Set Arguments" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = new java.util.Random();
-+if (${seedForRandom} &gt; 0) {
-+random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+/**
-+ * Get unique ids for fix concurrent category saving
-+ */
-+function getNextProductNumber(i) {
-+    number = productsVariationsSize * ${__threadNum} - i;
-+    if (number &gt;= productsSize) {
-+        log.info("${testLabel}: capacity of product list is not enough for support all ${adminPoolUsers} threads");
-+        return random.nextInt(productsSize);
-+    }
-+    return productsVariationsSize * ${__threadNum} - i;
-+}
-+
-+var productsVariationsSize = 5,
-+    productsSize = props.get("simple_products_list_for_edit").size();
-+
-+
-+for (i = 1; i&lt;= productsVariationsSize; i++) {
-+    var productVariablePrefix = "simple_product_" + i + "_";
-+    number = getNextProductNumber(i);
-+    simpleList = props.get("simple_products_list_for_edit").get(number);
-+
-+    vars.put(productVariablePrefix + "url_key", simpleList.get("url_key"));
-+    vars.put(productVariablePrefix + "id", simpleList.get("id"));
-+    vars.put(productVariablePrefix + "name", simpleList.get("title"));
-+}
-+
-+categoryIndex = random.nextInt(props.get("admin_category_ids_list").size());
-+vars.put("parent_category_id", props.get("admin_category_ids_list").get(categoryIndex));
-+do {
-+categoryIndexNew = random.nextInt(props.get("admin_category_ids_list").size());
-+} while(categoryIndex == categoryIndexNew);
-+vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(categoryIndexNew));</stringProp>
-+    </JSR223Sampler>
-       <hashTree/>
--    </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Export Products" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="form_key" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">form_key</stringProp>
--            <stringProp name="Argument.value">${admin_form_key}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="attribute_code" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">attribute_code</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[allow_message][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[allow_message][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[allow_open_amount]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[allow_open_amount]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[category_ids]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[category_ids]</stringProp>
--            <stringProp name="Argument.value">24,25,26,27,28,29,30</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[configurable_variations]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[configurable_variations]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[cost][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[cost][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[country_of_manufacture]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[country_of_manufacture]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[created_at]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[created_at]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[custom_design]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[custom_design]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[custom_design_from][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[custom_design_from][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[custom_design_to][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[custom_design_to][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[custom_layout_update]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[custom_layout_update]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[description]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[description]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[email_template]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[email_template]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[gallery]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[gallery]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[gift_message_available]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[gift_message_available]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[gift_wrapping_available]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[gift_wrapping_available]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[gift_wrapping_price][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[gift_wrapping_price][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[group_price][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[group_price][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[has_options]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[has_options]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[image]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[image]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[image_label]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[image_label]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[is_redeemable][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[is_redeemable][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[is_returnable]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[is_returnable]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[lifetime][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[lifetime][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[links_exist][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[links_exist][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[links_purchased_separately][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[links_purchased_separately][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[links_title]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[links_title]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[media_gallery]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[media_gallery]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[meta_description]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[meta_description]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[meta_keyword]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[meta_keyword]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[meta_title]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[meta_title]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[minimal_price][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[minimal_price][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[msrp][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[msrp][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[msrp_display_actual_price_type]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[msrp_display_actual_price_type]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[name]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[name]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[news_from_date][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[news_from_date][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[news_to_date][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[news_to_date][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[old_id][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[old_id][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[open_amount_max][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[open_amount_max][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[open_amount_min][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[open_amount_min][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[options_container]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[options_container]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[page_layout]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[page_layout]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[price][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[price][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[price_type][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[price_type][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[price_view]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[price_view]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[quantity_and_stock_status]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[quantity_and_stock_status]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[related_tgtr_position_behavior][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[related_tgtr_position_behavior][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[related_tgtr_position_limit][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[related_tgtr_position_limit][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[required_options]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[required_options]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[samples_title]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[samples_title]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[shipment_type][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[shipment_type][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[short_description]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[short_description]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[sku]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[sku]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[sku_type][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[sku_type][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[small_image]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[small_image]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[small_image_label]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[small_image_label]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[special_from_date][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[special_from_date][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[special_price][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[special_price][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[special_to_date][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[special_to_date][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[status]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[status]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[tax_class_id]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[tax_class_id]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[thumbnail]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[thumbnail]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[thumbnail_label]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[thumbnail_label]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[tier_price][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[tier_price][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[updated_at]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[updated_at]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[upsell_tgtr_position_behavior][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[upsell_tgtr_position_behavior][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[upsell_tgtr_position_limit][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[upsell_tgtr_position_limit][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[url_key]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[url_key]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[url_path]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[url_path]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[use_config_allow_message][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[use_config_allow_message][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[use_config_email_template][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[use_config_email_template][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[use_config_is_redeemable][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[use_config_is_redeemable][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[use_config_lifetime][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[use_config_lifetime][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[visibility]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[visibility]</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[weight][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[weight][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="export_filter[weight_type][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">export_filter[weight_type][]</stringProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--          <elementProp name="frontend_label" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.name">frontend_label</stringProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/export/export/entity/catalog_product/file_format/csv</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/export_products/export_products.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="-261088822">Simple Product 1</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">16</intProp>
--      </ResponseAssertion>
--      <hashTree/>
--    </hashTree>
--  </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments"/>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--    
--    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
--        <boolProp name="resetInterpreter">false</boolProp>
--        <stringProp name="parameters"/>
--        <stringProp name="filename"/>
--        <stringProp name="script">
--        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
--        if (adminUsersDistribution == 1) {
--            adminUserList = props.get("adminUserList");
--            adminUserList.add(vars.get("admin_user"));
--        }
--        </stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
--    <hashTree/>
--  </hashTree>
--  </hashTree>
--
--  
--    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Export Customers" enabled="true">
--      <intProp name="ThroughputController.style">1</intProp>
--      <boolProp name="ThroughputController.perThread">false</boolProp>
--      <intProp name="ThroughputController.maxThroughput">1</intProp>
--      <stringProp name="ThroughputController.percentThroughput">${exportCustomersPercentage}</stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
--    <hashTree>
--        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
--            <stringProp name="script">
--var testLabel = "${testLabel}" ? " (${testLabel})" : "";
--if (testLabel
--    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
--) {
--    if (sampler.getName().indexOf(testLabel) == -1) {
--       sampler.setName(sampler.getName() + testLabel);
--    }
--} else if (sampler.getName().indexOf("SetUp - ") == -1) {
--    sampler.setName("SetUp - " + sampler.getName());
--}
--            </stringProp>
--            <stringProp name="scriptLanguage">javascript</stringProp>
--        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Landing Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="Accept-Language" elementType="Header">
-+              <stringProp name="Header.name">Accept-Language</stringProp>
-+              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept" elementType="Header">
-+              <stringProp name="Header.name">Accept</stringProp>
-+              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
-+            </elementProp>
-+            <elementProp name="User-Agent" elementType="Header">
-+              <stringProp name="Header.name">User-Agent</stringProp>
-+              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept-Encoding" elementType="Header">
-+              <stringProp name="Header.name">Accept-Encoding</stringProp>
-+              <stringProp name="Header.value">gzip, deflate</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-         <hashTree/>
--        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
--            <stringProp name="BeanShellSampler.query">
--                vars.put("testLabel", "Export Customers");
--            </stringProp>
--            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
--        </BeanShellSampler>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+          <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-         <hashTree/>
--    
--        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
--        <stringProp name="script">
--        function getFormKeyFromResponse()
--        {
--            var url = prev.getUrlAsString(),
--            responseCode =  prev.getResponseCode(),
--            formKey = null;
--            searchPattern = /var FORM_KEY = '(.+)'/;
--            if (responseCode == "200" &amp;&amp; url) {
--                response = prev.getResponseDataAsString();
--                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
--            }
--            return formKey;
--        }
--
--        formKey = vars.get("form_key_storage");
--
--	   currentFormKey = getFormKeyFromResponse();
--
--	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
--		  vars.put("form_key_storage", currentFormKey);
--	   }
--        </stringProp>
--        <stringProp name="scriptLanguage">javascript</stringProp>
--        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Select parent category" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/edit/id/${parent_category_id}/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="Accept-Language" elementType="Header">
-+              <stringProp name="Header.name">Accept-Language</stringProp>
-+              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept" elementType="Header">
-+              <stringProp name="Header.name">Accept</stringProp>
-+              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
-+            </elementProp>
-+            <elementProp name="User-Agent" elementType="Header">
-+              <stringProp name="Header.name">User-Agent</stringProp>
-+              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept-Encoding" elementType="Header">
-+              <stringProp name="Header.name">Accept-Encoding</stringProp>
-+              <stringProp name="Header.value">gzip, deflate</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-         <hashTree/>
--        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
--            <stringProp name="script">
--                formKey =  vars.get("form_key_storage");
--                if (formKey
--                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
--                    &amp;&amp; sampler.getMethod() == "POST")
--                    {
--                        arguments = sampler.getArguments();
--                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
--                        {
--                            argument = arguments.getArgument(i);
--                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
--                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
--                            argument.setValue(formKey);
--                        }
--                    }
--                }
--            </stringProp>
--            <stringProp name="scriptLanguage">javascript</stringProp>
--        </JSR223PreProcessor>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open new category page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/add/store/0/parent/${parent_category_id}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-1903925024">&lt;title&gt;New Category</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-         <hashTree/>
--    
--    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
--      <collectionProp name="CookieManager.cookies"/>
--      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
--    <hashTree/>
--  
--    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
--</GenericController>
--    <hashTree>
--    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
--        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
--    <hashTree>
--    
--    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
--      <stringProp name="BeanShellSampler.query">
--adminUserList = props.get("adminUserList");
--adminUserListIterator = props.get("adminUserListIterator");
--adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
--
--if (adminUsersDistribution == 1) {
--    adminUser = adminUserList.poll();
--} else {
--    if (!adminUserListIterator.hasNext()) {
--        adminUserListIterator = adminUserList.descendingIterator();
--    }
--
--    adminUser = adminUserListIterator.next();
--}
--
--if (adminUser == null) {
--  SampleResult.setResponseMessage("adminUser list is empty");
--  SampleResult.setResponseData("adminUser list is empty","UTF-8");
--  IsSuccess=false;
--  SampleResult.setSuccessful(false);
--  SampleResult.setStopThread(true);
--}
--vars.put("admin_user", adminUser);
--      </stringProp>
--      <stringProp name="BeanShellSampler.filename"/>
--      <stringProp name="BeanShellSampler.parameters"/>
--      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
--    </BeanShellSampler>
--    <hashTree/>
--  </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments"/>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="-1397214398">Welcome</stringProp>
--          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">2</intProp>
--      </ResponseAssertion>
--      <hashTree/>
--      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
--        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
--        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
--        <stringProp name="RegexExtractor.template">$1$</stringProp>
--        <stringProp name="RegexExtractor.default"/>
--        <stringProp name="RegexExtractor.match_number">1</stringProp>
--      </RegexExtractor>
--      <hashTree/>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="2845929">^.+$</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">1</intProp>
--        <stringProp name="Assertion.scope">variable</stringProp>
--        <stringProp name="Scope.variable">admin_form_key</stringProp>
--      </ResponseAssertion>
--      <hashTree/>
--    </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="dummy" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">dummy</stringProp>
--          </elementProp>
--          <elementProp name="form_key" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_form_key}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">form_key</stringProp>
--          </elementProp>
--          <elementProp name="login[password]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_password}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">login[password]</stringProp>
--          </elementProp>
--          <elementProp name="login[username]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_user}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">login[username]</stringProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <stringProp name="HTTPSampler.implementation">Java</stringProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
--    </HTTPSamplerProxy>
--    <hashTree>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
--            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
--            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
--            <stringProp name="RegexExtractor.template">$1$</stringProp>
--            <stringProp name="RegexExtractor.default"/>
--            <stringProp name="RegexExtractor.match_number">1</stringProp>
--        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create category" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">id</stringProp>
-+            </elementProp>
-+            <elementProp name="parent" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${parent_category_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">parent</stringProp>
-+            </elementProp>
-+            <elementProp name="path" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">path</stringProp>
-+            </elementProp>
-+            <elementProp name="store_id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">store_id</stringProp>
-+            </elementProp>
-+            <elementProp name="is_active" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">is_active</stringProp>
-+            </elementProp>
-+            <elementProp name="include_in_menu" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">include_in_menu</stringProp>
-+            </elementProp>
-+            <elementProp name="is_anchor" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">is_anchor</stringProp>
-+            </elementProp>
-+            <elementProp name="use_config[available_sort_by]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">use_config[available_sort_by]</stringProp>
-+            </elementProp>
-+            <elementProp name="use_config[default_sort_by]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">use_config[default_sort_by]</stringProp>
-+            </elementProp>
-+            <elementProp name="use_config[filter_price_range]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">use_config[filter_price_range]</stringProp>
-+            </elementProp>
-+            <elementProp name="use_default[url_key]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">false</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">use_default[url_key]</stringProp>
-+            </elementProp>
-+            <elementProp name="url_key_create_redirect" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">url_key_create_redirect</stringProp>
-+            </elementProp>
-+            <elementProp name="custom_use_parent_settings" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">custom_use_parent_settings</stringProp>
-+            </elementProp>
-+            <elementProp name="custom_apply_to_products" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">custom_apply_to_products</stringProp>
-+            </elementProp>
-+            <elementProp name="name" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Admin Category Management ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">name</stringProp>
-+            </elementProp>
-+            <elementProp name="url_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">admin-category-management-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">url_key</stringProp>
-+            </elementProp>
-+            <elementProp name="meta_title" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">meta_title</stringProp>
-+            </elementProp>
-+            <elementProp name="description" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">description</stringProp>
-+            </elementProp>
-+            <elementProp name="display_mode" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">PRODUCTS</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">display_mode</stringProp>
-+            </elementProp>
-+            <elementProp name="default_sort_by" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">position</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">default_sort_by</stringProp>
-+            </elementProp>
-+            <elementProp name="meta_keywords" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">meta_keywords</stringProp>
-+            </elementProp>
-+            <elementProp name="meta_description" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">meta_description</stringProp>
-+            </elementProp>
-+            <elementProp name="custom_layout_update" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">custom_layout_update</stringProp>
-+            </elementProp>
-+            <elementProp name="category_products" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+              <stringProp name="Argument.value">{"${simple_product_1_id}":"","${simple_product_2_id}":"","${simple_product_3_id}":"","${simple_product_4_id}":"","${simple_product_5_id}":""}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">category_products</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/save/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">URL</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">/catalog/category/edit/id/(\d+)/</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-         <hashTree/>
--    </hashTree>
--  </hashTree>
--  
--    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
--</GenericController>
--    <hashTree>
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Export Page" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments"/>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/export/</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/export.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="1723813687">Export Settings</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">2</intProp>
--      </ResponseAssertion>
--      <hashTree/>
--    </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Export Customers" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="form_key" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_form_key}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">form_key</stringProp>
--            <stringProp name="Argument.desc">false</stringProp>
--          </elementProp>
--          <elementProp name="attribute_code" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">attribute_code</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[confirmation]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[confirmation]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[created_at]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[created_at]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[created_in]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[created_in]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[default_billing][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[default_billing][]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[default_shipping][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[default_shipping][]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[disable_auto_group_change]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[disable_auto_group_change]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[dob][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[dob][]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[email]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[email]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[firstname]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[firstname]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[gender]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[gender]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[group_id]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[group_id]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[lastname]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[lastname]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[middlename]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[middlename]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[password_hash]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[password_hash]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[prefix]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[prefix]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[reward_update_notification][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[reward_update_notification][]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[reward_warning_notification][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[reward_warning_notification][]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[rp_token]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[rp_token]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[rp_token_created_at][]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">,</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[rp_token_created_at][]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[store_id]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[store_id]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[suffix]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[suffix]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[taxvat]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[taxvat]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="export_filter[website_id]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">export_filter[website_id]</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--          <elementProp name="frontend_label" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">frontend_label</stringProp>
--            <stringProp name="Argument.desc">true</stringProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/export/export/entity/customer/file_format/csv</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/export_customers/export_customers.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="-2040454917">user_1@example.com</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">16</intProp>
--      </ResponseAssertion>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Select created category" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/edit/id/${admin_category_id}/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="Accept-Language" elementType="Header">
-+              <stringProp name="Header.name">Accept-Language</stringProp>
-+              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept" elementType="Header">
-+              <stringProp name="Header.name">Accept</stringProp>
-+              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
-+            </elementProp>
-+            <elementProp name="User-Agent" elementType="Header">
-+              <stringProp name="Header.name">User-Agent</stringProp>
-+              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept-Encoding" elementType="Header">
-+              <stringProp name="Header.name">Accept-Encoding</stringProp>
-+              <stringProp name="Header.value">gzip, deflate</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category row id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_entity_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">"entity_id":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category attribute set id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_attribute_set_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">"attribute_set_id":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category parent Id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_parent_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">"parent_id":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category created at" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_created_at</stringProp>
-+          <stringProp name="RegexExtractor.regex">"created_at":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category updated at" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_updated_at</stringProp>
-+          <stringProp name="RegexExtractor.regex">"updated_at":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category path" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_path</stringProp>
-+          <stringProp name="RegexExtractor.regex">"entity_id":(.+)"path":"([^\"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$2$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category level" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_level</stringProp>
-+          <stringProp name="RegexExtractor.regex">"level":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category name" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_name</stringProp>
-+          <stringProp name="RegexExtractor.regex">"entity_id":(.+)"name":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$2$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category url key" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_url_key</stringProp>
-+          <stringProp name="RegexExtractor.regex">"url_key":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category url path" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_url_path</stringProp>
-+          <stringProp name="RegexExtractor.regex">"url_path":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category row id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_entity_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category attribute set id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_attribute_set_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category parent id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_parent_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category created at" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_created_at</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category updated at" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_updated_at</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category path" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="59022110">^[\d\\\/]+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_path</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category level" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_level</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category name" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_name</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category url key" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_url_key</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category url path" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_url_path</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert products added" enabled="true">
-+            <collectionProp name="Asserion.test_strings">
-+              <stringProp name="417284990">${simple_product_1_name}</stringProp>
-+              <stringProp name="1304788671">${simple_product_2_name}</stringProp>
-+              <stringProp name="-2102674944">${simple_product_3_name}</stringProp>
-+              <stringProp name="-1215171263">${simple_product_4_name}</stringProp>
-+              <stringProp name="-327667582">${simple_product_5_name}</stringProp>
-+            </collectionProp>
-+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+            <boolProp name="Assertion.assume_success">false</boolProp>
-+            <intProp name="Assertion.test_type">2</intProp>
-+          </ResponseAssertion>
-+          <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Move category" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_category_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">id</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+            </elementProp>
-+            <elementProp name="point" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">append</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">point</stringProp>
-+            </elementProp>
-+            <elementProp name="pid" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${new_parent_category_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">pid</stringProp>
-+            </elementProp>
-+            <elementProp name="paid" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${parent_category_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">paid</stringProp>
-+            </elementProp>
-+            <elementProp name="aid" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">aid</stringProp>
-+            </elementProp>
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/move/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete category" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/delete/id/${admin_category_id}/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category deleted" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="1277069529">You deleted the category.</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Pause" enabled="true">
-+        <intProp name="ActionProcessor.action">1</intProp>
-+        <intProp name="ActionProcessor.target">0</intProp>
-+        <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${adminCategoryManagementDelay}*1000))}</stringProp>
-+      </TestAction>
-       <hashTree/>
-     </hashTree>
-   </hashTree>
-@@ -30560,11 +29850,11 @@ vars.put("admin_user", adminUser);
-   </hashTree>
- 
-   
--    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API" enabled="true">
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Promotion Rules" enabled="true">
-       <intProp name="ThroughputController.style">1</intProp>
-       <boolProp name="ThroughputController.perThread">false</boolProp>
-       <intProp name="ThroughputController.maxThroughput">1</intProp>
--      <stringProp name="ThroughputController.percentThroughput">${apiBasePercentage}</stringProp>
-+      <stringProp name="ThroughputController.percentThroughput">${adminPromotionRulesPercentage}</stringProp>
-     <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-     <hashTree>
-         <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-@@ -30585,557 +29875,7 @@ if (testLabel
-         <hashTree/>
-         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-             <stringProp name="BeanShellSampler.query">
--                vars.put("testLabel", "API");
--            </stringProp>
--            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
--        </BeanShellSampler>
--        <hashTree/>
--    
--    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--      <collectionProp name="HeaderManager.headers">
--        <elementProp name="" elementType="Header">
--          <stringProp name="Header.name">Content-Type</stringProp>
--          <stringProp name="Header.value">application/json</stringProp>
--        </elementProp>
--        <elementProp name="" elementType="Header">
--          <stringProp name="Header.name">Accept</stringProp>
--          <stringProp name="Header.value">*/*</stringProp>
--        </elementProp>
--      </collectionProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
--    <hashTree/>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
--      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
--        <stringProp name="VAR">admin_token</stringProp>
--        <stringProp name="JSONPATH">$</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--      <hashTree/>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">1</intProp>
--        <stringProp name="Assertion.scope">variable</stringProp>
--        <stringProp name="Scope.variable">admin_token</stringProp>
--      </ResponseAssertion>
--      <hashTree/>
--    </hashTree>
--  
--    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--      <collectionProp name="HeaderManager.headers">
--        <elementProp name="" elementType="Header">
--          <stringProp name="Header.name">Authorization</stringProp>
--          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
--        </elementProp>
--      </collectionProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
--    <hashTree/>
--  
--    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Process Orders" enabled="true">
--      <intProp name="ThroughputController.style">1</intProp>
--      <boolProp name="ThroughputController.perThread">false</boolProp>
--      <intProp name="ThroughputController.maxThroughput">1</intProp>
--      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
--    <hashTree>
--        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
--            <stringProp name="script">
--var testLabel = "${testLabel}" ? " (${testLabel})" : "";
--if (testLabel
--    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
--) {
--    if (sampler.getName().indexOf(testLabel) == -1) {
--       sampler.setName(sampler.getName() + testLabel);
--    }
--} else if (sampler.getName().indexOf("SetUp - ") == -1) {
--    sampler.setName("SetUp - " + sampler.getName());
--}
--            </stringProp>
--            <stringProp name="scriptLanguage">javascript</stringProp>
--        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
--        <hashTree/>
--        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
--            <stringProp name="BeanShellSampler.query">
--                vars.put("testLabel", "API Process Orders");
--            </stringProp>
--            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
--        </BeanShellSampler>
--        <hashTree/>
--    
--    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
--      <stringProp name="BeanShellSampler.query">// Each thread gets an equal number of orders, based on how many orders are available.
--
--      int apiProcessOrders = Integer.parseInt("${apiProcessOrders}");
--      if (apiProcessOrders &gt; 0) {
--      ordersPerThread = apiProcessOrders;
--      } else {
--      ordersPerThread = 1;
--      }
--
--
--      threadNum = ${__threadNum};
--      vars.put("ordersPerThread", String.valueOf(ordersPerThread));
--      vars.put("threadNum", String.valueOf(threadNum));
--
--      </stringProp>
--      <stringProp name="BeanShellSampler.filename"/>
--      <stringProp name="BeanShellSampler.parameters"/>
--      <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/setup.jmx</stringProp></BeanShellSampler>
--    <hashTree/>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Orders" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">status</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
--          </elementProp>
--          <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">Pending</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
--          </elementProp>
--          <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${ordersPerThread}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
--          </elementProp>
--          <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${threadNum}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">searchCriteria[current_page]</stringProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/orders</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/get_orders.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract entity ids" enabled="true">
--        <stringProp name="VAR">entity_ids</stringProp>
--        <stringProp name="JSONPATH">$.items[*].entity_id</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--      <hashTree/>
--    </hashTree>
--  
--    <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Order" enabled="true">
--      <stringProp name="ForeachController.inputVal">entity_ids</stringProp>
--      <stringProp name="ForeachController.returnVal">order_id</stringProp>
--      <boolProp name="ForeachController.useSeparator">true</boolProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/for_each_order.jmx</stringProp></ForeachController>
--    <hashTree>
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Invoice" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments"/>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/order/${order_id}/invoice</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/create_invoice.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="34237953">"\d+"</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">2</intProp>
--      </ResponseAssertion>
--      <hashTree/>
--    </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Shipment" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments"/>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/order/${order_id}/ship</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/create_shipment.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="34237953">"\d+"</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">2</intProp>
--      </ResponseAssertion>
--      <hashTree/>
--    </hashTree>
--  </hashTree>
--  </hashTree>
--
--  
--    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Product Attribute Management" enabled="true">
--      <intProp name="ThroughputController.style">1</intProp>
--      <boolProp name="ThroughputController.perThread">false</boolProp>
--      <intProp name="ThroughputController.maxThroughput">1</intProp>
--      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
--    <hashTree>
--        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
--            <stringProp name="script">
--var testLabel = "${testLabel}" ? " (${testLabel})" : "";
--if (testLabel
--    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
--) {
--    if (sampler.getName().indexOf(testLabel) == -1) {
--       sampler.setName(sampler.getName() + testLabel);
--    }
--} else if (sampler.getName().indexOf("SetUp - ") == -1) {
--    sampler.setName("SetUp - " + sampler.getName());
--}
--            </stringProp>
--            <stringProp name="scriptLanguage">javascript</stringProp>
--        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
--        <hashTree/>
--        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
--            <stringProp name="BeanShellSampler.query">
--                vars.put("testLabel", "API Product Attribute Management");
--            </stringProp>
--            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
--        </BeanShellSampler>
--        <hashTree/>
--    
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create attribute set" enabled="true">
--      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--            <stringProp name="Argument.value">{&#xD;
--    "attributeSet": {&#xD;
--        "attribute_set_name": "new_attribute_set_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
--        "sort_order": 500&#xD;
--    },&#xD;
--    "skeletonId": "4"&#xD;
--}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attribute-sets/</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_attribute_set.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_set_id" enabled="true">
--        <stringProp name="VAR">attribute_set_id</stringProp>
--        <stringProp name="JSONPATH">$.attribute_set_id</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--      <hashTree/>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_set_id not null" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="89649215">^\d+$</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">1</intProp>
--        <stringProp name="Assertion.scope">variable</stringProp>
--        <stringProp name="Scope.variable">attribute_set_id</stringProp>
--      </ResponseAssertion>
--      <hashTree/>
--    </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create attribute group" enabled="true">
--      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--            <stringProp name="Argument.value">{&#xD;
--    "group": {&#xD;
--        "attribute_group_name": "empty_attribute_group_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
--        "attribute_set_id": ${attribute_set_id}&#xD;
--    }&#xD;
--}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attribute-sets/groups</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_attribute_group.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_group_id" enabled="true">
--        <stringProp name="VAR">attribute_group_id</stringProp>
--        <stringProp name="JSONPATH">$.attribute_group_id</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--      <hashTree/>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_group_id not null" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="89649215">^\d+$</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">1</intProp>
--        <stringProp name="Assertion.scope">variable</stringProp>
--        <stringProp name="Scope.variable">attribute_set_id</stringProp>
--      </ResponseAssertion>
--      <hashTree/>
--    </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create attribute" enabled="true">
--      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--            <stringProp name="Argument.value">{&#xD;
--    "attribute": {&#xD;
--        "attribute_code": "attr_code_${__time()}",&#xD;
--        "frontend_labels": [&#xD;
--            {&#xD;
--                "store_id": 0,&#xD;
--                "label": "front_lbl_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}"&#xD;
--            }&#xD;
--        ],&#xD;
--        "default_value": "default value",&#xD;
--        "frontend_input": "textarea",&#xD;
--        "is_required": 1&#xD;
--    }&#xD;
--}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attributes/</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_attribute.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_id" enabled="true">
--        <stringProp name="VAR">attribute_id</stringProp>
--        <stringProp name="JSONPATH">$.attribute_id</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--      <hashTree/>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_code" enabled="true">
--        <stringProp name="VAR">attribute_code</stringProp>
--        <stringProp name="JSONPATH">$.attribute_code</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--      <hashTree/>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_id not null" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="89649215">^\d+$</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">1</intProp>
--        <stringProp name="Assertion.scope">variable</stringProp>
--        <stringProp name="Scope.variable">attribute_id</stringProp>
--      </ResponseAssertion>
--      <hashTree/>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_code not null" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="2131456825">^[a-z0-9-_]+$</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">1</intProp>
--        <stringProp name="Assertion.scope">variable</stringProp>
--        <stringProp name="Scope.variable">attribute_code</stringProp>
--      </ResponseAssertion>
--      <hashTree/>
--    </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add attribute to attribute set" enabled="true">
--      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--            <stringProp name="Argument.value">{&#xD;
--    "attributeSetId": "${attribute_set_id}",&#xD;
--    "attributeGroupId": "${attribute_group_id}",&#xD;
--    "attributeCode": "${attribute_code}",&#xD;
--    "sortOrder": 3&#xD;
--}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attribute-sets/attributes</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/add_attribute_to_attribute_set.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert response is not null" enabled="true">
--        <stringProp name="JSON_PATH">$</stringProp>
--        <stringProp name="EXPECTED_VALUE">(\d+)</stringProp>
--        <boolProp name="JSONVALIDATION">true</boolProp>
--        <boolProp name="EXPECT_NULL">false</boolProp>
--        <boolProp name="INVERT">false</boolProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
--      <hashTree/>
--    </hashTree>
--  </hashTree>
--
--  </hashTree>
--
--  
--    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Category Management" enabled="true">
--      <intProp name="ThroughputController.style">1</intProp>
--      <boolProp name="ThroughputController.perThread">false</boolProp>
--      <intProp name="ThroughputController.maxThroughput">1</intProp>
--      <stringProp name="ThroughputController.percentThroughput">${adminCategoryManagementPercentage}</stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
--    <hashTree>
--        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
--            <stringProp name="script">
--var testLabel = "${testLabel}" ? " (${testLabel})" : "";
--if (testLabel
--    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
--) {
--    if (sampler.getName().indexOf(testLabel) == -1) {
--       sampler.setName(sampler.getName() + testLabel);
--    }
--} else if (sampler.getName().indexOf("SetUp - ") == -1) {
--    sampler.setName("SetUp - " + sampler.getName());
--}
--            </stringProp>
--            <stringProp name="scriptLanguage">javascript</stringProp>
--        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
--        <hashTree/>
--        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
--            <stringProp name="BeanShellSampler.query">
--                vars.put("testLabel", "Admin Category Management");
-+                vars.put("testLabel", "Admin Promotion Rules");
-             </stringProp>
-             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-         </BeanShellSampler>
-@@ -31356,54 +30096,10 @@ vars.put("admin_user", adminUser);
-   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
- </GenericController>
-     <hashTree>
--    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Category Management" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_category_management/admin_category_management.jmx</stringProp>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Promotions Management" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_promotions_management/admin_promotions_management.jmx</stringProp>
- </TestFragmentController>
-     <hashTree>
--         <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Set Arguments" enabled="true">
--      <stringProp name="scriptLanguage">javascript</stringProp>
--      <stringProp name="parameters"/>
--      <stringProp name="filename"/>
--      <stringProp name="cacheKey"/>
--      <stringProp name="script">random = new java.util.Random();
--if (${seedForRandom} &gt; 0) {
--random.setSeed(${seedForRandom} + ${__threadNum});
--}
--
--/**
-- * Get unique ids for fix concurrent category saving
-- */
--function getNextProductNumber(i) {
--    number = productsVariationsSize * ${__threadNum} - i;
--    if (number &gt;= productsSize) {
--        log.info("${testLabel}: capacity of product list is not enough for support all ${adminPoolUsers} threads");
--        return random.nextInt(productsSize);
--    }
--    return productsVariationsSize * ${__threadNum} - i;
--}
--
--var productsVariationsSize = 5,
--    productsSize = props.get("simple_products_list_for_edit").size();
--
--
--for (i = 1; i&lt;= productsVariationsSize; i++) {
--    var productVariablePrefix = "simple_product_" + i + "_";
--    number = getNextProductNumber(i);
--    simpleList = props.get("simple_products_list_for_edit").get(number);
--
--    vars.put(productVariablePrefix + "url_key", simpleList.get("url_key"));
--    vars.put(productVariablePrefix + "id", simpleList.get("id"));
--    vars.put(productVariablePrefix + "name", simpleList.get("title"));
--}
--
--categoryIndex = random.nextInt(props.get("admin_category_ids_list").size());
--vars.put("parent_category_id", props.get("admin_category_ids_list").get(categoryIndex));
--do {
--categoryIndexNew = random.nextInt(props.get("admin_category_ids_list").size());
--} while(categoryIndex == categoryIndexNew);
--vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(categoryIndexNew));</stringProp>
--    </JSR223Sampler>
--      <hashTree/>
-       <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Landing Page" enabled="true">
-         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-           <collectionProp name="Arguments.arguments"/>
-@@ -31414,7 +30110,7 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
-         <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-         <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/</stringProp>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/</stringProp>
-         <stringProp name="HTTPSampler.method">GET</stringProp>
-         <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-         <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-@@ -31423,39 +30119,8 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
-         <boolProp name="HTTPSampler.monitor">false</boolProp>
-         <stringProp name="HTTPSampler.embedded_url_re"/>
-       </HTTPSamplerProxy>
--      <hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="Accept-Language" elementType="Header">
--              <stringProp name="Header.name">Accept-Language</stringProp>
--              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
--            </elementProp>
--            <elementProp name="Accept" elementType="Header">
--              <stringProp name="Header.name">Accept</stringProp>
--              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
--            </elementProp>
--            <elementProp name="User-Agent" elementType="Header">
--              <stringProp name="Header.name">User-Agent</stringProp>
--              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
--            </elementProp>
--            <elementProp name="Accept-Encoding" elementType="Header">
--              <stringProp name="Header.name">Accept-Encoding</stringProp>
--              <stringProp name="Header.value">gzip, deflate</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
--          <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
--          <stringProp name="RegexExtractor.template">$1$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--      </hashTree>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Select parent category" enabled="true">
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create New" enabled="true">
-         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-           <collectionProp name="Arguments.arguments"/>
-         </elementProp>
-@@ -31465,7 +30130,7 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
-         <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-         <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/edit/id/${parent_category_id}/</stringProp>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/new</stringProp>
-         <stringProp name="HTTPSampler.method">GET</stringProp>
-         <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-         <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-@@ -31474,32 +30139,40 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
-         <boolProp name="HTTPSampler.monitor">false</boolProp>
-         <stringProp name="HTTPSampler.embedded_url_re"/>
-       </HTTPSamplerProxy>
--      <hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="Accept-Language" elementType="Header">
--              <stringProp name="Header.name">Accept-Language</stringProp>
--              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create New Conditional" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-             </elementProp>
--            <elementProp name="Accept" elementType="Header">
--              <stringProp name="Header.name">Accept</stringProp>
--              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-             </elementProp>
--            <elementProp name="User-Agent" elementType="Header">
--              <stringProp name="Header.name">User-Agent</stringProp>
--              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
-+            <elementProp name="id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1--1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">id</stringProp>
-             </elementProp>
--            <elementProp name="Accept-Encoding" elementType="Header">
--              <stringProp name="Header.name">Accept-Encoding</stringProp>
--              <stringProp name="Header.value">gzip, deflate</stringProp>
-+            <elementProp name="type" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Magento\SalesRule\Model\Rule\Condition\Address|base_subtotal</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">type</stringProp>
-             </elementProp>
-           </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--      </hashTree>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open new category page" enabled="true">
--        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--          <collectionProp name="Arguments.arguments"/>
-         </elementProp>
-         <stringProp name="HTTPSampler.domain"/>
-         <stringProp name="HTTPSampler.port"/>
-@@ -31507,8 +30180,8 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
-         <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-         <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/add/store/0/parent/${parent_category_id}</stringProp>
--        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/newConditionHtml/form/sales_rule_formrule_conditions_fieldset_/form_namespace/sales_rule_form</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-         <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-         <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-         <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-@@ -31516,187 +30189,268 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
-         <boolProp name="HTTPSampler.monitor">false</boolProp>
-         <stringProp name="HTTPSampler.embedded_url_re"/>
-       </HTTPSamplerProxy>
--      <hashTree>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="-1903925024">&lt;title&gt;New Category</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">2</intProp>
--        </ResponseAssertion>
--        <hashTree/>
--      </hashTree>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create category" enabled="true">
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save" enabled="true">
-         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-           <collectionProp name="Arguments.arguments">
--            <elementProp name="id" elementType="HTTPArgument">
-+            <elementProp name="name" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Rule Name ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">name</stringProp>
-+            </elementProp>
-+            <elementProp name="is_active" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">is_active</stringProp>
-+            </elementProp>
-+            <elementProp name="use_auto_generation" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">use_auto_generation</stringProp>
-+            </elementProp>
-+            <elementProp name="is_rss" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">is_rss</stringProp>
-+            </elementProp>
-+            <elementProp name="apply_to_shipping" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">apply_to_shipping</stringProp>
-+            </elementProp>
-+            <elementProp name="stop_rules_processing" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">stop_rules_processing</stringProp>
-+            </elementProp>
-+            <elementProp name="coupon_code" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-               <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">id</stringProp>
-+              <stringProp name="Argument.name">coupon_code</stringProp>
-             </elementProp>
--            <elementProp name="parent" elementType="HTTPArgument">
-+            <elementProp name="uses_per_coupon" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">${parent_category_id}</stringProp>
-+              <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">parent</stringProp>
-+              <stringProp name="Argument.name">uses_per_coupon</stringProp>
-             </elementProp>
--            <elementProp name="path" elementType="HTTPArgument">
-+            <elementProp name="uses_per_customer" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-               <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">path</stringProp>
-+              <stringProp name="Argument.name">uses_per_customer</stringProp>
-             </elementProp>
--            <elementProp name="store_id" elementType="HTTPArgument">
-+            <elementProp name="sort_order" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-               <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">store_id</stringProp>
-+              <stringProp name="Argument.name">sort_order</stringProp>
-             </elementProp>
--            <elementProp name="is_active" elementType="HTTPArgument">
-+            <elementProp name="discount_amount" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.value">5</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">is_active</stringProp>
-+              <stringProp name="Argument.name">discount_amount</stringProp>
-             </elementProp>
--            <elementProp name="include_in_menu" elementType="HTTPArgument">
-+            <elementProp name="discount_qty" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-               <stringProp name="Argument.value">0</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">include_in_menu</stringProp>
-+              <stringProp name="Argument.name">discount_qty</stringProp>
-             </elementProp>
--            <elementProp name="is_anchor" elementType="HTTPArgument">
-+            <elementProp name="discount_step" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">is_anchor</stringProp>
-+              <stringProp name="Argument.name">discount_step</stringProp>
-             </elementProp>
--            <elementProp name="use_config[available_sort_by]" elementType="HTTPArgument">
-+            <elementProp name="reward_points_delta" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">use_config[available_sort_by]</stringProp>
-+              <stringProp name="Argument.name">reward_points_delta</stringProp>
-             </elementProp>
--            <elementProp name="use_config[default_sort_by]" elementType="HTTPArgument">
-+            <elementProp name="store_labels[0]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">use_config[default_sort_by]</stringProp>
-+              <stringProp name="Argument.name">store_labels[0]</stringProp>
-             </elementProp>
--            <elementProp name="use_config[filter_price_range]" elementType="HTTPArgument">
-+            <elementProp name="description" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.value">Rule Description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">use_config[filter_price_range]</stringProp>
-+              <stringProp name="Argument.name">description</stringProp>
-             </elementProp>
--            <elementProp name="use_default[url_key]" elementType="HTTPArgument">
-+            <elementProp name="coupon_type" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">false</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">use_default[url_key]</stringProp>
-+              <stringProp name="Argument.name">coupon_type</stringProp>
-             </elementProp>
--            <elementProp name="url_key_create_redirect" elementType="HTTPArgument">
-+            <elementProp name="simple_action" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.value">cart_fixed</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">url_key_create_redirect</stringProp>
-+              <stringProp name="Argument.name">simple_action</stringProp>
-             </elementProp>
--            <elementProp name="custom_use_parent_settings" elementType="HTTPArgument">
-+            <elementProp name="website_ids[0]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">custom_use_parent_settings</stringProp>
-+              <stringProp name="Argument.name">website_ids[0]</stringProp>
-             </elementProp>
--            <elementProp name="custom_apply_to_products" elementType="HTTPArgument">
-+            <elementProp name="customer_group_ids[0]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-               <stringProp name="Argument.value">0</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">custom_apply_to_products</stringProp>
-+              <stringProp name="Argument.name">customer_group_ids[0]</stringProp>
-             </elementProp>
--            <elementProp name="name" elementType="HTTPArgument">
-+            <elementProp name="from_date" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">Admin Category Management ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">name</stringProp>
-+              <stringProp name="Argument.name">from_date</stringProp>
-             </elementProp>
--            <elementProp name="url_key" elementType="HTTPArgument">
-+            <elementProp name="to_date" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">admin-category-management-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">url_key</stringProp>
-+              <stringProp name="Argument.name">to_date</stringProp>
-             </elementProp>
--            <elementProp name="meta_title" elementType="HTTPArgument">
-+            <elementProp name="rule[conditions][1][type]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.value">Magento\SalesRule\Model\Rule\Condition\Combine</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">meta_title</stringProp>
-+              <stringProp name="Argument.name">rule[conditions][1][type]</stringProp>
-             </elementProp>
--            <elementProp name="description" elementType="HTTPArgument">
-+            <elementProp name="rule[conditions][1][aggregator]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">all</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1][aggregator]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1][value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1][value]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1--1][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Magento\SalesRule\Model\Rule\Condition\Address</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1--1][type]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1--1][attribute]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">base_subtotal</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1--1][attribute]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1--1][operator]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&gt;=</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1--1][operator]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1--1][value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1--1][value]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1][new_chlid]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-               <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">description</stringProp>
-+              <stringProp name="Argument.name">rule[conditions][1][new_chlid]</stringProp>
-             </elementProp>
--            <elementProp name="display_mode" elementType="HTTPArgument">
-+            <elementProp name="rule[actions][1][type]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">PRODUCTS</stringProp>
-+              <stringProp name="Argument.value">Magento\SalesRule\Model\Rule\Condition\Product\Combine</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">display_mode</stringProp>
-+              <stringProp name="Argument.name">rule[actions][1][type]</stringProp>
-             </elementProp>
--            <elementProp name="default_sort_by" elementType="HTTPArgument">
-+            <elementProp name="rule[actions][1][aggregator]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">position</stringProp>
-+              <stringProp name="Argument.value">all</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">default_sort_by</stringProp>
-+              <stringProp name="Argument.name">rule[actions][1][aggregator]</stringProp>
-             </elementProp>
--            <elementProp name="meta_keywords" elementType="HTTPArgument">
-+            <elementProp name="rule[actions][1][value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[actions][1][value]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[actions][1][new_child]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-               <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">meta_keywords</stringProp>
-+              <stringProp name="Argument.name">rule[actions][1][new_child]</stringProp>
-             </elementProp>
--            <elementProp name="meta_description" elementType="HTTPArgument">
-+            <elementProp name="store_labels[1]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-               <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">meta_description</stringProp>
-+              <stringProp name="Argument.name">store_labels[1]</stringProp>
-             </elementProp>
--            <elementProp name="custom_layout_update" elementType="HTTPArgument">
-+            <elementProp name="store_labels[2]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-               <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">custom_layout_update</stringProp>
-+              <stringProp name="Argument.name">store_labels[2]</stringProp>
-             </elementProp>
--            <elementProp name="category_products" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">false</boolProp>
--              <stringProp name="Argument.value">{"${simple_product_1_id}":"","${simple_product_2_id}":"","${simple_product_3_id}":"","${simple_product_4_id}":"","${simple_product_5_id}":""}</stringProp>
-+            <elementProp name="related_banners" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">category_products</stringProp>
-+              <stringProp name="Argument.name">related_banners</stringProp>
-             </elementProp>
-             <elementProp name="form_key" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-@@ -31713,7 +30467,7 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
-         <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-         <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/save/</stringProp>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/save/</stringProp>
-         <stringProp name="HTTPSampler.method">POST</stringProp>
-         <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-         <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-@@ -31723,458 +30477,92 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
-         <stringProp name="HTTPSampler.embedded_url_re"/>
-       </HTTPSamplerProxy>
-       <hashTree>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category id" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">URL</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_category_id</stringProp>
--          <stringProp name="RegexExtractor.regex">/catalog/category/edit/id/(\d+)/</stringProp>
--          <stringProp name="RegexExtractor.template">$1$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category id" enabled="true">
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-           <collectionProp name="Asserion.test_strings">
--            <stringProp name="89649215">^\d+$</stringProp>
-+            <stringProp name="-396438583">You saved the rule.</stringProp>
-           </collectionProp>
-           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-           <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">1</intProp>
--          <stringProp name="Assertion.scope">variable</stringProp>
--          <stringProp name="Scope.variable">admin_category_id</stringProp>
-+          <intProp name="Assertion.test_type">16</intProp>
-         </ResponseAssertion>
-         <hashTree/>
-       </hashTree>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Select created category" enabled="true">
--        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--          <collectionProp name="Arguments.arguments"/>
--        </elementProp>
--        <stringProp name="HTTPSampler.domain"/>
--        <stringProp name="HTTPSampler.port"/>
--        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--        <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/edit/id/${admin_category_id}/</stringProp>
--        <stringProp name="HTTPSampler.method">GET</stringProp>
--        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--        <boolProp name="HTTPSampler.monitor">false</boolProp>
--        <stringProp name="HTTPSampler.embedded_url_re"/>
--      </HTTPSamplerProxy>
--      <hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="Accept-Language" elementType="Header">
--              <stringProp name="Header.name">Accept-Language</stringProp>
--              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
--            </elementProp>
--            <elementProp name="Accept" elementType="Header">
--              <stringProp name="Header.name">Accept</stringProp>
--              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
--            </elementProp>
--            <elementProp name="User-Agent" elementType="Header">
--              <stringProp name="Header.name">User-Agent</stringProp>
--              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
--            </elementProp>
--            <elementProp name="Accept-Encoding" elementType="Header">
--              <stringProp name="Header.name">Accept-Encoding</stringProp>
--              <stringProp name="Header.value">gzip, deflate</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category row id" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_category_entity_id</stringProp>
--          <stringProp name="RegexExtractor.regex">"entity_id":"([^"]+)"</stringProp>
--          <stringProp name="RegexExtractor.template">$1$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category attribute set id" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_category_attribute_set_id</stringProp>
--          <stringProp name="RegexExtractor.regex">"attribute_set_id":"([^"]+)"</stringProp>
--          <stringProp name="RegexExtractor.template">$1$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
-+      <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Pause" enabled="true">
-+        <intProp name="ActionProcessor.action">1</intProp>
-+        <intProp name="ActionProcessor.target">0</intProp>
-+        <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${adminPromotionsManagementDelay}*1000))}</stringProp>
-+      </TestAction>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Customer Management" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${adminCustomerManagementPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-         <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category parent Id" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_category_parent_id</stringProp>
--          <stringProp name="RegexExtractor.regex">"parent_id":"([^"]+)"</stringProp>
--          <stringProp name="RegexExtractor.template">$1$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category created at" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_category_created_at</stringProp>
--          <stringProp name="RegexExtractor.regex">"created_at":"([^"]+)"</stringProp>
--          <stringProp name="RegexExtractor.template">$1$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category updated at" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_category_updated_at</stringProp>
--          <stringProp name="RegexExtractor.regex">"updated_at":"([^"]+)"</stringProp>
--          <stringProp name="RegexExtractor.template">$1$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category path" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_category_path</stringProp>
--          <stringProp name="RegexExtractor.regex">"entity_id":(.+)"path":"([^\"]+)"</stringProp>
--          <stringProp name="RegexExtractor.template">$2$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category level" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_category_level</stringProp>
--          <stringProp name="RegexExtractor.regex">"level":"([^"]+)"</stringProp>
--          <stringProp name="RegexExtractor.template">$1$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category name" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_category_name</stringProp>
--          <stringProp name="RegexExtractor.regex">"entity_id":(.+)"name":"([^"]+)"</stringProp>
--          <stringProp name="RegexExtractor.template">$2$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category url key" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_category_url_key</stringProp>
--          <stringProp name="RegexExtractor.regex">"url_key":"([^"]+)"</stringProp>
--          <stringProp name="RegexExtractor.template">$1$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category url path" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_category_url_path</stringProp>
--          <stringProp name="RegexExtractor.regex">"url_path":"([^"]+)"</stringProp>
--          <stringProp name="RegexExtractor.template">$1$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category row id" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="89649215">^\d+$</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">1</intProp>
--          <stringProp name="Assertion.scope">variable</stringProp>
--          <stringProp name="Scope.variable">admin_category_entity_id</stringProp>
--        </ResponseAssertion>
--        <hashTree/>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category attribute set id" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="89649215">^\d+$</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">1</intProp>
--          <stringProp name="Assertion.scope">variable</stringProp>
--          <stringProp name="Scope.variable">admin_category_attribute_set_id</stringProp>
--        </ResponseAssertion>
--        <hashTree/>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category parent id" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="89649215">^\d+$</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">1</intProp>
--          <stringProp name="Assertion.scope">variable</stringProp>
--          <stringProp name="Scope.variable">admin_category_parent_id</stringProp>
--        </ResponseAssertion>
--        <hashTree/>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category created at" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="2845929">^.+$</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">1</intProp>
--          <stringProp name="Assertion.scope">variable</stringProp>
--          <stringProp name="Scope.variable">admin_category_created_at</stringProp>
--        </ResponseAssertion>
--        <hashTree/>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category updated at" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="2845929">^.+$</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">1</intProp>
--          <stringProp name="Assertion.scope">variable</stringProp>
--          <stringProp name="Scope.variable">admin_category_updated_at</stringProp>
--        </ResponseAssertion>
--        <hashTree/>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category path" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="59022110">^[\d\\\/]+$</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">1</intProp>
--          <stringProp name="Assertion.scope">variable</stringProp>
--          <stringProp name="Scope.variable">admin_category_path</stringProp>
--        </ResponseAssertion>
--        <hashTree/>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category level" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="89649215">^\d+$</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">1</intProp>
--          <stringProp name="Assertion.scope">variable</stringProp>
--          <stringProp name="Scope.variable">admin_category_level</stringProp>
--        </ResponseAssertion>
--        <hashTree/>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category name" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="2845929">^.+$</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">1</intProp>
--          <stringProp name="Assertion.scope">variable</stringProp>
--          <stringProp name="Scope.variable">admin_category_name</stringProp>
--        </ResponseAssertion>
--        <hashTree/>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category url key" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="2845929">^.+$</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">1</intProp>
--          <stringProp name="Assertion.scope">variable</stringProp>
--          <stringProp name="Scope.variable">admin_category_url_key</stringProp>
--        </ResponseAssertion>
--        <hashTree/>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category url path" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="2845929">^.+$</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">1</intProp>
--          <stringProp name="Assertion.scope">variable</stringProp>
--          <stringProp name="Scope.variable">admin_category_url_path</stringProp>
--        </ResponseAssertion>
--        <hashTree/>
--          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert products added" enabled="true">
--            <collectionProp name="Asserion.test_strings">
--              <stringProp name="417284990">${simple_product_1_name}</stringProp>
--              <stringProp name="1304788671">${simple_product_2_name}</stringProp>
--              <stringProp name="-2102674944">${simple_product_3_name}</stringProp>
--              <stringProp name="-1215171263">${simple_product_4_name}</stringProp>
--              <stringProp name="-327667582">${simple_product_5_name}</stringProp>
--            </collectionProp>
--            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--            <boolProp name="Assertion.assume_success">false</boolProp>
--            <intProp name="Assertion.test_type">2</intProp>
--          </ResponseAssertion>
--          <hashTree/>
--      </hashTree>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Move category" enabled="true">
--        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--          <collectionProp name="Arguments.arguments">
--            <elementProp name="id" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">${admin_category_id}</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">id</stringProp>
--            </elementProp>
--            <elementProp name="form_key" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">${admin_form_key}</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">form_key</stringProp>
--            </elementProp>
--            <elementProp name="point" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">append</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">point</stringProp>
--            </elementProp>
--            <elementProp name="pid" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">${new_parent_category_id}</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">pid</stringProp>
--            </elementProp>
--            <elementProp name="paid" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">${parent_category_id}</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">paid</stringProp>
--            </elementProp>
--            <elementProp name="aid" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">0</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">aid</stringProp>
--            </elementProp>
--            <elementProp name="isAjax" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">true</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">isAjax</stringProp>
--            </elementProp>
--          </collectionProp>
--        </elementProp>
--        <stringProp name="HTTPSampler.domain"/>
--        <stringProp name="HTTPSampler.port"/>
--        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--        <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/move/</stringProp>
--        <stringProp name="HTTPSampler.method">POST</stringProp>
--        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--        <boolProp name="HTTPSampler.monitor">false</boolProp>
--        <stringProp name="HTTPSampler.embedded_url_re"/>
--      </HTTPSamplerProxy>
--      <hashTree/>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete category" enabled="true">
--        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--          <collectionProp name="Arguments.arguments"/>
--        </elementProp>
--        <stringProp name="HTTPSampler.domain"/>
--        <stringProp name="HTTPSampler.port"/>
--        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--        <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/delete/id/${admin_category_id}/</stringProp>
--        <stringProp name="HTTPSampler.method">GET</stringProp>
--        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--        <boolProp name="HTTPSampler.monitor">false</boolProp>
--        <stringProp name="HTTPSampler.embedded_url_re"/>
--      </HTTPSamplerProxy>
--      <hashTree>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category deleted" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="1277069529">You deleted the category.</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">2</intProp>
--        </ResponseAssertion>
--        <hashTree/>
--      </hashTree>
--      <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Pause" enabled="true">
--        <intProp name="ActionProcessor.action">1</intProp>
--        <intProp name="ActionProcessor.target">0</intProp>
--        <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${adminCategoryManagementDelay}*1000))}</stringProp>
--      </TestAction>
--      <hashTree/>
--    </hashTree>
--  </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments"/>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--    
--    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
--        <boolProp name="resetInterpreter">false</boolProp>
--        <stringProp name="parameters"/>
--        <stringProp name="filename"/>
--        <stringProp name="script">
--        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
--        if (adminUsersDistribution == 1) {
--            adminUserList = props.get("adminUserList");
--            adminUserList.add(vars.get("admin_user"));
--        }
--        </stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
--    <hashTree/>
--  </hashTree>
--  </hashTree>
--
--  
--    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Promotion Rules" enabled="true">
--      <intProp name="ThroughputController.style">1</intProp>
--      <boolProp name="ThroughputController.perThread">false</boolProp>
--      <intProp name="ThroughputController.maxThroughput">1</intProp>
--      <stringProp name="ThroughputController.percentThroughput">${adminPromotionRulesPercentage}</stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
--    <hashTree>
--        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
--            <stringProp name="script">
--var testLabel = "${testLabel}" ? " (${testLabel})" : "";
--if (testLabel
--    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
--) {
--    if (sampler.getName().indexOf(testLabel) == -1) {
--       sampler.setName(sampler.getName() + testLabel);
--    }
--} else if (sampler.getName().indexOf("SetUp - ") == -1) {
--    sampler.setName("SetUp - " + sampler.getName());
--}
--            </stringProp>
--            <stringProp name="scriptLanguage">javascript</stringProp>
--        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
--        <hashTree/>
--        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
--            <stringProp name="BeanShellSampler.query">
--                vars.put("testLabel", "Admin Promotion Rules");
--            </stringProp>
--            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
--        </BeanShellSampler>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "Admin Customer Management");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-         <hashTree/>
-     
-         <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-@@ -32392,8 +30780,8 @@ vars.put("admin_user", adminUser);
-   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
- </GenericController>
-     <hashTree>
--    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Promotions Management" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_promotions_management/admin_promotions_management.jmx</stringProp>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Customer Management" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_customer_management/admin_customer_management.jmx</stringProp>
- </TestFragmentController>
-     <hashTree>
-       <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Landing Page" enabled="true">
-@@ -32406,27 +30794,7 @@ vars.put("admin_user", adminUser);
-         <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-         <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/</stringProp>
--        <stringProp name="HTTPSampler.method">GET</stringProp>
--        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--        <boolProp name="HTTPSampler.monitor">false</boolProp>
--        <stringProp name="HTTPSampler.embedded_url_re"/>
--      </HTTPSamplerProxy>
--      <hashTree/>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create New" enabled="true">
--        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--          <collectionProp name="Arguments.arguments"/>
--        </elementProp>
--        <stringProp name="HTTPSampler.domain"/>
--        <stringProp name="HTTPSampler.port"/>
--        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--        <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/new</stringProp>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index</stringProp>
-         <stringProp name="HTTPSampler.method">GET</stringProp>
-         <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-         <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-@@ -32435,38 +30803,87 @@ vars.put("admin_user", adminUser);
-         <boolProp name="HTTPSampler.monitor">false</boolProp>
-         <stringProp name="HTTPSampler.embedded_url_re"/>
-       </HTTPSamplerProxy>
--      <hashTree/>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create New Conditional" enabled="true">
-+      <hashTree>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="Accept-Language" elementType="Header">
-+              <stringProp name="Header.name">Accept-Language</stringProp>
-+              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept" elementType="Header">
-+              <stringProp name="Header.name">Accept</stringProp>
-+              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
-+            </elementProp>
-+            <elementProp name="User-Agent" elementType="Header">
-+              <stringProp name="Header.name">User-Agent</stringProp>
-+              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept-Encoding" elementType="Header">
-+              <stringProp name="Header.name">Accept-Encoding</stringProp>
-+              <stringProp name="Header.value">gzip, deflate</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Render" enabled="true">
-         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-           <collectionProp name="Arguments.arguments">
--            <elementProp name="isAjax" elementType="HTTPArgument">
-+            <elementProp name="namespace" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">customer_listing</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">namespace</stringProp>
-+            </elementProp>
-+            <elementProp name="search" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">search</stringProp>
-+            </elementProp>
-+            <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-               <stringProp name="Argument.value">true</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">isAjax</stringProp>
-+              <stringProp name="Argument.name">filters[placeholder]</stringProp>
-             </elementProp>
--            <elementProp name="form_key" elementType="HTTPArgument">
-+            <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.value">20</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">form_key</stringProp>
--              <stringProp name="Argument.desc">true</stringProp>
-+              <stringProp name="Argument.name">paging[pageSize]</stringProp>
-             </elementProp>
--            <elementProp name="id" elementType="HTTPArgument">
-+            <elementProp name="paging[current]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">1--1</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">id</stringProp>
-+              <stringProp name="Argument.name">paging[current]</stringProp>
-             </elementProp>
--            <elementProp name="type" elementType="HTTPArgument">
-+            <elementProp name="sorting[field]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">Magento\SalesRule\Model\Rule\Condition\Address|base_subtotal</stringProp>
-+              <stringProp name="Argument.value">entity_id</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">type</stringProp>
-+              <stringProp name="Argument.name">sorting[field]</stringProp>
-+            </elementProp>
-+            <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">asc</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            </elementProp>
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-             </elementProp>
-           </collectionProp>
-         </elementProp>
-@@ -32476,8 +30893,8 @@ vars.put("admin_user", adminUser);
-         <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-         <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/newConditionHtml/form/sales_rule_formrule_conditions_fieldset_/form_namespace/sales_rule_form</stringProp>
--        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-         <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-         <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-         <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-@@ -32485,275 +30902,75 @@ vars.put("admin_user", adminUser);
-         <boolProp name="HTTPSampler.monitor">false</boolProp>
-         <stringProp name="HTTPSampler.embedded_url_re"/>
-       </HTTPSamplerProxy>
--      <hashTree/>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save" enabled="true">
-+      <hashTree>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="" elementType="Header">
-+              <stringProp name="Header.name">X-Requested-With</stringProp>
-+              <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search Render" enabled="true">
-         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-           <collectionProp name="Arguments.arguments">
--            <elementProp name="name" elementType="HTTPArgument">
-+            <elementProp name="namespace" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">Rule Name ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.value">customer_listing</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">name</stringProp>
-+              <stringProp name="Argument.name">namespace</stringProp>
-             </elementProp>
--            <elementProp name="is_active" elementType="HTTPArgument">
-+            <elementProp name="search" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.value">Lastname</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">is_active</stringProp>
-+              <stringProp name="Argument.name">search</stringProp>
-             </elementProp>
--            <elementProp name="use_auto_generation" elementType="HTTPArgument">
-+            <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.value">true</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">use_auto_generation</stringProp>
-+              <stringProp name="Argument.name">filters[placeholder]</stringProp>
-             </elementProp>
--            <elementProp name="is_rss" elementType="HTTPArgument">
-+            <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.value">20</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">is_rss</stringProp>
-+              <stringProp name="Argument.name">paging[pageSize]</stringProp>
-             </elementProp>
--            <elementProp name="apply_to_shipping" elementType="HTTPArgument">
-+            <elementProp name="paging[current]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">apply_to_shipping</stringProp>
-+              <stringProp name="Argument.name">paging[current]</stringProp>
-             </elementProp>
--            <elementProp name="stop_rules_processing" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">0</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">stop_rules_processing</stringProp>
--            </elementProp>
--            <elementProp name="coupon_code" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">coupon_code</stringProp>
--            </elementProp>
--            <elementProp name="uses_per_coupon" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">uses_per_coupon</stringProp>
--            </elementProp>
--            <elementProp name="uses_per_customer" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">uses_per_customer</stringProp>
--            </elementProp>
--            <elementProp name="sort_order" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">sort_order</stringProp>
--            </elementProp>
--            <elementProp name="discount_amount" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">5</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">discount_amount</stringProp>
--            </elementProp>
--            <elementProp name="discount_qty" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">0</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">discount_qty</stringProp>
--            </elementProp>
--            <elementProp name="discount_step" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">discount_step</stringProp>
--            </elementProp>
--            <elementProp name="reward_points_delta" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">reward_points_delta</stringProp>
--            </elementProp>
--            <elementProp name="store_labels[0]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">store_labels[0]</stringProp>
--            </elementProp>
--            <elementProp name="description" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">Rule Description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">description</stringProp>
--            </elementProp>
--            <elementProp name="coupon_type" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">1</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">coupon_type</stringProp>
--            </elementProp>
--            <elementProp name="simple_action" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">cart_fixed</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">simple_action</stringProp>
--            </elementProp>
--            <elementProp name="website_ids[0]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">1</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">website_ids[0]</stringProp>
--            </elementProp>
--            <elementProp name="customer_group_ids[0]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">0</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">customer_group_ids[0]</stringProp>
--            </elementProp>
--            <elementProp name="from_date" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">from_date</stringProp>
--            </elementProp>
--            <elementProp name="to_date" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">to_date</stringProp>
--            </elementProp>
--            <elementProp name="rule[conditions][1][type]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">Magento\SalesRule\Model\Rule\Condition\Combine</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">rule[conditions][1][type]</stringProp>
--            </elementProp>
--            <elementProp name="rule[conditions][1][aggregator]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">all</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">rule[conditions][1][aggregator]</stringProp>
--            </elementProp>
--            <elementProp name="rule[conditions][1][value]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">1</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">rule[conditions][1][value]</stringProp>
--            </elementProp>
--            <elementProp name="rule[conditions][1--1][type]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">Magento\SalesRule\Model\Rule\Condition\Address</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">rule[conditions][1--1][type]</stringProp>
--            </elementProp>
--            <elementProp name="rule[conditions][1--1][attribute]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">base_subtotal</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">rule[conditions][1--1][attribute]</stringProp>
--            </elementProp>
--            <elementProp name="rule[conditions][1--1][operator]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">&gt;=</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">rule[conditions][1--1][operator]</stringProp>
--            </elementProp>
--            <elementProp name="rule[conditions][1--1][value]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">100</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">rule[conditions][1--1][value]</stringProp>
--            </elementProp>
--            <elementProp name="rule[conditions][1][new_chlid]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">rule[conditions][1][new_chlid]</stringProp>
--            </elementProp>
--            <elementProp name="rule[actions][1][type]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">Magento\SalesRule\Model\Rule\Condition\Product\Combine</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">rule[actions][1][type]</stringProp>
--            </elementProp>
--            <elementProp name="rule[actions][1][aggregator]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">all</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">rule[actions][1][aggregator]</stringProp>
--            </elementProp>
--            <elementProp name="rule[actions][1][value]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">1</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">rule[actions][1][value]</stringProp>
--            </elementProp>
--            <elementProp name="rule[actions][1][new_child]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">rule[actions][1][new_child]</stringProp>
--            </elementProp>
--            <elementProp name="store_labels[1]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">store_labels[1]</stringProp>
--            </elementProp>
--            <elementProp name="store_labels[2]" elementType="HTTPArgument">
-+            <elementProp name="sorting[field]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.value">entity_id</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">store_labels[2]</stringProp>
-+              <stringProp name="Argument.name">sorting[field]</stringProp>
-             </elementProp>
--            <elementProp name="related_banners" elementType="HTTPArgument">
-+            <elementProp name="sorting[direction]" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.value">asc</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">related_banners</stringProp>
-+              <stringProp name="Argument.name">sorting[direction]</stringProp>
-             </elementProp>
--            <elementProp name="form_key" elementType="HTTPArgument">
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-               <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.value">true</stringProp>
-               <stringProp name="Argument.metadata">=</stringProp>
-               <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-             </elementProp>
-           </collectionProp>
-         </elementProp>
-@@ -32763,8 +30980,8 @@ vars.put("admin_user", adminUser);
-         <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-         <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/save/</stringProp>
--        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-         <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-         <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-         <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-@@ -32773,604 +30990,91 @@ vars.put("admin_user", adminUser);
-         <stringProp name="HTTPSampler.embedded_url_re"/>
-       </HTTPSamplerProxy>
-       <hashTree>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="" elementType="Header">
-+              <stringProp name="Header.name">X-Requested-With</stringProp>
-+              <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract customer edit url" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">customer_edit_url_path</stringProp>
-+          <stringProp name="RegexExtractor.regex">actions":\{"edit":\{"href":"(?:http|https):\\/\\/(.*?)\\/customer\\/index\\/edit\\/id\\/(\d+)\\/",</stringProp>
-+          <stringProp name="RegexExtractor.template">/customer/index/edit/id/$2$/</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer edit url" enabled="true">
-           <collectionProp name="Asserion.test_strings">
--            <stringProp name="-396438583">You saved the rule.</stringProp>
-+            <stringProp name="2845929">^.+$</stringProp>
-           </collectionProp>
-           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-           <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">16</intProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">customer_edit_url_path</stringProp>
-         </ResponseAssertion>
-         <hashTree/>
-       </hashTree>
--      <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Pause" enabled="true">
--        <intProp name="ActionProcessor.action">1</intProp>
--        <intProp name="ActionProcessor.target">0</intProp>
--        <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${adminPromotionsManagementDelay}*1000))}</stringProp>
--      </TestAction>
--      <hashTree/>
--    </hashTree>
--  </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments"/>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--    
--    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
--        <boolProp name="resetInterpreter">false</boolProp>
--        <stringProp name="parameters"/>
--        <stringProp name="filename"/>
--        <stringProp name="script">
--        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
--        if (adminUsersDistribution == 1) {
--            adminUserList = props.get("adminUserList");
--            adminUserList.add(vars.get("admin_user"));
--        }
--        </stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
--    <hashTree/>
--  </hashTree>
--  </hashTree>
--
--  
--    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Customer Management" enabled="true">
--      <intProp name="ThroughputController.style">1</intProp>
--      <boolProp name="ThroughputController.perThread">false</boolProp>
--      <intProp name="ThroughputController.maxThroughput">1</intProp>
--      <stringProp name="ThroughputController.percentThroughput">${adminCustomerManagementPercentage}</stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
--    <hashTree>
--        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
--            <stringProp name="script">
--var testLabel = "${testLabel}" ? " (${testLabel})" : "";
--if (testLabel
--    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
--) {
--    if (sampler.getName().indexOf(testLabel) == -1) {
--       sampler.setName(sampler.getName() + testLabel);
--    }
--} else if (sampler.getName().indexOf("SetUp - ") == -1) {
--    sampler.setName("SetUp - " + sampler.getName());
--}
--            </stringProp>
--            <stringProp name="scriptLanguage">javascript</stringProp>
--        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Edit Customer" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}${customer_edit_url_path}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert edit customer page" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-1422614550">Customer Information</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-         <hashTree/>
--        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
--            <stringProp name="BeanShellSampler.query">
--                vars.put("testLabel", "Admin Customer Management");
--            </stringProp>
--            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
--        </BeanShellSampler>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract customer entity_id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_entity_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">"entity_id":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-         <hashTree/>
--    
--        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
--        <stringProp name="script">
--        function getFormKeyFromResponse()
--        {
--            var url = prev.getUrlAsString(),
--            responseCode =  prev.getResponseCode(),
--            formKey = null;
--            searchPattern = /var FORM_KEY = '(.+)'/;
--            if (responseCode == "200" &amp;&amp; url) {
--                response = prev.getResponseDataAsString();
--                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
--            }
--            return formKey;
--        }
--
--        formKey = vars.get("form_key_storage");
--
--	   currentFormKey = getFormKeyFromResponse();
--
--	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
--		  vars.put("form_key_storage", currentFormKey);
--	   }
--        </stringProp>
--        <stringProp name="scriptLanguage">javascript</stringProp>
--        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract website_id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_website_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">"website_id":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-         <hashTree/>
--        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
--            <stringProp name="script">
--                formKey =  vars.get("form_key_storage");
--                if (formKey
--                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
--                    &amp;&amp; sampler.getMethod() == "POST")
--                    {
--                        arguments = sampler.getArguments();
--                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
--                        {
--                            argument = arguments.getArgument(i);
--                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
--                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
--                            argument.setValue(formKey);
--                        }
--                    }
--                }
--            </stringProp>
--            <stringProp name="scriptLanguage">javascript</stringProp>
--        </JSR223PreProcessor>
--        <hashTree/>
--    
--    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
--      <collectionProp name="CookieManager.cookies"/>
--      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
--    <hashTree/>
--  
--    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
--</GenericController>
--    <hashTree>
--    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
--        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
--    <hashTree>
--    
--    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
--      <stringProp name="BeanShellSampler.query">
--adminUserList = props.get("adminUserList");
--adminUserListIterator = props.get("adminUserListIterator");
--adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
--
--if (adminUsersDistribution == 1) {
--    adminUser = adminUserList.poll();
--} else {
--    if (!adminUserListIterator.hasNext()) {
--        adminUserListIterator = adminUserList.descendingIterator();
--    }
--
--    adminUser = adminUserListIterator.next();
--}
--
--if (adminUser == null) {
--  SampleResult.setResponseMessage("adminUser list is empty");
--  SampleResult.setResponseData("adminUser list is empty","UTF-8");
--  IsSuccess=false;
--  SampleResult.setSuccessful(false);
--  SampleResult.setStopThread(true);
--}
--vars.put("admin_user", adminUser);
--      </stringProp>
--      <stringProp name="BeanShellSampler.filename"/>
--      <stringProp name="BeanShellSampler.parameters"/>
--      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
--    </BeanShellSampler>
--    <hashTree/>
--  </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments"/>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
--      <stringProp name="HTTPSampler.method">GET</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
--    <hashTree>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="-1397214398">Welcome</stringProp>
--          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">2</intProp>
--      </ResponseAssertion>
--      <hashTree/>
--      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
--        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
--        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
--        <stringProp name="RegexExtractor.template">$1$</stringProp>
--        <stringProp name="RegexExtractor.default"/>
--        <stringProp name="RegexExtractor.match_number">1</stringProp>
--      </RegexExtractor>
--      <hashTree/>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
--        <collectionProp name="Asserion.test_strings">
--          <stringProp name="2845929">^.+$</stringProp>
--        </collectionProp>
--        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--        <boolProp name="Assertion.assume_success">false</boolProp>
--        <intProp name="Assertion.test_type">1</intProp>
--        <stringProp name="Assertion.scope">variable</stringProp>
--        <stringProp name="Scope.variable">admin_form_key</stringProp>
--      </ResponseAssertion>
--      <hashTree/>
--    </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="dummy" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value"/>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">dummy</stringProp>
--          </elementProp>
--          <elementProp name="form_key" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_form_key}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">form_key</stringProp>
--          </elementProp>
--          <elementProp name="login[password]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_password}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">login[password]</stringProp>
--          </elementProp>
--          <elementProp name="login[username]" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">true</boolProp>
--            <stringProp name="Argument.value">${admin_user}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--            <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">login[username]</stringProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <stringProp name="HTTPSampler.implementation">Java</stringProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
--    </HTTPSamplerProxy>
--    <hashTree>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
--            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
--            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
--            <stringProp name="RegexExtractor.template">$1$</stringProp>
--            <stringProp name="RegexExtractor.default"/>
--            <stringProp name="RegexExtractor.match_number">1</stringProp>
--        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
--        <hashTree/>
--    </hashTree>
--  </hashTree>
--  
--    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
--</GenericController>
--    <hashTree>
--    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Customer Management" enabled="true">
--  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_customer_management/admin_customer_management.jmx</stringProp>
--</TestFragmentController>
--    <hashTree>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Landing Page" enabled="true">
--        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--          <collectionProp name="Arguments.arguments"/>
--        </elementProp>
--        <stringProp name="HTTPSampler.domain"/>
--        <stringProp name="HTTPSampler.port"/>
--        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--        <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index</stringProp>
--        <stringProp name="HTTPSampler.method">GET</stringProp>
--        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--        <boolProp name="HTTPSampler.monitor">false</boolProp>
--        <stringProp name="HTTPSampler.embedded_url_re"/>
--      </HTTPSamplerProxy>
--      <hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="Accept-Language" elementType="Header">
--              <stringProp name="Header.name">Accept-Language</stringProp>
--              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
--            </elementProp>
--            <elementProp name="Accept" elementType="Header">
--              <stringProp name="Header.name">Accept</stringProp>
--              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
--            </elementProp>
--            <elementProp name="User-Agent" elementType="Header">
--              <stringProp name="Header.name">User-Agent</stringProp>
--              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
--            </elementProp>
--            <elementProp name="Accept-Encoding" elementType="Header">
--              <stringProp name="Header.name">Accept-Encoding</stringProp>
--              <stringProp name="Header.value">gzip, deflate</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--      </hashTree>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Render" enabled="true">
--        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--          <collectionProp name="Arguments.arguments">
--            <elementProp name="namespace" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">customer_listing</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">namespace</stringProp>
--            </elementProp>
--            <elementProp name="search" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value"/>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">search</stringProp>
--            </elementProp>
--            <elementProp name="filters[placeholder]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">true</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">filters[placeholder]</stringProp>
--            </elementProp>
--            <elementProp name="paging[pageSize]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">20</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">paging[pageSize]</stringProp>
--            </elementProp>
--            <elementProp name="paging[current]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">1</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">paging[current]</stringProp>
--            </elementProp>
--            <elementProp name="sorting[field]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">entity_id</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">sorting[field]</stringProp>
--            </elementProp>
--            <elementProp name="sorting[direction]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">asc</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">sorting[direction]</stringProp>
--            </elementProp>
--            <elementProp name="isAjax" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">true</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">isAjax</stringProp>
--            </elementProp>
--          </collectionProp>
--        </elementProp>
--        <stringProp name="HTTPSampler.domain"/>
--        <stringProp name="HTTPSampler.port"/>
--        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--        <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
--        <stringProp name="HTTPSampler.method">GET</stringProp>
--        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--        <boolProp name="HTTPSampler.monitor">false</boolProp>
--        <stringProp name="HTTPSampler.embedded_url_re"/>
--      </HTTPSamplerProxy>
--      <hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">X-Requested-With</stringProp>
--              <stringProp name="Header.value">XMLHttpRequest</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--      </hashTree>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search Render" enabled="true">
--        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--          <collectionProp name="Arguments.arguments">
--            <elementProp name="namespace" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">customer_listing</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">namespace</stringProp>
--            </elementProp>
--            <elementProp name="search" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">Lastname</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">search</stringProp>
--            </elementProp>
--            <elementProp name="filters[placeholder]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">true</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">filters[placeholder]</stringProp>
--            </elementProp>
--            <elementProp name="paging[pageSize]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">20</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">paging[pageSize]</stringProp>
--            </elementProp>
--            <elementProp name="paging[current]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">1</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">paging[current]</stringProp>
--            </elementProp>
--            <elementProp name="sorting[field]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">entity_id</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">sorting[field]</stringProp>
--            </elementProp>
--            <elementProp name="sorting[direction]" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">asc</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">sorting[direction]</stringProp>
--            </elementProp>
--            <elementProp name="isAjax" elementType="HTTPArgument">
--              <boolProp name="HTTPArgument.always_encode">true</boolProp>
--              <stringProp name="Argument.value">true</stringProp>
--              <stringProp name="Argument.metadata">=</stringProp>
--              <boolProp name="HTTPArgument.use_equals">true</boolProp>
--              <stringProp name="Argument.name">isAjax</stringProp>
--            </elementProp>
--          </collectionProp>
--        </elementProp>
--        <stringProp name="HTTPSampler.domain"/>
--        <stringProp name="HTTPSampler.port"/>
--        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--        <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
--        <stringProp name="HTTPSampler.method">GET</stringProp>
--        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--        <boolProp name="HTTPSampler.monitor">false</boolProp>
--        <stringProp name="HTTPSampler.embedded_url_re"/>
--      </HTTPSamplerProxy>
--      <hashTree>
--        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--          <collectionProp name="HeaderManager.headers">
--            <elementProp name="" elementType="Header">
--              <stringProp name="Header.name">X-Requested-With</stringProp>
--              <stringProp name="Header.value">XMLHttpRequest</stringProp>
--            </elementProp>
--          </collectionProp>
--        </HeaderManager>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract customer edit url" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">customer_edit_url_path</stringProp>
--          <stringProp name="RegexExtractor.regex">actions":\{"edit":\{"href":"(?:http|https):\\/\\/(.*?)\\/customer\\/index\\/edit\\/id\\/(\d+)\\/",</stringProp>
--          <stringProp name="RegexExtractor.template">/customer/index/edit/id/$2$/</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer edit url" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="2845929">^.+$</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">1</intProp>
--          <stringProp name="Assertion.scope">variable</stringProp>
--          <stringProp name="Scope.variable">customer_edit_url_path</stringProp>
--        </ResponseAssertion>
--        <hashTree/>
--      </hashTree>
--      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Edit Customer" enabled="true">
--        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--          <collectionProp name="Arguments.arguments"/>
--        </elementProp>
--        <stringProp name="HTTPSampler.domain"/>
--        <stringProp name="HTTPSampler.port"/>
--        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
--        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
--        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--        <stringProp name="HTTPSampler.contentEncoding"/>
--        <stringProp name="HTTPSampler.path">${base_path}${admin_path}${customer_edit_url_path}</stringProp>
--        <stringProp name="HTTPSampler.method">GET</stringProp>
--        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--        <boolProp name="HTTPSampler.monitor">false</boolProp>
--        <stringProp name="HTTPSampler.embedded_url_re"/>
--      </HTTPSamplerProxy>
--      <hashTree>
--        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert edit customer page" enabled="true">
--          <collectionProp name="Asserion.test_strings">
--            <stringProp name="-1422614550">Customer Information</stringProp>
--          </collectionProp>
--          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--          <boolProp name="Assertion.assume_success">false</boolProp>
--          <intProp name="Assertion.test_type">2</intProp>
--        </ResponseAssertion>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract customer entity_id" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_customer_entity_id</stringProp>
--          <stringProp name="RegexExtractor.regex">"entity_id":"(\d+)"</stringProp>
--          <stringProp name="RegexExtractor.template">$1$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract website_id" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_customer_website_id</stringProp>
--          <stringProp name="RegexExtractor.regex">"website_id":"(\d+)"</stringProp>
--          <stringProp name="RegexExtractor.template">$1$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
--        <hashTree/>
--        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract customer firstname" enabled="true">
--          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
--          <stringProp name="RegexExtractor.refname">admin_customer_firstname</stringProp>
--          <stringProp name="RegexExtractor.regex">"firstname":"([^"]+)"</stringProp>
--          <stringProp name="RegexExtractor.template">$1$</stringProp>
--          <stringProp name="RegexExtractor.default"/>
--          <stringProp name="RegexExtractor.match_number">1</stringProp>
--        </RegexExtractor>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract customer firstname" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_firstname</stringProp>
-+          <stringProp name="RegexExtractor.regex">"firstname":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-         <hashTree/>
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract customer lastname" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-@@ -33501,7 +31205,7 @@ vars.put("admin_user", adminUser);
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_entity_id" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_entity_id</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{"entity_id":"(\d+)".+?"parent_id":"${admin_customer_entity_id}"</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{"entity_id":"(\d+)".+?"parent_id":"${admin_customer_entity_id}"</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -33510,7 +31214,7 @@ vars.put("admin_user", adminUser);
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_created_at" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_created_at</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"created_at":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"created_at":"([^"]+)"</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -33519,7 +31223,7 @@ vars.put("admin_user", adminUser);
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_updated_at" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_updated_at</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"updated_at":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"updated_at":"([^"]+)"</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -33528,7 +31232,7 @@ vars.put("admin_user", adminUser);
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_is_active" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_is_active</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"is_active":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"is_active":"(\d+)"</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -33537,7 +31241,7 @@ vars.put("admin_user", adminUser);
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_city" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_city</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"city":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"city":"([^"]+)"</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -33546,7 +31250,7 @@ vars.put("admin_user", adminUser);
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_country_id" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_country_id</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"country_id":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"country_id":"([^"]+)"</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -33555,7 +31259,7 @@ vars.put("admin_user", adminUser);
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_firstname" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_firstname</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"firstname":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"firstname":"([^"]+)"</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -33564,7 +31268,7 @@ vars.put("admin_user", adminUser);
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_lastname" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_lastname</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"lastname":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"lastname":"([^"]+)"</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -33573,7 +31277,7 @@ vars.put("admin_user", adminUser);
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_postcode" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_postcode</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"postcode":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"postcode":"([^"]+)"</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -33582,7 +31286,7 @@ vars.put("admin_user", adminUser);
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_region" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_region</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"region":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"region":"([^"]+)"</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -33591,7 +31295,7 @@ vars.put("admin_user", adminUser);
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_region_id" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_region_id</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"region_id":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"region_id":"([^"]+)"</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -33600,7 +31304,7 @@ vars.put("admin_user", adminUser);
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address street" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_street</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"street":\["([^"]+)"\]</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"street":\["([^"]+)"\]</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -33609,7 +31313,7 @@ vars.put("admin_user", adminUser);
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_telephone" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_telephone</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"telephone":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"telephone":"([^"]+)"</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -33618,7 +31322,7 @@ vars.put("admin_user", adminUser);
-         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_customer_id" enabled="true">
-           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-           <stringProp name="RegexExtractor.refname">admin_customer_address_customer_id</stringProp>
--          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"customer_id":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"customer_id":"([^"]+)"</stringProp>
-           <stringProp name="RegexExtractor.template">$1$</stringProp>
-           <stringProp name="RegexExtractor.default"/>
-           <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -36453,7 +34157,7 @@ vars.putObject("product_attributes", attributes);
-       <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
-         <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-         <stringProp name="RegexExtractor.refname">attribute_set_id</stringProp>
--        <stringProp name="RegexExtractor.regex">catalog\/product_set\/edit\/id\/([\d]+)\/"[\D\d]*Attribute Set 1</stringProp>
-+        <stringProp name="RegexExtractor.regex">catalog&amp;#x2F;product_set&amp;#x2F;edit&amp;#x2F;id&amp;#x2F;([\d]+)&amp;#x2F;"[\D\d]*Attribute Set 1</stringProp>
-         <stringProp name="RegexExtractor.template">$1$</stringProp>
-         <stringProp name="RegexExtractor.default"/>
-         <stringProp name="RegexExtractor.match_number">1</stringProp>
-@@ -40387,320 +38091,31315 @@ vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNu
-                     </elementProp>
-                 </collectionProp>
-             </elementProp>
--            <stringProp name="HTTPSampler.domain"/>
--            <stringProp name="HTTPSampler.port"/>
--            <stringProp name="HTTPSampler.connect_timeout"/>
--            <stringProp name="HTTPSampler.response_timeout"/>
--            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--            <stringProp name="HTTPSampler.contentEncoding"/>
--            <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
--            <stringProp name="HTTPSampler.method">POST</stringProp>
--            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--            <boolProp name="HTTPSampler.monitor">false</boolProp>
--            <stringProp name="HTTPSampler.embedded_url_re"/>
--            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_virtual_product_with_extensible_data_objects.jmx</stringProp>
--        </HTTPSamplerProxy>
--        <hashTree>
--            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product id" enabled="true">
--                <stringProp name="VAR">virtual_product_id</stringProp>
--                <stringProp name="JSONPATH">$.id</stringProp>
--                <stringProp name="DEFAULT"/>
--                <stringProp name="VARIABLE"/>
--                <stringProp name="SUBJECT">BODY</stringProp>
--            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--            <hashTree/>
--            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product sku" enabled="true">
--                <stringProp name="VAR">virtual_product_sku</stringProp>
--                <stringProp name="JSONPATH">$.sku</stringProp>
--                <stringProp name="DEFAULT"/>
--                <stringProp name="VARIABLE"/>
--                <stringProp name="SUBJECT">BODY</stringProp>
--            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--            <hashTree/>
--            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract stock item id" enabled="true">
--                <stringProp name="VAR">virtual_stock_item_id</stringProp>
--                <stringProp name="JSONPATH">$.extension_attributes.stock_item.item_id</stringProp>
--                <stringProp name="DEFAULT"/>
--                <stringProp name="VARIABLE"/>
--                <stringProp name="SUBJECT">BODY</stringProp>
--            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--            <hashTree/>
--            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
--                <collectionProp name="Asserion.test_strings">
--                    <stringProp name="89649215">^\d+$</stringProp>
--                </collectionProp>
--                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--                <boolProp name="Assertion.assume_success">false</boolProp>
--                <intProp name="Assertion.test_type">1</intProp>
--                <stringProp name="Assertion.scope">variable</stringProp>
--                <stringProp name="Scope.variable">virtual_product_id</stringProp>
--            </ResponseAssertion>
--            <hashTree/>
--            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
--                <collectionProp name="Asserion.test_strings">
--                    <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
--                </collectionProp>
--                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--                <boolProp name="Assertion.assume_success">false</boolProp>
--                <intProp name="Assertion.test_type">1</intProp>
--                <stringProp name="Assertion.scope">variable</stringProp>
--                <stringProp name="Scope.variable">virtual_product_sku</stringProp>
--            </ResponseAssertion>
--            <hashTree/>
--            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert stock item id not null" enabled="true">
--                <collectionProp name="Asserion.test_strings">
--                    <stringProp name="89649215">^\d+$</stringProp>
--                </collectionProp>
--                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--                <boolProp name="Assertion.assume_success">false</boolProp>
--                <intProp name="Assertion.test_type">1</intProp>
--                <stringProp name="Assertion.scope">variable</stringProp>
--                <stringProp name="Scope.variable">virtual_stock_item_id</stringProp>
--            </ResponseAssertion>
--            <hashTree/>
--        </hashTree>
--    
--        <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Create grouped product" enabled="true">
--            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_grouped_product_with_extensible_data_objects.jmx</stringProp>
--        </OnceOnlyController>
--        <hashTree>
--            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create grouped product with extensible data objects" enabled="true">
--                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--                    <collectionProp name="Arguments.arguments">
--                        <elementProp name="" elementType="HTTPArgument">
--                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                            <stringProp name="Argument.value">{&#xD;
--                                "product": {&#xD;
--                                "sku": "apsku-test-${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
--                                "name": "Extensible_Product_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
--                                "visibility": "4",&#xD;
--                                "type_id": "grouped",&#xD;
--                                "price": "3.62",&#xD;
--                                "status": "1",&#xD;
--                                "attribute_set_id": "4",&#xD;
--                                "custom_attributes": [&#xD;
--                                {&#xD;
--                                "attribute_code": "cost",&#xD;
--                                "value": ""&#xD;
--                                },&#xD;
--                                {&#xD;
--                                "attribute_code": "description",&#xD;
--                                "value": "Description"&#xD;
--                                }&#xD;
--                                ],&#xD;
--                                "extension_attributes":{&#xD;
--                                "stock_item":{&#xD;
--                                "manage_stock": 1,    &#xD;
--                                "is_in_stock": 1,&#xD;
--                                "qty":"100"&#xD;
--                                }&#xD;
--                                }        ,&#xD;
--                                "media_gallery_entries":&#xD;
--                                [{&#xD;
--                                "id": null,&#xD;
--                                "label":"test_label_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
--                                "position":1,&#xD;
--                                "disabled":false,&#xD;
--                                "media_type":"image",&#xD;
--                                "types":["image"],&#xD;
--                                "content":{&#xD;
--                                "base64_encoded_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
--                                "type": "image/jpeg",&#xD;
--                                "name": "test_image_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}.jpeg"&#xD;
--                                }&#xD;
--                                }&#xD;
--                                ]&#xD;
--                                }&#xD;
--                                }</stringProp>
--                            <stringProp name="Argument.metadata">=</stringProp>
--                        </elementProp>
--                    </collectionProp>
--                </elementProp>
--                <stringProp name="HTTPSampler.domain"/>
--                <stringProp name="HTTPSampler.port"/>
--                <stringProp name="HTTPSampler.connect_timeout"/>
--                <stringProp name="HTTPSampler.response_timeout"/>
--                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--                <stringProp name="HTTPSampler.contentEncoding"/>
--                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
--                <stringProp name="HTTPSampler.method">POST</stringProp>
--                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--                <boolProp name="HTTPSampler.monitor">false</boolProp>
--                <stringProp name="HTTPSampler.embedded_url_re"/>
--            </HTTPSamplerProxy>
--            <hashTree>
--                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract downloadable product id" enabled="true">
--                    <stringProp name="VAR">grouped_product_id</stringProp>
--                    <stringProp name="JSONPATH">$.id</stringProp>
--                    <stringProp name="DEFAULT"/>
--                    <stringProp name="VARIABLE"/>
--                    <stringProp name="SUBJECT">BODY</stringProp>
--                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--                <hashTree/>
--                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract downloadable product sku" enabled="true">
--                    <stringProp name="VAR">grouped_product_sku</stringProp>
--                    <stringProp name="JSONPATH">$.sku</stringProp>
--                    <stringProp name="DEFAULT"/>
--                    <stringProp name="VARIABLE"/>
--                    <stringProp name="SUBJECT">BODY</stringProp>
--                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--                <hashTree/>
--                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
--                    <collectionProp name="Asserion.test_strings">
--                        <stringProp name="89649215">^\d+$</stringProp>
--                    </collectionProp>
--                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--                    <boolProp name="Assertion.assume_success">false</boolProp>
--                    <intProp name="Assertion.test_type">1</intProp>
--                    <stringProp name="Assertion.scope">variable</stringProp>
--                    <stringProp name="Scope.variable">grouped_product_id</stringProp>
--                </ResponseAssertion>
--                <hashTree/>
--                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
--                    <collectionProp name="Asserion.test_strings">
--                        <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
--                    </collectionProp>
--                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--                    <boolProp name="Assertion.assume_success">false</boolProp>
--                    <intProp name="Assertion.test_type">1</intProp>
--                    <stringProp name="Assertion.scope">variable</stringProp>
--                    <stringProp name="Scope.variable">grouped_product_sku</stringProp>
--                </ResponseAssertion>
--                <hashTree/>
--            </hashTree>
--            <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Create Links" enabled="true"/>
--            <hashTree>
--                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create child bundle, configurable, simple, downloadable,  for grouped" enabled="true">
--                    <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--                    <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--                        <collectionProp name="Arguments.arguments">
--                            <elementProp name="" elementType="HTTPArgument">
--                                <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                                <stringProp name="Argument.value">{&#xD;
--                                    "items": [&#xD;
--                                    {&#xD;
--                                    "sku": "${grouped_product_sku}",&#xD;
--                                    "link_type": "associated",&#xD;
--                                    "linked_product_sku": "${bundle_product_sku}",&#xD;
--                                    "linked_product_type": "bundle",&#xD;
--                                    "position": 1,&#xD;
--                                    "extension_attributes": {&#xD;
--                                    "qty": 1&#xD;
--                                    }&#xD;
--                                    },&#xD;
--                                    {&#xD;
--                                    "sku": "${grouped_product_sku}",&#xD;
--                                    "link_type": "associated",&#xD;
--                                    "linked_product_sku": "${configurable_product_sku}",&#xD;
--                                    "linked_product_type": "configurable",&#xD;
--                                    "position": 2,&#xD;
--                                    "extension_attributes": {&#xD;
--                                    "qty": 1&#xD;
--                                    }&#xD;
--                                    },&#xD;
--                                    {&#xD;
--                                    "sku": "${grouped_product_sku}",&#xD;
--                                    "link_type": "associated",&#xD;
--                                    "linked_product_sku": "${simple_product_sku}",&#xD;
--                                    "linked_product_type": "simple",&#xD;
--                                    "position": 3,&#xD;
--                                    "extension_attributes": {&#xD;
--                                    "qty": 1&#xD;
--                                    }&#xD;
--                                    },&#xD;
--                                    {&#xD;
--                                    "sku": "${grouped_product_sku}",&#xD;
--                                    "link_type": "associated",&#xD;
--                                    "linked_product_sku": "${downloadable_product_sku}",&#xD;
--                                    "linked_product_type": "downloadable",&#xD;
--                                    "position": 4,&#xD;
--                                    "extension_attributes": {&#xD;
--                                    "qty": 1&#xD;
--                                    }&#xD;
--                                    }&#xD;
--                                    ]&#xD;
--                                    }&#xD;
--                                </stringProp>
--                                <stringProp name="Argument.metadata">=</stringProp>
--                            </elementProp>
--                        </collectionProp>
--                    </elementProp>
--                    <stringProp name="HTTPSampler.domain"/>
--                    <stringProp name="HTTPSampler.port"/>
--                    <stringProp name="HTTPSampler.connect_timeout"/>
--                    <stringProp name="HTTPSampler.response_timeout"/>
--                    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--                    <stringProp name="HTTPSampler.contentEncoding"/>
--                    <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${grouped_product_sku}/links</stringProp>
--                    <stringProp name="HTTPSampler.method">POST</stringProp>
--                    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--                    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--                    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--                    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--                    <boolProp name="HTTPSampler.monitor">false</boolProp>
--                    <stringProp name="HTTPSampler.embedded_url_re"/>
--                </HTTPSamplerProxy>
--                <hashTree>
--                    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product id" enabled="true">
--                        <stringProp name="VAR">grouped_product_response</stringProp>
--                        <stringProp name="JSONPATH">$</stringProp>
--                        <stringProp name="DEFAULT"/>
--                        <stringProp name="VARIABLE"/>
--                        <stringProp name="SUBJECT">BODY</stringProp>
--                    </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--                    <hashTree/>
--                    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert add true" enabled="true">
--                        <collectionProp name="Asserion.test_strings">
--                            <stringProp name="3569038">true</stringProp>
--                        </collectionProp>
--                        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--                        <boolProp name="Assertion.assume_success">false</boolProp>
--                        <intProp name="Assertion.test_type">8</intProp>
--                        <stringProp name="Assertion.scope">variable</stringProp>
--                        <stringProp name="Scope.variable">grouped_product_response</stringProp>
--                    </ResponseAssertion>
--                    <hashTree/>
--                </hashTree>
--            </hashTree>
--        </hashTree>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout"/>
-+            <stringProp name="HTTPSampler.response_timeout"/>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
-+            <stringProp name="HTTPSampler.method">POST</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_virtual_product_with_extensible_data_objects.jmx</stringProp>
-+        </HTTPSamplerProxy>
-+        <hashTree>
-+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product id" enabled="true">
-+                <stringProp name="VAR">virtual_product_id</stringProp>
-+                <stringProp name="JSONPATH">$.id</stringProp>
-+                <stringProp name="DEFAULT"/>
-+                <stringProp name="VARIABLE"/>
-+                <stringProp name="SUBJECT">BODY</stringProp>
-+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+            <hashTree/>
-+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product sku" enabled="true">
-+                <stringProp name="VAR">virtual_product_sku</stringProp>
-+                <stringProp name="JSONPATH">$.sku</stringProp>
-+                <stringProp name="DEFAULT"/>
-+                <stringProp name="VARIABLE"/>
-+                <stringProp name="SUBJECT">BODY</stringProp>
-+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+            <hashTree/>
-+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract stock item id" enabled="true">
-+                <stringProp name="VAR">virtual_stock_item_id</stringProp>
-+                <stringProp name="JSONPATH">$.extension_attributes.stock_item.item_id</stringProp>
-+                <stringProp name="DEFAULT"/>
-+                <stringProp name="VARIABLE"/>
-+                <stringProp name="SUBJECT">BODY</stringProp>
-+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+            <hashTree/>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="89649215">^\d+$</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">1</intProp>
-+                <stringProp name="Assertion.scope">variable</stringProp>
-+                <stringProp name="Scope.variable">virtual_product_id</stringProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">1</intProp>
-+                <stringProp name="Assertion.scope">variable</stringProp>
-+                <stringProp name="Scope.variable">virtual_product_sku</stringProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert stock item id not null" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="89649215">^\d+$</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">1</intProp>
-+                <stringProp name="Assertion.scope">variable</stringProp>
-+                <stringProp name="Scope.variable">virtual_stock_item_id</stringProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+        <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Create grouped product" enabled="true">
-+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_grouped_product_with_extensible_data_objects.jmx</stringProp>
-+        </OnceOnlyController>
-+        <hashTree>
-+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create grouped product with extensible data objects" enabled="true">
-+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+                    <collectionProp name="Arguments.arguments">
-+                        <elementProp name="" elementType="HTTPArgument">
-+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+                            <stringProp name="Argument.value">{&#xD;
-+                                "product": {&#xD;
-+                                "sku": "apsku-test-${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-+                                "name": "Extensible_Product_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-+                                "visibility": "4",&#xD;
-+                                "type_id": "grouped",&#xD;
-+                                "price": "3.62",&#xD;
-+                                "status": "1",&#xD;
-+                                "attribute_set_id": "4",&#xD;
-+                                "custom_attributes": [&#xD;
-+                                {&#xD;
-+                                "attribute_code": "cost",&#xD;
-+                                "value": ""&#xD;
-+                                },&#xD;
-+                                {&#xD;
-+                                "attribute_code": "description",&#xD;
-+                                "value": "Description"&#xD;
-+                                }&#xD;
-+                                ],&#xD;
-+                                "extension_attributes":{&#xD;
-+                                "stock_item":{&#xD;
-+                                "manage_stock": 1,    &#xD;
-+                                "is_in_stock": 1,&#xD;
-+                                "qty":"100"&#xD;
-+                                }&#xD;
-+                                }        ,&#xD;
-+                                "media_gallery_entries":&#xD;
-+                                [{&#xD;
-+                                "id": null,&#xD;
-+                                "label":"test_label_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-+                                "position":1,&#xD;
-+                                "disabled":false,&#xD;
-+                                "media_type":"image",&#xD;
-+                                "types":["image"],&#xD;
-+                                "content":{&#xD;
-+                                "base64_encoded_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
-+                                "type": "image/jpeg",&#xD;
-+                                "name": "test_image_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}.jpeg"&#xD;
-+                                }&#xD;
-+                                }&#xD;
-+                                ]&#xD;
-+                                }&#xD;
-+                                }</stringProp>
-+                            <stringProp name="Argument.metadata">=</stringProp>
-+                        </elementProp>
-+                    </collectionProp>
-+                </elementProp>
-+                <stringProp name="HTTPSampler.domain"/>
-+                <stringProp name="HTTPSampler.port"/>
-+                <stringProp name="HTTPSampler.connect_timeout"/>
-+                <stringProp name="HTTPSampler.response_timeout"/>
-+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+                <stringProp name="HTTPSampler.contentEncoding"/>
-+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
-+                <stringProp name="HTTPSampler.method">POST</stringProp>
-+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+                <boolProp name="HTTPSampler.monitor">false</boolProp>
-+                <stringProp name="HTTPSampler.embedded_url_re"/>
-+            </HTTPSamplerProxy>
-+            <hashTree>
-+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract downloadable product id" enabled="true">
-+                    <stringProp name="VAR">grouped_product_id</stringProp>
-+                    <stringProp name="JSONPATH">$.id</stringProp>
-+                    <stringProp name="DEFAULT"/>
-+                    <stringProp name="VARIABLE"/>
-+                    <stringProp name="SUBJECT">BODY</stringProp>
-+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+                <hashTree/>
-+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract downloadable product sku" enabled="true">
-+                    <stringProp name="VAR">grouped_product_sku</stringProp>
-+                    <stringProp name="JSONPATH">$.sku</stringProp>
-+                    <stringProp name="DEFAULT"/>
-+                    <stringProp name="VARIABLE"/>
-+                    <stringProp name="SUBJECT">BODY</stringProp>
-+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+                <hashTree/>
-+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
-+                    <collectionProp name="Asserion.test_strings">
-+                        <stringProp name="89649215">^\d+$</stringProp>
-+                    </collectionProp>
-+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                    <boolProp name="Assertion.assume_success">false</boolProp>
-+                    <intProp name="Assertion.test_type">1</intProp>
-+                    <stringProp name="Assertion.scope">variable</stringProp>
-+                    <stringProp name="Scope.variable">grouped_product_id</stringProp>
-+                </ResponseAssertion>
-+                <hashTree/>
-+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
-+                    <collectionProp name="Asserion.test_strings">
-+                        <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-+                    </collectionProp>
-+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                    <boolProp name="Assertion.assume_success">false</boolProp>
-+                    <intProp name="Assertion.test_type">1</intProp>
-+                    <stringProp name="Assertion.scope">variable</stringProp>
-+                    <stringProp name="Scope.variable">grouped_product_sku</stringProp>
-+                </ResponseAssertion>
-+                <hashTree/>
-+            </hashTree>
-+            <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Create Links" enabled="true"/>
-+            <hashTree>
-+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create child bundle, configurable, simple, downloadable,  for grouped" enabled="true">
-+                    <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+                    <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+                        <collectionProp name="Arguments.arguments">
-+                            <elementProp name="" elementType="HTTPArgument">
-+                                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+                                <stringProp name="Argument.value">{&#xD;
-+                                    "items": [&#xD;
-+                                    {&#xD;
-+                                    "sku": "${grouped_product_sku}",&#xD;
-+                                    "link_type": "associated",&#xD;
-+                                    "linked_product_sku": "${bundle_product_sku}",&#xD;
-+                                    "linked_product_type": "bundle",&#xD;
-+                                    "position": 1,&#xD;
-+                                    "extension_attributes": {&#xD;
-+                                    "qty": 1&#xD;
-+                                    }&#xD;
-+                                    },&#xD;
-+                                    {&#xD;
-+                                    "sku": "${grouped_product_sku}",&#xD;
-+                                    "link_type": "associated",&#xD;
-+                                    "linked_product_sku": "${configurable_product_sku}",&#xD;
-+                                    "linked_product_type": "configurable",&#xD;
-+                                    "position": 2,&#xD;
-+                                    "extension_attributes": {&#xD;
-+                                    "qty": 1&#xD;
-+                                    }&#xD;
-+                                    },&#xD;
-+                                    {&#xD;
-+                                    "sku": "${grouped_product_sku}",&#xD;
-+                                    "link_type": "associated",&#xD;
-+                                    "linked_product_sku": "${simple_product_sku}",&#xD;
-+                                    "linked_product_type": "simple",&#xD;
-+                                    "position": 3,&#xD;
-+                                    "extension_attributes": {&#xD;
-+                                    "qty": 1&#xD;
-+                                    }&#xD;
-+                                    },&#xD;
-+                                    {&#xD;
-+                                    "sku": "${grouped_product_sku}",&#xD;
-+                                    "link_type": "associated",&#xD;
-+                                    "linked_product_sku": "${downloadable_product_sku}",&#xD;
-+                                    "linked_product_type": "downloadable",&#xD;
-+                                    "position": 4,&#xD;
-+                                    "extension_attributes": {&#xD;
-+                                    "qty": 1&#xD;
-+                                    }&#xD;
-+                                    }&#xD;
-+                                    ]&#xD;
-+                                    }&#xD;
-+                                </stringProp>
-+                                <stringProp name="Argument.metadata">=</stringProp>
-+                            </elementProp>
-+                        </collectionProp>
-+                    </elementProp>
-+                    <stringProp name="HTTPSampler.domain"/>
-+                    <stringProp name="HTTPSampler.port"/>
-+                    <stringProp name="HTTPSampler.connect_timeout"/>
-+                    <stringProp name="HTTPSampler.response_timeout"/>
-+                    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+                    <stringProp name="HTTPSampler.contentEncoding"/>
-+                    <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${grouped_product_sku}/links</stringProp>
-+                    <stringProp name="HTTPSampler.method">POST</stringProp>
-+                    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+                    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+                    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+                    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+                    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+                    <stringProp name="HTTPSampler.embedded_url_re"/>
-+                </HTTPSamplerProxy>
-+                <hashTree>
-+                    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product id" enabled="true">
-+                        <stringProp name="VAR">grouped_product_response</stringProp>
-+                        <stringProp name="JSONPATH">$</stringProp>
-+                        <stringProp name="DEFAULT"/>
-+                        <stringProp name="VARIABLE"/>
-+                        <stringProp name="SUBJECT">BODY</stringProp>
-+                    </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+                    <hashTree/>
-+                    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert add true" enabled="true">
-+                        <collectionProp name="Asserion.test_strings">
-+                            <stringProp name="3569038">true</stringProp>
-+                        </collectionProp>
-+                        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                        <boolProp name="Assertion.assume_success">false</boolProp>
-+                        <intProp name="Assertion.test_type">8</intProp>
-+                        <stringProp name="Assertion.scope">variable</stringProp>
-+                        <stringProp name="Scope.variable">grouped_product_response</stringProp>
-+                    </ResponseAssertion>
-+                    <hashTree/>
-+                </hashTree>
-+            </hashTree>
-+        </hashTree>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Graphql Query Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-+        <stringProp name="VAR">admin_token</stringProp>
-+        <stringProp name="JSONPATH">$</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_token</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Authorization</stringProp>
-+          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query multiple products" enabled="true">
-+            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+                <collectionProp name="Arguments.arguments">
-+                    <elementProp name="" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+                        <stringProp name="Argument.value">{"query":"{\n  products(\n    filter: {\n         price: {gt: \"10\"}\n         or: {\n            sku:{like:\"%Product%\"}\n            name:{like:\"%Configurable Product%\"}\n          }\n        }\n    pageSize: 20\n    currentPage: 1\n    sort: {\n      price: ASC\n      name:DESC\n    }\n  ) {\n    total_count\n    items {\n        attribute_set_id\n        country_of_manufacture\n        created_at\n        description {\n            html\n        }\n        gift_message_available\n        image\n        {\n            url\n            label\n        }\n        meta_description\n        meta_keyword\n        meta_title\n        name\n        new_from_date\n        new_to_date\n        options_container\n        ... on CustomizableProductInterface {\n            options\n            {\n                title\n                required\n                sort_order\n            }\n        }\n        \n        price {\n            minimalPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n            maximalPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n            regularPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n        }\n        short_description {\n            html\n        }\n        sku\n        small_image {\n            url\n            label\n        }\n        special_from_date\n        special_price\n        special_to_date\n        swatch_image\n        thumbnail\n        {\n            url\n            label\n        }\n        tier_price\n        type_id\n        updated_at\n        url_key\n        url_path\n        websites { id name code sort_order default_group_id is_default }\n      \t... on PhysicalProductInterface {\n        \tweight\n      \t}\n    }\n    page_info {\n      page_size\n      current_page\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                    </elementProp>
-+                </collectionProp>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout"/>
-+            <stringProp name="HTTPSampler.response_timeout"/>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+            <stringProp name="HTTPSampler.method">POST</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_filter_only.jmx</stringProp>
-+        </HTTPSamplerProxy>
-+        <hashTree>
-+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-+                <stringProp name="VAR">graphql_multiple_products_query_total_count</stringProp>
-+                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-+                <stringProp name="DEFAULT"/>
-+                <stringProp name="VARIABLE"/>
-+                <stringProp name="SUBJECT">BODY</stringProp>
-+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+            <hashTree/>
-+            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 200" enabled="true">
-+                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_multiple_products_query_total_count");
-+                    if (totalCount == null) {
-+                    Failure = true;
-+                    FailureMessage = "Not Expected \"totalCount\" to be null";
-+                    } else {
-+                    if (Integer.parseInt(totalCount) &lt; 200) {
-+                    Failure = true;
-+                    FailureMessage = "Expected \"totalCount\" to be greater than 200, Actual: " + totalCount;
-+                    } else {
-+                    Failure = false;
-+                    }
-+                    }
-+                </stringProp>
-+                <stringProp name="BeanShellAssertion.filename"/>
-+                <stringProp name="BeanShellAssertion.parameters"/>
-+                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-+            </BeanShellAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query simple product" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${simple_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout"/>
-+      <stringProp name="HTTPSampler.response_timeout"/>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_simple_product_with_extensible_data_objects.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-+        <stringProp name="VAR">graphql_simple_products_query_total_count</stringProp>
-+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract response" enabled="true">
-+            <stringProp name="VAR">graphql_multiple_products_query_response</stringProp>
-+            <stringProp name="JSONPATH">$</stringProp>
-+            <stringProp name="DEFAULT"/>
-+            <stringProp name="VARIABLE"/>
-+            <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+        <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_simple_products_query_total_count");
-+
-+if (totalCount == null) {
-+        Failure = true;
-+        FailureMessage = "Not Expected \"totalCount\" to be null";
-+} else {
-+	if (Integer.parseInt(totalCount) != 1) {
-+   Failure = true;
-+   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
-+	} else {
-+		Failure = false;
-+	}
-+}
-+</stringProp>
-+        <stringProp name="BeanShellAssertion.filename"/>
-+        <stringProp name="BeanShellAssertion.parameters"/>
-+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-+      </BeanShellAssertion>
-+      <hashTree/>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
-+        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
-+        <stringProp name="EXPECTED_VALUE">${simple_product_sku}</stringProp>
-+        <boolProp name="JSONVALIDATION">true</boolProp>
-+        <boolProp name="EXPECT_NULL">false</boolProp>
-+        <boolProp name="INVERT">false</boolProp>
-+        <boolProp name="ISREGEX">true</boolProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query configurable product" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: {eq:\"${configurable_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image\n                        {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout"/>
-+      <stringProp name="HTTPSampler.response_timeout"/>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_configurable_product_with_extensible_data_objects.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-+        <stringProp name="VAR">graphql_configurable_products_query_total_count</stringProp>
-+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_configurable_products_query_total_count");
-+
-+if (totalCount == null) {
-+        Failure = true;
-+        FailureMessage = "Not Expected \"totalCount\" to be null";
-+} else {
-+	if (Integer.parseInt(totalCount) != 1) {
-+   Failure = true;
-+   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
-+	} else {
-+		Failure = false;
-+	}
-+}
-+
-+
-+</stringProp>
-+        <stringProp name="BeanShellAssertion.filename"/>
-+        <stringProp name="BeanShellAssertion.parameters"/>
-+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-+      </BeanShellAssertion>
-+      <hashTree/>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert configurable product sku" enabled="true">
-+        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
-+        <stringProp name="EXPECTED_VALUE">${configurable_product_sku}</stringProp>
-+        <boolProp name="JSONVALIDATION">true</boolProp>
-+        <boolProp name="EXPECT_NULL">false</boolProp>
-+        <boolProp name="INVERT">false</boolProp>
-+        <boolProp name="ISREGEX">true</boolProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search and filter" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n    products(\n   pageSize:20\n   currentPage:1\n    search: \"configurable\"\n        filter: {name: {like: \"Configurable Product%\"} }\n    ) {\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t\t}\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image\n                        {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout"/>
-+      <stringProp name="HTTPSampler.response_timeout"/>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_and_filter.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-+        <stringProp name="VAR">graphql_search_products_query_total_count_fulltext_filter</stringProp>
-+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
-+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count_fulltext_filter");
-+
-+if (totalCount == null) {
-+        Failure = true;
-+        FailureMessage = "Not Expected \"totalCount\" to be null";
-+} else {
-+	if (Integer.parseInt(totalCount) &lt; 1) {
-+   Failure = true;
-+   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
-+	} else {
-+		Failure = false;
-+	}
-+}
-+
-+
-+</stringProp>
-+        <stringProp name="BeanShellAssertion.filename"/>
-+        <stringProp name="BeanShellAssertion.parameters"/>
-+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-+      </BeanShellAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search only" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n    products(\n   pageSize:20\n   currentPage:1\n    search: \"configurable\") {\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t\t}\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout"/>
-+      <stringProp name="HTTPSampler.response_timeout"/>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_only.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-+        <stringProp name="VAR">graphql_search_products_query_total_count</stringProp>
-+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
-+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count");
-+
-+if (totalCount == null) {
-+        Failure = true;
-+        FailureMessage = "Not Expected \"totalCount\" to be null";
-+} else {
-+	if (Integer.parseInt(totalCount) &lt; 1) {
-+   Failure = true;
-+   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
-+	} else {
-+		Failure = false;
-+	}
-+}
-+
-+
-+</stringProp>
-+        <stringProp name="BeanShellAssertion.filename"/>
-+        <stringProp name="BeanShellAssertion.parameters"/>
-+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-+      </BeanShellAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search and filters" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n    products(\n   pageSize:20\n   currentPage:1\n    search: \"Option 1\") {\n        filters {\n            name\n            filter_items_count\n            request_var\n            filter_items {\n                label\n                value_string\n                items_count\n                ... on SwatchLayerFilterItemInterface {\n                    swatch_data {\n                        type\n                        value\n                    }\n                }\n            }\n        }\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n                    weight\n                  }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image\n                        {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout"/>
-+      <stringProp name="HTTPSampler.response_timeout"/>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_and_filters.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-+        <stringProp name="VAR">graphql_search_products_query_total_count</stringProp>
-+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
-+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count");
-+
-+if (totalCount == null) {
-+        Failure = true;
-+        FailureMessage = "Not Expected \"totalCount\" to be null";
-+} else {
-+	if (Integer.parseInt(totalCount) &lt; 1) {
-+   Failure = true;
-+   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
-+	} else {
-+		Failure = false;
-+	}
-+}
-+
-+
-+</stringProp>
-+        <stringProp name="BeanShellAssertion.filename"/>
-+        <stringProp name="BeanShellAssertion.parameters"/>
-+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-+      </BeanShellAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query bundle product" enabled="true">
-+            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+                <collectionProp name="Arguments.arguments">
-+                    <elementProp name="" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${bundle_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n               url\n               label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on BundleProduct {\n                weight\n                price_view\n                dynamic_price\n                dynamic_sku\n                ship_bundle_items\n                dynamic_weight\n                items {\n                  option_id\n                  title\n                  required\n                  type\n                  position\n                  sku\n                  options {\n                        id\n                        qty\n                        position\n                        is_default\n                        price\n                        price_type\n                        can_change_quantity\n                    product {\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n                    }\n                  }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                    </elementProp>
-+                </collectionProp>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout"/>
-+            <stringProp name="HTTPSampler.response_timeout"/>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+            <stringProp name="HTTPSampler.method">POST</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_bundle_product_with_extensible_data_objects.jmx</stringProp>
-+        </HTTPSamplerProxy>
-+        <hashTree>
-+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-+                <stringProp name="VAR">graphql_bundle_products_query_total_count</stringProp>
-+                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-+                <stringProp name="DEFAULT"/>
-+                <stringProp name="VARIABLE"/>
-+                <stringProp name="SUBJECT">BODY</stringProp>
-+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+            <hashTree/>
-+            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-+                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_bundle_products_query_total_count");
-+
-+                    if (totalCount == null) {
-+                    Failure = true;
-+                    FailureMessage = "Not Expected \"totalCount\" to be null";
-+                    } else {
-+                    if (Integer.parseInt(totalCount) != 1) {
-+                    Failure = true;
-+                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
-+                    } else {
-+                    Failure = false;
-+                    }
-+                    }
-+
-+
-+                </stringProp>
-+                <stringProp name="BeanShellAssertion.filename"/>
-+                <stringProp name="BeanShellAssertion.parameters"/>
-+                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-+            </BeanShellAssertion>
-+            <hashTree/>
-+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert bundle product sku" enabled="true">
-+                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
-+                <stringProp name="EXPECTED_VALUE">${bundle_product_sku}</stringProp>
-+                <boolProp name="JSONVALIDATION">true</boolProp>
-+                <boolProp name="EXPECT_NULL">false</boolProp>
-+                <boolProp name="INVERT">false</boolProp>
-+                <boolProp name="ISREGEX">false</boolProp>
-+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query downloadable product" enabled="true">
-+            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+                <collectionProp name="Arguments.arguments">
-+                    <elementProp name="" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+                        <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${downloadable_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n              ... on DownloadableProduct {\n                links_purchased_separately\n                links_title\n                downloadable_product_samples {\n                  id\n                  title\n                  sort_order\n                  sample_type\n                  sample_file\n                  sample_url\n                }\n                downloadable_product_links {\n                        id\n                        title\n                        sort_order\n                        is_shareable\n                        price\n                        number_of_downloads\n                        link_type\n                        sample_type\n                        sample_file\n                            sample_url\n                }\n              }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                    </elementProp>
-+                </collectionProp>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout"/>
-+            <stringProp name="HTTPSampler.response_timeout"/>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+            <stringProp name="HTTPSampler.method">POST</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_downloadable_product_with_extensible_data_objects.jmx</stringProp>
-+        </HTTPSamplerProxy>
-+        <hashTree>
-+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-+                <stringProp name="VAR">graphql_downloadable_products_query_total_count</stringProp>
-+                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-+                <stringProp name="DEFAULT"/>
-+                <stringProp name="VARIABLE"/>
-+                <stringProp name="SUBJECT">BODY</stringProp>
-+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+            <hashTree/>
-+            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-+                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_downloadable_products_query_total_count");
-+
-+                    if (totalCount == null) {
-+                    Failure = true;
-+                    FailureMessage = "Not Expected \"totalCount\" to be null";
-+                    } else {
-+                    if (Integer.parseInt(totalCount) != 1) {
-+                    Failure = true;
-+                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
-+                    } else {
-+                    Failure = false;
-+                    }
-+                    }
-+
-+
-+                </stringProp>
-+                <stringProp name="BeanShellAssertion.filename"/>
-+                <stringProp name="BeanShellAssertion.parameters"/>
-+                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-+            </BeanShellAssertion>
-+            <hashTree/>
-+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert downloadable product sku" enabled="true">
-+                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
-+                <stringProp name="EXPECTED_VALUE">${downloadable_product_sku}</stringProp>
-+                <boolProp name="JSONVALIDATION">true</boolProp>
-+                <boolProp name="EXPECT_NULL">false</boolProp>
-+                <boolProp name="INVERT">false</boolProp>
-+                <boolProp name="ISREGEX">true</boolProp>
-+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+            <hashTree/>
-+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert link samples titles" enabled="true">
-+                <stringProp name="JSON_PATH">$.data.products.items[0].downloadable_product_samples..title</stringProp>
-+                <stringProp name="EXPECTED_VALUE">["sample1","sample2"]</stringProp>
-+                <boolProp name="JSONVALIDATION">true</boolProp>
-+                <boolProp name="EXPECT_NULL">false</boolProp>
-+                <boolProp name="INVERT">false</boolProp>
-+                <boolProp name="ISREGEX">false</boolProp>
-+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+            <hashTree/>
-+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert sample titles" enabled="true">
-+                <stringProp name="JSON_PATH">$.data.products.items[0].downloadable_product_samples..title</stringProp>
-+                <stringProp name="EXPECTED_VALUE">["sample1","sample2"]</stringProp>
-+                <boolProp name="JSONVALIDATION">true</boolProp>
-+                <boolProp name="EXPECT_NULL">false</boolProp>
-+                <boolProp name="INVERT">false</boolProp>
-+                <boolProp name="ISREGEX">false</boolProp>
-+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query virtual product" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${virtual_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout"/>
-+      <stringProp name="HTTPSampler.response_timeout"/>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_virtual_product_with_extensible_data_objects.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-+        <stringProp name="VAR">graphql_virtual_products_query_total_count</stringProp>
-+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_virtual_products_query_total_count");
-+
-+if (totalCount == null) {
-+        Failure = true;
-+        FailureMessage = "Not Expected \"totalCount\" to be null";
-+} else {
-+	if (Integer.parseInt(totalCount) != 1) {
-+   Failure = true;
-+   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
-+	} else {
-+		Failure = false;
-+	}
-+}
-+</stringProp>
-+        <stringProp name="BeanShellAssertion.filename"/>
-+        <stringProp name="BeanShellAssertion.parameters"/>
-+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-+      </BeanShellAssertion>
-+      <hashTree/>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
-+        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
-+        <stringProp name="EXPECTED_VALUE">${virtual_product_sku}</stringProp>
-+        <boolProp name="JSONVALIDATION">true</boolProp>
-+        <boolProp name="EXPECT_NULL">false</boolProp>
-+        <boolProp name="INVERT">false</boolProp>
-+        <boolProp name="ISREGEX">true</boolProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query grouped product" enabled="true">
-+            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+                <collectionProp name="Arguments.arguments">
-+                    <elementProp name="" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${grouped_product_sku}\"} }) {\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on GroupedProduct {\n                weight\n                items {\n                  qty\n                  position\n                  product {\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image\n                        {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n                  }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                    </elementProp>
-+                </collectionProp>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout"/>
-+            <stringProp name="HTTPSampler.response_timeout"/>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+            <stringProp name="HTTPSampler.method">POST</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_grouped_product_with_extensible_data_objects.jmx</stringProp>
-+        </HTTPSamplerProxy>
-+        <hashTree>
-+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-+                <stringProp name="VAR">graphql_grouped_products_query_total_count</stringProp>
-+                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-+                <stringProp name="DEFAULT"/>
-+                <stringProp name="VARIABLE"/>
-+                <stringProp name="SUBJECT">BODY</stringProp>
-+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+            <hashTree/>
-+            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-+                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_grouped_products_query_total_count");
-+
-+                    if (totalCount == null) {
-+                    Failure = true;
-+                    FailureMessage = "Not Expected \"totalCount\" to be null";
-+                    } else {
-+                    if (Integer.parseInt(totalCount) != 1) {
-+                    Failure = true;
-+                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
-+                    } else {
-+                    Failure = false;
-+                    }
-+                    }
-+
-+
-+                </stringProp>
-+                <stringProp name="BeanShellAssertion.filename"/>
-+                <stringProp name="BeanShellAssertion.parameters"/>
-+                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-+            </BeanShellAssertion>
-+            <hashTree/>
-+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert grouped product sku" enabled="true">
-+                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
-+                <stringProp name="EXPECTED_VALUE">${grouped_product_sku}</stringProp>
-+                <boolProp name="JSONVALIDATION">true</boolProp>
-+                <boolProp name="EXPECT_NULL">false</boolProp>
-+                <boolProp name="INVERT">false</boolProp>
-+                <boolProp name="ISREGEX">true</boolProp>
-+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+        <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Query Customer" enabled="true"/>
-+        <hashTree>
-+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create customer" enabled="true">
-+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+                    <collectionProp name="Arguments.arguments">
-+                        <elementProp name="" elementType="HTTPArgument">
-+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+                            <stringProp name="Argument.value">{&#xD;
-+                                "customer": {&#xD;
-+                                &#xD;
-+                                "email": "customer_${__time()}-${__threadNum}-${__Random(1,1000000)}@example.com",&#xD;
-+                                "firstname": "test_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-+                                "lastname": "Doe"&#xD;
-+                                },&#xD;
-+                                "password": "test@123"&#xD;
-+                                }</stringProp>
-+                            <stringProp name="Argument.metadata">=</stringProp>
-+                        </elementProp>
-+                    </collectionProp>
-+                </elementProp>
-+                <stringProp name="HTTPSampler.domain"/>
-+                <stringProp name="HTTPSampler.port"/>
-+                <stringProp name="HTTPSampler.connect_timeout"/>
-+                <stringProp name="HTTPSampler.response_timeout"/>
-+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+                <stringProp name="HTTPSampler.contentEncoding"/>
-+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers</stringProp>
-+                <stringProp name="HTTPSampler.method">POST</stringProp>
-+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+                <boolProp name="HTTPSampler.monitor">false</boolProp>
-+                <stringProp name="HTTPSampler.embedded_url_re"/>
-+                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_frontend_customer.jmx</stringProp>
-+            </HTTPSamplerProxy>
-+            <hashTree>
-+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer id" enabled="true">
-+                    <stringProp name="VAR">customer_id</stringProp>
-+                    <stringProp name="JSONPATH">$.id</stringProp>
-+                    <stringProp name="DEFAULT"/>
-+                    <stringProp name="VARIABLE"/>
-+                    <stringProp name="SUBJECT">BODY</stringProp>
-+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+                <hashTree/>
-+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer id not null" enabled="true">
-+                    <collectionProp name="Asserion.test_strings">
-+                        <stringProp name="89649215">^\d+$</stringProp>
-+                    </collectionProp>
-+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                    <boolProp name="Assertion.assume_success">false</boolProp>
-+                    <intProp name="Assertion.test_type">1</intProp>
-+                    <stringProp name="Assertion.scope">variable</stringProp>
-+                    <stringProp name="Scope.variable">customer_id</stringProp>
-+                </ResponseAssertion>
-+                <hashTree/>
-+            </hashTree>
-+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check customer" enabled="true">
-+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                    <collectionProp name="Arguments.arguments"/>
-+                </elementProp>
-+                <stringProp name="HTTPSampler.domain"/>
-+                <stringProp name="HTTPSampler.port"/>
-+                <stringProp name="HTTPSampler.connect_timeout"/>
-+                <stringProp name="HTTPSampler.response_timeout"/>
-+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+                <stringProp name="HTTPSampler.contentEncoding"/>
-+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers/${customer_id}</stringProp>
-+                <stringProp name="HTTPSampler.method">GET</stringProp>
-+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+                <boolProp name="HTTPSampler.monitor">false</boolProp>
-+                <stringProp name="HTTPSampler.embedded_url_re"/>
-+                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/check_customer.jmx</stringProp>
-+            </HTTPSamplerProxy>
-+            <hashTree>
-+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
-+                    <stringProp name="JSON_PATH">$.id</stringProp>
-+                    <stringProp name="EXPECTED_VALUE">${customer_id}</stringProp>
-+                    <boolProp name="JSONVALIDATION">true</boolProp>
-+                    <boolProp name="EXPECT_NULL">false</boolProp>
-+                    <boolProp name="INVERT">false</boolProp>
-+                    <boolProp name="ISREGEX">true</boolProp>
-+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+                <hashTree/>
-+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer email" enabled="true">
-+                    <stringProp name="VAR">customer_email</stringProp>
-+                    <stringProp name="JSONPATH">$.email</stringProp>
-+                    <stringProp name="DEFAULT"/>
-+                    <stringProp name="VARIABLE"/>
-+                    <stringProp name="SUBJECT">BODY</stringProp>
-+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+                <hashTree/>
-+            </hashTree>
-+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create customer token" enabled="true">
-+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+                    <collectionProp name="Arguments.arguments">
-+                        <elementProp name="" elementType="HTTPArgument">
-+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+                            <stringProp name="Argument.value">{&#xD;
-+                                "username":"${customer_email}",&#xD;
-+                                "password":"test@123"&#xD;
-+                                }&#xD;
-+                            </stringProp>
-+                            <stringProp name="Argument.metadata">=</stringProp>
-+                        </elementProp>
-+                    </collectionProp>
-+                </elementProp>
-+                <stringProp name="HTTPSampler.domain"/>
-+                <stringProp name="HTTPSampler.port"/>
-+                <stringProp name="HTTPSampler.connect_timeout"/>
-+                <stringProp name="HTTPSampler.response_timeout"/>
-+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+                <stringProp name="HTTPSampler.contentEncoding"/>
-+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/integration/customer/token</stringProp>
-+                <stringProp name="HTTPSampler.method">POST</stringProp>
-+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+                <boolProp name="HTTPSampler.monitor">false</boolProp>
-+                <stringProp name="HTTPSampler.embedded_url_re"/>
-+                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_customer.jmx</stringProp>
-+            </HTTPSamplerProxy>
-+            <hashTree>
-+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer token" enabled="true">
-+                    <stringProp name="VAR">customer_token</stringProp>
-+                    <stringProp name="JSONPATH">$</stringProp>
-+                    <stringProp name="DEFAULT"/>
-+                    <stringProp name="VARIABLE"/>
-+                    <stringProp name="SUBJECT">BODY</stringProp>
-+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+                <hashTree/>
-+            </hashTree>
-+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query customer with token" enabled="true">
-+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+                    <collectionProp name="Arguments.arguments">
-+                        <elementProp name="" elementType="HTTPArgument">
-+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+                            <stringProp name="Argument.value">{"query":"{\n  customer {\n    created_at\n    group_id\n\n    prefix\n    firstname\n    middlename\n    lastname\n    suffix\n    email\n    default_billing\n    default_shipping\n\n    dob\n    taxvat\n\n    id\n    addresses {\n        id\n        customer_id\n        region {\n            region_code\n          region\n          region_id\n        }\n        region_id\n        country_id\n        street \n        company\n        telephone\n        fax\n        postcode\n        city\n        firstname\n        lastname\n        middlename\n        prefix\n        suffix\n        vat_id\n        default_shipping\n        default_billing\n    }\n    is_subscribed\n  }\n}","variables":null,"operationName":null}</stringProp>
-+                            <stringProp name="Argument.metadata">=</stringProp>
-+                        </elementProp>
-+                    </collectionProp>
-+                </elementProp>
-+                <stringProp name="HTTPSampler.domain"/>
-+                <stringProp name="HTTPSampler.port"/>
-+                <stringProp name="HTTPSampler.connect_timeout"/>
-+                <stringProp name="HTTPSampler.response_timeout"/>
-+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+                <stringProp name="HTTPSampler.contentEncoding"/>
-+                <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+                <stringProp name="HTTPSampler.method">POST</stringProp>
-+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+                <boolProp name="HTTPSampler.monitor">false</boolProp>
-+                <stringProp name="HTTPSampler.embedded_url_re"/>
-+                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_frontend_customer.jmx</stringProp>
-+            </HTTPSamplerProxy>
-+            <hashTree>
-+                <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="Set Customer Token" enabled="true">
-+                    <boolProp name="resetInterpreter">false</boolProp>
-+                    <stringProp name="parameters"/>
-+                    <stringProp name="filename"/>
-+                    <stringProp name="script">import org.apache.jmeter.protocol.http.control.Header;
-+
-+                        sampler.getHeaderManager().removeHeaderNamed("Authorization");
-+
-+                        sampler.getHeaderManager().add(new Header("Authorization","Bearer " + vars.get("customer_token")));</stringProp>
-+                </BeanShellPreProcessor>
-+                <hashTree/>
-+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert customer lastname" enabled="true">
-+                    <stringProp name="JSON_PATH">$.data.customer.lastname</stringProp>
-+                    <stringProp name="EXPECTED_VALUE">Doe</stringProp>
-+                    <boolProp name="JSONVALIDATION">true</boolProp>
-+                    <boolProp name="EXPECT_NULL">false</boolProp>
-+                    <boolProp name="INVERT">false</boolProp>
-+                    <boolProp name="ISREGEX">true</boolProp>
-+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+                <hashTree/>
-+            </hashTree>
-+        </hashTree>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query Category" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n  category(id: 1) {\n      name\n      id\n      level\n      description\n      path\n      path_in_store\n      url_key\n      url_path\n      children {\n        id\n        description\n        default_sort_by\n        children {\n          id\n          description\n          level\n          children {\n            level\n            id\n            children {\n              id\n            }\n          }\n        }\n      }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout"/>
-+      <stringProp name="HTTPSampler.response_timeout"/>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_root_category.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-+        <stringProp name="VAR">graphql_category_query_name</stringProp>
-+        <stringProp name="JSONPATH">$.data.category.name</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
-+        <stringProp name="BeanShellAssertion.query">String name = vars.get("graphql_category_query_name");
-+if (name == null) {
-+	Failure = true;
-+	FailureMessage = "Not Expected \"children\" to be null";
-+} else {
-+	if (!name.equals("Root Catalog")) {
-+		Failure = true;
-+		FailureMessage = "Expected \"name\" to equal \"Root Catalog\", Actual: " + name;
-+	} else {
-+		Failure = false;
-+	}
-+}
-+</stringProp>
-+        <stringProp name="BeanShellAssertion.filename"/>
-+        <stringProp name="BeanShellAssertion.parameters"/>
-+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-+      </BeanShellAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  </hashTree>
-+
-+  </hashTree>
-+
-+    
-+        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="GraphQL Pool" enabled="true">
-+            <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-+            <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-+                <boolProp name="LoopController.continue_forever">false</boolProp>
-+                <stringProp name="LoopController.loops">${loops}</stringProp>
-+            </elementProp>
-+            <stringProp name="ThreadGroup.num_threads">${graphQLPoolUsers}</stringProp>
-+            <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp>
-+            <longProp name="ThreadGroup.start_time">1505803944000</longProp>
-+            <longProp name="ThreadGroup.end_time">1505803944000</longProp>
-+            <boolProp name="ThreadGroup.scheduler">false</boolProp>
-+            <stringProp name="ThreadGroup.duration"/>
-+            <stringProp name="ThreadGroup.delay"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
-+        <hashTree>
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get List of Products by category_id" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetListOfProductsByCategoryIdPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Get List of Products by category_id");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
-+
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get List of Products by category_id" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query category($id: Int!, $currentPage: Int, $pageSize: Int) {\n  category(id: $id) {\n    product_count\n    description\n    url_key\n    name\n    id\n    breadcrumbs {\n      category_name\n      category_url_key\n      __typename\n    }\n    products(pageSize: $pageSize, currentPage: $currentPage) {\n      total_count\n      items {\n        id\n        name\n        # small_image\n        # short_description\n        url_key\n        special_price\n        special_from_date\n        special_to_date\n        price {\n          regularPrice {\n            amount {\n              value\n              currency\n              __typename\n            }\n            __typename\n          }\n          __typename\n        }\n        __typename\n      }\n      __typename\n    }\n    __typename\n  }\n}\n","variables":{"id":${category_id},"currentPage":1,"pageSize":12},"operationName":"category"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_list_of_products_by_category_id.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"name":"${category_name}","id":${category_id},</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Simple Product Details by product_url_key" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetSimpleProductDetailsByProductUrlKeyPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Get Simple Product Details by product_url_key");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Simple Product Details by product_url_key" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productDetail($urlKey: String, $onServer: Boolean!) {\n    productDetail: products(filter: { url_key: { eq: $urlKey } }) {\n        items {\n            sku\n            name\n            price {\n                regularPrice {\n                    amount {\n                        currency\n                        value\n                    }\n                }\n            }\n            description {html}\n            media_gallery_entries {\n                label\n                position\n                disabled\n                file\n            }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            # Yes, Products have `meta_keyword` and\n            # everything else has `meta_keywords`.\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"urlKey":"${product_url_key}","onServer":false},"operationName":"productDetail"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_simple_product_details_by_product_url_key.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Simple Product Details by name" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetSimpleProductDetailsByNamePercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Get Simple Product Details by name");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Simple Product Details by name" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productDetail($name: String, $onServer: Boolean!) {\n    productDetail: products(filter: { name: { eq: $name } }) {\n        items {\n            sku\n            name\n            price {\n                regularPrice {\n                    amount {\n                        currency\n                        value\n                    }\n                }\n            }\n            description {html}\n            media_gallery_entries {\n                label\n                position\n                disabled\n                file\n            }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            # Yes, Products have `meta_keyword` and\n            # everything else has `meta_keywords`.\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetail"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_simple_product_details_by_name.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Configurable Product Detail by product_url_key" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetConfigurableProductDetailsByProductUrlKeyPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Get Configurable Product Detail by product_url_key");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("configurable_products_list").size());
-+product = props.get("configurable_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by product_url_key" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productDetail($urlKey: String, $onServer: Boolean!) {\n    productDetail: products(filter: { url_key: { eq: $urlKey } }) {\n        items {\n            sku\n            name\n            price {\n                regularPrice {\n                    amount {\n                        currency\n                        value\n                    }\n                }\n            }\n            description {html}\n            media_gallery_entries {\n                label\n                position\n                disabled\n                file\n            }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            # Yes, Products have `meta_keyword` and\n            # everything else has `meta_keywords`.\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"urlKey":"${product_url_key}","onServer":false},"operationName":"productDetail"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_product_url_key.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Configurable Product Detail by name" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetConfigurableProductDetailsByNamePercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Get Configurable Product Detail by name");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("configurable_products_list").size());
-+product = props.get("configurable_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by name" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Product Search by text and category_id" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetProductSearchByTextAndCategoryIdPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Get Product Search by text and category_id");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
-+
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Product Search by text and category_id" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productSearch($inputText: String!, $categoryId: String) {\n    products(\n   pageSize:12\n    search: $inputText, filter: { category_id: { eq: $categoryId } }) {\n        items {\n            id\n            name\n            small_image {\n              label\n              url\n            }\n            url_key\n            price {\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                }\n            }\n        }\n        total_count\n        filters {\n            name\n            filter_items_count\n            request_var\n            filter_items {\n                label\n                value_string\n            }\n        }\n    }\n}","variables":{"inputText":"Product","categoryId":"${category_id}"},"operationName":"productSearch"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_product_search_by_text_and_category_id.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-+        <stringProp name="VAR">graphql_search_products_query_total_count</stringProp>
-+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
-+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count");
-+
-+if (totalCount == null) {
-+        Failure = true;
-+        FailureMessage = "Not Expected \"totalCount\" to be null";
-+} else {
-+	if (Integer.parseInt(totalCount) &lt; 1) {
-+   Failure = true;
-+   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
-+	} else {
-+		Failure = false;
-+	}
-+}
-+
-+
-+</stringProp>
-+        <stringProp name="BeanShellAssertion.filename"/>
-+        <stringProp name="BeanShellAssertion.parameters"/>
-+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-+      </BeanShellAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Category List by category_id" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetCategoryListByCategoryIdPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Get Category List by category_id");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
-+
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Category List by category_id" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">
-+            {"query":"query categoryList($id: Int!) {\n    category(id: $id) {\n        id\n        children {\n            id\n            name\n            url_key\n            url_path\n            children_count\n            path\n            image\n            productImagePreview: products(pageSize: 1) {\n                items {\n                    small_image {\n                      label\n                      url\n                    }\n                }\n            }\n        }\n    }\n}","variables":{"id":${category_id}},"operationName":"categoryList"}
-+            </stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_category_list_by_category_id.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="Assert found categories" enabled="true">
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="cacheKey"/>
-+        <stringProp name="script">var category = vars.getObject("category");
-+var response = JSON.parse(prev.getResponseDataAsString());
-+
-+assertCategoryId(category, response);
-+assertCategoryChildren(category, response);
-+
-+function assertCategoryId(category, response) {
-+    if (response.data == undefined || response.data.category == undefined || response.data.category.id != category.id) {
-+      AssertionResult.setFailureMessage("Cannot find category with id \"" + category.id + "\"");
-+      AssertionResult.setFailure(true);
-+     }
-+}
-+
-+function assertCategoryChildren(category, response) {
-+    foundCategory = response.data &amp;&amp; response.data.category ? response.data.category : null;
-+    if (foundCategory) {
-+        var childrenFound = foundCategory.children.map(function (c) {return parseInt(c.id)});
-+        var children = category.children.map(function (c) {return parseInt(c)});
-+        if (JSON.stringify(children.sort()) != JSON.stringify(childrenFound.sort())) {
-+           AssertionResult.setFailureMessage("Cannot math children categories \"" + JSON.stringify(children) + "\" for to found one: \"" + JSON.stringify(childrenFound) +  "\"");
-+           AssertionResult.setFailure(true);
-+        }
-+    }
-+ 
-+}
-+
-+</stringProp>
-+      </JSR223Assertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Url Info by url_key" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlUrlInfoByUrlKeyPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Get Url Info by url_key");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
-+
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Url Info by url_key" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">&#xD;
-+            {"query":"query resolveUrl($urlKey: String!) {\n    urlResolver(url: $urlKey) {\n        type\n        id\n    }\n}","variables":{"urlKey":"${category_url_key}${url_suffix}"},"operationName":"resolveUrl"}&#xD;
-+            </stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_url_info_by_url_key.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1062388959">{"type":"CATEGORY","id":${category_id}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Cms Page by id" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetCmsPageByIdPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Get Cms Page by id");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare CMS Page" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var cmsPages = props.get("cms_pages");
-+var number = random.nextInt(cmsPages.length);
-+
-+vars.put("cms_page_id", cmsPages[number].id);
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/prepare_cms_page.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cms Page by id" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">
-+           {"query":"query getCmsPage($id: Int!, $onServer: Boolean!) {\n  cmsPage(id: $id) {\n    url_key\n    content\n    content_heading\n    title\n    page_layout\n    meta_title @include(if: $onServer)\n    meta_keywords @include(if: $onServer)\n    meta_description @include(if: $onServer)\n  }\n}","variables":{"id":${cms_page_id},"onServer":false},"operationName":"getCmsPage"}
-+            </stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_get_cms_page_by_id.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
-+        <stringProp name="JSON_PATH">$.data.cmsPage.url_key</stringProp>
-+        <stringProp name="EXPECTED_VALUE">${cms_page_id}</stringProp>
-+        <boolProp name="JSONVALIDATION">false</boolProp>
-+        <boolProp name="EXPECT_NULL">false</boolProp>
-+        <boolProp name="INVERT">false</boolProp>
-+        <boolProp name="ISREGEX">false</boolProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Navigation Menu by category_id" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetNavigationMenuByCategoryIdPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Get Navigation Menu by category_id");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
-+
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Navigation Menu by category_id" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query navigationMenu($id: Int!) {\n  category(id: $id) {\n    id\n    name\n    product_count\n    path\n    children {\n      id\n      name\n      position\n      level\n      url_key\n      url_path\n      product_count\n      children_count\n      path\n      productImagePreview: products(pageSize: 1) {\n        items {\n          small_image {\n            label\n             url\n          }\n        }\n      }\n    }\n  }\n}","variables":{"id":${category_id}},"operationName":"navigationMenu"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_navigation_menu_by_category_id.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"id":${category_id},"name":"${category_name}","product_count"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Create Empty Cart" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlCreateEmptyCartPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Create Empty Cart");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">quote_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Empty Cart" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetEmptyCartPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Get Empty Cart");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">quote_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1901638450">{"data":{"cart":{"items":[]}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Set Shipping Address On Cart" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlSetShippingAddressOnCartPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Set Shipping Address On Cart");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">quote_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1901638450">{"data":{"cart":{"items":[]}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Shipping Address On Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingAddressesOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      shipping_addresses: [\n        {\n          address: {\n            firstname: \"test firstname\"\n            lastname: \"test lastname\"\n            company: \"test company\"\n            street: [\"test street 1\", \"test street 2\"]\n            city: \"test city\"\n            region: \"test region\"\n            postcode: \"887766\"\n            country_code: \"US\"\n            telephone: \"88776655\"\n            save_in_address_book: false\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      shipping_addresses {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_shipping_address_on_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1671866339">{"data":{"setShippingAddressesOnCart":{"cart":{"shipping_addresses":[{"firstname":"test firstname","lastname":"test lastname","company":"test company","street":["test street 1","test street 2"],"city":"test city","postcode":"887766","telephone":"88776655","country":{"code":"US","label":"US"}}]}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Set Billing Address On Cart" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlSetBillingAddressOnCartPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Set Billing Address On Cart");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">quote_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1901638450">{"data":{"cart":{"items":[]}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Billing Address On Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  setBillingAddressOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      billing_address: {\n        address: {\n          firstname: \"test firstname\"\n          lastname: \"test lastname\"\n          company: \"test company\"\n          street: [\"test street 1\", \"test street 2\"]\n          city: \"test city\"\n          region: \"test region\"\n          postcode: \"887766\"\n          country_code: \"US\"\n          telephone: \"88776655\"\n          save_in_address_book: false\n        }\n      }\n    }\n  ) {\n    cart {\n      billing_address {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_billing_address_on_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1147076914">{"data":{"setBillingAddressOnCart":{"cart":{"billing_address":{"firstname":"test firstname","lastname":"test lastname","company":"test company","street":["test street 1","test street 2"],"city":"test city","postcode":"887766","telephone":"88776655","country":{"code":"US","label":"US"}}}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Add Simple Product To Cart" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlAddSimpleProductToCartPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Add Simple Product To Cart");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">quote_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Simple Product To Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {  \n  addSimpleProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_items: [\n        {\n          data: {\n            quantity: 2\n            sku: \"${product_sku}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        quantity\n        product {\n          sku\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_simple_product_to_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1421843282">addSimpleProductsToCart</stringProp>
-+          <stringProp name="-1173443935">"sku":"${product_sku}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Add Configurable Product To Cart" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlAddConfigurableProductToCartPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Add Configurable Product To Cart");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">quote_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("configurable_products_list").size());
-+product = props.get("configurable_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by name" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract Configurable Product option" enabled="true">
-+      <stringProp name="VAR">product_option</stringProp>
-+      <stringProp name="JSONPATH">$.data.products.items[0].variants[0].product.sku</stringProp>
-+      <stringProp name="DEFAULT"/>
-+      <stringProp name="VARIABLE"/>
-+      <stringProp name="SUBJECT">BODY</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/extract_configurable_product_option.jmx</stringProp></com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Configurable Product To Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  addConfigurableProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_items: [\n        {\n          variant_sku: \"${product_option}\"\n          data: {\n            quantity: 2\n            sku: \"${product_option}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        id\n        quantity\n        product {\n          name\n          sku\n        }\n        ... on ConfigurableCartItem {\n          configurable_options {\n            option_label\n          }\n        }\n    }\n  }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_configurable_product_to_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1421843282">addConfigurableProductsToCart</stringProp>
-+          <stringProp name="675049292">"sku":"${product_option}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Update Simple Product Qty In Cart" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlUpdateSimpleProductQtyInCartPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Update Simple Product Qty In Cart");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">quote_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Simple Product To Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {  \n  addSimpleProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_items: [\n        {\n          data: {\n            quantity: 2\n            sku: \"${product_sku}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        quantity\n        product {\n          sku\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_simple_product_to_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1421843282">addSimpleProductsToCart</stringProp>
-+          <stringProp name="-1173443935">"sku":"${product_sku}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-+        <stringProp name="VAR">item_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Update Simple Product qty In Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  updateCartItems(input: {\n    cart_id: \"${quote_id}\"\n    cart_items: [\n      {\n        cart_item_id: ${item_id}\n        quantity: 5\n      }\n    ]\n  }) {\n    cart {\n      items {\n        id\n        quantity\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/update_simple_product_qty_in_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="664196114">{"data":{"updateCartItems":{"cart":{"items":[{"id":"${item_id}","quantity":5}]}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Update Configurable Product Qty In Cart" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlUpdateConfigurableProductQtyInCartPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Update Configurable Product Qty In Cart");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">quote_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("configurable_products_list").size());
-+product = props.get("configurable_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by name" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract Configurable Product option" enabled="true">
-+      <stringProp name="VAR">product_option</stringProp>
-+      <stringProp name="JSONPATH">$.data.products.items[0].variants[0].product.sku</stringProp>
-+      <stringProp name="DEFAULT"/>
-+      <stringProp name="VARIABLE"/>
-+      <stringProp name="SUBJECT">BODY</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/extract_configurable_product_option.jmx</stringProp></com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Configurable Product To Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  addConfigurableProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_items: [\n        {\n          variant_sku: \"${product_option}\"\n          data: {\n            quantity: 2\n            sku: \"${product_option}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        id\n        quantity\n        product {\n          name\n          sku\n        }\n        ... on ConfigurableCartItem {\n          configurable_options {\n            option_label\n          }\n        }\n    }\n  }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_configurable_product_to_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1421843282">addConfigurableProductsToCart</stringProp>
-+          <stringProp name="675049292">"sku":"${product_option}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-+        <stringProp name="VAR">item_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Update Configurable Product qty In Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  updateCartItems(input: {\n    cart_id: \"${quote_id}\"\n    cart_items: [\n      {\n        cart_item_id: ${item_id}\n        quantity: 5\n      }\n    ]\n  }) {\n    cart {\n      items {\n        id\n        quantity\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/update_configurable_product_qty_in_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="664196114">{"data":{"updateCartItems":{"cart":{"items":[{"id":"${item_id}","quantity":5}]}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Remove Simple Product From Cart" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlRemoveSimpleProductFromCartPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Remove Simple Product From Cart");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">quote_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Simple Product To Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {  \n  addSimpleProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_items: [\n        {\n          data: {\n            quantity: 2\n            sku: \"${product_sku}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        quantity\n        product {\n          sku\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_simple_product_to_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1421843282">addSimpleProductsToCart</stringProp>
-+          <stringProp name="-1173443935">"sku":"${product_sku}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-+        <stringProp name="VAR">item_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Remove Simple Product From Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  removeItemFromCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_item_id: ${item_id}\n    }\n  ) {\n    cart {\n      items {\n        quantity\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/remove_simple_product_from_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1452665323">{"data":{"removeItemFromCart":{"cart":{"items":[]}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Remove Configurable Product From Cart" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlRemoveConfigurableProductFromCartPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Remove Configurable Product From Cart");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">quote_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("configurable_products_list").size());
-+product = props.get("configurable_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by name" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract Configurable Product option" enabled="true">
-+      <stringProp name="VAR">product_option</stringProp>
-+      <stringProp name="JSONPATH">$.data.products.items[0].variants[0].product.sku</stringProp>
-+      <stringProp name="DEFAULT"/>
-+      <stringProp name="VARIABLE"/>
-+      <stringProp name="SUBJECT">BODY</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/extract_configurable_product_option.jmx</stringProp></com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Configurable Product To Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  addConfigurableProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_items: [\n        {\n          variant_sku: \"${product_option}\"\n          data: {\n            quantity: 2\n            sku: \"${product_option}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        id\n        quantity\n        product {\n          name\n          sku\n        }\n        ... on ConfigurableCartItem {\n          configurable_options {\n            option_label\n          }\n        }\n    }\n  }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_configurable_product_to_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1421843282">addConfigurableProductsToCart</stringProp>
-+          <stringProp name="675049292">"sku":"${product_option}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-+        <stringProp name="VAR">item_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Remove Configurable Product From Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  removeItemFromCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_item_id: ${item_id}\n    }\n  ) {\n    cart {\n      items {\n        quantity\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/remove_configurable_product_from_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1452665323">{"data":{"removeItemFromCart":{"cart":{"items":[]}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Apply Coupon To Cart" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlApplyCouponToCartPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Apply Coupon To Cart");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">quote_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Simple Product To Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {  \n  addSimpleProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_items: [\n        {\n          data: {\n            quantity: 2\n            sku: \"${product_sku}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        quantity\n        product {\n          sku\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_simple_product_to_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1421843282">addSimpleProductsToCart</stringProp>
-+          <stringProp name="-1173443935">"sku":"${product_sku}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Coupon Code Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var coupons = props.get("coupon_codes");
-+number = random.nextInt(coupons.length);
-+
-+vars.put("coupon_code", coupons[number].code);
-+        </stringProp>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_coupon_code_setup.jmx</stringProp>
-+    </JSR223Sampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Apply Coupon To Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  applyCouponToCart(input: {cart_id: \"${quote_id}\", coupon_code: \"${coupon_code}\"}) {\n    cart {\n      applied_coupon {\n        code\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/apply_coupon_to_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1026466978">{"data":{"applyCouponToCart":{"cart":{"applied_coupon":{"code":"${coupon_code}"}}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Remove Coupon From Cart" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlRemoveCouponFromCartPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Remove Coupon From Cart");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">quote_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Simple Product To Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {  \n  addSimpleProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_items: [\n        {\n          data: {\n            quantity: 2\n            sku: \"${product_sku}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        quantity\n        product {\n          sku\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_simple_product_to_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1421843282">addSimpleProductsToCart</stringProp>
-+          <stringProp name="-1173443935">"sku":"${product_sku}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Coupon Code Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var coupons = props.get("coupon_codes");
-+number = random.nextInt(coupons.length);
-+
-+vars.put("coupon_code", coupons[number].code);
-+        </stringProp>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_coupon_code_setup.jmx</stringProp>
-+    </JSR223Sampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Apply Coupon To Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  applyCouponToCart(input: {cart_id: \"${quote_id}\", coupon_code: \"${coupon_code}\"}) {\n    cart {\n      applied_coupon {\n        code\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/apply_coupon_to_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1026466978">{"data":{"applyCouponToCart":{"cart":{"applied_coupon":{"code":"${coupon_code}"}}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Remove Coupon From Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  removeCouponFromCart(input: {cart_id: \"${quote_id}\"}) {\n    cart {\n      applied_coupon {\n        code\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/remove_coupon_from_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-76201335">{"data":{"removeCouponFromCart":{"cart":{"applied_coupon":null}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Catalog Browsing By Guest" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlCatalogBrowsingByGuestPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Catalog Browsing By Guest");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
-+
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Navigation Menu by category_id" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query navigationMenu($id: Int!) {\n  category(id: $id) {\n    id\n    name\n    product_count\n    path\n    children {\n      id\n      name\n      position\n      level\n      url_key\n      url_path\n      product_count\n      children_count\n      path\n      productImagePreview: products(pageSize: 1) {\n        items {\n          small_image {\n            label\n             url\n          }\n        }\n      }\n    }\n  }\n}","variables":{"id":${category_id}},"operationName":"navigationMenu"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_navigation_menu_by_category_id.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"id":${category_id},"name":"${category_name}","product_count"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Product Search by text and category_id" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productSearch($inputText: String!, $categoryId: String) {\n    products(\n   pageSize:12\n    search: $inputText, filter: { category_id: { eq: $categoryId } }) {\n        items {\n            id\n            name\n            small_image {\n              label\n              url\n            }\n            url_key\n            price {\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                }\n            }\n        }\n        total_count\n        filters {\n            name\n            filter_items_count\n            request_var\n            filter_items {\n                label\n                value_string\n            }\n        }\n    }\n}","variables":{"inputText":"Product","categoryId":"${category_id}"},"operationName":"productSearch"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_product_search_by_text_and_category_id.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-+        <stringProp name="VAR">graphql_search_products_query_total_count</stringProp>
-+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
-+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count");
-+
-+if (totalCount == null) {
-+        Failure = true;
-+        FailureMessage = "Not Expected \"totalCount\" to be null";
-+} else {
-+	if (Integer.parseInt(totalCount) &lt; 1) {
-+   Failure = true;
-+   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
-+	} else {
-+		Failure = false;
-+	}
-+}
-+
-+
-+</stringProp>
-+        <stringProp name="BeanShellAssertion.filename"/>
-+        <stringProp name="BeanShellAssertion.parameters"/>
-+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-+      </BeanShellAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Url Info by url_key" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">&#xD;
-+            {"query":"query resolveUrl($urlKey: String!) {\n    urlResolver(url: $urlKey) {\n        type\n        id\n    }\n}","variables":{"urlKey":"${category_url_key}${url_suffix}"},"operationName":"resolveUrl"}&#xD;
-+            </stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_url_info_by_url_key.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1062388959">{"type":"CATEGORY","id":${category_id}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get List of Products by category_id" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query category($id: Int!, $currentPage: Int, $pageSize: Int) {\n  category(id: $id) {\n    product_count\n    description\n    url_key\n    name\n    id\n    breadcrumbs {\n      category_name\n      category_url_key\n      __typename\n    }\n    products(pageSize: $pageSize, currentPage: $currentPage) {\n      total_count\n      items {\n        id\n        name\n        # small_image\n        # short_description\n        url_key\n        special_price\n        special_from_date\n        special_to_date\n        price {\n          regularPrice {\n            amount {\n              value\n              currency\n              __typename\n            }\n            __typename\n          }\n          __typename\n        }\n        __typename\n      }\n      __typename\n    }\n    __typename\n  }\n}\n","variables":{"id":${category_id},"currentPage":1,"pageSize":12},"operationName":"category"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_list_of_products_by_category_id.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"name":"${category_name}","id":${category_id},</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("configurable_products_list").size());
-+product = props.get("configurable_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by name" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by product_url_key" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productDetail($urlKey: String, $onServer: Boolean!) {\n    productDetail: products(filter: { url_key: { eq: $urlKey } }) {\n        items {\n            sku\n            name\n            price {\n                regularPrice {\n                    amount {\n                        currency\n                        value\n                    }\n                }\n            }\n            description {html}\n            media_gallery_entries {\n                label\n                position\n                disabled\n                file\n            }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            # Yes, Products have `meta_keyword` and\n            # everything else has `meta_keywords`.\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"urlKey":"${product_url_key}","onServer":false},"operationName":"productDetail"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_product_url_key.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Simple Product Details by name" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productDetail($name: String, $onServer: Boolean!) {\n    productDetail: products(filter: { name: { eq: $name } }) {\n        items {\n            sku\n            name\n            price {\n                regularPrice {\n                    amount {\n                        currency\n                        value\n                    }\n                }\n            }\n            description {html}\n            media_gallery_entries {\n                label\n                position\n                disabled\n                file\n            }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            # Yes, Products have `meta_keyword` and\n            # everything else has `meta_keywords`.\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetail"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_simple_product_details_by_name.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Simple Product Details by product_url_key" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productDetail($urlKey: String, $onServer: Boolean!) {\n    productDetail: products(filter: { url_key: { eq: $urlKey } }) {\n        items {\n            sku\n            name\n            price {\n                regularPrice {\n                    amount {\n                        currency\n                        value\n                    }\n                }\n            }\n            description {html}\n            media_gallery_entries {\n                label\n                position\n                disabled\n                file\n            }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            # Yes, Products have `meta_keyword` and\n            # everything else has `meta_keywords`.\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"urlKey":"${product_url_key}","onServer":false},"operationName":"productDetail"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_simple_product_details_by_product_url_key.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare CMS Page" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var cmsPages = props.get("cms_pages");
-+var number = random.nextInt(cmsPages.length);
-+
-+vars.put("cms_page_id", cmsPages[number].id);
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/prepare_cms_page.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cms Page by id" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">
-+           {"query":"query getCmsPage($id: Int!, $onServer: Boolean!) {\n  cmsPage(id: $id) {\n    url_key\n    content\n    content_heading\n    title\n    page_layout\n    meta_title @include(if: $onServer)\n    meta_keywords @include(if: $onServer)\n    meta_description @include(if: $onServer)\n  }\n}","variables":{"id":${cms_page_id},"onServer":false},"operationName":"getCmsPage"}
-+            </stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_get_cms_page_by_id.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
-+        <stringProp name="JSON_PATH">$.data.cmsPage.url_key</stringProp>
-+        <stringProp name="EXPECTED_VALUE">${cms_page_id}</stringProp>
-+        <boolProp name="JSONVALIDATION">false</boolProp>
-+        <boolProp name="EXPECT_NULL">false</boolProp>
-+        <boolProp name="INVERT">false</boolProp>
-+        <boolProp name="ISREGEX">false</boolProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Checkout By Guest" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${graphqlCheckoutByGuestPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "GraphQL Checkout By Guest");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">quote_id</stringProp>
-+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Empty Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_empty_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1901638450">{"data":{"cart":{"items":[]}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("configurable_products_list").size());
-+product = props.get("configurable_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by name" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract Configurable Product option" enabled="true">
-+      <stringProp name="VAR">product_option</stringProp>
-+      <stringProp name="JSONPATH">$.data.products.items[0].variants[0].product.sku</stringProp>
-+      <stringProp name="DEFAULT"/>
-+      <stringProp name="VARIABLE"/>
-+      <stringProp name="SUBJECT">BODY</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/extract_configurable_product_option.jmx</stringProp></com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Configurable Product To Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  addConfigurableProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_items: [\n        {\n          variant_sku: \"${product_option}\"\n          data: {\n            quantity: 2\n            sku: \"${product_option}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        id\n        quantity\n        product {\n          name\n          sku\n        }\n        ... on ConfigurableCartItem {\n          configurable_options {\n            option_label\n          }\n        }\n    }\n  }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_configurable_product_to_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1421843282">addConfigurableProductsToCart</stringProp>
-+          <stringProp name="675049292">"sku":"${product_option}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Simple Product To Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {  \n  addSimpleProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_items: [\n        {\n          data: {\n            quantity: 2\n            sku: \"${product_sku}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        quantity\n        product {\n          sku\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_simple_product_to_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1421843282">addSimpleProductsToCart</stringProp>
-+          <stringProp name="-1173443935">"sku":"${product_sku}"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Billing Address On Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  setBillingAddressOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      billing_address: {\n        address: {\n          firstname: \"test firstname\"\n          lastname: \"test lastname\"\n          company: \"test company\"\n          street: [\"test street 1\", \"test street 2\"]\n          city: \"test city\"\n          region: \"test region\"\n          postcode: \"887766\"\n          country_code: \"US\"\n          telephone: \"88776655\"\n          save_in_address_book: false\n        }\n      }\n    }\n  ) {\n    cart {\n      billing_address {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_billing_address_on_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1147076914">{"data":{"setBillingAddressOnCart":{"cart":{"billing_address":{"firstname":"test firstname","lastname":"test lastname","company":"test company","street":["test street 1","test street 2"],"city":"test city","postcode":"887766","telephone":"88776655","country":{"code":"US","label":"US"}}}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Shipping Address On Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingAddressesOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      shipping_addresses: [\n        {\n          address: {\n            firstname: \"test firstname\"\n            lastname: \"test lastname\"\n            company: \"test company\"\n            street: [\"test street 1\", \"test street 2\"]\n            city: \"test city\"\n            region: \"test region\"\n            postcode: \"887766\"\n            country_code: \"US\"\n            telephone: \"88776655\"\n            save_in_address_book: false\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      shipping_addresses {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_shipping_address_on_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1671866339">{"data":{"setShippingAddressesOnCart":{"cart":{"shipping_addresses":[{"firstname":"test firstname","lastname":"test lastname","company":"test company","street":["test street 1","test street 2"],"city":"test city","postcode":"887766","telephone":"88776655","country":{"code":"US","label":"US"}}]}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Payment Method On Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  setPaymentMethodOnCart(input: {\n    cart_id: \"${quote_id}\", \n    payment_method: {\n      code: \"checkmo\"\n    }\n  }) {\n    cart {\n      selected_payment_method {\n        code\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_payment_method_on_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1830199373">{"data":{"setPaymentMethodOnCart":{"cart":{"selected_payment_method":{"code":"checkmo"}}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Current Shipping Address" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    shipping_addresses {\n      postcode\n      }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_current_shipping_address.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Shipping Method On Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingMethodsOnCart(input: \n    {\n      cart_id: \"${quote_id}\", \n      shipping_methods: [{\n        carrier_code: \"flatrate\"\n        method_code: \"flatrate\"\n      }]\n    }) {\n    cart {\n      shipping_addresses {\n        selected_shipping_method {\n          carrier_code\n          method_code\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_shipping_method_on_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="644143859">{"data":{"setShippingMethodsOnCart":{"cart":{"shipping_addresses":[{"selected_shipping_method":{"carrier_code":"flatrate","method_code":"flatrate"}}]}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Coupon Code Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var coupons = props.get("coupon_codes");
-+number = random.nextInt(coupons.length);
-+
-+vars.put("coupon_code", coupons[number].code);
-+        </stringProp>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_coupon_code_setup.jmx</stringProp>
-+    </JSR223Sampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Apply Coupon To Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  applyCouponToCart(input: {cart_id: \"${quote_id}\", coupon_code: \"${coupon_code}\"}) {\n    cart {\n      applied_coupon {\n        code\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/apply_coupon_to_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1026466978">{"data":{"applyCouponToCart":{"cart":{"applied_coupon":{"code":"${coupon_code}"}}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Remove Coupon From Cart" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"query":"mutation {\n  removeCouponFromCart(input: {cart_id: \"${quote_id}\"}) {\n    cart {\n      applied_coupon {\n        code\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/remove_coupon_from_cart.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-76201335">{"data":{"removeCouponFromCart":{"cart":{"applied_coupon":null}}}}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+
-+  </hashTree>
-+
-+    
-+        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Combined Benchmark Pool" enabled="true">
-+            <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-+            <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-+                <boolProp name="LoopController.continue_forever">false</boolProp>
-+                <stringProp name="LoopController.loops">${loops}</stringProp>
-+            </elementProp>
-+            <stringProp name="ThreadGroup.num_threads">${combinedBenchmarkPoolUsers}</stringProp>
-+            <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp>
-+            <longProp name="ThreadGroup.start_time">1505803944000</longProp>
-+            <longProp name="ThreadGroup.end_time">1505803944000</longProp>
-+            <boolProp name="ThreadGroup.scheduler">false</boolProp>
-+            <stringProp name="ThreadGroup.duration"/>
-+            <stringProp name="ThreadGroup.delay"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
-+        <hashTree>
-+    <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Cache hit miss" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">var cacheHitPercent = vars.get("cache_hits_percentage");
-+
-+if (
-+	cacheHitPercent &lt; 100 &amp;&amp;
-+	sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+	doCache();
-+}
-+
-+function doCache(){
-+	var random = Math.random() * 100;
-+	if (cacheHitPercent &lt; random) {
-+		sampler.setPath(sampler.getPath() + "?cacheModifier=" + Math.random().toString(36).substring(2, 13));
-+	}
-+}
-+</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/cache_hit_miss.jmx</stringProp></JSR223PreProcessor>
-+    <hashTree/>
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Catalog Browsing By Guest" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cBrowseCatalogByGuestPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Catalog Browsing By Guest");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies">
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit">
-+          <stringProp name="Cookie.value">30</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">/</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="form_key">
-+          <stringProp name="Cookie.value">${form_key}</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">${base_path}</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+      </collectionProp>
-+      <boolProp name="CookieManager.clearEachIteration">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
-+
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_home_page.jmx</stringProp></HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="571386695">&lt;title&gt;Home page&lt;/title&gt;</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Category" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_category.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1210004667">&lt;span class="base" data-ui-id="page-title"&gt;${category_name}&lt;/span&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">6</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract category id" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">category_id</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;li class="item category([^'"]+)"&gt;\s*&lt;strong&gt;${category_name}&lt;/strong&gt;\s*&lt;/li&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="Scope.variable">simple_product_1_url_key</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert category id" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1191417111">^[0-9]+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">category_id</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="View Simple Products" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">2</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    </hashTree>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="View Configurable Products" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">1</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("configurable_products_list").size());
-+product = props.get("configurable_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Site Search" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cSiteSearchPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Site Search");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="Search Terms" enabled="true">
-+      <stringProp name="filename">${files_folder}search_terms.csv</stringProp>
-+      <stringProp name="fileEncoding">UTF-8</stringProp>
-+      <stringProp name="variableNames"/>
-+      <stringProp name="delimiter">,</stringProp>
-+      <boolProp name="quotedData">false</boolProp>
-+      <boolProp name="recycle">true</boolProp>
-+      <boolProp name="stopThread">false</boolProp>
-+      <stringProp name="shareMode">shareMode.thread</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/search_terms.jmx</stringProp></CSVDataSet>
-+    <hashTree/>
-+  
-+    <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Cache hit miss" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">var cacheHitPercent = vars.get("cache_hits_percentage");
-+
-+if (
-+	cacheHitPercent &lt; 100 &amp;&amp;
-+	sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+	doCache();
-+}
-+
-+function doCache(){
-+	var random = Math.random() * 100;
-+	if (cacheHitPercent &lt; random) {
-+		sampler.setPath(sampler.getPath() + "?cacheModifier=" + Math.random().toString(36).substring(2, 13));
-+	}
-+}
-+</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/cache_hit_miss.jmx</stringProp></JSR223PreProcessor>
-+    <hashTree/>
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Quick Search" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${searchQuickPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "Quick Search");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies">
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit">
-+          <stringProp name="Cookie.value">30</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">/</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="form_key">
-+          <stringProp name="Cookie.value">${form_key}</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">${base_path}</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+      </collectionProp>
-+      <boolProp name="CookieManager.clearEachIteration">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_home_page.jmx</stringProp></HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="571386695">&lt;title&gt;Home page&lt;/title&gt;</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="q" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.name">q</stringProp>
-+            <stringProp name="Argument.value">${searchTerm}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}catalogsearch/result/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/search_quick.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert search result" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="56511661">Search results for: </stringProp>
-+          <stringProp name="1533671447">&lt;span class="toolbar-number"&gt;\d&lt;\/span&gt; Items|Items &lt;span class="toolbar-number"&gt;1</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product url keys" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">product_url_keys</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;a class="product-item-link"(?s).+?href="(?:http|https)://${host}${base_path}(index.php/)?([^'"]+)${url_suffix}"&gt;(?s).</stringProp>
-+        <stringProp name="RegexExtractor.template">$2$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: isPageCacheable" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">isPageCacheable</stringProp>
-+        <stringProp name="RegexExtractor.regex">catalogsearch/searchTermsLog/save</stringProp>
-+        <stringProp name="RegexExtractor.template">$0$</stringProp>
-+        <stringProp name="RegexExtractor.default">0</stringProp>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+    </hashTree>
-+  
-+      <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
-+        <stringProp name="IfController.condition">"${isPageCacheable}" != "0"</stringProp>
-+        <boolProp name="IfController.evaluateAll">false</boolProp>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/if_page_cacheable_controller.jmx</stringProp></IfController>
-+    <hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search Terms Log" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="q" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">q</stringProp>
-+              <stringProp name="Argument.value">${searchTerm}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}catalogsearch/searchTermsLog/save/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/search_terms_log_save.jmx</stringProp>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert search result" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-547797305">"success":true</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+  </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+foundProducts = Integer.parseInt(vars.get("product_url_keys_matchNr"));
-+
-+if (foundProducts &gt; 3) {
-+	foundProducts = 3;
-+}
-+
-+vars.put("foundProducts", String.valueOf(foundProducts));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/set_found_items.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="View Searched Products" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">${foundProducts}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Product Data" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/searched_products_setup.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+number = vars.get("_counter");
-+product = vars.get("product_url_keys_"+number);
-+
-+vars.put("product_url_key", product);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Quick Search With Filtration" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${searchQuickFilterPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "Quick Search With Filtration");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies">
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit">
-+          <stringProp name="Cookie.value">30</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">/</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="form_key">
-+          <stringProp name="Cookie.value">${form_key}</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">${base_path}</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+      </collectionProp>
-+      <boolProp name="CookieManager.clearEachIteration">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_home_page.jmx</stringProp></HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="571386695">&lt;title&gt;Home page&lt;/title&gt;</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="q" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.name">q</stringProp>
-+            <stringProp name="Argument.value">${searchTerm}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol"/>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}catalogsearch/result/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/search_quick_filter.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert search result" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="56511661">Search results for: </stringProp>
-+          <stringProp name="1533671447">Items &lt;span class="toolbar-number"&gt;1</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="Extract number of attribute 1 options" enabled="true">
-+        <stringProp name="XPathExtractor.default">0</stringProp>
-+        <stringProp name="XPathExtractor.refname">attribute_1_options_count</stringProp>
-+        <stringProp name="XPathExtractor.xpathQuery">count((//div[@class="filter-options-content"])[1]//li[@class="item"])</stringProp>
-+        <boolProp name="XPathExtractor.validate">false</boolProp>
-+        <boolProp name="XPathExtractor.tolerant">true</boolProp>
-+        <boolProp name="XPathExtractor.namespace">false</boolProp>
-+      </XPathExtractor>
-+      <hashTree/>
-+      <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="Extract number of attribute 2 options" enabled="true">
-+        <stringProp name="XPathExtractor.default">0</stringProp>
-+        <stringProp name="XPathExtractor.refname">attribute_2_options_count</stringProp>
-+        <stringProp name="XPathExtractor.xpathQuery">count((//div[@class="filter-options-content"])[2]//li[@class="item"])</stringProp>
-+        <boolProp name="XPathExtractor.validate">false</boolProp>
-+        <boolProp name="XPathExtractor.tolerant">true</boolProp>
-+        <boolProp name="XPathExtractor.namespace">false</boolProp>
-+      </XPathExtractor>
-+      <hashTree/>
-+      <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="Extract filter link from layered navigation" enabled="true">
-+        <stringProp name="XPathExtractor.default"/>
-+        <stringProp name="XPathExtractor.refname">attribute_1_filter_url</stringProp>
-+        <stringProp name="XPathExtractor.xpathQuery">((//div[@class="filter-options-content"])[1]//li[@class="item"]//a)[1]/@href</stringProp>
-+        <boolProp name="XPathExtractor.validate">false</boolProp>
-+        <boolProp name="XPathExtractor.tolerant">true</boolProp>
-+        <boolProp name="XPathExtractor.namespace">false</boolProp>
-+      </XPathExtractor>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract product url keys" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">product_url_keys</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;a class="product-item-link"(?s).+?href="http://${host}${base_path}(index.php/)?([^'"]+)${url_suffix}"&gt;(?s).</stringProp>
-+        <stringProp name="RegexExtractor.template">$2$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: isPageCacheable" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">isPageCacheable</stringProp>
-+        <stringProp name="RegexExtractor.regex">catalogsearch/searchTermsLog/save</stringProp>
-+        <stringProp name="RegexExtractor.template">$0$</stringProp>
-+        <stringProp name="RegexExtractor.default">0</stringProp>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+    </hashTree>
-+  
-+      <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
-+        <stringProp name="IfController.condition">"${isPageCacheable}" != "0"</stringProp>
-+        <boolProp name="IfController.evaluateAll">false</boolProp>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/if_page_cacheable_controller.jmx</stringProp></IfController>
-+    <hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search Terms Log" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="q" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">q</stringProp>
-+              <stringProp name="Argument.value">${searchTerm}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}catalogsearch/searchTermsLog/save/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/search_terms_log_save.jmx</stringProp>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert search result" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-547797305">"success":true</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+  </hashTree>
-+  
-+    <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Attribute 1 present in layered navigation" enabled="true">
-+      <stringProp name="IfController.condition">${attribute_1_options_count} &gt; 0</stringProp>
-+      <boolProp name="IfController.evaluateAll">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/search_quick_filter-first-attribute.jmx</stringProp></IfController>
-+    <hashTree>
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Search Url 2" enabled="true">
-+        <stringProp name="BeanShellSampler.query">vars.put("search_url", vars.get("attribute_1_filter_url"));</stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Filter by Attribute 1" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol"/>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${attribute_1_filter_url}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert search result" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="56511661">Search results for: </stringProp>
-+            <stringProp name="1420634794">&lt;span class="toolbar-number"&gt;[1-9]+</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="Extract number of attribute 2 options" enabled="true">
-+          <stringProp name="XPathExtractor.default">0</stringProp>
-+          <stringProp name="XPathExtractor.refname">attribute_2_options_count</stringProp>
-+          <stringProp name="XPathExtractor.xpathQuery">count((//div[@class="filter-options-content"])[2]//li[@class="item"])</stringProp>
-+          <boolProp name="XPathExtractor.validate">false</boolProp>
-+          <boolProp name="XPathExtractor.tolerant">true</boolProp>
-+          <boolProp name="XPathExtractor.namespace">false</boolProp>
-+        </XPathExtractor>
-+        <hashTree/>
-+        <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="Extract filter link from layered navigation" enabled="true">
-+          <stringProp name="XPathExtractor.default"/>
-+          <stringProp name="XPathExtractor.refname">attribute_2_filter_url</stringProp>
-+          <stringProp name="XPathExtractor.xpathQuery">((//div[@class="filter-options-content"])[2]//li[@class="item"]//a)[1]/@href</stringProp>
-+          <boolProp name="XPathExtractor.validate">false</boolProp>
-+          <boolProp name="XPathExtractor.tolerant">true</boolProp>
-+          <boolProp name="XPathExtractor.namespace">false</boolProp>
-+        </XPathExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract product url keys" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">product_url_keys</stringProp>
-+          <stringProp name="RegexExtractor.regex">&lt;a class="product-item-link"(?s).+?href="http://${host}${base_path}(index.php/)?([^'"]+)${url_suffix}"&gt;(?s).</stringProp>
-+          <stringProp name="RegexExtractor.template">$2$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+      </hashTree>
-+    </hashTree>
-+  
-+    <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Attribute 2 present in layered navigation" enabled="true">
-+      <stringProp name="IfController.condition">${attribute_2_options_count} &gt; 0</stringProp>
-+      <boolProp name="IfController.evaluateAll">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/search_quick_filter-second-attribute.jmx</stringProp></IfController>
-+    <hashTree>
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Search Ul 3" enabled="true">
-+        <stringProp name="BeanShellSampler.query">vars.put("search_url", vars.get("attribute_2_filter_url"));</stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Filter by Attribute 2" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol"/>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${attribute_2_filter_url}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert search result" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="56511661">Search results for: </stringProp>
-+            <stringProp name="1420634794">&lt;span class="toolbar-number"&gt;[1-9]+</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract product url keys" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">product_url_keys</stringProp>
-+          <stringProp name="RegexExtractor.regex">&lt;a class="product-item-link"(?s).+?href="http://${host}${base_path}(index.php/)?([^'"]+)${url_suffix}"&gt;(?s).</stringProp>
-+          <stringProp name="RegexExtractor.template">$2$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+      </hashTree>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+foundProducts = Integer.parseInt(vars.get("product_url_keys_matchNr"));
-+
-+if (foundProducts &gt; 3) {
-+	foundProducts = 3;
-+}
-+
-+vars.put("foundProducts", String.valueOf(foundProducts));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/set_found_items.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="View Searched Products" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">${foundProducts}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Product Data" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/searched_products_setup.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+number = vars.get("_counter");
-+product = vars.get("product_url_keys_"+number);
-+
-+vars.put("product_url_key", product);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Advanced Search" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${searchAdvancedPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "Advanced Search");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies">
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit">
-+          <stringProp name="Cookie.value">30</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">/</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="form_key">
-+          <stringProp name="Cookie.value">${form_key}</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">${base_path}</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+      </collectionProp>
-+      <boolProp name="CookieManager.clearEachIteration">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_home_page.jmx</stringProp></HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="571386695">&lt;title&gt;Home page&lt;/title&gt;</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+  
-+
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Advanced Search" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol"/>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}catalogsearch/advanced/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/open_advanced_search_page.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="921122077">&lt;title&gt;Advanced Search&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="Extract attribute name" enabled="true">
-+        <stringProp name="XPathExtractor.default"/>
-+        <stringProp name="XPathExtractor.refname">attribute_name</stringProp>
-+        <stringProp name="XPathExtractor.xpathQuery">(//select[@class="multiselect"])[last()]/@name</stringProp>
-+        <boolProp name="XPathExtractor.validate">false</boolProp>
-+        <boolProp name="XPathExtractor.tolerant">true</boolProp>
-+        <boolProp name="XPathExtractor.namespace">false</boolProp>
-+      </XPathExtractor>
-+      <hashTree/>
-+      <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="Extract attribute options count" enabled="true">
-+        <stringProp name="XPathExtractor.default">0</stringProp>
-+        <stringProp name="XPathExtractor.refname">attribute_options_count</stringProp>
-+        <stringProp name="XPathExtractor.xpathQuery">count((//select[@class="multiselect"])[last()]/option)</stringProp>
-+        <boolProp name="XPathExtractor.validate">false</boolProp>
-+        <boolProp name="XPathExtractor.tolerant">true</boolProp>
-+        <boolProp name="XPathExtractor.namespace">false</boolProp>
-+      </XPathExtractor>
-+      <hashTree/>
-+      <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="Extract attribute value" enabled="true">
-+        <stringProp name="XPathExtractor.default"/>
-+        <stringProp name="XPathExtractor.refname">attribute_value</stringProp>
-+        <stringProp name="XPathExtractor.xpathQuery">((//select[@class="multiselect"])[last()]/option)[1]/@value</stringProp>
-+        <boolProp name="XPathExtractor.validate">false</boolProp>
-+        <boolProp name="XPathExtractor.tolerant">true</boolProp>
-+        <boolProp name="XPathExtractor.namespace">false</boolProp>
-+      </XPathExtractor>
-+      <hashTree/>
-+    </hashTree>
-+
-+
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="name" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.name">name</stringProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          </elementProp>
-+          <elementProp name="sku" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.name">sku</stringProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          </elementProp>
-+          <elementProp name="description" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.name">description</stringProp>
-+            <stringProp name="Argument.value">${searchTerm}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          </elementProp>
-+          <elementProp name="short_description" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.name">short_description</stringProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          </elementProp>
-+          <elementProp name="price%5Bfrom%5D" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.name">price%5Bfrom%5D</stringProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          </elementProp>
-+          <elementProp name="price%5Bto%5D" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.name">price%5Bto%5D</stringProp>
-+            <stringProp name="Argument.value">${priceTo}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          </elementProp>
-+          <!-- Should be fixed in MAGETWO-80420 -->
-+          <!--<elementProp name="${attribute_name}" elementType="HTTPArgument">-->
-+            <!--<boolProp name="HTTPArgument.always_encode">true</boolProp>-->
-+            <!--<stringProp name="Argument.value">${attribute_value}</stringProp>-->
-+            <!--<stringProp name="Argument.metadata">=</stringProp>-->
-+            <!--<boolProp name="HTTPArgument.use_equals">true</boolProp>-->
-+            <!--<stringProp name="Argument.name">${attribute_name}</stringProp>-->
-+          <!--</elementProp>-->
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}catalogsearch/advanced/result/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/search_advanced.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert search result" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1851531284">items&lt;/strong&gt; were found using the following search criteria</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product url keys" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">product_url_keys</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;a class="product-item-link"(?s).+?href="(?:http|https)://${host}${base_path}(index.php/)?([^'"]+)${url_suffix}"&gt;(?s).</stringProp>
-+        <stringProp name="RegexExtractor.template">$2$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+foundProducts = Integer.parseInt(vars.get("product_url_keys_matchNr"));
-+
-+if (foundProducts &gt; 3) {
-+	foundProducts = 3;
-+}
-+
-+vars.put("foundProducts", String.valueOf(foundProducts));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/set_found_items.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="View Searched Products" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">${foundProducts}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Product Data" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/searched_products_setup.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+number = vars.get("_counter");
-+product = vars.get("product_url_keys_"+number);
-+
-+vars.put("product_url_key", product);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    </hashTree>
-+  </hashTree>
-+
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Add To Cart By Guest" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAddToCartByGuestPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Add To Cart By Guest");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies">
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit">
-+          <stringProp name="Cookie.value">30</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">/</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="form_key">
-+          <stringProp name="Cookie.value">${form_key}</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">${base_path}</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+      </collectionProp>
-+      <boolProp name="CookieManager.clearEachIteration">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Total Products In Cart" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_total_products_in_cart_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+vars.put("totalProductsAdded", "0");
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
-+
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_home_page.jmx</stringProp></HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="571386695">&lt;title&gt;Home page&lt;/title&gt;</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Category" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_category.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1210004667">&lt;span class="base" data-ui-id="page-title"&gt;${category_name}&lt;/span&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">6</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract category id" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">category_id</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;li class="item category([^'"]+)"&gt;\s*&lt;strong&gt;${category_name}&lt;/strong&gt;\s*&lt;/li&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="Scope.variable">simple_product_1_url_key</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert category id" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1191417111">^[0-9]+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">category_id</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Add Simple Products to Cart" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">2</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Update Products Added Counter" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loops/update_products_added_counter.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+productsAdded = Integer.parseInt(vars.get("totalProductsAdded"));
-+productsAdded = productsAdded + 1;
-+
-+vars.put("totalProductsAdded", String.valueOf(productsAdded));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product ${_counter} Add To Cart" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product</stringProp>
-+          </elementProp>
-+          <elementProp name="related_product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">related_product</stringProp>
-+          </elementProp>
-+          <elementProp name="qty" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">qty</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_product_add_to_cart.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">X-Requested-With</stringProp>
-+          <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/http_header_manager_ajax.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Load Cart Section ${_counter}" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="sections" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">cart,messages</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sections</stringProp>
-+          </elementProp>
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-+          </elementProp>
-+          <elementProp name="_" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">_</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/load_cart_section.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2057973164">This product is out of stock.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">6</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-350323027">\"summary_count\":${totalProductsAdded}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">X-Requested-With</stringProp>
-+          <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/http_header_manager_ajax.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Add Configurable Products to Cart" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">1</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("configurable_products_list").size());
-+product = props.get("configurable_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Update Products Added Counter" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loops/update_products_added_counter.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+productsAdded = Integer.parseInt(vars.get("totalProductsAdded"));
-+productsAdded = productsAdded + 1;
-+
-+vars.put("totalProductsAdded", String.valueOf(productsAdded));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="SetUp - Get Configurable Product Options" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">1</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/get_configurable_product_options.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+        <collectionProp name="HeaderManager.headers">
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Content-Type</stringProp>
-+            <stringProp name="Header.value">application/json</stringProp>
-+          </elementProp>
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Accept</stringProp>
-+            <stringProp name="Header.value">*/*</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </HeaderManager>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-+        <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+              <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-+          <stringProp name="VAR">admin_token</stringProp>
-+          <stringProp name="JSONPATH">$</stringProp>
-+          <stringProp name="DEFAULT"/>
-+          <stringProp name="VARIABLE"/>
-+          <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_token</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+        <collectionProp name="HeaderManager.headers">
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Authorization</stringProp>
-+            <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </HeaderManager>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Options" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}rest/V1/configurable-products/${product_sku}/options/all</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="JSON Path Extractor: Extract attribute_ids" enabled="true">
-+          <stringProp name="VAR">attribute_ids</stringProp>
-+          <stringProp name="JSONPATH">$.[*].attribute_id</stringProp>
-+          <stringProp name="DEFAULT">NO_VALUE</stringProp>
-+          <stringProp name="VARIABLE"/>
-+          <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="JSON Path Extractor: Extract option_values" enabled="true">
-+          <stringProp name="VAR">option_values</stringProp>
-+          <stringProp name="JSONPATH">$.[*].values[0].value_index</stringProp>
-+          <stringProp name="DEFAULT">NO_VALUE</stringProp>
-+          <stringProp name="VARIABLE"/>
-+          <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+      </hashTree>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product ${_counter} Add To Cart" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product</stringProp>
-+          </elementProp>
-+          <elementProp name="related_product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">related_product</stringProp>
-+          </elementProp>
-+          <elementProp name="qty" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">qty</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_product_add_to_cart.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+        <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
-+                <boolProp name="resetInterpreter">false</boolProp>
-+                <stringProp name="parameters"/>
-+                <stringProp name="filename"/>
-+                <stringProp name="script">
-+                    try {
-+                    attribute_ids = vars.get("attribute_ids");
-+                    option_values = vars.get("option_values");
-+                    attribute_ids = attribute_ids.replace("[","").replace("]","").replace("\"", "");
-+                    option_values = option_values.replace("[","").replace("]","").replace("\"", "");
-+                    attribute_ids_array = attribute_ids.split(",");
-+                    option_values_array = option_values.split(",");
-+                    args = ctx.getCurrentSampler().getArguments();
-+                    it = args.iterator();
-+                    while (it.hasNext()) {
-+                        argument = it.next();
-+                        if (argument.getStringValue().contains("${")) {
-+                            args.removeArgument(argument.getName());
-+                        }
-+                    }
-+                    for (int i = 0; i &lt; attribute_ids_array.length; i++) {
-+                        ctx.getCurrentSampler().addArgument("super_attribute[" + attribute_ids_array[i] + "]", option_values_array[i]);
-+                    }
-+                    } catch (Exception e) {
-+                        log.error("eror&#x2026;", e);
-+                    }
-+                </stringProp>
-+              <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/configurable_product_add_to_cart_preprocessor.jmx</stringProp></BeanShellPreProcessor>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">X-Requested-With</stringProp>
-+          <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/http_header_manager_ajax.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Load Cart Section ${_counter}" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="sections" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">cart,messages</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sections</stringProp>
-+          </elementProp>
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-+          </elementProp>
-+          <elementProp name="_" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">_</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/load_cart_section.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2057973164">This product is out of stock.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">6</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-350323027">\"summary_count\":${totalProductsAdded}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">X-Requested-With</stringProp>
-+          <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/http_header_manager_ajax.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Add to Wishlist" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAddToWishlistPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Add to Wishlist");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies">
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit">
-+          <stringProp name="Cookie.value">30</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">/</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="form_key">
-+          <stringProp name="Cookie.value">${form_key}</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">${base_path}</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+      </collectionProp>
-+      <boolProp name="CookieManager.clearEachIteration">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Get Customer Email" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Customer Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_customer_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+customerUserList = props.get("customer_emails_list");
-+customerUser = customerUserList.poll();
-+if (customerUser == null) {
-+  SampleResult.setResponseMessage("customernUser list is empty");
-+  SampleResult.setResponseData("customerUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("customer_email", customerUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Login Page" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/account/login/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_login_page.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="637394530">&lt;title&gt;Customer Login&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${customer_email}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${customer_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="send" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">send</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/account/loginPost/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1312950388">&lt;title&gt;My Account&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Address" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">addressId</stringProp>
-+        <stringProp name="RegexExtractor.regex">customer/address/edit/id/([^'"]+)/</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert addressId extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">addressId</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Load Customer Private Data" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="sections" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sections</stringProp>
-+          </elementProp>
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">false</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-+          </elementProp>
-+          <elementProp name="_" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">_</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    </HTTPSamplerProxy>
-+    <hashTree/>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Add Produts to Wishlist" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">5</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product ${_counter} Add To Wishlist" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="uenc" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${product_uenc}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">uenc</stringProp>
-+            </elementProp>
-+            <elementProp name="product" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}wishlist/index/add/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/wishlist/add_to_wishlist.jmx</stringProp></HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-1907714722">&lt;title&gt;My Wish List&lt;/title&gt;</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">16</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">wishListItems</stringProp>
-+          <stringProp name="RegexExtractor.regex">data-post-remove='\{"action":"(.+)\/wishlist\\/index\\/remove\\/","data":\{"item":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$2$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+      </hashTree>
-+  
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Load Wishlist Section ${_counter}" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="sections" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">wishlist,messages</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">sections</stringProp>
-+            </elementProp>
-+            <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">false</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-+            </elementProp>
-+            <elementProp name="_" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">_</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/wishlist/load_wishlist_section.jmx</stringProp></HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-1865430343">{"wishlist":{"counter":"</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">16</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true">
-+          <stringProp name="ConstantTimer.delay">${wishlistDelay}*1000</stringProp>
-+        </ConstantTimer>
-+        <hashTree/>
-+      </hashTree>
-+  </hashTree>
-+  
-+    <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: Clear Wishlist" enabled="true">
-+      <stringProp name="ForeachController.inputVal">wishListItems</stringProp>
-+      <stringProp name="ForeachController.returnVal">wishListItem</stringProp>
-+      <boolProp name="ForeachController.useSeparator">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/wishlist/clear_wishlist.jmx</stringProp></ForeachController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end">5</stringProp>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Clear Wishlist ${counter}" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="item" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${wishListItem}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">item</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}wishlist/index/remove/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/account/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1723813687">You are signed out.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Customer to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+customerUserList = props.get("customer_emails_list");
-+customerUserList.add(vars.get("customer_email"));
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Compare Products" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cCompareProductsPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Compare Products");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies">
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit">
-+          <stringProp name="Cookie.value">30</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">/</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="form_key">
-+          <stringProp name="Cookie.value">${form_key}</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">${base_path}</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+      </collectionProp>
-+      <boolProp name="CookieManager.clearEachIteration">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Total Products In Cart" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_total_products_in_cart_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+vars.put("totalProductsAdded", "0");
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
-+
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Category" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_compare/open_category.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1210004667">&lt;span class="base" data-ui-id="page-title"&gt;${category_name}&lt;/span&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">6</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Random Product Id" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">random_product_compare_id</stringProp>
-+        <stringProp name="RegexExtractor.regex">catalog\\/product_compare\\/add\\/\",\"data\":\{\"product\":\"([0-9]+)\"</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Random Product Id" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1191417111">^[0-9]+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">random_product_compare_id</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Add Simple Products to Compare" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">2</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Update Products Added Counter" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loops/update_products_added_counter.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+productsAdded = Integer.parseInt(vars.get("totalProductsAdded"));
-+productsAdded = productsAdded + 1;
-+
-+vars.put("totalProductsAdded", String.valueOf(productsAdded));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product ${_counter} Comparison Add" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="uenc" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${product_uenc}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">uenc</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}catalog/product_compare/add/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_compare/product_compare_add.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Load Compare Product Section" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="sections" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">compare-products,messages</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sections</stringProp>
-+          </elementProp>
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">false</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-+          </elementProp>
-+          <elementProp name="_" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">_</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_compare/customer_section_load_product_compare_add.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-350323027">\"compare-products\":{\"count\":${totalProductsAdded}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Add Configurable Products to Compare" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">1</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("configurable_products_list").size());
-+product = props.get("configurable_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Update Products Added Counter" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loops/update_products_added_counter.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+productsAdded = Integer.parseInt(vars.get("totalProductsAdded"));
-+productsAdded = productsAdded + 1;
-+
-+vars.put("totalProductsAdded", String.valueOf(productsAdded));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product ${_counter} Comparison Add" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="uenc" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${product_uenc}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">uenc</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}catalog/product_compare/add/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_compare/product_compare_add.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Load Compare Product Section" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="sections" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">compare-products,messages</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sections</stringProp>
-+          </elementProp>
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">false</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-+          </elementProp>
-+          <elementProp name="_" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">_</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_compare/customer_section_load_product_compare_add.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-350323027">\"compare-products\":{\"count\":${totalProductsAdded}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Compare Products" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}catalog/product_compare/index/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_compare/compare_products.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree/>
-+  
-+    <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Product Compare - Pause" enabled="true">
-+      <intProp name="ActionProcessor.action">1</intProp>
-+      <intProp name="ActionProcessor.target">0</intProp>
-+      <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${productCompareDelay}*1000))}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_compare/compare_products_pause.jmx</stringProp></TestAction>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Compare Products Clear" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}catalog/product_compare/clear</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_compare/compare_products_clear.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree/>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Checkout By Guest" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cCheckoutByGuestPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Checkout By Guest");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies">
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit">
-+          <stringProp name="Cookie.value">30</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">/</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="form_key">
-+          <stringProp name="Cookie.value">${form_key}</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">${base_path}</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+      </collectionProp>
-+      <boolProp name="CookieManager.clearEachIteration">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Total Products In Cart" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_total_products_in_cart_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+vars.put("totalProductsAdded", "0");
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
-+
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_home_page.jmx</stringProp></HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="571386695">&lt;title&gt;Home page&lt;/title&gt;</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Category" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_category.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1210004667">&lt;span class="base" data-ui-id="page-title"&gt;${category_name}&lt;/span&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">6</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract category id" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">category_id</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;li class="item category([^'"]+)"&gt;\s*&lt;strong&gt;${category_name}&lt;/strong&gt;\s*&lt;/li&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="Scope.variable">simple_product_1_url_key</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert category id" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1191417111">^[0-9]+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">category_id</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Add Simple Products to Cart" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">2</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Update Products Added Counter" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loops/update_products_added_counter.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+productsAdded = Integer.parseInt(vars.get("totalProductsAdded"));
-+productsAdded = productsAdded + 1;
-+
-+vars.put("totalProductsAdded", String.valueOf(productsAdded));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product ${_counter} Add To Cart" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product</stringProp>
-+          </elementProp>
-+          <elementProp name="related_product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">related_product</stringProp>
-+          </elementProp>
-+          <elementProp name="qty" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">qty</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_product_add_to_cart.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">X-Requested-With</stringProp>
-+          <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/http_header_manager_ajax.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Load Cart Section ${_counter}" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="sections" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">cart,messages</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sections</stringProp>
-+          </elementProp>
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-+          </elementProp>
-+          <elementProp name="_" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">_</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/load_cart_section.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2057973164">This product is out of stock.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">6</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-350323027">\"summary_count\":${totalProductsAdded}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">X-Requested-With</stringProp>
-+          <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/http_header_manager_ajax.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Add Configurable Products to Cart" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">1</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("configurable_products_list").size());
-+product = props.get("configurable_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Update Products Added Counter" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loops/update_products_added_counter.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+productsAdded = Integer.parseInt(vars.get("totalProductsAdded"));
-+productsAdded = productsAdded + 1;
-+
-+vars.put("totalProductsAdded", String.valueOf(productsAdded));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="SetUp - Get Configurable Product Options" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">1</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/get_configurable_product_options.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+        <collectionProp name="HeaderManager.headers">
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Content-Type</stringProp>
-+            <stringProp name="Header.value">application/json</stringProp>
-+          </elementProp>
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Accept</stringProp>
-+            <stringProp name="Header.value">*/*</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </HeaderManager>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-+        <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+              <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-+          <stringProp name="VAR">admin_token</stringProp>
-+          <stringProp name="JSONPATH">$</stringProp>
-+          <stringProp name="DEFAULT"/>
-+          <stringProp name="VARIABLE"/>
-+          <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_token</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+        <collectionProp name="HeaderManager.headers">
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Authorization</stringProp>
-+            <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </HeaderManager>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Options" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}rest/V1/configurable-products/${product_sku}/options/all</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="JSON Path Extractor: Extract attribute_ids" enabled="true">
-+          <stringProp name="VAR">attribute_ids</stringProp>
-+          <stringProp name="JSONPATH">$.[*].attribute_id</stringProp>
-+          <stringProp name="DEFAULT">NO_VALUE</stringProp>
-+          <stringProp name="VARIABLE"/>
-+          <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="JSON Path Extractor: Extract option_values" enabled="true">
-+          <stringProp name="VAR">option_values</stringProp>
-+          <stringProp name="JSONPATH">$.[*].values[0].value_index</stringProp>
-+          <stringProp name="DEFAULT">NO_VALUE</stringProp>
-+          <stringProp name="VARIABLE"/>
-+          <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+      </hashTree>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product ${_counter} Add To Cart" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product</stringProp>
-+          </elementProp>
-+          <elementProp name="related_product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">related_product</stringProp>
-+          </elementProp>
-+          <elementProp name="qty" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">qty</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_product_add_to_cart.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+        <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
-+                <boolProp name="resetInterpreter">false</boolProp>
-+                <stringProp name="parameters"/>
-+                <stringProp name="filename"/>
-+                <stringProp name="script">
-+                    try {
-+                    attribute_ids = vars.get("attribute_ids");
-+                    option_values = vars.get("option_values");
-+                    attribute_ids = attribute_ids.replace("[","").replace("]","").replace("\"", "");
-+                    option_values = option_values.replace("[","").replace("]","").replace("\"", "");
-+                    attribute_ids_array = attribute_ids.split(",");
-+                    option_values_array = option_values.split(",");
-+                    args = ctx.getCurrentSampler().getArguments();
-+                    it = args.iterator();
-+                    while (it.hasNext()) {
-+                        argument = it.next();
-+                        if (argument.getStringValue().contains("${")) {
-+                            args.removeArgument(argument.getName());
-+                        }
-+                    }
-+                    for (int i = 0; i &lt; attribute_ids_array.length; i++) {
-+                        ctx.getCurrentSampler().addArgument("super_attribute[" + attribute_ids_array[i] + "]", option_values_array[i]);
-+                    }
-+                    } catch (Exception e) {
-+                        log.error("eror&#x2026;", e);
-+                    }
-+                </stringProp>
-+              <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/configurable_product_add_to_cart_preprocessor.jmx</stringProp></BeanShellPreProcessor>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">X-Requested-With</stringProp>
-+          <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/http_header_manager_ajax.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Load Cart Section ${_counter}" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="sections" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">cart,messages</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sections</stringProp>
-+          </elementProp>
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-+          </elementProp>
-+          <elementProp name="_" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">_</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/load_cart_section.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2057973164">This product is out of stock.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">6</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-350323027">\"summary_count\":${totalProductsAdded}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">X-Requested-With</stringProp>
-+          <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/http_header_manager_ajax.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Checkout" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Get region data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">
-+      vars.put("alabama_region_id", props.get("alabama_region_id"));
-+      vars.put("california_region_id", props.get("california_region_id"));
-+</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/get_region_data.jmx</stringProp></JSR223PreProcessor>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout start" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}checkout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/guest_checkout/checkout_start.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1403911775">&lt;title&gt;Checkout&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-179817969">&lt;title&gt;Shopping Cart&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">6</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Cart Id" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">cart_id</stringProp>
-+        <stringProp name="RegexExtractor.regex">"quoteData":{"entity_id":"([^'"]+)",</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Cart Id extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">cart_id</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout Email Available" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"customerEmail":"test@example.com"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers/isEmailAvailable</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/guest_checkout/checkout_email_available.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+        <collectionProp name="HeaderManager.headers">
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Referer</stringProp>
-+            <stringProp name="Header.value">${base_path}checkout/onepage/</stringProp>
-+          </elementProp>
-+          <elementProp name="Content-Type" elementType="Header">
-+            <stringProp name="Header.name">Content-Type</stringProp>
-+            <stringProp name="Header.value">application/json; charset=UTF-8</stringProp>
-+          </elementProp>
-+          <elementProp name="X-Requested-With" elementType="Header">
-+            <stringProp name="Header.name">X-Requested-With</stringProp>
-+            <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+          </elementProp>
-+          <elementProp name="Accept" elementType="Header">
-+            <stringProp name="Header.name">Accept</stringProp>
-+            <stringProp name="Header.value">application/json</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </HeaderManager>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="3569038">true</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">8</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout Estimate Shipping Methods" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"address":{"country_id":"US","postcode":"95630"}}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/estimate-shipping-methods</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/guest_checkout/checkout_estimate_shipping_methods_with_postal_code.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+        <collectionProp name="HeaderManager.headers">
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Referer</stringProp>
-+            <stringProp name="Header.value">${base_path}checkout/onepage/</stringProp>
-+          </elementProp>
-+          <elementProp name="Content-Type" elementType="Header">
-+            <stringProp name="Header.name">Content-Type</stringProp>
-+            <stringProp name="Header.value">application/json; charset=UTF-8</stringProp>
-+          </elementProp>
-+          <elementProp name="X-Requested-With" elementType="Header">
-+            <stringProp name="Header.name">X-Requested-With</stringProp>
-+            <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+          </elementProp>
-+          <elementProp name="Accept" elementType="Header">
-+            <stringProp name="Header.name">Accept</stringProp>
-+            <stringProp name="Header.value">application/json</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </HeaderManager>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1224567411">"available":true</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout Billing/Shipping Information" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"addressInformation":{"shipping_address":{"countryId":"US","regionId":"${california_region_id}","regionCode":"CA","region":"California","street":["10441 Jefferson Blvd ste 200"],"company":"","telephone":"3109450345","fax":"","postcode":"90232","city":"Culver City","firstname":"Name","lastname":"Lastname"},"shipping_method_code":"flatrate","shipping_carrier_code":"flatrate"}}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/shipping-information</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/guest_checkout/checkout_billing_shipping_information.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+        <collectionProp name="HeaderManager.headers">
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Referer</stringProp>
-+            <stringProp name="Header.value">${base_path}checkout/onepage/</stringProp>
-+          </elementProp>
-+          <elementProp name="Content-Type" elementType="Header">
-+            <stringProp name="Header.name">Content-Type</stringProp>
-+            <stringProp name="Header.value">application/json; charset=UTF-8</stringProp>
-+          </elementProp>
-+          <elementProp name="X-Requested-With" elementType="Header">
-+            <stringProp name="Header.name">X-Requested-With</stringProp>
-+            <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+          </elementProp>
-+          <elementProp name="Accept" elementType="Header">
-+            <stringProp name="Header.name">Accept</stringProp>
-+            <stringProp name="Header.value">application/json</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </HeaderManager>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1494218646">{"payment_methods":</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout Payment Info/Place Order" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"cartId":"${cart_id}","email":"test@example.com","paymentMethod":{"method":"checkmo","po_number":null,"additional_data":null},"billingAddress":{"countryId":"US","regionId":"${california_region_id}","regionCode":"CA","region":"California","street":["10441 Jefferson Blvd ste 200"],"company":"","telephone":"3109450345","fax":"","postcode":"90232","city":"Culver City","firstname":"Name","lastname":"Lastname"}}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/payment-information</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/guest_checkout/checkout_payment_info_place_order.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+        <collectionProp name="HeaderManager.headers">
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Referer</stringProp>
-+            <stringProp name="Header.value">${base_path}checkout/onepage/</stringProp>
-+          </elementProp>
-+          <elementProp name="Content-Type" elementType="Header">
-+            <stringProp name="Header.name">Content-Type</stringProp>
-+            <stringProp name="Header.value">application/json; charset=UTF-8</stringProp>
-+          </elementProp>
-+          <elementProp name="X-Requested-With" elementType="Header">
-+            <stringProp name="Header.name">X-Requested-With</stringProp>
-+            <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+          </elementProp>
-+          <elementProp name="Accept" elementType="Header">
-+            <stringProp name="Header.name">Accept</stringProp>
-+            <stringProp name="Header.value">application/json</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </HeaderManager>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-297987887">"[0-9]+"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-+        <stringProp name="VAR">order_id</stringProp>
-+        <stringProp name="JSONPATH">$</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="89649215">^\d+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">order_id</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout success" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/success/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/guest_checkout/checkout_success.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="494863233">Thank you for your purchase!</stringProp>
-+          <stringProp name="1635682758">Your order # is</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Checkout By Customer" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cCheckoutByCustomerPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Checkout By Customer");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies">
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit">
-+          <stringProp name="Cookie.value">30</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">/</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="form_key">
-+          <stringProp name="Cookie.value">${form_key}</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">${base_path}</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+      </collectionProp>
-+      <boolProp name="CookieManager.clearEachIteration">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+vars.putObject("randomIntGenerator", random);
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Total Products In Cart" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_total_products_in_cart_setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+vars.put("totalProductsAdded", "0");
-+        </stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+    
-+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-+
-+var categories = props.get("categories");
-+number = random.nextInt(categories.length);
-+
-+vars.put("category_url_key", categories[number].url_key);
-+vars.put("category_name", categories[number].name);
-+vars.put("category_id", categories[number].id);
-+vars.putObject("category", categories[number]);
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
-+    <hashTree/>
-+  
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Get Customer Email" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Customer Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_customer_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+customerUserList = props.get("customer_emails_list");
-+customerUser = customerUserList.poll();
-+if (customerUser == null) {
-+  SampleResult.setResponseMessage("customernUser list is empty");
-+  SampleResult.setResponseData("customerUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("customer_email", customerUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_home_page.jmx</stringProp></HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="571386695">&lt;title&gt;Home page&lt;/title&gt;</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Login Page" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/account/login/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_login_page.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="637394530">&lt;title&gt;Customer Login&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${customer_email}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${customer_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="send" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">send</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/account/loginPost/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1312950388">&lt;title&gt;My Account&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Address" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">addressId</stringProp>
-+        <stringProp name="RegexExtractor.regex">customer/address/edit/id/([^'"]+)/</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert addressId extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">addressId</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Load Customer Private Data" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="sections" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sections</stringProp>
-+          </elementProp>
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">false</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-+          </elementProp>
-+          <elementProp name="_" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">_</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    </HTTPSamplerProxy>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Category" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_category.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1210004667">&lt;span class="base" data-ui-id="page-title"&gt;${category_name}&lt;/span&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">6</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract category id" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">category_id</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;li class="item category([^'"]+)"&gt;\s*&lt;strong&gt;${category_name}&lt;/strong&gt;\s*&lt;/li&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="Scope.variable">simple_product_1_url_key</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert category id" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1191417111">^[0-9]+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">category_id</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Add Simple Products to Cart" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">2</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("simple_products_list").size());
-+product = props.get("simple_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Update Products Added Counter" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loops/update_products_added_counter.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+productsAdded = Integer.parseInt(vars.get("totalProductsAdded"));
-+productsAdded = productsAdded + 1;
-+
-+vars.put("totalProductsAdded", String.valueOf(productsAdded));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product ${_counter} Add To Cart" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product</stringProp>
-+          </elementProp>
-+          <elementProp name="related_product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">related_product</stringProp>
-+          </elementProp>
-+          <elementProp name="qty" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">qty</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_product_add_to_cart.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">X-Requested-With</stringProp>
-+          <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/http_header_manager_ajax.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Load Cart Section ${_counter}" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="sections" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">cart,messages</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sections</stringProp>
-+          </elementProp>
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-+          </elementProp>
-+          <elementProp name="_" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">_</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/load_cart_section.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2057973164">This product is out of stock.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">6</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-350323027">\"summary_count\":${totalProductsAdded}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">X-Requested-With</stringProp>
-+          <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/http_header_manager_ajax.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+  
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Add Configurable Products to Cart" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">1</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loop_controller.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+        <stringProp name="CounterConfig.start">1</stringProp>
-+        <stringProp name="CounterConfig.end"/>
-+        <stringProp name="CounterConfig.incr">1</stringProp>
-+        <stringProp name="CounterConfig.name">_counter</stringProp>
-+        <stringProp name="CounterConfig.format"/>
-+        <boolProp name="CounterConfig.per_user">true</boolProp>
-+        <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+      </CounterConfig>
-+      <hashTree/>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-+      <stringProp name="BeanShellSampler.query">
-+import java.util.Random;
-+
-+Random random = vars.getObject("randomIntGenerator");
-+number = random.nextInt(props.get("configurable_products_list").size());
-+product = props.get("configurable_products_list").get(number);
-+
-+vars.put("product_url_key", product.get("url_key"));
-+vars.put("product_id", product.get("id"));
-+vars.put("product_name", product.get("title"));
-+vars.put("product_uenc", product.get("uenc"));
-+vars.put("product_sku", product.get("sku"));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Update Products Added Counter" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/loops/update_products_added_counter.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+productsAdded = Integer.parseInt(vars.get("totalProductsAdded"));
-+productsAdded = productsAdded + 1;
-+
-+vars.put("totalProductsAdded", String.valueOf(productsAdded));
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product ${_counter} View" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                <collectionProp name="Arguments.arguments"/>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/product_view.jmx</stringProp></HTTPSamplerProxy>
-+        <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                <collectionProp name="Asserion.test_strings">
-+                    <stringProp name="-1787050162">&lt;span&gt;In stock&lt;/span&gt;</stringProp>
-+                </collectionProp>
-+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                <boolProp name="Assertion.assume_success">false</boolProp>
-+                <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+        </hashTree>
-+    
-+    <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="SetUp - Get Configurable Product Options" enabled="true">
-+      <boolProp name="LoopController.continue_forever">true</boolProp>
-+      <stringProp name="LoopController.loops">1</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/get_configurable_product_options.jmx</stringProp></LoopController>
-+    <hashTree>
-+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+        <collectionProp name="HeaderManager.headers">
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Content-Type</stringProp>
-+            <stringProp name="Header.value">application/json</stringProp>
-+          </elementProp>
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Accept</stringProp>
-+            <stringProp name="Header.value">*/*</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </HeaderManager>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-+        <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+              <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-+          <stringProp name="VAR">admin_token</stringProp>
-+          <stringProp name="JSONPATH">$</stringProp>
-+          <stringProp name="DEFAULT"/>
-+          <stringProp name="VARIABLE"/>
-+          <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_token</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+        <collectionProp name="HeaderManager.headers">
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Authorization</stringProp>
-+            <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </HeaderManager>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Options" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}rest/V1/configurable-products/${product_sku}/options/all</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="JSON Path Extractor: Extract attribute_ids" enabled="true">
-+          <stringProp name="VAR">attribute_ids</stringProp>
-+          <stringProp name="JSONPATH">$.[*].attribute_id</stringProp>
-+          <stringProp name="DEFAULT">NO_VALUE</stringProp>
-+          <stringProp name="VARIABLE"/>
-+          <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="JSON Path Extractor: Extract option_values" enabled="true">
-+          <stringProp name="VAR">option_values</stringProp>
-+          <stringProp name="JSONPATH">$.[*].values[0].value_index</stringProp>
-+          <stringProp name="DEFAULT">NO_VALUE</stringProp>
-+          <stringProp name="VARIABLE"/>
-+          <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+      </hashTree>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product ${_counter} Add To Cart" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product</stringProp>
-+          </elementProp>
-+          <elementProp name="related_product" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">related_product</stringProp>
-+          </elementProp>
-+          <elementProp name="qty" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">qty</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_product_add_to_cart.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+        <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
-+                <boolProp name="resetInterpreter">false</boolProp>
-+                <stringProp name="parameters"/>
-+                <stringProp name="filename"/>
-+                <stringProp name="script">
-+                    try {
-+                    attribute_ids = vars.get("attribute_ids");
-+                    option_values = vars.get("option_values");
-+                    attribute_ids = attribute_ids.replace("[","").replace("]","").replace("\"", "");
-+                    option_values = option_values.replace("[","").replace("]","").replace("\"", "");
-+                    attribute_ids_array = attribute_ids.split(",");
-+                    option_values_array = option_values.split(",");
-+                    args = ctx.getCurrentSampler().getArguments();
-+                    it = args.iterator();
-+                    while (it.hasNext()) {
-+                        argument = it.next();
-+                        if (argument.getStringValue().contains("${")) {
-+                            args.removeArgument(argument.getName());
-+                        }
-+                    }
-+                    for (int i = 0; i &lt; attribute_ids_array.length; i++) {
-+                        ctx.getCurrentSampler().addArgument("super_attribute[" + attribute_ids_array[i] + "]", option_values_array[i]);
-+                    }
-+                    } catch (Exception e) {
-+                        log.error("eror&#x2026;", e);
-+                    }
-+                </stringProp>
-+              <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/configurable_product_add_to_cart_preprocessor.jmx</stringProp></BeanShellPreProcessor>
-+        <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">X-Requested-With</stringProp>
-+          <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/http_header_manager_ajax.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Load Cart Section ${_counter}" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="sections" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">cart,messages</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sections</stringProp>
-+          </elementProp>
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-+          </elementProp>
-+          <elementProp name="_" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">_</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/load_cart_section.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2057973164">This product is out of stock.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">6</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-350323027">\"summary_count\":${totalProductsAdded}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">X-Requested-With</stringProp>
-+          <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/http_header_manager_ajax.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Checkout" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Get region data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">
-+      vars.put("alabama_region_id", props.get("alabama_region_id"));
-+      vars.put("california_region_id", props.get("california_region_id"));
-+</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/get_region_data.jmx</stringProp></JSR223PreProcessor>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout start" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}checkout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/customer_checkout/checkout_start.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1403911775">&lt;title&gt;Checkout&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-179817969">&lt;title&gt;Shopping Cart&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">6</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Cart Id" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">cart_id</stringProp>
-+        <stringProp name="RegexExtractor.regex">"quoteData":{"entity_id":"([^'"]+)",</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Address Id" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">address_id</stringProp>
-+        <stringProp name="RegexExtractor.regex">"default_billing":"([^'"]+)",</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Customer Id" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">customer_id</stringProp>
-+        <stringProp name="RegexExtractor.regex">"customer_id":([^'",]+),</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Cart Id extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">cart_id</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Address Id extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="576002869">[0-9]+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">address_id</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Customer Id extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="576002869">[0-9]+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">customer_id</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout Estimate Shipping Methods" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"addressId":"${addressId}"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/carts/mine/estimate-shipping-methods-by-address-id</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/customer_checkout/checkout_estimate_shipping_methods.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+        <collectionProp name="HeaderManager.headers">
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Referer</stringProp>
-+            <stringProp name="Header.value">${base_path}checkout/onepage/</stringProp>
-+          </elementProp>
-+          <elementProp name="Content-Type" elementType="Header">
-+            <stringProp name="Header.name">Content-Type</stringProp>
-+            <stringProp name="Header.value">application/json; charset=UTF-8</stringProp>
-+          </elementProp>
-+          <elementProp name="X-Requested-With" elementType="Header">
-+            <stringProp name="Header.name">X-Requested-With</stringProp>
-+            <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+          </elementProp>
-+          <elementProp name="Accept" elementType="Header">
-+            <stringProp name="Header.name">Accept</stringProp>
-+            <stringProp name="Header.value">application/json</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </HeaderManager>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1224567411">"available":true</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout Billing/Shipping Information" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"addressInformation":{"shipping_address":{"customerAddressId":"${address_id}","countryId":"US","regionId":"${alabama_region_id}","regionCode":"AL","region":"Alabama","customerId":"${customer_id}","street":["123 Freedom Blvd. #123"],"telephone":"022-333-4455","postcode":"123123","city":"Fayetteville","firstname":"Anthony","lastname":"Nealy"},"shipping_method_code":"flatrate","shipping_carrier_code":"flatrate"}}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/carts/mine/shipping-information</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/customer_checkout/checkout_billing_shipping_information.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+        <collectionProp name="HeaderManager.headers">
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Referer</stringProp>
-+            <stringProp name="Header.value">${host}${base_path}checkout/onepage</stringProp>
-+          </elementProp>
-+          <elementProp name="Content-Type" elementType="Header">
-+            <stringProp name="Header.name">Content-Type</stringProp>
-+            <stringProp name="Header.value">application/json; charset=UTF-8</stringProp>
-+          </elementProp>
-+          <elementProp name="X-Requested-With" elementType="Header">
-+            <stringProp name="Header.name">X-Requested-With</stringProp>
-+            <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+          </elementProp>
-+          <elementProp name="Accept" elementType="Header">
-+            <stringProp name="Header.name">Accept</stringProp>
-+            <stringProp name="Header.value">application/json</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </HeaderManager>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-740937264">{"payment_methods"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout Payment Info/Place Order" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"cartId":"${cart_id}","paymentMethod":{"method":"checkmo","po_number":null,"additional_data":null},"billingAddress":{"customerAddressId":"${address_id}","countryId":"US","regionId":"${alabama_region_id}","regionCode":"AL","region":"Alabama","customerId":"${customer_id}","street":["123 Freedom Blvd. #123"],"telephone":"022-333-4455","postcode":"123123","city":"Fayetteville","firstname":"Anthony","lastname":"Nealy"}}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/carts/mine/payment-information</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/customer_checkout/checkout_payment_info_place_order.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+        <collectionProp name="HeaderManager.headers">
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Referer</stringProp>
-+            <stringProp name="Header.value">${host}${base_path}checkout/onepage</stringProp>
-+          </elementProp>
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Content-Type</stringProp>
-+            <stringProp name="Header.value">application/json; charset=UTF-8 </stringProp>
-+          </elementProp>
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">Accept</stringProp>
-+            <stringProp name="Header.value">application/json</stringProp>
-+          </elementProp>
-+          <elementProp name="" elementType="Header">
-+            <stringProp name="Header.name">X-Requested-With</stringProp>
-+            <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </HeaderManager>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert order number" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-297987887">"[0-9]+"</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout success" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/success/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/customer_checkout/checkout_success.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="494863233">Thank you for your purchase!</stringProp>
-+          <stringProp name="-1590086334">Your order number is</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/account/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1723813687">You are signed out.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Clear Cookie" enabled="true">
-+      <boolProp name="resetInterpreter">false</boolProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="script">curSampler = ctx.getCurrentSampler();
-+if(curSampler.getName().contains("Checkout success")) {
-+	manager = curSampler.getCookieManager();
-+	manager.clear();
-+}
-+</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/customer_checkout/checkout_clear_cookie.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Customer to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+customerUserList = props.get("customer_emails_list");
-+customerUserList.add(vars.get("customer_email"));
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Account management" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAccountManagementPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Account management");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies">
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit">
-+          <stringProp name="Cookie.value">30</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">/</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+        <elementProp name="product_list_limit" elementType="Cookie" testname="form_key">
-+          <stringProp name="Cookie.value">${form_key}</stringProp>
-+          <stringProp name="Cookie.domain">${host}</stringProp>
-+          <stringProp name="Cookie.path">${base_path}</stringProp>
-+          <boolProp name="Cookie.secure">false</boolProp>
-+          <longProp name="Cookie.expires">0</longProp>
-+          <boolProp name="Cookie.path_specified">true</boolProp>
-+          <boolProp name="Cookie.domain_specified">true</boolProp>
-+        </elementProp>
-+      </collectionProp>
-+      <boolProp name="CookieManager.clearEachIteration">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Get Customer Email" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Customer Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_customer_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+customerUserList = props.get("customer_emails_list");
-+customerUser = customerUserList.poll();
-+if (customerUser == null) {
-+  SampleResult.setResponseMessage("customernUser list is empty");
-+  SampleResult.setResponseData("customerUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("customer_email", customerUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_home_page.jmx</stringProp></HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="571386695">&lt;title&gt;Home page&lt;/title&gt;</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Login Page" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/account/login/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/open_login_page.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="637394530">&lt;title&gt;Customer Login&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${customer_email}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${customer_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="send" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">send</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/account/loginPost/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1312950388">&lt;title&gt;My Account&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Address" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">addressId</stringProp>
-+        <stringProp name="RegexExtractor.regex">customer/address/edit/id/([^'"]+)/</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert addressId extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">addressId</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Load Customer Private Data" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="sections" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sections</stringProp>
-+          </elementProp>
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">false</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-+          </elementProp>
-+          <elementProp name="_" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">_</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    </HTTPSamplerProxy>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="My Orders" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}sales/order/history/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/account_management/my_orders.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="220295440">&lt;title&gt;My Orders&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract orderId" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">orderId</stringProp>
-+        <stringProp name="RegexExtractor.regex">sales/order/view/order_id/(\d+)/</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default">NOT_FOUND</stringProp>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Orders Controller" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/account_management/if_orders.jmx</stringProp>
-+      <stringProp name="IfController.condition">"${orderId}" != "NOT_FOUND"</stringProp>
-+      <boolProp name="IfController.evaluateAll">false</boolProp>
-+    </IfController>
-+    <hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View Order" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}sales/order/view/order_id/${orderId}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="1956770127">&lt;title&gt;Order #</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract shipment tab" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">shipment_tab</stringProp>
-+          <stringProp name="RegexExtractor.regex">sales/order/shipment/order_id/(\d+)..Order Shipments</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default">NOT_FOUND</stringProp>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+      </hashTree>
-+      <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Shipments Controller" enabled="true">
-+        <stringProp name="TestPlan.comments">May not have shipped</stringProp>
-+        <stringProp name="IfController.condition">"${shipment_tab}" != "NOT_FOUND"</stringProp>
-+        <boolProp name="IfController.evaluateAll">false</boolProp>
-+      </IfController>
-+      <hashTree>
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View Order Shipments" enabled="true">
-+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+            <collectionProp name="Arguments.arguments"/>
-+          </elementProp>
-+          <stringProp name="HTTPSampler.domain"/>
-+          <stringProp name="HTTPSampler.port"/>
-+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+          <stringProp name="HTTPSampler.contentEncoding"/>
-+          <stringProp name="HTTPSampler.path">${base_path}sales/order/shipment/order_id/${orderId}</stringProp>
-+          <stringProp name="HTTPSampler.method">GET</stringProp>
-+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+          <boolProp name="HTTPSampler.monitor">false</boolProp>
-+          <stringProp name="HTTPSampler.embedded_url_re"/>
-+        </HTTPSamplerProxy>
-+        <hashTree>
-+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+            <collectionProp name="Asserion.test_strings">
-+              <stringProp name="120578727">Track this shipment</stringProp>
-+            </collectionProp>
-+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+            <boolProp name="Assertion.assume_success">false</boolProp>
-+            <intProp name="Assertion.test_type">2</intProp>
-+          </ResponseAssertion>
-+          <hashTree/>
-+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract popup link" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">popupLink</stringProp>
-+            <stringProp name="RegexExtractor.regex">popupWindow": {"windowURL":"([^'"]+)",</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">1</stringProp>
-+          </RegexExtractor>
-+          <hashTree/>
-+        </hashTree>
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Track Shipment" enabled="true">
-+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+            <collectionProp name="Arguments.arguments"/>
-+          </elementProp>
-+          <stringProp name="HTTPSampler.domain"/>
-+          <stringProp name="HTTPSampler.port"/>
-+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+          <stringProp name="HTTPSampler.contentEncoding"/>
-+          <stringProp name="HTTPSampler.path">${popupLink}</stringProp>
-+          <stringProp name="HTTPSampler.method">GET</stringProp>
-+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+          <boolProp name="HTTPSampler.monitor">false</boolProp>
-+          <stringProp name="HTTPSampler.embedded_url_re"/>
-+        </HTTPSamplerProxy>
-+        <hashTree>
-+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+            <collectionProp name="Asserion.test_strings">
-+              <stringProp name="-760430210">&lt;title&gt;Tracking Information&lt;/title&gt;</stringProp>
-+            </collectionProp>
-+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+            <boolProp name="Assertion.assume_success">false</boolProp>
-+            <intProp name="Assertion.test_type">2</intProp>
-+          </ResponseAssertion>
-+          <hashTree/>
-+        </hashTree>
-+      </hashTree>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="My Downloadable Products" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}downloadable/customer/products</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/account_management/my_downloadable_products.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="358050505">&lt;title&gt;My Downloadable Products&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract orderId" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">orderId</stringProp>
-+        <stringProp name="RegexExtractor.regex">sales/order/view/order_id/(\d+)/</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default">NOT_FOUND</stringProp>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract linkId" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">linkId</stringProp>
-+        <stringProp name="RegexExtractor.regex">downloadable/download/link/id/(\d+)/</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Downloadables Controller" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/account_management/if_downloadables.jmx</stringProp>
-+      <stringProp name="IfController.condition">"${orderId}" != "NOT_FOUND"</stringProp>
-+      <boolProp name="IfController.evaluateAll">false</boolProp>
-+    </IfController>
-+    <hashTree>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View Downloadable Product" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}sales/order/view/order_id/${orderId}</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/account_management/view_downloadable_products.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1956770127">&lt;title&gt;Order #</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Download Product" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}downloadable/download/link/id/${linkId}</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/account_management/download_product.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="My Wish List" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}wishlist</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1907714722">&lt;title&gt;My Wish List&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract wishlistId" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">wishlistId</stringProp>
-+        <stringProp name="RegexExtractor.regex">wishlist/index/update/wishlist_id/([^'"]+)/</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/account_management/my_wish_list.jmx</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Verify that there are items in the wishlist" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">buttonTitle</stringProp>
-+        <stringProp name="RegexExtractor.regex">Update Wish List</stringProp>
-+        <stringProp name="RegexExtractor.template">FOUND</stringProp>
-+        <stringProp name="RegexExtractor.default">NOT_FOUND</stringProp>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Wish List Controller" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/account_management/if_wishlist.jmx</stringProp>
-+      <stringProp name="IfController.condition">"${buttonTitle}" === "FOUND"</stringProp>
-+      <boolProp name="IfController.evaluateAll">false</boolProp>
-+    </IfController>
-+    <hashTree>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Share Wish List" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}wishlist/index/share/wishlist_id/${wishlistId}/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/account_management/share_wish_list.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1257102154">&lt;title&gt;Wish List Sharing&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Send Wish List" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="emails" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${customer_email}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">emails</stringProp>
-+          </elementProp>
-+          <elementProp name="message" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">[TEST] See my wishlist!!!</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">message</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}wishlist/index/send/wishlist_id/${wishlistId}/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/account_management/send_wish_list.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1907714722">&lt;title&gt;My Wish List&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}customer/account/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1723813687">You are signed out.</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Customer to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+customerUserList = props.get("customer_emails_list");
-+customerUserList.add(vars.get("customer_email"));
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Admin CMS Management" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAdminCMSManagementPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Admin CMS Management");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-+        <stringProp name="script">
-+        function getFormKeyFromResponse()
-+        {
-+            var url = prev.getUrlAsString(),
-+            responseCode =  prev.getResponseCode(),
-+            formKey = null;
-+            searchPattern = /var FORM_KEY = '(.+)'/;
-+            if (responseCode == "200" &amp;&amp; url) {
-+                response = prev.getResponseDataAsString();
-+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-+            }
-+            return formKey;
-+        }
-+
-+        formKey = vars.get("form_key_storage");
-+
-+	   currentFormKey = getFormKeyFromResponse();
-+
-+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-+		  vars.put("form_key_storage", currentFormKey);
-+	   }
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+        <hashTree/>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-+            <stringProp name="script">
-+                formKey =  vars.get("form_key_storage");
-+                if (formKey
-+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+                    &amp;&amp; sampler.getMethod() == "POST")
-+                    {
-+                        arguments = sampler.getArguments();
-+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-+                        {
-+                            argument = arguments.getArgument(i);
-+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-+                            argument.setValue(formKey);
-+                        }
-+                    }
-+                }
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        </JSR223PreProcessor>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies"/>
-+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+adminUserList = props.get("adminUserList");
-+adminUserListIterator = props.get("adminUserListIterator");
-+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+
-+if (adminUsersDistribution == 1) {
-+    adminUser = adminUserList.poll();
-+} else {
-+    if (!adminUserListIterator.hasNext()) {
-+        adminUserListIterator = adminUserList.descendingIterator();
-+    }
-+
-+    adminUser = adminUserListIterator.next();
-+}
-+
-+if (adminUser == null) {
-+  SampleResult.setResponseMessage("adminUser list is empty");
-+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("admin_user", adminUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1397214398">Welcome</stringProp>
-+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_form_key</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="dummy" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">dummy</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_user}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-+        <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin CMS Management" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_cms_management/admin_cms_management.jmx</stringProp>
-+</TestFragmentController>
-+    <hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Landing Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/cms/page/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create New" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/cms/page/new</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="content" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&lt;p&gt;CMS Content ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">content</stringProp>
-+            </elementProp>
-+            <elementProp name="content_heading" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">content_heading</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+            </elementProp>
-+            <elementProp name="identifier" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">identifier</stringProp>
-+            </elementProp>
-+            <elementProp name="is_active" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">is_active</stringProp>
-+            </elementProp>
-+            <elementProp name="layout_update_xml" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">layout_update_xml</stringProp>
-+            </elementProp>
-+            <elementProp name="meta_description" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">meta_description</stringProp>
-+            </elementProp>
-+            <elementProp name="meta_keywords" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">meta_keywords</stringProp>
-+            </elementProp>
-+            <elementProp name="meta_title" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">meta_title</stringProp>
-+            </elementProp>
-+            <elementProp name="nodes_data" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+              <stringProp name="Argument.value">{}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">nodes_data</stringProp>
-+            </elementProp>
-+            <elementProp name="node_ids" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">node_ids</stringProp>
-+            </elementProp>
-+            <elementProp name="page_id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">page_id</stringProp>
-+            </elementProp>
-+            <elementProp name="page_layout" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1column</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">page_layout</stringProp>
-+            </elementProp>
-+            <elementProp name="store_id[0]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">store_id[0]</stringProp>
-+            </elementProp>
-+            <elementProp name="title" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">CMS Title ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">title</stringProp>
-+            </elementProp>
-+            <elementProp name="website_root" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">website_root</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/cms/page/save/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-398886250">You saved the page.</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">16</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Pause" enabled="true">
-+        <intProp name="ActionProcessor.action">1</intProp>
-+        <intProp name="ActionProcessor.target">0</intProp>
-+        <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${adminCMSManagementDelay}*1000))}</stringProp>
-+      </TestAction>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Admin Browse Product Grid" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAdminBrowseProductGridPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Admin Browse Product Grid");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-+        <stringProp name="script">
-+        function getFormKeyFromResponse()
-+        {
-+            var url = prev.getUrlAsString(),
-+            responseCode =  prev.getResponseCode(),
-+            formKey = null;
-+            searchPattern = /var FORM_KEY = '(.+)'/;
-+            if (responseCode == "200" &amp;&amp; url) {
-+                response = prev.getResponseDataAsString();
-+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-+            }
-+            return formKey;
-+        }
-+
-+        formKey = vars.get("form_key_storage");
-+
-+	   currentFormKey = getFormKeyFromResponse();
-+
-+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-+		  vars.put("form_key_storage", currentFormKey);
-+	   }
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+        <hashTree/>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-+            <stringProp name="script">
-+                formKey =  vars.get("form_key_storage");
-+                if (formKey
-+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+                    &amp;&amp; sampler.getMethod() == "POST")
-+                    {
-+                        arguments = sampler.getArguments();
-+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-+                        {
-+                            argument = arguments.getArgument(i);
-+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-+                            argument.setValue(formKey);
-+                        }
-+                    }
-+                }
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        </JSR223PreProcessor>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies"/>
-+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+adminUserList = props.get("adminUserList");
-+adminUserListIterator = props.get("adminUserListIterator");
-+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+
-+if (adminUsersDistribution == 1) {
-+    adminUser = adminUserList.poll();
-+} else {
-+    if (!adminUserListIterator.hasNext()) {
-+        adminUserListIterator = adminUserList.descendingIterator();
-+    }
-+
-+    adminUser = adminUserListIterator.next();
-+}
-+
-+if (adminUser == null) {
-+  SampleResult.setResponseMessage("adminUser list is empty");
-+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("admin_user", adminUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1397214398">Welcome</stringProp>
-+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_form_key</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="dummy" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">dummy</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_user}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-+        <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Set Arguments" enabled="true">
-+      <stringProp name="script">
-+        vars.put("gridEntityType" , "Product");
-+
-+        pagesCount = parseInt(vars.get("products_page_size")) || 20;
-+        vars.put("grid_entity_page_size" , pagesCount);
-+        vars.put("grid_namespace" , "product_listing");
-+        vars.put("grid_admin_browse_filter_text" , vars.get("admin_browse_product_filter_text"));
-+        vars.put("grid_filter_field", "name");
-+
-+        // set sort fields and sort directions
-+        vars.put("grid_sort_field_1", "name");
-+        vars.put("grid_sort_field_2", "price");
-+        vars.put("grid_sort_field_3", "attribute_set_id");
-+        vars.put("grid_sort_order_1", "asc");
-+        vars.put("grid_sort_order_2", "desc");
-+      </stringProp>
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/setup.jmx</stringProp></JSR223PostProcessor>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Set ${gridEntityType} Pages Count" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="namespace" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_namespace}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">namespace</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="search" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">search</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[current]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[current]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[field]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">entity_id</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[field]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">asc</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="isAjax" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">isAjax</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/set_pages_count.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
-+        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
-+        <stringProp name="EXPECTED_VALUE">0</stringProp>
-+        <boolProp name="JSONVALIDATION">true</boolProp>
-+        <boolProp name="EXPECT_NULL">false</boolProp>
-+        <boolProp name="INVERT">true</boolProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <hashTree/>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
-+        <stringProp name="VAR">entity_total_records</stringProp>
-+        <stringProp name="JSONPATH">$.totalRecords</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Calculate ${gridEntityType} pages count" enabled="true">
-+        <stringProp name="cacheKey"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="parameters"/>
-+        <stringProp name="script">
-+          var pageSize = parseInt(vars.get("grid_entity_page_size")) || 20;
-+          var totalsRecord = parseInt(vars.get("entity_total_records"));
-+          var pageCount = Math.round(totalsRecord/pageSize);
-+
-+          vars.put("grid_pages_count", pageCount);
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+      </JSR223PostProcessor>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Set ${gridEntityType} Filtered Pages Count" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="namespace" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_namespace}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">namespace</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="search" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">search</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_admin_browse_filter_text}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[current]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[current]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[field]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">entity_id</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[field]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">asc</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="isAjax" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">isAjax</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/set_filtered_pages_count.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
-+        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
-+        <stringProp name="EXPECTED_VALUE">0</stringProp>
-+        <boolProp name="JSONVALIDATION">true</boolProp>
-+        <boolProp name="EXPECT_NULL">false</boolProp>
-+        <boolProp name="INVERT">true</boolProp>
-+        <boolProp name="ISREGEX">true</boolProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <hashTree/>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
-+        <stringProp name="VAR">entity_total_records</stringProp>
-+        <stringProp name="JSONPATH">$.totalRecords</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Calculate ${gridEntityType} filtered pages count" enabled="true">
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+          var pageSize = parseInt(vars.get("grid_entity_page_size")) || 20;
-+var totalsRecord = parseInt(vars.get("entity_total_records"));
-+var pageCount = Math.round(totalsRecord/pageSize);
-+
-+vars.put("grid_pages_count_filtered", pageCount);
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+      </JSR223PostProcessor>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="SetUp - Select ${gridEntityType} Page Number" enabled="true">
-+      <stringProp name="CounterConfig.start">1</stringProp>
-+      <stringProp name="CounterConfig.end">${grid_pages_count}</stringProp>
-+      <stringProp name="CounterConfig.incr">1</stringProp>
-+      <stringProp name="CounterConfig.name">page_number</stringProp>
-+      <stringProp name="CounterConfig.format"/>
-+      <boolProp name="CounterConfig.per_user">true</boolProp>
-+      <boolProp name="CounterConfig.reset_on_tg_iteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/select_page_number.jmx</stringProp></CounterConfig>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View ${gridEntityType} page" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="namespace" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_namespace}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">namespace</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="search" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">search</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[current]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${page_number}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[current]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[field]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">entity_id</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[field]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">asc</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="isAjax" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">isAjax</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/admin_browse_grid.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1637639774">\"totalRecords\":[^0]\d*</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="SetUp - Select Filtered ${gridEntityType} Page Number" enabled="true">
-+      <stringProp name="CounterConfig.start">1</stringProp>
-+      <stringProp name="CounterConfig.end">${grid_pages_count_filtered}</stringProp>
-+      <stringProp name="CounterConfig.incr">1</stringProp>
-+      <stringProp name="CounterConfig.name">page_number</stringProp>
-+      <stringProp name="CounterConfig.format"/>
-+      <boolProp name="CounterConfig.per_user">true</boolProp>
-+      <boolProp name="CounterConfig.reset_on_tg_iteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/select_filtered_page_number.jmx</stringProp></CounterConfig>
-+    <hashTree/>
-+  
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="View ${gridEntityType} page - Filtering + Sorting" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/admin_browse_grid_sort_and_filter.jmx</stringProp>
-+</TestFragmentController>
-+    <hashTree>
-+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Sort Field Defined" enabled="true">
-+        <stringProp name="ForeachController.inputVal">grid_sort_field</stringProp>
-+        <stringProp name="ForeachController.returnVal">grid_sort_field</stringProp>
-+        <boolProp name="ForeachController.useSeparator">true</boolProp>
-+        <stringProp name="ForeachController.startIndex">0</stringProp>
-+        <stringProp name="ForeachController.endIndex">3</stringProp>
-+      </ForeachController>
-+      <hashTree>
-+        <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Sort Order Defined" enabled="true">
-+          <stringProp name="ForeachController.inputVal">grid_sort_order</stringProp>
-+          <stringProp name="ForeachController.returnVal">grid_sort_order</stringProp>
-+          <boolProp name="ForeachController.useSeparator">true</boolProp>
-+          <stringProp name="ForeachController.startIndex">0</stringProp>
-+          <stringProp name="ForeachController.endIndex">2</stringProp>
-+        </ForeachController>
-+        <hashTree>
-+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View ${gridEntityType} page - Filtering + Sort By ${grid_sort_field} ${grid_sort_order}" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+              <collectionProp name="Arguments.arguments">
-+                <elementProp name="namespace" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_namespace}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">namespace</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="filters[${grid_filter_field}]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_admin_browse_filter_text}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">filters[${grid_filter_field}]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="paging[current]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${page_number}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">paging[current]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="sorting[field]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_sort_field}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">sorting[field]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_sort_order}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">sorting[direction]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="isAjax" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">true</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">isAjax</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+              </collectionProp>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+          </HTTPSamplerProxy>
-+          <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+              <collectionProp name="Asserion.test_strings">
-+                <stringProp name="1637639774">\"totalRecords\":[^0]\d*</stringProp>
-+              </collectionProp>
-+              <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+              <boolProp name="Assertion.assume_success">false</boolProp>
-+              <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+          </hashTree>
-+        </hashTree>
-+      </hashTree>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Admin Browse Order Grid" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAdminBrowseOrderGridPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Admin Browse Order Grid");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-+        <stringProp name="script">
-+        function getFormKeyFromResponse()
-+        {
-+            var url = prev.getUrlAsString(),
-+            responseCode =  prev.getResponseCode(),
-+            formKey = null;
-+            searchPattern = /var FORM_KEY = '(.+)'/;
-+            if (responseCode == "200" &amp;&amp; url) {
-+                response = prev.getResponseDataAsString();
-+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-+            }
-+            return formKey;
-+        }
-+
-+        formKey = vars.get("form_key_storage");
-+
-+	   currentFormKey = getFormKeyFromResponse();
-+
-+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-+		  vars.put("form_key_storage", currentFormKey);
-+	   }
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+        <hashTree/>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-+            <stringProp name="script">
-+                formKey =  vars.get("form_key_storage");
-+                if (formKey
-+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+                    &amp;&amp; sampler.getMethod() == "POST")
-+                    {
-+                        arguments = sampler.getArguments();
-+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-+                        {
-+                            argument = arguments.getArgument(i);
-+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-+                            argument.setValue(formKey);
-+                        }
-+                    }
-+                }
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        </JSR223PreProcessor>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies"/>
-+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+adminUserList = props.get("adminUserList");
-+adminUserListIterator = props.get("adminUserListIterator");
-+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+
-+if (adminUsersDistribution == 1) {
-+    adminUser = adminUserList.poll();
-+} else {
-+    if (!adminUserListIterator.hasNext()) {
-+        adminUserListIterator = adminUserList.descendingIterator();
-+    }
-+
-+    adminUser = adminUserListIterator.next();
-+}
-+
-+if (adminUser == null) {
-+  SampleResult.setResponseMessage("adminUser list is empty");
-+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("admin_user", adminUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1397214398">Welcome</stringProp>
-+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_form_key</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="dummy" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">dummy</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_user}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-+        <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Set Arguments" enabled="true">
-+      <stringProp name="script">
-+        vars.put("gridEntityType" , "Order");
-+
-+        pagesCount = parseInt(vars.get("orders_page_size")) || 20;
-+        vars.put("grid_entity_page_size" , pagesCount);
-+        vars.put("grid_namespace" , "sales_order_grid");
-+        vars.put("grid_admin_browse_filter_text" , vars.get("admin_browse_orders_filter_text"));
-+        vars.put("grid_filter_field", "status");
-+
-+        // set sort fields and sort directions
-+        vars.put("grid_sort_field_1", "increment_id");
-+        vars.put("grid_sort_field_2", "created_at");
-+        vars.put("grid_sort_field_3", "billing_name");
-+        vars.put("grid_sort_order_1", "asc");
-+        vars.put("grid_sort_order_2", "desc");
-+      </stringProp>
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_orders_grid/setup.jmx</stringProp></JSR223PostProcessor>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Set ${gridEntityType} Pages Count" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="namespace" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_namespace}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">namespace</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="search" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">search</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[current]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[current]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[field]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">entity_id</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[field]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">asc</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="isAjax" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">isAjax</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/set_pages_count.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
-+        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
-+        <stringProp name="EXPECTED_VALUE">0</stringProp>
-+        <boolProp name="JSONVALIDATION">true</boolProp>
-+        <boolProp name="EXPECT_NULL">false</boolProp>
-+        <boolProp name="INVERT">true</boolProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <hashTree/>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
-+        <stringProp name="VAR">entity_total_records</stringProp>
-+        <stringProp name="JSONPATH">$.totalRecords</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Calculate ${gridEntityType} pages count" enabled="true">
-+        <stringProp name="cacheKey"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="parameters"/>
-+        <stringProp name="script">
-+          var pageSize = parseInt(vars.get("grid_entity_page_size")) || 20;
-+          var totalsRecord = parseInt(vars.get("entity_total_records"));
-+          var pageCount = Math.round(totalsRecord/pageSize);
-+
-+          vars.put("grid_pages_count", pageCount);
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+      </JSR223PostProcessor>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Set ${gridEntityType} Filtered Pages Count" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="namespace" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_namespace}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">namespace</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="search" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">search</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_admin_browse_filter_text}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[current]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[current]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[field]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">entity_id</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[field]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">asc</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="isAjax" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">isAjax</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/set_filtered_pages_count.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
-+        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
-+        <stringProp name="EXPECTED_VALUE">0</stringProp>
-+        <boolProp name="JSONVALIDATION">true</boolProp>
-+        <boolProp name="EXPECT_NULL">false</boolProp>
-+        <boolProp name="INVERT">true</boolProp>
-+        <boolProp name="ISREGEX">true</boolProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <hashTree/>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
-+        <stringProp name="VAR">entity_total_records</stringProp>
-+        <stringProp name="JSONPATH">$.totalRecords</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Calculate ${gridEntityType} filtered pages count" enabled="true">
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+          var pageSize = parseInt(vars.get("grid_entity_page_size")) || 20;
-+var totalsRecord = parseInt(vars.get("entity_total_records"));
-+var pageCount = Math.round(totalsRecord/pageSize);
-+
-+vars.put("grid_pages_count_filtered", pageCount);
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+      </JSR223PostProcessor>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="SetUp - Select ${gridEntityType} Page Number" enabled="true">
-+      <stringProp name="CounterConfig.start">1</stringProp>
-+      <stringProp name="CounterConfig.end">${grid_pages_count}</stringProp>
-+      <stringProp name="CounterConfig.incr">1</stringProp>
-+      <stringProp name="CounterConfig.name">page_number</stringProp>
-+      <stringProp name="CounterConfig.format"/>
-+      <boolProp name="CounterConfig.per_user">true</boolProp>
-+      <boolProp name="CounterConfig.reset_on_tg_iteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/select_page_number.jmx</stringProp></CounterConfig>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View ${gridEntityType} page" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="namespace" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_namespace}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">namespace</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="search" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">search</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[current]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${page_number}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[current]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[field]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">entity_id</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[field]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">asc</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="isAjax" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">isAjax</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/admin_browse_grid.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1637639774">\"totalRecords\":[^0]\d*</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="SetUp - Select Filtered ${gridEntityType} Page Number" enabled="true">
-+      <stringProp name="CounterConfig.start">1</stringProp>
-+      <stringProp name="CounterConfig.end">${grid_pages_count_filtered}</stringProp>
-+      <stringProp name="CounterConfig.incr">1</stringProp>
-+      <stringProp name="CounterConfig.name">page_number</stringProp>
-+      <stringProp name="CounterConfig.format"/>
-+      <boolProp name="CounterConfig.per_user">true</boolProp>
-+      <boolProp name="CounterConfig.reset_on_tg_iteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/select_filtered_page_number.jmx</stringProp></CounterConfig>
-+    <hashTree/>
-+  
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="View ${gridEntityType} page - Filtering + Sorting" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/admin_browse_grid_sort_and_filter.jmx</stringProp>
-+</TestFragmentController>
-+    <hashTree>
-+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Sort Field Defined" enabled="true">
-+        <stringProp name="ForeachController.inputVal">grid_sort_field</stringProp>
-+        <stringProp name="ForeachController.returnVal">grid_sort_field</stringProp>
-+        <boolProp name="ForeachController.useSeparator">true</boolProp>
-+        <stringProp name="ForeachController.startIndex">0</stringProp>
-+        <stringProp name="ForeachController.endIndex">3</stringProp>
-+      </ForeachController>
-+      <hashTree>
-+        <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Sort Order Defined" enabled="true">
-+          <stringProp name="ForeachController.inputVal">grid_sort_order</stringProp>
-+          <stringProp name="ForeachController.returnVal">grid_sort_order</stringProp>
-+          <boolProp name="ForeachController.useSeparator">true</boolProp>
-+          <stringProp name="ForeachController.startIndex">0</stringProp>
-+          <stringProp name="ForeachController.endIndex">2</stringProp>
-+        </ForeachController>
-+        <hashTree>
-+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View ${gridEntityType} page - Filtering + Sort By ${grid_sort_field} ${grid_sort_order}" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+              <collectionProp name="Arguments.arguments">
-+                <elementProp name="namespace" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_namespace}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">namespace</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="filters[${grid_filter_field}]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_admin_browse_filter_text}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">filters[${grid_filter_field}]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="paging[current]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${page_number}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">paging[current]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="sorting[field]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_sort_field}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">sorting[field]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_sort_order}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">sorting[direction]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="isAjax" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">true</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">isAjax</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+              </collectionProp>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+          </HTTPSamplerProxy>
-+          <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+              <collectionProp name="Asserion.test_strings">
-+                <stringProp name="1637639774">\"totalRecords\":[^0]\d*</stringProp>
-+              </collectionProp>
-+              <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+              <boolProp name="Assertion.assume_success">false</boolProp>
-+              <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+          </hashTree>
-+        </hashTree>
-+      </hashTree>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Admin Create Product" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAdminProductCreationPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Admin Create Product");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-+        <stringProp name="script">
-+        function getFormKeyFromResponse()
-+        {
-+            var url = prev.getUrlAsString(),
-+            responseCode =  prev.getResponseCode(),
-+            formKey = null;
-+            searchPattern = /var FORM_KEY = '(.+)'/;
-+            if (responseCode == "200" &amp;&amp; url) {
-+                response = prev.getResponseDataAsString();
-+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-+            }
-+            return formKey;
-+        }
-+
-+        formKey = vars.get("form_key_storage");
-+
-+	   currentFormKey = getFormKeyFromResponse();
-+
-+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-+		  vars.put("form_key_storage", currentFormKey);
-+	   }
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+        <hashTree/>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-+            <stringProp name="script">
-+                formKey =  vars.get("form_key_storage");
-+                if (formKey
-+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+                    &amp;&amp; sampler.getMethod() == "POST")
-+                    {
-+                        arguments = sampler.getArguments();
-+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-+                        {
-+                            argument = arguments.getArgument(i);
-+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-+                            argument.setValue(formKey);
-+                        }
-+                    }
-+                }
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        </JSR223PreProcessor>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies"/>
-+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+adminUserList = props.get("adminUserList");
-+adminUserListIterator = props.get("adminUserListIterator");
-+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+
-+if (adminUsersDistribution == 1) {
-+    adminUser = adminUserList.poll();
-+} else {
-+    if (!adminUserListIterator.hasNext()) {
-+        adminUserListIterator = adminUserList.descendingIterator();
-+    }
-+
-+    adminUser = adminUserListIterator.next();
-+}
-+
-+if (adminUser == null) {
-+  SampleResult.setResponseMessage("adminUser list is empty");
-+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("admin_user", adminUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1397214398">Welcome</stringProp>
-+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_form_key</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="dummy" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">dummy</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_user}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-+        <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/once_only_controller.jmx</stringProp>
-+</OnceOnlyController>
-+    <hashTree>
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Related Product Id" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/get_related_product_id.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
-+import java.util.Random;
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom});
-+}
-+relatedIndex = random.nextInt(props.get("simple_products_list").size());
-+vars.put("related_product_id", props.get("simple_products_list").get(relatedIndex).get("id"));</stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Get Product Attributes" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Content-Type</stringProp>
-+          <stringProp name="Header.value">application/json</stringProp>
-+        </elementProp>
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Accept</stringProp>
-+          <stringProp name="Header.value">*/*</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-+        <stringProp name="VAR">admin_token</stringProp>
-+        <stringProp name="JSONPATH">$</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_token</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+      <collectionProp name="HeaderManager.headers">
-+        <elementProp name="" elementType="Header">
-+          <stringProp name="Header.name">Authorization</stringProp>
-+          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - API Get product attributes" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">mycolor</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
-+          </elementProp>
-+          <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">attribute_code</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
-+          </elementProp>
-+          <elementProp name="searchCriteria[filterGroups][0][filters][1][value]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">mysize</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][value]</stringProp>
-+          </elementProp>
-+          <elementProp name="searchCriteria[filterGroups][0][filters][1][field]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+            <stringProp name="Argument.value">attribute_code</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][field]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attributes</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/get_product_attributes.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product attributes" enabled="true">
-+        <stringProp name="VAR">product_attributes</stringProp>
-+        <stringProp name="JSONPATH">$.items</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="SetUp - Prepare product attributes" enabled="true">
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="cacheKey"/>
-+        <stringProp name="script">
-+var attributesData = JSON.parse(vars.get("product_attributes")),
-+maxOptions = 2;
-+
-+attributes = [];
-+for (i in attributesData) {
-+    if (i &gt;= 2) {
-+        break;
-+    }
-+    var data = attributesData[i],
-+        attribute = {
-+            "id": data.attribute_id,
-+            "code": data.attribute_code,
-+            "label": data.default_frontend_label,
-+            "options": []
-+        };
-+
-+    var processedOptions = 0;
-+    for (optionN in data.options) {
-+        var option = data.options[optionN];
-+        if (parseInt(option.value) &gt; 0 &amp;&amp; processedOptions &lt; maxOptions) {
-+            processedOptions++;
-+            attribute.options.push(option);
-+        }
-+    }
-+    attributes.push(attribute);
-+}
-+
-+vars.putObject("product_attributes", attributes);
-+</stringProp>
-+      </JSR223PostProcessor>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get Attribute Set Id" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_set/index/filter/${attribute_set_filter}</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/configurable_setup_attribute_set.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">attribute_set_id</stringProp>
-+        <stringProp name="RegexExtractor.regex">catalog&amp;#x2F;product_set&amp;#x2F;edit&amp;#x2F;id&amp;#x2F;([\d]+)&amp;#x2F;"[\D\d]*Attribute Set 1</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="SetUp - Set Attribute Set Filter" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">import org.apache.commons.codec.binary.Base64;
-+
-+byte[] encodedBytes = Base64.encodeBase64("set_name=Attribute Set 1".getBytes());
-+vars.put("attribute_set_filter", new String(encodedBytes));
-+</stringProp>
-+      </BeanShellPreProcessor>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-+      <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
-+import java.util.Random;
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom});
-+}
-+number = random.nextInt(props.get("simple_products_list_for_edit").size());
-+simpleList = props.get("simple_products_list_for_edit").get(number);
-+vars.put("simple_product_1_id", simpleList.get("id"));
-+vars.put("simple_product_1_name", simpleList.get("title"));
-+
-+do {
-+    number1 = random.nextInt(props.get("simple_products_list_for_edit").size());
-+} while(number == number1);
-+simpleList = props.get("simple_products_list_for_edit").get(number1);
-+vars.put("simple_product_2_id", simpleList.get("id"));
-+vars.put("simple_product_2_name", simpleList.get("title"));
-+
-+number2 = random.nextInt(props.get("configurable_products_list").size());
-+configurableList = props.get("configurable_products_list").get(number2);
-+vars.put("configurable_product_1_id", configurableList.get("id"));
-+vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
-+vars.put("configurable_product_1_name", configurableList.get("title"));
-+
-+//Additional category to be added
-+//int categoryId = Integer.parseInt(vars.get("simple_product_category_id"));
-+//vars.put("category_additional", (categoryId+1).toString());
-+//New price
-+vars.put("price_new", "9999");
-+//New special price
-+vars.put("special_price_new", "8888");
-+//New quantity
-+vars.put("quantity_new", "100600");
-+vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNum}-${__Random(1,1000000)}");
-+
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/setup.jmx</stringProp></BeanShellSampler>
-+    <hashTree/>
-+  
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Create Bundle Product" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/create_bundle_product.jmx</stringProp>
-+</TestFragmentController>
-+    <hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Catalog Product" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="1509986340">records found</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Bundle Product" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/new/set/4/type/bundle/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-144461265">New Product</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Bundle Product Validate" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="ajax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">ajax</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[name]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[name]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[sku]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Bundle Product  ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[sku]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">42</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tax_class_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">111</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[weight]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1.0000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[weight]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[category_ids][]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&lt;p&gt;Full bundle product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[short_description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&lt;p&gt;Short bundle product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[short_description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[status]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[status]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[configurable_variations]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[configurable_variations]</stringProp>
-+            </elementProp>
-+            <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
-+            </elementProp>
-+            <elementProp name="product[image]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[image]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[small_image]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[small_image]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[thumbnail]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[thumbnail]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[url_key]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">bundle-product-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[url_key]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Title</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_title]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Keyword</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Description</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[website_ids][]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[website_ids][]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_from_date]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_from_date]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_to_date]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_to_date]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[cost]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[cost]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][cust_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">32000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][cust_group]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][price_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][price_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">90</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][cust_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][cust_group]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][price_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">101</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][price_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][original_inventory_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][original_inventory_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">10000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design_from]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design_to]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[page_layout]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[page_layout]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options_container]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">container2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options_container]</stringProp>
-+            </elementProp>
-+            <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
-+            </elementProp>
-+            <elementProp name="product[shipment_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[shipment_type]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">option title one</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][title]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][option_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][option_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">select</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][type]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][required]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][required]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][option_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][option_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][product_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${simple_product_1_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][product_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">25</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_can_change_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_can_change_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][option_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][option_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][product_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${simple_product_2_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][product_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_price_value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">10.99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_price_value]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_price_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_price_type]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_can_change_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_can_change_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">option title two</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][title]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][option_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][option_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">select</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][type]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][required]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][required]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_id]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][option_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][option_id]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][product_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${simple_product_1_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][product_id]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][delete]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_price_value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">5.00</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_price_value]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_price_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_price_type]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_qty]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_can_change_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_can_change_qty]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][position]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_id]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][option_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][option_id]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][product_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${simple_product_2_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][product_id]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][delete]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_price_value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">7.00</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_price_value]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_price_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_price_type]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_qty]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_can_change_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_can_change_qty]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][position]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="affect_bundle_product_selections" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">affect_bundle_product_selections</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="links[related][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[related][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[related][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[related][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[upsell][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[upsell][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[upsell][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[upsell][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[crosssell][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[crosssell][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[crosssell][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[crosssell][0][position]</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/set/4/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="1853918323">{"error":false}</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Bundle Product Save" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="ajax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">ajax</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[name]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[name]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[sku]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[sku]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">42</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tax_class_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">111</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[weight]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1.0000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[weight]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[category_ids][]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&lt;p&gt;Full bundle product Description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[short_description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&lt;p&gt;Short bundle product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[short_description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[status]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[status]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[configurable_variations]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[configurable_variations]</stringProp>
-+            </elementProp>
-+            <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
-+            </elementProp>
-+            <elementProp name="product[image]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[image]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[small_image]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[small_image]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[thumbnail]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[thumbnail]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[url_key]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">bundle-product-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[url_key]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Title</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_title]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Keyword</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Description</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[website_ids][]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[website_ids][]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_from_date]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_from_date]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_to_date]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_to_date]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[cost]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[cost]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][cust_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">32000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][cust_group]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][price_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][price_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">90</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][cust_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][cust_group]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][price_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">101</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][price_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][original_inventory_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][original_inventory_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">10000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design_from]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design_to]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[page_layout]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[page_layout]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options_container]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">container2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options_container]</stringProp>
-+            </elementProp>
-+            <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
-+            </elementProp>
-+            <elementProp name="product[shipment_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[shipment_type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">option title one</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][title]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][option_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][option_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][delete]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">select</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][required]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][required]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][position]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][option_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][option_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][product_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${simple_product_1_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][product_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][delete]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">25</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_qty]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_can_change_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_can_change_qty]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][position]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][option_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][option_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][product_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${simple_product_2_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][product_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][delete]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_price_value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">10.99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_price_value]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_price_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_price_type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_qty]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_can_change_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_can_change_qty]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][position]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">option title two</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][title]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][option_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][option_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][delete]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">select</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][required]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][required]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][position]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][option_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][option_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][product_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${simple_product_1_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][product_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][delete]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_price_value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">5.00</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_price_value]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_price_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_price_type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_qty]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_can_change_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_can_change_qty]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][position]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][option_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][option_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][product_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${simple_product_2_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][product_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][delete]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_price_value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">7.00</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_price_value]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_price_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_price_type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_qty]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_can_change_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_can_change_qty]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][position]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="affect_bundle_product_selections" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">affect_bundle_product_selections</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="links[related][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[related][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[related][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[related][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[upsell][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[upsell][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[upsell][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[upsell][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[crosssell][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[crosssell][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[crosssell][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[crosssell][0][position]</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/set/4/type/bundle/back/edit/active_tab/product-details/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-583471546">You saved the product</stringProp>
-+            <stringProp name="-1534079309">option title one</stringProp>
-+            <stringProp name="-1534074215">option title two</stringProp>
-+            <stringProp name="1304788671">${simple_product_2_name}</stringProp>
-+            <stringProp name="417284990">${simple_product_1_name}</stringProp>
-+          </collectionProp>
-+
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+    </hashTree>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Create Configurable Product" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Catalog Product" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/open_catalog_grid.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1509986340">records found</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Configurable Product" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/new/set/${attribute_set_id}/type/configurable/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/new_configurable.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-144461265">New Product</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Configurable Product Validate" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="ajax" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">ajax</stringProp>
-+            <stringProp name="Argument.desc">false</stringProp>
-+          </elementProp>
-+          <elementProp name="isAjax" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">isAjax</stringProp>
-+            <stringProp name="Argument.desc">false</stringProp>
-+          </elementProp>
-+          <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${attribute_set_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[affect_product_custom_options]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[affect_product_custom_options]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[attribute_set_id]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${attribute_set_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[attribute_set_id]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[category_ids][0]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">4</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[category_ids][0]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[description]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[description]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[gift_message_available]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">0</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[gift_message_available]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[gift_wrapping_available]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[gift_wrapping_available]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[gift_wrapping_price]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[gift_wrapping_price]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[image]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[image]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[is_returnable]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">2</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[is_returnable]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[meta_description]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${configurable_sku} - Meta Description</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[meta_description]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${configurable_sku} - Meta Keyword</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[meta_title]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${configurable_sku} - Meta Title</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[meta_title]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[name]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${configurable_sku}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[name]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[options_container]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">container2</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[options_container]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[price]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${price_new}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[price]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1000</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[short_description]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[short_description]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[sku]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${configurable_sku}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[sku]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[small_image]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[small_image]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[special_price]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${special_price_new}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[special_price]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[status]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[status]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">0</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][deferred_stock_update]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][deferred_stock_update]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">0</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">0</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">0</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][manage_stock]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][manage_stock]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">10000</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">0</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_deferred_stock_update]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_deferred_stock_update]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_enable_qty_increments]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_enable_qty_increments]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">2</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[tax_class_id]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[thumbnail]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[thumbnail]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[url_key]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[url_key]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[use_config_is_returnable]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[use_config_is_returnable]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[visibility]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">4</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[visibility]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[website_ids][1]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[website_ids][1]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="links[related][0][id]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${related_product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">links[related][0][id]</stringProp>
-+          </elementProp>
-+          <elementProp name="links[related][0][position]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">links[related][0][position]</stringProp>
-+          </elementProp>
-+          <elementProp name="links[upsell][0][id]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${related_product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">links[upsell][0][id]</stringProp>
-+          </elementProp>
-+          <elementProp name="links[upsell][0][position]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">links[upsell][0][position]</stringProp>
-+          </elementProp>
-+          <elementProp name="links[crosssell][0][id]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${related_product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">links[crosssell][0][id]</stringProp>
-+          </elementProp>
-+          <elementProp name="links[crosssell][0][position]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">links[crosssell][0][position]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/set/${attribute_set_id}/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/configurable_validate.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1853918323">{"error":false}</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Prepare Configurable Data" enabled="true">
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+            <stringProp name="parameters"/>
-+            <stringProp name="filename"/>
-+            <stringProp name="cacheKey"/>
-+            <stringProp name="script">
-+attributes = vars.getObject("product_attributes");
-+
-+for (i in attributes) {
-+    var attribute = attributes[i];
-+    sampler.addArgument("attribute_codes[" + i + "]", attribute.code);
-+    sampler.addArgument("attributes[" + i + "]", attribute.id);
-+    sampler.addArgument("product[" + attribute.code + "]", attribute.options[0].value);
-+    addConfigurableAttributeData(attribute);
-+}
-+
-+addConfigurableMatrix(attributes);
-+
-+function addConfigurableAttributeData(attribute) {
-+    var attributeId = attribute.id;
-+
-+    sampler.addArgument("product[configurable_attributes_data][" + attributeId + "][attribute_id]", attributeId);
-+    sampler.addArgument("product[configurable_attributes_data][" + attributeId + "][code]", attribute.code);
-+    sampler.addArgument("product[configurable_attributes_data][" + attributeId + "][label]", attribute.label);
-+    sampler.addArgument("product[configurable_attributes_data][" + attributeId + "][position]", 0);
-+    attribute.options.forEach(function (option, index) {
-+        sampler.addArgument("product[configurable_attributes_data][" + attributeId + "][values][" + option.value + "][include]", index);
-+        sampler.addArgument("product[configurable_attributes_data][" + attributeId + "][values][" + option.value + "][value_index]", option.value);
-+    });
-+}
-+
-+/**
-+ * Build 4 simple products for Configurable
-+ */
-+function addConfigurableMatrix(attributes) {
-+
-+    var attribute1 = attributes[0],
-+        attribute2 = attributes[1],
-+        productIndex = 1,
-+        products = [];
-+    var variationNames = [];
-+    attribute1.options.forEach(function (option1) {
-+        attribute2.options.forEach(function (option2) {
-+            var productAttributes = {},
-+                namePart = option1.label + "+" + option2.label,
-+                variationKey = option1.value + "-" + option2.value;
-+            productAttributes[attribute1.code] = option1.value;
-+            productAttributes[attribute2.code] = option2.value;
-+
-+            variationNames.push(namePart + " - " + vars.get("configurable_sku"));
-+            var product = {
-+                "id": null,
-+                "name": namePart + " - " + vars.get("configurable_sku"),
-+                "sku": namePart + " - " + vars.get("configurable_sku"),
-+                "status": 1,
-+                "price": "100",
-+                "price_currency": "$",
-+                "price_string": "$100",
-+                "weight": "6",
-+                "qty": "50",
-+                "variationKey": variationKey,
-+                "configurable_attribute": JSON.stringify(productAttributes),
-+                "thumbnail_image": "",
-+                "media_gallery": {"images": {}},
-+                "image": [],
-+                "was_changed": true,
-+                "canEdit": 1,
-+                "newProduct": 1,
-+                "record_id": productIndex
-+            };
-+            productIndex++;
-+            products.push(product);
-+        });
-+    });
-+
-+    sampler.addArgument("configurable-matrix-serialized", JSON.stringify(products));
-+    vars.putObject("configurable_variations_assertion", variationNames);
-+}
-+            </stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/configurable_prepare_data.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Configurable Product Save" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="ajax" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">ajax</stringProp>
-+            <stringProp name="Argument.desc">false</stringProp>
-+          </elementProp>
-+          <elementProp name="isAjax" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">isAjax</stringProp>
-+            <stringProp name="Argument.desc">false</stringProp>
-+          </elementProp>
-+          <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${attribute_set_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[affect_product_custom_options]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[affect_product_custom_options]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[attribute_set_id]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${attribute_set_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[attribute_set_id]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[category_ids][0]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">2</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[category_ids][0]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[description]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[description]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[gift_message_available]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">0</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[gift_message_available]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[gift_wrapping_available]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[gift_wrapping_available]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[gift_wrapping_price]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[gift_wrapping_price]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[image]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[image]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[is_returnable]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">2</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[is_returnable]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[meta_description]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${configurable_sku} - Meta Description</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[meta_description]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${configurable_sku} - Meta Keyword</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[meta_title]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${configurable_sku} - Meta Title</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[meta_title]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[name]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${configurable_sku}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[name]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[options_container]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">container2</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[options_container]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[price]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${price_new}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[price]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1000</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[short_description]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[short_description]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[sku]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${configurable_sku}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[sku]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[small_image]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[small_image]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[special_price]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${special_price_new}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[special_price]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[status]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[status]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">0</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][deferred_stock_update]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][deferred_stock_update]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">0</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">0</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">0</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][manage_stock]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][manage_stock]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">10000</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">0</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_deferred_stock_update]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_deferred_stock_update]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_enable_qty_increments]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_enable_qty_increments]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">2</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[tax_class_id]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[thumbnail]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[thumbnail]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[url_key]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[url_key]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[use_config_is_returnable]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[use_config_is_returnable]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[visibility]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">4</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[visibility]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="product[website_ids][1]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">product[website_ids][1]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="links[related][0][id]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${related_product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">links[related][0][id]</stringProp>
-+          </elementProp>
-+          <elementProp name="links[related][0][position]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">links[related][0][position]</stringProp>
-+          </elementProp>
-+          <elementProp name="links[upsell][0][id]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${related_product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">links[upsell][0][id]</stringProp>
-+          </elementProp>
-+          <elementProp name="links[upsell][0][position]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">links[upsell][0][position]</stringProp>
-+          </elementProp>
-+          <elementProp name="links[crosssell][0][id]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${related_product_id}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">links[crosssell][0][id]</stringProp>
-+          </elementProp>
-+          <elementProp name="links[crosssell][0][position]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">links[crosssell][0][position]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/set/${attribute_set_id}/type/configurable/back/edit/active_tab/product-details/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/configurable_save.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-583471546">You saved the product</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="Assert Variation" enabled="true">
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="cacheKey"/>
-+        <stringProp name="script">
-+var configurableVariations = vars.getObject("configurable_variations_assertion"),
-+response = SampleResult.getResponseDataAsString();
-+
-+configurableVariations.forEach(function (variation) {
-+    if (response.indexOf(variation) == -1) {
-+        AssertionResult.setFailureMessage("Cannot find variation \"" + variation + "\"");
-+        AssertionResult.setFailure(true);
-+    }
-+});
-+</stringProp>
-+      </JSR223Assertion>
-+      <hashTree/>
-+    
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Prepare Configurable Data" enabled="true">
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+            <stringProp name="parameters"/>
-+            <stringProp name="filename"/>
-+            <stringProp name="cacheKey"/>
-+            <stringProp name="script">
-+attributes = vars.getObject("product_attributes");
-+
-+for (i in attributes) {
-+    var attribute = attributes[i];
-+    sampler.addArgument("attribute_codes[" + i + "]", attribute.code);
-+    sampler.addArgument("attributes[" + i + "]", attribute.id);
-+    sampler.addArgument("product[" + attribute.code + "]", attribute.options[0].value);
-+    addConfigurableAttributeData(attribute);
-+}
-+
-+addConfigurableMatrix(attributes);
-+
-+function addConfigurableAttributeData(attribute) {
-+    var attributeId = attribute.id;
-+
-+    sampler.addArgument("product[configurable_attributes_data][" + attributeId + "][attribute_id]", attributeId);
-+    sampler.addArgument("product[configurable_attributes_data][" + attributeId + "][code]", attribute.code);
-+    sampler.addArgument("product[configurable_attributes_data][" + attributeId + "][label]", attribute.label);
-+    sampler.addArgument("product[configurable_attributes_data][" + attributeId + "][position]", 0);
-+    attribute.options.forEach(function (option, index) {
-+        sampler.addArgument("product[configurable_attributes_data][" + attributeId + "][values][" + option.value + "][include]", index);
-+        sampler.addArgument("product[configurable_attributes_data][" + attributeId + "][values][" + option.value + "][value_index]", option.value);
-+    });
-+}
-+
-+/**
-+ * Build 4 simple products for Configurable
-+ */
-+function addConfigurableMatrix(attributes) {
-+
-+    var attribute1 = attributes[0],
-+        attribute2 = attributes[1],
-+        productIndex = 1,
-+        products = [];
-+    var variationNames = [];
-+    attribute1.options.forEach(function (option1) {
-+        attribute2.options.forEach(function (option2) {
-+            var productAttributes = {},
-+                namePart = option1.label + "+" + option2.label,
-+                variationKey = option1.value + "-" + option2.value;
-+            productAttributes[attribute1.code] = option1.value;
-+            productAttributes[attribute2.code] = option2.value;
-+
-+            variationNames.push(namePart + " - " + vars.get("configurable_sku"));
-+            var product = {
-+                "id": null,
-+                "name": namePart + " - " + vars.get("configurable_sku"),
-+                "sku": namePart + " - " + vars.get("configurable_sku"),
-+                "status": 1,
-+                "price": "100",
-+                "price_currency": "$",
-+                "price_string": "$100",
-+                "weight": "6",
-+                "qty": "50",
-+                "variationKey": variationKey,
-+                "configurable_attribute": JSON.stringify(productAttributes),
-+                "thumbnail_image": "",
-+                "media_gallery": {"images": {}},
-+                "image": [],
-+                "was_changed": true,
-+                "canEdit": 1,
-+                "newProduct": 1,
-+                "record_id": productIndex
-+            };
-+            productIndex++;
-+            products.push(product);
-+        });
-+    });
-+
-+    sampler.addArgument("configurable-matrix-serialized", JSON.stringify(products));
-+    vars.putObject("configurable_variations_assertion", variationNames);
-+}
-+            </stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/configurable_prepare_data.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Create Downloadable Product" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/create_downloadable_product.jmx</stringProp>
-+</TestFragmentController>
-+    <hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Catalog Product" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="1509986340">records found</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Downloadable Product" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/new/set/4/type/downloadable/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-144461265">New Product</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Downloadable Upload Original File" enabled="true">
-+        <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
-+          <collectionProp name="HTTPFileArgs.files">
-+            <elementProp name="${files_folder}downloadable_original.txt" elementType="HTTPFileArg">
-+              <stringProp name="File.path">${files_folder}downloadable_original.txt</stringProp>
-+              <stringProp name="File.paramname">links</stringProp>
-+              <stringProp name="File.mimetype">text/plain</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/downloadable_file/upload/type/links/?isAjax=true</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">true</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract original file" enabled="true">
-+          <stringProp name="VAR">original_file</stringProp>
-+          <stringProp name="JSONPATH">$.file</stringProp>
-+          <stringProp name="DEFAULT"/>
-+          <stringProp name="VARIABLE"/>
-+          <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Downloadable Upload Sample File" enabled="true">
-+        <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
-+          <collectionProp name="HTTPFileArgs.files">
-+            <elementProp name="${files_folder}downloadable_sample.txt" elementType="HTTPFileArg">
-+              <stringProp name="File.path">${files_folder}downloadable_sample.txt</stringProp>
-+              <stringProp name="File.paramname">samples</stringProp>
-+              <stringProp name="File.mimetype">text/plain</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/downloadable_file/upload/type/samples/?isAjax=true</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">true</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract sample file" enabled="true">
-+          <stringProp name="VAR">sample_file</stringProp>
-+          <stringProp name="JSONPATH">$.file</stringProp>
-+          <stringProp name="DEFAULT"/>
-+          <stringProp name="VARIABLE"/>
-+          <stringProp name="SUBJECT">BODY</stringProp>
-+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Downloadable Product Validate" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="ajax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">ajax</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[name]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Downloadable Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[name]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[sku]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">SKU ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[sku]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">123</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tax_class_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">111</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[weight]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1.0000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[weight]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[category_ids][]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&lt;p&gt;Full downloadable product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[short_description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&lt;p&gt;Short downloadable product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[short_description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[status]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[status]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[image]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[image]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[small_image]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[small_image]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[thumbnail]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[thumbnail]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[url_key]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">downloadable-product-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[url_key]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Downloadable Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Title</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_title]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Downloadable Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Keyword</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Downloadable Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Description</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[website_ids][]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[website_ids][]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_from_date]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_from_date]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_to_date]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_to_date]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[cost]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[cost]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][cust_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">32000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][cust_group]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][price_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][price_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">90</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][cust_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][cust_group]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][price_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">101</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][price_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][original_inventory_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][original_inventory_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">10000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design_from]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design_to]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[page_layout]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[page_layout]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options_container]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">container2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options_container]</stringProp>
-+            </elementProp>
-+            <elementProp name="is_downloadable" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">on</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">is_downloadable</stringProp>
-+            </elementProp>
-+            <elementProp name="product[links_title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Links</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[links_title]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[links_purchased_separately]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[links_purchased_separately]</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][file][0][file]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${original_file}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][file][0][file]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][file][0][name]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">downloadable_original.txt</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][file][0][name]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][file][0][size]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">13</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][file][0][size]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][file][0][status]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">new</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][file][0][status]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][is_shareable]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][is_shareable]</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][is_unlimited]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][is_unlimited]</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][link_url]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][link_url]</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][number_of_downloads]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][number_of_downloads]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">120</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][price]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][record_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][record_id]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][sample][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">file</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][sample][type]</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][sample][url]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][sample][url]</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][sort_order]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][sort_order]</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Original Link</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][title]</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">file</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][type]</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][file][0][file]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${sample_file}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][file][0][file]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][file][0][name]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">downloadable_sample.txt</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][file][0][name]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][file][0][size]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">14</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][file][0][size]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][file][0][status]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">new</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][file][0][status]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][record_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][record_id]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][sample_url]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][sample_url]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][sort_order]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][sort_order]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Sample Link</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][title]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">file</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][type]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">4</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[configurable_variation]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[configurable_variation]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="links[related][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[related][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[related][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[related][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[upsell][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[upsell][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[upsell][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[upsell][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[crosssell][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[crosssell][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[crosssell][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[crosssell][0][position]</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/set/4/type/downloadable/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="1853918323">{"error":false}</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Downloadable Product Save" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="ajax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">ajax</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[name]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Downloadable Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[name]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[sku]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">SKU ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[sku]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">123</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tax_class_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">111</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[weight]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1.0000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[weight]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[category_ids][]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&lt;p&gt;Full downloadable product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[short_description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&lt;p&gt;Short downloadable product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[short_description]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[status]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[status]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[image]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[image]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[small_image]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[small_image]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[thumbnail]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[thumbnail]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[url_key]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">downloadable-product-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[url_key]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Downloadable Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Title</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_title]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Downloadable Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Keyword</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Downloadable Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Description</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[website_ids][]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[website_ids][]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_from_date]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_from_date]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_to_date]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_to_date]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[cost]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[cost]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][cust_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">32000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][cust_group]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][price_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][price_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">90</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][cust_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][cust_group]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][price_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">101</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][price_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][original_inventory_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][original_inventory_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">10000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design_from]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design_to]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[page_layout]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[page_layout]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options_container]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">container2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options_container]</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][file][0][file]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${original_file}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][file][0][file]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][file][0][name]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">downloadable_original.txt</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][file][0][name]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][file][0][size]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">13</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][file][0][size]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][file][0][status]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">new</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][file][0][status]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][is_shareable]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][is_shareable]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][is_unlimited]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][is_unlimited]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][link_url]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][link_url]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][number_of_downloads]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][number_of_downloads]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">120</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][price]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][record_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][record_id]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][sample][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">file</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][sample][type]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][sample][url]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][sample][url]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][sort_order]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][sort_order]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Original Link</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][title]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[link][0][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">file</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[link][0][type]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][file][0][file]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${sample_file}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][file][0][file]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][file][0][name]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">downloadable_sample.txt</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][file][0][name]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][file][0][size]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">14</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][file][0][size]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][file][0][status]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">new</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][file][0][status]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][record_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][record_id]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][sample_url]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][sample_url]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][sort_order]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][sort_order]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Sample Link</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][title]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="downloadable[sample][0][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">file</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">downloadable[sample][0][type]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">4</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[configurable_variation]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[configurable_variation]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="links[related][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[related][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[related][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[related][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[upsell][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[upsell][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[upsell][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[upsell][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[crosssell][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[crosssell][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[crosssell][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[crosssell][0][position]</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/set/4/type/downloadable/back/edit/active_tab/product-details/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-583471546">You saved the product</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-1600986843">violation</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">6</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+    </hashTree>
-+  
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Create Simple Product" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/create_simple_product.jmx</stringProp>
-+</TestFragmentController>
-+    <hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Catalog Product" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="1509986340">records found</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Simple Product" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/new/set/4/type/simple/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-144461265">New Product</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Simple Product Validate" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="ajax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">ajax</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[name]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Simple Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[name]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[sku]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">SKU ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[sku]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">123</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tax_class_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">111</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[weight]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1.0000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[weight]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[category_ids][]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&lt;p&gt;Full simple product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[short_description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&lt;p&gt;Short simple product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[short_description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[status]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[status]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[image]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[image]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[small_image]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[small_image]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[thumbnail]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[thumbnail]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[url_key]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">simple-product-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[url_key]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Simple Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Title</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_title]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Simple Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Keyword</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Simple Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Description</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[website_ids][]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[website_ids][]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_from_date]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_from_date]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_to_date]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_to_date]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[cost]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[cost]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][cust_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">32000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][cust_group]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][price_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][price_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">90</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][cust_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][cust_group]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][price_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">101</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][price_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][original_inventory_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][original_inventory_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">10000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design_from]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design_to]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[page_layout]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[page_layout]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options_container]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">container2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options_container]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][is_delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][is_delete]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][is_require]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][is_require]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][previous_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">select</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][previous_group]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][previous_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">drop_down</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][previous_type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][sort_order]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][sort_order]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Product Option Title One</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][title]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">drop_down</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][values][1][is_delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][values][1][is_delete]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][values][1][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">200</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][values][1][price]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][values][1][price_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">fixed</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][values][1][price_type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][values][1][sku]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">sku-one</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][values][1][sku]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][values][1][sort_order]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][values][1][sort_order]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][values][1][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Row Title</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][values][1][title]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][is_delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][is_delete]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][is_require]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][is_require]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][max_characters]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">250</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][max_characters]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][previous_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">text</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][previous_group]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][previous_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">field</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][previous_type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][price]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][price_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">fixed</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][price_type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][sku]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">sku-two</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][sku]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][sort_order]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][sort_order]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Field Title</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][title]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">field</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">4</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="product[configurable_variation]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[configurable_variation]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="links[related][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[related][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[related][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[related][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[upsell][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[upsell][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[upsell][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[upsell][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[crosssell][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[crosssell][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[crosssell][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[crosssell][0][position]</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/set/4/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="1853918323">{"error":false}</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Simple Product Save" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="ajax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">ajax</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[name]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Simple Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[name]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[sku]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">SKU ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[sku]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">123</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tax_class_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">111</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[weight]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1.0000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[weight]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[category_ids][]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&lt;p&gt;Full simple product Description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[short_description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&lt;p&gt;Short simple product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[short_description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[status]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[status]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[image]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[image]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[small_image]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[small_image]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[thumbnail]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[thumbnail]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[url_key]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">simple-product-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[url_key]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Simple Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Title</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_title]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Simple Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Keyword</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[meta_description]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Simple Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Description</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[meta_description]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[website_ids][]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[website_ids][]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_from_date]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_from_date]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[special_to_date]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[special_to_date]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[cost]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[cost]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][cust_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">32000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][cust_group]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][price_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][price_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">90</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][0][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][0][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][cust_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][cust_group]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][price_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">101</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][price_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">99</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[tier_price][1][delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[tier_price][1][delete]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][original_inventory_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][original_inventory_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">10000</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design_from]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_design_to]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[page_layout]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[page_layout]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options_container]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">container2</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options_container]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][is_delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][is_delete]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][is_require]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][is_require]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][previous_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">select</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][previous_group]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][previous_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">drop_down</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][previous_type]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][sort_order]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][sort_order]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Product Option Title One</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][title]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">drop_down</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][type]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][values][1][is_delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][values][1][is_delete]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][values][1][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">200</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][values][1][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][values][1][price_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">fixed</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][values][1][price_type]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][values][1][sku]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">sku-one</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][values][1][sku]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][values][1][sort_order]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][values][1][sort_order]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][1][values][1][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Row Title</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][1][values][1][title]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][is_delete]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][is_delete]</stringProp>
-+              <stringProp name="Argument.desc">false</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][is_require]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][is_require]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][max_characters]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">250</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][max_characters]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][previous_group]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">text</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][previous_group]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][previous_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">field</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][previous_type]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][price]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">500</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][price]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][price_type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">fixed</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][price_type]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][sku]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">sku-two</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][sku]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][sort_order]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][sort_order]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][title]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Field Title</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][title]</stringProp>
-+            </elementProp>
-+            <elementProp name="product[options][2][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">field</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[options][2][type]</stringProp>
-+            </elementProp>
-+            <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">4</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="product[configurable_variation]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">product[configurable_variation]</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="links[related][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[related][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[related][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[related][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[upsell][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[upsell][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[upsell][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[upsell][0][position]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[crosssell][0][id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${related_product_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[crosssell][0][id]</stringProp>
-+            </elementProp>
-+            <elementProp name="links[crosssell][0][position]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">links[crosssell][0][position]</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/set/4/type/simple/back/edit/active_tab/product-details/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-583471546">You saved the product</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-1600986843">violation</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">6</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Admin Edit Product" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAdminProductEditingPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Admin Edit Product");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-+        <stringProp name="script">
-+        function getFormKeyFromResponse()
-+        {
-+            var url = prev.getUrlAsString(),
-+            responseCode =  prev.getResponseCode(),
-+            formKey = null;
-+            searchPattern = /var FORM_KEY = '(.+)'/;
-+            if (responseCode == "200" &amp;&amp; url) {
-+                response = prev.getResponseDataAsString();
-+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-+            }
-+            return formKey;
-+        }
-+
-+        formKey = vars.get("form_key_storage");
-+
-+	   currentFormKey = getFormKeyFromResponse();
-+
-+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-+		  vars.put("form_key_storage", currentFormKey);
-+	   }
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+        <hashTree/>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-+            <stringProp name="script">
-+                formKey =  vars.get("form_key_storage");
-+                if (formKey
-+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+                    &amp;&amp; sampler.getMethod() == "POST")
-+                    {
-+                        arguments = sampler.getArguments();
-+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-+                        {
-+                            argument = arguments.getArgument(i);
-+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-+                            argument.setValue(formKey);
-+                        }
-+                    }
-+                }
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        </JSR223PreProcessor>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies"/>
-+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+adminUserList = props.get("adminUserList");
-+adminUserListIterator = props.get("adminUserListIterator");
-+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+
-+if (adminUsersDistribution == 1) {
-+    adminUser = adminUserList.poll();
-+} else {
-+    if (!adminUserListIterator.hasNext()) {
-+        adminUserListIterator = adminUserList.descendingIterator();
-+    }
-+
-+    adminUser = adminUserListIterator.next();
-+}
-+
-+if (adminUser == null) {
-+  SampleResult.setResponseMessage("adminUser list is empty");
-+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("admin_user", adminUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1397214398">Welcome</stringProp>
-+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_form_key</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="dummy" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">dummy</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_user}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-+        <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Edit Product" enabled="true"/>
-+              <hashTree>
-+                <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Generate Unique Ids for each Thread" enabled="true">
-+                  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_product/admin_edit_product_updated.jmx</stringProp>
-+                  <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
-+    import java.util.HashMap;
-+    import java.util.Random;
-+
-+    try {
-+    Random random = new Random();
-+    if (${seedForRandom} &gt; 0) {
-+      random.setSeed(${seedForRandom} + ${__threadNum});
-+    }
-+    simpleCount = props.get("simple_products_list_for_edit").size();
-+    configCount = props.get("configurable_products_list_for_edit").size();
-+    productCount = 0;
-+    if (simpleCount &gt; configCount) {
-+    	productCount = configCount;
-+    } else {
-+    	productCount = simpleCount;
-+    }
-+    int threadsNumber = ctx.getThreadGroup().getNumThreads();
-+    if (threadsNumber == 0) {
-+    	threadsNumber = 1;
-+    }
-+    //Current thread number starts from 0
-+    currentThreadNum = ctx.getThreadNum();
-+
-+    String siterator = vars.get("threadIterator_" + currentThreadNum.toString());
-+    iterator = 0;
-+    if(siterator == null){
-+    	vars.put("threadIterator_" + currentThreadNum.toString() , "0");
-+    } else {
-+    	iterator = Integer.parseInt(siterator);
-+    	iterator ++;
-+    	vars.put("threadIterator_" + currentThreadNum.toString() , iterator.toString());
-+    }
-+
-+    //Number of products for one thread
-+    productClusterLength = productCount / threadsNumber;
-+
-+    if (iterator &gt;= productClusterLength) {
-+    	vars.put("threadIterator_" + currentThreadNum.toString(), "0");
-+    	iterator = 0;
-+    }
-+
-+    //Index of the current product from the cluster
-+    i = productClusterLength * currentThreadNum + iterator;
-+
-+    //ids of simple and configurable products to edit
-+    vars.put("simple_product_id", props.get("simple_products_list_for_edit").get(i).get("id"));
-+    vars.put("configurable_product_id", props.get("configurable_products_list_for_edit").get(i).get("id"));
-+
-+    //id of related product
-+    do {
-+    	relatedIndex = random.nextInt(props.get("simple_products_list_for_edit").size());
-+    } while(i == relatedIndex);
-+    vars.put("related_product_id", props.get("simple_products_list_for_edit").get(relatedIndex).get("id"));
-+    } catch (Exception ex) {
-+    log.info("Script execution failed", ex);
-+}</stringProp>
-+                  <stringProp name="BeanShellSampler.filename"/>
-+                  <stringProp name="BeanShellSampler.parameters"/>
-+                  <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-+                </BeanShellSampler>
-+                <hashTree/>
-+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Edit Simple Product" enabled="true">
-+                  <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                    <collectionProp name="Arguments.arguments"/>
-+                  </elementProp>
-+                  <stringProp name="HTTPSampler.domain"/>
-+                  <stringProp name="HTTPSampler.port"/>
-+                  <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+                  <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+                  <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+                  <stringProp name="HTTPSampler.contentEncoding"/>
-+                  <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/edit/id/${simple_product_id}/</stringProp>
-+                  <stringProp name="HTTPSampler.method">GET</stringProp>
-+                  <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+                  <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+                  <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+                  <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+                  <boolProp name="HTTPSampler.monitor">false</boolProp>
-+                  <stringProp name="HTTPSampler.embedded_url_re"/>
-+                </HTTPSamplerProxy>
-+                <hashTree>
-+                  <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                    <collectionProp name="Asserion.test_strings">
-+                      <stringProp name="1355179215">Product</stringProp>
-+                    </collectionProp>
-+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                    <boolProp name="Assertion.assume_success">false</boolProp>
-+                    <intProp name="Assertion.test_type">16</intProp>
-+                  </ResponseAssertion>
-+                  <hashTree/>
-+                  <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract name" enabled="true">
-+                    <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                    <stringProp name="RegexExtractor.refname">simple_product_name</stringProp>
-+                    <stringProp name="RegexExtractor.regex">,"name":"([^'"]+)",</stringProp>
-+                    <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                    <stringProp name="RegexExtractor.default"/>
-+                    <stringProp name="RegexExtractor.match_number">1</stringProp>
-+                  </RegexExtractor>
-+                  <hashTree/>
-+                  <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract sku" enabled="true">
-+                    <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                    <stringProp name="RegexExtractor.refname">simple_product_sku</stringProp>
-+                    <stringProp name="RegexExtractor.regex">,"sku":"([^'"]+)",</stringProp>
-+                    <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                    <stringProp name="RegexExtractor.default"/>
-+                    <stringProp name="RegexExtractor.match_number">1</stringProp>
-+                  </RegexExtractor>
-+                  <hashTree/>
-+                  <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category" enabled="true">
-+                    <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                    <stringProp name="RegexExtractor.refname">simple_product_category_id</stringProp>
-+                    <stringProp name="RegexExtractor.regex">,"category_ids":."(\d+)".</stringProp>
-+                    <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                    <stringProp name="RegexExtractor.default"/>
-+                    <stringProp name="RegexExtractor.match_number">1</stringProp>
-+                  </RegexExtractor>
-+                  <hashTree/>
-+                </hashTree>
-+                <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set updated values" enabled="true">
-+                  <stringProp name="TestPlan.comments">Passing arguments between threads</stringProp>
-+                  <stringProp name="BeanShellSampler.query">//Additional category to be added
-+                    import java.util.Random;
-+
-+                        Random randomGenerator = new Random();
-+                        if (${seedForRandom} &gt; 0) {
-+                          randomGenerator.setSeed(${seedForRandom} + ${__threadNum});
-+                        }
-+
-+                        int categoryId = Integer.parseInt(vars.get("simple_product_category_id"));
-+                        categoryList = props.get("admin_category_ids_list");
-+
-+                        if (categoryList.size() &gt; 1) {
-+	                        do {
-+	                            int index = randomGenerator.nextInt(categoryList.size());
-+	                            newCategoryId = categoryList.get(index);
-+	                        } while (categoryId == newCategoryId);
-+
-+                            vars.put("category_additional", newCategoryId.toString());
-+                        }
-+
-+                        //New price
-+                        vars.put("price_new", "9999");
-+                        //New special price
-+                        vars.put("special_price_new", "8888");
-+                        //New quantity
-+                        vars.put("quantity_new", "100600");
-+                  </stringProp>
-+                  <stringProp name="BeanShellSampler.filename"/>
-+                  <stringProp name="BeanShellSampler.parameters"/>
-+                  <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-+                </BeanShellSampler>
-+                <hashTree/>
-+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Edit Simple Product Validate" enabled="true">
-+                  <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                    <collectionProp name="Arguments.arguments">
-+                      <elementProp name="ajax" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">true</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">ajax</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="isAjax" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">true</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">isAjax</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="form_key" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">form_key</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[name]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_name}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[name]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[sku]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_sku}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[sku]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[price]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${price_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[price]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">2</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[tax_class_id]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${quantity_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[weight]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1.0000</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[weight]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_category_id}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[category_ids][]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[description]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">&lt;p&gt;Full simple product Description ${simple_product_id} Edited&lt;/p&gt;</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[description]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[status]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[status]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[configurable_variations]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[configurable_variations]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[image]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[image]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[small_image]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[small_image]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[thumbnail]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[thumbnail]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[url_key]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_name}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[url_key]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[meta_title]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_name} Meta Title Edited</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[meta_title]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_name} Meta Keyword Edited</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[meta_description]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_name} Meta Description Edited</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[meta_description]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[website_ids][]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[website_ids][]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[special_price]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${special_price_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[special_price]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[special_from_date]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[special_from_date]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[special_to_date]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[special_to_date]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[cost]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[cost]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][original_inventory_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${quantity_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][original_inventory_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${quantity_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">10000</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_design]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_design]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_design_from]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_design_to]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[page_layout]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[page_layout]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[options_container]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">container2</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[options_container]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                    </collectionProp>
-+                  </elementProp>
-+                  <stringProp name="HTTPSampler.domain"/>
-+                  <stringProp name="HTTPSampler.port"/>
-+                  <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+                  <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+                  <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+                  <stringProp name="HTTPSampler.contentEncoding"/>
-+                  <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/id/${simple_product_id}/?isAjax=true</stringProp>
-+                  <stringProp name="HTTPSampler.method">POST</stringProp>
-+                  <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+                  <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+                  <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+                  <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+                  <boolProp name="HTTPSampler.monitor">false</boolProp>
-+                  <stringProp name="HTTPSampler.embedded_url_re"/>
-+                </HTTPSamplerProxy>
-+                <hashTree>
-+                  <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                    <collectionProp name="Asserion.test_strings">
-+                      <stringProp name="1853918323">{"error":false}</stringProp>
-+                    </collectionProp>
-+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                    <boolProp name="Assertion.assume_success">false</boolProp>
-+                    <intProp name="Assertion.test_type">2</intProp>
-+                  </ResponseAssertion>
-+                  <hashTree/>
-+                </hashTree>
-+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Edit Simple Product Save" enabled="true">
-+                  <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                    <collectionProp name="Arguments.arguments">
-+                      <elementProp name="ajax" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">true</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">ajax</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="isAjax" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">true</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">isAjax</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="form_key" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">form_key</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[name]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_name}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[name]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[sku]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_sku}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[sku]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[price]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${price_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[price]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">2</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[tax_class_id]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${quantity_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[weight]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1.0000</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[weight]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_category_id}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[category_ids][]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${category_additional}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[category_ids][]</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[description]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">&lt;p&gt;Full simple product Description ${simple_product_id} Edited&lt;/p&gt;</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[description]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[status]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[status]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[configurable_variations]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[configurable_variations]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[image]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[image]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[small_image]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[small_image]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[thumbnail]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[thumbnail]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[url_key]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_name}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[url_key]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[meta_title]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_name} Meta Title Edited</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[meta_title]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_name} Meta Keyword Edited</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[meta_description]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${simple_product_name} Meta Description Edited</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[meta_description]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[website_ids][]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[website_ids][]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[special_price]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${special_price_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[special_price]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[special_from_date]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[special_from_date]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[special_to_date]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[special_to_date]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[cost]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[cost]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][original_inventory_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${quantity_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][original_inventory_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${quantity_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">10000</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_design]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_design]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_design_from]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_design_to]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[page_layout]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[page_layout]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[options_container]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">container2</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[options_container]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                    </collectionProp>
-+                  </elementProp>
-+                  <stringProp name="HTTPSampler.domain"/>
-+                  <stringProp name="HTTPSampler.port"/>
-+                  <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+                  <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+                  <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+                  <stringProp name="HTTPSampler.contentEncoding"/>
-+                  <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/id/${simple_product_id}/back/edit/active_tab/product-details/</stringProp>
-+                  <stringProp name="HTTPSampler.method">POST</stringProp>
-+                  <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+                  <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+                  <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+                  <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+                  <boolProp name="HTTPSampler.monitor">false</boolProp>
-+                  <stringProp name="HTTPSampler.embedded_url_re"/>
-+                </HTTPSamplerProxy>
-+                <hashTree>
-+                  <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                    <collectionProp name="Asserion.test_strings">
-+                      <stringProp name="-583471546">You saved the product</stringProp>
-+                    </collectionProp>
-+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                    <boolProp name="Assertion.assume_success">false</boolProp>
-+                    <intProp name="Assertion.test_type">2</intProp>
-+                  </ResponseAssertion>
-+                  <hashTree/>
-+                </hashTree>
-+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Edit Configurable Product" enabled="true">
-+                  <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                    <collectionProp name="Arguments.arguments"/>
-+                  </elementProp>
-+                  <stringProp name="HTTPSampler.domain"/>
-+                  <stringProp name="HTTPSampler.port"/>
-+                  <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+                  <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+                  <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+                  <stringProp name="HTTPSampler.contentEncoding"/>
-+                  <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/edit/id/${configurable_product_id}/</stringProp>
-+                  <stringProp name="HTTPSampler.method">GET</stringProp>
-+                  <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+                  <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+                  <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+                  <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+                  <boolProp name="HTTPSampler.monitor">false</boolProp>
-+                  <stringProp name="HTTPSampler.embedded_url_re"/>
-+                </HTTPSamplerProxy>
-+                <hashTree>
-+                  <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                    <collectionProp name="Asserion.test_strings">
-+                      <stringProp name="1355179215">Product</stringProp>
-+                    </collectionProp>
-+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                    <boolProp name="Assertion.assume_success">false</boolProp>
-+                    <intProp name="Assertion.test_type">16</intProp>
-+                  </ResponseAssertion>
-+                  <hashTree/>
-+                  <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract name" enabled="true">
-+                    <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                    <stringProp name="RegexExtractor.refname">configurable_product_name</stringProp>
-+                    <stringProp name="RegexExtractor.regex">,"name":"([^'"]+)",</stringProp>
-+                    <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                    <stringProp name="RegexExtractor.default"/>
-+                    <stringProp name="RegexExtractor.match_number">1</stringProp>
-+                  </RegexExtractor>
-+                  <hashTree/>
-+                  <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract sku" enabled="true">
-+                    <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                    <stringProp name="RegexExtractor.refname">configurable_product_sku</stringProp>
-+                    <stringProp name="RegexExtractor.regex">,"sku":"([^'"]+)",</stringProp>
-+                    <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                    <stringProp name="RegexExtractor.default"/>
-+                    <stringProp name="RegexExtractor.match_number">1</stringProp>
-+                  </RegexExtractor>
-+                  <hashTree/>
-+                  <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category" enabled="true">
-+                    <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                    <stringProp name="RegexExtractor.refname">configurable_product_category_id</stringProp>
-+                    <stringProp name="RegexExtractor.regex">,"category_ids":."(\d+)"</stringProp>
-+                    <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                    <stringProp name="RegexExtractor.default"/>
-+                    <stringProp name="RegexExtractor.match_number">1</stringProp>
-+                  </RegexExtractor>
-+                  <hashTree/>
-+                  <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract configurable attribute id" enabled="true">
-+                    <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                    <stringProp name="RegexExtractor.refname">configurable_attribute_id</stringProp>
-+                    <stringProp name="RegexExtractor.regex">,"configurable_variation":"([^'"]+)",</stringProp>
-+                    <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                    <stringProp name="RegexExtractor.default"/>
-+                    <stringProp name="RegexExtractor.match_number">1</stringProp>
-+                    <boolProp name="RegexExtractor.default_empty_value">true</boolProp>
-+                  </RegexExtractor>
-+                  <hashTree/>
-+                  <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract configurable matrix" enabled="true">
-+                    <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                    <stringProp name="RegexExtractor.refname">configurable_matrix</stringProp>
-+                    <stringProp name="RegexExtractor.regex">"configurable-matrix":(\[.*?\])</stringProp>
-+                    <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                    <stringProp name="RegexExtractor.default"/>
-+                    <stringProp name="RegexExtractor.match_number">1</stringProp>
-+                    <boolProp name="RegexExtractor.default_empty_value">true</boolProp>
-+                  </RegexExtractor>
-+                  <hashTree/>
-+                  <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract associated products ids" enabled="true">
-+                    <stringProp name="VAR">associated_products_ids</stringProp>
-+                    <stringProp name="JSONPATH">$.[*].id</stringProp>
-+                    <stringProp name="DEFAULT"/>
-+                    <stringProp name="VARIABLE">configurable_matrix</stringProp>
-+                    <stringProp name="SUBJECT">VAR</stringProp>
-+                  </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+                  <hashTree/>
-+                  <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract configurable product json" enabled="true">
-+                    <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                    <stringProp name="RegexExtractor.refname">configurable_product_data</stringProp>
-+                    <stringProp name="RegexExtractor.regex">(\{"product":.*?configurable_attributes_data.*?\})\s*&lt;</stringProp>
-+                    <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                    <stringProp name="RegexExtractor.default"/>
-+                    <stringProp name="RegexExtractor.match_number">1</stringProp>
-+                  </RegexExtractor>
-+                  <hashTree/>
-+                  <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract configurable attributes data" enabled="true">
-+                    <stringProp name="VAR">configurable_attributes_data</stringProp>
-+                    <stringProp name="JSONPATH">$.product.configurable_attributes_data</stringProp>
-+                    <stringProp name="DEFAULT"/>
-+                    <stringProp name="VARIABLE">configurable_product_data</stringProp>
-+                    <stringProp name="SUBJECT">VAR</stringProp>
-+                  </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+                  <hashTree/>
-+                  <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract attribute ids" enabled="true">
-+                    <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                    <stringProp name="RegexExtractor.refname">configurable_attribute_ids</stringProp>
-+                    <stringProp name="RegexExtractor.regex">"attribute_id":"(\d+)"</stringProp>
-+                    <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                    <stringProp name="RegexExtractor.default"/>
-+                    <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+                    <stringProp name="Sample.scope">variable</stringProp>
-+                    <stringProp name="Scope.variable">configurable_attributes_data</stringProp>
-+                  </RegexExtractor>
-+                  <hashTree/>
-+                  <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract attribute codes" enabled="true">
-+                    <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                    <stringProp name="RegexExtractor.refname">configurable_attribute_codes</stringProp>
-+                    <stringProp name="RegexExtractor.regex">"code":"(\w+)"</stringProp>
-+                    <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                    <stringProp name="RegexExtractor.default"/>
-+                    <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+                    <stringProp name="Sample.scope">variable</stringProp>
-+                    <stringProp name="Scope.variable">configurable_attributes_data</stringProp>
-+                  </RegexExtractor>
-+                  <hashTree/>
-+                  <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract attribute labels" enabled="true">
-+                    <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                    <stringProp name="RegexExtractor.refname">configurable_attribute_labels</stringProp>
-+                    <stringProp name="RegexExtractor.regex">"label":"(.*?)"</stringProp>
-+                    <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                    <stringProp name="RegexExtractor.default"/>
-+                    <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+                    <stringProp name="Sample.scope">variable</stringProp>
-+                    <stringProp name="Scope.variable">configurable_attributes_data</stringProp>
-+                  </RegexExtractor>
-+                  <hashTree/>
-+                  <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract attribute values" enabled="true">
-+                    <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                    <stringProp name="RegexExtractor.refname">configurable_attribute_values</stringProp>
-+                    <stringProp name="RegexExtractor.regex">"values":(\{(?:\}|.*?\}\}))</stringProp>
-+                    <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                    <stringProp name="RegexExtractor.default"/>
-+                    <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+                    <stringProp name="Sample.scope">variable</stringProp>
-+                    <stringProp name="Scope.variable">configurable_attributes_data</stringProp>
-+                  </RegexExtractor>
-+                  <hashTree/>
-+                </hashTree>
-+                <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach configurable attribute id" enabled="true">
-+                  <stringProp name="ForeachController.inputVal">configurable_attribute_ids</stringProp>
-+                  <stringProp name="ForeachController.returnVal">configurable_attribute_id</stringProp>
-+                  <boolProp name="ForeachController.useSeparator">true</boolProp>
-+                </ForeachController>
-+                <hashTree>
-+                  <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-+                    <stringProp name="CounterConfig.start">1</stringProp>
-+                    <stringProp name="CounterConfig.end">${configurable_attribute_ids_matchNr}</stringProp>
-+                    <stringProp name="CounterConfig.incr">1</stringProp>
-+                    <stringProp name="CounterConfig.name">attribute_counter</stringProp>
-+                    <stringProp name="CounterConfig.format"/>
-+                    <boolProp name="CounterConfig.per_user">true</boolProp>
-+                    <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-+                  </CounterConfig>
-+                  <hashTree/>
-+                  <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Process configurable attribute values" enabled="true">
-+                    <stringProp name="BeanShellSampler.query">return vars.get("configurable_attribute_values_" + vars.get("attribute_counter"));</stringProp>
-+                    <stringProp name="BeanShellSampler.filename"/>
-+                    <stringProp name="BeanShellSampler.parameters"/>
-+                    <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-+                  </BeanShellSampler>
-+                  <hashTree>
-+                    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Exctract attribute values" enabled="true">
-+                      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+                      <stringProp name="RegexExtractor.refname">attribute_${configurable_attribute_id}_values</stringProp>
-+                      <stringProp name="RegexExtractor.regex">"value_index":"(\d+)"</stringProp>
-+                      <stringProp name="RegexExtractor.template">$1$</stringProp>
-+                      <stringProp name="RegexExtractor.default"/>
-+                      <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+                      <stringProp name="Scope.variable">configurable_attribute_values_${attribute_counter}</stringProp>
-+                    </RegexExtractor>
-+                    <hashTree/>
-+                  </hashTree>
-+                </hashTree>
-+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Edit Configurable Product Validate" enabled="true">
-+                  <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                    <collectionProp name="Arguments.arguments">
-+                      <elementProp name="isAjax" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">true</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">isAjax</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="form_key" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">form_key</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[name]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_name}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[name]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[sku]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_sku}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[sku]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[price]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${price_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[price]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">2</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[tax_class_id]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[weight]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">3</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[weight]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_category_id}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[category_ids][]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${category_additional}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[category_ids][]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[description]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">&lt;p&gt;Configurable product description ${configurable_product_id} Edited&lt;/p&gt;</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[description]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[status]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[status]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[meta_title]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_name} Meta Title Edited</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[meta_title]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_name} Meta Keyword Edited</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[meta_description]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_name} Meta Description Edited</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[meta_description]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[website_ids][]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[website_ids][]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[special_price]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${special_price_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[special_price]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[special_from_date]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[special_from_date]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[special_to_date]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[special_to_date]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[cost]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[cost]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_design]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_design]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_design_from]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_design_to]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[page_layout]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[page_layout]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[options_container]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">container2</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[options_container]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[configurable_variation]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_attribute_id}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[configurable_variation]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[url_key]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_name}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[url_key]</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[visibility]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">4</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[visibility]</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-+                        <stringProp name="Argument.desc">true</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">50</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][type_id]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">configurable</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][type_id]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                    </collectionProp>
-+                  </elementProp>
-+                  <stringProp name="HTTPSampler.domain"/>
-+                  <stringProp name="HTTPSampler.port"/>
-+                  <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+                  <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+                  <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+                  <stringProp name="HTTPSampler.contentEncoding"/>
-+                  <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/id/${configurable_product_id}/</stringProp>
-+                  <stringProp name="HTTPSampler.method">POST</stringProp>
-+                  <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+                  <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+                  <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+                  <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+                  <boolProp name="HTTPSampler.monitor">false</boolProp>
-+                  <stringProp name="HTTPSampler.embedded_url_re"/>
-+                </HTTPSamplerProxy>
-+                <hashTree>
-+                  <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="Configure product options" enabled="true">
-+                    <boolProp name="resetInterpreter">false</boolProp>
-+                    <stringProp name="parameters"/>
-+                    <stringProp name="filename"/>
-+                    <stringProp name="script">try {
-+    	int attributesCount = Integer.parseInt(vars.get("configurable_attribute_ids_matchNr"));
-+    	for (int i = 1; i &lt;= attributesCount; i++) {
-+    		attributeId = vars.get("configurable_attribute_ids_" + i.toString());
-+    		attributeCode = vars.get("configurable_attribute_codes_" + i.toString());
-+    		attributeLabel = vars.get("configurable_attribute_labels_" + i.toString());
-+    		ctx.getCurrentSampler().addArgument("attributes[" + (i - 1).toString() + "]", attributeId);
-+    		ctx.getCurrentSampler().addArgument("attribute_codes[" + (i - 1).toString() + "]", attributeCode);
-+    		ctx.getCurrentSampler().addArgument("product[" + attributeCode + "]", attributeId);
-+    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][attribute_id]", attributeId);
-+    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][position]", (i - 1).toString());
-+    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][code]", attributeCode);
-+    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][label]", attributeLabel);
-+
-+    		int valuesCount = Integer.parseInt(vars.get("attribute_" + attributeId + "_values_matchNr"));
-+    		for (int j = 1; j &lt;= valuesCount; j++) {
-+    			attributeValue = vars.get("attribute_" + attributeId + "_values_" + j.toString());
-+    			ctx.getCurrentSampler().addArgument(
-+    				"product[configurable_attributes_data][" + attributeId + "][values][" + attributeValue + "][include]",
-+    				"1"
-+    			);
-+    			ctx.getCurrentSampler().addArgument(
-+    				"product[configurable_attributes_data][" + attributeId + "][values][" + attributeValue + "][value_index]",
-+    				attributeValue
-+    			);
-+    		}
-+    	}
-+    	ctx.getCurrentSampler().addArgument("associated_product_ids_serialized", vars.get("associated_products_ids").toString());
-+    } catch (Exception e) {
-+        log.error("error???", e);
-+    }</stringProp>
-+                  </BeanShellPreProcessor>
-+                  <hashTree/>
-+                  <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                    <collectionProp name="Asserion.test_strings">
-+                      <stringProp name="1853918323">{"error":false}</stringProp>
-+                    </collectionProp>
-+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                    <boolProp name="Assertion.assume_success">false</boolProp>
-+                    <intProp name="Assertion.test_type">2</intProp>
-+                  </ResponseAssertion>
-+                  <hashTree/>
-+                </hashTree>
-+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Edit Configurable Product Save" enabled="true">
-+                  <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+                    <collectionProp name="Arguments.arguments">
-+                      <elementProp name="ajax" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">true</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">ajax</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="isAjax" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">true</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">isAjax</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="form_key" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">form_key</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[name]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_name}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[name]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[sku]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_sku}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[sku]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[price]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${price_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[price]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[tax_class_id]admin" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">2</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[tax_class_id]admin</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[weight]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">3</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[weight]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_category_id}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[category_ids][]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${category_additional}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[category_ids][]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[description]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">&lt;p&gt;Configurable product description ${configurable_product_id} Edited&lt;/p&gt;</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[description]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[status]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[status]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[meta_title]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_name} Meta Title Edited</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[meta_title]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_name} Meta Keyword Edited</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[meta_description]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_name} Meta Description Edited</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[meta_description]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[website_ids][]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[website_ids][]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[special_price]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${special_price_new}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[special_price]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[special_from_date]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[special_from_date]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[special_to_date]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[special_to_date]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[cost]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[cost]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">0</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_design]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_design]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_design_from]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_design_to]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[page_layout]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value"/>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[page_layout]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[options_container]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">container2</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[options_container]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[configurable_variation]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_attribute_id}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[configurable_variation]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[url_key]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">${configurable_product_name}</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[url_key]</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[visibility]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">4</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[visibility]</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">1</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-+                        <stringProp name="Argument.desc">true</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">50</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                      <elementProp name="product[stock_data][type_id]" elementType="HTTPArgument">
-+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                        <stringProp name="Argument.value">configurable</stringProp>
-+                        <stringProp name="Argument.metadata">=</stringProp>
-+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                        <stringProp name="Argument.name">product[stock_data][type_id]</stringProp>
-+                        <stringProp name="Argument.desc">false</stringProp>
-+                      </elementProp>
-+                    </collectionProp>
-+                  </elementProp>
-+                  <stringProp name="HTTPSampler.domain"/>
-+                  <stringProp name="HTTPSampler.port"/>
-+                  <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+                  <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+                  <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+                  <stringProp name="HTTPSampler.contentEncoding"/>
-+                  <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/id/${configurable_product_id}/back/edit/active_tab/product-details/</stringProp>
-+                  <stringProp name="HTTPSampler.method">POST</stringProp>
-+                  <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+                  <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+                  <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+                  <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+                  <boolProp name="HTTPSampler.monitor">false</boolProp>
-+                  <stringProp name="HTTPSampler.embedded_url_re"/>
-+                </HTTPSamplerProxy>
-+                <hashTree>
-+                  <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="Configure product options" enabled="true">
-+                    <boolProp name="resetInterpreter">false</boolProp>
-+                    <stringProp name="parameters"/>
-+                    <stringProp name="filename"/>
-+                    <stringProp name="script">try {
-+    	int attributesCount = Integer.parseInt(vars.get("configurable_attribute_ids_matchNr"));
-+    	for (int i = 1; i &lt;= attributesCount; i++) {
-+    		attributeId = vars.get("configurable_attribute_ids_" + i.toString());
-+    		attributeCode = vars.get("configurable_attribute_codes_" + i.toString());
-+    		attributeLabel = vars.get("configurable_attribute_labels_" + i.toString());
-+    		ctx.getCurrentSampler().addArgument("attributes[" + (i - 1).toString() + "]", attributeId);
-+    		ctx.getCurrentSampler().addArgument("attribute_codes[" + (i - 1).toString() + "]", attributeCode);
-+    		ctx.getCurrentSampler().addArgument("product[" + attributeCode + "]", attributeId);
-+    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][attribute_id]", attributeId);
-+    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][position]", (i - 1).toString());
-+    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][code]", attributeCode);
-+    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][label]", attributeLabel);
-+
-+    		int valuesCount = Integer.parseInt(vars.get("attribute_" + attributeId + "_values_matchNr"));
-+    		for (int j = 1; j &lt;= valuesCount; j++) {
-+    			attributeValue = vars.get("attribute_" + attributeId + "_values_" + j.toString());
-+    			ctx.getCurrentSampler().addArgument(
-+    				"product[configurable_attributes_data][" + attributeId + "][values][" + attributeValue + "][include]",
-+    				"1"
-+    			);
-+    			ctx.getCurrentSampler().addArgument(
-+    				"product[configurable_attributes_data][" + attributeId + "][values][" + attributeValue + "][value_index]",
-+    				attributeValue
-+    			);
-+    		}
-+    	}
-+    	ctx.getCurrentSampler().addArgument("associated_product_ids_serialized", vars.get("associated_products_ids").toString());
-+    } catch (Exception e) {
-+        log.error("error???", e);
-+    }</stringProp>
-+                  </BeanShellPreProcessor>
-+                  <hashTree/>
-+                  <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+                    <collectionProp name="Asserion.test_strings">
-+                      <stringProp name="-583471546">You saved the product</stringProp>
-+                    </collectionProp>
-+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+                    <boolProp name="Assertion.assume_success">false</boolProp>
-+                    <intProp name="Assertion.test_type">2</intProp>
-+                    <stringProp name="TestPlan.comments"> if have trouble see messages-message-error </stringProp>
-+                  </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Admin Returns Management" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAdminReturnsManagementPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Admin Returns Management");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-+        <stringProp name="script">
-+        function getFormKeyFromResponse()
-+        {
-+            var url = prev.getUrlAsString(),
-+            responseCode =  prev.getResponseCode(),
-+            formKey = null;
-+            searchPattern = /var FORM_KEY = '(.+)'/;
-+            if (responseCode == "200" &amp;&amp; url) {
-+                response = prev.getResponseDataAsString();
-+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-+            }
-+            return formKey;
-+        }
-+
-+        formKey = vars.get("form_key_storage");
-+
-+	   currentFormKey = getFormKeyFromResponse();
-+
-+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-+		  vars.put("form_key_storage", currentFormKey);
-+	   }
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+        <hashTree/>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-+            <stringProp name="script">
-+                formKey =  vars.get("form_key_storage");
-+                if (formKey
-+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+                    &amp;&amp; sampler.getMethod() == "POST")
-+                    {
-+                        arguments = sampler.getArguments();
-+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-+                        {
-+                            argument = arguments.getArgument(i);
-+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-+                            argument.setValue(formKey);
-+                        }
-+                    }
-+                }
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        </JSR223PreProcessor>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies"/>
-+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+adminUserList = props.get("adminUserList");
-+adminUserListIterator = props.get("adminUserListIterator");
-+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+
-+if (adminUsersDistribution == 1) {
-+    adminUser = adminUserList.poll();
-+} else {
-+    if (!adminUserListIterator.hasNext()) {
-+        adminUserListIterator = adminUserList.descendingIterator();
-+    }
-+
-+    adminUser = adminUserListIterator.next();
-+}
-+
-+if (adminUser == null) {
-+  SampleResult.setResponseMessage("adminUser list is empty");
-+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("admin_user", adminUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1397214398">Welcome</stringProp>
-+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_form_key</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="dummy" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">dummy</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_user}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-+        <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Orders page" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments"/>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/</stringProp>
-+    <stringProp name="HTTPSampler.method">GET</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/orders_page.jmx</stringProp></HTTPSamplerProxy>
-+  <hashTree>
-+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+      <collectionProp name="Asserion.test_strings">
-+        <stringProp name="1204796042">Create New Order</stringProp>
-+      </collectionProp>
-+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+      <boolProp name="Assertion.assume_success">false</boolProp>
-+      <intProp name="Assertion.test_type">2</intProp>
-+    </ResponseAssertion>
-+    <hashTree/>
-+  </hashTree>
-+
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Orders" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments">
-+        <elementProp name="namespace" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">sales_order_grid</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">namespace</stringProp>
-+        </elementProp>
-+        <elementProp name="search" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value"/>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">search</stringProp>
-+        </elementProp>
-+        <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">true</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+        </elementProp>
-+        <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">200</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+        </elementProp>
-+        <elementProp name="paging[current]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">1</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">paging[current]</stringProp>
-+        </elementProp>
-+        <elementProp name="sorting[field]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">increment_id</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">sorting[field]</stringProp>
-+        </elementProp>
-+        <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">desc</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">sorting[direction]</stringProp>
-+        </elementProp>
-+        <elementProp name="isAjax" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">true</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">isAjax</stringProp>
-+        </elementProp>
-+        <elementProp name="form_key" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">form_key</stringProp>
-+          <stringProp name="Argument.desc">false</stringProp>
-+        </elementProp>
-+        <elementProp name="filters[status]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">pending</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">filters[status]</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="_" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">_</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+    <stringProp name="HTTPSampler.method">GET</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/open_orders.jmx</stringProp></HTTPSamplerProxy>
-+  <hashTree>
-+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+      <collectionProp name="Asserion.test_strings">
-+        <stringProp name="1637639774">totalRecords</stringProp>
-+      </collectionProp>
-+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+      <boolProp name="Assertion.assume_success">false</boolProp>
-+      <intProp name="Assertion.test_type">2</intProp>
-+    </ResponseAssertion>
-+    <hashTree/>
-+  </hashTree>
-+
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search Pending Orders" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments">
-+        <elementProp name="form_key" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">form_key</stringProp>
-+        </elementProp>
-+        <elementProp name="namespace" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">sales_order_grid</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">namespace</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="search" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value"/>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">search</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">true</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">200</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="paging[current]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">1</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">paging[current]</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="sorting[field]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">increment_id</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">sorting[field]</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">asc</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">sorting[direction]</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="isAjax" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">true</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">isAjax</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="filters[status]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">pending</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">filters[status]</stringProp>
-+        </elementProp>
-+        <elementProp name="_" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">_</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+    <stringProp name="HTTPSampler.method">GET</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/search_orders.jmx</stringProp></HTTPSamplerProxy>
-+<hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1637639774">totalRecords</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order numbers" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">order_numbers</stringProp>
-+        <stringProp name="RegexExtractor.regex">\"increment_id\":\"(\d+)\"\,</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+        <stringProp name="Scope.variable">simple_products</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order ids" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">order_ids</stringProp>
-+        <stringProp name="RegexExtractor.regex">\"entity_id\":\"(\d+)\"\,</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+        <stringProp name="Scope.variable">simple_products</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+    </hashTree>
-+
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Generate Unique Ids for each Thread" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+  import java.util.ArrayList;
-+  import java.util.HashMap;
-+  import org.apache.jmeter.protocol.http.util.Base64Encoder;
-+  import java.util.Random;
-+
-+  // get count of "order_numbers" variable defined in "Search Pending Orders Limit"
-+  int ordersCount = Integer.parseInt(vars.get("order_numbers_matchNr"));
-+
-+
-+  int clusterLength;
-+  int threadsNumber = ctx.getThreadGroup().getNumThreads();
-+  if (threadsNumber == 0) {
-+      //Number of orders for one thread
-+      clusterLength = ordersCount;
-+  } else {
-+      clusterLength = Math.round(ordersCount / threadsNumber);
-+      if (clusterLength == 0) {
-+          clusterLength = 1;
-+      }
-+  }
-+
-+  //Current thread number starts from 0
-+  int currentThreadNum = ctx.getThreadNum();
-+
-+  //Index of the current product from the cluster
-+  Random random = new Random();
-+  if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+  }
-+  int iterator = random.nextInt(clusterLength);
-+  if (iterator == 0) {
-+  	iterator = 1;
-+  }
-+
-+  int i = clusterLength * currentThreadNum + iterator;
-+
-+  orderNumber = vars.get("order_numbers_" + i.toString());
-+  orderId = vars.get("order_ids_" + i.toString());
-+  vars.put("order_number", orderNumber);
-+  vars.put("order_id", orderId);
-+
-+  </stringProp>
-+    <stringProp name="BeanShellSampler.filename"/>
-+    <stringProp name="BeanShellSampler.parameters"/>
-+    <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-+  </BeanShellSampler>
-+  <hashTree/>
-+
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Order" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments"/>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/view/order_id/${order_id}/</stringProp>
-+    <stringProp name="HTTPSampler.method">GET</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/open_order.jmx</stringProp></HTTPSamplerProxy>
-+  <hashTree>
-+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+      <collectionProp name="Asserion.test_strings">
-+        <stringProp name="2103620713">#${order_number}</stringProp>
-+      </collectionProp>
-+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+      <boolProp name="Assertion.assume_success">false</boolProp>
-+      <intProp name="Assertion.test_type">2</intProp>
-+    </ResponseAssertion>
-+    <hashTree/>
-+    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order status" enabled="true">
-+      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+      <stringProp name="RegexExtractor.refname">order_status</stringProp>
-+      <stringProp name="RegexExtractor.regex">&lt;span id="order_status"&gt;([^&lt;]+)&lt;/span&gt;</stringProp>
-+      <stringProp name="RegexExtractor.template">$1$</stringProp>
-+      <stringProp name="RegexExtractor.default"/>
-+      <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      <stringProp name="Scope.variable">simple_products</stringProp>
-+    </RegexExtractor>
-+    <hashTree/>
-+  </hashTree>
-+
-+    <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
-+      <stringProp name="IfController.condition">"${order_status}" == "Pending"</stringProp>
-+      <boolProp name="IfController.evaluateAll">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/if_controller.jmx</stringProp></IfController>
-+    <hashTree>
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Invoice Start" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments"/>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/start/order_id/${order_id}/</stringProp>
-+    <stringProp name="HTTPSampler.method">GET</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/invoice_start.jmx</stringProp></HTTPSamplerProxy>
-+  <hashTree>
-+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+      <collectionProp name="Asserion.test_strings">
-+        <stringProp name="-1233850814">Invoice Totals</stringProp>
-+      </collectionProp>
-+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+      <boolProp name="Assertion.assume_success">false</boolProp>
-+      <intProp name="Assertion.test_type">2</intProp>
-+    </ResponseAssertion>
-+    <hashTree/>
-+    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract ordered items ids" enabled="true">
-+      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+      <stringProp name="RegexExtractor.refname">item_ids</stringProp>
-+      <stringProp name="RegexExtractor.regex">&lt;div id="order_item_(\d+)_title"\s*class="product-title"&gt;</stringProp>
-+      <stringProp name="RegexExtractor.template">$1$</stringProp>
-+      <stringProp name="RegexExtractor.default"/>
-+      <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+      <stringProp name="Scope.variable">simple_products</stringProp>
-+    </RegexExtractor>
-+    <hashTree/>
-+  </hashTree>
-+
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Invoice Submit" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments">
-+        <elementProp name="form_key" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">form_key</stringProp>
-+          <stringProp name="Argument.desc">false</stringProp>
-+        </elementProp>
-+        <elementProp name="invoice[items][${item_ids_1}]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">1</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">invoice[items][${item_ids_1}]</stringProp>
-+        </elementProp>
-+        <elementProp name="invoice[items][${item_ids_2}]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">1</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">invoice[items][${item_ids_2}]</stringProp>
-+        </elementProp>
-+        <elementProp name="invoice[comment_text]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">Invoiced</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">invoice[comment_text]</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/save/order_id/${order_id}/</stringProp>
-+    <stringProp name="HTTPSampler.method">POST</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/invoice_submit.jmx</stringProp></HTTPSamplerProxy>
-+  <hashTree>
-+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+      <collectionProp name="Asserion.test_strings">
-+        <stringProp name="1740524604">The invoice has been created</stringProp>
-+      </collectionProp>
-+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+      <boolProp name="Assertion.assume_success">false</boolProp>
-+      <intProp name="Assertion.test_type">2</intProp>
-+    </ResponseAssertion>
-+    <hashTree/>
-+  </hashTree>
-+
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Credit Memo Start" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments"/>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_creditmemo/start/order_id/${order_id}/</stringProp>
-+    <stringProp name="HTTPSampler.method">GET</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/credit_memo_start.jmx</stringProp></HTTPSamplerProxy>
-+  <hashTree>
-+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+      <collectionProp name="Asserion.test_strings">
-+        <stringProp name="1382627322">New Memo</stringProp>
-+      </collectionProp>
-+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+      <boolProp name="Assertion.assume_success">false</boolProp>
-+      <intProp name="Assertion.test_type">2</intProp>
-+    </ResponseAssertion>
-+    <hashTree/>
-+  </hashTree>
-+
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Credit Memo Submit - Full Refund" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments">
-+        <elementProp name="form_key" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">form_key</stringProp>
-+          <stringProp name="Argument.desc">false</stringProp>
-+        </elementProp>
-+        <elementProp name="creditmemo[items][${item_ids_1}][qty]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">1</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">creditmemo[items][${item_ids_1}][qty]</stringProp>
-+        </elementProp>
-+        <elementProp name="creditmemo[items][${item_ids_2}][qty]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">1</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">creditmemo[items][${item_ids_2}][qty]</stringProp>
-+        </elementProp>
-+        <elementProp name="creditmemo[do_offline]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">1</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">creditmemo[do_offline]</stringProp>
-+        </elementProp>
-+        <elementProp name="creditmemo[comment_text]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">Credit Memo added</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">creditmemo[comment_text]</stringProp>
-+        </elementProp>
-+        <elementProp name="creditmemo[shipping_amount]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">10</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">creditmemo[shipping_amount]</stringProp>
-+        </elementProp>
-+        <elementProp name="creditmemo[adjustment_positive]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">0</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">creditmemo[adjustment_positive]</stringProp>
-+        </elementProp>
-+        <elementProp name="creditmemo[adjustment_negative]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">0</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">creditmemo[adjustment_negative]</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_creditmemo/save/order_id/${order_id}/</stringProp>
-+    <stringProp name="HTTPSampler.method">POST</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/credit_memo_full_refund.jmx</stringProp></HTTPSamplerProxy>
-+  <hashTree>
-+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-515117447">You created the credit memo</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+    <hashTree/>
-+  </hashTree>
-+
-+    <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Create/Process Returns - Pause" enabled="true">
-+      <intProp name="ActionProcessor.action">1</intProp>
-+      <intProp name="ActionProcessor.target">0</intProp>
-+      <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${adminCreateProcessReturnsDelay}*1000))}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/pause.jmx</stringProp></TestAction>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Admin Browse Customer Grid" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAdminBrowseCustomerGridPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Admin Browse Customer Grid");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-+        <stringProp name="script">
-+        function getFormKeyFromResponse()
-+        {
-+            var url = prev.getUrlAsString(),
-+            responseCode =  prev.getResponseCode(),
-+            formKey = null;
-+            searchPattern = /var FORM_KEY = '(.+)'/;
-+            if (responseCode == "200" &amp;&amp; url) {
-+                response = prev.getResponseDataAsString();
-+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-+            }
-+            return formKey;
-+        }
-+
-+        formKey = vars.get("form_key_storage");
-+
-+	   currentFormKey = getFormKeyFromResponse();
-+
-+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-+		  vars.put("form_key_storage", currentFormKey);
-+	   }
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+        <hashTree/>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-+            <stringProp name="script">
-+                formKey =  vars.get("form_key_storage");
-+                if (formKey
-+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+                    &amp;&amp; sampler.getMethod() == "POST")
-+                    {
-+                        arguments = sampler.getArguments();
-+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-+                        {
-+                            argument = arguments.getArgument(i);
-+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-+                            argument.setValue(formKey);
-+                        }
-+                    }
-+                }
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        </JSR223PreProcessor>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies"/>
-+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+adminUserList = props.get("adminUserList");
-+adminUserListIterator = props.get("adminUserListIterator");
-+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+
-+if (adminUsersDistribution == 1) {
-+    adminUser = adminUserList.poll();
-+} else {
-+    if (!adminUserListIterator.hasNext()) {
-+        adminUserListIterator = adminUserList.descendingIterator();
-+    }
-+
-+    adminUser = adminUserListIterator.next();
-+}
-+
-+if (adminUser == null) {
-+  SampleResult.setResponseMessage("adminUser list is empty");
-+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("admin_user", adminUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1397214398">Welcome</stringProp>
-+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_form_key</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="dummy" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">dummy</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_user}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-+        <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Set Arguments" enabled="true">
-+      <stringProp name="script">
-+        vars.put("gridEntityType" , "Customer");
-+
-+        pagesCount = parseInt(vars.get("customers_page_size")) || 20;
-+        vars.put("grid_entity_page_size" , pagesCount);
-+        vars.put("grid_namespace" , "customer_listing");
-+        vars.put("grid_admin_browse_filter_text" , vars.get("admin_browse_customer_filter_text"));
-+        vars.put("grid_filter_field", "name");
-+
-+        // set sort fields and sort directions
-+        vars.put("grid_sort_field_1", "name");
-+        vars.put("grid_sort_field_2", "group_id");
-+        vars.put("grid_sort_field_3", "billing_country_id");
-+        vars.put("grid_sort_order_1", "asc");
-+        vars.put("grid_sort_order_2", "desc");
-+      </stringProp>
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_customers_grid/setup.jmx</stringProp></JSR223PostProcessor>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Set ${gridEntityType} Pages Count" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="namespace" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_namespace}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">namespace</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="search" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">search</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[current]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[current]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[field]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">entity_id</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[field]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">asc</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="isAjax" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">isAjax</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/set_pages_count.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
-+        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
-+        <stringProp name="EXPECTED_VALUE">0</stringProp>
-+        <boolProp name="JSONVALIDATION">true</boolProp>
-+        <boolProp name="EXPECT_NULL">false</boolProp>
-+        <boolProp name="INVERT">true</boolProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <hashTree/>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
-+        <stringProp name="VAR">entity_total_records</stringProp>
-+        <stringProp name="JSONPATH">$.totalRecords</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Calculate ${gridEntityType} pages count" enabled="true">
-+        <stringProp name="cacheKey"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="parameters"/>
-+        <stringProp name="script">
-+          var pageSize = parseInt(vars.get("grid_entity_page_size")) || 20;
-+          var totalsRecord = parseInt(vars.get("entity_total_records"));
-+          var pageCount = Math.round(totalsRecord/pageSize);
-+
-+          vars.put("grid_pages_count", pageCount);
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+      </JSR223PostProcessor>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Set ${gridEntityType} Filtered Pages Count" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="namespace" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_namespace}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">namespace</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="search" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">search</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_admin_browse_filter_text}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[current]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[current]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[field]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">entity_id</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[field]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">asc</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="isAjax" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">isAjax</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/set_filtered_pages_count.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
-+        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
-+        <stringProp name="EXPECTED_VALUE">0</stringProp>
-+        <boolProp name="JSONVALIDATION">true</boolProp>
-+        <boolProp name="EXPECT_NULL">false</boolProp>
-+        <boolProp name="INVERT">true</boolProp>
-+        <boolProp name="ISREGEX">true</boolProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <hashTree/>
-+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
-+        <stringProp name="VAR">entity_total_records</stringProp>
-+        <stringProp name="JSONPATH">$.totalRecords</stringProp>
-+        <stringProp name="DEFAULT"/>
-+        <stringProp name="VARIABLE"/>
-+        <stringProp name="SUBJECT">BODY</stringProp>
-+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <hashTree/>
-+      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Calculate ${gridEntityType} filtered pages count" enabled="true">
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+          var pageSize = parseInt(vars.get("grid_entity_page_size")) || 20;
-+var totalsRecord = parseInt(vars.get("entity_total_records"));
-+var pageCount = Math.round(totalsRecord/pageSize);
-+
-+vars.put("grid_pages_count_filtered", pageCount);
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+      </JSR223PostProcessor>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="SetUp - Select ${gridEntityType} Page Number" enabled="true">
-+      <stringProp name="CounterConfig.start">1</stringProp>
-+      <stringProp name="CounterConfig.end">${grid_pages_count}</stringProp>
-+      <stringProp name="CounterConfig.incr">1</stringProp>
-+      <stringProp name="CounterConfig.name">page_number</stringProp>
-+      <stringProp name="CounterConfig.format"/>
-+      <boolProp name="CounterConfig.per_user">true</boolProp>
-+      <boolProp name="CounterConfig.reset_on_tg_iteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/select_page_number.jmx</stringProp></CounterConfig>
-+    <hashTree/>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View ${gridEntityType} page" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="namespace" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_namespace}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">namespace</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="search" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">search</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="paging[current]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${page_number}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">paging[current]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[field]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">entity_id</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[field]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">asc</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+          <elementProp name="isAjax" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">isAjax</stringProp>
-+            <stringProp name="Argument.desc">true</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/admin_browse_grid.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1637639774">\"totalRecords\":[^0]\d*</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="SetUp - Select Filtered ${gridEntityType} Page Number" enabled="true">
-+      <stringProp name="CounterConfig.start">1</stringProp>
-+      <stringProp name="CounterConfig.end">${grid_pages_count_filtered}</stringProp>
-+      <stringProp name="CounterConfig.incr">1</stringProp>
-+      <stringProp name="CounterConfig.name">page_number</stringProp>
-+      <stringProp name="CounterConfig.format"/>
-+      <boolProp name="CounterConfig.per_user">true</boolProp>
-+      <boolProp name="CounterConfig.reset_on_tg_iteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/select_filtered_page_number.jmx</stringProp></CounterConfig>
-+    <hashTree/>
-+  
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="View ${gridEntityType} page - Filtering + Sorting" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/admin_browse_grid_sort_and_filter.jmx</stringProp>
-+</TestFragmentController>
-+    <hashTree>
-+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Sort Field Defined" enabled="true">
-+        <stringProp name="ForeachController.inputVal">grid_sort_field</stringProp>
-+        <stringProp name="ForeachController.returnVal">grid_sort_field</stringProp>
-+        <boolProp name="ForeachController.useSeparator">true</boolProp>
-+        <stringProp name="ForeachController.startIndex">0</stringProp>
-+        <stringProp name="ForeachController.endIndex">3</stringProp>
-+      </ForeachController>
-+      <hashTree>
-+        <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Sort Order Defined" enabled="true">
-+          <stringProp name="ForeachController.inputVal">grid_sort_order</stringProp>
-+          <stringProp name="ForeachController.returnVal">grid_sort_order</stringProp>
-+          <boolProp name="ForeachController.useSeparator">true</boolProp>
-+          <stringProp name="ForeachController.startIndex">0</stringProp>
-+          <stringProp name="ForeachController.endIndex">2</stringProp>
-+        </ForeachController>
-+        <hashTree>
-+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View ${gridEntityType} page - Filtering + Sort By ${grid_sort_field} ${grid_sort_order}" enabled="true">
-+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+              <collectionProp name="Arguments.arguments">
-+                <elementProp name="namespace" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_namespace}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">namespace</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="filters[${grid_filter_field}]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_admin_browse_filter_text}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">filters[${grid_filter_field}]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">true</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="paging[current]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${page_number}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">paging[current]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="sorting[field]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_sort_field}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">sorting[field]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">${grid_sort_order}</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">sorting[direction]</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+                <elementProp name="isAjax" elementType="HTTPArgument">
-+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+                  <stringProp name="Argument.value">true</stringProp>
-+                  <stringProp name="Argument.metadata">=</stringProp>
-+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+                  <stringProp name="Argument.name">isAjax</stringProp>
-+                  <stringProp name="Argument.desc">false</stringProp>
-+                </elementProp>
-+              </collectionProp>
-+            </elementProp>
-+            <stringProp name="HTTPSampler.domain"/>
-+            <stringProp name="HTTPSampler.port"/>
-+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+            <stringProp name="HTTPSampler.contentEncoding"/>
-+            <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+            <stringProp name="HTTPSampler.method">GET</stringProp>
-+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+            <boolProp name="HTTPSampler.monitor">false</boolProp>
-+            <stringProp name="HTTPSampler.embedded_url_re"/>
-+          </HTTPSamplerProxy>
-+          <hashTree>
-+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+              <collectionProp name="Asserion.test_strings">
-+                <stringProp name="1637639774">\"totalRecords\":[^0]\d*</stringProp>
-+              </collectionProp>
-+              <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+              <boolProp name="Assertion.assume_success">false</boolProp>
-+              <intProp name="Assertion.test_type">2</intProp>
-+            </ResponseAssertion>
-+            <hashTree/>
-+          </hashTree>
-+        </hashTree>
-+      </hashTree>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Admin Create Order" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAdminCreateOrderPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Admin Create Order");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-+        <stringProp name="script">
-+        function getFormKeyFromResponse()
-+        {
-+            var url = prev.getUrlAsString(),
-+            responseCode =  prev.getResponseCode(),
-+            formKey = null;
-+            searchPattern = /var FORM_KEY = '(.+)'/;
-+            if (responseCode == "200" &amp;&amp; url) {
-+                response = prev.getResponseDataAsString();
-+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-+            }
-+            return formKey;
-+        }
-+
-+        formKey = vars.get("form_key_storage");
-+
-+	   currentFormKey = getFormKeyFromResponse();
-+
-+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-+		  vars.put("form_key_storage", currentFormKey);
-+	   }
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+        <hashTree/>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-+            <stringProp name="script">
-+                formKey =  vars.get("form_key_storage");
-+                if (formKey
-+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+                    &amp;&amp; sampler.getMethod() == "POST")
-+                    {
-+                        arguments = sampler.getArguments();
-+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-+                        {
-+                            argument = arguments.getArgument(i);
-+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-+                            argument.setValue(formKey);
-+                        }
-+                    }
-+                }
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        </JSR223PreProcessor>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies"/>
-+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+adminUserList = props.get("adminUserList");
-+adminUserListIterator = props.get("adminUserListIterator");
-+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+
-+if (adminUsersDistribution == 1) {
-+    adminUser = adminUserList.poll();
-+} else {
-+    if (!adminUserListIterator.hasNext()) {
-+        adminUserListIterator = adminUserList.descendingIterator();
-+    }
-+
-+    adminUser = adminUserListIterator.next();
-+}
-+
-+if (adminUser == null) {
-+  SampleResult.setResponseMessage("adminUser list is empty");
-+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("admin_user", adminUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1397214398">Welcome</stringProp>
-+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_form_key</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="dummy" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">dummy</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_user}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-+        <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Get region data" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">
-+      vars.put("alabama_region_id", props.get("alabama_region_id"));
-+      vars.put("california_region_id", props.get("california_region_id"));
-+</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/get_region_data.jmx</stringProp></JSR223PreProcessor>
-+    <hashTree/>
-+  
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Create Order" enabled="true"/>
-+    <hashTree>
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_order/admin_create_order.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
-+import java.util.Random;
-+Random random = new Random();
-+if (${seedForRandom} &gt; 0) {
-+  random.setSeed(${seedForRandom});
-+}
-+number = random.nextInt(props.get("simple_products_list").size());
-+simpleList = props.get("simple_products_list").get(number);
-+vars.put("simple_product_1_url_key", simpleList.get("url_key"));
-+vars.put("simple_product_1_name", simpleList.get("title"));
-+vars.put("simple_product_1_id", simpleList.get("id"));
-+
-+do {
-+    number1 = random.nextInt(props.get("simple_products_list").size());
-+} while(number == number1);
-+simpleList = props.get("simple_products_list").get(number1);
-+vars.put("simple_product_2_url_key", simpleList.get("url_key"));
-+vars.put("simple_product_2_name", simpleList.get("title"));
-+vars.put("simple_product_2_id", simpleList.get("id"));
-+
-+number = random.nextInt(props.get("configurable_products_list").size());
-+configurableList = props.get("configurable_products_list").get(number);
-+vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
-+vars.put("configurable_product_1_name", configurableList.get("title"));
-+vars.put("configurable_product_1_id", configurableList.get("id"));
-+vars.put("configurable_product_1_sku", configurableList.get("sku"));
-+vars.put("configurable_attribute_id", configurableList.get("attribute_id"));
-+vars.put("configurable_option_id", configurableList.get("attribute_option_id"));
-+
-+
-+customers_index = 0;
-+if (!props.containsKey("customer_ids_index")) {
-+	props.put("customer_ids_index", customers_index);
-+}
-+
-+try {
-+	customers_index = props.get("customer_ids_index");
-+	customers_list = props.get("customer_ids_list");
-+
-+	if (customers_index == customers_list.size()) {
-+		customers_index=0;
-+	}
-+	vars.put("customer_id", customers_list.get(customers_index));
-+	props.put("customer_ids_index", ++customers_index);
-+}
-+catch (java.lang.Exception e) {
-+	   log.error("Caught Exception in 'Admin Create Order' thread.");
-+	   SampleResult.setStopThread(true);
-+}</stringProp>
-+        <stringProp name="BeanShellSampler.filename"/>
-+        <stringProp name="BeanShellSampler.parameters"/>
-+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+      </BeanShellSampler>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Start Order" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/start/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
-+      </HTTPSamplerProxy>
-+      <hashTree/>
-+      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Get Configurable Product Options" enabled="true"/>
-+      <hashTree>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="" elementType="Header">
-+              <stringProp name="Header.name">Content-Type</stringProp>
-+              <stringProp name="Header.value">application/json</stringProp>
-+            </elementProp>
-+            <elementProp name="" elementType="Header">
-+              <stringProp name="Header.name">Accept</stringProp>
-+              <stringProp name="Header.value">*/*</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-+        <hashTree/>
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-+          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+            <collectionProp name="Arguments.arguments">
-+              <elementProp name="" elementType="HTTPArgument">
-+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-+                <stringProp name="Argument.metadata">=</stringProp>
-+              </elementProp>
-+            </collectionProp>
-+          </elementProp>
-+          <stringProp name="HTTPSampler.domain"/>
-+          <stringProp name="HTTPSampler.port"/>
-+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+          <stringProp name="HTTPSampler.contentEncoding"/>
-+          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-+          <stringProp name="HTTPSampler.method">POST</stringProp>
-+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+          <boolProp name="HTTPSampler.monitor">false</boolProp>
-+          <stringProp name="HTTPSampler.embedded_url_re"/>
-+        </HTTPSamplerProxy>
-+        <hashTree>
-+          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-+            <stringProp name="VAR">admin_token</stringProp>
-+            <stringProp name="JSONPATH">$</stringProp>
-+            <stringProp name="DEFAULT"/>
-+            <stringProp name="VARIABLE"/>
-+            <stringProp name="SUBJECT">BODY</stringProp>
-+          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+          <hashTree/>
-+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-+            <collectionProp name="Asserion.test_strings">
-+              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-+            </collectionProp>
-+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+            <boolProp name="Assertion.assume_success">false</boolProp>
-+            <intProp name="Assertion.test_type">1</intProp>
-+            <stringProp name="Assertion.scope">variable</stringProp>
-+            <stringProp name="Scope.variable">admin_token</stringProp>
-+          </ResponseAssertion>
-+          <hashTree/>
-+        </hashTree>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="" elementType="Header">
-+              <stringProp name="Header.name">Authorization</stringProp>
-+              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-+        <hashTree/>
-+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get Configurable Product Options" enabled="true">
-+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+            <collectionProp name="Arguments.arguments"/>
-+          </elementProp>
-+          <stringProp name="HTTPSampler.domain"/>
-+          <stringProp name="HTTPSampler.port"/>
-+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+          <stringProp name="HTTPSampler.contentEncoding"/>
-+          <stringProp name="HTTPSampler.path">${base_path}rest/V1/configurable-products/${configurable_product_1_sku}/options/all</stringProp>
-+          <stringProp name="HTTPSampler.method">GET</stringProp>
-+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+          <boolProp name="HTTPSampler.monitor">false</boolProp>
-+          <stringProp name="HTTPSampler.embedded_url_re"/>
-+        </HTTPSamplerProxy>
-+        <hashTree>
-+          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="JSON Path Extractor: Extract attribute_ids" enabled="true">
-+            <stringProp name="VAR">attribute_ids</stringProp>
-+            <stringProp name="JSONPATH">$.[*].attribute_id</stringProp>
-+            <stringProp name="DEFAULT">NO_VALUE</stringProp>
-+            <stringProp name="VARIABLE"/>
-+            <stringProp name="SUBJECT">BODY</stringProp>
-+          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+          <hashTree/>
-+          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="JSON Path Extractor: Extract option_values" enabled="true">
-+            <stringProp name="VAR">option_values</stringProp>
-+            <stringProp name="JSONPATH">$.[*].values[0].value_index</stringProp>
-+            <stringProp name="DEFAULT">NO_VALUE</stringProp>
-+            <stringProp name="VARIABLE"/>
-+            <stringProp name="SUBJECT">BODY</stringProp>
-+          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+          <hashTree/>
-+        </hashTree>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Products" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="item[${simple_product_1_id}][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">item[${simple_product_1_id}][qty]</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="item[${simple_product_2_id}][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">item[${simple_product_2_id}][qty]</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="item[${configurable_product_1_id}][qty]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">item[${configurable_product_1_id}][qty]</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="customer_id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">customer_id</stringProp>
-+              <stringProp name="Argument.value">${customer_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="store_id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">store_id</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="currency_id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">currency_id</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="payment[method]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">payment[method]</stringProp>
-+              <stringProp name="Argument.value">checkmo</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="reset_shipping" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">reset_shipping</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="json" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">json</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="as_js_varname" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">as_js_varname</stringProp>
-+              <stringProp name="Argument.value">iFrameResponse</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/loadBlock/block/search,items,shipping_method,totals,giftmessage,billing_method?isAjax=true</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="Configure product options" enabled="true">
-+          <boolProp name="resetInterpreter">false</boolProp>
-+          <stringProp name="parameters"/>
-+          <stringProp name="filename"/>
-+          <stringProp name="script">try {
-+	attribute_ids = vars.get("attribute_ids");
-+	option_values = vars.get("option_values");
-+	attribute_ids = attribute_ids.replace("[","").replace("]","").replace("\"", "");
-+	option_values = option_values.replace("[","").replace("]","").replace("\"", "");
-+	attribute_ids_array = attribute_ids.split(",");
-+	option_values_array = option_values.split(",");
-+	args = ctx.getCurrentSampler().getArguments();
-+	it = args.iterator();
-+	while (it.hasNext()) {
-+	    argument = it.next();
-+	    if (argument.getStringValue().contains("${")) {
-+	        args.removeArgument(argument.getName());
-+	    }
-+	}
-+	for (int i = 0; i &lt; attribute_ids_array.length; i++) {
-+
-+    ctx.getCurrentSampler().addArgument("item[" + vars.get("configurable_product_1_id") + "][super_attribute][" + attribute_ids_array[i] + "]", option_values_array[i]);
-+	}
-+} catch (Exception e) {
-+    log.error("error???", e);
-+}</stringProp>
-+        </BeanShellPreProcessor>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Collect Shipping Rates" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="collect_shipping_rates" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">collect_shipping_rates</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="customer_id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">customer_id</stringProp>
-+              <stringProp name="Argument.value">${customer_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="store_id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">store_id</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="currency_id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">currency_id</stringProp>
-+              <stringProp name="Argument.value">false</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="payment[method]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">payment[method]</stringProp>
-+              <stringProp name="Argument.value">checkmo</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="json" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">json</stringProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/loadBlock/block/shipping_method,totals?isAjax=true</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Shipping Method" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-1987784558">shipping_method</stringProp>
-+            <stringProp name="818779431">Flat Rate</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Filled Order Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/index/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Filled Order Page" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-37823069">Select from existing customer addresses</stringProp>
-+            <stringProp name="-13185722">Submit Order</stringProp>
-+            <stringProp name="-209419315">Items Ordered</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Order" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="limit" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">limit</stringProp>
-+              <stringProp name="Argument.value">20</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="entity_id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">entity_id</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="name" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">name</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="email" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">email</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="Telephone" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">Telephone</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="billing_postcode" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">billing_postcode</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="billing_country_id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">billing_country_id</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="billing_regione" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">billing_regione</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="store_name" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">store_name</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="page" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">page</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[currency]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[currency]</stringProp>
-+              <stringProp name="Argument.value">USD</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="sku" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">sku</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="qty" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">qty</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="limit" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">limit</stringProp>
-+              <stringProp name="Argument.value">20</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="entity_id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">entity_id</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="name" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">name</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="sku" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">sku</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="price[from]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">price[from]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="price[to]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">price[to]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="in_products" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">in_products</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="page" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">page</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="coupon_code" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">coupon_code</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[account][group_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[account][group_id]</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[account][email]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[account][email]</stringProp>
-+              <stringProp name="Argument.value">user_${customer_id}@example.com</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][customer_address_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][customer_address_id]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][prefix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][prefix]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][firstname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][firstname]</stringProp>
-+              <stringProp name="Argument.value">Anthony</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][middlename]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][middlename]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][lastname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][lastname]</stringProp>
-+              <stringProp name="Argument.value">Nealy</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][suffix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][suffix]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][company]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][company]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][street][0]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][street][0]</stringProp>
-+              <stringProp name="Argument.value">123 Freedom Blvd. #123</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][street][1]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][street][1]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][city]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][city]</stringProp>
-+              <stringProp name="Argument.value">Fayetteville</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][country_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][country_id]</stringProp>
-+              <stringProp name="Argument.value">US</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][region]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][region]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][region_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][region_id]</stringProp>
-+              <stringProp name="Argument.value">${alabama_region_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][postcode]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][postcode]</stringProp>
-+              <stringProp name="Argument.value">123123</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][telephone]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][telephone]</stringProp>
-+              <stringProp name="Argument.value">022-333-4455</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][fax]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][fax]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[billing_address][vat_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[billing_address][vat_id]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="shipping_same_as_billing" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">shipping_same_as_billing</stringProp>
-+              <stringProp name="Argument.value">on</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="payment[method]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">payment[method]</stringProp>
-+              <stringProp name="Argument.value">checkmo</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[shipping_method]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[shipping_method]</stringProp>
-+              <stringProp name="Argument.value">flatrate_flatrate</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[comment][customer_note]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[comment][customer_note]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[comment][customer_note_notify]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[comment][customer_note_notify]</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="order[send_confirmation]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">order[send_confirmation]</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/save/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">true</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Order Id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">order_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">${host}${base_path}${admin_path}/sales/order/index/order_id/(\d+)/</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Order Item 1" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">order_item_1</stringProp>
-+          <stringProp name="RegexExtractor.regex">order_item_(\d+)_title</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Order Item 2" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">order_item_2</stringProp>
-+          <stringProp name="RegexExtractor.regex">order_item_(\d+)_title</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">2</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Order Item 3" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">order_item_3</stringProp>
-+          <stringProp name="RegexExtractor.regex">order_item_(\d+)_title</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">3</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">order_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Item 1" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">order_item_1</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Item 2" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">order_item_2</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Item 3" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">order_item_3</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Created" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="563107624">You created the order.</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Invoice" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="invoice[items][${order_item_1}]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">invoice[items][${order_item_1}]</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="invoice[items][${order_item_2}]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">invoice[items][${order_item_2}]</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="invoice[items][${order_item_3}]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">invoice[items][${order_item_3}]</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="invoice[comment_text]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">invoice[comment_text]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/save/order_id/${order_id}/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Invoice Created" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-1878312078">The invoice has been created.</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Shipment" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="shipment[items][${order_item_1}]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">shipment[items][${order_item_1}]</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="shipment[items][${order_item_2}]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">shipment[items][${order_item_2}]</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="shipment[items][${order_item_3}]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">shipment[items][${order_item_3}]</stringProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+            <elementProp name="shipment[comment_text]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.name">shipment[comment_text]</stringProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/order_shipment/save/order_id/${order_id}/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Shipment Created" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-348539683">The shipment has been created.</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Admin Category Management" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAdminCategoryManagementPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Admin Category Management");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-+        <stringProp name="script">
-+        function getFormKeyFromResponse()
-+        {
-+            var url = prev.getUrlAsString(),
-+            responseCode =  prev.getResponseCode(),
-+            formKey = null;
-+            searchPattern = /var FORM_KEY = '(.+)'/;
-+            if (responseCode == "200" &amp;&amp; url) {
-+                response = prev.getResponseDataAsString();
-+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-+            }
-+            return formKey;
-+        }
-+
-+        formKey = vars.get("form_key_storage");
-+
-+	   currentFormKey = getFormKeyFromResponse();
-+
-+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-+		  vars.put("form_key_storage", currentFormKey);
-+	   }
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+        <hashTree/>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-+            <stringProp name="script">
-+                formKey =  vars.get("form_key_storage");
-+                if (formKey
-+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+                    &amp;&amp; sampler.getMethod() == "POST")
-+                    {
-+                        arguments = sampler.getArguments();
-+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-+                        {
-+                            argument = arguments.getArgument(i);
-+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-+                            argument.setValue(formKey);
-+                        }
-+                    }
-+                }
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        </JSR223PreProcessor>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies"/>
-+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+adminUserList = props.get("adminUserList");
-+adminUserListIterator = props.get("adminUserListIterator");
-+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+
-+if (adminUsersDistribution == 1) {
-+    adminUser = adminUserList.poll();
-+} else {
-+    if (!adminUserListIterator.hasNext()) {
-+        adminUserListIterator = adminUserList.descendingIterator();
-+    }
-+
-+    adminUser = adminUserListIterator.next();
-+}
-+
-+if (adminUser == null) {
-+  SampleResult.setResponseMessage("adminUser list is empty");
-+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("admin_user", adminUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1397214398">Welcome</stringProp>
-+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_form_key</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="dummy" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">dummy</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_user}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-+        <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Category Management" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_category_management/admin_category_management.jmx</stringProp>
-+</TestFragmentController>
-+    <hashTree>
-+         <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Set Arguments" enabled="true">
-+      <stringProp name="scriptLanguage">javascript</stringProp>
-+      <stringProp name="parameters"/>
-+      <stringProp name="filename"/>
-+      <stringProp name="cacheKey"/>
-+      <stringProp name="script">random = new java.util.Random();
-+if (${seedForRandom} &gt; 0) {
-+random.setSeed(${seedForRandom} + ${__threadNum});
-+}
-+
-+/**
-+ * Get unique ids for fix concurrent category saving
-+ */
-+function getNextProductNumber(i) {
-+    number = productsVariationsSize * ${__threadNum} - i;
-+    if (number &gt;= productsSize) {
-+        log.info("${testLabel}: capacity of product list is not enough for support all ${adminPoolUsers} threads");
-+        return random.nextInt(productsSize);
-+    }
-+    return productsVariationsSize * ${__threadNum} - i;
-+}
-+
-+var productsVariationsSize = 5,
-+    productsSize = props.get("simple_products_list_for_edit").size();
-+
-+
-+for (i = 1; i&lt;= productsVariationsSize; i++) {
-+    var productVariablePrefix = "simple_product_" + i + "_";
-+    number = getNextProductNumber(i);
-+    simpleList = props.get("simple_products_list_for_edit").get(number);
-+
-+    vars.put(productVariablePrefix + "url_key", simpleList.get("url_key"));
-+    vars.put(productVariablePrefix + "id", simpleList.get("id"));
-+    vars.put(productVariablePrefix + "name", simpleList.get("title"));
-+}
-+
-+categoryIndex = random.nextInt(props.get("admin_category_ids_list").size());
-+vars.put("parent_category_id", props.get("admin_category_ids_list").get(categoryIndex));
-+do {
-+categoryIndexNew = random.nextInt(props.get("admin_category_ids_list").size());
-+} while(categoryIndex == categoryIndexNew);
-+vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(categoryIndexNew));</stringProp>
-+    </JSR223Sampler>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Landing Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="Accept-Language" elementType="Header">
-+              <stringProp name="Header.name">Accept-Language</stringProp>
-+              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept" elementType="Header">
-+              <stringProp name="Header.name">Accept</stringProp>
-+              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
-+            </elementProp>
-+            <elementProp name="User-Agent" elementType="Header">
-+              <stringProp name="Header.name">User-Agent</stringProp>
-+              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept-Encoding" elementType="Header">
-+              <stringProp name="Header.name">Accept-Encoding</stringProp>
-+              <stringProp name="Header.value">gzip, deflate</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+          <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Select parent category" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/edit/id/${parent_category_id}/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="Accept-Language" elementType="Header">
-+              <stringProp name="Header.name">Accept-Language</stringProp>
-+              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept" elementType="Header">
-+              <stringProp name="Header.name">Accept</stringProp>
-+              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
-+            </elementProp>
-+            <elementProp name="User-Agent" elementType="Header">
-+              <stringProp name="Header.name">User-Agent</stringProp>
-+              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept-Encoding" elementType="Header">
-+              <stringProp name="Header.name">Accept-Encoding</stringProp>
-+              <stringProp name="Header.value">gzip, deflate</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open new category page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/add/store/0/parent/${parent_category_id}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-1903925024">&lt;title&gt;New Category</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create category" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">id</stringProp>
-+            </elementProp>
-+            <elementProp name="parent" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${parent_category_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">parent</stringProp>
-+            </elementProp>
-+            <elementProp name="path" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">path</stringProp>
-+            </elementProp>
-+            <elementProp name="store_id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">store_id</stringProp>
-+            </elementProp>
-+            <elementProp name="is_active" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">is_active</stringProp>
-+            </elementProp>
-+            <elementProp name="include_in_menu" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">include_in_menu</stringProp>
-+            </elementProp>
-+            <elementProp name="is_anchor" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">is_anchor</stringProp>
-+            </elementProp>
-+            <elementProp name="use_config[available_sort_by]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">use_config[available_sort_by]</stringProp>
-+            </elementProp>
-+            <elementProp name="use_config[default_sort_by]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">use_config[default_sort_by]</stringProp>
-+            </elementProp>
-+            <elementProp name="use_config[filter_price_range]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">use_config[filter_price_range]</stringProp>
-+            </elementProp>
-+            <elementProp name="use_default[url_key]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">false</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">use_default[url_key]</stringProp>
-+            </elementProp>
-+            <elementProp name="url_key_create_redirect" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">url_key_create_redirect</stringProp>
-+            </elementProp>
-+            <elementProp name="custom_use_parent_settings" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">custom_use_parent_settings</stringProp>
-+            </elementProp>
-+            <elementProp name="custom_apply_to_products" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">custom_apply_to_products</stringProp>
-+            </elementProp>
-+            <elementProp name="name" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Admin Category Management ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">name</stringProp>
-+            </elementProp>
-+            <elementProp name="url_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">admin-category-management-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">url_key</stringProp>
-+            </elementProp>
-+            <elementProp name="meta_title" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">meta_title</stringProp>
-+            </elementProp>
-+            <elementProp name="description" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">description</stringProp>
-+            </elementProp>
-+            <elementProp name="display_mode" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">PRODUCTS</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">display_mode</stringProp>
-+            </elementProp>
-+            <elementProp name="default_sort_by" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">position</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">default_sort_by</stringProp>
-+            </elementProp>
-+            <elementProp name="meta_keywords" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">meta_keywords</stringProp>
-+            </elementProp>
-+            <elementProp name="meta_description" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">meta_description</stringProp>
-+            </elementProp>
-+            <elementProp name="custom_layout_update" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">custom_layout_update</stringProp>
-+            </elementProp>
-+            <elementProp name="category_products" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
-+              <stringProp name="Argument.value">{"${simple_product_1_id}":"","${simple_product_2_id}":"","${simple_product_3_id}":"","${simple_product_4_id}":"","${simple_product_5_id}":""}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">category_products</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/save/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">URL</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">/catalog/category/edit/id/(\d+)/</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Select created category" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/edit/id/${admin_category_id}/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="Accept-Language" elementType="Header">
-+              <stringProp name="Header.name">Accept-Language</stringProp>
-+              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept" elementType="Header">
-+              <stringProp name="Header.name">Accept</stringProp>
-+              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
-+            </elementProp>
-+            <elementProp name="User-Agent" elementType="Header">
-+              <stringProp name="Header.name">User-Agent</stringProp>
-+              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept-Encoding" elementType="Header">
-+              <stringProp name="Header.name">Accept-Encoding</stringProp>
-+              <stringProp name="Header.value">gzip, deflate</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category row id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_entity_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">"entity_id":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category attribute set id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_attribute_set_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">"attribute_set_id":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category parent Id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_parent_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">"parent_id":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category created at" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_created_at</stringProp>
-+          <stringProp name="RegexExtractor.regex">"created_at":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category updated at" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_updated_at</stringProp>
-+          <stringProp name="RegexExtractor.regex">"updated_at":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category path" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_path</stringProp>
-+          <stringProp name="RegexExtractor.regex">"entity_id":(.+)"path":"([^\"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$2$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category level" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_level</stringProp>
-+          <stringProp name="RegexExtractor.regex">"level":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category name" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_name</stringProp>
-+          <stringProp name="RegexExtractor.regex">"entity_id":(.+)"name":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$2$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category url key" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_url_key</stringProp>
-+          <stringProp name="RegexExtractor.regex">"url_key":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract category url path" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_category_url_path</stringProp>
-+          <stringProp name="RegexExtractor.regex">"url_path":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category row id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_entity_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category attribute set id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_attribute_set_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category parent id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_parent_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category created at" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_created_at</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category updated at" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_updated_at</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category path" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="59022110">^[\d\\\/]+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_path</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category level" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_level</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category name" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_name</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category url key" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_url_key</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category url path" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_category_url_path</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert products added" enabled="true">
-+            <collectionProp name="Asserion.test_strings">
-+              <stringProp name="417284990">${simple_product_1_name}</stringProp>
-+              <stringProp name="1304788671">${simple_product_2_name}</stringProp>
-+              <stringProp name="-2102674944">${simple_product_3_name}</stringProp>
-+              <stringProp name="-1215171263">${simple_product_4_name}</stringProp>
-+              <stringProp name="-327667582">${simple_product_5_name}</stringProp>
-+            </collectionProp>
-+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+            <boolProp name="Assertion.assume_success">false</boolProp>
-+            <intProp name="Assertion.test_type">2</intProp>
-+          </ResponseAssertion>
-+          <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Move category" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_category_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">id</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+            </elementProp>
-+            <elementProp name="point" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">append</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">point</stringProp>
-+            </elementProp>
-+            <elementProp name="pid" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${new_parent_category_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">pid</stringProp>
-+            </elementProp>
-+            <elementProp name="paid" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${parent_category_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">paid</stringProp>
-+            </elementProp>
-+            <elementProp name="aid" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">aid</stringProp>
-+            </elementProp>
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/move/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete category" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/delete/id/${admin_category_id}/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert category deleted" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="1277069529">You deleted the category.</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Pause" enabled="true">
-+        <intProp name="ActionProcessor.action">1</intProp>
-+        <intProp name="ActionProcessor.target">0</intProp>
-+        <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${adminCategoryManagementDelay}*1000))}</stringProp>
-+      </TestAction>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Admin Promotion Rules" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAdminPromotionRulesPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Admin Promotion Rules");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-+        <stringProp name="script">
-+        function getFormKeyFromResponse()
-+        {
-+            var url = prev.getUrlAsString(),
-+            responseCode =  prev.getResponseCode(),
-+            formKey = null;
-+            searchPattern = /var FORM_KEY = '(.+)'/;
-+            if (responseCode == "200" &amp;&amp; url) {
-+                response = prev.getResponseDataAsString();
-+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-+            }
-+            return formKey;
-+        }
-+
-+        formKey = vars.get("form_key_storage");
-+
-+	   currentFormKey = getFormKeyFromResponse();
-+
-+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-+		  vars.put("form_key_storage", currentFormKey);
-+	   }
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+        <hashTree/>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-+            <stringProp name="script">
-+                formKey =  vars.get("form_key_storage");
-+                if (formKey
-+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+                    &amp;&amp; sampler.getMethod() == "POST")
-+                    {
-+                        arguments = sampler.getArguments();
-+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-+                        {
-+                            argument = arguments.getArgument(i);
-+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-+                            argument.setValue(formKey);
-+                        }
-+                    }
-+                }
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        </JSR223PreProcessor>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies"/>
-+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+adminUserList = props.get("adminUserList");
-+adminUserListIterator = props.get("adminUserListIterator");
-+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+
-+if (adminUsersDistribution == 1) {
-+    adminUser = adminUserList.poll();
-+} else {
-+    if (!adminUserListIterator.hasNext()) {
-+        adminUserListIterator = adminUserList.descendingIterator();
-+    }
-+
-+    adminUser = adminUserListIterator.next();
-+}
-+
-+if (adminUser == null) {
-+  SampleResult.setResponseMessage("adminUser list is empty");
-+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("admin_user", adminUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1397214398">Welcome</stringProp>
-+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_form_key</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="dummy" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">dummy</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_user}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-+        <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Promotions Management" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_promotions_management/admin_promotions_management.jmx</stringProp>
-+</TestFragmentController>
-+    <hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Landing Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create New" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/new</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create New Conditional" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+              <stringProp name="Argument.desc">true</stringProp>
-+            </elementProp>
-+            <elementProp name="id" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1--1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">id</stringProp>
-+            </elementProp>
-+            <elementProp name="type" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Magento\SalesRule\Model\Rule\Condition\Address|base_subtotal</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">type</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/newConditionHtml/form/sales_rule_formrule_conditions_fieldset_/form_namespace/sales_rule_form</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree/>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="name" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Rule Name ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">name</stringProp>
-+            </elementProp>
-+            <elementProp name="is_active" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">is_active</stringProp>
-+            </elementProp>
-+            <elementProp name="use_auto_generation" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">use_auto_generation</stringProp>
-+            </elementProp>
-+            <elementProp name="is_rss" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">is_rss</stringProp>
-+            </elementProp>
-+            <elementProp name="apply_to_shipping" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">apply_to_shipping</stringProp>
-+            </elementProp>
-+            <elementProp name="stop_rules_processing" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">stop_rules_processing</stringProp>
-+            </elementProp>
-+            <elementProp name="coupon_code" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">coupon_code</stringProp>
-+            </elementProp>
-+            <elementProp name="uses_per_coupon" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">uses_per_coupon</stringProp>
-+            </elementProp>
-+            <elementProp name="uses_per_customer" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">uses_per_customer</stringProp>
-+            </elementProp>
-+            <elementProp name="sort_order" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">sort_order</stringProp>
-+            </elementProp>
-+            <elementProp name="discount_amount" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">5</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">discount_amount</stringProp>
-+            </elementProp>
-+            <elementProp name="discount_qty" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">discount_qty</stringProp>
-+            </elementProp>
-+            <elementProp name="discount_step" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">discount_step</stringProp>
-+            </elementProp>
-+            <elementProp name="reward_points_delta" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">reward_points_delta</stringProp>
-+            </elementProp>
-+            <elementProp name="store_labels[0]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">store_labels[0]</stringProp>
-+            </elementProp>
-+            <elementProp name="description" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Rule Description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">description</stringProp>
-+            </elementProp>
-+            <elementProp name="coupon_type" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">coupon_type</stringProp>
-+            </elementProp>
-+            <elementProp name="simple_action" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">cart_fixed</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">simple_action</stringProp>
-+            </elementProp>
-+            <elementProp name="website_ids[0]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">website_ids[0]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer_group_ids[0]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">0</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer_group_ids[0]</stringProp>
-+            </elementProp>
-+            <elementProp name="from_date" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">from_date</stringProp>
-+            </elementProp>
-+            <elementProp name="to_date" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">to_date</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Magento\SalesRule\Model\Rule\Condition\Combine</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1][type]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1][aggregator]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">all</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1][aggregator]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1][value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1][value]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1--1][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Magento\SalesRule\Model\Rule\Condition\Address</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1--1][type]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1--1][attribute]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">base_subtotal</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1--1][attribute]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1--1][operator]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">&gt;=</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1--1][operator]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1--1][value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">100</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1--1][value]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[conditions][1][new_chlid]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[conditions][1][new_chlid]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[actions][1][type]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Magento\SalesRule\Model\Rule\Condition\Product\Combine</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[actions][1][type]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[actions][1][aggregator]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">all</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[actions][1][aggregator]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[actions][1][value]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[actions][1][value]</stringProp>
-+            </elementProp>
-+            <elementProp name="rule[actions][1][new_child]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">rule[actions][1][new_child]</stringProp>
-+            </elementProp>
-+            <elementProp name="store_labels[1]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">store_labels[1]</stringProp>
-+            </elementProp>
-+            <elementProp name="store_labels[2]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">store_labels[2]</stringProp>
-+            </elementProp>
-+            <elementProp name="related_banners" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">related_banners</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/save/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-396438583">You saved the rule.</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">16</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Pause" enabled="true">
-+        <intProp name="ActionProcessor.action">1</intProp>
-+        <intProp name="ActionProcessor.target">0</intProp>
-+        <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${adminPromotionsManagementDelay}*1000))}</stringProp>
-+      </TestAction>
-+      <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Admin Customer Management" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAdminCustomerManagementPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Admin Customer Management");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-+        <stringProp name="script">
-+        function getFormKeyFromResponse()
-+        {
-+            var url = prev.getUrlAsString(),
-+            responseCode =  prev.getResponseCode(),
-+            formKey = null;
-+            searchPattern = /var FORM_KEY = '(.+)'/;
-+            if (responseCode == "200" &amp;&amp; url) {
-+                response = prev.getResponseDataAsString();
-+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-+            }
-+            return formKey;
-+        }
-+
-+        formKey = vars.get("form_key_storage");
-+
-+	   currentFormKey = getFormKeyFromResponse();
-+
-+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-+		  vars.put("form_key_storage", currentFormKey);
-+	   }
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+        <hashTree/>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-+            <stringProp name="script">
-+                formKey =  vars.get("form_key_storage");
-+                if (formKey
-+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+                    &amp;&amp; sampler.getMethod() == "POST")
-+                    {
-+                        arguments = sampler.getArguments();
-+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-+                        {
-+                            argument = arguments.getArgument(i);
-+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-+                            argument.setValue(formKey);
-+                        }
-+                    }
-+                }
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        </JSR223PreProcessor>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies"/>
-+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+adminUserList = props.get("adminUserList");
-+adminUserListIterator = props.get("adminUserListIterator");
-+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+
-+if (adminUsersDistribution == 1) {
-+    adminUser = adminUserList.poll();
-+} else {
-+    if (!adminUserListIterator.hasNext()) {
-+        adminUserListIterator = adminUserList.descendingIterator();
-+    }
-+
-+    adminUser = adminUserListIterator.next();
-+}
-+
-+if (adminUser == null) {
-+  SampleResult.setResponseMessage("adminUser list is empty");
-+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("admin_user", adminUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-+    <hashTree/>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1397214398">Welcome</stringProp>
-+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="2845929">^.+$</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">1</intProp>
-+        <stringProp name="Assertion.scope">variable</stringProp>
-+        <stringProp name="Scope.variable">admin_form_key</stringProp>
-+      </ResponseAssertion>
-+      <hashTree/>
-+    </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments">
-+          <elementProp name="dummy" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">dummy</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_user}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-+          </elementProp>
-+        </collectionProp>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-+      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-+    </HTTPSamplerProxy>
-+    <hashTree>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-+        <hashTree/>
-+    </hashTree>
-+  </hashTree>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-+    <hashTree>
-+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Customer Management" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_customer_management/admin_customer_management.jmx</stringProp>
-+</TestFragmentController>
-+    <hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Landing Page" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="Accept-Language" elementType="Header">
-+              <stringProp name="Header.name">Accept-Language</stringProp>
-+              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept" elementType="Header">
-+              <stringProp name="Header.name">Accept</stringProp>
-+              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
-+            </elementProp>
-+            <elementProp name="User-Agent" elementType="Header">
-+              <stringProp name="Header.name">User-Agent</stringProp>
-+              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept-Encoding" elementType="Header">
-+              <stringProp name="Header.name">Accept-Encoding</stringProp>
-+              <stringProp name="Header.value">gzip, deflate</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Render" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="namespace" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">customer_listing</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">namespace</stringProp>
-+            </elementProp>
-+            <elementProp name="search" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">search</stringProp>
-+            </elementProp>
-+            <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+            </elementProp>
-+            <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">20</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+            </elementProp>
-+            <elementProp name="paging[current]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">paging[current]</stringProp>
-+            </elementProp>
-+            <elementProp name="sorting[field]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">entity_id</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">sorting[field]</stringProp>
-+            </elementProp>
-+            <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">asc</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            </elementProp>
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="" elementType="Header">
-+              <stringProp name="Header.name">X-Requested-With</stringProp>
-+              <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search Render" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="namespace" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">customer_listing</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">namespace</stringProp>
-+            </elementProp>
-+            <elementProp name="search" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Lastname</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">search</stringProp>
-+            </elementProp>
-+            <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+            </elementProp>
-+            <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">20</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+            </elementProp>
-+            <elementProp name="paging[current]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">paging[current]</stringProp>
-+            </elementProp>
-+            <elementProp name="sorting[field]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">entity_id</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">sorting[field]</stringProp>
-+            </elementProp>
-+            <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">asc</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">sorting[direction]</stringProp>
-+            </elementProp>
-+            <elementProp name="isAjax" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="" elementType="Header">
-+              <stringProp name="Header.name">X-Requested-With</stringProp>
-+              <stringProp name="Header.value">XMLHttpRequest</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract customer edit url" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">customer_edit_url_path</stringProp>
-+          <stringProp name="RegexExtractor.regex">actions":\{"edit":\{"href":"(?:http|https):\\/\\/(.*?)\\/customer\\/index\\/edit\\/id\\/(\d+)\\/",</stringProp>
-+          <stringProp name="RegexExtractor.template">/customer/index/edit/id/$2$/</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer edit url" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">customer_edit_url_path</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Edit Customer" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments"/>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}${customer_edit_url_path}</stringProp>
-+        <stringProp name="HTTPSampler.method">GET</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert edit customer page" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="-1422614550">Customer Information</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract customer entity_id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_entity_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">"entity_id":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract website_id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_website_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">"website_id":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract customer firstname" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_firstname</stringProp>
-+          <stringProp name="RegexExtractor.regex">"firstname":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract customer lastname" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_lastname</stringProp>
-+          <stringProp name="RegexExtractor.regex">"lastname":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract customer email" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_email</stringProp>
-+          <stringProp name="RegexExtractor.regex">"email":"([^\@]+@[^.]+.[^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract group_id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_group_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">"group_id":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract store_id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_store_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">"store_id":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extact created_at" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_created_at</stringProp>
-+          <stringProp name="RegexExtractor.regex">"created_at":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract updated_at" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_updated_at</stringProp>
-+          <stringProp name="RegexExtractor.regex">"updated_at":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract is_active" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_is_active</stringProp>
-+          <stringProp name="RegexExtractor.regex">"is_active":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract disable_auto_group_change" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_disable_auto_group_change</stringProp>
-+          <stringProp name="RegexExtractor.regex">"disable_auto_group_change":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract created_in" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_created_in</stringProp>
-+          <stringProp name="RegexExtractor.regex">"created_in":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract dob" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_dob</stringProp>
-+          <stringProp name="RegexExtractor.regex">"dob":"(\d+)-(\d+)-(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$2$/$3$/$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract default_billing" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_default_billing</stringProp>
-+          <stringProp name="RegexExtractor.regex">"default_billing":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract default_shipping" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_default_shipping</stringProp>
-+          <stringProp name="RegexExtractor.regex">"default_shipping":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract gender" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_gender</stringProp>
-+          <stringProp name="RegexExtractor.regex">"gender":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract failures_num" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_failures_num</stringProp>
-+          <stringProp name="RegexExtractor.regex">"failures_num":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_entity_id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_entity_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{"entity_id":"(\d+)".+?"parent_id":"${admin_customer_entity_id}"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+       <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_created_at" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_created_at</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"created_at":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_updated_at" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_updated_at</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"updated_at":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_is_active" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_is_active</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"is_active":"(\d+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_city" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_city</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"city":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_country_id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_country_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"country_id":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_firstname" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_firstname</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"firstname":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_lastname" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_lastname</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"lastname":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_postcode" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_postcode</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"postcode":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_region" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_region</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"region":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_region_id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_region_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"region_id":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address street" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_street</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"street":\["([^"]+)"\]</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_telephone" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_telephone</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"telephone":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_customer_id" enabled="true">
-+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+          <stringProp name="RegexExtractor.refname">admin_customer_address_customer_id</stringProp>
-+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"customer_id":"([^"]+)"</stringProp>
-+          <stringProp name="RegexExtractor.template">$1$</stringProp>
-+          <stringProp name="RegexExtractor.default"/>
-+          <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        </RegexExtractor>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer entity_id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_entity_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert website_id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_website_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer firstname" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_firstname</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer lastname" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_lastname</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer email" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_email</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer group_id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_group_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer store_id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_store_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer created_at" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_created_at</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer updated_at" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_updated_at</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer is_active" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_is_active</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer disable_auto_group_change" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_disable_auto_group_change</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer created_in" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_created_in</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer dob" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="221072919">^\d+/\d+/\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_dob</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer default_billing" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_default_billing</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer default_shipping" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_default_shipping</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer gender" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_gender</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer failures_num" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_failures_num</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_entity_id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_entity_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_created_at" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_created_at</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_updated_at" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_updated_at</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_is_active" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_is_active</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_city" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_city</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_country_id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_country_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_firstname" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_firstname</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_lastname" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_lastname</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_postcode" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_postcode</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_region" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_region</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_region_id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_region_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_street" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_street</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_telephone" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="2845929">^.+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_telephone</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert address_customer_id" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="89649215">^\d+$</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">1</intProp>
-+          <stringProp name="Assertion.scope">variable</stringProp>
-+          <stringProp name="Scope.variable">admin_customer_address_customer_id</stringProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-+          <collectionProp name="HeaderManager.headers">
-+            <elementProp name="Accept-Language" elementType="Header">
-+              <stringProp name="Header.name">Accept-Language</stringProp>
-+              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept" elementType="Header">
-+              <stringProp name="Header.name">Accept</stringProp>
-+              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
-+            </elementProp>
-+            <elementProp name="User-Agent" elementType="Header">
-+              <stringProp name="Header.name">User-Agent</stringProp>
-+              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
-+            </elementProp>
-+            <elementProp name="Accept-Encoding" elementType="Header">
-+              <stringProp name="Header.name">Accept-Encoding</stringProp>
-+              <stringProp name="Header.value">gzip, deflate</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </HeaderManager>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Customer Validate" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="isAjax   " elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax   </stringProp>
-+            </elementProp>
-+            <elementProp name="customer[entity_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_entity_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[entity_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_website_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[email]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_email}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[email]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[group_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_group_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[group_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[store_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_store_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[store_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[created_at]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_created_at}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[created_at]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[updated_at]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_updated_at}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[updated_at]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[is_active]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_is_active}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[is_active]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[disable_auto_group_change]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_disable_auto_group_change}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[disable_auto_group_change]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[created_in]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_created_in}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[created_in]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[prefix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[prefix]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[firstname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_firstname} 1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[firstname]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[middlename]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[middlename]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[lastname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_lastname} 1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[lastname]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[suffix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[suffix]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[dob]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_dob}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[dob]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[default_billing]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_default_billing}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[default_billing]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[default_shipping]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_default_shipping}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[default_shipping]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[taxvat]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[taxvat]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[gender]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_gender}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[gender]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[failures_num]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_failures_num}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[failures_num]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[sendemail_store_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_store_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[sendemail_store_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][entity_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_entity_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][entity_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][created_at]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_created_at}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][created_at]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][updated_at]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_updated_at}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][updated_at]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][is_active]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_is_active}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][is_active]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][city]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_city}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][city]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][company]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][company]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][country_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_country_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][country_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][firstname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_firstname}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][firstname]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][lastname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_lastname}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][lastname]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][middlename]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][middlename]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][postcode]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_postcode}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][postcode]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][prefix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][prefix]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][region]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_region}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][region]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][region_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_region_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][region_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][street][0]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_street}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][street][0]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][street][1]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][street][1]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][suffix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][suffix]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][telephone]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_telephone}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][telephone]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][vat_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][vat_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][customer_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_customer_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][customer_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][default_billing]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][default_billing]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][default_shipping]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][default_shipping]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][prefix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][prefix]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][firstname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">John</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][firstname]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][middlename]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][middlename]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][lastname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Doe</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][lastname]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][suffix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][suffix]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][company]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Test Company</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][company]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][city]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Folsom</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][city]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][postcode]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">95630</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][postcode]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][telephone]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1234567890</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][telephone]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][vat_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][vat_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][default_billing]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">false</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][default_billing]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][default_shipping]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">false</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][default_shipping]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][street][0]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">123 Main</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][street][0]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][street][1]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][street][1]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][region]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][region]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][country_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">US</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][country_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][region_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_region_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][region_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/validate/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="49586">200</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">16</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Customer Save" enabled="true">
-+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+          <collectionProp name="Arguments.arguments">
-+            <elementProp name="isAjax   " elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">isAjax   </stringProp>
-+            </elementProp>
-+            <elementProp name="customer[entity_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_entity_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[entity_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[website_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_website_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[website_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[email]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_email}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[email]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[group_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_group_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[group_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[store_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_store_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[store_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[created_at]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_created_at}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[created_at]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[updated_at]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_updated_at}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[updated_at]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[is_active]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_is_active}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[is_active]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[disable_auto_group_change]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_disable_auto_group_change}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[disable_auto_group_change]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[created_in]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_created_in}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[created_in]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[prefix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[prefix]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[firstname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_firstname} 1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[firstname]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[middlename]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[middlename]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[lastname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_lastname} 1</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[lastname]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[suffix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[suffix]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[dob]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_dob}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[dob]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[default_billing]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_default_billing}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[default_billing]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[default_shipping]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_default_shipping}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[default_shipping]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[taxvat]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[taxvat]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[gender]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_gender}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[gender]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[failures_num]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_failures_num}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[failures_num]</stringProp>
-+            </elementProp>
-+            <elementProp name="customer[sendemail_store_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_store_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">customer[sendemail_store_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][entity_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_entity_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][entity_id]</stringProp>
-+            </elementProp>
-+
-+            <elementProp name="address[${admin_customer_address_entity_id}][created_at]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_created_at}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][created_at]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][updated_at]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_updated_at}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][updated_at]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][is_active]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_is_active}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][is_active]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][city]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_city}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][city]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][company]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][company]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][country_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_country_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][country_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][firstname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_firstname}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][firstname]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][lastname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_lastname}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][lastname]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][middlename]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][middlename]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][postcode]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_postcode}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][postcode]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][prefix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][prefix]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][region]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_region}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][region]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][region_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_region_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][region_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][street][0]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_street}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][street][0]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][street][1]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][street][1]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][suffix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][suffix]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][telephone]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_telephone}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][telephone]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][vat_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][vat_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][customer_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_customer_address_customer_id}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][customer_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][default_billing]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][default_billing]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[${admin_customer_address_entity_id}][default_shipping]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">true</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][default_shipping]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][prefix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][prefix]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][firstname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">John</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][firstname]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][middlename]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][middlename]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][lastname]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Doe</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][lastname]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][suffix]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][suffix]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][company]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Test Company</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][company]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][city]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">Folsom</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][city]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][postcode]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">95630</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][postcode]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][telephone]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">1234567890</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][telephone]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][vat_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][vat_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][default_billing]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">false</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][default_billing]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][default_shipping]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">false</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][default_shipping]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][street][0]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">123 Main</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][street][0]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][street][1]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][street][1]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][region]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value"/>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][region]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][country_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">US</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][country_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="address[new_0][region_id]" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">12</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">address[new_0][region_id]</stringProp>
-+            </elementProp>
-+            <elementProp name="form_key" elementType="HTTPArgument">
-+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+              <stringProp name="Argument.metadata">=</stringProp>
-+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+              <stringProp name="Argument.name">form_key</stringProp>
-+            </elementProp>
-+          </collectionProp>
-+        </elementProp>
-+        <stringProp name="HTTPSampler.domain"/>
-+        <stringProp name="HTTPSampler.port"/>
-+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+        <stringProp name="HTTPSampler.contentEncoding"/>
-+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/save/</stringProp>
-+        <stringProp name="HTTPSampler.method">POST</stringProp>
-+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">true</boolProp>
-+        <boolProp name="HTTPSampler.monitor">false</boolProp>
-+        <stringProp name="HTTPSampler.embedded_url_re"/>
-+      </HTTPSamplerProxy>
-+      <hashTree>
-+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer saved" enabled="true">
-+          <collectionProp name="Asserion.test_strings">
-+            <stringProp name="292987815">You saved the customer.</stringProp>
-+          </collectionProp>
-+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+          <boolProp name="Assertion.assume_success">false</boolProp>
-+          <intProp name="Assertion.test_type">2</intProp>
-+        </ResponseAssertion>
-+        <hashTree/>
-+      </hashTree>
-+      <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Pause" enabled="true">
-+        <intProp name="ActionProcessor.action">1</intProp>
-+        <intProp name="ActionProcessor.target">0</intProp>
-+        <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${adminCustomerManagementDelay}*1000))}</stringProp>
-+      </TestAction>
-+      <hashTree/>
-     </hashTree>
-   </hashTree>
-   
--    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Graphql Query Controller" enabled="true">
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-+  </hashTree>
-+
-+  
-+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="[C] Admin Edit Order" enabled="true">
-+      <intProp name="ThroughputController.style">1</intProp>
-+      <boolProp name="ThroughputController.perThread">false</boolProp>
-+      <intProp name="ThroughputController.maxThroughput">1</intProp>
-+      <stringProp name="ThroughputController.percentThroughput">${cAdminEditOrderPercentage}</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-+    <hashTree>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-+            <stringProp name="script">
-+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-+if (testLabel
-+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+) {
-+    if (sampler.getName().indexOf(testLabel) == -1) {
-+       sampler.setName(sampler.getName() + testLabel);
-+    }
-+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-+    sampler.setName("SetUp - " + sampler.getName());
-+}
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-+        <hashTree/>
-+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-+            <stringProp name="BeanShellSampler.query">
-+                vars.put("testLabel", "[C] Admin Edit Order");
-+            </stringProp>
-+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+        </BeanShellSampler>
-+        <hashTree/>
-+    
-+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-+        <stringProp name="script">
-+        function getFormKeyFromResponse()
-+        {
-+            var url = prev.getUrlAsString(),
-+            responseCode =  prev.getResponseCode(),
-+            formKey = null;
-+            searchPattern = /var FORM_KEY = '(.+)'/;
-+            if (responseCode == "200" &amp;&amp; url) {
-+                response = prev.getResponseDataAsString();
-+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-+            }
-+            return formKey;
-+        }
-+
-+        formKey = vars.get("form_key_storage");
-+
-+	   currentFormKey = getFormKeyFromResponse();
-+
-+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-+		  vars.put("form_key_storage", currentFormKey);
-+	   }
-+        </stringProp>
-+        <stringProp name="scriptLanguage">javascript</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-+        <hashTree/>
-+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-+            <stringProp name="script">
-+                formKey =  vars.get("form_key_storage");
-+                if (formKey
-+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-+                    &amp;&amp; sampler.getMethod() == "POST")
-+                    {
-+                        arguments = sampler.getArguments();
-+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-+                        {
-+                            argument = arguments.getArgument(i);
-+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-+                            argument.setValue(formKey);
-+                        }
-+                    }
-+                }
-+            </stringProp>
-+            <stringProp name="scriptLanguage">javascript</stringProp>
-+        </JSR223PreProcessor>
-+        <hashTree/>
-+    
-+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-+      <collectionProp name="CookieManager.cookies"/>
-+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-+    <hashTree/>
-+  
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
- </GenericController>
-     <hashTree>
--    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--      <collectionProp name="HeaderManager.headers">
--        <elementProp name="" elementType="Header">
--          <stringProp name="Header.name">Content-Type</stringProp>
--          <stringProp name="Header.value">application/json</stringProp>
--        </elementProp>
--        <elementProp name="" elementType="Header">
--          <stringProp name="Header.name">Accept</stringProp>
--          <stringProp name="Header.value">*/*</stringProp>
--        </elementProp>
--      </collectionProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-+    <hashTree>
-+    
-+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-+      <stringProp name="BeanShellSampler.query">
-+adminUserList = props.get("adminUserList");
-+adminUserListIterator = props.get("adminUserListIterator");
-+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+
-+if (adminUsersDistribution == 1) {
-+    adminUser = adminUserList.poll();
-+} else {
-+    if (!adminUserListIterator.hasNext()) {
-+        adminUserListIterator = adminUserList.descendingIterator();
-+    }
-+
-+    adminUser = adminUserListIterator.next();
-+}
-+
-+if (adminUser == null) {
-+  SampleResult.setResponseMessage("adminUser list is empty");
-+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-+  IsSuccess=false;
-+  SampleResult.setSuccessful(false);
-+  SampleResult.setStopThread(true);
-+}
-+vars.put("admin_user", adminUser);
-+      </stringProp>
-+      <stringProp name="BeanShellSampler.filename"/>
-+      <stringProp name="BeanShellSampler.parameters"/>
-+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-+    </BeanShellSampler>
-     <hashTree/>
-+  </hashTree>
-   
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
--      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
--        </collectionProp>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-       </elementProp>
-       <stringProp name="HTTPSampler.domain"/>
-       <stringProp name="HTTPSampler.port"/>
-@@ -40708,387 +69407,526 @@ vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNu
-       <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-       <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-     <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
--        <stringProp name="VAR">admin_token</stringProp>
--        <stringProp name="JSONPATH">$</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-1397214398">Welcome</stringProp>
-+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-       <hashTree/>
--      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      </RegexExtractor>
-+      <hashTree/>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-         <collectionProp name="Asserion.test_strings">
--          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-+          <stringProp name="2845929">^.+$</stringProp>
-         </collectionProp>
-         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-         <boolProp name="Assertion.assume_success">false</boolProp>
-         <intProp name="Assertion.test_type">1</intProp>
-         <stringProp name="Assertion.scope">variable</stringProp>
--        <stringProp name="Scope.variable">admin_token</stringProp>
-+        <stringProp name="Scope.variable">admin_form_key</stringProp>
-       </ResponseAssertion>
-       <hashTree/>
-     </hashTree>
-   
--    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
--      <collectionProp name="HeaderManager.headers">
--        <elementProp name="" elementType="Header">
--          <stringProp name="Header.name">Authorization</stringProp>
--          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
--        </elementProp>
--      </collectionProp>
--    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
--    <hashTree/>
--  
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query multiple products" enabled="true">
--            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--                <collectionProp name="Arguments.arguments">
--                    <elementProp name="" elementType="HTTPArgument">
--                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                        <stringProp name="Argument.value">{"query":"{\n  products(\n    filter: {\n         price: {gt: \"10\"}\n         or: {\n            sku:{like:\"%Product%\"}\n            name:{like:\"%Configurable Product%\"}\n          }\n        }\n    pageSize: 200\n    currentPage: 1\n    sort: {\n      price: ASC\n      name:DESC\n    }\n  ) {\n    total_count\n    items {\n        attribute_set_id\n        country_of_manufacture\n        created_at\n        description\n        gift_message_available\n        image\n        image_label\n        meta_description\n        meta_keyword\n        meta_title\n        name\n        new_from_date\n        new_to_date\n        options_container\n        ... on CustomizableProductInterface {\n            options\n            {\n                title\n                required\n                sort_order\n            }\n        }\n        \n        price {\n            minimalPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n            maximalPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n            regularPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n        }\n        short_description\n        sku\n        small_image\n        small_image_label\n        special_from_date\n        special_price\n        special_to_date\n        swatch_image\n        thumbnail\n        thumbnail_label\n        tier_price\n        type_id\n        updated_at\n        url_key\n        url_path\n        websites { id name code sort_order default_group_id is_default }\n      \t... on PhysicalProductInterface {\n        \tweight\n      \t}\n    }\n    page_info {\n      page_size\n      current_page\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
--                        <stringProp name="Argument.metadata">=</stringProp>
--                    </elementProp>
--                </collectionProp>
--            </elementProp>
--            <stringProp name="HTTPSampler.domain"/>
--            <stringProp name="HTTPSampler.port"/>
--            <stringProp name="HTTPSampler.connect_timeout"/>
--            <stringProp name="HTTPSampler.response_timeout"/>
--            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--            <stringProp name="HTTPSampler.contentEncoding"/>
--            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
--            <stringProp name="HTTPSampler.method">POST</stringProp>
--            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--            <boolProp name="HTTPSampler.monitor">false</boolProp>
--            <stringProp name="HTTPSampler.embedded_url_re"/>
--            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_filter_only.jmx</stringProp>
--        </HTTPSamplerProxy>
--        <hashTree>
--            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
--                <stringProp name="VAR">graphql_multiple_products_query_total_count</stringProp>
--                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
--                <stringProp name="DEFAULT"/>
--                <stringProp name="VARIABLE"/>
--                <stringProp name="SUBJECT">BODY</stringProp>
--            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--            <hashTree/>
--            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 200" enabled="true">
--                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_multiple_products_query_total_count");
--                    if (totalCount == null) {
--                    Failure = true;
--                    FailureMessage = "Not Expected \"totalCount\" to be null";
--                    } else {
--                    if (Integer.parseInt(totalCount) &lt; 200) {
--                    Failure = true;
--                    FailureMessage = "Expected \"totalCount\" to be greater than 200, Actual: " + totalCount;
--                    } else {
--                    Failure = false;
--                    }
--                    }
--                </stringProp>
--                <stringProp name="BeanShellAssertion.filename"/>
--                <stringProp name="BeanShellAssertion.parameters"/>
--                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
--            </BeanShellAssertion>
--            <hashTree/>
--        </hashTree>
--    
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query simple product" enabled="true">
--      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-         <collectionProp name="Arguments.arguments">
--          <elementProp name="" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${simple_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
-+          <elementProp name="dummy" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value"/>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">dummy</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+          </elementProp>
-+          <elementProp name="login[password]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_password}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[password]</stringProp>
-+          </elementProp>
-+          <elementProp name="login[username]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_user}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">login[username]</stringProp>
-           </elementProp>
-         </collectionProp>
-       </elementProp>
-       <stringProp name="HTTPSampler.domain"/>
-       <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout"/>
--      <stringProp name="HTTPSampler.response_timeout"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-       <stringProp name="HTTPSampler.method">POST</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-       <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_simple_product_with_extensible_data_objects.jmx</stringProp>
-+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-     </HTTPSamplerProxy>
-     <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
--        <stringProp name="VAR">graphql_simple_products_query_total_count</stringProp>
--        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--      <hashTree/>
--
--        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract response" enabled="true">
--            <stringProp name="VAR">graphql_multiple_products_query_response</stringProp>
--            <stringProp name="JSONPATH">$</stringProp>
--            <stringProp name="DEFAULT"/>
--            <stringProp name="VARIABLE"/>
--            <stringProp name="SUBJECT">BODY</stringProp>
--        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-+            <stringProp name="RegexExtractor.template">$1$</stringProp>
-+            <stringProp name="RegexExtractor.default"/>
-+            <stringProp name="RegexExtractor.match_number">1</stringProp>
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-         <hashTree/>
--        <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
--        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_simple_products_query_total_count");
--
--if (totalCount == null) {
--        Failure = true;
--        FailureMessage = "Not Expected \"totalCount\" to be null";
--} else {
--	if (Integer.parseInt(totalCount) != 1) {
--   Failure = true;
--   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
--	} else {
--		Failure = false;
--	}
--}
--</stringProp>
--        <stringProp name="BeanShellAssertion.filename"/>
--        <stringProp name="BeanShellAssertion.parameters"/>
--        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
--      </BeanShellAssertion>
--      <hashTree/>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
--        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
--        <stringProp name="EXPECTED_VALUE">${simple_product_sku}</stringProp>
--        <boolProp name="JSONVALIDATION">true</boolProp>
--        <boolProp name="EXPECT_NULL">false</boolProp>
--        <boolProp name="INVERT">false</boolProp>
--        <boolProp name="ISREGEX">true</boolProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
--      <hashTree/>
-     </hashTree>
-+  </hashTree>
-   
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query configurable product" enabled="true">
--      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: {eq:\"${configurable_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout"/>
--      <stringProp name="HTTPSampler.response_timeout"/>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_configurable_product_with_extensible_data_objects.jmx</stringProp>
--    </HTTPSamplerProxy>
-+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-+</GenericController>
-     <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
--        <stringProp name="VAR">graphql_configurable_products_query_total_count</stringProp>
--        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Orders page" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments"/>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/</stringProp>
-+    <stringProp name="HTTPSampler.method">GET</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/orders_page.jmx</stringProp></HTTPSamplerProxy>
-+  <hashTree>
-+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+      <collectionProp name="Asserion.test_strings">
-+        <stringProp name="1204796042">Create New Order</stringProp>
-+      </collectionProp>
-+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+      <boolProp name="Assertion.assume_success">false</boolProp>
-+      <intProp name="Assertion.test_type">2</intProp>
-+    </ResponseAssertion>
-+    <hashTree/>
-+  </hashTree>
-+
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Orders" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments">
-+        <elementProp name="namespace" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">sales_order_grid</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">namespace</stringProp>
-+        </elementProp>
-+        <elementProp name="search" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value"/>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">search</stringProp>
-+        </elementProp>
-+        <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">true</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+        </elementProp>
-+        <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">200</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+        </elementProp>
-+        <elementProp name="paging[current]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">1</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">paging[current]</stringProp>
-+        </elementProp>
-+        <elementProp name="sorting[field]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">increment_id</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">sorting[field]</stringProp>
-+        </elementProp>
-+        <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">desc</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">sorting[direction]</stringProp>
-+        </elementProp>
-+        <elementProp name="isAjax" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">true</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">isAjax</stringProp>
-+        </elementProp>
-+        <elementProp name="form_key" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">form_key</stringProp>
-+          <stringProp name="Argument.desc">false</stringProp>
-+        </elementProp>
-+        <elementProp name="filters[status]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">pending</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">filters[status]</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="_" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">_</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+    <stringProp name="HTTPSampler.method">GET</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/open_orders.jmx</stringProp></HTTPSamplerProxy>
-+  <hashTree>
-+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+      <collectionProp name="Asserion.test_strings">
-+        <stringProp name="1637639774">totalRecords</stringProp>
-+      </collectionProp>
-+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+      <boolProp name="Assertion.assume_success">false</boolProp>
-+      <intProp name="Assertion.test_type">2</intProp>
-+    </ResponseAssertion>
-+    <hashTree/>
-+  </hashTree>
-+
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search Pending Orders" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments">
-+        <elementProp name="form_key" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">form_key</stringProp>
-+        </elementProp>
-+        <elementProp name="namespace" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">sales_order_grid</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">namespace</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="search" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value"/>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">search</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">true</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">filters[placeholder]</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">200</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">paging[pageSize]</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="paging[current]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">1</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">paging[current]</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="sorting[field]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">increment_id</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">sorting[field]</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="sorting[direction]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">asc</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">sorting[direction]</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="isAjax" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">true</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">isAjax</stringProp>
-+          <stringProp name="Argument.desc">true</stringProp>
-+        </elementProp>
-+        <elementProp name="filters[status]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">pending</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">filters[status]</stringProp>
-+        </elementProp>
-+        <elementProp name="_" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">_</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-+    <stringProp name="HTTPSampler.method">GET</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/search_orders.jmx</stringProp></HTTPSamplerProxy>
-+<hashTree>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="1637639774">totalRecords</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-       <hashTree/>
--      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
--        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_configurable_products_query_total_count");
--
--if (totalCount == null) {
--        Failure = true;
--        FailureMessage = "Not Expected \"totalCount\" to be null";
--} else {
--	if (Integer.parseInt(totalCount) != 1) {
--   Failure = true;
--   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
--	} else {
--		Failure = false;
--	}
--}
--
--
--</stringProp>
--        <stringProp name="BeanShellAssertion.filename"/>
--        <stringProp name="BeanShellAssertion.parameters"/>
--        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
--      </BeanShellAssertion>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order numbers" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">order_numbers</stringProp>
-+        <stringProp name="RegexExtractor.regex">\"increment_id\":\"(\d+)\"\,</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+        <stringProp name="Scope.variable">simple_products</stringProp>
-+      </RegexExtractor>
-       <hashTree/>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert configurable product sku" enabled="true">
--        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
--        <stringProp name="EXPECTED_VALUE">${configurable_product_sku}</stringProp>
--        <boolProp name="JSONVALIDATION">true</boolProp>
--        <boolProp name="EXPECT_NULL">false</boolProp>
--        <boolProp name="INVERT">false</boolProp>
--        <boolProp name="ISREGEX">true</boolProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order ids" enabled="true">
-+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+        <stringProp name="RegexExtractor.refname">order_ids</stringProp>
-+        <stringProp name="RegexExtractor.regex">\"entity_id\":\"(\d+)\"\,</stringProp>
-+        <stringProp name="RegexExtractor.template">$1$</stringProp>
-+        <stringProp name="RegexExtractor.default"/>
-+        <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+        <stringProp name="Scope.variable">simple_products</stringProp>
-+      </RegexExtractor>
-       <hashTree/>
-     </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search and filter" enabled="true">
--      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--            <stringProp name="Argument.value">{"query":"{\n    products(\n        search: \"configurable\"\n        filter: {price: {gteq: \"1\"} }\n    ) {\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t\t}\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout"/>
--      <stringProp name="HTTPSampler.response_timeout"/>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_and_filter.jmx</stringProp>
--    </HTTPSamplerProxy>
--    <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
--        <stringProp name="VAR">graphql_search_products_query_total_count_fulltext_filter</stringProp>
--        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--      <hashTree/>
--      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
--        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count_fulltext_filter");
- 
--if (totalCount == null) {
--        Failure = true;
--        FailureMessage = "Not Expected \"totalCount\" to be null";
--} else {
--	if (Integer.parseInt(totalCount) &lt; 1) {
--   Failure = true;
--   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
--	} else {
--		Failure = false;
--	}
--}
-+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Generate Unique Ids for each Thread" enabled="true">
-+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/setup.jmx</stringProp>
-+        <stringProp name="BeanShellSampler.query">
-+  import java.util.ArrayList;
-+  import java.util.HashMap;
-+  import org.apache.jmeter.protocol.http.util.Base64Encoder;
-+  import java.util.Random;
- 
-+  // get count of "order_numbers" variable defined in "Search Pending Orders Limit"
-+  int ordersCount = Integer.parseInt(vars.get("order_numbers_matchNr"));
- 
--</stringProp>
--        <stringProp name="BeanShellAssertion.filename"/>
--        <stringProp name="BeanShellAssertion.parameters"/>
--        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
--      </BeanShellAssertion>
--      <hashTree/>
--    </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search only" enabled="true">
--      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--            <stringProp name="Argument.value">{"query":"{\n    products(search: \"configurable\") {\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t\t}\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
--        </collectionProp>
--      </elementProp>
--      <stringProp name="HTTPSampler.domain"/>
--      <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout"/>
--      <stringProp name="HTTPSampler.response_timeout"/>
--      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--      <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
--      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--      <boolProp name="HTTPSampler.monitor">false</boolProp>
--      <stringProp name="HTTPSampler.embedded_url_re"/>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_only.jmx</stringProp>
--    </HTTPSamplerProxy>
--    <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
--        <stringProp name="VAR">graphql_search_products_query_total_count</stringProp>
--        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--      <hashTree/>
--      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
--        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count");
- 
--if (totalCount == null) {
--        Failure = true;
--        FailureMessage = "Not Expected \"totalCount\" to be null";
--} else {
--	if (Integer.parseInt(totalCount) &lt; 1) {
--   Failure = true;
--   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
--	} else {
--		Failure = false;
--	}
--}
-+  int clusterLength;
-+  int threadsNumber = ctx.getThreadGroup().getNumThreads();
-+  if (threadsNumber == 0) {
-+      //Number of orders for one thread
-+      clusterLength = ordersCount;
-+  } else {
-+      clusterLength = Math.round(ordersCount / threadsNumber);
-+      if (clusterLength == 0) {
-+          clusterLength = 1;
-+      }
-+  }
- 
-+  //Current thread number starts from 0
-+  int currentThreadNum = ctx.getThreadNum();
- 
--</stringProp>
--        <stringProp name="BeanShellAssertion.filename"/>
--        <stringProp name="BeanShellAssertion.parameters"/>
--        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
--      </BeanShellAssertion>
--      <hashTree/>
--    </hashTree>
--  
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search only" enabled="true">
--      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+  //Index of the current product from the cluster
-+  Random random = new Random();
-+  if (${seedForRandom} &gt; 0) {
-+    random.setSeed(${seedForRandom} + ${__threadNum});
-+  }
-+  int iterator = random.nextInt(clusterLength);
-+  if (iterator == 0) {
-+  	iterator = 1;
-+  }
-+
-+  int i = clusterLength * currentThreadNum + iterator;
-+
-+  orderNumber = vars.get("order_numbers_" + i.toString());
-+  orderId = vars.get("order_ids_" + i.toString());
-+  vars.put("order_number", orderNumber);
-+  vars.put("order_id", orderId);
-+
-+  </stringProp>
-+    <stringProp name="BeanShellSampler.filename"/>
-+    <stringProp name="BeanShellSampler.parameters"/>
-+    <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-+  </BeanShellSampler>
-+  <hashTree/>
-+
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Order" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments"/>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/view/order_id/${order_id}/</stringProp>
-+    <stringProp name="HTTPSampler.method">GET</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/open_order.jmx</stringProp></HTTPSamplerProxy>
-+  <hashTree>
-+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+      <collectionProp name="Asserion.test_strings">
-+        <stringProp name="2103620713">#${order_number}</stringProp>
-+      </collectionProp>
-+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+      <boolProp name="Assertion.assume_success">false</boolProp>
-+      <intProp name="Assertion.test_type">2</intProp>
-+    </ResponseAssertion>
-+    <hashTree/>
-+    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order status" enabled="true">
-+      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+      <stringProp name="RegexExtractor.refname">order_status</stringProp>
-+      <stringProp name="RegexExtractor.regex">&lt;span id="order_status"&gt;([^&lt;]+)&lt;/span&gt;</stringProp>
-+      <stringProp name="RegexExtractor.template">$1$</stringProp>
-+      <stringProp name="RegexExtractor.default"/>
-+      <stringProp name="RegexExtractor.match_number">1</stringProp>
-+      <stringProp name="Scope.variable">simple_products</stringProp>
-+    </RegexExtractor>
-+    <hashTree/>
-+  </hashTree>
-+
-+    <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
-+      <stringProp name="IfController.condition">"${order_status}" == "Pending"</stringProp>
-+      <boolProp name="IfController.evaluateAll">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/if_controller.jmx</stringProp></IfController>
-+    <hashTree>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Comment" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-         <collectionProp name="Arguments.arguments">
--          <elementProp name="" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--            <stringProp name="Argument.value">{"query":"{\n    products(search: \"color\") {\n        filters {\n            name\n            filter_items_count\n            request_var\n            filter_items {\n                label\n                value_string\n                items_count\n                ... on SwatchLayerFilterItemInterface {\n                    swatch_data {\n                        type\n                        value\n                    }\n                }\n            }\n        }\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n                    weight\n                  }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}","variables":null,"operationName":null}</stringProp>
-+          <elementProp name="history[status]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">pending</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">history[status]</stringProp>
-+            <stringProp name="Argument.desc">false</stringProp>
-+          </elementProp>
-+          <elementProp name="history[comment]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">Some text</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">history[comment]</stringProp>
-+          </elementProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+            <stringProp name="Argument.desc">false</stringProp>
-           </elementProp>
-         </collectionProp>
-       </elementProp>
-       <stringProp name="HTTPSampler.domain"/>
-       <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout"/>
--      <stringProp name="HTTPSampler.response_timeout"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/addComment/order_id/${order_id}/?isAjax=true</stringProp>
-       <stringProp name="HTTPSampler.method">POST</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-@@ -41096,540 +69934,193 @@ if (totalCount == null) {
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_and_filters.jmx</stringProp>
--    </HTTPSamplerProxy>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/add_comment.jmx</stringProp></HTTPSamplerProxy>
-     <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
--        <stringProp name="VAR">graphql_search_products_query_total_count</stringProp>
--        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--      <hashTree/>
--      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
--        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count");
--
--if (totalCount == null) {
--        Failure = true;
--        FailureMessage = "Not Expected \"totalCount\" to be null";
--} else {
--	if (Integer.parseInt(totalCount) &lt; 1) {
--   Failure = true;
--   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
--	} else {
--		Failure = false;
--	}
--}
--
--
--</stringProp>
--        <stringProp name="BeanShellAssertion.filename"/>
--        <stringProp name="BeanShellAssertion.parameters"/>
--        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
--      </BeanShellAssertion>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-2089278331">Not Notified</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-       <hashTree/>
-     </hashTree>
-   
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query bundle product" enabled="true">
--            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--                <collectionProp name="Arguments.arguments">
--                    <elementProp name="" elementType="HTTPArgument">
--                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${bundle_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on BundleProduct {\n                weight\n                price_view\n                dynamic_price\n                dynamic_sku\n                ship_bundle_items\n                dynamic_weight\n                items {\n                  option_id\n                  title\n                  required\n                  type\n                  position\n                  sku\n                  options {\n                        id\n                        qty\n                        position\n                        is_default\n                        price\n                        price_type\n                        can_change_quantity\n                    product {\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                                    swatch_image\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n                    }\n                  }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
--                        <stringProp name="Argument.metadata">=</stringProp>
--                    </elementProp>
--                </collectionProp>
--            </elementProp>
--            <stringProp name="HTTPSampler.domain"/>
--            <stringProp name="HTTPSampler.port"/>
--            <stringProp name="HTTPSampler.connect_timeout"/>
--            <stringProp name="HTTPSampler.response_timeout"/>
--            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--            <stringProp name="HTTPSampler.contentEncoding"/>
--            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
--            <stringProp name="HTTPSampler.method">POST</stringProp>
--            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--            <boolProp name="HTTPSampler.monitor">false</boolProp>
--            <stringProp name="HTTPSampler.embedded_url_re"/>
--            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_bundle_product_with_extensible_data_objects.jmx</stringProp>
--        </HTTPSamplerProxy>
--        <hashTree>
--            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
--                <stringProp name="VAR">graphql_bundle_products_query_total_count</stringProp>
--                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
--                <stringProp name="DEFAULT"/>
--                <stringProp name="VARIABLE"/>
--                <stringProp name="SUBJECT">BODY</stringProp>
--            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--            <hashTree/>
--            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
--                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_bundle_products_query_total_count");
--
--                    if (totalCount == null) {
--                    Failure = true;
--                    FailureMessage = "Not Expected \"totalCount\" to be null";
--                    } else {
--                    if (Integer.parseInt(totalCount) != 1) {
--                    Failure = true;
--                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
--                    } else {
--                    Failure = false;
--                    }
--                    }
--
--
--                </stringProp>
--                <stringProp name="BeanShellAssertion.filename"/>
--                <stringProp name="BeanShellAssertion.parameters"/>
--                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
--            </BeanShellAssertion>
--            <hashTree/>
--            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert bundle product sku" enabled="true">
--                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
--                <stringProp name="EXPECTED_VALUE">${bundle_product_sku}</stringProp>
--                <boolProp name="JSONVALIDATION">true</boolProp>
--                <boolProp name="EXPECT_NULL">false</boolProp>
--                <boolProp name="INVERT">false</boolProp>
--                <boolProp name="ISREGEX">false</boolProp>
--            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
--            <hashTree/>
--        </hashTree>
--    
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query downloadable product" enabled="true">
--            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--                <collectionProp name="Arguments.arguments">
--                    <elementProp name="" elementType="HTTPArgument">
--                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                        <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${downloadable_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n              ... on DownloadableProduct {\n                links_purchased_separately\n                links_title\n                downloadable_product_samples {\n                  id\n                  title\n                  sort_order\n                  sample_type\n                  sample_file\n                  sample_url\n                }\n                downloadable_product_links {\n                        id\n                        title\n                        sort_order\n                        is_shareable\n                        price\n                        number_of_downloads\n                        link_type\n                        sample_type\n                        sample_file\n                            sample_url\n                }\n              }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
--                        <stringProp name="Argument.metadata">=</stringProp>
--                    </elementProp>
--                </collectionProp>
--            </elementProp>
--            <stringProp name="HTTPSampler.domain"/>
--            <stringProp name="HTTPSampler.port"/>
--            <stringProp name="HTTPSampler.connect_timeout"/>
--            <stringProp name="HTTPSampler.response_timeout"/>
--            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--            <stringProp name="HTTPSampler.contentEncoding"/>
--            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
--            <stringProp name="HTTPSampler.method">POST</stringProp>
--            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--            <boolProp name="HTTPSampler.monitor">false</boolProp>
--            <stringProp name="HTTPSampler.embedded_url_re"/>
--            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_downloadable_product_with_extensible_data_objects.jmx</stringProp>
--        </HTTPSamplerProxy>
--        <hashTree>
--            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
--                <stringProp name="VAR">graphql_downloadable_products_query_total_count</stringProp>
--                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
--                <stringProp name="DEFAULT"/>
--                <stringProp name="VARIABLE"/>
--                <stringProp name="SUBJECT">BODY</stringProp>
--            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--            <hashTree/>
--            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
--                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_downloadable_products_query_total_count");
--
--                    if (totalCount == null) {
--                    Failure = true;
--                    FailureMessage = "Not Expected \"totalCount\" to be null";
--                    } else {
--                    if (Integer.parseInt(totalCount) != 1) {
--                    Failure = true;
--                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
--                    } else {
--                    Failure = false;
--                    }
--                    }
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Invoice Start" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments"/>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/start/order_id/${order_id}/</stringProp>
-+    <stringProp name="HTTPSampler.method">GET</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/invoice_start.jmx</stringProp></HTTPSamplerProxy>
-+  <hashTree>
-+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+      <collectionProp name="Asserion.test_strings">
-+        <stringProp name="-1233850814">Invoice Totals</stringProp>
-+      </collectionProp>
-+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+      <boolProp name="Assertion.assume_success">false</boolProp>
-+      <intProp name="Assertion.test_type">2</intProp>
-+    </ResponseAssertion>
-+    <hashTree/>
-+    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract ordered items ids" enabled="true">
-+      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-+      <stringProp name="RegexExtractor.refname">item_ids</stringProp>
-+      <stringProp name="RegexExtractor.regex">&lt;div id="order_item_(\d+)_title"\s*class="product-title"&gt;</stringProp>
-+      <stringProp name="RegexExtractor.template">$1$</stringProp>
-+      <stringProp name="RegexExtractor.default"/>
-+      <stringProp name="RegexExtractor.match_number">-1</stringProp>
-+      <stringProp name="Scope.variable">simple_products</stringProp>
-+    </RegexExtractor>
-+    <hashTree/>
-+  </hashTree>
- 
-+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Invoice Submit" enabled="true">
-+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+      <collectionProp name="Arguments.arguments">
-+        <elementProp name="form_key" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">form_key</stringProp>
-+          <stringProp name="Argument.desc">false</stringProp>
-+        </elementProp>
-+        <elementProp name="invoice[items][${item_ids_1}]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">1</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">invoice[items][${item_ids_1}]</stringProp>
-+        </elementProp>
-+        <elementProp name="invoice[items][${item_ids_2}]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">1</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">invoice[items][${item_ids_2}]</stringProp>
-+        </elementProp>
-+        <elementProp name="invoice[comment_text]" elementType="HTTPArgument">
-+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+          <stringProp name="Argument.value">Invoiced</stringProp>
-+          <stringProp name="Argument.metadata">=</stringProp>
-+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+          <stringProp name="Argument.name">invoice[comment_text]</stringProp>
-+        </elementProp>
-+      </collectionProp>
-+    </elementProp>
-+    <stringProp name="HTTPSampler.domain"/>
-+    <stringProp name="HTTPSampler.port"/>
-+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+    <stringProp name="HTTPSampler.contentEncoding"/>
-+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/save/order_id/${order_id}/</stringProp>
-+    <stringProp name="HTTPSampler.method">POST</stringProp>
-+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+    <boolProp name="HTTPSampler.monitor">false</boolProp>
-+    <stringProp name="HTTPSampler.embedded_url_re"/>
-+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/invoice_submit.jmx</stringProp></HTTPSamplerProxy>
-+  <hashTree>
-+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+      <collectionProp name="Asserion.test_strings">
-+        <stringProp name="1740524604">The invoice has been created</stringProp>
-+      </collectionProp>
-+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+      <boolProp name="Assertion.assume_success">false</boolProp>
-+      <intProp name="Assertion.test_type">2</intProp>
-+    </ResponseAssertion>
-+    <hashTree/>
-+  </hashTree>
- 
--                </stringProp>
--                <stringProp name="BeanShellAssertion.filename"/>
--                <stringProp name="BeanShellAssertion.parameters"/>
--                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
--            </BeanShellAssertion>
--            <hashTree/>
--            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert downloadable product sku" enabled="true">
--                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
--                <stringProp name="EXPECTED_VALUE">${downloadable_product_sku}</stringProp>
--                <boolProp name="JSONVALIDATION">true</boolProp>
--                <boolProp name="EXPECT_NULL">false</boolProp>
--                <boolProp name="INVERT">false</boolProp>
--                <boolProp name="ISREGEX">true</boolProp>
--            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
--            <hashTree/>
--            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert link samples titles" enabled="true">
--                <stringProp name="JSON_PATH">$.data.products.items[0].downloadable_product_samples..title</stringProp>
--                <stringProp name="EXPECTED_VALUE">["sample1","sample2"]</stringProp>
--                <boolProp name="JSONVALIDATION">true</boolProp>
--                <boolProp name="EXPECT_NULL">false</boolProp>
--                <boolProp name="INVERT">false</boolProp>
--                <boolProp name="ISREGEX">false</boolProp>
--            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
--            <hashTree/>
--            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert sample titles" enabled="true">
--                <stringProp name="JSON_PATH">$.data.products.items[0].downloadable_product_samples..title</stringProp>
--                <stringProp name="EXPECTED_VALUE">["sample1","sample2"]</stringProp>
--                <boolProp name="JSONVALIDATION">true</boolProp>
--                <boolProp name="EXPECT_NULL">false</boolProp>
--                <boolProp name="INVERT">false</boolProp>
--                <boolProp name="ISREGEX">false</boolProp>
--            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
--            <hashTree/>
--        </hashTree>
--    
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query virtual product" enabled="true">
--      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--        <collectionProp name="Arguments.arguments">
--          <elementProp name="" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${virtual_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
--            <stringProp name="Argument.metadata">=</stringProp>
--          </elementProp>
--        </collectionProp>
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Shipment Start" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-       </elementProp>
-       <stringProp name="HTTPSampler.domain"/>
-       <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout"/>
--      <stringProp name="HTTPSampler.response_timeout"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
--      <stringProp name="HTTPSampler.method">POST</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/order_shipment/start/order_id/${order_id}/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-       <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_virtual_product_with_extensible_data_objects.jmx</stringProp>
--    </HTTPSamplerProxy>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/shipment_start.jmx</stringProp></HTTPSamplerProxy>
-     <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
--        <stringProp name="VAR">graphql_virtual_products_query_total_count</stringProp>
--        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--      <hashTree/>
--      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
--        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_virtual_products_query_total_count");
--
--if (totalCount == null) {
--        Failure = true;
--        FailureMessage = "Not Expected \"totalCount\" to be null";
--} else {
--	if (Integer.parseInt(totalCount) != 1) {
--   Failure = true;
--   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
--	} else {
--		Failure = false;
--	}
--}
--</stringProp>
--        <stringProp name="BeanShellAssertion.filename"/>
--        <stringProp name="BeanShellAssertion.parameters"/>
--        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
--      </BeanShellAssertion>
--      <hashTree/>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
--        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
--        <stringProp name="EXPECTED_VALUE">${virtual_product_sku}</stringProp>
--        <boolProp name="JSONVALIDATION">true</boolProp>
--        <boolProp name="EXPECT_NULL">false</boolProp>
--        <boolProp name="INVERT">false</boolProp>
--        <boolProp name="ISREGEX">true</boolProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="304100442">New Shipment</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-       <hashTree/>
-     </hashTree>
-   
--        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query grouped product" enabled="true">
--            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--                <collectionProp name="Arguments.arguments">
--                    <elementProp name="" elementType="HTTPArgument">
--                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${grouped_product_sku}\"} }) {\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on GroupedProduct {\n                weight\n                items {\n                  qty\n                  position\n                  product {\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                                    swatch_image\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n                  }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
--                        <stringProp name="Argument.metadata">=</stringProp>
--                    </elementProp>
--                </collectionProp>
--            </elementProp>
--            <stringProp name="HTTPSampler.domain"/>
--            <stringProp name="HTTPSampler.port"/>
--            <stringProp name="HTTPSampler.connect_timeout"/>
--            <stringProp name="HTTPSampler.response_timeout"/>
--            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--            <stringProp name="HTTPSampler.contentEncoding"/>
--            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
--            <stringProp name="HTTPSampler.method">POST</stringProp>
--            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--            <boolProp name="HTTPSampler.monitor">false</boolProp>
--            <stringProp name="HTTPSampler.embedded_url_re"/>
--            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_grouped_product_with_extensible_data_objects.jmx</stringProp>
--        </HTTPSamplerProxy>
--        <hashTree>
--            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
--                <stringProp name="VAR">graphql_grouped_products_query_total_count</stringProp>
--                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
--                <stringProp name="DEFAULT"/>
--                <stringProp name="VARIABLE"/>
--                <stringProp name="SUBJECT">BODY</stringProp>
--            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--            <hashTree/>
--            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
--                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_grouped_products_query_total_count");
--
--                    if (totalCount == null) {
--                    Failure = true;
--                    FailureMessage = "Not Expected \"totalCount\" to be null";
--                    } else {
--                    if (Integer.parseInt(totalCount) != 1) {
--                    Failure = true;
--                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
--                    } else {
--                    Failure = false;
--                    }
--                    }
--
--
--                </stringProp>
--                <stringProp name="BeanShellAssertion.filename"/>
--                <stringProp name="BeanShellAssertion.parameters"/>
--                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
--            </BeanShellAssertion>
--            <hashTree/>
--            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert grouped product sku" enabled="true">
--                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
--                <stringProp name="EXPECTED_VALUE">${grouped_product_sku}</stringProp>
--                <boolProp name="JSONVALIDATION">true</boolProp>
--                <boolProp name="EXPECT_NULL">false</boolProp>
--                <boolProp name="INVERT">false</boolProp>
--                <boolProp name="ISREGEX">true</boolProp>
--            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
--            <hashTree/>
--        </hashTree>
--    
--        <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Query Customer" enabled="true"/>
--        <hashTree>
--            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create customer" enabled="true">
--                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--                    <collectionProp name="Arguments.arguments">
--                        <elementProp name="" elementType="HTTPArgument">
--                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                            <stringProp name="Argument.value">{&#xD;
--                                "customer": {&#xD;
--                                &#xD;
--                                "email": "customer_${__time()}-${__threadNum}-${__Random(1,1000000)}@example.com",&#xD;
--                                "firstname": "test_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
--                                "lastname": "Doe"&#xD;
--                                },&#xD;
--                                "password": "test@123"&#xD;
--                                }</stringProp>
--                            <stringProp name="Argument.metadata">=</stringProp>
--                        </elementProp>
--                    </collectionProp>
--                </elementProp>
--                <stringProp name="HTTPSampler.domain"/>
--                <stringProp name="HTTPSampler.port"/>
--                <stringProp name="HTTPSampler.connect_timeout"/>
--                <stringProp name="HTTPSampler.response_timeout"/>
--                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--                <stringProp name="HTTPSampler.contentEncoding"/>
--                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers</stringProp>
--                <stringProp name="HTTPSampler.method">POST</stringProp>
--                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--                <boolProp name="HTTPSampler.monitor">false</boolProp>
--                <stringProp name="HTTPSampler.embedded_url_re"/>
--                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_frontend_customer.jmx</stringProp>
--            </HTTPSamplerProxy>
--            <hashTree>
--                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer id" enabled="true">
--                    <stringProp name="VAR">customer_id</stringProp>
--                    <stringProp name="JSONPATH">$.id</stringProp>
--                    <stringProp name="DEFAULT"/>
--                    <stringProp name="VARIABLE"/>
--                    <stringProp name="SUBJECT">BODY</stringProp>
--                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--                <hashTree/>
--                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer id not null" enabled="true">
--                    <collectionProp name="Asserion.test_strings">
--                        <stringProp name="89649215">^\d+$</stringProp>
--                    </collectionProp>
--                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
--                    <boolProp name="Assertion.assume_success">false</boolProp>
--                    <intProp name="Assertion.test_type">1</intProp>
--                    <stringProp name="Assertion.scope">variable</stringProp>
--                    <stringProp name="Scope.variable">customer_id</stringProp>
--                </ResponseAssertion>
--                <hashTree/>
--            </hashTree>
--            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check customer" enabled="true">
--                <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
--                    <collectionProp name="Arguments.arguments"/>
--                </elementProp>
--                <stringProp name="HTTPSampler.domain"/>
--                <stringProp name="HTTPSampler.port"/>
--                <stringProp name="HTTPSampler.connect_timeout"/>
--                <stringProp name="HTTPSampler.response_timeout"/>
--                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--                <stringProp name="HTTPSampler.contentEncoding"/>
--                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers/${customer_id}</stringProp>
--                <stringProp name="HTTPSampler.method">GET</stringProp>
--                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--                <boolProp name="HTTPSampler.monitor">false</boolProp>
--                <stringProp name="HTTPSampler.embedded_url_re"/>
--                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/check_customer.jmx</stringProp>
--            </HTTPSamplerProxy>
--            <hashTree>
--                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
--                    <stringProp name="JSON_PATH">$.id</stringProp>
--                    <stringProp name="EXPECTED_VALUE">${customer_id}</stringProp>
--                    <boolProp name="JSONVALIDATION">true</boolProp>
--                    <boolProp name="EXPECT_NULL">false</boolProp>
--                    <boolProp name="INVERT">false</boolProp>
--                    <boolProp name="ISREGEX">true</boolProp>
--                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
--                <hashTree/>
--                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer email" enabled="true">
--                    <stringProp name="VAR">customer_email</stringProp>
--                    <stringProp name="JSONPATH">$.email</stringProp>
--                    <stringProp name="DEFAULT"/>
--                    <stringProp name="VARIABLE"/>
--                    <stringProp name="SUBJECT">BODY</stringProp>
--                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--                <hashTree/>
--            </hashTree>
--            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create customer token" enabled="true">
--                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--                    <collectionProp name="Arguments.arguments">
--                        <elementProp name="" elementType="HTTPArgument">
--                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                            <stringProp name="Argument.value">{&#xD;
--                                "username":"${customer_email}",&#xD;
--                                "password":"test@123"&#xD;
--                                }&#xD;
--                            </stringProp>
--                            <stringProp name="Argument.metadata">=</stringProp>
--                        </elementProp>
--                    </collectionProp>
--                </elementProp>
--                <stringProp name="HTTPSampler.domain"/>
--                <stringProp name="HTTPSampler.port"/>
--                <stringProp name="HTTPSampler.connect_timeout"/>
--                <stringProp name="HTTPSampler.response_timeout"/>
--                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--                <stringProp name="HTTPSampler.contentEncoding"/>
--                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/integration/customer/token</stringProp>
--                <stringProp name="HTTPSampler.method">POST</stringProp>
--                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--                <boolProp name="HTTPSampler.monitor">false</boolProp>
--                <stringProp name="HTTPSampler.embedded_url_re"/>
--                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_customer.jmx</stringProp>
--            </HTTPSamplerProxy>
--            <hashTree>
--                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer token" enabled="true">
--                    <stringProp name="VAR">customer_token</stringProp>
--                    <stringProp name="JSONPATH">$</stringProp>
--                    <stringProp name="DEFAULT"/>
--                    <stringProp name="VARIABLE"/>
--                    <stringProp name="SUBJECT">BODY</stringProp>
--                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--                <hashTree/>
--            </hashTree>
--            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query customer with token" enabled="true">
--                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
--                    <collectionProp name="Arguments.arguments">
--                        <elementProp name="" elementType="HTTPArgument">
--                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--                            <stringProp name="Argument.value">{"query":"{\n  customer {\n    created_at\n    group_id\n\n    prefix\n    firstname\n    middlename\n    lastname\n    suffix\n    email\n    default_billing\n    default_shipping\n\n    dob\n    taxvat\n\n    id\n    addresses {\n        id\n        customer_id\n        region {\n            region_code\n          region\n          region_id\n        }\n        region_id\n        country_id\n        street \n        company\n        telephone\n        fax\n        postcode\n        city\n        firstname\n        lastname\n        middlename\n        prefix\n        suffix\n        vat_id\n        default_shipping\n        default_billing\n    }\n    is_subscribed\n  }\n}","variables":null,"operationName":null}</stringProp>
--                            <stringProp name="Argument.metadata">=</stringProp>
--                        </elementProp>
--                    </collectionProp>
--                </elementProp>
--                <stringProp name="HTTPSampler.domain"/>
--                <stringProp name="HTTPSampler.port"/>
--                <stringProp name="HTTPSampler.connect_timeout"/>
--                <stringProp name="HTTPSampler.response_timeout"/>
--                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
--                <stringProp name="HTTPSampler.contentEncoding"/>
--                <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
--                <stringProp name="HTTPSampler.method">POST</stringProp>
--                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
--                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
--                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
--                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
--                <boolProp name="HTTPSampler.monitor">false</boolProp>
--                <stringProp name="HTTPSampler.embedded_url_re"/>
--                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_frontend_customer.jmx</stringProp>
--            </HTTPSamplerProxy>
--            <hashTree>
--                <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="Set Customer Token" enabled="true">
--                    <boolProp name="resetInterpreter">false</boolProp>
--                    <stringProp name="parameters"/>
--                    <stringProp name="filename"/>
--                    <stringProp name="script">import org.apache.jmeter.protocol.http.control.Header;
--
--                        sampler.getHeaderManager().removeHeaderNamed("Authorization");
--
--                        sampler.getHeaderManager().add(new Header("Authorization","Bearer " + vars.get("customer_token")));</stringProp>
--                </BeanShellPreProcessor>
--                <hashTree/>
--                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert customer lastname" enabled="true">
--                    <stringProp name="JSON_PATH">$.data.customer.lastname</stringProp>
--                    <stringProp name="EXPECTED_VALUE">Doe</stringProp>
--                    <boolProp name="JSONVALIDATION">true</boolProp>
--                    <boolProp name="EXPECT_NULL">false</boolProp>
--                    <boolProp name="INVERT">false</boolProp>
--                    <boolProp name="ISREGEX">true</boolProp>
--                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
--                <hashTree/>
--            </hashTree>
--        </hashTree>
--    
--    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query Category" enabled="true">
--      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
--      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Shipment Submit" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-         <collectionProp name="Arguments.arguments">
--          <elementProp name="" elementType="HTTPArgument">
--            <boolProp name="HTTPArgument.always_encode">false</boolProp>
--            <stringProp name="Argument.value">{"query":"{\n  category(id: 1) {\n      name\n      id\n      level\n      description\n      path\n      path_in_store\n      url_key\n      url_path\n      children {\n        id\n        description\n        default_sort_by\n        children {\n          id\n          description\n          level\n          children {\n            level\n            id\n            children {\n              id\n            }\n          }\n        }\n      }\n  }\n}","variables":null,"operationName":null}</stringProp>
-+          <elementProp name="form_key" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">form_key</stringProp>
-+            <stringProp name="Argument.desc">false</stringProp>
-+          </elementProp>
-+          <elementProp name="shipment[items][${item_ids_1}]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">shipment[items][${item_ids_1}]</stringProp>
-+          </elementProp>
-+          <elementProp name="shipment[items][${item_ids_2}]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">1</stringProp>
-+            <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">shipment[items][${item_ids_2}]</stringProp>
-+          </elementProp>
-+          <elementProp name="shipment[comment_text]" elementType="HTTPArgument">
-+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-+            <stringProp name="Argument.value">Shipped</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-+            <stringProp name="Argument.name">shipment[comment_text]</stringProp>
-           </elementProp>
-         </collectionProp>
-       </elementProp>
-       <stringProp name="HTTPSampler.domain"/>
-       <stringProp name="HTTPSampler.port"/>
--      <stringProp name="HTTPSampler.connect_timeout"/>
--      <stringProp name="HTTPSampler.response_timeout"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-       <stringProp name="HTTPSampler.contentEncoding"/>
--      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/order_shipment/save/order_id/${order_id}/</stringProp>
-       <stringProp name="HTTPSampler.method">POST</stringProp>
-       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-@@ -41637,38 +70128,56 @@ if (totalCount == null) {
-       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-       <boolProp name="HTTPSampler.monitor">false</boolProp>
-       <stringProp name="HTTPSampler.embedded_url_re"/>
--      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_root_category.jmx</stringProp>
--    </HTTPSamplerProxy>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/shipment_submit.jmx</stringProp></HTTPSamplerProxy>
-     <hashTree>
--      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
--        <stringProp name="VAR">graphql_category_query_name</stringProp>
--        <stringProp name="JSONPATH">$.data.category.name</stringProp>
--        <stringProp name="DEFAULT"/>
--        <stringProp name="VARIABLE"/>
--        <stringProp name="SUBJECT">BODY</stringProp>
--      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
--      <hashTree/>
--      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
--        <stringProp name="BeanShellAssertion.query">String name = vars.get("graphql_category_query_name");
--if (name == null) {
--	Failure = true;
--	FailureMessage = "Not Expected \"children\" to be null";
--} else {
--	if (!name.equals("Root Catalog")) {
--		Failure = true;
--		FailureMessage = "Expected \"name\" to equal \"Root Catalog\", Actual: " + name;
--	} else {
--		Failure = false;
--	}
--}
--</stringProp>
--        <stringProp name="BeanShellAssertion.filename"/>
--        <stringProp name="BeanShellAssertion.parameters"/>
--        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
--      </BeanShellAssertion>
-+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-+        <collectionProp name="Asserion.test_strings">
-+          <stringProp name="-2089453199">The shipment has been created</stringProp>
-+        </collectionProp>
-+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-+        <boolProp name="Assertion.assume_success">false</boolProp>
-+        <intProp name="Assertion.test_type">2</intProp>
-+      </ResponseAssertion>
-       <hashTree/>
-     </hashTree>
-   </hashTree>
-+  </hashTree>
-+  
-+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-+        <collectionProp name="Arguments.arguments"/>
-+      </elementProp>
-+      <stringProp name="HTTPSampler.domain"/>
-+      <stringProp name="HTTPSampler.port"/>
-+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-+      <stringProp name="HTTPSampler.contentEncoding"/>
-+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-+      <stringProp name="HTTPSampler.method">GET</stringProp>
-+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-+      <boolProp name="HTTPSampler.monitor">false</boolProp>
-+      <stringProp name="HTTPSampler.embedded_url_re"/>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-+    <hashTree>
-+    
-+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-+        <boolProp name="resetInterpreter">false</boolProp>
-+        <stringProp name="parameters"/>
-+        <stringProp name="filename"/>
-+        <stringProp name="script">
-+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-+        if (adminUsersDistribution == 1) {
-+            adminUserList = props.get("adminUserList");
-+            adminUserList.add(vars.get("admin_user"));
-+        }
-+        </stringProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-+    <hashTree/>
-+  </hashTree>
-   </hashTree>
- 
-   </hashTree>
-@@ -41805,6 +70314,14 @@ if (name == null) {
-       <stringProp name="filename">${response_time_file_name}</stringProp>
-     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/aggregate_graph.jmx</stringProp></ResultCollector>
-     <hashTree/>
-+  
-+    <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="false">
-+      <boolProp name="displayJMeterProperties">false</boolProp>
-+      <boolProp name="displayJMeterVariables">true</boolProp>
-+      <boolProp name="displaySamplerProperties">true</boolProp>
-+      <boolProp name="displaySystemProperties">false</boolProp>
-+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/debug.jmx</stringProp></DebugPostProcessor>
-+    <hashTree/>
-   </hashTree>
-     <WorkBench guiclass="WorkBenchGui" testclass="WorkBench" testname="WorkBench" enabled="true">
-       <boolProp name="WorkBench.save">true</boolProp>
-diff --git a/setup/performance-toolkit/benchmark_2015.jmx b/setup/performance-toolkit/benchmark_2015.jmx
-index 8be7749a08b..e58e6103041 100644
---- a/setup/performance-toolkit/benchmark_2015.jmx
-+++ b/setup/performance-toolkit/benchmark_2015.jmx
-@@ -2981,12 +2981,12 @@ vars.put("loadType", "Guest");</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-@@ -3217,12 +3217,12 @@ vars.put("loadType", "Guest");</stringProp>
-             <stringProp name="Argument.name">sections</stringProp>
-             <stringProp name="Argument.desc">true</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-             <stringProp name="Argument.desc">true</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-@@ -3565,12 +3565,12 @@ vars.put("loadType", "Guest");</stringProp>
-             <stringProp name="Argument.name">sections</stringProp>
-             <stringProp name="Argument.desc">true</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-             <stringProp name="Argument.desc">true</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-@@ -4039,12 +4039,12 @@ vars.put("loadType", "Guest");</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-@@ -4275,12 +4275,12 @@ vars.put("loadType", "Guest");</stringProp>
-             <stringProp name="Argument.name">sections</stringProp>
-             <stringProp name="Argument.desc">true</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-             <stringProp name="Argument.desc">true</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-@@ -4623,12 +4623,12 @@ vars.put("loadType", "Guest");</stringProp>
-             <stringProp name="Argument.name">sections</stringProp>
-             <stringProp name="Argument.desc">true</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-             <stringProp name="Argument.desc">true</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-@@ -5637,12 +5637,12 @@ vars.put("loadType", "Customer");</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-             <stringProp name="Argument.name">sections</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-@@ -5873,12 +5873,12 @@ vars.put("loadType", "Customer");</stringProp>
-             <stringProp name="Argument.name">sections</stringProp>
-             <stringProp name="Argument.desc">true</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-             <stringProp name="Argument.desc">true</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-@@ -6221,12 +6221,12 @@ vars.put("loadType", "Customer");</stringProp>
-             <stringProp name="Argument.name">sections</stringProp>
-             <stringProp name="Argument.desc">true</stringProp>
-           </elementProp>
--          <elementProp name="update_section_id" elementType="HTTPArgument">
-+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
-             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-             <stringProp name="Argument.value">true</stringProp>
-             <stringProp name="Argument.metadata">=</stringProp>
-             <boolProp name="HTTPArgument.use_equals">true</boolProp>
--            <stringProp name="Argument.name">update_section_id</stringProp>
-+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
-             <stringProp name="Argument.desc">true</stringProp>
-           </elementProp>
-           <elementProp name="_" elementType="HTTPArgument">
-diff --git a/setup/performance-toolkit/config/description.xml b/setup/performance-toolkit/config/description.xml
-index ae7e1e343b1..06fa6a2618f 100644
---- a/setup/performance-toolkit/config/description.xml
-+++ b/setup/performance-toolkit/config/description.xml
-@@ -7,16 +7,16 @@
- -->
- <description>
-     <paragraphs>
--        <count-min>4</count-min>
--        <count-max>10</count-max>
-+        <count-min>7</count-min>
-+        <count-max>7</count-max>
- 
-         <sentences>
--            <count-min>10</count-min>
--            <count-max>15</count-max>
-+            <count-min>12</count-min>
-+            <count-max>12</count-max>
- 
-             <words>
--                <count-min>5</count-min>
--                <count-max>7</count-max>
-+                <count-min>6</count-min>
-+                <count-max>6</count-max>
-             </words>
-         </sentences>
-     </paragraphs>
-diff --git a/setup/performance-toolkit/profiles/ce/extra_large.xml b/setup/performance-toolkit/profiles/ce/extra_large.xml
-index 44b3512090b..911ac7fe06d 100644
---- a/setup/performance-toolkit/profiles/ce/extra_large.xml
-+++ b/setup/performance-toolkit/profiles/ce/extra_large.xml
-@@ -39,10 +39,11 @@
-         <catalog_price_rules>20</catalog_price_rules> <!-- Number of catalog price rules -->
-         <cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
-         <cart_price_rules_floor>2</cart_price_rules_floor>
-+        <coupon_codes>20</coupon_codes> <!-- Number of coupon codes -->
- 
--        <product_attribute_sets>200</product_attribute_sets> <!-- Number of product attribute sets -->
--        <product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
--        <product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
-+        <product_attribute_sets>100</product_attribute_sets> <!-- Number of product attribute sets -->
-+        <product_attribute_sets_attributes>30</product_attribute_sets_attributes> <!-- Number of attributes per set -->
-+        <product_attribute_sets_attributes_values>15</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
- 
-         <order_quotes_enable>true</order_quotes_enable>
-         <order_simple_product_count_from>2</order_simple_product_count_from>
-diff --git a/setup/performance-toolkit/profiles/ce/large.xml b/setup/performance-toolkit/profiles/ce/large.xml
-index 606c854d27a..79abab0ba4b 100644
---- a/setup/performance-toolkit/profiles/ce/large.xml
-+++ b/setup/performance-toolkit/profiles/ce/large.xml
-@@ -39,10 +39,11 @@
-         <catalog_price_rules>20</catalog_price_rules> <!-- Number of catalog price rules -->
-         <cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
-         <cart_price_rules_floor>2</cart_price_rules_floor>
-+        <coupon_codes>20</coupon_codes> <!-- Number of coupon codes -->
- 
--        <product_attribute_sets>200</product_attribute_sets> <!-- Number of product attribute sets -->
--        <product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
--        <product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
-+        <product_attribute_sets>50</product_attribute_sets> <!-- Number of product attribute sets -->
-+        <product_attribute_sets_attributes>20</product_attribute_sets_attributes> <!-- Number of attributes per set -->
-+        <product_attribute_sets_attributes_values>15</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
- 
-         <order_quotes_enable>true</order_quotes_enable>
-         <order_simple_product_count_from>2</order_simple_product_count_from>
-diff --git a/setup/performance-toolkit/profiles/ce/medium.xml b/setup/performance-toolkit/profiles/ce/medium.xml
-index 4f735ae4ac2..d02370a7770 100644
---- a/setup/performance-toolkit/profiles/ce/medium.xml
-+++ b/setup/performance-toolkit/profiles/ce/medium.xml
-@@ -39,10 +39,11 @@
-         <catalog_price_rules>20</catalog_price_rules> <!-- Number of catalog price rules -->
-         <cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
-         <cart_price_rules_floor>2</cart_price_rules_floor>
-+        <coupon_codes>20</coupon_codes> <!-- Number of coupon codes -->
- 
--        <product_attribute_sets>100</product_attribute_sets> <!-- Number of product attribute sets -->
--        <product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
--        <product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
-+        <product_attribute_sets>30</product_attribute_sets> <!-- Number of product attribute sets -->
-+        <product_attribute_sets_attributes>10</product_attribute_sets_attributes> <!-- Number of attributes per set -->
-+        <product_attribute_sets_attributes_values>8</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
- 
-         <order_quotes_enable>true</order_quotes_enable>
-         <order_simple_product_count_from>2</order_simple_product_count_from>
-diff --git a/setup/performance-toolkit/profiles/ce/medium_msite.xml b/setup/performance-toolkit/profiles/ce/medium_msite.xml
-index 24d51d170fb..2f9310c5242 100644
---- a/setup/performance-toolkit/profiles/ce/medium_msite.xml
-+++ b/setup/performance-toolkit/profiles/ce/medium_msite.xml
-@@ -45,10 +45,11 @@
-         <catalog_price_rules>20</catalog_price_rules> <!-- Number of catalog price rules -->
-         <cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
-         <cart_price_rules_floor>2</cart_price_rules_floor>
-+        <coupon_codes>20</coupon_codes> <!-- Number of coupon codes -->
- 
--        <product_attribute_sets>100</product_attribute_sets> <!-- Number of product attribute sets -->
--        <product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
--        <product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
-+        <product_attribute_sets>30</product_attribute_sets> <!-- Number of product attribute sets -->
-+        <product_attribute_sets_attributes>10</product_attribute_sets_attributes> <!-- Number of attributes per set -->
-+        <product_attribute_sets_attributes_values>8</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
- 
-         <order_quotes_enable>true</order_quotes_enable>
-         <order_simple_product_count_from>2</order_simple_product_count_from>
-diff --git a/setup/performance-toolkit/profiles/ce/small.xml b/setup/performance-toolkit/profiles/ce/small.xml
-index 270828c2a2c..cf7768328bd 100644
---- a/setup/performance-toolkit/profiles/ce/small.xml
-+++ b/setup/performance-toolkit/profiles/ce/small.xml
-@@ -39,10 +39,11 @@
-         <catalog_price_rules>20</catalog_price_rules> <!-- Number of catalog price rules -->
-         <cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
-         <cart_price_rules_floor>2</cart_price_rules_floor>
-+        <coupon_codes>20</coupon_codes> <!-- Number of coupon codes -->
- 
-         <product_attribute_sets>10</product_attribute_sets> <!-- Number of product attribute sets -->
--        <product_attribute_sets_attributes>10</product_attribute_sets_attributes> <!-- Number of attributes per set -->
--        <product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
-+        <product_attribute_sets_attributes>5</product_attribute_sets_attributes> <!-- Number of attributes per set -->
-+        <product_attribute_sets_attributes_values>5</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
- 
-         <order_quotes_enable>true</order_quotes_enable>
-         <order_simple_product_count_from>2</order_simple_product_count_from>
-diff --git a/setup/pub/angular-ng-storage/angular-ng-storage.min.js b/setup/pub/angular-ng-storage/angular-ng-storage.min.js
-index f5526bbace8..54891ebb408 100644
---- a/setup/pub/angular-ng-storage/angular-ng-storage.min.js
-+++ b/setup/pub/angular-ng-storage/angular-ng-storage.min.js
-@@ -1 +1 @@
--/*! ngStorage 0.3.0 | Copyright (c) 2013 Gias Kay Lee | MIT License */"use strict";!function(){function a(a){return["$rootScope","$window",function(b,c){for(var d,e,f,g=c[a]||(console.warn("This browser does not support Web Storage!"),{}),h={$default:function(a){for(var b in a)angular.isDefined(h[b])||(h[b]=a[b]);return h},$reset:function(a){for(var b in h)"$"===b[0]||delete h[b];return h.$default(a)}},i=0;i<g.length;i++)(f=g.key(i))&&"ngStorage-"===f.slice(0,10)&&(h[f.slice(10)]=angular.fromJson(g.getItem(f)));return d=angular.copy(h),b.$watch(function(){e||(e=setTimeout(function(){if(e=null,!angular.equals(h,d)){angular.forEach(h,function(a,b){angular.isDefined(a)&&"$"!==b[0]&&g.setItem("ngStorage-"+b,angular.toJson(a)),delete d[b]});for(var a in d)g.removeItem("ngStorage-"+a);d=angular.copy(h)}},100))}),"localStorage"===a&&c.addEventListener&&c.addEventListener("storage",function(a){"ngStorage-"===a.key.slice(0,10)&&(a.newValue?h[a.key.slice(10)]=angular.fromJson(a.newValue):delete h[a.key.slice(10)],d=angular.copy(h),b.$apply())}),h}]}angular.module("ngStorage",[]).factory("$localStorage",a("localStorage")).factory("$sessionStorage",a("sessionStorage"))}();
-\ No newline at end of file
-+/*! ngstorage 0.3.10 | Copyright (c) 2016 Gias Kay Lee | MIT License */!function(a,b){"use strict";"function"==typeof define&&define.amd?define(["angular"],b):a.hasOwnProperty("angular")?b(a.angular):"object"==typeof exports&&(module.exports=b(require("angular")))}(this,function(a){"use strict";function b(a,b){var c;try{c=a[b]}catch(d){c=!1}if(c){var e="__"+Math.round(1e7*Math.random());try{a[b].setItem(e,e),a[b].removeItem(e,e)}catch(d){c=!1}}return c}function c(c){var d=b(window,c);return function(){var e="ngStorage-";this.setKeyPrefix=function(a){if("string"!=typeof a)throw new TypeError("[ngStorage] - "+c+"Provider.setKeyPrefix() expects a String.");e=a};var f=a.toJson,g=a.fromJson;this.setSerializer=function(a){if("function"!=typeof a)throw new TypeError("[ngStorage] - "+c+"Provider.setSerializer expects a function.");f=a},this.setDeserializer=function(a){if("function"!=typeof a)throw new TypeError("[ngStorage] - "+c+"Provider.setDeserializer expects a function.");g=a},this.supported=function(){return!!d},this.get=function(a){return d&&g(d.getItem(e+a))},this.set=function(a,b){return d&&d.setItem(e+a,f(b))},this.remove=function(a){d&&d.removeItem(e+a)},this.$get=["$rootScope","$window","$log","$timeout","$document",function(d,h,i,j,k){var l,m,n=e.length,o=b(h,c),p=o||(i.warn("This browser does not support Web Storage!"),{setItem:a.noop,getItem:a.noop,removeItem:a.noop}),q={$default:function(b){for(var c in b)a.isDefined(q[c])||(q[c]=a.copy(b[c]));return q.$sync(),q},$reset:function(a){for(var b in q)"$"===b[0]||delete q[b]&&p.removeItem(e+b);return q.$default(a)},$sync:function(){for(var a,b=0,c=p.length;c>b;b++)(a=p.key(b))&&e===a.slice(0,n)&&(q[a.slice(n)]=g(p.getItem(a)))},$apply:function(){var b;if(m=null,!a.equals(q,l)){b=a.copy(l),a.forEach(q,function(c,d){a.isDefined(c)&&"$"!==d[0]&&(p.setItem(e+d,f(c)),delete b[d])});for(var c in b)p.removeItem(e+c);l=a.copy(q)}},$supported:function(){return!!o}};return q.$sync(),l=a.copy(q),d.$watch(function(){m||(m=j(q.$apply,100,!1))}),h.addEventListener&&h.addEventListener("storage",function(b){if(b.key){var c=k[0];c.hasFocus&&c.hasFocus()||e!==b.key.slice(0,n)||(b.newValue?q[b.key.slice(n)]=g(b.newValue):delete q[b.key.slice(n)],l=a.copy(q),d.$apply())}}),h.addEventListener&&h.addEventListener("beforeunload",function(){q.$apply()}),q}]}}return a=a&&a.module?a:window.angular,a.module("ngStorage",[]).provider("$localStorage",c("localStorage")).provider("$sessionStorage",c("sessionStorage"))});
-\ No newline at end of file
-diff --git a/setup/pub/angular-sanitize/angular-sanitize.js b/setup/pub/angular-sanitize/angular-sanitize.js
-index 6004460cd17..8faa8431500 100644
---- a/setup/pub/angular-sanitize/angular-sanitize.js
-+++ b/setup/pub/angular-sanitize/angular-sanitize.js
-@@ -1,76 +1,79 @@
- /**
-- * @license AngularJS v1.2.14
-- * (c) 2010-2014 Google, Inc. http://angularjs.org
-+ * @license AngularJS v1.6.9
-+ * (c) 2010-2018 Google, Inc. http://angularjs.org
-  * License: MIT
-  */
--(function(window, angular, undefined) {'use strict';
-+(function(window, angular) {'use strict';
-+
-+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-+     *     Any commits to this file should be reviewed with security in mind.  *
-+     *   Changes to this file can potentially create security vulnerabilities. *
-+     *          An approval from 2 Core members with history of modifying      *
-+     *                         this file is required.                          *
-+     *                                                                         *
-+     *  Does the change somehow allow for arbitrary javascript to be executed? *
-+     *    Or allows for someone to change the prototype of built-in objects?   *
-+     *     Or gives undesired access to variables likes document or window?    *
-+     * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
- 
-     var $sanitizeMinErr = angular.$$minErr('$sanitize');
-+    var bind;
-+    var extend;
-+    var forEach;
-+    var isDefined;
-+    var lowercase;
-+    var noop;
-+    var nodeContains;
-+    var htmlParser;
-+    var htmlSanitizeWriter;
- 
-     /**
-      * @ngdoc module
-      * @name ngSanitize
-      * @description
-      *
--     * # ngSanitize
--     *
-      * The `ngSanitize` module provides functionality to sanitize HTML.
-      *
--     *
--     * <div doc-module-components="ngSanitize"></div>
--     *
-      * See {@link ngSanitize.$sanitize `$sanitize`} for usage.
-      */
- 
--    /*
--     * HTML Parser By Misko Hevery (misko@hevery.com)
--     * based on:  HTML Parser By John Resig (ejohn.org)
--     * Original code by Erik Arvidsson, Mozilla Public License
--     * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
--     *
--     * // Use like so:
--     * htmlParser(htmlString, {
--     *     start: function(tag, attrs, unary) {},
--     *     end: function(tag) {},
--     *     chars: function(text) {},
--     *     comment: function(text) {}
--     * });
--     *
--     */
--
--
-     /**
-      * @ngdoc service
-      * @name $sanitize
--     * @function
-+     * @kind function
-      *
-      * @description
--     *   The input is sanitized by parsing the html into tokens. All safe tokens (from a whitelist) are
-+     *   Sanitizes an html string by stripping all potentially dangerous tokens.
-+     *
-+     *   The input is sanitized by parsing the HTML into tokens. All safe tokens (from a whitelist) are
-      *   then serialized back to properly escaped html string. This means that no unsafe input can make
--     *   it into the returned string, however, since our parser is more strict than a typical browser
--     *   parser, it's possible that some obscure input, which would be recognized as valid HTML by a
--     *   browser, won't make it through the sanitizer.
--     *   The whitelist is configured using the functions `aHrefSanitizationWhitelist` and
--     *   `imgSrcSanitizationWhitelist` of {@link ng.$compileProvider `$compileProvider`}.
-+     *   it into the returned string.
-      *
--     * @param {string} html Html input.
--     * @returns {string} Sanitized html.
-+     *   The whitelist for URL sanitization of attribute values is configured using the functions
-+     *   `aHrefSanitizationWhitelist` and `imgSrcSanitizationWhitelist` of {@link ng.$compileProvider
-+ *   `$compileProvider`}.
-+     *
-+     *   The input may also contain SVG markup if this is enabled via {@link $sanitizeProvider}.
-+     *
-+     * @param {string} html HTML input.
-+     * @returns {string} Sanitized HTML.
-      *
-      * @example
--     <example module="ngSanitize" deps="angular-sanitize.js">
-+     <example module="sanitizeExample" deps="angular-sanitize.js" name="sanitize-service">
-      <file name="index.html">
-      <script>
--     function Ctrl($scope, $sce) {
--         $scope.snippet =
--           '<p style="color:blue">an html\n' +
--           '<em onmouseover="this.textContent=\'PWN3D!\'">click here</em>\n' +
--           'snippet</p>';
--         $scope.deliberatelyTrustDangerousSnippet = function() {
--           return $sce.trustAsHtml($scope.snippet);
--         };
--       }
-+     angular.module('sanitizeExample', ['ngSanitize'])
-+     .controller('ExampleController', ['$scope', '$sce', function($scope, $sce) {
-+             $scope.snippet =
-+               '<p style="color:blue">an html\n' +
-+               '<em onmouseover="this.textContent=\'PWN3D!\'">click here</em>\n' +
-+               'snippet</p>';
-+             $scope.deliberatelyTrustDangerousSnippet = function() {
-+               return $sce.trustAsHtml($scope.snippet);
-+             };
-+           }]);
-      </script>
--     <div ng-controller="Ctrl">
-+     <div ng-controller="ExampleController">
-      Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
-      <table>
-      <tr>
-@@ -105,410 +108,538 @@
-      </file>
-      <file name="protractor.js" type="protractor">
-      it('should sanitize the html snippet by default', function() {
--       expect(element(by.css('#bind-html-with-sanitize div')).getInnerHtml()).
-+       expect(element(by.css('#bind-html-with-sanitize div')).getAttribute('innerHTML')).
-          toBe('<p>an html\n<em>click here</em>\nsnippet</p>');
-      });
-+
-      it('should inline raw snippet if bound to a trusted value', function() {
--       expect(element(by.css('#bind-html-with-trust div')).getInnerHtml()).
-+       expect(element(by.css('#bind-html-with-trust div')).getAttribute('innerHTML')).
-          toBe("<p style=\"color:blue\">an html\n" +
-               "<em onmouseover=\"this.textContent='PWN3D!'\">click here</em>\n" +
-               "snippet</p>");
-      });
-+
-      it('should escape snippet without any filter', function() {
--       expect(element(by.css('#bind-default div')).getInnerHtml()).
-+       expect(element(by.css('#bind-default div')).getAttribute('innerHTML')).
-          toBe("&lt;p style=\"color:blue\"&gt;an html\n" +
-               "&lt;em onmouseover=\"this.textContent='PWN3D!'\"&gt;click here&lt;/em&gt;\n" +
-               "snippet&lt;/p&gt;");
-      });
-+
-      it('should update', function() {
-        element(by.model('snippet')).clear();
-        element(by.model('snippet')).sendKeys('new <b onclick="alert(1)">text</b>');
--       expect(element(by.css('#bind-html-with-sanitize div')).getInnerHtml()).
-+       expect(element(by.css('#bind-html-with-sanitize div')).getAttribute('innerHTML')).
-          toBe('new <b>text</b>');
--       expect(element(by.css('#bind-html-with-trust div')).getInnerHtml()).toBe(
-+       expect(element(by.css('#bind-html-with-trust div')).getAttribute('innerHTML')).toBe(
-          'new <b onclick="alert(1)">text</b>');
--       expect(element(by.css('#bind-default div')).getInnerHtml()).toBe(
-+       expect(element(by.css('#bind-default div')).getAttribute('innerHTML')).toBe(
-          "new &lt;b onclick=\"alert(1)\"&gt;text&lt;/b&gt;");
-      });
-      </file>
-      </example>
-      */
-+
-+
-+    /**
-+     * @ngdoc provider
-+     * @name $sanitizeProvider
-+     * @this
-+     *
-+     * @description
-+     * Creates and configures {@link $sanitize} instance.
-+     */
-     function $SanitizeProvider() {
-+        var svgEnabled = false;
-+
-         this.$get = ['$$sanitizeUri', function($$sanitizeUri) {
-+            if (svgEnabled) {
-+                extend(validElements, svgElements);
-+            }
-             return function(html) {
-                 var buf = [];
-                 htmlParser(html, htmlSanitizeWriter(buf, function(uri, isImage) {
--                    return !/^unsafe/.test($$sanitizeUri(uri, isImage));
-+                    return !/^unsafe:/.test($$sanitizeUri(uri, isImage));
-                 }));
-                 return buf.join('');
-             };
-         }];
--    }
- 
--    function sanitizeText(chars) {
--        var buf = [];
--        var writer = htmlSanitizeWriter(buf, angular.noop);
--        writer.chars(chars);
--        return buf.join('');
--    }
--
--
--// Regular Expressions for parsing tags and attributes
--    var START_TAG_REGEXP =
--            /^<\s*([\w:-]+)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*>/,
--        END_TAG_REGEXP = /^<\s*\/\s*([\w:-]+)[^>]*>/,
--        ATTR_REGEXP = /([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,
--        BEGIN_TAG_REGEXP = /^</,
--        BEGIN_END_TAGE_REGEXP = /^<\s*\//,
--        COMMENT_REGEXP = /<!--(.*?)-->/g,
--        DOCTYPE_REGEXP = /<!DOCTYPE([^>]*?)>/i,
--        CDATA_REGEXP = /<!\[CDATA\[(.*?)]]>/g,
--        // Match everything outside of normal chars and " (quote character)
--        NON_ALPHANUMERIC_REGEXP = /([^\#-~| |!])/g;
--
--
--// Good source of info about elements and attributes
--// http://dev.w3.org/html5/spec/Overview.html#semantics
--// http://simon.html5.org/html-elements
--
--// Safe Void Elements - HTML5
--// http://dev.w3.org/html5/spec/Overview.html#void-elements
--    var voidElements = makeMap("area,br,col,hr,img,wbr");
--
--// Elements that you can, intentionally, leave open (and which close themselves)
--// http://dev.w3.org/html5/spec/Overview.html#optional-tags
--    var optionalEndTagBlockElements = makeMap("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr"),
--        optionalEndTagInlineElements = makeMap("rp,rt"),
--        optionalEndTagElements = angular.extend({},
--            optionalEndTagInlineElements,
--            optionalEndTagBlockElements);
--
--// Safe Block Elements - HTML5
--    var blockElements = angular.extend({}, optionalEndTagBlockElements, makeMap("address,article," +
--        "aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5," +
--        "h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul"));
--
--// Inline Elements - HTML5
--    var inlineElements = angular.extend({}, optionalEndTagInlineElements, makeMap("a,abbr,acronym,b," +
--        "bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s," +
--        "samp,small,span,strike,strong,sub,sup,time,tt,u,var"));
--
--
--// Special Elements (can contain anything)
--    var specialElements = makeMap("script,style");
--
--    var validElements = angular.extend({},
--        voidElements,
--        blockElements,
--        inlineElements,
--        optionalEndTagElements);
--
--//Attributes that have href and hence need to be sanitized
--    var uriAttrs = makeMap("background,cite,href,longdesc,src,usemap");
--    var validAttrs = angular.extend({}, uriAttrs, makeMap(
--        'abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,'+
--        'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,'+
--        'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,'+
--        'scope,scrolling,shape,size,span,start,summary,target,title,type,'+
--        'valign,value,vspace,width'));
--
--    function makeMap(str) {
--        var obj = {}, items = str.split(','), i;
--        for (i = 0; i < items.length; i++) obj[items[i]] = true;
--        return obj;
--    }
- 
-+        /**
-+         * @ngdoc method
-+         * @name $sanitizeProvider#enableSvg
-+         * @kind function
-+         *
-+         * @description
-+         * Enables a subset of svg to be supported by the sanitizer.
-+         *
-+         * <div class="alert alert-warning">
-+         *   <p>By enabling this setting without taking other precautions, you might expose your
-+         *   application to click-hijacking attacks. In these attacks, sanitized svg elements could be positioned
-+         *   outside of the containing element and be rendered over other elements on the page (e.g. a login
-+         *   link). Such behavior can then result in phishing incidents.</p>
-+         *
-+         *   <p>To protect against these, explicitly setup `overflow: hidden` css rule for all potential svg
-+         *   tags within the sanitized content:</p>
-+         *
-+         *   <br>
-+         *
-+         *   <pre><code>
-+         *   .rootOfTheIncludedContent svg {
-+         *     overflow: hidden !important;
-+         *   }
-+         *   </code></pre>
-+         * </div>
-+         *
-+         * @param {boolean=} flag Enable or disable SVG support in the sanitizer.
-+         * @returns {boolean|ng.$sanitizeProvider} Returns the currently configured value if called
-+         *    without an argument or self for chaining otherwise.
-+         */
-+        this.enableSvg = function(enableSvg) {
-+            if (isDefined(enableSvg)) {
-+                svgEnabled = enableSvg;
-+                return this;
-+            } else {
-+                return svgEnabled;
-+            }
-+        };
- 
--    /**
--     * @example
--     * htmlParser(htmlString, {
-- *     start: function(tag, attrs, unary) {},
-- *     end: function(tag) {},
-- *     chars: function(text) {},
-- *     comment: function(text) {}
-- * });
--     *
--     * @param {string} html string
--     * @param {object} handler
--     */
--    function htmlParser( html, handler ) {
--        var index, chars, match, stack = [], last = html;
--        stack.last = function() { return stack[ stack.length - 1 ]; };
--
--        while ( html ) {
--            chars = true;
-+        //////////////////////////////////////////////////////////////////////////////////////////////////
-+        // Private stuff
-+        //////////////////////////////////////////////////////////////////////////////////////////////////
- 
--            // Make sure we're not in a script or style element
--            if ( !stack.last() || !specialElements[ stack.last() ] ) {
-+        bind = angular.bind;
-+        extend = angular.extend;
-+        forEach = angular.forEach;
-+        isDefined = angular.isDefined;
-+        lowercase = angular.lowercase;
-+        noop = angular.noop;
- 
--                // Comment
--                if ( html.indexOf("<!--") === 0 ) {
--                    // comments containing -- are not allowed unless they terminate the comment
--                    index = html.indexOf("--", 4);
-+        htmlParser = htmlParserImpl;
-+        htmlSanitizeWriter = htmlSanitizeWriterImpl;
- 
--                    if ( index >= 0 && html.lastIndexOf("-->", index) === index) {
--                        if (handler.comment) handler.comment( html.substring( 4, index ) );
--                        html = html.substring( index + 3 );
--                        chars = false;
--                    }
--                    // DOCTYPE
--                } else if ( DOCTYPE_REGEXP.test(html) ) {
--                    match = html.match( DOCTYPE_REGEXP );
-+        nodeContains = window.Node.prototype.contains || /** @this */ function(arg) {
-+            // eslint-disable-next-line no-bitwise
-+            return !!(this.compareDocumentPosition(arg) & 16);
-+        };
- 
--                    if ( match ) {
--                        html = html.replace( match[0] , '');
--                        chars = false;
--                    }
--                    // end tag
--                } else if ( BEGIN_END_TAGE_REGEXP.test(html) ) {
--                    match = html.match( END_TAG_REGEXP );
--
--                    if ( match ) {
--                        html = html.substring( match[0].length );
--                        match[0].replace( END_TAG_REGEXP, parseEndTag );
--                        chars = false;
--                    }
-+        // Regular Expressions for parsing tags and attributes
-+        var SURROGATE_PAIR_REGEXP = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g,
-+            // Match everything outside of normal chars and " (quote character)
-+            NON_ALPHANUMERIC_REGEXP = /([^#-~ |!])/g;
-+
-+
-+        // Good source of info about elements and attributes
-+        // http://dev.w3.org/html5/spec/Overview.html#semantics
-+        // http://simon.html5.org/html-elements
-+
-+        // Safe Void Elements - HTML5
-+        // http://dev.w3.org/html5/spec/Overview.html#void-elements
-+        var voidElements = toMap('area,br,col,hr,img,wbr');
-+
-+        // Elements that you can, intentionally, leave open (and which close themselves)
-+        // http://dev.w3.org/html5/spec/Overview.html#optional-tags
-+        var optionalEndTagBlockElements = toMap('colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr'),
-+            optionalEndTagInlineElements = toMap('rp,rt'),
-+            optionalEndTagElements = extend({},
-+                optionalEndTagInlineElements,
-+                optionalEndTagBlockElements);
-+
-+        // Safe Block Elements - HTML5
-+        var blockElements = extend({}, optionalEndTagBlockElements, toMap('address,article,' +
-+            'aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,' +
-+            'h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,section,table,ul'));
-+
-+        // Inline Elements - HTML5
-+        var inlineElements = extend({}, optionalEndTagInlineElements, toMap('a,abbr,acronym,b,' +
-+            'bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,' +
-+            'samp,small,span,strike,strong,sub,sup,time,tt,u,var'));
-+
-+        // SVG Elements
-+        // https://wiki.whatwg.org/wiki/Sanitization_rules#svg_Elements
-+        // Note: the elements animate,animateColor,animateMotion,animateTransform,set are intentionally omitted.
-+        // They can potentially allow for arbitrary javascript to be executed. See #11290
-+        var svgElements = toMap('circle,defs,desc,ellipse,font-face,font-face-name,font-face-src,g,glyph,' +
-+            'hkern,image,linearGradient,line,marker,metadata,missing-glyph,mpath,path,polygon,polyline,' +
-+            'radialGradient,rect,stop,svg,switch,text,title,tspan');
-+
-+        // Blocked Elements (will be stripped)
-+        var blockedElements = toMap('script,style');
-+
-+        var validElements = extend({},
-+            voidElements,
-+            blockElements,
-+            inlineElements,
-+            optionalEndTagElements);
-+
-+        //Attributes that have href and hence need to be sanitized
-+        var uriAttrs = toMap('background,cite,href,longdesc,src,xlink:href,xml:base');
-+
-+        var htmlAttrs = toMap('abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,' +
-+            'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,' +
-+            'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,' +
-+            'scope,scrolling,shape,size,span,start,summary,tabindex,target,title,type,' +
-+            'valign,value,vspace,width');
-+
-+        // SVG attributes (without "id" and "name" attributes)
-+        // https://wiki.whatwg.org/wiki/Sanitization_rules#svg_Attributes
-+        var svgAttrs = toMap('accent-height,accumulate,additive,alphabetic,arabic-form,ascent,' +
-+            'baseProfile,bbox,begin,by,calcMode,cap-height,class,color,color-rendering,content,' +
-+            'cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,font-size,font-stretch,' +
-+            'font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,gradientUnits,hanging,' +
-+            'height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,keySplines,keyTimes,lang,' +
-+            'marker-end,marker-mid,marker-start,markerHeight,markerUnits,markerWidth,mathematical,' +
-+            'max,min,offset,opacity,orient,origin,overline-position,overline-thickness,panose-1,' +
-+            'path,pathLength,points,preserveAspectRatio,r,refX,refY,repeatCount,repeatDur,' +
-+            'requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,stemv,stop-color,' +
-+            'stop-opacity,strikethrough-position,strikethrough-thickness,stroke,stroke-dasharray,' +
-+            'stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,stroke-opacity,' +
-+            'stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,underline-position,' +
-+            'underline-thickness,unicode,unicode-range,units-per-em,values,version,viewBox,visibility,' +
-+            'width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,xlink:show,xlink:title,' +
-+            'xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,zoomAndPan', true);
-+
-+        var validAttrs = extend({},
-+            uriAttrs,
-+            svgAttrs,
-+            htmlAttrs);
-+
-+        function toMap(str, lowercaseKeys) {
-+            var obj = {}, items = str.split(','), i;
-+            for (i = 0; i < items.length; i++) {
-+                obj[lowercaseKeys ? lowercase(items[i]) : items[i]] = true;
-+            }
-+            return obj;
-+        }
- 
--                    // start tag
--                } else if ( BEGIN_TAG_REGEXP.test(html) ) {
--                    match = html.match( START_TAG_REGEXP );
-+        /**
-+         * Create an inert document that contains the dirty HTML that needs sanitizing
-+         * Depending upon browser support we use one of three strategies for doing this.
-+         * Support: Safari 10.x -> XHR strategy
-+         * Support: Firefox -> DomParser strategy
-+         */
-+        var getInertBodyElement /* function(html: string): HTMLBodyElement */ = (function(window, document) {
-+            var inertDocument;
-+            if (document && document.implementation) {
-+                inertDocument = document.implementation.createHTMLDocument('inert');
-+            } else {
-+                throw $sanitizeMinErr('noinert', 'Can\'t create an inert html document');
-+            }
-+            var inertBodyElement = (inertDocument.documentElement || inertDocument.getDocumentElement()).querySelector('body');
- 
--                    if ( match ) {
--                        html = html.substring( match[0].length );
--                        match[0].replace( START_TAG_REGEXP, parseStartTag );
--                        chars = false;
--                    }
-+            // Check for the Safari 10.1 bug - which allows JS to run inside the SVG G element
-+            inertBodyElement.innerHTML = '<svg><g onload="this.parentNode.remove()"></g></svg>';
-+            if (!inertBodyElement.querySelector('svg')) {
-+                return getInertBodyElement_XHR;
-+            } else {
-+                // Check for the Firefox bug - which prevents the inner img JS from being sanitized
-+                inertBodyElement.innerHTML = '<svg><p><style><img src="</style><img src=x onerror=alert(1)//">';
-+                if (inertBodyElement.querySelector('svg img')) {
-+                    return getInertBodyElement_DOMParser;
-+                } else {
-+                    return getInertBodyElement_InertDocument;
-                 }
-+            }
- 
--                if ( chars ) {
--                    index = html.indexOf("<");
--
--                    var text = index < 0 ? html : html.substring( 0, index );
--                    html = index < 0 ? "" : html.substring( index );
--
--                    if (handler.chars) handler.chars( decodeEntities(text) );
-+            function getInertBodyElement_XHR(html) {
-+                // We add this dummy element to ensure that the rest of the content is parsed as expected
-+                // e.g. leading whitespace is maintained and tags like `<meta>` do not get hoisted to the `<head>` tag.
-+                html = '<remove></remove>' + html;
-+                try {
-+                    html = encodeURI(html);
-+                } catch (e) {
-+                    return undefined;
-                 }
-+                var xhr = new window.XMLHttpRequest();
-+                xhr.responseType = 'document';
-+                xhr.open('GET', 'data:text/html;charset=utf-8,' + html, false);
-+                xhr.send(null);
-+                var body = xhr.response.body;
-+                body.firstChild.remove();
-+                return body;
-+            }
- 
--            } else {
--                html = html.replace(new RegExp("(.*)<\\s*\\/\\s*" + stack.last() + "[^>]*>", 'i'),
--                    function(all, text){
--                        text = text.replace(COMMENT_REGEXP, "$1").replace(CDATA_REGEXP, "$1");
-+            function getInertBodyElement_DOMParser(html) {
-+                // We add this dummy element to ensure that the rest of the content is parsed as expected
-+                // e.g. leading whitespace is maintained and tags like `<meta>` do not get hoisted to the `<head>` tag.
-+                html = '<remove></remove>' + html;
-+                try {
-+                    var body = new window.DOMParser().parseFromString(html, 'text/html').body;
-+                    body.firstChild.remove();
-+                    return body;
-+                } catch (e) {
-+                    return undefined;
-+                }
-+            }
- 
--                        if (handler.chars) handler.chars( decodeEntities(text) );
-+            function getInertBodyElement_InertDocument(html) {
-+                inertBodyElement.innerHTML = html;
- 
--                        return "";
--                    });
-+                // Support: IE 9-11 only
-+                // strip custom-namespaced attributes on IE<=11
-+                if (document.documentMode) {
-+                    stripCustomNsAttrs(inertBodyElement);
-+                }
- 
--                parseEndTag( "", stack.last() );
-+                return inertBodyElement;
-             }
--
--            if ( html == last ) {
--                throw $sanitizeMinErr('badparse', "The sanitizer was unable to parse the following block " +
--                    "of html: {0}", html);
-+        })(window, window.document);
-+
-+        /**
-+         * @example
-+         * htmlParser(htmlString, {
-+         *     start: function(tag, attrs) {},
-+         *     end: function(tag) {},
-+         *     chars: function(text) {},
-+         *     comment: function(text) {}
-+         * });
-+         *
-+         * @param {string} html string
-+         * @param {object} handler
-+         */
-+        function htmlParserImpl(html, handler) {
-+            if (html === null || html === undefined) {
-+                html = '';
-+            } else if (typeof html !== 'string') {
-+                html = '' + html;
-             }
--            last = html;
--        }
- 
--        // Clean up any remaining tags
--        parseEndTag();
-+            var inertBodyElement = getInertBodyElement(html);
-+            if (!inertBodyElement) return '';
- 
--        function parseStartTag( tag, tagName, rest, unary ) {
--            tagName = angular.lowercase(tagName);
--            if ( blockElements[ tagName ] ) {
--                while ( stack.last() && inlineElements[ stack.last() ] ) {
--                    parseEndTag( "", stack.last() );
-+            //mXSS protection
-+            var mXSSAttempts = 5;
-+            do {
-+                if (mXSSAttempts === 0) {
-+                    throw $sanitizeMinErr('uinput', 'Failed to sanitize html because the input is unstable');
-+                }
-+                mXSSAttempts--;
-+
-+                // trigger mXSS if it is going to happen by reading and writing the innerHTML
-+                html = inertBodyElement.innerHTML;
-+                inertBodyElement = getInertBodyElement(html);
-+            } while (html !== inertBodyElement.innerHTML);
-+
-+            var node = inertBodyElement.firstChild;
-+            while (node) {
-+                switch (node.nodeType) {
-+                    case 1: // ELEMENT_NODE
-+                        handler.start(node.nodeName.toLowerCase(), attrToMap(node.attributes));
-+                        break;
-+                    case 3: // TEXT NODE
-+                        handler.chars(node.textContent);
-+                        break;
-                 }
--            }
- 
--            if ( optionalEndTagElements[ tagName ] && stack.last() == tagName ) {
--                parseEndTag( "", tagName );
-+                var nextNode;
-+                if (!(nextNode = node.firstChild)) {
-+                    if (node.nodeType === 1) {
-+                        handler.end(node.nodeName.toLowerCase());
-+                    }
-+                    nextNode = getNonDescendant('nextSibling', node);
-+                    if (!nextNode) {
-+                        while (nextNode == null) {
-+                            node = getNonDescendant('parentNode', node);
-+                            if (node === inertBodyElement) break;
-+                            nextNode = getNonDescendant('nextSibling', node);
-+                            if (node.nodeType === 1) {
-+                                handler.end(node.nodeName.toLowerCase());
-+                            }
-+                        }
-+                    }
-+                }
-+                node = nextNode;
-             }
- 
--            unary = voidElements[ tagName ] || !!unary;
-+            while ((node = inertBodyElement.firstChild)) {
-+                inertBodyElement.removeChild(node);
-+            }
-+        }
- 
--            if ( !unary )
--                stack.push( tagName );
-+        function attrToMap(attrs) {
-+            var map = {};
-+            for (var i = 0, ii = attrs.length; i < ii; i++) {
-+                var attr = attrs[i];
-+                map[attr.name] = attr.value;
-+            }
-+            return map;
-+        }
- 
--            var attrs = {};
- 
--            rest.replace(ATTR_REGEXP,
--                function(match, name, doubleQuotedValue, singleQuotedValue, unquotedValue) {
--                    var value = doubleQuotedValue
--                        || singleQuotedValue
--                        || unquotedValue
--                        || '';
-+        /**
-+         * Escapes all potentially dangerous characters, so that the
-+         * resulting string can be safely inserted into attribute or
-+         * element text.
-+         * @param value
-+         * @returns {string} escaped text
-+         */
-+        function encodeEntities(value) {
-+            return value.
-+            replace(/&/g, '&amp;').
-+            replace(SURROGATE_PAIR_REGEXP, function(value) {
-+                var hi = value.charCodeAt(0);
-+                var low = value.charCodeAt(1);
-+                return '&#' + (((hi - 0xD800) * 0x400) + (low - 0xDC00) + 0x10000) + ';';
-+            }).
-+            replace(NON_ALPHANUMERIC_REGEXP, function(value) {
-+                return '&#' + value.charCodeAt(0) + ';';
-+            }).
-+            replace(/</g, '&lt;').
-+            replace(/>/g, '&gt;');
-+        }
- 
--                    attrs[name] = decodeEntities(value);
--                });
--            if (handler.start) handler.start( tagName, attrs, unary );
-+        /**
-+         * create an HTML/XML writer which writes to buffer
-+         * @param {Array} buf use buf.join('') to get out sanitized html string
-+         * @returns {object} in the form of {
-+         *     start: function(tag, attrs) {},
-+         *     end: function(tag) {},
-+         *     chars: function(text) {},
-+         *     comment: function(text) {}
-+         * }
-+         */
-+        function htmlSanitizeWriterImpl(buf, uriValidator) {
-+            var ignoreCurrentElement = false;
-+            var out = bind(buf, buf.push);
-+            return {
-+                start: function(tag, attrs) {
-+                    tag = lowercase(tag);
-+                    if (!ignoreCurrentElement && blockedElements[tag]) {
-+                        ignoreCurrentElement = tag;
-+                    }
-+                    if (!ignoreCurrentElement && validElements[tag] === true) {
-+                        out('<');
-+                        out(tag);
-+                        forEach(attrs, function(value, key) {
-+                            var lkey = lowercase(key);
-+                            var isImage = (tag === 'img' && lkey === 'src') || (lkey === 'background');
-+                            if (validAttrs[lkey] === true &&
-+                                (uriAttrs[lkey] !== true || uriValidator(value, isImage))) {
-+                                out(' ');
-+                                out(key);
-+                                out('="');
-+                                out(encodeEntities(value));
-+                                out('"');
-+                            }
-+                        });
-+                        out('>');
-+                    }
-+                },
-+                end: function(tag) {
-+                    tag = lowercase(tag);
-+                    if (!ignoreCurrentElement && validElements[tag] === true && voidElements[tag] !== true) {
-+                        out('</');
-+                        out(tag);
-+                        out('>');
-+                    }
-+                    // eslint-disable-next-line eqeqeq
-+                    if (tag == ignoreCurrentElement) {
-+                        ignoreCurrentElement = false;
-+                    }
-+                },
-+                chars: function(chars) {
-+                    if (!ignoreCurrentElement) {
-+                        out(encodeEntities(chars));
-+                    }
-+                }
-+            };
-         }
- 
--        function parseEndTag( tag, tagName ) {
--            var pos = 0, i;
--            tagName = angular.lowercase(tagName);
--            if ( tagName )
--            // Find the closest opened tag of the same type
--                for ( pos = stack.length - 1; pos >= 0; pos-- )
--                    if ( stack[ pos ] == tagName )
--                        break;
- 
--            if ( pos >= 0 ) {
--                // Close all the open elements, up the stack
--                for ( i = stack.length - 1; i >= pos; i-- )
--                    if (handler.end) handler.end( stack[ i ] );
-+        /**
-+         * When IE9-11 comes across an unknown namespaced attribute e.g. 'xlink:foo' it adds 'xmlns:ns1' attribute to declare
-+         * ns1 namespace and prefixes the attribute with 'ns1' (e.g. 'ns1:xlink:foo'). This is undesirable since we don't want
-+         * to allow any of these custom attributes. This method strips them all.
-+         *
-+         * @param node Root element to process
-+         */
-+        function stripCustomNsAttrs(node) {
-+            while (node) {
-+                if (node.nodeType === window.Node.ELEMENT_NODE) {
-+                    var attrs = node.attributes;
-+                    for (var i = 0, l = attrs.length; i < l; i++) {
-+                        var attrNode = attrs[i];
-+                        var attrName = attrNode.name.toLowerCase();
-+                        if (attrName === 'xmlns:ns1' || attrName.lastIndexOf('ns1:', 0) === 0) {
-+                            node.removeAttributeNode(attrNode);
-+                            i--;
-+                            l--;
-+                        }
-+                    }
-+                }
- 
--                // Remove the open elements from the stack
--                stack.length = pos;
-+                var nextNode = node.firstChild;
-+                if (nextNode) {
-+                    stripCustomNsAttrs(nextNode);
-+                }
-+
-+                node = getNonDescendant('nextSibling', node);
-             }
-         }
--    }
- 
--    var hiddenPre=document.createElement("pre");
--    var spaceRe = /^(\s*)([\s\S]*?)(\s*)$/;
--    /**
--     * decodes all entities into regular string
--     * @param value
--     * @returns {string} A string with decoded entities.
--     */
--    function decodeEntities(value) {
--        if (!value) { return ''; }
--
--        // Note: IE8 does not preserve spaces at the start/end of innerHTML
--        // so we must capture them and reattach them afterward
--        var parts = spaceRe.exec(value);
--        var spaceBefore = parts[1];
--        var spaceAfter = parts[3];
--        var content = parts[2];
--        if (content) {
--            hiddenPre.innerHTML=content.replace(/</g,"&lt;");
--            // innerText depends on styling as it doesn't display hidden elements.
--            // Therefore, it's better to use textContent not to cause unnecessary
--            // reflows. However, IE<9 don't support textContent so the innerText
--            // fallback is necessary.
--            content = 'textContent' in hiddenPre ?
--                hiddenPre.textContent : hiddenPre.innerText;
-+        function getNonDescendant(propName, node) {
-+            // An element is clobbered if its `propName` property points to one of its descendants
-+            var nextNode = node[propName];
-+            if (nextNode && nodeContains.call(node, nextNode)) {
-+                throw $sanitizeMinErr('elclob', 'Failed to sanitize html because the element is clobbered: {0}', node.outerHTML || node.outerText);
-+            }
-+            return nextNode;
-         }
--        return spaceBefore + content + spaceAfter;
--    }
--
--    /**
--     * Escapes all potentially dangerous characters, so that the
--     * resulting string can be safely inserted into attribute or
--     * element text.
--     * @param value
--     * @returns {string} escaped text
--     */
--    function encodeEntities(value) {
--        return value.
--        replace(/&/g, '&amp;').
--        replace(NON_ALPHANUMERIC_REGEXP, function(value){
--            return '&#' + value.charCodeAt(0) + ';';
--        }).
--        replace(/</g, '&lt;').
--        replace(/>/g, '&gt;');
-     }
- 
--    /**
--     * create an HTML/XML writer which writes to buffer
--     * @param {Array} buf use buf.jain('') to get out sanitized html string
--     * @returns {object} in the form of {
-- *     start: function(tag, attrs, unary) {},
-- *     end: function(tag) {},
-- *     chars: function(text) {},
-- *     comment: function(text) {}
-- * }
--     */
--    function htmlSanitizeWriter(buf, uriValidator){
--        var ignore = false;
--        var out = angular.bind(buf, buf.push);
--        return {
--            start: function(tag, attrs, unary){
--                tag = angular.lowercase(tag);
--                if (!ignore && specialElements[tag]) {
--                    ignore = tag;
--                }
--                if (!ignore && validElements[tag] === true) {
--                    out('<');
--                    out(tag);
--                    angular.forEach(attrs, function(value, key){
--                        var lkey=angular.lowercase(key);
--                        var isImage = (tag === 'img' && lkey === 'src') || (lkey === 'background');
--                        if (validAttrs[lkey] === true &&
--                            (uriAttrs[lkey] !== true || uriValidator(value, isImage))) {
--                            out(' ');
--                            out(key);
--                            out('="');
--                            out(encodeEntities(value));
--                            out('"');
--                        }
--                    });
--                    out(unary ? '/>' : '>');
--                }
--            },
--            end: function(tag){
--                tag = angular.lowercase(tag);
--                if (!ignore && validElements[tag] === true) {
--                    out('</');
--                    out(tag);
--                    out('>');
--                }
--                if (tag == ignore) {
--                    ignore = false;
--                }
--            },
--            chars: function(chars){
--                if (!ignore) {
--                    out(encodeEntities(chars));
--                }
--            }
--        };
-+    function sanitizeText(chars) {
-+        var buf = [];
-+        var writer = htmlSanitizeWriter(buf, noop);
-+        writer.chars(chars);
-+        return buf.join('');
-     }
- 
- 
- // define ngSanitize module and register $sanitize service
--    angular.module('ngSanitize', []).provider('$sanitize', $SanitizeProvider);
--
--    /* global sanitizeText: false */
-+    angular.module('ngSanitize', [])
-+        .provider('$sanitize', $SanitizeProvider)
-+        .info({ angularVersion: '1.6.9' });
- 
-     /**
-      * @ngdoc filter
-      * @name linky
--     * @function
-+     * @kind function
-      *
-      * @description
--     * Finds links in text input and turns them into html links. Supports http/https/ftp/mailto and
-+     * Finds links in text input and turns them into html links. Supports `http/https/ftp/sftp/mailto` and
-      * plain email address links.
-      *
-      * Requires the {@link ngSanitize `ngSanitize`} module to be installed.
-      *
-      * @param {string} text Input text.
--     * @param {string} target Window (_blank|_self|_parent|_top) or named frame to open links in.
--     * @returns {string} Html-linkified text.
-+     * @param {string} [target] Window (`_blank|_self|_parent|_top`) or named frame to open links in.
-+     * @param {object|function(url)} [attributes] Add custom attributes to the link element.
-+     *
-+     *    Can be one of:
-+     *
-+     *    - `object`: A map of attributes
-+     *    - `function`: Takes the url as a parameter and returns a map of attributes
-+     *
-+     *    If the map of attributes contains a value for `target`, it overrides the value of
-+     *    the target parameter.
-+     *
-+     *
-+     * @returns {string} Html-linkified and {@link $sanitize sanitized} text.
-      *
-      * @usage
-      <span ng-bind-html="linky_expression | linky"></span>
-      *
-      * @example
--     <example module="ngSanitize" deps="angular-sanitize.js">
-+     <example module="linkyExample" deps="angular-sanitize.js" name="linky-filter">
-      <file name="index.html">
--     <script>
--     function Ctrl($scope) {
--           $scope.snippet =
--             'Pretty text with some links:\n'+
--             'http://angularjs.org/,\n'+
--             'mailto:us@somewhere.org,\n'+
--             'another@somewhere.org,\n'+
--             'and one more: ftp://127.0.0.1/.';
--           $scope.snippetWithTarget = 'http://angularjs.org/';
--         }
--     </script>
--     <div ng-controller="Ctrl">
-+     <div ng-controller="ExampleController">
-      Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
-      <table>
-      <tr>
--     <td>Filter</td>
--     <td>Source</td>
--     <td>Rendered</td>
-+     <th>Filter</th>
-+     <th>Source</th>
-+     <th>Rendered</th>
-      </tr>
-      <tr id="linky-filter">
-      <td>linky filter</td>
-@@ -522,10 +653,19 @@
-      <tr id="linky-target">
-      <td>linky target</td>
-      <td>
--     <pre>&lt;div ng-bind-html="snippetWithTarget | linky:'_blank'"&gt;<br>&lt;/div&gt;</pre>
-+     <pre>&lt;div ng-bind-html="snippetWithSingleURL | linky:'_blank'"&gt;<br>&lt;/div&gt;</pre>
-      </td>
-      <td>
--     <div ng-bind-html="snippetWithTarget | linky:'_blank'"></div>
-+     <div ng-bind-html="snippetWithSingleURL | linky:'_blank'"></div>
-+     </td>
-+     </tr>
-+     <tr id="linky-custom-attributes">
-+     <td>linky custom attributes</td>
-+     <td>
-+     <pre>&lt;div ng-bind-html="snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}"&gt;<br>&lt;/div&gt;</pre>
-+     </td>
-+     <td>
-+     <div ng-bind-html="snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}"></div>
-      </td>
-      </tr>
-      <tr id="escaped-html">
-@@ -535,6 +675,18 @@
-      </tr>
-      </table>
-      </file>
-+     <file name="script.js">
-+     angular.module('linkyExample', ['ngSanitize'])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+           $scope.snippet =
-+             'Pretty text with some links:\n' +
-+             'http://angularjs.org/,\n' +
-+             'mailto:us@somewhere.org,\n' +
-+             'another@somewhere.org,\n' +
-+             'and one more: ftp://127.0.0.1/.';
-+           $scope.snippetWithSingleURL = 'http://angularjs.org/';
-+         }]);
-+     </file>
-      <file name="protractor.js" type="protractor">
-      it('should linkify the snippet with urls', function() {
-          expect(element(by.id('linky-filter')).element(by.binding('snippet | linky')).getText()).
-@@ -542,12 +694,14 @@
-                   'another@somewhere.org, and one more: ftp://127.0.0.1/.');
-          expect(element.all(by.css('#linky-filter a')).count()).toEqual(4);
-        });
-+
-      it('should not linkify snippet without the linky filter', function() {
-          expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText()).
-              toBe('Pretty text with some links: http://angularjs.org/, mailto:us@somewhere.org, ' +
-                   'another@somewhere.org, and one more: ftp://127.0.0.1/.');
-          expect(element.all(by.css('#escaped-html a')).count()).toEqual(0);
-        });
-+
-      it('should update', function() {
-          element(by.model('snippet')).clear();
-          element(by.model('snippet')).sendKeys('new http://link.');
-@@ -557,22 +711,43 @@
-          expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText())
-              .toBe('new http://link.');
-        });
-+
-      it('should work with the target property', function() {
-         expect(element(by.id('linky-target')).
--            element(by.binding("snippetWithTarget | linky:'_blank'")).getText()).
-+            element(by.binding("snippetWithSingleURL | linky:'_blank'")).getText()).
-             toBe('http://angularjs.org/');
-         expect(element(by.css('#linky-target a')).getAttribute('target')).toEqual('_blank');
-        });
-+
-+     it('should optionally add custom attributes', function() {
-+        expect(element(by.id('linky-custom-attributes')).
-+            element(by.binding("snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}")).getText()).
-+            toBe('http://angularjs.org/');
-+        expect(element(by.css('#linky-custom-attributes a')).getAttribute('rel')).toEqual('nofollow');
-+       });
-      </file>
-      </example>
-      */
-     angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) {
-         var LINKY_URL_REGEXP =
--                /((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>]/,
--            MAILTO_REGEXP = /^mailto:/;
-+                /((s?ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,
-+            MAILTO_REGEXP = /^mailto:/i;
-+
-+        var linkyMinErr = angular.$$minErr('linky');
-+        var isDefined = angular.isDefined;
-+        var isFunction = angular.isFunction;
-+        var isObject = angular.isObject;
-+        var isString = angular.isString;
-+
-+        return function(text, target, attributes) {
-+            if (text == null || text === '') return text;
-+            if (!isString(text)) throw linkyMinErr('notstring', 'Expected string but received: {0}', text);
-+
-+            var attributesFn =
-+                isFunction(attributes) ? attributes :
-+                    isObject(attributes) ? function getAttributesObject() {return attributes;} :
-+                        function getEmptyAttributesObject() {return {};};
- 
--        return function(text, target) {
--            if (!text) return text;
-             var match;
-             var raw = text;
-             var html = [];
-@@ -581,8 +756,10 @@
-             while ((match = raw.match(LINKY_URL_REGEXP))) {
-                 // We can not end in these as they are sometimes found at the end of the sentence
-                 url = match[0];
--                // if we did not match ftp/http/mailto then assume mailto
--                if (match[2] == match[3]) url = 'mailto:' + url;
-+                // if we did not match ftp/http/www/mailto then assume mailto
-+                if (!match[2] && !match[4]) {
-+                    url = (match[3] ? 'http://' : 'mailto:') + url;
-+                }
-                 i = match.index;
-                 addText(raw.substr(0, i));
-                 addLink(url, match[0].replace(MAILTO_REGEXP, ''));
-@@ -599,15 +776,21 @@
-             }
- 
-             function addLink(url, text) {
-+                var key, linkAttributes = attributesFn(url);
-                 html.push('<a ');
--                if (angular.isDefined(target)) {
--                    html.push('target="');
--                    html.push(target);
--                    html.push('" ');
-+
-+                for (key in linkAttributes) {
-+                    html.push(key + '="' + linkAttributes[key] + '" ');
-+                }
-+
-+                if (isDefined(target) && !('target' in linkAttributes)) {
-+                    html.push('target="',
-+                        target,
-+                        '" ');
-                 }
--                html.push('href="');
--                html.push(url);
--                html.push('">');
-+                html.push('href="',
-+                    url.replace(/"/g, '&quot;'),
-+                    '">');
-                 addText(text);
-                 html.push('</a>');
-             }
-diff --git a/setup/pub/angular-sanitize/angular-sanitize.min.js b/setup/pub/angular-sanitize/angular-sanitize.min.js
-index 4fc586065be..991dd00987a 100644
---- a/setup/pub/angular-sanitize/angular-sanitize.min.js
-+++ b/setup/pub/angular-sanitize/angular-sanitize.min.js
-@@ -1,14 +1,17 @@
- /*
-- AngularJS v1.2.14
-- (c) 2010-2014 Google, Inc. http://angularjs.org
-+ AngularJS v1.6.9
-+ (c) 2010-2018 Google, Inc. http://angularjs.org
-  License: MIT
-- */
--(function(p,h,q){'use strict';function E(a){var e=[];s(e,h.noop).chars(a);return e.join("")}function k(a){var e={};a=a.split(",");var d;for(d=0;d<a.length;d++)e[a[d]]=!0;return e}function F(a,e){function d(a,b,d,g){b=h.lowercase(b);if(t[b])for(;f.last()&&u[f.last()];)c("",f.last());v[b]&&f.last()==b&&c("",b);(g=w[b]||!!g)||f.push(b);var l={};d.replace(G,function(a,b,e,c,d){l[b]=r(e||c||d||"")});e.start&&e.start(b,l,g)}function c(a,b){var c=0,d;if(b=h.lowercase(b))for(c=f.length-1;0<=c&&f[c]!=b;c--);
--    if(0<=c){for(d=f.length-1;d>=c;d--)e.end&&e.end(f[d]);f.length=c}}var b,g,f=[],l=a;for(f.last=function(){return f[f.length-1]};a;){g=!0;if(f.last()&&x[f.last()])a=a.replace(RegExp("(.*)<\\s*\\/\\s*"+f.last()+"[^>]*>","i"),function(b,a){a=a.replace(H,"$1").replace(I,"$1");e.chars&&e.chars(r(a));return""}),c("",f.last());else{if(0===a.indexOf("\x3c!--"))b=a.indexOf("--",4),0<=b&&a.lastIndexOf("--\x3e",b)===b&&(e.comment&&e.comment(a.substring(4,b)),a=a.substring(b+3),g=!1);else if(y.test(a)){if(b=a.match(y))a=
--    a.replace(b[0],""),g=!1}else if(J.test(a)){if(b=a.match(z))a=a.substring(b[0].length),b[0].replace(z,c),g=!1}else K.test(a)&&(b=a.match(A))&&(a=a.substring(b[0].length),b[0].replace(A,d),g=!1);g&&(b=a.indexOf("<"),g=0>b?a:a.substring(0,b),a=0>b?"":a.substring(b),e.chars&&e.chars(r(g)))}if(a==l)throw L("badparse",a);l=a}c()}function r(a){if(!a)return"";var e=M.exec(a);a=e[1];var d=e[3];if(e=e[2])n.innerHTML=e.replace(/</g,"&lt;"),e="textContent"in n?n.textContent:n.innerText;return a+e+d}function B(a){return a.replace(/&/g,
--    "&amp;").replace(N,function(a){return"&#"+a.charCodeAt(0)+";"}).replace(/</g,"&lt;").replace(/>/g,"&gt;")}function s(a,e){var d=!1,c=h.bind(a,a.push);return{start:function(a,g,f){a=h.lowercase(a);!d&&x[a]&&(d=a);d||!0!==C[a]||(c("<"),c(a),h.forEach(g,function(d,f){var g=h.lowercase(f),k="img"===a&&"src"===g||"background"===g;!0!==O[g]||!0===D[g]&&!e(d,k)||(c(" "),c(f),c('="'),c(B(d)),c('"'))}),c(f?"/>":">"))},end:function(a){a=h.lowercase(a);d||!0!==C[a]||(c("</"),c(a),c(">"));a==d&&(d=!1)},chars:function(a){d||
--c(B(a))}}}var L=h.$$minErr("$sanitize"),A=/^<\s*([\w:-]+)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*>/,z=/^<\s*\/\s*([\w:-]+)[^>]*>/,G=/([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,K=/^</,J=/^<\s*\//,H=/\x3c!--(.*?)--\x3e/g,y=/<!DOCTYPE([^>]*?)>/i,I=/<!\[CDATA\[(.*?)]]\x3e/g,N=/([^\#-~| |!])/g,w=k("area,br,col,hr,img,wbr");p=k("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr");q=k("rp,rt");var v=h.extend({},q,p),t=h.extend({},p,k("address,article,aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul")),
--    u=h.extend({},q,k("a,abbr,acronym,b,bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var")),x=k("script,style"),C=h.extend({},w,t,u,v),D=k("background,cite,href,longdesc,src,usemap"),O=h.extend({},D,k("abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,scope,scrolling,shape,size,span,start,summary,target,title,type,valign,value,vspace,width")),
--    n=document.createElement("pre"),M=/^(\s*)([\s\S]*?)(\s*)$/;h.module("ngSanitize",[]).provider("$sanitize",function(){this.$get=["$$sanitizeUri",function(a){return function(e){var d=[];F(e,s(d,function(c,b){return!/^unsafe/.test(a(c,b))}));return d.join("")}}]});h.module("ngSanitize").filter("linky",["$sanitize",function(a){var e=/((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>]/,d=/^mailto:/;return function(c,b){function g(a){a&&m.push(E(a))}function f(a,c){m.push("<a ");h.isDefined(b)&&
--(m.push('target="'),m.push(b),m.push('" '));m.push('href="');m.push(a);m.push('">');g(c);m.push("</a>")}if(!c)return c;for(var l,k=c,m=[],n,p;l=k.match(e);)n=l[0],l[2]==l[3]&&(n="mailto:"+n),p=l.index,g(k.substr(0,p)),f(n,l[0].replace(d,"")),k=k.substring(p+l[0].length);g(k);return a(m.join(""))}}])})(window,window.angular);
-+*/
-+(function(s,d){'use strict';function J(d){var k=[];w(k,B).chars(d);return k.join("")}var x=d.$$minErr("$sanitize"),C,k,D,E,p,B,F,G,w;d.module("ngSanitize",[]).provider("$sanitize",function(){function g(a,e){var c={},b=a.split(","),f;for(f=0;f<b.length;f++)c[e?p(b[f]):b[f]]=!0;return c}function K(a){for(var e={},c=0,b=a.length;c<b;c++){var f=a[c];e[f.name]=f.value}return e}function H(a){return a.replace(/&/g,"&amp;").replace(L,function(a){var c=a.charCodeAt(0);a=a.charCodeAt(1);return"&#"+(1024*(c-
-+    55296)+(a-56320)+65536)+";"}).replace(M,function(a){return"&#"+a.charCodeAt(0)+";"}).replace(/</g,"&lt;").replace(/>/g,"&gt;")}function I(a){for(;a;){if(a.nodeType===s.Node.ELEMENT_NODE)for(var e=a.attributes,c=0,b=e.length;c<b;c++){var f=e[c],h=f.name.toLowerCase();if("xmlns:ns1"===h||0===h.lastIndexOf("ns1:",0))a.removeAttributeNode(f),c--,b--}(e=a.firstChild)&&I(e);a=t("nextSibling",a)}}function t(a,e){var c=e[a];if(c&&F.call(e,c))throw x("elclob",e.outerHTML||e.outerText);return c}var y=!1;this.$get=
-+    ["$$sanitizeUri",function(a){y&&k(n,z);return function(e){var c=[];G(e,w(c,function(b,c){return!/^unsafe:/.test(a(b,c))}));return c.join("")}}];this.enableSvg=function(a){return E(a)?(y=a,this):y};C=d.bind;k=d.extend;D=d.forEach;E=d.isDefined;p=d.lowercase;B=d.noop;G=function(a,e){null===a||void 0===a?a="":"string"!==typeof a&&(a=""+a);var c=u(a);if(!c)return"";var b=5;do{if(0===b)throw x("uinput");b--;a=c.innerHTML;c=u(a)}while(a!==c.innerHTML);for(b=c.firstChild;b;){switch(b.nodeType){case 1:e.start(b.nodeName.toLowerCase(),
-+    K(b.attributes));break;case 3:e.chars(b.textContent)}var f;if(!(f=b.firstChild)&&(1===b.nodeType&&e.end(b.nodeName.toLowerCase()),f=t("nextSibling",b),!f))for(;null==f;){b=t("parentNode",b);if(b===c)break;f=t("nextSibling",b);1===b.nodeType&&e.end(b.nodeName.toLowerCase())}b=f}for(;b=c.firstChild;)c.removeChild(b)};w=function(a,e){var c=!1,b=C(a,a.push);return{start:function(a,h){a=p(a);!c&&A[a]&&(c=a);c||!0!==n[a]||(b("<"),b(a),D(h,function(c,h){var d=p(h),g="img"===a&&"src"===d||"background"===
-+        d;!0!==v[d]||!0===m[d]&&!e(c,g)||(b(" "),b(h),b('="'),b(H(c)),b('"'))}),b(">"))},end:function(a){a=p(a);c||!0!==n[a]||!0===h[a]||(b("</"),b(a),b(">"));a==c&&(c=!1)},chars:function(a){c||b(H(a))}}};F=s.Node.prototype.contains||function(a){return!!(this.compareDocumentPosition(a)&16)};var L=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,M=/([^#-~ |!])/g,h=g("area,br,col,hr,img,wbr"),q=g("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr"),l=g("rp,rt"),r=k({},l,q),q=k({},q,g("address,article,aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,section,table,ul")),
-+    l=k({},l,g("a,abbr,acronym,b,bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var")),z=g("circle,defs,desc,ellipse,font-face,font-face-name,font-face-src,g,glyph,hkern,image,linearGradient,line,marker,metadata,missing-glyph,mpath,path,polygon,polyline,radialGradient,rect,stop,svg,switch,text,title,tspan"),A=g("script,style"),n=k({},h,q,l,r),m=g("background,cite,href,longdesc,src,xlink:href,xml:base"),r=g("abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,scope,scrolling,shape,size,span,start,summary,tabindex,target,title,type,valign,value,vspace,width"),
-+    l=g("accent-height,accumulate,additive,alphabetic,arabic-form,ascent,baseProfile,bbox,begin,by,calcMode,cap-height,class,color,color-rendering,content,cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,font-size,font-stretch,font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,gradientUnits,hanging,height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,keySplines,keyTimes,lang,marker-end,marker-mid,marker-start,markerHeight,markerUnits,markerWidth,mathematical,max,min,offset,opacity,orient,origin,overline-position,overline-thickness,panose-1,path,pathLength,points,preserveAspectRatio,r,refX,refY,repeatCount,repeatDur,requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,stemv,stop-color,stop-opacity,strikethrough-position,strikethrough-thickness,stroke,stroke-dasharray,stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,stroke-opacity,stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,underline-position,underline-thickness,unicode,unicode-range,units-per-em,values,version,viewBox,visibility,width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,xlink:show,xlink:title,xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,zoomAndPan",
-+        !0),v=k({},m,l,r),u=function(a,e){function c(b){b="<remove></remove>"+b;try{var c=(new a.DOMParser).parseFromString(b,"text/html").body;c.firstChild.remove();return c}catch(e){}}function b(a){d.innerHTML=a;e.documentMode&&I(d);return d}var h;if(e&&e.implementation)h=e.implementation.createHTMLDocument("inert");else throw x("noinert");var d=(h.documentElement||h.getDocumentElement()).querySelector("body");d.innerHTML='<svg><g onload="this.parentNode.remove()"></g></svg>';return d.querySelector("svg")?
-+        (d.innerHTML='<svg><p><style><img src="</style><img src=x onerror=alert(1)//">',d.querySelector("svg img")?c:b):function(b){b="<remove></remove>"+b;try{b=encodeURI(b)}catch(c){return}var e=new a.XMLHttpRequest;e.responseType="document";e.open("GET","data:text/html;charset=utf-8,"+b,!1);e.send(null);b=e.response.body;b.firstChild.remove();return b}}(s,s.document)}).info({angularVersion:"1.6.9"});d.module("ngSanitize").filter("linky",["$sanitize",function(g){var k=/((s?ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,
-+    p=/^mailto:/i,s=d.$$minErr("linky"),t=d.isDefined,y=d.isFunction,w=d.isObject,x=d.isString;return function(d,q,l){function r(a){a&&m.push(J(a))}function z(a,d){var c,b=A(a);m.push("<a ");for(c in b)m.push(c+'="'+b[c]+'" ');!t(q)||"target"in b||m.push('target="',q,'" ');m.push('href="',a.replace(/"/g,"&quot;"),'">');r(d);m.push("</a>")}if(null==d||""===d)return d;if(!x(d))throw s("notstring",d);for(var A=y(l)?l:w(l)?function(){return l}:function(){return{}},n=d,m=[],v,u;d=n.match(k);)v=d[0],d[2]||
-+d[4]||(v=(d[3]?"http://":"mailto:")+v),u=d.index,r(n.substr(0,u)),z(v,d[0].replace(p,"")),n=n.substring(u+d[0].length);r(n);return g(m.join(""))}}])})(window,window.angular);
- //# sourceMappingURL=angular-sanitize.min.js.map
-\ No newline at end of file
-diff --git a/setup/pub/angular-sanitize/angular-sanitize.min.js.map b/setup/pub/angular-sanitize/angular-sanitize.min.js.map
-index 0310ddce9c9..8ce8290b2b3 100644
---- a/setup/pub/angular-sanitize/angular-sanitize.min.js.map
-+++ b/setup/pub/angular-sanitize/angular-sanitize.min.js.map
-@@ -1,8 +1,8 @@
- {
--"version":3,
--"file":"angular-sanitize.min.js",
--"lineCount":13,
--"mappings":"A;;;;;aAKC,SAAQ,CAACA,CAAD,CAASC,CAAT,CAAkBC,CAAlB,CAA6B,CAiJtCC,QAASA,EAAY,CAACC,CAAD,CAAQ,CAC3B,IAAIC,EAAM,EACGC,EAAAC,CAAmBF,CAAnBE,CAAwBN,CAAAO,KAAxBD,CACbH,MAAA,CAAaA,CAAb,CACA,OAAOC,EAAAI,KAAA,CAAS,EAAT,CAJoB,CAmE7BC,QAASA,EAAO,CAACC,CAAD,CAAM,CAAA,IAChBC,EAAM,EAAIC,EAAAA,CAAQF,CAAAG,MAAA,CAAU,GAAV,CAAtB,KAAsCC,CACtC,KAAKA,CAAL,CAAS,CAAT,CAAYA,CAAZ,CAAgBF,CAAAG,OAAhB,CAA8BD,CAAA,EAA9B,CAAmCH,CAAA,CAAIC,CAAA,CAAME,CAAN,CAAJ,CAAA,CAAgB,CAAA,CACnD,OAAOH,EAHa,CAmBtBK,QAASA,EAAU,CAAEC,CAAF,CAAQC,CAAR,CAAkB,CAiFnCC,QAASA,EAAa,CAAEC,CAAF,CAAOC,CAAP,CAAgBC,CAAhB,CAAsBC,CAAtB,CAA8B,CAClDF,CAAA,CAAUrB,CAAAwB,UAAA,CAAkBH,CAAlB,CACV,IAAKI,CAAA,CAAeJ,CAAf,CAAL,CACE,IAAA,CAAQK,CAAAC,KAAA,EAAR,EAAwBC,CAAA,CAAgBF,CAAAC,KAAA,EAAhB,CAAxB,CAAA,CACEE,CAAA,CAAa,EAAb,CAAiBH,CAAAC,KAAA,EAAjB,CAICG,EAAA,CAAwBT,CAAxB,CAAL,EAA0CK,CAAAC,KAAA,EAA1C,EAA0DN,CAA1D,EACEQ,CAAA,CAAa,EAAb,CAAiBR,CAAjB,CAKF,EAFAE,CAEA,CAFQQ,CAAA,CAAcV,CAAd,CAER,EAFmC,CAAC,CAACE,CAErC,GACEG,CAAAM,KAAA,CAAYX,CAAZ,CAEF,KAAIY,EAAQ,EAEZX,EAAAY,QAAA,CAAaC,CAAb,CACE,QAAQ,CAACC,CAAD,CAAQC,CAAR,CAAcC,CAAd,CAAiCC,CAAjC,CAAoDC,CAApD,CAAmE,CAMzEP,CAAA,CAAMI,CAAN,CAAA,CAAcI,CAAA,CALFH,CAKE,EAJTC,CAIS,EAHTC,CAGS,EAFT,EAES,CAN2D,CAD7E,CASItB,EAAAwB,MAAJ,EAAmBxB,CAAAwB,MAAA,CAAerB,CAAf,CAAwBY,CAAxB,CAA+BV,CAA/B,CA5B+B,CA+BpDM,QAASA,EAAW,CAAET,CAAF,CAAOC,CAAP,CAAiB,CAAA,IAC/BsB,EAAM,CADyB,CACtB7B,CAEb,IADAO,CACA,CADUrB,CAAAwB,UAAA,CAAkBH,CAAlB,CACV,CAEE,IAAMsB,CAAN,CAAYjB,CAAAX,OAAZ,CAA2B,CAA3B,CAAqC,CAArC,EAA8B4B,CAA9B,EACOjB,CAAA,CAAOiB,CAAP,CADP,EACuBtB,CADvB,CAAwCsB,CAAA,EAAxC;AAIF,GAAY,CAAZ,EAAKA,CAAL,CAAgB,CAEd,IAAM7B,CAAN,CAAUY,CAAAX,OAAV,CAAyB,CAAzB,CAA4BD,CAA5B,EAAiC6B,CAAjC,CAAsC7B,CAAA,EAAtC,CACMI,CAAA0B,IAAJ,EAAiB1B,CAAA0B,IAAA,CAAalB,CAAA,CAAOZ,CAAP,CAAb,CAGnBY,EAAAX,OAAA,CAAe4B,CAND,CATmB,CAhHF,IAC/BE,CAD+B,CACxB1C,CADwB,CACVuB,EAAQ,EADE,CACEC,EAAOV,CAG5C,KAFAS,CAAAC,KAEA,CAFamB,QAAQ,EAAG,CAAE,MAAOpB,EAAA,CAAOA,CAAAX,OAAP,CAAsB,CAAtB,CAAT,CAExB,CAAQE,CAAR,CAAA,CAAe,CACbd,CAAA,CAAQ,CAAA,CAGR,IAAMuB,CAAAC,KAAA,EAAN,EAAuBoB,CAAA,CAAiBrB,CAAAC,KAAA,EAAjB,CAAvB,CAmDEV,CASA,CATOA,CAAAiB,QAAA,CAAiBc,MAAJ,CAAW,kBAAX,CAAgCtB,CAAAC,KAAA,EAAhC,CAA+C,QAA/C,CAAyD,GAAzD,CAAb,CACL,QAAQ,CAACsB,CAAD,CAAMC,CAAN,CAAW,CACjBA,CAAA,CAAOA,CAAAhB,QAAA,CAAaiB,CAAb,CAA6B,IAA7B,CAAAjB,QAAA,CAA2CkB,CAA3C,CAAyD,IAAzD,CAEHlC,EAAAf,MAAJ,EAAmBe,CAAAf,MAAA,CAAesC,CAAA,CAAeS,CAAf,CAAf,CAEnB,OAAO,EALU,CADd,CASP,CAAArB,CAAA,CAAa,EAAb,CAAiBH,CAAAC,KAAA,EAAjB,CA5DF,KAAyD,CAGvD,GAA8B,CAA9B,GAAKV,CAAAoC,QAAA,CAAa,SAAb,CAAL,CAEER,CAEA,CAFQ5B,CAAAoC,QAAA,CAAa,IAAb,CAAmB,CAAnB,CAER,CAAc,CAAd,EAAKR,CAAL,EAAmB5B,CAAAqC,YAAA,CAAiB,QAAjB,CAAwBT,CAAxB,CAAnB,GAAsDA,CAAtD,GACM3B,CAAAqC,QAEJ,EAFqBrC,CAAAqC,QAAA,CAAiBtC,CAAAuC,UAAA,CAAgB,CAAhB,CAAmBX,CAAnB,CAAjB,CAErB,CADA5B,CACA,CADOA,CAAAuC,UAAA,CAAgBX,CAAhB,CAAwB,CAAxB,CACP,CAAA1C,CAAA,CAAQ,CAAA,CAHV,CAJF,KAUO,IAAKsD,CAAAC,KAAA,CAAoBzC,CAApB,CAAL,CAGL,IAFAmB,CAEA,CAFQnB,CAAAmB,MAAA,CAAYqB,CAAZ,CAER,CACExC,CACA;AADOA,CAAAiB,QAAA,CAAcE,CAAA,CAAM,CAAN,CAAd,CAAyB,EAAzB,CACP,CAAAjC,CAAA,CAAQ,CAAA,CAFV,CAHK,IAQA,IAAKwD,CAAAD,KAAA,CAA4BzC,CAA5B,CAAL,CAGL,IAFAmB,CAEA,CAFQnB,CAAAmB,MAAA,CAAYwB,CAAZ,CAER,CACE3C,CAEA,CAFOA,CAAAuC,UAAA,CAAgBpB,CAAA,CAAM,CAAN,CAAArB,OAAhB,CAEP,CADAqB,CAAA,CAAM,CAAN,CAAAF,QAAA,CAAkB0B,CAAlB,CAAkC/B,CAAlC,CACA,CAAA1B,CAAA,CAAQ,CAAA,CAHV,CAHK,IAUK0D,EAAAH,KAAA,CAAsBzC,CAAtB,CAAL,GACLmB,CADK,CACGnB,CAAAmB,MAAA,CAAY0B,CAAZ,CADH,IAIH7C,CAEA,CAFOA,CAAAuC,UAAA,CAAgBpB,CAAA,CAAM,CAAN,CAAArB,OAAhB,CAEP,CADAqB,CAAA,CAAM,CAAN,CAAAF,QAAA,CAAkB4B,CAAlB,CAAoC3C,CAApC,CACA,CAAAhB,CAAA,CAAQ,CAAA,CANL,CAUFA,EAAL,GACE0C,CAKA,CALQ5B,CAAAoC,QAAA,CAAa,GAAb,CAKR,CAHIH,CAGJ,CAHmB,CAAR,CAAAL,CAAA,CAAY5B,CAAZ,CAAmBA,CAAAuC,UAAA,CAAgB,CAAhB,CAAmBX,CAAnB,CAG9B,CAFA5B,CAEA,CAFe,CAAR,CAAA4B,CAAA,CAAY,EAAZ,CAAiB5B,CAAAuC,UAAA,CAAgBX,CAAhB,CAExB,CAAI3B,CAAAf,MAAJ,EAAmBe,CAAAf,MAAA,CAAesC,CAAA,CAAeS,CAAf,CAAf,CANrB,CAzCuD,CA+DzD,GAAKjC,CAAL,EAAaU,CAAb,CACE,KAAMoC,EAAA,CAAgB,UAAhB,CAC4C9C,CAD5C,CAAN,CAGFU,CAAA,CAAOV,CAvEM,CA2EfY,CAAA,EA/EmC,CA2IrCY,QAASA,EAAc,CAACuB,CAAD,CAAQ,CAC7B,GAAI,CAACA,CAAL,CAAc,MAAO,EAIrB,KAAIC,EAAQC,CAAAC,KAAA,CAAaH,CAAb,CACRI,EAAAA,CAAcH,CAAA,CAAM,CAAN,CAClB,KAAII,EAAaJ,CAAA,CAAM,CAAN,CAEjB,IADIK,CACJ,CADcL,CAAA,CAAM,CAAN,CACd,CACEM,CAAAC,UAKA,CALoBF,CAAApC,QAAA,CAAgB,IAAhB,CAAqB,MAArB,CAKpB,CAAAoC,CAAA,CAAU,aAAA,EAAiBC,EAAjB,CACRA,CAAAE,YADQ,CACgBF,CAAAG,UAE5B,OAAON,EAAP,CAAqBE,CAArB,CAA+BD,CAlBF,CA4B/BM,QAASA,EAAc,CAACX,CAAD,CAAQ,CAC7B,MAAOA,EAAA9B,QAAA,CACG,IADH;AACS,OADT,CAAAA,QAAA,CAEG0C,CAFH,CAE4B,QAAQ,CAACZ,CAAD,CAAO,CAC9C,MAAO,IAAP,CAAcA,CAAAa,WAAA,CAAiB,CAAjB,CAAd,CAAoC,GADU,CAF3C,CAAA3C,QAAA,CAKG,IALH,CAKS,MALT,CAAAA,QAAA,CAMG,IANH,CAMS,MANT,CADsB,CAoB/B7B,QAASA,EAAkB,CAACD,CAAD,CAAM0E,CAAN,CAAmB,CAC5C,IAAIC,EAAS,CAAA,CAAb,CACIC,EAAMhF,CAAAiF,KAAA,CAAa7E,CAAb,CAAkBA,CAAA4B,KAAlB,CACV,OAAO,OACEU,QAAQ,CAACtB,CAAD,CAAMa,CAAN,CAAaV,CAAb,CAAmB,CAChCH,CAAA,CAAMpB,CAAAwB,UAAA,CAAkBJ,CAAlB,CACD2D,EAAAA,CAAL,EAAehC,CAAA,CAAgB3B,CAAhB,CAAf,GACE2D,CADF,CACW3D,CADX,CAGK2D,EAAL,EAAsC,CAAA,CAAtC,GAAeG,CAAA,CAAc9D,CAAd,CAAf,GACE4D,CAAA,CAAI,GAAJ,CAcA,CAbAA,CAAA,CAAI5D,CAAJ,CAaA,CAZApB,CAAAmF,QAAA,CAAgBlD,CAAhB,CAAuB,QAAQ,CAAC+B,CAAD,CAAQoB,CAAR,CAAY,CACzC,IAAIC,EAAKrF,CAAAwB,UAAA,CAAkB4D,CAAlB,CAAT,CACIE,EAAmB,KAAnBA,GAAWlE,CAAXkE,EAAqC,KAArCA,GAA4BD,CAA5BC,EAAyD,YAAzDA,GAAgDD,CAC3B,EAAA,CAAzB,GAAIE,CAAA,CAAWF,CAAX,CAAJ,EACsB,CAAA,CADtB,GACGG,CAAA,CAASH,CAAT,CADH,EAC8B,CAAAP,CAAA,CAAad,CAAb,CAAoBsB,CAApB,CAD9B,GAEEN,CAAA,CAAI,GAAJ,CAIA,CAHAA,CAAA,CAAII,CAAJ,CAGA,CAFAJ,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAIL,CAAA,CAAeX,CAAf,CAAJ,CACA,CAAAgB,CAAA,CAAI,GAAJ,CANF,CAHyC,CAA3C,CAYA,CAAAA,CAAA,CAAIzD,CAAA,CAAQ,IAAR,CAAe,GAAnB,CAfF,CALgC,CAD7B,KAwBAqB,QAAQ,CAACxB,CAAD,CAAK,CACdA,CAAA,CAAMpB,CAAAwB,UAAA,CAAkBJ,CAAlB,CACD2D,EAAL,EAAsC,CAAA,CAAtC,GAAeG,CAAA,CAAc9D,CAAd,CAAf,GACE4D,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAI5D,CAAJ,CACA,CAAA4D,CAAA,CAAI,GAAJ,CAHF,CAKI5D,EAAJ,EAAW2D,CAAX,GACEA,CADF,CACW,CAAA,CADX,CAPc,CAxBb,OAmCE5E,QAAQ,CAACA,CAAD,CAAO,CACb4E,CAAL;AACEC,CAAA,CAAIL,CAAA,CAAexE,CAAf,CAAJ,CAFgB,CAnCjB,CAHqC,CAha9C,IAAI4D,EAAkB/D,CAAAyF,SAAA,CAAiB,WAAjB,CAAtB,CAwJI3B,EACG,4FAzJP,CA0JEF,EAAiB,2BA1JnB,CA2JEzB,EAAc,yEA3JhB,CA4JE0B,EAAmB,IA5JrB,CA6JEF,EAAyB,SA7J3B,CA8JER,EAAiB,qBA9JnB,CA+JEM,EAAiB,qBA/JnB,CAgKEL,EAAe,yBAhKjB,CAkKEwB,EAA0B,gBAlK5B,CA2KI7C,EAAetB,CAAA,CAAQ,wBAAR,CAIfiF,EAAAA,CAA8BjF,CAAA,CAAQ,gDAAR,CAC9BkF,EAAAA,CAA+BlF,CAAA,CAAQ,OAAR,CADnC,KAEIqB,EAAyB9B,CAAA4F,OAAA,CAAe,EAAf,CACeD,CADf,CAEeD,CAFf,CAF7B,CAOIjE,EAAgBzB,CAAA4F,OAAA,CAAe,EAAf,CAAmBF,CAAnB,CAAgDjF,CAAA,CAAQ,4KAAR,CAAhD,CAPpB;AAYImB,EAAiB5B,CAAA4F,OAAA,CAAe,EAAf,CAAmBD,CAAnB,CAAiDlF,CAAA,CAAQ,2JAAR,CAAjD,CAZrB,CAkBIsC,EAAkBtC,CAAA,CAAQ,cAAR,CAlBtB,CAoBIyE,EAAgBlF,CAAA4F,OAAA,CAAe,EAAf,CACe7D,CADf,CAEeN,CAFf,CAGeG,CAHf,CAIeE,CAJf,CApBpB,CA2BI0D,EAAW/E,CAAA,CAAQ,0CAAR,CA3Bf,CA4BI8E,EAAavF,CAAA4F,OAAA,CAAe,EAAf,CAAmBJ,CAAnB,CAA6B/E,CAAA,CAC1C,ySAD0C,CAA7B,CA5BjB;AA0LI8D,EAAUsB,QAAAC,cAAA,CAAuB,KAAvB,CA1Ld,CA2LI5B,EAAU,wBAsGdlE,EAAA+F,OAAA,CAAe,YAAf,CAA6B,EAA7B,CAAAC,SAAA,CAA0C,WAA1C,CA7UAC,QAA0B,EAAG,CAC3B,IAAAC,KAAA,CAAY,CAAC,eAAD,CAAkB,QAAQ,CAACC,CAAD,CAAgB,CACpD,MAAO,SAAQ,CAAClF,CAAD,CAAO,CACpB,IAAIb,EAAM,EACVY,EAAA,CAAWC,CAAX,CAAiBZ,CAAA,CAAmBD,CAAnB,CAAwB,QAAQ,CAACgG,CAAD,CAAMd,CAAN,CAAe,CAC9D,MAAO,CAAC,SAAA5B,KAAA,CAAeyC,CAAA,CAAcC,CAAd,CAAmBd,CAAnB,CAAf,CADsD,CAA/C,CAAjB,CAGA,OAAOlF,EAAAI,KAAA,CAAS,EAAT,CALa,CAD8B,CAA1C,CADe,CA6U7B,CAuGAR,EAAA+F,OAAA,CAAe,YAAf,CAAAM,OAAA,CAAoC,OAApC,CAA6C,CAAC,WAAD,CAAc,QAAQ,CAACC,CAAD,CAAY,CAAA,IACzEC,EACE,mEAFuE,CAGzEC,EAAgB,UAEpB,OAAO,SAAQ,CAACtD,CAAD,CAAOuD,CAAP,CAAe,CAoB5BC,QAASA,EAAO,CAACxD,CAAD,CAAO,CAChBA,CAAL,EAGAjC,CAAAe,KAAA,CAAU9B,CAAA,CAAagD,CAAb,CAAV,CAJqB,CAOvByD,QAASA,EAAO,CAACC,CAAD,CAAM1D,CAAN,CAAY,CAC1BjC,CAAAe,KAAA,CAAU,KAAV,CACIhC,EAAA6G,UAAA,CAAkBJ,CAAlB,CAAJ;CACExF,CAAAe,KAAA,CAAU,UAAV,CAEA,CADAf,CAAAe,KAAA,CAAUyE,CAAV,CACA,CAAAxF,CAAAe,KAAA,CAAU,IAAV,CAHF,CAKAf,EAAAe,KAAA,CAAU,QAAV,CACAf,EAAAe,KAAA,CAAU4E,CAAV,CACA3F,EAAAe,KAAA,CAAU,IAAV,CACA0E,EAAA,CAAQxD,CAAR,CACAjC,EAAAe,KAAA,CAAU,MAAV,CAX0B,CA1B5B,GAAI,CAACkB,CAAL,CAAW,MAAOA,EAMlB,KALA,IAAId,CAAJ,CACI0E,EAAM5D,CADV,CAEIjC,EAAO,EAFX,CAGI2F,CAHJ,CAII9F,CACJ,CAAQsB,CAAR,CAAgB0E,CAAA1E,MAAA,CAAUmE,CAAV,CAAhB,CAAA,CAEEK,CAMA,CANMxE,CAAA,CAAM,CAAN,CAMN,CAJIA,CAAA,CAAM,CAAN,CAIJ,EAJgBA,CAAA,CAAM,CAAN,CAIhB,GAJ0BwE,CAI1B,CAJgC,SAIhC,CAJ4CA,CAI5C,EAHA9F,CAGA,CAHIsB,CAAAS,MAGJ,CAFA6D,CAAA,CAAQI,CAAAC,OAAA,CAAW,CAAX,CAAcjG,CAAd,CAAR,CAEA,CADA6F,CAAA,CAAQC,CAAR,CAAaxE,CAAA,CAAM,CAAN,CAAAF,QAAA,CAAiBsE,CAAjB,CAAgC,EAAhC,CAAb,CACA,CAAAM,CAAA,CAAMA,CAAAtD,UAAA,CAAc1C,CAAd,CAAkBsB,CAAA,CAAM,CAAN,CAAArB,OAAlB,CAER2F,EAAA,CAAQI,CAAR,CACA,OAAOR,EAAA,CAAUrF,CAAAT,KAAA,CAAU,EAAV,CAAV,CAlBqB,CAL+C,CAAlC,CAA7C,CAzjBsC,CAArC,CAAA,CA0mBET,MA1mBF,CA0mBUA,MAAAC,QA1mBV;",
--"sources":["angular-sanitize.js"],
--"names":["window","angular","undefined","sanitizeText","chars","buf","htmlSanitizeWriter","writer","noop","join","makeMap","str","obj","items","split","i","length","htmlParser","html","handler","parseStartTag","tag","tagName","rest","unary","lowercase","blockElements","stack","last","inlineElements","parseEndTag","optionalEndTagElements","voidElements","push","attrs","replace","ATTR_REGEXP","match","name","doubleQuotedValue","singleQuotedValue","unquotedValue","decodeEntities","start","pos","end","index","stack.last","specialElements","RegExp","all","text","COMMENT_REGEXP","CDATA_REGEXP","indexOf","lastIndexOf","comment","substring","DOCTYPE_REGEXP","test","BEGIN_END_TAGE_REGEXP","END_TAG_REGEXP","BEGIN_TAG_REGEXP","START_TAG_REGEXP","$sanitizeMinErr","value","parts","spaceRe","exec","spaceBefore","spaceAfter","content","hiddenPre","innerHTML","textContent","innerText","encodeEntities","NON_ALPHANUMERIC_REGEXP","charCodeAt","uriValidator","ignore","out","bind","validElements","forEach","key","lkey","isImage","validAttrs","uriAttrs","$$minErr","optionalEndTagBlockElements","optionalEndTagInlineElements","extend","document","createElement","module","provider","$SanitizeProvider","$get","$$sanitizeUri","uri","filter","$sanitize","LINKY_URL_REGEXP","MAILTO_REGEXP","target","addText","addLink","url","isDefined","raw","substr"]
-+  "version":3,
-+  "file":"angular-sanitize.min.js",
-+  "lineCount":16,
-+  "mappings":"A;;;;;aAKC,SAAQ,CAACA,CAAD,CAASC,CAAT,CAAkB,CAykB3BC,QAASA,EAAY,CAACC,CAAD,CAAQ,CAC3B,IAAIC,EAAM,EACGC,EAAAC,CAAmBF,CAAnBE,CAAwBC,CAAxBD,CACbH,MAAA,CAAaA,CAAb,CACA,OAAOC,EAAAI,KAAA,CAAS,EAAT,CAJoB,CA5jB7B,IAAIC,EAAkBR,CAAAS,SAAA,CAAiB,WAAjB,CAAtB,CACIC,CADJ,CAEIC,CAFJ,CAGIC,CAHJ,CAIIC,CAJJ,CAKIC,CALJ,CAMIR,CANJ,CAOIS,CAPJ,CAQIC,CARJ,CASIZ,CA4jBJJ,EAAAiB,OAAA,CAAe,YAAf,CAA6B,EAA7B,CAAAC,SAAA,CACY,WADZ,CAhcAC,QAA0B,EAAG,CA4J3BC,QAASA,EAAK,CAACC,CAAD,CAAMC,CAAN,CAAqB,CAAA,IAC7BC,EAAM,EADuB,CACnBC,EAAQH,CAAAI,MAAA,CAAU,GAAV,CADW,CACKC,CACtC,KAAKA,CAAL,CAAS,CAAT,CAAYA,CAAZ,CAAgBF,CAAAG,OAAhB,CAA8BD,CAAA,EAA9B,CACEH,CAAA,CAAID,CAAA,CAAgBR,CAAA,CAAUU,CAAA,CAAME,CAAN,CAAV,CAAhB,CAAsCF,CAAA,CAAME,CAAN,CAA1C,CAAA,CAAsD,CAAA,CAExD,OAAOH,EAL0B,CAwJnCK,QAASA,EAAS,CAACC,CAAD,CAAQ,CAExB,IADA,IAAIC,EAAM,EAAV,CACSJ,EAAI,CADb,CACgBK,EAAKF,CAAAF,OAArB,CAAmCD,CAAnC,CAAuCK,CAAvC,CAA2CL,CAAA,EAA3C,CAAgD,CAC9C,IAAIM,EAAOH,CAAA,CAAMH,CAAN,CACXI,EAAA,CAAIE,CAAAC,KAAJ,CAAA,CAAiBD,CAAAE,MAF6B,CAIhD,MAAOJ,EANiB,CAiB1BK,QAASA,EAAc,CAACD,CAAD,CAAQ,CAC7B,MAAOA,EAAAE,QAAA,CACG,IADH,CACS,OADT,CAAAA,QAAA,CAEGC,CAFH,CAE0B,QAAQ,CAACH,CAAD,CAAQ,CAC7C,IAAII,EAAKJ,CAAAK,WAAA,CAAiB,CAAjB,CACLC,EAAAA,CAAMN,CAAAK,WAAA,CAAiB,CAAjB,CACV,OAAO,IAAP,EAAgC,IAAhC,EAAiBD,CAAjB;AAAsB,KAAtB,GAA0CE,CAA1C,CAAgD,KAAhD,EAA0D,KAA1D,EAAqE,GAHxB,CAF1C,CAAAJ,QAAA,CAOGK,CAPH,CAO4B,QAAQ,CAACP,CAAD,CAAQ,CAC/C,MAAO,IAAP,CAAcA,CAAAK,WAAA,CAAiB,CAAjB,CAAd,CAAoC,GADW,CAP5C,CAAAH,QAAA,CAUG,IAVH,CAUS,MAVT,CAAAA,QAAA,CAWG,IAXH,CAWS,MAXT,CADsB,CAgF/BM,QAASA,EAAkB,CAACC,CAAD,CAAO,CAChC,IAAA,CAAOA,CAAP,CAAA,CAAa,CACX,GAAIA,CAAAC,SAAJ,GAAsB7C,CAAA8C,KAAAC,aAAtB,CAEE,IADA,IAAIjB,EAAQc,CAAAI,WAAZ,CACSrB,EAAI,CADb,CACgBsB,EAAInB,CAAAF,OAApB,CAAkCD,CAAlC,CAAsCsB,CAAtC,CAAyCtB,CAAA,EAAzC,CAA8C,CAC5C,IAAIuB,EAAWpB,CAAA,CAAMH,CAAN,CAAf,CACIwB,EAAWD,CAAAhB,KAAAkB,YAAA,EACf,IAAiB,WAAjB,GAAID,CAAJ,EAAoE,CAApE,GAAgCA,CAAAE,YAAA,CAAqB,MAArB,CAA6B,CAA7B,CAAhC,CACET,CAAAU,oBAAA,CAAyBJ,CAAzB,CAEA,CADAvB,CAAA,EACA,CAAAsB,CAAA,EAN0C,CAYhD,CADIM,CACJ,CADeX,CAAAY,WACf,GACEb,CAAA,CAAmBY,CAAnB,CAGFX,EAAA,CAAOa,CAAA,CAAiB,aAAjB,CAAgCb,CAAhC,CAnBI,CADmB,CAwBlCa,QAASA,EAAgB,CAACC,CAAD,CAAWd,CAAX,CAAiB,CAExC,IAAIW,EAAWX,CAAA,CAAKc,CAAL,CACf,IAAIH,CAAJ,EAAgBvC,CAAA2C,KAAA,CAAkBf,CAAlB,CAAwBW,CAAxB,CAAhB,CACE,KAAM9C,EAAA,CAAgB,QAAhB,CAA2FmC,CAAAgB,UAA3F,EAA6GhB,CAAAiB,UAA7G,CAAN,CAEF,MAAON,EANiC,CA5a1C,IAAIO,EAAa,CAAA,CAEjB,KAAAC,KAAA;AAAY,CAAC,eAAD,CAAkB,QAAQ,CAACC,CAAD,CAAgB,CAChDF,CAAJ,EACElD,CAAA,CAAOqD,CAAP,CAAsBC,CAAtB,CAEF,OAAO,SAAQ,CAACC,CAAD,CAAO,CACpB,IAAI/D,EAAM,EACVa,EAAA,CAAWkD,CAAX,CAAiB9D,CAAA,CAAmBD,CAAnB,CAAwB,QAAQ,CAACgE,CAAD,CAAMC,CAAN,CAAe,CAC9D,MAAO,CAAC,UAAAC,KAAA,CAAgBN,CAAA,CAAcI,CAAd,CAAmBC,CAAnB,CAAhB,CADsD,CAA/C,CAAjB,CAGA,OAAOjE,EAAAI,KAAA,CAAS,EAAT,CALa,CAJ8B,CAA1C,CA4CZ,KAAA+D,UAAA,CAAiBC,QAAQ,CAACD,CAAD,CAAY,CACnC,MAAIzD,EAAA,CAAUyD,CAAV,CAAJ,EACET,CACO,CADMS,CACN,CAAA,IAFT,EAIST,CAL0B,CAarCnD,EAAA,CAAOV,CAAAU,KACPC,EAAA,CAASX,CAAAW,OACTC,EAAA,CAAUZ,CAAAY,QACVC,EAAA,CAAYb,CAAAa,UACZC,EAAA,CAAYd,CAAAc,UACZR,EAAA,CAAON,CAAAM,KAEPU,EAAA,CAsLAwD,QAAuB,CAACN,CAAD,CAAOO,CAAP,CAAgB,CACxB,IAAb,GAAIP,CAAJ,EAA8BQ,IAAAA,EAA9B,GAAqBR,CAArB,CACEA,CADF,CACS,EADT,CAE2B,QAF3B,GAEW,MAAOA,EAFlB,GAGEA,CAHF,CAGS,EAHT,CAGcA,CAHd,CAMA,KAAIS,EAAmBC,CAAA,CAAoBV,CAApB,CACvB,IAAKS,CAAAA,CAAL,CAAuB,MAAO,EAG9B,KAAIE,EAAe,CACnB,GAAG,CACD,GAAqB,CAArB,GAAIA,CAAJ,CACE,KAAMrE,EAAA,CAAgB,QAAhB,CAAN,CAEFqE,CAAA,EAGAX,EAAA,CAAOS,CAAAG,UACPH,EAAA,CAAmBC,CAAA,CAAoBV,CAApB,CARlB,CAAH,MASSA,CATT,GASkBS,CAAAG,UATlB,CAYA,KADInC,CACJ,CADWgC,CAAApB,WACX,CAAOZ,CAAP,CAAA,CAAa,CACX,OAAQA,CAAAC,SAAR,EACE,KAAK,CAAL,CACE6B,CAAAM,MAAA,CAAcpC,CAAAqC,SAAA7B,YAAA,EAAd;AAA2CvB,CAAA,CAAUe,CAAAI,WAAV,CAA3C,CACA,MACF,MAAK,CAAL,CACE0B,CAAAvE,MAAA,CAAcyC,CAAAsC,YAAd,CALJ,CASA,IAAI3B,CACJ,IAAM,EAAAA,CAAA,CAAWX,CAAAY,WAAX,CAAN,GACwB,CAIjBD,GAJDX,CAAAC,SAICU,EAHHmB,CAAAS,IAAA,CAAYvC,CAAAqC,SAAA7B,YAAA,EAAZ,CAGGG,CADLA,CACKA,CADME,CAAA,CAAiB,aAAjB,CAAgCb,CAAhC,CACNW,CAAAA,CAAAA,CALP,EAMI,IAAA,CAAmB,IAAnB,EAAOA,CAAP,CAAA,CAAyB,CACvBX,CAAA,CAAOa,CAAA,CAAiB,YAAjB,CAA+Bb,CAA/B,CACP,IAAIA,CAAJ,GAAagC,CAAb,CAA+B,KAC/BrB,EAAA,CAAWE,CAAA,CAAiB,aAAjB,CAAgCb,CAAhC,CACW,EAAtB,GAAIA,CAAAC,SAAJ,EACE6B,CAAAS,IAAA,CAAYvC,CAAAqC,SAAA7B,YAAA,EAAZ,CALqB,CAU7BR,CAAA,CAAOW,CA3BI,CA8Bb,IAAA,CAAQX,CAAR,CAAegC,CAAApB,WAAf,CAAA,CACEoB,CAAAQ,YAAA,CAA6BxC,CAA7B,CAvDmC,CArLvCvC,EAAA,CA0RAgF,QAA+B,CAACjF,CAAD,CAAMkF,CAAN,CAAoB,CACjD,IAAIC,EAAuB,CAAA,CAA3B,CACIC,EAAM7E,CAAA,CAAKP,CAAL,CAAUA,CAAAqF,KAAV,CACV,OAAO,CACLT,MAAOA,QAAQ,CAACU,CAAD,CAAM5D,CAAN,CAAa,CAC1B4D,CAAA,CAAM3E,CAAA,CAAU2E,CAAV,CACDH,EAAAA,CAAL,EAA6BI,CAAA,CAAgBD,CAAhB,CAA7B,GACEH,CADF,CACyBG,CADzB,CAGKH,EAAL,EAAoD,CAAA,CAApD,GAA6BtB,CAAA,CAAcyB,CAAd,CAA7B,GACEF,CAAA,CAAI,GAAJ,CAcA,CAbAA,CAAA,CAAIE,CAAJ,CAaA,CAZA7E,CAAA,CAAQiB,CAAR,CAAe,QAAQ,CAACK,CAAD,CAAQyD,CAAR,CAAa,CAClC,IAAIC,EAAO9E,CAAA,CAAU6E,CAAV,CAAX,CACIvB,EAAmB,KAAnBA,GAAWqB,CAAXrB,EAAqC,KAArCA,GAA4BwB,CAA5BxB,EAAyD,YAAzDA;AAAgDwB,CAC3B,EAAA,CAAzB,GAAIC,CAAA,CAAWD,CAAX,CAAJ,EACsB,CAAA,CADtB,GACGE,CAAA,CAASF,CAAT,CADH,EAC8B,CAAAP,CAAA,CAAanD,CAAb,CAAoBkC,CAApB,CAD9B,GAEEmB,CAAA,CAAI,GAAJ,CAIA,CAHAA,CAAA,CAAII,CAAJ,CAGA,CAFAJ,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAIpD,CAAA,CAAeD,CAAf,CAAJ,CACA,CAAAqD,CAAA,CAAI,GAAJ,CANF,CAHkC,CAApC,CAYA,CAAAA,CAAA,CAAI,GAAJ,CAfF,CAL0B,CADvB,CAwBLL,IAAKA,QAAQ,CAACO,CAAD,CAAM,CACjBA,CAAA,CAAM3E,CAAA,CAAU2E,CAAV,CACDH,EAAL,EAAoD,CAAA,CAApD,GAA6BtB,CAAA,CAAcyB,CAAd,CAA7B,EAAkF,CAAA,CAAlF,GAA4DM,CAAA,CAAaN,CAAb,CAA5D,GACEF,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAIE,CAAJ,CACA,CAAAF,CAAA,CAAI,GAAJ,CAHF,CAMIE,EAAJ,EAAWH,CAAX,GACEA,CADF,CACyB,CAAA,CADzB,CARiB,CAxBd,CAoCLpF,MAAOA,QAAQ,CAACA,CAAD,CAAQ,CAChBoF,CAAL,EACEC,CAAA,CAAIpD,CAAA,CAAejC,CAAf,CAAJ,CAFmB,CApClB,CAH0C,CAxRnDa,EAAA,CAAehB,CAAA8C,KAAAmD,UAAAC,SAAf,EAA8D,QAAQ,CAACC,CAAD,CAAM,CAE1E,MAAO,CAAG,EAAA,IAAAC,wBAAA,CAA6BD,CAA7B,CAAA,CAAoC,EAApC,CAFgE,CAtEjD,KA4EvB7D,EAAwB,iCA5ED,CA8EzBI,EAA0B,cA9ED,CAuFvBsD,EAAe3E,CAAA,CAAM,wBAAN,CAvFQ,CA2FvBgF,EAA8BhF,CAAA,CAAM,gDAAN,CA3FP,CA4FvBiF,EAA+BjF,CAAA,CAAM,OAAN,CA5FR,CA6FvBkF,EAAyB3F,CAAA,CAAO,EAAP,CACe0F,CADf,CAEeD,CAFf,CA7FF,CAkGvBG,EAAgB5F,CAAA,CAAO,EAAP,CAAWyF,CAAX,CAAwChF,CAAA,CAAM,qKAAN,CAAxC,CAlGO;AAuGvBoF,EAAiB7F,CAAA,CAAO,EAAP,CAAW0F,CAAX,CAAyCjF,CAAA,CAAM,2JAAN,CAAzC,CAvGM,CA+GvB6C,EAAc7C,CAAA,CAAM,wNAAN,CA/GS,CAoHvBsE,EAAkBtE,CAAA,CAAM,cAAN,CApHK,CAsHvB4C,EAAgBrD,CAAA,CAAO,EAAP,CACeoF,CADf,CAEeQ,CAFf,CAGeC,CAHf,CAIeF,CAJf,CAtHO,CA6HvBR,EAAW1E,CAAA,CAAM,uDAAN,CA7HY,CA+HvBqF,EAAYrF,CAAA,CAAM,kTAAN,CA/HW;AAuIvBsF,EAAWtF,CAAA,CAAM,guCAAN;AAcoE,CAAA,CAdpE,CAvIY,CAuJvByE,EAAalF,CAAA,CAAO,EAAP,CACemF,CADf,CAEeY,CAFf,CAGeD,CAHf,CAvJU,CA0KvB7B,EAAqE,QAAQ,CAAC7E,CAAD,CAAS4G,CAAT,CAAmB,CAyClGC,QAASA,EAA6B,CAAC1C,CAAD,CAAO,CAG3CA,CAAA,CAAO,mBAAP,CAA6BA,CAC7B,IAAI,CACF,IAAI2C,EAAOC,CAAA,IAAI/G,CAAAgH,UAAJD,iBAAA,CAAuC5C,CAAvC,CAA6C,WAA7C,CAAA2C,KACXA,EAAAtD,WAAAyD,OAAA,EACA,OAAOH,EAHL,CAIF,MAAOI,CAAP,CAAU,EAR+B,CAa7CC,QAASA,EAAiC,CAAChD,CAAD,CAAO,CAC/CS,CAAAG,UAAA,CAA6BZ,CAIzByC,EAAAQ,aAAJ,EACEzE,CAAA,CAAmBiC,CAAnB,CAGF,OAAOA,EATwC,CArDjD,IAAIyC,CACJ,IAAIT,CAAJ,EAAgBA,CAAAU,eAAhB,CACED,CAAA,CAAgBT,CAAAU,eAAAC,mBAAA,CAA2C,OAA3C,CADlB,KAGE,MAAM9G,EAAA,CAAgB,SAAhB,CAAN,CAEF,IAAImE,EAAmB4C,CAACH,CAAAI,gBAADD,EAAkCH,CAAAK,mBAAA,EAAlCF,eAAA,CAAoF,MAApF,CAGvB5C,EAAAG,UAAA,CAA6B,sDAC7B,OAAKH,EAAA4C,cAAA,CAA+B,KAA/B,CAAL;CAIE5C,CAAAG,UACA,CAD6B,kEAC7B,CAAIH,CAAA4C,cAAA,CAA+B,SAA/B,CAAJ,CACSX,CADT,CAGSM,CARX,EAYAQ,QAAgC,CAACxD,CAAD,CAAO,CAGrCA,CAAA,CAAO,mBAAP,CAA6BA,CAC7B,IAAI,CACFA,CAAA,CAAOyD,SAAA,CAAUzD,CAAV,CADL,CAEF,MAAO+C,CAAP,CAAU,CACV,MADU,CAGZ,IAAIW,EAAM,IAAI7H,CAAA8H,eACdD,EAAAE,aAAA,CAAmB,UACnBF,EAAAG,KAAA,CAAS,KAAT,CAAgB,+BAAhB,CAAkD7D,CAAlD,CAAwD,CAAA,CAAxD,CACA0D,EAAAI,KAAA,CAAS,IAAT,CACInB,EAAAA,CAAOe,CAAAK,SAAApB,KACXA,EAAAtD,WAAAyD,OAAA,EACA,OAAOH,EAf8B,CAvB2D,CAA5B,CAiErE9G,CAjEqE,CAiE7DA,CAAA4G,SAjE6D,CA1K7C,CAgc7B,CAAAuB,KAAA,CAEQ,CAAEC,eAAgB,OAAlB,CAFR,CAmIAnI,EAAAiB,OAAA,CAAe,YAAf,CAAAmH,OAAA,CAAoC,OAApC,CAA6C,CAAC,WAAD,CAAc,QAAQ,CAACC,CAAD,CAAY,CAAA,IACzEC,EACE,2FAFuE;AAGzEC,EAAgB,WAHyD,CAKzEC,EAAcxI,CAAAS,SAAA,CAAiB,OAAjB,CAL2D,CAMzEI,EAAYb,CAAAa,UAN6D,CAOzE4H,EAAazI,CAAAyI,WAP4D,CAQzEC,EAAW1I,CAAA0I,SAR8D,CASzEC,EAAW3I,CAAA2I,SAEf,OAAO,SAAQ,CAACC,CAAD,CAAOC,CAAP,CAAe9F,CAAf,CAA2B,CA6BxC+F,QAASA,EAAO,CAACF,CAAD,CAAO,CAChBA,CAAL,EAGA1E,CAAAsB,KAAA,CAAUvF,CAAA,CAAa2I,CAAb,CAAV,CAJqB,CAOvBG,QAASA,EAAO,CAACC,CAAD,CAAMJ,CAAN,CAAY,CAAA,IACtBjD,CADsB,CACjBsD,EAAiBC,CAAA,CAAaF,CAAb,CAC1B9E,EAAAsB,KAAA,CAAU,KAAV,CAEA,KAAKG,CAAL,GAAYsD,EAAZ,CACE/E,CAAAsB,KAAA,CAAUG,CAAV,CAAgB,IAAhB,CAAuBsD,CAAA,CAAetD,CAAf,CAAvB,CAA6C,IAA7C,CAGE,EAAA9E,CAAA,CAAUgI,CAAV,CAAJ,EAA2B,QAA3B,EAAuCI,EAAvC,EACE/E,CAAAsB,KAAA,CAAU,UAAV,CACUqD,CADV,CAEU,IAFV,CAIF3E,EAAAsB,KAAA,CAAU,QAAV,CACUwD,CAAA5G,QAAA,CAAY,IAAZ,CAAkB,QAAlB,CADV,CAEU,IAFV,CAGA0G,EAAA,CAAQF,CAAR,CACA1E,EAAAsB,KAAA,CAAU,MAAV,CAjB0B,CAnC5B,GAAY,IAAZ,EAAIoD,CAAJ,EAA6B,EAA7B,GAAoBA,CAApB,CAAiC,MAAOA,EACxC,IAAK,CAAAD,CAAA,CAASC,CAAT,CAAL,CAAqB,KAAMJ,EAAA,CAAY,WAAZ,CAA8DI,CAA9D,CAAN,CAYrB,IAVA,IAAIM,EACFT,CAAA,CAAW1F,CAAX,CAAA,CAAyBA,CAAzB,CACA2F,CAAA,CAAS3F,CAAT,CAAA,CAAuBoG,QAA4B,EAAG,CAAC,MAAOpG,EAAR,CAAtD,CACAqG,QAAiC,EAAG,CAAC,MAAO,EAAR,CAHtC,CAMIC,EAAMT,CANV,CAOI1E,EAAO,EAPX,CAQI8E,CARJ,CASItH,CACJ,CAAQ4H,CAAR,CAAgBD,CAAAC,MAAA,CAAUhB,CAAV,CAAhB,CAAA,CAEEU,CAQA,CARMM,CAAA,CAAM,CAAN,CAQN,CANKA,CAAA,CAAM,CAAN,CAML;AANkBA,CAAA,CAAM,CAAN,CAMlB,GALEN,CAKF,EALSM,CAAA,CAAM,CAAN,CAAA,CAAW,SAAX,CAAuB,SAKhC,EAL6CN,CAK7C,EAHAtH,CAGA,CAHI4H,CAAAC,MAGJ,CAFAT,CAAA,CAAQO,CAAAG,OAAA,CAAW,CAAX,CAAc9H,CAAd,CAAR,CAEA,CADAqH,CAAA,CAAQC,CAAR,CAAaM,CAAA,CAAM,CAAN,CAAAlH,QAAA,CAAiBmG,CAAjB,CAAgC,EAAhC,CAAb,CACA,CAAAc,CAAA,CAAMA,CAAAI,UAAA,CAAc/H,CAAd,CAAkB4H,CAAA,CAAM,CAAN,CAAA3H,OAAlB,CAERmH,EAAA,CAAQO,CAAR,CACA,OAAOhB,EAAA,CAAUnE,CAAA3D,KAAA,CAAU,EAAV,CAAV,CA3BiC,CAXmC,CAAlC,CAA7C,CArtB2B,CAA1B,CAAD,CA2xBGR,MA3xBH,CA2xBWA,MAAAC,QA3xBX;",
-+  "sources":["angular-sanitize.js"],
-+  "names":["window","angular","sanitizeText","chars","buf","htmlSanitizeWriter","writer","noop","join","$sanitizeMinErr","$$minErr","bind","extend","forEach","isDefined","lowercase","nodeContains","htmlParser","module","provider","$SanitizeProvider","toMap","str","lowercaseKeys","obj","items","split","i","length","attrToMap","attrs","map","ii","attr","name","value","encodeEntities","replace","SURROGATE_PAIR_REGEXP","hi","charCodeAt","low","NON_ALPHANUMERIC_REGEXP","stripCustomNsAttrs","node","nodeType","Node","ELEMENT_NODE","attributes","l","attrNode","attrName","toLowerCase","lastIndexOf","removeAttributeNode","nextNode","firstChild","getNonDescendant","propName","call","outerHTML","outerText","svgEnabled","$get","$$sanitizeUri","validElements","svgElements","html","uri","isImage","test","enableSvg","this.enableSvg","htmlParserImpl","handler","undefined","inertBodyElement","getInertBodyElement","mXSSAttempts","innerHTML","start","nodeName","textContent","end","removeChild","htmlSanitizeWriterImpl","uriValidator","ignoreCurrentElement","out","push","tag","blockedElements","key","lkey","validAttrs","uriAttrs","voidElements","prototype","contains","arg","compareDocumentPosition","optionalEndTagBlockElements","optionalEndTagInlineElements","optionalEndTagElements","blockElements","inlineElements","htmlAttrs","svgAttrs","document","getInertBodyElement_DOMParser","body","parseFromString","DOMParser","remove","e","getInertBodyElement_InertDocument","documentMode","inertDocument","implementation","createHTMLDocument","querySelector","documentElement","getDocumentElement","getInertBodyElement_XHR","encodeURI","xhr","XMLHttpRequest","responseType","open","send","response","info","angularVersion","filter","$sanitize","LINKY_URL_REGEXP","MAILTO_REGEXP","linkyMinErr","isFunction","isObject","isString","text","target","addText","addLink","url","linkAttributes","attributesFn","getAttributesObject","getEmptyAttributesObject","raw","match","index","substr","substring"]
- }
-\ No newline at end of file
-diff --git a/setup/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js b/setup/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js
-index fa6a8613174..2676e0ae9dd 100644
---- a/setup/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js
-+++ b/setup/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js
-@@ -6,5 +6,5 @@
-  * License: MIT
-  */
- angular.module("ui.bootstrap",["ui.bootstrap.tpls","ui.bootstrap.transition","ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.bindHtml","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.dropdown","ui.bootstrap.modal","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]),angular.module("ui.bootstrap.tpls",["template/accordion/accordion-group.html","template/accordion/accordion.html","template/alert/alert.html","template/carousel/carousel.html","template/carousel/slide.html","template/datepicker/datepicker.html","template/datepicker/day.html","template/datepicker/month.html","template/datepicker/popup.html","template/datepicker/year.html","template/modal/backdrop.html","template/modal/window.html","template/pagination/pager.html","template/pagination/pagination.html","template/tooltip/tooltip-html-unsafe-popup.html","template/tooltip/tooltip-popup.html","template/popover/popover.html","template/progressbar/bar.html","template/progressbar/progress.html","template/progressbar/progressbar.html","template/rating/rating.html","template/tabs/tab.html","template/tabs/tabset.html","template/timepicker/timepicker.html","template/typeahead/typeahead-match.html","template/typeahead/typeahead-popup.html"]),angular.module("ui.bootstrap.transition",[]).factory("$transition",["$q","$timeout","$rootScope",function(a,b,c){function d(a){for(var b in a)if(void 0!==f.style[b])return a[b]}var e=function(d,f,g){g=g||{};var h=a.defer(),i=e[g.animation?"animationEndEventName":"transitionEndEventName"],j=function(){c.$apply(function(){d.unbind(i,j),h.resolve(d)})};return i&&d.bind(i,j),b(function(){angular.isString(f)?d.addClass(f):angular.isFunction(f)?f(d):angular.isObject(f)&&d.css(f),i||h.resolve(d)}),h.promise.cancel=function(){i&&d.unbind(i,j),h.reject("Transition cancelled")},h.promise},f=document.createElement("trans"),g={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",transition:"transitionend"},h={WebkitTransition:"webkitAnimationEnd",MozTransition:"animationend",OTransition:"oAnimationEnd",transition:"animationend"};return e.transitionEndEventName=d(g),e.animationEndEventName=d(h),e}]),angular.module("ui.bootstrap.collapse",["ui.bootstrap.transition"]).directive("collapse",["$transition",function(a){return{link:function(b,c,d){function e(b){function d(){j===e&&(j=void 0)}var e=a(c,b);return j&&j.cancel(),j=e,e.then(d,d),e}function f(){k?(k=!1,g()):(c.removeClass("collapse").addClass("collapsing"),e({height:c[0].scrollHeight+"px"}).then(g))}function g(){c.removeClass("collapsing"),c.addClass("collapse in"),c.css({height:"auto"})}function h(){if(k)k=!1,i(),c.css({height:0});else{c.css({height:c[0].scrollHeight+"px"});{c[0].offsetWidth}c.removeClass("collapse in").addClass("collapsing"),e({height:0}).then(i)}}function i(){c.removeClass("collapsing"),c.addClass("collapse")}var j,k=!0;b.$watch(d.collapse,function(a){a?h():f()})}}}]),angular.module("ui.bootstrap.accordion",["ui.bootstrap.collapse"]).constant("accordionConfig",{closeOthers:!0}).controller("AccordionController",["$scope","$attrs","accordionConfig",function(a,b,c){this.groups=[],this.closeOthers=function(d){var e=angular.isDefined(b.closeOthers)?a.$eval(b.closeOthers):c.closeOthers;e&&angular.forEach(this.groups,function(a){a!==d&&(a.isOpen=!1)})},this.addGroup=function(a){var b=this;this.groups.push(a),a.$on("$destroy",function(){b.removeGroup(a)})},this.removeGroup=function(a){var b=this.groups.indexOf(a);-1!==b&&this.groups.splice(b,1)}}]).directive("accordion",function(){return{restrict:"EA",controller:"AccordionController",transclude:!0,replace:!1,templateUrl:"template/accordion/accordion.html"}}).directive("accordionGroup",function(){return{require:"^accordion",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/accordion/accordion-group.html",scope:{heading:"@",isOpen:"=?",isDisabled:"=?"},controller:function(){this.setHeading=function(a){this.heading=a}},link:function(a,b,c,d){d.addGroup(a),a.$watch("isOpen",function(b){b&&d.closeOthers(a)}),a.toggleOpen=function(){a.isDisabled||(a.isOpen=!a.isOpen)}}}}).directive("accordionHeading",function(){return{restrict:"EA",transclude:!0,template:"",replace:!0,require:"^accordionGroup",link:function(a,b,c,d,e){d.setHeading(e(a,function(){}))}}}).directive("accordionTransclude",function(){return{require:"^accordionGroup",link:function(a,b,c,d){a.$watch(function(){return d[c.accordionTransclude]},function(a){a&&(b.html(""),b.append(a))})}}}),angular.module("ui.bootstrap.alert",[]).controller("AlertController",["$scope","$attrs",function(a,b){a.closeable="close"in b}]).directive("alert",function(){return{restrict:"EA",controller:"AlertController",templateUrl:"template/alert/alert.html",transclude:!0,replace:!0,scope:{type:"@",close:"&"}}}),angular.module("ui.bootstrap.bindHtml",[]).directive("bindHtmlUnsafe",function(){return function(a,b,c){b.addClass("ng-binding").data("$binding",c.bindHtmlUnsafe),a.$watch(c.bindHtmlUnsafe,function(a){b.html(a||"")})}}),angular.module("ui.bootstrap.buttons",[]).constant("buttonConfig",{activeClass:"active",toggleEvent:"click"}).controller("ButtonsController",["buttonConfig",function(a){this.activeClass=a.activeClass||"active",this.toggleEvent=a.toggleEvent||"click"}]).directive("btnRadio",function(){return{require:["btnRadio","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){var e=d[0],f=d[1];f.$render=function(){b.toggleClass(e.activeClass,angular.equals(f.$modelValue,a.$eval(c.btnRadio)))},b.bind(e.toggleEvent,function(){var d=b.hasClass(e.activeClass);(!d||angular.isDefined(c.uncheckable))&&a.$apply(function(){f.$setViewValue(d?null:a.$eval(c.btnRadio)),f.$render()})})}}}).directive("btnCheckbox",function(){return{require:["btnCheckbox","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){function e(){return g(c.btnCheckboxTrue,!0)}function f(){return g(c.btnCheckboxFalse,!1)}function g(b,c){var d=a.$eval(b);return angular.isDefined(d)?d:c}var h=d[0],i=d[1];i.$render=function(){b.toggleClass(h.activeClass,angular.equals(i.$modelValue,e()))},b.bind(h.toggleEvent,function(){a.$apply(function(){i.$setViewValue(b.hasClass(h.activeClass)?f():e()),i.$render()})})}}}),angular.module("ui.bootstrap.carousel",["ui.bootstrap.transition"]).controller("CarouselController",["$scope","$timeout","$transition",function(a,b,c){function d(){e();var c=+a.interval;!isNaN(c)&&c>=0&&(g=b(f,c))}function e(){g&&(b.cancel(g),g=null)}function f(){h?(a.next(),d()):a.pause()}var g,h,i=this,j=i.slides=a.slides=[],k=-1;i.currentSlide=null;var l=!1;i.select=a.select=function(e,f){function g(){if(!l){if(i.currentSlide&&angular.isString(f)&&!a.noTransition&&e.$element){e.$element.addClass(f);{e.$element[0].offsetWidth}angular.forEach(j,function(a){angular.extend(a,{direction:"",entering:!1,leaving:!1,active:!1})}),angular.extend(e,{direction:f,active:!0,entering:!0}),angular.extend(i.currentSlide||{},{direction:f,leaving:!0}),a.$currentTransition=c(e.$element,{}),function(b,c){a.$currentTransition.then(function(){h(b,c)},function(){h(b,c)})}(e,i.currentSlide)}else h(e,i.currentSlide);i.currentSlide=e,k=m,d()}}function h(b,c){angular.extend(b,{direction:"",active:!0,leaving:!1,entering:!1}),angular.extend(c||{},{direction:"",active:!1,leaving:!1,entering:!1}),a.$currentTransition=null}var m=j.indexOf(e);void 0===f&&(f=m>k?"next":"prev"),e&&e!==i.currentSlide&&(a.$currentTransition?(a.$currentTransition.cancel(),b(g)):g())},a.$on("$destroy",function(){l=!0}),i.indexOfSlide=function(a){return j.indexOf(a)},a.next=function(){var b=(k+1)%j.length;return a.$currentTransition?void 0:i.select(j[b],"next")},a.prev=function(){var b=0>k-1?j.length-1:k-1;return a.$currentTransition?void 0:i.select(j[b],"prev")},a.isActive=function(a){return i.currentSlide===a},a.$watch("interval",d),a.$on("$destroy",e),a.play=function(){h||(h=!0,d())},a.pause=function(){a.noPause||(h=!1,e())},i.addSlide=function(b,c){b.$element=c,j.push(b),1===j.length||b.active?(i.select(j[j.length-1]),1==j.length&&a.play()):b.active=!1},i.removeSlide=function(a){var b=j.indexOf(a);j.splice(b,1),j.length>0&&a.active?i.select(b>=j.length?j[b-1]:j[b]):k>b&&k--}}]).directive("carousel",[function(){return{restrict:"EA",transclude:!0,replace:!0,controller:"CarouselController",require:"carousel",templateUrl:"template/carousel/carousel.html",scope:{interval:"=",noTransition:"=",noPause:"="}}}]).directive("slide",function(){return{require:"^carousel",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/carousel/slide.html",scope:{active:"=?"},link:function(a,b,c,d){d.addSlide(a,b),a.$on("$destroy",function(){d.removeSlide(a)}),a.$watch("active",function(b){b&&d.select(a)})}}}),angular.module("ui.bootstrap.dateparser",[]).service("dateParser",["$locale","orderByFilter",function(a,b){function c(a,b,c){return 1===b&&c>28?29===c&&(a%4===0&&a%100!==0||a%400===0):3===b||5===b||8===b||10===b?31>c:!0}this.parsers={};var d={yyyy:{regex:"\\d{4}",apply:function(a){this.year=+a}},yy:{regex:"\\d{2}",apply:function(a){this.year=+a+2e3}},y:{regex:"\\d{1,4}",apply:function(a){this.year=+a}},MMMM:{regex:a.DATETIME_FORMATS.MONTH.join("|"),apply:function(b){this.month=a.DATETIME_FORMATS.MONTH.indexOf(b)}},MMM:{regex:a.DATETIME_FORMATS.SHORTMONTH.join("|"),apply:function(b){this.month=a.DATETIME_FORMATS.SHORTMONTH.indexOf(b)}},MM:{regex:"0[1-9]|1[0-2]",apply:function(a){this.month=a-1}},M:{regex:"[1-9]|1[0-2]",apply:function(a){this.month=a-1}},dd:{regex:"[0-2][0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},d:{regex:"[1-2]?[0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},EEEE:{regex:a.DATETIME_FORMATS.DAY.join("|")},EEE:{regex:a.DATETIME_FORMATS.SHORTDAY.join("|")}};this.createParser=function(a){var c=[],e=a.split("");return angular.forEach(d,function(b,d){var f=a.indexOf(d);if(f>-1){a=a.split(""),e[f]="("+b.regex+")",a[f]="$";for(var g=f+1,h=f+d.length;h>g;g++)e[g]="",a[g]="$";a=a.join(""),c.push({index:f,apply:b.apply})}}),{regex:new RegExp("^"+e.join("")+"$"),map:b(c,"index")}},this.parse=function(b,d){if(!angular.isString(b))return b;d=a.DATETIME_FORMATS[d]||d,this.parsers[d]||(this.parsers[d]=this.createParser(d));var e=this.parsers[d],f=e.regex,g=e.map,h=b.match(f);if(h&&h.length){for(var i,j={year:1900,month:0,date:1,hours:0},k=1,l=h.length;l>k;k++){var m=g[k-1];m.apply&&m.apply.call(j,h[k])}return c(j.year,j.month,j.date)&&(i=new Date(j.year,j.month,j.date,j.hours)),i}}}]),angular.module("ui.bootstrap.position",[]).factory("$position",["$document","$window",function(a,b){function c(a,c){return a.currentStyle?a.currentStyle[c]:b.getComputedStyle?b.getComputedStyle(a)[c]:a.style[c]}function d(a){return"static"===(c(a,"position")||"static")}var e=function(b){for(var c=a[0],e=b.offsetParent||c;e&&e!==c&&d(e);)e=e.offsetParent;return e||c};return{position:function(b){var c=this.offset(b),d={top:0,left:0},f=e(b[0]);f!=a[0]&&(d=this.offset(angular.element(f)),d.top+=f.clientTop-f.scrollTop,d.left+=f.clientLeft-f.scrollLeft);var g=b[0].getBoundingClientRect();return{width:g.width||b.prop("offsetWidth"),height:g.height||b.prop("offsetHeight"),top:c.top-d.top,left:c.left-d.left}},offset:function(c){var d=c[0].getBoundingClientRect();return{width:d.width||c.prop("offsetWidth"),height:d.height||c.prop("offsetHeight"),top:d.top+(b.pageYOffset||a[0].documentElement.scrollTop),left:d.left+(b.pageXOffset||a[0].documentElement.scrollLeft)}},positionElements:function(a,b,c,d){var e,f,g,h,i=c.split("-"),j=i[0],k=i[1]||"center";e=d?this.offset(a):this.position(a),f=b.prop("offsetWidth"),g=b.prop("offsetHeight");var l={center:function(){return e.left+e.width/2-f/2},left:function(){return e.left},right:function(){return e.left+e.width}},m={center:function(){return e.top+e.height/2-g/2},top:function(){return e.top},bottom:function(){return e.top+e.height}};switch(j){case"right":h={top:m[k](),left:l[j]()};break;case"left":h={top:m[k](),left:e.left-f};break;case"bottom":h={top:m[j](),left:l[k]()};break;default:h={top:e.top-g,left:l[k]()}}return h}}}]),angular.module("ui.bootstrap.datepicker",["ui.bootstrap.dateparser","ui.bootstrap.position"]).constant("datepickerConfig",{formatDay:"dd",formatMonth:"MMMM",formatYear:"yyyy",formatDayHeader:"EEE",formatDayTitle:"MMMM yyyy",formatMonthTitle:"yyyy",datepickerMode:"day",minMode:"day",maxMode:"year",showWeeks:!0,startingDay:0,yearRange:20,minDate:null,maxDate:null}).controller("DatepickerController",["$scope","$attrs","$parse","$interpolate","$timeout","$log","dateFilter","datepickerConfig",function(a,b,c,d,e,f,g,h){var i=this,j={$setViewValue:angular.noop};this.modes=["day","month","year"],angular.forEach(["formatDay","formatMonth","formatYear","formatDayHeader","formatDayTitle","formatMonthTitle","minMode","maxMode","showWeeks","startingDay","yearRange"],function(c,e){i[c]=angular.isDefined(b[c])?8>e?d(b[c])(a.$parent):a.$parent.$eval(b[c]):h[c]}),angular.forEach(["minDate","maxDate"],function(d){b[d]?a.$parent.$watch(c(b[d]),function(a){i[d]=a?new Date(a):null,i.refreshView()}):i[d]=h[d]?new Date(h[d]):null}),a.datepickerMode=a.datepickerMode||h.datepickerMode,a.uniqueId="datepicker-"+a.$id+"-"+Math.floor(1e4*Math.random()),this.activeDate=angular.isDefined(b.initDate)?a.$parent.$eval(b.initDate):new Date,a.isActive=function(b){return 0===i.compare(b.date,i.activeDate)?(a.activeDateId=b.uid,!0):!1},this.init=function(a){j=a,j.$render=function(){i.render()}},this.render=function(){if(j.$modelValue){var a=new Date(j.$modelValue),b=!isNaN(a);b?this.activeDate=a:f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'),j.$setValidity("date",b)}this.refreshView()},this.refreshView=function(){if(this.element){this._refreshView();var a=j.$modelValue?new Date(j.$modelValue):null;j.$setValidity("date-disabled",!a||this.element&&!this.isDisabled(a))}},this.createDateObject=function(a,b){var c=j.$modelValue?new Date(j.$modelValue):null;return{date:a,label:g(a,b),selected:c&&0===this.compare(a,c),disabled:this.isDisabled(a),current:0===this.compare(a,new Date)}},this.isDisabled=function(c){return this.minDate&&this.compare(c,this.minDate)<0||this.maxDate&&this.compare(c,this.maxDate)>0||b.dateDisabled&&a.dateDisabled({date:c,mode:a.datepickerMode})},this.split=function(a,b){for(var c=[];a.length>0;)c.push(a.splice(0,b));return c},a.select=function(b){if(a.datepickerMode===i.minMode){var c=j.$modelValue?new Date(j.$modelValue):new Date(0,0,0,0,0,0,0);c.setFullYear(b.getFullYear(),b.getMonth(),b.getDate()),j.$setViewValue(c),j.$render()}else i.activeDate=b,a.datepickerMode=i.modes[i.modes.indexOf(a.datepickerMode)-1]},a.move=function(a){var b=i.activeDate.getFullYear()+a*(i.step.years||0),c=i.activeDate.getMonth()+a*(i.step.months||0);i.activeDate.setFullYear(b,c,1),i.refreshView()},a.toggleMode=function(b){b=b||1,a.datepickerMode===i.maxMode&&1===b||a.datepickerMode===i.minMode&&-1===b||(a.datepickerMode=i.modes[i.modes.indexOf(a.datepickerMode)+b])},a.keys={13:"enter",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down"};var k=function(){e(function(){i.element[0].focus()},0,!1)};a.$on("datepicker.focus",k),a.keydown=function(b){var c=a.keys[b.which];if(c&&!b.shiftKey&&!b.altKey)if(b.preventDefault(),b.stopPropagation(),"enter"===c||"space"===c){if(i.isDisabled(i.activeDate))return;a.select(i.activeDate),k()}else!b.ctrlKey||"up"!==c&&"down"!==c?(i.handleKeyDown(c,b),i.refreshView()):(a.toggleMode("up"===c?1:-1),k())}}]).directive("datepicker",function(){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/datepicker.html",scope:{datepickerMode:"=?",dateDisabled:"&"},require:["datepicker","?^ngModel"],controller:"DatepickerController",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f)}}}).directive("daypicker",["dateFilter",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/day.html",require:"^datepicker",link:function(b,c,d,e){function f(a,b){return 1!==b||a%4!==0||a%100===0&&a%400!==0?i[b]:29}function g(a,b){var c=new Array(b),d=new Date(a),e=0;for(d.setHours(12);b>e;)c[e++]=new Date(d),d.setDate(d.getDate()+1);return c}function h(a){var b=new Date(a);b.setDate(b.getDate()+4-(b.getDay()||7));var c=b.getTime();return b.setMonth(0),b.setDate(1),Math.floor(Math.round((c-b)/864e5)/7)+1}b.showWeeks=e.showWeeks,e.step={months:1},e.element=c;var i=[31,28,31,30,31,30,31,31,30,31,30,31];e._refreshView=function(){var c=e.activeDate.getFullYear(),d=e.activeDate.getMonth(),f=new Date(c,d,1),i=e.startingDay-f.getDay(),j=i>0?7-i:-i,k=new Date(f);j>0&&k.setDate(-j+1);for(var l=g(k,42),m=0;42>m;m++)l[m]=angular.extend(e.createDateObject(l[m],e.formatDay),{secondary:l[m].getMonth()!==d,uid:b.uniqueId+"-"+m});b.labels=new Array(7);for(var n=0;7>n;n++)b.labels[n]={abbr:a(l[n].date,e.formatDayHeader),full:a(l[n].date,"EEEE")};if(b.title=a(e.activeDate,e.formatDayTitle),b.rows=e.split(l,7),b.showWeeks){b.weekNumbers=[];for(var o=h(b.rows[0][0].date),p=b.rows.length;b.weekNumbers.push(o++)<p;);}},e.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate())-new Date(b.getFullYear(),b.getMonth(),b.getDate())},e.handleKeyDown=function(a){var b=e.activeDate.getDate();if("left"===a)b-=1;else if("up"===a)b-=7;else if("right"===a)b+=1;else if("down"===a)b+=7;else if("pageup"===a||"pagedown"===a){var c=e.activeDate.getMonth()+("pageup"===a?-1:1);e.activeDate.setMonth(c,1),b=Math.min(f(e.activeDate.getFullYear(),e.activeDate.getMonth()),b)}else"home"===a?b=1:"end"===a&&(b=f(e.activeDate.getFullYear(),e.activeDate.getMonth()));e.activeDate.setDate(b)},e.refreshView()}}}]).directive("monthpicker",["dateFilter",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/month.html",require:"^datepicker",link:function(b,c,d,e){e.step={years:1},e.element=c,e._refreshView=function(){for(var c=new Array(12),d=e.activeDate.getFullYear(),f=0;12>f;f++)c[f]=angular.extend(e.createDateObject(new Date(d,f,1),e.formatMonth),{uid:b.uniqueId+"-"+f});b.title=a(e.activeDate,e.formatMonthTitle),b.rows=e.split(c,3)},e.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth())-new Date(b.getFullYear(),b.getMonth())},e.handleKeyDown=function(a){var b=e.activeDate.getMonth();if("left"===a)b-=1;else if("up"===a)b-=3;else if("right"===a)b+=1;else if("down"===a)b+=3;else if("pageup"===a||"pagedown"===a){var c=e.activeDate.getFullYear()+("pageup"===a?-1:1);e.activeDate.setFullYear(c)}else"home"===a?b=0:"end"===a&&(b=11);e.activeDate.setMonth(b)},e.refreshView()}}}]).directive("yearpicker",["dateFilter",function(){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/year.html",require:"^datepicker",link:function(a,b,c,d){function e(a){return parseInt((a-1)/f,10)*f+1}var f=d.yearRange;d.step={years:f},d.element=b,d._refreshView=function(){for(var b=new Array(f),c=0,g=e(d.activeDate.getFullYear());f>c;c++)b[c]=angular.extend(d.createDateObject(new Date(g+c,0,1),d.formatYear),{uid:a.uniqueId+"-"+c});a.title=[b[0].label,b[f-1].label].join(" - "),a.rows=d.split(b,5)},d.compare=function(a,b){return a.getFullYear()-b.getFullYear()},d.handleKeyDown=function(a){var b=d.activeDate.getFullYear();"left"===a?b-=1:"up"===a?b-=5:"right"===a?b+=1:"down"===a?b+=5:"pageup"===a||"pagedown"===a?b+=("pageup"===a?-1:1)*d.step.years:"home"===a?b=e(d.activeDate.getFullYear()):"end"===a&&(b=e(d.activeDate.getFullYear())+f-1),d.activeDate.setFullYear(b)},d.refreshView()}}}]).constant("datepickerPopupConfig",{datepickerPopup:"yyyy-MM-dd",currentText:"Today",clearText:"Clear",closeText:"Done",closeOnDateSelection:!0,appendToBody:!1,showButtonBar:!0}).directive("datepickerPopup",["$compile","$parse","$document","$position","dateFilter","dateParser","datepickerPopupConfig",function(a,b,c,d,e,f,g){return{restrict:"EA",require:"ngModel",scope:{isOpen:"=?",currentText:"@",clearText:"@",closeText:"@",dateDisabled:"&"},link:function(h,i,j,k){function l(a){return a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()})}function m(a){if(a){if(angular.isDate(a)&&!isNaN(a))return k.$setValidity("date",!0),a;if(angular.isString(a)){var b=f.parse(a,n)||new Date(a);return isNaN(b)?void k.$setValidity("date",!1):(k.$setValidity("date",!0),b)}return void k.$setValidity("date",!1)}return k.$setValidity("date",!0),null}var n,o=angular.isDefined(j.closeOnDateSelection)?h.$parent.$eval(j.closeOnDateSelection):g.closeOnDateSelection,p=angular.isDefined(j.datepickerAppendToBody)?h.$parent.$eval(j.datepickerAppendToBody):g.appendToBody;h.showButtonBar=angular.isDefined(j.showButtonBar)?h.$parent.$eval(j.showButtonBar):g.showButtonBar,h.getText=function(a){return h[a+"Text"]||g[a+"Text"]},j.$observe("datepickerPopup",function(a){n=a||g.datepickerPopup,k.$render()});var q=angular.element("<div datepicker-popup-wrap><div datepicker></div></div>");q.attr({"ng-model":"date","ng-change":"dateSelection()"});var r=angular.element(q.children()[0]);j.datepickerOptions&&angular.forEach(h.$parent.$eval(j.datepickerOptions),function(a,b){r.attr(l(b),a)}),angular.forEach(["minDate","maxDate"],function(a){j[a]&&(h.$parent.$watch(b(j[a]),function(b){h[a]=b}),r.attr(l(a),a))}),j.dateDisabled&&r.attr("date-disabled","dateDisabled({ date: date, mode: mode })"),k.$parsers.unshift(m),h.dateSelection=function(a){angular.isDefined(a)&&(h.date=a),k.$setViewValue(h.date),k.$render(),o&&(h.isOpen=!1,i[0].focus())},i.bind("input change keyup",function(){h.$apply(function(){h.date=k.$modelValue})}),k.$render=function(){var a=k.$viewValue?e(k.$viewValue,n):"";i.val(a),h.date=m(k.$modelValue)};var s=function(a){h.isOpen&&a.target!==i[0]&&h.$apply(function(){h.isOpen=!1})},t=function(a){h.keydown(a)};i.bind("keydown",t),h.keydown=function(a){27===a.which?(a.preventDefault(),a.stopPropagation(),h.close()):40!==a.which||h.isOpen||(h.isOpen=!0)},h.$watch("isOpen",function(a){a?(h.$broadcast("datepicker.focus"),h.position=p?d.offset(i):d.position(i),h.position.top=h.position.top+i.prop("offsetHeight"),c.bind("click",s)):c.unbind("click",s)}),h.select=function(a){if("today"===a){var b=new Date;angular.isDate(k.$modelValue)?(a=new Date(k.$modelValue),a.setFullYear(b.getFullYear(),b.getMonth(),b.getDate())):a=new Date(b.setHours(0,0,0,0))}h.dateSelection(a)},h.close=function(){h.isOpen=!1,i[0].focus()};var u=a(q)(h);p?c.find("body").append(u):i.after(u),h.$on("$destroy",function(){u.remove(),i.unbind("keydown",t),c.unbind("click",s)})}}}]).directive("datepickerPopupWrap",function(){return{restrict:"EA",replace:!0,transclude:!0,templateUrl:"template/datepicker/popup.html",link:function(a,b){b.bind("click",function(a){a.preventDefault(),a.stopPropagation()})}}}),angular.module("ui.bootstrap.dropdown",[]).constant("dropdownConfig",{openClass:"open"}).service("dropdownService",["$document",function(a){var b=null;this.open=function(e){b||(a.bind("click",c),a.bind("keydown",d)),b&&b!==e&&(b.isOpen=!1),b=e},this.close=function(e){b===e&&(b=null,a.unbind("click",c),a.unbind("keydown",d))};var c=function(a){a&&a.isDefaultPrevented()||b.$apply(function(){b.isOpen=!1})},d=function(a){27===a.which&&(b.focusToggleElement(),c())}}]).controller("DropdownController",["$scope","$attrs","$parse","dropdownConfig","dropdownService","$animate",function(a,b,c,d,e,f){var g,h=this,i=a.$new(),j=d.openClass,k=angular.noop,l=b.onToggle?c(b.onToggle):angular.noop;this.init=function(d){h.$element=d,b.isOpen&&(g=c(b.isOpen),k=g.assign,a.$watch(g,function(a){i.isOpen=!!a}))},this.toggle=function(a){return i.isOpen=arguments.length?!!a:!i.isOpen},this.isOpen=function(){return i.isOpen},i.focusToggleElement=function(){h.toggleElement&&h.toggleElement[0].focus()},i.$watch("isOpen",function(b,c){f[b?"addClass":"removeClass"](h.$element,j),b?(i.focusToggleElement(),e.open(i)):e.close(i),k(a,b),angular.isDefined(b)&&b!==c&&l(a,{open:!!b})}),a.$on("$locationChangeSuccess",function(){i.isOpen=!1}),a.$on("$destroy",function(){i.$destroy()})}]).directive("dropdown",function(){return{restrict:"CA",controller:"DropdownController",link:function(a,b,c,d){d.init(b)}}}).directive("dropdownToggle",function(){return{restrict:"CA",require:"?^dropdown",link:function(a,b,c,d){if(d){d.toggleElement=b;var e=function(e){e.preventDefault(),b.hasClass("disabled")||c.disabled||a.$apply(function(){d.toggle()})};b.bind("click",e),b.attr({"aria-haspopup":!0,"aria-expanded":!1}),a.$watch(d.isOpen,function(a){b.attr("aria-expanded",!!a)}),a.$on("$destroy",function(){b.unbind("click",e)})}}}}),angular.module("ui.bootstrap.modal",["ui.bootstrap.transition"]).factory("$$stackedMap",function(){return{createNew:function(){var a=[];return{add:function(b,c){a.push({key:b,value:c})},get:function(b){for(var c=0;c<a.length;c++)if(b==a[c].key)return a[c]},keys:function(){for(var b=[],c=0;c<a.length;c++)b.push(a[c].key);return b},top:function(){return a[a.length-1]},remove:function(b){for(var c=-1,d=0;d<a.length;d++)if(b==a[d].key){c=d;break}return a.splice(c,1)[0]},removeTop:function(){return a.splice(a.length-1,1)[0]},length:function(){return a.length}}}}}).directive("modalBackdrop",["$timeout",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/modal/backdrop.html",link:function(b){b.animate=!1,a(function(){b.animate=!0})}}}]).directive("modalWindow",["$modalStack","$timeout",function(a,b){return{restrict:"EA",scope:{index:"@",animate:"="},replace:!0,transclude:!0,templateUrl:function(a,b){return b.templateUrl||"template/modal/window.html"},link:function(c,d,e){d.addClass(e.windowClass||""),c.size=e.size,b(function(){c.animate=!0,d[0].focus()}),c.close=function(b){var c=a.getTop();c&&c.value.backdrop&&"static"!=c.value.backdrop&&b.target===b.currentTarget&&(b.preventDefault(),b.stopPropagation(),a.dismiss(c.key,"backdrop click"))}}}}]).factory("$modalStack",["$transition","$timeout","$document","$compile","$rootScope","$$stackedMap",function(a,b,c,d,e,f){function g(){for(var a=-1,b=n.keys(),c=0;c<b.length;c++)n.get(b[c]).value.backdrop&&(a=c);return a}function h(a){var b=c.find("body").eq(0),d=n.get(a).value;n.remove(a),j(d.modalDomEl,d.modalScope,300,function(){d.modalScope.$destroy(),b.toggleClass(m,n.length()>0),i()})}function i(){if(k&&-1==g()){var a=l;j(k,l,150,function(){a.$destroy(),a=null}),k=void 0,l=void 0}}function j(c,d,e,f){function g(){g.done||(g.done=!0,c.remove(),f&&f())}d.animate=!1;var h=a.transitionEndEventName;if(h){var i=b(g,e);c.bind(h,function(){b.cancel(i),g(),d.$apply()})}else b(g,0)}var k,l,m="modal-open",n=f.createNew(),o={};return e.$watch(g,function(a){l&&(l.index=a)}),c.bind("keydown",function(a){var b;27===a.which&&(b=n.top(),b&&b.value.keyboard&&(a.preventDefault(),e.$apply(function(){o.dismiss(b.key,"escape key press")})))}),o.open=function(a,b){n.add(a,{deferred:b.deferred,modalScope:b.scope,backdrop:b.backdrop,keyboard:b.keyboard});var f=c.find("body").eq(0),h=g();h>=0&&!k&&(l=e.$new(!0),l.index=h,k=d("<div modal-backdrop></div>")(l),f.append(k));var i=angular.element("<div modal-window></div>");i.attr({"template-url":b.windowTemplateUrl,"window-class":b.windowClass,size:b.size,index:n.length()-1,animate:"animate"}).html(b.content);var j=d(i)(b.scope);n.top().value.modalDomEl=j,f.append(j),f.addClass(m)},o.close=function(a,b){var c=n.get(a).value;c&&(c.deferred.resolve(b),h(a))},o.dismiss=function(a,b){var c=n.get(a).value;c&&(c.deferred.reject(b),h(a))},o.dismissAll=function(a){for(var b=this.getTop();b;)this.dismiss(b.key,a),b=this.getTop()},o.getTop=function(){return n.top()},o}]).provider("$modal",function(){var a={options:{backdrop:!0,keyboard:!0},$get:["$injector","$rootScope","$q","$http","$templateCache","$controller","$modalStack",function(b,c,d,e,f,g,h){function i(a){return a.template?d.when(a.template):e.get(a.templateUrl,{cache:f}).then(function(a){return a.data})}function j(a){var c=[];return angular.forEach(a,function(a){(angular.isFunction(a)||angular.isArray(a))&&c.push(d.when(b.invoke(a)))}),c}var k={};return k.open=function(b){var e=d.defer(),f=d.defer(),k={result:e.promise,opened:f.promise,close:function(a){h.close(k,a)},dismiss:function(a){h.dismiss(k,a)}};if(b=angular.extend({},a.options,b),b.resolve=b.resolve||{},!b.template&&!b.templateUrl)throw new Error("One of template or templateUrl options is required.");var l=d.all([i(b)].concat(j(b.resolve)));return l.then(function(a){var d=(b.scope||c).$new();d.$close=k.close,d.$dismiss=k.dismiss;var f,i={},j=1;b.controller&&(i.$scope=d,i.$modalInstance=k,angular.forEach(b.resolve,function(b,c){i[c]=a[j++]}),f=g(b.controller,i)),h.open(k,{scope:d,deferred:e,content:a[0],backdrop:b.backdrop,keyboard:b.keyboard,windowClass:b.windowClass,windowTemplateUrl:b.windowTemplateUrl,size:b.size})},function(a){e.reject(a)}),l.then(function(){f.resolve(!0)},function(){f.reject(!1)}),k},k}]};return a}),angular.module("ui.bootstrap.pagination",[]).controller("PaginationController",["$scope","$attrs","$parse",function(a,b,c){var d=this,e={$setViewValue:angular.noop},f=b.numPages?c(b.numPages).assign:angular.noop;this.init=function(f,g){e=f,this.config=g,e.$render=function(){d.render()},b.itemsPerPage?a.$parent.$watch(c(b.itemsPerPage),function(b){d.itemsPerPage=parseInt(b,10),a.totalPages=d.calculateTotalPages()}):this.itemsPerPage=g.itemsPerPage},this.calculateTotalPages=function(){var b=this.itemsPerPage<1?1:Math.ceil(a.totalItems/this.itemsPerPage);return Math.max(b||0,1)},this.render=function(){a.page=parseInt(e.$viewValue,10)||1},a.selectPage=function(b){a.page!==b&&b>0&&b<=a.totalPages&&(e.$setViewValue(b),e.$render())},a.getText=function(b){return a[b+"Text"]||d.config[b+"Text"]},a.noPrevious=function(){return 1===a.page},a.noNext=function(){return a.page===a.totalPages},a.$watch("totalItems",function(){a.totalPages=d.calculateTotalPages()}),a.$watch("totalPages",function(b){f(a.$parent,b),a.page>b?a.selectPage(b):e.$render()})}]).constant("paginationConfig",{itemsPerPage:10,boundaryLinks:!1,directionLinks:!0,firstText:"First",previousText:"Previous",nextText:"Next",lastText:"Last",rotate:!0}).directive("pagination",["$parse","paginationConfig",function(a,b){return{restrict:"EA",scope:{totalItems:"=",firstText:"@",previousText:"@",nextText:"@",lastText:"@"},require:["pagination","?ngModel"],controller:"PaginationController",templateUrl:"template/pagination/pagination.html",replace:!0,link:function(c,d,e,f){function g(a,b,c){return{number:a,text:b,active:c}}function h(a,b){var c=[],d=1,e=b,f=angular.isDefined(k)&&b>k;f&&(l?(d=Math.max(a-Math.floor(k/2),1),e=d+k-1,e>b&&(e=b,d=e-k+1)):(d=(Math.ceil(a/k)-1)*k+1,e=Math.min(d+k-1,b)));for(var h=d;e>=h;h++){var i=g(h,h,h===a);c.push(i)}if(f&&!l){if(d>1){var j=g(d-1,"...",!1);c.unshift(j)}if(b>e){var m=g(e+1,"...",!1);c.push(m)}}return c}var i=f[0],j=f[1];if(j){var k=angular.isDefined(e.maxSize)?c.$parent.$eval(e.maxSize):b.maxSize,l=angular.isDefined(e.rotate)?c.$parent.$eval(e.rotate):b.rotate;c.boundaryLinks=angular.isDefined(e.boundaryLinks)?c.$parent.$eval(e.boundaryLinks):b.boundaryLinks,c.directionLinks=angular.isDefined(e.directionLinks)?c.$parent.$eval(e.directionLinks):b.directionLinks,i.init(j,b),e.maxSize&&c.$parent.$watch(a(e.maxSize),function(a){k=parseInt(a,10),i.render()});var m=i.render;i.render=function(){m(),c.page>0&&c.page<=c.totalPages&&(c.pages=h(c.page,c.totalPages))}}}}}]).constant("pagerConfig",{itemsPerPage:10,previousText:"« Previous",nextText:"Next »",align:!0}).directive("pager",["pagerConfig",function(a){return{restrict:"EA",scope:{totalItems:"=",previousText:"@",nextText:"@"},require:["pager","?ngModel"],controller:"PaginationController",templateUrl:"template/pagination/pager.html",replace:!0,link:function(b,c,d,e){var f=e[0],g=e[1];g&&(b.align=angular.isDefined(d.align)?b.$parent.$eval(d.align):a.align,f.init(g,a))}}}]),angular.module("ui.bootstrap.tooltip",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).provider("$tooltip",function(){function a(a){var b=/[A-Z]/g,c="-";
--return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",animation:!0,popupDelay:0},c={mouseenter:"mouseleave",click:"click",focus:"blur"},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$parse","$document","$position","$interpolate",function(e,f,g,h,i,j,k){return function(e,l,m){function n(a){var b=a||o.trigger||m,d=c[b]||b;return{show:b,hide:d}}var o=angular.extend({},b,d),p=a(e),q=k.startSymbol(),r=k.endSymbol(),s="<div "+p+'-popup title="'+q+"tt_title"+r+'" content="'+q+"tt_content"+r+'" placement="'+q+"tt_placement"+r+'" animation="tt_animation" is-open="tt_isOpen"></div>';return{restrict:"EA",scope:!0,compile:function(){var a=f(s);return function(b,c,d){function f(){b.tt_isOpen?m():k()}function k(){(!y||b.$eval(d[l+"Enable"]))&&(b.tt_popupDelay?v||(v=g(p,b.tt_popupDelay,!1),v.then(function(a){a()})):p()())}function m(){b.$apply(function(){q()})}function p(){return v=null,u&&(g.cancel(u),u=null),b.tt_content?(r(),t.css({top:0,left:0,display:"block"}),w?i.find("body").append(t):c.after(t),z(),b.tt_isOpen=!0,b.$digest(),z):angular.noop}function q(){b.tt_isOpen=!1,g.cancel(v),v=null,b.tt_animation?u||(u=g(s,500)):s()}function r(){t&&s(),t=a(b,function(){}),b.$digest()}function s(){u=null,t&&(t.remove(),t=null)}var t,u,v,w=angular.isDefined(o.appendToBody)?o.appendToBody:!1,x=n(void 0),y=angular.isDefined(d[l+"Enable"]),z=function(){var a=j.positionElements(c,t,b.tt_placement,w);a.top+="px",a.left+="px",t.css(a)};b.tt_isOpen=!1,d.$observe(e,function(a){b.tt_content=a,!a&&b.tt_isOpen&&q()}),d.$observe(l+"Title",function(a){b.tt_title=a}),d.$observe(l+"Placement",function(a){b.tt_placement=angular.isDefined(a)?a:o.placement}),d.$observe(l+"PopupDelay",function(a){var c=parseInt(a,10);b.tt_popupDelay=isNaN(c)?o.popupDelay:c});var A=function(){c.unbind(x.show,k),c.unbind(x.hide,m)};d.$observe(l+"Trigger",function(a){A(),x=n(a),x.show===x.hide?c.bind(x.show,f):(c.bind(x.show,k),c.bind(x.hide,m))});var B=b.$eval(d[l+"Animation"]);b.tt_animation=angular.isDefined(B)?!!B:o.animation,d.$observe(l+"AppendToBody",function(a){w=angular.isDefined(a)?h(a)(b):w}),w&&b.$on("$locationChangeSuccess",function(){b.tt_isOpen&&q()}),b.$on("$destroy",function(){g.cancel(u),g.cancel(v),A(),s()})}}}}}]}).directive("tooltipPopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-popup.html"}}).directive("tooltip",["$tooltip",function(a){return a("tooltip","tooltip","mouseenter")}]).directive("tooltipHtmlUnsafePopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-unsafe-popup.html"}}).directive("tooltipHtmlUnsafe",["$tooltip",function(a){return a("tooltipHtmlUnsafe","tooltip","mouseenter")}]),angular.module("ui.bootstrap.popover",["ui.bootstrap.tooltip"]).directive("popoverPopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/popover/popover.html"}}).directive("popover",["$tooltip",function(a){return a("popover","popover","click")}]),angular.module("ui.bootstrap.progressbar",[]).constant("progressConfig",{animate:!0,max:100}).controller("ProgressController",["$scope","$attrs","progressConfig",function(a,b,c){var d=this,e=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.bars=[],a.max=angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max,this.addBar=function(b,c){e||c.css({transition:"none"}),this.bars.push(b),b.$watch("value",function(c){b.percent=+(100*c/a.max).toFixed(2)}),b.$on("$destroy",function(){c=null,d.removeBar(b)})},this.removeBar=function(a){this.bars.splice(this.bars.indexOf(a),1)}}]).directive("progress",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",require:"progress",scope:{},templateUrl:"template/progressbar/progress.html"}}).directive("bar",function(){return{restrict:"EA",replace:!0,transclude:!0,require:"^progress",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b)}}}).directive("progressbar",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]))}}}),angular.module("ui.bootstrap.rating",[]).constant("ratingConfig",{max:5,stateOn:null,stateOff:null}).controller("RatingController",["$scope","$attrs","ratingConfig",function(a,b,c){var d={$setViewValue:angular.noop};this.init=function(e){d=e,d.$render=this.render,this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):c.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):c.stateOff;var f=angular.isDefined(b.ratingStates)?a.$parent.$eval(b.ratingStates):new Array(angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max);a.range=this.buildTemplateObjects(f)},this.buildTemplateObjects=function(a){for(var b=0,c=a.length;c>b;b++)a[b]=angular.extend({index:b},{stateOn:this.stateOn,stateOff:this.stateOff},a[b]);return a},a.rate=function(b){!a.readonly&&b>=0&&b<=a.range.length&&(d.$setViewValue(b),d.$render())},a.enter=function(b){a.readonly||(a.value=b),a.onHover({value:b})},a.reset=function(){a.value=d.$viewValue,a.onLeave()},a.onKeydown=function(b){/(37|38|39|40)/.test(b.which)&&(b.preventDefault(),b.stopPropagation(),a.rate(a.value+(38===b.which||39===b.which?1:-1)))},this.render=function(){a.value=d.$viewValue}}]).directive("rating",function(){return{restrict:"EA",require:["rating","ngModel"],scope:{readonly:"=?",onHover:"&",onLeave:"&"},controller:"RatingController",templateUrl:"template/rating/rating.html",replace:!0,link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f)}}}),angular.module("ui.bootstrap.tabs",[]).controller("TabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(b){b.active&&b!==a&&(b.active=!1,b.onDeselect())}),a.active=!0,a.onSelect()},b.addTab=function(a){c.push(a),1===c.length?a.active=!0:a.active&&b.select(a)},b.removeTab=function(a){var d=c.indexOf(a);if(a.active&&c.length>1){var e=d==c.length-1?d-1:d+1;b.select(c[e])}c.splice(d,1)}}]).directive("tabset",function(){return{restrict:"EA",transclude:!0,replace:!0,scope:{type:"@"},controller:"TabsetController",templateUrl:"template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1}}}).directive("tab",["$parse",function(a){return{require:"^tabset",restrict:"EA",replace:!0,templateUrl:"template/tabs/tab.html",transclude:!0,scope:{active:"=?",heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},compile:function(b,c,d){return function(b,c,e,f){b.$watch("active",function(a){a&&f.select(b)}),b.disabled=!1,e.disabled&&b.$parent.$watch(a(e.disabled),function(a){b.disabled=!!a}),b.select=function(){b.disabled||(b.active=!0)},f.addTab(b),b.$on("$destroy",function(){f.removeTab(b)}),b.$transcludeFn=d}}}}]).directive("tabHeadingTransclude",[function(){return{restrict:"A",require:"^tab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}]).directive("tabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("tab-heading")||a.hasAttribute("data-tab-heading")||"tab-heading"===a.tagName.toLowerCase()||"data-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^tabset",link:function(b,c,d){var e=b.$eval(d.tabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("ui.bootstrap.timepicker",[]).constant("timepickerConfig",{hourStep:1,minuteStep:1,showMeridian:!0,meridians:null,readonlyInput:!1,mousewheel:!0}).controller("TimepickerController",["$scope","$attrs","$parse","$log","$locale","timepickerConfig",function(a,b,c,d,e,f){function g(){var b=parseInt(a.hours,10),c=a.showMeridian?b>0&&13>b:b>=0&&24>b;return c?(a.showMeridian&&(12===b&&(b=0),a.meridian===p[1]&&(b+=12)),b):void 0}function h(){var b=parseInt(a.minutes,10);return b>=0&&60>b?b:void 0}function i(a){return angular.isDefined(a)&&a.toString().length<2?"0"+a:a}function j(a){k(),o.$setViewValue(new Date(n)),l(a)}function k(){o.$setValidity("time",!0),a.invalidHours=!1,a.invalidMinutes=!1}function l(b){var c=n.getHours(),d=n.getMinutes();a.showMeridian&&(c=0===c||12===c?12:c%12),a.hours="h"===b?c:i(c),a.minutes="m"===b?d:i(d),a.meridian=n.getHours()<12?p[0]:p[1]}function m(a){var b=new Date(n.getTime()+6e4*a);n.setHours(b.getHours(),b.getMinutes()),j()}var n=new Date,o={$setViewValue:angular.noop},p=angular.isDefined(b.meridians)?a.$parent.$eval(b.meridians):f.meridians||e.DATETIME_FORMATS.AMPMS;this.init=function(c,d){o=c,o.$render=this.render;var e=d.eq(0),g=d.eq(1),h=angular.isDefined(b.mousewheel)?a.$parent.$eval(b.mousewheel):f.mousewheel;h&&this.setupMousewheelEvents(e,g),a.readonlyInput=angular.isDefined(b.readonlyInput)?a.$parent.$eval(b.readonlyInput):f.readonlyInput,this.setupInputEvents(e,g)};var q=f.hourStep;b.hourStep&&a.$parent.$watch(c(b.hourStep),function(a){q=parseInt(a,10)});var r=f.minuteStep;b.minuteStep&&a.$parent.$watch(c(b.minuteStep),function(a){r=parseInt(a,10)}),a.showMeridian=f.showMeridian,b.showMeridian&&a.$parent.$watch(c(b.showMeridian),function(b){if(a.showMeridian=!!b,o.$error.time){var c=g(),d=h();angular.isDefined(c)&&angular.isDefined(d)&&(n.setHours(c),j())}else l()}),this.setupMousewheelEvents=function(b,c){var d=function(a){a.originalEvent&&(a=a.originalEvent);var b=a.wheelDelta?a.wheelDelta:-a.deltaY;return a.detail||b>0};b.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementHours():a.decrementHours()),b.preventDefault()}),c.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementMinutes():a.decrementMinutes()),b.preventDefault()})},this.setupInputEvents=function(b,c){if(a.readonlyInput)return a.updateHours=angular.noop,void(a.updateMinutes=angular.noop);var d=function(b,c){o.$setViewValue(null),o.$setValidity("time",!1),angular.isDefined(b)&&(a.invalidHours=b),angular.isDefined(c)&&(a.invalidMinutes=c)};a.updateHours=function(){var a=g();angular.isDefined(a)?(n.setHours(a),j("h")):d(!0)},b.bind("blur",function(){!a.invalidHours&&a.hours<10&&a.$apply(function(){a.hours=i(a.hours)})}),a.updateMinutes=function(){var a=h();angular.isDefined(a)?(n.setMinutes(a),j("m")):d(void 0,!0)},c.bind("blur",function(){!a.invalidMinutes&&a.minutes<10&&a.$apply(function(){a.minutes=i(a.minutes)})})},this.render=function(){var a=o.$modelValue?new Date(o.$modelValue):null;isNaN(a)?(o.$setValidity("time",!1),d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')):(a&&(n=a),k(),l())},a.incrementHours=function(){m(60*q)},a.decrementHours=function(){m(60*-q)},a.incrementMinutes=function(){m(r)},a.decrementMinutes=function(){m(-r)},a.toggleMeridian=function(){m(720*(n.getHours()<12?1:-1))}}]).directive("timepicker",function(){return{restrict:"EA",require:["timepicker","?^ngModel"],controller:"TimepickerController",replace:!0,scope:{},templateUrl:"template/timepicker/timepicker.html",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f,b.find("input"))}}}),angular.module("ui.bootstrap.typeahead",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).factory("typeaheadParser",["$parse",function(a){var b=/^\s*(.*?)(?:\s+as\s+(.*?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+(.*)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "'+c+'".');return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).directive("typeahead",["$compile","$parse","$q","$timeout","$document","$position","typeaheadParser",function(a,b,c,d,e,f,g){var h=[9,13,27,38,40];return{require:"ngModel",link:function(i,j,k,l){var m,n=i.$eval(k.typeaheadMinLength)||1,o=i.$eval(k.typeaheadWaitMs)||0,p=i.$eval(k.typeaheadEditable)!==!1,q=b(k.typeaheadLoading).assign||angular.noop,r=b(k.typeaheadOnSelect),s=k.typeaheadInputFormatter?b(k.typeaheadInputFormatter):void 0,t=k.typeaheadAppendToBody?i.$eval(k.typeaheadAppendToBody):!1,u=b(k.ngModel).assign,v=g.parse(k.typeahead),w=i.$new();i.$on("$destroy",function(){w.$destroy()});var x="typeahead-"+w.$id+"-"+Math.floor(1e4*Math.random());j.attr({"aria-autocomplete":"list","aria-expanded":!1,"aria-owns":x});var y=angular.element("<div typeahead-popup></div>");y.attr({id:x,matches:"matches",active:"activeIdx",select:"select(activeIdx)",query:"query",position:"position"}),angular.isDefined(k.typeaheadTemplateUrl)&&y.attr("template-url",k.typeaheadTemplateUrl);var z=function(){w.matches=[],w.activeIdx=-1,j.attr("aria-expanded",!1)},A=function(a){return x+"-option-"+a};w.$watch("activeIdx",function(a){0>a?j.removeAttr("aria-activedescendant"):j.attr("aria-activedescendant",A(a))});var B=function(a){var b={$viewValue:a};q(i,!0),c.when(v.source(i,b)).then(function(c){var d=a===l.$viewValue;if(d&&m)if(c.length>0){w.activeIdx=0,w.matches.length=0;for(var e=0;e<c.length;e++)b[v.itemName]=c[e],w.matches.push({id:A(e),label:v.viewMapper(w,b),model:c[e]});w.query=a,w.position=t?f.offset(j):f.position(j),w.position.top=w.position.top+j.prop("offsetHeight"),j.attr("aria-expanded",!0)}else z();d&&q(i,!1)},function(){z(),q(i,!1)})};z(),w.query=void 0;var C;l.$parsers.unshift(function(a){return m=!0,a&&a.length>=n?o>0?(C&&d.cancel(C),C=d(function(){B(a)},o)):B(a):(q(i,!1),z()),p?a:a?void l.$setValidity("editable",!1):(l.$setValidity("editable",!0),a)}),l.$formatters.push(function(a){var b,c,d={};return s?(d.$model=a,s(i,d)):(d[v.itemName]=a,b=v.viewMapper(i,d),d[v.itemName]=void 0,c=v.viewMapper(i,d),b!==c?b:a)}),w.select=function(a){var b,c,e={};e[v.itemName]=c=w.matches[a].model,b=v.modelMapper(i,e),u(i,b),l.$setValidity("editable",!0),r(i,{$item:c,$model:b,$label:v.viewMapper(i,e)}),z(),d(function(){j[0].focus()},0,!1)},j.bind("keydown",function(a){0!==w.matches.length&&-1!==h.indexOf(a.which)&&(a.preventDefault(),40===a.which?(w.activeIdx=(w.activeIdx+1)%w.matches.length,w.$digest()):38===a.which?(w.activeIdx=(w.activeIdx?w.activeIdx:w.matches.length)-1,w.$digest()):13===a.which||9===a.which?w.$apply(function(){w.select(w.activeIdx)}):27===a.which&&(a.stopPropagation(),z(),w.$digest()))}),j.bind("blur",function(){m=!1});var D=function(a){j[0]!==a.target&&(z(),w.$digest())};e.bind("click",D),i.$on("$destroy",function(){e.unbind("click",D)});var E=a(y)(w);t?e.find("body").append(E):j.after(E)}}}]).directive("typeaheadPopup",function(){return{restrict:"EA",scope:{matches:"=",query:"=",active:"=",position:"=",select:"&"},replace:!0,templateUrl:"template/typeahead/typeahead-popup.html",link:function(a,b,c){a.templateUrl=c.templateUrl,a.isOpen=function(){return a.matches.length>0},a.isActive=function(b){return a.active==b},a.selectActive=function(b){a.active=b},a.selectMatch=function(b){a.select({activeIdx:b})}}}}).directive("typeaheadMatch",["$http","$templateCache","$compile","$parse",function(a,b,c,d){return{restrict:"EA",scope:{index:"=",match:"=",query:"="},link:function(e,f,g){var h=d(g.templateUrl)(e.$parent)||"template/typeahead/typeahead-match.html";a.get(h,{cache:b}).success(function(a){f.replaceWith(c(a.trim())(e))})}}}]).filter("typeaheadHighlight",function(){function a(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}return function(b,c){return c?(""+b).replace(new RegExp(a(c),"gi"),"<strong>$&</strong>"):b}}),angular.module("template/accordion/accordion-group.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion-group.html",'<div class="panel panel-default">\n  <div class="panel-heading">\n    <h4 class="panel-title">\n      <a class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n    </h4>\n  </div>\n  <div class="panel-collapse" collapse="!isOpen">\n	  <div class="panel-body" ng-transclude></div>\n  </div>\n</div>')}]),angular.module("template/accordion/accordion.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion.html",'<div class="panel-group" ng-transclude></div>')}]),angular.module("template/alert/alert.html",[]).run(["$templateCache",function(a){a.put("template/alert/alert.html",'<div class="alert" ng-class="{\'alert-{{type || \'warning\'}}\': true, \'alert-dismissable\': closeable}" role="alert">\n    <button ng-show="closeable" type="button" class="close" ng-click="close()">\n        <span aria-hidden="true">&times;</span>\n        <span class="sr-only">Close</span>\n    </button>\n    <div ng-transclude></div>\n</div>\n')}]),angular.module("template/carousel/carousel.html",[]).run(["$templateCache",function(a){a.put("template/carousel/carousel.html",'<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n    <ol class="carousel-indicators" ng-show="slides.length > 1">\n        <li ng-repeat="slide in slides track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n    </ol>\n    <div class="carousel-inner" ng-transclude></div>\n    <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n    <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n')}]),angular.module("template/carousel/slide.html",[]).run(["$templateCache",function(a){a.put("template/carousel/slide.html","<div ng-class=\"{\n    'active': leaving || (active && !entering),\n    'prev': (next || active) && direction=='prev',\n    'next': (next || active) && direction=='next',\n    'right': direction=='prev',\n    'left': direction=='next'\n  }\" class=\"item text-center\" ng-transclude></div>\n")}]),angular.module("template/datepicker/datepicker.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/datepicker.html",'<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n  <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n  <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n  <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>')}]),angular.module("template/datepicker/day.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/day.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n    <tr>\n      <th ng-show="showWeeks" class="text-center"></th>\n      <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/month.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/month.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/popup.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/popup.html",'<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n	<li ng-transclude></li>\n	<li ng-if="showButtonBar" style="padding:10px 9px 2px">\n		<span class="btn-group">\n			<button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n			<button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n		</span>\n		<button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n	</li>\n</ul>\n')}]),angular.module("template/datepicker/year.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/year.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("template/modal/backdrop.html",'<div class="modal-backdrop fade"\n     ng-class="{in: animate}"\n     ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n')}]),angular.module("template/modal/window.html",[]).run(["$templateCache",function(a){a.put("template/modal/window.html",'<div tabindex="-1" role="dialog" class="modal fade" ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n    <div class="modal-dialog" ng-class="{\'modal-sm\': size == \'sm\', \'modal-lg\': size == \'lg\'}"><div class="modal-content" ng-transclude></div></div>\n</div>')}]),angular.module("template/pagination/pager.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pager.html",'<ul class="pager">\n  <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1)">{{getText(\'previous\')}}</a></li>\n  <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1)">{{getText(\'next\')}}</a></li>\n</ul>')}]),angular.module("template/pagination/pagination.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pagination.html",'<ul class="pagination">\n  <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1)">{{getText(\'first\')}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1)">{{getText(\'previous\')}}</a></li>\n  <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number)">{{page.text}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1)">{{getText(\'next\')}}</a></li>\n  <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages)">{{getText(\'last\')}}</a></li>\n</ul>')}]),angular.module("template/tooltip/tooltip-html-unsafe-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-html-unsafe-popup.html",'<div class="tooltip {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n')}]),angular.module("template/tooltip/tooltip-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-popup.html",'<div class="tooltip {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n')}]),angular.module("template/popover/popover.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover.html",'<div class="popover {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n      <div class="popover-content" ng-bind="content"></div>\n  </div>\n</div>\n')}]),angular.module("template/progressbar/bar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/bar.html",'<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: percent + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>')}]),angular.module("template/progressbar/progress.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progress.html",'<div class="progress" ng-transclude></div>')}]),angular.module("template/progressbar/progressbar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progressbar.html",'<div class="progress">\n  <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: percent + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>')}]),angular.module("template/rating/rating.html",[]).run(["$templateCache",function(a){a.put("template/rating/rating.html",'<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n    <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n        <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n    </i>\n</span>')}]),angular.module("template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tab.html",'<li ng-class="{active: active, disabled: disabled}">\n  <a ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n')}]),angular.module("template/tabs/tabset-titles.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset-titles.html","<ul class=\"nav {{type && 'nav-' + type}}\" ng-class=\"{'nav-stacked': vertical}\">\n</ul>\n")}]),angular.module("template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset.html",'\n<div>\n  <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n  <div class="tab-content">\n    <div class="tab-pane" \n         ng-repeat="tab in tabs" \n         ng-class="{active: tab.active}"\n         tab-content-transclude="tab">\n    </div>\n  </div>\n</div>\n')}]),angular.module("template/timepicker/timepicker.html",[]).run(["$templateCache",function(a){a.put("template/timepicker/timepicker.html",'<table>\n	<tbody>\n		<tr class="text-center">\n			<td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n		<tr>\n			<td style="width:50px;" class="form-group" ng-class="{\'has-error\': invalidHours}">\n				<input type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-mousewheel="incrementHours()" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td>:</td>\n			<td style="width:50px;" class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n				<input type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n		</tr>\n		<tr class="text-center">\n			<td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n	</tbody>\n</table>\n')}]),angular.module("template/typeahead/typeahead-match.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-match.html",'<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>')}]),angular.module("template/typeahead/typeahead-popup.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-popup.html",'<ul class="dropdown-menu" ng-if="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n    <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n        <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n    </li>\n</ul>')
-+    return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",animation:!0,popupDelay:0},c={mouseenter:"mouseleave",click:"click",focus:"blur"},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$parse","$document","$position","$interpolate",function(e,f,g,h,i,j,k){return function(e,l,m){function n(a){var b=a||o.trigger||m,d=c[b]||b;return{show:b,hide:d}}var o=angular.extend({},b,d),p=a(e),q=k.startSymbol(),r=k.endSymbol(),s="<div "+p+'-popup title="'+q+"tt_title"+r+'" content="'+q+"tt_content"+r+'" placement="'+q+"tt_placement"+r+'" animation="tt_animation" is-open="tt_isOpen"></div>';return{restrict:"EA",scope:!0,compile:function(){var a=f(s);return function(b,c,d){function f(){b.tt_isOpen?m():k()}function k(){(!y||b.$eval(d[l+"Enable"]))&&(b.tt_popupDelay?v||(v=g(p,b.tt_popupDelay,!1),v.then(function(a){a()})):p()())}function m(){b.$apply(function(){q()})}function p(){return v=null,u&&(g.cancel(u),u=null),b.tt_content?(r(),t.css({top:0,left:0,display:"block"}),w?i.find("body").append(t):c.after(t),z(),b.tt_isOpen=!0,b.$digest(),z):angular.noop}function q(){b.tt_isOpen=!1,g.cancel(v),v=null,b.tt_animation?u||(u=g(s,500)):s()}function r(){t&&s(),t=a(b,function(){}),b.$digest()}function s(){u=null,t&&(t.remove(),t=null)}var t,u,v,w=angular.isDefined(o.appendToBody)?o.appendToBody:!1,x=n(void 0),y=angular.isDefined(d[l+"Enable"]),z=function(){var a=j.positionElements(c,t,b.tt_placement,w);a.top+="px",a.left+="px",t.css(a)};b.tt_isOpen=!1,d.$observe(e,function(a){b.tt_content=a,!a&&b.tt_isOpen&&q()}),d.$observe(l+"Title",function(a){b.tt_title=a}),d.$observe(l+"Placement",function(a){b.tt_placement=angular.isDefined(a)?a:o.placement}),d.$observe(l+"PopupDelay",function(a){var c=parseInt(a,10);b.tt_popupDelay=isNaN(c)?o.popupDelay:c});var A=function(){c.unbind(x.show,k),c.unbind(x.hide,m)};d.$observe(l+"Trigger",function(a){A(),x=n(a),x.show===x.hide?c.bind(x.show,f):(c.bind(x.show,k),c.bind(x.hide,m))});var B=b.$eval(d[l+"Animation"]);b.tt_animation=angular.isDefined(B)?!!B:o.animation,d.$observe(l+"AppendToBody",function(a){w=angular.isDefined(a)?h(a)(b):w}),w&&b.$on("$locationChangeSuccess",function(){b.tt_isOpen&&q()}),b.$on("$destroy",function(){g.cancel(u),g.cancel(v),A(),s()})}}}}}]}).directive("tooltipPopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-popup.html"}}).directive("tooltip",["$tooltip",function(a){return a("tooltip","tooltip","mouseenter")}]).directive("tooltipHtmlUnsafePopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-unsafe-popup.html"}}).directive("tooltipHtmlUnsafe",["$tooltip",function(a){return a("tooltipHtmlUnsafe","tooltip","mouseenter")}]),angular.module("ui.bootstrap.popover",["ui.bootstrap.tooltip"]).directive("popoverPopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/popover/popover.html"}}).directive("popover",["$tooltip",function(a){return a("popover","popover","click")}]),angular.module("ui.bootstrap.progressbar",[]).constant("progressConfig",{animate:!0,max:100}).controller("ProgressController",["$scope","$attrs","progressConfig",function(a,b,c){var d=this,e=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.bars=[],a.max=angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max,this.addBar=function(b,c){e||c.css({transition:"none"}),this.bars.push(b),b.$watch("value",function(c){b.percent=+(100*c/a.max).toFixed(2)}),b.$on("$destroy",function(){c=null,d.removeBar(b)})},this.removeBar=function(a){this.bars.splice(this.bars.indexOf(a),1)}}]).directive("progress",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",require:"progress",scope:{},templateUrl:"template/progressbar/progress.html"}}).directive("bar",function(){return{restrict:"EA",replace:!0,transclude:!0,require:"^progress",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b)}}}).directive("progressbar",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]))}}}),angular.module("ui.bootstrap.rating",[]).constant("ratingConfig",{max:5,stateOn:null,stateOff:null}).controller("RatingController",["$scope","$attrs","ratingConfig",function(a,b,c){var d={$setViewValue:angular.noop};this.init=function(e){d=e,d.$render=this.render,this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):c.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):c.stateOff;var f=angular.isDefined(b.ratingStates)?a.$parent.$eval(b.ratingStates):new Array(angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max);a.range=this.buildTemplateObjects(f)},this.buildTemplateObjects=function(a){for(var b=0,c=a.length;c>b;b++)a[b]=angular.extend({index:b},{stateOn:this.stateOn,stateOff:this.stateOff},a[b]);return a},a.rate=function(b){!a.readonly&&b>=0&&b<=a.range.length&&(d.$setViewValue(b),d.$render())},a.enter=function(b){a.readonly||(a.value=b),a.onHover({value:b})},a.reset=function(){a.value=d.$viewValue,a.onLeave()},a.onKeydown=function(b){/(37|38|39|40)/.test(b.which)&&(b.preventDefault(),b.stopPropagation(),a.rate(a.value+(38===b.which||39===b.which?1:-1)))},this.render=function(){a.value=d.$viewValue}}]).directive("rating",function(){return{restrict:"EA",require:["rating","ngModel"],scope:{readonly:"=?",onHover:"&",onLeave:"&"},controller:"RatingController",templateUrl:"template/rating/rating.html",replace:!0,link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f)}}}),angular.module("ui.bootstrap.tabs",[]).controller("TabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(b){b.active&&b!==a&&(b.active=!1,b.onDeselect())}),a.active=!0,a.onSelect()},b.addTab=function(a){c.push(a),1===c.length?a.active=!0:a.active&&b.select(a)},b.removeTab=function(a){var d=c.indexOf(a);if(a.active&&c.length>1){var e=d==c.length-1?d-1:d+1;b.select(c[e])}c.splice(d,1)}}]).directive("tabset",function(){return{restrict:"EA",transclude:!0,replace:!0,scope:{type:"@"},controller:"TabsetController",templateUrl:"template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1}}}).directive("tab",["$parse",function(a){return{require:"^tabset",restrict:"EA",replace:!0,templateUrl:"template/tabs/tab.html",transclude:!0,scope:{active:"=?",heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},compile:function(b,c,d){return function(b,c,e,f){b.$watch("active",function(a){a&&f.select(b)}),b.disabled=!1,e.disabled&&b.$parent.$watch(a(e.disabled),function(a){b.disabled=!!a}),b.select=function(){b.disabled||(b.active=!0)},f.addTab(b),b.$on("$destroy",function(){f.removeTab(b)}),b.$transcludeFn=d}}}}]).directive("tabHeadingTransclude",[function(){return{restrict:"A",require:"^tab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}]).directive("tabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("tab-heading")||a.hasAttribute("data-tab-heading")||"tab-heading"===a.tagName.toLowerCase()||"data-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^tabset",link:function(b,c,d){var e=b.$eval(d.tabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("ui.bootstrap.timepicker",[]).constant("timepickerConfig",{hourStep:1,minuteStep:1,showMeridian:!0,meridians:null,readonlyInput:!1,mousewheel:!0}).controller("TimepickerController",["$scope","$attrs","$parse","$log","$locale","timepickerConfig",function(a,b,c,d,e,f){function g(){var b=parseInt(a.hours,10),c=a.showMeridian?b>0&&13>b:b>=0&&24>b;return c?(a.showMeridian&&(12===b&&(b=0),a.meridian===p[1]&&(b+=12)),b):void 0}function h(){var b=parseInt(a.minutes,10);return b>=0&&60>b?b:void 0}function i(a){return angular.isDefined(a)&&a.toString().length<2?"0"+a:a}function j(a){k(),o.$setViewValue(new Date(n)),l(a)}function k(){o.$setValidity("time",!0),a.invalidHours=!1,a.invalidMinutes=!1}function l(b){var c=n.getHours(),d=n.getMinutes();a.showMeridian&&(c=0===c||12===c?12:c%12),a.hours="h"===b?c:i(c),a.minutes="m"===b?d:i(d),a.meridian=n.getHours()<12?p[0]:p[1]}function m(a){var b=new Date(n.getTime()+6e4*a);n.setHours(b.getHours(),b.getMinutes()),j()}var n=new Date,o={$setViewValue:angular.noop},p=angular.isDefined(b.meridians)?a.$parent.$eval(b.meridians):f.meridians||e.DATETIME_FORMATS.AMPMS;this.init=function(c,d){o=c,o.$render=this.render;var e=d.eq(0),g=d.eq(1),h=angular.isDefined(b.mousewheel)?a.$parent.$eval(b.mousewheel):f.mousewheel;h&&this.setupMousewheelEvents(e,g),a.readonlyInput=angular.isDefined(b.readonlyInput)?a.$parent.$eval(b.readonlyInput):f.readonlyInput,this.setupInputEvents(e,g)};var q=f.hourStep;b.hourStep&&a.$parent.$watch(c(b.hourStep),function(a){q=parseInt(a,10)});var r=f.minuteStep;b.minuteStep&&a.$parent.$watch(c(b.minuteStep),function(a){r=parseInt(a,10)}),a.showMeridian=f.showMeridian,b.showMeridian&&a.$parent.$watch(c(b.showMeridian),function(b){if(a.showMeridian=!!b,o.$error.time){var c=g(),d=h();angular.isDefined(c)&&angular.isDefined(d)&&(n.setHours(c),j())}else l()}),this.setupMousewheelEvents=function(b,c){var d=function(a){a.originalEvent&&(a=a.originalEvent);var b=a.wheelDelta?a.wheelDelta:-a.deltaY;return a.detail||b>0};b.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementHours():a.decrementHours()),b.preventDefault()}),c.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementMinutes():a.decrementMinutes()),b.preventDefault()})},this.setupInputEvents=function(b,c){if(a.readonlyInput)return a.updateHours=angular.noop,void(a.updateMinutes=angular.noop);var d=function(b,c){o.$setViewValue(null),o.$setValidity("time",!1),angular.isDefined(b)&&(a.invalidHours=b),angular.isDefined(c)&&(a.invalidMinutes=c)};a.updateHours=function(){var a=g();angular.isDefined(a)?(n.setHours(a),j("h")):d(!0)},b.bind("blur",function(){!a.invalidHours&&a.hours<10&&a.$apply(function(){a.hours=i(a.hours)})}),a.updateMinutes=function(){var a=h();angular.isDefined(a)?(n.setMinutes(a),j("m")):d(void 0,!0)},c.bind("blur",function(){!a.invalidMinutes&&a.minutes<10&&a.$apply(function(){a.minutes=i(a.minutes)})})},this.render=function(){var a=o.$modelValue?new Date(o.$modelValue):null;isNaN(a)?(o.$setValidity("time",!1),d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')):(a&&(n=a),k(),l())},a.incrementHours=function(){m(60*q)},a.decrementHours=function(){m(60*-q)},a.incrementMinutes=function(){m(r)},a.decrementMinutes=function(){m(-r)},a.toggleMeridian=function(){m(720*(n.getHours()<12?1:-1))}}]).directive("timepicker",function(){return{restrict:"EA",require:["timepicker","?^ngModel"],controller:"TimepickerController",replace:!0,scope:{},templateUrl:"template/timepicker/timepicker.html",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f,b.find("input"))}}}),angular.module("ui.bootstrap.typeahead",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).factory("typeaheadParser",["$parse",function(a){var b=/^\s*(.*?)(?:\s+as\s+(.*?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+(.*)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "'+c+'".');return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).directive("typeahead",["$compile","$parse","$q","$timeout","$document","$position","typeaheadParser",function(a,b,c,d,e,f,g){var h=[9,13,27,38,40];return{require:"ngModel",link:function(i,j,k,l){var m,n=i.$eval(k.typeaheadMinLength)||1,o=i.$eval(k.typeaheadWaitMs)||0,p=i.$eval(k.typeaheadEditable)!==!1,q=b(k.typeaheadLoading).assign||angular.noop,r=b(k.typeaheadOnSelect),s=k.typeaheadInputFormatter?b(k.typeaheadInputFormatter):void 0,t=k.typeaheadAppendToBody?i.$eval(k.typeaheadAppendToBody):!1,u=b(k.ngModel).assign,v=g.parse(k.typeahead),w=i.$new();i.$on("$destroy",function(){w.$destroy()});var x="typeahead-"+w.$id+"-"+Math.floor(1e4*Math.random());j.attr({"aria-autocomplete":"list","aria-expanded":!1,"aria-owns":x});var y=angular.element("<div typeahead-popup></div>");y.attr({id:x,matches:"matches",active:"activeIdx",select:"select(activeIdx)",query:"query",position:"position"}),angular.isDefined(k.typeaheadTemplateUrl)&&y.attr("template-url",k.typeaheadTemplateUrl);var z=function(){w.matches=[],w.activeIdx=-1,j.attr("aria-expanded",!1)},A=function(a){return x+"-option-"+a};w.$watch("activeIdx",function(a){0>a?j.removeAttr("aria-activedescendant"):j.attr("aria-activedescendant",A(a))});var B=function(a){var b={$viewValue:a};q(i,!0),c.when(v.source(i,b)).then(function(c){var d=a===l.$viewValue;if(d&&m)if(c.length>0){w.activeIdx=0,w.matches.length=0;for(var e=0;e<c.length;e++)b[v.itemName]=c[e],w.matches.push({id:A(e),label:v.viewMapper(w,b),model:c[e]});w.query=a,w.position=t?f.offset(j):f.position(j),w.position.top=w.position.top+j.prop("offsetHeight"),j.attr("aria-expanded",!0)}else z();d&&q(i,!1)},function(){z(),q(i,!1)})};z(),w.query=void 0;var C;l.$parsers.unshift(function(a){return m=!0,a&&a.length>=n?o>0?(C&&d.cancel(C),C=d(function(){B(a)},o)):B(a):(q(i,!1),z()),p?a:a?void l.$setValidity("editable",!1):(l.$setValidity("editable",!0),a)}),l.$formatters.push(function(a){var b,c,d={};return s?(d.$model=a,s(i,d)):(d[v.itemName]=a,b=v.viewMapper(i,d),d[v.itemName]=void 0,c=v.viewMapper(i,d),b!==c?b:a)}),w.select=function(a){var b,c,e={};e[v.itemName]=c=w.matches[a].model,b=v.modelMapper(i,e),u(i,b),l.$setValidity("editable",!0),r(i,{$item:c,$model:b,$label:v.viewMapper(i,e)}),z(),d(function(){j[0].focus()},0,!1)},j.bind("keydown",function(a){0!==w.matches.length&&-1!==h.indexOf(a.which)&&(a.preventDefault(),40===a.which?(w.activeIdx=(w.activeIdx+1)%w.matches.length,w.$digest()):38===a.which?(w.activeIdx=(w.activeIdx?w.activeIdx:w.matches.length)-1,w.$digest()):13===a.which||9===a.which?w.$apply(function(){w.select(w.activeIdx)}):27===a.which&&(a.stopPropagation(),z(),w.$digest()))}),j.bind("blur",function(){m=!1});var D=function(a){j[0]!==a.target&&(z(),w.$digest())};e.bind("click",D),i.$on("$destroy",function(){e.unbind("click",D)});var E=a(y)(w);t?e.find("body").append(E):j.after(E)}}}]).directive("typeaheadPopup",function(){return{restrict:"EA",scope:{matches:"=",query:"=",active:"=",position:"=",select:"&"},replace:!0,templateUrl:"template/typeahead/typeahead-popup.html",link:function(a,b,c){a.templateUrl=c.templateUrl,a.isOpen=function(){return a.matches.length>0},a.isActive=function(b){return a.active==b},a.selectActive=function(b){a.active=b},a.selectMatch=function(b){a.select({activeIdx:b})}}}}).directive("typeaheadMatch",["$http","$templateCache","$compile","$parse",function(a,b,c,d){return{restrict:"EA",scope:{index:"=",match:"=",query:"="},link:function(e,f,g){var h=d(g.templateUrl)(e.$parent)||"template/typeahead/typeahead-match.html";a.get(h,{cache:b}).success(function(a){f.replaceWith(c(a.trim())(e))})}}}]).filter("typeaheadHighlight",function(){function a(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}return function(b,c){return c?(""+b).replace(new RegExp(a(c),"gi"),"<strong>$&</strong>"):b}}),angular.module("template/accordion/accordion-group.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion-group.html",'<div class="panel panel-default">\n  <div class="panel-heading">\n    <h4 class="panel-title">\n      <a class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n    </h4>\n  </div>\n  <div class="panel-collapse" collapse="!isOpen">\n	  <div class="panel-body" ng-transclude></div>\n  </div>\n</div>')}]),angular.module("template/accordion/accordion.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion.html",'<div class="panel-group" ng-transclude></div>')}]),angular.module("template/alert/alert.html",[]).run(["$templateCache",function(a){a.put("template/alert/alert.html",'<div class="alert" ng-class="{\'alert-{{type || \'warning\'}}\': true, \'alert-dismissable\': closeable}" role="alert">\n    <button ng-show="closeable" type="button" class="close" ng-click="close()">\n        <span aria-hidden="true">&times;</span>\n        <span class="sr-only">Close</span>\n    </button>\n    <div ng-transclude></div>\n</div>\n')}]),angular.module("template/carousel/carousel.html",[]).run(["$templateCache",function(a){a.put("template/carousel/carousel.html",'<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n    <ol class="carousel-indicators" ng-show="slides.length > 1">\n        <li ng-repeat="slide in slides track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n    </ol>\n    <div class="carousel-inner" ng-transclude></div>\n    <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n    <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n')}]),angular.module("template/carousel/slide.html",[]).run(["$templateCache",function(a){a.put("template/carousel/slide.html","<div ng-class=\"{\n    'active': leaving || (active && !entering),\n    'prev': (next || active) && direction=='prev',\n    'next': (next || active) && direction=='next',\n    'right': direction=='prev',\n    'left': direction=='next'\n  }\" class=\"item text-center\" ng-transclude></div>\n")}]),angular.module("template/datepicker/datepicker.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/datepicker.html",'<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n  <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n  <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n  <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>')}]),angular.module("template/datepicker/day.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/day.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n    <tr>\n      <th ng-show="showWeeks" class="text-center"></th>\n      <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/month.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/month.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/popup.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/popup.html",'<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n	<li ng-transclude></li>\n	<li ng-if="showButtonBar" style="padding:10px 9px 2px">\n		<span class="btn-group">\n			<button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n			<button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n		</span>\n		<button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n	</li>\n</ul>\n')}]),angular.module("template/datepicker/year.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/year.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("template/modal/backdrop.html",'<div class="modal-backdrop fade"\n     ng-class="{in: animate}"\n     ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n')}]),angular.module("template/modal/window.html",[]).run(["$templateCache",function(a){a.put("template/modal/window.html",'<div tabindex="-1" role="dialog" class="modal fade" ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n    <div class="modal-dialog" ng-class="{\'modal-sm\': size == \'sm\', \'modal-lg\': size == \'lg\'}"><div class="modal-content" ng-transclude></div></div>\n</div>')}]),angular.module("template/pagination/pager.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pager.html",'<ul class="pager">\n  <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1)">{{getText(\'previous\')}}</a></li>\n  <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1)">{{getText(\'next\')}}</a></li>\n</ul>')}]),angular.module("template/pagination/pagination.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pagination.html",'<ul class="pagination">\n  <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1)">{{getText(\'first\')}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1)">{{getText(\'previous\')}}</a></li>\n  <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number)">{{page.text}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1)">{{getText(\'next\')}}</a></li>\n  <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages)">{{getText(\'last\')}}</a></li>\n</ul>')}]),angular.module("template/tooltip/tooltip-html-unsafe-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-html-unsafe-popup.html",'<div class="tooltip {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n')}]),angular.module("template/tooltip/tooltip-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-popup.html",'<div class="tooltip {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n')}]),angular.module("template/popover/popover.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover.html",'<div class="popover {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n      <div class="popover-content" ng-bind="content"></div>\n  </div>\n</div>\n')}]),angular.module("template/progressbar/bar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/bar.html",'<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: percent + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>')}]),angular.module("template/progressbar/progress.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progress.html",'<div class="progress" ng-transclude></div>')}]),angular.module("template/progressbar/progressbar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progressbar.html",'<div class="progress">\n  <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: percent + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>')}]),angular.module("template/rating/rating.html",[]).run(["$templateCache",function(a){a.put("template/rating/rating.html",'<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n    <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n        <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n    </i>\n</span>')}]),angular.module("template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tab.html",'<li ng-class="{active: active, disabled: disabled}">\n  <a ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n')}]),angular.module("template/tabs/tabset-titles.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset-titles.html","<ul class=\"nav {{type && 'nav-' + type}}\" ng-class=\"{'nav-stacked': vertical}\">\n</ul>\n")}]),angular.module("template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset.html",'\n<div>\n  <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n  <div class="tab-content">\n    <div class="tab-pane" \n         ng-repeat="tab in tabs" \n         ng-class="{active: tab.active}"\n         tab-content-transclude="tab">\n    </div>\n  </div>\n</div>\n')}]),angular.module("template/timepicker/timepicker.html",[]).run(["$templateCache",function(a){a.put("template/timepicker/timepicker.html",'<table>\n	<tbody>\n		<tr class="text-center">\n			<td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n		<tr>\n			<td style="width:50px;" class="form-group" ng-class="{\'has-error\': invalidHours}">\n				<input type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-mousewheel="incrementHours()" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td>:</td>\n			<td style="width:50px;" class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n				<input type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n		</tr>\n		<tr class="text-center">\n			<td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n	</tbody>\n</table>\n')}]),angular.module("template/typeahead/typeahead-match.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-match.html",'<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>')}]),angular.module("template/typeahead/typeahead-popup.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-popup.html",'<ul class="dropdown-menu" ng-if="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n    <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n        <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n    </li>\n</ul>')
- }]);
-\ No newline at end of file
-diff --git a/setup/pub/angular-ui-router/angular-ui-router.min.js b/setup/pub/angular-ui-router/angular-ui-router.min.js
-index f065ecc9606..66568f91192 100644
---- a/setup/pub/angular-ui-router/angular-ui-router.min.js
-+++ b/setup/pub/angular-ui-router/angular-ui-router.min.js
-@@ -1,7 +1,7 @@
- /**
-  * State-based routing for AngularJS
-- * @version v0.2.10
-+ * @version v0.4.3
-  * @link http://angular-ui.github.com/
-  * @license MIT License, http://www.opensource.org/licenses/MIT
-  */
--"undefined"!=typeof module&&"undefined"!=typeof exports&&module.exports===exports&&(module.exports="ui.router"),function(a,b,c){"use strict";function d(a,b){return I(new(I(function(){},{prototype:a})),b)}function e(a){return H(arguments,function(b){b!==a&&H(b,function(b,c){a.hasOwnProperty(c)||(a[c]=b)})}),a}function f(a,b){var c=[];for(var d in a.path){if(a.path[d]!==b.path[d])break;c.push(a.path[d])}return c}function g(a,b){if(Array.prototype.indexOf)return a.indexOf(b,Number(arguments[2])||0);var c=a.length>>>0,d=Number(arguments[2])||0;for(d=0>d?Math.ceil(d):Math.floor(d),0>d&&(d+=c);c>d;d++)if(d in a&&a[d]===b)return d;return-1}function h(a,b,c,d){var e,h=f(c,d),i={},j=[];for(var k in h)if(h[k].params&&h[k].params.length){e=h[k].params;for(var l in e)g(j,e[l])>=0||(j.push(e[l]),i[e[l]]=a[e[l]])}return I({},i,b)}function i(a,b){var c={};return H(a,function(a){var d=b[a];c[a]=null!=d?String(d):null}),c}function j(a,b,c){if(!c){c=[];for(var d in a)c.push(d)}for(var e=0;e<c.length;e++){var f=c[e];if(a[f]!=b[f])return!1}return!0}function k(a,b){var c={};return H(a,function(a){c[a]=b[a]}),c}function l(a,b){var d=1,f=2,g={},h=[],i=g,j=I(a.when(g),{$$promises:g,$$values:g});this.study=function(g){function k(a,c){if(o[c]!==f){if(n.push(c),o[c]===d)throw n.splice(0,n.indexOf(c)),new Error("Cyclic dependency: "+n.join(" -> "));if(o[c]=d,E(a))m.push(c,[function(){return b.get(a)}],h);else{var e=b.annotate(a);H(e,function(a){a!==c&&g.hasOwnProperty(a)&&k(g[a],a)}),m.push(c,a,e)}n.pop(),o[c]=f}}function l(a){return F(a)&&a.then&&a.$$promises}if(!F(g))throw new Error("'invocables' must be an object");var m=[],n=[],o={};return H(g,k),g=n=o=null,function(d,f,g){function h(){--s||(t||e(r,f.$$values),p.$$values=r,p.$$promises=!0,o.resolve(r))}function k(a){p.$$failure=a,o.reject(a)}function n(c,e,f){function i(a){l.reject(a),k(a)}function j(){if(!C(p.$$failure))try{l.resolve(b.invoke(e,g,r)),l.promise.then(function(a){r[c]=a,h()},i)}catch(a){i(a)}}var l=a.defer(),m=0;H(f,function(a){q.hasOwnProperty(a)&&!d.hasOwnProperty(a)&&(m++,q[a].then(function(b){r[a]=b,--m||j()},i))}),m||j(),q[c]=l.promise}if(l(d)&&g===c&&(g=f,f=d,d=null),d){if(!F(d))throw new Error("'locals' must be an object")}else d=i;if(f){if(!l(f))throw new Error("'parent' must be a promise returned by $resolve.resolve()")}else f=j;var o=a.defer(),p=o.promise,q=p.$$promises={},r=I({},d),s=1+m.length/3,t=!1;if(C(f.$$failure))return k(f.$$failure),p;f.$$values?(t=e(r,f.$$values),h()):(I(q,f.$$promises),f.then(h,k));for(var u=0,v=m.length;v>u;u+=3)d.hasOwnProperty(m[u])?h():n(m[u],m[u+1],m[u+2]);return p}},this.resolve=function(a,b,c,d){return this.study(a)(b,c,d)}}function m(a,b,c){this.fromConfig=function(a,b,c){return C(a.template)?this.fromString(a.template,b):C(a.templateUrl)?this.fromUrl(a.templateUrl,b):C(a.templateProvider)?this.fromProvider(a.templateProvider,b,c):null},this.fromString=function(a,b){return D(a)?a(b):a},this.fromUrl=function(c,d){return D(c)&&(c=c(d)),null==c?null:a.get(c,{cache:b}).then(function(a){return a.data})},this.fromProvider=function(a,b,d){return c.invoke(a,null,d||{params:b})}}function n(a){function b(b){if(!/^\w+(-+\w+)*$/.test(b))throw new Error("Invalid parameter name '"+b+"' in pattern '"+a+"'");if(f[b])throw new Error("Duplicate parameter name '"+b+"' in pattern '"+a+"'");f[b]=!0,j.push(b)}function c(a){return a.replace(/[\\\[\]\^$*+?.()|{}]/g,"\\$&")}var d,e=/([:*])(\w+)|\{(\w+)(?:\:((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,f={},g="^",h=0,i=this.segments=[],j=this.params=[];this.source=a;for(var k,l,m;(d=e.exec(a))&&(k=d[2]||d[3],l=d[4]||("*"==d[1]?".*":"[^/]*"),m=a.substring(h,d.index),!(m.indexOf("?")>=0));)g+=c(m)+"("+l+")",b(k),i.push(m),h=e.lastIndex;m=a.substring(h);var n=m.indexOf("?");if(n>=0){var o=this.sourceSearch=m.substring(n);m=m.substring(0,n),this.sourcePath=a.substring(0,h+n),H(o.substring(1).split(/[&?]/),b)}else this.sourcePath=a,this.sourceSearch="";g+=c(m)+"$",i.push(m),this.regexp=new RegExp(g),this.prefix=i[0]}function o(){this.compile=function(a){return new n(a)},this.isMatcher=function(a){return F(a)&&D(a.exec)&&D(a.format)&&D(a.concat)},this.$get=function(){return this}}function p(a){function b(a){var b=/^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(a.source);return null!=b?b[1].replace(/\\(.)/g,"$1"):""}function c(a,b){return a.replace(/\$(\$|\d{1,2})/,function(a,c){return b["$"===c?0:Number(c)]})}function d(a,b,c){if(!c)return!1;var d=a.invoke(b,b,{$match:c});return C(d)?d:!0}var e=[],f=null;this.rule=function(a){if(!D(a))throw new Error("'rule' must be a function");return e.push(a),this},this.otherwise=function(a){if(E(a)){var b=a;a=function(){return b}}else if(!D(a))throw new Error("'rule' must be a function");return f=a,this},this.when=function(e,f){var g,h=E(f);if(E(e)&&(e=a.compile(e)),!h&&!D(f)&&!G(f))throw new Error("invalid 'handler' in when()");var i={matcher:function(b,c){return h&&(g=a.compile(c),c=["$match",function(a){return g.format(a)}]),I(function(a,e){return d(a,c,b.exec(e.path(),e.search()))},{prefix:E(b.prefix)?b.prefix:""})},regex:function(a,e){if(a.global||a.sticky)throw new Error("when() RegExp must not be global or sticky");return h&&(g=e,e=["$match",function(a){return c(g,a)}]),I(function(b,c){return d(b,e,a.exec(c.path()))},{prefix:b(a)})}},j={matcher:a.isMatcher(e),regex:e instanceof RegExp};for(var k in j)if(j[k])return this.rule(i[k](e,f));throw new Error("invalid 'what' in when()")},this.$get=["$location","$rootScope","$injector",function(a,b,c){function d(b){function d(b){var d=b(c,a);return d?(E(d)&&a.replace().url(d),!0):!1}if(!b||!b.defaultPrevented){var g,h=e.length;for(g=0;h>g;g++)if(d(e[g]))return;f&&d(f)}}return b.$on("$locationChangeSuccess",d),{sync:function(){d()}}}]}function q(a,e,f){function g(a){return 0===a.indexOf(".")||0===a.indexOf("^")}function l(a,b){var d=E(a),e=d?a:a.name,f=g(e);if(f){if(!b)throw new Error("No reference point given for path '"+e+"'");for(var h=e.split("."),i=0,j=h.length,k=b;j>i;i++)if(""!==h[i]||0!==i){if("^"!==h[i])break;if(!k.parent)throw new Error("Path '"+e+"' not valid for state '"+b.name+"'");k=k.parent}else k=b;h=h.slice(i).join("."),e=k.name+(k.name&&h?".":"")+h}var l=w[e];return!l||!d&&(d||l!==a&&l.self!==a)?c:l}function m(a,b){x[a]||(x[a]=[]),x[a].push(b)}function n(b){b=d(b,{self:b,resolve:b.resolve||{},toString:function(){return this.name}});var c=b.name;if(!E(c)||c.indexOf("@")>=0)throw new Error("State must have a valid name");if(w.hasOwnProperty(c))throw new Error("State '"+c+"'' is already defined");var e=-1!==c.indexOf(".")?c.substring(0,c.lastIndexOf(".")):E(b.parent)?b.parent:"";if(e&&!w[e])return m(e,b.self);for(var f in z)D(z[f])&&(b[f]=z[f](b,z.$delegates[f]));if(w[c]=b,!b[y]&&b.url&&a.when(b.url,["$match","$stateParams",function(a,c){v.$current.navigable==b&&j(a,c)||v.transitionTo(b,a,{location:!1})}]),x[c])for(var g=0;g<x[c].length;g++)n(x[c][g]);return b}function o(a){return a.indexOf("*")>-1}function p(a){var b=a.split("."),c=v.$current.name.split(".");if("**"===b[0]&&(c=c.slice(c.indexOf(b[1])),c.unshift("**")),"**"===b[b.length-1]&&(c.splice(c.indexOf(b[b.length-2])+1,Number.MAX_VALUE),c.push("**")),b.length!=c.length)return!1;for(var d=0,e=b.length;e>d;d++)"*"===b[d]&&(c[d]="*");return c.join("")===b.join("")}function q(a,b){return E(a)&&!C(b)?z[a]:D(b)&&E(a)?(z[a]&&!z.$delegates[a]&&(z.$delegates[a]=z[a]),z[a]=b,this):this}function r(a,b){return F(a)?b=a:b.name=a,n(b),this}function s(a,e,g,m,n,q,r,s,x){function z(){r.url()!==M&&(r.url(M),r.replace())}function A(a,c,d,f,h){var i=d?c:k(a.params,c),j={$stateParams:i};h.resolve=n.resolve(a.resolve,j,h.resolve,a);var l=[h.resolve.then(function(a){h.globals=a})];return f&&l.push(f),H(a.views,function(c,d){var e=c.resolve&&c.resolve!==a.resolve?c.resolve:{};e.$template=[function(){return g.load(d,{view:c,locals:j,params:i,notify:!1})||""}],l.push(n.resolve(e,j,h.resolve,a).then(function(f){if(D(c.controllerProvider)||G(c.controllerProvider)){var g=b.extend({},e,j);f.$$controller=m.invoke(c.controllerProvider,null,g)}else f.$$controller=c.controller;f.$$state=a,f.$$controllerAs=c.controllerAs,h[d]=f}))}),e.all(l).then(function(){return h})}var B=e.reject(new Error("transition superseded")),F=e.reject(new Error("transition prevented")),K=e.reject(new Error("transition aborted")),L=e.reject(new Error("transition failed")),M=r.url(),N=x.baseHref();return u.locals={resolve:null,globals:{$stateParams:{}}},v={params:{},current:u.self,$current:u,transition:null},v.reload=function(){v.transitionTo(v.current,q,{reload:!0,inherit:!1,notify:!1})},v.go=function(a,b,c){return this.transitionTo(a,b,I({inherit:!0,relative:v.$current},c))},v.transitionTo=function(b,c,f){c=c||{},f=I({location:!0,inherit:!1,relative:null,notify:!0,reload:!1,$retry:!1},f||{});var g,k=v.$current,n=v.params,o=k.path,p=l(b,f.relative);if(!C(p)){var s={to:b,toParams:c,options:f};if(g=a.$broadcast("$stateNotFound",s,k.self,n),g.defaultPrevented)return z(),K;if(g.retry){if(f.$retry)return z(),L;var w=v.transition=e.when(g.retry);return w.then(function(){return w!==v.transition?B:(s.options.$retry=!0,v.transitionTo(s.to,s.toParams,s.options))},function(){return K}),z(),w}if(b=s.to,c=s.toParams,f=s.options,p=l(b,f.relative),!C(p)){if(f.relative)throw new Error("Could not resolve '"+b+"' from state '"+f.relative+"'");throw new Error("No such state '"+b+"'")}}if(p[y])throw new Error("Cannot transition to abstract state '"+b+"'");f.inherit&&(c=h(q,c||{},v.$current,p)),b=p;var x,D,E=b.path,G=u.locals,H=[];for(x=0,D=E[x];D&&D===o[x]&&j(c,n,D.ownParams)&&!f.reload;x++,D=E[x])G=H[x]=D.locals;if(t(b,k,G,f))return b.self.reloadOnSearch!==!1&&z(),v.transition=null,e.when(v.current);if(c=i(b.params,c||{}),f.notify&&(g=a.$broadcast("$stateChangeStart",b.self,c,k.self,n),g.defaultPrevented))return z(),F;for(var N=e.when(G),O=x;O<E.length;O++,D=E[O])G=H[O]=d(G),N=A(D,c,D===b,N,G);var P=v.transition=N.then(function(){var d,e,g;if(v.transition!==P)return B;for(d=o.length-1;d>=x;d--)g=o[d],g.self.onExit&&m.invoke(g.self.onExit,g.self,g.locals.globals),g.locals=null;for(d=x;d<E.length;d++)e=E[d],e.locals=H[d],e.self.onEnter&&m.invoke(e.self.onEnter,e.self,e.locals.globals);if(v.transition!==P)return B;v.$current=b,v.current=b.self,v.params=c,J(v.params,q),v.transition=null;var h=b.navigable;return f.location&&h&&(r.url(h.url.format(h.locals.globals.$stateParams)),"replace"===f.location&&r.replace()),f.notify&&a.$broadcast("$stateChangeSuccess",b.self,c,k.self,n),M=r.url(),v.current},function(d){return v.transition!==P?B:(v.transition=null,a.$broadcast("$stateChangeError",b.self,c,k.self,n,d),z(),e.reject(d))});return P},v.is=function(a,d){var e=l(a);return C(e)?v.$current!==e?!1:C(d)&&null!==d?b.equals(q,d):!0:c},v.includes=function(a,d){if(E(a)&&o(a)){if(!p(a))return!1;a=v.$current.name}var e=l(a);if(!C(e))return c;if(!C(v.$current.includes[e.name]))return!1;var f=!0;return b.forEach(d,function(a,b){C(q[b])&&q[b]===a||(f=!1)}),f},v.href=function(a,b,c){c=I({lossy:!0,inherit:!1,absolute:!1,relative:v.$current},c||{});var d=l(a,c.relative);if(!C(d))return null;b=h(q,b||{},v.$current,d);var e=d&&c.lossy?d.navigable:d,g=e&&e.url?e.url.format(i(d.params,b||{})):null;return!f.html5Mode()&&g&&(g="#"+f.hashPrefix()+g),"/"!==N&&(f.html5Mode()?g=N.slice(0,-1)+g:c.absolute&&(g=N.slice(1)+g)),c.absolute&&g&&(g=r.protocol()+"://"+r.host()+(80==r.port()||443==r.port()?"":":"+r.port())+(!f.html5Mode()&&g?"/":"")+g),g},v.get=function(a,b){if(!C(a)){var c=[];return H(w,function(a){c.push(a.self)}),c}var d=l(a,b);return d&&d.self?d.self:null},v}function t(a,b,c,d){return a!==b||(c!==b.locals||d.reload)&&a.self.reloadOnSearch!==!1?void 0:!0}var u,v,w={},x={},y="abstract",z={parent:function(a){if(C(a.parent)&&a.parent)return l(a.parent);var b=/^(.+)\.[^.]+$/.exec(a.name);return b?l(b[1]):u},data:function(a){return a.parent&&a.parent.data&&(a.data=a.self.data=I({},a.parent.data,a.data)),a.data},url:function(a){var b=a.url;if(E(b))return"^"==b.charAt(0)?e.compile(b.substring(1)):(a.parent.navigable||u).url.concat(b);if(e.isMatcher(b)||null==b)return b;throw new Error("Invalid url '"+b+"' in state '"+a+"'")},navigable:function(a){return a.url?a:a.parent?a.parent.navigable:null},params:function(a){if(!a.params)return a.url?a.url.parameters():a.parent.params;if(!G(a.params))throw new Error("Invalid params in state '"+a+"'");if(a.url)throw new Error("Both params and url specicified in state '"+a+"'");return a.params},views:function(a){var b={};return H(C(a.views)?a.views:{"":a},function(c,d){d.indexOf("@")<0&&(d+="@"+a.parent.name),b[d]=c}),b},ownParams:function(a){if(!a.parent)return a.params;var b={};H(a.params,function(a){b[a]=!0}),H(a.parent.params,function(c){if(!b[c])throw new Error("Missing required parameter '"+c+"' in state '"+a.name+"'");b[c]=!1});var c=[];return H(b,function(a,b){a&&c.push(b)}),c},path:function(a){return a.parent?a.parent.path.concat(a):[]},includes:function(a){var b=a.parent?I({},a.parent.includes):{};return b[a.name]=!0,b},$delegates:{}};u=n({name:"",url:"^",views:null,"abstract":!0}),u.navigable=null,this.decorator=q,this.state=r,this.$get=s,s.$inject=["$rootScope","$q","$view","$injector","$resolve","$stateParams","$location","$urlRouter","$browser"]}function r(){function a(a,b){return{load:function(c,d){var e,f={template:null,controller:null,view:null,locals:null,notify:!0,async:!0,params:{}};return d=I(f,d),d.view&&(e=b.fromConfig(d.view,d.params,d.locals)),e&&d.notify&&a.$broadcast("$viewContentLoading",d),e}}}this.$get=a,a.$inject=["$rootScope","$templateFactory"]}function s(){var a=!1;this.useAnchorScroll=function(){a=!0},this.$get=["$anchorScroll","$timeout",function(b,c){return a?b:function(a){c(function(){a[0].scrollIntoView()},0,!1)}}]}function t(a,c,d){function e(){return c.has?function(a){return c.has(a)?c.get(a):null}:function(a){try{return c.get(a)}catch(b){return null}}}function f(a,b){var c=function(){return{enter:function(a,b,c){b.after(a),c()},leave:function(a,b){a.remove(),b()}}};if(i)return{enter:function(a,b,c){i.enter(a,null,b,c)},leave:function(a,b){i.leave(a,b)}};if(h){var d=h&&h(b,a);return{enter:function(a,b,c){d.enter(a,null,b),c()},leave:function(a,b){d.leave(a),b()}}}return c()}var g=e(),h=g("$animator"),i=g("$animate"),j={restrict:"ECA",terminal:!0,priority:400,transclude:"element",compile:function(c,e,g){return function(c,e,h){function i(){k&&(k.remove(),k=null),m&&(m.$destroy(),m=null),l&&(q.leave(l,function(){k=null}),k=l,l=null)}function j(f){var h=c.$new(),j=l&&l.data("$uiViewName"),k=j&&a.$current&&a.$current.locals[j];if(f||k!==n){var r=g(h,function(a){q.enter(a,e,function(){(b.isDefined(p)&&!p||c.$eval(p))&&d(a)}),i()});n=a.$current.locals[r.data("$uiViewName")],l=r,m=h,m.$emit("$viewContentLoaded"),m.$eval(o)}}var k,l,m,n,o=h.onload||"",p=h.autoscroll,q=f(h,c);c.$on("$stateChangeSuccess",function(){j(!1)}),c.$on("$viewContentLoading",function(){j(!1)}),j(!0)}}};return j}function u(a,b,c){return{restrict:"ECA",priority:-400,compile:function(d){var e=d.html();return function(d,f,g){var h=g.uiView||g.name||"",i=f.inheritedData("$uiView");h.indexOf("@")<0&&(h=h+"@"+(i?i.state.name:"")),f.data("$uiViewName",h);var j=c.$current,k=j&&j.locals[h];if(k){f.data("$uiView",{name:h,state:k.$$state}),f.html(k.$template?k.$template:e);var l=a(f.contents());if(k.$$controller){k.$scope=d;var m=b(k.$$controller,k);k.$$controllerAs&&(d[k.$$controllerAs]=m),f.data("$ngControllerController",m),f.children().data("$ngControllerController",m)}l(d)}}}}}function v(a){var b=a.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!b||4!==b.length)throw new Error("Invalid state ref '"+a+"'");return{state:b[1],paramExpr:b[3]||null}}function w(a){var b=a.parent().inheritedData("$uiView");return b&&b.state&&b.state.name?b.state:void 0}function x(a,c){var d=["location","inherit","reload"];return{restrict:"A",require:"?^uiSrefActive",link:function(e,f,g,h){var i=v(g.uiSref),j=null,k=w(f)||a.$current,l="FORM"===f[0].nodeName,m=l?"action":"href",n=!0,o={relative:k},p=e.$eval(g.uiSrefOpts)||{};b.forEach(d,function(a){a in p&&(o[a]=p[a])});var q=function(b){if(b&&(j=b),n){var c=a.href(i.state,j,o);return h&&h.$$setStateInfo(i.state,j),c?void(f[0][m]=c):(n=!1,!1)}};i.paramExpr&&(e.$watch(i.paramExpr,function(a){a!==j&&q(a)},!0),j=e.$eval(i.paramExpr)),q(),l||f.bind("click",function(b){var d=b.which||b.button;d>1||b.ctrlKey||b.metaKey||b.shiftKey||f.attr("target")||(c(function(){a.go(i.state,j,o)}),b.preventDefault())})}}}function y(a,b,c){return{restrict:"A",controller:["$scope","$element","$attrs",function(d,e,f){function g(){a.$current.self===i&&h()?e.addClass(l):e.removeClass(l)}function h(){return!k||j(k,b)}var i,k,l;l=c(f.uiSrefActive||"",!1)(d),this.$$setStateInfo=function(b,c){i=a.get(b,w(e)),k=c,g()},d.$on("$stateChangeSuccess",g)}]}}function z(a){return function(b){return a.is(b)}}function A(a){return function(b){return a.includes(b)}}function B(a,b){function e(a){this.locals=a.locals.globals,this.params=this.locals.$stateParams}function f(){this.locals=null,this.params=null}function g(c,g){if(null!=g.redirectTo){var h,j=g.redirectTo;if(E(j))h=j;else{if(!D(j))throw new Error("Invalid 'redirectTo' in when()");h=function(a,b){return j(a,b.path(),b.search())}}b.when(c,h)}else a.state(d(g,{parent:null,name:"route:"+encodeURIComponent(c),url:c,onEnter:e,onExit:f}));return i.push(g),this}function h(a,b,d){function e(a){return""!==a.name?a:c}var f={routes:i,params:d,current:c};return b.$on("$stateChangeStart",function(a,c,d,f){b.$broadcast("$routeChangeStart",e(c),e(f))}),b.$on("$stateChangeSuccess",function(a,c,d,g){f.current=e(c),b.$broadcast("$routeChangeSuccess",e(c),e(g)),J(d,f.params)}),b.$on("$stateChangeError",function(a,c,d,f,g,h){b.$broadcast("$routeChangeError",e(c),e(f),h)}),f}var i=[];e.$inject=["$$state"],this.when=g,this.$get=h,h.$inject=["$state","$rootScope","$routeParams"]}var C=b.isDefined,D=b.isFunction,E=b.isString,F=b.isObject,G=b.isArray,H=b.forEach,I=b.extend,J=b.copy;b.module("ui.router.util",["ng"]),b.module("ui.router.router",["ui.router.util"]),b.module("ui.router.state",["ui.router.router","ui.router.util"]),b.module("ui.router",["ui.router.state"]),b.module("ui.router.compat",["ui.router"]),l.$inject=["$q","$injector"],b.module("ui.router.util").service("$resolve",l),m.$inject=["$http","$templateCache","$injector"],b.module("ui.router.util").service("$templateFactory",m),n.prototype.concat=function(a){return new n(this.sourcePath+a+this.sourceSearch)},n.prototype.toString=function(){return this.source},n.prototype.exec=function(a,b){var c=this.regexp.exec(a);if(!c)return null;var d,e=this.params,f=e.length,g=this.segments.length-1,h={};if(g!==c.length-1)throw new Error("Unbalanced capture group in route '"+this.source+"'");for(d=0;g>d;d++)h[e[d]]=c[d+1];for(;f>d;d++)h[e[d]]=b[e[d]];return h},n.prototype.parameters=function(){return this.params},n.prototype.format=function(a){var b=this.segments,c=this.params;if(!a)return b.join("");var d,e,f,g=b.length-1,h=c.length,i=b[0];for(d=0;g>d;d++)f=a[c[d]],null!=f&&(i+=encodeURIComponent(f)),i+=b[d+1];for(;h>d;d++)f=a[c[d]],null!=f&&(i+=(e?"&":"?")+c[d]+"="+encodeURIComponent(f),e=!0);return i},b.module("ui.router.util").provider("$urlMatcherFactory",o),p.$inject=["$urlMatcherFactoryProvider"],b.module("ui.router.router").provider("$urlRouter",p),q.$inject=["$urlRouterProvider","$urlMatcherFactoryProvider","$locationProvider"],b.module("ui.router.state").value("$stateParams",{}).provider("$state",q),r.$inject=[],b.module("ui.router.state").provider("$view",r),b.module("ui.router.state").provider("$uiViewScroll",s),t.$inject=["$state","$injector","$uiViewScroll"],u.$inject=["$compile","$controller","$state"],b.module("ui.router.state").directive("uiView",t),b.module("ui.router.state").directive("uiView",u),x.$inject=["$state","$timeout"],y.$inject=["$state","$stateParams","$interpolate"],b.module("ui.router.state").directive("uiSref",x).directive("uiSrefActive",y),z.$inject=["$state"],A.$inject=["$state"],b.module("ui.router.state").filter("isState",z).filter("includedByState",A),B.$inject=["$stateProvider","$urlRouterProvider"],b.module("ui.router.compat").provider("$route",B).directive("ngView",t)}(window,window.angular);
-\ No newline at end of file
-+"undefined"!=typeof module&&"undefined"!=typeof exports&&module.exports===exports&&(module.exports="ui.router"),function(a,b,c){"use strict";function d(a,b){return T(new(T(function(){},{prototype:a})),b)}function e(a){return S(arguments,function(b){b!==a&&S(b,function(b,c){a.hasOwnProperty(c)||(a[c]=b)})}),a}function f(a,b){var c=[];for(var d in a.path){if(a.path[d]!==b.path[d])break;c.push(a.path[d])}return c}function g(a){if(Object.keys)return Object.keys(a);var b=[];return S(a,function(a,c){b.push(c)}),b}function h(a,b){if(Array.prototype.indexOf)return a.indexOf(b,Number(arguments[2])||0);var c=a.length>>>0,d=Number(arguments[2])||0;for(d=d<0?Math.ceil(d):Math.floor(d),d<0&&(d+=c);d<c;d++)if(d in a&&a[d]===b)return d;return-1}function i(a,b,c,d){var e,i=f(c,d),j={},k=[];for(var l in i)if(i[l]&&i[l].params&&(e=g(i[l].params),e.length))for(var m in e)h(k,e[m])>=0||(k.push(e[m]),j[e[m]]=a[e[m]]);return T({},j,b)}function j(a,b,c){if(!c){c=[];for(var d in a)c.push(d)}for(var e=0;e<c.length;e++){var f=c[e];if(a[f]!=b[f])return!1}return!0}function k(a,b){var c={};return S(a,function(a){c[a]=b[a]}),c}function l(a){var b={},c=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));return S(c,function(c){c in a&&(b[c]=a[c])}),b}function m(a){var b={},c=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));for(var d in a)-1==h(c,d)&&(b[d]=a[d]);return b}function n(a,b){var c=R(a),d=c?[]:{};return S(a,function(a,e){b(a,e)&&(d[c?d.length:e]=a)}),d}function o(a,b){var c=R(a)?[]:{};return S(a,function(a,d){c[d]=b(a,d)}),c}function p(a){return a.then(c,function(){})&&a}function q(a,b){var d=1,f=2,i={},j=[],k=i,l=T(a.when(i),{$$promises:i,$$values:i});this.study=function(i){function n(a,c){if(t[c]!==f){if(s.push(c),t[c]===d)throw s.splice(0,h(s,c)),new Error("Cyclic dependency: "+s.join(" -> "));if(t[c]=d,P(a))r.push(c,[function(){return b.get(a)}],j);else{var e=b.annotate(a);S(e,function(a){a!==c&&i.hasOwnProperty(a)&&n(i[a],a)}),r.push(c,a,e)}s.pop(),t[c]=f}}function o(a){return Q(a)&&a.then&&a.$$promises}if(!Q(i))throw new Error("'invocables' must be an object");var q=g(i||{}),r=[],s=[],t={};return S(i,n),i=s=t=null,function(d,f,g){function h(){--v||(w||e(u,f.$$values),s.$$values=u,s.$$promises=s.$$promises||!0,delete s.$$inheritedValues,n.resolve(u))}function i(a){s.$$failure=a,n.reject(a)}function j(c,e,f){function j(a){l.reject(a),i(a)}function k(){if(!N(s.$$failure))try{l.resolve(b.invoke(e,g,u)),l.promise.then(function(a){u[c]=a,h()},j)}catch(a){j(a)}}var l=a.defer(),m=0;S(f,function(a){t.hasOwnProperty(a)&&!d.hasOwnProperty(a)&&(m++,t[a].then(function(b){u[a]=b,--m||k()},j))}),m||k(),t[c]=p(l.promise)}if(o(d)&&g===c&&(g=f,f=d,d=null),d){if(!Q(d))throw new Error("'locals' must be an object")}else d=k;if(f){if(!o(f))throw new Error("'parent' must be a promise returned by $resolve.resolve()")}else f=l;var n=a.defer(),s=p(n.promise),t=s.$$promises={},u=T({},d),v=1+r.length/3,w=!1;if(p(s),N(f.$$failure))return i(f.$$failure),s;f.$$inheritedValues&&e(u,m(f.$$inheritedValues,q)),T(t,f.$$promises),f.$$values?(w=e(u,m(f.$$values,q)),s.$$inheritedValues=m(f.$$values,q),h()):(f.$$inheritedValues&&(s.$$inheritedValues=m(f.$$inheritedValues,q)),f.then(h,i));for(var x=0,y=r.length;x<y;x+=3)d.hasOwnProperty(r[x])?h():j(r[x],r[x+1],r[x+2]);return s}},this.resolve=function(a,b,c,d){return this.study(a)(b,c,d)}}function r(){var a=b.version.minor<3;this.shouldUnsafelyUseHttp=function(b){a=!!b},this.$get=["$http","$templateCache","$injector",function(b,c,d){return new s(b,c,d,a)}]}function s(a,b,c,d){this.fromConfig=function(a,b,c){return N(a.template)?this.fromString(a.template,b):N(a.templateUrl)?this.fromUrl(a.templateUrl,b):N(a.templateProvider)?this.fromProvider(a.templateProvider,b,c):null},this.fromString=function(a,b){return O(a)?a(b):a},this.fromUrl=function(e,f){return O(e)&&(e=e(f)),null==e?null:d?a.get(e,{cache:b,headers:{Accept:"text/html"}}).then(function(a){return a.data}):c.get("$templateRequest")(e)},this.fromProvider=function(a,b,d){return c.invoke(a,null,d||{params:b})}}function t(a,b,e){function f(b,c,d,e){if(q.push(b),o[b])return o[b];if(!/^\w+([-.]+\w+)*(?:\[\])?$/.test(b))throw new Error("Invalid parameter name '"+b+"' in pattern '"+a+"'");if(p[b])throw new Error("Duplicate parameter name '"+b+"' in pattern '"+a+"'");return p[b]=new W.Param(b,c,d,e),p[b]}function g(a,b,c,d){var e=["",""],f=a.replace(/[\\\[\]\^$*+?.()|{}]/g,"\\$&");if(!b)return f;switch(c){case!1:e=["(",")"+(d?"?":"")];break;case!0:f=f.replace(/\/$/,""),e=["(?:/(",")|/)?"];break;default:e=["("+c+"|",")?"]}return f+e[0]+b+e[1]}function h(e,f){var g,h,i,j,k;return g=e[2]||e[3],k=b.params[g],i=a.substring(m,e.index),h=f?e[4]:e[4]||("*"==e[1]?".*":null),h&&(j=W.type(h)||d(W.type("string"),{pattern:new RegExp(h,b.caseInsensitive?"i":c)})),{id:g,regexp:h,segment:i,type:j,cfg:k}}b=T({params:{}},Q(b)?b:{});var i,j=/([:*])([\w\[\]]+)|\{([\w\[\]]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,k=/([:]?)([\w\[\].-]+)|\{([\w\[\].-]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,l="^",m=0,n=this.segments=[],o=e?e.params:{},p=this.params=e?e.params.$$new():new W.ParamSet,q=[];this.source=a;for(var r,s,t;(i=j.exec(a))&&(r=h(i,!1),!(r.segment.indexOf("?")>=0));)s=f(r.id,r.type,r.cfg,"path"),l+=g(r.segment,s.type.pattern.source,s.squash,s.isOptional),n.push(r.segment),m=j.lastIndex;t=a.substring(m);var u=t.indexOf("?");if(u>=0){var v=this.sourceSearch=t.substring(u);if(t=t.substring(0,u),this.sourcePath=a.substring(0,m+u),v.length>0)for(m=0;i=k.exec(v);)r=h(i,!0),s=f(r.id,r.type,r.cfg,"search"),m=j.lastIndex}else this.sourcePath=a,this.sourceSearch="";l+=g(t)+(!1===b.strict?"/?":"")+"$",n.push(t),this.regexp=new RegExp(l,b.caseInsensitive?"i":c),this.prefix=n[0],this.$$paramNames=q}function u(a){T(this,a)}function v(){function a(a){return null!=a?a.toString().replace(/(~|\/)/g,function(a){return{"~":"~~","/":"~2F"}[a]}):a}function e(a){return null!=a?a.toString().replace(/(~~|~2F)/g,function(a){return{"~~":"~","~2F":"/"}[a]}):a}function f(){return{strict:p,caseInsensitive:m}}function i(a){return O(a)||R(a)&&O(a[a.length-1])}function j(){for(;w.length;){var a=w.shift();if(a.pattern)throw new Error("You cannot override a type's .pattern at runtime.");b.extend(r[a.name],l.invoke(a.def))}}function k(a){T(this,a||{})}W=this;var l,m=!1,p=!0,q=!1,r={},s=!0,w=[],x={string:{encode:a,decode:e,is:function(a){return null==a||!N(a)||"string"==typeof a},pattern:/[^\/]*/},int:{encode:a,decode:function(a){return parseInt(a,10)},is:function(a){return a!==c&&null!==a&&this.decode(a.toString())===a},pattern:/-?\d+/},bool:{encode:function(a){return a?1:0},decode:function(a){return 0!==parseInt(a,10)},is:function(a){return!0===a||!1===a},pattern:/0|1/},date:{encode:function(a){return this.is(a)?[a.getFullYear(),("0"+(a.getMonth()+1)).slice(-2),("0"+a.getDate()).slice(-2)].join("-"):c},decode:function(a){if(this.is(a))return a;var b=this.capture.exec(a);return b?new Date(b[1],b[2]-1,b[3]):c},is:function(a){return a instanceof Date&&!isNaN(a.valueOf())},equals:function(a,b){return this.is(a)&&this.is(b)&&a.toISOString()===b.toISOString()},pattern:/[0-9]{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])/,capture:/([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/},json:{encode:b.toJson,decode:b.fromJson,is:b.isObject,equals:b.equals,pattern:/[^\/]*/},any:{encode:b.identity,decode:b.identity,equals:b.equals,pattern:/.*/}};v.$$getDefaultValue=function(a){if(!i(a.value))return a.value;if(!l)throw new Error("Injectable functions cannot be called at configuration time");return l.invoke(a.value)},this.caseInsensitive=function(a){return N(a)&&(m=a),m},this.strictMode=function(a){return N(a)&&(p=a),p},this.defaultSquashPolicy=function(a){if(!N(a))return q;if(!0!==a&&!1!==a&&!P(a))throw new Error("Invalid squash policy: "+a+". Valid policies: false, true, arbitrary-string");return q=a,a},this.compile=function(a,b){return new t(a,T(f(),b))},this.isMatcher=function(a){if(!Q(a))return!1;var b=!0;return S(t.prototype,function(c,d){O(c)&&(b=b&&N(a[d])&&O(a[d]))}),b},this.type=function(a,b,c){if(!N(b))return r[a];if(r.hasOwnProperty(a))throw new Error("A type named '"+a+"' has already been defined.");return r[a]=new u(T({name:a},b)),c&&(w.push({name:a,def:c}),s||j()),this},S(x,function(a,b){r[b]=new u(T({name:b},a))}),r=d(r,{}),this.$get=["$injector",function(a){return l=a,s=!1,j(),S(x,function(a,b){r[b]||(r[b]=new u(a))}),this}],this.Param=function(a,d,e,f){function j(a){var b=Q(a)?g(a):[];return-1===h(b,"value")&&-1===h(b,"type")&&-1===h(b,"squash")&&-1===h(b,"array")&&(a={value:a}),a.$$fn=i(a.value)?a.value:function(){return a.value},a}function k(c,d,e){if(c.type&&d)throw new Error("Param '"+a+"' has two type configurations.");return d||(c.type?b.isString(c.type)?r[c.type]:c.type instanceof u?c.type:new u(c.type):"config"===e?r.any:r.string)}function m(){var b={array:"search"===f&&"auto"},c=a.match(/\[\]$/)?{array:!0}:{};return T(b,c,e).array}function p(a,b){var c=a.squash;if(!b||!1===c)return!1;if(!N(c)||null==c)return q;if(!0===c||P(c))return c;throw new Error("Invalid squash policy: '"+c+"'. Valid policies: false, true, or arbitrary string")}function s(a,b,d,e){var f,g,i=[{from:"",to:d||b?c:""},{from:null,to:d||b?c:""}];return f=R(a.replace)?a.replace:[],P(e)&&f.push({from:e,to:c}),g=o(f,function(a){return a.from}),n(i,function(a){return-1===h(g,a.from)}).concat(f)}function t(){if(!l)throw new Error("Injectable functions cannot be called at configuration time");var a=l.invoke(e.$$fn);if(null!==a&&a!==c&&!x.type.is(a))throw new Error("Default value ("+a+") for parameter '"+x.id+"' is not an instance of Type ("+x.type.name+")");return a}function v(a){function b(a){return function(b){return b.from===a}}function c(a){var c=o(n(x.replace,b(a)),function(a){return a.to});return c.length?c[0]:a}return a=c(a),N(a)?x.type.$normalize(a):t()}function w(){return"{Param:"+a+" "+d+" squash: '"+A+"' optional: "+z+"}"}var x=this;e=j(e),d=k(e,d,f);var y=m();d=y?d.$asArray(y,"search"===f):d,"string"!==d.name||y||"path"!==f||e.value!==c||(e.value="");var z=e.value!==c,A=p(e,z),B=s(e,y,z,A);T(this,{id:a,type:d,location:f,array:y,squash:A,replace:B,isOptional:z,value:v,dynamic:c,config:e,toString:w})},k.prototype={$$new:function(){return d(this,T(new k,{$$parent:this}))},$$keys:function(){for(var a=[],b=[],c=this,d=g(k.prototype);c;)b.push(c),c=c.$$parent;return b.reverse(),S(b,function(b){S(g(b),function(b){-1===h(a,b)&&-1===h(d,b)&&a.push(b)})}),a},$$values:function(a){var b={},c=this;return S(c.$$keys(),function(d){b[d]=c[d].value(a&&a[d])}),b},$$equals:function(a,b){var c=!0,d=this;return S(d.$$keys(),function(e){var f=a&&a[e],g=b&&b[e];d[e].type.equals(f,g)||(c=!1)}),c},$$validates:function(a){var d,e,f,g,h,i=this.$$keys();for(d=0;d<i.length&&(e=this[i[d]],(f=a[i[d]])!==c&&null!==f||!e.isOptional);d++){if(g=e.type.$normalize(f),!e.type.is(g))return!1;if(h=e.type.encode(g),b.isString(h)&&!e.type.pattern.exec(h))return!1}return!0},$$parent:c},this.ParamSet=k}function w(a,d){function e(a){var b=/^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(a.source);return null!=b?b[1].replace(/\\(.)/g,"$1"):""}function f(a,b){return a.replace(/\$(\$|\d{1,2})/,function(a,c){return b["$"===c?0:Number(c)]})}function g(a,b,c){if(!c)return!1;var d=a.invoke(b,b,{$match:c});return!N(d)||d}function h(d,e,f,g,h){function m(a,b,c){return"/"===q?a:b?q.slice(0,-1)+a:c?q.slice(1)+a:a}function n(a){function b(a){var b=a(f,d);return!!b&&(P(b)&&d.replace().url(b),!0)}if(!a||!a.defaultPrevented){p&&d.url();p=c;var e,g=j.length;for(e=0;e<g;e++)if(b(j[e]))return;k&&b(k)}}function o(){return i=i||e.$on("$locationChangeSuccess",n)}var p,q=g.baseHref(),r=d.url();return l||o(),{sync:function(){n()},listen:function(){return o()},update:function(a){if(a)return void(r=d.url());d.url()!==r&&(d.url(r),d.replace())},push:function(a,b,e){var f=a.format(b||{});null!==f&&b&&b["#"]&&(f+="#"+b["#"]),d.url(f),p=e&&e.$$avoidResync?d.url():c,e&&e.replace&&d.replace()},href:function(c,e,f){if(!c.validates(e))return null;var g=a.html5Mode();b.isObject(g)&&(g=g.enabled),g=g&&h.history;var i=c.format(e);if(f=f||{},g||null===i||(i="#"+a.hashPrefix()+i),null!==i&&e&&e["#"]&&(i+="#"+e["#"]),i=m(i,g,f.absolute),!f.absolute||!i)return i;var j=!g&&i?"/":"",k=d.port();return k=80===k||443===k?"":":"+k,[d.protocol(),"://",d.host(),k,j,i].join("")}}}var i,j=[],k=null,l=!1;this.rule=function(a){if(!O(a))throw new Error("'rule' must be a function");return j.push(a),this},this.otherwise=function(a){if(P(a)){var b=a;a=function(){return b}}else if(!O(a))throw new Error("'rule' must be a function");return k=a,this},this.when=function(a,b){var c,h=P(b);if(P(a)&&(a=d.compile(a)),!h&&!O(b)&&!R(b))throw new Error("invalid 'handler' in when()");var i={matcher:function(a,b){return h&&(c=d.compile(b),b=["$match",function(a){return c.format(a)}]),T(function(c,d){return g(c,b,a.exec(d.path(),d.search()))},{prefix:P(a.prefix)?a.prefix:""})},regex:function(a,b){if(a.global||a.sticky)throw new Error("when() RegExp must not be global or sticky");return h&&(c=b,b=["$match",function(a){return f(c,a)}]),T(function(c,d){return g(c,b,a.exec(d.path()))},{prefix:e(a)})}},j={matcher:d.isMatcher(a),regex:a instanceof RegExp};for(var k in j)if(j[k])return this.rule(i[k](a,b));throw new Error("invalid 'what' in when()")},this.deferIntercept=function(a){a===c&&(a=!0),l=a},this.$get=h,h.$inject=["$location","$rootScope","$injector","$browser","$sniffer"]}function x(a,e){function f(a){return 0===a.indexOf(".")||0===a.indexOf("^")}function m(a,b){if(!a)return c;var d=P(a),e=d?a:a.name;if(f(e)){if(!b)throw new Error("No reference point given for path '"+e+"'");b=m(b);for(var g=e.split("."),h=0,i=g.length,j=b;h<i;h++)if(""!==g[h]||0!==h){if("^"!==g[h])break;if(!j.parent)throw new Error("Path '"+e+"' not valid for state '"+b.name+"'");j=j.parent}else j=b;g=g.slice(h).join("."),e=j.name+(j.name&&g?".":"")+g}var k=A[e];return!k||!d&&(d||k!==a&&k.self!==a)?c:k}function n(a,b){B[a]||(B[a]=[]),B[a].push(b)}function q(a){for(var b=B[a]||[];b.length;)r(b.shift())}function r(b){b=d(b,{self:b,resolve:b.resolve||{},toString:function(){return this.name}});var c=b.name;if(!P(c)||c.indexOf("@")>=0)throw new Error("State must have a valid name");if(A.hasOwnProperty(c))throw new Error("State '"+c+"' is already defined");var e=-1!==c.indexOf(".")?c.substring(0,c.lastIndexOf(".")):P(b.parent)?b.parent:Q(b.parent)&&P(b.parent.name)?b.parent.name:"";if(e&&!A[e])return n(e,b.self);for(var f in D)O(D[f])&&(b[f]=D[f](b,D.$delegates[f]));return A[c]=b,!b[C]&&b.url&&a.when(b.url,["$match","$stateParams",function(a,c){z.$current.navigable==b&&j(a,c)||z.transitionTo(b,a,{inherit:!0,location:!1})}]),q(c),b}function s(a){return a.indexOf("*")>-1}function t(a){for(var b=a.split("."),c=z.$current.name.split("."),d=0,e=b.length;d<e;d++)"*"===b[d]&&(c[d]="*");return"**"===b[0]&&(c=c.slice(h(c,b[1])),c.unshift("**")),"**"===b[b.length-1]&&(c.splice(h(c,b[b.length-2])+1,Number.MAX_VALUE),c.push("**")),b.length==c.length&&c.join("")===b.join("")}function u(a,b){return P(a)&&!N(b)?D[a]:O(b)&&P(a)?(D[a]&&!D.$delegates[a]&&(D.$delegates[a]=D[a]),D[a]=b,this):this}function v(a,b){return Q(a)?b=a:b.name=a,r(b),this}function w(a,e,f,h,j,l,n,q,r){function u(b,c,d,f){var g=a.$broadcast("$stateNotFound",b,c,d);if(g.defaultPrevented)return n.update(),E;if(!g.retry)return null;if(f.$retry)return n.update(),F;var h=z.transition=e.when(g.retry);return h.then(function(){return h!==z.transition?(a.$broadcast("$stateChangeCancel",b.to,b.toParams,c,d),B):(b.options.$retry=!0,z.transitionTo(b.to,b.toParams,b.options))},function(){return E}),n.update(),h}function v(a,c,d,g,i,l){function m(){var c=[];return S(a.views,function(d,e){var g=d.resolve&&d.resolve!==a.resolve?d.resolve:{};g.$template=[function(){return f.load(e,{view:d,locals:i.globals,params:n,notify:l.notify})||""}],c.push(j.resolve(g,i.globals,i.resolve,a).then(function(c){if(O(d.controllerProvider)||R(d.controllerProvider)){var f=b.extend({},g,i.globals);c.$$controller=h.invoke(d.controllerProvider,null,f)}else c.$$controller=d.controller;c.$$state=a,c.$$controllerAs=d.controllerAs,c.$$resolveAs=d.resolveAs,i[e]=c}))}),e.all(c).then(function(){return i.globals})}var n=d?c:k(a.params.$$keys(),c),o={$stateParams:n};i.resolve=j.resolve(a.resolve,o,i.resolve,a);var p=[i.resolve.then(function(a){i.globals=a})];return g&&p.push(g),e.all(p).then(m).then(function(a){return i})}var w=new Error("transition superseded"),B=p(e.reject(w)),D=p(e.reject(new Error("transition prevented"))),E=p(e.reject(new Error("transition aborted"))),F=p(e.reject(new Error("transition failed")));return y.locals={resolve:null,globals:{$stateParams:{}}},z={params:{},current:y.self,$current:y,transition:null},z.reload=function(a){return z.transitionTo(z.current,l,{reload:a||!0,inherit:!1,notify:!0})},z.go=function(a,b,c){return z.transitionTo(a,b,T({inherit:!0,relative:z.$current},c))},z.transitionTo=function(b,c,f){c=c||{},f=T({location:!0,inherit:!1,relative:null,notify:!0,reload:!1,$retry:!1},f||{});var g,j=z.$current,o=z.params,q=j.path,r=m(b,f.relative),s=c["#"];if(!N(r)){var t={to:b,toParams:c,options:f},A=u(t,j.self,o,f);if(A)return A;if(b=t.to,c=t.toParams,f=t.options,r=m(b,f.relative),!N(r)){if(!f.relative)throw new Error("No such state '"+b+"'");throw new Error("Could not resolve '"+b+"' from state '"+f.relative+"'")}}if(r[C])throw new Error("Cannot transition to abstract state '"+b+"'");if(f.inherit&&(c=i(l,c||{},z.$current,r)),!r.params.$$validates(c))return F;c=r.params.$$values(c),b=r;var E=b.path,G=0,H=E[G],I=y.locals,J=[];if(f.reload){if(P(f.reload)||Q(f.reload)){if(Q(f.reload)&&!f.reload.name)throw new Error("Invalid reload state object");var K=!0===f.reload?q[0]:m(f.reload);if(f.reload&&!K)throw new Error("No such reload state '"+(P(f.reload)?f.reload:f.reload.name)+"'");for(;H&&H===q[G]&&H!==K;)I=J[G]=H.locals,G++,H=E[G]}}else for(;H&&H===q[G]&&H.ownParams.$$equals(c,o);)I=J[G]=H.locals,G++,H=E[G];if(x(b,c,j,o,I,f))return s&&(c["#"]=s),z.params=c,U(z.params,l),U(k(b.params.$$keys(),l),b.locals.globals.$stateParams),f.location&&b.navigable&&b.navigable.url&&(n.push(b.navigable.url,c,{$$avoidResync:!0,replace:"replace"===f.location}),n.update(!0)),z.transition=null,e.when(z.current);if(c=k(b.params.$$keys(),c||{}),s&&(c["#"]=s),f.notify&&a.$broadcast("$stateChangeStart",b.self,c,j.self,o,f).defaultPrevented)return a.$broadcast("$stateChangeCancel",b.self,c,j.self,o),null==z.transition&&n.update(),D;for(var L=e.when(I),M=G;M<E.length;M++,H=E[M])I=J[M]=d(I),L=v(H,c,H===b,L,I,f);var O=z.transition=L.then(function(){var d,e,g;if(z.transition!==O)return a.$broadcast("$stateChangeCancel",b.self,c,j.self,o),B;for(d=q.length-1;d>=G;d--)g=q[d],g.self.onExit&&h.invoke(g.self.onExit,g.self,g.locals.globals),g.locals=null;for(d=G;d<E.length;d++)e=E[d],e.locals=J[d],e.self.onEnter&&h.invoke(e.self.onEnter,e.self,e.locals.globals);return z.transition!==O?(a.$broadcast("$stateChangeCancel",b.self,c,j.self,o),B):(z.$current=b,z.current=b.self,z.params=c,U(z.params,l),z.transition=null,f.location&&b.navigable&&n.push(b.navigable.url,b.navigable.locals.globals.$stateParams,{$$avoidResync:!0,replace:"replace"===f.location}),f.notify&&a.$broadcast("$stateChangeSuccess",b.self,c,j.self,o),n.update(!0),z.current)}).then(null,function(d){return d===w?B:z.transition!==O?(a.$broadcast("$stateChangeCancel",b.self,c,j.self,o),B):(z.transition=null,g=a.$broadcast("$stateChangeError",b.self,c,j.self,o,d),g.defaultPrevented||n.update(),e.reject(d))});return p(O),O},z.is=function(a,b,d){d=T({relative:z.$current},d||{});var e=m(a,d.relative);return N(e)?z.$current===e&&(!b||g(b).reduce(function(a,c){var d=e.params[c];return a&&(!d||d.type.equals(l[c],b[c]))},!0)):c},z.includes=function(a,b,d){if(d=T({relative:z.$current},d||{}),P(a)&&s(a)){if(!t(a))return!1;a=z.$current.name}var e=m(a,d.relative);if(!N(e))return c;if(!N(z.$current.includes[e.name]))return!1;if(!b)return!0;for(var f=g(b),h=0;h<f.length;h++){var i=f[h],j=e.params[i];if(j&&!j.type.equals(l[i],b[i]))return!1}return g(b).reduce(function(a,c){var d=e.params[c];return a&&!d||d.type.equals(l[c],b[c])},!0)},z.href=function(a,b,d){d=T({lossy:!0,inherit:!0,absolute:!1,relative:z.$current},d||{});var e=m(a,d.relative);if(!N(e))return null;d.inherit&&(b=i(l,b||{},z.$current,e));var f=e&&d.lossy?e.navigable:e;return f&&f.url!==c&&null!==f.url?n.href(f.url,k(e.params.$$keys().concat("#"),b||{}),{absolute:d.absolute}):null},z.get=function(a,b){if(0===arguments.length)return o(g(A),function(a){return A[a].self});var c=m(a,b||z.$current);return c&&c.self?c.self:null},z}function x(a,b,c,d,e,f){function g(a,b,c){function d(b){return"search"!=a.params[b].location}var e=a.params.$$keys().filter(d),f=l.apply({},[a.params].concat(e));return new W.ParamSet(f).$$equals(b,c)}if(!f.reload&&a===c&&(e===c.locals||!1===a.self.reloadOnSearch&&g(c,d,b)))return!0}var y,z,A={},B={},C="abstract",D={parent:function(a){if(N(a.parent)&&a.parent)return m(a.parent);var b=/^(.+)\.[^.]+$/.exec(a.name);return b?m(b[1]):y},data:function(a){return a.parent&&a.parent.data&&(a.data=a.self.data=d(a.parent.data,a.data)),a.data},url:function(a){var b=a.url,c={params:a.params||{}};if(P(b))return"^"==b.charAt(0)?e.compile(b.substring(1),c):(a.parent.navigable||y).url.concat(b,c);if(!b||e.isMatcher(b))return b;throw new Error("Invalid url '"+b+"' in state '"+a+"'")},navigable:function(a){return a.url?a:a.parent?a.parent.navigable:null},ownParams:function(a){var b=a.url&&a.url.params||new W.ParamSet;return S(a.params||{},function(a,c){b[c]||(b[c]=new W.Param(c,null,a,"config"))}),b},params:function(a){var b=l(a.ownParams,a.ownParams.$$keys());return a.parent&&a.parent.params?T(a.parent.params.$$new(),b):new W.ParamSet},views:function(a){var b={};return S(N(a.views)?a.views:{"":a},function(c,d){d.indexOf("@")<0&&(d+="@"+a.parent.name),c.resolveAs=c.resolveAs||a.resolveAs||"$resolve",b[d]=c}),b},path:function(a){return a.parent?a.parent.path.concat(a):[]},includes:function(a){var b=a.parent?T({},a.parent.includes):{};return b[a.name]=!0,b},$delegates:{}};y=r({name:"",url:"^",views:null,abstract:!0}),y.navigable=null,this.decorator=u,this.state=v,this.$get=w,w.$inject=["$rootScope","$q","$view","$injector","$resolve","$stateParams","$urlRouter","$location","$urlMatcherFactory"]}function y(){function a(a,b){return{load:function(a,c){var d;return c=T({template:null,controller:null,view:null,locals:null,notify:!0,async:!0,params:{}},c),c.view&&(d=b.fromConfig(c.view,c.params,c.locals)),d}}}this.$get=a,a.$inject=["$rootScope","$templateFactory"]}function z(){var a=!1;this.useAnchorScroll=function(){a=!0},this.$get=["$anchorScroll","$timeout",function(b,c){return a?b:function(a){return c(function(){a[0].scrollIntoView()},0,!1)}}]}function A(a,c,d,e,f){function g(){return c.has?function(a){return c.has(a)?c.get(a):null}:function(a){try{return c.get(a)}catch(a){return null}}}function h(a,c){var d=function(){return{enter:function(a,b,c){b.after(a),c()},leave:function(a,b){a.remove(),b()}}};if(k)return{enter:function(a,c,d){b.version.minor>2?k.enter(a,null,c).then(d):k.enter(a,null,c,d)},leave:function(a,c){b.version.minor>2?k.leave(a).then(c):k.leave(a,c)}};if(j){var e=j&&j(c,a);return{enter:function(a,b,c){e.enter(a,null,b),c()},leave:function(a,b){e.leave(a),b()}}}return d()}var i=g(),j=i("$animator"),k=i("$animate");return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",compile:function(c,g,i){return function(c,g,j){function k(){if(m&&(m.remove(),m=null),o&&(o.$destroy(),o=null),n){var a=n.data("$uiViewAnim");s.leave(n,function(){a.$$animLeave.resolve(),m=null}),m=n,n=null}}function l(h){var l,m=C(c,j,g,e),t=m&&a.$current&&a.$current.locals[m];if(h||t!==p){l=c.$new(),p=a.$current.locals[m],l.$emit("$viewContentLoading",m);var u=i(l,function(a){var e=f.defer(),h=f.defer(),i={$animEnter:e.promise,$animLeave:h.promise,$$animLeave:h};a.data("$uiViewAnim",i),s.enter(a,g,function(){e.resolve(),o&&o.$emit("$viewContentAnimationEnded"),(b.isDefined(r)&&!r||c.$eval(r))&&d(a)}),k()});n=u,o=l,o.$emit("$viewContentLoaded",m),o.$eval(q)}}var m,n,o,p,q=j.onload||"",r=j.autoscroll,s=h(j,c);g.inheritedData("$uiView");c.$on("$stateChangeSuccess",function(){l(!1)}),l(!0)}}}}function B(a,c,d,e){return{restrict:"ECA",priority:-400,compile:function(f){var g=f.html();return f.empty?f.empty():f[0].innerHTML=null,function(f,h,i){var j=d.$current,k=C(f,i,h,e),l=j&&j.locals[k];if(!l)return h.html(g),void a(h.contents())(f);h.data("$uiView",{name:k,state:l.$$state}),h.html(l.$template?l.$template:g);var m=b.extend({},l);f[l.$$resolveAs]=m;var n=a(h.contents());if(l.$$controller){l.$scope=f,l.$element=h;var o=c(l.$$controller,l);l.$$controllerAs&&(f[l.$$controllerAs]=o,f[l.$$controllerAs][l.$$resolveAs]=m),O(o.$onInit)&&o.$onInit(),h.data("$ngControllerController",o),h.children().data("$ngControllerController",o)}n(f)}}}}function C(a,b,c,d){var e=d(b.uiView||b.name||"")(a),f=c.inheritedData("$uiView");return e.indexOf("@")>=0?e:e+"@"+(f?f.state.name:"")}function D(a,b){var c,d=a.match(/^\s*({[^}]*})\s*$/);if(d&&(a=b+"("+d[1]+")"),!(c=a.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/))||4!==c.length)throw new Error("Invalid state ref '"+a+"'");return{state:c[1],paramExpr:c[3]||null}}function E(a){var b=a.parent().inheritedData("$uiView");if(b&&b.state&&b.state.name)return b.state}function F(a){var b="[object SVGAnimatedString]"===Object.prototype.toString.call(a.prop("href")),c="FORM"===a[0].nodeName;return{attr:c?"action":b?"xlink:href":"href",isAnchor:"A"===a.prop("tagName").toUpperCase(),clickable:!c}}function G(a,b,c,d,e){return function(f){var g=f.which||f.button,h=e();if(!(g>1||f.ctrlKey||f.metaKey||f.shiftKey||a.attr("target"))){var i=c(function(){b.go(h.state,h.params,h.options)});f.preventDefault();var j=d.isAnchor&&!h.href?1:0;f.preventDefault=function(){j--<=0&&c.cancel(i)}}}}function H(a,b){return{relative:E(a)||b.$current,inherit:!0}}function I(a,c){return{restrict:"A",require:["?^uiSrefActive","?^uiSrefActiveEq"],link:function(d,e,f,g){var h,i=D(f.uiSref,a.current.name),j={state:i.state,href:null,params:null},k=F(e),l=g[1]||g[0],m=null;j.options=T(H(e,a),f.uiSrefOpts?d.$eval(f.uiSrefOpts):{});var n=function(c){c&&(j.params=b.copy(c)),j.href=a.href(i.state,j.params,j.options),m&&m(),l&&(m=l.$$addStateInfo(i.state,j.params)),null!==j.href&&f.$set(k.attr,j.href)};i.paramExpr&&(d.$watch(i.paramExpr,function(a){a!==j.params&&n(a)},!0),j.params=b.copy(d.$eval(i.paramExpr))),n(),k.clickable&&(h=G(e,a,c,k,function(){return j}),e[e.on?"on":"bind"]("click",h),d.$on("$destroy",function(){e[e.off?"off":"unbind"]("click",h)}))}}}function J(a,b){return{restrict:"A",require:["?^uiSrefActive","?^uiSrefActiveEq"],link:function(c,d,e,f){function g(b){m.state=b[0],m.params=b[1],m.options=b[2],m.href=a.href(m.state,m.params,m.options),n&&n(),j&&(n=j.$$addStateInfo(m.state,m.params)),m.href&&e.$set(i.attr,m.href)}var h,i=F(d),j=f[1]||f[0],k=[e.uiState,e.uiStateParams||null,e.uiStateOpts||null],l="["+k.map(function(a){return a||"null"}).join(", ")+"]",m={state:null,params:null,options:null,href:null},n=null;c.$watch(l,g,!0),g(c.$eval(l)),i.clickable&&(h=G(d,a,b,i,function(){return m}),d[d.on?"on":"bind"]("click",h),c.$on("$destroy",function(){d[d.off?"off":"unbind"]("click",h)}))}}}function K(a,b,c){return{restrict:"A",controller:["$scope","$element","$attrs","$timeout",function(b,d,e,f){function g(b,c,e){var f=a.get(b,E(d)),g=h(b,c),i={state:f||{name:b},params:c,hash:g};return p.push(i),q[g]=e,function(){var a=p.indexOf(i);-1!==a&&p.splice(a,1)}}function h(a,c){if(!P(a))throw new Error("state should be a string");return Q(c)?a+V(c):(c=b.$eval(c),Q(c)?a+V(c):a)}function i(){for(var a=0;a<p.length;a++)l(p[a].state,p[a].params)?j(d,q[p[a].hash]):k(d,q[p[a].hash]),m(p[a].state,p[a].params)?j(d,n):k(d,n)}function j(a,b){f(function(){a.addClass(b)})}function k(a,b){a.removeClass(b)}function l(b,c){return a.includes(b.name,c)}function m(b,c){return a.is(b.name,c)}var n,o,p=[],q={};n=c(e.uiSrefActiveEq||"",!1)(b);try{o=b.$eval(e.uiSrefActive)}catch(a){}o=o||c(e.uiSrefActive||"",!1)(b),Q(o)&&S(o,function(c,d){if(P(c)){var e=D(c,a.current.name);g(e.state,b.$eval(e.paramExpr),d)}}),this.$$addStateInfo=function(a,b){if(!(Q(o)&&p.length>0)){var c=g(a,b,o);return i(),c}},b.$on("$stateChangeSuccess",i),i()}]}}function L(a){var b=function(b,c){return a.is(b,c)};return b.$stateful=!0,b}function M(a){var b=function(b,c,d){return a.includes(b,c,d)};return b.$stateful=!0,b}var N=b.isDefined,O=b.isFunction,P=b.isString,Q=b.isObject,R=b.isArray,S=b.forEach,T=b.extend,U=b.copy,V=b.toJson;b.module("ui.router.util",["ng"]),b.module("ui.router.router",["ui.router.util"]),b.module("ui.router.state",["ui.router.router","ui.router.util"]),b.module("ui.router",["ui.router.state"]),b.module("ui.router.compat",["ui.router"]),q.$inject=["$q","$injector"],b.module("ui.router.util").service("$resolve",q),b.module("ui.router.util").provider("$templateFactory",r);var W;t.prototype.concat=function(a,b){var c={caseInsensitive:W.caseInsensitive(),strict:W.strictMode(),squash:W.defaultSquashPolicy()};return new t(this.sourcePath+a+this.sourceSearch,T(c,b),this)},t.prototype.toString=function(){return this.source},t.prototype.exec=function(a,b){function c(a){function b(a){return a.split("").reverse().join("")}function c(a){return a.replace(/\\-/g,"-")}return o(o(b(a).split(/-(?!\\)/),b),c).reverse()}var d=this.regexp.exec(a);if(!d)return null;b=b||{};var e,f,g,h=this.parameters(),i=h.length,j=this.segments.length-1,k={};if(j!==d.length-1)throw new Error("Unbalanced capture group in route '"+this.source+"'");var l,m;for(e=0;e<j;e++){for(g=h[e],l=this.params[g],m=d[e+1],f=0;f<l.replace.length;f++)l.replace[f].from===m&&(m=l.replace[f].to);m&&!0===l.array&&(m=c(m)),N(m)&&(m=l.type.decode(m)),k[g]=l.value(m)}for(;e<i;e++){for(g=h[e],k[g]=this.params[g].value(b[g]),l=this.params[g],m=b[g],f=0;f<l.replace.length;f++)l.replace[f].from===m&&(m=l.replace[f].to);N(m)&&(m=l.type.decode(m)),k[g]=l.value(m)}return k},t.prototype.parameters=function(a){return N(a)?this.params[a]||null:this.$$paramNames},t.prototype.validates=function(a){return this.params.$$validates(a)},t.prototype.format=function(a){function b(a){return encodeURIComponent(a).replace(/-/g,function(a){return"%5C%"+a.charCodeAt(0).toString(16).toUpperCase()})}a=a||{};var c=this.segments,d=this.parameters(),e=this.params;if(!this.validates(a))return null;var f,g=!1,h=c.length-1,i=d.length,j=c[0];for(f=0;f<i;f++){var k=f<h,l=d[f],m=e[l],n=m.value(a[l]),p=m.isOptional&&m.type.equals(m.value(),n),q=!!p&&m.squash,r=m.type.encode(n);if(k){var s=c[f+1],t=f+1===h;if(!1===q)null!=r&&(R(r)?j+=o(r,b).join("-"):j+=encodeURIComponent(r)),j+=s;else if(!0===q){var u=j.match(/\/$/)?/\/?(.*)/:/(.*)/;j+=s.match(u)[1]}else P(q)&&(j+=q+s);t&&!0===m.squash&&"/"===j.slice(-1)&&(j=j.slice(0,-1))}else{if(null==r||p&&!1!==q)continue;if(R(r)||(r=[r]),0===r.length)continue;r=o(r,encodeURIComponent).join("&"+l+"="),j+=(g?"&":"?")+l+"="+r,g=!0}}return j},u.prototype.is=function(a,b){return!0},u.prototype.encode=function(a,b){return a},u.prototype.decode=function(a,b){return a},u.prototype.equals=function(a,b){return a==b},u.prototype.$subPattern=function(){var a=this.pattern.toString();return a.substr(1,a.length-2)},u.prototype.pattern=/.*/,u.prototype.toString=function(){return"{Type:"+this.name+"}"},u.prototype.$normalize=function(a){return this.is(a)?a:this.decode(a)},u.prototype.$asArray=function(a,b){function d(a,b){function d(a,b){return function(){return a[b].apply(a,arguments)}}function e(a){return R(a)?a:N(a)?[a]:[]}function f(a){switch(a.length){case 0:return c;case 1:return"auto"===b?a[0]:a;default:return a}}function g(a){return!a}function h(a,b){return function(c){if(R(c)&&0===c.length)return c;c=e(c);var d=o(c,a);return!0===b?0===n(d,g).length:f(d)}}function i(a){return function(b,c){var d=e(b),f=e(c);if(d.length!==f.length)return!1;for(var g=0;g<d.length;g++)if(!a(d[g],f[g]))return!1;return!0}}this.encode=h(d(a,"encode")),this.decode=h(d(a,"decode")),this.is=h(d(a,"is"),!0),this.equals=i(d(a,"equals")),this.pattern=a.pattern,this.$normalize=h(d(a,"$normalize")),this.name=a.name,this.$arrayMode=b}if(!a)return this;if("auto"===a&&!b)throw new Error("'auto' array mode is for query parameters only");return new d(this,a)},b.module("ui.router.util").provider("$urlMatcherFactory",v),b.module("ui.router.util").run(["$urlMatcherFactory",function(a){}]),w.$inject=["$locationProvider","$urlMatcherFactoryProvider"],b.module("ui.router.router").provider("$urlRouter",w),x.$inject=["$urlRouterProvider","$urlMatcherFactoryProvider"],b.module("ui.router.state").factory("$stateParams",function(){return{}}).constant("$state.runtime",{autoinject:!0}).provider("$state",x).run(["$injector",function(a){a.get("$state.runtime").autoinject&&a.get("$state")}]),y.$inject=[],b.module("ui.router.state").provider("$view",y),b.module("ui.router.state").provider("$uiViewScroll",z),A.$inject=["$state","$injector","$uiViewScroll","$interpolate","$q"],B.$inject=["$compile","$controller","$state","$interpolate"],b.module("ui.router.state").directive("uiView",A),b.module("ui.router.state").directive("uiView",B),I.$inject=["$state","$timeout"],J.$inject=["$state","$timeout"],K.$inject=["$state","$stateParams","$interpolate"],b.module("ui.router.state").directive("uiSref",I).directive("uiSrefActive",K).directive("uiSrefActiveEq",K).directive("uiState",J),L.$inject=["$state"],M.$inject=["$state"],b.module("ui.router.state").filter("isState",L).filter("includedByState",M)}(window,window.angular);
-\ No newline at end of file
-diff --git a/setup/pub/angular/angular.js b/setup/pub/angular/angular.js
-index e3a85e3679a..189ff16495b 100644
---- a/setup/pub/angular/angular.js
-+++ b/setup/pub/angular/angular.js
-@@ -1,15 +1,65 @@
- /**
-- * @license AngularJS v1.2.16
-- * (c) 2010-2014 Google, Inc. http://angularjs.org
-+ * @license AngularJS v1.6.9
-+ * (c) 2010-2018 Google, Inc. http://angularjs.org
-  * License: MIT
-  */
--(function(window, document, undefined) {'use strict';
-+(function(window) {'use strict';
-+
-+    /* exported
-+  minErrConfig,
-+  errorHandlingConfig,
-+  isValidObjectMaxDepth
-+*/
-+
-+    var minErrConfig = {
-+        objectMaxDepth: 5
-+    };
-+
-+    /**
-+     * @ngdoc function
-+     * @name angular.errorHandlingConfig
-+     * @module ng
-+     * @kind function
-+     *
-+     * @description
-+     * Configure several aspects of error handling in AngularJS if used as a setter or return the
-+     * current configuration if used as a getter. The following options are supported:
-+     *
-+     * - **objectMaxDepth**: The maximum depth to which objects are traversed when stringified for error messages.
-+     *
-+     * Omitted or undefined options will leave the corresponding configuration values unchanged.
-+     *
-+     * @param {Object=} config - The configuration object. May only contain the options that need to be
-+     *     updated. Supported keys:
-+     *
-+     * * `objectMaxDepth`  **{Number}** - The max depth for stringifying objects. Setting to a
-+     *   non-positive or non-numeric value, removes the max depth limit.
-+     *   Default: 5
-+     */
-+    function errorHandlingConfig(config) {
-+        if (isObject(config)) {
-+            if (isDefined(config.objectMaxDepth)) {
-+                minErrConfig.objectMaxDepth = isValidObjectMaxDepth(config.objectMaxDepth) ? config.objectMaxDepth : NaN;
-+            }
-+        } else {
-+            return minErrConfig;
-+        }
-+    }
-+
-+    /**
-+     * @private
-+     * @param {Number} maxDepth
-+     * @return {boolean}
-+     */
-+    function isValidObjectMaxDepth(maxDepth) {
-+        return isNumber(maxDepth) && maxDepth > 0;
-+    }
- 
-     /**
-      * @description
-      *
-      * This object provides a utility for producing rich Error messages within
--     * Angular. It can be called as follows:
-+     * AngularJS. It can be called as follows:
-      *
-      * var exampleMinErr = minErr('example');
-      * throw exampleMinErr('one', 'This {0} is {1}', foo, bar);
-@@ -30,140 +80,145 @@
-      * should all be static strings, not variables or general expressions.
-      *
-      * @param {string} module The namespace to use for the new minErr instance.
-+     * @param {function} ErrorConstructor Custom error constructor to be instantiated when returning
-+     *   error from returned function, for cases when a particular type of error is useful.
-      * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance
-      */
- 
--    function minErr(module) {
--        return function () {
-+    function minErr(module, ErrorConstructor) {
-+        ErrorConstructor = ErrorConstructor || Error;
-+        return function() {
-             var code = arguments[0],
--                prefix = '[' + (module ? module + ':' : '') + code + '] ',
-                 template = arguments[1],
--                templateArgs = arguments,
--                stringify = function (obj) {
--                    if (typeof obj === 'function') {
--                        return obj.toString().replace(/ \{[\s\S]*$/, '');
--                    } else if (typeof obj === 'undefined') {
--                        return 'undefined';
--                    } else if (typeof obj !== 'string') {
--                        return JSON.stringify(obj);
--                    }
--                    return obj;
--                },
--                message, i;
-+                message = '[' + (module ? module + ':' : '') + code + '] ',
-+                templateArgs = sliceArgs(arguments, 2).map(function(arg) {
-+                    return toDebugString(arg, minErrConfig.objectMaxDepth);
-+                }),
-+                paramPrefix, i;
- 
--            message = prefix + template.replace(/\{\d+\}/g, function (match) {
--                var index = +match.slice(1, -1), arg;
-+            message += template.replace(/\{\d+\}/g, function(match) {
-+                var index = +match.slice(1, -1);
- 
--                if (index + 2 < templateArgs.length) {
--                    arg = templateArgs[index + 2];
--                    if (typeof arg === 'function') {
--                        return arg.toString().replace(/ ?\{[\s\S]*$/, '');
--                    } else if (typeof arg === 'undefined') {
--                        return 'undefined';
--                    } else if (typeof arg !== 'string') {
--                        return toJson(arg);
--                    }
--                    return arg;
-+                if (index < templateArgs.length) {
-+                    return templateArgs[index];
-                 }
-+
-                 return match;
-             });
- 
--            message = message + '\nhttp://errors.angularjs.org/1.2.16/' +
--            (module ? module + '/' : '') + code;
--            for (i = 2; i < arguments.length; i++) {
--                message = message + (i == 2 ? '?' : '&') + 'p' + (i-2) + '=' +
--                encodeURIComponent(stringify(arguments[i]));
-+            message += '\nhttp://errors.angularjs.org/1.6.9/' +
-+                (module ? module + '/' : '') + code;
-+
-+            for (i = 0, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
-+                message += paramPrefix + 'p' + i + '=' + encodeURIComponent(templateArgs[i]);
-             }
- 
--            return new Error(message);
-+            return new ErrorConstructor(message);
-         };
-     }
- 
--    /* We need to tell jshint what variables are being exported */
--    /* global
--     -angular,
--     -msie,
--     -jqLite,
--     -jQuery,
--     -slice,
--     -push,
--     -toString,
--     -ngMinErr,
--     -_angular,
--     -angularModule,
--     -nodeName_,
--     -uid,
--
--     -lowercase,
--     -uppercase,
--     -manualLowercase,
--     -manualUppercase,
--     -nodeName_,
--     -isArrayLike,
--     -forEach,
--     -sortedKeys,
--     -forEachSorted,
--     -reverseParams,
--     -nextUid,
--     -setHashKey,
--     -extend,
--     -int,
--     -inherit,
--     -noop,
--     -identity,
--     -valueFn,
--     -isUndefined,
--     -isDefined,
--     -isObject,
--     -isString,
--     -isNumber,
--     -isDate,
--     -isArray,
--     -isFunction,
--     -isRegExp,
--     -isWindow,
--     -isScope,
--     -isFile,
--     -isBlob,
--     -isBoolean,
--     -trim,
--     -isElement,
--     -makeMap,
--     -map,
--     -size,
--     -includes,
--     -indexOf,
--     -arrayRemove,
--     -isLeafNode,
--     -copy,
--     -shallowCopy,
--     -equals,
--     -csp,
--     -concat,
--     -sliceArgs,
--     -bind,
--     -toJsonReplacer,
--     -toJson,
--     -fromJson,
--     -toBoolean,
--     -startingTag,
--     -tryDecodeURIComponent,
--     -parseKeyValue,
--     -toKeyValue,
--     -encodeUriSegment,
--     -encodeUriQuery,
--     -angularInit,
--     -bootstrap,
--     -snake_case,
--     -bindJQuery,
--     -assertArg,
--     -assertArgFn,
--     -assertNotHasOwnProperty,
--     -getter,
--     -getBlockElements,
--     -hasOwnProperty,
--
--     */
-+    /* We need to tell ESLint what variables are being exported */
-+    /* exported
-+  angular,
-+  msie,
-+  jqLite,
-+  jQuery,
-+  slice,
-+  splice,
-+  push,
-+  toString,
-+  minErrConfig,
-+  errorHandlingConfig,
-+  isValidObjectMaxDepth,
-+  ngMinErr,
-+  angularModule,
-+  uid,
-+  REGEX_STRING_REGEXP,
-+  VALIDITY_STATE_PROPERTY,
-+
-+  lowercase,
-+  uppercase,
-+  manualLowercase,
-+  manualUppercase,
-+  nodeName_,
-+  isArrayLike,
-+  forEach,
-+  forEachSorted,
-+  reverseParams,
-+  nextUid,
-+  setHashKey,
-+  extend,
-+  toInt,
-+  inherit,
-+  merge,
-+  noop,
-+  identity,
-+  valueFn,
-+  isUndefined,
-+  isDefined,
-+  isObject,
-+  isBlankObject,
-+  isString,
-+  isNumber,
-+  isNumberNaN,
-+  isDate,
-+  isError,
-+  isArray,
-+  isFunction,
-+  isRegExp,
-+  isWindow,
-+  isScope,
-+  isFile,
-+  isFormData,
-+  isBlob,
-+  isBoolean,
-+  isPromiseLike,
-+  trim,
-+  escapeForRegexp,
-+  isElement,
-+  makeMap,
-+  includes,
-+  arrayRemove,
-+  copy,
-+  simpleCompare,
-+  equals,
-+  csp,
-+  jq,
-+  concat,
-+  sliceArgs,
-+  bind,
-+  toJsonReplacer,
-+  toJson,
-+  fromJson,
-+  convertTimezoneToLocal,
-+  timezoneToOffset,
-+  startingTag,
-+  tryDecodeURIComponent,
-+  parseKeyValue,
-+  toKeyValue,
-+  encodeUriSegment,
-+  encodeUriQuery,
-+  angularInit,
-+  bootstrap,
-+  getTestability,
-+  snake_case,
-+  bindJQuery,
-+  assertArg,
-+  assertArgFn,
-+  assertNotHasOwnProperty,
-+  getter,
-+  getBlockNodes,
-+  hasOwnProperty,
-+  createMap,
-+  stringify,
-+
-+  NODE_TYPE_ELEMENT,
-+  NODE_TYPE_ATTRIBUTE,
-+  NODE_TYPE_TEXT,
-+  NODE_TYPE_COMMENT,
-+  NODE_TYPE_DOCUMENT,
-+  NODE_TYPE_DOCUMENT_FRAGMENT
-+*/
- 
- ////////////////////////////////////
- 
-@@ -171,91 +226,107 @@
-      * @ngdoc module
-      * @name ng
-      * @module ng
-+     * @installation
-      * @description
-      *
--     * # ng (core module)
-      * The ng module is loaded by default when an AngularJS application is started. The module itself
-      * contains the essential components for an AngularJS application to function. The table below
-      * lists a high level breakdown of each of the services/factories, filters, directives and testing
-      * components available within this core module.
-      *
--     * <div doc-module-components="ng"></div>
-      */
- 
-+    var REGEX_STRING_REGEXP = /^\/(.+)\/([a-z]*)$/;
-+
-+// The name of a form control's ValidityState property.
-+// This is used so that it's possible for internal tests to create mock ValidityStates.
-+    var VALIDITY_STATE_PROPERTY = 'validity';
-+
-+
-+    var hasOwnProperty = Object.prototype.hasOwnProperty;
-+
-     /**
-      * @ngdoc function
-      * @name angular.lowercase
-      * @module ng
--     * @function
-+     * @kind function
-+     *
-+     * @deprecated
-+     * sinceVersion="1.5.0"
-+     * removeVersion="1.7.0"
-+     * Use [String.prototype.toLowerCase](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/toLowerCase) instead.
-      *
-      * @description Converts the specified string to lowercase.
-      * @param {string} string String to be converted to lowercase.
-      * @returns {string} Lowercased string.
-      */
--    var lowercase = function(string){return isString(string) ? string.toLowerCase() : string;};
--    var hasOwnProperty = Object.prototype.hasOwnProperty;
-+    var lowercase = function(string) {return isString(string) ? string.toLowerCase() : string;};
- 
-     /**
-      * @ngdoc function
-      * @name angular.uppercase
-      * @module ng
--     * @function
-+     * @kind function
-+     *
-+     * @deprecated
-+     * sinceVersion="1.5.0"
-+     * removeVersion="1.7.0"
-+     * Use [String.prototype.toUpperCase](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/toUpperCase) instead.
-      *
-      * @description Converts the specified string to uppercase.
-      * @param {string} string String to be converted to uppercase.
-      * @returns {string} Uppercased string.
-      */
--    var uppercase = function(string){return isString(string) ? string.toUpperCase() : string;};
-+    var uppercase = function(string) {return isString(string) ? string.toUpperCase() : string;};
- 
- 
-     var manualLowercase = function(s) {
--        /* jshint bitwise: false */
-+        /* eslint-disable no-bitwise */
-         return isString(s)
-             ? s.replace(/[A-Z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) | 32);})
-             : s;
-+        /* eslint-enable */
-     };
-     var manualUppercase = function(s) {
--        /* jshint bitwise: false */
-+        /* eslint-disable no-bitwise */
-         return isString(s)
-             ? s.replace(/[a-z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) & ~32);})
-             : s;
-+        /* eslint-enable */
-     };
- 
- 
- // String#toLowerCase and String#toUpperCase don't produce correct results in browsers with Turkish
- // locale, for this reason we need to detect this case and redefine lowercase/uppercase methods
--// with correct but slower alternatives.
-+// with correct but slower alternatives. See https://github.com/angular/angular.js/issues/11387
-     if ('i' !== 'I'.toLowerCase()) {
-         lowercase = manualLowercase;
-         uppercase = manualUppercase;
-     }
- 
- 
--    var /** holds major version number for IE or NaN for real browsers */
--        msie,
-+    var
-+        msie,             // holds major version number for IE, or NaN if UA is not IE.
-         jqLite,           // delay binding since jQuery could be loaded after us.
-         jQuery,           // delay binding
-         slice             = [].slice,
-+        splice            = [].splice,
-         push              = [].push,
-         toString          = Object.prototype.toString,
-+        getPrototypeOf    = Object.getPrototypeOf,
-         ngMinErr          = minErr('ng'),
- 
--
--        _angular          = window.angular,
-         /** @name angular */
-         angular           = window.angular || (window.angular = {}),
-         angularModule,
--        nodeName_,
--        uid               = ['0', '0', '0'];
-+        uid               = 0;
- 
-+// Support: IE 9-11 only
-     /**
--     * IE 11 changed the format of the UserAgent string.
--     * See http://msdn.microsoft.com/en-us/library/ms537503.aspx
-+     * documentMode is an IE-only property
-+     * http://msdn.microsoft.com/en-us/library/ie/cc196988(v=vs.85).aspx
-      */
--    msie = int((/msie (\d+)/.exec(lowercase(navigator.userAgent)) || [])[1]);
--    if (isNaN(msie)) {
--        msie = int((/trident\/.*; rv:(\d+)/.exec(lowercase(navigator.userAgent)) || [])[1]);
--    }
-+    msie = window.document.documentMode;
- 
- 
-     /**
-@@ -265,39 +336,51 @@
-      *                   String ...)
-      */
-     function isArrayLike(obj) {
--        if (obj == null || isWindow(obj)) {
--            return false;
--        }
- 
--        var length = obj.length;
-+        // `null`, `undefined` and `window` are not array-like
-+        if (obj == null || isWindow(obj)) return false;
- 
--        if (obj.nodeType === 1 && length) {
--            return true;
--        }
-+        // arrays, strings and jQuery/jqLite objects are array like
-+        // * jqLite is either the jQuery or jqLite constructor function
-+        // * we have to check the existence of jqLite first as this method is called
-+        //   via the forEach method when constructing the jqLite object in the first place
-+        if (isArray(obj) || isString(obj) || (jqLite && obj instanceof jqLite)) return true;
-+
-+        // Support: iOS 8.2 (not reproducible in simulator)
-+        // "length" in obj used to prevent JIT error (gh-11508)
-+        var length = 'length' in Object(obj) && obj.length;
-+
-+        // NodeList objects (with `item` method) and
-+        // other objects with suitable length characteristics are array-like
-+        return isNumber(length) &&
-+            (length >= 0 && ((length - 1) in obj || obj instanceof Array) || typeof obj.item === 'function');
- 
--        return isString(obj) || isArray(obj) || length === 0 ||
--        typeof length === 'number' && length > 0 && (length - 1) in obj;
-     }
- 
-     /**
-      * @ngdoc function
-      * @name angular.forEach
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Invokes the `iterator` function once for each item in `obj` collection, which can be either an
--     * object or an array. The `iterator` function is invoked with `iterator(value, key)`, where `value`
--     * is the value of an object property or an array element and `key` is the object property key or
--     * array element index. Specifying a `context` for the function is optional.
-+     * object or an array. The `iterator` function is invoked with `iterator(value, key, obj)`, where `value`
-+     * is the value of an object property or an array element, `key` is the object property key or
-+     * array element index and obj is the `obj` itself. Specifying a `context` for the function is optional.
-      *
-      * It is worth noting that `.forEach` does not iterate over inherited properties because it filters
-      * using the `hasOwnProperty` method.
-      *
-+     * Unlike ES262's
-+     * [Array.prototype.forEach](http://www.ecma-international.org/ecma-262/5.1/#sec-15.4.4.18),
-+     * providing 'undefined' or 'null' values for `obj` will not throw a TypeError, but rather just
-+     * return the value provided.
-+     *
-      ```js
-      var values = {name: 'misko', gender: 'male'};
-      var log = [];
--     angular.forEach(values, function(value, key){
-+     angular.forEach(values, function(value, key) {
-        this.push(key + ': ' + value);
-      }, log);
-      expect(log).toEqual(['name: misko', 'gender: male']);
-@@ -308,26 +391,42 @@
-      * @param {Object=} context Object to become context (`this`) for the iterator function.
-      * @returns {Object|Array} Reference to `obj`.
-      */
-+
-     function forEach(obj, iterator, context) {
--        var key;
-+        var key, length;
-         if (obj) {
--            if (isFunction(obj)){
-+            if (isFunction(obj)) {
-                 for (key in obj) {
--                    // Need to check if hasOwnProperty exists,
--                    // as on IE8 the result of querySelectorAll is an object without a hasOwnProperty function
--                    if (key != 'prototype' && key != 'length' && key != 'name' && (!obj.hasOwnProperty || obj.hasOwnProperty(key))) {
--                        iterator.call(context, obj[key], key);
-+                    if (key !== 'prototype' && key !== 'length' && key !== 'name' && obj.hasOwnProperty(key)) {
-+                        iterator.call(context, obj[key], key, obj);
-+                    }
-+                }
-+            } else if (isArray(obj) || isArrayLike(obj)) {
-+                var isPrimitive = typeof obj !== 'object';
-+                for (key = 0, length = obj.length; key < length; key++) {
-+                    if (isPrimitive || key in obj) {
-+                        iterator.call(context, obj[key], key, obj);
-                     }
-                 }
-             } else if (obj.forEach && obj.forEach !== forEach) {
--                obj.forEach(iterator, context);
--            } else if (isArrayLike(obj)) {
--                for (key = 0; key < obj.length; key++)
--                    iterator.call(context, obj[key], key);
--            } else {
-+                obj.forEach(iterator, context, obj);
-+            } else if (isBlankObject(obj)) {
-+                // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
-+                for (key in obj) {
-+                    iterator.call(context, obj[key], key, obj);
-+                }
-+            } else if (typeof obj.hasOwnProperty === 'function') {
-+                // Slow path for objects inheriting Object.prototype, hasOwnProperty check needed
-                 for (key in obj) {
-                     if (obj.hasOwnProperty(key)) {
--                        iterator.call(context, obj[key], key);
-+                        iterator.call(context, obj[key], key, obj);
-+                    }
-+                }
-+            } else {
-+                // Slow path for objects which do not have a method `hasOwnProperty`
-+                for (key in obj) {
-+                    if (hasOwnProperty.call(obj, key)) {
-+                        iterator.call(context, obj[key], key, obj);
-                     }
-                 }
-             }
-@@ -335,19 +434,9 @@
-         return obj;
-     }
- 
--    function sortedKeys(obj) {
--        var keys = [];
--        for (var key in obj) {
--            if (obj.hasOwnProperty(key)) {
--                keys.push(key);
--            }
--        }
--        return keys.sort();
--    }
--
-     function forEachSorted(obj, iterator, context) {
--        var keys = sortedKeys(obj);
--        for ( var i = 0; i < keys.length; i++) {
-+        var keys = Object.keys(obj).sort();
-+        for (var i = 0; i < keys.length; i++) {
-             iterator.call(context, obj[keys[i]], keys[i]);
-         }
-         return keys;
-@@ -360,37 +449,21 @@
-      * @returns {function(*, string)}
-      */
-     function reverseParams(iteratorFn) {
--        return function(value, key) { iteratorFn(key, value); };
-+        return function(value, key) {iteratorFn(key, value);};
-     }
- 
-     /**
--     * A consistent way of creating unique IDs in angular. The ID is a sequence of alpha numeric
--     * characters such as '012ABC'. The reason why we are not using simply a number counter is that
--     * the number string gets longer over time, and it can also overflow, where as the nextId
--     * will grow much slower, it is a string, and it will never overflow.
-+     * A consistent way of creating unique IDs in angular.
-      *
--     * @returns {string} an unique alpha-numeric string
-+     * Using simple numbers allows us to generate 28.6 million unique ids per second for 10 years before
-+     * we hit number precision issues in JavaScript.
-+     *
-+     * Math.pow(2,53) / 60 / 60 / 24 / 365 / 10 = 28.6M
-+     *
-+     * @returns {number} an unique alpha-numeric string
-      */
-     function nextUid() {
--        var index = uid.length;
--        var digit;
--
--        while(index) {
--            index--;
--            digit = uid[index].charCodeAt(0);
--            if (digit == 57 /*'9'*/) {
--                uid[index] = 'A';
--                return uid.join('');
--            }
--            if (digit == 90  /*'Z'*/) {
--                uid[index] = '0';
--            } else {
--                uid[index] = String.fromCharCode(digit + 1);
--                return uid.join('');
--            }
--        }
--        uid.unshift('0');
--        return uid.join('');
-+        return ++uid;
-     }
- 
- 
-@@ -402,54 +475,126 @@
-     function setHashKey(obj, h) {
-         if (h) {
-             obj.$$hashKey = h;
--        }
--        else {
-+        } else {
-             delete obj.$$hashKey;
-         }
-     }
- 
-+
-+    function baseExtend(dst, objs, deep) {
-+        var h = dst.$$hashKey;
-+
-+        for (var i = 0, ii = objs.length; i < ii; ++i) {
-+            var obj = objs[i];
-+            if (!isObject(obj) && !isFunction(obj)) continue;
-+            var keys = Object.keys(obj);
-+            for (var j = 0, jj = keys.length; j < jj; j++) {
-+                var key = keys[j];
-+                var src = obj[key];
-+
-+                if (deep && isObject(src)) {
-+                    if (isDate(src)) {
-+                        dst[key] = new Date(src.valueOf());
-+                    } else if (isRegExp(src)) {
-+                        dst[key] = new RegExp(src);
-+                    } else if (src.nodeName) {
-+                        dst[key] = src.cloneNode(true);
-+                    } else if (isElement(src)) {
-+                        dst[key] = src.clone();
-+                    } else {
-+                        if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
-+                        baseExtend(dst[key], [src], true);
-+                    }
-+                } else {
-+                    dst[key] = src;
-+                }
-+            }
-+        }
-+
-+        setHashKey(dst, h);
-+        return dst;
-+    }
-+
-     /**
-      * @ngdoc function
-      * @name angular.extend
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
--     * Extends the destination object `dst` by copying all of the properties from the `src` object(s)
--     * to `dst`. You can specify multiple `src` objects.
-+     * Extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
-+     * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
-+     * by passing an empty object as the target: `var object = angular.extend({}, object1, object2)`.
-+     *
-+     * **Note:** Keep in mind that `angular.extend` does not support recursive merge (deep copy). Use
-+     * {@link angular.merge} for this.
-      *
-      * @param {Object} dst Destination object.
-      * @param {...Object} src Source object(s).
-      * @returns {Object} Reference to `dst`.
-      */
-     function extend(dst) {
--        var h = dst.$$hashKey;
--        forEach(arguments, function(obj){
--            if (obj !== dst) {
--                forEach(obj, function(value, key){
--                    dst[key] = value;
--                });
--            }
--        });
-+        return baseExtend(dst, slice.call(arguments, 1), false);
-+    }
- 
--        setHashKey(dst,h);
--        return dst;
-+
-+    /**
-+     * @ngdoc function
-+     * @name angular.merge
-+     * @module ng
-+     * @kind function
-+     *
-+     * @description
-+     * Deeply extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
-+     * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
-+     * by passing an empty object as the target: `var object = angular.merge({}, object1, object2)`.
-+     *
-+     * Unlike {@link angular.extend extend()}, `merge()` recursively descends into object properties of source
-+     * objects, performing a deep copy.
-+     *
-+     * @deprecated
-+     * sinceVersion="1.6.5"
-+     * This function is deprecated, but will not be removed in the 1.x lifecycle.
-+     * There are edge cases (see {@link angular.merge#known-issues known issues}) that are not
-+     * supported by this function. We suggest
-+     * using [lodash's merge()](https://lodash.com/docs/4.17.4#merge) instead.
-+     *
-+     * @knownIssue
-+     * This is a list of (known) object types that are not handled correctly by this function:
-+     * - [`Blob`](https://developer.mozilla.org/docs/Web/API/Blob)
-+     * - [`MediaStream`](https://developer.mozilla.org/docs/Web/API/MediaStream)
-+     * - [`CanvasGradient`](https://developer.mozilla.org/docs/Web/API/CanvasGradient)
-+     * - AngularJS {@link $rootScope.Scope scopes};
-+     *
-+     * @param {Object} dst Destination object.
-+     * @param {...Object} src Source object(s).
-+     * @returns {Object} Reference to `dst`.
-+     */
-+    function merge(dst) {
-+        return baseExtend(dst, slice.call(arguments, 1), true);
-     }
- 
--    function int(str) {
-+
-+
-+    function toInt(str) {
-         return parseInt(str, 10);
-     }
- 
-+    var isNumberNaN = Number.isNaN || function isNumberNaN(num) {
-+        // eslint-disable-next-line no-self-compare
-+        return num !== num;
-+    };
-+
- 
-     function inherit(parent, extra) {
--        return extend(new (extend(function() {}, {prototype:parent}))(), extra);
-+        return extend(Object.create(parent), extra);
-     }
- 
-     /**
-      * @ngdoc function
-      * @name angular.noop
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * A function that performs no operations. This function can be useful when writing code in the
-@@ -469,7 +614,7 @@
-      * @ngdoc function
-      * @name angular.identity
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * A function that returns its first argument. This function is useful when writing code in the
-@@ -477,21 +622,38 @@
-      *
-      ```js
-      function transformer(transformationFn, value) {
--       return (transformationFn || angular.identity)(value);
--     };
-+     return (transformationFn || angular.identity)(value);
-+   };
-+
-+     // E.g.
-+     function getResult(fn, input) {
-+     return (fn || angular.identity)(input);
-+   };
-+
-+     getResult(function(n) { return n * 2; }, 21);   // returns 42
-+     getResult(null, 21);                            // returns 21
-+     getResult(undefined, 21);                       // returns 21
-      ```
-+     *
-+     * @param {*} value to be returned.
-+     * @returns {*} the value passed in.
-      */
-     function identity($) {return $;}
-     identity.$inject = [];
- 
- 
--    function valueFn(value) {return function() {return value;};}
-+    function valueFn(value) {return function valueRef() {return value;};}
-+
-+    function hasCustomToString(obj) {
-+        return isFunction(obj.toString) && obj.toString !== toString;
-+    }
-+
- 
-     /**
-      * @ngdoc function
-      * @name angular.isUndefined
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Determines if a reference is undefined.
-@@ -499,14 +661,14 @@
-      * @param {*} value Reference to check.
-      * @returns {boolean} True if `value` is undefined.
-      */
--    function isUndefined(value){return typeof value === 'undefined';}
-+    function isUndefined(value) {return typeof value === 'undefined';}
- 
- 
-     /**
-      * @ngdoc function
-      * @name angular.isDefined
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Determines if a reference is defined.
-@@ -514,14 +676,14 @@
-      * @param {*} value Reference to check.
-      * @returns {boolean} True if `value` is defined.
-      */
--    function isDefined(value){return typeof value !== 'undefined';}
-+    function isDefined(value) {return typeof value !== 'undefined';}
- 
- 
-     /**
-      * @ngdoc function
-      * @name angular.isObject
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Determines if a reference is an `Object`. Unlike `typeof` in JavaScript, `null`s are not
-@@ -530,14 +692,27 @@
-      * @param {*} value Reference to check.
-      * @returns {boolean} True if `value` is an `Object` but not `null`.
-      */
--    function isObject(value){return value != null && typeof value === 'object';}
-+    function isObject(value) {
-+        // http://jsperf.com/isobject4
-+        return value !== null && typeof value === 'object';
-+    }
-+
-+
-+    /**
-+     * Determine if a value is an object with a null prototype
-+     *
-+     * @returns {boolean} True if `value` is an `Object` with a null prototype
-+     */
-+    function isBlankObject(value) {
-+        return value !== null && typeof value === 'object' && !getPrototypeOf(value);
-+    }
- 
- 
-     /**
-      * @ngdoc function
-      * @name angular.isString
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Determines if a reference is a `String`.
-@@ -545,29 +720,35 @@
-      * @param {*} value Reference to check.
-      * @returns {boolean} True if `value` is a `String`.
-      */
--    function isString(value){return typeof value === 'string';}
-+    function isString(value) {return typeof value === 'string';}
- 
- 
-     /**
-      * @ngdoc function
-      * @name angular.isNumber
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Determines if a reference is a `Number`.
-      *
-+     * This includes the "special" numbers `NaN`, `+Infinity` and `-Infinity`.
-+     *
-+     * If you wish to exclude these then you can use the native
-+     * [`isFinite'](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/isFinite)
-+     * method.
-+     *
-      * @param {*} value Reference to check.
-      * @returns {boolean} True if `value` is a `Number`.
-      */
--    function isNumber(value){return typeof value === 'number';}
-+    function isNumber(value) {return typeof value === 'number';}
- 
- 
-     /**
-      * @ngdoc function
-      * @name angular.isDate
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Determines if a value is a date.
-@@ -575,7 +756,7 @@
-      * @param {*} value Reference to check.
-      * @returns {boolean} True if `value` is a `Date`.
-      */
--    function isDate(value){
-+    function isDate(value) {
-         return toString.call(value) === '[object Date]';
-     }
- 
-@@ -584,24 +765,39 @@
-      * @ngdoc function
-      * @name angular.isArray
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
--     * Determines if a reference is an `Array`.
-+     * Determines if a reference is an `Array`. Alias of Array.isArray.
-      *
-      * @param {*} value Reference to check.
-      * @returns {boolean} True if `value` is an `Array`.
-      */
--    function isArray(value) {
--        return toString.call(value) === '[object Array]';
--    }
-+    var isArray = Array.isArray;
- 
-+    /**
-+     * @description
-+     * Determines if a reference is an `Error`.
-+     * Loosely based on https://www.npmjs.com/package/iserror
-+     *
-+     * @param {*} value Reference to check.
-+     * @returns {boolean} True if `value` is an `Error`.
-+     */
-+    function isError(value) {
-+        var tag = toString.call(value);
-+        switch (tag) {
-+            case '[object Error]': return true;
-+            case '[object Exception]': return true;
-+            case '[object DOMException]': return true;
-+            default: return value instanceof Error;
-+        }
-+    }
- 
-     /**
-      * @ngdoc function
-      * @name angular.isFunction
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Determines if a reference is a `Function`.
-@@ -609,7 +805,7 @@
-      * @param {*} value Reference to check.
-      * @returns {boolean} True if `value` is a `Function`.
-      */
--    function isFunction(value){return typeof value === 'function';}
-+    function isFunction(value) {return typeof value === 'function';}
- 
- 
-     /**
-@@ -632,7 +828,7 @@
-      * @returns {boolean} True if `obj` is a window obj.
-      */
-     function isWindow(obj) {
--        return obj && obj.document && obj.location && obj.alert && obj.setInterval;
-+        return obj && obj.window === obj;
-     }
- 
- 
-@@ -646,6 +842,11 @@
-     }
- 
- 
-+    function isFormData(obj) {
-+        return toString.call(obj) === '[object FormData]';
-+    }
-+
-+
-     function isBlob(obj) {
-         return toString.call(obj) === '[object Blob]';
-     }
-@@ -656,26 +857,41 @@
-     }
- 
- 
--    var trim = (function() {
--        // native trim is way faster: http://jsperf.com/angular-trim-test
--        // but IE doesn't have it... :-(
--        // TODO: we should move this into IE/ES5 polyfill
--        if (!String.prototype.trim) {
--            return function(value) {
--                return isString(value) ? value.replace(/^\s\s*/, '').replace(/\s\s*$/, '') : value;
--            };
--        }
--        return function(value) {
--            return isString(value) ? value.trim() : value;
--        };
--    })();
-+    function isPromiseLike(obj) {
-+        return obj && isFunction(obj.then);
-+    }
-+
-+
-+    var TYPED_ARRAY_REGEXP = /^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array]$/;
-+    function isTypedArray(value) {
-+        return value && isNumber(value.length) && TYPED_ARRAY_REGEXP.test(toString.call(value));
-+    }
-+
-+    function isArrayBuffer(obj) {
-+        return toString.call(obj) === '[object ArrayBuffer]';
-+    }
-+
-+
-+    var trim = function(value) {
-+        return isString(value) ? value.trim() : value;
-+    };
-+
-+// Copied from:
-+// http://docs.closure-library.googlecode.com/git/local_closure_goog_string_string.js.source.html#line1021
-+// Prereq: s is a string.
-+    var escapeForRegexp = function(s) {
-+        return s
-+            .replace(/([-()[\]{}+?*.$^|,:#<!\\])/g, '\\$1')
-+            // eslint-disable-next-line no-control-regex
-+            .replace(/\x08/g, '\\x08');
-+    };
- 
- 
-     /**
-      * @ngdoc function
-      * @name angular.isElement
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Determines if a reference is a DOM element (or wrapped jQuery element).
-@@ -685,117 +901,59 @@
-      */
-     function isElement(node) {
-         return !!(node &&
--        (node.nodeName  // we are a direct element
--        || (node.prop && node.attr && node.find)));  // we have an on and find method part of jQuery API
-+            (node.nodeName  // We are a direct element.
-+                || (node.prop && node.attr && node.find)));  // We have an on and find method part of jQuery API.
-     }
- 
-     /**
-      * @param str 'key1,key2,...'
-      * @returns {object} in the form of {key1:true, key2:true, ...}
-      */
--    function makeMap(str){
--        var obj = {}, items = str.split(","), i;
--        for ( i = 0; i < items.length; i++ )
--            obj[ items[i] ] = true;
-+    function makeMap(str) {
-+        var obj = {}, items = str.split(','), i;
-+        for (i = 0; i < items.length; i++) {
-+            obj[items[i]] = true;
-+        }
-         return obj;
-     }
- 
- 
--    if (msie < 9) {
--        nodeName_ = function(element) {
--            element = element.nodeName ? element : element[0];
--            return (element.scopeName && element.scopeName != 'HTML')
--                ? uppercase(element.scopeName + ':' + element.nodeName) : element.nodeName;
--        };
--    } else {
--        nodeName_ = function(element) {
--            return element.nodeName ? element.nodeName : element[0].nodeName;
--        };
--    }
--
--
--    function map(obj, iterator, context) {
--        var results = [];
--        forEach(obj, function(value, index, list) {
--            results.push(iterator.call(context, value, index, list));
--        });
--        return results;
--    }
--
--
--    /**
--     * @description
--     * Determines the number of elements in an array, the number of properties an object has, or
--     * the length of a string.
--     *
--     * Note: This function is used to augment the Object type in Angular expressions. See
--     * {@link angular.Object} for more information about Angular arrays.
--     *
--     * @param {Object|Array|string} obj Object, array, or string to inspect.
--     * @param {boolean} [ownPropsOnly=false] Count only "own" properties in an object
--     * @returns {number} The size of `obj` or `0` if `obj` is neither an object nor an array.
--     */
--    function size(obj, ownPropsOnly) {
--        var count = 0, key;
--
--        if (isArray(obj) || isString(obj)) {
--            return obj.length;
--        } else if (isObject(obj)){
--            for (key in obj)
--                if (!ownPropsOnly || obj.hasOwnProperty(key))
--                    count++;
--        }
--
--        return count;
-+    function nodeName_(element) {
-+        return lowercase(element.nodeName || (element[0] && element[0].nodeName));
-     }
- 
--
-     function includes(array, obj) {
--        return indexOf(array, obj) != -1;
--    }
--
--    function indexOf(array, obj) {
--        if (array.indexOf) return array.indexOf(obj);
--
--        for (var i = 0; i < array.length; i++) {
--            if (obj === array[i]) return i;
--        }
--        return -1;
-+        return Array.prototype.indexOf.call(array, obj) !== -1;
-     }
- 
-     function arrayRemove(array, value) {
--        var index = indexOf(array, value);
--        if (index >=0)
-+        var index = array.indexOf(value);
-+        if (index >= 0) {
-             array.splice(index, 1);
--        return value;
--    }
--
--    function isLeafNode (node) {
--        if (node) {
--            switch (node.nodeName) {
--                case "OPTION":
--                case "PRE":
--                case "TITLE":
--                    return true;
--            }
-         }
--        return false;
-+        return index;
-     }
- 
-     /**
-      * @ngdoc function
-      * @name angular.copy
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Creates a deep copy of `source`, which should be an object or an array.
-      *
-      * * If no destination is supplied, a copy of the object or array is created.
--     * * If a destination is provided, all of its elements (for array) or properties (for objects)
-+     * * If a destination is provided, all of its elements (for arrays) or properties (for objects)
-      *   are deleted and then all elements/properties from the source are copied to it.
-      * * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned.
--     * * If `source` is identical to 'destination' an exception will be thrown.
-+     * * If `source` is identical to `destination` an exception will be thrown.
-+     *
-+     * <br />
-+     * <div class="alert alert-warning">
-+     *   Only enumerable properties are taken into account. Non-enumerable properties (both on `source`
-+     *   and on `destination`) will be ignored.
-+     * </div>
-      *
-      * @param {*} source The source that will be used to make a copy.
-      *                   Can be any type, including primitives, `null`, and `undefined`.
-@@ -804,105 +962,198 @@
-      * @returns {*} The copy or updated `destination`, if `destination` was specified.
-      *
-      * @example
--     <example>
-+     <example module="copyExample" name="angular-copy">
-      <file name="index.html">
--     <div ng-controller="Controller">
-+     <div ng-controller="ExampleController">
-      <form novalidate class="simple-form">
--     Name: <input type="text" ng-model="user.name" /><br />
--     Email: <input type="email" ng-model="user.email" /><br />
--     Gender: <input type="radio" ng-model="user.gender" value="male" />male
--     <input type="radio" ng-model="user.gender" value="female" />female<br />
-+     <label>Name: <input type="text" ng-model="user.name" /></label><br />
-+     <label>Age:  <input type="number" ng-model="user.age" /></label><br />
-+     Gender: <label><input type="radio" ng-model="user.gender" value="male" />male</label>
-+     <label><input type="radio" ng-model="user.gender" value="female" />female</label><br />
-      <button ng-click="reset()">RESET</button>
-      <button ng-click="update(user)">SAVE</button>
-      </form>
-      <pre>form = {{user | json}}</pre>
--     <pre>master = {{master | json}}</pre>
-+     <pre>leader = {{leader | json}}</pre>
-      </div>
-+     </file>
-+     <file name="script.js">
-+     // Module: copyExample
-+     angular.
-+     module('copyExample', []).
-+     controller('ExampleController', ['$scope', function($scope) {
-+          $scope.leader = {};
-+
-+          $scope.reset = function() {
-+            // Example with 1 argument
-+            $scope.user = angular.copy($scope.leader);
-+          };
- 
--     <script>
--     function Controller($scope) {
--    $scope.master= {};
--
--    $scope.update = function(user) {
--      // Example with 1 argument
--      $scope.master= angular.copy(user);
--    };
--
--    $scope.reset = function() {
--      // Example with 2 arguments
--      angular.copy($scope.master, $scope.user);
--    };
-+          $scope.update = function(user) {
-+            // Example with 2 arguments
-+            angular.copy(user, $scope.leader);
-+          };
- 
--    $scope.reset();
--  }
--     </script>
-+          $scope.reset();
-+        }]);
-      </file>
-      </example>
-      */
--    function copy(source, destination){
--        if (isWindow(source) || isScope(source)) {
--            throw ngMinErr('cpws',
--                "Can't copy! Making copies of Window or Scope instances is not supported.");
-+    function copy(source, destination, maxDepth) {
-+        var stackSource = [];
-+        var stackDest = [];
-+        maxDepth = isValidObjectMaxDepth(maxDepth) ? maxDepth : NaN;
-+
-+        if (destination) {
-+            if (isTypedArray(destination) || isArrayBuffer(destination)) {
-+                throw ngMinErr('cpta', 'Can\'t copy! TypedArray destination cannot be mutated.');
-+            }
-+            if (source === destination) {
-+                throw ngMinErr('cpi', 'Can\'t copy! Source and destination are identical.');
-+            }
-+
-+            // Empty the destination object
-+            if (isArray(destination)) {
-+                destination.length = 0;
-+            } else {
-+                forEach(destination, function(value, key) {
-+                    if (key !== '$$hashKey') {
-+                        delete destination[key];
-+                    }
-+                });
-+            }
-+
-+            stackSource.push(source);
-+            stackDest.push(destination);
-+            return copyRecurse(source, destination, maxDepth);
-         }
- 
--        if (!destination) {
--            destination = source;
--            if (source) {
--                if (isArray(source)) {
--                    destination = copy(source, []);
--                } else if (isDate(source)) {
--                    destination = new Date(source.getTime());
--                } else if (isRegExp(source)) {
--                    destination = new RegExp(source.source);
--                } else if (isObject(source)) {
--                    destination = copy(source, {});
--                }
-+        return copyElement(source, maxDepth);
-+
-+        function copyRecurse(source, destination, maxDepth) {
-+            maxDepth--;
-+            if (maxDepth < 0) {
-+                return '...';
-             }
--        } else {
--            if (source === destination) throw ngMinErr('cpi',
--                "Can't copy! Source and destination are identical.");
-+            var h = destination.$$hashKey;
-+            var key;
-             if (isArray(source)) {
--                destination.length = 0;
--                for ( var i = 0; i < source.length; i++) {
--                    destination.push(copy(source[i]));
-+                for (var i = 0, ii = source.length; i < ii; i++) {
-+                    destination.push(copyElement(source[i], maxDepth));
-+                }
-+            } else if (isBlankObject(source)) {
-+                // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
-+                for (key in source) {
-+                    destination[key] = copyElement(source[key], maxDepth);
-+                }
-+            } else if (source && typeof source.hasOwnProperty === 'function') {
-+                // Slow path, which must rely on hasOwnProperty
-+                for (key in source) {
-+                    if (source.hasOwnProperty(key)) {
-+                        destination[key] = copyElement(source[key], maxDepth);
-+                    }
-                 }
-             } else {
--                var h = destination.$$hashKey;
--                forEach(destination, function(value, key){
--                    delete destination[key];
--                });
--                for ( var key in source) {
--                    destination[key] = copy(source[key]);
-+                // Slowest path --- hasOwnProperty can't be called as a method
-+                for (key in source) {
-+                    if (hasOwnProperty.call(source, key)) {
-+                        destination[key] = copyElement(source[key], maxDepth);
-+                    }
-                 }
--                setHashKey(destination,h);
-             }
-+            setHashKey(destination, h);
-+            return destination;
-         }
--        return destination;
--    }
- 
--    /**
--     * Create a shallow copy of an object
--     */
--    function shallowCopy(src, dst) {
--        dst = dst || {};
-+        function copyElement(source, maxDepth) {
-+            // Simple values
-+            if (!isObject(source)) {
-+                return source;
-+            }
-+
-+            // Already copied values
-+            var index = stackSource.indexOf(source);
-+            if (index !== -1) {
-+                return stackDest[index];
-+            }
- 
--        for(var key in src) {
--            // shallowCopy is only ever called by $compile nodeLinkFn, which has control over src
--            // so we don't need to worry about using our custom hasOwnProperty here
--            if (src.hasOwnProperty(key) && !(key.charAt(0) === '$' && key.charAt(1) === '$')) {
--                dst[key] = src[key];
-+            if (isWindow(source) || isScope(source)) {
-+                throw ngMinErr('cpws',
-+                    'Can\'t copy! Making copies of Window or Scope instances is not supported.');
-             }
-+
-+            var needsRecurse = false;
-+            var destination = copyType(source);
-+
-+            if (destination === undefined) {
-+                destination = isArray(source) ? [] : Object.create(getPrototypeOf(source));
-+                needsRecurse = true;
-+            }
-+
-+            stackSource.push(source);
-+            stackDest.push(destination);
-+
-+            return needsRecurse
-+                ? copyRecurse(source, destination, maxDepth)
-+                : destination;
-         }
- 
--        return dst;
-+        function copyType(source) {
-+            switch (toString.call(source)) {
-+                case '[object Int8Array]':
-+                case '[object Int16Array]':
-+                case '[object Int32Array]':
-+                case '[object Float32Array]':
-+                case '[object Float64Array]':
-+                case '[object Uint8Array]':
-+                case '[object Uint8ClampedArray]':
-+                case '[object Uint16Array]':
-+                case '[object Uint32Array]':
-+                    return new source.constructor(copyElement(source.buffer), source.byteOffset, source.length);
-+
-+                case '[object ArrayBuffer]':
-+                    // Support: IE10
-+                    if (!source.slice) {
-+                        // If we're in this case we know the environment supports ArrayBuffer
-+                        /* eslint-disable no-undef */
-+                        var copied = new ArrayBuffer(source.byteLength);
-+                        new Uint8Array(copied).set(new Uint8Array(source));
-+                        /* eslint-enable */
-+                        return copied;
-+                    }
-+                    return source.slice(0);
-+
-+                case '[object Boolean]':
-+                case '[object Number]':
-+                case '[object String]':
-+                case '[object Date]':
-+                    return new source.constructor(source.valueOf());
-+
-+                case '[object RegExp]':
-+                    var re = new RegExp(source.source, source.toString().match(/[^/]*$/)[0]);
-+                    re.lastIndex = source.lastIndex;
-+                    return re;
-+
-+                case '[object Blob]':
-+                    return new source.constructor([source], {type: source.type});
-+            }
-+
-+            if (isFunction(source.cloneNode)) {
-+                return source.cloneNode(true);
-+            }
-+        }
-     }
- 
- 
-+// eslint-disable-next-line no-self-compare
-+    function simpleCompare(a, b) { return a === b || (a !== a && b !== b); }
-+
-+
-     /**
-      * @ngdoc function
-      * @name angular.equals
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Determines if two objects or two values are equivalent. Supports value types, regular
-@@ -914,7 +1165,7 @@
-      * * Both objects or values are of the same type and all of their properties are equal by
-      *   comparing them with `angular.equals`.
-      * * Both values are NaN. (In JavaScript, NaN == NaN => false. But we consider two NaN as equal)
--     * * Both values represent the same regular expression (In JavasScript,
-+     * * Both values represent the same regular expression (In JavaScript,
-      *   /abc/ == /abc/ => false. But we consider two regular expressions as equal when their textual
-      *   representation matches).
-      *
-@@ -926,54 +1177,171 @@
-      * @param {*} o1 Object or value to compare.
-      * @param {*} o2 Object or value to compare.
-      * @returns {boolean} True if arguments are equal.
--     */
--    function equals(o1, o2) {
--        if (o1 === o2) return true;
--        if (o1 === null || o2 === null) return false;
--        if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN
--        var t1 = typeof o1, t2 = typeof o2, length, key, keySet;
--        if (t1 == t2) {
--            if (t1 == 'object') {
--                if (isArray(o1)) {
--                    if (!isArray(o2)) return false;
--                    if ((length = o1.length) == o2.length) {
--                        for(key=0; key<length; key++) {
--                            if (!equals(o1[key], o2[key])) return false;
--                        }
--                        return true;
--                    }
--                } else if (isDate(o1)) {
--                    return isDate(o2) && o1.getTime() == o2.getTime();
--                } else if (isRegExp(o1) && isRegExp(o2)) {
--                    return o1.toString() == o2.toString();
--                } else {
--                    if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) || isArray(o2)) return false;
--                    keySet = {};
--                    for(key in o1) {
--                        if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
-+     *
-+     * @example
-+     <example module="equalsExample" name="equalsExample">
-+     <file name="index.html">
-+     <div ng-controller="ExampleController">
-+     <form novalidate>
-+     <h3>User 1</h3>
-+     Name: <input type="text" ng-model="user1.name">
-+     Age: <input type="number" ng-model="user1.age">
-+
-+     <h3>User 2</h3>
-+     Name: <input type="text" ng-model="user2.name">
-+     Age: <input type="number" ng-model="user2.age">
-+
-+     <div>
-+     <br/>
-+     <input type="button" value="Compare" ng-click="compare()">
-+     </div>
-+     User 1: <pre>{{user1 | json}}</pre>
-+     User 2: <pre>{{user2 | json}}</pre>
-+     Equal: <pre>{{result}}</pre>
-+     </form>
-+     </div>
-+     </file>
-+     <file name="script.js">
-+     angular.module('equalsExample', []).controller('ExampleController', ['$scope', function($scope) {
-+          $scope.user1 = {};
-+          $scope.user2 = {};
-+          $scope.compare = function() {
-+            $scope.result = angular.equals($scope.user1, $scope.user2);
-+          };
-+        }]);
-+     </file>
-+     </example>
-+     */
-+    function equals(o1, o2) {
-+        if (o1 === o2) return true;
-+        if (o1 === null || o2 === null) return false;
-+        // eslint-disable-next-line no-self-compare
-+        if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN
-+        var t1 = typeof o1, t2 = typeof o2, length, key, keySet;
-+        if (t1 === t2 && t1 === 'object') {
-+            if (isArray(o1)) {
-+                if (!isArray(o2)) return false;
-+                if ((length = o1.length) === o2.length) {
-+                    for (key = 0; key < length; key++) {
-                         if (!equals(o1[key], o2[key])) return false;
--                        keySet[key] = true;
--                    }
--                    for(key in o2) {
--                        if (!keySet.hasOwnProperty(key) &&
--                            key.charAt(0) !== '$' &&
--                            o2[key] !== undefined &&
--                            !isFunction(o2[key])) return false;
-                     }
-                     return true;
-                 }
-+            } else if (isDate(o1)) {
-+                if (!isDate(o2)) return false;
-+                return simpleCompare(o1.getTime(), o2.getTime());
-+            } else if (isRegExp(o1)) {
-+                if (!isRegExp(o2)) return false;
-+                return o1.toString() === o2.toString();
-+            } else {
-+                if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) ||
-+                    isArray(o2) || isDate(o2) || isRegExp(o2)) return false;
-+                keySet = createMap();
-+                for (key in o1) {
-+                    if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
-+                    if (!equals(o1[key], o2[key])) return false;
-+                    keySet[key] = true;
-+                }
-+                for (key in o2) {
-+                    if (!(key in keySet) &&
-+                        key.charAt(0) !== '$' &&
-+                        isDefined(o2[key]) &&
-+                        !isFunction(o2[key])) return false;
-+                }
-+                return true;
-             }
-         }
-         return false;
-     }
- 
-+    var csp = function() {
-+        if (!isDefined(csp.rules)) {
- 
--    function csp() {
--        return (document.securityPolicy && document.securityPolicy.isActive) ||
--        (document.querySelector &&
--        !!(document.querySelector('[ng-csp]') || document.querySelector('[data-ng-csp]')));
--    }
- 
-+            var ngCspElement = (window.document.querySelector('[ng-csp]') ||
-+                window.document.querySelector('[data-ng-csp]'));
-+
-+            if (ngCspElement) {
-+                var ngCspAttribute = ngCspElement.getAttribute('ng-csp') ||
-+                    ngCspElement.getAttribute('data-ng-csp');
-+                csp.rules = {
-+                    noUnsafeEval: !ngCspAttribute || (ngCspAttribute.indexOf('no-unsafe-eval') !== -1),
-+                    noInlineStyle: !ngCspAttribute || (ngCspAttribute.indexOf('no-inline-style') !== -1)
-+                };
-+            } else {
-+                csp.rules = {
-+                    noUnsafeEval: noUnsafeEval(),
-+                    noInlineStyle: false
-+                };
-+            }
-+        }
-+
-+        return csp.rules;
-+
-+        function noUnsafeEval() {
-+            try {
-+                // eslint-disable-next-line no-new, no-new-func
-+                new Function('');
-+                return false;
-+            } catch (e) {
-+                return true;
-+            }
-+        }
-+    };
-+
-+    /**
-+     * @ngdoc directive
-+     * @module ng
-+     * @name ngJq
-+     *
-+     * @element ANY
-+     * @param {string=} ngJq the name of the library available under `window`
-+     * to be used for angular.element
-+     * @description
-+     * Use this directive to force the angular.element library.  This should be
-+     * used to force either jqLite by leaving ng-jq blank or setting the name of
-+     * the jquery variable under window (eg. jQuery).
-+     *
-+     * Since AngularJS looks for this directive when it is loaded (doesn't wait for the
-+     * DOMContentLoaded event), it must be placed on an element that comes before the script
-+     * which loads angular. Also, only the first instance of `ng-jq` will be used and all
-+     * others ignored.
-+     *
-+     * @example
-+     * This example shows how to force jqLite using the `ngJq` directive to the `html` tag.
-+     ```html
-+     <!doctype html>
-+     <html ng-app ng-jq>
-+     ...
-+     ...
-+     </html>
-+     ```
-+     * @example
-+     * This example shows how to use a jQuery based library of a different name.
-+     * The library name must be available at the top most 'window'.
-+     ```html
-+     <!doctype html>
-+     <html ng-app ng-jq="jQueryLib">
-+     ...
-+     ...
-+     </html>
-+     ```
-+     */
-+    var jq = function() {
-+        if (isDefined(jq.name_)) return jq.name_;
-+        var el;
-+        var i, ii = ngAttrPrefixes.length, prefix, name;
-+        for (i = 0; i < ii; ++i) {
-+            prefix = ngAttrPrefixes[i];
-+            el = window.document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]');
-+            if (el) {
-+                name = el.getAttribute(prefix + 'jq');
-+                break;
-+            }
-+        }
-+
-+        return (jq.name_ = name);
-+    };
- 
-     function concat(array1, array2, index) {
-         return array1.concat(slice.call(array2, index));
-@@ -984,12 +1352,11 @@
-     }
- 
- 
--    /* jshint -W101 */
-     /**
-      * @ngdoc function
-      * @name angular.bind
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Returns a function which calls function `fn` bound to `self` (`self` becomes the `this` for
-@@ -1002,23 +1369,22 @@
-      * @param {...*} args Optional arguments to be prebound to the `fn` function call.
-      * @returns {function()} Function that wraps the `fn` with all the specified bindings.
-      */
--    /* jshint +W101 */
-     function bind(self, fn) {
-         var curryArgs = arguments.length > 2 ? sliceArgs(arguments, 2) : [];
-         if (isFunction(fn) && !(fn instanceof RegExp)) {
-             return curryArgs.length
-                 ? function() {
--                return arguments.length
--                    ? fn.apply(self, curryArgs.concat(slice.call(arguments, 0)))
--                    : fn.apply(self, curryArgs);
--            }
-+                    return arguments.length
-+                        ? fn.apply(self, concat(curryArgs, arguments, 0))
-+                        : fn.apply(self, curryArgs);
-+                }
-                 : function() {
--                return arguments.length
--                    ? fn.apply(self, arguments)
--                    : fn.call(self);
--            };
-+                    return arguments.length
-+                        ? fn.apply(self, arguments)
-+                        : fn.call(self);
-+                };
-         } else {
--            // in IE, native methods are not functions so they cannot be bound (note: they don't need to be)
-+            // In IE, native methods are not functions so they cannot be bound (note: they don't need to be).
-             return fn;
-         }
-     }
-@@ -1027,11 +1393,11 @@
-     function toJsonReplacer(key, value) {
-         var val = value;
- 
--        if (typeof key === 'string' && key.charAt(0) === '$') {
-+        if (typeof key === 'string' && key.charAt(0) === '$' && key.charAt(1) === '$') {
-             val = undefined;
-         } else if (isWindow(value)) {
-             val = '$WINDOW';
--        } else if (value &&  document === value) {
-+        } else if (value &&  window.document === value) {
-             val = '$DOCUMENT';
-         } else if (isScope(value)) {
-             val = '$SCOPE';
-@@ -1045,19 +1411,44 @@
-      * @ngdoc function
-      * @name angular.toJson
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
--     * Serializes input into a JSON-formatted string. Properties with leading $ characters will be
--     * stripped since angular uses this notation internally.
-+     * Serializes input into a JSON-formatted string. Properties with leading $$ characters will be
-+     * stripped since AngularJS uses this notation internally.
-      *
--     * @param {Object|Array|Date|string|number} obj Input to be serialized into JSON.
--     * @param {boolean=} pretty If set to true, the JSON output will contain newlines and whitespace.
-+     * @param {Object|Array|Date|string|number|boolean} obj Input to be serialized into JSON.
-+     * @param {boolean|number} [pretty=2] If set to true, the JSON output will contain newlines and whitespace.
-+     *    If set to an integer, the JSON output will contain that many spaces per indentation.
-      * @returns {string|undefined} JSON-ified string representing `obj`.
-+     * @knownIssue
-+     *
-+     * The Safari browser throws a `RangeError` instead of returning `null` when it tries to stringify a `Date`
-+     * object with an invalid date value. The only reliable way to prevent this is to monkeypatch the
-+     * `Date.prototype.toJSON` method as follows:
-+     *
-+     * ```
-+     * var _DatetoJSON = Date.prototype.toJSON;
-+     * Date.prototype.toJSON = function() {
-+     *   try {
-+     *     return _DatetoJSON.call(this);
-+     *   } catch(e) {
-+     *     if (e instanceof RangeError) {
-+     *       return null;
-+     *     }
-+     *     throw e;
-+     *   }
-+     * };
-+     * ```
-+     *
-+     * See https://github.com/angular/angular.js/pull/14221 for more information.
-      */
-     function toJson(obj, pretty) {
--        if (typeof obj === 'undefined') return undefined;
--        return JSON.stringify(obj, toJsonReplacer, pretty ? '  ' : null);
-+        if (isUndefined(obj)) return undefined;
-+        if (!isNumber(pretty)) {
-+            pretty = pretty ? 2 : null;
-+        }
-+        return JSON.stringify(obj, toJsonReplacer, pretty);
-     }
- 
- 
-@@ -1065,13 +1456,13 @@
-      * @ngdoc function
-      * @name angular.fromJson
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Deserializes a JSON string.
-      *
-      * @param {string} json JSON string to deserialize.
--     * @returns {Object|Array|string|number} Deserialized thingy.
-+     * @returns {Object|Array|string|number} Deserialized JSON string.
-      */
-     function fromJson(json) {
-         return isString(json)
-@@ -1080,37 +1471,43 @@
-     }
- 
- 
--    function toBoolean(value) {
--        if (typeof value === 'function') {
--            value = true;
--        } else if (value && value.length !== 0) {
--            var v = lowercase("" + value);
--            value = !(v == 'f' || v == '0' || v == 'false' || v == 'no' || v == 'n' || v == '[]');
--        } else {
--            value = false;
--        }
--        return value;
-+    var ALL_COLONS = /:/g;
-+    function timezoneToOffset(timezone, fallback) {
-+        // Support: IE 9-11 only, Edge 13-15+
-+        // IE/Edge do not "understand" colon (`:`) in timezone
-+        timezone = timezone.replace(ALL_COLONS, '');
-+        var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000;
-+        return isNumberNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset;
-+    }
-+
-+
-+    function addDateMinutes(date, minutes) {
-+        date = new Date(date.getTime());
-+        date.setMinutes(date.getMinutes() + minutes);
-+        return date;
-     }
- 
-+
-+    function convertTimezoneToLocal(date, timezone, reverse) {
-+        reverse = reverse ? -1 : 1;
-+        var dateTimezoneOffset = date.getTimezoneOffset();
-+        var timezoneOffset = timezoneToOffset(timezone, dateTimezoneOffset);
-+        return addDateMinutes(date, reverse * (timezoneOffset - dateTimezoneOffset));
-+    }
-+
-+
-     /**
-      * @returns {string} Returns the string representation of the element.
-      */
-     function startingTag(element) {
--        element = jqLite(element).clone();
--        try {
--            // turns out IE does not let you set .html() on elements which
--            // are not allowed to have children. So we just ignore it.
--            element.empty();
--        } catch(e) {}
--        // As Per DOM Standards
--        var TEXT_NODE = 3;
-+        element = jqLite(element).clone().empty();
-         var elemHtml = jqLite('<div>').append(element).html();
-         try {
--            return element[0].nodeType === TEXT_NODE ? lowercase(elemHtml) :
-+            return element[0].nodeType === NODE_TYPE_TEXT ? lowercase(elemHtml) :
-                 elemHtml.
--                    match(/^(<[^>]+>)/)[1].
--                    replace(/^<([\w\-]+)/, function(match, nodeName) { return '<' + lowercase(nodeName); });
--        } catch(e) {
-+                match(/^(<[^>]+>)/)[1].
-+                replace(/^<([\w-]+)/, function(match, nodeName) {return '<' + lowercase(nodeName);});
-+        } catch (e) {
-             return lowercase(elemHtml);
-         }
- 
-@@ -1130,8 +1527,8 @@
-     function tryDecodeURIComponent(value) {
-         try {
-             return decodeURIComponent(value);
--        } catch(e) {
--            // Ignore any invalid uri component
-+        } catch (e) {
-+            // Ignore any invalid uri component.
-         }
-     }
- 
-@@ -1141,16 +1538,22 @@
-      * @returns {Object.<string,boolean|Array>}
-      */
-     function parseKeyValue(/**string*/keyValue) {
--        var obj = {}, key_value, key;
--        forEach((keyValue || "").split('&'), function(keyValue){
--            if ( keyValue ) {
--                key_value = keyValue.split('=');
--                key = tryDecodeURIComponent(key_value[0]);
--                if ( isDefined(key) ) {
--                    var val = isDefined(key_value[1]) ? tryDecodeURIComponent(key_value[1]) : true;
--                    if (!obj[key]) {
-+        var obj = {};
-+        forEach((keyValue || '').split('&'), function(keyValue) {
-+            var splitPoint, key, val;
-+            if (keyValue) {
-+                key = keyValue = keyValue.replace(/\+/g,'%20');
-+                splitPoint = keyValue.indexOf('=');
-+                if (splitPoint !== -1) {
-+                    key = keyValue.substring(0, splitPoint);
-+                    val = keyValue.substring(splitPoint + 1);
-+                }
-+                key = tryDecodeURIComponent(key);
-+                if (isDefined(key)) {
-+                    val = isDefined(val) ? tryDecodeURIComponent(val) : true;
-+                    if (!hasOwnProperty.call(obj, key)) {
-                         obj[key] = val;
--                    } else if(isArray(obj[key])) {
-+                    } else if (isArray(obj[key])) {
-                         obj[key].push(val);
-                     } else {
-                         obj[key] = [obj[key],val];
-@@ -1167,11 +1570,11 @@
-             if (isArray(value)) {
-                 forEach(value, function(arrayValue) {
-                     parts.push(encodeUriQuery(key, true) +
--                    (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true)));
-+                        (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true)));
-                 });
-             } else {
-                 parts.push(encodeUriQuery(key, true) +
--                (value === true ? '' : '=' + encodeUriQuery(value, true)));
-+                    (value === true ? '' : '=' + encodeUriQuery(value, true)));
-             }
-         });
-         return parts.length ? parts.join('&') : '';
-@@ -1191,9 +1594,9 @@
-      */
-     function encodeUriSegment(val) {
-         return encodeUriQuery(val, true).
--            replace(/%26/gi, '&').
--            replace(/%3D/gi, '=').
--            replace(/%2B/gi, '+');
-+        replace(/%26/gi, '&').
-+        replace(/%3D/gi, '=').
-+        replace(/%2B/gi, '+');
-     }
- 
- 
-@@ -1201,7 +1604,7 @@
-      * This method is intended for encoding *key* or *value* parts of query component. We need a custom
-      * method because encodeURIComponent is too aggressive and encodes stuff that doesn't have to be
-      * encoded per http://tools.ietf.org/html/rfc3986:
--     *    query       = *( pchar / "/" / "?" )
-+     *    query         = *( pchar / "/" / "?" )
-      *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
-      *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
-      *    pct-encoded   = "%" HEXDIG HEXDIG
-@@ -1210,13 +1613,78 @@
-      */
-     function encodeUriQuery(val, pctEncodeSpaces) {
-         return encodeURIComponent(val).
--            replace(/%40/gi, '@').
--            replace(/%3A/gi, ':').
--            replace(/%24/g, '$').
--            replace(/%2C/gi, ',').
--            replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
-+        replace(/%40/gi, '@').
-+        replace(/%3A/gi, ':').
-+        replace(/%24/g, '$').
-+        replace(/%2C/gi, ',').
-+        replace(/%3B/gi, ';').
-+        replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
-+    }
-+
-+    var ngAttrPrefixes = ['ng-', 'data-ng-', 'ng:', 'x-ng-'];
-+
-+    function getNgAttribute(element, ngAttr) {
-+        var attr, i, ii = ngAttrPrefixes.length;
-+        for (i = 0; i < ii; ++i) {
-+            attr = ngAttrPrefixes[i] + ngAttr;
-+            if (isString(attr = element.getAttribute(attr))) {
-+                return attr;
-+            }
-+        }
-+        return null;
-+    }
-+
-+    function allowAutoBootstrap(document) {
-+        var script = document.currentScript;
-+
-+        if (!script) {
-+            // Support: IE 9-11 only
-+            // IE does not have `document.currentScript`
-+            return true;
-+        }
-+
-+        // If the `currentScript` property has been clobbered just return false, since this indicates a probable attack
-+        if (!(script instanceof window.HTMLScriptElement || script instanceof window.SVGScriptElement)) {
-+            return false;
-+        }
-+
-+        var attributes = script.attributes;
-+        var srcs = [attributes.getNamedItem('src'), attributes.getNamedItem('href'), attributes.getNamedItem('xlink:href')];
-+
-+        return srcs.every(function(src) {
-+            if (!src) {
-+                return true;
-+            }
-+            if (!src.value) {
-+                return false;
-+            }
-+
-+            var link = document.createElement('a');
-+            link.href = src.value;
-+
-+            if (document.location.origin === link.origin) {
-+                // Same-origin resources are always allowed, even for non-whitelisted schemes.
-+                return true;
-+            }
-+            // Disabled bootstrapping unless angular.js was loaded from a known scheme used on the web.
-+            // This is to prevent angular.js bundled with browser extensions from being used to bypass the
-+            // content security policy in web pages and other browser extensions.
-+            switch (link.protocol) {
-+                case 'http:':
-+                case 'https:':
-+                case 'ftp:':
-+                case 'blob:':
-+                case 'file:':
-+                case 'data:':
-+                    return true;
-+                default:
-+                    return false;
-+            }
-+        });
-     }
- 
-+// Cached as it has to run during loading so that document.currentScript is available.
-+    var isAutoBootstrapAllowed = allowAutoBootstrap(window.document);
- 
-     /**
-      * @ngdoc directive
-@@ -1226,6 +1694,11 @@
-      * @element ANY
-      * @param {angular.Module} ngApp an optional application
-      *   {@link angular.module module} name to load.
-+     * @param {boolean=} ngStrictDi if this attribute is present on the app element, the injector will be
-+     *   created in "strict-di" mode. This means that the application will fail to invoke functions which
-+     *   do not use explicit function annotation (and are thus unsuitable for minification), as described
-+     *   in {@link guide/di the Dependency Injection guide}, and useful debugging info will assist in
-+     *   tracking down the root of these bugs.
-      *
-      * @description
-      *
-@@ -1233,13 +1706,20 @@
-      * designates the **root element** of the application and is typically placed near the root element
-      * of the page - e.g. on the `<body>` or `<html>` tags.
-      *
--     * Only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp`
--     * found in the document will be used to define the root element to auto-bootstrap as an
--     * application. To run multiple applications in an HTML document you must manually bootstrap them using
--     * {@link angular.bootstrap} instead. AngularJS applications cannot be nested within each other.
-+     * There are a few things to keep in mind when using `ngApp`:
-+     * - only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp`
-+     *   found in the document will be used to define the root element to auto-bootstrap as an
-+     *   application. To run multiple applications in an HTML document you must manually bootstrap them using
-+     *   {@link angular.bootstrap} instead.
-+     * - AngularJS applications cannot be nested within each other.
-+     * - Do not use a directive that uses {@link ng.$compile#transclusion transclusion} on the same element as `ngApp`.
-+     *   This includes directives such as {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and
-+     *   {@link ngRoute.ngView `ngView`}.
-+     *   Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector},
-+     *   causing animations to stop working and making the injector inaccessible from outside the app.
-      *
-      * You can specify an **AngularJS module** to be used as the root module for the application.  This
--     * module will be loaded into the {@link auto.$injector} when the application is bootstrapped and
-+     * module will be loaded into the {@link auto.$injector} when the application is bootstrapped. It
-      * should contain the application code needed or have dependencies on other modules that will
-      * contain the code. See {@link angular.module} for more information.
-      *
-@@ -1247,9 +1727,13 @@
-      * document would not be compiled, the `AppController` would not be instantiated and the `{{ a+b }}`
-      * would not be resolved to `3`.
-      *
--     * `ngApp` is the easiest, and most common, way to bootstrap an application.
-+     * @example
-+     *
-+     * ### Simple Usage
-+     *
-+     * `ngApp` is the easiest, and most common way to bootstrap an application.
-      *
--     <example module="ngAppDemo">
-+     <example module="ngAppDemo" name="ng-app">
-      <file name="index.html">
-      <div ng-controller="ngAppDemoController">
-      I can add: {{a}} + {{b}} =  {{ a+b }}
-@@ -1263,48 +1747,118 @@
-      </file>
-      </example>
-      *
-+     * @example
-+     *
-+     * ### With `ngStrictDi`
-+     *
-+     * Using `ngStrictDi`, you would see something like this:
-+     *
-+     <example ng-app-included="true" name="strict-di">
-+     <file name="index.html">
-+     <div ng-app="ngAppStrictDemo" ng-strict-di>
-+     <div ng-controller="GoodController1">
-+     I can add: {{a}} + {{b}} =  {{ a+b }}
-+
-+     <p>This renders because the controller does not fail to
-+     instantiate, by using explicit annotation style (see
-+     script.js for details)
-+     </p>
-+     </div>
-+
-+     <div ng-controller="GoodController2">
-+     Name: <input ng-model="name"><br />
-+     Hello, {{name}}!
-+
-+     <p>This renders because the controller does not fail to
-+     instantiate, by using explicit annotation style
-+     (see script.js for details)
-+     </p>
-+     </div>
-+
-+     <div ng-controller="BadController">
-+     I can add: {{a}} + {{b}} =  {{ a+b }}
-+
-+     <p>The controller could not be instantiated, due to relying
-+     on automatic function annotations (which are disabled in
-+     strict mode). As such, the content of this section is not
-+     interpolated, and there should be an error in your web console.
-+     </p>
-+     </div>
-+     </div>
-+     </file>
-+     <file name="script.js">
-+     angular.module('ngAppStrictDemo', [])
-+     // BadController will fail to instantiate, due to relying on automatic function annotation,
-+     // rather than an explicit annotation
-+     .controller('BadController', function($scope) {
-+       $scope.a = 1;
-+       $scope.b = 2;
-+     })
-+     // Unlike BadController, GoodController1 and GoodController2 will not fail to be instantiated,
-+     // due to using explicit annotations using the array style and $inject property, respectively.
-+     .controller('GoodController1', ['$scope', function($scope) {
-+       $scope.a = 1;
-+       $scope.b = 2;
-+     }])
-+     .controller('GoodController2', GoodController2);
-+     function GoodController2($scope) {
-+       $scope.name = 'World';
-+     }
-+     GoodController2.$inject = ['$scope'];
-+     </file>
-+     <file name="style.css">
-+     div[ng-controller] {
-+       margin-bottom: 1em;
-+       -webkit-border-radius: 4px;
-+       border-radius: 4px;
-+       border: 1px solid;
-+       padding: .5em;
-+   }
-+     div[ng-controller^=Good] {
-+       border-color: #d6e9c6;
-+       background-color: #dff0d8;
-+       color: #3c763d;
-+   }
-+     div[ng-controller^=Bad] {
-+       border-color: #ebccd1;
-+       background-color: #f2dede;
-+       color: #a94442;
-+       margin-bottom: 0;
-+   }
-+     </file>
-+     </example>
-      */
-     function angularInit(element, bootstrap) {
--        var elements = [element],
--            appElement,
-+        var appElement,
-             module,
--            names = ['ng:app', 'ng-app', 'x-ng-app', 'data-ng-app'],
--            NG_APP_CLASS_REGEXP = /\sng[:\-]app(:\s*([\w\d_]+);?)?\s/;
-+            config = {};
- 
--        function append(element) {
--            element && elements.push(element);
--        }
-+        // The element `element` has priority over any other element.
-+        forEach(ngAttrPrefixes, function(prefix) {
-+            var name = prefix + 'app';
- 
--        forEach(names, function(name) {
--            names[name] = true;
--            append(document.getElementById(name));
--            name = name.replace(':', '\\:');
--            if (element.querySelectorAll) {
--                forEach(element.querySelectorAll('.' + name), append);
--                forEach(element.querySelectorAll('.' + name + '\\:'), append);
--                forEach(element.querySelectorAll('[' + name + ']'), append);
-+            if (!appElement && element.hasAttribute && element.hasAttribute(name)) {
-+                appElement = element;
-+                module = element.getAttribute(name);
-             }
-         });
-+        forEach(ngAttrPrefixes, function(prefix) {
-+            var name = prefix + 'app';
-+            var candidate;
- 
--        forEach(elements, function(element) {
--            if (!appElement) {
--                var className = ' ' + element.className + ' ';
--                var match = NG_APP_CLASS_REGEXP.exec(className);
--                if (match) {
--                    appElement = element;
--                    module = (match[2] || '').replace(/\s+/g, ',');
--                } else {
--                    forEach(element.attributes, function(attr) {
--                        if (!appElement && names[attr.name]) {
--                            appElement = element;
--                            module = attr.value;
--                        }
--                    });
--                }
-+            if (!appElement && (candidate = element.querySelector('[' + name.replace(':', '\\:') + ']'))) {
-+                appElement = candidate;
-+                module = candidate.getAttribute(name);
-             }
-         });
-         if (appElement) {
--            bootstrap(appElement, module ? [module] : []);
-+            if (!isAutoBootstrapAllowed) {
-+                window.console.error('AngularJS: disabling automatic bootstrap. <script> protocol indicates ' +
-+                    'an extension, document.location.href does not match.');
-+                return;
-+            }
-+            config.strictDi = getNgAttribute(appElement, 'strict-di') !== null;
-+            bootstrap(appElement, module ? [module] : [], config);
-         }
-     }
- 
-@@ -1313,83 +1867,111 @@
-      * @name angular.bootstrap
-      * @module ng
-      * @description
--     * Use this function to manually start up angular application.
-+     * Use this function to manually start up AngularJS application.
-+     *
-+     * For more information, see the {@link guide/bootstrap Bootstrap guide}.
-      *
--     * See: {@link guide/bootstrap Bootstrap}
-+     * AngularJS will detect if it has been loaded into the browser more than once and only allow the
-+     * first loaded script to be bootstrapped and will report a warning to the browser console for
-+     * each of the subsequent scripts. This prevents strange results in applications, where otherwise
-+     * multiple instances of AngularJS try to work on the DOM.
-      *
--     * Note that ngScenario-based end-to-end tests cannot use this function to bootstrap manually.
-+     * <div class="alert alert-warning">
-+     * **Note:** Protractor based end-to-end tests cannot use this function to bootstrap manually.
-      * They must use {@link ng.directive:ngApp ngApp}.
-+     * </div>
-      *
--     * Angular will detect if it has been loaded into the browser more than once and only allow the
--     * first loaded script to be bootstrapped and will report a warning to the browser console for
--     * each of the subsequent scripts.   This prevents strange results in applications, where otherwise
--     * multiple instances of Angular try to work on the DOM.
-+     * <div class="alert alert-warning">
-+     * **Note:** Do not bootstrap the app on an element with a directive that uses {@link ng.$compile#transclusion transclusion},
-+     * such as {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and {@link ngRoute.ngView `ngView`}.
-+     * Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector},
-+     * causing animations to stop working and making the injector inaccessible from outside the app.
-+     * </div>
-      *
--     * <example name="multi-bootstrap" module="multi-bootstrap">
--     * <file name="index.html">
--     * <script src="../../../angular.js"></script>
--     * <div ng-controller="BrokenTable">
--     *   <table>
--     *   <tr>
--     *     <th ng-repeat="heading in headings">{{heading}}</th>
--     *   </tr>
--     *   <tr ng-repeat="filling in fillings">
--     *     <td ng-repeat="fill in filling">{{fill}}</td>
--     *   </tr>
--     * </table>
-+     * ```html
-+     * <!doctype html>
-+     * <html>
-+     * <body>
-+     * <div ng-controller="WelcomeController">
-+     *   {{greeting}}
-      * </div>
--     * </file>
--     * <file name="controller.js">
--     * var app = angular.module('multi-bootstrap', [])
-      *
--     * .controller('BrokenTable', function($scope) {
-- *     $scope.headings = ['One', 'Two', 'Three'];
-- *     $scope.fillings = [[1, 2, 3], ['A', 'B', 'C'], [7, 8, 9]];
-- * });
--     * </file>
--     * <file name="protractor.js" type="protractor">
--     * it('should only insert one table cell for each item in $scope.fillings', function() {
-- *  expect(element.all(by.css('td')).count())
-- *      .toBe(9);
-- * });
--     * </file>
--     * </example>
-+     * <script src="angular.js"></script>
-+     * <script>
-+     *   var app = angular.module('demo', [])
-+     *   .controller('WelcomeController', function($scope) {
-+     *       $scope.greeting = 'Welcome!';
-+     *   });
-+     *   angular.bootstrap(document, ['demo']);
-+     * </script>
-+     * </body>
-+     * </html>
-+     * ```
-      *
--     * @param {DOMElement} element DOM element which is the root of angular application.
-+     * @param {DOMElement} element DOM element which is the root of AngularJS application.
-      * @param {Array<String|Function|Array>=} modules an array of modules to load into the application.
-      *     Each item in the array should be the name of a predefined module or a (DI annotated)
--     *     function that will be invoked by the injector as a run block.
-+     *     function that will be invoked by the injector as a `config` block.
-      *     See: {@link angular.module modules}
-+     * @param {Object=} config an object for defining configuration options for the application. The
-+     *     following keys are supported:
-+     *
-+     * * `strictDi` - disable automatic function annotation for the application. This is meant to
-+     *   assist in finding bugs which break minified code. Defaults to `false`.
-+     *
-      * @returns {auto.$injector} Returns the newly created injector for this app.
-      */
--    function bootstrap(element, modules) {
-+    function bootstrap(element, modules, config) {
-+        if (!isObject(config)) config = {};
-+        var defaultConfig = {
-+            strictDi: false
-+        };
-+        config = extend(defaultConfig, config);
-         var doBootstrap = function() {
-             element = jqLite(element);
- 
-             if (element.injector()) {
--                var tag = (element[0] === document) ? 'document' : startingTag(element);
--                throw ngMinErr('btstrpd', "App Already Bootstrapped with this Element '{0}'", tag);
-+                var tag = (element[0] === window.document) ? 'document' : startingTag(element);
-+                // Encode angle brackets to prevent input from being sanitized to empty string #8683.
-+                throw ngMinErr(
-+                    'btstrpd',
-+                    'App already bootstrapped with this element \'{0}\'',
-+                    tag.replace(/</,'&lt;').replace(/>/,'&gt;'));
-             }
- 
-             modules = modules || [];
-             modules.unshift(['$provide', function($provide) {
-                 $provide.value('$rootElement', element);
-             }]);
-+
-+            if (config.debugInfoEnabled) {
-+                // Pushing so that this overrides `debugInfoEnabled` setting defined in user's `modules`.
-+                modules.push(['$compileProvider', function($compileProvider) {
-+                    $compileProvider.debugInfoEnabled(true);
-+                }]);
-+            }
-+
-             modules.unshift('ng');
--            var injector = createInjector(modules);
--            injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector', '$animate',
--                    function(scope, element, compile, injector, animate) {
--                        scope.$apply(function() {
--                            element.data('$injector', injector);
--                            compile(element)(scope);
--                        });
--                    }]
-+            var injector = createInjector(modules, config.strictDi);
-+            injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector',
-+                function bootstrapApply(scope, element, compile, injector) {
-+                    scope.$apply(function() {
-+                        element.data('$injector', injector);
-+                        compile(element)(scope);
-+                    });
-+                }]
-             );
-             return injector;
-         };
- 
-+        var NG_ENABLE_DEBUG_INFO = /^NG_ENABLE_DEBUG_INFO!/;
-         var NG_DEFER_BOOTSTRAP = /^NG_DEFER_BOOTSTRAP!/;
- 
-+        if (window && NG_ENABLE_DEBUG_INFO.test(window.name)) {
-+            config.debugInfoEnabled = true;
-+            window.name = window.name.replace(NG_ENABLE_DEBUG_INFO, '');
-+        }
-+
-         if (window && !NG_DEFER_BOOTSTRAP.test(window.name)) {
-             return doBootstrap();
-         }
-@@ -1399,40 +1981,104 @@
-             forEach(extraModules, function(module) {
-                 modules.push(module);
-             });
--            doBootstrap();
-+            return doBootstrap();
-         };
-+
-+        if (isFunction(angular.resumeDeferredBootstrap)) {
-+            angular.resumeDeferredBootstrap();
-+        }
-+    }
-+
-+    /**
-+     * @ngdoc function
-+     * @name angular.reloadWithDebugInfo
-+     * @module ng
-+     * @description
-+     * Use this function to reload the current application with debug information turned on.
-+     * This takes precedence over a call to `$compileProvider.debugInfoEnabled(false)`.
-+     *
-+     * See {@link ng.$compileProvider#debugInfoEnabled} for more.
-+     */
-+    function reloadWithDebugInfo() {
-+        window.name = 'NG_ENABLE_DEBUG_INFO!' + window.name;
-+        window.location.reload();
-+    }
-+
-+    /**
-+     * @name angular.getTestability
-+     * @module ng
-+     * @description
-+     * Get the testability service for the instance of AngularJS on the given
-+     * element.
-+     * @param {DOMElement} element DOM element which is the root of AngularJS application.
-+     */
-+    function getTestability(rootElement) {
-+        var injector = angular.element(rootElement).injector();
-+        if (!injector) {
-+            throw ngMinErr('test',
-+                'no injector found for element argument to getTestability');
-+        }
-+        return injector.get('$$testability');
-     }
- 
-     var SNAKE_CASE_REGEXP = /[A-Z]/g;
--    function snake_case(name, separator){
-+    function snake_case(name, separator) {
-         separator = separator || '_';
-         return name.replace(SNAKE_CASE_REGEXP, function(letter, pos) {
-             return (pos ? separator : '') + letter.toLowerCase();
-         });
-     }
- 
-+    var bindJQueryFired = false;
-     function bindJQuery() {
-+        var originalCleanData;
-+
-+        if (bindJQueryFired) {
-+            return;
-+        }
-+
-         // bind to jQuery if present;
--        jQuery = window.jQuery;
--        // reset to jQuery or default to us.
--        if (jQuery) {
-+        var jqName = jq();
-+        jQuery = isUndefined(jqName) ? window.jQuery :   // use jQuery (if present)
-+            !jqName             ? undefined     :   // use jqLite
-+                window[jqName];   // use jQuery specified by `ngJq`
-+
-+        // Use jQuery if it exists with proper functionality, otherwise default to us.
-+        // AngularJS 1.2+ requires jQuery 1.7+ for on()/off() support.
-+        // AngularJS 1.3+ technically requires at least jQuery 2.1+ but it may work with older
-+        // versions. It will not work for sure with jQuery <1.7, though.
-+        if (jQuery && jQuery.fn.on) {
-             jqLite = jQuery;
-             extend(jQuery.fn, {
-                 scope: JQLitePrototype.scope,
-                 isolateScope: JQLitePrototype.isolateScope,
--                controller: JQLitePrototype.controller,
-+                controller: /** @type {?} */ (JQLitePrototype).controller,
-                 injector: JQLitePrototype.injector,
-                 inheritedData: JQLitePrototype.inheritedData
-             });
--            // Method signature:
--            //     jqLitePatchJQueryRemove(name, dispatchThis, filterElems, getterIfNoArguments)
--            jqLitePatchJQueryRemove('remove', true, true, false);
--            jqLitePatchJQueryRemove('empty', false, false, false);
--            jqLitePatchJQueryRemove('html', false, false, true);
-+
-+            // All nodes removed from the DOM via various jQuery APIs like .remove()
-+            // are passed through jQuery.cleanData. Monkey-patch this method to fire
-+            // the $destroy event on all removed nodes.
-+            originalCleanData = jQuery.cleanData;
-+            jQuery.cleanData = function(elems) {
-+                var events;
-+                for (var i = 0, elem; (elem = elems[i]) != null; i++) {
-+                    events = jQuery._data(elem, 'events');
-+                    if (events && events.$destroy) {
-+                        jQuery(elem).triggerHandler('$destroy');
-+                    }
-+                }
-+                originalCleanData(elems);
-+            };
-         } else {
-             jqLite = JQLite;
-         }
-+
-         angular.element = jqLite;
-+
-+        // Prevent double-proxying.
-+        bindJQueryFired = true;
-     }
- 
-     /**
-@@ -1440,7 +2086,7 @@
-      */
-     function assertArg(arg, name, reason) {
-         if (!arg) {
--            throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required"));
-+            throw ngMinErr('areq', 'Argument \'{0}\' is {1}', (name || '?'), (reason || 'required'));
-         }
-         return arg;
-     }
-@@ -1451,7 +2097,7 @@
-         }
- 
-         assertArg(isFunction(arg), name, 'not a function, got ' +
--        (arg && typeof arg == 'object' ? arg.constructor.name || 'Object' : typeof arg));
-+            (arg && typeof arg === 'object' ? arg.constructor.name || 'Object' : typeof arg));
-         return arg;
-     }
- 
-@@ -1462,7 +2108,7 @@
-      */
-     function assertNotHasOwnProperty(name, context) {
-         if (name === 'hasOwnProperty') {
--            throw ngMinErr('badname', "hasOwnProperty is not a valid {0} name", context);
-+            throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
-         }
-     }
- 
-@@ -1496,34 +2142,77 @@
-     /**
-      * Return the DOM siblings between the first and last node in the given array.
-      * @param {Array} array like object
--     * @returns {DOMElement} object containing the elements
-+     * @returns {Array} the inputted object or a jqLite collection containing the nodes
-      */
--    function getBlockElements(nodes) {
--        var startNode = nodes[0],
--            endNode = nodes[nodes.length - 1];
--        if (startNode === endNode) {
--            return jqLite(startNode);
-+    function getBlockNodes(nodes) {
-+        // TODO(perf): update `nodes` instead of creating a new object?
-+        var node = nodes[0];
-+        var endNode = nodes[nodes.length - 1];
-+        var blockNodes;
-+
-+        for (var i = 1; node !== endNode && (node = node.nextSibling); i++) {
-+            if (blockNodes || nodes[i] !== node) {
-+                if (!blockNodes) {
-+                    blockNodes = jqLite(slice.call(nodes, 0, i));
-+                }
-+                blockNodes.push(node);
-+            }
-         }
- 
--        var element = startNode;
--        var elements = [element];
-+        return blockNodes || nodes;
-+    }
-+
-+
-+    /**
-+     * Creates a new object without a prototype. This object is useful for lookup without having to
-+     * guard against prototypically inherited properties via hasOwnProperty.
-+     *
-+     * Related micro-benchmarks:
-+     * - http://jsperf.com/object-create2
-+     * - http://jsperf.com/proto-map-lookup/2
-+     * - http://jsperf.com/for-in-vs-object-keys2
-+     *
-+     * @returns {Object}
-+     */
-+    function createMap() {
-+        return Object.create(null);
-+    }
- 
--        do {
--            element = element.nextSibling;
--            if (!element) break;
--            elements.push(element);
--        } while (element !== endNode);
-+    function stringify(value) {
-+        if (value == null) { // null || undefined
-+            return '';
-+        }
-+        switch (typeof value) {
-+            case 'string':
-+                break;
-+            case 'number':
-+                value = '' + value;
-+                break;
-+            default:
-+                if (hasCustomToString(value) && !isArray(value) && !isDate(value)) {
-+                    value = value.toString();
-+                } else {
-+                    value = toJson(value);
-+                }
-+        }
- 
--        return jqLite(elements);
-+        return value;
-     }
- 
-+    var NODE_TYPE_ELEMENT = 1;
-+    var NODE_TYPE_ATTRIBUTE = 2;
-+    var NODE_TYPE_TEXT = 3;
-+    var NODE_TYPE_COMMENT = 8;
-+    var NODE_TYPE_DOCUMENT = 9;
-+    var NODE_TYPE_DOCUMENT_FRAGMENT = 11;
-+
-     /**
-      * @ngdoc type
-      * @name angular.Module
-      * @module ng
-      * @description
-      *
--     * Interface for configuring angular {@link angular.module modules}.
-+     * Interface for configuring AngularJS {@link angular.module modules}.
-      */
- 
-     function setupModuleLoader(window) {
-@@ -1550,18 +2239,18 @@
-              * @module ng
-              * @description
-              *
--             * The `angular.module` is a global place for creating, registering and retrieving Angular
-+             * The `angular.module` is a global place for creating, registering and retrieving AngularJS
-              * modules.
--             * All modules (angular core or 3rd party) that should be available to an application must be
-+             * All modules (AngularJS core or 3rd party) that should be available to an application must be
-              * registered using this mechanism.
-              *
--             * When passed two or more arguments, a new module is created.  If passed only one argument, an
--             * existing module (the name passed as the first argument to `module`) is retrieved.
-+             * Passing one argument retrieves an existing {@link angular.Module},
-+             * whereas passing more than one argument creates a new {@link angular.Module}
-              *
-              *
-              * # Module
-              *
--             * A module is a collection of services, directives, filters, and configuration information.
-+             * A module is a collection of services, directives, controllers, filters, and configuration information.
-              * `angular.module` is used to configure the {@link auto.$injector $injector}.
-              *
-              * ```js
-@@ -1573,9 +2262,9 @@
-              *
-              * // configure existing services inside initialization blocks.
-              * myModule.config(['$locationProvider', function($locationProvider) {
--     *   // Configure existing providers
--     *   $locationProvider.hashPrefix('!');
--     * }]);
-+             *   // Configure existing providers
-+             *   $locationProvider.hashPrefix('!');
-+             * }]);
-              * ```
-              *
-              * Then you can create an injector and load your modules like this:
-@@ -1589,13 +2278,16 @@
-              * {@link angular.bootstrap} to simplify this process for you.
-              *
-              * @param {!string} name The name of the module to create or retrieve.
--             <<<<<* @param {!Array.<string>=} requires If specified then new module is being created. If
--             >>>>>*        unspecified then the module is being retrieved for further configuration.
--             * @param {Function} configFn Optional configuration function for the module. Same as
-+             * @param {!Array.<string>=} requires If specified then new module is being created. If
-+             *        unspecified then the module is being retrieved for further configuration.
-+             * @param {Function=} configFn Optional configuration function for the module. Same as
-              *        {@link angular.Module#config Module#config()}.
--             * @returns {module} new module with the {@link angular.Module} api.
-+             * @returns {angular.Module} new module with the {@link angular.Module} api.
-              */
-             return function module(name, requires, configFn) {
-+
-+                var info = {};
-+
-                 var assertNotHasOwnProperty = function(name, context) {
-                     if (name === 'hasOwnProperty') {
-                         throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
-@@ -1608,42 +2300,86 @@
-                 }
-                 return ensure(modules, name, function() {
-                     if (!requires) {
--                        throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " +
--                        "the module name or forgot to load it. If registering a module ensure that you " +
--                        "specify the dependencies as the second argument.", name);
-+                        throw $injectorMinErr('nomod', 'Module \'{0}\' is not available! You either misspelled ' +
-+                            'the module name or forgot to load it. If registering a module ensure that you ' +
-+                            'specify the dependencies as the second argument.', name);
-                     }
- 
-                     /** @type {!Array.<Array.<*>>} */
-                     var invokeQueue = [];
- 
-+                    /** @type {!Array.<Function>} */
-+                    var configBlocks = [];
-+
-                     /** @type {!Array.<Function>} */
-                     var runBlocks = [];
- 
--                    var config = invokeLater('$injector', 'invoke');
-+                    var config = invokeLater('$injector', 'invoke', 'push', configBlocks);
- 
-                     /** @type {angular.Module} */
-                     var moduleInstance = {
-                         // Private state
-                         _invokeQueue: invokeQueue,
-+                        _configBlocks: configBlocks,
-                         _runBlocks: runBlocks,
- 
-                         /**
--                         * @ngdoc property
--                         * @name angular.Module#requires
-+                         * @ngdoc method
-+                         * @name angular.Module#info
-                          * @module ng
--                         * @returns {Array.<string>} List of module names which must be loaded before this module.
-+                         *
-+                         * @param {Object=} info Information about the module
-+                         * @returns {Object|Module} The current info object for this module if called as a getter,
-+                         *                          or `this` if called as a setter.
-+                         *
-                          * @description
--                         * Holds the list of modules which the injector will load before the current module is
--                         * loaded.
-+                         * Read and write custom information about this module.
-+                         * For example you could put the version of the module in here.
-+                         *
-+                         * ```js
-+                         * angular.module('myModule', []).info({ version: '1.0.0' });
-+                         * ```
-+                         *
-+                         * The version could then be read back out by accessing the module elsewhere:
-+                         *
-+                         * ```
-+                         * var version = angular.module('myModule').info().version;
-+                         * ```
-+                         *
-+                         * You can also retrieve this information during runtime via the
-+                         * {@link $injector#modules `$injector.modules`} property:
-+                         *
-+                         * ```js
-+                         * var version = $injector.modules['myModule'].info().version;
-+                         * ```
-                          */
--                        requires: requires,
--
-+                        info: function(value) {
-+                            if (isDefined(value)) {
-+                                if (!isObject(value)) throw ngMinErr('aobj', 'Argument \'{0}\' must be an object', 'value');
-+                                info = value;
-+                                return this;
-+                            }
-+                            return info;
-+                        },
-+
-+                        /**
-+                         * @ngdoc property
-+                         * @name angular.Module#requires
-+                         * @module ng
-+                         *
-+                         * @description
-+                         * Holds the list of modules which the injector will load before the current module is
-+                         * loaded.
-+                         */
-+                        requires: requires,
-+
-                         /**
-                          * @ngdoc property
-                          * @name angular.Module#name
-                          * @module ng
--                         * @returns {string} Name of the module.
-+                         *
-                          * @description
-+                         * Name of the module.
-                          */
-                         name: name,
- 
-@@ -1658,7 +2394,7 @@
-                          * @description
-                          * See {@link auto.$provide#provider $provide.provider()}.
-                          */
--                        provider: invokeLater('$provide', 'provider'),
-+                        provider: invokeLaterAndSetModuleName('$provide', 'provider'),
- 
-                         /**
-                          * @ngdoc method
-@@ -1669,7 +2405,7 @@
-                          * @description
-                          * See {@link auto.$provide#factory $provide.factory()}.
-                          */
--                        factory: invokeLater('$provide', 'factory'),
-+                        factory: invokeLaterAndSetModuleName('$provide', 'factory'),
- 
-                         /**
-                          * @ngdoc method
-@@ -1680,7 +2416,7 @@
-                          * @description
-                          * See {@link auto.$provide#service $provide.service()}.
-                          */
--                        service: invokeLater('$provide', 'service'),
-+                        service: invokeLaterAndSetModuleName('$provide', 'service'),
- 
-                         /**
-                          * @ngdoc method
-@@ -1700,11 +2436,23 @@
-                          * @param {string} name constant name
-                          * @param {*} object Constant value.
-                          * @description
--                         * Because the constant are fixed, they get applied before other provide methods.
-+                         * Because the constants are fixed, they get applied before other provide methods.
-                          * See {@link auto.$provide#constant $provide.constant()}.
-                          */
-                         constant: invokeLater('$provide', 'constant', 'unshift'),
- 
-+                        /**
-+                         * @ngdoc method
-+                         * @name angular.Module#decorator
-+                         * @module ng
-+                         * @param {string} name The name of the service to decorate.
-+                         * @param {Function} decorFn This function will be invoked when the service needs to be
-+                         *                           instantiated and should return the decorated service instance.
-+                         * @description
-+                         * See {@link auto.$provide#decorator $provide.decorator()}.
-+                         */
-+                        decorator: invokeLaterAndSetModuleName('$provide', 'decorator', configBlocks),
-+
-                         /**
-                          * @ngdoc method
-                          * @name angular.Module#animation
-@@ -1718,37 +2466,44 @@
-                          *
-                          *
-                          * Defines an animation hook that can be later used with
--                         * {@link ngAnimate.$animate $animate} service and directives that use this service.
-+                         * {@link $animate $animate} service and directives that use this service.
-                          *
-                          * ```js
-                          * module.animation('.animation-name', function($inject1, $inject2) {
--           *   return {
--           *     eventName : function(element, done) {
--           *       //code to run the animation
--           *       //once complete, then run done()
--           *       return function cancellationFunction(element) {
--           *         //code to cancel the animation
--           *       }
--           *     }
--           *   }
--           * })
-+                         *   return {
-+                         *     eventName : function(element, done) {
-+                         *       //code to run the animation
-+                         *       //once complete, then run done()
-+                         *       return function cancellationFunction(element) {
-+                         *         //code to cancel the animation
-+                         *       }
-+                         *     }
-+                         *   }
-+                         * })
-                          * ```
-                          *
--                         * See {@link ngAnimate.$animateProvider#register $animateProvider.register()} and
-+                         * See {@link ng.$animateProvider#register $animateProvider.register()} and
-                          * {@link ngAnimate ngAnimate module} for more information.
-                          */
--                        animation: invokeLater('$animateProvider', 'register'),
-+                        animation: invokeLaterAndSetModuleName('$animateProvider', 'register'),
- 
-                         /**
-                          * @ngdoc method
-                          * @name angular.Module#filter
-                          * @module ng
--                         * @param {string} name Filter name.
-+                         * @param {string} name Filter name - this must be a valid AngularJS expression identifier
-                          * @param {Function} filterFactory Factory function for creating new instance of filter.
-                          * @description
-                          * See {@link ng.$filterProvider#register $filterProvider.register()}.
-+                         *
-+                         * <div class="alert alert-warning">
-+                         * **Note:** Filter names must be valid AngularJS {@link expression} identifiers, such as `uppercase` or `orderBy`.
-+                         * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
-+                         * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
-+                         * (`myapp_subsection_filterx`).
-+                         * </div>
-                          */
--                        filter: invokeLater('$filterProvider', 'register'),
-+                        filter: invokeLaterAndSetModuleName('$filterProvider', 'register'),
- 
-                         /**
-                          * @ngdoc method
-@@ -1760,7 +2515,7 @@
-                          * @description
-                          * See {@link ng.$controllerProvider#register $controllerProvider.register()}.
-                          */
--                        controller: invokeLater('$controllerProvider', 'register'),
-+                        controller: invokeLaterAndSetModuleName('$controllerProvider', 'register'),
- 
-                         /**
-                          * @ngdoc method
-@@ -1773,7 +2528,20 @@
-                          * @description
-                          * See {@link ng.$compileProvider#directive $compileProvider.directive()}.
-                          */
--                        directive: invokeLater('$compileProvider', 'directive'),
-+                        directive: invokeLaterAndSetModuleName('$compileProvider', 'directive'),
-+
-+                        /**
-+                         * @ngdoc method
-+                         * @name angular.Module#component
-+                         * @module ng
-+                         * @param {string} name Name of the component in camel-case (i.e. myComp which will match as my-comp)
-+                         * @param {Object} options Component definition object (a simplified
-+                         *    {@link ng.$compile#directive-definition-object directive definition object})
-+                         *
-+                         * @description
-+                         * See {@link ng.$compileProvider#component $compileProvider.component()}.
-+                         */
-+                        component: invokeLaterAndSetModuleName('$compileProvider', 'component'),
- 
-                         /**
-                          * @ngdoc method
-@@ -1782,7 +2550,15 @@
-                          * @param {Function} configFn Execute this function on module load. Useful for service
-                          *    configuration.
-                          * @description
--                         * Use this method to register work which needs to be performed on module loading.
-+                         * Use this method to configure services by injecting their
-+                         * {@link angular.Module#provider `providers`}, e.g. for adding routes to the
-+                         * {@link ngRoute.$routeProvider $routeProvider}.
-+                         *
-+                         * Note that you can only inject {@link angular.Module#provider `providers`} and
-+                         * {@link angular.Module#constant `constants`} into this function.
-+                         *
-+                         * For more about how to configure services, see
-+                         * {@link providers#provider-recipe Provider Recipe}.
-                          */
-                         config: config,
- 
-@@ -1806,7 +2582,7 @@
-                         config(configFn);
-                     }
- 
--                    return  moduleInstance;
-+                    return moduleInstance;
- 
-                     /**
-                      * @param {string} provider
-@@ -1814,9 +2590,24 @@
-                      * @param {String=} insertMethod
-                      * @returns {angular.Module}
-                      */
--                    function invokeLater(provider, method, insertMethod) {
-+                    function invokeLater(provider, method, insertMethod, queue) {
-+                        if (!queue) queue = invokeQueue;
-                         return function() {
--                            invokeQueue[insertMethod || 'push']([provider, method, arguments]);
-+                            queue[insertMethod || 'push']([provider, method, arguments]);
-+                            return moduleInstance;
-+                        };
-+                    }
-+
-+                    /**
-+                     * @param {string} provider
-+                     * @param {string} method
-+                     * @returns {angular.Module}
-+                     */
-+                    function invokeLaterAndSetModuleName(provider, method, queue) {
-+                        if (!queue) queue = invokeQueue;
-+                        return function(recipeName, factoryFunction) {
-+                            if (factoryFunction && isFunction(factoryFunction)) factoryFunction.$$moduleName = name;
-+                            queue.push([provider, method, arguments]);
-                             return moduleInstance;
-                         };
-                     }
-@@ -1826,82 +2617,165 @@
- 
-     }
- 
--    /* global
--     angularModule: true,
--     version: true,
--
--     $LocaleProvider,
--     $CompileProvider,
--
--     htmlAnchorDirective,
--     inputDirective,
--     inputDirective,
--     formDirective,
--     scriptDirective,
--     selectDirective,
--     styleDirective,
--     optionDirective,
--     ngBindDirective,
--     ngBindHtmlDirective,
--     ngBindTemplateDirective,
--     ngClassDirective,
--     ngClassEvenDirective,
--     ngClassOddDirective,
--     ngCspDirective,
--     ngCloakDirective,
--     ngControllerDirective,
--     ngFormDirective,
--     ngHideDirective,
--     ngIfDirective,
--     ngIncludeDirective,
--     ngIncludeFillContentDirective,
--     ngInitDirective,
--     ngNonBindableDirective,
--     ngPluralizeDirective,
--     ngRepeatDirective,
--     ngShowDirective,
--     ngStyleDirective,
--     ngSwitchDirective,
--     ngSwitchWhenDirective,
--     ngSwitchDefaultDirective,
--     ngOptionsDirective,
--     ngTranscludeDirective,
--     ngModelDirective,
--     ngListDirective,
--     ngChangeDirective,
--     requiredDirective,
--     requiredDirective,
--     ngValueDirective,
--     ngAttributeAliasDirectives,
--     ngEventDirectives,
--
--     $AnchorScrollProvider,
--     $AnimateProvider,
--     $BrowserProvider,
--     $CacheFactoryProvider,
--     $ControllerProvider,
--     $DocumentProvider,
--     $ExceptionHandlerProvider,
--     $FilterProvider,
--     $InterpolateProvider,
--     $IntervalProvider,
--     $HttpProvider,
--     $HttpBackendProvider,
--     $LocationProvider,
--     $LogProvider,
--     $ParseProvider,
--     $RootScopeProvider,
--     $QProvider,
--     $$SanitizeUriProvider,
--     $SceProvider,
--     $SceDelegateProvider,
--     $SnifferProvider,
--     $TemplateCacheProvider,
--     $TimeoutProvider,
--     $$RAFProvider,
--     $$AsyncCallbackProvider,
--     $WindowProvider
-+    /* global shallowCopy: true */
-+
-+    /**
-+     * Creates a shallow copy of an object, an array or a primitive.
-+     *
-+     * Assumes that there are no proto properties for objects.
-      */
-+    function shallowCopy(src, dst) {
-+        if (isArray(src)) {
-+            dst = dst || [];
-+
-+            for (var i = 0, ii = src.length; i < ii; i++) {
-+                dst[i] = src[i];
-+            }
-+        } else if (isObject(src)) {
-+            dst = dst || {};
-+
-+            for (var key in src) {
-+                if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
-+                    dst[key] = src[key];
-+                }
-+            }
-+        }
-+
-+        return dst || src;
-+    }
-+
-+    /* exported toDebugString */
-+
-+    function serializeObject(obj, maxDepth) {
-+        var seen = [];
-+
-+        // There is no direct way to stringify object until reaching a specific depth
-+        // and a very deep object can cause a performance issue, so we copy the object
-+        // based on this specific depth and then stringify it.
-+        if (isValidObjectMaxDepth(maxDepth)) {
-+            // This file is also included in `angular-loader`, so `copy()` might not always be available in
-+            // the closure. Therefore, it is lazily retrieved as `angular.copy()` when needed.
-+            obj = angular.copy(obj, null, maxDepth);
-+        }
-+        return JSON.stringify(obj, function(key, val) {
-+            val = toJsonReplacer(key, val);
-+            if (isObject(val)) {
-+
-+                if (seen.indexOf(val) >= 0) return '...';
-+
-+                seen.push(val);
-+            }
-+            return val;
-+        });
-+    }
-+
-+    function toDebugString(obj, maxDepth) {
-+        if (typeof obj === 'function') {
-+            return obj.toString().replace(/ \{[\s\S]*$/, '');
-+        } else if (isUndefined(obj)) {
-+            return 'undefined';
-+        } else if (typeof obj !== 'string') {
-+            return serializeObject(obj, maxDepth);
-+        }
-+        return obj;
-+    }
-+
-+    /* global angularModule: true,
-+  version: true,
-+
-+  $CompileProvider,
-+
-+  htmlAnchorDirective,
-+  inputDirective,
-+  inputDirective,
-+  formDirective,
-+  scriptDirective,
-+  selectDirective,
-+  optionDirective,
-+  ngBindDirective,
-+  ngBindHtmlDirective,
-+  ngBindTemplateDirective,
-+  ngClassDirective,
-+  ngClassEvenDirective,
-+  ngClassOddDirective,
-+  ngCloakDirective,
-+  ngControllerDirective,
-+  ngFormDirective,
-+  ngHideDirective,
-+  ngIfDirective,
-+  ngIncludeDirective,
-+  ngIncludeFillContentDirective,
-+  ngInitDirective,
-+  ngNonBindableDirective,
-+  ngPluralizeDirective,
-+  ngRepeatDirective,
-+  ngShowDirective,
-+  ngStyleDirective,
-+  ngSwitchDirective,
-+  ngSwitchWhenDirective,
-+  ngSwitchDefaultDirective,
-+  ngOptionsDirective,
-+  ngTranscludeDirective,
-+  ngModelDirective,
-+  ngListDirective,
-+  ngChangeDirective,
-+  patternDirective,
-+  patternDirective,
-+  requiredDirective,
-+  requiredDirective,
-+  minlengthDirective,
-+  minlengthDirective,
-+  maxlengthDirective,
-+  maxlengthDirective,
-+  ngValueDirective,
-+  ngModelOptionsDirective,
-+  ngAttributeAliasDirectives,
-+  ngEventDirectives,
-+
-+  $AnchorScrollProvider,
-+  $AnimateProvider,
-+  $CoreAnimateCssProvider,
-+  $$CoreAnimateJsProvider,
-+  $$CoreAnimateQueueProvider,
-+  $$AnimateRunnerFactoryProvider,
-+  $$AnimateAsyncRunFactoryProvider,
-+  $BrowserProvider,
-+  $CacheFactoryProvider,
-+  $ControllerProvider,
-+  $DateProvider,
-+  $DocumentProvider,
-+  $$IsDocumentHiddenProvider,
-+  $ExceptionHandlerProvider,
-+  $FilterProvider,
-+  $$ForceReflowProvider,
-+  $InterpolateProvider,
-+  $IntervalProvider,
-+  $HttpProvider,
-+  $HttpParamSerializerProvider,
-+  $HttpParamSerializerJQLikeProvider,
-+  $HttpBackendProvider,
-+  $xhrFactoryProvider,
-+  $jsonpCallbacksProvider,
-+  $LocationProvider,
-+  $LogProvider,
-+  $$MapProvider,
-+  $ParseProvider,
-+  $RootScopeProvider,
-+  $QProvider,
-+  $$QProvider,
-+  $$SanitizeUriProvider,
-+  $SceProvider,
-+  $SceDelegateProvider,
-+  $SnifferProvider,
-+  $TemplateCacheProvider,
-+  $TemplateRequestProvider,
-+  $$TestabilityProvider,
-+  $TimeoutProvider,
-+  $$RAFProvider,
-+  $WindowProvider,
-+  $$jqLiteProvider,
-+  $$CookieReaderProvider
-+*/
- 
- 
-     /**
-@@ -1909,8 +2783,9 @@
-      * @name angular.version
-      * @module ng
-      * @description
--     * An object that contains information about the current AngularJS version. This object has the
--     * following properties:
-+     * An object that contains information about the current AngularJS version.
-+     *
-+     * This object has the following properties:
-      *
-      * - `full` – `{string}` – Full version string, such as "0.9.18".
-      * - `major` – `{number}` – Major version number, such as "0".
-@@ -1919,28 +2794,32 @@
-      * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
-      */
-     var version = {
--        full: '1.2.16',    // all of these placeholder strings will be replaced by grunt's
--        major: 1,    // package task
--        minor: 2,
--        dot: 16,
--        codeName: 'badger-enumeration'
-+        // These placeholder strings will be replaced by grunt's `build` task.
-+        // They need to be double- or single-quoted.
-+        full: '1.6.9',
-+        major: 1,
-+        minor: 6,
-+        dot: 9,
-+        codeName: 'fiery-basilisk'
-     };
- 
- 
--    function publishExternalAPI(angular){
-+    function publishExternalAPI(angular) {
-         extend(angular, {
-+            'errorHandlingConfig': errorHandlingConfig,
-             'bootstrap': bootstrap,
-             'copy': copy,
-             'extend': extend,
-+            'merge': merge,
-             'equals': equals,
-             'element': jqLite,
-             'forEach': forEach,
-             'injector': createInjector,
--            'noop':noop,
--            'bind':bind,
-+            'noop': noop,
-+            'bind': bind,
-             'toJson': toJson,
-             'fromJson': fromJson,
--            'identity':identity,
-+            'identity': identity,
-             'isUndefined': isUndefined,
-             'isDefined': isDefined,
-             'isString': isString,
-@@ -1953,17 +2832,17 @@
-             'isDate': isDate,
-             'lowercase': lowercase,
-             'uppercase': uppercase,
--            'callbacks': {counter: 0},
-+            'callbacks': {$$counter: 0},
-+            'getTestability': getTestability,
-+            'reloadWithDebugInfo': reloadWithDebugInfo,
-             '$$minErr': minErr,
--            '$$csp': csp
-+            '$$csp': csp,
-+            '$$encodeUriSegment': encodeUriSegment,
-+            '$$encodeUriQuery': encodeUriQuery,
-+            '$$stringify': stringify
-         });
- 
-         angularModule = setupModuleLoader(window);
--        try {
--            angularModule('ngLocale');
--        } catch (e) {
--            angularModule('ngLocale', []).provider('$locale', $LocaleProvider);
--        }
- 
-         angularModule('ng', ['ngLocale'], ['$provide',
-             function ngModule($provide) {
-@@ -1972,88 +2851,120 @@
-                     $$sanitizeUri: $$SanitizeUriProvider
-                 });
-                 $provide.provider('$compile', $CompileProvider).
--                    directive({
--                        a: htmlAnchorDirective,
--                        input: inputDirective,
--                        textarea: inputDirective,
--                        form: formDirective,
--                        script: scriptDirective,
--                        select: selectDirective,
--                        style: styleDirective,
--                        option: optionDirective,
--                        ngBind: ngBindDirective,
--                        ngBindHtml: ngBindHtmlDirective,
--                        ngBindTemplate: ngBindTemplateDirective,
--                        ngClass: ngClassDirective,
--                        ngClassEven: ngClassEvenDirective,
--                        ngClassOdd: ngClassOddDirective,
--                        ngCloak: ngCloakDirective,
--                        ngController: ngControllerDirective,
--                        ngForm: ngFormDirective,
--                        ngHide: ngHideDirective,
--                        ngIf: ngIfDirective,
--                        ngInclude: ngIncludeDirective,
--                        ngInit: ngInitDirective,
--                        ngNonBindable: ngNonBindableDirective,
--                        ngPluralize: ngPluralizeDirective,
--                        ngRepeat: ngRepeatDirective,
--                        ngShow: ngShowDirective,
--                        ngStyle: ngStyleDirective,
--                        ngSwitch: ngSwitchDirective,
--                        ngSwitchWhen: ngSwitchWhenDirective,
--                        ngSwitchDefault: ngSwitchDefaultDirective,
--                        ngOptions: ngOptionsDirective,
--                        ngTransclude: ngTranscludeDirective,
--                        ngModel: ngModelDirective,
--                        ngList: ngListDirective,
--                        ngChange: ngChangeDirective,
--                        required: requiredDirective,
--                        ngRequired: requiredDirective,
--                        ngValue: ngValueDirective
--                    }).
--                    directive({
--                        ngInclude: ngIncludeFillContentDirective
--                    }).
--                    directive(ngAttributeAliasDirectives).
--                    directive(ngEventDirectives);
-+                directive({
-+                    a: htmlAnchorDirective,
-+                    input: inputDirective,
-+                    textarea: inputDirective,
-+                    form: formDirective,
-+                    script: scriptDirective,
-+                    select: selectDirective,
-+                    option: optionDirective,
-+                    ngBind: ngBindDirective,
-+                    ngBindHtml: ngBindHtmlDirective,
-+                    ngBindTemplate: ngBindTemplateDirective,
-+                    ngClass: ngClassDirective,
-+                    ngClassEven: ngClassEvenDirective,
-+                    ngClassOdd: ngClassOddDirective,
-+                    ngCloak: ngCloakDirective,
-+                    ngController: ngControllerDirective,
-+                    ngForm: ngFormDirective,
-+                    ngHide: ngHideDirective,
-+                    ngIf: ngIfDirective,
-+                    ngInclude: ngIncludeDirective,
-+                    ngInit: ngInitDirective,
-+                    ngNonBindable: ngNonBindableDirective,
-+                    ngPluralize: ngPluralizeDirective,
-+                    ngRepeat: ngRepeatDirective,
-+                    ngShow: ngShowDirective,
-+                    ngStyle: ngStyleDirective,
-+                    ngSwitch: ngSwitchDirective,
-+                    ngSwitchWhen: ngSwitchWhenDirective,
-+                    ngSwitchDefault: ngSwitchDefaultDirective,
-+                    ngOptions: ngOptionsDirective,
-+                    ngTransclude: ngTranscludeDirective,
-+                    ngModel: ngModelDirective,
-+                    ngList: ngListDirective,
-+                    ngChange: ngChangeDirective,
-+                    pattern: patternDirective,
-+                    ngPattern: patternDirective,
-+                    required: requiredDirective,
-+                    ngRequired: requiredDirective,
-+                    minlength: minlengthDirective,
-+                    ngMinlength: minlengthDirective,
-+                    maxlength: maxlengthDirective,
-+                    ngMaxlength: maxlengthDirective,
-+                    ngValue: ngValueDirective,
-+                    ngModelOptions: ngModelOptionsDirective
-+                }).
-+                directive({
-+                    ngInclude: ngIncludeFillContentDirective
-+                }).
-+                directive(ngAttributeAliasDirectives).
-+                directive(ngEventDirectives);
-                 $provide.provider({
-                     $anchorScroll: $AnchorScrollProvider,
-                     $animate: $AnimateProvider,
-+                    $animateCss: $CoreAnimateCssProvider,
-+                    $$animateJs: $$CoreAnimateJsProvider,
-+                    $$animateQueue: $$CoreAnimateQueueProvider,
-+                    $$AnimateRunner: $$AnimateRunnerFactoryProvider,
-+                    $$animateAsyncRun: $$AnimateAsyncRunFactoryProvider,
-                     $browser: $BrowserProvider,
-                     $cacheFactory: $CacheFactoryProvider,
-                     $controller: $ControllerProvider,
-                     $document: $DocumentProvider,
-+                    $$isDocumentHidden: $$IsDocumentHiddenProvider,
-                     $exceptionHandler: $ExceptionHandlerProvider,
-                     $filter: $FilterProvider,
-+                    $$forceReflow: $$ForceReflowProvider,
-                     $interpolate: $InterpolateProvider,
-                     $interval: $IntervalProvider,
-                     $http: $HttpProvider,
-+                    $httpParamSerializer: $HttpParamSerializerProvider,
-+                    $httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider,
-                     $httpBackend: $HttpBackendProvider,
-+                    $xhrFactory: $xhrFactoryProvider,
-+                    $jsonpCallbacks: $jsonpCallbacksProvider,
-                     $location: $LocationProvider,
-                     $log: $LogProvider,
-                     $parse: $ParseProvider,
-                     $rootScope: $RootScopeProvider,
-                     $q: $QProvider,
-+                    $$q: $$QProvider,
-                     $sce: $SceProvider,
-                     $sceDelegate: $SceDelegateProvider,
-                     $sniffer: $SnifferProvider,
-                     $templateCache: $TemplateCacheProvider,
-+                    $templateRequest: $TemplateRequestProvider,
-+                    $$testability: $$TestabilityProvider,
-                     $timeout: $TimeoutProvider,
-                     $window: $WindowProvider,
-                     $$rAF: $$RAFProvider,
--                    $$asyncCallback : $$AsyncCallbackProvider
-+                    $$jqLite: $$jqLiteProvider,
-+                    $$Map: $$MapProvider,
-+                    $$cookieReader: $$CookieReaderProvider
-                 });
-             }
--        ]);
-+        ])
-+            .info({ angularVersion: '1.6.9' });
-     }
- 
--    /* global
-+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-+ *     Any commits to this file should be reviewed with security in mind.  *
-+ *   Changes to this file can potentially create security vulnerabilities. *
-+ *          An approval from 2 Core members with history of modifying      *
-+ *                         this file is required.                          *
-+ *                                                                         *
-+ *  Does the change somehow allow for arbitrary javascript to be executed? *
-+ *    Or allows for someone to change the prototype of built-in objects?   *
-+ *     Or gives undesired access to variables likes document or window?    *
-+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
- 
--     -JQLitePrototype,
--     -addEventListenerFn,
--     -removeEventListenerFn,
--     -BOOLEAN_ATTR
--     */
-+    /* global
-+  JQLitePrototype: true,
-+  BOOLEAN_ATTR: true,
-+  ALIASED_ATTR: true
-+*/
- 
- //////////////////////////////////
- //JQLite
-@@ -2063,37 +2974,45 @@
-      * @ngdoc function
-      * @name angular.element
-      * @module ng
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Wraps a raw DOM element or HTML string as a [jQuery](http://jquery.com) element.
-      *
-      * If jQuery is available, `angular.element` is an alias for the
-      * [jQuery](http://api.jquery.com/jQuery/) function. If jQuery is not available, `angular.element`
--     * delegates to Angular's built-in subset of jQuery, called "jQuery lite" or "jqLite."
-+     * delegates to AngularJS's built-in subset of jQuery, called "jQuery lite" or **jqLite**.
-+     *
-+     * jqLite is a tiny, API-compatible subset of jQuery that allows
-+     * AngularJS to manipulate the DOM in a cross-browser compatible way. jqLite implements only the most
-+     * commonly needed functionality with the goal of having a very small footprint.
-      *
--     * <div class="alert alert-success">jqLite is a tiny, API-compatible subset of jQuery that allows
--     * Angular to manipulate the DOM in a cross-browser compatible way. **jqLite** implements only the most
--     * commonly needed functionality with the goal of having a very small footprint.</div>
-+     * To use `jQuery`, simply ensure it is loaded before the `angular.js` file. You can also use the
-+     * {@link ngJq `ngJq`} directive to specify that jqlite should be used over jQuery, or to use a
-+     * specific version of jQuery if multiple versions exist on the page.
-      *
--     * To use jQuery, simply load it before `DOMContentLoaded` event fired.
-+     * <div class="alert alert-info">**Note:** All element references in AngularJS are always wrapped with jQuery or
-+     * jqLite (such as the element argument in a directive's compile / link function). They are never raw DOM references.</div>
-      *
--     * <div class="alert">**Note:** all element references in Angular are always wrapped with jQuery or
--     * jqLite; they are never raw DOM references.</div>
-+     * <div class="alert alert-warning">**Note:** Keep in mind that this function will not find elements
-+     * by tag name / CSS selector. For lookups by tag name, try instead `angular.element(document).find(...)`
-+     * or `$document.find()`, or use the standard DOM APIs, e.g. `document.querySelectorAll()`.</div>
-      *
--     * ## Angular's jqLite
-+     * ## AngularJS's jqLite
-      * jqLite provides only the following jQuery methods:
-      *
--     * - [`addClass()`](http://api.jquery.com/addClass/)
-+     * - [`addClass()`](http://api.jquery.com/addClass/) - Does not support a function as first argument
-      * - [`after()`](http://api.jquery.com/after/)
-      * - [`append()`](http://api.jquery.com/append/)
--     * - [`attr()`](http://api.jquery.com/attr/)
--     * - [`bind()`](http://api.jquery.com/bind/) - Does not support namespaces, selectors or eventData
-+     * - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters
-+     * - [`bind()`](http://api.jquery.com/bind/) (_deprecated_, use [`on()`](http://api.jquery.com/on/)) - Does not support namespaces, selectors or eventData
-      * - [`children()`](http://api.jquery.com/children/) - Does not support selectors
-      * - [`clone()`](http://api.jquery.com/clone/)
-      * - [`contents()`](http://api.jquery.com/contents/)
--     * - [`css()`](http://api.jquery.com/css/)
-+     * - [`css()`](http://api.jquery.com/css/) - Only retrieves inline-styles, does not call `getComputedStyle()`.
-+     *   As a setter, does not convert numbers to strings or append 'px', and also does not have automatic property prefixing.
-      * - [`data()`](http://api.jquery.com/data/)
-+     * - [`detach()`](http://api.jquery.com/detach/)
-      * - [`empty()`](http://api.jquery.com/empty/)
-      * - [`eq()`](http://api.jquery.com/eq/)
-      * - [`find()`](http://api.jquery.com/find/) - Limited to lookups by tag name
-@@ -2101,26 +3020,26 @@
-      * - [`html()`](http://api.jquery.com/html/)
-      * - [`next()`](http://api.jquery.com/next/) - Does not support selectors
-      * - [`on()`](http://api.jquery.com/on/) - Does not support namespaces, selectors or eventData
--     * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces or selectors
-+     * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces, selectors or event object as parameter
-      * - [`one()`](http://api.jquery.com/one/) - Does not support namespaces or selectors
-      * - [`parent()`](http://api.jquery.com/parent/) - Does not support selectors
-      * - [`prepend()`](http://api.jquery.com/prepend/)
-      * - [`prop()`](http://api.jquery.com/prop/)
--     * - [`ready()`](http://api.jquery.com/ready/)
-+     * - [`ready()`](http://api.jquery.com/ready/) (_deprecated_, use `angular.element(callback)` instead of `angular.element(document).ready(callback)`)
-      * - [`remove()`](http://api.jquery.com/remove/)
--     * - [`removeAttr()`](http://api.jquery.com/removeAttr/)
--     * - [`removeClass()`](http://api.jquery.com/removeClass/)
-+     * - [`removeAttr()`](http://api.jquery.com/removeAttr/) - Does not support multiple attributes
-+     * - [`removeClass()`](http://api.jquery.com/removeClass/) - Does not support a function as first argument
-      * - [`removeData()`](http://api.jquery.com/removeData/)
-      * - [`replaceWith()`](http://api.jquery.com/replaceWith/)
-      * - [`text()`](http://api.jquery.com/text/)
--     * - [`toggleClass()`](http://api.jquery.com/toggleClass/)
--     * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers.
--     * - [`unbind()`](http://api.jquery.com/unbind/) - Does not support namespaces
-+     * - [`toggleClass()`](http://api.jquery.com/toggleClass/) - Does not support a function as first argument
-+     * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers
-+     * - [`unbind()`](http://api.jquery.com/unbind/) (_deprecated_, use [`off()`](http://api.jquery.com/off/)) - Does not support namespaces or event object as parameter
-      * - [`val()`](http://api.jquery.com/val/)
-      * - [`wrap()`](http://api.jquery.com/wrap/)
-      *
-      * ## jQuery/jqLite Extras
--     * Angular also provides the following additional methods and events to both jQuery and jqLite:
-+     * AngularJS also provides the following additional methods and events to both jQuery and jqLite:
-      *
-      * ### Events
-      * - `$destroy` - AngularJS intercepts all jqLite/jQuery's DOM destruction apis and fires this event
-@@ -2134,31 +3053,31 @@
-      *   `'ngModel'`).
-      * - `injector()` - retrieves the injector of the current element or its parent.
-      * - `scope()` - retrieves the {@link ng.$rootScope.Scope scope} of the current
--     *   element or its parent.
-+     *   element or its parent. Requires {@link guide/production#disabling-debug-data Debug Data} to
-+     *   be enabled.
-      * - `isolateScope()` - retrieves an isolate {@link ng.$rootScope.Scope scope} if one is attached directly to the
-      *   current element. This getter should be used only on elements that contain a directive which starts a new isolate
-      *   scope. Calling `scope()` on this element always returns the original non-isolate scope.
-+     *   Requires {@link guide/production#disabling-debug-data Debug Data} to be enabled.
-      * - `inheritedData()` - same as `data()`, but walks up the DOM until a value is found or the top
-      *   parent element is reached.
-      *
-+     * @knownIssue You cannot spy on `angular.element` if you are using Jasmine version 1.x. See
-+     * https://github.com/angular/angular.js/issues/14251 for more information.
-+     *
-      * @param {string|DOMElement} element HTML string or DOMElement to be wrapped into jQuery.
-      * @returns {Object} jQuery object.
-      */
- 
-+    JQLite.expando = 'ng339';
-+
-     var jqCache = JQLite.cache = {},
--        jqName = JQLite.expando = 'ng-' + new Date().getTime(),
--        jqId = 1,
--        addEventListenerFn = (window.document.addEventListener
--            ? function(element, type, fn) {element.addEventListener(type, fn, false);}
--            : function(element, type, fn) {element.attachEvent('on' + type, fn);}),
--        removeEventListenerFn = (window.document.removeEventListener
--            ? function(element, type, fn) {element.removeEventListener(type, fn, false); }
--            : function(element, type, fn) {element.detachEvent('on' + type, fn); });
-+        jqId = 1;
- 
-     /*
--     * !!! This is an undocumented "private" function !!!
--     */
--    var jqData = JQLite._data = function(node) {
-+ * !!! This is an undocumented "private" function !!!
-+ */
-+    JQLite._data = function(node) {
-         //jQuery always returns an object on cache miss
-         return this.cache[node[this.expando]] || {};
-     };
-@@ -2166,70 +3085,37 @@
-     function jqNextId() { return ++jqId; }
- 
- 
--    var SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g;
--    var MOZ_HACK_REGEXP = /^moz([A-Z])/;
-+    var DASH_LOWERCASE_REGEXP = /-([a-z])/g;
-+    var MS_HACK_REGEXP = /^-ms-/;
-+    var MOUSE_EVENT_MAP = { mouseleave: 'mouseout', mouseenter: 'mouseover' };
-     var jqLiteMinErr = minErr('jqLite');
- 
-     /**
--     * Converts snake_case to camelCase.
--     * Also there is special case for Moz prefix starting with upper case letter.
-+     * Converts kebab-case to camelCase.
-+     * There is also a special case for the ms prefix starting with a lowercase letter.
-      * @param name Name to normalize
-      */
--    function camelCase(name) {
--        return name.
--            replace(SPECIAL_CHARS_REGEXP, function(_, separator, letter, offset) {
--                return offset ? letter.toUpperCase() : letter;
--            }).
--            replace(MOZ_HACK_REGEXP, 'Moz$1');
-+    function cssKebabToCamel(name) {
-+        return kebabToCamel(name.replace(MS_HACK_REGEXP, 'ms-'));
-     }
- 
--/////////////////////////////////////////////
--// jQuery mutation patch
--//
--// In conjunction with bindJQuery intercepts all jQuery's DOM destruction apis and fires a
--// $destroy event on all DOM nodes being removed.
--//
--/////////////////////////////////////////////
-+    function fnCamelCaseReplace(all, letter) {
-+        return letter.toUpperCase();
-+    }
- 
--    function jqLitePatchJQueryRemove(name, dispatchThis, filterElems, getterIfNoArguments) {
--        var originalJqFn = jQuery.fn[name];
--        originalJqFn = originalJqFn.$original || originalJqFn;
--        removePatch.$original = originalJqFn;
--        jQuery.fn[name] = removePatch;
--
--        function removePatch(param) {
--            // jshint -W040
--            var list = filterElems && param ? [this.filter(param)] : [this],
--                fireEvent = dispatchThis,
--                set, setIndex, setLength,
--                element, childIndex, childLength, children;
--
--            if (!getterIfNoArguments || param != null) {
--                while(list.length) {
--                    set = list.shift();
--                    for(setIndex = 0, setLength = set.length; setIndex < setLength; setIndex++) {
--                        element = jqLite(set[setIndex]);
--                        if (fireEvent) {
--                            element.triggerHandler('$destroy');
--                        } else {
--                            fireEvent = !fireEvent;
--                        }
--                        for(childIndex = 0, childLength = (children = element.children()).length;
--                            childIndex < childLength;
--                            childIndex++) {
--                            list.push(jQuery(children[childIndex]));
--                        }
--                    }
--                }
--            }
--            return originalJqFn.apply(this, arguments);
--        }
-+    /**
-+     * Converts kebab-case to camelCase.
-+     * @param name Name to normalize
-+     */
-+    function kebabToCamel(name) {
-+        return name
-+            .replace(DASH_LOWERCASE_REGEXP, fnCamelCaseReplace);
-     }
- 
--    var SINGLE_TAG_REGEXP = /^<(\w+)\s*\/?>(?:<\/\1>|)$/;
-+    var SINGLE_TAG_REGEXP = /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/;
-     var HTML_REGEXP = /<|&#?\w+;/;
--    var TAG_NAME_REGEXP = /<([\w:]+)/;
--    var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi;
-+    var TAG_NAME_REGEXP = /<([\w:-]+)/;
-+    var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi;
- 
-     var wrapMap = {
-         'option': [1, '<select multiple="multiple">', '</select>'],
-@@ -2238,33 +3124,46 @@
-         'col': [2, '<table><colgroup>', '</colgroup></table>'],
-         'tr': [2, '<table><tbody>', '</tbody></table>'],
-         'td': [3, '<table><tbody><tr>', '</tr></tbody></table>'],
--        '_default': [0, "", ""]
-+        '_default': [0, '', '']
-     };
- 
-     wrapMap.optgroup = wrapMap.option;
-     wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-     wrapMap.th = wrapMap.td;
- 
-+
-     function jqLiteIsTextNode(html) {
-         return !HTML_REGEXP.test(html);
-     }
- 
-+    function jqLiteAcceptsData(node) {
-+        // The window object can accept data but has no nodeType
-+        // Otherwise we are only interested in elements (1) and documents (9)
-+        var nodeType = node.nodeType;
-+        return nodeType === NODE_TYPE_ELEMENT || !nodeType || nodeType === NODE_TYPE_DOCUMENT;
-+    }
-+
-+    function jqLiteHasData(node) {
-+        for (var key in jqCache[node.ng339]) {
-+            return true;
-+        }
-+        return false;
-+    }
-+
-     function jqLiteBuildFragment(html, context) {
--        var elem, tmp, tag, wrap,
-+        var tmp, tag, wrap,
-             fragment = context.createDocumentFragment(),
--            nodes = [], i, j, jj;
-+            nodes = [], i;
- 
-         if (jqLiteIsTextNode(html)) {
-             // Convert non-html into a text node
-             nodes.push(context.createTextNode(html));
-         } else {
--            tmp = fragment.appendChild(context.createElement('div'));
-             // Convert html into DOM nodes
--            tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase();
-+            tmp = fragment.appendChild(context.createElement('div'));
-+            tag = (TAG_NAME_REGEXP.exec(html) || ['', ''])[1].toLowerCase();
-             wrap = wrapMap[tag] || wrapMap._default;
--            tmp.innerHTML = '<div>&#160;</div>' +
--            wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1></$2>") + wrap[2];
--            tmp.removeChild(tmp.firstChild);
-+            tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, '<$1></$2>') + wrap[2];
- 
-             // Descend through wrappers to the right content
-             i = wrap[0];
-@@ -2272,48 +3171,77 @@
-                 tmp = tmp.lastChild;
-             }
- 
--            for (j=0, jj=tmp.childNodes.length; j<jj; ++j) nodes.push(tmp.childNodes[j]);
-+            nodes = concat(nodes, tmp.childNodes);
- 
-             tmp = fragment.firstChild;
--            tmp.textContent = "";
-+            tmp.textContent = '';
-         }
- 
-         // Remove wrapper from fragment
--        fragment.textContent = "";
--        fragment.innerHTML = ""; // Clear inner HTML
--        return nodes;
-+        fragment.textContent = '';
-+        fragment.innerHTML = ''; // Clear inner HTML
-+        forEach(nodes, function(node) {
-+            fragment.appendChild(node);
-+        });
-+
-+        return fragment;
-     }
- 
-     function jqLiteParseHTML(html, context) {
--        context = context || document;
-+        context = context || window.document;
-         var parsed;
- 
-         if ((parsed = SINGLE_TAG_REGEXP.exec(html))) {
-             return [context.createElement(parsed[1])];
-         }
- 
--        return jqLiteBuildFragment(html, context);
-+        if ((parsed = jqLiteBuildFragment(html, context))) {
-+            return parsed.childNodes;
-+        }
-+
-+        return [];
-+    }
-+
-+    function jqLiteWrapNode(node, wrapper) {
-+        var parent = node.parentNode;
-+
-+        if (parent) {
-+            parent.replaceChild(wrapper, node);
-+        }
-+
-+        wrapper.appendChild(node);
-     }
- 
-+
-+// IE9-11 has no method "contains" in SVG element and in Node.prototype. Bug #10259.
-+    var jqLiteContains = window.Node.prototype.contains || /** @this */ function(arg) {
-+        // eslint-disable-next-line no-bitwise
-+        return !!(this.compareDocumentPosition(arg) & 16);
-+    };
-+
- /////////////////////////////////////////////
-     function JQLite(element) {
-         if (element instanceof JQLite) {
-             return element;
-         }
-+
-+        var argIsString;
-+
-         if (isString(element)) {
-             element = trim(element);
-+            argIsString = true;
-         }
-         if (!(this instanceof JQLite)) {
--            if (isString(element) && element.charAt(0) != '<') {
-+            if (argIsString && element.charAt(0) !== '<') {
-                 throw jqLiteMinErr('nosel', 'Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element');
-             }
-             return new JQLite(element);
-         }
- 
--        if (isString(element)) {
-+        if (argIsString) {
-             jqLiteAddNodes(this, jqLiteParseHTML(element));
--            var fragment = jqLite(document.createDocumentFragment());
--            fragment.append(this);
-+        } else if (isFunction(element)) {
-+            jqLiteReady(element);
-         } else {
-             jqLiteAddNodes(this, element);
-         }
-@@ -2323,206 +3251,265 @@
-         return element.cloneNode(true);
-     }
- 
--    function jqLiteDealoc(element){
--        jqLiteRemoveData(element);
--        for ( var i = 0, children = element.childNodes || []; i < children.length; i++) {
--            jqLiteDealoc(children[i]);
-+    function jqLiteDealoc(element, onlyDescendants) {
-+        if (!onlyDescendants && jqLiteAcceptsData(element)) jqLite.cleanData([element]);
-+
-+        if (element.querySelectorAll) {
-+            jqLite.cleanData(element.querySelectorAll('*'));
-         }
-     }
- 
-     function jqLiteOff(element, type, fn, unsupported) {
-         if (isDefined(unsupported)) throw jqLiteMinErr('offargs', 'jqLite#off() does not support the `selector` argument');
- 
--        var events = jqLiteExpandoStore(element, 'events'),
--            handle = jqLiteExpandoStore(element, 'handle');
-+        var expandoStore = jqLiteExpandoStore(element);
-+        var events = expandoStore && expandoStore.events;
-+        var handle = expandoStore && expandoStore.handle;
- 
-         if (!handle) return; //no listeners registered
- 
--        if (isUndefined(type)) {
--            forEach(events, function(eventHandler, type) {
--                removeEventListenerFn(element, type, eventHandler);
-+        if (!type) {
-+            for (type in events) {
-+                if (type !== '$destroy') {
-+                    element.removeEventListener(type, handle);
-+                }
-                 delete events[type];
--            });
-+            }
-         } else {
--            forEach(type.split(' '), function(type) {
--                if (isUndefined(fn)) {
--                    removeEventListenerFn(element, type, events[type]);
-+
-+            var removeHandler = function(type) {
-+                var listenerFns = events[type];
-+                if (isDefined(fn)) {
-+                    arrayRemove(listenerFns || [], fn);
-+                }
-+                if (!(isDefined(fn) && listenerFns && listenerFns.length > 0)) {
-+                    element.removeEventListener(type, handle);
-                     delete events[type];
--                } else {
--                    arrayRemove(events[type] || [], fn);
-+                }
-+            };
-+
-+            forEach(type.split(' '), function(type) {
-+                removeHandler(type);
-+                if (MOUSE_EVENT_MAP[type]) {
-+                    removeHandler(MOUSE_EVENT_MAP[type]);
-                 }
-             });
-         }
-     }
- 
-     function jqLiteRemoveData(element, name) {
--        var expandoId = element[jqName],
--            expandoStore = jqCache[expandoId];
-+        var expandoId = element.ng339;
-+        var expandoStore = expandoId && jqCache[expandoId];
- 
-         if (expandoStore) {
-             if (name) {
--                delete jqCache[expandoId].data[name];
-+                delete expandoStore.data[name];
-                 return;
-             }
- 
-             if (expandoStore.handle) {
--                expandoStore.events.$destroy && expandoStore.handle({}, '$destroy');
-+                if (expandoStore.events.$destroy) {
-+                    expandoStore.handle({}, '$destroy');
-+                }
-                 jqLiteOff(element);
-             }
-             delete jqCache[expandoId];
--            element[jqName] = undefined; // ie does not allow deletion of attributes on elements.
-+            element.ng339 = undefined; // don't delete DOM expandos. IE and Chrome don't like it
-         }
-     }
- 
--    function jqLiteExpandoStore(element, key, value) {
--        var expandoId = element[jqName],
--            expandoStore = jqCache[expandoId || -1];
- 
--        if (isDefined(value)) {
--            if (!expandoStore) {
--                element[jqName] = expandoId = jqNextId();
--                expandoStore = jqCache[expandoId] = {};
--            }
--            expandoStore[key] = value;
--        } else {
--            return expandoStore && expandoStore[key];
-+    function jqLiteExpandoStore(element, createIfNecessary) {
-+        var expandoId = element.ng339,
-+            expandoStore = expandoId && jqCache[expandoId];
-+
-+        if (createIfNecessary && !expandoStore) {
-+            element.ng339 = expandoId = jqNextId();
-+            expandoStore = jqCache[expandoId] = {events: {}, data: {}, handle: undefined};
-         }
-+
-+        return expandoStore;
-     }
- 
-+
-     function jqLiteData(element, key, value) {
--        var data = jqLiteExpandoStore(element, 'data'),
--            isSetter = isDefined(value),
--            keyDefined = !isSetter && isDefined(key),
--            isSimpleGetter = keyDefined && !isObject(key);
-+        if (jqLiteAcceptsData(element)) {
-+            var prop;
- 
--        if (!data && !isSimpleGetter) {
--            jqLiteExpandoStore(element, 'data', data = {});
--        }
-+            var isSimpleSetter = isDefined(value);
-+            var isSimpleGetter = !isSimpleSetter && key && !isObject(key);
-+            var massGetter = !key;
-+            var expandoStore = jqLiteExpandoStore(element, !isSimpleGetter);
-+            var data = expandoStore && expandoStore.data;
- 
--        if (isSetter) {
--            data[key] = value;
--        } else {
--            if (keyDefined) {
--                if (isSimpleGetter) {
--                    // don't create data in this case.
--                    return data && data[key];
-+            if (isSimpleSetter) { // data('key', value)
-+                data[kebabToCamel(key)] = value;
-+            } else {
-+                if (massGetter) {  // data()
-+                    return data;
-                 } else {
--                    extend(data, key);
-+                    if (isSimpleGetter) { // data('key')
-+                        // don't force creation of expandoStore if it doesn't exist yet
-+                        return data && data[kebabToCamel(key)];
-+                    } else { // mass-setter: data({key1: val1, key2: val2})
-+                        for (prop in key) {
-+                            data[kebabToCamel(prop)] = key[prop];
-+                        }
-+                    }
-                 }
--            } else {
--                return data;
-             }
-         }
-     }
- 
-     function jqLiteHasClass(element, selector) {
-         if (!element.getAttribute) return false;
--        return ((" " + (element.getAttribute('class') || '') + " ").replace(/[\n\t]/g, " ").
--            indexOf( " " + selector + " " ) > -1);
-+        return ((' ' + (element.getAttribute('class') || '') + ' ').replace(/[\n\t]/g, ' ').
-+        indexOf(' ' + selector + ' ') > -1);
-     }
- 
-     function jqLiteRemoveClass(element, cssClasses) {
-         if (cssClasses && element.setAttribute) {
-+            var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ')
-+                .replace(/[\n\t]/g, ' ');
-+            var newClasses = existingClasses;
-+
-             forEach(cssClasses.split(' '), function(cssClass) {
--                element.setAttribute('class', trim(
--                        (" " + (element.getAttribute('class') || '') + " ")
--                            .replace(/[\n\t]/g, " ")
--                            .replace(" " + trim(cssClass) + " ", " "))
--                );
-+                cssClass = trim(cssClass);
-+                newClasses = newClasses.replace(' ' + cssClass + ' ', ' ');
-             });
-+
-+            if (newClasses !== existingClasses) {
-+                element.setAttribute('class', trim(newClasses));
-+            }
-         }
-     }
- 
-     function jqLiteAddClass(element, cssClasses) {
-         if (cssClasses && element.setAttribute) {
-             var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ')
--                .replace(/[\n\t]/g, " ");
-+                .replace(/[\n\t]/g, ' ');
-+            var newClasses = existingClasses;
- 
-             forEach(cssClasses.split(' '), function(cssClass) {
-                 cssClass = trim(cssClass);
--                if (existingClasses.indexOf(' ' + cssClass + ' ') === -1) {
--                    existingClasses += cssClass + ' ';
-+                if (newClasses.indexOf(' ' + cssClass + ' ') === -1) {
-+                    newClasses += cssClass + ' ';
-                 }
-             });
- 
--            element.setAttribute('class', trim(existingClasses));
-+            if (newClasses !== existingClasses) {
-+                element.setAttribute('class', trim(newClasses));
-+            }
-         }
-     }
- 
-+
-     function jqLiteAddNodes(root, elements) {
-+        // THIS CODE IS VERY HOT. Don't make changes without benchmarking.
-+
-         if (elements) {
--            elements = (!elements.nodeName && isDefined(elements.length) && !isWindow(elements))
--                ? elements
--                : [ elements ];
--            for(var i=0; i < elements.length; i++) {
--                root.push(elements[i]);
-+
-+            // if a Node (the most common case)
-+            if (elements.nodeType) {
-+                root[root.length++] = elements;
-+            } else {
-+                var length = elements.length;
-+
-+                // if an Array or NodeList and not a Window
-+                if (typeof length === 'number' && elements.window !== elements) {
-+                    if (length) {
-+                        for (var i = 0; i < length; i++) {
-+                            root[root.length++] = elements[i];
-+                        }
-+                    }
-+                } else {
-+                    root[root.length++] = elements;
-+                }
-             }
-         }
-     }
- 
-+
-     function jqLiteController(element, name) {
--        return jqLiteInheritedData(element, '$' + (name || 'ngController' ) + 'Controller');
-+        return jqLiteInheritedData(element, '$' + (name || 'ngController') + 'Controller');
-     }
- 
-     function jqLiteInheritedData(element, name, value) {
--        element = jqLite(element);
--
-         // if element is the document object work with the html element instead
-         // this makes $(document).scope() possible
--        if(element[0].nodeType == 9) {
--            element = element.find('html');
-+        if (element.nodeType === NODE_TYPE_DOCUMENT) {
-+            element = element.documentElement;
-         }
-         var names = isArray(name) ? name : [name];
- 
--        while (element.length) {
--            var node = element[0];
-+        while (element) {
-             for (var i = 0, ii = names.length; i < ii; i++) {
--                if ((value = element.data(names[i])) !== undefined) return value;
-+                if (isDefined(value = jqLite.data(element, names[i]))) return value;
-             }
- 
-             // If dealing with a document fragment node with a host element, and no parent, use the host
-             // element as the parent. This enables directives within a Shadow DOM or polyfilled Shadow DOM
-             // to lookup parent controllers.
--            element = jqLite(node.parentNode || (node.nodeType === 11 && node.host));
-+            element = element.parentNode || (element.nodeType === NODE_TYPE_DOCUMENT_FRAGMENT && element.host);
-         }
-     }
- 
-     function jqLiteEmpty(element) {
--        for (var i = 0, childNodes = element.childNodes; i < childNodes.length; i++) {
--            jqLiteDealoc(childNodes[i]);
--        }
-+        jqLiteDealoc(element, true);
-         while (element.firstChild) {
-             element.removeChild(element.firstChild);
-         }
-     }
- 
-+    function jqLiteRemove(element, keepData) {
-+        if (!keepData) jqLiteDealoc(element);
-+        var parent = element.parentNode;
-+        if (parent) parent.removeChild(element);
-+    }
-+
-+
-+    function jqLiteDocumentLoaded(action, win) {
-+        win = win || window;
-+        if (win.document.readyState === 'complete') {
-+            // Force the action to be run async for consistent behavior
-+            // from the action's point of view
-+            // i.e. it will definitely not be in a $apply
-+            win.setTimeout(action);
-+        } else {
-+            // No need to unbind this handler as load is only ever called once
-+            jqLite(win).on('load', action);
-+        }
-+    }
-+
-+    function jqLiteReady(fn) {
-+        function trigger() {
-+            window.document.removeEventListener('DOMContentLoaded', trigger);
-+            window.removeEventListener('load', trigger);
-+            fn();
-+        }
-+
-+        // check if document is already loaded
-+        if (window.document.readyState === 'complete') {
-+            window.setTimeout(fn);
-+        } else {
-+            // We can not use jqLite since we are not done loading and jQuery could be loaded later.
-+
-+            // Works for modern browsers and IE9
-+            window.document.addEventListener('DOMContentLoaded', trigger);
-+
-+            // Fallback to window.onload for others
-+            window.addEventListener('load', trigger);
-+        }
-+    }
-+
- //////////////////////////////////////////
- // Functions which are declared directly.
- //////////////////////////////////////////
-     var JQLitePrototype = JQLite.prototype = {
--        ready: function(fn) {
--            var fired = false;
--
--            function trigger() {
--                if (fired) return;
--                fired = true;
--                fn();
--            }
--
--            // check if document already is loaded
--            if (document.readyState === 'complete'){
--                setTimeout(trigger);
--            } else {
--                this.on('DOMContentLoaded', trigger); // works for modern browsers and IE9
--                // we can not use jqLite since we are not done loading and jQuery could be loaded later.
--                // jshint -W064
--                JQLite(window).on('load', trigger); // fallback to window.onload for others
--                // jshint +W064
--            }
--        },
-+        ready: jqLiteReady,
-         toString: function() {
-             var value = [];
--            forEach(this, function(e){ value.push('' + e);});
-+            forEach(this, function(e) { value.push('' + e);});
-             return '[' + value.join(', ') + ']';
-         },
- 
-@@ -2547,29 +3534,54 @@
-     });
-     var BOOLEAN_ELEMENTS = {};
-     forEach('input,select,option,textarea,button,form,details'.split(','), function(value) {
--        BOOLEAN_ELEMENTS[uppercase(value)] = true;
-+        BOOLEAN_ELEMENTS[value] = true;
-     });
-+    var ALIASED_ATTR = {
-+        'ngMinlength': 'minlength',
-+        'ngMaxlength': 'maxlength',
-+        'ngMin': 'min',
-+        'ngMax': 'max',
-+        'ngPattern': 'pattern',
-+        'ngStep': 'step'
-+    };
- 
-     function getBooleanAttrName(element, name) {
-         // check dom last since we will most likely fail on name
-         var booleanAttr = BOOLEAN_ATTR[name.toLowerCase()];
- 
-         // booleanAttr is here twice to minimize DOM access
--        return booleanAttr && BOOLEAN_ELEMENTS[element.nodeName] && booleanAttr;
-+        return booleanAttr && BOOLEAN_ELEMENTS[nodeName_(element)] && booleanAttr;
-+    }
-+
-+    function getAliasedAttrName(name) {
-+        return ALIASED_ATTR[name];
-     }
- 
-+    forEach({
-+        data: jqLiteData,
-+        removeData: jqLiteRemoveData,
-+        hasData: jqLiteHasData,
-+        cleanData: function jqLiteCleanData(nodes) {
-+            for (var i = 0, ii = nodes.length; i < ii; i++) {
-+                jqLiteRemoveData(nodes[i]);
-+            }
-+        }
-+    }, function(fn, name) {
-+        JQLite[name] = fn;
-+    });
-+
-     forEach({
-         data: jqLiteData,
-         inheritedData: jqLiteInheritedData,
- 
-         scope: function(element) {
-             // Can't use jqLiteData here directly so we stay compatible with jQuery!
--            return jqLite(element).data('$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']);
-+            return jqLite.data(element, '$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']);
-         },
- 
-         isolateScope: function(element) {
-             // Can't use jqLiteData here directly so we stay compatible with jQuery!
--            return jqLite(element).data('$isolateScope') || jqLite(element).data('$isolateScopeNoTemplate');
-+            return jqLite.data(element, '$isolateScope') || jqLite.data(element, '$isolateScopeNoTemplate');
-         },
- 
-         controller: jqLiteController,
-@@ -2578,61 +3590,50 @@
-             return jqLiteInheritedData(element, '$injector');
-         },
- 
--        removeAttr: function(element,name) {
-+        removeAttr: function(element, name) {
-             element.removeAttribute(name);
-         },
- 
-         hasClass: jqLiteHasClass,
- 
-         css: function(element, name, value) {
--            name = camelCase(name);
-+            name = cssKebabToCamel(name);
- 
-             if (isDefined(value)) {
-                 element.style[name] = value;
-             } else {
--                var val;
-+                return element.style[name];
-+            }
-+        },
- 
--                if (msie <= 8) {
--                    // this is some IE specific weirdness that jQuery 1.6.4 does not sure why
--                    val = element.currentStyle && element.currentStyle[name];
--                    if (val === '') val = 'auto';
--                }
-+        attr: function(element, name, value) {
-+            var ret;
-+            var nodeType = element.nodeType;
-+            if (nodeType === NODE_TYPE_TEXT || nodeType === NODE_TYPE_ATTRIBUTE || nodeType === NODE_TYPE_COMMENT ||
-+                !element.getAttribute) {
-+                return;
-+            }
- 
--                val = val || element.style[name];
-+            var lowercasedName = lowercase(name);
-+            var isBooleanAttr = BOOLEAN_ATTR[lowercasedName];
-+
-+            if (isDefined(value)) {
-+                // setter
- 
--                if (msie <= 8) {
--                    // jquery weirdness :-/
--                    val = (val === '') ? undefined : val;
-+                if (value === null || (value === false && isBooleanAttr)) {
-+                    element.removeAttribute(name);
-+                } else {
-+                    element.setAttribute(name, isBooleanAttr ? lowercasedName : value);
-                 }
-+            } else {
-+                // getter
- 
--                return  val;
--            }
--        },
-+                ret = element.getAttribute(name);
- 
--        attr: function(element, name, value){
--            var lowercasedName = lowercase(name);
--            if (BOOLEAN_ATTR[lowercasedName]) {
--                if (isDefined(value)) {
--                    if (!!value) {
--                        element[name] = true;
--                        element.setAttribute(name, lowercasedName);
--                    } else {
--                        element[name] = false;
--                        element.removeAttribute(lowercasedName);
--                    }
--                } else {
--                    return (element[name] ||
--                    (element.attributes.getNamedItem(name)|| noop).specified)
--                        ? lowercasedName
--                        : undefined;
--                }
--            } else if (isDefined(value)) {
--                element.setAttribute(name, value);
--            } else if (element.getAttribute) {
--                // the extra argument "2" is to get the right thing for a.href in IE, see jQuery code
--                // some elements (e.g. Document) don't have get attribute, so return undefined
--                var ret = element.getAttribute(name, 2);
--                // normalize non-existing attributes to undefined (as jQuery)
-+                if (isBooleanAttr && ret !== null) {
-+                    ret = lowercasedName;
-+                }
-+                // Normalize non-existing attributes to undefined (as jQuery).
-                 return ret === null ? undefined : ret;
-             }
-         },
-@@ -2646,36 +3647,28 @@
-         },
- 
-         text: (function() {
--            var NODE_TYPE_TEXT_PROPERTY = [];
--            if (msie < 9) {
--                NODE_TYPE_TEXT_PROPERTY[1] = 'innerText';    /** Element **/
--                NODE_TYPE_TEXT_PROPERTY[3] = 'nodeValue';    /** Text **/
--            } else {
--                NODE_TYPE_TEXT_PROPERTY[1] =                 /** Element **/
--                    NODE_TYPE_TEXT_PROPERTY[3] = 'textContent';  /** Text **/
--            }
-             getText.$dv = '';
-             return getText;
- 
-             function getText(element, value) {
--                var textProp = NODE_TYPE_TEXT_PROPERTY[element.nodeType];
-                 if (isUndefined(value)) {
--                    return textProp ? element[textProp] : '';
-+                    var nodeType = element.nodeType;
-+                    return (nodeType === NODE_TYPE_ELEMENT || nodeType === NODE_TYPE_TEXT) ? element.textContent : '';
-                 }
--                element[textProp] = value;
-+                element.textContent = value;
-             }
-         })(),
- 
-         val: function(element, value) {
-             if (isUndefined(value)) {
--                if (nodeName_(element) === 'SELECT' && element.multiple) {
-+                if (element.multiple && nodeName_(element) === 'select') {
-                     var result = [];
--                    forEach(element.options, function (option) {
-+                    forEach(element.options, function(option) {
-                         if (option.selected) {
-                             result.push(option.value || option.text);
-                         }
-                     });
--                    return result.length === 0 ? null : result;
-+                    return result;
-                 }
-                 return element.value;
-             }
-@@ -2686,29 +3679,28 @@
-             if (isUndefined(value)) {
-                 return element.innerHTML;
-             }
--            for (var i = 0, childNodes = element.childNodes; i < childNodes.length; i++) {
--                jqLiteDealoc(childNodes[i]);
--            }
-+            jqLiteDealoc(element, true);
-             element.innerHTML = value;
-         },
- 
-         empty: jqLiteEmpty
--    }, function(fn, name){
-+    }, function(fn, name) {
-         /**
-          * Properties: writes return selection, reads return first value
-          */
-         JQLite.prototype[name] = function(arg1, arg2) {
-             var i, key;
-+            var nodeCount = this.length;
- 
-             // jqLiteHasClass has only two arguments, but is a getter-only fn, so we need to special-case it
-             // in a way that survives minification.
-             // jqLiteEmpty takes no arguments but is a setter.
-             if (fn !== jqLiteEmpty &&
--                (((fn.length == 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2) === undefined)) {
-+                (isUndefined((fn.length === 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2))) {
-                 if (isObject(arg1)) {
- 
-                     // we are a write, but the object properties are the key/values
--                    for (i = 0; i < this.length; i++) {
-+                    for (i = 0; i < nodeCount; i++) {
-                         if (fn === jqLiteData) {
-                             // data() takes the whole object in jQuery
-                             fn(this[i], arg1);
-@@ -2722,9 +3714,10 @@
-                     return this;
-                 } else {
-                     // we are a read, so read the first child.
-+                    // TODO: do we still need this?
-                     var value = fn.$dv;
-                     // Only if we have $dv do we iterate over all, otherwise it is just the first element.
--                    var jj = (value === undefined) ? Math.min(this.length, 1) : this.length;
-+                    var jj = (isUndefined(value)) ? Math.min(nodeCount, 1) : nodeCount;
-                     for (var j = 0; j < jj; j++) {
-                         var nodeValue = fn(this[j], arg1, arg2);
-                         value = value ? value + nodeValue : nodeValue;
-@@ -2733,7 +3726,7 @@
-                 }
-             } else {
-                 // we are a write, so apply to all children
--                for (i = 0; i < this.length; i++) {
-+                for (i = 0; i < nodeCount; i++) {
-                     fn(this[i], arg1, arg2);
-                 }
-                 // return self for chaining
-@@ -2743,61 +3736,73 @@
-     });
- 
-     function createEventHandler(element, events) {
--        var eventHandler = function (event, type) {
--            if (!event.preventDefault) {
--                event.preventDefault = function() {
--                    event.returnValue = false; //ie
--                };
--            }
-+        var eventHandler = function(event, type) {
-+            // jQuery specific api
-+            event.isDefaultPrevented = function() {
-+                return event.defaultPrevented;
-+            };
- 
--            if (!event.stopPropagation) {
--                event.stopPropagation = function() {
--                    event.cancelBubble = true; //ie
--                };
--            }
-+            var eventFns = events[type || event.type];
-+            var eventFnsLength = eventFns ? eventFns.length : 0;
- 
--            if (!event.target) {
--                event.target = event.srcElement || document;
--            }
-+            if (!eventFnsLength) return;
-+
-+            if (isUndefined(event.immediatePropagationStopped)) {
-+                var originalStopImmediatePropagation = event.stopImmediatePropagation;
-+                event.stopImmediatePropagation = function() {
-+                    event.immediatePropagationStopped = true;
- 
--            if (isUndefined(event.defaultPrevented)) {
--                var prevent = event.preventDefault;
--                event.preventDefault = function() {
--                    event.defaultPrevented = true;
--                    prevent.call(event);
-+                    if (event.stopPropagation) {
-+                        event.stopPropagation();
-+                    }
-+
-+                    if (originalStopImmediatePropagation) {
-+                        originalStopImmediatePropagation.call(event);
-+                    }
-                 };
--                event.defaultPrevented = false;
-             }
- 
--            event.isDefaultPrevented = function() {
--                return event.defaultPrevented || event.returnValue === false;
-+            event.isImmediatePropagationStopped = function() {
-+                return event.immediatePropagationStopped === true;
-             };
- 
--            // Copy event handlers in case event handlers array is modified during execution.
--            var eventHandlersCopy = shallowCopy(events[type || event.type] || []);
-+            // Some events have special handlers that wrap the real handler
-+            var handlerWrapper = eventFns.specialHandlerWrapper || defaultHandlerWrapper;
- 
--            forEach(eventHandlersCopy, function(fn) {
--                fn.call(element, event);
--            });
-+            // Copy event handlers in case event handlers array is modified during execution.
-+            if ((eventFnsLength > 1)) {
-+                eventFns = shallowCopy(eventFns);
-+            }
- 
--            // Remove monkey-patched methods (IE),
--            // as they would cause memory leaks in IE8.
--            if (msie <= 8) {
--                // IE7/8 does not allow to delete property on native object
--                event.preventDefault = null;
--                event.stopPropagation = null;
--                event.isDefaultPrevented = null;
--            } else {
--                // It shouldn't affect normal browsers (native methods are defined on prototype).
--                delete event.preventDefault;
--                delete event.stopPropagation;
--                delete event.isDefaultPrevented;
-+            for (var i = 0; i < eventFnsLength; i++) {
-+                if (!event.isImmediatePropagationStopped()) {
-+                    handlerWrapper(element, event, eventFns[i]);
-+                }
-             }
-         };
-+
-+        // TODO: this is a hack for angularMocks/clearDataCache that makes it possible to deregister all
-+        //       events on `element`
-         eventHandler.elem = element;
-         return eventHandler;
-     }
- 
-+    function defaultHandlerWrapper(element, event, handler) {
-+        handler.call(element, event);
-+    }
-+
-+    function specialMouseHandlerWrapper(target, event, handler) {
-+        // Refer to jQuery's implementation of mouseenter & mouseleave
-+        // Read about mouseenter and mouseleave:
-+        // http://www.quirksmode.org/js/events_mouse.html#link8
-+        var related = event.relatedTarget;
-+        // For mousenter/leave call the handler if related is outside the target.
-+        // NB: No relatedTarget if the mouse left/entered the browser window
-+        if (!related || (related !== target && !jqLiteContains.call(target, related))) {
-+            handler.call(target, event);
-+        }
-+    }
-+
- //////////////////////////////////////////
- // Functions iterating traversal.
- // These functions chain results into a single
-@@ -2806,68 +3811,49 @@
-     forEach({
-         removeData: jqLiteRemoveData,
- 
--        dealoc: jqLiteDealoc,
--
--        on: function onFn(element, type, fn, unsupported){
-+        on: function jqLiteOn(element, type, fn, unsupported) {
-             if (isDefined(unsupported)) throw jqLiteMinErr('onargs', 'jqLite#on() does not support the `selector` or `eventData` parameters');
- 
--            var events = jqLiteExpandoStore(element, 'events'),
--                handle = jqLiteExpandoStore(element, 'handle');
-+            // Do not add event handlers to non-elements because they will not be cleaned up.
-+            if (!jqLiteAcceptsData(element)) {
-+                return;
-+            }
-+
-+            var expandoStore = jqLiteExpandoStore(element, true);
-+            var events = expandoStore.events;
-+            var handle = expandoStore.handle;
- 
--            if (!events) jqLiteExpandoStore(element, 'events', events = {});
--            if (!handle) jqLiteExpandoStore(element, 'handle', handle = createEventHandler(element, events));
-+            if (!handle) {
-+                handle = expandoStore.handle = createEventHandler(element, events);
-+            }
-+
-+            // http://jsperf.com/string-indexof-vs-split
-+            var types = type.indexOf(' ') >= 0 ? type.split(' ') : [type];
-+            var i = types.length;
- 
--            forEach(type.split(' '), function(type){
-+            var addHandler = function(type, specialHandlerWrapper, noEventListener) {
-                 var eventFns = events[type];
- 
-                 if (!eventFns) {
--                    if (type == 'mouseenter' || type == 'mouseleave') {
--                        var contains = document.body.contains || document.body.compareDocumentPosition ?
--                            function( a, b ) {
--                                // jshint bitwise: false
--                                var adown = a.nodeType === 9 ? a.documentElement : a,
--                                    bup = b && b.parentNode;
--                                return a === bup || !!( bup && bup.nodeType === 1 && (
--                                    adown.contains ?
--                                        adown.contains( bup ) :
--                                    a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
--                                ));
--                            } :
--                            function( a, b ) {
--                                if ( b ) {
--                                    while ( (b = b.parentNode) ) {
--                                        if ( b === a ) {
--                                            return true;
--                                        }
--                                    }
--                                }
--                                return false;
--                            };
--
--                        events[type] = [];
-+                    eventFns = events[type] = [];
-+                    eventFns.specialHandlerWrapper = specialHandlerWrapper;
-+                    if (type !== '$destroy' && !noEventListener) {
-+                        element.addEventListener(type, handle);
-+                    }
-+                }
- 
--                        // Refer to jQuery's implementation of mouseenter & mouseleave
--                        // Read about mouseenter and mouseleave:
--                        // http://www.quirksmode.org/js/events_mouse.html#link8
--                        var eventmap = { mouseleave : "mouseout", mouseenter : "mouseover"};
-+                eventFns.push(fn);
-+            };
- 
--                        onFn(element, eventmap[type], function(event) {
--                            var target = this, related = event.relatedTarget;
--                            // For mousenter/leave call the handler if related is outside the target.
--                            // NB: No relatedTarget if the mouse left/entered the browser window
--                            if ( !related || (related !== target && !contains(target, related)) ){
--                                handle(event, type);
--                            }
--                        });
--
--                    } else {
--                        addEventListenerFn(element, type, handle);
--                        events[type] = [];
--                    }
--                    eventFns = events[type];
-+            while (i--) {
-+                type = types[i];
-+                if (MOUSE_EVENT_MAP[type]) {
-+                    addHandler(MOUSE_EVENT_MAP[type], specialMouseHandlerWrapper);
-+                    addHandler(type, undefined, true);
-+                } else {
-+                    addHandler(type);
-                 }
--                eventFns.push(fn);
--            });
-+            }
-         },
- 
-         off: jqLiteOff,
-@@ -2888,7 +3874,7 @@
-         replaceWith: function(element, replaceNode) {
-             var index, parent = element.parentNode;
-             jqLiteDealoc(element);
--            forEach(new JQLite(replaceNode), function(node){
-+            forEach(new JQLite(replaceNode), function(node) {
-                 if (index) {
-                     parent.insertBefore(node, index.nextSibling);
-                 } else {
-@@ -2900,9 +3886,10 @@
- 
-         children: function(element) {
-             var children = [];
--            forEach(element.childNodes, function(element){
--                if (element.nodeType === 1)
-+            forEach(element.childNodes, function(element) {
-+                if (element.nodeType === NODE_TYPE_ELEMENT) {
-                     children.push(element);
-+                }
-             });
-             return children;
-         },
-@@ -2912,43 +3899,48 @@
-         },
- 
-         append: function(element, node) {
--            forEach(new JQLite(node), function(child){
--                if (element.nodeType === 1 || element.nodeType === 11) {
--                    element.appendChild(child);
--                }
--            });
-+            var nodeType = element.nodeType;
-+            if (nodeType !== NODE_TYPE_ELEMENT && nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT) return;
-+
-+            node = new JQLite(node);
-+
-+            for (var i = 0, ii = node.length; i < ii; i++) {
-+                var child = node[i];
-+                element.appendChild(child);
-+            }
-         },
- 
-         prepend: function(element, node) {
--            if (element.nodeType === 1) {
-+            if (element.nodeType === NODE_TYPE_ELEMENT) {
-                 var index = element.firstChild;
--                forEach(new JQLite(node), function(child){
-+                forEach(new JQLite(node), function(child) {
-                     element.insertBefore(child, index);
-                 });
-             }
-         },
- 
-         wrap: function(element, wrapNode) {
--            wrapNode = jqLite(wrapNode)[0];
--            var parent = element.parentNode;
--            if (parent) {
--                parent.replaceChild(wrapNode, element);
--            }
--            wrapNode.appendChild(element);
-+            jqLiteWrapNode(element, jqLite(wrapNode).eq(0).clone()[0]);
-         },
- 
--        remove: function(element) {
--            jqLiteDealoc(element);
--            var parent = element.parentNode;
--            if (parent) parent.removeChild(element);
-+        remove: jqLiteRemove,
-+
-+        detach: function(element) {
-+            jqLiteRemove(element, true);
-         },
- 
-         after: function(element, newElement) {
-             var index = element, parent = element.parentNode;
--            forEach(new JQLite(newElement), function(node){
--                parent.insertBefore(node, index.nextSibling);
--                index = node;
--            });
-+
-+            if (parent) {
-+                newElement = new JQLite(newElement);
-+
-+                for (var i = 0, ii = newElement.length; i < ii; i++) {
-+                    var node = newElement[i];
-+                    parent.insertBefore(node, index.nextSibling);
-+                    index = node;
-+                }
-+            }
-         },
- 
-         addClass: jqLiteAddClass,
-@@ -2956,7 +3948,7 @@
- 
-         toggleClass: function(element, selector, condition) {
-             if (selector) {
--                forEach(selector.split(' '), function(className){
-+                forEach(selector.split(' '), function(className) {
-                     var classCondition = condition;
-                     if (isUndefined(classCondition)) {
-                         classCondition = !jqLiteHasClass(element, className);
-@@ -2968,20 +3960,11 @@
- 
-         parent: function(element) {
-             var parent = element.parentNode;
--            return parent && parent.nodeType !== 11 ? parent : null;
-+            return parent && parent.nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT ? parent : null;
-         },
- 
-         next: function(element) {
--            if (element.nextElementSibling) {
--                return element.nextElementSibling;
--            }
--
--            // IE8 doesn't have nextElementSibling
--            var elm = element.nextSibling;
--            while (elm != null && elm.nodeType !== 1) {
--                elm = elm.nextSibling;
--            }
--            return elm;
-+            return element.nextElementSibling;
-         },
- 
-         find: function(element, selector) {
-@@ -2994,27 +3977,50 @@
- 
-         clone: jqLiteClone,
- 
--        triggerHandler: function(element, eventName, eventData) {
--            var eventFns = (jqLiteExpandoStore(element, 'events') || {})[eventName];
-+        triggerHandler: function(element, event, extraParameters) {
-+
-+            var dummyEvent, eventFnsCopy, handlerArgs;
-+            var eventName = event.type || event;
-+            var expandoStore = jqLiteExpandoStore(element);
-+            var events = expandoStore && expandoStore.events;
-+            var eventFns = events && events[eventName];
-+
-+            if (eventFns) {
-+                // Create a dummy event to pass to the handlers
-+                dummyEvent = {
-+                    preventDefault: function() { this.defaultPrevented = true; },
-+                    isDefaultPrevented: function() { return this.defaultPrevented === true; },
-+                    stopImmediatePropagation: function() { this.immediatePropagationStopped = true; },
-+                    isImmediatePropagationStopped: function() { return this.immediatePropagationStopped === true; },
-+                    stopPropagation: noop,
-+                    type: eventName,
-+                    target: element
-+                };
- 
--            eventData = eventData || [];
-+                // If a custom event was provided then extend our dummy event with it
-+                if (event.type) {
-+                    dummyEvent = extend(dummyEvent, event);
-+                }
- 
--            var event = [{
--                preventDefault: noop,
--                stopPropagation: noop
--            }];
-+                // Copy event handlers in case event handlers array is modified during execution.
-+                eventFnsCopy = shallowCopy(eventFns);
-+                handlerArgs = extraParameters ? [dummyEvent].concat(extraParameters) : [dummyEvent];
- 
--            forEach(eventFns, function(fn) {
--                fn.apply(element, event.concat(eventData));
--            });
-+                forEach(eventFnsCopy, function(fn) {
-+                    if (!dummyEvent.isImmediatePropagationStopped()) {
-+                        fn.apply(element, handlerArgs);
-+                    }
-+                });
-+            }
-         }
--    }, function(fn, name){
-+    }, function(fn, name) {
-         /**
-          * chaining functions
-          */
-         JQLite.prototype[name] = function(arg1, arg2, arg3) {
-             var value;
--            for(var i=0; i < this.length; i++) {
-+
-+            for (var i = 0, ii = this.length; i < ii; i++) {
-                 if (isUndefined(value)) {
-                     value = fn(this[i], arg1, arg2, arg3);
-                     if (isDefined(value)) {
-@@ -3027,12 +4033,34 @@
-             }
-             return isDefined(value) ? value : this;
-         };
--
--        // bind legacy bind/unbind to on/off
--        JQLite.prototype.bind = JQLite.prototype.on;
--        JQLite.prototype.unbind = JQLite.prototype.off;
-     });
- 
-+// bind legacy bind/unbind to on/off
-+    JQLite.prototype.bind = JQLite.prototype.on;
-+    JQLite.prototype.unbind = JQLite.prototype.off;
-+
-+
-+// Provider for private $$jqLite service
-+    /** @this */
-+    function $$jqLiteProvider() {
-+        this.$get = function $$jqLite() {
-+            return extend(JQLite, {
-+                hasClass: function(node, classes) {
-+                    if (node.attr) node = node[0];
-+                    return jqLiteHasClass(node, classes);
-+                },
-+                addClass: function(node, classes) {
-+                    if (node.attr) node = node[0];
-+                    return jqLiteAddClass(node, classes);
-+                },
-+                removeClass: function(node, classes) {
-+                    if (node.attr) node = node[0];
-+                    return jqLiteRemoveClass(node, classes);
-+                }
-+            });
-+        };
-+    }
-+
-     /**
-      * Computes a hash of an 'obj'.
-      * Hash of a:
-@@ -3045,73 +4073,108 @@
-      * @returns {string} hash string such that the same input will have the same hash string.
-      *         The resulting string key is in 'type:hashKey' format.
-      */
--    function hashKey(obj) {
--        var objType = typeof obj,
--            key;
-+    function hashKey(obj, nextUidFn) {
-+        var key = obj && obj.$$hashKey;
- 
--        if (objType == 'object' && obj !== null) {
--            if (typeof (key = obj.$$hashKey) == 'function') {
--                // must invoke on object to keep the right this
-+        if (key) {
-+            if (typeof key === 'function') {
-                 key = obj.$$hashKey();
--            } else if (key === undefined) {
--                key = obj.$$hashKey = nextUid();
-             }
-+            return key;
-+        }
-+
-+        var objType = typeof obj;
-+        if (objType === 'function' || (objType === 'object' && obj !== null)) {
-+            key = obj.$$hashKey = objType + ':' + (nextUidFn || nextUid)();
-         } else {
--            key = obj;
-+            key = objType + ':' + obj;
-         }
- 
--        return objType + ':' + key;
-+        return key;
-     }
- 
--    /**
--     * HashMap which can use objects as keys
--     */
--    function HashMap(array){
--        forEach(array, this.put, this);
-+// A minimal ES2015 Map implementation.
-+// Should be bug/feature equivalent to the native implementations of supported browsers
-+// (for the features required in Angular).
-+// See https://kangax.github.io/compat-table/es6/#test-Map
-+    var nanKey = Object.create(null);
-+    function NgMapShim() {
-+        this._keys = [];
-+        this._values = [];
-+        this._lastKey = NaN;
-+        this._lastIndex = -1;
-     }
--    HashMap.prototype = {
--        /**
--         * Store key value pair
--         * @param key key to store can be any type
--         * @param value value to store can be any type
--         */
--        put: function(key, value) {
--            this[hashKey(key)] = value;
-+    NgMapShim.prototype = {
-+        _idx: function(key) {
-+            if (key === this._lastKey) {
-+                return this._lastIndex;
-+            }
-+            this._lastKey = key;
-+            this._lastIndex = this._keys.indexOf(key);
-+            return this._lastIndex;
-+        },
-+        _transformKey: function(key) {
-+            return isNumberNaN(key) ? nanKey : key;
-         },
--
--        /**
--         * @param key
--         * @returns {Object} the value for the key
--         */
-         get: function(key) {
--            return this[hashKey(key)];
-+            key = this._transformKey(key);
-+            var idx = this._idx(key);
-+            if (idx !== -1) {
-+                return this._values[idx];
-+            }
-         },
-+        set: function(key, value) {
-+            key = this._transformKey(key);
-+            var idx = this._idx(key);
-+            if (idx === -1) {
-+                idx = this._lastIndex = this._keys.length;
-+            }
-+            this._keys[idx] = key;
-+            this._values[idx] = value;
- 
--        /**
--         * Remove the key/value pair
--         * @param key
--         */
--        remove: function(key) {
--            var value = this[key = hashKey(key)];
--            delete this[key];
--            return value;
-+            // Support: IE11
-+            // Do not `return this` to simulate the partial IE11 implementation
-+        },
-+        delete: function(key) {
-+            key = this._transformKey(key);
-+            var idx = this._idx(key);
-+            if (idx === -1) {
-+                return false;
-+            }
-+            this._keys.splice(idx, 1);
-+            this._values.splice(idx, 1);
-+            this._lastKey = NaN;
-+            this._lastIndex = -1;
-+            return true;
-         }
-     };
- 
-+// For now, always use `NgMapShim`, even if `window.Map` is available. Some native implementations
-+// are still buggy (often in subtle ways) and can cause hard-to-debug failures. When native `Map`
-+// implementations get more stable, we can reconsider switching to `window.Map` (when available).
-+    var NgMap = NgMapShim;
-+
-+    var $$MapProvider = [/** @this */function() {
-+        this.$get = [function() {
-+            return NgMap;
-+        }];
-+    }];
-+
-     /**
-      * @ngdoc function
-      * @module ng
-      * @name angular.injector
--     * @function
-+     * @kind function
-      *
-      * @description
--     * Creates an injector function that can be used for retrieving services as well as for
-+     * Creates an injector object that can be used for retrieving services as well as for
-      * dependency injection (see {@link guide/di dependency injection}).
-      *
--
-      * @param {Array.<string|Function>} modules A list of module functions or their aliases. See
--     *        {@link angular.module}. The `ng` module must be explicitly added.
--     * @returns {function()} Injector function. See {@link auto.$injector $injector}.
-+     *     {@link angular.module}. The `ng` module must be explicitly added.
-+     * @param {boolean=} [strictDi=false] Whether the injector should be in strict mode, which
-+     *     disallows argument name annotation inference.
-+     * @returns {injector} Injector object. See {@link auto.$injector $injector}.
-      *
-      * @example
-      * Typical usage
-@@ -3121,15 +4184,15 @@
-      *
-      *   // use the injector to kick off your application
-      *   // use the type inference to auto inject arguments, or use implicit injection
--     *   $injector.invoke(function($rootScope, $compile, $document){
-- *     $compile($document)($rootScope);
-- *     $rootScope.$digest();
-- *   });
-+     *   $injector.invoke(function($rootScope, $compile, $document) {
-+     *     $compile($document)($rootScope);
-+     *     $rootScope.$digest();
-+     *   });
-      * ```
-      *
--     * Sometimes you want to get access to the injector of a currently running Angular app
--     * from outside Angular. Perhaps, you want to inject and compile some markup after the
--     * application has been bootstrapped. You can do this using extra `injector()` added
-+     * Sometimes you want to get access to the injector of a currently running AngularJS app
-+     * from outside AngularJS. Perhaps, you want to inject and compile some markup after the
-+     * application has been bootstrapped. You can do this using the extra `injector()` added
-      * to JQuery/jqLite elements. See {@link angular.element}.
-      *
-      * *This is fairly rare but could be the case if a third party library is injecting the
-@@ -3144,9 +4207,9 @@
-      * $(document.body).append($div);
-      *
-      * angular.element(document).injector().invoke(function($compile) {
-- *   var scope = angular.element($div).scope();
-- *   $compile($div)(scope);
-- * });
-+     *   var scope = angular.element($div).scope();
-+     *   $compile($div)(scope);
-+     * });
-      * ```
-      */
- 
-@@ -3154,30 +4217,58 @@
-     /**
-      * @ngdoc module
-      * @name auto
-+     * @installation
-      * @description
-      *
-      * Implicit module which gets automatically added to each {@link auto.$injector $injector}.
-      */
- 
--    var FN_ARGS = /^function\s*[^\(]*\(\s*([^\)]*)\)/m;
-+    var ARROW_ARG = /^([^(]+?)=>/;
-+    var FN_ARGS = /^[^(]*\(\s*([^)]*)\)/m;
-     var FN_ARG_SPLIT = /,/;
-     var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/;
-     var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
-     var $injectorMinErr = minErr('$injector');
--    function annotate(fn) {
-+
-+    function stringifyFn(fn) {
-+        return Function.prototype.toString.call(fn);
-+    }
-+
-+    function extractArgs(fn) {
-+        var fnText = stringifyFn(fn).replace(STRIP_COMMENTS, ''),
-+            args = fnText.match(ARROW_ARG) || fnText.match(FN_ARGS);
-+        return args;
-+    }
-+
-+    function anonFn(fn) {
-+        // For anonymous functions, showing at the very least the function signature can help in
-+        // debugging.
-+        var args = extractArgs(fn);
-+        if (args) {
-+            return 'function(' + (args[1] || '').replace(/[\s\r\n]+/, ' ') + ')';
-+        }
-+        return 'fn';
-+    }
-+
-+    function annotate(fn, strictDi, name) {
-         var $inject,
--            fnText,
-             argDecl,
-             last;
- 
--        if (typeof fn == 'function') {
-+        if (typeof fn === 'function') {
-             if (!($inject = fn.$inject)) {
-                 $inject = [];
-                 if (fn.length) {
--                    fnText = fn.toString().replace(STRIP_COMMENTS, '');
--                    argDecl = fnText.match(FN_ARGS);
--                    forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg){
--                        arg.replace(FN_ARG, function(all, underscore, name){
-+                    if (strictDi) {
-+                        if (!isString(name) || !name) {
-+                            name = fn.name || anonFn(fn);
-+                        }
-+                        throw $injectorMinErr('strictdi',
-+                            '{0} is not using explicit annotation and cannot be invoked in strict mode', name);
-+                    }
-+                    argDecl = extractArgs(fn);
-+                    forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg) {
-+                        arg.replace(FN_ARG, function(all, underscore, name) {
-                             $inject.push(name);
-                         });
-                     });
-@@ -3199,7 +4290,6 @@
-     /**
-      * @ngdoc service
-      * @name $injector
--     * @function
-      *
-      * @description
-      *
-@@ -3212,12 +4302,12 @@
-      * ```js
-      *   var $injector = angular.injector();
-      *   expect($injector.get('$injector')).toBe($injector);
--     *   expect($injector.invoke(function($injector){
-- *     return $injector;
-- *   }).toBe($injector);
-+     *   expect($injector.invoke(function($injector) {
-+     *     return $injector;
-+     *   })).toBe($injector);
-      * ```
-      *
--     * # Injection Function Annotation
-+     * ## Injection Function Annotation
-      *
-      * JavaScript does not have annotations, and annotations are needed for dependency injection. The
-      * following are all valid ways of annotating function with injection arguments and are equivalent.
-@@ -3235,19 +4325,43 @@
-      *   $injector.invoke(['serviceA', function(serviceA){}]);
-      * ```
-      *
--     * ## Inference
-+     * ### Inference
-      *
-      * In JavaScript calling `toString()` on a function returns the function definition. The definition
--     * can then be parsed and the function arguments can be extracted. *NOTE:* This does not work with
--     * minification, and obfuscation tools since these tools change the argument names.
-+     * can then be parsed and the function arguments can be extracted. This method of discovering
-+     * annotations is disallowed when the injector is in strict mode.
-+     * *NOTE:* This does not work with minification, and obfuscation tools since these tools change the
-+     * argument names.
-      *
--     * ## `$inject` Annotation
--     * By adding a `$inject` property onto a function the injection parameters can be specified.
-+     * ### `$inject` Annotation
-+     * By adding an `$inject` property onto a function the injection parameters can be specified.
-      *
--     * ## Inline
-+     * ### Inline
-      * As an array of injection names, where the last item in the array is the function to call.
-      */
- 
-+    /**
-+     * @ngdoc property
-+     * @name $injector#modules
-+     * @type {Object}
-+     * @description
-+     * A hash containing all the modules that have been loaded into the
-+     * $injector.
-+     *
-+     * You can use this property to find out information about a module via the
-+     * {@link angular.Module#info `myModule.info(...)`} method.
-+     *
-+     * For example:
-+     *
-+     * ```
-+     * var info = $injector.modules['ngAnimate'].info();
-+     * ```
-+     *
-+     * **Do not use this property to attempt to modify the modules after the application
-+     * has been bootstrapped.**
-+     */
-+
-+
-     /**
-      * @ngdoc method
-      * @name $injector#get
-@@ -3256,6 +4370,7 @@
-      * Return an instance of the service.
-      *
-      * @param {string} name The name of the instance to retrieve.
-+     * @param {string=} caller An optional string to provide the origin of the function call for error messages.
-      * @return {*} The instance.
-      */
- 
-@@ -3266,8 +4381,8 @@
-      * @description
-      * Invoke the method and supply the method arguments from the `$injector`.
-      *
--     * @param {!Function} fn The function to invoke. Function parameters are injected according to the
--     *   {@link guide/di $inject Annotation} rules.
-+     * @param {Function|Array.<string|Function>} fn The injectable function to invoke. Function parameters are
-+     *   injected according to the {@link guide/di $inject Annotation} rules.
-      * @param {Object=} self The `this` for the invoked method.
-      * @param {Object=} locals Optional object. If preset then any argument names are read from this
-      *                         object first, before the `$injector` is consulted.
-@@ -3279,18 +4394,18 @@
-      * @name $injector#has
-      *
-      * @description
--     * Allows the user to query if the particular service exist.
-+     * Allows the user to query if the particular service exists.
-      *
--     * @param {string} Name of the service to query.
--     * @returns {boolean} returns true if injector has given service.
-+     * @param {string} name Name of the service to query.
-+     * @returns {boolean} `true` if injector has given service.
-      */
- 
-     /**
-      * @ngdoc method
-      * @name $injector#instantiate
-      * @description
--     * Create a new instance of JS type. The method takes a constructor function invokes the new
--     * operator and supplies all of the arguments to the constructor function as specified by the
-+     * Create a new instance of JS type. The method takes a constructor function, invokes the new
-+     * operator, and supplies all of the arguments to the constructor function as specified by the
-      * constructor annotation.
-      *
-      * @param {Function} Type Annotated constructor function.
-@@ -3309,7 +4424,7 @@
-      * function is invoked. There are three ways in which the function can be annotated with the needed
-      * dependencies.
-      *
--     * # Argument names
-+     * #### Argument names
-      *
-      * The simplest form is to extract the dependencies from the arguments of the function. This is done
-      * by converting the function into a string using `toString()` method and extracting the argument
-@@ -3317,25 +4432,27 @@
-      * ```js
-      *   // Given
-      *   function MyController($scope, $route) {
-- *     // ...
-- *   }
-+     *     // ...
-+     *   }
-      *
-      *   // Then
-      *   expect(injector.annotate(MyController)).toEqual(['$scope', '$route']);
-      * ```
-      *
-+     * You can disallow this method by using strict injection mode.
-+     *
-      * This method does not work with code minification / obfuscation. For this reason the following
-      * annotation strategies are supported.
-      *
--     * # The `$inject` property
-+     * #### The `$inject` property
-      *
-      * If a function has an `$inject` property and its value is an array of strings, then the strings
-      * represent names of services to be injected into the function.
-      * ```js
-      *   // Given
-      *   var MyController = function(obfuscatedScope, obfuscatedRoute) {
-- *     // ...
-- *   }
-+     *     // ...
-+     *   }
-      *   // Define function dependencies
-      *   MyController['$inject'] = ['$scope', '$route'];
-      *
-@@ -3343,7 +4460,7 @@
-      *   expect(injector.annotate(MyController)).toEqual(['$scope', '$route']);
-      * ```
-      *
--     * # The array notation
-+     * #### The array notation
-      *
-      * It is often desirable to inline Injected functions and that's when setting the `$inject` property
-      * is very inconvenient. In these situations using the array notation to specify the dependencies in
-@@ -3352,20 +4469,20 @@
-      * ```js
-      *   // We wish to write this (not minification / obfuscation safe)
-      *   injector.invoke(function($compile, $rootScope) {
-- *     // ...
-- *   });
-+     *     // ...
-+     *   });
-      *
-      *   // We are forced to write break inlining
-      *   var tmpFn = function(obfuscatedCompile, obfuscatedRootScope) {
-- *     // ...
-- *   };
-+     *     // ...
-+     *   };
-      *   tmpFn.$inject = ['$compile', '$rootScope'];
-      *   injector.invoke(tmpFn);
-      *
-      *   // To better support inline function the inline annotation is supported
-      *   injector.invoke(['$compile', '$rootScope', function(obfCompile, obfRootScope) {
-- *     // ...
-- *   }]);
-+     *     // ...
-+     *   }]);
-      *
-      *   // Therefore
-      *   expect(injector.annotate(
-@@ -3376,14 +4493,53 @@
-      * @param {Function|Array.<string|Function>} fn Function for which dependent service names need to
-      * be retrieved as described above.
-      *
-+     * @param {boolean=} [strictDi=false] Disallow argument name annotation inference.
-+     *
-      * @returns {Array.<string>} The names of the services which the function requires.
-      */
--
--
-+    /**
-+     * @ngdoc method
-+     * @name $injector#loadNewModules
-+     *
-+     * @description
-+     *
-+     * **This is a dangerous API, which you use at your own risk!**
-+     *
-+     * Add the specified modules to the current injector.
-+     *
-+     * This method will add each of the injectables to the injector and execute all of the config and run
-+     * blocks for each module passed to the method.
-+     *
-+     * If a module has already been loaded into the injector then it will not be loaded again.
-+     *
-+     * * The application developer is responsible for loading the code containing the modules; and for
-+     * ensuring that lazy scripts are not downloaded and executed more often that desired.
-+     * * Previously compiled HTML will not be affected by newly loaded directives, filters and components.
-+     * * Modules cannot be unloaded.
-+     *
-+     * You can use {@link $injector#modules `$injector.modules`} to check whether a module has been loaded
-+     * into the injector, which may indicate whether the script has been executed already.
-+     *
-+     * @example
-+     * Here is an example of loading a bundle of modules, with a utility method called `getScript`:
-+     *
-+     * ```javascript
-+     * app.factory('loadModule', function($injector) {
-+     *   return function loadModule(moduleName, bundleUrl) {
-+     *     return getScript(bundleUrl).then(function() { $injector.loadNewModules([moduleName]); });
-+     *   };
-+     * })
-+     * ```
-+     *
-+     * @param {Array<String|Function|Array>=} mods an array of modules to load into the application.
-+     *     Each item in the array should be the name of a predefined module or a (DI annotated)
-+     *     function that will be invoked by the injector as a `config` block.
-+     *     See: {@link angular.module modules}
-+     */
- 
- 
-     /**
--     * @ngdoc object
-+     * @ngdoc service
-      * @name $provide
-      *
-      * @description
-@@ -3392,7 +4548,7 @@
-      * with the {@link auto.$injector $injector}. Many of these functions are also exposed on
-      * {@link angular.Module}.
-      *
--     * An Angular **service** is a singleton object created by a **service factory**.  These **service
-+     * An AngularJS **service** is a singleton object created by a **service factory**.  These **service
-      * factories** are functions which, in turn, are created by a **service provider**.
-      * The **service providers** are constructor functions. When instantiated they must contain a
-      * property called `$get`, which holds the **service factory** function.
-@@ -3406,18 +4562,20 @@
-      * these cases the {@link auto.$provide $provide} service has additional helper methods to register
-      * services without specifying a provider.
-      *
--     * * {@link auto.$provide#provider provider(provider)} - registers a **service provider** with the
-+     * * {@link auto.$provide#provider provider(name, provider)} - registers a **service provider** with the
-      *     {@link auto.$injector $injector}
--     * * {@link auto.$provide#constant constant(obj)} - registers a value/object that can be accessed by
-+     * * {@link auto.$provide#constant constant(name, obj)} - registers a value/object that can be accessed by
-      *     providers and services.
--     * * {@link auto.$provide#value value(obj)} - registers a value/object that can only be accessed by
-+     * * {@link auto.$provide#value value(name, obj)} - registers a value/object that can only be accessed by
-      *     services, not providers.
--     * * {@link auto.$provide#factory factory(fn)} - registers a service **factory function**, `fn`,
-+     * * {@link auto.$provide#factory factory(name, fn)} - registers a service **factory function**
-      *     that will be wrapped in a **service provider** object, whose `$get` property will contain the
-      *     given factory function.
--     * * {@link auto.$provide#service service(class)} - registers a **constructor function**, `class`
-+     * * {@link auto.$provide#service service(name, Fn)} - registers a **constructor function**
-      *     that will be wrapped in a **service provider** object, whose `$get` property will instantiate
-      *      a new object using the given constructor function.
-+     * * {@link auto.$provide#decorator decorator(name, decorFn)} - registers a **decorator function** that
-+     *      will be able to modify or replace the implementation of another service.
-      *
-      * See the individual methods for more information and examples.
-      */
-@@ -3442,6 +4600,9 @@
-      * which lets you specify whether the {@link ng.$log $log} service will log debug messages to the
-      * console or not.
-      *
-+     * It is possible to inject other providers into the provider function,
-+     * but the injected provider must have been defined before the one that requires it.
-+     *
-      * @param {string} name The name of the instance. NOTE: the provider will be available under `name +
-      'Provider'` key.
-      * @param {(Object|function())} provider If the provider is:
-@@ -3461,60 +4622,60 @@
-      * ```js
-      *  // Define the eventTracker provider
-      *  function EventTrackerProvider() {
-- *    var trackingUrl = '/track';
-- *
-- *    // A provider method for configuring where the tracked events should been saved
-- *    this.setTrackingUrl = function(url) {
-- *      trackingUrl = url;
-- *    };
-- *
-- *    // The service factory function
-- *    this.$get = ['$http', function($http) {
-- *      var trackedEvents = {};
-- *      return {
-- *        // Call this to track an event
-- *        event: function(event) {
-- *          var count = trackedEvents[event] || 0;
-- *          count += 1;
-- *          trackedEvents[event] = count;
-- *          return count;
-- *        },
-- *        // Call this to save the tracked events to the trackingUrl
-- *        save: function() {
-- *          $http.post(trackingUrl, trackedEvents);
-- *        }
-- *      };
-- *    }];
-- *  }
-+     *    var trackingUrl = '/track';
-+     *
-+     *    // A provider method for configuring where the tracked events should been saved
-+     *    this.setTrackingUrl = function(url) {
-+     *      trackingUrl = url;
-+     *    };
-+     *
-+     *    // The service factory function
-+     *    this.$get = ['$http', function($http) {
-+     *      var trackedEvents = {};
-+     *      return {
-+     *        // Call this to track an event
-+     *        event: function(event) {
-+     *          var count = trackedEvents[event] || 0;
-+     *          count += 1;
-+     *          trackedEvents[event] = count;
-+     *          return count;
-+     *        },
-+     *        // Call this to save the tracked events to the trackingUrl
-+     *        save: function() {
-+     *          $http.post(trackingUrl, trackedEvents);
-+     *        }
-+     *      };
-+     *    }];
-+     *  }
-      *
-      *  describe('eventTracker', function() {
-- *    var postSpy;
-- *
-- *    beforeEach(module(function($provide) {
-- *      // Register the eventTracker provider
-- *      $provide.provider('eventTracker', EventTrackerProvider);
-- *    }));
-- *
-- *    beforeEach(module(function(eventTrackerProvider) {
-- *      // Configure eventTracker provider
-- *      eventTrackerProvider.setTrackingUrl('/custom-track');
-- *    }));
-- *
-- *    it('tracks events', inject(function(eventTracker) {
-- *      expect(eventTracker.event('login')).toEqual(1);
-- *      expect(eventTracker.event('login')).toEqual(2);
-- *    }));
-- *
-- *    it('saves to the tracking url', inject(function(eventTracker, $http) {
-- *      postSpy = spyOn($http, 'post');
-- *      eventTracker.event('login');
-- *      eventTracker.save();
-- *      expect(postSpy).toHaveBeenCalled();
-- *      expect(postSpy.mostRecentCall.args[0]).not.toEqual('/track');
-- *      expect(postSpy.mostRecentCall.args[0]).toEqual('/custom-track');
-- *      expect(postSpy.mostRecentCall.args[1]).toEqual({ 'login': 1 });
-- *    }));
-- *  });
-+     *    var postSpy;
-+     *
-+     *    beforeEach(module(function($provide) {
-+     *      // Register the eventTracker provider
-+     *      $provide.provider('eventTracker', EventTrackerProvider);
-+     *    }));
-+     *
-+     *    beforeEach(module(function(eventTrackerProvider) {
-+     *      // Configure eventTracker provider
-+     *      eventTrackerProvider.setTrackingUrl('/custom-track');
-+     *    }));
-+     *
-+     *    it('tracks events', inject(function(eventTracker) {
-+     *      expect(eventTracker.event('login')).toEqual(1);
-+     *      expect(eventTracker.event('login')).toEqual(2);
-+     *    }));
-+     *
-+     *    it('saves to the tracking url', inject(function(eventTracker, $http) {
-+     *      postSpy = spyOn($http, 'post');
-+     *      eventTracker.event('login');
-+     *      eventTracker.save();
-+     *      expect(postSpy).toHaveBeenCalled();
-+     *      expect(postSpy.mostRecentCall.args[0]).not.toEqual('/track');
-+     *      expect(postSpy.mostRecentCall.args[0]).toEqual('/custom-track');
-+     *      expect(postSpy.mostRecentCall.args[1]).toEqual({ 'login': 1 });
-+     *    }));
-+     *  });
-      * ```
-      */
- 
-@@ -3530,24 +4691,24 @@
-      * configure your service in a provider.
-      *
-      * @param {string} name The name of the instance.
--     * @param {function()} $getFn The $getFn for the instance creation. Internally this is a short hand
--     *                            for `$provide.provider(name, {$get: $getFn})`.
-+     * @param {Function|Array.<string|Function>} $getFn The injectable $getFn for the instance creation.
-+     *                      Internally this is a short hand for `$provide.provider(name, {$get: $getFn})`.
-      * @returns {Object} registered provider instance
-      *
-      * @example
-      * Here is an example of registering a service
-      * ```js
-      *   $provide.factory('ping', ['$http', function($http) {
-- *     return function ping() {
-- *       return $http.send('/ping');
-- *     };
-- *   }]);
-+     *     return function ping() {
-+     *       return $http.send('/ping');
-+     *     };
-+     *   }]);
-      * ```
-      * You would then inject and use this service like this:
-      * ```js
-      *   someModule.controller('Ctrl', ['ping', function(ping) {
-- *     ping();
-- *   }]);
-+     *     ping();
-+     *   }]);
-      * ```
-      */
- 
-@@ -3559,14 +4720,27 @@
-      *
-      * Register a **service constructor**, which will be invoked with `new` to create the service
-      * instance.
--     * This is short for registering a service where its provider's `$get` property is the service
--     * constructor function that will be used to instantiate the service instance.
-+     * This is short for registering a service where its provider's `$get` property is a factory
-+     * function that returns an instance instantiated by the injector from the service constructor
-+     * function.
-+     *
-+     * Internally it looks a bit like this:
-+     *
-+     * ```
-+     * {
-+     *   $get: function() {
-+     *     return $injector.instantiate(constructor);
-+     *   }
-+     * }
-+     * ```
-+     *
-      *
-      * You should use {@link auto.$provide#service $provide.service(class)} if you define your service
-      * as a type/class.
-      *
-      * @param {string} name The name of the instance.
--     * @param {Function} constructor A class (constructor function) that will be instantiated.
-+     * @param {Function|Array.<string|Function>} constructor An injectable class (constructor function)
-+     *     that will be instantiated.
-      * @returns {Object} registered provider instance
-      *
-      * @example
-@@ -3574,21 +4748,21 @@
-      * {@link auto.$provide#service $provide.service(class)}.
-      * ```js
-      *   var Ping = function($http) {
-- *     this.$http = $http;
-- *   };
-+     *     this.$http = $http;
-+     *   };
-      *
-      *   Ping.$inject = ['$http'];
-      *
-      *   Ping.prototype.send = function() {
-- *     return this.$http.get('/ping');
-- *   };
-+     *     return this.$http.get('/ping');
-+     *   };
-      *   $provide.service('ping', Ping);
-      * ```
-      * You would then inject and use this service like this:
-      * ```js
-      *   someModule.controller('Ctrl', ['ping', function(ping) {
-- *     ping.send();
-- *   }]);
-+     *     ping.send();
-+     *   }]);
-      * ```
-      */
- 
-@@ -3599,14 +4773,13 @@
-      * @description
-      *
-      * Register a **value service** with the {@link auto.$injector $injector}, such as a string, a
--     * number, an array, an object or a function.  This is short for registering a service where its
-+     * number, an array, an object or a function. This is short for registering a service where its
-      * provider's `$get` property is a factory function that takes no arguments and returns the **value
--     * service**.
-+     * service**. That also means it is not possible to inject other services into a value service.
-      *
-      * Value services are similar to constant services, except that they cannot be injected into a
-      * module configuration function (see {@link angular.Module#config}) but they can be overridden by
--     * an Angular
--     * {@link auto.$provide#decorator decorator}.
-+     * an AngularJS {@link auto.$provide#decorator decorator}.
-      *
-      * @param {string} name The name of the instance.
-      * @param {*} value The value.
-@@ -3620,8 +4793,8 @@
-      *   $provide.value('RoleLookup', { admin: 0, writer: 1, reader: 2 });
-      *
-      *   $provide.value('halfOf', function(value) {
-- *     return value / 2;
-- *   });
-+     *     return value / 2;
-+     *   });
-      * ```
-      */
- 
-@@ -3631,10 +4804,13 @@
-      * @name $provide#constant
-      * @description
-      *
--     * Register a **constant service**, such as a string, a number, an array, an object or a function,
--     * with the {@link auto.$injector $injector}. Unlike {@link auto.$provide#value value} it can be
-+     * Register a **constant service** with the {@link auto.$injector $injector}, such as a string,
-+     * a number, an array, an object or a function. Like the {@link auto.$provide#value value}, it is not
-+     * possible to inject other services into a constant.
-+     *
-+     * But unlike {@link auto.$provide#value value}, a constant can be
-      * injected into a module configuration function (see {@link angular.Module#config}) and it cannot
--     * be overridden by an Angular {@link auto.$provide#decorator decorator}.
-+     * be overridden by an AngularJS {@link auto.$provide#decorator decorator}.
-      *
-      * @param {string} name The name of the constant.
-      * @param {*} value The constant value.
-@@ -3648,8 +4824,8 @@
-      *   $provide.constant('MY_COLOURS', ['red', 'blue', 'grey']);
-      *
-      *   $provide.constant('double', function(value) {
-- *     return value * 2;
-- *   });
-+     *     return value * 2;
-+     *   });
-      * ```
-      */
- 
-@@ -3659,18 +4835,20 @@
-      * @name $provide#decorator
-      * @description
-      *
--     * Register a **service decorator** with the {@link auto.$injector $injector}. A service decorator
--     * intercepts the creation of a service, allowing it to override or modify the behaviour of the
--     * service. The object returned by the decorator may be the original service, or a new service
--     * object which replaces or wraps and delegates to the original service.
-+     * Register a **decorator function** with the {@link auto.$injector $injector}. A decorator function
-+     * intercepts the creation of a service, allowing it to override or modify the behavior of the
-+     * service. The return value of the decorator function may be the original service, or a new service
-+     * that replaces (or wraps and delegates to) the original service.
-+     *
-+     * You can find out more about using decorators in the {@link guide/decorators} guide.
-      *
-      * @param {string} name The name of the service to decorate.
--     * @param {function()} decorator This function will be invoked when the service needs to be
--     *    instantiated and should return the decorated service instance. The function is called using
-+     * @param {Function|Array.<string|Function>} decorator This function will be invoked when the service needs to be
-+     *    provided and should return the decorated service instance. The function is called using
-      *    the {@link auto.$injector#invoke injector.invoke} method and is therefore fully injectable.
-      *    Local injection arguments:
-      *
--     *    * `$delegate` - The original service instance, which can be monkey patched, configured,
-+     *    * `$delegate` - The original service instance, which can be replaced, monkey patched, configured,
-      *      decorated or delegated to.
-      *
-      * @example
-@@ -3678,18 +4856,19 @@
-      * calls to {@link ng.$log#error $log.warn()}.
-      * ```js
-      *   $provide.decorator('$log', ['$delegate', function($delegate) {
-- *     $delegate.warn = $delegate.error;
-- *     return $delegate;
-- *   }]);
-+     *     $delegate.warn = $delegate.error;
-+     *     return $delegate;
-+     *   }]);
-      * ```
-      */
- 
- 
--    function createInjector(modulesToLoad) {
-+    function createInjector(modulesToLoad, strictDi) {
-+        strictDi = (strictDi === true);
-         var INSTANTIATING = {},
-             providerSuffix = 'Provider',
-             path = [],
--            loadedModules = new HashMap(),
-+            loadedModules = new NgMap(),
-             providerCache = {
-                 $provide: {
-                     provider: supportObject(provider),
-@@ -3701,18 +4880,32 @@
-                 }
-             },
-             providerInjector = (providerCache.$injector =
--                createInternalInjector(providerCache, function() {
--                    throw $injectorMinErr('unpr', "Unknown provider: {0}", path.join(' <- '));
-+                createInternalInjector(providerCache, function(serviceName, caller) {
-+                    if (angular.isString(caller)) {
-+                        path.push(caller);
-+                    }
-+                    throw $injectorMinErr('unpr', 'Unknown provider: {0}', path.join(' <- '));
-                 })),
-             instanceCache = {},
--            instanceInjector = (instanceCache.$injector =
--                createInternalInjector(instanceCache, function(servicename) {
--                    var provider = providerInjector.get(servicename + providerSuffix);
--                    return instanceInjector.invoke(provider.$get, provider);
--                }));
-+            protoInstanceInjector =
-+                createInternalInjector(instanceCache, function(serviceName, caller) {
-+                    var provider = providerInjector.get(serviceName + providerSuffix, caller);
-+                    return instanceInjector.invoke(
-+                        provider.$get, provider, undefined, serviceName);
-+                }),
-+            instanceInjector = protoInstanceInjector;
-+
-+        providerCache['$injector' + providerSuffix] = { $get: valueFn(protoInstanceInjector) };
-+        instanceInjector.modules = providerInjector.modules = createMap();
-+        var runBlocks = loadModules(modulesToLoad);
-+        instanceInjector = protoInstanceInjector.get('$injector');
-+        instanceInjector.strictDi = strictDi;
-+        forEach(runBlocks, function(fn) { if (fn) instanceInjector.invoke(fn); });
- 
-+        instanceInjector.loadNewModules = function(mods) {
-+            forEach(loadModules(mods), function(fn) { if (fn) instanceInjector.invoke(fn); });
-+        };
- 
--        forEach(loadModules(modulesToLoad), function(fn) { instanceInjector.invoke(fn || noop); });
- 
-         return instanceInjector;
- 
-@@ -3736,12 +4929,26 @@
-                 provider_ = providerInjector.instantiate(provider_);
-             }
-             if (!provider_.$get) {
--                throw $injectorMinErr('pget', "Provider '{0}' must define $get factory method.", name);
-+                throw $injectorMinErr('pget', 'Provider \'{0}\' must define $get factory method.', name);
-             }
--            return providerCache[name + providerSuffix] = provider_;
-+            return (providerCache[name + providerSuffix] = provider_);
-+        }
-+
-+        function enforceReturnValue(name, factory) {
-+            return /** @this */ function enforcedReturnValue() {
-+                var result = instanceInjector.invoke(factory, this);
-+                if (isUndefined(result)) {
-+                    throw $injectorMinErr('undef', 'Provider \'{0}\' must return a value from $get factory method.', name);
-+                }
-+                return result;
-+            };
-         }
- 
--        function factory(name, factoryFn) { return provider(name, { $get: factoryFn }); }
-+        function factory(name, factoryFn, enforce) {
-+            return provider(name, {
-+                $get: enforce !== false ? enforceReturnValue(name, factoryFn) : factoryFn
-+            });
-+        }
- 
-         function service(name, constructor) {
-             return factory(name, ['$injector', function($injector) {
-@@ -3749,7 +4956,7 @@
-             }]);
-         }
- 
--        function value(name, val) { return factory(name, valueFn(val)); }
-+        function value(name, val) { return factory(name, valueFn(val), false); }
- 
-         function constant(name, value) {
-             assertNotHasOwnProperty(name, 'constant');
-@@ -3770,23 +4977,30 @@
-         ////////////////////////////////////
-         // Module Loading
-         ////////////////////////////////////
--        function loadModules(modulesToLoad){
--            var runBlocks = [], moduleFn, invokeQueue, i, ii;
-+        function loadModules(modulesToLoad) {
-+            assertArg(isUndefined(modulesToLoad) || isArray(modulesToLoad), 'modulesToLoad', 'not an array');
-+            var runBlocks = [], moduleFn;
-             forEach(modulesToLoad, function(module) {
-                 if (loadedModules.get(module)) return;
--                loadedModules.put(module, true);
-+                loadedModules.set(module, true);
-+
-+                function runInvokeQueue(queue) {
-+                    var i, ii;
-+                    for (i = 0, ii = queue.length; i < ii; i++) {
-+                        var invokeArgs = queue[i],
-+                            provider = providerInjector.get(invokeArgs[0]);
-+
-+                        provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
-+                    }
-+                }
- 
-                 try {
-                     if (isString(module)) {
-                         moduleFn = angularModule(module);
-+                        instanceInjector.modules[module] = moduleFn;
-                         runBlocks = runBlocks.concat(loadModules(moduleFn.requires)).concat(moduleFn._runBlocks);
--
--                        for(invokeQueue = moduleFn._invokeQueue, i = 0, ii = invokeQueue.length; i < ii; i++) {
--                            var invokeArgs = invokeQueue[i],
--                                provider = providerInjector.get(invokeArgs[0]);
--
--                            provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
--                        }
-+                        runInvokeQueue(moduleFn._invokeQueue);
-+                        runInvokeQueue(moduleFn._configBlocks);
-                     } else if (isFunction(module)) {
-                         runBlocks.push(providerInjector.invoke(module));
-                     } else if (isArray(module)) {
-@@ -3798,15 +5012,15 @@
-                     if (isArray(module)) {
-                         module = module[module.length - 1];
-                     }
--                    if (e.message && e.stack && e.stack.indexOf(e.message) == -1) {
-+                    if (e.message && e.stack && e.stack.indexOf(e.message) === -1) {
-                         // Safari & FF's stack traces don't contain error.message content
-                         // unlike those of Chrome and IE
-                         // So if stack doesn't contain message, we create a new string that contains both.
-                         // Since error.stack is read-only in Safari, I'm overriding e and not e.stack here.
--                        /* jshint -W022 */
-+                        // eslint-disable-next-line no-ex-assign
-                         e = e.message + '\n' + e.stack;
-                     }
--                    throw $injectorMinErr('modulerr', "Failed to instantiate module {0} due to:\n{1}",
-+                    throw $injectorMinErr('modulerr', 'Failed to instantiate module {0} due to:\n{1}',
-                         module, e.stack || e.message || e);
-                 }
-             });
-@@ -3819,17 +5033,19 @@
- 
-         function createInternalInjector(cache, factory) {
- 
--            function getService(serviceName) {
-+            function getService(serviceName, caller) {
-                 if (cache.hasOwnProperty(serviceName)) {
-                     if (cache[serviceName] === INSTANTIATING) {
--                        throw $injectorMinErr('cdep', 'Circular dependency found: {0}', path.join(' <- '));
-+                        throw $injectorMinErr('cdep', 'Circular dependency found: {0}',
-+                            serviceName + ' <- ' + path.join(' <- '));
-                     }
-                     return cache[serviceName];
-                 } else {
-                     try {
-                         path.unshift(serviceName);
-                         cache[serviceName] = INSTANTIATING;
--                        return cache[serviceName] = factory(serviceName);
-+                        cache[serviceName] = factory(serviceName, caller);
-+                        return cache[serviceName];
-                     } catch (err) {
-                         if (cache[serviceName] === INSTANTIATING) {
-                             delete cache[serviceName];
-@@ -3841,52 +5057,76 @@
-                 }
-             }
- 
--            function invoke(fn, self, locals){
-+
-+            function injectionArgs(fn, locals, serviceName) {
-                 var args = [],
--                    $inject = annotate(fn),
--                    length, i,
--                    key;
-+                    $inject = createInjector.$$annotate(fn, strictDi, serviceName);
- 
--                for(i = 0, length = $inject.length; i < length; i++) {
--                    key = $inject[i];
-+                for (var i = 0, length = $inject.length; i < length; i++) {
-+                    var key = $inject[i];
-                     if (typeof key !== 'string') {
-                         throw $injectorMinErr('itkn',
-                             'Incorrect injection token! Expected service name as string, got {0}', key);
-                     }
--                    args.push(
--                        locals && locals.hasOwnProperty(key)
--                            ? locals[key]
--                            : getService(key)
--                    );
-+                    args.push(locals && locals.hasOwnProperty(key) ? locals[key] :
-+                        getService(key, serviceName));
-+                }
-+                return args;
-+            }
-+
-+            function isClass(func) {
-+                // Support: IE 9-11 only
-+                // IE 9-11 do not support classes and IE9 leaks with the code below.
-+                if (msie || typeof func !== 'function') {
-+                    return false;
-+                }
-+                var result = func.$$ngIsClass;
-+                if (!isBoolean(result)) {
-+                    // Support: Edge 12-13 only
-+                    // See: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6156135/
-+                    result = func.$$ngIsClass = /^(?:class\b|constructor\()/.test(stringifyFn(func));
-                 }
--                if (!fn.$inject) {
--                    // this means that we must be an array.
--                    fn = fn[length];
-+                return result;
-+            }
-+
-+            function invoke(fn, self, locals, serviceName) {
-+                if (typeof locals === 'string') {
-+                    serviceName = locals;
-+                    locals = null;
-+                }
-+
-+                var args = injectionArgs(fn, locals, serviceName);
-+                if (isArray(fn)) {
-+                    fn = fn[fn.length - 1];
-                 }
- 
--                // http://jsperf.com/angularjs-invoke-apply-vs-switch
--                // #5388
--                return fn.apply(self, args);
-+                if (!isClass(fn)) {
-+                    // http://jsperf.com/angularjs-invoke-apply-vs-switch
-+                    // #5388
-+                    return fn.apply(self, args);
-+                } else {
-+                    args.unshift(null);
-+                    return new (Function.prototype.bind.apply(fn, args))();
-+                }
-             }
- 
--            function instantiate(Type, locals) {
--                var Constructor = function() {},
--                    instance, returnedValue;
- 
-+            function instantiate(Type, locals, serviceName) {
-                 // Check if Type is annotated and use just the given function at n-1 as parameter
-                 // e.g. someModule.factory('greeter', ['$window', function(renamed$window) {}]);
--                Constructor.prototype = (isArray(Type) ? Type[Type.length - 1] : Type).prototype;
--                instance = new Constructor();
--                returnedValue = invoke(Type, instance, locals);
--
--                return isObject(returnedValue) || isFunction(returnedValue) ? returnedValue : instance;
-+                var ctor = (isArray(Type) ? Type[Type.length - 1] : Type);
-+                var args = injectionArgs(Type, locals, serviceName);
-+                // Empty object at position 0 is ignored for invocation with `new`, but required.
-+                args.unshift(null);
-+                return new (Function.prototype.bind.apply(ctor, args))();
-             }
- 
-+
-             return {
-                 invoke: invoke,
-                 instantiate: instantiate,
-                 get: getService,
--                annotate: annotate,
-+                annotate: createInjector.$$annotate,
-                 has: function(name) {
-                     return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name);
-                 }
-@@ -3894,108 +5134,445 @@
-         }
-     }
- 
-+    createInjector.$$annotate = annotate;
-+
-     /**
--     * @ngdoc service
--     * @name $anchorScroll
--     * @kind function
--     * @requires $window
--     * @requires $location
--     * @requires $rootScope
-+     * @ngdoc provider
-+     * @name $anchorScrollProvider
-+     * @this
-      *
-      * @description
--     * When called, it checks current value of `$location.hash()` and scroll to related element,
--     * according to rules specified in
--     * [Html5 spec](http://dev.w3.org/html5/spec/Overview.html#the-indicated-part-of-the-document).
--     *
--     * It also watches the `$location.hash()` and scrolls whenever it changes to match any anchor.
--     * This can be disabled by calling `$anchorScrollProvider.disableAutoScrolling()`.
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <div id="scrollArea" ng-controller="ScrollCtrl">
--     <a ng-click="gotoBottom()">Go to bottom</a>
--     <a id="bottom"></a> You're at the bottom!
--     </div>
--     </file>
--     <file name="script.js">
--     function ScrollCtrl($scope, $location, $anchorScroll) {
--         $scope.gotoBottom = function (){
--           // set the location.hash to the id of
--           // the element you wish to scroll to.
--           $location.hash('bottom');
--
--           // call $anchorScroll()
--           $anchorScroll();
--         };
--       }
--     </file>
--     <file name="style.css">
--     #scrollArea {
--         height: 350px;
--         overflow: auto;
--       }
--
--     #bottom {
--         display: block;
--         margin-top: 2000px;
--       }
--     </file>
--     </example>
-+     * Use `$anchorScrollProvider` to disable automatic scrolling whenever
-+     * {@link ng.$location#hash $location.hash()} changes.
-      */
-     function $AnchorScrollProvider() {
- 
-         var autoScrollingEnabled = true;
- 
-+        /**
-+         * @ngdoc method
-+         * @name $anchorScrollProvider#disableAutoScrolling
-+         *
-+         * @description
-+         * By default, {@link ng.$anchorScroll $anchorScroll()} will automatically detect changes to
-+         * {@link ng.$location#hash $location.hash()} and scroll to the element matching the new hash.<br />
-+         * Use this method to disable automatic scrolling.
-+         *
-+         * If automatic scrolling is disabled, one must explicitly call
-+         * {@link ng.$anchorScroll $anchorScroll()} in order to scroll to the element related to the
-+         * current hash.
-+         */
-         this.disableAutoScrolling = function() {
-             autoScrollingEnabled = false;
-         };
- 
-+        /**
-+         * @ngdoc service
-+         * @name $anchorScroll
-+         * @kind function
-+         * @requires $window
-+         * @requires $location
-+         * @requires $rootScope
-+         *
-+         * @description
-+         * When called, it scrolls to the element related to the specified `hash` or (if omitted) to the
-+         * current value of {@link ng.$location#hash $location.hash()}, according to the rules specified
-+         * in the
-+         * [HTML5 spec](http://www.w3.org/html/wg/drafts/html/master/browsers.html#an-indicated-part-of-the-document).
-+         *
-+         * It also watches the {@link ng.$location#hash $location.hash()} and automatically scrolls to
-+         * match any anchor whenever it changes. This can be disabled by calling
-+         * {@link ng.$anchorScrollProvider#disableAutoScrolling $anchorScrollProvider.disableAutoScrolling()}.
-+         *
-+         * Additionally, you can use its {@link ng.$anchorScroll#yOffset yOffset} property to specify a
-+         * vertical scroll-offset (either fixed or dynamic).
-+         *
-+         * @param {string=} hash The hash specifying the element to scroll to. If omitted, the value of
-+         *                       {@link ng.$location#hash $location.hash()} will be used.
-+         *
-+         * @property {(number|function|jqLite)} yOffset
-+         * If set, specifies a vertical scroll-offset. This is often useful when there are fixed
-+         * positioned elements at the top of the page, such as navbars, headers etc.
-+         *
-+         * `yOffset` can be specified in various ways:
-+         * - **number**: A fixed number of pixels to be used as offset.<br /><br />
-+         * - **function**: A getter function called everytime `$anchorScroll()` is executed. Must return
-+         *   a number representing the offset (in pixels).<br /><br />
-+         * - **jqLite**: A jqLite/jQuery element to be used for specifying the offset. The distance from
-+         *   the top of the page to the element's bottom will be used as offset.<br />
-+         *   **Note**: The element will be taken into account only as long as its `position` is set to
-+         *   `fixed`. This option is useful, when dealing with responsive navbars/headers that adjust
-+         *   their height and/or positioning according to the viewport's size.
-+         *
-+         * <br />
-+         * <div class="alert alert-warning">
-+         * In order for `yOffset` to work properly, scrolling should take place on the document's root and
-+         * not some child element.
-+         * </div>
-+         *
-+         * @example
-+         <example module="anchorScrollExample" name="anchor-scroll">
-+         <file name="index.html">
-+         <div id="scrollArea" ng-controller="ScrollController">
-+         <a ng-click="gotoBottom()">Go to bottom</a>
-+         <a id="bottom"></a> You're at the bottom!
-+         </div>
-+         </file>
-+         <file name="script.js">
-+         angular.module('anchorScrollExample', [])
-+         .controller('ScrollController', ['$scope', '$location', '$anchorScroll',
-+         function($scope, $location, $anchorScroll) {
-+               $scope.gotoBottom = function() {
-+                 // set the location.hash to the id of
-+                 // the element you wish to scroll to.
-+                 $location.hash('bottom');
-+
-+                 // call $anchorScroll()
-+                 $anchorScroll();
-+               };
-+             }]);
-+         </file>
-+         <file name="style.css">
-+         #scrollArea {
-+           height: 280px;
-+           overflow: auto;
-+         }
-+
-+         #bottom {
-+           display: block;
-+           margin-top: 2000px;
-+         }
-+         </file>
-+         </example>
-+         *
-+         * <hr />
-+         * The example below illustrates the use of a vertical scroll-offset (specified as a fixed value).
-+         * See {@link ng.$anchorScroll#yOffset $anchorScroll.yOffset} for more details.
-+         *
-+         * @example
-+         <example module="anchorScrollOffsetExample" name="anchor-scroll-offset">
-+         <file name="index.html">
-+         <div class="fixed-header" ng-controller="headerCtrl">
-+         <a href="" ng-click="gotoAnchor(x)" ng-repeat="x in [1,2,3,4,5]">
-+         Go to anchor {{x}}
-+         </a>
-+         </div>
-+         <div id="anchor{{x}}" class="anchor" ng-repeat="x in [1,2,3,4,5]">
-+         Anchor {{x}} of 5
-+         </div>
-+         </file>
-+         <file name="script.js">
-+         angular.module('anchorScrollOffsetExample', [])
-+         .run(['$anchorScroll', function($anchorScroll) {
-+             $anchorScroll.yOffset = 50;   // always scroll by 50 extra pixels
-+           }])
-+         .controller('headerCtrl', ['$anchorScroll', '$location', '$scope',
-+         function($anchorScroll, $location, $scope) {
-+               $scope.gotoAnchor = function(x) {
-+                 var newHash = 'anchor' + x;
-+                 if ($location.hash() !== newHash) {
-+                   // set the $location.hash to `newHash` and
-+                   // $anchorScroll will automatically scroll to it
-+                   $location.hash('anchor' + x);
-+                 } else {
-+                   // call $anchorScroll() explicitly,
-+                   // since $location.hash hasn't changed
-+                   $anchorScroll();
-+                 }
-+               };
-+             }
-+         ]);
-+         </file>
-+         <file name="style.css">
-+         body {
-+           padding-top: 50px;
-+         }
-+
-+         .anchor {
-+           border: 2px dashed DarkOrchid;
-+           padding: 10px 10px 200px 10px;
-+         }
-+
-+         .fixed-header {
-+           background-color: rgba(0, 0, 0, 0.2);
-+           height: 50px;
-+           position: fixed;
-+           top: 0; left: 0; right: 0;
-+         }
-+
-+         .fixed-header > a {
-+           display: inline-block;
-+           margin: 5px 15px;
-+         }
-+         </file>
-+         </example>
-+         */
-         this.$get = ['$window', '$location', '$rootScope', function($window, $location, $rootScope) {
-             var document = $window.document;
- 
--            // helper function to get first anchor from a NodeList
--            // can't use filter.filter, as it accepts only instances of Array
--            // and IE can't convert NodeList to an array using [].slice
--            // TODO(vojta): use filter if we change it to accept lists as well
-+            // Helper function to get first anchor from a NodeList
-+            // (using `Array#some()` instead of `angular#forEach()` since it's more performant
-+            //  and working in all supported browsers.)
-             function getFirstAnchor(list) {
-                 var result = null;
--                forEach(list, function(element) {
--                    if (!result && lowercase(element.nodeName) === 'a') result = element;
-+                Array.prototype.some.call(list, function(element) {
-+                    if (nodeName_(element) === 'a') {
-+                        result = element;
-+                        return true;
-+                    }
-                 });
-                 return result;
-             }
- 
--            function scroll() {
--                var hash = $location.hash(), elm;
--
--                // empty hash, scroll to the top of the page
--                if (!hash) $window.scrollTo(0, 0);
-+            function getYOffset() {
- 
--                // element with given id
--                else if ((elm = document.getElementById(hash))) elm.scrollIntoView();
-+                var offset = scroll.yOffset;
- 
--                // first anchor with given name :-D
--                else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) elm.scrollIntoView();
-+                if (isFunction(offset)) {
-+                    offset = offset();
-+                } else if (isElement(offset)) {
-+                    var elem = offset[0];
-+                    var style = $window.getComputedStyle(elem);
-+                    if (style.position !== 'fixed') {
-+                        offset = 0;
-+                    } else {
-+                        offset = elem.getBoundingClientRect().bottom;
-+                    }
-+                } else if (!isNumber(offset)) {
-+                    offset = 0;
-+                }
- 
--                // no element and hash == 'top', scroll to the top of the page
--                else if (hash === 'top') $window.scrollTo(0, 0);
-+                return offset;
-             }
- 
--            // does not scroll when user clicks on anchor link that is currently on
--            // (no url change, no $location.hash() change), browser native does scroll
--            if (autoScrollingEnabled) {
--                $rootScope.$watch(function autoScrollWatch() {return $location.hash();},
--                    function autoScrollWatchAction() {
--                        $rootScope.$evalAsync(scroll);
--                    });
--            }
-+            function scrollTo(elem) {
-+                if (elem) {
-+                    elem.scrollIntoView();
- 
--            return scroll;
-+                    var offset = getYOffset();
-+
-+                    if (offset) {
-+                        // `offset` is the number of pixels we should scroll UP in order to align `elem` properly.
-+                        // This is true ONLY if the call to `elem.scrollIntoView()` initially aligns `elem` at the
-+                        // top of the viewport.
-+                        //
-+                        // IF the number of pixels from the top of `elem` to the end of the page's content is less
-+                        // than the height of the viewport, then `elem.scrollIntoView()` will align the `elem` some
-+                        // way down the page.
-+                        //
-+                        // This is often the case for elements near the bottom of the page.
-+                        //
-+                        // In such cases we do not need to scroll the whole `offset` up, just the difference between
-+                        // the top of the element and the offset, which is enough to align the top of `elem` at the
-+                        // desired position.
-+                        var elemTop = elem.getBoundingClientRect().top;
-+                        $window.scrollBy(0, elemTop - offset);
-+                    }
-+                } else {
-+                    $window.scrollTo(0, 0);
-+                }
-+            }
-+
-+            function scroll(hash) {
-+                // Allow numeric hashes
-+                hash = isString(hash) ? hash : isNumber(hash) ? hash.toString() : $location.hash();
-+                var elm;
-+
-+                // empty hash, scroll to the top of the page
-+                if (!hash) scrollTo(null);
-+
-+                // element with given id
-+                else if ((elm = document.getElementById(hash))) scrollTo(elm);
-+
-+                // first anchor with given name :-D
-+                else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) scrollTo(elm);
-+
-+                // no element and hash === 'top', scroll to the top of the page
-+                else if (hash === 'top') scrollTo(null);
-+            }
-+
-+            // does not scroll when user clicks on anchor link that is currently on
-+            // (no url change, no $location.hash() change), browser native does scroll
-+            if (autoScrollingEnabled) {
-+                $rootScope.$watch(function autoScrollWatch() {return $location.hash();},
-+                    function autoScrollWatchAction(newVal, oldVal) {
-+                        // skip the initial scroll if $location.hash is empty
-+                        if (newVal === oldVal && newVal === '') return;
-+
-+                        jqLiteDocumentLoaded(function() {
-+                            $rootScope.$evalAsync(scroll);
-+                        });
-+                    });
-+            }
-+
-+            return scroll;
-         }];
-     }
- 
-     var $animateMinErr = minErr('$animate');
-+    var ELEMENT_NODE = 1;
-+    var NG_ANIMATE_CLASSNAME = 'ng-animate';
-+
-+    function mergeClasses(a,b) {
-+        if (!a && !b) return '';
-+        if (!a) return b;
-+        if (!b) return a;
-+        if (isArray(a)) a = a.join(' ');
-+        if (isArray(b)) b = b.join(' ');
-+        return a + ' ' + b;
-+    }
-+
-+    function extractElementNode(element) {
-+        for (var i = 0; i < element.length; i++) {
-+            var elm = element[i];
-+            if (elm.nodeType === ELEMENT_NODE) {
-+                return elm;
-+            }
-+        }
-+    }
-+
-+    function splitClasses(classes) {
-+        if (isString(classes)) {
-+            classes = classes.split(' ');
-+        }
-+
-+        // Use createMap() to prevent class assumptions involving property names in
-+        // Object.prototype
-+        var obj = createMap();
-+        forEach(classes, function(klass) {
-+            // sometimes the split leaves empty string values
-+            // incase extra spaces were applied to the options
-+            if (klass.length) {
-+                obj[klass] = true;
-+            }
-+        });
-+        return obj;
-+    }
-+
-+// if any other type of options value besides an Object value is
-+// passed into the $animate.method() animation then this helper code
-+// will be run which will ignore it. While this patch is not the
-+// greatest solution to this, a lot of existing plugins depend on
-+// $animate to either call the callback (< 1.2) or return a promise
-+// that can be changed. This helper function ensures that the options
-+// are wiped clean incase a callback function is provided.
-+    function prepareAnimateOptions(options) {
-+        return isObject(options)
-+            ? options
-+            : {};
-+    }
-+
-+    var $$CoreAnimateJsProvider = /** @this */ function() {
-+        this.$get = noop;
-+    };
-+
-+// this is prefixed with Core since it conflicts with
-+// the animateQueueProvider defined in ngAnimate/animateQueue.js
-+    var $$CoreAnimateQueueProvider = /** @this */ function() {
-+        var postDigestQueue = new NgMap();
-+        var postDigestElements = [];
-+
-+        this.$get = ['$$AnimateRunner', '$rootScope',
-+            function($$AnimateRunner,   $rootScope) {
-+                return {
-+                    enabled: noop,
-+                    on: noop,
-+                    off: noop,
-+                    pin: noop,
-+
-+                    push: function(element, event, options, domOperation) {
-+                        if (domOperation) {
-+                            domOperation();
-+                        }
-+
-+                        options = options || {};
-+                        if (options.from) {
-+                            element.css(options.from);
-+                        }
-+                        if (options.to) {
-+                            element.css(options.to);
-+                        }
-+
-+                        if (options.addClass || options.removeClass) {
-+                            addRemoveClassesPostDigest(element, options.addClass, options.removeClass);
-+                        }
-+
-+                        var runner = new $$AnimateRunner();
-+
-+                        // since there are no animations to run the runner needs to be
-+                        // notified that the animation call is complete.
-+                        runner.complete();
-+                        return runner;
-+                    }
-+                };
-+
-+
-+                function updateData(data, classes, value) {
-+                    var changed = false;
-+                    if (classes) {
-+                        classes = isString(classes) ? classes.split(' ') :
-+                            isArray(classes) ? classes : [];
-+                        forEach(classes, function(className) {
-+                            if (className) {
-+                                changed = true;
-+                                data[className] = value;
-+                            }
-+                        });
-+                    }
-+                    return changed;
-+                }
-+
-+                function handleCSSClassChanges() {
-+                    forEach(postDigestElements, function(element) {
-+                        var data = postDigestQueue.get(element);
-+                        if (data) {
-+                            var existing = splitClasses(element.attr('class'));
-+                            var toAdd = '';
-+                            var toRemove = '';
-+                            forEach(data, function(status, className) {
-+                                var hasClass = !!existing[className];
-+                                if (status !== hasClass) {
-+                                    if (status) {
-+                                        toAdd += (toAdd.length ? ' ' : '') + className;
-+                                    } else {
-+                                        toRemove += (toRemove.length ? ' ' : '') + className;
-+                                    }
-+                                }
-+                            });
-+
-+                            forEach(element, function(elm) {
-+                                if (toAdd) {
-+                                    jqLiteAddClass(elm, toAdd);
-+                                }
-+                                if (toRemove) {
-+                                    jqLiteRemoveClass(elm, toRemove);
-+                                }
-+                            });
-+                            postDigestQueue.delete(element);
-+                        }
-+                    });
-+                    postDigestElements.length = 0;
-+                }
-+
-+
-+                function addRemoveClassesPostDigest(element, add, remove) {
-+                    var data = postDigestQueue.get(element) || {};
-+
-+                    var classesAdded = updateData(data, add, true);
-+                    var classesRemoved = updateData(data, remove, false);
-+
-+                    if (classesAdded || classesRemoved) {
-+
-+                        postDigestQueue.set(element, data);
-+                        postDigestElements.push(element);
-+
-+                        if (postDigestElements.length === 1) {
-+                            $rootScope.$$postDigest(handleCSSClassChanges);
-+                        }
-+                    }
-+                }
-+            }];
-+    };
- 
-     /**
-      * @ngdoc provider
-@@ -4003,18 +5580,18 @@
-      *
-      * @description
-      * Default implementation of $animate that doesn't perform any animations, instead just
--     * synchronously performs DOM
--     * updates and calls done() callbacks.
-+     * synchronously performs DOM updates and resolves the returned runner promise.
-      *
--     * In order to enable animations the ngAnimate module has to be loaded.
-+     * In order to enable animations the `ngAnimate` module has to be loaded.
-      *
--     * To see the functional implementation check out src/ngAnimate/animate.js
-+     * To see the functional implementation check out `src/ngAnimate/animate.js`.
-      */
--    var $AnimateProvider = ['$provide', function($provide) {
--
--
--        this.$$selectors = {};
-+    var $AnimateProvider = ['$provide', /** @this */ function($provide) {
-+        var provider = this;
-+        var classNameFilter = null;
-+        var customFilter = null;
- 
-+        this.$$registeredAnimations = Object.create(null);
- 
-         /**
-          * @ngdoc method
-@@ -4025,36 +5602,91 @@
-          * animation object which contains callback functions for each event that is expected to be
-          * animated.
-          *
--         *   * `eventFn`: `function(Element, doneFunction)` The element to animate, the `doneFunction`
--         *   must be called once the element animation is complete. If a function is returned then the
--         *   animation service will use this function to cancel the animation whenever a cancel event is
--         *   triggered.
-+         *   * `eventFn`: `function(element, ... , doneFunction, options)`
-+         *   The element to animate, the `doneFunction` and the options fed into the animation. Depending
-+         *   on the type of animation additional arguments will be injected into the animation function. The
-+         *   list below explains the function signatures for the different animation methods:
-          *
-+         *   - setClass: function(element, addedClasses, removedClasses, doneFunction, options)
-+         *   - addClass: function(element, addedClasses, doneFunction, options)
-+         *   - removeClass: function(element, removedClasses, doneFunction, options)
-+         *   - enter, leave, move: function(element, doneFunction, options)
-+         *   - animate: function(element, fromStyles, toStyles, doneFunction, options)
-+         *
-+         *   Make sure to trigger the `doneFunction` once the animation is fully complete.
-          *
-          * ```js
-          *   return {
--     *     eventFn : function(element, done) {
--     *       //code to run the animation
--     *       //once complete, then run done()
--     *       return function cancellationFunction() {
--     *         //code to cancel the animation
--     *       }
--     *     }
--     *   }
-+         *     //enter, leave, move signature
-+         *     eventFn : function(element, done, options) {
-+         *       //code to run the animation
-+         *       //once complete, then run done()
-+         *       return function endFunction(wasCancelled) {
-+         *         //code to cancel the animation
-+         *       }
-+         *     }
-+         *   }
-          * ```
-          *
--         * @param {string} name The name of the animation.
-+         * @param {string} name The name of the animation (this is what the class-based CSS value will be compared to).
-          * @param {Function} factory The factory function that will be executed to return the animation
-          *                           object.
-          */
-         this.register = function(name, factory) {
-+            if (name && name.charAt(0) !== '.') {
-+                throw $animateMinErr('notcsel', 'Expecting class selector starting with \'.\' got \'{0}\'.', name);
-+            }
-+
-             var key = name + '-animation';
--            if (name && name.charAt(0) != '.') throw $animateMinErr('notcsel',
--                "Expecting class selector starting with '.' got '{0}'.", name);
--            this.$$selectors[name.substr(1)] = key;
-+            provider.$$registeredAnimations[name.substr(1)] = key;
-             $provide.factory(key, factory);
-         };
- 
-+        /**
-+         * @ngdoc method
-+         * @name $animateProvider#customFilter
-+         *
-+         * @description
-+         * Sets and/or returns the custom filter function that is used to "filter" animations, i.e.
-+         * determine if an animation is allowed or not. When no filter is specified (the default), no
-+         * animation will be blocked. Setting the `customFilter` value will only allow animations for
-+         * which the filter function's return value is truthy.
-+         *
-+         * This allows to easily create arbitrarily complex rules for filtering animations, such as
-+         * allowing specific events only, or enabling animations on specific subtrees of the DOM, etc.
-+         * Filtering animations can also boost performance for low-powered devices, as well as
-+         * applications containing a lot of structural operations.
-+         *
-+         * <div class="alert alert-success">
-+         *   **Best Practice:**
-+         *   Keep the filtering function as lean as possible, because it will be called for each DOM
-+         *   action (e.g. insertion, removal, class change) performed by "animation-aware" directives.
-+         *   See {@link guide/animations#which-directives-support-animations- here} for a list of built-in
-+         *   directives that support animations.
-+         *   Performing computationally expensive or time-consuming operations on each call of the
-+         *   filtering function can make your animations sluggish.
-+         * </div>
-+         *
-+         * **Note:** If present, `customFilter` will be checked before
-+         * {@link $animateProvider#classNameFilter classNameFilter}.
-+         *
-+         * @param {Function=} filterFn - The filter function which will be used to filter all animations.
-+         *   If a falsy value is returned, no animation will be performed. The function will be called
-+         *   with the following arguments:
-+         *   - **node** `{DOMElement}` - The DOM element to be animated.
-+         *   - **event** `{String}` - The name of the animation event (e.g. `enter`, `leave`, `addClass`
-+         *     etc).
-+         *   - **options** `{Object}` - A collection of options/styles used for the animation.
-+         * @return {Function} The current filter function or `null` if there is none set.
-+         */
-+        this.customFilter = function(filterFn) {
-+            if (arguments.length === 1) {
-+                customFilter = isFunction(filterFn) ? filterFn : null;
-+            }
-+
-+            return customFilter;
-+        };
-+
-         /**
-          * @ngdoc method
-          * @name $animateProvider#classNameFilter
-@@ -4062,220 +5694,716 @@
-          * @description
-          * Sets and/or returns the CSS class regular expression that is checked when performing
-          * an animation. Upon bootstrap the classNameFilter value is not set at all and will
--         * therefore enable $animate to attempt to perform an animation on any element.
--         * When setting the classNameFilter value, animations will only be performed on elements
-+         * therefore enable $animate to attempt to perform an animation on any element that is triggered.
-+         * When setting the `classNameFilter` value, animations will only be performed on elements
-          * that successfully match the filter expression. This in turn can boost performance
-          * for low-powered devices as well as applications containing a lot of structural operations.
-+         *
-+         * **Note:** If present, `classNameFilter` will be checked after
-+         * {@link $animateProvider#customFilter customFilter}. If `customFilter` is present and returns
-+         * false, `classNameFilter` will not be checked.
-+         *
-          * @param {RegExp=} expression The className expression which will be checked against all animations
-          * @return {RegExp} The current CSS className expression value. If null then there is no expression value
-          */
-         this.classNameFilter = function(expression) {
--            if(arguments.length === 1) {
--                this.$$classNameFilter = (expression instanceof RegExp) ? expression : null;
-+            if (arguments.length === 1) {
-+                classNameFilter = (expression instanceof RegExp) ? expression : null;
-+                if (classNameFilter) {
-+                    var reservedRegex = new RegExp('[(\\s|\\/)]' + NG_ANIMATE_CLASSNAME + '[(\\s|\\/)]');
-+                    if (reservedRegex.test(classNameFilter.toString())) {
-+                        classNameFilter = null;
-+                        throw $animateMinErr('nongcls', '$animateProvider.classNameFilter(regex) prohibits accepting a regex value which matches/contains the "{0}" CSS class.', NG_ANIMATE_CLASSNAME);
-+                    }
-+                }
-             }
--            return this.$$classNameFilter;
-+            return classNameFilter;
-         };
- 
--        this.$get = ['$timeout', '$$asyncCallback', function($timeout, $$asyncCallback) {
--
--            function async(fn) {
--                fn && $$asyncCallback(fn);
-+        this.$get = ['$$animateQueue', function($$animateQueue) {
-+            function domInsert(element, parentElement, afterElement) {
-+                // if for some reason the previous element was removed
-+                // from the dom sometime before this code runs then let's
-+                // just stick to using the parent element as the anchor
-+                if (afterElement) {
-+                    var afterNode = extractElementNode(afterElement);
-+                    if (afterNode && !afterNode.parentNode && !afterNode.previousElementSibling) {
-+                        afterElement = null;
-+                    }
-+                }
-+                if (afterElement) {
-+                    afterElement.after(element);
-+                } else {
-+                    parentElement.prepend(element);
-+                }
-             }
- 
-             /**
--             *
-              * @ngdoc service
-              * @name $animate
--             * @description The $animate service provides rudimentary DOM manipulation functions to
--             * insert, remove and move elements within the DOM, as well as adding and removing classes.
--             * This service is the core service used by the ngAnimate $animator service which provides
--             * high-level animation hooks for CSS and JavaScript.
-+             * @description The $animate service exposes a series of DOM utility methods that provide support
-+             * for animation hooks. The default behavior is the application of DOM operations, however,
-+             * when an animation is detected (and animations are enabled), $animate will do the heavy lifting
-+             * to ensure that animation runs with the triggered DOM operation.
-+             *
-+             * By default $animate doesn't trigger any animations. This is because the `ngAnimate` module isn't
-+             * included and only when it is active then the animation hooks that `$animate` triggers will be
-+             * functional. Once active then all structural `ng-` directives will trigger animations as they perform
-+             * their DOM-related operations (enter, leave and move). Other directives such as `ngClass`,
-+             * `ngShow`, `ngHide` and `ngMessages` also provide support for animations.
-              *
--             * $animate is available in the AngularJS core, however, the ngAnimate module must be included
--             * to enable full out animation support. Otherwise, $animate will only perform simple DOM
--             * manipulation operations.
-+             * It is recommended that the`$animate` service is always used when executing DOM-related procedures within directives.
-              *
--             * To learn more about enabling animation support, click here to visit the {@link ngAnimate
--     * ngAnimate module page} as well as the {@link ngAnimate.$animate ngAnimate $animate service
--     * page}.
-+             * To learn more about enabling animation support, click here to visit the
-+             * {@link ngAnimate ngAnimate module page}.
-              */
-             return {
-+                // we don't call it directly since non-existant arguments may
-+                // be interpreted as null within the sub enabled function
- 
-                 /**
-                  *
-                  * @ngdoc method
--                 * @name $animate#enter
--                 * @function
--                 * @description Inserts the element into the DOM either after the `after` element or within
--                 *   the `parent` element. Once complete, the done() callback will be fired (if provided).
--                 * @param {DOMElement} element the element which will be inserted into the DOM
--                 * @param {DOMElement} parent the parent element which will append the element as
--                 *   a child (if the after element is not present)
--                 * @param {DOMElement} after the sibling element which will append the element
--                 *   after itself
--                 * @param {Function=} done callback function that will be called after the element has been
--                 *   inserted into the DOM
-+                 * @name $animate#on
-+                 * @kind function
-+                 * @description Sets up an event listener to fire whenever the animation event (enter, leave, move, etc...)
-+                 *    has fired on the given element or among any of its children. Once the listener is fired, the provided callback
-+                 *    is fired with the following params:
-+                 *
-+                 * ```js
-+                 * $animate.on('enter', container,
-+                 *    function callback(element, phase) {
-+                 *      // cool we detected an enter animation within the container
-+                 *    }
-+                 * );
-+                 * ```
-+                 *
-+                 * @param {string} event the animation event that will be captured (e.g. enter, leave, move, addClass, removeClass, etc...)
-+                 * @param {DOMElement} container the container element that will capture each of the animation events that are fired on itself
-+                 *     as well as among its children
-+                 * @param {Function} callback the callback function that will be fired when the listener is triggered
-+                 *
-+                 * The arguments present in the callback function are:
-+                 * * `element` - The captured DOM element that the animation was fired on.
-+                 * * `phase` - The phase of the animation. The two possible phases are **start** (when the animation starts) and **close** (when it ends).
-                  */
--                enter : function(element, parent, after, done) {
--                    if (after) {
--                        after.after(element);
--                    } else {
--                        if (!parent || !parent[0]) {
--                            parent = after.parent();
--                        }
--                        parent.append(element);
-+                on: $$animateQueue.on,
-+
-+                /**
-+                 *
-+                 * @ngdoc method
-+                 * @name $animate#off
-+                 * @kind function
-+                 * @description Deregisters an event listener based on the event which has been associated with the provided element. This method
-+                 * can be used in three different ways depending on the arguments:
-+                 *
-+                 * ```js
-+                 * // remove all the animation event listeners listening for `enter`
-+                 * $animate.off('enter');
-+                 *
-+                 * // remove listeners for all animation events from the container element
-+                 * $animate.off(container);
-+                 *
-+                 * // remove all the animation event listeners listening for `enter` on the given element and its children
-+                 * $animate.off('enter', container);
-+                 *
-+                 * // remove the event listener function provided by `callback` that is set
-+                 * // to listen for `enter` on the given `container` as well as its children
-+                 * $animate.off('enter', container, callback);
-+                 * ```
-+                 *
-+                 * @param {string|DOMElement} event|container the animation event (e.g. enter, leave, move,
-+                 * addClass, removeClass, etc...), or the container element. If it is the element, all other
-+                 * arguments are ignored.
-+                 * @param {DOMElement=} container the container element the event listener was placed on
-+                 * @param {Function=} callback the callback function that was registered as the listener
-+                 */
-+                off: $$animateQueue.off,
-+
-+                /**
-+                 * @ngdoc method
-+                 * @name $animate#pin
-+                 * @kind function
-+                 * @description Associates the provided element with a host parent element to allow the element to be animated even if it exists
-+                 *    outside of the DOM structure of the AngularJS application. By doing so, any animation triggered via `$animate` can be issued on the
-+                 *    element despite being outside the realm of the application or within another application. Say for example if the application
-+                 *    was bootstrapped on an element that is somewhere inside of the `<body>` tag, but we wanted to allow for an element to be situated
-+                 *    as a direct child of `document.body`, then this can be achieved by pinning the element via `$animate.pin(element)`. Keep in mind
-+                 *    that calling `$animate.pin(element, parentElement)` will not actually insert into the DOM anywhere; it will just create the association.
-+                 *
-+                 *    Note that this feature is only active when the `ngAnimate` module is used.
-+                 *
-+                 * @param {DOMElement} element the external element that will be pinned
-+                 * @param {DOMElement} parentElement the host parent element that will be associated with the external element
-+                 */
-+                pin: $$animateQueue.pin,
-+
-+                /**
-+                 *
-+                 * @ngdoc method
-+                 * @name $animate#enabled
-+                 * @kind function
-+                 * @description Used to get and set whether animations are enabled or not on the entire application or on an element and its children. This
-+                 * function can be called in four ways:
-+                 *
-+                 * ```js
-+                 * // returns true or false
-+                 * $animate.enabled();
-+                 *
-+                 * // changes the enabled state for all animations
-+                 * $animate.enabled(false);
-+                 * $animate.enabled(true);
-+                 *
-+                 * // returns true or false if animations are enabled for an element
-+                 * $animate.enabled(element);
-+                 *
-+                 * // changes the enabled state for an element and its children
-+                 * $animate.enabled(element, true);
-+                 * $animate.enabled(element, false);
-+                 * ```
-+                 *
-+                 * @param {DOMElement=} element the element that will be considered for checking/setting the enabled state
-+                 * @param {boolean=} enabled whether or not the animations will be enabled for the element
-+                 *
-+                 * @return {boolean} whether or not animations are enabled
-+                 */
-+                enabled: $$animateQueue.enabled,
-+
-+                /**
-+                 * @ngdoc method
-+                 * @name $animate#cancel
-+                 * @kind function
-+                 * @description Cancels the provided animation.
-+                 *
-+                 * @param {Promise} animationPromise The animation promise that is returned when an animation is started.
-+                 */
-+                cancel: function(runner) {
-+                    if (runner.end) {
-+                        runner.end();
-                     }
--                    async(done);
-                 },
- 
-                 /**
-                  *
-                  * @ngdoc method
--                 * @name $animate#leave
--                 * @function
--                 * @description Removes the element from the DOM. Once complete, the done() callback will be
--                 *   fired (if provided).
--                 * @param {DOMElement} element the element which will be removed from the DOM
--                 * @param {Function=} done callback function that will be called after the element has been
--                 *   removed from the DOM
-+                 * @name $animate#enter
-+                 * @kind function
-+                 * @description Inserts the element into the DOM either after the `after` element (if provided) or
-+                 *   as the first child within the `parent` element and then triggers an animation.
-+                 *   A promise is returned that will be resolved during the next digest once the animation
-+                 *   has completed.
-+                 *
-+                 * @param {DOMElement} element the element which will be inserted into the DOM
-+                 * @param {DOMElement} parent the parent element which will append the element as
-+                 *   a child (so long as the after element is not present)
-+                 * @param {DOMElement=} after the sibling element after which the element will be appended
-+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
-+                 *   The object can have the following properties:
-+                 *
-+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
-+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
-+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
-+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
-+                 *
-+                 * @return {Promise} the animation callback promise
-                  */
--                leave : function(element, done) {
--                    element.remove();
--                    async(done);
-+                enter: function(element, parent, after, options) {
-+                    parent = parent && jqLite(parent);
-+                    after = after && jqLite(after);
-+                    parent = parent || after.parent();
-+                    domInsert(element, parent, after);
-+                    return $$animateQueue.push(element, 'enter', prepareAnimateOptions(options));
-                 },
- 
-                 /**
-                  *
-                  * @ngdoc method
-                  * @name $animate#move
--                 * @function
--                 * @description Moves the position of the provided element within the DOM to be placed
--                 * either after the `after` element or inside of the `parent` element. Once complete, the
--                 * done() callback will be fired (if provided).
-+                 * @kind function
-+                 * @description Inserts (moves) the element into its new position in the DOM either after
-+                 *   the `after` element (if provided) or as the first child within the `parent` element
-+                 *   and then triggers an animation. A promise is returned that will be resolved
-+                 *   during the next digest once the animation has completed.
-+                 *
-+                 * @param {DOMElement} element the element which will be moved into the new DOM position
-+                 * @param {DOMElement} parent the parent element which will append the element as
-+                 *   a child (so long as the after element is not present)
-+                 * @param {DOMElement=} after the sibling element after which the element will be appended
-+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
-+                 *   The object can have the following properties:
-+                 *
-+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
-+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
-+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
-+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
-                  *
--                 * @param {DOMElement} element the element which will be moved around within the
--                 *   DOM
--                 * @param {DOMElement} parent the parent element where the element will be
--                 *   inserted into (if the after element is not present)
--                 * @param {DOMElement} after the sibling element where the element will be
--                 *   positioned next to
--                 * @param {Function=} done the callback function (if provided) that will be fired after the
--                 *   element has been moved to its new position
-+                 * @return {Promise} the animation callback promise
-                  */
--                move : function(element, parent, after, done) {
--                    // Do not remove element before insert. Removing will cause data associated with the
--                    // element to be dropped. Insert will implicitly do the remove.
--                    this.enter(element, parent, after, done);
-+                move: function(element, parent, after, options) {
-+                    parent = parent && jqLite(parent);
-+                    after = after && jqLite(after);
-+                    parent = parent || after.parent();
-+                    domInsert(element, parent, after);
-+                    return $$animateQueue.push(element, 'move', prepareAnimateOptions(options));
-                 },
- 
-                 /**
--                 *
-                  * @ngdoc method
--                 * @name $animate#addClass
--                 * @function
--                 * @description Adds the provided className CSS class value to the provided element. Once
--                 * complete, the done() callback will be fired (if provided).
--                 * @param {DOMElement} element the element which will have the className value
--                 *   added to it
--                 * @param {string} className the CSS class which will be added to the element
--                 * @param {Function=} done the callback function (if provided) that will be fired after the
--                 *   className value has been added to the element
-+                 * @name $animate#leave
-+                 * @kind function
-+                 * @description Triggers an animation and then removes the element from the DOM.
-+                 * When the function is called a promise is returned that will be resolved during the next
-+                 * digest once the animation has completed.
-+                 *
-+                 * @param {DOMElement} element the element which will be removed from the DOM
-+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
-+                 *   The object can have the following properties:
-+                 *
-+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
-+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
-+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
-+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
-+                 *
-+                 * @return {Promise} the animation callback promise
-                  */
--                addClass : function(element, className, done) {
--                    className = isString(className) ?
--                        className :
--                        isArray(className) ? className.join(' ') : '';
--                    forEach(element, function (element) {
--                        jqLiteAddClass(element, className);
-+                leave: function(element, options) {
-+                    return $$animateQueue.push(element, 'leave', prepareAnimateOptions(options), function() {
-+                        element.remove();
-                     });
--                    async(done);
-                 },
- 
-                 /**
-+                 * @ngdoc method
-+                 * @name $animate#addClass
-+                 * @kind function
-+                 *
-+                 * @description Triggers an addClass animation surrounding the addition of the provided CSS class(es). Upon
-+                 *   execution, the addClass operation will only be handled after the next digest and it will not trigger an
-+                 *   animation if element already contains the CSS class or if the class is removed at a later step.
-+                 *   Note that class-based animations are treated differently compared to structural animations
-+                 *   (like enter, move and leave) since the CSS classes may be added/removed at different points
-+                 *   depending if CSS or JavaScript animations are used.
-+                 *
-+                 * @param {DOMElement} element the element which the CSS classes will be applied to
-+                 * @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces)
-+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
-+                 *   The object can have the following properties:
-+                 *
-+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
-+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
-+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
-+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
-                  *
-+                 * @return {Promise} the animation callback promise
-+                 */
-+                addClass: function(element, className, options) {
-+                    options = prepareAnimateOptions(options);
-+                    options.addClass = mergeClasses(options.addclass, className);
-+                    return $$animateQueue.push(element, 'addClass', options);
-+                },
-+
-+                /**
-                  * @ngdoc method
-                  * @name $animate#removeClass
--                 * @function
--                 * @description Removes the provided className CSS class value from the provided element.
--                 * Once complete, the done() callback will be fired (if provided).
--                 * @param {DOMElement} element the element which will have the className value
--                 *   removed from it
--                 * @param {string} className the CSS class which will be removed from the element
--                 * @param {Function=} done the callback function (if provided) that will be fired after the
--                 *   className value has been removed from the element
-+                 * @kind function
-+                 *
-+                 * @description Triggers a removeClass animation surrounding the removal of the provided CSS class(es). Upon
-+                 *   execution, the removeClass operation will only be handled after the next digest and it will not trigger an
-+                 *   animation if element does not contain the CSS class or if the class is added at a later step.
-+                 *   Note that class-based animations are treated differently compared to structural animations
-+                 *   (like enter, move and leave) since the CSS classes may be added/removed at different points
-+                 *   depending if CSS or JavaScript animations are used.
-+                 *
-+                 * @param {DOMElement} element the element which the CSS classes will be applied to
-+                 * @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces)
-+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
-+                 *   The object can have the following properties:
-+                 *
-+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
-+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
-+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
-+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
-+                 *
-+                 * @return {Promise} the animation callback promise
-                  */
--                removeClass : function(element, className, done) {
--                    className = isString(className) ?
--                        className :
--                        isArray(className) ? className.join(' ') : '';
--                    forEach(element, function (element) {
--                        jqLiteRemoveClass(element, className);
--                    });
--                    async(done);
-+                removeClass: function(element, className, options) {
-+                    options = prepareAnimateOptions(options);
-+                    options.removeClass = mergeClasses(options.removeClass, className);
-+                    return $$animateQueue.push(element, 'removeClass', options);
-                 },
- 
-                 /**
--                 *
-                  * @ngdoc method
-                  * @name $animate#setClass
--                 * @function
--                 * @description Adds and/or removes the given CSS classes to and from the element.
--                 * Once complete, the done() callback will be fired (if provided).
--                 * @param {DOMElement} element the element which will it's CSS classes changed
--                 *   removed from it
--                 * @param {string} add the CSS classes which will be added to the element
--                 * @param {string} remove the CSS class which will be removed from the element
--                 * @param {Function=} done the callback function (if provided) that will be fired after the
--                 *   CSS classes have been set on the element
-+                 * @kind function
-+                 *
-+                 * @description Performs both the addition and removal of a CSS classes on an element and (during the process)
-+                 *    triggers an animation surrounding the class addition/removal. Much like `$animate.addClass` and
-+                 *    `$animate.removeClass`, `setClass` will only evaluate the classes being added/removed once a digest has
-+                 *    passed. Note that class-based animations are treated differently compared to structural animations
-+                 *    (like enter, move and leave) since the CSS classes may be added/removed at different points
-+                 *    depending if CSS or JavaScript animations are used.
-+                 *
-+                 * @param {DOMElement} element the element which the CSS classes will be applied to
-+                 * @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces)
-+                 * @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces)
-+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
-+                 *   The object can have the following properties:
-+                 *
-+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
-+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
-+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
-+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
-+                 *
-+                 * @return {Promise} the animation callback promise
-                  */
--                setClass : function(element, add, remove, done) {
--                    forEach(element, function (element) {
--                        jqLiteAddClass(element, add);
--                        jqLiteRemoveClass(element, remove);
--                    });
--                    async(done);
-+                setClass: function(element, add, remove, options) {
-+                    options = prepareAnimateOptions(options);
-+                    options.addClass = mergeClasses(options.addClass, add);
-+                    options.removeClass = mergeClasses(options.removeClass, remove);
-+                    return $$animateQueue.push(element, 'setClass', options);
-                 },
- 
--                enabled : noop
-+                /**
-+                 * @ngdoc method
-+                 * @name $animate#animate
-+                 * @kind function
-+                 *
-+                 * @description Performs an inline animation on the element which applies the provided to and from CSS styles to the element.
-+                 * If any detected CSS transition, keyframe or JavaScript matches the provided className value, then the animation will take
-+                 * on the provided styles. For example, if a transition animation is set for the given className, then the provided `from` and
-+                 * `to` styles will be applied alongside the given transition. If the CSS style provided in `from` does not have a corresponding
-+                 * style in `to`, the style in `from` is applied immediately, and no animation is run.
-+                 * If a JavaScript animation is detected then the provided styles will be given in as function parameters into the `animate`
-+                 * method (or as part of the `options` parameter):
-+                 *
-+                 * ```js
-+                 * ngModule.animation('.my-inline-animation', function() {
-+                 *   return {
-+                 *     animate : function(element, from, to, done, options) {
-+                 *       //animation
-+                 *       done();
-+                 *     }
-+                 *   }
-+                 * });
-+                 * ```
-+                 *
-+                 * @param {DOMElement} element the element which the CSS styles will be applied to
-+                 * @param {object} from the from (starting) CSS styles that will be applied to the element and across the animation.
-+                 * @param {object} to the to (destination) CSS styles that will be applied to the element and across the animation.
-+                 * @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If
-+                 *    this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element.
-+                 *    (Note that if no animation is detected then this value will not be applied to the element.)
-+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
-+                 *   The object can have the following properties:
-+                 *
-+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
-+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
-+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
-+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
-+                 *
-+                 * @return {Promise} the animation callback promise
-+                 */
-+                animate: function(element, from, to, className, options) {
-+                    options = prepareAnimateOptions(options);
-+                    options.from = options.from ? extend(options.from, from) : from;
-+                    options.to   = options.to   ? extend(options.to, to)     : to;
-+
-+                    className = className || 'ng-inline-animate';
-+                    options.tempClasses = mergeClasses(options.tempClasses, className);
-+                    return $$animateQueue.push(element, 'animate', options);
-+                }
-             };
-         }];
-     }];
- 
--    function $$AsyncCallbackProvider(){
--        this.$get = ['$$rAF', '$timeout', function($$rAF, $timeout) {
--            return $$rAF.supported
--                ? function(fn) { return $$rAF(fn); }
--                : function(fn) {
--                return $timeout(fn, 0, false);
-+    var $$AnimateAsyncRunFactoryProvider = /** @this */ function() {
-+        this.$get = ['$$rAF', function($$rAF) {
-+            var waitQueue = [];
-+
-+            function waitForTick(fn) {
-+                waitQueue.push(fn);
-+                if (waitQueue.length > 1) return;
-+                $$rAF(function() {
-+                    for (var i = 0; i < waitQueue.length; i++) {
-+                        waitQueue[i]();
-+                    }
-+                    waitQueue = [];
-+                });
-+            }
-+
-+            return function() {
-+                var passed = false;
-+                waitForTick(function() {
-+                    passed = true;
-+                });
-+                return function(callback) {
-+                    if (passed) {
-+                        callback();
-+                    } else {
-+                        waitForTick(callback);
-+                    }
-+                };
-             };
-         }];
--    }
-+    };
- 
--    /**
--     * ! This is a private undocumented service !
--     *
--     * @name $browser
--     * @requires $log
--     * @description
--     * This object has two goals:
--     *
--     * - hide all the global state in the browser caused by the window object
--     * - abstract away all the browser specific features and inconsistencies
--     *
--     * For tests we provide {@link ngMock.$browser mock implementation} of the `$browser`
--     * service, which can be used for convenient testing of the application without the interaction with
--     * the real browser apis.
--     */
--    /**
--     * @param {object} window The global window object.
--     * @param {object} document jQuery wrapped document.
--     * @param {function()} XHR XMLHttpRequest constructor.
--     * @param {object} $log console.log or an object with the same interface.
--     * @param {object} $sniffer $sniffer service
-+    var $$AnimateRunnerFactoryProvider = /** @this */ function() {
-+        this.$get = ['$q', '$sniffer', '$$animateAsyncRun', '$$isDocumentHidden', '$timeout',
-+            function($q,   $sniffer,   $$animateAsyncRun,   $$isDocumentHidden,   $timeout) {
-+
-+                var INITIAL_STATE = 0;
-+                var DONE_PENDING_STATE = 1;
-+                var DONE_COMPLETE_STATE = 2;
-+
-+                AnimateRunner.chain = function(chain, callback) {
-+                    var index = 0;
-+
-+                    next();
-+                    function next() {
-+                        if (index === chain.length) {
-+                            callback(true);
-+                            return;
-+                        }
-+
-+                        chain[index](function(response) {
-+                            if (response === false) {
-+                                callback(false);
-+                                return;
-+                            }
-+                            index++;
-+                            next();
-+                        });
-+                    }
-+                };
-+
-+                AnimateRunner.all = function(runners, callback) {
-+                    var count = 0;
-+                    var status = true;
-+                    forEach(runners, function(runner) {
-+                        runner.done(onProgress);
-+                    });
-+
-+                    function onProgress(response) {
-+                        status = status && response;
-+                        if (++count === runners.length) {
-+                            callback(status);
-+                        }
-+                    }
-+                };
-+
-+                function AnimateRunner(host) {
-+                    this.setHost(host);
-+
-+                    var rafTick = $$animateAsyncRun();
-+                    var timeoutTick = function(fn) {
-+                        $timeout(fn, 0, false);
-+                    };
-+
-+                    this._doneCallbacks = [];
-+                    this._tick = function(fn) {
-+                        if ($$isDocumentHidden()) {
-+                            timeoutTick(fn);
-+                        } else {
-+                            rafTick(fn);
-+                        }
-+                    };
-+                    this._state = 0;
-+                }
-+
-+                AnimateRunner.prototype = {
-+                    setHost: function(host) {
-+                        this.host = host || {};
-+                    },
-+
-+                    done: function(fn) {
-+                        if (this._state === DONE_COMPLETE_STATE) {
-+                            fn();
-+                        } else {
-+                            this._doneCallbacks.push(fn);
-+                        }
-+                    },
-+
-+                    progress: noop,
-+
-+                    getPromise: function() {
-+                        if (!this.promise) {
-+                            var self = this;
-+                            this.promise = $q(function(resolve, reject) {
-+                                self.done(function(status) {
-+                                    if (status === false) {
-+                                        reject();
-+                                    } else {
-+                                        resolve();
-+                                    }
-+                                });
-+                            });
-+                        }
-+                        return this.promise;
-+                    },
-+
-+                    then: function(resolveHandler, rejectHandler) {
-+                        return this.getPromise().then(resolveHandler, rejectHandler);
-+                    },
-+
-+                    'catch': function(handler) {
-+                        return this.getPromise()['catch'](handler);
-+                    },
-+
-+                    'finally': function(handler) {
-+                        return this.getPromise()['finally'](handler);
-+                    },
-+
-+                    pause: function() {
-+                        if (this.host.pause) {
-+                            this.host.pause();
-+                        }
-+                    },
-+
-+                    resume: function() {
-+                        if (this.host.resume) {
-+                            this.host.resume();
-+                        }
-+                    },
-+
-+                    end: function() {
-+                        if (this.host.end) {
-+                            this.host.end();
-+                        }
-+                        this._resolve(true);
-+                    },
-+
-+                    cancel: function() {
-+                        if (this.host.cancel) {
-+                            this.host.cancel();
-+                        }
-+                        this._resolve(false);
-+                    },
-+
-+                    complete: function(response) {
-+                        var self = this;
-+                        if (self._state === INITIAL_STATE) {
-+                            self._state = DONE_PENDING_STATE;
-+                            self._tick(function() {
-+                                self._resolve(response);
-+                            });
-+                        }
-+                    },
-+
-+                    _resolve: function(response) {
-+                        if (this._state !== DONE_COMPLETE_STATE) {
-+                            forEach(this._doneCallbacks, function(fn) {
-+                                fn(response);
-+                            });
-+                            this._doneCallbacks.length = 0;
-+                            this._state = DONE_COMPLETE_STATE;
-+                        }
-+                    }
-+                };
-+
-+                return AnimateRunner;
-+            }];
-+    };
-+
-+    /* exported $CoreAnimateCssProvider */
-+
-+    /**
-+     * @ngdoc service
-+     * @name $animateCss
-+     * @kind object
-+     * @this
-+     *
-+     * @description
-+     * This is the core version of `$animateCss`. By default, only when the `ngAnimate` is included,
-+     * then the `$animateCss` service will actually perform animations.
-+     *
-+     * Click here {@link ngAnimate.$animateCss to read the documentation for $animateCss}.
-+     */
-+    var $CoreAnimateCssProvider = function() {
-+        this.$get = ['$$rAF', '$q', '$$AnimateRunner', function($$rAF, $q, $$AnimateRunner) {
-+
-+            return function(element, initialOptions) {
-+                // all of the animation functions should create
-+                // a copy of the options data, however, if a
-+                // parent service has already created a copy then
-+                // we should stick to using that
-+                var options = initialOptions || {};
-+                if (!options.$$prepared) {
-+                    options = copy(options);
-+                }
-+
-+                // there is no point in applying the styles since
-+                // there is no animation that goes on at all in
-+                // this version of $animateCss.
-+                if (options.cleanupStyles) {
-+                    options.from = options.to = null;
-+                }
-+
-+                if (options.from) {
-+                    element.css(options.from);
-+                    options.from = null;
-+                }
-+
-+                var closed, runner = new $$AnimateRunner();
-+                return {
-+                    start: run,
-+                    end: run
-+                };
-+
-+                function run() {
-+                    $$rAF(function() {
-+                        applyAnimationContents();
-+                        if (!closed) {
-+                            runner.complete();
-+                        }
-+                        closed = true;
-+                    });
-+                    return runner;
-+                }
-+
-+                function applyAnimationContents() {
-+                    if (options.addClass) {
-+                        element.addClass(options.addClass);
-+                        options.addClass = null;
-+                    }
-+                    if (options.removeClass) {
-+                        element.removeClass(options.removeClass);
-+                        options.removeClass = null;
-+                    }
-+                    if (options.to) {
-+                        element.css(options.to);
-+                        options.to = null;
-+                    }
-+                }
-+            };
-+        }];
-+    };
-+
-+    /* global stripHash: true */
-+
-+    /**
-+     * ! This is a private undocumented service !
-+     *
-+     * @name $browser
-+     * @requires $log
-+     * @description
-+     * This object has two goals:
-+     *
-+     * - hide all the global state in the browser caused by the window object
-+     * - abstract away all the browser specific features and inconsistencies
-+     *
-+     * For tests we provide {@link ngMock.$browser mock implementation} of the `$browser`
-+     * service, which can be used for convenient testing of the application without the interaction with
-+     * the real browser apis.
-+     */
-+    /**
-+     * @param {object} window The global window object.
-+     * @param {object} document jQuery wrapped document.
-+     * @param {object} $log window.console or an object with the same interface.
-+     * @param {object} $sniffer $sniffer service
-      */
-     function Browser(window, document, $log, $sniffer) {
-         var self = this,
--            rawDocument = document[0],
-             location = window.location,
-             history = window.history,
-             setTimeout = window.setTimeout,
-@@ -4301,7 +6429,7 @@
-             } finally {
-                 outstandingRequestCount--;
-                 if (outstandingRequestCount === 0) {
--                    while(outstandingRequestCallbacks.length) {
-+                    while (outstandingRequestCallbacks.length) {
-                         try {
-                             outstandingRequestCallbacks.pop()();
-                         } catch (e) {
-@@ -4312,18 +6440,17 @@
-             }
-         }
- 
-+        function getHash(url) {
-+            var index = url.indexOf('#');
-+            return index === -1 ? '' : url.substr(index);
-+        }
-+
-         /**
-          * @private
--         * Note: this method is used only by scenario runner
-          * TODO(vojta): prefix this method with $$ ?
-          * @param {function()} callback Function that will be called when no outstanding request
-          */
-         self.notifyWhenNoOutstandingRequests = function(callback) {
--            // force browser to execute all pollFns - this is needed so that cookies and other pollers fire
--            // at some deterministic time in respect to the test runner's actions. Leaving things up to the
--            // regular poller would result in flaky tests.
--            forEach(pollFns, function(pollFn){ pollFn(); });
--
-             if (outstandingRequestCount === 0) {
-                 callback();
-             } else {
-@@ -4331,51 +6458,23 @@
-             }
-         };
- 
--        //////////////////////////////////////////////////////////////
--        // Poll Watcher API
--        //////////////////////////////////////////////////////////////
--        var pollFns = [],
--            pollTimeout;
--
--        /**
--         * @name $browser#addPollFn
--         *
--         * @param {function()} fn Poll function to add
--         *
--         * @description
--         * Adds a function to the list of functions that poller periodically executes,
--         * and starts polling if not started yet.
--         *
--         * @returns {function()} the added function
--         */
--        self.addPollFn = function(fn) {
--            if (isUndefined(pollTimeout)) startPoller(100, setTimeout);
--            pollFns.push(fn);
--            return fn;
--        };
--
--        /**
--         * @param {number} interval How often should browser call poll functions (ms)
--         * @param {function()} setTimeout Reference to a real or fake `setTimeout` function.
--         *
--         * @description
--         * Configures the poller to run in the specified intervals, using the specified
--         * setTimeout fn and kicks it off.
--         */
--        function startPoller(interval, setTimeout) {
--            (function check() {
--                forEach(pollFns, function(pollFn){ pollFn(); });
--                pollTimeout = setTimeout(check, interval);
--            })();
--        }
--
-         //////////////////////////////////////////////////////////////
-         // URL API
-         //////////////////////////////////////////////////////////////
- 
--        var lastBrowserUrl = location.href,
-+        var cachedState, lastHistoryState,
-+            lastBrowserUrl = location.href,
-             baseElement = document.find('base'),
--            newLocation = null;
-+            pendingLocation = null,
-+            getCurrentState = !$sniffer.history ? noop : function getCurrentState() {
-+                try {
-+                    return history.state;
-+                } catch (e) {
-+                    // MSIE can reportedly throw when there is no state (UNCONFIRMED).
-+                }
-+            };
-+
-+        cacheState();
- 
-         /**
-          * @name $browser#url
-@@ -4394,52 +6493,120 @@
-          * {@link ng.$location $location service} to change url.
-          *
-          * @param {string} url New url (when used as setter)
--         * @param {boolean=} replace Should new url replace current history record ?
-+         * @param {boolean=} replace Should new url replace current history record?
-+         * @param {object=} state object to use with pushState/replaceState
-          */
--        self.url = function(url, replace) {
-+        self.url = function(url, replace, state) {
-+            // In modern browsers `history.state` is `null` by default; treating it separately
-+            // from `undefined` would cause `$browser.url('/foo')` to change `history.state`
-+            // to undefined via `pushState`. Instead, let's change `undefined` to `null` here.
-+            if (isUndefined(state)) {
-+                state = null;
-+            }
-+
-             // Android Browser BFCache causes location, history reference to become stale.
-             if (location !== window.location) location = window.location;
-             if (history !== window.history) history = window.history;
- 
-             // setter
-             if (url) {
--                if (lastBrowserUrl == url) return;
-+                var sameState = lastHistoryState === state;
-+
-+                // Don't change anything if previous and current URLs and states match. This also prevents
-+                // IE<10 from getting into redirect loop when in LocationHashbangInHtml5Url mode.
-+                // See https://github.com/angular/angular.js/commit/ffb2701
-+                if (lastBrowserUrl === url && (!$sniffer.history || sameState)) {
-+                    return self;
-+                }
-+                var sameBase = lastBrowserUrl && stripHash(lastBrowserUrl) === stripHash(url);
-                 lastBrowserUrl = url;
--                if ($sniffer.history) {
--                    if (replace) history.replaceState(null, '', url);
--                    else {
--                        history.pushState(null, '', url);
--                        // Crazy Opera Bug: http://my.opera.com/community/forums/topic.dml?id=1185462
--                        baseElement.attr('href', baseElement.attr('href'));
--                    }
-+                lastHistoryState = state;
-+                // Don't use history API if only the hash changed
-+                // due to a bug in IE10/IE11 which leads
-+                // to not firing a `hashchange` nor `popstate` event
-+                // in some cases (see #9143).
-+                if ($sniffer.history && (!sameBase || !sameState)) {
-+                    history[replace ? 'replaceState' : 'pushState'](state, '', url);
-+                    cacheState();
-                 } else {
--                    newLocation = url;
-+                    if (!sameBase) {
-+                        pendingLocation = url;
-+                    }
-                     if (replace) {
-                         location.replace(url);
--                    } else {
-+                    } else if (!sameBase) {
-                         location.href = url;
-+                    } else {
-+                        location.hash = getHash(url);
-                     }
-+                    if (location.href !== url) {
-+                        pendingLocation = url;
-+                    }
-+                }
-+                if (pendingLocation) {
-+                    pendingLocation = url;
-                 }
-                 return self;
-                 // getter
-             } else {
--                // - newLocation is a workaround for an IE7-9 issue with location.replace and location.href
--                //   methods not updating location.href synchronously.
-+                // - pendingLocation is needed as browsers don't allow to read out
-+                //   the new location.href if a reload happened or if there is a bug like in iOS 9 (see
-+                //   https://openradar.appspot.com/22186109).
-                 // - the replacement is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=407172
--                return newLocation || location.href.replace(/%27/g,"'");
-+                return pendingLocation || location.href.replace(/%27/g,'\'');
-             }
-         };
- 
-+        /**
-+         * @name $browser#state
-+         *
-+         * @description
-+         * This method is a getter.
-+         *
-+         * Return history.state or null if history.state is undefined.
-+         *
-+         * @returns {object} state
-+         */
-+        self.state = function() {
-+            return cachedState;
-+        };
-+
-         var urlChangeListeners = [],
-             urlChangeInit = false;
- 
--        function fireUrlChange() {
--            newLocation = null;
--            if (lastBrowserUrl == self.url()) return;
-+        function cacheStateAndFireUrlChange() {
-+            pendingLocation = null;
-+            fireStateOrUrlChange();
-+        }
-+
-+        // This variable should be used *only* inside the cacheState function.
-+        var lastCachedState = null;
-+        function cacheState() {
-+            // This should be the only place in $browser where `history.state` is read.
-+            cachedState = getCurrentState();
-+            cachedState = isUndefined(cachedState) ? null : cachedState;
-+
-+            // Prevent callbacks fo fire twice if both hashchange & popstate were fired.
-+            if (equals(cachedState, lastCachedState)) {
-+                cachedState = lastCachedState;
-+            }
-+
-+            lastCachedState = cachedState;
-+            lastHistoryState = cachedState;
-+        }
-+
-+        function fireStateOrUrlChange() {
-+            var prevLastHistoryState = lastHistoryState;
-+            cacheState();
-+
-+            if (lastBrowserUrl === self.url() && prevLastHistoryState === cachedState) {
-+                return;
-+            }
- 
-             lastBrowserUrl = self.url();
-+            lastHistoryState = cachedState;
-             forEach(urlChangeListeners, function(listener) {
--                listener(self.url());
-+                listener(self.url(), cachedState);
-             });
-         }
- 
-@@ -4449,7 +6616,7 @@
-          * @description
-          * Register callback function that will be called, when url changes.
-          *
--         * It's only called when the url is changed from outside of angular:
-+         * It's only called when the url is changed from outside of AngularJS:
-          * - user types different url into address bar
-          * - user clicks on history (forward/back) button
-          * - user clicks on a link
-@@ -4459,7 +6626,7 @@
-          * The listener gets called with new url as parameter.
-          *
-          * NOTE: this api is intended for use only by the $location service. Please use the
--         * {@link ng.$location $location service} to monitor url changes in angular apps.
-+         * {@link ng.$location $location service} to monitor url changes in AngularJS apps.
-          *
-          * @param {function(string)} listener Listener function to be called when url changes.
-          * @return {function(string)} Returns the registered listener fn - handy if the fn is anonymous.
-@@ -4467,16 +6634,14 @@
-         self.onUrlChange = function(callback) {
-             // TODO(vojta): refactor to use node's syntax for events
-             if (!urlChangeInit) {
--                // We listen on both (hashchange/popstate) when available, as some browsers (e.g. Opera)
--                // don't fire popstate when user change the address bar and don't fire hashchange when url
-+                // We listen on both (hashchange/popstate) when available, as some browsers don't
-+                // fire popstate when user changes the address bar and don't fire hashchange when url
-                 // changed by push/replaceState
- 
-                 // html5 history api - popstate event
--                if ($sniffer.history) jqLite(window).on('popstate', fireUrlChange);
-+                if ($sniffer.history) jqLite(window).on('popstate', cacheStateAndFireUrlChange);
-                 // hashchange event
--                if ($sniffer.hashchange) jqLite(window).on('hashchange', fireUrlChange);
--                // polling
--                else self.addPollFn(fireUrlChange);
-+                jqLite(window).on('hashchange', cacheStateAndFireUrlChange);
- 
-                 urlChangeInit = true;
-             }
-@@ -4485,6 +6650,23 @@
-             return callback;
-         };
- 
-+        /**
-+         * @private
-+         * Remove popstate and hashchange handler from window.
-+         *
-+         * NOTE: this api is intended for use only by $rootScope.
-+         */
-+        self.$$applicationDestroyed = function() {
-+            jqLite(window).off('hashchange popstate', cacheStateAndFireUrlChange);
-+        };
-+
-+        /**
-+         * Checks whether the url has changed outside of AngularJS.
-+         * Needs to be exported to be able to check for changes that have been done in sync,
-+         * as hashchange/popstate events fire in async.
-+         */
-+        self.$$checkUrlChange = fireStateOrUrlChange;
-+
-         //////////////////////////////////////////////////////////////
-         // Misc API
-         //////////////////////////////////////////////////////////////
-@@ -4500,85 +6682,9 @@
-          */
-         self.baseHref = function() {
-             var href = baseElement.attr('href');
--            return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : '';
--        };
--
--        //////////////////////////////////////////////////////////////
--        // Cookies API
--        //////////////////////////////////////////////////////////////
--        var lastCookies = {};
--        var lastCookieString = '';
--        var cookiePath = self.baseHref();
--
--        /**
--         * @name $browser#cookies
--         *
--         * @param {string=} name Cookie name
--         * @param {string=} value Cookie value
--         *
--         * @description
--         * The cookies method provides a 'private' low level access to browser cookies.
--         * It is not meant to be used directly, use the $cookie service instead.
--         *
--         * The return values vary depending on the arguments that the method was called with as follows:
--         *
--         * - cookies() -> hash of all cookies, this is NOT a copy of the internal state, so do not modify
--         *   it
--         * - cookies(name, value) -> set name to value, if value is undefined delete the cookie
--         * - cookies(name) -> the same as (name, undefined) == DELETES (no one calls it right now that
--         *   way)
--         *
--         * @returns {Object} Hash of all cookies (if called without any parameter)
--         */
--        self.cookies = function(name, value) {
--            /* global escape: false, unescape: false */
--            var cookieLength, cookieArray, cookie, i, index;
--
--            if (name) {
--                if (value === undefined) {
--                    rawDocument.cookie = escape(name) + "=;path=" + cookiePath +
--                    ";expires=Thu, 01 Jan 1970 00:00:00 GMT";
--                } else {
--                    if (isString(value)) {
--                        cookieLength = (rawDocument.cookie = escape(name) + '=' + escape(value) +
--                        ';path=' + cookiePath).length + 1;
--
--                        // per http://www.ietf.org/rfc/rfc2109.txt browser must allow at minimum:
--                        // - 300 cookies
--                        // - 20 cookies per unique domain
--                        // - 4096 bytes per cookie
--                        if (cookieLength > 4096) {
--                            $log.warn("Cookie '"+ name +
--                            "' possibly not set or overflowed because it was too large ("+
--                            cookieLength + " > 4096 bytes)!");
--                        }
--                    }
--                }
--            } else {
--                if (rawDocument.cookie !== lastCookieString) {
--                    lastCookieString = rawDocument.cookie;
--                    cookieArray = lastCookieString.split("; ");
--                    lastCookies = {};
--
--                    for (i = 0; i < cookieArray.length; i++) {
--                        cookie = cookieArray[i];
--                        index = cookie.indexOf('=');
--                        if (index > 0) { //ignore nameless cookies
--                            name = unescape(cookie.substring(0, index));
--                            // the first value that is seen for a cookie is the most
--                            // specific one.  values for the same cookie name that
--                            // follow are for less specific paths.
--                            if (lastCookies[name] === undefined) {
--                                lastCookies[name] = unescape(cookie.substring(index + 1));
--                            }
--                        }
--                    }
--                }
--                return lastCookies;
--            }
-+            return href ? href.replace(/^(https?:)?\/\/[^/]*/, '') : '';
-         };
- 
--
-         /**
-          * @name $browser#defer
-          * @param {function()} fn A function, who's execution should be deferred.
-@@ -4627,9 +6733,10 @@
- 
-     }
- 
--    function $BrowserProvider(){
-+    /** @this */
-+    function $BrowserProvider() {
-         this.$get = ['$window', '$log', '$sniffer', '$document',
--            function( $window,   $log,   $sniffer,   $document){
-+            function($window, $log, $sniffer, $document) {
-                 return new Browser($window, $document, $log, $sniffer);
-             }];
-     }
-@@ -4637,6 +6744,7 @@
-     /**
-      * @ngdoc service
-      * @name $cacheFactory
-+     * @this
-      *
-      * @description
-      * Factory that constructs {@link $cacheFactory.Cache Cache} objects and gives access to
-@@ -4673,7 +6781,7 @@
-      * - `{void}` `destroy()` — Removes references to this cache from $cacheFactory.
-      *
-      * @example
--     <example module="cacheExampleApp">
-+     <example module="cacheExampleApp" name="cache-factory">
-      <file name="index.html">
-      <div ng-controller="CacheController">
-      <input ng-model="newCacheKey" placeholder="Key">
-@@ -4701,8 +6809,10 @@
-            $scope.keys = [];
-            $scope.cache = $cacheFactory('cacheId');
-            $scope.put = function(key, value) {
--             $scope.cache.put(key, value);
--             $scope.keys.push(key);
-+             if (angular.isUndefined($scope.cache.get(key))) {
-+               $scope.keys.push(key);
-+             }
-+             $scope.cache.put(key, angular.isUndefined(value) ? null : value);
-            };
-          }]);
-      </file>
-@@ -4720,14 +6830,14 @@
- 
-             function cacheFactory(cacheId, options) {
-                 if (cacheId in caches) {
--                    throw minErr('$cacheFactory')('iid', "CacheId '{0}' is already taken!", cacheId);
-+                    throw minErr('$cacheFactory')('iid', 'CacheId \'{0}\' is already taken!', cacheId);
-                 }
- 
-                 var size = 0,
-                     stats = extend({}, options, {id: cacheId}),
--                    data = {},
-+                    data = createMap(),
-                     capacity = (options && options.capacity) || Number.MAX_VALUE,
--                    lruHash = {},
-+                    lruHash = createMap(),
-                     freshEnd = null,
-                     staleEnd = null;
- 
-@@ -4737,45 +6847,45 @@
-                  *
-                  * @description
-                  * A cache object used to store and retrieve data, primarily used by
--                 * {@link $http $http} and the {@link ng.directive:script script} directive to cache
--                 * templates and other data.
-+                 * {@link $templateRequest $templateRequest} and the {@link ng.directive:script script}
-+                 * directive to cache templates and other data.
-                  *
-                  * ```js
-                  *  angular.module('superCache')
-                  *    .factory('superCache', ['$cacheFactory', function($cacheFactory) {
--       *      return $cacheFactory('super-cache');
--       *    }]);
-+                 *      return $cacheFactory('super-cache');
-+                 *    }]);
-                  * ```
-                  *
-                  * Example test:
-                  *
-                  * ```js
-                  *  it('should behave like a cache', inject(function(superCache) {
--       *    superCache.put('key', 'value');
--       *    superCache.put('another key', 'another value');
--       *
--       *    expect(superCache.info()).toEqual({
--       *      id: 'super-cache',
--       *      size: 2
--       *    });
--       *
--       *    superCache.remove('another key');
--       *    expect(superCache.get('another key')).toBeUndefined();
--       *
--       *    superCache.removeAll();
--       *    expect(superCache.info()).toEqual({
--       *      id: 'super-cache',
--       *      size: 0
--       *    });
--       *  }));
-+                 *    superCache.put('key', 'value');
-+                 *    superCache.put('another key', 'another value');
-+                 *
-+                 *    expect(superCache.info()).toEqual({
-+                 *      id: 'super-cache',
-+                 *      size: 2
-+                 *    });
-+                 *
-+                 *    superCache.remove('another key');
-+                 *    expect(superCache.get('another key')).toBeUndefined();
-+                 *
-+                 *    superCache.removeAll();
-+                 *    expect(superCache.info()).toEqual({
-+                 *      id: 'super-cache',
-+                 *      size: 0
-+                 *    });
-+                 *  }));
-                  * ```
-                  */
--                return caches[cacheId] = {
-+                return (caches[cacheId] = {
- 
-                     /**
-                      * @ngdoc method
-                      * @name $cacheFactory.Cache#put
--                     * @function
-+                     * @kind function
-                      *
-                      * @description
-                      * Inserts a named entry into the {@link $cacheFactory.Cache Cache} object to be
-@@ -4791,13 +6901,13 @@
-                      * @returns {*} the value stored.
-                      */
-                     put: function(key, value) {
-+                        if (isUndefined(value)) return;
-                         if (capacity < Number.MAX_VALUE) {
-                             var lruEntry = lruHash[key] || (lruHash[key] = {key: key});
- 
-                             refresh(lruEntry);
-                         }
- 
--                        if (isUndefined(value)) return;
-                         if (!(key in data)) size++;
-                         data[key] = value;
- 
-@@ -4811,7 +6921,7 @@
-                     /**
-                      * @ngdoc method
-                      * @name $cacheFactory.Cache#get
--                     * @function
-+                     * @kind function
-                      *
-                      * @description
-                      * Retrieves named data stored in the {@link $cacheFactory.Cache Cache} object.
-@@ -4835,7 +6945,7 @@
-                     /**
-                      * @ngdoc method
-                      * @name $cacheFactory.Cache#remove
--                     * @function
-+                     * @kind function
-                      *
-                      * @description
-                      * Removes an entry from the {@link $cacheFactory.Cache Cache} object.
-@@ -4848,13 +6958,15 @@
- 
-                             if (!lruEntry) return;
- 
--                            if (lruEntry == freshEnd) freshEnd = lruEntry.p;
--                            if (lruEntry == staleEnd) staleEnd = lruEntry.n;
-+                            if (lruEntry === freshEnd) freshEnd = lruEntry.p;
-+                            if (lruEntry === staleEnd) staleEnd = lruEntry.n;
-                             link(lruEntry.n,lruEntry.p);
- 
-                             delete lruHash[key];
-                         }
- 
-+                        if (!(key in data)) return;
-+
-                         delete data[key];
-                         size--;
-                     },
-@@ -4863,15 +6975,15 @@
-                     /**
-                      * @ngdoc method
-                      * @name $cacheFactory.Cache#removeAll
--                     * @function
-+                     * @kind function
-                      *
-                      * @description
-                      * Clears the cache object of any entries.
-                      */
-                     removeAll: function() {
--                        data = {};
-+                        data = createMap();
-                         size = 0;
--                        lruHash = {};
-+                        lruHash = createMap();
-                         freshEnd = staleEnd = null;
-                     },
- 
-@@ -4879,7 +6991,7 @@
-                     /**
-                      * @ngdoc method
-                      * @name $cacheFactory.Cache#destroy
--                     * @function
-+                     * @kind function
-                      *
-                      * @description
-                      * Destroys the {@link $cacheFactory.Cache Cache} object entirely,
-@@ -4896,7 +7008,7 @@
-                     /**
-                      * @ngdoc method
-                      * @name $cacheFactory.Cache#info
--                     * @function
-+                     * @kind function
-                      *
-                      * @description
-                      * Retrieve information regarding a particular {@link $cacheFactory.Cache Cache}.
-@@ -4912,17 +7024,17 @@
-                     info: function() {
-                         return extend({}, stats, {size: size});
-                     }
--                };
-+                });
- 
- 
-                 /**
-                  * makes the `entry` the freshEnd of the LRU linked list
-                  */
-                 function refresh(entry) {
--                    if (entry != freshEnd) {
-+                    if (entry !== freshEnd) {
-                         if (!staleEnd) {
-                             staleEnd = entry;
--                        } else if (staleEnd == entry) {
-+                        } else if (staleEnd === entry) {
-                             staleEnd = entry.n;
-                         }
- 
-@@ -4938,7 +7050,7 @@
-                  * bidirectionally links two entries of the LRU linked list
-                  */
-                 function link(nextEntry, prevEntry) {
--                    if (nextEntry != prevEntry) {
-+                    if (nextEntry !== prevEntry) {
-                         if (nextEntry) nextEntry.p = prevEntry; //p stands for previous, 'prev' didn't minify
-                         if (prevEntry) prevEntry.n = nextEntry; //n stands for next, 'next' didn't minify
-                     }
-@@ -4951,7 +7063,7 @@
-              * @name $cacheFactory#info
-              *
-              * @description
--             * Get information about all the of the caches that have been created
-+             * Get information about all the caches that have been created
-              *
-              * @returns {Object} - key-value map of `cacheId` to the result of calling `cache#info`
-              */
-@@ -4986,11 +7098,15 @@
-     /**
-      * @ngdoc service
-      * @name $templateCache
-+     * @this
-      *
-      * @description
-+     * `$templateCache` is a {@link $cacheFactory.Cache Cache object} created by the
-+     * {@link ng.$cacheFactory $cacheFactory}.
-+     *
-      * The first time a template is used, it is loaded in the template cache for quick retrieval. You
--     * can load templates directly into the cache in a `script` tag, or by consuming the
--     * `$templateCache` service directly.
-+     * can load templates directly into the cache in a `script` tag, by using {@link $templateRequest},
-+     * or by consuming the `$templateCache` service directly.
-      *
-      * Adding via the `script` tag:
-      *
-@@ -5001,29 +7117,30 @@
-      * ```
-      *
-      * **Note:** the `script` tag containing the template does not need to be included in the `head` of
--     * the document, but it must be below the `ng-app` definition.
-+     * the document, but it must be a descendent of the {@link ng.$rootElement $rootElement} (e.g.
-+     * element with {@link ngApp} attribute), otherwise the template will be ignored.
-      *
--     * Adding via the $templateCache service:
-+     * Adding via the `$templateCache` service:
-      *
-      * ```js
-      * var myApp = angular.module('myApp', []);
-      * myApp.run(function($templateCache) {
-- *   $templateCache.put('templateId.html', 'This is the content of the template');
-- * });
-+     *   $templateCache.put('templateId.html', 'This is the content of the template');
-+     * });
-      * ```
-      *
--     * To retrieve the template later, simply use it in your HTML:
--     * ```html
--     * <div ng-include=" 'templateId.html' "></div>
-+     * To retrieve the template later, simply use it in your component:
-+     * ```js
-+     * myApp.component('myComponent', {
-+     *    templateUrl: 'templateId.html'
-+     * });
-      * ```
-      *
--     * or get it via Javascript:
-+     * or get it via the `$templateCache` service:
-      * ```js
-      * $templateCache.get('templateId.html')
-      * ```
-      *
--     * See {@link ng.$cacheFactory $cacheFactory}.
--     *
-      */
-     function $TemplateCacheProvider() {
-         this.$get = ['$cacheFactory', function($cacheFactory) {
-@@ -5031,28 +7148,39 @@
-         }];
-     }
- 
-+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-+ *     Any commits to this file should be reviewed with security in mind.  *
-+ *   Changes to this file can potentially create security vulnerabilities. *
-+ *          An approval from 2 Core members with history of modifying      *
-+ *                         this file is required.                          *
-+ *                                                                         *
-+ *  Does the change somehow allow for arbitrary javascript to be executed? *
-+ *    Or allows for someone to change the prototype of built-in objects?   *
-+ *     Or gives undesired access to variables like document or window?    *
-+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-+
-     /* ! VARIABLE/FUNCTION NAMING CONVENTIONS THAT APPLY TO THIS FILE!
--     *
--     * DOM-related variables:
--     *
--     * - "node" - DOM Node
--     * - "element" - DOM Element or Node
--     * - "$node" or "$element" - jqLite-wrapped node or element
--     *
--     *
--     * Compiler related stuff:
--     *
--     * - "linkFn" - linking fn of a single directive
--     * - "nodeLinkFn" - function that aggregates all linking fns for a particular node
--     * - "childLinkFn" -  function that aggregates all linking fns for child nodes of a particular node
--     * - "compositeLinkFn" - function that aggregates all linking fns for a compilation root (nodeList)
--     */
-+ *
-+ * DOM-related variables:
-+ *
-+ * - "node" - DOM Node
-+ * - "element" - DOM Element or Node
-+ * - "$node" or "$element" - jqLite-wrapped node or element
-+ *
-+ *
-+ * Compiler related stuff:
-+ *
-+ * - "linkFn" - linking fn of a single directive
-+ * - "nodeLinkFn" - function that aggregates all linking fns for a particular node
-+ * - "childLinkFn" -  function that aggregates all linking fns for child nodes of a particular node
-+ * - "compositeLinkFn" - function that aggregates all linking fns for a compilation root (nodeList)
-+ */
- 
- 
-     /**
-      * @ngdoc service
-      * @name $compile
--     * @function
-+     * @kind function
-      *
-      * @description
-      * Compiles an HTML string or DOM into a template and produces a template function, which
-@@ -5072,8 +7200,9 @@
-      * There are many different options for a directive.
-      *
-      * The difference resides in the return value of the factory function.
--     * You can either return a "Directive Definition Object" (see below) that defines the directive properties,
--     * or just the `postLink` function (all other properties will have the default values).
-+     * You can either return a {@link $compile#directive-definition-object Directive Definition Object (see below)}
-+     * that defines the directive properties, or just the `postLink` function (all other properties will have
-+     * the default values).
-      *
-      * <div class="alert alert-success">
-      * **Best Practice:** It's recommended to use the "directive definition object" form.
-@@ -5085,36 +7214,38 @@
-      *   var myModule = angular.module(...);
-      *
-      *   myModule.directive('directiveName', function factory(injectables) {
-- *     var directiveDefinitionObject = {
-- *       priority: 0,
-- *       template: '<div></div>', // or // function(tElement, tAttrs) { ... },
-- *       // or
-- *       // templateUrl: 'directive.html', // or // function(tElement, tAttrs) { ... },
-- *       replace: false,
-- *       transclude: false,
-- *       restrict: 'A',
-- *       scope: false,
-- *       controller: function($scope, $element, $attrs, $transclude, otherInjectables) { ... },
-- *       controllerAs: 'stringAlias',
-- *       require: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'],
-- *       compile: function compile(tElement, tAttrs, transclude) {
-- *         return {
-- *           pre: function preLink(scope, iElement, iAttrs, controller) { ... },
-- *           post: function postLink(scope, iElement, iAttrs, controller) { ... }
-- *         }
-- *         // or
-- *         // return function postLink( ... ) { ... }
-- *       },
-- *       // or
-- *       // link: {
-- *       //  pre: function preLink(scope, iElement, iAttrs, controller) { ... },
-- *       //  post: function postLink(scope, iElement, iAttrs, controller) { ... }
-- *       // }
-- *       // or
-- *       // link: function postLink( ... ) { ... }
-- *     };
-- *     return directiveDefinitionObject;
-- *   });
-+     *     var directiveDefinitionObject = {
-+     *       {@link $compile#-priority- priority}: 0,
-+     *       {@link $compile#-template- template}: '<div></div>', // or // function(tElement, tAttrs) { ... },
-+     *       // or
-+     *       // {@link $compile#-templateurl- templateUrl}: 'directive.html', // or // function(tElement, tAttrs) { ... },
-+     *       {@link $compile#-transclude- transclude}: false,
-+     *       {@link $compile#-restrict- restrict}: 'A',
-+     *       {@link $compile#-templatenamespace- templateNamespace}: 'html',
-+     *       {@link $compile#-scope- scope}: false,
-+     *       {@link $compile#-controller- controller}: function($scope, $element, $attrs, $transclude, otherInjectables) { ... },
-+     *       {@link $compile#-controlleras- controllerAs}: 'stringIdentifier',
-+     *       {@link $compile#-bindtocontroller- bindToController}: false,
-+     *       {@link $compile#-require- require}: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'],
-+     *       {@link $compile#-multielement- multiElement}: false,
-+     *       {@link $compile#-compile- compile}: function compile(tElement, tAttrs, transclude) {
-+     *         return {
-+     *            {@link $compile#pre-linking-function pre}: function preLink(scope, iElement, iAttrs, controller) { ... },
-+     *            {@link $compile#post-linking-function post}: function postLink(scope, iElement, iAttrs, controller) { ... }
-+     *         }
-+     *         // or
-+     *         // return function postLink( ... ) { ... }
-+     *       },
-+     *       // or
-+     *       // {@link $compile#-link- link}: {
-+     *       //  {@link $compile#pre-linking-function pre}: function preLink(scope, iElement, iAttrs, controller) { ... },
-+     *       //  {@link $compile#post-linking-function post}: function postLink(scope, iElement, iAttrs, controller) { ... }
-+     *       // }
-+     *       // or
-+     *       // {@link $compile#-link- link}: function postLink( ... ) { ... }
-+     *     };
-+     *     return directiveDefinitionObject;
-+     *   });
-      * ```
-      *
-      * <div class="alert alert-warning">
-@@ -5127,21 +7258,148 @@
-      *   var myModule = angular.module(...);
-      *
-      *   myModule.directive('directiveName', function factory(injectables) {
-- *     var directiveDefinitionObject = {
-- *       link: function postLink(scope, iElement, iAttrs) { ... }
-- *     };
-- *     return directiveDefinitionObject;
-- *     // or
-- *     // return function postLink(scope, iElement, iAttrs) { ... }
-- *   });
-+     *     var directiveDefinitionObject = {
-+     *       link: function postLink(scope, iElement, iAttrs) { ... }
-+     *     };
-+     *     return directiveDefinitionObject;
-+     *     // or
-+     *     // return function postLink(scope, iElement, iAttrs) { ... }
-+     *   });
-      * ```
-      *
-+     * ### Life-cycle hooks
-+     * Directive controllers can provide the following methods that are called by AngularJS at points in the life-cycle of the
-+     * directive:
-+     * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and
-+     *   had their bindings initialized (and before the pre &amp; post linking functions for the directives on
-+     *   this element). This is a good place to put initialization code for your controller.
-+     * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The
-+     *   `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an
-+     *   object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a
-+     *   component such as cloning the bound value to prevent accidental mutation of the outer value. Note that this will
-+     *   also be called when your bindings are initialized.
-+     * * `$doCheck()` - Called on each turn of the digest cycle. Provides an opportunity to detect and act on
-+     *   changes. Any actions that you wish to take in response to the changes that you detect must be
-+     *   invoked from this hook; implementing this has no effect on when `$onChanges` is called. For example, this hook
-+     *   could be useful if you wish to perform a deep equality check, or to check a Date object, changes to which would not
-+     *   be detected by AngularJS's change detector and thus not trigger `$onChanges`. This hook is invoked with no arguments;
-+     *   if detecting changes, you must store the previous value(s) for comparison to the current values.
-+     * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
-+     *   external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in
-+     *   the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent
-+     *   components will have their `$onDestroy()` hook called before child components.
-+     * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link
-+     *   function this hook can be used to set up DOM event handlers and do direct DOM manipulation.
-+     *   Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
-+     *   they are waiting for their template to load asynchronously and their own compilation and linking has been
-+     *   suspended until that occurs.
-+     *
-+     * #### Comparison with life-cycle hooks in the new Angular
-+     * The new Angular also uses life-cycle hooks for its components. While the AngularJS life-cycle hooks are similar there are
-+     * some differences that you should be aware of, especially when it comes to moving your code from AngularJS to Angular:
-+     *
-+     * * AngularJS hooks are prefixed with `$`, such as `$onInit`. Angular hooks are prefixed with `ng`, such as `ngOnInit`.
-+     * * AngularJS hooks can be defined on the controller prototype or added to the controller inside its constructor.
-+     *   In Angular you can only define hooks on the prototype of the Component class.
-+     * * Due to the differences in change-detection, you may get many more calls to `$doCheck` in AngularJS than you would to
-+     *   `ngDoCheck` in Angular.
-+     * * Changes to the model inside `$doCheck` will trigger new turns of the digest loop, which will cause the changes to be
-+     *   propagated throughout the application.
-+     *   Angular does not allow the `ngDoCheck` hook to trigger a change outside of the component. It will either throw an
-+     *   error or do nothing depending upon the state of `enableProdMode()`.
-+     *
-+     * #### Life-cycle hook examples
-+     *
-+     * This example shows how you can check for mutations to a Date object even though the identity of the object
-+     * has not changed.
-+     *
-+     * <example name="doCheckDateExample" module="do-check-module">
-+     *   <file name="app.js">
-+     *     angular.module('do-check-module', [])
-+     *       .component('app', {
-+     *         template:
-+     *           'Month: <input ng-model="$ctrl.month" ng-change="$ctrl.updateDate()">' +
-+     *           'Date: {{ $ctrl.date }}' +
-+     *           '<test date="$ctrl.date"></test>',
-+     *         controller: function() {
-+     *           this.date = new Date();
-+     *           this.month = this.date.getMonth();
-+     *           this.updateDate = function() {
-+     *             this.date.setMonth(this.month);
-+     *           };
-+     *         }
-+     *       })
-+     *       .component('test', {
-+     *         bindings: { date: '<' },
-+     *         template:
-+     *           '<pre>{{ $ctrl.log | json }}</pre>',
-+     *         controller: function() {
-+     *           var previousValue;
-+     *           this.log = [];
-+     *           this.$doCheck = function() {
-+     *             var currentValue = this.date && this.date.valueOf();
-+     *             if (previousValue !== currentValue) {
-+     *               this.log.push('doCheck: date mutated: ' + this.date);
-+     *               previousValue = currentValue;
-+     *             }
-+     *           };
-+     *         }
-+     *       });
-+     *   </file>
-+     *   <file name="index.html">
-+     *     <app></app>
-+     *   </file>
-+     * </example>
-      *
-+     * This example show how you might use `$doCheck` to trigger changes in your component's inputs even if the
-+     * actual identity of the component doesn't change. (Be aware that cloning and deep equality checks on large
-+     * arrays or objects can have a negative impact on your application performance)
-      *
--     * ### Directive Definition Object
--     *
--     * The directive definition object provides instructions to the {@link ng.$compile
-- * compiler}. The attributes are:
-+     * <example name="doCheckArrayExample" module="do-check-module">
-+     *   <file name="index.html">
-+     *     <div ng-init="items = []">
-+     *       <button ng-click="items.push(items.length)">Add Item</button>
-+     *       <button ng-click="items = []">Reset Items</button>
-+     *       <pre>{{ items }}</pre>
-+     *       <test items="items"></test>
-+     *     </div>
-+     *   </file>
-+     *   <file name="app.js">
-+     *      angular.module('do-check-module', [])
-+     *        .component('test', {
-+     *          bindings: { items: '<' },
-+     *          template:
-+     *            '<pre>{{ $ctrl.log | json }}</pre>',
-+     *          controller: function() {
-+     *            this.log = [];
-+     *
-+     *            this.$doCheck = function() {
-+     *              if (this.items_ref !== this.items) {
-+     *                this.log.push('doCheck: items changed');
-+     *                this.items_ref = this.items;
-+     *              }
-+     *              if (!angular.equals(this.items_clone, this.items)) {
-+     *                this.log.push('doCheck: items mutated');
-+     *                this.items_clone = angular.copy(this.items);
-+     *              }
-+     *            };
-+     *          }
-+     *        });
-+     *   </file>
-+     * </example>
-+     *
-+     *
-+     * ### Directive Definition Object
-+     *
-+     * The directive definition object provides instructions to the {@link ng.$compile
-+ * compiler}. The attributes are:
-+     *
-+     * #### `multiElement`
-+     * When this property is set to true (default is `false`), the HTML compiler will collect DOM nodes between
-+     * nodes with the attributes `directive-name-start` and `directive-name-end`, and group them
-+     * together as the directive elements. It is recommended that this feature be used on directives
-+     * which are not strictly behavioral (such as {@link ngClick}), and which
-+     * do not manipulate or replace child nodes (such as {@link ngInclude}).
-      *
-      * #### `priority`
-      * When there are multiple directives defined on a single DOM element, sometimes it
-@@ -5154,136 +7412,269 @@
-      * #### `terminal`
-      * If set to true then the current `priority` will be the last set of directives
-      * which will execute (any directives at the current priority will still execute
--     * as the order of execution on same `priority` is undefined).
-+     * as the order of execution on same `priority` is undefined). Note that expressions
-+     * and other directives used in the directive's template will also be excluded from execution.
-      *
-      * #### `scope`
--     * **If set to `true`,** then a new scope will be created for this directive. If multiple directives on the
--     * same element request a new scope, only one new scope is created. The new scope rule does not
--     * apply for the root of the template since the root of the template always gets a new scope.
-+     * The scope property can be `false`, `true`, or an object:
-      *
--     * **If set to `{}` (object hash),** then a new "isolate" scope is created. The 'isolate' scope differs from
--     * normal scope in that it does not prototypically inherit from the parent scope. This is useful
--     * when creating reusable components, which should not accidentally read or modify data in the
--     * parent scope.
-+     * * **`false` (default):** No scope will be created for the directive. The directive will use its
-+     * parent's scope.
-      *
--     * The 'isolate' scope takes an object hash which defines a set of local scope properties
--     * derived from the parent scope. These local properties are useful for aliasing values for
--     * templates. Locals definition is a hash of local scope property to its source:
-+     * * **`true`:** A new child scope that prototypically inherits from its parent will be created for
-+     * the directive's element. If multiple directives on the same element request a new scope,
-+     * only one new scope is created.
-+     *
-+     * * **`{...}` (an object hash):** A new "isolate" scope is created for the directive's template.
-+     * The 'isolate' scope differs from normal scope in that it does not prototypically
-+     * inherit from its parent scope. This is useful when creating reusable components, which should not
-+     * accidentally read or modify data in the parent scope. Note that an isolate scope
-+     * directive without a `template` or `templateUrl` will not apply the isolate scope
-+     * to its children elements.
-+     *
-+     * The 'isolate' scope object hash defines a set of local scope properties derived from attributes on the
-+     * directive's element. These local properties are useful for aliasing values for templates. The keys in
-+     * the object hash map to the name of the property on the isolate scope; the values define how the property
-+     * is bound to the parent scope, via matching attributes on the directive's element:
-      *
-      * * `@` or `@attr` - bind a local scope property to the value of DOM attribute. The result is
--     *   always a string since DOM attributes are strings. If no `attr` name is specified  then the
--     *   attribute name is assumed to be the same as the local name.
--     *   Given `<widget my-attr="hello {{name}}">` and widget definition
--     *   of `scope: { localName:'@myAttr' }`, then widget scope property `localName` will reflect
--     *   the interpolated value of `hello {{name}}`. As the `name` attribute changes so will the
--     *   `localName` property on the widget scope. The `name` is read from the parent scope (not
--     *   component scope).
--     *
--     * * `=` or `=attr` - set up bi-directional binding between a local scope property and the
--     *   parent scope property of name defined via the value of the `attr` attribute. If no `attr`
--     *   name is specified then the attribute name is assumed to be the same as the local name.
--     *   Given `<widget my-attr="parentModel">` and widget definition of
--     *   `scope: { localModel:'=myAttr' }`, then widget scope property `localModel` will reflect the
-+     *   always a string since DOM attributes are strings. If no `attr` name is specified then the
-+     *   attribute name is assumed to be the same as the local name. Given `<my-component
-+     *   my-attr="hello {{name}}">` and the isolate scope definition `scope: { localName:'@myAttr' }`,
-+     *   the directive's scope property `localName` will reflect the interpolated value of `hello
-+     *   {{name}}`. As the `name` attribute changes so will the `localName` property on the directive's
-+     *   scope. The `name` is read from the parent scope (not the directive's scope).
-+     *
-+     * * `=` or `=attr` - set up a bidirectional binding between a local scope property and an expression
-+     *   passed via the attribute `attr`. The expression is evaluated in the context of the parent scope.
-+     *   If no `attr` name is specified then the attribute name is assumed to be the same as the local
-+     *   name. Given `<my-component my-attr="parentModel">` and the isolate scope definition `scope: {
-+     *   localModel: '=myAttr' }`, the property `localModel` on the directive's scope will reflect the
-+     *   value of `parentModel` on the parent scope. Changes to `parentModel` will be reflected in
-+     *   `localModel` and vice versa. Optional attributes should be marked as such with a question mark:
-+     *   `=?` or `=?attr`. If the binding expression is non-assignable, or if the attribute isn't
-+     *   optional and doesn't exist, an exception ({@link error/$compile/nonassign `$compile:nonassign`})
-+     *   will be thrown upon discovering changes to the local value, since it will be impossible to sync
-+     *   them back to the parent scope. By default, the {@link ng.$rootScope.Scope#$watch `$watch`}
-+     *   method is used for tracking changes, and the equality check is based on object identity.
-+     *   However, if an object literal or an array literal is passed as the binding expression, the
-+     *   equality check is done by value (using the {@link angular.equals} function). It's also possible
-+     *   to watch the evaluated value shallowly with {@link ng.$rootScope.Scope#$watchCollection
-+ *   `$watchCollection`}: use `=*` or `=*attr` (`=*?` or `=*?attr` if the attribute is optional).
-+     *
-+     * * `<` or `<attr` - set up a one-way (one-directional) binding between a local scope property and an
-+     *   expression passed via the attribute `attr`. The expression is evaluated in the context of the
-+     *   parent scope. If no `attr` name is specified then the attribute name is assumed to be the same as the
-+     *   local name. You can also make the binding optional by adding `?`: `<?` or `<?attr`.
-+     *
-+     *   For example, given `<my-component my-attr="parentModel">` and directive definition of
-+     *   `scope: { localModel:'<myAttr' }`, then the isolated scope property `localModel` will reflect the
-      *   value of `parentModel` on the parent scope. Any changes to `parentModel` will be reflected
--     *   in `localModel` and any changes in `localModel` will reflect in `parentModel`. If the parent
--     *   scope property doesn't exist, it will throw a NON_ASSIGNABLE_MODEL_EXPRESSION exception. You
--     *   can avoid this behavior using `=?` or `=?attr` in order to flag the property as optional.
-+     *   in `localModel`, but changes in `localModel` will not reflect in `parentModel`. There are however
-+     *   two caveats:
-+     *     1. one-way binding does not copy the value from the parent to the isolate scope, it simply
-+     *     sets the same value. That means if your bound value is an object, changes to its properties
-+     *     in the isolated scope will be reflected in the parent scope (because both reference the same object).
-+     *     2. one-way binding watches changes to the **identity** of the parent value. That means the
-+     *     {@link ng.$rootScope.Scope#$watch `$watch`} on the parent value only fires if the reference
-+     *     to the value has changed. In most cases, this should not be of concern, but can be important
-+     *     to know if you one-way bind to an object, and then replace that object in the isolated scope.
-+     *     If you now change a property of the object in your parent scope, the change will not be
-+     *     propagated to the isolated scope, because the identity of the object on the parent scope
-+     *     has not changed. Instead you must assign a new object.
-+     *
-+     *   One-way binding is useful if you do not plan to propagate changes to your isolated scope bindings
-+     *   back to the parent. However, it does not make this completely impossible.
-+     *
-+     * * `&` or `&attr` - provides a way to execute an expression in the context of the parent scope. If
-+     *   no `attr` name is specified then the attribute name is assumed to be the same as the local name.
-+     *   Given `<my-component my-attr="count = count + value">` and the isolate scope definition `scope: {
-+     *   localFn:'&myAttr' }`, the isolate scope property `localFn` will point to a function wrapper for
-+     *   the `count = count + value` expression. Often it's desirable to pass data from the isolated scope
-+     *   via an expression to the parent scope. This can be done by passing a map of local variable names
-+     *   and values into the expression wrapper fn. For example, if the expression is `increment(amount)`
-+     *   then we can specify the amount value by calling the `localFn` as `localFn({amount: 22})`.
-+     *
-+     * In general it's possible to apply more than one directive to one element, but there might be limitations
-+     * depending on the type of scope required by the directives. The following points will help explain these limitations.
-+     * For simplicity only two directives are taken into account, but it is also applicable for several directives:
-+     *
-+     * * **no scope** + **no scope** => Two directives which don't require their own scope will use their parent's scope
-+     * * **child scope** + **no scope** =>  Both directives will share one single child scope
-+     * * **child scope** + **child scope** =>  Both directives will share one single child scope
-+     * * **isolated scope** + **no scope** =>  The isolated directive will use it's own created isolated scope. The other directive will use
-+     * its parent's scope
-+     * * **isolated scope** + **child scope** =>  **Won't work!** Only one scope can be related to one element. Therefore these directives cannot
-+     * be applied to the same element.
-+     * * **isolated scope** + **isolated scope**  =>  **Won't work!** Only one scope can be related to one element. Therefore these directives
-+     * cannot be applied to the same element.
-+     *
-+     *
-+     * #### `bindToController`
-+     * This property is used to bind scope properties directly to the controller. It can be either
-+     * `true` or an object hash with the same format as the `scope` property.
-+     *
-+     * When an isolate scope is used for a directive (see above), `bindToController: true` will
-+     * allow a component to have its properties bound to the controller, rather than to scope.
-+     *
-+     * After the controller is instantiated, the initial values of the isolate scope bindings will be bound to the controller
-+     * properties. You can access these bindings once they have been initialized by providing a controller method called
-+     * `$onInit`, which is called after all the controllers on an element have been constructed and had their bindings
-+     * initialized.
-+     *
-+     * <div class="alert alert-warning">
-+     * **Deprecation warning:** if `$compileProcvider.preAssignBindingsEnabled(true)` was called, bindings for non-ES6 class
-+     * controllers are bound to `this` before the controller constructor is called but this use is now deprecated. Please
-+     * place initialization code that relies upon bindings inside a `$onInit` method on the controller, instead.
-+     * </div>
-      *
--     * * `&` or `&attr` - provides a way to execute an expression in the context of the parent scope.
--     *   If no `attr` name is specified then the attribute name is assumed to be the same as the
--     *   local name. Given `<widget my-attr="count = count + value">` and widget definition of
--     *   `scope: { localFn:'&myAttr' }`, then isolate scope property `localFn` will point to
--     *   a function wrapper for the `count = count + value` expression. Often it's desirable to
--     *   pass data from the isolated scope via an expression and to the parent scope, this can be
--     *   done by passing a map of local variable names and values into the expression wrapper fn.
--     *   For example, if the expression is `increment(amount)` then we can specify the amount value
--     *   by calling the `localFn` as `localFn({amount: 22})`.
-+     * It is also possible to set `bindToController` to an object hash with the same format as the `scope` property.
-+     * This will set up the scope bindings to the controller directly. Note that `scope` can still be used
-+     * to define which kind of scope is created. By default, no scope is created. Use `scope: {}` to create an isolate
-+     * scope (useful for component directives).
-      *
-+     * If both `bindToController` and `scope` are defined and have object hashes, `bindToController` overrides `scope`.
-      *
-      *
-      * #### `controller`
-      * Controller constructor function. The controller is instantiated before the
--     * pre-linking phase and it is shared with other directives (see
-+     * pre-linking phase and can be accessed by other directives (see
-      * `require` attribute). This allows the directives to communicate with each other and augment
-      * each other's behavior. The controller is injectable (and supports bracket notation) with the following locals:
-      *
-      * * `$scope` - Current scope associated with the element
-      * * `$element` - Current element
-      * * `$attrs` - Current attributes object for the element
--     * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope.
--     *    The scope can be overridden by an optional first argument.
--     *   `function([scope], cloneLinkingFn)`.
--     *
-+     * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope:
-+     *   `function([scope], cloneLinkingFn, futureParentElement, slotName)`:
-+     *    * `scope`: (optional) override the scope.
-+     *    * `cloneLinkingFn`: (optional) argument to create clones of the original transcluded content.
-+     *    * `futureParentElement` (optional):
-+     *        * defines the parent to which the `cloneLinkingFn` will add the cloned elements.
-+     *        * default: `$element.parent()` resp. `$element` for `transclude:'element'` resp. `transclude:true`.
-+     *        * only needed for transcludes that are allowed to contain non html elements (e.g. SVG elements)
-+     *          and when the `cloneLinkingFn` is passed,
-+     *          as those elements need to created and cloned in a special way when they are defined outside their
-+     *          usual containers (e.g. like `<svg>`).
-+     *        * See also the `directive.templateNamespace` property.
-+     *    * `slotName`: (optional) the name of the slot to transclude. If falsy (e.g. `null`, `undefined` or `''`)
-+     *      then the default transclusion is provided.
-+     *    The `$transclude` function also has a method on it, `$transclude.isSlotFilled(slotName)`, which returns
-+     *    `true` if the specified slot contains content (i.e. one or more DOM nodes).
-      *
-      * #### `require`
-      * Require another directive and inject its controller as the fourth argument to the linking function. The
--     * `require` takes a string name (or array of strings) of the directive(s) to pass in. If an array is used, the
--     * injected argument will be an array in corresponding order. If no such directive can be
--     * found, or if the directive does not have a controller, then an error is raised. The name can be prefixed with:
-+     * `require` property can be a string, an array or an object:
-+     * * a **string** containing the name of the directive to pass to the linking function
-+     * * an **array** containing the names of directives to pass to the linking function. The argument passed to the
-+     * linking function will be an array of controllers in the same order as the names in the `require` property
-+     * * an **object** whose property values are the names of the directives to pass to the linking function. The argument
-+     * passed to the linking function will also be an object with matching keys, whose values will hold the corresponding
-+     * controllers.
-+     *
-+     * If the `require` property is an object and `bindToController` is truthy, then the required controllers are
-+     * bound to the controller using the keys of the `require` property. This binding occurs after all the controllers
-+     * have been constructed but before `$onInit` is called.
-+     * If the name of the required controller is the same as the local name (the key), the name can be
-+     * omitted. For example, `{parentDir: '^^'}` is equivalent to `{parentDir: '^^parentDir'}`.
-+     * See the {@link $compileProvider#component} helper for an example of how this can be used.
-+     * If no such required directive(s) can be found, or if the directive does not have a controller, then an error is
-+     * raised (unless no link function is specified and the required controllers are not being bound to the directive
-+     * controller, in which case error checking is skipped). The name can be prefixed with:
-      *
-      * * (no prefix) - Locate the required controller on the current element. Throw an error if not found.
-      * * `?` - Attempt to locate the required controller or pass `null` to the `link` fn if not found.
--     * * `^` - Locate the required controller by searching the element's parents. Throw an error if not found.
--     * * `?^` - Attempt to locate the required controller by searching the element's parents or pass `null` to the
--     *   `link` fn if not found.
-+     * * `^` - Locate the required controller by searching the element and its parents. Throw an error if not found.
-+     * * `^^` - Locate the required controller by searching the element's parents. Throw an error if not found.
-+     * * `?^` - Attempt to locate the required controller by searching the element and its parents or pass
-+     *   `null` to the `link` fn if not found.
-+     * * `?^^` - Attempt to locate the required controller by searching the element's parents, or pass
-+     *   `null` to the `link` fn if not found.
-      *
-      *
-      * #### `controllerAs`
--     * Controller alias at the directive scope. An alias for the controller so it
--     * can be referenced at the directive template. The directive needs to define a scope for this
--     * configuration to be used. Useful in the case when directive is used as component.
-+     * Identifier name for a reference to the controller in the directive's scope.
-+     * This allows the controller to be referenced from the directive template. This is especially
-+     * useful when a directive is used as component, i.e. with an `isolate` scope. It's also possible
-+     * to use it in a directive without an `isolate` / `new` scope, but you need to be aware that the
-+     * `controllerAs` reference might overwrite a property that already exists on the parent scope.
-      *
-      *
-      * #### `restrict`
-      * String of subset of `EACM` which restricts the directive to a specific directive
--     * declaration style. If omitted, the default (attributes only) is used.
-+     * declaration style. If omitted, the defaults (elements and attributes) are used.
-      *
--     * * `E` - Element name: `<my-directive></my-directive>`
-+     * * `E` - Element name (default): `<my-directive></my-directive>`
-      * * `A` - Attribute (default): `<div my-directive="exp"></div>`
-      * * `C` - Class: `<div class="my-directive: exp;"></div>`
-      * * `M` - Comment: `<!-- directive: my-directive exp -->`
-      *
-      *
-+     * #### `templateNamespace`
-+     * String representing the document type used by the markup in the template.
-+     * AngularJS needs this information as those elements need to be created and cloned
-+     * in a special way when they are defined outside their usual containers like `<svg>` and `<math>`.
-+     *
-+     * * `html` - All root nodes in the template are HTML. Root nodes may also be
-+     *   top-level elements such as `<svg>` or `<math>`.
-+     * * `svg` - The root nodes in the template are SVG elements (excluding `<math>`).
-+     * * `math` - The root nodes in the template are MathML elements (excluding `<svg>`).
-+     *
-+     * If no `templateNamespace` is specified, then the namespace is considered to be `html`.
-+     *
-      * #### `template`
--     * replace the current element with the contents of the HTML. The replacement process
--     * migrates all of the attributes / classes from the old element to the new one. See the
--     * {@link guide/directive#creating-custom-directives_creating-directives_template-expanding-directive
-- * Directives Guide} for an example.
-+     * HTML markup that may:
-+     * * Replace the contents of the directive's element (default).
-+     * * Replace the directive's element itself (if `replace` is true - DEPRECATED).
-+     * * Wrap the contents of the directive's element (if `transclude` is true).
-      *
--     * You can specify `template` as a string representing the template or as a function which takes
--     * two arguments `tElement` and `tAttrs` (described in the `compile` function api below) and
--     * returns a string value representing the template.
-+     * Value may be:
-+     *
-+     * * A string. For example `<div red-on-hover>{{delete_str}}</div>`.
-+     * * A function which takes two arguments `tElement` and `tAttrs` (described in the `compile`
-+     *   function api below) and returns a string value.
-      *
-      *
-      * #### `templateUrl`
--     * Same as `template` but the template is loaded from the specified URL. Because
--     * the template loading is asynchronous the compilation/linking is suspended until the template
--     * is loaded.
-+     * This is similar to `template` but the template is loaded from the specified URL, asynchronously.
-+     *
-+     * Because template loading is asynchronous the compiler will suspend compilation of directives on that element
-+     * for later when the template has been resolved.  In the meantime it will continue to compile and link
-+     * sibling and parent elements as though this element had not contained any directives.
-+     *
-+     * The compiler does not suspend the entire compilation to wait for templates to be loaded because this
-+     * would result in the whole app "stalling" until all templates are loaded asynchronously - even in the
-+     * case when only one deeply nested directive has `templateUrl`.
-+     *
-+     * Template loading is asynchronous even if the template has been preloaded into the {@link $templateCache}
-      *
-      * You can specify `templateUrl` as a string representing the URL or as a function which takes two
-      * arguments `tElement` and `tAttrs` (described in the `compile` function api below) and returns
-      * a string value representing the url.  In either case, the template URL is passed through {@link
--        * api/ng.$sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}.
-+        * $sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}.
-      *
-      *
--     * #### `replace`
--     * specify where the template should be inserted. Defaults to `false`.
-+     * #### `replace` (*DEPRECATED*)
-      *
--     * * `true` - the template will replace the current element.
--     * * `false` - the template will replace the contents of the current element.
-+     * `replace` will be removed in next major release - i.e. v2.0).
-      *
-+     * Specifies what the template should replace. Defaults to `false`.
-      *
--     * #### `transclude`
--     * compile the content of the element and make it available to the directive.
--     * Typically used with {@link ng.directive:ngTransclude
-- * ngTransclude}. The advantage of transclusion is that the linking function receives a
--     * transclusion function which is pre-bound to the correct scope. In a typical setup the widget
--     * creates an `isolate` scope, but the transclusion is not a child, but a sibling of the `isolate`
--     * scope. This makes it possible for the widget to have private state, and the transclusion to
--     * be bound to the parent (pre-`isolate`) scope.
-+     * * `true` - the template will replace the directive's element.
-+     * * `false` - the template will replace the contents of the directive's element.
-+     *
-+     * The replacement process migrates all of the attributes / classes from the old element to the new
-+     * one. See the {@link guide/directive#template-expanding-directive
-+ * Directives Guide} for an example.
-+     *
-+     * There are very few scenarios where element replacement is required for the application function,
-+     * the main one being reusable custom components that are used within SVG contexts
-+     * (because SVG doesn't work with custom elements in the DOM tree).
-      *
--     * * `true` - transclude the content of the directive.
--     * * `'element'` - transclude the whole element including any directives defined at lower priority.
-+     * #### `transclude`
-+     * Extract the contents of the element where the directive appears and make it available to the directive.
-+     * The contents are compiled and provided to the directive as a **transclusion function**. See the
-+     * {@link $compile#transclusion Transclusion} section below.
-      *
-      *
-      * #### `compile`
-@@ -5293,11 +7684,7 @@
-      * ```
-      *
-      * The compile function deals with transforming the template DOM. Since most directives do not do
--     * template transformation, it is not used often. Examples that require compile functions are
--     * directives that transform template DOM, such as {@link
--        * api/ng.directive:ngRepeat ngRepeat}, or load the contents
--     * asynchronously, such as {@link ngRoute.directive:ngView ngView}. The
--     * compile function takes the following arguments.
-+     * template transformation, it is not used often. The compile function takes the following arguments:
-      *
-      *   * `tElement` - template element - The element where the directive has been declared. It is
-      *     safe to do template transformation on the element and child elements only.
-@@ -5316,7 +7703,7 @@
- 
-      * <div class="alert alert-warning">
-      * **Note:** The compile function cannot handle directives that recursively use themselves in their
--     * own templates or compile functions. Compiling these directives results in an infinite loop and a
-+     * own templates or compile functions. Compiling these directives results in an infinite loop and
-      * stack overflow errors.
-      *
-      * This can be avoided by manually using $compile in the postLink function to imperatively compile
-@@ -5324,7 +7711,7 @@
-      * `templateUrl` declaration or manual compilation inside the compile function.
-      * </div>
-      *
--     * <div class="alert alert-error">
-+     * <div class="alert alert-danger">
-      * **Note:** The `transclude` function that is passed to the compile function is deprecated, as it
-      *   e.g. does not know about the right outer scope. Please use the transclude function that is passed
-      *   to the link function instead.
-@@ -5361,15 +7748,23 @@
-      *   * `iAttrs` - instance attributes - Normalized list of attributes declared on this element shared
-      *     between all directive linking functions.
-      *
--     *   * `controller` - a controller instance - A controller instance if at least one directive on the
--     *     element defines a controller. The controller is shared among all the directives, which allows
--     *     the directives to use the controllers as a communication channel.
-+     *   * `controller` - the directive's required controller instance(s) - Instances are shared
-+     *     among all directives, which allows the directives to use the controllers as a communication
-+     *     channel. The exact value depends on the directive's `require` property:
-+     *       * no controller(s) required: the directive's own controller, or `undefined` if it doesn't have one
-+     *       * `string`: the controller instance
-+     *       * `array`: array of controller instances
-      *
--     *   * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
--     *     The scope can be overridden by an optional first argument. This is the same as the `$transclude`
--     *     parameter of directive controllers.
--     *     `function([scope], cloneLinkingFn)`.
-+     *     If a required controller cannot be found, and it is optional, the instance is `null`,
-+     *     otherwise the {@link error:$compile:ctreq Missing Required Controller} error is thrown.
-      *
-+     *     Note that you can also require the directive's own controller - it will be made available like
-+     *     any other controller.
-+     *
-+     *   * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
-+     *     This is the same as the `$transclude` parameter of directive controllers,
-+     *     see {@link ng.$compile#-controller- the controller section for details}.
-+     *     `function([scope], cloneLinkingFn, futureParentElement)`.
-      *
-      * #### Pre-linking function
-      *
-@@ -5378,18 +7773,166 @@
-      *
-      * #### Post-linking function
-      *
--     * Executed after the child elements are linked. It is safe to do DOM transformation in the post-linking function.
-+     * Executed after the child elements are linked.
-+     *
-+     * Note that child elements that contain `templateUrl` directives will not have been compiled
-+     * and linked since they are waiting for their template to load asynchronously and their own
-+     * compilation and linking has been suspended until that occurs.
-+     *
-+     * It is safe to do DOM transformation in the post-linking function on elements that are not waiting
-+     * for their async templates to be resolved.
-+     *
-+     *
-+     * ### Transclusion
-+     *
-+     * Transclusion is the process of extracting a collection of DOM elements from one part of the DOM and
-+     * copying them to another part of the DOM, while maintaining their connection to the original AngularJS
-+     * scope from where they were taken.
-+     *
-+     * Transclusion is used (often with {@link ngTransclude}) to insert the
-+     * original contents of a directive's element into a specified place in the template of the directive.
-+     * The benefit of transclusion, over simply moving the DOM elements manually, is that the transcluded
-+     * content has access to the properties on the scope from which it was taken, even if the directive
-+     * has isolated scope.
-+     * See the {@link guide/directive#creating-a-directive-that-wraps-other-elements Directives Guide}.
-+     *
-+     * This makes it possible for the widget to have private state for its template, while the transcluded
-+     * content has access to its originating scope.
-+     *
-+     * <div class="alert alert-warning">
-+     * **Note:** When testing an element transclude directive you must not place the directive at the root of the
-+     * DOM fragment that is being compiled. See {@link guide/unit-testing#testing-transclusion-directives
-+ * Testing Transclusion Directives}.
-+     * </div>
-+     *
-+     * There are three kinds of transclusion depending upon whether you want to transclude just the contents of the
-+     * directive's element, the entire element or multiple parts of the element contents:
-+     *
-+     * * `true` - transclude the content (i.e. the child nodes) of the directive's element.
-+     * * `'element'` - transclude the whole of the directive's element including any directives on this
-+     *   element that defined at a lower priority than this directive. When used, the `template`
-+     *   property is ignored.
-+     * * **`{...}` (an object hash):** - map elements of the content onto transclusion "slots" in the template.
-+     *
-+     * **Mult-slot transclusion** is declared by providing an object for the `transclude` property.
-+     *
-+     * This object is a map where the keys are the name of the slot to fill and the value is an element selector
-+     * used to match the HTML to the slot. The element selector should be in normalized form (e.g. `myElement`)
-+     * and will match the standard element variants (e.g. `my-element`, `my:element`, `data-my-element`, etc).
-+     *
-+     * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives}
-+     *
-+     * If the element selector is prefixed with a `?` then that slot is optional.
-+     *
-+     * For example, the transclude object `{ slotA: '?myCustomElement' }` maps `<my-custom-element>` elements to
-+     * the `slotA` slot, which can be accessed via the `$transclude` function or via the {@link ngTransclude} directive.
-+     *
-+     * Slots that are not marked as optional (`?`) will trigger a compile time error if there are no matching elements
-+     * in the transclude content. If you wish to know if an optional slot was filled with content, then you can call
-+     * `$transclude.isSlotFilled(slotName)` on the transclude function passed to the directive's link function and
-+     * injectable into the directive's controller.
-+     *
-+     *
-+     * #### Transclusion Functions
-+     *
-+     * When a directive requests transclusion, the compiler extracts its contents and provides a **transclusion
-+     * function** to the directive's `link` function and `controller`. This transclusion function is a special
-+     * **linking function** that will return the compiled contents linked to a new transclusion scope.
-+     *
-+     * <div class="alert alert-info">
-+     * If you are just using {@link ngTransclude} then you don't need to worry about this function, since
-+     * ngTransclude will deal with it for us.
-+     * </div>
-+     *
-+     * If you want to manually control the insertion and removal of the transcluded content in your directive
-+     * then you must use this transclude function. When you call a transclude function it returns a a jqLite/JQuery
-+     * object that contains the compiled DOM, which is linked to the correct transclusion scope.
-+     *
-+     * When you call a transclusion function you can pass in a **clone attach function**. This function accepts
-+     * two parameters, `function(clone, scope) { ... }`, where the `clone` is a fresh compiled copy of your transcluded
-+     * content and the `scope` is the newly created transclusion scope, which the clone will be linked to.
-+     *
-+     * <div class="alert alert-info">
-+     * **Best Practice**: Always provide a `cloneFn` (clone attach function) when you call a transclude function
-+     * since you then get a fresh clone of the original DOM and also have access to the new transclusion scope.
-+     * </div>
-+     *
-+     * It is normal practice to attach your transcluded content (`clone`) to the DOM inside your **clone
-+     * attach function**:
-+     *
-+     * ```js
-+     * var transcludedContent, transclusionScope;
-+     *
-+     * $transclude(function(clone, scope) {
-+     *   element.append(clone);
-+     *   transcludedContent = clone;
-+     *   transclusionScope = scope;
-+     * });
-+     * ```
-+     *
-+     * Later, if you want to remove the transcluded content from your DOM then you should also destroy the
-+     * associated transclusion scope:
-+     *
-+     * ```js
-+     * transcludedContent.remove();
-+     * transclusionScope.$destroy();
-+     * ```
-+     *
-+     * <div class="alert alert-info">
-+     * **Best Practice**: if you intend to add and remove transcluded content manually in your directive
-+     * (by calling the transclude function to get the DOM and calling `element.remove()` to remove it),
-+     * then you are also responsible for calling `$destroy` on the transclusion scope.
-+     * </div>
-+     *
-+     * The built-in DOM manipulation directives, such as {@link ngIf}, {@link ngSwitch} and {@link ngRepeat}
-+     * automatically destroy their transcluded clones as necessary so you do not need to worry about this if
-+     * you are simply using {@link ngTransclude} to inject the transclusion into your directive.
-+     *
-+     *
-+     * #### Transclusion Scopes
-+     *
-+     * When you call a transclude function it returns a DOM fragment that is pre-bound to a **transclusion
-+     * scope**. This scope is special, in that it is a child of the directive's scope (and so gets destroyed
-+     * when the directive's scope gets destroyed) but it inherits the properties of the scope from which it
-+     * was taken.
-+     *
-+     * For example consider a directive that uses transclusion and isolated scope. The DOM hierarchy might look
-+     * like this:
-+     *
-+     * ```html
-+     * <div ng-app>
-+     *   <div isolate>
-+     *     <div transclusion>
-+     *     </div>
-+     *   </div>
-+     * </div>
-+     * ```
-+     *
-+     * The `$parent` scope hierarchy will look like this:
-+     *
-+     ```
-+     - $rootScope
-+     - isolate
-+     - transclusion
-+     ```
-+     *
-+     * but the scopes will inherit prototypically from different scopes to their `$parent`.
-+     *
-+     ```
-+     - $rootScope
-+     - transclusion
-+     - isolate
-+     ```
-+     *
-      *
--     * <a name="Attributes"></a>
-      * ### Attributes
-      *
-      * The {@link ng.$compile.directive.Attributes Attributes} object - passed as a parameter in the
-      * `link()` or `compile()` functions. It has a variety of uses.
-      *
--     * accessing *Normalized attribute names:*
--     * Directives like 'ngBind' can be expressed in many ways: 'ng:bind', `data-ng-bind`, or 'x-ng-bind'.
--     * the attributes object allows for normalized access to
--     *   the attributes.
-+     * * *Accessing normalized attribute names:* Directives like 'ngBind' can be expressed in many ways:
-+     *   'ng:bind', `data-ng-bind`, or 'x-ng-bind'. The attributes object allows for normalized access
-+     *   to the attributes.
-      *
-      * * *Directive inter-communication:* All directives share the same instance of the attributes
-      *   object which allows the directives to use the attributes object as inter directive
-@@ -5405,30 +7948,30 @@
-      *
-      * ```js
-      * function linkingFn(scope, elm, attrs, ctrl) {
-- *   // get the attribute value
-- *   console.log(attrs.ngModel);
-- *
-- *   // change the attribute
-- *   attrs.$set('ngModel', 'new value');
-- *
-- *   // observe changes to interpolated attribute
-- *   attrs.$observe('ngModel', function(value) {
-- *     console.log('ngModel has changed value to ' + value);
-- *   });
-- * }
-+     *   // get the attribute value
-+     *   console.log(attrs.ngModel);
-+     *
-+     *   // change the attribute
-+     *   attrs.$set('ngModel', 'new value');
-+     *
-+     *   // observe changes to interpolated attribute
-+     *   attrs.$observe('ngModel', function(value) {
-+     *     console.log('ngModel has changed value to ' + value);
-+     *   });
-+     * }
-      * ```
-      *
--     * Below is an example using `$compileProvider`.
-+     * ## Example
-      *
-      * <div class="alert alert-warning">
-      * **Note**: Typically directives are registered with `module.directive`. The example below is
-      * to illustrate how `$compile` works.
-      * </div>
-      *
--     <example module="compile">
-+     <example module="compileExample" name="compile">
-      <file name="index.html">
-      <script>
--     angular.module('compile', [], function($compileProvider) {
-+     angular.module('compileExample', [], function($compileProvider) {
-         // configure new 'compile' directive by passing a directive
-         // factory function. The factory function injects the '$compile'
-         $compileProvider.directive('compile', function($compile) {
-@@ -5452,17 +7995,16 @@
-               }
-             );
-           };
--        })
--      });
--
--     function Ctrl($scope) {
--        $scope.name = 'Angular';
-+        });
-+      })
-+     .controller('GreeterController', ['$scope', function($scope) {
-+        $scope.name = 'AngularJS';
-         $scope.html = 'Hello {{name}}';
--      }
-+      }]);
-      </script>
--     <div ng-controller="Ctrl">
--     <input ng-model="name"> <br>
--     <textarea ng-model="html"></textarea> <br>
-+     <div ng-controller="GreeterController">
-+     <input ng-model="name"> <br/>
-+     <textarea ng-model="html"></textarea> <br/>
-      <div compile="html"></div>
-      </div>
-      </file>
-@@ -5470,11 +8012,11 @@
-      it('should auto compile', function() {
-        var textarea = $('textarea');
-        var output = $('div[compile]');
--       // The initial state reads 'Hello Angular'.
--       expect(output.getText()).toBe('Hello Angular');
-+       // The initial state reads 'Hello AngularJS'.
-+       expect(output.getText()).toBe('Hello AngularJS');
-        textarea.clear();
-        textarea.sendKeys('{{name}}!');
--       expect(output.getText()).toBe('Angular!');
-+       expect(output.getText()).toBe('AngularJS!');
-      });
-      </file>
-      </example>
-@@ -5482,26 +8024,53 @@
-      *
-      *
-      * @param {string|DOMElement} element Element or HTML string to compile into a template function.
--     * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives.
-+     * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives - DEPRECATED.
-+     *
-+     * <div class="alert alert-danger">
-+     * **Note:** Passing a `transclude` function to the $compile function is deprecated, as it
-+     *   e.g. will not use the right outer scope. Please pass the transclude function as a
-+     *   `parentBoundTranscludeFn` to the link function instead.
-+     * </div>
-+     *
-      * @param {number} maxPriority only apply directives lower than given priority (Only effects the
-      *                 root element(s), not their children)
--     * @returns {function(scope, cloneAttachFn=)} a link function which is used to bind template
-+     * @returns {function(scope, cloneAttachFn=, options=)} a link function which is used to bind template
-      * (a DOM element/tree) to a scope. Where:
-      *
-      *  * `scope` - A {@link ng.$rootScope.Scope Scope} to bind to.
-      *  * `cloneAttachFn` - If `cloneAttachFn` is provided, then the link function will clone the
-      *  `template` and call the `cloneAttachFn` function allowing the caller to attach the
-      *  cloned elements to the DOM document at the appropriate place. The `cloneAttachFn` is
--     *  called as: <br> `cloneAttachFn(clonedElement, scope)` where:
-+     *  called as: <br/> `cloneAttachFn(clonedElement, scope)` where:
-      *
-      *      * `clonedElement` - is a clone of the original `element` passed into the compiler.
-      *      * `scope` - is the current scope with which the linking function is working with.
-      *
-+     *  * `options` - An optional object hash with linking options. If `options` is provided, then the following
-+     *  keys may be used to control linking behavior:
-+     *
-+     *      * `parentBoundTranscludeFn` - the transclude function made available to
-+     *        directives; if given, it will be passed through to the link functions of
-+     *        directives found in `element` during compilation.
-+     *      * `transcludeControllers` - an object hash with keys that map controller names
-+     *        to a hash with the key `instance`, which maps to the controller instance;
-+     *        if given, it will make the controllers available to directives on the compileNode:
-+     *        ```
-+     *        {
-+     *          parent: {
-+     *            instance: parentControllerInstance
-+     *          }
-+     *        }
-+     *        ```
-+     *      * `futureParentElement` - defines the parent to which the `cloneAttachFn` will add
-+     *        the cloned elements; only needed for transcludes that are allowed to contain non html
-+     *        elements (e.g. SVG elements). See also the directive.controller property.
-+     *
-      * Calling the linking function returns the element of the template. It is either the original
-      * element passed in, or the clone of the element if the `cloneAttachFn` is provided.
-      *
-      * After linking the view is not updated until after a call to $digest which typically is done by
--     * Angular automatically.
-+     * AngularJS automatically.
-      *
-      * If you need access to the bound view, there are two ways to do it:
-      *
-@@ -5519,42 +8088,158 @@
-      *         scope = ....;
-      *
-      *     var clonedElement = $compile(templateElement)(scope, function(clonedElement, scope) {
-- *       //attach the clone to DOM document at the right place
-- *     });
-+     *       //attach the clone to DOM document at the right place
-+     *     });
-      *
-      *     //now we have reference to the cloned DOM via `clonedElement`
-      *   ```
-      *
-      *
-      * For information on how the compiler works, see the
--     * {@link guide/compiler Angular HTML Compiler} section of the Developer Guide.
-+     * {@link guide/compiler AngularJS HTML Compiler} section of the Developer Guide.
-+     *
-+     * @knownIssue
-+     *
-+     * ### Double Compilation
-+     *
-+     Double compilation occurs when an already compiled part of the DOM gets
-+     compiled again. This is an undesired effect and can lead to misbehaving directives, performance issues,
-+     and memory leaks. Refer to the Compiler Guide {@link guide/compiler#double-compilation-and-how-to-avoid-it
-+   section on double compilation} for an in-depth explanation and ways to avoid it.
-+     *
-      */
- 
-     var $compileMinErr = minErr('$compile');
- 
-+    function UNINITIALIZED_VALUE() {}
-+    var _UNINITIALIZED_VALUE = new UNINITIALIZED_VALUE();
-+
-     /**
-      * @ngdoc provider
-      * @name $compileProvider
--     * @function
-      *
-      * @description
-      */
-     $CompileProvider.$inject = ['$provide', '$$sanitizeUriProvider'];
-+    /** @this */
-     function $CompileProvider($provide, $$sanitizeUriProvider) {
-         var hasDirectives = {},
-             Suffix = 'Directive',
--            COMMENT_DIRECTIVE_REGEXP = /^\s*directive\:\s*([\d\w\-_]+)\s+(.*)$/,
--            CLASS_DIRECTIVE_REGEXP = /(([\d\w\-_]+)(?:\:([^;]+))?;?)/;
-+            COMMENT_DIRECTIVE_REGEXP = /^\s*directive:\s*([\w-]+)\s+(.*)$/,
-+            CLASS_DIRECTIVE_REGEXP = /(([\w-]+)(?::([^;]+))?;?)/,
-+            ALL_OR_NOTHING_ATTRS = makeMap('ngSrc,ngSrcset,src,srcset'),
-+            REQUIRE_PREFIX_REGEXP = /^(?:(\^\^?)?(\?)?(\^\^?)?)?/;
- 
-         // Ref: http://developers.whatwg.org/webappapis.html#event-handler-idl-attributes
-         // The assumption is that future DOM event attribute names will begin with
-         // 'on' and be composed of only English letters.
-         var EVENT_HANDLER_ATTR_REGEXP = /^(on[a-z]+|formaction)$/;
-+        var bindingCache = createMap();
-+
-+        function parseIsolateBindings(scope, directiveName, isController) {
-+            var LOCAL_REGEXP = /^\s*([@&<]|=(\*?))(\??)\s*([\w$]*)\s*$/;
-+
-+            var bindings = createMap();
-+
-+            forEach(scope, function(definition, scopeName) {
-+                if (definition in bindingCache) {
-+                    bindings[scopeName] = bindingCache[definition];
-+                    return;
-+                }
-+                var match = definition.match(LOCAL_REGEXP);
-+
-+                if (!match) {
-+                    throw $compileMinErr('iscp',
-+                        'Invalid {3} for directive \'{0}\'.' +
-+                        ' Definition: {... {1}: \'{2}\' ...}',
-+                        directiveName, scopeName, definition,
-+                        (isController ? 'controller bindings definition' :
-+                            'isolate scope definition'));
-+                }
-+
-+                bindings[scopeName] = {
-+                    mode: match[1][0],
-+                    collection: match[2] === '*',
-+                    optional: match[3] === '?',
-+                    attrName: match[4] || scopeName
-+                };
-+                if (match[4]) {
-+                    bindingCache[definition] = bindings[scopeName];
-+                }
-+            });
-+
-+            return bindings;
-+        }
-+
-+        function parseDirectiveBindings(directive, directiveName) {
-+            var bindings = {
-+                isolateScope: null,
-+                bindToController: null
-+            };
-+            if (isObject(directive.scope)) {
-+                if (directive.bindToController === true) {
-+                    bindings.bindToController = parseIsolateBindings(directive.scope,
-+                        directiveName, true);
-+                    bindings.isolateScope = {};
-+                } else {
-+                    bindings.isolateScope = parseIsolateBindings(directive.scope,
-+                        directiveName, false);
-+                }
-+            }
-+            if (isObject(directive.bindToController)) {
-+                bindings.bindToController =
-+                    parseIsolateBindings(directive.bindToController, directiveName, true);
-+            }
-+            if (bindings.bindToController && !directive.controller) {
-+                // There is no controller
-+                throw $compileMinErr('noctrl',
-+                    'Cannot bind to controller without directive \'{0}\'s controller.',
-+                    directiveName);
-+            }
-+            return bindings;
-+        }
-+
-+        function assertValidDirectiveName(name) {
-+            var letter = name.charAt(0);
-+            if (!letter || letter !== lowercase(letter)) {
-+                throw $compileMinErr('baddir', 'Directive/Component name \'{0}\' is invalid. The first character must be a lowercase letter', name);
-+            }
-+            if (name !== name.trim()) {
-+                throw $compileMinErr('baddir',
-+                    'Directive/Component name \'{0}\' is invalid. The name should not contain leading or trailing whitespaces',
-+                    name);
-+            }
-+        }
-+
-+        function getDirectiveRequire(directive) {
-+            var require = directive.require || (directive.controller && directive.name);
-+
-+            if (!isArray(require) && isObject(require)) {
-+                forEach(require, function(value, key) {
-+                    var match = value.match(REQUIRE_PREFIX_REGEXP);
-+                    var name = value.substring(match[0].length);
-+                    if (!name) require[key] = match[0] + key;
-+                });
-+            }
-+
-+            return require;
-+        }
-+
-+        function getDirectiveRestrict(restrict, name) {
-+            if (restrict && !(isString(restrict) && /[EACM]/.test(restrict))) {
-+                throw $compileMinErr('badrestrict',
-+                    'Restrict property \'{0}\' of directive \'{1}\' is invalid',
-+                    restrict,
-+                    name);
-+            }
-+
-+            return restrict || 'EA';
-+        }
- 
-         /**
-          * @ngdoc method
-          * @name $compileProvider#directive
--         * @function
-+         * @kind function
-          *
-          * @description
-          * Register a new directive with the compiler.
-@@ -5562,13 +8247,15 @@
-          * @param {string|Object} name Name of the directive in camel-case (i.e. <code>ngBind</code> which
-          *    will match as <code>ng-bind</code>), or an object map of directives where the keys are the
-          *    names and the values are the factories.
--         * @param {Function|Array} directiveFactory An injectable directive factory function. See
--         *    {@link guide/directive} for more info.
-+         * @param {Function|Array} directiveFactory An injectable directive factory function. See the
-+         *    {@link guide/directive directive guide} and the {@link $compile compile API} for more info.
-          * @returns {ng.$compileProvider} Self for chaining.
-          */
-         this.directive = function registerDirective(name, directiveFactory) {
-+            assertArg(name, 'name');
-             assertNotHasOwnProperty(name, 'directive');
-             if (isString(name)) {
-+                assertValidDirectiveName(name);
-                 assertArg(directiveFactory, 'directiveFactory');
-                 if (!hasDirectives.hasOwnProperty(name)) {
-                     hasDirectives[name] = [];
-@@ -5586,8 +8273,9 @@
-                                     directive.priority = directive.priority || 0;
-                                     directive.index = index;
-                                     directive.name = directive.name || name;
--                                    directive.require = directive.require || (directive.controller && directive.name);
--                                    directive.restrict = directive.restrict || 'A';
-+                                    directive.require = getDirectiveRequire(directive);
-+                                    directive.restrict = getDirectiveRestrict(directive.restrict, name);
-+                                    directive.$$moduleName = directiveFactory.$$moduleName;
-                                     directives.push(directive);
-                                 } catch (e) {
-                                     $exceptionHandler(e);
-@@ -5603,17 +8291,164 @@
-             return this;
-         };
- 
-+        /**
-+         * @ngdoc method
-+         * @name $compileProvider#component
-+         * @module ng
-+         * @param {string|Object} name Name of the component in camelCase (i.e. `myComp` which will match `<my-comp>`),
-+         *    or an object map of components where the keys are the names and the values are the component definition objects.
-+         * @param {Object} options Component definition object (a simplified
-+         *    {@link ng.$compile#directive-definition-object directive definition object}),
-+         *    with the following properties (all optional):
-+         *
-+         *    - `controller` – `{(string|function()=}` – controller constructor function that should be
-+         *      associated with newly created scope or the name of a {@link ng.$compile#-controller-
-+   *      registered controller} if passed as a string. An empty `noop` function by default.
-+         *    - `controllerAs` – `{string=}` – identifier name for to reference the controller in the component's scope.
-+         *      If present, the controller will be published to scope under the `controllerAs` name.
-+         *      If not present, this will default to be `$ctrl`.
-+         *    - `template` – `{string=|function()=}` – html template as a string or a function that
-+         *      returns an html template as a string which should be used as the contents of this component.
-+         *      Empty string by default.
-+         *
-+         *      If `template` is a function, then it is {@link auto.$injector#invoke injected} with
-+         *      the following locals:
-+         *
-+         *      - `$element` - Current element
-+         *      - `$attrs` - Current attributes object for the element
-+         *
-+         *    - `templateUrl` – `{string=|function()=}` – path or function that returns a path to an html
-+         *      template that should be used  as the contents of this component.
-+         *
-+         *      If `templateUrl` is a function, then it is {@link auto.$injector#invoke injected} with
-+         *      the following locals:
-+         *
-+         *      - `$element` - Current element
-+         *      - `$attrs` - Current attributes object for the element
-+         *
-+         *    - `bindings` – `{object=}` – defines bindings between DOM attributes and component properties.
-+         *      Component properties are always bound to the component controller and not to the scope.
-+         *      See {@link ng.$compile#-bindtocontroller- `bindToController`}.
-+         *    - `transclude` – `{boolean=}` – whether {@link $compile#transclusion content transclusion} is enabled.
-+         *      Disabled by default.
-+         *    - `require` - `{Object<string, string>=}` - requires the controllers of other directives and binds them to
-+         *      this component's controller. The object keys specify the property names under which the required
-+         *      controllers (object values) will be bound. See {@link ng.$compile#-require- `require`}.
-+         *    - `$...` – additional properties to attach to the directive factory function and the controller
-+         *      constructor function. (This is used by the component router to annotate)
-+         *
-+         * @returns {ng.$compileProvider} the compile provider itself, for chaining of function calls.
-+         * @description
-+         * Register a **component definition** with the compiler. This is a shorthand for registering a special
-+         * type of directive, which represents a self-contained UI component in your application. Such components
-+         * are always isolated (i.e. `scope: {}`) and are always restricted to elements (i.e. `restrict: 'E'`).
-+         *
-+         * Component definitions are very simple and do not require as much configuration as defining general
-+         * directives. Component definitions usually consist only of a template and a controller backing it.
-+         *
-+         * In order to make the definition easier, components enforce best practices like use of `controllerAs`,
-+         * `bindToController`. They always have **isolate scope** and are restricted to elements.
-+         *
-+         * Here are a few examples of how you would usually define components:
-+         *
-+         * ```js
-+         *   var myMod = angular.module(...);
-+         *   myMod.component('myComp', {
-+         *     template: '<div>My name is {{$ctrl.name}}</div>',
-+         *     controller: function() {
-+         *       this.name = 'shahar';
-+         *     }
-+         *   });
-+         *
-+         *   myMod.component('myComp', {
-+         *     template: '<div>My name is {{$ctrl.name}}</div>',
-+         *     bindings: {name: '@'}
-+         *   });
-+         *
-+         *   myMod.component('myComp', {
-+         *     templateUrl: 'views/my-comp.html',
-+         *     controller: 'MyCtrl',
-+         *     controllerAs: 'ctrl',
-+         *     bindings: {name: '@'}
-+         *   });
-+         *
-+         * ```
-+         * For more examples, and an in-depth guide, see the {@link guide/component component guide}.
-+         *
-+         * <br />
-+         * See also {@link ng.$compileProvider#directive $compileProvider.directive()}.
-+         */
-+        this.component = function registerComponent(name, options) {
-+            if (!isString(name)) {
-+                forEach(name, reverseParams(bind(this, registerComponent)));
-+                return this;
-+            }
-+
-+            var controller = options.controller || function() {};
-+
-+            function factory($injector) {
-+                function makeInjectable(fn) {
-+                    if (isFunction(fn) || isArray(fn)) {
-+                        return /** @this */ function(tElement, tAttrs) {
-+                            return $injector.invoke(fn, this, {$element: tElement, $attrs: tAttrs});
-+                        };
-+                    } else {
-+                        return fn;
-+                    }
-+                }
-+
-+                var template = (!options.template && !options.templateUrl ? '' : options.template);
-+                var ddo = {
-+                    controller: controller,
-+                    controllerAs: identifierForController(options.controller) || options.controllerAs || '$ctrl',
-+                    template: makeInjectable(template),
-+                    templateUrl: makeInjectable(options.templateUrl),
-+                    transclude: options.transclude,
-+                    scope: {},
-+                    bindToController: options.bindings || {},
-+                    restrict: 'E',
-+                    require: options.require
-+                };
-+
-+                // Copy annotations (starting with $) over to the DDO
-+                forEach(options, function(val, key) {
-+                    if (key.charAt(0) === '$') ddo[key] = val;
-+                });
-+
-+                return ddo;
-+            }
-+
-+            // TODO(pete) remove the following `forEach` before we release 1.6.0
-+            // The component-router@0.2.0 looks for the annotations on the controller constructor
-+            // Nothing in AngularJS looks for annotations on the factory function but we can't remove
-+            // it from 1.5.x yet.
-+
-+            // Copy any annotation properties (starting with $) over to the factory and controller constructor functions
-+            // These could be used by libraries such as the new component router
-+            forEach(options, function(val, key) {
-+                if (key.charAt(0) === '$') {
-+                    factory[key] = val;
-+                    // Don't try to copy over annotations to named controller
-+                    if (isFunction(controller)) controller[key] = val;
-+                }
-+            });
-+
-+            factory.$inject = ['$injector'];
-+
-+            return this.directive(name, factory);
-+        };
-+
- 
-         /**
-          * @ngdoc method
-          * @name $compileProvider#aHrefSanitizationWhitelist
--         * @function
-+         * @kind function
-          *
-          * @description
-          * Retrieves or overrides the default regular expression that is used for whitelisting of safe
-          * urls during a[href] sanitization.
-          *
--         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
-+         * The sanitization is a security measure aimed at preventing XSS attacks via html links.
-          *
-          * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
-          * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
-@@ -5637,7 +8472,7 @@
-         /**
-          * @ngdoc method
-          * @name $compileProvider#imgSrcSanitizationWhitelist
--         * @function
-+         * @kind function
-          *
-          * @description
-          * Retrieves or overrides the default regular expression that is used for whitelisting of safe
-@@ -5663,42 +8498,295 @@
-             }
-         };
- 
--        this.$get = [
--            '$injector', '$interpolate', '$exceptionHandler', '$http', '$templateCache', '$parse',
--            '$controller', '$rootScope', '$document', '$sce', '$animate', '$$sanitizeUri',
--            function($injector,   $interpolate,   $exceptionHandler,   $http,   $templateCache,   $parse,
--                     $controller,   $rootScope,   $document,   $sce,   $animate,   $$sanitizeUri) {
--
--                var Attributes = function(element, attr) {
--                    this.$$element = element;
--                    this.$attr = attr || {};
--                };
-+        /**
-+         * @ngdoc method
-+         * @name  $compileProvider#debugInfoEnabled
-+         *
-+         * @param {boolean=} enabled update the debugInfoEnabled state if provided, otherwise just return the
-+         * current debugInfoEnabled state
-+         * @returns {*} current value if used as getter or itself (chaining) if used as setter
-+         *
-+         * @kind function
-+         *
-+         * @description
-+         * Call this method to enable/disable various debug runtime information in the compiler such as adding
-+         * binding information and a reference to the current scope on to DOM elements.
-+         * If enabled, the compiler will add the following to DOM elements that have been bound to the scope
-+         * * `ng-binding` CSS class
-+         * * `ng-scope` and `ng-isolated-scope` CSS classes
-+         * * `$binding` data property containing an array of the binding expressions
-+         * * Data properties used by the {@link angular.element#methods `scope()`/`isolateScope()` methods} to return
-+         *   the element's scope.
-+         * * Placeholder comments will contain information about what directive and binding caused the placeholder.
-+         *   E.g. `<!-- ngIf: shouldShow() -->`.
-+         *
-+         * You may want to disable this in production for a significant performance boost. See
-+         * {@link guide/production#disabling-debug-data Disabling Debug Data} for more.
-+         *
-+         * The default value is true.
-+         */
-+        var debugInfoEnabled = true;
-+        this.debugInfoEnabled = function(enabled) {
-+            if (isDefined(enabled)) {
-+                debugInfoEnabled = enabled;
-+                return this;
-+            }
-+            return debugInfoEnabled;
-+        };
- 
--                Attributes.prototype = {
--                    $normalize: directiveNormalize,
-+        /**
-+         * @ngdoc method
-+         * @name  $compileProvider#preAssignBindingsEnabled
-+         *
-+         * @param {boolean=} enabled update the preAssignBindingsEnabled state if provided, otherwise just return the
-+         * current preAssignBindingsEnabled state
-+         * @returns {*} current value if used as getter or itself (chaining) if used as setter
-+         *
-+         * @kind function
-+         *
-+         * @description
-+         * Call this method to enable/disable whether directive controllers are assigned bindings before
-+         * calling the controller's constructor.
-+         * If enabled (true), the compiler assigns the value of each of the bindings to the
-+         * properties of the controller object before the constructor of this object is called.
-+         *
-+         * If disabled (false), the compiler calls the constructor first before assigning bindings.
-+         *
-+         * The default value is false.
-+         *
-+         * @deprecated
-+         * sinceVersion="1.6.0"
-+         * removeVersion="1.7.0"
-+         *
-+         * This method and the option to assign the bindings before calling the controller's constructor
-+         * will be removed in v1.7.0.
-+         */
-+        var preAssignBindingsEnabled = false;
-+        this.preAssignBindingsEnabled = function(enabled) {
-+            if (isDefined(enabled)) {
-+                preAssignBindingsEnabled = enabled;
-+                return this;
-+            }
-+            return preAssignBindingsEnabled;
-+        };
- 
-+        /**
-+         * @ngdoc method
-+         * @name  $compileProvider#strictComponentBindingsEnabled
-+         *
-+         * @param {boolean=} enabled update the strictComponentBindingsEnabled state if provided, otherwise just return the
-+         * current strictComponentBindingsEnabled state
-+         * @returns {*} current value if used as getter or itself (chaining) if used as setter
-+         *
-+         * @kind function
-+         *
-+         * @description
-+         * Call this method to enable/disable strict component bindings check. If enabled, the compiler will enforce that
-+         * for all bindings of a component that are not set as optional with `?`, an attribute needs to be provided
-+         * on the component's HTML tag.
-+         *
-+         * The default value is false.
-+         */
-+        var strictComponentBindingsEnabled = false;
-+        this.strictComponentBindingsEnabled = function(enabled) {
-+            if (isDefined(enabled)) {
-+                strictComponentBindingsEnabled = enabled;
-+                return this;
-+            }
-+            return strictComponentBindingsEnabled;
-+        };
- 
--                    /**
--                     * @ngdoc method
--                     * @name $compile.directive.Attributes#$addClass
--                     * @function
--                     *
--                     * @description
--                     * Adds the CSS class value specified by the classVal parameter to the element. If animations
--                     * are enabled then an animation will be triggered for the class addition.
--                     *
--                     * @param {string} classVal The className value that will be added to the element
--                     */
--                    $addClass : function(classVal) {
--                        if(classVal && classVal.length > 0) {
--                            $animate.addClass(this.$$element, classVal);
-+        var TTL = 10;
-+        /**
-+         * @ngdoc method
-+         * @name $compileProvider#onChangesTtl
-+         * @description
-+         *
-+         * Sets the number of times `$onChanges` hooks can trigger new changes before giving up and
-+         * assuming that the model is unstable.
-+         *
-+         * The current default is 10 iterations.
-+         *
-+         * In complex applications it's possible that dependencies between `$onChanges` hooks and bindings will result
-+         * in several iterations of calls to these hooks. However if an application needs more than the default 10
-+         * iterations to stabilize then you should investigate what is causing the model to continuously change during
-+         * the `$onChanges` hook execution.
-+         *
-+         * Increasing the TTL could have performance implications, so you should not change it without proper justification.
-+         *
-+         * @param {number} limit The number of `$onChanges` hook iterations.
-+         * @returns {number|object} the current limit (or `this` if called as a setter for chaining)
-+         */
-+        this.onChangesTtl = function(value) {
-+            if (arguments.length) {
-+                TTL = value;
-+                return this;
-+            }
-+            return TTL;
-+        };
-+
-+        var commentDirectivesEnabledConfig = true;
-+        /**
-+         * @ngdoc method
-+         * @name $compileProvider#commentDirectivesEnabled
-+         * @description
-+         *
-+         * It indicates to the compiler
-+         * whether or not directives on comments should be compiled.
-+         * Defaults to `true`.
-+         *
-+         * Calling this function with false disables the compilation of directives
-+         * on comments for the whole application.
-+         * This results in a compilation performance gain,
-+         * as the compiler doesn't have to check comments when looking for directives.
-+         * This should however only be used if you are sure that no comment directives are used in
-+         * the application (including any 3rd party directives).
-+         *
-+         * @param {boolean} enabled `false` if the compiler may ignore directives on comments
-+         * @returns {boolean|object} the current value (or `this` if called as a setter for chaining)
-+         */
-+        this.commentDirectivesEnabled = function(value) {
-+            if (arguments.length) {
-+                commentDirectivesEnabledConfig = value;
-+                return this;
-+            }
-+            return commentDirectivesEnabledConfig;
-+        };
-+
-+
-+        var cssClassDirectivesEnabledConfig = true;
-+        /**
-+         * @ngdoc method
-+         * @name $compileProvider#cssClassDirectivesEnabled
-+         * @description
-+         *
-+         * It indicates to the compiler
-+         * whether or not directives on element classes should be compiled.
-+         * Defaults to `true`.
-+         *
-+         * Calling this function with false disables the compilation of directives
-+         * on element classes for the whole application.
-+         * This results in a compilation performance gain,
-+         * as the compiler doesn't have to check element classes when looking for directives.
-+         * This should however only be used if you are sure that no class directives are used in
-+         * the application (including any 3rd party directives).
-+         *
-+         * @param {boolean} enabled `false` if the compiler may ignore directives on element classes
-+         * @returns {boolean|object} the current value (or `this` if called as a setter for chaining)
-+         */
-+        this.cssClassDirectivesEnabled = function(value) {
-+            if (arguments.length) {
-+                cssClassDirectivesEnabledConfig = value;
-+                return this;
-+            }
-+            return cssClassDirectivesEnabledConfig;
-+        };
-+
-+        this.$get = [
-+            '$injector', '$interpolate', '$exceptionHandler', '$templateRequest', '$parse',
-+            '$controller', '$rootScope', '$sce', '$animate', '$$sanitizeUri',
-+            function($injector,   $interpolate,   $exceptionHandler,   $templateRequest,   $parse,
-+                     $controller,   $rootScope,   $sce,   $animate,   $$sanitizeUri) {
-+
-+                var SIMPLE_ATTR_NAME = /^\w/;
-+                var specialAttrHolder = window.document.createElement('div');
-+
-+
-+                var commentDirectivesEnabled = commentDirectivesEnabledConfig;
-+                var cssClassDirectivesEnabled = cssClassDirectivesEnabledConfig;
-+
-+
-+                var onChangesTtl = TTL;
-+                // The onChanges hooks should all be run together in a single digest
-+                // When changes occur, the call to trigger their hooks will be added to this queue
-+                var onChangesQueue;
-+
-+                // This function is called in a $$postDigest to trigger all the onChanges hooks in a single digest
-+                function flushOnChangesQueue() {
-+                    try {
-+                        if (!(--onChangesTtl)) {
-+                            // We have hit the TTL limit so reset everything
-+                            onChangesQueue = undefined;
-+                            throw $compileMinErr('infchng', '{0} $onChanges() iterations reached. Aborting!\n', TTL);
-+                        }
-+                        // We must run this hook in an apply since the $$postDigest runs outside apply
-+                        $rootScope.$apply(function() {
-+                            var errors = [];
-+                            for (var i = 0, ii = onChangesQueue.length; i < ii; ++i) {
-+                                try {
-+                                    onChangesQueue[i]();
-+                                } catch (e) {
-+                                    errors.push(e);
-+                                }
-+                            }
-+                            // Reset the queue to trigger a new schedule next time there is a change
-+                            onChangesQueue = undefined;
-+                            if (errors.length) {
-+                                throw errors;
-+                            }
-+                        });
-+                    } finally {
-+                        onChangesTtl++;
-+                    }
-+                }
-+
-+
-+                function Attributes(element, attributesToCopy) {
-+                    if (attributesToCopy) {
-+                        var keys = Object.keys(attributesToCopy);
-+                        var i, l, key;
-+
-+                        for (i = 0, l = keys.length; i < l; i++) {
-+                            key = keys[i];
-+                            this[key] = attributesToCopy[key];
-+                        }
-+                    } else {
-+                        this.$attr = {};
-+                    }
-+
-+                    this.$$element = element;
-+                }
-+
-+                Attributes.prototype = {
-+                    /**
-+                     * @ngdoc method
-+                     * @name $compile.directive.Attributes#$normalize
-+                     * @kind function
-+                     *
-+                     * @description
-+                     * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with `x-` or
-+                     * `data-`) to its normalized, camelCase form.
-+                     *
-+                     * Also there is special case for Moz prefix starting with upper case letter.
-+                     *
-+                     * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives}
-+                     *
-+                     * @param {string} name Name to normalize
-+                     */
-+                    $normalize: directiveNormalize,
-+
-+
-+                    /**
-+                     * @ngdoc method
-+                     * @name $compile.directive.Attributes#$addClass
-+                     * @kind function
-+                     *
-+                     * @description
-+                     * Adds the CSS class value specified by the classVal parameter to the element. If animations
-+                     * are enabled then an animation will be triggered for the class addition.
-+                     *
-+                     * @param {string} classVal The className value that will be added to the element
-+                     */
-+                    $addClass: function(classVal) {
-+                        if (classVal && classVal.length > 0) {
-+                            $animate.addClass(this.$$element, classVal);
-                         }
-                     },
- 
-                     /**
-                      * @ngdoc method
-                      * @name $compile.directive.Attributes#$removeClass
--                     * @function
-+                     * @kind function
-                      *
-                      * @description
-                      * Removes the CSS class value specified by the classVal parameter from the element. If
-@@ -5706,8 +8794,8 @@
-                      *
-                      * @param {string} classVal The className value that will be removed from the element
-                      */
--                    $removeClass : function(classVal) {
--                        if(classVal && classVal.length > 0) {
-+                    $removeClass: function(classVal) {
-+                        if (classVal && classVal.length > 0) {
-                             $animate.removeClass(this.$$element, classVal);
-                         }
-                     },
-@@ -5715,7 +8803,7 @@
-                     /**
-                      * @ngdoc method
-                      * @name $compile.directive.Attributes#$updateClass
--                     * @function
-+                     * @kind function
-                      *
-                      * @description
-                      * Adds and removes the appropriate CSS class values to the element based on the difference
-@@ -5724,16 +8812,15 @@
-                      * @param {string} newClasses The current CSS className value
-                      * @param {string} oldClasses The former CSS className value
-                      */
--                    $updateClass : function(newClasses, oldClasses) {
-+                    $updateClass: function(newClasses, oldClasses) {
-                         var toAdd = tokenDifference(newClasses, oldClasses);
--                        var toRemove = tokenDifference(oldClasses, newClasses);
-+                        if (toAdd && toAdd.length) {
-+                            $animate.addClass(this.$$element, toAdd);
-+                        }
- 
--                        if(toAdd.length === 0) {
-+                        var toRemove = tokenDifference(oldClasses, newClasses);
-+                        if (toRemove && toRemove.length) {
-                             $animate.removeClass(this.$$element, toRemove);
--                        } else if(toRemove.length === 0) {
--                            $animate.addClass(this.$$element, toAdd);
--                        } else {
--                            $animate.setClass(this.$$element, toAdd, toRemove);
-                         }
-                     },
- 
-@@ -5751,13 +8838,18 @@
-                         //is set through this function since it may cause $updateClass to
-                         //become unstable.
- 
--                        var booleanKey = getBooleanAttrName(this.$$element[0], key),
--                            normalizedVal,
-+                        var node = this.$$element[0],
-+                            booleanKey = getBooleanAttrName(node, key),
-+                            aliasedKey = getAliasedAttrName(key),
-+                            observer = key,
-                             nodeName;
- 
-                         if (booleanKey) {
-                             this.$$element.prop(key, value);
-                             attrName = booleanKey;
-+                        } else if (aliasedKey) {
-+                            this[aliasedKey] = value;
-+                            observer = aliasedKey;
-                         }
- 
-                         this[key] = value;
-@@ -5774,36 +8866,76 @@
- 
-                         nodeName = nodeName_(this.$$element);
- 
--                        // sanitize a[href] and img[src] values
--                        if ((nodeName === 'A' && key === 'href') ||
--                            (nodeName === 'IMG' && key === 'src')) {
-+                        if ((nodeName === 'a' && (key === 'href' || key === 'xlinkHref')) ||
-+                            (nodeName === 'img' && key === 'src')) {
-+                            // sanitize a[href] and img[src] values
-                             this[key] = value = $$sanitizeUri(value, key === 'src');
-+                        } else if (nodeName === 'img' && key === 'srcset' && isDefined(value)) {
-+                            // sanitize img[srcset] values
-+                            var result = '';
-+
-+                            // first check if there are spaces because it's not the same pattern
-+                            var trimmedSrcset = trim(value);
-+                            //                (   999x   ,|   999w   ,|   ,|,   )
-+                            var srcPattern = /(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/;
-+                            var pattern = /\s/.test(trimmedSrcset) ? srcPattern : /(,)/;
-+
-+                            // split srcset into tuple of uri and descriptor except for the last item
-+                            var rawUris = trimmedSrcset.split(pattern);
-+
-+                            // for each tuples
-+                            var nbrUrisWith2parts = Math.floor(rawUris.length / 2);
-+                            for (var i = 0; i < nbrUrisWith2parts; i++) {
-+                                var innerIdx = i * 2;
-+                                // sanitize the uri
-+                                result += $$sanitizeUri(trim(rawUris[innerIdx]), true);
-+                                // add the descriptor
-+                                result += (' ' + trim(rawUris[innerIdx + 1]));
-+                            }
-+
-+                            // split the last item into uri and descriptor
-+                            var lastTuple = trim(rawUris[i * 2]).split(/\s/);
-+
-+                            // sanitize the last uri
-+                            result += $$sanitizeUri(trim(lastTuple[0]), true);
-+
-+                            // and add the last descriptor if any
-+                            if (lastTuple.length === 2) {
-+                                result += (' ' + trim(lastTuple[1]));
-+                            }
-+                            this[key] = value = result;
-                         }
- 
-                         if (writeAttr !== false) {
--                            if (value === null || value === undefined) {
-+                            if (value === null || isUndefined(value)) {
-                                 this.$$element.removeAttr(attrName);
-                             } else {
--                                this.$$element.attr(attrName, value);
-+                                if (SIMPLE_ATTR_NAME.test(attrName)) {
-+                                    this.$$element.attr(attrName, value);
-+                                } else {
-+                                    setSpecialAttr(this.$$element[0], attrName, value);
-+                                }
-                             }
-                         }
- 
-                         // fire observers
-                         var $$observers = this.$$observers;
--                        $$observers && forEach($$observers[key], function(fn) {
--                            try {
--                                fn(value);
--                            } catch (e) {
--                                $exceptionHandler(e);
--                            }
--                        });
-+                        if ($$observers) {
-+                            forEach($$observers[observer], function(fn) {
-+                                try {
-+                                    fn(value);
-+                                } catch (e) {
-+                                    $exceptionHandler(e);
-+                                }
-+                            });
-+                        }
-                     },
- 
- 
-                     /**
-                      * @ngdoc method
-                      * @name $compile.directive.Attributes#$observe
--                     * @function
-+                     * @kind function
-                      *
-                      * @description
-                      * Observes an interpolated attribute.
-@@ -5815,34 +8947,95 @@
-                      * @param {string} key Normalized key. (ie ngAttribute) .
-                      * @param {function(interpolatedValue)} fn Function that will be called whenever
-                      the interpolated value of the attribute changes.
--                     *        See the {@link guide/directive#Attributes Directives} guide for more info.
--                     * @returns {function()} the `fn` parameter.
-+                     *        See the {@link guide/interpolation#how-text-and-attribute-bindings-work Interpolation
-+       *        guide} for more info.
-+                     * @returns {function()} Returns a deregistration function for this observer.
-                      */
-                     $observe: function(key, fn) {
-                         var attrs = this,
--                            $$observers = (attrs.$$observers || (attrs.$$observers = {})),
-+                            $$observers = (attrs.$$observers || (attrs.$$observers = createMap())),
-                             listeners = ($$observers[key] || ($$observers[key] = []));
- 
-                         listeners.push(fn);
-                         $rootScope.$evalAsync(function() {
--                            if (!listeners.$$inter) {
-+                            if (!listeners.$$inter && attrs.hasOwnProperty(key) && !isUndefined(attrs[key])) {
-                                 // no one registered attribute interpolation function, so lets call it manually
-                                 fn(attrs[key]);
-                             }
-                         });
--                        return fn;
-+
-+                        return function() {
-+                            arrayRemove(listeners, fn);
-+                        };
-                     }
-                 };
- 
-+                function setSpecialAttr(element, attrName, value) {
-+                    // Attributes names that do not start with letters (such as `(click)`) cannot be set using `setAttribute`
-+                    // so we have to jump through some hoops to get such an attribute
-+                    // https://github.com/angular/angular.js/pull/13318
-+                    specialAttrHolder.innerHTML = '<span ' + attrName + '>';
-+                    var attributes = specialAttrHolder.firstChild.attributes;
-+                    var attribute = attributes[0];
-+                    // We have to remove the attribute from its container element before we can add it to the destination element
-+                    attributes.removeNamedItem(attribute.name);
-+                    attribute.value = value;
-+                    element.attributes.setNamedItem(attribute);
-+                }
-+
-+                function safeAddClass($element, className) {
-+                    try {
-+                        $element.addClass(className);
-+                    } catch (e) {
-+                        // ignore, since it means that we are trying to set class on
-+                        // SVG element, where class name is read-only.
-+                    }
-+                }
-+
-+
-                 var startSymbol = $interpolate.startSymbol(),
-                     endSymbol = $interpolate.endSymbol(),
--                    denormalizeTemplate = (startSymbol == '{{' || endSymbol  == '}}')
-+                    denormalizeTemplate = (startSymbol === '{{' && endSymbol  === '}}')
-                         ? identity
-                         : function denormalizeTemplate(template) {
--                        return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol);
--                    },
-+                            return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol);
-+                        },
-                     NG_ATTR_BINDING = /^ngAttr[A-Z]/;
-+                var MULTI_ELEMENT_DIR_RE = /^(.+)Start$/;
-+
-+                compile.$$addBindingInfo = debugInfoEnabled ? function $$addBindingInfo($element, binding) {
-+                    var bindings = $element.data('$binding') || [];
- 
-+                    if (isArray(binding)) {
-+                        bindings = bindings.concat(binding);
-+                    } else {
-+                        bindings.push(binding);
-+                    }
-+
-+                    $element.data('$binding', bindings);
-+                } : noop;
-+
-+                compile.$$addBindingClass = debugInfoEnabled ? function $$addBindingClass($element) {
-+                    safeAddClass($element, 'ng-binding');
-+                } : noop;
-+
-+                compile.$$addScopeInfo = debugInfoEnabled ? function $$addScopeInfo($element, scope, isolated, noTemplate) {
-+                    var dataName = isolated ? (noTemplate ? '$isolateScopeNoTemplate' : '$isolateScope') : '$scope';
-+                    $element.data(dataName, scope);
-+                } : noop;
-+
-+                compile.$$addScopeClass = debugInfoEnabled ? function $$addScopeClass($element, isolated) {
-+                    safeAddClass($element, isolated ? 'ng-isolate-scope' : 'ng-scope');
-+                } : noop;
-+
-+                compile.$$createComment = function(directiveName, comment) {
-+                    var content = '';
-+                    if (debugInfoEnabled) {
-+                        content = ' ' + (directiveName || '') + ': ';
-+                        if (comment) content += comment + ' ';
-+                    }
-+                    return window.document.createComment(content);
-+                };
- 
-                 return compile;
- 
-@@ -5855,50 +9048,84 @@
-                         // modify it.
-                         $compileNodes = jqLite($compileNodes);
-                     }
--                    // We can not compile top level text elements since text nodes can be merged and we will
--                    // not be able to attach scope data to them, so we will wrap them in <span>
--                    forEach($compileNodes, function(node, index){
--                        if (node.nodeType == 3 /* text node */ && node.nodeValue.match(/\S+/) /* non-empty */ ) {
--                            $compileNodes[index] = node = jqLite(node).wrap('<span></span>').parent()[0];
--                        }
--                    });
-                     var compositeLinkFn =
-                         compileNodes($compileNodes, transcludeFn, $compileNodes,
-                             maxPriority, ignoreDirective, previousCompileContext);
--                    safeAddClass($compileNodes, 'ng-scope');
--                    return function publicLinkFn(scope, cloneConnectFn, transcludeControllers){
-+                    compile.$$addScopeClass($compileNodes);
-+                    var namespace = null;
-+                    return function publicLinkFn(scope, cloneConnectFn, options) {
-+                        if (!$compileNodes) {
-+                            throw $compileMinErr('multilink', 'This element has already been linked.');
-+                        }
-                         assertArg(scope, 'scope');
--                        // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart
--                        // and sometimes changes the structure of the DOM.
--                        var $linkNode = cloneConnectFn
--                            ? JQLitePrototype.clone.call($compileNodes) // IMPORTANT!!!
--                            : $compileNodes;
--
--                        forEach(transcludeControllers, function(instance, name) {
--                            $linkNode.data('$' + name + 'Controller', instance);
--                        });
- 
--                        // Attach scope only to non-text nodes.
--                        for(var i = 0, ii = $linkNode.length; i<ii; i++) {
--                            var node = $linkNode[i],
--                                nodeType = node.nodeType;
--                            if (nodeType === 1 /* element */ || nodeType === 9 /* document */) {
--                                $linkNode.eq(i).data('$scope', scope);
-+                        if (previousCompileContext && previousCompileContext.needsNewScope) {
-+                            // A parent directive did a replace and a directive on this element asked
-+                            // for transclusion, which caused us to lose a layer of element on which
-+                            // we could hold the new transclusion scope, so we will create it manually
-+                            // here.
-+                            scope = scope.$parent.$new();
-+                        }
-+
-+                        options = options || {};
-+                        var parentBoundTranscludeFn = options.parentBoundTranscludeFn,
-+                            transcludeControllers = options.transcludeControllers,
-+                            futureParentElement = options.futureParentElement;
-+
-+                        // When `parentBoundTranscludeFn` is passed, it is a
-+                        // `controllersBoundTransclude` function (it was previously passed
-+                        // as `transclude` to directive.link) so we must unwrap it to get
-+                        // its `boundTranscludeFn`
-+                        if (parentBoundTranscludeFn && parentBoundTranscludeFn.$$boundTransclude) {
-+                            parentBoundTranscludeFn = parentBoundTranscludeFn.$$boundTransclude;
-+                        }
-+
-+                        if (!namespace) {
-+                            namespace = detectNamespaceForChildElements(futureParentElement);
-+                        }
-+                        var $linkNode;
-+                        if (namespace !== 'html') {
-+                            // When using a directive with replace:true and templateUrl the $compileNodes
-+                            // (or a child element inside of them)
-+                            // might change, so we need to recreate the namespace adapted compileNodes
-+                            // for call to the link function.
-+                            // Note: This will already clone the nodes...
-+                            $linkNode = jqLite(
-+                                wrapTemplate(namespace, jqLite('<div>').append($compileNodes).html())
-+                            );
-+                        } else if (cloneConnectFn) {
-+                            // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart
-+                            // and sometimes changes the structure of the DOM.
-+                            $linkNode = JQLitePrototype.clone.call($compileNodes);
-+                        } else {
-+                            $linkNode = $compileNodes;
-+                        }
-+
-+                        if (transcludeControllers) {
-+                            for (var controllerName in transcludeControllers) {
-+                                $linkNode.data('$' + controllerName + 'Controller', transcludeControllers[controllerName].instance);
-                             }
-                         }
- 
-+                        compile.$$addScopeInfo($linkNode, scope);
-+
-                         if (cloneConnectFn) cloneConnectFn($linkNode, scope);
--                        if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode);
-+                        if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode, parentBoundTranscludeFn);
-+
-+                        if (!cloneConnectFn) {
-+                            $compileNodes = compositeLinkFn = null;
-+                        }
-                         return $linkNode;
-                     };
-                 }
- 
--                function safeAddClass($element, className) {
--                    try {
--                        $element.addClass(className);
--                    } catch(e) {
--                        // ignore, since it means that we are trying to set class on
--                        // SVG element, where class name is read-only.
-+                function detectNamespaceForChildElements(parentElement) {
-+                    // TODO: Make this detect MathML as well...
-+                    var node = parentElement && parentElement[0];
-+                    if (!node) {
-+                        return 'html';
-+                    } else {
-+                        return nodeName_(node) !== 'foreignobject' && toString.call(node).match(/SVG/) ? 'svg' : 'html';
-                     }
-                 }
- 
-@@ -5920,33 +9147,50 @@
-                 function compileNodes(nodeList, transcludeFn, $rootElement, maxPriority, ignoreDirective,
-                                       previousCompileContext) {
-                     var linkFns = [],
--                        attrs, directives, nodeLinkFn, childNodes, childLinkFn, linkFnFound;
-+                        // `nodeList` can be either an element's `.childNodes` (live NodeList)
-+                        // or a jqLite/jQuery collection or an array
-+                        notLiveList = isArray(nodeList) || (nodeList instanceof jqLite),
-+                        attrs, directives, nodeLinkFn, childNodes, childLinkFn, linkFnFound, nodeLinkFnFound;
-+
- 
-                     for (var i = 0; i < nodeList.length; i++) {
-                         attrs = new Attributes();
- 
--                        // we must always refer to nodeList[i] since the nodes can be replaced underneath us.
-+                        // Support: IE 11 only
-+                        // Workaround for #11781 and #14924
-+                        if (msie === 11) {
-+                            mergeConsecutiveTextNodes(nodeList, i, notLiveList);
-+                        }
-+
-+                        // We must always refer to `nodeList[i]` hereafter,
-+                        // since the nodes can be replaced underneath us.
-                         directives = collectDirectives(nodeList[i], [], attrs, i === 0 ? maxPriority : undefined,
-                             ignoreDirective);
- 
-                         nodeLinkFn = (directives.length)
-                             ? applyDirectivesToNode(directives, nodeList[i], attrs, transcludeFn, $rootElement,
--                            null, [], [], previousCompileContext)
-+                                null, [], [], previousCompileContext)
-                             : null;
- 
-                         if (nodeLinkFn && nodeLinkFn.scope) {
--                            safeAddClass(jqLite(nodeList[i]), 'ng-scope');
-+                            compile.$$addScopeClass(attrs.$$element);
-                         }
- 
-                         childLinkFn = (nodeLinkFn && nodeLinkFn.terminal ||
--                        !(childNodes = nodeList[i].childNodes) ||
--                        !childNodes.length)
-+                            !(childNodes = nodeList[i].childNodes) ||
-+                            !childNodes.length)
-                             ? null
-                             : compileNodes(childNodes,
--                            nodeLinkFn ? nodeLinkFn.transclude : transcludeFn);
-+                                nodeLinkFn ? (
-+                                    (nodeLinkFn.transcludeOnThisElement || !nodeLinkFn.templateOnThisElement)
-+                                    && nodeLinkFn.transclude) : transcludeFn);
-+
-+                        if (nodeLinkFn || childLinkFn) {
-+                            linkFns.push(i, nodeLinkFn, childLinkFn);
-+                            linkFnFound = true;
-+                            nodeLinkFnFound = nodeLinkFnFound || nodeLinkFn;
-+                        }
- 
--                        linkFns.push(nodeLinkFn, childLinkFn);
--                        linkFnFound = linkFnFound || nodeLinkFn || childLinkFn;
-                         //use the previous context only for the first element in the virtual group
-                         previousCompileContext = null;
-                     }
-@@ -5954,60 +9198,115 @@
-                     // return a linking function if we have found anything, null otherwise
-                     return linkFnFound ? compositeLinkFn : null;
- 
--                    function compositeLinkFn(scope, nodeList, $rootElement, boundTranscludeFn) {
--                        var nodeLinkFn, childLinkFn, node, $node, childScope, childTranscludeFn, i, ii, n;
-+                    function compositeLinkFn(scope, nodeList, $rootElement, parentBoundTranscludeFn) {
-+                        var nodeLinkFn, childLinkFn, node, childScope, i, ii, idx, childBoundTranscludeFn;
-+                        var stableNodeList;
- 
--                        // copy nodeList so that linking doesn't break due to live list updates.
--                        var nodeListLength = nodeList.length,
-+
-+                        if (nodeLinkFnFound) {
-+                            // copy nodeList so that if a nodeLinkFn removes or adds an element at this DOM level our
-+                            // offsets don't get screwed up
-+                            var nodeListLength = nodeList.length;
-                             stableNodeList = new Array(nodeListLength);
--                        for (i = 0; i < nodeListLength; i++) {
--                            stableNodeList[i] = nodeList[i];
-+
-+                            // create a sparse array by only copying the elements which have a linkFn
-+                            for (i = 0; i < linkFns.length; i += 3) {
-+                                idx = linkFns[i];
-+                                stableNodeList[idx] = nodeList[idx];
-+                            }
-+                        } else {
-+                            stableNodeList = nodeList;
-                         }
- 
--                        for(i = 0, n = 0, ii = linkFns.length; i < ii; n++) {
--                            node = stableNodeList[n];
-+                        for (i = 0, ii = linkFns.length; i < ii;) {
-+                            node = stableNodeList[linkFns[i++]];
-                             nodeLinkFn = linkFns[i++];
-                             childLinkFn = linkFns[i++];
--                            $node = jqLite(node);
- 
-                             if (nodeLinkFn) {
-                                 if (nodeLinkFn.scope) {
-                                     childScope = scope.$new();
--                                    $node.data('$scope', childScope);
-+                                    compile.$$addScopeInfo(jqLite(node), childScope);
-                                 } else {
-                                     childScope = scope;
-                                 }
--                                childTranscludeFn = nodeLinkFn.transclude;
--                                if (childTranscludeFn || (!boundTranscludeFn && transcludeFn)) {
--                                    nodeLinkFn(childLinkFn, childScope, node, $rootElement,
--                                        createBoundTranscludeFn(scope, childTranscludeFn || transcludeFn)
--                                    );
-+
-+                                if (nodeLinkFn.transcludeOnThisElement) {
-+                                    childBoundTranscludeFn = createBoundTranscludeFn(
-+                                        scope, nodeLinkFn.transclude, parentBoundTranscludeFn);
-+
-+                                } else if (!nodeLinkFn.templateOnThisElement && parentBoundTranscludeFn) {
-+                                    childBoundTranscludeFn = parentBoundTranscludeFn;
-+
-+                                } else if (!parentBoundTranscludeFn && transcludeFn) {
-+                                    childBoundTranscludeFn = createBoundTranscludeFn(scope, transcludeFn);
-+
-                                 } else {
--                                    nodeLinkFn(childLinkFn, childScope, node, $rootElement, boundTranscludeFn);
-+                                    childBoundTranscludeFn = null;
-                                 }
-+
-+                                nodeLinkFn(childLinkFn, childScope, node, $rootElement, childBoundTranscludeFn);
-+
-                             } else if (childLinkFn) {
--                                childLinkFn(scope, node.childNodes, undefined, boundTranscludeFn);
-+                                childLinkFn(scope, node.childNodes, undefined, parentBoundTranscludeFn);
-                             }
-                         }
-                     }
-                 }
- 
--                function createBoundTranscludeFn(scope, transcludeFn) {
--                    return function boundTranscludeFn(transcludedScope, cloneFn, controllers) {
--                        var scopeCreated = false;
-+                function mergeConsecutiveTextNodes(nodeList, idx, notLiveList) {
-+                    var node = nodeList[idx];
-+                    var parent = node.parentNode;
-+                    var sibling;
-+
-+                    if (node.nodeType !== NODE_TYPE_TEXT) {
-+                        return;
-+                    }
-+
-+                    while (true) {
-+                        sibling = parent ? node.nextSibling : nodeList[idx + 1];
-+                        if (!sibling || sibling.nodeType !== NODE_TYPE_TEXT) {
-+                            break;
-+                        }
-+
-+                        node.nodeValue = node.nodeValue + sibling.nodeValue;
-+
-+                        if (sibling.parentNode) {
-+                            sibling.parentNode.removeChild(sibling);
-+                        }
-+                        if (notLiveList && sibling === nodeList[idx + 1]) {
-+                            nodeList.splice(idx + 1, 1);
-+                        }
-+                    }
-+                }
-+
-+                function createBoundTranscludeFn(scope, transcludeFn, previousBoundTranscludeFn) {
-+                    function boundTranscludeFn(transcludedScope, cloneFn, controllers, futureParentElement, containingScope) {
- 
-                         if (!transcludedScope) {
--                            transcludedScope = scope.$new();
-+                            transcludedScope = scope.$new(false, containingScope);
-                             transcludedScope.$$transcluded = true;
--                            scopeCreated = true;
-                         }
- 
--                        var clone = transcludeFn(transcludedScope, cloneFn, controllers);
--                        if (scopeCreated) {
--                            clone.on('$destroy', bind(transcludedScope, transcludedScope.$destroy));
-+                        return transcludeFn(transcludedScope, cloneFn, {
-+                            parentBoundTranscludeFn: previousBoundTranscludeFn,
-+                            transcludeControllers: controllers,
-+                            futureParentElement: futureParentElement
-+                        });
-+                    }
-+
-+                    // We need  to attach the transclusion slots onto the `boundTranscludeFn`
-+                    // so that they are available inside the `controllersBoundTransclude` function
-+                    var boundSlots = boundTranscludeFn.$$slots = createMap();
-+                    for (var slotName in transcludeFn.$$slots) {
-+                        if (transcludeFn.$$slots[slotName]) {
-+                            boundSlots[slotName] = createBoundTranscludeFn(scope, transcludeFn.$$slots[slotName], previousBoundTranscludeFn);
-+                        } else {
-+                            boundSlots[slotName] = null;
-                         }
--                        return clone;
--                    };
-+                    }
-+
-+                    return boundTranscludeFn;
-                 }
- 
-                 /**
-@@ -6024,52 +9323,73 @@
-                     var nodeType = node.nodeType,
-                         attrsMap = attrs.$attr,
-                         match,
-+                        nodeName,
-                         className;
- 
--                    switch(nodeType) {
--                        case 1: /* Element */
-+                    switch (nodeType) {
-+                        case NODE_TYPE_ELEMENT: /* Element */
-+
-+                            nodeName = nodeName_(node);
-+
-                             // use the node name: <directive>
-                             addDirective(directives,
--                                directiveNormalize(nodeName_(node).toLowerCase()), 'E', maxPriority, ignoreDirective);
-+                                directiveNormalize(nodeName), 'E', maxPriority, ignoreDirective);
- 
-                             // iterate over the attributes
--                            for (var attr, name, nName, ngAttrName, value, nAttrs = node.attributes,
-+                            for (var attr, name, nName, ngAttrName, value, isNgAttr, nAttrs = node.attributes,
-                                      j = 0, jj = nAttrs && nAttrs.length; j < jj; j++) {
-                                 var attrStartName = false;
-                                 var attrEndName = false;
- 
-                                 attr = nAttrs[j];
--                                if (!msie || msie >= 8 || attr.specified) {
--                                    name = attr.name;
--                                    // support ngAttr attribute binding
--                                    ngAttrName = directiveNormalize(name);
--                                    if (NG_ATTR_BINDING.test(ngAttrName)) {
--                                        name = snake_case(ngAttrName.substr(6), '-');
--                                    }
-+                                name = attr.name;
-+                                value = attr.value;
-+
-+                                // support ngAttr attribute binding
-+                                ngAttrName = directiveNormalize(name);
-+                                isNgAttr = NG_ATTR_BINDING.test(ngAttrName);
-+                                if (isNgAttr) {
-+                                    name = name.replace(PREFIX_REGEXP, '')
-+                                        .substr(8).replace(/_(.)/g, function(match, letter) {
-+                                            return letter.toUpperCase();
-+                                        });
-+                                }
- 
--                                    var directiveNName = ngAttrName.replace(/(Start|End)$/, '');
--                                    if (ngAttrName === directiveNName + 'Start') {
--                                        attrStartName = name;
--                                        attrEndName = name.substr(0, name.length - 5) + 'end';
--                                        name = name.substr(0, name.length - 6);
--                                    }
-+                                var multiElementMatch = ngAttrName.match(MULTI_ELEMENT_DIR_RE);
-+                                if (multiElementMatch && directiveIsMultiElement(multiElementMatch[1])) {
-+                                    attrStartName = name;
-+                                    attrEndName = name.substr(0, name.length - 5) + 'end';
-+                                    name = name.substr(0, name.length - 6);
-+                                }
- 
--                                    nName = directiveNormalize(name.toLowerCase());
--                                    attrsMap[nName] = name;
--                                    attrs[nName] = value = trim(attr.value);
-+                                nName = directiveNormalize(name.toLowerCase());
-+                                attrsMap[nName] = name;
-+                                if (isNgAttr || !attrs.hasOwnProperty(nName)) {
-+                                    attrs[nName] = value;
-                                     if (getBooleanAttrName(node, nName)) {
-                                         attrs[nName] = true; // presence means true
-                                     }
--                                    addAttrInterpolateDirective(node, directives, value, nName);
--                                    addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName,
--                                        attrEndName);
-                                 }
-+                                addAttrInterpolateDirective(node, directives, value, nName, isNgAttr);
-+                                addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName,
-+                                    attrEndName);
-+                            }
-+
-+                            if (nodeName === 'input' && node.getAttribute('type') === 'hidden') {
-+                                // Hidden input elements can have strange behaviour when navigating back to the page
-+                                // This tells the browser not to try to cache and reinstate previous values
-+                                node.setAttribute('autocomplete', 'off');
-                             }
- 
-                             // use class as directive
-+                            if (!cssClassDirectivesEnabled) break;
-                             className = node.className;
-+                            if (isObject(className)) {
-+                                // Maybe SVGAnimatedString
-+                                className = className.animVal;
-+                            }
-                             if (isString(className) && className !== '') {
--                                while (match = CLASS_DIRECTIVE_REGEXP.exec(className)) {
-+                                while ((match = CLASS_DIRECTIVE_REGEXP.exec(className))) {
-                                     nName = directiveNormalize(match[2]);
-                                     if (addDirective(directives, nName, 'C', maxPriority, ignoreDirective)) {
-                                         attrs[nName] = trim(match[3]);
-@@ -6078,23 +9398,12 @@
-                                 }
-                             }
-                             break;
--                        case 3: /* Text Node */
-+                        case NODE_TYPE_TEXT: /* Text Node */
-                             addTextInterpolateDirective(directives, node.nodeValue);
-                             break;
--                        case 8: /* Comment */
--                            try {
--                                match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
--                                if (match) {
--                                    nName = directiveNormalize(match[1]);
--                                    if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
--                                        attrs[nName] = trim(match[2]);
--                                    }
--                                }
--                            } catch (e) {
--                                // turns out that under some circumstances IE9 throws errors when one attempts to read
--                                // comment's node value.
--                                // Just ignore it and continue. (Can't seem to reproduce in test case.)
--                            }
-+                        case NODE_TYPE_COMMENT: /* Comment */
-+                            if (!commentDirectivesEnabled) break;
-+                            collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective);
-                             break;
-                     }
- 
-@@ -6102,8 +9411,26 @@
-                     return directives;
-                 }
- 
-+                function collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective) {
-+                    // function created because of performance, try/catch disables
-+                    // the optimization of the whole function #14848
-+                    try {
-+                        var match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
-+                        if (match) {
-+                            var nName = directiveNormalize(match[1]);
-+                            if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
-+                                attrs[nName] = trim(match[2]);
-+                            }
-+                        }
-+                    } catch (e) {
-+                        // turns out that under some circumstances IE9 throws errors when one attempts to read
-+                        // comment's node value.
-+                        // Just ignore it and continue. (Can't seem to reproduce in test case.)
-+                    }
-+                }
-+
-                 /**
--                 * Given a node with an directive-start it collects all of the siblings until it finds
-+                 * Given a node with a directive-start it collects all of the siblings until it finds
-                  * directive-end.
-                  * @param node
-                  * @param attrStart
-@@ -6114,14 +9441,13 @@
-                     var nodes = [];
-                     var depth = 0;
-                     if (attrStart && node.hasAttribute && node.hasAttribute(attrStart)) {
--                        var startNode = node;
-                         do {
-                             if (!node) {
-                                 throw $compileMinErr('uterdir',
--                                    "Unterminated attribute, found '{0}' but no matching '{1}' found.",
-+                                    'Unterminated attribute, found \'{0}\' but no matching \'{1}\' found.',
-                                     attrStart, attrEnd);
-                             }
--                            if (node.nodeType == 1 /** Element **/) {
-+                            if (node.nodeType === NODE_TYPE_ELEMENT) {
-                                 if (node.hasAttribute(attrStart)) depth++;
-                                 if (node.hasAttribute(attrEnd)) depth--;
-                             }
-@@ -6144,12 +9470,41 @@
-                  * @returns {Function}
-                  */
-                 function groupElementsLinkFnWrapper(linkFn, attrStart, attrEnd) {
--                    return function(scope, element, attrs, controllers, transcludeFn) {
-+                    return function groupedElementsLink(scope, element, attrs, controllers, transcludeFn) {
-                         element = groupScan(element[0], attrStart, attrEnd);
-                         return linkFn(scope, element, attrs, controllers, transcludeFn);
-                     };
-                 }
- 
-+                /**
-+                 * A function generator that is used to support both eager and lazy compilation
-+                 * linking function.
-+                 * @param eager
-+                 * @param $compileNodes
-+                 * @param transcludeFn
-+                 * @param maxPriority
-+                 * @param ignoreDirective
-+                 * @param previousCompileContext
-+                 * @returns {Function}
-+                 */
-+                function compilationGenerator(eager, $compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext) {
-+                    var compiled;
-+
-+                    if (eager) {
-+                        return compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext);
-+                    }
-+                    return /** @this */ function lazyCompilation() {
-+                        if (!compiled) {
-+                            compiled = compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext);
-+
-+                            // Null out all of these references in order to make them eligible for garbage collection
-+                            // since this is a potentially long lived closure
-+                            $compileNodes = transcludeFn = previousCompileContext = null;
-+                        }
-+                        return compiled.apply(this, arguments);
-+                    };
-+                }
-+
-                 /**
-                  * Once the directives have been collected, their compile functions are executed. This method
-                  * is responsible for inlining directive templates as well as terminating the application
-@@ -6179,12 +9534,13 @@
-                     previousCompileContext = previousCompileContext || {};
- 
-                     var terminalPriority = -Number.MAX_VALUE,
--                        newScopeDirective,
-+                        newScopeDirective = previousCompileContext.newScopeDirective,
-                         controllerDirectives = previousCompileContext.controllerDirectives,
-                         newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective,
-                         templateDirective = previousCompileContext.templateDirective,
-                         nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective,
-                         hasTranscludeDirective = false,
-+                        hasTemplate = false,
-                         hasElementTranscludeDirective = previousCompileContext.hasElementTranscludeDirective,
-                         $compileNode = templateAttrs.$$element = jqLite(compileNode),
-                         directive,
-@@ -6193,10 +9549,12 @@
-                         replaceDirective = originalReplaceDirective,
-                         childTranscludeFn = transcludeFn,
-                         linkFn,
-+                        didScanForMultipleTransclusion = false,
-+                        mightHaveMultipleTransclusionError = false,
-                         directiveValue;
- 
-                     // executes all directives on the current element
--                    for(var i = 0, ii = directives.length; i < ii; i++) {
-+                    for (var i = 0, ii = directives.length; i < ii; i++) {
-                         directive = directives[i];
-                         var attrStart = directive.$$start;
-                         var attrEnd = directive.$$end;
-@@ -6211,31 +9569,63 @@
-                             break; // prevent further processing of directives
-                         }
- 
--                        if (directiveValue = directive.scope) {
--                            newScopeDirective = newScopeDirective || directive;
-+                        directiveValue = directive.scope;
-+
-+                        if (directiveValue) {
- 
-                             // skip the check for directives with async templates, we'll check the derived sync
-                             // directive when the template arrives
-                             if (!directive.templateUrl) {
--                                assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive,
--                                    $compileNode);
-                                 if (isObject(directiveValue)) {
-+                                    // This directive is trying to add an isolated scope.
-+                                    // Check that there is no scope of any kind already
-+                                    assertNoDuplicate('new/isolated scope', newIsolateScopeDirective || newScopeDirective,
-+                                        directive, $compileNode);
-                                     newIsolateScopeDirective = directive;
-+                                } else {
-+                                    // This directive is trying to add a child scope.
-+                                    // Check that there is no isolated scope already
-+                                    assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive,
-+                                        $compileNode);
-                                 }
-                             }
-+
-+                            newScopeDirective = newScopeDirective || directive;
-                         }
- 
-                         directiveName = directive.name;
- 
-+                        // If we encounter a condition that can result in transclusion on the directive,
-+                        // then scan ahead in the remaining directives for others that may cause a multiple
-+                        // transclusion error to be thrown during the compilation process.  If a matching directive
-+                        // is found, then we know that when we encounter a transcluded directive, we need to eagerly
-+                        // compile the `transclude` function rather than doing it lazily in order to throw
-+                        // exceptions at the correct time
-+                        if (!didScanForMultipleTransclusion && ((directive.replace && (directive.templateUrl || directive.template))
-+                            || (directive.transclude && !directive.$$tlb))) {
-+                            var candidateDirective;
-+
-+                            for (var scanningIndex = i + 1; (candidateDirective = directives[scanningIndex++]);) {
-+                                if ((candidateDirective.transclude && !candidateDirective.$$tlb)
-+                                    || (candidateDirective.replace && (candidateDirective.templateUrl || candidateDirective.template))) {
-+                                    mightHaveMultipleTransclusionError = true;
-+                                    break;
-+                                }
-+                            }
-+
-+                            didScanForMultipleTransclusion = true;
-+                        }
-+
-                         if (!directive.templateUrl && directive.controller) {
--                            directiveValue = directive.controller;
--                            controllerDirectives = controllerDirectives || {};
--                            assertNoDuplicate("'" + directiveName + "' controller",
-+                            controllerDirectives = controllerDirectives || createMap();
-+                            assertNoDuplicate('\'' + directiveName + '\' controller',
-                                 controllerDirectives[directiveName], directive, $compileNode);
-                             controllerDirectives[directiveName] = directive;
-                         }
- 
--                        if (directiveValue = directive.transclude) {
-+                        directiveValue = directive.transclude;
-+
-+                        if (directiveValue) {
-                             hasTranscludeDirective = true;
- 
-                             // Special case ngIf and ngRepeat so that we don't complain about duplicate transclusion.
-@@ -6246,17 +9636,27 @@
-                                 nonTlbTranscludeDirective = directive;
-                             }
- 
--                            if (directiveValue == 'element') {
-+                            if (directiveValue === 'element') {
-                                 hasElementTranscludeDirective = true;
-                                 terminalPriority = directive.priority;
--                                $template = groupScan(compileNode, attrStart, attrEnd);
-+                                $template = $compileNode;
-                                 $compileNode = templateAttrs.$$element =
--                                    jqLite(document.createComment(' ' + directiveName + ': ' +
--                                    templateAttrs[directiveName] + ' '));
-+                                    jqLite(compile.$$createComment(directiveName, templateAttrs[directiveName]));
-                                 compileNode = $compileNode[0];
--                                replaceWith(jqCollection, jqLite(sliceArgs($template)), compileNode);
-+                                replaceWith(jqCollection, sliceArgs($template), compileNode);
- 
--                                childTranscludeFn = compile($template, transcludeFn, terminalPriority,
-+                                // Support: Chrome < 50
-+                                // https://github.com/angular/angular.js/issues/14041
-+
-+                                // In the versions of V8 prior to Chrome 50, the document fragment that is created
-+                                // in the `replaceWith` function is improperly garbage collected despite still
-+                                // being referenced by the `parentNode` property of all of the child nodes.  By adding
-+                                // a reference to the fragment via a different property, we can avoid that incorrect
-+                                // behavior.
-+                                // TODO: remove this line after Chrome 50 has been released
-+                                $template[0].$$parentNode = $template[0].parentNode;
-+
-+                                childTranscludeFn = compilationGenerator(mightHaveMultipleTransclusionError, $template, transcludeFn, terminalPriority,
-                                     replaceDirective && replaceDirective.name, {
-                                         // Don't pass in:
-                                         // - controllerDirectives - otherwise we'll create duplicates controllers
-@@ -6268,19 +9668,80 @@
-                                         nonTlbTranscludeDirective: nonTlbTranscludeDirective
-                                     });
-                             } else {
--                                $template = jqLite(jqLiteClone(compileNode)).contents();
--                                $compileNode.empty(); // clear contents
--                                childTranscludeFn = compile($template, transcludeFn);
--                            }
--                        }
- 
--                        if (directive.template) {
--                            assertNoDuplicate('template', templateDirective, directive, $compileNode);
--                            templateDirective = directive;
-+                                var slots = createMap();
- 
--                            directiveValue = (isFunction(directive.template))
--                                ? directive.template($compileNode, templateAttrs)
--                                : directive.template;
-+                                if (!isObject(directiveValue)) {
-+                                    $template = jqLite(jqLiteClone(compileNode)).contents();
-+                                } else {
-+
-+                                    // We have transclusion slots,
-+                                    // collect them up, compile them and store their transclusion functions
-+                                    $template = [];
-+
-+                                    var slotMap = createMap();
-+                                    var filledSlots = createMap();
-+
-+                                    // Parse the element selectors
-+                                    forEach(directiveValue, function(elementSelector, slotName) {
-+                                        // If an element selector starts with a ? then it is optional
-+                                        var optional = (elementSelector.charAt(0) === '?');
-+                                        elementSelector = optional ? elementSelector.substring(1) : elementSelector;
-+
-+                                        slotMap[elementSelector] = slotName;
-+
-+                                        // We explicitly assign `null` since this implies that a slot was defined but not filled.
-+                                        // Later when calling boundTransclusion functions with a slot name we only error if the
-+                                        // slot is `undefined`
-+                                        slots[slotName] = null;
-+
-+                                        // filledSlots contains `true` for all slots that are either optional or have been
-+                                        // filled. This is used to check that we have not missed any required slots
-+                                        filledSlots[slotName] = optional;
-+                                    });
-+
-+                                    // Add the matching elements into their slot
-+                                    forEach($compileNode.contents(), function(node) {
-+                                        var slotName = slotMap[directiveNormalize(nodeName_(node))];
-+                                        if (slotName) {
-+                                            filledSlots[slotName] = true;
-+                                            slots[slotName] = slots[slotName] || [];
-+                                            slots[slotName].push(node);
-+                                        } else {
-+                                            $template.push(node);
-+                                        }
-+                                    });
-+
-+                                    // Check for required slots that were not filled
-+                                    forEach(filledSlots, function(filled, slotName) {
-+                                        if (!filled) {
-+                                            throw $compileMinErr('reqslot', 'Required transclusion slot `{0}` was not filled.', slotName);
-+                                        }
-+                                    });
-+
-+                                    for (var slotName in slots) {
-+                                        if (slots[slotName]) {
-+                                            // Only define a transclusion function if the slot was filled
-+                                            slots[slotName] = compilationGenerator(mightHaveMultipleTransclusionError, slots[slotName], transcludeFn);
-+                                        }
-+                                    }
-+                                }
-+
-+                                $compileNode.empty(); // clear contents
-+                                childTranscludeFn = compilationGenerator(mightHaveMultipleTransclusionError, $template, transcludeFn, undefined,
-+                                    undefined, { needsNewScope: directive.$$isolateScope || directive.$$newScope});
-+                                childTranscludeFn.$$slots = slots;
-+                            }
-+                        }
-+
-+                        if (directive.template) {
-+                            hasTemplate = true;
-+                            assertNoDuplicate('template', templateDirective, directive, $compileNode);
-+                            templateDirective = directive;
-+
-+                            directiveValue = (isFunction(directive.template))
-+                                ? directive.template($compileNode, templateAttrs)
-+                                : directive.template;
- 
-                             directiveValue = denormalizeTemplate(directiveValue);
- 
-@@ -6289,13 +9750,13 @@
-                                 if (jqLiteIsTextNode(directiveValue)) {
-                                     $template = [];
-                                 } else {
--                                    $template = jqLite(directiveValue);
-+                                    $template = removeComments(wrapTemplate(directive.templateNamespace, trim(directiveValue)));
-                                 }
-                                 compileNode = $template[0];
- 
--                                if ($template.length != 1 || compileNode.nodeType !== 1) {
-+                                if ($template.length !== 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) {
-                                     throw $compileMinErr('tplrt',
--                                        "Template for directive '{0}' must have exactly one root element. {1}",
-+                                        'Template for directive \'{0}\' must have exactly one root element. {1}',
-                                         directiveName, '');
-                                 }
- 
-@@ -6311,8 +9772,11 @@
-                                 var templateDirectives = collectDirectives(compileNode, [], newTemplateAttrs);
-                                 var unprocessedDirectives = directives.splice(i + 1, directives.length - (i + 1));
- 
--                                if (newIsolateScopeDirective) {
--                                    markDirectivesAsIsolate(templateDirectives);
-+                                if (newIsolateScopeDirective || newScopeDirective) {
-+                                    // The original directive caused the current element to be replaced but this element
-+                                    // also needs to have a new scope, so we need to tell the template directives
-+                                    // that they would need to get their scope from further up, if they require transclusion
-+                                    markDirectiveScope(templateDirectives, newIsolateScopeDirective, newScopeDirective);
-                                 }
-                                 directives = directives.concat(templateDirectives).concat(unprocessedDirectives);
-                                 mergeTemplateAttributes(templateAttrs, newTemplateAttrs);
-@@ -6324,6 +9788,7 @@
-                         }
- 
-                         if (directive.templateUrl) {
-+                            hasTemplate = true;
-                             assertNoDuplicate('template', templateDirective, directive, $compileNode);
-                             templateDirective = directive;
- 
-@@ -6331,9 +9796,11 @@
-                                 replaceDirective = directive;
-                             }
- 
-+                            // eslint-disable-next-line no-func-assign
-                             nodeLinkFn = compileTemplateUrl(directives.splice(i, directives.length - i), $compileNode,
--                                templateAttrs, jqCollection, childTranscludeFn, preLinkFns, postLinkFns, {
-+                                templateAttrs, jqCollection, hasTranscludeDirective && childTranscludeFn, preLinkFns, postLinkFns, {
-                                     controllerDirectives: controllerDirectives,
-+                                    newScopeDirective: (newScopeDirective !== directive) && newScopeDirective,
-                                     newIsolateScopeDirective: newIsolateScopeDirective,
-                                     templateDirective: templateDirective,
-                                     nonTlbTranscludeDirective: nonTlbTranscludeDirective
-@@ -6342,10 +9809,11 @@
-                         } else if (directive.compile) {
-                             try {
-                                 linkFn = directive.compile($compileNode, templateAttrs, childTranscludeFn);
-+                                var context = directive.$$originalDirective || directive;
-                                 if (isFunction(linkFn)) {
--                                    addLinkFns(null, linkFn, attrStart, attrEnd);
-+                                    addLinkFns(null, bind(context, linkFn), attrStart, attrEnd);
-                                 } else if (linkFn) {
--                                    addLinkFns(linkFn.pre, linkFn.post, attrStart, attrEnd);
-+                                    addLinkFns(bind(context, linkFn.pre), bind(context, linkFn.post), attrStart, attrEnd);
-                                 }
-                             } catch (e) {
-                                 $exceptionHandler(e, startingTag($compileNode));
-@@ -6360,7 +9828,10 @@
-                     }
- 
-                     nodeLinkFn.scope = newScopeDirective && newScopeDirective.scope === true;
--                    nodeLinkFn.transclude = hasTranscludeDirective && childTranscludeFn;
-+                    nodeLinkFn.transcludeOnThisElement = hasTranscludeDirective;
-+                    nodeLinkFn.templateOnThisElement = hasTemplate;
-+                    nodeLinkFn.transclude = childTranscludeFn;
-+
-                     previousCompileContext.hasElementTranscludeDirective = hasElementTranscludeDirective;
- 
-                     // might be normal or delayed nodeLinkFn depending on if templateUrl is present
-@@ -6372,6 +9843,7 @@
-                         if (pre) {
-                             if (attrStart) pre = groupElementsLinkFnWrapper(pre, attrStart, attrEnd);
-                             pre.require = directive.require;
-+                            pre.directiveName = directiveName;
-                             if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
-                                 pre = cloneAndAnnotateFn(pre, {isolateScope: true});
-                             }
-@@ -6380,6 +9852,7 @@
-                         if (post) {
-                             if (attrStart) post = groupElementsLinkFnWrapper(post, attrStart, attrEnd);
-                             post.require = directive.require;
-+                            post.directiveName = directiveName;
-                             if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
-                                 post = cloneAndAnnotateFn(post, {isolateScope: true});
-                             }
-@@ -6387,180 +9860,135 @@
-                         }
-                     }
- 
--
--                    function getControllers(require, $element, elementControllers) {
--                        var value, retrievalMethod = 'data', optional = false;
--                        if (isString(require)) {
--                            while((value = require.charAt(0)) == '^' || value == '?') {
--                                require = require.substr(1);
--                                if (value == '^') {
--                                    retrievalMethod = 'inheritedData';
--                                }
--                                optional = optional || value == '?';
--                            }
--                            value = null;
--
--                            if (elementControllers && retrievalMethod === 'data') {
--                                value = elementControllers[require];
--                            }
--                            value = value || $element[retrievalMethod]('$' + require + 'Controller');
--
--                            if (!value && !optional) {
--                                throw $compileMinErr('ctreq',
--                                    "Controller '{0}', required by directive '{1}', can't be found!",
--                                    require, directiveName);
--                            }
--                            return value;
--                        } else if (isArray(require)) {
--                            value = [];
--                            forEach(require, function(require) {
--                                value.push(getControllers(require, $element, elementControllers));
--                            });
--                        }
--                        return value;
--                    }
--
--
-                     function nodeLinkFn(childLinkFn, scope, linkNode, $rootElement, boundTranscludeFn) {
--                        var attrs, $element, i, ii, linkFn, controller, isolateScope, elementControllers = {}, transcludeFn;
-+                        var i, ii, linkFn, isolateScope, controllerScope, elementControllers, transcludeFn, $element,
-+                            attrs, scopeBindingInfo;
- 
-                         if (compileNode === linkNode) {
-                             attrs = templateAttrs;
-+                            $element = templateAttrs.$$element;
-                         } else {
--                            attrs = shallowCopy(templateAttrs, new Attributes(jqLite(linkNode), templateAttrs.$attr));
-+                            $element = jqLite(linkNode);
-+                            attrs = new Attributes($element, templateAttrs);
-                         }
--                        $element = attrs.$$element;
- 
-+                        controllerScope = scope;
-                         if (newIsolateScopeDirective) {
--                            var LOCAL_REGEXP = /^\s*([@=&])(\??)\s*(\w*)\s*$/;
--                            var $linkNode = jqLite(linkNode);
--
-                             isolateScope = scope.$new(true);
-+                        } else if (newScopeDirective) {
-+                            controllerScope = scope.$parent;
-+                        }
- 
--                            if (templateDirective && (templateDirective === newIsolateScopeDirective.$$originalDirective)) {
--                                $linkNode.data('$isolateScope', isolateScope) ;
--                            } else {
--                                $linkNode.data('$isolateScopeNoTemplate', isolateScope);
--                            }
--
--
--
--                            safeAddClass($linkNode, 'ng-isolate-scope');
-+                        if (boundTranscludeFn) {
-+                            // track `boundTranscludeFn` so it can be unwrapped if `transcludeFn`
-+                            // is later passed as `parentBoundTranscludeFn` to `publicLinkFn`
-+                            transcludeFn = controllersBoundTransclude;
-+                            transcludeFn.$$boundTransclude = boundTranscludeFn;
-+                            // expose the slots on the `$transclude` function
-+                            transcludeFn.isSlotFilled = function(slotName) {
-+                                return !!boundTranscludeFn.$$slots[slotName];
-+                            };
-+                        }
- 
--                            forEach(newIsolateScopeDirective.scope, function(definition, scopeName) {
--                                var match = definition.match(LOCAL_REGEXP) || [],
--                                    attrName = match[3] || scopeName,
--                                    optional = (match[2] == '?'),
--                                    mode = match[1], // @, =, or &
--                                    lastValue,
--                                    parentGet, parentSet, compare;
-+                        if (controllerDirectives) {
-+                            elementControllers = setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope, newIsolateScopeDirective);
-+                        }
- 
--                                isolateScope.$$isolateBindings[scopeName] = mode + attrName;
-+                        if (newIsolateScopeDirective) {
-+                            // Initialize isolate scope bindings for new isolate scope directive.
-+                            compile.$$addScopeInfo($element, isolateScope, true, !(templateDirective && (templateDirective === newIsolateScopeDirective ||
-+                                templateDirective === newIsolateScopeDirective.$$originalDirective)));
-+                            compile.$$addScopeClass($element, true);
-+                            isolateScope.$$isolateBindings =
-+                                newIsolateScopeDirective.$$isolateBindings;
-+                            scopeBindingInfo = initializeDirectiveBindings(scope, attrs, isolateScope,
-+                                isolateScope.$$isolateBindings,
-+                                newIsolateScopeDirective);
-+                            if (scopeBindingInfo.removeWatches) {
-+                                isolateScope.$on('$destroy', scopeBindingInfo.removeWatches);
-+                            }
-+                        }
- 
--                                switch (mode) {
-+                        // Initialize bindToController bindings
-+                        for (var name in elementControllers) {
-+                            var controllerDirective = controllerDirectives[name];
-+                            var controller = elementControllers[name];
-+                            var bindings = controllerDirective.$$bindings.bindToController;
- 
--                                    case '@':
--                                        attrs.$observe(attrName, function(value) {
--                                            isolateScope[scopeName] = value;
--                                        });
--                                        attrs.$$observers[attrName].$$scope = scope;
--                                        if( attrs[attrName] ) {
--                                            // If the attribute has been provided then we trigger an interpolation to ensure
--                                            // the value is there for use in the link fn
--                                            isolateScope[scopeName] = $interpolate(attrs[attrName])(scope);
--                                        }
--                                        break;
-+                            if (preAssignBindingsEnabled) {
-+                                if (bindings) {
-+                                    controller.bindingInfo =
-+                                        initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
-+                                } else {
-+                                    controller.bindingInfo = {};
-+                                }
- 
--                                    case '=':
--                                        if (optional && !attrs[attrName]) {
--                                            return;
--                                        }
--                                        parentGet = $parse(attrs[attrName]);
--                                        if (parentGet.literal) {
--                                            compare = equals;
--                                        } else {
--                                            compare = function(a,b) { return a === b; };
--                                        }
--                                        parentSet = parentGet.assign || function() {
--                                            // reset the change, or we will throw this exception on every $digest
--                                            lastValue = isolateScope[scopeName] = parentGet(scope);
--                                            throw $compileMinErr('nonassign',
--                                                "Expression '{0}' used with directive '{1}' is non-assignable!",
--                                                attrs[attrName], newIsolateScopeDirective.name);
--                                        };
--                                        lastValue = isolateScope[scopeName] = parentGet(scope);
--                                        isolateScope.$watch(function parentValueWatch() {
--                                            var parentValue = parentGet(scope);
--                                            if (!compare(parentValue, isolateScope[scopeName])) {
--                                                // we are out of sync and need to copy
--                                                if (!compare(parentValue, lastValue)) {
--                                                    // parent changed and it has precedence
--                                                    isolateScope[scopeName] = parentValue;
--                                                } else {
--                                                    // if the parent can be assigned then do so
--                                                    parentSet(scope, parentValue = isolateScope[scopeName]);
--                                                }
--                                            }
--                                            return lastValue = parentValue;
--                                        }, null, parentGet.literal);
--                                        break;
--
--                                    case '&':
--                                        parentGet = $parse(attrs[attrName]);
--                                        isolateScope[scopeName] = function(locals) {
--                                            return parentGet(scope, locals);
--                                        };
--                                        break;
--
--                                    default:
--                                        throw $compileMinErr('iscp',
--                                            "Invalid isolate scope definition for directive '{0}'." +
--                                            " Definition: {... {1}: '{2}' ...}",
--                                            newIsolateScopeDirective.name, scopeName, definition);
-+                                var controllerResult = controller();
-+                                if (controllerResult !== controller.instance) {
-+                                    // If the controller constructor has a return value, overwrite the instance
-+                                    // from setupControllers
-+                                    controller.instance = controllerResult;
-+                                    $element.data('$' + controllerDirective.name + 'Controller', controllerResult);
-+                                    if (controller.bindingInfo.removeWatches) {
-+                                        controller.bindingInfo.removeWatches();
-+                                    }
-+                                    controller.bindingInfo =
-+                                        initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
-                                 }
--                            });
-+                            } else {
-+                                controller.instance = controller();
-+                                $element.data('$' + controllerDirective.name + 'Controller', controller.instance);
-+                                controller.bindingInfo =
-+                                    initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
-+                            }
-                         }
--                        transcludeFn = boundTranscludeFn && controllersBoundTransclude;
--                        if (controllerDirectives) {
--                            forEach(controllerDirectives, function(directive) {
--                                var locals = {
--                                    $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
--                                    $element: $element,
--                                    $attrs: attrs,
--                                    $transclude: transcludeFn
--                                }, controllerInstance;
--
--                                controller = directive.controller;
--                                if (controller == '@') {
--                                    controller = attrs[directive.name];
--                                }
- 
--                                controllerInstance = $controller(controller, locals);
--                                // For directives with element transclusion the element is a comment,
--                                // but jQuery .data doesn't support attaching data to comment nodes as it's hard to
--                                // clean up (http://bugs.jquery.com/ticket/8335).
--                                // Instead, we save the controllers for the element in a local hash and attach to .data
--                                // later, once we have the actual element.
--                                elementControllers[directive.name] = controllerInstance;
--                                if (!hasElementTranscludeDirective) {
--                                    $element.data('$' + directive.name + 'Controller', controllerInstance);
--                                }
-+                        // Bind the required controllers to the controller, if `require` is an object and `bindToController` is truthy
-+                        forEach(controllerDirectives, function(controllerDirective, name) {
-+                            var require = controllerDirective.require;
-+                            if (controllerDirective.bindToController && !isArray(require) && isObject(require)) {
-+                                extend(elementControllers[name].instance, getControllers(name, require, $element, elementControllers));
-+                            }
-+                        });
- 
--                                if (directive.controllerAs) {
--                                    locals.$scope[directive.controllerAs] = controllerInstance;
-+                        // Handle the init and destroy lifecycle hooks on all controllers that have them
-+                        forEach(elementControllers, function(controller) {
-+                            var controllerInstance = controller.instance;
-+                            if (isFunction(controllerInstance.$onChanges)) {
-+                                try {
-+                                    controllerInstance.$onChanges(controller.bindingInfo.initialChanges);
-+                                } catch (e) {
-+                                    $exceptionHandler(e);
-                                 }
--                            });
--                        }
-+                            }
-+                            if (isFunction(controllerInstance.$onInit)) {
-+                                try {
-+                                    controllerInstance.$onInit();
-+                                } catch (e) {
-+                                    $exceptionHandler(e);
-+                                }
-+                            }
-+                            if (isFunction(controllerInstance.$doCheck)) {
-+                                controllerScope.$watch(function() { controllerInstance.$doCheck(); });
-+                                controllerInstance.$doCheck();
-+                            }
-+                            if (isFunction(controllerInstance.$onDestroy)) {
-+                                controllerScope.$on('$destroy', function callOnDestroyHook() {
-+                                    controllerInstance.$onDestroy();
-+                                });
-+                            }
-+                        });
- 
-                         // PRELINKING
--                        for(i = 0, ii = preLinkFns.length; i < ii; i++) {
--                            try {
--                                linkFn = preLinkFns[i];
--                                linkFn(linkFn.isolateScope ? isolateScope : scope, $element, attrs,
--                                    linkFn.require && getControllers(linkFn.require, $element, elementControllers), transcludeFn);
--                            } catch (e) {
--                                $exceptionHandler(e, startingTag($element));
--                            }
-+                        for (i = 0, ii = preLinkFns.length; i < ii; i++) {
-+                            linkFn = preLinkFns[i];
-+                            invokeLinkFn(linkFn,
-+                                linkFn.isolateScope ? isolateScope : scope,
-+                                $element,
-+                                attrs,
-+                                linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers),
-+                                transcludeFn
-+                            );
-                         }
- 
-                         // RECURSION
-@@ -6570,25 +9998,38 @@
-                         if (newIsolateScopeDirective && (newIsolateScopeDirective.template || newIsolateScopeDirective.templateUrl === null)) {
-                             scopeToChild = isolateScope;
-                         }
--                        childLinkFn && childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn);
-+                        if (childLinkFn) {
-+                            childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn);
-+                        }
- 
-                         // POSTLINKING
--                        for(i = postLinkFns.length - 1; i >= 0; i--) {
--                            try {
--                                linkFn = postLinkFns[i];
--                                linkFn(linkFn.isolateScope ? isolateScope : scope, $element, attrs,
--                                    linkFn.require && getControllers(linkFn.require, $element, elementControllers), transcludeFn);
--                            } catch (e) {
--                                $exceptionHandler(e, startingTag($element));
--                            }
-+                        for (i = postLinkFns.length - 1; i >= 0; i--) {
-+                            linkFn = postLinkFns[i];
-+                            invokeLinkFn(linkFn,
-+                                linkFn.isolateScope ? isolateScope : scope,
-+                                $element,
-+                                attrs,
-+                                linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers),
-+                                transcludeFn
-+                            );
-                         }
- 
-+                        // Trigger $postLink lifecycle hooks
-+                        forEach(elementControllers, function(controller) {
-+                            var controllerInstance = controller.instance;
-+                            if (isFunction(controllerInstance.$postLink)) {
-+                                controllerInstance.$postLink();
-+                            }
-+                        });
-+
-                         // This is the function that is injected as `$transclude`.
--                        function controllersBoundTransclude(scope, cloneAttachFn) {
-+                        // Note: all arguments are optional!
-+                        function controllersBoundTransclude(scope, cloneAttachFn, futureParentElement, slotName) {
-                             var transcludeControllers;
--
--                            // no scope passed
--                            if (arguments.length < 2) {
-+                            // No scope passed in:
-+                            if (!isScope(scope)) {
-+                                slotName = futureParentElement;
-+                                futureParentElement = cloneAttachFn;
-                                 cloneAttachFn = scope;
-                                 scope = undefined;
-                             }
-@@ -6596,16 +10037,111 @@
-                             if (hasElementTranscludeDirective) {
-                                 transcludeControllers = elementControllers;
-                             }
-+                            if (!futureParentElement) {
-+                                futureParentElement = hasElementTranscludeDirective ? $element.parent() : $element;
-+                            }
-+                            if (slotName) {
-+                                // slotTranscludeFn can be one of three things:
-+                                //  * a transclude function - a filled slot
-+                                //  * `null` - an optional slot that was not filled
-+                                //  * `undefined` - a slot that was not declared (i.e. invalid)
-+                                var slotTranscludeFn = boundTranscludeFn.$$slots[slotName];
-+                                if (slotTranscludeFn) {
-+                                    return slotTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild);
-+                                } else if (isUndefined(slotTranscludeFn)) {
-+                                    throw $compileMinErr('noslot',
-+                                        'No parent directive that requires a transclusion with slot name "{0}". ' +
-+                                        'Element: {1}',
-+                                        slotName, startingTag($element));
-+                                }
-+                            } else {
-+                                return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild);
-+                            }
-+                        }
-+                    }
-+                }
-+
-+                function getControllers(directiveName, require, $element, elementControllers) {
-+                    var value;
- 
--                            return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers);
-+                    if (isString(require)) {
-+                        var match = require.match(REQUIRE_PREFIX_REGEXP);
-+                        var name = require.substring(match[0].length);
-+                        var inheritType = match[1] || match[3];
-+                        var optional = match[2] === '?';
-+
-+                        //If only parents then start at the parent element
-+                        if (inheritType === '^^') {
-+                            $element = $element.parent();
-+                            //Otherwise attempt getting the controller from elementControllers in case
-+                            //the element is transcluded (and has no data) and to avoid .data if possible
-+                        } else {
-+                            value = elementControllers && elementControllers[name];
-+                            value = value && value.instance;
-+                        }
-+
-+                        if (!value) {
-+                            var dataName = '$' + name + 'Controller';
-+                            value = inheritType ? $element.inheritedData(dataName) : $element.data(dataName);
-+                        }
-+
-+                        if (!value && !optional) {
-+                            throw $compileMinErr('ctreq',
-+                                'Controller \'{0}\', required by directive \'{1}\', can\'t be found!',
-+                                name, directiveName);
-+                        }
-+                    } else if (isArray(require)) {
-+                        value = [];
-+                        for (var i = 0, ii = require.length; i < ii; i++) {
-+                            value[i] = getControllers(directiveName, require[i], $element, elementControllers);
-+                        }
-+                    } else if (isObject(require)) {
-+                        value = {};
-+                        forEach(require, function(controller, property) {
-+                            value[property] = getControllers(directiveName, controller, $element, elementControllers);
-+                        });
-+                    }
-+
-+                    return value || null;
-+                }
-+
-+                function setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope, newIsolateScopeDirective) {
-+                    var elementControllers = createMap();
-+                    for (var controllerKey in controllerDirectives) {
-+                        var directive = controllerDirectives[controllerKey];
-+                        var locals = {
-+                            $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
-+                            $element: $element,
-+                            $attrs: attrs,
-+                            $transclude: transcludeFn
-+                        };
-+
-+                        var controller = directive.controller;
-+                        if (controller === '@') {
-+                            controller = attrs[directive.name];
-                         }
-+
-+                        var controllerInstance = $controller(controller, locals, true, directive.controllerAs);
-+
-+                        // For directives with element transclusion the element is a comment.
-+                        // In this case .data will not attach any data.
-+                        // Instead, we save the controllers for the element in a local hash and attach to .data
-+                        // later, once we have the actual element.
-+                        elementControllers[directive.name] = controllerInstance;
-+                        $element.data('$' + directive.name + 'Controller', controllerInstance.instance);
-                     }
-+                    return elementControllers;
-                 }
- 
--                function markDirectivesAsIsolate(directives) {
--                    // mark all directives as needing isolate scope.
-+                // Depending upon the context in which a directive finds itself it might need to have a new isolated
-+                // or child scope created. For instance:
-+                // * if the directive has been pulled into a template because another directive with a higher priority
-+                // asked for element transclusion
-+                // * if the directive itself asks for transclusion but it is at the root of a template and the original
-+                // element was replaced. See https://github.com/angular/angular.js/issues/12936
-+                function markDirectiveScope(directives, isolateScope, newScope) {
-                     for (var j = 0, jj = directives.length; j < jj; j++) {
--                        directives[j] = inherit(directives[j], {$$isolateScope: true});
-+                        directives[j] = inherit(directives[j], {$$isolateScope: isolateScope, $$newScope: newScope});
-                     }
-                 }
- 
-@@ -6628,25 +10164,51 @@
-                     if (name === ignoreDirective) return null;
-                     var match = null;
-                     if (hasDirectives.hasOwnProperty(name)) {
--                        for(var directive, directives = $injector.get(name + Suffix),
--                                i = 0, ii = directives.length; i<ii; i++) {
--                            try {
--                                directive = directives[i];
--                                if ( (maxPriority === undefined || maxPriority > directive.priority) &&
--                                    directive.restrict.indexOf(location) != -1) {
--                                    if (startAttrName) {
--                                        directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName});
-+                        for (var directive, directives = $injector.get(name + Suffix),
-+                                 i = 0, ii = directives.length; i < ii; i++) {
-+                            directive = directives[i];
-+                            if ((isUndefined(maxPriority) || maxPriority > directive.priority) &&
-+                                directive.restrict.indexOf(location) !== -1) {
-+                                if (startAttrName) {
-+                                    directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName});
-+                                }
-+                                if (!directive.$$bindings) {
-+                                    var bindings = directive.$$bindings =
-+                                        parseDirectiveBindings(directive, directive.name);
-+                                    if (isObject(bindings.isolateScope)) {
-+                                        directive.$$isolateBindings = bindings.isolateScope;
-                                     }
--                                    tDirectives.push(directive);
--                                    match = directive;
-                                 }
--                            } catch(e) { $exceptionHandler(e); }
-+                                tDirectives.push(directive);
-+                                match = directive;
-+                            }
-                         }
-                     }
-                     return match;
-                 }
- 
- 
-+                /**
-+                 * looks up the directive and returns true if it is a multi-element directive,
-+                 * and therefore requires DOM nodes between -start and -end markers to be grouped
-+                 * together.
-+                 *
-+                 * @param {string} name name of the directive to look up.
-+                 * @returns true if directive was registered as multi-element.
-+                 */
-+                function directiveIsMultiElement(name) {
-+                    if (hasDirectives.hasOwnProperty(name)) {
-+                        for (var directive, directives = $injector.get(name + Suffix),
-+                                 i = 0, ii = directives.length; i < ii; i++) {
-+                            directive = directives[i];
-+                            if (directive.multiElement) {
-+                                return true;
-+                            }
-+                        }
-+                    }
-+                    return false;
-+                }
-+
-                 /**
-                  * When the element is replaced with HTML template then the new attributes
-                  * on the template need to be merged with the existing attributes in the DOM.
-@@ -6657,14 +10219,17 @@
-                  */
-                 function mergeTemplateAttributes(dst, src) {
-                     var srcAttr = src.$attr,
--                        dstAttr = dst.$attr,
--                        $element = dst.$$element;
-+                        dstAttr = dst.$attr;
- 
-                     // reapply the old attributes to the new element
-                     forEach(dst, function(value, key) {
--                        if (key.charAt(0) != '$') {
--                            if (src[key]) {
--                                value += (key === 'style' ? ';' : ' ') + src[key];
-+                        if (key.charAt(0) !== '$') {
-+                            if (src[key] && src[key] !== value) {
-+                                if (value.length) {
-+                                    value += (key === 'style' ? ';' : ' ') + src[key];
-+                                } else {
-+                                    value = src[key];
-+                                }
-                             }
-                             dst.$set(key, value, true, srcAttr[key]);
-                         }
-@@ -6672,18 +10237,16 @@
- 
-                     // copy the new attributes on the old attrs object
-                     forEach(src, function(value, key) {
--                        if (key == 'class') {
--                            safeAddClass($element, value);
--                            dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value;
--                        } else if (key == 'style') {
--                            $element.attr('style', $element.attr('style') + ';' + value);
--                            dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value;
--                            // `dst` will never contain hasOwnProperty as DOM parser won't let it.
--                            // You will get an "InvalidCharacterError: DOM Exception 5" error if you
--                            // have an attribute like "has-own-property" or "data-has-own-property", etc.
--                        } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) {
-+                        // Check if we already set this attribute in the loop above.
-+                        // `dst` will never contain hasOwnProperty as DOM parser won't let it.
-+                        // You will get an "InvalidCharacterError: DOM Exception 5" error if you
-+                        // have an attribute like "has-own-property" or "data-has-own-property", etc.
-+                        if (!dst.hasOwnProperty(key) && key.charAt(0) !== '$') {
-                             dst[key] = value;
--                            dstAttr[key] = srcAttr[key];
-+
-+                            if (key !== 'class' && key !== 'style') {
-+                                dstAttr[key] = srcAttr[key];
-+                            }
-                         }
-                     });
-                 }
-@@ -6696,18 +10259,18 @@
-                         afterTemplateChildLinkFn,
-                         beforeTemplateCompileNode = $compileNode[0],
-                         origAsyncDirective = directives.shift(),
--                    // The fact that we have to copy and patch the directive seems wrong!
--                        derivedSyncDirective = extend({}, origAsyncDirective, {
-+                        derivedSyncDirective = inherit(origAsyncDirective, {
-                             templateUrl: null, transclude: null, replace: null, $$originalDirective: origAsyncDirective
-                         }),
-                         templateUrl = (isFunction(origAsyncDirective.templateUrl))
-                             ? origAsyncDirective.templateUrl($compileNode, tAttrs)
--                            : origAsyncDirective.templateUrl;
-+                            : origAsyncDirective.templateUrl,
-+                        templateNamespace = origAsyncDirective.templateNamespace;
- 
-                     $compileNode.empty();
- 
--                    $http.get($sce.getTrustedResourceUrl(templateUrl), {cache: $templateCache}).
--                        success(function(content) {
-+                    $templateRequest(templateUrl)
-+                        .then(function(content) {
-                             var compileNode, tempTemplateAttrs, $template, childBoundTranscludeFn;
- 
-                             content = denormalizeTemplate(content);
-@@ -6716,13 +10279,13 @@
-                                 if (jqLiteIsTextNode(content)) {
-                                     $template = [];
-                                 } else {
--                                    $template = jqLite(content);
-+                                    $template = removeComments(wrapTemplate(templateNamespace, trim(content)));
-                                 }
-                                 compileNode = $template[0];
- 
--                                if ($template.length != 1 || compileNode.nodeType !== 1) {
-+                                if ($template.length !== 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) {
-                                     throw $compileMinErr('tplrt',
--                                        "Template for directive '{0}' must have exactly one root element. {1}",
-+                                        'Template for directive \'{0}\' must have exactly one root element. {1}',
-                                         origAsyncDirective.name, templateUrl);
-                                 }
- 
-@@ -6731,7 +10294,9 @@
-                                 var templateDirectives = collectDirectives(compileNode, [], tempTemplateAttrs);
- 
-                                 if (isObject(origAsyncDirective.scope)) {
--                                    markDirectivesAsIsolate(templateDirectives);
-+                                    // the original directive that caused the template to be loaded async required
-+                                    // an isolate scope
-+                                    markDirectiveScope(templateDirectives, true);
-                                 }
-                                 directives = templateDirectives.concat(directives);
-                                 mergeTemplateAttributes(tAttrs, tempTemplateAttrs);
-@@ -6746,20 +10311,21 @@
-                                 childTranscludeFn, $compileNode, origAsyncDirective, preLinkFns, postLinkFns,
-                                 previousCompileContext);
-                             forEach($rootElement, function(node, i) {
--                                if (node == compileNode) {
-+                                if (node === compileNode) {
-                                     $rootElement[i] = $compileNode[0];
-                                 }
-                             });
-                             afterTemplateChildLinkFn = compileNodes($compileNode[0].childNodes, childTranscludeFn);
- 
--
--                            while(linkQueue.length) {
-+                            while (linkQueue.length) {
-                                 var scope = linkQueue.shift(),
-                                     beforeTemplateLinkNode = linkQueue.shift(),
-                                     linkRootElement = linkQueue.shift(),
-                                     boundTranscludeFn = linkQueue.shift(),
-                                     linkNode = $compileNode[0];
- 
-+                                if (scope.$$destroyed) continue;
-+
-                                 if (beforeTemplateLinkNode !== beforeTemplateCompileNode) {
-                                     var oldClasses = beforeTemplateLinkNode.className;
- 
-@@ -6768,14 +10334,13 @@
-                                         // it was cloned therefore we have to clone as well.
-                                         linkNode = jqLiteClone(compileNode);
-                                     }
--
-                                     replaceWith(linkRootElement, jqLite(beforeTemplateLinkNode), linkNode);
- 
-                                     // Copy in CSS classes from original node
-                                     safeAddClass(jqLite(linkNode), oldClasses);
-                                 }
--                                if (afterTemplateNodeLinkFn.transclude) {
--                                    childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude);
-+                                if (afterTemplateNodeLinkFn.transcludeOnThisElement) {
-+                                    childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn);
-                                 } else {
-                                     childBoundTranscludeFn = boundTranscludeFn;
-                                 }
-@@ -6783,19 +10348,25 @@
-                                     childBoundTranscludeFn);
-                             }
-                             linkQueue = null;
--                        }).
--                        error(function(response, code, headers, config) {
--                            throw $compileMinErr('tpload', 'Failed to load template: {0}', config.url);
--                        });
-+                        }).catch(function(error) {
-+                        if (isError(error)) {
-+                            $exceptionHandler(error);
-+                        }
-+                    });
- 
-                     return function delayedNodeLinkFn(ignoreChildLinkFn, scope, node, rootElement, boundTranscludeFn) {
-+                        var childBoundTranscludeFn = boundTranscludeFn;
-+                        if (scope.$$destroyed) return;
-                         if (linkQueue) {
--                            linkQueue.push(scope);
--                            linkQueue.push(node);
--                            linkQueue.push(rootElement);
--                            linkQueue.push(boundTranscludeFn);
-+                            linkQueue.push(scope,
-+                                node,
-+                                rootElement,
-+                                childBoundTranscludeFn);
-                         } else {
--                            afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, boundTranscludeFn);
-+                            if (afterTemplateNodeLinkFn.transcludeOnThisElement) {
-+                                childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn);
-+                            }
-+                            afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, childBoundTranscludeFn);
-                         }
-                     };
-                 }
-@@ -6811,11 +10382,18 @@
-                     return a.index - b.index;
-                 }
- 
--
-                 function assertNoDuplicate(what, previousDirective, directive, element) {
-+
-+                    function wrapModuleNameIfDefined(moduleName) {
-+                        return moduleName ?
-+                            (' (module: ' + moduleName + ')') :
-+                            '';
-+                    }
-+
-                     if (previousDirective) {
--                        throw $compileMinErr('multidir', 'Multiple directives [{0}, {1}] asking for {2} on: {3}',
--                            previousDirective.name, directive.name, what, startingTag(element));
-+                        throw $compileMinErr('multidir', 'Multiple directives [{0}{1}, {2}{3}] asking for {4} on: {5}',
-+                            previousDirective.name, wrapModuleNameIfDefined(previousDirective.$$moduleName),
-+                            directive.name, wrapModuleNameIfDefined(directive.$$moduleName), what, startingTag(element));
-                     }
-                 }
- 
-@@ -6825,87 +10403,127 @@
-                     if (interpolateFn) {
-                         directives.push({
-                             priority: 0,
--                            compile: valueFn(function textInterpolateLinkFn(scope, node) {
--                                var parent = node.parent(),
--                                    bindings = parent.data('$binding') || [];
--                                bindings.push(interpolateFn);
--                                safeAddClass(parent.data('$binding', bindings), 'ng-binding');
--                                scope.$watch(interpolateFn, function interpolateFnWatchAction(value) {
--                                    node[0].nodeValue = value;
--                                });
--                            })
-+                            compile: function textInterpolateCompileFn(templateNode) {
-+                                var templateNodeParent = templateNode.parent(),
-+                                    hasCompileParent = !!templateNodeParent.length;
-+
-+                                // When transcluding a template that has bindings in the root
-+                                // we don't have a parent and thus need to add the class during linking fn.
-+                                if (hasCompileParent) compile.$$addBindingClass(templateNodeParent);
-+
-+                                return function textInterpolateLinkFn(scope, node) {
-+                                    var parent = node.parent();
-+                                    if (!hasCompileParent) compile.$$addBindingClass(parent);
-+                                    compile.$$addBindingInfo(parent, interpolateFn.expressions);
-+                                    scope.$watch(interpolateFn, function interpolateFnWatchAction(value) {
-+                                        node[0].nodeValue = value;
-+                                    });
-+                                };
-+                            }
-                         });
-                     }
-                 }
- 
- 
-+                function wrapTemplate(type, template) {
-+                    type = lowercase(type || 'html');
-+                    switch (type) {
-+                        case 'svg':
-+                        case 'math':
-+                            var wrapper = window.document.createElement('div');
-+                            wrapper.innerHTML = '<' + type + '>' + template + '</' + type + '>';
-+                            return wrapper.childNodes[0].childNodes;
-+                        default:
-+                            return template;
-+                    }
-+                }
-+
-+
-                 function getTrustedContext(node, attrNormalizedName) {
--                    if (attrNormalizedName == "srcdoc") {
-+                    if (attrNormalizedName === 'srcdoc') {
-                         return $sce.HTML;
-                     }
-                     var tag = nodeName_(node);
--                    // maction[xlink:href] can source SVG.  It's not limited to <maction>.
--                    if (attrNormalizedName == "xlinkHref" ||
--                        (tag == "FORM" && attrNormalizedName == "action") ||
--                        (tag != "IMG" && (attrNormalizedName == "src" ||
--                        attrNormalizedName == "ngSrc"))) {
-+                    // All tags with src attributes require a RESOURCE_URL value, except for
-+                    // img and various html5 media tags.
-+                    if (attrNormalizedName === 'src' || attrNormalizedName === 'ngSrc') {
-+                        if (['img', 'video', 'audio', 'source', 'track'].indexOf(tag) === -1) {
-+                            return $sce.RESOURCE_URL;
-+                        }
-+                        // maction[xlink:href] can source SVG.  It's not limited to <maction>.
-+                    } else if (attrNormalizedName === 'xlinkHref' ||
-+                        (tag === 'form' && attrNormalizedName === 'action') ||
-+                        // links can be stylesheets or imports, which can run script in the current origin
-+                        (tag === 'link' && attrNormalizedName === 'href')
-+                    ) {
-                         return $sce.RESOURCE_URL;
-                     }
-                 }
- 
- 
--                function addAttrInterpolateDirective(node, directives, value, name) {
--                    var interpolateFn = $interpolate(value, true);
-+                function addAttrInterpolateDirective(node, directives, value, name, isNgAttr) {
-+                    var trustedContext = getTrustedContext(node, name);
-+                    var mustHaveExpression = !isNgAttr;
-+                    var allOrNothing = ALL_OR_NOTHING_ATTRS[name] || isNgAttr;
-+
-+                    var interpolateFn = $interpolate(value, mustHaveExpression, trustedContext, allOrNothing);
- 
-                     // no interpolation found -> ignore
-                     if (!interpolateFn) return;
- 
--
--                    if (name === "multiple" && nodeName_(node) === "SELECT") {
--                        throw $compileMinErr("selmulti",
--                            "Binding to the 'multiple' attribute is not supported. Element: {0}",
-+                    if (name === 'multiple' && nodeName_(node) === 'select') {
-+                        throw $compileMinErr('selmulti',
-+                            'Binding to the \'multiple\' attribute is not supported. Element: {0}',
-                             startingTag(node));
-                     }
- 
-+                    if (EVENT_HANDLER_ATTR_REGEXP.test(name)) {
-+                        throw $compileMinErr('nodomevents',
-+                            'Interpolations for HTML DOM event attributes are disallowed.  Please use the ' +
-+                            'ng- versions (such as ng-click instead of onclick) instead.');
-+                    }
-+
-                     directives.push({
-                         priority: 100,
-                         compile: function() {
-                             return {
-                                 pre: function attrInterpolatePreLinkFn(scope, element, attr) {
--                                    var $$observers = (attr.$$observers || (attr.$$observers = {}));
--
--                                    if (EVENT_HANDLER_ATTR_REGEXP.test(name)) {
--                                        throw $compileMinErr('nodomevents',
--                                            "Interpolations for HTML DOM event attributes are disallowed.  Please use the " +
--                                            "ng- versions (such as ng-click instead of onclick) instead.");
-+                                    var $$observers = (attr.$$observers || (attr.$$observers = createMap()));
-+
-+                                    // If the attribute has changed since last $interpolate()ed
-+                                    var newValue = attr[name];
-+                                    if (newValue !== value) {
-+                                        // we need to interpolate again since the attribute value has been updated
-+                                        // (e.g. by another directive's compile function)
-+                                        // ensure unset/empty values make interpolateFn falsy
-+                                        interpolateFn = newValue && $interpolate(newValue, true, trustedContext, allOrNothing);
-+                                        value = newValue;
-                                     }
- 
--                                    // we need to interpolate again, in case the attribute value has been updated
--                                    // (e.g. by another directive's compile function)
--                                    interpolateFn = $interpolate(attr[name], true, getTrustedContext(node, name));
--
-                                     // if attribute was updated so that there is no interpolation going on we don't want to
-                                     // register any observers
-                                     if (!interpolateFn) return;
- 
--                                    // TODO(i): this should likely be attr.$set(name, iterpolateFn(scope) so that we reset the
--                                    // actual attr value
-+                                    // initialize attr object so that it's ready in case we need the value for isolate
-+                                    // scope initialization, otherwise the value would not be available from isolate
-+                                    // directive's linking fn during linking phase
-                                     attr[name] = interpolateFn(scope);
-+
-                                     ($$observers[name] || ($$observers[name] = [])).$$inter = true;
-                                     (attr.$$observers && attr.$$observers[name].$$scope || scope).
--                                        $watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) {
--                                            //special case for class attribute addition + removal
--                                            //so that class changes can tap into the animation
--                                            //hooks provided by the $animate service. Be sure to
--                                            //skip animations when the first digest occurs (when
--                                            //both the new and the old values are the same) since
--                                            //the CSS classes are the non-interpolated values
--                                            if(name === 'class' && newValue != oldValue) {
--                                                attr.$updateClass(newValue, oldValue);
--                                            } else {
--                                                attr.$set(name, newValue);
--                                            }
--                                        });
-+                                    $watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) {
-+                                        //special case for class attribute addition + removal
-+                                        //so that class changes can tap into the animation
-+                                        //hooks provided by the $animate service. Be sure to
-+                                        //skip animations when the first digest occurs (when
-+                                        //both the new and the old values are the same) since
-+                                        //the CSS classes are the non-interpolated values
-+                                        if (name === 'class' && newValue !== oldValue) {
-+                                            attr.$updateClass(newValue, oldValue);
-+                                        } else {
-+                                            attr.$set(name, newValue);
-+                                        }
-+                                    });
-                                 }
-                             };
-                         }
-@@ -6930,8 +10548,8 @@
-                         i, ii;
- 
-                     if ($rootElement) {
--                        for(i = 0, ii = $rootElement.length; i < ii; i++) {
--                            if ($rootElement[i] == firstElementToRemove) {
-+                        for (i = 0, ii = $rootElement.length; i < ii; i++) {
-+                            if ($rootElement[i] === firstElementToRemove) {
-                                 $rootElement[i++] = newNode;
-                                 for (var j = i, j2 = j + removeCount - 1,
-                                          jj = $rootElement.length;
-@@ -6943,6 +10561,13 @@
-                                     }
-                                 }
-                                 $rootElement.length -= removeCount - 1;
-+
-+                                // If the replaced element is also the jQuery .context then replace it
-+                                // .context is a deprecated jQuery api, so we should set it only when jQuery set it
-+                                // http://api.jquery.com/context/
-+                                if ($rootElement.context === firstElementToRemove) {
-+                                    $rootElement.context = newNode;
-+                                }
-                                 break;
-                             }
-                         }
-@@ -6951,16 +10576,34 @@
-                     if (parent) {
-                         parent.replaceChild(newNode, firstElementToRemove);
-                     }
--                    var fragment = document.createDocumentFragment();
--                    fragment.appendChild(firstElementToRemove);
--                    newNode[jqLite.expando] = firstElementToRemove[jqLite.expando];
--                    for (var k = 1, kk = elementsToRemove.length; k < kk; k++) {
--                        var element = elementsToRemove[k];
--                        jqLite(element).remove(); // must do this way to clean up expando
--                        fragment.appendChild(element);
--                        delete elementsToRemove[k];
-+
-+                    // Append all the `elementsToRemove` to a fragment. This will...
-+                    // - remove them from the DOM
-+                    // - allow them to still be traversed with .nextSibling
-+                    // - allow a single fragment.qSA to fetch all elements being removed
-+                    var fragment = window.document.createDocumentFragment();
-+                    for (i = 0; i < removeCount; i++) {
-+                        fragment.appendChild(elementsToRemove[i]);
-+                    }
-+
-+                    if (jqLite.hasData(firstElementToRemove)) {
-+                        // Copy over user data (that includes AngularJS's $scope etc.). Don't copy private
-+                        // data here because there's no public interface in jQuery to do that and copying over
-+                        // event listeners (which is the main use of private data) wouldn't work anyway.
-+                        jqLite.data(newNode, jqLite.data(firstElementToRemove));
-+
-+                        // Remove $destroy event listeners from `firstElementToRemove`
-+                        jqLite(firstElementToRemove).off('$destroy');
-                     }
- 
-+                    // Cleanup any data/listeners on the elements and children.
-+                    // This includes invoking the $destroy event on any elements with listeners.
-+                    jqLite.cleanData(fragment.querySelectorAll('*'));
-+
-+                    // Update the jqLite collection to only contain the `newNode`
-+                    for (i = 1; i < removeCount; i++) {
-+                        delete elementsToRemove[i];
-+                    }
-                     elementsToRemove[0] = newNode;
-                     elementsToRemove.length = 1;
-                 }
-@@ -6969,102 +10612,332 @@
-                 function cloneAndAnnotateFn(fn, annotation) {
-                     return extend(function() { return fn.apply(null, arguments); }, fn, annotation);
-                 }
--            }];
--    }
--
--    var PREFIX_REGEXP = /^(x[\:\-_]|data[\:\-_])/i;
--    /**
--     * Converts all accepted directives format into proper directive name.
--     * All of these will become 'myDirective':
--     *   my:Directive
--     *   my-directive
--     *   x-my-directive
--     *   data-my:directive
--     *
--     * Also there is special case for Moz prefix starting with upper case letter.
--     * @param name Name to normalize
--     */
--    function directiveNormalize(name) {
--        return camelCase(name.replace(PREFIX_REGEXP, ''));
--    }
- 
--    /**
--     * @ngdoc type
--     * @name $compile.directive.Attributes
--     *
--     * @description
--     * A shared object between directive compile / linking functions which contains normalized DOM
--     * element attributes. The values reflect current binding state `{{ }}`. The normalization is
--     * needed since all of these are treated as equivalent in Angular:
--     *
--     *    <span ng:bind="a" ng-bind="a" data-ng-bind="a" x-ng-bind="a">
--     */
- 
--    /**
--     * @ngdoc property
--     * @name $compile.directive.Attributes#$attr
--     * @returns {object} A map of DOM element attribute names to the normalized name. This is
--     *                   needed to do reverse lookup from normalized name back to actual name.
--     */
-+                function invokeLinkFn(linkFn, scope, $element, attrs, controllers, transcludeFn) {
-+                    try {
-+                        linkFn(scope, $element, attrs, controllers, transcludeFn);
-+                    } catch (e) {
-+                        $exceptionHandler(e, startingTag($element));
-+                    }
-+                }
- 
-+                function strictBindingsCheck(attrName, directiveName) {
-+                    if (strictComponentBindingsEnabled) {
-+                        throw $compileMinErr('missingattr',
-+                            'Attribute \'{0}\' of \'{1}\' is non-optional and must be set!',
-+                            attrName, directiveName);
-+                    }
-+                }
- 
--    /**
--     * @ngdoc method
--     * @name $compile.directive.Attributes#$set
--     * @function
--     *
--     * @description
--     * Set DOM element attribute value.
--     *
--     *
--     * @param {string} name Normalized element attribute name of the property to modify. The name is
--     *          reverse-translated using the {@link ng.$compile.directive.Attributes#$attr $attr}
--     *          property to the original name.
--     * @param {string} value Value to set the attribute to. The value can be an interpolated string.
--     */
-+                // Set up $watches for isolate scope and controller bindings.
-+                function initializeDirectiveBindings(scope, attrs, destination, bindings, directive) {
-+                    var removeWatchCollection = [];
-+                    var initialChanges = {};
-+                    var changes;
- 
-+                    forEach(bindings, function initializeBinding(definition, scopeName) {
-+                        var attrName = definition.attrName,
-+                            optional = definition.optional,
-+                            mode = definition.mode, // @, =, <, or &
-+                            lastValue,
-+                            parentGet, parentSet, compare, removeWatch;
- 
-+                        switch (mode) {
- 
--    /**
--     * Closure compiler type information
--     */
-+                            case '@':
-+                                if (!optional && !hasOwnProperty.call(attrs, attrName)) {
-+                                    strictBindingsCheck(attrName, directive.name);
-+                                    destination[scopeName] = attrs[attrName] = undefined;
- 
--    function nodesetLinkingFn(
--        /* angular.Scope */ scope,
--        /* NodeList */ nodeList,
--        /* Element */ rootElement,
--        /* function(Function) */ boundTranscludeFn
--        ){}
-+                                }
-+                                removeWatch = attrs.$observe(attrName, function(value) {
-+                                    if (isString(value) || isBoolean(value)) {
-+                                        var oldValue = destination[scopeName];
-+                                        recordChanges(scopeName, value, oldValue);
-+                                        destination[scopeName] = value;
-+                                    }
-+                                });
-+                                attrs.$$observers[attrName].$$scope = scope;
-+                                lastValue = attrs[attrName];
-+                                if (isString(lastValue)) {
-+                                    // If the attribute has been provided then we trigger an interpolation to ensure
-+                                    // the value is there for use in the link fn
-+                                    destination[scopeName] = $interpolate(lastValue)(scope);
-+                                } else if (isBoolean(lastValue)) {
-+                                    // If the attributes is one of the BOOLEAN_ATTR then AngularJS will have converted
-+                                    // the value to boolean rather than a string, so we special case this situation
-+                                    destination[scopeName] = lastValue;
-+                                }
-+                                initialChanges[scopeName] = new SimpleChange(_UNINITIALIZED_VALUE, destination[scopeName]);
-+                                removeWatchCollection.push(removeWatch);
-+                                break;
- 
--    function directiveLinkingFn(
--        /* nodesetLinkingFn */ nodesetLinkingFn,
--        /* angular.Scope */ scope,
--        /* Node */ node,
--        /* Element */ rootElement,
--        /* function(Function) */ boundTranscludeFn
--        ){}
-+                            case '=':
-+                                if (!hasOwnProperty.call(attrs, attrName)) {
-+                                    if (optional) break;
-+                                    strictBindingsCheck(attrName, directive.name);
-+                                    attrs[attrName] = undefined;
-+                                }
-+                                if (optional && !attrs[attrName]) break;
- 
--    function tokenDifference(str1, str2) {
--        var values = '',
--            tokens1 = str1.split(/\s+/),
--            tokens2 = str2.split(/\s+/);
-+                                parentGet = $parse(attrs[attrName]);
-+                                if (parentGet.literal) {
-+                                    compare = equals;
-+                                } else {
-+                                    compare = simpleCompare;
-+                                }
-+                                parentSet = parentGet.assign || function() {
-+                                    // reset the change, or we will throw this exception on every $digest
-+                                    lastValue = destination[scopeName] = parentGet(scope);
-+                                    throw $compileMinErr('nonassign',
-+                                        'Expression \'{0}\' in attribute \'{1}\' used with directive \'{2}\' is non-assignable!',
-+                                        attrs[attrName], attrName, directive.name);
-+                                };
-+                                lastValue = destination[scopeName] = parentGet(scope);
-+                                var parentValueWatch = function parentValueWatch(parentValue) {
-+                                    if (!compare(parentValue, destination[scopeName])) {
-+                                        // we are out of sync and need to copy
-+                                        if (!compare(parentValue, lastValue)) {
-+                                            // parent changed and it has precedence
-+                                            destination[scopeName] = parentValue;
-+                                        } else {
-+                                            // if the parent can be assigned then do so
-+                                            parentSet(scope, parentValue = destination[scopeName]);
-+                                        }
-+                                    }
-+                                    lastValue = parentValue;
-+                                    return lastValue;
-+                                };
-+                                parentValueWatch.$stateful = true;
-+                                if (definition.collection) {
-+                                    removeWatch = scope.$watchCollection(attrs[attrName], parentValueWatch);
-+                                } else {
-+                                    removeWatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
-+                                }
-+                                removeWatchCollection.push(removeWatch);
-+                                break;
-+
-+                            case '<':
-+                                if (!hasOwnProperty.call(attrs, attrName)) {
-+                                    if (optional) break;
-+                                    strictBindingsCheck(attrName, directive.name);
-+                                    attrs[attrName] = undefined;
-+                                }
-+                                if (optional && !attrs[attrName]) break;
-+
-+                                parentGet = $parse(attrs[attrName]);
-+                                var deepWatch = parentGet.literal;
-+
-+                                var initialValue = destination[scopeName] = parentGet(scope);
-+                                initialChanges[scopeName] = new SimpleChange(_UNINITIALIZED_VALUE, destination[scopeName]);
-+
-+                                removeWatch = scope.$watch(parentGet, function parentValueWatchAction(newValue, oldValue) {
-+                                    if (oldValue === newValue) {
-+                                        if (oldValue === initialValue || (deepWatch && equals(oldValue, initialValue))) {
-+                                            return;
-+                                        }
-+                                        oldValue = initialValue;
-+                                    }
-+                                    recordChanges(scopeName, newValue, oldValue);
-+                                    destination[scopeName] = newValue;
-+                                }, deepWatch);
-+
-+                                removeWatchCollection.push(removeWatch);
-+                                break;
-+
-+                            case '&':
-+                                if (!optional && !hasOwnProperty.call(attrs, attrName)) {
-+                                    strictBindingsCheck(attrName, directive.name);
-+                                }
-+                                // Don't assign Object.prototype method to scope
-+                                parentGet = attrs.hasOwnProperty(attrName) ? $parse(attrs[attrName]) : noop;
-+
-+                                // Don't assign noop to destination if expression is not valid
-+                                if (parentGet === noop && optional) break;
-+
-+                                destination[scopeName] = function(locals) {
-+                                    return parentGet(scope, locals);
-+                                };
-+                                break;
-+                        }
-+                    });
-+
-+                    function recordChanges(key, currentValue, previousValue) {
-+                        if (isFunction(destination.$onChanges) && !simpleCompare(currentValue, previousValue)) {
-+                            // If we have not already scheduled the top level onChangesQueue handler then do so now
-+                            if (!onChangesQueue) {
-+                                scope.$$postDigest(flushOnChangesQueue);
-+                                onChangesQueue = [];
-+                            }
-+                            // If we have not already queued a trigger of onChanges for this controller then do so now
-+                            if (!changes) {
-+                                changes = {};
-+                                onChangesQueue.push(triggerOnChangesHook);
-+                            }
-+                            // If the has been a change on this property already then we need to reuse the previous value
-+                            if (changes[key]) {
-+                                previousValue = changes[key].previousValue;
-+                            }
-+                            // Store this change
-+                            changes[key] = new SimpleChange(previousValue, currentValue);
-+                        }
-+                    }
-+
-+                    function triggerOnChangesHook() {
-+                        destination.$onChanges(changes);
-+                        // Now clear the changes so that we schedule onChanges when more changes arrive
-+                        changes = undefined;
-+                    }
-+
-+                    return {
-+                        initialChanges: initialChanges,
-+                        removeWatches: removeWatchCollection.length && function removeWatches() {
-+                            for (var i = 0, ii = removeWatchCollection.length; i < ii; ++i) {
-+                                removeWatchCollection[i]();
-+                            }
-+                        }
-+                    };
-+                }
-+            }];
-+    }
-+
-+    function SimpleChange(previous, current) {
-+        this.previousValue = previous;
-+        this.currentValue = current;
-+    }
-+    SimpleChange.prototype.isFirstChange = function() { return this.previousValue === _UNINITIALIZED_VALUE; };
-+
-+
-+    var PREFIX_REGEXP = /^((?:x|data)[:\-_])/i;
-+    var SPECIAL_CHARS_REGEXP = /[:\-_]+(.)/g;
-+
-+    /**
-+     * Converts all accepted directives format into proper directive name.
-+     * @param name Name to normalize
-+     */
-+    function directiveNormalize(name) {
-+        return name
-+            .replace(PREFIX_REGEXP, '')
-+            .replace(SPECIAL_CHARS_REGEXP, function(_, letter, offset) {
-+                return offset ? letter.toUpperCase() : letter;
-+            });
-+    }
-+
-+    /**
-+     * @ngdoc type
-+     * @name $compile.directive.Attributes
-+     *
-+     * @description
-+     * A shared object between directive compile / linking functions which contains normalized DOM
-+     * element attributes. The values reflect current binding state `{{ }}`. The normalization is
-+     * needed since all of these are treated as equivalent in AngularJS:
-+     *
-+     * ```
-+     *    <span ng:bind="a" ng-bind="a" data-ng-bind="a" x-ng-bind="a">
-+     * ```
-+     */
-+
-+    /**
-+     * @ngdoc property
-+     * @name $compile.directive.Attributes#$attr
-+     *
-+     * @description
-+     * A map of DOM element attribute names to the normalized name. This is
-+     * needed to do reverse lookup from normalized name back to actual name.
-+     */
-+
-+
-+    /**
-+     * @ngdoc method
-+     * @name $compile.directive.Attributes#$set
-+     * @kind function
-+     *
-+     * @description
-+     * Set DOM element attribute value.
-+     *
-+     *
-+     * @param {string} name Normalized element attribute name of the property to modify. The name is
-+     *          reverse-translated using the {@link ng.$compile.directive.Attributes#$attr $attr}
-+     *          property to the original name.
-+     * @param {string} value Value to set the attribute to. The value can be an interpolated string.
-+     */
-+
-+
-+
-+    /**
-+     * Closure compiler type information
-+     */
-+
-+    function nodesetLinkingFn(
-+        /* angular.Scope */ scope,
-+        /* NodeList */ nodeList,
-+        /* Element */ rootElement,
-+        /* function(Function) */ boundTranscludeFn
-+    ) {}
-+
-+    function directiveLinkingFn(
-+        /* nodesetLinkingFn */ nodesetLinkingFn,
-+        /* angular.Scope */ scope,
-+        /* Node */ node,
-+        /* Element */ rootElement,
-+        /* function(Function) */ boundTranscludeFn
-+    ) {}
-+
-+    function tokenDifference(str1, str2) {
-+        var values = '',
-+            tokens1 = str1.split(/\s+/),
-+            tokens2 = str2.split(/\s+/);
- 
-         outer:
--            for(var i = 0; i < tokens1.length; i++) {
-+            for (var i = 0; i < tokens1.length; i++) {
-                 var token = tokens1[i];
--                for(var j = 0; j < tokens2.length; j++) {
--                    if(token == tokens2[j]) continue outer;
-+                for (var j = 0; j < tokens2.length; j++) {
-+                    if (token === tokens2[j]) continue outer;
-                 }
-                 values += (values.length > 0 ? ' ' : '') + token;
-             }
-         return values;
-     }
- 
-+    function removeComments(jqNodes) {
-+        jqNodes = jqLite(jqNodes);
-+        var i = jqNodes.length;
-+
-+        if (i <= 1) {
-+            return jqNodes;
-+        }
-+
-+        while (i--) {
-+            var node = jqNodes[i];
-+            if (node.nodeType === NODE_TYPE_COMMENT ||
-+                (node.nodeType === NODE_TYPE_TEXT && node.nodeValue.trim() === '')) {
-+                splice.call(jqNodes, i, 1);
-+            }
-+        }
-+        return jqNodes;
-+    }
-+
-+    var $controllerMinErr = minErr('$controller');
-+
-+
-+    var CNTRL_REG = /^(\S+)(\s+as\s+([\w$]+))?$/;
-+    function identifierForController(controller, ident) {
-+        if (ident && isString(ident)) return ident;
-+        if (isString(controller)) {
-+            var match = CNTRL_REG.exec(controller);
-+            if (match) return match[3];
-+        }
-+    }
-+
-+
-     /**
-      * @ngdoc provider
-      * @name $controllerProvider
-+     * @this
-+     *
-      * @description
--     * The {@link ng.$controller $controller service} is used by Angular to create new
-+     * The {@link ng.$controller $controller service} is used by AngularJS to create new
-      * controllers.
-      *
-      * This provider allows controller registration via the
-@@ -7072,8 +10945,16 @@
-      */
-     function $ControllerProvider() {
-         var controllers = {},
--            CNTRL_REG = /^(\S+)(\s+as\s+(\w+))?$/;
-+            globals = false;
- 
-+        /**
-+         * @ngdoc method
-+         * @name $controllerProvider#has
-+         * @param {string} name Controller name to check.
-+         */
-+        this.has = function(name) {
-+            return controllers.hasOwnProperty(name);
-+        };
- 
-         /**
-          * @ngdoc method
-@@ -7092,6 +10973,20 @@
-             }
-         };
- 
-+        /**
-+         * @ngdoc method
-+         * @name $controllerProvider#allowGlobals
-+         * @description If called, allows `$controller` to find controller constructors on `window`
-+         *
-+         * @deprecated
-+         * sinceVersion="v1.3.0"
-+         * removeVersion="v1.7.0"
-+         * This method of finding controllers has been deprecated.
-+         */
-+        this.allowGlobals = function() {
-+            globals = true;
-+        };
-+
- 
-         this.$get = ['$injector', '$window', function($injector, $window) {
- 
-@@ -7106,7 +11001,12 @@
-              *
-              *    * check if a controller with given name is registered via `$controllerProvider`
-              *    * check if evaluating the string on the current scope returns a constructor
--             *    * check `window[constructor]` on the global `window` object
-+             *    * if $controllerProvider#allowGlobals, check `window[constructor]` on the global
-+             *      `window` object (deprecated, not recommended)
-+             *
-+             *    The string can use the `controller as property` syntax, where the controller instance is published
-+             *    as the specified property on the `scope`; the `scope` must be injected into `locals` param for this
-+             *    to work correctly.
-              *
-              * @param {Object} locals Injection locals for Controller.
-              * @return {Object} Instance of given controller.
-@@ -7117,34 +11017,95 @@
-              * It's just a simple call to {@link auto.$injector $injector}, but extracted into
-              * a service, so that one can override this service with [BC version](https://gist.github.com/1649788).
-              */
--            return function(expression, locals) {
-+            return function $controller(expression, locals, later, ident) {
-+                // PRIVATE API:
-+                //   param `later` --- indicates that the controller's constructor is invoked at a later time.
-+                //                     If true, $controller will allocate the object with the correct
-+                //                     prototype chain, but will not invoke the controller until a returned
-+                //                     callback is invoked.
-+                //   param `ident` --- An optional label which overrides the label parsed from the controller
-+                //                     expression, if any.
-                 var instance, match, constructor, identifier;
-+                later = later === true;
-+                if (ident && isString(ident)) {
-+                    identifier = ident;
-+                }
- 
--                if(isString(expression)) {
--                    match = expression.match(CNTRL_REG),
--                        constructor = match[1],
--                        identifier = match[3];
-+                if (isString(expression)) {
-+                    match = expression.match(CNTRL_REG);
-+                    if (!match) {
-+                        throw $controllerMinErr('ctrlfmt',
-+                            'Badly formed controller string \'{0}\'. ' +
-+                            'Must match `__name__ as __id__` or `__name__`.', expression);
-+                    }
-+                    constructor = match[1];
-+                    identifier = identifier || match[3];
-                     expression = controllers.hasOwnProperty(constructor)
-                         ? controllers[constructor]
--                        : getter(locals.$scope, constructor, true) || getter($window, constructor, true);
-+                        : getter(locals.$scope, constructor, true) ||
-+                        (globals ? getter($window, constructor, true) : undefined);
-+
-+                    if (!expression) {
-+                        throw $controllerMinErr('ctrlreg',
-+                            'The controller with the name \'{0}\' is not registered.', constructor);
-+                    }
- 
-                     assertArgFn(expression, constructor, true);
-                 }
- 
--                instance = $injector.instantiate(expression, locals);
--
--                if (identifier) {
--                    if (!(locals && typeof locals.$scope == 'object')) {
--                        throw minErr('$controller')('noscp',
--                            "Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.",
--                            constructor || expression.name, identifier);
-+                if (later) {
-+                    // Instantiate controller later:
-+                    // This machinery is used to create an instance of the object before calling the
-+                    // controller's constructor itself.
-+                    //
-+                    // This allows properties to be added to the controller before the constructor is
-+                    // invoked. Primarily, this is used for isolate scope bindings in $compile.
-+                    //
-+                    // This feature is not intended for use by applications, and is thus not documented
-+                    // publicly.
-+                    // Object creation: http://jsperf.com/create-constructor/2
-+                    var controllerPrototype = (isArray(expression) ?
-+                        expression[expression.length - 1] : expression).prototype;
-+                    instance = Object.create(controllerPrototype || null);
-+
-+                    if (identifier) {
-+                        addIdentifier(locals, identifier, instance, constructor || expression.name);
-                     }
- 
--                    locals.$scope[identifier] = instance;
-+                    return extend(function $controllerInit() {
-+                        var result = $injector.invoke(expression, instance, locals, constructor);
-+                        if (result !== instance && (isObject(result) || isFunction(result))) {
-+                            instance = result;
-+                            if (identifier) {
-+                                // If result changed, re-assign controllerAs value to scope.
-+                                addIdentifier(locals, identifier, instance, constructor || expression.name);
-+                            }
-+                        }
-+                        return instance;
-+                    }, {
-+                        instance: instance,
-+                        identifier: identifier
-+                    });
-+                }
-+
-+                instance = $injector.instantiate(expression, locals, constructor);
-+
-+                if (identifier) {
-+                    addIdentifier(locals, identifier, instance, constructor || expression.name);
-                 }
- 
-                 return instance;
-             };
-+
-+            function addIdentifier(locals, identifier, instance, name) {
-+                if (!(locals && isObject(locals.$scope))) {
-+                    throw minErr('$controller')('noscp',
-+                        'Cannot export controller \'{0}\' as \'{1}\'! No $scope object provided via `locals`.',
-+                        name, identifier);
-+                }
-+
-+                locals.$scope[identifier] = instance;
-+            }
-         }];
-     }
- 
-@@ -7152,39 +11113,69 @@
-      * @ngdoc service
-      * @name $document
-      * @requires $window
-+     * @this
-      *
-      * @description
-      * A {@link angular.element jQuery or jqLite} wrapper for the browser's `window.document` object.
-      *
-      * @example
--     <example>
-+     <example module="documentExample" name="document">
-      <file name="index.html">
--     <div ng-controller="MainCtrl">
-+     <div ng-controller="ExampleController">
-      <p>$document title: <b ng-bind="title"></b></p>
-      <p>window.document title: <b ng-bind="windowTitle"></b></p>
-      </div>
-      </file>
-      <file name="script.js">
--     function MainCtrl($scope, $document) {
--         $scope.title = $document[0].title;
--         $scope.windowTitle = angular.element(window.document)[0].title;
--       }
-+     angular.module('documentExample', [])
-+     .controller('ExampleController', ['$scope', '$document', function($scope, $document) {
-+           $scope.title = $document[0].title;
-+           $scope.windowTitle = angular.element(window.document)[0].title;
-+         }]);
-      </file>
-      </example>
-      */
--    function $DocumentProvider(){
--        this.$get = ['$window', function(window){
-+    function $DocumentProvider() {
-+        this.$get = ['$window', function(window) {
-             return jqLite(window.document);
-         }];
-     }
- 
-+
-+    /**
-+     * @private
-+     * @this
-+     * Listens for document visibility change and makes the current status accessible.
-+     */
-+    function $$IsDocumentHiddenProvider() {
-+        this.$get = ['$document', '$rootScope', function($document, $rootScope) {
-+            var doc = $document[0];
-+            var hidden = doc && doc.hidden;
-+
-+            $document.on('visibilitychange', changeListener);
-+
-+            $rootScope.$on('$destroy', function() {
-+                $document.off('visibilitychange', changeListener);
-+            });
-+
-+            function changeListener() {
-+                hidden = doc.hidden;
-+            }
-+
-+            return function() {
-+                return hidden;
-+            };
-+        }];
-+    }
-+
-     /**
-      * @ngdoc service
-      * @name $exceptionHandler
-      * @requires ng.$log
-+     * @this
-      *
-      * @description
--     * Any uncaught exception in angular expressions is delegated to this service.
-+     * Any uncaught exception in AngularJS expressions is delegated to this service.
-      * The default implementation simply delegates to `$log.error` which logs it into
-      * the browser console.
-      *
-@@ -7193,20 +11184,31 @@
-      *
-      * ## Example:
-      *
-+     * The example below will overwrite the default `$exceptionHandler` in order to (a) log uncaught
-+     * errors to the backend for later inspection by the developers and (b) to use `$log.warn()` instead
-+     * of `$log.error()`.
-+     *
-      * ```js
--     *   angular.module('exceptionOverride', []).factory('$exceptionHandler', function () {
-- *     return function (exception, cause) {
-- *       exception.message += ' (caused by "' + cause + '")';
-- *       throw exception;
-- *     };
-- *   });
-+     *   angular.
-+     *     module('exceptionOverwrite', []).
-+     *     factory('$exceptionHandler', ['$log', 'logErrorsToBackend', function($log, logErrorsToBackend) {
-+     *       return function myExceptionHandler(exception, cause) {
-+     *         logErrorsToBackend(exception, cause);
-+     *         $log.warn(exception, cause);
-+     *       };
-+     *     }]);
-      * ```
-      *
--     * This example will override the normal action of `$exceptionHandler`, to make angular
--     * exceptions fail hard when they happen, instead of just logging to the console.
-+     * <hr />
-+     * Note, that code executed in event-listeners (even those registered using jqLite's `on`/`bind`
-+     * methods) does not delegate exceptions to the {@link ng.$exceptionHandler $exceptionHandler}
-+     * (unless executed during a digest).
-+     *
-+     * If you wish, you can manually delegate exceptions, e.g.
-+     * `try { ... } catch(e) { $exceptionHandler(e); }`
-      *
-      * @param {Error} exception Exception associated with the error.
--     * @param {string=} cause optional information about the context in which
-+     * @param {string=} cause Optional information about the context in which
-      *       the error was thrown.
-      *
-      */
-@@ -7218,110 +11220,349 @@
-         }];
-     }
- 
--    /**
--     * Parse headers into key value object
--     *
--     * @param {string} headers Raw headers as a string
--     * @returns {Object} Parsed headers as key value object
--     */
--    function parseHeaders(headers) {
--        var parsed = {}, key, val, i;
--
--        if (!headers) return parsed;
--
--        forEach(headers.split('\n'), function(line) {
--            i = line.indexOf(':');
--            key = lowercase(trim(line.substr(0, i)));
--            val = trim(line.substr(i + 1));
--
--            if (key) {
--                if (parsed[key]) {
--                    parsed[key] += ', ' + val;
-+    var $$ForceReflowProvider = /** @this */ function() {
-+        this.$get = ['$document', function($document) {
-+            return function(domNode) {
-+                //the line below will force the browser to perform a repaint so
-+                //that all the animated elements within the animation frame will
-+                //be properly updated and drawn on screen. This is required to
-+                //ensure that the preparation animation is properly flushed so that
-+                //the active state picks up from there. DO NOT REMOVE THIS LINE.
-+                //DO NOT OPTIMIZE THIS LINE. THE MINIFIER WILL REMOVE IT OTHERWISE WHICH
-+                //WILL RESULT IN AN UNPREDICTABLE BUG THAT IS VERY HARD TO TRACK DOWN AND
-+                //WILL TAKE YEARS AWAY FROM YOUR LIFE.
-+                if (domNode) {
-+                    if (!domNode.nodeType && domNode instanceof jqLite) {
-+                        domNode = domNode[0];
-+                    }
-                 } else {
--                    parsed[key] = val;
-+                    domNode = $document[0].body;
-                 }
--            }
--        });
--
--        return parsed;
--    }
--
--
--    /**
--     * Returns a function that provides access to parsed headers.
--     *
--     * Headers are lazy parsed when first requested.
--     * @see parseHeaders
--     *
--     * @param {(string|Object)} headers Headers to provide access to.
--     * @returns {function(string=)} Returns a getter function which if called with:
--     *
--     *   - if called with single an argument returns a single header value or null
--     *   - if called with no arguments returns an object containing all headers.
--     */
--    function headersGetter(headers) {
--        var headersObj = isObject(headers) ? headers : undefined;
--
--        return function(name) {
--            if (!headersObj) headersObj =  parseHeaders(headers);
-+                return domNode.offsetWidth + 1;
-+            };
-+        }];
-+    };
- 
--            if (name) {
--                return headersObj[lowercase(name)] || null;
--            }
-+    var APPLICATION_JSON = 'application/json';
-+    var CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': APPLICATION_JSON + ';charset=utf-8'};
-+    var JSON_START = /^\[|^\{(?!\{)/;
-+    var JSON_ENDS = {
-+        '[': /]$/,
-+        '{': /}$/
-+    };
-+    var JSON_PROTECTION_PREFIX = /^\)]\}',?\n/;
-+    var $httpMinErr = minErr('$http');
- 
--            return headersObj;
--        };
-+    function serializeValue(v) {
-+        if (isObject(v)) {
-+            return isDate(v) ? v.toISOString() : toJson(v);
-+        }
-+        return v;
-     }
- 
- 
--    /**
--     * Chain all given functions
--     *
--     * This function is used for both request and response transforming
--     *
--     * @param {*} data Data to transform.
--     * @param {function(string=)} headers Http headers getter fn.
--     * @param {(Function|Array.<Function>)} fns Function or an array of functions.
--     * @returns {*} Transformed data.
--     */
--    function transformData(data, headers, fns) {
--        if (isFunction(fns))
--            return fns(data, headers);
--
--        forEach(fns, function(fn) {
--            data = fn(data, headers);
--        });
--
--        return data;
--    }
-+    /** @this */
-+    function $HttpParamSerializerProvider() {
-+        /**
-+         * @ngdoc service
-+         * @name $httpParamSerializer
-+         * @description
-+         *
-+         * Default {@link $http `$http`} params serializer that converts objects to strings
-+         * according to the following rules:
-+         *
-+         * * `{'foo': 'bar'}` results in `foo=bar`
-+         * * `{'foo': Date.now()}` results in `foo=2015-04-01T09%3A50%3A49.262Z` (`toISOString()` and encoded representation of a Date object)
-+         * * `{'foo': ['bar', 'baz']}` results in `foo=bar&foo=baz` (repeated key for each array element)
-+         * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D` (stringified and encoded representation of an object)
-+         *
-+         * Note that serializer will sort the request parameters alphabetically.
-+         * */
- 
-+        this.$get = function() {
-+            return function ngParamSerializer(params) {
-+                if (!params) return '';
-+                var parts = [];
-+                forEachSorted(params, function(value, key) {
-+                    if (value === null || isUndefined(value) || isFunction(value)) return;
-+                    if (isArray(value)) {
-+                        forEach(value, function(v) {
-+                            parts.push(encodeUriQuery(key)  + '=' + encodeUriQuery(serializeValue(v)));
-+                        });
-+                    } else {
-+                        parts.push(encodeUriQuery(key) + '=' + encodeUriQuery(serializeValue(value)));
-+                    }
-+                });
- 
--    function isSuccess(status) {
--        return 200 <= status && status < 300;
-+                return parts.join('&');
-+            };
-+        };
-     }
- 
-+    /** @this */
-+    function $HttpParamSerializerJQLikeProvider() {
-+        /**
-+         * @ngdoc service
-+         * @name $httpParamSerializerJQLike
-+         *
-+         * @description
-+         *
-+         * Alternative {@link $http `$http`} params serializer that follows
-+         * jQuery's [`param()`](http://api.jquery.com/jquery.param/) method logic.
-+         * The serializer will also sort the params alphabetically.
-+         *
-+         * To use it for serializing `$http` request parameters, set it as the `paramSerializer` property:
-+         *
-+         * ```js
-+         * $http({
-+         *   url: myUrl,
-+         *   method: 'GET',
-+         *   params: myParams,
-+         *   paramSerializer: '$httpParamSerializerJQLike'
-+         * });
-+         * ```
-+         *
-+         * It is also possible to set it as the default `paramSerializer` in the
-+         * {@link $httpProvider#defaults `$httpProvider`}.
-+         *
-+         * Additionally, you can inject the serializer and use it explicitly, for example to serialize
-+         * form data for submission:
-+         *
-+         * ```js
-+         * .controller(function($http, $httpParamSerializerJQLike) {
-+         *   //...
-+         *
-+         *   $http({
-+         *     url: myUrl,
-+         *     method: 'POST',
-+         *     data: $httpParamSerializerJQLike(myData),
-+         *     headers: {
-+         *       'Content-Type': 'application/x-www-form-urlencoded'
-+         *     }
-+         *   });
-+         *
-+         * });
-+         * ```
-+         *
-+         * */
-+        this.$get = function() {
-+            return function jQueryLikeParamSerializer(params) {
-+                if (!params) return '';
-+                var parts = [];
-+                serialize(params, '', true);
-+                return parts.join('&');
-+
-+                function serialize(toSerialize, prefix, topLevel) {
-+                    if (toSerialize === null || isUndefined(toSerialize)) return;
-+                    if (isArray(toSerialize)) {
-+                        forEach(toSerialize, function(value, index) {
-+                            serialize(value, prefix + '[' + (isObject(value) ? index : '') + ']');
-+                        });
-+                    } else if (isObject(toSerialize) && !isDate(toSerialize)) {
-+                        forEachSorted(toSerialize, function(value, key) {
-+                            serialize(value, prefix +
-+                                (topLevel ? '' : '[') +
-+                                key +
-+                                (topLevel ? '' : ']'));
-+                        });
-+                    } else {
-+                        parts.push(encodeUriQuery(prefix) + '=' + encodeUriQuery(serializeValue(toSerialize)));
-+                    }
-+                }
-+            };
-+        };
-+    }
-+
-+    function defaultHttpResponseTransform(data, headers) {
-+        if (isString(data)) {
-+            // Strip json vulnerability protection prefix and trim whitespace
-+            var tempData = data.replace(JSON_PROTECTION_PREFIX, '').trim();
-+
-+            if (tempData) {
-+                var contentType = headers('Content-Type');
-+                var hasJsonContentType = contentType && (contentType.indexOf(APPLICATION_JSON) === 0);
-+
-+                if (hasJsonContentType || isJsonLike(tempData)) {
-+                    try {
-+                        data = fromJson(tempData);
-+                    } catch (e) {
-+                        if (!hasJsonContentType) {
-+                            return data;
-+                        }
-+                        throw $httpMinErr('baddata', 'Data must be a valid JSON object. Received: "{0}". ' +
-+                            'Parse error: "{1}"', data, e);
-+                    }
-+                }
-+            }
-+        }
-+
-+        return data;
-+    }
-+
-+    function isJsonLike(str) {
-+        var jsonStart = str.match(JSON_START);
-+        return jsonStart && JSON_ENDS[jsonStart[0]].test(str);
-+    }
-+
-+    /**
-+     * Parse headers into key value object
-+     *
-+     * @param {string} headers Raw headers as a string
-+     * @returns {Object} Parsed headers as key value object
-+     */
-+    function parseHeaders(headers) {
-+        var parsed = createMap(), i;
-+
-+        function fillInParsed(key, val) {
-+            if (key) {
-+                parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
-+            }
-+        }
-+
-+        if (isString(headers)) {
-+            forEach(headers.split('\n'), function(line) {
-+                i = line.indexOf(':');
-+                fillInParsed(lowercase(trim(line.substr(0, i))), trim(line.substr(i + 1)));
-+            });
-+        } else if (isObject(headers)) {
-+            forEach(headers, function(headerVal, headerKey) {
-+                fillInParsed(lowercase(headerKey), trim(headerVal));
-+            });
-+        }
-+
-+        return parsed;
-+    }
-+
-+
-+    /**
-+     * Returns a function that provides access to parsed headers.
-+     *
-+     * Headers are lazy parsed when first requested.
-+     * @see parseHeaders
-+     *
-+     * @param {(string|Object)} headers Headers to provide access to.
-+     * @returns {function(string=)} Returns a getter function which if called with:
-+     *
-+     *   - if called with an argument returns a single header value or null
-+     *   - if called with no arguments returns an object containing all headers.
-+     */
-+    function headersGetter(headers) {
-+        var headersObj;
-+
-+        return function(name) {
-+            if (!headersObj) headersObj =  parseHeaders(headers);
-+
-+            if (name) {
-+                var value = headersObj[lowercase(name)];
-+                if (value === undefined) {
-+                    value = null;
-+                }
-+                return value;
-+            }
-+
-+            return headersObj;
-+        };
-+    }
-+
-+
-+    /**
-+     * Chain all given functions
-+     *
-+     * This function is used for both request and response transforming
-+     *
-+     * @param {*} data Data to transform.
-+     * @param {function(string=)} headers HTTP headers getter fn.
-+     * @param {number} status HTTP status code of the response.
-+     * @param {(Function|Array.<Function>)} fns Function or an array of functions.
-+     * @returns {*} Transformed data.
-+     */
-+    function transformData(data, headers, status, fns) {
-+        if (isFunction(fns)) {
-+            return fns(data, headers, status);
-+        }
-+
-+        forEach(fns, function(fn) {
-+            data = fn(data, headers, status);
-+        });
-+
-+        return data;
-+    }
-+
-+
-+    function isSuccess(status) {
-+        return 200 <= status && status < 300;
-+    }
- 
--    function $HttpProvider() {
--        var JSON_START = /^\s*(\[|\{[^\{])/,
--            JSON_END = /[\}\]]\s*$/,
--            PROTECTION_PREFIX = /^\)\]\}',?\n/,
--            CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': 'application/json;charset=utf-8'};
--
-+
-+    /**
-+     * @ngdoc provider
-+     * @name $httpProvider
-+     * @this
-+     *
-+     * @description
-+     * Use `$httpProvider` to change the default behavior of the {@link ng.$http $http} service.
-+     * */
-+    function $HttpProvider() {
-+        /**
-+         * @ngdoc property
-+         * @name $httpProvider#defaults
-+         * @description
-+         *
-+         * Object containing default values for all {@link ng.$http $http} requests.
-+         *
-+         * - **`defaults.cache`** - {boolean|Object} - A boolean value or object created with
-+         * {@link ng.$cacheFactory `$cacheFactory`} to enable or disable caching of HTTP responses
-+         * by default. See {@link $http#caching $http Caching} for more information.
-+         *
-+         * - **`defaults.headers`** - {Object} - Default headers for all $http requests.
-+         * Refer to {@link ng.$http#setting-http-headers $http} for documentation on
-+         * setting default headers.
-+         *     - **`defaults.headers.common`**
-+         *     - **`defaults.headers.post`**
-+         *     - **`defaults.headers.put`**
-+         *     - **`defaults.headers.patch`**
-+         *
-+         * - **`defaults.jsonpCallbackParam`** - `{string}` - the name of the query parameter that passes the name of the
-+         * callback in a JSONP request. The value of this parameter will be replaced with the expression generated by the
-+         * {@link $jsonpCallbacks} service. Defaults to `'callback'`.
-+         *
-+         * - **`defaults.paramSerializer`** - `{string|function(Object<string,string>):string}` - A function
-+         *  used to the prepare string representation of request parameters (specified as an object).
-+         *  If specified as string, it is interpreted as a function registered with the {@link auto.$injector $injector}.
-+         *  Defaults to {@link ng.$httpParamSerializer $httpParamSerializer}.
-+         *
-+         * - **`defaults.transformRequest`** -
-+         * `{Array<function(data, headersGetter)>|function(data, headersGetter)}` -
-+         * An array of functions (or a single function) which are applied to the request data.
-+         * By default, this is an array with one request transformation function:
-+         *
-+         *   - If the `data` property of the request configuration object contains an object, serialize it
-+         *     into JSON format.
-+         *
-+         * - **`defaults.transformResponse`** -
-+         * `{Array<function(data, headersGetter, status)>|function(data, headersGetter, status)}` -
-+         * An array of functions (or a single function) which are applied to the response data. By default,
-+         * this is an array which applies one response transformation function that does two things:
-+         *
-+         *  - If XSRF prefix is detected, strip it
-+         *    (see {@link ng.$http#security-considerations Security Considerations in the $http docs}).
-+         *  - If the `Content-Type` is `application/json` or the response looks like JSON,
-+         *    deserialize it using a JSON parser.
-+         *
-+         * - **`defaults.xsrfCookieName`** - {string} - Name of cookie containing the XSRF token.
-+         * Defaults value is `'XSRF-TOKEN'`.
-+         *
-+         * - **`defaults.xsrfHeaderName`** - {string} - Name of HTTP header to populate with the
-+         * XSRF token. Defaults value is `'X-XSRF-TOKEN'`.
-+         *
-+         **/
-         var defaults = this.defaults = {
-             // transform incoming response data
--            transformResponse: [function(data) {
--                if (isString(data)) {
--                    // strip json vulnerability protection prefix
--                    data = data.replace(PROTECTION_PREFIX, '');
--                    if (JSON_START.test(data) && JSON_END.test(data))
--                        data = fromJson(data);
--                }
--                return data;
--            }],
-+            transformResponse: [defaultHttpResponseTransform],
- 
-             // transform outgoing request data
-             transformRequest: [function(d) {
--                return isObject(d) && !isFile(d) && !isBlob(d) ? toJson(d) : d;
-+                return isObject(d) && !isFile(d) && !isBlob(d) && !isFormData(d) ? toJson(d) : d;
-             }],
- 
-             // default headers
-@@ -7329,32 +11570,73 @@
-                 common: {
-                     'Accept': 'application/json, text/plain, */*'
-                 },
--                post:   copy(CONTENT_TYPE_APPLICATION_JSON),
--                put:    copy(CONTENT_TYPE_APPLICATION_JSON),
--                patch:  copy(CONTENT_TYPE_APPLICATION_JSON)
-+                post:   shallowCopy(CONTENT_TYPE_APPLICATION_JSON),
-+                put:    shallowCopy(CONTENT_TYPE_APPLICATION_JSON),
-+                patch:  shallowCopy(CONTENT_TYPE_APPLICATION_JSON)
-             },
- 
-             xsrfCookieName: 'XSRF-TOKEN',
--            xsrfHeaderName: 'X-XSRF-TOKEN'
-+            xsrfHeaderName: 'X-XSRF-TOKEN',
-+
-+            paramSerializer: '$httpParamSerializer',
-+
-+            jsonpCallbackParam: 'callback'
-         };
- 
-+        var useApplyAsync = false;
-         /**
--         * Are ordered by request, i.e. they are applied in the same order as the
--         * array, on request, but reverse order, on response.
--         */
--        var interceptorFactories = this.interceptors = [];
-+         * @ngdoc method
-+         * @name $httpProvider#useApplyAsync
-+         * @description
-+         *
-+         * Configure $http service to combine processing of multiple http responses received at around
-+         * the same time via {@link ng.$rootScope.Scope#$applyAsync $rootScope.$applyAsync}. This can result in
-+         * significant performance improvement for bigger applications that make many HTTP requests
-+         * concurrently (common during application bootstrap).
-+         *
-+         * Defaults to false. If no value is specified, returns the current configured value.
-+         *
-+         * @param {boolean=} value If true, when requests are loaded, they will schedule a deferred
-+         *    "apply" on the next tick, giving time for subsequent requests in a roughly ~10ms window
-+         *    to load and share the same digest cycle.
-+         *
-+         * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining.
-+         *    otherwise, returns the current configured value.
-+         **/
-+        this.useApplyAsync = function(value) {
-+            if (isDefined(value)) {
-+                useApplyAsync = !!value;
-+                return this;
-+            }
-+            return useApplyAsync;
-+        };
- 
-         /**
--         * For historical reasons, response interceptors are ordered by the order in which
--         * they are applied to the response. (This is the opposite of interceptorFactories)
--         */
--        var responseInterceptorFactories = this.responseInterceptors = [];
-+         * @ngdoc property
-+         * @name $httpProvider#interceptors
-+         * @description
-+         *
-+         * Array containing service factories for all synchronous or asynchronous {@link ng.$http $http}
-+         * pre-processing of request or postprocessing of responses.
-+         *
-+         * These service factories are ordered by request, i.e. they are applied in the same order as the
-+         * array, on request, but reverse order, on response.
-+         *
-+         * {@link ng.$http#interceptors Interceptors detailed info}
-+         **/
-+        var interceptorFactories = this.interceptors = [];
- 
--        this.$get = ['$httpBackend', '$browser', '$cacheFactory', '$rootScope', '$q', '$injector',
--            function($httpBackend, $browser, $cacheFactory, $rootScope, $q, $injector) {
-+        this.$get = ['$browser', '$httpBackend', '$$cookieReader', '$cacheFactory', '$rootScope', '$q', '$injector', '$sce',
-+            function($browser, $httpBackend, $$cookieReader, $cacheFactory, $rootScope, $q, $injector, $sce) {
- 
-                 var defaultCache = $cacheFactory('$http');
- 
-+                /**
-+                 * Make sure that default param serializer is exposed as a function
-+                 */
-+                defaults.paramSerializer = isString(defaults.paramSerializer) ?
-+                    $injector.get(defaults.paramSerializer) : defaults.paramSerializer;
-+
-                 /**
-                  * Interceptors stored in reverse order. Inner interceptors before outer interceptors.
-                  * The reversal is needed so that we can build up the interception chain around the
-@@ -7367,27 +11649,6 @@
-                         ? $injector.get(interceptorFactory) : $injector.invoke(interceptorFactory));
-                 });
- 
--                forEach(responseInterceptorFactories, function(interceptorFactory, index) {
--                    var responseFn = isString(interceptorFactory)
--                        ? $injector.get(interceptorFactory)
--                        : $injector.invoke(interceptorFactory);
--
--                    /**
--                     * Response interceptors go before "around" interceptors (no real reason, just
--                     * had to pick one.) But they are already reversed, so we can't use unshift, hence
--                     * the splice.
--                     */
--                    reversedInterceptors.splice(index, 0, {
--                        response: function(response) {
--                            return responseFn($q.when(response));
--                        },
--                        responseError: function(response) {
--                            return responseFn($q.reject(response));
--                        }
--                    });
--                });
--
--
-                 /**
-                  * @ngdoc service
-                  * @kind function
-@@ -7399,7 +11660,7 @@
-                  * @requires $injector
-                  *
-                  * @description
--                 * The `$http` service is a core Angular service that facilitates communication with the remote
-+                 * The `$http` service is a core AngularJS service that facilitates communication with the remote
-                  * HTTP servers via the browser's [XMLHttpRequest](https://developer.mozilla.org/en/xmlhttprequest)
-                  * object or via [JSONP](http://en.wikipedia.org/wiki/JSONP).
-                  *
-@@ -7414,52 +11675,52 @@
-                  * it is important to familiarize yourself with these APIs and the guarantees they provide.
-                  *
-                  *
--                 * # General usage
--                 * The `$http` service is a function which takes a single argument — a configuration object —
--                 * that is used to generate an HTTP request and returns  a {@link ng.$q promise}
--                 * with two $http specific methods: `success` and `error`.
-+                 * ## General usage
-+                 * The `$http` service is a function which takes a single argument — a {@link $http#usage configuration object} —
-+                 * that is used to generate an HTTP request and returns  a {@link ng.$q promise}.
-                  *
-                  * ```js
--                 *   $http({method: 'GET', url: '/someUrl'}).
--                 *     success(function(data, status, headers, config) {
--     *       // this callback will be called asynchronously
--     *       // when the response is available
--     *     }).
--                 *     error(function(data, status, headers, config) {
--     *       // called asynchronously if an error occurs
--     *       // or server returns response with an error status.
--     *     });
-+                 *   // Simple GET request example:
-+                 *   $http({
-+                 *     method: 'GET',
-+                 *     url: '/someUrl'
-+                 *   }).then(function successCallback(response) {
-+                 *       // this callback will be called asynchronously
-+                 *       // when the response is available
-+                 *     }, function errorCallback(response) {
-+                 *       // called asynchronously if an error occurs
-+                 *       // or server returns response with an error status.
-+                 *     });
-                  * ```
-                  *
--                 * Since the returned value of calling the $http function is a `promise`, you can also use
--                 * the `then` method to register callbacks, and these callbacks will receive a single argument –
--                 * an object representing the response. See the API signature and type info below for more
--                 * details.
-+                 * The response object has these properties:
-                  *
--                 * A response status code between 200 and 299 is considered a success status and
--                 * will result in the success callback being called. Note that if the response is a redirect,
--                 * XMLHttpRequest will transparently follow it, meaning that the error callback will not be
--                 * called for such responses.
-+                 *   - **data** – `{string|Object}` – The response body transformed with the transform
-+                 *     functions.
-+                 *   - **status** – `{number}` – HTTP status code of the response.
-+                 *   - **headers** – `{function([headerName])}` – Header getter function.
-+                 *   - **config** – `{Object}` – The configuration object that was used to generate the request.
-+                 *   - **statusText** – `{string}` – HTTP status text of the response.
-+                 *   - **xhrStatus** – `{string}` – Status of the XMLHttpRequest (`complete`, `error`, `timeout` or `abort`).
-                  *
--                 * # Writing Unit Tests that use $http
--                 * When unit testing (using {@link ngMock ngMock}), it is necessary to call
--                 * {@link ngMock.$httpBackend#flush $httpBackend.flush()} to flush each pending
--                 * request using trained responses.
-+                 * A response status code between 200 and 299 is considered a success status and will result in
-+                 * the success callback being called. Any response status code outside of that range is
-+                 * considered an error status and will result in the error callback being called.
-+                 * Also, status codes less than -1 are normalized to zero. -1 usually means the request was
-+                 * aborted, e.g. using a `config.timeout`.
-+                 * Note that if the response is a redirect, XMLHttpRequest will transparently follow it, meaning
-+                 * that the outcome (success or error) will be determined by the final response status code.
-                  *
--                 * ```
--                 * $httpBackend.expectGET(...);
--                 * $http.get(...);
--                 * $httpBackend.flush();
--                 * ```
-                  *
--                 * # Shortcut methods
-+                 * ## Shortcut methods
-                  *
-                  * Shortcut methods are also available. All shortcut methods require passing in the URL, and
--                 * request data must be passed in for POST/PUT requests.
-+                 * request data must be passed in for POST/PUT requests. An optional config can be passed as the
-+                 * last argument.
-                  *
-                  * ```js
--                 *   $http.get('/someUrl').success(successCallback);
--                 *   $http.post('/someUrl', data).success(successCallback);
-+                 *   $http.get('/someUrl', config).then(successCallback, errorCallback);
-+                 *   $http.post('/someUrl', data, config).then(successCallback, errorCallback);
-                  * ```
-                  *
-                  * Complete list of shortcut methods:
-@@ -7470,16 +11731,28 @@
-                  * - {@link ng.$http#put $http.put}
-                  * - {@link ng.$http#delete $http.delete}
-                  * - {@link ng.$http#jsonp $http.jsonp}
-+                 * - {@link ng.$http#patch $http.patch}
-+                 *
-                  *
-+                 * ## Writing Unit Tests that use $http
-+                 * When unit testing (using {@link ngMock ngMock}), it is necessary to call
-+                 * {@link ngMock.$httpBackend#flush $httpBackend.flush()} to flush each pending
-+                 * request using trained responses.
-+                 *
-+                 * ```
-+                 * $httpBackend.expectGET(...);
-+                 * $http.get(...);
-+                 * $httpBackend.flush();
-+                 * ```
-                  *
--                 * # Setting HTTP Headers
-+                 * ## Setting HTTP Headers
-                  *
-                  * The $http service will automatically add certain HTTP headers to all requests. These defaults
-                  * can be fully configured by accessing the `$httpProvider.defaults.headers` configuration
-                  * object, which currently contains this default configuration:
-                  *
-                  * - `$httpProvider.defaults.headers.common` (headers that are common for all requests):
--                 *   - `Accept: application/json, text/plain, * / *`
-+                 *   - <code>Accept: application/json, text/plain, \*&#65279;/&#65279;\*</code>
-                  * - `$httpProvider.defaults.headers.post`: (header defaults for POST requests)
-                  *   - `Content-Type: application/json`
-                  * - `$httpProvider.defaults.headers.put` (header defaults for PUT requests)
-@@ -7488,74 +11761,143 @@
-                  * To add or overwrite these defaults, simply add or remove a property from these configuration
-                  * objects. To add headers for an HTTP method other than POST or PUT, simply add a new object
-                  * with the lowercased HTTP method name as the key, e.g.
--                 * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }.
-+                 * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }`.
-                  *
-                  * The defaults can also be set at runtime via the `$http.defaults` object in the same
-                  * fashion. For example:
-                  *
-                  * ```
-                  * module.run(function($http) {
--     *   $http.defaults.headers.common.Authorization = 'Basic YmVlcDpib29w'
--     * });
-+                 *   $http.defaults.headers.common.Authorization = 'Basic YmVlcDpib29w';
-+                 * });
-                  * ```
-                  *
-                  * In addition, you can supply a `headers` property in the config object passed when
-                  * calling `$http(config)`, which overrides the defaults without changing them globally.
-                  *
-+                 * To explicitly remove a header automatically added via $httpProvider.defaults.headers on a per request basis,
-+                 * Use the `headers` property, setting the desired header to `undefined`. For example:
-+                 *
-+                 * ```js
-+                 * var req = {
-+                 *  method: 'POST',
-+                 *  url: 'http://example.com',
-+                 *  headers: {
-+                 *    'Content-Type': undefined
-+                 *  },
-+                 *  data: { test: 'test' }
-+                 * }
-+                 *
-+                 * $http(req).then(function(){...}, function(){...});
-+                 * ```
-+                 *
-+                 * ## Transforming Requests and Responses
-+                 *
-+                 * Both requests and responses can be transformed using transformation functions: `transformRequest`
-+                 * and `transformResponse`. These properties can be a single function that returns
-+                 * the transformed value (`function(data, headersGetter, status)`) or an array of such transformation functions,
-+                 * which allows you to `push` or `unshift` a new transformation function into the transformation chain.
-                  *
--                 * # Transforming Requests and Responses
-+                 * <div class="alert alert-warning">
-+                 * **Note:** AngularJS does not make a copy of the `data` parameter before it is passed into the `transformRequest` pipeline.
-+                 * That means changes to the properties of `data` are not local to the transform function (since Javascript passes objects by reference).
-+                 * For example, when calling `$http.get(url, $scope.myObject)`, modifications to the object's properties in a transformRequest
-+                 * function will be reflected on the scope and in any templates where the object is data-bound.
-+                 * To prevent this, transform functions should have no side-effects.
-+                 * If you need to modify properties, it is recommended to make a copy of the data, or create new object to return.
-+                 * </div>
-+                 *
-+                 * ### Default Transformations
-+                 *
-+                 * The `$httpProvider` provider and `$http` service expose `defaults.transformRequest` and
-+                 * `defaults.transformResponse` properties. If a request does not provide its own transformations
-+                 * then these will be applied.
-                  *
--                 * Both requests and responses can be transformed using transform functions. By default, Angular
--                 * applies these transformations:
-+                 * You can augment or replace the default transformations by modifying these properties by adding to or
-+                 * replacing the array.
-                  *
--                 * Request transformations:
-+                 * AngularJS provides the following default transformations:
-+                 *
-+                 * Request transformations (`$httpProvider.defaults.transformRequest` and `$http.defaults.transformRequest`) is
-+                 * an array with one function that does the following:
-                  *
-                  * - If the `data` property of the request configuration object contains an object, serialize it
-                  *   into JSON format.
-                  *
--                 * Response transformations:
-+                 * Response transformations (`$httpProvider.defaults.transformResponse` and `$http.defaults.transformResponse`) is
-+                 * an array with one function that does the following:
-                  *
-                  *  - If XSRF prefix is detected, strip it (see Security Considerations section below).
--                 *  - If JSON response is detected, deserialize it using a JSON parser.
-+                 *  - If the `Content-Type` is `application/json` or the response looks like JSON,
-+                 *      deserialize it using a JSON parser.
-+                 *
-                  *
--                 * To globally augment or override the default transforms, modify the
--                 * `$httpProvider.defaults.transformRequest` and `$httpProvider.defaults.transformResponse`
--                 * properties. These properties are by default an array of transform functions, which allows you
--                 * to `push` or `unshift` a new transformation function into the transformation chain. You can
--                 * also decide to completely override any default transformations by assigning your
--                 * transformation functions to these properties directly without the array wrapper.  These defaults
--                 * are again available on the $http factory at run-time, which may be useful if you have run-time
--                 * services you wish to be involved in your transformations.
-+                 * ### Overriding the Default Transformations Per Request
-                  *
--                 * Similarly, to locally override the request/response transforms, augment the
--                 * `transformRequest` and/or `transformResponse` properties of the configuration object passed
-+                 * If you wish to override the request/response transformations only for a single request then provide
-+                 * `transformRequest` and/or `transformResponse` properties on the configuration object passed
-                  * into `$http`.
-                  *
-+                 * Note that if you provide these properties on the config object the default transformations will be
-+                 * overwritten. If you wish to augment the default transformations then you must include them in your
-+                 * local transformation array.
-+                 *
-+                 * The following code demonstrates adding a new response transformation to be run after the default response
-+                 * transformations have been run.
-+                 *
-+                 * ```js
-+                 * function appendTransform(defaults, transform) {
-+                 *
-+                 *   // We can't guarantee that the default transformation is an array
-+                 *   defaults = angular.isArray(defaults) ? defaults : [defaults];
-+                 *
-+                 *   // Append the new transformation to the defaults
-+                 *   return defaults.concat(transform);
-+                 * }
-+                 *
-+                 * $http({
-+                 *   url: '...',
-+                 *   method: 'GET',
-+                 *   transformResponse: appendTransform($http.defaults.transformResponse, function(value) {
-+                 *     return doTransform(value);
-+                 *   })
-+                 * });
-+                 * ```
-+                 *
-+                 *
-+                 * ## Caching
-+                 *
-+                 * {@link ng.$http `$http`} responses are not cached by default. To enable caching, you must
-+                 * set the config.cache value or the default cache value to TRUE or to a cache object (created
-+                 * with {@link ng.$cacheFactory `$cacheFactory`}). If defined, the value of config.cache takes
-+                 * precedence over the default cache value.
-                  *
--                 * # Caching
-+                 * In order to:
-+                 *   * cache all responses - set the default cache value to TRUE or to a cache object
-+                 *   * cache a specific response - set config.cache value to TRUE or to a cache object
-                  *
--                 * To enable caching, set the request configuration `cache` property to `true` (to use default
--                 * cache) or to a custom cache object (built with {@link ng.$cacheFactory `$cacheFactory`}).
--                 * When the cache is enabled, `$http` stores the response from the server in the specified
--                 * cache. The next time the same request is made, the response is served from the cache without
--                 * sending a request to the server.
-+                 * If caching is enabled, but neither the default cache nor config.cache are set to a cache object,
-+                 * then the default `$cacheFactory("$http")` object is used.
-                  *
--                 * Note that even if the response is served from cache, delivery of the data is asynchronous in
--                 * the same way that real requests are.
-+                 * The default cache value can be set by updating the
-+                 * {@link ng.$http#defaults `$http.defaults.cache`} property or the
-+                 * {@link $httpProvider#defaults `$httpProvider.defaults.cache`} property.
-                  *
--                 * If there are multiple GET requests for the same URL that should be cached using the same
--                 * cache, but the cache is not populated yet, only one request to the server will be made and
--                 * the remaining requests will be fulfilled using the response from the first request.
-+                 * When caching is enabled, {@link ng.$http `$http`} stores the response from the server using
-+                 * the relevant cache object. The next time the same request is made, the response is returned
-+                 * from the cache without sending a request to the server.
-                  *
--                 * You can change the default cache to a new object (built with
--                 * {@link ng.$cacheFactory `$cacheFactory`}) by updating the
--                 * {@link ng.$http#properties_defaults `$http.defaults.cache`} property. All requests who set
--                 * their `cache` property to `true` will now use this cache object.
-+                 * Take note that:
-                  *
--                 * If you set the default cache to `false` then only requests that specify their own custom
--                 * cache object will be cached.
-+                 *   * Only GET and JSONP requests are cached.
-+                 *   * The cache key is the request URL including search parameters; headers are not considered.
-+                 *   * Cached responses are returned asynchronously, in the same way as responses from the server.
-+                 *   * If multiple identical requests are made using the same cache, which is not yet populated,
-+                 *     one request will be made to the server and remaining requests will return the same response.
-+                 *   * A cache-control header on the response does not affect if or how responses are cached.
-                  *
--                 * # Interceptors
-+                 *
-+                 * ## Interceptors
-                  *
-                  * Before you start creating interceptors, be sure to understand the
-                  * {@link ng.$q $q and deferred/promise APIs}.
-@@ -7573,14 +11915,14 @@
-                  *
-                  * There are two kinds of interceptors (and two kinds of rejection interceptors):
-                  *
--                 *   * `request`: interceptors get called with http `config` object. The function is free to
--                 *     modify the `config` or create a new one. The function needs to return the `config`
--                 *     directly or as a promise.
-+                 *   * `request`: interceptors get called with a http {@link $http#usage config} object. The function is free to
-+                 *     modify the `config` object or create a new one. The function needs to return the `config`
-+                 *     object directly, or a promise containing the `config` or a new `config` object.
-                  *   * `requestError`: interceptor gets called when a previous interceptor threw an error or
-                  *     resolved with a rejection.
-                  *   * `response`: interceptors get called with http `response` object. The function is free to
--                 *     modify the `response` or create a new one. The function needs to return the `response`
--                 *     directly or as a promise.
-+                 *     modify the `response` object or create a new one. The function needs to return the `response`
-+                 *     object directly, or as a promise containing the `response` or a new `response` object.
-                  *   * `responseError`: interceptor gets called when a previous interceptor threw an error or
-                  *     resolved with a rejection.
-                  *
-@@ -7588,121 +11930,76 @@
-                  * ```js
-                  *   // register the interceptor as a service
-                  *   $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) {
--     *     return {
--     *       // optional method
--     *       'request': function(config) {
--     *         // do something on success
--     *         return config || $q.when(config);
--     *       },
--     *
--     *       // optional method
--     *      'requestError': function(rejection) {
--     *         // do something on error
--     *         if (canRecover(rejection)) {
--     *           return responseOrNewPromise
--     *         }
--     *         return $q.reject(rejection);
--     *       },
--     *
--     *
--     *
--     *       // optional method
--     *       'response': function(response) {
--     *         // do something on success
--     *         return response || $q.when(response);
--     *       },
--     *
--     *       // optional method
--     *      'responseError': function(rejection) {
--     *         // do something on error
--     *         if (canRecover(rejection)) {
--     *           return responseOrNewPromise
--     *         }
--     *         return $q.reject(rejection);
--     *       }
--     *     };
--     *   });
-+                 *     return {
-+                 *       // optional method
-+                 *       'request': function(config) {
-+                 *         // do something on success
-+                 *         return config;
-+                 *       },
-+                 *
-+                 *       // optional method
-+                 *      'requestError': function(rejection) {
-+                 *         // do something on error
-+                 *         if (canRecover(rejection)) {
-+                 *           return responseOrNewPromise
-+                 *         }
-+                 *         return $q.reject(rejection);
-+                 *       },
-+                 *
-+                 *
-+                 *
-+                 *       // optional method
-+                 *       'response': function(response) {
-+                 *         // do something on success
-+                 *         return response;
-+                 *       },
-+                 *
-+                 *       // optional method
-+                 *      'responseError': function(rejection) {
-+                 *         // do something on error
-+                 *         if (canRecover(rejection)) {
-+                 *           return responseOrNewPromise
-+                 *         }
-+                 *         return $q.reject(rejection);
-+                 *       }
-+                 *     };
-+                 *   });
-                  *
-                  *   $httpProvider.interceptors.push('myHttpInterceptor');
-                  *
-                  *
-                  *   // alternatively, register the interceptor via an anonymous factory
-                  *   $httpProvider.interceptors.push(function($q, dependency1, dependency2) {
--     *     return {
--     *      'request': function(config) {
--     *          // same as above
--     *       },
--     *
--     *       'response': function(response) {
--     *          // same as above
--     *       }
--     *     };
--     *   });
-+                 *     return {
-+                 *      'request': function(config) {
-+                 *          // same as above
-+                 *       },
-+                 *
-+                 *       'response': function(response) {
-+                 *          // same as above
-+                 *       }
-+                 *     };
-+                 *   });
-                  * ```
-                  *
--                 * # Response interceptors (DEPRECATED)
-+                 * ## Security Considerations
-                  *
--                 * Before you start creating interceptors, be sure to understand the
--                 * {@link ng.$q $q and deferred/promise APIs}.
-+                 * When designing web applications, consider security threats from:
-                  *
--                 * For purposes of global error handling, authentication or any kind of synchronous or
--                 * asynchronous preprocessing of received responses, it is desirable to be able to intercept
--                 * responses for http requests before they are handed over to the application code that
--                 * initiated these requests. The response interceptors leverage the {@link ng.$q
--     * promise apis} to fulfil this need for both synchronous and asynchronous preprocessing.
-+                 * - [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
-+                 * - [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery)
-                  *
--                 * The interceptors are service factories that are registered with the $httpProvider by
--                 * adding them to the `$httpProvider.responseInterceptors` array. The factory is called and
--                 * injected with dependencies (if specified) and returns the interceptor  — a function that
--                 * takes a {@link ng.$q promise} and returns the original or a new promise.
-+                 * Both server and the client must cooperate in order to eliminate these threats. AngularJS comes
-+                 * pre-configured with strategies that address these issues, but for this to work backend server
-+                 * cooperation is required.
-                  *
--                 * ```js
--                 *   // register the interceptor as a service
--                 *   $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) {
--     *     return function(promise) {
--     *       return promise.then(function(response) {
--     *         // do something on success
--     *         return response;
--     *       }, function(response) {
--     *         // do something on error
--     *         if (canRecover(response)) {
--     *           return responseOrNewPromise
--     *         }
--     *         return $q.reject(response);
--     *       });
--     *     }
--     *   });
--                 *
--                 *   $httpProvider.responseInterceptors.push('myHttpInterceptor');
--                 *
--                 *
--                 *   // register the interceptor via an anonymous factory
--                 *   $httpProvider.responseInterceptors.push(function($q, dependency1, dependency2) {
--     *     return function(promise) {
--     *       // same as above
--     *     }
--     *   });
--                 * ```
--                 *
--                 *
--                 * # Security Considerations
--                 *
--                 * When designing web applications, consider security threats from:
--                 *
--                 * - [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
--                 * - [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery)
--                 *
--                 * Both server and the client must cooperate in order to eliminate these threats. Angular comes
--                 * pre-configured with strategies that address these issues, but for this to work backend server
--                 * cooperation is required.
--                 *
--                 * ## JSON Vulnerability Protection
-+                 * ### JSON Vulnerability Protection
-                  *
-                  * A [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
-                  * allows third party website to turn your JSON resource URL into
-                  * [JSONP](http://en.wikipedia.org/wiki/JSONP) request under some conditions. To
-                  * counter this your server can prefix all JSON requests with following string `")]}',\n"`.
--                 * Angular will automatically strip the prefix before processing it as JSON.
-+                 * AngularJS will automatically strip the prefix before processing it as JSON.
-                  *
-                  * For example if your server needs to return:
-                  * ```js
-@@ -7715,18 +12012,18 @@
-                  * ['one','two']
-                  * ```
-                  *
--                 * Angular will strip the prefix, before processing the JSON.
-+                 * AngularJS will strip the prefix, before processing the JSON.
-                  *
-                  *
--                 * ## Cross Site Request Forgery (XSRF) Protection
-+                 * ### Cross Site Request Forgery (XSRF) Protection
-                  *
--                 * [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) is a technique by which
--                 * an unauthorized site can gain your user's private data. Angular provides a mechanism
--                 * to counter XSRF. When performing XHR requests, the $http service reads a token from a cookie
--                 * (by default, `XSRF-TOKEN`) and sets it as an HTTP header (`X-XSRF-TOKEN`). Since only
--                 * JavaScript that runs on your domain could read the cookie, your server can be assured that
--                 * the XHR came from JavaScript running on your domain. The header will not be set for
--                 * cross-domain requests.
-+                 * [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) is an attack technique by
-+                 * which the attacker can trick an authenticated user into unknowingly executing actions on your
-+                 * website. AngularJS provides a mechanism to counter XSRF. When performing XHR requests, the
-+                 * $http service reads a token from a cookie (by default, `XSRF-TOKEN`) and sets it as an HTTP
-+                 * header (`X-XSRF-TOKEN`). Since only JavaScript that runs on your domain could read the
-+                 * cookie, your server can be assured that the XHR came from JavaScript running on your domain.
-+                 * The header will not be set for cross-domain requests.
-                  *
-                  * To take advantage of this, your server needs to set a token in a JavaScript readable session
-                  * cookie called `XSRF-TOKEN` on the first HTTP GET request. On subsequent XHR requests the
-@@ -7734,85 +12031,92 @@
-                  * that only JavaScript running on your domain could have sent the request. The token must be
-                  * unique for each user and must be verifiable by the server (to prevent the JavaScript from
-                  * making up its own tokens). We recommend that the token is a digest of your site's
--                 * authentication cookie with a [salt](https://en.wikipedia.org/wiki/Salt_(cryptography))
-+                 * authentication cookie with a [salt](https://en.wikipedia.org/wiki/Salt_(cryptography&#41;)
-                  * for added security.
-                  *
-                  * The name of the headers can be specified using the xsrfHeaderName and xsrfCookieName
-                  * properties of either $httpProvider.defaults at config-time, $http.defaults at run-time,
-                  * or the per-request config object.
-                  *
-+                 * In order to prevent collisions in environments where multiple AngularJS apps share the
-+                 * same domain or subdomain, we recommend that each application uses unique cookie name.
-                  *
-                  * @param {object} config Object describing the request to be made and how it should be
-                  *    processed. The object has following properties:
-                  *
-                  *    - **method** – `{string}` – HTTP method (e.g. 'GET', 'POST', etc)
--                 *    - **url** – `{string}` – Absolute or relative URL of the resource that is being requested.
--                 *    - **params** – `{Object.<string|Object>}` – Map of strings or objects which will be turned
--                 *      to `?key1=value1&key2=value2` after the url. If the value is not a string, it will be
--                 *      JSONified.
-+                 *    - **url** – `{string|TrustedObject}` – Absolute or relative URL of the resource that is being requested;
-+                 *      or an object created by a call to `$sce.trustAsResourceUrl(url)`.
-+                 *    - **params** – `{Object.<string|Object>}` – Map of strings or objects which will be serialized
-+                 *      with the `paramSerializer` and appended as GET parameters.
-                  *    - **data** – `{string|Object}` – Data to be sent as the request message data.
-                  *    - **headers** – `{Object}` – Map of strings or functions which return strings representing
-                  *      HTTP headers to send to the server. If the return value of a function is null, the
--                 *      header will not be sent.
-+                 *      header will not be sent. Functions accept a config object as an argument.
-+                 *    - **eventHandlers** - `{Object}` - Event listeners to be bound to the XMLHttpRequest object.
-+                 *      To bind events to the XMLHttpRequest upload object, use `uploadEventHandlers`.
-+                 *      The handler will be called in the context of a `$apply` block.
-+                 *    - **uploadEventHandlers** - `{Object}` - Event listeners to be bound to the XMLHttpRequest upload
-+                 *      object. To bind events to the XMLHttpRequest object, use `eventHandlers`.
-+                 *      The handler will be called in the context of a `$apply` block.
-                  *    - **xsrfHeaderName** – `{string}` – Name of HTTP header to populate with the XSRF token.
-                  *    - **xsrfCookieName** – `{string}` – Name of cookie containing the XSRF token.
-                  *    - **transformRequest** –
-                  *      `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
-                  *      transform function or an array of such functions. The transform function takes the http
-                  *      request body and headers and returns its transformed (typically serialized) version.
-+                 *      See {@link ng.$http#overriding-the-default-transformations-per-request
-+     *      Overriding the Default Transformations}
-                  *    - **transformResponse** –
--                 *      `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
-+                 *      `{function(data, headersGetter, status)|Array.<function(data, headersGetter, status)>}` –
-                  *      transform function or an array of such functions. The transform function takes the http
--                 *      response body and headers and returns its transformed (typically deserialized) version.
--                 *    - **cache** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
--                 *      GET request, otherwise if a cache instance built with
--                 *      {@link ng.$cacheFactory $cacheFactory}, this cache will be used for
--                 *      caching.
-+                 *      response body, headers and status and returns its transformed (typically deserialized) version.
-+                 *      See {@link ng.$http#overriding-the-default-transformations-per-request
-+     *      Overriding the Default Transformations}
-+                 *    - **paramSerializer** - `{string|function(Object<string,string>):string}` - A function used to
-+                 *      prepare the string representation of request parameters (specified as an object).
-+                 *      If specified as string, it is interpreted as function registered with the
-+                 *      {@link $injector $injector}, which means you can create your own serializer
-+                 *      by registering it as a {@link auto.$provide#service service}.
-+                 *      The default serializer is the {@link $httpParamSerializer $httpParamSerializer};
-+                 *      alternatively, you can use the {@link $httpParamSerializerJQLike $httpParamSerializerJQLike}
-+                 *    - **cache** – `{boolean|Object}` – A boolean value or object created with
-+                 *      {@link ng.$cacheFactory `$cacheFactory`} to enable or disable caching of the HTTP response.
-+                 *      See {@link $http#caching $http Caching} for more information.
-                  *    - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise}
-                  *      that should abort the request when resolved.
-                  *    - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the
--                 *      XHR object. See [requests with credentials]https://developer.mozilla.org/en/http_access_control#section_5
-+                 *      XHR object. See [requests with credentials](https://developer.mozilla.org/docs/Web/HTTP/Access_control_CORS#Requests_with_credentials)
-                  *      for more information.
-                  *    - **responseType** - `{string}` - see
--                 *      [requestType](https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType).
-+                 *      [XMLHttpRequest.responseType](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#xmlhttprequest-responsetype).
-                  *
--                 * @returns {HttpPromise} Returns a {@link ng.$q promise} object with the
--                 *   standard `then` method and two http specific methods: `success` and `error`. The `then`
--                 *   method takes two arguments a success and an error callback which will be called with a
--                 *   response object. The `success` and `error` methods take a single argument - a function that
--                 *   will be called when the request succeeds or fails respectively. The arguments passed into
--                 *   these functions are destructured representation of the response object passed into the
--                 *   `then` method. The response object has these properties:
-+                 * @returns {HttpPromise} Returns a {@link ng.$q `Promise}` that will be resolved to a response object
-+                 *                        when the request succeeds or fails.
-                  *
--                 *   - **data** – `{string|Object}` – The response body transformed with the transform
--                 *     functions.
--                 *   - **status** – `{number}` – HTTP status code of the response.
--                 *   - **headers** – `{function([headerName])}` – Header getter function.
--                 *   - **config** – `{Object}` – The configuration object that was used to generate the request.
--                 *   - **statusText** – `{string}` – HTTP status text of the response.
-                  *
-                  * @property {Array.<Object>} pendingRequests Array of config objects for currently pending
-                  *   requests. This is primarily meant to be used for debugging purposes.
-                  *
-                  *
-                  * @example
--                 <example>
-+                 <example module="httpExample" name="http-service">
-                  <file name="index.html">
--                 <div ng-controller="FetchCtrl">
--                 <select ng-model="method">
-+                 <div ng-controller="FetchController">
-+                 <select ng-model="method" aria-label="Request method">
-                  <option>GET</option>
-                  <option>JSONP</option>
-                  </select>
--                 <input type="text" ng-model="url" size="80"/>
-+                 <input type="text" ng-model="url" size="80" aria-label="URL" />
-                  <button id="fetchbtn" ng-click="fetch()">fetch</button><br>
-                  <button id="samplegetbtn" ng-click="updateModel('GET', 'http-hello.html')">Sample GET</button>
-                  <button id="samplejsonpbtn"
-                  ng-click="updateModel('JSONP',
--                 'http://angularjs.org/greet.php?callback=JSON_CALLBACK&name=Super%20Hero')">
-+                 'https://angularjs.org/greet.php?name=Super%20Hero')">
-                  Sample JSONP
-                  </button>
-                  <button id="invalidjsonpbtn"
--                 ng-click="updateModel('JSONP', 'http://angularjs.org/doesntexist&callback=JSON_CALLBACK')">
-+                 ng-click="updateModel('JSONP', 'https://angularjs.org/doesntexist')">
-                  Invalid JSONP
-                  </button>
-                  <pre>http status code: {{status}}</pre>
-@@ -7820,30 +12124,38 @@
-                  </div>
-                  </file>
-                  <file name="script.js">
--                 function FetchCtrl($scope, $http, $templateCache) {
--    $scope.method = 'GET';
--    $scope.url = 'http-hello.html';
--
--    $scope.fetch = function() {
--      $scope.code = null;
--      $scope.response = null;
--
--      $http({method: $scope.method, url: $scope.url, cache: $templateCache}).
--        success(function(data, status) {
--          $scope.status = status;
--          $scope.data = data;
--        }).
--        error(function(data, status) {
--          $scope.data = data || "Request failed";
--          $scope.status = status;
--      });
--    };
-+                 angular.module('httpExample', [])
-+                 .config(['$sceDelegateProvider', function($sceDelegateProvider) {
-+      // We must whitelist the JSONP endpoint that we are using to show that we trust it
-+      $sceDelegateProvider.resourceUrlWhitelist([
-+        'self',
-+        'https://angularjs.org/**'
-+      ]);
-+    }])
-+                 .controller('FetchController', ['$scope', '$http', '$templateCache',
-+                 function($scope, $http, $templateCache) {
-+        $scope.method = 'GET';
-+        $scope.url = 'http-hello.html';
-+
-+        $scope.fetch = function() {
-+          $scope.code = null;
-+          $scope.response = null;
-+
-+          $http({method: $scope.method, url: $scope.url, cache: $templateCache}).
-+            then(function(response) {
-+              $scope.status = response.status;
-+              $scope.data = response.data;
-+            }, function(response) {
-+              $scope.data = response.data || 'Request failed';
-+              $scope.status = response.status;
-+          });
-+        };
- 
--    $scope.updateModel = function(method, url) {
--      $scope.method = method;
--      $scope.url = url;
--    };
--  }
-+        $scope.updateModel = function(method, url) {
-+          $scope.method = method;
-+          $scope.url = url;
-+        };
-+      }]);
-                  </file>
-                  <file name="http-hello.html">
-                  Hello, $http!
-@@ -7853,7 +12165,6 @@
-                  var data = element(by.binding('data'));
-                  var fetchBtn = element(by.id('fetchbtn'));
-                  var sampleGetBtn = element(by.id('samplegetbtn'));
--                 var sampleJsonpBtn = element(by.id('samplejsonpbtn'));
-                  var invalidJsonpBtn = element(by.id('invalidjsonpbtn'));
- 
-                  it('should make an xhr GET request', function() {
-@@ -7863,12 +12174,14 @@
-     expect(data.getText()).toMatch(/Hello, \$http!/);
-   });
- 
--                 it('should make a JSONP request to angularjs.org', function() {
--    sampleJsonpBtn.click();
--    fetchBtn.click();
--    expect(status.getText()).toMatch('200');
--    expect(data.getText()).toMatch(/Super Hero!/);
--  });
-+                 // Commented out due to flakes. See https://github.com/angular/angular.js/issues/9185
-+                 // it('should make a JSONP request to angularjs.org', function() {
-+//   var sampleJsonpBtn = element(by.id('samplejsonpbtn'));
-+//   sampleJsonpBtn.click();
-+//   fetchBtn.click();
-+//   expect(status.getText()).toMatch('200');
-+//   expect(data.getText()).toMatch(/Super Hero!/);
-+// });
- 
-                  it('should make JSONP request to invalid URL and invoke the error handler',
-                  function() {
-@@ -7881,90 +12194,84 @@
-                  </example>
-                  */
-                 function $http(requestConfig) {
--                    var config = {
--                        method: 'get',
--                        transformRequest: defaults.transformRequest,
--                        transformResponse: defaults.transformResponse
--                    };
--                    var headers = mergeHeaders(requestConfig);
--
--                    extend(config, requestConfig);
--                    config.headers = headers;
--                    config.method = uppercase(config.method);
- 
--                    var xsrfValue = urlIsSameOrigin(config.url)
--                        ? $browser.cookies()[config.xsrfCookieName || defaults.xsrfCookieName]
--                        : undefined;
--                    if (xsrfValue) {
--                        headers[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue;
-+                    if (!isObject(requestConfig)) {
-+                        throw minErr('$http')('badreq', 'Http request configuration must be an object.  Received: {0}', requestConfig);
-                     }
- 
-+                    if (!isString($sce.valueOf(requestConfig.url))) {
-+                        throw minErr('$http')('badreq', 'Http request configuration url must be a string or a $sce trusted object.  Received: {0}', requestConfig.url);
-+                    }
- 
--                    var serverRequest = function(config) {
--                        headers = config.headers;
--                        var reqData = transformData(config.data, headersGetter(headers), config.transformRequest);
--
--                        // strip content-type if data is undefined
--                        if (isUndefined(config.data)) {
--                            forEach(headers, function(value, header) {
--                                if (lowercase(header) === 'content-type') {
--                                    delete headers[header];
--                                }
--                            });
--                        }
-+                    var config = extend({
-+                        method: 'get',
-+                        transformRequest: defaults.transformRequest,
-+                        transformResponse: defaults.transformResponse,
-+                        paramSerializer: defaults.paramSerializer,
-+                        jsonpCallbackParam: defaults.jsonpCallbackParam
-+                    }, requestConfig);
- 
--                        if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
--                            config.withCredentials = defaults.withCredentials;
--                        }
-+                    config.headers = mergeHeaders(requestConfig);
-+                    config.method = uppercase(config.method);
-+                    config.paramSerializer = isString(config.paramSerializer) ?
-+                        $injector.get(config.paramSerializer) : config.paramSerializer;
- 
--                        // send request
--                        return sendReq(config, reqData, headers).then(transformResponse, transformResponse);
--                    };
-+                    $browser.$$incOutstandingRequestCount();
- 
--                    var chain = [serverRequest, undefined];
--                    var promise = $q.when(config);
-+                    var requestInterceptors = [];
-+                    var responseInterceptors = [];
-+                    var promise = $q.resolve(config);
- 
-                     // apply interceptors
-                     forEach(reversedInterceptors, function(interceptor) {
-                         if (interceptor.request || interceptor.requestError) {
--                            chain.unshift(interceptor.request, interceptor.requestError);
-+                            requestInterceptors.unshift(interceptor.request, interceptor.requestError);
-                         }
-                         if (interceptor.response || interceptor.responseError) {
--                            chain.push(interceptor.response, interceptor.responseError);
-+                            responseInterceptors.push(interceptor.response, interceptor.responseError);
-                         }
-                     });
- 
--                    while(chain.length) {
--                        var thenFn = chain.shift();
--                        var rejectFn = chain.shift();
-+                    promise = chainInterceptors(promise, requestInterceptors);
-+                    promise = promise.then(serverRequest);
-+                    promise = chainInterceptors(promise, responseInterceptors);
-+                    promise = promise.finally(completeOutstandingRequest);
- 
--                        promise = promise.then(thenFn, rejectFn);
--                    }
-+                    return promise;
- 
--                    promise.success = function(fn) {
--                        promise.then(function(response) {
--                            fn(response.data, response.status, response.headers, config);
--                        });
--                        return promise;
--                    };
- 
--                    promise.error = function(fn) {
--                        promise.then(null, function(response) {
--                            fn(response.data, response.status, response.headers, config);
--                        });
-+                    function chainInterceptors(promise, interceptors) {
-+                        for (var i = 0, ii = interceptors.length; i < ii;) {
-+                            var thenFn = interceptors[i++];
-+                            var rejectFn = interceptors[i++];
-+
-+                            promise = promise.then(thenFn, rejectFn);
-+                        }
-+
-+                        interceptors.length = 0;
-+
-                         return promise;
--                    };
-+                    }
- 
--                    return promise;
-+                    function completeOutstandingRequest() {
-+                        $browser.$$completeOutstandingRequest(noop);
-+                    }
- 
--                    function transformResponse(response) {
--                        // make a copy since the response must be cacheable
--                        var resp = extend({}, response, {
--                            data: transformData(response.data, response.headers, config.transformResponse)
-+                    function executeHeaderFns(headers, config) {
-+                        var headerContent, processedHeaders = {};
-+
-+                        forEach(headers, function(headerFn, header) {
-+                            if (isFunction(headerFn)) {
-+                                headerContent = headerFn(config);
-+                                if (headerContent != null) {
-+                                    processedHeaders[header] = headerContent;
-+                                }
-+                            } else {
-+                                processedHeaders[header] = headerFn;
-+                            }
-                         });
--                        return (isSuccess(response.status))
--                            ? resp
--                            : $q.reject(resp);
-+
-+                        return processedHeaders;
-                     }
- 
-                     function mergeHeaders(config) {
-@@ -7974,11 +12281,7 @@
- 
-                         defHeaders = extend({}, defHeaders.common, defHeaders[lowercase(config.method)]);
- 
--                        // execute if header value is function
--                        execHeaders(defHeaders);
--                        execHeaders(reqHeaders);
--
--                        // using for-in instead of forEach to avoid unecessary iteration after header has been found
-+                        // using for-in instead of forEach to avoid unnecessary iteration after header has been found
-                         defaultHeadersIteration:
-                             for (defHeaderName in defHeaders) {
-                                 lowercaseDefHeaderName = lowercase(defHeaderName);
-@@ -7992,22 +12295,39 @@
-                                 reqHeaders[defHeaderName] = defHeaders[defHeaderName];
-                             }
- 
--                        return reqHeaders;
-+                        // execute if header value is a function for merged headers
-+                        return executeHeaderFns(reqHeaders, shallowCopy(config));
-+                    }
- 
--                        function execHeaders(headers) {
--                            var headerContent;
-+                    function serverRequest(config) {
-+                        var headers = config.headers;
-+                        var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
- 
--                            forEach(headers, function(headerFn, header) {
--                                if (isFunction(headerFn)) {
--                                    headerContent = headerFn();
--                                    if (headerContent != null) {
--                                        headers[header] = headerContent;
--                                    } else {
--                                        delete headers[header];
--                                    }
-+                        // strip content-type if data is undefined
-+                        if (isUndefined(reqData)) {
-+                            forEach(headers, function(value, header) {
-+                                if (lowercase(header) === 'content-type') {
-+                                    delete headers[header];
-                                 }
-                             });
-                         }
-+
-+                        if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
-+                            config.withCredentials = defaults.withCredentials;
-+                        }
-+
-+                        // send request
-+                        return sendReq(config, reqData).then(transformResponse, transformResponse);
-+                    }
-+
-+                    function transformResponse(response) {
-+                        // make a copy since the response must be cacheable
-+                        var resp = extend({}, response);
-+                        resp.data = transformData(response.data, response.headers, response.status,
-+                            config.transformResponse);
-+                        return (isSuccess(response.status))
-+                            ? resp
-+                            : $q.reject(resp);
-                     }
-                 }
- 
-@@ -8020,8 +12340,9 @@
-                  * @description
-                  * Shortcut method to perform `GET` request.
-                  *
--                 * @param {string} url Relative or absolute URL specifying the destination of the request
--                 * @param {Object=} config Optional configuration object
-+                 * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
-+                 *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
-+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
-                  * @returns {HttpPromise} Future object
-                  */
- 
-@@ -8032,8 +12353,9 @@
-                  * @description
-                  * Shortcut method to perform `DELETE` request.
-                  *
--                 * @param {string} url Relative or absolute URL specifying the destination of the request
--                 * @param {Object=} config Optional configuration object
-+                 * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
-+                 *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
-+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
-                  * @returns {HttpPromise} Future object
-                  */
- 
-@@ -8044,8 +12366,9 @@
-                  * @description
-                  * Shortcut method to perform `HEAD` request.
-                  *
--                 * @param {string} url Relative or absolute URL specifying the destination of the request
--                 * @param {Object=} config Optional configuration object
-+                 * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
-+                 *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
-+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
-                  * @returns {HttpPromise} Future object
-                  */
- 
-@@ -8056,9 +12379,38 @@
-                  * @description
-                  * Shortcut method to perform `JSONP` request.
-                  *
--                 * @param {string} url Relative or absolute URL specifying the destination of the request.
--                 *                     Should contain `JSON_CALLBACK` string.
--                 * @param {Object=} config Optional configuration object
-+                 * Note that, since JSONP requests are sensitive because the response is given full access to the browser,
-+                 * the url must be declared, via {@link $sce} as a trusted resource URL.
-+                 * You can trust a URL by adding it to the whitelist via
-+                 * {@link $sceDelegateProvider#resourceUrlWhitelist  `$sceDelegateProvider.resourceUrlWhitelist`} or
-+                 * by explicitly trusting the URL via {@link $sce#trustAsResourceUrl `$sce.trustAsResourceUrl(url)`}.
-+                 *
-+                 * You should avoid generating the URL for the JSONP request from user provided data.
-+                 * Provide additional query parameters via `params` property of the `config` parameter, rather than
-+                 * modifying the URL itself.
-+                 *
-+                 * JSONP requests must specify a callback to be used in the response from the server. This callback
-+                 * is passed as a query parameter in the request. You must specify the name of this parameter by
-+                 * setting the `jsonpCallbackParam` property on the request config object.
-+                 *
-+                 * ```
-+                 * $http.jsonp('some/trusted/url', {jsonpCallbackParam: 'callback'})
-+                 * ```
-+                 *
-+                 * You can also specify a default callback parameter name in `$http.defaults.jsonpCallbackParam`.
-+                 * Initially this is set to `'callback'`.
-+                 *
-+                 * <div class="alert alert-danger">
-+                 * You can no longer use the `JSON_CALLBACK` string as a placeholder for specifying where the callback
-+                 * parameter value should go.
-+                 * </div>
-+                 *
-+                 * If you would like to customise where and how the callbacks are stored then try overriding
-+                 * or decorating the {@link $jsonpCallbacks} service.
-+                 *
-+                 * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
-+                 *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
-+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
-                  * @returns {HttpPromise} Future object
-                  */
-                 createShortMethods('get', 'delete', 'head', 'jsonp');
-@@ -8072,7 +12424,7 @@
-                  *
-                  * @param {string} url Relative or absolute URL specifying the destination of the request
-                  * @param {*} data Request content
--                 * @param {Object=} config Optional configuration object
-+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
-                  * @returns {HttpPromise} Future object
-                  */
- 
-@@ -8085,10 +12437,23 @@
-                  *
-                  * @param {string} url Relative or absolute URL specifying the destination of the request
-                  * @param {*} data Request content
--                 * @param {Object=} config Optional configuration object
-+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
-+                 * @returns {HttpPromise} Future object
-+                 */
-+
-+                /**
-+                 * @ngdoc method
-+                 * @name $http#patch
-+                 *
-+                 * @description
-+                 * Shortcut method to perform `PATCH` request.
-+                 *
-+                 * @param {string} url Relative or absolute URL specifying the destination of the request
-+                 * @param {*} data Request content
-+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
-                  * @returns {HttpPromise} Future object
-                  */
--                createShortMethodsWithData('post', 'put');
-+                createShortMethodsWithData('post', 'put', 'patch');
- 
-                 /**
-                  * @ngdoc property
-@@ -8109,7 +12474,7 @@
-                 function createShortMethods(names) {
-                     forEach(arguments, function(name) {
-                         $http[name] = function(url, config) {
--                            return $http(extend(config || {}, {
-+                            return $http(extend({}, config || {}, {
-                                 method: name,
-                                 url: url
-                             }));
-@@ -8121,7 +12486,7 @@
-                 function createShortMethodsWithData(name) {
-                     forEach(arguments, function(name) {
-                         $http[name] = function(url, data, config) {
--                            return $http(extend(config || {}, {
-+                            return $http(extend({}, config || {}, {
-                                 method: name,
-                                 url: url,
-                                 data: data
-@@ -8137,36 +12502,54 @@
-                  * !!! ACCESSES CLOSURE VARS:
-                  * $httpBackend, defaults, $log, $rootScope, defaultCache, $http.pendingRequests
-                  */
--                function sendReq(config, reqData, reqHeaders) {
-+                function sendReq(config, reqData) {
-                     var deferred = $q.defer(),
-                         promise = deferred.promise,
-                         cache,
-                         cachedResp,
--                        url = buildUrl(config.url, config.params);
-+                        reqHeaders = config.headers,
-+                        isJsonp = lowercase(config.method) === 'jsonp',
-+                        url = config.url;
-+
-+                    if (isJsonp) {
-+                        // JSONP is a pretty sensitive operation where we're allowing a script to have full access to
-+                        // our DOM and JS space.  So we require that the URL satisfies SCE.RESOURCE_URL.
-+                        url = $sce.getTrustedResourceUrl(url);
-+                    } else if (!isString(url)) {
-+                        // If it is not a string then the URL must be a $sce trusted object
-+                        url = $sce.valueOf(url);
-+                    }
-+
-+                    url = buildUrl(url, config.paramSerializer(config.params));
-+
-+                    if (isJsonp) {
-+                        // Check the url and add the JSONP callback placeholder
-+                        url = sanitizeJsonpCallbackParam(url, config.jsonpCallbackParam);
-+                    }
- 
-                     $http.pendingRequests.push(config);
-                     promise.then(removePendingReq, removePendingReq);
- 
--
--                    if ((config.cache || defaults.cache) && config.cache !== false && config.method == 'GET') {
-+                    if ((config.cache || defaults.cache) && config.cache !== false &&
-+                        (config.method === 'GET' || config.method === 'JSONP')) {
-                         cache = isObject(config.cache) ? config.cache
--                            : isObject(defaults.cache) ? defaults.cache
--                            : defaultCache;
-+                            : isObject(/** @type {?} */ (defaults).cache)
-+                                ? /** @type {?} */ (defaults).cache
-+                                : defaultCache;
-                     }
- 
-                     if (cache) {
-                         cachedResp = cache.get(url);
-                         if (isDefined(cachedResp)) {
--                            if (cachedResp.then) {
-+                            if (isPromiseLike(cachedResp)) {
-                                 // cached request has already been sent, but there is no response yet
--                                cachedResp.then(removePendingReq, removePendingReq);
--                                return cachedResp;
-+                                cachedResp.then(resolvePromiseWithResult, resolvePromiseWithResult);
-                             } else {
-                                 // serving from cache
-                                 if (isArray(cachedResp)) {
--                                    resolvePromise(cachedResp[1], cachedResp[0], copy(cachedResp[2]), cachedResp[3]);
-+                                    resolvePromise(cachedResp[1], cachedResp[0], shallowCopy(cachedResp[2]), cachedResp[3], cachedResp[4]);
-                                 } else {
--                                    resolvePromise(cachedResp, 200, {}, 'OK');
-+                                    resolvePromise(cachedResp, 200, {}, 'OK', 'complete');
-                                 }
-                             }
-                         } else {
-@@ -8175,14 +12558,47 @@
-                         }
-                     }
- 
--                    // if we won't have the response in cache, send the request to the backend
-+
-+                    // if we won't have the response in cache, set the xsrf headers and
-+                    // send the request to the backend
-                     if (isUndefined(cachedResp)) {
-+                        var xsrfValue = urlIsSameOrigin(config.url)
-+                            ? $$cookieReader()[config.xsrfCookieName || defaults.xsrfCookieName]
-+                            : undefined;
-+                        if (xsrfValue) {
-+                            reqHeaders[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue;
-+                        }
-+
-                         $httpBackend(config.method, url, reqData, done, reqHeaders, config.timeout,
--                            config.withCredentials, config.responseType);
-+                            config.withCredentials, config.responseType,
-+                            createApplyHandlers(config.eventHandlers),
-+                            createApplyHandlers(config.uploadEventHandlers));
-                     }
- 
-                     return promise;
- 
-+                    function createApplyHandlers(eventHandlers) {
-+                        if (eventHandlers) {
-+                            var applyHandlers = {};
-+                            forEach(eventHandlers, function(eventHandler, key) {
-+                                applyHandlers[key] = function(event) {
-+                                    if (useApplyAsync) {
-+                                        $rootScope.$applyAsync(callEventHandler);
-+                                    } else if ($rootScope.$$phase) {
-+                                        callEventHandler();
-+                                    } else {
-+                                        $rootScope.$apply(callEventHandler);
-+                                    }
-+
-+                                    function callEventHandler() {
-+                                        eventHandler(event);
-+                                    }
-+                                };
-+                            });
-+                            return applyHandlers;
-+                        }
-+                    }
-+
- 
-                     /**
-                      * Callback registered to $httpBackend():
-@@ -8190,89 +12606,127 @@
-                      *  - resolves the raw $http promise
-                      *  - calls $apply
-                      */
--                    function done(status, response, headersString, statusText) {
-+                    function done(status, response, headersString, statusText, xhrStatus) {
-                         if (cache) {
-                             if (isSuccess(status)) {
--                                cache.put(url, [status, response, parseHeaders(headersString), statusText]);
-+                                cache.put(url, [status, response, parseHeaders(headersString), statusText, xhrStatus]);
-                             } else {
-                                 // remove promise from the cache
-                                 cache.remove(url);
-                             }
-                         }
- 
--                        resolvePromise(response, status, headersString, statusText);
--                        if (!$rootScope.$$phase) $rootScope.$apply();
-+                        function resolveHttpPromise() {
-+                            resolvePromise(response, status, headersString, statusText, xhrStatus);
-+                        }
-+
-+                        if (useApplyAsync) {
-+                            $rootScope.$applyAsync(resolveHttpPromise);
-+                        } else {
-+                            resolveHttpPromise();
-+                            if (!$rootScope.$$phase) $rootScope.$apply();
-+                        }
-                     }
- 
- 
-                     /**
-                      * Resolves the raw $http promise.
-                      */
--                    function resolvePromise(response, status, headers, statusText) {
--                        // normalize internal statuses to 0
--                        status = Math.max(status, 0);
-+                    function resolvePromise(response, status, headers, statusText, xhrStatus) {
-+                        //status: HTTP response status code, 0, -1 (aborted by timeout / promise)
-+                        status = status >= -1 ? status : 0;
- 
-                         (isSuccess(status) ? deferred.resolve : deferred.reject)({
-                             data: response,
-                             status: status,
-                             headers: headersGetter(headers),
-                             config: config,
--                            statusText : statusText
-+                            statusText: statusText,
-+                            xhrStatus: xhrStatus
-                         });
-                     }
- 
-+                    function resolvePromiseWithResult(result) {
-+                        resolvePromise(result.data, result.status, shallowCopy(result.headers()), result.statusText, result.xhrStatus);
-+                    }
- 
-                     function removePendingReq() {
--                        var idx = indexOf($http.pendingRequests, config);
-+                        var idx = $http.pendingRequests.indexOf(config);
-                         if (idx !== -1) $http.pendingRequests.splice(idx, 1);
-                     }
-                 }
- 
- 
--                function buildUrl(url, params) {
--                    if (!params) return url;
--                    var parts = [];
--                    forEachSorted(params, function(value, key) {
--                        if (value === null || isUndefined(value)) return;
--                        if (!isArray(value)) value = [value];
--
--                        forEach(value, function(v) {
--                            if (isObject(v)) {
--                                v = toJson(v);
--                            }
--                            parts.push(encodeUriQuery(key) + '=' +
--                            encodeUriQuery(v));
--                        });
--                    });
--                    if(parts.length > 0) {
--                        url += ((url.indexOf('?') == -1) ? '?' : '&') + parts.join('&');
-+                function buildUrl(url, serializedParams) {
-+                    if (serializedParams.length > 0) {
-+                        url += ((url.indexOf('?') === -1) ? '?' : '&') + serializedParams;
-                     }
-                     return url;
-                 }
- 
-+                function sanitizeJsonpCallbackParam(url, cbKey) {
-+                    var parts = url.split('?');
-+                    if (parts.length > 2) {
-+                        // Throw if the url contains more than one `?` query indicator
-+                        throw $httpMinErr('badjsonp', 'Illegal use more than one "?", in url, "{1}"', url);
-+                    }
-+                    var params = parseKeyValue(parts[1]);
-+                    forEach(params, function(value, key) {
-+                        if (value === 'JSON_CALLBACK') {
-+                            // Throw if the url already contains a reference to JSON_CALLBACK
-+                            throw $httpMinErr('badjsonp', 'Illegal use of JSON_CALLBACK in url, "{0}"', url);
-+                        }
-+                        if (key === cbKey) {
-+                            // Throw if the callback param was already provided
-+                            throw $httpMinErr('badjsonp', 'Illegal use of callback param, "{0}", in url, "{1}"', cbKey, url);
-+                        }
-+                    });
-+
-+                    // Add in the JSON_CALLBACK callback param value
-+                    url += ((url.indexOf('?') === -1) ? '?' : '&') + cbKey + '=JSON_CALLBACK';
- 
-+                    return url;
-+                }
-             }];
-     }
- 
--    function createXhr(method) {
--        //if IE and the method is not RFC2616 compliant, or if XMLHttpRequest
--        //is not available, try getting an ActiveXObject. Otherwise, use XMLHttpRequest
--        //if it is available
--        if (msie <= 8 && (!method.match(/^(get|post|head|put|delete|options)$/i) ||
--            !window.XMLHttpRequest)) {
--            return new window.ActiveXObject("Microsoft.XMLHTTP");
--        } else if (window.XMLHttpRequest) {
--            return new window.XMLHttpRequest();
--        }
--
--        throw minErr('$httpBackend')('noxhr', "This browser does not support XMLHttpRequest.");
-+    /**
-+     * @ngdoc service
-+     * @name $xhrFactory
-+     * @this
-+     *
-+     * @description
-+     * Factory function used to create XMLHttpRequest objects.
-+     *
-+     * Replace or decorate this service to create your own custom XMLHttpRequest objects.
-+     *
-+     * ```
-+     * angular.module('myApp', [])
-+     * .factory('$xhrFactory', function() {
-+     *   return function createXhr(method, url) {
-+     *     return new window.XMLHttpRequest({mozSystem: true});
-+     *   };
-+     * });
-+     * ```
-+     *
-+     * @param {string} method HTTP method of the request (GET, POST, PUT, ..)
-+     * @param {string} url URL of the request.
-+     */
-+    function $xhrFactoryProvider() {
-+        this.$get = function() {
-+            return function createXhr() {
-+                return new window.XMLHttpRequest();
-+            };
-+        };
-     }
- 
-     /**
-      * @ngdoc service
-      * @name $httpBackend
--     * @requires $window
-+     * @requires $jsonpCallbacks
-      * @requires $document
-+     * @requires $xhrFactory
-+     * @this
-      *
-      * @description
-      * HTTP backend used by the {@link ng.$http service} that delegates to
-@@ -8285,38 +12739,27 @@
-  * $httpBackend} which can be trained with responses.
-      */
-     function $HttpBackendProvider() {
--        this.$get = ['$browser', '$window', '$document', function($browser, $window, $document) {
--            return createHttpBackend($browser, createXhr, $browser.defer, $window.angular.callbacks, $document[0]);
-+        this.$get = ['$browser', '$jsonpCallbacks', '$document', '$xhrFactory', function($browser, $jsonpCallbacks, $document, $xhrFactory) {
-+            return createHttpBackend($browser, $xhrFactory, $browser.defer, $jsonpCallbacks, $document[0]);
-         }];
-     }
- 
-     function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDocument) {
--        var ABORTED = -1;
--
-         // TODO(vojta): fix the signature
--        return function(method, url, post, callback, headers, timeout, withCredentials, responseType) {
--            var status;
--            $browser.$$incOutstandingRequestCount();
-+        return function(method, url, post, callback, headers, timeout, withCredentials, responseType, eventHandlers, uploadEventHandlers) {
-             url = url || $browser.url();
- 
--            if (lowercase(method) == 'jsonp') {
--                var callbackId = '_' + (callbacks.counter++).toString(36);
--                callbacks[callbackId] = function(data) {
--                    callbacks[callbackId].data = data;
--                };
--
--                var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId),
--                    function() {
--                        if (callbacks[callbackId].data) {
--                            completeRequest(callback, 200, callbacks[callbackId].data);
--                        } else {
--                            completeRequest(callback, status || -2);
--                        }
--                        callbacks[callbackId] = angular.noop;
--                    });
-+            if (lowercase(method) === 'jsonp') {
-+                var callbackPath = callbacks.createCallback(url);
-+                var jsonpDone = jsonpReq(url, callbackPath, function(status, text) {
-+                    // jsonpReq only ever sets status to 200 (OK), 404 (ERROR) or -1 (WAITING)
-+                    var response = (status === 200) && callbacks.getResponse(callbackPath);
-+                    completeRequest(callback, status, response, '', text, 'complete');
-+                    callbacks.removeCallback(callbackPath);
-+                });
-             } else {
- 
--                var xhr = createXhr(method);
-+                var xhr = createXhr(method, url);
- 
-                 xhr.open(method, url, true);
-                 forEach(headers, function(value, key) {
-@@ -8325,37 +12768,59 @@
-                     }
-                 });
- 
--                // In IE6 and 7, this might be called synchronously when xhr.send below is called and the
--                // response is in the cache. the promise api will ensure that to the app code the api is
--                // always async
--                xhr.onreadystatechange = function() {
--                    // onreadystatechange might get called multiple times with readyState === 4 on mobile webkit caused by
--                    // xhrs that are resolved while the app is in the background (see #5426).
--                    // since calling completeRequest sets the `xhr` variable to null, we just check if it's not null before
--                    // continuing
--                    //
--                    // we can't set xhr.onreadystatechange to undefined or delete it because that breaks IE8 (method=PATCH) and
--                    // Safari respectively.
--                    if (xhr && xhr.readyState == 4) {
--                        var responseHeaders = null,
--                            response = null;
--
--                        if(status !== ABORTED) {
--                            responseHeaders = xhr.getAllResponseHeaders();
--
--                            // responseText is the old-school way of retrieving response (supported by IE8 & 9)
--                            // response/responseType properties were introduced in XHR Level2 spec (supported by IE10)
--                            response = ('response' in xhr) ? xhr.response : xhr.responseText;
--                        }
-+                xhr.onload = function requestLoaded() {
-+                    var statusText = xhr.statusText || '';
- 
--                        completeRequest(callback,
--                            status || xhr.status,
--                            response,
--                            responseHeaders,
--                            xhr.statusText || '');
-+                    // responseText is the old-school way of retrieving response (supported by IE9)
-+                    // response/responseType properties were introduced in XHR Level2 spec (supported by IE10)
-+                    var response = ('response' in xhr) ? xhr.response : xhr.responseText;
-+
-+                    // normalize IE9 bug (http://bugs.jquery.com/ticket/1450)
-+                    var status = xhr.status === 1223 ? 204 : xhr.status;
-+
-+                    // fix status code when it is 0 (0 status is undocumented).
-+                    // Occurs when accessing file resources or on Android 4.1 stock browser
-+                    // while retrieving files from application cache.
-+                    if (status === 0) {
-+                        status = response ? 200 : urlResolve(url).protocol === 'file' ? 404 : 0;
-                     }
-+
-+                    completeRequest(callback,
-+                        status,
-+                        response,
-+                        xhr.getAllResponseHeaders(),
-+                        statusText,
-+                        'complete');
-+                };
-+
-+                var requestError = function() {
-+                    // The response is always empty
-+                    // See https://xhr.spec.whatwg.org/#request-error-steps and https://fetch.spec.whatwg.org/#concept-network-error
-+                    completeRequest(callback, -1, null, null, '', 'error');
-+                };
-+
-+                var requestAborted = function() {
-+                    completeRequest(callback, -1, null, null, '', 'abort');
-+                };
-+
-+                var requestTimeout = function() {
-+                    // The response is always empty
-+                    // See https://xhr.spec.whatwg.org/#request-error-steps and https://fetch.spec.whatwg.org/#concept-network-error
-+                    completeRequest(callback, -1, null, null, '', 'timeout');
-                 };
- 
-+                xhr.onerror = requestError;
-+                xhr.onabort = requestAborted;
-+                xhr.ontimeout = requestTimeout;
-+
-+                forEach(eventHandlers, function(value, key) {
-+                    xhr.addEventListener(key, value);
-+                });
-+
-+                forEach(uploadEventHandlers, function(value, key) {
-+                    xhr.upload.addEventListener(key, value);
-+                });
-+
-                 if (withCredentials) {
-                     xhr.withCredentials = true;
-                 }
-@@ -8377,87 +12842,105 @@
-                     }
-                 }
- 
--                xhr.send(post || null);
-+                xhr.send(isUndefined(post) ? null : post);
-             }
- 
-             if (timeout > 0) {
-                 var timeoutId = $browserDefer(timeoutRequest, timeout);
--            } else if (timeout && timeout.then) {
-+            } else if (isPromiseLike(timeout)) {
-                 timeout.then(timeoutRequest);
-             }
- 
- 
-             function timeoutRequest() {
--                status = ABORTED;
--                jsonpDone && jsonpDone();
--                xhr && xhr.abort();
-+                if (jsonpDone) {
-+                    jsonpDone();
-+                }
-+                if (xhr) {
-+                    xhr.abort();
-+                }
-             }
- 
--            function completeRequest(callback, status, response, headersString, statusText) {
-+            function completeRequest(callback, status, response, headersString, statusText, xhrStatus) {
-                 // cancel timeout and subsequent timeout promise resolution
--                timeoutId && $browserDefer.cancel(timeoutId);
--                jsonpDone = xhr = null;
--
--                // fix status code when it is 0 (0 status is undocumented).
--                // Occurs when accessing file resources or on Android 4.1 stock browser
--                // while retrieving files from application cache.
--                if (status === 0) {
--                    status = response ? 200 : urlResolve(url).protocol == 'file' ? 404 : 0;
-+                if (isDefined(timeoutId)) {
-+                    $browserDefer.cancel(timeoutId);
-                 }
-+                jsonpDone = xhr = null;
- 
--                // normalize IE bug (http://bugs.jquery.com/ticket/1450)
--                status = status === 1223 ? 204 : status;
--                statusText = statusText || '';
--
--                callback(status, response, headersString, statusText);
--                $browser.$$completeOutstandingRequest(noop);
-+                callback(status, response, headersString, statusText, xhrStatus);
-             }
-         };
- 
--        function jsonpReq(url, done) {
--            // we can't use jQuery/jqLite here because jQuery does crazy shit with script elements, e.g.:
-+        function jsonpReq(url, callbackPath, done) {
-+            url = url.replace('JSON_CALLBACK', callbackPath);
-+            // we can't use jQuery/jqLite here because jQuery does crazy stuff with script elements, e.g.:
-             // - fetches local scripts via XHR and evals them
-             // - adds and immediately removes script elements from the document
--            var script = rawDocument.createElement('script'),
--                doneWrapper = function() {
--                    script.onreadystatechange = script.onload = script.onerror = null;
--                    rawDocument.body.removeChild(script);
--                    if (done) done();
--                };
--
-+            var script = rawDocument.createElement('script'), callback = null;
-             script.type = 'text/javascript';
-             script.src = url;
--
--            if (msie && msie <= 8) {
--                script.onreadystatechange = function() {
--                    if (/loaded|complete/.test(script.readyState)) {
--                        doneWrapper();
-+            script.async = true;
-+
-+            callback = function(event) {
-+                script.removeEventListener('load', callback);
-+                script.removeEventListener('error', callback);
-+                rawDocument.body.removeChild(script);
-+                script = null;
-+                var status = -1;
-+                var text = 'unknown';
-+
-+                if (event) {
-+                    if (event.type === 'load' && !callbacks.wasCalled(callbackPath)) {
-+                        event = { type: 'error' };
-                     }
--                };
--            } else {
--                script.onload = script.onerror = function() {
--                    doneWrapper();
--                };
--            }
-+                    text = event.type;
-+                    status = event.type === 'error' ? 404 : 200;
-+                }
- 
-+                if (done) {
-+                    done(status, text);
-+                }
-+            };
-+
-+            script.addEventListener('load', callback);
-+            script.addEventListener('error', callback);
-             rawDocument.body.appendChild(script);
--            return doneWrapper;
-+            return callback;
-         }
-     }
- 
--    var $interpolateMinErr = minErr('$interpolate');
-+    var $interpolateMinErr = angular.$interpolateMinErr = minErr('$interpolate');
-+    $interpolateMinErr.throwNoconcat = function(text) {
-+        throw $interpolateMinErr('noconcat',
-+            'Error while interpolating: {0}\nStrict Contextual Escaping disallows ' +
-+            'interpolations that concatenate multiple expressions when a trusted value is ' +
-+            'required.  See http://docs.angularjs.org/api/ng.$sce', text);
-+    };
-+
-+    $interpolateMinErr.interr = function(text, err) {
-+        return $interpolateMinErr('interr', 'Can\'t interpolate: {0}\n{1}', text, err.toString());
-+    };
- 
-     /**
-      * @ngdoc provider
-      * @name $interpolateProvider
--     * @function
-+     * @this
-      *
-      * @description
-      *
-      * Used for configuring the interpolation markup. Defaults to `{{` and `}}`.
-      *
-+     * <div class="alert alert-danger">
-+     * This feature is sometimes used to mix different markup languages, e.g. to wrap an AngularJS
-+     * template within a Python Jinja template (or any other template language). Mixing templating
-+     * languages is **very dangerous**. The embedding template language will not safely escape AngularJS
-+     * expressions, so any user-controlled values in the template will cause Cross Site Scripting (XSS)
-+     * security bugs!
-+     * </div>
-+     *
-      * @example
--     <example module="customInterpolationApp">
-+     <example name="custom-interpolation-markup" module="customInterpolationApp">
-      <file name="index.html">
-      <script>
-      var customInterpolationApp = angular.module('customInterpolationApp', []);
-@@ -8468,11 +12951,11 @@
-   });
- 
- 
--     customInterpolationApp.controller('DemoController', function DemoController() {
-+     customInterpolationApp.controller('DemoController', function() {
-       this.label = "This binding is brought you by // interpolation symbols.";
-   });
-      </script>
--     <div ng-app="App" ng-controller="DemoController as demo">
-+     <div ng-controller="DemoController as demo">
-      //demo.label//
-      </div>
-      </file>
-@@ -8492,11 +12975,11 @@
-          * @name $interpolateProvider#startSymbol
-          * @description
-          * Symbol to denote start of expression in the interpolated string. Defaults to `{{`.
--   *
--   * @param {string=} value new value to set the starting symbol to.
-+         *
-+         * @param {string=} value new value to set the starting symbol to.
-          * @returns {string|self} Returns the symbol when used as getter and self if used as setter.
-          */
--        this.startSymbol = function(value){
-+        this.startSymbol = function(value) {
-             if (value) {
-                 startSymbol = value;
-                 return this;
-@@ -8514,7 +12997,7 @@
-          * @param {string=} value new value to set the ending symbol to.
-          * @returns {string|self} Returns the symbol when used as getter and self if used as setter.
-          */
--        this.endSymbol = function(value){
-+        this.endSymbol = function(value) {
-             if (value) {
-                 endSymbol = value;
-                 return this;
-@@ -8526,12 +13009,32 @@
- 
-         this.$get = ['$parse', '$exceptionHandler', '$sce', function($parse, $exceptionHandler, $sce) {
-             var startSymbolLength = startSymbol.length,
--                endSymbolLength = endSymbol.length;
-+                endSymbolLength = endSymbol.length,
-+                escapedStartRegexp = new RegExp(startSymbol.replace(/./g, escape), 'g'),
-+                escapedEndRegexp = new RegExp(endSymbol.replace(/./g, escape), 'g');
-+
-+            function escape(ch) {
-+                return '\\\\\\' + ch;
-+            }
-+
-+            function unescapeText(text) {
-+                return text.replace(escapedStartRegexp, startSymbol).
-+                replace(escapedEndRegexp, endSymbol);
-+            }
-+
-+            // TODO: this is the same as the constantWatchDelegate in parse.js
-+            function constantWatchDelegate(scope, listener, objectEquality, constantInterp) {
-+                var unwatch = scope.$watch(function constantInterpolateWatch(scope) {
-+                    unwatch();
-+                    return constantInterp(scope);
-+                }, listener, objectEquality);
-+                return unwatch;
-+            }
- 
-             /**
-              * @ngdoc service
-              * @name $interpolate
--             * @function
-+             * @kind function
-              *
-              * @requires $parse
-              * @requires $sce
-@@ -8547,9 +13050,89 @@
-              * ```js
-              *   var $interpolate = ...; // injected
-              *   var exp = $interpolate('Hello {{name | uppercase}}!');
--             *   expect(exp({name:'Angular'}).toEqual('Hello ANGULAR!');
-+             *   expect(exp({name:'AngularJS'})).toEqual('Hello ANGULAR!');
-+             * ```
-+             *
-+             * `$interpolate` takes an optional fourth argument, `allOrNothing`. If `allOrNothing` is
-+             * `true`, the interpolation function will return `undefined` unless all embedded expressions
-+             * evaluate to a value other than `undefined`.
-+             *
-+             * ```js
-+             *   var $interpolate = ...; // injected
-+             *   var context = {greeting: 'Hello', name: undefined };
-+             *
-+             *   // default "forgiving" mode
-+             *   var exp = $interpolate('{{greeting}} {{name}}!');
-+             *   expect(exp(context)).toEqual('Hello !');
-+             *
-+             *   // "allOrNothing" mode
-+             *   exp = $interpolate('{{greeting}} {{name}}!', false, null, true);
-+             *   expect(exp(context)).toBeUndefined();
-+             *   context.name = 'AngularJS';
-+             *   expect(exp(context)).toEqual('Hello AngularJS!');
-+             * ```
-+             *
-+             * `allOrNothing` is useful for interpolating URLs. `ngSrc` and `ngSrcset` use this behavior.
-+             *
-+             * #### Escaped Interpolation
-+             * $interpolate provides a mechanism for escaping interpolation markers. Start and end markers
-+             * can be escaped by preceding each of their characters with a REVERSE SOLIDUS U+005C (backslash).
-+             * It will be rendered as a regular start/end marker, and will not be interpreted as an expression
-+             * or binding.
-+             *
-+             * This enables web-servers to prevent script injection attacks and defacing attacks, to some
-+             * degree, while also enabling code examples to work without relying on the
-+             * {@link ng.directive:ngNonBindable ngNonBindable} directive.
-+             *
-+             * **For security purposes, it is strongly encouraged that web servers escape user-supplied data,
-+             * replacing angle brackets (&lt;, &gt;) with &amp;lt; and &amp;gt; respectively, and replacing all
-+             * interpolation start/end markers with their escaped counterparts.**
-+             *
-+             * Escaped interpolation markers are only replaced with the actual interpolation markers in rendered
-+             * output when the $interpolate service processes the text. So, for HTML elements interpolated
-+             * by {@link ng.$compile $compile}, or otherwise interpolated with the `mustHaveExpression` parameter
-+             * set to `true`, the interpolated text must contain an unescaped interpolation expression. As such,
-+             * this is typically useful only when user-data is used in rendering a template from the server, or
-+             * when otherwise untrusted data is used by a directive.
-+             *
-+             * <example name="interpolation">
-+             *  <file name="index.html">
-+             *    <div ng-init="username='A user'">
-+             *      <p ng-init="apptitle='Escaping demo'">{{apptitle}}: \{\{ username = "defaced value"; \}\}
-+             *        </p>
-+             *      <p><strong>{{username}}</strong> attempts to inject code which will deface the
-+             *        application, but fails to accomplish their task, because the server has correctly
-+             *        escaped the interpolation start/end markers with REVERSE SOLIDUS U+005C (backslash)
-+             *        characters.</p>
-+             *      <p>Instead, the result of the attempted script injection is visible, and can be removed
-+             *        from the database by an administrator.</p>
-+             *    </div>
-+             *  </file>
-+             * </example>
-+             *
-+             * @knownIssue
-+             * It is currently not possible for an interpolated expression to contain the interpolation end
-+             * symbol. For example, `{{ '}}' }}` will be incorrectly interpreted as `{{ ' }}` + `' }}`, i.e.
-+             * an interpolated expression consisting of a single-quote (`'`) and the `' }}` string.
-+             *
-+             * @knownIssue
-+             * All directives and components must use the standard `{{` `}}` interpolation symbols
-+             * in their templates. If you change the application interpolation symbols the {@link $compile}
-+             * service will attempt to denormalize the standard symbols to the custom symbols.
-+             * The denormalization process is not clever enough to know not to replace instances of the standard
-+             * symbols where they would not normally be treated as interpolation symbols. For example in the following
-+             * code snippet the closing braces of the literal object will get incorrectly denormalized:
-+             *
-+             * ```
-+             * <div data-context='{"context":{"id":3,"type":"page"}}">
-+             * ```
-+             *
-+             * The workaround is to ensure that such instances are separated by whitespace:
-+             * ```
-+             * <div data-context='{"context":{"id":3,"type":"page"} }">
-              * ```
-              *
-+             * See https://github.com/angular/angular.js/pull/14610#issuecomment-219401099 for more information.
-              *
-              * @param {string} text The text with markup to interpolate.
-              * @param {boolean=} mustHaveExpression if set to true then the interpolation string must have
-@@ -8559,43 +13142,57 @@
-              *    result through {@link ng.$sce#getTrusted $sce.getTrusted(interpolatedResult,
-      *    trustedContext)} before returning it.  Refer to the {@link ng.$sce $sce} service that
-              *    provides Strict Contextual Escaping for details.
-+             * @param {boolean=} allOrNothing if `true`, then the returned function returns undefined
-+             *    unless all embedded expressions evaluate to a value other than `undefined`.
-              * @returns {function(context)} an interpolation function which is used to compute the
-              *    interpolated string. The function has these parameters:
-              *
--             *    * `context`: an object against which any expressions embedded in the strings are evaluated
--             *      against.
--             *
-+             * - `context`: evaluation context for all expressions embedded in the interpolated text
-              */
--            function $interpolate(text, mustHaveExpression, trustedContext) {
-+            function $interpolate(text, mustHaveExpression, trustedContext, allOrNothing) {
-+                // Provide a quick exit and simplified result function for text with no interpolation
-+                if (!text.length || text.indexOf(startSymbol) === -1) {
-+                    var constantInterp;
-+                    if (!mustHaveExpression) {
-+                        var unescapedText = unescapeText(text);
-+                        constantInterp = valueFn(unescapedText);
-+                        constantInterp.exp = text;
-+                        constantInterp.expressions = [];
-+                        constantInterp.$$watchDelegate = constantWatchDelegate;
-+                    }
-+                    return constantInterp;
-+                }
-+
-+                allOrNothing = !!allOrNothing;
-                 var startIndex,
-                     endIndex,
-                     index = 0,
--                    parts = [],
--                    length = text.length,
--                    hasInterpolation = false,
--                    fn,
-+                    expressions = [],
-+                    parseFns = [],
-+                    textLength = text.length,
-                     exp,
--                    concat = [];
--
--                while(index < length) {
--                    if ( ((startIndex = text.indexOf(startSymbol, index)) != -1) &&
--                        ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) != -1) ) {
--                        (index != startIndex) && parts.push(text.substring(index, startIndex));
--                        parts.push(fn = $parse(exp = text.substring(startIndex + startSymbolLength, endIndex)));
--                        fn.exp = exp;
-+                    concat = [],
-+                    expressionPositions = [];
-+
-+                while (index < textLength) {
-+                    if (((startIndex = text.indexOf(startSymbol, index)) !== -1) &&
-+                        ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) !== -1)) {
-+                        if (index !== startIndex) {
-+                            concat.push(unescapeText(text.substring(index, startIndex)));
-+                        }
-+                        exp = text.substring(startIndex + startSymbolLength, endIndex);
-+                        expressions.push(exp);
-+                        parseFns.push($parse(exp, parseStringifyInterceptor));
-                         index = endIndex + endSymbolLength;
--                        hasInterpolation = true;
-+                        expressionPositions.push(concat.length);
-+                        concat.push('');
-                     } else {
--                        // we did not find anything, so we have to add the remainder to the parts array
--                        (index != length) && parts.push(text.substring(index));
--                        index = length;
--                    }
--                }
--
--                if (!(length = parts.length)) {
--                    // we added, nothing, must have been an empty string.
--                    parts.push('');
--                    length = 1;
-+                        // we did not find an interpolation, so we have to add the remainder to the separators array
-+                        if (index !== textLength) {
-+                            concat.push(unescapeText(text.substring(index)));
-+                        }
-+                        break;
-+                    }
-                 }
- 
-                 // Concatenating expressions makes it hard to reason about whether some combination of
-@@ -8604,44 +13201,62 @@
-                 // that's used is assigned or constructed by some JS code somewhere that is more testable or
-                 // make it obvious that you bound the value to some user controlled value.  This helps reduce
-                 // the load when auditing for XSS issues.
--                if (trustedContext && parts.length > 1) {
--                    throw $interpolateMinErr('noconcat',
--                        "Error while interpolating: {0}\nStrict Contextual Escaping disallows " +
--                        "interpolations that concatenate multiple expressions when a trusted value is " +
--                        "required.  See http://docs.angularjs.org/api/ng.$sce", text);
-+                if (trustedContext && concat.length > 1) {
-+                    $interpolateMinErr.throwNoconcat(text);
-                 }
- 
--                if (!mustHaveExpression  || hasInterpolation) {
--                    concat.length = length;
--                    fn = function(context) {
-+                if (!mustHaveExpression || expressions.length) {
-+                    var compute = function(values) {
-+                        for (var i = 0, ii = expressions.length; i < ii; i++) {
-+                            if (allOrNothing && isUndefined(values[i])) return;
-+                            concat[expressionPositions[i]] = values[i];
-+                        }
-+                        return concat.join('');
-+                    };
-+
-+                    var getValue = function(value) {
-+                        return trustedContext ?
-+                            $sce.getTrusted(trustedContext, value) :
-+                            $sce.valueOf(value);
-+                    };
-+
-+                    return extend(function interpolationFn(context) {
-+                        var i = 0;
-+                        var ii = expressions.length;
-+                        var values = new Array(ii);
-+
-                         try {
--                            for(var i = 0, ii = length, part; i<ii; i++) {
--                                if (typeof (part = parts[i]) == 'function') {
--                                    part = part(context);
--                                    if (trustedContext) {
--                                        part = $sce.getTrusted(trustedContext, part);
--                                    } else {
--                                        part = $sce.valueOf(part);
--                                    }
--                                    if (part === null || isUndefined(part)) {
--                                        part = '';
--                                    } else if (typeof part != 'string') {
--                                        part = toJson(part);
--                                    }
--                                }
--                                concat[i] = part;
-+                            for (; i < ii; i++) {
-+                                values[i] = parseFns[i](context);
-                             }
--                            return concat.join('');
-+
-+                            return compute(values);
-+                        } catch (err) {
-+                            $exceptionHandler($interpolateMinErr.interr(text, err));
-                         }
--                        catch(err) {
--                            var newErr = $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text,
--                                err.toString());
--                            $exceptionHandler(newErr);
-+
-+                    }, {
-+                        // all of these properties are undocumented for now
-+                        exp: text, //just for compatibility with regular watchers created via $watch
-+                        expressions: expressions,
-+                        $$watchDelegate: function(scope, listener) {
-+                            var lastValue;
-+                            return scope.$watchGroup(parseFns, /** @this */ function interpolateFnWatcher(values, oldValues) {
-+                                var currValue = compute(values);
-+                                listener.call(this, currValue, values !== oldValues ? lastValue : currValue, scope);
-+                                lastValue = currValue;
-+                            });
-                         }
--                    };
--                    fn.exp = text;
--                    fn.parts = parts;
--                    return fn;
-+                    });
-+                }
-+
-+                function parseStringifyInterceptor(value) {
-+                    try {
-+                        value = getValue(value);
-+                        return allOrNothing && !isDefined(value) ? value : stringify(value);
-+                    } catch (err) {
-+                        $exceptionHandler($interpolateMinErr.interr(text, err));
-+                    }
-                 }
-             }
- 
-@@ -8651,8 +13266,8 @@
-              * @name $interpolate#startSymbol
-              * @description
-              * Symbol to denote the start of expression in the interpolated string. Defaults to `{{`.
--     *
--     * Use {@link ng.$interpolateProvider#startSymbol $interpolateProvider#startSymbol} to change
-+             *
-+             * Use {@link ng.$interpolateProvider#startSymbol `$interpolateProvider.startSymbol`} to change
-              * the symbol.
-              *
-              * @returns {string} start symbol.
-@@ -8668,7 +13283,7 @@
-              * @description
-              * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`.
-              *
--             * Use {@link ng.$interpolateProvider#endSymbol $interpolateProvider#endSymbol} to change
-+             * Use {@link ng.$interpolateProvider#endSymbol `$interpolateProvider.endSymbol`} to change
-              * the symbol.
-              *
-              * @returns {string} end symbol.
-@@ -8681,9 +13296,10 @@
-         }];
-     }
- 
-+    /** @this */
-     function $IntervalProvider() {
--        this.$get = ['$rootScope', '$window', '$q',
--            function($rootScope,   $window,   $q) {
-+        this.$get = ['$rootScope', '$window', '$q', '$$q', '$browser',
-+            function($rootScope,   $window,   $q,   $$q,   $browser) {
-                 var intervals = {};
- 
- 
-@@ -8692,7 +13308,7 @@
-                  * @name $interval
-                  *
-                  * @description
--                 * Angular's wrapper for `window.setInterval`. The `fn` function is executed every `delay`
-+                 * AngularJS's wrapper for `window.setInterval`. The `fn` function is executed every `delay`
-                  * milliseconds.
-                  *
-                  * The return value of registering an interval function is a promise. This promise will be
-@@ -8713,116 +13329,124 @@
-                  * appropriate moment.  See the example below for more details on how and when to do this.
-                  * </div>
-                  *
--                 * @param {function()} fn A function that should be called repeatedly.
-+                 * @param {function()} fn A function that should be called repeatedly. If no additional arguments
-+                 *   are passed (see below), the function is called with the current iteration count.
-                  * @param {number} delay Number of milliseconds between each function call.
-                  * @param {number=} [count=0] Number of times to repeat. If not set, or 0, will repeat
-                  *   indefinitely.
-                  * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
-                  *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
--                 * @returns {promise} A promise which will be notified on each iteration.
-+                 * @param {...*=} Pass additional parameters to the executed function.
-+                 * @returns {promise} A promise which will be notified on each iteration. It will resolve once all iterations of the interval complete.
-                  *
-                  * @example
--                 * <example module="time">
--                 *   <file name="index.html">
--                 *     <script>
--                 *       function Ctrl2($scope,$interval) {
--      *         $scope.format = 'M/d/yy h:mm:ss a';
--      *         $scope.blood_1 = 100;
--      *         $scope.blood_2 = 120;
--      *
--      *         var stop;
--      *         $scope.fight = function() {
--      *           // Don't start a new fight if we are already fighting
--      *           if ( angular.isDefined(stop) ) return;
--      *
--      *           stop = $interval(function() {
--      *             if ($scope.blood_1 > 0 && $scope.blood_2 > 0) {
--      *                 $scope.blood_1 = $scope.blood_1 - 3;
--      *                 $scope.blood_2 = $scope.blood_2 - 4;
--      *             } else {
--      *                 $scope.stopFight();
--      *             }
--      *           }, 100);
--      *         };
--      *
--      *         $scope.stopFight = function() {
--      *           if (angular.isDefined(stop)) {
--      *             $interval.cancel(stop);
--      *             stop = undefined;
--      *           }
--      *         };
--      *
--      *         $scope.resetFight = function() {
--      *           $scope.blood_1 = 100;
--      *           $scope.blood_2 = 120;
--      *         }
--      *
--      *         $scope.$on('$destroy', function() {
--      *           // Make sure that the interval is destroyed too
--      *           $scope.stopFight();
--      *         });
--      *       }
-+                 * <example module="intervalExample" name="interval-service">
-+                 * <file name="index.html">
-+                 *   <script>
-+                 *     angular.module('intervalExample', [])
-+                 *       .controller('ExampleController', ['$scope', '$interval',
-+                 *         function($scope, $interval) {
-+                 *           $scope.format = 'M/d/yy h:mm:ss a';
-+                 *           $scope.blood_1 = 100;
-+                 *           $scope.blood_2 = 120;
-+                 *
-+                 *           var stop;
-+                 *           $scope.fight = function() {
-+                 *             // Don't start a new fight if we are already fighting
-+                 *             if ( angular.isDefined(stop) ) return;
-+                 *
-+                 *             stop = $interval(function() {
-+                 *               if ($scope.blood_1 > 0 && $scope.blood_2 > 0) {
-+                 *                 $scope.blood_1 = $scope.blood_1 - 3;
-+                 *                 $scope.blood_2 = $scope.blood_2 - 4;
-+                 *               } else {
-+                 *                 $scope.stopFight();
-+                 *               }
-+                 *             }, 100);
-+                 *           };
-+                 *
-+                 *           $scope.stopFight = function() {
-+                 *             if (angular.isDefined(stop)) {
-+                 *               $interval.cancel(stop);
-+                 *               stop = undefined;
-+                 *             }
-+                 *           };
-+                 *
-+                 *           $scope.resetFight = function() {
-+                 *             $scope.blood_1 = 100;
-+                 *             $scope.blood_2 = 120;
-+                 *           };
-+                 *
-+                 *           $scope.$on('$destroy', function() {
-+                 *             // Make sure that the interval is destroyed too
-+                 *             $scope.stopFight();
-+                 *           });
-+                 *         }])
-+                 *       // Register the 'myCurrentTime' directive factory method.
-+                 *       // We inject $interval and dateFilter service since the factory method is DI.
-+                 *       .directive('myCurrentTime', ['$interval', 'dateFilter',
-+                 *         function($interval, dateFilter) {
-+                 *           // return the directive link function. (compile function not needed)
-+                 *           return function(scope, element, attrs) {
-+                 *             var format,  // date format
-+                 *                 stopTime; // so that we can cancel the time updates
-                  *
--                 *       angular.module('time', [])
--                 *         // Register the 'myCurrentTime' directive factory method.
--                 *         // We inject $interval and dateFilter service since the factory method is DI.
--                 *         .directive('myCurrentTime', function($interval, dateFilter) {
--      *           // return the directive link function. (compile function not needed)
--      *           return function(scope, element, attrs) {
--      *             var format,  // date format
--      *             stopTime; // so that we can cancel the time updates
--      *
--      *             // used to update the UI
--      *             function updateTime() {
--      *               element.text(dateFilter(new Date(), format));
--      *             }
--      *
--      *             // watch the expression, and update the UI on change.
--      *             scope.$watch(attrs.myCurrentTime, function(value) {
--      *               format = value;
--      *               updateTime();
--      *             });
--      *
--      *             stopTime = $interval(updateTime, 1000);
--      *
--      *             // listen on DOM destroy (removal) event, and cancel the next UI update
--      *             // to prevent updating time ofter the DOM element was removed.
--      *             element.bind('$destroy', function() {
--      *               $interval.cancel(stopTime);
--      *             });
--      *           }
--      *         });
--                 *     </script>
-+                 *             // used to update the UI
-+                 *             function updateTime() {
-+                 *               element.text(dateFilter(new Date(), format));
-+                 *             }
-                  *
--                 *     <div>
--                 *       <div ng-controller="Ctrl2">
--                 *         Date format: <input ng-model="format"> <hr/>
--                 *         Current time is: <span my-current-time="format"></span>
--                 *         <hr/>
--                 *         Blood 1 : <font color='red'>{{blood_1}}</font>
--                 *         Blood 2 : <font color='red'>{{blood_2}}</font>
--                 *         <button type="button" data-ng-click="fight()">Fight</button>
--                 *         <button type="button" data-ng-click="stopFight()">StopFight</button>
--                 *         <button type="button" data-ng-click="resetFight()">resetFight</button>
--                 *       </div>
-+                 *             // watch the expression, and update the UI on change.
-+                 *             scope.$watch(attrs.myCurrentTime, function(value) {
-+                 *               format = value;
-+                 *               updateTime();
-+                 *             });
-+                 *
-+                 *             stopTime = $interval(updateTime, 1000);
-+                 *
-+                 *             // listen on DOM destroy (removal) event, and cancel the next UI update
-+                 *             // to prevent updating time after the DOM element was removed.
-+                 *             element.on('$destroy', function() {
-+                 *               $interval.cancel(stopTime);
-+                 *             });
-+                 *           }
-+                 *         }]);
-+                 *   </script>
-+                 *
-+                 *   <div>
-+                 *     <div ng-controller="ExampleController">
-+                 *       <label>Date format: <input ng-model="format"></label> <hr/>
-+                 *       Current time is: <span my-current-time="format"></span>
-+                 *       <hr/>
-+                 *       Blood 1 : <font color='red'>{{blood_1}}</font>
-+                 *       Blood 2 : <font color='red'>{{blood_2}}</font>
-+                 *       <button type="button" data-ng-click="fight()">Fight</button>
-+                 *       <button type="button" data-ng-click="stopFight()">StopFight</button>
-+                 *       <button type="button" data-ng-click="resetFight()">resetFight</button>
-                  *     </div>
-+                 *   </div>
-                  *
--                 *   </file>
-+                 * </file>
-                  * </example>
-                  */
-                 function interval(fn, delay, count, invokeApply) {
--                    var setInterval = $window.setInterval,
-+                    var hasParams = arguments.length > 4,
-+                        args = hasParams ? sliceArgs(arguments, 4) : [],
-+                        setInterval = $window.setInterval,
-                         clearInterval = $window.clearInterval,
--                        deferred = $q.defer(),
--                        promise = deferred.promise,
-                         iteration = 0,
--                        skipApply = (isDefined(invokeApply) && !invokeApply);
-+                        skipApply = (isDefined(invokeApply) && !invokeApply),
-+                        deferred = (skipApply ? $$q : $q).defer(),
-+                        promise = deferred.promise;
- 
-                     count = isDefined(count) ? count : 0;
- 
--                    promise.then(null, null, fn);
--
-                     promise.$$intervalId = setInterval(function tick() {
-+                        if (skipApply) {
-+                            $browser.defer(callback);
-+                        } else {
-+                            $rootScope.$evalAsync(callback);
-+                        }
-                         deferred.notify(iteration++);
- 
-                         if (count > 0 && iteration >= count) {
-@@ -8838,6 +13462,14 @@
-                     intervals[promise.$$intervalId] = deferred;
- 
-                     return promise;
-+
-+                    function callback() {
-+                        if (!hasParams) {
-+                            fn(iteration);
-+                        } else {
-+                            fn.apply(null, args);
-+                        }
-+                    }
-                 }
- 
- 
-@@ -8848,13 +13480,15 @@
-                  * @description
-                  * Cancels a task associated with the `promise`.
-                  *
--                 * @param {promise} promise returned by the `$interval` function.
-+                 * @param {Promise=} promise returned by the `$interval` function.
-                  * @returns {boolean} Returns `true` if the task was successfully canceled.
-                  */
-                 interval.cancel = function(promise) {
-                     if (promise && promise.$$intervalId in intervals) {
-+                        // Interval cancels should not report as unhandled promise.
-+                        markQExceptionHandled(intervals[promise.$$intervalId].promise);
-                         intervals[promise.$$intervalId].reject('canceled');
--                        clearInterval(promise.$$intervalId);
-+                        $window.clearInterval(promise.$$intervalId);
-                         delete intervals[promise.$$intervalId];
-                         return true;
-                     }
-@@ -8867,77 +13501,97 @@
- 
-     /**
-      * @ngdoc service
--     * @name $locale
--     *
-+     * @name $jsonpCallbacks
-+     * @requires $window
-      * @description
--     * $locale service provides localization rules for various Angular components. As of right now the
--     * only public api is:
--     *
--     * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`)
-+     * This service handles the lifecycle of callbacks to handle JSONP requests.
-+     * Override this service if you wish to customise where the callbacks are stored and
-+     * how they vary compared to the requested url.
-      */
--    function $LocaleProvider(){
-+    var $jsonpCallbacksProvider = /** @this */ function() {
-         this.$get = function() {
-+            var callbacks = angular.callbacks;
-+            var callbackMap = {};
-+
-+            function createCallback(callbackId) {
-+                var callback = function(data) {
-+                    callback.data = data;
-+                    callback.called = true;
-+                };
-+                callback.id = callbackId;
-+                return callback;
-+            }
-+
-             return {
--                id: 'en-us',
--
--                NUMBER_FORMATS: {
--                    DECIMAL_SEP: '.',
--                    GROUP_SEP: ',',
--                    PATTERNS: [
--                        { // Decimal Pattern
--                            minInt: 1,
--                            minFrac: 0,
--                            maxFrac: 3,
--                            posPre: '',
--                            posSuf: '',
--                            negPre: '-',
--                            negSuf: '',
--                            gSize: 3,
--                            lgSize: 3
--                        },{ //Currency Pattern
--                            minInt: 1,
--                            minFrac: 2,
--                            maxFrac: 2,
--                            posPre: '\u00A4',
--                            posSuf: '',
--                            negPre: '(\u00A4',
--                            negSuf: ')',
--                            gSize: 3,
--                            lgSize: 3
--                        }
--                    ],
--                    CURRENCY_SYM: '$'
-+                /**
-+                 * @ngdoc method
-+                 * @name $jsonpCallbacks#createCallback
-+                 * @param {string} url the url of the JSONP request
-+                 * @returns {string} the callback path to send to the server as part of the JSONP request
-+                 * @description
-+                 * {@link $httpBackend} calls this method to create a callback and get hold of the path to the callback
-+                 * to pass to the server, which will be used to call the callback with its payload in the JSONP response.
-+                 */
-+                createCallback: function(url) {
-+                    var callbackId = '_' + (callbacks.$$counter++).toString(36);
-+                    var callbackPath = 'angular.callbacks.' + callbackId;
-+                    var callback = createCallback(callbackId);
-+                    callbackMap[callbackPath] = callbacks[callbackId] = callback;
-+                    return callbackPath;
-                 },
--
--                DATETIME_FORMATS: {
--                    MONTH:
--                        'January,February,March,April,May,June,July,August,September,October,November,December'
--                            .split(','),
--                    SHORTMONTH:  'Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec'.split(','),
--                    DAY: 'Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday'.split(','),
--                    SHORTDAY: 'Sun,Mon,Tue,Wed,Thu,Fri,Sat'.split(','),
--                    AMPMS: ['AM','PM'],
--                    medium: 'MMM d, y h:mm:ss a',
--                    short: 'M/d/yy h:mm a',
--                    fullDate: 'EEEE, MMMM d, y',
--                    longDate: 'MMMM d, y',
--                    mediumDate: 'MMM d, y',
--                    shortDate: 'M/d/yy',
--                    mediumTime: 'h:mm:ss a',
--                    shortTime: 'h:mm a'
-+                /**
-+                 * @ngdoc method
-+                 * @name $jsonpCallbacks#wasCalled
-+                 * @param {string} callbackPath the path to the callback that was sent in the JSONP request
-+                 * @returns {boolean} whether the callback has been called, as a result of the JSONP response
-+                 * @description
-+                 * {@link $httpBackend} calls this method to find out whether the JSONP response actually called the
-+                 * callback that was passed in the request.
-+                 */
-+                wasCalled: function(callbackPath) {
-+                    return callbackMap[callbackPath].called;
-                 },
--
--                pluralCat: function(num) {
--                    if (num === 1) {
--                        return 'one';
--                    }
--                    return 'other';
-+                /**
-+                 * @ngdoc method
-+                 * @name $jsonpCallbacks#getResponse
-+                 * @param {string} callbackPath the path to the callback that was sent in the JSONP request
-+                 * @returns {*} the data received from the response via the registered callback
-+                 * @description
-+                 * {@link $httpBackend} calls this method to get hold of the data that was provided to the callback
-+                 * in the JSONP response.
-+                 */
-+                getResponse: function(callbackPath) {
-+                    return callbackMap[callbackPath].data;
-+                },
-+                /**
-+                 * @ngdoc method
-+                 * @name $jsonpCallbacks#removeCallback
-+                 * @param {string} callbackPath the path to the callback that was sent in the JSONP request
-+                 * @description
-+                 * {@link $httpBackend} calls this method to remove the callback after the JSONP request has
-+                 * completed or timed-out.
-+                 */
-+                removeCallback: function(callbackPath) {
-+                    var callback = callbackMap[callbackPath];
-+                    delete callbacks[callback.id];
-+                    delete callbackMap[callbackPath];
-                 }
-             };
-         };
--    }
-+    };
-+
-+    /**
-+     * @ngdoc service
-+     * @name $locale
-+     *
-+     * @description
-+     * $locale service provides localization rules for various AngularJS components. As of right now the
-+     * only public api is:
-+     *
-+     * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`)
-+     */
- 
--    var PATH_MATCH = /^([^\?#]*)(\?([^#]*))?(#(.*))?$/,
-+    var PATH_MATCH = /^([^?#]*)(\?([^#]*))?(#(.*))?$/,
-         DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21};
-     var $locationMinErr = minErr('$location');
- 
-@@ -8953,56 +13607,84 @@
-             i = segments.length;
- 
-         while (i--) {
--            segments[i] = encodeUriSegment(segments[i]);
-+            // decode forward slashes to prevent them from being double encoded
-+            segments[i] = encodeUriSegment(segments[i].replace(/%2F/g, '/'));
-+        }
-+
-+        return segments.join('/');
-+    }
-+
-+    function decodePath(path, html5Mode) {
-+        var segments = path.split('/'),
-+            i = segments.length;
-+
-+        while (i--) {
-+            segments[i] = decodeURIComponent(segments[i]);
-+            if (html5Mode) {
-+                // encode forward slashes to prevent them from being mistaken for path separators
-+                segments[i] = segments[i].replace(/\//g, '%2F');
-+            }
-         }
- 
-         return segments.join('/');
-     }
- 
--    function parseAbsoluteUrl(absoluteUrl, locationObj, appBase) {
--        var parsedUrl = urlResolve(absoluteUrl, appBase);
-+    function parseAbsoluteUrl(absoluteUrl, locationObj) {
-+        var parsedUrl = urlResolve(absoluteUrl);
- 
-         locationObj.$$protocol = parsedUrl.protocol;
-         locationObj.$$host = parsedUrl.hostname;
--        locationObj.$$port = int(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null;
-+        locationObj.$$port = toInt(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null;
-     }
- 
-+    var DOUBLE_SLASH_REGEX = /^\s*[\\/]{2,}/;
-+    function parseAppUrl(url, locationObj, html5Mode) {
-+
-+        if (DOUBLE_SLASH_REGEX.test(url)) {
-+            throw $locationMinErr('badpath', 'Invalid url "{0}".', url);
-+        }
- 
--    function parseAppUrl(relativeUrl, locationObj, appBase) {
--        var prefixed = (relativeUrl.charAt(0) !== '/');
-+        var prefixed = (url.charAt(0) !== '/');
-         if (prefixed) {
--            relativeUrl = '/' + relativeUrl;
-+            url = '/' + url;
-         }
--        var match = urlResolve(relativeUrl, appBase);
--        locationObj.$$path = decodeURIComponent(prefixed && match.pathname.charAt(0) === '/' ?
--            match.pathname.substring(1) : match.pathname);
-+        var match = urlResolve(url);
-+        var path = prefixed && match.pathname.charAt(0) === '/' ? match.pathname.substring(1) : match.pathname;
-+        locationObj.$$path = decodePath(path, html5Mode);
-         locationObj.$$search = parseKeyValue(match.search);
-         locationObj.$$hash = decodeURIComponent(match.hash);
- 
-         // make sure path starts with '/';
--        if (locationObj.$$path && locationObj.$$path.charAt(0) != '/') {
-+        if (locationObj.$$path && locationObj.$$path.charAt(0) !== '/') {
-             locationObj.$$path = '/' + locationObj.$$path;
-         }
-     }
- 
-+    function startsWith(str, search) {
-+        return str.slice(0, search.length) === search;
-+    }
- 
-     /**
-      *
--     * @param {string} begin
--     * @param {string} whole
--     * @returns {string} returns text from whole after begin or undefined if it does not begin with
--     *                   expected string.
-+     * @param {string} base
-+     * @param {string} url
-+     * @returns {string} returns text from `url` after `base` or `undefined` if it does not begin with
-+     *                   the expected string.
-      */
--    function beginsWith(begin, whole) {
--        if (whole.indexOf(begin) === 0) {
--            return whole.substr(begin.length);
-+    function stripBaseUrl(base, url) {
-+        if (startsWith(url, base)) {
-+            return url.substr(base.length);
-         }
-     }
- 
- 
-     function stripHash(url) {
-         var index = url.indexOf('#');
--        return index == -1 ? url : url.substr(0, index);
-+        return index === -1 ? url : url.substr(0, index);
-+    }
-+
-+    function trimEmptyHash(url) {
-+        return url.replace(/(#.+)|#$/, '$1');
-     }
- 
- 
-@@ -9017,33 +13699,33 @@
- 
- 
-     /**
--     * LocationHtml5Url represents an url
-+     * LocationHtml5Url represents a URL
-      * This object is exposed as $location service when HTML5 mode is enabled and supported
-      *
-      * @constructor
-      * @param {string} appBase application base URL
--     * @param {string} basePrefix url path prefix
-+     * @param {string} appBaseNoFile application base URL stripped of any filename
-+     * @param {string} basePrefix URL path prefix
-      */
--    function LocationHtml5Url(appBase, basePrefix) {
-+    function LocationHtml5Url(appBase, appBaseNoFile, basePrefix) {
-         this.$$html5 = true;
-         basePrefix = basePrefix || '';
--        var appBaseNoFile = stripFile(appBase);
--        parseAbsoluteUrl(appBase, this, appBase);
-+        parseAbsoluteUrl(appBase, this);
- 
- 
-         /**
--         * Parse given html5 (regular) url string into properties
--         * @param {string} newAbsoluteUrl HTML5 url
-+         * Parse given HTML5 (regular) URL string into properties
-+         * @param {string} url HTML5 URL
-          * @private
-          */
-         this.$$parse = function(url) {
--            var pathUrl = beginsWith(appBaseNoFile, url);
-+            var pathUrl = stripBaseUrl(appBaseNoFile, url);
-             if (!isString(pathUrl)) {
-                 throw $locationMinErr('ipthprfx', 'Invalid url "{0}", missing path prefix "{1}".', url,
-                     appBaseNoFile);
-             }
- 
--            parseAppUrl(pathUrl, this, appBase);
-+            parseAppUrl(pathUrl, this, true);
- 
-             if (!this.$$path) {
-                 this.$$path = '/';
-@@ -9062,94 +13744,122 @@
- 
-             this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
-             this.$$absUrl = appBaseNoFile + this.$$url.substr(1); // first char is always '/'
-+
-+            this.$$urlUpdatedByLocation = true;
-         };
- 
--        this.$$rewrite = function(url) {
-+        this.$$parseLinkUrl = function(url, relHref) {
-+            if (relHref && relHref[0] === '#') {
-+                // special case for links to hash fragments:
-+                // keep the old url and only replace the hash fragment
-+                this.hash(relHref.slice(1));
-+                return true;
-+            }
-             var appUrl, prevAppUrl;
-+            var rewrittenUrl;
-+
- 
--            if ( (appUrl = beginsWith(appBase, url)) !== undefined ) {
-+            if (isDefined(appUrl = stripBaseUrl(appBase, url))) {
-                 prevAppUrl = appUrl;
--                if ( (appUrl = beginsWith(basePrefix, appUrl)) !== undefined ) {
--                    return appBaseNoFile + (beginsWith('/', appUrl) || appUrl);
-+                if (basePrefix && isDefined(appUrl = stripBaseUrl(basePrefix, appUrl))) {
-+                    rewrittenUrl = appBaseNoFile + (stripBaseUrl('/', appUrl) || appUrl);
-                 } else {
--                    return appBase + prevAppUrl;
-+                    rewrittenUrl = appBase + prevAppUrl;
-                 }
--            } else if ( (appUrl = beginsWith(appBaseNoFile, url)) !== undefined ) {
--                return appBaseNoFile + appUrl;
--            } else if (appBaseNoFile == url + '/') {
--                return appBaseNoFile;
-+            } else if (isDefined(appUrl = stripBaseUrl(appBaseNoFile, url))) {
-+                rewrittenUrl = appBaseNoFile + appUrl;
-+            } else if (appBaseNoFile === url + '/') {
-+                rewrittenUrl = appBaseNoFile;
-             }
-+            if (rewrittenUrl) {
-+                this.$$parse(rewrittenUrl);
-+            }
-+            return !!rewrittenUrl;
-         };
-     }
- 
- 
-     /**
--     * LocationHashbangUrl represents url
-+     * LocationHashbangUrl represents URL
-      * This object is exposed as $location service when developer doesn't opt into html5 mode.
-      * It also serves as the base class for html5 mode fallback on legacy browsers.
-      *
-      * @constructor
-      * @param {string} appBase application base URL
-+     * @param {string} appBaseNoFile application base URL stripped of any filename
-      * @param {string} hashPrefix hashbang prefix
-      */
--    function LocationHashbangUrl(appBase, hashPrefix) {
--        var appBaseNoFile = stripFile(appBase);
-+    function LocationHashbangUrl(appBase, appBaseNoFile, hashPrefix) {
- 
--        parseAbsoluteUrl(appBase, this, appBase);
-+        parseAbsoluteUrl(appBase, this);
- 
- 
-         /**
--         * Parse given hashbang url into properties
--         * @param {string} url Hashbang url
-+         * Parse given hashbang URL into properties
-+         * @param {string} url Hashbang URL
-          * @private
-          */
-         this.$$parse = function(url) {
--            var withoutBaseUrl = beginsWith(appBase, url) || beginsWith(appBaseNoFile, url);
--            var withoutHashUrl = withoutBaseUrl.charAt(0) == '#'
--                ? beginsWith(hashPrefix, withoutBaseUrl)
--                : (this.$$html5)
--                ? withoutBaseUrl
--                : '';
-+            var withoutBaseUrl = stripBaseUrl(appBase, url) || stripBaseUrl(appBaseNoFile, url);
-+            var withoutHashUrl;
-+
-+            if (!isUndefined(withoutBaseUrl) && withoutBaseUrl.charAt(0) === '#') {
- 
--            if (!isString(withoutHashUrl)) {
--                throw $locationMinErr('ihshprfx', 'Invalid url "{0}", missing hash prefix "{1}".', url,
--                    hashPrefix);
-+                // The rest of the URL starts with a hash so we have
-+                // got either a hashbang path or a plain hash fragment
-+                withoutHashUrl = stripBaseUrl(hashPrefix, withoutBaseUrl);
-+                if (isUndefined(withoutHashUrl)) {
-+                    // There was no hashbang prefix so we just have a hash fragment
-+                    withoutHashUrl = withoutBaseUrl;
-+                }
-+
-+            } else {
-+                // There was no hashbang path nor hash fragment:
-+                // If we are in HTML5 mode we use what is left as the path;
-+                // Otherwise we ignore what is left
-+                if (this.$$html5) {
-+                    withoutHashUrl = withoutBaseUrl;
-+                } else {
-+                    withoutHashUrl = '';
-+                    if (isUndefined(withoutBaseUrl)) {
-+                        appBase = url;
-+                        /** @type {?} */ (this).replace();
-+                    }
-+                }
-             }
--            parseAppUrl(withoutHashUrl, this, appBase);
-+
-+            parseAppUrl(withoutHashUrl, this, false);
- 
-             this.$$path = removeWindowsDriveName(this.$$path, withoutHashUrl, appBase);
- 
-             this.$$compose();
- 
-             /*
--             * In Windows, on an anchor node on documents loaded from
--             * the filesystem, the browser will return a pathname
--             * prefixed with the drive name ('/C:/path') when a
--             * pathname without a drive is set:
--             *  * a.setAttribute('href', '/foo')
--             *   * a.pathname === '/C:/foo' //true
--             *
--             * Inside of Angular, we're always using pathnames that
--             * do not include drive names for routing.
--             */
--            function removeWindowsDriveName (path, url, base) {
-+     * In Windows, on an anchor node on documents loaded from
-+     * the filesystem, the browser will return a pathname
-+     * prefixed with the drive name ('/C:/path') when a
-+     * pathname without a drive is set:
-+     *  * a.setAttribute('href', '/foo')
-+     *   * a.pathname === '/C:/foo' //true
-+     *
-+     * Inside of AngularJS, we're always using pathnames that
-+     * do not include drive names for routing.
-+     */
-+            function removeWindowsDriveName(path, url, base) {
-                 /*
--                 Matches paths for file protocol on windows,
--                 such as /C:/foo/bar, and captures only /foo/bar.
--                 */
--                var windowsFilePathExp = /^\/?.*?:(\/.*)/;
-+      Matches paths for file protocol on windows,
-+      such as /C:/foo/bar, and captures only /foo/bar.
-+      */
-+                var windowsFilePathExp = /^\/[A-Z]:(\/.*)/;
- 
-                 var firstPathSegmentMatch;
- 
-                 //Get the relative path from the input URL.
--                if (url.indexOf(base) === 0) {
-+                if (startsWith(url, base)) {
-                     url = url.replace(base, '');
-                 }
- 
--                /*
--                 * The input URL intentionally contains a
--                 * first path segment that ends with a colon.
--                 */
-+                // The input URL intentionally contains a first path segment that ends with a colon.
-                 if (windowsFilePathExp.exec(url)) {
-                     return path;
-                 }
-@@ -9160,7 +13870,7 @@
-         };
- 
-         /**
--         * Compose hashbang url and update `absUrl` property
-+         * Compose hashbang URL and update `absUrl` property
-          * @private
-          */
-         this.$$compose = function() {
-@@ -9169,250 +13879,415 @@
- 
-             this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
-             this.$$absUrl = appBase + (this.$$url ? hashPrefix + this.$$url : '');
-+
-+            this.$$urlUpdatedByLocation = true;
-         };
- 
--        this.$$rewrite = function(url) {
--            if(stripHash(appBase) == stripHash(url)) {
--                return url;
-+        this.$$parseLinkUrl = function(url, relHref) {
-+            if (stripHash(appBase) === stripHash(url)) {
-+                this.$$parse(url);
-+                return true;
-             }
-+            return false;
-         };
-     }
- 
- 
-     /**
--     * LocationHashbangUrl represents url
-+     * LocationHashbangUrl represents URL
-      * This object is exposed as $location service when html5 history api is enabled but the browser
-      * does not support it.
-      *
-      * @constructor
-      * @param {string} appBase application base URL
-+     * @param {string} appBaseNoFile application base URL stripped of any filename
-      * @param {string} hashPrefix hashbang prefix
-      */
--    function LocationHashbangInHtml5Url(appBase, hashPrefix) {
-+    function LocationHashbangInHtml5Url(appBase, appBaseNoFile, hashPrefix) {
-         this.$$html5 = true;
-         LocationHashbangUrl.apply(this, arguments);
- 
--        var appBaseNoFile = stripFile(appBase);
-+        this.$$parseLinkUrl = function(url, relHref) {
-+            if (relHref && relHref[0] === '#') {
-+                // special case for links to hash fragments:
-+                // keep the old url and only replace the hash fragment
-+                this.hash(relHref.slice(1));
-+                return true;
-+            }
- 
--        this.$$rewrite = function(url) {
-+            var rewrittenUrl;
-             var appUrl;
- 
--            if ( appBase == stripHash(url) ) {
--                return url;
--            } else if ( (appUrl = beginsWith(appBaseNoFile, url)) ) {
--                return appBase + hashPrefix + appUrl;
--            } else if ( appBaseNoFile === url + '/') {
--                return appBaseNoFile;
-+            if (appBase === stripHash(url)) {
-+                rewrittenUrl = url;
-+            } else if ((appUrl = stripBaseUrl(appBaseNoFile, url))) {
-+                rewrittenUrl = appBase + hashPrefix + appUrl;
-+            } else if (appBaseNoFile === url + '/') {
-+                rewrittenUrl = appBaseNoFile;
-             }
-+            if (rewrittenUrl) {
-+                this.$$parse(rewrittenUrl);
-+            }
-+            return !!rewrittenUrl;
-         };
--    }
- 
-+        this.$$compose = function() {
-+            var search = toKeyValue(this.$$search),
-+                hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
- 
--    LocationHashbangInHtml5Url.prototype =
--        LocationHashbangUrl.prototype =
--            LocationHtml5Url.prototype = {
-+            this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
-+            // include hashPrefix in $$absUrl when $$url is empty so IE9 does not reload page because of removal of '#'
-+            this.$$absUrl = appBase + hashPrefix + this.$$url;
- 
--                /**
--                 * Are we in html5 mode?
--                 * @private
--                 */
--                $$html5: false,
-+            this.$$urlUpdatedByLocation = true;
-+        };
- 
--                /**
--                 * Has any change been replacing ?
--                 * @private
--                 */
--                $$replace: false,
-+    }
- 
--                /**
--                 * @ngdoc method
--                 * @name $location#absUrl
--                 *
--                 * @description
--                 * This method is getter only.
--                 *
--                 * Return full url representation with all segments encoded according to rules specified in
--                 * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt).
--                 *
--                 * @return {string} full url
--                 */
--                absUrl: locationGetter('$$absUrl'),
- 
--                /**
--                 * @ngdoc method
--                 * @name $location#url
--                 *
--                 * @description
--                 * This method is getter / setter.
--                 *
--                 * Return url (e.g. `/path?a=b#hash`) when called without any parameter.
--                 *
--                 * Change path, search and hash, when called with parameter and return `$location`.
--                 *
--                 * @param {string=} url New url without base prefix (e.g. `/path?a=b#hash`)
--                 * @param {string=} replace The path that will be changed
--                 * @return {string} url
--                 */
--                url: function(url, replace) {
--                    if (isUndefined(url))
--                        return this.$$url;
-+    var locationPrototype = {
- 
--                    var match = PATH_MATCH.exec(url);
--                    if (match[1]) this.path(decodeURIComponent(match[1]));
--                    if (match[2] || match[1]) this.search(match[3] || '');
--                    this.hash(match[5] || '', replace);
-+        /**
-+         * Ensure absolute URL is initialized.
-+         * @private
-+         */
-+        $$absUrl:'',
- 
--                    return this;
--                },
-+        /**
-+         * Are we in html5 mode?
-+         * @private
-+         */
-+        $$html5: false,
- 
--                /**
--                 * @ngdoc method
--                 * @name $location#protocol
--                 *
--                 * @description
--                 * This method is getter only.
--                 *
--                 * Return protocol of current url.
--                 *
--                 * @return {string} protocol of current url
--                 */
--                protocol: locationGetter('$$protocol'),
-+        /**
-+         * Has any change been replacing?
-+         * @private
-+         */
-+        $$replace: false,
- 
--                /**
--                 * @ngdoc method
--                 * @name $location#host
--                 *
--                 * @description
--                 * This method is getter only.
--                 *
--                 * Return host of current url.
--                 *
--                 * @return {string} host of current url.
--                 */
--                host: locationGetter('$$host'),
-+        /**
-+         * @ngdoc method
-+         * @name $location#absUrl
-+         *
-+         * @description
-+         * This method is getter only.
-+         *
-+         * Return full URL representation with all segments encoded according to rules specified in
-+         * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt).
-+         *
-+         *
-+         * ```js
-+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
-+         * var absUrl = $location.absUrl();
-+         * // => "http://example.com/#/some/path?foo=bar&baz=xoxo"
-+         * ```
-+         *
-+         * @return {string} full URL
-+         */
-+        absUrl: locationGetter('$$absUrl'),
- 
--                /**
--                 * @ngdoc method
--                 * @name $location#port
--                 *
--                 * @description
--                 * This method is getter only.
--                 *
--                 * Return port of current url.
--                 *
--                 * @return {Number} port
--                 */
--                port: locationGetter('$$port'),
-+        /**
-+         * @ngdoc method
-+         * @name $location#url
-+         *
-+         * @description
-+         * This method is getter / setter.
-+         *
-+         * Return URL (e.g. `/path?a=b#hash`) when called without any parameter.
-+         *
-+         * Change path, search and hash, when called with parameter and return `$location`.
-+         *
-+         *
-+         * ```js
-+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
-+         * var url = $location.url();
-+         * // => "/some/path?foo=bar&baz=xoxo"
-+         * ```
-+         *
-+         * @param {string=} url New URL without base prefix (e.g. `/path?a=b#hash`)
-+         * @return {string} url
-+         */
-+        url: function(url) {
-+            if (isUndefined(url)) {
-+                return this.$$url;
-+            }
- 
--                /**
--                 * @ngdoc method
--                 * @name $location#path
--                 *
--                 * @description
--                 * This method is getter / setter.
--                 *
--                 * Return path of current url when called without any parameter.
--                 *
--                 * Change path when called with parameter and return `$location`.
--                 *
--                 * Note: Path should always begin with forward slash (/), this method will add the forward slash
--                 * if it is missing.
--                 *
--                 * @param {string=} path New path
--                 * @return {string} path
--                 */
--                path: locationGetterSetter('$$path', function(path) {
--                    return path.charAt(0) == '/' ? path : '/' + path;
--                }),
-+            var match = PATH_MATCH.exec(url);
-+            if (match[1] || url === '') this.path(decodeURIComponent(match[1]));
-+            if (match[2] || match[1] || url === '') this.search(match[3] || '');
-+            this.hash(match[5] || '');
- 
--                /**
--                 * @ngdoc method
--                 * @name $location#search
--                 *
--                 * @description
--                 * This method is getter / setter.
--                 *
--                 * Return search part (as object) of current url when called without any parameter.
--                 *
--                 * Change search part when called with parameter and return `$location`.
--                 *
--                 * @param {string|Object.<string>|Object.<Array.<string>>} search New search params - string or
--                 * hash object. Hash object may contain an array of values, which will be decoded as duplicates in
--                 * the url.
--                 *
--                 * @param {(string|Array<string>)=} paramValue If `search` is a string, then `paramValue` will override only a
--                 * single search parameter. If `paramValue` is an array, it will set the parameter as a
--                 * comma-separated value. If `paramValue` is `null`, the parameter will be deleted.
--                 *
--                 * @return {string} search
--                 */
--                search: function(search, paramValue) {
--                    switch (arguments.length) {
--                        case 0:
--                            return this.$$search;
--                        case 1:
--                            if (isString(search)) {
--                                this.$$search = parseKeyValue(search);
--                            } else if (isObject(search)) {
--                                this.$$search = search;
--                            } else {
--                                throw $locationMinErr('isrcharg',
--                                    'The first argument of the `$location#search()` call must be a string or an object.');
--                            }
--                            break;
--                        default:
--                            if (isUndefined(paramValue) || paramValue === null) {
--                                delete this.$$search[search];
--                            } else {
--                                this.$$search[search] = paramValue;
--                            }
--                    }
-+            return this;
-+        },
- 
--                    this.$$compose();
--                    return this;
--                },
-+        /**
-+         * @ngdoc method
-+         * @name $location#protocol
-+         *
-+         * @description
-+         * This method is getter only.
-+         *
-+         * Return protocol of current URL.
-+         *
-+         *
-+         * ```js
-+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
-+         * var protocol = $location.protocol();
-+         * // => "http"
-+         * ```
-+         *
-+         * @return {string} protocol of current URL
-+         */
-+        protocol: locationGetter('$$protocol'),
- 
--                /**
--                 * @ngdoc method
--                 * @name $location#hash
--                 *
--                 * @description
--                 * This method is getter / setter.
--                 *
--                 * Return hash fragment when called without any parameter.
--                 *
--                 * Change hash fragment when called with parameter and return `$location`.
--                 *
--                 * @param {string=} hash New hash fragment
--                 * @return {string} hash
--                 */
--                hash: locationGetterSetter('$$hash', identity),
-+        /**
-+         * @ngdoc method
-+         * @name $location#host
-+         *
-+         * @description
-+         * This method is getter only.
-+         *
-+         * Return host of current URL.
-+         *
-+         * Note: compared to the non-AngularJS version `location.host` which returns `hostname:port`, this returns the `hostname` portion only.
-+         *
-+         *
-+         * ```js
-+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
-+         * var host = $location.host();
-+         * // => "example.com"
-+         *
-+         * // given URL http://user:password@example.com:8080/#/some/path?foo=bar&baz=xoxo
-+         * host = $location.host();
-+         * // => "example.com"
-+         * host = location.host;
-+         * // => "example.com:8080"
-+         * ```
-+         *
-+         * @return {string} host of current URL.
-+         */
-+        host: locationGetter('$$host'),
-+
-+        /**
-+         * @ngdoc method
-+         * @name $location#port
-+         *
-+         * @description
-+         * This method is getter only.
-+         *
-+         * Return port of current URL.
-+         *
-+         *
-+         * ```js
-+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
-+         * var port = $location.port();
-+         * // => 80
-+         * ```
-+         *
-+         * @return {Number} port
-+         */
-+        port: locationGetter('$$port'),
-+
-+        /**
-+         * @ngdoc method
-+         * @name $location#path
-+         *
-+         * @description
-+         * This method is getter / setter.
-+         *
-+         * Return path of current URL when called without any parameter.
-+         *
-+         * Change path when called with parameter and return `$location`.
-+         *
-+         * Note: Path should always begin with forward slash (/), this method will add the forward slash
-+         * if it is missing.
-+         *
-+         *
-+         * ```js
-+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
-+         * var path = $location.path();
-+         * // => "/some/path"
-+         * ```
-+         *
-+         * @param {(string|number)=} path New path
-+         * @return {(string|object)} path if called with no parameters, or `$location` if called with a parameter
-+         */
-+        path: locationGetterSetter('$$path', function(path) {
-+            path = path !== null ? path.toString() : '';
-+            return path.charAt(0) === '/' ? path : '/' + path;
-+        }),
-+
-+        /**
-+         * @ngdoc method
-+         * @name $location#search
-+         *
-+         * @description
-+         * This method is getter / setter.
-+         *
-+         * Return search part (as object) of current URL when called without any parameter.
-+         *
-+         * Change search part when called with parameter and return `$location`.
-+         *
-+         *
-+         * ```js
-+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
-+         * var searchObject = $location.search();
-+         * // => {foo: 'bar', baz: 'xoxo'}
-+         *
-+         * // set foo to 'yipee'
-+         * $location.search('foo', 'yipee');
-+         * // $location.search() => {foo: 'yipee', baz: 'xoxo'}
-+         * ```
-+         *
-+         * @param {string|Object.<string>|Object.<Array.<string>>} search New search params - string or
-+         * hash object.
-+         *
-+         * When called with a single argument the method acts as a setter, setting the `search` component
-+         * of `$location` to the specified value.
-+         *
-+         * If the argument is a hash object containing an array of values, these values will be encoded
-+         * as duplicate search parameters in the URL.
-+         *
-+         * @param {(string|Number|Array<string>|boolean)=} paramValue If `search` is a string or number, then `paramValue`
-+         * will override only a single search property.
-+         *
-+         * If `paramValue` is an array, it will override the property of the `search` component of
-+         * `$location` specified via the first argument.
-+         *
-+         * If `paramValue` is `null`, the property specified via the first argument will be deleted.
-+         *
-+         * If `paramValue` is `true`, the property specified via the first argument will be added with no
-+         * value nor trailing equal sign.
-+         *
-+         * @return {Object} If called with no arguments returns the parsed `search` object. If called with
-+         * one or more arguments returns `$location` object itself.
-+         */
-+        search: function(search, paramValue) {
-+            switch (arguments.length) {
-+                case 0:
-+                    return this.$$search;
-+                case 1:
-+                    if (isString(search) || isNumber(search)) {
-+                        search = search.toString();
-+                        this.$$search = parseKeyValue(search);
-+                    } else if (isObject(search)) {
-+                        search = copy(search, {});
-+                        // remove object undefined or null properties
-+                        forEach(search, function(value, key) {
-+                            if (value == null) delete search[key];
-+                        });
-+
-+                        this.$$search = search;
-+                    } else {
-+                        throw $locationMinErr('isrcharg',
-+                            'The first argument of the `$location#search()` call must be a string or an object.');
-+                    }
-+                    break;
-+                default:
-+                    if (isUndefined(paramValue) || paramValue === null) {
-+                        delete this.$$search[search];
-+                    } else {
-+                        this.$$search[search] = paramValue;
-+                    }
-+            }
-+
-+            this.$$compose();
-+            return this;
-+        },
-+
-+        /**
-+         * @ngdoc method
-+         * @name $location#hash
-+         *
-+         * @description
-+         * This method is getter / setter.
-+         *
-+         * Returns the hash fragment when called without any parameters.
-+         *
-+         * Changes the hash fragment when called with a parameter and returns `$location`.
-+         *
-+         *
-+         * ```js
-+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo#hashValue
-+         * var hash = $location.hash();
-+         * // => "hashValue"
-+         * ```
-+         *
-+         * @param {(string|number)=} hash New hash fragment
-+         * @return {string} hash
-+         */
-+        hash: locationGetterSetter('$$hash', function(hash) {
-+            return hash !== null ? hash.toString() : '';
-+        }),
-+
-+        /**
-+         * @ngdoc method
-+         * @name $location#replace
-+         *
-+         * @description
-+         * If called, all changes to $location during the current `$digest` will replace the current history
-+         * record, instead of adding a new one.
-+         */
-+        replace: function() {
-+            this.$$replace = true;
-+            return this;
-+        }
-+    };
-+
-+    forEach([LocationHashbangInHtml5Url, LocationHashbangUrl, LocationHtml5Url], function(Location) {
-+        Location.prototype = Object.create(locationPrototype);
-+
-+        /**
-+         * @ngdoc method
-+         * @name $location#state
-+         *
-+         * @description
-+         * This method is getter / setter.
-+         *
-+         * Return the history state object when called without any parameter.
-+         *
-+         * Change the history state object when called with one parameter and return `$location`.
-+         * The state object is later passed to `pushState` or `replaceState`.
-+         *
-+         * NOTE: This method is supported only in HTML5 mode and only in browsers supporting
-+         * the HTML5 History API (i.e. methods `pushState` and `replaceState`). If you need to support
-+         * older browsers (like IE9 or Android < 4.0), don't use this method.
-+         *
-+         * @param {object=} state State object for pushState or replaceState
-+         * @return {object} state
-+         */
-+        Location.prototype.state = function(state) {
-+            if (!arguments.length) {
-+                return this.$$state;
-+            }
-+
-+            if (Location !== LocationHtml5Url || !this.$$html5) {
-+                throw $locationMinErr('nostate', 'History API state support is available only ' +
-+                    'in HTML5 mode and only in browsers supporting HTML5 History API');
-+            }
-+            // The user might modify `stateObject` after invoking `$location.state(stateObject)`
-+            // but we're changing the $$state reference to $browser.state() during the $digest
-+            // so the modification window is narrow.
-+            this.$$state = isUndefined(state) ? null : state;
-+            this.$$urlUpdatedByLocation = true;
-+
-+            return this;
-+        };
-+    });
- 
--                /**
--                 * @ngdoc method
--                 * @name $location#replace
--                 *
--                 * @description
--                 * If called, all changes to $location during current `$digest` will be replacing current history
--                 * record, instead of adding new one.
--                 */
--                replace: function() {
--                    this.$$replace = true;
--                    return this;
--                }
--            };
- 
-     function locationGetter(property) {
--        return function() {
-+        return /** @this */ function() {
-             return this[property];
-         };
-     }
- 
- 
-     function locationGetterSetter(property, preprocess) {
--        return function(value) {
--            if (isUndefined(value))
-+        return /** @this */ function(value) {
-+            if (isUndefined(value)) {
-                 return this[property];
-+            }
- 
-             this[property] = preprocess(value);
-             this.$$compose();
-@@ -9451,17 +14326,24 @@
-     /**
-      * @ngdoc provider
-      * @name $locationProvider
-+     * @this
-+     *
-      * @description
-      * Use the `$locationProvider` to configure how the application deep linking paths are stored.
-      */
--    function $LocationProvider(){
--        var hashPrefix = '',
--            html5Mode = false;
-+    function $LocationProvider() {
-+        var hashPrefix = '!',
-+            html5Mode = {
-+                enabled: false,
-+                requireBase: true,
-+                rewriteLinks: true
-+            };
- 
-         /**
--         * @ngdoc property
-+         * @ngdoc method
-          * @name $locationProvider#hashPrefix
-          * @description
-+         * The default value for the prefix is `'!'`.
-          * @param {string=} prefix Prefix for hash part (containing path and search)
-          * @returns {*} current value if used as getter or itself (chaining) if used as setter
-          */
-@@ -9475,15 +14357,46 @@
-         };
- 
-         /**
--         * @ngdoc property
-+         * @ngdoc method
-          * @name $locationProvider#html5Mode
-          * @description
--         * @param {boolean=} mode Use HTML5 strategy if available.
--         * @returns {*} current value if used as getter or itself (chaining) if used as setter
-+         * @param {(boolean|Object)=} mode If boolean, sets `html5Mode.enabled` to value.
-+         *   If object, sets `enabled`, `requireBase` and `rewriteLinks` to respective values. Supported
-+         *   properties:
-+         *   - **enabled** – `{boolean}` – (default: false) If true, will rely on `history.pushState` to
-+         *     change urls where supported. Will fall back to hash-prefixed paths in browsers that do not
-+         *     support `pushState`.
-+         *   - **requireBase** - `{boolean}` - (default: `true`) When html5Mode is enabled, specifies
-+         *     whether or not a <base> tag is required to be present. If `enabled` and `requireBase` are
-+         *     true, and a base tag is not present, an error will be thrown when `$location` is injected.
-+         *     See the {@link guide/$location $location guide for more information}
-+         *   - **rewriteLinks** - `{boolean|string}` - (default: `true`) When html5Mode is enabled,
-+         *     enables/disables URL rewriting for relative links. If set to a string, URL rewriting will
-+         *     only happen on links with an attribute that matches the given string. For example, if set
-+         *     to `'internal-link'`, then the URL will only be rewritten for `<a internal-link>` links.
-+         *     Note that [attribute name normalization](guide/directive#normalization) does not apply
-+         *     here, so `'internalLink'` will **not** match `'internal-link'`.
-+         *
-+         * @returns {Object} html5Mode object if used as getter or itself (chaining) if used as setter
-          */
-         this.html5Mode = function(mode) {
--            if (isDefined(mode)) {
--                html5Mode = mode;
-+            if (isBoolean(mode)) {
-+                html5Mode.enabled = mode;
-+                return this;
-+            } else if (isObject(mode)) {
-+
-+                if (isBoolean(mode.enabled)) {
-+                    html5Mode.enabled = mode.enabled;
-+                }
-+
-+                if (isBoolean(mode.requireBase)) {
-+                    html5Mode.requireBase = mode.requireBase;
-+                }
-+
-+                if (isBoolean(mode.rewriteLinks) || isString(mode.rewriteLinks)) {
-+                    html5Mode.rewriteLinks = mode.rewriteLinks;
-+                }
-+
-                 return this;
-             } else {
-                 return html5Mode;
-@@ -9495,14 +14408,21 @@
-          * @name $location#$locationChangeStart
-          * @eventType broadcast on root scope
-          * @description
--         * Broadcasted before a URL will change. This change can be prevented by calling
-+         * Broadcasted before a URL will change.
-+         *
-+         * This change can be prevented by calling
-          * `preventDefault` method of the event. See {@link ng.$rootScope.Scope#$on} for more
-          * details about event object. Upon successful change
--         * {@link ng.$location#events_$locationChangeSuccess $locationChangeSuccess} is fired.
-+         * {@link ng.$location#$locationChangeSuccess $locationChangeSuccess} is fired.
-+         *
-+         * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when
-+         * the browser supports the HTML5 History API.
-          *
-          * @param {Object} angularEvent Synthetic event object.
-          * @param {string} newUrl New URL
-          * @param {string=} oldUrl URL that was before it was changed.
-+         * @param {string=} newState New history state object
-+         * @param {string=} oldState History state object that was before it was changed.
-          */
- 
-         /**
-@@ -9512,44 +14432,84 @@
-          * @description
-          * Broadcasted after a URL was changed.
-          *
-+         * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when
-+         * the browser supports the HTML5 History API.
-+         *
-          * @param {Object} angularEvent Synthetic event object.
-          * @param {string} newUrl New URL
-          * @param {string=} oldUrl URL that was before it was changed.
-+         * @param {string=} newState New history state object
-+         * @param {string=} oldState History state object that was before it was changed.
-          */
- 
--        this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement',
--            function( $rootScope,   $browser,   $sniffer,   $rootElement) {
-+        this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement', '$window',
-+            function($rootScope, $browser, $sniffer, $rootElement, $window) {
-                 var $location,
-                     LocationMode,
-                     baseHref = $browser.baseHref(), // if base[href] is undefined, it defaults to ''
-                     initialUrl = $browser.url(),
-                     appBase;
- 
--                if (html5Mode) {
-+                if (html5Mode.enabled) {
-+                    if (!baseHref && html5Mode.requireBase) {
-+                        throw $locationMinErr('nobase',
-+                            '$location in HTML5 mode requires a <base> tag to be present!');
-+                    }
-                     appBase = serverBase(initialUrl) + (baseHref || '/');
-                     LocationMode = $sniffer.history ? LocationHtml5Url : LocationHashbangInHtml5Url;
-                 } else {
-                     appBase = stripHash(initialUrl);
-                     LocationMode = LocationHashbangUrl;
-                 }
--                $location = new LocationMode(appBase, '#' + hashPrefix);
--                $location.$$parse($location.$$rewrite(initialUrl));
-+                var appBaseNoFile = stripFile(appBase);
-+
-+                $location = new LocationMode(appBase, appBaseNoFile, '#' + hashPrefix);
-+                $location.$$parseLinkUrl(initialUrl, initialUrl);
-+
-+                $location.$$state = $browser.state();
-+
-+                var IGNORE_URI_REGEXP = /^\s*(javascript|mailto):/i;
-+
-+                function setBrowserUrlWithFallback(url, replace, state) {
-+                    var oldUrl = $location.url();
-+                    var oldState = $location.$$state;
-+                    try {
-+                        $browser.url(url, replace, state);
-+
-+                        // Make sure $location.state() returns referentially identical (not just deeply equal)
-+                        // state object; this makes possible quick checking if the state changed in the digest
-+                        // loop. Checking deep equality would be too expensive.
-+                        $location.$$state = $browser.state();
-+                    } catch (e) {
-+                        // Restore old values if pushState fails
-+                        $location.url(oldUrl);
-+                        $location.$$state = oldState;
-+
-+                        throw e;
-+                    }
-+                }
- 
-                 $rootElement.on('click', function(event) {
-+                    var rewriteLinks = html5Mode.rewriteLinks;
-                     // TODO(vojta): rewrite link when opening in new tab/window (in legacy browser)
-                     // currently we open nice url link and redirect then
- 
--                    if (event.ctrlKey || event.metaKey || event.which == 2) return;
-+                    if (!rewriteLinks || event.ctrlKey || event.metaKey || event.shiftKey || event.which === 2 || event.button === 2) return;
- 
-                     var elm = jqLite(event.target);
- 
-                     // traverse the DOM up to find first A tag
--                    while (lowercase(elm[0].nodeName) !== 'a') {
-+                    while (nodeName_(elm[0]) !== 'a') {
-                         // ignore rewriting if no A tag (reached root element, or no parent - removed from document)
-                         if (elm[0] === $rootElement[0] || !(elm = elm.parent())[0]) return;
-                     }
- 
-+                    if (isString(rewriteLinks) && isUndefined(elm.attr(rewriteLinks))) return;
-+
-                     var absHref = elm.prop('href');
-+                    // get the actual href attribute - see
-+                    // http://msdn.microsoft.com/en-us/library/ie/dd347148(v=vs.85).aspx
-+                    var relHref = elm.attr('href') || elm.attr('xlink:href');
- 
-                     if (isObject(absHref) && absHref.toString() === '[object SVGAnimatedString]') {
-                         // SVGAnimatedString.animVal should be identical to SVGAnimatedString.baseVal, unless during
-@@ -9557,72 +14517,118 @@
-                         absHref = urlResolve(absHref.animVal).href;
-                     }
- 
--                    var rewrittenUrl = $location.$$rewrite(absHref);
-+                    // Ignore when url is started with javascript: or mailto:
-+                    if (IGNORE_URI_REGEXP.test(absHref)) return;
- 
--                    if (absHref && !elm.attr('target') && rewrittenUrl && !event.isDefaultPrevented()) {
--                        event.preventDefault();
--                        if (rewrittenUrl != $browser.url()) {
-+                    if (absHref && !elm.attr('target') && !event.isDefaultPrevented()) {
-+                        if ($location.$$parseLinkUrl(absHref, relHref)) {
-+                            // We do a preventDefault for all urls that are part of the AngularJS application,
-+                            // in html5mode and also without, so that we are able to abort navigation without
-+                            // getting double entries in the location history.
-+                            event.preventDefault();
-                             // update location manually
--                            $location.$$parse(rewrittenUrl);
--                            $rootScope.$apply();
--                            // hack to work around FF6 bug 684208 when scenario runner clicks on links
--                            window.angular['ff-684208-preventDefault'] = true;
-+                            if ($location.absUrl() !== $browser.url()) {
-+                                $rootScope.$apply();
-+                                // hack to work around FF6 bug 684208 when scenario runner clicks on links
-+                                $window.angular['ff-684208-preventDefault'] = true;
-+                            }
-                         }
-                     }
-                 });
- 
- 
-                 // rewrite hashbang url <> html5 url
--                if ($location.absUrl() != initialUrl) {
-+                if (trimEmptyHash($location.absUrl()) !== trimEmptyHash(initialUrl)) {
-                     $browser.url($location.absUrl(), true);
-                 }
- 
-+                var initializing = true;
-+
-                 // update $location when $browser url changes
--                $browser.onUrlChange(function(newUrl) {
--                    if ($location.absUrl() != newUrl) {
--                        $rootScope.$evalAsync(function() {
--                            var oldUrl = $location.absUrl();
-+                $browser.onUrlChange(function(newUrl, newState) {
- 
--                            $location.$$parse(newUrl);
--                            if ($rootScope.$broadcast('$locationChangeStart', newUrl,
--                                    oldUrl).defaultPrevented) {
--                                $location.$$parse(oldUrl);
--                                $browser.url(oldUrl);
--                            } else {
--                                afterLocationChange(oldUrl);
--                            }
--                        });
--                        if (!$rootScope.$$phase) $rootScope.$digest();
-+                    if (!startsWith(newUrl, appBaseNoFile)) {
-+                        // If we are navigating outside of the app then force a reload
-+                        $window.location.href = newUrl;
-+                        return;
-                     }
-+
-+                    $rootScope.$evalAsync(function() {
-+                        var oldUrl = $location.absUrl();
-+                        var oldState = $location.$$state;
-+                        var defaultPrevented;
-+                        newUrl = trimEmptyHash(newUrl);
-+                        $location.$$parse(newUrl);
-+                        $location.$$state = newState;
-+
-+                        defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
-+                            newState, oldState).defaultPrevented;
-+
-+                        // if the location was changed by a `$locationChangeStart` handler then stop
-+                        // processing this location change
-+                        if ($location.absUrl() !== newUrl) return;
-+
-+                        if (defaultPrevented) {
-+                            $location.$$parse(oldUrl);
-+                            $location.$$state = oldState;
-+                            setBrowserUrlWithFallback(oldUrl, false, oldState);
-+                        } else {
-+                            initializing = false;
-+                            afterLocationChange(oldUrl, oldState);
-+                        }
-+                    });
-+                    if (!$rootScope.$$phase) $rootScope.$digest();
-                 });
- 
-                 // update browser
--                var changeCounter = 0;
-                 $rootScope.$watch(function $locationWatch() {
--                    var oldUrl = $browser.url();
--                    var currentReplace = $location.$$replace;
--
--                    if (!changeCounter || oldUrl != $location.absUrl()) {
--                        changeCounter++;
--                        $rootScope.$evalAsync(function() {
--                            if ($rootScope.$broadcast('$locationChangeStart', $location.absUrl(), oldUrl).
--                                    defaultPrevented) {
--                                $location.$$parse(oldUrl);
--                            } else {
--                                $browser.url($location.absUrl(), currentReplace);
--                                afterLocationChange(oldUrl);
--                            }
--                        });
-+                    if (initializing || $location.$$urlUpdatedByLocation) {
-+                        $location.$$urlUpdatedByLocation = false;
-+
-+                        var oldUrl = trimEmptyHash($browser.url());
-+                        var newUrl = trimEmptyHash($location.absUrl());
-+                        var oldState = $browser.state();
-+                        var currentReplace = $location.$$replace;
-+                        var urlOrStateChanged = oldUrl !== newUrl ||
-+                            ($location.$$html5 && $sniffer.history && oldState !== $location.$$state);
-+
-+                        if (initializing || urlOrStateChanged) {
-+                            initializing = false;
-+
-+                            $rootScope.$evalAsync(function() {
-+                                var newUrl = $location.absUrl();
-+                                var defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
-+                                    $location.$$state, oldState).defaultPrevented;
-+
-+                                // if the location was changed by a `$locationChangeStart` handler then stop
-+                                // processing this location change
-+                                if ($location.absUrl() !== newUrl) return;
-+
-+                                if (defaultPrevented) {
-+                                    $location.$$parse(oldUrl);
-+                                    $location.$$state = oldState;
-+                                } else {
-+                                    if (urlOrStateChanged) {
-+                                        setBrowserUrlWithFallback(newUrl, currentReplace,
-+                                            oldState === $location.$$state ? null : $location.$$state);
-+                                    }
-+                                    afterLocationChange(oldUrl, oldState);
-+                                }
-+                            });
-+                        }
-                     }
-+
-                     $location.$$replace = false;
- 
--                    return changeCounter;
-+                    // we don't need to return anything because $evalAsync will make the digest loop dirty when
-+                    // there is a change
-                 });
- 
-                 return $location;
- 
--                function afterLocationChange(oldUrl) {
--                    $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl);
-+                function afterLocationChange(oldUrl, oldState) {
-+                    $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl,
-+                        $location.$$state, oldState);
-                 }
-             }];
-     }
-@@ -9638,26 +14644,36 @@
-      *
-      * The main purpose of this service is to simplify debugging and troubleshooting.
-      *
-+     * To reveal the location of the calls to `$log` in the JavaScript console,
-+     * you can "blackbox" the AngularJS source in your browser:
-+     *
-+     * [Mozilla description of blackboxing](https://developer.mozilla.org/en-US/docs/Tools/Debugger/How_to/Black_box_a_source).
-+     * [Chrome description of blackboxing](https://developer.chrome.com/devtools/docs/blackboxing).
-+     *
-+     * Note: Not all browsers support blackboxing.
-+     *
-      * The default is to log `debug` messages. You can use
-      * {@link ng.$logProvider ng.$logProvider#debugEnabled} to change this.
-      *
-      * @example
--     <example>
-+     <example module="logExample" name="log-service">
-      <file name="script.js">
--     function LogCtrl($scope, $log) {
--         $scope.$log = $log;
--         $scope.message = 'Hello World!';
--       }
-+     angular.module('logExample', [])
-+     .controller('LogController', ['$scope', '$log', function($scope, $log) {
-+           $scope.$log = $log;
-+           $scope.message = 'Hello World!';
-+         }]);
-      </file>
-      <file name="index.html">
--     <div ng-controller="LogCtrl">
-+     <div ng-controller="LogController">
-      <p>Reload this page with open console, enter text and hit the log button...</p>
--     Message:
--     <input type="text" ng-model="message"/>
-+     <label>Message:
-+     <input type="text" ng-model="message" /></label>
-      <button ng-click="$log.log(message)">log</button>
-      <button ng-click="$log.warn(message)">warn</button>
-      <button ng-click="$log.info(message)">info</button>
-      <button ng-click="$log.error(message)">error</button>
-+     <button ng-click="$log.debug(message)">debug</button>
-      </div>
-      </file>
-      </example>
-@@ -9666,15 +14682,17 @@
-     /**
-      * @ngdoc provider
-      * @name $logProvider
-+     * @this
-+     *
-      * @description
-      * Use the `$logProvider` to configure how the application logs messages
-      */
--    function $LogProvider(){
-+    function $LogProvider() {
-         var debug = true,
-             self = this;
- 
-         /**
--         * @ngdoc property
-+         * @ngdoc method
-          * @name $logProvider#debugEnabled
-          * @description
-          * @param {boolean=} flag enable or disable debug level messages
-@@ -9689,7 +14707,16 @@
-             }
-         };
- 
--        this.$get = ['$window', function($window){
-+        this.$get = ['$window', function($window) {
-+            // Support: IE 9-11, Edge 12-14+
-+            // IE/Edge display errors in such a way that it requires the user to click in 4 places
-+            // to see the stack trace. There is no way to feature-detect it so there's a chance
-+            // of the user agent sniffing to go wrong but since it's only about logging, this shouldn't
-+            // break apps. Other browsers display errors in a sensible way and some of them map stack
-+            // traces along source maps if available so it makes sense to let browsers display it
-+            // as they want.
-+            var formatStackTrace = msie || /\bEdge\//.test($window.navigator && $window.navigator.userAgent);
-+
-             return {
-                 /**
-                  * @ngdoc method
-@@ -9734,7 +14761,7 @@
-                  * @description
-                  * Write a debug message
-                  */
--                debug: (function () {
-+                debug: (function() {
-                     var fn = consoleLog('debug');
- 
-                     return function() {
-@@ -9742,12 +14769,12 @@
-                             fn.apply(self, arguments);
-                         }
-                     };
--                }())
-+                })()
-             };
- 
-             function formatError(arg) {
--                if (arg instanceof Error) {
--                    if (arg.stack) {
-+                if (isError(arg)) {
-+                    if (arg.stack && formatStackTrace) {
-                         arg = (arg.message && arg.stack.indexOf(arg.message) === -1)
-                             ? 'Error: ' + arg.message + '\n' + arg.stack
-                             : arg.stack;
-@@ -9760,139 +14787,74 @@
- 
-             function consoleLog(type) {
-                 var console = $window.console || {},
--                    logFn = console[type] || console.log || noop,
--                    hasApply = false;
--
--                // Note: reading logFn.apply throws an error in IE11 in IE8 document mode.
--                // The reason behind this is that console.log has type "object" in IE8...
--                try {
--                    hasApply = !!logFn.apply;
--                } catch (e) {}
-+                    logFn = console[type] || console.log || noop;
- 
--                if (hasApply) {
--                    return function() {
--                        var args = [];
--                        forEach(arguments, function(arg) {
--                            args.push(formatError(arg));
--                        });
--                        return logFn.apply(console, args);
--                    };
--                }
--
--                // we are IE which either doesn't have window.console => this is noop and we do nothing,
--                // or we are IE where console.log doesn't have apply so we log at least first 2 args
--                return function(arg1, arg2) {
--                    logFn(arg1, arg2 == null ? '' : arg2);
-+                return function() {
-+                    var args = [];
-+                    forEach(arguments, function(arg) {
-+                        args.push(formatError(arg));
-+                    });
-+                    // Support: IE 9 only
-+                    // console methods don't inherit from Function.prototype in IE 9 so we can't
-+                    // call `logFn.apply(console, args)` directly.
-+                    return Function.prototype.apply.call(logFn, console, args);
-                 };
-             }
-         }];
-     }
- 
-+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-+ *     Any commits to this file should be reviewed with security in mind.  *
-+ *   Changes to this file can potentially create security vulnerabilities. *
-+ *          An approval from 2 Core members with history of modifying      *
-+ *                         this file is required.                          *
-+ *                                                                         *
-+ *  Does the change somehow allow for arbitrary javascript to be executed? *
-+ *    Or allows for someone to change the prototype of built-in objects?   *
-+ *     Or gives undesired access to variables likes document or window?    *
-+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-+
-     var $parseMinErr = minErr('$parse');
--    var promiseWarningCache = {};
--    var promiseWarning;
- 
--// Sandboxing Angular Expressions
-+    var objectValueOf = {}.constructor.prototype.valueOf;
-+
-+// Sandboxing AngularJS Expressions
- // ------------------------------
--// Angular expressions are generally considered safe because these expressions only have direct
--// access to $scope and locals. However, one can obtain the ability to execute arbitrary JS code by
--// obtaining a reference to native JS functions such as the Function constructor.
--//
--// As an example, consider the following Angular expression:
--//
--//   {}.toString.constructor(alert("evil JS code"))
--//
--// We want to prevent this type of access. For the sake of performance, during the lexing phase we
--// disallow any "dotted" access to any member named "constructor".
-+// AngularJS expressions are no longer sandboxed. So it is now even easier to access arbitrary JS code by
-+// various means such as obtaining a reference to native JS functions like the Function constructor.
- //
--// For reflective calls (a[b]) we check that the value of the lookup is not the Function constructor
--// while evaluating the expression, which is a stronger but more expensive test. Since reflective
--// calls are expensive anyway, this is not such a big deal compared to static dereferencing.
-+// As an example, consider the following AngularJS expression:
- //
--// This sandboxing technique is not perfect and doesn't aim to be. The goal is to prevent exploits
--// against the expression language, but not to prevent exploits that were enabled by exposing
--// sensitive JavaScript or browser apis on Scope. Exposing such objects on a Scope is never a good
--// practice and therefore we are not even trying to protect against interaction with an object
--// explicitly exposed in this way.
-+//   {}.toString.constructor('alert("evil JS code")')
- //
--// A developer could foil the name check by aliasing the Function constructor under a different
--// name on the scope.
-+// It is important to realize that if you create an expression from a string that contains user provided
-+// content then it is possible that your application contains a security vulnerability to an XSS style attack.
- //
--// In general, it is not possible to access a Window object from an angular expression unless a
--// window or some DOM object that has a reference to window is published onto a Scope.
--
--    function ensureSafeMemberName(name, fullExpression) {
--        if (name === "constructor") {
--            throw $parseMinErr('isecfld',
--                'Referencing "constructor" field in Angular expressions is disallowed! Expression: {0}',
--                fullExpression);
--        }
--        return name;
-+// See https://docs.angularjs.org/guide/security
-+
-+
-+    function getStringValue(name) {
-+        // Property names must be strings. This means that non-string objects cannot be used
-+        // as keys in an object. Any non-string object, including a number, is typecasted
-+        // into a string via the toString method.
-+        // -- MDN, https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Operators/Property_accessors#Property_names
-+        //
-+        // So, to ensure that we are checking the same `name` that JavaScript would use, we cast it
-+        // to a string. It's not always possible. If `name` is an object and its `toString` method is
-+        // 'broken' (doesn't return a string, isn't a function, etc.), an error will be thrown:
-+        //
-+        // TypeError: Cannot convert object to primitive value
-+        //
-+        // For performance reasons, we don't catch this error here and allow it to propagate up the call
-+        // stack. Note that you'll get the same error in JavaScript if you try to access a property using
-+        // such a 'broken' object as a key.
-+        return name + '';
-     }
- 
--    function ensureSafeObject(obj, fullExpression) {
--        // nifty check if obj is Function that is fast and works across iframes and other contexts
--        if (obj) {
--            if (obj.constructor === obj) {
--                throw $parseMinErr('isecfn',
--                    'Referencing Function in Angular expressions is disallowed! Expression: {0}',
--                    fullExpression);
--            } else if (// isWindow(obj)
--            obj.document && obj.location && obj.alert && obj.setInterval) {
--                throw $parseMinErr('isecwindow',
--                    'Referencing the Window in Angular expressions is disallowed! Expression: {0}',
--                    fullExpression);
--            } else if (// isElement(obj)
--            obj.children && (obj.nodeName || (obj.prop && obj.attr && obj.find))) {
--                throw $parseMinErr('isecdom',
--                    'Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}',
--                    fullExpression);
--            }
--        }
--        return obj;
--    }
- 
--    var OPERATORS = {
--        /* jshint bitwise : false */
--        'null':function(){return null;},
--        'true':function(){return true;},
--        'false':function(){return false;},
--        undefined:noop,
--        '+':function(self, locals, a,b){
--            a=a(self, locals); b=b(self, locals);
--            if (isDefined(a)) {
--                if (isDefined(b)) {
--                    return a + b;
--                }
--                return a;
--            }
--            return isDefined(b)?b:undefined;},
--        '-':function(self, locals, a,b){
--            a=a(self, locals); b=b(self, locals);
--            return (isDefined(a)?a:0)-(isDefined(b)?b:0);
--        },
--        '*':function(self, locals, a,b){return a(self, locals)*b(self, locals);},
--        '/':function(self, locals, a,b){return a(self, locals)/b(self, locals);},
--        '%':function(self, locals, a,b){return a(self, locals)%b(self, locals);},
--        '^':function(self, locals, a,b){return a(self, locals)^b(self, locals);},
--        '=':noop,
--        '===':function(self, locals, a, b){return a(self, locals)===b(self, locals);},
--        '!==':function(self, locals, a, b){return a(self, locals)!==b(self, locals);},
--        '==':function(self, locals, a,b){return a(self, locals)==b(self, locals);},
--        '!=':function(self, locals, a,b){return a(self, locals)!=b(self, locals);},
--        '<':function(self, locals, a,b){return a(self, locals)<b(self, locals);},
--        '>':function(self, locals, a,b){return a(self, locals)>b(self, locals);},
--        '<=':function(self, locals, a,b){return a(self, locals)<=b(self, locals);},
--        '>=':function(self, locals, a,b){return a(self, locals)>=b(self, locals);},
--        '&&':function(self, locals, a,b){return a(self, locals)&&b(self, locals);},
--        '||':function(self, locals, a,b){return a(self, locals)||b(self, locals);},
--        '&':function(self, locals, a,b){return a(self, locals)&b(self, locals);},
--//    '|':function(self, locals, a,b){return a|b;},
--        '|':function(self, locals, a,b){return b(self, locals)(self, locals, a(self, locals));},
--        '!':function(self, locals, a){return !a(self, locals);}
--    };
--    /* jshint bitwise: true */
--    var ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'};
-+    var OPERATORS = createMap();
-+    forEach('+ - * / % === !== == != < > <= >= && || ! = |'.split(' '), function(operator) { OPERATORS[operator] = true; });
-+    var ESCAPE = {'n':'\n', 'f':'\f', 'r':'\r', 't':'\t', 'v':'\v', '\'':'\'', '"':'"'};
- 
- 
- /////////////////////////////////////////
-@@ -9901,85 +14863,51 @@
-     /**
-      * @constructor
-      */
--    var Lexer = function (options) {
-+    var Lexer = function Lexer(options) {
-         this.options = options;
-     };
- 
-     Lexer.prototype = {
-         constructor: Lexer,
- 
--        lex: function (text) {
-+        lex: function(text) {
-             this.text = text;
--
-             this.index = 0;
--            this.ch = undefined;
--            this.lastCh = ':'; // can start regexp
--
-             this.tokens = [];
- 
--            var token;
--            var json = [];
--
-             while (this.index < this.text.length) {
--                this.ch = this.text.charAt(this.index);
--                if (this.is('"\'')) {
--                    this.readString(this.ch);
--                } else if (this.isNumber(this.ch) || this.is('.') && this.isNumber(this.peek())) {
-+                var ch = this.text.charAt(this.index);
-+                if (ch === '"' || ch === '\'') {
-+                    this.readString(ch);
-+                } else if (this.isNumber(ch) || ch === '.' && this.isNumber(this.peek())) {
-                     this.readNumber();
--                } else if (this.isIdent(this.ch)) {
-+                } else if (this.isIdentifierStart(this.peekMultichar())) {
-                     this.readIdent();
--                    // identifiers can only be if the preceding char was a { or ,
--                    if (this.was('{,') && json[0] === '{' &&
--                        (token = this.tokens[this.tokens.length - 1])) {
--                        token.json = token.text.indexOf('.') === -1;
--                    }
--                } else if (this.is('(){}[].,;:?')) {
--                    this.tokens.push({
--                        index: this.index,
--                        text: this.ch,
--                        json: (this.was(':[,') && this.is('{[')) || this.is('}]:,')
--                    });
--                    if (this.is('{[')) json.unshift(this.ch);
--                    if (this.is('}]')) json.shift();
-+                } else if (this.is(ch, '(){}[].,;:?')) {
-+                    this.tokens.push({index: this.index, text: ch});
-                     this.index++;
--                } else if (this.isWhitespace(this.ch)) {
-+                } else if (this.isWhitespace(ch)) {
-                     this.index++;
--                    continue;
-                 } else {
--                    var ch2 = this.ch + this.peek();
-+                    var ch2 = ch + this.peek();
-                     var ch3 = ch2 + this.peek(2);
--                    var fn = OPERATORS[this.ch];
--                    var fn2 = OPERATORS[ch2];
--                    var fn3 = OPERATORS[ch3];
--                    if (fn3) {
--                        this.tokens.push({index: this.index, text: ch3, fn: fn3});
--                        this.index += 3;
--                    } else if (fn2) {
--                        this.tokens.push({index: this.index, text: ch2, fn: fn2});
--                        this.index += 2;
--                    } else if (fn) {
--                        this.tokens.push({
--                            index: this.index,
--                            text: this.ch,
--                            fn: fn,
--                            json: (this.was('[,:') && this.is('+-'))
--                        });
--                        this.index += 1;
-+                    var op1 = OPERATORS[ch];
-+                    var op2 = OPERATORS[ch2];
-+                    var op3 = OPERATORS[ch3];
-+                    if (op1 || op2 || op3) {
-+                        var token = op3 ? ch3 : (op2 ? ch2 : ch);
-+                        this.tokens.push({index: this.index, text: token, operator: true});
-+                        this.index += token.length;
-                     } else {
-                         this.throwError('Unexpected next character ', this.index, this.index + 1);
-                     }
-                 }
--                this.lastCh = this.ch;
-             }
-             return this.tokens;
-         },
- 
--        is: function(chars) {
--            return chars.indexOf(this.ch) !== -1;
--        },
--
--        was: function(chars) {
--            return chars.indexOf(this.lastCh) !== -1;
-+        is: function(ch, chars) {
-+            return chars.indexOf(ch) !== -1;
-         },
- 
-         peek: function(i) {
-@@ -9988,19 +14916,55 @@
-         },
- 
-         isNumber: function(ch) {
--            return ('0' <= ch && ch <= '9');
-+            return ('0' <= ch && ch <= '9') && typeof ch === 'string';
-         },
- 
-         isWhitespace: function(ch) {
-             // IE treats non-breaking space as \u00A0
-             return (ch === ' ' || ch === '\r' || ch === '\t' ||
--            ch === '\n' || ch === '\v' || ch === '\u00A0');
-+                ch === '\n' || ch === '\v' || ch === '\u00A0');
-+        },
-+
-+        isIdentifierStart: function(ch) {
-+            return this.options.isIdentifierStart ?
-+                this.options.isIdentifierStart(ch, this.codePointAt(ch)) :
-+                this.isValidIdentifierStart(ch);
-         },
- 
--        isIdent: function(ch) {
-+        isValidIdentifierStart: function(ch) {
-             return ('a' <= ch && ch <= 'z' ||
--            'A' <= ch && ch <= 'Z' ||
--            '_' === ch || ch === '$');
-+                'A' <= ch && ch <= 'Z' ||
-+                '_' === ch || ch === '$');
-+        },
-+
-+        isIdentifierContinue: function(ch) {
-+            return this.options.isIdentifierContinue ?
-+                this.options.isIdentifierContinue(ch, this.codePointAt(ch)) :
-+                this.isValidIdentifierContinue(ch);
-+        },
-+
-+        isValidIdentifierContinue: function(ch, cp) {
-+            return this.isValidIdentifierStart(ch, cp) || this.isNumber(ch);
-+        },
-+
-+        codePointAt: function(ch) {
-+            if (ch.length === 1) return ch.charCodeAt(0);
-+            // eslint-disable-next-line no-bitwise
-+            return (ch.charCodeAt(0) << 10) + ch.charCodeAt(1) - 0x35FDC00;
-+        },
-+
-+        peekMultichar: function() {
-+            var ch = this.text.charAt(this.index);
-+            var peek = this.peek();
-+            if (!peek) {
-+                return ch;
-+            }
-+            var cp1 = ch.charCodeAt(0);
-+            var cp2 = peek.charCodeAt(0);
-+            if (cp1 >= 0xD800 && cp1 <= 0xDBFF && cp2 >= 0xDC00 && cp2 <= 0xDFFF) {
-+                return ch + peek;
-+            }
-+            return ch;
-         },
- 
-         isExpOperator: function(ch) {
-@@ -10021,19 +14985,19 @@
-             var start = this.index;
-             while (this.index < this.text.length) {
-                 var ch = lowercase(this.text.charAt(this.index));
--                if (ch == '.' || this.isNumber(ch)) {
-+                if (ch === '.' || this.isNumber(ch)) {
-                     number += ch;
-                 } else {
-                     var peekCh = this.peek();
--                    if (ch == 'e' && this.isExpOperator(peekCh)) {
-+                    if (ch === 'e' && this.isExpOperator(peekCh)) {
-                         number += ch;
-                     } else if (this.isExpOperator(ch) &&
-                         peekCh && this.isNumber(peekCh) &&
--                        number.charAt(number.length - 1) == 'e') {
-+                        number.charAt(number.length - 1) === 'e') {
-                         number += ch;
-                     } else if (this.isExpOperator(ch) &&
-                         (!peekCh || !this.isNumber(peekCh)) &&
--                        number.charAt(number.length - 1) == 'e') {
-+                        number.charAt(number.length - 1) === 'e') {
-                         this.throwError('Invalid exponent');
-                     } else {
-                         break;
-@@ -10041,89 +15005,30 @@
-                 }
-                 this.index++;
-             }
--            number = 1 * number;
-             this.tokens.push({
-                 index: start,
-                 text: number,
--                json: true,
--                fn: function() { return number; }
-+                constant: true,
-+                value: Number(number)
-             });
-         },
- 
-         readIdent: function() {
--            var parser = this;
--
--            var ident = '';
-             var start = this.index;
--
--            var lastDot, peekIndex, methodName, ch;
--
-+            this.index += this.peekMultichar().length;
-             while (this.index < this.text.length) {
--                ch = this.text.charAt(this.index);
--                if (ch === '.' || this.isIdent(ch) || this.isNumber(ch)) {
--                    if (ch === '.') lastDot = this.index;
--                    ident += ch;
--                } else {
-+                var ch = this.peekMultichar();
-+                if (!this.isIdentifierContinue(ch)) {
-                     break;
-                 }
--                this.index++;
--            }
--
--            //check if this is not a method invocation and if it is back out to last dot
--            if (lastDot) {
--                peekIndex = this.index;
--                while (peekIndex < this.text.length) {
--                    ch = this.text.charAt(peekIndex);
--                    if (ch === '(') {
--                        methodName = ident.substr(lastDot - start + 1);
--                        ident = ident.substr(0, lastDot - start);
--                        this.index = peekIndex;
--                        break;
--                    }
--                    if (this.isWhitespace(ch)) {
--                        peekIndex++;
--                    } else {
--                        break;
--                    }
--                }
-+                this.index += ch.length;
-             }
--
--
--            var token = {
-+            this.tokens.push({
-                 index: start,
--                text: ident
--            };
--
--            // OPERATORS is our own object so we don't need to use special hasOwnPropertyFn
--            if (OPERATORS.hasOwnProperty(ident)) {
--                token.fn = OPERATORS[ident];
--                token.json = OPERATORS[ident];
--            } else {
--                var getter = getterFn(ident, this.options, this.text);
--                token.fn = extend(function(self, locals) {
--                    return (getter(self, locals));
--                }, {
--                    assign: function(self, value) {
--                        return setter(self, ident, value, parser.text, parser.options);
--                    }
--                });
--            }
--
--            this.tokens.push(token);
--
--            if (methodName) {
--                this.tokens.push({
--                    index:lastDot,
--                    text: '.',
--                    json: false
--                });
--                this.tokens.push({
--                    index: lastDot + 1,
--                    text: methodName,
--                    json: false
--                });
--            }
--        },
-+                text: this.text.slice(start, this.index),
-+                identifier: true
-+            });
-+        },
- 
-         readString: function(quote) {
-             var start = this.index;
-@@ -10137,17 +15042,14 @@
-                 if (escape) {
-                     if (ch === 'u') {
-                         var hex = this.text.substring(this.index + 1, this.index + 5);
--                        if (!hex.match(/[\da-f]{4}/i))
-+                        if (!hex.match(/[\da-f]{4}/i)) {
-                             this.throwError('Invalid unicode escape [\\u' + hex + ']');
-+                        }
-                         this.index += 4;
-                         string += String.fromCharCode(parseInt(hex, 16));
-                     } else {
-                         var rep = ESCAPE[ch];
--                        if (rep) {
--                            string += rep;
--                        } else {
--                            string += ch;
--                        }
-+                        string = string + (rep || ch);
-                     }
-                     escape = false;
-                 } else if (ch === '\\') {
-@@ -10157,9 +15059,8 @@
-                     this.tokens.push({
-                         index: start,
-                         text: rawString,
--                        string: string,
--                        json: true,
--                        fn: function() { return string; }
-+                        constant: true,
-+                        value: string
-                     });
-                     return;
-                 } else {
-@@ -10171,219 +15072,66 @@
-         }
-     };
- 
--
--    /**
--     * @constructor
--     */
--    var Parser = function (lexer, $filter, options) {
-+    var AST = function AST(lexer, options) {
-         this.lexer = lexer;
--        this.$filter = $filter;
-         this.options = options;
-     };
- 
--    Parser.ZERO = extend(function () {
--        return 0;
--    }, {
--        constant: true
--    });
--
--    Parser.prototype = {
--        constructor: Parser,
--
--        parse: function (text, json) {
-+    AST.Program = 'Program';
-+    AST.ExpressionStatement = 'ExpressionStatement';
-+    AST.AssignmentExpression = 'AssignmentExpression';
-+    AST.ConditionalExpression = 'ConditionalExpression';
-+    AST.LogicalExpression = 'LogicalExpression';
-+    AST.BinaryExpression = 'BinaryExpression';
-+    AST.UnaryExpression = 'UnaryExpression';
-+    AST.CallExpression = 'CallExpression';
-+    AST.MemberExpression = 'MemberExpression';
-+    AST.Identifier = 'Identifier';
-+    AST.Literal = 'Literal';
-+    AST.ArrayExpression = 'ArrayExpression';
-+    AST.Property = 'Property';
-+    AST.ObjectExpression = 'ObjectExpression';
-+    AST.ThisExpression = 'ThisExpression';
-+    AST.LocalsExpression = 'LocalsExpression';
-+
-+// Internal use only
-+    AST.NGValueParameter = 'NGValueParameter';
-+
-+    AST.prototype = {
-+        ast: function(text) {
-             this.text = text;
--
--            //TODO(i): strip all the obsolte json stuff from this file
--            this.json = json;
--
-             this.tokens = this.lexer.lex(text);
- 
--            if (json) {
--                // The extra level of aliasing is here, just in case the lexer misses something, so that
--                // we prevent any accidental execution in JSON.
--                this.assignment = this.logicalOR;
--
--                this.functionCall =
--                    this.fieldAccess =
--                        this.objectIndex =
--                            this.filterChain = function() {
--                                this.throwError('is not valid json', {text: text, index: 0});
--                            };
--            }
--
--            var value = json ? this.primary() : this.statements();
-+            var value = this.program();
- 
-             if (this.tokens.length !== 0) {
-                 this.throwError('is an unexpected token', this.tokens[0]);
-             }
- 
--            value.literal = !!value.literal;
--            value.constant = !!value.constant;
--
-             return value;
-         },
- 
--        primary: function () {
--            var primary;
--            if (this.expect('(')) {
--                primary = this.filterChain();
--                this.consume(')');
--            } else if (this.expect('[')) {
--                primary = this.arrayDeclaration();
--            } else if (this.expect('{')) {
--                primary = this.object();
--            } else {
--                var token = this.expect();
--                primary = token.fn;
--                if (!primary) {
--                    this.throwError('not a primary expression', token);
--                }
--                if (token.json) {
--                    primary.constant = true;
--                    primary.literal = true;
--                }
--            }
--
--            var next, context;
--            while ((next = this.expect('(', '[', '.'))) {
--                if (next.text === '(') {
--                    primary = this.functionCall(primary, context);
--                    context = null;
--                } else if (next.text === '[') {
--                    context = primary;
--                    primary = this.objectIndex(primary);
--                } else if (next.text === '.') {
--                    context = primary;
--                    primary = this.fieldAccess(primary);
--                } else {
--                    this.throwError('IMPOSSIBLE');
--                }
--            }
--            return primary;
--        },
--
--        throwError: function(msg, token) {
--            throw $parseMinErr('syntax',
--                'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].',
--                token.text, msg, (token.index + 1), this.text, this.text.substring(token.index));
--        },
--
--        peekToken: function() {
--            if (this.tokens.length === 0)
--                throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
--            return this.tokens[0];
--        },
--
--        peek: function(e1, e2, e3, e4) {
--            if (this.tokens.length > 0) {
--                var token = this.tokens[0];
--                var t = token.text;
--                if (t === e1 || t === e2 || t === e3 || t === e4 ||
--                    (!e1 && !e2 && !e3 && !e4)) {
--                    return token;
--                }
--            }
--            return false;
--        },
--
--        expect: function(e1, e2, e3, e4){
--            var token = this.peek(e1, e2, e3, e4);
--            if (token) {
--                if (this.json && !token.json) {
--                    this.throwError('is not valid json', token);
--                }
--                this.tokens.shift();
--                return token;
--            }
--            return false;
--        },
--
--        consume: function(e1){
--            if (!this.expect(e1)) {
--                this.throwError('is unexpected, expecting [' + e1 + ']', this.peek());
--            }
--        },
--
--        unaryFn: function(fn, right) {
--            return extend(function(self, locals) {
--                return fn(self, locals, right);
--            }, {
--                constant:right.constant
--            });
--        },
--
--        ternaryFn: function(left, middle, right){
--            return extend(function(self, locals){
--                return left(self, locals) ? middle(self, locals) : right(self, locals);
--            }, {
--                constant: left.constant && middle.constant && right.constant
--            });
--        },
--
--        binaryFn: function(left, fn, right) {
--            return extend(function(self, locals) {
--                return fn(self, locals, left, right);
--            }, {
--                constant:left.constant && right.constant
--            });
--        },
--
--        statements: function() {
--            var statements = [];
-+        program: function() {
-+            var body = [];
-             while (true) {
-                 if (this.tokens.length > 0 && !this.peek('}', ')', ';', ']'))
--                    statements.push(this.filterChain());
-+                    body.push(this.expressionStatement());
-                 if (!this.expect(';')) {
--                    // optimize for the common case where there is only one statement.
--                    // TODO(size): maybe we should not support multiple statements?
--                    return (statements.length === 1)
--                        ? statements[0]
--                        : function(self, locals) {
--                        var value;
--                        for (var i = 0; i < statements.length; i++) {
--                            var statement = statements[i];
--                            if (statement) {
--                                value = statement(self, locals);
--                            }
--                        }
--                        return value;
--                    };
-+                    return { type: AST.Program, body: body};
-                 }
-             }
-         },
- 
--        filterChain: function() {
--            var left = this.expression();
--            var token;
--            while (true) {
--                if ((token = this.expect('|'))) {
--                    left = this.binaryFn(left, token.fn, this.filter());
--                } else {
--                    return left;
--                }
--            }
-+        expressionStatement: function() {
-+            return { type: AST.ExpressionStatement, expression: this.filterChain() };
-         },
- 
--        filter: function() {
--            var token = this.expect();
--            var fn = this.$filter(token.text);
--            var argsFn = [];
--            while (true) {
--                if ((token = this.expect(':'))) {
--                    argsFn.push(this.expression());
--                } else {
--                    var fnInvoke = function(self, locals, input) {
--                        var args = [input];
--                        for (var i = 0; i < argsFn.length; i++) {
--                            args.push(argsFn[i](self, locals));
--                        }
--                        return fn.apply(self, args);
--                    };
--                    return function() {
--                        return fnInvoke;
--                    };
--                }
-+        filterChain: function() {
-+            var left = this.expression();
-+            while (this.expect('|')) {
-+                left = this.filter(left);
-             }
-+            return left;
-         },
- 
-         expression: function() {
-@@ -10391,55 +15139,43 @@
-         },
- 
-         assignment: function() {
--            var left = this.ternary();
--            var right;
--            var token;
--            if ((token = this.expect('='))) {
--                if (!left.assign) {
--                    this.throwError('implies assignment but [' +
--                    this.text.substring(0, token.index) + '] can not be assigned to', token);
--                }
--                right = this.ternary();
--                return function(scope, locals) {
--                    return left.assign(scope, right(scope, locals), locals);
--                };
-+            var result = this.ternary();
-+            if (this.expect('=')) {
-+                if (!isAssignable(result)) {
-+                    throw $parseMinErr('lval', 'Trying to assign a value to a non l-value');
-+                }
-+
-+                result = { type: AST.AssignmentExpression, left: result, right: this.assignment(), operator: '='};
-             }
--            return left;
-+            return result;
-         },
- 
-         ternary: function() {
--            var left = this.logicalOR();
--            var middle;
--            var token;
--            if ((token = this.expect('?'))) {
--                middle = this.ternary();
--                if ((token = this.expect(':'))) {
--                    return this.ternaryFn(left, middle, this.ternary());
--                } else {
--                    this.throwError('expected :', token);
-+            var test = this.logicalOR();
-+            var alternate;
-+            var consequent;
-+            if (this.expect('?')) {
-+                alternate = this.expression();
-+                if (this.consume(':')) {
-+                    consequent = this.expression();
-+                    return { type: AST.ConditionalExpression, test: test, alternate: alternate, consequent: consequent};
-                 }
--            } else {
--                return left;
-             }
-+            return test;
-         },
- 
-         logicalOR: function() {
-             var left = this.logicalAND();
--            var token;
--            while (true) {
--                if ((token = this.expect('||'))) {
--                    left = this.binaryFn(left, token.fn, this.logicalAND());
--                } else {
--                    return left;
--                }
-+            while (this.expect('||')) {
-+                left = { type: AST.LogicalExpression, operator: '||', left: left, right: this.logicalAND() };
-             }
-+            return left;
-         },
- 
-         logicalAND: function() {
-             var left = this.equality();
--            var token;
--            if ((token = this.expect('&&'))) {
--                left = this.binaryFn(left, token.fn, this.logicalAND());
-+            while (this.expect('&&')) {
-+                left = { type: AST.LogicalExpression, operator: '&&', left: left, right: this.equality()};
-             }
-             return left;
-         },
-@@ -10447,8 +15183,8 @@
-         equality: function() {
-             var left = this.relational();
-             var token;
--            if ((token = this.expect('==','!=','===','!=='))) {
--                left = this.binaryFn(left, token.fn, this.equality());
-+            while ((token = this.expect('==','!=','===','!=='))) {
-+                left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.relational() };
-             }
-             return left;
-         },
-@@ -10456,8 +15192,8 @@
-         relational: function() {
-             var left = this.additive();
-             var token;
--            if ((token = this.expect('<', '>', '<=', '>='))) {
--                left = this.binaryFn(left, token.fn, this.relational());
-+            while ((token = this.expect('<', '>', '<=', '>='))) {
-+                left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.additive() };
-             }
-             return left;
-         },
-@@ -10466,7 +15202,7 @@
-             var left = this.multiplicative();
-             var token;
-             while ((token = this.expect('+','-'))) {
--                left = this.binaryFn(left, token.fn, this.multiplicative());
-+                left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.multiplicative() };
-             }
-             return left;
-         },
-@@ -10475,9029 +15211,15853 @@
-             var left = this.unary();
-             var token;
-             while ((token = this.expect('*','/','%'))) {
--                left = this.binaryFn(left, token.fn, this.unary());
-+                left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.unary() };
-             }
-             return left;
-         },
- 
-         unary: function() {
-             var token;
--            if (this.expect('+')) {
--                return this.primary();
--            } else if ((token = this.expect('-'))) {
--                return this.binaryFn(Parser.ZERO, token.fn, this.unary());
--            } else if ((token = this.expect('!'))) {
--                return this.unaryFn(token.fn, this.unary());
-+            if ((token = this.expect('+', '-', '!'))) {
-+                return { type: AST.UnaryExpression, operator: token.text, prefix: true, argument: this.unary() };
-             } else {
-                 return this.primary();
-             }
-         },
- 
--        fieldAccess: function(object) {
--            var parser = this;
--            var field = this.expect().text;
--            var getter = getterFn(field, this.options, this.text);
-+        primary: function() {
-+            var primary;
-+            if (this.expect('(')) {
-+                primary = this.filterChain();
-+                this.consume(')');
-+            } else if (this.expect('[')) {
-+                primary = this.arrayDeclaration();
-+            } else if (this.expect('{')) {
-+                primary = this.object();
-+            } else if (this.selfReferential.hasOwnProperty(this.peek().text)) {
-+                primary = copy(this.selfReferential[this.consume().text]);
-+            } else if (this.options.literals.hasOwnProperty(this.peek().text)) {
-+                primary = { type: AST.Literal, value: this.options.literals[this.consume().text]};
-+            } else if (this.peek().identifier) {
-+                primary = this.identifier();
-+            } else if (this.peek().constant) {
-+                primary = this.constant();
-+            } else {
-+                this.throwError('not a primary expression', this.peek());
-+            }
- 
--            return extend(function(scope, locals, self) {
--                return getter(self || object(scope, locals));
--            }, {
--                assign: function(scope, value, locals) {
--                    return setter(object(scope, locals), field, value, parser.text, parser.options);
-+            var next;
-+            while ((next = this.expect('(', '[', '.'))) {
-+                if (next.text === '(') {
-+                    primary = {type: AST.CallExpression, callee: primary, arguments: this.parseArguments() };
-+                    this.consume(')');
-+                } else if (next.text === '[') {
-+                    primary = { type: AST.MemberExpression, object: primary, property: this.expression(), computed: true };
-+                    this.consume(']');
-+                } else if (next.text === '.') {
-+                    primary = { type: AST.MemberExpression, object: primary, property: this.identifier(), computed: false };
-+                } else {
-+                    this.throwError('IMPOSSIBLE');
-                 }
--            });
-+            }
-+            return primary;
-         },
- 
--        objectIndex: function(obj) {
--            var parser = this;
-+        filter: function(baseExpression) {
-+            var args = [baseExpression];
-+            var result = {type: AST.CallExpression, callee: this.identifier(), arguments: args, filter: true};
- 
--            var indexFn = this.expression();
--            this.consume(']');
-+            while (this.expect(':')) {
-+                args.push(this.expression());
-+            }
- 
--            return extend(function(self, locals) {
--                var o = obj(self, locals),
--                    i = indexFn(self, locals),
--                    v, p;
--
--                if (!o) return undefined;
--                v = ensureSafeObject(o[i], parser.text);
--                if (v && v.then && parser.options.unwrapPromises) {
--                    p = v;
--                    if (!('$$v' in v)) {
--                        p.$$v = undefined;
--                        p.then(function(val) { p.$$v = val; });
--                    }
--                    v = v.$$v;
--                }
--                return v;
--            }, {
--                assign: function(self, value, locals) {
--                    var key = indexFn(self, locals);
--                    // prevent overwriting of Function.constructor which would break ensureSafeObject check
--                    var safe = ensureSafeObject(obj(self, locals), parser.text);
--                    return safe[key] = value;
--                }
--            });
-+            return result;
-         },
- 
--        functionCall: function(fn, contextGetter) {
--            var argsFn = [];
-+        parseArguments: function() {
-+            var args = [];
-             if (this.peekToken().text !== ')') {
-                 do {
--                    argsFn.push(this.expression());
-+                    args.push(this.filterChain());
-                 } while (this.expect(','));
-             }
--            this.consume(')');
--
--            var parser = this;
--
--            return function(scope, locals) {
--                var args = [];
--                var context = contextGetter ? contextGetter(scope, locals) : scope;
--
--                for (var i = 0; i < argsFn.length; i++) {
--                    args.push(argsFn[i](scope, locals));
--                }
--                var fnPtr = fn(scope, locals, context) || noop;
--
--                ensureSafeObject(context, parser.text);
--                ensureSafeObject(fnPtr, parser.text);
-+            return args;
-+        },
- 
--                // IE stupidity! (IE doesn't have apply for some native functions)
--                var v = fnPtr.apply
--                    ? fnPtr.apply(context, args)
--                    : fnPtr(args[0], args[1], args[2], args[3], args[4]);
-+        identifier: function() {
-+            var token = this.consume();
-+            if (!token.identifier) {
-+                this.throwError('is not a valid identifier', token);
-+            }
-+            return { type: AST.Identifier, name: token.text };
-+        },
- 
--                return ensureSafeObject(v, parser.text);
--            };
-+        constant: function() {
-+            // TODO check that it is a constant
-+            return { type: AST.Literal, value: this.consume().value };
-         },
- 
--        // This is used with json array declaration
--        arrayDeclaration: function () {
--            var elementFns = [];
--            var allConstant = true;
-+        arrayDeclaration: function() {
-+            var elements = [];
-             if (this.peekToken().text !== ']') {
-                 do {
-                     if (this.peek(']')) {
-                         // Support trailing commas per ES5.1.
-                         break;
-                     }
--                    var elementFn = this.expression();
--                    elementFns.push(elementFn);
--                    if (!elementFn.constant) {
--                        allConstant = false;
--                    }
-+                    elements.push(this.expression());
-                 } while (this.expect(','));
-             }
-             this.consume(']');
- 
--            return extend(function(self, locals) {
--                var array = [];
--                for (var i = 0; i < elementFns.length; i++) {
--                    array.push(elementFns[i](self, locals));
--                }
--                return array;
--            }, {
--                literal: true,
--                constant: allConstant
--            });
-+            return { type: AST.ArrayExpression, elements: elements };
-         },
- 
--        object: function () {
--            var keyValues = [];
--            var allConstant = true;
-+        object: function() {
-+            var properties = [], property;
-             if (this.peekToken().text !== '}') {
-                 do {
-                     if (this.peek('}')) {
-                         // Support trailing commas per ES5.1.
-                         break;
-                     }
--                    var token = this.expect(),
--                        key = token.string || token.text;
--                    this.consume(':');
--                    var value = this.expression();
--                    keyValues.push({key: key, value: value});
--                    if (!value.constant) {
--                        allConstant = false;
-+                    property = {type: AST.Property, kind: 'init'};
-+                    if (this.peek().constant) {
-+                        property.key = this.constant();
-+                        property.computed = false;
-+                        this.consume(':');
-+                        property.value = this.expression();
-+                    } else if (this.peek().identifier) {
-+                        property.key = this.identifier();
-+                        property.computed = false;
-+                        if (this.peek(':')) {
-+                            this.consume(':');
-+                            property.value = this.expression();
-+                        } else {
-+                            property.value = property.key;
-+                        }
-+                    } else if (this.peek('[')) {
-+                        this.consume('[');
-+                        property.key = this.expression();
-+                        this.consume(']');
-+                        property.computed = true;
-+                        this.consume(':');
-+                        property.value = this.expression();
-+                    } else {
-+                        this.throwError('invalid key', this.peek());
-                     }
-+                    properties.push(property);
-                 } while (this.expect(','));
-             }
-             this.consume('}');
- 
--            return extend(function(self, locals) {
--                var object = {};
--                for (var i = 0; i < keyValues.length; i++) {
--                    var keyValue = keyValues[i];
--                    object[keyValue.key] = keyValue.value(self, locals);
--                }
--                return object;
--            }, {
--                literal: true,
--                constant: allConstant
--            });
--        }
--    };
-+            return {type: AST.ObjectExpression, properties: properties };
-+        },
- 
-+        throwError: function(msg, token) {
-+            throw $parseMinErr('syntax',
-+                'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].',
-+                token.text, msg, (token.index + 1), this.text, this.text.substring(token.index));
-+        },
- 
--//////////////////////////////////////////////////
--// Parser helper functions
--//////////////////////////////////////////////////
-+        consume: function(e1) {
-+            if (this.tokens.length === 0) {
-+                throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
-+            }
- 
--    function setter(obj, path, setValue, fullExp, options) {
--        //needed?
--        options = options || {};
-+            var token = this.expect(e1);
-+            if (!token) {
-+                this.throwError('is unexpected, expecting [' + e1 + ']', this.peek());
-+            }
-+            return token;
-+        },
- 
--        var element = path.split('.'), key;
--        for (var i = 0; element.length > 1; i++) {
--            key = ensureSafeMemberName(element.shift(), fullExp);
--            var propertyObj = obj[key];
--            if (!propertyObj) {
--                propertyObj = {};
--                obj[key] = propertyObj;
-+        peekToken: function() {
-+            if (this.tokens.length === 0) {
-+                throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
-             }
--            obj = propertyObj;
--            if (obj.then && options.unwrapPromises) {
--                promiseWarning(fullExp);
--                if (!("$$v" in obj)) {
--                    (function(promise) {
--                        promise.then(function(val) { promise.$$v = val; }); }
--                    )(obj);
--                }
--                if (obj.$$v === undefined) {
--                    obj.$$v = {};
-+            return this.tokens[0];
-+        },
-+
-+        peek: function(e1, e2, e3, e4) {
-+            return this.peekAhead(0, e1, e2, e3, e4);
-+        },
-+
-+        peekAhead: function(i, e1, e2, e3, e4) {
-+            if (this.tokens.length > i) {
-+                var token = this.tokens[i];
-+                var t = token.text;
-+                if (t === e1 || t === e2 || t === e3 || t === e4 ||
-+                    (!e1 && !e2 && !e3 && !e4)) {
-+                    return token;
-                 }
--                obj = obj.$$v;
-             }
-+            return false;
-+        },
-+
-+        expect: function(e1, e2, e3, e4) {
-+            var token = this.peek(e1, e2, e3, e4);
-+            if (token) {
-+                this.tokens.shift();
-+                return token;
-+            }
-+            return false;
-+        },
-+
-+        selfReferential: {
-+            'this': {type: AST.ThisExpression },
-+            '$locals': {type: AST.LocalsExpression }
-         }
--        key = ensureSafeMemberName(element.shift(), fullExp);
--        obj[key] = setValue;
--        return setValue;
-+    };
-+
-+    function ifDefined(v, d) {
-+        return typeof v !== 'undefined' ? v : d;
-+    }
-+
-+    function plusFn(l, r) {
-+        if (typeof l === 'undefined') return r;
-+        if (typeof r === 'undefined') return l;
-+        return l + r;
-     }
- 
--    var getterFnCache = {};
-+    function isStateless($filter, filterName) {
-+        var fn = $filter(filterName);
-+        return !fn.$stateful;
-+    }
- 
--    /**
--     * Implementation of the "Black Hole" variant from:
--     * - http://jsperf.com/angularjs-parse-getter/4
--     * - http://jsperf.com/path-evaluation-simplified/7
--     */
--    function cspSafeGetterFn(key0, key1, key2, key3, key4, fullExp, options) {
--        ensureSafeMemberName(key0, fullExp);
--        ensureSafeMemberName(key1, fullExp);
--        ensureSafeMemberName(key2, fullExp);
--        ensureSafeMemberName(key3, fullExp);
--        ensureSafeMemberName(key4, fullExp);
-+    var PURITY_ABSOLUTE = 1;
-+    var PURITY_RELATIVE = 2;
- 
--        return !options.unwrapPromises
--            ? function cspSafeGetter(scope, locals) {
--            var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope;
-+// Detect nodes which could depend on non-shallow state of objects
-+    function isPure(node, parentIsPure) {
-+        switch (node.type) {
-+            // Computed members might invoke a stateful toString()
-+            case AST.MemberExpression:
-+                if (node.computed) {
-+                    return false;
-+                }
-+                break;
- 
--            if (pathVal == null) return pathVal;
--            pathVal = pathVal[key0];
-+            // Unary always convert to primative
-+            case AST.UnaryExpression:
-+                return PURITY_ABSOLUTE;
- 
--            if (!key1) return pathVal;
--            if (pathVal == null) return undefined;
--            pathVal = pathVal[key1];
-+            // The binary + operator can invoke a stateful toString().
-+            case AST.BinaryExpression:
-+                return node.operator !== '+' ? PURITY_ABSOLUTE : false;
-+
-+            // Functions / filters probably read state from within objects
-+            case AST.CallExpression:
-+                return false;
-+        }
- 
--            if (!key2) return pathVal;
--            if (pathVal == null) return undefined;
--            pathVal = pathVal[key2];
-+        return (undefined === parentIsPure) ? PURITY_RELATIVE : parentIsPure;
-+    }
- 
--            if (!key3) return pathVal;
--            if (pathVal == null) return undefined;
--            pathVal = pathVal[key3];
-+    function findConstantAndWatchExpressions(ast, $filter, parentIsPure) {
-+        var allConstants;
-+        var argsToWatch;
-+        var isStatelessFilter;
- 
--            if (!key4) return pathVal;
--            if (pathVal == null) return undefined;
--            pathVal = pathVal[key4];
-+        var astIsPure = ast.isPure = isPure(ast, parentIsPure);
- 
--            return pathVal;
-+        switch (ast.type) {
-+            case AST.Program:
-+                allConstants = true;
-+                forEach(ast.body, function(expr) {
-+                    findConstantAndWatchExpressions(expr.expression, $filter, astIsPure);
-+                    allConstants = allConstants && expr.expression.constant;
-+                });
-+                ast.constant = allConstants;
-+                break;
-+            case AST.Literal:
-+                ast.constant = true;
-+                ast.toWatch = [];
-+                break;
-+            case AST.UnaryExpression:
-+                findConstantAndWatchExpressions(ast.argument, $filter, astIsPure);
-+                ast.constant = ast.argument.constant;
-+                ast.toWatch = ast.argument.toWatch;
-+                break;
-+            case AST.BinaryExpression:
-+                findConstantAndWatchExpressions(ast.left, $filter, astIsPure);
-+                findConstantAndWatchExpressions(ast.right, $filter, astIsPure);
-+                ast.constant = ast.left.constant && ast.right.constant;
-+                ast.toWatch = ast.left.toWatch.concat(ast.right.toWatch);
-+                break;
-+            case AST.LogicalExpression:
-+                findConstantAndWatchExpressions(ast.left, $filter, astIsPure);
-+                findConstantAndWatchExpressions(ast.right, $filter, astIsPure);
-+                ast.constant = ast.left.constant && ast.right.constant;
-+                ast.toWatch = ast.constant ? [] : [ast];
-+                break;
-+            case AST.ConditionalExpression:
-+                findConstantAndWatchExpressions(ast.test, $filter, astIsPure);
-+                findConstantAndWatchExpressions(ast.alternate, $filter, astIsPure);
-+                findConstantAndWatchExpressions(ast.consequent, $filter, astIsPure);
-+                ast.constant = ast.test.constant && ast.alternate.constant && ast.consequent.constant;
-+                ast.toWatch = ast.constant ? [] : [ast];
-+                break;
-+            case AST.Identifier:
-+                ast.constant = false;
-+                ast.toWatch = [ast];
-+                break;
-+            case AST.MemberExpression:
-+                findConstantAndWatchExpressions(ast.object, $filter, astIsPure);
-+                if (ast.computed) {
-+                    findConstantAndWatchExpressions(ast.property, $filter, astIsPure);
-+                }
-+                ast.constant = ast.object.constant && (!ast.computed || ast.property.constant);
-+                ast.toWatch = ast.constant ? [] : [ast];
-+                break;
-+            case AST.CallExpression:
-+                isStatelessFilter = ast.filter ? isStateless($filter, ast.callee.name) : false;
-+                allConstants = isStatelessFilter;
-+                argsToWatch = [];
-+                forEach(ast.arguments, function(expr) {
-+                    findConstantAndWatchExpressions(expr, $filter, astIsPure);
-+                    allConstants = allConstants && expr.constant;
-+                    argsToWatch.push.apply(argsToWatch, expr.toWatch);
-+                });
-+                ast.constant = allConstants;
-+                ast.toWatch = isStatelessFilter ? argsToWatch : [ast];
-+                break;
-+            case AST.AssignmentExpression:
-+                findConstantAndWatchExpressions(ast.left, $filter, astIsPure);
-+                findConstantAndWatchExpressions(ast.right, $filter, astIsPure);
-+                ast.constant = ast.left.constant && ast.right.constant;
-+                ast.toWatch = [ast];
-+                break;
-+            case AST.ArrayExpression:
-+                allConstants = true;
-+                argsToWatch = [];
-+                forEach(ast.elements, function(expr) {
-+                    findConstantAndWatchExpressions(expr, $filter, astIsPure);
-+                    allConstants = allConstants && expr.constant;
-+                    argsToWatch.push.apply(argsToWatch, expr.toWatch);
-+                });
-+                ast.constant = allConstants;
-+                ast.toWatch = argsToWatch;
-+                break;
-+            case AST.ObjectExpression:
-+                allConstants = true;
-+                argsToWatch = [];
-+                forEach(ast.properties, function(property) {
-+                    findConstantAndWatchExpressions(property.value, $filter, astIsPure);
-+                    allConstants = allConstants && property.value.constant;
-+                    argsToWatch.push.apply(argsToWatch, property.value.toWatch);
-+                    if (property.computed) {
-+                        //`{[key]: value}` implicitly does `key.toString()` which may be non-pure
-+                        findConstantAndWatchExpressions(property.key, $filter, /*parentIsPure=*/false);
-+                        allConstants = allConstants && property.key.constant;
-+                        argsToWatch.push.apply(argsToWatch, property.key.toWatch);
-+                    }
-+                });
-+                ast.constant = allConstants;
-+                ast.toWatch = argsToWatch;
-+                break;
-+            case AST.ThisExpression:
-+                ast.constant = false;
-+                ast.toWatch = [];
-+                break;
-+            case AST.LocalsExpression:
-+                ast.constant = false;
-+                ast.toWatch = [];
-+                break;
-         }
--            : function cspSafePromiseEnabledGetter(scope, locals) {
--            var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope,
--                promise;
--
--            if (pathVal == null) return pathVal;
--
--            pathVal = pathVal[key0];
--            if (pathVal && pathVal.then) {
--                promiseWarning(fullExp);
--                if (!("$$v" in pathVal)) {
--                    promise = pathVal;
--                    promise.$$v = undefined;
--                    promise.then(function(val) { promise.$$v = val; });
--                }
--                pathVal = pathVal.$$v;
--            }
--
--            if (!key1) return pathVal;
--            if (pathVal == null) return undefined;
--            pathVal = pathVal[key1];
--            if (pathVal && pathVal.then) {
--                promiseWarning(fullExp);
--                if (!("$$v" in pathVal)) {
--                    promise = pathVal;
--                    promise.$$v = undefined;
--                    promise.then(function(val) { promise.$$v = val; });
--                }
--                pathVal = pathVal.$$v;
--            }
--
--            if (!key2) return pathVal;
--            if (pathVal == null) return undefined;
--            pathVal = pathVal[key2];
--            if (pathVal && pathVal.then) {
--                promiseWarning(fullExp);
--                if (!("$$v" in pathVal)) {
--                    promise = pathVal;
--                    promise.$$v = undefined;
--                    promise.then(function(val) { promise.$$v = val; });
--                }
--                pathVal = pathVal.$$v;
--            }
--
--            if (!key3) return pathVal;
--            if (pathVal == null) return undefined;
--            pathVal = pathVal[key3];
--            if (pathVal && pathVal.then) {
--                promiseWarning(fullExp);
--                if (!("$$v" in pathVal)) {
--                    promise = pathVal;
--                    promise.$$v = undefined;
--                    promise.then(function(val) { promise.$$v = val; });
--                }
--                pathVal = pathVal.$$v;
--            }
--
--            if (!key4) return pathVal;
--            if (pathVal == null) return undefined;
--            pathVal = pathVal[key4];
--            if (pathVal && pathVal.then) {
--                promiseWarning(fullExp);
--                if (!("$$v" in pathVal)) {
--                    promise = pathVal;
--                    promise.$$v = undefined;
--                    promise.then(function(val) { promise.$$v = val; });
--                }
--                pathVal = pathVal.$$v;
--            }
--            return pathVal;
--        };
-     }
- 
--    function simpleGetterFn1(key0, fullExp) {
--        ensureSafeMemberName(key0, fullExp);
-+    function getInputs(body) {
-+        if (body.length !== 1) return;
-+        var lastExpression = body[0].expression;
-+        var candidate = lastExpression.toWatch;
-+        if (candidate.length !== 1) return candidate;
-+        return candidate[0] !== lastExpression ? candidate : undefined;
-+    }
- 
--        return function simpleGetterFn1(scope, locals) {
--            if (scope == null) return undefined;
--            return ((locals && locals.hasOwnProperty(key0)) ? locals : scope)[key0];
--        };
-+    function isAssignable(ast) {
-+        return ast.type === AST.Identifier || ast.type === AST.MemberExpression;
-     }
- 
--    function simpleGetterFn2(key0, key1, fullExp) {
--        ensureSafeMemberName(key0, fullExp);
--        ensureSafeMemberName(key1, fullExp);
-+    function assignableAST(ast) {
-+        if (ast.body.length === 1 && isAssignable(ast.body[0].expression)) {
-+            return {type: AST.AssignmentExpression, left: ast.body[0].expression, right: {type: AST.NGValueParameter}, operator: '='};
-+        }
-+    }
- 
--        return function simpleGetterFn2(scope, locals) {
--            if (scope == null) return undefined;
--            scope = ((locals && locals.hasOwnProperty(key0)) ? locals : scope)[key0];
--            return scope == null ? undefined : scope[key1];
--        };
-+    function isLiteral(ast) {
-+        return ast.body.length === 0 ||
-+            ast.body.length === 1 && (
-+                ast.body[0].expression.type === AST.Literal ||
-+                ast.body[0].expression.type === AST.ArrayExpression ||
-+                ast.body[0].expression.type === AST.ObjectExpression);
-     }
- 
--    function getterFn(path, options, fullExp) {
--        // Check whether the cache has this getter already.
--        // We can use hasOwnProperty directly on the cache because we ensure,
--        // see below, that the cache never stores a path called 'hasOwnProperty'
--        if (getterFnCache.hasOwnProperty(path)) {
--            return getterFnCache[path];
--        }
-+    function isConstant(ast) {
-+        return ast.constant;
-+    }
- 
--        var pathKeys = path.split('.'),
--            pathKeysLength = pathKeys.length,
--            fn;
--
--        // When we have only 1 or 2 tokens, use optimized special case closures.
--        // http://jsperf.com/angularjs-parse-getter/6
--        if (!options.unwrapPromises && pathKeysLength === 1) {
--            fn = simpleGetterFn1(pathKeys[0], fullExp);
--        } else if (!options.unwrapPromises && pathKeysLength === 2) {
--            fn = simpleGetterFn2(pathKeys[0], pathKeys[1], fullExp);
--        } else if (options.csp) {
--            if (pathKeysLength < 6) {
--                fn = cspSafeGetterFn(pathKeys[0], pathKeys[1], pathKeys[2], pathKeys[3], pathKeys[4], fullExp,
--                    options);
--            } else {
--                fn = function(scope, locals) {
--                    var i = 0, val;
--                    do {
--                        val = cspSafeGetterFn(pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++],
--                            pathKeys[i++], fullExp, options)(scope, locals);
-+    function ASTCompiler($filter) {
-+        this.$filter = $filter;
-+    }
- 
--                        locals = undefined; // clear after first iteration
--                        scope = val;
--                    } while (i < pathKeysLength);
--                    return val;
--                };
-+    ASTCompiler.prototype = {
-+        compile: function(ast) {
-+            var self = this;
-+            this.state = {
-+                nextId: 0,
-+                filters: {},
-+                fn: {vars: [], body: [], own: {}},
-+                assign: {vars: [], body: [], own: {}},
-+                inputs: []
-+            };
-+            findConstantAndWatchExpressions(ast, self.$filter);
-+            var extra = '';
-+            var assignable;
-+            this.stage = 'assign';
-+            if ((assignable = assignableAST(ast))) {
-+                this.state.computing = 'assign';
-+                var result = this.nextId();
-+                this.recurse(assignable, result);
-+                this.return_(result);
-+                extra = 'fn.assign=' + this.generateFunction('assign', 's,v,l');
-             }
--        } else {
--            var code = 'var p;\n';
--            forEach(pathKeys, function(key, index) {
--                ensureSafeMemberName(key, fullExp);
--                code += 'if(s == null) return undefined;\n' +
--                's='+ (index
--                    // we simply dereference 's' on any .dot notation
--                    ? 's'
--                    // but if we are first then we check locals first, and if so read it first
--                    : '((k&&k.hasOwnProperty("' + key + '"))?k:s)') + '["' + key + '"]' + ';\n' +
--                (options.unwrapPromises
--                    ? 'if (s && s.then) {\n' +
--                ' pw("' + fullExp.replace(/(["\r\n])/g, '\\$1') + '");\n' +
--                ' if (!("$$v" in s)) {\n' +
--                ' p=s;\n' +
--                ' p.$$v = undefined;\n' +
--                ' p.then(function(v) {p.$$v=v;});\n' +
--                '}\n' +
--                ' s=s.$$v\n' +
--                '}\n'
--                    : '');
-+            var toWatch = getInputs(ast.body);
-+            self.stage = 'inputs';
-+            forEach(toWatch, function(watch, key) {
-+                var fnKey = 'fn' + key;
-+                self.state[fnKey] = {vars: [], body: [], own: {}};
-+                self.state.computing = fnKey;
-+                var intoId = self.nextId();
-+                self.recurse(watch, intoId);
-+                self.return_(intoId);
-+                self.state.inputs.push({name: fnKey, isPure: watch.isPure});
-+                watch.watchId = key;
-             });
--            code += 'return s;';
--
--            /* jshint -W054 */
--            var evaledFnGetter = new Function('s', 'k', 'pw', code); // s=scope, k=locals, pw=promiseWarning
--            /* jshint +W054 */
--            evaledFnGetter.toString = valueFn(code);
--            fn = options.unwrapPromises ? function(scope, locals) {
--                return evaledFnGetter(scope, locals, promiseWarning);
--            } : evaledFnGetter;
--        }
-+            this.state.computing = 'fn';
-+            this.stage = 'main';
-+            this.recurse(ast);
-+            var fnString =
-+                // The build and minification steps remove the string "use strict" from the code, but this is done using a regex.
-+                // This is a workaround for this until we do a better job at only removing the prefix only when we should.
-+                '"' + this.USE + ' ' + this.STRICT + '";\n' +
-+                this.filterPrefix() +
-+                'var fn=' + this.generateFunction('fn', 's,l,a,i') +
-+                extra +
-+                this.watchFns() +
-+                'return fn;';
-+
-+            // eslint-disable-next-line no-new-func
-+            var fn = (new Function('$filter',
-+                'getStringValue',
-+                'ifDefined',
-+                'plus',
-+                fnString))(
-+                this.$filter,
-+                getStringValue,
-+                ifDefined,
-+                plusFn);
-+            this.state = this.stage = undefined;
-+            return fn;
-+        },
- 
--        // Only cache the value if it's not going to mess up the cache object
--        // This is more performant that using Object.prototype.hasOwnProperty.call
--        if (path !== 'hasOwnProperty') {
--            getterFnCache[path] = fn;
--        }
--        return fn;
--    }
-+        USE: 'use',
- 
--///////////////////////////////////
-+        STRICT: 'strict',
- 
--    /**
--     * @ngdoc service
--     * @name $parse
--     * @kind function
--     *
--     * @description
--     *
--     * Converts Angular {@link guide/expression expression} into a function.
--     *
--     * ```js
--     *   var getter = $parse('user.name');
--     *   var setter = getter.assign;
--     *   var context = {user:{name:'angular'}};
--     *   var locals = {user:{name:'local'}};
--     *
--     *   expect(getter(context)).toEqual('angular');
--     *   setter(context, 'newValue');
--     *   expect(context.user.name).toEqual('newValue');
--     *   expect(getter(context, locals)).toEqual('local');
--     * ```
--     *
--     *
--     * @param {string} expression String expression to compile.
--     * @returns {function(context, locals)} a function which represents the compiled expression:
--     *
--     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
--     *      are evaluated against (typically a scope object).
--     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
--     *      `context`.
--     *
--     *    The returned function also has the following properties:
--     *      * `literal` – `{boolean}` – whether the expression's top-level node is a JavaScript
--     *        literal.
--     *      * `constant` – `{boolean}` – whether the expression is made entirely of JavaScript
--     *        constant literals.
--     *      * `assign` – `{?function(context, value)}` – if the expression is assignable, this will be
--     *        set to a function to change its value on the given context.
--     *
--     */
-+        watchFns: function() {
-+            var result = [];
-+            var inputs = this.state.inputs;
-+            var self = this;
-+            forEach(inputs, function(input) {
-+                result.push('var ' + input.name + '=' + self.generateFunction(input.name, 's'));
-+                if (input.isPure) {
-+                    result.push(input.name, '.isPure=' + JSON.stringify(input.isPure) + ';');
-+                }
-+            });
-+            if (inputs.length) {
-+                result.push('fn.inputs=[' + inputs.map(function(i) { return i.name; }).join(',') + '];');
-+            }
-+            return result.join('');
-+        },
- 
-+        generateFunction: function(name, params) {
-+            return 'function(' + params + '){' +
-+                this.varsPrefix(name) +
-+                this.body(name) +
-+                '};';
-+        },
- 
--    /**
--     * @ngdoc provider
--     * @name $parseProvider
--     * @function
--     *
--     * @description
--     * `$parseProvider` can be used for configuring the default behavior of the {@link ng.$parse $parse}
--     *  service.
--     */
--    function $ParseProvider() {
--        var cache = {};
-+        filterPrefix: function() {
-+            var parts = [];
-+            var self = this;
-+            forEach(this.state.filters, function(id, filter) {
-+                parts.push(id + '=$filter(' + self.escape(filter) + ')');
-+            });
-+            if (parts.length) return 'var ' + parts.join(',') + ';';
-+            return '';
-+        },
- 
--        var $parseOptions = {
--            csp: false,
--            unwrapPromises: false,
--            logPromiseWarnings: true
--        };
-+        varsPrefix: function(section) {
-+            return this.state[section].vars.length ? 'var ' + this.state[section].vars.join(',') + ';' : '';
-+        },
- 
-+        body: function(section) {
-+            return this.state[section].body.join('');
-+        },
- 
--        /**
--         * @deprecated Promise unwrapping via $parse is deprecated and will be removed in the future.
--         *
--         * @ngdoc method
--         * @name $parseProvider#unwrapPromises
--         * @description
--         *
--         * **This feature is deprecated, see deprecation notes below for more info**
--         *
--         * If set to true (default is false), $parse will unwrap promises automatically when a promise is
--         * found at any part of the expression. In other words, if set to true, the expression will always
--         * result in a non-promise value.
--         *
--         * While the promise is unresolved, it's treated as undefined, but once resolved and fulfilled,
--         * the fulfillment value is used in place of the promise while evaluating the expression.
--         *
--         * **Deprecation notice**
--         *
--         * This is a feature that didn't prove to be wildly useful or popular, primarily because of the
--         * dichotomy between data access in templates (accessed as raw values) and controller code
--         * (accessed as promises).
--         *
--         * In most code we ended up resolving promises manually in controllers anyway and thus unifying
--         * the model access there.
--         *
--         * Other downsides of automatic promise unwrapping:
--         *
--         * - when building components it's often desirable to receive the raw promises
--         * - adds complexity and slows down expression evaluation
--         * - makes expression code pre-generation unattractive due to the amount of code that needs to be
--         *   generated
--         * - makes IDE auto-completion and tool support hard
--         *
--         * **Warning Logs**
--         *
--         * If the unwrapping is enabled, Angular will log a warning about each expression that unwraps a
--         * promise (to reduce the noise, each expression is logged only once). To disable this logging use
--         * `$parseProvider.logPromiseWarnings(false)` api.
--         *
--         *
--         * @param {boolean=} value New value.
--         * @returns {boolean|self} Returns the current setting when used as getter and self if used as
--         *                         setter.
--         */
--        this.unwrapPromises = function(value) {
--            if (isDefined(value)) {
--                $parseOptions.unwrapPromises = !!value;
--                return this;
-+        recurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
-+            var left, right, self = this, args, expression, computed;
-+            recursionFn = recursionFn || noop;
-+            if (!skipWatchIdCheck && isDefined(ast.watchId)) {
-+                intoId = intoId || this.nextId();
-+                this.if_('i',
-+                    this.lazyAssign(intoId, this.computedMember('i', ast.watchId)),
-+                    this.lazyRecurse(ast, intoId, nameId, recursionFn, create, true)
-+                );
-+                return;
-+            }
-+            switch (ast.type) {
-+                case AST.Program:
-+                    forEach(ast.body, function(expression, pos) {
-+                        self.recurse(expression.expression, undefined, undefined, function(expr) { right = expr; });
-+                        if (pos !== ast.body.length - 1) {
-+                            self.current().body.push(right, ';');
-+                        } else {
-+                            self.return_(right);
-+                        }
-+                    });
-+                    break;
-+                case AST.Literal:
-+                    expression = this.escape(ast.value);
-+                    this.assign(intoId, expression);
-+                    recursionFn(intoId || expression);
-+                    break;
-+                case AST.UnaryExpression:
-+                    this.recurse(ast.argument, undefined, undefined, function(expr) { right = expr; });
-+                    expression = ast.operator + '(' + this.ifDefined(right, 0) + ')';
-+                    this.assign(intoId, expression);
-+                    recursionFn(expression);
-+                    break;
-+                case AST.BinaryExpression:
-+                    this.recurse(ast.left, undefined, undefined, function(expr) { left = expr; });
-+                    this.recurse(ast.right, undefined, undefined, function(expr) { right = expr; });
-+                    if (ast.operator === '+') {
-+                        expression = this.plus(left, right);
-+                    } else if (ast.operator === '-') {
-+                        expression = this.ifDefined(left, 0) + ast.operator + this.ifDefined(right, 0);
-+                    } else {
-+                        expression = '(' + left + ')' + ast.operator + '(' + right + ')';
-+                    }
-+                    this.assign(intoId, expression);
-+                    recursionFn(expression);
-+                    break;
-+                case AST.LogicalExpression:
-+                    intoId = intoId || this.nextId();
-+                    self.recurse(ast.left, intoId);
-+                    self.if_(ast.operator === '&&' ? intoId : self.not(intoId), self.lazyRecurse(ast.right, intoId));
-+                    recursionFn(intoId);
-+                    break;
-+                case AST.ConditionalExpression:
-+                    intoId = intoId || this.nextId();
-+                    self.recurse(ast.test, intoId);
-+                    self.if_(intoId, self.lazyRecurse(ast.alternate, intoId), self.lazyRecurse(ast.consequent, intoId));
-+                    recursionFn(intoId);
-+                    break;
-+                case AST.Identifier:
-+                    intoId = intoId || this.nextId();
-+                    if (nameId) {
-+                        nameId.context = self.stage === 'inputs' ? 's' : this.assign(this.nextId(), this.getHasOwnProperty('l', ast.name) + '?l:s');
-+                        nameId.computed = false;
-+                        nameId.name = ast.name;
-+                    }
-+                    self.if_(self.stage === 'inputs' || self.not(self.getHasOwnProperty('l', ast.name)),
-+                        function() {
-+                            self.if_(self.stage === 'inputs' || 's', function() {
-+                                if (create && create !== 1) {
-+                                    self.if_(
-+                                        self.isNull(self.nonComputedMember('s', ast.name)),
-+                                        self.lazyAssign(self.nonComputedMember('s', ast.name), '{}'));
-+                                }
-+                                self.assign(intoId, self.nonComputedMember('s', ast.name));
-+                            });
-+                        }, intoId && self.lazyAssign(intoId, self.nonComputedMember('l', ast.name))
-+                    );
-+                    recursionFn(intoId);
-+                    break;
-+                case AST.MemberExpression:
-+                    left = nameId && (nameId.context = this.nextId()) || this.nextId();
-+                    intoId = intoId || this.nextId();
-+                    self.recurse(ast.object, left, undefined, function() {
-+                        self.if_(self.notNull(left), function() {
-+                            if (ast.computed) {
-+                                right = self.nextId();
-+                                self.recurse(ast.property, right);
-+                                self.getStringValue(right);
-+                                if (create && create !== 1) {
-+                                    self.if_(self.not(self.computedMember(left, right)), self.lazyAssign(self.computedMember(left, right), '{}'));
-+                                }
-+                                expression = self.computedMember(left, right);
-+                                self.assign(intoId, expression);
-+                                if (nameId) {
-+                                    nameId.computed = true;
-+                                    nameId.name = right;
-+                                }
-+                            } else {
-+                                if (create && create !== 1) {
-+                                    self.if_(self.isNull(self.nonComputedMember(left, ast.property.name)), self.lazyAssign(self.nonComputedMember(left, ast.property.name), '{}'));
-+                                }
-+                                expression = self.nonComputedMember(left, ast.property.name);
-+                                self.assign(intoId, expression);
-+                                if (nameId) {
-+                                    nameId.computed = false;
-+                                    nameId.name = ast.property.name;
-+                                }
-+                            }
-+                        }, function() {
-+                            self.assign(intoId, 'undefined');
-+                        });
-+                        recursionFn(intoId);
-+                    }, !!create);
-+                    break;
-+                case AST.CallExpression:
-+                    intoId = intoId || this.nextId();
-+                    if (ast.filter) {
-+                        right = self.filter(ast.callee.name);
-+                        args = [];
-+                        forEach(ast.arguments, function(expr) {
-+                            var argument = self.nextId();
-+                            self.recurse(expr, argument);
-+                            args.push(argument);
-+                        });
-+                        expression = right + '(' + args.join(',') + ')';
-+                        self.assign(intoId, expression);
-+                        recursionFn(intoId);
-+                    } else {
-+                        right = self.nextId();
-+                        left = {};
-+                        args = [];
-+                        self.recurse(ast.callee, right, left, function() {
-+                            self.if_(self.notNull(right), function() {
-+                                forEach(ast.arguments, function(expr) {
-+                                    self.recurse(expr, ast.constant ? undefined : self.nextId(), undefined, function(argument) {
-+                                        args.push(argument);
-+                                    });
-+                                });
-+                                if (left.name) {
-+                                    expression = self.member(left.context, left.name, left.computed) + '(' + args.join(',') + ')';
-+                                } else {
-+                                    expression = right + '(' + args.join(',') + ')';
-+                                }
-+                                self.assign(intoId, expression);
-+                            }, function() {
-+                                self.assign(intoId, 'undefined');
-+                            });
-+                            recursionFn(intoId);
-+                        });
-+                    }
-+                    break;
-+                case AST.AssignmentExpression:
-+                    right = this.nextId();
-+                    left = {};
-+                    this.recurse(ast.left, undefined, left, function() {
-+                        self.if_(self.notNull(left.context), function() {
-+                            self.recurse(ast.right, right);
-+                            expression = self.member(left.context, left.name, left.computed) + ast.operator + right;
-+                            self.assign(intoId, expression);
-+                            recursionFn(intoId || expression);
-+                        });
-+                    }, 1);
-+                    break;
-+                case AST.ArrayExpression:
-+                    args = [];
-+                    forEach(ast.elements, function(expr) {
-+                        self.recurse(expr, ast.constant ? undefined : self.nextId(), undefined, function(argument) {
-+                            args.push(argument);
-+                        });
-+                    });
-+                    expression = '[' + args.join(',') + ']';
-+                    this.assign(intoId, expression);
-+                    recursionFn(intoId || expression);
-+                    break;
-+                case AST.ObjectExpression:
-+                    args = [];
-+                    computed = false;
-+                    forEach(ast.properties, function(property) {
-+                        if (property.computed) {
-+                            computed = true;
-+                        }
-+                    });
-+                    if (computed) {
-+                        intoId = intoId || this.nextId();
-+                        this.assign(intoId, '{}');
-+                        forEach(ast.properties, function(property) {
-+                            if (property.computed) {
-+                                left = self.nextId();
-+                                self.recurse(property.key, left);
-+                            } else {
-+                                left = property.key.type === AST.Identifier ?
-+                                    property.key.name :
-+                                    ('' + property.key.value);
-+                            }
-+                            right = self.nextId();
-+                            self.recurse(property.value, right);
-+                            self.assign(self.member(intoId, left, property.computed), right);
-+                        });
-+                    } else {
-+                        forEach(ast.properties, function(property) {
-+                            self.recurse(property.value, ast.constant ? undefined : self.nextId(), undefined, function(expr) {
-+                                args.push(self.escape(
-+                                    property.key.type === AST.Identifier ? property.key.name :
-+                                        ('' + property.key.value)) +
-+                                    ':' + expr);
-+                            });
-+                        });
-+                        expression = '{' + args.join(',') + '}';
-+                        this.assign(intoId, expression);
-+                    }
-+                    recursionFn(intoId || expression);
-+                    break;
-+                case AST.ThisExpression:
-+                    this.assign(intoId, 's');
-+                    recursionFn(intoId || 's');
-+                    break;
-+                case AST.LocalsExpression:
-+                    this.assign(intoId, 'l');
-+                    recursionFn(intoId || 'l');
-+                    break;
-+                case AST.NGValueParameter:
-+                    this.assign(intoId, 'v');
-+                    recursionFn(intoId || 'v');
-+                    break;
-+            }
-+        },
-+
-+        getHasOwnProperty: function(element, property) {
-+            var key = element + '.' + property;
-+            var own = this.current().own;
-+            if (!own.hasOwnProperty(key)) {
-+                own[key] = this.nextId(false, element + '&&(' + this.escape(property) + ' in ' + element + ')');
-+            }
-+            return own[key];
-+        },
-+
-+        assign: function(id, value) {
-+            if (!id) return;
-+            this.current().body.push(id, '=', value, ';');
-+            return id;
-+        },
-+
-+        filter: function(filterName) {
-+            if (!this.state.filters.hasOwnProperty(filterName)) {
-+                this.state.filters[filterName] = this.nextId(true);
-+            }
-+            return this.state.filters[filterName];
-+        },
-+
-+        ifDefined: function(id, defaultValue) {
-+            return 'ifDefined(' + id + ',' + this.escape(defaultValue) + ')';
-+        },
-+
-+        plus: function(left, right) {
-+            return 'plus(' + left + ',' + right + ')';
-+        },
-+
-+        return_: function(id) {
-+            this.current().body.push('return ', id, ';');
-+        },
-+
-+        if_: function(test, alternate, consequent) {
-+            if (test === true) {
-+                alternate();
-             } else {
--                return $parseOptions.unwrapPromises;
-+                var body = this.current().body;
-+                body.push('if(', test, '){');
-+                alternate();
-+                body.push('}');
-+                if (consequent) {
-+                    body.push('else{');
-+                    consequent();
-+                    body.push('}');
-+                }
-             }
--        };
-+        },
- 
-+        not: function(expression) {
-+            return '!(' + expression + ')';
-+        },
- 
--        /**
--         * @deprecated Promise unwrapping via $parse is deprecated and will be removed in the future.
--         *
--         * @ngdoc method
--         * @name $parseProvider#logPromiseWarnings
--         * @description
--         *
--         * Controls whether Angular should log a warning on any encounter of a promise in an expression.
--         *
--         * The default is set to `true`.
--         *
--         * This setting applies only if `$parseProvider.unwrapPromises` setting is set to true as well.
--         *
--         * @param {boolean=} value New value.
--         * @returns {boolean|self} Returns the current setting when used as getter and self if used as
--         *                         setter.
--         */
--        this.logPromiseWarnings = function(value) {
--            if (isDefined(value)) {
--                $parseOptions.logPromiseWarnings = value;
--                return this;
-+        isNull: function(expression) {
-+            return expression + '==null';
-+        },
-+
-+        notNull: function(expression) {
-+            return expression + '!=null';
-+        },
-+
-+        nonComputedMember: function(left, right) {
-+            var SAFE_IDENTIFIER = /^[$_a-zA-Z][$_a-zA-Z0-9]*$/;
-+            var UNSAFE_CHARACTERS = /[^$_a-zA-Z0-9]/g;
-+            if (SAFE_IDENTIFIER.test(right)) {
-+                return left + '.' + right;
-             } else {
--                return $parseOptions.logPromiseWarnings;
-+                return left  + '["' + right.replace(UNSAFE_CHARACTERS, this.stringEscapeFn) + '"]';
-             }
--        };
-+        },
-+
-+        computedMember: function(left, right) {
-+            return left + '[' + right + ']';
-+        },
- 
-+        member: function(left, right, computed) {
-+            if (computed) return this.computedMember(left, right);
-+            return this.nonComputedMember(left, right);
-+        },
- 
--        this.$get = ['$filter', '$sniffer', '$log', function($filter, $sniffer, $log) {
--            $parseOptions.csp = $sniffer.csp;
-+        getStringValue: function(item) {
-+            this.assign(item, 'getStringValue(' + item + ')');
-+        },
- 
--            promiseWarning = function promiseWarningFn(fullExp) {
--                if (!$parseOptions.logPromiseWarnings || promiseWarningCache.hasOwnProperty(fullExp)) return;
--                promiseWarningCache[fullExp] = true;
--                $log.warn('[$parse] Promise found in the expression `' + fullExp + '`. ' +
--                'Automatic unwrapping of promises in Angular expressions is deprecated.');
-+        lazyRecurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
-+            var self = this;
-+            return function() {
-+                self.recurse(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck);
-             };
-+        },
- 
--            return function(exp) {
--                var parsedExpression;
-+        lazyAssign: function(id, value) {
-+            var self = this;
-+            return function() {
-+                self.assign(id, value);
-+            };
-+        },
- 
--                switch (typeof exp) {
--                    case 'string':
-+        stringEscapeRegex: /[^ a-zA-Z0-9]/g,
- 
--                        if (cache.hasOwnProperty(exp)) {
--                            return cache[exp];
--                        }
-+        stringEscapeFn: function(c) {
-+            return '\\u' + ('0000' + c.charCodeAt(0).toString(16)).slice(-4);
-+        },
- 
--                        var lexer = new Lexer($parseOptions);
--                        var parser = new Parser(lexer, $filter, $parseOptions);
--                        parsedExpression = parser.parse(exp, false);
-+        escape: function(value) {
-+            if (isString(value)) return '\'' + value.replace(this.stringEscapeRegex, this.stringEscapeFn) + '\'';
-+            if (isNumber(value)) return value.toString();
-+            if (value === true) return 'true';
-+            if (value === false) return 'false';
-+            if (value === null) return 'null';
-+            if (typeof value === 'undefined') return 'undefined';
- 
--                        if (exp !== 'hasOwnProperty') {
--                            // Only cache the value if it's not going to mess up the cache object
--                            // This is more performant that using Object.prototype.hasOwnProperty.call
--                            cache[exp] = parsedExpression;
--                        }
-+            throw $parseMinErr('esc', 'IMPOSSIBLE');
-+        },
- 
--                        return parsedExpression;
-+        nextId: function(skip, init) {
-+            var id = 'v' + (this.state.nextId++);
-+            if (!skip) {
-+                this.current().vars.push(id + (init ? '=' + init : ''));
-+            }
-+            return id;
-+        },
- 
--                    case 'function':
--                        return exp;
-+        current: function() {
-+            return this.state[this.state.computing];
-+        }
-+    };
- 
--                    default:
--                        return noop;
--                }
--            };
--        }];
-+
-+    function ASTInterpreter($filter) {
-+        this.$filter = $filter;
-     }
- 
--    /**
--     * @ngdoc service
--     * @name $q
--     * @requires $rootScope
--     *
--     * @description
--     * A promise/deferred implementation inspired by [Kris Kowal's Q](https://github.com/kriskowal/q).
--     *
--     * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an
--     * interface for interacting with an object that represents the result of an action that is
--     * performed asynchronously, and may or may not be finished at any given point in time.
--     *
--     * From the perspective of dealing with error handling, deferred and promise APIs are to
--     * asynchronous programming what `try`, `catch` and `throw` keywords are to synchronous programming.
--     *
--     * ```js
--     *   // for the purpose of this example let's assume that variables `$q`, `scope` and `okToGreet`
--     *   // are available in the current lexical scope (they could have been injected or passed in).
--     *
--     *   function asyncGreet(name) {
-- *     var deferred = $q.defer();
-- *
-- *     setTimeout(function() {
-- *       // since this fn executes async in a future turn of the event loop, we need to wrap
-- *       // our code into an $apply call so that the model changes are properly observed.
-- *       scope.$apply(function() {
-- *         deferred.notify('About to greet ' + name + '.');
-- *
-- *         if (okToGreet(name)) {
-- *           deferred.resolve('Hello, ' + name + '!');
-- *         } else {
-- *           deferred.reject('Greeting ' + name + ' is not allowed.');
-- *         }
-- *       });
-- *     }, 1000);
-- *
-- *     return deferred.promise;
-- *   }
--     *
--     *   var promise = asyncGreet('Robin Hood');
--     *   promise.then(function(greeting) {
-- *     alert('Success: ' + greeting);
-- *   }, function(reason) {
-- *     alert('Failed: ' + reason);
-- *   }, function(update) {
-- *     alert('Got notification: ' + update);
-- *   });
--     * ```
--     *
--     * At first it might not be obvious why this extra complexity is worth the trouble. The payoff
--     * comes in the way of guarantees that promise and deferred APIs make, see
--     * https://github.com/kriskowal/uncommonjs/blob/master/promises/specification.md.
--     *
--     * Additionally the promise api allows for composition that is very hard to do with the
--     * traditional callback ([CPS](http://en.wikipedia.org/wiki/Continuation-passing_style)) approach.
--     * For more on this please see the [Q documentation](https://github.com/kriskowal/q) especially the
--     * section on serial or parallel joining of promises.
--     *
--     *
--     * # The Deferred API
--     *
--     * A new instance of deferred is constructed by calling `$q.defer()`.
--     *
--     * The purpose of the deferred object is to expose the associated Promise instance as well as APIs
--     * that can be used for signaling the successful or unsuccessful completion, as well as the status
--     * of the task.
--     *
--     * **Methods**
--     *
--     * - `resolve(value)` – resolves the derived promise with the `value`. If the value is a rejection
--     *   constructed via `$q.reject`, the promise will be rejected instead.
--     * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to
--     *   resolving it with a rejection constructed via `$q.reject`.
--     * - `notify(value)` - provides updates on the status of the promise's execution. This may be called
--     *   multiple times before the promise is either resolved or rejected.
--     *
--     * **Properties**
--     *
--     * - promise – `{Promise}` – promise object associated with this deferred.
--     *
--     *
--     * # The Promise API
--     *
--     * A new promise instance is created when a deferred instance is created and can be retrieved by
--     * calling `deferred.promise`.
--     *
--     * The purpose of the promise object is to allow for interested parties to get access to the result
--     * of the deferred task when it completes.
--     *
--     * **Methods**
--     *
--     * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or
--     *   will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously
--     *   as soon as the result is available. The callbacks are called with a single argument: the result
--     *   or rejection reason. Additionally, the notify callback may be called zero or more times to
--     *   provide a progress indication, before the promise is resolved or rejected.
--     *
--     *   This method *returns a new promise* which is resolved or rejected via the return value of the
--     *   `successCallback`, `errorCallback`. It also notifies via the return value of the
--     *   `notifyCallback` method. The promise can not be resolved or rejected from the notifyCallback
--     *   method.
--     *
--     * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
--     *
--     * - `finally(callback)` – allows you to observe either the fulfillment or rejection of a promise,
--     *   but to do so without modifying the final value. This is useful to release resources or do some
--     *   clean-up that needs to be done whether the promise was rejected or resolved. See the [full
--     *   specification](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) for
--     *   more information.
--     *
--     *   Because `finally` is a reserved word in JavaScript and reserved keywords are not supported as
--     *   property names by ES3, you'll need to invoke the method like `promise['finally'](callback)` to
--     *   make your code IE8 and Android 2.x compatible.
-+    ASTInterpreter.prototype = {
-+        compile: function(ast) {
-+            var self = this;
-+            findConstantAndWatchExpressions(ast, self.$filter);
-+            var assignable;
-+            var assign;
-+            if ((assignable = assignableAST(ast))) {
-+                assign = this.recurse(assignable);
-+            }
-+            var toWatch = getInputs(ast.body);
-+            var inputs;
-+            if (toWatch) {
-+                inputs = [];
-+                forEach(toWatch, function(watch, key) {
-+                    var input = self.recurse(watch);
-+                    input.isPure = watch.isPure;
-+                    watch.input = input;
-+                    inputs.push(input);
-+                    watch.watchId = key;
-+                });
-+            }
-+            var expressions = [];
-+            forEach(ast.body, function(expression) {
-+                expressions.push(self.recurse(expression.expression));
-+            });
-+            var fn = ast.body.length === 0 ? noop :
-+                ast.body.length === 1 ? expressions[0] :
-+                    function(scope, locals) {
-+                        var lastValue;
-+                        forEach(expressions, function(exp) {
-+                            lastValue = exp(scope, locals);
-+                        });
-+                        return lastValue;
-+                    };
-+            if (assign) {
-+                fn.assign = function(scope, value, locals) {
-+                    return assign(scope, locals, value);
-+                };
-+            }
-+            if (inputs) {
-+                fn.inputs = inputs;
-+            }
-+            return fn;
-+        },
-+
-+        recurse: function(ast, context, create) {
-+            var left, right, self = this, args;
-+            if (ast.input) {
-+                return this.inputs(ast.input, ast.watchId);
-+            }
-+            switch (ast.type) {
-+                case AST.Literal:
-+                    return this.value(ast.value, context);
-+                case AST.UnaryExpression:
-+                    right = this.recurse(ast.argument);
-+                    return this['unary' + ast.operator](right, context);
-+                case AST.BinaryExpression:
-+                    left = this.recurse(ast.left);
-+                    right = this.recurse(ast.right);
-+                    return this['binary' + ast.operator](left, right, context);
-+                case AST.LogicalExpression:
-+                    left = this.recurse(ast.left);
-+                    right = this.recurse(ast.right);
-+                    return this['binary' + ast.operator](left, right, context);
-+                case AST.ConditionalExpression:
-+                    return this['ternary?:'](
-+                        this.recurse(ast.test),
-+                        this.recurse(ast.alternate),
-+                        this.recurse(ast.consequent),
-+                        context
-+                    );
-+                case AST.Identifier:
-+                    return self.identifier(ast.name, context, create);
-+                case AST.MemberExpression:
-+                    left = this.recurse(ast.object, false, !!create);
-+                    if (!ast.computed) {
-+                        right = ast.property.name;
-+                    }
-+                    if (ast.computed) right = this.recurse(ast.property);
-+                    return ast.computed ?
-+                        this.computedMember(left, right, context, create) :
-+                        this.nonComputedMember(left, right, context, create);
-+                case AST.CallExpression:
-+                    args = [];
-+                    forEach(ast.arguments, function(expr) {
-+                        args.push(self.recurse(expr));
-+                    });
-+                    if (ast.filter) right = this.$filter(ast.callee.name);
-+                    if (!ast.filter) right = this.recurse(ast.callee, true);
-+                    return ast.filter ?
-+                        function(scope, locals, assign, inputs) {
-+                            var values = [];
-+                            for (var i = 0; i < args.length; ++i) {
-+                                values.push(args[i](scope, locals, assign, inputs));
-+                            }
-+                            var value = right.apply(undefined, values, inputs);
-+                            return context ? {context: undefined, name: undefined, value: value} : value;
-+                        } :
-+                        function(scope, locals, assign, inputs) {
-+                            var rhs = right(scope, locals, assign, inputs);
-+                            var value;
-+                            if (rhs.value != null) {
-+                                var values = [];
-+                                for (var i = 0; i < args.length; ++i) {
-+                                    values.push(args[i](scope, locals, assign, inputs));
-+                                }
-+                                value = rhs.value.apply(rhs.context, values);
-+                            }
-+                            return context ? {value: value} : value;
-+                        };
-+                case AST.AssignmentExpression:
-+                    left = this.recurse(ast.left, true, 1);
-+                    right = this.recurse(ast.right);
-+                    return function(scope, locals, assign, inputs) {
-+                        var lhs = left(scope, locals, assign, inputs);
-+                        var rhs = right(scope, locals, assign, inputs);
-+                        lhs.context[lhs.name] = rhs;
-+                        return context ? {value: rhs} : rhs;
-+                    };
-+                case AST.ArrayExpression:
-+                    args = [];
-+                    forEach(ast.elements, function(expr) {
-+                        args.push(self.recurse(expr));
-+                    });
-+                    return function(scope, locals, assign, inputs) {
-+                        var value = [];
-+                        for (var i = 0; i < args.length; ++i) {
-+                            value.push(args[i](scope, locals, assign, inputs));
-+                        }
-+                        return context ? {value: value} : value;
-+                    };
-+                case AST.ObjectExpression:
-+                    args = [];
-+                    forEach(ast.properties, function(property) {
-+                        if (property.computed) {
-+                            args.push({key: self.recurse(property.key),
-+                                computed: true,
-+                                value: self.recurse(property.value)
-+                            });
-+                        } else {
-+                            args.push({key: property.key.type === AST.Identifier ?
-+                                    property.key.name :
-+                                    ('' + property.key.value),
-+                                computed: false,
-+                                value: self.recurse(property.value)
-+                            });
-+                        }
-+                    });
-+                    return function(scope, locals, assign, inputs) {
-+                        var value = {};
-+                        for (var i = 0; i < args.length; ++i) {
-+                            if (args[i].computed) {
-+                                value[args[i].key(scope, locals, assign, inputs)] = args[i].value(scope, locals, assign, inputs);
-+                            } else {
-+                                value[args[i].key] = args[i].value(scope, locals, assign, inputs);
-+                            }
-+                        }
-+                        return context ? {value: value} : value;
-+                    };
-+                case AST.ThisExpression:
-+                    return function(scope) {
-+                        return context ? {value: scope} : scope;
-+                    };
-+                case AST.LocalsExpression:
-+                    return function(scope, locals) {
-+                        return context ? {value: locals} : locals;
-+                    };
-+                case AST.NGValueParameter:
-+                    return function(scope, locals, assign) {
-+                        return context ? {value: assign} : assign;
-+                    };
-+            }
-+        },
-+
-+        'unary+': function(argument, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = argument(scope, locals, assign, inputs);
-+                if (isDefined(arg)) {
-+                    arg = +arg;
-+                } else {
-+                    arg = 0;
-+                }
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'unary-': function(argument, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = argument(scope, locals, assign, inputs);
-+                if (isDefined(arg)) {
-+                    arg = -arg;
-+                } else {
-+                    arg = -0;
-+                }
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'unary!': function(argument, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = !argument(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary+': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var lhs = left(scope, locals, assign, inputs);
-+                var rhs = right(scope, locals, assign, inputs);
-+                var arg = plusFn(lhs, rhs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary-': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var lhs = left(scope, locals, assign, inputs);
-+                var rhs = right(scope, locals, assign, inputs);
-+                var arg = (isDefined(lhs) ? lhs : 0) - (isDefined(rhs) ? rhs : 0);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary*': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = left(scope, locals, assign, inputs) * right(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary/': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = left(scope, locals, assign, inputs) / right(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary%': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = left(scope, locals, assign, inputs) % right(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary===': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = left(scope, locals, assign, inputs) === right(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary!==': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = left(scope, locals, assign, inputs) !== right(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary==': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                // eslint-disable-next-line eqeqeq
-+                var arg = left(scope, locals, assign, inputs) == right(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary!=': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                // eslint-disable-next-line eqeqeq
-+                var arg = left(scope, locals, assign, inputs) != right(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary<': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = left(scope, locals, assign, inputs) < right(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary>': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = left(scope, locals, assign, inputs) > right(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary<=': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = left(scope, locals, assign, inputs) <= right(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary>=': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = left(scope, locals, assign, inputs) >= right(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary&&': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = left(scope, locals, assign, inputs) && right(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'binary||': function(left, right, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = left(scope, locals, assign, inputs) || right(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        'ternary?:': function(test, alternate, consequent, context) {
-+            return function(scope, locals, assign, inputs) {
-+                var arg = test(scope, locals, assign, inputs) ? alternate(scope, locals, assign, inputs) : consequent(scope, locals, assign, inputs);
-+                return context ? {value: arg} : arg;
-+            };
-+        },
-+        value: function(value, context) {
-+            return function() { return context ? {context: undefined, name: undefined, value: value} : value; };
-+        },
-+        identifier: function(name, context, create) {
-+            return function(scope, locals, assign, inputs) {
-+                var base = locals && (name in locals) ? locals : scope;
-+                if (create && create !== 1 && base && base[name] == null) {
-+                    base[name] = {};
-+                }
-+                var value = base ? base[name] : undefined;
-+                if (context) {
-+                    return {context: base, name: name, value: value};
-+                } else {
-+                    return value;
-+                }
-+            };
-+        },
-+        computedMember: function(left, right, context, create) {
-+            return function(scope, locals, assign, inputs) {
-+                var lhs = left(scope, locals, assign, inputs);
-+                var rhs;
-+                var value;
-+                if (lhs != null) {
-+                    rhs = right(scope, locals, assign, inputs);
-+                    rhs = getStringValue(rhs);
-+                    if (create && create !== 1) {
-+                        if (lhs && !(lhs[rhs])) {
-+                            lhs[rhs] = {};
-+                        }
-+                    }
-+                    value = lhs[rhs];
-+                }
-+                if (context) {
-+                    return {context: lhs, name: rhs, value: value};
-+                } else {
-+                    return value;
-+                }
-+            };
-+        },
-+        nonComputedMember: function(left, right, context, create) {
-+            return function(scope, locals, assign, inputs) {
-+                var lhs = left(scope, locals, assign, inputs);
-+                if (create && create !== 1) {
-+                    if (lhs && lhs[right] == null) {
-+                        lhs[right] = {};
-+                    }
-+                }
-+                var value = lhs != null ? lhs[right] : undefined;
-+                if (context) {
-+                    return {context: lhs, name: right, value: value};
-+                } else {
-+                    return value;
-+                }
-+            };
-+        },
-+        inputs: function(input, watchId) {
-+            return function(scope, value, locals, inputs) {
-+                if (inputs) return inputs[watchId];
-+                return input(scope, value, locals);
-+            };
-+        }
-+    };
-+
-+    /**
-+     * @constructor
-+     */
-+    function Parser(lexer, $filter, options) {
-+        this.ast = new AST(lexer, options);
-+        this.astCompiler = options.csp ? new ASTInterpreter($filter) :
-+            new ASTCompiler($filter);
-+    }
-+
-+    Parser.prototype = {
-+        constructor: Parser,
-+
-+        parse: function(text) {
-+            var ast = this.getAst(text);
-+            var fn = this.astCompiler.compile(ast.ast);
-+            fn.literal = isLiteral(ast.ast);
-+            fn.constant = isConstant(ast.ast);
-+            fn.oneTime = ast.oneTime;
-+            return fn;
-+        },
-+
-+        getAst: function(exp) {
-+            var oneTime = false;
-+            exp = exp.trim();
-+
-+            if (exp.charAt(0) === ':' && exp.charAt(1) === ':') {
-+                oneTime = true;
-+                exp = exp.substring(2);
-+            }
-+            return {
-+                ast: this.ast.ast(exp),
-+                oneTime: oneTime
-+            };
-+        }
-+    };
-+
-+    function getValueOf(value) {
-+        return isFunction(value.valueOf) ? value.valueOf() : objectValueOf.call(value);
-+    }
-+
-+///////////////////////////////////
-+
-+    /**
-+     * @ngdoc service
-+     * @name $parse
-+     * @kind function
-      *
--     * # Chaining promises
-+     * @description
-      *
--     * Because calling the `then` method of a promise returns a new derived promise, it is easily
--     * possible to create a chain of promises:
-+     * Converts AngularJS {@link guide/expression expression} into a function.
-      *
-      * ```js
--     *   promiseB = promiseA.then(function(result) {
-- *     return result + 1;
-- *   });
-+     *   var getter = $parse('user.name');
-+     *   var setter = getter.assign;
-+     *   var context = {user:{name:'AngularJS'}};
-+     *   var locals = {user:{name:'local'}};
-      *
--     *   // promiseB will be resolved immediately after promiseA is resolved and its value
--     *   // will be the result of promiseA incremented by 1
-+     *   expect(getter(context)).toEqual('AngularJS');
-+     *   setter(context, 'newValue');
-+     *   expect(context.user.name).toEqual('newValue');
-+     *   expect(getter(context, locals)).toEqual('local');
-      * ```
-      *
--     * It is possible to create chains of any length and since a promise can be resolved with another
--     * promise (which will defer its resolution further), it is possible to pause/defer resolution of
--     * the promises at any point in the chain. This makes it possible to implement powerful APIs like
--     * $http's response interceptors.
-      *
-+     * @param {string} expression String expression to compile.
-+     * @returns {function(context, locals)} a function which represents the compiled expression:
-      *
--     * # Differences between Kris Kowal's Q and $q
--     *
--     *  There are two main differences:
--     *
--     * - $q is integrated with the {@link ng.$rootScope.Scope} Scope model observation
--     *   mechanism in angular, which means faster propagation of resolution or rejection into your
--     *   models and avoiding unnecessary browser repaints, which would result in flickering UI.
--     * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains
--     *   all the important functionality needed for common async tasks.
-+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-+     *      are evaluated against (typically a scope object).
-+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-+     *      `context`.
-      *
--     *  # Testing
-+     *    The returned function also has the following properties:
-+     *      * `literal` – `{boolean}` – whether the expression's top-level node is a JavaScript
-+     *        literal.
-+     *      * `constant` – `{boolean}` – whether the expression is made entirely of JavaScript
-+     *        constant literals.
-+     *      * `assign` – `{?function(context, value)}` – if the expression is assignable, this will be
-+     *        set to a function to change its value on the given context.
-      *
--     *  ```js
--     *    it('should simulate promise', inject(function($q, $rootScope) {
-- *      var deferred = $q.defer();
-- *      var promise = deferred.promise;
-- *      var resolvedValue;
-- *
-- *      promise.then(function(value) { resolvedValue = value; });
-- *      expect(resolvedValue).toBeUndefined();
-- *
-- *      // Simulate resolving of promise
-- *      deferred.resolve(123);
-- *      // Note that the 'then' function does not get called synchronously.
-- *      // This is because we want the promise API to always be async, whether or not
-- *      // it got called synchronously or asynchronously.
-- *      expect(resolvedValue).toBeUndefined();
-- *
-- *      // Propagate promise resolution to 'then' functions using $apply().
-- *      $rootScope.$apply();
-- *      expect(resolvedValue).toEqual(123);
-- *    }));
--     *  ```
-      */
--    function $QProvider() {
--
--        this.$get = ['$rootScope', '$exceptionHandler', function($rootScope, $exceptionHandler) {
--            return qFactory(function(callback) {
--                $rootScope.$evalAsync(callback);
--            }, $exceptionHandler);
--        }];
--    }
- 
- 
-     /**
--     * Constructs a promise manager.
-+     * @ngdoc provider
-+     * @name $parseProvider
-+     * @this
-      *
--     * @param {function(Function)} nextTick Function for executing functions in the next turn.
--     * @param {function(...*)} exceptionHandler Function into which unexpected exceptions are passed for
--     *     debugging purposes.
--     * @returns {object} Promise manager.
-+     * @description
-+     * `$parseProvider` can be used for configuring the default behavior of the {@link ng.$parse $parse}
-+     *  service.
-      */
--    function qFactory(nextTick, exceptionHandler) {
-+    function $ParseProvider() {
-+        var cache = createMap();
-+        var literals = {
-+            'true': true,
-+            'false': false,
-+            'null': null,
-+            'undefined': undefined
-+        };
-+        var identStart, identContinue;
-+
-+        /**
-+         * @ngdoc method
-+         * @name $parseProvider#addLiteral
-+         * @description
-+         *
-+         * Configure $parse service to add literal values that will be present as literal at expressions.
-+         *
-+         * @param {string} literalName Token for the literal value. The literal name value must be a valid literal name.
-+         * @param {*} literalValue Value for this literal. All literal values must be primitives or `undefined`.
-+         *
-+         **/
-+        this.addLiteral = function(literalName, literalValue) {
-+            literals[literalName] = literalValue;
-+        };
- 
-         /**
-          * @ngdoc method
--         * @name $q#defer
--         * @function
-+         * @name $parseProvider#setIdentifierFns
-          *
-          * @description
--         * Creates a `Deferred` object which represents a task which will finish in the future.
-          *
--         * @returns {Deferred} Returns a new instance of deferred.
-+         * Allows defining the set of characters that are allowed in AngularJS expressions. The function
-+         * `identifierStart` will get called to know if a given character is a valid character to be the
-+         * first character for an identifier. The function `identifierContinue` will get called to know if
-+         * a given character is a valid character to be a follow-up identifier character. The functions
-+         * `identifierStart` and `identifierContinue` will receive as arguments the single character to be
-+         * identifier and the character code point. These arguments will be `string` and `numeric`. Keep in
-+         * mind that the `string` parameter can be two characters long depending on the character
-+         * representation. It is expected for the function to return `true` or `false`, whether that
-+         * character is allowed or not.
-+         *
-+         * Since this function will be called extensively, keep the implementation of these functions fast,
-+         * as the performance of these functions have a direct impact on the expressions parsing speed.
-+         *
-+         * @param {function=} identifierStart The function that will decide whether the given character is
-+         *   a valid identifier start character.
-+         * @param {function=} identifierContinue The function that will decide whether the given character is
-+         *   a valid identifier continue character.
-          */
--        var defer = function() {
--            var pending = [],
--                value, deferred;
--
--            deferred = {
--
--                resolve: function(val) {
--                    if (pending) {
--                        var callbacks = pending;
--                        pending = undefined;
--                        value = ref(val);
--
--                        if (callbacks.length) {
--                            nextTick(function() {
--                                var callback;
--                                for (var i = 0, ii = callbacks.length; i < ii; i++) {
--                                    callback = callbacks[i];
--                                    value.then(callback[0], callback[1], callback[2]);
--                                }
--                            });
-+        this.setIdentifierFns = function(identifierStart, identifierContinue) {
-+            identStart = identifierStart;
-+            identContinue = identifierContinue;
-+            return this;
-+        };
-+
-+        this.$get = ['$filter', function($filter) {
-+            var noUnsafeEval = csp().noUnsafeEval;
-+            var $parseOptions = {
-+                csp: noUnsafeEval,
-+                literals: copy(literals),
-+                isIdentifierStart: isFunction(identStart) && identStart,
-+                isIdentifierContinue: isFunction(identContinue) && identContinue
-+            };
-+            $parse.$$getAst = $$getAst;
-+            return $parse;
-+
-+            function $parse(exp, interceptorFn) {
-+                var parsedExpression, cacheKey;
-+
-+                switch (typeof exp) {
-+                    case 'string':
-+                        exp = exp.trim();
-+                        cacheKey = exp;
-+
-+                        parsedExpression = cache[cacheKey];
-+
-+                        if (!parsedExpression) {
-+                            var lexer = new Lexer($parseOptions);
-+                            var parser = new Parser(lexer, $filter, $parseOptions);
-+                            parsedExpression = parser.parse(exp);
-+                            if (parsedExpression.constant) {
-+                                parsedExpression.$$watchDelegate = constantWatchDelegate;
-+                            } else if (parsedExpression.oneTime) {
-+                                parsedExpression.$$watchDelegate = parsedExpression.literal ?
-+                                    oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
-+                            } else if (parsedExpression.inputs) {
-+                                parsedExpression.$$watchDelegate = inputsWatchDelegate;
-+                            }
-+                            cache[cacheKey] = parsedExpression;
-                         }
--                    }
--                },
-+                        return addInterceptor(parsedExpression, interceptorFn);
- 
-+                    case 'function':
-+                        return addInterceptor(exp, interceptorFn);
- 
--                reject: function(reason) {
--                    deferred.resolve(createInternalRejectedPromise(reason));
--                },
-+                    default:
-+                        return addInterceptor(noop, interceptorFn);
-+                }
-+            }
- 
-+            function $$getAst(exp) {
-+                var lexer = new Lexer($parseOptions);
-+                var parser = new Parser(lexer, $filter, $parseOptions);
-+                return parser.getAst(exp).ast;
-+            }
- 
--                notify: function(progress) {
--                    if (pending) {
--                        var callbacks = pending;
-+            function expressionInputDirtyCheck(newValue, oldValueOfValue, compareObjectIdentity) {
- 
--                        if (pending.length) {
--                            nextTick(function() {
--                                var callback;
--                                for (var i = 0, ii = callbacks.length; i < ii; i++) {
--                                    callback = callbacks[i];
--                                    callback[2](progress);
--                                }
--                            });
--                        }
--                    }
--                },
-+                if (newValue == null || oldValueOfValue == null) { // null/undefined
-+                    return newValue === oldValueOfValue;
-+                }
- 
-+                if (typeof newValue === 'object') {
- 
--                promise: {
--                    then: function(callback, errback, progressback) {
--                        var result = defer();
-+                    // attempt to convert the value to a primitive type
-+                    // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
-+                    //             be cheaply dirty-checked
-+                    newValue = getValueOf(newValue);
- 
--                        var wrappedCallback = function(value) {
--                            try {
--                                result.resolve((isFunction(callback) ? callback : defaultCallback)(value));
--                            } catch(e) {
--                                result.reject(e);
--                                exceptionHandler(e);
--                            }
--                        };
-+                    if (typeof newValue === 'object' && !compareObjectIdentity) {
-+                        // objects/arrays are not supported - deep-watching them would be too expensive
-+                        return false;
-+                    }
- 
--                        var wrappedErrback = function(reason) {
--                            try {
--                                result.resolve((isFunction(errback) ? errback : defaultErrback)(reason));
--                            } catch(e) {
--                                result.reject(e);
--                                exceptionHandler(e);
--                            }
--                        };
-+                    // fall-through to the primitive equality check
-+                }
- 
--                        var wrappedProgressback = function(progress) {
--                            try {
--                                result.notify((isFunction(progressback) ? progressback : defaultCallback)(progress));
--                            } catch(e) {
--                                exceptionHandler(e);
--                            }
--                        };
-+                //Primitive or NaN
-+                // eslint-disable-next-line no-self-compare
-+                return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
-+            }
- 
--                        if (pending) {
--                            pending.push([wrappedCallback, wrappedErrback, wrappedProgressback]);
--                        } else {
--                            value.then(wrappedCallback, wrappedErrback, wrappedProgressback);
-+            function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression, prettyPrintExpression) {
-+                var inputExpressions = parsedExpression.inputs;
-+                var lastResult;
-+
-+                if (inputExpressions.length === 1) {
-+                    var oldInputValueOf = expressionInputDirtyCheck; // init to something unique so that equals check fails
-+                    inputExpressions = inputExpressions[0];
-+                    return scope.$watch(function expressionInputWatch(scope) {
-+                        var newInputValue = inputExpressions(scope);
-+                        if (!expressionInputDirtyCheck(newInputValue, oldInputValueOf, inputExpressions.isPure)) {
-+                            lastResult = parsedExpression(scope, undefined, undefined, [newInputValue]);
-+                            oldInputValueOf = newInputValue && getValueOf(newInputValue);
-                         }
-+                        return lastResult;
-+                    }, listener, objectEquality, prettyPrintExpression);
-+                }
- 
--                        return result.promise;
--                    },
--
--                    "catch": function(callback) {
--                        return this.then(null, callback);
--                    },
-+                var oldInputValueOfValues = [];
-+                var oldInputValues = [];
-+                for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
-+                    oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
-+                    oldInputValues[i] = null;
-+                }
- 
--                    "finally": function(callback) {
-+                return scope.$watch(function expressionInputsWatch(scope) {
-+                    var changed = false;
- 
--                        function makePromise(value, resolved) {
--                            var result = defer();
--                            if (resolved) {
--                                result.resolve(value);
--                            } else {
--                                result.reject(value);
--                            }
--                            return result.promise;
--                        }
--
--                        function handleCallback(value, isResolved) {
--                            var callbackOutput = null;
--                            try {
--                                callbackOutput = (callback ||defaultCallback)();
--                            } catch(e) {
--                                return makePromise(e, false);
--                            }
--                            if (callbackOutput && isFunction(callbackOutput.then)) {
--                                return callbackOutput.then(function() {
--                                    return makePromise(value, isResolved);
--                                }, function(error) {
--                                    return makePromise(error, false);
--                                });
--                            } else {
--                                return makePromise(value, isResolved);
--                            }
-+                    for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
-+                        var newInputValue = inputExpressions[i](scope);
-+                        if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i], inputExpressions[i].isPure))) {
-+                            oldInputValues[i] = newInputValue;
-+                            oldInputValueOfValues[i] = newInputValue && getValueOf(newInputValue);
-                         }
-+                    }
- 
--                        return this.then(function(value) {
--                            return handleCallback(value, true);
--                        }, function(error) {
--                            return handleCallback(error, false);
--                        });
-+                    if (changed) {
-+                        lastResult = parsedExpression(scope, undefined, undefined, oldInputValues);
-                     }
--                }
--            };
- 
--            return deferred;
--        };
-+                    return lastResult;
-+                }, listener, objectEquality, prettyPrintExpression);
-+            }
- 
-+            function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression, prettyPrintExpression) {
-+                var unwatch, lastValue;
-+                if (parsedExpression.inputs) {
-+                    unwatch = inputsWatchDelegate(scope, oneTimeListener, objectEquality, parsedExpression, prettyPrintExpression);
-+                } else {
-+                    unwatch = scope.$watch(oneTimeWatch, oneTimeListener, objectEquality);
-+                }
-+                return unwatch;
- 
--        var ref = function(value) {
--            if (value && isFunction(value.then)) return value;
--            return {
--                then: function(callback) {
--                    var result = defer();
--                    nextTick(function() {
--                        result.resolve(callback(value));
--                    });
--                    return result.promise;
-+                function oneTimeWatch(scope) {
-+                    return parsedExpression(scope);
-                 }
--            };
--        };
-+                function oneTimeListener(value, old, scope) {
-+                    lastValue = value;
-+                    if (isFunction(listener)) {
-+                        listener(value, old, scope);
-+                    }
-+                    if (isDefined(value)) {
-+                        scope.$$postDigest(function() {
-+                            if (isDefined(lastValue)) {
-+                                unwatch();
-+                            }
-+                        });
-+                    }
-+                }
-+            }
- 
-+            function oneTimeLiteralWatchDelegate(scope, listener, objectEquality, parsedExpression) {
-+                var unwatch, lastValue;
-+                unwatch = scope.$watch(function oneTimeWatch(scope) {
-+                    return parsedExpression(scope);
-+                }, function oneTimeListener(value, old, scope) {
-+                    lastValue = value;
-+                    if (isFunction(listener)) {
-+                        listener(value, old, scope);
-+                    }
-+                    if (isAllDefined(value)) {
-+                        scope.$$postDigest(function() {
-+                            if (isAllDefined(lastValue)) unwatch();
-+                        });
-+                    }
-+                }, objectEquality);
- 
--        /**
--         * @ngdoc method
--         * @name $q#reject
--         * @function
--         *
--         * @description
--         * Creates a promise that is resolved as rejected with the specified `reason`. This api should be
--         * used to forward rejection in a chain of promises. If you are dealing with the last promise in
--         * a promise chain, you don't need to worry about it.
--         *
--         * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of
--         * `reject` as the `throw` keyword in JavaScript. This also means that if you "catch" an error via
--         * a promise error callback and you want to forward the error to the promise derived from the
--         * current promise, you have to "rethrow" the error by returning a rejection constructed via
--         * `reject`.
--         *
--         * ```js
--         *   promiseB = promiseA.then(function(result) {
--   *     // success: do something and resolve promiseB
--   *     //          with the old or a new result
--   *     return result;
--   *   }, function(reason) {
--   *     // error: handle the error if possible and
--   *     //        resolve promiseB with newPromiseOrValue,
--   *     //        otherwise forward the rejection to promiseB
--   *     if (canHandle(reason)) {
--   *      // handle the error and recover
--   *      return newPromiseOrValue;
--   *     }
--   *     return $q.reject(reason);
--   *   });
--         * ```
--         *
--         * @param {*} reason Constant, message, exception or an object representing the rejection reason.
--         * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`.
--         */
--        var reject = function(reason) {
--            var result = defer();
--            result.reject(reason);
--            return result.promise;
--        };
-+                return unwatch;
- 
--        var createInternalRejectedPromise = function(reason) {
--            return {
--                then: function(callback, errback) {
--                    var result = defer();
--                    nextTick(function() {
--                        try {
--                            result.resolve((isFunction(errback) ? errback : defaultErrback)(reason));
--                        } catch(e) {
--                            result.reject(e);
--                            exceptionHandler(e);
--                        }
-+                function isAllDefined(value) {
-+                    var allDefined = true;
-+                    forEach(value, function(val) {
-+                        if (!isDefined(val)) allDefined = false;
-                     });
--                    return result.promise;
-+                    return allDefined;
-                 }
--            };
--        };
--
-+            }
- 
--        /**
--         * @ngdoc method
--         * @name $q#when
--         * @function
--         *
--         * @description
--         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise.
--         * This is useful when you are dealing with an object that might or might not be a promise, or if
--         * the promise comes from a source that can't be trusted.
--         *
--         * @param {*} value Value or a promise
--         * @returns {Promise} Returns a promise of the passed value or promise
--         */
--        var when = function(value, callback, errback, progressback) {
--            var result = defer(),
--                done;
-+            function constantWatchDelegate(scope, listener, objectEquality, parsedExpression) {
-+                var unwatch = scope.$watch(function constantWatch(scope) {
-+                    unwatch();
-+                    return parsedExpression(scope);
-+                }, listener, objectEquality);
-+                return unwatch;
-+            }
- 
--            var wrappedCallback = function(value) {
--                try {
--                    return (isFunction(callback) ? callback : defaultCallback)(value);
--                } catch (e) {
--                    exceptionHandler(e);
--                    return reject(e);
--                }
--            };
-+            function addInterceptor(parsedExpression, interceptorFn) {
-+                if (!interceptorFn) return parsedExpression;
-+                var watchDelegate = parsedExpression.$$watchDelegate;
-+                var useInputs = false;
-+
-+                var regularWatch =
-+                    watchDelegate !== oneTimeLiteralWatchDelegate &&
-+                    watchDelegate !== oneTimeWatchDelegate;
-+
-+                var fn = regularWatch ? function regularInterceptedExpression(scope, locals, assign, inputs) {
-+                    var value = useInputs && inputs ? inputs[0] : parsedExpression(scope, locals, assign, inputs);
-+                    return interceptorFn(value, scope, locals);
-+                } : function oneTimeInterceptedExpression(scope, locals, assign, inputs) {
-+                    var value = parsedExpression(scope, locals, assign, inputs);
-+                    var result = interceptorFn(value, scope, locals);
-+                    // we only return the interceptor's result if the
-+                    // initial value is defined (for bind-once)
-+                    return isDefined(value) ? result : value;
-+                };
- 
--            var wrappedErrback = function(reason) {
--                try {
--                    return (isFunction(errback) ? errback : defaultErrback)(reason);
--                } catch (e) {
--                    exceptionHandler(e);
--                    return reject(e);
-+                // Propagate $$watchDelegates other then inputsWatchDelegate
-+                useInputs = !parsedExpression.inputs;
-+                if (watchDelegate && watchDelegate !== inputsWatchDelegate) {
-+                    fn.$$watchDelegate = watchDelegate;
-+                    fn.inputs = parsedExpression.inputs;
-+                } else if (!interceptorFn.$stateful) {
-+                    // Treat interceptor like filters - assume non-stateful by default and use the inputsWatchDelegate
-+                    fn.$$watchDelegate = inputsWatchDelegate;
-+                    fn.inputs = parsedExpression.inputs ? parsedExpression.inputs : [parsedExpression];
-                 }
--            };
- 
--            var wrappedProgressback = function(progress) {
--                try {
--                    return (isFunction(progressback) ? progressback : defaultCallback)(progress);
--                } catch (e) {
--                    exceptionHandler(e);
-+                if (fn.inputs) {
-+                    fn.inputs = fn.inputs.map(function(e) {
-+                        // Remove the isPure flag of inputs when it is not absolute because they are now wrapped in a
-+                        // potentially non-pure interceptor function.
-+                        if (e.isPure === PURITY_RELATIVE) {
-+                            return function depurifier(s) { return e(s); };
-+                        }
-+                        return e;
-+                    });
-                 }
--            };
--
--            nextTick(function() {
--                ref(value).then(function(value) {
--                    if (done) return;
--                    done = true;
--                    result.resolve(ref(value).then(wrappedCallback, wrappedErrback, wrappedProgressback));
--                }, function(reason) {
--                    if (done) return;
--                    done = true;
--                    result.resolve(wrappedErrback(reason));
--                }, function(progress) {
--                    if (done) return;
--                    result.notify(wrappedProgressback(progress));
--                });
--            });
--
--            return result.promise;
--        };
--
--
--        function defaultCallback(value) {
--            return value;
--        }
--
--
--        function defaultErrback(reason) {
--            return reject(reason);
--        }
--
--
--        /**
--         * @ngdoc method
--         * @name $q#all
--         * @function
--         *
--         * @description
--         * Combines multiple promises into a single promise that is resolved when all of the input
--         * promises are resolved.
--         *
--         * @param {Array.<Promise>|Object.<Promise>} promises An array or hash of promises.
--         * @returns {Promise} Returns a single promise that will be resolved with an array/hash of values,
--         *   each value corresponding to the promise at the same index/key in the `promises` array/hash.
--         *   If any of the promises is resolved with a rejection, this resulting promise will be rejected
--         *   with the same rejection value.
--         */
--        function all(promises) {
--            var deferred = defer(),
--                counter = 0,
--                results = isArray(promises) ? [] : {};
--
--            forEach(promises, function(promise, key) {
--                counter++;
--                ref(promise).then(function(value) {
--                    if (results.hasOwnProperty(key)) return;
--                    results[key] = value;
--                    if (!(--counter)) deferred.resolve(results);
--                }, function(reason) {
--                    if (results.hasOwnProperty(key)) return;
--                    deferred.reject(reason);
--                });
--            });
--
--            if (counter === 0) {
--                deferred.resolve(results);
--            }
--
--            return deferred.promise;
--        }
--
--        return {
--            defer: defer,
--            reject: reject,
--            when: when,
--            all: all
--        };
--    }
--
--    function $$RAFProvider(){ //rAF
--        this.$get = ['$window', '$timeout', function($window, $timeout) {
--            var requestAnimationFrame = $window.requestAnimationFrame ||
--                $window.webkitRequestAnimationFrame ||
--                $window.mozRequestAnimationFrame;
--
--            var cancelAnimationFrame = $window.cancelAnimationFrame ||
--                $window.webkitCancelAnimationFrame ||
--                $window.mozCancelAnimationFrame ||
--                $window.webkitCancelRequestAnimationFrame;
- 
--            var rafSupported = !!requestAnimationFrame;
--            var raf = rafSupported
--                ? function(fn) {
--                var id = requestAnimationFrame(fn);
--                return function() {
--                    cancelAnimationFrame(id);
--                };
-+                return fn;
-             }
--                : function(fn) {
--                var timer = $timeout(fn, 16.66, false); // 1000 / 60 = 16.666
--                return function() {
--                    $timeout.cancel(timer);
--                };
--            };
--
--            raf.supported = rafSupported;
--
--            return raf;
-         }];
-     }
- 
-     /**
--     * DESIGN NOTES
-+     * @ngdoc service
-+     * @name $q
-+     * @requires $rootScope
-      *
--     * The design decisions behind the scope are heavily favored for speed and memory consumption.
-+     * @description
-+     * A service that helps you run functions asynchronously, and use their return values (or exceptions)
-+     * when they are done processing.
-      *
--     * The typical use of scope is to watch the expressions, which most of the time return the same
--     * value as last time so we optimize the operation.
-+     * This is a [Promises/A+](https://promisesaplus.com/)-compliant implementation of promises/deferred
-+     * objects inspired by [Kris Kowal's Q](https://github.com/kriskowal/q).
-      *
--     * Closures construction is expensive in terms of speed as well as memory:
--     *   - No closures, instead use prototypical inheritance for API
--     *   - Internal state needs to be stored on scope directly, which means that private state is
--     *     exposed as $$____ properties
-+     * $q can be used in two fashions --- one which is more similar to Kris Kowal's Q or jQuery's Deferred
-+     * implementations, and the other which resembles ES6 (ES2015) promises to some degree.
-      *
--     * Loop operations are optimized by using while(count--) { ... }
--     *   - this means that in order to keep the same order of execution as addition we have to add
--     *     items to the array at the beginning (shift) instead of at the end (push)
-+     * ## $q constructor
-      *
--     * Child scopes are created and removed often
--     *   - Using an array would be slow since inserts in middle are expensive so we use linked list
-+     * The streamlined ES6 style promise is essentially just using $q as a constructor which takes a `resolver`
-+     * function as the first argument. This is similar to the native Promise implementation from ES6,
-+     * see [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise).
-      *
--     * There are few watches then a lot of observers. This is why you don't want the observer to be
--     * implemented in the same way as watch. Watch requires return of initialization function which
--     * are expensive to construct.
--     */
--
--
--    /**
--     * @ngdoc provider
--     * @name $rootScopeProvider
--     * @description
-+     * While the constructor-style use is supported, not all of the supporting methods from ES6 promises are
-+     * available yet.
-      *
--     * Provider for the $rootScope service.
--     */
--
--    /**
--     * @ngdoc method
--     * @name $rootScopeProvider#digestTtl
--     * @description
-+     * It can be used like so:
-      *
--     * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and
--     * assuming that the model is unstable.
-+     * ```js
-+     *   // for the purpose of this example let's assume that variables `$q` and `okToGreet`
-+     *   // are available in the current lexical scope (they could have been injected or passed in).
-      *
--     * The current default is 10 iterations.
-+     *   function asyncGreet(name) {
-+     *     // perform some asynchronous operation, resolve or reject the promise when appropriate.
-+     *     return $q(function(resolve, reject) {
-+     *       setTimeout(function() {
-+     *         if (okToGreet(name)) {
-+     *           resolve('Hello, ' + name + '!');
-+     *         } else {
-+     *           reject('Greeting ' + name + ' is not allowed.');
-+     *         }
-+     *       }, 1000);
-+     *     });
-+     *   }
-      *
--     * In complex applications it's possible that the dependencies between `$watch`s will result in
--     * several digest iterations. However if an application needs more than the default 10 digest
--     * iterations for its model to stabilize then you should investigate what is causing the model to
--     * continuously change during the digest.
-+     *   var promise = asyncGreet('Robin Hood');
-+     *   promise.then(function(greeting) {
-+     *     alert('Success: ' + greeting);
-+     *   }, function(reason) {
-+     *     alert('Failed: ' + reason);
-+     *   });
-+     * ```
-      *
--     * Increasing the TTL could have performance implications, so you should not change it without
--     * proper justification.
-+     * Note: progress/notify callbacks are not currently supported via the ES6-style interface.
-      *
--     * @param {number} limit The number of digest iterations.
--     */
--
--
--    /**
--     * @ngdoc service
--     * @name $rootScope
--     * @description
-+     * Note: unlike ES6 behavior, an exception thrown in the constructor function will NOT implicitly reject the promise.
-      *
--     * Every application has a single root {@link ng.$rootScope.Scope scope}.
--     * All other scopes are descendant scopes of the root scope. Scopes provide separation
--     * between the model and the view, via a mechanism for watching the model for changes.
--     * They also provide an event emission/broadcast and subscription facility. See the
--     * {@link guide/scope developer guide on scopes}.
--     */
--    function $RootScopeProvider(){
--        var TTL = 10;
--        var $rootScopeMinErr = minErr('$rootScope');
--        var lastDirtyWatch = null;
--
--        this.digestTtl = function(value) {
--            if (arguments.length) {
--                TTL = value;
--            }
--            return TTL;
--        };
--
--        this.$get = ['$injector', '$exceptionHandler', '$parse', '$browser',
--            function( $injector,   $exceptionHandler,   $parse,   $browser) {
--
--                /**
--                 * @ngdoc type
--                 * @name $rootScope.Scope
--                 *
--                 * @description
--                 * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the
--                 * {@link auto.$injector $injector}. Child scopes are created using the
--                 * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when
--                 * compiled HTML template is executed.)
--                 *
--                 * Here is a simple scope snippet to show how you can interact with the scope.
--                 * ```html
--                 * <file src="./test/ng/rootScopeSpec.js" tag="docs1" />
--                 * ```
--                 *
--                 * # Inheritance
--                 * A scope can inherit from a parent scope, as in this example:
--                 * ```js
--                 var parent = $rootScope;
--                 var child = parent.$new();
--
--                 parent.salutation = "Hello";
--                 child.name = "World";
--                 expect(child.salutation).toEqual('Hello');
--
--                 child.salutation = "Welcome";
--                 expect(child.salutation).toEqual('Welcome');
--                 expect(parent.salutation).toEqual('Hello');
--                 * ```
--                 *
--                 *
--                 * @param {Object.<string, function()>=} providers Map of service factory which need to be
--                 *                                       provided for the current scope. Defaults to {@link ng}.
--                 * @param {Object.<string, *>=} instanceCache Provides pre-instantiated services which should
--                 *                              append/override services provided by `providers`. This is handy
--                 *                              when unit-testing and having the need to override a default
--                 *                              service.
--                 * @returns {Object} Newly created scope.
--                 *
--                 */
--                function Scope() {
--                    this.$id = nextUid();
--                    this.$$phase = this.$parent = this.$$watchers =
--                        this.$$nextSibling = this.$$prevSibling =
--                            this.$$childHead = this.$$childTail = null;
--                    this['this'] = this.$root =  this;
--                    this.$$destroyed = false;
--                    this.$$asyncQueue = [];
--                    this.$$postDigestQueue = [];
--                    this.$$listeners = {};
--                    this.$$listenerCount = {};
--                    this.$$isolateBindings = {};
--                }
-+     * However, the more traditional CommonJS-style usage is still available, and documented below.
-+     *
-+     * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an
-+     * interface for interacting with an object that represents the result of an action that is
-+     * performed asynchronously, and may or may not be finished at any given point in time.
-+     *
-+     * From the perspective of dealing with error handling, deferred and promise APIs are to
-+     * asynchronous programming what `try`, `catch` and `throw` keywords are to synchronous programming.
-+     *
-+     * ```js
-+     *   // for the purpose of this example let's assume that variables `$q` and `okToGreet`
-+     *   // are available in the current lexical scope (they could have been injected or passed in).
-+     *
-+     *   function asyncGreet(name) {
-+     *     var deferred = $q.defer();
-+     *
-+     *     setTimeout(function() {
-+     *       deferred.notify('About to greet ' + name + '.');
-+     *
-+     *       if (okToGreet(name)) {
-+     *         deferred.resolve('Hello, ' + name + '!');
-+     *       } else {
-+     *         deferred.reject('Greeting ' + name + ' is not allowed.');
-+     *       }
-+     *     }, 1000);
-+     *
-+     *     return deferred.promise;
-+     *   }
-+     *
-+     *   var promise = asyncGreet('Robin Hood');
-+     *   promise.then(function(greeting) {
-+     *     alert('Success: ' + greeting);
-+     *   }, function(reason) {
-+     *     alert('Failed: ' + reason);
-+     *   }, function(update) {
-+     *     alert('Got notification: ' + update);
-+     *   });
-+     * ```
-+     *
-+     * At first it might not be obvious why this extra complexity is worth the trouble. The payoff
-+     * comes in the way of guarantees that promise and deferred APIs make, see
-+     * https://github.com/kriskowal/uncommonjs/blob/master/promises/specification.md.
-+     *
-+     * Additionally the promise api allows for composition that is very hard to do with the
-+     * traditional callback ([CPS](http://en.wikipedia.org/wiki/Continuation-passing_style)) approach.
-+     * For more on this please see the [Q documentation](https://github.com/kriskowal/q) especially the
-+     * section on serial or parallel joining of promises.
-+     *
-+     * ## The Deferred API
-+     *
-+     * A new instance of deferred is constructed by calling `$q.defer()`.
-+     *
-+     * The purpose of the deferred object is to expose the associated Promise instance as well as APIs
-+     * that can be used for signaling the successful or unsuccessful completion, as well as the status
-+     * of the task.
-+     *
-+     * **Methods**
-+     *
-+     * - `resolve(value)` – resolves the derived promise with the `value`. If the value is a rejection
-+     *   constructed via `$q.reject`, the promise will be rejected instead.
-+     * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to
-+     *   resolving it with a rejection constructed via `$q.reject`.
-+     * - `notify(value)` - provides updates on the status of the promise's execution. This may be called
-+     *   multiple times before the promise is either resolved or rejected.
-+     *
-+     * **Properties**
-+     *
-+     * - promise – `{Promise}` – promise object associated with this deferred.
-+     *
-+     *
-+     * ## The Promise API
-+     *
-+     * A new promise instance is created when a deferred instance is created and can be retrieved by
-+     * calling `deferred.promise`.
-+     *
-+     * The purpose of the promise object is to allow for interested parties to get access to the result
-+     * of the deferred task when it completes.
-+     *
-+     * **Methods**
-+     *
-+     * - `then(successCallback, [errorCallback], [notifyCallback])` – regardless of when the promise was or
-+     *   will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously
-+     *   as soon as the result is available. The callbacks are called with a single argument: the result
-+     *   or rejection reason. Additionally, the notify callback may be called zero or more times to
-+     *   provide a progress indication, before the promise is resolved or rejected.
-+     *
-+     *   This method *returns a new promise* which is resolved or rejected via the return value of the
-+     *   `successCallback`, `errorCallback` (unless that value is a promise, in which case it is resolved
-+     *   with the value which is resolved in that promise using
-+     *   [promise chaining](http://www.html5rocks.com/en/tutorials/es6/promises/#toc-promises-queues)).
-+     *   It also notifies via the return value of the `notifyCallback` method. The promise cannot be
-+     *   resolved or rejected from the notifyCallback method. The errorCallback and notifyCallback
-+     *   arguments are optional.
-+     *
-+     * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
-+     *
-+     * - `finally(callback, notifyCallback)` – allows you to observe either the fulfillment or rejection of a promise,
-+     *   but to do so without modifying the final value. This is useful to release resources or do some
-+     *   clean-up that needs to be done whether the promise was rejected or resolved. See the [full
-+     *   specification](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) for
-+     *   more information.
-+     *
-+     * ## Chaining promises
-+     *
-+     * Because calling the `then` method of a promise returns a new derived promise, it is easily
-+     * possible to create a chain of promises:
-+     *
-+     * ```js
-+     *   promiseB = promiseA.then(function(result) {
-+     *     return result + 1;
-+     *   });
-+     *
-+     *   // promiseB will be resolved immediately after promiseA is resolved and its value
-+     *   // will be the result of promiseA incremented by 1
-+     * ```
-+     *
-+     * It is possible to create chains of any length and since a promise can be resolved with another
-+     * promise (which will defer its resolution further), it is possible to pause/defer resolution of
-+     * the promises at any point in the chain. This makes it possible to implement powerful APIs like
-+     * $http's response interceptors.
-+     *
-+     *
-+     * ## Differences between Kris Kowal's Q and $q
-+     *
-+     *  There are two main differences:
-+     *
-+     * - $q is integrated with the {@link ng.$rootScope.Scope} Scope model observation
-+     *   mechanism in AngularJS, which means faster propagation of resolution or rejection into your
-+     *   models and avoiding unnecessary browser repaints, which would result in flickering UI.
-+     * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains
-+     *   all the important functionality needed for common async tasks.
-+     *
-+     * ## Testing
-+     *
-+     *  ```js
-+     *    it('should simulate promise', inject(function($q, $rootScope) {
-+     *      var deferred = $q.defer();
-+     *      var promise = deferred.promise;
-+     *      var resolvedValue;
-+     *
-+     *      promise.then(function(value) { resolvedValue = value; });
-+     *      expect(resolvedValue).toBeUndefined();
-+     *
-+     *      // Simulate resolving of promise
-+     *      deferred.resolve(123);
-+     *      // Note that the 'then' function does not get called synchronously.
-+     *      // This is because we want the promise API to always be async, whether or not
-+     *      // it got called synchronously or asynchronously.
-+     *      expect(resolvedValue).toBeUndefined();
-+     *
-+     *      // Propagate promise resolution to 'then' functions using $apply().
-+     *      $rootScope.$apply();
-+     *      expect(resolvedValue).toEqual(123);
-+     *    }));
-+     *  ```
-+     *
-+     * @param {function(function, function)} resolver Function which is responsible for resolving or
-+     *   rejecting the newly created promise. The first parameter is a function which resolves the
-+     *   promise, the second parameter is a function which rejects the promise.
-+     *
-+     * @returns {Promise} The newly created promise.
-+     */
-+    /**
-+     * @ngdoc provider
-+     * @name $qProvider
-+     * @this
-+     *
-+     * @description
-+     */
-+    function $QProvider() {
-+        var errorOnUnhandledRejections = true;
-+        this.$get = ['$rootScope', '$exceptionHandler', function($rootScope, $exceptionHandler) {
-+            return qFactory(function(callback) {
-+                $rootScope.$evalAsync(callback);
-+            }, $exceptionHandler, errorOnUnhandledRejections);
-+        }];
- 
--                /**
--                 * @ngdoc property
--                 * @name $rootScope.Scope#$id
--                 * @returns {number} Unique scope ID (monotonically increasing alphanumeric sequence) useful for
--                 *   debugging.
--                 */
-+        /**
-+         * @ngdoc method
-+         * @name $qProvider#errorOnUnhandledRejections
-+         * @kind function
-+         *
-+         * @description
-+         * Retrieves or overrides whether to generate an error when a rejected promise is not handled.
-+         * This feature is enabled by default.
-+         *
-+         * @param {boolean=} value Whether to generate an error when a rejected promise is not handled.
-+         * @returns {boolean|ng.$qProvider} Current value when called without a new value or self for
-+         *    chaining otherwise.
-+         */
-+        this.errorOnUnhandledRejections = function(value) {
-+            if (isDefined(value)) {
-+                errorOnUnhandledRejections = value;
-+                return this;
-+            } else {
-+                return errorOnUnhandledRejections;
-+            }
-+        };
-+    }
- 
-+    /** @this */
-+    function $$QProvider() {
-+        var errorOnUnhandledRejections = true;
-+        this.$get = ['$browser', '$exceptionHandler', function($browser, $exceptionHandler) {
-+            return qFactory(function(callback) {
-+                $browser.defer(callback);
-+            }, $exceptionHandler, errorOnUnhandledRejections);
-+        }];
- 
--                Scope.prototype = {
--                    constructor: Scope,
--                    /**
--                     * @ngdoc method
--                     * @name $rootScope.Scope#$new
--                     * @function
--                     *
--                     * @description
--                     * Creates a new child {@link ng.$rootScope.Scope scope}.
--                     *
--                     * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} and
--                     * {@link ng.$rootScope.Scope#$digest $digest()} events. The scope can be removed from the
--                     * scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}.
--                     *
--                     * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is
--                     * desired for the scope and its child scopes to be permanently detached from the parent and
--                     * thus stop participating in model change detection and listener notification by invoking.
--                     *
--                     * @param {boolean} isolate If true, then the scope does not prototypically inherit from the
--                     *         parent scope. The scope is isolated, as it can not see parent scope properties.
--                     *         When creating widgets, it is useful for the widget to not accidentally read parent
--                     *         state.
--                     *
--                     * @returns {Object} The newly created child scope.
--                     *
--                     */
--                    $new: function(isolate) {
--                        var ChildScope,
--                            child;
-+        this.errorOnUnhandledRejections = function(value) {
-+            if (isDefined(value)) {
-+                errorOnUnhandledRejections = value;
-+                return this;
-+            } else {
-+                return errorOnUnhandledRejections;
-+            }
-+        };
-+    }
- 
--                        if (isolate) {
--                            child = new Scope();
--                            child.$root = this.$root;
--                            // ensure that there is just one async queue per $rootScope and its children
--                            child.$$asyncQueue = this.$$asyncQueue;
--                            child.$$postDigestQueue = this.$$postDigestQueue;
--                        } else {
--                            ChildScope = function() {}; // should be anonymous; This is so that when the minifier munges
--                            // the name it does not become random set of chars. This will then show up as class
--                            // name in the web inspector.
--                            ChildScope.prototype = this;
--                            child = new ChildScope();
--                            child.$id = nextUid();
--                        }
--                        child['this'] = child;
--                        child.$$listeners = {};
--                        child.$$listenerCount = {};
--                        child.$parent = this;
--                        child.$$watchers = child.$$nextSibling = child.$$childHead = child.$$childTail = null;
--                        child.$$prevSibling = this.$$childTail;
--                        if (this.$$childHead) {
--                            this.$$childTail.$$nextSibling = child;
--                            this.$$childTail = child;
--                        } else {
--                            this.$$childHead = this.$$childTail = child;
--                        }
--                        return child;
--                    },
-+    /**
-+     * Constructs a promise manager.
-+     *
-+     * @param {function(function)} nextTick Function for executing functions in the next turn.
-+     * @param {function(...*)} exceptionHandler Function into which unexpected exceptions are passed for
-+     *     debugging purposes.
-+     * @param {boolean=} errorOnUnhandledRejections Whether an error should be generated on unhandled
-+     *     promises rejections.
-+     * @returns {object} Promise manager.
-+     */
-+    function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {
-+        var $qMinErr = minErr('$q', TypeError);
-+        var queueSize = 0;
-+        var checkQueue = [];
- 
--                    /**
--                     * @ngdoc method
--                     * @name $rootScope.Scope#$watch
--                     * @function
--                     *
--                     * @description
--                     * Registers a `listener` callback to be executed whenever the `watchExpression` changes.
--                     *
--                     * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#$digest
--       *   $digest()} and should return the value that will be watched. (Since
--                     *   {@link ng.$rootScope.Scope#$digest $digest()} reruns when it detects changes the
--                     *   `watchExpression` can execute multiple times per
--                     *   {@link ng.$rootScope.Scope#$digest $digest()} and should be idempotent.)
--                     * - The `listener` is called only when the value from the current `watchExpression` and the
--                     *   previous call to `watchExpression` are not equal (with the exception of the initial run,
--                     *   see below). The inequality is determined according to
--                     *   {@link angular.equals} function. To save the value of the object for later comparison,
--                     *   the {@link angular.copy} function is used. It also means that watching complex options
--                     *   will have adverse memory and performance implications.
--                     * - The watch `listener` may change the model, which may trigger other `listener`s to fire.
--                     *   This is achieved by rerunning the watchers until no changes are detected. The rerun
--                     *   iteration limit is 10 to prevent an infinite loop deadlock.
--                     *
--                     *
--                     * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called,
--                     * you can register a `watchExpression` function with no `listener`. (Since `watchExpression`
--                     * can execute multiple times per {@link ng.$rootScope.Scope#$digest $digest} cycle when a
--                     * change is detected, be prepared for multiple calls to your listener.)
--                     *
--                     * After a watcher is registered with the scope, the `listener` fn is called asynchronously
--                     * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the
--                     * watcher. In rare cases, this is undesirable because the listener is called when the result
--                     * of `watchExpression` didn't change. To detect this scenario within the `listener` fn, you
--                     * can compare the `newVal` and `oldVal`. If these two values are identical (`===`) then the
--                     * listener was called due to initialization.
--                     *
--                     * The example below contains an illustration of using a function as your $watch listener
--                     *
--                     *
--                     * # Example
--                     * ```js
--                     // let's assume that scope was dependency injected as the $rootScope
--                     var scope = $rootScope;
--                     scope.name = 'misko';
--                     scope.counter = 0;
-+        /**
-+         * @ngdoc method
-+         * @name ng.$q#defer
-+         * @kind function
-+         *
-+         * @description
-+         * Creates a `Deferred` object which represents a task which will finish in the future.
-+         *
-+         * @returns {Deferred} Returns a new instance of deferred.
-+         */
-+        function defer() {
-+            return new Deferred();
-+        }
- 
--                     expect(scope.counter).toEqual(0);
--                     scope.$watch('name', function(newValue, oldValue) {
--             scope.counter = scope.counter + 1;
--           });
--                     expect(scope.counter).toEqual(0);
-+        function Deferred() {
-+            var promise = this.promise = new Promise();
-+            //Non prototype methods necessary to support unbound execution :/
-+            this.resolve = function(val) { resolvePromise(promise, val); };
-+            this.reject = function(reason) { rejectPromise(promise, reason); };
-+            this.notify = function(progress) { notifyPromise(promise, progress); };
-+        }
- 
--                     scope.$digest();
--                     // no variable change
--                     expect(scope.counter).toEqual(0);
- 
--                     scope.name = 'adam';
--                     scope.$digest();
--                     expect(scope.counter).toEqual(1);
-+        function Promise() {
-+            this.$$state = { status: 0 };
-+        }
- 
-+        extend(Promise.prototype, {
-+            then: function(onFulfilled, onRejected, progressBack) {
-+                if (isUndefined(onFulfilled) && isUndefined(onRejected) && isUndefined(progressBack)) {
-+                    return this;
-+                }
-+                var result = new Promise();
- 
-+                this.$$state.pending = this.$$state.pending || [];
-+                this.$$state.pending.push([result, onFulfilled, onRejected, progressBack]);
-+                if (this.$$state.status > 0) scheduleProcessQueue(this.$$state);
- 
--                     // Using a listener function
--                     var food;
--                     scope.foodCounter = 0;
--                     expect(scope.foodCounter).toEqual(0);
--                     scope.$watch(
--                     // This is the listener function
--                     function() { return food; },
--                     // This is the change handler
--                     function(newValue, oldValue) {
--               if ( newValue !== oldValue ) {
--                 // Only increment the counter if the value changed
--                 scope.foodCounter = scope.foodCounter + 1;
--               }
--             }
--                     );
--                     // No digest has been run so the counter will be zero
--                     expect(scope.foodCounter).toEqual(0);
--
--                     // Run the digest but since food has not changed count will still be zero
--                     scope.$digest();
--                     expect(scope.foodCounter).toEqual(0);
-+                return result;
-+            },
- 
--                     // Update food and run digest.  Now the counter will increment
--                     food = 'cheeseburger';
--                     scope.$digest();
--                     expect(scope.foodCounter).toEqual(1);
-+            'catch': function(callback) {
-+                return this.then(null, callback);
-+            },
- 
--                     * ```
--                     *
--                     *
--                     *
--                     * @param {(function()|string)} watchExpression Expression that is evaluated on each
--                     *    {@link ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers
--                     *    a call to the `listener`.
--                     *
--                     *    - `string`: Evaluated as {@link guide/expression expression}
--                     *    - `function(scope)`: called with current `scope` as a parameter.
--                     * @param {(function()|string)=} listener Callback called whenever the return value of
--                     *   the `watchExpression` changes.
--                     *
--                     *    - `string`: Evaluated as {@link guide/expression expression}
--                     *    - `function(newValue, oldValue, scope)`: called with current and previous values as
--                     *      parameters.
--                     *
--                     * @param {boolean=} objectEquality Compare for object equality using {@link angular.equals} instead of
--                     *     comparing for reference equality.
--                     * @returns {function()} Returns a deregistration function for this listener.
--                     */
--                    $watch: function(watchExp, listener, objectEquality) {
--                        var scope = this,
--                            get = compileToFn(watchExp, 'watch'),
--                            array = scope.$$watchers,
--                            watcher = {
--                                fn: listener,
--                                last: initWatchVal,
--                                get: get,
--                                exp: watchExp,
--                                eq: !!objectEquality
--                            };
-+            'finally': function(callback, progressBack) {
-+                return this.then(function(value) {
-+                    return handleCallback(value, resolve, callback);
-+                }, function(error) {
-+                    return handleCallback(error, reject, callback);
-+                }, progressBack);
-+            }
-+        });
- 
--                        lastDirtyWatch = null;
-+        function processQueue(state) {
-+            var fn, promise, pending;
- 
--                        // in the case user pass string, we need to compile it, do we really need this ?
--                        if (!isFunction(listener)) {
--                            var listenFn = compileToFn(listener || noop, 'listener');
--                            watcher.fn = function(newVal, oldVal, scope) {listenFn(scope);};
-+            pending = state.pending;
-+            state.processScheduled = false;
-+            state.pending = undefined;
-+            try {
-+                for (var i = 0, ii = pending.length; i < ii; ++i) {
-+                    markQStateExceptionHandled(state);
-+                    promise = pending[i][0];
-+                    fn = pending[i][state.status];
-+                    try {
-+                        if (isFunction(fn)) {
-+                            resolvePromise(promise, fn(state.value));
-+                        } else if (state.status === 1) {
-+                            resolvePromise(promise, state.value);
-+                        } else {
-+                            rejectPromise(promise, state.value);
-                         }
--
--                        if (typeof watchExp == 'string' && get.constant) {
--                            var originalFn = watcher.fn;
--                            watcher.fn = function(newVal, oldVal, scope) {
--                                originalFn.call(this, newVal, oldVal, scope);
--                                arrayRemove(array, watcher);
--                            };
-+                    } catch (e) {
-+                        rejectPromise(promise, e);
-+                        // This error is explicitly marked for being passed to the $exceptionHandler
-+                        if (e && e.$$passToExceptionHandler === true) {
-+                            exceptionHandler(e);
-                         }
-+                    }
-+                }
-+            } finally {
-+                --queueSize;
-+                if (errorOnUnhandledRejections && queueSize === 0) {
-+                    nextTick(processChecks);
-+                }
-+            }
-+        }
- 
--                        if (!array) {
--                            array = scope.$$watchers = [];
--                        }
--                        // we use unshift since we use a while loop in $digest for speed.
--                        // the while loop reads in reverse order.
--                        array.unshift(watcher);
-+        function processChecks() {
-+            // eslint-disable-next-line no-unmodified-loop-condition
-+            while (!queueSize && checkQueue.length) {
-+                var toCheck = checkQueue.shift();
-+                if (!isStateExceptionHandled(toCheck)) {
-+                    markQStateExceptionHandled(toCheck);
-+                    var errorMessage = 'Possibly unhandled rejection: ' + toDebugString(toCheck.value);
-+                    if (isError(toCheck.value)) {
-+                        exceptionHandler(toCheck.value, errorMessage);
-+                    } else {
-+                        exceptionHandler(errorMessage);
-+                    }
-+                }
-+            }
-+        }
- 
--                        return function() {
--                            arrayRemove(array, watcher);
--                            lastDirtyWatch = null;
--                        };
--                    },
-+        function scheduleProcessQueue(state) {
-+            if (errorOnUnhandledRejections && !state.pending && state.status === 2 && !isStateExceptionHandled(state)) {
-+                if (queueSize === 0 && checkQueue.length === 0) {
-+                    nextTick(processChecks);
-+                }
-+                checkQueue.push(state);
-+            }
-+            if (state.processScheduled || !state.pending) return;
-+            state.processScheduled = true;
-+            ++queueSize;
-+            nextTick(function() { processQueue(state); });
-+        }
- 
-+        function resolvePromise(promise, val) {
-+            if (promise.$$state.status) return;
-+            if (val === promise) {
-+                $$reject(promise, $qMinErr(
-+                    'qcycle',
-+                    'Expected promise to be resolved with value other than itself \'{0}\'',
-+                    val));
-+            } else {
-+                $$resolve(promise, val);
-+            }
- 
--                    /**
--                     * @ngdoc method
--                     * @name $rootScope.Scope#$watchCollection
--                     * @function
--                     *
--                     * @description
--                     * Shallow watches the properties of an object and fires whenever any of the properties change
--                     * (for arrays, this implies watching the array items; for object maps, this implies watching
--                     * the properties). If a change is detected, the `listener` callback is fired.
--                     *
--                     * - The `obj` collection is observed via standard $watch operation and is examined on every
--                     *   call to $digest() to see if any items have been added, removed, or moved.
--                     * - The `listener` is called whenever anything within the `obj` has changed. Examples include
--                     *   adding, removing, and moving items belonging to an object or array.
--                     *
--                     *
--                     * # Example
--                     * ```js
--                     $scope.names = ['igor', 'matias', 'misko', 'james'];
--                     $scope.dataCount = 4;
-+        }
- 
--                     $scope.$watchCollection('names', function(newNames, oldNames) {
--            $scope.dataCount = newNames.length;
--          });
-+        function $$resolve(promise, val) {
-+            var then;
-+            var done = false;
-+            try {
-+                if (isObject(val) || isFunction(val)) then = val.then;
-+                if (isFunction(then)) {
-+                    promise.$$state.status = -1;
-+                    then.call(val, doResolve, doReject, doNotify);
-+                } else {
-+                    promise.$$state.value = val;
-+                    promise.$$state.status = 1;
-+                    scheduleProcessQueue(promise.$$state);
-+                }
-+            } catch (e) {
-+                doReject(e);
-+            }
- 
--                     expect($scope.dataCount).toEqual(4);
--                     $scope.$digest();
-+            function doResolve(val) {
-+                if (done) return;
-+                done = true;
-+                $$resolve(promise, val);
-+            }
-+            function doReject(val) {
-+                if (done) return;
-+                done = true;
-+                $$reject(promise, val);
-+            }
-+            function doNotify(progress) {
-+                notifyPromise(promise, progress);
-+            }
-+        }
- 
--                     //still at 4 ... no changes
--                     expect($scope.dataCount).toEqual(4);
-+        function rejectPromise(promise, reason) {
-+            if (promise.$$state.status) return;
-+            $$reject(promise, reason);
-+        }
- 
--                     $scope.names.pop();
--                     $scope.$digest();
-+        function $$reject(promise, reason) {
-+            promise.$$state.value = reason;
-+            promise.$$state.status = 2;
-+            scheduleProcessQueue(promise.$$state);
-+        }
- 
--                     //now there's been a change
--                     expect($scope.dataCount).toEqual(3);
--                     * ```
--                     *
--                     *
--                     * @param {string|function(scope)} obj Evaluated as {@link guide/expression expression}. The
--                     *    expression value should evaluate to an object or an array which is observed on each
--                     *    {@link ng.$rootScope.Scope#$digest $digest} cycle. Any shallow change within the
--                     *    collection will trigger a call to the `listener`.
--                     *
--                     * @param {function(newCollection, oldCollection, scope)} listener a callback function called
--                     *    when a change is detected.
--                     *    - The `newCollection` object is the newly modified data obtained from the `obj` expression
--                     *    - The `oldCollection` object is a copy of the former collection data.
--                     *      Due to performance considerations, the`oldCollection` value is computed only if the
--                     *      `listener` function declares two or more arguments.
--                     *    - The `scope` argument refers to the current scope.
--                     *
--                     * @returns {function()} Returns a de-registration function for this listener. When the
--                     *    de-registration function is executed, the internal watch operation is terminated.
--                     */
--                    $watchCollection: function(obj, listener) {
--                        var self = this;
--                        // the current value, updated on each dirty-check run
--                        var newValue;
--                        // a shallow copy of the newValue from the last dirty-check run,
--                        // updated to match newValue during dirty-check run
--                        var oldValue;
--                        // a shallow copy of the newValue from when the last change happened
--                        var veryOldValue;
--                        // only track veryOldValue if the listener is asking for it
--                        var trackVeryOldValue = (listener.length > 1);
--                        var changeDetected = 0;
--                        var objGetter = $parse(obj);
--                        var internalArray = [];
--                        var internalObject = {};
--                        var initRun = true;
--                        var oldLength = 0;
-+        function notifyPromise(promise, progress) {
-+            var callbacks = promise.$$state.pending;
- 
--                        function $watchCollectionWatch() {
--                            newValue = objGetter(self);
--                            var newLength, key;
-+            if ((promise.$$state.status <= 0) && callbacks && callbacks.length) {
-+                nextTick(function() {
-+                    var callback, result;
-+                    for (var i = 0, ii = callbacks.length; i < ii; i++) {
-+                        result = callbacks[i][0];
-+                        callback = callbacks[i][3];
-+                        try {
-+                            notifyPromise(result, isFunction(callback) ? callback(progress) : progress);
-+                        } catch (e) {
-+                            exceptionHandler(e);
-+                        }
-+                    }
-+                });
-+            }
-+        }
- 
--                            if (!isObject(newValue)) { // if primitive
--                                if (oldValue !== newValue) {
--                                    oldValue = newValue;
--                                    changeDetected++;
--                                }
--                            } else if (isArrayLike(newValue)) {
--                                if (oldValue !== internalArray) {
--                                    // we are transitioning from something which was not an array into array.
--                                    oldValue = internalArray;
--                                    oldLength = oldValue.length = 0;
--                                    changeDetected++;
--                                }
-+        /**
-+         * @ngdoc method
-+         * @name $q#reject
-+         * @kind function
-+         *
-+         * @description
-+         * Creates a promise that is resolved as rejected with the specified `reason`. This api should be
-+         * used to forward rejection in a chain of promises. If you are dealing with the last promise in
-+         * a promise chain, you don't need to worry about it.
-+         *
-+         * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of
-+         * `reject` as the `throw` keyword in JavaScript. This also means that if you "catch" an error via
-+         * a promise error callback and you want to forward the error to the promise derived from the
-+         * current promise, you have to "rethrow" the error by returning a rejection constructed via
-+         * `reject`.
-+         *
-+         * ```js
-+         *   promiseB = promiseA.then(function(result) {
-+         *     // success: do something and resolve promiseB
-+         *     //          with the old or a new result
-+         *     return result;
-+         *   }, function(reason) {
-+         *     // error: handle the error if possible and
-+         *     //        resolve promiseB with newPromiseOrValue,
-+         *     //        otherwise forward the rejection to promiseB
-+         *     if (canHandle(reason)) {
-+         *      // handle the error and recover
-+         *      return newPromiseOrValue;
-+         *     }
-+         *     return $q.reject(reason);
-+         *   });
-+         * ```
-+         *
-+         * @param {*} reason Constant, message, exception or an object representing the rejection reason.
-+         * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`.
-+         */
-+        function reject(reason) {
-+            var result = new Promise();
-+            rejectPromise(result, reason);
-+            return result;
-+        }
- 
--                                newLength = newValue.length;
-+        function handleCallback(value, resolver, callback) {
-+            var callbackOutput = null;
-+            try {
-+                if (isFunction(callback)) callbackOutput = callback();
-+            } catch (e) {
-+                return reject(e);
-+            }
-+            if (isPromiseLike(callbackOutput)) {
-+                return callbackOutput.then(function() {
-+                    return resolver(value);
-+                }, reject);
-+            } else {
-+                return resolver(value);
-+            }
-+        }
- 
--                                if (oldLength !== newLength) {
--                                    // if lengths do not match we need to trigger change notification
--                                    changeDetected++;
--                                    oldValue.length = oldLength = newLength;
--                                }
--                                // copy the items to oldValue and look for changes.
--                                for (var i = 0; i < newLength; i++) {
--                                    var bothNaN = (oldValue[i] !== oldValue[i]) &&
--                                        (newValue[i] !== newValue[i]);
--                                    if (!bothNaN && (oldValue[i] !== newValue[i])) {
--                                        changeDetected++;
--                                        oldValue[i] = newValue[i];
--                                    }
--                                }
--                            } else {
--                                if (oldValue !== internalObject) {
--                                    // we are transitioning from something which was not an object into object.
--                                    oldValue = internalObject = {};
--                                    oldLength = 0;
--                                    changeDetected++;
--                                }
--                                // copy the items to oldValue and look for changes.
--                                newLength = 0;
--                                for (key in newValue) {
--                                    if (newValue.hasOwnProperty(key)) {
--                                        newLength++;
--                                        if (oldValue.hasOwnProperty(key)) {
--                                            if (oldValue[key] !== newValue[key]) {
--                                                changeDetected++;
--                                                oldValue[key] = newValue[key];
--                                            }
--                                        } else {
--                                            oldLength++;
--                                            oldValue[key] = newValue[key];
--                                            changeDetected++;
--                                        }
--                                    }
--                                }
--                                if (oldLength > newLength) {
--                                    // we used to have more keys, need to find them and destroy them.
--                                    changeDetected++;
--                                    for(key in oldValue) {
--                                        if (oldValue.hasOwnProperty(key) && !newValue.hasOwnProperty(key)) {
--                                            oldLength--;
--                                            delete oldValue[key];
--                                        }
--                                    }
--                                }
--                            }
--                            return changeDetected;
--                        }
-+        /**
-+         * @ngdoc method
-+         * @name $q#when
-+         * @kind function
-+         *
-+         * @description
-+         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise.
-+         * This is useful when you are dealing with an object that might or might not be a promise, or if
-+         * the promise comes from a source that can't be trusted.
-+         *
-+         * @param {*} value Value or a promise
-+         * @param {Function=} successCallback
-+         * @param {Function=} errorCallback
-+         * @param {Function=} progressCallback
-+         * @returns {Promise} Returns a promise of the passed value or promise
-+         */
- 
--                        function $watchCollectionAction() {
--                            if (initRun) {
--                                initRun = false;
--                                listener(newValue, newValue, self);
--                            } else {
--                                listener(newValue, veryOldValue, self);
--                            }
--
--                            // make a copy for the next time a collection is changed
--                            if (trackVeryOldValue) {
--                                if (!isObject(newValue)) {
--                                    //primitive
--                                    veryOldValue = newValue;
--                                } else if (isArrayLike(newValue)) {
--                                    veryOldValue = new Array(newValue.length);
--                                    for (var i = 0; i < newValue.length; i++) {
--                                        veryOldValue[i] = newValue[i];
--                                    }
--                                } else { // if object
--                                    veryOldValue = {};
--                                    for (var key in newValue) {
--                                        if (hasOwnProperty.call(newValue, key)) {
--                                            veryOldValue[key] = newValue[key];
--                                        }
--                                    }
--                                }
--                            }
--                        }
- 
--                        return this.$watch($watchCollectionWatch, $watchCollectionAction);
--                    },
--
--                    /**
--                     * @ngdoc method
--                     * @name $rootScope.Scope#$digest
--                     * @function
--                     *
--                     * @description
--                     * Processes all of the {@link ng.$rootScope.Scope#$watch watchers} of the current scope and
--                     * its children. Because a {@link ng.$rootScope.Scope#$watch watcher}'s listener can change
--                     * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#$watch watchers}
--                     * until no more listeners are firing. This means that it is possible to get into an infinite
--                     * loop. This function will throw `'Maximum iteration limit exceeded.'` if the number of
--                     * iterations exceeds 10.
--                     *
--                     * Usually, you don't call `$digest()` directly in
--                     * {@link ng.directive:ngController controllers} or in
--                     * {@link ng.$compileProvider#directive directives}.
--                     * Instead, you should call {@link ng.$rootScope.Scope#$apply $apply()} (typically from within
--                     * a {@link ng.$compileProvider#directive directives}), which will force a `$digest()`.
--                     *
--                     * If you want to be notified whenever `$digest()` is called,
--                     * you can register a `watchExpression` function with
--                     * {@link ng.$rootScope.Scope#$watch $watch()} with no `listener`.
--                     *
--                     * In unit tests, you may need to call `$digest()` to simulate the scope life cycle.
--                     *
--                     * # Example
--                     * ```js
--                     var scope = ...;
--                     scope.name = 'misko';
--                     scope.counter = 0;
-+        function when(value, callback, errback, progressBack) {
-+            var result = new Promise();
-+            resolvePromise(result, value);
-+            return result.then(callback, errback, progressBack);
-+        }
- 
--                     expect(scope.counter).toEqual(0);
--                     scope.$watch('name', function(newValue, oldValue) {
--             scope.counter = scope.counter + 1;
--           });
--                     expect(scope.counter).toEqual(0);
-+        /**
-+         * @ngdoc method
-+         * @name $q#resolve
-+         * @kind function
-+         *
-+         * @description
-+         * Alias of {@link ng.$q#when when} to maintain naming consistency with ES6.
-+         *
-+         * @param {*} value Value or a promise
-+         * @param {Function=} successCallback
-+         * @param {Function=} errorCallback
-+         * @param {Function=} progressCallback
-+         * @returns {Promise} Returns a promise of the passed value or promise
-+         */
-+        var resolve = when;
- 
--                     scope.$digest();
--                     // no variable change
--                     expect(scope.counter).toEqual(0);
-+        /**
-+         * @ngdoc method
-+         * @name $q#all
-+         * @kind function
-+         *
-+         * @description
-+         * Combines multiple promises into a single promise that is resolved when all of the input
-+         * promises are resolved.
-+         *
-+         * @param {Array.<Promise>|Object.<Promise>} promises An array or hash of promises.
-+         * @returns {Promise} Returns a single promise that will be resolved with an array/hash of values,
-+         *   each value corresponding to the promise at the same index/key in the `promises` array/hash.
-+         *   If any of the promises is resolved with a rejection, this resulting promise will be rejected
-+         *   with the same rejection value.
-+         */
- 
--                     scope.name = 'adam';
--                     scope.$digest();
--                     expect(scope.counter).toEqual(1);
--                     * ```
--                     *
--                     */
--                    $digest: function() {
--                        var watch, value, last,
--                            watchers,
--                            asyncQueue = this.$$asyncQueue,
--                            postDigestQueue = this.$$postDigestQueue,
--                            length,
--                            dirty, ttl = TTL,
--                            next, current, target = this,
--                            watchLog = [],
--                            logIdx, logMsg, asyncTask;
-+        function all(promises) {
-+            var result = new Promise(),
-+                counter = 0,
-+                results = isArray(promises) ? [] : {};
- 
--                        beginPhase('$digest');
-+            forEach(promises, function(promise, key) {
-+                counter++;
-+                when(promise).then(function(value) {
-+                    results[key] = value;
-+                    if (!(--counter)) resolvePromise(result, results);
-+                }, function(reason) {
-+                    rejectPromise(result, reason);
-+                });
-+            });
- 
--                        lastDirtyWatch = null;
-+            if (counter === 0) {
-+                resolvePromise(result, results);
-+            }
- 
--                        do { // "while dirty" loop
--                            dirty = false;
--                            current = target;
-+            return result;
-+        }
- 
--                            while(asyncQueue.length) {
--                                try {
--                                    asyncTask = asyncQueue.shift();
--                                    asyncTask.scope.$eval(asyncTask.expression);
--                                } catch (e) {
--                                    clearPhase();
--                                    $exceptionHandler(e);
--                                }
--                                lastDirtyWatch = null;
--                            }
-+        /**
-+         * @ngdoc method
-+         * @name $q#race
-+         * @kind function
-+         *
-+         * @description
-+         * Returns a promise that resolves or rejects as soon as one of those promises
-+         * resolves or rejects, with the value or reason from that promise.
-+         *
-+         * @param {Array.<Promise>|Object.<Promise>} promises An array or hash of promises.
-+         * @returns {Promise} a promise that resolves or rejects as soon as one of the `promises`
-+         * resolves or rejects, with the value or reason from that promise.
-+         */
- 
--                            traverseScopesLoop:
--                                do { // "traverse the scopes" loop
--                                    if ((watchers = current.$$watchers)) {
--                                        // process our watches
--                                        length = watchers.length;
--                                        while (length--) {
--                                            try {
--                                                watch = watchers[length];
--                                                // Most common watches are on primitives, in which case we can short
--                                                // circuit it with === operator, only when === fails do we use .equals
--                                                if (watch) {
--                                                    if ((value = watch.get(current)) !== (last = watch.last) &&
--                                                        !(watch.eq
--                                                            ? equals(value, last)
--                                                            : (typeof value == 'number' && typeof last == 'number'
--                                                        && isNaN(value) && isNaN(last)))) {
--                                                        dirty = true;
--                                                        lastDirtyWatch = watch;
--                                                        watch.last = watch.eq ? copy(value) : value;
--                                                        watch.fn(value, ((last === initWatchVal) ? value : last), current);
--                                                        if (ttl < 5) {
--                                                            logIdx = 4 - ttl;
--                                                            if (!watchLog[logIdx]) watchLog[logIdx] = [];
--                                                            logMsg = (isFunction(watch.exp))
--                                                                ? 'fn: ' + (watch.exp.name || watch.exp.toString())
--                                                                : watch.exp;
--                                                            logMsg += '; newVal: ' + toJson(value) + '; oldVal: ' + toJson(last);
--                                                            watchLog[logIdx].push(logMsg);
--                                                        }
--                                                    } else if (watch === lastDirtyWatch) {
--                                                        // If the most recently dirty watcher is now clean, short circuit since the remaining watchers
--                                                        // have already been tested.
--                                                        dirty = false;
--                                                        break traverseScopesLoop;
--                                                    }
--                                                }
--                                            } catch (e) {
--                                                clearPhase();
--                                                $exceptionHandler(e);
--                                            }
--                                        }
--                                    }
-+        function race(promises) {
-+            var deferred = defer();
- 
--                                    // Insanity Warning: scope depth-first traversal
--                                    // yes, this code is a bit crazy, but it works and we have tests to prove it!
--                                    // this piece should be kept in sync with the traversal in $broadcast
--                                    if (!(next = (current.$$childHead ||
--                                        (current !== target && current.$$nextSibling)))) {
--                                        while(current !== target && !(next = current.$$nextSibling)) {
--                                            current = current.$parent;
--                                        }
--                                    }
--                                } while ((current = next));
-+            forEach(promises, function(promise) {
-+                when(promise).then(deferred.resolve, deferred.reject);
-+            });
- 
--                            // `break traverseScopesLoop;` takes us to here
-+            return deferred.promise;
-+        }
- 
--                            if((dirty || asyncQueue.length) && !(ttl--)) {
--                                clearPhase();
--                                throw $rootScopeMinErr('infdig',
--                                    '{0} $digest() iterations reached. Aborting!\n' +
--                                    'Watchers fired in the last 5 iterations: {1}',
--                                    TTL, toJson(watchLog));
--                            }
-+        function $Q(resolver) {
-+            if (!isFunction(resolver)) {
-+                throw $qMinErr('norslvr', 'Expected resolverFn, got \'{0}\'', resolver);
-+            }
- 
--                        } while (dirty || asyncQueue.length);
-+            var promise = new Promise();
- 
--                        clearPhase();
-+            function resolveFn(value) {
-+                resolvePromise(promise, value);
-+            }
- 
--                        while(postDigestQueue.length) {
--                            try {
--                                postDigestQueue.shift()();
--                            } catch (e) {
--                                $exceptionHandler(e);
--                            }
--                        }
--                    },
-+            function rejectFn(reason) {
-+                rejectPromise(promise, reason);
-+            }
- 
-+            resolver(resolveFn, rejectFn);
- 
--                    /**
--                     * @ngdoc event
--                     * @name $rootScope.Scope#$destroy
--                     * @eventType broadcast on scope being destroyed
--                     *
--                     * @description
--                     * Broadcasted when a scope and its children are being destroyed.
--                     *
--                     * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
--                     * clean up DOM bindings before an element is removed from the DOM.
--                     */
-+            return promise;
-+        }
- 
--                    /**
--                     * @ngdoc method
--                     * @name $rootScope.Scope#$destroy
--                     * @function
--                     *
--                     * @description
--                     * Removes the current scope (and all of its children) from the parent scope. Removal implies
--                     * that calls to {@link ng.$rootScope.Scope#$digest $digest()} will no longer
--                     * propagate to the current scope and its children. Removal also implies that the current
--                     * scope is eligible for garbage collection.
--                     *
--                     * The `$destroy()` is usually used by directives such as
--                     * {@link ng.directive:ngRepeat ngRepeat} for managing the
--                     * unrolling of the loop.
--                     *
--                     * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope.
--                     * Application code can register a `$destroy` event handler that will give it a chance to
--                     * perform any necessary cleanup.
--                     *
--                     * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
--                     * clean up DOM bindings before an element is removed from the DOM.
--                     */
--                    $destroy: function() {
--                        // we can't destroy the root scope or a scope that has been already destroyed
--                        if (this.$$destroyed) return;
--                        var parent = this.$parent;
-+        // Let's make the instanceof operator work for promises, so that
-+        // `new $q(fn) instanceof $q` would evaluate to true.
-+        $Q.prototype = Promise.prototype;
- 
--                        this.$broadcast('$destroy');
--                        this.$$destroyed = true;
--                        if (this === $rootScope) return;
-+        $Q.defer = defer;
-+        $Q.reject = reject;
-+        $Q.when = when;
-+        $Q.resolve = resolve;
-+        $Q.all = all;
-+        $Q.race = race;
- 
--                        forEach(this.$$listenerCount, bind(null, decrementListenerCount, this));
-+        return $Q;
-+    }
- 
--                        // sever all the references to parent scopes (after this cleanup, the current scope should
--                        // not be retained by any of our references and should be eligible for garbage collection)
--                        if (parent.$$childHead == this) parent.$$childHead = this.$$nextSibling;
--                        if (parent.$$childTail == this) parent.$$childTail = this.$$prevSibling;
--                        if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling;
--                        if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling;
-+    function isStateExceptionHandled(state) {
-+        return !!state.pur;
-+    }
-+    function markQStateExceptionHandled(state) {
-+        state.pur = true;
-+    }
-+    function markQExceptionHandled(q) {
-+        markQStateExceptionHandled(q.$$state);
-+    }
- 
-+    /** @this */
-+    function $$RAFProvider() { //rAF
-+        this.$get = ['$window', '$timeout', function($window, $timeout) {
-+            var requestAnimationFrame = $window.requestAnimationFrame ||
-+                $window.webkitRequestAnimationFrame;
- 
--                        // All of the code below is bogus code that works around V8's memory leak via optimized code
--                        // and inline caches.
--                        //
--                        // see:
--                        // - https://code.google.com/p/v8/issues/detail?id=2073#c26
--                        // - https://github.com/angular/angular.js/issues/6794#issuecomment-38648909
--                        // - https://github.com/angular/angular.js/issues/1313#issuecomment-10378451
-+            var cancelAnimationFrame = $window.cancelAnimationFrame ||
-+                $window.webkitCancelAnimationFrame ||
-+                $window.webkitCancelRequestAnimationFrame;
- 
--                        this.$parent = this.$$nextSibling = this.$$prevSibling = this.$$childHead =
--                            this.$$childTail = this.$root = null;
-+            var rafSupported = !!requestAnimationFrame;
-+            var raf = rafSupported
-+                ? function(fn) {
-+                    var id = requestAnimationFrame(fn);
-+                    return function() {
-+                        cancelAnimationFrame(id);
-+                    };
-+                }
-+                : function(fn) {
-+                    var timer = $timeout(fn, 16.66, false); // 1000 / 60 = 16.666
-+                    return function() {
-+                        $timeout.cancel(timer);
-+                    };
-+                };
- 
--                        // don't reset these to null in case some async task tries to register a listener/watch/task
--                        this.$$listeners = {};
--                        this.$$watchers = this.$$asyncQueue = this.$$postDigestQueue = [];
-+            raf.supported = rafSupported;
- 
--                        // prevent NPEs since these methods have references to properties we nulled out
--                        this.$destroy = this.$digest = this.$apply = noop;
--                        this.$on = this.$watch = function() { return noop; };
--                    },
-+            return raf;
-+        }];
-+    }
- 
--                    /**
--                     * @ngdoc method
--                     * @name $rootScope.Scope#$eval
--                     * @function
--                     *
--                     * @description
--                     * Executes the `expression` on the current scope and returns the result. Any exceptions in
--                     * the expression are propagated (uncaught). This is useful when evaluating Angular
--                     * expressions.
--                     *
--                     * # Example
--                     * ```js
--                     var scope = ng.$rootScope.Scope();
--                     scope.a = 1;
--                     scope.b = 2;
-+    /**
-+     * DESIGN NOTES
-+     *
-+     * The design decisions behind the scope are heavily favored for speed and memory consumption.
-+     *
-+     * The typical use of scope is to watch the expressions, which most of the time return the same
-+     * value as last time so we optimize the operation.
-+     *
-+     * Closures construction is expensive in terms of speed as well as memory:
-+     *   - No closures, instead use prototypical inheritance for API
-+     *   - Internal state needs to be stored on scope directly, which means that private state is
-+     *     exposed as $$____ properties
-+     *
-+     * Loop operations are optimized by using while(count--) { ... }
-+     *   - This means that in order to keep the same order of execution as addition we have to add
-+     *     items to the array at the beginning (unshift) instead of at the end (push)
-+     *
-+     * Child scopes are created and removed often
-+     *   - Using an array would be slow since inserts in the middle are expensive; so we use linked lists
-+     *
-+     * There are fewer watches than observers. This is why you don't want the observer to be implemented
-+     * in the same way as watch. Watch requires return of the initialization function which is expensive
-+     * to construct.
-+     */
- 
--                     expect(scope.$eval('a+b')).toEqual(3);
--                     expect(scope.$eval(function(scope){ return scope.a + scope.b; })).toEqual(3);
--                     * ```
--                     *
--                     * @param {(string|function())=} expression An angular expression to be executed.
--                     *
--                     *    - `string`: execute using the rules as defined in  {@link guide/expression expression}.
--                     *    - `function(scope)`: execute the function with the current `scope` parameter.
--                     *
--                     * @param {(object)=} locals Local variables object, useful for overriding values in scope.
--                     * @returns {*} The result of evaluating the expression.
--                     */
--                    $eval: function(expr, locals) {
--                        return $parse(expr)(this, locals);
--                    },
- 
-+    /**
-+     * @ngdoc provider
-+     * @name $rootScopeProvider
-+     * @description
-+     *
-+     * Provider for the $rootScope service.
-+     */
-+
-+    /**
-+     * @ngdoc method
-+     * @name $rootScopeProvider#digestTtl
-+     * @description
-+     *
-+     * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and
-+     * assuming that the model is unstable.
-+     *
-+     * The current default is 10 iterations.
-+     *
-+     * In complex applications it's possible that the dependencies between `$watch`s will result in
-+     * several digest iterations. However if an application needs more than the default 10 digest
-+     * iterations for its model to stabilize then you should investigate what is causing the model to
-+     * continuously change during the digest.
-+     *
-+     * Increasing the TTL could have performance implications, so you should not change it without
-+     * proper justification.
-+     *
-+     * @param {number} limit The number of digest iterations.
-+     */
-+
-+
-+    /**
-+     * @ngdoc service
-+     * @name $rootScope
-+     * @this
-+     *
-+     * @description
-+     *
-+     * Every application has a single root {@link ng.$rootScope.Scope scope}.
-+     * All other scopes are descendant scopes of the root scope. Scopes provide separation
-+     * between the model and the view, via a mechanism for watching the model for changes.
-+     * They also provide event emission/broadcast and subscription facility. See the
-+     * {@link guide/scope developer guide on scopes}.
-+     */
-+    function $RootScopeProvider() {
-+        var TTL = 10;
-+        var $rootScopeMinErr = minErr('$rootScope');
-+        var lastDirtyWatch = null;
-+        var applyAsyncId = null;
-+
-+        this.digestTtl = function(value) {
-+            if (arguments.length) {
-+                TTL = value;
-+            }
-+            return TTL;
-+        };
-+
-+        function createChildScopeClass(parent) {
-+            function ChildScope() {
-+                this.$$watchers = this.$$nextSibling =
-+                    this.$$childHead = this.$$childTail = null;
-+                this.$$listeners = {};
-+                this.$$listenerCount = {};
-+                this.$$watchersCount = 0;
-+                this.$id = nextUid();
-+                this.$$ChildScope = null;
-+            }
-+            ChildScope.prototype = parent;
-+            return ChildScope;
-+        }
-+
-+        this.$get = ['$exceptionHandler', '$parse', '$browser',
-+            function($exceptionHandler, $parse, $browser) {
-+
-+                function destroyChildScope($event) {
-+                    $event.currentScope.$$destroyed = true;
-+                }
-+
-+                function cleanUpScope($scope) {
-+
-+                    // Support: IE 9 only
-+                    if (msie === 9) {
-+                        // There is a memory leak in IE9 if all child scopes are not disconnected
-+                        // completely when a scope is destroyed. So this code will recurse up through
-+                        // all this scopes children
-+                        //
-+                        // See issue https://github.com/angular/angular.js/issues/10706
-+                        if ($scope.$$childHead) {
-+                            cleanUpScope($scope.$$childHead);
-+                        }
-+                        if ($scope.$$nextSibling) {
-+                            cleanUpScope($scope.$$nextSibling);
-+                        }
-+                    }
-+
-+                    // The code below works around IE9 and V8's memory leaks
-+                    //
-+                    // See:
-+                    // - https://code.google.com/p/v8/issues/detail?id=2073#c26
-+                    // - https://github.com/angular/angular.js/issues/6794#issuecomment-38648909
-+                    // - https://github.com/angular/angular.js/issues/1313#issuecomment-10378451
-+
-+                    $scope.$parent = $scope.$$nextSibling = $scope.$$prevSibling = $scope.$$childHead =
-+                        $scope.$$childTail = $scope.$root = $scope.$$watchers = null;
-+                }
-+
-+                /**
-+                 * @ngdoc type
-+                 * @name $rootScope.Scope
-+                 *
-+                 * @description
-+                 * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the
-+                 * {@link auto.$injector $injector}. Child scopes are created using the
-+                 * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when
-+                 * compiled HTML template is executed.) See also the {@link guide/scope Scopes guide} for
-+                 * an in-depth introduction and usage examples.
-+                 *
-+                 *
-+                 * ## Inheritance
-+                 * A scope can inherit from a parent scope, as in this example:
-+                 * ```js
-+                 var parent = $rootScope;
-+                 var child = parent.$new();
-+
-+                 parent.salutation = "Hello";
-+                 expect(child.salutation).toEqual('Hello');
-+
-+                 child.salutation = "Welcome";
-+                 expect(child.salutation).toEqual('Welcome');
-+                 expect(parent.salutation).toEqual('Hello');
-+                 * ```
-+                 *
-+                 * When interacting with `Scope` in tests, additional helper methods are available on the
-+                 * instances of `Scope` type. See {@link ngMock.$rootScope.Scope ngMock Scope} for additional
-+                 * details.
-+                 *
-+                 *
-+                 * @param {Object.<string, function()>=} providers Map of service factory which need to be
-+                 *                                       provided for the current scope. Defaults to {@link ng}.
-+                 * @param {Object.<string, *>=} instanceCache Provides pre-instantiated services which should
-+                 *                              append/override services provided by `providers`. This is handy
-+                 *                              when unit-testing and having the need to override a default
-+                 *                              service.
-+                 * @returns {Object} Newly created scope.
-+                 *
-+                 */
-+                function Scope() {
-+                    this.$id = nextUid();
-+                    this.$$phase = this.$parent = this.$$watchers =
-+                        this.$$nextSibling = this.$$prevSibling =
-+                            this.$$childHead = this.$$childTail = null;
-+                    this.$root = this;
-+                    this.$$destroyed = false;
-+                    this.$$listeners = {};
-+                    this.$$listenerCount = {};
-+                    this.$$watchersCount = 0;
-+                    this.$$isolateBindings = null;
-+                }
-+
-+                /**
-+                 * @ngdoc property
-+                 * @name $rootScope.Scope#$id
-+                 *
-+                 * @description
-+                 * Unique scope ID (monotonically increasing) useful for debugging.
-+                 */
-+
-+                /**
-+                 * @ngdoc property
-+                 * @name $rootScope.Scope#$parent
-+                 *
-+                 * @description
-+                 * Reference to the parent scope.
-+                 */
-+
-+                /**
-+                 * @ngdoc property
-+                 * @name $rootScope.Scope#$root
-+                 *
-+                 * @description
-+                 * Reference to the root scope.
-+                 */
-+
-+                Scope.prototype = {
-+                    constructor: Scope,
-                     /**
-                      * @ngdoc method
--                     * @name $rootScope.Scope#$evalAsync
--                     * @function
-+                     * @name $rootScope.Scope#$new
-+                     * @kind function
-                      *
-                      * @description
--                     * Executes the expression on the current scope at a later point in time.
--                     *
--                     * The `$evalAsync` makes no guarantees as to when the `expression` will be executed, only
--                     * that:
-+                     * Creates a new child {@link ng.$rootScope.Scope scope}.
-                      *
--                     *   - it will execute after the function that scheduled the evaluation (preferably before DOM
--                     *     rendering).
--                     *   - at least one {@link ng.$rootScope.Scope#$digest $digest cycle} will be performed after
--                     *     `expression` execution.
-+                     * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} event.
-+                     * The scope can be removed from the scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}.
-                      *
--                     * Any exceptions from the execution of the expression are forwarded to the
--                     * {@link ng.$exceptionHandler $exceptionHandler} service.
-+                     * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is
-+                     * desired for the scope and its child scopes to be permanently detached from the parent and
-+                     * thus stop participating in model change detection and listener notification by invoking.
-                      *
--                     * __Note:__ if this function is called outside of a `$digest` cycle, a new `$digest` cycle
--                     * will be scheduled. However, it is encouraged to always call code that changes the model
--                     * from within an `$apply` call. That includes code evaluated via `$evalAsync`.
-+                     * @param {boolean} isolate If true, then the scope does not prototypically inherit from the
-+                     *         parent scope. The scope is isolated, as it can not see parent scope properties.
-+                     *         When creating widgets, it is useful for the widget to not accidentally read parent
-+                     *         state.
-                      *
--                     * @param {(string|function())=} expression An angular expression to be executed.
-+                     * @param {Scope} [parent=this] The {@link ng.$rootScope.Scope `Scope`} that will be the `$parent`
-+                     *                              of the newly created scope. Defaults to `this` scope if not provided.
-+                     *                              This is used when creating a transclude scope to correctly place it
-+                     *                              in the scope hierarchy while maintaining the correct prototypical
-+                     *                              inheritance.
-                      *
--                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
--                     *    - `function(scope)`: execute the function with the current `scope` parameter.
-+                     * @returns {Object} The newly created child scope.
-                      *
-                      */
--                    $evalAsync: function(expr) {
--                        // if we are outside of an $digest loop and this is the first time we are scheduling async
--                        // task also schedule async auto-flush
--                        if (!$rootScope.$$phase && !$rootScope.$$asyncQueue.length) {
--                            $browser.defer(function() {
--                                if ($rootScope.$$asyncQueue.length) {
--                                    $rootScope.$digest();
--                                }
--                            });
-+                    $new: function(isolate, parent) {
-+                        var child;
-+
-+                        parent = parent || this;
-+
-+                        if (isolate) {
-+                            child = new Scope();
-+                            child.$root = this.$root;
-+                        } else {
-+                            // Only create a child scope class if somebody asks for one,
-+                            // but cache it to allow the VM to optimize lookups.
-+                            if (!this.$$ChildScope) {
-+                                this.$$ChildScope = createChildScopeClass(this);
-+                            }
-+                            child = new this.$$ChildScope();
-+                        }
-+                        child.$parent = parent;
-+                        child.$$prevSibling = parent.$$childTail;
-+                        if (parent.$$childHead) {
-+                            parent.$$childTail.$$nextSibling = child;
-+                            parent.$$childTail = child;
-+                        } else {
-+                            parent.$$childHead = parent.$$childTail = child;
-                         }
- 
--                        this.$$asyncQueue.push({scope: this, expression: expr});
--                    },
-+                        // When the new scope is not isolated or we inherit from `this`, and
-+                        // the parent scope is destroyed, the property `$$destroyed` is inherited
-+                        // prototypically. In all other cases, this property needs to be set
-+                        // when the parent scope is destroyed.
-+                        // The listener needs to be added after the parent is set
-+                        if (isolate || parent !== this) child.$on('$destroy', destroyChildScope);
- 
--                    $$postDigest : function(fn) {
--                        this.$$postDigestQueue.push(fn);
-+                        return child;
-                     },
- 
-                     /**
-                      * @ngdoc method
--                     * @name $rootScope.Scope#$apply
--                     * @function
-+                     * @name $rootScope.Scope#$watch
-+                     * @kind function
-                      *
-                      * @description
--                     * `$apply()` is used to execute an expression in angular from outside of the angular
--                     * framework. (For example from browser DOM events, setTimeout, XHR or third party libraries).
--                     * Because we are calling into the angular framework we need to perform proper scope life
--                     * cycle of {@link ng.$exceptionHandler exception handling},
--                     * {@link ng.$rootScope.Scope#$digest executing watches}.
--                     *
--                     * ## Life cycle
-+                     * Registers a `listener` callback to be executed whenever the `watchExpression` changes.
-                      *
--                     * # Pseudo-Code of `$apply()`
--                     * ```js
--                     function $apply(expr) {
--             try {
--               return $eval(expr);
--             } catch (e) {
--               $exceptionHandler(e);
--             } finally {
--               $root.$digest();
--             }
--           }
--                     * ```
-+                     * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#$digest
-+       *   $digest()} and should return the value that will be watched. (`watchExpression` should not change
-+                     *   its value when executed multiple times with the same input because it may be executed multiple
-+                     *   times by {@link ng.$rootScope.Scope#$digest $digest()}. That is, `watchExpression` should be
-+                     *   [idempotent](http://en.wikipedia.org/wiki/Idempotence).)
-+                     * - The `listener` is called only when the value from the current `watchExpression` and the
-+                     *   previous call to `watchExpression` are not equal (with the exception of the initial run,
-+                     *   see below). Inequality is determined according to reference inequality,
-+                     *   [strict comparison](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Comparison_Operators)
-+                     *    via the `!==` Javascript operator, unless `objectEquality == true`
-+                     *   (see next point)
-+                     * - When `objectEquality == true`, inequality of the `watchExpression` is determined
-+                     *   according to the {@link angular.equals} function. To save the value of the object for
-+                     *   later comparison, the {@link angular.copy} function is used. This therefore means that
-+                     *   watching complex objects will have adverse memory and performance implications.
-+                     * - This should not be used to watch for changes in objects that are
-+                     *   or contain [File](https://developer.mozilla.org/docs/Web/API/File) objects due to limitations with {@link angular.copy `angular.copy`}.
-+                     * - The watch `listener` may change the model, which may trigger other `listener`s to fire.
-+                     *   This is achieved by rerunning the watchers until no changes are detected. The rerun
-+                     *   iteration limit is 10 to prevent an infinite loop deadlock.
-                      *
-                      *
--                     * Scope's `$apply()` method transitions through the following stages:
-+                     * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called,
-+                     * you can register a `watchExpression` function with no `listener`. (Be prepared for
-+                     * multiple calls to your `watchExpression` because it will execute multiple times in a
-+                     * single {@link ng.$rootScope.Scope#$digest $digest} cycle if a change is detected.)
-                      *
--                     * 1. The {@link guide/expression expression} is executed using the
--                     *    {@link ng.$rootScope.Scope#$eval $eval()} method.
--                     * 2. Any exceptions from the execution of the expression are forwarded to the
--                     *    {@link ng.$exceptionHandler $exceptionHandler} service.
--                     * 3. The {@link ng.$rootScope.Scope#$watch watch} listeners are fired immediately after the
--                     *    expression was executed using the {@link ng.$rootScope.Scope#$digest $digest()} method.
-+                     * After a watcher is registered with the scope, the `listener` fn is called asynchronously
-+                     * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the
-+                     * watcher. In rare cases, this is undesirable because the listener is called when the result
-+                     * of `watchExpression` didn't change. To detect this scenario within the `listener` fn, you
-+                     * can compare the `newVal` and `oldVal`. If these two values are identical (`===`) then the
-+                     * listener was called due to initialization.
-                      *
-                      *
--                     * @param {(string|function())=} exp An angular expression to be executed.
-                      *
--                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
--                     *    - `function(scope)`: execute the function with current `scope` parameter.
--                     *
--                     * @returns {*} The result of evaluating the expression.
--                     */
--                    $apply: function(expr) {
--                        try {
--                            beginPhase('$apply');
--                            return this.$eval(expr);
--                        } catch (e) {
--                            $exceptionHandler(e);
--                        } finally {
--                            clearPhase();
--                            try {
--                                $rootScope.$digest();
--                            } catch (e) {
--                                $exceptionHandler(e);
--                                throw e;
--                            }
--                        }
--                    },
-+                     * @example
-+                     * ```js
-+                     // let's assume that scope was dependency injected as the $rootScope
-+                     var scope = $rootScope;
-+                     scope.name = 'misko';
-+                     scope.counter = 0;
- 
--                    /**
--                     * @ngdoc method
--                     * @name $rootScope.Scope#$on
--                     * @function
-+                     expect(scope.counter).toEqual(0);
-+                     scope.$watch('name', function(newValue, oldValue) {
-+             scope.counter = scope.counter + 1;
-+           });
-+                     expect(scope.counter).toEqual(0);
-+
-+                     scope.$digest();
-+                     // the listener is always called during the first $digest loop after it was registered
-+                     expect(scope.counter).toEqual(1);
-+
-+                     scope.$digest();
-+                     // but now it will not be called unless the value changes
-+                     expect(scope.counter).toEqual(1);
-+
-+                     scope.name = 'adam';
-+                     scope.$digest();
-+                     expect(scope.counter).toEqual(2);
-+
-+
-+
-+                     // Using a function as a watchExpression
-+                     var food;
-+                     scope.foodCounter = 0;
-+                     expect(scope.foodCounter).toEqual(0);
-+                     scope.$watch(
-+                     // This function returns the value being watched. It is called for each turn of the $digest loop
-+                     function() { return food; },
-+                     // This is the change listener, called when the value returned from the above function changes
-+                     function(newValue, oldValue) {
-+               if ( newValue !== oldValue ) {
-+                 // Only increment the counter if the value changed
-+                 scope.foodCounter = scope.foodCounter + 1;
-+               }
-+             }
-+                     );
-+                     // No digest has been run so the counter will be zero
-+                     expect(scope.foodCounter).toEqual(0);
-+
-+                     // Run the digest but since food has not changed count will still be zero
-+                     scope.$digest();
-+                     expect(scope.foodCounter).toEqual(0);
-+
-+                     // Update food and run digest.  Now the counter will increment
-+                     food = 'cheeseburger';
-+                     scope.$digest();
-+                     expect(scope.foodCounter).toEqual(1);
-+
-+                     * ```
-                      *
--                     * @description
--                     * Listens on events of a given type. See {@link ng.$rootScope.Scope#$emit $emit} for
--                     * discussion of event life cycle.
-                      *
--                     * The event listener function format is: `function(event, args...)`. The `event` object
--                     * passed into the listener has the following attributes:
-                      *
--                     *   - `targetScope` - `{Scope}`: the scope on which the event was `$emit`-ed or
--                     *     `$broadcast`-ed.
--                     *   - `currentScope` - `{Scope}`: the current scope which is handling the event.
--                     *   - `name` - `{string}`: name of the event.
--                     *   - `stopPropagation` - `{function=}`: calling `stopPropagation` function will cancel
--                     *     further event propagation (available only for events that were `$emit`-ed).
--                     *   - `preventDefault` - `{function}`: calling `preventDefault` sets `defaultPrevented` flag
--                     *     to true.
--                     *   - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called.
-+                     * @param {(function()|string)} watchExpression Expression that is evaluated on each
-+                     *    {@link ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers
-+                     *    a call to the `listener`.
-                      *
--                     * @param {string} name Event name to listen on.
--                     * @param {function(event, ...args)} listener Function to call when the event is emitted.
-+                     *    - `string`: Evaluated as {@link guide/expression expression}
-+                     *    - `function(scope)`: called with current `scope` as a parameter.
-+                     * @param {function(newVal, oldVal, scope)} listener Callback called whenever the value
-+                     *    of `watchExpression` changes.
-+                     *
-+                     *    - `newVal` contains the current value of the `watchExpression`
-+                     *    - `oldVal` contains the previous value of the `watchExpression`
-+                     *    - `scope` refers to the current scope
-+                     * @param {boolean=} [objectEquality=false] Compare for object equality using {@link angular.equals} instead of
-+                     *     comparing for reference equality.
-                      * @returns {function()} Returns a deregistration function for this listener.
-                      */
--                    $on: function(name, listener) {
--                        var namedListeners = this.$$listeners[name];
--                        if (!namedListeners) {
--                            this.$$listeners[name] = namedListeners = [];
-+                    $watch: function(watchExp, listener, objectEquality, prettyPrintExpression) {
-+                        var get = $parse(watchExp);
-+                        var fn = isFunction(listener) ? listener : noop;
-+
-+                        if (get.$$watchDelegate) {
-+                            return get.$$watchDelegate(this, fn, objectEquality, get, watchExp);
-                         }
--                        namedListeners.push(listener);
-+                        var scope = this,
-+                            array = scope.$$watchers,
-+                            watcher = {
-+                                fn: fn,
-+                                last: initWatchVal,
-+                                get: get,
-+                                exp: prettyPrintExpression || watchExp,
-+                                eq: !!objectEquality
-+                            };
- 
--                        var current = this;
--                        do {
--                            if (!current.$$listenerCount[name]) {
--                                current.$$listenerCount[name] = 0;
--                            }
--                            current.$$listenerCount[name]++;
--                        } while ((current = current.$parent));
-+                        lastDirtyWatch = null;
- 
--                        var self = this;
--                        return function() {
--                            namedListeners[indexOf(namedListeners, listener)] = null;
--                            decrementListenerCount(self, 1, name);
-+                        if (!array) {
-+                            array = scope.$$watchers = [];
-+                            array.$$digestWatchIndex = -1;
-+                        }
-+                        // we use unshift since we use a while loop in $digest for speed.
-+                        // the while loop reads in reverse order.
-+                        array.unshift(watcher);
-+                        array.$$digestWatchIndex++;
-+                        incrementWatchersCount(this, 1);
-+
-+                        return function deregisterWatch() {
-+                            var index = arrayRemove(array, watcher);
-+                            if (index >= 0) {
-+                                incrementWatchersCount(scope, -1);
-+                                if (index < array.$$digestWatchIndex) {
-+                                    array.$$digestWatchIndex--;
-+                                }
-+                            }
-+                            lastDirtyWatch = null;
-                         };
-                     },
- 
--
-                     /**
-                      * @ngdoc method
--                     * @name $rootScope.Scope#$emit
--                     * @function
-+                     * @name $rootScope.Scope#$watchGroup
-+                     * @kind function
-                      *
-                      * @description
--                     * Dispatches an event `name` upwards through the scope hierarchy notifying the
--                     * registered {@link ng.$rootScope.Scope#$on} listeners.
-+                     * A variant of {@link ng.$rootScope.Scope#$watch $watch()} where it watches an array of `watchExpressions`.
-+                     * If any one expression in the collection changes the `listener` is executed.
-                      *
--                     * The event life cycle starts at the scope on which `$emit` was called. All
--                     * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
--                     * notified. Afterwards, the event traverses upwards toward the root scope and calls all
--                     * registered listeners along the way. The event will stop propagating if one of the listeners
--                     * cancels it.
-+                     * - The items in the `watchExpressions` array are observed via the standard `$watch` operation. Their return
-+                     *   values are examined for changes on every call to `$digest`.
-+                     * - The `listener` is called whenever any expression in the `watchExpressions` array changes.
-                      *
--                     * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
--                     * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
-+                     * `$watchGroup` is more performant than watching each expression individually, and should be
-+                     * used when the listener does not need to know which expression has changed.
-+                     * If the listener needs to know which expression has changed,
-+                     * {@link ng.$rootScope.Scope#$watch $watch()} or
-+                     * {@link ng.$rootScope.Scope#$watchCollection $watchCollection()} should be used.
-                      *
--                     * @param {string} name Event name to emit.
--                     * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
--                     * @return {Object} Event object (see {@link ng.$rootScope.Scope#$on}).
-+                     * @param {Array.<string|Function(scope)>} watchExpressions Array of expressions that will be individually
-+                     * watched using {@link ng.$rootScope.Scope#$watch $watch()}
-+                     *
-+                     * @param {function(newValues, oldValues, scope)} listener Callback called whenever the return value of any
-+                     *    expression in `watchExpressions` changes
-+                     *    The `newValues` array contains the current values of the `watchExpressions`, with the indexes matching
-+                     *    those of `watchExpression`
-+                     *    and the `oldValues` array contains the previous values of the `watchExpressions`, with the indexes matching
-+                     *    those of `watchExpression`.
-+                     *
-+                     *    Note that `newValues` and `oldValues` reflect the differences in each **individual**
-+                     *    expression, and not the difference of the values between each call of the listener.
-+                     *    That means the difference between `newValues` and `oldValues` cannot be used to determine
-+                     *    which expression has changed / remained stable:
-+                     *
-+                     *    ```js
-+                     *
-+                     *    $scope.$watchGroup(['v1', 'v2'], function(newValues, oldValues) {
-+                     *      console.log(newValues, oldValues);
-+                     *    });
-+                     *
-+                     *    // newValues, oldValues initially
-+                     *    // [undefined, undefined], [undefined, undefined]
-+                     *
-+                     *    $scope.v1 = 'a';
-+                     *    $scope.v2 = 'a';
-+                     *
-+                     *    // ['a', 'a'], [undefined, undefined]
-+                     *
-+                     *    $scope.v2 = 'b'
-+                     *
-+                     *    // v1 hasn't changed since it became `'a'`, therefore its oldValue is still `undefined`
-+                     *    // ['a', 'b'], [undefined, 'a']
-+                     *
-+                     *    ```
-+                     *
-+                     *    The `scope` refers to the current scope.
-+                     * @returns {function()} Returns a de-registration function for all listeners.
-                      */
--                    $emit: function(name, args) {
--                        var empty = [],
--                            namedListeners,
--                            scope = this,
--                            stopPropagation = false,
--                            event = {
--                                name: name,
--                                targetScope: scope,
--                                stopPropagation: function() {stopPropagation = true;},
--                                preventDefault: function() {
--                                    event.defaultPrevented = true;
--                                },
--                                defaultPrevented: false
--                            },
--                            listenerArgs = concat([event], arguments, 1),
--                            i, length;
-+                    $watchGroup: function(watchExpressions, listener) {
-+                        var oldValues = new Array(watchExpressions.length);
-+                        var newValues = new Array(watchExpressions.length);
-+                        var deregisterFns = [];
-+                        var self = this;
-+                        var changeReactionScheduled = false;
-+                        var firstRun = true;
-+
-+                        if (!watchExpressions.length) {
-+                            // No expressions means we call the listener ASAP
-+                            var shouldCall = true;
-+                            self.$evalAsync(function() {
-+                                if (shouldCall) listener(newValues, newValues, self);
-+                            });
-+                            return function deregisterWatchGroup() {
-+                                shouldCall = false;
-+                            };
-+                        }
- 
--                        do {
--                            namedListeners = scope.$$listeners[name] || empty;
--                            event.currentScope = scope;
--                            for (i=0, length=namedListeners.length; i<length; i++) {
-+                        if (watchExpressions.length === 1) {
-+                            // Special case size of one
-+                            return this.$watch(watchExpressions[0], function watchGroupAction(value, oldValue, scope) {
-+                                newValues[0] = value;
-+                                oldValues[0] = oldValue;
-+                                listener(newValues, (value === oldValue) ? newValues : oldValues, scope);
-+                            });
-+                        }
- 
--                                // if listeners were deregistered, defragment the array
--                                if (!namedListeners[i]) {
--                                    namedListeners.splice(i, 1);
--                                    i--;
--                                    length--;
--                                    continue;
--                                }
--                                try {
--                                    //allow all listeners attached to the current scope to run
--                                    namedListeners[i].apply(null, listenerArgs);
--                                } catch (e) {
--                                    $exceptionHandler(e);
-+                        forEach(watchExpressions, function(expr, i) {
-+                            var unwatchFn = self.$watch(expr, function watchGroupSubAction(value, oldValue) {
-+                                newValues[i] = value;
-+                                oldValues[i] = oldValue;
-+                                if (!changeReactionScheduled) {
-+                                    changeReactionScheduled = true;
-+                                    self.$evalAsync(watchGroupAction);
-                                 }
-+                            });
-+                            deregisterFns.push(unwatchFn);
-+                        });
-+
-+                        function watchGroupAction() {
-+                            changeReactionScheduled = false;
-+
-+                            if (firstRun) {
-+                                firstRun = false;
-+                                listener(newValues, newValues, self);
-+                            } else {
-+                                listener(newValues, oldValues, self);
-                             }
--                            //if any listener on the current scope stops propagation, prevent bubbling
--                            if (stopPropagation) return event;
--                            //traverse upwards
--                            scope = scope.$parent;
--                        } while (scope);
-+                        }
- 
--                        return event;
-+                        return function deregisterWatchGroup() {
-+                            while (deregisterFns.length) {
-+                                deregisterFns.shift()();
-+                            }
-+                        };
-                     },
- 
- 
-                     /**
-                      * @ngdoc method
--                     * @name $rootScope.Scope#$broadcast
--                     * @function
-+                     * @name $rootScope.Scope#$watchCollection
-+                     * @kind function
-                      *
-                      * @description
--                     * Dispatches an event `name` downwards to all child scopes (and their children) notifying the
--                     * registered {@link ng.$rootScope.Scope#$on} listeners.
-+                     * Shallow watches the properties of an object and fires whenever any of the properties change
-+                     * (for arrays, this implies watching the array items; for object maps, this implies watching
-+                     * the properties). If a change is detected, the `listener` callback is fired.
-                      *
--                     * The event life cycle starts at the scope on which `$broadcast` was called. All
--                     * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
--                     * notified. Afterwards, the event propagates to all direct and indirect scopes of the current
--                     * scope and calls all registered listeners along the way. The event cannot be canceled.
-+                     * - The `obj` collection is observed via standard $watch operation and is examined on every
-+                     *   call to $digest() to see if any items have been added, removed, or moved.
-+                     * - The `listener` is called whenever anything within the `obj` has changed. Examples include
-+                     *   adding, removing, and moving items belonging to an object or array.
-                      *
--                     * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
--                     * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
-                      *
--                     * @param {string} name Event name to broadcast.
--                     * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
--                     * @return {Object} Event object, see {@link ng.$rootScope.Scope#$on}
--                     */
--                    $broadcast: function(name, args) {
--                        console.debug(name);
--                        var target = this,
--                            current = target,
--                            next = target,
--                            event = {
--                                name: name,
--                                targetScope: target,
--                                preventDefault: function() {
--                                    event.defaultPrevented = true;
--                                },
--                                defaultPrevented: false
--                            },
--                            listenerArgs = concat([event], arguments, 1),
--                            listeners, i, length;
-+                     * @example
-+                     * ```js
-+                     $scope.names = ['igor', 'matias', 'misko', 'james'];
-+                     $scope.dataCount = 4;
- 
--                        //down while you can, then up and next sibling or up and next sibling until back at root
--                        while ((current = next)) {
--                            event.currentScope = current;
--                            listeners = current.$$listeners[name] || [];
--                            for (i=0, length = listeners.length; i<length; i++) {
--                                // if listeners were deregistered, defragment the array
--                                if (!listeners[i]) {
--                                    listeners.splice(i, 1);
--                                    i--;
--                                    length--;
--                                    continue;
--                                }
-+                     $scope.$watchCollection('names', function(newNames, oldNames) {
-+            $scope.dataCount = newNames.length;
-+          });
- 
--                                try {
--                                    listeners[i].apply(null, listenerArgs);
--                                } catch(e) {
--                                    $exceptionHandler(e);
--                                }
--                            }
-+                     expect($scope.dataCount).toEqual(4);
-+                     $scope.$digest();
- 
--                            // Insanity Warning: scope depth-first traversal
--                            // yes, this code is a bit crazy, but it works and we have tests to prove it!
--                            // this piece should be kept in sync with the traversal in $digest
--                            // (though it differs due to having the extra check for $$listenerCount)
--                            if (!(next = ((current.$$listenerCount[name] && current.$$childHead) ||
--                                (current !== target && current.$$nextSibling)))) {
--                                while(current !== target && !(next = current.$$nextSibling)) {
--                                    current = current.$parent;
--                                }
--                            }
--                        }
-+                     //still at 4 ... no changes
-+                     expect($scope.dataCount).toEqual(4);
- 
--                        return event;
--                    }
--                };
-+                     $scope.names.pop();
-+                     $scope.$digest();
- 
--                var $rootScope = new Scope();
-+                     //now there's been a change
-+                     expect($scope.dataCount).toEqual(3);
-+                     * ```
-+                     *
-+                     *
-+                     * @param {string|function(scope)} obj Evaluated as {@link guide/expression expression}. The
-+                     *    expression value should evaluate to an object or an array which is observed on each
-+                     *    {@link ng.$rootScope.Scope#$digest $digest} cycle. Any shallow change within the
-+                     *    collection will trigger a call to the `listener`.
-+                     *
-+                     * @param {function(newCollection, oldCollection, scope)} listener a callback function called
-+                     *    when a change is detected.
-+                     *    - The `newCollection` object is the newly modified data obtained from the `obj` expression
-+                     *    - The `oldCollection` object is a copy of the former collection data.
-+                     *      Due to performance considerations, the`oldCollection` value is computed only if the
-+                     *      `listener` function declares two or more arguments.
-+                     *    - The `scope` argument refers to the current scope.
-+                     *
-+                     * @returns {function()} Returns a de-registration function for this listener. When the
-+                     *    de-registration function is executed, the internal watch operation is terminated.
-+                     */
-+                    $watchCollection: function(obj, listener) {
-+                        $watchCollectionInterceptor.$stateful = true;
- 
--                return $rootScope;
-+                        var self = this;
-+                        // the current value, updated on each dirty-check run
-+                        var newValue;
-+                        // a shallow copy of the newValue from the last dirty-check run,
-+                        // updated to match newValue during dirty-check run
-+                        var oldValue;
-+                        // a shallow copy of the newValue from when the last change happened
-+                        var veryOldValue;
-+                        // only track veryOldValue if the listener is asking for it
-+                        var trackVeryOldValue = (listener.length > 1);
-+                        var changeDetected = 0;
-+                        var changeDetector = $parse(obj, $watchCollectionInterceptor);
-+                        var internalArray = [];
-+                        var internalObject = {};
-+                        var initRun = true;
-+                        var oldLength = 0;
- 
-+                        function $watchCollectionInterceptor(_value) {
-+                            newValue = _value;
-+                            var newLength, key, bothNaN, newItem, oldItem;
- 
--                function beginPhase(phase) {
--                    if ($rootScope.$$phase) {
--                        throw $rootScopeMinErr('inprog', '{0} already in progress', $rootScope.$$phase);
--                    }
-+                            // If the new value is undefined, then return undefined as the watch may be a one-time watch
-+                            if (isUndefined(newValue)) return;
- 
--                    $rootScope.$$phase = phase;
--                }
-+                            if (!isObject(newValue)) { // if primitive
-+                                if (oldValue !== newValue) {
-+                                    oldValue = newValue;
-+                                    changeDetected++;
-+                                }
-+                            } else if (isArrayLike(newValue)) {
-+                                if (oldValue !== internalArray) {
-+                                    // we are transitioning from something which was not an array into array.
-+                                    oldValue = internalArray;
-+                                    oldLength = oldValue.length = 0;
-+                                    changeDetected++;
-+                                }
- 
--                function clearPhase() {
--                    $rootScope.$$phase = null;
--                }
-+                                newLength = newValue.length;
- 
--                function compileToFn(exp, name) {
--                    var fn = $parse(exp);
--                    assertArgFn(fn, name);
--                    return fn;
--                }
-+                                if (oldLength !== newLength) {
-+                                    // if lengths do not match we need to trigger change notification
-+                                    changeDetected++;
-+                                    oldValue.length = oldLength = newLength;
-+                                }
-+                                // copy the items to oldValue and look for changes.
-+                                for (var i = 0; i < newLength; i++) {
-+                                    oldItem = oldValue[i];
-+                                    newItem = newValue[i];
- 
--                function decrementListenerCount(current, count, name) {
--                    do {
--                        current.$$listenerCount[name] -= count;
-+                                    // eslint-disable-next-line no-self-compare
-+                                    bothNaN = (oldItem !== oldItem) && (newItem !== newItem);
-+                                    if (!bothNaN && (oldItem !== newItem)) {
-+                                        changeDetected++;
-+                                        oldValue[i] = newItem;
-+                                    }
-+                                }
-+                            } else {
-+                                if (oldValue !== internalObject) {
-+                                    // we are transitioning from something which was not an object into object.
-+                                    oldValue = internalObject = {};
-+                                    oldLength = 0;
-+                                    changeDetected++;
-+                                }
-+                                // copy the items to oldValue and look for changes.
-+                                newLength = 0;
-+                                for (key in newValue) {
-+                                    if (hasOwnProperty.call(newValue, key)) {
-+                                        newLength++;
-+                                        newItem = newValue[key];
-+                                        oldItem = oldValue[key];
- 
--                        if (current.$$listenerCount[name] === 0) {
--                            delete current.$$listenerCount[name];
-+                                        if (key in oldValue) {
-+                                            // eslint-disable-next-line no-self-compare
-+                                            bothNaN = (oldItem !== oldItem) && (newItem !== newItem);
-+                                            if (!bothNaN && (oldItem !== newItem)) {
-+                                                changeDetected++;
-+                                                oldValue[key] = newItem;
-+                                            }
-+                                        } else {
-+                                            oldLength++;
-+                                            oldValue[key] = newItem;
-+                                            changeDetected++;
-+                                        }
-+                                    }
-+                                }
-+                                if (oldLength > newLength) {
-+                                    // we used to have more keys, need to find them and destroy them.
-+                                    changeDetected++;
-+                                    for (key in oldValue) {
-+                                        if (!hasOwnProperty.call(newValue, key)) {
-+                                            oldLength--;
-+                                            delete oldValue[key];
-+                                        }
-+                                    }
-+                                }
-+                            }
-+                            return changeDetected;
-                         }
--                    } while ((current = current.$parent));
--                }
- 
--                /**
--                 * function used as an initial value for watchers.
--                 * because it's unique we can easily tell it apart from other values
--                 */
--                function initWatchVal() {}
--            }];
--    }
-+                        function $watchCollectionAction() {
-+                            if (initRun) {
-+                                initRun = false;
-+                                listener(newValue, newValue, self);
-+                            } else {
-+                                listener(newValue, veryOldValue, self);
-+                            }
- 
--    /**
--     * @description
--     * Private service to sanitize uris for links and images. Used by $compile and $sanitize.
--     */
--    function $$SanitizeUriProvider() {
--        var aHrefSanitizationWhitelist = /^\s*(https?|ftp|mailto|tel|file):/,
--            imgSrcSanitizationWhitelist = /^\s*(https?|ftp|file):|data:image\//;
-+                            // make a copy for the next time a collection is changed
-+                            if (trackVeryOldValue) {
-+                                if (!isObject(newValue)) {
-+                                    //primitive
-+                                    veryOldValue = newValue;
-+                                } else if (isArrayLike(newValue)) {
-+                                    veryOldValue = new Array(newValue.length);
-+                                    for (var i = 0; i < newValue.length; i++) {
-+                                        veryOldValue[i] = newValue[i];
-+                                    }
-+                                } else { // if object
-+                                    veryOldValue = {};
-+                                    for (var key in newValue) {
-+                                        if (hasOwnProperty.call(newValue, key)) {
-+                                            veryOldValue[key] = newValue[key];
-+                                        }
-+                                    }
-+                                }
-+                            }
-+                        }
- 
--        /**
--         * @description
--         * Retrieves or overrides the default regular expression that is used for whitelisting of safe
--         * urls during a[href] sanitization.
--         *
--         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
--         *
--         * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
--         * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
--         * regular expression. If a match is found, the original url is written into the dom. Otherwise,
--         * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
--         *
--         * @param {RegExp=} regexp New regexp to whitelist urls with.
--         * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
--         *    chaining otherwise.
--         */
--        this.aHrefSanitizationWhitelist = function(regexp) {
--            if (isDefined(regexp)) {
--                aHrefSanitizationWhitelist = regexp;
--                return this;
--            }
--            return aHrefSanitizationWhitelist;
--        };
-+                        return this.$watch(changeDetector, $watchCollectionAction);
-+                    },
- 
-+                    /**
-+                     * @ngdoc method
-+                     * @name $rootScope.Scope#$digest
-+                     * @kind function
-+                     *
-+                     * @description
-+                     * Processes all of the {@link ng.$rootScope.Scope#$watch watchers} of the current scope and
-+                     * its children. Because a {@link ng.$rootScope.Scope#$watch watcher}'s listener can change
-+                     * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#$watch watchers}
-+                     * until no more listeners are firing. This means that it is possible to get into an infinite
-+                     * loop. This function will throw `'Maximum iteration limit exceeded.'` if the number of
-+                     * iterations exceeds 10.
-+                     *
-+                     * Usually, you don't call `$digest()` directly in
-+                     * {@link ng.directive:ngController controllers} or in
-+                     * {@link ng.$compileProvider#directive directives}.
-+                     * Instead, you should call {@link ng.$rootScope.Scope#$apply $apply()} (typically from within
-+                     * a {@link ng.$compileProvider#directive directive}), which will force a `$digest()`.
-+                     *
-+                     * If you want to be notified whenever `$digest()` is called,
-+                     * you can register a `watchExpression` function with
-+                     * {@link ng.$rootScope.Scope#$watch $watch()} with no `listener`.
-+                     *
-+                     * In unit tests, you may need to call `$digest()` to simulate the scope life cycle.
-+                     *
-+                     * @example
-+                     * ```js
-+                     var scope = ...;
-+                     scope.name = 'misko';
-+                     scope.counter = 0;
- 
--        /**
--         * @description
--         * Retrieves or overrides the default regular expression that is used for whitelisting of safe
--         * urls during img[src] sanitization.
--         *
--         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
--         *
--         * Any url about to be assigned to img[src] via data-binding is first normalized and turned into
--         * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist`
--         * regular expression. If a match is found, the original url is written into the dom. Otherwise,
--         * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
--         *
--         * @param {RegExp=} regexp New regexp to whitelist urls with.
--         * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
--         *    chaining otherwise.
--         */
--        this.imgSrcSanitizationWhitelist = function(regexp) {
--            if (isDefined(regexp)) {
--                imgSrcSanitizationWhitelist = regexp;
--                return this;
--            }
--            return imgSrcSanitizationWhitelist;
--        };
-+                     expect(scope.counter).toEqual(0);
-+                     scope.$watch('name', function(newValue, oldValue) {
-+             scope.counter = scope.counter + 1;
-+           });
-+                     expect(scope.counter).toEqual(0);
- 
--        this.$get = function() {
--            return function sanitizeUri(uri, isImage) {
--                var regex = isImage ? imgSrcSanitizationWhitelist : aHrefSanitizationWhitelist;
--                var normalizedVal;
--                // NOTE: urlResolve() doesn't support IE < 8 so we don't sanitize for that case.
--                if (!msie || msie >= 8 ) {
--                    normalizedVal = urlResolve(uri).href;
--                    if (normalizedVal !== '' && !normalizedVal.match(regex)) {
--                        return 'unsafe:'+normalizedVal;
--                    }
--                }
--                return uri;
--            };
--        };
--    }
-+                     scope.$digest();
-+                     // the listener is always called during the first $digest loop after it was registered
-+                     expect(scope.counter).toEqual(1);
- 
--    var $sceMinErr = minErr('$sce');
--
--    var SCE_CONTEXTS = {
--        HTML: 'html',
--        CSS: 'css',
--        URL: 'url',
--        // RESOURCE_URL is a subtype of URL used in contexts where a privileged resource is sourced from a
--        // url.  (e.g. ng-include, script src, templateUrl)
--        RESOURCE_URL: 'resourceUrl',
--        JS: 'js'
--    };
--
--// Helper functions follow.
--
--// Copied from:
--// http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962
--// Prereq: s is a string.
--    function escapeForRegexp(s) {
--        return s.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g, '\\$1').
--            replace(/\x08/g, '\\x08');
--    }
--
--
--    function adjustMatcher(matcher) {
--        if (matcher === 'self') {
--            return matcher;
--        } else if (isString(matcher)) {
--            // Strings match exactly except for 2 wildcards - '*' and '**'.
--            // '*' matches any character except those from the set ':/.?&'.
--            // '**' matches any character (like .* in a RegExp).
--            // More than 2 *'s raises an error as it's ill defined.
--            if (matcher.indexOf('***') > -1) {
--                throw $sceMinErr('iwcard',
--                    'Illegal sequence *** in string matcher.  String: {0}', matcher);
--            }
--            matcher = escapeForRegexp(matcher).
--                replace('\\*\\*', '.*').
--                replace('\\*', '[^:/.?&;]*');
--            return new RegExp('^' + matcher + '$');
--        } else if (isRegExp(matcher)) {
--            // The only other type of matcher allowed is a Regexp.
--            // Match entire URL / disallow partial matches.
--            // Flags are reset (i.e. no global, ignoreCase or multiline)
--            return new RegExp('^' + matcher.source + '$');
--        } else {
--            throw $sceMinErr('imatcher',
--                'Matchers may only be "self", string patterns or RegExp objects');
--        }
--    }
-+                     scope.$digest();
-+                     // but now it will not be called unless the value changes
-+                     expect(scope.counter).toEqual(1);
- 
-+                     scope.name = 'adam';
-+                     scope.$digest();
-+                     expect(scope.counter).toEqual(2);
-+                     * ```
-+                     *
-+                     */
-+                    $digest: function() {
-+                        var watch, value, last, fn, get,
-+                            watchers,
-+                            dirty, ttl = TTL,
-+                            next, current, target = this,
-+                            watchLog = [],
-+                            logIdx, asyncTask;
- 
--    function adjustMatchers(matchers) {
--        var adjustedMatchers = [];
--        if (isDefined(matchers)) {
--            forEach(matchers, function(matcher) {
--                adjustedMatchers.push(adjustMatcher(matcher));
--            });
--        }
--        return adjustedMatchers;
--    }
-+                        beginPhase('$digest');
-+                        // Check for changes to browser url that happened in sync before the call to $digest
-+                        $browser.$$checkUrlChange();
-+
-+                        if (this === $rootScope && applyAsyncId !== null) {
-+                            // If this is the root scope, and $applyAsync has scheduled a deferred $apply(), then
-+                            // cancel the scheduled $apply and flush the queue of expressions to be evaluated.
-+                            $browser.defer.cancel(applyAsyncId);
-+                            flushApplyAsync();
-+                        }
- 
-+                        lastDirtyWatch = null;
- 
--    /**
--     * @ngdoc service
--     * @name $sceDelegate
--     * @function
--     *
--     * @description
--     *
--     * `$sceDelegate` is a service that is used by the `$sce` service to provide {@link ng.$sce Strict
-- * Contextual Escaping (SCE)} services to AngularJS.
--     *
--     * Typically, you would configure or override the {@link ng.$sceDelegate $sceDelegate} instead of
--     * the `$sce` service to customize the way Strict Contextual Escaping works in AngularJS.  This is
--     * because, while the `$sce` provides numerous shorthand methods, etc., you really only need to
--     * override 3 core functions (`trustAs`, `getTrusted` and `valueOf`) to replace the way things
--     * work because `$sce` delegates to `$sceDelegate` for these operations.
--     *
--     * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} to configure this service.
--     *
--     * The default instance of `$sceDelegate` should work out of the box with little pain.  While you
--     * can override it completely to change the behavior of `$sce`, the common case would
--     * involve configuring the {@link ng.$sceDelegateProvider $sceDelegateProvider} instead by setting
--     * your own whitelists and blacklists for trusting URLs used for loading AngularJS resources such as
--     * templates.  Refer {@link ng.$sceDelegateProvider#resourceUrlWhitelist
-- * $sceDelegateProvider.resourceUrlWhitelist} and {@link
--        * ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
--     */
-+                        do { // "while dirty" loop
-+                            dirty = false;
-+                            current = target;
- 
--    /**
--     * @ngdoc provider
--     * @name $sceDelegateProvider
--     * @description
--     *
--     * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate
-- * $sceDelegate} service.  This allows one to get/set the whitelists and blacklists used to ensure
--     * that the URLs used for sourcing Angular templates are safe.  Refer {@link
--        * ng.$sceDelegateProvider#resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist} and
--     * {@link ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
--     *
--     * For the general details about this service in Angular, read the main page for {@link ng.$sce
-- * Strict Contextual Escaping (SCE)}.
--     *
--     * **Example**:  Consider the following case. <a name="example"></a>
--     *
--     * - your app is hosted at url `http://myapp.example.com/`
--     * - but some of your templates are hosted on other domains you control such as
--     *   `http://srv01.assets.example.com/`,  `http://srv02.assets.example.com/`, etc.
--     * - and you have an open redirect at `http://myapp.example.com/clickThru?...`.
--     *
--     * Here is what a secure configuration for this scenario might look like:
--     *
--     * <pre class="prettyprint">
--     *    angular.module('myApp', []).config(function($sceDelegateProvider) {
-- *      $sceDelegateProvider.resourceUrlWhitelist([
-- *        // Allow same origin resource loads.
-- *        'self',
-- *        // Allow loading from our assets domain.  Notice the difference between * and **.
-- *        'http://srv*.assets.example.com/**']);
-- *
-- *      // The blacklist overrides the whitelist so the open redirect here is blocked.
-- *      $sceDelegateProvider.resourceUrlBlacklist([
-- *        'http://myapp.example.com/clickThru**']);
-- *      });
--     * </pre>
--     */
-+                            // It's safe for asyncQueuePosition to be a local variable here because this loop can't
-+                            // be reentered recursively. Calling $digest from a function passed to $evalAsync would
-+                            // lead to a '$digest already in progress' error.
-+                            for (var asyncQueuePosition = 0; asyncQueuePosition < asyncQueue.length; asyncQueuePosition++) {
-+                                try {
-+                                    asyncTask = asyncQueue[asyncQueuePosition];
-+                                    fn = asyncTask.fn;
-+                                    fn(asyncTask.scope, asyncTask.locals);
-+                                } catch (e) {
-+                                    $exceptionHandler(e);
-+                                }
-+                                lastDirtyWatch = null;
-+                            }
-+                            asyncQueue.length = 0;
- 
--    function $SceDelegateProvider() {
--        this.SCE_CONTEXTS = SCE_CONTEXTS;
-+                            traverseScopesLoop:
-+                                do { // "traverse the scopes" loop
-+                                    if ((watchers = current.$$watchers)) {
-+                                        // process our watches
-+                                        watchers.$$digestWatchIndex = watchers.length;
-+                                        while (watchers.$$digestWatchIndex--) {
-+                                            try {
-+                                                watch = watchers[watchers.$$digestWatchIndex];
-+                                                // Most common watches are on primitives, in which case we can short
-+                                                // circuit it with === operator, only when === fails do we use .equals
-+                                                if (watch) {
-+                                                    get = watch.get;
-+                                                    if ((value = get(current)) !== (last = watch.last) &&
-+                                                        !(watch.eq
-+                                                            ? equals(value, last)
-+                                                            : (isNumberNaN(value) && isNumberNaN(last)))) {
-+                                                        dirty = true;
-+                                                        lastDirtyWatch = watch;
-+                                                        watch.last = watch.eq ? copy(value, null) : value;
-+                                                        fn = watch.fn;
-+                                                        fn(value, ((last === initWatchVal) ? value : last), current);
-+                                                        if (ttl < 5) {
-+                                                            logIdx = 4 - ttl;
-+                                                            if (!watchLog[logIdx]) watchLog[logIdx] = [];
-+                                                            watchLog[logIdx].push({
-+                                                                msg: isFunction(watch.exp) ? 'fn: ' + (watch.exp.name || watch.exp.toString()) : watch.exp,
-+                                                                newVal: value,
-+                                                                oldVal: last
-+                                                            });
-+                                                        }
-+                                                    } else if (watch === lastDirtyWatch) {
-+                                                        // If the most recently dirty watcher is now clean, short circuit since the remaining watchers
-+                                                        // have already been tested.
-+                                                        dirty = false;
-+                                                        break traverseScopesLoop;
-+                                                    }
-+                                                }
-+                                            } catch (e) {
-+                                                $exceptionHandler(e);
-+                                            }
-+                                        }
-+                                    }
- 
--        // Resource URLs can also be trusted by policy.
--        var resourceUrlWhitelist = ['self'],
--            resourceUrlBlacklist = [];
-+                                    // Insanity Warning: scope depth-first traversal
-+                                    // yes, this code is a bit crazy, but it works and we have tests to prove it!
-+                                    // this piece should be kept in sync with the traversal in $broadcast
-+                                    if (!(next = ((current.$$watchersCount && current.$$childHead) ||
-+                                        (current !== target && current.$$nextSibling)))) {
-+                                        while (current !== target && !(next = current.$$nextSibling)) {
-+                                            current = current.$parent;
-+                                        }
-+                                    }
-+                                } while ((current = next));
- 
--        /**
--         * @ngdoc method
--         * @name $sceDelegateProvider#resourceUrlWhitelist
--         * @function
--         *
--         * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value
--         *     provided.  This must be an array or null.  A snapshot of this array is used so further
--         *     changes to the array are ignored.
--         *
--         *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
--         *     allowed in this array.
--         *
--         *     Note: **an empty whitelist array will block all URLs**!
--         *
--         * @return {Array} the currently set whitelist array.
--         *
--         * The **default value** when no whitelist has been explicitly set is `['self']` allowing only
--         * same origin resource requests.
--         *
--         * @description
--         * Sets/Gets the whitelist of trusted resource URLs.
--         */
--        this.resourceUrlWhitelist = function (value) {
--            if (arguments.length) {
--                resourceUrlWhitelist = adjustMatchers(value);
--            }
--            return resourceUrlWhitelist;
--        };
-+                            // `break traverseScopesLoop;` takes us to here
- 
--        /**
--         * @ngdoc method
--         * @name $sceDelegateProvider#resourceUrlBlacklist
--         * @function
--         *
--         * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value
--         *     provided.  This must be an array or null.  A snapshot of this array is used so further
--         *     changes to the array are ignored.
--         *
--         *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
--         *     allowed in this array.
--         *
--         *     The typical usage for the blacklist is to **block
--         *     [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as
--         *     these would otherwise be trusted but actually return content from the redirected domain.
--         *
--         *     Finally, **the blacklist overrides the whitelist** and has the final say.
--         *
--         * @return {Array} the currently set blacklist array.
--         *
--         * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there
--         * is no blacklist.)
--         *
--         * @description
--         * Sets/Gets the blacklist of trusted resource URLs.
--         */
-+                            if ((dirty || asyncQueue.length) && !(ttl--)) {
-+                                clearPhase();
-+                                throw $rootScopeMinErr('infdig',
-+                                    '{0} $digest() iterations reached. Aborting!\n' +
-+                                    'Watchers fired in the last 5 iterations: {1}',
-+                                    TTL, watchLog);
-+                            }
- 
--        this.resourceUrlBlacklist = function (value) {
--            if (arguments.length) {
--                resourceUrlBlacklist = adjustMatchers(value);
--            }
--            return resourceUrlBlacklist;
--        };
-+                        } while (dirty || asyncQueue.length);
- 
--        this.$get = ['$injector', function($injector) {
-+                        clearPhase();
- 
--            var htmlSanitizer = function htmlSanitizer(html) {
--                throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
--            };
-+                        // postDigestQueuePosition isn't local here because this loop can be reentered recursively.
-+                        while (postDigestQueuePosition < postDigestQueue.length) {
-+                            try {
-+                                postDigestQueue[postDigestQueuePosition++]();
-+                            } catch (e) {
-+                                $exceptionHandler(e);
-+                            }
-+                        }
-+                        postDigestQueue.length = postDigestQueuePosition = 0;
- 
--            if ($injector.has('$sanitize')) {
--                htmlSanitizer = $injector.get('$sanitize');
--            }
-+                        // Check for changes to browser url that happened during the $digest
-+                        // (for which no event is fired; e.g. via `history.pushState()`)
-+                        $browser.$$checkUrlChange();
-+                    },
- 
- 
--            function matchUrl(matcher, parsedUrl) {
--                if (matcher === 'self') {
--                    return urlIsSameOrigin(parsedUrl);
--                } else {
--                    // definitely a regex.  See adjustMatchers()
--                    return !!matcher.exec(parsedUrl.href);
--                }
--            }
-+                    /**
-+                     * @ngdoc event
-+                     * @name $rootScope.Scope#$destroy
-+                     * @eventType broadcast on scope being destroyed
-+                     *
-+                     * @description
-+                     * Broadcasted when a scope and its children are being destroyed.
-+                     *
-+                     * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
-+                     * clean up DOM bindings before an element is removed from the DOM.
-+                     */
- 
--            function isResourceUrlAllowedByPolicy(url) {
--                var parsedUrl = urlResolve(url.toString());
--                var i, n, allowed = false;
--                // Ensure that at least one item from the whitelist allows this url.
--                for (i = 0, n = resourceUrlWhitelist.length; i < n; i++) {
--                    if (matchUrl(resourceUrlWhitelist[i], parsedUrl)) {
--                        allowed = true;
--                        break;
--                    }
--                }
--                if (allowed) {
--                    // Ensure that no item from the blacklist blocked this url.
--                    for (i = 0, n = resourceUrlBlacklist.length; i < n; i++) {
--                        if (matchUrl(resourceUrlBlacklist[i], parsedUrl)) {
--                            allowed = false;
--                            break;
--                        }
--                    }
--                }
--                return allowed;
--            }
-+                    /**
-+                     * @ngdoc method
-+                     * @name $rootScope.Scope#$destroy
-+                     * @kind function
-+                     *
-+                     * @description
-+                     * Removes the current scope (and all of its children) from the parent scope. Removal implies
-+                     * that calls to {@link ng.$rootScope.Scope#$digest $digest()} will no longer
-+                     * propagate to the current scope and its children. Removal also implies that the current
-+                     * scope is eligible for garbage collection.
-+                     *
-+                     * The `$destroy()` is usually used by directives such as
-+                     * {@link ng.directive:ngRepeat ngRepeat} for managing the
-+                     * unrolling of the loop.
-+                     *
-+                     * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope.
-+                     * Application code can register a `$destroy` event handler that will give it a chance to
-+                     * perform any necessary cleanup.
-+                     *
-+                     * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
-+                     * clean up DOM bindings before an element is removed from the DOM.
-+                     */
-+                    $destroy: function() {
-+                        // We can't destroy a scope that has been already destroyed.
-+                        if (this.$$destroyed) return;
-+                        var parent = this.$parent;
- 
--            function generateHolderType(Base) {
--                var holderType = function TrustedValueHolderType(trustedValue) {
--                    this.$$unwrapTrustedValue = function() {
--                        return trustedValue;
--                    };
--                };
--                if (Base) {
--                    holderType.prototype = new Base();
--                }
--                holderType.prototype.valueOf = function sceValueOf() {
--                    return this.$$unwrapTrustedValue();
--                };
--                holderType.prototype.toString = function sceToString() {
--                    return this.$$unwrapTrustedValue().toString();
--                };
--                return holderType;
--            }
-+                        this.$broadcast('$destroy');
-+                        this.$$destroyed = true;
- 
--            var trustedValueHolderBase = generateHolderType(),
--                byType = {};
-+                        if (this === $rootScope) {
-+                            //Remove handlers attached to window when $rootScope is removed
-+                            $browser.$$applicationDestroyed();
-+                        }
- 
--            byType[SCE_CONTEXTS.HTML] = generateHolderType(trustedValueHolderBase);
--            byType[SCE_CONTEXTS.CSS] = generateHolderType(trustedValueHolderBase);
--            byType[SCE_CONTEXTS.URL] = generateHolderType(trustedValueHolderBase);
--            byType[SCE_CONTEXTS.JS] = generateHolderType(trustedValueHolderBase);
--            byType[SCE_CONTEXTS.RESOURCE_URL] = generateHolderType(byType[SCE_CONTEXTS.URL]);
-+                        incrementWatchersCount(this, -this.$$watchersCount);
-+                        for (var eventName in this.$$listenerCount) {
-+                            decrementListenerCount(this, this.$$listenerCount[eventName], eventName);
-+                        }
- 
--            /**
--             * @ngdoc method
--             * @name $sceDelegate#trustAs
--             *
--             * @description
--             * Returns an object that is trusted by angular for use in specified strict
--             * contextual escaping contexts (such as ng-bind-html, ng-include, any src
--             * attribute interpolation, any dom event binding attribute interpolation
--             * such as for onclick,  etc.) that uses the provided value.
--             * See {@link ng.$sce $sce} for enabling strict contextual escaping.
--             *
--             * @param {string} type The kind of context in which this value is safe for use.  e.g. url,
--             *   resourceUrl, html, js and css.
--             * @param {*} value The value that that should be considered trusted/safe.
--             * @returns {*} A value that can be used to stand in for the provided `value` in places
--             * where Angular expects a $sce.trustAs() return value.
--             */
--            function trustAs(type, trustedValue) {
--                var Constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
--                if (!Constructor) {
--                    throw $sceMinErr('icontext',
--                        'Attempted to trust a value in invalid context. Context: {0}; Value: {1}',
--                        type, trustedValue);
--                }
--                if (trustedValue === null || trustedValue === undefined || trustedValue === '') {
--                    return trustedValue;
--                }
--                // All the current contexts in SCE_CONTEXTS happen to be strings.  In order to avoid trusting
--                // mutable objects, we ensure here that the value passed in is actually a string.
--                if (typeof trustedValue !== 'string') {
--                    throw $sceMinErr('itype',
--                        'Attempted to trust a non-string value in a content requiring a string: Context: {0}',
--                        type);
--                }
--                return new Constructor(trustedValue);
--            }
-+                        // sever all the references to parent scopes (after this cleanup, the current scope should
-+                        // not be retained by any of our references and should be eligible for garbage collection)
-+                        if (parent && parent.$$childHead === this) parent.$$childHead = this.$$nextSibling;
-+                        if (parent && parent.$$childTail === this) parent.$$childTail = this.$$prevSibling;
-+                        if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling;
-+                        if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling;
- 
--            /**
--             * @ngdoc method
--             * @name $sceDelegate#valueOf
--             *
--             * @description
--             * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#trustAs
--     * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link
--                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.
--             *
--             * If the passed parameter is not a value that had been returned by {@link
--                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}, returns it as-is.
--             *
--             * @param {*} value The result of a prior {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}
--             *      call or anything else.
--             * @returns {*} The `value` that was originally provided to {@link ng.$sceDelegate#trustAs
--     *     `$sceDelegate.trustAs`} if `value` is the result of such a call.  Otherwise, returns
--             *     `value` unchanged.
--             */
--            function valueOf(maybeTrusted) {
--                if (maybeTrusted instanceof trustedValueHolderBase) {
--                    return maybeTrusted.$$unwrapTrustedValue();
--                } else {
--                    return maybeTrusted;
--                }
--            }
-+                        // Disable listeners, watchers and apply/digest methods
-+                        this.$destroy = this.$digest = this.$apply = this.$evalAsync = this.$applyAsync = noop;
-+                        this.$on = this.$watch = this.$watchGroup = function() { return noop; };
-+                        this.$$listeners = {};
- 
--            /**
--             * @ngdoc method
--             * @name $sceDelegate#getTrusted
--             *
--             * @description
--             * Takes the result of a {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} call and
--             * returns the originally supplied value if the queried context type is a supertype of the
--             * created type.  If this condition isn't satisfied, throws an exception.
--             *
--             * @param {string} type The kind of context in which this value is to be used.
--             * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#trustAs
--     *     `$sceDelegate.trustAs`} call.
--             * @returns {*} The value the was originally provided to {@link ng.$sceDelegate#trustAs
--     *     `$sceDelegate.trustAs`} if valid in this context.  Otherwise, throws an exception.
--             */
--            function getTrusted(type, maybeTrusted) {
--                if (maybeTrusted === null || maybeTrusted === undefined || maybeTrusted === '') {
--                    return maybeTrusted;
--                }
--                var constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
--                if (constructor && maybeTrusted instanceof constructor) {
--                    return maybeTrusted.$$unwrapTrustedValue();
--                }
--                // If we get here, then we may only take one of two actions.
--                // 1. sanitize the value for the requested type, or
--                // 2. throw an exception.
--                if (type === SCE_CONTEXTS.RESOURCE_URL) {
--                    if (isResourceUrlAllowedByPolicy(maybeTrusted)) {
--                        return maybeTrusted;
--                    } else {
--                        throw $sceMinErr('insecurl',
--                            'Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}',
--                            maybeTrusted.toString());
--                    }
--                } else if (type === SCE_CONTEXTS.HTML) {
--                    return htmlSanitizer(maybeTrusted);
--                }
--                throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
--            }
-+                        // Disconnect the next sibling to prevent `cleanUpScope` destroying those too
-+                        this.$$nextSibling = null;
-+                        cleanUpScope(this);
-+                    },
- 
--            return { trustAs: trustAs,
--                getTrusted: getTrusted,
--                valueOf: valueOf };
--        }];
--    }
-+                    /**
-+                     * @ngdoc method
-+                     * @name $rootScope.Scope#$eval
-+                     * @kind function
-+                     *
-+                     * @description
-+                     * Executes the `expression` on the current scope and returns the result. Any exceptions in
-+                     * the expression are propagated (uncaught). This is useful when evaluating AngularJS
-+                     * expressions.
-+                     *
-+                     * @example
-+                     * ```js
-+                     var scope = ng.$rootScope.Scope();
-+                     scope.a = 1;
-+                     scope.b = 2;
- 
-+                     expect(scope.$eval('a+b')).toEqual(3);
-+                     expect(scope.$eval(function(scope){ return scope.a + scope.b; })).toEqual(3);
-+                     * ```
-+                     *
-+                     * @param {(string|function())=} expression An AngularJS expression to be executed.
-+                     *
-+                     *    - `string`: execute using the rules as defined in  {@link guide/expression expression}.
-+                     *    - `function(scope)`: execute the function with the current `scope` parameter.
-+                     *
-+                     * @param {(object)=} locals Local variables object, useful for overriding values in scope.
-+                     * @returns {*} The result of evaluating the expression.
-+                     */
-+                    $eval: function(expr, locals) {
-+                        return $parse(expr)(this, locals);
-+                    },
- 
--    /**
--     * @ngdoc provider
--     * @name $sceProvider
--     * @description
--     *
--     * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service.
--     * -   enable/disable Strict Contextual Escaping (SCE) in a module
--     * -   override the default implementation with a custom delegate
--     *
--     * Read more about {@link ng.$sce Strict Contextual Escaping (SCE)}.
--     */
-+                    /**
-+                     * @ngdoc method
-+                     * @name $rootScope.Scope#$evalAsync
-+                     * @kind function
-+                     *
-+                     * @description
-+                     * Executes the expression on the current scope at a later point in time.
-+                     *
-+                     * The `$evalAsync` makes no guarantees as to when the `expression` will be executed, only
-+                     * that:
-+                     *
-+                     *   - it will execute after the function that scheduled the evaluation (preferably before DOM
-+                     *     rendering).
-+                     *   - at least one {@link ng.$rootScope.Scope#$digest $digest cycle} will be performed after
-+                     *     `expression` execution.
-+                     *
-+                     * Any exceptions from the execution of the expression are forwarded to the
-+                     * {@link ng.$exceptionHandler $exceptionHandler} service.
-+                     *
-+                     * __Note:__ if this function is called outside of a `$digest` cycle, a new `$digest` cycle
-+                     * will be scheduled. However, it is encouraged to always call code that changes the model
-+                     * from within an `$apply` call. That includes code evaluated via `$evalAsync`.
-+                     *
-+                     * @param {(string|function())=} expression An AngularJS expression to be executed.
-+                     *
-+                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
-+                     *    - `function(scope)`: execute the function with the current `scope` parameter.
-+                     *
-+                     * @param {(object)=} locals Local variables object, useful for overriding values in scope.
-+                     */
-+                    $evalAsync: function(expr, locals) {
-+                        // if we are outside of an $digest loop and this is the first time we are scheduling async
-+                        // task also schedule async auto-flush
-+                        if (!$rootScope.$$phase && !asyncQueue.length) {
-+                            $browser.defer(function() {
-+                                if (asyncQueue.length) {
-+                                    $rootScope.$digest();
-+                                }
-+                            });
-+                        }
- 
--    /* jshint maxlen: false*/
-+                        asyncQueue.push({scope: this, fn: $parse(expr), locals: locals});
-+                    },
- 
--    /**
--     * @ngdoc service
--     * @name $sce
--     * @function
--     *
--     * @description
--     *
--     * `$sce` is a service that provides Strict Contextual Escaping services to AngularJS.
--     *
--     * # Strict Contextual Escaping
--     *
--     * Strict Contextual Escaping (SCE) is a mode in which AngularJS requires bindings in certain
--     * contexts to result in a value that is marked as safe to use for that context.  One example of
--     * such a context is binding arbitrary html controlled by the user via `ng-bind-html`.  We refer
--     * to these contexts as privileged or SCE contexts.
--     *
--     * As of version 1.2, Angular ships with SCE enabled by default.
--     *
--     * Note:  When enabled (the default), IE8 in quirks mode is not supported.  In this mode, IE8 allows
--     * one to execute arbitrary javascript by the use of the expression() syntax.  Refer
--     * <http://blogs.msdn.com/b/ie/archive/2008/10/16/ending-expressions.aspx> to learn more about them.
--     * You can ensure your document is in standards mode and not quirks mode by adding `<!doctype html>`
--     * to the top of your HTML document.
--     *
--     * SCE assists in writing code in way that (a) is secure by default and (b) makes auditing for
--     * security vulnerabilities such as XSS, clickjacking, etc. a lot easier.
--     *
--     * Here's an example of a binding in a privileged context:
--     *
--     * <pre class="prettyprint">
--     *     <input ng-model="userHtml">
--     *     <div ng-bind-html="userHtml">
--     * </pre>
--     *
--     * Notice that `ng-bind-html` is bound to `userHtml` controlled by the user.  With SCE
--     * disabled, this application allows the user to render arbitrary HTML into the DIV.
--     * In a more realistic example, one may be rendering user comments, blog articles, etc. via
--     * bindings.  (HTML is just one example of a context where rendering user controlled input creates
--     * security vulnerabilities.)
--     *
--     * For the case of HTML, you might use a library, either on the client side, or on the server side,
--     * to sanitize unsafe HTML before binding to the value and rendering it in the document.
--     *
--     * How would you ensure that every place that used these types of bindings was bound to a value that
--     * was sanitized by your library (or returned as safe for rendering by your server?)  How can you
--     * ensure that you didn't accidentally delete the line that sanitized the value, or renamed some
--     * properties/fields and forgot to update the binding to the sanitized value?
-+                    $$postDigest: function(fn) {
-+                        postDigestQueue.push(fn);
-+                    },
-+
-+                    /**
-+                     * @ngdoc method
-+                     * @name $rootScope.Scope#$apply
-+                     * @kind function
-+                     *
-+                     * @description
-+                     * `$apply()` is used to execute an expression in AngularJS from outside of the AngularJS
-+                     * framework. (For example from browser DOM events, setTimeout, XHR or third party libraries).
-+                     * Because we are calling into the AngularJS framework we need to perform proper scope life
-+                     * cycle of {@link ng.$exceptionHandler exception handling},
-+                     * {@link ng.$rootScope.Scope#$digest executing watches}.
-+                     *
-+                     * **Life cycle: Pseudo-Code of `$apply()`**
-+                     *
-+                     * ```js
-+                     function $apply(expr) {
-+             try {
-+               return $eval(expr);
-+             } catch (e) {
-+               $exceptionHandler(e);
-+             } finally {
-+               $root.$digest();
-+             }
-+           }
-+                     * ```
-+                     *
-+                     *
-+                     * Scope's `$apply()` method transitions through the following stages:
-+                     *
-+                     * 1. The {@link guide/expression expression} is executed using the
-+                     *    {@link ng.$rootScope.Scope#$eval $eval()} method.
-+                     * 2. Any exceptions from the execution of the expression are forwarded to the
-+                     *    {@link ng.$exceptionHandler $exceptionHandler} service.
-+                     * 3. The {@link ng.$rootScope.Scope#$watch watch} listeners are fired immediately after the
-+                     *    expression was executed using the {@link ng.$rootScope.Scope#$digest $digest()} method.
-+                     *
-+                     *
-+                     * @param {(string|function())=} exp An AngularJS expression to be executed.
-+                     *
-+                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
-+                     *    - `function(scope)`: execute the function with current `scope` parameter.
-+                     *
-+                     * @returns {*} The result of evaluating the expression.
-+                     */
-+                    $apply: function(expr) {
-+                        try {
-+                            beginPhase('$apply');
-+                            try {
-+                                return this.$eval(expr);
-+                            } finally {
-+                                clearPhase();
-+                            }
-+                        } catch (e) {
-+                            $exceptionHandler(e);
-+                        } finally {
-+                            try {
-+                                $rootScope.$digest();
-+                            } catch (e) {
-+                                $exceptionHandler(e);
-+                                // eslint-disable-next-line no-unsafe-finally
-+                                throw e;
-+                            }
-+                        }
-+                    },
-+
-+                    /**
-+                     * @ngdoc method
-+                     * @name $rootScope.Scope#$applyAsync
-+                     * @kind function
-+                     *
-+                     * @description
-+                     * Schedule the invocation of $apply to occur at a later time. The actual time difference
-+                     * varies across browsers, but is typically around ~10 milliseconds.
-+                     *
-+                     * This can be used to queue up multiple expressions which need to be evaluated in the same
-+                     * digest.
-+                     *
-+                     * @param {(string|function())=} exp An AngularJS expression to be executed.
-+                     *
-+                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
-+                     *    - `function(scope)`: execute the function with current `scope` parameter.
-+                     */
-+                    $applyAsync: function(expr) {
-+                        var scope = this;
-+                        if (expr) {
-+                            applyAsyncQueue.push($applyAsyncExpression);
-+                        }
-+                        expr = $parse(expr);
-+                        scheduleApplyAsync();
-+
-+                        function $applyAsyncExpression() {
-+                            scope.$eval(expr);
-+                        }
-+                    },
-+
-+                    /**
-+                     * @ngdoc method
-+                     * @name $rootScope.Scope#$on
-+                     * @kind function
-+                     *
-+                     * @description
-+                     * Listens on events of a given type. See {@link ng.$rootScope.Scope#$emit $emit} for
-+                     * discussion of event life cycle.
-+                     *
-+                     * The event listener function format is: `function(event, args...)`. The `event` object
-+                     * passed into the listener has the following attributes:
-+                     *
-+                     *   - `targetScope` - `{Scope}`: the scope on which the event was `$emit`-ed or
-+                     *     `$broadcast`-ed.
-+                     *   - `currentScope` - `{Scope}`: the scope that is currently handling the event. Once the
-+                     *     event propagates through the scope hierarchy, this property is set to null.
-+                     *   - `name` - `{string}`: name of the event.
-+                     *   - `stopPropagation` - `{function=}`: calling `stopPropagation` function will cancel
-+                     *     further event propagation (available only for events that were `$emit`-ed).
-+                     *   - `preventDefault` - `{function}`: calling `preventDefault` sets `defaultPrevented` flag
-+                     *     to true.
-+                     *   - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called.
-+                     *
-+                     * @param {string} name Event name to listen on.
-+                     * @param {function(event, ...args)} listener Function to call when the event is emitted.
-+                     * @returns {function()} Returns a deregistration function for this listener.
-+                     */
-+                    $on: function(name, listener) {
-+                        var namedListeners = this.$$listeners[name];
-+                        if (!namedListeners) {
-+                            this.$$listeners[name] = namedListeners = [];
-+                        }
-+                        namedListeners.push(listener);
-+
-+                        var current = this;
-+                        do {
-+                            if (!current.$$listenerCount[name]) {
-+                                current.$$listenerCount[name] = 0;
-+                            }
-+                            current.$$listenerCount[name]++;
-+                        } while ((current = current.$parent));
-+
-+                        var self = this;
-+                        return function() {
-+                            var indexOfListener = namedListeners.indexOf(listener);
-+                            if (indexOfListener !== -1) {
-+                                // Use delete in the hope of the browser deallocating the memory for the array entry,
-+                                // while not shifting the array indexes of other listeners.
-+                                // See issue https://github.com/angular/angular.js/issues/16135
-+                                delete namedListeners[indexOfListener];
-+                                decrementListenerCount(self, 1, name);
-+                            }
-+                        };
-+                    },
-+
-+
-+                    /**
-+                     * @ngdoc method
-+                     * @name $rootScope.Scope#$emit
-+                     * @kind function
-+                     *
-+                     * @description
-+                     * Dispatches an event `name` upwards through the scope hierarchy notifying the
-+                     * registered {@link ng.$rootScope.Scope#$on} listeners.
-+                     *
-+                     * The event life cycle starts at the scope on which `$emit` was called. All
-+                     * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
-+                     * notified. Afterwards, the event traverses upwards toward the root scope and calls all
-+                     * registered listeners along the way. The event will stop propagating if one of the listeners
-+                     * cancels it.
-+                     *
-+                     * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
-+                     * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
-+                     *
-+                     * @param {string} name Event name to emit.
-+                     * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
-+                     * @return {Object} Event object (see {@link ng.$rootScope.Scope#$on}).
-+                     */
-+                    $emit: function(name, args) {
-+                        var empty = [],
-+                            namedListeners,
-+                            scope = this,
-+                            stopPropagation = false,
-+                            event = {
-+                                name: name,
-+                                targetScope: scope,
-+                                stopPropagation: function() {stopPropagation = true;},
-+                                preventDefault: function() {
-+                                    event.defaultPrevented = true;
-+                                },
-+                                defaultPrevented: false
-+                            },
-+                            listenerArgs = concat([event], arguments, 1),
-+                            i, length;
-+
-+                        do {
-+                            namedListeners = scope.$$listeners[name] || empty;
-+                            event.currentScope = scope;
-+                            for (i = 0, length = namedListeners.length; i < length; i++) {
-+
-+                                // if listeners were deregistered, defragment the array
-+                                if (!namedListeners[i]) {
-+                                    namedListeners.splice(i, 1);
-+                                    i--;
-+                                    length--;
-+                                    continue;
-+                                }
-+                                try {
-+                                    //allow all listeners attached to the current scope to run
-+                                    namedListeners[i].apply(null, listenerArgs);
-+                                } catch (e) {
-+                                    $exceptionHandler(e);
-+                                }
-+                            }
-+                            //if any listener on the current scope stops propagation, prevent bubbling
-+                            if (stopPropagation) {
-+                                break;
-+                            }
-+                            //traverse upwards
-+                            scope = scope.$parent;
-+                        } while (scope);
-+
-+                        event.currentScope = null;
-+
-+                        return event;
-+                    },
-+
-+
-+                    /**
-+                     * @ngdoc method
-+                     * @name $rootScope.Scope#$broadcast
-+                     * @kind function
-+                     *
-+                     * @description
-+                     * Dispatches an event `name` downwards to all child scopes (and their children) notifying the
-+                     * registered {@link ng.$rootScope.Scope#$on} listeners.
-+                     *
-+                     * The event life cycle starts at the scope on which `$broadcast` was called. All
-+                     * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
-+                     * notified. Afterwards, the event propagates to all direct and indirect scopes of the current
-+                     * scope and calls all registered listeners along the way. The event cannot be canceled.
-+                     *
-+                     * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
-+                     * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
-+                     *
-+                     * @param {string} name Event name to broadcast.
-+                     * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
-+                     * @return {Object} Event object, see {@link ng.$rootScope.Scope#$on}
-+                     */
-+                    $broadcast: function(name, args) {
-+                        var target = this,
-+                            current = target,
-+                            next = target,
-+                            event = {
-+                                name: name,
-+                                targetScope: target,
-+                                preventDefault: function() {
-+                                    event.defaultPrevented = true;
-+                                },
-+                                defaultPrevented: false
-+                            };
-+
-+                        if (!target.$$listenerCount[name]) return event;
-+
-+                        var listenerArgs = concat([event], arguments, 1),
-+                            listeners, i, length;
-+
-+                        //down while you can, then up and next sibling or up and next sibling until back at root
-+                        while ((current = next)) {
-+                            event.currentScope = current;
-+                            listeners = current.$$listeners[name] || [];
-+                            for (i = 0, length = listeners.length; i < length; i++) {
-+                                // if listeners were deregistered, defragment the array
-+                                if (!listeners[i]) {
-+                                    listeners.splice(i, 1);
-+                                    i--;
-+                                    length--;
-+                                    continue;
-+                                }
-+
-+                                try {
-+                                    listeners[i].apply(null, listenerArgs);
-+                                } catch (e) {
-+                                    $exceptionHandler(e);
-+                                }
-+                            }
-+
-+                            // Insanity Warning: scope depth-first traversal
-+                            // yes, this code is a bit crazy, but it works and we have tests to prove it!
-+                            // this piece should be kept in sync with the traversal in $digest
-+                            // (though it differs due to having the extra check for $$listenerCount)
-+                            if (!(next = ((current.$$listenerCount[name] && current.$$childHead) ||
-+                                (current !== target && current.$$nextSibling)))) {
-+                                while (current !== target && !(next = current.$$nextSibling)) {
-+                                    current = current.$parent;
-+                                }
-+                            }
-+                        }
-+
-+                        event.currentScope = null;
-+                        return event;
-+                    }
-+                };
-+
-+                var $rootScope = new Scope();
-+
-+                //The internal queues. Expose them on the $rootScope for debugging/testing purposes.
-+                var asyncQueue = $rootScope.$$asyncQueue = [];
-+                var postDigestQueue = $rootScope.$$postDigestQueue = [];
-+                var applyAsyncQueue = $rootScope.$$applyAsyncQueue = [];
-+
-+                var postDigestQueuePosition = 0;
-+
-+                return $rootScope;
-+
-+
-+                function beginPhase(phase) {
-+                    if ($rootScope.$$phase) {
-+                        throw $rootScopeMinErr('inprog', '{0} already in progress', $rootScope.$$phase);
-+                    }
-+
-+                    $rootScope.$$phase = phase;
-+                }
-+
-+                function clearPhase() {
-+                    $rootScope.$$phase = null;
-+                }
-+
-+                function incrementWatchersCount(current, count) {
-+                    do {
-+                        current.$$watchersCount += count;
-+                    } while ((current = current.$parent));
-+                }
-+
-+                function decrementListenerCount(current, count, name) {
-+                    do {
-+                        current.$$listenerCount[name] -= count;
-+
-+                        if (current.$$listenerCount[name] === 0) {
-+                            delete current.$$listenerCount[name];
-+                        }
-+                    } while ((current = current.$parent));
-+                }
-+
-+                /**
-+                 * function used as an initial value for watchers.
-+                 * because it's unique we can easily tell it apart from other values
-+                 */
-+                function initWatchVal() {}
-+
-+                function flushApplyAsync() {
-+                    while (applyAsyncQueue.length) {
-+                        try {
-+                            applyAsyncQueue.shift()();
-+                        } catch (e) {
-+                            $exceptionHandler(e);
-+                        }
-+                    }
-+                    applyAsyncId = null;
-+                }
-+
-+                function scheduleApplyAsync() {
-+                    if (applyAsyncId === null) {
-+                        applyAsyncId = $browser.defer(function() {
-+                            $rootScope.$apply(flushApplyAsync);
-+                        });
-+                    }
-+                }
-+            }];
-+    }
-+
-+    /**
-+     * @ngdoc service
-+     * @name $rootElement
-+     *
-+     * @description
-+     * The root element of AngularJS application. This is either the element where {@link
-+        * ng.directive:ngApp ngApp} was declared or the element passed into
-+     * {@link angular.bootstrap}. The element represents the root element of application. It is also the
-+     * location where the application's {@link auto.$injector $injector} service gets
-+     * published, and can be retrieved using `$rootElement.injector()`.
-+     */
-+
-+
-+// the implementation is in angular.bootstrap
-+
-+    /**
-+     * @this
-+     * @description
-+     * Private service to sanitize uris for links and images. Used by $compile and $sanitize.
-+     */
-+    function $$SanitizeUriProvider() {
-+        var aHrefSanitizationWhitelist = /^\s*(https?|s?ftp|mailto|tel|file):/,
-+            imgSrcSanitizationWhitelist = /^\s*((https?|ftp|file|blob):|data:image\/)/;
-+
-+        /**
-+         * @description
-+         * Retrieves or overrides the default regular expression that is used for whitelisting of safe
-+         * urls during a[href] sanitization.
-+         *
-+         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
-+         *
-+         * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
-+         * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
-+         * regular expression. If a match is found, the original url is written into the dom. Otherwise,
-+         * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
-+         *
-+         * @param {RegExp=} regexp New regexp to whitelist urls with.
-+         * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
-+         *    chaining otherwise.
-+         */
-+        this.aHrefSanitizationWhitelist = function(regexp) {
-+            if (isDefined(regexp)) {
-+                aHrefSanitizationWhitelist = regexp;
-+                return this;
-+            }
-+            return aHrefSanitizationWhitelist;
-+        };
-+
-+
-+        /**
-+         * @description
-+         * Retrieves or overrides the default regular expression that is used for whitelisting of safe
-+         * urls during img[src] sanitization.
-+         *
-+         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
-+         *
-+         * Any url about to be assigned to img[src] via data-binding is first normalized and turned into
-+         * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist`
-+         * regular expression. If a match is found, the original url is written into the dom. Otherwise,
-+         * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
-+         *
-+         * @param {RegExp=} regexp New regexp to whitelist urls with.
-+         * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
-+         *    chaining otherwise.
-+         */
-+        this.imgSrcSanitizationWhitelist = function(regexp) {
-+            if (isDefined(regexp)) {
-+                imgSrcSanitizationWhitelist = regexp;
-+                return this;
-+            }
-+            return imgSrcSanitizationWhitelist;
-+        };
-+
-+        this.$get = function() {
-+            return function sanitizeUri(uri, isImage) {
-+                var regex = isImage ? imgSrcSanitizationWhitelist : aHrefSanitizationWhitelist;
-+                var normalizedVal;
-+                normalizedVal = urlResolve(uri && uri.trim()).href;
-+                if (normalizedVal !== '' && !normalizedVal.match(regex)) {
-+                    return 'unsafe:' + normalizedVal;
-+                }
-+                return uri;
-+            };
-+        };
-+    }
-+
-+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-+ *     Any commits to this file should be reviewed with security in mind.  *
-+ *   Changes to this file can potentially create security vulnerabilities. *
-+ *          An approval from 2 Core members with history of modifying      *
-+ *                         this file is required.                          *
-+ *                                                                         *
-+ *  Does the change somehow allow for arbitrary javascript to be executed? *
-+ *    Or allows for someone to change the prototype of built-in objects?   *
-+ *     Or gives undesired access to variables likes document or window?    *
-+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-+
-+    /* exported $SceProvider, $SceDelegateProvider */
-+
-+    var $sceMinErr = minErr('$sce');
-+
-+    var SCE_CONTEXTS = {
-+        // HTML is used when there's HTML rendered (e.g. ng-bind-html, iframe srcdoc binding).
-+        HTML: 'html',
-+
-+        // Style statements or stylesheets. Currently unused in AngularJS.
-+        CSS: 'css',
-+
-+        // An URL used in a context where it does not refer to a resource that loads code. Currently
-+        // unused in AngularJS.
-+        URL: 'url',
-+
-+        // RESOURCE_URL is a subtype of URL used where the referred-to resource could be interpreted as
-+        // code. (e.g. ng-include, script src binding, templateUrl)
-+        RESOURCE_URL: 'resourceUrl',
-+
-+        // Script. Currently unused in AngularJS.
-+        JS: 'js'
-+    };
-+
-+// Helper functions follow.
-+
-+    var UNDERSCORE_LOWERCASE_REGEXP = /_([a-z])/g;
-+
-+    function snakeToCamel(name) {
-+        return name
-+            .replace(UNDERSCORE_LOWERCASE_REGEXP, fnCamelCaseReplace);
-+    }
-+
-+    function adjustMatcher(matcher) {
-+        if (matcher === 'self') {
-+            return matcher;
-+        } else if (isString(matcher)) {
-+            // Strings match exactly except for 2 wildcards - '*' and '**'.
-+            // '*' matches any character except those from the set ':/.?&'.
-+            // '**' matches any character (like .* in a RegExp).
-+            // More than 2 *'s raises an error as it's ill defined.
-+            if (matcher.indexOf('***') > -1) {
-+                throw $sceMinErr('iwcard',
-+                    'Illegal sequence *** in string matcher.  String: {0}', matcher);
-+            }
-+            matcher = escapeForRegexp(matcher).
-+            replace(/\\\*\\\*/g, '.*').
-+            replace(/\\\*/g, '[^:/.?&;]*');
-+            return new RegExp('^' + matcher + '$');
-+        } else if (isRegExp(matcher)) {
-+            // The only other type of matcher allowed is a Regexp.
-+            // Match entire URL / disallow partial matches.
-+            // Flags are reset (i.e. no global, ignoreCase or multiline)
-+            return new RegExp('^' + matcher.source + '$');
-+        } else {
-+            throw $sceMinErr('imatcher',
-+                'Matchers may only be "self", string patterns or RegExp objects');
-+        }
-+    }
-+
-+
-+    function adjustMatchers(matchers) {
-+        var adjustedMatchers = [];
-+        if (isDefined(matchers)) {
-+            forEach(matchers, function(matcher) {
-+                adjustedMatchers.push(adjustMatcher(matcher));
-+            });
-+        }
-+        return adjustedMatchers;
-+    }
-+
-+
-+    /**
-+     * @ngdoc service
-+     * @name $sceDelegate
-+     * @kind function
-+     *
-+     * @description
-+     *
-+     * `$sceDelegate` is a service that is used by the `$sce` service to provide {@link ng.$sce Strict
-+ * Contextual Escaping (SCE)} services to AngularJS.
-+     *
-+     * For an overview of this service and the functionnality it provides in AngularJS, see the main
-+     * page for {@link ng.$sce SCE}. The current page is targeted for developers who need to alter how
-+     * SCE works in their application, which shouldn't be needed in most cases.
-+     *
-+     * <div class="alert alert-danger">
-+     * AngularJS strongly relies on contextual escaping for the security of bindings: disabling or
-+     * modifying this might cause cross site scripting (XSS) vulnerabilities. For libraries owners,
-+     * changes to this service will also influence users, so be extra careful and document your changes.
-+     * </div>
-+     *
-+     * Typically, you would configure or override the {@link ng.$sceDelegate $sceDelegate} instead of
-+     * the `$sce` service to customize the way Strict Contextual Escaping works in AngularJS.  This is
-+     * because, while the `$sce` provides numerous shorthand methods, etc., you really only need to
-+     * override 3 core functions (`trustAs`, `getTrusted` and `valueOf`) to replace the way things
-+     * work because `$sce` delegates to `$sceDelegate` for these operations.
-+     *
-+     * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} to configure this service.
-+     *
-+     * The default instance of `$sceDelegate` should work out of the box with little pain.  While you
-+     * can override it completely to change the behavior of `$sce`, the common case would
-+     * involve configuring the {@link ng.$sceDelegateProvider $sceDelegateProvider} instead by setting
-+     * your own whitelists and blacklists for trusting URLs used for loading AngularJS resources such as
-+     * templates.  Refer {@link ng.$sceDelegateProvider#resourceUrlWhitelist
-+ * $sceDelegateProvider.resourceUrlWhitelist} and {@link
-+        * ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
-+     */
-+
-+    /**
-+     * @ngdoc provider
-+     * @name $sceDelegateProvider
-+     * @this
-+     *
-+     * @description
-+     *
-+     * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate
-+ * $sceDelegate service}, used as a delegate for {@link ng.$sce Strict Contextual Escaping (SCE)}.
-+     *
-+     * The `$sceDelegateProvider` allows one to get/set the whitelists and blacklists used to ensure
-+     * that the URLs used for sourcing AngularJS templates and other script-running URLs are safe (all
-+     * places that use the `$sce.RESOURCE_URL` context). See
-+     * {@link ng.$sceDelegateProvider#resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist}
-+     * and
-+     * {@link ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist},
-+     *
-+     * For the general details about this service in AngularJS, read the main page for {@link ng.$sce
-+ * Strict Contextual Escaping (SCE)}.
-+     *
-+     * **Example**:  Consider the following case. <a name="example"></a>
-+     *
-+     * - your app is hosted at url `http://myapp.example.com/`
-+     * - but some of your templates are hosted on other domains you control such as
-+     *   `http://srv01.assets.example.com/`, `http://srv02.assets.example.com/`, etc.
-+     * - and you have an open redirect at `http://myapp.example.com/clickThru?...`.
-+     *
-+     * Here is what a secure configuration for this scenario might look like:
-+     *
-+     * ```
-+     *  angular.module('myApp', []).config(function($sceDelegateProvider) {
-+     *    $sceDelegateProvider.resourceUrlWhitelist([
-+     *      // Allow same origin resource loads.
-+     *      'self',
-+     *      // Allow loading from our assets domain.  Notice the difference between * and **.
-+     *      'http://srv*.assets.example.com/**'
-+     *    ]);
-+     *
-+     *    // The blacklist overrides the whitelist so the open redirect here is blocked.
-+     *    $sceDelegateProvider.resourceUrlBlacklist([
-+     *      'http://myapp.example.com/clickThru**'
-+     *    ]);
-+     *  });
-+     * ```
-+     * Note that an empty whitelist will block every resource URL from being loaded, and will require
-+     * you to manually mark each one as trusted with `$sce.trustAsResourceUrl`. However, templates
-+     * requested by {@link ng.$templateRequest $templateRequest} that are present in
-+     * {@link ng.$templateCache $templateCache} will not go through this check. If you have a mechanism
-+     * to populate your templates in that cache at config time, then it is a good idea to remove 'self'
-+     * from that whitelist. This helps to mitigate the security impact of certain types of issues, like
-+     * for instance attacker-controlled `ng-includes`.
-+     */
-+
-+    function $SceDelegateProvider() {
-+        this.SCE_CONTEXTS = SCE_CONTEXTS;
-+
-+        // Resource URLs can also be trusted by policy.
-+        var resourceUrlWhitelist = ['self'],
-+            resourceUrlBlacklist = [];
-+
-+        /**
-+         * @ngdoc method
-+         * @name $sceDelegateProvider#resourceUrlWhitelist
-+         * @kind function
-+         *
-+         * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value
-+         *     provided.  This must be an array or null.  A snapshot of this array is used so further
-+         *     changes to the array are ignored.
-+         *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
-+         *     allowed in this array.
-+         *
-+         * @return {Array} The currently set whitelist array.
-+         *
-+         * @description
-+         * Sets/Gets the whitelist of trusted resource URLs.
-+         *
-+         * The **default value** when no whitelist has been explicitly set is `['self']` allowing only
-+         * same origin resource requests.
-+         *
-+         * <div class="alert alert-warning">
-+         * **Note:** the default whitelist of 'self' is not recommended if your app shares its origin
-+         * with other apps! It is a good idea to limit it to only your application's directory.
-+         * </div>
-+         */
-+        this.resourceUrlWhitelist = function(value) {
-+            if (arguments.length) {
-+                resourceUrlWhitelist = adjustMatchers(value);
-+            }
-+            return resourceUrlWhitelist;
-+        };
-+
-+        /**
-+         * @ngdoc method
-+         * @name $sceDelegateProvider#resourceUrlBlacklist
-+         * @kind function
-+         *
-+         * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value
-+         *     provided.  This must be an array or null.  A snapshot of this array is used so further
-+         *     changes to the array are ignored.</p><p>
-+         *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
-+         *     allowed in this array.</p><p>
-+         *     The typical usage for the blacklist is to **block
-+         *     [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as
-+         *     these would otherwise be trusted but actually return content from the redirected domain.
-+         *     </p><p>
-+         *     Finally, **the blacklist overrides the whitelist** and has the final say.
-+         *
-+         * @return {Array} The currently set blacklist array.
-+         *
-+         * @description
-+         * Sets/Gets the blacklist of trusted resource URLs.
-+         *
-+         * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there
-+         * is no blacklist.)
-+         */
-+
-+        this.resourceUrlBlacklist = function(value) {
-+            if (arguments.length) {
-+                resourceUrlBlacklist = adjustMatchers(value);
-+            }
-+            return resourceUrlBlacklist;
-+        };
-+
-+        this.$get = ['$injector', function($injector) {
-+
-+            var htmlSanitizer = function htmlSanitizer(html) {
-+                throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
-+            };
-+
-+            if ($injector.has('$sanitize')) {
-+                htmlSanitizer = $injector.get('$sanitize');
-+            }
-+
-+
-+            function matchUrl(matcher, parsedUrl) {
-+                if (matcher === 'self') {
-+                    return urlIsSameOrigin(parsedUrl);
-+                } else {
-+                    // definitely a regex.  See adjustMatchers()
-+                    return !!matcher.exec(parsedUrl.href);
-+                }
-+            }
-+
-+            function isResourceUrlAllowedByPolicy(url) {
-+                var parsedUrl = urlResolve(url.toString());
-+                var i, n, allowed = false;
-+                // Ensure that at least one item from the whitelist allows this url.
-+                for (i = 0, n = resourceUrlWhitelist.length; i < n; i++) {
-+                    if (matchUrl(resourceUrlWhitelist[i], parsedUrl)) {
-+                        allowed = true;
-+                        break;
-+                    }
-+                }
-+                if (allowed) {
-+                    // Ensure that no item from the blacklist blocked this url.
-+                    for (i = 0, n = resourceUrlBlacklist.length; i < n; i++) {
-+                        if (matchUrl(resourceUrlBlacklist[i], parsedUrl)) {
-+                            allowed = false;
-+                            break;
-+                        }
-+                    }
-+                }
-+                return allowed;
-+            }
-+
-+            function generateHolderType(Base) {
-+                var holderType = function TrustedValueHolderType(trustedValue) {
-+                    this.$$unwrapTrustedValue = function() {
-+                        return trustedValue;
-+                    };
-+                };
-+                if (Base) {
-+                    holderType.prototype = new Base();
-+                }
-+                holderType.prototype.valueOf = function sceValueOf() {
-+                    return this.$$unwrapTrustedValue();
-+                };
-+                holderType.prototype.toString = function sceToString() {
-+                    return this.$$unwrapTrustedValue().toString();
-+                };
-+                return holderType;
-+            }
-+
-+            var trustedValueHolderBase = generateHolderType(),
-+                byType = {};
-+
-+            byType[SCE_CONTEXTS.HTML] = generateHolderType(trustedValueHolderBase);
-+            byType[SCE_CONTEXTS.CSS] = generateHolderType(trustedValueHolderBase);
-+            byType[SCE_CONTEXTS.URL] = generateHolderType(trustedValueHolderBase);
-+            byType[SCE_CONTEXTS.JS] = generateHolderType(trustedValueHolderBase);
-+            byType[SCE_CONTEXTS.RESOURCE_URL] = generateHolderType(byType[SCE_CONTEXTS.URL]);
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sceDelegate#trustAs
-+             *
-+             * @description
-+             * Returns a trusted representation of the parameter for the specified context. This trusted
-+             * object will later on be used as-is, without any security check, by bindings or directives
-+             * that require this security context.
-+             * For instance, marking a string as trusted for the `$sce.HTML` context will entirely bypass
-+             * the potential `$sanitize` call in corresponding `$sce.HTML` bindings or directives, such as
-+             * `ng-bind-html`. Note that in most cases you won't need to call this function: if you have the
-+             * sanitizer loaded, passing the value itself will render all the HTML that does not pose a
-+             * security risk.
-+             *
-+             * See {@link ng.$sceDelegate#getTrusted getTrusted} for the function that will consume those
-+             * trusted values, and {@link ng.$sce $sce} for general documentation about strict contextual
-+             * escaping.
-+             *
-+             * @param {string} type The context in which this value is safe for use, e.g. `$sce.URL`,
-+             *     `$sce.RESOURCE_URL`, `$sce.HTML`, `$sce.JS` or `$sce.CSS`.
-+             *
-+             * @param {*} value The value that should be considered trusted.
-+             * @return {*} A trusted representation of value, that can be used in the given context.
-+             */
-+            function trustAs(type, trustedValue) {
-+                var Constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
-+                if (!Constructor) {
-+                    throw $sceMinErr('icontext',
-+                        'Attempted to trust a value in invalid context. Context: {0}; Value: {1}',
-+                        type, trustedValue);
-+                }
-+                if (trustedValue === null || isUndefined(trustedValue) || trustedValue === '') {
-+                    return trustedValue;
-+                }
-+                // All the current contexts in SCE_CONTEXTS happen to be strings.  In order to avoid trusting
-+                // mutable objects, we ensure here that the value passed in is actually a string.
-+                if (typeof trustedValue !== 'string') {
-+                    throw $sceMinErr('itype',
-+                        'Attempted to trust a non-string value in a content requiring a string: Context: {0}',
-+                        type);
-+                }
-+                return new Constructor(trustedValue);
-+            }
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sceDelegate#valueOf
-+             *
-+             * @description
-+             * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#trustAs
-+     * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link
-+                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.
-+             *
-+             * If the passed parameter is not a value that had been returned by {@link
-+                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}, it must be returned as-is.
-+             *
-+             * @param {*} value The result of a prior {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}
-+             *     call or anything else.
-+             * @return {*} The `value` that was originally provided to {@link ng.$sceDelegate#trustAs
-+     *     `$sceDelegate.trustAs`} if `value` is the result of such a call.  Otherwise, returns
-+             *     `value` unchanged.
-+             */
-+            function valueOf(maybeTrusted) {
-+                if (maybeTrusted instanceof trustedValueHolderBase) {
-+                    return maybeTrusted.$$unwrapTrustedValue();
-+                } else {
-+                    return maybeTrusted;
-+                }
-+            }
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sceDelegate#getTrusted
-+             *
-+             * @description
-+             * Takes any input, and either returns a value that's safe to use in the specified context, or
-+             * throws an exception.
-+             *
-+             * In practice, there are several cases. When given a string, this function runs checks
-+             * and sanitization to make it safe without prior assumptions. When given the result of a {@link
-+                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} call, it returns the originally supplied
-+             * value if that value's context is valid for this call's context. Finally, this function can
-+             * also throw when there is no way to turn `maybeTrusted` in a safe value (e.g., no sanitization
-+             * is available or possible.)
-+             *
-+             * @param {string} type The context in which this value is to be used (such as `$sce.HTML`).
-+             * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#trustAs
-+     *     `$sceDelegate.trustAs`} call, or anything else (which will not be considered trusted.)
-+             * @return {*} A version of the value that's safe to use in the given context, or throws an
-+             *     exception if this is impossible.
-+             */
-+            function getTrusted(type, maybeTrusted) {
-+                if (maybeTrusted === null || isUndefined(maybeTrusted) || maybeTrusted === '') {
-+                    return maybeTrusted;
-+                }
-+                var constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
-+                // If maybeTrusted is a trusted class instance or subclass instance, then unwrap and return
-+                // as-is.
-+                if (constructor && maybeTrusted instanceof constructor) {
-+                    return maybeTrusted.$$unwrapTrustedValue();
-+                }
-+                // Otherwise, if we get here, then we may either make it safe, or throw an exception. This
-+                // depends on the context: some are sanitizatible (HTML), some use whitelists (RESOURCE_URL),
-+                // some are impossible to do (JS). This step isn't implemented for CSS and URL, as AngularJS
-+                // has no corresponding sinks.
-+                if (type === SCE_CONTEXTS.RESOURCE_URL) {
-+                    // RESOURCE_URL uses a whitelist.
-+                    if (isResourceUrlAllowedByPolicy(maybeTrusted)) {
-+                        return maybeTrusted;
-+                    } else {
-+                        throw $sceMinErr('insecurl',
-+                            'Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}',
-+                            maybeTrusted.toString());
-+                    }
-+                } else if (type === SCE_CONTEXTS.HTML) {
-+                    // htmlSanitizer throws its own error when no sanitizer is available.
-+                    return htmlSanitizer(maybeTrusted);
-+                }
-+                // Default error when the $sce service has no way to make the input safe.
-+                throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
-+            }
-+
-+            return { trustAs: trustAs,
-+                getTrusted: getTrusted,
-+                valueOf: valueOf };
-+        }];
-+    }
-+
-+
-+    /**
-+     * @ngdoc provider
-+     * @name $sceProvider
-+     * @this
-+     *
-+     * @description
-+     *
-+     * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service.
-+     * -   enable/disable Strict Contextual Escaping (SCE) in a module
-+     * -   override the default implementation with a custom delegate
-+     *
-+     * Read more about {@link ng.$sce Strict Contextual Escaping (SCE)}.
-+     */
-+
-+    /**
-+     * @ngdoc service
-+     * @name $sce
-+     * @kind function
-+     *
-+     * @description
-+     *
-+     * `$sce` is a service that provides Strict Contextual Escaping services to AngularJS.
-+     *
-+     * ## Strict Contextual Escaping
-+     *
-+     * Strict Contextual Escaping (SCE) is a mode in which AngularJS constrains bindings to only render
-+     * trusted values. Its goal is to assist in writing code in a way that (a) is secure by default, and
-+     * (b) makes auditing for security vulnerabilities such as XSS, clickjacking, etc. a lot easier.
-+     *
-+     * ### Overview
-+     *
-+     * To systematically block XSS security bugs, AngularJS treats all values as untrusted by default in
-+     * HTML or sensitive URL bindings. When binding untrusted values, AngularJS will automatically
-+     * run security checks on them (sanitizations, whitelists, depending on context), or throw when it
-+     * cannot guarantee the security of the result. That behavior depends strongly on contexts: HTML
-+     * can be sanitized, but template URLs cannot, for instance.
-+     *
-+     * To illustrate this, consider the `ng-bind-html` directive. It renders its value directly as HTML:
-+     * we call that the *context*. When given an untrusted input, AngularJS will attempt to sanitize it
-+     * before rendering if a sanitizer is available, and throw otherwise. To bypass sanitization and
-+     * render the input as-is, you will need to mark it as trusted for that context before attempting
-+     * to bind it.
-+     *
-+     * As of version 1.2, AngularJS ships with SCE enabled by default.
-+     *
-+     * ### In practice
-+     *
-+     * Here's an example of a binding in a privileged context:
-+     *
-+     * ```
-+     * <input ng-model="userHtml" aria-label="User input">
-+     * <div ng-bind-html="userHtml"></div>
-+     * ```
-+     *
-+     * Notice that `ng-bind-html` is bound to `userHtml` controlled by the user.  With SCE
-+     * disabled, this application allows the user to render arbitrary HTML into the DIV, which would
-+     * be an XSS security bug. In a more realistic example, one may be rendering user comments, blog
-+     * articles, etc. via bindings. (HTML is just one example of a context where rendering user
-+     * controlled input creates security vulnerabilities.)
-+     *
-+     * For the case of HTML, you might use a library, either on the client side, or on the server side,
-+     * to sanitize unsafe HTML before binding to the value and rendering it in the document.
-+     *
-+     * How would you ensure that every place that used these types of bindings was bound to a value that
-+     * was sanitized by your library (or returned as safe for rendering by your server?)  How can you
-+     * ensure that you didn't accidentally delete the line that sanitized the value, or renamed some
-+     * properties/fields and forgot to update the binding to the sanitized value?
-+     *
-+     * To be secure by default, AngularJS makes sure bindings go through that sanitization, or
-+     * any similar validation process, unless there's a good reason to trust the given value in this
-+     * context.  That trust is formalized with a function call. This means that as a developer, you
-+     * can assume all untrusted bindings are safe. Then, to audit your code for binding security issues,
-+     * you just need to ensure the values you mark as trusted indeed are safe - because they were
-+     * received from your server, sanitized by your library, etc. You can organize your codebase to
-+     * help with this - perhaps allowing only the files in a specific directory to do this.
-+     * Ensuring that the internal API exposed by that code doesn't markup arbitrary values as safe then
-+     * becomes a more manageable task.
-+     *
-+     * In the case of AngularJS' SCE service, one uses {@link ng.$sce#trustAs $sce.trustAs}
-+     * (and shorthand methods such as {@link ng.$sce#trustAsHtml $sce.trustAsHtml}, etc.) to
-+     * build the trusted versions of your values.
-+     *
-+     * ### How does it work?
-+     *
-+     * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#getTrusted
-+ * $sce.getTrusted(context, value)} rather than to the value directly.  Think of this function as
-+     * a way to enforce the required security context in your data sink. Directives use {@link
-+        * ng.$sce#parseAs $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs
-+     * the {@link ng.$sce#getTrusted $sce.getTrusted} behind the scenes on non-constant literals. Also,
-+     * when binding without directives, AngularJS will understand the context of your bindings
-+     * automatically.
-+     *
-+     * As an example, {@link ng.directive:ngBindHtml ngBindHtml} uses {@link
-+        * ng.$sce#parseAsHtml $sce.parseAsHtml(binding expression)}.  Here's the actual code (slightly
-+     * simplified):
-+     *
-+     * ```
-+     * var ngBindHtmlDirective = ['$sce', function($sce) {
-+     *   return function(scope, element, attr) {
-+     *     scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) {
-+     *       element.html(value || '');
-+     *     });
-+     *   };
-+     * }];
-+     * ```
-+     *
-+     * ### Impact on loading templates
-+     *
-+     * This applies both to the {@link ng.directive:ngInclude `ng-include`} directive as well as
-+     * `templateUrl`'s specified by {@link guide/directive directives}.
-+     *
-+     * By default, AngularJS only loads templates from the same domain and protocol as the application
-+     * document.  This is done by calling {@link ng.$sce#getTrustedResourceUrl
-+ * $sce.getTrustedResourceUrl} on the template URL.  To load templates from other domains and/or
-+     * protocols, you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist
-+ * them} or {@link ng.$sce#trustAsResourceUrl wrap it} into a trusted value.
-+     *
-+     * *Please note*:
-+     * The browser's
-+     * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
-+     * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
-+     * policy apply in addition to this and may further restrict whether the template is successfully
-+     * loaded.  This means that without the right CORS policy, loading templates from a different domain
-+     * won't work on all browsers.  Also, loading templates from `file://` URL does not work on some
-+     * browsers.
-+     *
-+     * ### This feels like too much overhead
-+     *
-+     * It's important to remember that SCE only applies to interpolation expressions.
-+     *
-+     * If your expressions are constant literals, they're automatically trusted and you don't need to
-+     * call `$sce.trustAs` on them (e.g.
-+     * `<div ng-bind-html="'<b>implicitly trusted</b>'"></div>`) just works. The `$sceDelegate` will
-+     * also use the `$sanitize` service if it is available when binding untrusted values to
-+     * `$sce.HTML` context. AngularJS provides an implementation in `angular-sanitize.js`, and if you
-+     * wish to use it, you will also need to depend on the {@link ngSanitize `ngSanitize`} module in
-+     * your application.
-+     *
-+     * The included {@link ng.$sceDelegate $sceDelegate} comes with sane defaults to allow you to load
-+     * templates in `ng-include` from your application's domain without having to even know about SCE.
-+     * It blocks loading templates from other domains or loading templates over http from an https
-+     * served document.  You can change these by setting your own custom {@link
-+        * ng.$sceDelegateProvider#resourceUrlWhitelist whitelists} and {@link
-+        * ng.$sceDelegateProvider#resourceUrlBlacklist blacklists} for matching such URLs.
-+     *
-+     * This significantly reduces the overhead.  It is far easier to pay the small overhead and have an
-+     * application that's secure and can be audited to verify that with much more ease than bolting
-+     * security onto an application later.
-+     *
-+     * <a name="contexts"></a>
-+     * ### What trusted context types are supported?
-+     *
-+     * | Context             | Notes          |
-+     * |---------------------|----------------|
-+     * | `$sce.HTML`         | For HTML that's safe to source into the application.  The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. If an unsafe value is encountered, and the {@link ngSanitize.$sanitize $sanitize} service is available (implemented by the {@link ngSanitize ngSanitize} module) this will sanitize the value instead of throwing an error. |
-+     * | `$sce.CSS`          | For CSS that's safe to source into the application.  Currently, no bindings require this context. Feel free to use it in your own directives. |
-+     * | `$sce.URL`          | For URLs that are safe to follow as links.  Currently unused (`<a href=`, `<img src=`, and some others sanitize their urls and don't constitute an SCE context.) |
-+     * | `$sce.RESOURCE_URL` | For URLs that are not only safe to follow as links, but whose contents are also safe to include in your application.  Examples include `ng-include`, `src` / `ngSrc` bindings for tags other than `IMG`, `VIDEO`, `AUDIO`, `SOURCE`, and `TRACK` (e.g. `IFRAME`, `OBJECT`, etc.)  <br><br>Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does (it's not just the URL that matters, but also what is at the end of it), and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. |
-+     * | `$sce.JS`           | For JavaScript that is safe to execute in your application's context.  Currently, no bindings require this context.  Feel free to use it in your own directives. |
-+     *
-+     *
-+     * Be aware that `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them
-+     * through {@link ng.$sce#getTrusted $sce.getTrusted}. There's no CSS-, URL-, or JS-context bindings
-+     * in AngularJS currently, so their corresponding `$sce.trustAs` functions aren't useful yet. This
-+     * might evolve.
-+     *
-+     * ### Format of items in {@link ng.$sceDelegateProvider#resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#resourceUrlBlacklist Blacklist} <a name="resourceUrlPatternItem"></a>
-+     *
-+     *  Each element in these arrays must be one of the following:
-+     *
-+     *  - **'self'**
-+     *    - The special **string**, `'self'`, can be used to match against all URLs of the **same
-+     *      domain** as the application document using the **same protocol**.
-+     *  - **String** (except the special value `'self'`)
-+     *    - The string is matched against the full *normalized / absolute URL* of the resource
-+     *      being tested (substring matches are not good enough.)
-+     *    - There are exactly **two wildcard sequences** - `*` and `**`.  All other characters
-+     *      match themselves.
-+     *    - `*`: matches zero or more occurrences of any character other than one of the following 6
-+     *      characters: '`:`', '`/`', '`.`', '`?`', '`&`' and '`;`'.  It's a useful wildcard for use
-+     *      in a whitelist.
-+     *    - `**`: matches zero or more occurrences of *any* character.  As such, it's not
-+     *      appropriate for use in a scheme, domain, etc. as it would match too much.  (e.g.
-+     *      http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might
-+     *      not have been the intention.)  Its usage at the very end of the path is ok.  (e.g.
-+     *      http://foo.example.com/templates/**).
-+     *  - **RegExp** (*see caveat below*)
-+     *    - *Caveat*:  While regular expressions are powerful and offer great flexibility,  their syntax
-+     *      (and all the inevitable escaping) makes them *harder to maintain*.  It's easy to
-+     *      accidentally introduce a bug when one updates a complex expression (imho, all regexes should
-+     *      have good test coverage).  For instance, the use of `.` in the regex is correct only in a
-+     *      small number of cases.  A `.` character in the regex used when matching the scheme or a
-+     *      subdomain could be matched against a `:` or literal `.` that was likely not intended.   It
-+     *      is highly recommended to use the string patterns and only fall back to regular expressions
-+     *      as a last resort.
-+     *    - The regular expression must be an instance of RegExp (i.e. not a string.)  It is
-+     *      matched against the **entire** *normalized / absolute URL* of the resource being tested
-+     *      (even when the RegExp did not have the `^` and `$` codes.)  In addition, any flags
-+     *      present on the RegExp (such as multiline, global, ignoreCase) are ignored.
-+     *    - If you are generating your JavaScript from some other templating engine (not
-+     *      recommended, e.g. in issue [#4006](https://github.com/angular/angular.js/issues/4006)),
-+     *      remember to escape your regular expression (and be aware that you might need more than
-+     *      one level of escaping depending on your templating engine and the way you interpolated
-+     *      the value.)  Do make use of your platform's escaping mechanism as it might be good
-+     *      enough before coding your own.  E.g. Ruby has
-+     *      [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape)
-+     *      and Python has [re.escape](http://docs.python.org/library/re.html#re.escape).
-+     *      Javascript lacks a similar built in function for escaping.  Take a look at Google
-+     *      Closure library's [goog.string.regExpEscape(s)](
-+     *      http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962).
-+     *
-+     * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} for an example.
-+     *
-+     * ### Show me an example using SCE.
-+     *
-+     * <example module="mySceApp" deps="angular-sanitize.js" name="sce-service">
-+     * <file name="index.html">
-+     *   <div ng-controller="AppController as myCtrl">
-+     *     <i ng-bind-html="myCtrl.explicitlyTrustedHtml" id="explicitlyTrustedHtml"></i><br><br>
-+     *     <b>User comments</b><br>
-+     *     By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when
-+     *     $sanitize is available.  If $sanitize isn't available, this results in an error instead of an
-+     *     exploit.
-+     *     <div class="well">
-+     *       <div ng-repeat="userComment in myCtrl.userComments">
-+     *         <b>{{userComment.name}}</b>:
-+     *         <span ng-bind-html="userComment.htmlComment" class="htmlComment"></span>
-+     *         <br>
-+     *       </div>
-+     *     </div>
-+     *   </div>
-+     * </file>
-+     *
-+     * <file name="script.js">
-+     *   angular.module('mySceApp', ['ngSanitize'])
-+     *     .controller('AppController', ['$http', '$templateCache', '$sce',
-+     *       function AppController($http, $templateCache, $sce) {
-+     *         var self = this;
-+     *         $http.get('test_data.json', {cache: $templateCache}).then(function(response) {
-+     *           self.userComments = response.data;
-+     *         });
-+     *         self.explicitlyTrustedHtml = $sce.trustAsHtml(
-+     *             '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
-+     *             'sanitization.&quot;">Hover over this text.</span>');
-+     *       }]);
-+     * </file>
-+     *
-+     * <file name="test_data.json">
-+     * [
-+     *   { "name": "Alice",
-+     *     "htmlComment":
-+     *         "<span onmouseover='this.textContent=\"PWN3D!\"'>Is <i>anyone</i> reading this?</span>"
-+     *   },
-+     *   { "name": "Bob",
-+     *     "htmlComment": "<i>Yes!</i>  Am I the only other one?"
-+     *   }
-+     * ]
-+     * </file>
-+     *
-+     * <file name="protractor.js" type="protractor">
-+     *   describe('SCE doc demo', function() {
-+     *     it('should sanitize untrusted values', function() {
-+     *       expect(element.all(by.css('.htmlComment')).first().getAttribute('innerHTML'))
-+     *           .toBe('<span>Is <i>anyone</i> reading this?</span>');
-+     *     });
-+     *
-+     *     it('should NOT sanitize explicitly trusted values', function() {
-+     *       expect(element(by.id('explicitlyTrustedHtml')).getAttribute('innerHTML')).toBe(
-+     *           '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
-+     *           'sanitization.&quot;">Hover over this text.</span>');
-+     *     });
-+     *   });
-+     * </file>
-+     * </example>
-+     *
-+     *
-+     *
-+     * ## Can I disable SCE completely?
-+     *
-+     * Yes, you can.  However, this is strongly discouraged.  SCE gives you a lot of security benefits
-+     * for little coding overhead.  It will be much harder to take an SCE disabled application and
-+     * either secure it on your own or enable SCE at a later stage.  It might make sense to disable SCE
-+     * for cases where you have a lot of existing code that was written before SCE was introduced and
-+     * you're migrating them a module at a time. Also do note that this is an app-wide setting, so if
-+     * you are writing a library, you will cause security bugs applications using it.
-+     *
-+     * That said, here's how you can completely disable SCE:
-+     *
-+     * ```
-+     * angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) {
-+     *   // Completely disable SCE.  For demonstration purposes only!
-+     *   // Do not use in new projects or libraries.
-+     *   $sceProvider.enabled(false);
-+     * });
-+     * ```
-+     *
-+     */
-+
-+    function $SceProvider() {
-+        var enabled = true;
-+
-+        /**
-+         * @ngdoc method
-+         * @name $sceProvider#enabled
-+         * @kind function
-+         *
-+         * @param {boolean=} value If provided, then enables/disables SCE application-wide.
-+         * @return {boolean} True if SCE is enabled, false otherwise.
-+         *
-+         * @description
-+         * Enables/disables SCE and returns the current value.
-+         */
-+        this.enabled = function(value) {
-+            if (arguments.length) {
-+                enabled = !!value;
-+            }
-+            return enabled;
-+        };
-+
-+
-+        /* Design notes on the default implementation for SCE.
-+   *
-+   * The API contract for the SCE delegate
-+   * -------------------------------------
-+   * The SCE delegate object must provide the following 3 methods:
-+   *
-+   * - trustAs(contextEnum, value)
-+   *     This method is used to tell the SCE service that the provided value is OK to use in the
-+   *     contexts specified by contextEnum.  It must return an object that will be accepted by
-+   *     getTrusted() for a compatible contextEnum and return this value.
-+   *
-+   * - valueOf(value)
-+   *     For values that were not produced by trustAs(), return them as is.  For values that were
-+   *     produced by trustAs(), return the corresponding input value to trustAs.  Basically, if
-+   *     trustAs is wrapping the given values into some type, this operation unwraps it when given
-+   *     such a value.
-+   *
-+   * - getTrusted(contextEnum, value)
-+   *     This function should return the a value that is safe to use in the context specified by
-+   *     contextEnum or throw and exception otherwise.
-+   *
-+   * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be
-+   * opaque or wrapped in some holder object.  That happens to be an implementation detail.  For
-+   * instance, an implementation could maintain a registry of all trusted objects by context.  In
-+   * such a case, trustAs() would return the same object that was passed in.  getTrusted() would
-+   * return the same object passed in if it was found in the registry under a compatible context or
-+   * throw an exception otherwise.  An implementation might only wrap values some of the time based
-+   * on some criteria.  getTrusted() might return a value and not throw an exception for special
-+   * constants or objects even if not wrapped.  All such implementations fulfill this contract.
-+   *
-+   *
-+   * A note on the inheritance model for SCE contexts
-+   * ------------------------------------------------
-+   * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types.  This
-+   * is purely an implementation details.
-+   *
-+   * The contract is simply this:
-+   *
-+   *     getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value)
-+   *     will also succeed.
-+   *
-+   * Inheritance happens to capture this in a natural way. In some future, we may not use
-+   * inheritance anymore. That is OK because no code outside of sce.js and sceSpecs.js would need to
-+   * be aware of this detail.
-+   */
-+
-+        this.$get = ['$parse', '$sceDelegate', function(
-+            $parse,   $sceDelegate) {
-+            // Support: IE 9-11 only
-+            // Prereq: Ensure that we're not running in IE<11 quirks mode.  In that mode, IE < 11 allow
-+            // the "expression(javascript expression)" syntax which is insecure.
-+            if (enabled && msie < 8) {
-+                throw $sceMinErr('iequirks',
-+                    'Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks ' +
-+                    'mode.  You can fix this by adding the text <!doctype html> to the top of your HTML ' +
-+                    'document.  See http://docs.angularjs.org/api/ng.$sce for more information.');
-+            }
-+
-+            var sce = shallowCopy(SCE_CONTEXTS);
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#isEnabled
-+             * @kind function
-+             *
-+             * @return {Boolean} True if SCE is enabled, false otherwise.  If you want to set the value, you
-+             *     have to do it at module config time on {@link ng.$sceProvider $sceProvider}.
-+             *
-+             * @description
-+             * Returns a boolean indicating if SCE is enabled.
-+             */
-+            sce.isEnabled = function() {
-+                return enabled;
-+            };
-+            sce.trustAs = $sceDelegate.trustAs;
-+            sce.getTrusted = $sceDelegate.getTrusted;
-+            sce.valueOf = $sceDelegate.valueOf;
-+
-+            if (!enabled) {
-+                sce.trustAs = sce.getTrusted = function(type, value) { return value; };
-+                sce.valueOf = identity;
-+            }
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#parseAs
-+             *
-+             * @description
-+             * Converts AngularJS {@link guide/expression expression} into a function.  This is like {@link
-+                * ng.$parse $parse} and is identical when the expression is a literal constant.  Otherwise, it
-+             * wraps the expression in a call to {@link ng.$sce#getTrusted $sce.getTrusted(*type*,
-+     * *result*)}
-+             *
-+             * @param {string} type The SCE context in which this result will be used.
-+             * @param {string} expression String expression to compile.
-+             * @return {function(context, locals)} A function which represents the compiled expression:
-+             *
-+             *    * `context` – `{object}` – an object against which any expressions embedded in the
-+             *      strings are evaluated against (typically a scope object).
-+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
-+             *      in `context`.
-+             */
-+            sce.parseAs = function sceParseAs(type, expr) {
-+                var parsed = $parse(expr);
-+                if (parsed.literal && parsed.constant) {
-+                    return parsed;
-+                } else {
-+                    return $parse(expr, function(value) {
-+                        return sce.getTrusted(type, value);
-+                    });
-+                }
-+            };
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#trustAs
-+             *
-+             * @description
-+             * Delegates to {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}. As such, returns a
-+             * wrapped object that represents your value, and the trust you have in its safety for the given
-+             * context. AngularJS can then use that value as-is in bindings of the specified secure context.
-+             * This is used in bindings for `ng-bind-html`, `ng-include`, and most `src` attribute
-+             * interpolations. See {@link ng.$sce $sce} for strict contextual escaping.
-+             *
-+             * @param {string} type The context in which this value is safe for use, e.g. `$sce.URL`,
-+             *     `$sce.RESOURCE_URL`, `$sce.HTML`, `$sce.JS` or `$sce.CSS`.
-+             *
-+             * @param {*} value The value that that should be considered trusted.
-+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
-+             *     in the context you specified.
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#trustAsHtml
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.trustAsHtml(value)` →
-+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.HTML, value)`}
-+             *
-+             * @param {*} value The value to mark as trusted for `$sce.HTML` context.
-+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
-+             *     in `$sce.HTML` context (like `ng-bind-html`).
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#trustAsCss
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.trustAsCss(value)` →
-+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.CSS, value)`}
-+             *
-+             * @param {*} value The value to mark as trusted for `$sce.CSS` context.
-+             * @return {*} A wrapped version of value that can be used as a trusted variant
-+             *     of your `value` in `$sce.CSS` context. This context is currently unused, so there are
-+             *     almost no reasons to use this function so far.
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#trustAsUrl
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.trustAsUrl(value)` →
-+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.URL, value)`}
-+             *
-+             * @param {*} value The value to mark as trusted for `$sce.URL` context.
-+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
-+             *     in `$sce.URL` context. That context is currently unused, so there are almost no reasons
-+             *     to use this function so far.
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#trustAsResourceUrl
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.trustAsResourceUrl(value)` →
-+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`}
-+             *
-+             * @param {*} value The value to mark as trusted for `$sce.RESOURCE_URL` context.
-+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
-+             *     in `$sce.RESOURCE_URL` context (template URLs in `ng-include`, most `src` attribute
-+             *     bindings, ...)
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#trustAsJs
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.trustAsJs(value)` →
-+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.JS, value)`}
-+             *
-+             * @param {*} value The value to mark as trusted for `$sce.JS` context.
-+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
-+             *     in `$sce.JS` context. That context is currently unused, so there are almost no reasons to
-+             *     use this function so far.
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#getTrusted
-+             *
-+             * @description
-+             * Delegates to {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted`}.  As such,
-+             * takes any input, and either returns a value that's safe to use in the specified context,
-+             * or throws an exception. This function is aware of trusted values created by the `trustAs`
-+             * function and its shorthands, and when contexts are appropriate, returns the unwrapped value
-+             * as-is. Finally, this function can also throw when there is no way to turn `maybeTrusted` in a
-+             * safe value (e.g., no sanitization is available or possible.)
-+             *
-+             * @param {string} type The context in which this value is to be used.
-+             * @param {*} maybeTrusted The result of a prior {@link ng.$sce#trustAs
-+     *     `$sce.trustAs`} call, or anything else (which will not be considered trusted.)
-+             * @return {*} A version of the value that's safe to use in the given context, or throws an
-+             *     exception if this is impossible.
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#getTrustedHtml
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.getTrustedHtml(value)` →
-+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`}
-+             *
-+             * @param {*} value The value to pass to `$sce.getTrusted`.
-+             * @return {*} The return value of `$sce.getTrusted($sce.HTML, value)`
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#getTrustedCss
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.getTrustedCss(value)` →
-+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`}
-+             *
-+             * @param {*} value The value to pass to `$sce.getTrusted`.
-+             * @return {*} The return value of `$sce.getTrusted($sce.CSS, value)`
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#getTrustedUrl
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.getTrustedUrl(value)` →
-+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.URL, value)`}
-+             *
-+             * @param {*} value The value to pass to `$sce.getTrusted`.
-+             * @return {*} The return value of `$sce.getTrusted($sce.URL, value)`
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#getTrustedResourceUrl
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.getTrustedResourceUrl(value)` →
-+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`}
-+             *
-+             * @param {*} value The value to pass to `$sceDelegate.getTrusted`.
-+             * @return {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)`
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#getTrustedJs
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.getTrustedJs(value)` →
-+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.JS, value)`}
-+             *
-+             * @param {*} value The value to pass to `$sce.getTrusted`.
-+             * @return {*} The return value of `$sce.getTrusted($sce.JS, value)`
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#parseAsHtml
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.parseAsHtml(expression string)` →
-+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.HTML, value)`}
-+             *
-+             * @param {string} expression String expression to compile.
-+             * @return {function(context, locals)} A function which represents the compiled expression:
-+             *
-+             *    * `context` – `{object}` – an object against which any expressions embedded in the
-+             *      strings are evaluated against (typically a scope object).
-+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
-+             *      in `context`.
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#parseAsCss
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.parseAsCss(value)` →
-+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.CSS, value)`}
-+             *
-+             * @param {string} expression String expression to compile.
-+             * @return {function(context, locals)} A function which represents the compiled expression:
-+             *
-+             *    * `context` – `{object}` – an object against which any expressions embedded in the
-+             *      strings are evaluated against (typically a scope object).
-+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
-+             *      in `context`.
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#parseAsUrl
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.parseAsUrl(value)` →
-+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.URL, value)`}
-+             *
-+             * @param {string} expression String expression to compile.
-+             * @return {function(context, locals)} A function which represents the compiled expression:
-+             *
-+             *    * `context` – `{object}` – an object against which any expressions embedded in the
-+             *      strings are evaluated against (typically a scope object).
-+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
-+             *      in `context`.
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#parseAsResourceUrl
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.parseAsResourceUrl(value)` →
-+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.RESOURCE_URL, value)`}
-+             *
-+             * @param {string} expression String expression to compile.
-+             * @return {function(context, locals)} A function which represents the compiled expression:
-+             *
-+             *    * `context` – `{object}` – an object against which any expressions embedded in the
-+             *      strings are evaluated against (typically a scope object).
-+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
-+             *      in `context`.
-+             */
-+
-+            /**
-+             * @ngdoc method
-+             * @name $sce#parseAsJs
-+             *
-+             * @description
-+             * Shorthand method.  `$sce.parseAsJs(value)` →
-+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.JS, value)`}
-+             *
-+             * @param {string} expression String expression to compile.
-+             * @return {function(context, locals)} A function which represents the compiled expression:
-+             *
-+             *    * `context` – `{object}` – an object against which any expressions embedded in the
-+             *      strings are evaluated against (typically a scope object).
-+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
-+             *      in `context`.
-+             */
-+
-+                // Shorthand delegations.
-+            var parse = sce.parseAs,
-+                getTrusted = sce.getTrusted,
-+                trustAs = sce.trustAs;
-+
-+            forEach(SCE_CONTEXTS, function(enumValue, name) {
-+                var lName = lowercase(name);
-+                sce[snakeToCamel('parse_as_' + lName)] = function(expr) {
-+                    return parse(enumValue, expr);
-+                };
-+                sce[snakeToCamel('get_trusted_' + lName)] = function(value) {
-+                    return getTrusted(enumValue, value);
-+                };
-+                sce[snakeToCamel('trust_as_' + lName)] = function(value) {
-+                    return trustAs(enumValue, value);
-+                };
-+            });
-+
-+            return sce;
-+        }];
-+    }
-+
-+    /* exported $SnifferProvider */
-+
-+    /**
-+     * !!! This is an undocumented "private" service !!!
-+     *
-+     * @name $sniffer
-+     * @requires $window
-+     * @requires $document
-+     * @this
-+     *
-+     * @property {boolean} history Does the browser support html5 history api ?
-+     * @property {boolean} transitions Does the browser support CSS transition events ?
-+     * @property {boolean} animations Does the browser support CSS animation events ?
-+     *
-+     * @description
-+     * This is very simple implementation of testing browser's features.
-+     */
-+    function $SnifferProvider() {
-+        this.$get = ['$window', '$document', function($window, $document) {
-+            var eventSupport = {},
-+                // Chrome Packaged Apps are not allowed to access `history.pushState`.
-+                // If not sandboxed, they can be detected by the presence of `chrome.app.runtime`
-+                // (see https://developer.chrome.com/apps/api_index). If sandboxed, they can be detected by
-+                // the presence of an extension runtime ID and the absence of other Chrome runtime APIs
-+                // (see https://developer.chrome.com/apps/manifest/sandbox).
-+                // (NW.js apps have access to Chrome APIs, but do support `history`.)
-+                isNw = $window.nw && $window.nw.process,
-+                isChromePackagedApp =
-+                    !isNw &&
-+                    $window.chrome &&
-+                    ($window.chrome.app && $window.chrome.app.runtime ||
-+                        !$window.chrome.app && $window.chrome.runtime && $window.chrome.runtime.id),
-+                hasHistoryPushState = !isChromePackagedApp && $window.history && $window.history.pushState,
-+                android =
-+                    toInt((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]),
-+                boxee = /Boxee/i.test(($window.navigator || {}).userAgent),
-+                document = $document[0] || {},
-+                bodyStyle = document.body && document.body.style,
-+                transitions = false,
-+                animations = false;
-+
-+            if (bodyStyle) {
-+                // Support: Android <5, Blackberry Browser 10, default Chrome in Android 4.4.x
-+                // Mentioned browsers need a -webkit- prefix for transitions & animations.
-+                transitions = !!('transition' in bodyStyle || 'webkitTransition' in bodyStyle);
-+                animations = !!('animation' in bodyStyle || 'webkitAnimation' in bodyStyle);
-+            }
-+
-+
-+            return {
-+                // Android has history.pushState, but it does not update location correctly
-+                // so let's not use the history API at all.
-+                // http://code.google.com/p/android/issues/detail?id=17471
-+                // https://github.com/angular/angular.js/issues/904
-+
-+                // older webkit browser (533.9) on Boxee box has exactly the same problem as Android has
-+                // so let's not use the history API also
-+                // We are purposefully using `!(android < 4)` to cover the case when `android` is undefined
-+                history: !!(hasHistoryPushState && !(android < 4) && !boxee),
-+                hasEvent: function(event) {
-+                    // Support: IE 9-11 only
-+                    // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have
-+                    // it. In particular the event is not fired when backspace or delete key are pressed or
-+                    // when cut operation is performed.
-+                    // IE10+ implements 'input' event but it erroneously fires under various situations,
-+                    // e.g. when placeholder changes, or a form is focused.
-+                    if (event === 'input' && msie) return false;
-+
-+                    if (isUndefined(eventSupport[event])) {
-+                        var divElm = document.createElement('div');
-+                        eventSupport[event] = 'on' + event in divElm;
-+                    }
-+
-+                    return eventSupport[event];
-+                },
-+                csp: csp(),
-+                transitions: transitions,
-+                animations: animations,
-+                android: android
-+            };
-+        }];
-+    }
-+
-+    var $templateRequestMinErr = minErr('$compile');
-+
-+    /**
-+     * @ngdoc provider
-+     * @name $templateRequestProvider
-+     * @this
-+     *
-+     * @description
-+     * Used to configure the options passed to the {@link $http} service when making a template request.
-+     *
-+     * For example, it can be used for specifying the "Accept" header that is sent to the server, when
-+     * requesting a template.
-+     */
-+    function $TemplateRequestProvider() {
-+
-+        var httpOptions;
-+
-+        /**
-+         * @ngdoc method
-+         * @name $templateRequestProvider#httpOptions
-+         * @description
-+         * The options to be passed to the {@link $http} service when making the request.
-+         * You can use this to override options such as the "Accept" header for template requests.
-+         *
-+         * The {@link $templateRequest} will set the `cache` and the `transformResponse` properties of the
-+         * options if not overridden here.
-+         *
-+         * @param {string=} value new value for the {@link $http} options.
-+         * @returns {string|self} Returns the {@link $http} options when used as getter and self if used as setter.
-+         */
-+        this.httpOptions = function(val) {
-+            if (val) {
-+                httpOptions = val;
-+                return this;
-+            }
-+            return httpOptions;
-+        };
-+
-+        /**
-+         * @ngdoc service
-+         * @name $templateRequest
-+         *
-+         * @description
-+         * The `$templateRequest` service runs security checks then downloads the provided template using
-+         * `$http` and, upon success, stores the contents inside of `$templateCache`. If the HTTP request
-+         * fails or the response data of the HTTP request is empty, a `$compile` error will be thrown (the
-+         * exception can be thwarted by setting the 2nd parameter of the function to true). Note that the
-+         * contents of `$templateCache` are trusted, so the call to `$sce.getTrustedUrl(tpl)` is omitted
-+         * when `tpl` is of type string and `$templateCache` has the matching entry.
-+         *
-+         * If you want to pass custom options to the `$http` service, such as setting the Accept header you
-+         * can configure this via {@link $templateRequestProvider#httpOptions}.
-+         *
-+         * `$templateRequest` is used internally by {@link $compile}, {@link ngRoute.$route}, and directives such
-+         * as {@link ngInclude} to download and cache templates.
-+         *
-+         * 3rd party modules should use `$templateRequest` if their services or directives are loading
-+         * templates.
-+         *
-+         * @param {string|TrustedResourceUrl} tpl The HTTP request template URL
-+         * @param {boolean=} ignoreRequestError Whether or not to ignore the exception when the request fails or the template is empty
-+         *
-+         * @return {Promise} a promise for the HTTP response data of the given URL.
-+         *
-+         * @property {number} totalPendingRequests total amount of pending template requests being downloaded.
-+         */
-+        this.$get = ['$exceptionHandler', '$templateCache', '$http', '$q', '$sce',
-+            function($exceptionHandler, $templateCache, $http, $q, $sce) {
-+
-+                function handleRequestFn(tpl, ignoreRequestError) {
-+                    handleRequestFn.totalPendingRequests++;
-+
-+                    // We consider the template cache holds only trusted templates, so
-+                    // there's no need to go through whitelisting again for keys that already
-+                    // are included in there. This also makes AngularJS accept any script
-+                    // directive, no matter its name. However, we still need to unwrap trusted
-+                    // types.
-+                    if (!isString(tpl) || isUndefined($templateCache.get(tpl))) {
-+                        tpl = $sce.getTrustedResourceUrl(tpl);
-+                    }
-+
-+                    var transformResponse = $http.defaults && $http.defaults.transformResponse;
-+
-+                    if (isArray(transformResponse)) {
-+                        transformResponse = transformResponse.filter(function(transformer) {
-+                            return transformer !== defaultHttpResponseTransform;
-+                        });
-+                    } else if (transformResponse === defaultHttpResponseTransform) {
-+                        transformResponse = null;
-+                    }
-+
-+                    return $http.get(tpl, extend({
-+                        cache: $templateCache,
-+                        transformResponse: transformResponse
-+                    }, httpOptions))
-+                        .finally(function() {
-+                            handleRequestFn.totalPendingRequests--;
-+                        })
-+                        .then(function(response) {
-+                            $templateCache.put(tpl, response.data);
-+                            return response.data;
-+                        }, handleError);
-+
-+                    function handleError(resp) {
-+                        if (!ignoreRequestError) {
-+                            resp = $templateRequestMinErr('tpload',
-+                                'Failed to load template: {0} (HTTP status: {1} {2})',
-+                                tpl, resp.status, resp.statusText);
-+
-+                            $exceptionHandler(resp);
-+                        }
-+
-+                        return $q.reject(resp);
-+                    }
-+                }
-+
-+                handleRequestFn.totalPendingRequests = 0;
-+
-+                return handleRequestFn;
-+            }
-+        ];
-+    }
-+
-+    /** @this */
-+    function $$TestabilityProvider() {
-+        this.$get = ['$rootScope', '$browser', '$location',
-+            function($rootScope,   $browser,   $location) {
-+
-+                /**
-+                 * @name $testability
-+                 *
-+                 * @description
-+                 * The private $$testability service provides a collection of methods for use when debugging
-+                 * or by automated test and debugging tools.
-+                 */
-+                var testability = {};
-+
-+                /**
-+                 * @name $$testability#findBindings
-+                 *
-+                 * @description
-+                 * Returns an array of elements that are bound (via ng-bind or {{}})
-+                 * to expressions matching the input.
-+                 *
-+                 * @param {Element} element The element root to search from.
-+                 * @param {string} expression The binding expression to match.
-+                 * @param {boolean} opt_exactMatch If true, only returns exact matches
-+                 *     for the expression. Filters and whitespace are ignored.
-+                 */
-+                testability.findBindings = function(element, expression, opt_exactMatch) {
-+                    var bindings = element.getElementsByClassName('ng-binding');
-+                    var matches = [];
-+                    forEach(bindings, function(binding) {
-+                        var dataBinding = angular.element(binding).data('$binding');
-+                        if (dataBinding) {
-+                            forEach(dataBinding, function(bindingName) {
-+                                if (opt_exactMatch) {
-+                                    var matcher = new RegExp('(^|\\s)' + escapeForRegexp(expression) + '(\\s|\\||$)');
-+                                    if (matcher.test(bindingName)) {
-+                                        matches.push(binding);
-+                                    }
-+                                } else {
-+                                    if (bindingName.indexOf(expression) !== -1) {
-+                                        matches.push(binding);
-+                                    }
-+                                }
-+                            });
-+                        }
-+                    });
-+                    return matches;
-+                };
-+
-+                /**
-+                 * @name $$testability#findModels
-+                 *
-+                 * @description
-+                 * Returns an array of elements that are two-way found via ng-model to
-+                 * expressions matching the input.
-+                 *
-+                 * @param {Element} element The element root to search from.
-+                 * @param {string} expression The model expression to match.
-+                 * @param {boolean} opt_exactMatch If true, only returns exact matches
-+                 *     for the expression.
-+                 */
-+                testability.findModels = function(element, expression, opt_exactMatch) {
-+                    var prefixes = ['ng-', 'data-ng-', 'ng\\:'];
-+                    for (var p = 0; p < prefixes.length; ++p) {
-+                        var attributeEquals = opt_exactMatch ? '=' : '*=';
-+                        var selector = '[' + prefixes[p] + 'model' + attributeEquals + '"' + expression + '"]';
-+                        var elements = element.querySelectorAll(selector);
-+                        if (elements.length) {
-+                            return elements;
-+                        }
-+                    }
-+                };
-+
-+                /**
-+                 * @name $$testability#getLocation
-+                 *
-+                 * @description
-+                 * Shortcut for getting the location in a browser agnostic way. Returns
-+                 *     the path, search, and hash. (e.g. /path?a=b#hash)
-+                 */
-+                testability.getLocation = function() {
-+                    return $location.url();
-+                };
-+
-+                /**
-+                 * @name $$testability#setLocation
-+                 *
-+                 * @description
-+                 * Shortcut for navigating to a location without doing a full page reload.
-+                 *
-+                 * @param {string} url The location url (path, search and hash,
-+                 *     e.g. /path?a=b#hash) to go to.
-+                 */
-+                testability.setLocation = function(url) {
-+                    if (url !== $location.url()) {
-+                        $location.url(url);
-+                        $rootScope.$digest();
-+                    }
-+                };
-+
-+                /**
-+                 * @name $$testability#whenStable
-+                 *
-+                 * @description
-+                 * Calls the callback when $timeout and $http requests are completed.
-+                 *
-+                 * @param {function} callback
-+                 */
-+                testability.whenStable = function(callback) {
-+                    $browser.notifyWhenNoOutstandingRequests(callback);
-+                };
-+
-+                return testability;
-+            }];
-+    }
-+
-+    /** @this */
-+    function $TimeoutProvider() {
-+        this.$get = ['$rootScope', '$browser', '$q', '$$q', '$exceptionHandler',
-+            function($rootScope,   $browser,   $q,   $$q,   $exceptionHandler) {
-+
-+                var deferreds = {};
-+
-+
-+                /**
-+                 * @ngdoc service
-+                 * @name $timeout
-+                 *
-+                 * @description
-+                 * AngularJS's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch
-+                 * block and delegates any exceptions to
-+                 * {@link ng.$exceptionHandler $exceptionHandler} service.
-+                 *
-+                 * The return value of calling `$timeout` is a promise, which will be resolved when
-+                 * the delay has passed and the timeout function, if provided, is executed.
-+                 *
-+                 * To cancel a timeout request, call `$timeout.cancel(promise)`.
-+                 *
-+                 * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to
-+                 * synchronously flush the queue of deferred functions.
-+                 *
-+                 * If you only want a promise that will be resolved after some specified delay
-+                 * then you can call `$timeout` without the `fn` function.
-+                 *
-+                 * @param {function()=} fn A function, whose execution should be delayed.
-+                 * @param {number=} [delay=0] Delay in milliseconds.
-+                 * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
-+                 *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
-+                 * @param {...*=} Pass additional parameters to the executed function.
-+                 * @returns {Promise} Promise that will be resolved when the timeout is reached. The promise
-+                 *   will be resolved with the return value of the `fn` function.
-+                 *
-+                 */
-+                function timeout(fn, delay, invokeApply) {
-+                    if (!isFunction(fn)) {
-+                        invokeApply = delay;
-+                        delay = fn;
-+                        fn = noop;
-+                    }
-+
-+                    var args = sliceArgs(arguments, 3),
-+                        skipApply = (isDefined(invokeApply) && !invokeApply),
-+                        deferred = (skipApply ? $$q : $q).defer(),
-+                        promise = deferred.promise,
-+                        timeoutId;
-+
-+                    timeoutId = $browser.defer(function() {
-+                        try {
-+                            deferred.resolve(fn.apply(null, args));
-+                        } catch (e) {
-+                            deferred.reject(e);
-+                            $exceptionHandler(e);
-+                        } finally {
-+                            delete deferreds[promise.$$timeoutId];
-+                        }
-+
-+                        if (!skipApply) $rootScope.$apply();
-+                    }, delay);
-+
-+                    promise.$$timeoutId = timeoutId;
-+                    deferreds[timeoutId] = deferred;
-+
-+                    return promise;
-+                }
-+
-+
-+                /**
-+                 * @ngdoc method
-+                 * @name $timeout#cancel
-+                 *
-+                 * @description
-+                 * Cancels a task associated with the `promise`. As a result of this, the promise will be
-+                 * resolved with a rejection.
-+                 *
-+                 * @param {Promise=} promise Promise returned by the `$timeout` function.
-+                 * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully
-+                 *   canceled.
-+                 */
-+                timeout.cancel = function(promise) {
-+                    if (promise && promise.$$timeoutId in deferreds) {
-+                        // Timeout cancels should not report an unhandled promise.
-+                        markQExceptionHandled(deferreds[promise.$$timeoutId].promise);
-+                        deferreds[promise.$$timeoutId].reject('canceled');
-+                        delete deferreds[promise.$$timeoutId];
-+                        return $browser.defer.cancel(promise.$$timeoutId);
-+                    }
-+                    return false;
-+                };
-+
-+                return timeout;
-+            }];
-+    }
-+
-+// NOTE:  The usage of window and document instead of $window and $document here is
-+// deliberate.  This service depends on the specific behavior of anchor nodes created by the
-+// browser (resolving and parsing URLs) that is unlikely to be provided by mock objects and
-+// cause us to break tests.  In addition, when the browser resolves a URL for XHR, it
-+// doesn't know about mocked locations and resolves URLs to the real document - which is
-+// exactly the behavior needed here.  There is little value is mocking these out for this
-+// service.
-+    var urlParsingNode = window.document.createElement('a');
-+    var originUrl = urlResolve(window.location.href);
-+
-+
-+    /**
-+     *
-+     * Implementation Notes for non-IE browsers
-+     * ----------------------------------------
-+     * Assigning a URL to the href property of an anchor DOM node, even one attached to the DOM,
-+     * results both in the normalizing and parsing of the URL.  Normalizing means that a relative
-+     * URL will be resolved into an absolute URL in the context of the application document.
-+     * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related
-+     * properties are all populated to reflect the normalized URL.  This approach has wide
-+     * compatibility - Safari 1+, Mozilla 1+ etc.  See
-+     * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
-+     *
-+     * Implementation Notes for IE
-+     * ---------------------------
-+     * IE <= 10 normalizes the URL when assigned to the anchor node similar to the other
-+     * browsers.  However, the parsed components will not be set if the URL assigned did not specify
-+     * them.  (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.)  We
-+     * work around that by performing the parsing in a 2nd step by taking a previously normalized
-+     * URL (e.g. by assigning to a.href) and assigning it a.href again.  This correctly populates the
-+     * properties such as protocol, hostname, port, etc.
-+     *
-+     * References:
-+     *   http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement
-+     *   http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
-+     *   http://url.spec.whatwg.org/#urlutils
-+     *   https://github.com/angular/angular.js/pull/2902
-+     *   http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
-+     *
-+     * @kind function
-+     * @param {string} url The URL to be parsed.
-+     * @description Normalizes and parses a URL.
-+     * @returns {object} Returns the normalized URL as a dictionary.
-+     *
-+     *   | member name   | Description    |
-+     *   |---------------|----------------|
-+     *   | href          | A normalized version of the provided URL if it was not an absolute URL |
-+     *   | protocol      | The protocol including the trailing colon                              |
-+     *   | host          | The host and port (if the port is non-default) of the normalizedUrl    |
-+     *   | search        | The search params, minus the question mark                             |
-+     *   | hash          | The hash string, minus the hash symbol
-+     *   | hostname      | The hostname
-+     *   | port          | The port, without ":"
-+     *   | pathname      | The pathname, beginning with "/"
-+     *
-+     */
-+    function urlResolve(url) {
-+        var href = url;
-+
-+        // Support: IE 9-11 only
-+        if (msie) {
-+            // Normalize before parse.  Refer Implementation Notes on why this is
-+            // done in two steps on IE.
-+            urlParsingNode.setAttribute('href', href);
-+            href = urlParsingNode.href;
-+        }
-+
-+        urlParsingNode.setAttribute('href', href);
-+
-+        // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils
-+        return {
-+            href: urlParsingNode.href,
-+            protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '',
-+            host: urlParsingNode.host,
-+            search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '',
-+            hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
-+            hostname: urlParsingNode.hostname,
-+            port: urlParsingNode.port,
-+            pathname: (urlParsingNode.pathname.charAt(0) === '/')
-+                ? urlParsingNode.pathname
-+                : '/' + urlParsingNode.pathname
-+        };
-+    }
-+
-+    /**
-+     * Parse a request URL and determine whether this is a same-origin request as the application document.
-+     *
-+     * @param {string|object} requestUrl The url of the request as a string that will be resolved
-+     * or a parsed URL object.
-+     * @returns {boolean} Whether the request is for the same origin as the application document.
-+     */
-+    function urlIsSameOrigin(requestUrl) {
-+        var parsed = (isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl;
-+        return (parsed.protocol === originUrl.protocol &&
-+            parsed.host === originUrl.host);
-+    }
-+
-+    /**
-+     * @ngdoc service
-+     * @name $window
-+     * @this
-+     *
-+     * @description
-+     * A reference to the browser's `window` object. While `window`
-+     * is globally available in JavaScript, it causes testability problems, because
-+     * it is a global variable. In AngularJS we always refer to it through the
-+     * `$window` service, so it may be overridden, removed or mocked for testing.
-+     *
-+     * Expressions, like the one defined for the `ngClick` directive in the example
-+     * below, are evaluated with respect to the current scope.  Therefore, there is
-+     * no risk of inadvertently coding in a dependency on a global value in such an
-+     * expression.
-+     *
-+     * @example
-+     <example module="windowExample" name="window-service">
-+     <file name="index.html">
-+     <script>
-+     angular.module('windowExample', [])
-+     .controller('ExampleController', ['$scope', '$window', function($scope, $window) {
-+             $scope.greeting = 'Hello, World!';
-+             $scope.doGreeting = function(greeting) {
-+               $window.alert(greeting);
-+             };
-+           }]);
-+     </script>
-+     <div ng-controller="ExampleController">
-+     <input type="text" ng-model="greeting" aria-label="greeting" />
-+     <button ng-click="doGreeting(greeting)">ALERT</button>
-+     </div>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should display the greeting in the input box', function() {
-+       element(by.model('greeting')).sendKeys('Hello, E2E Tests');
-+       // If we click the button it will block the test runner
-+       // element(':button').click();
-+      });
-+     </file>
-+     </example>
-+     */
-+    function $WindowProvider() {
-+        this.$get = valueFn(window);
-+    }
-+
-+    /**
-+     * @name $$cookieReader
-+     * @requires $document
-+     *
-+     * @description
-+     * This is a private service for reading cookies used by $http and ngCookies
-+     *
-+     * @return {Object} a key/value map of the current cookies
-+     */
-+    function $$CookieReader($document) {
-+        var rawDocument = $document[0] || {};
-+        var lastCookies = {};
-+        var lastCookieString = '';
-+
-+        function safeGetCookie(rawDocument) {
-+            try {
-+                return rawDocument.cookie || '';
-+            } catch (e) {
-+                return '';
-+            }
-+        }
-+
-+        function safeDecodeURIComponent(str) {
-+            try {
-+                return decodeURIComponent(str);
-+            } catch (e) {
-+                return str;
-+            }
-+        }
-+
-+        return function() {
-+            var cookieArray, cookie, i, index, name;
-+            var currentCookieString = safeGetCookie(rawDocument);
-+
-+            if (currentCookieString !== lastCookieString) {
-+                lastCookieString = currentCookieString;
-+                cookieArray = lastCookieString.split('; ');
-+                lastCookies = {};
-+
-+                for (i = 0; i < cookieArray.length; i++) {
-+                    cookie = cookieArray[i];
-+                    index = cookie.indexOf('=');
-+                    if (index > 0) { //ignore nameless cookies
-+                        name = safeDecodeURIComponent(cookie.substring(0, index));
-+                        // the first value that is seen for a cookie is the most
-+                        // specific one.  values for the same cookie name that
-+                        // follow are for less specific paths.
-+                        if (isUndefined(lastCookies[name])) {
-+                            lastCookies[name] = safeDecodeURIComponent(cookie.substring(index + 1));
-+                        }
-+                    }
-+                }
-+            }
-+            return lastCookies;
-+        };
-+    }
-+
-+    $$CookieReader.$inject = ['$document'];
-+
-+    /** @this */
-+    function $$CookieReaderProvider() {
-+        this.$get = $$CookieReader;
-+    }
-+
-+    /* global currencyFilter: true,
-+ dateFilter: true,
-+ filterFilter: true,
-+ jsonFilter: true,
-+ limitToFilter: true,
-+ lowercaseFilter: true,
-+ numberFilter: true,
-+ orderByFilter: true,
-+ uppercaseFilter: true,
-+ */
-+
-+    /**
-+     * @ngdoc provider
-+     * @name $filterProvider
-+     * @description
-+     *
-+     * Filters are just functions which transform input to an output. However filters need to be
-+     * Dependency Injected. To achieve this a filter definition consists of a factory function which is
-+     * annotated with dependencies and is responsible for creating a filter function.
-+     *
-+     * <div class="alert alert-warning">
-+     * **Note:** Filter names must be valid AngularJS {@link expression} identifiers, such as `uppercase` or `orderBy`.
-+     * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
-+     * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
-+     * (`myapp_subsection_filterx`).
-+     * </div>
-+     *
-+     * ```js
-+     *   // Filter registration
-+     *   function MyModule($provide, $filterProvider) {
-+     *     // create a service to demonstrate injection (not always needed)
-+     *     $provide.value('greet', function(name){
-+     *       return 'Hello ' + name + '!';
-+     *     });
-+     *
-+     *     // register a filter factory which uses the
-+     *     // greet service to demonstrate DI.
-+     *     $filterProvider.register('greet', function(greet){
-+     *       // return the filter function which uses the greet service
-+     *       // to generate salutation
-+     *       return function(text) {
-+     *         // filters need to be forgiving so check input validity
-+     *         return text && greet(text) || text;
-+     *       };
-+     *     });
-+     *   }
-+     * ```
-+     *
-+     * The filter function is registered with the `$injector` under the filter name suffix with
-+     * `Filter`.
-+     *
-+     * ```js
-+     *   it('should be the same instance', inject(
-+     *     function($filterProvider) {
-+     *       $filterProvider.register('reverse', function(){
-+     *         return ...;
-+     *       });
-+     *     },
-+     *     function($filter, reverseFilter) {
-+     *       expect($filter('reverse')).toBe(reverseFilter);
-+     *     });
-+     * ```
-+     *
-+     *
-+     * For more information about how AngularJS filters work, and how to create your own filters, see
-+     * {@link guide/filter Filters} in the AngularJS Developer Guide.
-+     */
-+
-+    /**
-+     * @ngdoc service
-+     * @name $filter
-+     * @kind function
-+     * @description
-+     * Filters are used for formatting data displayed to the user.
-+     *
-+     * They can be used in view templates, controllers or services. AngularJS comes
-+     * with a collection of [built-in filters](api/ng/filter), but it is easy to
-+     * define your own as well.
-+     *
-+     * The general syntax in templates is as follows:
-+     *
-+     * ```html
-+     * {{ expression [| filter_name[:parameter_value] ... ] }}
-+     * ```
-+     *
-+     * @param {String} name Name of the filter function to retrieve
-+     * @return {Function} the filter function
-+     * @example
-+     <example name="$filter" module="filterExample">
-+     <file name="index.html">
-+     <div ng-controller="MainCtrl">
-+     <h3>{{ originalText }}</h3>
-+     <h3>{{ filteredText }}</h3>
-+     </div>
-+     </file>
-+
-+     <file name="script.js">
-+     angular.module('filterExample', [])
-+     .controller('MainCtrl', function($scope, $filter) {
-+        $scope.originalText = 'hello';
-+        $scope.filteredText = $filter('uppercase')($scope.originalText);
-+      });
-+     </file>
-+     </example>
-+     */
-+    $FilterProvider.$inject = ['$provide'];
-+    /** @this */
-+    function $FilterProvider($provide) {
-+        var suffix = 'Filter';
-+
-+        /**
-+         * @ngdoc method
-+         * @name $filterProvider#register
-+         * @param {string|Object} name Name of the filter function, or an object map of filters where
-+         *    the keys are the filter names and the values are the filter factories.
-+         *
-+         *    <div class="alert alert-warning">
-+         *    **Note:** Filter names must be valid AngularJS {@link expression} identifiers, such as `uppercase` or `orderBy`.
-+         *    Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
-+         *    your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
-+         *    (`myapp_subsection_filterx`).
-+         *    </div>
-+         * @param {Function} factory If the first argument was a string, a factory function for the filter to be registered.
-+         * @returns {Object} Registered filter instance, or if a map of filters was provided then a map
-+         *    of the registered filter instances.
-+         */
-+        function register(name, factory) {
-+            if (isObject(name)) {
-+                var filters = {};
-+                forEach(name, function(filter, key) {
-+                    filters[key] = register(key, filter);
-+                });
-+                return filters;
-+            } else {
-+                return $provide.factory(name + suffix, factory);
-+            }
-+        }
-+        this.register = register;
-+
-+        this.$get = ['$injector', function($injector) {
-+            return function(name) {
-+                return $injector.get(name + suffix);
-+            };
-+        }];
-+
-+        ////////////////////////////////////////
-+
-+        /* global
-+    currencyFilter: false,
-+    dateFilter: false,
-+    filterFilter: false,
-+    jsonFilter: false,
-+    limitToFilter: false,
-+    lowercaseFilter: false,
-+    numberFilter: false,
-+    orderByFilter: false,
-+    uppercaseFilter: false
-+  */
-+
-+        register('currency', currencyFilter);
-+        register('date', dateFilter);
-+        register('filter', filterFilter);
-+        register('json', jsonFilter);
-+        register('limitTo', limitToFilter);
-+        register('lowercase', lowercaseFilter);
-+        register('number', numberFilter);
-+        register('orderBy', orderByFilter);
-+        register('uppercase', uppercaseFilter);
-+    }
-+
-+    /**
-+     * @ngdoc filter
-+     * @name filter
-+     * @kind function
-+     *
-+     * @description
-+     * Selects a subset of items from `array` and returns it as a new array.
-+     *
-+     * @param {Array} array The source array.
-+     * <div class="alert alert-info">
-+     *   **Note**: If the array contains objects that reference themselves, filtering is not possible.
-+     * </div>
-+     * @param {string|Object|function()} expression The predicate to be used for selecting items from
-+     *   `array`.
-+     *
-+     *   Can be one of:
-+     *
-+     *   - `string`: The string is used for matching against the contents of the `array`. All strings or
-+     *     objects with string properties in `array` that match this string will be returned. This also
-+     *     applies to nested object properties.
-+     *     The predicate can be negated by prefixing the string with `!`.
-+     *
-+     *   - `Object`: A pattern object can be used to filter specific properties on objects contained
-+     *     by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items
-+     *     which have property `name` containing "M" and property `phone` containing "1". A special
-+     *     property name (`$` by default) can be used (e.g. as in `{$: "text"}`) to accept a match
-+     *     against any property of the object or its nested object properties. That's equivalent to the
-+     *     simple substring match with a `string` as described above. The special property name can be
-+     *     overwritten, using the `anyPropertyKey` parameter.
-+     *     The predicate can be negated by prefixing the string with `!`.
-+     *     For example `{name: "!M"}` predicate will return an array of items which have property `name`
-+     *     not containing "M".
-+     *
-+     *     Note that a named property will match properties on the same level only, while the special
-+     *     `$` property will match properties on the same level or deeper. E.g. an array item like
-+     *     `{name: {first: 'John', last: 'Doe'}}` will **not** be matched by `{name: 'John'}`, but
-+     *     **will** be matched by `{$: 'John'}`.
-+     *
-+     *   - `function(value, index, array)`: A predicate function can be used to write arbitrary filters.
-+     *     The function is called for each element of the array, with the element, its index, and
-+     *     the entire array itself as arguments.
-+     *
-+     *     The final result is an array of those elements that the predicate returned true for.
-+     *
-+     * @param {function(actual, expected)|true|false} [comparator] Comparator which is used in
-+     *     determining if values retrieved using `expression` (when it is not a function) should be
-+     *     considered a match based on the expected value (from the filter expression) and actual
-+     *     value (from the object in the array).
-+     *
-+     *   Can be one of:
-+     *
-+     *   - `function(actual, expected)`:
-+     *     The function will be given the object value and the predicate value to compare and
-+     *     should return true if both values should be considered equal.
-+     *
-+     *   - `true`: A shorthand for `function(actual, expected) { return angular.equals(actual, expected)}`.
-+     *     This is essentially strict comparison of expected and actual.
-+     *
-+     *   - `false`: A short hand for a function which will look for a substring match in a case
-+     *     insensitive way. Primitive values are converted to strings. Objects are not compared against
-+     *     primitives, unless they have a custom `toString` method (e.g. `Date` objects).
-+     *
-+     *
-+     *   Defaults to `false`.
-+     *
-+     * @param {string} [anyPropertyKey] The special property name that matches against any property.
-+     *     By default `$`.
-+     *
-+     * @example
-+     <example name="filter-filter">
-+     <file name="index.html">
-+     <div ng-init="friends = [{name:'John', phone:'555-1276'},
-+     {name:'Mary', phone:'800-BIG-MARY'},
-+     {name:'Mike', phone:'555-4321'},
-+     {name:'Adam', phone:'555-5678'},
-+     {name:'Julie', phone:'555-8765'},
-+     {name:'Juliette', phone:'555-5678'}]"></div>
-+
-+     <label>Search: <input ng-model="searchText"></label>
-+     <table id="searchTextResults">
-+     <tr><th>Name</th><th>Phone</th></tr>
-+     <tr ng-repeat="friend in friends | filter:searchText">
-+     <td>{{friend.name}}</td>
-+     <td>{{friend.phone}}</td>
-+     </tr>
-+     </table>
-+     <hr>
-+     <label>Any: <input ng-model="search.$"></label> <br>
-+     <label>Name only <input ng-model="search.name"></label><br>
-+     <label>Phone only <input ng-model="search.phone"></label><br>
-+     <label>Equality <input type="checkbox" ng-model="strict"></label><br>
-+     <table id="searchObjResults">
-+     <tr><th>Name</th><th>Phone</th></tr>
-+     <tr ng-repeat="friendObj in friends | filter:search:strict">
-+     <td>{{friendObj.name}}</td>
-+     <td>{{friendObj.phone}}</td>
-+     </tr>
-+     </table>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     var expectFriendNames = function(expectedNames, key) {
-+         element.all(by.repeater(key + ' in friends').column(key + '.name')).then(function(arr) {
-+           arr.forEach(function(wd, i) {
-+             expect(wd.getText()).toMatch(expectedNames[i]);
-+           });
-+         });
-+       };
-+
-+     it('should search across all fields when filtering with a string', function() {
-+         var searchText = element(by.model('searchText'));
-+         searchText.clear();
-+         searchText.sendKeys('m');
-+         expectFriendNames(['Mary', 'Mike', 'Adam'], 'friend');
-+
-+         searchText.clear();
-+         searchText.sendKeys('76');
-+         expectFriendNames(['John', 'Julie'], 'friend');
-+       });
-+
-+     it('should search in specific fields when filtering with a predicate object', function() {
-+         var searchAny = element(by.model('search.$'));
-+         searchAny.clear();
-+         searchAny.sendKeys('i');
-+         expectFriendNames(['Mary', 'Mike', 'Julie', 'Juliette'], 'friendObj');
-+       });
-+     it('should use a equal comparison when comparator is true', function() {
-+         var searchName = element(by.model('search.name'));
-+         var strict = element(by.model('strict'));
-+         searchName.clear();
-+         searchName.sendKeys('Julie');
-+         strict.click();
-+         expectFriendNames(['Julie'], 'friendObj');
-+       });
-+     </file>
-+     </example>
-+     */
-+
-+    function filterFilter() {
-+        return function(array, expression, comparator, anyPropertyKey) {
-+            if (!isArrayLike(array)) {
-+                if (array == null) {
-+                    return array;
-+                } else {
-+                    throw minErr('filter')('notarray', 'Expected array but received: {0}', array);
-+                }
-+            }
-+
-+            anyPropertyKey = anyPropertyKey || '$';
-+            var expressionType = getTypeForFilter(expression);
-+            var predicateFn;
-+            var matchAgainstAnyProp;
-+
-+            switch (expressionType) {
-+                case 'function':
-+                    predicateFn = expression;
-+                    break;
-+                case 'boolean':
-+                case 'null':
-+                case 'number':
-+                case 'string':
-+                    matchAgainstAnyProp = true;
-+                // falls through
-+                case 'object':
-+                    predicateFn = createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp);
-+                    break;
-+                default:
-+                    return array;
-+            }
-+
-+            return Array.prototype.filter.call(array, predicateFn);
-+        };
-+    }
-+
-+// Helper functions for `filterFilter`
-+    function createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp) {
-+        var shouldMatchPrimitives = isObject(expression) && (anyPropertyKey in expression);
-+        var predicateFn;
-+
-+        if (comparator === true) {
-+            comparator = equals;
-+        } else if (!isFunction(comparator)) {
-+            comparator = function(actual, expected) {
-+                if (isUndefined(actual)) {
-+                    // No substring matching against `undefined`
-+                    return false;
-+                }
-+                if ((actual === null) || (expected === null)) {
-+                    // No substring matching against `null`; only match against `null`
-+                    return actual === expected;
-+                }
-+                if (isObject(expected) || (isObject(actual) && !hasCustomToString(actual))) {
-+                    // Should not compare primitives against objects, unless they have custom `toString` method
-+                    return false;
-+                }
-+
-+                actual = lowercase('' + actual);
-+                expected = lowercase('' + expected);
-+                return actual.indexOf(expected) !== -1;
-+            };
-+        }
-+
-+        predicateFn = function(item) {
-+            if (shouldMatchPrimitives && !isObject(item)) {
-+                return deepCompare(item, expression[anyPropertyKey], comparator, anyPropertyKey, false);
-+            }
-+            return deepCompare(item, expression, comparator, anyPropertyKey, matchAgainstAnyProp);
-+        };
-+
-+        return predicateFn;
-+    }
-+
-+    function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstAnyProp, dontMatchWholeObject) {
-+        var actualType = getTypeForFilter(actual);
-+        var expectedType = getTypeForFilter(expected);
-+
-+        if ((expectedType === 'string') && (expected.charAt(0) === '!')) {
-+            return !deepCompare(actual, expected.substring(1), comparator, anyPropertyKey, matchAgainstAnyProp);
-+        } else if (isArray(actual)) {
-+            // In case `actual` is an array, consider it a match
-+            // if ANY of it's items matches `expected`
-+            return actual.some(function(item) {
-+                return deepCompare(item, expected, comparator, anyPropertyKey, matchAgainstAnyProp);
-+            });
-+        }
-+
-+        switch (actualType) {
-+            case 'object':
-+                var key;
-+                if (matchAgainstAnyProp) {
-+                    for (key in actual) {
-+                        // Under certain, rare, circumstances, key may not be a string and `charAt` will be undefined
-+                        // See: https://github.com/angular/angular.js/issues/15644
-+                        if (key.charAt && (key.charAt(0) !== '$') &&
-+                            deepCompare(actual[key], expected, comparator, anyPropertyKey, true)) {
-+                            return true;
-+                        }
-+                    }
-+                    return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, anyPropertyKey, false);
-+                } else if (expectedType === 'object') {
-+                    for (key in expected) {
-+                        var expectedVal = expected[key];
-+                        if (isFunction(expectedVal) || isUndefined(expectedVal)) {
-+                            continue;
-+                        }
-+
-+                        var matchAnyProperty = key === anyPropertyKey;
-+                        var actualVal = matchAnyProperty ? actual : actual[key];
-+                        if (!deepCompare(actualVal, expectedVal, comparator, anyPropertyKey, matchAnyProperty, matchAnyProperty)) {
-+                            return false;
-+                        }
-+                    }
-+                    return true;
-+                } else {
-+                    return comparator(actual, expected);
-+                }
-+            case 'function':
-+                return false;
-+            default:
-+                return comparator(actual, expected);
-+        }
-+    }
-+
-+// Used for easily differentiating between `null` and actual `object`
-+    function getTypeForFilter(val) {
-+        return (val === null) ? 'null' : typeof val;
-+    }
-+
-+    var MAX_DIGITS = 22;
-+    var DECIMAL_SEP = '.';
-+    var ZERO_CHAR = '0';
-+
-+    /**
-+     * @ngdoc filter
-+     * @name currency
-+     * @kind function
-+     *
-+     * @description
-+     * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default
-+     * symbol for current locale is used.
-+     *
-+     * @param {number} amount Input to filter.
-+     * @param {string=} symbol Currency symbol or identifier to be displayed.
-+     * @param {number=} fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale
-+     * @returns {string} Formatted number.
-+     *
-+     *
-+     * @example
-+     <example module="currencyExample" name="currency-filter">
-+     <file name="index.html">
-+     <script>
-+     angular.module('currencyExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+             $scope.amount = 1234.56;
-+           }]);
-+     </script>
-+     <div ng-controller="ExampleController">
-+     <input type="number" ng-model="amount" aria-label="amount"> <br>
-+     default currency symbol ($): <span id="currency-default">{{amount | currency}}</span><br>
-+     custom currency identifier (USD$): <span id="currency-custom">{{amount | currency:"USD$"}}</span><br>
-+     no fractions (0): <span id="currency-no-fractions">{{amount | currency:"USD$":0}}</span>
-+     </div>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should init with 1234.56', function() {
-+         expect(element(by.id('currency-default')).getText()).toBe('$1,234.56');
-+         expect(element(by.id('currency-custom')).getText()).toBe('USD$1,234.56');
-+         expect(element(by.id('currency-no-fractions')).getText()).toBe('USD$1,235');
-+       });
-+     it('should update', function() {
-+         if (browser.params.browser === 'safari') {
-+           // Safari does not understand the minus key. See
-+           // https://github.com/angular/protractor/issues/481
-+           return;
-+         }
-+         element(by.model('amount')).clear();
-+         element(by.model('amount')).sendKeys('-1234');
-+         expect(element(by.id('currency-default')).getText()).toBe('-$1,234.00');
-+         expect(element(by.id('currency-custom')).getText()).toBe('-USD$1,234.00');
-+         expect(element(by.id('currency-no-fractions')).getText()).toBe('-USD$1,234');
-+       });
-+     </file>
-+     </example>
-+     */
-+    currencyFilter.$inject = ['$locale'];
-+    function currencyFilter($locale) {
-+        var formats = $locale.NUMBER_FORMATS;
-+        return function(amount, currencySymbol, fractionSize) {
-+            if (isUndefined(currencySymbol)) {
-+                currencySymbol = formats.CURRENCY_SYM;
-+            }
-+
-+            if (isUndefined(fractionSize)) {
-+                fractionSize = formats.PATTERNS[1].maxFrac;
-+            }
-+
-+            // If the currency symbol is empty, trim whitespace around the symbol
-+            var currencySymbolRe = !currencySymbol ? /\s*\u00A4\s*/g : /\u00A4/g;
-+
-+            // if null or undefined pass it through
-+            return (amount == null)
-+                ? amount
-+                : formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, fractionSize).
-+                replace(currencySymbolRe, currencySymbol);
-+        };
-+    }
-+
-+    /**
-+     * @ngdoc filter
-+     * @name number
-+     * @kind function
-+     *
-+     * @description
-+     * Formats a number as text.
-+     *
-+     * If the input is null or undefined, it will just be returned.
-+     * If the input is infinite (Infinity or -Infinity), the Infinity symbol '∞' or '-∞' is returned, respectively.
-+     * If the input is not a number an empty string is returned.
-+     *
-+     *
-+     * @param {number|string} number Number to format.
-+     * @param {(number|string)=} fractionSize Number of decimal places to round the number to.
-+     * If this is not provided then the fraction size is computed from the current locale's number
-+     * formatting pattern. In the case of the default locale, it will be 3.
-+     * @returns {string} Number rounded to `fractionSize` appropriately formatted based on the current
-+     *                   locale (e.g., in the en_US locale it will have "." as the decimal separator and
-+     *                   include "," group separators after each third digit).
-+     *
-+     * @example
-+     <example module="numberFilterExample" name="number-filter">
-+     <file name="index.html">
-+     <script>
-+     angular.module('numberFilterExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+             $scope.val = 1234.56789;
-+           }]);
-+     </script>
-+     <div ng-controller="ExampleController">
-+     <label>Enter number: <input ng-model='val'></label><br>
-+     Default formatting: <span id='number-default'>{{val | number}}</span><br>
-+     No fractions: <span>{{val | number:0}}</span><br>
-+     Negative number: <span>{{-val | number:4}}</span>
-+     </div>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should format numbers', function() {
-+         expect(element(by.id('number-default')).getText()).toBe('1,234.568');
-+         expect(element(by.binding('val | number:0')).getText()).toBe('1,235');
-+         expect(element(by.binding('-val | number:4')).getText()).toBe('-1,234.5679');
-+       });
-+
-+     it('should update', function() {
-+         element(by.model('val')).clear();
-+         element(by.model('val')).sendKeys('3374.333');
-+         expect(element(by.id('number-default')).getText()).toBe('3,374.333');
-+         expect(element(by.binding('val | number:0')).getText()).toBe('3,374');
-+         expect(element(by.binding('-val | number:4')).getText()).toBe('-3,374.3330');
-+      });
-+     </file>
-+     </example>
-+     */
-+    numberFilter.$inject = ['$locale'];
-+    function numberFilter($locale) {
-+        var formats = $locale.NUMBER_FORMATS;
-+        return function(number, fractionSize) {
-+
-+            // if null or undefined pass it through
-+            return (number == null)
-+                ? number
-+                : formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP,
-+                    fractionSize);
-+        };
-+    }
-+
-+    /**
-+     * Parse a number (as a string) into three components that can be used
-+     * for formatting the number.
-+     *
-+     * (Significant bits of this parse algorithm came from https://github.com/MikeMcl/big.js/)
-+     *
-+     * @param  {string} numStr The number to parse
-+     * @return {object} An object describing this number, containing the following keys:
-+     *  - d : an array of digits containing leading zeros as necessary
-+     *  - i : the number of the digits in `d` that are to the left of the decimal point
-+     *  - e : the exponent for numbers that would need more than `MAX_DIGITS` digits in `d`
-+     *
-+     */
-+    function parse(numStr) {
-+        var exponent = 0, digits, numberOfIntegerDigits;
-+        var i, j, zeros;
-+
-+        // Decimal point?
-+        if ((numberOfIntegerDigits = numStr.indexOf(DECIMAL_SEP)) > -1) {
-+            numStr = numStr.replace(DECIMAL_SEP, '');
-+        }
-+
-+        // Exponential form?
-+        if ((i = numStr.search(/e/i)) > 0) {
-+            // Work out the exponent.
-+            if (numberOfIntegerDigits < 0) numberOfIntegerDigits = i;
-+            numberOfIntegerDigits += +numStr.slice(i + 1);
-+            numStr = numStr.substring(0, i);
-+        } else if (numberOfIntegerDigits < 0) {
-+            // There was no decimal point or exponent so it is an integer.
-+            numberOfIntegerDigits = numStr.length;
-+        }
-+
-+        // Count the number of leading zeros.
-+        for (i = 0; numStr.charAt(i) === ZERO_CHAR; i++) { /* empty */ }
-+
-+        if (i === (zeros = numStr.length)) {
-+            // The digits are all zero.
-+            digits = [0];
-+            numberOfIntegerDigits = 1;
-+        } else {
-+            // Count the number of trailing zeros
-+            zeros--;
-+            while (numStr.charAt(zeros) === ZERO_CHAR) zeros--;
-+
-+            // Trailing zeros are insignificant so ignore them
-+            numberOfIntegerDigits -= i;
-+            digits = [];
-+            // Convert string to array of digits without leading/trailing zeros.
-+            for (j = 0; i <= zeros; i++, j++) {
-+                digits[j] = +numStr.charAt(i);
-+            }
-+        }
-+
-+        // If the number overflows the maximum allowed digits then use an exponent.
-+        if (numberOfIntegerDigits > MAX_DIGITS) {
-+            digits = digits.splice(0, MAX_DIGITS - 1);
-+            exponent = numberOfIntegerDigits - 1;
-+            numberOfIntegerDigits = 1;
-+        }
-+
-+        return { d: digits, e: exponent, i: numberOfIntegerDigits };
-+    }
-+
-+    /**
-+     * Round the parsed number to the specified number of decimal places
-+     * This function changed the parsedNumber in-place
-+     */
-+    function roundNumber(parsedNumber, fractionSize, minFrac, maxFrac) {
-+        var digits = parsedNumber.d;
-+        var fractionLen = digits.length - parsedNumber.i;
-+
-+        // determine fractionSize if it is not specified; `+fractionSize` converts it to a number
-+        fractionSize = (isUndefined(fractionSize)) ? Math.min(Math.max(minFrac, fractionLen), maxFrac) : +fractionSize;
-+
-+        // The index of the digit to where rounding is to occur
-+        var roundAt = fractionSize + parsedNumber.i;
-+        var digit = digits[roundAt];
-+
-+        if (roundAt > 0) {
-+            // Drop fractional digits beyond `roundAt`
-+            digits.splice(Math.max(parsedNumber.i, roundAt));
-+
-+            // Set non-fractional digits beyond `roundAt` to 0
-+            for (var j = roundAt; j < digits.length; j++) {
-+                digits[j] = 0;
-+            }
-+        } else {
-+            // We rounded to zero so reset the parsedNumber
-+            fractionLen = Math.max(0, fractionLen);
-+            parsedNumber.i = 1;
-+            digits.length = Math.max(1, roundAt = fractionSize + 1);
-+            digits[0] = 0;
-+            for (var i = 1; i < roundAt; i++) digits[i] = 0;
-+        }
-+
-+        if (digit >= 5) {
-+            if (roundAt - 1 < 0) {
-+                for (var k = 0; k > roundAt; k--) {
-+                    digits.unshift(0);
-+                    parsedNumber.i++;
-+                }
-+                digits.unshift(1);
-+                parsedNumber.i++;
-+            } else {
-+                digits[roundAt - 1]++;
-+            }
-+        }
-+
-+        // Pad out with zeros to get the required fraction length
-+        for (; fractionLen < Math.max(0, fractionSize); fractionLen++) digits.push(0);
-+
-+
-+        // Do any carrying, e.g. a digit was rounded up to 10
-+        var carry = digits.reduceRight(function(carry, d, i, digits) {
-+            d = d + carry;
-+            digits[i] = d % 10;
-+            return Math.floor(d / 10);
-+        }, 0);
-+        if (carry) {
-+            digits.unshift(carry);
-+            parsedNumber.i++;
-+        }
-+    }
-+
-+    /**
-+     * Format a number into a string
-+     * @param  {number} number       The number to format
-+     * @param  {{
-+     *           minFrac, // the minimum number of digits required in the fraction part of the number
-+     *           maxFrac, // the maximum number of digits required in the fraction part of the number
-+     *           gSize,   // number of digits in each group of separated digits
-+     *           lgSize,  // number of digits in the last group of digits before the decimal separator
-+     *           negPre,  // the string to go in front of a negative number (e.g. `-` or `(`))
-+     *           posPre,  // the string to go in front of a positive number
-+     *           negSuf,  // the string to go after a negative number (e.g. `)`)
-+     *           posSuf   // the string to go after a positive number
-+     *         }} pattern
-+     * @param  {string} groupSep     The string to separate groups of number (e.g. `,`)
-+     * @param  {string} decimalSep   The string to act as the decimal separator (e.g. `.`)
-+     * @param  {[type]} fractionSize The size of the fractional part of the number
-+     * @return {string}              The number formatted as a string
-+     */
-+    function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
-+
-+        if (!(isString(number) || isNumber(number)) || isNaN(number)) return '';
-+
-+        var isInfinity = !isFinite(number);
-+        var isZero = false;
-+        var numStr = Math.abs(number) + '',
-+            formattedText = '',
-+            parsedNumber;
-+
-+        if (isInfinity) {
-+            formattedText = '\u221e';
-+        } else {
-+            parsedNumber = parse(numStr);
-+
-+            roundNumber(parsedNumber, fractionSize, pattern.minFrac, pattern.maxFrac);
-+
-+            var digits = parsedNumber.d;
-+            var integerLen = parsedNumber.i;
-+            var exponent = parsedNumber.e;
-+            var decimals = [];
-+            isZero = digits.reduce(function(isZero, d) { return isZero && !d; }, true);
-+
-+            // pad zeros for small numbers
-+            while (integerLen < 0) {
-+                digits.unshift(0);
-+                integerLen++;
-+            }
-+
-+            // extract decimals digits
-+            if (integerLen > 0) {
-+                decimals = digits.splice(integerLen, digits.length);
-+            } else {
-+                decimals = digits;
-+                digits = [0];
-+            }
-+
-+            // format the integer digits with grouping separators
-+            var groups = [];
-+            if (digits.length >= pattern.lgSize) {
-+                groups.unshift(digits.splice(-pattern.lgSize, digits.length).join(''));
-+            }
-+            while (digits.length > pattern.gSize) {
-+                groups.unshift(digits.splice(-pattern.gSize, digits.length).join(''));
-+            }
-+            if (digits.length) {
-+                groups.unshift(digits.join(''));
-+            }
-+            formattedText = groups.join(groupSep);
-+
-+            // append the decimal digits
-+            if (decimals.length) {
-+                formattedText += decimalSep + decimals.join('');
-+            }
-+
-+            if (exponent) {
-+                formattedText += 'e+' + exponent;
-+            }
-+        }
-+        if (number < 0 && !isZero) {
-+            return pattern.negPre + formattedText + pattern.negSuf;
-+        } else {
-+            return pattern.posPre + formattedText + pattern.posSuf;
-+        }
-+    }
-+
-+    function padNumber(num, digits, trim, negWrap) {
-+        var neg = '';
-+        if (num < 0 || (negWrap && num <= 0)) {
-+            if (negWrap) {
-+                num = -num + 1;
-+            } else {
-+                num = -num;
-+                neg = '-';
-+            }
-+        }
-+        num = '' + num;
-+        while (num.length < digits) num = ZERO_CHAR + num;
-+        if (trim) {
-+            num = num.substr(num.length - digits);
-+        }
-+        return neg + num;
-+    }
-+
-+
-+    function dateGetter(name, size, offset, trim, negWrap) {
-+        offset = offset || 0;
-+        return function(date) {
-+            var value = date['get' + name]();
-+            if (offset > 0 || value > -offset) {
-+                value += offset;
-+            }
-+            if (value === 0 && offset === -12) value = 12;
-+            return padNumber(value, size, trim, negWrap);
-+        };
-+    }
-+
-+    function dateStrGetter(name, shortForm, standAlone) {
-+        return function(date, formats) {
-+            var value = date['get' + name]();
-+            var propPrefix = (standAlone ? 'STANDALONE' : '') + (shortForm ? 'SHORT' : '');
-+            var get = uppercase(propPrefix + name);
-+
-+            return formats[get][value];
-+        };
-+    }
-+
-+    function timeZoneGetter(date, formats, offset) {
-+        var zone = -1 * offset;
-+        var paddedZone = (zone >= 0) ? '+' : '';
-+
-+        paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) +
-+            padNumber(Math.abs(zone % 60), 2);
-+
-+        return paddedZone;
-+    }
-+
-+    function getFirstThursdayOfYear(year) {
-+        // 0 = index of January
-+        var dayOfWeekOnFirst = (new Date(year, 0, 1)).getDay();
-+        // 4 = index of Thursday (+1 to account for 1st = 5)
-+        // 11 = index of *next* Thursday (+1 account for 1st = 12)
-+        return new Date(year, 0, ((dayOfWeekOnFirst <= 4) ? 5 : 12) - dayOfWeekOnFirst);
-+    }
-+
-+    function getThursdayThisWeek(datetime) {
-+        return new Date(datetime.getFullYear(), datetime.getMonth(),
-+            // 4 = index of Thursday
-+            datetime.getDate() + (4 - datetime.getDay()));
-+    }
-+
-+    function weekGetter(size) {
-+        return function(date) {
-+            var firstThurs = getFirstThursdayOfYear(date.getFullYear()),
-+                thisThurs = getThursdayThisWeek(date);
-+
-+            var diff = +thisThurs - +firstThurs,
-+                result = 1 + Math.round(diff / 6.048e8); // 6.048e8 ms per week
-+
-+            return padNumber(result, size);
-+        };
-+    }
-+
-+    function ampmGetter(date, formats) {
-+        return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1];
-+    }
-+
-+    function eraGetter(date, formats) {
-+        return date.getFullYear() <= 0 ? formats.ERAS[0] : formats.ERAS[1];
-+    }
-+
-+    function longEraGetter(date, formats) {
-+        return date.getFullYear() <= 0 ? formats.ERANAMES[0] : formats.ERANAMES[1];
-+    }
-+
-+    var DATE_FORMATS = {
-+        yyyy: dateGetter('FullYear', 4, 0, false, true),
-+        yy: dateGetter('FullYear', 2, 0, true, true),
-+        y: dateGetter('FullYear', 1, 0, false, true),
-+        MMMM: dateStrGetter('Month'),
-+        MMM: dateStrGetter('Month', true),
-+        MM: dateGetter('Month', 2, 1),
-+        M: dateGetter('Month', 1, 1),
-+        LLLL: dateStrGetter('Month', false, true),
-+        dd: dateGetter('Date', 2),
-+        d: dateGetter('Date', 1),
-+        HH: dateGetter('Hours', 2),
-+        H: dateGetter('Hours', 1),
-+        hh: dateGetter('Hours', 2, -12),
-+        h: dateGetter('Hours', 1, -12),
-+        mm: dateGetter('Minutes', 2),
-+        m: dateGetter('Minutes', 1),
-+        ss: dateGetter('Seconds', 2),
-+        s: dateGetter('Seconds', 1),
-+        // while ISO 8601 requires fractions to be prefixed with `.` or `,`
-+        // we can be just safely rely on using `sss` since we currently don't support single or two digit fractions
-+        sss: dateGetter('Milliseconds', 3),
-+        EEEE: dateStrGetter('Day'),
-+        EEE: dateStrGetter('Day', true),
-+        a: ampmGetter,
-+        Z: timeZoneGetter,
-+        ww: weekGetter(2),
-+        w: weekGetter(1),
-+        G: eraGetter,
-+        GG: eraGetter,
-+        GGG: eraGetter,
-+        GGGG: longEraGetter
-+    };
-+
-+    var DATE_FORMATS_SPLIT = /((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|L+|d+|H+|h+|m+|s+|a|Z|G+|w+))([\s\S]*)/,
-+        NUMBER_STRING = /^-?\d+$/;
-+
-+    /**
-+     * @ngdoc filter
-+     * @name date
-+     * @kind function
-+     *
-+     * @description
-+     *   Formats `date` to a string based on the requested `format`.
-+     *
-+     *   `format` string can be composed of the following elements:
-+     *
-+     *   * `'yyyy'`: 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010)
-+     *   * `'yy'`: 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10)
-+     *   * `'y'`: 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199)
-+     *   * `'MMMM'`: Month in year (January-December)
-+     *   * `'MMM'`: Month in year (Jan-Dec)
-+     *   * `'MM'`: Month in year, padded (01-12)
-+     *   * `'M'`: Month in year (1-12)
-+     *   * `'LLLL'`: Stand-alone month in year (January-December)
-+     *   * `'dd'`: Day in month, padded (01-31)
-+     *   * `'d'`: Day in month (1-31)
-+     *   * `'EEEE'`: Day in Week,(Sunday-Saturday)
-+     *   * `'EEE'`: Day in Week, (Sun-Sat)
-+     *   * `'HH'`: Hour in day, padded (00-23)
-+     *   * `'H'`: Hour in day (0-23)
-+     *   * `'hh'`: Hour in AM/PM, padded (01-12)
-+     *   * `'h'`: Hour in AM/PM, (1-12)
-+     *   * `'mm'`: Minute in hour, padded (00-59)
-+     *   * `'m'`: Minute in hour (0-59)
-+     *   * `'ss'`: Second in minute, padded (00-59)
-+     *   * `'s'`: Second in minute (0-59)
-+     *   * `'sss'`: Millisecond in second, padded (000-999)
-+     *   * `'a'`: AM/PM marker
-+     *   * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200)
-+     *   * `'ww'`: Week of year, padded (00-53). Week 01 is the week with the first Thursday of the year
-+     *   * `'w'`: Week of year (0-53). Week 1 is the week with the first Thursday of the year
-+     *   * `'G'`, `'GG'`, `'GGG'`: The abbreviated form of the era string (e.g. 'AD')
-+     *   * `'GGGG'`: The long form of the era string (e.g. 'Anno Domini')
-+     *
-+     *   `format` string can also be one of the following predefined
-+     *   {@link guide/i18n localizable formats}:
-+     *
-+     *   * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale
-+     *     (e.g. Sep 3, 2010 12:05:08 PM)
-+     *   * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US  locale (e.g. 9/3/10 12:05 PM)
-+     *   * `'fullDate'`: equivalent to `'EEEE, MMMM d, y'` for en_US  locale
-+     *     (e.g. Friday, September 3, 2010)
-+     *   * `'longDate'`: equivalent to `'MMMM d, y'` for en_US  locale (e.g. September 3, 2010)
-+     *   * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US  locale (e.g. Sep 3, 2010)
-+     *   * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10)
-+     *   * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 PM)
-+     *   * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 PM)
-+     *
-+     *   `format` string can contain literal values. These need to be escaped by surrounding with single quotes (e.g.
-+     *   `"h 'in the morning'"`). In order to output a single quote, escape it - i.e., two single quotes in a sequence
-+     *   (e.g. `"h 'o''clock'"`).
-+     *
-+     *   Any other characters in the `format` string will be output as-is.
-+     *
-+     * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or
-+     *    number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its
-+     *    shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is
-+     *    specified in the string input, the time is considered to be in the local timezone.
-+     * @param {string=} format Formatting rules (see Description). If not specified,
-+     *    `mediumDate` is used.
-+     * @param {string=} timezone Timezone to be used for formatting. It understands UTC/GMT and the
-+     *    continental US time zone abbreviations, but for general use, use a time zone offset, for
-+     *    example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
-+     *    If not specified, the timezone of the browser will be used.
-+     * @returns {string} Formatted string or the input if input is not recognized as date/millis.
-+     *
-+     * @example
-+     <example name="filter-date">
-+     <file name="index.html">
-+     <span ng-non-bindable>{{1288323623006 | date:'medium'}}</span>:
-+     <span>{{1288323623006 | date:'medium'}}</span><br>
-+     <span ng-non-bindable>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span>:
-+     <span>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span><br>
-+     <span ng-non-bindable>{{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}</span>:
-+     <span>{{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}</span><br>
-+     <span ng-non-bindable>{{1288323623006 | date:"MM/dd/yyyy 'at' h:mma"}}</span>:
-+     <span>{{'1288323623006' | date:"MM/dd/yyyy 'at' h:mma"}}</span><br>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should format date', function() {
-+         expect(element(by.binding("1288323623006 | date:'medium'")).getText()).
-+            toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} (AM|PM)/);
-+         expect(element(by.binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).getText()).
-+            toMatch(/2010-10-2\d \d{2}:\d{2}:\d{2} (-|\+)?\d{4}/);
-+         expect(element(by.binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).getText()).
-+            toMatch(/10\/2\d\/2010 @ \d{1,2}:\d{2}(AM|PM)/);
-+         expect(element(by.binding("'1288323623006' | date:\"MM/dd/yyyy 'at' h:mma\"")).getText()).
-+            toMatch(/10\/2\d\/2010 at \d{1,2}:\d{2}(AM|PM)/);
-+       });
-+     </file>
-+     </example>
-+     */
-+    dateFilter.$inject = ['$locale'];
-+    function dateFilter($locale) {
-+
-+
-+        var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;
-+        // 1        2       3         4          5          6          7          8  9     10      11
-+        function jsonStringToDate(string) {
-+            var match;
-+            if ((match = string.match(R_ISO8601_STR))) {
-+                var date = new Date(0),
-+                    tzHour = 0,
-+                    tzMin  = 0,
-+                    dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear,
-+                    timeSetter = match[8] ? date.setUTCHours : date.setHours;
-+
-+                if (match[9]) {
-+                    tzHour = toInt(match[9] + match[10]);
-+                    tzMin = toInt(match[9] + match[11]);
-+                }
-+                dateSetter.call(date, toInt(match[1]), toInt(match[2]) - 1, toInt(match[3]));
-+                var h = toInt(match[4] || 0) - tzHour;
-+                var m = toInt(match[5] || 0) - tzMin;
-+                var s = toInt(match[6] || 0);
-+                var ms = Math.round(parseFloat('0.' + (match[7] || 0)) * 1000);
-+                timeSetter.call(date, h, m, s, ms);
-+                return date;
-+            }
-+            return string;
-+        }
-+
-+
-+        return function(date, format, timezone) {
-+            var text = '',
-+                parts = [],
-+                fn, match;
-+
-+            format = format || 'mediumDate';
-+            format = $locale.DATETIME_FORMATS[format] || format;
-+            if (isString(date)) {
-+                date = NUMBER_STRING.test(date) ? toInt(date) : jsonStringToDate(date);
-+            }
-+
-+            if (isNumber(date)) {
-+                date = new Date(date);
-+            }
-+
-+            if (!isDate(date) || !isFinite(date.getTime())) {
-+                return date;
-+            }
-+
-+            while (format) {
-+                match = DATE_FORMATS_SPLIT.exec(format);
-+                if (match) {
-+                    parts = concat(parts, match, 1);
-+                    format = parts.pop();
-+                } else {
-+                    parts.push(format);
-+                    format = null;
-+                }
-+            }
-+
-+            var dateTimezoneOffset = date.getTimezoneOffset();
-+            if (timezone) {
-+                dateTimezoneOffset = timezoneToOffset(timezone, dateTimezoneOffset);
-+                date = convertTimezoneToLocal(date, timezone, true);
-+            }
-+            forEach(parts, function(value) {
-+                fn = DATE_FORMATS[value];
-+                text += fn ? fn(date, $locale.DATETIME_FORMATS, dateTimezoneOffset)
-+                    : value === '\'\'' ? '\'' : value.replace(/(^'|'$)/g, '').replace(/''/g, '\'');
-+            });
-+
-+            return text;
-+        };
-+    }
-+
-+
-+    /**
-+     * @ngdoc filter
-+     * @name json
-+     * @kind function
-+     *
-+     * @description
-+     *   Allows you to convert a JavaScript object into JSON string.
-+     *
-+     *   This filter is mostly useful for debugging. When using the double curly {{value}} notation
-+     *   the binding is automatically converted to JSON.
-+     *
-+     * @param {*} object Any JavaScript object (including arrays and primitive types) to filter.
-+     * @param {number=} spacing The number of spaces to use per indentation, defaults to 2.
-+     * @returns {string} JSON string.
-+     *
-+     *
-+     * @example
-+     <example name="filter-json">
-+     <file name="index.html">
-+     <pre id="default-spacing">{{ {'name':'value'} | json }}</pre>
-+     <pre id="custom-spacing">{{ {'name':'value'} | json:4 }}</pre>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should jsonify filtered objects', function() {
-+         expect(element(by.id('default-spacing')).getText()).toMatch(/\{\n {2}"name": ?"value"\n}/);
-+         expect(element(by.id('custom-spacing')).getText()).toMatch(/\{\n {4}"name": ?"value"\n}/);
-+       });
-+     </file>
-+     </example>
-+     *
-+     */
-+    function jsonFilter() {
-+        return function(object, spacing) {
-+            if (isUndefined(spacing)) {
-+                spacing = 2;
-+            }
-+            return toJson(object, spacing);
-+        };
-+    }
-+
-+
-+    /**
-+     * @ngdoc filter
-+     * @name lowercase
-+     * @kind function
-+     * @description
-+     * Converts string to lowercase.
-+     *
-+     * See the {@link ng.uppercase uppercase filter documentation} for a functionally identical example.
-+     *
-+     * @see angular.lowercase
-+     */
-+    var lowercaseFilter = valueFn(lowercase);
-+
-+
-+    /**
-+     * @ngdoc filter
-+     * @name uppercase
-+     * @kind function
-+     * @description
-+     * Converts string to uppercase.
-+     * @example
-+     <example module="uppercaseFilterExample" name="filter-uppercase">
-+     <file name="index.html">
-+     <script>
-+     angular.module('uppercaseFilterExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+             $scope.title = 'This is a title';
-+           }]);
-+     </script>
-+     <div ng-controller="ExampleController">
-+     <!-- This title should be formatted normally -->
-+     <h1>{{title}}</h1>
-+     <!-- This title should be capitalized -->
-+     <h1>{{title | uppercase}}</h1>
-+     </div>
-+     </file>
-+     </example>
-+     */
-+    var uppercaseFilter = valueFn(uppercase);
-+
-+    /**
-+     * @ngdoc filter
-+     * @name limitTo
-+     * @kind function
-+     *
-+     * @description
-+     * Creates a new array or string containing only a specified number of elements. The elements are
-+     * taken from either the beginning or the end of the source array, string or number, as specified by
-+     * the value and sign (positive or negative) of `limit`. Other array-like objects are also supported
-+     * (e.g. array subclasses, NodeLists, jqLite/jQuery collections etc). If a number is used as input,
-+     * it is converted to a string.
-+     *
-+     * @param {Array|ArrayLike|string|number} input - Array/array-like, string or number to be limited.
-+     * @param {string|number} limit - The length of the returned array or string. If the `limit` number
-+     *     is positive, `limit` number of items from the beginning of the source array/string are copied.
-+     *     If the number is negative, `limit` number  of items from the end of the source array/string
-+     *     are copied. The `limit` will be trimmed if it exceeds `array.length`. If `limit` is undefined,
-+     *     the input will be returned unchanged.
-+     * @param {(string|number)=} begin - Index at which to begin limitation. As a negative index,
-+     *     `begin` indicates an offset from the end of `input`. Defaults to `0`.
-+     * @returns {Array|string} A new sub-array or substring of length `limit` or less if the input had
-+     *     less than `limit` elements.
-+     *
-+     * @example
-+     <example module="limitToExample" name="limit-to-filter">
-+     <file name="index.html">
-+     <script>
-+     angular.module('limitToExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+             $scope.numbers = [1,2,3,4,5,6,7,8,9];
-+             $scope.letters = "abcdefghi";
-+             $scope.longNumber = 2345432342;
-+             $scope.numLimit = 3;
-+             $scope.letterLimit = 3;
-+             $scope.longNumberLimit = 3;
-+           }]);
-+     </script>
-+     <div ng-controller="ExampleController">
-+     <label>
-+     Limit {{numbers}} to:
-+     <input type="number" step="1" ng-model="numLimit">
-+     </label>
-+     <p>Output numbers: {{ numbers | limitTo:numLimit }}</p>
-+     <label>
-+     Limit {{letters}} to:
-+     <input type="number" step="1" ng-model="letterLimit">
-+     </label>
-+     <p>Output letters: {{ letters | limitTo:letterLimit }}</p>
-+     <label>
-+     Limit {{longNumber}} to:
-+     <input type="number" step="1" ng-model="longNumberLimit">
-+     </label>
-+     <p>Output long number: {{ longNumber | limitTo:longNumberLimit }}</p>
-+     </div>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     var numLimitInput = element(by.model('numLimit'));
-+     var letterLimitInput = element(by.model('letterLimit'));
-+     var longNumberLimitInput = element(by.model('longNumberLimit'));
-+     var limitedNumbers = element(by.binding('numbers | limitTo:numLimit'));
-+     var limitedLetters = element(by.binding('letters | limitTo:letterLimit'));
-+     var limitedLongNumber = element(by.binding('longNumber | limitTo:longNumberLimit'));
-+
-+     it('should limit the number array to first three items', function() {
-+         expect(numLimitInput.getAttribute('value')).toBe('3');
-+         expect(letterLimitInput.getAttribute('value')).toBe('3');
-+         expect(longNumberLimitInput.getAttribute('value')).toBe('3');
-+         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3]');
-+         expect(limitedLetters.getText()).toEqual('Output letters: abc');
-+         expect(limitedLongNumber.getText()).toEqual('Output long number: 234');
-+       });
-+
-+     // There is a bug in safari and protractor that doesn't like the minus key
-+     // it('should update the output when -3 is entered', function() {
-+       //   numLimitInput.clear();
-+       //   numLimitInput.sendKeys('-3');
-+       //   letterLimitInput.clear();
-+       //   letterLimitInput.sendKeys('-3');
-+       //   longNumberLimitInput.clear();
-+       //   longNumberLimitInput.sendKeys('-3');
-+       //   expect(limitedNumbers.getText()).toEqual('Output numbers: [7,8,9]');
-+       //   expect(limitedLetters.getText()).toEqual('Output letters: ghi');
-+       //   expect(limitedLongNumber.getText()).toEqual('Output long number: 342');
-+       // });
-+
-+     it('should not exceed the maximum size of input array', function() {
-+         numLimitInput.clear();
-+         numLimitInput.sendKeys('100');
-+         letterLimitInput.clear();
-+         letterLimitInput.sendKeys('100');
-+         longNumberLimitInput.clear();
-+         longNumberLimitInput.sendKeys('100');
-+         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3,4,5,6,7,8,9]');
-+         expect(limitedLetters.getText()).toEqual('Output letters: abcdefghi');
-+         expect(limitedLongNumber.getText()).toEqual('Output long number: 2345432342');
-+       });
-+     </file>
-+     </example>
-+     */
-+    function limitToFilter() {
-+        return function(input, limit, begin) {
-+            if (Math.abs(Number(limit)) === Infinity) {
-+                limit = Number(limit);
-+            } else {
-+                limit = toInt(limit);
-+            }
-+            if (isNumberNaN(limit)) return input;
-+
-+            if (isNumber(input)) input = input.toString();
-+            if (!isArrayLike(input)) return input;
-+
-+            begin = (!begin || isNaN(begin)) ? 0 : toInt(begin);
-+            begin = (begin < 0) ? Math.max(0, input.length + begin) : begin;
-+
-+            if (limit >= 0) {
-+                return sliceFn(input, begin, begin + limit);
-+            } else {
-+                if (begin === 0) {
-+                    return sliceFn(input, limit, input.length);
-+                } else {
-+                    return sliceFn(input, Math.max(0, begin + limit), begin);
-+                }
-+            }
-+        };
-+    }
-+
-+    function sliceFn(input, begin, end) {
-+        if (isString(input)) return input.slice(begin, end);
-+
-+        return slice.call(input, begin, end);
-+    }
-+
-+    /**
-+     * @ngdoc filter
-+     * @name orderBy
-+     * @kind function
-+     *
-+     * @description
-+     * Returns an array containing the items from the specified `collection`, ordered by a `comparator`
-+     * function based on the values computed using the `expression` predicate.
-+     *
-+     * For example, `[{id: 'foo'}, {id: 'bar'}] | orderBy:'id'` would result in
-+     * `[{id: 'bar'}, {id: 'foo'}]`.
-+     *
-+     * The `collection` can be an Array or array-like object (e.g. NodeList, jQuery object, TypedArray,
-+     * String, etc).
-+     *
-+     * The `expression` can be a single predicate, or a list of predicates each serving as a tie-breaker
-+     * for the preceding one. The `expression` is evaluated against each item and the output is used
-+     * for comparing with other items.
-+     *
-+     * You can change the sorting order by setting `reverse` to `true`. By default, items are sorted in
-+     * ascending order.
-+     *
-+     * The comparison is done using the `comparator` function. If none is specified, a default, built-in
-+     * comparator is used (see below for details - in a nutshell, it compares numbers numerically and
-+     * strings alphabetically).
-+     *
-+     * ### Under the hood
-+     *
-+     * Ordering the specified `collection` happens in two phases:
-+     *
-+     * 1. All items are passed through the predicate (or predicates), and the returned values are saved
-+     *    along with their type (`string`, `number` etc). For example, an item `{label: 'foo'}`, passed
-+     *    through a predicate that extracts the value of the `label` property, would be transformed to:
-+     *    ```
-+     *    {
-+     *      value: 'foo',
-+     *      type: 'string',
-+     *      index: ...
-+     *    }
-+     *    ```
-+     * 2. The comparator function is used to sort the items, based on the derived values, types and
-+     *    indices.
-+     *
-+     * If you use a custom comparator, it will be called with pairs of objects of the form
-+     * `{value: ..., type: '...', index: ...}` and is expected to return `0` if the objects are equal
-+     * (as far as the comparator is concerned), `-1` if the 1st one should be ranked higher than the
-+     * second, or `1` otherwise.
-+     *
-+     * In order to ensure that the sorting will be deterministic across platforms, if none of the
-+     * specified predicates can distinguish between two items, `orderBy` will automatically introduce a
-+     * dummy predicate that returns the item's index as `value`.
-+     * (If you are using a custom comparator, make sure it can handle this predicate as well.)
-+     *
-+     * If a custom comparator still can't distinguish between two items, then they will be sorted based
-+     * on their index using the built-in comparator.
-+     *
-+     * Finally, in an attempt to simplify things, if a predicate returns an object as the extracted
-+     * value for an item, `orderBy` will try to convert that object to a primitive value, before passing
-+     * it to the comparator. The following rules govern the conversion:
-+     *
-+     * 1. If the object has a `valueOf()` method that returns a primitive, its return value will be
-+     *    used instead.<br />
-+     *    (If the object has a `valueOf()` method that returns another object, then the returned object
-+     *    will be used in subsequent steps.)
-+     * 2. If the object has a custom `toString()` method (i.e. not the one inherited from `Object`) that
-+     *    returns a primitive, its return value will be used instead.<br />
-+     *    (If the object has a `toString()` method that returns another object, then the returned object
-+     *    will be used in subsequent steps.)
-+     * 3. No conversion; the object itself is used.
-+     *
-+     * ### The default comparator
-+     *
-+     * The default, built-in comparator should be sufficient for most usecases. In short, it compares
-+     * numbers numerically, strings alphabetically (and case-insensitively), for objects falls back to
-+     * using their index in the original collection, and sorts values of different types by type.
-+     *
-+     * More specifically, it follows these steps to determine the relative order of items:
-+     *
-+     * 1. If the compared values are of different types, compare the types themselves alphabetically.
-+     * 2. If both values are of type `string`, compare them alphabetically in a case- and
-+     *    locale-insensitive way.
-+     * 3. If both values are objects, compare their indices instead.
-+     * 4. Otherwise, return:
-+     *    -  `0`, if the values are equal (by strict equality comparison, i.e. using `===`).
-+     *    - `-1`, if the 1st value is "less than" the 2nd value (compared using the `<` operator).
-+     *    -  `1`, otherwise.
-+     *
-+     * **Note:** If you notice numbers not being sorted as expected, make sure they are actually being
-+     *           saved as numbers and not strings.
-+     * **Note:** For the purpose of sorting, `null` values are treated as the string `'null'` (i.e.
-+     *           `type: 'string'`, `value: 'null'`). This may cause unexpected sort order relative to
-+     *           other values.
-+     *
-+     * @param {Array|ArrayLike} collection - The collection (array or array-like object) to sort.
-+     * @param {(Function|string|Array.<Function|string>)=} expression - A predicate (or list of
-+     *    predicates) to be used by the comparator to determine the order of elements.
-+     *
-+     *    Can be one of:
-+     *
-+     *    - `Function`: A getter function. This function will be called with each item as argument and
-+     *      the return value will be used for sorting.
-+     *    - `string`: An AngularJS expression. This expression will be evaluated against each item and the
-+     *      result will be used for sorting. For example, use `'label'` to sort by a property called
-+     *      `label` or `'label.substring(0, 3)'` to sort by the first 3 characters of the `label`
-+     *      property.<br />
-+     *      (The result of a constant expression is interpreted as a property name to be used for
-+     *      comparison. For example, use `'"special name"'` (note the extra pair of quotes) to sort by a
-+     *      property called `special name`.)<br />
-+     *      An expression can be optionally prefixed with `+` or `-` to control the sorting direction,
-+     *      ascending or descending. For example, `'+label'` or `'-label'`. If no property is provided,
-+     *      (e.g. `'+'` or `'-'`), the collection element itself is used in comparisons.
-+     *    - `Array`: An array of function and/or string predicates. If a predicate cannot determine the
-+     *      relative order of two items, the next predicate is used as a tie-breaker.
-+     *
-+     * **Note:** If the predicate is missing or empty then it defaults to `'+'`.
-+     *
-+     * @param {boolean=} reverse - If `true`, reverse the sorting order.
-+     * @param {(Function)=} comparator - The comparator function used to determine the relative order of
-+     *    value pairs. If omitted, the built-in comparator will be used.
-+     *
-+     * @returns {Array} - The sorted array.
-+     *
-+     *
-+     * @example
-+     * ### Ordering a table with `ngRepeat`
-+     *
-+     * The example below demonstrates a simple {@link ngRepeat ngRepeat}, where the data is sorted by
-+     * age in descending order (expression is set to `'-age'`). The `comparator` is not set, which means
-+     * it defaults to the built-in comparator.
-+     *
-+     <example name="orderBy-static" module="orderByExample1">
-+     <file name="index.html">
-+     <div ng-controller="ExampleController">
-+     <table class="friends">
-+     <tr>
-+     <th>Name</th>
-+     <th>Phone Number</th>
-+     <th>Age</th>
-+     </tr>
-+     <tr ng-repeat="friend in friends | orderBy:'-age'">
-+     <td>{{friend.name}}</td>
-+     <td>{{friend.phone}}</td>
-+     <td>{{friend.age}}</td>
-+     </tr>
-+     </table>
-+     </div>
-+     </file>
-+     <file name="script.js">
-+     angular.module('orderByExample1', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+           $scope.friends = [
-+             {name: 'John',   phone: '555-1212',  age: 10},
-+             {name: 'Mary',   phone: '555-9876',  age: 19},
-+             {name: 'Mike',   phone: '555-4321',  age: 21},
-+             {name: 'Adam',   phone: '555-5678',  age: 35},
-+             {name: 'Julie',  phone: '555-8765',  age: 29}
-+           ];
-+         }]);
-+     </file>
-+     <file name="style.css">
-+     .friends {
-+         border-collapse: collapse;
-+       }
-+
-+     .friends th {
-+         border-bottom: 1px solid;
-+       }
-+     .friends td, .friends th {
-+         border-left: 1px solid;
-+         padding: 5px 10px;
-+       }
-+     .friends td:first-child, .friends th:first-child {
-+         border-left: none;
-+       }
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     // Element locators
-+     var names = element.all(by.repeater('friends').column('friend.name'));
-+
-+     it('should sort friends by age in reverse order', function() {
-+         expect(names.get(0).getText()).toBe('Adam');
-+         expect(names.get(1).getText()).toBe('Julie');
-+         expect(names.get(2).getText()).toBe('Mike');
-+         expect(names.get(3).getText()).toBe('Mary');
-+         expect(names.get(4).getText()).toBe('John');
-+       });
-+     </file>
-+     </example>
-+     * <hr />
-      *
--     * To be secure by default, you want to ensure that any such bindings are disallowed unless you can
--     * determine that something explicitly says it's safe to use a value for binding in that
--     * context.  You can then audit your code (a simple grep would do) to ensure that this is only done
--     * for those values that you can easily tell are safe - because they were received from your server,
--     * sanitized by your library, etc.  You can organize your codebase to help with this - perhaps
--     * allowing only the files in a specific directory to do this.  Ensuring that the internal API
--     * exposed by that code doesn't markup arbitrary values as safe then becomes a more manageable task.
-+     * @example
-+     * ### Changing parameters dynamically
-      *
--     * In the case of AngularJS' SCE service, one uses {@link ng.$sce#trustAs $sce.trustAs}
--     * (and shorthand methods such as {@link ng.$sce#trustAsHtml $sce.trustAsHtml}, etc.) to
--     * obtain values that will be accepted by SCE / privileged contexts.
-+     * All parameters can be changed dynamically. The next example shows how you can make the columns of
-+     * a table sortable, by binding the `expression` and `reverse` parameters to scope properties.
-+     *
-+     <example name="orderBy-dynamic" module="orderByExample2">
-+     <file name="index.html">
-+     <div ng-controller="ExampleController">
-+     <pre>Sort by = {{propertyName}}; reverse = {{reverse}}</pre>
-+     <hr/>
-+     <button ng-click="propertyName = null; reverse = false">Set to unsorted</button>
-+     <hr/>
-+     <table class="friends">
-+     <tr>
-+     <th>
-+     <button ng-click="sortBy('name')">Name</button>
-+     <span class="sortorder" ng-show="propertyName === 'name'" ng-class="{reverse: reverse}"></span>
-+     </th>
-+     <th>
-+     <button ng-click="sortBy('phone')">Phone Number</button>
-+     <span class="sortorder" ng-show="propertyName === 'phone'" ng-class="{reverse: reverse}"></span>
-+     </th>
-+     <th>
-+     <button ng-click="sortBy('age')">Age</button>
-+     <span class="sortorder" ng-show="propertyName === 'age'" ng-class="{reverse: reverse}"></span>
-+     </th>
-+     </tr>
-+     <tr ng-repeat="friend in friends | orderBy:propertyName:reverse">
-+     <td>{{friend.name}}</td>
-+     <td>{{friend.phone}}</td>
-+     <td>{{friend.age}}</td>
-+     </tr>
-+     </table>
-+     </div>
-+     </file>
-+     <file name="script.js">
-+     angular.module('orderByExample2', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+           var friends = [
-+             {name: 'John',   phone: '555-1212',  age: 10},
-+             {name: 'Mary',   phone: '555-9876',  age: 19},
-+             {name: 'Mike',   phone: '555-4321',  age: 21},
-+             {name: 'Adam',   phone: '555-5678',  age: 35},
-+             {name: 'Julie',  phone: '555-8765',  age: 29}
-+           ];
-+
-+           $scope.propertyName = 'age';
-+           $scope.reverse = true;
-+           $scope.friends = friends;
-+
-+           $scope.sortBy = function(propertyName) {
-+             $scope.reverse = ($scope.propertyName === propertyName) ? !$scope.reverse : false;
-+             $scope.propertyName = propertyName;
-+           };
-+         }]);
-+     </file>
-+     <file name="style.css">
-+     .friends {
-+         border-collapse: collapse;
-+       }
-+
-+     .friends th {
-+         border-bottom: 1px solid;
-+       }
-+     .friends td, .friends th {
-+         border-left: 1px solid;
-+         padding: 5px 10px;
-+       }
-+     .friends td:first-child, .friends th:first-child {
-+         border-left: none;
-+       }
-+
-+     .sortorder:after {
-+         content: '\25b2';   // BLACK UP-POINTING TRIANGLE
-+       }
-+     .sortorder.reverse:after {
-+         content: '\25bc';   // BLACK DOWN-POINTING TRIANGLE
-+       }
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     // Element locators
-+     var unsortButton = element(by.partialButtonText('unsorted'));
-+     var nameHeader = element(by.partialButtonText('Name'));
-+     var phoneHeader = element(by.partialButtonText('Phone'));
-+     var ageHeader = element(by.partialButtonText('Age'));
-+     var firstName = element(by.repeater('friends').column('friend.name').row(0));
-+     var lastName = element(by.repeater('friends').column('friend.name').row(4));
-+
-+     it('should sort friends by some property, when clicking on the column header', function() {
-+         expect(firstName.getText()).toBe('Adam');
-+         expect(lastName.getText()).toBe('John');
-+
-+         phoneHeader.click();
-+         expect(firstName.getText()).toBe('John');
-+         expect(lastName.getText()).toBe('Mary');
-+
-+         nameHeader.click();
-+         expect(firstName.getText()).toBe('Adam');
-+         expect(lastName.getText()).toBe('Mike');
-+
-+         ageHeader.click();
-+         expect(firstName.getText()).toBe('John');
-+         expect(lastName.getText()).toBe('Adam');
-+       });
-+
-+     it('should sort friends in reverse order, when clicking on the same column', function() {
-+         expect(firstName.getText()).toBe('Adam');
-+         expect(lastName.getText()).toBe('John');
-+
-+         ageHeader.click();
-+         expect(firstName.getText()).toBe('John');
-+         expect(lastName.getText()).toBe('Adam');
-+
-+         ageHeader.click();
-+         expect(firstName.getText()).toBe('Adam');
-+         expect(lastName.getText()).toBe('John');
-+       });
-+
-+     it('should restore the original order, when clicking "Set to unsorted"', function() {
-+         expect(firstName.getText()).toBe('Adam');
-+         expect(lastName.getText()).toBe('John');
-+
-+         unsortButton.click();
-+         expect(firstName.getText()).toBe('John');
-+         expect(lastName.getText()).toBe('Julie');
-+       });
-+     </file>
-+     </example>
-+     * <hr />
-+     *
-+     * @example
-+     * ### Using `orderBy` inside a controller
-+     *
-+     * It is also possible to call the `orderBy` filter manually, by injecting `orderByFilter`, and
-+     * calling it with the desired parameters. (Alternatively, you could inject the `$filter` factory
-+     * and retrieve the `orderBy` filter with `$filter('orderBy')`.)
-+     *
-+     <example name="orderBy-call-manually" module="orderByExample3">
-+     <file name="index.html">
-+     <div ng-controller="ExampleController">
-+     <pre>Sort by = {{propertyName}}; reverse = {{reverse}}</pre>
-+     <hr/>
-+     <button ng-click="sortBy(null)">Set to unsorted</button>
-+     <hr/>
-+     <table class="friends">
-+     <tr>
-+     <th>
-+     <button ng-click="sortBy('name')">Name</button>
-+     <span class="sortorder" ng-show="propertyName === 'name'" ng-class="{reverse: reverse}"></span>
-+     </th>
-+     <th>
-+     <button ng-click="sortBy('phone')">Phone Number</button>
-+     <span class="sortorder" ng-show="propertyName === 'phone'" ng-class="{reverse: reverse}"></span>
-+     </th>
-+     <th>
-+     <button ng-click="sortBy('age')">Age</button>
-+     <span class="sortorder" ng-show="propertyName === 'age'" ng-class="{reverse: reverse}"></span>
-+     </th>
-+     </tr>
-+     <tr ng-repeat="friend in friends">
-+     <td>{{friend.name}}</td>
-+     <td>{{friend.phone}}</td>
-+     <td>{{friend.age}}</td>
-+     </tr>
-+     </table>
-+     </div>
-+     </file>
-+     <file name="script.js">
-+     angular.module('orderByExample3', [])
-+     .controller('ExampleController', ['$scope', 'orderByFilter', function($scope, orderBy) {
-+           var friends = [
-+             {name: 'John',   phone: '555-1212',  age: 10},
-+             {name: 'Mary',   phone: '555-9876',  age: 19},
-+             {name: 'Mike',   phone: '555-4321',  age: 21},
-+             {name: 'Adam',   phone: '555-5678',  age: 35},
-+             {name: 'Julie',  phone: '555-8765',  age: 29}
-+           ];
-+
-+           $scope.propertyName = 'age';
-+           $scope.reverse = true;
-+           $scope.friends = orderBy(friends, $scope.propertyName, $scope.reverse);
-+
-+           $scope.sortBy = function(propertyName) {
-+             $scope.reverse = (propertyName !== null && $scope.propertyName === propertyName)
-+                 ? !$scope.reverse : false;
-+             $scope.propertyName = propertyName;
-+             $scope.friends = orderBy(friends, $scope.propertyName, $scope.reverse);
-+           };
-+         }]);
-+     </file>
-+     <file name="style.css">
-+     .friends {
-+         border-collapse: collapse;
-+       }
-+
-+     .friends th {
-+         border-bottom: 1px solid;
-+       }
-+     .friends td, .friends th {
-+         border-left: 1px solid;
-+         padding: 5px 10px;
-+       }
-+     .friends td:first-child, .friends th:first-child {
-+         border-left: none;
-+       }
-+
-+     .sortorder:after {
-+         content: '\25b2';   // BLACK UP-POINTING TRIANGLE
-+       }
-+     .sortorder.reverse:after {
-+         content: '\25bc';   // BLACK DOWN-POINTING TRIANGLE
-+       }
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     // Element locators
-+     var unsortButton = element(by.partialButtonText('unsorted'));
-+     var nameHeader = element(by.partialButtonText('Name'));
-+     var phoneHeader = element(by.partialButtonText('Phone'));
-+     var ageHeader = element(by.partialButtonText('Age'));
-+     var firstName = element(by.repeater('friends').column('friend.name').row(0));
-+     var lastName = element(by.repeater('friends').column('friend.name').row(4));
-+
-+     it('should sort friends by some property, when clicking on the column header', function() {
-+         expect(firstName.getText()).toBe('Adam');
-+         expect(lastName.getText()).toBe('John');
-+
-+         phoneHeader.click();
-+         expect(firstName.getText()).toBe('John');
-+         expect(lastName.getText()).toBe('Mary');
-+
-+         nameHeader.click();
-+         expect(firstName.getText()).toBe('Adam');
-+         expect(lastName.getText()).toBe('Mike');
-+
-+         ageHeader.click();
-+         expect(firstName.getText()).toBe('John');
-+         expect(lastName.getText()).toBe('Adam');
-+       });
-+
-+     it('should sort friends in reverse order, when clicking on the same column', function() {
-+         expect(firstName.getText()).toBe('Adam');
-+         expect(lastName.getText()).toBe('John');
-+
-+         ageHeader.click();
-+         expect(firstName.getText()).toBe('John');
-+         expect(lastName.getText()).toBe('Adam');
-+
-+         ageHeader.click();
-+         expect(firstName.getText()).toBe('Adam');
-+         expect(lastName.getText()).toBe('John');
-+       });
-+
-+     it('should restore the original order, when clicking "Set to unsorted"', function() {
-+         expect(firstName.getText()).toBe('Adam');
-+         expect(lastName.getText()).toBe('John');
-+
-+         unsortButton.click();
-+         expect(firstName.getText()).toBe('John');
-+         expect(lastName.getText()).toBe('Julie');
-+       });
-+     </file>
-+     </example>
-+     * <hr />
-+     *
-+     * @example
-+     * ### Using a custom comparator
-+     *
-+     * If you have very specific requirements about the way items are sorted, you can pass your own
-+     * comparator function. For example, you might need to compare some strings in a locale-sensitive
-+     * way. (When specifying a custom comparator, you also need to pass a value for the `reverse`
-+     * argument - passing `false` retains the default sorting order, i.e. ascending.)
-+     *
-+     <example name="orderBy-custom-comparator" module="orderByExample4">
-+     <file name="index.html">
-+     <div ng-controller="ExampleController">
-+     <div class="friends-container custom-comparator">
-+     <h3>Locale-sensitive Comparator</h3>
-+     <table class="friends">
-+     <tr>
-+     <th>Name</th>
-+     <th>Favorite Letter</th>
-+     </tr>
-+     <tr ng-repeat="friend in friends | orderBy:'favoriteLetter':false:localeSensitiveComparator">
-+     <td>{{friend.name}}</td>
-+     <td>{{friend.favoriteLetter}}</td>
-+     </tr>
-+     </table>
-+     </div>
-+     <div class="friends-container default-comparator">
-+     <h3>Default Comparator</h3>
-+     <table class="friends">
-+     <tr>
-+     <th>Name</th>
-+     <th>Favorite Letter</th>
-+     </tr>
-+     <tr ng-repeat="friend in friends | orderBy:'favoriteLetter'">
-+     <td>{{friend.name}}</td>
-+     <td>{{friend.favoriteLetter}}</td>
-+     </tr>
-+     </table>
-+     </div>
-+     </div>
-+     </file>
-+     <file name="script.js">
-+     angular.module('orderByExample4', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+           $scope.friends = [
-+             {name: 'John',   favoriteLetter: 'Ä'},
-+             {name: 'Mary',   favoriteLetter: 'Ü'},
-+             {name: 'Mike',   favoriteLetter: 'Ö'},
-+             {name: 'Adam',   favoriteLetter: 'H'},
-+             {name: 'Julie',  favoriteLetter: 'Z'}
-+           ];
-+
-+           $scope.localeSensitiveComparator = function(v1, v2) {
-+             // If we don't get strings, just compare by index
-+             if (v1.type !== 'string' || v2.type !== 'string') {
-+               return (v1.index < v2.index) ? -1 : 1;
-+             }
-+
-+             // Compare strings alphabetically, taking locale into account
-+             return v1.value.localeCompare(v2.value);
-+           };
-+         }]);
-+     </file>
-+     <file name="style.css">
-+     .friends-container {
-+         display: inline-block;
-+         margin: 0 30px;
-+       }
-+
-+     .friends {
-+         border-collapse: collapse;
-+       }
-+
-+     .friends th {
-+         border-bottom: 1px solid;
-+       }
-+     .friends td, .friends th {
-+         border-left: 1px solid;
-+         padding: 5px 10px;
-+       }
-+     .friends td:first-child, .friends th:first-child {
-+         border-left: none;
-+       }
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     // Element locators
-+     var container = element(by.css('.custom-comparator'));
-+     var names = container.all(by.repeater('friends').column('friend.name'));
-+
-+     it('should sort friends by favorite letter (in correct alphabetical order)', function() {
-+         expect(names.get(0).getText()).toBe('John');
-+         expect(names.get(1).getText()).toBe('Adam');
-+         expect(names.get(2).getText()).toBe('Mike');
-+         expect(names.get(3).getText()).toBe('Mary');
-+         expect(names.get(4).getText()).toBe('Julie');
-+       });
-+     </file>
-+     </example>
-      *
-+     */
-+    orderByFilter.$inject = ['$parse'];
-+    function orderByFilter($parse) {
-+        return function(array, sortPredicate, reverseOrder, compareFn) {
-+
-+            if (array == null) return array;
-+            if (!isArrayLike(array)) {
-+                throw minErr('orderBy')('notarray', 'Expected array but received: {0}', array);
-+            }
-+
-+            if (!isArray(sortPredicate)) { sortPredicate = [sortPredicate]; }
-+            if (sortPredicate.length === 0) { sortPredicate = ['+']; }
-+
-+            var predicates = processPredicates(sortPredicate);
-+
-+            var descending = reverseOrder ? -1 : 1;
-+
-+            // Define the `compare()` function. Use a default comparator if none is specified.
-+            var compare = isFunction(compareFn) ? compareFn : defaultCompare;
-+
-+            // The next three lines are a version of a Swartzian Transform idiom from Perl
-+            // (sometimes called the Decorate-Sort-Undecorate idiom)
-+            // See https://en.wikipedia.org/wiki/Schwartzian_transform
-+            var compareValues = Array.prototype.map.call(array, getComparisonObject);
-+            compareValues.sort(doComparison);
-+            array = compareValues.map(function(item) { return item.value; });
-+
-+            return array;
-+
-+            function getComparisonObject(value, index) {
-+                // NOTE: We are adding an extra `tieBreaker` value based on the element's index.
-+                // This will be used to keep the sort stable when none of the input predicates can
-+                // distinguish between two elements.
-+                return {
-+                    value: value,
-+                    tieBreaker: {value: index, type: 'number', index: index},
-+                    predicateValues: predicates.map(function(predicate) {
-+                        return getPredicateValue(predicate.get(value), index);
-+                    })
-+                };
-+            }
-+
-+            function doComparison(v1, v2) {
-+                for (var i = 0, ii = predicates.length; i < ii; i++) {
-+                    var result = compare(v1.predicateValues[i], v2.predicateValues[i]);
-+                    if (result) {
-+                        return result * predicates[i].descending * descending;
-+                    }
-+                }
-+
-+                return (compare(v1.tieBreaker, v2.tieBreaker) || defaultCompare(v1.tieBreaker, v2.tieBreaker)) * descending;
-+            }
-+        };
-+
-+        function processPredicates(sortPredicates) {
-+            return sortPredicates.map(function(predicate) {
-+                var descending = 1, get = identity;
-+
-+                if (isFunction(predicate)) {
-+                    get = predicate;
-+                } else if (isString(predicate)) {
-+                    if ((predicate.charAt(0) === '+' || predicate.charAt(0) === '-')) {
-+                        descending = predicate.charAt(0) === '-' ? -1 : 1;
-+                        predicate = predicate.substring(1);
-+                    }
-+                    if (predicate !== '') {
-+                        get = $parse(predicate);
-+                        if (get.constant) {
-+                            var key = get();
-+                            get = function(value) { return value[key]; };
-+                        }
-+                    }
-+                }
-+                return {get: get, descending: descending};
-+            });
-+        }
-+
-+        function isPrimitive(value) {
-+            switch (typeof value) {
-+                case 'number': /* falls through */
-+                case 'boolean': /* falls through */
-+                case 'string':
-+                    return true;
-+                default:
-+                    return false;
-+            }
-+        }
-+
-+        function objectValue(value) {
-+            // If `valueOf` is a valid function use that
-+            if (isFunction(value.valueOf)) {
-+                value = value.valueOf();
-+                if (isPrimitive(value)) return value;
-+            }
-+            // If `toString` is a valid function and not the one from `Object.prototype` use that
-+            if (hasCustomToString(value)) {
-+                value = value.toString();
-+                if (isPrimitive(value)) return value;
-+            }
-+
-+            return value;
-+        }
-+
-+        function getPredicateValue(value, index) {
-+            var type = typeof value;
-+            if (value === null) {
-+                type = 'string';
-+                value = 'null';
-+            } else if (type === 'object') {
-+                value = objectValue(value);
-+            }
-+            return {value: value, type: type, index: index};
-+        }
-+
-+        function defaultCompare(v1, v2) {
-+            var result = 0;
-+            var type1 = v1.type;
-+            var type2 = v2.type;
-+
-+            if (type1 === type2) {
-+                var value1 = v1.value;
-+                var value2 = v2.value;
-+
-+                if (type1 === 'string') {
-+                    // Compare strings case-insensitively
-+                    value1 = value1.toLowerCase();
-+                    value2 = value2.toLowerCase();
-+                } else if (type1 === 'object') {
-+                    // For basic objects, use the position of the object
-+                    // in the collection instead of the value
-+                    if (isObject(value1)) value1 = v1.index;
-+                    if (isObject(value2)) value2 = v2.index;
-+                }
-+
-+                if (value1 !== value2) {
-+                    result = value1 < value2 ? -1 : 1;
-+                }
-+            } else {
-+                result = type1 < type2 ? -1 : 1;
-+            }
-+
-+            return result;
-+        }
-+    }
-+
-+    function ngDirective(directive) {
-+        if (isFunction(directive)) {
-+            directive = {
-+                link: directive
-+            };
-+        }
-+        directive.restrict = directive.restrict || 'AC';
-+        return valueFn(directive);
-+    }
-+
-+    /**
-+     * @ngdoc directive
-+     * @name a
-+     * @restrict E
-+     *
-+     * @description
-+     * Modifies the default behavior of the html a tag so that the default action is prevented when
-+     * the href attribute is empty.
-+     *
-+     * For dynamically creating `href` attributes for a tags, see the {@link ng.ngHref `ngHref`} directive.
-+     */
-+    var htmlAnchorDirective = valueFn({
-+        restrict: 'E',
-+        compile: function(element, attr) {
-+            if (!attr.href && !attr.xlinkHref) {
-+                return function(scope, element) {
-+                    // If the linked element is not an anchor tag anymore, do nothing
-+                    if (element[0].nodeName.toLowerCase() !== 'a') return;
-+
-+                    // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute.
-+                    var href = toString.call(element.prop('href')) === '[object SVGAnimatedString]' ?
-+                        'xlink:href' : 'href';
-+                    element.on('click', function(event) {
-+                        // if we have no href url, then don't navigate anywhere.
-+                        if (!element.attr(href)) {
-+                            event.preventDefault();
-+                        }
-+                    });
-+                };
-+            }
-+        }
-+    });
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngHref
-+     * @restrict A
-+     * @priority 99
-+     *
-+     * @description
-+     * Using AngularJS markup like `{{hash}}` in an href attribute will
-+     * make the link go to the wrong URL if the user clicks it before
-+     * AngularJS has a chance to replace the `{{hash}}` markup with its
-+     * value. Until AngularJS replaces the markup the link will be broken
-+     * and will most likely return a 404 error. The `ngHref` directive
-+     * solves this problem.
-+     *
-+     * The wrong way to write it:
-+     * ```html
-+     * <a href="http://www.gravatar.com/avatar/{{hash}}">link1</a>
-+     * ```
-+     *
-+     * The correct way to write it:
-+     * ```html
-+     * <a ng-href="http://www.gravatar.com/avatar/{{hash}}">link1</a>
-+     * ```
-+     *
-+     * @element A
-+     * @param {template} ngHref any string which can contain `{{}}` markup.
-+     *
-+     * @example
-+     * This example shows various combinations of `href`, `ng-href` and `ng-click` attributes
-+     * in links and their different behaviors:
-+     <example name="ng-href">
-+     <file name="index.html">
-+     <input ng-model="value" /><br />
-+     <a id="link-1" href ng-click="value = 1">link 1</a> (link, don't reload)<br />
-+     <a id="link-2" href="" ng-click="value = 2">link 2</a> (link, don't reload)<br />
-+     <a id="link-3" ng-href="/{{'123'}}">link 3</a> (link, reload!)<br />
-+     <a id="link-4" href="" name="xx" ng-click="value = 4">anchor</a> (link, don't reload)<br />
-+     <a id="link-5" name="xxx" ng-click="value = 5">anchor</a> (no link)<br />
-+     <a id="link-6" ng-href="{{value}}">link</a> (link, change location)
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should execute ng-click but not reload when href without value', function() {
-+          element(by.id('link-1')).click();
-+          expect(element(by.model('value')).getAttribute('value')).toEqual('1');
-+          expect(element(by.id('link-1')).getAttribute('href')).toBe('');
-+        });
-+
-+     it('should execute ng-click but not reload when href empty string', function() {
-+          element(by.id('link-2')).click();
-+          expect(element(by.model('value')).getAttribute('value')).toEqual('2');
-+          expect(element(by.id('link-2')).getAttribute('href')).toBe('');
-+        });
-+
-+     it('should execute ng-click and change url when ng-href specified', function() {
-+          expect(element(by.id('link-3')).getAttribute('href')).toMatch(/\/123$/);
-+
-+          element(by.id('link-3')).click();
-+
-+          // At this point, we navigate away from an AngularJS page, so we need
-+          // to use browser.driver to get the base webdriver.
-+
-+          browser.wait(function() {
-+            return browser.driver.getCurrentUrl().then(function(url) {
-+              return url.match(/\/123$/);
-+            });
-+          }, 5000, 'page should navigate to /123');
-+        });
-+
-+     it('should execute ng-click but not reload when href empty string and name specified', function() {
-+          element(by.id('link-4')).click();
-+          expect(element(by.model('value')).getAttribute('value')).toEqual('4');
-+          expect(element(by.id('link-4')).getAttribute('href')).toBe('');
-+        });
-+
-+     it('should execute ng-click but not reload when no href but name specified', function() {
-+          element(by.id('link-5')).click();
-+          expect(element(by.model('value')).getAttribute('value')).toEqual('5');
-+          expect(element(by.id('link-5')).getAttribute('href')).toBe(null);
-+        });
-+
-+     it('should only change url when only ng-href', function() {
-+          element(by.model('value')).clear();
-+          element(by.model('value')).sendKeys('6');
-+          expect(element(by.id('link-6')).getAttribute('href')).toMatch(/\/6$/);
-+
-+          element(by.id('link-6')).click();
-+
-+          // At this point, we navigate away from an AngularJS page, so we need
-+          // to use browser.driver to get the base webdriver.
-+          browser.wait(function() {
-+            return browser.driver.getCurrentUrl().then(function(url) {
-+              return url.match(/\/6$/);
-+            });
-+          }, 5000, 'page should navigate to /6');
-+        });
-+     </file>
-+     </example>
-+     */
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngSrc
-+     * @restrict A
-+     * @priority 99
-      *
--     * ## How does it work?
-+     * @description
-+     * Using AngularJS markup like `{{hash}}` in a `src` attribute doesn't
-+     * work right: The browser will fetch from the URL with the literal
-+     * text `{{hash}}` until AngularJS replaces the expression inside
-+     * `{{hash}}`. The `ngSrc` directive solves this problem.
-      *
--     * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#getTrusted
-- * $sce.getTrusted(context, value)} rather than to the value directly.  Directives use {@link
--        * ng.$sce#parse $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs the
--     * {@link ng.$sce#getTrusted $sce.getTrusted} behind the scenes on non-constant literals.
-+     * The buggy way to write it:
-+     * ```html
-+     * <img src="http://www.gravatar.com/avatar/{{hash}}" alt="Description"/>
-+     * ```
-      *
--     * As an example, {@link ng.directive:ngBindHtml ngBindHtml} uses {@link
--        * ng.$sce#parseAsHtml $sce.parseAsHtml(binding expression)}.  Here's the actual code (slightly
--     * simplified):
-+     * The correct way to write it:
-+     * ```html
-+     * <img ng-src="http://www.gravatar.com/avatar/{{hash}}" alt="Description" />
-+     * ```
-      *
--     * <pre class="prettyprint">
--     *   var ngBindHtmlDirective = ['$sce', function($sce) {
-- *     return function(scope, element, attr) {
-- *       scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) {
-- *         element.html(value || '');
-- *       });
-- *     };
-- *   }];
--     * </pre>
-+     * @element IMG
-+     * @param {template} ngSrc any string which can contain `{{}}` markup.
-+     */
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngSrcset
-+     * @restrict A
-+     * @priority 99
-      *
--     * ## Impact on loading templates
-+     * @description
-+     * Using AngularJS markup like `{{hash}}` in a `srcset` attribute doesn't
-+     * work right: The browser will fetch from the URL with the literal
-+     * text `{{hash}}` until AngularJS replaces the expression inside
-+     * `{{hash}}`. The `ngSrcset` directive solves this problem.
-      *
--     * This applies both to the {@link ng.directive:ngInclude `ng-include`} directive as well as
--     * `templateUrl`'s specified by {@link guide/directive directives}.
-+     * The buggy way to write it:
-+     * ```html
-+     * <img srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description"/>
-+     * ```
-      *
--     * By default, Angular only loads templates from the same domain and protocol as the application
--     * document.  This is done by calling {@link ng.$sce#getTrustedResourceUrl
-- * $sce.getTrustedResourceUrl} on the template URL.  To load templates from other domains and/or
--     * protocols, you may either either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist
-- * them} or {@link ng.$sce#trustAsResourceUrl wrap it} into a trusted value.
-+     * The correct way to write it:
-+     * ```html
-+     * <img ng-srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description" />
-+     * ```
-      *
--     * *Please note*:
--     * The browser's
--     * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
--     * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
--     * policy apply in addition to this and may further restrict whether the template is successfully
--     * loaded.  This means that without the right CORS policy, loading templates from a different domain
--     * won't work on all browsers.  Also, loading templates from `file://` URL does not work on some
--     * browsers.
-+     * @element IMG
-+     * @param {template} ngSrcset any string which can contain `{{}}` markup.
-+     */
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngDisabled
-+     * @restrict A
-+     * @priority 100
-      *
--     * ## This feels like too much overhead for the developer?
-+     * @description
-      *
--     * It's important to remember that SCE only applies to interpolation expressions.
-+     * This directive sets the `disabled` attribute on the element (typically a form control,
-+     * e.g. `input`, `button`, `select` etc.) if the
-+     * {@link guide/expression expression} inside `ngDisabled` evaluates to truthy.
-      *
--     * If your expressions are constant literals, they're automatically trusted and you don't need to
--     * call `$sce.trustAs` on them (remember to include the `ngSanitize` module) (e.g.
--     * `<div ng-bind-html="'<b>implicitly trusted</b>'"></div>`) just works.
-+     * A special directive is necessary because we cannot use interpolation inside the `disabled`
-+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
-      *
--     * Additionally, `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them
--     * through {@link ng.$sce#getTrusted $sce.getTrusted}.  SCE doesn't play a role here.
-+     * @example
-+     <example name="ng-disabled">
-+     <file name="index.html">
-+     <label>Click me to toggle: <input type="checkbox" ng-model="checked"></label><br/>
-+     <button ng-model="button" ng-disabled="checked">Button</button>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should toggle button', function() {
-+          expect(element(by.css('button')).getAttribute('disabled')).toBeFalsy();
-+          element(by.model('checked')).click();
-+          expect(element(by.css('button')).getAttribute('disabled')).toBeTruthy();
-+        });
-+     </file>
-+     </example>
-      *
--     * The included {@link ng.$sceDelegate $sceDelegate} comes with sane defaults to allow you to load
--     * templates in `ng-include` from your application's domain without having to even know about SCE.
--     * It blocks loading templates from other domains or loading templates over http from an https
--     * served document.  You can change these by setting your own custom {@link
--        * ng.$sceDelegateProvider#resourceUrlWhitelist whitelists} and {@link
--        * ng.$sceDelegateProvider#resourceUrlBlacklist blacklists} for matching such URLs.
-+     * @element INPUT
-+     * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy,
-+     *     then the `disabled` attribute will be set on the element
-+     */
-+
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngChecked
-+     * @restrict A
-+     * @priority 100
-      *
--     * This significantly reduces the overhead.  It is far easier to pay the small overhead and have an
--     * application that's secure and can be audited to verify that with much more ease than bolting
--     * security onto an application later.
-+     * @description
-+     * Sets the `checked` attribute on the element, if the expression inside `ngChecked` is truthy.
-      *
--     * <a name="contexts"></a>
--     * ## What trusted context types are supported?
-+     * Note that this directive should not be used together with {@link ngModel `ngModel`},
-+     * as this can lead to unexpected behavior.
-      *
--     * | Context             | Notes          |
--     * |---------------------|----------------|
--     * | `$sce.HTML`         | For HTML that's safe to source into the application.  The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. |
--     * | `$sce.CSS`          | For CSS that's safe to source into the application.  Currently unused.  Feel free to use it in your own directives. |
--     * | `$sce.URL`          | For URLs that are safe to follow as links.  Currently unused (`<a href=` and `<img src=` sanitize their urls and don't constitute an SCE context. |
--     * | `$sce.RESOURCE_URL` | For URLs that are not only safe to follow as links, but whose contents are also safe to include in your application.  Examples include `ng-include`, `src` / `ngSrc` bindings for tags other than `IMG` (e.g. `IFRAME`, `OBJECT`, etc.)  <br><br>Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. |
--     * | `$sce.JS`           | For JavaScript that is safe to execute in your application's context.  Currently unused.  Feel free to use it in your own directives. |
-+     * A special directive is necessary because we cannot use interpolation inside the `checked`
-+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
-      *
--     * ## Format of items in {@link ng.$sceDelegateProvider#resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#resourceUrlBlacklist Blacklist} <a name="resourceUrlPatternItem"></a>
-+     * @example
-+     <example name="ng-checked">
-+     <file name="index.html">
-+     <label>Check me to check both: <input type="checkbox" ng-model="leader"></label><br/>
-+     <input id="checkFollower" type="checkbox" ng-checked="leader" aria-label="Follower input">
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should check both checkBoxes', function() {
-+          expect(element(by.id('checkFollower')).getAttribute('checked')).toBeFalsy();
-+          element(by.model('leader')).click();
-+          expect(element(by.id('checkFollower')).getAttribute('checked')).toBeTruthy();
-+        });
-+     </file>
-+     </example>
-      *
--     *  Each element in these arrays must be one of the following:
-+     * @element INPUT
-+     * @param {expression} ngChecked If the {@link guide/expression expression} is truthy,
-+     *     then the `checked` attribute will be set on the element
-+     */
-+
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngReadonly
-+     * @restrict A
-+     * @priority 100
-      *
--     *  - **'self'**
--     *    - The special **string**, `'self'`, can be used to match against all URLs of the **same
--     *      domain** as the application document using the **same protocol**.
--     *  - **String** (except the special value `'self'`)
--     *    - The string is matched against the full *normalized / absolute URL* of the resource
--     *      being tested (substring matches are not good enough.)
--     *    - There are exactly **two wildcard sequences** - `*` and `**`.  All other characters
--     *      match themselves.
--     *    - `*`: matches zero or more occurrences of any character other than one of the following 6
--     *      characters: '`:`', '`/`', '`.`', '`?`', '`&`' and ';'.  It's a useful wildcard for use
--     *      in a whitelist.
--     *    - `**`: matches zero or more occurrences of *any* character.  As such, it's not
--     *      not appropriate to use in for a scheme, domain, etc. as it would match too much.  (e.g.
--     *      http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might
--     *      not have been the intention.)  It's usage at the very end of the path is ok.  (e.g.
--     *      http://foo.example.com/templates/**).
--     *  - **RegExp** (*see caveat below*)
--     *    - *Caveat*:  While regular expressions are powerful and offer great flexibility,  their syntax
--     *      (and all the inevitable escaping) makes them *harder to maintain*.  It's easy to
--     *      accidentally introduce a bug when one updates a complex expression (imho, all regexes should
--     *      have good test coverage.).  For instance, the use of `.` in the regex is correct only in a
--     *      small number of cases.  A `.` character in the regex used when matching the scheme or a
--     *      subdomain could be matched against a `:` or literal `.` that was likely not intended.   It
--     *      is highly recommended to use the string patterns and only fall back to regular expressions
--     *      if they as a last resort.
--     *    - The regular expression must be an instance of RegExp (i.e. not a string.)  It is
--     *      matched against the **entire** *normalized / absolute URL* of the resource being tested
--     *      (even when the RegExp did not have the `^` and `$` codes.)  In addition, any flags
--     *      present on the RegExp (such as multiline, global, ignoreCase) are ignored.
--     *    - If you are generating your JavaScript from some other templating engine (not
--     *      recommended, e.g. in issue [#4006](https://github.com/angular/angular.js/issues/4006)),
--     *      remember to escape your regular expression (and be aware that you might need more than
--     *      one level of escaping depending on your templating engine and the way you interpolated
--     *      the value.)  Do make use of your platform's escaping mechanism as it might be good
--     *      enough before coding your own.  e.g. Ruby has
--     *      [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape)
--     *      and Python has [re.escape](http://docs.python.org/library/re.html#re.escape).
--     *      Javascript lacks a similar built in function for escaping.  Take a look at Google
--     *      Closure library's [goog.string.regExpEscape(s)](
--     *      http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962).
-+     * @description
-      *
--     * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} for an example.
-+     * Sets the `readonly` attribute on the element, if the expression inside `ngReadonly` is truthy.
-+     * Note that `readonly` applies only to `input` elements with specific types. [See the input docs on
-+     * MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-readonly) for more information.
-      *
--     * ## Show me an example using SCE.
-+     * A special directive is necessary because we cannot use interpolation inside the `readonly`
-+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
-      *
-      * @example
--     <example module="mySceApp" deps="angular-sanitize.js">
-+     <example name="ng-readonly">
-      <file name="index.html">
--     <div ng-controller="myAppController as myCtrl">
--     <i ng-bind-html="myCtrl.explicitlyTrustedHtml" id="explicitlyTrustedHtml"></i><br><br>
--     <b>User comments</b><br>
--     By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when
--     $sanitize is available.  If $sanitize isn't available, this results in an error instead of an
--     exploit.
--     <div class="well">
--     <div ng-repeat="userComment in myCtrl.userComments">
--     <b>{{userComment.name}}</b>:
--     <span ng-bind-html="userComment.htmlComment" class="htmlComment"></span>
--     <br>
--     </div>
--     </div>
--     </div>
-+     <label>Check me to make text readonly: <input type="checkbox" ng-model="checked"></label><br/>
-+     <input type="text" ng-readonly="checked" value="I'm AngularJS" aria-label="Readonly field" />
-      </file>
--
--     <file name="script.js">
--     var mySceApp = angular.module('mySceApp', ['ngSanitize']);
--
--     mySceApp.controller("myAppController", function myAppController($http, $templateCache, $sce) {
--    var self = this;
--    $http.get("test_data.json", {cache: $templateCache}).success(function(userComments) {
--      self.userComments = userComments;
--    });
--    self.explicitlyTrustedHtml = $sce.trustAsHtml(
--        '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
--        'sanitization.&quot;">Hover over this text.</span>');
--  });
-+     <file name="protractor.js" type="protractor">
-+     it('should toggle readonly attr', function() {
-+          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeFalsy();
-+          element(by.model('checked')).click();
-+          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeTruthy();
-+        });
-      </file>
-+     </example>
-+     *
-+     * @element INPUT
-+     * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy,
-+     *     then special attribute "readonly" will be set on the element
-+     */
- 
--     <file name="test_data.json">
--     [
--     { "name": "Alice",
--    "htmlComment":
--        "<span onmouseover='this.textContent=\"PWN3D!\"'>Is <i>anyone</i> reading this?</span>"
--  },
--     { "name": "Bob",
--    "htmlComment": "<i>Yes!</i>  Am I the only other one?"
--  }
--     ]
--     </file>
- 
-+    /**
-+     * @ngdoc directive
-+     * @name ngSelected
-+     * @restrict A
-+     * @priority 100
-+     *
-+     * @description
-+     *
-+     * Sets the `selected` attribute on the element, if the expression inside `ngSelected` is truthy.
-+     *
-+     * A special directive is necessary because we cannot use interpolation inside the `selected`
-+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
-+     *
-+     * <div class="alert alert-warning">
-+     *   **Note:** `ngSelected` does not interact with the `select` and `ngModel` directives, it only
-+     *   sets the `selected` attribute on the element. If you are using `ngModel` on the select, you
-+     *   should not use `ngSelected` on the options, as `ngModel` will set the select value and
-+     *   selected options.
-+     * </div>
-+     *
-+     * @example
-+     <example name="ng-selected">
-+     <file name="index.html">
-+     <label>Check me to select: <input type="checkbox" ng-model="selected"></label><br/>
-+     <select aria-label="ngSelected demo">
-+     <option>Hello!</option>
-+     <option id="greet" ng-selected="selected">Greetings!</option>
-+     </select>
-+     </file>
-      <file name="protractor.js" type="protractor">
--     describe('SCE doc demo', function() {
--    it('should sanitize untrusted values', function() {
--      expect(element(by.css('.htmlComment')).getInnerHtml())
--          .toBe('<span>Is <i>anyone</i> reading this?</span>');
--    });
--
--    it('should NOT sanitize explicitly trusted values', function() {
--      expect(element(by.id('explicitlyTrustedHtml')).getInnerHtml()).toBe(
--          '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
--          'sanitization.&quot;">Hover over this text.</span>');
--    });
--  });
-+     it('should select Greetings!', function() {
-+          expect(element(by.id('greet')).getAttribute('selected')).toBeFalsy();
-+          element(by.model('selected')).click();
-+          expect(element(by.id('greet')).getAttribute('selected')).toBeTruthy();
-+        });
-      </file>
-      </example>
-      *
-+     * @element OPTION
-+     * @param {expression} ngSelected If the {@link guide/expression expression} is truthy,
-+     *     then special attribute "selected" will be set on the element
-+     */
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngOpen
-+     * @restrict A
-+     * @priority 100
-+     *
-+     * @description
-      *
-+     * Sets the `open` attribute on the element, if the expression inside `ngOpen` is truthy.
-      *
--     * ## Can I disable SCE completely?
-+     * A special directive is necessary because we cannot use interpolation inside the `open`
-+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
-      *
--     * Yes, you can.  However, this is strongly discouraged.  SCE gives you a lot of security benefits
--     * for little coding overhead.  It will be much harder to take an SCE disabled application and
--     * either secure it on your own or enable SCE at a later stage.  It might make sense to disable SCE
--     * for cases where you have a lot of existing code that was written before SCE was introduced and
--     * you're migrating them a module at a time.
-+     * ## A note about browser compatibility
-      *
--     * That said, here's how you can completely disable SCE:
-+     * Internet Explorer and Edge do not support the `details` element, it is
-+     * recommended to use {@link ng.ngShow} and {@link ng.ngHide} instead.
-      *
--     * <pre class="prettyprint">
--     *   angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) {
-- *     // Completely disable SCE.  For demonstration purposes only!
-- *     // Do not use in new projects.
-- *     $sceProvider.enabled(false);
-- *   });
--     * </pre>
-+     * @example
-+     <example name="ng-open">
-+     <file name="index.html">
-+     <label>Toggle details: <input type="checkbox" ng-model="open"></label><br/>
-+     <details id="details" ng-open="open">
-+     <summary>List</summary>
-+     <ul>
-+     <li>Apple</li>
-+     <li>Orange</li>
-+     <li>Durian</li>
-+     </ul>
-+     </details>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should toggle open', function() {
-+           expect(element(by.id('details')).getAttribute('open')).toBeFalsy();
-+           element(by.model('open')).click();
-+           expect(element(by.id('details')).getAttribute('open')).toBeTruthy();
-+         });
-+     </file>
-+     </example>
-      *
-+     * @element DETAILS
-+     * @param {expression} ngOpen If the {@link guide/expression expression} is truthy,
-+     *     then special attribute "open" will be set on the element
-      */
--    /* jshint maxlen: 100 */
--
--    function $SceProvider() {
--        var enabled = true;
--
--        /**
--         * @ngdoc method
--         * @name $sceProvider#enabled
--         * @function
--         *
--         * @param {boolean=} value If provided, then enables/disables SCE.
--         * @return {boolean} true if SCE is enabled, false otherwise.
--         *
--         * @description
--         * Enables/disables SCE and returns the current value.
--         */
--        this.enabled = function (value) {
--            if (arguments.length) {
--                enabled = !!value;
--            }
--            return enabled;
--        };
--
--
--        /* Design notes on the default implementation for SCE.
--         *
--         * The API contract for the SCE delegate
--         * -------------------------------------
--         * The SCE delegate object must provide the following 3 methods:
--         *
--         * - trustAs(contextEnum, value)
--         *     This method is used to tell the SCE service that the provided value is OK to use in the
--         *     contexts specified by contextEnum.  It must return an object that will be accepted by
--         *     getTrusted() for a compatible contextEnum and return this value.
--         *
--         * - valueOf(value)
--         *     For values that were not produced by trustAs(), return them as is.  For values that were
--         *     produced by trustAs(), return the corresponding input value to trustAs.  Basically, if
--         *     trustAs is wrapping the given values into some type, this operation unwraps it when given
--         *     such a value.
--         *
--         * - getTrusted(contextEnum, value)
--         *     This function should return the a value that is safe to use in the context specified by
--         *     contextEnum or throw and exception otherwise.
--         *
--         * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be
--         * opaque or wrapped in some holder object.  That happens to be an implementation detail.  For
--         * instance, an implementation could maintain a registry of all trusted objects by context.  In
--         * such a case, trustAs() would return the same object that was passed in.  getTrusted() would
--         * return the same object passed in if it was found in the registry under a compatible context or
--         * throw an exception otherwise.  An implementation might only wrap values some of the time based
--         * on some criteria.  getTrusted() might return a value and not throw an exception for special
--         * constants or objects even if not wrapped.  All such implementations fulfill this contract.
--         *
--         *
--         * A note on the inheritance model for SCE contexts
--         * ------------------------------------------------
--         * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types.  This
--         * is purely an implementation details.
--         *
--         * The contract is simply this:
--         *
--         *     getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value)
--         *     will also succeed.
--         *
--         * Inheritance happens to capture this in a natural way.  In some future, we
--         * may not use inheritance anymore.  That is OK because no code outside of
--         * sce.js and sceSpecs.js would need to be aware of this detail.
--         */
- 
--        this.$get = ['$parse', '$sniffer', '$sceDelegate', function(
--            $parse,   $sniffer,   $sceDelegate) {
--            // Prereq: Ensure that we're not running in IE8 quirks mode.  In that mode, IE allows
--            // the "expression(javascript expression)" syntax which is insecure.
--            if (enabled && $sniffer.msie && $sniffer.msieDocumentMode < 8) {
--                throw $sceMinErr('iequirks',
--                    'Strict Contextual Escaping does not support Internet Explorer version < 9 in quirks ' +
--                    'mode.  You can fix this by adding the text <!doctype html> to the top of your HTML ' +
--                    'document.  See http://docs.angularjs.org/api/ng.$sce for more information.');
--            }
-+    var ngAttributeAliasDirectives = {};
- 
--            var sce = copy(SCE_CONTEXTS);
-+// boolean attrs are evaluated
-+    forEach(BOOLEAN_ATTR, function(propName, attrName) {
-+        // binding to multiple is not supported
-+        if (propName === 'multiple') return;
- 
--            /**
--             * @ngdoc method
--             * @name $sce#isEnabled
--             * @function
--             *
--             * @return {Boolean} true if SCE is enabled, false otherwise.  If you want to set the value, you
--             * have to do it at module config time on {@link ng.$sceProvider $sceProvider}.
--             *
--             * @description
--             * Returns a boolean indicating if SCE is enabled.
--             */
--            sce.isEnabled = function () {
--                return enabled;
--            };
--            sce.trustAs = $sceDelegate.trustAs;
--            sce.getTrusted = $sceDelegate.getTrusted;
--            sce.valueOf = $sceDelegate.valueOf;
-+        function defaultLinkFn(scope, element, attr) {
-+            scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) {
-+                attr.$set(attrName, !!value);
-+            });
-+        }
- 
--            if (!enabled) {
--                sce.trustAs = sce.getTrusted = function(type, value) { return value; };
--                sce.valueOf = identity;
--            }
-+        var normalized = directiveNormalize('ng-' + attrName);
-+        var linkFn = defaultLinkFn;
- 
--            /**
--             * @ngdoc method
--             * @name $sce#parse
--             *
--             * @description
--             * Converts Angular {@link guide/expression expression} into a function.  This is like {@link
--                * ng.$parse $parse} and is identical when the expression is a literal constant.  Otherwise, it
--             * wraps the expression in a call to {@link ng.$sce#getTrusted $sce.getTrusted(*type*,
--     * *result*)}
--             *
--             * @param {string} type The kind of SCE context in which this result will be used.
--             * @param {string} expression String expression to compile.
--             * @returns {function(context, locals)} a function which represents the compiled expression:
--             *
--             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
--             *      are evaluated against (typically a scope object).
--             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
--             *      `context`.
--             */
--            sce.parseAs = function sceParseAs(type, expr) {
--                var parsed = $parse(expr);
--                if (parsed.literal && parsed.constant) {
--                    return parsed;
--                } else {
--                    return function sceParseAsTrusted(self, locals) {
--                        return sce.getTrusted(type, parsed(self, locals));
--                    };
-+        if (propName === 'checked') {
-+            linkFn = function(scope, element, attr) {
-+                // ensuring ngChecked doesn't interfere with ngModel when both are set on the same input
-+                if (attr.ngModel !== attr[normalized]) {
-+                    defaultLinkFn(scope, element, attr);
-                 }
-             };
-+        }
- 
--            /**
--             * @ngdoc method
--             * @name $sce#trustAs
--             *
--             * @description
--             * Delegates to {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.  As such,
--             * returns an object that is trusted by angular for use in specified strict contextual
--             * escaping contexts (such as ng-bind-html, ng-include, any src attribute
--             * interpolation, any dom event binding attribute interpolation such as for onclick,  etc.)
--             * that uses the provided value.  See * {@link ng.$sce $sce} for enabling strict contextual
--             * escaping.
--             *
--             * @param {string} type The kind of context in which this value is safe for use.  e.g. url,
--             *   resource_url, html, js and css.
--             * @param {*} value The value that that should be considered trusted/safe.
--             * @returns {*} A value that can be used to stand in for the provided `value` in places
--             * where Angular expects a $sce.trustAs() return value.
--             */
--
--            /**
--             * @ngdoc method
--             * @name $sce#trustAsHtml
--             *
--             * @description
--             * Shorthand method.  `$sce.trustAsHtml(value)` →
--             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.HTML, value)`}
--             *
--             * @param {*} value The value to trustAs.
--             * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedHtml
--     *     $sce.getTrustedHtml(value)} to obtain the original value.  (privileged directives
--             *     only accept expressions that are either literal constants or are the
--             *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
--             */
--
--            /**
--             * @ngdoc method
--             * @name $sce#trustAsUrl
--             *
--             * @description
--             * Shorthand method.  `$sce.trustAsUrl(value)` →
--             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.URL, value)`}
--             *
--             * @param {*} value The value to trustAs.
--             * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedUrl
--     *     $sce.getTrustedUrl(value)} to obtain the original value.  (privileged directives
--             *     only accept expressions that are either literal constants or are the
--             *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
--             */
--
--            /**
--             * @ngdoc method
--             * @name $sce#trustAsResourceUrl
--             *
--             * @description
--             * Shorthand method.  `$sce.trustAsResourceUrl(value)` →
--             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`}
--             *
--             * @param {*} value The value to trustAs.
--             * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedResourceUrl
--     *     $sce.getTrustedResourceUrl(value)} to obtain the original value.  (privileged directives
--             *     only accept expressions that are either literal constants or are the return
--             *     value of {@link ng.$sce#trustAs $sce.trustAs}.)
--             */
--
--            /**
--             * @ngdoc method
--             * @name $sce#trustAsJs
--             *
--             * @description
--             * Shorthand method.  `$sce.trustAsJs(value)` →
--             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.JS, value)`}
--             *
--             * @param {*} value The value to trustAs.
--             * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedJs
--     *     $sce.getTrustedJs(value)} to obtain the original value.  (privileged directives
--             *     only accept expressions that are either literal constants or are the
--             *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
--             */
--
--            /**
--             * @ngdoc method
--             * @name $sce#getTrusted
--             *
--             * @description
--             * Delegates to {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted`}.  As such,
--             * takes the result of a {@link ng.$sce#trustAs `$sce.trustAs`}() call and returns the
--             * originally supplied value if the queried context type is a supertype of the created type.
--             * If this condition isn't satisfied, throws an exception.
--             *
--             * @param {string} type The kind of context in which this value is to be used.
--             * @param {*} maybeTrusted The result of a prior {@link ng.$sce#trustAs `$sce.trustAs`}
--             *                         call.
--             * @returns {*} The value the was originally provided to
--             *              {@link ng.$sce#trustAs `$sce.trustAs`} if valid in this context.
--             *              Otherwise, throws an exception.
--             */
--
--            /**
--             * @ngdoc method
--             * @name $sce#getTrustedHtml
--             *
--             * @description
--             * Shorthand method.  `$sce.getTrustedHtml(value)` →
--             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`}
--             *
--             * @param {*} value The value to pass to `$sce.getTrusted`.
--             * @returns {*} The return value of `$sce.getTrusted($sce.HTML, value)`
--             */
--
--            /**
--             * @ngdoc method
--             * @name $sce#getTrustedCss
--             *
--             * @description
--             * Shorthand method.  `$sce.getTrustedCss(value)` →
--             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`}
--             *
--             * @param {*} value The value to pass to `$sce.getTrusted`.
--             * @returns {*} The return value of `$sce.getTrusted($sce.CSS, value)`
--             */
--
--            /**
--             * @ngdoc method
--             * @name $sce#getTrustedUrl
--             *
--             * @description
--             * Shorthand method.  `$sce.getTrustedUrl(value)` →
--             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.URL, value)`}
--             *
--             * @param {*} value The value to pass to `$sce.getTrusted`.
--             * @returns {*} The return value of `$sce.getTrusted($sce.URL, value)`
--             */
--
--            /**
--             * @ngdoc method
--             * @name $sce#getTrustedResourceUrl
--             *
--             * @description
--             * Shorthand method.  `$sce.getTrustedResourceUrl(value)` →
--             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`}
--             *
--             * @param {*} value The value to pass to `$sceDelegate.getTrusted`.
--             * @returns {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)`
--             */
--
--            /**
--             * @ngdoc method
--             * @name $sce#getTrustedJs
--             *
--             * @description
--             * Shorthand method.  `$sce.getTrustedJs(value)` →
--             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.JS, value)`}
--             *
--             * @param {*} value The value to pass to `$sce.getTrusted`.
--             * @returns {*} The return value of `$sce.getTrusted($sce.JS, value)`
--             */
-+        ngAttributeAliasDirectives[normalized] = function() {
-+            return {
-+                restrict: 'A',
-+                priority: 100,
-+                link: linkFn
-+            };
-+        };
-+    });
- 
--            /**
--             * @ngdoc method
--             * @name $sce#parseAsHtml
--             *
--             * @description
--             * Shorthand method.  `$sce.parseAsHtml(expression string)` →
--             *     {@link ng.$sce#parse `$sce.parseAs($sce.HTML, value)`}
--             *
--             * @param {string} expression String expression to compile.
--             * @returns {function(context, locals)} a function which represents the compiled expression:
--             *
--             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
--             *      are evaluated against (typically a scope object).
--             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
--             *      `context`.
--             */
-+// aliased input attrs are evaluated
-+    forEach(ALIASED_ATTR, function(htmlAttr, ngAttr) {
-+        ngAttributeAliasDirectives[ngAttr] = function() {
-+            return {
-+                priority: 100,
-+                link: function(scope, element, attr) {
-+                    //special case ngPattern when a literal regular expression value
-+                    //is used as the expression (this way we don't have to watch anything).
-+                    if (ngAttr === 'ngPattern' && attr.ngPattern.charAt(0) === '/') {
-+                        var match = attr.ngPattern.match(REGEX_STRING_REGEXP);
-+                        if (match) {
-+                            attr.$set('ngPattern', new RegExp(match[1], match[2]));
-+                            return;
-+                        }
-+                    }
- 
--            /**
--             * @ngdoc method
--             * @name $sce#parseAsCss
--             *
--             * @description
--             * Shorthand method.  `$sce.parseAsCss(value)` →
--             *     {@link ng.$sce#parse `$sce.parseAs($sce.CSS, value)`}
--             *
--             * @param {string} expression String expression to compile.
--             * @returns {function(context, locals)} a function which represents the compiled expression:
--             *
--             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
--             *      are evaluated against (typically a scope object).
--             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
--             *      `context`.
--             */
-+                    scope.$watch(attr[ngAttr], function ngAttrAliasWatchAction(value) {
-+                        attr.$set(ngAttr, value);
-+                    });
-+                }
-+            };
-+        };
-+    });
- 
--            /**
--             * @ngdoc method
--             * @name $sce#parseAsUrl
--             *
--             * @description
--             * Shorthand method.  `$sce.parseAsUrl(value)` →
--             *     {@link ng.$sce#parse `$sce.parseAs($sce.URL, value)`}
--             *
--             * @param {string} expression String expression to compile.
--             * @returns {function(context, locals)} a function which represents the compiled expression:
--             *
--             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
--             *      are evaluated against (typically a scope object).
--             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
--             *      `context`.
--             */
-+// ng-src, ng-srcset, ng-href are interpolated
-+    forEach(['src', 'srcset', 'href'], function(attrName) {
-+        var normalized = directiveNormalize('ng-' + attrName);
-+        ngAttributeAliasDirectives[normalized] = function() {
-+            return {
-+                priority: 99, // it needs to run after the attributes are interpolated
-+                link: function(scope, element, attr) {
-+                    var propName = attrName,
-+                        name = attrName;
- 
--            /**
--             * @ngdoc method
--             * @name $sce#parseAsResourceUrl
--             *
--             * @description
--             * Shorthand method.  `$sce.parseAsResourceUrl(value)` →
--             *     {@link ng.$sce#parse `$sce.parseAs($sce.RESOURCE_URL, value)`}
--             *
--             * @param {string} expression String expression to compile.
--             * @returns {function(context, locals)} a function which represents the compiled expression:
--             *
--             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
--             *      are evaluated against (typically a scope object).
--             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
--             *      `context`.
--             */
-+                    if (attrName === 'href' &&
-+                        toString.call(element.prop('href')) === '[object SVGAnimatedString]') {
-+                        name = 'xlinkHref';
-+                        attr.$attr[name] = 'xlink:href';
-+                        propName = null;
-+                    }
- 
--            /**
--             * @ngdoc method
--             * @name $sce#parseAsJs
--             *
--             * @description
--             * Shorthand method.  `$sce.parseAsJs(value)` →
--             *     {@link ng.$sce#parse `$sce.parseAs($sce.JS, value)`}
--             *
--             * @param {string} expression String expression to compile.
--             * @returns {function(context, locals)} a function which represents the compiled expression:
--             *
--             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
--             *      are evaluated against (typically a scope object).
--             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
--             *      `context`.
--             */
-+                    attr.$observe(normalized, function(value) {
-+                        if (!value) {
-+                            if (attrName === 'href') {
-+                                attr.$set(name, null);
-+                            }
-+                            return;
-+                        }
- 
--            // Shorthand delegations.
--            var parse = sce.parseAs,
--                getTrusted = sce.getTrusted,
--                trustAs = sce.trustAs;
-+                        attr.$set(name, value);
- 
--            forEach(SCE_CONTEXTS, function (enumValue, name) {
--                var lName = lowercase(name);
--                sce[camelCase("parse_as_" + lName)] = function (expr) {
--                    return parse(enumValue, expr);
--                };
--                sce[camelCase("get_trusted_" + lName)] = function (value) {
--                    return getTrusted(enumValue, value);
--                };
--                sce[camelCase("trust_as_" + lName)] = function (value) {
--                    return trustAs(enumValue, value);
--                };
--            });
-+                        // Support: IE 9-11 only
-+                        // On IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist
-+                        // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need
-+                        // to set the property as well to achieve the desired effect.
-+                        // We use attr[attrName] value since $set can sanitize the url.
-+                        if (msie && propName) element.prop(propName, attr[name]);
-+                    });
-+                }
-+            };
-+        };
-+    });
- 
--            return sce;
--        }];
-+    /* global -nullFormCtrl, -PENDING_CLASS, -SUBMITTED_CLASS
-+ */
-+    var nullFormCtrl = {
-+            $addControl: noop,
-+            $$renameControl: nullFormRenameControl,
-+            $removeControl: noop,
-+            $setValidity: noop,
-+            $setDirty: noop,
-+            $setPristine: noop,
-+            $setSubmitted: noop
-+        },
-+        PENDING_CLASS = 'ng-pending',
-+        SUBMITTED_CLASS = 'ng-submitted';
-+
-+    function nullFormRenameControl(control, name) {
-+        control.$name = name;
-     }
- 
-     /**
--     * !!! This is an undocumented "private" service !!!
-+     * @ngdoc type
-+     * @name form.FormController
-      *
--     * @name $sniffer
--     * @requires $window
--     * @requires $document
-+     * @property {boolean} $pristine True if user has not interacted with the form yet.
-+     * @property {boolean} $dirty True if user has already interacted with the form.
-+     * @property {boolean} $valid True if all of the containing forms and controls are valid.
-+     * @property {boolean} $invalid True if at least one containing control or form is invalid.
-+     * @property {boolean} $submitted True if user has submitted the form even if its invalid.
-      *
--     * @property {boolean} history Does the browser support html5 history api ?
--     * @property {boolean} hashchange Does the browser support hashchange event ?
--     * @property {boolean} transitions Does the browser support CSS transition events ?
--     * @property {boolean} animations Does the browser support CSS animation events ?
-+     * @property {Object} $pending An object hash, containing references to controls or forms with
-+     *  pending validators, where:
-+     *
-+     *  - keys are validations tokens (error names).
-+     *  - values are arrays of controls or forms that have a pending validator for the given error name.
-+     *
-+     * See {@link form.FormController#$error $error} for a list of built-in validation tokens.
-+     *
-+     * @property {Object} $error An object hash, containing references to controls or forms with failing
-+     *  validators, where:
-+     *
-+     *  - keys are validation tokens (error names),
-+     *  - values are arrays of controls or forms that have a failing validator for the given error name.
-+     *
-+     *  Built-in validation tokens:
-+     *  - `email`
-+     *  - `max`
-+     *  - `maxlength`
-+     *  - `min`
-+     *  - `minlength`
-+     *  - `number`
-+     *  - `pattern`
-+     *  - `required`
-+     *  - `url`
-+     *  - `date`
-+     *  - `datetimelocal`
-+     *  - `time`
-+     *  - `week`
-+     *  - `month`
-      *
-      * @description
--     * This is very simple implementation of testing browser's features.
-+     * `FormController` keeps track of all its controls and nested forms as well as the state of them,
-+     * such as being valid/invalid or dirty/pristine.
-+     *
-+     * Each {@link ng.directive:form form} directive creates an instance
-+     * of `FormController`.
-+     *
-      */
--    function $SnifferProvider() {
--        this.$get = ['$window', '$document', function($window, $document) {
--            var eventSupport = {},
--                android =
--                    int((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]),
--                boxee = /Boxee/i.test(($window.navigator || {}).userAgent),
--                document = $document[0] || {},
--                documentMode = document.documentMode,
--                vendorPrefix,
--                vendorRegex = /^(Moz|webkit|O|ms)(?=[A-Z])/,
--                bodyStyle = document.body && document.body.style,
--                transitions = false,
--                animations = false,
--                match;
--
--            if (bodyStyle) {
--                for(var prop in bodyStyle) {
--                    if(match = vendorRegex.exec(prop)) {
--                        vendorPrefix = match[0];
--                        vendorPrefix = vendorPrefix.substr(0, 1).toUpperCase() + vendorPrefix.substr(1);
--                        break;
--                    }
--                }
--
--                if(!vendorPrefix) {
--                    vendorPrefix = ('WebkitOpacity' in bodyStyle) && 'webkit';
--                }
-+//asks for $scope to fool the BC controller module
-+    FormController.$inject = ['$element', '$attrs', '$scope', '$animate', '$interpolate'];
-+    function FormController($element, $attrs, $scope, $animate, $interpolate) {
-+        this.$$controls = [];
- 
--                transitions = !!(('transition' in bodyStyle) || (vendorPrefix + 'Transition' in bodyStyle));
--                animations  = !!(('animation' in bodyStyle) || (vendorPrefix + 'Animation' in bodyStyle));
-+        // init state
-+        this.$error = {};
-+        this.$$success = {};
-+        this.$pending = undefined;
-+        this.$name = $interpolate($attrs.name || $attrs.ngForm || '')($scope);
-+        this.$dirty = false;
-+        this.$pristine = true;
-+        this.$valid = true;
-+        this.$invalid = false;
-+        this.$submitted = false;
-+        this.$$parentForm = nullFormCtrl;
-+
-+        this.$$element = $element;
-+        this.$$animate = $animate;
-+
-+        setupValidity(this);
-+    }
- 
--                if (android && (!transitions||!animations)) {
--                    transitions = isString(document.body.style.webkitTransition);
--                    animations = isString(document.body.style.webkitAnimation);
--                }
--            }
-+    FormController.prototype = {
-+        /**
-+         * @ngdoc method
-+         * @name form.FormController#$rollbackViewValue
-+         *
-+         * @description
-+         * Rollback all form controls pending updates to the `$modelValue`.
-+         *
-+         * Updates may be pending by a debounced event or because the input is waiting for a some future
-+         * event defined in `ng-model-options`. This method is typically needed by the reset button of
-+         * a form that uses `ng-model-options` to pend updates.
-+         */
-+        $rollbackViewValue: function() {
-+            forEach(this.$$controls, function(control) {
-+                control.$rollbackViewValue();
-+            });
-+        },
- 
-+        /**
-+         * @ngdoc method
-+         * @name form.FormController#$commitViewValue
-+         *
-+         * @description
-+         * Commit all form controls pending updates to the `$modelValue`.
-+         *
-+         * Updates may be pending by a debounced event or because the input is waiting for a some future
-+         * event defined in `ng-model-options`. This method is rarely needed as `NgModelController`
-+         * usually handles calling this in response to input events.
-+         */
-+        $commitViewValue: function() {
-+            forEach(this.$$controls, function(control) {
-+                control.$commitViewValue();
-+            });
-+        },
- 
--            return {
--                // Android has history.pushState, but it does not update location correctly
--                // so let's not use the history API at all.
--                // http://code.google.com/p/android/issues/detail?id=17471
--                // https://github.com/angular/angular.js/issues/904
-+        /**
-+         * @ngdoc method
-+         * @name form.FormController#$addControl
-+         * @param {object} control control object, either a {@link form.FormController} or an
-+         * {@link ngModel.NgModelController}
-+         *
-+         * @description
-+         * Register a control with the form. Input elements using ngModelController do this automatically
-+         * when they are linked.
-+         *
-+         * Note that the current state of the control will not be reflected on the new parent form. This
-+         * is not an issue with normal use, as freshly compiled and linked controls are in a `$pristine`
-+         * state.
-+         *
-+         * However, if the method is used programmatically, for example by adding dynamically created controls,
-+         * or controls that have been previously removed without destroying their corresponding DOM element,
-+         * it's the developers responsibility to make sure the current state propagates to the parent form.
-+         *
-+         * For example, if an input control is added that is already `$dirty` and has `$error` properties,
-+         * calling `$setDirty()` and `$validate()` afterwards will propagate the state to the parent form.
-+         */
-+        $addControl: function(control) {
-+            // Breaking change - before, inputs whose name was "hasOwnProperty" were quietly ignored
-+            // and not added to the scope.  Now we throw an error.
-+            assertNotHasOwnProperty(control.$name, 'input');
-+            this.$$controls.push(control);
- 
--                // older webkit browser (533.9) on Boxee box has exactly the same problem as Android has
--                // so let's not use the history API also
--                // We are purposefully using `!(android < 4)` to cover the case when `android` is undefined
--                // jshint -W018
--                history: !!($window.history && $window.history.pushState && !(android < 4) && !boxee),
--                // jshint +W018
--                hashchange: 'onhashchange' in $window &&
--                    // IE8 compatible mode lies
--                (!documentMode || documentMode > 7),
--                hasEvent: function(event) {
--                    // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have
--                    // it. In particular the event is not fired when backspace or delete key are pressed or
--                    // when cut operation is performed.
--                    if (event == 'input' && msie == 9) return false;
-+            if (control.$name) {
-+                this[control.$name] = control;
-+            }
- 
--                    if (isUndefined(eventSupport[event])) {
--                        var divElm = document.createElement('div');
--                        eventSupport[event] = 'on' + event in divElm;
--                    }
-+            control.$$parentForm = this;
-+        },
- 
--                    return eventSupport[event];
--                },
--                csp: csp(),
--                vendorPrefix: vendorPrefix,
--                transitions : transitions,
--                animations : animations,
--                android: android,
--                msie : msie,
--                msieDocumentMode: documentMode
--            };
--        }];
--    }
-+        // Private API: rename a form control
-+        $$renameControl: function(control, newName) {
-+            var oldName = control.$name;
- 
--    function $TimeoutProvider() {
--        this.$get = ['$rootScope', '$browser', '$q', '$exceptionHandler',
--            function($rootScope,   $browser,   $q,   $exceptionHandler) {
--                var deferreds = {};
-+            if (this[oldName] === control) {
-+                delete this[oldName];
-+            }
-+            this[newName] = control;
-+            control.$name = newName;
-+        },
- 
-+        /**
-+         * @ngdoc method
-+         * @name form.FormController#$removeControl
-+         * @param {object} control control object, either a {@link form.FormController} or an
-+         * {@link ngModel.NgModelController}
-+         *
-+         * @description
-+         * Deregister a control from the form.
-+         *
-+         * Input elements using ngModelController do this automatically when they are destroyed.
-+         *
-+         * Note that only the removed control's validation state (`$errors`etc.) will be removed from the
-+         * form. `$dirty`, `$submitted` states will not be changed, because the expected behavior can be
-+         * different from case to case. For example, removing the only `$dirty` control from a form may or
-+         * may not mean that the form is still `$dirty`.
-+         */
-+        $removeControl: function(control) {
-+            if (control.$name && this[control.$name] === control) {
-+                delete this[control.$name];
-+            }
-+            forEach(this.$pending, function(value, name) {
-+                // eslint-disable-next-line no-invalid-this
-+                this.$setValidity(name, null, control);
-+            }, this);
-+            forEach(this.$error, function(value, name) {
-+                // eslint-disable-next-line no-invalid-this
-+                this.$setValidity(name, null, control);
-+            }, this);
-+            forEach(this.$$success, function(value, name) {
-+                // eslint-disable-next-line no-invalid-this
-+                this.$setValidity(name, null, control);
-+            }, this);
-+
-+            arrayRemove(this.$$controls, control);
-+            control.$$parentForm = nullFormCtrl;
-+        },
- 
--                /**
--                 * @ngdoc service
--                 * @name $timeout
--                 *
--                 * @description
--                 * Angular's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch
--                 * block and delegates any exceptions to
--                 * {@link ng.$exceptionHandler $exceptionHandler} service.
--                 *
--                 * The return value of registering a timeout function is a promise, which will be resolved when
--                 * the timeout is reached and the timeout function is executed.
--                 *
--                 * To cancel a timeout request, call `$timeout.cancel(promise)`.
--                 *
--                 * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to
--                 * synchronously flush the queue of deferred functions.
--                 *
--                 * @param {function()} fn A function, whose execution should be delayed.
--                 * @param {number=} [delay=0] Delay in milliseconds.
--                 * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
--                 *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
--                 * @returns {Promise} Promise that will be resolved when the timeout is reached. The value this
--                 *   promise will be resolved with is the return value of the `fn` function.
--                 *
--                 */
--                function timeout(fn, delay, invokeApply) {
--                    var deferred = $q.defer(),
--                        promise = deferred.promise,
--                        skipApply = (isDefined(invokeApply) && !invokeApply),
--                        timeoutId;
-+        /**
-+         * @ngdoc method
-+         * @name form.FormController#$setDirty
-+         *
-+         * @description
-+         * Sets the form to a dirty state.
-+         *
-+         * This method can be called to add the 'ng-dirty' class and set the form to a dirty
-+         * state (ng-dirty class). This method will also propagate to parent forms.
-+         */
-+        $setDirty: function() {
-+            this.$$animate.removeClass(this.$$element, PRISTINE_CLASS);
-+            this.$$animate.addClass(this.$$element, DIRTY_CLASS);
-+            this.$dirty = true;
-+            this.$pristine = false;
-+            this.$$parentForm.$setDirty();
-+        },
- 
--                    timeoutId = $browser.defer(function() {
--                        try {
--                            deferred.resolve(fn());
--                        } catch(e) {
--                            deferred.reject(e);
--                            $exceptionHandler(e);
--                        }
--                        finally {
--                            delete deferreds[promise.$$timeoutId];
--                        }
-+        /**
-+         * @ngdoc method
-+         * @name form.FormController#$setPristine
-+         *
-+         * @description
-+         * Sets the form to its pristine state.
-+         *
-+         * This method sets the form's `$pristine` state to true, the `$dirty` state to false, removes
-+         * the `ng-dirty` class and adds the `ng-pristine` class. Additionally, it sets the `$submitted`
-+         * state to false.
-+         *
-+         * This method will also propagate to all the controls contained in this form.
-+         *
-+         * Setting a form back to a pristine state is often useful when we want to 'reuse' a form after
-+         * saving or resetting it.
-+         */
-+        $setPristine: function() {
-+            this.$$animate.setClass(this.$$element, PRISTINE_CLASS, DIRTY_CLASS + ' ' + SUBMITTED_CLASS);
-+            this.$dirty = false;
-+            this.$pristine = true;
-+            this.$submitted = false;
-+            forEach(this.$$controls, function(control) {
-+                control.$setPristine();
-+            });
-+        },
- 
--                        if (!skipApply) $rootScope.$apply();
--                    }, delay);
-+        /**
-+         * @ngdoc method
-+         * @name form.FormController#$setUntouched
-+         *
-+         * @description
-+         * Sets the form to its untouched state.
-+         *
-+         * This method can be called to remove the 'ng-touched' class and set the form controls to their
-+         * untouched state (ng-untouched class).
-+         *
-+         * Setting a form controls back to their untouched state is often useful when setting the form
-+         * back to its pristine state.
-+         */
-+        $setUntouched: function() {
-+            forEach(this.$$controls, function(control) {
-+                control.$setUntouched();
-+            });
-+        },
- 
--                    promise.$$timeoutId = timeoutId;
--                    deferreds[timeoutId] = deferred;
-+        /**
-+         * @ngdoc method
-+         * @name form.FormController#$setSubmitted
-+         *
-+         * @description
-+         * Sets the form to its submitted state.
-+         */
-+        $setSubmitted: function() {
-+            this.$$animate.addClass(this.$$element, SUBMITTED_CLASS);
-+            this.$submitted = true;
-+            this.$$parentForm.$setSubmitted();
-+        }
-+    };
- 
--                    return promise;
-+    /**
-+     * @ngdoc method
-+     * @name form.FormController#$setValidity
-+     *
-+     * @description
-+     * Change the validity state of the form, and notify the parent form (if any).
-+     *
-+     * Application developers will rarely need to call this method directly. It is used internally, by
-+     * {@link ngModel.NgModelController#$setValidity NgModelController.$setValidity()}, to propagate a
-+     * control's validity state to the parent `FormController`.
-+     *
-+     * @param {string} validationErrorKey Name of the validator. The `validationErrorKey` will be
-+     *        assigned to either `$error[validationErrorKey]` or `$pending[validationErrorKey]` (for
-+     *        unfulfilled `$asyncValidators`), so that it is available for data-binding. The
-+     *        `validationErrorKey` should be in camelCase and will get converted into dash-case for
-+     *        class name. Example: `myError` will result in `ng-valid-my-error` and
-+     *        `ng-invalid-my-error` classes and can be bound to as `{{ someForm.$error.myError }}`.
-+     * @param {boolean} isValid Whether the current state is valid (true), invalid (false), pending
-+     *        (undefined),  or skipped (null). Pending is used for unfulfilled `$asyncValidators`.
-+     *        Skipped is used by AngularJS when validators do not run because of parse errors and when
-+     *        `$asyncValidators` do not run because any of the `$validators` failed.
-+     * @param {NgModelController | FormController} controller - The controller whose validity state is
-+     *        triggering the change.
-+     */
-+    addSetValidityMethod({
-+        clazz: FormController,
-+        set: function(object, property, controller) {
-+            var list = object[property];
-+            if (!list) {
-+                object[property] = [controller];
-+            } else {
-+                var index = list.indexOf(controller);
-+                if (index === -1) {
-+                    list.push(controller);
-                 }
-+            }
-+        },
-+        unset: function(object, property, controller) {
-+            var list = object[property];
-+            if (!list) {
-+                return;
-+            }
-+            arrayRemove(list, controller);
-+            if (list.length === 0) {
-+                delete object[property];
-+            }
-+        }
-+    });
- 
--
--                /**
--                 * @ngdoc method
--                 * @name $timeout#cancel
--                 *
--                 * @description
--                 * Cancels a task associated with the `promise`. As a result of this, the promise will be
--                 * resolved with a rejection.
--                 *
--                 * @param {Promise=} promise Promise returned by the `$timeout` function.
--                 * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully
--                 *   canceled.
--                 */
--                timeout.cancel = function(promise) {
--                    if (promise && promise.$$timeoutId in deferreds) {
--                        deferreds[promise.$$timeoutId].reject('canceled');
--                        delete deferreds[promise.$$timeoutId];
--                        return $browser.defer.cancel(promise.$$timeoutId);
--                    }
--                    return false;
--                };
--
--                return timeout;
--            }];
--    }
--
--// NOTE:  The usage of window and document instead of $window and $document here is
--// deliberate.  This service depends on the specific behavior of anchor nodes created by the
--// browser (resolving and parsing URLs) that is unlikely to be provided by mock objects and
--// cause us to break tests.  In addition, when the browser resolves a URL for XHR, it
--// doesn't know about mocked locations and resolves URLs to the real document - which is
--// exactly the behavior needed here.  There is little value is mocking these out for this
--// service.
--    var urlParsingNode = document.createElement("a");
--    var originUrl = urlResolve(window.location.href, true);
--
-+    /**
-+     * @ngdoc directive
-+     * @name ngForm
-+     * @restrict EAC
-+     *
-+     * @description
-+     * Nestable alias of {@link ng.directive:form `form`} directive. HTML
-+     * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a
-+     * sub-group of controls needs to be determined.
-+     *
-+     * Note: the purpose of `ngForm` is to group controls,
-+     * but not to be a replacement for the `<form>` tag with all of its capabilities
-+     * (e.g. posting to the server, ...).
-+     *
-+     * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into
-+     *                       related scope, under this name.
-+     *
-+     */
- 
-     /**
-+     * @ngdoc directive
-+     * @name form
-+     * @restrict E
-      *
--     * Implementation Notes for non-IE browsers
--     * ----------------------------------------
--     * Assigning a URL to the href property of an anchor DOM node, even one attached to the DOM,
--     * results both in the normalizing and parsing of the URL.  Normalizing means that a relative
--     * URL will be resolved into an absolute URL in the context of the application document.
--     * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related
--     * properties are all populated to reflect the normalized URL.  This approach has wide
--     * compatibility - Safari 1+, Mozilla 1+, Opera 7+,e etc.  See
--     * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
-+     * @description
-+     * Directive that instantiates
-+     * {@link form.FormController FormController}.
-      *
--     * Implementation Notes for IE
--     * ---------------------------
--     * IE >= 8 and <= 10 normalizes the URL when assigned to the anchor node similar to the other
--     * browsers.  However, the parsed components will not be set if the URL assigned did not specify
--     * them.  (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.)  We
--     * work around that by performing the parsing in a 2nd step by taking a previously normalized
--     * URL (e.g. by assigning to a.href) and assigning it a.href again.  This correctly populates the
--     * properties such as protocol, hostname, port, etc.
-+     * If the `name` attribute is specified, the form controller is published onto the current scope under
-+     * this name.
-      *
--     * IE7 does not normalize the URL when assigned to an anchor node.  (Apparently, it does, if one
--     * uses the inner HTML approach to assign the URL as part of an HTML snippet -
--     * http://stackoverflow.com/a/472729)  However, setting img[src] does normalize the URL.
--     * Unfortunately, setting img[src] to something like "javascript:foo" on IE throws an exception.
--     * Since the primary usage for normalizing URLs is to sanitize such URLs, we can't use that
--     * method and IE < 8 is unsupported.
-+     * ## Alias: {@link ng.directive:ngForm `ngForm`}
-      *
--     * References:
--     *   http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement
--     *   http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
--     *   http://url.spec.whatwg.org/#urlutils
--     *   https://github.com/angular/angular.js/pull/2902
--     *   http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
-+     * In AngularJS, forms can be nested. This means that the outer form is valid when all of the child
-+     * forms are valid as well. However, browsers do not allow nesting of `<form>` elements, so
-+     * AngularJS provides the {@link ng.directive:ngForm `ngForm`} directive, which behaves identically to
-+     * `form` but can be nested. Nested forms can be useful, for example, if the validity of a sub-group
-+     * of controls needs to be determined.
-      *
--     * @function
--     * @param {string} url The URL to be parsed.
--     * @description Normalizes and parses a URL.
--     * @returns {object} Returns the normalized URL as a dictionary.
-+     * ## CSS classes
-+     *  - `ng-valid` is set if the form is valid.
-+     *  - `ng-invalid` is set if the form is invalid.
-+     *  - `ng-pending` is set if the form is pending.
-+     *  - `ng-pristine` is set if the form is pristine.
-+     *  - `ng-dirty` is set if the form is dirty.
-+     *  - `ng-submitted` is set if the form was submitted.
-      *
--     *   | member name   | Description    |
--     *   |---------------|----------------|
--     *   | href          | A normalized version of the provided URL if it was not an absolute URL |
--     *   | protocol      | The protocol including the trailing colon                              |
--     *   | host          | The host and port (if the port is non-default) of the normalizedUrl    |
--     *   | search        | The search params, minus the question mark                             |
--     *   | hash          | The hash string, minus the hash symbol
--     *   | hostname      | The hostname
--     *   | port          | The port, without ":"
--     *   | pathname      | The pathname, beginning with "/"
-+     * Keep in mind that ngAnimate can detect each of these classes when added and removed.
-+     *
-+     *
-+     * ## Submitting a form and preventing the default action
-+     *
-+     * Since the role of forms in client-side AngularJS applications is different than in classical
-+     * roundtrip apps, it is desirable for the browser not to translate the form submission into a full
-+     * page reload that sends the data to the server. Instead some javascript logic should be triggered
-+     * to handle the form submission in an application-specific way.
-+     *
-+     * For this reason, AngularJS prevents the default action (form submission to the server) unless the
-+     * `<form>` element has an `action` attribute specified.
-+     *
-+     * You can use one of the following two ways to specify what javascript method should be called when
-+     * a form is submitted:
-+     *
-+     * - {@link ng.directive:ngSubmit ngSubmit} directive on the form element
-+     * - {@link ng.directive:ngClick ngClick} directive on the first
-+     *  button or input field of type submit (input[type=submit])
-+     *
-+     * To prevent double execution of the handler, use only one of the {@link ng.directive:ngSubmit ngSubmit}
-+     * or {@link ng.directive:ngClick ngClick} directives.
-+     * This is because of the following form submission rules in the HTML specification:
-+     *
-+     * - If a form has only one input field then hitting enter in this field triggers form submit
-+     * (`ngSubmit`)
-+     * - if a form has 2+ input fields and no buttons or input[type=submit] then hitting enter
-+     * doesn't trigger submit
-+     * - if a form has one or more input fields and one or more buttons or input[type=submit] then
-+     * hitting enter in any of the input fields will trigger the click handler on the *first* button or
-+     * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`)
-+     *
-+     * Any pending `ngModelOptions` changes will take place immediately when an enclosing form is
-+     * submitted. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit`
-+     * to have access to the updated model.
-+     *
-+     * @animations
-+     * Animations in ngForm are triggered when any of the associated CSS classes are added and removed.
-+     * These classes are: `.ng-pristine`, `.ng-dirty`, `.ng-invalid` and `.ng-valid` as well as any
-+     * other validations that are performed within the form. Animations in ngForm are similar to how
-+     * they work in ngClass and animations can be hooked into using CSS transitions, keyframes as well
-+     * as JS animations.
-+     *
-+     * The following example shows a simple way to utilize CSS transitions to style a form element
-+     * that has been rendered as invalid after it has been validated:
-+     *
-+     * <pre>
-+     * //be sure to include ngAnimate as a module to hook into more
-+     * //advanced animations
-+     * .my-form {
-+     *   transition:0.5s linear all;
-+     *   background: white;
-+     * }
-+     * .my-form.ng-invalid {
-+     *   background: red;
-+     *   color:white;
-+     * }
-+     * </pre>
-+     *
-+     * @example
-+     <example name="ng-form" deps="angular-animate.js" animations="true" fixBase="true" module="formExample">
-+     <file name="index.html">
-+     <script>
-+     angular.module('formExample', [])
-+     .controller('FormController', ['$scope', function($scope) {
-+             $scope.userType = 'guest';
-+           }]);
-+     </script>
-+     <style>
-+     .my-form {
-+          transition:all linear 0.5s;
-+          background: transparent;
-+        }
-+     .my-form.ng-invalid {
-+          background: red;
-+        }
-+     </style>
-+     <form name="myForm" ng-controller="FormController" class="my-form">
-+     userType: <input name="input" ng-model="userType" required>
-+     <span class="error" ng-show="myForm.input.$error.required">Required!</span><br>
-+     <code>userType = {{userType}}</code><br>
-+     <code>myForm.input.$valid = {{myForm.input.$valid}}</code><br>
-+     <code>myForm.input.$error = {{myForm.input.$error}}</code><br>
-+     <code>myForm.$valid = {{myForm.$valid}}</code><br>
-+     <code>myForm.$error.required = {{!!myForm.$error.required}}</code><br>
-+     </form>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should initialize to model', function() {
-+          var userType = element(by.binding('userType'));
-+          var valid = element(by.binding('myForm.input.$valid'));
-+
-+          expect(userType.getText()).toContain('guest');
-+          expect(valid.getText()).toContain('true');
-+        });
-+
-+     it('should be invalid if empty', function() {
-+          var userType = element(by.binding('userType'));
-+          var valid = element(by.binding('myForm.input.$valid'));
-+          var userInput = element(by.model('userType'));
-+
-+          userInput.clear();
-+          userInput.sendKeys('');
-+
-+          expect(userType.getText()).toEqual('userType =');
-+          expect(valid.getText()).toContain('false');
-+        });
-+     </file>
-+     </example>
-      *
-+     * @param {string=} name Name of the form. If specified, the form controller will be published into
-+     *                       related scope, under this name.
-      */
--    function urlResolve(url, base) {
--        var href = url;
-+    var formDirectiveFactory = function(isNgForm) {
-+        return ['$timeout', '$parse', function($timeout, $parse) {
-+            var formDirective = {
-+                name: 'form',
-+                restrict: isNgForm ? 'EAC' : 'E',
-+                require: ['form', '^^?form'], //first is the form's own ctrl, second is an optional parent form
-+                controller: FormController,
-+                compile: function ngFormCompile(formElement, attr) {
-+                    // Setup initial state of the control
-+                    formElement.addClass(PRISTINE_CLASS).addClass(VALID_CLASS);
-+
-+                    var nameAttr = attr.name ? 'name' : (isNgForm && attr.ngForm ? 'ngForm' : false);
-+
-+                    return {
-+                        pre: function ngFormPreLink(scope, formElement, attr, ctrls) {
-+                            var controller = ctrls[0];
-+
-+                            // if `action` attr is not present on the form, prevent the default action (submission)
-+                            if (!('action' in attr)) {
-+                                // we can't use jq events because if a form is destroyed during submission the default
-+                                // action is not prevented. see #1238
-+                                //
-+                                // IE 9 is not affected because it doesn't fire a submit event and try to do a full
-+                                // page reload if the form was destroyed by submission of the form via a click handler
-+                                // on a button in the form. Looks like an IE9 specific bug.
-+                                var handleFormSubmission = function(event) {
-+                                    scope.$apply(function() {
-+                                        controller.$commitViewValue();
-+                                        controller.$setSubmitted();
-+                                    });
-+
-+                                    event.preventDefault();
-+                                };
-+
-+                                formElement[0].addEventListener('submit', handleFormSubmission);
-+
-+                                // unregister the preventDefault listener so that we don't not leak memory but in a
-+                                // way that will achieve the prevention of the default action.
-+                                formElement.on('$destroy', function() {
-+                                    $timeout(function() {
-+                                        formElement[0].removeEventListener('submit', handleFormSubmission);
-+                                    }, 0, false);
-+                                });
-+                            }
- 
--        if (msie) {
--            // Normalize before parse.  Refer Implementation Notes on why this is
--            // done in two steps on IE.
--            urlParsingNode.setAttribute("href", href);
--            href = urlParsingNode.href;
--        }
-+                            var parentFormCtrl = ctrls[1] || controller.$$parentForm;
-+                            parentFormCtrl.$addControl(controller);
- 
--        urlParsingNode.setAttribute('href', href);
-+                            var setter = nameAttr ? getSetter(controller.$name) : noop;
- 
--        // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils
--        return {
--            href: urlParsingNode.href,
--            protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '',
--            host: urlParsingNode.host,
--            search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '',
--            hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
--            hostname: urlParsingNode.hostname,
--            port: urlParsingNode.port,
--            pathname: (urlParsingNode.pathname.charAt(0) === '/')
--                ? urlParsingNode.pathname
--                : '/' + urlParsingNode.pathname
--        };
--    }
-+                            if (nameAttr) {
-+                                setter(scope, controller);
-+                                attr.$observe(nameAttr, function(newValue) {
-+                                    if (controller.$name === newValue) return;
-+                                    setter(scope, undefined);
-+                                    controller.$$parentForm.$$renameControl(controller, newValue);
-+                                    setter = getSetter(controller.$name);
-+                                    setter(scope, controller);
-+                                });
-+                            }
-+                            formElement.on('$destroy', function() {
-+                                controller.$$parentForm.$removeControl(controller);
-+                                setter(scope, undefined);
-+                                extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards
-+                            });
-+                        }
-+                    };
-+                }
-+            };
- 
--    /**
--     * Parse a request URL and determine whether this is a same-origin request as the application document.
--     *
--     * @param {string|object} requestUrl The url of the request as a string that will be resolved
--     * or a parsed URL object.
--     * @returns {boolean} Whether the request is for the same origin as the application document.
--     */
--    function urlIsSameOrigin(requestUrl) {
--        var parsed = (isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl;
--        return (parsed.protocol === originUrl.protocol &&
--        parsed.host === originUrl.host);
-+            return formDirective;
-+
-+            function getSetter(expression) {
-+                if (expression === '') {
-+                    //create an assignable expression, so forms with an empty name can be renamed later
-+                    return $parse('this[""]').assign;
-+                }
-+                return $parse(expression).assign || noop;
-+            }
-+        }];
-+    };
-+
-+    var formDirective = formDirectiveFactory();
-+    var ngFormDirective = formDirectiveFactory(true);
-+
-+
-+
-+// helper methods
-+    function setupValidity(instance) {
-+        instance.$$classCache = {};
-+        instance.$$classCache[INVALID_CLASS] = !(instance.$$classCache[VALID_CLASS] = instance.$$element.hasClass(VALID_CLASS));
-     }
-+    function addSetValidityMethod(context) {
-+        var clazz = context.clazz,
-+            set = context.set,
-+            unset = context.unset;
-+
-+        clazz.prototype.$setValidity = function(validationErrorKey, state, controller) {
-+            if (isUndefined(state)) {
-+                createAndSet(this, '$pending', validationErrorKey, controller);
-+            } else {
-+                unsetAndCleanup(this, '$pending', validationErrorKey, controller);
-+            }
-+            if (!isBoolean(state)) {
-+                unset(this.$error, validationErrorKey, controller);
-+                unset(this.$$success, validationErrorKey, controller);
-+            } else {
-+                if (state) {
-+                    unset(this.$error, validationErrorKey, controller);
-+                    set(this.$$success, validationErrorKey, controller);
-+                } else {
-+                    set(this.$error, validationErrorKey, controller);
-+                    unset(this.$$success, validationErrorKey, controller);
-+                }
-+            }
-+            if (this.$pending) {
-+                cachedToggleClass(this, PENDING_CLASS, true);
-+                this.$valid = this.$invalid = undefined;
-+                toggleValidationCss(this, '', null);
-+            } else {
-+                cachedToggleClass(this, PENDING_CLASS, false);
-+                this.$valid = isObjectEmpty(this.$error);
-+                this.$invalid = !this.$valid;
-+                toggleValidationCss(this, '', this.$valid);
-+            }
- 
--    /**
--     * @ngdoc service
--     * @name $window
--     *
--     * @description
--     * A reference to the browser's `window` object. While `window`
--     * is globally available in JavaScript, it causes testability problems, because
--     * it is a global variable. In angular we always refer to it through the
--     * `$window` service, so it may be overridden, removed or mocked for testing.
--     *
--     * Expressions, like the one defined for the `ngClick` directive in the example
--     * below, are evaluated with respect to the current scope.  Therefore, there is
--     * no risk of inadvertently coding in a dependency on a global value in such an
--     * expression.
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <script>
--     function Ctrl($scope, $window) {
--           $scope.greeting = 'Hello, World!';
--           $scope.doGreeting = function(greeting) {
--               $window.alert(greeting);
--           };
--         }
--     </script>
--     <div ng-controller="Ctrl">
--     <input type="text" ng-model="greeting" />
--     <button ng-click="doGreeting(greeting)">ALERT</button>
--     </div>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should display the greeting in the input box', function() {
--       element(by.model('greeting')).sendKeys('Hello, E2E Tests');
--       // If we click the button it will block the test runner
--       // element(':button').click();
--      });
--     </file>
--     </example>
--     */
--    function $WindowProvider(){
--        this.$get = valueFn(window);
-+            // re-read the state as the set/unset methods could have
-+            // combined state in this.$error[validationError] (used for forms),
-+            // where setting/unsetting only increments/decrements the value,
-+            // and does not replace it.
-+            var combinedState;
-+            if (this.$pending && this.$pending[validationErrorKey]) {
-+                combinedState = undefined;
-+            } else if (this.$error[validationErrorKey]) {
-+                combinedState = false;
-+            } else if (this.$$success[validationErrorKey]) {
-+                combinedState = true;
-+            } else {
-+                combinedState = null;
-+            }
-+
-+            toggleValidationCss(this, validationErrorKey, combinedState);
-+            this.$$parentForm.$setValidity(validationErrorKey, combinedState, this);
-+        };
-+
-+        function createAndSet(ctrl, name, value, controller) {
-+            if (!ctrl[name]) {
-+                ctrl[name] = {};
-+            }
-+            set(ctrl[name], value, controller);
-+        }
-+
-+        function unsetAndCleanup(ctrl, name, value, controller) {
-+            if (ctrl[name]) {
-+                unset(ctrl[name], value, controller);
-+            }
-+            if (isObjectEmpty(ctrl[name])) {
-+                ctrl[name] = undefined;
-+            }
-+        }
-+
-+        function cachedToggleClass(ctrl, className, switchValue) {
-+            if (switchValue && !ctrl.$$classCache[className]) {
-+                ctrl.$$animate.addClass(ctrl.$$element, className);
-+                ctrl.$$classCache[className] = true;
-+            } else if (!switchValue && ctrl.$$classCache[className]) {
-+                ctrl.$$animate.removeClass(ctrl.$$element, className);
-+                ctrl.$$classCache[className] = false;
-+            }
-+        }
-+
-+        function toggleValidationCss(ctrl, validationErrorKey, isValid) {
-+            validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
-+
-+            cachedToggleClass(ctrl, VALID_CLASS + validationErrorKey, isValid === true);
-+            cachedToggleClass(ctrl, INVALID_CLASS + validationErrorKey, isValid === false);
-+        }
-     }
- 
--    /**
--     * @ngdoc provider
--     * @name $filterProvider
--     * @description
--     *
--     * Filters are just functions which transform input to an output. However filters need to be
--     * Dependency Injected. To achieve this a filter definition consists of a factory function which is
--     * annotated with dependencies and is responsible for creating a filter function.
--     *
--     * ```js
--     *   // Filter registration
--     *   function MyModule($provide, $filterProvider) {
-- *     // create a service to demonstrate injection (not always needed)
-- *     $provide.value('greet', function(name){
-- *       return 'Hello ' + name + '!';
-- *     });
-- *
-- *     // register a filter factory which uses the
-- *     // greet service to demonstrate DI.
-- *     $filterProvider.register('greet', function(greet){
-- *       // return the filter function which uses the greet service
-- *       // to generate salutation
-- *       return function(text) {
-- *         // filters need to be forgiving so check input validity
-- *         return text && greet(text) || text;
-- *       };
-- *     });
-- *   }
--     * ```
--     *
--     * The filter function is registered with the `$injector` under the filter name suffix with
--     * `Filter`.
--     *
--     * ```js
--     *   it('should be the same instance', inject(
--     *     function($filterProvider) {
-- *       $filterProvider.register('reverse', function(){
-- *         return ...;
-- *       });
-- *     },
--     *     function($filter, reverseFilter) {
-- *       expect($filter('reverse')).toBe(reverseFilter);
-- *     });
--     * ```
--     *
--     *
--     * For more information about how angular filters work, and how to create your own filters, see
--     * {@link guide/filter Filters} in the Angular Developer Guide.
--     */
--    /**
--     * @ngdoc method
--     * @name $filterProvider#register
--     * @description
--     * Register filter factory function.
--     *
--     * @param {String} name Name of the filter.
--     * @param {Function} fn The filter factory function which is injectable.
--     */
-+    function isObjectEmpty(obj) {
-+        if (obj) {
-+            for (var prop in obj) {
-+                if (obj.hasOwnProperty(prop)) {
-+                    return false;
-+                }
-+            }
-+        }
-+        return true;
-+    }
- 
-+    /* global
-+  VALID_CLASS: false,
-+  INVALID_CLASS: false,
-+  PRISTINE_CLASS: false,
-+  DIRTY_CLASS: false,
-+  ngModelMinErr: false
-+*/
-+
-+// Regex code was initially obtained from SO prior to modification: https://stackoverflow.com/questions/3143070/javascript-regex-iso-datetime#answer-3143231
-+    var ISO_DATE_REGEXP = /^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-][0-2]\d:[0-5]\d|Z)$/;
-+// See valid URLs in RFC3987 (http://tools.ietf.org/html/rfc3987)
-+// Note: We are being more lenient, because browsers are too.
-+//   1. Scheme
-+//   2. Slashes
-+//   3. Username
-+//   4. Password
-+//   5. Hostname
-+//   6. Port
-+//   7. Path
-+//   8. Query
-+//   9. Fragment
-+//                 1111111111111111 222   333333    44444        55555555555555555555555     666     77777777     8888888     999
-+    var URL_REGEXP = /^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i;
-+// eslint-disable-next-line max-len
-+    var EMAIL_REGEXP = /^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/;
-+    var NUMBER_REGEXP = /^\s*(-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;
-+    var DATE_REGEXP = /^(\d{4,})-(\d{2})-(\d{2})$/;
-+    var DATETIMELOCAL_REGEXP = /^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
-+    var WEEK_REGEXP = /^(\d{4,})-W(\d\d)$/;
-+    var MONTH_REGEXP = /^(\d{4,})-(\d\d)$/;
-+    var TIME_REGEXP = /^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
-+
-+    var PARTIAL_VALIDATION_EVENTS = 'keydown wheel mousedown';
-+    var PARTIAL_VALIDATION_TYPES = createMap();
-+    forEach('date,datetime-local,month,time,week'.split(','), function(type) {
-+        PARTIAL_VALIDATION_TYPES[type] = true;
-+    });
- 
--    /**
--     * @ngdoc service
--     * @name $filter
--     * @function
--     * @description
--     * Filters are used for formatting data displayed to the user.
--     *
--     * The general syntax in templates is as follows:
--     *
--     *         {{ expression [| filter_name[:parameter_value] ... ] }}
--     *
--     * @param {String} name Name of the filter function to retrieve
--     * @return {Function} the filter function
--     */
--    $FilterProvider.$inject = ['$provide'];
--    function $FilterProvider($provide) {
--        var suffix = 'Filter';
-+    var inputType = {
- 
-         /**
--         * @ngdoc method
--         * @name $controllerProvider#register
--         * @param {string|Object} name Name of the filter function, or an object map of filters where
--         *    the keys are the filter names and the values are the filter factories.
--         * @returns {Object} Registered filter instance, or if a map of filters was provided then a map
--         *    of the registered filter instances.
-+         * @ngdoc input
-+         * @name input[text]
-+         *
-+         * @description
-+         * Standard HTML text input with AngularJS data binding, inherited by most of the `input` elements.
-+         *
-+         *
-+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+         * @param {string=} name Property name of the form under which the control is published.
-+         * @param {string=} required Adds `required` validation error key if the value is not entered.
-+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-+         *    `required` when you want to data-bind to the `required` attribute.
-+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-+         *    minlength.
-+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
-+         *    any length.
-+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
-+         *    that contains the regular expression body that will be converted to a regular expression
-+         *    as in the ngPattern directive.
-+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
-+         *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
-+         *    If the expression evaluates to a RegExp object, then this is used directly.
-+         *    If the expression evaluates to a string, then it will be converted to a RegExp
-+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
-+         *    `new RegExp('^abc$')`.<br />
-+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
-+         *    start at the index of the last search's match, thus not taking the whole input value into
-+         *    account.
-+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
-+         *    interaction with the input element.
-+         * @param {boolean=} [ngTrim=true] If set to false AngularJS will not automatically trim the input.
-+         *    This parameter is ignored for input[type=password] controls, which will never trim the
-+         *    input.
-+         *
-+         * @example
-+         <example name="text-input-directive" module="textInputExample">
-+         <file name="index.html">
-+         <script>
-+         angular.module('textInputExample', [])
-+         .controller('ExampleController', ['$scope', function($scope) {
-+               $scope.example = {
-+                 text: 'guest',
-+                 word: /^\s*\w*\s*$/
-+               };
-+             }]);
-+         </script>
-+         <form name="myForm" ng-controller="ExampleController">
-+         <label>Single word:
-+         <input type="text" name="input" ng-model="example.text"
-+         ng-pattern="example.word" required ng-trim="false">
-+         </label>
-+         <div role="alert">
-+         <span class="error" ng-show="myForm.input.$error.required">
-+         Required!</span>
-+         <span class="error" ng-show="myForm.input.$error.pattern">
-+         Single word only!</span>
-+         </div>
-+         <code>text = {{example.text}}</code><br/>
-+         <code>myForm.input.$valid = {{myForm.input.$valid}}</code><br/>
-+         <code>myForm.input.$error = {{myForm.input.$error}}</code><br/>
-+         <code>myForm.$valid = {{myForm.$valid}}</code><br/>
-+         <code>myForm.$error.required = {{!!myForm.$error.required}}</code><br/>
-+         </form>
-+         </file>
-+         <file name="protractor.js" type="protractor">
-+         var text = element(by.binding('example.text'));
-+         var valid = element(by.binding('myForm.input.$valid'));
-+         var input = element(by.model('example.text'));
-+
-+         it('should initialize to model', function() {
-+            expect(text.getText()).toContain('guest');
-+            expect(valid.getText()).toContain('true');
-+          });
-+
-+         it('should be invalid if empty', function() {
-+            input.clear();
-+            input.sendKeys('');
-+
-+            expect(text.getText()).toEqual('text =');
-+            expect(valid.getText()).toContain('false');
-+          });
-+
-+         it('should be invalid if multi word', function() {
-+            input.clear();
-+            input.sendKeys('hello world');
-+
-+            expect(valid.getText()).toContain('false');
-+          });
-+         </file>
-+         </example>
-          */
--        function register(name, factory) {
--            if(isObject(name)) {
--                var filters = {};
--                forEach(name, function(filter, key) {
--                    filters[key] = register(key, filter);
--                });
--                return filters;
--            } else {
--                return $provide.factory(name + suffix, factory);
--            }
-+        'text': textInputType,
-+
-+        /**
-+         * @ngdoc input
-+         * @name input[date]
-+         *
-+         * @description
-+         * Input with date validation and transformation. In browsers that do not yet support
-+         * the HTML5 date input, a text element will be used. In that case, text must be entered in a valid ISO-8601
-+         * date format (yyyy-MM-dd), for example: `2009-01-06`. Since many
-+         * modern browsers do not yet support this input type, it is important to provide cues to users on the
-+         * expected input format via a placeholder or label.
-+         *
-+         * The model must always be a Date object, otherwise AngularJS will throw an error.
-+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
-+         *
-+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
-+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
-+         *
-+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+         * @param {string=} name Property name of the form under which the control is published.
-+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a
-+         *   valid ISO date string (yyyy-MM-dd). You can also use interpolation inside this attribute
-+         *   (e.g. `min="{{minDate | date:'yyyy-MM-dd'}}"`). Note that `min` will also add native HTML5
-+         *   constraint validation.
-+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be
-+         *   a valid ISO date string (yyyy-MM-dd). You can also use interpolation inside this attribute
-+         *   (e.g. `max="{{maxDate | date:'yyyy-MM-dd'}}"`). Note that `max` will also add native HTML5
-+         *   constraint validation.
-+         * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO date string
-+         *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
-+         * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO date string
-+         *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
-+         * @param {string=} required Sets `required` validation error key if the value is not entered.
-+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-+         *    `required` when you want to data-bind to the `required` attribute.
-+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
-+         *    interaction with the input element.
-+         *
-+         * @example
-+         <example name="date-input-directive" module="dateInputExample">
-+         <file name="index.html">
-+         <script>
-+         angular.module('dateInputExample', [])
-+         .controller('DateController', ['$scope', function($scope) {
-+              $scope.example = {
-+                value: new Date(2013, 9, 22)
-+              };
-+            }]);
-+         </script>
-+         <form name="myForm" ng-controller="DateController as dateCtrl">
-+         <label for="exampleInput">Pick a date in 2013:</label>
-+         <input type="date" id="exampleInput" name="input" ng-model="example.value"
-+         placeholder="yyyy-MM-dd" min="2013-01-01" max="2013-12-31" required />
-+         <div role="alert">
-+         <span class="error" ng-show="myForm.input.$error.required">
-+         Required!</span>
-+         <span class="error" ng-show="myForm.input.$error.date">
-+         Not a valid date!</span>
-+         </div>
-+         <tt>value = {{example.value | date: "yyyy-MM-dd"}}</tt><br/>
-+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-+         </form>
-+         </file>
-+         <file name="protractor.js" type="protractor">
-+         var value = element(by.binding('example.value | date: "yyyy-MM-dd"'));
-+         var valid = element(by.binding('myForm.input.$valid'));
-+
-+         // currently protractor/webdriver does not support
-+         // sending keys to all known HTML5 input controls
-+         // for various browsers (see https://github.com/angular/protractor/issues/562).
-+         function setInput(val) {
-+          // set the value of the element and force validation.
-+          var scr = "var ipt = document.getElementById('exampleInput'); " +
-+          "ipt.value = '" + val + "';" +
-+          "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
-+          browser.executeScript(scr);
-         }
--        this.register = register;
- 
--        this.$get = ['$injector', function($injector) {
--            return function(name) {
--                return $injector.get(name + suffix);
--            };
--        }];
-+         it('should initialize to model', function() {
-+          expect(value.getText()).toContain('2013-10-22');
-+          expect(valid.getText()).toContain('myForm.input.$valid = true');
-+        });
- 
--        ////////////////////////////////////////
-+         it('should be invalid if empty', function() {
-+          setInput('');
-+          expect(value.getText()).toEqual('value =');
-+          expect(valid.getText()).toContain('myForm.input.$valid = false');
-+        });
- 
--        /* global
--         currencyFilter: false,
--         dateFilter: false,
--         filterFilter: false,
--         jsonFilter: false,
--         limitToFilter: false,
--         lowercaseFilter: false,
--         numberFilter: false,
--         orderByFilter: false,
--         uppercaseFilter: false,
-+         it('should be invalid if over max', function() {
-+          setInput('2015-01-01');
-+          expect(value.getText()).toContain('');
-+          expect(valid.getText()).toContain('myForm.input.$valid = false');
-+        });
-+         </file>
-+         </example>
-          */
-+        'date': createDateInputType('date', DATE_REGEXP,
-+            createDateParser(DATE_REGEXP, ['yyyy', 'MM', 'dd']),
-+            'yyyy-MM-dd'),
- 
--        register('currency', currencyFilter);
--        register('date', dateFilter);
--        register('filter', filterFilter);
--        register('json', jsonFilter);
--        register('limitTo', limitToFilter);
--        register('lowercase', lowercaseFilter);
--        register('number', numberFilter);
--        register('orderBy', orderByFilter);
--        register('uppercase', uppercaseFilter);
--    }
-+        /**
-+         * @ngdoc input
-+         * @name input[datetime-local]
-+         *
-+         * @description
-+         * Input with datetime validation and transformation. In browsers that do not yet support
-+         * the HTML5 date input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
-+         * local datetime format (yyyy-MM-ddTHH:mm:ss), for example: `2010-12-28T14:57:00`.
-+         *
-+         * The model must always be a Date object, otherwise AngularJS will throw an error.
-+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
-+         *
-+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
-+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
-+         *
-+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+         * @param {string=} name Property name of the form under which the control is published.
-+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
-+         *   This must be a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). You can also use interpolation
-+         *   inside this attribute (e.g. `min="{{minDatetimeLocal | date:'yyyy-MM-ddTHH:mm:ss'}}"`).
-+         *   Note that `min` will also add native HTML5 constraint validation.
-+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
-+         *   This must be a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). You can also use interpolation
-+         *   inside this attribute (e.g. `max="{{maxDatetimeLocal | date:'yyyy-MM-ddTHH:mm:ss'}}"`).
-+         *   Note that `max` will also add native HTML5 constraint validation.
-+         * @param {(date|string)=} ngMin Sets the `min` validation error key to the Date / ISO datetime string
-+         *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
-+         * @param {(date|string)=} ngMax Sets the `max` validation error key to the Date / ISO datetime string
-+         *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
-+         * @param {string=} required Sets `required` validation error key if the value is not entered.
-+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-+         *    `required` when you want to data-bind to the `required` attribute.
-+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
-+         *    interaction with the input element.
-+         *
-+         * @example
-+         <example name="datetimelocal-input-directive" module="dateExample">
-+         <file name="index.html">
-+         <script>
-+         angular.module('dateExample', [])
-+         .controller('DateController', ['$scope', function($scope) {
-+            $scope.example = {
-+              value: new Date(2010, 11, 28, 14, 57)
-+            };
-+          }]);
-+         </script>
-+         <form name="myForm" ng-controller="DateController as dateCtrl">
-+         <label for="exampleInput">Pick a date between in 2013:</label>
-+         <input type="datetime-local" id="exampleInput" name="input" ng-model="example.value"
-+         placeholder="yyyy-MM-ddTHH:mm:ss" min="2001-01-01T00:00:00" max="2013-12-31T00:00:00" required />
-+         <div role="alert">
-+         <span class="error" ng-show="myForm.input.$error.required">
-+         Required!</span>
-+         <span class="error" ng-show="myForm.input.$error.datetimelocal">
-+         Not a valid date!</span>
-+         </div>
-+         <tt>value = {{example.value | date: "yyyy-MM-ddTHH:mm:ss"}}</tt><br/>
-+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-+         </form>
-+         </file>
-+         <file name="protractor.js" type="protractor">
-+         var value = element(by.binding('example.value | date: "yyyy-MM-ddTHH:mm:ss"'));
-+         var valid = element(by.binding('myForm.input.$valid'));
- 
--    /**
--     * @ngdoc filter
--     * @name filter
--     * @function
--     *
--     * @description
--     * Selects a subset of items from `array` and returns it as a new array.
--     *
--     * @param {Array} array The source array.
--     * @param {string|Object|function()} expression The predicate to be used for selecting items from
--     *   `array`.
--     *
--     *   Can be one of:
--     *
--     *   - `string`: The string is evaluated as an expression and the resulting value is used for substring match against
--     *     the contents of the `array`. All strings or objects with string properties in `array` that contain this string
--     *     will be returned. The predicate can be negated by prefixing the string with `!`.
--     *
--     *   - `Object`: A pattern object can be used to filter specific properties on objects contained
--     *     by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items
--     *     which have property `name` containing "M" and property `phone` containing "1". A special
--     *     property name `$` can be used (as in `{$:"text"}`) to accept a match against any
--     *     property of the object. That's equivalent to the simple substring match with a `string`
--     *     as described above.
--     *
--     *   - `function(value)`: A predicate function can be used to write arbitrary filters. The function is
--     *     called for each element of `array`. The final result is an array of those elements that
--     *     the predicate returned true for.
--     *
--     * @param {function(actual, expected)|true|undefined} comparator Comparator which is used in
--     *     determining if the expected value (from the filter expression) and actual value (from
--     *     the object in the array) should be considered a match.
--     *
--     *   Can be one of:
--     *
--     *     - `function(actual, expected)`:
--     *       The function will be given the object value and the predicate value to compare and
--     *       should return true if the item should be included in filtered result.
--     *
--     *     - `true`: A shorthand for `function(actual, expected) { return angular.equals(expected, actual)}`.
--     *       this is essentially strict comparison of expected and actual.
--     *
--     *     - `false|undefined`: A short hand for a function which will look for a substring match in case
--     *       insensitive way.
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <div ng-init="friends = [{name:'John', phone:'555-1276'},
--     {name:'Mary', phone:'800-BIG-MARY'},
--     {name:'Mike', phone:'555-4321'},
--     {name:'Adam', phone:'555-5678'},
--     {name:'Julie', phone:'555-8765'},
--     {name:'Juliette', phone:'555-5678'}]"></div>
-+         // currently protractor/webdriver does not support
-+         // sending keys to all known HTML5 input controls
-+         // for various browsers (https://github.com/angular/protractor/issues/562).
-+         function setInput(val) {
-+        // set the value of the element and force validation.
-+        var scr = "var ipt = document.getElementById('exampleInput'); " +
-+        "ipt.value = '" + val + "';" +
-+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
-+        browser.executeScript(scr);
-+      }
- 
--     Search: <input ng-model="searchText">
--     <table id="searchTextResults">
--     <tr><th>Name</th><th>Phone</th></tr>
--     <tr ng-repeat="friend in friends | filter:searchText">
--     <td>{{friend.name}}</td>
--     <td>{{friend.phone}}</td>
--     </tr>
--     </table>
--     <hr>
--     Any: <input ng-model="search.$"> <br>
--     Name only <input ng-model="search.name"><br>
--     Phone only <input ng-model="search.phone"><br>
--     Equality <input type="checkbox" ng-model="strict"><br>
--     <table id="searchObjResults">
--     <tr><th>Name</th><th>Phone</th></tr>
--     <tr ng-repeat="friendObj in friends | filter:search:strict">
--     <td>{{friendObj.name}}</td>
--     <td>{{friendObj.phone}}</td>
--     </tr>
--     </table>
--     </file>
--     <file name="protractor.js" type="protractor">
--     var expectFriendNames = function(expectedNames, key) {
--         element.all(by.repeater(key + ' in friends').column(key + '.name')).then(function(arr) {
--           arr.forEach(function(wd, i) {
--             expect(wd.getText()).toMatch(expectedNames[i]);
--           });
--         });
--       };
-+         it('should initialize to model', function() {
-+        expect(value.getText()).toContain('2010-12-28T14:57:00');
-+        expect(valid.getText()).toContain('myForm.input.$valid = true');
-+      });
- 
--     it('should search across all fields when filtering with a string', function() {
--         var searchText = element(by.model('searchText'));
--         searchText.clear();
--         searchText.sendKeys('m');
--         expectFriendNames(['Mary', 'Mike', 'Adam'], 'friend');
-+         it('should be invalid if empty', function() {
-+        setInput('');
-+        expect(value.getText()).toEqual('value =');
-+        expect(valid.getText()).toContain('myForm.input.$valid = false');
-+      });
- 
--         searchText.clear();
--         searchText.sendKeys('76');
--         expectFriendNames(['John', 'Julie'], 'friend');
--       });
-+         it('should be invalid if over max', function() {
-+        setInput('2015-01-01T23:59:00');
-+        expect(value.getText()).toContain('');
-+        expect(valid.getText()).toContain('myForm.input.$valid = false');
-+      });
-+         </file>
-+         </example>
-+         */
-+        'datetime-local': createDateInputType('datetimelocal', DATETIMELOCAL_REGEXP,
-+            createDateParser(DATETIMELOCAL_REGEXP, ['yyyy', 'MM', 'dd', 'HH', 'mm', 'ss', 'sss']),
-+            'yyyy-MM-ddTHH:mm:ss.sss'),
- 
--     it('should search in specific fields when filtering with a predicate object', function() {
--         var searchAny = element(by.model('search.$'));
--         searchAny.clear();
--         searchAny.sendKeys('i');
--         expectFriendNames(['Mary', 'Mike', 'Julie', 'Juliette'], 'friendObj');
--       });
--     it('should use a equal comparison when comparator is true', function() {
--         var searchName = element(by.model('search.name'));
--         var strict = element(by.model('strict'));
--         searchName.clear();
--         searchName.sendKeys('Julie');
--         strict.click();
--         expectFriendNames(['Julie'], 'friendObj');
--       });
--     </file>
--     </example>
--     */
--    function filterFilter() {
--        return function(array, expression, comparator) {
--            if (!isArray(array)) return array;
-+        /**
-+         * @ngdoc input
-+         * @name input[time]
-+         *
-+         * @description
-+         * Input with time validation and transformation. In browsers that do not yet support
-+         * the HTML5 time input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
-+         * local time format (HH:mm:ss), for example: `14:57:00`. Model must be a Date object. This binding will always output a
-+         * Date object to the model of January 1, 1970, or local date `new Date(1970, 0, 1, HH, mm, ss)`.
-+         *
-+         * The model must always be a Date object, otherwise AngularJS will throw an error.
-+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
-+         *
-+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
-+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
-+         *
-+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+         * @param {string=} name Property name of the form under which the control is published.
-+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
-+         *   This must be a valid ISO time format (HH:mm:ss). You can also use interpolation inside this
-+         *   attribute (e.g. `min="{{minTime | date:'HH:mm:ss'}}"`). Note that `min` will also add
-+         *   native HTML5 constraint validation.
-+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
-+         *   This must be a valid ISO time format (HH:mm:ss). You can also use interpolation inside this
-+         *   attribute (e.g. `max="{{maxTime | date:'HH:mm:ss'}}"`). Note that `max` will also add
-+         *   native HTML5 constraint validation.
-+         * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO time string the
-+         *   `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
-+         * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO time string the
-+         *   `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
-+         * @param {string=} required Sets `required` validation error key if the value is not entered.
-+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-+         *    `required` when you want to data-bind to the `required` attribute.
-+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
-+         *    interaction with the input element.
-+         *
-+         * @example
-+         <example name="time-input-directive" module="timeExample">
-+         <file name="index.html">
-+         <script>
-+         angular.module('timeExample', [])
-+         .controller('DateController', ['$scope', function($scope) {
-+          $scope.example = {
-+            value: new Date(1970, 0, 1, 14, 57, 0)
-+          };
-+        }]);
-+         </script>
-+         <form name="myForm" ng-controller="DateController as dateCtrl">
-+         <label for="exampleInput">Pick a time between 8am and 5pm:</label>
-+         <input type="time" id="exampleInput" name="input" ng-model="example.value"
-+         placeholder="HH:mm:ss" min="08:00:00" max="17:00:00" required />
-+         <div role="alert">
-+         <span class="error" ng-show="myForm.input.$error.required">
-+         Required!</span>
-+         <span class="error" ng-show="myForm.input.$error.time">
-+         Not a valid date!</span>
-+         </div>
-+         <tt>value = {{example.value | date: "HH:mm:ss"}}</tt><br/>
-+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-+         </form>
-+         </file>
-+         <file name="protractor.js" type="protractor">
-+         var value = element(by.binding('example.value | date: "HH:mm:ss"'));
-+         var valid = element(by.binding('myForm.input.$valid'));
- 
--            var comparatorType = typeof(comparator),
--                predicates = [];
-+         // currently protractor/webdriver does not support
-+         // sending keys to all known HTML5 input controls
-+         // for various browsers (https://github.com/angular/protractor/issues/562).
-+         function setInput(val) {
-+        // set the value of the element and force validation.
-+        var scr = "var ipt = document.getElementById('exampleInput'); " +
-+        "ipt.value = '" + val + "';" +
-+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
-+        browser.executeScript(scr);
-+      }
- 
--            predicates.check = function(value) {
--                for (var j = 0; j < predicates.length; j++) {
--                    if(!predicates[j](value)) {
--                        return false;
--                    }
--                }
--                return true;
--            };
-+         it('should initialize to model', function() {
-+        expect(value.getText()).toContain('14:57:00');
-+        expect(valid.getText()).toContain('myForm.input.$valid = true');
-+      });
- 
--            if (comparatorType !== 'function') {
--                if (comparatorType === 'boolean' && comparator) {
--                    comparator = function(obj, text) {
--                        return angular.equals(obj, text);
--                    };
--                } else {
--                    comparator = function(obj, text) {
--                        if (obj && text && typeof obj === 'object' && typeof text === 'object') {
--                            for (var objKey in obj) {
--                                if (objKey.charAt(0) !== '$' && hasOwnProperty.call(obj, objKey) &&
--                                    comparator(obj[objKey], text[objKey])) {
--                                    return true;
--                                }
--                            }
--                            return false;
--                        }
--                        text = (''+text).toLowerCase();
--                        return (''+obj).toLowerCase().indexOf(text) > -1;
--                    };
--                }
--            }
-+         it('should be invalid if empty', function() {
-+        setInput('');
-+        expect(value.getText()).toEqual('value =');
-+        expect(valid.getText()).toContain('myForm.input.$valid = false');
-+      });
- 
--            var search = function(obj, text){
--                if (typeof text == 'string' && text.charAt(0) === '!') {
--                    return !search(obj, text.substr(1));
--                }
--                switch (typeof obj) {
--                    case "boolean":
--                    case "number":
--                    case "string":
--                        return comparator(obj, text);
--                    case "object":
--                        switch (typeof text) {
--                            case "object":
--                                return comparator(obj, text);
--                            default:
--                                for ( var objKey in obj) {
--                                    if (objKey.charAt(0) !== '$' && search(obj[objKey], text)) {
--                                        return true;
--                                    }
--                                }
--                                break;
--                        }
--                        return false;
--                    case "array":
--                        for ( var i = 0; i < obj.length; i++) {
--                            if (search(obj[i], text)) {
--                                return true;
--                            }
--                        }
--                        return false;
--                    default:
--                        return false;
--                }
--            };
--            switch (typeof expression) {
--                case "boolean":
--                case "number":
--                case "string":
--                    // Set up expression object and fall through
--                    expression = {$:expression};
--                // jshint -W086
--                case "object":
--                    // jshint +W086
--                    for (var key in expression) {
--                        (function(path) {
--                            if (typeof expression[path] == 'undefined') return;
--                            predicates.push(function(value) {
--                                return search(path == '$' ? value : (value && value[path]), expression[path]);
--                            });
--                        })(key);
--                    }
--                    break;
--                case 'function':
--                    predicates.push(expression);
--                    break;
--                default:
--                    return array;
--            }
--            var filtered = [];
--            for ( var j = 0; j < array.length; j++) {
--                var value = array[j];
--                if (predicates.check(value)) {
--                    filtered.push(value);
--                }
--            }
--            return filtered;
--        };
--    }
-+         it('should be invalid if over max', function() {
-+        setInput('23:59:00');
-+        expect(value.getText()).toContain('');
-+        expect(valid.getText()).toContain('myForm.input.$valid = false');
-+      });
-+         </file>
-+         </example>
-+         */
-+        'time': createDateInputType('time', TIME_REGEXP,
-+            createDateParser(TIME_REGEXP, ['HH', 'mm', 'ss', 'sss']),
-+            'HH:mm:ss.sss'),
-+
-+        /**
-+         * @ngdoc input
-+         * @name input[week]
-+         *
-+         * @description
-+         * Input with week-of-the-year validation and transformation to Date. In browsers that do not yet support
-+         * the HTML5 week input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
-+         * week format (yyyy-W##), for example: `2013-W02`.
-+         *
-+         * The model must always be a Date object, otherwise AngularJS will throw an error.
-+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
-+         *
-+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
-+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
-+         *
-+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+         * @param {string=} name Property name of the form under which the control is published.
-+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
-+         *   This must be a valid ISO week format (yyyy-W##). You can also use interpolation inside this
-+         *   attribute (e.g. `min="{{minWeek | date:'yyyy-Www'}}"`). Note that `min` will also add
-+         *   native HTML5 constraint validation.
-+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
-+         *   This must be a valid ISO week format (yyyy-W##). You can also use interpolation inside this
-+         *   attribute (e.g. `max="{{maxWeek | date:'yyyy-Www'}}"`). Note that `max` will also add
-+         *   native HTML5 constraint validation.
-+         * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO week string
-+         *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
-+         * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO week string
-+         *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
-+         * @param {string=} required Sets `required` validation error key if the value is not entered.
-+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-+         *    `required` when you want to data-bind to the `required` attribute.
-+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
-+         *    interaction with the input element.
-+         *
-+         * @example
-+         <example name="week-input-directive" module="weekExample">
-+         <file name="index.html">
-+         <script>
-+         angular.module('weekExample', [])
-+         .controller('DateController', ['$scope', function($scope) {
-+          $scope.example = {
-+            value: new Date(2013, 0, 3)
-+          };
-+        }]);
-+         </script>
-+         <form name="myForm" ng-controller="DateController as dateCtrl">
-+         <label>Pick a date between in 2013:
-+         <input id="exampleInput" type="week" name="input" ng-model="example.value"
-+         placeholder="YYYY-W##" min="2012-W32"
-+         max="2013-W52" required />
-+         </label>
-+         <div role="alert">
-+         <span class="error" ng-show="myForm.input.$error.required">
-+         Required!</span>
-+         <span class="error" ng-show="myForm.input.$error.week">
-+         Not a valid date!</span>
-+         </div>
-+         <tt>value = {{example.value | date: "yyyy-Www"}}</tt><br/>
-+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-+         </form>
-+         </file>
-+         <file name="protractor.js" type="protractor">
-+         var value = element(by.binding('example.value | date: "yyyy-Www"'));
-+         var valid = element(by.binding('myForm.input.$valid'));
- 
--    /**
--     * @ngdoc filter
--     * @name currency
--     * @function
--     *
--     * @description
--     * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default
--     * symbol for current locale is used.
--     *
--     * @param {number} amount Input to filter.
--     * @param {string=} symbol Currency symbol or identifier to be displayed.
--     * @returns {string} Formatted number.
--     *
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <script>
--     function Ctrl($scope) {
--           $scope.amount = 1234.56;
--         }
--     </script>
--     <div ng-controller="Ctrl">
--     <input type="number" ng-model="amount"> <br>
--     default currency symbol ($): <span id="currency-default">{{amount | currency}}</span><br>
--     custom currency identifier (USD$): <span>{{amount | currency:"USD$"}}</span>
--     </div>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should init with 1234.56', function() {
--         expect(element(by.id('currency-default')).getText()).toBe('$1,234.56');
--         expect(element(by.binding('amount | currency:"USD$"')).getText()).toBe('USD$1,234.56');
--       });
--     it('should update', function() {
--         if (browser.params.browser == 'safari') {
--           // Safari does not understand the minus key. See
--           // https://github.com/angular/protractor/issues/481
--           return;
--         }
--         element(by.model('amount')).clear();
--         element(by.model('amount')).sendKeys('-1234');
--         expect(element(by.id('currency-default')).getText()).toBe('($1,234.00)');
--         expect(element(by.binding('amount | currency:"USD$"')).getText()).toBe('(USD$1,234.00)');
--       });
--     </file>
--     </example>
--     */
--    currencyFilter.$inject = ['$locale'];
--    function currencyFilter($locale) {
--        var formats = $locale.NUMBER_FORMATS;
--        return function(amount, currencySymbol){
--            if (isUndefined(currencySymbol)) currencySymbol = formats.CURRENCY_SYM;
--            return formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, 2).
--                replace(/\u00A4/g, currencySymbol);
--        };
--    }
-+         // currently protractor/webdriver does not support
-+         // sending keys to all known HTML5 input controls
-+         // for various browsers (https://github.com/angular/protractor/issues/562).
-+         function setInput(val) {
-+        // set the value of the element and force validation.
-+        var scr = "var ipt = document.getElementById('exampleInput'); " +
-+        "ipt.value = '" + val + "';" +
-+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
-+        browser.executeScript(scr);
-+      }
- 
--    /**
--     * @ngdoc filter
--     * @name number
--     * @function
--     *
--     * @description
--     * Formats a number as text.
--     *
--     * If the input is not a number an empty string is returned.
--     *
--     * @param {number|string} number Number to format.
--     * @param {(number|string)=} fractionSize Number of decimal places to round the number to.
--     * If this is not provided then the fraction size is computed from the current locale's number
--     * formatting pattern. In the case of the default locale, it will be 3.
--     * @returns {string} Number rounded to decimalPlaces and places a “,” after each third digit.
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <script>
--     function Ctrl($scope) {
--           $scope.val = 1234.56789;
--         }
--     </script>
--     <div ng-controller="Ctrl">
--     Enter number: <input ng-model='val'><br>
--     Default formatting: <span id='number-default'>{{val | number}}</span><br>
--     No fractions: <span>{{val | number:0}}</span><br>
--     Negative number: <span>{{-val | number:4}}</span>
--     </div>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should format numbers', function() {
--         expect(element(by.id('number-default')).getText()).toBe('1,234.568');
--         expect(element(by.binding('val | number:0')).getText()).toBe('1,235');
--         expect(element(by.binding('-val | number:4')).getText()).toBe('-1,234.5679');
--       });
-+         it('should initialize to model', function() {
-+        expect(value.getText()).toContain('2013-W01');
-+        expect(valid.getText()).toContain('myForm.input.$valid = true');
-+      });
- 
--     it('should update', function() {
--         element(by.model('val')).clear();
--         element(by.model('val')).sendKeys('3374.333');
--         expect(element(by.id('number-default')).getText()).toBe('3,374.333');
--         expect(element(by.binding('val | number:0')).getText()).toBe('3,374');
--         expect(element(by.binding('-val | number:4')).getText()).toBe('-3,374.3330');
-+         it('should be invalid if empty', function() {
-+        setInput('');
-+        expect(value.getText()).toEqual('value =');
-+        expect(valid.getText()).toContain('myForm.input.$valid = false');
-       });
--     </file>
--     </example>
--     */
- 
-+         it('should be invalid if over max', function() {
-+        setInput('2015-W01');
-+        expect(value.getText()).toContain('');
-+        expect(valid.getText()).toContain('myForm.input.$valid = false');
-+      });
-+         </file>
-+         </example>
-+         */
-+        'week': createDateInputType('week', WEEK_REGEXP, weekParser, 'yyyy-Www'),
- 
--    numberFilter.$inject = ['$locale'];
--    function numberFilter($locale) {
--        var formats = $locale.NUMBER_FORMATS;
--        return function(number, fractionSize) {
--            return formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP,
--                fractionSize);
--        };
--    }
-+        /**
-+         * @ngdoc input
-+         * @name input[month]
-+         *
-+         * @description
-+         * Input with month validation and transformation. In browsers that do not yet support
-+         * the HTML5 month input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
-+         * month format (yyyy-MM), for example: `2009-01`.
-+         *
-+         * The model must always be a Date object, otherwise AngularJS will throw an error.
-+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
-+         * If the model is not set to the first of the month, the next view to model update will set it
-+         * to the first of the month.
-+         *
-+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
-+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
-+         *
-+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+         * @param {string=} name Property name of the form under which the control is published.
-+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
-+         *   This must be a valid ISO month format (yyyy-MM). You can also use interpolation inside this
-+         *   attribute (e.g. `min="{{minMonth | date:'yyyy-MM'}}"`). Note that `min` will also add
-+         *   native HTML5 constraint validation.
-+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
-+         *   This must be a valid ISO month format (yyyy-MM). You can also use interpolation inside this
-+         *   attribute (e.g. `max="{{maxMonth | date:'yyyy-MM'}}"`). Note that `max` will also add
-+         *   native HTML5 constraint validation.
-+         * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO week string
-+         *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
-+         * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO week string
-+         *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
- 
--    var DECIMAL_SEP = '.';
--    function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
--        if (number == null || !isFinite(number) || isObject(number)) return '';
--
--        var isNegative = number < 0;
--        number = Math.abs(number);
--        var numStr = number + '',
--            formatedText = '',
--            parts = [];
--
--        var hasExponent = false;
--        if (numStr.indexOf('e') !== -1) {
--            var match = numStr.match(/([\d\.]+)e(-?)(\d+)/);
--            if (match && match[2] == '-' && match[3] > fractionSize + 1) {
--                numStr = '0';
--            } else {
--                formatedText = numStr;
--                hasExponent = true;
--            }
--        }
-+         * @param {string=} required Sets `required` validation error key if the value is not entered.
-+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-+         *    `required` when you want to data-bind to the `required` attribute.
-+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
-+         *    interaction with the input element.
-+         *
-+         * @example
-+         <example name="month-input-directive" module="monthExample">
-+         <file name="index.html">
-+         <script>
-+         angular.module('monthExample', [])
-+         .controller('DateController', ['$scope', function($scope) {
-+          $scope.example = {
-+            value: new Date(2013, 9, 1)
-+          };
-+        }]);
-+         </script>
-+         <form name="myForm" ng-controller="DateController as dateCtrl">
-+         <label for="exampleInput">Pick a month in 2013:</label>
-+         <input id="exampleInput" type="month" name="input" ng-model="example.value"
-+         placeholder="yyyy-MM" min="2013-01" max="2013-12" required />
-+         <div role="alert">
-+         <span class="error" ng-show="myForm.input.$error.required">
-+         Required!</span>
-+         <span class="error" ng-show="myForm.input.$error.month">
-+         Not a valid month!</span>
-+         </div>
-+         <tt>value = {{example.value | date: "yyyy-MM"}}</tt><br/>
-+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-+         </form>
-+         </file>
-+         <file name="protractor.js" type="protractor">
-+         var value = element(by.binding('example.value | date: "yyyy-MM"'));
-+         var valid = element(by.binding('myForm.input.$valid'));
- 
--        if (!hasExponent) {
--            var fractionLen = (numStr.split(DECIMAL_SEP)[1] || '').length;
-+         // currently protractor/webdriver does not support
-+         // sending keys to all known HTML5 input controls
-+         // for various browsers (https://github.com/angular/protractor/issues/562).
-+         function setInput(val) {
-+        // set the value of the element and force validation.
-+        var scr = "var ipt = document.getElementById('exampleInput'); " +
-+        "ipt.value = '" + val + "';" +
-+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
-+        browser.executeScript(scr);
-+      }
- 
--            // determine fractionSize if it is not specified
--            if (isUndefined(fractionSize)) {
--                fractionSize = Math.min(Math.max(pattern.minFrac, fractionLen), pattern.maxFrac);
--            }
-+         it('should initialize to model', function() {
-+        expect(value.getText()).toContain('2013-10');
-+        expect(valid.getText()).toContain('myForm.input.$valid = true');
-+      });
- 
--            var pow = Math.pow(10, fractionSize);
--            number = Math.round(number * pow) / pow;
--            var fraction = ('' + number).split(DECIMAL_SEP);
--            var whole = fraction[0];
--            fraction = fraction[1] || '';
-+         it('should be invalid if empty', function() {
-+        setInput('');
-+        expect(value.getText()).toEqual('value =');
-+        expect(valid.getText()).toContain('myForm.input.$valid = false');
-+      });
- 
--            var i, pos = 0,
--                lgroup = pattern.lgSize,
--                group = pattern.gSize;
-+         it('should be invalid if over max', function() {
-+        setInput('2015-01');
-+        expect(value.getText()).toContain('');
-+        expect(valid.getText()).toContain('myForm.input.$valid = false');
-+      });
-+         </file>
-+         </example>
-+         */
-+        'month': createDateInputType('month', MONTH_REGEXP,
-+            createDateParser(MONTH_REGEXP, ['yyyy', 'MM']),
-+            'yyyy-MM'),
- 
--            if (whole.length >= (lgroup + group)) {
--                pos = whole.length - lgroup;
--                for (i = 0; i < pos; i++) {
--                    if ((pos - i)%group === 0 && i !== 0) {
--                        formatedText += groupSep;
--                    }
--                    formatedText += whole.charAt(i);
--                }
--            }
-+        /**
-+         * @ngdoc input
-+         * @name input[number]
-+         *
-+         * @description
-+         * Text input with number validation and transformation. Sets the `number` validation
-+         * error if not a valid number.
-+         *
-+         * <div class="alert alert-warning">
-+         * The model must always be of type `number` otherwise AngularJS will throw an error.
-+         * Be aware that a string containing a number is not enough. See the {@link ngModel:numfmt}
-+         * error docs for more information and an example of how to convert your model if necessary.
-+         * </div>
-+         *
-+         * ## Issues with HTML5 constraint validation
-+         *
-+         * In browsers that follow the
-+         * [HTML5 specification](https://html.spec.whatwg.org/multipage/forms.html#number-state-%28type=number%29),
-+         * `input[number]` does not work as expected with {@link ngModelOptions `ngModelOptions.allowInvalid`}.
-+         * If a non-number is entered in the input, the browser will report the value as an empty string,
-+         * which means the view / model values in `ngModel` and subsequently the scope value
-+         * will also be an empty string.
-+         *
-+         *
-+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+         * @param {string=} name Property name of the form under which the control is published.
-+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
-+         *    Can be interpolated.
-+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
-+         *    Can be interpolated.
-+         * @param {string=} ngMin Like `min`, sets the `min` validation error key if the value entered is less than `ngMin`,
-+         *    but does not trigger HTML5 native validation. Takes an expression.
-+         * @param {string=} ngMax Like `max`, sets the `max` validation error key if the value entered is greater than `ngMax`,
-+         *    but does not trigger HTML5 native validation. Takes an expression.
-+         * @param {string=} step Sets the `step` validation error key if the value entered does not fit the `step` constraint.
-+         *    Can be interpolated.
-+         * @param {string=} ngStep Like `step`, sets the `step` validation error key if the value entered does not fit the `ngStep` constraint,
-+         *    but does not trigger HTML5 native validation. Takes an expression.
-+         * @param {string=} required Sets `required` validation error key if the value is not entered.
-+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-+         *    `required` when you want to data-bind to the `required` attribute.
-+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-+         *    minlength.
-+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
-+         *    any length.
-+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
-+         *    that contains the regular expression body that will be converted to a regular expression
-+         *    as in the ngPattern directive.
-+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
-+         *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
-+         *    If the expression evaluates to a RegExp object, then this is used directly.
-+         *    If the expression evaluates to a string, then it will be converted to a RegExp
-+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
-+         *    `new RegExp('^abc$')`.<br />
-+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
-+         *    start at the index of the last search's match, thus not taking the whole input value into
-+         *    account.
-+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
-+         *    interaction with the input element.
-+         *
-+         * @example
-+         <example name="number-input-directive" module="numberExample">
-+         <file name="index.html">
-+         <script>
-+         angular.module('numberExample', [])
-+         .controller('ExampleController', ['$scope', function($scope) {
-+               $scope.example = {
-+                 value: 12
-+               };
-+             }]);
-+         </script>
-+         <form name="myForm" ng-controller="ExampleController">
-+         <label>Number:
-+         <input type="number" name="input" ng-model="example.value"
-+         min="0" max="99" required>
-+         </label>
-+         <div role="alert">
-+         <span class="error" ng-show="myForm.input.$error.required">
-+         Required!</span>
-+         <span class="error" ng-show="myForm.input.$error.number">
-+         Not valid number!</span>
-+         </div>
-+         <tt>value = {{example.value}}</tt><br/>
-+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-+         </form>
-+         </file>
-+         <file name="protractor.js" type="protractor">
-+         var value = element(by.binding('example.value'));
-+         var valid = element(by.binding('myForm.input.$valid'));
-+         var input = element(by.model('example.value'));
- 
--            for (i = pos; i < whole.length; i++) {
--                if ((whole.length - i)%lgroup === 0 && i !== 0) {
--                    formatedText += groupSep;
--                }
--                formatedText += whole.charAt(i);
--            }
-+         it('should initialize to model', function() {
-+            expect(value.getText()).toContain('12');
-+            expect(valid.getText()).toContain('true');
-+          });
- 
--            // format fraction part.
--            while(fraction.length < fractionSize) {
--                fraction += '0';
--            }
-+         it('should be invalid if empty', function() {
-+            input.clear();
-+            input.sendKeys('');
-+            expect(value.getText()).toEqual('value =');
-+            expect(valid.getText()).toContain('false');
-+          });
- 
--            if (fractionSize && fractionSize !== "0") formatedText += decimalSep + fraction.substr(0, fractionSize);
--        } else {
-+         it('should be invalid if over max', function() {
-+            input.clear();
-+            input.sendKeys('123');
-+            expect(value.getText()).toEqual('value =');
-+            expect(valid.getText()).toContain('false');
-+          });
-+         </file>
-+         </example>
-+         */
-+        'number': numberInputType,
- 
--            if (fractionSize > 0 && number > -1 && number < 1) {
--                formatedText = number.toFixed(fractionSize);
--            }
--        }
- 
--        parts.push(isNegative ? pattern.negPre : pattern.posPre);
--        parts.push(formatedText);
--        parts.push(isNegative ? pattern.negSuf : pattern.posSuf);
--        return parts.join('');
--    }
-+        /**
-+         * @ngdoc input
-+         * @name input[url]
-+         *
-+         * @description
-+         * Text input with URL validation. Sets the `url` validation error key if the content is not a
-+         * valid URL.
-+         *
-+         * <div class="alert alert-warning">
-+         * **Note:** `input[url]` uses a regex to validate urls that is derived from the regex
-+         * used in Chromium. If you need stricter validation, you can use `ng-pattern` or modify
-+         * the built-in validators (see the {@link guide/forms Forms guide})
-+         * </div>
-+         *
-+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+         * @param {string=} name Property name of the form under which the control is published.
-+         * @param {string=} required Sets `required` validation error key if the value is not entered.
-+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-+         *    `required` when you want to data-bind to the `required` attribute.
-+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-+         *    minlength.
-+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
-+         *    any length.
-+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
-+         *    that contains the regular expression body that will be converted to a regular expression
-+         *    as in the ngPattern directive.
-+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
-+         *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
-+         *    If the expression evaluates to a RegExp object, then this is used directly.
-+         *    If the expression evaluates to a string, then it will be converted to a RegExp
-+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
-+         *    `new RegExp('^abc$')`.<br />
-+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
-+         *    start at the index of the last search's match, thus not taking the whole input value into
-+         *    account.
-+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
-+         *    interaction with the input element.
-+         *
-+         * @example
-+         <example name="url-input-directive" module="urlExample">
-+         <file name="index.html">
-+         <script>
-+         angular.module('urlExample', [])
-+         .controller('ExampleController', ['$scope', function($scope) {
-+               $scope.url = {
-+                 text: 'http://google.com'
-+               };
-+             }]);
-+         </script>
-+         <form name="myForm" ng-controller="ExampleController">
-+         <label>URL:
-+         <input type="url" name="input" ng-model="url.text" required>
-+         <label>
-+         <div role="alert">
-+         <span class="error" ng-show="myForm.input.$error.required">
-+         Required!</span>
-+         <span class="error" ng-show="myForm.input.$error.url">
-+         Not valid url!</span>
-+         </div>
-+         <tt>text = {{url.text}}</tt><br/>
-+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-+         <tt>myForm.$error.url = {{!!myForm.$error.url}}</tt><br/>
-+         </form>
-+         </file>
-+         <file name="protractor.js" type="protractor">
-+         var text = element(by.binding('url.text'));
-+         var valid = element(by.binding('myForm.input.$valid'));
-+         var input = element(by.model('url.text'));
-+
-+         it('should initialize to model', function() {
-+            expect(text.getText()).toContain('http://google.com');
-+            expect(valid.getText()).toContain('true');
-+          });
- 
--    function padNumber(num, digits, trim) {
--        var neg = '';
--        if (num < 0) {
--            neg =  '-';
--            num = -num;
--        }
--        num = '' + num;
--        while(num.length < digits) num = '0' + num;
--        if (trim)
--            num = num.substr(num.length - digits);
--        return neg + num;
--    }
-+         it('should be invalid if empty', function() {
-+            input.clear();
-+            input.sendKeys('');
- 
-+            expect(text.getText()).toEqual('text =');
-+            expect(valid.getText()).toContain('false');
-+          });
- 
--    function dateGetter(name, size, offset, trim) {
--        offset = offset || 0;
--        return function(date) {
--            var value = date['get' + name]();
--            if (offset > 0 || value > -offset)
--                value += offset;
--            if (value === 0 && offset == -12 ) value = 12;
--            return padNumber(value, size, trim);
--        };
--    }
-+         it('should be invalid if not url', function() {
-+            input.clear();
-+            input.sendKeys('box');
- 
--    function dateStrGetter(name, shortForm) {
--        return function(date, formats) {
--            var value = date['get' + name]();
--            var get = uppercase(shortForm ? ('SHORT' + name) : name);
-+            expect(valid.getText()).toContain('false');
-+          });
-+         </file>
-+         </example>
-+         */
-+        'url': urlInputType,
- 
--            return formats[get][value];
--        };
--    }
- 
--    function timeZoneGetter(date) {
--        var zone = -1 * date.getTimezoneOffset();
--        var paddedZone = (zone >= 0) ? "+" : "";
-+        /**
-+         * @ngdoc input
-+         * @name input[email]
-+         *
-+         * @description
-+         * Text input with email validation. Sets the `email` validation error key if not a valid email
-+         * address.
-+         *
-+         * <div class="alert alert-warning">
-+         * **Note:** `input[email]` uses a regex to validate email addresses that is derived from the regex
-+         * used in Chromium. If you need stricter validation (e.g. requiring a top-level domain), you can
-+         * use `ng-pattern` or modify the built-in validators (see the {@link guide/forms Forms guide})
-+         * </div>
-+         *
-+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+         * @param {string=} name Property name of the form under which the control is published.
-+         * @param {string=} required Sets `required` validation error key if the value is not entered.
-+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-+         *    `required` when you want to data-bind to the `required` attribute.
-+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-+         *    minlength.
-+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
-+         *    any length.
-+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
-+         *    that contains the regular expression body that will be converted to a regular expression
-+         *    as in the ngPattern directive.
-+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
-+         *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
-+         *    If the expression evaluates to a RegExp object, then this is used directly.
-+         *    If the expression evaluates to a string, then it will be converted to a RegExp
-+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
-+         *    `new RegExp('^abc$')`.<br />
-+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
-+         *    start at the index of the last search's match, thus not taking the whole input value into
-+         *    account.
-+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
-+         *    interaction with the input element.
-+         *
-+         * @example
-+         <example name="email-input-directive" module="emailExample">
-+         <file name="index.html">
-+         <script>
-+         angular.module('emailExample', [])
-+         .controller('ExampleController', ['$scope', function($scope) {
-+               $scope.email = {
-+                 text: 'me@example.com'
-+               };
-+             }]);
-+         </script>
-+         <form name="myForm" ng-controller="ExampleController">
-+         <label>Email:
-+         <input type="email" name="input" ng-model="email.text" required>
-+         </label>
-+         <div role="alert">
-+         <span class="error" ng-show="myForm.input.$error.required">
-+         Required!</span>
-+         <span class="error" ng-show="myForm.input.$error.email">
-+         Not valid email!</span>
-+         </div>
-+         <tt>text = {{email.text}}</tt><br/>
-+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-+         <tt>myForm.$error.email = {{!!myForm.$error.email}}</tt><br/>
-+         </form>
-+         </file>
-+         <file name="protractor.js" type="protractor">
-+         var text = element(by.binding('email.text'));
-+         var valid = element(by.binding('myForm.input.$valid'));
-+         var input = element(by.model('email.text'));
- 
--        paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) +
--        padNumber(Math.abs(zone % 60), 2);
-+         it('should initialize to model', function() {
-+            expect(text.getText()).toContain('me@example.com');
-+            expect(valid.getText()).toContain('true');
-+          });
- 
--        return paddedZone;
--    }
-+         it('should be invalid if empty', function() {
-+            input.clear();
-+            input.sendKeys('');
-+            expect(text.getText()).toEqual('text =');
-+            expect(valid.getText()).toContain('false');
-+          });
- 
--    function ampmGetter(date, formats) {
--        return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1];
--    }
-+         it('should be invalid if not email', function() {
-+            input.clear();
-+            input.sendKeys('xxx');
- 
--    var DATE_FORMATS = {
--        yyyy: dateGetter('FullYear', 4),
--        yy: dateGetter('FullYear', 2, 0, true),
--        y: dateGetter('FullYear', 1),
--        MMMM: dateStrGetter('Month'),
--        MMM: dateStrGetter('Month', true),
--        MM: dateGetter('Month', 2, 1),
--        M: dateGetter('Month', 1, 1),
--        dd: dateGetter('Date', 2),
--        d: dateGetter('Date', 1),
--        HH: dateGetter('Hours', 2),
--        H: dateGetter('Hours', 1),
--        hh: dateGetter('Hours', 2, -12),
--        h: dateGetter('Hours', 1, -12),
--        mm: dateGetter('Minutes', 2),
--        m: dateGetter('Minutes', 1),
--        ss: dateGetter('Seconds', 2),
--        s: dateGetter('Seconds', 1),
--        // while ISO 8601 requires fractions to be prefixed with `.` or `,`
--        // we can be just safely rely on using `sss` since we currently don't support single or two digit fractions
--        sss: dateGetter('Milliseconds', 3),
--        EEEE: dateStrGetter('Day'),
--        EEE: dateStrGetter('Day', true),
--        a: ampmGetter,
--        Z: timeZoneGetter
--    };
-+            expect(valid.getText()).toContain('false');
-+          });
-+         </file>
-+         </example>
-+         */
-+        'email': emailInputType,
- 
--    var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/,
--        NUMBER_STRING = /^\-?\d+$/;
- 
--    /**
--     * @ngdoc filter
--     * @name date
--     * @function
--     *
--     * @description
--     *   Formats `date` to a string based on the requested `format`.
--     *
--     *   `format` string can be composed of the following elements:
--     *
--     *   * `'yyyy'`: 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010)
--     *   * `'yy'`: 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10)
--     *   * `'y'`: 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199)
--     *   * `'MMMM'`: Month in year (January-December)
--     *   * `'MMM'`: Month in year (Jan-Dec)
--     *   * `'MM'`: Month in year, padded (01-12)
--     *   * `'M'`: Month in year (1-12)
--     *   * `'dd'`: Day in month, padded (01-31)
--     *   * `'d'`: Day in month (1-31)
--     *   * `'EEEE'`: Day in Week,(Sunday-Saturday)
--     *   * `'EEE'`: Day in Week, (Sun-Sat)
--     *   * `'HH'`: Hour in day, padded (00-23)
--     *   * `'H'`: Hour in day (0-23)
--     *   * `'hh'`: Hour in am/pm, padded (01-12)
--     *   * `'h'`: Hour in am/pm, (1-12)
--     *   * `'mm'`: Minute in hour, padded (00-59)
--     *   * `'m'`: Minute in hour (0-59)
--     *   * `'ss'`: Second in minute, padded (00-59)
--     *   * `'s'`: Second in minute (0-59)
--     *   * `'.sss' or ',sss'`: Millisecond in second, padded (000-999)
--     *   * `'a'`: am/pm marker
--     *   * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200)
--     *
--     *   `format` string can also be one of the following predefined
--     *   {@link guide/i18n localizable formats}:
--     *
--     *   * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale
--     *     (e.g. Sep 3, 2010 12:05:08 pm)
--     *   * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US  locale (e.g. 9/3/10 12:05 pm)
--     *   * `'fullDate'`: equivalent to `'EEEE, MMMM d,y'` for en_US  locale
--     *     (e.g. Friday, September 3, 2010)
--     *   * `'longDate'`: equivalent to `'MMMM d, y'` for en_US  locale (e.g. September 3, 2010)
--     *   * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US  locale (e.g. Sep 3, 2010)
--     *   * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10)
--     *   * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 pm)
--     *   * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 pm)
--     *
--     *   `format` string can contain literal values. These need to be quoted with single quotes (e.g.
--     *   `"h 'in the morning'"`). In order to output single quote, use two single quotes in a sequence
--     *   (e.g. `"h 'o''clock'"`).
--     *
--     * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or
--     *    number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.SSSZ and its
--     *    shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is
--     *    specified in the string input, the time is considered to be in the local timezone.
--     * @param {string=} format Formatting rules (see Description). If not specified,
--     *    `mediumDate` is used.
--     * @returns {string} Formatted string or the input if input is not recognized as date/millis.
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <span ng-non-bindable>{{1288323623006 | date:'medium'}}</span>:
--     <span>{{1288323623006 | date:'medium'}}</span><br>
--     <span ng-non-bindable>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span>:
--     <span>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span><br>
--     <span ng-non-bindable>{{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}</span>:
--     <span>{{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}</span><br>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should format date', function() {
--         expect(element(by.binding("1288323623006 | date:'medium'")).getText()).
--            toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} (AM|PM)/);
--         expect(element(by.binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).getText()).
--            toMatch(/2010\-10\-2\d \d{2}:\d{2}:\d{2} (\-|\+)?\d{4}/);
--         expect(element(by.binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).getText()).
--     toMatch(/10\/2\d\/2010 @ \d{1,2}:\d{2}(AM|PM)/);
--     });
--     </file>
--     </example>
--     */
--    dateFilter.$inject = ['$locale'];
--    function dateFilter($locale) {
-+        /**
-+         * @ngdoc input
-+         * @name input[radio]
-+         *
-+         * @description
-+         * HTML radio button.
-+         *
-+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+         * @param {string} value The value to which the `ngModel` expression should be set when selected.
-+         *    Note that `value` only supports `string` values, i.e. the scope model needs to be a string,
-+         *    too. Use `ngValue` if you need complex models (`number`, `object`, ...).
-+         * @param {string=} name Property name of the form under which the control is published.
-+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
-+         *    interaction with the input element.
-+         * @param {string} ngValue AngularJS expression to which `ngModel` will be be set when the radio
-+         *    is selected. Should be used instead of the `value` attribute if you need
-+         *    a non-string `ngModel` (`boolean`, `array`, ...).
-+         *
-+         * @example
-+         <example name="radio-input-directive" module="radioExample">
-+         <file name="index.html">
-+         <script>
-+         angular.module('radioExample', [])
-+         .controller('ExampleController', ['$scope', function($scope) {
-+               $scope.color = {
-+                 name: 'blue'
-+               };
-+               $scope.specialValue = {
-+                 "id": "12345",
-+                 "value": "green"
-+               };
-+             }]);
-+         </script>
-+         <form name="myForm" ng-controller="ExampleController">
-+         <label>
-+         <input type="radio" ng-model="color.name" value="red">
-+         Red
-+         </label><br/>
-+         <label>
-+         <input type="radio" ng-model="color.name" ng-value="specialValue">
-+         Green
-+         </label><br/>
-+         <label>
-+         <input type="radio" ng-model="color.name" value="blue">
-+         Blue
-+         </label><br/>
-+         <tt>color = {{color.name | json}}</tt><br/>
-+         </form>
-+         Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`.
-+         </file>
-+         <file name="protractor.js" type="protractor">
-+         it('should change state', function() {
-+            var inputs = element.all(by.model('color.name'));
-+            var color = element(by.binding('color.name'));
- 
-+            expect(color.getText()).toContain('blue');
- 
--        var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;
--        // 1        2       3         4          5          6          7          8  9     10      11
--        function jsonStringToDate(string) {
--            var match;
--            if (match = string.match(R_ISO8601_STR)) {
--                var date = new Date(0),
--                    tzHour = 0,
--                    tzMin  = 0,
--                    dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear,
--                    timeSetter = match[8] ? date.setUTCHours : date.setHours;
-+            inputs.get(0).click();
-+            expect(color.getText()).toContain('red');
- 
--                if (match[9]) {
--                    tzHour = int(match[9] + match[10]);
--                    tzMin = int(match[9] + match[11]);
--                }
--                dateSetter.call(date, int(match[1]), int(match[2]) - 1, int(match[3]));
--                var h = int(match[4]||0) - tzHour;
--                var m = int(match[5]||0) - tzMin;
--                var s = int(match[6]||0);
--                var ms = Math.round(parseFloat('0.' + (match[7]||0)) * 1000);
--                timeSetter.call(date, h, m, s, ms);
--                return date;
--            }
--            return string;
--        }
-+            inputs.get(1).click();
-+            expect(color.getText()).toContain('green');
-+          });
-+         </file>
-+         </example>
-+         */
-+        'radio': radioInputType,
- 
-+        /**
-+         * @ngdoc input
-+         * @name input[range]
-+         *
-+         * @description
-+         * Native range input with validation and transformation.
-+         *
-+         * The model for the range input must always be a `Number`.
-+         *
-+         * IE9 and other browsers that do not support the `range` type fall back
-+         * to a text input without any default values for `min`, `max` and `step`. Model binding,
-+         * validation and number parsing are nevertheless supported.
-+         *
-+         * Browsers that support range (latest Chrome, Safari, Firefox, Edge) treat `input[range]`
-+         * in a way that never allows the input to hold an invalid value. That means:
-+         * - any non-numerical value is set to `(max + min) / 2`.
-+         * - any numerical value that is less than the current min val, or greater than the current max val
-+         * is set to the min / max val respectively.
-+         * - additionally, the current `step` is respected, so the nearest value that satisfies a step
-+         * is used.
-+         *
-+         * See the [HTML Spec on input[type=range]](https://www.w3.org/TR/html5/forms.html#range-state-(type=range))
-+         * for more info.
-+         *
-+         * This has the following consequences for AngularJS:
-+         *
-+         * Since the element value should always reflect the current model value, a range input
-+         * will set the bound ngModel expression to the value that the browser has set for the
-+         * input element. For example, in the following input `<input type="range" ng-model="model.value">`,
-+         * if the application sets `model.value = null`, the browser will set the input to `'50'`.
-+         * AngularJS will then set the model to `50`, to prevent input and model value being out of sync.
-+         *
-+         * That means the model for range will immediately be set to `50` after `ngModel` has been
-+         * initialized. It also means a range input can never have the required error.
-+         *
-+         * This does not only affect changes to the model value, but also to the values of the `min`,
-+         * `max`, and `step` attributes. When these change in a way that will cause the browser to modify
-+         * the input value, AngularJS will also update the model value.
-+         *
-+         * Automatic value adjustment also means that a range input element can never have the `required`,
-+         * `min`, or `max` errors.
-+         *
-+         * However, `step` is currently only fully implemented by Firefox. Other browsers have problems
-+         * when the step value changes dynamically - they do not adjust the element value correctly, but
-+         * instead may set the `stepMismatch` error. If that's the case, the AngularJS will set the `step`
-+         * error on the input, and set the model to `undefined`.
-+         *
-+         * Note that `input[range]` is not compatible with`ngMax`, `ngMin`, and `ngStep`, because they do
-+         * not set the `min` and `max` attributes, which means that the browser won't automatically adjust
-+         * the input value based on their values, and will always assume min = 0, max = 100, and step = 1.
-+         *
-+         * @param {string}  ngModel Assignable AngularJS expression to data-bind to.
-+         * @param {string=} name Property name of the form under which the control is published.
-+         * @param {string=} min Sets the `min` validation to ensure that the value entered is greater
-+         *                  than `min`. Can be interpolated.
-+         * @param {string=} max Sets the `max` validation to ensure that the value entered is less than `max`.
-+         *                  Can be interpolated.
-+         * @param {string=} step Sets the `step` validation to ensure that the value entered matches the `step`
-+         *                  Can be interpolated.
-+         * @param {string=} ngChange AngularJS expression to be executed when the ngModel value changes due
-+         *                  to user interaction with the input element.
-+         * @param {expression=} ngChecked If the expression is truthy, then the `checked` attribute will be set on the
-+         *                      element. **Note** : `ngChecked` should not be used alongside `ngModel`.
-+         *                      Checkout {@link ng.directive:ngChecked ngChecked} for usage.
-+         *
-+         * @example
-+         <example name="range-input-directive" module="rangeExample">
-+         <file name="index.html">
-+         <script>
-+         angular.module('rangeExample', [])
-+         .controller('ExampleController', ['$scope', function($scope) {
-+                $scope.value = 75;
-+                $scope.min = 10;
-+                $scope.max = 90;
-+              }]);
-+         </script>
-+         <form name="myForm" ng-controller="ExampleController">
-+
-+         Model as range: <input type="range" name="range" ng-model="value" min="{{min}}"  max="{{max}}">
-+         <hr>
-+         Model as number: <input type="number" ng-model="value"><br>
-+         Min: <input type="number" ng-model="min"><br>
-+         Max: <input type="number" ng-model="max"><br>
-+         value = <code>{{value}}</code><br/>
-+         myForm.range.$valid = <code>{{myForm.range.$valid}}</code><br/>
-+         myForm.range.$error = <code>{{myForm.range.$error}}</code>
-+         </form>
-+         </file>
-+         </example>
- 
--        return function(date, format) {
--            var text = '',
--                parts = [],
--                fn, match;
-+         * ## Range Input with ngMin & ngMax attributes
- 
--            format = format || 'mediumDate';
--            format = $locale.DATETIME_FORMATS[format] || format;
--            if (isString(date)) {
--                if (NUMBER_STRING.test(date)) {
--                    date = int(date);
--                } else {
--                    date = jsonStringToDate(date);
--                }
--            }
-+         * @example
-+         <example name="range-input-directive-ng" module="rangeExample">
-+         <file name="index.html">
-+         <script>
-+         angular.module('rangeExample', [])
-+         .controller('ExampleController', ['$scope', function($scope) {
-+                $scope.value = 75;
-+                $scope.min = 10;
-+                $scope.max = 90;
-+              }]);
-+         </script>
-+         <form name="myForm" ng-controller="ExampleController">
-+         Model as range: <input type="range" name="range" ng-model="value" ng-min="min" ng-max="max">
-+         <hr>
-+         Model as number: <input type="number" ng-model="value"><br>
-+         Min: <input type="number" ng-model="min"><br>
-+         Max: <input type="number" ng-model="max"><br>
-+         value = <code>{{value}}</code><br/>
-+         myForm.range.$valid = <code>{{myForm.range.$valid}}</code><br/>
-+         myForm.range.$error = <code>{{myForm.range.$error}}</code>
-+         </form>
-+         </file>
-+         </example>
- 
--            if (isNumber(date)) {
--                date = new Date(date);
--            }
-+         */
-+        'range': rangeInputType,
- 
--            if (!isDate(date)) {
--                return date;
--            }
-+        /**
-+         * @ngdoc input
-+         * @name input[checkbox]
-+         *
-+         * @description
-+         * HTML checkbox.
-+         *
-+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+         * @param {string=} name Property name of the form under which the control is published.
-+         * @param {expression=} ngTrueValue The value to which the expression should be set when selected.
-+         * @param {expression=} ngFalseValue The value to which the expression should be set when not selected.
-+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
-+         *    interaction with the input element.
-+         *
-+         * @example
-+         <example name="checkbox-input-directive" module="checkboxExample">
-+         <file name="index.html">
-+         <script>
-+         angular.module('checkboxExample', [])
-+         .controller('ExampleController', ['$scope', function($scope) {
-+               $scope.checkboxModel = {
-+                value1 : true,
-+                value2 : 'YES'
-+              };
-+             }]);
-+         </script>
-+         <form name="myForm" ng-controller="ExampleController">
-+         <label>Value1:
-+         <input type="checkbox" ng-model="checkboxModel.value1">
-+         </label><br/>
-+         <label>Value2:
-+         <input type="checkbox" ng-model="checkboxModel.value2"
-+         ng-true-value="'YES'" ng-false-value="'NO'">
-+         </label><br/>
-+         <tt>value1 = {{checkboxModel.value1}}</tt><br/>
-+         <tt>value2 = {{checkboxModel.value2}}</tt><br/>
-+         </form>
-+         </file>
-+         <file name="protractor.js" type="protractor">
-+         it('should change state', function() {
-+            var value1 = element(by.binding('checkboxModel.value1'));
-+            var value2 = element(by.binding('checkboxModel.value2'));
- 
--            while(format) {
--                match = DATE_FORMATS_SPLIT.exec(format);
--                if (match) {
--                    parts = concat(parts, match, 1);
--                    format = parts.pop();
--                } else {
--                    parts.push(format);
--                    format = null;
--                }
--            }
-+            expect(value1.getText()).toContain('true');
-+            expect(value2.getText()).toContain('YES');
- 
--            forEach(parts, function(value){
--                fn = DATE_FORMATS[value];
--                text += fn ? fn(date, $locale.DATETIME_FORMATS)
--                    : value.replace(/(^'|'$)/g, '').replace(/''/g, "'");
--            });
-+            element(by.model('checkboxModel.value1')).click();
-+            element(by.model('checkboxModel.value2')).click();
- 
--            return text;
--        };
--    }
-+            expect(value1.getText()).toContain('false');
-+            expect(value2.getText()).toContain('NO');
-+          });
-+         </file>
-+         </example>
-+         */
-+        'checkbox': checkboxInputType,
- 
-+        'hidden': noop,
-+        'button': noop,
-+        'submit': noop,
-+        'reset': noop,
-+        'file': noop
-+    };
- 
--    /**
--     * @ngdoc filter
--     * @name json
--     * @function
--     *
--     * @description
--     *   Allows you to convert a JavaScript object into JSON string.
--     *
--     *   This filter is mostly useful for debugging. When using the double curly {{value}} notation
--     *   the binding is automatically converted to JSON.
--     *
--     * @param {*} object Any JavaScript object (including arrays and primitive types) to filter.
--     * @returns {string} JSON string.
--     *
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <pre>{{ {'name':'value'} | json }}</pre>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should jsonify filtered objects', function() {
--         expect(element(by.binding("{'name':'value'}")).getText()).toMatch(/\{\n  "name": ?"value"\n}/);
--       });
--     </file>
--     </example>
--     *
--     */
--    function jsonFilter() {
--        return function(object) {
--            return toJson(object, true);
--        };
-+    function stringBasedInputType(ctrl) {
-+        ctrl.$formatters.push(function(value) {
-+            return ctrl.$isEmpty(value) ? value : value.toString();
-+        });
-     }
- 
-+    function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
-+        stringBasedInputType(ctrl);
-+    }
- 
--    /**
--     * @ngdoc filter
--     * @name lowercase
--     * @function
--     * @description
--     * Converts string to lowercase.
--     * @see angular.lowercase
--     */
--    var lowercaseFilter = valueFn(lowercase);
--
--
--    /**
--     * @ngdoc filter
--     * @name uppercase
--     * @function
--     * @description
--     * Converts string to uppercase.
--     * @see angular.uppercase
--     */
--    var uppercaseFilter = valueFn(uppercase);
--
--    /**
--     * @ngdoc filter
--     * @name limitTo
--     * @function
--     *
--     * @description
--     * Creates a new array or string containing only a specified number of elements. The elements
--     * are taken from either the beginning or the end of the source array or string, as specified by
--     * the value and sign (positive or negative) of `limit`.
--     *
--     * @param {Array|string} input Source array or string to be limited.
--     * @param {string|number} limit The length of the returned array or string. If the `limit` number
--     *     is positive, `limit` number of items from the beginning of the source array/string are copied.
--     *     If the number is negative, `limit` number  of items from the end of the source array/string
--     *     are copied. The `limit` will be trimmed if it exceeds `array.length`
--     * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array
--     *     had less than `limit` elements.
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <script>
--     function Ctrl($scope) {
--           $scope.numbers = [1,2,3,4,5,6,7,8,9];
--           $scope.letters = "abcdefghi";
--           $scope.numLimit = 3;
--           $scope.letterLimit = 3;
--         }
--     </script>
--     <div ng-controller="Ctrl">
--     Limit {{numbers}} to: <input type="integer" ng-model="numLimit">
--     <p>Output numbers: {{ numbers | limitTo:numLimit }}</p>
--     Limit {{letters}} to: <input type="integer" ng-model="letterLimit">
--     <p>Output letters: {{ letters | limitTo:letterLimit }}</p>
--     </div>
--     </file>
--     <file name="protractor.js" type="protractor">
--     var numLimitInput = element(by.model('numLimit'));
--     var letterLimitInput = element(by.model('letterLimit'));
--     var limitedNumbers = element(by.binding('numbers | limitTo:numLimit'));
--     var limitedLetters = element(by.binding('letters | limitTo:letterLimit'));
-+    function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-+        var type = lowercase(element[0].type);
- 
--     it('should limit the number array to first three items', function() {
--         expect(numLimitInput.getAttribute('value')).toBe('3');
--         expect(letterLimitInput.getAttribute('value')).toBe('3');
--         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3]');
--         expect(limitedLetters.getText()).toEqual('Output letters: abc');
--       });
-+        // In composition mode, users are still inputting intermediate text buffer,
-+        // hold the listener until composition is done.
-+        // More about composition events: https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent
-+        if (!$sniffer.android) {
-+            var composing = false;
- 
--     it('should update the output when -3 is entered', function() {
--         numLimitInput.clear();
--         numLimitInput.sendKeys('-3');
--         letterLimitInput.clear();
--         letterLimitInput.sendKeys('-3');
--         expect(limitedNumbers.getText()).toEqual('Output numbers: [7,8,9]');
--         expect(limitedLetters.getText()).toEqual('Output letters: ghi');
--       });
-+            element.on('compositionstart', function() {
-+                composing = true;
-+            });
- 
--     it('should not exceed the maximum size of input array', function() {
--         numLimitInput.clear();
--         numLimitInput.sendKeys('100');
--         letterLimitInput.clear();
--         letterLimitInput.sendKeys('100');
--         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3,4,5,6,7,8,9]');
--         expect(limitedLetters.getText()).toEqual('Output letters: abcdefghi');
--       });
--     </file>
--     </example>
--     */
--    function limitToFilter(){
--        return function(input, limit) {
--            if (!isArray(input) && !isString(input)) return input;
-+            element.on('compositionend', function() {
-+                composing = false;
-+                listener();
-+            });
-+        }
- 
--            limit = int(limit);
-+        var timeout;
- 
--            if (isString(input)) {
--                //NaN check on limit
--                if (limit) {
--                    return limit >= 0 ? input.slice(0, limit) : input.slice(limit, input.length);
--                } else {
--                    return "";
--                }
-+        var listener = function(ev) {
-+            if (timeout) {
-+                $browser.defer.cancel(timeout);
-+                timeout = null;
-             }
-+            if (composing) return;
-+            var value = element.val(),
-+                event = ev && ev.type;
- 
--            var out = [],
--                i, n;
--
--            // if abs(limit) exceeds maximum length, trim it
--            if (limit > input.length)
--                limit = input.length;
--            else if (limit < -input.length)
--                limit = -input.length;
--
--            if (limit > 0) {
--                i = 0;
--                n = limit;
--            } else {
--                i = input.length + limit;
--                n = input.length;
-+            // By default we will trim the value
-+            // If the attribute ng-trim exists we will avoid trimming
-+            // If input type is 'password', the value is never trimmed
-+            if (type !== 'password' && (!attr.ngTrim || attr.ngTrim !== 'false')) {
-+                value = trim(value);
-             }
- 
--            for (; i<n; i++) {
--                out.push(input[i]);
-+            // If a control is suffering from bad input (due to native validators), browsers discard its
-+            // value, so it may be necessary to revalidate (by calling $setViewValue again) even if the
-+            // control's value is the same empty value twice in a row.
-+            if (ctrl.$viewValue !== value || (value === '' && ctrl.$$hasNativeValidators)) {
-+                ctrl.$setViewValue(value, event);
-             }
--
--            return out;
-         };
--    }
- 
--    /**
--     * @ngdoc filter
--     * @name orderBy
--     * @function
--     *
--     * @description
--     * Orders a specified `array` by the `expression` predicate.
--     *
--     * @param {Array} array The array to sort.
--     * @param {function(*)|string|Array.<(function(*)|string)>} expression A predicate to be
--     *    used by the comparator to determine the order of elements.
--     *
--     *    Can be one of:
--     *
--     *    - `function`: Getter function. The result of this function will be sorted using the
--     *      `<`, `=`, `>` operator.
--     *    - `string`: An Angular expression which evaluates to an object to order by, such as 'name'
--     *      to sort by a property called 'name'. Optionally prefixed with `+` or `-` to control
--     *      ascending or descending sort order (for example, +name or -name).
--     *    - `Array`: An array of function or string predicates. The first predicate in the array
--     *      is used for sorting, but when two items are equivalent, the next predicate is used.
--     *
--     * @param {boolean=} reverse Reverse the order of the array.
--     * @returns {Array} Sorted copy of the source array.
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <script>
--     function Ctrl($scope) {
--           $scope.friends =
--               [{name:'John', phone:'555-1212', age:10},
--                {name:'Mary', phone:'555-9876', age:19},
--                {name:'Mike', phone:'555-4321', age:21},
--                {name:'Adam', phone:'555-5678', age:35},
--                {name:'Julie', phone:'555-8765', age:29}]
--           $scope.predicate = '-age';
--         }
--     </script>
--     <div ng-controller="Ctrl">
--     <pre>Sorting predicate = {{predicate}}; reverse = {{reverse}}</pre>
--     <hr/>
--     [ <a href="" ng-click="predicate=''">unsorted</a> ]
--     <table class="friend">
--     <tr>
--     <th><a href="" ng-click="predicate = 'name'; reverse=false">Name</a>
--     (<a href="" ng-click="predicate = '-name'; reverse=false">^</a>)</th>
--     <th><a href="" ng-click="predicate = 'phone'; reverse=!reverse">Phone Number</a></th>
--     <th><a href="" ng-click="predicate = 'age'; reverse=!reverse">Age</a></th>
--     </tr>
--     <tr ng-repeat="friend in friends | orderBy:predicate:reverse">
--     <td>{{friend.name}}</td>
--     <td>{{friend.phone}}</td>
--     <td>{{friend.age}}</td>
--     </tr>
--     </table>
--     </div>
--     </file>
--     </example>
--     */
--    orderByFilter.$inject = ['$parse'];
--    function orderByFilter($parse){
--        return function(array, sortPredicate, reverseOrder) {
--            if (!isArray(array)) return array;
--            if (!sortPredicate) return array;
--            sortPredicate = isArray(sortPredicate) ? sortPredicate: [sortPredicate];
--            sortPredicate = map(sortPredicate, function(predicate){
--                var descending = false, get = predicate || identity;
--                if (isString(predicate)) {
--                    if ((predicate.charAt(0) == '+' || predicate.charAt(0) == '-')) {
--                        descending = predicate.charAt(0) == '-';
--                        predicate = predicate.substring(1);
--                    }
--                    get = $parse(predicate);
--                    if (get.constant) {
--                        var key = get();
--                        return reverseComparator(function(a,b) {
--                            return compare(a[key], b[key]);
--                        }, descending);
--                    }
--                }
--                return reverseComparator(function(a,b){
--                    return compare(get(a),get(b));
--                }, descending);
--            });
--            var arrayCopy = [];
--            for ( var i = 0; i < array.length; i++) { arrayCopy.push(array[i]); }
--            return arrayCopy.sort(reverseComparator(comparator, reverseOrder));
--
--            function comparator(o1, o2){
--                for ( var i = 0; i < sortPredicate.length; i++) {
--                    var comp = sortPredicate[i](o1, o2);
--                    if (comp !== 0) return comp;
--                }
--                return 0;
--            }
--            function reverseComparator(comp, descending) {
--                return toBoolean(descending)
--                    ? function(a,b){return comp(b,a);}
--                    : comp;
--            }
--            function compare(v1, v2){
--                var t1 = typeof v1;
--                var t2 = typeof v2;
--                if (t1 == t2) {
--                    if (t1 == "string") {
--                        v1 = v1.toLowerCase();
--                        v2 = v2.toLowerCase();
--                    }
--                    if (v1 === v2) return 0;
--                    return v1 < v2 ? -1 : 1;
--                } else {
--                    return t1 < t2 ? -1 : 1;
-+        // if the browser does support "input" event, we are fine - except on IE9 which doesn't fire the
-+        // input event on backspace, delete or cut
-+        if ($sniffer.hasEvent('input')) {
-+            element.on('input', listener);
-+        } else {
-+            var deferListener = function(ev, input, origValue) {
-+                if (!timeout) {
-+                    timeout = $browser.defer(function() {
-+                        timeout = null;
-+                        if (!input || input.value !== origValue) {
-+                            listener(ev);
-+                        }
-+                    });
-                 }
--            }
--        };
--    }
--
--    function ngDirective(directive) {
--        if (isFunction(directive)) {
--            directive = {
--                link: directive
-             };
--        }
--        directive.restrict = directive.restrict || 'AC';
--        return valueFn(directive);
--    }
- 
--    /**
--     * @ngdoc directive
--     * @name a
--     * @restrict E
--     *
--     * @description
--     * Modifies the default behavior of the html A tag so that the default action is prevented when
--     * the href attribute is empty.
--     *
--     * This change permits the easy creation of action links with the `ngClick` directive
--     * without changing the location or causing page reloads, e.g.:
--     * `<a href="" ng-click="list.addItem()">Add Item</a>`
--     */
--    var htmlAnchorDirective = valueFn({
--        restrict: 'E',
--        compile: function(element, attr) {
-+            element.on('keydown', /** @this */ function(event) {
-+                var key = event.keyCode;
- 
--            if (msie <= 8) {
-+                // ignore
-+                //    command            modifiers                   arrows
-+                if (key === 91 || (15 < key && key < 19) || (37 <= key && key <= 40)) return;
- 
--                // turn <a href ng-click="..">link</a> into a stylable link in IE
--                // but only if it doesn't have name attribute, in which case it's an anchor
--                if (!attr.href && !attr.name) {
--                    attr.$set('href', '');
--                }
-+                deferListener(event, this, this.value);
-+            });
- 
--                // add a comment node to anchors to workaround IE bug that causes element content to be reset
--                // to new attribute content if attribute is updated with value containing @ and element also
--                // contains value with @
--                // see issue #1949
--                element.append(document.createComment('IE fix'));
-+            // if user modifies input value using context menu in IE, we need "paste", "cut" and "drop" events to catch it
-+            if ($sniffer.hasEvent('paste')) {
-+                element.on('paste cut drop', deferListener);
-             }
-+        }
- 
--            if (!attr.href && !attr.xlinkHref && !attr.name) {
--                return function(scope, element) {
--                    // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute.
--                    var href = toString.call(element.prop('href')) === '[object SVGAnimatedString]' ?
--                        'xlink:href' : 'href';
--                    element.on('click', function(event){
--                        // if we have no href url, then don't navigate anywhere.
--                        if (!element.attr(href)) {
--                            event.preventDefault();
-+        // if user paste into input using mouse on older browser
-+        // or form autocomplete on newer browser, we need "change" event to catch it
-+        element.on('change', listener);
-+
-+        // Some native input types (date-family) have the ability to change validity without
-+        // firing any input/change events.
-+        // For these event types, when native validators are present and the browser supports the type,
-+        // check for validity changes on various DOM events.
-+        if (PARTIAL_VALIDATION_TYPES[type] && ctrl.$$hasNativeValidators && type === attr.type) {
-+            element.on(PARTIAL_VALIDATION_EVENTS, /** @this */ function(ev) {
-+                if (!timeout) {
-+                    var validity = this[VALIDITY_STATE_PROPERTY];
-+                    var origBadInput = validity.badInput;
-+                    var origTypeMismatch = validity.typeMismatch;
-+                    timeout = $browser.defer(function() {
-+                        timeout = null;
-+                        if (validity.badInput !== origBadInput || validity.typeMismatch !== origTypeMismatch) {
-+                            listener(ev);
-                         }
-                     });
--                };
--            }
-+                }
-+            });
-         }
--    });
- 
--    /**
--     * @ngdoc directive
--     * @name ngHref
--     * @restrict A
--     * @priority 99
--     *
--     * @description
--     * Using Angular markup like `{{hash}}` in an href attribute will
--     * make the link go to the wrong URL if the user clicks it before
--     * Angular has a chance to replace the `{{hash}}` markup with its
--     * value. Until Angular replaces the markup the link will be broken
--     * and will most likely return a 404 error.
--     *
--     * The `ngHref` directive solves this problem.
--     *
--     * The wrong way to write it:
--     * ```html
--     * <a href="http://www.gravatar.com/avatar/{{hash}}"/>
--     * ```
--     *
--     * The correct way to write it:
--     * ```html
--     * <a ng-href="http://www.gravatar.com/avatar/{{hash}}"/>
--     * ```
--     *
--     * @element A
--     * @param {template} ngHref any string which can contain `{{}}` markup.
--     *
--     * @example
--     * This example shows various combinations of `href`, `ng-href` and `ng-click` attributes
--     * in links and their different behaviors:
--     <example>
--     <file name="index.html">
--     <input ng-model="value" /><br />
--     <a id="link-1" href ng-click="value = 1">link 1</a> (link, don't reload)<br />
--     <a id="link-2" href="" ng-click="value = 2">link 2</a> (link, don't reload)<br />
--     <a id="link-3" ng-href="/{{'123'}}">link 3</a> (link, reload!)<br />
--     <a id="link-4" href="" name="xx" ng-click="value = 4">anchor</a> (link, don't reload)<br />
--     <a id="link-5" name="xxx" ng-click="value = 5">anchor</a> (no link)<br />
--     <a id="link-6" ng-href="{{value}}">link</a> (link, change location)
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should execute ng-click but not reload when href without value', function() {
--          element(by.id('link-1')).click();
--          expect(element(by.model('value')).getAttribute('value')).toEqual('1');
--          expect(element(by.id('link-1')).getAttribute('href')).toBe('');
--        });
-+        ctrl.$render = function() {
-+            // Workaround for Firefox validation #12102.
-+            var value = ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue;
-+            if (element.val() !== value) {
-+                element.val(value);
-+            }
-+        };
-+    }
- 
--     it('should execute ng-click but not reload when href empty string', function() {
--          element(by.id('link-2')).click();
--          expect(element(by.model('value')).getAttribute('value')).toEqual('2');
--          expect(element(by.id('link-2')).getAttribute('href')).toBe('');
--        });
-+    function weekParser(isoWeek, existingDate) {
-+        if (isDate(isoWeek)) {
-+            return isoWeek;
-+        }
- 
--     it('should execute ng-click and change url when ng-href specified', function() {
--          expect(element(by.id('link-3')).getAttribute('href')).toMatch(/\/123$/);
-+        if (isString(isoWeek)) {
-+            WEEK_REGEXP.lastIndex = 0;
-+            var parts = WEEK_REGEXP.exec(isoWeek);
-+            if (parts) {
-+                var year = +parts[1],
-+                    week = +parts[2],
-+                    hours = 0,
-+                    minutes = 0,
-+                    seconds = 0,
-+                    milliseconds = 0,
-+                    firstThurs = getFirstThursdayOfYear(year),
-+                    addDays = (week - 1) * 7;
-+
-+                if (existingDate) {
-+                    hours = existingDate.getHours();
-+                    minutes = existingDate.getMinutes();
-+                    seconds = existingDate.getSeconds();
-+                    milliseconds = existingDate.getMilliseconds();
-+                }
- 
--          element(by.id('link-3')).click();
-+                return new Date(year, 0, firstThurs.getDate() + addDays, hours, minutes, seconds, milliseconds);
-+            }
-+        }
- 
--          // At this point, we navigate away from an Angular page, so we need
--          // to use browser.driver to get the base webdriver.
-+        return NaN;
-+    }
- 
--          browser.wait(function() {
--            return browser.driver.getCurrentUrl().then(function(url) {
--              return url.match(/\/123$/);
--            });
--          }, 1000, 'page should navigate to /123');
--        });
-+    function createDateParser(regexp, mapping) {
-+        return function(iso, date) {
-+            var parts, map;
- 
--     xit('should execute ng-click but not reload when href empty string and name specified', function() {
--          element(by.id('link-4')).click();
--          expect(element(by.model('value')).getAttribute('value')).toEqual('4');
--          expect(element(by.id('link-4')).getAttribute('href')).toBe('');
--        });
-+            if (isDate(iso)) {
-+                return iso;
-+            }
- 
--     it('should execute ng-click but not reload when no href but name specified', function() {
--          element(by.id('link-5')).click();
--          expect(element(by.model('value')).getAttribute('value')).toEqual('5');
--          expect(element(by.id('link-5')).getAttribute('href')).toBe(null);
--        });
-+            if (isString(iso)) {
-+                // When a date is JSON'ified to wraps itself inside of an extra
-+                // set of double quotes. This makes the date parsing code unable
-+                // to match the date string and parse it as a date.
-+                if (iso.charAt(0) === '"' && iso.charAt(iso.length - 1) === '"') {
-+                    iso = iso.substring(1, iso.length - 1);
-+                }
-+                if (ISO_DATE_REGEXP.test(iso)) {
-+                    return new Date(iso);
-+                }
-+                regexp.lastIndex = 0;
-+                parts = regexp.exec(iso);
-+
-+                if (parts) {
-+                    parts.shift();
-+                    if (date) {
-+                        map = {
-+                            yyyy: date.getFullYear(),
-+                            MM: date.getMonth() + 1,
-+                            dd: date.getDate(),
-+                            HH: date.getHours(),
-+                            mm: date.getMinutes(),
-+                            ss: date.getSeconds(),
-+                            sss: date.getMilliseconds() / 1000
-+                        };
-+                    } else {
-+                        map = { yyyy: 1970, MM: 1, dd: 1, HH: 0, mm: 0, ss: 0, sss: 0 };
-+                    }
- 
--     it('should only change url when only ng-href', function() {
--          element(by.model('value')).clear();
--          element(by.model('value')).sendKeys('6');
--          expect(element(by.id('link-6')).getAttribute('href')).toMatch(/\/6$/);
-+                    forEach(parts, function(part, index) {
-+                        if (index < mapping.length) {
-+                            map[mapping[index]] = +part;
-+                        }
-+                    });
-+                    return new Date(map.yyyy, map.MM - 1, map.dd, map.HH, map.mm, map.ss || 0, map.sss * 1000 || 0);
-+                }
-+            }
- 
--          element(by.id('link-6')).click();
-+            return NaN;
-+        };
-+    }
- 
--          // At this point, we navigate away from an Angular page, so we need
--          // to use browser.driver to get the base webdriver.
--          browser.wait(function() {
--            return browser.driver.getCurrentUrl().then(function(url) {
--              return url.match(/\/6$/);
-+    function createDateInputType(type, regexp, parseDate, format) {
-+        return function dynamicDateInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter) {
-+            badInputChecker(scope, element, attr, ctrl);
-+            baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
-+            var timezone = ctrl && ctrl.$options.getOption('timezone');
-+            var previousDate;
-+
-+            ctrl.$$parserName = type;
-+            ctrl.$parsers.push(function(value) {
-+                if (ctrl.$isEmpty(value)) return null;
-+                if (regexp.test(value)) {
-+                    // Note: We cannot read ctrl.$modelValue, as there might be a different
-+                    // parser/formatter in the processing chain so that the model
-+                    // contains some different data format!
-+                    var parsedDate = parseDate(value, previousDate);
-+                    if (timezone) {
-+                        parsedDate = convertTimezoneToLocal(parsedDate, timezone);
-+                    }
-+                    return parsedDate;
-+                }
-+                return undefined;
-             });
--          }, 1000, 'page should navigate to /6');
--        });
--     </file>
--     </example>
--     */
--
--    /**
--     * @ngdoc directive
--     * @name ngSrc
--     * @restrict A
--     * @priority 99
--     *
--     * @description
--     * Using Angular markup like `{{hash}}` in a `src` attribute doesn't
--     * work right: The browser will fetch from the URL with the literal
--     * text `{{hash}}` until Angular replaces the expression inside
--     * `{{hash}}`. The `ngSrc` directive solves this problem.
--     *
--     * The buggy way to write it:
--     * ```html
--     * <img src="http://www.gravatar.com/avatar/{{hash}}"/>
--     * ```
--     *
--     * The correct way to write it:
--     * ```html
--     * <img ng-src="http://www.gravatar.com/avatar/{{hash}}"/>
--     * ```
--     *
--     * @element IMG
--     * @param {template} ngSrc any string which can contain `{{}}` markup.
--     */
--
--    /**
--     * @ngdoc directive
--     * @name ngSrcset
--     * @restrict A
--     * @priority 99
--     *
--     * @description
--     * Using Angular markup like `{{hash}}` in a `srcset` attribute doesn't
--     * work right: The browser will fetch from the URL with the literal
--     * text `{{hash}}` until Angular replaces the expression inside
--     * `{{hash}}`. The `ngSrcset` directive solves this problem.
--     *
--     * The buggy way to write it:
--     * ```html
--     * <img srcset="http://www.gravatar.com/avatar/{{hash}} 2x"/>
--     * ```
--     *
--     * The correct way to write it:
--     * ```html
--     * <img ng-srcset="http://www.gravatar.com/avatar/{{hash}} 2x"/>
--     * ```
--     *
--     * @element IMG
--     * @param {template} ngSrcset any string which can contain `{{}}` markup.
--     */
- 
--    /**
--     * @ngdoc directive
--     * @name ngDisabled
--     * @restrict A
--     * @priority 100
--     *
--     * @description
--     *
--     * The following markup will make the button enabled on Chrome/Firefox but not on IE8 and older IEs:
--     * ```html
--     * <div ng-init="scope = { isDisabled: false }">
--     *  <button disabled="{{scope.isDisabled}}">Disabled</button>
--     * </div>
--     * ```
--     *
--     * The HTML specification does not require browsers to preserve the values of boolean attributes
--     * such as disabled. (Their presence means true and their absence means false.)
--     * If we put an Angular interpolation expression into such an attribute then the
--     * binding information would be lost when the browser removes the attribute.
--     * The `ngDisabled` directive solves this problem for the `disabled` attribute.
--     * This complementary directive is not removed by the browser and so provides
--     * a permanent reliable place to store the binding information.
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     Click me to toggle: <input type="checkbox" ng-model="checked"><br/>
--     <button ng-model="button" ng-disabled="checked">Button</button>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should toggle button', function() {
--          expect(element(by.css('button')).getAttribute('disabled')).toBeFalsy();
--          element(by.model('checked')).click();
--          expect(element(by.css('button')).getAttribute('disabled')).toBeTruthy();
--        });
--     </file>
--     </example>
--     *
--     * @element INPUT
--     * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy,
--     *     then special attribute "disabled" will be set on the element
--     */
-+            ctrl.$formatters.push(function(value) {
-+                if (value && !isDate(value)) {
-+                    throw ngModelMinErr('datefmt', 'Expected `{0}` to be a date', value);
-+                }
-+                if (isValidDate(value)) {
-+                    previousDate = value;
-+                    if (previousDate && timezone) {
-+                        previousDate = convertTimezoneToLocal(previousDate, timezone, true);
-+                    }
-+                    return $filter('date')(value, format, timezone);
-+                } else {
-+                    previousDate = null;
-+                    return '';
-+                }
-+            });
- 
-+            if (isDefined(attr.min) || attr.ngMin) {
-+                var minVal;
-+                ctrl.$validators.min = function(value) {
-+                    return !isValidDate(value) || isUndefined(minVal) || parseDate(value) >= minVal;
-+                };
-+                attr.$observe('min', function(val) {
-+                    minVal = parseObservedDateValue(val);
-+                    ctrl.$validate();
-+                });
-+            }
- 
--    /**
--     * @ngdoc directive
--     * @name ngChecked
--     * @restrict A
--     * @priority 100
--     *
--     * @description
--     * The HTML specification does not require browsers to preserve the values of boolean attributes
--     * such as checked. (Their presence means true and their absence means false.)
--     * If we put an Angular interpolation expression into such an attribute then the
--     * binding information would be lost when the browser removes the attribute.
--     * The `ngChecked` directive solves this problem for the `checked` attribute.
--     * This complementary directive is not removed by the browser and so provides
--     * a permanent reliable place to store the binding information.
--     * @example
--     <example>
--     <file name="index.html">
--     Check me to check both: <input type="checkbox" ng-model="master"><br/>
--     <input id="checkSlave" type="checkbox" ng-checked="master">
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should check both checkBoxes', function() {
--          expect(element(by.id('checkSlave')).getAttribute('checked')).toBeFalsy();
--          element(by.model('master')).click();
--          expect(element(by.id('checkSlave')).getAttribute('checked')).toBeTruthy();
--        });
--     </file>
--     </example>
--     *
--     * @element INPUT
--     * @param {expression} ngChecked If the {@link guide/expression expression} is truthy,
--     *     then special attribute "checked" will be set on the element
--     */
-+            if (isDefined(attr.max) || attr.ngMax) {
-+                var maxVal;
-+                ctrl.$validators.max = function(value) {
-+                    return !isValidDate(value) || isUndefined(maxVal) || parseDate(value) <= maxVal;
-+                };
-+                attr.$observe('max', function(val) {
-+                    maxVal = parseObservedDateValue(val);
-+                    ctrl.$validate();
-+                });
-+            }
- 
-+            function isValidDate(value) {
-+                // Invalid Date: getTime() returns NaN
-+                return value && !(value.getTime && value.getTime() !== value.getTime());
-+            }
- 
--    /**
--     * @ngdoc directive
--     * @name ngReadonly
--     * @restrict A
--     * @priority 100
--     *
--     * @description
--     * The HTML specification does not require browsers to preserve the values of boolean attributes
--     * such as readonly. (Their presence means true and their absence means false.)
--     * If we put an Angular interpolation expression into such an attribute then the
--     * binding information would be lost when the browser removes the attribute.
--     * The `ngReadonly` directive solves this problem for the `readonly` attribute.
--     * This complementary directive is not removed by the browser and so provides
--     * a permanent reliable place to store the binding information.
--     * @example
--     <example>
--     <file name="index.html">
--     Check me to make text readonly: <input type="checkbox" ng-model="checked"><br/>
--     <input type="text" ng-readonly="checked" value="I'm Angular"/>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should toggle readonly attr', function() {
--          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeFalsy();
--          element(by.model('checked')).click();
--          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeTruthy();
--        });
--     </file>
--     </example>
--     *
--     * @element INPUT
--     * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy,
--     *     then special attribute "readonly" will be set on the element
--     */
-+            function parseObservedDateValue(val) {
-+                return isDefined(val) && !isDate(val) ? parseDate(val) || undefined : val;
-+            }
-+        };
-+    }
- 
-+    function badInputChecker(scope, element, attr, ctrl) {
-+        var node = element[0];
-+        var nativeValidation = ctrl.$$hasNativeValidators = isObject(node.validity);
-+        if (nativeValidation) {
-+            ctrl.$parsers.push(function(value) {
-+                var validity = element.prop(VALIDITY_STATE_PROPERTY) || {};
-+                return validity.badInput || validity.typeMismatch ? undefined : value;
-+            });
-+        }
-+    }
- 
--    /**
--     * @ngdoc directive
--     * @name ngSelected
--     * @restrict A
--     * @priority 100
--     *
--     * @description
--     * The HTML specification does not require browsers to preserve the values of boolean attributes
--     * such as selected. (Their presence means true and their absence means false.)
--     * If we put an Angular interpolation expression into such an attribute then the
--     * binding information would be lost when the browser removes the attribute.
--     * The `ngSelected` directive solves this problem for the `selected` attribute.
--     * This complementary directive is not removed by the browser and so provides
--     * a permanent reliable place to store the binding information.
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     Check me to select: <input type="checkbox" ng-model="selected"><br/>
--     <select>
--     <option>Hello!</option>
--     <option id="greet" ng-selected="selected">Greetings!</option>
--     </select>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should select Greetings!', function() {
--          expect(element(by.id('greet')).getAttribute('selected')).toBeFalsy();
--          element(by.model('selected')).click();
--          expect(element(by.id('greet')).getAttribute('selected')).toBeTruthy();
-+    function numberFormatterParser(ctrl) {
-+        ctrl.$$parserName = 'number';
-+        ctrl.$parsers.push(function(value) {
-+            if (ctrl.$isEmpty(value))      return null;
-+            if (NUMBER_REGEXP.test(value)) return parseFloat(value);
-+            return undefined;
-         });
--     </file>
--     </example>
--     *
--     * @element OPTION
--     * @param {expression} ngSelected If the {@link guide/expression expression} is truthy,
--     *     then special attribute "selected" will be set on the element
--     */
- 
--    /**
--     * @ngdoc directive
--     * @name ngOpen
--     * @restrict A
--     * @priority 100
--     *
--     * @description
--     * The HTML specification does not require browsers to preserve the values of boolean attributes
--     * such as open. (Their presence means true and their absence means false.)
--     * If we put an Angular interpolation expression into such an attribute then the
--     * binding information would be lost when the browser removes the attribute.
--     * The `ngOpen` directive solves this problem for the `open` attribute.
--     * This complementary directive is not removed by the browser and so provides
--     * a permanent reliable place to store the binding information.
--     * @example
--     <example>
--     <file name="index.html">
--     Check me check multiple: <input type="checkbox" ng-model="open"><br/>
--     <details id="details" ng-open="open">
--     <summary>Show/Hide me</summary>
--     </details>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should toggle open', function() {
--           expect(element(by.id('details')).getAttribute('open')).toBeFalsy();
--           element(by.model('open')).click();
--           expect(element(by.id('details')).getAttribute('open')).toBeTruthy();
--         });
--     </file>
--     </example>
--     *
--     * @element DETAILS
--     * @param {expression} ngOpen If the {@link guide/expression expression} is truthy,
--     *     then special attribute "open" will be set on the element
--     */
-+        ctrl.$formatters.push(function(value) {
-+            if (!ctrl.$isEmpty(value)) {
-+                if (!isNumber(value)) {
-+                    throw ngModelMinErr('numfmt', 'Expected `{0}` to be a number', value);
-+                }
-+                value = value.toString();
-+            }
-+            return value;
-+        });
-+    }
- 
--    var ngAttributeAliasDirectives = {};
-+    function parseNumberAttrVal(val) {
-+        if (isDefined(val) && !isNumber(val)) {
-+            val = parseFloat(val);
-+        }
-+        return !isNumberNaN(val) ? val : undefined;
-+    }
- 
-+    function isNumberInteger(num) {
-+        // See http://stackoverflow.com/questions/14636536/how-to-check-if-a-variable-is-an-integer-in-javascript#14794066
-+        // (minus the assumption that `num` is a number)
- 
--// boolean attrs are evaluated
--    forEach(BOOLEAN_ATTR, function(propName, attrName) {
--        // binding to multiple is not supported
--        if (propName == "multiple") return;
-+        // eslint-disable-next-line no-bitwise
-+        return (num | 0) === num;
-+    }
- 
--        var normalized = directiveNormalize('ng-' + attrName);
--        ngAttributeAliasDirectives[normalized] = function() {
--            return {
--                priority: 100,
--                link: function(scope, element, attr) {
--                    scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) {
--                        attr.$set(attrName, !!value);
--                    });
-+    function countDecimals(num) {
-+        var numString = num.toString();
-+        var decimalSymbolIndex = numString.indexOf('.');
-+
-+        if (decimalSymbolIndex === -1) {
-+            if (-1 < num && num < 1) {
-+                // It may be in the exponential notation format (`1e-X`)
-+                var match = /e-(\d+)$/.exec(numString);
-+
-+                if (match) {
-+                    return Number(match[1]);
-                 }
--            };
--        };
--    });
-+            }
- 
-+            return 0;
-+        }
- 
--// ng-src, ng-srcset, ng-href are interpolated
--    forEach(['src', 'srcset', 'href'], function(attrName) {
--        var normalized = directiveNormalize('ng-' + attrName);
--        ngAttributeAliasDirectives[normalized] = function() {
--            return {
--                priority: 99, // it needs to run after the attributes are interpolated
--                link: function(scope, element, attr) {
--                    var propName = attrName,
--                        name = attrName;
-+        return numString.length - decimalSymbolIndex - 1;
-+    }
- 
--                    if (attrName === 'href' &&
--                        toString.call(element.prop('href')) === '[object SVGAnimatedString]') {
--                        name = 'xlinkHref';
--                        attr.$attr[name] = 'xlink:href';
--                        propName = null;
--                    }
-+    function isValidForStep(viewValue, stepBase, step) {
-+        // At this point `stepBase` and `step` are expected to be non-NaN values
-+        // and `viewValue` is expected to be a valid stringified number.
-+        var value = Number(viewValue);
- 
--                    attr.$observe(normalized, function(value) {
--                        if (!value)
--                            return;
-+        var isNonIntegerValue = !isNumberInteger(value);
-+        var isNonIntegerStepBase = !isNumberInteger(stepBase);
-+        var isNonIntegerStep = !isNumberInteger(step);
- 
--                        attr.$set(name, value);
-+        // Due to limitations in Floating Point Arithmetic (e.g. `0.3 - 0.2 !== 0.1` or
-+        // `0.5 % 0.1 !== 0`), we need to convert all numbers to integers.
-+        if (isNonIntegerValue || isNonIntegerStepBase || isNonIntegerStep) {
-+            var valueDecimals = isNonIntegerValue ? countDecimals(value) : 0;
-+            var stepBaseDecimals = isNonIntegerStepBase ? countDecimals(stepBase) : 0;
-+            var stepDecimals = isNonIntegerStep ? countDecimals(step) : 0;
- 
--                        // on IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist
--                        // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need
--                        // to set the property as well to achieve the desired effect.
--                        // we use attr[attrName] value since $set can sanitize the url.
--                        if (msie && propName) element.prop(propName, attr[name]);
--                    });
--                }
-+            var decimalCount = Math.max(valueDecimals, stepBaseDecimals, stepDecimals);
-+            var multiplier = Math.pow(10, decimalCount);
-+
-+            value = value * multiplier;
-+            stepBase = stepBase * multiplier;
-+            step = step * multiplier;
-+
-+            if (isNonIntegerValue) value = Math.round(value);
-+            if (isNonIntegerStepBase) stepBase = Math.round(stepBase);
-+            if (isNonIntegerStep) step = Math.round(step);
-+        }
-+
-+        return (value - stepBase) % step === 0;
-+    }
-+
-+    function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-+        badInputChecker(scope, element, attr, ctrl);
-+        numberFormatterParser(ctrl);
-+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
-+
-+        var minVal;
-+        var maxVal;
-+
-+        if (isDefined(attr.min) || attr.ngMin) {
-+            ctrl.$validators.min = function(value) {
-+                return ctrl.$isEmpty(value) || isUndefined(minVal) || value >= minVal;
-             };
--        };
--    });
- 
--    /* global -nullFormCtrl */
--    var nullFormCtrl = {
--        $addControl: noop,
--        $removeControl: noop,
--        $setValidity: noop,
--        $setDirty: noop,
--        $setPristine: noop
--    };
-+            attr.$observe('min', function(val) {
-+                minVal = parseNumberAttrVal(val);
-+                // TODO(matsko): implement validateLater to reduce number of validations
-+                ctrl.$validate();
-+            });
-+        }
- 
--    /**
--     * @ngdoc type
--     * @name form.FormController
--     *
--     * @property {boolean} $pristine True if user has not interacted with the form yet.
--     * @property {boolean} $dirty True if user has already interacted with the form.
--     * @property {boolean} $valid True if all of the containing forms and controls are valid.
--     * @property {boolean} $invalid True if at least one containing control or form is invalid.
--     *
--     * @property {Object} $error Is an object hash, containing references to all invalid controls or
--     *  forms, where:
--     *
--     *  - keys are validation tokens (error names),
--     *  - values are arrays of controls or forms that are invalid for given error name.
--     *
--     *
--     *  Built-in validation tokens:
--     *
--     *  - `email`
--     *  - `max`
--     *  - `maxlength`
--     *  - `min`
--     *  - `minlength`
--     *  - `number`
--     *  - `pattern`
--     *  - `required`
--     *  - `url`
--     *
--     * @description
--     * `FormController` keeps track of all its controls and nested forms as well as state of them,
--     * such as being valid/invalid or dirty/pristine.
--     *
--     * Each {@link ng.directive:form form} directive creates an instance
--     * of `FormController`.
--     *
--     */
--//asks for $scope to fool the BC controller module
--    FormController.$inject = ['$element', '$attrs', '$scope', '$animate'];
--    function FormController(element, attrs, $scope, $animate) {
--        var form = this,
--            parentForm = element.parent().controller('form') || nullFormCtrl,
--            invalidCount = 0, // used to easily determine if we are valid
--            errors = form.$error = {},
--            controls = [];
-+        if (isDefined(attr.max) || attr.ngMax) {
-+            ctrl.$validators.max = function(value) {
-+                return ctrl.$isEmpty(value) || isUndefined(maxVal) || value <= maxVal;
-+            };
- 
--        // init state
--        form.$name = attrs.name || attrs.ngForm;
--        form.$dirty = false;
--        form.$pristine = true;
--        form.$valid = true;
--        form.$invalid = false;
-+            attr.$observe('max', function(val) {
-+                maxVal = parseNumberAttrVal(val);
-+                // TODO(matsko): implement validateLater to reduce number of validations
-+                ctrl.$validate();
-+            });
-+        }
-+
-+        if (isDefined(attr.step) || attr.ngStep) {
-+            var stepVal;
-+            ctrl.$validators.step = function(modelValue, viewValue) {
-+                return ctrl.$isEmpty(viewValue) || isUndefined(stepVal) ||
-+                    isValidForStep(viewValue, minVal || 0, stepVal);
-+            };
- 
--        parentForm.$addControl(form);
-+            attr.$observe('step', function(val) {
-+                stepVal = parseNumberAttrVal(val);
-+                // TODO(matsko): implement validateLater to reduce number of validations
-+                ctrl.$validate();
-+            });
-+        }
-+    }
- 
--        // Setup initial state of the control
--        element.addClass(PRISTINE_CLASS);
--        toggleValidCss(true);
-+    function rangeInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-+        badInputChecker(scope, element, attr, ctrl);
-+        numberFormatterParser(ctrl);
-+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
-+
-+        var supportsRange = ctrl.$$hasNativeValidators && element[0].type === 'range',
-+            minVal = supportsRange ? 0 : undefined,
-+            maxVal = supportsRange ? 100 : undefined,
-+            stepVal = supportsRange ? 1 : undefined,
-+            validity = element[0].validity,
-+            hasMinAttr = isDefined(attr.min),
-+            hasMaxAttr = isDefined(attr.max),
-+            hasStepAttr = isDefined(attr.step);
-+
-+        var originalRender = ctrl.$render;
-+
-+        ctrl.$render = supportsRange && isDefined(validity.rangeUnderflow) && isDefined(validity.rangeOverflow) ?
-+            //Browsers that implement range will set these values automatically, but reading the adjusted values after
-+            //$render would cause the min / max validators to be applied with the wrong value
-+            function rangeRender() {
-+                originalRender();
-+                ctrl.$setViewValue(element.val());
-+            } :
-+            originalRender;
-+
-+        if (hasMinAttr) {
-+            ctrl.$validators.min = supportsRange ?
-+                // Since all browsers set the input to a valid value, we don't need to check validity
-+                function noopMinValidator() { return true; } :
-+                // non-support browsers validate the min val
-+                function minValidator(modelValue, viewValue) {
-+                    return ctrl.$isEmpty(viewValue) || isUndefined(minVal) || viewValue >= minVal;
-+                };
- 
--        // convenience method for easy toggling of classes
--        function toggleValidCss(isValid, validationErrorKey) {
--            validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
--            $animate.removeClass(element, (isValid ? INVALID_CLASS : VALID_CLASS) + validationErrorKey);
--            $animate.addClass(element, (isValid ? VALID_CLASS : INVALID_CLASS) + validationErrorKey);
-+            setInitialValueAndObserver('min', minChange);
-         }
- 
--        /**
--         * @ngdoc method
--         * @name form.FormController#$addControl
--         *
--         * @description
--         * Register a control with the form.
--         *
--         * Input elements using ngModelController do this automatically when they are linked.
--         */
--        form.$addControl = function(control) {
--            // Breaking change - before, inputs whose name was "hasOwnProperty" were quietly ignored
--            // and not added to the scope.  Now we throw an error.
--            assertNotHasOwnProperty(control.$name, 'input');
--            controls.push(control);
-+        if (hasMaxAttr) {
-+            ctrl.$validators.max = supportsRange ?
-+                // Since all browsers set the input to a valid value, we don't need to check validity
-+                function noopMaxValidator() { return true; } :
-+                // non-support browsers validate the max val
-+                function maxValidator(modelValue, viewValue) {
-+                    return ctrl.$isEmpty(viewValue) || isUndefined(maxVal) || viewValue <= maxVal;
-+                };
- 
--            if (control.$name) {
--                form[control.$name] = control;
-+            setInitialValueAndObserver('max', maxChange);
-+        }
-+
-+        if (hasStepAttr) {
-+            ctrl.$validators.step = supportsRange ?
-+                function nativeStepValidator() {
-+                    // Currently, only FF implements the spec on step change correctly (i.e. adjusting the
-+                    // input element value to a valid value). It's possible that other browsers set the stepMismatch
-+                    // validity error instead, so we can at least report an error in that case.
-+                    return !validity.stepMismatch;
-+                } :
-+                // ngStep doesn't set the setp attr, so the browser doesn't adjust the input value as setting step would
-+                function stepValidator(modelValue, viewValue) {
-+                    return ctrl.$isEmpty(viewValue) || isUndefined(stepVal) ||
-+                        isValidForStep(viewValue, minVal || 0, stepVal);
-+                };
-+
-+            setInitialValueAndObserver('step', stepChange);
-+        }
-+
-+        function setInitialValueAndObserver(htmlAttrName, changeFn) {
-+            // interpolated attributes set the attribute value only after a digest, but we need the
-+            // attribute value when the input is first rendered, so that the browser can adjust the
-+            // input value based on the min/max value
-+            element.attr(htmlAttrName, attr[htmlAttrName]);
-+            attr.$observe(htmlAttrName, changeFn);
-+        }
-+
-+        function minChange(val) {
-+            minVal = parseNumberAttrVal(val);
-+            // ignore changes before model is initialized
-+            if (isNumberNaN(ctrl.$modelValue)) {
-+                return;
-             }
--        };
- 
--        /**
--         * @ngdoc method
--         * @name form.FormController#$removeControl
--         *
--         * @description
--         * Deregister a control from the form.
--         *
--         * Input elements using ngModelController do this automatically when they are destroyed.
--         */
--        form.$removeControl = function(control) {
--            if (control.$name && form[control.$name] === control) {
--                delete form[control.$name];
-+            if (supportsRange) {
-+                var elVal = element.val();
-+                // IE11 doesn't set the el val correctly if the minVal is greater than the element value
-+                if (minVal > elVal) {
-+                    elVal = minVal;
-+                    element.val(elVal);
-+                }
-+                ctrl.$setViewValue(elVal);
-+            } else {
-+                // TODO(matsko): implement validateLater to reduce number of validations
-+                ctrl.$validate();
-             }
--            forEach(errors, function(queue, validationToken) {
--                form.$setValidity(validationToken, true, control);
--            });
-+        }
- 
--            arrayRemove(controls, control);
--        };
-+        function maxChange(val) {
-+            maxVal = parseNumberAttrVal(val);
-+            // ignore changes before model is initialized
-+            if (isNumberNaN(ctrl.$modelValue)) {
-+                return;
-+            }
- 
--        /**
--         * @ngdoc method
--         * @name form.FormController#$setValidity
--         *
--         * @description
--         * Sets the validity of a form control.
--         *
--         * This method will also propagate to parent forms.
--         */
--        form.$setValidity = function(validationToken, isValid, control) {
--            var queue = errors[validationToken];
--
--            if (isValid) {
--                if (queue) {
--                    arrayRemove(queue, control);
--                    if (!queue.length) {
--                        invalidCount--;
--                        if (!invalidCount) {
--                            toggleValidCss(isValid);
--                            form.$valid = true;
--                            form.$invalid = false;
--                        }
--                        errors[validationToken] = false;
--                        toggleValidCss(true, validationToken);
--                        parentForm.$setValidity(validationToken, true, form);
--                    }
-+            if (supportsRange) {
-+                var elVal = element.val();
-+                // IE11 doesn't set the el val correctly if the maxVal is less than the element value
-+                if (maxVal < elVal) {
-+                    element.val(maxVal);
-+                    // IE11 and Chrome don't set the value to the minVal when max < min
-+                    elVal = maxVal < minVal ? minVal : maxVal;
-                 }
-+                ctrl.$setViewValue(elVal);
-+            } else {
-+                // TODO(matsko): implement validateLater to reduce number of validations
-+                ctrl.$validate();
-+            }
-+        }
-+
-+        function stepChange(val) {
-+            stepVal = parseNumberAttrVal(val);
-+            // ignore changes before model is initialized
-+            if (isNumberNaN(ctrl.$modelValue)) {
-+                return;
-+            }
- 
-+            // Some browsers don't adjust the input value correctly, but set the stepMismatch error
-+            if (supportsRange && ctrl.$viewValue !== element.val()) {
-+                ctrl.$setViewValue(element.val());
-             } else {
--                if (!invalidCount) {
--                    toggleValidCss(isValid);
--                }
--                if (queue) {
--                    if (includes(queue, control)) return;
--                } else {
--                    errors[validationToken] = queue = [];
--                    invalidCount++;
--                    toggleValidCss(false, validationToken);
--                    parentForm.$setValidity(validationToken, false, form);
-+                // TODO(matsko): implement validateLater to reduce number of validations
-+                ctrl.$validate();
-+            }
-+        }
-+    }
-+
-+    function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-+        // Note: no badInputChecker here by purpose as `url` is only a validation
-+        // in browsers, i.e. we can always read out input.value even if it is not valid!
-+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
-+        stringBasedInputType(ctrl);
-+
-+        ctrl.$$parserName = 'url';
-+        ctrl.$validators.url = function(modelValue, viewValue) {
-+            var value = modelValue || viewValue;
-+            return ctrl.$isEmpty(value) || URL_REGEXP.test(value);
-+        };
-+    }
-+
-+    function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-+        // Note: no badInputChecker here by purpose as `url` is only a validation
-+        // in browsers, i.e. we can always read out input.value even if it is not valid!
-+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
-+        stringBasedInputType(ctrl);
-+
-+        ctrl.$$parserName = 'email';
-+        ctrl.$validators.email = function(modelValue, viewValue) {
-+            var value = modelValue || viewValue;
-+            return ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value);
-+        };
-+    }
-+
-+    function radioInputType(scope, element, attr, ctrl) {
-+        var doTrim = !attr.ngTrim || trim(attr.ngTrim) !== 'false';
-+        // make the name unique, if not defined
-+        if (isUndefined(attr.name)) {
-+            element.attr('name', nextUid());
-+        }
-+
-+        var listener = function(ev) {
-+            var value;
-+            if (element[0].checked) {
-+                value = attr.value;
-+                if (doTrim) {
-+                    value = trim(value);
-                 }
--                queue.push(control);
-+                ctrl.$setViewValue(value, ev && ev.type);
-+            }
-+        };
-+
-+        element.on('click', listener);
-+
-+        ctrl.$render = function() {
-+            var value = attr.value;
-+            if (doTrim) {
-+                value = trim(value);
-+            }
-+            element[0].checked = (value === ctrl.$viewValue);
-+        };
- 
--                form.$valid = false;
--                form.$invalid = true;
-+        attr.$observe('value', ctrl.$render);
-+    }
-+
-+    function parseConstantExpr($parse, context, name, expression, fallback) {
-+        var parseFn;
-+        if (isDefined(expression)) {
-+            parseFn = $parse(expression);
-+            if (!parseFn.constant) {
-+                throw ngModelMinErr('constexpr', 'Expected constant expression for `{0}`, but saw ' +
-+                    '`{1}`.', name, expression);
-             }
-+            return parseFn(context);
-+        }
-+        return fallback;
-+    }
-+
-+    function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter, $parse) {
-+        var trueValue = parseConstantExpr($parse, scope, 'ngTrueValue', attr.ngTrueValue, true);
-+        var falseValue = parseConstantExpr($parse, scope, 'ngFalseValue', attr.ngFalseValue, false);
-+
-+        var listener = function(ev) {
-+            ctrl.$setViewValue(element[0].checked, ev && ev.type);
-         };
- 
--        /**
--         * @ngdoc method
--         * @name form.FormController#$setDirty
--         *
--         * @description
--         * Sets the form to a dirty state.
--         *
--         * This method can be called to add the 'ng-dirty' class and set the form to a dirty
--         * state (ng-dirty class). This method will also propagate to parent forms.
--         */
--        form.$setDirty = function() {
--            $animate.removeClass(element, PRISTINE_CLASS);
--            $animate.addClass(element, DIRTY_CLASS);
--            form.$dirty = true;
--            form.$pristine = false;
--            parentForm.$setDirty();
-+        element.on('click', listener);
-+
-+        ctrl.$render = function() {
-+            element[0].checked = ctrl.$viewValue;
-         };
- 
--        /**
--         * @ngdoc method
--         * @name form.FormController#$setPristine
--         *
--         * @description
--         * Sets the form to its pristine state.
--         *
--         * This method can be called to remove the 'ng-dirty' class and set the form to its pristine
--         * state (ng-pristine class). This method will also propagate to all the controls contained
--         * in this form.
--         *
--         * Setting a form back to a pristine state is often useful when we want to 'reuse' a form after
--         * saving or resetting it.
--         */
--        form.$setPristine = function () {
--            $animate.removeClass(element, DIRTY_CLASS);
--            $animate.addClass(element, PRISTINE_CLASS);
--            form.$dirty = false;
--            form.$pristine = true;
--            forEach(controls, function(control) {
--                control.$setPristine();
--            });
-+        // Override the standard `$isEmpty` because the $viewValue of an empty checkbox is always set to `false`
-+        // This is because of the parser below, which compares the `$modelValue` with `trueValue` to convert
-+        // it to a boolean.
-+        ctrl.$isEmpty = function(value) {
-+            return value === false;
-         };
-+
-+        ctrl.$formatters.push(function(value) {
-+            return equals(value, trueValue);
-+        });
-+
-+        ctrl.$parsers.push(function(value) {
-+            return value ? trueValue : falseValue;
-+        });
-     }
- 
- 
-     /**
-      * @ngdoc directive
--     * @name ngForm
--     * @restrict EAC
-+     * @name textarea
-+     * @restrict E
-      *
-      * @description
--     * Nestable alias of {@link ng.directive:form `form`} directive. HTML
--     * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a
--     * sub-group of controls needs to be determined.
-+     * HTML textarea element control with AngularJS data-binding. The data-binding and validation
-+     * properties of this element are exactly the same as those of the
-+     * {@link ng.directive:input input element}.
-      *
--     * Note: the purpose of `ngForm` is to group controls,
--     * but not to be a replacement for the `<form>` tag with all of its capabilities
--     * (e.g. posting to the server, ...).
-+     * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+     * @param {string=} name Property name of the form under which the control is published.
-+     * @param {string=} required Sets `required` validation error key if the value is not entered.
-+     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-+     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-+     *    `required` when you want to data-bind to the `required` attribute.
-+     * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-+     *    minlength.
-+     * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-+     *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
-+     *    length.
-+     * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
-+     *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
-+     *    If the expression evaluates to a RegExp object, then this is used directly.
-+     *    If the expression evaluates to a string, then it will be converted to a RegExp
-+     *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
-+     *    `new RegExp('^abc$')`.<br />
-+     *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
-+     *    start at the index of the last search's match, thus not taking the whole input value into
-+     *    account.
-+     * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
-+     *    interaction with the input element.
-+     * @param {boolean=} [ngTrim=true] If set to false AngularJS will not automatically trim the input.
-      *
--     * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into
--     *                       related scope, under this name.
-+     * @knownIssue
-      *
-+     * When specifying the `placeholder` attribute of `<textarea>`, Internet Explorer will temporarily
-+     * insert the placeholder value as the textarea's content. If the placeholder value contains
-+     * interpolation (`{{ ... }}`), an error will be logged in the console when AngularJS tries to update
-+     * the value of the by-then-removed text node. This doesn't affect the functionality of the
-+     * textarea, but can be undesirable.
-+     *
-+     * You can work around this Internet Explorer issue by using `ng-attr-placeholder` instead of
-+     * `placeholder` on textareas, whenever you need interpolation in the placeholder value. You can
-+     * find more details on `ngAttr` in the
-+     * [Interpolation](guide/interpolation#-ngattr-for-binding-to-arbitrary-attributes) section of the
-+     * Developer Guide.
-      */
- 
-+
-     /**
-      * @ngdoc directive
--     * @name form
-+     * @name input
-      * @restrict E
-      *
-      * @description
--     * Directive that instantiates
--     * {@link form.FormController FormController}.
--     *
--     * If the `name` attribute is specified, the form controller is published onto the current scope under
--     * this name.
--     *
--     * # Alias: {@link ng.directive:ngForm `ngForm`}
--     *
--     * In Angular forms can be nested. This means that the outer form is valid when all of the child
--     * forms are valid as well. However, browsers do not allow nesting of `<form>` elements, so
--     * Angular provides the {@link ng.directive:ngForm `ngForm`} directive which behaves identically to
--     * `<form>` but can be nested.  This allows you to have nested forms, which is very useful when
--     * using Angular validation directives in forms that are dynamically generated using the
--     * {@link ng.directive:ngRepeat `ngRepeat`} directive. Since you cannot dynamically generate the `name`
--     * attribute of input elements using interpolation, you have to wrap each set of repeated inputs in an
--     * `ngForm` directive and nest these in an outer `form` element.
--     *
--     *
--     * # CSS classes
--     *  - `ng-valid` is set if the form is valid.
--     *  - `ng-invalid` is set if the form is invalid.
--     *  - `ng-pristine` is set if the form is pristine.
--     *  - `ng-dirty` is set if the form is dirty.
-+     * HTML input element control. When used together with {@link ngModel `ngModel`}, it provides data-binding,
-+     * input state control, and validation.
-+     * Input control follows HTML5 input types and polyfills the HTML5 validation behavior for older browsers.
-      *
--     * Keep in mind that ngAnimate can detect each of these classes when added and removed.
-+     * <div class="alert alert-warning">
-+     * **Note:** Not every feature offered is available for all input types.
-+     * Specifically, data binding and event handling via `ng-model` is unsupported for `input[file]`.
-+     * </div>
-      *
-+     * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+     * @param {string=} name Property name of the form under which the control is published.
-+     * @param {string=} required Sets `required` validation error key if the value is not entered.
-+     * @param {boolean=} ngRequired Sets `required` attribute if set to true
-+     * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-+     *    minlength.
-+     * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-+     *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
-+     *    length.
-+     * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
-+     *    value does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
-+     *    If the expression evaluates to a RegExp object, then this is used directly.
-+     *    If the expression evaluates to a string, then it will be converted to a RegExp
-+     *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
-+     *    `new RegExp('^abc$')`.<br />
-+     *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
-+     *    start at the index of the last search's match, thus not taking the whole input value into
-+     *    account.
-+     * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
-+     *    interaction with the input element.
-+     * @param {boolean=} [ngTrim=true] If set to false AngularJS will not automatically trim the input.
-+     *    This parameter is ignored for input[type=password] controls, which will never trim the
-+     *    input.
-      *
--     * # Submitting a form and preventing the default action
-+     * @example
-+     <example name="input-directive" module="inputExample">
-+     <file name="index.html">
-+     <script>
-+     angular.module('inputExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+              $scope.user = {name: 'guest', last: 'visitor'};
-+            }]);
-+     </script>
-+     <div ng-controller="ExampleController">
-+     <form name="myForm">
-+     <label>
-+     User name:
-+     <input type="text" name="userName" ng-model="user.name" required>
-+     </label>
-+     <div role="alert">
-+     <span class="error" ng-show="myForm.userName.$error.required">
-+     Required!</span>
-+     </div>
-+     <label>
-+     Last name:
-+     <input type="text" name="lastName" ng-model="user.last"
-+     ng-minlength="3" ng-maxlength="10">
-+     </label>
-+     <div role="alert">
-+     <span class="error" ng-show="myForm.lastName.$error.minlength">
-+     Too short!</span>
-+     <span class="error" ng-show="myForm.lastName.$error.maxlength">
-+     Too long!</span>
-+     </div>
-+     </form>
-+     <hr>
-+     <tt>user = {{user}}</tt><br/>
-+     <tt>myForm.userName.$valid = {{myForm.userName.$valid}}</tt><br/>
-+     <tt>myForm.userName.$error = {{myForm.userName.$error}}</tt><br/>
-+     <tt>myForm.lastName.$valid = {{myForm.lastName.$valid}}</tt><br/>
-+     <tt>myForm.lastName.$error = {{myForm.lastName.$error}}</tt><br/>
-+     <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-+     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-+     <tt>myForm.$error.minlength = {{!!myForm.$error.minlength}}</tt><br/>
-+     <tt>myForm.$error.maxlength = {{!!myForm.$error.maxlength}}</tt><br/>
-+     </div>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     var user = element(by.exactBinding('user'));
-+     var userNameValid = element(by.binding('myForm.userName.$valid'));
-+     var lastNameValid = element(by.binding('myForm.lastName.$valid'));
-+     var lastNameError = element(by.binding('myForm.lastName.$error'));
-+     var formValid = element(by.binding('myForm.$valid'));
-+     var userNameInput = element(by.model('user.name'));
-+     var userLastInput = element(by.model('user.last'));
-+
-+     it('should initialize to model', function() {
-+          expect(user.getText()).toContain('{"name":"guest","last":"visitor"}');
-+          expect(userNameValid.getText()).toContain('true');
-+          expect(formValid.getText()).toContain('true');
-+        });
-+
-+     it('should be invalid if empty when required', function() {
-+          userNameInput.clear();
-+          userNameInput.sendKeys('');
-+
-+          expect(user.getText()).toContain('{"last":"visitor"}');
-+          expect(userNameValid.getText()).toContain('false');
-+          expect(formValid.getText()).toContain('false');
-+        });
-+
-+     it('should be valid if empty when min length is set', function() {
-+          userLastInput.clear();
-+          userLastInput.sendKeys('');
-+
-+          expect(user.getText()).toContain('{"name":"guest","last":""}');
-+          expect(lastNameValid.getText()).toContain('true');
-+          expect(formValid.getText()).toContain('true');
-+        });
-+
-+     it('should be invalid if less than required min length', function() {
-+          userLastInput.clear();
-+          userLastInput.sendKeys('xx');
-+
-+          expect(user.getText()).toContain('{"name":"guest"}');
-+          expect(lastNameValid.getText()).toContain('false');
-+          expect(lastNameError.getText()).toContain('minlength');
-+          expect(formValid.getText()).toContain('false');
-+        });
-+
-+     it('should be invalid if longer than max length', function() {
-+          userLastInput.clear();
-+          userLastInput.sendKeys('some ridiculously long name');
-+
-+          expect(user.getText()).toContain('{"name":"guest"}');
-+          expect(lastNameValid.getText()).toContain('false');
-+          expect(lastNameError.getText()).toContain('maxlength');
-+          expect(formValid.getText()).toContain('false');
-+        });
-+     </file>
-+     </example>
-+     */
-+    var inputDirective = ['$browser', '$sniffer', '$filter', '$parse',
-+        function($browser, $sniffer, $filter, $parse) {
-+            return {
-+                restrict: 'E',
-+                require: ['?ngModel'],
-+                link: {
-+                    pre: function(scope, element, attr, ctrls) {
-+                        if (ctrls[0]) {
-+                            (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrls[0], $sniffer,
-+                                $browser, $filter, $parse);
-+                        }
-+                    }
-+                }
-+            };
-+        }];
-+
-+
-+
-+    var CONSTANT_VALUE_REGEXP = /^(true|false|\d+)$/;
-+    /**
-+     * @ngdoc directive
-+     * @name ngValue
-+     * @restrict A
-+     * @priority 100
-      *
--     * Since the role of forms in client-side Angular applications is different than in classical
--     * roundtrip apps, it is desirable for the browser not to translate the form submission into a full
--     * page reload that sends the data to the server. Instead some javascript logic should be triggered
--     * to handle the form submission in an application-specific way.
-+     * @description
-+     * Binds the given expression to the value of the element.
-      *
--     * For this reason, Angular prevents the default action (form submission to the server) unless the
--     * `<form>` element has an `action` attribute specified.
-+     * It is mainly used on {@link input[radio] `input[radio]`} and option elements,
-+     * so that when the element is selected, the {@link ngModel `ngModel`} of that element (or its
-+     * {@link select `select`} parent element) is set to the bound value. It is especially useful
-+     * for dynamically generated lists using {@link ngRepeat `ngRepeat`}, as shown below.
-      *
--     * You can use one of the following two ways to specify what javascript method should be called when
--     * a form is submitted:
-+     * It can also be used to achieve one-way binding of a given expression to an input element
-+     * such as an `input[text]` or a `textarea`, when that element does not use ngModel.
-      *
--     * - {@link ng.directive:ngSubmit ngSubmit} directive on the form element
--     * - {@link ng.directive:ngClick ngClick} directive on the first
--     *  button or input field of type submit (input[type=submit])
-+     * @element ANY
-+     * @param {string=} ngValue AngularJS expression, whose value will be bound to the `value` attribute
-+     * and `value` property of the element.
-      *
--     * To prevent double execution of the handler, use only one of the {@link ng.directive:ngSubmit ngSubmit}
--     * or {@link ng.directive:ngClick ngClick} directives.
--     * This is because of the following form submission rules in the HTML specification:
-+     * @example
-+     <example name="ngValue-directive" module="valueExample">
-+     <file name="index.html">
-+     <script>
-+     angular.module('valueExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+              $scope.names = ['pizza', 'unicorns', 'robots'];
-+              $scope.my = { favorite: 'unicorns' };
-+            }]);
-+     </script>
-+     <form ng-controller="ExampleController">
-+     <h2>Which is your favorite?</h2>
-+     <label ng-repeat="name in names" for="{{name}}">
-+     {{name}}
-+     <input type="radio"
-+     ng-model="my.favorite"
-+     ng-value="name"
-+     id="{{name}}"
-+     name="favorite">
-+     </label>
-+     <div>You chose {{my.favorite}}</div>
-+     </form>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     var favorite = element(by.binding('my.favorite'));
-+
-+     it('should initialize to model', function() {
-+          expect(favorite.getText()).toContain('unicorns');
-+        });
-+     it('should bind the values to the inputs', function() {
-+          element.all(by.model('my.favorite')).get(0).click();
-+          expect(favorite.getText()).toContain('pizza');
-+        });
-+     </file>
-+     </example>
-+     */
-+    var ngValueDirective = function() {
-+        /**
-+         *  inputs use the value attribute as their default value if the value property is not set.
-+         *  Once the value property has been set (by adding input), it will not react to changes to
-+         *  the value attribute anymore. Setting both attribute and property fixes this behavior, and
-+         *  makes it possible to use ngValue as a sort of one-way bind.
-+         */
-+        function updateElementValue(element, attr, value) {
-+            // Support: IE9 only
-+            // In IE9 values are converted to string (e.g. `input.value = null` results in `input.value === 'null'`).
-+            var propValue = isDefined(value) ? value : (msie === 9) ? '' : null;
-+            element.prop('value', propValue);
-+            attr.$set('value', value);
-+        }
-+
-+        return {
-+            restrict: 'A',
-+            priority: 100,
-+            compile: function(tpl, tplAttr) {
-+                if (CONSTANT_VALUE_REGEXP.test(tplAttr.ngValue)) {
-+                    return function ngValueConstantLink(scope, elm, attr) {
-+                        var value = scope.$eval(attr.ngValue);
-+                        updateElementValue(elm, attr, value);
-+                    };
-+                } else {
-+                    return function ngValueLink(scope, elm, attr) {
-+                        scope.$watch(attr.ngValue, function valueWatchAction(value) {
-+                            updateElementValue(elm, attr, value);
-+                        });
-+                    };
-+                }
-+            }
-+        };
-+    };
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngBind
-+     * @restrict AC
-      *
--     * - If a form has only one input field then hitting enter in this field triggers form submit
--     * (`ngSubmit`)
--     * - if a form has 2+ input fields and no buttons or input[type=submit] then hitting enter
--     * doesn't trigger submit
--     * - if a form has one or more input fields and one or more buttons or input[type=submit] then
--     * hitting enter in any of the input fields will trigger the click handler on the *first* button or
--     * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`)
-+     * @description
-+     * The `ngBind` attribute tells AngularJS to replace the text content of the specified HTML element
-+     * with the value of a given expression, and to update the text content when the value of that
-+     * expression changes.
-      *
--     * @param {string=} name Name of the form. If specified, the form controller will be published into
--     *                       related scope, under this name.
-+     * Typically, you don't use `ngBind` directly, but instead you use the double curly markup like
-+     * `{{ expression }}` which is similar but less verbose.
-      *
--     * ## Animation Hooks
-+     * It is preferable to use `ngBind` instead of `{{ expression }}` if a template is momentarily
-+     * displayed by the browser in its raw state before AngularJS compiles it. Since `ngBind` is an
-+     * element attribute, it makes the bindings invisible to the user while the page is loading.
-      *
--     * Animations in ngForm are triggered when any of the associated CSS classes are added and removed.
--     * These classes are: `.ng-pristine`, `.ng-dirty`, `.ng-invalid` and `.ng-valid` as well as any
--     * other validations that are performed within the form. Animations in ngForm are similar to how
--     * they work in ngClass and animations can be hooked into using CSS transitions, keyframes as well
--     * as JS animations.
-+     * An alternative solution to this problem would be using the
-+     * {@link ng.directive:ngCloak ngCloak} directive.
-      *
--     * The following example shows a simple way to utilize CSS transitions to style a form element
--     * that has been rendered as invalid after it has been validated:
-      *
--     * <pre>
--     * //be sure to include ngAnimate as a module to hook into more
--     * //advanced animations
--     * .my-form {
-- *   transition:0.5s linear all;
-- *   background: white;
-- * }
--     * .my-form.ng-invalid {
-- *   background: red;
-- *   color:white;
-- * }
--     * </pre>
-+     * @element ANY
-+     * @param {expression} ngBind {@link guide/expression Expression} to evaluate.
-      *
-      * @example
--     <example deps="angular-animate.js" animations="true" fixBase="true">
-+     * Enter a name in the Live Preview text box; the greeting below the text box changes instantly.
-+     <example module="bindExample" name="ng-bind">
-      <file name="index.html">
-      <script>
--     function Ctrl($scope) {
--           $scope.userType = 'guest';
--         }
-+     angular.module('bindExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+             $scope.name = 'Whirled';
-+           }]);
-      </script>
--     <style>
--     .my-form {
--          -webkit-transition:all linear 0.5s;
--          transition:all linear 0.5s;
--          background: transparent;
--        }
--     .my-form.ng-invalid {
--          background: red;
--        }
--     </style>
--     <form name="myForm" ng-controller="Ctrl" class="my-form">
--     userType: <input name="input" ng-model="userType" required>
--     <span class="error" ng-show="myForm.input.$error.required">Required!</span><br>
--     <tt>userType = {{userType}}</tt><br>
--     <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br>
--     <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br>
--     <tt>myForm.$valid = {{myForm.$valid}}</tt><br>
--     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br>
--     </form>
-+     <div ng-controller="ExampleController">
-+     <label>Enter name: <input type="text" ng-model="name"></label><br>
-+     Hello <span ng-bind="name"></span>!
-+     </div>
-      </file>
-      <file name="protractor.js" type="protractor">
--     it('should initialize to model', function() {
--          var userType = element(by.binding('userType'));
--          var valid = element(by.binding('myForm.input.$valid'));
--
--          expect(userType.getText()).toContain('guest');
--          expect(valid.getText()).toContain('true');
--        });
--
--     it('should be invalid if empty', function() {
--          var userType = element(by.binding('userType'));
--          var valid = element(by.binding('myForm.input.$valid'));
--          var userInput = element(by.model('userType'));
--
--          userInput.clear();
--          userInput.sendKeys('');
-+     it('should check ng-bind', function() {
-+         var nameInput = element(by.model('name'));
- 
--          expect(userType.getText()).toEqual('userType =');
--          expect(valid.getText()).toContain('false');
--        });
-+         expect(element(by.binding('name')).getText()).toBe('Whirled');
-+         nameInput.clear();
-+         nameInput.sendKeys('world');
-+         expect(element(by.binding('name')).getText()).toBe('world');
-+       });
-      </file>
-      </example>
--     *
-      */
--    var formDirectiveFactory = function(isNgForm) {
--        return ['$timeout', function($timeout) {
--            var formDirective = {
--                name: 'form',
--                restrict: isNgForm ? 'EAC' : 'E',
--                controller: FormController,
--                compile: function() {
--                    return {
--                        pre: function(scope, formElement, attr, controller) {
--                            if (!attr.action) {
--                                // we can't use jq events because if a form is destroyed during submission the default
--                                // action is not prevented. see #1238
--                                //
--                                // IE 9 is not affected because it doesn't fire a submit event and try to do a full
--                                // page reload if the form was destroyed by submission of the form via a click handler
--                                // on a button in the form. Looks like an IE9 specific bug.
--                                var preventDefaultListener = function(event) {
--                                    event.preventDefault
--                                        ? event.preventDefault()
--                                        : event.returnValue = false; // IE
--                                };
--
--                                addEventListenerFn(formElement[0], 'submit', preventDefaultListener);
--
--                                // unregister the preventDefault listener so that we don't not leak memory but in a
--                                // way that will achieve the prevention of the default action.
--                                formElement.on('$destroy', function() {
--                                    $timeout(function() {
--                                        removeEventListenerFn(formElement[0], 'submit', preventDefaultListener);
--                                    }, 0, false);
--                                });
--                            }
--
--                            var parentFormCtrl = formElement.parent().controller('form'),
--                                alias = attr.name || attr.ngForm;
-+    var ngBindDirective = ['$compile', function($compile) {
-+        return {
-+            restrict: 'AC',
-+            compile: function ngBindCompile(templateElement) {
-+                $compile.$$addBindingClass(templateElement);
-+                return function ngBindLink(scope, element, attr) {
-+                    $compile.$$addBindingInfo(element, attr.ngBind);
-+                    element = element[0];
-+                    scope.$watch(attr.ngBind, function ngBindWatchAction(value) {
-+                        element.textContent = stringify(value);
-+                    });
-+                };
-+            }
-+        };
-+    }];
- 
--                            if (alias) {
--                                setter(scope, alias, controller, alias);
--                            }
--                            if (parentFormCtrl) {
--                                formElement.on('$destroy', function() {
--                                    parentFormCtrl.$removeControl(controller);
--                                    if (alias) {
--                                        setter(scope, alias, undefined, alias);
--                                    }
--                                    extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards
--                                });
--                            }
--                        }
--                    };
--                }
--            };
- 
--            return formDirective;
--        }];
--    };
-+    /**
-+     * @ngdoc directive
-+     * @name ngBindTemplate
-+     *
-+     * @description
-+     * The `ngBindTemplate` directive specifies that the element
-+     * text content should be replaced with the interpolation of the template
-+     * in the `ngBindTemplate` attribute.
-+     * Unlike `ngBind`, the `ngBindTemplate` can contain multiple `{{` `}}`
-+     * expressions. This directive is needed since some HTML elements
-+     * (such as TITLE and OPTION) cannot contain SPAN elements.
-+     *
-+     * @element ANY
-+     * @param {string} ngBindTemplate template of form
-+     *   <tt>{{</tt> <tt>expression</tt> <tt>}}</tt> to eval.
-+     *
-+     * @example
-+     * Try it here: enter text in text box and watch the greeting change.
-+     <example module="bindExample" name="ng-bind-template">
-+     <file name="index.html">
-+     <script>
-+     angular.module('bindExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+             $scope.salutation = 'Hello';
-+             $scope.name = 'World';
-+           }]);
-+     </script>
-+     <div ng-controller="ExampleController">
-+     <label>Salutation: <input type="text" ng-model="salutation"></label><br>
-+     <label>Name: <input type="text" ng-model="name"></label><br>
-+     <pre ng-bind-template="{{salutation}} {{name}}!"></pre>
-+     </div>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should check ng-bind', function() {
-+         var salutationElem = element(by.binding('salutation'));
-+         var salutationInput = element(by.model('salutation'));
-+         var nameInput = element(by.model('name'));
- 
--    var formDirective = formDirectiveFactory();
--    var ngFormDirective = formDirectiveFactory(true);
-+         expect(salutationElem.getText()).toBe('Hello World!');
- 
--    /* global
-+         salutationInput.clear();
-+         salutationInput.sendKeys('Greetings');
-+         nameInput.clear();
-+         nameInput.sendKeys('user');
- 
--     -VALID_CLASS,
--     -INVALID_CLASS,
--     -PRISTINE_CLASS,
--     -DIRTY_CLASS
-+         expect(salutationElem.getText()).toBe('Greetings user!');
-+       });
-+     </file>
-+     </example>
-      */
-+    var ngBindTemplateDirective = ['$interpolate', '$compile', function($interpolate, $compile) {
-+        return {
-+            compile: function ngBindTemplateCompile(templateElement) {
-+                $compile.$$addBindingClass(templateElement);
-+                return function ngBindTemplateLink(scope, element, attr) {
-+                    var interpolateFn = $interpolate(element.attr(attr.$attr.ngBindTemplate));
-+                    $compile.$$addBindingInfo(element, interpolateFn.expressions);
-+                    element = element[0];
-+                    attr.$observe('ngBindTemplate', function(value) {
-+                        element.textContent = isUndefined(value) ? '' : value;
-+                    });
-+                };
-+            }
-+        };
-+    }];
- 
--    var URL_REGEXP = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
--    var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*$/i;
--    var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/;
- 
--    var inputType = {
-+    /**
-+     * @ngdoc directive
-+     * @name ngBindHtml
-+     *
-+     * @description
-+     * Evaluates the expression and inserts the resulting HTML into the element in a secure way. By default,
-+     * the resulting HTML content will be sanitized using the {@link ngSanitize.$sanitize $sanitize} service.
-+     * To utilize this functionality, ensure that `$sanitize` is available, for example, by including {@link
-+        * ngSanitize} in your module's dependencies (not in core AngularJS). In order to use {@link ngSanitize}
-+     * in your module's dependencies, you need to include "angular-sanitize.js" in your application.
-+     *
-+     * You may also bypass sanitization for values you know are safe. To do so, bind to
-+     * an explicitly trusted value via {@link ng.$sce#trustAsHtml $sce.trustAsHtml}.  See the example
-+     * under {@link ng.$sce#show-me-an-example-using-sce- Strict Contextual Escaping (SCE)}.
-+     *
-+     * Note: If a `$sanitize` service is unavailable and the bound value isn't explicitly trusted, you
-+     * will have an exception (instead of an exploit.)
-+     *
-+     * @element ANY
-+     * @param {expression} ngBindHtml {@link guide/expression Expression} to evaluate.
-+     *
-+     * @example
- 
--        /**
--         * @ngdoc input
--         * @name input[text]
--         *
--         * @description
--         * Standard HTML text input with angular data binding.
--         *
--         * @param {string} ngModel Assignable angular expression to data-bind to.
--         * @param {string=} name Property name of the form under which the control is published.
--         * @param {string=} required Adds `required` validation error key if the value is not entered.
--         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
--         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
--         *    `required` when you want to data-bind to the `required` attribute.
--         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
--         *    minlength.
--         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
--         *    maxlength.
--         * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
--         *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
--         *    patterns defined as scope expressions.
--         * @param {string=} ngChange Angular expression to be executed when input changes due to user
--         *    interaction with the input element.
--         * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
--         *
--         * @example
--         <example name="text-input-directive">
--         <file name="index.html">
--         <script>
--         function Ctrl($scope) {
--             $scope.text = 'guest';
--             $scope.word = /^\s*\w*\s*$/;
--           }
--         </script>
--         <form name="myForm" ng-controller="Ctrl">
--         Single word: <input type="text" name="input" ng-model="text"
--         ng-pattern="word" required ng-trim="false">
--         <span class="error" ng-show="myForm.input.$error.required">
--         Required!</span>
--         <span class="error" ng-show="myForm.input.$error.pattern">
--         Single word only!</span>
-+     <example module="bindHtmlExample" deps="angular-sanitize.js" name="ng-bind-html">
-+     <file name="index.html">
-+     <div ng-controller="ExampleController">
-+     <p ng-bind-html="myHTML"></p>
-+     </div>
-+     </file>
- 
--         <tt>text = {{text}}</tt><br/>
--         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
--         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
--         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
--         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
--         </form>
--         </file>
--         <file name="protractor.js" type="protractor">
--         var text = element(by.binding('text'));
--         var valid = element(by.binding('myForm.input.$valid'));
--         var input = element(by.model('text'));
-+     <file name="script.js">
-+     angular.module('bindHtmlExample', ['ngSanitize'])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+           $scope.myHTML =
-+              'I am an <code>HTML</code>string with ' +
-+              '<a href="#">links!</a> and other <em>stuff</em>';
-+         }]);
-+     </file>
- 
--         it('should initialize to model', function() {
--            expect(text.getText()).toContain('guest');
--            expect(valid.getText()).toContain('true');
--          });
-+     <file name="protractor.js" type="protractor">
-+     it('should check ng-bind-html', function() {
-+         expect(element(by.binding('myHTML')).getText()).toBe(
-+             'I am an HTMLstring with links! and other stuff');
-+       });
-+     </file>
-+     </example>
-+     */
-+    var ngBindHtmlDirective = ['$sce', '$parse', '$compile', function($sce, $parse, $compile) {
-+        return {
-+            restrict: 'A',
-+            compile: function ngBindHtmlCompile(tElement, tAttrs) {
-+                var ngBindHtmlGetter = $parse(tAttrs.ngBindHtml);
-+                var ngBindHtmlWatch = $parse(tAttrs.ngBindHtml, function sceValueOf(val) {
-+                    // Unwrap the value to compare the actual inner safe value, not the wrapper object.
-+                    return $sce.valueOf(val);
-+                });
-+                $compile.$$addBindingClass(tElement);
- 
--         it('should be invalid if empty', function() {
--            input.clear();
--            input.sendKeys('');
-+                return function ngBindHtmlLink(scope, element, attr) {
-+                    $compile.$$addBindingInfo(element, attr.ngBindHtml);
- 
--            expect(text.getText()).toEqual('text =');
--            expect(valid.getText()).toContain('false');
--          });
-+                    scope.$watch(ngBindHtmlWatch, function ngBindHtmlWatchAction() {
-+                        // The watched value is the unwrapped value. To avoid re-escaping, use the direct getter.
-+                        var value = ngBindHtmlGetter(scope);
-+                        element.html($sce.getTrustedHtml(value) || '');
-+                    });
-+                };
-+            }
-+        };
-+    }];
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngChange
-+     * @restrict A
-+     *
-+     * @description
-+     * Evaluate the given expression when the user changes the input.
-+     * The expression is evaluated immediately, unlike the JavaScript onchange event
-+     * which only triggers at the end of a change (usually, when the user leaves the
-+     * form element or presses the return key).
-+     *
-+     * The `ngChange` expression is only evaluated when a change in the input value causes
-+     * a new value to be committed to the model.
-+     *
-+     * It will not be evaluated:
-+     * * if the value returned from the `$parsers` transformation pipeline has not changed
-+     * * if the input has continued to be invalid since the model will stay `null`
-+     * * if the model is changed programmatically and not by a change to the input value
-+     *
-+     *
-+     * Note, this directive requires `ngModel` to be present.
-+     *
-+     * @element ANY
-+     * @param {expression} ngChange {@link guide/expression Expression} to evaluate upon change
-+     * in input value.
-+     *
-+     * @example
-+     * <example name="ngChange-directive" module="changeExample">
-+     *   <file name="index.html">
-+     *     <script>
-+     *       angular.module('changeExample', [])
-+     *         .controller('ExampleController', ['$scope', function($scope) {
-+     *           $scope.counter = 0;
-+     *           $scope.change = function() {
-+     *             $scope.counter++;
-+     *           };
-+     *         }]);
-+     *     </script>
-+     *     <div ng-controller="ExampleController">
-+     *       <input type="checkbox" ng-model="confirmed" ng-change="change()" id="ng-change-example1" />
-+     *       <input type="checkbox" ng-model="confirmed" id="ng-change-example2" />
-+     *       <label for="ng-change-example2">Confirmed</label><br />
-+     *       <tt>debug = {{confirmed}}</tt><br/>
-+     *       <tt>counter = {{counter}}</tt><br/>
-+     *     </div>
-+     *   </file>
-+     *   <file name="protractor.js" type="protractor">
-+     *     var counter = element(by.binding('counter'));
-+     *     var debug = element(by.binding('confirmed'));
-+     *
-+     *     it('should evaluate the expression if changing from view', function() {
-+     *       expect(counter.getText()).toContain('0');
-+     *
-+     *       element(by.id('ng-change-example1')).click();
-+     *
-+     *       expect(counter.getText()).toContain('1');
-+     *       expect(debug.getText()).toContain('true');
-+     *     });
-+     *
-+     *     it('should not evaluate the expression if changing from model', function() {
-+     *       element(by.id('ng-change-example2')).click();
- 
--         it('should be invalid if multi word', function() {
--            input.clear();
--            input.sendKeys('hello world');
-+     *       expect(counter.getText()).toContain('0');
-+     *       expect(debug.getText()).toContain('true');
-+     *     });
-+     *   </file>
-+     * </example>
-+     */
-+    var ngChangeDirective = valueFn({
-+        restrict: 'A',
-+        require: 'ngModel',
-+        link: function(scope, element, attr, ctrl) {
-+            ctrl.$viewChangeListeners.push(function() {
-+                scope.$eval(attr.ngChange);
-+            });
-+        }
-+    });
- 
--            expect(valid.getText()).toContain('false');
--          });
--         </file>
--         </example>
--         */
--        'text': textInputType,
-+    /* exported
-+  ngClassDirective,
-+  ngClassEvenDirective,
-+  ngClassOddDirective
-+*/
- 
-+    function classDirective(name, selector) {
-+        name = 'ngClass' + name;
-+        var indexWatchExpression;
- 
--        /**
--         * @ngdoc input
--         * @name input[number]
--         *
--         * @description
--         * Text input with number validation and transformation. Sets the `number` validation
--         * error if not a valid number.
--         *
--         * @param {string} ngModel Assignable angular expression to data-bind to.
--         * @param {string=} name Property name of the form under which the control is published.
--         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
--         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
--         * @param {string=} required Sets `required` validation error key if the value is not entered.
--         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
--         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
--         *    `required` when you want to data-bind to the `required` attribute.
--         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
--         *    minlength.
--         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
--         *    maxlength.
--         * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
--         *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
--         *    patterns defined as scope expressions.
--         * @param {string=} ngChange Angular expression to be executed when input changes due to user
--         *    interaction with the input element.
--         *
--         * @example
--         <example name="number-input-directive">
--         <file name="index.html">
--         <script>
--         function Ctrl($scope) {
--             $scope.value = 12;
--           }
--         </script>
--         <form name="myForm" ng-controller="Ctrl">
--         Number: <input type="number" name="input" ng-model="value"
--         min="0" max="99" required>
--         <span class="error" ng-show="myForm.input.$error.required">
--         Required!</span>
--         <span class="error" ng-show="myForm.input.$error.number">
--         Not valid number!</span>
--         <tt>value = {{value}}</tt><br/>
--         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
--         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
--         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
--         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
--         </form>
--         </file>
--         <file name="protractor.js" type="protractor">
--         var value = element(by.binding('value'));
--         var valid = element(by.binding('myForm.input.$valid'));
--         var input = element(by.model('value'));
-+        return ['$parse', function($parse) {
-+            return {
-+                restrict: 'AC',
-+                link: function(scope, element, attr) {
-+                    var expression = attr[name].trim();
-+                    var isOneTime = (expression.charAt(0) === ':') && (expression.charAt(1) === ':');
- 
--         it('should initialize to model', function() {
--            expect(value.getText()).toContain('12');
--            expect(valid.getText()).toContain('true');
--          });
-+                    var watchInterceptor = isOneTime ? toFlatValue : toClassString;
-+                    var watchExpression = $parse(expression, watchInterceptor);
-+                    var watchAction = isOneTime ? ngClassOneTimeWatchAction : ngClassWatchAction;
- 
--         it('should be invalid if empty', function() {
--            input.clear();
--            input.sendKeys('');
--            expect(value.getText()).toEqual('value =');
--            expect(valid.getText()).toContain('false');
--          });
-+                    var classCounts = element.data('$classCounts');
-+                    var oldModulo = true;
-+                    var oldClassString;
- 
--         it('should be invalid if over max', function() {
--            input.clear();
--            input.sendKeys('123');
--            expect(value.getText()).toEqual('value =');
--            expect(valid.getText()).toContain('false');
--          });
--         </file>
--         </example>
--         */
--        'number': numberInputType,
-+                    if (!classCounts) {
-+                        // Use createMap() to prevent class assumptions involving property
-+                        // names in Object.prototype
-+                        classCounts = createMap();
-+                        element.data('$classCounts', classCounts);
-+                    }
- 
-+                    if (name !== 'ngClass') {
-+                        if (!indexWatchExpression) {
-+                            indexWatchExpression = $parse('$index', function moduloTwo($index) {
-+                                // eslint-disable-next-line no-bitwise
-+                                return $index & 1;
-+                            });
-+                        }
- 
--        /**
--         * @ngdoc input
--         * @name input[url]
--         *
--         * @description
--         * Text input with URL validation. Sets the `url` validation error key if the content is not a
--         * valid URL.
--         *
--         * @param {string} ngModel Assignable angular expression to data-bind to.
--         * @param {string=} name Property name of the form under which the control is published.
--         * @param {string=} required Sets `required` validation error key if the value is not entered.
--         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
--         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
--         *    `required` when you want to data-bind to the `required` attribute.
--         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
--         *    minlength.
--         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
--         *    maxlength.
--         * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
--         *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
--         *    patterns defined as scope expressions.
--         * @param {string=} ngChange Angular expression to be executed when input changes due to user
--         *    interaction with the input element.
--         *
--         * @example
--         <example name="url-input-directive">
--         <file name="index.html">
--         <script>
--         function Ctrl($scope) {
--             $scope.text = 'http://google.com';
--           }
--         </script>
--         <form name="myForm" ng-controller="Ctrl">
--         URL: <input type="url" name="input" ng-model="text" required>
--         <span class="error" ng-show="myForm.input.$error.required">
--         Required!</span>
--         <span class="error" ng-show="myForm.input.$error.url">
--         Not valid url!</span>
--         <tt>text = {{text}}</tt><br/>
--         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
--         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
--         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
--         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
--         <tt>myForm.$error.url = {{!!myForm.$error.url}}</tt><br/>
--         </form>
--         </file>
--         <file name="protractor.js" type="protractor">
--         var text = element(by.binding('text'));
--         var valid = element(by.binding('myForm.input.$valid'));
--         var input = element(by.model('text'));
-+                        scope.$watch(indexWatchExpression, ngClassIndexWatchAction);
-+                    }
- 
--         it('should initialize to model', function() {
--            expect(text.getText()).toContain('http://google.com');
--            expect(valid.getText()).toContain('true');
--          });
-+                    scope.$watch(watchExpression, watchAction, isOneTime);
- 
--         it('should be invalid if empty', function() {
--            input.clear();
--            input.sendKeys('');
-+                    function addClasses(classString) {
-+                        classString = digestClassCounts(split(classString), 1);
-+                        attr.$addClass(classString);
-+                    }
- 
--            expect(text.getText()).toEqual('text =');
--            expect(valid.getText()).toContain('false');
--          });
-+                    function removeClasses(classString) {
-+                        classString = digestClassCounts(split(classString), -1);
-+                        attr.$removeClass(classString);
-+                    }
- 
--         it('should be invalid if not url', function() {
--            input.clear();
--            input.sendKeys('box');
-+                    function updateClasses(oldClassString, newClassString) {
-+                        var oldClassArray = split(oldClassString);
-+                        var newClassArray = split(newClassString);
- 
--            expect(valid.getText()).toContain('false');
--          });
--         </file>
--         </example>
--         */
--        'url': urlInputType,
-+                        var toRemoveArray = arrayDifference(oldClassArray, newClassArray);
-+                        var toAddArray = arrayDifference(newClassArray, oldClassArray);
- 
-+                        var toRemoveString = digestClassCounts(toRemoveArray, -1);
-+                        var toAddString = digestClassCounts(toAddArray, 1);
- 
--        /**
--         * @ngdoc input
--         * @name input[email]
--         *
--         * @description
--         * Text input with email validation. Sets the `email` validation error key if not a valid email
--         * address.
--         *
--         * @param {string} ngModel Assignable angular expression to data-bind to.
--         * @param {string=} name Property name of the form under which the control is published.
--         * @param {string=} required Sets `required` validation error key if the value is not entered.
--         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
--         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
--         *    `required` when you want to data-bind to the `required` attribute.
--         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
--         *    minlength.
--         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
--         *    maxlength.
--         * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
--         *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
--         *    patterns defined as scope expressions.
--         * @param {string=} ngChange Angular expression to be executed when input changes due to user
--         *    interaction with the input element.
--         *
--         * @example
--         <example name="email-input-directive">
--         <file name="index.html">
--         <script>
--         function Ctrl($scope) {
--             $scope.text = 'me@example.com';
--         }
--         </script>
--         <form name="myForm" ng-controller="Ctrl">
--         Email: <input type="email" name="input" ng-model="text" required>
--         <span class="error" ng-show="myForm.input.$error.required">
--         Required!</span>
--         <span class="error" ng-show="myForm.input.$error.email">
--         Not valid email!</span>
--         <tt>text = {{text}}</tt><br/>
--         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
--         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
--         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
--         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
--         <tt>myForm.$error.email = {{!!myForm.$error.email}}</tt><br/>
--         </form>
--         </file>
--         <file name="protractor.js" type="protractor">
--         var text = element(by.binding('text'));
--         var valid = element(by.binding('myForm.input.$valid'));
--         var input = element(by.model('text'));
-+                        attr.$addClass(toAddString);
-+                        attr.$removeClass(toRemoveString);
-+                    }
- 
--         it('should initialize to model', function() {
--            expect(text.getText()).toContain('me@example.com');
--         expect(valid.getText()).toContain('true');
--         });
-+                    function digestClassCounts(classArray, count) {
-+                        var classesToUpdate = [];
- 
--         it('should be invalid if empty', function() {
--            input.clear();
--            input.sendKeys('');
--            expect(text.getText()).toEqual('text =');
--            expect(valid.getText()).toContain('false');
--          });
-+                        forEach(classArray, function(className) {
-+                            if (count > 0 || classCounts[className]) {
-+                                classCounts[className] = (classCounts[className] || 0) + count;
-+                                if (classCounts[className] === +(count > 0)) {
-+                                    classesToUpdate.push(className);
-+                                }
-+                            }
-+                        });
- 
--         it('should be invalid if not email', function() {
--            input.clear();
--            input.sendKeys('xxx');
-+                        return classesToUpdate.join(' ');
-+                    }
- 
--            expect(valid.getText()).toContain('false');
--          });
--         </file>
--         </example>
--         */
--        'email': emailInputType,
-+                    function ngClassIndexWatchAction(newModulo) {
-+                        // This watch-action should run before the `ngClass[OneTime]WatchAction()`, thus it
-+                        // adds/removes `oldClassString`. If the `ngClass` expression has changed as well, the
-+                        // `ngClass[OneTime]WatchAction()` will update the classes.
-+                        if (newModulo === selector) {
-+                            addClasses(oldClassString);
-+                        } else {
-+                            removeClasses(oldClassString);
-+                        }
- 
-+                        oldModulo = newModulo;
-+                    }
- 
--        /**
--         * @ngdoc input
--         * @name input[radio]
--         *
--         * @description
--         * HTML radio button.
--         *
--         * @param {string} ngModel Assignable angular expression to data-bind to.
--         * @param {string} value The value to which the expression should be set when selected.
--         * @param {string=} name Property name of the form under which the control is published.
--         * @param {string=} ngChange Angular expression to be executed when input changes due to user
--         *    interaction with the input element.
--         * @param {string} ngValue Angular expression which sets the value to which the expression should
--         *    be set when selected.
--         *
--         * @example
--         <example name="radio-input-directive">
--         <file name="index.html">
--         <script>
--         function Ctrl($scope) {
--             $scope.color = 'blue';
--             $scope.specialValue = {
--               "id": "12345",
--               "value": "green"
--             };
--           }
--         </script>
--         <form name="myForm" ng-controller="Ctrl">
--         <input type="radio" ng-model="color" value="red">  Red <br/>
--         <input type="radio" ng-model="color" ng-value="specialValue"> Green <br/>
--         <input type="radio" ng-model="color" value="blue"> Blue <br/>
--         <tt>color = {{color | json}}</tt><br/>
--         </form>
--         Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`.
--         </file>
--         <file name="protractor.js" type="protractor">
--         it('should change state', function() {
--            var color = element(by.binding('color'));
-+                    function ngClassOneTimeWatchAction(newClassValue) {
-+                        var newClassString = toClassString(newClassValue);
- 
--            expect(color.getText()).toContain('blue');
-+                        if (newClassString !== oldClassString) {
-+                            ngClassWatchAction(newClassString);
-+                        }
-+                    }
- 
--            element.all(by.model('color')).get(0).click();
-+                    function ngClassWatchAction(newClassString) {
-+                        if (oldModulo === selector) {
-+                            updateClasses(oldClassString, newClassString);
-+                        }
- 
--            expect(color.getText()).toContain('red');
--          });
--         </file>
--         </example>
--         */
--        'radio': radioInputType,
-+                        oldClassString = newClassString;
-+                    }
-+                }
-+            };
-+        }];
- 
-+        // Helpers
-+        function arrayDifference(tokens1, tokens2) {
-+            if (!tokens1 || !tokens1.length) return [];
-+            if (!tokens2 || !tokens2.length) return tokens1;
- 
--        /**
--         * @ngdoc input
--         * @name input[checkbox]
--         *
--         * @description
--         * HTML checkbox.
--         *
--         * @param {string} ngModel Assignable angular expression to data-bind to.
--         * @param {string=} name Property name of the form under which the control is published.
--         * @param {string=} ngTrueValue The value to which the expression should be set when selected.
--         * @param {string=} ngFalseValue The value to which the expression should be set when not selected.
--         * @param {string=} ngChange Angular expression to be executed when input changes due to user
--         *    interaction with the input element.
--         *
--         * @example
--         <example name="checkbox-input-directive">
--         <file name="index.html">
--         <script>
--         function Ctrl($scope) {
--             $scope.value1 = true;
--             $scope.value2 = 'YES'
--           }
--         </script>
--         <form name="myForm" ng-controller="Ctrl">
--         Value1: <input type="checkbox" ng-model="value1"> <br/>
--         Value2: <input type="checkbox" ng-model="value2"
--         ng-true-value="YES" ng-false-value="NO"> <br/>
--         <tt>value1 = {{value1}}</tt><br/>
--         <tt>value2 = {{value2}}</tt><br/>
--         </form>
--         </file>
--         <file name="protractor.js" type="protractor">
--         it('should change state', function() {
--            var value1 = element(by.binding('value1'));
--            var value2 = element(by.binding('value2'));
-+            var values = [];
- 
--            expect(value1.getText()).toContain('true');
--            expect(value2.getText()).toContain('YES');
-+            outer:
-+                for (var i = 0; i < tokens1.length; i++) {
-+                    var token = tokens1[i];
-+                    for (var j = 0; j < tokens2.length; j++) {
-+                        if (token === tokens2[j]) continue outer;
-+                    }
-+                    values.push(token);
-+                }
- 
--            element(by.model('value1')).click();
--            element(by.model('value2')).click();
-+            return values;
-+        }
- 
--            expect(value1.getText()).toContain('false');
--            expect(value2.getText()).toContain('NO');
--          });
--         </file>
--         </example>
--         */
--        'checkbox': checkboxInputType,
-+        function split(classString) {
-+            return classString && classString.split(' ');
-+        }
- 
--        'hidden': noop,
--        'button': noop,
--        'submit': noop,
--        'reset': noop,
--        'file': noop
--    };
-+        function toClassString(classValue) {
-+            var classString = classValue;
- 
--// A helper function to call $setValidity and return the value / undefined,
--// a pattern that is repeated a lot in the input validation logic.
--    function validate(ctrl, validatorName, validity, value){
--        ctrl.$setValidity(validatorName, validity);
--        return validity ? value : undefined;
--    }
-+            if (isArray(classValue)) {
-+                classString = classValue.map(toClassString).join(' ');
-+            } else if (isObject(classValue)) {
-+                classString = Object.keys(classValue).
-+                filter(function(key) { return classValue[key]; }).
-+                join(' ');
-+            }
- 
-+            return classString;
-+        }
- 
--    function addNativeHtml5Validators(ctrl, validatorName, element) {
--        var validity = element.prop('validity');
--        if (isObject(validity)) {
--            var validator = function(value) {
--                // Don't overwrite previous validation, don't consider valueMissing to apply (ng-required can
--                // perform the required validation)
--                if (!ctrl.$error[validatorName] && (validity.badInput || validity.customError ||
--                    validity.typeMismatch) && !validity.valueMissing) {
--                    ctrl.$setValidity(validatorName, false);
--                    return;
-+        function toFlatValue(classValue) {
-+            var flatValue = classValue;
-+
-+            if (isArray(classValue)) {
-+                flatValue = classValue.map(toFlatValue);
-+            } else if (isObject(classValue)) {
-+                var hasUndefined = false;
-+
-+                flatValue = Object.keys(classValue).filter(function(key) {
-+                    var value = classValue[key];
-+
-+                    if (!hasUndefined && isUndefined(value)) {
-+                        hasUndefined = true;
-+                    }
-+
-+                    return value;
-+                });
-+
-+                if (hasUndefined) {
-+                    // Prevent the `oneTimeLiteralWatchInterceptor` from unregistering
-+                    // the watcher, by including at least one `undefined` value.
-+                    flatValue.push(undefined);
-                 }
--                return value;
--            };
--            ctrl.$parsers.push(validator);
-+            }
-+
-+            return flatValue;
-         }
-     }
- 
--    function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
--        var validity = element.prop('validity');
--        // In composition mode, users are still inputing intermediate text buffer,
--        // hold the listener until composition is done.
--        // More about composition events: https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent
--        if (!$sniffer.android) {
--            var composing = false;
-+    /**
-+     * @ngdoc directive
-+     * @name ngClass
-+     * @restrict AC
-+     * @element ANY
-+     *
-+     * @description
-+     * The `ngClass` directive allows you to dynamically set CSS classes on an HTML element by databinding
-+     * an expression that represents all classes to be added.
-+     *
-+     * The directive operates in three different ways, depending on which of three types the expression
-+     * evaluates to:
-+     *
-+     * 1. If the expression evaluates to a string, the string should be one or more space-delimited class
-+     * names.
-+     *
-+     * 2. If the expression evaluates to an object, then for each key-value pair of the
-+     * object with a truthy value the corresponding key is used as a class name.
-+     *
-+     * 3. If the expression evaluates to an array, each element of the array should either be a string as in
-+     * type 1 or an object as in type 2. This means that you can mix strings and objects together in an array
-+     * to give you more control over what CSS classes appear. See the code below for an example of this.
-+     *
-+     *
-+     * The directive won't add duplicate classes if a particular class was already set.
-+     *
-+     * When the expression changes, the previously added classes are removed and only then are the
-+     * new classes added.
-+     *
-+     * @knownIssue
-+     * You should not use {@link guide/interpolation interpolation} in the value of the `class`
-+     * attribute, when using the `ngClass` directive on the same element.
-+     * See {@link guide/interpolation#known-issues here} for more info.
-+     *
-+     * @animations
-+     * | Animation                        | Occurs                              |
-+     * |----------------------------------|-------------------------------------|
-+     * | {@link ng.$animate#addClass addClass}       | just before the class is applied to the element   |
-+     * | {@link ng.$animate#removeClass removeClass} | just before the class is removed from the element |
-+     *
-+     * ### ngClass and pre-existing CSS3 Transitions/Animations
-+     The ngClass directive still supports CSS3 Transitions/Animations even if they do not follow the ngAnimate CSS naming structure.
-+     Upon animation ngAnimate will apply supplementary CSS classes to track the start and end of an animation, but this will not hinder
-+     any pre-existing CSS transitions already on the element. To get an idea of what happens during a class-based animation, be sure
-+     to view the step by step details of {@link $animate#addClass $animate.addClass} and
-+     {@link $animate#removeClass $animate.removeClass}.
-+     *
-+     * @param {expression} ngClass {@link guide/expression Expression} to eval. The result
-+     *   of the evaluation can be a string representing space delimited class
-+     *   names, an array, or a map of class names to boolean values. In the case of a map, the
-+     *   names of the properties whose values are truthy will be added as css classes to the
-+     *   element.
-+     *
-+     * @example
-+     * ### Basic
-+     <example name="ng-class">
-+     <file name="index.html">
-+     <p ng-class="{strike: deleted, bold: important, 'has-error': error}">Map Syntax Example</p>
-+     <label>
-+     <input type="checkbox" ng-model="deleted">
-+     deleted (apply "strike" class)
-+     </label><br>
-+     <label>
-+     <input type="checkbox" ng-model="important">
-+     important (apply "bold" class)
-+     </label><br>
-+     <label>
-+     <input type="checkbox" ng-model="error">
-+     error (apply "has-error" class)
-+     </label>
-+     <hr>
-+     <p ng-class="style">Using String Syntax</p>
-+     <input type="text" ng-model="style"
-+     placeholder="Type: bold strike red" aria-label="Type: bold strike red">
-+     <hr>
-+     <p ng-class="[style1, style2, style3]">Using Array Syntax</p>
-+     <input ng-model="style1"
-+     placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red"><br>
-+     <input ng-model="style2"
-+     placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 2"><br>
-+     <input ng-model="style3"
-+     placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 3"><br>
-+     <hr>
-+     <p ng-class="[style4, {orange: warning}]">Using Array and Map Syntax</p>
-+     <input ng-model="style4" placeholder="Type: bold, strike" aria-label="Type: bold, strike"><br>
-+     <label><input type="checkbox" ng-model="warning"> warning (apply "orange" class)</label>
-+     </file>
-+     <file name="style.css">
-+     .strike {
-+           text-decoration: line-through;
-+       }
-+     .bold {
-+           font-weight: bold;
-+       }
-+     .red {
-+           color: red;
-+       }
-+     .has-error {
-+           color: red;
-+           background-color: yellow;
-+       }
-+     .orange {
-+           color: orange;
-+       }
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     var ps = element.all(by.css('p'));
- 
--            element.on('compositionstart', function(data) {
--                composing = true;
--            });
-+     it('should let you toggle the class', function() {
- 
--            element.on('compositionend', function() {
--                composing = false;
--                listener();
--            });
--        }
-+         expect(ps.first().getAttribute('class')).not.toMatch(/bold/);
-+         expect(ps.first().getAttribute('class')).not.toMatch(/has-error/);
- 
--        var listener = function() {
--            if (composing) return;
--            var value = element.val();
-+         element(by.model('important')).click();
-+         expect(ps.first().getAttribute('class')).toMatch(/bold/);
- 
--            // By default we will trim the value
--            // If the attribute ng-trim exists we will avoid trimming
--            // e.g. <input ng-model="foo" ng-trim="false">
--            if (toBoolean(attr.ngTrim || 'T')) {
--                value = trim(value);
--            }
-+         element(by.model('error')).click();
-+         expect(ps.first().getAttribute('class')).toMatch(/has-error/);
-+       });
- 
--            if (ctrl.$viewValue !== value ||
--                    // If the value is still empty/falsy, and there is no `required` error, run validators
--                    // again. This enables HTML5 constraint validation errors to affect Angular validation
--                    // even when the first character entered causes an error.
--                (validity && value === '' && !validity.valueMissing)) {
--                if (scope.$$phase) {
--                    ctrl.$setViewValue(value);
--                } else {
--                    scope.$apply(function() {
--                        ctrl.$setViewValue(value);
--                    });
--                }
--            }
--        };
-+     it('should let you toggle string example', function() {
-+         expect(ps.get(1).getAttribute('class')).toBe('');
-+         element(by.model('style')).clear();
-+         element(by.model('style')).sendKeys('red');
-+         expect(ps.get(1).getAttribute('class')).toBe('red');
-+       });
- 
--        // if the browser does support "input" event, we are fine - except on IE9 which doesn't fire the
--        // input event on backspace, delete or cut
--        if ($sniffer.hasEvent('input')) {
--            element.on('input', listener);
--        } else {
--            var timeout;
-+     it('array example should have 3 classes', function() {
-+         expect(ps.get(2).getAttribute('class')).toBe('');
-+         element(by.model('style1')).sendKeys('bold');
-+         element(by.model('style2')).sendKeys('strike');
-+         element(by.model('style3')).sendKeys('red');
-+         expect(ps.get(2).getAttribute('class')).toBe('bold strike red');
-+       });
- 
--            var deferListener = function() {
--                if (!timeout) {
--                    timeout = $browser.defer(function() {
--                        listener();
--                        timeout = null;
--                    });
--                }
--            };
-+     it('array with map example should have 2 classes', function() {
-+         expect(ps.last().getAttribute('class')).toBe('');
-+         element(by.model('style4')).sendKeys('bold');
-+         element(by.model('warning')).click();
-+         expect(ps.last().getAttribute('class')).toBe('bold orange');
-+       });
-+     </file>
-+     </example>
- 
--            element.on('keydown', function(event) {
--                var key = event.keyCode;
-+     @example
-+     ### Animations
- 
--                // ignore
--                //    command            modifiers                   arrows
--                if (key === 91 || (15 < key && key < 19) || (37 <= key && key <= 40)) return;
-+     The example below demonstrates how to perform animations using ngClass.
-+
-+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-class">
-+     <file name="index.html">
-+     <input id="setbtn" type="button" value="set" ng-click="myVar='my-class'">
-+     <input id="clearbtn" type="button" value="clear" ng-click="myVar=''">
-+     <br>
-+     <span class="base-class" ng-class="myVar">Sample Text</span>
-+     </file>
-+     <file name="style.css">
-+     .base-class {
-+         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-+       }
-+
-+     .base-class.my-class {
-+         color: red;
-+         font-size:3em;
-+       }
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should check ng-class', function() {
-+         expect(element(by.css('.base-class')).getAttribute('class')).not.
-+           toMatch(/my-class/);
-+
-+         element(by.id('setbtn')).click();
-+
-+         expect(element(by.css('.base-class')).getAttribute('class')).
-+           toMatch(/my-class/);
-+
-+         element(by.id('clearbtn')).click();
-+
-+         expect(element(by.css('.base-class')).getAttribute('class')).not.
-+           toMatch(/my-class/);
-+       });
-+     </file>
-+     </example>
-+     */
-+    var ngClassDirective = classDirective('', true);
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngClassOdd
-+     * @restrict AC
-+     *
-+     * @description
-+     * The `ngClassOdd` and `ngClassEven` directives work exactly as
-+     * {@link ng.directive:ngClass ngClass}, except they work in
-+     * conjunction with `ngRepeat` and take effect only on odd (even) rows.
-+     *
-+     * This directive can be applied only within the scope of an
-+     * {@link ng.directive:ngRepeat ngRepeat}.
-+     *
-+     * @element ANY
-+     * @param {expression} ngClassOdd {@link guide/expression Expression} to eval. The result
-+     *   of the evaluation can be a string representing space delimited class names or an array.
-+     *
-+     * @example
-+     <example name="ng-class-odd">
-+     <file name="index.html">
-+     <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
-+     <li ng-repeat="name in names">
-+     <span ng-class-odd="'odd'" ng-class-even="'even'">
-+     {{name}}
-+     </span>
-+     </li>
-+     </ol>
-+     </file>
-+     <file name="style.css">
-+     .odd {
-+         color: red;
-+       }
-+     .even {
-+         color: blue;
-+       }
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should check ng-class-odd and ng-class-even', function() {
-+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
-+           toMatch(/odd/);
-+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
-+           toMatch(/even/);
-+       });
-+     </file>
-+     </example>
-+     */
-+    var ngClassOddDirective = classDirective('Odd', 0);
- 
--                deferListener();
--            });
-+    /**
-+     * @ngdoc directive
-+     * @name ngClassEven
-+     * @restrict AC
-+     *
-+     * @description
-+     * The `ngClassOdd` and `ngClassEven` directives work exactly as
-+     * {@link ng.directive:ngClass ngClass}, except they work in
-+     * conjunction with `ngRepeat` and take effect only on odd (even) rows.
-+     *
-+     * This directive can be applied only within the scope of an
-+     * {@link ng.directive:ngRepeat ngRepeat}.
-+     *
-+     * @element ANY
-+     * @param {expression} ngClassEven {@link guide/expression Expression} to eval. The
-+     *   result of the evaluation can be a string representing space delimited class names or an array.
-+     *
-+     * @example
-+     <example name="ng-class-even">
-+     <file name="index.html">
-+     <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
-+     <li ng-repeat="name in names">
-+     <span ng-class-odd="'odd'" ng-class-even="'even'">
-+     {{name}} &nbsp; &nbsp; &nbsp;
-+     </span>
-+     </li>
-+     </ol>
-+     </file>
-+     <file name="style.css">
-+     .odd {
-+         color: red;
-+       }
-+     .even {
-+         color: blue;
-+       }
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should check ng-class-odd and ng-class-even', function() {
-+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
-+           toMatch(/odd/);
-+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
-+           toMatch(/even/);
-+       });
-+     </file>
-+     </example>
-+     */
-+    var ngClassEvenDirective = classDirective('Even', 1);
- 
--            // if user modifies input value using context menu in IE, we need "paste" and "cut" events to catch it
--            if ($sniffer.hasEvent('paste')) {
--                element.on('paste cut', deferListener);
--            }
-+    /**
-+     * @ngdoc directive
-+     * @name ngCloak
-+     * @restrict AC
-+     *
-+     * @description
-+     * The `ngCloak` directive is used to prevent the AngularJS html template from being briefly
-+     * displayed by the browser in its raw (uncompiled) form while your application is loading. Use this
-+     * directive to avoid the undesirable flicker effect caused by the html template display.
-+     *
-+     * The directive can be applied to the `<body>` element, but the preferred usage is to apply
-+     * multiple `ngCloak` directives to small portions of the page to permit progressive rendering
-+     * of the browser view.
-+     *
-+     * `ngCloak` works in cooperation with the following css rule embedded within `angular.js` and
-+     * `angular.min.js`.
-+     * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
-+     *
-+     * ```css
-+     * [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
-+     *   display: none !important;
-+     * }
-+     * ```
-+     *
-+     * When this css rule is loaded by the browser, all html elements (including their children) that
-+     * are tagged with the `ngCloak` directive are hidden. When AngularJS encounters this directive
-+     * during the compilation of the template it deletes the `ngCloak` element attribute, making
-+     * the compiled element visible.
-+     *
-+     * For the best result, the `angular.js` script must be loaded in the head section of the html
-+     * document; alternatively, the css rule above must be included in the external stylesheet of the
-+     * application.
-+     *
-+     * @element ANY
-+     *
-+     * @example
-+     <example name="ng-cloak">
-+     <file name="index.html">
-+     <div id="template1" ng-cloak>{{ 'hello' }}</div>
-+     <div id="template2" class="ng-cloak">{{ 'world' }}</div>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should remove the template directive and css class', function() {
-+         expect($('#template1').getAttribute('ng-cloak')).
-+           toBeNull();
-+         expect($('#template2').getAttribute('ng-cloak')).
-+           toBeNull();
-+       });
-+     </file>
-+     </example>
-+     *
-+     */
-+    var ngCloakDirective = ngDirective({
-+        compile: function(element, attr) {
-+            attr.$set('ngCloak', undefined);
-+            element.removeClass('ng-cloak');
-         }
-+    });
- 
--        // if user paste into input using mouse on older browser
--        // or form autocomplete on newer browser, we need "change" event to catch it
--        element.on('change', listener);
-+    /**
-+     * @ngdoc directive
-+     * @name ngController
-+     *
-+     * @description
-+     * The `ngController` directive attaches a controller class to the view. This is a key aspect of how angular
-+     * supports the principles behind the Model-View-Controller design pattern.
-+     *
-+     * MVC components in angular:
-+     *
-+     * * Model — Models are the properties of a scope; scopes are attached to the DOM where scope properties
-+     *   are accessed through bindings.
-+     * * View — The template (HTML with data bindings) that is rendered into the View.
-+     * * Controller — The `ngController` directive specifies a Controller class; the class contains business
-+     *   logic behind the application to decorate the scope with functions and values
-+     *
-+     * Note that you can also attach controllers to the DOM by declaring it in a route definition
-+     * via the {@link ngRoute.$route $route} service. A common mistake is to declare the controller
-+     * again using `ng-controller` in the template itself.  This will cause the controller to be attached
-+     * and executed twice.
-+     *
-+     * @element ANY
-+     * @scope
-+     * @priority 500
-+     * @param {expression} ngController Name of a constructor function registered with the current
-+     * {@link ng.$controllerProvider $controllerProvider} or an {@link guide/expression expression}
-+     * that on the current scope evaluates to a constructor function.
-+     *
-+     * The controller instance can be published into a scope property by specifying
-+     * `ng-controller="as propertyName"`.
-+     *
-+     * If the current `$controllerProvider` is configured to use globals (via
-+     * {@link ng.$controllerProvider#allowGlobals `$controllerProvider.allowGlobals()` }), this may
-+     * also be the name of a globally accessible constructor function (deprecated, not recommended).
-+     *
-+     * @example
-+     * Here is a simple form for editing user contact information. Adding, removing, clearing, and
-+     * greeting are methods declared on the controller (see source tab). These methods can
-+     * easily be called from the AngularJS markup. Any changes to the data are automatically reflected
-+     * in the View without the need for a manual update.
-+     *
-+     * Two different declaration styles are included below:
-+     *
-+     * * one binds methods and properties directly onto the controller using `this`:
-+     * `ng-controller="SettingsController1 as settings"`
-+     * * one injects `$scope` into the controller:
-+     * `ng-controller="SettingsController2"`
-+     *
-+     * The second option is more common in the AngularJS community, and is generally used in boilerplates
-+     * and in this guide. However, there are advantages to binding properties directly to the controller
-+     * and avoiding scope.
-+     *
-+     * * Using `controller as` makes it obvious which controller you are accessing in the template when
-+     * multiple controllers apply to an element.
-+     * * If you are writing your controllers as classes you have easier access to the properties and
-+     * methods, which will appear on the scope, from inside the controller code.
-+     * * Since there is always a `.` in the bindings, you don't have to worry about prototypal
-+     * inheritance masking primitives.
-+     *
-+     * This example demonstrates the `controller as` syntax.
-+     *
-+     * <example name="ngControllerAs" module="controllerAsExample">
-+     *   <file name="index.html">
-+     *    <div id="ctrl-as-exmpl" ng-controller="SettingsController1 as settings">
-+     *      <label>Name: <input type="text" ng-model="settings.name"/></label>
-+     *      <button ng-click="settings.greet()">greet</button><br/>
-+     *      Contact:
-+     *      <ul>
-+     *        <li ng-repeat="contact in settings.contacts">
-+     *          <select ng-model="contact.type" aria-label="Contact method" id="select_{{$index}}">
-+     *             <option>phone</option>
-+     *             <option>email</option>
-+     *          </select>
-+     *          <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
-+     *          <button ng-click="settings.clearContact(contact)">clear</button>
-+     *          <button ng-click="settings.removeContact(contact)" aria-label="Remove">X</button>
-+     *        </li>
-+     *        <li><button ng-click="settings.addContact()">add</button></li>
-+     *     </ul>
-+     *    </div>
-+     *   </file>
-+     *   <file name="app.js">
-+     *    angular.module('controllerAsExample', [])
-+     *      .controller('SettingsController1', SettingsController1);
-+     *
-+     *    function SettingsController1() {
-+     *      this.name = 'John Smith';
-+     *      this.contacts = [
-+     *        {type: 'phone', value: '408 555 1212'},
-+     *        {type: 'email', value: 'john.smith@example.org'}
-+     *      ];
-+     *    }
-+     *
-+     *    SettingsController1.prototype.greet = function() {
-+     *      alert(this.name);
-+     *    };
-+     *
-+     *    SettingsController1.prototype.addContact = function() {
-+     *      this.contacts.push({type: 'email', value: 'yourname@example.org'});
-+     *    };
-+     *
-+     *    SettingsController1.prototype.removeContact = function(contactToRemove) {
-+     *     var index = this.contacts.indexOf(contactToRemove);
-+     *      this.contacts.splice(index, 1);
-+     *    };
-+     *
-+     *    SettingsController1.prototype.clearContact = function(contact) {
-+     *      contact.type = 'phone';
-+     *      contact.value = '';
-+     *    };
-+     *   </file>
-+     *   <file name="protractor.js" type="protractor">
-+     *     it('should check controller as', function() {
-+     *       var container = element(by.id('ctrl-as-exmpl'));
-+     *         expect(container.element(by.model('settings.name'))
-+     *           .getAttribute('value')).toBe('John Smith');
-+     *
-+     *       var firstRepeat =
-+     *           container.element(by.repeater('contact in settings.contacts').row(0));
-+     *       var secondRepeat =
-+     *           container.element(by.repeater('contact in settings.contacts').row(1));
-+     *
-+     *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
-+     *           .toBe('408 555 1212');
-+     *
-+     *       expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
-+     *           .toBe('john.smith@example.org');
-+     *
-+     *       firstRepeat.element(by.buttonText('clear')).click();
-+     *
-+     *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
-+     *           .toBe('');
-+     *
-+     *       container.element(by.buttonText('add')).click();
-+     *
-+     *       expect(container.element(by.repeater('contact in settings.contacts').row(2))
-+     *           .element(by.model('contact.value'))
-+     *           .getAttribute('value'))
-+     *           .toBe('yourname@example.org');
-+     *     });
-+     *   </file>
-+     * </example>
-+     *
-+     * This example demonstrates the "attach to `$scope`" style of controller.
-+     *
-+     * <example name="ngController" module="controllerExample">
-+     *  <file name="index.html">
-+     *   <div id="ctrl-exmpl" ng-controller="SettingsController2">
-+     *     <label>Name: <input type="text" ng-model="name"/></label>
-+     *     <button ng-click="greet()">greet</button><br/>
-+     *     Contact:
-+     *     <ul>
-+     *       <li ng-repeat="contact in contacts">
-+     *         <select ng-model="contact.type" id="select_{{$index}}">
-+     *            <option>phone</option>
-+     *            <option>email</option>
-+     *         </select>
-+     *         <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
-+     *         <button ng-click="clearContact(contact)">clear</button>
-+     *         <button ng-click="removeContact(contact)">X</button>
-+     *       </li>
-+     *       <li>[ <button ng-click="addContact()">add</button> ]</li>
-+     *    </ul>
-+     *   </div>
-+     *  </file>
-+     *  <file name="app.js">
-+     *   angular.module('controllerExample', [])
-+     *     .controller('SettingsController2', ['$scope', SettingsController2]);
-+     *
-+     *   function SettingsController2($scope) {
-+     *     $scope.name = 'John Smith';
-+     *     $scope.contacts = [
-+     *       {type:'phone', value:'408 555 1212'},
-+     *       {type:'email', value:'john.smith@example.org'}
-+     *     ];
-+     *
-+     *     $scope.greet = function() {
-+     *       alert($scope.name);
-+     *     };
-+     *
-+     *     $scope.addContact = function() {
-+     *       $scope.contacts.push({type:'email', value:'yourname@example.org'});
-+     *     };
-+     *
-+     *     $scope.removeContact = function(contactToRemove) {
-+     *       var index = $scope.contacts.indexOf(contactToRemove);
-+     *       $scope.contacts.splice(index, 1);
-+     *     };
-+     *
-+     *     $scope.clearContact = function(contact) {
-+     *       contact.type = 'phone';
-+     *       contact.value = '';
-+     *     };
-+     *   }
-+     *  </file>
-+     *  <file name="protractor.js" type="protractor">
-+     *    it('should check controller', function() {
-+     *      var container = element(by.id('ctrl-exmpl'));
-+     *
-+     *      expect(container.element(by.model('name'))
-+     *          .getAttribute('value')).toBe('John Smith');
-+     *
-+     *      var firstRepeat =
-+     *          container.element(by.repeater('contact in contacts').row(0));
-+     *      var secondRepeat =
-+     *          container.element(by.repeater('contact in contacts').row(1));
-+     *
-+     *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
-+     *          .toBe('408 555 1212');
-+     *      expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
-+     *          .toBe('john.smith@example.org');
-+     *
-+     *      firstRepeat.element(by.buttonText('clear')).click();
-+     *
-+     *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
-+     *          .toBe('');
-+     *
-+     *      container.element(by.buttonText('add')).click();
-+     *
-+     *      expect(container.element(by.repeater('contact in contacts').row(2))
-+     *          .element(by.model('contact.value'))
-+     *          .getAttribute('value'))
-+     *          .toBe('yourname@example.org');
-+     *    });
-+     *  </file>
-+     *</example>
- 
--        ctrl.$render = function() {
--            element.val(ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue);
-+     */
-+    var ngControllerDirective = [function() {
-+        return {
-+            restrict: 'A',
-+            scope: true,
-+            controller: '@',
-+            priority: 500
-         };
-+    }];
- 
--        // pattern validator
--        var pattern = attr.ngPattern,
--            patternValidator,
--            match;
--
--        if (pattern) {
--            var validateRegex = function(regexp, value) {
--                return validate(ctrl, 'pattern', ctrl.$isEmpty(value) || regexp.test(value), value);
--            };
--            match = pattern.match(/^\/(.*)\/([gim]*)$/);
--            if (match) {
--                pattern = new RegExp(match[1], match[2]);
--                patternValidator = function(value) {
--                    return validateRegex(pattern, value);
--                };
--            } else {
--                patternValidator = function(value) {
--                    var patternObj = scope.$eval(pattern);
--
--                    if (!patternObj || !patternObj.test) {
--                        throw minErr('ngPattern')('noregexp',
--                            'Expected {0} to be a RegExp but was {1}. Element: {2}', pattern,
--                            patternObj, startingTag(element));
--                    }
--                    return validateRegex(patternObj, value);
--                };
--            }
--
--            ctrl.$formatters.push(patternValidator);
--            ctrl.$parsers.push(patternValidator);
--        }
--
--        // min length validator
--        if (attr.ngMinlength) {
--            var minlength = int(attr.ngMinlength);
--            var minLengthValidator = function(value) {
--                return validate(ctrl, 'minlength', ctrl.$isEmpty(value) || value.length >= minlength, value);
--            };
--
--            ctrl.$parsers.push(minLengthValidator);
--            ctrl.$formatters.push(minLengthValidator);
--        }
--
--        // max length validator
--        if (attr.ngMaxlength) {
--            var maxlength = int(attr.ngMaxlength);
--            var maxLengthValidator = function(value) {
--                return validate(ctrl, 'maxlength', ctrl.$isEmpty(value) || value.length <= maxlength, value);
--            };
--
--            ctrl.$parsers.push(maxLengthValidator);
--            ctrl.$formatters.push(maxLengthValidator);
--        }
--    }
--
--    function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
--        textInputType(scope, element, attr, ctrl, $sniffer, $browser);
--
--        ctrl.$parsers.push(function(value) {
--            var empty = ctrl.$isEmpty(value);
--            if (empty || NUMBER_REGEXP.test(value)) {
--                ctrl.$setValidity('number', true);
--                return value === '' ? null : (empty ? value : parseFloat(value));
--            } else {
--                ctrl.$setValidity('number', false);
--                return undefined;
--            }
--        });
--
--        addNativeHtml5Validators(ctrl, 'number', element);
-+    /**
-+     * @ngdoc directive
-+     * @name ngCsp
-+     *
-+     * @restrict A
-+     * @element ANY
-+     * @description
-+     *
-+     * AngularJS has some features that can conflict with certain restrictions that are applied when using
-+     * [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) rules.
-+     *
-+     * If you intend to implement CSP with these rules then you must tell AngularJS not to use these
-+     * features.
-+     *
-+     * This is necessary when developing things like Google Chrome Extensions or Universal Windows Apps.
-+     *
-+     *
-+     * The following default rules in CSP affect AngularJS:
-+     *
-+     * * The use of `eval()`, `Function(string)` and similar functions to dynamically create and execute
-+     * code from strings is forbidden. AngularJS makes use of this in the {@link $parse} service to
-+     * provide a 30% increase in the speed of evaluating AngularJS expressions. (This CSP rule can be
-+     * disabled with the CSP keyword `unsafe-eval`, but it is generally not recommended as it would
-+     * weaken the protections offered by CSP.)
-+     *
-+     * * The use of inline resources, such as inline `<script>` and `<style>` elements, are forbidden.
-+     * This prevents apps from injecting custom styles directly into the document. AngularJS makes use of
-+     * this to include some CSS rules (e.g. {@link ngCloak} and {@link ngHide}). To make these
-+     * directives work when a CSP rule is blocking inline styles, you must link to the `angular-csp.css`
-+     * in your HTML manually. (This CSP rule can be disabled with the CSP keyword `unsafe-inline`, but
-+     * it is generally not recommended as it would weaken the protections offered by CSP.)
-+     *
-+     * If you do not provide `ngCsp` then AngularJS tries to autodetect if CSP is blocking dynamic code
-+     * creation from strings (e.g., `unsafe-eval` not specified in CSP header) and automatically
-+     * deactivates this feature in the {@link $parse} service. This autodetection, however, triggers a
-+     * CSP error to be logged in the console:
-+     *
-+     * ```
-+     * Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of
-+     * script in the following Content Security Policy directive: "default-src 'self'". Note that
-+     * 'script-src' was not explicitly set, so 'default-src' is used as a fallback.
-+     * ```
-+     *
-+     * This error is harmless but annoying. To prevent the error from showing up, put the `ngCsp`
-+     * directive on an element of the HTML document that appears before the `<script>` tag that loads
-+     * the `angular.js` file.
-+     *
-+     * *Note: This directive is only available in the `ng-csp` and `data-ng-csp` attribute form.*
-+     *
-+     * You can specify which of the CSP related AngularJS features should be deactivated by providing
-+     * a value for the `ng-csp` attribute. The options are as follows:
-+     *
-+     * * no-inline-style: this stops AngularJS from injecting CSS styles into the DOM
-+     *
-+     * * no-unsafe-eval: this stops AngularJS from optimizing $parse with unsafe eval of strings
-+     *
-+     * You can use these values in the following combinations:
-+     *
-+     *
-+     * * No declaration means that AngularJS will assume that you can do inline styles, but it will do
-+     * a runtime check for unsafe-eval. E.g. `<body>`. This is backwardly compatible with previous
-+     * versions of AngularJS.
-+     *
-+     * * A simple `ng-csp` (or `data-ng-csp`) attribute will tell AngularJS to deactivate both inline
-+     * styles and unsafe eval. E.g. `<body ng-csp>`. This is backwardly compatible with previous
-+     * versions of AngularJS.
-+     *
-+     * * Specifying only `no-unsafe-eval` tells AngularJS that we must not use eval, but that we can
-+     * inject inline styles. E.g. `<body ng-csp="no-unsafe-eval">`.
-+     *
-+     * * Specifying only `no-inline-style` tells AngularJS that we must not inject styles, but that we can
-+     * run eval - no automatic check for unsafe eval will occur. E.g. `<body ng-csp="no-inline-style">`
-+     *
-+     * * Specifying both `no-unsafe-eval` and `no-inline-style` tells AngularJS that we must not inject
-+     * styles nor use eval, which is the same as an empty: ng-csp.
-+     * E.g.`<body ng-csp="no-inline-style;no-unsafe-eval">`
-+     *
-+     * @example
-+     *
-+     * This example shows how to apply the `ngCsp` directive to the `html` tag.
-+     ```html
-+     <!doctype html>
-+     <html ng-app ng-csp>
-+     ...
-+     ...
-+     </html>
-+     ```
- 
--        ctrl.$formatters.push(function(value) {
--            return ctrl.$isEmpty(value) ? '' : '' + value;
--        });
-+     <!-- Note: the `.csp` suffix in the example name triggers CSP mode in our http server! -->
-+     <example name="example.csp" module="cspExample" ng-csp="true">
-+     <file name="index.html">
-+     <div ng-controller="MainController as ctrl">
-+     <div>
-+     <button ng-click="ctrl.inc()" id="inc">Increment</button>
-+     <span id="counter">
-+     {{ctrl.counter}}
-+     </span>
-+     </div>
- 
--        if (attr.min) {
--            var minValidator = function(value) {
--                var min = parseFloat(attr.min);
--                return validate(ctrl, 'min', ctrl.$isEmpty(value) || value >= min, value);
-+     <div>
-+     <button ng-click="ctrl.evil()" id="evil">Evil</button>
-+     <span id="evilError">
-+     {{ctrl.evilError}}
-+     </span>
-+     </div>
-+     </div>
-+     </file>
-+     <file name="script.js">
-+     angular.module('cspExample', [])
-+     .controller('MainController', function MainController() {
-+            this.counter = 0;
-+            this.inc = function() {
-+              this.counter++;
-             };
--
--            ctrl.$parsers.push(minValidator);
--            ctrl.$formatters.push(minValidator);
--        }
--
--        if (attr.max) {
--            var maxValidator = function(value) {
--                var max = parseFloat(attr.max);
--                return validate(ctrl, 'max', ctrl.$isEmpty(value) || value <= max, value);
-+            this.evil = function() {
-+              try {
-+                eval('1+2'); // eslint-disable-line no-eval
-+              } catch (e) {
-+                this.evilError = e.message;
-+              }
-             };
-+          });
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     var util, webdriver;
- 
--            ctrl.$parsers.push(maxValidator);
--            ctrl.$formatters.push(maxValidator);
--        }
-+     var incBtn = element(by.id('inc'));
-+     var counter = element(by.id('counter'));
-+     var evilBtn = element(by.id('evil'));
-+     var evilError = element(by.id('evilError'));
- 
--        ctrl.$formatters.push(function(value) {
--            return validate(ctrl, 'number', ctrl.$isEmpty(value) || isNumber(value), value);
-+     function getAndClearSevereErrors() {
-+        return browser.manage().logs().get('browser').then(function(browserLog) {
-+          return browserLog.filter(function(logEntry) {
-+            return logEntry.level.value > webdriver.logging.Level.WARNING.value;
-+          });
-         });
--    }
--
--    function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) {
--        textInputType(scope, element, attr, ctrl, $sniffer, $browser);
--
--        var urlValidator = function(value) {
--            return validate(ctrl, 'url', ctrl.$isEmpty(value) || URL_REGEXP.test(value), value);
--        };
--
--        ctrl.$formatters.push(urlValidator);
--        ctrl.$parsers.push(urlValidator);
--    }
--
--    function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) {
--        textInputType(scope, element, attr, ctrl, $sniffer, $browser);
--
--        var emailValidator = function(value) {
--            return validate(ctrl, 'email', ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value), value);
--        };
-+      }
- 
--        ctrl.$formatters.push(emailValidator);
--        ctrl.$parsers.push(emailValidator);
--    }
-+     function clearErrors() {
-+        getAndClearSevereErrors();
-+      }
- 
--    function radioInputType(scope, element, attr, ctrl) {
--        // make the name unique, if not defined
--        if (isUndefined(attr.name)) {
--            element.attr('name', nextUid());
--        }
-+     function expectNoErrors() {
-+        getAndClearSevereErrors().then(function(filteredLog) {
-+          expect(filteredLog.length).toEqual(0);
-+          if (filteredLog.length) {
-+            console.log('browser console errors: ' + util.inspect(filteredLog));
-+          }
-+        });
-+      }
- 
--        element.on('click', function() {
--            if (element[0].checked) {
--                scope.$apply(function() {
--                    ctrl.$setViewValue(attr.value);
--                });
-+     function expectError(regex) {
-+        getAndClearSevereErrors().then(function(filteredLog) {
-+          var found = false;
-+          filteredLog.forEach(function(log) {
-+            if (log.message.match(regex)) {
-+              found = true;
-             }
-+          });
-+          if (!found) {
-+            throw new Error('expected an error that matches ' + regex);
-+          }
-         });
-+      }
- 
--        ctrl.$render = function() {
--            var value = attr.value;
--            element[0].checked = (value == ctrl.$viewValue);
--        };
--
--        attr.$observe('value', ctrl.$render);
--    }
--
--    function checkboxInputType(scope, element, attr, ctrl) {
--        var trueValue = attr.ngTrueValue,
--            falseValue = attr.ngFalseValue;
-+     beforeEach(function() {
-+        util = require('util');
-+        webdriver = require('selenium-webdriver');
-+      });
- 
--        if (!isString(trueValue)) trueValue = true;
--        if (!isString(falseValue)) falseValue = false;
-+     // For now, we only test on Chrome,
-+     // as Safari does not load the page with Protractor's injected scripts,
-+     // and Firefox webdriver always disables content security policy (#6358)
-+     if (browser.params.browser !== 'chrome') {
-+        return;
-+      }
- 
--        element.on('click', function() {
--            scope.$apply(function() {
--                ctrl.$setViewValue(element[0].checked);
--            });
-+     it('should not report errors when the page is loaded', function() {
-+        // clear errors so we are not dependent on previous tests
-+        clearErrors();
-+        // Need to reload the page as the page is already loaded when
-+        // we come here
-+        browser.driver.getCurrentUrl().then(function(url) {
-+          browser.get(url);
-         });
-+        expectNoErrors();
-+      });
- 
--        ctrl.$render = function() {
--            element[0].checked = ctrl.$viewValue;
--        };
--
--        // Override the standard `$isEmpty` because a value of `false` means empty in a checkbox.
--        ctrl.$isEmpty = function(value) {
--            return value !== trueValue;
--        };
--
--        ctrl.$formatters.push(function(value) {
--            return value === trueValue;
--        });
-+     it('should evaluate expressions', function() {
-+        expect(counter.getText()).toEqual('0');
-+        incBtn.click();
-+        expect(counter.getText()).toEqual('1');
-+        expectNoErrors();
-+      });
- 
--        ctrl.$parsers.push(function(value) {
--            return value ? trueValue : falseValue;
--        });
--    }
-+     it('should throw and report an error when using "eval"', function() {
-+        evilBtn.click();
-+        expect(evilError.getText()).toMatch(/Content Security Policy/);
-+        expectError(/Content Security Policy/);
-+      });
-+     </file>
-+     </example>
-+     */
- 
-+// `ngCsp` is not implemented as a proper directive any more, because we need it be processed while
-+// we bootstrap the app (before `$parse` is instantiated). For this reason, we just have the `csp()`
-+// fn that looks for the `ng-csp` attribute anywhere in the current doc.
- 
-     /**
-      * @ngdoc directive
--     * @name textarea
--     * @restrict E
-+     * @name ngClick
-+     * @restrict A
-+     * @element ANY
-+     * @priority 0
-      *
-      * @description
--     * HTML textarea element control with angular data-binding. The data-binding and validation
--     * properties of this element are exactly the same as those of the
--     * {@link ng.directive:input input element}.
-+     * The ngClick directive allows you to specify custom behavior when
-+     * an element is clicked.
-      *
--     * @param {string} ngModel Assignable angular expression to data-bind to.
--     * @param {string=} name Property name of the form under which the control is published.
--     * @param {string=} required Sets `required` validation error key if the value is not entered.
--     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
--     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
--     *    `required` when you want to data-bind to the `required` attribute.
--     * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
--     *    minlength.
--     * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
--     *    maxlength.
--     * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
--     *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
--     *    patterns defined as scope expressions.
--     * @param {string=} ngChange Angular expression to be executed when input changes due to user
--     *    interaction with the input element.
-+     * @param {expression} ngClick {@link guide/expression Expression} to evaluate upon
-+     * click. ({@link guide/expression#-event- Event object is available as `$event`})
-+     *
-+     * @example
-+     <example name="ng-click">
-+     <file name="index.html">
-+     <button ng-click="count = count + 1" ng-init="count=0">
-+     Increment
-+     </button>
-+     <span>
-+     count: {{count}}
-+     </span>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should check ng-click', function() {
-+         expect(element(by.binding('count')).getText()).toMatch('0');
-+         element(by.css('button')).click();
-+         expect(element(by.binding('count')).getText()).toMatch('1');
-+       });
-+     </file>
-+     </example>
-      */
-+    /*
-+ * A collection of directives that allows creation of custom event handlers that are defined as
-+ * AngularJS expressions and are compiled and executed within the current scope.
-+ */
-+    var ngEventDirectives = {};
- 
-+// For events that might fire synchronously during DOM manipulation
-+// we need to execute their event handlers asynchronously using $evalAsync,
-+// so that they are not executed in an inconsistent state.
-+    var forceAsyncEvents = {
-+        'blur': true,
-+        'focus': true
-+    };
-+    forEach(
-+        'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
-+        function(eventName) {
-+            var directiveName = directiveNormalize('ng-' + eventName);
-+            ngEventDirectives[directiveName] = ['$parse', '$rootScope', function($parse, $rootScope) {
-+                return {
-+                    restrict: 'A',
-+                    compile: function($element, attr) {
-+                        // NOTE:
-+                        // We expose the powerful `$event` object on the scope that provides access to the Window,
-+                        // etc. This is OK, because expressions are not sandboxed any more (and the expression
-+                        // sandbox was never meant to be a security feature anyway).
-+                        var fn = $parse(attr[directiveName]);
-+                        return function ngEventHandler(scope, element) {
-+                            element.on(eventName, function(event) {
-+                                var callback = function() {
-+                                    fn(scope, {$event: event});
-+                                };
-+                                if (forceAsyncEvents[eventName] && $rootScope.$$phase) {
-+                                    scope.$evalAsync(callback);
-+                                } else {
-+                                    scope.$apply(callback);
-+                                }
-+                            });
-+                        };
-+                    }
-+                };
-+            }];
-+        }
-+    );
- 
-     /**
-      * @ngdoc directive
--     * @name input
--     * @restrict E
-+     * @name ngDblclick
-+     * @restrict A
-+     * @element ANY
-+     * @priority 0
-      *
-      * @description
--     * HTML input element control with angular data-binding. Input control follows HTML5 input types
--     * and polyfills the HTML5 validation behavior for older browsers.
-+     * The `ngDblclick` directive allows you to specify custom behavior on a dblclick event.
-      *
--     * @param {string} ngModel Assignable angular expression to data-bind to.
--     * @param {string=} name Property name of the form under which the control is published.
--     * @param {string=} required Sets `required` validation error key if the value is not entered.
--     * @param {boolean=} ngRequired Sets `required` attribute if set to true
--     * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
--     *    minlength.
--     * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
--     *    maxlength.
--     * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
--     *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
--     *    patterns defined as scope expressions.
--     * @param {string=} ngChange Angular expression to be executed when input changes due to user
--     *    interaction with the input element.
-+     * @param {expression} ngDblclick {@link guide/expression Expression} to evaluate upon
-+     * a dblclick. (The Event object is available as `$event`)
-      *
-      * @example
--     <example name="input-directive">
-+     <example name="ng-dblclick">
-      <file name="index.html">
--     <script>
--     function Ctrl($scope) {
--           $scope.user = {name: 'guest', last: 'visitor'};
--         }
--     </script>
--     <div ng-controller="Ctrl">
--     <form name="myForm">
--     User name: <input type="text" name="userName" ng-model="user.name" required>
--     <span class="error" ng-show="myForm.userName.$error.required">
--     Required!</span><br>
--     Last name: <input type="text" name="lastName" ng-model="user.last"
--     ng-minlength="3" ng-maxlength="10">
--     <span class="error" ng-show="myForm.lastName.$error.minlength">
--     Too short!</span>
--     <span class="error" ng-show="myForm.lastName.$error.maxlength">
--     Too long!</span><br>
--     </form>
--     <hr>
--     <tt>user = {{user}}</tt><br/>
--     <tt>myForm.userName.$valid = {{myForm.userName.$valid}}</tt><br>
--     <tt>myForm.userName.$error = {{myForm.userName.$error}}</tt><br>
--     <tt>myForm.lastName.$valid = {{myForm.lastName.$valid}}</tt><br>
--     <tt>myForm.lastName.$error = {{myForm.lastName.$error}}</tt><br>
--     <tt>myForm.$valid = {{myForm.$valid}}</tt><br>
--     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br>
--     <tt>myForm.$error.minlength = {{!!myForm.$error.minlength}}</tt><br>
--     <tt>myForm.$error.maxlength = {{!!myForm.$error.maxlength}}</tt><br>
--     </div>
--     </file>
--     <file name="protractor.js" type="protractor">
--     var user = element(by.binding('{{user}}'));
--     var userNameValid = element(by.binding('myForm.userName.$valid'));
--     var lastNameValid = element(by.binding('myForm.lastName.$valid'));
--     var lastNameError = element(by.binding('myForm.lastName.$error'));
--     var formValid = element(by.binding('myForm.$valid'));
--     var userNameInput = element(by.model('user.name'));
--     var userLastInput = element(by.model('user.last'));
--
--     it('should initialize to model', function() {
--          expect(user.getText()).toContain('{"name":"guest","last":"visitor"}');
--          expect(userNameValid.getText()).toContain('true');
--          expect(formValid.getText()).toContain('true');
--        });
--
--     it('should be invalid if empty when required', function() {
--          userNameInput.clear();
--          userNameInput.sendKeys('');
--
--          expect(user.getText()).toContain('{"last":"visitor"}');
--          expect(userNameValid.getText()).toContain('false');
--          expect(formValid.getText()).toContain('false');
--        });
--
--     it('should be valid if empty when min length is set', function() {
--          userLastInput.clear();
--          userLastInput.sendKeys('');
--
--          expect(user.getText()).toContain('{"name":"guest","last":""}');
--          expect(lastNameValid.getText()).toContain('true');
--          expect(formValid.getText()).toContain('true');
--        });
--
--     it('should be invalid if less than required min length', function() {
--          userLastInput.clear();
--          userLastInput.sendKeys('xx');
--
--          expect(user.getText()).toContain('{"name":"guest"}');
--          expect(lastNameValid.getText()).toContain('false');
--          expect(lastNameError.getText()).toContain('minlength');
--          expect(formValid.getText()).toContain('false');
--        });
--
--     it('should be invalid if longer than max length', function() {
--          userLastInput.clear();
--          userLastInput.sendKeys('some ridiculously long name');
--
--          expect(user.getText()).toContain('{"name":"guest"}');
--          expect(lastNameValid.getText()).toContain('false');
--          expect(lastNameError.getText()).toContain('maxlength');
--          expect(formValid.getText()).toContain('false');
--        });
-+     <button ng-dblclick="count = count + 1" ng-init="count=0">
-+     Increment (on double click)
-+     </button>
-+     count: {{count}}
-+     </file>
-+     </example>
-+     */
-+
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngMousedown
-+     * @restrict A
-+     * @element ANY
-+     * @priority 0
-+     *
-+     * @description
-+     * The ngMousedown directive allows you to specify custom behavior on mousedown event.
-+     *
-+     * @param {expression} ngMousedown {@link guide/expression Expression} to evaluate upon
-+     * mousedown. ({@link guide/expression#-event- Event object is available as `$event`})
-+     *
-+     * @example
-+     <example name="ng-mousedown">
-+     <file name="index.html">
-+     <button ng-mousedown="count = count + 1" ng-init="count=0">
-+     Increment (on mouse down)
-+     </button>
-+     count: {{count}}
-      </file>
-      </example>
-      */
--    var inputDirective = ['$browser', '$sniffer', function($browser, $sniffer) {
--        return {
--            restrict: 'E',
--            require: '?ngModel',
--            link: function(scope, element, attr, ctrl) {
--                if (ctrl) {
--                    (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrl, $sniffer,
--                        $browser);
--                }
--            }
--        };
--    }];
- 
--    var VALID_CLASS = 'ng-valid',
--        INVALID_CLASS = 'ng-invalid',
--        PRISTINE_CLASS = 'ng-pristine',
--        DIRTY_CLASS = 'ng-dirty';
- 
-     /**
--     * @ngdoc type
--     * @name ngModel.NgModelController
--     *
--     * @property {string} $viewValue Actual string value in the view.
--     * @property {*} $modelValue The value in the model, that the control is bound to.
--     * @property {Array.<Function>} $parsers Array of functions to execute, as a pipeline, whenever
--     the control reads value from the DOM.  Each function is called, in turn, passing the value
--     through to the next. The last return value is used to populate the model.
--     Used to sanitize / convert the value as well as validation. For validation,
--     the parsers should update the validity state using
--     {@link ngModel.NgModelController#$setValidity $setValidity()},
--     and return `undefined` for invalid values.
--
-+     * @ngdoc directive
-+     * @name ngMouseup
-+     * @restrict A
-+     * @element ANY
-+     * @priority 0
-      *
--     * @property {Array.<Function>} $formatters Array of functions to execute, as a pipeline, whenever
--     the model value changes. Each function is called, in turn, passing the value through to the
--     next. Used to format / convert values for display in the control and validation.
--     *      ```js
--     *      function formatter(value) {
-- *        if (value) {
-- *          return value.toUpperCase();
-- *        }
-- *      }
--     *      ngModel.$formatters.push(formatter);
--     *      ```
--     *
--     * @property {Array.<Function>} $viewChangeListeners Array of functions to execute whenever the
--     *     view value has changed. It is called with no arguments, and its return value is ignored.
--     *     This can be used in place of additional $watches against the model value.
-+     * @description
-+     * Specify custom behavior on mouseup event.
-      *
--     * @property {Object} $error An object hash with all errors as keys.
-+     * @param {expression} ngMouseup {@link guide/expression Expression} to evaluate upon
-+     * mouseup. ({@link guide/expression#-event- Event object is available as `$event`})
-      *
--     * @property {boolean} $pristine True if user has not interacted with the control yet.
--     * @property {boolean} $dirty True if user has already interacted with the control.
--     * @property {boolean} $valid True if there is no error.
--     * @property {boolean} $invalid True if at least one error on the control.
-+     * @example
-+     <example name="ng-mouseup">
-+     <file name="index.html">
-+     <button ng-mouseup="count = count + 1" ng-init="count=0">
-+     Increment (on mouse up)
-+     </button>
-+     count: {{count}}
-+     </file>
-+     </example>
-+     */
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngMouseover
-+     * @restrict A
-+     * @element ANY
-+     * @priority 0
-      *
-      * @description
-+     * Specify custom behavior on mouseover event.
-      *
--     * `NgModelController` provides API for the `ng-model` directive. The controller contains
--     * services for data-binding, validation, CSS updates, and value formatting and parsing. It
--     * purposefully does not contain any logic which deals with DOM rendering or listening to
--     * DOM events. Such DOM related logic should be provided by other directives which make use of
--     * `NgModelController` for data-binding.
--     *
--     * ## Custom Control Example
--     * This example shows how to use `NgModelController` with a custom control to achieve
--     * data-binding. Notice how different directives (`contenteditable`, `ng-model`, and `required`)
--     * collaborate together to achieve the desired result.
--     *
--     * Note that `contenteditable` is an HTML5 attribute, which tells the browser to let the element
--     * contents be edited in place by the user.  This will not work on older browsers.
-+     * @param {expression} ngMouseover {@link guide/expression Expression} to evaluate upon
-+     * mouseover. ({@link guide/expression#-event- Event object is available as `$event`})
-      *
--     * <example name="NgModelController" module="customControl">
--     <file name="style.css">
--     [contenteditable] {
--        border: 1px solid black;
--        background-color: white;
--        min-height: 20px;
--      }
--
--     .ng-invalid {
--        border: 1px solid red;
--      }
--
-+     * @example
-+     <example name="ng-mouseover">
-+     <file name="index.html">
-+     <button ng-mouseover="count = count + 1" ng-init="count=0">
-+     Increment (when mouse is over)
-+     </button>
-+     count: {{count}}
-      </file>
--     <file name="script.js">
--     angular.module('customControl', []).
--     directive('contenteditable', function() {
--          return {
--            restrict: 'A', // only activate on element attribute
--            require: '?ngModel', // get a hold of NgModelController
--            link: function(scope, element, attrs, ngModel) {
--              if(!ngModel) return; // do nothing if no ng-model
--
--              // Specify how UI should be updated
--              ngModel.$render = function() {
--                element.html(ngModel.$viewValue || '');
--              };
-+     </example>
-+     */
- 
--              // Listen for change events to enable binding
--              element.on('blur keyup change', function() {
--                scope.$apply(read);
--              });
--              read(); // initialize
- 
--              // Write data to the model
--              function read() {
--                var html = element.html();
--                // When we clear the content editable the browser leaves a <br> behind
--                // If strip-br attribute is provided then we strip this out
--                if( attrs.stripBr && html == '<br>' ) {
--                  html = '';
--                }
--                ngModel.$setViewValue(html);
--              }
--            }
--          };
--        });
--     </file>
-+    /**
-+     * @ngdoc directive
-+     * @name ngMouseenter
-+     * @restrict A
-+     * @element ANY
-+     * @priority 0
-+     *
-+     * @description
-+     * Specify custom behavior on mouseenter event.
-+     *
-+     * @param {expression} ngMouseenter {@link guide/expression Expression} to evaluate upon
-+     * mouseenter. ({@link guide/expression#-event- Event object is available as `$event`})
-+     *
-+     * @example
-+     <example name="ng-mouseenter">
-      <file name="index.html">
--     <form name="myForm">
--     <div contenteditable
--     name="myWidget" ng-model="userContent"
--     strip-br="true"
--     required>Change me!</div>
--     <span ng-show="myForm.myWidget.$error.required">Required!</span>
--     <hr>
--     <textarea ng-model="userContent"></textarea>
--     </form>
-+     <button ng-mouseenter="count = count + 1" ng-init="count=0">
-+     Increment (when mouse enters)
-+     </button>
-+     count: {{count}}
-      </file>
--     <file name="protractor.js" type="protractor">
--     it('should data-bind and become invalid', function() {
--      if (browser.params.browser == 'safari' || browser.params.browser == 'firefox') {
--        // SafariDriver can't handle contenteditable
--        // and Firefox driver can't clear contenteditables very well
--        return;
--      }
--      var contentEditable = element(by.css('[contenteditable]'));
--      var content = 'Change me!';
-+     </example>
-+     */
- 
--      expect(contentEditable.getText()).toEqual(content);
- 
--      contentEditable.clear();
--      contentEditable.sendKeys(protractor.Key.BACK_SPACE);
--      expect(contentEditable.getText()).toEqual('');
--      expect(contentEditable.getAttribute('class')).toMatch(/ng-invalid-required/);
--    });
--     </file>
--     * </example>
-+    /**
-+     * @ngdoc directive
-+     * @name ngMouseleave
-+     * @restrict A
-+     * @element ANY
-+     * @priority 0
-+     *
-+     * @description
-+     * Specify custom behavior on mouseleave event.
-      *
-+     * @param {expression} ngMouseleave {@link guide/expression Expression} to evaluate upon
-+     * mouseleave. ({@link guide/expression#-event- Event object is available as `$event`})
-      *
-+     * @example
-+     <example name="ng-mouseleave">
-+     <file name="index.html">
-+     <button ng-mouseleave="count = count + 1" ng-init="count=0">
-+     Increment (when mouse leaves)
-+     </button>
-+     count: {{count}}
-+     </file>
-+     </example>
-      */
--    var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse', '$animate',
--        function($scope, $exceptionHandler, $attr, $element, $parse, $animate) {
--            this.$viewValue = Number.NaN;
--            this.$modelValue = Number.NaN;
--            this.$parsers = [];
--            this.$formatters = [];
--            this.$viewChangeListeners = [];
--            this.$pristine = true;
--            this.$dirty = false;
--            this.$valid = true;
--            this.$invalid = false;
--            this.$name = $attr.name;
--
--            var ngModelGet = $parse($attr.ngModel),
--                ngModelSet = ngModelGet.assign;
--
--            if (!ngModelSet) {
--                throw minErr('ngModel')('nonassign', "Expression '{0}' is non-assignable. Element: {1}",
--                    $attr.ngModel, startingTag($element));
--            }
--
--            /**
--             * @ngdoc method
--             * @name ngModel.NgModelController#$render
--             *
--             * @description
--             * Called when the view needs to be updated. It is expected that the user of the ng-model
--             * directive will implement this method.
--             */
--            this.$render = noop;
--
--            /**
--             * @ngdoc method
--             * @name ngModel.NgModelController#$isEmpty
--             *
--             * @description
--             * This is called when we need to determine if the value of the input is empty.
--             *
--             * For instance, the required directive does this to work out if the input has data or not.
--             * The default `$isEmpty` function checks whether the value is `undefined`, `''`, `null` or `NaN`.
--             *
--             * You can override this for input directives whose concept of being empty is different to the
--             * default. The `checkboxInputType` directive does this because in its case a value of `false`
--             * implies empty.
--             *
--             * @param {*} value Reference to check.
--             * @returns {boolean} True if `value` is empty.
--             */
--            this.$isEmpty = function(value) {
--                return isUndefined(value) || value === '' || value === null || value !== value;
--            };
--
--            var parentForm = $element.inheritedData('$formController') || nullFormCtrl,
--                invalidCount = 0, // used to easily determine if we are valid
--                $error = this.$error = {}; // keep invalid keys here
--
--
--            // Setup initial state of the control
--            $element.addClass(PRISTINE_CLASS);
--            toggleValidCss(true);
--
--            // convenience method for easy toggling of classes
--            function toggleValidCss(isValid, validationErrorKey) {
--                validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
--                $animate.removeClass($element, (isValid ? INVALID_CLASS : VALID_CLASS) + validationErrorKey);
--                $animate.addClass($element, (isValid ? VALID_CLASS : INVALID_CLASS) + validationErrorKey);
--            }
--
--            /**
--             * @ngdoc method
--             * @name ngModel.NgModelController#$setValidity
--             *
--             * @description
--             * Change the validity state, and notifies the form when the control changes validity. (i.e. it
--             * does not notify form if given validator is already marked as invalid).
--             *
--             * This method should be called by validators - i.e. the parser or formatter functions.
--             *
--             * @param {string} validationErrorKey Name of the validator. the `validationErrorKey` will assign
--             *        to `$error[validationErrorKey]=isValid` so that it is available for data-binding.
--             *        The `validationErrorKey` should be in camelCase and will get converted into dash-case
--             *        for class name. Example: `myError` will result in `ng-valid-my-error` and `ng-invalid-my-error`
--             *        class and can be bound to as  `{{someForm.someControl.$error.myError}}` .
--             * @param {boolean} isValid Whether the current state is valid (true) or invalid (false).
--             */
--            this.$setValidity = function(validationErrorKey, isValid) {
--                // Purposeful use of ! here to cast isValid to boolean in case it is undefined
--                // jshint -W018
--                if ($error[validationErrorKey] === !isValid) return;
--                // jshint +W018
--
--                if (isValid) {
--                    if ($error[validationErrorKey]) invalidCount--;
--                    if (!invalidCount) {
--                        toggleValidCss(true);
--                        this.$valid = true;
--                        this.$invalid = false;
--                    }
--                } else {
--                    toggleValidCss(false);
--                    this.$invalid = true;
--                    this.$valid = false;
--                    invalidCount++;
--                }
--
--                $error[validationErrorKey] = !isValid;
--                toggleValidCss(isValid, validationErrorKey);
--
--                parentForm.$setValidity(validationErrorKey, isValid, this);
--            };
--
--            /**
--             * @ngdoc method
--             * @name ngModel.NgModelController#$setPristine
--             *
--             * @description
--             * Sets the control to its pristine state.
--             *
--             * This method can be called to remove the 'ng-dirty' class and set the control to its pristine
--             * state (ng-pristine class).
--             */
--            this.$setPristine = function () {
--                this.$dirty = false;
--                this.$pristine = true;
--                $animate.removeClass($element, DIRTY_CLASS);
--                $animate.addClass($element, PRISTINE_CLASS);
--            };
- 
--            /**
--             * @ngdoc method
--             * @name ngModel.NgModelController#$setViewValue
--             *
--             * @description
--             * Update the view value.
--             *
--             * This method should be called when the view value changes, typically from within a DOM event handler.
--             * For example {@link ng.directive:input input} and
--             * {@link ng.directive:select select} directives call it.
--             *
--             * It will update the $viewValue, then pass this value through each of the functions in `$parsers`,
--             * which includes any validators. The value that comes out of this `$parsers` pipeline, be applied to
--             * `$modelValue` and the **expression** specified in the `ng-model` attribute.
--             *
--             * Lastly, all the registered change listeners, in the `$viewChangeListeners` list, are called.
--             *
--             * Note that calling this function does not trigger a `$digest`.
--             *
--             * @param {string} value Value from the view.
--             */
--            this.$setViewValue = function(value) {
--                this.$viewValue = value;
--
--                // change to dirty
--                if (this.$pristine) {
--                    this.$dirty = true;
--                    this.$pristine = false;
--                    $animate.removeClass($element, PRISTINE_CLASS);
--                    $animate.addClass($element, DIRTY_CLASS);
--                    parentForm.$setDirty();
--                }
- 
--                forEach(this.$parsers, function(fn) {
--                    value = fn(value);
--                });
--
--                if (this.$modelValue !== value) {
--                    this.$modelValue = value;
--                    ngModelSet($scope, value);
--                    forEach(this.$viewChangeListeners, function(listener) {
--                        try {
--                            listener();
--                        } catch(e) {
--                            $exceptionHandler(e);
--                        }
--                    });
--                }
--            };
-+    /**
-+     * @ngdoc directive
-+     * @name ngMousemove
-+     * @restrict A
-+     * @element ANY
-+     * @priority 0
-+     *
-+     * @description
-+     * Specify custom behavior on mousemove event.
-+     *
-+     * @param {expression} ngMousemove {@link guide/expression Expression} to evaluate upon
-+     * mousemove. ({@link guide/expression#-event- Event object is available as `$event`})
-+     *
-+     * @example
-+     <example name="ng-mousemove">
-+     <file name="index.html">
-+     <button ng-mousemove="count = count + 1" ng-init="count=0">
-+     Increment (when mouse moves)
-+     </button>
-+     count: {{count}}
-+     </file>
-+     </example>
-+     */
- 
--            // model -> value
--            var ctrl = this;
- 
--            $scope.$watch(function ngModelWatch() {
--                var value = ngModelGet($scope);
-+    /**
-+     * @ngdoc directive
-+     * @name ngKeydown
-+     * @restrict A
-+     * @element ANY
-+     * @priority 0
-+     *
-+     * @description
-+     * Specify custom behavior on keydown event.
-+     *
-+     * @param {expression} ngKeydown {@link guide/expression Expression} to evaluate upon
-+     * keydown. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
-+     *
-+     * @example
-+     <example name="ng-keydown">
-+     <file name="index.html">
-+     <input ng-keydown="count = count + 1" ng-init="count=0">
-+     key down count: {{count}}
-+     </file>
-+     </example>
-+     */
- 
--                // if scope model value and ngModel value are out of sync
--                if (ctrl.$modelValue !== value) {
- 
--                    var formatters = ctrl.$formatters,
--                        idx = formatters.length;
-+    /**
-+     * @ngdoc directive
-+     * @name ngKeyup
-+     * @restrict A
-+     * @element ANY
-+     * @priority 0
-+     *
-+     * @description
-+     * Specify custom behavior on keyup event.
-+     *
-+     * @param {expression} ngKeyup {@link guide/expression Expression} to evaluate upon
-+     * keyup. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
-+     *
-+     * @example
-+     <example name="ng-keyup">
-+     <file name="index.html">
-+     <p>Typing in the input box below updates the key count</p>
-+     <input ng-keyup="count = count + 1" ng-init="count=0"> key up count: {{count}}
- 
--                    ctrl.$modelValue = value;
--                    while(idx--) {
--                        value = formatters[idx](value);
--                    }
-+     <p>Typing in the input box below updates the keycode</p>
-+     <input ng-keyup="event=$event">
-+     <p>event keyCode: {{ event.keyCode }}</p>
-+     <p>event altKey: {{ event.altKey }}</p>
-+     </file>
-+     </example>
-+     */
- 
--                    if (ctrl.$viewValue !== value) {
--                        ctrl.$viewValue = value;
--                        ctrl.$render();
--                    }
--                }
- 
--                return value;
--            });
--        }];
-+    /**
-+     * @ngdoc directive
-+     * @name ngKeypress
-+     * @restrict A
-+     * @element ANY
-+     *
-+     * @description
-+     * Specify custom behavior on keypress event.
-+     *
-+     * @param {expression} ngKeypress {@link guide/expression Expression} to evaluate upon
-+     * keypress. ({@link guide/expression#-event- Event object is available as `$event`}
-+     * and can be interrogated for keyCode, altKey, etc.)
-+     *
-+     * @example
-+     <example name="ng-keypress">
-+     <file name="index.html">
-+     <input ng-keypress="count = count + 1" ng-init="count=0">
-+     key press count: {{count}}
-+     </file>
-+     </example>
-+     */
- 
- 
-     /**
-      * @ngdoc directive
--     * @name ngModel
--     *
--     * @element input
-+     * @name ngSubmit
-+     * @restrict A
-+     * @element form
-+     * @priority 0
-      *
-      * @description
--     * The `ngModel` directive binds an `input`,`select`, `textarea` (or custom form control) to a
--     * property on the scope using {@link ngModel.NgModelController NgModelController},
--     * which is created and exposed by this directive.
-+     * Enables binding AngularJS expressions to onsubmit events.
-      *
--     * `ngModel` is responsible for:
-+     * Additionally it prevents the default action (which for form means sending the request to the
-+     * server and reloading the current page), but only if the form does not contain `action`,
-+     * `data-action`, or `x-action` attributes.
-      *
--     * - Binding the view into the model, which other directives such as `input`, `textarea` or `select`
--     *   require.
--     * - Providing validation behavior (i.e. required, number, email, url).
--     * - Keeping the state of the control (valid/invalid, dirty/pristine, validation errors).
--     * - Setting related css classes on the element (`ng-valid`, `ng-invalid`, `ng-dirty`, `ng-pristine`) including animations.
--     * - Registering the control with its parent {@link ng.directive:form form}.
-+     * <div class="alert alert-warning">
-+     * **Warning:** Be careful not to cause "double-submission" by using both the `ngClick` and
-+     * `ngSubmit` handlers together. See the
-+     * {@link form#submitting-a-form-and-preventing-the-default-action `form` directive documentation}
-+     * for a detailed discussion of when `ngSubmit` may be triggered.
-+     * </div>
-      *
--     * Note: `ngModel` will try to bind to the property given by evaluating the expression on the
--     * current scope. If the property doesn't already exist on this scope, it will be created
--     * implicitly and added to the scope.
-+     * @param {expression} ngSubmit {@link guide/expression Expression} to eval.
-+     * ({@link guide/expression#-event- Event object is available as `$event`})
-      *
--     * For best practices on using `ngModel`, see:
-+     * @example
-+     <example module="submitExample" name="ng-submit">
-+     <file name="index.html">
-+     <script>
-+     angular.module('submitExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+            $scope.list = [];
-+            $scope.text = 'hello';
-+            $scope.submit = function() {
-+              if ($scope.text) {
-+                $scope.list.push(this.text);
-+                $scope.text = '';
-+              }
-+            };
-+          }]);
-+     </script>
-+     <form ng-submit="submit()" ng-controller="ExampleController">
-+     Enter text and hit enter:
-+     <input type="text" ng-model="text" name="text" />
-+     <input type="submit" id="submit" value="Submit" />
-+     <pre>list={{list}}</pre>
-+     </form>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should check ng-submit', function() {
-+         expect(element(by.binding('list')).getText()).toBe('list=[]');
-+         element(by.css('#submit')).click();
-+         expect(element(by.binding('list')).getText()).toContain('hello');
-+         expect(element(by.model('text')).getAttribute('value')).toBe('');
-+       });
-+     it('should ignore empty strings', function() {
-+         expect(element(by.binding('list')).getText()).toBe('list=[]');
-+         element(by.css('#submit')).click();
-+         element(by.css('#submit')).click();
-+         expect(element(by.binding('list')).getText()).toContain('hello');
-+        });
-+     </file>
-+     </example>
-+     */
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngFocus
-+     * @restrict A
-+     * @element window, input, select, textarea, a
-+     * @priority 0
-      *
--     *  - [https://github.com/angular/angular.js/wiki/Understanding-Scopes]
-+     * @description
-+     * Specify custom behavior on focus event.
-      *
--     * For basic examples, how to use `ngModel`, see:
-+     * Note: As the `focus` event is executed synchronously when calling `input.focus()`
-+     * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
-+     * during an `$apply` to ensure a consistent state.
-      *
--     *  - {@link ng.directive:input input}
--     *    - {@link input[text] text}
--     *    - {@link input[checkbox] checkbox}
--     *    - {@link input[radio] radio}
--     *    - {@link input[number] number}
--     *    - {@link input[email] email}
--     *    - {@link input[url] url}
--     *  - {@link ng.directive:select select}
--     *  - {@link ng.directive:textarea textarea}
-+     * @param {expression} ngFocus {@link guide/expression Expression} to evaluate upon
-+     * focus. ({@link guide/expression#-event- Event object is available as `$event`})
-      *
--     * # CSS classes
--     * The following CSS classes are added and removed on the associated input/select/textarea element
--     * depending on the validity of the model.
-+     * @example
-+     * See {@link ng.directive:ngClick ngClick}
-+     */
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngBlur
-+     * @restrict A
-+     * @element window, input, select, textarea, a
-+     * @priority 0
-      *
--     *  - `ng-valid` is set if the model is valid.
--     *  - `ng-invalid` is set if the model is invalid.
--     *  - `ng-pristine` is set if the model is pristine.
--     *  - `ng-dirty` is set if the model is dirty.
-+     * @description
-+     * Specify custom behavior on blur event.
-      *
--     * Keep in mind that ngAnimate can detect each of these classes when added and removed.
-+     * A [blur event](https://developer.mozilla.org/en-US/docs/Web/Events/blur) fires when
-+     * an element has lost focus.
-      *
--     * ## Animation Hooks
-+     * Note: As the `blur` event is executed synchronously also during DOM manipulations
-+     * (e.g. removing a focussed input),
-+     * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
-+     * during an `$apply` to ensure a consistent state.
-      *
--     * Animations within models are triggered when any of the associated CSS classes are added and removed
--     * on the input element which is attached to the model. These classes are: `.ng-pristine`, `.ng-dirty`,
--     * `.ng-invalid` and `.ng-valid` as well as any other validations that are performed on the model itself.
--     * The animations that are triggered within ngModel are similar to how they work in ngClass and
--     * animations can be hooked into using CSS transitions, keyframes as well as JS animations.
-+     * @param {expression} ngBlur {@link guide/expression Expression} to evaluate upon
-+     * blur. ({@link guide/expression#-event- Event object is available as `$event`})
-      *
--     * The following example shows a simple way to utilize CSS transitions to style an input element
--     * that has been rendered as invalid after it has been validated:
-+     * @example
-+     * See {@link ng.directive:ngClick ngClick}
-+     */
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngCopy
-+     * @restrict A
-+     * @element window, input, select, textarea, a
-+     * @priority 0
-      *
--     * <pre>
--     * //be sure to include ngAnimate as a module to hook into more
--     * //advanced animations
--     * .my-input {
-- *   transition:0.5s linear all;
-- *   background: white;
-- * }
--     * .my-input.ng-invalid {
-- *   background: red;
-- *   color:white;
-- * }
--     * </pre>
-+     * @description
-+     * Specify custom behavior on copy event.
-+     *
-+     * @param {expression} ngCopy {@link guide/expression Expression} to evaluate upon
-+     * copy. ({@link guide/expression#-event- Event object is available as `$event`})
-      *
-      * @example
--     * <example deps="angular-animate.js" animations="true" fixBase="true">
-+     <example name="ng-copy">
-      <file name="index.html">
--     <script>
--     function Ctrl($scope) {
--          $scope.val = '1';
--        }
--     </script>
--     <style>
--     .my-input {
--           -webkit-transition:all linear 0.5s;
--           transition:all linear 0.5s;
--           background: transparent;
--         }
--     .my-input.ng-invalid {
--           color:white;
--           background: red;
--         }
--     </style>
--     Update input to see transitions when valid/invalid.
--     Integer is a valid value.
--     <form name="testForm" ng-controller="Ctrl">
--     <input ng-model="val" ng-pattern="/^\d+$/" name="anim" class="my-input" />
--     </form>
-+     <input ng-copy="copied=true" ng-init="copied=false; value='copy me'" ng-model="value">
-+     copied: {{copied}}
-      </file>
--     * </example>
-+     </example>
-      */
--    var ngModelDirective = function() {
--        return {
--            require: ['ngModel', '^?form'],
--            controller: NgModelController,
--            link: function(scope, element, attr, ctrls) {
--                // notify others, especially parent forms
--
--                var modelCtrl = ctrls[0],
--                    formCtrl = ctrls[1] || nullFormCtrl;
- 
--                formCtrl.$addControl(modelCtrl);
--
--                scope.$on('$destroy', function() {
--                    formCtrl.$removeControl(modelCtrl);
--                });
--            }
--        };
--    };
-+    /**
-+     * @ngdoc directive
-+     * @name ngCut
-+     * @restrict A
-+     * @element window, input, select, textarea, a
-+     * @priority 0
-+     *
-+     * @description
-+     * Specify custom behavior on cut event.
-+     *
-+     * @param {expression} ngCut {@link guide/expression Expression} to evaluate upon
-+     * cut. ({@link guide/expression#-event- Event object is available as `$event`})
-+     *
-+     * @example
-+     <example name="ng-cut">
-+     <file name="index.html">
-+     <input ng-cut="cut=true" ng-init="cut=false; value='cut me'" ng-model="value">
-+     cut: {{cut}}
-+     </file>
-+     </example>
-+     */
- 
-+    /**
-+     * @ngdoc directive
-+     * @name ngPaste
-+     * @restrict A
-+     * @element window, input, select, textarea, a
-+     * @priority 0
-+     *
-+     * @description
-+     * Specify custom behavior on paste event.
-+     *
-+     * @param {expression} ngPaste {@link guide/expression Expression} to evaluate upon
-+     * paste. ({@link guide/expression#-event- Event object is available as `$event`})
-+     *
-+     * @example
-+     <example name="ng-paste">
-+     <file name="index.html">
-+     <input ng-paste="paste=true" ng-init="paste=false" placeholder='paste here'>
-+     pasted: {{paste}}
-+     </file>
-+     </example>
-+     */
- 
-     /**
-      * @ngdoc directive
--     * @name ngChange
-+     * @name ngIf
-+     * @restrict A
-+     * @multiElement
-      *
-      * @description
--     * Evaluate the given expression when the user changes the input.
--     * The expression is evaluated immediately, unlike the JavaScript onchange event
--     * which only triggers at the end of a change (usually, when the user leaves the
--     * form element or presses the return key).
--     * The expression is not evaluated when the value change is coming from the model.
-+     * The `ngIf` directive removes or recreates a portion of the DOM tree based on an
-+     * {expression}. If the expression assigned to `ngIf` evaluates to a false
-+     * value then the element is removed from the DOM, otherwise a clone of the
-+     * element is reinserted into the DOM.
-+     *
-+     * `ngIf` differs from `ngShow` and `ngHide` in that `ngIf` completely removes and recreates the
-+     * element in the DOM rather than changing its visibility via the `display` css property.  A common
-+     * case when this difference is significant is when using css selectors that rely on an element's
-+     * position within the DOM, such as the `:first-child` or `:last-child` pseudo-classes.
-      *
--     * Note, this directive requires `ngModel` to be present.
-+     * Note that when an element is removed using `ngIf` its scope is destroyed and a new scope
-+     * is created when the element is restored.  The scope created within `ngIf` inherits from
-+     * its parent scope using
-+     * [prototypal inheritance](https://github.com/angular/angular.js/wiki/Understanding-Scopes#javascript-prototypal-inheritance).
-+     * An important implication of this is if `ngModel` is used within `ngIf` to bind to
-+     * a javascript primitive defined in the parent scope. In this case any modifications made to the
-+     * variable within the child scope will override (hide) the value in the parent scope.
-      *
--     * @element input
--     * @param {expression} ngChange {@link guide/expression Expression} to evaluate upon change
--     * in input value.
-+     * Also, `ngIf` recreates elements using their compiled state. An example of this behavior
-+     * is if an element's class attribute is directly modified after it's compiled, using something like
-+     * jQuery's `.addClass()` method, and the element is later removed. When `ngIf` recreates the element
-+     * the added class will be lost because the original compiled state is used to regenerate the element.
-      *
--     * @example
--     * <example name="ngChange-directive">
--     *   <file name="index.html">
--     *     <script>
--     *       function Controller($scope) {
-- *         $scope.counter = 0;
-- *         $scope.change = function() {
-- *           $scope.counter++;
-- *         };
-- *       }
--     *     </script>
--     *     <div ng-controller="Controller">
--     *       <input type="checkbox" ng-model="confirmed" ng-change="change()" id="ng-change-example1" />
--     *       <input type="checkbox" ng-model="confirmed" id="ng-change-example2" />
--     *       <label for="ng-change-example2">Confirmed</label><br />
--     *       <tt>debug = {{confirmed}}</tt><br/>
--     *       <tt>counter = {{counter}}</tt><br/>
--     *     </div>
--     *   </file>
--     *   <file name="protractor.js" type="protractor">
--     *     var counter = element(by.binding('counter'));
--     *     var debug = element(by.binding('confirmed'));
-+     * Additionally, you can provide animations via the `ngAnimate` module to animate the `enter`
-+     * and `leave` effects.
-      *
--     *     it('should evaluate the expression if changing from view', function() {
-- *       expect(counter.getText()).toContain('0');
-- *
-- *       element(by.id('ng-change-example1')).click();
-- *
-- *       expect(counter.getText()).toContain('1');
-- *       expect(debug.getText()).toContain('true');
-- *     });
-+     * @animations
-+     * | Animation                        | Occurs                               |
-+     * |----------------------------------|-------------------------------------|
-+     * | {@link ng.$animate#enter enter}  | just after the `ngIf` contents change and a new DOM element is created and injected into the `ngIf` container |
-+     * | {@link ng.$animate#leave leave}  | just before the `ngIf` contents are removed from the DOM |
-      *
--     *     it('should not evaluate the expression if changing from model', function() {
-- *       element(by.id('ng-change-example2')).click();
-+     * @element ANY
-+     * @scope
-+     * @priority 600
-+     * @param {expression} ngIf If the {@link guide/expression expression} is falsy then
-+     *     the element is removed from the DOM tree. If it is truthy a copy of the compiled
-+     *     element is added to the DOM tree.
-+     *
-+     * @example
-+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-if">
-+     <file name="index.html">
-+     <label>Click me: <input type="checkbox" ng-model="checked" ng-init="checked=true" /></label><br/>
-+     Show when checked:
-+     <span ng-if="checked" class="animate-if">
-+     This is removed when the checkbox is unchecked.
-+     </span>
-+     </file>
-+     <file name="animations.css">
-+     .animate-if {
-+        background:white;
-+        border:1px solid black;
-+        padding:10px;
-+      }
- 
-- *       expect(counter.getText()).toContain('0');
-- *       expect(debug.getText()).toContain('true');
-- *     });
--     *   </file>
--     * </example>
--     */
--    var ngChangeDirective = valueFn({
--        require: 'ngModel',
--        link: function(scope, element, attr, ctrl) {
--            ctrl.$viewChangeListeners.push(function() {
--                scope.$eval(attr.ngChange);
--            });
--        }
--    });
-+     .animate-if.ng-enter, .animate-if.ng-leave {
-+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-+      }
- 
-+     .animate-if.ng-enter,
-+     .animate-if.ng-leave.ng-leave-active {
-+        opacity:0;
-+      }
- 
--    var requiredDirective = function() {
-+     .animate-if.ng-leave,
-+     .animate-if.ng-enter.ng-enter-active {
-+        opacity:1;
-+      }
-+     </file>
-+     </example>
-+     */
-+    var ngIfDirective = ['$animate', '$compile', function($animate, $compile) {
-         return {
--            require: '?ngModel',
--            link: function(scope, elm, attr, ctrl) {
--                if (!ctrl) return;
--                attr.required = true; // force truthy in case we are on non input element
-+            multiElement: true,
-+            transclude: 'element',
-+            priority: 600,
-+            terminal: true,
-+            restrict: 'A',
-+            $$tlb: true,
-+            link: function($scope, $element, $attr, ctrl, $transclude) {
-+                var block, childScope, previousElements;
-+                $scope.$watch($attr.ngIf, function ngIfWatchAction(value) {
- 
--                var validator = function(value) {
--                    if (attr.required && ctrl.$isEmpty(value)) {
--                        ctrl.$setValidity('required', false);
--                        return;
-+                    if (value) {
-+                        if (!childScope) {
-+                            $transclude(function(clone, newScope) {
-+                                childScope = newScope;
-+                                clone[clone.length++] = $compile.$$createComment('end ngIf', $attr.ngIf);
-+                                // Note: We only need the first/last node of the cloned nodes.
-+                                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
-+                                // by a directive with templateUrl when its template arrives.
-+                                block = {
-+                                    clone: clone
-+                                };
-+                                $animate.enter(clone, $element.parent(), $element);
-+                            });
-+                        }
-                     } else {
--                        ctrl.$setValidity('required', true);
--                        return value;
-+                        if (previousElements) {
-+                            previousElements.remove();
-+                            previousElements = null;
-+                        }
-+                        if (childScope) {
-+                            childScope.$destroy();
-+                            childScope = null;
-+                        }
-+                        if (block) {
-+                            previousElements = getBlockNodes(block.clone);
-+                            $animate.leave(previousElements).done(function(response) {
-+                                if (response !== false) previousElements = null;
-+                            });
-+                            block = null;
-+                        }
-                     }
--                };
--
--                ctrl.$formatters.push(validator);
--                ctrl.$parsers.unshift(validator);
--
--                attr.$observe('required', function() {
--                    validator(ctrl.$viewValue);
-                 });
-             }
-         };
--    };
--
-+    }];
- 
-     /**
-      * @ngdoc directive
--     * @name ngList
-+     * @name ngInclude
-+     * @restrict ECA
-+     * @scope
-+     * @priority -400
-      *
-      * @description
--     * Text input that converts between a delimited string and an array of strings. The delimiter
--     * can be a fixed string (by default a comma) or a regular expression.
-+     * Fetches, compiles and includes an external HTML fragment.
-+     *
-+     * By default, the template URL is restricted to the same domain and protocol as the
-+     * application document. This is done by calling {@link $sce#getTrustedResourceUrl
-+ * $sce.getTrustedResourceUrl} on it. To load templates from other domains or protocols
-+     * you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist them} or
-+     * {@link $sce#trustAsResourceUrl wrap them} as trusted values. Refer to AngularJS's {@link
-+        * ng.$sce Strict Contextual Escaping}.
-+     *
-+     * In addition, the browser's
-+     * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
-+     * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
-+     * policy may further restrict whether the template is successfully loaded.
-+     * For example, `ngInclude` won't work for cross-domain requests on all browsers and for `file://`
-+     * access on some browsers.
-+     *
-+     * @animations
-+     * | Animation                        | Occurs                              |
-+     * |----------------------------------|-------------------------------------|
-+     * | {@link ng.$animate#enter enter}  | when the expression changes, on the new include |
-+     * | {@link ng.$animate#leave leave}  | when the expression changes, on the old include |
-+     *
-+     * The enter and leave animation occur concurrently.
-+     *
-+     * @param {string} ngInclude|src AngularJS expression evaluating to URL. If the source is a string constant,
-+     *                 make sure you wrap it in **single** quotes, e.g. `src="'myPartialTemplate.html'"`.
-+     * @param {string=} onload Expression to evaluate when a new partial is loaded.
-+     *                  <div class="alert alert-warning">
-+     *                  **Note:** When using onload on SVG elements in IE11, the browser will try to call
-+     *                  a function with the name on the window element, which will usually throw a
-+     *                  "function is undefined" error. To fix this, you can instead use `data-onload` or a
-+     *                  different form that {@link guide/directive#normalization matches} `onload`.
-+     *                  </div>
-      *
--     * @element input
--     * @param {string=} ngList optional delimiter that should be used to split the value. If
--     *   specified in form `/something/` then the value will be converted into a regular expression.
-+     * @param {string=} autoscroll Whether `ngInclude` should call {@link ng.$anchorScroll
-+ *                  $anchorScroll} to scroll the viewport after the content is loaded.
-+     *
-+     *                  - If the attribute is not set, disable scrolling.
-+     *                  - If the attribute is set without value, enable scrolling.
-+     *                  - Otherwise enable scrolling only if the expression evaluates to truthy value.
-      *
-      * @example
--     <example name="ngList-directive">
-+     <example module="includeExample" deps="angular-animate.js" animations="true" name="ng-include">
-      <file name="index.html">
--     <script>
--     function Ctrl($scope) {
--           $scope.names = ['igor', 'misko', 'vojta'];
--         }
--     </script>
--     <form name="myForm" ng-controller="Ctrl">
--     List: <input name="namesInput" ng-model="names" ng-list required>
--     <span class="error" ng-show="myForm.namesInput.$error.required">
--     Required!</span>
--     <br>
--     <tt>names = {{names}}</tt><br/>
--     <tt>myForm.namesInput.$valid = {{myForm.namesInput.$valid}}</tt><br/>
--     <tt>myForm.namesInput.$error = {{myForm.namesInput.$error}}</tt><br/>
--     <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
--     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
--     </form>
-+     <div ng-controller="ExampleController">
-+     <select ng-model="template" ng-options="t.name for t in templates">
-+     <option value="">(blank)</option>
-+     </select>
-+     url of the template: <code>{{template.url}}</code>
-+     <hr/>
-+     <div class="slide-animate-container">
-+     <div class="slide-animate" ng-include="template.url"></div>
-+     </div>
-+     </div>
-+     </file>
-+     <file name="script.js">
-+     angular.module('includeExample', ['ngAnimate'])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+          $scope.templates =
-+            [{ name: 'template1.html', url: 'template1.html'},
-+             { name: 'template2.html', url: 'template2.html'}];
-+          $scope.template = $scope.templates[0];
-+        }]);
-+     </file>
-+     <file name="template1.html">
-+     Content of template1.html
-+     </file>
-+     <file name="template2.html">
-+     Content of template2.html
-+     </file>
-+     <file name="animations.css">
-+     .slide-animate-container {
-+        position:relative;
-+        background:white;
-+        border:1px solid black;
-+        height:40px;
-+        overflow:hidden;
-+      }
-+
-+     .slide-animate {
-+        padding:10px;
-+      }
-+
-+     .slide-animate.ng-enter, .slide-animate.ng-leave {
-+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-+
-+        position:absolute;
-+        top:0;
-+        left:0;
-+        right:0;
-+        bottom:0;
-+        display:block;
-+        padding:10px;
-+      }
-+
-+     .slide-animate.ng-enter {
-+        top:-50px;
-+      }
-+     .slide-animate.ng-enter.ng-enter-active {
-+        top:0;
-+      }
-+
-+     .slide-animate.ng-leave {
-+        top:0;
-+      }
-+     .slide-animate.ng-leave.ng-leave-active {
-+        top:50px;
-+      }
-      </file>
-      <file name="protractor.js" type="protractor">
--     var listInput = element(by.model('names'));
--     var names = element(by.binding('{{names}}'));
--     var valid = element(by.binding('myForm.namesInput.$valid'));
--     var error = element(by.css('span.error'));
-+     var templateSelect = element(by.model('template'));
-+     var includeElem = element(by.css('[ng-include]'));
- 
--     it('should initialize to model', function() {
--          expect(names.getText()).toContain('["igor","misko","vojta"]');
--          expect(valid.getText()).toContain('true');
--          expect(error.getCssValue('display')).toBe('none');
--        });
-+     it('should load template1.html', function() {
-+        expect(includeElem.getText()).toMatch(/Content of template1.html/);
-+      });
- 
--     it('should be invalid if empty', function() {
--          listInput.clear();
--          listInput.sendKeys('');
-+     it('should load template2.html', function() {
-+        if (browser.params.browser === 'firefox') {
-+          // Firefox can't handle using selects
-+          // See https://github.com/angular/protractor/issues/480
-+          return;
-+        }
-+        templateSelect.click();
-+        templateSelect.all(by.css('option')).get(2).click();
-+        expect(includeElem.getText()).toMatch(/Content of template2.html/);
-+      });
- 
--          expect(names.getText()).toContain('');
--          expect(valid.getText()).toContain('false');
--          expect(error.getCssValue('display')).not.toBe('none');        });
-+     it('should change to blank', function() {
-+        if (browser.params.browser === 'firefox') {
-+          // Firefox can't handle using selects
-+          return;
-+        }
-+        templateSelect.click();
-+        templateSelect.all(by.css('option')).get(0).click();
-+        expect(includeElem.isPresent()).toBe(false);
-+      });
-      </file>
-      </example>
-      */
--    var ngListDirective = function() {
--        return {
--            require: 'ngModel',
--            link: function(scope, element, attr, ctrl) {
--                var match = /\/(.*)\//.exec(attr.ngList),
--                    separator = match && new RegExp(match[1]) || attr.ngList || ',';
- 
--                var parse = function(viewValue) {
--                    // If the viewValue is invalid (say required but empty) it will be `undefined`
--                    if (isUndefined(viewValue)) return;
- 
--                    var list = [];
-+    /**
-+     * @ngdoc event
-+     * @name ngInclude#$includeContentRequested
-+     * @eventType emit on the scope ngInclude was declared in
-+     * @description
-+     * Emitted every time the ngInclude content is requested.
-+     *
-+     * @param {Object} angularEvent Synthetic event object.
-+     * @param {String} src URL of content to load.
-+     */
-+
-+
-+    /**
-+     * @ngdoc event
-+     * @name ngInclude#$includeContentLoaded
-+     * @eventType emit on the current ngInclude scope
-+     * @description
-+     * Emitted every time the ngInclude content is reloaded.
-+     *
-+     * @param {Object} angularEvent Synthetic event object.
-+     * @param {String} src URL of content to load.
-+     */
-+
-+
-+    /**
-+     * @ngdoc event
-+     * @name ngInclude#$includeContentError
-+     * @eventType emit on the scope ngInclude was declared in
-+     * @description
-+     * Emitted when a template HTTP request yields an erroneous response (status < 200 || status > 299)
-+     *
-+     * @param {Object} angularEvent Synthetic event object.
-+     * @param {String} src URL of content to load.
-+     */
-+    var ngIncludeDirective = ['$templateRequest', '$anchorScroll', '$animate',
-+        function($templateRequest,   $anchorScroll,   $animate) {
-+            return {
-+                restrict: 'ECA',
-+                priority: 400,
-+                terminal: true,
-+                transclude: 'element',
-+                controller: angular.noop,
-+                compile: function(element, attr) {
-+                    var srcExp = attr.ngInclude || attr.src,
-+                        onloadExp = attr.onload || '',
-+                        autoScrollExp = attr.autoscroll;
- 
--                    if (viewValue) {
--                        forEach(viewValue.split(separator), function(value) {
--                            if (value) list.push(trim(value));
--                        });
--                    }
-+                    return function(scope, $element, $attr, ctrl, $transclude) {
-+                        var changeCounter = 0,
-+                            currentScope,
-+                            previousElement,
-+                            currentElement;
- 
--                    return list;
--                };
-+                        var cleanupLastIncludeContent = function() {
-+                            if (previousElement) {
-+                                previousElement.remove();
-+                                previousElement = null;
-+                            }
-+                            if (currentScope) {
-+                                currentScope.$destroy();
-+                                currentScope = null;
-+                            }
-+                            if (currentElement) {
-+                                $animate.leave(currentElement).done(function(response) {
-+                                    if (response !== false) previousElement = null;
-+                                });
-+                                previousElement = currentElement;
-+                                currentElement = null;
-+                            }
-+                        };
- 
--                ctrl.$parsers.push(parse);
--                ctrl.$formatters.push(function(value) {
--                    if (isArray(value)) {
--                        return value.join(', ');
--                    }
-+                        scope.$watch(srcExp, function ngIncludeWatchAction(src) {
-+                            var afterAnimation = function(response) {
-+                                if (response !== false && isDefined(autoScrollExp) &&
-+                                    (!autoScrollExp || scope.$eval(autoScrollExp))) {
-+                                    $anchorScroll();
-+                                }
-+                            };
-+                            var thisChangeId = ++changeCounter;
- 
--                    return undefined;
--                });
-+                            if (src) {
-+                                //set the 2nd param to true to ignore the template request error so that the inner
-+                                //contents and scope can be cleaned up.
-+                                $templateRequest(src, true).then(function(response) {
-+                                    if (scope.$$destroyed) return;
- 
--                // Override the standard $isEmpty because an empty array means the input is empty.
--                ctrl.$isEmpty = function(value) {
--                    return !value || !value.length;
--                };
--            }
--        };
--    };
-+                                    if (thisChangeId !== changeCounter) return;
-+                                    var newScope = scope.$new();
-+                                    ctrl.template = response;
- 
-+                                    // Note: This will also link all children of ng-include that were contained in the original
-+                                    // html. If that content contains controllers, ... they could pollute/change the scope.
-+                                    // However, using ng-include on an element with additional content does not make sense...
-+                                    // Note: We can't remove them in the cloneAttchFn of $transclude as that
-+                                    // function is called before linking the content, which would apply child
-+                                    // directives to non existing elements.
-+                                    var clone = $transclude(newScope, function(clone) {
-+                                        cleanupLastIncludeContent();
-+                                        $animate.enter(clone, null, $element).done(afterAnimation);
-+                                    });
- 
--    var CONSTANT_VALUE_REGEXP = /^(true|false|\d+)$/;
--    /**
--     * @ngdoc directive
--     * @name ngValue
--     *
--     * @description
--     * Binds the given expression to the value of `input[select]` or `input[radio]`, so
--     * that when the element is selected, the `ngModel` of that element is set to the
--     * bound value.
--     *
--     * `ngValue` is useful when dynamically generating lists of radio buttons using `ng-repeat`, as
--     * shown below.
--     *
--     * @element input
--     * @param {string=} ngValue angular expression, whose value will be bound to the `value` attribute
--     *   of the `input` element
--     *
--     * @example
--     <example name="ngValue-directive">
--     <file name="index.html">
--     <script>
--     function Ctrl($scope) {
--            $scope.names = ['pizza', 'unicorns', 'robots'];
--            $scope.my = { favorite: 'unicorns' };
--          }
--     </script>
--     <form ng-controller="Ctrl">
--     <h2>Which is your favorite?</h2>
--     <label ng-repeat="name in names" for="{{name}}">
--     {{name}}
--     <input type="radio"
--     ng-model="my.favorite"
--     ng-value="name"
--     id="{{name}}"
--     name="favorite">
--     </label>
--     <div>You chose {{my.favorite}}</div>
--     </form>
--     </file>
--     <file name="protractor.js" type="protractor">
--     var favorite = element(by.binding('my.favorite'));
-+                                    currentScope = newScope;
-+                                    currentElement = clone;
- 
--     it('should initialize to model', function() {
--          expect(favorite.getText()).toContain('unicorns');
--        });
--     it('should bind the values to the inputs', function() {
--          element.all(by.model('my.favorite')).get(0).click();
--          expect(favorite.getText()).toContain('pizza');
--        });
--     </file>
--     </example>
--     */
--    var ngValueDirective = function() {
--        return {
--            priority: 100,
--            compile: function(tpl, tplAttr) {
--                if (CONSTANT_VALUE_REGEXP.test(tplAttr.ngValue)) {
--                    return function ngValueConstantLink(scope, elm, attr) {
--                        attr.$set('value', scope.$eval(attr.ngValue));
--                    };
--                } else {
--                    return function ngValueLink(scope, elm, attr) {
--                        scope.$watch(attr.ngValue, function valueWatchAction(value) {
--                            attr.$set('value', value);
-+                                    currentScope.$emit('$includeContentLoaded', src);
-+                                    scope.$eval(onloadExp);
-+                                }, function() {
-+                                    if (scope.$$destroyed) return;
-+
-+                                    if (thisChangeId === changeCounter) {
-+                                        cleanupLastIncludeContent();
-+                                        scope.$emit('$includeContentError', src);
-+                                    }
-+                                });
-+                                scope.$emit('$includeContentRequested', src);
-+                            } else {
-+                                cleanupLastIncludeContent();
-+                                ctrl.template = null;
-+                            }
-                         });
-                     };
-                 }
--            }
--        };
--    };
-+            };
-+        }];
-+
-+// This directive is called during the $transclude call of the first `ngInclude` directive.
-+// It will replace and compile the content of the element with the loaded template.
-+// We need this directive so that the element content is already filled when
-+// the link function of another directive on the same element as ngInclude
-+// is called.
-+    var ngIncludeFillContentDirective = ['$compile',
-+        function($compile) {
-+            return {
-+                restrict: 'ECA',
-+                priority: -400,
-+                require: 'ngInclude',
-+                link: function(scope, $element, $attr, ctrl) {
-+                    if (toString.call($element[0]).match(/SVG/)) {
-+                        // WebKit: https://bugs.webkit.org/show_bug.cgi?id=135698 --- SVG elements do not
-+                        // support innerHTML, so detect this here and try to generate the contents
-+                        // specially.
-+                        $element.empty();
-+                        $compile(jqLiteBuildFragment(ctrl.template, window.document).childNodes)(scope,
-+                            function namespaceAdaptedClone(clone) {
-+                                $element.append(clone);
-+                            }, {futureParentElement: $element});
-+                        return;
-+                    }
-+
-+                    $element.html(ctrl.template);
-+                    $compile($element.contents())(scope);
-+                }
-+            };
-+        }];
- 
-     /**
-      * @ngdoc directive
--     * @name ngBind
-+     * @name ngInit
-      * @restrict AC
--     *
--     * @description
--     * The `ngBind` attribute tells Angular to replace the text content of the specified HTML element
--     * with the value of a given expression, and to update the text content when the value of that
--     * expression changes.
--     *
--     * Typically, you don't use `ngBind` directly, but instead you use the double curly markup like
--     * `{{ expression }}` which is similar but less verbose.
--     *
--     * It is preferable to use `ngBind` instead of `{{ expression }}` when a template is momentarily
--     * displayed by the browser in its raw state before Angular compiles it. Since `ngBind` is an
--     * element attribute, it makes the bindings invisible to the user while the page is loading.
--     *
--     * An alternative solution to this problem would be using the
--     * {@link ng.directive:ngCloak ngCloak} directive.
--     *
--     *
-+     * @priority 450
-      * @element ANY
--     * @param {expression} ngBind {@link guide/expression Expression} to evaluate.
-      *
--     * @example
--     * Enter a name in the Live Preview text box; the greeting below the text box changes instantly.
--     <example>
--     <file name="index.html">
--     <script>
--     function Ctrl($scope) {
--           $scope.name = 'Whirled';
--         }
--     </script>
--     <div ng-controller="Ctrl">
--     Enter name: <input type="text" ng-model="name"><br>
--     Hello <span ng-bind="name"></span>!
--     </div>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should check ng-bind', function() {
--         var nameInput = element(by.model('name'));
--
--         expect(element(by.binding('name')).getText()).toBe('Whirled');
--         nameInput.clear();
--         nameInput.sendKeys('world');
--         expect(element(by.binding('name')).getText()).toBe('world');
--       });
--     </file>
--     </example>
--     */
--    var ngBindDirective = ngDirective(function(scope, element, attr) {
--        element.addClass('ng-binding').data('$binding', attr.ngBind);
--        scope.$watch(attr.ngBind, function ngBindWatchAction(value) {
--            // We are purposefully using == here rather than === because we want to
--            // catch when value is "null or undefined"
--            // jshint -W041
--            element.text(value == undefined ? '' : value);
--        });
--    });
--
--
--    /**
--     * @ngdoc directive
--     * @name ngBindTemplate
-+     * @param {expression} ngInit {@link guide/expression Expression} to eval.
-      *
-      * @description
--     * The `ngBindTemplate` directive specifies that the element
--     * text content should be replaced with the interpolation of the template
--     * in the `ngBindTemplate` attribute.
--     * Unlike `ngBind`, the `ngBindTemplate` can contain multiple `{{` `}}`
--     * expressions. This directive is needed since some HTML elements
--     * (such as TITLE and OPTION) cannot contain SPAN elements.
-+     * The `ngInit` directive allows you to evaluate an expression in the
-+     * current scope.
-      *
--     * @element ANY
--     * @param {string} ngBindTemplate template of form
--     *   <tt>{{</tt> <tt>expression</tt> <tt>}}</tt> to eval.
-+     * <div class="alert alert-danger">
-+     * This directive can be abused to add unnecessary amounts of logic into your templates.
-+     * There are only a few appropriate uses of `ngInit`:
-+     * <ul>
-+     *   <li>aliasing special properties of {@link ng.directive:ngRepeat `ngRepeat`},
-+     *     as seen in the demo below.</li>
-+     *   <li>initializing data during development, or for examples, as seen throughout these docs.</li>
-+     *   <li>injecting data via server side scripting.</li>
-+     * </ul>
-+     *
-+     * Besides these few cases, you should use {@link guide/component Components} or
-+     * {@link guide/controller Controllers} rather than `ngInit` to initialize values on a scope.
-+     * </div>
-+     *
-+     * <div class="alert alert-warning">
-+     * **Note**: If you have assignment in `ngInit` along with a {@link ng.$filter `filter`}, make
-+     * sure you have parentheses to ensure correct operator precedence:
-+     * <pre class="prettyprint">
-+     * `<div ng-init="test1 = ($index | toString)"></div>`
-+     * </pre>
-+     * </div>
-      *
-      * @example
--     * Try it here: enter text in text box and watch the greeting change.
--     <example>
-+     <example module="initExample" name="ng-init">
-      <file name="index.html">
-      <script>
--     function Ctrl($scope) {
--           $scope.salutation = 'Hello';
--           $scope.name = 'World';
--         }
-+     angular.module('initExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+         $scope.list = [['a', 'b'], ['c', 'd']];
-+       }]);
-      </script>
--     <div ng-controller="Ctrl">
--     Salutation: <input type="text" ng-model="salutation"><br>
--     Name: <input type="text" ng-model="name"><br>
--     <pre ng-bind-template="{{salutation}} {{name}}!"></pre>
-+     <div ng-controller="ExampleController">
-+     <div ng-repeat="innerList in list" ng-init="outerIndex = $index">
-+     <div ng-repeat="value in innerList" ng-init="innerIndex = $index">
-+     <span class="example-init">list[ {{outerIndex}} ][ {{innerIndex}} ] = {{value}};</span>
-+     </div>
-+     </div>
-      </div>
-      </file>
-      <file name="protractor.js" type="protractor">
--     it('should check ng-bind', function() {
--         var salutationElem = element(by.binding('salutation'));
--         var salutationInput = element(by.model('salutation'));
--         var nameInput = element(by.model('name'));
--
--         expect(salutationElem.getText()).toBe('Hello World!');
--
--         salutationInput.clear();
--         salutationInput.sendKeys('Greetings');
--         nameInput.clear();
--         nameInput.sendKeys('user');
--
--         expect(salutationElem.getText()).toBe('Greetings user!');
-+     it('should alias index positions', function() {
-+         var elements = element.all(by.css('.example-init'));
-+         expect(elements.get(0).getText()).toBe('list[ 0 ][ 0 ] = a;');
-+         expect(elements.get(1).getText()).toBe('list[ 0 ][ 1 ] = b;');
-+         expect(elements.get(2).getText()).toBe('list[ 1 ][ 0 ] = c;');
-+         expect(elements.get(3).getText()).toBe('list[ 1 ][ 1 ] = d;');
-        });
-      </file>
-      </example>
-      */
--    var ngBindTemplateDirective = ['$interpolate', function($interpolate) {
--        return function(scope, element, attr) {
--            // TODO: move this to scenario runner
--            var interpolateFn = $interpolate(element.attr(attr.$attr.ngBindTemplate));
--            element.addClass('ng-binding').data('$binding', interpolateFn);
--            attr.$observe('ngBindTemplate', function(value) {
--                element.text(value);
--            });
--        };
--    }];
--
-+    var ngInitDirective = ngDirective({
-+        priority: 450,
-+        compile: function() {
-+            return {
-+                pre: function(scope, element, attrs) {
-+                    scope.$eval(attrs.ngInit);
-+                }
-+            };
-+        }
-+    });
- 
-     /**
-      * @ngdoc directive
--     * @name ngBindHtml
-+     * @name ngList
-+     * @restrict A
-+     * @priority 100
-+     *
-+     * @param {string=} ngList optional delimiter that should be used to split the value.
-      *
-      * @description
--     * Creates a binding that will innerHTML the result of evaluating the `expression` into the current
--     * element in a secure way.  By default, the innerHTML-ed content will be sanitized using the {@link
--        * ngSanitize.$sanitize $sanitize} service.  To utilize this functionality, ensure that `$sanitize`
--     * is available, for example, by including {@link ngSanitize} in your module's dependencies (not in
--     * core Angular.)  You may also bypass sanitization for values you know are safe. To do so, bind to
--     * an explicitly trusted value via {@link ng.$sce#trustAsHtml $sce.trustAsHtml}.  See the example
--     * under {@link ng.$sce#Example Strict Contextual Escaping (SCE)}.
-+     * Text input that converts between a delimited string and an array of strings. The default
-+     * delimiter is a comma followed by a space - equivalent to `ng-list=", "`. You can specify a custom
-+     * delimiter as the value of the `ngList` attribute - for example, `ng-list=" | "`.
-+     *
-+     * The behaviour of the directive is affected by the use of the `ngTrim` attribute.
-+     * * If `ngTrim` is set to `"false"` then whitespace around both the separator and each
-+     *   list item is respected. This implies that the user of the directive is responsible for
-+     *   dealing with whitespace but also allows you to use whitespace as a delimiter, such as a
-+     *   tab or newline character.
-+     * * Otherwise whitespace around the delimiter is ignored when splitting (although it is respected
-+     *   when joining the list items back together) and whitespace around each list item is stripped
-+     *   before it is added to the model.
-      *
--     * Note: If a `$sanitize` service is unavailable and the bound value isn't explicitly trusted, you
--     * will have an exception (instead of an exploit.)
-+     * @example
-+     * ### Validation
-+     *
-+     * <example name="ngList-directive" module="listExample">
-+     *   <file name="app.js">
-+     *      angular.module('listExample', [])
-+     *        .controller('ExampleController', ['$scope', function($scope) {
-+     *          $scope.names = ['morpheus', 'neo', 'trinity'];
-+     *        }]);
-+     *   </file>
-+     *   <file name="index.html">
-+     *    <form name="myForm" ng-controller="ExampleController">
-+     *      <label>List: <input name="namesInput" ng-model="names" ng-list required></label>
-+     *      <span role="alert">
-+     *        <span class="error" ng-show="myForm.namesInput.$error.required">
-+     *        Required!</span>
-+     *      </span>
-+     *      <br>
-+     *      <tt>names = {{names}}</tt><br/>
-+     *      <tt>myForm.namesInput.$valid = {{myForm.namesInput.$valid}}</tt><br/>
-+     *      <tt>myForm.namesInput.$error = {{myForm.namesInput.$error}}</tt><br/>
-+     *      <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-+     *      <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-+     *     </form>
-+     *   </file>
-+     *   <file name="protractor.js" type="protractor">
-+     *     var listInput = element(by.model('names'));
-+     *     var names = element(by.exactBinding('names'));
-+     *     var valid = element(by.binding('myForm.namesInput.$valid'));
-+     *     var error = element(by.css('span.error'));
-+     *
-+     *     it('should initialize to model', function() {
-+     *       expect(names.getText()).toContain('["morpheus","neo","trinity"]');
-+     *       expect(valid.getText()).toContain('true');
-+     *       expect(error.getCssValue('display')).toBe('none');
-+     *     });
-      *
--     * @element ANY
--     * @param {expression} ngBindHtml {@link guide/expression Expression} to evaluate.
-+     *     it('should be invalid if empty', function() {
-+     *       listInput.clear();
-+     *       listInput.sendKeys('');
-+     *
-+     *       expect(names.getText()).toContain('');
-+     *       expect(valid.getText()).toContain('false');
-+     *       expect(error.getCssValue('display')).not.toBe('none');
-+     *     });
-+     *   </file>
-+     * </example>
-      *
-      * @example
--     Try it here: enter text in text box and watch the greeting change.
-+     * ### Splitting on newline
-+     *
-+     * <example name="ngList-directive-newlines">
-+     *   <file name="index.html">
-+     *    <textarea ng-model="list" ng-list="&#10;" ng-trim="false"></textarea>
-+     *    <pre>{{ list | json }}</pre>
-+     *   </file>
-+     *   <file name="protractor.js" type="protractor">
-+     *     it("should split the text by newlines", function() {
-+     *       var listInput = element(by.model('list'));
-+     *       var output = element(by.binding('list | json'));
-+     *       listInput.sendKeys('abc\ndef\nghi');
-+     *       expect(output.getText()).toContain('[\n  "abc",\n  "def",\n  "ghi"\n]');
-+     *     });
-+     *   </file>
-+     * </example>
-+     *
-+     */
-+    var ngListDirective = function() {
-+        return {
-+            restrict: 'A',
-+            priority: 100,
-+            require: 'ngModel',
-+            link: function(scope, element, attr, ctrl) {
-+                var ngList = attr.ngList || ', ';
-+                var trimValues = attr.ngTrim !== 'false';
-+                var separator = trimValues ? trim(ngList) : ngList;
- 
--     <example module="ngBindHtmlExample" deps="angular-sanitize.js">
--     <file name="index.html">
--     <div ng-controller="ngBindHtmlCtrl">
--     <p ng-bind-html="myHTML"></p>
--     </div>
--     </file>
-+                var parse = function(viewValue) {
-+                    // If the viewValue is invalid (say required but empty) it will be `undefined`
-+                    if (isUndefined(viewValue)) return;
- 
--     <file name="script.js">
--     angular.module('ngBindHtmlExample', ['ngSanitize'])
-+                    var list = [];
- 
--     .controller('ngBindHtmlCtrl', ['$scope', function ngBindHtmlCtrl($scope) {
--         $scope.myHTML =
--            'I am an <code>HTML</code>string with <a href="#">links!</a> and other <em>stuff</em>';
--       }]);
--     </file>
-+                    if (viewValue) {
-+                        forEach(viewValue.split(separator), function(value) {
-+                            if (value) list.push(trimValues ? trim(value) : value);
-+                        });
-+                    }
- 
--     <file name="protractor.js" type="protractor">
--     it('should check ng-bind-html', function() {
--         expect(element(by.binding('myHTML')).getText()).toBe(
--             'I am an HTMLstring with links! and other stuff');
--       });
--     </file>
--     </example>
--     */
--    var ngBindHtmlDirective = ['$sce', '$parse', function($sce, $parse) {
--        return function(scope, element, attr) {
--            element.addClass('ng-binding').data('$binding', attr.ngBindHtml);
-+                    return list;
-+                };
- 
--            var parsed = $parse(attr.ngBindHtml);
--            function getStringValue() { return (parsed(scope) || '').toString(); }
-+                ctrl.$parsers.push(parse);
-+                ctrl.$formatters.push(function(value) {
-+                    if (isArray(value)) {
-+                        return value.join(ngList);
-+                    }
- 
--            scope.$watch(getStringValue, function ngBindHtmlWatchAction(value) {
--                element.html($sce.getTrustedHtml(parsed(scope)) || '');
--            });
--        };
--    }];
-+                    return undefined;
-+                });
- 
--    function classDirective(name, selector) {
--        name = 'ngClass' + name;
--        return ['$animate', function($animate) {
--            return {
--                restrict: 'AC',
--                link: function(scope, element, attr) {
--                    var oldVal;
-+                // Override the standard $isEmpty because an empty array means the input is empty.
-+                ctrl.$isEmpty = function(value) {
-+                    return !value || !value.length;
-+                };
-+            }
-+        };
-+    };
- 
--                    scope.$watch(attr[name], ngClassWatchAction, true);
-+    /* global VALID_CLASS: true,
-+  INVALID_CLASS: true,
-+  PRISTINE_CLASS: true,
-+  DIRTY_CLASS: true,
-+  UNTOUCHED_CLASS: true,
-+  TOUCHED_CLASS: true,
-+  PENDING_CLASS: true,
-+  addSetValidityMethod: true,
-+  setupValidity: true,
-+  defaultModelOptions: false
-+*/
- 
--                    attr.$observe('class', function(value) {
--                        ngClassWatchAction(scope.$eval(attr[name]));
--                    });
- 
-+    var VALID_CLASS = 'ng-valid',
-+        INVALID_CLASS = 'ng-invalid',
-+        PRISTINE_CLASS = 'ng-pristine',
-+        DIRTY_CLASS = 'ng-dirty',
-+        UNTOUCHED_CLASS = 'ng-untouched',
-+        TOUCHED_CLASS = 'ng-touched',
-+        EMPTY_CLASS = 'ng-empty',
-+        NOT_EMPTY_CLASS = 'ng-not-empty';
- 
--                    if (name !== 'ngClass') {
--                        scope.$watch('$index', function($index, old$index) {
--                            // jshint bitwise: false
--                            var mod = $index & 1;
--                            if (mod !== old$index & 1) {
--                                var classes = arrayClasses(scope.$eval(attr[name]));
--                                mod === selector ?
--                                    addClasses(classes) :
--                                    removeClasses(classes);
--                            }
--                        });
--                    }
-+    var ngModelMinErr = minErr('ngModel');
- 
--                    function addClasses(classes) {
--                        var newClasses = digestClassCounts(classes, 1);
--                        attr.$addClass(newClasses);
--                    }
-+    /**
-+     * @ngdoc type
-+     * @name ngModel.NgModelController
-+     * @property {*} $viewValue The actual value from the control's view. For `input` elements, this is a
-+     * String. See {@link ngModel.NgModelController#$setViewValue} for information about when the $viewValue
-+     * is set.
-+     *
-+     * @property {*} $modelValue The value in the model that the control is bound to.
-+     *
-+     * @property {Array.<Function>} $parsers Array of functions to execute, as a pipeline, whenever
-+     *  the control updates the ngModelController with a new {@link ngModel.NgModelController#$viewValue
-+    `$viewValue`} from the DOM, usually via user input.
-+     See {@link ngModel.NgModelController#$setViewValue `$setViewValue()`} for a detailed lifecycle explanation.
-+     Note that the `$parsers` are not called when the bound ngModel expression changes programmatically.
- 
--                    function removeClasses(classes) {
--                        var newClasses = digestClassCounts(classes, -1);
--                        attr.$removeClass(newClasses);
--                    }
-+     The functions are called in array order, each passing
-+     its return value through to the next. The last return value is forwarded to the
-+     {@link ngModel.NgModelController#$validators `$validators`} collection.
- 
--                    function digestClassCounts (classes, count) {
--                        var classCounts = element.data('$classCounts') || {};
--                        var classesToUpdate = [];
--                        forEach(classes, function (className) {
--                            if (count > 0 || classCounts[className]) {
--                                classCounts[className] = (classCounts[className] || 0) + count;
--                                if (classCounts[className] === +(count > 0)) {
--                                    classesToUpdate.push(className);
--                                }
--                            }
--                        });
--                        element.data('$classCounts', classCounts);
--                        return classesToUpdate.join(' ');
--                    }
-+     Parsers are used to sanitize / convert the {@link ngModel.NgModelController#$viewValue
-+    `$viewValue`}.
- 
--                    function updateClasses (oldClasses, newClasses) {
--                        var toAdd = arrayDifference(newClasses, oldClasses);
--                        var toRemove = arrayDifference(oldClasses, newClasses);
--                        toRemove = digestClassCounts(toRemove, -1);
--                        toAdd = digestClassCounts(toAdd, 1);
-+     Returning `undefined` from a parser means a parse error occurred. In that case,
-+     no {@link ngModel.NgModelController#$validators `$validators`} will run and the `ngModel`
-+     will be set to `undefined` unless {@link ngModelOptions `ngModelOptions.allowInvalid`}
-+     is set to `true`. The parse error is stored in `ngModel.$error.parse`.
- 
--                        if (toAdd.length === 0) {
--                            $animate.removeClass(element, toRemove);
--                        } else if (toRemove.length === 0) {
--                            $animate.addClass(element, toAdd);
--                        } else {
--                            $animate.setClass(element, toAdd, toRemove);
--                        }
--                    }
-+     This simple example shows a parser that would convert text input value to lowercase:
-+     * ```js
-+     * function parse(value) {
-+     *   if (value) {
-+     *     return value.toLowerCase();
-+     *   }
-+     * }
-+     * ngModelController.$parsers.push(parse);
-+     * ```
- 
--                    function ngClassWatchAction(newVal) {
--                        if (selector === true || scope.$index % 2 === selector) {
--                            var newClasses = arrayClasses(newVal || []);
--                            if (!oldVal) {
--                                addClasses(newClasses);
--                            } else if (!equals(newVal,oldVal)) {
--                                var oldClasses = arrayClasses(oldVal);
--                                updateClasses(oldClasses, newClasses);
--                            }
--                        }
--                        oldVal = copy(newVal);
--                    }
--                }
--            };
-+     *
-+     * @property {Array.<Function>} $formatters Array of functions to execute, as a pipeline, whenever
-+     the bound ngModel expression changes programmatically. The `$formatters` are not called when the
-+     value of the control is changed by user interaction.
- 
--            function arrayDifference(tokens1, tokens2) {
--                var values = [];
-+     Formatters are used to format / convert the {@link ngModel.NgModelController#$modelValue
-+    `$modelValue`} for display in the control.
- 
--                outer:
--                    for(var i = 0; i < tokens1.length; i++) {
--                        var token = tokens1[i];
--                        for(var j = 0; j < tokens2.length; j++) {
--                            if(token == tokens2[j]) continue outer;
--                        }
--                        values.push(token);
--                    }
--                return values;
--            }
-+     The functions are called in reverse array order, each passing the value through to the
-+     next. The last return value is used as the actual DOM value.
- 
--            function arrayClasses (classVal) {
--                if (isArray(classVal)) {
--                    return classVal;
--                } else if (isString(classVal)) {
--                    return classVal.split(' ');
--                } else if (isObject(classVal)) {
--                    var classes = [], i = 0;
--                    forEach(classVal, function(v, k) {
--                        if (v) {
--                            classes.push(k);
--                        }
--                    });
--                    return classes;
--                }
--                return classVal;
--            }
--        }];
--    }
-+     This simple example shows a formatter that would convert the model value to uppercase:
- 
--    /**
--     * @ngdoc directive
--     * @name ngClass
--     * @restrict AC
-+     * ```js
-+     * function format(value) {
-+     *   if (value) {
-+     *     return value.toUpperCase();
-+     *   }
-+     * }
-+     * ngModel.$formatters.push(format);
-+     * ```
-      *
--     * @description
--     * The `ngClass` directive allows you to dynamically set CSS classes on an HTML element by databinding
--     * an expression that represents all classes to be added.
-+     * @property {Object.<string, function>} $validators A collection of validators that are applied
-+     *      whenever the model value changes. The key value within the object refers to the name of the
-+     *      validator while the function refers to the validation operation. The validation operation is
-+     *      provided with the model value as an argument and must return a true or false value depending
-+     *      on the response of that validation.
-      *
--     * The directive operates in three different ways, depending on which of three types the expression
--     * evaluates to:
-+     * ```js
-+     * ngModel.$validators.validCharacters = function(modelValue, viewValue) {
-+     *   var value = modelValue || viewValue;
-+     *   return /[0-9]+/.test(value) &&
-+     *          /[a-z]+/.test(value) &&
-+     *          /[A-Z]+/.test(value) &&
-+     *          /\W+/.test(value);
-+     * };
-+     * ```
-      *
--     * 1. If the expression evaluates to a string, the string should be one or more space-delimited class
--     * names.
-+     * @property {Object.<string, function>} $asyncValidators A collection of validations that are expected to
-+     *      perform an asynchronous validation (e.g. a HTTP request). The validation function that is provided
-+     *      is expected to return a promise when it is run during the model validation process. Once the promise
-+     *      is delivered then the validation status will be set to true when fulfilled and false when rejected.
-+     *      When the asynchronous validators are triggered, each of the validators will run in parallel and the model
-+     *      value will only be updated once all validators have been fulfilled. As long as an asynchronous validator
-+     *      is unfulfilled, its key will be added to the controllers `$pending` property. Also, all asynchronous validators
-+     *      will only run once all synchronous validators have passed.
-      *
--     * 2. If the expression evaluates to an array, each element of the array should be a string that is
--     * one or more space-delimited class names.
-+     * Please note that if $http is used then it is important that the server returns a success HTTP response code
-+     * in order to fulfill the validation and a status level of `4xx` in order to reject the validation.
-      *
--     * 3. If the expression evaluates to an object, then for each key-value pair of the
--     * object with a truthy value the corresponding key is used as a class name.
-+     * ```js
-+     * ngModel.$asyncValidators.uniqueUsername = function(modelValue, viewValue) {
-+     *   var value = modelValue || viewValue;
-+     *
-+     *   // Lookup user by username
-+     *   return $http.get('/api/users/' + value).
-+     *      then(function resolved() {
-+     *        //username exists, this means validation fails
-+     *        return $q.reject('exists');
-+     *      }, function rejected() {
-+     *        //username does not exist, therefore this validation passes
-+     *        return true;
-+     *      });
-+     * };
-+     * ```
-      *
--     * The directive won't add duplicate classes if a particular class was already set.
-+     * @property {Array.<Function>} $viewChangeListeners Array of functions to execute whenever
-+     *     a change to {@link ngModel.NgModelController#$viewValue `$viewValue`} has caused a change
-+     *     to {@link ngModel.NgModelController#$modelValue `$modelValue`}.
-+     *     It is called with no arguments, and its return value is ignored.
-+     *     This can be used in place of additional $watches against the model value.
-      *
--     * When the expression changes, the previously added classes are removed and only then the
--     * new classes are added.
-+     * @property {Object} $error An object hash with all failing validator ids as keys.
-+     * @property {Object} $pending An object hash with all pending validator ids as keys.
-      *
--     * @animations
--     * add - happens just before the class is applied to the element
--     * remove - happens just before the class is removed from the element
-+     * @property {boolean} $untouched True if control has not lost focus yet.
-+     * @property {boolean} $touched True if control has lost focus.
-+     * @property {boolean} $pristine True if user has not interacted with the control yet.
-+     * @property {boolean} $dirty True if user has already interacted with the control.
-+     * @property {boolean} $valid True if there is no error.
-+     * @property {boolean} $invalid True if at least one error on the control.
-+     * @property {string} $name The name attribute of the control.
-      *
--     * @element ANY
--     * @param {expression} ngClass {@link guide/expression Expression} to eval. The result
--     *   of the evaluation can be a string representing space delimited class
--     *   names, an array, or a map of class names to boolean values. In the case of a map, the
--     *   names of the properties whose values are truthy will be added as css classes to the
--     *   element.
-+     * @description
-+     *
-+     * `NgModelController` provides API for the {@link ngModel `ngModel`} directive.
-+     * The controller contains services for data-binding, validation, CSS updates, and value formatting
-+     * and parsing. It purposefully does not contain any logic which deals with DOM rendering or
-+     * listening to DOM events.
-+     * Such DOM related logic should be provided by other directives which make use of
-+     * `NgModelController` for data-binding to control elements.
-+     * AngularJS provides this DOM logic for most {@link input `input`} elements.
-+     * At the end of this page you can find a {@link ngModel.NgModelController#custom-control-example
-+ * custom control example} that uses `ngModelController` to bind to `contenteditable` elements.
-+     *
-+     * @example
-+     * ### Custom Control Example
-+     * This example shows how to use `NgModelController` with a custom control to achieve
-+     * data-binding. Notice how different directives (`contenteditable`, `ng-model`, and `required`)
-+     * collaborate together to achieve the desired result.
-+     *
-+     * `contenteditable` is an HTML5 attribute, which tells the browser to let the element
-+     * contents be edited in place by the user.
-      *
--     * @example Example that demonstrates basic bindings via ngClass directive.
--     <example>
-+     * We are using the {@link ng.service:$sce $sce} service here and include the {@link ngSanitize $sanitize}
-+     * module to automatically remove "bad" content like inline event listener (e.g. `<span onclick="...">`).
-+     * However, as we are using `$sce` the model can still decide to provide unsafe content if it marks
-+     * that content using the `$sce` service.
-+     *
-+     * <example name="NgModelController" module="customControl" deps="angular-sanitize.js">
-+     <file name="style.css">
-+     [contenteditable] {
-+        border: 1px solid black;
-+        background-color: white;
-+        min-height: 20px;
-+      }
-+
-+     .ng-invalid {
-+        border: 1px solid red;
-+      }
-+
-+     </file>
-+     <file name="script.js">
-+     angular.module('customControl', ['ngSanitize']).
-+     directive('contenteditable', ['$sce', function($sce) {
-+          return {
-+            restrict: 'A', // only activate on element attribute
-+            require: '?ngModel', // get a hold of NgModelController
-+            link: function(scope, element, attrs, ngModel) {
-+              if (!ngModel) return; // do nothing if no ng-model
-+
-+              // Specify how UI should be updated
-+              ngModel.$render = function() {
-+                element.html($sce.getTrustedHtml(ngModel.$viewValue || ''));
-+              };
-+
-+              // Listen for change events to enable binding
-+              element.on('blur keyup change', function() {
-+                scope.$evalAsync(read);
-+              });
-+              read(); // initialize
-+
-+              // Write data to the model
-+              function read() {
-+                var html = element.html();
-+                // When we clear the content editable the browser leaves a <br> behind
-+                // If strip-br attribute is provided then we strip this out
-+                if (attrs.stripBr && html === '<br>') {
-+                  html = '';
-+                }
-+                ngModel.$setViewValue(html);
-+              }
-+            }
-+          };
-+        }]);
-+     </file>
-      <file name="index.html">
--     <p ng-class="{strike: deleted, bold: important, red: error}">Map Syntax Example</p>
--     <input type="checkbox" ng-model="deleted"> deleted (apply "strike" class)<br>
--     <input type="checkbox" ng-model="important"> important (apply "bold" class)<br>
--     <input type="checkbox" ng-model="error"> error (apply "red" class)
--     <hr>
--     <p ng-class="style">Using String Syntax</p>
--     <input type="text" ng-model="style" placeholder="Type: bold strike red">
-+     <form name="myForm">
-+     <div contenteditable
-+     name="myWidget" ng-model="userContent"
-+     strip-br="true"
-+     required>Change me!</div>
-+     <span ng-show="myForm.myWidget.$error.required">Required!</span>
-      <hr>
--     <p ng-class="[style1, style2, style3]">Using Array Syntax</p>
--     <input ng-model="style1" placeholder="Type: bold, strike or red"><br>
--     <input ng-model="style2" placeholder="Type: bold, strike or red"><br>
--     <input ng-model="style3" placeholder="Type: bold, strike or red"><br>
-+     <textarea ng-model="userContent" aria-label="Dynamic textarea"></textarea>
-+     </form>
-      </file>
--     <file name="style.css">
--     .strike {
--         text-decoration: line-through;
--       }
--     .bold {
--           font-weight: bold;
--       }
--     .red {
--           color: red;
--       }
-+     <file name="protractor.js" type="protractor">
-+     it('should data-bind and become invalid', function() {
-+      if (browser.params.browser === 'safari' || browser.params.browser === 'firefox') {
-+        // SafariDriver can't handle contenteditable
-+        // and Firefox driver can't clear contenteditables very well
-+        return;
-+      }
-+      var contentEditable = element(by.css('[contenteditable]'));
-+      var content = 'Change me!';
-+
-+      expect(contentEditable.getText()).toEqual(content);
-+
-+      contentEditable.clear();
-+      contentEditable.sendKeys(protractor.Key.BACK_SPACE);
-+      expect(contentEditable.getText()).toEqual('');
-+      expect(contentEditable.getAttribute('class')).toMatch(/ng-invalid-required/);
-+    });
-      </file>
--     <file name="protractor.js" type="protractor">
--     var ps = element.all(by.css('p'));
-+     * </example>
-+     *
-+     *
-+     */
-+    NgModelController.$inject = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse', '$animate', '$timeout', '$q', '$interpolate'];
-+    function NgModelController($scope, $exceptionHandler, $attr, $element, $parse, $animate, $timeout, $q, $interpolate) {
-+        this.$viewValue = Number.NaN;
-+        this.$modelValue = Number.NaN;
-+        this.$$rawModelValue = undefined; // stores the parsed modelValue / model set from scope regardless of validity.
-+        this.$validators = {};
-+        this.$asyncValidators = {};
-+        this.$parsers = [];
-+        this.$formatters = [];
-+        this.$viewChangeListeners = [];
-+        this.$untouched = true;
-+        this.$touched = false;
-+        this.$pristine = true;
-+        this.$dirty = false;
-+        this.$valid = true;
-+        this.$invalid = false;
-+        this.$error = {}; // keep invalid keys here
-+        this.$$success = {}; // keep valid keys here
-+        this.$pending = undefined; // keep pending keys here
-+        this.$name = $interpolate($attr.name || '', false)($scope);
-+        this.$$parentForm = nullFormCtrl;
-+        this.$options = defaultModelOptions;
-+        this.$$updateEvents = '';
-+        // Attach the correct context to the event handler function for updateOn
-+        this.$$updateEventHandler = this.$$updateEventHandler.bind(this);
-+
-+        this.$$parsedNgModel = $parse($attr.ngModel);
-+        this.$$parsedNgModelAssign = this.$$parsedNgModel.assign;
-+        this.$$ngModelGet = this.$$parsedNgModel;
-+        this.$$ngModelSet = this.$$parsedNgModelAssign;
-+        this.$$pendingDebounce = null;
-+        this.$$parserValid = undefined;
-+
-+        this.$$currentValidationRunId = 0;
-+
-+        // https://github.com/angular/angular.js/issues/15833
-+        // Prevent `$$scope` from being iterated over by `copy` when NgModelController is deep watched
-+        Object.defineProperty(this, '$$scope', {value: $scope});
-+        this.$$attr = $attr;
-+        this.$$element = $element;
-+        this.$$animate = $animate;
-+        this.$$timeout = $timeout;
-+        this.$$parse = $parse;
-+        this.$$q = $q;
-+        this.$$exceptionHandler = $exceptionHandler;
-+
-+        setupValidity(this);
-+        setupModelWatcher(this);
-+    }
- 
--     it('should let you toggle the class', function() {
-+    NgModelController.prototype = {
-+        $$initGetterSetters: function() {
-+            if (this.$options.getOption('getterSetter')) {
-+                var invokeModelGetter = this.$$parse(this.$$attr.ngModel + '()'),
-+                    invokeModelSetter = this.$$parse(this.$$attr.ngModel + '($$$p)');
- 
--         expect(ps.first().getAttribute('class')).not.toMatch(/bold/);
--         expect(ps.first().getAttribute('class')).not.toMatch(/red/);
-+                this.$$ngModelGet = function($scope) {
-+                    var modelValue = this.$$parsedNgModel($scope);
-+                    if (isFunction(modelValue)) {
-+                        modelValue = invokeModelGetter($scope);
-+                    }
-+                    return modelValue;
-+                };
-+                this.$$ngModelSet = function($scope, newValue) {
-+                    if (isFunction(this.$$parsedNgModel($scope))) {
-+                        invokeModelSetter($scope, {$$$p: newValue});
-+                    } else {
-+                        this.$$parsedNgModelAssign($scope, newValue);
-+                    }
-+                };
-+            } else if (!this.$$parsedNgModel.assign) {
-+                throw ngModelMinErr('nonassign', 'Expression \'{0}\' is non-assignable. Element: {1}',
-+                    this.$$attr.ngModel, startingTag(this.$$element));
-+            }
-+        },
- 
--         element(by.model('important')).click();
--         expect(ps.first().getAttribute('class')).toMatch(/bold/);
- 
--         element(by.model('error')).click();
--         expect(ps.first().getAttribute('class')).toMatch(/red/);
--       });
-+        /**
-+         * @ngdoc method
-+         * @name ngModel.NgModelController#$render
-+         *
-+         * @description
-+         * Called when the view needs to be updated. It is expected that the user of the ng-model
-+         * directive will implement this method.
-+         *
-+         * The `$render()` method is invoked in the following situations:
-+         *
-+         * * `$rollbackViewValue()` is called.  If we are rolling back the view value to the last
-+         *   committed value then `$render()` is called to update the input control.
-+         * * The value referenced by `ng-model` is changed programmatically and both the `$modelValue` and
-+         *   the `$viewValue` are different from last time.
-+         *
-+         * Since `ng-model` does not do a deep watch, `$render()` is only invoked if the values of
-+         * `$modelValue` and `$viewValue` are actually different from their previous values. If `$modelValue`
-+         * or `$viewValue` are objects (rather than a string or number) then `$render()` will not be
-+         * invoked if you only change a property on the objects.
-+         */
-+        $render: noop,
- 
--     it('should let you toggle string example', function() {
--         expect(ps.get(1).getAttribute('class')).toBe('');
--         element(by.model('style')).clear();
--         element(by.model('style')).sendKeys('red');
--         expect(ps.get(1).getAttribute('class')).toBe('red');
--       });
-+        /**
-+         * @ngdoc method
-+         * @name ngModel.NgModelController#$isEmpty
-+         *
-+         * @description
-+         * This is called when we need to determine if the value of an input is empty.
-+         *
-+         * For instance, the required directive does this to work out if the input has data or not.
-+         *
-+         * The default `$isEmpty` function checks whether the value is `undefined`, `''`, `null` or `NaN`.
-+         *
-+         * You can override this for input directives whose concept of being empty is different from the
-+         * default. The `checkboxInputType` directive does this because in its case a value of `false`
-+         * implies empty.
-+         *
-+         * @param {*} value The value of the input to check for emptiness.
-+         * @returns {boolean} True if `value` is "empty".
-+         */
-+        $isEmpty: function(value) {
-+            // eslint-disable-next-line no-self-compare
-+            return isUndefined(value) || value === '' || value === null || value !== value;
-+        },
- 
--     it('array example should have 3 classes', function() {
--         expect(ps.last().getAttribute('class')).toBe('');
--         element(by.model('style1')).sendKeys('bold');
--         element(by.model('style2')).sendKeys('strike');
--         element(by.model('style3')).sendKeys('red');
--         expect(ps.last().getAttribute('class')).toBe('bold strike red');
--       });
--     </file>
--     </example>
-+        $$updateEmptyClasses: function(value) {
-+            if (this.$isEmpty(value)) {
-+                this.$$animate.removeClass(this.$$element, NOT_EMPTY_CLASS);
-+                this.$$animate.addClass(this.$$element, EMPTY_CLASS);
-+            } else {
-+                this.$$animate.removeClass(this.$$element, EMPTY_CLASS);
-+                this.$$animate.addClass(this.$$element, NOT_EMPTY_CLASS);
-+            }
-+        },
- 
--     ## Animations
-+        /**
-+         * @ngdoc method
-+         * @name ngModel.NgModelController#$setPristine
-+         *
-+         * @description
-+         * Sets the control to its pristine state.
-+         *
-+         * This method can be called to remove the `ng-dirty` class and set the control to its pristine
-+         * state (`ng-pristine` class). A model is considered to be pristine when the control
-+         * has not been changed from when first compiled.
-+         */
-+        $setPristine: function() {
-+            this.$dirty = false;
-+            this.$pristine = true;
-+            this.$$animate.removeClass(this.$$element, DIRTY_CLASS);
-+            this.$$animate.addClass(this.$$element, PRISTINE_CLASS);
-+        },
- 
--     The example below demonstrates how to perform animations using ngClass.
-+        /**
-+         * @ngdoc method
-+         * @name ngModel.NgModelController#$setDirty
-+         *
-+         * @description
-+         * Sets the control to its dirty state.
-+         *
-+         * This method can be called to remove the `ng-pristine` class and set the control to its dirty
-+         * state (`ng-dirty` class). A model is considered to be dirty when the control has been changed
-+         * from when first compiled.
-+         */
-+        $setDirty: function() {
-+            this.$dirty = true;
-+            this.$pristine = false;
-+            this.$$animate.removeClass(this.$$element, PRISTINE_CLASS);
-+            this.$$animate.addClass(this.$$element, DIRTY_CLASS);
-+            this.$$parentForm.$setDirty();
-+        },
- 
--     <example module="ngAnimate" deps="angular-animate.js" animations="true">
--     <file name="index.html">
--     <input id="setbtn" type="button" value="set" ng-click="myVar='my-class'">
--     <input id="clearbtn" type="button" value="clear" ng-click="myVar=''">
--     <br>
--     <span class="base-class" ng-class="myVar">Sample Text</span>
--     </file>
--     <file name="style.css">
--     .base-class {
--         -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
--         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
--       }
-+        /**
-+         * @ngdoc method
-+         * @name ngModel.NgModelController#$setUntouched
-+         *
-+         * @description
-+         * Sets the control to its untouched state.
-+         *
-+         * This method can be called to remove the `ng-touched` class and set the control to its
-+         * untouched state (`ng-untouched` class). Upon compilation, a model is set as untouched
-+         * by default, however this function can be used to restore that state if the model has
-+         * already been touched by the user.
-+         */
-+        $setUntouched: function() {
-+            this.$touched = false;
-+            this.$untouched = true;
-+            this.$$animate.setClass(this.$$element, UNTOUCHED_CLASS, TOUCHED_CLASS);
-+        },
- 
--     .base-class.my-class {
--         color: red;
--         font-size:3em;
--       }
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should check ng-class', function() {
--         expect(element(by.css('.base-class')).getAttribute('class')).not.
--           toMatch(/my-class/);
-+        /**
-+         * @ngdoc method
-+         * @name ngModel.NgModelController#$setTouched
-+         *
-+         * @description
-+         * Sets the control to its touched state.
-+         *
-+         * This method can be called to remove the `ng-untouched` class and set the control to its
-+         * touched state (`ng-touched` class). A model is considered to be touched when the user has
-+         * first focused the control element and then shifted focus away from the control (blur event).
-+         */
-+        $setTouched: function() {
-+            this.$touched = true;
-+            this.$untouched = false;
-+            this.$$animate.setClass(this.$$element, TOUCHED_CLASS, UNTOUCHED_CLASS);
-+        },
- 
--         element(by.id('setbtn')).click();
-+        /**
-+         * @ngdoc method
-+         * @name ngModel.NgModelController#$rollbackViewValue
-+         *
-+         * @description
-+         * Cancel an update and reset the input element's value to prevent an update to the `$modelValue`,
-+         * which may be caused by a pending debounced event or because the input is waiting for some
-+         * future event.
-+         *
-+         * If you have an input that uses `ng-model-options` to set up debounced updates or updates that
-+         * depend on special events such as `blur`, there can be a period when the `$viewValue` is out of
-+         * sync with the ngModel's `$modelValue`.
-+         *
-+         * In this case, you can use `$rollbackViewValue()` to manually cancel the debounced / future update
-+         * and reset the input to the last committed view value.
-+         *
-+         * It is also possible that you run into difficulties if you try to update the ngModel's `$modelValue`
-+         * programmatically before these debounced/future events have resolved/occurred, because AngularJS's
-+         * dirty checking mechanism is not able to tell whether the model has actually changed or not.
-+         *
-+         * The `$rollbackViewValue()` method should be called before programmatically changing the model of an
-+         * input which may have such events pending. This is important in order to make sure that the
-+         * input field will be updated with the new model value and any pending operations are cancelled.
-+         *
-+         * @example
-+         * <example name="ng-model-cancel-update" module="cancel-update-example">
-+         *   <file name="app.js">
-+         *     angular.module('cancel-update-example', [])
-+         *
-+         *     .controller('CancelUpdateController', ['$scope', function($scope) {
-+         *       $scope.model = {value1: '', value2: ''};
-+         *
-+         *       $scope.setEmpty = function(e, value, rollback) {
-+         *         if (e.keyCode === 27) {
-+         *           e.preventDefault();
-+         *           if (rollback) {
-+         *             $scope.myForm[value].$rollbackViewValue();
-+         *           }
-+         *           $scope.model[value] = '';
-+         *         }
-+         *       };
-+         *     }]);
-+         *   </file>
-+         *   <file name="index.html">
-+         *     <div ng-controller="CancelUpdateController">
-+         *       <p>Both of these inputs are only updated if they are blurred. Hitting escape should
-+         *       empty them. Follow these steps and observe the difference:</p>
-+         *       <ol>
-+         *         <li>Type something in the input. You will see that the model is not yet updated</li>
-+         *         <li>Press the Escape key.
-+         *           <ol>
-+         *             <li> In the first example, nothing happens, because the model is already '', and no
-+         *             update is detected. If you blur the input, the model will be set to the current view.
-+         *             </li>
-+         *             <li> In the second example, the pending update is cancelled, and the input is set back
-+         *             to the last committed view value (''). Blurring the input does nothing.
-+         *             </li>
-+         *           </ol>
-+         *         </li>
-+         *       </ol>
-+         *
-+         *       <form name="myForm" ng-model-options="{ updateOn: 'blur' }">
-+         *         <div>
-+         *           <p id="inputDescription1">Without $rollbackViewValue():</p>
-+         *           <input name="value1" aria-describedby="inputDescription1" ng-model="model.value1"
-+         *                  ng-keydown="setEmpty($event, 'value1')">
-+         *           value1: "{{ model.value1 }}"
-+         *         </div>
-+         *
-+         *         <div>
-+         *           <p id="inputDescription2">With $rollbackViewValue():</p>
-+         *           <input name="value2" aria-describedby="inputDescription2" ng-model="model.value2"
-+         *                  ng-keydown="setEmpty($event, 'value2', true)">
-+         *           value2: "{{ model.value2 }}"
-+         *         </div>
-+         *       </form>
-+         *     </div>
-+         *   </file>
-+         <file name="style.css">
-+         div {
-+            display: table-cell;
-+          }
-+         div:nth-child(1) {
-+            padding-right: 30px;
-+          }
- 
--         expect(element(by.css('.base-class')).getAttribute('class')).
--           toMatch(/my-class/);
-+         </file>
-+         * </example>
-+         */
-+        $rollbackViewValue: function() {
-+            this.$$timeout.cancel(this.$$pendingDebounce);
-+            this.$viewValue = this.$$lastCommittedViewValue;
-+            this.$render();
-+        },
- 
--         element(by.id('clearbtn')).click();
-+        /**
-+         * @ngdoc method
-+         * @name ngModel.NgModelController#$validate
-+         *
-+         * @description
-+         * Runs each of the registered validators (first synchronous validators and then
-+         * asynchronous validators).
-+         * If the validity changes to invalid, the model will be set to `undefined`,
-+         * unless {@link ngModelOptions `ngModelOptions.allowInvalid`} is `true`.
-+         * If the validity changes to valid, it will set the model to the last available valid
-+         * `$modelValue`, i.e. either the last parsed value or the last value set from the scope.
-+         */
-+        $validate: function() {
-+            // ignore $validate before model is initialized
-+            if (isNumberNaN(this.$modelValue)) {
-+                return;
-+            }
- 
--         expect(element(by.css('.base-class')).getAttribute('class')).not.
--           toMatch(/my-class/);
--       });
--     </file>
--     </example>
-+            var viewValue = this.$$lastCommittedViewValue;
-+            // Note: we use the $$rawModelValue as $modelValue might have been
-+            // set to undefined during a view -> model update that found validation
-+            // errors. We can't parse the view here, since that could change
-+            // the model although neither viewValue nor the model on the scope changed
-+            var modelValue = this.$$rawModelValue;
-+
-+            var prevValid = this.$valid;
-+            var prevModelValue = this.$modelValue;
-+
-+            var allowInvalid = this.$options.getOption('allowInvalid');
-+
-+            var that = this;
-+            this.$$runValidators(modelValue, viewValue, function(allValid) {
-+                // If there was no change in validity, don't update the model
-+                // This prevents changing an invalid modelValue to undefined
-+                if (!allowInvalid && prevValid !== allValid) {
-+                    // Note: Don't check this.$valid here, as we could have
-+                    // external validators (e.g. calculated on the server),
-+                    // that just call $setValidity and need the model value
-+                    // to calculate their validity.
-+                    that.$modelValue = allValid ? modelValue : undefined;
-+
-+                    if (that.$modelValue !== prevModelValue) {
-+                        that.$$writeModelToScope();
-+                    }
-+                }
-+            });
-+        },
- 
-+        $$runValidators: function(modelValue, viewValue, doneCallback) {
-+            this.$$currentValidationRunId++;
-+            var localValidationRunId = this.$$currentValidationRunId;
-+            var that = this;
- 
--     ## ngClass and pre-existing CSS3 Transitions/Animations
--     The ngClass directive still supports CSS3 Transitions/Animations even if they do not follow the ngAnimate CSS naming structure.
--     Upon animation ngAnimate will apply supplementary CSS classes to track the start and end of an animation, but this will not hinder
--     any pre-existing CSS transitions already on the element. To get an idea of what happens during a class-based animation, be sure
--     to view the step by step details of {@link ngAnimate.$animate#addclass $animate.addClass} and
--     {@link ngAnimate.$animate#removeclass $animate.removeClass}.
--     */
--    var ngClassDirective = classDirective('', true);
-+            // check parser error
-+            if (!processParseErrors()) {
-+                validationDone(false);
-+                return;
-+            }
-+            if (!processSyncValidators()) {
-+                validationDone(false);
-+                return;
-+            }
-+            processAsyncValidators();
- 
--    /**
--     * @ngdoc directive
--     * @name ngClassOdd
--     * @restrict AC
--     *
--     * @description
--     * The `ngClassOdd` and `ngClassEven` directives work exactly as
--     * {@link ng.directive:ngClass ngClass}, except they work in
--     * conjunction with `ngRepeat` and take effect only on odd (even) rows.
--     *
--     * This directive can be applied only within the scope of an
--     * {@link ng.directive:ngRepeat ngRepeat}.
--     *
--     * @element ANY
--     * @param {expression} ngClassOdd {@link guide/expression Expression} to eval. The result
--     *   of the evaluation can be a string representing space delimited class names or an array.
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
--     <li ng-repeat="name in names">
--     <span ng-class-odd="'odd'" ng-class-even="'even'">
--     {{name}}
--     </span>
--     </li>
--     </ol>
--     </file>
--     <file name="style.css">
--     .odd {
--         color: red;
--       }
--     .even {
--         color: blue;
--       }
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should check ng-class-odd and ng-class-even', function() {
--         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
--           toMatch(/odd/);
--         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
--           toMatch(/even/);
--       });
--     </file>
--     </example>
--     */
--    var ngClassOddDirective = classDirective('Odd', 0);
-+            function processParseErrors() {
-+                var errorKey = that.$$parserName || 'parse';
-+                if (isUndefined(that.$$parserValid)) {
-+                    setValidity(errorKey, null);
-+                } else {
-+                    if (!that.$$parserValid) {
-+                        forEach(that.$validators, function(v, name) {
-+                            setValidity(name, null);
-+                        });
-+                        forEach(that.$asyncValidators, function(v, name) {
-+                            setValidity(name, null);
-+                        });
-+                    }
-+                    // Set the parse error last, to prevent unsetting it, should a $validators key == parserName
-+                    setValidity(errorKey, that.$$parserValid);
-+                    return that.$$parserValid;
-+                }
-+                return true;
-+            }
- 
--    /**
--     * @ngdoc directive
--     * @name ngClassEven
--     * @restrict AC
--     *
--     * @description
--     * The `ngClassOdd` and `ngClassEven` directives work exactly as
--     * {@link ng.directive:ngClass ngClass}, except they work in
--     * conjunction with `ngRepeat` and take effect only on odd (even) rows.
--     *
--     * This directive can be applied only within the scope of an
--     * {@link ng.directive:ngRepeat ngRepeat}.
--     *
--     * @element ANY
--     * @param {expression} ngClassEven {@link guide/expression Expression} to eval. The
--     *   result of the evaluation can be a string representing space delimited class names or an array.
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
--     <li ng-repeat="name in names">
--     <span ng-class-odd="'odd'" ng-class-even="'even'">
--     {{name}} &nbsp; &nbsp; &nbsp;
--     </span>
--     </li>
--     </ol>
--     </file>
--     <file name="style.css">
--     .odd {
--         color: red;
--       }
--     .even {
--         color: blue;
--       }
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should check ng-class-odd and ng-class-even', function() {
--         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
--           toMatch(/odd/);
--         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
--           toMatch(/even/);
--       });
--     </file>
--     </example>
--     */
--    var ngClassEvenDirective = classDirective('Even', 1);
-+            function processSyncValidators() {
-+                var syncValidatorsValid = true;
-+                forEach(that.$validators, function(validator, name) {
-+                    var result = Boolean(validator(modelValue, viewValue));
-+                    syncValidatorsValid = syncValidatorsValid && result;
-+                    setValidity(name, result);
-+                });
-+                if (!syncValidatorsValid) {
-+                    forEach(that.$asyncValidators, function(v, name) {
-+                        setValidity(name, null);
-+                    });
-+                    return false;
-+                }
-+                return true;
-+            }
- 
--    /**
--     * @ngdoc directive
--     * @name ngCloak
--     * @restrict AC
--     *
--     * @description
--     * The `ngCloak` directive is used to prevent the Angular html template from being briefly
--     * displayed by the browser in its raw (uncompiled) form while your application is loading. Use this
--     * directive to avoid the undesirable flicker effect caused by the html template display.
--     *
--     * The directive can be applied to the `<body>` element, but the preferred usage is to apply
--     * multiple `ngCloak` directives to small portions of the page to permit progressive rendering
--     * of the browser view.
--     *
--     * `ngCloak` works in cooperation with the following css rule embedded within `angular.js` and
--     * `angular.min.js`.
--     * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
--     *
--     * ```css
--     * [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
-- *   display: none !important;
-- * }
--     * ```
--     *
--     * When this css rule is loaded by the browser, all html elements (including their children) that
--     * are tagged with the `ngCloak` directive are hidden. When Angular encounters this directive
--     * during the compilation of the template it deletes the `ngCloak` element attribute, making
--     * the compiled element visible.
--     *
--     * For the best result, the `angular.js` script must be loaded in the head section of the html
--     * document; alternatively, the css rule above must be included in the external stylesheet of the
--     * application.
--     *
--     * Legacy browsers, like IE7, do not provide attribute selector support (added in CSS 2.1) so they
--     * cannot match the `[ng\:cloak]` selector. To work around this limitation, you must add the css
--     * class `ng-cloak` in addition to the `ngCloak` directive as shown in the example below.
--     *
--     * @element ANY
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <div id="template1" ng-cloak>{{ 'hello' }}</div>
--     <div id="template2" ng-cloak class="ng-cloak">{{ 'hello IE7' }}</div>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should remove the template directive and css class', function() {
--         expect($('#template1').getAttribute('ng-cloak')).
--           toBeNull();
--         expect($('#template2').getAttribute('ng-cloak')).
--           toBeNull();
--       });
--     </file>
--     </example>
--     *
--     */
--    var ngCloakDirective = ngDirective({
--        compile: function(element, attr) {
--            attr.$set('ngCloak', undefined);
--            element.removeClass('ng-cloak');
--        }
--    });
-+            function processAsyncValidators() {
-+                var validatorPromises = [];
-+                var allValid = true;
-+                forEach(that.$asyncValidators, function(validator, name) {
-+                    var promise = validator(modelValue, viewValue);
-+                    if (!isPromiseLike(promise)) {
-+                        throw ngModelMinErr('nopromise',
-+                            'Expected asynchronous validator to return a promise but got \'{0}\' instead.', promise);
-+                    }
-+                    setValidity(name, undefined);
-+                    validatorPromises.push(promise.then(function() {
-+                        setValidity(name, true);
-+                    }, function() {
-+                        allValid = false;
-+                        setValidity(name, false);
-+                    }));
-+                });
-+                if (!validatorPromises.length) {
-+                    validationDone(true);
-+                } else {
-+                    that.$$q.all(validatorPromises).then(function() {
-+                        validationDone(allValid);
-+                    }, noop);
-+                }
-+            }
- 
--    /**
--     * @ngdoc directive
--     * @name ngController
--     *
--     * @description
--     * The `ngController` directive attaches a controller class to the view. This is a key aspect of how angular
--     * supports the principles behind the Model-View-Controller design pattern.
--     *
--     * MVC components in angular:
--     *
--     * * Model — The Model is scope properties; scopes are attached to the DOM where scope properties
--     *   are accessed through bindings.
--     * * View — The template (HTML with data bindings) that is rendered into the View.
--     * * Controller — The `ngController` directive specifies a Controller class; the class contains business
--     *   logic behind the application to decorate the scope with functions and values
--     *
--     * Note that you can also attach controllers to the DOM by declaring it in a route definition
--     * via the {@link ngRoute.$route $route} service. A common mistake is to declare the controller
--     * again using `ng-controller` in the template itself.  This will cause the controller to be attached
--     * and executed twice.
--     *
--     * @element ANY
--     * @scope
--     * @param {expression} ngController Name of a globally accessible constructor function or an
--     *     {@link guide/expression expression} that on the current scope evaluates to a
--     *     constructor function. The controller instance can be published into a scope property
--     *     by specifying `as propertyName`.
--     *
--     * @example
--     * Here is a simple form for editing user contact information. Adding, removing, clearing, and
--     * greeting are methods declared on the controller (see source tab). These methods can
--     * easily be called from the angular markup. Notice that the scope becomes the `this` for the
--     * controller's instance. This allows for easy access to the view data from the controller. Also
--     * notice that any changes to the data are automatically reflected in the View without the need
--     * for a manual update. The example is shown in two different declaration styles you may use
--     * according to preference.
--     <example>
--     <file name="index.html">
--     <script>
--     function SettingsController1() {
--          this.name = "John Smith";
--          this.contacts = [
--            {type: 'phone', value: '408 555 1212'},
--            {type: 'email', value: 'john.smith@example.org'} ];
--     };
--
--     SettingsController1.prototype.greet = function() {
--          alert(this.name);
--        };
-+            function setValidity(name, isValid) {
-+                if (localValidationRunId === that.$$currentValidationRunId) {
-+                    that.$setValidity(name, isValid);
-+                }
-+            }
- 
--     SettingsController1.prototype.addContact = function() {
--          this.contacts.push({type: 'email', value: 'yourname@example.org'});
--     };
-+            function validationDone(allValid) {
-+                if (localValidationRunId === that.$$currentValidationRunId) {
- 
--     SettingsController1.prototype.removeContact = function(contactToRemove) {
--         var index = this.contacts.indexOf(contactToRemove);
--          this.contacts.splice(index, 1);
--        };
-+                    doneCallback(allValid);
-+                }
-+            }
-+        },
- 
--     SettingsController1.prototype.clearContact = function(contact) {
--          contact.type = 'phone';
--          contact.value = '';
--        };
--     </script>
--     <div id="ctrl-as-exmpl" ng-controller="SettingsController1 as settings">
--     Name: <input type="text" ng-model="settings.name"/>
--     [ <a href="" ng-click="settings.greet()">greet</a> ]<br/>
--     Contact:
--     <ul>
--     <li ng-repeat="contact in settings.contacts">
--     <select ng-model="contact.type">
--     <option>phone</option>
--     <option>email</option>
--     </select>
--     <input type="text" ng-model="contact.value"/>
--     [ <a href="" ng-click="settings.clearContact(contact)">clear</a>
--     | <a href="" ng-click="settings.removeContact(contact)">X</a> ]
--     </li>
--     <li>[ <a href="" ng-click="settings.addContact()">add</a> ]</li>
--     </ul>
--     </div>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should check controller as', function() {
--         var container = element(by.id('ctrl-as-exmpl'));
-+        /**
-+         * @ngdoc method
-+         * @name ngModel.NgModelController#$commitViewValue
-+         *
-+         * @description
-+         * Commit a pending update to the `$modelValue`.
-+         *
-+         * Updates may be pending by a debounced event or because the input is waiting for a some future
-+         * event defined in `ng-model-options`. this method is rarely needed as `NgModelController`
-+         * usually handles calling this in response to input events.
-+         */
-+        $commitViewValue: function() {
-+            var viewValue = this.$viewValue;
- 
--         expect(container.findElement(by.model('settings.name'))
--             .getAttribute('value')).toBe('John Smith');
-+            this.$$timeout.cancel(this.$$pendingDebounce);
- 
--         var firstRepeat =
--             container.findElement(by.repeater('contact in settings.contacts').row(0));
--         var secondRepeat =
--             container.findElement(by.repeater('contact in settings.contacts').row(1));
-+            // If the view value has not changed then we should just exit, except in the case where there is
-+            // a native validator on the element. In this case the validation state may have changed even though
-+            // the viewValue has stayed empty.
-+            if (this.$$lastCommittedViewValue === viewValue && (viewValue !== '' || !this.$$hasNativeValidators)) {
-+                return;
-+            }
-+            this.$$updateEmptyClasses(viewValue);
-+            this.$$lastCommittedViewValue = viewValue;
- 
--         expect(firstRepeat.findElement(by.model('contact.value')).getAttribute('value'))
--             .toBe('408 555 1212');
--         expect(secondRepeat.findElement(by.model('contact.value')).getAttribute('value'))
--             .toBe('john.smith@example.org');
-+            // change to dirty
-+            if (this.$pristine) {
-+                this.$setDirty();
-+            }
-+            this.$$parseAndValidate();
-+        },
- 
--     firstRepeat.findElement(by.linkText('clear')).click();
-+        $$parseAndValidate: function() {
-+            var viewValue = this.$$lastCommittedViewValue;
-+            var modelValue = viewValue;
-+            var that = this;
- 
--     expect(firstRepeat.findElement(by.model('contact.value')).getAttribute('value'))
--     .toBe('');
-+            this.$$parserValid = isUndefined(modelValue) ? undefined : true;
- 
--     container.findElement(by.linkText('add')).click();
-+            if (this.$$parserValid) {
-+                for (var i = 0; i < this.$parsers.length; i++) {
-+                    modelValue = this.$parsers[i](modelValue);
-+                    if (isUndefined(modelValue)) {
-+                        this.$$parserValid = false;
-+                        break;
-+                    }
-+                }
-+            }
-+            if (isNumberNaN(this.$modelValue)) {
-+                // this.$modelValue has not been touched yet...
-+                this.$modelValue = this.$$ngModelGet(this.$$scope);
-+            }
-+            var prevModelValue = this.$modelValue;
-+            var allowInvalid = this.$options.getOption('allowInvalid');
-+            this.$$rawModelValue = modelValue;
- 
--     expect(container.findElement(by.repeater('contact in settings.contacts').row(2))
--     .findElement(by.model('contact.value'))
--     .getAttribute('value'))
--     .toBe('yourname@example.org');
--     });
--     </file>
--     </example>
--     <example>
--     <file name="index.html">
--     <script>
--     function SettingsController2($scope) {
--          $scope.name = "John Smith";
--          $scope.contacts = [
--            {type:'phone', value:'408 555 1212'},
--            {type:'email', value:'john.smith@example.org'} ];
--
--     $scope.greet = function() {
--           alert(this.name);
--          };
-+            if (allowInvalid) {
-+                this.$modelValue = modelValue;
-+                writeToModelIfNeeded();
-+            }
- 
--     $scope.addContact = function() {
--           this.contacts.push({type:'email', value:'yourname@example.org'});
--     };
-+            // Pass the $$lastCommittedViewValue here, because the cached viewValue might be out of date.
-+            // This can happen if e.g. $setViewValue is called from inside a parser
-+            this.$$runValidators(modelValue, this.$$lastCommittedViewValue, function(allValid) {
-+                if (!allowInvalid) {
-+                    // Note: Don't check this.$valid here, as we could have
-+                    // external validators (e.g. calculated on the server),
-+                    // that just call $setValidity and need the model value
-+                    // to calculate their validity.
-+                    that.$modelValue = allValid ? modelValue : undefined;
-+                    writeToModelIfNeeded();
-+                }
-+            });
- 
--     $scope.removeContact = function(contactToRemove) {
--           var index = this.contacts.indexOf(contactToRemove);
--           this.contacts.splice(index, 1);
--          };
-+            function writeToModelIfNeeded() {
-+                if (that.$modelValue !== prevModelValue) {
-+                    that.$$writeModelToScope();
-+                }
-+            }
-+        },
- 
--     $scope.clearContact = function(contact) {
--           contact.type = 'phone';
--           contact.value = '';
--          };
--     }
--     </script>
--     <div id="ctrl-exmpl" ng-controller="SettingsController2">
--     Name: <input type="text" ng-model="name"/>
--     [ <a href="" ng-click="greet()">greet</a> ]<br/>
--     Contact:
--     <ul>
--     <li ng-repeat="contact in contacts">
--     <select ng-model="contact.type">
--     <option>phone</option>
--     <option>email</option>
--     </select>
--     <input type="text" ng-model="contact.value"/>
--     [ <a href="" ng-click="clearContact(contact)">clear</a>
--     | <a href="" ng-click="removeContact(contact)">X</a> ]
--     </li>
--     <li>[ <a href="" ng-click="addContact()">add</a> ]</li>
--     </ul>
--     </div>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should check controller', function() {
--         var container = element(by.id('ctrl-exmpl'));
-+        $$writeModelToScope: function() {
-+            this.$$ngModelSet(this.$$scope, this.$modelValue);
-+            forEach(this.$viewChangeListeners, function(listener) {
-+                try {
-+                    listener();
-+                } catch (e) {
-+                    // eslint-disable-next-line no-invalid-this
-+                    this.$$exceptionHandler(e);
-+                }
-+            }, this);
-+        },
- 
--         expect(container.findElement(by.model('name'))
--             .getAttribute('value')).toBe('John Smith');
-+        /**
-+         * @ngdoc method
-+         * @name ngModel.NgModelController#$setViewValue
-+         *
-+         * @description
-+         * Update the view value.
-+         *
-+         * This method should be called when a control wants to change the view value; typically,
-+         * this is done from within a DOM event handler. For example, the {@link ng.directive:input input}
-+         * directive calls it when the value of the input changes and {@link ng.directive:select select}
-+         * calls it when an option is selected.
-+         *
-+         * When `$setViewValue` is called, the new `value` will be staged for committing through the `$parsers`
-+         * and `$validators` pipelines. If there are no special {@link ngModelOptions} specified then the staged
-+         * value is sent directly for processing through the `$parsers` pipeline. After this, the `$validators` and
-+         * `$asyncValidators` are called and the value is applied to `$modelValue`.
-+         * Finally, the value is set to the **expression** specified in the `ng-model` attribute and
-+         * all the registered change listeners, in the `$viewChangeListeners` list are called.
-+         *
-+         * In case the {@link ng.directive:ngModelOptions ngModelOptions} directive is used with `updateOn`
-+         * and the `default` trigger is not listed, all those actions will remain pending until one of the
-+         * `updateOn` events is triggered on the DOM element.
-+         * All these actions will be debounced if the {@link ng.directive:ngModelOptions ngModelOptions}
-+         * directive is used with a custom debounce for this particular event.
-+         * Note that a `$digest` is only triggered once the `updateOn` events are fired, or if `debounce`
-+         * is specified, once the timer runs out.
-+         *
-+         * When used with standard inputs, the view value will always be a string (which is in some cases
-+         * parsed into another type, such as a `Date` object for `input[date]`.)
-+         * However, custom controls might also pass objects to this method. In this case, we should make
-+         * a copy of the object before passing it to `$setViewValue`. This is because `ngModel` does not
-+         * perform a deep watch of objects, it only looks for a change of identity. If you only change
-+         * the property of the object then ngModel will not realize that the object has changed and
-+         * will not invoke the `$parsers` and `$validators` pipelines. For this reason, you should
-+         * not change properties of the copy once it has been passed to `$setViewValue`.
-+         * Otherwise you may cause the model value on the scope to change incorrectly.
-+         *
-+         * <div class="alert alert-info">
-+         * In any case, the value passed to the method should always reflect the current value
-+         * of the control. For example, if you are calling `$setViewValue` for an input element,
-+         * you should pass the input DOM value. Otherwise, the control and the scope model become
-+         * out of sync. It's also important to note that `$setViewValue` does not call `$render` or change
-+         * the control's DOM value in any way. If we want to change the control's DOM value
-+         * programmatically, we should update the `ngModel` scope expression. Its new value will be
-+         * picked up by the model controller, which will run it through the `$formatters`, `$render` it
-+         * to update the DOM, and finally call `$validate` on it.
-+         * </div>
-+         *
-+         * @param {*} value value from the view.
-+         * @param {string} trigger Event that triggered the update.
-+         */
-+        $setViewValue: function(value, trigger) {
-+            this.$viewValue = value;
-+            if (this.$options.getOption('updateOnDefault')) {
-+                this.$$debounceViewValueCommit(trigger);
-+            }
-+        },
- 
--         var firstRepeat =
--             container.findElement(by.repeater('contact in contacts').row(0));
--         var secondRepeat =
--             container.findElement(by.repeater('contact in contacts').row(1));
-+        $$debounceViewValueCommit: function(trigger) {
-+            var debounceDelay = this.$options.getOption('debounce');
- 
--         expect(firstRepeat.findElement(by.model('contact.value')).getAttribute('value'))
--             .toBe('408 555 1212');
--         expect(secondRepeat.findElement(by.model('contact.value')).getAttribute('value'))
--             .toBe('john.smith@example.org');
-+            if (isNumber(debounceDelay[trigger])) {
-+                debounceDelay = debounceDelay[trigger];
-+            } else if (isNumber(debounceDelay['default'])) {
-+                debounceDelay = debounceDelay['default'];
-+            }
- 
--     firstRepeat.findElement(by.linkText('clear')).click();
-+            this.$$timeout.cancel(this.$$pendingDebounce);
-+            var that = this;
-+            if (debounceDelay > 0) { // this fails if debounceDelay is an object
-+                this.$$pendingDebounce = this.$$timeout(function() {
-+                    that.$commitViewValue();
-+                }, debounceDelay);
-+            } else if (this.$$scope.$root.$$phase) {
-+                this.$commitViewValue();
-+            } else {
-+                this.$$scope.$apply(function() {
-+                    that.$commitViewValue();
-+                });
-+            }
-+        },
- 
--     expect(firstRepeat.findElement(by.model('contact.value')).getAttribute('value'))
--     .toBe('');
-+        /**
-+         * @ngdoc method
-+         *
-+         * @name ngModel.NgModelController#$overrideModelOptions
-+         *
-+         * @description
-+         *
-+         * Override the current model options settings programmatically.
-+         *
-+         * The previous `ModelOptions` value will not be modified. Instead, a
-+         * new `ModelOptions` object will inherit from the previous one overriding
-+         * or inheriting settings that are defined in the given parameter.
-+         *
-+         * See {@link ngModelOptions} for information about what options can be specified
-+         * and how model option inheritance works.
-+         *
-+         * <div class="alert alert-warning">
-+         * **Note:** this function only affects the options set on the `ngModelController`,
-+         * and not the options on the {@link ngModelOptions} directive from which they might have been
-+         * obtained initially.
-+         * </div>
-+         *
-+         * <div class="alert alert-danger">
-+         * **Note:** it is not possible to override the `getterSetter` option.
-+         * </div>
-+         *
-+         * @param {Object} options a hash of settings to override the previous options
-+         *
-+         */
-+        $overrideModelOptions: function(options) {
-+            this.$options = this.$options.createChild(options);
-+            this.$$setUpdateOnEvents();
-+        },
- 
--     container.findElement(by.linkText('add')).click();
-+        /**
-+         * @ngdoc method
-+         *
-+         * @name  ngModel.NgModelController#$processModelValue
- 
--     expect(container.findElement(by.repeater('contact in contacts').row(2))
--     .findElement(by.model('contact.value'))
--     .getAttribute('value'))
--     .toBe('yourname@example.org');
--     });
--     </file>
--     </example>
-+         * @description
-+         *
-+         * Runs the model -> view pipeline on the current
-+         * {@link ngModel.NgModelController#$modelValue $modelValue}.
-+         *
-+         * The following actions are performed by this method:
-+         *
-+         * - the `$modelValue` is run through the {@link ngModel.NgModelController#$formatters $formatters}
-+         * and the result is set to the {@link ngModel.NgModelController#$viewValue $viewValue}
-+         * - the `ng-empty` or `ng-not-empty` class is set on the element
-+         * - if the `$viewValue` has changed:
-+         *   - {@link ngModel.NgModelController#$render $render} is called on the control
-+         *   - the {@link ngModel.NgModelController#$validators $validators} are run and
-+         *   the validation status is set.
-+         *
-+         * This method is called by ngModel internally when the bound scope value changes.
-+         * Application developers usually do not have to call this function themselves.
-+         *
-+         * This function can be used when the `$viewValue` or the rendered DOM value are not correctly
-+         * formatted and the `$modelValue` must be run through the `$formatters` again.
-+         *
-+         * @example
-+         * Consider a text input with an autocomplete list (for fruit), where the items are
-+         * objects with a name and an id.
-+         * A user enters `ap` and then selects `Apricot` from the list.
-+         * Based on this, the autocomplete widget will call `$setViewValue({name: 'Apricot', id: 443})`,
-+         * but the rendered value will still be `ap`.
-+         * The widget can then call `ctrl.$processModelValue()` to run the model -> view
-+         * pipeline again, which formats the object to the string `Apricot`,
-+         * then updates the `$viewValue`, and finally renders it in the DOM.
-+         *
-+         * <example module="inputExample" name="ng-model-process">
-+         <file name="index.html">
-+         <div ng-controller="inputController" style="display: flex;">
-+         <div style="margin-right: 30px;">
-+         Search Fruit:
-+         <basic-autocomplete items="items" on-select="selectedFruit = item"></basic-autocomplete>
-+         </div>
-+         <div>
-+         Model:<br>
-+         <pre>{{selectedFruit | json}}</pre>
-+         </div>
-+         </div>
-+         </file>
-+         <file name="app.js">
-+         angular.module('inputExample', [])
-+         .controller('inputController', function($scope) {
-+          $scope.items = [
-+            {name: 'Apricot', id: 443},
-+            {name: 'Clementine', id: 972},
-+            {name: 'Durian', id: 169},
-+            {name: 'Jackfruit', id: 982},
-+            {name: 'Strawberry', id: 863}
-+          ];
-+        })
-+         .component('basicAutocomplete', {
-+          bindings: {
-+            items: '<',
-+            onSelect: '&'
-+          },
-+          templateUrl: 'autocomplete.html',
-+          controller: function($element, $scope) {
-+            var that = this;
-+            var ngModel;
-+
-+            that.$postLink = function() {
-+              ngModel = $element.find('input').controller('ngModel');
-+
-+              ngModel.$formatters.push(function(value) {
-+                return (value && value.name) || value;
-+              });
-+
-+              ngModel.$parsers.push(function(value) {
-+                var match = value;
-+                for (var i = 0; i < that.items.length; i++) {
-+                  if (that.items[i].name === value) {
-+                    match = that.items[i];
-+                    break;
-+                  }
-+                }
-+
-+                return match;
-+              });
-+            };
-+
-+            that.selectItem = function(item) {
-+              ngModel.$setViewValue(item);
-+              ngModel.$processModelValue();
-+              that.onSelect({item: item});
-+            };
-+          }
-+        });
-+         </file>
-+         <file name="autocomplete.html">
-+         <div>
-+         <input type="search" ng-model="$ctrl.searchTerm" />
-+         <ul>
-+         <li ng-repeat="item in $ctrl.items | filter:$ctrl.searchTerm">
-+         <button ng-click="$ctrl.selectItem(item)">{{ item.name }}</button>
-+         </li>
-+         </ul>
-+         </div>
-+         </file>
-+         * </example>
-+         *
-+         */
-+        $processModelValue: function() {
-+            var viewValue = this.$$format();
-+
-+            if (this.$viewValue !== viewValue) {
-+                this.$$updateEmptyClasses(viewValue);
-+                this.$viewValue = this.$$lastCommittedViewValue = viewValue;
-+                this.$render();
-+                // It is possible that model and view value have been updated during render
-+                this.$$runValidators(this.$modelValue, this.$viewValue, noop);
-+            }
-+        },
-+
-+        /**
-+         * This method is called internally to run the $formatters on the $modelValue
-+         */
-+        $$format: function() {
-+            var formatters = this.$formatters,
-+                idx = formatters.length;
-+
-+            var viewValue = this.$modelValue;
-+            while (idx--) {
-+                viewValue = formatters[idx](viewValue);
-+            }
-+
-+            return viewValue;
-+        },
-+
-+        /**
-+         * This method is called internally when the bound scope value changes.
-+         */
-+        $$setModelValue: function(modelValue) {
-+            this.$modelValue = this.$$rawModelValue = modelValue;
-+            this.$$parserValid = undefined;
-+            this.$processModelValue();
-+        },
-+
-+        $$setUpdateOnEvents: function() {
-+            if (this.$$updateEvents) {
-+                this.$$element.off(this.$$updateEvents, this.$$updateEventHandler);
-+            }
-+
-+            this.$$updateEvents = this.$options.getOption('updateOn');
-+            if (this.$$updateEvents) {
-+                this.$$element.on(this.$$updateEvents, this.$$updateEventHandler);
-+            }
-+        },
-+
-+        $$updateEventHandler: function(ev) {
-+            this.$$debounceViewValueCommit(ev && ev.type);
-+        }
-+    };
-+
-+    function setupModelWatcher(ctrl) {
-+        // model -> value
-+        // Note: we cannot use a normal scope.$watch as we want to detect the following:
-+        // 1. scope value is 'a'
-+        // 2. user enters 'b'
-+        // 3. ng-change kicks in and reverts scope value to 'a'
-+        //    -> scope value did not change since the last digest as
-+        //       ng-change executes in apply phase
-+        // 4. view should be changed back to 'a'
-+        ctrl.$$scope.$watch(function ngModelWatch(scope) {
-+            var modelValue = ctrl.$$ngModelGet(scope);
-+
-+            // if scope model value and ngModel value are out of sync
-+            // This cannot be moved to the action function, because it would not catch the
-+            // case where the model is changed in the ngChange function or the model setter
-+            if (modelValue !== ctrl.$modelValue &&
-+                // checks for NaN is needed to allow setting the model to NaN when there's an asyncValidator
-+                // eslint-disable-next-line no-self-compare
-+                (ctrl.$modelValue === ctrl.$modelValue || modelValue === modelValue)
-+            ) {
-+                ctrl.$$setModelValue(modelValue);
-+            }
-+
-+            return modelValue;
-+        });
-+    }
- 
-+    /**
-+     * @ngdoc method
-+     * @name ngModel.NgModelController#$setValidity
-+     *
-+     * @description
-+     * Change the validity state, and notify the form.
-+     *
-+     * This method can be called within $parsers/$formatters or a custom validation implementation.
-+     * However, in most cases it should be sufficient to use the `ngModel.$validators` and
-+     * `ngModel.$asyncValidators` collections which will call `$setValidity` automatically.
-+     *
-+     * @param {string} validationErrorKey Name of the validator. The `validationErrorKey` will be assigned
-+     *        to either `$error[validationErrorKey]` or `$pending[validationErrorKey]`
-+     *        (for unfulfilled `$asyncValidators`), so that it is available for data-binding.
-+     *        The `validationErrorKey` should be in camelCase and will get converted into dash-case
-+     *        for class name. Example: `myError` will result in `ng-valid-my-error` and `ng-invalid-my-error`
-+     *        classes and can be bound to as `{{ someForm.someControl.$error.myError }}`.
-+     * @param {boolean} isValid Whether the current state is valid (true), invalid (false), pending (undefined),
-+     *                          or skipped (null). Pending is used for unfulfilled `$asyncValidators`.
-+     *                          Skipped is used by AngularJS when validators do not run because of parse errors and
-+     *                          when `$asyncValidators` do not run because any of the `$validators` failed.
-      */
--    var ngControllerDirective = [function() {
--        return {
--            scope: true,
--            controller: '@',
--            priority: 500
--        };
--    }];
-+    addSetValidityMethod({
-+        clazz: NgModelController,
-+        set: function(object, property) {
-+            object[property] = true;
-+        },
-+        unset: function(object, property) {
-+            delete object[property];
-+        }
-+    });
-+
- 
-     /**
-      * @ngdoc directive
--     * @name ngCsp
-+     * @name ngModel
-+     * @restrict A
-+     * @priority 1
-+     * @param {expression} ngModel assignable {@link guide/expression Expression} to bind to.
-      *
--     * @element html
-      * @description
--     * Enables [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) support.
-+     * The `ngModel` directive binds an `input`,`select`, `textarea` (or custom form control) to a
-+     * property on the scope using {@link ngModel.NgModelController NgModelController},
-+     * which is created and exposed by this directive.
-      *
--     * This is necessary when developing things like Google Chrome Extensions.
-+     * `ngModel` is responsible for:
-      *
--     * CSP forbids apps to use `eval` or `Function(string)` generated functions (among other things).
--     * For us to be compatible, we just need to implement the "getterFn" in $parse without violating
--     * any of these restrictions.
-+     * - Binding the view into the model, which other directives such as `input`, `textarea` or `select`
-+     *   require.
-+     * - Providing validation behavior (i.e. required, number, email, url).
-+     * - Keeping the state of the control (valid/invalid, dirty/pristine, touched/untouched, validation errors).
-+     * - Setting related css classes on the element (`ng-valid`, `ng-invalid`, `ng-dirty`, `ng-pristine`, `ng-touched`,
-+     *   `ng-untouched`, `ng-empty`, `ng-not-empty`) including animations.
-+     * - Registering the control with its parent {@link ng.directive:form form}.
-      *
--     * AngularJS uses `Function(string)` generated functions as a speed optimization. Applying the `ngCsp`
--     * directive will cause Angular to use CSP compatibility mode. When this mode is on AngularJS will
--     * evaluate all expressions up to 30% slower than in non-CSP mode, but no security violations will
--     * be raised.
-+     * Note: `ngModel` will try to bind to the property given by evaluating the expression on the
-+     * current scope. If the property doesn't already exist on this scope, it will be created
-+     * implicitly and added to the scope.
-      *
--     * CSP forbids JavaScript to inline stylesheet rules. In non CSP mode Angular automatically
--     * includes some CSS rules (e.g. {@link ng.directive:ngCloak ngCloak}).
--     * To make those directives work in CSP mode, include the `angular-csp.css` manually.
-+     * For best practices on using `ngModel`, see:
-      *
--     * In order to use this feature put the `ngCsp` directive on the root element of the application.
-+     *  - [Understanding Scopes](https://github.com/angular/angular.js/wiki/Understanding-Scopes)
-      *
--     * *Note: This directive is only available in the `ng-csp` and `data-ng-csp` attribute form.*
-+     * For basic examples, how to use `ngModel`, see:
-      *
--     * @example
--     * This example shows how to apply the `ngCsp` directive to the `html` tag.
--     ```html
--     <!doctype html>
--     <html ng-app ng-csp>
--     ...
--     ...
--     </html>
--     ```
--     */
--
--// ngCsp is not implemented as a proper directive any more, because we need it be processed while we bootstrap
--// the system (before $parse is instantiated), for this reason we just have a csp() fn that looks for ng-csp attribute
--// anywhere in the current doc
--
--    /**
--     * @ngdoc directive
--     * @name ngClick
-+     *  - {@link ng.directive:input input}
-+     *    - {@link input[text] text}
-+     *    - {@link input[checkbox] checkbox}
-+     *    - {@link input[radio] radio}
-+     *    - {@link input[number] number}
-+     *    - {@link input[email] email}
-+     *    - {@link input[url] url}
-+     *    - {@link input[date] date}
-+     *    - {@link input[datetime-local] datetime-local}
-+     *    - {@link input[time] time}
-+     *    - {@link input[month] month}
-+     *    - {@link input[week] week}
-+     *  - {@link ng.directive:select select}
-+     *  - {@link ng.directive:textarea textarea}
-      *
--     * @description
--     * The ngClick directive allows you to specify custom behavior when
--     * an element is clicked.
-+     * ## Complex Models (objects or collections)
-      *
--     * @element ANY
--     * @priority 0
--     * @param {expression} ngClick {@link guide/expression Expression} to evaluate upon
--     * click. ({@link guide/expression#-event- Event object is available as `$event`})
-+     * By default, `ngModel` watches the model by reference, not value. This is important to know when
-+     * binding inputs to models that are objects (e.g. `Date`) or collections (e.g. arrays). If only properties of the
-+     * object or collection change, `ngModel` will not be notified and so the input will not be  re-rendered.
-      *
--     * @example
--     <example>
--     <file name="index.html">
--     <button ng-click="count = count + 1" ng-init="count=0">
--     Increment
--     </button>
--     count: {{count}}
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should check ng-click', function() {
--         expect(element(by.binding('count')).getText()).toMatch('0');
--         element(by.css('button')).click();
--         expect(element(by.binding('count')).getText()).toMatch('1');
--       });
--     </file>
--     </example>
--     */
--    /*
--     * A directive that allows creation of custom onclick handlers that are defined as angular
--     * expressions and are compiled and executed within the current scope.
-+     * The model must be assigned an entirely new object or collection before a re-rendering will occur.
-      *
--     * Events that are handled via these handler are always configured not to propagate further.
--     */
--    var ngEventDirectives = {};
--    forEach(
--        'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
--        function(name) {
--            var directiveName = directiveNormalize('ng-' + name);
--            ngEventDirectives[directiveName] = ['$parse', function($parse) {
--                return {
--                    compile: function($element, attr) {
--                        var fn = $parse(attr[directiveName]);
--                        return function(scope, element, attr) {
--                            element.on(lowercase(name), function(event) {
--                                scope.$apply(function() {
--                                    fn(scope, {$event:event});
--                                });
--                            });
--                        };
--                    }
--                };
--            }];
--        }
--    );
--
--    /**
--     * @ngdoc directive
--     * @name ngDblclick
-+     * Some directives have options that will cause them to use a custom `$watchCollection` on the model expression
-+     * - for example, `ngOptions` will do so when a `track by` clause is included in the comprehension expression or
-+     * if the select is given the `multiple` attribute.
-      *
--     * @description
--     * The `ngDblclick` directive allows you to specify custom behavior on a dblclick event.
-+     * The `$watchCollection()` method only does a shallow comparison, meaning that changing properties deeper than the
-+     * first level of the object (or only changing the properties of an item in the collection if it's an array) will still
-+     * not trigger a re-rendering of the model.
-      *
--     * @element ANY
--     * @priority 0
--     * @param {expression} ngDblclick {@link guide/expression Expression} to evaluate upon
--     * a dblclick. (The Event object is available as `$event`)
-+     * ## CSS classes
-+     * The following CSS classes are added and removed on the associated input/select/textarea element
-+     * depending on the validity of the model.
-      *
--     * @example
--     <example>
--     <file name="index.html">
--     <button ng-dblclick="count = count + 1" ng-init="count=0">
--     Increment (on double click)
--     </button>
--     count: {{count}}
--     </file>
--     </example>
--     */
--
--
--    /**
--     * @ngdoc directive
--     * @name ngMousedown
-+     *  - `ng-valid`: the model is valid
-+     *  - `ng-invalid`: the model is invalid
-+     *  - `ng-valid-[key]`: for each valid key added by `$setValidity`
-+     *  - `ng-invalid-[key]`: for each invalid key added by `$setValidity`
-+     *  - `ng-pristine`: the control hasn't been interacted with yet
-+     *  - `ng-dirty`: the control has been interacted with
-+     *  - `ng-touched`: the control has been blurred
-+     *  - `ng-untouched`: the control hasn't been blurred
-+     *  - `ng-pending`: any `$asyncValidators` are unfulfilled
-+     *  - `ng-empty`: the view does not contain a value or the value is deemed "empty", as defined
-+     *     by the {@link ngModel.NgModelController#$isEmpty} method
-+     *  - `ng-not-empty`: the view contains a non-empty value
-      *
--     * @description
--     * The ngMousedown directive allows you to specify custom behavior on mousedown event.
-+     * Keep in mind that ngAnimate can detect each of these classes when added and removed.
-      *
--     * @element ANY
--     * @priority 0
--     * @param {expression} ngMousedown {@link guide/expression Expression} to evaluate upon
--     * mousedown. ({@link guide/expression#-event- Event object is available as `$event`})
-+     * @animations
-+     * Animations within models are triggered when any of the associated CSS classes are added and removed
-+     * on the input element which is attached to the model. These classes include: `.ng-pristine`, `.ng-dirty`,
-+     * `.ng-invalid` and `.ng-valid` as well as any other validations that are performed on the model itself.
-+     * The animations that are triggered within ngModel are similar to how they work in ngClass and
-+     * animations can be hooked into using CSS transitions, keyframes as well as JS animations.
-+     *
-+     * The following example shows a simple way to utilize CSS transitions to style an input element
-+     * that has been rendered as invalid after it has been validated:
-+     *
-+     * <pre>
-+     * //be sure to include ngAnimate as a module to hook into more
-+     * //advanced animations
-+     * .my-input {
-+     *   transition:0.5s linear all;
-+     *   background: white;
-+     * }
-+     * .my-input.ng-invalid {
-+     *   background: red;
-+     *   color:white;
-+     * }
-+     * </pre>
-      *
-      * @example
--     <example>
-+     * ### Basic Usage
-+     * <example deps="angular-animate.js" animations="true" fixBase="true" module="inputExample" name="ng-model">
-      <file name="index.html">
--     <button ng-mousedown="count = count + 1" ng-init="count=0">
--     Increment (on mouse down)
--     </button>
--     count: {{count}}
-+     <script>
-+     angular.module('inputExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+            $scope.val = '1';
-+          }]);
-+     </script>
-+     <style>
-+     .my-input {
-+           transition:all linear 0.5s;
-+           background: transparent;
-+         }
-+     .my-input.ng-invalid {
-+           color:white;
-+           background: red;
-+         }
-+     </style>
-+     <p id="inputDescription">
-+     Update input to see transitions when valid/invalid.
-+     Integer is a valid value.
-+     </p>
-+     <form name="testForm" ng-controller="ExampleController">
-+     <input ng-model="val" ng-pattern="/^\d+$/" name="anim" class="my-input"
-+     aria-describedby="inputDescription" />
-+     </form>
-      </file>
--     </example>
--     */
--
--
--    /**
--     * @ngdoc directive
--     * @name ngMouseup
-+     * </example>
-      *
--     * @description
--     * Specify custom behavior on mouseup event.
-+     * @example
-+     * ### Binding to a getter/setter
-      *
--     * @element ANY
--     * @priority 0
--     * @param {expression} ngMouseup {@link guide/expression Expression} to evaluate upon
--     * mouseup. ({@link guide/expression#-event- Event object is available as `$event`})
-+     * Sometimes it's helpful to bind `ngModel` to a getter/setter function.  A getter/setter is a
-+     * function that returns a representation of the model when called with zero arguments, and sets
-+     * the internal state of a model when called with an argument. It's sometimes useful to use this
-+     * for models that have an internal representation that's different from what the model exposes
-+     * to the view.
-+     *
-+     * <div class="alert alert-success">
-+     * **Best Practice:** It's best to keep getters fast because AngularJS is likely to call them more
-+     * frequently than other parts of your code.
-+     * </div>
-+     *
-+     * You use this behavior by adding `ng-model-options="{ getterSetter: true }"` to an element that
-+     * has `ng-model` attached to it. You can also add `ng-model-options="{ getterSetter: true }"` to
-+     * a `<form>`, which will enable this behavior for all `<input>`s within it. See
-+     * {@link ng.directive:ngModelOptions `ngModelOptions`} for more.
-+     *
-+     * The following example shows how to use `ngModel` with a getter/setter:
-      *
-      * @example
--     <example>
-+     * <example name="ngModel-getter-setter" module="getterSetterExample">
-      <file name="index.html">
--     <button ng-mouseup="count = count + 1" ng-init="count=0">
--     Increment (on mouse up)
--     </button>
--     count: {{count}}
-+     <div ng-controller="ExampleController">
-+     <form name="userForm">
-+     <label>Name:
-+     <input type="text" name="userName"
-+     ng-model="user.name"
-+     ng-model-options="{ getterSetter: true }" />
-+     </label>
-+     </form>
-+     <pre>user.name = <span ng-bind="user.name()"></span></pre>
-+     </div>
-      </file>
--     </example>
-+     <file name="app.js">
-+     angular.module('getterSetterExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+           var _name = 'Brian';
-+           $scope.user = {
-+             name: function(newName) {
-+              // Note that newName can be undefined for two reasons:
-+              // 1. Because it is called as a getter and thus called with no arguments
-+              // 2. Because the property should actually be set to undefined. This happens e.g. if the
-+              //    input is invalid
-+              return arguments.length ? (_name = newName) : _name;
-+             }
-+           };
-+         }]);
-+     </file>
-+     * </example>
-      */
-+    var ngModelDirective = ['$rootScope', function($rootScope) {
-+        return {
-+            restrict: 'A',
-+            require: ['ngModel', '^?form', '^?ngModelOptions'],
-+            controller: NgModelController,
-+            // Prelink needs to run before any input directive
-+            // so that we can set the NgModelOptions in NgModelController
-+            // before anyone else uses it.
-+            priority: 1,
-+            compile: function ngModelCompile(element) {
-+                // Setup initial state of the control
-+                element.addClass(PRISTINE_CLASS).addClass(UNTOUCHED_CLASS).addClass(VALID_CLASS);
-+
-+                return {
-+                    pre: function ngModelPreLink(scope, element, attr, ctrls) {
-+                        var modelCtrl = ctrls[0],
-+                            formCtrl = ctrls[1] || modelCtrl.$$parentForm,
-+                            optionsCtrl = ctrls[2];
-+
-+                        if (optionsCtrl) {
-+                            modelCtrl.$options = optionsCtrl.$options;
-+                        }
-+
-+                        modelCtrl.$$initGetterSetters();
-+
-+                        // notify others, especially parent forms
-+                        formCtrl.$addControl(modelCtrl);
-+
-+                        attr.$observe('name', function(newValue) {
-+                            if (modelCtrl.$name !== newValue) {
-+                                modelCtrl.$$parentForm.$$renameControl(modelCtrl, newValue);
-+                            }
-+                        });
-+
-+                        scope.$on('$destroy', function() {
-+                            modelCtrl.$$parentForm.$removeControl(modelCtrl);
-+                        });
-+                    },
-+                    post: function ngModelPostLink(scope, element, attr, ctrls) {
-+                        var modelCtrl = ctrls[0];
-+                        modelCtrl.$$setUpdateOnEvents();
-+
-+                        function setTouched() {
-+                            modelCtrl.$setTouched();
-+                        }
-+
-+                        element.on('blur', function() {
-+                            if (modelCtrl.$touched) return;
-+
-+                            if ($rootScope.$$phase) {
-+                                scope.$evalAsync(setTouched);
-+                            } else {
-+                                scope.$apply(setTouched);
-+                            }
-+                        });
-+                    }
-+                };
-+            }
-+        };
-+    }];
-+
-+    /* exported defaultModelOptions */
-+    var defaultModelOptions;
-+    var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
- 
-     /**
--     * @ngdoc directive
--     * @name ngMouseover
--     *
-+     * @ngdoc type
-+     * @name ModelOptions
-      * @description
--     * Specify custom behavior on mouseover event.
--     *
--     * @element ANY
--     * @priority 0
--     * @param {expression} ngMouseover {@link guide/expression Expression} to evaluate upon
--     * mouseover. ({@link guide/expression#-event- Event object is available as `$event`})
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <button ng-mouseover="count = count + 1" ng-init="count=0">
--     Increment (when mouse is over)
--     </button>
--     count: {{count}}
--     </file>
--     </example>
-+     * A container for the options set by the {@link ngModelOptions} directive
-      */
-+    function ModelOptions(options) {
-+        this.$$options = options;
-+    }
-+
-+    ModelOptions.prototype = {
-+
-+        /**
-+         * @ngdoc method
-+         * @name ModelOptions#getOption
-+         * @param {string} name the name of the option to retrieve
-+         * @returns {*} the value of the option
-+         * @description
-+         * Returns the value of the given option
-+         */
-+        getOption: function(name) {
-+            return this.$$options[name];
-+        },
-+
-+        /**
-+         * @ngdoc method
-+         * @name ModelOptions#createChild
-+         * @param {Object} options a hash of options for the new child that will override the parent's options
-+         * @return {ModelOptions} a new `ModelOptions` object initialized with the given options.
-+         */
-+        createChild: function(options) {
-+            var inheritAll = false;
-+
-+            // make a shallow copy
-+            options = extend({}, options);
-+
-+            // Inherit options from the parent if specified by the value `"$inherit"`
-+            forEach(options, /* @this */ function(option, key) {
-+                if (option === '$inherit') {
-+                    if (key === '*') {
-+                        inheritAll = true;
-+                    } else {
-+                        options[key] = this.$$options[key];
-+                        // `updateOn` is special so we must also inherit the `updateOnDefault` option
-+                        if (key === 'updateOn') {
-+                            options.updateOnDefault = this.$$options.updateOnDefault;
-+                        }
-+                    }
-+                } else {
-+                    if (key === 'updateOn') {
-+                        // If the `updateOn` property contains the `default` event then we have to remove
-+                        // it from the event list and set the `updateOnDefault` flag.
-+                        options.updateOnDefault = false;
-+                        options[key] = trim(option.replace(DEFAULT_REGEXP, function() {
-+                            options.updateOnDefault = true;
-+                            return ' ';
-+                        }));
-+                    }
-+                }
-+            }, this);
-+
-+            if (inheritAll) {
-+                // We have a property of the form: `"*": "$inherit"`
-+                delete options['*'];
-+                defaults(options, this.$$options);
-+            }
-+
-+            // Finally add in any missing defaults
-+            defaults(options, defaultModelOptions.$$options);
-+
-+            return new ModelOptions(options);
-+        }
-+    };
-+
-+
-+    defaultModelOptions = new ModelOptions({
-+        updateOn: '',
-+        updateOnDefault: true,
-+        debounce: 0,
-+        getterSetter: false,
-+        allowInvalid: false,
-+        timezone: null
-+    });
- 
- 
-     /**
-      * @ngdoc directive
--     * @name ngMouseenter
-+     * @name ngModelOptions
-+     * @restrict A
-+     * @priority 10
-      *
-      * @description
--     * Specify custom behavior on mouseenter event.
-+     * This directive allows you to modify the behaviour of {@link ngModel} directives within your
-+     * application. You can specify an `ngModelOptions` directive on any element. All {@link ngModel}
-+     * directives will use the options of their nearest `ngModelOptions` ancestor.
-      *
--     * @element ANY
--     * @priority 0
--     * @param {expression} ngMouseenter {@link guide/expression Expression} to evaluate upon
--     * mouseenter. ({@link guide/expression#-event- Event object is available as `$event`})
-+     * The `ngModelOptions` settings are found by evaluating the value of the attribute directive as
-+     * an AngularJS expression. This expression should evaluate to an object, whose properties contain
-+     * the settings. For example: `<div ng-model-options="{ debounce: 100 }"`.
-      *
--     * @example
--     <example>
--     <file name="index.html">
--     <button ng-mouseenter="count = count + 1" ng-init="count=0">
--     Increment (when mouse enters)
--     </button>
--     count: {{count}}
--     </file>
--     </example>
--     */
--
--
--    /**
--     * @ngdoc directive
--     * @name ngMouseleave
-+     * ## Inheriting Options
-      *
--     * @description
--     * Specify custom behavior on mouseleave event.
-+     * You can specify that an `ngModelOptions` setting should be inherited from a parent `ngModelOptions`
-+     * directive by giving it the value of `"$inherit"`.
-+     * Then it will inherit that setting from the first `ngModelOptions` directive found by traversing up the
-+     * DOM tree. If there is no ancestor element containing an `ngModelOptions` directive then default settings
-+     * will be used.
-      *
--     * @element ANY
--     * @priority 0
--     * @param {expression} ngMouseleave {@link guide/expression Expression} to evaluate upon
--     * mouseleave. ({@link guide/expression#-event- Event object is available as `$event`})
-+     * For example given the following fragment of HTML
-      *
--     * @example
--     <example>
--     <file name="index.html">
--     <button ng-mouseleave="count = count + 1" ng-init="count=0">
--     Increment (when mouse leaves)
--     </button>
--     count: {{count}}
--     </file>
--     </example>
--     */
--
--
--    /**
--     * @ngdoc directive
--     * @name ngMousemove
-      *
--     * @description
--     * Specify custom behavior on mousemove event.
-+     * ```html
-+     * <div ng-model-options="{ allowInvalid: true, debounce: 200 }">
-+     *   <form ng-model-options="{ updateOn: 'blur', allowInvalid: '$inherit' }">
-+     *     <input ng-model-options="{ updateOn: 'default', allowInvalid: '$inherit' }" />
-+     *   </form>
-+     * </div>
-+     * ```
-      *
--     * @element ANY
--     * @priority 0
--     * @param {expression} ngMousemove {@link guide/expression Expression} to evaluate upon
--     * mousemove. ({@link guide/expression#-event- Event object is available as `$event`})
-+     * the `input` element will have the following settings
-      *
--     * @example
--     <example>
--     <file name="index.html">
--     <button ng-mousemove="count = count + 1" ng-init="count=0">
--     Increment (when mouse moves)
--     </button>
--     count: {{count}}
--     </file>
--     </example>
--     */
--
--
--    /**
--     * @ngdoc directive
--     * @name ngKeydown
-+     * ```js
-+     * { allowInvalid: true, updateOn: 'default', debounce: 0 }
-+     * ```
-      *
--     * @description
--     * Specify custom behavior on keydown event.
-+     * Notice that the `debounce` setting was not inherited and used the default value instead.
-      *
--     * @element ANY
--     * @priority 0
--     * @param {expression} ngKeydown {@link guide/expression Expression} to evaluate upon
--     * keydown. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
-+     * You can specify that all undefined settings are automatically inherited from an ancestor by
-+     * including a property with key of `"*"` and value of `"$inherit"`.
-      *
--     * @example
--     <example>
--     <file name="index.html">
--     <input ng-keydown="count = count + 1" ng-init="count=0">
--     key down count: {{count}}
--     </file>
--     </example>
--     */
--
--
--    /**
--     * @ngdoc directive
--     * @name ngKeyup
-+     * For example given the following fragment of HTML
-      *
--     * @description
--     * Specify custom behavior on keyup event.
-      *
--     * @element ANY
--     * @priority 0
--     * @param {expression} ngKeyup {@link guide/expression Expression} to evaluate upon
--     * keyup. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
-+     * ```html
-+     * <div ng-model-options="{ allowInvalid: true, debounce: 200 }">
-+     *   <form ng-model-options="{ updateOn: 'blur', "*": '$inherit' }">
-+     *     <input ng-model-options="{ updateOn: 'default', "*": '$inherit' }" />
-+     *   </form>
-+     * </div>
-+     * ```
-      *
--     * @example
--     <example>
--     <file name="index.html">
--     <input ng-keyup="count = count + 1" ng-init="count=0">
--     key up count: {{count}}
--     </file>
--     </example>
--     */
--
--
--    /**
--     * @ngdoc directive
--     * @name ngKeypress
-+     * the `input` element will have the following settings
-      *
--     * @description
--     * Specify custom behavior on keypress event.
-+     * ```js
-+     * { allowInvalid: true, updateOn: 'default', debounce: 200 }
-+     * ```
-      *
--     * @element ANY
--     * @param {expression} ngKeypress {@link guide/expression Expression} to evaluate upon
--     * keypress. ({@link guide/expression#-event- Event object is available as `$event`}
--     * and can be interrogated for keyCode, altKey, etc.)
-+     * Notice that the `debounce` setting now inherits the value from the outer `<div>` element.
-      *
--     * @example
--     <example>
--     <file name="index.html">
--     <input ng-keypress="count = count + 1" ng-init="count=0">
--     key press count: {{count}}
--     </file>
--     </example>
--     */
--
--
--    /**
--     * @ngdoc directive
--     * @name ngSubmit
-+     * If you are creating a reusable component then you should be careful when using `"*": "$inherit"`
-+     * since you may inadvertently inherit a setting in the future that changes the behavior of your component.
-      *
--     * @description
--     * Enables binding angular expressions to onsubmit events.
-      *
--     * Additionally it prevents the default action (which for form means sending the request to the
--     * server and reloading the current page), but only if the form does not contain `action`,
--     * `data-action`, or `x-action` attributes.
-+     * ## Triggering and debouncing model updates
-      *
--     * @element form
--     * @priority 0
--     * @param {expression} ngSubmit {@link guide/expression Expression} to eval.
--     * ({@link guide/expression#-event- Event object is available as `$event`})
-+     * The `updateOn` and `debounce` properties allow you to specify a custom list of events that will
-+     * trigger a model update and/or a debouncing delay so that the actual update only takes place when
-+     * a timer expires; this timer will be reset after another change takes place.
-      *
--     * @example
--     <example>
--     <file name="index.html">
--     <script>
--     function Ctrl($scope) {
--          $scope.list = [];
--          $scope.text = 'hello';
--          $scope.submit = function() {
--            if ($scope.text) {
--              $scope.list.push(this.text);
--              $scope.text = '';
--            }
--          };
--        }
--     </script>
--     <form ng-submit="submit()" ng-controller="Ctrl">
--     Enter text and hit enter:
--     <input type="text" ng-model="text" name="text" />
--     <input type="submit" id="submit" value="Submit" />
--     <pre>list={{list}}</pre>
--     </form>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should check ng-submit', function() {
--         expect(element(by.binding('list')).getText()).toBe('list=[]');
--         element(by.css('#submit')).click();
--         expect(element(by.binding('list')).getText()).toContain('hello');
--         expect(element(by.input('text')).getAttribute('value')).toBe('');
--       });
--     it('should ignore empty strings', function() {
--         expect(element(by.binding('list')).getText()).toBe('list=[]');
--         element(by.css('#submit')).click();
--         element(by.css('#submit')).click();
--         expect(element(by.binding('list')).getText()).toContain('hello');
--        });
--     </file>
--     </example>
--     */
--
--    /**
--     * @ngdoc directive
--     * @name ngFocus
-+     * Given the nature of `ngModelOptions`, the value displayed inside input fields in the view might
-+     * be different from the value in the actual model. This means that if you update the model you
-+     * should also invoke {@link ngModel.NgModelController#$rollbackViewValue} on the relevant input field in
-+     * order to make sure it is synchronized with the model and that any debounced action is canceled.
-      *
--     * @description
--     * Specify custom behavior on focus event.
-+     * The easiest way to reference the control's {@link ngModel.NgModelController#$rollbackViewValue}
-+     * method is by making sure the input is placed inside a form that has a `name` attribute. This is
-+     * important because `form` controllers are published to the related scope under the name in their
-+     * `name` attribute.
-      *
--     * @element window, input, select, textarea, a
--     * @priority 0
--     * @param {expression} ngFocus {@link guide/expression Expression} to evaluate upon
--     * focus. ({@link guide/expression#-event- Event object is available as `$event`})
-+     * Any pending changes will take place immediately when an enclosing form is submitted via the
-+     * `submit` event. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit`
-+     * to have access to the updated model.
-      *
--     * @example
--     * See {@link ng.directive:ngClick ngClick}
--     */
--
--    /**
--     * @ngdoc directive
--     * @name ngBlur
-+     * ### Overriding immediate updates
-      *
--     * @description
--     * Specify custom behavior on blur event.
-+     * The following example shows how to override immediate updates. Changes on the inputs within the
-+     * form will update the model only when the control loses focus (blur event). If `escape` key is
-+     * pressed while the input field is focused, the value is reset to the value in the current model.
-      *
--     * @element window, input, select, textarea, a
--     * @priority 0
--     * @param {expression} ngBlur {@link guide/expression Expression} to evaluate upon
--     * blur. ({@link guide/expression#-event- Event object is available as `$event`})
-+     * <example name="ngModelOptions-directive-blur" module="optionsExample">
-+     *   <file name="index.html">
-+     *     <div ng-controller="ExampleController">
-+     *       <form name="userForm">
-+     *         <label>
-+     *           Name:
-+     *           <input type="text" name="userName"
-+     *                  ng-model="user.name"
-+     *                  ng-model-options="{ updateOn: 'blur' }"
-+     *                  ng-keyup="cancel($event)" />
-+     *         </label><br />
-+     *         <label>
-+     *           Other data:
-+     *           <input type="text" ng-model="user.data" />
-+     *         </label><br />
-+     *       </form>
-+     *       <pre>user.name = <span ng-bind="user.name"></span></pre>
-+     *     </div>
-+     *   </file>
-+     *   <file name="app.js">
-+     *     angular.module('optionsExample', [])
-+     *       .controller('ExampleController', ['$scope', function($scope) {
-+     *         $scope.user = { name: 'say', data: '' };
-+     *
-+     *         $scope.cancel = function(e) {
-+     *           if (e.keyCode === 27) {
-+     *             $scope.userForm.userName.$rollbackViewValue();
-+     *           }
-+     *         };
-+     *       }]);
-+     *   </file>
-+     *   <file name="protractor.js" type="protractor">
-+     *     var model = element(by.binding('user.name'));
-+     *     var input = element(by.model('user.name'));
-+     *     var other = element(by.model('user.data'));
-+     *
-+     *     it('should allow custom events', function() {
-+     *       input.sendKeys(' hello');
-+     *       input.click();
-+     *       expect(model.getText()).toEqual('say');
-+     *       other.click();
-+     *       expect(model.getText()).toEqual('say hello');
-+     *     });
-      *
--     * @example
--     * See {@link ng.directive:ngClick ngClick}
--     */
--
--    /**
--     * @ngdoc directive
--     * @name ngCopy
-+     *     it('should $rollbackViewValue when model changes', function() {
-+     *       input.sendKeys(' hello');
-+     *       expect(input.getAttribute('value')).toEqual('say hello');
-+     *       input.sendKeys(protractor.Key.ESCAPE);
-+     *       expect(input.getAttribute('value')).toEqual('say');
-+     *       other.click();
-+     *       expect(model.getText()).toEqual('say');
-+     *     });
-+     *   </file>
-+     * </example>
-      *
--     * @description
--     * Specify custom behavior on copy event.
-+     * ### Debouncing updates
-      *
--     * @element window, input, select, textarea, a
--     * @priority 0
--     * @param {expression} ngCopy {@link guide/expression Expression} to evaluate upon
--     * copy. ({@link guide/expression#-event- Event object is available as `$event`})
-+     * The next example shows how to debounce model changes. Model will be updated only 1 sec after last change.
-+     * If the `Clear` button is pressed, any debounced action is canceled and the value becomes empty.
-+     *
-+     * <example name="ngModelOptions-directive-debounce" module="optionsExample">
-+     *   <file name="index.html">
-+     *     <div ng-controller="ExampleController">
-+     *       <form name="userForm">
-+     *         Name:
-+     *         <input type="text" name="userName"
-+     *                ng-model="user.name"
-+     *                ng-model-options="{ debounce: 1000 }" />
-+     *         <button ng-click="userForm.userName.$rollbackViewValue(); user.name=''">Clear</button><br />
-+     *       </form>
-+     *       <pre>user.name = <span ng-bind="user.name"></span></pre>
-+     *     </div>
-+     *   </file>
-+     *   <file name="app.js">
-+     *     angular.module('optionsExample', [])
-+     *       .controller('ExampleController', ['$scope', function($scope) {
-+     *         $scope.user = { name: 'say' };
-+     *       }]);
-+     *   </file>
-+     * </example>
-+     *
-+     *
-+     * ## Model updates and validation
-+     *
-+     * The default behaviour in `ngModel` is that the model value is set to `undefined` when the
-+     * validation determines that the value is invalid. By setting the `allowInvalid` property to true,
-+     * the model will still be updated even if the value is invalid.
-+     *
-+     *
-+     * ## Connecting to the scope
-+     *
-+     * By setting the `getterSetter` property to true you are telling ngModel that the `ngModel` expression
-+     * on the scope refers to a "getter/setter" function rather than the value itself.
-+     *
-+     * The following example shows how to bind to getter/setters:
-+     *
-+     * <example name="ngModelOptions-directive-getter-setter" module="getterSetterExample">
-+     *   <file name="index.html">
-+     *     <div ng-controller="ExampleController">
-+     *       <form name="userForm">
-+     *         <label>
-+     *           Name:
-+     *           <input type="text" name="userName"
-+     *                  ng-model="user.name"
-+     *                  ng-model-options="{ getterSetter: true }" />
-+     *         </label>
-+     *       </form>
-+     *       <pre>user.name = <span ng-bind="user.name()"></span></pre>
-+     *     </div>
-+     *   </file>
-+     *   <file name="app.js">
-+     *     angular.module('getterSetterExample', [])
-+     *       .controller('ExampleController', ['$scope', function($scope) {
-+     *         var _name = 'Brian';
-+     *         $scope.user = {
-+     *           name: function(newName) {
-+     *             return angular.isDefined(newName) ? (_name = newName) : _name;
-+     *           }
-+     *         };
-+     *       }]);
-+     *   </file>
-+     * </example>
-+     *
-+     *
-+     * ## Specifying timezones
-+     *
-+     * You can specify the timezone that date/time input directives expect by providing its name in the
-+     * `timezone` property.
-+     *
-+     *
-+     * ## Programmatically changing options
-+     *
-+     * The `ngModelOptions` expression is only evaluated once when the directive is linked; it is not
-+     * watched for changes. However, it is possible to override the options on a single
-+     * {@link ngModel.NgModelController} instance with
-+     * {@link ngModel.NgModelController#$overrideModelOptions `NgModelController#$overrideModelOptions()`}.
-+     *
-+     *
-+     * @param {Object} ngModelOptions options to apply to {@link ngModel} directives on this element and
-+     *   and its descendents. Valid keys are:
-+     *   - `updateOn`: string specifying which event should the input be bound to. You can set several
-+     *     events using an space delimited list. There is a special event called `default` that
-+     *     matches the default events belonging to the control. These are the events that are bound to
-+     *     the control, and when fired, update the `$viewValue` via `$setViewValue`.
-+     *
-+     *     `ngModelOptions` considers every event that is not listed in `updateOn` a "default" event,
-+     *     since different control types use different default events.
-+     *
-+     *     See also the section {@link ngModelOptions#triggering-and-debouncing-model-updates
-+ *     Triggering and debouncing model updates}.
-+     *
-+     *   - `debounce`: integer value which contains the debounce model update value in milliseconds. A
-+     *     value of 0 triggers an immediate update. If an object is supplied instead, you can specify a
-+     *     custom value for each event. For example:
-+     *     ```
-+     *     ng-model-options="{
-+     *       updateOn: 'default blur click',
-+     *       debounce: { 'default': 500, 'blur': 0 }
-+     *     }"
-+     *     ```
-+     *
-+     *     "default" also applies to all events that are listed in `updateOn` but are not
-+     *     listed in `debounce`, i.e. "click" would also be debounced by 500 milliseconds.
-+     *
-+     *   - `allowInvalid`: boolean value which indicates that the model can be set with values that did
-+     *     not validate correctly instead of the default behavior of setting the model to undefined.
-+     *   - `getterSetter`: boolean value which determines whether or not to treat functions bound to
-+     *     `ngModel` as getters/setters.
-+     *   - `timezone`: Defines the timezone to be used to read/write the `Date` instance in the model for
-+     *     `<input type="date" />`, `<input type="time" />`, ... . It understands UTC/GMT and the
-+     *     continental US time zone abbreviations, but for general use, use a time zone offset, for
-+     *     example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
-+     *     If not specified, the timezone of the browser will be used.
-      *
--     * @example
--     <example>
--     <file name="index.html">
--     <input ng-copy="copied=true" ng-init="copied=false; value='copy me'" ng-model="value">
--     copied: {{copied}}
--     </file>
--     </example>
-      */
-+    var ngModelOptionsDirective = function() {
-+        NgModelOptionsController.$inject = ['$attrs', '$scope'];
-+        function NgModelOptionsController($attrs, $scope) {
-+            this.$$attrs = $attrs;
-+            this.$$scope = $scope;
-+        }
-+        NgModelOptionsController.prototype = {
-+            $onInit: function() {
-+                var parentOptions = this.parentCtrl ? this.parentCtrl.$options : defaultModelOptions;
-+                var modelOptionsDefinition = this.$$scope.$eval(this.$$attrs.ngModelOptions);
-+
-+                this.$options = parentOptions.createChild(modelOptionsDefinition);
-+            }
-+        };
-+
-+        return {
-+            restrict: 'A',
-+            // ngModelOptions needs to run before ngModel and input directives
-+            priority: 10,
-+            require: {parentCtrl: '?^^ngModelOptions'},
-+            bindToController: true,
-+            controller: NgModelOptionsController
-+        };
-+    };
-+
-+
-+// shallow copy over values from `src` that are not already specified on `dst`
-+    function defaults(dst, src) {
-+        forEach(src, function(value, key) {
-+            if (!isDefined(dst[key])) {
-+                dst[key] = value;
-+            }
-+        });
-+    }
- 
-     /**
-      * @ngdoc directive
--     * @name ngCut
-+     * @name ngNonBindable
-+     * @restrict AC
-+     * @priority 1000
-+     * @element ANY
-      *
-      * @description
--     * Specify custom behavior on cut event.
--     *
--     * @element window, input, select, textarea, a
--     * @priority 0
--     * @param {expression} ngCut {@link guide/expression Expression} to evaluate upon
--     * cut. ({@link guide/expression#-event- Event object is available as `$event`})
-+     * The `ngNonBindable` directive tells AngularJS not to compile or bind the contents of the current
-+     * DOM element, including directives on the element itself that have a lower priority than
-+     * `ngNonBindable`. This is useful if the element contains what appears to be AngularJS directives
-+     * and bindings but which should be ignored by AngularJS. This could be the case if you have a site
-+     * that displays snippets of code, for instance.
-      *
-      * @example
--     <example>
-+     * In this example there are two locations where a simple interpolation binding (`{{}}`) is present,
-+     * but the one wrapped in `ngNonBindable` is left alone.
-+     *
-+     <example name="ng-non-bindable">
-      <file name="index.html">
--     <input ng-cut="cut=true" ng-init="cut=false; value='cut me'" ng-model="value">
--     cut: {{cut}}
-+     <div>Normal: {{1 + 2}}</div>
-+     <div ng-non-bindable>Ignored: {{1 + 2}}</div>
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should check ng-non-bindable', function() {
-+       expect(element(by.binding('1 + 2')).getText()).toContain('3');
-+       expect(element.all(by.css('div')).last().getText()).toMatch(/1 \+ 2/);
-+     });
-      </file>
-      </example>
-      */
-+    var ngNonBindableDirective = ngDirective({ terminal: true, priority: 1000 });
-+
-+    /* exported ngOptionsDirective */
-+
-+    /* global jqLiteRemove */
-+
-+    var ngOptionsMinErr = minErr('ngOptions');
- 
-     /**
-      * @ngdoc directive
--     * @name ngPaste
-+     * @name ngOptions
-+     * @restrict A
-      *
-      * @description
--     * Specify custom behavior on paste event.
-      *
--     * @element window, input, select, textarea, a
--     * @priority 0
--     * @param {expression} ngPaste {@link guide/expression Expression} to evaluate upon
--     * paste. ({@link guide/expression#-event- Event object is available as `$event`})
-+     * The `ngOptions` attribute can be used to dynamically generate a list of `<option>`
-+     * elements for the `<select>` element using the array or object obtained by evaluating the
-+     * `ngOptions` comprehension expression.
-      *
--     * @example
--     <example>
--     <file name="index.html">
--     <input ng-paste="paste=true" ng-init="paste=false" placeholder='paste here'>
--     pasted: {{paste}}
--     </file>
--     </example>
--     */
--
--    /**
--     * @ngdoc directive
--     * @name ngIf
--     * @restrict A
-+     * In many cases, {@link ng.directive:ngRepeat ngRepeat} can be used on `<option>` elements instead of
-+     * `ngOptions` to achieve a similar result. However, `ngOptions` provides some benefits:
-+     * - more flexibility in how the `<select>`'s model is assigned via the `select` **`as`** part of the
-+     * comprehension expression
-+     * - reduced memory consumption by not creating a new scope for each repeated instance
-+     * - increased render speed by creating the options in a documentFragment instead of individually
-      *
--     * @description
--     * The `ngIf` directive removes or recreates a portion of the DOM tree based on an
--     * {expression}. If the expression assigned to `ngIf` evaluates to a false
--     * value then the element is removed from the DOM, otherwise a clone of the
--     * element is reinserted into the DOM.
-+     * When an item in the `<select>` menu is selected, the array element or object property
-+     * represented by the selected option will be bound to the model identified by the `ngModel`
-+     * directive.
-      *
--     * `ngIf` differs from `ngShow` and `ngHide` in that `ngIf` completely removes and recreates the
--     * element in the DOM rather than changing its visibility via the `display` css property.  A common
--     * case when this difference is significant is when using css selectors that rely on an element's
--     * position within the DOM, such as the `:first-child` or `:last-child` pseudo-classes.
-+     * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
-+     * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
-+     * option. See example below for demonstration.
-      *
--     * Note that when an element is removed using `ngIf` its scope is destroyed and a new scope
--     * is created when the element is restored.  The scope created within `ngIf` inherits from
--     * its parent scope using
--     * [prototypal inheritance](https://github.com/angular/angular.js/wiki/The-Nuances-of-Scope-Prototypal-Inheritance).
--     * An important implication of this is if `ngModel` is used within `ngIf` to bind to
--     * a javascript primitive defined in the parent scope. In this case any modifications made to the
--     * variable within the child scope will override (hide) the value in the parent scope.
-+     * ## Complex Models (objects or collections)
-      *
--     * Also, `ngIf` recreates elements using their compiled state. An example of this behavior
--     * is if an element's class attribute is directly modified after it's compiled, using something like
--     * jQuery's `.addClass()` method, and the element is later removed. When `ngIf` recreates the element
--     * the added class will be lost because the original compiled state is used to regenerate the element.
-+     * By default, `ngModel` watches the model by reference, not value. This is important to know when
-+     * binding the select to a model that is an object or a collection.
-      *
--     * Additionally, you can provide animations via the `ngAnimate` module to animate the `enter`
--     * and `leave` effects.
-+     * One issue occurs if you want to preselect an option. For example, if you set
-+     * the model to an object that is equal to an object in your collection, `ngOptions` won't be able to set the selection,
-+     * because the objects are not identical. So by default, you should always reference the item in your collection
-+     * for preselections, e.g.: `$scope.selected = $scope.collection[3]`.
-      *
--     * @animations
--     * enter - happens just after the ngIf contents change and a new DOM element is created and injected into the ngIf container
--     * leave - happens just before the ngIf contents are removed from the DOM
-+     * Another solution is to use a `track by` clause, because then `ngOptions` will track the identity
-+     * of the item not by reference, but by the result of the `track by` expression. For example, if your
-+     * collection items have an id property, you would `track by item.id`.
-      *
--     * @element ANY
--     * @scope
--     * @priority 600
--     * @param {expression} ngIf If the {@link guide/expression expression} is falsy then
--     *     the element is removed from the DOM tree. If it is truthy a copy of the compiled
--     *     element is added to the DOM tree.
-+     * A different issue with objects or collections is that ngModel won't detect if an object property or
-+     * a collection item changes. For that reason, `ngOptions` additionally watches the model using
-+     * `$watchCollection`, when the expression contains a `track by` clause or the the select has the `multiple` attribute.
-+     * This allows ngOptions to trigger a re-rendering of the options even if the actual object/collection
-+     * has not changed identity, but only a property on the object or an item in the collection changes.
-      *
--     * @example
--     <example module="ngAnimate" deps="angular-animate.js" animations="true">
--     <file name="index.html">
--     Click me: <input type="checkbox" ng-model="checked" ng-init="checked=true" /><br/>
--     Show when checked:
--     <span ng-if="checked" class="animate-if">
--     I'm removed when the checkbox is unchecked.
--     </span>
--     </file>
--     <file name="animations.css">
--     .animate-if {
--        background:white;
--        border:1px solid black;
--        padding:10px;
--      }
--
--     .animate-if.ng-enter, .animate-if.ng-leave {
--        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
--        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
--      }
--
--     .animate-if.ng-enter,
--     .animate-if.ng-leave.ng-leave-active {
--        opacity:0;
--      }
--
--     .animate-if.ng-leave,
--     .animate-if.ng-enter.ng-enter-active {
--        opacity:1;
--      }
--     </file>
--     </example>
--     */
--    var ngIfDirective = ['$animate', function($animate) {
--        return {
--            transclude: 'element',
--            priority: 600,
--            terminal: true,
--            restrict: 'A',
--            $$tlb: true,
--            link: function ($scope, $element, $attr, ctrl, $transclude) {
--                var block, childScope, previousElements;
--                $scope.$watch($attr.ngIf, function ngIfWatchAction(value) {
--
--                    if (toBoolean(value)) {
--                        if (!childScope) {
--                            childScope = $scope.$new();
--                            $transclude(childScope, function (clone) {
--                                clone[clone.length++] = document.createComment(' end ngIf: ' + $attr.ngIf + ' ');
--                                // Note: We only need the first/last node of the cloned nodes.
--                                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
--                                // by a directive with templateUrl when it's template arrives.
--                                block = {
--                                    clone: clone
--                                };
--                                $animate.enter(clone, $element.parent(), $element);
--                            });
--                        }
--                    } else {
--                        if(previousElements) {
--                            previousElements.remove();
--                            previousElements = null;
--                        }
--                        if(childScope) {
--                            childScope.$destroy();
--                            childScope = null;
--                        }
--                        if(block) {
--                            previousElements = getBlockElements(block.clone);
--                            $animate.leave(previousElements, function() {
--                                previousElements = null;
--                            });
--                            block = null;
--                        }
--                    }
--                });
--            }
--        };
--    }];
--
--    /**
--     * @ngdoc directive
--     * @name ngInclude
--     * @restrict ECA
-+     * Note that `$watchCollection` does a shallow comparison of the properties of the object (or the items in the collection
-+     * if the model is an array). This means that changing a property deeper than the first level inside the
-+     * object/collection will not trigger a re-rendering.
-      *
--     * @description
--     * Fetches, compiles and includes an external HTML fragment.
-+     * ## `select` **`as`**
-      *
--     * By default, the template URL is restricted to the same domain and protocol as the
--     * application document. This is done by calling {@link ng.$sce#getTrustedResourceUrl
-- * $sce.getTrustedResourceUrl} on it. To load templates from other domains or protocols
--     * you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist them} or
--     * [wrap them](ng.$sce#trustAsResourceUrl) as trusted values. Refer to Angular's {@link
--        * ng.$sce Strict Contextual Escaping}.
-+     * Using `select` **`as`** will bind the result of the `select` expression to the model, but
-+     * the value of the `<select>` and `<option>` html elements will be either the index (for array data sources)
-+     * or property name (for object data sources) of the value within the collection. If a **`track by`** expression
-+     * is used, the result of that expression will be set as the value of the `option` and `select` elements.
-      *
--     * In addition, the browser's
--     * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
--     * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
--     * policy may further restrict whether the template is successfully loaded.
--     * For example, `ngInclude` won't work for cross-domain requests on all browsers and for `file://`
--     * access on some browsers.
-      *
--     * @animations
--     * enter - animation is used to bring new content into the browser.
--     * leave - animation is used to animate existing content away.
-+     * ### `select` **`as`** and **`track by`**
-      *
--     * The enter and leave animation occur concurrently.
-+     * <div class="alert alert-warning">
-+     * Be careful when using `select` **`as`** and **`track by`** in the same expression.
-+     * </div>
-      *
--     * @scope
--     * @priority 400
-+     * Given this array of items on the $scope:
-      *
--     * @param {string} ngInclude|src angular expression evaluating to URL. If the source is a string constant,
--     *                 make sure you wrap it in **single** quotes, e.g. `src="'myPartialTemplate.html'"`.
--     * @param {string=} onload Expression to evaluate when a new partial is loaded.
-+     * ```js
-+     * $scope.items = [{
-+     *   id: 1,
-+     *   label: 'aLabel',
-+     *   subItem: { name: 'aSubItem' }
-+     * }, {
-+     *   id: 2,
-+     *   label: 'bLabel',
-+     *   subItem: { name: 'bSubItem' }
-+     * }];
-+     * ```
-      *
--     * @param {string=} autoscroll Whether `ngInclude` should call {@link ng.$anchorScroll
-- *                  $anchorScroll} to scroll the viewport after the content is loaded.
-+     * This will work:
-      *
--     *                  - If the attribute is not set, disable scrolling.
--     *                  - If the attribute is set without value, enable scrolling.
--     *                  - Otherwise enable scrolling only if the expression evaluates to truthy value.
-+     * ```html
-+     * <select ng-options="item as item.label for item in items track by item.id" ng-model="selected"></select>
-+     * ```
-+     * ```js
-+     * $scope.selected = $scope.items[0];
-+     * ```
-+     *
-+     * but this will not work:
-+     *
-+     * ```html
-+     * <select ng-options="item.subItem as item.label for item in items track by item.id" ng-model="selected"></select>
-+     * ```
-+     * ```js
-+     * $scope.selected = $scope.items[0].subItem;
-+     * ```
-+     *
-+     * In both examples, the **`track by`** expression is applied successfully to each `item` in the
-+     * `items` array. Because the selected option has been set programmatically in the controller, the
-+     * **`track by`** expression is also applied to the `ngModel` value. In the first example, the
-+     * `ngModel` value is `items[0]` and the **`track by`** expression evaluates to `items[0].id` with
-+     * no issue. In the second example, the `ngModel` value is `items[0].subItem` and the **`track by`**
-+     * expression evaluates to `items[0].subItem.id` (which is undefined). As a result, the model value
-+     * is not matched against any `<option>` and the `<select>` appears as having no selected value.
-+     *
-+     *
-+     * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+     * @param {comprehension_expression} ngOptions in one of the following forms:
-+     *
-+     *   * for array data sources:
-+     *     * `label` **`for`** `value` **`in`** `array`
-+     *     * `select` **`as`** `label` **`for`** `value` **`in`** `array`
-+     *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array`
-+     *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array`
-+     *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
-+     *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
-+     *     * `label` **`for`** `value` **`in`** `array` | orderBy:`orderexpr` **`track by`** `trackexpr`
-+     *        (for including a filter with `track by`)
-+     *   * for object data sources:
-+     *     * `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
-+     *     * `select` **`as`** `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
-+     *     * `label` **`group by`** `group` **`for (`**`key`**`,`** `value`**`) in`** `object`
-+     *     * `label` **`disable when`** `disable` **`for (`**`key`**`,`** `value`**`) in`** `object`
-+     *     * `select` **`as`** `label` **`group by`** `group`
-+     *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
-+     *     * `select` **`as`** `label` **`disable when`** `disable`
-+     *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
-+     *
-+     * Where:
-+     *
-+     *   * `array` / `object`: an expression which evaluates to an array / object to iterate over.
-+     *   * `value`: local variable which will refer to each item in the `array` or each property value
-+     *      of `object` during iteration.
-+     *   * `key`: local variable which will refer to a property name in `object` during iteration.
-+     *   * `label`: The result of this expression will be the label for `<option>` element. The
-+     *     `expression` will most likely refer to the `value` variable (e.g. `value.propertyName`).
-+     *   * `select`: The result of this expression will be bound to the model of the parent `<select>`
-+     *      element. If not specified, `select` expression will default to `value`.
-+     *   * `group`: The result of this expression will be used to group options using the `<optgroup>`
-+     *      DOM element.
-+     *   * `disable`: The result of this expression will be used to disable the rendered `<option>`
-+     *      element. Return `true` to disable.
-+     *   * `trackexpr`: Used when working with an array of objects. The result of this expression will be
-+     *      used to identify the objects in the array. The `trackexpr` will most likely refer to the
-+     *     `value` variable (e.g. `value.propertyName`). With this the selection is preserved
-+     *      even when the options are recreated (e.g. reloaded from the server).
-+     * @param {string=} name Property name of the form under which the control is published.
-+     * @param {string=} required The control is considered valid only if value is entered.
-+     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-+     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-+     *    `required` when you want to data-bind to the `required` attribute.
-+     * @param {string=} ngAttrSize sets the size of the select element dynamically. Uses the
-+     * {@link guide/interpolation#-ngattr-for-binding-to-arbitrary-attributes ngAttr} directive.
-      *
-      * @example
--     <example module="ngAnimate" deps="angular-animate.js" animations="true">
-+     <example module="selectExample" name="select">
-      <file name="index.html">
--     <div ng-controller="Ctrl">
--     <select ng-model="template" ng-options="t.name for t in templates">
--     <option value="">(blank)</option>
--     </select>
--     url of the template: <tt>{{template.url}}</tt>
-+     <script>
-+     angular.module('selectExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+            $scope.colors = [
-+              {name:'black', shade:'dark'},
-+              {name:'white', shade:'light', notAnOption: true},
-+              {name:'red', shade:'dark'},
-+              {name:'blue', shade:'dark', notAnOption: true},
-+              {name:'yellow', shade:'light', notAnOption: false}
-+            ];
-+            $scope.myColor = $scope.colors[2]; // red
-+          }]);
-+     </script>
-+     <div ng-controller="ExampleController">
-+     <ul>
-+     <li ng-repeat="color in colors">
-+     <label>Name: <input ng-model="color.name"></label>
-+     <label><input type="checkbox" ng-model="color.notAnOption"> Disabled?</label>
-+     <button ng-click="colors.splice($index, 1)" aria-label="Remove">X</button>
-+     </li>
-+     <li>
-+     <button ng-click="colors.push({})">add</button>
-+     </li>
-+     </ul>
-      <hr/>
--     <div class="slide-animate-container">
--     <div class="slide-animate" ng-include="template.url"></div>
--     </div>
--     </div>
--     </file>
--     <file name="script.js">
--     function Ctrl($scope) {
--        $scope.templates =
--          [ { name: 'template1.html', url: 'template1.html'},
--            { name: 'template2.html', url: 'template2.html'} ];
--        $scope.template = $scope.templates[0];
--      }
--     </file>
--     <file name="template1.html">
--     Content of template1.html
--     </file>
--     <file name="template2.html">
--     Content of template2.html
--     </file>
--     <file name="animations.css">
--     .slide-animate-container {
--        position:relative;
--        background:white;
--        border:1px solid black;
--        height:40px;
--        overflow:hidden;
--      }
-+     <label>Color (null not allowed):
-+     <select ng-model="myColor" ng-options="color.name for color in colors"></select>
-+     </label><br/>
-+     <label>Color (null allowed):
-+     <span  class="nullable">
-+     <select ng-model="myColor" ng-options="color.name for color in colors">
-+     <option value="">-- choose color --</option>
-+     </select>
-+     </span></label><br/>
- 
--     .slide-animate {
--        padding:10px;
--      }
-+     <label>Color grouped by shade:
-+     <select ng-model="myColor" ng-options="color.name group by color.shade for color in colors">
-+     </select>
-+     </label><br/>
- 
--     .slide-animate.ng-enter, .slide-animate.ng-leave {
--        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
--        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-+     <label>Color grouped by shade, with some disabled:
-+     <select ng-model="myColor"
-+     ng-options="color.name group by color.shade disable when color.notAnOption for color in colors">
-+     </select>
-+     </label><br/>
- 
--        position:absolute;
--        top:0;
--        left:0;
--        right:0;
--        bottom:0;
--        display:block;
--        padding:10px;
--      }
- 
--     .slide-animate.ng-enter {
--        top:-50px;
--      }
--     .slide-animate.ng-enter.ng-enter-active {
--        top:0;
--      }
- 
--     .slide-animate.ng-leave {
--        top:0;
--      }
--     .slide-animate.ng-leave.ng-leave-active {
--        top:50px;
--      }
-+     Select <button ng-click="myColor = { name:'not in list', shade: 'other' }">bogus</button>.
-+     <br/>
-+     <hr/>
-+     Currently selected: {{ {selected_color:myColor} }}
-+     <div style="border:solid 1px black; height:20px"
-+     ng-style="{'background-color':myColor.name}">
-+     </div>
-+     </div>
-      </file>
-      <file name="protractor.js" type="protractor">
--     var templateSelect = element(by.model('template'));
--     var includeElem = element(by.css('[ng-include]'));
--
--     it('should load template1.html', function() {
--        expect(includeElem.getText()).toMatch(/Content of template1.html/);
--      });
--
--     it('should load template2.html', function() {
--        if (browser.params.browser == 'firefox') {
--          // Firefox can't handle using selects
--          // See https://github.com/angular/protractor/issues/480
--          return;
--        }
--        templateSelect.click();
--        templateSelect.element.all(by.css('option')).get(2).click();
--        expect(includeElem.getText()).toMatch(/Content of template2.html/);
--      });
--
--     it('should change to blank', function() {
--        if (browser.params.browser == 'firefox') {
--          // Firefox can't handle using selects
--          return;
--        }
--        templateSelect.click();
--        templateSelect.element.all(by.css('option')).get(0).click();
--        expect(includeElem.isPresent()).toBe(false);
--      });
-+     it('should check ng-options', function() {
-+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('red');
-+           element.all(by.model('myColor')).first().click();
-+           element.all(by.css('select[ng-model="myColor"] option')).first().click();
-+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('black');
-+           element(by.css('.nullable select[ng-model="myColor"]')).click();
-+           element.all(by.css('.nullable select[ng-model="myColor"] option')).first().click();
-+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('null');
-+         });
-      </file>
-      </example>
-      */
- 
-+    /* eslint-disable max-len */
-+//                     //00001111111111000000000002222222222000000000000000000000333333333300000000000000000000000004444444444400000000000005555555555555000000000666666666666600000007777777777777000000000000000888888888800000000000000000009999999999
-+    var NG_OPTIONS_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([$\w][$\w]*)|(?:\(\s*([$\w][$\w]*)\s*,\s*([$\w][$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/;
-+    // 1: value expression (valueFn)
-+    // 2: label expression (displayFn)
-+    // 3: group by expression (groupByFn)
-+    // 4: disable when expression (disableWhenFn)
-+    // 5: array item variable name
-+    // 6: object item key variable name
-+    // 7: object item value variable name
-+    // 8: collection expression
-+    // 9: track by expression
-+    /* eslint-enable */
-+
-+
-+    var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile, $document, $parse) {
-+
-+        function parseOptionsExpression(optionsExp, selectElement, scope) {
-+
-+            var match = optionsExp.match(NG_OPTIONS_REGEXP);
-+            if (!(match)) {
-+                throw ngOptionsMinErr('iexp',
-+                    'Expected expression in form of ' +
-+                    '\'_select_ (as _label_)? for (_key_,)?_value_ in _collection_\'' +
-+                    ' but got \'{0}\'. Element: {1}',
-+                    optionsExp, startingTag(selectElement));
-+            }
- 
--    /**
--     * @ngdoc event
--     * @name ngInclude#$includeContentRequested
--     * @eventType emit on the scope ngInclude was declared in
--     * @description
--     * Emitted every time the ngInclude content is requested.
--     */
-+            // Extract the parts from the ngOptions expression
-+
-+            // The variable name for the value of the item in the collection
-+            var valueName = match[5] || match[7];
-+            // The variable name for the key of the item in the collection
-+            var keyName = match[6];
-+
-+            // An expression that generates the viewValue for an option if there is a label expression
-+            var selectAs = / as /.test(match[0]) && match[1];
-+            // An expression that is used to track the id of each object in the options collection
-+            var trackBy = match[9];
-+            // An expression that generates the viewValue for an option if there is no label expression
-+            var valueFn = $parse(match[2] ? match[1] : valueName);
-+            var selectAsFn = selectAs && $parse(selectAs);
-+            var viewValueFn = selectAsFn || valueFn;
-+            var trackByFn = trackBy && $parse(trackBy);
-+
-+            // Get the value by which we are going to track the option
-+            // if we have a trackFn then use that (passing scope and locals)
-+            // otherwise just hash the given viewValue
-+            var getTrackByValueFn = trackBy ?
-+                function(value, locals) { return trackByFn(scope, locals); } :
-+                function getHashOfValue(value) { return hashKey(value); };
-+            var getTrackByValue = function(value, key) {
-+                return getTrackByValueFn(value, getLocals(value, key));
-+            };
- 
-+            var displayFn = $parse(match[2] || match[1]);
-+            var groupByFn = $parse(match[3] || '');
-+            var disableWhenFn = $parse(match[4] || '');
-+            var valuesFn = $parse(match[8]);
-+
-+            var locals = {};
-+            var getLocals = keyName ? function(value, key) {
-+                locals[keyName] = key;
-+                locals[valueName] = value;
-+                return locals;
-+            } : function(value) {
-+                locals[valueName] = value;
-+                return locals;
-+            };
- 
--    /**
--     * @ngdoc event
--     * @name ngInclude#$includeContentLoaded
--     * @eventType emit on the current ngInclude scope
--     * @description
--     * Emitted every time the ngInclude content is reloaded.
--     */
--    var ngIncludeDirective = ['$http', '$templateCache', '$anchorScroll', '$animate', '$sce',
--        function($http,   $templateCache,   $anchorScroll,   $animate,   $sce) {
--            return {
--                restrict: 'ECA',
--                priority: 400,
--                terminal: true,
--                transclude: 'element',
--                controller: angular.noop,
--                compile: function(element, attr) {
--                    var srcExp = attr.ngInclude || attr.src,
--                        onloadExp = attr.onload || '',
--                        autoScrollExp = attr.autoscroll;
- 
--                    return function(scope, $element, $attr, ctrl, $transclude) {
--                        var changeCounter = 0,
--                            currentScope,
--                            previousElement,
--                            currentElement;
-+            function Option(selectValue, viewValue, label, group, disabled) {
-+                this.selectValue = selectValue;
-+                this.viewValue = viewValue;
-+                this.label = label;
-+                this.group = group;
-+                this.disabled = disabled;
-+            }
- 
--                        var cleanupLastIncludeContent = function() {
--                            if(previousElement) {
--                                previousElement.remove();
--                                previousElement = null;
--                            }
--                            if(currentScope) {
--                                currentScope.$destroy();
--                                currentScope = null;
--                            }
--                            if(currentElement) {
--                                $animate.leave(currentElement, function() {
--                                    previousElement = null;
--                                });
--                                previousElement = currentElement;
--                                currentElement = null;
--                            }
--                        };
-+            function getOptionValuesKeys(optionValues) {
-+                var optionValuesKeys;
- 
--                        scope.$watch($sce.parseAsResourceUrl(srcExp), function ngIncludeWatchAction(src) {
--                            var afterAnimation = function() {
--                                if (isDefined(autoScrollExp) && (!autoScrollExp || scope.$eval(autoScrollExp))) {
--                                    $anchorScroll();
--                                }
--                            };
--                            var thisChangeId = ++changeCounter;
-+                if (!keyName && isArrayLike(optionValues)) {
-+                    optionValuesKeys = optionValues;
-+                } else {
-+                    // if object, extract keys, in enumeration order, unsorted
-+                    optionValuesKeys = [];
-+                    for (var itemKey in optionValues) {
-+                        if (optionValues.hasOwnProperty(itemKey) && itemKey.charAt(0) !== '$') {
-+                            optionValuesKeys.push(itemKey);
-+                        }
-+                    }
-+                }
-+                return optionValuesKeys;
-+            }
- 
--                            if (src) {
--                                $http.get(src, {cache: $templateCache}).success(function(response) {
--                                    if (thisChangeId !== changeCounter) return;
--                                    var newScope = scope.$new();
--                                    ctrl.template = response;
-+            return {
-+                trackBy: trackBy,
-+                getTrackByValue: getTrackByValue,
-+                getWatchables: $parse(valuesFn, function(optionValues) {
-+                    // Create a collection of things that we would like to watch (watchedArray)
-+                    // so that they can all be watched using a single $watchCollection
-+                    // that only runs the handler once if anything changes
-+                    var watchedArray = [];
-+                    optionValues = optionValues || [];
-+
-+                    var optionValuesKeys = getOptionValuesKeys(optionValues);
-+                    var optionValuesLength = optionValuesKeys.length;
-+                    for (var index = 0; index < optionValuesLength; index++) {
-+                        var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index];
-+                        var value = optionValues[key];
-+
-+                        var locals = getLocals(value, key);
-+                        var selectValue = getTrackByValueFn(value, locals);
-+                        watchedArray.push(selectValue);
-+
-+                        // Only need to watch the displayFn if there is a specific label expression
-+                        if (match[2] || match[1]) {
-+                            var label = displayFn(scope, locals);
-+                            watchedArray.push(label);
-+                        }
- 
--                                    // Note: This will also link all children of ng-include that were contained in the original
--                                    // html. If that content contains controllers, ... they could pollute/change the scope.
--                                    // However, using ng-include on an element with additional content does not make sense...
--                                    // Note: We can't remove them in the cloneAttchFn of $transclude as that
--                                    // function is called before linking the content, which would apply child
--                                    // directives to non existing elements.
--                                    var clone = $transclude(newScope, function(clone) {
--                                        cleanupLastIncludeContent();
--                                        $animate.enter(clone, null, $element, afterAnimation);
--                                    });
-+                        // Only need to watch the disableWhenFn if there is a specific disable expression
-+                        if (match[4]) {
-+                            var disableWhen = disableWhenFn(scope, locals);
-+                            watchedArray.push(disableWhen);
-+                        }
-+                    }
-+                    return watchedArray;
-+                }),
- 
--                                    currentScope = newScope;
--                                    currentElement = clone;
-+                getOptions: function() {
-+
-+                    var optionItems = [];
-+                    var selectValueMap = {};
-+
-+                    // The option values were already computed in the `getWatchables` fn,
-+                    // which must have been called to trigger `getOptions`
-+                    var optionValues = valuesFn(scope) || [];
-+                    var optionValuesKeys = getOptionValuesKeys(optionValues);
-+                    var optionValuesLength = optionValuesKeys.length;
-+
-+                    for (var index = 0; index < optionValuesLength; index++) {
-+                        var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index];
-+                        var value = optionValues[key];
-+                        var locals = getLocals(value, key);
-+                        var viewValue = viewValueFn(scope, locals);
-+                        var selectValue = getTrackByValueFn(viewValue, locals);
-+                        var label = displayFn(scope, locals);
-+                        var group = groupByFn(scope, locals);
-+                        var disabled = disableWhenFn(scope, locals);
-+                        var optionItem = new Option(selectValue, viewValue, label, group, disabled);
-+
-+                        optionItems.push(optionItem);
-+                        selectValueMap[selectValue] = optionItem;
-+                    }
- 
--                                    currentScope.$emit('$includeContentLoaded');
--                                    scope.$eval(onloadExp);
--                                }).error(function() {
--                                    if (thisChangeId === changeCounter) cleanupLastIncludeContent();
--                                });
--                                scope.$emit('$includeContentRequested');
--                            } else {
--                                cleanupLastIncludeContent();
--                                ctrl.template = null;
--                            }
--                        });
-+                    return {
-+                        items: optionItems,
-+                        selectValueMap: selectValueMap,
-+                        getOptionFromViewValue: function(value) {
-+                            return selectValueMap[getTrackByValue(value)];
-+                        },
-+                        getViewValueFromOption: function(option) {
-+                            // If the viewValue could be an object that may be mutated by the application,
-+                            // we need to make a copy and not return the reference to the value on the option.
-+                            return trackBy ? copy(option.viewValue) : option.viewValue;
-+                        }
-                     };
-                 }
-             };
--        }];
-+        }
- 
--// This directive is called during the $transclude call of the first `ngInclude` directive.
--// It will replace and compile the content of the element with the loaded template.
--// We need this directive so that the element content is already filled when
--// the link function of another directive on the same element as ngInclude
--// is called.
--    var ngIncludeFillContentDirective = ['$compile',
--        function($compile) {
--            return {
--                restrict: 'ECA',
--                priority: -400,
--                require: 'ngInclude',
--                link: function(scope, $element, $attr, ctrl) {
--                    $element.html(ctrl.template);
--                    $compile($element.contents())(scope);
-+
-+        // Support: IE 9 only
-+        // We can't just jqLite('<option>') since jqLite is not smart enough
-+        // to create it in <select> and IE barfs otherwise.
-+        var optionTemplate = window.document.createElement('option'),
-+            optGroupTemplate = window.document.createElement('optgroup');
-+
-+        function ngOptionsPostLink(scope, selectElement, attr, ctrls) {
-+
-+            var selectCtrl = ctrls[0];
-+            var ngModelCtrl = ctrls[1];
-+            var multiple = attr.multiple;
-+
-+            // The emptyOption allows the application developer to provide their own custom "empty"
-+            // option when the viewValue does not match any of the option values.
-+            for (var i = 0, children = selectElement.children(), ii = children.length; i < ii; i++) {
-+                if (children[i].value === '') {
-+                    selectCtrl.hasEmptyOption = true;
-+                    selectCtrl.emptyOption = children.eq(i);
-+                    break;
-                 }
-+            }
-+
-+            // The empty option will be compiled and rendered before we first generate the options
-+            selectElement.empty();
-+
-+            var providedEmptyOption = !!selectCtrl.emptyOption;
-+
-+            var unknownOption = jqLite(optionTemplate.cloneNode(false));
-+            unknownOption.val('?');
-+
-+            var options;
-+            var ngOptions = parseOptionsExpression(attr.ngOptions, selectElement, scope);
-+            // This stores the newly created options before they are appended to the select.
-+            // Since the contents are removed from the fragment when it is appended,
-+            // we only need to create it once.
-+            var listFragment = $document[0].createDocumentFragment();
-+
-+            // Overwrite the implementation. ngOptions doesn't use hashes
-+            selectCtrl.generateUnknownOptionValue = function(val) {
-+                return '?';
-             };
--        }];
- 
--    /**
--     * @ngdoc directive
--     * @name ngInit
--     * @restrict AC
--     *
--     * @description
--     * The `ngInit` directive allows you to evaluate an expression in the
--     * current scope.
--     *
--     * <div class="alert alert-error">
--     * The only appropriate use of `ngInit` is for aliasing special properties of
--     * {@link ng.directive:ngRepeat `ngRepeat`}, as seen in the demo below. Besides this case, you
--     * should use {@link guide/controller controllers} rather than `ngInit`
--     * to initialize values on a scope.
--     * </div>
--     * <div class="alert alert-warning">
--     * **Note**: If you have assignment in `ngInit` along with {@link ng.$filter `$filter`}, make
--     * sure you have parenthesis for correct precedence:
--     * <pre class="prettyprint">
--     *   <div ng-init="test1 = (data | orderBy:'name')"></div>
--     * </pre>
--     * </div>
--     *
--     * @priority 450
--     *
--     * @element ANY
--     * @param {expression} ngInit {@link guide/expression Expression} to eval.
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <script>
--     function Ctrl($scope) {
--       $scope.list = [['a', 'b'], ['c', 'd']];
--     }
--     </script>
--     <div ng-controller="Ctrl">
--     <div ng-repeat="innerList in list" ng-init="outerIndex = $index">
--     <div ng-repeat="value in innerList" ng-init="innerIndex = $index">
--     <span class="example-init">list[ {{outerIndex}} ][ {{innerIndex}} ] = {{value}};</span>
--     </div>
--     </div>
--     </div>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should alias index positions', function() {
--         var elements = element.all(by.css('.example-init'));
--         expect(elements.get(0).getText()).toBe('list[ 0 ][ 0 ] = a;');
--         expect(elements.get(1).getText()).toBe('list[ 0 ][ 1 ] = b;');
--         expect(elements.get(2).getText()).toBe('list[ 1 ][ 0 ] = c;');
--         expect(elements.get(3).getText()).toBe('list[ 1 ][ 1 ] = d;');
--       });
--     </file>
--     </example>
--     */
--    var ngInitDirective = ngDirective({
--        priority: 450,
--        compile: function() {
--            return {
--                pre: function(scope, element, attrs) {
--                    scope.$eval(attrs.ngInit);
-+            // Update the controller methods for multiple selectable options
-+            if (!multiple) {
-+
-+                selectCtrl.writeValue = function writeNgOptionsValue(value) {
-+                    // The options might not be defined yet when ngModel tries to render
-+                    if (!options) return;
-+
-+                    var selectedOption = selectElement[0].options[selectElement[0].selectedIndex];
-+                    var option = options.getOptionFromViewValue(value);
-+
-+                    // Make sure to remove the selected attribute from the previously selected option
-+                    // Otherwise, screen readers might get confused
-+                    if (selectedOption) selectedOption.removeAttribute('selected');
-+
-+                    if (option) {
-+                        // Don't update the option when it is already selected.
-+                        // For example, the browser will select the first option by default. In that case,
-+                        // most properties are set automatically - except the `selected` attribute, which we
-+                        // set always
-+
-+                        if (selectElement[0].value !== option.selectValue) {
-+                            selectCtrl.removeUnknownOption();
-+
-+                            selectElement[0].value = option.selectValue;
-+                            option.element.selected = true;
-+                        }
-+
-+                        option.element.setAttribute('selected', 'selected');
-+                    } else {
-+                        selectCtrl.selectUnknownOrEmptyOption(value);
-+                    }
-+                };
-+
-+                selectCtrl.readValue = function readNgOptionsValue() {
-+
-+                    var selectedOption = options.selectValueMap[selectElement.val()];
-+
-+                    if (selectedOption && !selectedOption.disabled) {
-+                        selectCtrl.unselectEmptyOption();
-+                        selectCtrl.removeUnknownOption();
-+                        return options.getViewValueFromOption(selectedOption);
-+                    }
-+                    return null;
-+                };
-+
-+                // If we are using `track by` then we must watch the tracked value on the model
-+                // since ngModel only watches for object identity change
-+                // FIXME: When a user selects an option, this watch will fire needlessly
-+                if (ngOptions.trackBy) {
-+                    scope.$watch(
-+                        function() { return ngOptions.getTrackByValue(ngModelCtrl.$viewValue); },
-+                        function() { ngModelCtrl.$render(); }
-+                    );
-+                }
-+
-+            } else {
-+
-+                selectCtrl.writeValue = function writeNgOptionsMultiple(values) {
-+                    // The options might not be defined yet when ngModel tries to render
-+                    if (!options) return;
-+
-+                    // Only set `<option>.selected` if necessary, in order to prevent some browsers from
-+                    // scrolling to `<option>` elements that are outside the `<select>` element's viewport.
-+                    var selectedOptions = values && values.map(getAndUpdateSelectedOption) || [];
-+
-+                    options.items.forEach(function(option) {
-+                        if (option.element.selected && !includes(selectedOptions, option)) {
-+                            option.element.selected = false;
-+                        }
-+                    });
-+                };
-+
-+
-+                selectCtrl.readValue = function readNgOptionsMultiple() {
-+                    var selectedValues = selectElement.val() || [],
-+                        selections = [];
-+
-+                    forEach(selectedValues, function(value) {
-+                        var option = options.selectValueMap[value];
-+                        if (option && !option.disabled) selections.push(options.getViewValueFromOption(option));
-+                    });
-+
-+                    return selections;
-+                };
-+
-+                // If we are using `track by` then we must watch these tracked values on the model
-+                // since ngModel only watches for object identity change
-+                if (ngOptions.trackBy) {
-+
-+                    scope.$watchCollection(function() {
-+                        if (isArray(ngModelCtrl.$viewValue)) {
-+                            return ngModelCtrl.$viewValue.map(function(value) {
-+                                return ngOptions.getTrackByValue(value);
-+                            });
-+                        }
-+                    }, function() {
-+                        ngModelCtrl.$render();
-+                    });
-+
-+                }
-+            }
-+
-+            if (providedEmptyOption) {
-+
-+                // compile the element since there might be bindings in it
-+                $compile(selectCtrl.emptyOption)(scope);
-+
-+                selectElement.prepend(selectCtrl.emptyOption);
-+
-+                if (selectCtrl.emptyOption[0].nodeType === NODE_TYPE_COMMENT) {
-+                    // This means the empty option has currently no actual DOM node, probably because
-+                    // it has been modified by a transclusion directive.
-+                    selectCtrl.hasEmptyOption = false;
-+
-+                    // Redefine the registerOption function, which will catch
-+                    // options that are added by ngIf etc. (rendering of the node is async because of
-+                    // lazy transclusion)
-+                    selectCtrl.registerOption = function(optionScope, optionEl) {
-+                        if (optionEl.val() === '') {
-+                            selectCtrl.hasEmptyOption = true;
-+                            selectCtrl.emptyOption = optionEl;
-+                            selectCtrl.emptyOption.removeClass('ng-scope');
-+                            // This ensures the new empty option is selected if previously no option was selected
-+                            ngModelCtrl.$render();
-+
-+                            optionEl.on('$destroy', function() {
-+                                var needsRerender = selectCtrl.$isEmptyOptionSelected();
-+
-+                                selectCtrl.hasEmptyOption = false;
-+                                selectCtrl.emptyOption = undefined;
-+
-+                                if (needsRerender) ngModelCtrl.$render();
-+                            });
-+                        }
-+                    };
-+
-+                } else {
-+                    // remove the class, which is added automatically because we recompile the element and it
-+                    // becomes the compilation root
-+                    selectCtrl.emptyOption.removeClass('ng-scope');
-+                }
-+
-+            }
-+
-+            // We will re-render the option elements if the option values or labels change
-+            scope.$watchCollection(ngOptions.getWatchables, updateOptions);
-+
-+            // ------------------------------------------------------------------ //
-+
-+            function addOptionElement(option, parent) {
-+                var optionElement = optionTemplate.cloneNode(false);
-+                parent.appendChild(optionElement);
-+                updateOptionElement(option, optionElement);
-+            }
-+
-+            function getAndUpdateSelectedOption(viewValue) {
-+                var option = options.getOptionFromViewValue(viewValue);
-+                var element = option && option.element;
-+
-+                if (element && !element.selected) element.selected = true;
-+
-+                return option;
-+            }
-+
-+            function updateOptionElement(option, element) {
-+                option.element = element;
-+                element.disabled = option.disabled;
-+                // Support: IE 11 only, Edge 12-13 only
-+                // NOTE: The label must be set before the value, otherwise IE 11 & Edge create unresponsive
-+                // selects in certain circumstances when multiple selects are next to each other and display
-+                // the option list in listbox style, i.e. the select is [multiple], or specifies a [size].
-+                // See https://github.com/angular/angular.js/issues/11314 for more info.
-+                // This is unfortunately untestable with unit / e2e tests
-+                if (option.label !== element.label) {
-+                    element.label = option.label;
-+                    element.textContent = option.label;
-+                }
-+                element.value = option.selectValue;
-+            }
-+
-+            function updateOptions() {
-+                var previousValue = options && selectCtrl.readValue();
-+
-+                // We must remove all current options, but cannot simply set innerHTML = null
-+                // since the providedEmptyOption might have an ngIf on it that inserts comments which we
-+                // must preserve.
-+                // Instead, iterate over the current option elements and remove them or their optgroup
-+                // parents
-+                if (options) {
-+
-+                    for (var i = options.items.length - 1; i >= 0; i--) {
-+                        var option = options.items[i];
-+                        if (isDefined(option.group)) {
-+                            jqLiteRemove(option.element.parentNode);
-+                        } else {
-+                            jqLiteRemove(option.element);
-+                        }
-+                    }
-+                }
-+
-+                options = ngOptions.getOptions();
-+
-+                var groupElementMap = {};
-+
-+                options.items.forEach(function addOption(option) {
-+                    var groupElement;
-+
-+                    if (isDefined(option.group)) {
-+
-+                        // This option is to live in a group
-+                        // See if we have already created this group
-+                        groupElement = groupElementMap[option.group];
-+
-+                        if (!groupElement) {
-+
-+                            groupElement = optGroupTemplate.cloneNode(false);
-+                            listFragment.appendChild(groupElement);
-+
-+                            // Update the label on the group element
-+                            // "null" is special cased because of Safari
-+                            groupElement.label = option.group === null ? 'null' : option.group;
-+
-+                            // Store it for use later
-+                            groupElementMap[option.group] = groupElement;
-+                        }
-+
-+                        addOptionElement(option, groupElement);
-+
-+                    } else {
-+
-+                        // This option is not in a group
-+                        addOptionElement(option, listFragment);
-+                    }
-+                });
-+
-+                selectElement[0].appendChild(listFragment);
-+
-+                ngModelCtrl.$render();
-+
-+                // Check to see if the value has changed due to the update to the options
-+                if (!ngModelCtrl.$isEmpty(previousValue)) {
-+                    var nextValue = selectCtrl.readValue();
-+                    var isNotPrimitive = ngOptions.trackBy || multiple;
-+                    if (isNotPrimitive ? !equals(previousValue, nextValue) : previousValue !== nextValue) {
-+                        ngModelCtrl.$setViewValue(nextValue);
-+                        ngModelCtrl.$render();
-+                    }
-                 }
--            };
-+            }
-         }
--    });
- 
--    /**
--     * @ngdoc directive
--     * @name ngNonBindable
--     * @restrict AC
--     * @priority 1000
--     *
--     * @description
--     * The `ngNonBindable` directive tells Angular not to compile or bind the contents of the current
--     * DOM element. This is useful if the element contains what appears to be Angular directives and
--     * bindings but which should be ignored by Angular. This could be the case if you have a site that
--     * displays snippets of code, for instance.
--     *
--     * @element ANY
--     *
--     * @example
--     * In this example there are two locations where a simple interpolation binding (`{{}}`) is present,
--     * but the one wrapped in `ngNonBindable` is left alone.
--     *
--     * @example
--     <example>
--     <file name="index.html">
--     <div>Normal: {{1 + 2}}</div>
--     <div ng-non-bindable>Ignored: {{1 + 2}}</div>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should check ng-non-bindable', function() {
--         expect(element(by.binding('1 + 2')).getText()).toContain('3');
--         expect(element.all(by.css('div')).last().getText()).toMatch(/1 \+ 2/);
--       });
--     </file>
--     </example>
--     */
--    var ngNonBindableDirective = ngDirective({ terminal: true, priority: 1000 });
-+        return {
-+            restrict: 'A',
-+            terminal: true,
-+            require: ['select', 'ngModel'],
-+            link: {
-+                pre: function ngOptionsPreLink(scope, selectElement, attr, ctrls) {
-+                    // Deactivate the SelectController.register method to prevent
-+                    // option directives from accidentally registering themselves
-+                    // (and unwanted $destroy handlers etc.)
-+                    ctrls[0].registerOption = noop;
-+                },
-+                post: ngOptionsPostLink
-+            }
-+        };
-+    }];
- 
-     /**
-      * @ngdoc directive
-@@ -19507,27 +31067,27 @@
-      * @description
-      * `ngPluralize` is a directive that displays messages according to en-US localization rules.
-      * These rules are bundled with angular.js, but can be overridden
--     * (see {@link guide/i18n Angular i18n} dev guide). You configure ngPluralize directive
-+     * (see {@link guide/i18n AngularJS i18n} dev guide). You configure ngPluralize directive
-      * by specifying the mappings between
-      * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
-      * and the strings to be displayed.
-      *
--     * # Plural categories and explicit number rules
-+     * ## Plural categories and explicit number rules
-      * There are two
-      * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
--     * in Angular's default en-US locale: "one" and "other".
-+     * in AngularJS's default en-US locale: "one" and "other".
-      *
-      * While a plural category may match many numbers (for example, in en-US locale, "other" can match
-      * any number that is not 1), an explicit number rule can only match one number. For example, the
-      * explicit number rule for "3" matches the number 3. There are examples of plural categories
-      * and explicit number rules throughout the rest of this documentation.
-      *
--     * # Configuring ngPluralize
-+     * ## Configuring ngPluralize
-      * You configure ngPluralize by providing 2 attributes: `count` and `when`.
-      * You can also provide an optional attribute, `offset`.
-      *
-      * The value of the `count` attribute can be either a string or an {@link guide/expression
-- * Angular expression}; these are evaluated on the current scope for its bound value.
-+ * AngularJS expression}; these are evaluated on the current scope for its bound value.
-      *
-      * The `when` attribute specifies the mappings between plural categories and the actual
-      * string to be displayed. The value of the attribute should be a JSON object.
-@@ -19537,8 +31097,8 @@
-      * ```html
-      * <ng-pluralize count="personCount"
-      when="{'0': 'Nobody is viewing.',
-- *                      'one': '1 person is viewing.',
-- *                      'other': '{} people are viewing.'}">
-+     *                      'one': '1 person is viewing.',
-+     *                      'other': '{} people are viewing.'}">
-      * </ng-pluralize>
-      *```
-      *
-@@ -19549,11 +31109,14 @@
-      * show "a dozen people are viewing".
-      *
-      * You can use a set of closed braces (`{}`) as a placeholder for the number that you want substituted
--     * into pluralized strings. In the previous example, Angular will replace `{}` with
-+     * into pluralized strings. In the previous example, AngularJS will replace `{}` with
-      * <span ng-non-bindable>`{{personCount}}`</span>. The closed braces `{}` is a placeholder
-      * for <span ng-non-bindable>{{numberExpression}}</span>.
-      *
--     * # Configuring ngPluralize with offset
-+     * If no rule is defined for a category, then an empty string is displayed and a warning is generated.
-+     * Note that some locales define more categories than `one` and `other`. For example, fr-fr defines `few` and `many`.
-+     *
-+     * ## Configuring ngPluralize with offset
-      * The `offset` attribute allows further customization of pluralized text, which can result in
-      * a better user experience. For example, instead of the message "4 people are viewing this document",
-      * you might display "John, Kate and 2 others are viewing this document".
-@@ -19563,10 +31126,10 @@
-      * ```html
-      * <ng-pluralize count="personCount" offset=2
-      *               when="{'0': 'Nobody is viewing.',
-- *                      '1': '{{person1}} is viewing.',
-- *                      '2': '{{person1}} and {{person2}} are viewing.',
-- *                      'one': '{{person1}}, {{person2}} and one other person are viewing.',
-- *                      'other': '{{person1}}, {{person2}} and {} other people are viewing.'}">
-+     *                      '1': '{{person1}} is viewing.',
-+     *                      '2': '{{person1}} and {{person2}} are viewing.',
-+     *                      'one': '{{person1}}, {{person2}} and one other person are viewing.',
-+     *                      'other': '{{person1}}, {{person2}} and {} other people are viewing.'}">
-      * </ng-pluralize>
-      * ```
-      *
-@@ -19574,8 +31137,8 @@
-      * three explicit number rules 0, 1 and 2.
-      * When one person, perhaps John, views the document, "John is viewing" will be shown.
-      * When three people view the document, no explicit number rule is found, so
--     * an offset of 2 is taken off 3, and Angular uses 1 to decide the plural category.
--     * In this case, plural category 'one' is matched and "John, Marry and one other person are viewing"
-+     * an offset of 2 is taken off 3, and AngularJS uses 1 to decide the plural category.
-+     * In this case, plural category 'one' is matched and "John, Mary and one other person are viewing"
-      * is shown.
-      *
-      * Note that when you specify offsets, you must provide explicit number rules for
-@@ -19588,19 +31151,20 @@
-      * @param {number=} offset Offset to deduct from the total number.
-      *
-      * @example
--     <example>
-+     <example module="pluralizeExample" name="ng-pluralize">
-      <file name="index.html">
-      <script>
--     function Ctrl($scope) {
--            $scope.person1 = 'Igor';
--            $scope.person2 = 'Misko';
--            $scope.personCount = 1;
--          }
-+     angular.module('pluralizeExample', [])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+              $scope.person1 = 'Igor';
-+              $scope.person2 = 'Misko';
-+              $scope.personCount = 1;
-+            }]);
-      </script>
--     <div ng-controller="Ctrl">
--     Person 1:<input type="text" ng-model="person1" value="Igor" /><br/>
--     Person 2:<input type="text" ng-model="person2" value="Misko" /><br/>
--     Number of People:<input type="text" ng-model="personCount" value="1" /><br/>
-+     <div ng-controller="ExampleController">
-+     <label>Person 1:<input type="text" ng-model="person1" value="Igor" /></label><br/>
-+     <label>Person 2:<input type="text" ng-model="person2" value="Misko" /></label><br/>
-+     <label>Number of People:<input type="text" ng-model="personCount" value="1" /></label><br/>
- 
-      <!--- Example with simple pluralization rules for en locale --->
-      Without Offset:
-@@ -19670,10 +31234,11 @@
-      </file>
-      </example>
-      */
--    var ngPluralizeDirective = ['$locale', '$interpolate', function($locale, $interpolate) {
--        var BRACE = /{}/g;
-+    var ngPluralizeDirective = ['$locale', '$interpolate', '$log', function($locale, $interpolate, $log) {
-+        var BRACE = /{}/g,
-+            IS_WHEN = /^when(Minus)?(.+)$/;
-+
-         return {
--            restrict: 'EA',
-             link: function(scope, element, attr) {
-                 var numberExp = attr.count,
-                     whenExp = attr.$attr.when && element.attr(attr.$attr.when), // we have {{}} in attrs
-@@ -19682,41 +31247,64 @@
-                     whensExpFns = {},
-                     startSymbol = $interpolate.startSymbol(),
-                     endSymbol = $interpolate.endSymbol(),
--                    isWhen = /^when(Minus)?(.+)$/;
-+                    braceReplacement = startSymbol + numberExp + '-' + offset + endSymbol,
-+                    watchRemover = angular.noop,
-+                    lastCount;
- 
-                 forEach(attr, function(expression, attributeName) {
--                    if (isWhen.test(attributeName)) {
--                        whens[lowercase(attributeName.replace('when', '').replace('Minus', '-'))] =
--                            element.attr(attr.$attr[attributeName]);
-+                    var tmpMatch = IS_WHEN.exec(attributeName);
-+                    if (tmpMatch) {
-+                        var whenKey = (tmpMatch[1] ? '-' : '') + lowercase(tmpMatch[2]);
-+                        whens[whenKey] = element.attr(attr.$attr[attributeName]);
-                     }
-                 });
-                 forEach(whens, function(expression, key) {
--                    whensExpFns[key] =
--                        $interpolate(expression.replace(BRACE, startSymbol + numberExp + '-' +
--                        offset + endSymbol));
-+                    whensExpFns[key] = $interpolate(expression.replace(BRACE, braceReplacement));
-+
-                 });
- 
--                scope.$watch(function ngPluralizeWatch() {
--                    var value = parseFloat(scope.$eval(numberExp));
-+                scope.$watch(numberExp, function ngPluralizeWatchAction(newVal) {
-+                    var count = parseFloat(newVal);
-+                    var countIsNaN = isNumberNaN(count);
- 
--                    if (!isNaN(value)) {
--                        //if explicit number rule such as 1, 2, 3... is defined, just use it. Otherwise,
--                        //check it against pluralization rules in $locale service
--                        if (!(value in whens)) value = $locale.pluralCat(value - offset);
--                        return whensExpFns[value](scope, element, true);
--                    } else {
--                        return '';
-+                    if (!countIsNaN && !(count in whens)) {
-+                        // If an explicit number rule such as 1, 2, 3... is defined, just use it.
-+                        // Otherwise, check it against pluralization rules in $locale service.
-+                        count = $locale.pluralCat(count - offset);
-+                    }
-+
-+                    // If both `count` and `lastCount` are NaN, we don't need to re-register a watch.
-+                    // In JS `NaN !== NaN`, so we have to explicitly check.
-+                    if ((count !== lastCount) && !(countIsNaN && isNumberNaN(lastCount))) {
-+                        watchRemover();
-+                        var whenExpFn = whensExpFns[count];
-+                        if (isUndefined(whenExpFn)) {
-+                            if (newVal != null) {
-+                                $log.debug('ngPluralize: no rule defined for \'' + count + '\' in ' + whenExp);
-+                            }
-+                            watchRemover = noop;
-+                            updateElementText();
-+                        } else {
-+                            watchRemover = scope.$watch(whenExpFn, updateElementText);
-+                        }
-+                        lastCount = count;
-                     }
--                }, function ngPluralizeWatchAction(newVal) {
--                    element.text(newVal);
-                 });
-+
-+                function updateElementText(newText) {
-+                    element.text(newText || '');
-+                }
-             }
-         };
-     }];
- 
-+    /* exported ngRepeatDirective */
-+
-     /**
-      * @ngdoc directive
-      * @name ngRepeat
-+     * @multiElement
-+     * @restrict A
-      *
-      * @description
-      * The `ngRepeat` directive instantiates a template once per item from a collection. Each template
-@@ -19734,10 +31322,200 @@
-      * | `$even`   | {@type boolean} | true if the iterator position `$index` is even (otherwise false).           |
-      * | `$odd`    | {@type boolean} | true if the iterator position `$index` is odd (otherwise false).            |
-      *
--     * Creating aliases for these properties is possible with {@link ng.directive:ngInit `ngInit`}.
--     * This may be useful when, for instance, nesting ngRepeats.
-+     * <div class="alert alert-info">
-+     *   Creating aliases for these properties is possible with {@link ng.directive:ngInit `ngInit`}.
-+     *   This may be useful when, for instance, nesting ngRepeats.
-+     * </div>
-+     *
-+     *
-+     * ## Iterating over object properties
-+     *
-+     * It is possible to get `ngRepeat` to iterate over the properties of an object using the following
-+     * syntax:
-+     *
-+     * ```js
-+     * <div ng-repeat="(key, value) in myObj"> ... </div>
-+     * ```
-+     *
-+     * However, there are a few limitations compared to array iteration:
-+     *
-+     * - The JavaScript specification does not define the order of keys
-+     *   returned for an object, so AngularJS relies on the order returned by the browser
-+     *   when running `for key in myObj`. Browsers generally follow the strategy of providing
-+     *   keys in the order in which they were defined, although there are exceptions when keys are deleted
-+     *   and reinstated. See the
-+     *   [MDN page on `delete` for more info](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/delete#Cross-browser_notes).
-+     *
-+     * - `ngRepeat` will silently *ignore* object keys starting with `$`, because
-+     *   it's a prefix used by AngularJS for public (`$`) and private (`$$`) properties.
-+     *
-+     * - The built-in filters {@link ng.orderBy orderBy} and {@link ng.filter filter} do not work with
-+     *   objects, and will throw an error if used with one.
-+     *
-+     * If you are hitting any of these limitations, the recommended workaround is to convert your object into an array
-+     * that is sorted into the order that you prefer before providing it to `ngRepeat`. You could
-+     * do this with a filter such as [toArrayFilter](http://ngmodules.org/modules/angular-toArrayFilter)
-+     * or implement a `$watch` on the object yourself.
-+     *
-+     *
-+     * ## Tracking and Duplicates
-+     *
-+     * `ngRepeat` uses {@link $rootScope.Scope#$watchCollection $watchCollection} to detect changes in
-+     * the collection. When a change happens, `ngRepeat` then makes the corresponding changes to the DOM:
-+     *
-+     * * When an item is added, a new instance of the template is added to the DOM.
-+     * * When an item is removed, its template instance is removed from the DOM.
-+     * * When items are reordered, their respective templates are reordered in the DOM.
-+     *
-+     * To minimize creation of DOM elements, `ngRepeat` uses a function
-+     * to "keep track" of all items in the collection and their corresponding DOM elements.
-+     * For example, if an item is added to the collection, `ngRepeat` will know that all other items
-+     * already have DOM elements, and will not re-render them.
-+     *
-+     * All different types of tracking functions, their syntax, and and their support for duplicate
-+     * items in collections can be found in the
-+     * {@link ngRepeat#ngRepeat-arguments ngRepeat expression description}.
-      *
--     * # Special repeat start and end points
-+     * <div class="alert alert-success">
-+     * **Best Practice:** If you are working with objects that have a unique identifier property, you
-+     * should track by this identifier instead of the object instance,
-+     * e.g. `item in items track by item.id`.
-+     * Should you reload your data later, `ngRepeat` will not have to rebuild the DOM elements for items
-+     * it has already rendered, even if the JavaScript objects in the collection have been substituted
-+     * for new ones. For large collections, this significantly improves rendering performance.
-+     * </div>
-+     *
-+     * ### Effects of DOM Element re-use
-+     *
-+     * When DOM elements are re-used, ngRepeat updates the scope for the element, which will
-+     * automatically update any active bindings on the template. However, other
-+     * functionality will not be updated, because the element is not re-created:
-+     *
-+     * - Directives are not re-compiled
-+     * - {@link guide/expression#one-time-binding one-time expressions} on the repeated template are not
-+     * updated if they have stabilized.
-+     *
-+     * The above affects all kinds of element re-use due to tracking, but may be especially visible
-+     * when tracking by `$index` due to the way ngRepeat re-uses elements.
-+     *
-+     * The following example shows the effects of different actions with tracking:
-+
-+     <example module="ngRepeat" name="ngRepeat-tracking" deps="angular-animate.js" animations="true">
-+     <file name="script.js">
-+     angular.module('ngRepeat', ['ngAnimate']).controller('repeatController', function($scope) {
-+        var friends = [
-+          {name:'John', age:25},
-+          {name:'Mary', age:40},
-+          {name:'Peter', age:85}
-+        ];
-+
-+        $scope.removeFirst = function() {
-+          $scope.friends.shift();
-+        };
-+
-+        $scope.updateAge = function() {
-+          $scope.friends.forEach(function(el) {
-+            el.age = el.age + 5;
-+          });
-+        };
-+
-+        $scope.copy = function() {
-+          $scope.friends = angular.copy($scope.friends);
-+        };
-+
-+        $scope.reset = function() {
-+          $scope.friends = angular.copy(friends);
-+        };
-+
-+        $scope.reset();
-+      });
-+     </file>
-+     <file name="index.html">
-+     <div ng-controller="repeatController">
-+     <ol>
-+     <li>When you click "Update Age", only the first list updates the age, because all others have
-+     a one-time binding on the age property. If you then click "Copy", the current friend list
-+     is copied, and now the second list updates the age, because the identity of the collection items
-+     has changed and the list must be re-rendered. The 3rd and 4th list stay the same, because all the
-+     items are already known according to their tracking functions.
-+     </li>
-+     <li>When you click "Remove First", the 4th list has the wrong age on both remaining items. This is
-+     due to tracking by $index: when the first collection item is removed, ngRepeat reuses the first
-+     DOM element for the new first collection item, and so on. Since the age property is one-time
-+     bound, the value remains from the collection item which was previously at this index.
-+     </li>
-+     </ol>
-+
-+     <button ng-click="removeFirst()">Remove First</button>
-+     <button ng-click="updateAge()">Update Age</button>
-+     <button ng-click="copy()">Copy</button>
-+     <br><button ng-click="reset()">Reset List</button>
-+     <br>
-+     <code>track by $id(friend)</code> (default):
-+     <ul class="example-animate-container">
-+     <li class="animate-repeat" ng-repeat="friend in friends">
-+     {{friend.name}} is {{friend.age}} years old.
-+     </li>
-+     </ul>
-+     <code>track by $id(friend)</code> (default), with age one-time binding:
-+     <ul class="example-animate-container">
-+     <li class="animate-repeat" ng-repeat="friend in friends">
-+     {{friend.name}} is {{::friend.age}} years old.
-+     </li>
-+     </ul>
-+     <code>track by friend.name</code>, with age one-time binding:
-+     <ul class="example-animate-container">
-+     <li class="animate-repeat" ng-repeat="friend in friends track by friend.name">
-+     {{friend.name}}  is {{::friend.age}} years old.
-+     </li>
-+     </ul>
-+     <code>track by $index</code>, with age one-time binding:
-+     <ul class="example-animate-container">
-+     <li class="animate-repeat" ng-repeat="friend in friends track by $index">
-+     {{friend.name}} is {{::friend.age}} years old.
-+     </li>
-+     </ul>
-+     </div>
-+     </file>
-+     <file name="animations.css">
-+     .example-animate-container {
-+        background:white;
-+        border:1px solid black;
-+        list-style:none;
-+        margin:0;
-+        padding:0 10px;
-+      }
-+
-+     .animate-repeat {
-+        line-height:30px;
-+        list-style:none;
-+        box-sizing:border-box;
-+      }
-+
-+     .animate-repeat.ng-move,
-+     .animate-repeat.ng-enter,
-+     .animate-repeat.ng-leave {
-+        transition:all linear 0.5s;
-+      }
-+
-+     .animate-repeat.ng-leave.ng-leave-active,
-+     .animate-repeat.ng-move,
-+     .animate-repeat.ng-enter {
-+        opacity:0;
-+        max-height:0;
-+      }
-+
-+     .animate-repeat.ng-leave,
-+     .animate-repeat.ng-move.ng-move-active,
-+     .animate-repeat.ng-enter.ng-enter-active {
-+        opacity:1;
-+        max-height:30px;
-+      }
-+     </file>
-+     </example>
-+
-+     *
-+     * ## Special repeat start and end points
-      * To repeat a series of elements instead of just one parent element, ngRepeat (as well as other ng directives) supports extending
-      * the range of the repeater by defining explicit start and end points by using **ng-repeat-start** and **ng-repeat-end** respectively.
-      * The **ng-repeat-start** directive works the same as **ng-repeat**, but will repeat all the HTML code (including the tag it's defined on)
-@@ -19782,11 +31560,13 @@
-      * as **data-ng-repeat-start**, **x-ng-repeat-start** and **ng:repeat-start**).
-      *
-      * @animations
--     * **.enter** - when a new item is added to the list or when an item is revealed after a filter
-+     * | Animation                        | Occurs                              |
-+     * |----------------------------------|-------------------------------------|
-+     * | {@link ng.$animate#enter enter} | when a new item is added to the list or when an item is revealed after a filter |
-+     * | {@link ng.$animate#leave leave} | when an item is removed from the list or when an item is filtered out |
-+     * | {@link ng.$animate#move move } | when an adjacent item is filtered out causing a reorder or when the item contents are reordered |
-      *
--     * **.leave** - when an item is removed from the list or when an item is filtered out
--     *
--     * **.move** - when an adjacent item is filtered out causing a reorder or when the item contents are reordered
-+     * See the example below for defining CSS animations with ngRepeat.
-      *
-      * @element ANY
-      * @scope
-@@ -19804,54 +31584,91 @@
-      *
-      *     For example: `(name, age) in {'adam':10, 'amalie':12}`.
-      *
--     *   * `variable in expression track by tracking_expression` – You can also provide an optional tracking function
--     *     which can be used to associate the objects in the collection with the DOM elements. If no tracking function
--     *     is specified the ng-repeat associates elements by identity in the collection. It is an error to have
--     *     more than one tracking function to resolve to the same key. (This would mean that two distinct objects are
--     *     mapped to the same DOM element, which is not possible.)  Filters should be applied to the expression,
--     *     before specifying a tracking expression.
-+     *   * `variable in expression track by tracking_expression` – You can also provide an optional tracking expression
-+     *     which can be used to associate the objects in the collection with the DOM elements. If no tracking expression
-+     *     is specified, ng-repeat associates elements by identity. It is an error to have
-+     *     more than one tracking expression value resolve to the same key. (This would mean that two distinct objects are
-+     *     mapped to the same DOM element, which is not possible.)
-+     *
-+     *     *Default tracking: $id()*: `item in items` is equivalent to `item in items track by $id(item)`.
-+     *     This implies that the DOM elements will be associated by item identity in the collection.
-+     *
-+     *     The built-in `$id()` function can be used to assign a unique
-+     *     `$$hashKey` property to each item in the collection. This property is then used as a key to associated DOM elements
-+     *     with the corresponding item in the collection by identity. Moving the same object would move
-+     *     the DOM element in the same way in the DOM.
-+     *     Note that the default id function does not support duplicate primitive values (`number`, `string`),
-+     *     but supports duplictae non-primitive values (`object`) that are *equal* in shape.
-+     *
-+     *     *Custom Expression*: It is possible to use any AngularJS expression to compute the tracking
-+     *     id, for example with a function, or using a property on the collection items.
-+     *     `item in items track by item.id` is a typical pattern when the items have a unique identifier,
-+     *     e.g. database id. In this case the object identity does not matter. Two objects are considered
-+     *     equivalent as long as their `id` property is same.
-+     *     Tracking by unique identifier is the most performant way and should be used whenever possible.
-+     *
-+     *     *$index*: This special property tracks the collection items by their index, and
-+     *     re-uses the DOM elements that match that index, e.g. `item in items track by $index`. This can
-+     *     be used for a performance improvement if no unique identfier is available and the identity of
-+     *     the collection items cannot be easily computed. It also allows duplicates.
-+     *
-+     *     <div class="alert alert-warning">
-+     *       <strong>Note:</strong> Re-using DOM elements can have unforeseen effects. Read the
-+     *       {@link ngRepeat#tracking-and-duplicates section on tracking and duplicates} for
-+     *       more info.
-+     *     </div>
-+     *
-+     *     <div class="alert alert-warning">
-+     *       <strong>Note:</strong> the `track by` expression must come last - after any filters, and the alias expression:
-+     *       `item in items | filter:searchText as results  track by item.id`
-+     *     </div>
-      *
--     *     For example: `item in items` is equivalent to `item in items track by $id(item)'. This implies that the DOM elements
--     *     will be associated by item identity in the array.
-+     *   * `variable in expression as alias_expression` – You can also provide an optional alias expression which will then store the
-+     *     intermediate results of the repeater after the filters have been applied. Typically this is used to render a special message
-+     *     when a filter is active on the repeater, but the filtered result set is empty.
-      *
--     *     For example: `item in items track by $id(item)`. A built in `$id()` function can be used to assign a unique
--     *     `$$hashKey` property to each item in the array. This property is then used as a key to associated DOM elements
--     *     with the corresponding item in the array by identity. Moving the same object in array would move the DOM
--     *     element in the same way in the DOM.
-+     *     For example: `item in items | filter:x as results` will store the fragment of the repeated items as `results`, but only after
-+     *     the items have been processed through the filter.
-      *
--     *     For example: `item in items track by item.id` is a typical pattern when the items come from the database. In this
--     *     case the object identity does not matter. Two objects are considered equivalent as long as their `id`
--     *     property is same.
-+     *     Please note that `as [variable name] is not an operator but rather a part of ngRepeat
-+     *     micro-syntax so it can be used only after all filters (and not as operator, inside an expression).
-      *
--     *     For example: `item in items | filter:searchText track by item.id` is a pattern that might be used to apply a filter
--     *     to items in conjunction with a tracking expression.
-+     *     For example: `item in items | filter : x | orderBy : order | limitTo : limit as results track by item.id` .
-      *
-      * @example
--     * This example initializes the scope to a list of names and
--     * then uses `ngRepeat` to display every person:
--     <example module="ngAnimate" deps="angular-animate.js" animations="true">
-+     * This example uses `ngRepeat` to display a list of people. A filter is used to restrict the displayed
-+     * results by name or by age. New (entering) and removed (leaving) items are animated.
-+     <example module="ngRepeat" name="ngRepeat" deps="angular-animate.js" animations="true">
-      <file name="index.html">
--     <div ng-init="friends = [
--     {name:'John', age:25, gender:'boy'},
--     {name:'Jessie', age:30, gender:'girl'},
--     {name:'Johanna', age:28, gender:'girl'},
--     {name:'Joy', age:15, gender:'girl'},
--     {name:'Mary', age:28, gender:'girl'},
--     {name:'Peter', age:95, gender:'boy'},
--     {name:'Sebastian', age:50, gender:'boy'},
--     {name:'Erika', age:27, gender:'girl'},
--     {name:'Patrick', age:40, gender:'boy'},
--     {name:'Samantha', age:60, gender:'girl'}
--     ]">
-+     <div ng-controller="repeatController">
-      I have {{friends.length}} friends. They are:
--     <input type="search" ng-model="q" placeholder="filter friends..." />
-+     <input type="search" ng-model="q" placeholder="filter friends..." aria-label="filter friends" />
-      <ul class="example-animate-container">
--     <li class="animate-repeat" ng-repeat="friend in friends | filter:q">
-+     <li class="animate-repeat" ng-repeat="friend in friends | filter:q as results track by friend.name">
-      [{{$index + 1}}] {{friend.name}} who is {{friend.age}} years old.
-      </li>
-+     <li class="animate-repeat" ng-if="results.length === 0">
-+     <strong>No results found...</strong>
-+     </li>
-      </ul>
-      </div>
-      </file>
-+     <file name="script.js">
-+     angular.module('ngRepeat', ['ngAnimate']).controller('repeatController', function($scope) {
-+        $scope.friends = [
-+          {name:'John', age:25, gender:'boy'},
-+          {name:'Jessie', age:30, gender:'girl'},
-+          {name:'Johanna', age:28, gender:'girl'},
-+          {name:'Joy', age:15, gender:'girl'},
-+          {name:'Mary', age:28, gender:'girl'},
-+          {name:'Peter', age:95, gender:'boy'},
-+          {name:'Sebastian', age:50, gender:'boy'},
-+          {name:'Erika', age:27, gender:'girl'},
-+          {name:'Patrick', age:40, gender:'boy'},
-+          {name:'Samantha', age:60, gender:'girl'}
-+        ];
-+      });
-+     </file>
-      <file name="animations.css">
-      .example-animate-container {
-         background:white;
-@@ -19862,7 +31679,7 @@
-       }
- 
-      .animate-repeat {
--        line-height:40px;
-+        line-height:30px;
-         list-style:none;
-         box-sizing:border-box;
-       }
-@@ -19870,7 +31687,6 @@
-      .animate-repeat.ng-move,
-      .animate-repeat.ng-enter,
-      .animate-repeat.ng-leave {
--        -webkit-transition:all linear 0.5s;
-         transition:all linear 0.5s;
-       }
- 
-@@ -19885,7 +31701,7 @@
-      .animate-repeat.ng-move.ng-move-active,
-      .animate-repeat.ng-enter.ng-enter-active {
-         opacity:1;
--        max-height:40px;
-+        max-height:30px;
-       }
-      </file>
-      <file name="protractor.js" type="protractor">
-@@ -19912,39 +31728,74 @@
-      </file>
-      </example>
-      */
--    var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
-+    var ngRepeatDirective = ['$parse', '$animate', '$compile', function($parse, $animate, $compile) {
-         var NG_REMOVED = '$$NG_REMOVED';
-         var ngRepeatMinErr = minErr('ngRepeat');
-+
-+        var updateScope = function(scope, index, valueIdentifier, value, keyIdentifier, key, arrayLength) {
-+            // TODO(perf): generate setters to shave off ~40ms or 1-1.5%
-+            scope[valueIdentifier] = value;
-+            if (keyIdentifier) scope[keyIdentifier] = key;
-+            scope.$index = index;
-+            scope.$first = (index === 0);
-+            scope.$last = (index === (arrayLength - 1));
-+            scope.$middle = !(scope.$first || scope.$last);
-+            // eslint-disable-next-line no-bitwise
-+            scope.$odd = !(scope.$even = (index & 1) === 0);
-+        };
-+
-+        var getBlockStart = function(block) {
-+            return block.clone[0];
-+        };
-+
-+        var getBlockEnd = function(block) {
-+            return block.clone[block.clone.length - 1];
-+        };
-+
-+
-         return {
-+            restrict: 'A',
-+            multiElement: true,
-             transclude: 'element',
-             priority: 1000,
-             terminal: true,
-             $$tlb: true,
--            link: function($scope, $element, $attr, ctrl, $transclude){
-+            compile: function ngRepeatCompile($element, $attr) {
-                 var expression = $attr.ngRepeat;
--                var match = expression.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/),
--                    trackByExp, trackByExpGetter, trackByIdExpFn, trackByIdArrayFn, trackByIdObjFn,
--                    lhs, rhs, valueIdentifier, keyIdentifier,
--                    hashFnLocals = {$id: hashKey};
-+                var ngRepeatEndComment = $compile.$$createComment('end ngRepeat', expression);
-+
-+                var match = expression.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);
- 
-                 if (!match) {
--                    throw ngRepeatMinErr('iexp', "Expected expression in form of '_item_ in _collection_[ track by _id_]' but got '{0}'.",
-+                    throw ngRepeatMinErr('iexp', 'Expected expression in form of \'_item_ in _collection_[ track by _id_]\' but got \'{0}\'.',
-                         expression);
-                 }
- 
--                lhs = match[1];
--                rhs = match[2];
--                trackByExp = match[3];
-+                var lhs = match[1];
-+                var rhs = match[2];
-+                var aliasAs = match[3];
-+                var trackByExp = match[4];
-+
-+                match = lhs.match(/^(?:(\s*[$\w]+)|\(\s*([$\w]+)\s*,\s*([$\w]+)\s*\))$/);
-+
-+                if (!match) {
-+                    throw ngRepeatMinErr('iidexp', '\'_item_\' in \'_item_ in _collection_\' should be an identifier or \'(_key_, _value_)\' expression, but got \'{0}\'.',
-+                        lhs);
-+                }
-+                var valueIdentifier = match[3] || match[1];
-+                var keyIdentifier = match[2];
-+
-+                if (aliasAs && (!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(aliasAs) ||
-+                    /^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(aliasAs))) {
-+                    throw ngRepeatMinErr('badident', 'alias \'{0}\' is invalid --- must be a valid JS identifier which is not a reserved name.',
-+                        aliasAs);
-+                }
-+
-+                var trackByExpGetter, trackByIdExpFn, trackByIdArrayFn, trackByIdObjFn;
-+                var hashFnLocals = {$id: hashKey};
- 
-                 if (trackByExp) {
-                     trackByExpGetter = $parse(trackByExp);
--                    trackByIdExpFn = function(key, value, index) {
--                        // assign key, value, and $index to the locals so that they can be used in hash functions
--                        if (keyIdentifier) hashFnLocals[keyIdentifier] = key;
--                        hashFnLocals[valueIdentifier] = value;
--                        hashFnLocals.$index = index;
--                        return trackByExpGetter($scope, hashFnLocals);
--                    };
-                 } else {
-                     trackByIdArrayFn = function(key, value) {
-                         return hashKey(value);
-@@ -19954,171 +31805,172 @@
-                     };
-                 }
- 
--                match = lhs.match(/^(?:([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\))$/);
--                if (!match) {
--                    throw ngRepeatMinErr('iidexp', "'_item_' in '_item_ in _collection_' should be an identifier or '(_key_, _value_)' expression, but got '{0}'.",
--                        lhs);
--                }
--                valueIdentifier = match[3] || match[1];
--                keyIdentifier = match[2];
--
--                // Store a list of elements from previous run. This is a hash where key is the item from the
--                // iterator, and the value is objects with following properties.
--                //   - scope: bound scope
--                //   - element: previous element.
--                //   - index: position
--                var lastBlockMap = {};
--
--                //watch props
--                $scope.$watchCollection(rhs, function ngRepeatAction(collection){
--                    var index, length,
--                        previousNode = $element[0],     // current position of the node
--                        nextNode,
--                    // Same as lastBlockMap but it has the current state. It will become the
--                    // lastBlockMap on the next iteration.
--                        nextBlockMap = {},
--                        arrayLength,
--                        childScope,
--                        key, value, // key/value of iteration
--                        trackById,
--                        trackByIdFn,
--                        collectionKeys,
--                        block,       // last object information {scope, element, id}
--                        nextBlockOrder = [],
--                        elementsToRemove;
--
--
--                    if (isArrayLike(collection)) {
--                        collectionKeys = collection;
--                        trackByIdFn = trackByIdExpFn || trackByIdArrayFn;
--                    } else {
--                        trackByIdFn = trackByIdExpFn || trackByIdObjFn;
--                        // if object, extract keys, sort them and use to determine order of iteration over obj props
--                        collectionKeys = [];
--                        for (key in collection) {
--                            if (collection.hasOwnProperty(key) && key.charAt(0) != '$') {
--                                collectionKeys.push(key);
--                            }
-+                return function ngRepeatLink($scope, $element, $attr, ctrl, $transclude) {
-+
-+                    if (trackByExpGetter) {
-+                        trackByIdExpFn = function(key, value, index) {
-+                            // assign key, value, and $index to the locals so that they can be used in hash functions
-+                            if (keyIdentifier) hashFnLocals[keyIdentifier] = key;
-+                            hashFnLocals[valueIdentifier] = value;
-+                            hashFnLocals.$index = index;
-+                            return trackByExpGetter($scope, hashFnLocals);
-+                        };
-+                    }
-+
-+                    // Store a list of elements from previous run. This is a hash where key is the item from the
-+                    // iterator, and the value is objects with following properties.
-+                    //   - scope: bound scope
-+                    //   - clone: previous element.
-+                    //   - index: position
-+                    //
-+                    // We are using no-proto object so that we don't need to guard against inherited props via
-+                    // hasOwnProperty.
-+                    var lastBlockMap = createMap();
-+
-+                    //watch props
-+                    $scope.$watchCollection(rhs, function ngRepeatAction(collection) {
-+                        var index, length,
-+                            previousNode = $element[0],     // node that cloned nodes should be inserted after
-+                                                            // initialized to the comment node anchor
-+                            nextNode,
-+                            // Same as lastBlockMap but it has the current state. It will become the
-+                            // lastBlockMap on the next iteration.
-+                            nextBlockMap = createMap(),
-+                            collectionLength,
-+                            key, value, // key/value of iteration
-+                            trackById,
-+                            trackByIdFn,
-+                            collectionKeys,
-+                            block,       // last object information {scope, element, id}
-+                            nextBlockOrder,
-+                            elementsToRemove;
-+
-+                        if (aliasAs) {
-+                            $scope[aliasAs] = collection;
-                         }
--                        collectionKeys.sort();
--                    }
--
--                    arrayLength = collectionKeys.length;
--
--                    // locate existing items
--                    length = nextBlockOrder.length = collectionKeys.length;
--                    for(index = 0; index < length; index++) {
--                        key = (collection === collectionKeys) ? index : collectionKeys[index];
--                        value = collection[key];
--                        trackById = trackByIdFn(key, value, index);
--                        assertNotHasOwnProperty(trackById, '`track by` id');
--                        if(lastBlockMap.hasOwnProperty(trackById)) {
--                            block = lastBlockMap[trackById];
--                            delete lastBlockMap[trackById];
--                            nextBlockMap[trackById] = block;
--                            nextBlockOrder[index] = block;
--                        } else if (nextBlockMap.hasOwnProperty(trackById)) {
--                            // restore lastBlockMap
--                            forEach(nextBlockOrder, function(block) {
--                                if (block && block.scope) lastBlockMap[block.id] = block;
--                            });
--                            // This is a duplicate and we need to throw an error
--                            throw ngRepeatMinErr('dupes', "Duplicates in a repeater are not allowed. Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}",
--                                expression,       trackById);
-+
-+                        if (isArrayLike(collection)) {
-+                            collectionKeys = collection;
-+                            trackByIdFn = trackByIdExpFn || trackByIdArrayFn;
-                         } else {
--                            // new never before seen block
--                            nextBlockOrder[index] = { id: trackById };
--                            nextBlockMap[trackById] = false;
-+                            trackByIdFn = trackByIdExpFn || trackByIdObjFn;
-+                            // if object, extract keys, in enumeration order, unsorted
-+                            collectionKeys = [];
-+                            for (var itemKey in collection) {
-+                                if (hasOwnProperty.call(collection, itemKey) && itemKey.charAt(0) !== '$') {
-+                                    collectionKeys.push(itemKey);
-+                                }
-+                            }
-                         }
--                    }
- 
--                    // remove existing items
--                    for (key in lastBlockMap) {
--                        // lastBlockMap is our own object so we don't need to use special hasOwnPropertyFn
--                        if (lastBlockMap.hasOwnProperty(key)) {
--                            block = lastBlockMap[key];
--                            elementsToRemove = getBlockElements(block.clone);
-+                        collectionLength = collectionKeys.length;
-+                        nextBlockOrder = new Array(collectionLength);
-+
-+                        // locate existing items
-+                        for (index = 0; index < collectionLength; index++) {
-+                            key = (collection === collectionKeys) ? index : collectionKeys[index];
-+                            value = collection[key];
-+                            trackById = trackByIdFn(key, value, index);
-+                            if (lastBlockMap[trackById]) {
-+                                // found previously seen block
-+                                block = lastBlockMap[trackById];
-+                                delete lastBlockMap[trackById];
-+                                nextBlockMap[trackById] = block;
-+                                nextBlockOrder[index] = block;
-+                            } else if (nextBlockMap[trackById]) {
-+                                // if collision detected. restore lastBlockMap and throw an error
-+                                forEach(nextBlockOrder, function(block) {
-+                                    if (block && block.scope) lastBlockMap[block.id] = block;
-+                                });
-+                                throw ngRepeatMinErr('dupes',
-+                                    'Duplicates in a repeater are not allowed. Use \'track by\' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}, Duplicate value: {2}',
-+                                    expression, trackById, value);
-+                            } else {
-+                                // new never before seen block
-+                                nextBlockOrder[index] = {id: trackById, scope: undefined, clone: undefined};
-+                                nextBlockMap[trackById] = true;
-+                            }
-+                        }
-+
-+                        // remove leftover items
-+                        for (var blockKey in lastBlockMap) {
-+                            block = lastBlockMap[blockKey];
-+                            elementsToRemove = getBlockNodes(block.clone);
-                             $animate.leave(elementsToRemove);
--                            forEach(elementsToRemove, function(element) { element[NG_REMOVED] = true; });
-+                            if (elementsToRemove[0].parentNode) {
-+                                // if the element was not removed yet because of pending animation, mark it as deleted
-+                                // so that we can ignore it later
-+                                for (index = 0, length = elementsToRemove.length; index < length; index++) {
-+                                    elementsToRemove[index][NG_REMOVED] = true;
-+                                }
-+                            }
-                             block.scope.$destroy();
-                         }
--                    }
- 
--                    // we are not using forEach for perf reasons (trying to avoid #call)
--                    for (index = 0, length = collectionKeys.length; index < length; index++) {
--                        key = (collection === collectionKeys) ? index : collectionKeys[index];
--                        value = collection[key];
--                        block = nextBlockOrder[index];
--                        if (nextBlockOrder[index - 1]) previousNode = getBlockEnd(nextBlockOrder[index - 1]);
-+                        // we are not using forEach for perf reasons (trying to avoid #call)
-+                        for (index = 0; index < collectionLength; index++) {
-+                            key = (collection === collectionKeys) ? index : collectionKeys[index];
-+                            value = collection[key];
-+                            block = nextBlockOrder[index];
- 
--                        if (block.scope) {
--                            // if we have already seen this object, then we need to reuse the
--                            // associated scope/element
--                            childScope = block.scope;
-+                            if (block.scope) {
-+                                // if we have already seen this object, then we need to reuse the
-+                                // associated scope/element
- 
--                            nextNode = previousNode;
--                            do {
--                                nextNode = nextNode.nextSibling;
--                            } while(nextNode && nextNode[NG_REMOVED]);
-+                                nextNode = previousNode;
- 
--                            if (getBlockStart(block) != nextNode) {
--                                // existing item which got moved
--                                $animate.move(getBlockElements(block.clone), null, jqLite(previousNode));
--                            }
--                            previousNode = getBlockEnd(block);
--                        } else {
--                            // new item which we don't know about
--                            childScope = $scope.$new();
--                        }
-+                                // skip nodes that are already pending removal via leave animation
-+                                do {
-+                                    nextNode = nextNode.nextSibling;
-+                                } while (nextNode && nextNode[NG_REMOVED]);
- 
--                        childScope[valueIdentifier] = value;
--                        if (keyIdentifier) childScope[keyIdentifier] = key;
--                        childScope.$index = index;
--                        childScope.$first = (index === 0);
--                        childScope.$last = (index === (arrayLength - 1));
--                        childScope.$middle = !(childScope.$first || childScope.$last);
--                        // jshint bitwise: false
--                        childScope.$odd = !(childScope.$even = (index&1) === 0);
--                        // jshint bitwise: true
--
--                        if (!block.scope) {
--                            $transclude(childScope, function(clone) {
--                                clone[clone.length++] = document.createComment(' end ngRepeat: ' + expression + ' ');
--                                $animate.enter(clone, null, jqLite(previousNode));
--                                previousNode = clone;
--                                block.scope = childScope;
--                                // Note: We only need the first/last node of the cloned nodes.
--                                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
--                                // by a directive with templateUrl when it's template arrives.
--                                block.clone = clone;
--                                nextBlockMap[block.id] = block;
--                            });
-+                                if (getBlockStart(block) !== nextNode) {
-+                                    // existing item which got moved
-+                                    $animate.move(getBlockNodes(block.clone), null, previousNode);
-+                                }
-+                                previousNode = getBlockEnd(block);
-+                                updateScope(block.scope, index, valueIdentifier, value, keyIdentifier, key, collectionLength);
-+                            } else {
-+                                // new item which we don't know about
-+                                $transclude(function ngRepeatTransclude(clone, scope) {
-+                                    block.scope = scope;
-+                                    // http://jsperf.com/clone-vs-createcomment
-+                                    var endNode = ngRepeatEndComment.cloneNode(false);
-+                                    clone[clone.length++] = endNode;
-+
-+                                    $animate.enter(clone, null, previousNode);
-+                                    previousNode = endNode;
-+                                    // Note: We only need the first/last node of the cloned nodes.
-+                                    // However, we need to keep the reference to the jqlite wrapper as it might be changed later
-+                                    // by a directive with templateUrl when its template arrives.
-+                                    block.clone = clone;
-+                                    nextBlockMap[block.id] = block;
-+                                    updateScope(block.scope, index, valueIdentifier, value, keyIdentifier, key, collectionLength);
-+                                });
-+                            }
-                         }
--                    }
--                    lastBlockMap = nextBlockMap;
--                });
-+                        lastBlockMap = nextBlockMap;
-+                    });
-+                };
-             }
-         };
--
--        function getBlockStart(block) {
--            return block.clone[0];
--        }
--
--        function getBlockEnd(block) {
--            return block.clone[block.clone.length - 1];
--        }
-     }];
- 
-+    var NG_HIDE_CLASS = 'ng-hide';
-+    var NG_HIDE_IN_PROGRESS_CLASS = 'ng-hide-animate';
-     /**
-      * @ngdoc directive
-      * @name ngShow
-+     * @multiElement
-      *
-      * @description
--     * The `ngShow` directive shows or hides the given HTML element based on the expression
--     * provided to the ngShow attribute. The element is shown or hidden by removing or adding
--     * the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
--     * in AngularJS and sets the display style to none (using an !important flag).
--     * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
-+     * The `ngShow` directive shows or hides the given HTML element based on the expression provided to
-+     * the `ngShow` attribute.
-+     *
-+     * The element is shown or hidden by removing or adding the `.ng-hide` CSS class onto the element.
-+     * The `.ng-hide` CSS class is predefined in AngularJS and sets the display style to none (using an
-+     * `!important` flag). For CSP mode please add `angular-csp.css` to your HTML file (see
-+     * {@link ng.directive:ngCsp ngCsp}).
-      *
-      * ```html
-      * <!-- when $scope.myValue is truthy (element is visible) -->
-@@ -20128,59 +31980,58 @@
-      * <div ng-show="myValue" class="ng-hide"></div>
-      * ```
-      *
--     * When the ngShow expression evaluates to false then the ng-hide CSS class is added to the class attribute
--     * on the element causing it to become hidden. When true, the ng-hide CSS class is removed
--     * from the element causing the element not to appear hidden.
-+     * When the `ngShow` expression evaluates to a falsy value then the `.ng-hide` CSS class is added
-+     * to the class attribute on the element causing it to become hidden. When truthy, the `.ng-hide`
-+     * CSS class is removed from the element causing the element not to appear hidden.
-      *
--     * ## Why is !important used?
-+     * ## Why is `!important` used?
-      *
--     * You may be wondering why !important is used for the .ng-hide CSS class. This is because the `.ng-hide` selector
--     * can be easily overridden by heavier selectors. For example, something as simple
--     * as changing the display style on a HTML list item would make hidden elements appear visible.
--     * This also becomes a bigger issue when dealing with CSS frameworks.
-+     * You may be wondering why `!important` is used for the `.ng-hide` CSS class. This is because the
-+     * `.ng-hide` selector can be easily overridden by heavier selectors. For example, something as
-+     * simple as changing the display style on a HTML list item would make hidden elements appear
-+     * visible. This also becomes a bigger issue when dealing with CSS frameworks.
-      *
--     * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
--     * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
--     * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
-+     * By using `!important`, the show and hide behavior will work as expected despite any clash between
-+     * CSS selector specificity (when `!important` isn't used with any conflicting styles). If a
-+     * developer chooses to override the styling to change how to hide an element then it is just a
-+     * matter of using `!important` in their own CSS code.
-      *
--     * ### Overriding .ng-hide
-+     * ### Overriding `.ng-hide`
-+     *
-+     * By default, the `.ng-hide` class will style the element with `display: none !important`. If you
-+     * wish to change the hide behavior with `ngShow`/`ngHide`, you can simply overwrite the styles for
-+     * the `.ng-hide` CSS class. Note that the selector that needs to be used is actually
-+     * `.ng-hide:not(.ng-hide-animate)` to cope with extra animation classes that can be added.
-      *
--     * If you wish to change the hide behavior with ngShow/ngHide then this can be achieved by
--     * restating the styles for the .ng-hide class in CSS:
-      * ```css
--     * .ng-hide {
-- *   //!annotate CSS Specificity|Not to worry, this will override the AngularJS default...
-- *   display:block!important;
-- *
-- *   //this is just another form of hiding an element
-- *   position:absolute;
-- *   top:-9999px;
-- *   left:-9999px;
-- * }
-+     * .ng-hide:not(.ng-hide-animate) {
-+     *   /&#42; These are just alternative ways of hiding an element &#42;/
-+     *   display: block!important;
-+     *   position: absolute;
-+     *   top: -9999px;
-+     *   left: -9999px;
-+     * }
-      * ```
-      *
--     * Just remember to include the important flag so the CSS override will function.
-+     * By default you don't need to override anything in CSS and the animations will work around the
-+     * display style.
-      *
--     * <div class="alert alert-warning">
--     * **Note:** Here is a list of values that ngShow will consider as a falsy value (case insensitive):<br />
--     * "f" / "0" / "false" / "no" / "n" / "[]"
--     * </div>
--     *
--     * ## A note about animations with ngShow
-+     * @animations
-+     * | Animation                                           | Occurs                                                                                                        |
-+     * |-----------------------------------------------------|---------------------------------------------------------------------------------------------------------------|
-+     * | {@link $animate#addClass addClass} `.ng-hide`       | After the `ngShow` expression evaluates to a non truthy value and just before the contents are set to hidden. |
-+     * | {@link $animate#removeClass removeClass} `.ng-hide` | After the `ngShow` expression evaluates to a truthy value and just before contents are set to visible.        |
-      *
--     * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
--     * is true and false. This system works like the animation system present with ngClass except that
--     * you must also include the !important flag to override the display property
--     * so that you can perform an animation when the element is hidden during the time of the animation.
-+     * Animations in `ngShow`/`ngHide` work with the show and hide events that are triggered when the
-+     * directive expression is true and false. This system works like the animation system present with
-+     * `ngClass` except that you must also include the `!important` flag to override the display
-+     * property so that the elements are not actually hidden during the animation.
-      *
-      * ```css
--     * //
--     * //a working example can be found at the bottom of this page
--     * //
-+     * /&#42; A working example can be found at the bottom of this page. &#42;/
-      * .my-element.ng-hide-add, .my-element.ng-hide-remove {
-- *   transition:0.5s linear all;
-- *   display:block!important;
-- * }
-+     *   transition: all 0.5s linear;
-+     * }
-      *
-      * .my-element.ng-hide-add { ... }
-      * .my-element.ng-hide-add.ng-hide-add-active { ... }
-@@ -20188,83 +32039,121 @@
-      * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
-      * ```
-      *
--     * @animations
--     * addClass: .ng-hide - happens after the ngShow expression evaluates to a truthy value and the just before contents are set to visible
--     * removeClass: .ng-hide - happens after the ngShow expression evaluates to a non truthy value and just before the contents are set to hidden
-+     * Keep in mind that, as of AngularJS version 1.3, there is no need to change the display property
-+     * to block during animation states - ngAnimate will automatically handle the style toggling for you.
-      *
-      * @element ANY
--     * @param {expression} ngShow If the {@link guide/expression expression} is truthy
--     *     then the element is shown or hidden respectively.
-+     * @param {expression} ngShow If the {@link guide/expression expression} is truthy/falsy then the
-+     *                            element is shown/hidden respectively.
-      *
-      * @example
--     <example module="ngAnimate" deps="angular-animate.js" animations="true">
-+     * A simple example, animating the element's opacity:
-+     *
-+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-show-simple">
-      <file name="index.html">
--     Click me: <input type="checkbox" ng-model="checked"><br/>
--     <div>
--     Show:
--     <div class="check-element animate-show" ng-show="checked">
--     <span class="glyphicon glyphicon-thumbs-up"></span> I show up when your checkbox is checked.
--     </div>
--     </div>
--     <div>
--     Hide:
--     <div class="check-element animate-show" ng-hide="checked">
--     <span class="glyphicon glyphicon-thumbs-down"></span> I hide when your checkbox is checked.
--     </div>
-+     Show: <input type="checkbox" ng-model="checked" aria-label="Toggle ngShow"><br />
-+     <div class="check-element animate-show-hide" ng-show="checked">
-+     I show up when your checkbox is checked.
-      </div>
-      </file>
--     <file name="glyphicons.css">
--     @import url(//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css);
-+     <file name="animations.css">
-+     .animate-show-hide.ng-hide {
-+        opacity: 0;
-+      }
-+
-+     .animate-show-hide.ng-hide-add,
-+     .animate-show-hide.ng-hide-remove {
-+        transition: all linear 0.5s;
-+      }
-+
-+     .check-element {
-+        border: 1px solid black;
-+        opacity: 1;
-+        padding: 10px;
-+      }
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should check ngShow', function() {
-+        var checkbox = element(by.model('checked'));
-+        var checkElem = element(by.css('.check-element'));
-+
-+        expect(checkElem.isDisplayed()).toBe(false);
-+        checkbox.click();
-+        expect(checkElem.isDisplayed()).toBe(true);
-+      });
-+     </file>
-+     </example>
-+     *
-+     * <hr />
-+     * @example
-+     * A more complex example, featuring different show/hide animations:
-+     *
-+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-show-complex">
-+     <file name="index.html">
-+     Show: <input type="checkbox" ng-model="checked" aria-label="Toggle ngShow"><br />
-+     <div class="check-element funky-show-hide" ng-show="checked">
-+     I show up when your checkbox is checked.
-+     </div>
-      </file>
-      <file name="animations.css">
--     .animate-show {
--        -webkit-transition:all linear 0.5s;
--        transition:all linear 0.5s;
--        line-height:20px;
--        opacity:1;
--        padding:10px;
--        border:1px solid black;
--        background:white;
-+     body {
-+        overflow: hidden;
-+        perspective: 1000px;
-       }
- 
--     .animate-show.ng-hide-add,
--     .animate-show.ng-hide-remove {
--        display:block!important;
-+     .funky-show-hide.ng-hide-add {
-+        transform: rotateZ(0);
-+        transform-origin: right;
-+        transition: all 0.5s ease-in-out;
-       }
- 
--     .animate-show.ng-hide {
--        line-height:0;
--        opacity:0;
--        padding:0 10px;
-+     .funky-show-hide.ng-hide-add.ng-hide-add-active {
-+        transform: rotateZ(-135deg);
-+      }
-+
-+     .funky-show-hide.ng-hide-remove {
-+        transform: rotateY(90deg);
-+        transform-origin: left;
-+        transition: all 0.5s ease;
-+      }
-+
-+     .funky-show-hide.ng-hide-remove.ng-hide-remove-active {
-+        transform: rotateY(0);
-       }
- 
-      .check-element {
--        padding:10px;
--        border:1px solid black;
--        background:white;
-+        border: 1px solid black;
-+        opacity: 1;
-+        padding: 10px;
-       }
-      </file>
-      <file name="protractor.js" type="protractor">
--     var thumbsUp = element(by.css('span.glyphicon-thumbs-up'));
--     var thumbsDown = element(by.css('span.glyphicon-thumbs-down'));
--
--     it('should check ng-show / ng-hide', function() {
--        expect(thumbsUp.isDisplayed()).toBeFalsy();
--        expect(thumbsDown.isDisplayed()).toBeTruthy();
-+     it('should check ngShow', function() {
-+        var checkbox = element(by.model('checked'));
-+        var checkElem = element(by.css('.check-element'));
- 
--        element(by.model('checked')).click();
--
--        expect(thumbsUp.isDisplayed()).toBeTruthy();
--        expect(thumbsDown.isDisplayed()).toBeFalsy();
-+        expect(checkElem.isDisplayed()).toBe(false);
-+        checkbox.click();
-+        expect(checkElem.isDisplayed()).toBe(true);
-       });
-      </file>
-      </example>
-      */
-     var ngShowDirective = ['$animate', function($animate) {
--        return function(scope, element, attr) {
--            scope.$watch(attr.ngShow, function ngShowWatchAction(value){
--                $animate[toBoolean(value) ? 'removeClass' : 'addClass'](element, 'ng-hide');
--            });
-+        return {
-+            restrict: 'A',
-+            multiElement: true,
-+            link: function(scope, element, attr) {
-+                scope.$watch(attr.ngShow, function ngShowWatchAction(value) {
-+                    // we're adding a temporary, animation-specific class for ng-hide since this way
-+                    // we can control when the element is actually displayed on screen without having
-+                    // to have a global/greedy CSS selector that breaks when other animations are run.
-+                    // Read: https://github.com/angular/angular.js/issues/9103#issuecomment-58335845
-+                    $animate[value ? 'removeClass' : 'addClass'](element, NG_HIDE_CLASS, {
-+                        tempClasses: NG_HIDE_IN_PROGRESS_CLASS
-+                    });
-+                });
-+            }
-         };
-     }];
- 
-@@ -20272,75 +32161,77 @@
-     /**
-      * @ngdoc directive
-      * @name ngHide
-+     * @multiElement
-      *
-      * @description
--     * The `ngHide` directive shows or hides the given HTML element based on the expression
--     * provided to the ngHide attribute. The element is shown or hidden by removing or adding
--     * the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
--     * in AngularJS and sets the display style to none (using an !important flag).
--     * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
-+     * The `ngHide` directive shows or hides the given HTML element based on the expression provided to
-+     * the `ngHide` attribute.
-+     *
-+     * The element is shown or hidden by removing or adding the `.ng-hide` CSS class onto the element.
-+     * The `.ng-hide` CSS class is predefined in AngularJS and sets the display style to none (using an
-+     * `!important` flag). For CSP mode please add `angular-csp.css` to your HTML file (see
-+     * {@link ng.directive:ngCsp ngCsp}).
-      *
-      * ```html
-      * <!-- when $scope.myValue is truthy (element is hidden) -->
--     * <div ng-hide="myValue"></div>
-+     * <div ng-hide="myValue" class="ng-hide"></div>
-      *
-      * <!-- when $scope.myValue is falsy (element is visible) -->
--     * <div ng-hide="myValue" class="ng-hide"></div>
-+     * <div ng-hide="myValue"></div>
-      * ```
-      *
--     * When the ngHide expression evaluates to true then the .ng-hide CSS class is added to the class attribute
--     * on the element causing it to become hidden. When false, the ng-hide CSS class is removed
--     * from the element causing the element not to appear hidden.
-+     * When the `ngHide` expression evaluates to a truthy value then the `.ng-hide` CSS class is added
-+     * to the class attribute on the element causing it to become hidden. When falsy, the `.ng-hide`
-+     * CSS class is removed from the element causing the element not to appear hidden.
-      *
--     * ## Why is !important used?
-+     * ## Why is `!important` used?
-      *
--     * You may be wondering why !important is used for the .ng-hide CSS class. This is because the `.ng-hide` selector
--     * can be easily overridden by heavier selectors. For example, something as simple
--     * as changing the display style on a HTML list item would make hidden elements appear visible.
--     * This also becomes a bigger issue when dealing with CSS frameworks.
-+     * You may be wondering why `!important` is used for the `.ng-hide` CSS class. This is because the
-+     * `.ng-hide` selector can be easily overridden by heavier selectors. For example, something as
-+     * simple as changing the display style on a HTML list item would make hidden elements appear
-+     * visible. This also becomes a bigger issue when dealing with CSS frameworks.
-      *
--     * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
--     * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
--     * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
-+     * By using `!important`, the show and hide behavior will work as expected despite any clash between
-+     * CSS selector specificity (when `!important` isn't used with any conflicting styles). If a
-+     * developer chooses to override the styling to change how to hide an element then it is just a
-+     * matter of using `!important` in their own CSS code.
-      *
--     * ### Overriding .ng-hide
-+     * ### Overriding `.ng-hide`
-+     *
-+     * By default, the `.ng-hide` class will style the element with `display: none !important`. If you
-+     * wish to change the hide behavior with `ngShow`/`ngHide`, you can simply overwrite the styles for
-+     * the `.ng-hide` CSS class. Note that the selector that needs to be used is actually
-+     * `.ng-hide:not(.ng-hide-animate)` to cope with extra animation classes that can be added.
-      *
--     * If you wish to change the hide behavior with ngShow/ngHide then this can be achieved by
--     * restating the styles for the .ng-hide class in CSS:
-      * ```css
--     * .ng-hide {
-- *   //!annotate CSS Specificity|Not to worry, this will override the AngularJS default...
-- *   display:block!important;
-- *
-- *   //this is just another form of hiding an element
-- *   position:absolute;
-- *   top:-9999px;
-- *   left:-9999px;
-- * }
-+     * .ng-hide:not(.ng-hide-animate) {
-+     *   /&#42; These are just alternative ways of hiding an element &#42;/
-+     *   display: block!important;
-+     *   position: absolute;
-+     *   top: -9999px;
-+     *   left: -9999px;
-+     * }
-      * ```
-      *
--     * Just remember to include the important flag so the CSS override will function.
--     *
--     * <div class="alert alert-warning">
--     * **Note:** Here is a list of values that ngHide will consider as a falsy value (case insensitive):<br />
--     * "f" / "0" / "false" / "no" / "n" / "[]"
--     * </div>
-+     * By default you don't need to override in CSS anything and the animations will work around the
-+     * display style.
-      *
--     * ## A note about animations with ngHide
-+     * @animations
-+     * | Animation                                           | Occurs                                                                                                     |
-+     * |-----------------------------------------------------|------------------------------------------------------------------------------------------------------------|
-+     * | {@link $animate#addClass addClass} `.ng-hide`       | After the `ngHide` expression evaluates to a truthy value and just before the contents are set to hidden.  |
-+     * | {@link $animate#removeClass removeClass} `.ng-hide` | After the `ngHide` expression evaluates to a non truthy value and just before contents are set to visible. |
-      *
--     * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
--     * is true and false. This system works like the animation system present with ngClass, except that
--     * you must also include the !important flag to override the display property so
--     * that you can perform an animation when the element is hidden during the time of the animation.
-+     * Animations in `ngShow`/`ngHide` work with the show and hide events that are triggered when the
-+     * directive expression is true and false. This system works like the animation system present with
-+     * `ngClass` except that you must also include the `!important` flag to override the display
-+     * property so that the elements are not actually hidden during the animation.
-      *
-      * ```css
--     * //
--     * //a working example can be found at the bottom of this page
--     * //
-+     * /&#42; A working example can be found at the bottom of this page. &#42;/
-      * .my-element.ng-hide-add, .my-element.ng-hide-remove {
-- *   transition:0.5s linear all;
-- *   display:block!important;
-- * }
-+     *   transition: all 0.5s linear;
-+     * }
-      *
-      * .my-element.ng-hide-add { ... }
-      * .my-element.ng-hide-add.ng-hide-add-active { ... }
-@@ -20348,83 +32239,119 @@
-      * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
-      * ```
-      *
--     * @animations
--     * removeClass: .ng-hide - happens after the ngHide expression evaluates to a truthy value and just before the contents are set to hidden
--     * addClass: .ng-hide - happens after the ngHide expression evaluates to a non truthy value and just before the contents are set to visible
-+     * Keep in mind that, as of AngularJS version 1.3, there is no need to change the display property
-+     * to block during animation states - ngAnimate will automatically handle the style toggling for you.
-      *
-      * @element ANY
--     * @param {expression} ngHide If the {@link guide/expression expression} is truthy then
--     *     the element is shown or hidden respectively.
-+     * @param {expression} ngHide If the {@link guide/expression expression} is truthy/falsy then the
-+     *                            element is hidden/shown respectively.
-      *
-      * @example
--     <example module="ngAnimate" deps="angular-animate.js" animations="true">
-+     * A simple example, animating the element's opacity:
-+     *
-+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-hide-simple">
-      <file name="index.html">
--     Click me: <input type="checkbox" ng-model="checked"><br/>
--     <div>
--     Show:
--     <div class="check-element animate-hide" ng-show="checked">
--     <span class="glyphicon glyphicon-thumbs-up"></span> I show up when your checkbox is checked.
--     </div>
--     </div>
--     <div>
--     Hide:
--     <div class="check-element animate-hide" ng-hide="checked">
--     <span class="glyphicon glyphicon-thumbs-down"></span> I hide when your checkbox is checked.
--     </div>
-+     Hide: <input type="checkbox" ng-model="checked" aria-label="Toggle ngHide"><br />
-+     <div class="check-element animate-show-hide" ng-hide="checked">
-+     I hide when your checkbox is checked.
-      </div>
-      </file>
--     <file name="glyphicons.css">
--     @import url(//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css);
-+     <file name="animations.css">
-+     .animate-show-hide.ng-hide {
-+        opacity: 0;
-+      }
-+
-+     .animate-show-hide.ng-hide-add,
-+     .animate-show-hide.ng-hide-remove {
-+        transition: all linear 0.5s;
-+      }
-+
-+     .check-element {
-+        border: 1px solid black;
-+        opacity: 1;
-+        padding: 10px;
-+      }
-+     </file>
-+     <file name="protractor.js" type="protractor">
-+     it('should check ngHide', function() {
-+        var checkbox = element(by.model('checked'));
-+        var checkElem = element(by.css('.check-element'));
-+
-+        expect(checkElem.isDisplayed()).toBe(true);
-+        checkbox.click();
-+        expect(checkElem.isDisplayed()).toBe(false);
-+      });
-+     </file>
-+     </example>
-+     *
-+     * <hr />
-+     * @example
-+     * A more complex example, featuring different show/hide animations:
-+     *
-+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-hide-complex">
-+     <file name="index.html">
-+     Hide: <input type="checkbox" ng-model="checked" aria-label="Toggle ngHide"><br />
-+     <div class="check-element funky-show-hide" ng-hide="checked">
-+     I hide when your checkbox is checked.
-+     </div>
-      </file>
-      <file name="animations.css">
--     .animate-hide {
--        -webkit-transition:all linear 0.5s;
--        transition:all linear 0.5s;
--        line-height:20px;
--        opacity:1;
--        padding:10px;
--        border:1px solid black;
--        background:white;
-+     body {
-+        overflow: hidden;
-+        perspective: 1000px;
-       }
- 
--     .animate-hide.ng-hide-add,
--     .animate-hide.ng-hide-remove {
--        display:block!important;
-+     .funky-show-hide.ng-hide-add {
-+        transform: rotateZ(0);
-+        transform-origin: right;
-+        transition: all 0.5s ease-in-out;
-       }
- 
--     .animate-hide.ng-hide {
--        line-height:0;
--        opacity:0;
--        padding:0 10px;
-+     .funky-show-hide.ng-hide-add.ng-hide-add-active {
-+        transform: rotateZ(-135deg);
-+      }
-+
-+     .funky-show-hide.ng-hide-remove {
-+        transform: rotateY(90deg);
-+        transform-origin: left;
-+        transition: all 0.5s ease;
-+      }
-+
-+     .funky-show-hide.ng-hide-remove.ng-hide-remove-active {
-+        transform: rotateY(0);
-       }
- 
-      .check-element {
--        padding:10px;
--        border:1px solid black;
--        background:white;
-+        border: 1px solid black;
-+        opacity: 1;
-+        padding: 10px;
-       }
-      </file>
-      <file name="protractor.js" type="protractor">
--     var thumbsUp = element(by.css('span.glyphicon-thumbs-up'));
--     var thumbsDown = element(by.css('span.glyphicon-thumbs-down'));
--
--     it('should check ng-show / ng-hide', function() {
--        expect(thumbsUp.isDisplayed()).toBeFalsy();
--        expect(thumbsDown.isDisplayed()).toBeTruthy();
-+     it('should check ngHide', function() {
-+        var checkbox = element(by.model('checked'));
-+        var checkElem = element(by.css('.check-element'));
- 
--        element(by.model('checked')).click();
--
--        expect(thumbsUp.isDisplayed()).toBeTruthy();
--        expect(thumbsDown.isDisplayed()).toBeFalsy();
-+        expect(checkElem.isDisplayed()).toBe(true);
-+        checkbox.click();
-+        expect(checkElem.isDisplayed()).toBe(false);
-       });
-      </file>
-      </example>
-      */
-     var ngHideDirective = ['$animate', function($animate) {
--        return function(scope, element, attr) {
--            scope.$watch(attr.ngHide, function ngHideWatchAction(value){
--                $animate[toBoolean(value) ? 'addClass' : 'removeClass'](element, 'ng-hide');
--            });
-+        return {
-+            restrict: 'A',
-+            multiElement: true,
-+            link: function(scope, element, attr) {
-+                scope.$watch(attr.ngHide, function ngHideWatchAction(value) {
-+                    // The comment inside of the ngShowDirective explains why we add and
-+                    // remove a temporary class for the show/hide animation
-+                    $animate[value ? 'addClass' : 'removeClass'](element,NG_HIDE_CLASS, {
-+                        tempClasses: NG_HIDE_IN_PROGRESS_CLASS
-+                    });
-+                });
-+            }
-         };
-     }];
- 
-@@ -20436,15 +32363,26 @@
-      * @description
-      * The `ngStyle` directive allows you to set CSS style on an HTML element conditionally.
-      *
-+     * @knownIssue
-+     * You should not use {@link guide/interpolation interpolation} in the value of the `style`
-+     * attribute, when using the `ngStyle` directive on the same element.
-+     * See {@link guide/interpolation#known-issues here} for more info.
-+     *
-      * @element ANY
--     * @param {expression} ngStyle {@link guide/expression Expression} which evals to an
--     *      object whose keys are CSS style names and values are corresponding values for those CSS
--     *      keys.
-+     * @param {expression} ngStyle
-+     *
-+     * {@link guide/expression Expression} which evals to an
-+     * object whose keys are CSS style names and values are corresponding values for those CSS
-+     * keys.
-+     *
-+     * Since some CSS style names are not valid keys for an object, they must be quoted.
-+     * See the 'background-color' style in the example below.
-      *
-      * @example
--     <example>
-+     <example name="ng-style">
-      <file name="index.html">
--     <input type="button" value="set" ng-click="myStyle={color:'red'}">
-+     <input type="button" value="set color" ng-click="myStyle={color:'red'}">
-+     <input type="button" value="set background" ng-click="myStyle={'background-color':'blue'}">
-      <input type="button" value="clear" ng-click="myStyle={}">
-      <br/>
-      <span ng-style="myStyle">Sample Text</span>
-@@ -20460,7 +32398,7 @@
- 
-      it('should check ng-style', function() {
-          expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
--         element(by.css('input[value=set]')).click();
-+         element(by.css('input[value=\'set color\']')).click();
-          expect(colorSpan.getCssValue('color')).toBe('rgba(255, 0, 0, 1)');
-          element(by.css('input[value=clear]')).click();
-          expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
-@@ -20504,51 +32442,61 @@
-      * </div>
- 
-      * @animations
--     * enter - happens after the ngSwitch contents change and the matched child element is placed inside the container
--     * leave - happens just after the ngSwitch contents change and just before the former contents are removed from the DOM
-+     * | Animation                        | Occurs                              |
-+     * |----------------------------------|-------------------------------------|
-+     * | {@link ng.$animate#enter enter}  | after the ngSwitch contents change and the matched child element is placed inside the container |
-+     * | {@link ng.$animate#leave leave}  | after the ngSwitch contents change and just before the former contents are removed from the DOM |
-      *
-      * @usage
-+     *
-+     * ```
-      * <ANY ng-switch="expression">
-      *   <ANY ng-switch-when="matchValue1">...</ANY>
-      *   <ANY ng-switch-when="matchValue2">...</ANY>
-      *   <ANY ng-switch-default>...</ANY>
-      * </ANY>
-+     * ```
-      *
-      *
-      * @scope
--     * @priority 800
--     * @param {*} ngSwitch|on expression to match against <tt>ng-switch-when</tt>.
-+     * @priority 1200
-+     * @param {*} ngSwitch|on expression to match against <code>ng-switch-when</code>.
-      * On child elements add:
-      *
-      * * `ngSwitchWhen`: the case statement to match against. If match then this
-      *   case will be displayed. If the same match appears multiple times, all the
--     *   elements will be displayed.
-+     *   elements will be displayed. It is possible to associate multiple values to
-+     *   the same `ngSwitchWhen` by defining the optional attribute
-+     *   `ngSwitchWhenSeparator`. The separator will be used to split the value of
-+     *   the `ngSwitchWhen` attribute into multiple tokens, and the element will show
-+     *   if any of the `ngSwitch` evaluates to any of these tokens.
-      * * `ngSwitchDefault`: the default case when no other case match. If there
-      *   are multiple default cases, all of them will be displayed when no other
-      *   case match.
-      *
-      *
-      * @example
--     <example module="ngAnimate" deps="angular-animate.js" animations="true">
-+     <example module="switchExample" deps="angular-animate.js" animations="true" name="ng-switch">
-      <file name="index.html">
--     <div ng-controller="Ctrl">
-+     <div ng-controller="ExampleController">
-      <select ng-model="selection" ng-options="item for item in items">
-      </select>
--     <tt>selection={{selection}}</tt>
-+     <code>selection={{selection}}</code>
-      <hr/>
-      <div class="animate-switch-container"
-      ng-switch on="selection">
--     <div class="animate-switch" ng-switch-when="settings">Settings Div</div>
-+     <div class="animate-switch" ng-switch-when="settings|options" ng-switch-when-separator="|">Settings Div</div>
-      <div class="animate-switch" ng-switch-when="home">Home Span</div>
-      <div class="animate-switch" ng-switch-default>default</div>
-      </div>
-      </div>
-      </file>
-      <file name="script.js">
--     function Ctrl($scope) {
--        $scope.items = ['settings', 'home', 'other'];
--        $scope.selection = $scope.items[0];
--      }
-+     angular.module('switchExample', ['ngAnimate'])
-+     .controller('ExampleController', ['$scope', function($scope) {
-+          $scope.items = ['settings', 'home', 'options', 'other'];
-+          $scope.selection = $scope.items[0];
-+        }]);
-      </file>
-      <file name="animations.css">
-      .animate-switch-container {
-@@ -20564,7 +32512,6 @@
-       }
- 
-      .animate-switch.ng-animate {
--        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
- 
-         position:absolute;
-@@ -20591,68 +32538,68 @@
-         expect(switchElem.getText()).toMatch(/Settings Div/);
-       });
-      it('should change to home', function() {
--        select.element.all(by.css('option')).get(1).click();
-+        select.all(by.css('option')).get(1).click();
-         expect(switchElem.getText()).toMatch(/Home Span/);
-       });
-+     it('should change to settings via "options"', function() {
-+        select.all(by.css('option')).get(2).click();
-+        expect(switchElem.getText()).toMatch(/Settings Div/);
-+      });
-      it('should select default', function() {
--        select.element.all(by.css('option')).get(2).click();
-+        select.all(by.css('option')).get(3).click();
-         expect(switchElem.getText()).toMatch(/default/);
-       });
-      </file>
-      </example>
-      */
--    var ngSwitchDirective = ['$animate', function($animate) {
-+    var ngSwitchDirective = ['$animate', '$compile', function($animate, $compile) {
-         return {
--            restrict: 'EA',
-             require: 'ngSwitch',
- 
-             // asks for $scope to fool the BC controller module
--            controller: ['$scope', function ngSwitchController() {
-+            controller: ['$scope', function NgSwitchController() {
-                 this.cases = {};
-             }],
-             link: function(scope, element, attr, ngSwitchController) {
-                 var watchExpr = attr.ngSwitch || attr.on,
--                    selectedTranscludes,
--                    selectedElements,
--                    previousElements,
-+                    selectedTranscludes = [],
-+                    selectedElements = [],
-+                    previousLeaveAnimations = [],
-                     selectedScopes = [];
- 
-+                var spliceFactory = function(array, index) {
-+                    return function(response) {
-+                        if (response !== false) array.splice(index, 1);
-+                    };
-+                };
-+
-                 scope.$watch(watchExpr, function ngSwitchWatchAction(value) {
--                    var i, ii = selectedScopes.length;
--                    if(ii > 0) {
--                        if(previousElements) {
--                            for (i = 0; i < ii; i++) {
--                                previousElements[i].remove();
--                            }
--                            previousElements = null;
--                        }
-+                    var i, ii;
- 
--                        previousElements = [];
--                        for (i= 0; i<ii; i++) {
--                            var selected = selectedElements[i];
--                            selectedScopes[i].$destroy();
--                            previousElements[i] = selected;
--                            $animate.leave(selected, function() {
--                                previousElements.splice(i, 1);
--                                if(previousElements.length === 0) {
--                                    previousElements = null;
--                                }
--                            });
--                        }
-+                    // Start with the last, in case the array is modified during the loop
-+                    while (previousLeaveAnimations.length) {
-+                        $animate.cancel(previousLeaveAnimations.pop());
-                     }
- 
--                    selectedElements = [];
--                    selectedScopes = [];
-+                    for (i = 0, ii = selectedScopes.length; i < ii; ++i) {
-+                        var selected = getBlockNodes(selectedElements[i].clone);
-+                        selectedScopes[i].$destroy();
-+                        var runner = previousLeaveAnimations[i] = $animate.leave(selected);
-+                        runner.done(spliceFactory(previousLeaveAnimations, i));
-+                    }
-+
-+                    selectedElements.length = 0;
-+                    selectedScopes.length = 0;
- 
-                     if ((selectedTranscludes = ngSwitchController.cases['!' + value] || ngSwitchController.cases['?'])) {
--                        scope.$eval(attr.change);
-                         forEach(selectedTranscludes, function(selectedTransclude) {
--                            var selectedScope = scope.$new();
--                            selectedScopes.push(selectedScope);
--                            selectedTransclude.transclude(selectedScope, function(caseElement) {
-+                            selectedTransclude.transclude(function(caseElement, selectedScope) {
-+                                selectedScopes.push(selectedScope);
-                                 var anchor = selectedTransclude.element;
-+                                caseElement[caseElement.length++] = $compile.$$createComment('end ngSwitchWhen');
-+                                var block = { clone: caseElement };
- 
--                                selectedElements.push(caseElement);
-+                                selectedElements.push(block);
-                                 $animate.enter(caseElement, anchor.parent(), anchor);
-                             });
-                         });
-@@ -20664,18 +32611,28 @@
- 
-     var ngSwitchWhenDirective = ngDirective({
-         transclude: 'element',
--        priority: 800,
-+        priority: 1200,
-         require: '^ngSwitch',
-+        multiElement: true,
-         link: function(scope, element, attrs, ctrl, $transclude) {
--            ctrl.cases['!' + attrs.ngSwitchWhen] = (ctrl.cases['!' + attrs.ngSwitchWhen] || []);
--            ctrl.cases['!' + attrs.ngSwitchWhen].push({ transclude: $transclude, element: element });
-+
-+            var cases = attrs.ngSwitchWhen.split(attrs.ngSwitchWhenSeparator).sort().filter(
-+                // Filter duplicate cases
-+                function(element, index, array) { return array[index - 1] !== element; }
-+            );
-+
-+            forEach(cases, function(whenCase) {
-+                ctrl.cases['!' + whenCase] = (ctrl.cases['!' + whenCase] || []);
-+                ctrl.cases['!' + whenCase].push({ transclude: $transclude, element: element });
-+            });
-         }
-     });
- 
-     var ngSwitchDefaultDirective = ngDirective({
-         transclude: 'element',
--        priority: 800,
-+        priority: 1200,
-         require: '^ngSwitch',
-+        multiElement: true,
-         link: function(scope, element, attr, ctrl, $transclude) {
-             ctrl.cases['?'] = (ctrl.cases['?'] || []);
-             ctrl.cases['?'].push({ transclude: $transclude, element: element });
-@@ -20685,74 +32642,227 @@
-     /**
-      * @ngdoc directive
-      * @name ngTransclude
--     * @restrict AC
-+     * @restrict EAC
-      *
-      * @description
-      * Directive that marks the insertion point for the transcluded DOM of the nearest parent directive that uses transclusion.
-      *
--     * Any existing content of the element that this directive is placed on will be removed before the transcluded content is inserted.
-+     * You can specify that you want to insert a named transclusion slot, instead of the default slot, by providing the slot name
-+     * as the value of the `ng-transclude` or `ng-transclude-slot` attribute.
-+     *
-+     * If the transcluded content is not empty (i.e. contains one or more DOM nodes, including whitespace text nodes), any existing
-+     * content of this element will be removed before the transcluded content is inserted.
-+     * If the transcluded content is empty (or only whitespace), the existing content is left intact. This lets you provide fallback
-+     * content in the case that no transcluded content is provided.
-      *
-      * @element ANY
-      *
-+     * @param {string} ngTransclude|ngTranscludeSlot the name of the slot to insert at this point. If this is not provided, is empty
-+     *                                               or its value is the same as the name of the attribute then the default slot is used.
-+     *
-      * @example
--     <example module="transclude">
--     <file name="index.html">
--     <script>
--     function Ctrl($scope) {
--           $scope.title = 'Lorem Ipsum';
--           $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
--         }
--
--     angular.module('transclude', [])
--     .directive('pane', function(){
--             return {
--               restrict: 'E',
--               transclude: true,
--               scope: { title:'@' },
--     template: '<div style="border: 1px solid black;">' +
--     '<div style="background-color: gray">{{title}}</div>' +
--     '<div ng-transclude></div>' +
--     '</div>'
--     };
--     });
--     </script>
--     <div ng-controller="Ctrl">
--     <input ng-model="title"><br>
--     <textarea ng-model="text"></textarea> <br/>
--     <pane title="{{title}}">{{text}}</pane>
--     </div>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should have transcluded', function() {
--          var titleElement = element(by.model('title'));
--          titleElement.clear();
--          titleElement.sendKeys('TITLE');
--          var textElement = element(by.model('text'));
--          textElement.clear();
--          textElement.sendKeys('TEXT');
--          expect(element(by.binding('title')).getText()).toEqual('TITLE');
--          expect(element(by.binding('text')).getText()).toEqual('TEXT');
--        });
--     </file>
--     </example>
-+     * ### Basic transclusion
-+     * This example demonstrates basic transclusion of content into a component directive.
-+     * <example name="simpleTranscludeExample" module="transcludeExample">
-+     *   <file name="index.html">
-+     *     <script>
-+     *       angular.module('transcludeExample', [])
-+     *        .directive('pane', function(){
-+     *           return {
-+     *             restrict: 'E',
-+     *             transclude: true,
-+     *             scope: { title:'@' },
-+     *             template: '<div style="border: 1px solid black;">' +
-+     *                         '<div style="background-color: gray">{{title}}</div>' +
-+     *                         '<ng-transclude></ng-transclude>' +
-+     *                       '</div>'
-+     *           };
-+     *       })
-+     *       .controller('ExampleController', ['$scope', function($scope) {
-+     *         $scope.title = 'Lorem Ipsum';
-+     *         $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
-+     *       }]);
-+     *     </script>
-+     *     <div ng-controller="ExampleController">
-+     *       <input ng-model="title" aria-label="title"> <br/>
-+     *       <textarea ng-model="text" aria-label="text"></textarea> <br/>
-+     *       <pane title="{{title}}"><span>{{text}}</span></pane>
-+     *     </div>
-+     *   </file>
-+     *   <file name="protractor.js" type="protractor">
-+     *      it('should have transcluded', function() {
-+     *        var titleElement = element(by.model('title'));
-+     *        titleElement.clear();
-+     *        titleElement.sendKeys('TITLE');
-+     *        var textElement = element(by.model('text'));
-+     *        textElement.clear();
-+     *        textElement.sendKeys('TEXT');
-+     *        expect(element(by.binding('title')).getText()).toEqual('TITLE');
-+     *        expect(element(by.binding('text')).getText()).toEqual('TEXT');
-+     *      });
-+     *   </file>
-+     * </example>
-+     *
-+     * @example
-+     * ### Transclude fallback content
-+     * This example shows how to use `NgTransclude` with fallback content, that
-+     * is displayed if no transcluded content is provided.
-+     *
-+     * <example module="transcludeFallbackContentExample" name="ng-transclude">
-+     * <file name="index.html">
-+     * <script>
-+     * angular.module('transcludeFallbackContentExample', [])
-+     * .directive('myButton', function(){
-+     *             return {
-+     *               restrict: 'E',
-+     *               transclude: true,
-+     *               scope: true,
-+     *               template: '<button style="cursor: pointer;">' +
-+     *                           '<ng-transclude>' +
-+     *                             '<b style="color: red;">Button1</b>' +
-+     *                           '</ng-transclude>' +
-+     *                         '</button>'
-+     *             };
-+     *         });
-+     * </script>
-+     * <!-- fallback button content -->
-+     * <my-button id="fallback"></my-button>
-+     * <!-- modified button content -->
-+     * <my-button id="modified">
-+     *   <i style="color: green;">Button2</i>
-+     * </my-button>
-+     * </file>
-+     * <file name="protractor.js" type="protractor">
-+     * it('should have different transclude element content', function() {
-+     *          expect(element(by.id('fallback')).getText()).toBe('Button1');
-+     *          expect(element(by.id('modified')).getText()).toBe('Button2');
-+     *        });
-+     * </file>
-+     * </example>
-      *
-+     * @example
-+     * ### Multi-slot transclusion
-+     * This example demonstrates using multi-slot transclusion in a component directive.
-+     * <example name="multiSlotTranscludeExample" module="multiSlotTranscludeExample">
-+     *   <file name="index.html">
-+     *    <style>
-+     *      .title, .footer {
-+     *        background-color: gray
-+     *      }
-+     *    </style>
-+     *    <div ng-controller="ExampleController">
-+     *      <input ng-model="title" aria-label="title"> <br/>
-+     *      <textarea ng-model="text" aria-label="text"></textarea> <br/>
-+     *      <pane>
-+     *        <pane-title><a ng-href="{{link}}">{{title}}</a></pane-title>
-+     *        <pane-body><p>{{text}}</p></pane-body>
-+     *      </pane>
-+     *    </div>
-+     *   </file>
-+     *   <file name="app.js">
-+     *    angular.module('multiSlotTranscludeExample', [])
-+     *     .directive('pane', function() {
-+     *        return {
-+     *          restrict: 'E',
-+     *          transclude: {
-+     *            'title': '?paneTitle',
-+     *            'body': 'paneBody',
-+     *            'footer': '?paneFooter'
-+     *          },
-+     *          template: '<div style="border: 1px solid black;">' +
-+     *                      '<div class="title" ng-transclude="title">Fallback Title</div>' +
-+     *                      '<div ng-transclude="body"></div>' +
-+     *                      '<div class="footer" ng-transclude="footer">Fallback Footer</div>' +
-+     *                    '</div>'
-+     *        };
-+     *    })
-+     *    .controller('ExampleController', ['$scope', function($scope) {
-+     *      $scope.title = 'Lorem Ipsum';
-+     *      $scope.link = 'https://google.com';
-+     *      $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
-+     *    }]);
-+     *   </file>
-+     *   <file name="protractor.js" type="protractor">
-+     *      it('should have transcluded the title and the body', function() {
-+     *        var titleElement = element(by.model('title'));
-+     *        titleElement.clear();
-+     *        titleElement.sendKeys('TITLE');
-+     *        var textElement = element(by.model('text'));
-+     *        textElement.clear();
-+     *        textElement.sendKeys('TEXT');
-+     *        expect(element(by.css('.title')).getText()).toEqual('TITLE');
-+     *        expect(element(by.binding('text')).getText()).toEqual('TEXT');
-+     *        expect(element(by.css('.footer')).getText()).toEqual('Fallback Footer');
-+     *      });
-+     *   </file>
-+     * </example>
-      */
--    var ngTranscludeDirective = ngDirective({
--        link: function($scope, $element, $attrs, controller, $transclude) {
--            if (!$transclude) {
--                throw minErr('ngTransclude')('orphan',
--                    'Illegal use of ngTransclude directive in the template! ' +
--                    'No parent directive that requires a transclusion found. ' +
--                    'Element: {0}',
--                    startingTag($element));
--            }
--
--            $transclude(function(clone) {
--                $element.empty();
--                $element.append(clone);
--            });
--        }
--    });
-+    var ngTranscludeMinErr = minErr('ngTransclude');
-+    var ngTranscludeDirective = ['$compile', function($compile) {
-+        return {
-+            restrict: 'EAC',
-+            compile: function ngTranscludeCompile(tElement) {
-+
-+                // Remove and cache any original content to act as a fallback
-+                var fallbackLinkFn = $compile(tElement.contents());
-+                tElement.empty();
-+
-+                return function ngTranscludePostLink($scope, $element, $attrs, controller, $transclude) {
-+
-+                    if (!$transclude) {
-+                        throw ngTranscludeMinErr('orphan',
-+                            'Illegal use of ngTransclude directive in the template! ' +
-+                            'No parent directive that requires a transclusion found. ' +
-+                            'Element: {0}',
-+                            startingTag($element));
-+                    }
-+
-+
-+                    // If the attribute is of the form: `ng-transclude="ng-transclude"` then treat it like the default
-+                    if ($attrs.ngTransclude === $attrs.$attr.ngTransclude) {
-+                        $attrs.ngTransclude = '';
-+                    }
-+                    var slotName = $attrs.ngTransclude || $attrs.ngTranscludeSlot;
-+
-+                    // If the slot is required and no transclusion content is provided then this call will throw an error
-+                    $transclude(ngTranscludeCloneAttachFn, null, slotName);
-+
-+                    // If the slot is optional and no transclusion content is provided then use the fallback content
-+                    if (slotName && !$transclude.isSlotFilled(slotName)) {
-+                        useFallbackContent();
-+                    }
-+
-+                    function ngTranscludeCloneAttachFn(clone, transcludedScope) {
-+                        if (clone.length && notWhitespace(clone)) {
-+                            $element.append(clone);
-+                        } else {
-+                            useFallbackContent();
-+                            // There is nothing linked against the transcluded scope since no content was available,
-+                            // so it should be safe to clean up the generated scope.
-+                            transcludedScope.$destroy();
-+                        }
-+                    }
-+
-+                    function useFallbackContent() {
-+                        // Since this is the fallback content rather than the transcluded content,
-+                        // we link against the scope of this directive rather than the transcluded scope
-+                        fallbackLinkFn($scope, function(clone) {
-+                            $element.append(clone);
-+                        });
-+                    }
-+
-+                    function notWhitespace(nodes) {
-+                        for (var i = 0, ii = nodes.length; i < ii; i++) {
-+                            var node = nodes[i];
-+                            if (node.nodeType !== NODE_TYPE_TEXT || node.nodeValue.trim()) {
-+                                return true;
-+                            }
-+                        }
-+                    }
-+                };
-+            }
-+        };
-+    }];
- 
-     /**
-      * @ngdoc directive
-@@ -20770,7 +32880,7 @@
-      * @param {string} id Cache name of the template.
-      *
-      * @example
--     <example>
-+     <example  name="script-tag">
-      <file name="index.html">
-      <script type="text/ng-template" id="/tpl.html">
-      Content of the template.
-@@ -20792,9 +32902,8 @@
-             restrict: 'E',
-             terminal: true,
-             compile: function(element, attr) {
--                if (attr.type == 'text/ng-template') {
-+                if (attr.type === 'text/ng-template') {
-                     var templateUrl = attr.id,
--                    // IE is not consistent, in scripts we have to read .text but in other nodes we have to read .textContent
-                         text = element[0].text;
- 
-                     $templateCache.put(templateUrl, text);
-@@ -20803,663 +32912,1448 @@
-         };
-     }];
- 
--    var ngOptionsMinErr = minErr('ngOptions');
-+    /* exported selectDirective, optionDirective */
-+
-+    var noopNgModelController = { $setViewValue: noop, $render: noop };
-+
-+    function setOptionSelectedStatus(optionEl, value) {
-+        optionEl.prop('selected', value);
-+        /**
-+         * When unselecting an option, setting the property to null / false should be enough
-+         * However, screenreaders might react to the selected attribute instead, see
-+         * https://github.com/angular/angular.js/issues/14419
-+         * Note: "selected" is a boolean attr and will be removed when the "value" arg in attr() is false
-+         * or null
-+         */
-+        optionEl.attr('selected', value);
-+    }
-+
-     /**
--     * @ngdoc directive
--     * @name select
--     * @restrict E
-+     * @ngdoc type
-+     * @name  select.SelectController
-      *
-      * @description
--     * HTML `SELECT` element with angular data-binding.
-+     * The controller for the {@link ng.select select} directive. The controller exposes
-+     * a few utility methods that can be used to augment the behavior of a regular or an
-+     * {@link ng.ngOptions ngOptions} select element.
-      *
--     * # `ngOptions`
-+     * @example
-+     * ### Set a custom error when the unknown option is selected
-      *
--     * The `ngOptions` attribute can be used to dynamically generate a list of `<option>`
--     * elements for the `<select>` element using the array or object obtained by evaluating the
--     * `ngOptions` comprehension_expression.
-+     * This example sets a custom error "unknownValue" on the ngModelController
-+     * when the select element's unknown option is selected, i.e. when the model is set to a value
-+     * that is not matched by any option.
-+     *
-+     * <example name="select-unknown-value-error" module="staticSelect">
-+     * <file name="index.html">
-+     * <div ng-controller="ExampleController">
-+     *   <form name="myForm">
-+     *     <label for="testSelect"> Single select: </label><br>
-+     *     <select name="testSelect" ng-model="selected" unknown-value-error>
-+     *       <option value="option-1">Option 1</option>
-+     *       <option value="option-2">Option 2</option>
-+     *     </select><br>
-+     *     <span class="error" ng-if="myForm.testSelect.$error.unknownValue">
-+     *       Error: The current model doesn't match any option</span><br>
-+     *
-+     *     <button ng-click="forceUnknownOption()">Force unknown option</button><br>
-+     *   </form>
-+     * </div>
-+     * </file>
-+     * <file name="app.js">
-+     *  angular.module('staticSelect', [])
-+     *    .controller('ExampleController', ['$scope', function($scope) {
-+     *      $scope.selected = null;
-+     *
-+     *      $scope.forceUnknownOption = function() {
-+     *        $scope.selected = 'nonsense';
-+     *      };
-+     *   }])
-+     *   .directive('unknownValueError', function() {
-+     *     return {
-+     *       require: ['ngModel', 'select'],
-+     *       link: function(scope, element, attrs, ctrls) {
-+     *         var ngModelCtrl = ctrls[0];
-+     *         var selectCtrl = ctrls[1];
-+     *
-+     *         ngModelCtrl.$validators.unknownValue = function(modelValue, viewValue) {
-+     *           if (selectCtrl.$isUnknownOptionSelected()) {
-+     *             return false;
-+     *           }
-+     *
-+     *           return true;
-+     *         };
-+     *       }
-+     *
-+     *     };
-+     *   });
-+     * </file>
-+     *</example>
-      *
--     * When an item in the `<select>` menu is selected, the array element or object property
--     * represented by the selected option will be bound to the model identified by the `ngModel`
--     * directive.
-      *
--     * <div class="alert alert-warning">
--     * **Note:** `ngModel` compares by reference, not value. This is important when binding to an
--     * array of objects. See an example [in this jsfiddle](http://jsfiddle.net/qWzTb/).
--     * </div>
-+     * @example
-+     * ### Set the "required" error when the unknown option is selected.
-      *
--     * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
--     * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
--     * option. See example below for demonstration.
-+     * By default, the "required" error on the ngModelController is only set on a required select
-+     * when the empty option is selected. This example adds a custom directive that also sets the
-+     * error when the unknown option is selected.
-      *
--     * <div class="alert alert-warning">
--     * **Note:** `ngOptions` provides an iterator facility for the `<option>` element which should be used instead
--     * of {@link ng.directive:ngRepeat ngRepeat} when you want the
--     * `select` model to be bound to a non-string value. This is because an option element can only
--     * be bound to string values at present.
-+     * <example name="select-unknown-value-required" module="staticSelect">
-+     * <file name="index.html">
-+     * <div ng-controller="ExampleController">
-+     *   <form name="myForm">
-+     *     <label for="testSelect"> Select: </label><br>
-+     *     <select name="testSelect" ng-model="selected" required unknown-value-required>
-+     *       <option value="option-1">Option 1</option>
-+     *       <option value="option-2">Option 2</option>
-+     *     </select><br>
-+     *     <span class="error" ng-if="myForm.testSelect.$error.required">Error: Please select a value</span><br>
-+     *
-+     *     <button ng-click="forceUnknownOption()">Force unknown option</button><br>
-+     *   </form>
-      * </div>
-+     * </file>
-+     * <file name="app.js">
-+     *  angular.module('staticSelect', [])
-+     *    .controller('ExampleController', ['$scope', function($scope) {
-+     *      $scope.selected = null;
-+     *
-+     *      $scope.forceUnknownOption = function() {
-+     *        $scope.selected = 'nonsense';
-+     *      };
-+     *   }])
-+     *   .directive('unknownValueRequired', function() {
-+     *     return {
-+     *       priority: 1, // This directive must run after the required directive has added its validator
-+     *       require: ['ngModel', 'select'],
-+     *       link: function(scope, element, attrs, ctrls) {
-+     *         var ngModelCtrl = ctrls[0];
-+     *         var selectCtrl = ctrls[1];
-      *
--     * @param {string} ngModel Assignable angular expression to data-bind to.
--     * @param {string=} name Property name of the form under which the control is published.
--     * @param {string=} required The control is considered valid only if value is entered.
--     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
--     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
--     *    `required` when you want to data-bind to the `required` attribute.
--     * @param {comprehension_expression=} ngOptions in one of the following forms:
-+     *         var originalRequiredValidator = ngModelCtrl.$validators.required;
-      *
--     *   * for array data sources:
--     *     * `label` **`for`** `value` **`in`** `array`
--     *     * `select` **`as`** `label` **`for`** `value` **`in`** `array`
--     *     * `label`  **`group by`** `group` **`for`** `value` **`in`** `array`
--     *     * `select` **`as`** `label` **`group by`** `group` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
--     *   * for object data sources:
--     *     * `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
--     *     * `select` **`as`** `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
--     *     * `label` **`group by`** `group` **`for (`**`key`**`,`** `value`**`) in`** `object`
--     *     * `select` **`as`** `label` **`group by`** `group`
--     *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
-+     *         ngModelCtrl.$validators.required = function() {
-+     *           if (attrs.required && selectCtrl.$isUnknownOptionSelected()) {
-+     *             return false;
-+     *           }
-      *
--     * Where:
-+     *           return originalRequiredValidator.apply(this, arguments);
-+     *         };
-+     *       }
-+     *     };
-+     *   });
-+     * </file>
-+     * <file name="protractor.js" type="protractor">
-+     *  it('should show the error message when the unknown option is selected', function() {
-+
-+      var error = element(by.className('error'));
-+
-+      expect(error.getText()).toBe('Error: Please select a value');
-+
-+      element(by.cssContainingText('option', 'Option 1')).click();
-+
-+      expect(error.isPresent()).toBe(false);
-+
-+      element(by.tagName('button')).click();
-+
-+      expect(error.getText()).toBe('Error: Please select a value');
-+    });
-+     * </file>
-+     *</example>
-      *
--     *   * `array` / `object`: an expression which evaluates to an array / object to iterate over.
--     *   * `value`: local variable which will refer to each item in the `array` or each property value
--     *      of `object` during iteration.
--     *   * `key`: local variable which will refer to a property name in `object` during iteration.
--     *   * `label`: The result of this expression will be the label for `<option>` element. The
--     *     `expression` will most likely refer to the `value` variable (e.g. `value.propertyName`).
--     *   * `select`: The result of this expression will be bound to the model of the parent `<select>`
--     *      element. If not specified, `select` expression will default to `value`.
--     *   * `group`: The result of this expression will be used to group options using the `<optgroup>`
--     *      DOM element.
--     *   * `trackexpr`: Used when working with an array of objects. The result of this expression will be
--     *      used to identify the objects in the array. The `trackexpr` will most likely refer to the
--     *     `value` variable (e.g. `value.propertyName`).
-      *
--     * @example
--     <example>
--     <file name="index.html">
--     <script>
--     function MyCntrl($scope) {
--          $scope.colors = [
--            {name:'black', shade:'dark'},
--            {name:'white', shade:'light'},
--            {name:'red', shade:'dark'},
--            {name:'blue', shade:'dark'},
--            {name:'yellow', shade:'light'}
--          ];
--          $scope.color = $scope.colors[2]; // red
--        }
--     </script>
--     <div ng-controller="MyCntrl">
--     <ul>
--     <li ng-repeat="color in colors">
--     Name: <input ng-model="color.name">
--     [<a href ng-click="colors.splice($index, 1)">X</a>]
--     </li>
--     <li>
--     [<a href ng-click="colors.push({})">add</a>]
--     </li>
--     </ul>
--     <hr/>
--     Color (null not allowed):
--     <select ng-model="color" ng-options="c.name for c in colors"></select><br>
-+     */
-+    var SelectController =
-+        ['$element', '$scope', /** @this */ function($element, $scope) {
-+
-+            var self = this,
-+                optionsMap = new NgMap();
-+
-+            self.selectValueMap = {}; // Keys are the hashed values, values the original values
-+
-+            // If the ngModel doesn't get provided then provide a dummy noop version to prevent errors
-+            self.ngModelCtrl = noopNgModelController;
-+            self.multiple = false;
-+
-+            // The "unknown" option is one that is prepended to the list if the viewValue
-+            // does not match any of the options. When it is rendered the value of the unknown
-+            // option is '? XXX ?' where XXX is the hashKey of the value that is not known.
-+            //
-+            // Support: IE 9 only
-+            // We can't just jqLite('<option>') since jqLite is not smart enough
-+            // to create it in <select> and IE barfs otherwise.
-+            self.unknownOption = jqLite(window.document.createElement('option'));
-+
-+            // The empty option is an option with the value '' that the application developer can
-+            // provide inside the select. It is always selectable and indicates that a "null" selection has
-+            // been made by the user.
-+            // If the select has an empty option, and the model of the select is set to "undefined" or "null",
-+            // the empty option is selected.
-+            // If the model is set to a different unmatched value, the unknown option is rendered and
-+            // selected, i.e both are present, because a "null" selection and an unknown value are different.
-+            self.hasEmptyOption = false;
-+            self.emptyOption = undefined;
-+
-+            self.renderUnknownOption = function(val) {
-+                var unknownVal = self.generateUnknownOptionValue(val);
-+                self.unknownOption.val(unknownVal);
-+                $element.prepend(self.unknownOption);
-+                setOptionSelectedStatus(self.unknownOption, true);
-+                $element.val(unknownVal);
-+            };
- 
--     Color (null allowed):
--     <span  class="nullable">
--     <select ng-model="color" ng-options="c.name for c in colors">
--     <option value="">-- choose color --</option>
--     </select>
--     </span><br/>
-+            self.updateUnknownOption = function(val) {
-+                var unknownVal = self.generateUnknownOptionValue(val);
-+                self.unknownOption.val(unknownVal);
-+                setOptionSelectedStatus(self.unknownOption, true);
-+                $element.val(unknownVal);
-+            };
- 
--     Color grouped by shade:
--     <select ng-model="color" ng-options="c.name group by c.shade for c in colors">
--     </select><br/>
-+            self.generateUnknownOptionValue = function(val) {
-+                return '? ' + hashKey(val) + ' ?';
-+            };
- 
-+            self.removeUnknownOption = function() {
-+                if (self.unknownOption.parent()) self.unknownOption.remove();
-+            };
- 
--     Select <a href ng-click="color={name:'not in list'}">bogus</a>.<br>
--     <hr/>
--     Currently selected: {{ {selected_color:color}  }}
--     <div style="border:solid 1px black; height:20px"
--     ng-style="{'background-color':color.name}">
--     </div>
--     </div>
--     </file>
--     <file name="protractor.js" type="protractor">
--     it('should check ng-options', function() {
--           expect(element(by.binding('{selected_color:color}')).getText()).toMatch('red');
--           element.all(by.select('color')).first().click();
--           element.all(by.css('select[ng-model="color"] option')).first().click();
--           expect(element(by.binding('{selected_color:color}')).getText()).toMatch('black');
--           element(by.css('.nullable select[ng-model="color"]')).click();
--           element.all(by.css('.nullable select[ng-model="color"] option')).first().click();
--           expect(element(by.binding('{selected_color:color}')).getText()).toMatch('null');
--         });
--     </file>
--     </example>
--     */
-+            self.selectEmptyOption = function() {
-+                if (self.emptyOption) {
-+                    $element.val('');
-+                    setOptionSelectedStatus(self.emptyOption, true);
-+                }
-+            };
- 
--    var ngOptionsDirective = valueFn({ terminal: true });
--// jshint maxlen: false
--    var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
--        //000011111111110000000000022222222220000000000000000000003333333333000000000000004444444444444440000000005555555555555550000000666666666666666000000000000000777777777700000000000000000008888888888
--        var NG_OPTIONS_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,
--            nullModelCtrl = {$setViewValue: noop};
--// jshint maxlen: 100
-+            self.unselectEmptyOption = function() {
-+                if (self.hasEmptyOption) {
-+                    setOptionSelectedStatus(self.emptyOption, false);
-+                }
-+            };
- 
--        return {
--            restrict: 'E',
--            require: ['select', '?ngModel'],
--            controller: ['$element', '$scope', '$attrs', function($element, $scope, $attrs) {
--                var self = this,
--                    optionsMap = {},
--                    ngModelCtrl = nullModelCtrl,
--                    nullOption,
--                    unknownOption;
-+            $scope.$on('$destroy', function() {
-+                // disable unknown option so that we don't do work when the whole select is being destroyed
-+                self.renderUnknownOption = noop;
-+            });
-+
-+            // Read the value of the select control, the implementation of this changes depending
-+            // upon whether the select can have multiple values and whether ngOptions is at work.
-+            self.readValue = function readSingleValue() {
-+                var val = $element.val();
-+                // ngValue added option values are stored in the selectValueMap, normal interpolations are not
-+                var realVal = val in self.selectValueMap ? self.selectValueMap[val] : val;
- 
-+                if (self.hasOption(realVal)) {
-+                    return realVal;
-+                }
- 
--                self.databound = $attrs.ngModel;
-+                return null;
-+            };
- 
- 
--                self.init = function(ngModelCtrl_, nullOption_, unknownOption_) {
--                    ngModelCtrl = ngModelCtrl_;
--                    nullOption = nullOption_;
--                    unknownOption = unknownOption_;
--                };
-+            // Write the value to the select control, the implementation of this changes depending
-+            // upon whether the select can have multiple values and whether ngOptions is at work.
-+            self.writeValue = function writeSingleValue(value) {
-+                // Make sure to remove the selected attribute from the previously selected option
-+                // Otherwise, screen readers might get confused
-+                var currentlySelectedOption = $element[0].options[$element[0].selectedIndex];
-+                if (currentlySelectedOption) setOptionSelectedStatus(jqLite(currentlySelectedOption), false);
- 
-+                if (self.hasOption(value)) {
-+                    self.removeUnknownOption();
- 
--                self.addOption = function(value) {
--                    assertNotHasOwnProperty(value, '"option value"');
--                    optionsMap[value] = true;
-+                    var hashedVal = hashKey(value);
-+                    $element.val(hashedVal in self.selectValueMap ? hashedVal : value);
- 
--                    if (ngModelCtrl.$viewValue == value) {
--                        $element.val(value);
--                        if (unknownOption.parent()) unknownOption.remove();
--                    }
--                };
-+                    // Set selected attribute and property on selected option for screen readers
-+                    var selectedOption = $element[0].options[$element[0].selectedIndex];
-+                    setOptionSelectedStatus(jqLite(selectedOption), true);
-+                } else {
-+                    self.selectUnknownOrEmptyOption(value);
-+                }
-+            };
- 
- 
--                self.removeOption = function(value) {
--                    if (this.hasOption(value)) {
--                        delete optionsMap[value];
--                        if (ngModelCtrl.$viewValue == value) {
--                            this.renderUnknownOption(value);
-+            // Tell the select control that an option, with the given value, has been added
-+            self.addOption = function(value, element) {
-+                // Skip comment nodes, as they only pollute the `optionsMap`
-+                if (element[0].nodeType === NODE_TYPE_COMMENT) return;
-+
-+                assertNotHasOwnProperty(value, '"option value"');
-+                if (value === '') {
-+                    self.hasEmptyOption = true;
-+                    self.emptyOption = element;
-+                }
-+                var count = optionsMap.get(value) || 0;
-+                optionsMap.set(value, count + 1);
-+                // Only render at the end of a digest. This improves render performance when many options
-+                // are added during a digest and ensures all relevant options are correctly marked as selected
-+                scheduleRender();
-+            };
-+
-+            // Tell the select control that an option, with the given value, has been removed
-+            self.removeOption = function(value) {
-+                var count = optionsMap.get(value);
-+                if (count) {
-+                    if (count === 1) {
-+                        optionsMap.delete(value);
-+                        if (value === '') {
-+                            self.hasEmptyOption = false;
-+                            self.emptyOption = undefined;
-                         }
-+                    } else {
-+                        optionsMap.set(value, count - 1);
-                     }
--                };
-+                }
-+            };
- 
-+            // Check whether the select control has an option matching the given value
-+            self.hasOption = function(value) {
-+                return !!optionsMap.get(value);
-+            };
- 
--                self.renderUnknownOption = function(val) {
--                    var unknownVal = '? ' + hashKey(val) + ' ?';
--                    unknownOption.val(unknownVal);
--                    $element.prepend(unknownOption);
--                    $element.val(unknownVal);
--                    unknownOption.prop('selected', true); // needed for IE
--                };
-+            /**
-+             * @ngdoc method
-+             * @name select.SelectController#$hasEmptyOption
-+             *
-+             * @description
-+             *
-+             * Returns `true` if the select element currently has an empty option
-+             * element, i.e. an option that signifies that the select is empty / the selection is null.
-+             *
-+             */
-+            self.$hasEmptyOption = function() {
-+                return self.hasEmptyOption;
-+            };
-+
-+            /**
-+             * @ngdoc method
-+             * @name select.SelectController#$isUnknownOptionSelected
-+             *
-+             * @description
-+             *
-+             * Returns `true` if the select element's unknown option is selected. The unknown option is added
-+             * and automatically selected whenever the select model doesn't match any option.
-+             *
-+             */
-+            self.$isUnknownOptionSelected = function() {
-+                // Presence of the unknown option means it is selected
-+                return $element[0].options[0] === self.unknownOption[0];
-+            };
- 
-+            /**
-+             * @ngdoc method
-+             * @name select.SelectController#$isEmptyOptionSelected
-+             *
-+             * @description
-+             *
-+             * Returns `true` if the select element has an empty option and this empty option is currently
-+             * selected. Returns `false` if the select element has no empty option or it is not selected.
-+             *
-+             */
-+            self.$isEmptyOptionSelected = function() {
-+                return self.hasEmptyOption && $element[0].options[$element[0].selectedIndex] === self.emptyOption[0];
-+            };
- 
--                self.hasOption = function(value) {
--                    return optionsMap.hasOwnProperty(value);
--                };
-+            self.selectUnknownOrEmptyOption = function(value) {
-+                if (value == null && self.emptyOption) {
-+                    self.removeUnknownOption();
-+                    self.selectEmptyOption();
-+                } else if (self.unknownOption.parent().length) {
-+                    self.updateUnknownOption(value);
-+                } else {
-+                    self.renderUnknownOption(value);
-+                }
-+            };
- 
--                $scope.$on('$destroy', function() {
--                    // disable unknown option so that we don't do work when the whole select is being destroyed
--                    self.renderUnknownOption = noop;
-+            var renderScheduled = false;
-+            function scheduleRender() {
-+                if (renderScheduled) return;
-+                renderScheduled = true;
-+                $scope.$$postDigest(function() {
-+                    renderScheduled = false;
-+                    self.ngModelCtrl.$render();
-                 });
--            }],
-+            }
- 
--            link: function(scope, element, attr, ctrls) {
--                // if ngModel is not defined, we don't need to do anything
--                if (!ctrls[1]) return;
--
--                var selectCtrl = ctrls[0],
--                    ngModelCtrl = ctrls[1],
--                    multiple = attr.multiple,
--                    optionsExp = attr.ngOptions,
--                    nullOption = false, // if false, user will not be able to select it (used by ngOptions)
--                    emptyOption,
--                // we can't just jqLite('<option>') since jqLite is not smart enough
--                // to create it in <select> and IE barfs otherwise.
--                    optionTemplate = jqLite(document.createElement('option')),
--                    optGroupTemplate =jqLite(document.createElement('optgroup')),
--                    unknownOption = optionTemplate.clone();
--
--                // find "null" option
--                for(var i = 0, children = element.children(), ii = children.length; i < ii; i++) {
--                    if (children[i].value === '') {
--                        emptyOption = nullOption = children.eq(i);
--                        break;
--                    }
--                }
-+            var updateScheduled = false;
-+            function scheduleViewValueUpdate(renderAfter) {
-+                if (updateScheduled) return;
- 
--                selectCtrl.init(ngModelCtrl, nullOption, unknownOption);
-+                updateScheduled = true;
- 
--                // required validator
--                if (multiple) {
--                    ngModelCtrl.$isEmpty = function(value) {
--                        return !value || value.length === 0;
--                    };
--                }
-+                $scope.$$postDigest(function() {
-+                    if ($scope.$$destroyed) return;
- 
--                if (optionsExp) setupAsOptions(scope, element, ngModelCtrl);
--                else if (multiple) setupAsMultiple(scope, element, ngModelCtrl);
--                else setupAsSingle(scope, element, ngModelCtrl, selectCtrl);
-+                    updateScheduled = false;
-+                    self.ngModelCtrl.$setViewValue(self.readValue());
-+                    if (renderAfter) self.ngModelCtrl.$render();
-+                });
-+            }
- 
- 
--                ////////////////////////////
-+            self.registerOption = function(optionScope, optionElement, optionAttrs, interpolateValueFn, interpolateTextFn) {
- 
-+                if (optionAttrs.$attr.ngValue) {
-+                    // The value attribute is set by ngValue
-+                    var oldVal, hashedVal = NaN;
-+                    optionAttrs.$observe('value', function valueAttributeObserveAction(newVal) {
- 
-+                        var removal;
-+                        var previouslySelected = optionElement.prop('selected');
- 
--                function setupAsSingle(scope, selectElement, ngModelCtrl, selectCtrl) {
--                    ngModelCtrl.$render = function() {
--                        var viewValue = ngModelCtrl.$viewValue;
-+                        if (isDefined(hashedVal)) {
-+                            self.removeOption(oldVal);
-+                            delete self.selectValueMap[hashedVal];
-+                            removal = true;
-+                        }
- 
--                        if (selectCtrl.hasOption(viewValue)) {
--                            if (unknownOption.parent()) unknownOption.remove();
--                            selectElement.val(viewValue);
--                            if (viewValue === '') emptyOption.prop('selected', true); // to make IE9 happy
--                        } else {
--                            if (isUndefined(viewValue) && emptyOption) {
--                                selectElement.val('');
--                            } else {
--                                selectCtrl.renderUnknownOption(viewValue);
--                            }
-+                        hashedVal = hashKey(newVal);
-+                        oldVal = newVal;
-+                        self.selectValueMap[hashedVal] = newVal;
-+                        self.addOption(newVal, optionElement);
-+                        // Set the attribute directly instead of using optionAttrs.$set - this stops the observer
-+                        // from firing a second time. Other $observers on value will also get the result of the
-+                        // ngValue expression, not the hashed value
-+                        optionElement.attr('value', hashedVal);
-+
-+                        if (removal && previouslySelected) {
-+                            scheduleViewValueUpdate();
-                         }
--                    };
- 
--                    selectElement.on('change', function() {
--                        scope.$apply(function() {
--                            if (unknownOption.parent()) unknownOption.remove();
--                            ngModelCtrl.$setViewValue(selectElement.val());
--                        });
-                     });
--                }
--
--                function setupAsMultiple(scope, selectElement, ctrl) {
--                    var lastView;
--                    ctrl.$render = function() {
--                        var items = new HashMap(ctrl.$viewValue);
--                        forEach(selectElement.find('option'), function(option) {
--                            option.selected = isDefined(items.get(option.value));
--                        });
--                    };
-+                } else if (interpolateValueFn) {
-+                    // The value attribute is interpolated
-+                    optionAttrs.$observe('value', function valueAttributeObserveAction(newVal) {
-+                        // This method is overwritten in ngOptions and has side-effects!
-+                        self.readValue();
-+
-+                        var removal;
-+                        var previouslySelected = optionElement.prop('selected');
-+
-+                        if (isDefined(oldVal)) {
-+                            self.removeOption(oldVal);
-+                            removal = true;
-+                        }
-+                        oldVal = newVal;
-+                        self.addOption(newVal, optionElement);
- 
--                    // we have to do it on each watch since ngModel watches reference, but
--                    // we need to work of an array, so we need to see if anything was inserted/removed
--                    scope.$watch(function selectMultipleWatch() {
--                        if (!equals(lastView, ctrl.$viewValue)) {
--                            lastView = copy(ctrl.$viewValue);
--                            ctrl.$render();
-+                        if (removal && previouslySelected) {
-+                            scheduleViewValueUpdate();
-                         }
-                     });
-+                } else if (interpolateTextFn) {
-+                    // The text content is interpolated
-+                    optionScope.$watch(interpolateTextFn, function interpolateWatchAction(newVal, oldVal) {
-+                        optionAttrs.$set('value', newVal);
-+                        var previouslySelected = optionElement.prop('selected');
-+                        if (oldVal !== newVal) {
-+                            self.removeOption(oldVal);
-+                        }
-+                        self.addOption(newVal, optionElement);
- 
--                    selectElement.on('change', function() {
--                        scope.$apply(function() {
--                            var array = [];
--                            forEach(selectElement.find('option'), function(option) {
--                                if (option.selected) {
--                                    array.push(option.value);
--                                }
--                            });
--                            ctrl.$setViewValue(array);
--                        });
-+                        if (oldVal && previouslySelected) {
-+                            scheduleViewValueUpdate();
-+                        }
-                     });
-+                } else {
-+                    // The value attribute is static
-+                    self.addOption(optionAttrs.value, optionElement);
-                 }
- 
--                function setupAsOptions(scope, selectElement, ctrl) {
--                    var match;
--
--                    if (!(match = optionsExp.match(NG_OPTIONS_REGEXP))) {
--                        throw ngOptionsMinErr('iexp',
--                            "Expected expression in form of " +
--                            "'_select_ (as _label_)? for (_key_,)?_value_ in _collection_'" +
--                            " but got '{0}'. Element: {1}",
--                            optionsExp, startingTag(selectElement));
--                    }
--
--                    var displayFn = $parse(match[2] || match[1]),
--                        valueName = match[4] || match[6],
--                        keyName = match[5],
--                        groupByFn = $parse(match[3] || ''),
--                        valueFn = $parse(match[2] ? match[1] : valueName),
--                        valuesFn = $parse(match[7]),
--                        track = match[8],
--                        trackFn = track ? $parse(match[8]) : null,
--                    // This is an array of array of existing option groups in DOM.
--                    // We try to reuse these if possible
--                    // - optionGroupsCache[0] is the options with no option group
--                    // - optionGroupsCache[?][0] is the parent: either the SELECT or OPTGROUP element
--                        optionGroupsCache = [[{element: selectElement, label:''}]];
--
--                    if (nullOption) {
--                        // compile the element since there might be bindings in it
--                        $compile(nullOption)(scope);
--
--                        // remove the class, which is added automatically because we recompile the element and it
--                        // becomes the compilation root
--                        nullOption.removeClass('ng-scope');
--
--                        // we need to remove it before calling selectElement.empty() because otherwise IE will
--                        // remove the label from the element. wtf?
--                        nullOption.remove();
--                    }
--
--                    // clear contents, we'll add what's needed based on the model
--                    selectElement.empty();
--
--                    selectElement.on('change', function() {
--                        scope.$apply(function() {
--                            var optionGroup,
--                                collection = valuesFn(scope) || [],
--                                locals = {},
--                                key, value, optionElement, index, groupIndex, length, groupLength, trackIndex;
--
--                            if (multiple) {
--                                value = [];
--                                for (groupIndex = 0, groupLength = optionGroupsCache.length;
--                                     groupIndex < groupLength;
--                                     groupIndex++) {
--                                    // list of options for that group. (first item has the parent)
--                                    optionGroup = optionGroupsCache[groupIndex];
--
--                                    for(index = 1, length = optionGroup.length; index < length; index++) {
--                                        if ((optionElement = optionGroup[index].element)[0].selected) {
--                                            key = optionElement.val();
--                                            if (keyName) locals[keyName] = key;
--                                            if (trackFn) {
--                                                for (trackIndex = 0; trackIndex < collection.length; trackIndex++) {
--                                                    locals[valueName] = collection[trackIndex];
--                                                    if (trackFn(scope, locals) == key) break;
--                                                }
--                                            } else {
--                                                locals[valueName] = collection[key];
--                                            }
--                                            value.push(valueFn(scope, locals));
--                                        }
--                                    }
--                                }
--                            } else {
--                                key = selectElement.val();
--                                if (key == '?') {
--                                    value = undefined;
--                                } else if (key === ''){
--                                    value = null;
--                                } else {
--                                    if (trackFn) {
--                                        for (trackIndex = 0; trackIndex < collection.length; trackIndex++) {
--                                            locals[valueName] = collection[trackIndex];
--                                            if (trackFn(scope, locals) == key) {
--                                                value = valueFn(scope, locals);
--                                                break;
--                                            }
--                                        }
--                                    } else {
--                                        locals[valueName] = collection[key];
--                                        if (keyName) locals[keyName] = key;
--                                        value = valueFn(scope, locals);
--                                    }
--                                }
--                                // Update the null option's selected property here so $render cleans it up correctly
--                                if (optionGroupsCache[0].length > 1) {
--                                    if (optionGroupsCache[0][1].id !== key) {
--                                        optionGroupsCache[0][1].selected = false;
--                                    }
--                                }
--                            }
--                            ctrl.$setViewValue(value);
--                        });
--                    });
- 
--                    ctrl.$render = render;
--
--                    // TODO(vojta): can't we optimize this ?
--                    scope.$watch(render);
--
--                    function render() {
--                        // Temporary location for the option groups before we render them
--                        var optionGroups = {'':[]},
--                            optionGroupNames = [''],
--                            optionGroupName,
--                            optionGroup,
--                            option,
--                            existingParent, existingOptions, existingOption,
--                            modelValue = ctrl.$modelValue,
--                            values = valuesFn(scope) || [],
--                            keys = keyName ? sortedKeys(values) : values,
--                            key,
--                            groupLength, length,
--                            groupIndex, index,
--                            locals = {},
--                            selected,
--                            selectedSet = false, // nothing is selected yet
--                            lastElement,
--                            element,
--                            label;
--
--                        if (multiple) {
--                            if (trackFn && isArray(modelValue)) {
--                                selectedSet = new HashMap([]);
--                                for (var trackIndex = 0; trackIndex < modelValue.length; trackIndex++) {
--                                    locals[valueName] = modelValue[trackIndex];
--                                    selectedSet.put(trackFn(scope, locals), modelValue[trackIndex]);
--                                }
--                            } else {
--                                selectedSet = new HashMap(modelValue);
--                            }
-+                optionAttrs.$observe('disabled', function(newVal) {
-+
-+                    // Since model updates will also select disabled options (like ngOptions),
-+                    // we only have to handle options becoming disabled, not enabled
-+
-+                    if (newVal === 'true' || newVal && optionElement.prop('selected')) {
-+                        if (self.multiple) {
-+                            scheduleViewValueUpdate(true);
-+                        } else {
-+                            self.ngModelCtrl.$setViewValue(null);
-+                            self.ngModelCtrl.$render();
-                         }
-+                    }
-+                });
-+
-+                optionElement.on('$destroy', function() {
-+                    var currentValue = self.readValue();
-+                    var removeValue = optionAttrs.value;
-+
-+                    self.removeOption(removeValue);
-+                    scheduleRender();
-+
-+                    if (self.multiple && currentValue && currentValue.indexOf(removeValue) !== -1 ||
-+                        currentValue === removeValue
-+                    ) {
-+                        // When multiple (selected) options are destroyed at the same time, we don't want
-+                        // to run a model update for each of them. Instead, run a single update in the $$postDigest
-+                        scheduleViewValueUpdate(true);
-+                    }
-+                });
-+            };
-+        }];
- 
--                        // We now build up the list of options we need (we merge later)
--                        for (index = 0; length = keys.length, index < length; index++) {
-+    /**
-+     * @ngdoc directive
-+     * @name select
-+     * @restrict E
-+     *
-+     * @description
-+     * HTML `select` element with AngularJS data-binding.
-+     *
-+     * The `select` directive is used together with {@link ngModel `ngModel`} to provide data-binding
-+     * between the scope and the `<select>` control (including setting default values).
-+     * It also handles dynamic `<option>` elements, which can be added using the {@link ngRepeat `ngRepeat}` or
-+     * {@link ngOptions `ngOptions`} directives.
-+     *
-+     * When an item in the `<select>` menu is selected, the value of the selected option will be bound
-+     * to the model identified by the `ngModel` directive. With static or repeated options, this is
-+     * the content of the `value` attribute or the textContent of the `<option>`, if the value attribute is missing.
-+     * Value and textContent can be interpolated.
-+     *
-+     * The {@link select.SelectController select controller} exposes utility functions that can be used
-+     * to manipulate the select's behavior.
-+     *
-+     * ## Matching model and option values
-+     *
-+     * In general, the match between the model and an option is evaluated by strictly comparing the model
-+     * value against the value of the available options.
-+     *
-+     * If you are setting the option value with the option's `value` attribute, or textContent, the
-+     * value will always be a `string` which means that the model value must also be a string.
-+     * Otherwise the `select` directive cannot match them correctly.
-+     *
-+     * To bind the model to a non-string value, you can use one of the following strategies:
-+     * - the {@link ng.ngOptions `ngOptions`} directive
-+     *   ({@link ng.select#using-select-with-ngoptions-and-setting-a-default-value})
-+     * - the {@link ng.ngValue `ngValue`} directive, which allows arbitrary expressions to be
-+     *   option values ({@link ng.select#using-ngvalue-to-bind-the-model-to-an-array-of-objects Example})
-+     * - model $parsers / $formatters to convert the string value
-+     *   ({@link ng.select#binding-select-to-a-non-string-value-via-ngmodel-parsing-formatting Example})
-+     *
-+     * If the viewValue of `ngModel` does not match any of the options, then the control
-+     * will automatically add an "unknown" option, which it then removes when the mismatch is resolved.
-+     *
-+     * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
-+     * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
-+     * option. See example below for demonstration.
-+     *
-+     * ## Choosing between `ngRepeat` and `ngOptions`
-+     *
-+     * In many cases, `ngRepeat` can be used on `<option>` elements instead of {@link ng.directive:ngOptions
-+ * ngOptions} to achieve a similar result. However, `ngOptions` provides some benefits:
-+     * - more flexibility in how the `<select>`'s model is assigned via the `select` **`as`** part of the
-+     * comprehension expression
-+     * - reduced memory consumption by not creating a new scope for each repeated instance
-+     * - increased render speed by creating the options in a documentFragment instead of individually
-+     *
-+     * Specifically, select with repeated options slows down significantly starting at 2000 options in
-+     * Chrome and Internet Explorer / Edge.
-+     *
-+     *
-+     * @param {string} ngModel Assignable AngularJS expression to data-bind to.
-+     * @param {string=} name Property name of the form under which the control is published.
-+     * @param {string=} multiple Allows multiple options to be selected. The selected values will be
-+     *     bound to the model as an array.
-+     * @param {string=} required Sets `required` validation error key if the value is not entered.
-+     * @param {string=} ngRequired Adds required attribute and required validation constraint to
-+     * the element when the ngRequired expression evaluates to true. Use ngRequired instead of required
-+     * when you want to data-bind to the required attribute.
-+     * @param {string=} ngChange AngularJS expression to be executed when selected option(s) changes due to user
-+     *    interaction with the select element.
-+     * @param {string=} ngOptions sets the options that the select is populated with and defines what is
-+     * set on the model on selection. See {@link ngOptions `ngOptions`}.
-+     * @param {string=} ngAttrSize sets the size of the select element dynamically. Uses the
-+     * {@link guide/interpolation#-ngattr-for-binding-to-arbitrary-attributes ngAttr} directive.
-+     *
-+     *
-+     * @knownIssue
-+     *
-+     * In Firefox, the select model is only updated when the select element is blurred. For example,
-+     * when switching between options with the keyboard, the select model is only set to the
-+     * currently selected option when the select is blurred, e.g via tab key or clicking the mouse
-+     * outside the select.
-+     *
-+     * This is due to an ambiguity in the select element specification. See the
-+     * [issue on the Firefox bug tracker](https://bugzilla.mozilla.org/show_bug.cgi?id=126379)
-+     * for more information, and this
-+     * [Github comment for a workaround](https://github.com/angular/angular.js/issues/9134#issuecomment-130800488)
-+     *
-+     * @example
-+     * ### Simple `select` elements with static options
-+     *
-+     * <example name="static-select" module="staticSelect">
-+     * <file name="index.html">
-+     * <div ng-controller="ExampleController">
-+     *   <form name="myForm">
-+     *     <label for="singleSelect"> Single select: </label><br>
-+     *     <select name="singleSelect" ng-model="data.singleSelect">
-+     *       <option value="option-1">Option 1</option>
-+     *       <option value="option-2">Option 2</option>
-+     *     </select><br>
-+     *
-+     *     <label for="singleSelect"> Single select with "not selected" option and dynamic option values: </label><br>
-+     *     <select name="singleSelect" id="singleSelect" ng-model="data.singleSelect">
-+     *       <option value="">---Please select---</option> <!-- not selected / blank option -->
-+     *       <option value="{{data.option1}}">Option 1</option> <!-- interpolation -->
-+     *       <option value="option-2">Option 2</option>
-+     *     </select><br>
-+     *     <button ng-click="forceUnknownOption()">Force unknown option</button><br>
-+     *     <tt>singleSelect = {{data.singleSelect}}</tt>
-+     *
-+     *     <hr>
-+     *     <label for="multipleSelect"> Multiple select: </label><br>
-+     *     <select name="multipleSelect" id="multipleSelect" ng-model="data.multipleSelect" multiple>
-+     *       <option value="option-1">Option 1</option>
-+     *       <option value="option-2">Option 2</option>
-+     *       <option value="option-3">Option 3</option>
-+     *     </select><br>
-+     *     <tt>multipleSelect = {{data.multipleSelect}}</tt><br/>
-+     *   </form>
-+     * </div>
-+     * </file>
-+     * <file name="app.js">
-+     *  angular.module('staticSelect', [])
-+     *    .controller('ExampleController', ['$scope', function($scope) {
-+     *      $scope.data = {
-+     *       singleSelect: null,
-+     *       multipleSelect: [],
-+     *       option1: 'option-1'
-+     *      };
-+     *
-+     *      $scope.forceUnknownOption = function() {
-+     *        $scope.data.singleSelect = 'nonsense';
-+     *      };
-+     *   }]);
-+     * </file>
-+     *</example>
-+     *
-+     * @example
-+     * ### Using `ngRepeat` to generate `select` options
-+     * <example name="select-ngrepeat" module="ngrepeatSelect">
-+     * <file name="index.html">
-+     * <div ng-controller="ExampleController">
-+     *   <form name="myForm">
-+     *     <label for="repeatSelect"> Repeat select: </label>
-+     *     <select name="repeatSelect" id="repeatSelect" ng-model="data.model">
-+     *       <option ng-repeat="option in data.availableOptions" value="{{option.id}}">{{option.name}}</option>
-+     *     </select>
-+     *   </form>
-+     *   <hr>
-+     *   <tt>model = {{data.model}}</tt><br/>
-+     * </div>
-+     * </file>
-+     * <file name="app.js">
-+     *  angular.module('ngrepeatSelect', [])
-+     *    .controller('ExampleController', ['$scope', function($scope) {
-+     *      $scope.data = {
-+     *       model: null,
-+     *       availableOptions: [
-+     *         {id: '1', name: 'Option A'},
-+     *         {id: '2', name: 'Option B'},
-+     *         {id: '3', name: 'Option C'}
-+     *       ]
-+     *      };
-+     *   }]);
-+     * </file>
-+     *</example>
-+     *
-+     * @example
-+     * ### Using `ngValue` to bind the model to an array of objects
-+     * <example name="select-ngvalue" module="ngvalueSelect">
-+     * <file name="index.html">
-+     * <div ng-controller="ExampleController">
-+     *   <form name="myForm">
-+     *     <label for="ngvalueselect"> ngvalue select: </label>
-+     *     <select size="6" name="ngvalueselect" ng-model="data.model" multiple>
-+     *       <option ng-repeat="option in data.availableOptions" ng-value="option.value">{{option.name}}</option>
-+     *     </select>
-+     *   </form>
-+     *   <hr>
-+     *   <pre>model = {{data.model | json}}</pre><br/>
-+     * </div>
-+     * </file>
-+     * <file name="app.js">
-+     *  angular.module('ngvalueSelect', [])
-+     *    .controller('ExampleController', ['$scope', function($scope) {
-+     *      $scope.data = {
-+     *       model: null,
-+     *       availableOptions: [
-+           {value: 'myString', name: 'string'},
-+           {value: 1, name: 'integer'},
-+           {value: true, name: 'boolean'},
-+           {value: null, name: 'null'},
-+           {value: {prop: 'value'}, name: 'object'},
-+           {value: ['a'], name: 'array'}
-+     *       ]
-+     *      };
-+     *   }]);
-+     * </file>
-+     *</example>
-+     *
-+     * @example
-+     * ### Using `select` with `ngOptions` and setting a default value
-+     * See the {@link ngOptions ngOptions documentation} for more `ngOptions` usage examples.
-+     *
-+     * <example name="select-with-default-values" module="defaultValueSelect">
-+     * <file name="index.html">
-+     * <div ng-controller="ExampleController">
-+     *   <form name="myForm">
-+     *     <label for="mySelect">Make a choice:</label>
-+     *     <select name="mySelect" id="mySelect"
-+     *       ng-options="option.name for option in data.availableOptions track by option.id"
-+     *       ng-model="data.selectedOption"></select>
-+     *   </form>
-+     *   <hr>
-+     *   <tt>option = {{data.selectedOption}}</tt><br/>
-+     * </div>
-+     * </file>
-+     * <file name="app.js">
-+     *  angular.module('defaultValueSelect', [])
-+     *    .controller('ExampleController', ['$scope', function($scope) {
-+     *      $scope.data = {
-+     *       availableOptions: [
-+     *         {id: '1', name: 'Option A'},
-+     *         {id: '2', name: 'Option B'},
-+     *         {id: '3', name: 'Option C'}
-+     *       ],
-+     *       selectedOption: {id: '3', name: 'Option C'} //This sets the default value of the select in the ui
-+     *       };
-+     *   }]);
-+     * </file>
-+     *</example>
-+     *
-+     * @example
-+     * ### Binding `select` to a non-string value via `ngModel` parsing / formatting
-+     *
-+     * <example name="select-with-non-string-options" module="nonStringSelect">
-+     *   <file name="index.html">
-+     *     <select ng-model="model.id" convert-to-number>
-+     *       <option value="0">Zero</option>
-+     *       <option value="1">One</option>
-+     *       <option value="2">Two</option>
-+     *     </select>
-+     *     {{ model }}
-+     *   </file>
-+     *   <file name="app.js">
-+     *     angular.module('nonStringSelect', [])
-+     *       .run(function($rootScope) {
-+     *         $rootScope.model = { id: 2 };
-+     *       })
-+     *       .directive('convertToNumber', function() {
-+     *         return {
-+     *           require: 'ngModel',
-+     *           link: function(scope, element, attrs, ngModel) {
-+     *             ngModel.$parsers.push(function(val) {
-+     *               return parseInt(val, 10);
-+     *             });
-+     *             ngModel.$formatters.push(function(val) {
-+     *               return '' + val;
-+     *             });
-+     *           }
-+     *         };
-+     *       });
-+     *   </file>
-+     *   <file name="protractor.js" type="protractor">
-+     *     it('should initialize to model', function() {
-+     *       expect(element(by.model('model.id')).$('option:checked').getText()).toEqual('Two');
-+     *     });
-+     *   </file>
-+     * </example>
-+     *
-+     */
-+    var selectDirective = function() {
- 
--                            key = index;
--                            if (keyName) {
--                                key = keys[index];
--                                if ( key.charAt(0) === '$' ) continue;
--                                locals[keyName] = key;
--                            }
-+        return {
-+            restrict: 'E',
-+            require: ['select', '?ngModel'],
-+            controller: SelectController,
-+            priority: 1,
-+            link: {
-+                pre: selectPreLink,
-+                post: selectPostLink
-+            }
-+        };
- 
--                            locals[valueName] = values[key];
-+        function selectPreLink(scope, element, attr, ctrls) {
- 
--                            optionGroupName = groupByFn(scope, locals) || '';
--                            if (!(optionGroup = optionGroups[optionGroupName])) {
--                                optionGroup = optionGroups[optionGroupName] = [];
--                                optionGroupNames.push(optionGroupName);
--                            }
--                            if (multiple) {
--                                selected = isDefined(
--                                    selectedSet.remove(trackFn ? trackFn(scope, locals) : valueFn(scope, locals))
--                                );
--                            } else {
--                                if (trackFn) {
--                                    var modelCast = {};
--                                    modelCast[valueName] = modelValue;
--                                    selected = trackFn(scope, modelCast) === trackFn(scope, locals);
--                                } else {
--                                    selected = modelValue === valueFn(scope, locals);
--                                }
--                                selectedSet = selectedSet || selected; // see if at least one item is selected
--                            }
--                            label = displayFn(scope, locals); // what will be seen by the user
--
--                            // doing displayFn(scope, locals) || '' overwrites zero values
--                            label = isDefined(label) ? label : '';
--                            optionGroup.push({
--                                // either the index into array or key from object
--                                id: trackFn ? trackFn(scope, locals) : (keyName ? keys[index] : index),
--                                label: label,
--                                selected: selected                   // determine if we should be selected
--                            });
--                        }
--                        if (!multiple) {
--                            if (nullOption || modelValue === null) {
--                                // insert null option if we have a placeholder, or the model is null
--                                optionGroups[''].unshift({id:'', label:'', selected:!selectedSet});
--                            } else if (!selectedSet) {
--                                // option could not be found, we have to insert the undefined item
--                                optionGroups[''].unshift({id:'?', label:'', selected:true});
--                            }
--                        }
-+            var selectCtrl = ctrls[0];
-+            var ngModelCtrl = ctrls[1];
- 
--                        // Now we need to update the list of DOM nodes to match the optionGroups we computed above
--                        for (groupIndex = 0, groupLength = optionGroupNames.length;
--                             groupIndex < groupLength;
--                             groupIndex++) {
--                            // current option group name or '' if no group
--                            optionGroupName = optionGroupNames[groupIndex];
--
--                            // list of options for that group. (first item has the parent)
--                            optionGroup = optionGroups[optionGroupName];
--
--                            if (optionGroupsCache.length <= groupIndex) {
--                                // we need to grow the optionGroups
--                                existingParent = {
--                                    element: optGroupTemplate.clone().attr('label', optionGroupName),
--                                    label: optionGroup.label
--                                };
--                                existingOptions = [existingParent];
--                                optionGroupsCache.push(existingOptions);
--                                selectElement.append(existingParent.element);
--                            } else {
--                                existingOptions = optionGroupsCache[groupIndex];
--                                existingParent = existingOptions[0];  // either SELECT (no group) or OPTGROUP element
-+            // if ngModel is not defined, we don't need to do anything but set the registerOption
-+            // function to noop, so options don't get added internally
-+            if (!ngModelCtrl) {
-+                selectCtrl.registerOption = noop;
-+                return;
-+            }
- 
--                                // update the OPTGROUP label if not the same.
--                                if (existingParent.label != optionGroupName) {
--                                    existingParent.element.attr('label', existingParent.label = optionGroupName);
--                                }
--                            }
- 
--                            lastElement = null;  // start at the beginning
--                            for(index = 0, length = optionGroup.length; index < length; index++) {
--                                option = optionGroup[index];
--                                if ((existingOption = existingOptions[index+1])) {
--                                    // reuse elements
--                                    lastElement = existingOption.element;
--                                    if (existingOption.label !== option.label) {
--                                        lastElement.text(existingOption.label = option.label);
--                                    }
--                                    if (existingOption.id !== option.id) {
--                                        lastElement.val(existingOption.id = option.id);
--                                    }
--                                    // lastElement.prop('selected') provided by jQuery has side-effects
--                                    if (existingOption.selected !== option.selected) {
--                                        lastElement.prop('selected', (existingOption.selected = option.selected));
--                                    }
--                                } else {
--                                    // grow elements
-+            selectCtrl.ngModelCtrl = ngModelCtrl;
- 
--                                    // if it's a null option
--                                    if (option.id === '' && nullOption) {
--                                        // put back the pre-compiled element
--                                        element = nullOption;
--                                    } else {
--                                        // jQuery(v1.4.2) Bug: We should be able to chain the method calls, but
--                                        // in this version of jQuery on some browser the .text() returns a string
--                                        // rather then the element.
--                                        (element = optionTemplate.clone())
--                                            .val(option.id)
--                                            .attr('selected', option.selected)
--                                            .text(option.label);
--                                    }
-+            // When the selected item(s) changes we delegate getting the value of the select control
-+            // to the `readValue` method, which can be changed if the select can have multiple
-+            // selected values or if the options are being generated by `ngOptions`
-+            element.on('change', function() {
-+                selectCtrl.removeUnknownOption();
-+                scope.$apply(function() {
-+                    ngModelCtrl.$setViewValue(selectCtrl.readValue());
-+                });
-+            });
- 
--                                    existingOptions.push(existingOption = {
--                                        element: element,
--                                        label: option.label,
--                                        id: option.id,
--                                        selected: option.selected
--                                    });
--                                    if (lastElement) {
--                                        lastElement.after(element);
--                                    } else {
--                                        existingParent.element.append(element);
--                                    }
--                                    lastElement = element;
--                                }
--                            }
--                            // remove any excessive OPTIONs in a group
--                            index++; // increment since the existingOptions[0] is parent element not OPTION
--                            while(existingOptions.length > index) {
--                                existingOptions.pop().element.remove();
--                            }
-+            // If the select allows multiple values then we need to modify how we read and write
-+            // values from and to the control; also what it means for the value to be empty and
-+            // we have to add an extra watch since ngModel doesn't work well with arrays - it
-+            // doesn't trigger rendering if only an item in the array changes.
-+            if (attr.multiple) {
-+                selectCtrl.multiple = true;
-+
-+                // Read value now needs to check each option to see if it is selected
-+                selectCtrl.readValue = function readMultipleValue() {
-+                    var array = [];
-+                    forEach(element.find('option'), function(option) {
-+                        if (option.selected && !option.disabled) {
-+                            var val = option.value;
-+                            array.push(val in selectCtrl.selectValueMap ? selectCtrl.selectValueMap[val] : val);
-                         }
--                        // remove any excessive OPTGROUPs from select
--                        while(optionGroupsCache.length > groupIndex) {
--                            optionGroupsCache.pop()[0].element.remove();
-+                    });
-+                    return array;
-+                };
-+
-+                // Write value now needs to set the selected property of each matching option
-+                selectCtrl.writeValue = function writeMultipleValue(value) {
-+                    forEach(element.find('option'), function(option) {
-+                        var shouldBeSelected = !!value && (includes(value, option.value) ||
-+                            includes(value, selectCtrl.selectValueMap[option.value]));
-+                        var currentlySelected = option.selected;
-+
-+                        // Support: IE 9-11 only, Edge 12-15+
-+                        // In IE and Edge adding options to the selection via shift+click/UP/DOWN
-+                        // will de-select already selected options if "selected" on those options was set
-+                        // more than once (i.e. when the options were already selected)
-+                        // So we only modify the selected property if necessary.
-+                        // Note: this behavior cannot be replicated via unit tests because it only shows in the
-+                        // actual user interface.
-+                        if (shouldBeSelected !== currentlySelected) {
-+                            setOptionSelectedStatus(jqLite(option), shouldBeSelected);
-                         }
-+
-+                    });
-+                };
-+
-+                // we have to do it on each watch since ngModel watches reference, but
-+                // we need to work of an array, so we need to see if anything was inserted/removed
-+                var lastView, lastViewRef = NaN;
-+                scope.$watch(function selectMultipleWatch() {
-+                    if (lastViewRef === ngModelCtrl.$viewValue && !equals(lastView, ngModelCtrl.$viewValue)) {
-+                        lastView = shallowCopy(ngModelCtrl.$viewValue);
-+                        ngModelCtrl.$render();
-                     }
--                }
-+                    lastViewRef = ngModelCtrl.$viewValue;
-+                });
-+
-+                // If we are a multiple select then value is now a collection
-+                // so the meaning of $isEmpty changes
-+                ngModelCtrl.$isEmpty = function(value) {
-+                    return !value || value.length === 0;
-+                };
-+
-             }
--        };
--    }];
-+        }
- 
--    var optionDirective = ['$interpolate', function($interpolate) {
--        var nullSelectCtrl = {
--            addOption: noop,
--            removeOption: noop
--        };
-+        function selectPostLink(scope, element, attrs, ctrls) {
-+            // if ngModel is not defined, we don't need to do anything
-+            var ngModelCtrl = ctrls[1];
-+            if (!ngModelCtrl) return;
-+
-+            var selectCtrl = ctrls[0];
-+
-+            // We delegate rendering to the `writeValue` method, which can be changed
-+            // if the select can have multiple selected values or if the options are being
-+            // generated by `ngOptions`.
-+            // This must be done in the postLink fn to prevent $render to be called before
-+            // all nodes have been linked correctly.
-+            ngModelCtrl.$render = function() {
-+                selectCtrl.writeValue(ngModelCtrl.$viewValue);
-+            };
-+        }
-+    };
- 
-+
-+// The option directive is purely designed to communicate the existence (or lack of)
-+// of dynamically created (and destroyed) option elements to their containing select
-+// directive via its controller.
-+    var optionDirective = ['$interpolate', function($interpolate) {
-         return {
-             restrict: 'E',
-             priority: 100,
-             compile: function(element, attr) {
--                if (isUndefined(attr.value)) {
--                    var interpolateFn = $interpolate(element.text(), true);
--                    if (!interpolateFn) {
-+                var interpolateValueFn, interpolateTextFn;
-+
-+                if (isDefined(attr.ngValue)) {
-+                    // Will be handled by registerOption
-+                } else if (isDefined(attr.value)) {
-+                    // If the value attribute is defined, check if it contains an interpolation
-+                    interpolateValueFn = $interpolate(attr.value, true);
-+                } else {
-+                    // If the value attribute is not defined then we fall back to the
-+                    // text content of the option element, which may be interpolated
-+                    interpolateTextFn = $interpolate(element.text(), true);
-+                    if (!interpolateTextFn) {
-                         attr.$set('value', element.text());
-                     }
-                 }
- 
--                return function (scope, element, attr) {
-+                return function(scope, element, attr) {
-+                    // This is an optimization over using ^^ since we don't want to have to search
-+                    // all the way to the root of the DOM for every single option element
-                     var selectCtrlName = '$selectController',
-                         parent = element.parent(),
-                         selectCtrl = parent.data(selectCtrlName) ||
-                             parent.parent().data(selectCtrlName); // in case we are in optgroup
- 
--                    if (selectCtrl && selectCtrl.databound) {
--                        // For some reason Opera defaults to true and if not overridden this messes up the repeater.
--                        // We don't want the view to drive the initialization of the model anyway.
--                        element.prop('selected', false);
--                    } else {
--                        selectCtrl = nullSelectCtrl;
-+                    if (selectCtrl) {
-+                        selectCtrl.registerOption(scope, element, attr, interpolateValueFn, interpolateTextFn);
-                     }
-+                };
-+            }
-+        };
-+    }];
- 
--                    if (interpolateFn) {
--                        scope.$watch(interpolateFn, function interpolateWatchAction(newVal, oldVal) {
--                            attr.$set('value', newVal);
--                            if (newVal !== oldVal) selectCtrl.removeOption(oldVal);
--                            selectCtrl.addOption(newVal);
--                        });
--                    } else {
--                        selectCtrl.addOption(attr.value);
-+    /**
-+     * @ngdoc directive
-+     * @name ngRequired
-+     * @restrict A
-+     *
-+     * @param {expression} ngRequired AngularJS expression. If it evaluates to `true`, it sets the
-+     *                                `required` attribute to the element and adds the `required`
-+     *                                {@link ngModel.NgModelController#$validators `validator`}.
-+     *
-+     * @description
-+     *
-+     * ngRequired adds the required {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
-+     * It is most often used for {@link input `input`} and {@link select `select`} controls, but can also be
-+     * applied to custom controls.
-+     *
-+     * The directive sets the `required` attribute on the element if the AngularJS expression inside
-+     * `ngRequired` evaluates to true. A special directive for setting `required` is necessary because we
-+     * cannot use interpolation inside `required`. See the {@link guide/interpolation interpolation guide}
-+     * for more info.
-+     *
-+     * The validator will set the `required` error key to true if the `required` attribute is set and
-+     * calling {@link ngModel.NgModelController#$isEmpty `NgModelController.$isEmpty`} with the
-+     * {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`} returns `true`. For example, the
-+     * `$isEmpty()` implementation for `input[text]` checks the length of the `$viewValue`. When developing
-+     * custom controls, `$isEmpty()` can be overwritten to account for a $viewValue that is not string-based.
-+     *
-+     * @example
-+     * <example name="ngRequiredDirective" module="ngRequiredExample">
-+     *   <file name="index.html">
-+     *     <script>
-+     *       angular.module('ngRequiredExample', [])
-+     *         .controller('ExampleController', ['$scope', function($scope) {
-+     *           $scope.required = true;
-+     *         }]);
-+     *     </script>
-+     *     <div ng-controller="ExampleController">
-+     *       <form name="form">
-+     *         <label for="required">Toggle required: </label>
-+     *         <input type="checkbox" ng-model="required" id="required" />
-+     *         <br>
-+     *         <label for="input">This input must be filled if `required` is true: </label>
-+     *         <input type="text" ng-model="model" id="input" name="input" ng-required="required" /><br>
-+     *         <hr>
-+     *         required error set? = <code>{{form.input.$error.required}}</code><br>
-+     *         model = <code>{{model}}</code>
-+     *       </form>
-+     *     </div>
-+     *   </file>
-+     *   <file name="protractor.js" type="protractor">
-+     var required = element(by.binding('form.input.$error.required'));
-+     var model = element(by.binding('model'));
-+     var input = element(by.id('input'));
-+
-+     it('should set the required error', function() {
-+         expect(required.getText()).toContain('true');
-+
-+         input.sendKeys('123');
-+         expect(required.getText()).not.toContain('true');
-+         expect(model.getText()).toContain('123');
-+       });
-+     *   </file>
-+     * </example>
-+     */
-+    var requiredDirective = function() {
-+        return {
-+            restrict: 'A',
-+            require: '?ngModel',
-+            link: function(scope, elm, attr, ctrl) {
-+                if (!ctrl) return;
-+                attr.required = true; // force truthy in case we are on non input element
-+
-+                ctrl.$validators.required = function(modelValue, viewValue) {
-+                    return !attr.required || !ctrl.$isEmpty(viewValue);
-+                };
-+
-+                attr.$observe('required', function() {
-+                    ctrl.$validate();
-+                });
-+            }
-+        };
-+    };
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngPattern
-+     * @restrict A
-+     *
-+     * @param {expression|RegExp} ngPattern AngularJS expression that must evaluate to a `RegExp` or a `String`
-+     *                                      parsable into a `RegExp`, or a `RegExp` literal. See above for
-+     *                                      more details.
-+     *
-+     * @description
-+     *
-+     * ngPattern adds the pattern {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
-+     * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
-+     *
-+     * The validator sets the `pattern` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
-+     * does not match a RegExp which is obtained from the `ngPattern` attribute value:
-+     * - the value is an AngularJS expression:
-+     *   - If the expression evaluates to a RegExp object, then this is used directly.
-+     *   - If the expression evaluates to a string, then it will be converted to a RegExp after wrapping it
-+     *     in `^` and `$` characters. For instance, `"abc"` will be converted to `new RegExp('^abc$')`.
-+     * - If the value is a RegExp literal, e.g. `ngPattern="/^\d+$/"`, it is used directly.
-+     *
-+     * <div class="alert alert-info">
-+     * **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
-+     * start at the index of the last search's match, thus not taking the whole input value into
-+     * account.
-+     * </div>
-+     *
-+     * <div class="alert alert-info">
-+     * **Note:** This directive is also added when the plain `pattern` attribute is used, with two
-+     * differences:
-+     * <ol>
-+     *   <li>
-+     *     `ngPattern` does not set the `pattern` attribute and therefore HTML5 constraint validation is
-+     *     not available.
-+     *   </li>
-+     *   <li>
-+     *     The `ngPattern` attribute must be an expression, while the `pattern` value must be
-+     *     interpolated.
-+     *   </li>
-+     * </ol>
-+     * </div>
-+     *
-+     * @example
-+     * <example name="ngPatternDirective" module="ngPatternExample">
-+     *   <file name="index.html">
-+     *     <script>
-+     *       angular.module('ngPatternExample', [])
-+     *         .controller('ExampleController', ['$scope', function($scope) {
-+     *           $scope.regex = '\\d+';
-+     *         }]);
-+     *     </script>
-+     *     <div ng-controller="ExampleController">
-+     *       <form name="form">
-+     *         <label for="regex">Set a pattern (regex string): </label>
-+     *         <input type="text" ng-model="regex" id="regex" />
-+     *         <br>
-+     *         <label for="input">This input is restricted by the current pattern: </label>
-+     *         <input type="text" ng-model="model" id="input" name="input" ng-pattern="regex" /><br>
-+     *         <hr>
-+     *         input valid? = <code>{{form.input.$valid}}</code><br>
-+     *         model = <code>{{model}}</code>
-+     *       </form>
-+     *     </div>
-+     *   </file>
-+     *   <file name="protractor.js" type="protractor">
-+     var model = element(by.binding('model'));
-+     var input = element(by.id('input'));
-+
-+     it('should validate the input with the default pattern', function() {
-+         input.sendKeys('aaa');
-+         expect(model.getText()).not.toContain('aaa');
-+
-+         input.clear().then(function() {
-+           input.sendKeys('123');
-+           expect(model.getText()).toContain('123');
-+         });
-+       });
-+     *   </file>
-+     * </example>
-+     */
-+    var patternDirective = function() {
-+        return {
-+            restrict: 'A',
-+            require: '?ngModel',
-+            link: function(scope, elm, attr, ctrl) {
-+                if (!ctrl) return;
-+
-+                var regexp, patternExp = attr.ngPattern || attr.pattern;
-+                attr.$observe('pattern', function(regex) {
-+                    if (isString(regex) && regex.length > 0) {
-+                        regex = new RegExp('^' + regex + '$');
-                     }
- 
--                    element.on('$destroy', function() {
--                        selectCtrl.removeOption(attr.value);
--                    });
-+                    if (regex && !regex.test) {
-+                        throw minErr('ngPattern')('noregexp',
-+                            'Expected {0} to be a RegExp but was {1}. Element: {2}', patternExp,
-+                            regex, startingTag(elm));
-+                    }
-+
-+                    regexp = regex || undefined;
-+                    ctrl.$validate();
-+                });
-+
-+                ctrl.$validators.pattern = function(modelValue, viewValue) {
-+                    // HTML5 pattern constraint validates the input value, so we validate the viewValue
-+                    return ctrl.$isEmpty(viewValue) || isUndefined(regexp) || regexp.test(viewValue);
-                 };
-             }
-         };
--    }];
-+    };
- 
--    var styleDirective = valueFn({
--        restrict: 'E',
--        terminal: true
--    });
-+    /**
-+     * @ngdoc directive
-+     * @name ngMaxlength
-+     * @restrict A
-+     *
-+     * @param {expression} ngMaxlength AngularJS expression that must evaluate to a `Number` or `String`
-+     *                                 parsable into a `Number`. Used as value for the `maxlength`
-+     *                                 {@link ngModel.NgModelController#$validators validator}.
-+     *
-+     * @description
-+     *
-+     * ngMaxlength adds the maxlength {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
-+     * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
-+     *
-+     * The validator sets the `maxlength` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
-+     * is longer than the integer obtained by evaluating the AngularJS expression given in the
-+     * `ngMaxlength` attribute value.
-+     *
-+     * <div class="alert alert-info">
-+     * **Note:** This directive is also added when the plain `maxlength` attribute is used, with two
-+     * differences:
-+     * <ol>
-+     *   <li>
-+     *     `ngMaxlength` does not set the `maxlength` attribute and therefore HTML5 constraint
-+     *     validation is not available.
-+     *   </li>
-+     *   <li>
-+     *     The `ngMaxlength` attribute must be an expression, while the `maxlength` value must be
-+     *     interpolated.
-+     *   </li>
-+     * </ol>
-+     * </div>
-+     *
-+     * @example
-+     * <example name="ngMaxlengthDirective" module="ngMaxlengthExample">
-+     *   <file name="index.html">
-+     *     <script>
-+     *       angular.module('ngMaxlengthExample', [])
-+     *         .controller('ExampleController', ['$scope', function($scope) {
-+     *           $scope.maxlength = 5;
-+     *         }]);
-+     *     </script>
-+     *     <div ng-controller="ExampleController">
-+     *       <form name="form">
-+     *         <label for="maxlength">Set a maxlength: </label>
-+     *         <input type="number" ng-model="maxlength" id="maxlength" />
-+     *         <br>
-+     *         <label for="input">This input is restricted by the current maxlength: </label>
-+     *         <input type="text" ng-model="model" id="input" name="input" ng-maxlength="maxlength" /><br>
-+     *         <hr>
-+     *         input valid? = <code>{{form.input.$valid}}</code><br>
-+     *         model = <code>{{model}}</code>
-+     *       </form>
-+     *     </div>
-+     *   </file>
-+     *   <file name="protractor.js" type="protractor">
-+     var model = element(by.binding('model'));
-+     var input = element(by.id('input'));
-+
-+     it('should validate the input with the default maxlength', function() {
-+         input.sendKeys('abcdef');
-+         expect(model.getText()).not.toContain('abcdef');
-+
-+         input.clear().then(function() {
-+           input.sendKeys('abcde');
-+           expect(model.getText()).toContain('abcde');
-+         });
-+       });
-+     *   </file>
-+     * </example>
-+     */
-+    var maxlengthDirective = function() {
-+        return {
-+            restrict: 'A',
-+            require: '?ngModel',
-+            link: function(scope, elm, attr, ctrl) {
-+                if (!ctrl) return;
-+
-+                var maxlength = -1;
-+                attr.$observe('maxlength', function(value) {
-+                    var intVal = toInt(value);
-+                    maxlength = isNumberNaN(intVal) ? -1 : intVal;
-+                    ctrl.$validate();
-+                });
-+                ctrl.$validators.maxlength = function(modelValue, viewValue) {
-+                    return (maxlength < 0) || ctrl.$isEmpty(viewValue) || (viewValue.length <= maxlength);
-+                };
-+            }
-+        };
-+    };
-+
-+    /**
-+     * @ngdoc directive
-+     * @name ngMinlength
-+     * @restrict A
-+     *
-+     * @param {expression} ngMinlength AngularJS expression that must evaluate to a `Number` or `String`
-+     *                                 parsable into a `Number`. Used as value for the `minlength`
-+     *                                 {@link ngModel.NgModelController#$validators validator}.
-+     *
-+     * @description
-+     *
-+     * ngMinlength adds the minlength {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
-+     * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
-+     *
-+     * The validator sets the `minlength` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
-+     * is shorter than the integer obtained by evaluating the AngularJS expression given in the
-+     * `ngMinlength` attribute value.
-+     *
-+     * <div class="alert alert-info">
-+     * **Note:** This directive is also added when the plain `minlength` attribute is used, with two
-+     * differences:
-+     * <ol>
-+     *   <li>
-+     *     `ngMinlength` does not set the `minlength` attribute and therefore HTML5 constraint
-+     *     validation is not available.
-+     *   </li>
-+     *   <li>
-+     *     The `ngMinlength` value must be an expression, while the `minlength` value must be
-+     *     interpolated.
-+     *   </li>
-+     * </ol>
-+     * </div>
-+     *
-+     * @example
-+     * <example name="ngMinlengthDirective" module="ngMinlengthExample">
-+     *   <file name="index.html">
-+     *     <script>
-+     *       angular.module('ngMinlengthExample', [])
-+     *         .controller('ExampleController', ['$scope', function($scope) {
-+     *           $scope.minlength = 3;
-+     *         }]);
-+     *     </script>
-+     *     <div ng-controller="ExampleController">
-+     *       <form name="form">
-+     *         <label for="minlength">Set a minlength: </label>
-+     *         <input type="number" ng-model="minlength" id="minlength" />
-+     *         <br>
-+     *         <label for="input">This input is restricted by the current minlength: </label>
-+     *         <input type="text" ng-model="model" id="input" name="input" ng-minlength="minlength" /><br>
-+     *         <hr>
-+     *         input valid? = <code>{{form.input.$valid}}</code><br>
-+     *         model = <code>{{model}}</code>
-+     *       </form>
-+     *     </div>
-+     *   </file>
-+     *   <file name="protractor.js" type="protractor">
-+     var model = element(by.binding('model'));
-+     var input = element(by.id('input'));
-+
-+     it('should validate the input with the default minlength', function() {
-+         input.sendKeys('ab');
-+         expect(model.getText()).not.toContain('ab');
-+
-+         input.sendKeys('abc');
-+         expect(model.getText()).toContain('abc');
-+       });
-+     *   </file>
-+     * </example>
-+     */
-+    var minlengthDirective = function() {
-+        return {
-+            restrict: 'A',
-+            require: '?ngModel',
-+            link: function(scope, elm, attr, ctrl) {
-+                if (!ctrl) return;
-+
-+                var minlength = 0;
-+                attr.$observe('minlength', function(value) {
-+                    minlength = toInt(value) || 0;
-+                    ctrl.$validate();
-+                });
-+                ctrl.$validators.minlength = function(modelValue, viewValue) {
-+                    return ctrl.$isEmpty(viewValue) || viewValue.length >= minlength;
-+                };
-+            }
-+        };
-+    };
- 
-     if (window.angular.bootstrap) {
--        //AngularJS is already loaded, so we can return here...
--        console.log('WARNING: Tried to load angular more than once.');
-+        // AngularJS is already loaded, so we can return here...
-+        if (window.console) {
-+            console.log('WARNING: Tried to load AngularJS more than once.');
-+        }
-         return;
-     }
- 
--    //try to bind to jquery now so that one can write angular.element().read()
--    //but we will rebind on bootstrap again.
-+// try to bind to jquery now so that one can write jqLite(fn)
-+// but we will rebind on bootstrap again.
-     bindJQuery();
- 
-     publishExternalAPI(angular);
- 
--    jqLite(document).ready(function() {
--        angularInit(document, bootstrap);
-+    angular.module("ngLocale", [], ["$provide", function($provide) {
-+        var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"};
-+        function getDecimals(n) {
-+            n = n + '';
-+            var i = n.indexOf('.');
-+            return (i == -1) ? 0 : n.length - i - 1;
-+        }
-+
-+        function getVF(n, opt_precision) {
-+            var v = opt_precision;
-+
-+            if (undefined === v) {
-+                v = Math.min(getDecimals(n), 3);
-+            }
-+
-+            var base = Math.pow(10, v);
-+            var f = ((n * base) | 0) % base;
-+            return {v: v, f: f};
-+        }
-+
-+        $provide.value("$locale", {
-+            "DATETIME_FORMATS": {
-+                "AMPMS": [
-+                    "AM",
-+                    "PM"
-+                ],
-+                "DAY": [
-+                    "Sunday",
-+                    "Monday",
-+                    "Tuesday",
-+                    "Wednesday",
-+                    "Thursday",
-+                    "Friday",
-+                    "Saturday"
-+                ],
-+                "ERANAMES": [
-+                    "Before Christ",
-+                    "Anno Domini"
-+                ],
-+                "ERAS": [
-+                    "BC",
-+                    "AD"
-+                ],
-+                "FIRSTDAYOFWEEK": 6,
-+                "MONTH": [
-+                    "January",
-+                    "February",
-+                    "March",
-+                    "April",
-+                    "May",
-+                    "June",
-+                    "July",
-+                    "August",
-+                    "September",
-+                    "October",
-+                    "November",
-+                    "December"
-+                ],
-+                "SHORTDAY": [
-+                    "Sun",
-+                    "Mon",
-+                    "Tue",
-+                    "Wed",
-+                    "Thu",
-+                    "Fri",
-+                    "Sat"
-+                ],
-+                "SHORTMONTH": [
-+                    "Jan",
-+                    "Feb",
-+                    "Mar",
-+                    "Apr",
-+                    "May",
-+                    "Jun",
-+                    "Jul",
-+                    "Aug",
-+                    "Sep",
-+                    "Oct",
-+                    "Nov",
-+                    "Dec"
-+                ],
-+                "STANDALONEMONTH": [
-+                    "January",
-+                    "February",
-+                    "March",
-+                    "April",
-+                    "May",
-+                    "June",
-+                    "July",
-+                    "August",
-+                    "September",
-+                    "October",
-+                    "November",
-+                    "December"
-+                ],
-+                "WEEKENDRANGE": [
-+                    5,
-+                    6
-+                ],
-+                "fullDate": "EEEE, MMMM d, y",
-+                "longDate": "MMMM d, y",
-+                "medium": "MMM d, y h:mm:ss a",
-+                "mediumDate": "MMM d, y",
-+                "mediumTime": "h:mm:ss a",
-+                "short": "M/d/yy h:mm a",
-+                "shortDate": "M/d/yy",
-+                "shortTime": "h:mm a"
-+            },
-+            "NUMBER_FORMATS": {
-+                "CURRENCY_SYM": "$",
-+                "DECIMAL_SEP": ".",
-+                "GROUP_SEP": ",",
-+                "PATTERNS": [
-+                    {
-+                        "gSize": 3,
-+                        "lgSize": 3,
-+                        "maxFrac": 3,
-+                        "minFrac": 0,
-+                        "minInt": 1,
-+                        "negPre": "-",
-+                        "negSuf": "",
-+                        "posPre": "",
-+                        "posSuf": ""
-+                    },
-+                    {
-+                        "gSize": 3,
-+                        "lgSize": 3,
-+                        "maxFrac": 2,
-+                        "minFrac": 2,
-+                        "minInt": 1,
-+                        "negPre": "-\u00a4",
-+                        "negSuf": "",
-+                        "posPre": "\u00a4",
-+                        "posSuf": ""
-+                    }
-+                ]
-+            },
-+            "id": "en-us",
-+            "localeID": "en_US",
-+            "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
-+        });
-+    }]);
-+
-+    jqLite(function() {
-+        angularInit(window.document, bootstrap);
-     });
- 
--})(window, document);
-+})(window);
- 
--!angular.$$csp() && angular.element(document).find('head').prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide{display:none !important;}ng\\:form{display:block;}.ng-animate-block-transitions{transition:0s all!important;-webkit-transition:0s all!important;}</style>');
-\ No newline at end of file
-+!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
-\ No newline at end of file
-diff --git a/setup/pub/angular/angular.min.js b/setup/pub/angular/angular.min.js
-index c7d2ea7388e..4c579373357 100644
---- a/setup/pub/angular/angular.min.js
-+++ b/setup/pub/angular/angular.min.js
-@@ -1,212 +1,337 @@
- /*
-- AngularJS v1.2.17-build.178+sha.2406084
-- (c) 2010-2014 Google, Inc. http://angularjs.org
-+ AngularJS v1.6.9
-+ (c) 2010-2018 Google, Inc. http://angularjs.org
-  License: MIT
- */
--(function(P,U,s){'use strict';function u(b){return function(){var a=arguments[0],c,a="["+(b?b+":":"")+a+"] http://errors.angularjs.org/1.2.17-build.178+sha.2406084/"+(b?b+"/":"")+a;for(c=1;c<arguments.length;c++)a=a+(1==c?"?":"&")+"p"+(c-1)+"="+encodeURIComponent("function"==typeof arguments[c]?arguments[c].toString().replace(/ \{[\s\S]*$/,""):"undefined"==typeof arguments[c]?"undefined":"string"!=typeof arguments[c]?JSON.stringify(arguments[c]):arguments[c]);return Error(a)}}function bb(b){if(null==
--b||Da(b))return!1;var a=b.length;return 1===b.nodeType&&a?!0:C(b)||L(b)||0===a||"number"===typeof a&&0<a&&a-1 in b}function q(b,a,c){var d;if(b)if(Q(b))for(d in b)"prototype"==d||("length"==d||"name"==d||b.hasOwnProperty&&!b.hasOwnProperty(d))||a.call(c,b[d],d);else if(b.forEach&&b.forEach!==q)b.forEach(a,c);else if(bb(b))for(d=0;d<b.length;d++)a.call(c,b[d],d);else for(d in b)b.hasOwnProperty(d)&&a.call(c,b[d],d);return b}function Ub(b){var a=[],c;for(c in b)b.hasOwnProperty(c)&&a.push(c);return a.sort()}
--function Sc(b,a,c){for(var d=Ub(b),e=0;e<d.length;e++)a.call(c,b[d[e]],d[e]);return d}function Vb(b){return function(a,c){b(c,a)}}function cb(){for(var b=ka.length,a;b;){b--;a=ka[b].charCodeAt(0);if(57==a)return ka[b]="A",ka.join("");if(90==a)ka[b]="0";else return ka[b]=String.fromCharCode(a+1),ka.join("")}ka.unshift("0");return ka.join("")}function Wb(b,a){a?b.$$hashKey=a:delete b.$$hashKey}function E(b){var a=b.$$hashKey;q(arguments,function(a){a!==b&&q(a,function(a,c){b[c]=a})});Wb(b,a);return b}
--function Y(b){return parseInt(b,10)}function Xb(b,a){return E(new (E(function(){},{prototype:b})),a)}function w(){}function Ea(b){return b}function aa(b){return function(){return b}}function H(b){return"undefined"===typeof b}function z(b){return"undefined"!==typeof b}function X(b){return null!=b&&"object"===typeof b}function C(b){return"string"===typeof b}function yb(b){return"number"===typeof b}function Ma(b){return"[object Date]"===wa.call(b)}function L(b){return"[object Array]"===wa.call(b)}function Q(b){return"function"===
--typeof b}function db(b){return"[object RegExp]"===wa.call(b)}function Da(b){return b&&b.document&&b.location&&b.alert&&b.setInterval}function Tc(b){return!(!b||!(b.nodeName||b.prop&&b.attr&&b.find))}function Uc(b,a,c){var d=[];q(b,function(b,g,f){d.push(a.call(c,b,g,f))});return d}function eb(b,a){if(b.indexOf)return b.indexOf(a);for(var c=0;c<b.length;c++)if(a===b[c])return c;return-1}function Na(b,a){var c=eb(b,a);0<=c&&b.splice(c,1);return a}function ca(b,a){if(Da(b)||b&&b.$evalAsync&&b.$watch)throw Oa("cpws");
--if(a){if(b===a)throw Oa("cpi");if(L(b))for(var c=a.length=0;c<b.length;c++)a.push(ca(b[c]));else{c=a.$$hashKey;q(a,function(b,c){delete a[c]});for(var d in b)a[d]=ca(b[d]);Wb(a,c)}}else(a=b)&&(L(b)?a=ca(b,[]):Ma(b)?a=new Date(b.getTime()):db(b)?a=RegExp(b.source):X(b)&&(a=ca(b,{})));return a}function Yb(b,a){a=a||{};for(var c in b)!b.hasOwnProperty(c)||"$"===c.charAt(0)&&"$"===c.charAt(1)||(a[c]=b[c]);return a}function xa(b,a){if(b===a)return!0;if(null===b||null===a)return!1;if(b!==b&&a!==a)return!0;
--var c=typeof b,d;if(c==typeof a&&"object"==c)if(L(b)){if(!L(a))return!1;if((c=b.length)==a.length){for(d=0;d<c;d++)if(!xa(b[d],a[d]))return!1;return!0}}else{if(Ma(b))return Ma(a)&&b.getTime()==a.getTime();if(db(b)&&db(a))return b.toString()==a.toString();if(b&&b.$evalAsync&&b.$watch||a&&a.$evalAsync&&a.$watch||Da(b)||Da(a)||L(a))return!1;c={};for(d in b)if("$"!==d.charAt(0)&&!Q(b[d])){if(!xa(b[d],a[d]))return!1;c[d]=!0}for(d in a)if(!c.hasOwnProperty(d)&&"$"!==d.charAt(0)&&a[d]!==s&&!Q(a[d]))return!1;
--return!0}return!1}function Zb(){return U.securityPolicy&&U.securityPolicy.isActive||U.querySelector&&!(!U.querySelector("[ng-csp]")&&!U.querySelector("[data-ng-csp]"))}function fb(b,a){var c=2<arguments.length?ya.call(arguments,2):[];return!Q(a)||a instanceof RegExp?a:c.length?function(){return arguments.length?a.apply(b,c.concat(ya.call(arguments,0))):a.apply(b,c)}:function(){return arguments.length?a.apply(b,arguments):a.call(b)}}function Vc(b,a){var c=a;"string"===typeof b&&"$"===b.charAt(0)?c=
--s:Da(a)?c="$WINDOW":a&&U===a?c="$DOCUMENT":a&&(a.$evalAsync&&a.$watch)&&(c="$SCOPE");return c}function qa(b,a){return"undefined"===typeof b?s:JSON.stringify(b,Vc,a?"  ":null)}function $b(b){return C(b)?JSON.parse(b):b}function Pa(b){"function"===typeof b?b=!0:b&&0!==b.length?(b=J(""+b),b=!("f"==b||"0"==b||"false"==b||"no"==b||"n"==b||"[]"==b)):b=!1;return b}function ia(b){b=y(b).clone();try{b.empty()}catch(a){}var c=y("<div>").append(b).html();try{return 3===b[0].nodeType?J(c):c.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,
--function(a,b){return"<"+J(b)})}catch(d){return J(c)}}function ac(b){try{return decodeURIComponent(b)}catch(a){}}function bc(b){var a={},c,d;q((b||"").split("&"),function(b){b&&(c=b.split("="),d=ac(c[0]),z(d)&&(b=z(c[1])?ac(c[1]):!0,a[d]?L(a[d])?a[d].push(b):a[d]=[a[d],b]:a[d]=b))});return a}function zb(b){var a=[];q(b,function(b,d){L(b)?q(b,function(b){a.push(za(d,!0)+(!0===b?"":"="+za(b,!0)))}):a.push(za(d,!0)+(!0===b?"":"="+za(b,!0)))});return a.length?a.join("&"):""}function gb(b){return za(b,
--!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function za(b,a){return encodeURIComponent(b).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,a?"%20":"+")}function Wc(b,a){function c(a){a&&d.push(a)}var d=[b],e,g,f=["ng:app","ng-app","x-ng-app","data-ng-app"],h=/\sng[:\-]app(:\s*([\w\d_]+);?)?\s/;q(f,function(a){f[a]=!0;c(U.getElementById(a));a=a.replace(":","\\:");b.querySelectorAll&&(q(b.querySelectorAll("."+a),c),q(b.querySelectorAll("."+
--a+"\\:"),c),q(b.querySelectorAll("["+a+"]"),c))});q(d,function(a){if(!e){var b=h.exec(" "+a.className+" ");b?(e=a,g=(b[2]||"").replace(/\s+/g,",")):q(a.attributes,function(b){!e&&f[b.name]&&(e=a,g=b.value)})}});e&&a(e,g?[g]:[])}function cc(b,a){var c=function(){b=y(b);if(b.injector()){var c=b[0]===U?"document":ia(b);throw Oa("btstrpd",c);}a=a||[];a.unshift(["$provide",function(a){a.value("$rootElement",b)}]);a.unshift("ng");c=dc(a);c.invoke(["$rootScope","$rootElement","$compile","$injector","$animate",
--function(a,b,c,d,e){a.$apply(function(){b.data("$injector",d);c(b)(a)})}]);return c},d=/^NG_DEFER_BOOTSTRAP!/;if(P&&!d.test(P.name))return c();P.name=P.name.replace(d,"");Qa.resumeBootstrap=function(b){q(b,function(b){a.push(b)});c()}}function hb(b,a){a=a||"_";return b.replace(Xc,function(b,d){return(d?a:"")+b.toLowerCase()})}function Ab(b,a,c){if(!b)throw Oa("areq",a||"?",c||"required");return b}function Ra(b,a,c){c&&L(b)&&(b=b[b.length-1]);Ab(Q(b),a,"not a function, got "+(b&&"object"==typeof b?
--b.constructor.name||"Object":typeof b));return b}function Aa(b,a){if("hasOwnProperty"===b)throw Oa("badname",a);}function ec(b,a,c){if(!a)return b;a=a.split(".");for(var d,e=b,g=a.length,f=0;f<g;f++)d=a[f],b&&(b=(e=b)[d]);return!c&&Q(b)?fb(e,b):b}function Bb(b){var a=b[0];b=b[b.length-1];if(a===b)return y(a);var c=[a];do{a=a.nextSibling;if(!a)break;c.push(a)}while(a!==b);return y(c)}function Yc(b){var a=u("$injector"),c=u("ng");b=b.angular||(b.angular={});b.$$minErr=b.$$minErr||u;return b.module||
--(b.module=function(){var b={};return function(e,g,f){if("hasOwnProperty"===e)throw c("badname","module");g&&b.hasOwnProperty(e)&&(b[e]=null);return b[e]||(b[e]=function(){function b(a,d,e){return function(){c[e||"push"]([a,d,arguments]);return n}}if(!g)throw a("nomod",e);var c=[],d=[],l=b("$injector","invoke"),n={_invokeQueue:c,_runBlocks:d,requires:g,name:e,provider:b("$provide","provider"),factory:b("$provide","factory"),service:b("$provide","service"),value:b("$provide","value"),constant:b("$provide",
--"constant","unshift"),animation:b("$animateProvider","register"),filter:b("$filterProvider","register"),controller:b("$controllerProvider","register"),directive:b("$compileProvider","directive"),config:l,run:function(a){d.push(a);return this}};f&&l(f);return n}())}}())}function Zc(b){E(b,{bootstrap:cc,copy:ca,extend:E,equals:xa,element:y,forEach:q,injector:dc,noop:w,bind:fb,toJson:qa,fromJson:$b,identity:Ea,isUndefined:H,isDefined:z,isString:C,isFunction:Q,isObject:X,isNumber:yb,isElement:Tc,isArray:L,
--version:$c,isDate:Ma,lowercase:J,uppercase:Fa,callbacks:{counter:0},$$minErr:u,$$csp:Zb});Sa=Yc(P);try{Sa("ngLocale")}catch(a){Sa("ngLocale",[]).provider("$locale",ad)}Sa("ng",["ngLocale"],["$provide",function(a){a.provider({$$sanitizeUri:bd});a.provider("$compile",fc).directive({a:cd,input:gc,textarea:gc,form:dd,script:ed,select:fd,style:gd,option:hd,ngBind:id,ngBindHtml:jd,ngBindTemplate:kd,ngClass:ld,ngClassEven:md,ngClassOdd:nd,ngCloak:od,ngController:pd,ngForm:qd,ngHide:rd,ngIf:sd,ngInclude:td,
--ngInit:ud,ngNonBindable:vd,ngPluralize:wd,ngRepeat:xd,ngShow:yd,ngStyle:zd,ngSwitch:Ad,ngSwitchWhen:Bd,ngSwitchDefault:Cd,ngOptions:Dd,ngTransclude:Ed,ngModel:Fd,ngList:Gd,ngChange:Hd,required:hc,ngRequired:hc,ngValue:Id}).directive({ngInclude:Jd}).directive(Cb).directive(ic);a.provider({$anchorScroll:Kd,$animate:Ld,$browser:Md,$cacheFactory:Nd,$controller:Od,$document:Pd,$exceptionHandler:Qd,$filter:jc,$interpolate:Rd,$interval:Sd,$http:Td,$httpBackend:Ud,$location:Vd,$log:Wd,$parse:Xd,$rootScope:Yd,
--$q:Zd,$sce:$d,$sceDelegate:ae,$sniffer:be,$templateCache:ce,$timeout:de,$window:ee,$$rAF:fe,$$asyncCallback:ge})}])}function Ta(b){return b.replace(he,function(a,b,d,e){return e?d.toUpperCase():d}).replace(ie,"Moz$1")}function Db(b,a,c,d){function e(b){var e=c&&b?[this.filter(b)]:[this],m=a,k,l,n,p,r,A;if(!d||null!=b)for(;e.length;)for(k=e.shift(),l=0,n=k.length;l<n;l++)for(p=y(k[l]),m?p.triggerHandler("$destroy"):m=!m,r=0,p=(A=p.children()).length;r<p;r++)e.push(Ba(A[r]));return g.apply(this,arguments)}
--var g=Ba.fn[b],g=g.$original||g;e.$original=g;Ba.fn[b]=e}function M(b){if(b instanceof M)return b;C(b)&&(b=ba(b));if(!(this instanceof M)){if(C(b)&&"<"!=b.charAt(0))throw Eb("nosel");return new M(b)}if(C(b)){var a=b;b=U;var c;if(c=je.exec(a))b=[b.createElement(c[1])];else{var d=b,e;b=d.createDocumentFragment();c=[];if(Fb.test(a)){d=b.appendChild(d.createElement("div"));e=(ke.exec(a)||["",""])[1].toLowerCase();e=ea[e]||ea._default;d.innerHTML="<div>&#160;</div>"+e[1]+a.replace(le,"<$1></$2>")+e[2];
--d.removeChild(d.firstChild);for(a=e[0];a--;)d=d.lastChild;a=0;for(e=d.childNodes.length;a<e;++a)c.push(d.childNodes[a]);d=b.firstChild;d.textContent=""}else c.push(d.createTextNode(a));b.textContent="";b.innerHTML="";b=c}Gb(this,b);y(U.createDocumentFragment()).append(this)}else Gb(this,b)}function Hb(b){return b.cloneNode(!0)}function Ga(b){kc(b);var a=0;for(b=b.childNodes||[];a<b.length;a++)Ga(b[a])}function lc(b,a,c,d){if(z(d))throw Eb("offargs");var e=la(b,"events");la(b,"handle")&&(H(a)?q(e,
--function(a,c){Ua(b,c,a);delete e[c]}):q(a.split(" "),function(a){H(c)?(Ua(b,a,e[a]),delete e[a]):Na(e[a]||[],c)}))}function kc(b,a){var c=b[ib],d=Va[c];d&&(a?delete Va[c].data[a]:(d.handle&&(d.events.$destroy&&d.handle({},"$destroy"),lc(b)),delete Va[c],b[ib]=s))}function la(b,a,c){var d=b[ib],d=Va[d||-1];if(z(c))d||(b[ib]=d=++me,d=Va[d]={}),d[a]=c;else return d&&d[a]}function mc(b,a,c){var d=la(b,"data"),e=z(c),g=!e&&z(a),f=g&&!X(a);d||f||la(b,"data",d={});if(e)d[a]=c;else if(g){if(f)return d&&d[a];
--E(d,a)}else return d}function Ib(b,a){return b.getAttribute?-1<(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+a+" "):!1}function jb(b,a){a&&b.setAttribute&&q(a.split(" "),function(a){b.setAttribute("class",ba((" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").replace(" "+ba(a)+" "," ")))})}function kb(b,a){if(a&&b.setAttribute){var c=(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ");q(a.split(" "),function(a){a=ba(a);-1===c.indexOf(" "+a+" ")&&
--(c+=a+" ")});b.setAttribute("class",ba(c))}}function Gb(b,a){if(a){a=a.nodeName||!z(a.length)||Da(a)?[a]:a;for(var c=0;c<a.length;c++)b.push(a[c])}}function nc(b,a){return lb(b,"$"+(a||"ngController")+"Controller")}function lb(b,a,c){b=y(b);9==b[0].nodeType&&(b=b.find("html"));for(a=L(a)?a:[a];b.length;){for(var d=b[0],e=0,g=a.length;e<g;e++)if((c=b.data(a[e]))!==s)return c;b=y(d.parentNode||11===d.nodeType&&d.host)}}function oc(b){for(var a=0,c=b.childNodes;a<c.length;a++)Ga(c[a]);for(;b.firstChild;)b.removeChild(b.firstChild)}
--function pc(b,a){var c=mb[a.toLowerCase()];return c&&qc[b.nodeName]&&c}function ne(b,a){var c=function(c,e){c.preventDefault||(c.preventDefault=function(){c.returnValue=!1});c.stopPropagation||(c.stopPropagation=function(){c.cancelBubble=!0});c.target||(c.target=c.srcElement||U);if(H(c.defaultPrevented)){var g=c.preventDefault;c.preventDefault=function(){c.defaultPrevented=!0;g.call(c)};c.defaultPrevented=!1}c.isDefaultPrevented=function(){return c.defaultPrevented||!1===c.returnValue};var f=Yb(a[e||
--c.type]||[]);q(f,function(a){a.call(b,c)});8>=S?(c.preventDefault=null,c.stopPropagation=null,c.isDefaultPrevented=null):(delete c.preventDefault,delete c.stopPropagation,delete c.isDefaultPrevented)};c.elem=b;return c}function Ha(b){var a=typeof b,c;"object"==a&&null!==b?"function"==typeof(c=b.$$hashKey)?c=b.$$hashKey():c===s&&(c=b.$$hashKey=cb()):c=b;return a+":"+c}function Wa(b){q(b,this.put,this)}function rc(b){var a,c;"function"==typeof b?(a=b.$inject)||(a=[],b.length&&(c=b.toString().replace(oe,
--""),c=c.match(pe),q(c[1].split(qe),function(b){b.replace(re,function(b,c,d){a.push(d)})})),b.$inject=a):L(b)?(c=b.length-1,Ra(b[c],"fn"),a=b.slice(0,c)):Ra(b,"fn",!0);return a}function dc(b){function a(a){return function(b,c){if(X(b))q(b,Vb(a));else return a(b,c)}}function c(a,b){Aa(a,"service");if(Q(b)||L(b))b=n.instantiate(b);if(!b.$get)throw Xa("pget",a);return l[a+h]=b}function d(a,b){return c(a,{$get:b})}function e(a){var b=[],c,d,g,h;q(a,function(a){if(!k.get(a)){k.put(a,!0);try{if(C(a))for(c=
--Sa(a),b=b.concat(e(c.requires)).concat(c._runBlocks),d=c._invokeQueue,g=0,h=d.length;g<h;g++){var f=d[g],m=n.get(f[0]);m[f[1]].apply(m,f[2])}else Q(a)?b.push(n.invoke(a)):L(a)?b.push(n.invoke(a)):Ra(a,"module")}catch(l){throw L(a)&&(a=a[a.length-1]),l.message&&(l.stack&&-1==l.stack.indexOf(l.message))&&(l=l.message+"\n"+l.stack),Xa("modulerr",a,l.stack||l.message||l);}}});return b}function g(a,b){function c(d){if(a.hasOwnProperty(d)){if(a[d]===f)throw Xa("cdep",m.join(" <- "));return a[d]}try{return m.unshift(d),
--a[d]=f,a[d]=b(d)}catch(e){throw a[d]===f&&delete a[d],e;}finally{m.shift()}}function d(a,b,e){var g=[],h=rc(a),f,m,k;m=0;for(f=h.length;m<f;m++){k=h[m];if("string"!==typeof k)throw Xa("itkn",k);g.push(e&&e.hasOwnProperty(k)?e[k]:c(k))}a.$inject||(a=a[f]);return a.apply(b,g)}return{invoke:d,instantiate:function(a,b){var c=function(){},e;c.prototype=(L(a)?a[a.length-1]:a).prototype;c=new c;e=d(a,c,b);return X(e)||Q(e)?e:c},get:c,annotate:rc,has:function(b){return l.hasOwnProperty(b+h)||a.hasOwnProperty(b)}}}
--var f={},h="Provider",m=[],k=new Wa,l={$provide:{provider:a(c),factory:a(d),service:a(function(a,b){return d(a,["$injector",function(a){return a.instantiate(b)}])}),value:a(function(a,b){return d(a,aa(b))}),constant:a(function(a,b){Aa(a,"constant");l[a]=b;p[a]=b}),decorator:function(a,b){var c=n.get(a+h),d=c.$get;c.$get=function(){var a=r.invoke(d,c);return r.invoke(b,null,{$delegate:a})}}}},n=l.$injector=g(l,function(){throw Xa("unpr",m.join(" <- "));}),p={},r=p.$injector=g(p,function(a){a=n.get(a+
--h);return r.invoke(a.$get,a)});q(e(b),function(a){r.invoke(a||w)});return r}function Kd(){var b=!0;this.disableAutoScrolling=function(){b=!1};this.$get=["$window","$location","$rootScope",function(a,c,d){function e(a){var b=null;q(a,function(a){b||"a"!==J(a.nodeName)||(b=a)});return b}function g(){var b=c.hash(),d;b?(d=f.getElementById(b))?d.scrollIntoView():(d=e(f.getElementsByName(b)))?d.scrollIntoView():"top"===b&&a.scrollTo(0,0):a.scrollTo(0,0)}var f=a.document;b&&d.$watch(function(){return c.hash()},
--function(){d.$evalAsync(g)});return g}]}function ge(){this.$get=["$$rAF","$timeout",function(b,a){return b.supported?function(a){return b(a)}:function(b){return a(b,0,!1)}}]}function se(b,a,c,d){function e(a){try{a.apply(null,ya.call(arguments,1))}finally{if(A--,0===A)for(;D.length;)try{D.pop()()}catch(b){c.error(b)}}}function g(a,b){(function T(){q(x,function(a){a()});t=b(T,a)})()}function f(){v=null;N!=h.url()&&(N=h.url(),q(ma,function(a){a(h.url())}))}var h=this,m=a[0],k=b.location,l=b.history,
--n=b.setTimeout,p=b.clearTimeout,r={};h.isMock=!1;var A=0,D=[];h.$$completeOutstandingRequest=e;h.$$incOutstandingRequestCount=function(){A++};h.notifyWhenNoOutstandingRequests=function(a){q(x,function(a){a()});0===A?a():D.push(a)};var x=[],t;h.addPollFn=function(a){H(t)&&g(100,n);x.push(a);return a};var N=k.href,B=a.find("base"),v=null;h.url=function(a,c){k!==b.location&&(k=b.location);l!==b.history&&(l=b.history);if(a){if(N!=a)return N=a,d.history?c?l.replaceState(null,"",a):(l.pushState(null,"",
--a),B.attr("href",B.attr("href"))):(v=a,c?k.replace(a):k.href=a),h}else return v||k.href.replace(/%27/g,"'")};var ma=[],K=!1;h.onUrlChange=function(a){if(!K){if(d.history)y(b).on("popstate",f);if(d.hashchange)y(b).on("hashchange",f);else h.addPollFn(f);K=!0}ma.push(a);return a};h.baseHref=function(){var a=B.attr("href");return a?a.replace(/^(https?\:)?\/\/[^\/]*/,""):""};var O={},da="",F=h.baseHref();h.cookies=function(a,b){var d,e,g,h;if(a)b===s?m.cookie=escape(a)+"=;path="+F+";expires=Thu, 01 Jan 1970 00:00:00 GMT":
--C(b)&&(d=(m.cookie=escape(a)+"="+escape(b)+";path="+F).length+1,4096<d&&c.warn("Cookie '"+a+"' possibly not set or overflowed because it was too large ("+d+" > 4096 bytes)!"));else{if(m.cookie!==da)for(da=m.cookie,d=da.split("; "),O={},g=0;g<d.length;g++)e=d[g],h=e.indexOf("="),0<h&&(a=unescape(e.substring(0,h)),O[a]===s&&(O[a]=unescape(e.substring(h+1))));return O}};h.defer=function(a,b){var c;A++;c=n(function(){delete r[c];e(a)},b||0);r[c]=!0;return c};h.defer.cancel=function(a){return r[a]?(delete r[a],
--p(a),e(w),!0):!1}}function Md(){this.$get=["$window","$log","$sniffer","$document",function(b,a,c,d){return new se(b,d,a,c)}]}function Nd(){this.$get=function(){function b(b,d){function e(a){a!=n&&(p?p==a&&(p=a.n):p=a,g(a.n,a.p),g(a,n),n=a,n.n=null)}function g(a,b){a!=b&&(a&&(a.p=b),b&&(b.n=a))}if(b in a)throw u("$cacheFactory")("iid",b);var f=0,h=E({},d,{id:b}),m={},k=d&&d.capacity||Number.MAX_VALUE,l={},n=null,p=null;return a[b]={put:function(a,b){if(k<Number.MAX_VALUE){var c=l[a]||(l[a]={key:a});
--e(c)}if(!H(b))return a in m||f++,m[a]=b,f>k&&this.remove(p.key),b},get:function(a){if(k<Number.MAX_VALUE){var b=l[a];if(!b)return;e(b)}return m[a]},remove:function(a){if(k<Number.MAX_VALUE){var b=l[a];if(!b)return;b==n&&(n=b.p);b==p&&(p=b.n);g(b.n,b.p);delete l[a]}delete m[a];f--},removeAll:function(){m={};f=0;l={};n=p=null},destroy:function(){l=h=m=null;delete a[b]},info:function(){return E({},h,{size:f})}}}var a={};b.info=function(){var b={};q(a,function(a,e){b[e]=a.info()});return b};b.get=function(b){return a[b]};
--return b}}function ce(){this.$get=["$cacheFactory",function(b){return b("templates")}]}function fc(b,a){var c={},d="Directive",e=/^\s*directive\:\s*([\d\w_\-]+)\s+(.*)$/,g=/(([\d\w_\-]+)(?:\:([^;]+))?;?)/,f=/^(on[a-z]+|formaction)$/;this.directive=function m(a,e){Aa(a,"directive");C(a)?(Ab(e,"directiveFactory"),c.hasOwnProperty(a)||(c[a]=[],b.factory(a+d,["$injector","$exceptionHandler",function(b,d){var e=[];q(c[a],function(c,g){try{var f=b.invoke(c);Q(f)?f={compile:aa(f)}:!f.compile&&f.link&&(f.compile=
--aa(f.link));f.priority=f.priority||0;f.index=g;f.name=f.name||a;f.require=f.require||f.controller&&f.name;f.restrict=f.restrict||"A";e.push(f)}catch(m){d(m)}});return e}])),c[a].push(e)):q(a,Vb(m));return this};this.aHrefSanitizationWhitelist=function(b){return z(b)?(a.aHrefSanitizationWhitelist(b),this):a.aHrefSanitizationWhitelist()};this.imgSrcSanitizationWhitelist=function(b){return z(b)?(a.imgSrcSanitizationWhitelist(b),this):a.imgSrcSanitizationWhitelist()};this.$get=["$injector","$interpolate",
--"$exceptionHandler","$http","$templateCache","$parse","$controller","$rootScope","$document","$sce","$animate","$$sanitizeUri",function(a,b,l,n,p,r,A,D,x,t,N,B){function v(a,b,c,d,e){a instanceof y||(a=y(a));q(a,function(b,c){3==b.nodeType&&b.nodeValue.match(/\S+/)&&(a[c]=y(b).wrap("<span></span>").parent()[0])});var g=K(a,b,a,c,d,e);ma(a,"ng-scope");return function(b,c,d){Ab(b,"scope");var e=c?Ia.clone.call(a):a;q(d,function(a,b){e.data("$"+b+"Controller",a)});d=0;for(var f=e.length;d<f;d++){var m=
--e[d].nodeType;1!==m&&9!==m||e.eq(d).data("$scope",b)}c&&c(e,b);g&&g(b,e,e);return e}}function ma(a,b){try{a.addClass(b)}catch(c){}}function K(a,b,c,d,e,g){function f(a,c,d,e){var g,k,l,r,n,p,A;g=c.length;var I=Array(g);for(n=0;n<g;n++)I[n]=c[n];A=n=0;for(p=m.length;n<p;A++)k=I[A],c=m[n++],g=m[n++],l=y(k),c?(c.scope?(r=a.$new(),l.data("$scope",r)):r=a,(l=c.transclude)||!e&&b?c(g,r,k,d,O(a,l||b)):c(g,r,k,d,e)):g&&g(a,k.childNodes,s,e)}for(var m=[],k,l,r,n,p=0;p<a.length;p++)k=new Jb,l=da(a[p],[],k,
--0===p?d:s,e),(g=l.length?fa(l,a[p],k,b,c,null,[],[],g):null)&&g.scope&&ma(y(a[p]),"ng-scope"),k=g&&g.terminal||!(r=a[p].childNodes)||!r.length?null:K(r,g?g.transclude:b),m.push(g,k),n=n||g||k,g=null;return n?f:null}function O(a,b){return function(c,d,e){var g=!1;c||(c=a.$new(),g=c.$$transcluded=!0);d=b(c,d,e);if(g)d.on("$destroy",fb(c,c.$destroy));return d}}function da(a,b,c,d,f){var m=c.$attr,k;switch(a.nodeType){case 1:T(b,na(Ja(a).toLowerCase()),"E",d,f);var l,r,n;k=a.attributes;for(var p=0,A=
--k&&k.length;p<A;p++){var x=!1,D=!1;l=k[p];if(!S||8<=S||l.specified){r=l.name;n=na(r);W.test(n)&&(r=hb(n.substr(6),"-"));var N=n.replace(/(Start|End)$/,"");n===N+"Start"&&(x=r,D=r.substr(0,r.length-5)+"end",r=r.substr(0,r.length-6));n=na(r.toLowerCase());m[n]=r;c[n]=l=ba(l.value);pc(a,n)&&(c[n]=!0);M(a,b,l,n);T(b,n,"A",d,f,x,D)}}a=a.className;if(C(a)&&""!==a)for(;k=g.exec(a);)n=na(k[2]),T(b,n,"C",d,f)&&(c[n]=ba(k[3])),a=a.substr(k.index+k[0].length);break;case 3:u(b,a.nodeValue);break;case 8:try{if(k=
--e.exec(a.nodeValue))n=na(k[1]),T(b,n,"M",d,f)&&(c[n]=ba(k[2]))}catch(t){}}b.sort(H);return b}function F(a,b,c){var d=[],e=0;if(b&&a.hasAttribute&&a.hasAttribute(b)){do{if(!a)throw ja("uterdir",b,c);1==a.nodeType&&(a.hasAttribute(b)&&e++,a.hasAttribute(c)&&e--);d.push(a);a=a.nextSibling}while(0<e)}else d.push(a);return y(d)}function R(a,b,c){return function(d,e,g,f,k){e=F(e[0],b,c);return a(d,e,g,f,k)}}function fa(a,c,d,e,g,f,m,n,p){function x(a,b,c,d){if(a){c&&(a=R(a,c,d));a.require=G.require;a.directiveName=
--u;if(O===G||G.$$isolateScope)a=tc(a,{isolateScope:!0});m.push(a)}if(b){c&&(b=R(b,c,d));b.require=G.require;b.directiveName=u;if(O===G||G.$$isolateScope)b=tc(b,{isolateScope:!0});n.push(b)}}function D(a,b,c,d){var e,g="data",f=!1;if(C(b)){for(;"^"==(e=b.charAt(0))||"?"==e;)b=b.substr(1),"^"==e&&(g="inheritedData"),f=f||"?"==e;e=null;d&&"data"===g&&(e=d[b]);e=e||c[g]("$"+b+"Controller");if(!e&&!f)throw ja("ctreq",b,a);}else L(b)&&(e=[],q(b,function(b){e.push(D(a,b,c,d))}));return e}function N(a,e,g,
--f,p){function x(a,b){var c;2>arguments.length&&(b=a,a=s);E&&(c=da);return p(a,b,c)}var t,I,v,B,R,F,da={},nb;t=c===g?d:Yb(d,new Jb(y(g),d.$attr));I=t.$$element;if(O){var T=/^\s*([@=&])(\??)\s*(\w*)\s*$/;f=y(g);F=e.$new(!0);!fa||fa!==O&&fa!==O.$$originalDirective?f.data("$isolateScopeNoTemplate",F):f.data("$isolateScope",F);ma(f,"ng-isolate-scope");q(O.scope,function(a,c){var d=a.match(T)||[],g=d[3]||c,f="?"==d[2],d=d[1],m,l,n,p;F.$$isolateBindings[c]=d+g;switch(d){case "@":t.$observe(g,function(a){F[c]=
--a});t.$$observers[g].$$scope=e;t[g]&&(F[c]=b(t[g])(e));break;case "=":if(f&&!t[g])break;l=r(t[g]);p=l.literal?xa:function(a,b){return a===b};n=l.assign||function(){m=F[c]=l(e);throw ja("nonassign",t[g],O.name);};m=F[c]=l(e);F.$watch(function(){var a=l(e);p(a,F[c])||(p(a,m)?n(e,a=F[c]):F[c]=a);return m=a},null,l.literal);break;case "&":l=r(t[g]);F[c]=function(a){return l(e,a)};break;default:throw ja("iscp",O.name,c,a);}})}nb=p&&x;K&&q(K,function(a){var b={$scope:a===O||a.$$isolateScope?F:e,$element:I,
--$attrs:t,$transclude:nb},c;R=a.controller;"@"==R&&(R=t[a.name]);c=A(R,b);da[a.name]=c;E||I.data("$"+a.name+"Controller",c);a.controllerAs&&(b.$scope[a.controllerAs]=c)});f=0;for(v=m.length;f<v;f++)try{B=m[f],B(B.isolateScope?F:e,I,t,B.require&&D(B.directiveName,B.require,I,da),nb)}catch(G){l(G,ia(I))}f=e;O&&(O.template||null===O.templateUrl)&&(f=F);a&&a(f,g.childNodes,s,p);for(f=n.length-1;0<=f;f--)try{B=n[f],B(B.isolateScope?F:e,I,t,B.require&&D(B.directiveName,B.require,I,da),nb)}catch(z){l(z,ia(I))}}
--p=p||{};for(var t=-Number.MAX_VALUE,B,K=p.controllerDirectives,O=p.newIsolateScopeDirective,fa=p.templateDirective,T=p.nonTlbTranscludeDirective,H=!1,E=p.hasElementTranscludeDirective,Z=d.$$element=y(c),G,u,V,Ya=e,P,M=0,S=a.length;M<S;M++){G=a[M];var ra=G.$$start,W=G.$$end;ra&&(Z=F(c,ra,W));V=s;if(t>G.priority)break;if(V=G.scope)B=B||G,G.templateUrl||(J("new/isolated scope",O,G,Z),X(V)&&(O=G));u=G.name;!G.templateUrl&&G.controller&&(V=G.controller,K=K||{},J("'"+u+"' controller",K[u],G,Z),K[u]=G);
--if(V=G.transclude)H=!0,G.$$tlb||(J("transclusion",T,G,Z),T=G),"element"==V?(E=!0,t=G.priority,V=F(c,ra,W),Z=d.$$element=y(U.createComment(" "+u+": "+d[u]+" ")),c=Z[0],ob(g,y(ya.call(V,0)),c),Ya=v(V,e,t,f&&f.name,{nonTlbTranscludeDirective:T})):(V=y(Hb(c)).contents(),Z.empty(),Ya=v(V,e));if(G.template)if(J("template",fa,G,Z),fa=G,V=Q(G.template)?G.template(Z,d):G.template,V=Y(V),G.replace){f=G;V=Fb.test(V)?y(ba(V)):[];c=V[0];if(1!=V.length||1!==c.nodeType)throw ja("tplrt",u,"");ob(g,Z,c);S={$attr:{}};
--V=da(c,[],S);var $=a.splice(M+1,a.length-(M+1));O&&sc(V);a=a.concat(V).concat($);z(d,S);S=a.length}else Z.html(V);if(G.templateUrl)J("template",fa,G,Z),fa=G,G.replace&&(f=G),N=w(a.splice(M,a.length-M),Z,d,g,Ya,m,n,{controllerDirectives:K,newIsolateScopeDirective:O,templateDirective:fa,nonTlbTranscludeDirective:T}),S=a.length;else if(G.compile)try{P=G.compile(Z,d,Ya),Q(P)?x(null,P,ra,W):P&&x(P.pre,P.post,ra,W)}catch(aa){l(aa,ia(Z))}G.terminal&&(N.terminal=!0,t=Math.max(t,G.priority))}N.scope=B&&!0===
--B.scope;N.transclude=H&&Ya;p.hasElementTranscludeDirective=E;return N}function sc(a){for(var b=0,c=a.length;b<c;b++)a[b]=Xb(a[b],{$$isolateScope:!0})}function T(b,e,g,f,k,r,n){if(e===k)return null;k=null;if(c.hasOwnProperty(e)){var p;e=a.get(e+d);for(var A=0,x=e.length;A<x;A++)try{p=e[A],(f===s||f>p.priority)&&-1!=p.restrict.indexOf(g)&&(r&&(p=Xb(p,{$$start:r,$$end:n})),b.push(p),k=p)}catch(D){l(D)}}return k}function z(a,b){var c=b.$attr,d=a.$attr,e=a.$$element;q(a,function(d,e){"$"!=e.charAt(0)&&
--(b[e]&&(d+=("style"===e?";":" ")+b[e]),a.$set(e,d,!0,c[e]))});q(b,function(b,g){"class"==g?(ma(e,b),a["class"]=(a["class"]?a["class"]+" ":"")+b):"style"==g?(e.attr("style",e.attr("style")+";"+b),a.style=(a.style?a.style+";":"")+b):"$"==g.charAt(0)||a.hasOwnProperty(g)||(a[g]=b,d[g]=c[g])})}function w(a,b,c,d,e,g,f,k){var m=[],l,r,A=b[0],x=a.shift(),D=E({},x,{templateUrl:null,transclude:null,replace:null,$$originalDirective:x}),N=Q(x.templateUrl)?x.templateUrl(b,c):x.templateUrl;b.empty();n.get(t.getTrustedResourceUrl(N),
--{cache:p}).success(function(n){var p,t;n=Y(n);if(x.replace){n=Fb.test(n)?y(ba(n)):[];p=n[0];if(1!=n.length||1!==p.nodeType)throw ja("tplrt",x.name,N);n={$attr:{}};ob(d,b,p);var v=da(p,[],n);X(x.scope)&&sc(v);a=v.concat(a);z(c,n)}else p=A,b.html(n);a.unshift(D);l=fa(a,p,c,e,b,x,g,f,k);q(d,function(a,c){a==p&&(d[c]=b[0])});for(r=K(b[0].childNodes,e);m.length;){n=m.shift();t=m.shift();var B=m.shift(),R=m.shift(),v=b[0];if(t!==A){var F=t.className;k.hasElementTranscludeDirective&&x.replace||(v=Hb(p));
--ob(B,y(t),v);ma(y(v),F)}t=l.transclude?O(n,l.transclude):R;l(r,n,v,d,t)}m=null}).error(function(a,b,c,d){throw ja("tpload",d.url);});return function(a,b,c,d,e){m?(m.push(b),m.push(c),m.push(d),m.push(e)):l(r,b,c,d,e)}}function H(a,b){var c=b.priority-a.priority;return 0!==c?c:a.name!==b.name?a.name<b.name?-1:1:a.index-b.index}function J(a,b,c,d){if(b)throw ja("multidir",b.name,c.name,a,ia(d));}function u(a,c){var d=b(c,!0);d&&a.push({priority:0,compile:aa(function(a,b){var c=b.parent(),e=c.data("$binding")||
--[];e.push(d);ma(c.data("$binding",e),"ng-binding");a.$watch(d,function(a){b[0].nodeValue=a})})})}function P(a,b){if("srcdoc"==b)return t.HTML;var c=Ja(a);if("xlinkHref"==b||"FORM"==c&&"action"==b||"IMG"!=c&&("src"==b||"ngSrc"==b))return t.RESOURCE_URL}function M(a,c,d,e){var g=b(d,!0);if(g){if("multiple"===e&&"SELECT"===Ja(a))throw ja("selmulti",ia(a));c.push({priority:100,compile:function(){return{pre:function(c,d,m){d=m.$$observers||(m.$$observers={});if(f.test(e))throw ja("nodomevents");if(g=b(m[e],
--!0,P(a,e)))m[e]=g(c),(d[e]||(d[e]=[])).$$inter=!0,(m.$$observers&&m.$$observers[e].$$scope||c).$watch(g,function(a,b){"class"===e&&a!=b?m.$updateClass(a,b):m.$set(e,a)})}}}})}}function ob(a,b,c){var d=b[0],e=b.length,g=d.parentNode,f,m;if(a)for(f=0,m=a.length;f<m;f++)if(a[f]==d){a[f++]=c;m=f+e-1;for(var k=a.length;f<k;f++,m++)m<k?a[f]=a[m]:delete a[f];a.length-=e-1;break}g&&g.replaceChild(c,d);a=U.createDocumentFragment();a.appendChild(d);c[y.expando]=d[y.expando];d=1;for(e=b.length;d<e;d++)g=b[d],
--y(g).remove(),a.appendChild(g),delete b[d];b[0]=c;b.length=1}function tc(a,b){return E(function(){return a.apply(null,arguments)},a,b)}var Jb=function(a,b){this.$$element=a;this.$attr=b||{}};Jb.prototype={$normalize:na,$addClass:function(a){a&&0<a.length&&N.addClass(this.$$element,a)},$removeClass:function(a){a&&0<a.length&&N.removeClass(this.$$element,a)},$updateClass:function(a,b){var c=uc(a,b),d=uc(b,a);0===c.length?N.removeClass(this.$$element,d):0===d.length?N.addClass(this.$$element,c):N.setClass(this.$$element,
--c,d)},$set:function(a,b,c,d){var e=pc(this.$$element[0],a);e&&(this.$$element.prop(a,b),d=e);this[a]=b;d?this.$attr[a]=d:(d=this.$attr[a])||(this.$attr[a]=d=hb(a,"-"));e=Ja(this.$$element);if("A"===e&&"href"===a||"IMG"===e&&"src"===a)this[a]=b=B(b,"src"===a);!1!==c&&(null===b||b===s?this.$$element.removeAttr(d):this.$$element.attr(d,b));(c=this.$$observers)&&q(c[a],function(a){try{a(b)}catch(c){l(c)}})},$observe:function(a,b){var c=this,d=c.$$observers||(c.$$observers={}),e=d[a]||(d[a]=[]);e.push(b);
--D.$evalAsync(function(){e.$$inter||b(c[a])});return b}};var Z=b.startSymbol(),ra=b.endSymbol(),Y="{{"==Z||"}}"==ra?Ea:function(a){return a.replace(/\{\{/g,Z).replace(/}}/g,ra)},W=/^ngAttr[A-Z]/;return v}]}function na(b){return Ta(b.replace(te,""))}function uc(b,a){var c="",d=b.split(/\s+/),e=a.split(/\s+/),g=0;a:for(;g<d.length;g++){for(var f=d[g],h=0;h<e.length;h++)if(f==e[h])continue a;c+=(0<c.length?" ":"")+f}return c}function Od(){var b={},a=/^(\S+)(\s+as\s+(\w+))?$/;this.register=function(a,
--d){Aa(a,"controller");X(a)?E(b,a):b[a]=d};this.$get=["$injector","$window",function(c,d){return function(e,g){var f,h,m;C(e)&&(f=e.match(a),h=f[1],m=f[3],e=b.hasOwnProperty(h)?b[h]:ec(g.$scope,h,!0)||ec(d,h,!0),Ra(e,h,!0));f=c.instantiate(e,g);if(m){if(!g||"object"!=typeof g.$scope)throw u("$controller")("noscp",h||e.name,m);g.$scope[m]=f}return f}}]}function Pd(){this.$get=["$window",function(b){return y(b.document)}]}function Qd(){this.$get=["$log",function(b){return function(a,c){b.error.apply(b,
--arguments)}}]}function vc(b){var a={},c,d,e;if(!b)return a;q(b.split("\n"),function(b){e=b.indexOf(":");c=J(ba(b.substr(0,e)));d=ba(b.substr(e+1));c&&(a[c]=a[c]?a[c]+(", "+d):d)});return a}function wc(b){var a=X(b)?b:s;return function(c){a||(a=vc(b));return c?a[J(c)]||null:a}}function xc(b,a,c){if(Q(c))return c(b,a);q(c,function(c){b=c(b,a)});return b}function Td(){var b=/^\s*(\[|\{[^\{])/,a=/[\}\]]\s*$/,c=/^\)\]\}',?\n/,d={"Content-Type":"application/json;charset=utf-8"},e=this.defaults={transformResponse:[function(d){C(d)&&
--(d=d.replace(c,""),b.test(d)&&a.test(d)&&(d=$b(d)));return d}],transformRequest:[function(a){return X(a)&&"[object File]"!==wa.call(a)&&"[object Blob]"!==wa.call(a)?qa(a):a}],headers:{common:{Accept:"application/json, text/plain, */*"},post:ca(d),put:ca(d),patch:ca(d)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN"},g=this.interceptors=[],f=this.responseInterceptors=[];this.$get=["$httpBackend","$browser","$cacheFactory","$rootScope","$q","$injector",function(a,b,c,d,n,p){function r(a){function c(a){var b=
--E({},a,{data:xc(a.data,a.headers,d.transformResponse)});return 200<=a.status&&300>a.status?b:n.reject(b)}var d={method:"get",transformRequest:e.transformRequest,transformResponse:e.transformResponse},g=function(a){function b(a){var c;q(a,function(b,d){Q(b)&&(c=b(),null!=c?a[d]=c:delete a[d])})}var c=e.headers,d=E({},a.headers),g,f,c=E({},c.common,c[J(a.method)]);b(c);b(d);a:for(g in c){a=J(g);for(f in d)if(J(f)===a)continue a;d[g]=c[g]}return d}(a);E(d,a);d.headers=g;d.method=Fa(d.method);(a=Kb(d.url)?
--b.cookies()[d.xsrfCookieName||e.xsrfCookieName]:s)&&(g[d.xsrfHeaderName||e.xsrfHeaderName]=a);var f=[function(a){g=a.headers;var b=xc(a.data,wc(g),a.transformRequest);H(a.data)&&q(g,function(a,b){"content-type"===J(b)&&delete g[b]});H(a.withCredentials)&&!H(e.withCredentials)&&(a.withCredentials=e.withCredentials);return A(a,b,g).then(c,c)},s],h=n.when(d);for(q(t,function(a){(a.request||a.requestError)&&f.unshift(a.request,a.requestError);(a.response||a.responseError)&&f.push(a.response,a.responseError)});f.length;){a=
--f.shift();var k=f.shift(),h=h.then(a,k)}h.success=function(a){h.then(function(b){a(b.data,b.status,b.headers,d)});return h};h.error=function(a){h.then(null,function(b){a(b.data,b.status,b.headers,d)});return h};return h}function A(b,c,g){function f(a,b,c,e){t&&(200<=a&&300>a?t.put(s,[a,b,vc(c),e]):t.remove(s));m(b,a,c,e);d.$$phase||d.$apply()}function m(a,c,d,e){c=Math.max(c,0);(200<=c&&300>c?p.resolve:p.reject)({data:a,status:c,headers:wc(d),config:b,statusText:e})}function k(){var a=eb(r.pendingRequests,
--b);-1!==a&&r.pendingRequests.splice(a,1)}var p=n.defer(),A=p.promise,t,q,s=D(b.url,b.params);r.pendingRequests.push(b);A.then(k,k);(b.cache||e.cache)&&(!1!==b.cache&&"GET"==b.method)&&(t=X(b.cache)?b.cache:X(e.cache)?e.cache:x);if(t)if(q=t.get(s),z(q)){if(q.then)return q.then(k,k),q;L(q)?m(q[1],q[0],ca(q[2]),q[3]):m(q,200,{},"OK")}else t.put(s,A);H(q)&&a(b.method,s,c,f,g,b.timeout,b.withCredentials,b.responseType);return A}function D(a,b){if(!b)return a;var c=[];Sc(b,function(a,b){null===a||H(a)||
--(L(a)||(a=[a]),q(a,function(a){X(a)&&(a=qa(a));c.push(za(b)+"="+za(a))}))});0<c.length&&(a+=(-1==a.indexOf("?")?"?":"&")+c.join("&"));return a}var x=c("$http"),t=[];q(g,function(a){t.unshift(C(a)?p.get(a):p.invoke(a))});q(f,function(a,b){var c=C(a)?p.get(a):p.invoke(a);t.splice(b,0,{response:function(a){return c(n.when(a))},responseError:function(a){return c(n.reject(a))}})});r.pendingRequests=[];(function(a){q(arguments,function(a){r[a]=function(b,c){return r(E(c||{},{method:a,url:b}))}})})("get",
--"delete","head","jsonp");(function(a){q(arguments,function(a){r[a]=function(b,c,d){return r(E(d||{},{method:a,url:b,data:c}))}})})("post","put");r.defaults=e;return r}]}function ue(b){if(8>=S&&(!b.match(/^(get|post|head|put|delete|options)$/i)||!P.XMLHttpRequest))return new P.ActiveXObject("Microsoft.XMLHTTP");if(P.XMLHttpRequest)return new P.XMLHttpRequest;throw u("$httpBackend")("noxhr");}function Ud(){this.$get=["$browser","$window","$document",function(b,a,c){return ve(b,ue,b.defer,a.angular.callbacks,
--c[0])}]}function ve(b,a,c,d,e){function g(a,b,c){var g=e.createElement("script"),f=null;g.type="text/javascript";g.src=a;g.async=!0;f=function(a){Ua(g,"load",f);Ua(g,"error",f);e.body.removeChild(g);g=null;var h=-1,A="unknown";a&&("load"!==a.type||d[b].called||(a={type:"error"}),A=a.type,h="error"===a.type?404:200);c&&c(h,A)};pb(g,"load",f);pb(g,"error",f);8>=S&&(g.onreadystatechange=function(){C(g.readyState)&&/loaded|complete/.test(g.readyState)&&(g.onreadystatechange=null,f({type:"load"}))});e.body.appendChild(g);
--return f}var f=-1;return function(e,m,k,l,n,p,r,A){function D(){t=f;B&&B();v&&v.abort()}function x(a,d,e,g,f){K&&c.cancel(K);B=v=null;0===d&&(d=e?200:"file"==sa(m).protocol?404:0);a(1223===d?204:d,e,g,f||"");b.$$completeOutstandingRequest(w)}var t;b.$$incOutstandingRequestCount();m=m||b.url();if("jsonp"==J(e)){var N="_"+(d.counter++).toString(36);d[N]=function(a){d[N].data=a;d[N].called=!0};var B=g(m.replace("JSON_CALLBACK","angular.callbacks."+N),N,function(a,b){x(l,a,d[N].data,"",b);d[N]=w})}else{var v=
--a(e);v.open(e,m,!0);q(n,function(a,b){z(a)&&v.setRequestHeader(b,a)});v.onreadystatechange=function(){if(v&&4==v.readyState){var a=null,b=null;t!==f&&(a=v.getAllResponseHeaders(),b="response"in v?v.response:v.responseText);x(l,t||v.status,b,a,v.statusText||"")}};r&&(v.withCredentials=!0);if(A)try{v.responseType=A}catch(s){if("json"!==A)throw s;}v.send(k||null)}if(0<p)var K=c(D,p);else p&&p.then&&p.then(D)}}function Rd(){var b="{{",a="}}";this.startSymbol=function(a){return a?(b=a,this):b};this.endSymbol=
--function(b){return b?(a=b,this):a};this.$get=["$parse","$exceptionHandler","$sce",function(c,d,e){function g(g,k,l){for(var n,p,r=0,A=[],D=g.length,x=!1,t=[];r<D;)-1!=(n=g.indexOf(b,r))&&-1!=(p=g.indexOf(a,n+f))?(r!=n&&A.push(g.substring(r,n)),A.push(r=c(x=g.substring(n+f,p))),r.exp=x,r=p+h,x=!0):(r!=D&&A.push(g.substring(r)),r=D);(D=A.length)||(A.push(""),D=1);if(l&&1<A.length)throw yc("noconcat",g);if(!k||x)return t.length=D,r=function(a){try{for(var b=0,c=D,f;b<c;b++){if("function"==typeof(f=A[b]))if(f=
--f(a),f=l?e.getTrusted(l,f):e.valueOf(f),null==f)f="";else switch(typeof f){case "string":break;case "number":f=""+f;break;default:f=qa(f)}t[b]=f}return t.join("")}catch(h){a=yc("interr",g,h.toString()),d(a)}},r.exp=g,r.parts=A,r}var f=b.length,h=a.length;g.startSymbol=function(){return b};g.endSymbol=function(){return a};return g}]}function Sd(){this.$get=["$rootScope","$window","$q",function(b,a,c){function d(d,f,h,m){var k=a.setInterval,l=a.clearInterval,n=c.defer(),p=n.promise,r=0,A=z(m)&&!m;h=
--z(h)?h:0;p.then(null,null,d);p.$$intervalId=k(function(){n.notify(r++);0<h&&r>=h&&(n.resolve(r),l(p.$$intervalId),delete e[p.$$intervalId]);A||b.$apply()},f);e[p.$$intervalId]=n;return p}var e={};d.cancel=function(a){return a&&a.$$intervalId in e?(e[a.$$intervalId].reject("canceled"),clearInterval(a.$$intervalId),delete e[a.$$intervalId],!0):!1};return d}]}function ad(){this.$get=function(){return{id:"en-us",NUMBER_FORMATS:{DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{minInt:1,minFrac:0,maxFrac:3,posPre:"",
--posSuf:"",negPre:"-",negSuf:"",gSize:3,lgSize:3},{minInt:1,minFrac:2,maxFrac:2,posPre:"\u00a4",posSuf:"",negPre:"(\u00a4",negSuf:")",gSize:3,lgSize:3}],CURRENCY_SYM:"$"},DATETIME_FORMATS:{MONTH:"January February March April May June July August September October November December".split(" "),SHORTMONTH:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),DAY:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),SHORTDAY:"Sun Mon Tue Wed Thu Fri Sat".split(" "),AMPMS:["AM",
--"PM"],medium:"MMM d, y h:mm:ss a","short":"M/d/yy h:mm a",fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",mediumDate:"MMM d, y",shortDate:"M/d/yy",mediumTime:"h:mm:ss a",shortTime:"h:mm a"},pluralCat:function(b){return 1===b?"one":"other"}}}}function Lb(b){b=b.split("/");for(var a=b.length;a--;)b[a]=gb(b[a]);return b.join("/")}function zc(b,a,c){b=sa(b,c);a.$$protocol=b.protocol;a.$$host=b.hostname;a.$$port=Y(b.port)||we[b.protocol]||null}function Ac(b,a,c){var d="/"!==b.charAt(0);d&&(b="/"+b);b=
--sa(b,c);a.$$path=decodeURIComponent(d&&"/"===b.pathname.charAt(0)?b.pathname.substring(1):b.pathname);a.$$search=bc(b.search);a.$$hash=decodeURIComponent(b.hash);a.$$path&&"/"!=a.$$path.charAt(0)&&(a.$$path="/"+a.$$path)}function oa(b,a){if(0===a.indexOf(b))return a.substr(b.length)}function Za(b){var a=b.indexOf("#");return-1==a?b:b.substr(0,a)}function Mb(b){return b.substr(0,Za(b).lastIndexOf("/")+1)}function Bc(b,a){this.$$html5=!0;a=a||"";var c=Mb(b);zc(b,this,b);this.$$parse=function(a){var e=
--oa(c,a);if(!C(e))throw Nb("ipthprfx",a,c);Ac(e,this,b);this.$$path||(this.$$path="/");this.$$compose()};this.$$compose=function(){var a=zb(this.$$search),b=this.$$hash?"#"+gb(this.$$hash):"";this.$$url=Lb(this.$$path)+(a?"?"+a:"")+b;this.$$absUrl=c+this.$$url.substr(1)};this.$$rewrite=function(d){var e;if((e=oa(b,d))!==s)return d=e,(e=oa(a,e))!==s?c+(oa("/",e)||e):b+d;if((e=oa(c,d))!==s)return c+e;if(c==d+"/")return c}}function Ob(b,a){var c=Mb(b);zc(b,this,b);this.$$parse=function(d){var e=oa(b,
--d)||oa(c,d),e="#"==e.charAt(0)?oa(a,e):this.$$html5?e:"";if(!C(e))throw Nb("ihshprfx",d,a);Ac(e,this,b);d=this.$$path;var g=/^\/[A-Z]:(\/.*)/;0===e.indexOf(b)&&(e=e.replace(b,""));g.exec(e)||(d=(e=g.exec(d))?e[1]:d);this.$$path=d;this.$$compose()};this.$$compose=function(){var c=zb(this.$$search),e=this.$$hash?"#"+gb(this.$$hash):"";this.$$url=Lb(this.$$path)+(c?"?"+c:"")+e;this.$$absUrl=b+(this.$$url?a+this.$$url:"")};this.$$rewrite=function(a){if(Za(b)==Za(a))return a}}function Pb(b,a){this.$$html5=
--!0;Ob.apply(this,arguments);var c=Mb(b);this.$$rewrite=function(d){var e;if(b==Za(d))return d;if(e=oa(c,d))return b+a+e;if(c===d+"/")return c};this.$$compose=function(){var c=zb(this.$$search),e=this.$$hash?"#"+gb(this.$$hash):"";this.$$url=Lb(this.$$path)+(c?"?"+c:"")+e;this.$$absUrl=b+a+this.$$url}}function qb(b){return function(){return this[b]}}function Cc(b,a){return function(c){if(H(c))return this[b];this[b]=a(c);this.$$compose();return this}}function Vd(){var b="",a=!1;this.hashPrefix=function(a){return z(a)?
--(b=a,this):b};this.html5Mode=function(b){return z(b)?(a=b,this):a};this.$get=["$rootScope","$browser","$sniffer","$rootElement",function(c,d,e,g){function f(a){c.$broadcast("$locationChangeSuccess",h.absUrl(),a)}var h,m,k=d.baseHref(),l=d.url(),n;a?(n=l.substring(0,l.indexOf("/",l.indexOf("//")+2))+(k||"/"),m=e.history?Bc:Pb):(n=Za(l),m=Ob);h=new m(n,"#"+b);h.$$parse(h.$$rewrite(l));g.on("click",function(a){if(!a.ctrlKey&&!a.metaKey&&2!=a.which){for(var e=y(a.target);"a"!==J(e[0].nodeName);)if(e[0]===
--g[0]||!(e=e.parent())[0])return;var f=e.prop("href");X(f)&&"[object SVGAnimatedString]"===f.toString()&&(f=sa(f.animVal).href);if(m===Pb){var k=e.attr("href")||e.attr("xlink:href");if(0>k.indexOf("://"))if(f="#"+b,"/"==k[0])f=n+f+k;else if("#"==k[0])f=n+f+(h.path()||"/")+k;else{for(var l=h.path().split("/"),k=k.split("/"),p=0;p<k.length;p++)"."!=k[p]&&(".."==k[p]?l.pop():k[p].length&&l.push(k[p]));f=n+f+l.join("/")}}l=h.$$rewrite(f);f&&(!e.attr("target")&&l&&!a.isDefaultPrevented())&&(a.preventDefault(),
--l!=d.url()&&(h.$$parse(l),c.$apply(),P.angular["ff-684208-preventDefault"]=!0))}});h.absUrl()!=l&&d.url(h.absUrl(),!0);d.onUrlChange(function(a){h.absUrl()!=a&&(c.$evalAsync(function(){var b=h.absUrl();h.$$parse(a);c.$broadcast("$locationChangeStart",a,b).defaultPrevented?(h.$$parse(b),d.url(b)):f(b)}),c.$$phase||c.$digest())});var p=0;c.$watch(function(){var a=d.url(),b=h.$$replace;p&&a==h.absUrl()||(p++,c.$evalAsync(function(){c.$broadcast("$locationChangeStart",h.absUrl(),a).defaultPrevented?h.$$parse(a):
--(d.url(h.absUrl(),b),f(a))}));h.$$replace=!1;return p});return h}]}function Wd(){var b=!0,a=this;this.debugEnabled=function(a){return z(a)?(b=a,this):b};this.$get=["$window",function(c){function d(a){a instanceof Error&&(a.stack?a=a.message&&-1===a.stack.indexOf(a.message)?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function e(a){var b=c.console||{},e=b[a]||b.log||w;a=!1;try{a=!!e.apply}catch(m){}return a?function(){var a=[];q(arguments,
--function(b){a.push(d(b))});return e.apply(b,a)}:function(a,b){e(a,null==b?"":b)}}return{log:e("log"),info:e("info"),warn:e("warn"),error:e("error"),debug:function(){var c=e("debug");return function(){b&&c.apply(a,arguments)}}()}}]}function ga(b,a){if("constructor"===b)throw Ca("isecfld",a);return b}function $a(b,a){if(b){if(b.constructor===b)throw Ca("isecfn",a);if(b.document&&b.location&&b.alert&&b.setInterval)throw Ca("isecwindow",a);if(b.children&&(b.nodeName||b.prop&&b.attr&&b.find))throw Ca("isecdom",
--a);}return b}function rb(b,a,c,d,e){e=e||{};a=a.split(".");for(var g,f=0;1<a.length;f++){g=ga(a.shift(),d);var h=b[g];h||(h={},b[g]=h);b=h;b.then&&e.unwrapPromises&&(ta(d),"$$v"in b||function(a){a.then(function(b){a.$$v=b})}(b),b.$$v===s&&(b.$$v={}),b=b.$$v)}g=ga(a.shift(),d);return b[g]=c}function Dc(b,a,c,d,e,g,f){ga(b,g);ga(a,g);ga(c,g);ga(d,g);ga(e,g);return f.unwrapPromises?function(f,m){var k=m&&m.hasOwnProperty(b)?m:f,l;if(null==k)return k;(k=k[b])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=
--a})),k=k.$$v);if(!a)return k;if(null==k)return s;(k=k[a])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=a})),k=k.$$v);if(!c)return k;if(null==k)return s;(k=k[c])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=a})),k=k.$$v);if(!d)return k;if(null==k)return s;(k=k[d])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=a})),k=k.$$v);if(!e)return k;if(null==k)return s;(k=k[e])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=a})),k=k.$$v);
--return k}:function(g,f){var k=f&&f.hasOwnProperty(b)?f:g;if(null==k)return k;k=k[b];if(!a)return k;if(null==k)return s;k=k[a];if(!c)return k;if(null==k)return s;k=k[c];if(!d)return k;if(null==k)return s;k=k[d];return e?null==k?s:k=k[e]:k}}function xe(b,a){ga(b,a);return function(a,d){return null==a?s:(d&&d.hasOwnProperty(b)?d:a)[b]}}function ye(b,a,c){ga(b,c);ga(a,c);return function(c,e){if(null==c)return s;c=(e&&e.hasOwnProperty(b)?e:c)[b];return null==c?s:c[a]}}function Ec(b,a,c){if(Qb.hasOwnProperty(b))return Qb[b];
--var d=b.split("."),e=d.length,g;if(a.unwrapPromises||1!==e)if(a.unwrapPromises||2!==e)if(a.csp)g=6>e?Dc(d[0],d[1],d[2],d[3],d[4],c,a):function(b,g){var f=0,h;do h=Dc(d[f++],d[f++],d[f++],d[f++],d[f++],c,a)(b,g),g=s,b=h;while(f<e);return h};else{var f="var p;\n";q(d,function(b,d){ga(b,c);f+="if(s == null) return undefined;\ns="+(d?"s":'((k&&k.hasOwnProperty("'+b+'"))?k:s)')+'["'+b+'"];\n'+(a.unwrapPromises?'if (s && s.then) {\n pw("'+c.replace(/(["\r\n])/g,"\\$1")+'");\n if (!("$$v" in s)) {\n p=s;\n p.$$v = undefined;\n p.then(function(v) {p.$$v=v;});\n}\n s=s.$$v\n}\n':
--"")});var f=f+"return s;",h=new Function("s","k","pw",f);h.toString=aa(f);g=a.unwrapPromises?function(a,b){return h(a,b,ta)}:h}else g=ye(d[0],d[1],c);else g=xe(d[0],c);"hasOwnProperty"!==b&&(Qb[b]=g);return g}function Xd(){var b={},a={csp:!1,unwrapPromises:!1,logPromiseWarnings:!0};this.unwrapPromises=function(b){return z(b)?(a.unwrapPromises=!!b,this):a.unwrapPromises};this.logPromiseWarnings=function(b){return z(b)?(a.logPromiseWarnings=b,this):a.logPromiseWarnings};this.$get=["$filter","$sniffer",
--"$log",function(c,d,e){a.csp=d.csp;ta=function(b){a.logPromiseWarnings&&!Fc.hasOwnProperty(b)&&(Fc[b]=!0,e.warn("[$parse] Promise found in the expression `"+b+"`. Automatic unwrapping of promises in Angular expressions is deprecated."))};return function(d){var e;switch(typeof d){case "string":if(b.hasOwnProperty(d))return b[d];e=new Rb(a);e=(new ab(e,c,a)).parse(d,!1);"hasOwnProperty"!==d&&(b[d]=e);return e;case "function":return d;default:return w}}}]}function Zd(){this.$get=["$rootScope","$exceptionHandler",
--function(b,a){return ze(function(a){b.$evalAsync(a)},a)}]}function ze(b,a){function c(a){return a}function d(a){return f(a)}var e=function(){var f=[],k,l;return l={resolve:function(a){if(f){var c=f;f=s;k=g(a);c.length&&b(function(){for(var a,b=0,d=c.length;b<d;b++)a=c[b],k.then(a[0],a[1],a[2])})}},reject:function(a){l.resolve(h(a))},notify:function(a){if(f){var c=f;f.length&&b(function(){for(var b,d=0,e=c.length;d<e;d++)b=c[d],b[2](a)})}},promise:{then:function(b,g,h){var l=e(),D=function(d){try{l.resolve((Q(b)?
--b:c)(d))}catch(e){l.reject(e),a(e)}},x=function(b){try{l.resolve((Q(g)?g:d)(b))}catch(c){l.reject(c),a(c)}},t=function(b){try{l.notify((Q(h)?h:c)(b))}catch(d){a(d)}};f?f.push([D,x,t]):k.then(D,x,t);return l.promise},"catch":function(a){return this.then(null,a)},"finally":function(a){function b(a,c){var d=e();c?d.resolve(a):d.reject(a);return d.promise}function d(e,g){var f=null;try{f=(a||c)()}catch(h){return b(h,!1)}return f&&Q(f.then)?f.then(function(){return b(e,g)},function(a){return b(a,!1)}):
--b(e,g)}return this.then(function(a){return d(a,!0)},function(a){return d(a,!1)})}}}},g=function(a){return a&&Q(a.then)?a:{then:function(c){var d=e();b(function(){d.resolve(c(a))});return d.promise}}},f=function(a){var b=e();b.reject(a);return b.promise},h=function(c){return{then:function(g,f){var h=e();b(function(){try{h.resolve((Q(f)?f:d)(c))}catch(b){h.reject(b),a(b)}});return h.promise}}};return{defer:e,reject:f,when:function(h,k,l,n){var p=e(),r,A=function(b){try{return(Q(k)?k:c)(b)}catch(d){return a(d),
--f(d)}},D=function(b){try{return(Q(l)?l:d)(b)}catch(c){return a(c),f(c)}},x=function(b){try{return(Q(n)?n:c)(b)}catch(d){a(d)}};b(function(){g(h).then(function(a){r||(r=!0,p.resolve(g(a).then(A,D,x)))},function(a){r||(r=!0,p.resolve(D(a)))},function(a){r||p.notify(x(a))})});return p.promise},all:function(a){var b=e(),c=0,d=L(a)?[]:{};q(a,function(a,e){c++;g(a).then(function(a){d.hasOwnProperty(e)||(d[e]=a,--c||b.resolve(d))},function(a){d.hasOwnProperty(e)||b.reject(a)})});0===c&&b.resolve(d);return b.promise}}}
--function fe(){this.$get=["$window","$timeout",function(b,a){var c=b.requestAnimationFrame||b.webkitRequestAnimationFrame||b.mozRequestAnimationFrame,d=b.cancelAnimationFrame||b.webkitCancelAnimationFrame||b.mozCancelAnimationFrame||b.webkitCancelRequestAnimationFrame,e=!!c,g=e?function(a){var b=c(a);return function(){d(b)}}:function(b){var c=a(b,16.66,!1);return function(){a.cancel(c)}};g.supported=e;return g}]}function Yd(){var b=10,a=u("$rootScope"),c=null;this.digestTtl=function(a){arguments.length&&
--(b=a);return b};this.$get=["$injector","$exceptionHandler","$parse","$browser",function(d,e,g,f){function h(){this.$id=cb();this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=null;this["this"]=this.$root=this;this.$$destroyed=!1;this.$$asyncQueue=[];this.$$postDigestQueue=[];this.$$listeners={};this.$$listenerCount={};this.$$isolateBindings={}}function m(b){if(p.$$phase)throw a("inprog",p.$$phase);p.$$phase=b}function k(a,b){var c=g(a);
--Ra(c,b);return c}function l(a,b,c){do a.$$listenerCount[c]-=b,0===a.$$listenerCount[c]&&delete a.$$listenerCount[c];while(a=a.$parent)}function n(){}h.prototype={constructor:h,$new:function(a){a?(a=new h,a.$root=this.$root,a.$$asyncQueue=this.$$asyncQueue,a.$$postDigestQueue=this.$$postDigestQueue):(this.$$childScopeClass||(this.$$childScopeClass=function(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null;this.$$listeners={};this.$$listenerCount={};this.$id=cb();this.$$childScopeClass=
--null},this.$$childScopeClass.prototype=this),a=new this.$$childScopeClass);a["this"]=a;a.$parent=this;a.$$prevSibling=this.$$childTail;this.$$childHead?this.$$childTail=this.$$childTail.$$nextSibling=a:this.$$childHead=this.$$childTail=a;return a},$watch:function(a,b,d){var e=k(a,"watch"),g=this.$$watchers,f={fn:b,last:n,get:e,exp:a,eq:!!d};c=null;if(!Q(b)){var h=k(b||w,"listener");f.fn=function(a,b,c){h(c)}}if("string"==typeof a&&e.constant){var m=f.fn;f.fn=function(a,b,c){m.call(this,a,b,c);Na(g,
--f)}}g||(g=this.$$watchers=[]);g.unshift(f);return function(){Na(g,f);c=null}},$watchCollection:function(a,b){var c=this,d,e,f,h=1<b.length,k=0,m=g(a),l=[],n={},p=!0,q=0;return this.$watch(function(){d=m(c);var a,b;if(X(d))if(bb(d))for(e!==l&&(e=l,q=e.length=0,k++),a=d.length,q!==a&&(k++,e.length=q=a),b=0;b<a;b++)e[b]!==e[b]&&d[b]!==d[b]||e[b]===d[b]||(k++,e[b]=d[b]);else{e!==n&&(e=n={},q=0,k++);a=0;for(b in d)d.hasOwnProperty(b)&&(a++,e.hasOwnProperty(b)?e[b]!==d[b]&&(k++,e[b]=d[b]):(q++,e[b]=d[b],
--k++));if(q>a)for(b in k++,e)e.hasOwnProperty(b)&&!d.hasOwnProperty(b)&&(q--,delete e[b])}else e!==d&&(e=d,k++);return k},function(){p?(p=!1,b(d,d,c)):b(d,f,c);if(h)if(X(d))if(bb(d)){f=Array(d.length);for(var a=0;a<d.length;a++)f[a]=d[a]}else for(a in f={},d)Gc.call(d,a)&&(f[a]=d[a]);else f=d})},$digest:function(){var d,g,f,h,k=this.$$asyncQueue,l=this.$$postDigestQueue,q,v,s=b,K,O=[],y,F,R;m("$digest");c=null;do{v=!1;for(K=this;k.length;){try{R=k.shift(),R.scope.$eval(R.expression)}catch(z){p.$$phase=
--null,e(z)}c=null}a:do{if(h=K.$$watchers)for(q=h.length;q--;)try{if(d=h[q])if((g=d.get(K))!==(f=d.last)&&!(d.eq?xa(g,f):"number"==typeof g&&"number"==typeof f&&isNaN(g)&&isNaN(f)))v=!0,c=d,d.last=d.eq?ca(g):g,d.fn(g,f===n?g:f,K),5>s&&(y=4-s,O[y]||(O[y]=[]),F=Q(d.exp)?"fn: "+(d.exp.name||d.exp.toString()):d.exp,F+="; newVal: "+qa(g)+"; oldVal: "+qa(f),O[y].push(F));else if(d===c){v=!1;break a}}catch(C){p.$$phase=null,e(C)}if(!(h=K.$$childHead||K!==this&&K.$$nextSibling))for(;K!==this&&!(h=K.$$nextSibling);)K=
--K.$parent}while(K=h);if((v||k.length)&&!s--)throw p.$$phase=null,a("infdig",b,qa(O));}while(v||k.length);for(p.$$phase=null;l.length;)try{l.shift()()}catch(T){e(T)}},$destroy:function(){if(!this.$$destroyed){var a=this.$parent;this.$broadcast("$destroy");this.$$destroyed=!0;this!==p&&(q(this.$$listenerCount,fb(null,l,this)),a.$$childHead==this&&(a.$$childHead=this.$$nextSibling),a.$$childTail==this&&(a.$$childTail=this.$$prevSibling),this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling),
--this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling),this.$parent=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=this.$root=null,this.$$listeners={},this.$$watchers=this.$$asyncQueue=this.$$postDigestQueue=[],this.$destroy=this.$digest=this.$apply=w,this.$on=this.$watch=function(){return w})}},$eval:function(a,b){return g(a)(this,b)},$evalAsync:function(a){p.$$phase||p.$$asyncQueue.length||f.defer(function(){p.$$asyncQueue.length&&p.$digest()});this.$$asyncQueue.push({scope:this,
--expression:a})},$$postDigest:function(a){this.$$postDigestQueue.push(a)},$apply:function(a){try{return m("$apply"),this.$eval(a)}catch(b){e(b)}finally{p.$$phase=null;try{p.$digest()}catch(c){throw e(c),c;}}},$on:function(a,b){var c=this.$$listeners[a];c||(this.$$listeners[a]=c=[]);c.push(b);var d=this;do d.$$listenerCount[a]||(d.$$listenerCount[a]=0),d.$$listenerCount[a]++;while(d=d.$parent);var e=this;return function(){c[eb(c,b)]=null;l(e,1,a)}},$emit:function(a,b){var c=[],d,g=this,f=!1,h={name:a,
--targetScope:g,stopPropagation:function(){f=!0},preventDefault:function(){h.defaultPrevented=!0},defaultPrevented:!1},k=[h].concat(ya.call(arguments,1)),m,l;do{d=g.$$listeners[a]||c;h.currentScope=g;m=0;for(l=d.length;m<l;m++)if(d[m])try{d[m].apply(null,k)}catch(n){e(n)}else d.splice(m,1),m--,l--;if(f)break;g=g.$parent}while(g);return h},$broadcast:function(a,b){for(var c=this,d=this,g={name:a,targetScope:this,preventDefault:function(){g.defaultPrevented=!0},defaultPrevented:!1},f=[g].concat(ya.call(arguments,
--1)),h,k;c=d;){g.currentScope=c;d=c.$$listeners[a]||[];h=0;for(k=d.length;h<k;h++)if(d[h])try{d[h].apply(null,f)}catch(m){e(m)}else d.splice(h,1),h--,k--;if(!(d=c.$$listenerCount[a]&&c.$$childHead||c!==this&&c.$$nextSibling))for(;c!==this&&!(d=c.$$nextSibling);)c=c.$parent}return g}};var p=new h;return p}]}function bd(){var b=/^\s*(https?|ftp|mailto|tel|file):/,a=/^\s*(https?|ftp|file):|data:image\//;this.aHrefSanitizationWhitelist=function(a){return z(a)?(b=a,this):b};this.imgSrcSanitizationWhitelist=
--function(b){return z(b)?(a=b,this):a};this.$get=function(){return function(c,d){var e=d?a:b,g;if(!S||8<=S)if(g=sa(c).href,""!==g&&!g.match(e))return"unsafe:"+g;return c}}}function Ae(b){if("self"===b)return b;if(C(b)){if(-1<b.indexOf("***"))throw ua("iwcard",b);b=b.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,"\\$1").replace(/\x08/g,"\\x08").replace("\\*\\*",".*").replace("\\*","[^:/.?&;]*");return RegExp("^"+b+"$")}if(db(b))return RegExp("^"+b.source+"$");throw ua("imatcher");}function Hc(b){var a=[];
--z(b)&&q(b,function(b){a.push(Ae(b))});return a}function ae(){this.SCE_CONTEXTS=ha;var b=["self"],a=[];this.resourceUrlWhitelist=function(a){arguments.length&&(b=Hc(a));return b};this.resourceUrlBlacklist=function(b){arguments.length&&(a=Hc(b));return a};this.$get=["$injector",function(c){function d(a){var b=function(a){this.$$unwrapTrustedValue=function(){return a}};a&&(b.prototype=new a);b.prototype.valueOf=function(){return this.$$unwrapTrustedValue()};b.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()};
--return b}var e=function(a){throw ua("unsafe");};c.has("$sanitize")&&(e=c.get("$sanitize"));var g=d(),f={};f[ha.HTML]=d(g);f[ha.CSS]=d(g);f[ha.URL]=d(g);f[ha.JS]=d(g);f[ha.RESOURCE_URL]=d(f[ha.URL]);return{trustAs:function(a,b){var c=f.hasOwnProperty(a)?f[a]:null;if(!c)throw ua("icontext",a,b);if(null===b||b===s||""===b)return b;if("string"!==typeof b)throw ua("itype",a);return new c(b)},getTrusted:function(c,d){if(null===d||d===s||""===d)return d;var g=f.hasOwnProperty(c)?f[c]:null;if(g&&d instanceof
--g)return d.$$unwrapTrustedValue();if(c===ha.RESOURCE_URL){var g=sa(d.toString()),l,n,p=!1;l=0;for(n=b.length;l<n;l++)if("self"===b[l]?Kb(g):b[l].exec(g.href)){p=!0;break}if(p)for(l=0,n=a.length;l<n;l++)if("self"===a[l]?Kb(g):a[l].exec(g.href)){p=!1;break}if(p)return d;throw ua("insecurl",d.toString());}if(c===ha.HTML)return e(d);throw ua("unsafe");},valueOf:function(a){return a instanceof g?a.$$unwrapTrustedValue():a}}}]}function $d(){var b=!0;this.enabled=function(a){arguments.length&&(b=!!a);return b};
--this.$get=["$parse","$sniffer","$sceDelegate",function(a,c,d){if(b&&c.msie&&8>c.msieDocumentMode)throw ua("iequirks");var e=ca(ha);e.isEnabled=function(){return b};e.trustAs=d.trustAs;e.getTrusted=d.getTrusted;e.valueOf=d.valueOf;b||(e.trustAs=e.getTrusted=function(a,b){return b},e.valueOf=Ea);e.parseAs=function(b,c){var d=a(c);return d.literal&&d.constant?d:function(a,c){return e.getTrusted(b,d(a,c))}};var g=e.parseAs,f=e.getTrusted,h=e.trustAs;q(ha,function(a,b){var c=J(b);e[Ta("parse_as_"+c)]=
--function(b){return g(a,b)};e[Ta("get_trusted_"+c)]=function(b){return f(a,b)};e[Ta("trust_as_"+c)]=function(b){return h(a,b)}});return e}]}function be(){this.$get=["$window","$document",function(b,a){var c={},d=Y((/android (\d+)/.exec(J((b.navigator||{}).userAgent))||[])[1]),e=/Boxee/i.test((b.navigator||{}).userAgent),g=a[0]||{},f=g.documentMode,h,m=/^(Moz|webkit|O|ms)(?=[A-Z])/,k=g.body&&g.body.style,l=!1,n=!1;if(k){for(var p in k)if(l=m.exec(p)){h=l[0];h=h.substr(0,1).toUpperCase()+h.substr(1);
--break}h||(h="WebkitOpacity"in k&&"webkit");l=!!("transition"in k||h+"Transition"in k);n=!!("animation"in k||h+"Animation"in k);!d||l&&n||(l=C(g.body.style.webkitTransition),n=C(g.body.style.webkitAnimation))}return{history:!(!b.history||!b.history.pushState||4>d||e),hashchange:"onhashchange"in b&&(!f||7<f),hasEvent:function(a){if("input"==a&&9==S)return!1;if(H(c[a])){var b=g.createElement("div");c[a]="on"+a in b}return c[a]},csp:Zb(),vendorPrefix:h,transitions:l,animations:n,android:d,msie:S,msieDocumentMode:f}}]}
--function de(){this.$get=["$rootScope","$browser","$q","$exceptionHandler",function(b,a,c,d){function e(e,h,m){var k=c.defer(),l=k.promise,n=z(m)&&!m;h=a.defer(function(){try{k.resolve(e())}catch(a){k.reject(a),d(a)}finally{delete g[l.$$timeoutId]}n||b.$apply()},h);l.$$timeoutId=h;g[h]=k;return l}var g={};e.cancel=function(b){return b&&b.$$timeoutId in g?(g[b.$$timeoutId].reject("canceled"),delete g[b.$$timeoutId],a.defer.cancel(b.$$timeoutId)):!1};return e}]}function sa(b,a){var c=b;S&&(W.setAttribute("href",
--c),c=W.href);W.setAttribute("href",c);return{href:W.href,protocol:W.protocol?W.protocol.replace(/:$/,""):"",host:W.host,search:W.search?W.search.replace(/^\?/,""):"",hash:W.hash?W.hash.replace(/^#/,""):"",hostname:W.hostname,port:W.port,pathname:"/"===W.pathname.charAt(0)?W.pathname:"/"+W.pathname}}function Kb(b){b=C(b)?sa(b):b;return b.protocol===Ic.protocol&&b.host===Ic.host}function ee(){this.$get=aa(P)}function jc(b){function a(d,e){if(X(d)){var g={};q(d,function(b,c){g[c]=a(c,b)});return g}return b.factory(d+
--c,e)}var c="Filter";this.register=a;this.$get=["$injector",function(a){return function(b){return a.get(b+c)}}];a("currency",Jc);a("date",Kc);a("filter",Be);a("json",Ce);a("limitTo",De);a("lowercase",Ee);a("number",Lc);a("orderBy",Mc);a("uppercase",Fe)}function Be(){return function(b,a,c){if(!L(b))return b;var d=typeof c,e=[];e.check=function(a){for(var b=0;b<e.length;b++)if(!e[b](a))return!1;return!0};"function"!==d&&(c="boolean"===d&&c?function(a,b){return Qa.equals(a,b)}:function(a,b){if(a&&b&&
--"object"===typeof a&&"object"===typeof b){for(var d in a)if("$"!==d.charAt(0)&&Gc.call(a,d)&&c(a[d],b[d]))return!0;return!1}b=(""+b).toLowerCase();return-1<(""+a).toLowerCase().indexOf(b)});var g=function(a,b){if("string"==typeof b&&"!"===b.charAt(0))return!g(a,b.substr(1));switch(typeof a){case "boolean":case "number":case "string":return c(a,b);case "object":switch(typeof b){case "object":return c(a,b);default:for(var d in a)if("$"!==d.charAt(0)&&g(a[d],b))return!0}return!1;case "array":for(d=0;d<
--a.length;d++)if(g(a[d],b))return!0;return!1;default:return!1}};switch(typeof a){case "boolean":case "number":case "string":a={$:a};case "object":for(var f in a)(function(b){"undefined"!=typeof a[b]&&e.push(function(c){return g("$"==b?c:c&&c[b],a[b])})})(f);break;case "function":e.push(a);break;default:return b}d=[];for(f=0;f<b.length;f++){var h=b[f];e.check(h)&&d.push(h)}return d}}function Jc(b){var a=b.NUMBER_FORMATS;return function(b,d){H(d)&&(d=a.CURRENCY_SYM);return Nc(b,a.PATTERNS[1],a.GROUP_SEP,
--a.DECIMAL_SEP,2).replace(/\u00A4/g,d)}}function Lc(b){var a=b.NUMBER_FORMATS;return function(b,d){return Nc(b,a.PATTERNS[0],a.GROUP_SEP,a.DECIMAL_SEP,d)}}function Nc(b,a,c,d,e){if(null==b||!isFinite(b)||X(b))return"";var g=0>b;b=Math.abs(b);var f=b+"",h="",m=[],k=!1;if(-1!==f.indexOf("e")){var l=f.match(/([\d\.]+)e(-?)(\d+)/);l&&"-"==l[2]&&l[3]>e+1?f="0":(h=f,k=!0)}if(k)0<e&&(-1<b&&1>b)&&(h=b.toFixed(e));else{f=(f.split(Oc)[1]||"").length;H(e)&&(e=Math.min(Math.max(a.minFrac,f),a.maxFrac));f=Math.pow(10,
--e+1);b=Math.floor(b*f+5)/f;b=(""+b).split(Oc);f=b[0];b=b[1]||"";var l=0,n=a.lgSize,p=a.gSize;if(f.length>=n+p)for(l=f.length-n,k=0;k<l;k++)0===(l-k)%p&&0!==k&&(h+=c),h+=f.charAt(k);for(k=l;k<f.length;k++)0===(f.length-k)%n&&0!==k&&(h+=c),h+=f.charAt(k);for(;b.length<e;)b+="0";e&&"0"!==e&&(h+=d+b.substr(0,e))}m.push(g?a.negPre:a.posPre);m.push(h);m.push(g?a.negSuf:a.posSuf);return m.join("")}function Sb(b,a,c){var d="";0>b&&(d="-",b=-b);for(b=""+b;b.length<a;)b="0"+b;c&&(b=b.substr(b.length-a));return d+
--b}function $(b,a,c,d){c=c||0;return function(e){e=e["get"+b]();if(0<c||e>-c)e+=c;0===e&&-12==c&&(e=12);return Sb(e,a,d)}}function sb(b,a){return function(c,d){var e=c["get"+b](),g=Fa(a?"SHORT"+b:b);return d[g][e]}}function Kc(b){function a(a){var b;if(b=a.match(c)){a=new Date(0);var g=0,f=0,h=b[8]?a.setUTCFullYear:a.setFullYear,m=b[8]?a.setUTCHours:a.setHours;b[9]&&(g=Y(b[9]+b[10]),f=Y(b[9]+b[11]));h.call(a,Y(b[1]),Y(b[2])-1,Y(b[3]));g=Y(b[4]||0)-g;f=Y(b[5]||0)-f;h=Y(b[6]||0);b=Math.round(1E3*parseFloat("0."+
--(b[7]||0)));m.call(a,g,f,h,b)}return a}var c=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(c,e){var g="",f=[],h,m;e=e||"mediumDate";e=b.DATETIME_FORMATS[e]||e;C(c)&&(c=Ge.test(c)?Y(c):a(c));yb(c)&&(c=new Date(c));if(!Ma(c))return c;for(;e;)(m=He.exec(e))?(f=f.concat(ya.call(m,1)),e=f.pop()):(f.push(e),e=null);q(f,function(a){h=Ie[a];g+=h?h(c,b.DATETIME_FORMATS):a.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return g}}function Ce(){return function(b){return qa(b,
--!0)}}function De(){return function(b,a){if(!L(b)&&!C(b))return b;a=Infinity===Math.abs(Number(a))?Number(a):Y(a);if(C(b))return a?0<=a?b.slice(0,a):b.slice(a,b.length):"";var c=[],d,e;a>b.length?a=b.length:a<-b.length&&(a=-b.length);0<a?(d=0,e=a):(d=b.length+a,e=b.length);for(;d<e;d++)c.push(b[d]);return c}}function Mc(b){return function(a,c,d){function e(a,b){return Pa(b)?function(b,c){return a(c,b)}:a}function g(a,b){var c=typeof a,d=typeof b;return c==d?("string"==c&&(a=a.toLowerCase(),b=b.toLowerCase()),
--a===b?0:a<b?-1:1):c<d?-1:1}if(!L(a)||!c)return a;c=L(c)?c:[c];c=Uc(c,function(a){var c=!1,d=a||Ea;if(C(a)){if("+"==a.charAt(0)||"-"==a.charAt(0))c="-"==a.charAt(0),a=a.substring(1);d=b(a);if(d.constant){var f=d();return e(function(a,b){return g(a[f],b[f])},c)}}return e(function(a,b){return g(d(a),d(b))},c)});for(var f=[],h=0;h<a.length;h++)f.push(a[h]);return f.sort(e(function(a,b){for(var d=0;d<c.length;d++){var e=c[d](a,b);if(0!==e)return e}return 0},d))}}function va(b){Q(b)&&(b={link:b});b.restrict=
--b.restrict||"AC";return aa(b)}function Pc(b,a,c,d){function e(a,c){c=c?"-"+hb(c,"-"):"";d.removeClass(b,(a?tb:ub)+c);d.addClass(b,(a?ub:tb)+c)}var g=this,f=b.parent().controller("form")||vb,h=0,m=g.$error={},k=[];g.$name=a.name||a.ngForm;g.$dirty=!1;g.$pristine=!0;g.$valid=!0;g.$invalid=!1;f.$addControl(g);b.addClass(Ka);e(!0);g.$addControl=function(a){Aa(a.$name,"input");k.push(a);a.$name&&(g[a.$name]=a)};g.$removeControl=function(a){a.$name&&g[a.$name]===a&&delete g[a.$name];q(m,function(b,c){g.$setValidity(c,
--!0,a)});Na(k,a)};g.$setValidity=function(a,b,c){var d=m[a];if(b)d&&(Na(d,c),d.length||(h--,h||(e(b),g.$valid=!0,g.$invalid=!1),m[a]=!1,e(!0,a),f.$setValidity(a,!0,g)));else{h||e(b);if(d){if(-1!=eb(d,c))return}else m[a]=d=[],h++,e(!1,a),f.$setValidity(a,!1,g);d.push(c);g.$valid=!1;g.$invalid=!0}};g.$setDirty=function(){d.removeClass(b,Ka);d.addClass(b,wb);g.$dirty=!0;g.$pristine=!1;f.$setDirty()};g.$setPristine=function(){d.removeClass(b,wb);d.addClass(b,Ka);g.$dirty=!1;g.$pristine=!0;q(k,function(a){a.$setPristine()})}}
--function pa(b,a,c,d){b.$setValidity(a,c);return c?d:s}function Je(b,a,c){var d=c.prop("validity");X(d)&&b.$parsers.push(function(c){if(b.$error[a]||!(d.badInput||d.customError||d.typeMismatch)||d.valueMissing)return c;b.$setValidity(a,!1)})}function xb(b,a,c,d,e,g){var f=a.prop("validity"),h=a[0].placeholder,m={};if(!e.android){var k=!1;a.on("compositionstart",function(a){k=!0});a.on("compositionend",function(){k=!1;l()})}var l=function(e){if(!k){var g=a.val();if(S&&"input"===(e||m).type&&a[0].placeholder!==
--h)h=a[0].placeholder;else if(Pa(c.ngTrim||"T")&&(g=ba(g)),d.$viewValue!==g||f&&""===g&&!f.valueMissing)b.$$phase?d.$setViewValue(g):b.$apply(function(){d.$setViewValue(g)})}};if(e.hasEvent("input"))a.on("input",l);else{var n,p=function(){n||(n=g.defer(function(){l();n=null}))};a.on("keydown",function(a){a=a.keyCode;91===a||(15<a&&19>a||37<=a&&40>=a)||p()});if(e.hasEvent("paste"))a.on("paste cut",p)}a.on("change",l);d.$render=function(){a.val(d.$isEmpty(d.$viewValue)?"":d.$viewValue)};var r=c.ngPattern;
--r&&((e=r.match(/^\/(.*)\/([gim]*)$/))?(r=RegExp(e[1],e[2]),e=function(a){return pa(d,"pattern",d.$isEmpty(a)||r.test(a),a)}):e=function(c){var e=b.$eval(r);if(!e||!e.test)throw u("ngPattern")("noregexp",r,e,ia(a));return pa(d,"pattern",d.$isEmpty(c)||e.test(c),c)},d.$formatters.push(e),d.$parsers.push(e));if(c.ngMinlength){var q=Y(c.ngMinlength);e=function(a){return pa(d,"minlength",d.$isEmpty(a)||a.length>=q,a)};d.$parsers.push(e);d.$formatters.push(e)}if(c.ngMaxlength){var D=Y(c.ngMaxlength);e=
--function(a){return pa(d,"maxlength",d.$isEmpty(a)||a.length<=D,a)};d.$parsers.push(e);d.$formatters.push(e)}}function Tb(b,a){b="ngClass"+b;return["$animate",function(c){function d(a,b){var c=[],d=0;a:for(;d<a.length;d++){for(var e=a[d],l=0;l<b.length;l++)if(e==b[l])continue a;c.push(e)}return c}function e(a){if(!L(a)){if(C(a))return a.split(" ");if(X(a)){var b=[];q(a,function(a,c){a&&b.push(c)});return b}}return a}return{restrict:"AC",link:function(g,f,h){function m(a,b){var c=f.data("$classCounts")||
--{},d=[];q(a,function(a){if(0<b||c[a])c[a]=(c[a]||0)+b,c[a]===+(0<b)&&d.push(a)});f.data("$classCounts",c);return d.join(" ")}function k(b){if(!0===a||g.$index%2===a){var k=e(b||[]);if(!l){var r=m(k,1);h.$addClass(r)}else if(!xa(b,l)){var q=e(l),r=d(k,q),k=d(q,k),k=m(k,-1),r=m(r,1);0===r.length?c.removeClass(f,k):0===k.length?c.addClass(f,r):c.setClass(f,r,k)}}l=ca(b)}var l;g.$watch(h[b],k,!0);h.$observe("class",function(a){k(g.$eval(h[b]))});"ngClass"!==b&&g.$watch("$index",function(c,d){var f=c&
--1;if(f!==(d&1)){var k=e(g.$eval(h[b]));f===a?(f=m(k,1),h.$addClass(f)):(f=m(k,-1),h.$removeClass(f))}})}}}]}var J=function(b){return C(b)?b.toLowerCase():b},Gc=Object.prototype.hasOwnProperty,Fa=function(b){return C(b)?b.toUpperCase():b},S,y,Ba,ya=[].slice,Ke=[].push,wa=Object.prototype.toString,Oa=u("ng"),Qa=P.angular||(P.angular={}),Sa,Ja,ka=["0","0","0"];S=Y((/msie (\d+)/.exec(J(navigator.userAgent))||[])[1]);isNaN(S)&&(S=Y((/trident\/.*; rv:(\d+)/.exec(J(navigator.userAgent))||[])[1]));w.$inject=
--[];Ea.$inject=[];var ba=function(){return String.prototype.trim?function(b){return C(b)?b.trim():b}:function(b){return C(b)?b.replace(/^\s\s*/,"").replace(/\s\s*$/,""):b}}();Ja=9>S?function(b){b=b.nodeName?b:b[0];return b.scopeName&&"HTML"!=b.scopeName?Fa(b.scopeName+":"+b.nodeName):b.nodeName}:function(b){return b.nodeName?b.nodeName:b[0].nodeName};var Xc=/[A-Z]/g,$c={full:"1.2.17-build.178+sha.2406084",major:1,minor:2,dot:17,codeName:"snapshot"},Va=M.cache={},ib=M.expando="ng-"+(new Date).getTime(),
--me=1,pb=P.document.addEventListener?function(b,a,c){b.addEventListener(a,c,!1)}:function(b,a,c){b.attachEvent("on"+a,c)},Ua=P.document.removeEventListener?function(b,a,c){b.removeEventListener(a,c,!1)}:function(b,a,c){b.detachEvent("on"+a,c)};M._data=function(b){return this.cache[b[this.expando]]||{}};var he=/([\:\-\_]+(.))/g,ie=/^moz([A-Z])/,Eb=u("jqLite"),je=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,Fb=/<|&#?\w+;/,ke=/<([\w:]+)/,le=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ea=
--{option:[1,'<select multiple="multiple">',"</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ea.optgroup=ea.option;ea.tbody=ea.tfoot=ea.colgroup=ea.caption=ea.thead;ea.th=ea.td;var Ia=M.prototype={ready:function(b){function a(){c||(c=!0,b())}var c=!1;"complete"===U.readyState?setTimeout(a):(this.on("DOMContentLoaded",a),M(P).on("load",a))},toString:function(){var b=
--[];q(this,function(a){b.push(""+a)});return"["+b.join(", ")+"]"},eq:function(b){return 0<=b?y(this[b]):y(this[this.length+b])},length:0,push:Ke,sort:[].sort,splice:[].splice},mb={};q("multiple selected checked disabled readOnly required open".split(" "),function(b){mb[J(b)]=b});var qc={};q("input select option textarea button form details".split(" "),function(b){qc[Fa(b)]=!0});q({data:mc,inheritedData:lb,scope:function(b){return y(b).data("$scope")||lb(b.parentNode||b,["$isolateScope","$scope"])},
--isolateScope:function(b){return y(b).data("$isolateScope")||y(b).data("$isolateScopeNoTemplate")},controller:nc,injector:function(b){return lb(b,"$injector")},removeAttr:function(b,a){b.removeAttribute(a)},hasClass:Ib,css:function(b,a,c){a=Ta(a);if(z(c))b.style[a]=c;else{var d;8>=S&&(d=b.currentStyle&&b.currentStyle[a],""===d&&(d="auto"));d=d||b.style[a];8>=S&&(d=""===d?s:d);return d}},attr:function(b,a,c){var d=J(a);if(mb[d])if(z(c))c?(b[a]=!0,b.setAttribute(a,d)):(b[a]=!1,b.removeAttribute(d));
--else return b[a]||(b.attributes.getNamedItem(a)||w).specified?d:s;else if(z(c))b.setAttribute(a,c);else if(b.getAttribute)return b=b.getAttribute(a,2),null===b?s:b},prop:function(b,a,c){if(z(c))b[a]=c;else return b[a]},text:function(){function b(b,d){var e=a[b.nodeType];if(H(d))return e?b[e]:"";b[e]=d}var a=[];9>S?(a[1]="innerText",a[3]="nodeValue"):a[1]=a[3]="textContent";b.$dv="";return b}(),val:function(b,a){if(H(a)){if("SELECT"===Ja(b)&&b.multiple){var c=[];q(b.options,function(a){a.selected&&
--c.push(a.value||a.text)});return 0===c.length?null:c}return b.value}b.value=a},html:function(b,a){if(H(a))return b.innerHTML;for(var c=0,d=b.childNodes;c<d.length;c++)Ga(d[c]);b.innerHTML=a},empty:oc},function(b,a){M.prototype[a]=function(a,d){var e,g;if(b!==oc&&(2==b.length&&b!==Ib&&b!==nc?a:d)===s){if(X(a)){for(e=0;e<this.length;e++)if(b===mc)b(this[e],a);else for(g in a)b(this[e],g,a[g]);return this}e=b.$dv;g=e===s?Math.min(this.length,1):this.length;for(var f=0;f<g;f++){var h=b(this[f],a,d);e=
--e?e+h:h}return e}for(e=0;e<this.length;e++)b(this[e],a,d);return this}});q({removeData:kc,dealoc:Ga,on:function a(c,d,e,g){if(z(g))throw Eb("onargs");var f=la(c,"events"),h=la(c,"handle");f||la(c,"events",f={});h||la(c,"handle",h=ne(c,f));q(d.split(" "),function(d){var g=f[d];if(!g){if("mouseenter"==d||"mouseleave"==d){var l=U.body.contains||U.body.compareDocumentPosition?function(a,c){var d=9===a.nodeType?a.documentElement:a,e=c&&c.parentNode;return a===e||!!(e&&1===e.nodeType&&(d.contains?d.contains(e):
--a.compareDocumentPosition&&a.compareDocumentPosition(e)&16))}:function(a,c){if(c)for(;c=c.parentNode;)if(c===a)return!0;return!1};f[d]=[];a(c,{mouseleave:"mouseout",mouseenter:"mouseover"}[d],function(a){var c=a.relatedTarget;c&&(c===this||l(this,c))||h(a,d)})}else pb(c,d,h),f[d]=[];g=f[d]}g.push(e)})},off:lc,one:function(a,c,d){a=y(a);a.on(c,function g(){a.off(c,d);a.off(c,g)});a.on(c,d)},replaceWith:function(a,c){var d,e=a.parentNode;Ga(a);q(new M(c),function(c){d?e.insertBefore(c,d.nextSibling):
--e.replaceChild(c,a);d=c})},children:function(a){var c=[];q(a.childNodes,function(a){1===a.nodeType&&c.push(a)});return c},contents:function(a){return a.contentDocument||a.childNodes||[]},append:function(a,c){q(new M(c),function(c){1!==a.nodeType&&11!==a.nodeType||a.appendChild(c)})},prepend:function(a,c){if(1===a.nodeType){var d=a.firstChild;q(new M(c),function(c){a.insertBefore(c,d)})}},wrap:function(a,c){c=y(c)[0];var d=a.parentNode;d&&d.replaceChild(c,a);c.appendChild(a)},remove:function(a){Ga(a);
--var c=a.parentNode;c&&c.removeChild(a)},after:function(a,c){var d=a,e=a.parentNode;q(new M(c),function(a){e.insertBefore(a,d.nextSibling);d=a})},addClass:kb,removeClass:jb,toggleClass:function(a,c,d){c&&q(c.split(" "),function(c){var g=d;H(g)&&(g=!Ib(a,c));(g?kb:jb)(a,c)})},parent:function(a){return(a=a.parentNode)&&11!==a.nodeType?a:null},next:function(a){if(a.nextElementSibling)return a.nextElementSibling;for(a=a.nextSibling;null!=a&&1!==a.nodeType;)a=a.nextSibling;return a},find:function(a,c){return a.getElementsByTagName?
--a.getElementsByTagName(c):[]},clone:Hb,triggerHandler:function(a,c,d){c=(la(a,"events")||{})[c];d=d||[];var e=[{preventDefault:w,stopPropagation:w}];q(c,function(c){c.apply(a,e.concat(d))})}},function(a,c){M.prototype[c]=function(c,e,g){for(var f,h=0;h<this.length;h++)H(f)?(f=a(this[h],c,e,g),z(f)&&(f=y(f))):Gb(f,a(this[h],c,e,g));return z(f)?f:this};M.prototype.bind=M.prototype.on;M.prototype.unbind=M.prototype.off});Wa.prototype={put:function(a,c){this[Ha(a)]=c},get:function(a){return this[Ha(a)]},
--remove:function(a){var c=this[a=Ha(a)];delete this[a];return c}};var pe=/^function\s*[^\(]*\(\s*([^\)]*)\)/m,qe=/,/,re=/^\s*(_?)(\S+?)\1\s*$/,oe=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,Xa=u("$injector"),Le=u("$animate"),Ld=["$provide",function(a){this.$$selectors={};this.register=function(c,d){var e=c+"-animation";if(c&&"."!=c.charAt(0))throw Le("notcsel",c);this.$$selectors[c.substr(1)]=e;a.factory(e,d)};this.classNameFilter=function(a){1===arguments.length&&(this.$$classNameFilter=a instanceof RegExp?
--a:null);return this.$$classNameFilter};this.$get=["$timeout","$$asyncCallback",function(a,d){return{enter:function(a,c,f,h){f?f.after(a):(c&&c[0]||(c=f.parent()),c.append(a));h&&d(h)},leave:function(a,c){a.remove();c&&d(c)},move:function(a,c,d,h){this.enter(a,c,d,h)},addClass:function(a,c,f){c=C(c)?c:L(c)?c.join(" "):"";q(a,function(a){kb(a,c)});f&&d(f)},removeClass:function(a,c,f){c=C(c)?c:L(c)?c.join(" "):"";q(a,function(a){jb(a,c)});f&&d(f)},setClass:function(a,c,f,h){q(a,function(a){kb(a,c);jb(a,
--f)});h&&d(h)},enabled:w}}]}],ja=u("$compile");fc.$inject=["$provide","$$sanitizeUriProvider"];var te=/^(x[\:\-_]|data[\:\-_])/i,yc=u("$interpolate"),Me=/^([^\?#]*)(\?([^#]*))?(#(.*))?$/,we={http:80,https:443,ftp:21},Nb=u("$location");Pb.prototype=Ob.prototype=Bc.prototype={$$html5:!1,$$replace:!1,absUrl:qb("$$absUrl"),url:function(a,c){if(H(a))return this.$$url;var d=Me.exec(a);d[1]&&this.path(decodeURIComponent(d[1]));(d[2]||d[1])&&this.search(d[3]||"");this.hash(d[5]||"",c);return this},protocol:qb("$$protocol"),
--host:qb("$$host"),port:qb("$$port"),path:Cc("$$path",function(a){return"/"==a.charAt(0)?a:"/"+a}),search:function(a,c){switch(arguments.length){case 0:return this.$$search;case 1:if(C(a))this.$$search=bc(a);else if(X(a))this.$$search=a;else throw Nb("isrcharg");break;default:H(c)||null===c?delete this.$$search[a]:this.$$search[a]=c}this.$$compose();return this},hash:Cc("$$hash",Ea),replace:function(){this.$$replace=!0;return this}};var Ca=u("$parse"),Fc={},ta,La={"null":function(){return null},"true":function(){return!0},
--"false":function(){return!1},undefined:w,"+":function(a,c,d,e){d=d(a,c);e=e(a,c);return z(d)?z(e)?d+e:d:z(e)?e:s},"-":function(a,c,d,e){d=d(a,c);e=e(a,c);return(z(d)?d:0)-(z(e)?e:0)},"*":function(a,c,d,e){return d(a,c)*e(a,c)},"/":function(a,c,d,e){return d(a,c)/e(a,c)},"%":function(a,c,d,e){return d(a,c)%e(a,c)},"^":function(a,c,d,e){return d(a,c)^e(a,c)},"=":w,"===":function(a,c,d,e){return d(a,c)===e(a,c)},"!==":function(a,c,d,e){return d(a,c)!==e(a,c)},"==":function(a,c,d,e){return d(a,c)==e(a,
--c)},"!=":function(a,c,d,e){return d(a,c)!=e(a,c)},"<":function(a,c,d,e){return d(a,c)<e(a,c)},">":function(a,c,d,e){return d(a,c)>e(a,c)},"<=":function(a,c,d,e){return d(a,c)<=e(a,c)},">=":function(a,c,d,e){return d(a,c)>=e(a,c)},"&&":function(a,c,d,e){return d(a,c)&&e(a,c)},"||":function(a,c,d,e){return d(a,c)||e(a,c)},"&":function(a,c,d,e){return d(a,c)&e(a,c)},"|":function(a,c,d,e){return e(a,c)(a,c,d(a,c))},"!":function(a,c,d){return!d(a,c)}},Ne={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},
--Rb=function(a){this.options=a};Rb.prototype={constructor:Rb,lex:function(a){this.text=a;this.index=0;this.ch=s;this.lastCh=":";this.tokens=[];var c;for(a=[];this.index<this.text.length;){this.ch=this.text.charAt(this.index);if(this.is("\"'"))this.readString(this.ch);else if(this.isNumber(this.ch)||this.is(".")&&this.isNumber(this.peek()))this.readNumber();else if(this.isIdent(this.ch))this.readIdent(),this.was("{,")&&("{"===a[0]&&(c=this.tokens[this.tokens.length-1]))&&(c.json=-1===c.text.indexOf("."));
--else if(this.is("(){}[].,;:?"))this.tokens.push({index:this.index,text:this.ch,json:this.was(":[,")&&this.is("{[")||this.is("}]:,")}),this.is("{[")&&a.unshift(this.ch),this.is("}]")&&a.shift(),this.index++;else if(this.isWhitespace(this.ch)){this.index++;continue}else{var d=this.ch+this.peek(),e=d+this.peek(2),g=La[this.ch],f=La[d],h=La[e];h?(this.tokens.push({index:this.index,text:e,fn:h}),this.index+=3):f?(this.tokens.push({index:this.index,text:d,fn:f}),this.index+=2):g?(this.tokens.push({index:this.index,
--text:this.ch,fn:g,json:this.was("[,:")&&this.is("+-")}),this.index+=1):this.throwError("Unexpected next character ",this.index,this.index+1)}this.lastCh=this.ch}return this.tokens},is:function(a){return-1!==a.indexOf(this.ch)},was:function(a){return-1!==a.indexOf(this.lastCh)},peek:function(a){a=a||1;return this.index+a<this.text.length?this.text.charAt(this.index+a):!1},isNumber:function(a){return"0"<=a&&"9">=a},isWhitespace:function(a){return" "===a||"\r"===a||"\t"===a||"\n"===a||"\v"===a||"\u00a0"===
--a},isIdent:function(a){return"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"===a||"$"===a},isExpOperator:function(a){return"-"===a||"+"===a||this.isNumber(a)},throwError:function(a,c,d){d=d||this.index;c=z(c)?"s "+c+"-"+this.index+" ["+this.text.substring(c,d)+"]":" "+d;throw Ca("lexerr",a,c,this.text);},readNumber:function(){for(var a="",c=this.index;this.index<this.text.length;){var d=J(this.text.charAt(this.index));if("."==d||this.isNumber(d))a+=d;else{var e=this.peek();if("e"==d&&this.isExpOperator(e))a+=
--d;else if(this.isExpOperator(d)&&e&&this.isNumber(e)&&"e"==a.charAt(a.length-1))a+=d;else if(!this.isExpOperator(d)||e&&this.isNumber(e)||"e"!=a.charAt(a.length-1))break;else this.throwError("Invalid exponent")}this.index++}a*=1;this.tokens.push({index:c,text:a,json:!0,fn:function(){return a}})},readIdent:function(){for(var a=this,c="",d=this.index,e,g,f,h;this.index<this.text.length;){h=this.text.charAt(this.index);if("."===h||this.isIdent(h)||this.isNumber(h))"."===h&&(e=this.index),c+=h;else break;
--this.index++}if(e)for(g=this.index;g<this.text.length;){h=this.text.charAt(g);if("("===h){f=c.substr(e-d+1);c=c.substr(0,e-d);this.index=g;break}if(this.isWhitespace(h))g++;else break}d={index:d,text:c};if(La.hasOwnProperty(c))d.fn=La[c],d.json=La[c];else{var m=Ec(c,this.options,this.text);d.fn=E(function(a,c){return m(a,c)},{assign:function(d,e){return rb(d,c,e,a.text,a.options)}})}this.tokens.push(d);f&&(this.tokens.push({index:e,text:".",json:!1}),this.tokens.push({index:e+1,text:f,json:!1}))},
--readString:function(a){var c=this.index;this.index++;for(var d="",e=a,g=!1;this.index<this.text.length;){var f=this.text.charAt(this.index),e=e+f;if(g)"u"===f?(f=this.text.substring(this.index+1,this.index+5),f.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+f+"]"),this.index+=4,d+=String.fromCharCode(parseInt(f,16))):d=(g=Ne[f])?d+g:d+f,g=!1;else if("\\"===f)g=!0;else{if(f===a){this.index++;this.tokens.push({index:c,text:e,string:d,json:!0,fn:function(){return d}});return}d+=
--f}this.index++}this.throwError("Unterminated quote",c)}};var ab=function(a,c,d){this.lexer=a;this.$filter=c;this.options=d};ab.ZERO=E(function(){return 0},{constant:!0});ab.prototype={constructor:ab,parse:function(a,c){this.text=a;this.json=c;this.tokens=this.lexer.lex(a);c&&(this.assignment=this.logicalOR,this.functionCall=this.fieldAccess=this.objectIndex=this.filterChain=function(){this.throwError("is not valid json",{text:a,index:0})});var d=c?this.primary():this.statements();0!==this.tokens.length&&
--this.throwError("is an unexpected token",this.tokens[0]);d.literal=!!d.literal;d.constant=!!d.constant;return d},primary:function(){var a;if(this.expect("("))a=this.filterChain(),this.consume(")");else if(this.expect("["))a=this.arrayDeclaration();else if(this.expect("{"))a=this.object();else{var c=this.expect();(a=c.fn)||this.throwError("not a primary expression",c);c.json&&(a.constant=!0,a.literal=!0)}for(var d;c=this.expect("(","[",".");)"("===c.text?(a=this.functionCall(a,d),d=null):"["===c.text?
--(d=a,a=this.objectIndex(a)):"."===c.text?(d=a,a=this.fieldAccess(a)):this.throwError("IMPOSSIBLE");return a},throwError:function(a,c){throw Ca("syntax",c.text,a,c.index+1,this.text,this.text.substring(c.index));},peekToken:function(){if(0===this.tokens.length)throw Ca("ueoe",this.text);return this.tokens[0]},peek:function(a,c,d,e){if(0<this.tokens.length){var g=this.tokens[0],f=g.text;if(f===a||f===c||f===d||f===e||!(a||c||d||e))return g}return!1},expect:function(a,c,d,e){return(a=this.peek(a,c,d,
--e))?(this.json&&!a.json&&this.throwError("is not valid json",a),this.tokens.shift(),a):!1},consume:function(a){this.expect(a)||this.throwError("is unexpected, expecting ["+a+"]",this.peek())},unaryFn:function(a,c){return E(function(d,e){return a(d,e,c)},{constant:c.constant})},ternaryFn:function(a,c,d){return E(function(e,g){return a(e,g)?c(e,g):d(e,g)},{constant:a.constant&&c.constant&&d.constant})},binaryFn:function(a,c,d){return E(function(e,g){return c(e,g,a,d)},{constant:a.constant&&d.constant})},
--statements:function(){for(var a=[];;)if(0<this.tokens.length&&!this.peek("}",")",";","]")&&a.push(this.filterChain()),!this.expect(";"))return 1===a.length?a[0]:function(c,d){for(var e,g=0;g<a.length;g++){var f=a[g];f&&(e=f(c,d))}return e}},filterChain:function(){for(var a=this.expression(),c;;)if(c=this.expect("|"))a=this.binaryFn(a,c.fn,this.filter());else return a},filter:function(){for(var a=this.expect(),c=this.$filter(a.text),d=[];;)if(a=this.expect(":"))d.push(this.expression());else{var e=
--function(a,e,h){h=[h];for(var m=0;m<d.length;m++)h.push(d[m](a,e));return c.apply(a,h)};return function(){return e}}},expression:function(){return this.assignment()},assignment:function(){var a=this.ternary(),c,d;return(d=this.expect("="))?(a.assign||this.throwError("implies assignment but ["+this.text.substring(0,d.index)+"] can not be assigned to",d),c=this.ternary(),function(d,g){return a.assign(d,c(d,g),g)}):a},ternary:function(){var a=this.logicalOR(),c,d;if(this.expect("?")){c=this.ternary();
--if(d=this.expect(":"))return this.ternaryFn(a,c,this.ternary());this.throwError("expected :",d)}else return a},logicalOR:function(){for(var a=this.logicalAND(),c;;)if(c=this.expect("||"))a=this.binaryFn(a,c.fn,this.logicalAND());else return a},logicalAND:function(){var a=this.equality(),c;if(c=this.expect("&&"))a=this.binaryFn(a,c.fn,this.logicalAND());return a},equality:function(){var a=this.relational(),c;if(c=this.expect("==","!=","===","!=="))a=this.binaryFn(a,c.fn,this.equality());return a},
--relational:function(){var a=this.additive(),c;if(c=this.expect("<",">","<=",">="))a=this.binaryFn(a,c.fn,this.relational());return a},additive:function(){for(var a=this.multiplicative(),c;c=this.expect("+","-");)a=this.binaryFn(a,c.fn,this.multiplicative());return a},multiplicative:function(){for(var a=this.unary(),c;c=this.expect("*","/","%");)a=this.binaryFn(a,c.fn,this.unary());return a},unary:function(){var a;return this.expect("+")?this.primary():(a=this.expect("-"))?this.binaryFn(ab.ZERO,a.fn,
--this.unary()):(a=this.expect("!"))?this.unaryFn(a.fn,this.unary()):this.primary()},fieldAccess:function(a){var c=this,d=this.expect().text,e=Ec(d,this.options,this.text);return E(function(c,d,h){return e(h||a(c,d))},{assign:function(e,f,h){return rb(a(e,h),d,f,c.text,c.options)}})},objectIndex:function(a){var c=this,d=this.expression();this.consume("]");return E(function(e,g){var f=a(e,g),h=d(e,g),m;if(!f)return s;(f=$a(f[h],c.text))&&(f.then&&c.options.unwrapPromises)&&(m=f,"$$v"in f||(m.$$v=s,m.then(function(a){m.$$v=
--a})),f=f.$$v);return f},{assign:function(e,g,f){var h=d(e,f);return $a(a(e,f),c.text)[h]=g}})},functionCall:function(a,c){var d=[];if(")"!==this.peekToken().text){do d.push(this.expression());while(this.expect(","))}this.consume(")");var e=this;return function(g,f){for(var h=[],m=c?c(g,f):g,k=0;k<d.length;k++)h.push(d[k](g,f));k=a(g,f,m)||w;$a(m,e.text);$a(k,e.text);h=k.apply?k.apply(m,h):k(h[0],h[1],h[2],h[3],h[4]);return $a(h,e.text)}},arrayDeclaration:function(){var a=[],c=!0;if("]"!==this.peekToken().text){do{if(this.peek("]"))break;
--var d=this.expression();a.push(d);d.constant||(c=!1)}while(this.expect(","))}this.consume("]");return E(function(c,d){for(var f=[],h=0;h<a.length;h++)f.push(a[h](c,d));return f},{literal:!0,constant:c})},object:function(){var a=[],c=!0;if("}"!==this.peekToken().text){do{if(this.peek("}"))break;var d=this.expect(),d=d.string||d.text;this.consume(":");var e=this.expression();a.push({key:d,value:e});e.constant||(c=!1)}while(this.expect(","))}this.consume("}");return E(function(c,d){for(var e={},m=0;m<
--a.length;m++){var k=a[m];e[k.key]=k.value(c,d)}return e},{literal:!0,constant:c})}};var Qb={},ua=u("$sce"),ha={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},W=U.createElement("a"),Ic=sa(P.location.href,!0);jc.$inject=["$provide"];Jc.$inject=["$locale"];Lc.$inject=["$locale"];var Oc=".",Ie={yyyy:$("FullYear",4),yy:$("FullYear",2,0,!0),y:$("FullYear",1),MMMM:sb("Month"),MMM:sb("Month",!0),MM:$("Month",2,1),M:$("Month",1,1),dd:$("Date",2),d:$("Date",1),HH:$("Hours",2),H:$("Hours",
--1),hh:$("Hours",2,-12),h:$("Hours",1,-12),mm:$("Minutes",2),m:$("Minutes",1),ss:$("Seconds",2),s:$("Seconds",1),sss:$("Milliseconds",3),EEEE:sb("Day"),EEE:sb("Day",!0),a:function(a,c){return 12>a.getHours()?c.AMPMS[0]:c.AMPMS[1]},Z:function(a){a=-1*a.getTimezoneOffset();return a=(0<=a?"+":"")+(Sb(Math[0<a?"floor":"ceil"](a/60),2)+Sb(Math.abs(a%60),2))}},He=/((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/,Ge=/^\-?\d+$/;Kc.$inject=["$locale"];var Ee=aa(J),Fe=aa(Fa);Mc.$inject=
--["$parse"];var cd=aa({restrict:"E",compile:function(a,c){8>=S&&(c.href||c.name||c.$set("href",""),a.append(U.createComment("IE fix")));if(!c.href&&!c.xlinkHref&&!c.name)return function(a,c){var g="[object SVGAnimatedString]"===wa.call(c.prop("href"))?"xlink:href":"href";c.on("click",function(a){c.attr(g)||a.preventDefault()})}}}),Cb={};q(mb,function(a,c){if("multiple"!=a){var d=na("ng-"+c);Cb[d]=function(){return{priority:100,link:function(a,g,f){a.$watch(f[d],function(a){f.$set(c,!!a)})}}}}});q(["src",
--"srcset","href"],function(a){var c=na("ng-"+a);Cb[c]=function(){return{priority:99,link:function(d,e,g){var f=a,h=a;"href"===a&&"[object SVGAnimatedString]"===wa.call(e.prop("href"))&&(h="xlinkHref",g.$attr[h]="xlink:href",f=null);g.$observe(c,function(a){a&&(g.$set(h,a),S&&f&&e.prop(f,g[h]))})}}}});var vb={$addControl:w,$removeControl:w,$setValidity:w,$setDirty:w,$setPristine:w};Pc.$inject=["$element","$attrs","$scope","$animate"];var Qc=function(a){return["$timeout",function(c){return{name:"form",
--restrict:a?"EAC":"E",controller:Pc,compile:function(){return{pre:function(a,e,g,f){if(!g.action){var h=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1};pb(e[0],"submit",h);e.on("$destroy",function(){c(function(){Ua(e[0],"submit",h)},0,!1)})}var m=e.parent().controller("form"),k=g.name||g.ngForm;k&&rb(a,k,f,k);if(m)e.on("$destroy",function(){m.$removeControl(f);k&&rb(a,k,s,k);E(f,vb)})}}}}}]},dd=Qc(),qd=Qc(!0),Oe=/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/,
--Pe=/^[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*$/i,Qe=/^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/,Rc={text:xb,number:function(a,c,d,e,g,f){xb(a,c,d,e,g,f);e.$parsers.push(function(a){var c=e.$isEmpty(a);if(c||Qe.test(a))return e.$setValidity("number",!0),""===a?null:c?a:parseFloat(a);e.$setValidity("number",!1);return s});Je(e,"number",c);e.$formatters.push(function(a){return e.$isEmpty(a)?"":""+a});d.min&&(a=function(a){var c=parseFloat(d.min);return pa(e,"min",e.$isEmpty(a)||a>=c,a)},e.$parsers.push(a),
--e.$formatters.push(a));d.max&&(a=function(a){var c=parseFloat(d.max);return pa(e,"max",e.$isEmpty(a)||a<=c,a)},e.$parsers.push(a),e.$formatters.push(a));e.$formatters.push(function(a){return pa(e,"number",e.$isEmpty(a)||yb(a),a)})},url:function(a,c,d,e,g,f){xb(a,c,d,e,g,f);a=function(a){return pa(e,"url",e.$isEmpty(a)||Oe.test(a),a)};e.$formatters.push(a);e.$parsers.push(a)},email:function(a,c,d,e,g,f){xb(a,c,d,e,g,f);a=function(a){return pa(e,"email",e.$isEmpty(a)||Pe.test(a),a)};e.$formatters.push(a);
--e.$parsers.push(a)},radio:function(a,c,d,e){H(d.name)&&c.attr("name",cb());c.on("click",function(){c[0].checked&&a.$apply(function(){e.$setViewValue(d.value)})});e.$render=function(){c[0].checked=d.value==e.$viewValue};d.$observe("value",e.$render)},checkbox:function(a,c,d,e){var g=d.ngTrueValue,f=d.ngFalseValue;C(g)||(g=!0);C(f)||(f=!1);c.on("click",function(){a.$apply(function(){e.$setViewValue(c[0].checked)})});e.$render=function(){c[0].checked=e.$viewValue};e.$isEmpty=function(a){return a!==g};
--e.$formatters.push(function(a){return a===g});e.$parsers.push(function(a){return a?g:f})},hidden:w,button:w,submit:w,reset:w,file:w},gc=["$browser","$sniffer",function(a,c){return{restrict:"E",require:"?ngModel",link:function(d,e,g,f){f&&(Rc[J(g.type)]||Rc.text)(d,e,g,f,c,a)}}}],ub="ng-valid",tb="ng-invalid",Ka="ng-pristine",wb="ng-dirty",Re=["$scope","$exceptionHandler","$attrs","$element","$parse","$animate",function(a,c,d,e,g,f){function h(a,c){c=c?"-"+hb(c,"-"):"";f.removeClass(e,(a?tb:ub)+c);
--f.addClass(e,(a?ub:tb)+c)}this.$modelValue=this.$viewValue=Number.NaN;this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$pristine=!0;this.$dirty=!1;this.$valid=!0;this.$invalid=!1;this.$name=d.name;var m=g(d.ngModel),k=m.assign;if(!k)throw u("ngModel")("nonassign",d.ngModel,ia(e));this.$render=w;this.$isEmpty=function(a){return H(a)||""===a||null===a||a!==a};var l=e.inheritedData("$formController")||vb,n=0,p=this.$error={};e.addClass(Ka);h(!0);this.$setValidity=function(a,c){p[a]!==
--!c&&(c?(p[a]&&n--,n||(h(!0),this.$valid=!0,this.$invalid=!1)):(h(!1),this.$invalid=!0,this.$valid=!1,n++),p[a]=!c,h(c,a),l.$setValidity(a,c,this))};this.$setPristine=function(){this.$dirty=!1;this.$pristine=!0;f.removeClass(e,wb);f.addClass(e,Ka)};this.$setViewValue=function(d){this.$viewValue=d;this.$pristine&&(this.$dirty=!0,this.$pristine=!1,f.removeClass(e,Ka),f.addClass(e,wb),l.$setDirty());q(this.$parsers,function(a){d=a(d)});this.$modelValue!==d&&(this.$modelValue=d,k(a,d),q(this.$viewChangeListeners,
--function(a){try{a()}catch(d){c(d)}}))};var r=this;a.$watch(function(){var c=m(a);if(r.$modelValue!==c){var d=r.$formatters,e=d.length;for(r.$modelValue=c;e--;)c=d[e](c);r.$viewValue!==c&&(r.$viewValue=c,r.$render())}return c})}],Fd=function(){return{require:["ngModel","^?form"],controller:Re,link:function(a,c,d,e){var g=e[0],f=e[1]||vb;f.$addControl(g);a.$on("$destroy",function(){f.$removeControl(g)})}}},Hd=aa({require:"ngModel",link:function(a,c,d,e){e.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),
--hc=function(){return{require:"?ngModel",link:function(a,c,d,e){if(e){d.required=!0;var g=function(a){if(d.required&&e.$isEmpty(a))e.$setValidity("required",!1);else return e.$setValidity("required",!0),a};e.$formatters.push(g);e.$parsers.unshift(g);d.$observe("required",function(){g(e.$viewValue)})}}}},Gd=function(){return{require:"ngModel",link:function(a,c,d,e){var g=(a=/\/(.*)\//.exec(d.ngList))&&RegExp(a[1])||d.ngList||",";e.$parsers.push(function(a){if(!H(a)){var c=[];a&&q(a.split(g),function(a){a&&
--c.push(ba(a))});return c}});e.$formatters.push(function(a){return L(a)?a.join(", "):s});e.$isEmpty=function(a){return!a||!a.length}}}},Se=/^(true|false|\d+)$/,Id=function(){return{priority:100,compile:function(a,c){return Se.test(c.ngValue)?function(a,c,g){g.$set("value",a.$eval(g.ngValue))}:function(a,c,g){a.$watch(g.ngValue,function(a){g.$set("value",a)})}}}},id=va(function(a,c,d){c.addClass("ng-binding").data("$binding",d.ngBind);a.$watch(d.ngBind,function(a){c.text(a==s?"":a)})}),kd=["$interpolate",
--function(a){return function(c,d,e){c=a(d.attr(e.$attr.ngBindTemplate));d.addClass("ng-binding").data("$binding",c);e.$observe("ngBindTemplate",function(a){d.text(a)})}}],jd=["$sce","$parse",function(a,c){return function(d,e,g){e.addClass("ng-binding").data("$binding",g.ngBindHtml);var f=c(g.ngBindHtml);d.$watch(function(){return(f(d)||"").toString()},function(c){e.html(a.getTrustedHtml(f(d))||"")})}}],ld=Tb("",!0),nd=Tb("Odd",0),md=Tb("Even",1),od=va({compile:function(a,c){c.$set("ngCloak",s);a.removeClass("ng-cloak")}}),
--pd=[function(){return{scope:!0,controller:"@",priority:500}}],ic={};q("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),function(a){var c=na("ng-"+a);ic[c]=["$parse",function(d){return{compile:function(e,g){var f=d(g[c]);return function(c,d,e){d.on(J(a),function(a){c.$apply(function(){f(c,{$event:a})})})}}}}]});var sd=["$animate",function(a){return{transclude:"element",priority:600,terminal:!0,restrict:"A",
--$$tlb:!0,link:function(c,d,e,g,f){var h,m,k;c.$watch(e.ngIf,function(g){Pa(g)?m||(m=c.$new(),f(m,function(c){c[c.length++]=U.createComment(" end ngIf: "+e.ngIf+" ");h={clone:c};a.enter(c,d.parent(),d)})):(k&&(k.remove(),k=null),m&&(m.$destroy(),m=null),h&&(k=Bb(h.clone),a.leave(k,function(){k=null}),h=null))})}}}],td=["$http","$templateCache","$anchorScroll","$animate","$sce",function(a,c,d,e,g){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:Qa.noop,compile:function(f,
--h){var m=h.ngInclude||h.src,k=h.onload||"",l=h.autoscroll;return function(f,h,q,s,D){var x=0,t,y,B,v=function(){y&&(y.remove(),y=null);t&&(t.$destroy(),t=null);B&&(e.leave(B,function(){y=null}),y=B,B=null)};f.$watch(g.parseAsResourceUrl(m),function(g){var m=function(){!z(l)||l&&!f.$eval(l)||d()},q=++x;g?(a.get(g,{cache:c}).success(function(a){if(q===x){var c=f.$new();s.template=a;a=D(c,function(a){v();e.enter(a,null,h,m)});t=c;B=a;t.$emit("$includeContentLoaded");f.$eval(k)}}).error(function(){q===
--x&&v()}),f.$emit("$includeContentRequested")):(v(),s.template=null)})}}}}],Jd=["$compile",function(a){return{restrict:"ECA",priority:-400,require:"ngInclude",link:function(c,d,e,g){d.html(g.template);a(d.contents())(c)}}}],ud=va({priority:450,compile:function(){return{pre:function(a,c,d){a.$eval(d.ngInit)}}}}),vd=va({terminal:!0,priority:1E3}),wd=["$locale","$interpolate",function(a,c){var d=/{}/g;return{restrict:"EA",link:function(e,g,f){var h=f.count,m=f.$attr.when&&g.attr(f.$attr.when),k=f.offset||
--0,l=e.$eval(m)||{},n={},p=c.startSymbol(),r=c.endSymbol(),s=/^when(Minus)?(.+)$/;q(f,function(a,c){s.test(c)&&(l[J(c.replace("when","").replace("Minus","-"))]=g.attr(f.$attr[c]))});q(l,function(a,e){n[e]=c(a.replace(d,p+h+"-"+k+r))});e.$watch(function(){var c=parseFloat(e.$eval(h));if(isNaN(c))return"";c in l||(c=a.pluralCat(c-k));return n[c](e,g,!0)},function(a){g.text(a)})}}}],xd=["$parse","$animate",function(a,c){var d=u("ngRepeat");return{transclude:"element",priority:1E3,terminal:!0,$$tlb:!0,
--link:function(e,g,f,h,m){var k=f.ngRepeat,l=k.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/),n,p,r,s,D,x,t={$id:Ha};if(!l)throw d("iexp",k);f=l[1];h=l[2];(l=l[3])?(n=a(l),p=function(a,c,d){x&&(t[x]=a);t[D]=c;t.$index=d;return n(e,t)}):(r=function(a,c){return Ha(c)},s=function(a){return a});l=f.match(/^(?:([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\))$/);if(!l)throw d("iidexp",f);D=l[3]||l[1];x=l[2];var z={};e.$watchCollection(h,function(a){var f,h,l=g[0],n,t={},F,R,C,w,T,u,
--E=[];if(bb(a))T=a,n=p||r;else{n=p||s;T=[];for(C in a)a.hasOwnProperty(C)&&"$"!=C.charAt(0)&&T.push(C);T.sort()}F=T.length;h=E.length=T.length;for(f=0;f<h;f++)if(C=a===T?f:T[f],w=a[C],w=n(C,w,f),Aa(w,"`track by` id"),z.hasOwnProperty(w))u=z[w],delete z[w],t[w]=u,E[f]=u;else{if(t.hasOwnProperty(w))throw q(E,function(a){a&&a.scope&&(z[a.id]=a)}),d("dupes",k,w);E[f]={id:w};t[w]=!1}for(C in z)z.hasOwnProperty(C)&&(u=z[C],f=Bb(u.clone),c.leave(f),q(f,function(a){a.$$NG_REMOVED=!0}),u.scope.$destroy());
--f=0;for(h=T.length;f<h;f++){C=a===T?f:T[f];w=a[C];u=E[f];E[f-1]&&(l=E[f-1].clone[E[f-1].clone.length-1]);if(u.scope){R=u.scope;n=l;do n=n.nextSibling;while(n&&n.$$NG_REMOVED);u.clone[0]!=n&&c.move(Bb(u.clone),null,y(l));l=u.clone[u.clone.length-1]}else R=e.$new();R[D]=w;x&&(R[x]=C);R.$index=f;R.$first=0===f;R.$last=f===F-1;R.$middle=!(R.$first||R.$last);R.$odd=!(R.$even=0===(f&1));u.scope||m(R,function(a){a[a.length++]=U.createComment(" end ngRepeat: "+k+" ");c.enter(a,null,y(l));l=a;u.scope=R;u.clone=
--a;t[u.id]=u})}z=t})}}}],yd=["$animate",function(a){return function(c,d,e){c.$watch(e.ngShow,function(c){a[Pa(c)?"removeClass":"addClass"](d,"ng-hide")})}}],rd=["$animate",function(a){return function(c,d,e){c.$watch(e.ngHide,function(c){a[Pa(c)?"addClass":"removeClass"](d,"ng-hide")})}}],zd=va(function(a,c,d){a.$watch(d.ngStyle,function(a,d){d&&a!==d&&q(d,function(a,d){c.css(d,"")});a&&c.css(a)},!0)}),Ad=["$animate",function(a){return{restrict:"EA",require:"ngSwitch",controller:["$scope",function(){this.cases=
--{}}],link:function(c,d,e,g){var f=[],h=[],m=[],k=[];c.$watch(e.ngSwitch||e.on,function(d){var n,p;n=0;for(p=m.length;n<p;++n)m[n].remove();n=m.length=0;for(p=k.length;n<p;++n){var r=h[n];k[n].$destroy();m[n]=r;a.leave(r,function(){m.splice(n,1)})}h.length=0;k.length=0;if(f=g.cases["!"+d]||g.cases["?"])c.$eval(e.change),q(f,function(d){var e=c.$new();k.push(e);d.transclude(e,function(c){var e=d.element;h.push(c);a.enter(c,e.parent(),e)})})})}}}],Bd=va({transclude:"element",priority:800,require:"^ngSwitch",
--link:function(a,c,d,e,g){e.cases["!"+d.ngSwitchWhen]=e.cases["!"+d.ngSwitchWhen]||[];e.cases["!"+d.ngSwitchWhen].push({transclude:g,element:c})}}),Cd=va({transclude:"element",priority:800,require:"^ngSwitch",link:function(a,c,d,e,g){e.cases["?"]=e.cases["?"]||[];e.cases["?"].push({transclude:g,element:c})}}),Ed=va({link:function(a,c,d,e,g){if(!g)throw u("ngTransclude")("orphan",ia(c));g(function(a){c.empty();c.append(a)})}}),ed=["$templateCache",function(a){return{restrict:"E",terminal:!0,compile:function(c,
--d){"text/ng-template"==d.type&&a.put(d.id,c[0].text)}}}],Te=u("ngOptions"),Dd=aa({terminal:!0}),fd=["$compile","$parse",function(a,c){var d=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,e={$setViewValue:w};return{restrict:"E",require:["select","?ngModel"],controller:["$element","$scope","$attrs",function(a,c,d){var m=this,k={},l=e,n;m.databound=
--d.ngModel;m.init=function(a,c,d){l=a;n=d};m.addOption=function(c){Aa(c,'"option value"');k[c]=!0;l.$viewValue==c&&(a.val(c),n.parent()&&n.remove())};m.removeOption=function(a){this.hasOption(a)&&(delete k[a],l.$viewValue==a&&this.renderUnknownOption(a))};m.renderUnknownOption=function(c){c="? "+Ha(c)+" ?";n.val(c);a.prepend(n);a.val(c);n.prop("selected",!0)};m.hasOption=function(a){return k.hasOwnProperty(a)};c.$on("$destroy",function(){m.renderUnknownOption=w})}],link:function(e,f,h,m){function k(a,
--c,d,e){d.$render=function(){var a=d.$viewValue;e.hasOption(a)?(w.parent()&&w.remove(),c.val(a),""===a&&x.prop("selected",!0)):H(a)&&x?c.val(""):e.renderUnknownOption(a)};c.on("change",function(){a.$apply(function(){w.parent()&&w.remove();d.$setViewValue(c.val())})})}function l(a,c,d){var e;d.$render=function(){var a=new Wa(d.$viewValue);q(c.find("option"),function(c){c.selected=z(a.get(c.value))})};a.$watch(function(){xa(e,d.$viewValue)||(e=ca(d.$viewValue),d.$render())});c.on("change",function(){a.$apply(function(){var a=
--[];q(c.find("option"),function(c){c.selected&&a.push(c.value)});d.$setViewValue(a)})})}function n(e,f,g){function h(){var a={"":[]},c=[""],d,k,s,u,v;u=g.$modelValue;v=y(e)||[];var A=n?Ub(v):v,E,I,B;I={};s=!1;var F,H;if(r)if(w&&L(u))for(s=new Wa([]),B=0;B<u.length;B++)I[m]=u[B],s.put(w(e,I),u[B]);else s=new Wa(u);for(B=0;E=A.length,B<E;B++){k=B;if(n){k=A[B];if("$"===k.charAt(0))continue;I[n]=k}I[m]=v[k];d=p(e,I)||"";(k=a[d])||(k=a[d]=[],c.push(d));r?d=z(s.remove(w?w(e,I):q(e,I))):(w?(d={},d[m]=u,d=
--w(e,d)===w(e,I)):d=u===q(e,I),s=s||d);F=l(e,I);F=z(F)?F:"";k.push({id:w?w(e,I):n?A[B]:B,label:F,selected:d})}r||(D||null===u?a[""].unshift({id:"",label:"",selected:!s}):s||a[""].unshift({id:"?",label:"",selected:!0}));I=0;for(A=c.length;I<A;I++){d=c[I];k=a[d];x.length<=I?(u={element:C.clone().attr("label",d),label:k.label},v=[u],x.push(v),f.append(u.element)):(v=x[I],u=v[0],u.label!=d&&u.element.attr("label",u.label=d));F=null;B=0;for(E=k.length;B<E;B++)s=k[B],(d=v[B+1])?(F=d.element,d.label!==s.label&&
--F.text(d.label=s.label),d.id!==s.id&&F.val(d.id=s.id),d.selected!==s.selected&&F.prop("selected",d.selected=s.selected)):(""===s.id&&D?H=D:(H=t.clone()).val(s.id).attr("selected",s.selected).text(s.label),v.push({element:H,label:s.label,id:s.id,selected:s.selected}),F?F.after(H):u.element.append(H),F=H);for(B++;v.length>B;)v.pop().element.remove()}for(;x.length>I;)x.pop()[0].element.remove()}var k;if(!(k=u.match(d)))throw Te("iexp",u,ia(f));var l=c(k[2]||k[1]),m=k[4]||k[6],n=k[5],p=c(k[3]||""),q=
--c(k[2]?k[1]:m),y=c(k[7]),w=k[8]?c(k[8]):null,x=[[{element:f,label:""}]];D&&(a(D)(e),D.removeClass("ng-scope"),D.remove());f.empty();f.on("change",function(){e.$apply(function(){var a,c=y(e)||[],d={},h,k,l,p,t,u,v;if(r)for(k=[],p=0,u=x.length;p<u;p++)for(a=x[p],l=1,t=a.length;l<t;l++){if((h=a[l].element)[0].selected){h=h.val();n&&(d[n]=h);if(w)for(v=0;v<c.length&&(d[m]=c[v],w(e,d)!=h);v++);else d[m]=c[h];k.push(q(e,d))}}else{h=f.val();if("?"==h)k=s;else if(""===h)k=null;else if(w)for(v=0;v<c.length;v++){if(d[m]=
--c[v],w(e,d)==h){k=q(e,d);break}}else d[m]=c[h],n&&(d[n]=h),k=q(e,d);1<x[0].length&&x[0][1].id!==h&&(x[0][1].selected=!1)}g.$setViewValue(k)})});g.$render=h;e.$watch(h)}if(m[1]){var p=m[0];m=m[1];var r=h.multiple,u=h.ngOptions,D=!1,x,t=y(U.createElement("option")),C=y(U.createElement("optgroup")),w=t.clone();h=0;for(var v=f.children(),E=v.length;h<E;h++)if(""===v[h].value){x=D=v.eq(h);break}p.init(m,D,w);r&&(m.$isEmpty=function(a){return!a||0===a.length});u?n(e,f,m):r?l(e,f,m):k(e,f,m,p)}}}}],hd=["$interpolate",
--function(a){var c={addOption:w,removeOption:w};return{restrict:"E",priority:100,compile:function(d,e){if(H(e.value)){var g=a(d.text(),!0);g||e.$set("value",d.text())}return function(a,d,e){var k=d.parent(),l=k.data("$selectController")||k.parent().data("$selectController");l&&l.databound?d.prop("selected",!1):l=c;g?a.$watch(g,function(a,c){e.$set("value",a);a!==c&&l.removeOption(c);l.addOption(a)}):l.addOption(e.value);d.on("$destroy",function(){l.removeOption(e.value)})}}}}],gd=aa({restrict:"E",
--terminal:!0});P.angular.bootstrap?console.log("WARNING: Tried to load angular more than once."):((Ba=P.jQuery)&&Ba.fn.on?(y=Ba,E(Ba.fn,{scope:Ia.scope,isolateScope:Ia.isolateScope,controller:Ia.controller,injector:Ia.injector,inheritedData:Ia.inheritedData}),Db("remove",!0,!0,!1),Db("empty",!1,!1,!1),Db("html",!1,!1,!0)):y=M,Qa.element=y,Zc(Qa),y(U).ready(function(){Wc(U,cc)}))})(window,document);!window.angular.$$csp()&&window.angular.element(document).find("head").prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide{display:none !important;}ng\\:form{display:block;}.ng-animate-block-transitions{transition:0s all!important;-webkit-transition:0s all!important;}</style>');
--//# sourceMappingURL=angular.min.js.map
-+(function(w){'use strict';function oe(a){if(B(a))u(a.objectMaxDepth)&&(Mc.objectMaxDepth=Wb(a.objectMaxDepth)?a.objectMaxDepth:NaN);else return Mc}function Wb(a){return Y(a)&&0<a}function K(a,b){b=b||Error;return function(){var d=arguments[0],c;c="["+(a?a+":":"")+d+"] http://errors.angularjs.org/1.6.9/"+(a?a+"/":"")+d;for(d=1;d<arguments.length;d++){c=c+(1==d?"?":"&")+"p"+(d-1)+"=";var e=encodeURIComponent,f;f=arguments[d];f="function"==typeof f?f.toString().replace(/ \{[\s\S]*$/,""):"undefined"==
-+typeof f?"undefined":"string"!=typeof f?JSON.stringify(f):f;c+=e(f)}return new b(c)}}function wa(a){if(null==a||Za(a))return!1;if(I(a)||E(a)||z&&a instanceof z)return!0;var b="length"in Object(a)&&a.length;return Y(b)&&(0<=b&&(b-1 in a||a instanceof Array)||"function"===typeof a.item)}function r(a,b,d){var c,e;if(a)if(C(a))for(c in a)"prototype"!==c&&"length"!==c&&"name"!==c&&a.hasOwnProperty(c)&&b.call(d,a[c],c,a);else if(I(a)||wa(a)){var f="object"!==typeof a;c=0;for(e=a.length;c<e;c++)(f||c in
-+    a)&&b.call(d,a[c],c,a)}else if(a.forEach&&a.forEach!==r)a.forEach(b,d,a);else if(Nc(a))for(c in a)b.call(d,a[c],c,a);else if("function"===typeof a.hasOwnProperty)for(c in a)a.hasOwnProperty(c)&&b.call(d,a[c],c,a);else for(c in a)ra.call(a,c)&&b.call(d,a[c],c,a);return a}function Oc(a,b,d){for(var c=Object.keys(a).sort(),e=0;e<c.length;e++)b.call(d,a[c[e]],c[e]);return c}function Xb(a){return function(b,d){a(d,b)}}function pe(){return++qb}function Yb(a,b,d){for(var c=a.$$hashKey,e=0,f=b.length;e<f;++e){var g=
-+    b[e];if(B(g)||C(g))for(var h=Object.keys(g),k=0,l=h.length;k<l;k++){var m=h[k],p=g[m];d&&B(p)?fa(p)?a[m]=new Date(p.valueOf()):$a(p)?a[m]=new RegExp(p):p.nodeName?a[m]=p.cloneNode(!0):Zb(p)?a[m]=p.clone():(B(a[m])||(a[m]=I(p)?[]:{}),Yb(a[m],[p],!0)):a[m]=p}}c?a.$$hashKey=c:delete a.$$hashKey;return a}function O(a){return Yb(a,xa.call(arguments,1),!1)}function qe(a){return Yb(a,xa.call(arguments,1),!0)}function Z(a){return parseInt(a,10)}function $b(a,b){return O(Object.create(a),b)}function D(){}
-+    function ab(a){return a}function la(a){return function(){return a}}function ac(a){return C(a.toString)&&a.toString!==ia}function x(a){return"undefined"===typeof a}function u(a){return"undefined"!==typeof a}function B(a){return null!==a&&"object"===typeof a}function Nc(a){return null!==a&&"object"===typeof a&&!Pc(a)}function E(a){return"string"===typeof a}function Y(a){return"number"===typeof a}function fa(a){return"[object Date]"===ia.call(a)}function bc(a){switch(ia.call(a)){case "[object Error]":return!0;
-+        case "[object Exception]":return!0;case "[object DOMException]":return!0;default:return a instanceof Error}}function C(a){return"function"===typeof a}function $a(a){return"[object RegExp]"===ia.call(a)}function Za(a){return a&&a.window===a}function bb(a){return a&&a.$evalAsync&&a.$watch}function Na(a){return"boolean"===typeof a}function re(a){return a&&Y(a.length)&&se.test(ia.call(a))}function Zb(a){return!(!a||!(a.nodeName||a.prop&&a.attr&&a.find))}function te(a){var b={};a=a.split(",");var d;for(d=
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   0;d<a.length;d++)b[a[d]]=!0;return b}function ya(a){return L(a.nodeName||a[0]&&a[0].nodeName)}function cb(a,b){var d=a.indexOf(b);0<=d&&a.splice(d,1);return d}function pa(a,b,d){function c(a,b,c){c--;if(0>c)return"...";var d=b.$$hashKey,g;if(I(a)){g=0;for(var f=a.length;g<f;g++)b.push(e(a[g],c))}else if(Nc(a))for(g in a)b[g]=e(a[g],c);else if(a&&"function"===typeof a.hasOwnProperty)for(g in a)a.hasOwnProperty(g)&&(b[g]=e(a[g],c));else for(g in a)ra.call(a,g)&&(b[g]=e(a[g],c));d?b.$$hashKey=d:delete b.$$hashKey;
-+        return b}function e(a,b){if(!B(a))return a;var d=g.indexOf(a);if(-1!==d)return h[d];if(Za(a)||bb(a))throw qa("cpws");var d=!1,e=f(a);void 0===e&&(e=I(a)?[]:Object.create(Pc(a)),d=!0);g.push(a);h.push(e);return d?c(a,e,b):e}function f(a){switch(ia.call(a)){case "[object Int8Array]":case "[object Int16Array]":case "[object Int32Array]":case "[object Float32Array]":case "[object Float64Array]":case "[object Uint8Array]":case "[object Uint8ClampedArray]":case "[object Uint16Array]":case "[object Uint32Array]":return new a.constructor(e(a.buffer),
-+        a.byteOffset,a.length);case "[object ArrayBuffer]":if(!a.slice){var b=new ArrayBuffer(a.byteLength);(new Uint8Array(b)).set(new Uint8Array(a));return b}return a.slice(0);case "[object Boolean]":case "[object Number]":case "[object String]":case "[object Date]":return new a.constructor(a.valueOf());case "[object RegExp]":return b=new RegExp(a.source,a.toString().match(/[^/]*$/)[0]),b.lastIndex=a.lastIndex,b;case "[object Blob]":return new a.constructor([a],{type:a.type})}if(C(a.cloneNode))return a.cloneNode(!0)}
-+        var g=[],h=[];d=Wb(d)?d:NaN;if(b){if(re(b)||"[object ArrayBuffer]"===ia.call(b))throw qa("cpta");if(a===b)throw qa("cpi");I(b)?b.length=0:r(b,function(a,c){"$$hashKey"!==c&&delete b[c]});g.push(a);h.push(b);return c(a,b,d)}return e(a,d)}function cc(a,b){return a===b||a!==a&&b!==b}function sa(a,b){if(a===b)return!0;if(null===a||null===b)return!1;if(a!==a&&b!==b)return!0;var d=typeof a,c;if(d===typeof b&&"object"===d)if(I(a)){if(!I(b))return!1;if((d=a.length)===b.length){for(c=0;c<d;c++)if(!sa(a[c],
-+        b[c]))return!1;return!0}}else{if(fa(a))return fa(b)?cc(a.getTime(),b.getTime()):!1;if($a(a))return $a(b)?a.toString()===b.toString():!1;if(bb(a)||bb(b)||Za(a)||Za(b)||I(b)||fa(b)||$a(b))return!1;d=S();for(c in a)if("$"!==c.charAt(0)&&!C(a[c])){if(!sa(a[c],b[c]))return!1;d[c]=!0}for(c in b)if(!(c in d)&&"$"!==c.charAt(0)&&u(b[c])&&!C(b[c]))return!1;return!0}return!1}function db(a,b,d){return a.concat(xa.call(b,d))}function Ra(a,b){var d=2<arguments.length?xa.call(arguments,2):[];return!C(b)||b instanceof
-+    RegExp?b:d.length?function(){return arguments.length?b.apply(a,db(d,arguments,0)):b.apply(a,d)}:function(){return arguments.length?b.apply(a,arguments):b.call(a)}}function Qc(a,b){var d=b;"string"===typeof a&&"$"===a.charAt(0)&&"$"===a.charAt(1)?d=void 0:Za(b)?d="$WINDOW":b&&w.document===b?d="$DOCUMENT":bb(b)&&(d="$SCOPE");return d}function eb(a,b){if(!x(a))return Y(b)||(b=b?2:null),JSON.stringify(a,Qc,b)}function Rc(a){return E(a)?JSON.parse(a):a}function Sc(a,b){a=a.replace(ue,"");var d=Date.parse("Jan 01, 1970 00:00:00 "+
-+        a)/6E4;return U(d)?b:d}function dc(a,b,d){d=d?-1:1;var c=a.getTimezoneOffset();b=Sc(b,c);d*=b-c;a=new Date(a.getTime());a.setMinutes(a.getMinutes()+d);return a}function za(a){a=z(a).clone().empty();var b=z("<div>").append(a).html();try{return a[0].nodeType===Oa?L(b):b.match(/^(<[^>]+>)/)[1].replace(/^<([\w-]+)/,function(a,b){return"<"+L(b)})}catch(d){return L(b)}}function Tc(a){try{return decodeURIComponent(a)}catch(b){}}function ec(a){var b={};r((a||"").split("&"),function(a){var c,e,f;a&&(e=a=a.replace(/\+/g,
-+        "%20"),c=a.indexOf("="),-1!==c&&(e=a.substring(0,c),f=a.substring(c+1)),e=Tc(e),u(e)&&(f=u(f)?Tc(f):!0,ra.call(b,e)?I(b[e])?b[e].push(f):b[e]=[b[e],f]:b[e]=f))});return b}function fc(a){var b=[];r(a,function(a,c){I(a)?r(a,function(a){b.push(ja(c,!0)+(!0===a?"":"="+ja(a,!0)))}):b.push(ja(c,!0)+(!0===a?"":"="+ja(a,!0)))});return b.length?b.join("&"):""}function fb(a){return ja(a,!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function ja(a,b){return encodeURIComponent(a).replace(/%40/gi,
-+        "@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%3B/gi,";").replace(/%20/g,b?"%20":"+")}function ve(a,b){var d,c,e=Ha.length;for(c=0;c<e;++c)if(d=Ha[c]+b,E(d=a.getAttribute(d)))return d;return null}function we(a,b){var d,c,e={};r(Ha,function(b){b+="app";!d&&a.hasAttribute&&a.hasAttribute(b)&&(d=a,c=a.getAttribute(b))});r(Ha,function(b){b+="app";var e;!d&&(e=a.querySelector("["+b.replace(":","\\:")+"]"))&&(d=e,c=e.getAttribute(b))});d&&(xe?(e.strictDi=null!==ve(d,"strict-di"),
-+        b(d,c?[c]:[],e)):w.console.error("AngularJS: disabling automatic bootstrap. <script> protocol indicates an extension, document.location.href does not match."))}function Uc(a,b,d){B(d)||(d={});d=O({strictDi:!1},d);var c=function(){a=z(a);if(a.injector()){var c=a[0]===w.document?"document":za(a);throw qa("btstrpd",c.replace(/</,"&lt;").replace(/>/,"&gt;"));}b=b||[];b.unshift(["$provide",function(b){b.value("$rootElement",a)}]);d.debugInfoEnabled&&b.push(["$compileProvider",function(a){a.debugInfoEnabled(!0)}]);
-+        b.unshift("ng");c=gb(b,d.strictDi);c.invoke(["$rootScope","$rootElement","$compile","$injector",function(a,b,c,d){a.$apply(function(){b.data("$injector",d);c(b)(a)})}]);return c},e=/^NG_ENABLE_DEBUG_INFO!/,f=/^NG_DEFER_BOOTSTRAP!/;w&&e.test(w.name)&&(d.debugInfoEnabled=!0,w.name=w.name.replace(e,""));if(w&&!f.test(w.name))return c();w.name=w.name.replace(f,"");$.resumeBootstrap=function(a){r(a,function(a){b.push(a)});return c()};C($.resumeDeferredBootstrap)&&$.resumeDeferredBootstrap()}function ye(){w.name=
-+        "NG_ENABLE_DEBUG_INFO!"+w.name;w.location.reload()}function ze(a){a=$.element(a).injector();if(!a)throw qa("test");return a.get("$$testability")}function Vc(a,b){b=b||"_";return a.replace(Ae,function(a,c){return(c?b:"")+a.toLowerCase()})}function Be(){var a;if(!Wc){var b=rb();(ma=x(b)?w.jQuery:b?w[b]:void 0)&&ma.fn.on?(z=ma,O(ma.fn,{scope:Sa.scope,isolateScope:Sa.isolateScope,controller:Sa.controller,injector:Sa.injector,inheritedData:Sa.inheritedData}),a=ma.cleanData,ma.cleanData=function(b){for(var c,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  e=0,f;null!=(f=b[e]);e++)(c=ma._data(f,"events"))&&c.$destroy&&ma(f).triggerHandler("$destroy");a(b)}):z=V;$.element=z;Wc=!0}}function hb(a,b,d){if(!a)throw qa("areq",b||"?",d||"required");return a}function sb(a,b,d){d&&I(a)&&(a=a[a.length-1]);hb(C(a),b,"not a function, got "+(a&&"object"===typeof a?a.constructor.name||"Object":typeof a));return a}function Ia(a,b){if("hasOwnProperty"===a)throw qa("badname",b);}function Xc(a,b,d){if(!b)return a;b=b.split(".");for(var c,e=a,f=b.length,g=0;g<f;g++)c=
-+        b[g],a&&(a=(e=a)[c]);return!d&&C(a)?Ra(e,a):a}function tb(a){for(var b=a[0],d=a[a.length-1],c,e=1;b!==d&&(b=b.nextSibling);e++)if(c||a[e]!==b)c||(c=z(xa.call(a,0,e))),c.push(b);return c||a}function S(){return Object.create(null)}function gc(a){if(null==a)return"";switch(typeof a){case "string":break;case "number":a=""+a;break;default:a=!ac(a)||I(a)||fa(a)?eb(a):a.toString()}return a}function Ce(a){function b(a,b,c){return a[b]||(a[b]=c())}var d=K("$injector"),c=K("ng");a=b(a,"angular",Object);a.$$minErr=
-+        a.$$minErr||K;return b(a,"module",function(){var a={};return function(f,g,h){var k={};if("hasOwnProperty"===f)throw c("badname","module");g&&a.hasOwnProperty(f)&&(a[f]=null);return b(a,f,function(){function a(b,c,d,g){g||(g=e);return function(){g[d||"push"]([b,c,arguments]);return v}}function b(a,c,d){d||(d=e);return function(b,e){e&&C(e)&&(e.$$moduleName=f);d.push([a,c,arguments]);return v}}if(!g)throw d("nomod",f);var e=[],n=[],F=[],s=a("$injector","invoke","push",n),v={_invokeQueue:e,_configBlocks:n,
-+        _runBlocks:F,info:function(a){if(u(a)){if(!B(a))throw c("aobj","value");k=a;return this}return k},requires:g,name:f,provider:b("$provide","provider"),factory:b("$provide","factory"),service:b("$provide","service"),value:a("$provide","value"),constant:a("$provide","constant","unshift"),decorator:b("$provide","decorator",n),animation:b("$animateProvider","register"),filter:b("$filterProvider","register"),controller:b("$controllerProvider","register"),directive:b("$compileProvider","directive"),component:b("$compileProvider",
-+            "component"),config:s,run:function(a){F.push(a);return this}};h&&s(h);return v})}})}function ka(a,b){if(I(a)){b=b||[];for(var d=0,c=a.length;d<c;d++)b[d]=a[d]}else if(B(a))for(d in b=b||{},a)if("$"!==d.charAt(0)||"$"!==d.charAt(1))b[d]=a[d];return b||a}function De(a,b){var d=[];Wb(b)&&(a=$.copy(a,null,b));return JSON.stringify(a,function(a,b){b=Qc(a,b);if(B(b)){if(0<=d.indexOf(b))return"...";d.push(b)}return b})}function Ee(a){O(a,{errorHandlingConfig:oe,bootstrap:Uc,copy:pa,extend:O,merge:qe,equals:sa,
-+        element:z,forEach:r,injector:gb,noop:D,bind:Ra,toJson:eb,fromJson:Rc,identity:ab,isUndefined:x,isDefined:u,isString:E,isFunction:C,isObject:B,isNumber:Y,isElement:Zb,isArray:I,version:Fe,isDate:fa,lowercase:L,uppercase:ub,callbacks:{$$counter:0},getTestability:ze,reloadWithDebugInfo:ye,$$minErr:K,$$csp:Ja,$$encodeUriSegment:fb,$$encodeUriQuery:ja,$$stringify:gc});ic=Ce(w);ic("ng",["ngLocale"],["$provide",function(a){a.provider({$$sanitizeUri:Ge});a.provider("$compile",Yc).directive({a:He,input:Zc,
-+        textarea:Zc,form:Ie,script:Je,select:Ke,option:Le,ngBind:Me,ngBindHtml:Ne,ngBindTemplate:Oe,ngClass:Pe,ngClassEven:Qe,ngClassOdd:Re,ngCloak:Se,ngController:Te,ngForm:Ue,ngHide:Ve,ngIf:We,ngInclude:Xe,ngInit:Ye,ngNonBindable:Ze,ngPluralize:$e,ngRepeat:af,ngShow:bf,ngStyle:cf,ngSwitch:df,ngSwitchWhen:ef,ngSwitchDefault:ff,ngOptions:gf,ngTransclude:hf,ngModel:jf,ngList:kf,ngChange:lf,pattern:$c,ngPattern:$c,required:ad,ngRequired:ad,minlength:bd,ngMinlength:bd,maxlength:cd,ngMaxlength:cd,ngValue:mf,
-+        ngModelOptions:nf}).directive({ngInclude:of}).directive(vb).directive(dd);a.provider({$anchorScroll:pf,$animate:qf,$animateCss:rf,$$animateJs:sf,$$animateQueue:tf,$$AnimateRunner:uf,$$animateAsyncRun:vf,$browser:wf,$cacheFactory:xf,$controller:yf,$document:zf,$$isDocumentHidden:Af,$exceptionHandler:Bf,$filter:ed,$$forceReflow:Cf,$interpolate:Df,$interval:Ef,$http:Ff,$httpParamSerializer:Gf,$httpParamSerializerJQLike:Hf,$httpBackend:If,$xhrFactory:Jf,$jsonpCallbacks:Kf,$location:Lf,$log:Mf,$parse:Nf,
-+        $rootScope:Of,$q:Pf,$$q:Qf,$sce:Rf,$sceDelegate:Sf,$sniffer:Tf,$templateCache:Uf,$templateRequest:Vf,$$testability:Wf,$timeout:Xf,$window:Yf,$$rAF:Zf,$$jqLite:$f,$$Map:ag,$$cookieReader:bg})}]).info({angularVersion:"1.6.9"})}function wb(a,b){return b.toUpperCase()}function xb(a){return a.replace(cg,wb)}function jc(a){a=a.nodeType;return 1===a||!a||9===a}function fd(a,b){var d,c,e=b.createDocumentFragment(),f=[];if(kc.test(a)){d=e.appendChild(b.createElement("div"));c=(dg.exec(a)||["",""])[1].toLowerCase();
-+        c=aa[c]||aa._default;d.innerHTML=c[1]+a.replace(eg,"<$1></$2>")+c[2];for(c=c[0];c--;)d=d.lastChild;f=db(f,d.childNodes);d=e.firstChild;d.textContent=""}else f.push(b.createTextNode(a));e.textContent="";e.innerHTML="";r(f,function(a){e.appendChild(a)});return e}function V(a){if(a instanceof V)return a;var b;E(a)&&(a=Q(a),b=!0);if(!(this instanceof V)){if(b&&"<"!==a.charAt(0))throw lc("nosel");return new V(a)}if(b){b=w.document;var d;a=(d=fg.exec(a))?[b.createElement(d[1])]:(d=fd(a,b))?d.childNodes:
-+        [];mc(this,a)}else C(a)?gd(a):mc(this,a)}function nc(a){return a.cloneNode(!0)}function yb(a,b){!b&&jc(a)&&z.cleanData([a]);a.querySelectorAll&&z.cleanData(a.querySelectorAll("*"))}function hd(a,b,d,c){if(u(c))throw lc("offargs");var e=(c=zb(a))&&c.events,f=c&&c.handle;if(f)if(b){var g=function(b){var c=e[b];u(d)&&cb(c||[],d);u(d)&&c&&0<c.length||(a.removeEventListener(b,f),delete e[b])};r(b.split(" "),function(a){g(a);Ab[a]&&g(Ab[a])})}else for(b in e)"$destroy"!==b&&a.removeEventListener(b,f),delete e[b]}
-+    function oc(a,b){var d=a.ng339,c=d&&ib[d];c&&(b?delete c.data[b]:(c.handle&&(c.events.$destroy&&c.handle({},"$destroy"),hd(a)),delete ib[d],a.ng339=void 0))}function zb(a,b){var d=a.ng339,d=d&&ib[d];b&&!d&&(a.ng339=d=++gg,d=ib[d]={events:{},data:{},handle:void 0});return d}function pc(a,b,d){if(jc(a)){var c,e=u(d),f=!e&&b&&!B(b),g=!b;a=(a=zb(a,!f))&&a.data;if(e)a[xb(b)]=d;else{if(g)return a;if(f)return a&&a[xb(b)];for(c in b)a[xb(c)]=b[c]}}}function Bb(a,b){return a.getAttribute?-1<(" "+(a.getAttribute("class")||
-+        "")+" ").replace(/[\n\t]/g," ").indexOf(" "+b+" "):!1}function Cb(a,b){if(b&&a.setAttribute){var d=(" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," "),c=d;r(b.split(" "),function(a){a=Q(a);c=c.replace(" "+a+" "," ")});c!==d&&a.setAttribute("class",Q(c))}}function Db(a,b){if(b&&a.setAttribute){var d=(" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," "),c=d;r(b.split(" "),function(a){a=Q(a);-1===c.indexOf(" "+a+" ")&&(c+=a+" ")});c!==d&&a.setAttribute("class",Q(c))}}function mc(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             b){if(b)if(b.nodeType)a[a.length++]=b;else{var d=b.length;if("number"===typeof d&&b.window!==b){if(d)for(var c=0;c<d;c++)a[a.length++]=b[c]}else a[a.length++]=b}}function id(a,b){return Eb(a,"$"+(b||"ngController")+"Controller")}function Eb(a,b,d){9===a.nodeType&&(a=a.documentElement);for(b=I(b)?b:[b];a;){for(var c=0,e=b.length;c<e;c++)if(u(d=z.data(a,b[c])))return d;a=a.parentNode||11===a.nodeType&&a.host}}function jd(a){for(yb(a,!0);a.firstChild;)a.removeChild(a.firstChild)}function Fb(a,b){b||
-+    yb(a);var d=a.parentNode;d&&d.removeChild(a)}function hg(a,b){b=b||w;if("complete"===b.document.readyState)b.setTimeout(a);else z(b).on("load",a)}function gd(a){function b(){w.document.removeEventListener("DOMContentLoaded",b);w.removeEventListener("load",b);a()}"complete"===w.document.readyState?w.setTimeout(a):(w.document.addEventListener("DOMContentLoaded",b),w.addEventListener("load",b))}function kd(a,b){var d=Gb[b.toLowerCase()];return d&&ld[ya(a)]&&d}function ig(a,b){var d=function(c,d){c.isDefaultPrevented=
-+        function(){return c.defaultPrevented};var f=b[d||c.type],g=f?f.length:0;if(g){if(x(c.immediatePropagationStopped)){var h=c.stopImmediatePropagation;c.stopImmediatePropagation=function(){c.immediatePropagationStopped=!0;c.stopPropagation&&c.stopPropagation();h&&h.call(c)}}c.isImmediatePropagationStopped=function(){return!0===c.immediatePropagationStopped};var k=f.specialHandlerWrapper||jg;1<g&&(f=ka(f));for(var l=0;l<g;l++)c.isImmediatePropagationStopped()||k(a,c,f[l])}};d.elem=a;return d}function jg(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 b,d){d.call(a,b)}function kg(a,b,d){var c=b.relatedTarget;c&&(c===a||lg.call(a,c))||d.call(a,b)}function $f(){this.$get=function(){return O(V,{hasClass:function(a,b){a.attr&&(a=a[0]);return Bb(a,b)},addClass:function(a,b){a.attr&&(a=a[0]);return Db(a,b)},removeClass:function(a,b){a.attr&&(a=a[0]);return Cb(a,b)}})}}function Pa(a,b){var d=a&&a.$$hashKey;if(d)return"function"===typeof d&&(d=a.$$hashKey()),d;d=typeof a;return d="function"===d||"object"===d&&null!==a?a.$$hashKey=d+":"+(b||pe)():d+":"+
-+        a}function md(){this._keys=[];this._values=[];this._lastKey=NaN;this._lastIndex=-1}function nd(a){a=Function.prototype.toString.call(a).replace(mg,"");return a.match(ng)||a.match(og)}function pg(a){return(a=nd(a))?"function("+(a[1]||"").replace(/[\s\r\n]+/," ")+")":"fn"}function gb(a,b){function d(a){return function(b,c){if(B(b))r(b,Xb(a));else return a(b,c)}}function c(a,b){Ia(a,"service");if(C(b)||I(b))b=n.instantiate(b);if(!b.$get)throw Ba("pget",a);return p[a+"Provider"]=b}function e(a,b){return function(){var c=
-+        v.invoke(b,this);if(x(c))throw Ba("undef",a);return c}}function f(a,b,d){return c(a,{$get:!1!==d?e(a,b):b})}function g(a){hb(x(a)||I(a),"modulesToLoad","not an array");var b=[],c;r(a,function(a){function d(a){var b,c;b=0;for(c=a.length;b<c;b++){var e=a[b],g=n.get(e[0]);g[e[1]].apply(g,e[2])}}if(!m.get(a)){m.set(a,!0);try{E(a)?(c=ic(a),v.modules[a]=c,b=b.concat(g(c.requires)).concat(c._runBlocks),d(c._invokeQueue),d(c._configBlocks)):C(a)?b.push(n.invoke(a)):I(a)?b.push(n.invoke(a)):sb(a,"module")}catch(e){throw I(a)&&
-+    (a=a[a.length-1]),e.message&&e.stack&&-1===e.stack.indexOf(e.message)&&(e=e.message+"\n"+e.stack),Ba("modulerr",a,e.stack||e.message||e);}}});return b}function h(a,c){function d(b,e){if(a.hasOwnProperty(b)){if(a[b]===k)throw Ba("cdep",b+" <- "+l.join(" <- "));return a[b]}try{return l.unshift(b),a[b]=k,a[b]=c(b,e),a[b]}catch(g){throw a[b]===k&&delete a[b],g;}finally{l.shift()}}function e(a,c,g){var f=[];a=gb.$$annotate(a,b,g);for(var k=0,h=a.length;k<h;k++){var l=a[k];if("string"!==typeof l)throw Ba("itkn",
-+        l);f.push(c&&c.hasOwnProperty(l)?c[l]:d(l,g))}return f}return{invoke:function(a,b,c,d){"string"===typeof c&&(d=c,c=null);c=e(a,c,d);I(a)&&(a=a[a.length-1]);d=a;if(Ca||"function"!==typeof d)d=!1;else{var g=d.$$ngIsClass;Na(g)||(g=d.$$ngIsClass=/^(?:class\b|constructor\()/.test(Function.prototype.toString.call(d)));d=g}return d?(c.unshift(null),new (Function.prototype.bind.apply(a,c))):a.apply(b,c)},instantiate:function(a,b,c){var d=I(a)?a[a.length-1]:a;a=e(a,b,c);a.unshift(null);return new (Function.prototype.bind.apply(d,
-+            a))},get:d,annotate:gb.$$annotate,has:function(b){return p.hasOwnProperty(b+"Provider")||a.hasOwnProperty(b)}}}b=!0===b;var k={},l=[],m=new Hb,p={$provide:{provider:d(c),factory:d(f),service:d(function(a,b){return f(a,["$injector",function(a){return a.instantiate(b)}])}),value:d(function(a,b){return f(a,la(b),!1)}),constant:d(function(a,b){Ia(a,"constant");p[a]=b;F[a]=b}),decorator:function(a,b){var c=n.get(a+"Provider"),d=c.$get;c.$get=function(){var a=v.invoke(d,c);return v.invoke(b,null,{$delegate:a})}}}},
-+        n=p.$injector=h(p,function(a,b){$.isString(b)&&l.push(b);throw Ba("unpr",l.join(" <- "));}),F={},s=h(F,function(a,b){var c=n.get(a+"Provider",b);return v.invoke(c.$get,c,void 0,a)}),v=s;p.$injectorProvider={$get:la(s)};v.modules=n.modules=S();var y=g(a),v=s.get("$injector");v.strictDi=b;r(y,function(a){a&&v.invoke(a)});v.loadNewModules=function(a){r(g(a),function(a){a&&v.invoke(a)})};return v}function pf(){var a=!0;this.disableAutoScrolling=function(){a=!1};this.$get=["$window","$location","$rootScope",
-+        function(b,d,c){function e(a){var b=null;Array.prototype.some.call(a,function(a){if("a"===ya(a))return b=a,!0});return b}function f(a){if(a){a.scrollIntoView();var c;c=g.yOffset;C(c)?c=c():Zb(c)?(c=c[0],c="fixed"!==b.getComputedStyle(c).position?0:c.getBoundingClientRect().bottom):Y(c)||(c=0);c&&(a=a.getBoundingClientRect().top,b.scrollBy(0,a-c))}else b.scrollTo(0,0)}function g(a){a=E(a)?a:Y(a)?a.toString():d.hash();var b;a?(b=h.getElementById(a))?f(b):(b=e(h.getElementsByName(a)))?f(b):"top"===a&&
-+            f(null):f(null)}var h=b.document;a&&c.$watch(function(){return d.hash()},function(a,b){a===b&&""===a||hg(function(){c.$evalAsync(g)})});return g}]}function jb(a,b){if(!a&&!b)return"";if(!a)return b;if(!b)return a;I(a)&&(a=a.join(" "));I(b)&&(b=b.join(" "));return a+" "+b}function qg(a){E(a)&&(a=a.split(" "));var b=S();r(a,function(a){a.length&&(b[a]=!0)});return b}function Ka(a){return B(a)?a:{}}function rg(a,b,d,c){function e(a){try{a.apply(null,xa.call(arguments,1))}finally{if(s--,0===s)for(;v.length;)try{v.pop()()}catch(b){d.error(b)}}}
-+        function f(){A=null;h()}function g(){y=H();y=x(y)?null:y;sa(y,J)&&(y=J);t=J=y}function h(){var a=t;g();if(Aa!==k.url()||a!==y)Aa=k.url(),t=y,r(G,function(a){a(k.url(),y)})}var k=this,l=a.location,m=a.history,p=a.setTimeout,n=a.clearTimeout,F={};k.isMock=!1;var s=0,v=[];k.$$completeOutstandingRequest=e;k.$$incOutstandingRequestCount=function(){s++};k.notifyWhenNoOutstandingRequests=function(a){0===s?a():v.push(a)};var y,t,Aa=l.href,hc=b.find("base"),A=null,H=c.history?function(){try{return m.state}catch(a){}}:
-+            D;g();k.url=function(b,d,e){x(e)&&(e=null);l!==a.location&&(l=a.location);m!==a.history&&(m=a.history);if(b){var f=t===e;if(Aa===b&&(!c.history||f))return k;var h=Aa&&La(Aa)===La(b);Aa=b;t=e;!c.history||h&&f?(h||(A=b),d?l.replace(b):h?(d=l,e=b.indexOf("#"),e=-1===e?"":b.substr(e),d.hash=e):l.href=b,l.href!==b&&(A=b)):(m[d?"replaceState":"pushState"](e,"",b),g());A&&(A=b);return k}return A||l.href.replace(/%27/g,"'")};k.state=function(){return y};var G=[],ba=!1,J=null;k.onUrlChange=function(b){if(!ba){if(c.history)z(a).on("popstate",
-+            f);z(a).on("hashchange",f);ba=!0}G.push(b);return b};k.$$applicationDestroyed=function(){z(a).off("hashchange popstate",f)};k.$$checkUrlChange=h;k.baseHref=function(){var a=hc.attr("href");return a?a.replace(/^(https?:)?\/\/[^/]*/,""):""};k.defer=function(a,b){var c;s++;c=p(function(){delete F[c];e(a)},b||0);F[c]=!0;return c};k.defer.cancel=function(a){return F[a]?(delete F[a],n(a),e(D),!0):!1}}function wf(){this.$get=["$window","$log","$sniffer","$document",function(a,b,d,c){return new rg(a,c,b,
-+        d)}]}function xf(){this.$get=function(){function a(a,c){function e(a){a!==p&&(n?n===a&&(n=a.n):n=a,f(a.n,a.p),f(a,p),p=a,p.n=null)}function f(a,b){a!==b&&(a&&(a.p=b),b&&(b.n=a))}if(a in b)throw K("$cacheFactory")("iid",a);var g=0,h=O({},c,{id:a}),k=S(),l=c&&c.capacity||Number.MAX_VALUE,m=S(),p=null,n=null;return b[a]={put:function(a,b){if(!x(b)){if(l<Number.MAX_VALUE){var c=m[a]||(m[a]={key:a});e(c)}a in k||g++;k[a]=b;g>l&&this.remove(n.key);return b}},get:function(a){if(l<Number.MAX_VALUE){var b=
-+            m[a];if(!b)return;e(b)}return k[a]},remove:function(a){if(l<Number.MAX_VALUE){var b=m[a];if(!b)return;b===p&&(p=b.p);b===n&&(n=b.n);f(b.n,b.p);delete m[a]}a in k&&(delete k[a],g--)},removeAll:function(){k=S();g=0;m=S();p=n=null},destroy:function(){m=h=k=null;delete b[a]},info:function(){return O({},h,{size:g})}}}var b={};a.info=function(){var a={};r(b,function(b,e){a[e]=b.info()});return a};a.get=function(a){return b[a]};return a}}function Uf(){this.$get=["$cacheFactory",function(a){return a("templates")}]}
-+    function Yc(a,b){function d(a,b,c){var d=/^\s*([@&<]|=(\*?))(\??)\s*([\w$]*)\s*$/,e=S();r(a,function(a,g){if(a in p)e[g]=p[a];else{var f=a.match(d);if(!f)throw ca("iscp",b,g,a,c?"controller bindings definition":"isolate scope definition");e[g]={mode:f[1][0],collection:"*"===f[2],optional:"?"===f[3],attrName:f[4]||g};f[4]&&(p[a]=e[g])}});return e}function c(a){var b=a.charAt(0);if(!b||b!==L(b))throw ca("baddir",a);if(a!==a.trim())throw ca("baddir",a);}function e(a){var b=a.require||a.controller&&a.name;
-+        !I(b)&&B(b)&&r(b,function(a,c){var d=a.match(l);a.substring(d[0].length)||(b[c]=d[0]+c)});return b}var f={},g=/^\s*directive:\s*([\w-]+)\s+(.*)$/,h=/(([\w-]+)(?::([^;]+))?;?)/,k=te("ngSrc,ngSrcset,src,srcset"),l=/^(?:(\^\^?)?(\?)?(\^\^?)?)?/,m=/^(on[a-z]+|formaction)$/,p=S();this.directive=function hc(b,d){hb(b,"name");Ia(b,"directive");E(b)?(c(b),hb(d,"directiveFactory"),f.hasOwnProperty(b)||(f[b]=[],a.factory(b+"Directive",["$injector","$exceptionHandler",function(a,c){var d=[];r(f[b],function(g,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             f){try{var h=a.invoke(g);C(h)?h={compile:la(h)}:!h.compile&&h.link&&(h.compile=la(h.link));h.priority=h.priority||0;h.index=f;h.name=h.name||b;h.require=e(h);var k=h,l=h.restrict;if(l&&(!E(l)||!/[EACM]/.test(l)))throw ca("badrestrict",l,b);k.restrict=l||"EA";h.$$moduleName=g.$$moduleName;d.push(h)}catch(m){c(m)}});return d}])),f[b].push(d)):r(b,Xb(hc));return this};this.component=function A(a,b){function c(a){function e(b){return C(b)||I(b)?function(c,d){return a.invoke(b,this,{$element:c,$attrs:d})}:
-+        b}var g=b.template||b.templateUrl?b.template:"",f={controller:d,controllerAs:sg(b.controller)||b.controllerAs||"$ctrl",template:e(g),templateUrl:e(b.templateUrl),transclude:b.transclude,scope:{},bindToController:b.bindings||{},restrict:"E",require:b.require};r(b,function(a,b){"$"===b.charAt(0)&&(f[b]=a)});return f}if(!E(a))return r(a,Xb(Ra(this,A))),this;var d=b.controller||function(){};r(b,function(a,b){"$"===b.charAt(0)&&(c[b]=a,C(d)&&(d[b]=a))});c.$inject=["$injector"];return this.directive(a,
-+        c)};this.aHrefSanitizationWhitelist=function(a){return u(a)?(b.aHrefSanitizationWhitelist(a),this):b.aHrefSanitizationWhitelist()};this.imgSrcSanitizationWhitelist=function(a){return u(a)?(b.imgSrcSanitizationWhitelist(a),this):b.imgSrcSanitizationWhitelist()};var n=!0;this.debugInfoEnabled=function(a){return u(a)?(n=a,this):n};var F=!1;this.preAssignBindingsEnabled=function(a){return u(a)?(F=a,this):F};var s=!1;this.strictComponentBindingsEnabled=function(a){return u(a)?(s=a,this):s};var v=10;this.onChangesTtl=
-+        function(a){return arguments.length?(v=a,this):v};var y=!0;this.commentDirectivesEnabled=function(a){return arguments.length?(y=a,this):y};var t=!0;this.cssClassDirectivesEnabled=function(a){return arguments.length?(t=a,this):t};this.$get=["$injector","$interpolate","$exceptionHandler","$templateRequest","$parse","$controller","$rootScope","$sce","$animate","$$sanitizeUri",function(a,b,c,e,p,R,M,T,P,q){function N(){try{if(!--Fa)throw ha=void 0,ca("infchng",v);M.$apply(function(){for(var a=[],b=0,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    c=ha.length;b<c;++b)try{ha[b]()}catch(d){a.push(d)}ha=void 0;if(a.length)throw a;})}finally{Fa++}}function qc(a,b){if(b){var c=Object.keys(b),d,e,g;d=0;for(e=c.length;d<e;d++)g=c[d],this[g]=b[g]}else this.$attr={};this.$$element=a}function Ta(a,b,c){Ba.innerHTML="<span "+b+">";b=Ba.firstChild.attributes;var d=b[0];b.removeNamedItem(d.name);d.value=c;a.attributes.setNamedItem(d)}function na(a,b){try{a.addClass(b)}catch(c){}}function da(a,b,c,d,e){a instanceof z||(a=z(a));var g=Ua(a,b,a,c,d,e);da.$$addScopeClass(a);
-+        var f=null;return function(b,c,d){if(!a)throw ca("multilink");hb(b,"scope");e&&e.needsNewScope&&(b=b.$parent.$new());d=d||{};var h=d.parentBoundTranscludeFn,k=d.transcludeControllers;d=d.futureParentElement;h&&h.$$boundTransclude&&(h=h.$$boundTransclude);f||(f=(d=d&&d[0])?"foreignobject"!==ya(d)&&ia.call(d).match(/SVG/)?"svg":"html":"html");d="html"!==f?z(ka(f,z("<div>").append(a).html())):c?Sa.clone.call(a):a;if(k)for(var l in k)d.data("$"+l+"Controller",k[l].instance);da.$$addScopeInfo(d,b);c&&
-+        c(d,b);g&&g(b,d,d,h);c||(a=g=null);return d}}function Ua(a,b,c,d,e,g){function f(a,c,d,e){var g,k,l,m,p,n,G;if(t)for(G=Array(c.length),m=0;m<h.length;m+=3)g=h[m],G[g]=c[g];else G=c;m=0;for(p=h.length;m<p;)k=G[h[m++]],c=h[m++],g=h[m++],c?(c.scope?(l=a.$new(),da.$$addScopeInfo(z(k),l)):l=a,n=c.transcludeOnThisElement?Ma(a,c.transclude,e):!c.templateOnThisElement&&e?e:!e&&b?Ma(a,b):null,c(g,l,k,d,n)):g&&g(a,k.childNodes,void 0,e)}for(var h=[],k=I(a)||a instanceof z,l,m,p,n,t,G=0;G<a.length;G++){l=new qc;
-+        11===Ca&&Da(a,G,k);m=K(a[G],[],l,0===G?d:void 0,e);(g=m.length?Y(m,a[G],l,b,c,null,[],[],g):null)&&g.scope&&da.$$addScopeClass(l.$$element);l=g&&g.terminal||!(p=a[G].childNodes)||!p.length?null:Ua(p,g?(g.transcludeOnThisElement||!g.templateOnThisElement)&&g.transclude:b);if(g||l)h.push(G,g,l),n=!0,t=t||g;g=null}return n?f:null}function Da(a,b,c){var d=a[b],e=d.parentNode,g;if(d.nodeType===Oa)for(;;){g=e?d.nextSibling:a[b+1];if(!g||g.nodeType!==Oa)break;d.nodeValue+=g.nodeValue;g.parentNode&&g.parentNode.removeChild(g);
-+        c&&g===a[b+1]&&a.splice(b+1,1)}}function Ma(a,b,c){function d(e,g,f,h,k){e||(e=a.$new(!1,k),e.$$transcluded=!0);return b(e,g,{parentBoundTranscludeFn:c,transcludeControllers:f,futureParentElement:h})}var e=d.$$slots=S(),g;for(g in b.$$slots)e[g]=b.$$slots[g]?Ma(a,b.$$slots[g],c):null;return d}function K(a,b,c,d,e){var g=c.$attr,f;switch(a.nodeType){case 1:f=ya(a);U(b,Ea(f),"E",d,e);for(var k,l,m,p,n=a.attributes,t=0,G=n&&n.length;t<G;t++){var H=!1,F=!1;k=n[t];l=k.name;m=k.value;k=Ea(l);(p=Pa.test(k))&&
-+    (l=l.replace(od,"").substr(8).replace(/_(.)/g,function(a,b){return b.toUpperCase()}));(k=k.match(Qa))&&$(k[1])&&(H=l,F=l.substr(0,l.length-5)+"end",l=l.substr(0,l.length-6));k=Ea(l.toLowerCase());g[k]=l;if(p||!c.hasOwnProperty(k))c[k]=m,kd(a,k)&&(c[k]=!0);wa(a,b,m,k,p);U(b,k,"A",d,e,H,F)}"input"===f&&"hidden"===a.getAttribute("type")&&a.setAttribute("autocomplete","off");if(!La)break;g=a.className;B(g)&&(g=g.animVal);if(E(g)&&""!==g)for(;a=h.exec(g);)k=Ea(a[2]),U(b,k,"C",d,e)&&(c[k]=Q(a[3])),g=g.substr(a.index+
-+        a[0].length);break;case Oa:oa(b,a.nodeValue);break;case 8:if(!Ka)break;rc(a,b,c,d,e)}b.sort(la);return b}function rc(a,b,c,d,e){try{var f=g.exec(a.nodeValue);if(f){var h=Ea(f[1]);U(b,h,"M",d,e)&&(c[h]=Q(f[2]))}}catch(k){}}function pd(a,b,c){var d=[],e=0;if(b&&a.hasAttribute&&a.hasAttribute(b)){do{if(!a)throw ca("uterdir",b,c);1===a.nodeType&&(a.hasAttribute(b)&&e++,a.hasAttribute(c)&&e--);d.push(a);a=a.nextSibling}while(0<e)}else d.push(a);return z(d)}function V(a,b,c){return function(d,e,g,f,h){e=
-+        pd(e[0],b,c);return a(d,e,g,f,h)}}function W(a,b,c,d,e,g){var f;return a?da(b,c,d,e,g):function(){f||(f=da(b,c,d,e,g),b=c=g=null);return f.apply(this,arguments)}}function Y(a,b,d,e,g,f,h,k,l){function m(a,b,c,d){if(a){c&&(a=V(a,c,d));a.require=s.require;a.directiveName=R;if(J===s||s.$$isolateScope)a=ta(a,{isolateScope:!0});h.push(a)}if(b){c&&(b=V(b,c,d));b.require=s.require;b.directiveName=R;if(J===s||s.$$isolateScope)b=ta(b,{isolateScope:!0});k.push(b)}}function p(a,e,g,f,l){function m(a,b,c,d){var e;
-+        bb(a)||(d=c,c=b,b=a,a=void 0);T&&(e=M);c||(c=T?ga.parent():ga);if(d){var g=l.$$slots[d];if(g)return g(a,b,e,c,N);if(x(g))throw ca("noslot",d,za(ga));}else return l(a,b,e,c,N)}var n,s,v,y,ba,M,R,ga;b===g?(f=d,ga=d.$$element):(ga=z(g),f=new qc(ga,d));ba=e;J?y=e.$new(!0):t&&(ba=e.$parent);l&&(R=m,R.$$boundTransclude=l,R.isSlotFilled=function(a){return!!l.$$slots[a]});H&&(M=ea(ga,f,R,H,y,e,J));J&&(da.$$addScopeInfo(ga,y,!0,!(A&&(A===J||A===J.$$originalDirective))),da.$$addScopeClass(ga,!0),y.$$isolateBindings=
-+        J.$$isolateBindings,s=qa(e,f,y,y.$$isolateBindings,J),s.removeWatches&&y.$on("$destroy",s.removeWatches));for(n in M){s=H[n];v=M[n];var P=s.$$bindings.bindToController;if(F){v.bindingInfo=P?qa(ba,f,v.instance,P,s):{};var q=v();q!==v.instance&&(v.instance=q,ga.data("$"+s.name+"Controller",q),v.bindingInfo.removeWatches&&v.bindingInfo.removeWatches(),v.bindingInfo=qa(ba,f,v.instance,P,s))}else v.instance=v(),ga.data("$"+s.name+"Controller",v.instance),v.bindingInfo=qa(ba,f,v.instance,P,s)}r(H,function(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 b){var c=a.require;a.bindToController&&!I(c)&&B(c)&&O(M[b].instance,X(b,c,ga,M))});r(M,function(a){var b=a.instance;if(C(b.$onChanges))try{b.$onChanges(a.bindingInfo.initialChanges)}catch(d){c(d)}if(C(b.$onInit))try{b.$onInit()}catch(e){c(e)}C(b.$doCheck)&&(ba.$watch(function(){b.$doCheck()}),b.$doCheck());C(b.$onDestroy)&&ba.$on("$destroy",function(){b.$onDestroy()})});n=0;for(s=h.length;n<s;n++)v=h[n],va(v,v.isolateScope?y:e,ga,f,v.require&&X(v.directiveName,v.require,ga,M),R);var N=e;J&&(J.template||
-+        null===J.templateUrl)&&(N=y);a&&a(N,g.childNodes,void 0,l);for(n=k.length-1;0<=n;n--)v=k[n],va(v,v.isolateScope?y:e,ga,f,v.require&&X(v.directiveName,v.require,ga,M),R);r(M,function(a){a=a.instance;C(a.$postLink)&&a.$postLink()})}l=l||{};for(var n=-Number.MAX_VALUE,t=l.newScopeDirective,H=l.controllerDirectives,J=l.newIsolateScopeDirective,A=l.templateDirective,y=l.nonTlbTranscludeDirective,ba=!1,M=!1,T=l.hasElementTranscludeDirective,v=d.$$element=z(b),s,R,P,q=e,N,u=!1,Ib=!1,w,Da=0,D=a.length;Da<
-+    D;Da++){s=a[Da];var Ta=s.$$start,E=s.$$end;Ta&&(v=pd(b,Ta,E));P=void 0;if(n>s.priority)break;if(w=s.scope)s.templateUrl||(B(w)?(aa("new/isolated scope",J||t,s,v),J=s):aa("new/isolated scope",J,s,v)),t=t||s;R=s.name;if(!u&&(s.replace&&(s.templateUrl||s.template)||s.transclude&&!s.$$tlb)){for(w=Da+1;u=a[w++];)if(u.transclude&&!u.$$tlb||u.replace&&(u.templateUrl||u.template)){Ib=!0;break}u=!0}!s.templateUrl&&s.controller&&(H=H||S(),aa("'"+R+"' controller",H[R],s,v),H[R]=s);if(w=s.transclude)if(ba=!0,
-+    s.$$tlb||(aa("transclusion",y,s,v),y=s),"element"===w)T=!0,n=s.priority,P=v,v=d.$$element=z(da.$$createComment(R,d[R])),b=v[0],ma(g,xa.call(P,0),b),P[0].$$parentNode=P[0].parentNode,q=W(Ib,P,e,n,f&&f.name,{nonTlbTranscludeDirective:y});else{var na=S();if(B(w)){P=[];var Ua=S(),Ma=S();r(w,function(a,b){var c="?"===a.charAt(0);a=c?a.substring(1):a;Ua[a]=b;na[b]=null;Ma[b]=c});r(v.contents(),function(a){var b=Ua[Ea(ya(a))];b?(Ma[b]=!0,na[b]=na[b]||[],na[b].push(a)):P.push(a)});r(Ma,function(a,b){if(!a)throw ca("reqslot",
-+        b);});for(var L in na)na[L]&&(na[L]=W(Ib,na[L],e))}else P=z(nc(b)).contents();v.empty();q=W(Ib,P,e,void 0,void 0,{needsNewScope:s.$$isolateScope||s.$$newScope});q.$$slots=na}if(s.template)if(M=!0,aa("template",A,s,v),A=s,w=C(s.template)?s.template(v,d):s.template,w=Ia(w),s.replace){f=s;P=kc.test(w)?qd(ka(s.templateNamespace,Q(w))):[];b=P[0];if(1!==P.length||1!==b.nodeType)throw ca("tplrt",R,"");ma(g,v,b);D={$attr:{}};w=K(b,[],D);var rc=a.splice(Da+1,a.length-(Da+1));(J||t)&&Z(w,J,t);a=a.concat(w).concat(rc);
-+        fa(d,D);D=a.length}else v.html(w);if(s.templateUrl)M=!0,aa("template",A,s,v),A=s,s.replace&&(f=s),p=ja(a.splice(Da,a.length-Da),v,d,g,ba&&q,h,k,{controllerDirectives:H,newScopeDirective:t!==s&&t,newIsolateScopeDirective:J,templateDirective:A,nonTlbTranscludeDirective:y}),D=a.length;else if(s.compile)try{N=s.compile(v,d,q);var U=s.$$originalDirective||s;C(N)?m(null,Ra(U,N),Ta,E):N&&m(Ra(U,N.pre),Ra(U,N.post),Ta,E)}catch($){c($,za(v))}s.terminal&&(p.terminal=!0,n=Math.max(n,s.priority))}p.scope=t&&
-+        !0===t.scope;p.transcludeOnThisElement=ba;p.templateOnThisElement=M;p.transclude=q;l.hasElementTranscludeDirective=T;return p}function X(a,b,c,d){var e;if(E(b)){var g=b.match(l);b=b.substring(g[0].length);var f=g[1]||g[3],g="?"===g[2];"^^"===f?c=c.parent():e=(e=d&&d[b])&&e.instance;if(!e){var h="$"+b+"Controller";e=f?c.inheritedData(h):c.data(h)}if(!e&&!g)throw ca("ctreq",b,a);}else if(I(b))for(e=[],f=0,g=b.length;f<g;f++)e[f]=X(a,b[f],c,d);else B(b)&&(e={},r(b,function(b,g){e[g]=X(a,b,c,d)}));return e||
-+        null}function ea(a,b,c,d,e,g,f){var h=S(),k;for(k in d){var l=d[k],m={$scope:l===f||l.$$isolateScope?e:g,$element:a,$attrs:b,$transclude:c},p=l.controller;"@"===p&&(p=b[l.name]);m=R(p,m,!0,l.controllerAs);h[l.name]=m;a.data("$"+l.name+"Controller",m.instance)}return h}function Z(a,b,c){for(var d=0,e=a.length;d<e;d++)a[d]=$b(a[d],{$$isolateScope:b,$$newScope:c})}function U(b,c,e,g,h,k,l){if(c===h)return null;var m=null;if(f.hasOwnProperty(c)){h=a.get(c+"Directive");for(var p=0,n=h.length;p<n;p++)if(c=
-+        h[p],(x(g)||g>c.priority)&&-1!==c.restrict.indexOf(e)){k&&(c=$b(c,{$$start:k,$$end:l}));if(!c.$$bindings){var t=m=c,G=c.name,H={isolateScope:null,bindToController:null};B(t.scope)&&(!0===t.bindToController?(H.bindToController=d(t.scope,G,!0),H.isolateScope={}):H.isolateScope=d(t.scope,G,!1));B(t.bindToController)&&(H.bindToController=d(t.bindToController,G,!0));if(H.bindToController&&!t.controller)throw ca("noctrl",G);m=m.$$bindings=H;B(m.isolateScope)&&(c.$$isolateBindings=m.isolateScope)}b.push(c);
-+        m=c}}return m}function $(b){if(f.hasOwnProperty(b))for(var c=a.get(b+"Directive"),d=0,e=c.length;d<e;d++)if(b=c[d],b.multiElement)return!0;return!1}function fa(a,b){var c=b.$attr,d=a.$attr;r(a,function(d,e){"$"!==e.charAt(0)&&(b[e]&&b[e]!==d&&(d=d.length?d+(("style"===e?";":" ")+b[e]):b[e]),a.$set(e,d,!0,c[e]))});r(b,function(b,e){a.hasOwnProperty(e)||"$"===e.charAt(0)||(a[e]=b,"class"!==e&&"style"!==e&&(d[e]=c[e]))})}function ja(a,b,d,g,f,h,k,l){var m=[],p,n,t=b[0],H=a.shift(),s=$b(H,{templateUrl:null,
-+        transclude:null,replace:null,$$originalDirective:H}),F=C(H.templateUrl)?H.templateUrl(b,d):H.templateUrl,v=H.templateNamespace;b.empty();e(F).then(function(c){var e,G;c=Ia(c);if(H.replace){c=kc.test(c)?qd(ka(v,Q(c))):[];e=c[0];if(1!==c.length||1!==e.nodeType)throw ca("tplrt",H.name,F);c={$attr:{}};ma(g,b,e);var J=K(e,[],c);B(H.scope)&&Z(J,!0);a=J.concat(a);fa(d,c)}else e=t,b.html(c);a.unshift(s);p=Y(a,e,d,f,b,H,h,k,l);r(g,function(a,c){a===e&&(g[c]=b[0])});for(n=Ua(b[0].childNodes,f);m.length;){c=
-+        m.shift();G=m.shift();var y=m.shift(),A=m.shift(),J=b[0];if(!c.$$destroyed){if(G!==t){var M=G.className;l.hasElementTranscludeDirective&&H.replace||(J=nc(e));ma(y,z(G),J);na(z(J),M)}G=p.transcludeOnThisElement?Ma(c,p.transclude,A):A;p(n,c,J,g,G)}}m=null}).catch(function(a){bc(a)&&c(a)});return function(a,b,c,d,e){a=e;b.$$destroyed||(m?m.push(b,c,d,a):(p.transcludeOnThisElement&&(a=Ma(b,p.transclude,e)),p(n,b,c,d,a)))}}function la(a,b){var c=b.priority-a.priority;return 0!==c?c:a.name!==b.name?a.name<
-+    b.name?-1:1:a.index-b.index}function aa(a,b,c,d){function e(a){return a?" (module: "+a+")":""}if(b)throw ca("multidir",b.name,e(b.$$moduleName),c.name,e(c.$$moduleName),a,za(d));}function oa(a,c){var d=b(c,!0);d&&a.push({priority:0,compile:function(a){a=a.parent();var b=!!a.length;b&&da.$$addBindingClass(a);return function(a,c){var e=c.parent();b||da.$$addBindingClass(e);da.$$addBindingInfo(e,d.expressions);a.$watch(d,function(a){c[0].nodeValue=a})}}})}function ka(a,b){a=L(a||"html");switch(a){case "svg":case "math":var c=
-+        w.document.createElement("div");c.innerHTML="<"+a+">"+b+"</"+a+">";return c.childNodes[0].childNodes;default:return b}}function ua(a,b){if("srcdoc"===b)return T.HTML;var c=ya(a);if("src"===b||"ngSrc"===b){if(-1===["img","video","audio","source","track"].indexOf(c))return T.RESOURCE_URL}else if("xlinkHref"===b||"form"===c&&"action"===b||"link"===c&&"href"===b)return T.RESOURCE_URL}function wa(a,c,d,e,g){var f=ua(a,e),h=k[e]||g,l=b(d,!g,f,h);if(l){if("multiple"===e&&"select"===ya(a))throw ca("selmulti",
-+        za(a));if(m.test(e))throw ca("nodomevents");c.push({priority:100,compile:function(){return{pre:function(a,c,g){c=g.$$observers||(g.$$observers=S());var k=g[e];k!==d&&(l=k&&b(k,!0,f,h),d=k);l&&(g[e]=l(a),(c[e]||(c[e]=[])).$$inter=!0,(g.$$observers&&g.$$observers[e].$$scope||a).$watch(l,function(a,b){"class"===e&&a!==b?g.$updateClass(a,b):g.$set(e,a)}))}}}})}}function ma(a,b,c){var d=b[0],e=b.length,g=d.parentNode,f,h;if(a)for(f=0,h=a.length;f<h;f++)if(a[f]===d){a[f++]=c;h=f+e-1;for(var k=a.length;f<
-+    k;f++,h++)h<k?a[f]=a[h]:delete a[f];a.length-=e-1;a.context===d&&(a.context=c);break}g&&g.replaceChild(c,d);a=w.document.createDocumentFragment();for(f=0;f<e;f++)a.appendChild(b[f]);z.hasData(d)&&(z.data(c,z.data(d)),z(d).off("$destroy"));z.cleanData(a.querySelectorAll("*"));for(f=1;f<e;f++)delete b[f];b[0]=c;b.length=1}function ta(a,b){return O(function(){return a.apply(null,arguments)},a,b)}function va(a,b,d,e,g,f){try{a(b,d,e,g,f)}catch(h){c(h,za(d))}}function pa(a,b){if(s)throw ca("missingattr",
-+        a,b);}function qa(a,c,d,e,g){function f(b,c,e){C(d.$onChanges)&&!cc(c,e)&&(ha||(a.$$postDigest(N),ha=[]),m||(m={},ha.push(h)),m[b]&&(e=m[b].previousValue),m[b]=new Jb(e,c))}function h(){d.$onChanges(m);m=void 0}var k=[],l={},m;r(e,function(e,h){var m=e.attrName,n=e.optional,t,G,s,F;switch(e.mode){case "@":n||ra.call(c,m)||(pa(m,g.name),d[h]=c[m]=void 0);n=c.$observe(m,function(a){if(E(a)||Na(a))f(h,a,d[h]),d[h]=a});c.$$observers[m].$$scope=a;t=c[m];E(t)?d[h]=b(t)(a):Na(t)&&(d[h]=t);l[h]=new Jb(sc,
-+        d[h]);k.push(n);break;case "=":if(!ra.call(c,m)){if(n)break;pa(m,g.name);c[m]=void 0}if(n&&!c[m])break;G=p(c[m]);F=G.literal?sa:cc;s=G.assign||function(){t=d[h]=G(a);throw ca("nonassign",c[m],m,g.name);};t=d[h]=G(a);n=function(b){F(b,d[h])||(F(b,t)?s(a,b=d[h]):d[h]=b);return t=b};n.$stateful=!0;n=e.collection?a.$watchCollection(c[m],n):a.$watch(p(c[m],n),null,G.literal);k.push(n);break;case "<":if(!ra.call(c,m)){if(n)break;pa(m,g.name);c[m]=void 0}if(n&&!c[m])break;G=p(c[m]);var v=G.literal,y=d[h]=
-+        G(a);l[h]=new Jb(sc,d[h]);n=a.$watch(G,function(a,b){if(b===a){if(b===y||v&&sa(b,y))return;b=y}f(h,a,b);d[h]=a},v);k.push(n);break;case "&":n||ra.call(c,m)||pa(m,g.name);G=c.hasOwnProperty(m)?p(c[m]):D;if(G===D&&n)break;d[h]=function(b){return G(a,b)}}});return{initialChanges:l,removeWatches:k.length&&function(){for(var a=0,b=k.length;a<b;++a)k[a]()}}}var Ja=/^\w/,Ba=w.document.createElement("div"),Ka=y,La=t,Fa=v,ha;qc.prototype={$normalize:Ea,$addClass:function(a){a&&0<a.length&&P.addClass(this.$$element,
-+            a)},$removeClass:function(a){a&&0<a.length&&P.removeClass(this.$$element,a)},$updateClass:function(a,b){var c=rd(a,b);c&&c.length&&P.addClass(this.$$element,c);(c=rd(b,a))&&c.length&&P.removeClass(this.$$element,c)},$set:function(a,b,d,e){var g=kd(this.$$element[0],a),f=sd[a],h=a;g?(this.$$element.prop(a,b),e=g):f&&(this[f]=b,h=f);this[a]=b;e?this.$attr[a]=e:(e=this.$attr[a])||(this.$attr[a]=e=Vc(a,"-"));g=ya(this.$$element);if("a"===g&&("href"===a||"xlinkHref"===a)||"img"===g&&"src"===a)this[a]=
-+            b=q(b,"src"===a);else if("img"===g&&"srcset"===a&&u(b)){for(var g="",f=Q(b),k=/(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/,k=/\s/.test(f)?k:/(,)/,f=f.split(k),k=Math.floor(f.length/2),l=0;l<k;l++)var m=2*l,g=g+q(Q(f[m]),!0),g=g+(" "+Q(f[m+1]));f=Q(f[2*l]).split(/\s/);g+=q(Q(f[0]),!0);2===f.length&&(g+=" "+Q(f[1]));this[a]=b=g}!1!==d&&(null===b||x(b)?this.$$element.removeAttr(e):Ja.test(e)?this.$$element.attr(e,b):Ta(this.$$element[0],e,b));(a=this.$$observers)&&r(a[h],function(a){try{a(b)}catch(d){c(d)}})},
-+        $observe:function(a,b){var c=this,d=c.$$observers||(c.$$observers=S()),e=d[a]||(d[a]=[]);e.push(b);M.$evalAsync(function(){e.$$inter||!c.hasOwnProperty(a)||x(c[a])||b(c[a])});return function(){cb(e,b)}}};var Ga=b.startSymbol(),Ha=b.endSymbol(),Ia="{{"===Ga&&"}}"===Ha?ab:function(a){return a.replace(/\{\{/g,Ga).replace(/}}/g,Ha)},Pa=/^ngAttr[A-Z]/,Qa=/^(.+)Start$/;da.$$addBindingInfo=n?function(a,b){var c=a.data("$binding")||[];I(b)?c=c.concat(b):c.push(b);a.data("$binding",c)}:D;da.$$addBindingClass=
-+        n?function(a){na(a,"ng-binding")}:D;da.$$addScopeInfo=n?function(a,b,c,d){a.data(c?d?"$isolateScopeNoTemplate":"$isolateScope":"$scope",b)}:D;da.$$addScopeClass=n?function(a,b){na(a,b?"ng-isolate-scope":"ng-scope")}:D;da.$$createComment=function(a,b){var c="";n&&(c=" "+(a||"")+": ",b&&(c+=b+" "));return w.document.createComment(c)};return da}]}function Jb(a,b){this.previousValue=a;this.currentValue=b}function Ea(a){return a.replace(od,"").replace(tg,function(a,d,c){return c?d.toUpperCase():d})}function rd(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       b){var d="",c=a.split(/\s+/),e=b.split(/\s+/),f=0;a:for(;f<c.length;f++){for(var g=c[f],h=0;h<e.length;h++)if(g===e[h])continue a;d+=(0<d.length?" ":"")+g}return d}function qd(a){a=z(a);var b=a.length;if(1>=b)return a;for(;b--;){var d=a[b];(8===d.nodeType||d.nodeType===Oa&&""===d.nodeValue.trim())&&ug.call(a,b,1)}return a}function sg(a,b){if(b&&E(b))return b;if(E(a)){var d=td.exec(a);if(d)return d[3]}}function yf(){var a={},b=!1;this.has=function(b){return a.hasOwnProperty(b)};this.register=function(b,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                c){Ia(b,"controller");B(b)?O(a,b):a[b]=c};this.allowGlobals=function(){b=!0};this.$get=["$injector","$window",function(d,c){function e(a,b,c,d){if(!a||!B(a.$scope))throw K("$controller")("noscp",d,b);a.$scope[b]=c}return function(f,g,h,k){var l,m,p;h=!0===h;k&&E(k)&&(p=k);if(E(f)){k=f.match(td);if(!k)throw ud("ctrlfmt",f);m=k[1];p=p||k[3];f=a.hasOwnProperty(m)?a[m]:Xc(g.$scope,m,!0)||(b?Xc(c,m,!0):void 0);if(!f)throw ud("ctrlreg",m);sb(f,m,!0)}if(h)return h=(I(f)?f[f.length-1]:f).prototype,l=Object.create(h||
-+        null),p&&e(g,p,l,m||f.name),O(function(){var a=d.invoke(f,l,g,m);a!==l&&(B(a)||C(a))&&(l=a,p&&e(g,p,l,m||f.name));return l},{instance:l,identifier:p});l=d.instantiate(f,g,m);p&&e(g,p,l,m||f.name);return l}}]}function zf(){this.$get=["$window",function(a){return z(a.document)}]}function Af(){this.$get=["$document","$rootScope",function(a,b){function d(){e=c.hidden}var c=a[0],e=c&&c.hidden;a.on("visibilitychange",d);b.$on("$destroy",function(){a.off("visibilitychange",d)});return function(){return e}}]}
-+    function Bf(){this.$get=["$log",function(a){return function(b,d){a.error.apply(a,arguments)}}]}function tc(a){return B(a)?fa(a)?a.toISOString():eb(a):a}function Gf(){this.$get=function(){return function(a){if(!a)return"";var b=[];Oc(a,function(a,c){null===a||x(a)||C(a)||(I(a)?r(a,function(a){b.push(ja(c)+"="+ja(tc(a)))}):b.push(ja(c)+"="+ja(tc(a))))});return b.join("&")}}}function Hf(){this.$get=function(){return function(a){function b(a,e,f){null===a||x(a)||(I(a)?r(a,function(a,c){b(a,e+"["+(B(a)?
-+        c:"")+"]")}):B(a)&&!fa(a)?Oc(a,function(a,c){b(a,e+(f?"":"[")+c+(f?"":"]"))}):d.push(ja(e)+"="+ja(tc(a))))}if(!a)return"";var d=[];b(a,"",!0);return d.join("&")}}}function uc(a,b){if(E(a)){var d=a.replace(vg,"").trim();if(d){var c=b("Content-Type"),c=c&&0===c.indexOf(vd),e;(e=c)||(e=(e=d.match(wg))&&xg[e[0]].test(d));if(e)try{a=Rc(d)}catch(f){if(!c)return a;throw Kb("baddata",a,f);}}}return a}function wd(a){var b=S(),d;E(a)?r(a.split("\n"),function(a){d=a.indexOf(":");var e=L(Q(a.substr(0,d)));a=
-+        Q(a.substr(d+1));e&&(b[e]=b[e]?b[e]+", "+a:a)}):B(a)&&r(a,function(a,d){var f=L(d),g=Q(a);f&&(b[f]=b[f]?b[f]+", "+g:g)});return b}function xd(a){var b;return function(d){b||(b=wd(a));return d?(d=b[L(d)],void 0===d&&(d=null),d):b}}function yd(a,b,d,c){if(C(c))return c(a,b,d);r(c,function(c){a=c(a,b,d)});return a}function Ff(){var a=this.defaults={transformResponse:[uc],transformRequest:[function(a){return B(a)&&"[object File]"!==ia.call(a)&&"[object Blob]"!==ia.call(a)&&"[object FormData]"!==ia.call(a)?
-+            eb(a):a}],headers:{common:{Accept:"application/json, text/plain, */*"},post:ka(vc),put:ka(vc),patch:ka(vc)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",paramSerializer:"$httpParamSerializer",jsonpCallbackParam:"callback"},b=!1;this.useApplyAsync=function(a){return u(a)?(b=!!a,this):b};var d=this.interceptors=[];this.$get=["$browser","$httpBackend","$$cookieReader","$cacheFactory","$rootScope","$q","$injector","$sce",function(c,e,f,g,h,k,l,m){function p(b){function d(a,b){for(var c=0,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              e=b.length;c<e;){var g=b[c++],f=b[c++];a=a.then(g,f)}b.length=0;return a}function e(a,b){var c,d={};r(a,function(a,e){C(a)?(c=a(b),null!=c&&(d[e]=c)):d[e]=a});return d}function g(a){var b=O({},a);b.data=yd(a.data,a.headers,a.status,f.transformResponse);a=a.status;return 200<=a&&300>a?b:k.reject(b)}if(!B(b))throw K("$http")("badreq",b);if(!E(m.valueOf(b.url)))throw K("$http")("badreq",b.url);var f=O({method:"get",transformRequest:a.transformRequest,transformResponse:a.transformResponse,paramSerializer:a.paramSerializer,
-+        jsonpCallbackParam:a.jsonpCallbackParam},b);f.headers=function(b){var c=a.headers,d=O({},b.headers),g,f,h,c=O({},c.common,c[L(b.method)]);a:for(g in c){f=L(g);for(h in d)if(L(h)===f)continue a;d[g]=c[g]}return e(d,ka(b))}(b);f.method=ub(f.method);f.paramSerializer=E(f.paramSerializer)?l.get(f.paramSerializer):f.paramSerializer;c.$$incOutstandingRequestCount();var h=[],p=[];b=k.resolve(f);r(y,function(a){(a.request||a.requestError)&&h.unshift(a.request,a.requestError);(a.response||a.responseError)&&
-+    p.push(a.response,a.responseError)});b=d(b,h);b=b.then(function(b){var c=b.headers,d=yd(b.data,xd(c),void 0,b.transformRequest);x(d)&&r(c,function(a,b){"content-type"===L(b)&&delete c[b]});x(b.withCredentials)&&!x(a.withCredentials)&&(b.withCredentials=a.withCredentials);return n(b,d).then(g,g)});b=d(b,p);return b=b.finally(function(){c.$$completeOutstandingRequest(D)})}function n(c,d){function g(a){if(a){var c={};r(a,function(a,d){c[d]=function(c){function d(){a(c)}b?h.$applyAsync(d):h.$$phase?d():
-+        h.$apply(d)}});return c}}function l(a,c,d,e,g){function f(){n(c,a,d,e,g)}M&&(200<=a&&300>a?M.put(N,[a,c,wd(d),e,g]):M.remove(N));b?h.$applyAsync(f):(f(),h.$$phase||h.$apply())}function n(a,b,d,e,g){b=-1<=b?b:0;(200<=b&&300>b?J.resolve:J.reject)({data:a,status:b,headers:xd(d),config:c,statusText:e,xhrStatus:g})}function G(a){n(a.data,a.status,ka(a.headers()),a.statusText,a.xhrStatus)}function y(){var a=p.pendingRequests.indexOf(c);-1!==a&&p.pendingRequests.splice(a,1)}var J=k.defer(),R=J.promise,M,
-+        T,P=c.headers,q="jsonp"===L(c.method),N=c.url;q?N=m.getTrustedResourceUrl(N):E(N)||(N=m.valueOf(N));N=F(N,c.paramSerializer(c.params));q&&(N=s(N,c.jsonpCallbackParam));p.pendingRequests.push(c);R.then(y,y);!c.cache&&!a.cache||!1===c.cache||"GET"!==c.method&&"JSONP"!==c.method||(M=B(c.cache)?c.cache:B(a.cache)?a.cache:v);M&&(T=M.get(N),u(T)?T&&C(T.then)?T.then(G,G):I(T)?n(T[1],T[0],ka(T[2]),T[3],T[4]):n(T,200,{},"OK","complete"):M.put(N,R));x(T)&&((T=zd(c.url)?f()[c.xsrfCookieName||a.xsrfCookieName]:
-+        void 0)&&(P[c.xsrfHeaderName||a.xsrfHeaderName]=T),e(c.method,N,d,l,P,c.timeout,c.withCredentials,c.responseType,g(c.eventHandlers),g(c.uploadEventHandlers)));return R}function F(a,b){0<b.length&&(a+=(-1===a.indexOf("?")?"?":"&")+b);return a}function s(a,b){var c=a.split("?");if(2<c.length)throw Kb("badjsonp",a);c=ec(c[1]);r(c,function(c,d){if("JSON_CALLBACK"===c)throw Kb("badjsonp",a);if(d===b)throw Kb("badjsonp",b,a);});return a+=(-1===a.indexOf("?")?"?":"&")+b+"=JSON_CALLBACK"}var v=g("$http");
-+        a.paramSerializer=E(a.paramSerializer)?l.get(a.paramSerializer):a.paramSerializer;var y=[];r(d,function(a){y.unshift(E(a)?l.get(a):l.invoke(a))});p.pendingRequests=[];(function(a){r(arguments,function(a){p[a]=function(b,c){return p(O({},c||{},{method:a,url:b}))}})})("get","delete","head","jsonp");(function(a){r(arguments,function(a){p[a]=function(b,c,d){return p(O({},d||{},{method:a,url:b,data:c}))}})})("post","put","patch");p.defaults=a;return p}]}function Jf(){this.$get=function(){return function(){return new w.XMLHttpRequest}}}
-+    function If(){this.$get=["$browser","$jsonpCallbacks","$document","$xhrFactory",function(a,b,d,c){return yg(a,c,a.defer,b,d[0])}]}function yg(a,b,d,c,e){function f(a,b,d){a=a.replace("JSON_CALLBACK",b);var f=e.createElement("script"),m=null;f.type="text/javascript";f.src=a;f.async=!0;m=function(a){f.removeEventListener("load",m);f.removeEventListener("error",m);e.body.removeChild(f);f=null;var g=-1,F="unknown";a&&("load"!==a.type||c.wasCalled(b)||(a={type:"error"}),F=a.type,g="error"===a.type?404:
-+        200);d&&d(g,F)};f.addEventListener("load",m);f.addEventListener("error",m);e.body.appendChild(f);return m}return function(e,h,k,l,m,p,n,F,s,v){function y(){q&&q();A&&A.abort()}function t(a,b,c,e,g,f){u(G)&&d.cancel(G);q=A=null;a(b,c,e,g,f)}h=h||a.url();if("jsonp"===L(e))var Aa=c.createCallback(h),q=f(h,Aa,function(a,b){var d=200===a&&c.getResponse(Aa);t(l,a,d,"",b,"complete");c.removeCallback(Aa)});else{var A=b(e,h);A.open(e,h,!0);r(m,function(a,b){u(a)&&A.setRequestHeader(b,a)});A.onload=function(){var a=
-+        A.statusText||"",b="response"in A?A.response:A.responseText,c=1223===A.status?204:A.status;0===c&&(c=b?200:"file"===ta(h).protocol?404:0);t(l,c,b,A.getAllResponseHeaders(),a,"complete")};A.onerror=function(){t(l,-1,null,null,"","error")};A.onabort=function(){t(l,-1,null,null,"","abort")};A.ontimeout=function(){t(l,-1,null,null,"","timeout")};r(s,function(a,b){A.addEventListener(b,a)});r(v,function(a,b){A.upload.addEventListener(b,a)});n&&(A.withCredentials=!0);if(F)try{A.responseType=F}catch(H){if("json"!==
-+        F)throw H;}A.send(x(k)?null:k)}if(0<p)var G=d(y,p);else p&&C(p.then)&&p.then(y)}}function Df(){var a="{{",b="}}";this.startSymbol=function(b){return b?(a=b,this):a};this.endSymbol=function(a){return a?(b=a,this):b};this.$get=["$parse","$exceptionHandler","$sce",function(d,c,e){function f(a){return"\\\\\\"+a}function g(c){return c.replace(p,a).replace(n,b)}function h(a,b,c,d){var e=a.$watch(function(a){e();return d(a)},b,c);return e}function k(f,k,p,n){function t(a){try{var b=a;a=p?e.getTrusted(p,
-+        b):e.valueOf(b);return n&&!u(a)?a:gc(a)}catch(d){c(Fa.interr(f,d))}}if(!f.length||-1===f.indexOf(a)){var r;k||(k=g(f),r=la(k),r.exp=f,r.expressions=[],r.$$watchDelegate=h);return r}n=!!n;var q,A,H=0,G=[],ba=[];r=f.length;for(var J=[],R=[];H<r;)if(-1!==(q=f.indexOf(a,H))&&-1!==(A=f.indexOf(b,q+l)))H!==q&&J.push(g(f.substring(H,q))),H=f.substring(q+l,A),G.push(H),ba.push(d(H,t)),H=A+m,R.push(J.length),J.push("");else{H!==r&&J.push(g(f.substring(H)));break}p&&1<J.length&&Fa.throwNoconcat(f);if(!k||G.length){var M=
-+        function(a){for(var b=0,c=G.length;b<c;b++){if(n&&x(a[b]))return;J[R[b]]=a[b]}return J.join("")};return O(function(a){var b=0,d=G.length,e=Array(d);try{for(;b<d;b++)e[b]=ba[b](a);return M(e)}catch(g){c(Fa.interr(f,g))}},{exp:f,expressions:G,$$watchDelegate:function(a,b){var c;return a.$watchGroup(ba,function(d,e){var g=M(d);b.call(this,g,d!==e?c:g,a);c=g})}})}}var l=a.length,m=b.length,p=new RegExp(a.replace(/./g,f),"g"),n=new RegExp(b.replace(/./g,f),"g");k.startSymbol=function(){return a};k.endSymbol=
-+        function(){return b};return k}]}function Ef(){this.$get=["$rootScope","$window","$q","$$q","$browser",function(a,b,d,c,e){function f(f,k,l,m){function p(){n?f.apply(null,F):f(y)}var n=4<arguments.length,F=n?xa.call(arguments,4):[],s=b.setInterval,v=b.clearInterval,y=0,t=u(m)&&!m,r=(t?c:d).defer(),q=r.promise;l=u(l)?l:0;q.$$intervalId=s(function(){t?e.defer(p):a.$evalAsync(p);r.notify(y++);0<l&&y>=l&&(r.resolve(y),v(q.$$intervalId),delete g[q.$$intervalId]);t||a.$apply()},k);g[q.$$intervalId]=r;return q}
-+        var g={};f.cancel=function(a){return a&&a.$$intervalId in g?(g[a.$$intervalId].promise.$$state.pur=!0,g[a.$$intervalId].reject("canceled"),b.clearInterval(a.$$intervalId),delete g[a.$$intervalId],!0):!1};return f}]}function wc(a){a=a.split("/");for(var b=a.length;b--;)a[b]=fb(a[b].replace(/%2F/g,"/"));return a.join("/")}function Ad(a,b){var d=ta(a);b.$$protocol=d.protocol;b.$$host=d.hostname;b.$$port=Z(d.port)||zg[d.protocol]||null}function Bd(a,b,d){if(Ag.test(a))throw kb("badpath",a);var c="/"!==
-+        a.charAt(0);c&&(a="/"+a);a=ta(a);for(var c=(c&&"/"===a.pathname.charAt(0)?a.pathname.substring(1):a.pathname).split("/"),e=c.length;e--;)c[e]=decodeURIComponent(c[e]),d&&(c[e]=c[e].replace(/\//g,"%2F"));d=c.join("/");b.$$path=d;b.$$search=ec(a.search);b.$$hash=decodeURIComponent(a.hash);b.$$path&&"/"!==b.$$path.charAt(0)&&(b.$$path="/"+b.$$path)}function xc(a,b){return a.slice(0,b.length)===b}function ua(a,b){if(xc(b,a))return b.substr(a.length)}function La(a){var b=a.indexOf("#");return-1===b?a:
-+        a.substr(0,b)}function lb(a){return a.replace(/(#.+)|#$/,"$1")}function yc(a,b,d){this.$$html5=!0;d=d||"";Ad(a,this);this.$$parse=function(a){var d=ua(b,a);if(!E(d))throw kb("ipthprfx",a,b);Bd(d,this,!0);this.$$path||(this.$$path="/");this.$$compose()};this.$$compose=function(){var a=fc(this.$$search),d=this.$$hash?"#"+fb(this.$$hash):"";this.$$url=wc(this.$$path)+(a?"?"+a:"")+d;this.$$absUrl=b+this.$$url.substr(1);this.$$urlUpdatedByLocation=!0};this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),
-+        !0;var f,g;u(f=ua(a,c))?(g=f,g=d&&u(f=ua(d,f))?b+(ua("/",f)||f):a+g):u(f=ua(b,c))?g=b+f:b===c+"/"&&(g=b);g&&this.$$parse(g);return!!g}}function zc(a,b,d){Ad(a,this);this.$$parse=function(c){var e=ua(a,c)||ua(b,c),f;x(e)||"#"!==e.charAt(0)?this.$$html5?f=e:(f="",x(e)&&(a=c,this.replace())):(f=ua(d,e),x(f)&&(f=e));Bd(f,this,!1);c=this.$$path;var e=a,g=/^\/[A-Z]:(\/.*)/;xc(f,e)&&(f=f.replace(e,""));g.exec(f)||(c=(f=g.exec(c))?f[1]:c);this.$$path=c;this.$$compose()};this.$$compose=function(){var b=fc(this.$$search),
-+        e=this.$$hash?"#"+fb(this.$$hash):"";this.$$url=wc(this.$$path)+(b?"?"+b:"")+e;this.$$absUrl=a+(this.$$url?d+this.$$url:"");this.$$urlUpdatedByLocation=!0};this.$$parseLinkUrl=function(b,d){return La(a)===La(b)?(this.$$parse(b),!0):!1}}function Cd(a,b,d){this.$$html5=!0;zc.apply(this,arguments);this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),!0;var f,g;a===La(c)?f=c:(g=ua(b,c))?f=a+d+g:b===c+"/"&&(f=b);f&&this.$$parse(f);return!!f};this.$$compose=function(){var b=fc(this.$$search),
-+        e=this.$$hash?"#"+fb(this.$$hash):"";this.$$url=wc(this.$$path)+(b?"?"+b:"")+e;this.$$absUrl=a+d+this.$$url;this.$$urlUpdatedByLocation=!0}}function Lb(a){return function(){return this[a]}}function Dd(a,b){return function(d){if(x(d))return this[a];this[a]=b(d);this.$$compose();return this}}function Lf(){var a="!",b={enabled:!1,requireBase:!0,rewriteLinks:!0};this.hashPrefix=function(b){return u(b)?(a=b,this):a};this.html5Mode=function(a){if(Na(a))return b.enabled=a,this;if(B(a)){Na(a.enabled)&&(b.enabled=
-+        a.enabled);Na(a.requireBase)&&(b.requireBase=a.requireBase);if(Na(a.rewriteLinks)||E(a.rewriteLinks))b.rewriteLinks=a.rewriteLinks;return this}return b};this.$get=["$rootScope","$browser","$sniffer","$rootElement","$window",function(d,c,e,f,g){function h(a,b,d){var e=l.url(),g=l.$$state;try{c.url(a,b,d),l.$$state=c.state()}catch(f){throw l.url(e),l.$$state=g,f;}}function k(a,b){d.$broadcast("$locationChangeSuccess",l.absUrl(),a,l.$$state,b)}var l,m;m=c.baseHref();var p=c.url(),n;if(b.enabled){if(!m&&
-+        b.requireBase)throw kb("nobase");n=p.substring(0,p.indexOf("/",p.indexOf("//")+2))+(m||"/");m=e.history?yc:Cd}else n=La(p),m=zc;var F=n.substr(0,La(n).lastIndexOf("/")+1);l=new m(n,F,"#"+a);l.$$parseLinkUrl(p,p);l.$$state=c.state();var s=/^\s*(javascript|mailto):/i;f.on("click",function(a){var e=b.rewriteLinks;if(e&&!a.ctrlKey&&!a.metaKey&&!a.shiftKey&&2!==a.which&&2!==a.button){for(var h=z(a.target);"a"!==ya(h[0]);)if(h[0]===f[0]||!(h=h.parent())[0])return;if(!E(e)||!x(h.attr(e))){var e=h.prop("href"),
-+        k=h.attr("href")||h.attr("xlink:href");B(e)&&"[object SVGAnimatedString]"===e.toString()&&(e=ta(e.animVal).href);s.test(e)||!e||h.attr("target")||a.isDefaultPrevented()||!l.$$parseLinkUrl(e,k)||(a.preventDefault(),l.absUrl()!==c.url()&&(d.$apply(),g.angular["ff-684208-preventDefault"]=!0))}}});lb(l.absUrl())!==lb(p)&&c.url(l.absUrl(),!0);var v=!0;c.onUrlChange(function(a,b){xc(a,F)?(d.$evalAsync(function(){var c=l.absUrl(),e=l.$$state,g;a=lb(a);l.$$parse(a);l.$$state=b;g=d.$broadcast("$locationChangeStart",
-+        a,c,b,e).defaultPrevented;l.absUrl()===a&&(g?(l.$$parse(c),l.$$state=e,h(c,!1,e)):(v=!1,k(c,e)))}),d.$$phase||d.$digest()):g.location.href=a});d.$watch(function(){if(v||l.$$urlUpdatedByLocation){l.$$urlUpdatedByLocation=!1;var a=lb(c.url()),b=lb(l.absUrl()),g=c.state(),f=l.$$replace,m=a!==b||l.$$html5&&e.history&&g!==l.$$state;if(v||m)v=!1,d.$evalAsync(function(){var b=l.absUrl(),c=d.$broadcast("$locationChangeStart",b,a,l.$$state,g).defaultPrevented;l.absUrl()===b&&(c?(l.$$parse(a),l.$$state=g):
-+        (m&&h(b,f,g===l.$$state?null:l.$$state),k(a,g)))})}l.$$replace=!1});return l}]}function Mf(){var a=!0,b=this;this.debugEnabled=function(b){return u(b)?(a=b,this):a};this.$get=["$window",function(d){function c(a){bc(a)&&(a.stack&&f?a=a.message&&-1===a.stack.indexOf(a.message)?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function e(a){var b=d.console||{},e=b[a]||b.log||D;return function(){var a=[];r(arguments,function(b){a.push(c(b))});return Function.prototype.apply.call(e,
-+        b,a)}}var f=Ca||/\bEdge\//.test(d.navigator&&d.navigator.userAgent);return{log:e("log"),info:e("info"),warn:e("warn"),error:e("error"),debug:function(){var c=e("debug");return function(){a&&c.apply(b,arguments)}}()}}]}function Bg(a){return a+""}function Cg(a,b){return"undefined"!==typeof a?a:b}function Ed(a,b){return"undefined"===typeof a?b:"undefined"===typeof b?a:a+b}function Dg(a,b){switch(a.type){case q.MemberExpression:if(a.computed)return!1;break;case q.UnaryExpression:return 1;case q.BinaryExpression:return"+"!==
-+    a.operator?1:!1;case q.CallExpression:return!1}return void 0===b?Fd:b}function W(a,b,d){var c,e,f=a.isPure=Dg(a,d);switch(a.type){case q.Program:c=!0;r(a.body,function(a){W(a.expression,b,f);c=c&&a.expression.constant});a.constant=c;break;case q.Literal:a.constant=!0;a.toWatch=[];break;case q.UnaryExpression:W(a.argument,b,f);a.constant=a.argument.constant;a.toWatch=a.argument.toWatch;break;case q.BinaryExpression:W(a.left,b,f);W(a.right,b,f);a.constant=a.left.constant&&a.right.constant;a.toWatch=
-+        a.left.toWatch.concat(a.right.toWatch);break;case q.LogicalExpression:W(a.left,b,f);W(a.right,b,f);a.constant=a.left.constant&&a.right.constant;a.toWatch=a.constant?[]:[a];break;case q.ConditionalExpression:W(a.test,b,f);W(a.alternate,b,f);W(a.consequent,b,f);a.constant=a.test.constant&&a.alternate.constant&&a.consequent.constant;a.toWatch=a.constant?[]:[a];break;case q.Identifier:a.constant=!1;a.toWatch=[a];break;case q.MemberExpression:W(a.object,b,f);a.computed&&W(a.property,b,f);a.constant=a.object.constant&&
-+        (!a.computed||a.property.constant);a.toWatch=a.constant?[]:[a];break;case q.CallExpression:c=d=a.filter?!b(a.callee.name).$stateful:!1;e=[];r(a.arguments,function(a){W(a,b,f);c=c&&a.constant;e.push.apply(e,a.toWatch)});a.constant=c;a.toWatch=d?e:[a];break;case q.AssignmentExpression:W(a.left,b,f);W(a.right,b,f);a.constant=a.left.constant&&a.right.constant;a.toWatch=[a];break;case q.ArrayExpression:c=!0;e=[];r(a.elements,function(a){W(a,b,f);c=c&&a.constant;e.push.apply(e,a.toWatch)});a.constant=c;
-+        a.toWatch=e;break;case q.ObjectExpression:c=!0;e=[];r(a.properties,function(a){W(a.value,b,f);c=c&&a.value.constant;e.push.apply(e,a.value.toWatch);a.computed&&(W(a.key,b,!1),c=c&&a.key.constant,e.push.apply(e,a.key.toWatch))});a.constant=c;a.toWatch=e;break;case q.ThisExpression:a.constant=!1;a.toWatch=[];break;case q.LocalsExpression:a.constant=!1,a.toWatch=[]}}function Gd(a){if(1===a.length){a=a[0].expression;var b=a.toWatch;return 1!==b.length?b:b[0]!==a?b:void 0}}function Hd(a){return a.type===
-+        q.Identifier||a.type===q.MemberExpression}function Id(a){if(1===a.body.length&&Hd(a.body[0].expression))return{type:q.AssignmentExpression,left:a.body[0].expression,right:{type:q.NGValueParameter},operator:"="}}function Jd(a){this.$filter=a}function Kd(a){this.$filter=a}function Mb(a,b,d){this.ast=new q(a,d);this.astCompiler=d.csp?new Kd(b):new Jd(b)}function Ac(a){return C(a.valueOf)?a.valueOf():Eg.call(a)}function Nf(){var a=S(),b={"true":!0,"false":!1,"null":null,undefined:void 0},d,c;this.addLiteral=
-+        function(a,c){b[a]=c};this.setIdentifierFns=function(a,b){d=a;c=b;return this};this.$get=["$filter",function(e){function f(b,c){var d,g;switch(typeof b){case "string":return g=b=b.trim(),d=a[g],d||(d=new Nb(n),d=(new Mb(d,e,n)).parse(b),d.constant?d.$$watchDelegate=m:d.oneTime?d.$$watchDelegate=d.literal?l:k:d.inputs&&(d.$$watchDelegate=h),a[g]=d),p(d,c);case "function":return p(b,c);default:return p(D,c)}}function g(a,b,c){return null==a||null==b?a===b:"object"!==typeof a||(a=Ac(a),"object"!==typeof a||
-+    c)?a===b||a!==a&&b!==b:!1}function h(a,b,c,d,e){var f=d.inputs,h;if(1===f.length){var k=g,f=f[0];return a.$watch(function(a){var b=f(a);g(b,k,f.isPure)||(h=d(a,void 0,void 0,[b]),k=b&&Ac(b));return h},b,c,e)}for(var l=[],m=[],p=0,n=f.length;p<n;p++)l[p]=g,m[p]=null;return a.$watch(function(a){for(var b=!1,c=0,e=f.length;c<e;c++){var k=f[c](a);if(b||(b=!g(k,l[c],f[c].isPure)))m[c]=k,l[c]=k&&Ac(k)}b&&(h=d(a,void 0,void 0,m));return h},b,c,e)}function k(a,b,c,d,e){function g(a){return d(a)}function f(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           c,d){l=a;C(b)&&b(a,c,d);u(a)&&d.$$postDigest(function(){u(l)&&k()})}var k,l;return k=d.inputs?h(a,f,c,d,e):a.$watch(g,f,c)}function l(a,b,c,d){function e(a){var b=!0;r(a,function(a){u(a)||(b=!1)});return b}var g,f;return g=a.$watch(function(a){return d(a)},function(a,c,d){f=a;C(b)&&b(a,c,d);e(a)&&d.$$postDigest(function(){e(f)&&g()})},c)}function m(a,b,c,d){var e=a.$watch(function(a){e();return d(a)},b,c);return e}function p(a,b){if(!b)return a;var c=a.$$watchDelegate,d=!1,e=c!==l&&c!==k?function(c,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 e,g,f){g=d&&f?f[0]:a(c,e,g,f);return b(g,c,e)}:function(c,d,e,g){e=a(c,d,e,g);c=b(e,c,d);return u(e)?c:e},d=!a.inputs;c&&c!==h?(e.$$watchDelegate=c,e.inputs=a.inputs):b.$stateful||(e.$$watchDelegate=h,e.inputs=a.inputs?a.inputs:[a]);e.inputs&&(e.inputs=e.inputs.map(function(a){return a.isPure===Fd?function(b){return a(b)}:a}));return e}var n={csp:Ja().noUnsafeEval,literals:pa(b),isIdentifierStart:C(d)&&d,isIdentifierContinue:C(c)&&c};f.$$getAst=function(a){var b=new Nb(n);return(new Mb(b,e,n)).getAst(a).ast};
-+        return f}]}function Pf(){var a=!0;this.$get=["$rootScope","$exceptionHandler",function(b,d){return Ld(function(a){b.$evalAsync(a)},d,a)}];this.errorOnUnhandledRejections=function(b){return u(b)?(a=b,this):a}}function Qf(){var a=!0;this.$get=["$browser","$exceptionHandler",function(b,d){return Ld(function(a){b.defer(a)},d,a)}];this.errorOnUnhandledRejections=function(b){return u(b)?(a=b,this):a}}function Ld(a,b,d){function c(){return new e}function e(){var a=this.promise=new f;this.resolve=function(b){k(a,
-+        b)};this.reject=function(b){m(a,b)};this.notify=function(b){n(a,b)}}function f(){this.$$state={status:0}}function g(){for(;!u&&w.length;){var a=w.shift();if(!a.pur){a.pur=!0;var c=a.value,c="Possibly unhandled rejection: "+("function"===typeof c?c.toString().replace(/ \{[\s\S]*$/,""):x(c)?"undefined":"string"!==typeof c?De(c,void 0):c);bc(a.value)?b(a.value,c):b(c)}}}function h(c){!d||c.pending||2!==c.status||c.pur||(0===u&&0===w.length&&a(g),w.push(c));!c.processScheduled&&c.pending&&(c.processScheduled=
-+        !0,++u,a(function(){var e,f,h;h=c.pending;c.processScheduled=!1;c.pending=void 0;try{for(var l=0,p=h.length;l<p;++l){c.pur=!0;f=h[l][0];e=h[l][c.status];try{C(e)?k(f,e(c.value)):1===c.status?k(f,c.value):m(f,c.value)}catch(n){m(f,n),n&&!0===n.$$passToExceptionHandler&&b(n)}}}finally{--u,d&&0===u&&a(g)}}))}function k(a,b){a.$$state.status||(b===a?p(a,t("qcycle",b)):l(a,b))}function l(a,b){function c(b){g||(g=!0,l(a,b))}function d(b){g||(g=!0,p(a,b))}function e(b){n(a,b)}var f,g=!1;try{if(B(b)||C(b))f=
-+        b.then;C(f)?(a.$$state.status=-1,f.call(b,c,d,e)):(a.$$state.value=b,a.$$state.status=1,h(a.$$state))}catch(k){d(k)}}function m(a,b){a.$$state.status||p(a,b)}function p(a,b){a.$$state.value=b;a.$$state.status=2;h(a.$$state)}function n(c,d){var e=c.$$state.pending;0>=c.$$state.status&&e&&e.length&&a(function(){for(var a,c,g=0,f=e.length;g<f;g++){c=e[g][0];a=e[g][3];try{n(c,C(a)?a(d):d)}catch(h){b(h)}}})}function F(a){var b=new f;m(b,a);return b}function s(a,b,c){var d=null;try{C(c)&&(d=c())}catch(e){return F(e)}return d&&
-+    C(d.then)?d.then(function(){return b(a)},F):b(a)}function v(a,b,c,d){var e=new f;k(e,a);return e.then(b,c,d)}function q(a){if(!C(a))throw t("norslvr",a);var b=new f;a(function(a){k(b,a)},function(a){m(b,a)});return b}var t=K("$q",TypeError),u=0,w=[];O(f.prototype,{then:function(a,b,c){if(x(a)&&x(b)&&x(c))return this;var d=new f;this.$$state.pending=this.$$state.pending||[];this.$$state.pending.push([d,a,b,c]);0<this.$$state.status&&h(this.$$state);return d},"catch":function(a){return this.then(null,
-+            a)},"finally":function(a,b){return this.then(function(b){return s(b,A,a)},function(b){return s(b,F,a)},b)}});var A=v;q.prototype=f.prototype;q.defer=c;q.reject=F;q.when=v;q.resolve=A;q.all=function(a){var b=new f,c=0,d=I(a)?[]:{};r(a,function(a,e){c++;v(a).then(function(a){d[e]=a;--c||k(b,d)},function(a){m(b,a)})});0===c&&k(b,d);return b};q.race=function(a){var b=c();r(a,function(a){v(a).then(b.resolve,b.reject)});return b.promise};return q}function Zf(){this.$get=["$window","$timeout",function(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                b){var d=a.requestAnimationFrame||a.webkitRequestAnimationFrame,c=a.cancelAnimationFrame||a.webkitCancelAnimationFrame||a.webkitCancelRequestAnimationFrame,e=!!d,f=e?function(a){var b=d(a);return function(){c(b)}}:function(a){var c=b(a,16.66,!1);return function(){b.cancel(c)}};f.supported=e;return f}]}function Of(){function a(a){function b(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$id=++qb;this.$$ChildScope=
-+        null}b.prototype=a;return b}var b=10,d=K("$rootScope"),c=null,e=null;this.digestTtl=function(a){arguments.length&&(b=a);return b};this.$get=["$exceptionHandler","$parse","$browser",function(f,g,h){function k(a){a.currentScope.$$destroyed=!0}function l(a){9===Ca&&(a.$$childHead&&l(a.$$childHead),a.$$nextSibling&&l(a.$$nextSibling));a.$parent=a.$$nextSibling=a.$$prevSibling=a.$$childHead=a.$$childTail=a.$root=a.$$watchers=null}function m(){this.$id=++qb;this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=
-+        this.$$prevSibling=this.$$childHead=this.$$childTail=null;this.$root=this;this.$$destroyed=!1;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$$isolateBindings=null}function p(a){if(t.$$phase)throw d("inprog",t.$$phase);t.$$phase=a}function n(a,b){do a.$$watchersCount+=b;while(a=a.$parent)}function F(a,b,c){do a.$$listenerCount[c]-=b,0===a.$$listenerCount[c]&&delete a.$$listenerCount[c];while(a=a.$parent)}function s(){}function v(){for(;A.length;)try{A.shift()()}catch(a){f(a)}e=
-+        null}function q(){null===e&&(e=h.defer(function(){t.$apply(v)}))}m.prototype={constructor:m,$new:function(b,c){var d;c=c||this;b?(d=new m,d.$root=this.$root):(this.$$ChildScope||(this.$$ChildScope=a(this)),d=new this.$$ChildScope);d.$parent=c;d.$$prevSibling=c.$$childTail;c.$$childHead?(c.$$childTail.$$nextSibling=d,c.$$childTail=d):c.$$childHead=c.$$childTail=d;(b||c!==this)&&d.$on("$destroy",k);return d},$watch:function(a,b,d,e){var f=g(a);b=C(b)?b:D;if(f.$$watchDelegate)return f.$$watchDelegate(this,
-+            b,d,f,a);var h=this,k=h.$$watchers,l={fn:b,last:s,get:f,exp:e||a,eq:!!d};c=null;k||(k=h.$$watchers=[],k.$$digestWatchIndex=-1);k.unshift(l);k.$$digestWatchIndex++;n(this,1);return function(){var a=cb(k,l);0<=a&&(n(h,-1),a<k.$$digestWatchIndex&&k.$$digestWatchIndex--);c=null}},$watchGroup:function(a,b){function c(){h=!1;k?(k=!1,b(e,e,g)):b(e,d,g)}var d=Array(a.length),e=Array(a.length),f=[],g=this,h=!1,k=!0;if(!a.length){var l=!0;g.$evalAsync(function(){l&&b(e,e,g)});return function(){l=!1}}if(1===
-+            a.length)return this.$watch(a[0],function(a,c,f){e[0]=a;d[0]=c;b(e,a===c?e:d,f)});r(a,function(a,b){var k=g.$watch(a,function(a,f){e[b]=a;d[b]=f;h||(h=!0,g.$evalAsync(c))});f.push(k)});return function(){for(;f.length;)f.shift()()}},$watchCollection:function(a,b){function c(a){e=a;var b,d,g,h;if(!x(e)){if(B(e))if(wa(e))for(f!==p&&(f=p,t=f.length=0,l++),a=e.length,t!==a&&(l++,f.length=t=a),b=0;b<a;b++)h=f[b],g=e[b],d=h!==h&&g!==g,d||h===g||(l++,f[b]=g);else{f!==n&&(f=n={},t=0,l++);a=0;for(b in e)ra.call(e,
-+            b)&&(a++,g=e[b],h=f[b],b in f?(d=h!==h&&g!==g,d||h===g||(l++,f[b]=g)):(t++,f[b]=g,l++));if(t>a)for(b in l++,f)ra.call(e,b)||(t--,delete f[b])}else f!==e&&(f=e,l++);return l}}c.$stateful=!0;var d=this,e,f,h,k=1<b.length,l=0,m=g(a,c),p=[],n={},s=!0,t=0;return this.$watch(m,function(){s?(s=!1,b(e,e,d)):b(e,h,d);if(k)if(B(e))if(wa(e)){h=Array(e.length);for(var a=0;a<e.length;a++)h[a]=e[a]}else for(a in h={},e)ra.call(e,a)&&(h[a]=e[a]);else h=e})},$digest:function(){var a,g,k,l,m,n,r,F=b,q,A=[],y,x;p("$digest");
-+            h.$$checkUrlChange();this===t&&null!==e&&(h.defer.cancel(e),v());c=null;do{r=!1;q=this;for(n=0;n<u.length;n++){try{x=u[n],l=x.fn,l(x.scope,x.locals)}catch(z){f(z)}c=null}u.length=0;a:do{if(n=q.$$watchers)for(n.$$digestWatchIndex=n.length;n.$$digestWatchIndex--;)try{if(a=n[n.$$digestWatchIndex])if(m=a.get,(g=m(q))!==(k=a.last)&&!(a.eq?sa(g,k):U(g)&&U(k)))r=!0,c=a,a.last=a.eq?pa(g,null):g,l=a.fn,l(g,k===s?g:k,q),5>F&&(y=4-F,A[y]||(A[y]=[]),A[y].push({msg:C(a.exp)?"fn: "+(a.exp.name||a.exp.toString()):
-+                    a.exp,newVal:g,oldVal:k}));else if(a===c){r=!1;break a}}catch(D){f(D)}if(!(n=q.$$watchersCount&&q.$$childHead||q!==this&&q.$$nextSibling))for(;q!==this&&!(n=q.$$nextSibling);)q=q.$parent}while(q=n);if((r||u.length)&&!F--)throw t.$$phase=null,d("infdig",b,A);}while(r||u.length);for(t.$$phase=null;H<w.length;)try{w[H++]()}catch(B){f(B)}w.length=H=0;h.$$checkUrlChange()},$destroy:function(){if(!this.$$destroyed){var a=this.$parent;this.$broadcast("$destroy");this.$$destroyed=!0;this===t&&h.$$applicationDestroyed();
-+            n(this,-this.$$watchersCount);for(var b in this.$$listenerCount)F(this,this.$$listenerCount[b],b);a&&a.$$childHead===this&&(a.$$childHead=this.$$nextSibling);a&&a.$$childTail===this&&(a.$$childTail=this.$$prevSibling);this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling);this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling);this.$destroy=this.$digest=this.$apply=this.$evalAsync=this.$applyAsync=D;this.$on=this.$watch=this.$watchGroup=function(){return D};this.$$listeners=
-+                {};this.$$nextSibling=null;l(this)}},$eval:function(a,b){return g(a)(this,b)},$evalAsync:function(a,b){t.$$phase||u.length||h.defer(function(){u.length&&t.$digest()});u.push({scope:this,fn:g(a),locals:b})},$$postDigest:function(a){w.push(a)},$apply:function(a){try{p("$apply");try{return this.$eval(a)}finally{t.$$phase=null}}catch(b){f(b)}finally{try{t.$digest()}catch(c){throw f(c),c;}}},$applyAsync:function(a){function b(){c.$eval(a)}var c=this;a&&A.push(b);a=g(a);q()},$on:function(a,b){var c=this.$$listeners[a];
-+            c||(this.$$listeners[a]=c=[]);c.push(b);var d=this;do d.$$listenerCount[a]||(d.$$listenerCount[a]=0),d.$$listenerCount[a]++;while(d=d.$parent);var e=this;return function(){var d=c.indexOf(b);-1!==d&&(delete c[d],F(e,1,a))}},$emit:function(a,b){var c=[],d,e=this,g=!1,h={name:a,targetScope:e,stopPropagation:function(){g=!0},preventDefault:function(){h.defaultPrevented=!0},defaultPrevented:!1},k=db([h],arguments,1),l,m;do{d=e.$$listeners[a]||c;h.currentScope=e;l=0;for(m=d.length;l<m;l++)if(d[l])try{d[l].apply(null,
-+            k)}catch(n){f(n)}else d.splice(l,1),l--,m--;if(g)break;e=e.$parent}while(e);h.currentScope=null;return h},$broadcast:function(a,b){var c=this,d=this,e={name:a,targetScope:this,preventDefault:function(){e.defaultPrevented=!0},defaultPrevented:!1};if(!this.$$listenerCount[a])return e;for(var g=db([e],arguments,1),h,k;c=d;){e.currentScope=c;d=c.$$listeners[a]||[];h=0;for(k=d.length;h<k;h++)if(d[h])try{d[h].apply(null,g)}catch(l){f(l)}else d.splice(h,1),h--,k--;if(!(d=c.$$listenerCount[a]&&c.$$childHead||
-+            c!==this&&c.$$nextSibling))for(;c!==this&&!(d=c.$$nextSibling);)c=c.$parent}e.currentScope=null;return e}};var t=new m,u=t.$$asyncQueue=[],w=t.$$postDigestQueue=[],A=t.$$applyAsyncQueue=[],H=0;return t}]}function Ge(){var a=/^\s*(https?|s?ftp|mailto|tel|file):/,b=/^\s*((https?|ftp|file|blob):|data:image\/)/;this.aHrefSanitizationWhitelist=function(b){return u(b)?(a=b,this):a};this.imgSrcSanitizationWhitelist=function(a){return u(a)?(b=a,this):b};this.$get=function(){return function(d,c){var e=c?b:
-+        a,f;f=ta(d&&d.trim()).href;return""===f||f.match(e)?d:"unsafe:"+f}}}function Fg(a){if("self"===a)return a;if(E(a)){if(-1<a.indexOf("***"))throw va("iwcard",a);a=Md(a).replace(/\\\*\\\*/g,".*").replace(/\\\*/g,"[^:/.?&;]*");return new RegExp("^"+a+"$")}if($a(a))return new RegExp("^"+a.source+"$");throw va("imatcher");}function Nd(a){var b=[];u(a)&&r(a,function(a){b.push(Fg(a))});return b}function Sf(){this.SCE_CONTEXTS=oa;var a=["self"],b=[];this.resourceUrlWhitelist=function(b){arguments.length&&
-+    (a=Nd(b));return a};this.resourceUrlBlacklist=function(a){arguments.length&&(b=Nd(a));return b};this.$get=["$injector",function(d){function c(a,b){return"self"===a?zd(b):!!a.exec(b.href)}function e(a){var b=function(a){this.$$unwrapTrustedValue=function(){return a}};a&&(b.prototype=new a);b.prototype.valueOf=function(){return this.$$unwrapTrustedValue()};b.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()};return b}var f=function(a){throw va("unsafe");};d.has("$sanitize")&&
-+    (f=d.get("$sanitize"));var g=e(),h={};h[oa.HTML]=e(g);h[oa.CSS]=e(g);h[oa.URL]=e(g);h[oa.JS]=e(g);h[oa.RESOURCE_URL]=e(h[oa.URL]);return{trustAs:function(a,b){var c=h.hasOwnProperty(a)?h[a]:null;if(!c)throw va("icontext",a,b);if(null===b||x(b)||""===b)return b;if("string"!==typeof b)throw va("itype",a);return new c(b)},getTrusted:function(d,e){if(null===e||x(e)||""===e)return e;var g=h.hasOwnProperty(d)?h[d]:null;if(g&&e instanceof g)return e.$$unwrapTrustedValue();if(d===oa.RESOURCE_URL){var g=ta(e.toString()),
-+            p,n,r=!1;p=0;for(n=a.length;p<n;p++)if(c(a[p],g)){r=!0;break}if(r)for(p=0,n=b.length;p<n;p++)if(c(b[p],g)){r=!1;break}if(r)return e;throw va("insecurl",e.toString());}if(d===oa.HTML)return f(e);throw va("unsafe");},valueOf:function(a){return a instanceof g?a.$$unwrapTrustedValue():a}}}]}function Rf(){var a=!0;this.enabled=function(b){arguments.length&&(a=!!b);return a};this.$get=["$parse","$sceDelegate",function(b,d){if(a&&8>Ca)throw va("iequirks");var c=ka(oa);c.isEnabled=function(){return a};c.trustAs=
-+        d.trustAs;c.getTrusted=d.getTrusted;c.valueOf=d.valueOf;a||(c.trustAs=c.getTrusted=function(a,b){return b},c.valueOf=ab);c.parseAs=function(a,d){var e=b(d);return e.literal&&e.constant?e:b(d,function(b){return c.getTrusted(a,b)})};var e=c.parseAs,f=c.getTrusted,g=c.trustAs;r(oa,function(a,b){var d=L(b);c[("parse_as_"+d).replace(Bc,wb)]=function(b){return e(a,b)};c[("get_trusted_"+d).replace(Bc,wb)]=function(b){return f(a,b)};c[("trust_as_"+d).replace(Bc,wb)]=function(b){return g(a,b)}});return c}]}
-+    function Tf(){this.$get=["$window","$document",function(a,b){var d={},c=!((!a.nw||!a.nw.process)&&a.chrome&&(a.chrome.app&&a.chrome.app.runtime||!a.chrome.app&&a.chrome.runtime&&a.chrome.runtime.id))&&a.history&&a.history.pushState,e=Z((/android (\d+)/.exec(L((a.navigator||{}).userAgent))||[])[1]),f=/Boxee/i.test((a.navigator||{}).userAgent),g=b[0]||{},h=g.body&&g.body.style,k=!1,l=!1;h&&(k=!!("transition"in h||"webkitTransition"in h),l=!!("animation"in h||"webkitAnimation"in h));return{history:!(!c||
-+            4>e||f),hasEvent:function(a){if("input"===a&&Ca)return!1;if(x(d[a])){var b=g.createElement("div");d[a]="on"+a in b}return d[a]},csp:Ja(),transitions:k,animations:l,android:e}}]}function Vf(){var a;this.httpOptions=function(b){return b?(a=b,this):a};this.$get=["$exceptionHandler","$templateCache","$http","$q","$sce",function(b,d,c,e,f){function g(h,k){g.totalPendingRequests++;if(!E(h)||x(d.get(h)))h=f.getTrustedResourceUrl(h);var l=c.defaults&&c.defaults.transformResponse;I(l)?l=l.filter(function(a){return a!==
-+        uc}):l===uc&&(l=null);return c.get(h,O({cache:d,transformResponse:l},a)).finally(function(){g.totalPendingRequests--}).then(function(a){d.put(h,a.data);return a.data},function(a){k||(a=Gg("tpload",h,a.status,a.statusText),b(a));return e.reject(a)})}g.totalPendingRequests=0;return g}]}function Wf(){this.$get=["$rootScope","$browser","$location",function(a,b,d){return{findBindings:function(a,b,d){a=a.getElementsByClassName("ng-binding");var g=[];r(a,function(a){var c=$.element(a).data("$binding");c&&
-+        r(c,function(c){d?(new RegExp("(^|\\s)"+Md(b)+"(\\s|\\||$)")).test(c)&&g.push(a):-1!==c.indexOf(b)&&g.push(a)})});return g},findModels:function(a,b,d){for(var g=["ng-","data-ng-","ng\\:"],h=0;h<g.length;++h){var k=a.querySelectorAll("["+g[h]+"model"+(d?"=":"*=")+'"'+b+'"]');if(k.length)return k}},getLocation:function(){return d.url()},setLocation:function(b){b!==d.url()&&(d.url(b),a.$digest())},whenStable:function(a){b.notifyWhenNoOutstandingRequests(a)}}}]}function Xf(){this.$get=["$rootScope","$browser",
-+        "$q","$$q","$exceptionHandler",function(a,b,d,c,e){function f(f,k,l){C(f)||(l=k,k=f,f=D);var m=xa.call(arguments,3),p=u(l)&&!l,n=(p?c:d).defer(),r=n.promise,s;s=b.defer(function(){try{n.resolve(f.apply(null,m))}catch(b){n.reject(b),e(b)}finally{delete g[r.$$timeoutId]}p||a.$apply()},k);r.$$timeoutId=s;g[s]=n;return r}var g={};f.cancel=function(a){return a&&a.$$timeoutId in g?(g[a.$$timeoutId].promise.$$state.pur=!0,g[a.$$timeoutId].reject("canceled"),delete g[a.$$timeoutId],b.defer.cancel(a.$$timeoutId)):
-+            !1};return f}]}function ta(a){Ca&&(X.setAttribute("href",a),a=X.href);X.setAttribute("href",a);return{href:X.href,protocol:X.protocol?X.protocol.replace(/:$/,""):"",host:X.host,search:X.search?X.search.replace(/^\?/,""):"",hash:X.hash?X.hash.replace(/^#/,""):"",hostname:X.hostname,port:X.port,pathname:"/"===X.pathname.charAt(0)?X.pathname:"/"+X.pathname}}function zd(a){a=E(a)?ta(a):a;return a.protocol===Od.protocol&&a.host===Od.host}function Yf(){this.$get=la(w)}function Pd(a){function b(a){try{return decodeURIComponent(a)}catch(b){return a}}
-+        var d=a[0]||{},c={},e="";return function(){var a,g,h,k,l;try{a=d.cookie||""}catch(m){a=""}if(a!==e)for(e=a,a=e.split("; "),c={},h=0;h<a.length;h++)g=a[h],k=g.indexOf("="),0<k&&(l=b(g.substring(0,k)),x(c[l])&&(c[l]=b(g.substring(k+1))));return c}}function bg(){this.$get=Pd}function ed(a){function b(d,c){if(B(d)){var e={};r(d,function(a,c){e[c]=b(c,a)});return e}return a.factory(d+"Filter",c)}this.register=b;this.$get=["$injector",function(a){return function(b){return a.get(b+"Filter")}}];b("currency",
-+        Qd);b("date",Rd);b("filter",Hg);b("json",Ig);b("limitTo",Jg);b("lowercase",Kg);b("number",Sd);b("orderBy",Td);b("uppercase",Lg)}function Hg(){return function(a,b,d,c){if(!wa(a)){if(null==a)return a;throw K("filter")("notarray",a);}c=c||"$";var e;switch(Cc(b)){case "function":break;case "boolean":case "null":case "number":case "string":e=!0;case "object":b=Mg(b,d,c,e);break;default:return a}return Array.prototype.filter.call(a,b)}}function Mg(a,b,d,c){var e=B(a)&&d in a;!0===b?b=sa:C(b)||(b=function(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                b){if(x(a))return!1;if(null===a||null===b)return a===b;if(B(b)||B(a)&&!ac(a))return!1;a=L(""+a);b=L(""+b);return-1!==a.indexOf(b)});return function(f){return e&&!B(f)?ha(f,a[d],b,d,!1):ha(f,a,b,d,c)}}function ha(a,b,d,c,e,f){var g=Cc(a),h=Cc(b);if("string"===h&&"!"===b.charAt(0))return!ha(a,b.substring(1),d,c,e);if(I(a))return a.some(function(a){return ha(a,b,d,c,e)});switch(g){case "object":var k;if(e){for(k in a)if(k.charAt&&"$"!==k.charAt(0)&&ha(a[k],b,d,c,!0))return!0;return f?!1:ha(a,b,d,c,!1)}if("object"===
-+        h){for(k in b)if(f=b[k],!C(f)&&!x(f)&&(g=k===c,!ha(g?a:a[k],f,d,c,g,g)))return!1;return!0}return d(a,b);case "function":return!1;default:return d(a,b)}}function Cc(a){return null===a?"null":typeof a}function Qd(a){var b=a.NUMBER_FORMATS;return function(a,c,e){x(c)&&(c=b.CURRENCY_SYM);x(e)&&(e=b.PATTERNS[1].maxFrac);var f=c?/\u00A4/g:/\s*\u00A4\s*/g;return null==a?a:Ud(a,b.PATTERNS[1],b.GROUP_SEP,b.DECIMAL_SEP,e).replace(f,c)}}function Sd(a){var b=a.NUMBER_FORMATS;return function(a,c){return null==
-+    a?a:Ud(a,b.PATTERNS[0],b.GROUP_SEP,b.DECIMAL_SEP,c)}}function Ng(a){var b=0,d,c,e,f,g;-1<(c=a.indexOf(Vd))&&(a=a.replace(Vd,""));0<(e=a.search(/e/i))?(0>c&&(c=e),c+=+a.slice(e+1),a=a.substring(0,e)):0>c&&(c=a.length);for(e=0;a.charAt(e)===Dc;e++);if(e===(g=a.length))d=[0],c=1;else{for(g--;a.charAt(g)===Dc;)g--;c-=e;d=[];for(f=0;e<=g;e++,f++)d[f]=+a.charAt(e)}c>Wd&&(d=d.splice(0,Wd-1),b=c-1,c=1);return{d:d,e:b,i:c}}function Og(a,b,d,c){var e=a.d,f=e.length-a.i;b=x(b)?Math.min(Math.max(d,f),c):+b;d=
-+        b+a.i;c=e[d];if(0<d){e.splice(Math.max(a.i,d));for(var g=d;g<e.length;g++)e[g]=0}else for(f=Math.max(0,f),a.i=1,e.length=Math.max(1,d=b+1),e[0]=0,g=1;g<d;g++)e[g]=0;if(5<=c)if(0>d-1){for(c=0;c>d;c--)e.unshift(0),a.i++;e.unshift(1);a.i++}else e[d-1]++;for(;f<Math.max(0,b);f++)e.push(0);if(b=e.reduceRight(function(a,b,c,d){b+=a;d[c]=b%10;return Math.floor(b/10)},0))e.unshift(b),a.i++}function Ud(a,b,d,c,e){if(!E(a)&&!Y(a)||isNaN(a))return"";var f=!isFinite(a),g=!1,h=Math.abs(a)+"",k="";if(f)k="\u221e";
-+    else{g=Ng(h);Og(g,e,b.minFrac,b.maxFrac);k=g.d;h=g.i;e=g.e;f=[];for(g=k.reduce(function(a,b){return a&&!b},!0);0>h;)k.unshift(0),h++;0<h?f=k.splice(h,k.length):(f=k,k=[0]);h=[];for(k.length>=b.lgSize&&h.unshift(k.splice(-b.lgSize,k.length).join(""));k.length>b.gSize;)h.unshift(k.splice(-b.gSize,k.length).join(""));k.length&&h.unshift(k.join(""));k=h.join(d);f.length&&(k+=c+f.join(""));e&&(k+="e+"+e)}return 0>a&&!g?b.negPre+k+b.negSuf:b.posPre+k+b.posSuf}function Ob(a,b,d,c){var e="";if(0>a||c&&0>=
-+        a)c?a=-a+1:(a=-a,e="-");for(a=""+a;a.length<b;)a=Dc+a;d&&(a=a.substr(a.length-b));return e+a}function ea(a,b,d,c,e){d=d||0;return function(f){f=f["get"+a]();if(0<d||f>-d)f+=d;0===f&&-12===d&&(f=12);return Ob(f,b,c,e)}}function mb(a,b,d){return function(c,e){var f=c["get"+a](),g=ub((d?"STANDALONE":"")+(b?"SHORT":"")+a);return e[g][f]}}function Xd(a){var b=(new Date(a,0,1)).getDay();return new Date(a,0,(4>=b?5:12)-b)}function Yd(a){return function(b){var d=Xd(b.getFullYear());b=+new Date(b.getFullYear(),
-+        b.getMonth(),b.getDate()+(4-b.getDay()))-+d;b=1+Math.round(b/6048E5);return Ob(b,a)}}function Ec(a,b){return 0>=a.getFullYear()?b.ERAS[0]:b.ERAS[1]}function Rd(a){function b(a){var b;if(b=a.match(d)){a=new Date(0);var f=0,g=0,h=b[8]?a.setUTCFullYear:a.setFullYear,k=b[8]?a.setUTCHours:a.setHours;b[9]&&(f=Z(b[9]+b[10]),g=Z(b[9]+b[11]));h.call(a,Z(b[1]),Z(b[2])-1,Z(b[3]));f=Z(b[4]||0)-f;g=Z(b[5]||0)-g;h=Z(b[6]||0);b=Math.round(1E3*parseFloat("0."+(b[7]||0)));k.call(a,f,g,h,b)}return a}var d=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;
-+        return function(c,d,f){var g="",h=[],k,l;d=d||"mediumDate";d=a.DATETIME_FORMATS[d]||d;E(c)&&(c=Pg.test(c)?Z(c):b(c));Y(c)&&(c=new Date(c));if(!fa(c)||!isFinite(c.getTime()))return c;for(;d;)(l=Qg.exec(d))?(h=db(h,l,1),d=h.pop()):(h.push(d),d=null);var m=c.getTimezoneOffset();f&&(m=Sc(f,m),c=dc(c,f,!0));r(h,function(b){k=Rg[b];g+=k?k(c,a.DATETIME_FORMATS,m):"''"===b?"'":b.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return g}}function Ig(){return function(a,b){x(b)&&(b=2);return eb(a,b)}}function Jg(){return function(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 b,d){b=Infinity===Math.abs(Number(b))?Number(b):Z(b);if(U(b))return a;Y(a)&&(a=a.toString());if(!wa(a))return a;d=!d||isNaN(d)?0:Z(d);d=0>d?Math.max(0,a.length+d):d;return 0<=b?Fc(a,d,d+b):0===d?Fc(a,b,a.length):Fc(a,Math.max(0,d+b),d)}}function Fc(a,b,d){return E(a)?a.slice(b,d):xa.call(a,b,d)}function Td(a){function b(b){return b.map(function(b){var c=1,d=ab;if(C(b))d=b;else if(E(b)){if("+"===b.charAt(0)||"-"===b.charAt(0))c="-"===b.charAt(0)?-1:1,b=b.substring(1);if(""!==b&&(d=a(b),d.constant))var e=
-+        d(),d=function(a){return a[e]}}return{get:d,descending:c}})}function d(a){switch(typeof a){case "number":case "boolean":case "string":return!0;default:return!1}}function c(a,b){var c=0,d=a.type,k=b.type;if(d===k){var k=a.value,l=b.value;"string"===d?(k=k.toLowerCase(),l=l.toLowerCase()):"object"===d&&(B(k)&&(k=a.index),B(l)&&(l=b.index));k!==l&&(c=k<l?-1:1)}else c=d<k?-1:1;return c}return function(a,f,g,h){if(null==a)return a;if(!wa(a))throw K("orderBy")("notarray",a);I(f)||(f=[f]);0===f.length&&
-+    (f=["+"]);var k=b(f),l=g?-1:1,m=C(h)?h:c;a=Array.prototype.map.call(a,function(a,b){return{value:a,tieBreaker:{value:b,type:"number",index:b},predicateValues:k.map(function(c){var e=c.get(a);c=typeof e;if(null===e)c="string",e="null";else if("object"===c)a:{if(C(e.valueOf)&&(e=e.valueOf(),d(e)))break a;ac(e)&&(e=e.toString(),d(e))}return{value:e,type:c,index:b}})}});a.sort(function(a,b){for(var d=0,e=k.length;d<e;d++){var g=m(a.predicateValues[d],b.predicateValues[d]);if(g)return g*k[d].descending*
-+        l}return(m(a.tieBreaker,b.tieBreaker)||c(a.tieBreaker,b.tieBreaker))*l});return a=a.map(function(a){return a.value})}}function Qa(a){C(a)&&(a={link:a});a.restrict=a.restrict||"AC";return la(a)}function Pb(a,b,d,c,e){this.$$controls=[];this.$error={};this.$$success={};this.$pending=void 0;this.$name=e(b.name||b.ngForm||"")(d);this.$dirty=!1;this.$valid=this.$pristine=!0;this.$submitted=this.$invalid=!1;this.$$parentForm=Qb;this.$$element=a;this.$$animate=c;Zd(this)}function Zd(a){a.$$classCache={};
-+        a.$$classCache[$d]=!(a.$$classCache[nb]=a.$$element.hasClass(nb))}function ae(a){function b(a,b,c){c&&!a.$$classCache[b]?(a.$$animate.addClass(a.$$element,b),a.$$classCache[b]=!0):!c&&a.$$classCache[b]&&(a.$$animate.removeClass(a.$$element,b),a.$$classCache[b]=!1)}function d(a,c,d){c=c?"-"+Vc(c,"-"):"";b(a,nb+c,!0===d);b(a,$d+c,!1===d)}var c=a.set,e=a.unset;a.clazz.prototype.$setValidity=function(a,g,h){x(g)?(this.$pending||(this.$pending={}),c(this.$pending,a,h)):(this.$pending&&e(this.$pending,
-+        a,h),be(this.$pending)&&(this.$pending=void 0));Na(g)?g?(e(this.$error,a,h),c(this.$$success,a,h)):(c(this.$error,a,h),e(this.$$success,a,h)):(e(this.$error,a,h),e(this.$$success,a,h));this.$pending?(b(this,"ng-pending",!0),this.$valid=this.$invalid=void 0,d(this,"",null)):(b(this,"ng-pending",!1),this.$valid=be(this.$error),this.$invalid=!this.$valid,d(this,"",this.$valid));g=this.$pending&&this.$pending[a]?void 0:this.$error[a]?!1:this.$$success[a]?!0:null;d(this,a,g);this.$$parentForm.$setValidity(a,
-+        g,this)}}function be(a){if(a)for(var b in a)if(a.hasOwnProperty(b))return!1;return!0}function Gc(a){a.$formatters.push(function(b){return a.$isEmpty(b)?b:b.toString()})}function Va(a,b,d,c,e,f){var g=L(b[0].type);if(!e.android){var h=!1;b.on("compositionstart",function(){h=!0});b.on("compositionend",function(){h=!1;l()})}var k,l=function(a){k&&(f.defer.cancel(k),k=null);if(!h){var e=b.val();a=a&&a.type;"password"===g||d.ngTrim&&"false"===d.ngTrim||(e=Q(e));(c.$viewValue!==e||""===e&&c.$$hasNativeValidators)&&
-+    c.$setViewValue(e,a)}};if(e.hasEvent("input"))b.on("input",l);else{var m=function(a,b,c){k||(k=f.defer(function(){k=null;b&&b.value===c||l(a)}))};b.on("keydown",function(a){var b=a.keyCode;91===b||15<b&&19>b||37<=b&&40>=b||m(a,this,this.value)});if(e.hasEvent("paste"))b.on("paste cut drop",m)}b.on("change",l);if(ce[g]&&c.$$hasNativeValidators&&g===d.type)b.on("keydown wheel mousedown",function(a){if(!k){var b=this.validity,c=b.badInput,d=b.typeMismatch;k=f.defer(function(){k=null;b.badInput===c&&
-+    b.typeMismatch===d||l(a)})}});c.$render=function(){var a=c.$isEmpty(c.$viewValue)?"":c.$viewValue;b.val()!==a&&b.val(a)}}function Rb(a,b){return function(d,c){var e,f;if(fa(d))return d;if(E(d)){'"'===d.charAt(0)&&'"'===d.charAt(d.length-1)&&(d=d.substring(1,d.length-1));if(Sg.test(d))return new Date(d);a.lastIndex=0;if(e=a.exec(d))return e.shift(),f=c?{yyyy:c.getFullYear(),MM:c.getMonth()+1,dd:c.getDate(),HH:c.getHours(),mm:c.getMinutes(),ss:c.getSeconds(),sss:c.getMilliseconds()/1E3}:{yyyy:1970,
-+        MM:1,dd:1,HH:0,mm:0,ss:0,sss:0},r(e,function(a,c){c<b.length&&(f[b[c]]=+a)}),new Date(f.yyyy,f.MM-1,f.dd,f.HH,f.mm,f.ss||0,1E3*f.sss||0)}return NaN}}function ob(a,b,d,c){return function(e,f,g,h,k,l,m){function p(a){return a&&!(a.getTime&&a.getTime()!==a.getTime())}function n(a){return u(a)&&!fa(a)?d(a)||void 0:a}Hc(e,f,g,h);Va(e,f,g,h,k,l);var r=h&&h.$options.getOption("timezone"),s;h.$$parserName=a;h.$parsers.push(function(a){if(h.$isEmpty(a))return null;if(b.test(a))return a=d(a,s),r&&(a=dc(a,r)),
-+        a});h.$formatters.push(function(a){if(a&&!fa(a))throw pb("datefmt",a);if(p(a))return(s=a)&&r&&(s=dc(s,r,!0)),m("date")(a,c,r);s=null;return""});if(u(g.min)||g.ngMin){var q;h.$validators.min=function(a){return!p(a)||x(q)||d(a)>=q};g.$observe("min",function(a){q=n(a);h.$validate()})}if(u(g.max)||g.ngMax){var y;h.$validators.max=function(a){return!p(a)||x(y)||d(a)<=y};g.$observe("max",function(a){y=n(a);h.$validate()})}}}function Hc(a,b,d,c){(c.$$hasNativeValidators=B(b[0].validity))&&c.$parsers.push(function(a){var c=
-+        b.prop("validity")||{};return c.badInput||c.typeMismatch?void 0:a})}function de(a){a.$$parserName="number";a.$parsers.push(function(b){if(a.$isEmpty(b))return null;if(Tg.test(b))return parseFloat(b)});a.$formatters.push(function(b){if(!a.$isEmpty(b)){if(!Y(b))throw pb("numfmt",b);b=b.toString()}return b})}function Wa(a){u(a)&&!Y(a)&&(a=parseFloat(a));return U(a)?void 0:a}function Ic(a){var b=a.toString(),d=b.indexOf(".");return-1===d?-1<a&&1>a&&(a=/e-(\d+)$/.exec(b))?Number(a[1]):0:b.length-d-1}function ee(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        b,d){a=Number(a);var c=(a|0)!==a,e=(b|0)!==b,f=(d|0)!==d;if(c||e||f){var g=c?Ic(a):0,h=e?Ic(b):0,k=f?Ic(d):0,g=Math.max(g,h,k),g=Math.pow(10,g);a*=g;b*=g;d*=g;c&&(a=Math.round(a));e&&(b=Math.round(b));f&&(d=Math.round(d))}return 0===(a-b)%d}function fe(a,b,d,c,e){if(u(c)){a=a(c);if(!a.constant)throw pb("constexpr",d,c);return a(b)}return e}function Jc(a,b){function d(a,b){if(!a||!a.length)return[];if(!b||!b.length)return a;var c=[],d=0;a:for(;d<a.length;d++){for(var e=a[d],f=0;f<b.length;f++)if(e===
-+        b[f])continue a;c.push(e)}return c}function c(a){var b=a;I(a)?b=a.map(c).join(" "):B(a)&&(b=Object.keys(a).filter(function(b){return a[b]}).join(" "));return b}function e(a){var b=a;if(I(a))b=a.map(e);else if(B(a)){var c=!1,b=Object.keys(a).filter(function(b){b=a[b];!c&&x(b)&&(c=!0);return b});c&&b.push(void 0)}return b}a="ngClass"+a;var f;return["$parse",function(g){return{restrict:"AC",link:function(h,k,l){function m(a,b){var c=[];r(a,function(a){if(0<b||t[a])t[a]=(t[a]||0)+b,t[a]===+(0<b)&&c.push(a)});
-+            return c.join(" ")}function p(a){if(a===b){var c=w,c=m(c&&c.split(" "),1);l.$addClass(c)}else c=w,c=m(c&&c.split(" "),-1),l.$removeClass(c);u=a}function n(a){a=c(a);a!==w&&q(a)}function q(a){if(u===b){var c=w&&w.split(" "),e=a&&a.split(" "),g=d(c,e),c=d(e,c),g=m(g,-1),c=m(c,1);l.$addClass(c);l.$removeClass(g)}w=a}var s=l[a].trim(),v=":"===s.charAt(0)&&":"===s.charAt(1),s=g(s,v?e:c),y=v?n:q,t=k.data("$classCounts"),u=!0,w;t||(t=S(),k.data("$classCounts",t));"ngClass"!==a&&(f||(f=g("$index",function(a){return a&
-+            1})),h.$watch(f,p));h.$watch(s,y,v)}}}]}function Sb(a,b,d,c,e,f,g,h,k){this.$modelValue=this.$viewValue=Number.NaN;this.$$rawModelValue=void 0;this.$validators={};this.$asyncValidators={};this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$untouched=!0;this.$touched=!1;this.$pristine=!0;this.$dirty=!1;this.$valid=!0;this.$invalid=!1;this.$error={};this.$$success={};this.$pending=void 0;this.$name=k(d.name||"",!1)(a);this.$$parentForm=Qb;this.$options=Tb;this.$$updateEvents="";
-+        this.$$updateEventHandler=this.$$updateEventHandler.bind(this);this.$$parsedNgModel=e(d.ngModel);this.$$parsedNgModelAssign=this.$$parsedNgModel.assign;this.$$ngModelGet=this.$$parsedNgModel;this.$$ngModelSet=this.$$parsedNgModelAssign;this.$$pendingDebounce=null;this.$$parserValid=void 0;this.$$currentValidationRunId=0;Object.defineProperty(this,"$$scope",{value:a});this.$$attr=d;this.$$element=c;this.$$animate=f;this.$$timeout=g;this.$$parse=e;this.$$q=h;this.$$exceptionHandler=b;Zd(this);Ug(this)}
-+    function Ug(a){a.$$scope.$watch(function(b){b=a.$$ngModelGet(b);b===a.$modelValue||a.$modelValue!==a.$modelValue&&b!==b||a.$$setModelValue(b);return b})}function Kc(a){this.$$options=a}function ge(a,b){r(b,function(b,c){u(a[c])||(a[c]=b)})}function Ga(a,b){a.prop("selected",b);a.attr("selected",b)}var Mc={objectMaxDepth:5},Vg=/^\/(.+)\/([a-z]*)$/,ra=Object.prototype.hasOwnProperty,L=function(a){return E(a)?a.toLowerCase():a},ub=function(a){return E(a)?a.toUpperCase():a},Ca,z,ma,xa=[].slice,ug=[].splice,
-+        Wg=[].push,ia=Object.prototype.toString,Pc=Object.getPrototypeOf,qa=K("ng"),$=w.angular||(w.angular={}),ic,qb=0;Ca=w.document.documentMode;var U=Number.isNaN||function(a){return a!==a};D.$inject=[];ab.$inject=[];var I=Array.isArray,se=/^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array]$/,Q=function(a){return E(a)?a.trim():a},Md=function(a){return a.replace(/([-()[\]{}+?*.$^|,:#<!\\])/g,"\\$1").replace(/\x08/g,"\\x08")},Ja=function(){if(!u(Ja.rules)){var a=w.document.querySelector("[ng-csp]")||
-+        w.document.querySelector("[data-ng-csp]");if(a){var b=a.getAttribute("ng-csp")||a.getAttribute("data-ng-csp");Ja.rules={noUnsafeEval:!b||-1!==b.indexOf("no-unsafe-eval"),noInlineStyle:!b||-1!==b.indexOf("no-inline-style")}}else{a=Ja;try{new Function(""),b=!1}catch(d){b=!0}a.rules={noUnsafeEval:b,noInlineStyle:!1}}}return Ja.rules},rb=function(){if(u(rb.name_))return rb.name_;var a,b,d=Ha.length,c,e;for(b=0;b<d;++b)if(c=Ha[b],a=w.document.querySelector("["+c.replace(":","\\:")+"jq]")){e=a.getAttribute(c+
-+        "jq");break}return rb.name_=e},ue=/:/g,Ha=["ng-","data-ng-","ng:","x-ng-"],xe=function(a){var b=a.currentScript;if(!b)return!0;if(!(b instanceof w.HTMLScriptElement||b instanceof w.SVGScriptElement))return!1;b=b.attributes;return[b.getNamedItem("src"),b.getNamedItem("href"),b.getNamedItem("xlink:href")].every(function(b){if(!b)return!0;if(!b.value)return!1;var c=a.createElement("a");c.href=b.value;if(a.location.origin===c.origin)return!0;switch(c.protocol){case "http:":case "https:":case "ftp:":case "blob:":case "file:":case "data:":return!0;
-+        default:return!1}})}(w.document),Ae=/[A-Z]/g,Wc=!1,Oa=3,Fe={full:"1.6.9",major:1,minor:6,dot:9,codeName:"fiery-basilisk"};V.expando="ng339";var ib=V.cache={},gg=1;V._data=function(a){return this.cache[a[this.expando]]||{}};var cg=/-([a-z])/g,Xg=/^-ms-/,Ab={mouseleave:"mouseout",mouseenter:"mouseover"},lc=K("jqLite"),fg=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,kc=/<|&#?\w+;/,dg=/<([\w:-]+)/,eg=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,aa={option:[1,'<select multiple="multiple">',
-+            "</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};aa.optgroup=aa.option;aa.tbody=aa.tfoot=aa.colgroup=aa.caption=aa.thead;aa.th=aa.td;var lg=w.Node.prototype.contains||function(a){return!!(this.compareDocumentPosition(a)&16)},Sa=V.prototype={ready:gd,toString:function(){var a=[];r(this,function(b){a.push(""+b)});return"["+a.join(", ")+"]"},
-+        eq:function(a){return 0<=a?z(this[a]):z(this[this.length+a])},length:0,push:Wg,sort:[].sort,splice:[].splice},Gb={};r("multiple selected checked disabled readOnly required open".split(" "),function(a){Gb[L(a)]=a});var ld={};r("input select option textarea button form details".split(" "),function(a){ld[a]=!0});var sd={ngMinlength:"minlength",ngMaxlength:"maxlength",ngMin:"min",ngMax:"max",ngPattern:"pattern",ngStep:"step"};r({data:pc,removeData:oc,hasData:function(a){for(var b in ib[a.ng339])return!0;
-+            return!1},cleanData:function(a){for(var b=0,d=a.length;b<d;b++)oc(a[b])}},function(a,b){V[b]=a});r({data:pc,inheritedData:Eb,scope:function(a){return z.data(a,"$scope")||Eb(a.parentNode||a,["$isolateScope","$scope"])},isolateScope:function(a){return z.data(a,"$isolateScope")||z.data(a,"$isolateScopeNoTemplate")},controller:id,injector:function(a){return Eb(a,"$injector")},removeAttr:function(a,b){a.removeAttribute(b)},hasClass:Bb,css:function(a,b,d){b=xb(b.replace(Xg,"ms-"));if(u(d))a.style[b]=d;
-+        else return a.style[b]},attr:function(a,b,d){var c=a.nodeType;if(c!==Oa&&2!==c&&8!==c&&a.getAttribute){var c=L(b),e=Gb[c];if(u(d))null===d||!1===d&&e?a.removeAttribute(b):a.setAttribute(b,e?c:d);else return a=a.getAttribute(b),e&&null!==a&&(a=c),null===a?void 0:a}},prop:function(a,b,d){if(u(d))a[b]=d;else return a[b]},text:function(){function a(a,d){if(x(d)){var c=a.nodeType;return 1===c||c===Oa?a.textContent:""}a.textContent=d}a.$dv="";return a}(),val:function(a,b){if(x(b)){if(a.multiple&&"select"===
-+            ya(a)){var d=[];r(a.options,function(a){a.selected&&d.push(a.value||a.text)});return d}return a.value}a.value=b},html:function(a,b){if(x(b))return a.innerHTML;yb(a,!0);a.innerHTML=b},empty:jd},function(a,b){V.prototype[b]=function(b,c){var e,f,g=this.length;if(a!==jd&&x(2===a.length&&a!==Bb&&a!==id?b:c)){if(B(b)){for(e=0;e<g;e++)if(a===pc)a(this[e],b);else for(f in b)a(this[e],f,b[f]);return this}e=a.$dv;g=x(e)?Math.min(g,1):g;for(f=0;f<g;f++){var h=a(this[f],b,c);e=e?e+h:h}return e}for(e=0;e<g;e++)a(this[e],
-+        b,c);return this}});r({removeData:oc,on:function(a,b,d,c){if(u(c))throw lc("onargs");if(jc(a)){c=zb(a,!0);var e=c.events,f=c.handle;f||(f=c.handle=ig(a,e));c=0<=b.indexOf(" ")?b.split(" "):[b];for(var g=c.length,h=function(b,c,g){var h=e[b];h||(h=e[b]=[],h.specialHandlerWrapper=c,"$destroy"===b||g||a.addEventListener(b,f));h.push(d)};g--;)b=c[g],Ab[b]?(h(Ab[b],kg),h(b,void 0,!0)):h(b)}},off:hd,one:function(a,b,d){a=z(a);a.on(b,function e(){a.off(b,d);a.off(b,e)});a.on(b,d)},replaceWith:function(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            b){var d,c=a.parentNode;yb(a);r(new V(b),function(b){d?c.insertBefore(b,d.nextSibling):c.replaceChild(b,a);d=b})},children:function(a){var b=[];r(a.childNodes,function(a){1===a.nodeType&&b.push(a)});return b},contents:function(a){return a.contentDocument||a.childNodes||[]},append:function(a,b){var d=a.nodeType;if(1===d||11===d){b=new V(b);for(var d=0,c=b.length;d<c;d++)a.appendChild(b[d])}},prepend:function(a,b){if(1===a.nodeType){var d=a.firstChild;r(new V(b),function(b){a.insertBefore(b,d)})}},
-+        wrap:function(a,b){var d=z(b).eq(0).clone()[0],c=a.parentNode;c&&c.replaceChild(d,a);d.appendChild(a)},remove:Fb,detach:function(a){Fb(a,!0)},after:function(a,b){var d=a,c=a.parentNode;if(c){b=new V(b);for(var e=0,f=b.length;e<f;e++){var g=b[e];c.insertBefore(g,d.nextSibling);d=g}}},addClass:Db,removeClass:Cb,toggleClass:function(a,b,d){b&&r(b.split(" "),function(b){var e=d;x(e)&&(e=!Bb(a,b));(e?Db:Cb)(a,b)})},parent:function(a){return(a=a.parentNode)&&11!==a.nodeType?a:null},next:function(a){return a.nextElementSibling},
-+        find:function(a,b){return a.getElementsByTagName?a.getElementsByTagName(b):[]},clone:nc,triggerHandler:function(a,b,d){var c,e,f=b.type||b,g=zb(a);if(g=(g=g&&g.events)&&g[f])c={preventDefault:function(){this.defaultPrevented=!0},isDefaultPrevented:function(){return!0===this.defaultPrevented},stopImmediatePropagation:function(){this.immediatePropagationStopped=!0},isImmediatePropagationStopped:function(){return!0===this.immediatePropagationStopped},stopPropagation:D,type:f,target:a},b.type&&(c=O(c,
-+            b)),b=ka(g),e=d?[c].concat(d):[c],r(b,function(b){c.isImmediatePropagationStopped()||b.apply(a,e)})}},function(a,b){V.prototype[b]=function(b,c,e){for(var f,g=0,h=this.length;g<h;g++)x(f)?(f=a(this[g],b,c,e),u(f)&&(f=z(f))):mc(f,a(this[g],b,c,e));return u(f)?f:this}});V.prototype.bind=V.prototype.on;V.prototype.unbind=V.prototype.off;var Yg=Object.create(null);md.prototype={_idx:function(a){if(a===this._lastKey)return this._lastIndex;this._lastKey=a;return this._lastIndex=this._keys.indexOf(a)},_transformKey:function(a){return U(a)?
-+            Yg:a},get:function(a){a=this._transformKey(a);a=this._idx(a);if(-1!==a)return this._values[a]},set:function(a,b){a=this._transformKey(a);var d=this._idx(a);-1===d&&(d=this._lastIndex=this._keys.length);this._keys[d]=a;this._values[d]=b},delete:function(a){a=this._transformKey(a);a=this._idx(a);if(-1===a)return!1;this._keys.splice(a,1);this._values.splice(a,1);this._lastKey=NaN;this._lastIndex=-1;return!0}};var Hb=md,ag=[function(){this.$get=[function(){return Hb}]}],ng=/^([^(]+?)=>/,og=/^[^(]*\(\s*([^)]*)\)/m,
-+        Zg=/,/,$g=/^\s*(_?)(\S+?)\1\s*$/,mg=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,Ba=K("$injector");gb.$$annotate=function(a,b,d){var c;if("function"===typeof a){if(!(c=a.$inject)){c=[];if(a.length){if(b)throw E(d)&&d||(d=a.name||pg(a)),Ba("strictdi",d);b=nd(a);r(b[1].split(Zg),function(a){a.replace($g,function(a,b,d){c.push(d)})})}a.$inject=c}}else I(a)?(b=a.length-1,sb(a[b],"fn"),c=a.slice(0,b)):sb(a,"fn",!0);return c};var he=K("$animate"),sf=function(){this.$get=D},tf=function(){var a=new Hb,b=[];this.$get=
-+        ["$$AnimateRunner","$rootScope",function(d,c){function e(a,b,c){var d=!1;b&&(b=E(b)?b.split(" "):I(b)?b:[],r(b,function(b){b&&(d=!0,a[b]=c)}));return d}function f(){r(b,function(b){var c=a.get(b);if(c){var d=qg(b.attr("class")),e="",f="";r(c,function(a,b){a!==!!d[b]&&(a?e+=(e.length?" ":"")+b:f+=(f.length?" ":"")+b)});r(b,function(a){e&&Db(a,e);f&&Cb(a,f)});a.delete(b)}});b.length=0}return{enabled:D,on:D,off:D,pin:D,push:function(g,h,k,l){l&&l();k=k||{};k.from&&g.css(k.from);k.to&&g.css(k.to);if(k.addClass||
-+                k.removeClass)if(h=k.addClass,l=k.removeClass,k=a.get(g)||{},h=e(k,h,!0),l=e(k,l,!1),h||l)a.set(g,k),b.push(g),1===b.length&&c.$$postDigest(f);g=new d;g.complete();return g}}}]},qf=["$provide",function(a){var b=this,d=null,c=null;this.$$registeredAnimations=Object.create(null);this.register=function(c,d){if(c&&"."!==c.charAt(0))throw he("notcsel",c);var g=c+"-animation";b.$$registeredAnimations[c.substr(1)]=g;a.factory(g,d)};this.customFilter=function(a){1===arguments.length&&(c=C(a)?a:null);return c};
-+        this.classNameFilter=function(a){if(1===arguments.length&&(d=a instanceof RegExp?a:null)&&/[(\s|\/)]ng-animate[(\s|\/)]/.test(d.toString()))throw d=null,he("nongcls","ng-animate");return d};this.$get=["$$animateQueue",function(a){function b(a,c,d){if(d){var e;a:{for(e=0;e<d.length;e++){var f=d[e];if(1===f.nodeType){e=f;break a}}e=void 0}!e||e.parentNode||e.previousElementSibling||(d=null)}d?d.after(a):c.prepend(a)}return{on:a.on,off:a.off,pin:a.pin,enabled:a.enabled,cancel:function(a){a.end&&a.end()},
-+            enter:function(c,d,k,l){d=d&&z(d);k=k&&z(k);d=d||k.parent();b(c,d,k);return a.push(c,"enter",Ka(l))},move:function(c,d,k,l){d=d&&z(d);k=k&&z(k);d=d||k.parent();b(c,d,k);return a.push(c,"move",Ka(l))},leave:function(b,c){return a.push(b,"leave",Ka(c),function(){b.remove()})},addClass:function(b,c,d){d=Ka(d);d.addClass=jb(d.addclass,c);return a.push(b,"addClass",d)},removeClass:function(b,c,d){d=Ka(d);d.removeClass=jb(d.removeClass,c);return a.push(b,"removeClass",d)},setClass:function(b,c,d,f){f=Ka(f);
-+                f.addClass=jb(f.addClass,c);f.removeClass=jb(f.removeClass,d);return a.push(b,"setClass",f)},animate:function(b,c,d,f,m){m=Ka(m);m.from=m.from?O(m.from,c):c;m.to=m.to?O(m.to,d):d;m.tempClasses=jb(m.tempClasses,f||"ng-inline-animate");return a.push(b,"animate",m)}}}]}],vf=function(){this.$get=["$$rAF",function(a){function b(b){d.push(b);1<d.length||a(function(){for(var a=0;a<d.length;a++)d[a]();d=[]})}var d=[];return function(){var a=!1;b(function(){a=!0});return function(d){a?d():b(d)}}}]},uf=function(){this.$get=
-+        ["$q","$sniffer","$$animateAsyncRun","$$isDocumentHidden","$timeout",function(a,b,d,c,e){function f(a){this.setHost(a);var b=d();this._doneCallbacks=[];this._tick=function(a){c()?e(a,0,!1):b(a)};this._state=0}f.chain=function(a,b){function c(){if(d===a.length)b(!0);else a[d](function(a){!1===a?b(!1):(d++,c())})}var d=0;c()};f.all=function(a,b){function c(f){e=e&&f;++d===a.length&&b(e)}var d=0,e=!0;r(a,function(a){a.done(c)})};f.prototype={setHost:function(a){this.host=a||{}},done:function(a){2===
-+            this._state?a():this._doneCallbacks.push(a)},progress:D,getPromise:function(){if(!this.promise){var b=this;this.promise=a(function(a,c){b.done(function(b){!1===b?c():a()})})}return this.promise},then:function(a,b){return this.getPromise().then(a,b)},"catch":function(a){return this.getPromise()["catch"](a)},"finally":function(a){return this.getPromise()["finally"](a)},pause:function(){this.host.pause&&this.host.pause()},resume:function(){this.host.resume&&this.host.resume()},end:function(){this.host.end&&
-+            this.host.end();this._resolve(!0)},cancel:function(){this.host.cancel&&this.host.cancel();this._resolve(!1)},complete:function(a){var b=this;0===b._state&&(b._state=1,b._tick(function(){b._resolve(a)}))},_resolve:function(a){2!==this._state&&(r(this._doneCallbacks,function(b){b(a)}),this._doneCallbacks.length=0,this._state=2)}};return f}]},rf=function(){this.$get=["$$rAF","$q","$$AnimateRunner",function(a,b,d){return function(b,e){function f(){a(function(){g.addClass&&(b.addClass(g.addClass),g.addClass=
-+        null);g.removeClass&&(b.removeClass(g.removeClass),g.removeClass=null);g.to&&(b.css(g.to),g.to=null);h||k.complete();h=!0});return k}var g=e||{};g.$$prepared||(g=pa(g));g.cleanupStyles&&(g.from=g.to=null);g.from&&(b.css(g.from),g.from=null);var h,k=new d;return{start:f,end:f}}}]},ca=K("$compile"),sc=new function(){};Yc.$inject=["$provide","$$sanitizeUriProvider"];Jb.prototype.isFirstChange=function(){return this.previousValue===sc};var od=/^((?:x|data)[:\-_])/i,tg=/[:\-_]+(.)/g,ud=K("$controller"),
-+        td=/^(\S+)(\s+as\s+([\w$]+))?$/,Cf=function(){this.$get=["$document",function(a){return function(b){b?!b.nodeType&&b instanceof z&&(b=b[0]):b=a[0].body;return b.offsetWidth+1}}]},vd="application/json",vc={"Content-Type":vd+";charset=utf-8"},wg=/^\[|^\{(?!\{)/,xg={"[":/]$/,"{":/}$/},vg=/^\)]\}',?\n/,Kb=K("$http"),Fa=$.$interpolateMinErr=K("$interpolate");Fa.throwNoconcat=function(a){throw Fa("noconcat",a);};Fa.interr=function(a,b){return Fa("interr",a,b.toString())};var Kf=function(){this.$get=function(){function a(a){var b=
-+        function(a){b.data=a;b.called=!0};b.id=a;return b}var b=$.callbacks,d={};return{createCallback:function(c){c="_"+(b.$$counter++).toString(36);var e="angular.callbacks."+c,f=a(c);d[e]=b[c]=f;return e},wasCalled:function(a){return d[a].called},getResponse:function(a){return d[a].data},removeCallback:function(a){delete b[d[a].id];delete d[a]}}}},ah=/^([^?#]*)(\?([^#]*))?(#(.*))?$/,zg={http:80,https:443,ftp:21},kb=K("$location"),Ag=/^\s*[\\/]{2,}/,bh={$$absUrl:"",$$html5:!1,$$replace:!1,absUrl:Lb("$$absUrl"),
-+        url:function(a){if(x(a))return this.$$url;var b=ah.exec(a);(b[1]||""===a)&&this.path(decodeURIComponent(b[1]));(b[2]||b[1]||""===a)&&this.search(b[3]||"");this.hash(b[5]||"");return this},protocol:Lb("$$protocol"),host:Lb("$$host"),port:Lb("$$port"),path:Dd("$$path",function(a){a=null!==a?a.toString():"";return"/"===a.charAt(0)?a:"/"+a}),search:function(a,b){switch(arguments.length){case 0:return this.$$search;case 1:if(E(a)||Y(a))a=a.toString(),this.$$search=ec(a);else if(B(a))a=pa(a,{}),r(a,function(b,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   c){null==b&&delete a[c]}),this.$$search=a;else throw kb("isrcharg");break;default:x(b)||null===b?delete this.$$search[a]:this.$$search[a]=b}this.$$compose();return this},hash:Dd("$$hash",function(a){return null!==a?a.toString():""}),replace:function(){this.$$replace=!0;return this}};r([Cd,zc,yc],function(a){a.prototype=Object.create(bh);a.prototype.state=function(b){if(!arguments.length)return this.$$state;if(a!==yc||!this.$$html5)throw kb("nostate");this.$$state=x(b)?null:b;this.$$urlUpdatedByLocation=
-+        !0;return this}});var Xa=K("$parse"),Eg={}.constructor.prototype.valueOf,Ub=S();r("+ - * / % === !== == != < > <= >= && || ! = |".split(" "),function(a){Ub[a]=!0});var ch={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},Nb=function(a){this.options=a};Nb.prototype={constructor:Nb,lex:function(a){this.text=a;this.index=0;for(this.tokens=[];this.index<this.text.length;)if(a=this.text.charAt(this.index),'"'===a||"'"===a)this.readString(a);else if(this.isNumber(a)||"."===a&&this.isNumber(this.peek()))this.readNumber();
-+        else if(this.isIdentifierStart(this.peekMultichar()))this.readIdent();else if(this.is(a,"(){}[].,;:?"))this.tokens.push({index:this.index,text:a}),this.index++;else if(this.isWhitespace(a))this.index++;else{var b=a+this.peek(),d=b+this.peek(2),c=Ub[b],e=Ub[d];Ub[a]||c||e?(a=e?d:c?b:a,this.tokens.push({index:this.index,text:a,operator:!0}),this.index+=a.length):this.throwError("Unexpected next character ",this.index,this.index+1)}return this.tokens},is:function(a,b){return-1!==b.indexOf(a)},peek:function(a){a=
-+            a||1;return this.index+a<this.text.length?this.text.charAt(this.index+a):!1},isNumber:function(a){return"0"<=a&&"9">=a&&"string"===typeof a},isWhitespace:function(a){return" "===a||"\r"===a||"\t"===a||"\n"===a||"\v"===a||"\u00a0"===a},isIdentifierStart:function(a){return this.options.isIdentifierStart?this.options.isIdentifierStart(a,this.codePointAt(a)):this.isValidIdentifierStart(a)},isValidIdentifierStart:function(a){return"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"===a||"$"===a},isIdentifierContinue:function(a){return this.options.isIdentifierContinue?
-+            this.options.isIdentifierContinue(a,this.codePointAt(a)):this.isValidIdentifierContinue(a)},isValidIdentifierContinue:function(a,b){return this.isValidIdentifierStart(a,b)||this.isNumber(a)},codePointAt:function(a){return 1===a.length?a.charCodeAt(0):(a.charCodeAt(0)<<10)+a.charCodeAt(1)-56613888},peekMultichar:function(){var a=this.text.charAt(this.index),b=this.peek();if(!b)return a;var d=a.charCodeAt(0),c=b.charCodeAt(0);return 55296<=d&&56319>=d&&56320<=c&&57343>=c?a+b:a},isExpOperator:function(a){return"-"===
-+            a||"+"===a||this.isNumber(a)},throwError:function(a,b,d){d=d||this.index;b=u(b)?"s "+b+"-"+this.index+" ["+this.text.substring(b,d)+"]":" "+d;throw Xa("lexerr",a,b,this.text);},readNumber:function(){for(var a="",b=this.index;this.index<this.text.length;){var d=L(this.text.charAt(this.index));if("."===d||this.isNumber(d))a+=d;else{var c=this.peek();if("e"===d&&this.isExpOperator(c))a+=d;else if(this.isExpOperator(d)&&c&&this.isNumber(c)&&"e"===a.charAt(a.length-1))a+=d;else if(!this.isExpOperator(d)||
-+            c&&this.isNumber(c)||"e"!==a.charAt(a.length-1))break;else this.throwError("Invalid exponent")}this.index++}this.tokens.push({index:b,text:a,constant:!0,value:Number(a)})},readIdent:function(){var a=this.index;for(this.index+=this.peekMultichar().length;this.index<this.text.length;){var b=this.peekMultichar();if(!this.isIdentifierContinue(b))break;this.index+=b.length}this.tokens.push({index:a,text:this.text.slice(a,this.index),identifier:!0})},readString:function(a){var b=this.index;this.index++;
-+            for(var d="",c=a,e=!1;this.index<this.text.length;){var f=this.text.charAt(this.index),c=c+f;if(e)"u"===f?(e=this.text.substring(this.index+1,this.index+5),e.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+e+"]"),this.index+=4,d+=String.fromCharCode(parseInt(e,16))):d+=ch[f]||f,e=!1;else if("\\"===f)e=!0;else{if(f===a){this.index++;this.tokens.push({index:b,text:c,constant:!0,value:d});return}d+=f}this.index++}this.throwError("Unterminated quote",b)}};var q=function(a,b){this.lexer=
-+        a;this.options=b};q.Program="Program";q.ExpressionStatement="ExpressionStatement";q.AssignmentExpression="AssignmentExpression";q.ConditionalExpression="ConditionalExpression";q.LogicalExpression="LogicalExpression";q.BinaryExpression="BinaryExpression";q.UnaryExpression="UnaryExpression";q.CallExpression="CallExpression";q.MemberExpression="MemberExpression";q.Identifier="Identifier";q.Literal="Literal";q.ArrayExpression="ArrayExpression";q.Property="Property";q.ObjectExpression="ObjectExpression";
-+    q.ThisExpression="ThisExpression";q.LocalsExpression="LocalsExpression";q.NGValueParameter="NGValueParameter";q.prototype={ast:function(a){this.text=a;this.tokens=this.lexer.lex(a);a=this.program();0!==this.tokens.length&&this.throwError("is an unexpected token",this.tokens[0]);return a},program:function(){for(var a=[];;)if(0<this.tokens.length&&!this.peek("}",")",";","]")&&a.push(this.expressionStatement()),!this.expect(";"))return{type:q.Program,body:a}},expressionStatement:function(){return{type:q.ExpressionStatement,
-+            expression:this.filterChain()}},filterChain:function(){for(var a=this.expression();this.expect("|");)a=this.filter(a);return a},expression:function(){return this.assignment()},assignment:function(){var a=this.ternary();if(this.expect("=")){if(!Hd(a))throw Xa("lval");a={type:q.AssignmentExpression,left:a,right:this.assignment(),operator:"="}}return a},ternary:function(){var a=this.logicalOR(),b,d;return this.expect("?")&&(b=this.expression(),this.consume(":"))?(d=this.expression(),{type:q.ConditionalExpression,
-+            test:a,alternate:b,consequent:d}):a},logicalOR:function(){for(var a=this.logicalAND();this.expect("||");)a={type:q.LogicalExpression,operator:"||",left:a,right:this.logicalAND()};return a},logicalAND:function(){for(var a=this.equality();this.expect("&&");)a={type:q.LogicalExpression,operator:"&&",left:a,right:this.equality()};return a},equality:function(){for(var a=this.relational(),b;b=this.expect("==","!=","===","!==");)a={type:q.BinaryExpression,operator:b.text,left:a,right:this.relational()};
-+            return a},relational:function(){for(var a=this.additive(),b;b=this.expect("<",">","<=",">=");)a={type:q.BinaryExpression,operator:b.text,left:a,right:this.additive()};return a},additive:function(){for(var a=this.multiplicative(),b;b=this.expect("+","-");)a={type:q.BinaryExpression,operator:b.text,left:a,right:this.multiplicative()};return a},multiplicative:function(){for(var a=this.unary(),b;b=this.expect("*","/","%");)a={type:q.BinaryExpression,operator:b.text,left:a,right:this.unary()};return a},
-+        unary:function(){var a;return(a=this.expect("+","-","!"))?{type:q.UnaryExpression,operator:a.text,prefix:!0,argument:this.unary()}:this.primary()},primary:function(){var a;this.expect("(")?(a=this.filterChain(),this.consume(")")):this.expect("[")?a=this.arrayDeclaration():this.expect("{")?a=this.object():this.selfReferential.hasOwnProperty(this.peek().text)?a=pa(this.selfReferential[this.consume().text]):this.options.literals.hasOwnProperty(this.peek().text)?a={type:q.Literal,value:this.options.literals[this.consume().text]}:
-+            this.peek().identifier?a=this.identifier():this.peek().constant?a=this.constant():this.throwError("not a primary expression",this.peek());for(var b;b=this.expect("(","[",".");)"("===b.text?(a={type:q.CallExpression,callee:a,arguments:this.parseArguments()},this.consume(")")):"["===b.text?(a={type:q.MemberExpression,object:a,property:this.expression(),computed:!0},this.consume("]")):"."===b.text?a={type:q.MemberExpression,object:a,property:this.identifier(),computed:!1}:this.throwError("IMPOSSIBLE");
-+            return a},filter:function(a){a=[a];for(var b={type:q.CallExpression,callee:this.identifier(),arguments:a,filter:!0};this.expect(":");)a.push(this.expression());return b},parseArguments:function(){var a=[];if(")"!==this.peekToken().text){do a.push(this.filterChain());while(this.expect(","))}return a},identifier:function(){var a=this.consume();a.identifier||this.throwError("is not a valid identifier",a);return{type:q.Identifier,name:a.text}},constant:function(){return{type:q.Literal,value:this.consume().value}},
-+        arrayDeclaration:function(){var a=[];if("]"!==this.peekToken().text){do{if(this.peek("]"))break;a.push(this.expression())}while(this.expect(","))}this.consume("]");return{type:q.ArrayExpression,elements:a}},object:function(){var a=[],b;if("}"!==this.peekToken().text){do{if(this.peek("}"))break;b={type:q.Property,kind:"init"};this.peek().constant?(b.key=this.constant(),b.computed=!1,this.consume(":"),b.value=this.expression()):this.peek().identifier?(b.key=this.identifier(),b.computed=!1,this.peek(":")?
-+            (this.consume(":"),b.value=this.expression()):b.value=b.key):this.peek("[")?(this.consume("["),b.key=this.expression(),this.consume("]"),b.computed=!0,this.consume(":"),b.value=this.expression()):this.throwError("invalid key",this.peek());a.push(b)}while(this.expect(","))}this.consume("}");return{type:q.ObjectExpression,properties:a}},throwError:function(a,b){throw Xa("syntax",b.text,a,b.index+1,this.text,this.text.substring(b.index));},consume:function(a){if(0===this.tokens.length)throw Xa("ueoe",
-+            this.text);var b=this.expect(a);b||this.throwError("is unexpected, expecting ["+a+"]",this.peek());return b},peekToken:function(){if(0===this.tokens.length)throw Xa("ueoe",this.text);return this.tokens[0]},peek:function(a,b,d,c){return this.peekAhead(0,a,b,d,c)},peekAhead:function(a,b,d,c,e){if(this.tokens.length>a){a=this.tokens[a];var f=a.text;if(f===b||f===d||f===c||f===e||!(b||d||c||e))return a}return!1},expect:function(a,b,d,c){return(a=this.peek(a,b,d,c))?(this.tokens.shift(),a):!1},selfReferential:{"this":{type:q.ThisExpression},
-+            $locals:{type:q.LocalsExpression}}};var Fd=2;Jd.prototype={compile:function(a){var b=this;this.state={nextId:0,filters:{},fn:{vars:[],body:[],own:{}},assign:{vars:[],body:[],own:{}},inputs:[]};W(a,b.$filter);var d="",c;this.stage="assign";if(c=Id(a))this.state.computing="assign",d=this.nextId(),this.recurse(c,d),this.return_(d),d="fn.assign="+this.generateFunction("assign","s,v,l");c=Gd(a.body);b.stage="inputs";r(c,function(a,c){var d="fn"+c;b.state[d]={vars:[],body:[],own:{}};b.state.computing=d;
-+            var h=b.nextId();b.recurse(a,h);b.return_(h);b.state.inputs.push({name:d,isPure:a.isPure});a.watchId=c});this.state.computing="fn";this.stage="main";this.recurse(a);a='"'+this.USE+" "+this.STRICT+'";\n'+this.filterPrefix()+"var fn="+this.generateFunction("fn","s,l,a,i")+d+this.watchFns()+"return fn;";a=(new Function("$filter","getStringValue","ifDefined","plus",a))(this.$filter,Bg,Cg,Ed);this.state=this.stage=void 0;return a},USE:"use",STRICT:"strict",watchFns:function(){var a=[],b=this.state.inputs,
-+            d=this;r(b,function(b){a.push("var "+b.name+"="+d.generateFunction(b.name,"s"));b.isPure&&a.push(b.name,".isPure="+JSON.stringify(b.isPure)+";")});b.length&&a.push("fn.inputs=["+b.map(function(a){return a.name}).join(",")+"];");return a.join("")},generateFunction:function(a,b){return"function("+b+"){"+this.varsPrefix(a)+this.body(a)+"};"},filterPrefix:function(){var a=[],b=this;r(this.state.filters,function(d,c){a.push(d+"=$filter("+b.escape(c)+")")});return a.length?"var "+a.join(",")+";":""},varsPrefix:function(a){return this.state[a].vars.length?
-+            "var "+this.state[a].vars.join(",")+";":""},body:function(a){return this.state[a].body.join("")},recurse:function(a,b,d,c,e,f){var g,h,k=this,l,m,p;c=c||D;if(!f&&u(a.watchId))b=b||this.nextId(),this.if_("i",this.lazyAssign(b,this.computedMember("i",a.watchId)),this.lazyRecurse(a,b,d,c,e,!0));else switch(a.type){case q.Program:r(a.body,function(b,c){k.recurse(b.expression,void 0,void 0,function(a){h=a});c!==a.body.length-1?k.current().body.push(h,";"):k.return_(h)});break;case q.Literal:m=this.escape(a.value);
-+            this.assign(b,m);c(b||m);break;case q.UnaryExpression:this.recurse(a.argument,void 0,void 0,function(a){h=a});m=a.operator+"("+this.ifDefined(h,0)+")";this.assign(b,m);c(m);break;case q.BinaryExpression:this.recurse(a.left,void 0,void 0,function(a){g=a});this.recurse(a.right,void 0,void 0,function(a){h=a});m="+"===a.operator?this.plus(g,h):"-"===a.operator?this.ifDefined(g,0)+a.operator+this.ifDefined(h,0):"("+g+")"+a.operator+"("+h+")";this.assign(b,m);c(m);break;case q.LogicalExpression:b=b||this.nextId();
-+            k.recurse(a.left,b);k.if_("&&"===a.operator?b:k.not(b),k.lazyRecurse(a.right,b));c(b);break;case q.ConditionalExpression:b=b||this.nextId();k.recurse(a.test,b);k.if_(b,k.lazyRecurse(a.alternate,b),k.lazyRecurse(a.consequent,b));c(b);break;case q.Identifier:b=b||this.nextId();d&&(d.context="inputs"===k.stage?"s":this.assign(this.nextId(),this.getHasOwnProperty("l",a.name)+"?l:s"),d.computed=!1,d.name=a.name);k.if_("inputs"===k.stage||k.not(k.getHasOwnProperty("l",a.name)),function(){k.if_("inputs"===
-+            k.stage||"s",function(){e&&1!==e&&k.if_(k.isNull(k.nonComputedMember("s",a.name)),k.lazyAssign(k.nonComputedMember("s",a.name),"{}"));k.assign(b,k.nonComputedMember("s",a.name))})},b&&k.lazyAssign(b,k.nonComputedMember("l",a.name)));c(b);break;case q.MemberExpression:g=d&&(d.context=this.nextId())||this.nextId();b=b||this.nextId();k.recurse(a.object,g,void 0,function(){k.if_(k.notNull(g),function(){a.computed?(h=k.nextId(),k.recurse(a.property,h),k.getStringValue(h),e&&1!==e&&k.if_(k.not(k.computedMember(g,
-+            h)),k.lazyAssign(k.computedMember(g,h),"{}")),m=k.computedMember(g,h),k.assign(b,m),d&&(d.computed=!0,d.name=h)):(e&&1!==e&&k.if_(k.isNull(k.nonComputedMember(g,a.property.name)),k.lazyAssign(k.nonComputedMember(g,a.property.name),"{}")),m=k.nonComputedMember(g,a.property.name),k.assign(b,m),d&&(d.computed=!1,d.name=a.property.name))},function(){k.assign(b,"undefined")});c(b)},!!e);break;case q.CallExpression:b=b||this.nextId();a.filter?(h=k.filter(a.callee.name),l=[],r(a.arguments,function(a){var b=
-+            k.nextId();k.recurse(a,b);l.push(b)}),m=h+"("+l.join(",")+")",k.assign(b,m),c(b)):(h=k.nextId(),g={},l=[],k.recurse(a.callee,h,g,function(){k.if_(k.notNull(h),function(){r(a.arguments,function(b){k.recurse(b,a.constant?void 0:k.nextId(),void 0,function(a){l.push(a)})});m=g.name?k.member(g.context,g.name,g.computed)+"("+l.join(",")+")":h+"("+l.join(",")+")";k.assign(b,m)},function(){k.assign(b,"undefined")});c(b)}));break;case q.AssignmentExpression:h=this.nextId();g={};this.recurse(a.left,void 0,
-+            g,function(){k.if_(k.notNull(g.context),function(){k.recurse(a.right,h);m=k.member(g.context,g.name,g.computed)+a.operator+h;k.assign(b,m);c(b||m)})},1);break;case q.ArrayExpression:l=[];r(a.elements,function(b){k.recurse(b,a.constant?void 0:k.nextId(),void 0,function(a){l.push(a)})});m="["+l.join(",")+"]";this.assign(b,m);c(b||m);break;case q.ObjectExpression:l=[];p=!1;r(a.properties,function(a){a.computed&&(p=!0)});p?(b=b||this.nextId(),this.assign(b,"{}"),r(a.properties,function(a){a.computed?
-+            (g=k.nextId(),k.recurse(a.key,g)):g=a.key.type===q.Identifier?a.key.name:""+a.key.value;h=k.nextId();k.recurse(a.value,h);k.assign(k.member(b,g,a.computed),h)})):(r(a.properties,function(b){k.recurse(b.value,a.constant?void 0:k.nextId(),void 0,function(a){l.push(k.escape(b.key.type===q.Identifier?b.key.name:""+b.key.value)+":"+a)})}),m="{"+l.join(",")+"}",this.assign(b,m));c(b||m);break;case q.ThisExpression:this.assign(b,"s");c(b||"s");break;case q.LocalsExpression:this.assign(b,"l");c(b||"l");break;
-+            case q.NGValueParameter:this.assign(b,"v"),c(b||"v")}},getHasOwnProperty:function(a,b){var d=a+"."+b,c=this.current().own;c.hasOwnProperty(d)||(c[d]=this.nextId(!1,a+"&&("+this.escape(b)+" in "+a+")"));return c[d]},assign:function(a,b){if(a)return this.current().body.push(a,"=",b,";"),a},filter:function(a){this.state.filters.hasOwnProperty(a)||(this.state.filters[a]=this.nextId(!0));return this.state.filters[a]},ifDefined:function(a,b){return"ifDefined("+a+","+this.escape(b)+")"},plus:function(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               b){return"plus("+a+","+b+")"},return_:function(a){this.current().body.push("return ",a,";")},if_:function(a,b,d){if(!0===a)b();else{var c=this.current().body;c.push("if(",a,"){");b();c.push("}");d&&(c.push("else{"),d(),c.push("}"))}},not:function(a){return"!("+a+")"},isNull:function(a){return a+"==null"},notNull:function(a){return a+"!=null"},nonComputedMember:function(a,b){var d=/[^$_a-zA-Z0-9]/g;return/^[$_a-zA-Z][$_a-zA-Z0-9]*$/.test(b)?a+"."+b:a+'["'+b.replace(d,this.stringEscapeFn)+'"]'},computedMember:function(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         b){return a+"["+b+"]"},member:function(a,b,d){return d?this.computedMember(a,b):this.nonComputedMember(a,b)},getStringValue:function(a){this.assign(a,"getStringValue("+a+")")},lazyRecurse:function(a,b,d,c,e,f){var g=this;return function(){g.recurse(a,b,d,c,e,f)}},lazyAssign:function(a,b){var d=this;return function(){d.assign(a,b)}},stringEscapeRegex:/[^ a-zA-Z0-9]/g,stringEscapeFn:function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)},escape:function(a){if(E(a))return"'"+a.replace(this.stringEscapeRegex,
-+            this.stringEscapeFn)+"'";if(Y(a))return a.toString();if(!0===a)return"true";if(!1===a)return"false";if(null===a)return"null";if("undefined"===typeof a)return"undefined";throw Xa("esc");},nextId:function(a,b){var d="v"+this.state.nextId++;a||this.current().vars.push(d+(b?"="+b:""));return d},current:function(){return this.state[this.state.computing]}};Kd.prototype={compile:function(a){var b=this;W(a,b.$filter);var d,c;if(d=Id(a))c=this.recurse(d);d=Gd(a.body);var e;d&&(e=[],r(d,function(a,c){var d=
-+            b.recurse(a);d.isPure=a.isPure;a.input=d;e.push(d);a.watchId=c}));var f=[];r(a.body,function(a){f.push(b.recurse(a.expression))});a=0===a.body.length?D:1===a.body.length?f[0]:function(a,b){var c;r(f,function(d){c=d(a,b)});return c};c&&(a.assign=function(a,b,d){return c(a,d,b)});e&&(a.inputs=e);return a},recurse:function(a,b,d){var c,e,f=this,g;if(a.input)return this.inputs(a.input,a.watchId);switch(a.type){case q.Literal:return this.value(a.value,b);case q.UnaryExpression:return e=this.recurse(a.argument),
-+            this["unary"+a.operator](e,b);case q.BinaryExpression:return c=this.recurse(a.left),e=this.recurse(a.right),this["binary"+a.operator](c,e,b);case q.LogicalExpression:return c=this.recurse(a.left),e=this.recurse(a.right),this["binary"+a.operator](c,e,b);case q.ConditionalExpression:return this["ternary?:"](this.recurse(a.test),this.recurse(a.alternate),this.recurse(a.consequent),b);case q.Identifier:return f.identifier(a.name,b,d);case q.MemberExpression:return c=this.recurse(a.object,!1,!!d),a.computed||
-+        (e=a.property.name),a.computed&&(e=this.recurse(a.property)),a.computed?this.computedMember(c,e,b,d):this.nonComputedMember(c,e,b,d);case q.CallExpression:return g=[],r(a.arguments,function(a){g.push(f.recurse(a))}),a.filter&&(e=this.$filter(a.callee.name)),a.filter||(e=this.recurse(a.callee,!0)),a.filter?function(a,c,d,f){for(var p=[],n=0;n<g.length;++n)p.push(g[n](a,c,d,f));a=e.apply(void 0,p,f);return b?{context:void 0,name:void 0,value:a}:a}:function(a,c,d,f){var p=e(a,c,d,f),n;if(null!=p.value){n=
-+            [];for(var r=0;r<g.length;++r)n.push(g[r](a,c,d,f));n=p.value.apply(p.context,n)}return b?{value:n}:n};case q.AssignmentExpression:return c=this.recurse(a.left,!0,1),e=this.recurse(a.right),function(a,d,f,g){var p=c(a,d,f,g);a=e(a,d,f,g);p.context[p.name]=a;return b?{value:a}:a};case q.ArrayExpression:return g=[],r(a.elements,function(a){g.push(f.recurse(a))}),function(a,c,d,e){for(var f=[],n=0;n<g.length;++n)f.push(g[n](a,c,d,e));return b?{value:f}:f};case q.ObjectExpression:return g=[],r(a.properties,
-+            function(a){a.computed?g.push({key:f.recurse(a.key),computed:!0,value:f.recurse(a.value)}):g.push({key:a.key.type===q.Identifier?a.key.name:""+a.key.value,computed:!1,value:f.recurse(a.value)})}),function(a,c,d,e){for(var f={},n=0;n<g.length;++n)g[n].computed?f[g[n].key(a,c,d,e)]=g[n].value(a,c,d,e):f[g[n].key]=g[n].value(a,c,d,e);return b?{value:f}:f};case q.ThisExpression:return function(a){return b?{value:a}:a};case q.LocalsExpression:return function(a,c){return b?{value:c}:c};case q.NGValueParameter:return function(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         c,d){return b?{value:d}:d}}},"unary+":function(a,b){return function(d,c,e,f){d=a(d,c,e,f);d=u(d)?+d:0;return b?{value:d}:d}},"unary-":function(a,b){return function(d,c,e,f){d=a(d,c,e,f);d=u(d)?-d:-0;return b?{value:d}:d}},"unary!":function(a,b){return function(d,c,e,f){d=!a(d,c,e,f);return b?{value:d}:d}},"binary+":function(a,b,d){return function(c,e,f,g){var h=a(c,e,f,g);c=b(c,e,f,g);h=Ed(h,c);return d?{value:h}:h}},"binary-":function(a,b,d){return function(c,e,f,g){var h=a(c,e,f,g);c=b(c,e,f,g);
-+            h=(u(h)?h:0)-(u(c)?c:0);return d?{value:h}:h}},"binary*":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)*b(c,e,f,g);return d?{value:c}:c}},"binary/":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)/b(c,e,f,g);return d?{value:c}:c}},"binary%":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)%b(c,e,f,g);return d?{value:c}:c}},"binary===":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)===b(c,e,f,g);return d?{value:c}:c}},"binary!==":function(a,b,d){return function(c,e,f,g){c=a(c,
-+            e,f,g)!==b(c,e,f,g);return d?{value:c}:c}},"binary==":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)==b(c,e,f,g);return d?{value:c}:c}},"binary!=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)!=b(c,e,f,g);return d?{value:c}:c}},"binary<":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)<b(c,e,f,g);return d?{value:c}:c}},"binary>":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)>b(c,e,f,g);return d?{value:c}:c}},"binary<=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,
-+            g)<=b(c,e,f,g);return d?{value:c}:c}},"binary>=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)>=b(c,e,f,g);return d?{value:c}:c}},"binary&&":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)&&b(c,e,f,g);return d?{value:c}:c}},"binary||":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)||b(c,e,f,g);return d?{value:c}:c}},"ternary?:":function(a,b,d,c){return function(e,f,g,h){e=a(e,f,g,h)?b(e,f,g,h):d(e,f,g,h);return c?{value:e}:e}},value:function(a,b){return function(){return b?{context:void 0,
-+            name:void 0,value:a}:a}},identifier:function(a,b,d){return function(c,e,f,g){c=e&&a in e?e:c;d&&1!==d&&c&&null==c[a]&&(c[a]={});e=c?c[a]:void 0;return b?{context:c,name:a,value:e}:e}},computedMember:function(a,b,d,c){return function(e,f,g,h){var k=a(e,f,g,h),l,m;null!=k&&(l=b(e,f,g,h),l+="",c&&1!==c&&k&&!k[l]&&(k[l]={}),m=k[l]);return d?{context:k,name:l,value:m}:m}},nonComputedMember:function(a,b,d,c){return function(e,f,g,h){e=a(e,f,g,h);c&&1!==c&&e&&null==e[b]&&(e[b]={});f=null!=e?e[b]:void 0;
-+            return d?{context:e,name:b,value:f}:f}},inputs:function(a,b){return function(d,c,e,f){return f?f[b]:a(d,c,e)}}};Mb.prototype={constructor:Mb,parse:function(a){a=this.getAst(a);var b=this.astCompiler.compile(a.ast),d=a.ast;b.literal=0===d.body.length||1===d.body.length&&(d.body[0].expression.type===q.Literal||d.body[0].expression.type===q.ArrayExpression||d.body[0].expression.type===q.ObjectExpression);b.constant=a.ast.constant;b.oneTime=a.oneTime;return b},getAst:function(a){var b=!1;a=a.trim();":"===
-+        a.charAt(0)&&":"===a.charAt(1)&&(b=!0,a=a.substring(2));return{ast:this.ast.ast(a),oneTime:b}}};var va=K("$sce"),oa={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},Bc=/_([a-z])/g,Gg=K("$compile"),X=w.document.createElement("a"),Od=ta(w.location.href);Pd.$inject=["$document"];ed.$inject=["$provide"];var Wd=22,Vd=".",Dc="0";Qd.$inject=["$locale"];Sd.$inject=["$locale"];var Rg={yyyy:ea("FullYear",4,0,!1,!0),yy:ea("FullYear",2,0,!0,!0),y:ea("FullYear",1,0,!1,!0),MMMM:mb("Month"),
-+        MMM:mb("Month",!0),MM:ea("Month",2,1),M:ea("Month",1,1),LLLL:mb("Month",!1,!0),dd:ea("Date",2),d:ea("Date",1),HH:ea("Hours",2),H:ea("Hours",1),hh:ea("Hours",2,-12),h:ea("Hours",1,-12),mm:ea("Minutes",2),m:ea("Minutes",1),ss:ea("Seconds",2),s:ea("Seconds",1),sss:ea("Milliseconds",3),EEEE:mb("Day"),EEE:mb("Day",!0),a:function(a,b){return 12>a.getHours()?b.AMPMS[0]:b.AMPMS[1]},Z:function(a,b,d){a=-1*d;return a=(0<=a?"+":"")+(Ob(Math[0<a?"floor":"ceil"](a/60),2)+Ob(Math.abs(a%60),2))},ww:Yd(2),w:Yd(1),
-+        G:Ec,GG:Ec,GGG:Ec,GGGG:function(a,b){return 0>=a.getFullYear()?b.ERANAMES[0]:b.ERANAMES[1]}},Qg=/((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|L+|d+|H+|h+|m+|s+|a|Z|G+|w+))([\s\S]*)/,Pg=/^-?\d+$/;Rd.$inject=["$locale"];var Kg=la(L),Lg=la(ub);Td.$inject=["$parse"];var He=la({restrict:"E",compile:function(a,b){if(!b.href&&!b.xlinkHref)return function(a,b){if("a"===b[0].nodeName.toLowerCase()){var e="[object SVGAnimatedString]"===ia.call(b.prop("href"))?"xlink:href":"href";b.on("click",function(a){b.attr(e)||
-+        a.preventDefault()})}}}}),vb={};r(Gb,function(a,b){function d(a,d,e){a.$watch(e[c],function(a){e.$set(b,!!a)})}if("multiple"!==a){var c=Ea("ng-"+b),e=d;"checked"===a&&(e=function(a,b,e){e.ngModel!==e[c]&&d(a,b,e)});vb[c]=function(){return{restrict:"A",priority:100,link:e}}}});r(sd,function(a,b){vb[b]=function(){return{priority:100,link:function(a,c,e){if("ngPattern"===b&&"/"===e.ngPattern.charAt(0)&&(c=e.ngPattern.match(Vg))){e.$set("ngPattern",new RegExp(c[1],c[2]));return}a.$watch(e[b],function(a){e.$set(b,
-+            a)})}}}});r(["src","srcset","href"],function(a){var b=Ea("ng-"+a);vb[b]=function(){return{priority:99,link:function(d,c,e){var f=a,g=a;"href"===a&&"[object SVGAnimatedString]"===ia.call(c.prop("href"))&&(g="xlinkHref",e.$attr[g]="xlink:href",f=null);e.$observe(b,function(b){b?(e.$set(g,b),Ca&&f&&c.prop(f,e[g])):"href"===a&&e.$set(g,null)})}}}});var Qb={$addControl:D,$$renameControl:function(a,b){a.$name=b},$removeControl:D,$setValidity:D,$setDirty:D,$setPristine:D,$setSubmitted:D};Pb.$inject=["$element",
-+        "$attrs","$scope","$animate","$interpolate"];Pb.prototype={$rollbackViewValue:function(){r(this.$$controls,function(a){a.$rollbackViewValue()})},$commitViewValue:function(){r(this.$$controls,function(a){a.$commitViewValue()})},$addControl:function(a){Ia(a.$name,"input");this.$$controls.push(a);a.$name&&(this[a.$name]=a);a.$$parentForm=this},$$renameControl:function(a,b){var d=a.$name;this[d]===a&&delete this[d];this[b]=a;a.$name=b},$removeControl:function(a){a.$name&&this[a.$name]===a&&delete this[a.$name];
-+            r(this.$pending,function(b,d){this.$setValidity(d,null,a)},this);r(this.$error,function(b,d){this.$setValidity(d,null,a)},this);r(this.$$success,function(b,d){this.$setValidity(d,null,a)},this);cb(this.$$controls,a);a.$$parentForm=Qb},$setDirty:function(){this.$$animate.removeClass(this.$$element,Ya);this.$$animate.addClass(this.$$element,Vb);this.$dirty=!0;this.$pristine=!1;this.$$parentForm.$setDirty()},$setPristine:function(){this.$$animate.setClass(this.$$element,Ya,Vb+" ng-submitted");this.$dirty=
-+            !1;this.$pristine=!0;this.$submitted=!1;r(this.$$controls,function(a){a.$setPristine()})},$setUntouched:function(){r(this.$$controls,function(a){a.$setUntouched()})},$setSubmitted:function(){this.$$animate.addClass(this.$$element,"ng-submitted");this.$submitted=!0;this.$$parentForm.$setSubmitted()}};ae({clazz:Pb,set:function(a,b,d){var c=a[b];c?-1===c.indexOf(d)&&c.push(d):a[b]=[d]},unset:function(a,b,d){var c=a[b];c&&(cb(c,d),0===c.length&&delete a[b])}});var ie=function(a){return["$timeout","$parse",
-+            function(b,d){function c(a){return""===a?d('this[""]').assign:d(a).assign||D}return{name:"form",restrict:a?"EAC":"E",require:["form","^^?form"],controller:Pb,compile:function(d,f){d.addClass(Ya).addClass(nb);var g=f.name?"name":a&&f.ngForm?"ngForm":!1;return{pre:function(a,d,e,f){var p=f[0];if(!("action"in e)){var n=function(b){a.$apply(function(){p.$commitViewValue();p.$setSubmitted()});b.preventDefault()};d[0].addEventListener("submit",n);d.on("$destroy",function(){b(function(){d[0].removeEventListener("submit",
-+                        n)},0,!1)})}(f[1]||p.$$parentForm).$addControl(p);var r=g?c(p.$name):D;g&&(r(a,p),e.$observe(g,function(b){p.$name!==b&&(r(a,void 0),p.$$parentForm.$$renameControl(p,b),r=c(p.$name),r(a,p))}));d.on("$destroy",function(){p.$$parentForm.$removeControl(p);r(a,void 0);O(p,Qb)})}}}}}]},Ie=ie(),Ue=ie(!0),Sg=/^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-][0-2]\d:[0-5]\d|Z)$/,dh=/^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i,
-+        eh=/^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/,Tg=/^\s*(-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/,je=/^(\d{4,})-(\d{2})-(\d{2})$/,ke=/^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Lc=/^(\d{4,})-W(\d\d)$/,le=/^(\d{4,})-(\d\d)$/,me=/^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,ce=S();r(["date","datetime-local","month","time","week"],function(a){ce[a]=
-+        !0});var ne={text:function(a,b,d,c,e,f){Va(a,b,d,c,e,f);Gc(c)},date:ob("date",je,Rb(je,["yyyy","MM","dd"]),"yyyy-MM-dd"),"datetime-local":ob("datetimelocal",ke,Rb(ke,"yyyy MM dd HH mm ss sss".split(" ")),"yyyy-MM-ddTHH:mm:ss.sss"),time:ob("time",me,Rb(me,["HH","mm","ss","sss"]),"HH:mm:ss.sss"),week:ob("week",Lc,function(a,b){if(fa(a))return a;if(E(a)){Lc.lastIndex=0;var d=Lc.exec(a);if(d){var c=+d[1],e=+d[2],f=d=0,g=0,h=0,k=Xd(c),e=7*(e-1);b&&(d=b.getHours(),f=b.getMinutes(),g=b.getSeconds(),h=b.getMilliseconds());
-+                return new Date(c,0,k.getDate()+e,d,f,g,h)}}return NaN},"yyyy-Www"),month:ob("month",le,Rb(le,["yyyy","MM"]),"yyyy-MM"),number:function(a,b,d,c,e,f){Hc(a,b,d,c);de(c);Va(a,b,d,c,e,f);var g,h;if(u(d.min)||d.ngMin)c.$validators.min=function(a){return c.$isEmpty(a)||x(g)||a>=g},d.$observe("min",function(a){g=Wa(a);c.$validate()});if(u(d.max)||d.ngMax)c.$validators.max=function(a){return c.$isEmpty(a)||x(h)||a<=h},d.$observe("max",function(a){h=Wa(a);c.$validate()});if(u(d.step)||d.ngStep){var k;c.$validators.step=
-+                function(a,b){return c.$isEmpty(b)||x(k)||ee(b,g||0,k)};d.$observe("step",function(a){k=Wa(a);c.$validate()})}},url:function(a,b,d,c,e,f){Va(a,b,d,c,e,f);Gc(c);c.$$parserName="url";c.$validators.url=function(a,b){var d=a||b;return c.$isEmpty(d)||dh.test(d)}},email:function(a,b,d,c,e,f){Va(a,b,d,c,e,f);Gc(c);c.$$parserName="email";c.$validators.email=function(a,b){var d=a||b;return c.$isEmpty(d)||eh.test(d)}},radio:function(a,b,d,c){var e=!d.ngTrim||"false"!==Q(d.ngTrim);x(d.name)&&b.attr("name",++qb);
-+                b.on("click",function(a){var g;b[0].checked&&(g=d.value,e&&(g=Q(g)),c.$setViewValue(g,a&&a.type))});c.$render=function(){var a=d.value;e&&(a=Q(a));b[0].checked=a===c.$viewValue};d.$observe("value",c.$render)},range:function(a,b,d,c,e,f){function g(a,c){b.attr(a,d[a]);d.$observe(a,c)}function h(a){p=Wa(a);U(c.$modelValue)||(m?(a=b.val(),p>a&&(a=p,b.val(a)),c.$setViewValue(a)):c.$validate())}function k(a){n=Wa(a);U(c.$modelValue)||(m?(a=b.val(),n<a&&(b.val(n),a=n<p?p:n),c.$setViewValue(a)):c.$validate())}
-+                function l(a){r=Wa(a);U(c.$modelValue)||(m&&c.$viewValue!==b.val()?c.$setViewValue(b.val()):c.$validate())}Hc(a,b,d,c);de(c);Va(a,b,d,c,e,f);var m=c.$$hasNativeValidators&&"range"===b[0].type,p=m?0:void 0,n=m?100:void 0,r=m?1:void 0,q=b[0].validity;a=u(d.min);e=u(d.max);f=u(d.step);var v=c.$render;c.$render=m&&u(q.rangeUnderflow)&&u(q.rangeOverflow)?function(){v();c.$setViewValue(b.val())}:v;a&&(c.$validators.min=m?function(){return!0}:function(a,b){return c.$isEmpty(b)||x(p)||b>=p},g("min",h));e&&
-+                (c.$validators.max=m?function(){return!0}:function(a,b){return c.$isEmpty(b)||x(n)||b<=n},g("max",k));f&&(c.$validators.step=m?function(){return!q.stepMismatch}:function(a,b){return c.$isEmpty(b)||x(r)||ee(b,p||0,r)},g("step",l))},checkbox:function(a,b,d,c,e,f,g,h){var k=fe(h,a,"ngTrueValue",d.ngTrueValue,!0),l=fe(h,a,"ngFalseValue",d.ngFalseValue,!1);b.on("click",function(a){c.$setViewValue(b[0].checked,a&&a.type)});c.$render=function(){b[0].checked=c.$viewValue};c.$isEmpty=function(a){return!1===
-+            a};c.$formatters.push(function(a){return sa(a,k)});c.$parsers.push(function(a){return a?k:l})},hidden:D,button:D,submit:D,reset:D,file:D},Zc=["$browser","$sniffer","$filter","$parse",function(a,b,d,c){return{restrict:"E",require:["?ngModel"],link:{pre:function(e,f,g,h){h[0]&&(ne[L(g.type)]||ne.text)(e,f,g,h[0],b,a,d,c)}}}}],fh=/^(true|false|\d+)$/,mf=function(){function a(a,d,c){var e=u(c)?c:9===Ca?"":null;a.prop("value",e);d.$set("value",c)}return{restrict:"A",priority:100,compile:function(b,d){return fh.test(d.ngValue)?
-+            function(b,d,f){b=b.$eval(f.ngValue);a(d,f,b)}:function(b,d,f){b.$watch(f.ngValue,function(b){a(d,f,b)})}}}},Me=["$compile",function(a){return{restrict:"AC",compile:function(b){a.$$addBindingClass(b);return function(b,c,e){a.$$addBindingInfo(c,e.ngBind);c=c[0];b.$watch(e.ngBind,function(a){c.textContent=gc(a)})}}}}],Oe=["$interpolate","$compile",function(a,b){return{compile:function(d){b.$$addBindingClass(d);return function(c,d,f){c=a(d.attr(f.$attr.ngBindTemplate));b.$$addBindingInfo(d,c.expressions);
-+                d=d[0];f.$observe("ngBindTemplate",function(a){d.textContent=x(a)?"":a})}}}}],Ne=["$sce","$parse","$compile",function(a,b,d){return{restrict:"A",compile:function(c,e){var f=b(e.ngBindHtml),g=b(e.ngBindHtml,function(b){return a.valueOf(b)});d.$$addBindingClass(c);return function(b,c,e){d.$$addBindingInfo(c,e.ngBindHtml);b.$watch(g,function(){var d=f(b);c.html(a.getTrustedHtml(d)||"")})}}}}],lf=la({restrict:"A",require:"ngModel",link:function(a,b,d,c){c.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),
-+        Pe=Jc("",!0),Re=Jc("Odd",0),Qe=Jc("Even",1),Se=Qa({compile:function(a,b){b.$set("ngCloak",void 0);a.removeClass("ng-cloak")}}),Te=[function(){return{restrict:"A",scope:!0,controller:"@",priority:500}}],dd={},gh={blur:!0,focus:!0};r("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),function(a){var b=Ea("ng-"+a);dd[b]=["$parse","$rootScope",function(d,c){return{restrict:"A",compile:function(e,f){var g=
-+            d(f[b]);return function(b,d){d.on(a,function(d){var e=function(){g(b,{$event:d})};gh[a]&&c.$$phase?b.$evalAsync(e):b.$apply(e)})}}}}]});var We=["$animate","$compile",function(a,b){return{multiElement:!0,transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(d,c,e,f,g){var h,k,l;d.$watch(e.ngIf,function(d){d?k||g(function(d,f){k=f;d[d.length++]=b.$$createComment("end ngIf",e.ngIf);h={clone:d};a.enter(d,c.parent(),c)}):(l&&(l.remove(),l=null),k&&(k.$destroy(),k=null),h&&(l=
-+            tb(h.clone),a.leave(l).done(function(a){!1!==a&&(l=null)}),h=null))})}}}],Xe=["$templateRequest","$anchorScroll","$animate",function(a,b,d){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:$.noop,compile:function(c,e){var f=e.ngInclude||e.src,g=e.onload||"",h=e.autoscroll;return function(c,e,m,p,n){var r=0,q,v,y,t=function(){v&&(v.remove(),v=null);q&&(q.$destroy(),q=null);y&&(d.leave(y).done(function(a){!1!==a&&(v=null)}),v=y,y=null)};c.$watch(f,function(f){var m=function(a){!1===
-+        a||!u(h)||h&&!c.$eval(h)||b()},v=++r;f?(a(f,!0).then(function(a){if(!c.$$destroyed&&v===r){var b=c.$new();p.template=a;a=n(b,function(a){t();d.enter(a,null,e).done(m)});q=b;y=a;q.$emit("$includeContentLoaded",f);c.$eval(g)}},function(){c.$$destroyed||v!==r||(t(),c.$emit("$includeContentError",f))}),c.$emit("$includeContentRequested",f)):(t(),p.template=null)})}}}}],of=["$compile",function(a){return{restrict:"ECA",priority:-400,require:"ngInclude",link:function(b,d,c,e){ia.call(d[0]).match(/SVG/)?
-+            (d.empty(),a(fd(e.template,w.document).childNodes)(b,function(a){d.append(a)},{futureParentElement:d})):(d.html(e.template),a(d.contents())(b))}}}],Ye=Qa({priority:450,compile:function(){return{pre:function(a,b,d){a.$eval(d.ngInit)}}}}),kf=function(){return{restrict:"A",priority:100,require:"ngModel",link:function(a,b,d,c){var e=d.ngList||", ",f="false"!==d.ngTrim,g=f?Q(e):e;c.$parsers.push(function(a){if(!x(a)){var b=[];a&&r(a.split(g),function(a){a&&b.push(f?Q(a):a)});return b}});c.$formatters.push(function(a){if(I(a))return a.join(e)});
-+            c.$isEmpty=function(a){return!a||!a.length}}}},nb="ng-valid",$d="ng-invalid",Ya="ng-pristine",Vb="ng-dirty",pb=K("ngModel");Sb.$inject="$scope $exceptionHandler $attrs $element $parse $animate $timeout $q $interpolate".split(" ");Sb.prototype={$$initGetterSetters:function(){if(this.$options.getOption("getterSetter")){var a=this.$$parse(this.$$attr.ngModel+"()"),b=this.$$parse(this.$$attr.ngModel+"($$$p)");this.$$ngModelGet=function(b){var c=this.$$parsedNgModel(b);C(c)&&(c=a(b));return c};this.$$ngModelSet=
-+            function(a,c){C(this.$$parsedNgModel(a))?b(a,{$$$p:c}):this.$$parsedNgModelAssign(a,c)}}else if(!this.$$parsedNgModel.assign)throw pb("nonassign",this.$$attr.ngModel,za(this.$$element));},$render:D,$isEmpty:function(a){return x(a)||""===a||null===a||a!==a},$$updateEmptyClasses:function(a){this.$isEmpty(a)?(this.$$animate.removeClass(this.$$element,"ng-not-empty"),this.$$animate.addClass(this.$$element,"ng-empty")):(this.$$animate.removeClass(this.$$element,"ng-empty"),this.$$animate.addClass(this.$$element,
-+            "ng-not-empty"))},$setPristine:function(){this.$dirty=!1;this.$pristine=!0;this.$$animate.removeClass(this.$$element,Vb);this.$$animate.addClass(this.$$element,Ya)},$setDirty:function(){this.$dirty=!0;this.$pristine=!1;this.$$animate.removeClass(this.$$element,Ya);this.$$animate.addClass(this.$$element,Vb);this.$$parentForm.$setDirty()},$setUntouched:function(){this.$touched=!1;this.$untouched=!0;this.$$animate.setClass(this.$$element,"ng-untouched","ng-touched")},$setTouched:function(){this.$touched=
-+            !0;this.$untouched=!1;this.$$animate.setClass(this.$$element,"ng-touched","ng-untouched")},$rollbackViewValue:function(){this.$$timeout.cancel(this.$$pendingDebounce);this.$viewValue=this.$$lastCommittedViewValue;this.$render()},$validate:function(){if(!U(this.$modelValue)){var a=this.$$lastCommittedViewValue,b=this.$$rawModelValue,d=this.$valid,c=this.$modelValue,e=this.$options.getOption("allowInvalid"),f=this;this.$$runValidators(b,a,function(a){e||d===a||(f.$modelValue=a?b:void 0,f.$modelValue!==
-+        c&&f.$$writeModelToScope())})}},$$runValidators:function(a,b,d){function c(){var c=!0;r(k.$validators,function(d,e){var g=Boolean(d(a,b));c=c&&g;f(e,g)});return c?!0:(r(k.$asyncValidators,function(a,b){f(b,null)}),!1)}function e(){var c=[],d=!0;r(k.$asyncValidators,function(e,g){var k=e(a,b);if(!k||!C(k.then))throw pb("nopromise",k);f(g,void 0);c.push(k.then(function(){f(g,!0)},function(){d=!1;f(g,!1)}))});c.length?k.$$q.all(c).then(function(){g(d)},D):g(!0)}function f(a,b){h===k.$$currentValidationRunId&&
-+        k.$setValidity(a,b)}function g(a){h===k.$$currentValidationRunId&&d(a)}this.$$currentValidationRunId++;var h=this.$$currentValidationRunId,k=this;(function(){var a=k.$$parserName||"parse";if(x(k.$$parserValid))f(a,null);else return k.$$parserValid||(r(k.$validators,function(a,b){f(b,null)}),r(k.$asyncValidators,function(a,b){f(b,null)})),f(a,k.$$parserValid),k.$$parserValid;return!0})()?c()?e():g(!1):g(!1)},$commitViewValue:function(){var a=this.$viewValue;this.$$timeout.cancel(this.$$pendingDebounce);
-+            if(this.$$lastCommittedViewValue!==a||""===a&&this.$$hasNativeValidators)this.$$updateEmptyClasses(a),this.$$lastCommittedViewValue=a,this.$pristine&&this.$setDirty(),this.$$parseAndValidate()},$$parseAndValidate:function(){var a=this.$$lastCommittedViewValue,b=this;if(this.$$parserValid=x(a)?void 0:!0)for(var d=0;d<this.$parsers.length;d++)if(a=this.$parsers[d](a),x(a)){this.$$parserValid=!1;break}U(this.$modelValue)&&(this.$modelValue=this.$$ngModelGet(this.$$scope));var c=this.$modelValue,e=this.$options.getOption("allowInvalid");
-+            this.$$rawModelValue=a;e&&(this.$modelValue=a,b.$modelValue!==c&&b.$$writeModelToScope());this.$$runValidators(a,this.$$lastCommittedViewValue,function(d){e||(b.$modelValue=d?a:void 0,b.$modelValue!==c&&b.$$writeModelToScope())})},$$writeModelToScope:function(){this.$$ngModelSet(this.$$scope,this.$modelValue);r(this.$viewChangeListeners,function(a){try{a()}catch(b){this.$$exceptionHandler(b)}},this)},$setViewValue:function(a,b){this.$viewValue=a;this.$options.getOption("updateOnDefault")&&this.$$debounceViewValueCommit(b)},
-+        $$debounceViewValueCommit:function(a){var b=this.$options.getOption("debounce");Y(b[a])?b=b[a]:Y(b["default"])&&(b=b["default"]);this.$$timeout.cancel(this.$$pendingDebounce);var d=this;0<b?this.$$pendingDebounce=this.$$timeout(function(){d.$commitViewValue()},b):this.$$scope.$root.$$phase?this.$commitViewValue():this.$$scope.$apply(function(){d.$commitViewValue()})},$overrideModelOptions:function(a){this.$options=this.$options.createChild(a);this.$$setUpdateOnEvents()},$processModelValue:function(){var a=
-+            this.$$format();this.$viewValue!==a&&(this.$$updateEmptyClasses(a),this.$viewValue=this.$$lastCommittedViewValue=a,this.$render(),this.$$runValidators(this.$modelValue,this.$viewValue,D))},$$format:function(){for(var a=this.$formatters,b=a.length,d=this.$modelValue;b--;)d=a[b](d);return d},$$setModelValue:function(a){this.$modelValue=this.$$rawModelValue=a;this.$$parserValid=void 0;this.$processModelValue()},$$setUpdateOnEvents:function(){this.$$updateEvents&&this.$$element.off(this.$$updateEvents,
-+            this.$$updateEventHandler);if(this.$$updateEvents=this.$options.getOption("updateOn"))this.$$element.on(this.$$updateEvents,this.$$updateEventHandler)},$$updateEventHandler:function(a){this.$$debounceViewValueCommit(a&&a.type)}};ae({clazz:Sb,set:function(a,b){a[b]=!0},unset:function(a,b){delete a[b]}});var jf=["$rootScope",function(a){return{restrict:"A",require:["ngModel","^?form","^?ngModelOptions"],controller:Sb,priority:1,compile:function(b){b.addClass(Ya).addClass("ng-untouched").addClass(nb);
-+            return{pre:function(a,b,e,f){var g=f[0];b=f[1]||g.$$parentForm;if(f=f[2])g.$options=f.$options;g.$$initGetterSetters();b.$addControl(g);e.$observe("name",function(a){g.$name!==a&&g.$$parentForm.$$renameControl(g,a)});a.$on("$destroy",function(){g.$$parentForm.$removeControl(g)})},post:function(b,c,e,f){function g(){h.$setTouched()}var h=f[0];h.$$setUpdateOnEvents();c.on("blur",function(){h.$touched||(a.$$phase?b.$evalAsync(g):b.$apply(g))})}}}}}],Tb,hh=/(\s+|^)default(\s+|$)/;Kc.prototype={getOption:function(a){return this.$$options[a]},
-+        createChild:function(a){var b=!1;a=O({},a);r(a,function(d,c){"$inherit"===d?"*"===c?b=!0:(a[c]=this.$$options[c],"updateOn"===c&&(a.updateOnDefault=this.$$options.updateOnDefault)):"updateOn"===c&&(a.updateOnDefault=!1,a[c]=Q(d.replace(hh,function(){a.updateOnDefault=!0;return" "})))},this);b&&(delete a["*"],ge(a,this.$$options));ge(a,Tb.$$options);return new Kc(a)}};Tb=new Kc({updateOn:"",updateOnDefault:!0,debounce:0,getterSetter:!1,allowInvalid:!1,timezone:null});var nf=function(){function a(a,
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            d){this.$$attrs=a;this.$$scope=d}a.$inject=["$attrs","$scope"];a.prototype={$onInit:function(){var a=this.parentCtrl?this.parentCtrl.$options:Tb,d=this.$$scope.$eval(this.$$attrs.ngModelOptions);this.$options=a.createChild(d)}};return{restrict:"A",priority:10,require:{parentCtrl:"?^^ngModelOptions"},bindToController:!0,controller:a}},Ze=Qa({terminal:!0,priority:1E3}),ih=K("ngOptions"),jh=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([$\w][$\w]*)|(?:\(\s*([$\w][$\w]*)\s*,\s*([$\w][$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,
-+        gf=["$compile","$document","$parse",function(a,b,d){function c(a,b,c){function e(a,b,c,d,f){this.selectValue=a;this.viewValue=b;this.label=c;this.group=d;this.disabled=f}function f(a){var b;if(!r&&wa(a))b=a;else{b=[];for(var c in a)a.hasOwnProperty(c)&&"$"!==c.charAt(0)&&b.push(c)}return b}var p=a.match(jh);if(!p)throw ih("iexp",a,za(b));var n=p[5]||p[7],r=p[6];a=/ as /.test(p[0])&&p[1];var q=p[9];b=d(p[2]?p[1]:n);var v=a&&d(a)||b,u=q&&d(q),t=q?function(a,b){return u(c,b)}:function(a){return Pa(a)},
-+            w=function(a,b){return t(a,C(a,b))},x=d(p[2]||p[1]),A=d(p[3]||""),H=d(p[4]||""),G=d(p[8]),z={},C=r?function(a,b){z[r]=b;z[n]=a;return z}:function(a){z[n]=a;return z};return{trackBy:q,getTrackByValue:w,getWatchables:d(G,function(a){var b=[];a=a||[];for(var d=f(a),e=d.length,g=0;g<e;g++){var h=a===d?g:d[g],l=a[h],h=C(l,h),l=t(l,h);b.push(l);if(p[2]||p[1])l=x(c,h),b.push(l);p[4]&&(h=H(c,h),b.push(h))}return b}),getOptions:function(){for(var a=[],b={},d=G(c)||[],g=f(d),h=g.length,n=0;n<h;n++){var p=d===
-+            g?n:g[n],r=C(d[p],p),u=v(c,r),p=t(u,r),y=x(c,r),F=A(c,r),r=H(c,r),u=new e(p,u,y,F,r);a.push(u);b[p]=u}return{items:a,selectValueMap:b,getOptionFromViewValue:function(a){return b[w(a)]},getViewValueFromOption:function(a){return q?pa(a.viewValue):a.viewValue}}}}}var e=w.document.createElement("option"),f=w.document.createElement("optgroup");return{restrict:"A",terminal:!0,require:["select","ngModel"],link:{pre:function(a,b,c,d){d[0].registerOption=D},post:function(d,h,k,l){function m(a){var b=(a=t.getOptionFromViewValue(a))&&
-+                    a.element;b&&!b.selected&&(b.selected=!0);return a}function p(a,b){a.element=b;b.disabled=a.disabled;a.label!==b.label&&(b.label=a.label,b.textContent=a.label);b.value=a.selectValue}var n=l[0],q=l[1],s=k.multiple;l=0;for(var v=h.children(),y=v.length;l<y;l++)if(""===v[l].value){n.hasEmptyOption=!0;n.emptyOption=v.eq(l);break}h.empty();l=!!n.emptyOption;z(e.cloneNode(!1)).val("?");var t,w=c(k.ngOptions,h,d),x=b[0].createDocumentFragment();n.generateUnknownOptionValue=function(a){return"?"};s?(n.writeValue=
-+                    function(a){if(t){var b=a&&a.map(m)||[];t.items.forEach(function(a){a.element.selected&&-1===Array.prototype.indexOf.call(b,a)&&(a.element.selected=!1)})}},n.readValue=function(){var a=h.val()||[],b=[];r(a,function(a){(a=t.selectValueMap[a])&&!a.disabled&&b.push(t.getViewValueFromOption(a))});return b},w.trackBy&&d.$watchCollection(function(){if(I(q.$viewValue))return q.$viewValue.map(function(a){return w.getTrackByValue(a)})},function(){q.$render()})):(n.writeValue=function(a){if(t){var b=h[0].options[h[0].selectedIndex],
-+                    c=t.getOptionFromViewValue(a);b&&b.removeAttribute("selected");c?(h[0].value!==c.selectValue&&(n.removeUnknownOption(),h[0].value=c.selectValue,c.element.selected=!0),c.element.setAttribute("selected","selected")):n.selectUnknownOrEmptyOption(a)}},n.readValue=function(){var a=t.selectValueMap[h.val()];return a&&!a.disabled?(n.unselectEmptyOption(),n.removeUnknownOption(),t.getViewValueFromOption(a)):null},w.trackBy&&d.$watch(function(){return w.getTrackByValue(q.$viewValue)},function(){q.$render()}));
-+                    l&&(a(n.emptyOption)(d),h.prepend(n.emptyOption),8===n.emptyOption[0].nodeType?(n.hasEmptyOption=!1,n.registerOption=function(a,b){""===b.val()&&(n.hasEmptyOption=!0,n.emptyOption=b,n.emptyOption.removeClass("ng-scope"),q.$render(),b.on("$destroy",function(){var a=n.$isEmptyOptionSelected();n.hasEmptyOption=!1;n.emptyOption=void 0;a&&q.$render()}))}):n.emptyOption.removeClass("ng-scope"));d.$watchCollection(w.getWatchables,function(){var a=t&&n.readValue();if(t)for(var b=t.items.length-1;0<=b;b--){var c=
-+                        t.items[b];u(c.group)?Fb(c.element.parentNode):Fb(c.element)}t=w.getOptions();var d={};t.items.forEach(function(a){var b;if(u(a.group)){b=d[a.group];b||(b=f.cloneNode(!1),x.appendChild(b),b.label=null===a.group?"null":a.group,d[a.group]=b);var c=e.cloneNode(!1);b.appendChild(c);p(a,c)}else b=e.cloneNode(!1),x.appendChild(b),p(a,b)});h[0].appendChild(x);q.$render();q.$isEmpty(a)||(b=n.readValue(),(w.trackBy||s?sa(a,b):a===b)||(q.$setViewValue(b),q.$render()))})}}}}],$e=["$locale","$interpolate","$log",
-+            function(a,b,d){var c=/{}/g,e=/^when(Minus)?(.+)$/;return{link:function(f,g,h){function k(a){g.text(a||"")}var l=h.count,m=h.$attr.when&&g.attr(h.$attr.when),p=h.offset||0,n=f.$eval(m)||{},q={},s=b.startSymbol(),v=b.endSymbol(),u=s+l+"-"+p+v,t=$.noop,w;r(h,function(a,b){var c=e.exec(b);c&&(c=(c[1]?"-":"")+L(c[2]),n[c]=g.attr(h.$attr[b]))});r(n,function(a,d){q[d]=b(a.replace(c,u))});f.$watch(l,function(b){var c=parseFloat(b),e=U(c);e||c in n||(c=a.pluralCat(c-p));c===w||e&&U(w)||(t(),e=q[c],x(e)?(null!=
-+                b&&d.debug("ngPluralize: no rule defined for '"+c+"' in "+m),t=D,k()):t=f.$watch(e,k),w=c)})}}}],af=["$parse","$animate","$compile",function(a,b,d){var c=K("ngRepeat"),e=function(a,b,c,d,e,m,p){a[c]=d;e&&(a[e]=m);a.$index=b;a.$first=0===b;a.$last=b===p-1;a.$middle=!(a.$first||a.$last);a.$odd=!(a.$even=0===(b&1))};return{restrict:"A",multiElement:!0,transclude:"element",priority:1E3,terminal:!0,$$tlb:!0,compile:function(f,g){var h=g.ngRepeat,k=d.$$createComment("end ngRepeat",h),l=h.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);
-+                if(!l)throw c("iexp",h);var m=l[1],p=l[2],n=l[3],q=l[4],l=m.match(/^(?:(\s*[$\w]+)|\(\s*([$\w]+)\s*,\s*([$\w]+)\s*\))$/);if(!l)throw c("iidexp",m);var s=l[3]||l[1],v=l[2];if(n&&(!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(n)||/^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(n)))throw c("badident",n);var u,t,w,x,z={$id:Pa};q?u=a(q):(w=function(a,b){return Pa(b)},x=function(a){return a});return function(a,d,f,g,l){u&&(t=function(b,c,d){v&&(z[v]=b);z[s]=c;z.$index=
-+                    d;return u(a,z)});var m=S();a.$watchCollection(p,function(f){var g,p,q=d[0],u,y=S(),z,F,C,A,D,B,E;n&&(a[n]=f);if(wa(f))D=f,p=t||w;else for(E in p=t||x,D=[],f)ra.call(f,E)&&"$"!==E.charAt(0)&&D.push(E);z=D.length;E=Array(z);for(g=0;g<z;g++)if(F=f===D?g:D[g],C=f[F],A=p(F,C,g),m[A])B=m[A],delete m[A],y[A]=B,E[g]=B;else{if(y[A])throw r(E,function(a){a&&a.scope&&(m[a.id]=a)}),c("dupes",h,A,C);E[g]={id:A,scope:void 0,clone:void 0};y[A]=!0}for(u in m){B=m[u];A=tb(B.clone);b.leave(A);if(A[0].parentNode)for(g=
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                0,p=A.length;g<p;g++)A[g].$$NG_REMOVED=!0;B.scope.$destroy()}for(g=0;g<z;g++)if(F=f===D?g:D[g],C=f[F],B=E[g],B.scope){u=q;do u=u.nextSibling;while(u&&u.$$NG_REMOVED);B.clone[0]!==u&&b.move(tb(B.clone),null,q);q=B.clone[B.clone.length-1];e(B.scope,g,s,C,v,F,z)}else l(function(a,c){B.scope=c;var d=k.cloneNode(!1);a[a.length++]=d;b.enter(a,null,q);q=d;B.clone=a;y[B.id]=B;e(B.scope,g,s,C,v,F,z)});m=y})}}}}],bf=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(b,d,c){b.$watch(c.ngShow,
-+                function(b){a[b?"removeClass":"addClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],Ve=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(b,d,c){b.$watch(c.ngHide,function(b){a[b?"addClass":"removeClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],cf=Qa(function(a,b,d){a.$watch(d.ngStyle,function(a,d){d&&a!==d&&r(d,function(a,c){b.css(c,"")});a&&b.css(a)},!0)}),df=["$animate","$compile",function(a,b){return{require:"ngSwitch",controller:["$scope",function(){this.cases=
-+                {}}],link:function(d,c,e,f){var g=[],h=[],k=[],l=[],m=function(a,b){return function(c){!1!==c&&a.splice(b,1)}};d.$watch(e.ngSwitch||e.on,function(c){for(var d,e;k.length;)a.cancel(k.pop());d=0;for(e=l.length;d<e;++d){var q=tb(h[d].clone);l[d].$destroy();(k[d]=a.leave(q)).done(m(k,d))}h.length=0;l.length=0;(g=f.cases["!"+c]||f.cases["?"])&&r(g,function(c){c.transclude(function(d,e){l.push(e);var f=c.element;d[d.length++]=b.$$createComment("end ngSwitchWhen");h.push({clone:d});a.enter(d,f.parent(),
-+                f)})})})}}}],ef=Qa({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,b,d,c,e){a=d.ngSwitchWhen.split(d.ngSwitchWhenSeparator).sort().filter(function(a,b,c){return c[b-1]!==a});r(a,function(a){c.cases["!"+a]=c.cases["!"+a]||[];c.cases["!"+a].push({transclude:e,element:b})})}}),ff=Qa({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,b,d,c,e){c.cases["?"]=c.cases["?"]||[];c.cases["?"].push({transclude:e,element:b})}}),kh=K("ngTransclude"),
-+        hf=["$compile",function(a){return{restrict:"EAC",compile:function(b){var d=a(b.contents());b.empty();return function(a,b,f,g,h){function k(){d(a,function(a){b.append(a)})}if(!h)throw kh("orphan",za(b));f.ngTransclude===f.$attr.ngTransclude&&(f.ngTransclude="");f=f.ngTransclude||f.ngTranscludeSlot;h(function(a,c){var d;if(d=a.length)a:{d=0;for(var f=a.length;d<f;d++){var g=a[d];if(g.nodeType!==Oa||g.nodeValue.trim()){d=!0;break a}}d=void 0}d?b.append(a):(k(),c.$destroy())},null,f);f&&!h.isSlotFilled(f)&&
-+            k()}}}}],Je=["$templateCache",function(a){return{restrict:"E",terminal:!0,compile:function(b,d){"text/ng-template"===d.type&&a.put(d.id,b[0].text)}}}],lh={$setViewValue:D,$render:D},mh=["$element","$scope",function(a,b){function d(){g||(g=!0,b.$$postDigest(function(){g=!1;e.ngModelCtrl.$render()}))}function c(a){h||(h=!0,b.$$postDigest(function(){b.$$destroyed||(h=!1,e.ngModelCtrl.$setViewValue(e.readValue()),a&&e.ngModelCtrl.$render())}))}var e=this,f=new Hb;e.selectValueMap={};e.ngModelCtrl=lh;
-+            e.multiple=!1;e.unknownOption=z(w.document.createElement("option"));e.hasEmptyOption=!1;e.emptyOption=void 0;e.renderUnknownOption=function(b){b=e.generateUnknownOptionValue(b);e.unknownOption.val(b);a.prepend(e.unknownOption);Ga(e.unknownOption,!0);a.val(b)};e.updateUnknownOption=function(b){b=e.generateUnknownOptionValue(b);e.unknownOption.val(b);Ga(e.unknownOption,!0);a.val(b)};e.generateUnknownOptionValue=function(a){return"? "+Pa(a)+" ?"};e.removeUnknownOption=function(){e.unknownOption.parent()&&
-+            e.unknownOption.remove()};e.selectEmptyOption=function(){e.emptyOption&&(a.val(""),Ga(e.emptyOption,!0))};e.unselectEmptyOption=function(){e.hasEmptyOption&&Ga(e.emptyOption,!1)};b.$on("$destroy",function(){e.renderUnknownOption=D});e.readValue=function(){var b=a.val(),b=b in e.selectValueMap?e.selectValueMap[b]:b;return e.hasOption(b)?b:null};e.writeValue=function(b){var c=a[0].options[a[0].selectedIndex];c&&Ga(z(c),!1);e.hasOption(b)?(e.removeUnknownOption(),c=Pa(b),a.val(c in e.selectValueMap?
-+                c:b),Ga(z(a[0].options[a[0].selectedIndex]),!0)):e.selectUnknownOrEmptyOption(b)};e.addOption=function(a,b){if(8!==b[0].nodeType){Ia(a,'"option value"');""===a&&(e.hasEmptyOption=!0,e.emptyOption=b);var c=f.get(a)||0;f.set(a,c+1);d()}};e.removeOption=function(a){var b=f.get(a);b&&(1===b?(f.delete(a),""===a&&(e.hasEmptyOption=!1,e.emptyOption=void 0)):f.set(a,b-1))};e.hasOption=function(a){return!!f.get(a)};e.$hasEmptyOption=function(){return e.hasEmptyOption};e.$isUnknownOptionSelected=function(){return a[0].options[0]===
-+                e.unknownOption[0]};e.$isEmptyOptionSelected=function(){return e.hasEmptyOption&&a[0].options[a[0].selectedIndex]===e.emptyOption[0]};e.selectUnknownOrEmptyOption=function(a){null==a&&e.emptyOption?(e.removeUnknownOption(),e.selectEmptyOption()):e.unknownOption.parent().length?e.updateUnknownOption(a):e.renderUnknownOption(a)};var g=!1,h=!1;e.registerOption=function(a,b,f,g,h){if(f.$attr.ngValue){var q,r=NaN;f.$observe("value",function(a){var d,f=b.prop("selected");u(r)&&(e.removeOption(q),delete e.selectValueMap[r],
-+                d=!0);r=Pa(a);q=a;e.selectValueMap[r]=a;e.addOption(a,b);b.attr("value",r);d&&f&&c()})}else g?f.$observe("value",function(a){e.readValue();var d,f=b.prop("selected");u(q)&&(e.removeOption(q),d=!0);q=a;e.addOption(a,b);d&&f&&c()}):h?a.$watch(h,function(a,d){f.$set("value",a);var g=b.prop("selected");d!==a&&e.removeOption(d);e.addOption(a,b);d&&g&&c()}):e.addOption(f.value,b);f.$observe("disabled",function(a){if("true"===a||a&&b.prop("selected"))e.multiple?c(!0):(e.ngModelCtrl.$setViewValue(null),e.ngModelCtrl.$render())});
-+                b.on("$destroy",function(){var a=e.readValue(),b=f.value;e.removeOption(b);d();(e.multiple&&a&&-1!==a.indexOf(b)||a===b)&&c(!0)})}}],Ke=function(){return{restrict:"E",require:["select","?ngModel"],controller:mh,priority:1,link:{pre:function(a,b,d,c){var e=c[0],f=c[1];if(f){if(e.ngModelCtrl=f,b.on("change",function(){e.removeUnknownOption();a.$apply(function(){f.$setViewValue(e.readValue())})}),d.multiple){e.multiple=!0;e.readValue=function(){var a=[];r(b.find("option"),function(b){b.selected&&!b.disabled&&
-+                (b=b.value,a.push(b in e.selectValueMap?e.selectValueMap[b]:b))});return a};e.writeValue=function(a){r(b.find("option"),function(b){var c=!!a&&(-1!==Array.prototype.indexOf.call(a,b.value)||-1!==Array.prototype.indexOf.call(a,e.selectValueMap[b.value]));c!==b.selected&&Ga(z(b),c)})};var g,h=NaN;a.$watch(function(){h!==f.$viewValue||sa(g,f.$viewValue)||(g=ka(f.$viewValue),f.$render());h=f.$viewValue});f.$isEmpty=function(a){return!a||0===a.length}}}else e.registerOption=D},post:function(a,b,d,c){var e=
-+                    c[1];if(e){var f=c[0];e.$render=function(){f.writeValue(e.$viewValue)}}}}}},Le=["$interpolate",function(a){return{restrict:"E",priority:100,compile:function(b,d){var c,e;u(d.ngValue)||(u(d.value)?c=a(d.value,!0):(e=a(b.text(),!0))||d.$set("value",b.text()));return function(a,b,d){var k=b.parent();(k=k.data("$selectController")||k.parent().data("$selectController"))&&k.registerOption(a,b,d,c,e)}}}}],ad=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){c&&(d.required=!0,c.$validators.required=
-+                function(a,b){return!d.required||!c.$isEmpty(b)},d.$observe("required",function(){c.$validate()}))}}},$c=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e,f=d.ngPattern||d.pattern;d.$observe("pattern",function(a){E(a)&&0<a.length&&(a=new RegExp("^"+a+"$"));if(a&&!a.test)throw K("ngPattern")("noregexp",f,a,za(b));e=a||void 0;c.$validate()});c.$validators.pattern=function(a,b){return c.$isEmpty(b)||x(e)||e.test(b)}}}}},cd=function(){return{restrict:"A",require:"?ngModel",
-+            link:function(a,b,d,c){if(c){var e=-1;d.$observe("maxlength",function(a){a=Z(a);e=U(a)?-1:a;c.$validate()});c.$validators.maxlength=function(a,b){return 0>e||c.$isEmpty(b)||b.length<=e}}}}},bd=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e=0;d.$observe("minlength",function(a){e=Z(a)||0;c.$validate()});c.$validators.minlength=function(a,b){return c.$isEmpty(b)||b.length>=e}}}}};w.angular.bootstrap?w.console&&console.log("WARNING: Tried to load AngularJS more than once."):
-+        (Be(),Ee($),$.module("ngLocale",[],["$provide",function(a){function b(a){a+="";var b=a.indexOf(".");return-1==b?0:a.length-b-1}a.value("$locale",{DATETIME_FORMATS:{AMPMS:["AM","PM"],DAY:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),ERANAMES:["Before Christ","Anno Domini"],ERAS:["BC","AD"],FIRSTDAYOFWEEK:6,MONTH:"January February March April May June July August September October November December".split(" "),SHORTDAY:"Sun Mon Tue Wed Thu Fri Sat".split(" "),SHORTMONTH:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),
-+                STANDALONEMONTH:"January February March April May June July August September October November December".split(" "),WEEKENDRANGE:[5,6],fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",medium:"MMM d, y h:mm:ss a",mediumDate:"MMM d, y",mediumTime:"h:mm:ss a","short":"M/d/yy h:mm a",shortDate:"M/d/yy",shortTime:"h:mm a"},NUMBER_FORMATS:{CURRENCY_SYM:"$",DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{gSize:3,lgSize:3,maxFrac:3,minFrac:0,minInt:1,negPre:"-",negSuf:"",posPre:"",posSuf:""},{gSize:3,lgSize:3,maxFrac:2,
-+                    minFrac:2,minInt:1,negPre:"-\u00a4",negSuf:"",posPre:"\u00a4",posSuf:""}]},id:"en-us",localeID:"en_US",pluralCat:function(a,c){var e=a|0,f=c;void 0===f&&(f=Math.min(b(a),3));Math.pow(10,f);return 1==e&&0==f?"one":"other"}})}]),z(function(){we(w.document,Uc)}))})(window);!window.angular.$$csp().noInlineStyle&&window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
-+//# sourceMappingURL=angular.min.js.map
-\ No newline at end of file
-diff --git a/setup/pub/images/magento-logo.svg b/setup/pub/images/magento-logo.svg
-index 6dcc79d33b2..e4f627809b6 100644
---- a/setup/pub/images/magento-logo.svg
-+++ b/setup/pub/images/magento-logo.svg
-@@ -1,18 +1 @@
--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
--<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
--<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1 Tiny//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd'>
--<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="214px" xml:space="preserve" height="62px" viewBox="0 0 214 62" baseProfile="tiny" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink">
--	<path d="m93.166 44.96l-1.809-23.096-9.17 23.221h-2.988l-9.17-23.221-1.767 23.096h-3.702l2.314-29.026h4.88l9.045 23.809 9.045-23.809h4.836l2.271 29.026h-3.785z" fill="#131108"/>
--	<path d="m112.94 44.96l-0.421-2.692c-1.597 1.639-3.785 3.112-7.066 3.112-3.619 0-5.889-2.188-5.889-5.596 0-5.006 4.29-6.981 12.663-7.867v-0.841c0-2.523-1.515-3.407-3.83-3.407-2.439 0-4.754 0.757-6.94 1.725l-0.505-3.238c2.398-0.969 4.67-1.682 7.783-1.682 4.88 0 7.236 1.976 7.236 6.435v14.051h-3.02zm-0.72-10.182c-7.406 0.715-8.963 2.735-8.963 4.796 0 1.642 1.095 2.693 2.989 2.693 2.187 0 4.291-1.095 5.974-2.82v-4.669z" fill="#131108"/>
--	<path d="m137.46 24.599l0.546 3.364-3.826 0.378c0.546 0.926 0.799 1.979 0.799 3.113 0 4.292-3.618 6.899-7.699 6.899-0.504 0-1.011-0.042-1.514-0.126-0.589 0.38-1.01 0.844-1.01 1.22 0 0.716 0.714 0.886 4.248 1.517l1.432 0.252c4.249 0.757 6.898 2.102 6.898 5.216 0 4.206-4.586 6.183-9.802 6.183s-9.381-1.64-9.381-5.173c0-2.062 1.431-3.66 4.248-5.174-0.882-0.631-1.26-1.348-1.26-2.104 0-0.969 0.756-1.936 2.103-2.734-2.229-1.095-3.744-3.238-3.744-5.974 0-4.332 3.616-6.981 7.697-6.981 2.019 0 3.786 0.587 5.175 1.682l5.08-1.558zm-15.73 22.547c0 1.599 2.06 2.775 5.972 2.775 3.913 0 6.099-1.345 6.099-3.027 0-1.222-0.924-2.061-3.784-2.566l-2.397-0.422c-1.095-0.208-1.682-0.336-2.481-0.502-2.36 1.177-3.41 2.356-3.41 3.742zm5.47-19.939c-2.522 0-4.081 1.936-4.081 4.375 0 2.313 1.6 4.12 4.081 4.12 2.566 0 4.165-1.892 4.165-4.29 0-2.397-1.68-4.205-4.16-4.205z" fill="#131108"/>
--	<path d="m155.3 35.325h-13.631c0.125 4.669 2.354 6.856 5.847 6.856 2.904 0 5.007-1.135 7.193-2.86l0.546 3.367c-2.144 1.682-4.709 2.691-8.031 2.691-5.219 0-9.299-3.155-9.299-10.519 0-6.435 3.787-10.388 8.835-10.388 5.846 0 8.54 4.5 8.54 10.052v0.801zm-8.58-7.908c-2.313 0-4.291 1.641-4.879 5.09h9.675c-0.47-3.239-1.9-5.09-4.8-5.09z" fill="#131108"/>
--	<path d="m171.07 44.96v-13.673c0-2.06-0.883-3.449-3.07-3.449-1.977 0-3.996 1.305-5.807 3.239v13.883h-3.743v-20.067h2.986l0.463 2.903c1.893-1.724 4.251-3.323 7.108-3.323 3.786 0 5.808 2.271 5.808 5.888v14.599h-3.75z" fill="#131108"/>
--	<path d="m185.88 45.298c-3.532 0-5.846-1.265-5.846-5.304v-11.946h-3.03v-3.156h3.03v-6.688l3.66-0.546v7.234h4.332l0.505 3.156h-4.837v11.273c0 1.643 0.675 2.651 2.776 2.651 0.673 0 1.262-0.041 1.724-0.127l0.506 3.196c-0.63 0.128-1.51 0.257-2.81 0.257z" fill="#131108"/>
--	<path d="m198.29 45.38c-5.342 0-9.213-3.827-9.213-10.434 0-6.605 3.871-10.473 9.213-10.473 5.383 0 9.339 3.868 9.339 10.473 0 6.607-3.96 10.434-9.34 10.434zm0-17.753c-3.617 0-5.426 3.113-5.426 7.319 0 4.125 1.892 7.321 5.426 7.321 3.702 0 5.553-3.114 5.553-7.321 0-4.122-1.93-7.319-5.55-7.319z" fill="#131108"/>
--		<path d="m210.28 27.897c-1.505 0-2.551-1.045-2.551-2.606 0-1.55 1.067-2.618 2.551-2.618 1.505 0 2.55 1.056 2.55 2.618 0 1.55-1.07 2.606-2.55 2.606zm0-4.92c-1.214 0-2.18 0.831-2.18 2.314 0 1.472 0.966 2.303 2.18 2.303 1.225 0 2.191-0.832 2.191-2.303 0-1.483-0.98-2.314-2.19-2.314zm0.75 3.708l-0.863-1.237h-0.281v1.191h-0.495v-2.888h0.878c0.606 0 1.01 0.303 1.01 0.843 0 0.416-0.225 0.686-0.585 0.798l0.833 1.18-0.5 0.113zm-0.76-2.484h-0.383v0.854h0.359c0.325 0 0.53-0.135 0.53-0.427 0-0.281-0.18-0.427-0.51-0.427z" fill="#131108"/>
--	<g fill="#E85D22">
--		<path d="m26.845 8.857"/>
--		<polygon points="53.692 15.5 53.692 46.5 46.021 50.929 46.021 19.929 26.845 8.857 7.67 19.928 7.67 50.929 0 46.5 0 15.5 26.845 0"/>
--		<polygon points="26.847 62 15.341 55.356 15.341 24.357 23.011 19.928 23.011 50.929 26.845 53.257 30.682 50.929 30.682 19.929 38.353 24.357 38.353 55.356"/>
--	</g>
--</svg>
-+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.07329 60.13148"><defs><style>.a{fill:#f26322;}.b{fill:#4d4d4d;}</style></defs><title>Magento-an-Adobe-Company-logo-horizontal</title><polygon class="a" points="21.432 0 0 12.373 0 37.086 6.117 40.619 6.076 15.906 21.391 7.064 36.704 15.906 36.704 40.612 42.822 37.086 42.822 12.35 21.432 0"/><polygon class="a" points="24.47 40.618 21.412 42.39 18.341 40.631 18.341 15.906 12.225 19.438 12.235 44.15 21.407 49.448 30.587 44.15 30.587 19.438 24.47 15.906 24.47 40.618"/><path class="b" d="M56.83813,12.5216l8.41451,21.258h.06808L73.531,12.5216h3.20261V36.87914h-2.2145v-21.223H74.451q-.17069.57915-.37444,1.15831-.17213.477-.39291,1.05522c-.14685.38707-.27814.74983-.391,1.09023l-7.052,17.91925H64.23049L57.11044,18.95989q-.20422-.477-.40847-1.03869t-.3754-1.07272q-.20424-.61417-.40848-1.19235H55.85v21.223H53.73763V12.5216Z"/><path class="b" d="M83.16956,36.98155a5.18444,5.18444,0,0,1-1.82256-.92,4.32686,4.32686,0,0,1-1.20888-1.53274,4.88654,4.88654,0,0,1-.44348-2.14545,5.01721,5.01721,0,0,1,.57867-2.55586,4.4721,4.4721,0,0,1,1.56775-1.58429,7.91353,7.91353,0,0,1,2.29911-.90253,24.63306,24.63306,0,0,1,2.81067-.47655q1.29545-.13713,2.198-.28982a6.67488,6.67488,0,0,0,1.46466-.39194,1.74967,1.74967,0,0,0,.81694-.63021,1.93855,1.93855,0,0,0,.25578-1.07272V24.139A3.21282,3.21282,0,0,0,90.596,21.4645,4.92377,4.92377,0,0,0,87.4624,20.595q-4.7018,0-4.94056,3.91841H80.44447a5.74847,5.74847,0,0,1,1.89064-4.08861A7.50173,7.50173,0,0,1,87.4624,18.8921,7.336,7.336,0,0,1,92.02659,20.17a4.92221,4.92221,0,0,1,1.66986,4.17322v9.57282a1.80589,1.80589,0,0,0,.28983,1.1408,1.14194,1.14194,0,0,0,.86848.39194,2.038,2.038,0,0,0,.3579-.034c.12449-.02237.26648-.05738.425-.10212h.10309v1.53274a3.99429,3.99429,0,0,1-.57964.18771,3.60124,3.60124,0,0,1-.852.08558,2.69449,2.69449,0,0,1-1.8391-.59714,2.57739,2.57739,0,0,1-.74983-1.89064v-.37444h-.10212a10.28754,10.28754,0,0,1-.90252,1.05619,6.08059,6.08059,0,0,1-1.27794.98812,7.1451,7.1451,0,0,1-1.737.71482,8.46792,8.46792,0,0,1-2.24853.27232,8.161,8.161,0,0,1-2.28258-.30636m5.19537-1.8566a5.975,5.975,0,0,0,1.8566-1.17484,4.76767,4.76767,0,0,0,1.4987-3.44089V27.34065a7.29273,7.29273,0,0,1-2.06084.73233q-1.20936.2553-2.50432.426-1.12329.17068-2.07737.3579a5.243,5.243,0,0,0-1.65236.59617,3.05235,3.05235,0,0,0-1.10773,1.10677,3.58626,3.58626,0,0,0-.40847,1.82353,3.2604,3.2604,0,0,0,.32386,1.53274,2.77919,2.77919,0,0,0,.851.98714,3.34368,3.34368,0,0,0,1.24389.52907,7.139,7.139,0,0,0,1.4987.15269,6.55762,6.55762,0,0,0,2.53836-.46"/><path class="b" d="M99.3499,41.73412a4.68909,4.68909,0,0,1-2.0093-3.28722h2.04334a2.86247,2.86247,0,0,0,1.65236,2.197,7.52105,7.52105,0,0,0,3.28819.66425,5.69284,5.69284,0,0,0,4.17322-1.345,4.99842,4.99842,0,0,0,1.345-3.69667V33.47327h-.10212a7.27781,7.27781,0,0,1-2.28258,2.2816,6.2891,6.2891,0,0,1-3.30375.78388,7.37745,7.37745,0,0,1-3.13453-.64675,6.92683,6.92683,0,0,1-2.3847-1.806,8.09694,8.09694,0,0,1-1.51621-2.77664,11.4194,11.4194,0,0,1-.52809-3.55954,10.89083,10.89083,0,0,1,.6127-3.79878,8.46783,8.46783,0,0,1,1.63583-2.77663,6.74456,6.74456,0,0,1,2.40221-1.70294,7.447,7.447,0,0,1,2.91279-.57964,6.23565,6.23565,0,0,1,3.37183.83542,6.92287,6.92287,0,0,1,2.2145,2.26507h.10212V19.26721h2.07834V36.19836a6.77964,6.77964,0,0,1-1.63583,4.73535,7.75455,7.75455,0,0,1-5.89269,2.11238,8.36019,8.36019,0,0,1-5.04267-1.312m9.23243-8.90857a8.55521,8.55521,0,0,0,1.39658-5.10978,11.225,11.225,0,0,0-.34039-2.86222,6.23339,6.23339,0,0,0-1.05619-2.231,4.8341,4.8341,0,0,0-1.78853-1.44812,5.76685,5.76685,0,0,0-2.50334-.51059,4.78168,4.78168,0,0,0-4.07111,1.94121,8.46075,8.46075,0,0,0-1.44812,5.17883,10.779,10.779,0,0,0,.34039,2.77664,6.6521,6.6521,0,0,0,1.02215,2.2145,4.81441,4.81441,0,0,0,1.70294,1.46466,5.20818,5.20818,0,0,0,2.4197.52809,4.969,4.969,0,0,0,4.32592-1.94218"/><path class="b" d="M119.24391,36.62385a7.17983,7.17983,0,0,1-2.57239-1.94121,8.67267,8.67267,0,0,1-1.58331-2.9303,11.83376,11.83376,0,0,1-.54561-3.66166,11.20538,11.20538,0,0,1,.57964-3.66262,9.15057,9.15057,0,0,1,1.61736-2.92933,7.3041,7.3041,0,0,1,2.52182-1.94218,7.68893,7.68893,0,0,1,3.32126-.6983,7.26371,7.26371,0,0,1,3.55953.80041,6.669,6.669,0,0,1,2.35067,2.14643,8.80226,8.80226,0,0,1,1.27793,3.083,16.91087,16.91087,0,0,1,.37442,3.57705H116.72307a10.20565,10.20565,0,0,0,.426,2.77663,6.97713,6.97713,0,0,0,1.12427,2.231,5.10411,5.10411,0,0,0,1.8566,1.4987,5.94442,5.94442,0,0,0,2.623.5456,4.98891,4.98891,0,0,0,3.42434-1.07369,5.88046,5.88046,0,0,0,1.71948-2.87778H129.941a7.5058,7.5058,0,0,1-2.3847,4.18975,7.07155,7.07155,0,0,1-4.80343,1.56678,8.37716,8.37716,0,0,1-3.509-.69829M127.55631,24.36a5.98459,5.98459,0,0,0-.98811-1.97623,4.52056,4.52056,0,0,0-1.63486-1.311,5.35765,5.35765,0,0,0-2.35066-.47752,5.61864,5.61864,0,0,0-2.36816.47752,5.06368,5.06368,0,0,0-1.75448,1.311,6.54337,6.54337,0,0,0-1.1408,1.95969,9.6597,9.6597,0,0,0-.56214,2.45278h11.17364a9.30557,9.30557,0,0,0-.37443-2.43624"/><path class="b" d="M134.87924,19.26682v2.69105h.06807a7.23505,7.23505,0,0,1,2.33315-2.197,6.8045,6.8045,0,0,1,3.56051-.86849,5.8368,5.8368,0,0,1,4.03706,1.41312,5.17343,5.17343,0,0,1,1.58428,4.0711V36.87973h-2.11238V24.58084a3.71719,3.71719,0,0,0-1.07272-2.94683,4.33224,4.33224,0,0,0-2.94781-.93656,5.90068,5.90068,0,0,0-2.1114.3754,5.56743,5.56743,0,0,0-1.73795,1.03869,4.77387,4.77387,0,0,0-1.17485,1.58428,4.72061,4.72061,0,0,0-.426,2.00929V36.87973h-2.1124V19.26682Z"/><path class="b" d="M151.91191,36.28355a2.93417,2.93417,0,0,1-.92-2.43624V21.00477h-2.657v-1.738h2.657V13.85069h2.11239v5.41613h3.27068v1.738h-3.27068V33.50692a1.65111,1.65111,0,0,0,.426,1.312,1.94949,1.94949,0,0,0,1.277.35693,3.61925,3.61925,0,0,0,.76638-.08462,3.514,3.514,0,0,0,.63021-.1877h.10309v1.806a5.90754,5.90754,0,0,1-1.94219.30635,3.82424,3.82424,0,0,1-2.45277-.73233"/><path class="b" d="M162.625,36.62424a7.37783,7.37783,0,0,1-2.57142-1.94219,8.72758,8.72758,0,0,1-1.61833-2.92932,12.21028,12.21028,0,0,1,0-7.32429,8.74174,8.74174,0,0,1,1.61833-2.93029A7.38946,7.38946,0,0,1,162.625,19.556a8.10343,8.10343,0,0,1,3.42436-.69829,7.98376,7.98376,0,0,1,3.40588.69829,7.43133,7.43133,0,0,1,2.55585,1.94219,8.50888,8.50888,0,0,1,1.60083,2.93029,12.56344,12.56344,0,0,1,0,7.32429,8.51161,8.51161,0,0,1-1.60083,2.92932,7.4195,7.4195,0,0,1-2.55585,1.94219,7.96929,7.96929,0,0,1-3.40588.69829,8.08867,8.08867,0,0,1-3.42436-.69829m6.0133-1.65237a5.30977,5.30977,0,0,0,1.87312-1.60082,7.23411,7.23411,0,0,0,1.12426-2.38469,11.35618,11.35618,0,0,0,0-5.79155,7.21572,7.21572,0,0,0-1.12426-2.38469,5.29013,5.29013,0,0,0-1.87312-1.60082,6.11061,6.11061,0,0,0-5.19538,0,5.5025,5.5025,0,0,0-1.87411,1.60082,7.037,7.037,0,0,0-1.14079,2.38469,11.38462,11.38462,0,0,0,0,5.79155,7.05452,7.05452,0,0,0,1.14079,2.38469,5.81691,5.81691,0,0,0,7.06949,1.60082"/><path class="b" d="M176.85586,22.19069a2.1284,2.1284,0,0,1-2.21371-2.26492,2.21634,2.21634,0,1,1,4.43114,0,2.14565,2.14565,0,0,1-2.21743,2.26492m0-4.2762a1.8463,1.8463,0,0,0-1.8928,2.01128,1.90119,1.90119,0,1,0,3.79717,0,1.85428,1.85428,0,0,0-1.90437-2.01128m.65338,3.22135-.751-1.07325h-.24266v1.03463h-.4296V18.58836h.76256c.52629,0,.8771.26363.8771.73238a.6799.6799,0,0,1-.50839.69275l.72373,1.02463Zm-.66074-2.15649h-.333v.741h.312c.28255,0,.46008-.11708.46008-.371,0-.24422-.15811-.37-.43911-.37"/><path class="b" d="M56.01605,53.8,54.9537,56.78168a.11575.11575,0,0,1-.11831.08828h-1.0035c-.07867,0-.10809-.039-.08828-.1183l3.21708-8.95821c.01982-.05945.039-.12551.05885-.19938a2.24879,2.24879,0,0,0,.04444-.406.06529.06529,0,0,1,.07387-.07387h1.44669a.08244.08244,0,0,1,.08828.07387l3.4681,9.57856c.03.06906.00961.10329-.05885.10329H60.96026a.13273.13273,0,0,1-.1177-.07386L59.7652,53.8Zm3.40924-1.13622q-.118-.354-.33209-.97407-.2135-.61975-.44981-1.28395-.236-.66479-.44259-1.28394c-.13813-.41377-.24142-.74767-.31048-1.0041h-.01441q-.08828.35491-.25823.87858-.17025.52338-.38375,1.13622-.21438.61255-.44259,1.26954-.22971.65668-.43539,1.26172Z"/><path class="b" d="M63.39544,51.36484c0-.12791-.0024-.27024-.0072-.42818-.00481-.15674-.00961-.30988-.015-.457-.0048-.14773-.00961-.28525-.01441-.41377a2.64678,2.64678,0,0,0-.02222-.27985.07822.07822,0,0,1,.08828-.08888h.91522a.14145.14145,0,0,1,.13271.08888,1.53405,1.53405,0,0,1,.04444.29486q.01441.19188.04444.4426a3.09954,3.09954,0,0,1,2.258-.97407,3.028,3.028,0,0,1,.81913.1183,1.9399,1.9399,0,0,1,.7747.43539,2.34944,2.34944,0,0,1,.58312.87078,3.76544,3.76544,0,0,1,.2288,1.42388v4.3689a.09138.09138,0,0,1-.10329.10329H68.08864c-.06846,0-.1033-.039-.1033-.1183V52.51607a2.28923,2.28923,0,0,0-.36873-1.35781,1.31944,1.31944,0,0,0-1.15122-.51646,2.232,2.232,0,0,0-1.02572.236,2.5679,2.5679,0,0,0-.81913.66419v5.22467c0,.06906-.02943.10329-.08828.10329H63.48432c-.05945,0-.08888-.03423-.08888-.10329Z"/><path class="b" d="M76.05776,53.8l-1.06235,2.98166a.11574.11574,0,0,1-.11831.08828H73.87361c-.07867,0-.1081-.039-.08828-.1183l3.21707-8.95821c.01982-.05945.039-.12551.05886-.19938a2.24974,2.24974,0,0,0,.04444-.406.06529.06529,0,0,1,.07386-.07387h1.4467a.08242.08242,0,0,1,.08827.07387l3.4681,9.57856c.03.06906.00961.10329-.05885.10329H81.002a.13274.13274,0,0,1-.11771-.07386L79.80691,53.8ZM79.467,52.6638q-.118-.354-.3321-.97407-.2135-.61975-.4498-1.28395-.236-.66479-.4426-1.28394c-.13812-.41377-.24141-.74767-.31048-1.0041h-.01441q-.08827.35491-.25823.87858-.17025.52338-.38374,1.13622-.21439.61255-.4426,1.26954-.2297.65668-.43539,1.26172Z"/><path class="b" d="M86.52211,57.01769a4.36237,4.36237,0,0,1-1.43108-.2288,3.18223,3.18223,0,0,1-1.159-.69362,3.22815,3.22815,0,0,1-.77469-1.15123,4.21828,4.21828,0,0,1-.28046-1.60163,3.89269,3.89269,0,0,1,.28766-1.505,3.51871,3.51871,0,0,1,.81913-1.20287,3.79829,3.79829,0,0,1,1.26954-.79691,4.4664,4.4664,0,0,1,1.63826-.28826,3.83172,3.83172,0,0,1,.51646.02943q.20629.02971.41317.05945V46.37618A.07822.07822,0,0,1,87.91,46.2879H88.9723c.05886,0,.08888.02463.08888.07387v9.63741a2.39778,2.39778,0,0,0,.02943.36873.1037.1037,0,0,1-.07387.1033,5.609,5.609,0,0,1-1.25452.421A6.24619,6.24619,0,0,1,86.52211,57.01769Zm1.299-6.25759a1.79213,1.79213,0,0,0-.42818-.1111,3.72916,3.72916,0,0,0-.53087-.03663,3.04975,3.04975,0,0,0-1.13682.19938,2.44176,2.44176,0,0,0-.85576.5603,2.51242,2.51242,0,0,0-.54589.84916,2.85873,2.85873,0,0,0-.19217,1.06235,3.225,3.225,0,0,0,.20658,1.22509,2.20392,2.20392,0,0,0,.5609.81913,2.238,2.238,0,0,0,.80412.46482,2.98757,2.98757,0,0,0,.93744.14773,5.30729,5.30729,0,0,0,.61255-.03723,1.79256,1.79256,0,0,0,.5681-.15494Z"/><path class="b" d="M94.0048,49.54942a3.367,3.367,0,0,1,1.40165.28045,3.04715,3.04715,0,0,1,1.05575.7825,3.57864,3.57864,0,0,1,.6714,1.18065,4.775,4.775,0,0,1-.015,3.0105,3.49229,3.49229,0,0,1-.69362,1.18065,3.1081,3.1081,0,0,1-1.06235.76028A3.63586,3.63586,0,0,1,92.477,56.6928a3.05685,3.05685,0,0,1-1.05515-.85576,3.61278,3.61278,0,0,1-.61255-1.20288,4.7316,4.7316,0,0,1-.19937-1.3506,4.4214,4.4214,0,0,1,.236-1.46111,3.57928,3.57928,0,0,1,.6792-1.18786,3.11326,3.11326,0,0,1,1.07016-.79691A3.33517,3.33517,0,0,1,94.0048,49.54942Zm-.05945,1.063a1.89444,1.89444,0,0,0-.85577.19157,1.92937,1.92937,0,0,0-.657.53868,2.61525,2.61525,0,0,0-.42759.83415,3.54279,3.54279,0,0,0-.15493,1.07736,3.66655,3.66655,0,0,0,.14713,1.05514,2.76175,2.76175,0,0,0,.421.86358,1.91175,1.91175,0,0,0,.67861.57531,2.035,2.035,0,0,0,.93744.20658,1.96491,1.96491,0,0,0,.76748-.15493,1.84307,1.84307,0,0,0,.6642-.487,2.49873,2.49873,0,0,0,.472-.82634,3.52827,3.52827,0,0,0,.17716-1.18786,3.92545,3.92545,0,0,0-.12551-.99629,2.7098,2.7098,0,0,0-.38375-.85637,1.95032,1.95032,0,0,0-.6714-.60474A2.01331,2.01331,0,0,0,93.94535,50.61237Z"/><path class="b" d="M100.0408,46.2879a.306.306,0,0,1,.08107.00721c.01441.00541.02222.03243.02222.08107v3.4687a4.173,4.173,0,0,1,1.59382-.29546,3.58246,3.58246,0,0,1,1.38724.25823,3.09666,3.09666,0,0,1,1.063.72365,3.20021,3.20021,0,0,1,.67861,1.09177,3.89335,3.89335,0,0,1,.236,1.38,4.117,4.117,0,0,1-.34651,1.74876,3.82231,3.82231,0,0,1-.91522,1.25452,3.7297,3.7297,0,0,1-1.30616.76028,4.69867,4.69867,0,0,1-1.52.251,7.89894,7.89894,0,0,1-1.05515-.06665,4.98849,4.98849,0,0,1-.96686-.22881c-.05945-.00961-.08888-.05405-.08888-.13272V46.37618c0-.05885.03483-.08828.10329-.08828Zm3.8074,6.8185a2.56051,2.56051,0,0,0-.61975-1.80762,2.17677,2.17677,0,0,0-1.68271-.672,4.04312,4.04312,0,0,0-.79691.06666,3.23058,3.23058,0,0,0-.60474.18437V55.837a1.79408,1.79408,0,0,0,.44259.09548q.236.02253.53148.02222a3.01325,3.01325,0,0,0,1.02572-.17715,2.47409,2.47409,0,0,0,.87077-.53088,2.606,2.606,0,0,0,.60474-.893A3.168,3.168,0,0,0,103.8482,53.1064Z"/><path class="b" d="M107.49406,53.43129a3.19549,3.19549,0,0,0,.14713.98848,2.09051,2.09051,0,0,0,1.2323,1.32839,2.83109,2.83109,0,0,0,1.08517.19217,4.67893,4.67893,0,0,0,.95185-.09608,3.80289,3.80289,0,0,0,.893-.30267c.04924-.02943.07387-.00961.07387.05885v.84135a.15833.15833,0,0,1-.07387.14773,4.09138,4.09138,0,0,1-.87859.30988,5.25576,5.25576,0,0,1-1.20227.1183A3.73874,3.73874,0,0,1,108.0988,56.7a2.91958,2.91958,0,0,1-1.07016-.84075,3.42439,3.42439,0,0,1-.59033-1.18126,4.90632,4.90632,0,0,1-.18436-1.33559,4.77784,4.77784,0,0,1,.2216-1.46111,3.65843,3.65843,0,0,1,.642-1.21008,3.08964,3.08964,0,0,1,1.02572-.81913,3.02553,3.02553,0,0,1,1.37223-.30267,2.85068,2.85068,0,0,1,1.3434.28826,2.69551,2.69551,0,0,1,.88519.723,2.872,2.872,0,0,1,.49484.95906,3.5172,3.5172,0,0,1,.15494.99629c0,.18737-.00541.34471-.015.47262a1.534,1.534,0,0,1-.04444.29487c0,.05885-.03423.08828-.10329.08828a4.6844,4.6844,0,0,1-.59753.04444q-.43509.0153-.92243.015Zm2.75946-.91522q.5459,0,.73086-.00721a.87793.87793,0,0,0,.21379-.02222.18758.18758,0,0,0,.015-.08107V52.3245a2.183,2.183,0,0,0-.07386-.49484,1.6987,1.6987,0,0,0-.81193-1.06235,1.67106,1.67106,0,0,0-.85576-.19938,1.8819,1.8819,0,0,0-.80472.16214,1.81914,1.81914,0,0,0-.59033.43539,2.10609,2.10609,0,0,0-.38374.62756,2.88327,2.88327,0,0,0-.18437.72305Z"/><path class="b" d="M123.90493,56.58951q0,.13332-.07387.14773a3.03678,3.03678,0,0,1-.87018.221,9.606,9.606,0,0,1-1.1218.05945,6.05385,6.05385,0,0,1-1.82263-.28045,4.34791,4.34791,0,0,1-2.73064-2.45019,5.58386,5.58386,0,0,1-.43539-2.31687,5.42272,5.42272,0,0,1,.36873-2.02921,4.53276,4.53276,0,0,1,1.04073-1.57941,4.72052,4.72052,0,0,1,1.63106-1.02572,5.9251,5.9251,0,0,1,2.13971-.36873,7.70183,7.70183,0,0,1,1.19567.07327,2.76709,2.76709,0,0,1,.69362.19217.11466.11466,0,0,1,.07387.1177v.98909c0,.06906-.03483.09368-.1033.07386a4.12534,4.12534,0,0,0-1.88928-.3393,4.42133,4.42133,0,0,0-1.58662.27264,3.57637,3.57637,0,0,0-1.2323.7753,3.397,3.397,0,0,0-.79692,1.21729,4.36453,4.36453,0,0,0-.28045,1.60163,4.26707,4.26707,0,0,0,.38375,1.91811,3.45094,3.45094,0,0,0,.96686,1.21789,3.5879,3.5879,0,0,0,1.26173.63477,4.80043,4.80043,0,0,0,1.25452.18436,8.46656,8.46656,0,0,0,.99629-.05164,3.41056,3.41056,0,0,0,.84856-.2138c.05885-.0102.08828.00961.08828.05886Z"/><path class="b" d="M128.24441,49.54942a3.367,3.367,0,0,1,1.40165.28045,3.04711,3.04711,0,0,1,1.05574.7825,3.57864,3.57864,0,0,1,.6714,1.18065,4.77506,4.77506,0,0,1-.015,3.0105,3.49245,3.49245,0,0,1-.69362,1.18065,3.1081,3.1081,0,0,1-1.06235.76028,3.63588,3.63588,0,0,1-2.88558-.05165,3.05681,3.05681,0,0,1-1.05514-.85576,3.61259,3.61259,0,0,1-.61255-1.20288,4.73127,4.73127,0,0,1-.19938-1.3506,4.4214,4.4214,0,0,1,.236-1.46111,3.57931,3.57931,0,0,1,.67921-1.18786,3.11307,3.11307,0,0,1,1.07016-.79691A3.33517,3.33517,0,0,1,128.24441,49.54942Zm-.05946,1.063a1.8944,1.8944,0,0,0-.85576.19157,1.9294,1.9294,0,0,0-.657.53868,2.61523,2.61523,0,0,0-.42758.83415,3.54279,3.54279,0,0,0-.15494,1.07736,3.66655,3.66655,0,0,0,.14713,1.05514,2.76176,2.76176,0,0,0,.421.86358,1.91163,1.91163,0,0,0,.6786.57531,2.03506,2.03506,0,0,0,.93744.20658,1.96492,1.96492,0,0,0,.76749-.15493,1.843,1.843,0,0,0,.66419-.487,2.49838,2.49838,0,0,0,.472-.82634,3.528,3.528,0,0,0,.17716-1.18786,3.92545,3.92545,0,0,0-.12551-.99629,2.70978,2.70978,0,0,0-.38374-.85637,1.9505,1.9505,0,0,0-.6714-.60474A2.01335,2.01335,0,0,0,128.18495,50.61237Z"/><path class="b" d="M133.23306,56.87c-.05945,0-.08887-.03423-.08887-.10329V51.24714q0-.48734-.01442-.87078c-.01021-.25583-.02462-.45281-.04444-.59033a.07822.07822,0,0,1,.08828-.08888h.93023a.13273.13273,0,0,1,.11771.07387,2.41793,2.41793,0,0,1,.05164.32489c.015.13752.027.26543.03724.38374a3.15175,3.15175,0,0,1,2.21358-.93023,2.08207,2.08207,0,0,1,1.96315,1.07736,4.58846,4.58846,0,0,1,1.06235-.76748,2.97888,2.97888,0,0,1,1.40225-.30988,2.91332,2.91332,0,0,1,.83415.12551,1.96871,1.96871,0,0,1,.76749.4426,2.35258,2.35258,0,0,1,.5681.86357,3.73571,3.73571,0,0,1,.221,1.38724v4.41334c0,.05886-.03423.08828-.10329.08828H142.2213a.09114.09114,0,0,1-.10329-.10329V52.45722a2.22321,2.22321,0,0,0-.36213-1.28395,1.28407,1.28407,0,0,0-1.14342-.53147,2.20014,2.20014,0,0,0-1.0113.2288,2.71959,2.71959,0,0,0-.80412.627,3.28749,3.28749,0,0,1,.05164.406c.015.18257.02222.36153.02222.53868v4.32447a.09138.09138,0,0,1-.10329.10329h-1.03352a.09138.09138,0,0,1-.10329-.10329V52.41278a2.02372,2.02372,0,0,0-.37594-1.30617,1.33264,1.33264,0,0,0-1.09958-.46481,2.16377,2.16377,0,0,0-.93744.19937,3.1054,3.1054,0,0,0-.84856.627v5.31355a.078.078,0,0,1-.08828.08828Z"/><path class="b" d="M148.16841,49.54942a3.7728,3.7728,0,0,1,1.4539.266,3.12905,3.12905,0,0,1,1.08517.73025,3.17548,3.17548,0,0,1,.67861,1.10679,3.97,3.97,0,0,1,.236,1.38,4.01744,4.01744,0,0,1-.36152,1.75657,3.63794,3.63794,0,0,1-.95906,1.24672,4.03655,4.03655,0,0,1-1.35781.73806,5.01586,5.01586,0,0,1-1.54218.24381c-.16755,0-.30808-.0054-.421-.015s-.224-.02462-.33209-.04444v2.95224a.09123.09123,0,0,1-.07387.10329c-.08828.00961-.18917.01922-.30267.02943-.1129.00961-.2264.02222-.3393.03663-.11291.015-.21139.027-.29487.03723q-.1261.01441-.14052.01442-.07387,0-.07387-.08828V50.84838c0-.06846-.0024-.17-.00721-.30267s-.01261-.248-.02222-.34651a.05974.05974,0,0,1,.02943-.05945q.38375-.14684,1.09238-.36873A5.54961,5.54961,0,0,1,148.16841,49.54942Zm-.14713,1.07736a4.19213,4.19213,0,0,0-.72364.05946,3.48071,3.48071,0,0,0-.64918.17715v5.00308a1.81449,1.81449,0,0,0,.41316.07386c.14774.00961.29006.01441.42819.01441a3.34545,3.34545,0,0,0,1.04793-.16935,2.70564,2.70564,0,0,0,.92243-.51646,2.57376,2.57376,0,0,0,.65639-.88579,2.99471,2.99471,0,0,0,.251-1.27674,2.579,2.579,0,0,0-.61255-1.80762A2.22666,2.22666,0,0,0,148.02128,50.62678Z"/><path class="b" d="M158.234,55.61544V55.977a2.09429,2.09429,0,0,0,.02943.34711.05979.05979,0,0,1-.02943.05886,6.00124,6.00124,0,0,1-1.4539.50925,6.9604,6.9604,0,0,1-1.30617.12551,3.85578,3.85578,0,0,1-1.09237-.14773,2.59513,2.59513,0,0,1-.87078-.43539,1.97765,1.97765,0,0,1-.57531-.723,2.32883,2.32883,0,0,1-.20659-1.01131,1.89323,1.89323,0,0,1,.25823-1.0107,2.16417,2.16417,0,0,1,.70083-.70083,3.24349,3.24349,0,0,1,1.04073-.41377,5.96124,5.96124,0,0,1,1.29115-.13272q.41347,0,.657.00721.24321.00811.36152.02222v-.35371a1.93718,1.93718,0,0,0-.05885-.42819,1.25647,1.25647,0,0,0-.236-.47983,1.50152,1.50152,0,0,0-.502-.39815,1.88625,1.88625,0,0,0-.87078-.17,4.21382,4.21382,0,0,0-1.0107.1183,3.662,3.662,0,0,0-.86357.32429c-.06907.01982-.1033-.0048-.1033-.07386v-.90021a.13163.13163,0,0,1,.07387-.1177,4.345,4.345,0,0,1,.96626-.3249,5.26451,5.26451,0,0,1,1.129-.1183,3.03846,3.03846,0,0,1,1.21789.2216,2.21246,2.21246,0,0,1,.82634.59753,2.48678,2.48678,0,0,1,.47262.87859,3.633,3.633,0,0,1,.15494,1.07736Zm-1.19567-2.16974a3.56574,3.56574,0,0,0-.39875-.04384c-.15734-.00961-.34892-.015-.57532-.015a2.94006,2.94006,0,0,0-1.601.34711,1.09634,1.09634,0,0,0-.52427.96626,1.36586,1.36586,0,0,0,.08888.487,1.03106,1.03106,0,0,0,.30207.421,1.60324,1.60324,0,0,0,.54649.29487,2.61144,2.61144,0,0,0,.81913.1111,3.469,3.469,0,0,0,1.3428-.251Z"/><path class="b" d="M160.29986,51.36484c0-.12791-.0024-.27024-.00721-.42818-.0048-.15674-.00961-.30988-.015-.457-.00481-.14773-.00961-.28525-.01441-.41377a2.64953,2.64953,0,0,0-.02222-.27985.07821.07821,0,0,1,.08827-.08888h.91522a.14147.14147,0,0,1,.13272.08888,1.53485,1.53485,0,0,1,.04444.29486q.01442.19188.04444.4426a3.09953,3.09953,0,0,1,2.258-.97407,3.028,3.028,0,0,1,.81913.1183,1.93993,1.93993,0,0,1,.77469.43539,2.34932,2.34932,0,0,1,.58312.87078,3.76523,3.76523,0,0,1,.22881,1.42388v4.3689a.09138.09138,0,0,1-.10329.10329h-1.03353c-.06846,0-.10329-.039-.10329-.1183V52.51607a2.28923,2.28923,0,0,0-.36873-1.35781,1.31945,1.31945,0,0,0-1.15123-.51646,2.23206,2.23206,0,0,0-1.02572.236,2.568,2.568,0,0,0-.81913.66419v5.22467c0,.06906-.02942.10329-.08828.10329h-1.04793c-.05946,0-.08888-.03423-.08888-.10329Z"/><path class="b" d="M168.35846,49.69715a.10467.10467,0,0,1,.10329.07387q.45762,1.2251.80412,2.15472.34681.92964.59814,1.60884.25042.67921.40536,1.129.15493.4504.2288.70083.35492-1.01792.83415-2.35411.47922-1.335,1.15843-3.23929a.1336.1336,0,0,1,.11831-.07387H173.657c.06846,0,.08828.03483.05885.10329q-.41347,1.19538-.893,2.48683-.48012,1.29176-.99629,2.59792t-1.05514,2.59011q-.53868,1.28366-1.07016,2.46461a.19465.19465,0,0,1-.16214.10329l-1.10679.08828c-.05946,0-.07387-.039-.04444-.11771q.32429-.6792.70863-1.52776.38285-.84857.75247-1.73435a.21629.21629,0,0,0,0-.19157q-.08827-.22161-.26543-.64918-.17747-.42789-.406-.98909-.2288-.56029-.49424-1.21789-.26574-.65579-.53928-1.33559-.27294-.67831-.53868-1.3428-.26484-.6639-.487-1.23951c-.02942-.05945-.0048-.08888.07387-.08888Z"/></svg>
-diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
-index 125b67f950f..229c13d11e2 100644
---- a/setup/pub/magento/setup/add-database.js
-+++ b/setup/pub/magento/setup/add-database.js
-@@ -20,14 +20,14 @@ angular.module('add-database', ['ngStorage'])
- 
-         $scope.testConnection = function () {
-             $http.post('index.php/database-check', $scope.db)
--                .success(function (data) {
--                    $scope.testConnection.result = data;
-+                .then(function successCallback(resp) {
-+                    $scope.testConnection.result = resp.data;
-+
-                     if ($scope.testConnection.result.success) {
-                         $scope.nextState();
-                     }
--                })
--                .error(function (data) {
--                    $scope.testConnection.failed = data;
-+                }, function errorCallback(resp) {
-+                    $scope.testConnection.failed = resp.data;
-                 });
-         };
- 
-diff --git a/setup/pub/magento/setup/app.js b/setup/pub/magento/setup/app.js
-index e6514ea41c0..f0abd15d106 100644
---- a/setup/pub/magento/setup/app.js
-+++ b/setup/pub/magento/setup/app.js
-@@ -31,7 +31,8 @@ var app = angular.module(
-         'home',
-         'auth-dialog',
-         'system-config',
--        'marketplace-credentials'
-+        'marketplace-credentials',
-+        'ngSanitize'
-     ]);
- 
- app.config(['$httpProvider', '$stateProvider', function ($httpProvider, $stateProvider) {
-@@ -55,6 +56,9 @@ app.config(['$httpProvider', '$stateProvider', function ($httpProvider, $statePr
-             return $delegate;
-         });
-     })
-+    .config(['$locationProvider', function($locationProvider) {
-+        $locationProvider.hashPrefix('');
-+    }])
-     .run(function ($rootScope, $state) {
-         $rootScope.$state = $state;
-     });
-diff --git a/setup/pub/magento/setup/complete-backup.js b/setup/pub/magento/setup/complete-backup.js
-index 9c3dd09798d..db7f6fdf8a1 100644
---- a/setup/pub/magento/setup/complete-backup.js
-+++ b/setup/pub/magento/setup/complete-backup.js
-@@ -121,8 +121,7 @@ angular.module('complete-backup', ['ngStorage'])
-         };
- 
-         $scope.disableMeintenanceMode = function() {
--            $http.post('index.php/maintenance/index', {'disable' : true}).success(function(data) {
--            });
-+            $http.post('index.php/maintenance/index', {'disable' : true});
-         };
-         
-         $scope.isCompleted = function() {
-@@ -149,8 +148,9 @@ angular.module('complete-backup', ['ngStorage'])
-         $scope.query = function(item) {
-             if (!$rootScope.hasErrors) {
-                 return $http.post(item.url, $scope.backupInfoPassed, {timeout: 3000000})
--                    .success(function(data) { item.process(data) })
--                    .error(function(data, status) {
-+                    .then(function successCallback(resp) {
-+                        item.process(resp.data);
-+                    }, function errorCallback() {
-                         item.fail();
-                     });
-             } else {
-diff --git a/setup/pub/magento/setup/create-admin-account.js b/setup/pub/magento/setup/create-admin-account.js
-index f6cbd154edf..6e8807bb7a2 100644
---- a/setup/pub/magento/setup/create-admin-account.js
-+++ b/setup/pub/magento/setup/create-admin-account.js
-@@ -51,14 +51,14 @@ angular.module('create-admin-account', ['ngStorage'])
-             $scope.validate();
-             if ($scope.valid) {
-                 $http.post('index.php/validate-admin-credentials', data)
--                    .success(function (data) {
--                        $scope.validateCredentials.result = data;
-+                    .then(function successCallback(resp) {
-+                        $scope.validateCredentials.result = resp.data;
-+
-                         if ($scope.validateCredentials.result.success) {
-                             $scope.nextState();
-                         }
--                    })
--                    .error(function (data) {
--                        $scope.validateCredentials.failed = data;
-+                    }, function errorCallback(resp) {
-+                        $scope.validateCredentials.failed = resp.data;
-                     });
-             }
-         };
-diff --git a/setup/pub/magento/setup/customize-your-store.js b/setup/pub/magento/setup/customize-your-store.js
-index 7404ef67765..d15c07c58ef 100644
---- a/setup/pub/magento/setup/customize-your-store.js
-+++ b/setup/pub/magento/setup/customize-your-store.js
-@@ -31,10 +31,9 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
- 
-         if (!$localStorage.store) {
-             $http.get('index.php/customize-your-store/default-time-zone',{'responseType' : 'json'})
--                .success(function (data) {
--                    $scope.store.timezone = data.defaultTimeZone;
--                })
--                .error(function (data) {
-+                .then(function successCallback(resp) {
-+                    $scope.store.timezone = resp.data.defaultTimeZone;
-+                }, function errorCallback() {
-                     $scope.store.timezone = 'UTC';
-                 });
-         }
-@@ -48,9 +47,12 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
-             $localStorage.store = $scope.store;
-             $scope.loading = true;
-             $http.post('index.php/modules/all-modules-valid', $scope.store)
--                .success(function (data) {
--                    $scope.checkModuleConstraints.result = data;
--                    if (($scope.checkModuleConstraints.result !== undefined) && ($scope.checkModuleConstraints.result.success)) {
-+                .then(function successCallback(resp) {
-+                    $scope.checkModuleConstraints.result = resp.data;
-+
-+                    if ($scope.checkModuleConstraints.result !== undefined &&
-+                        $scope.checkModuleConstraints.result.success
-+                    ) {
-                         $scope.loading = false;
-                         $scope.nextState();
-                     } else {
-@@ -61,17 +63,18 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
-         };
- 
-         if (!$scope.store.loadedAllModules) {
--            $http.get('index.php/modules').success(function (data) {
--                $state.loadedModules = data;
-+            $http.get('index.php/modules').then(function successCallback(resp) {
-+                $state.loadedModules = resp.data;
-                 $scope.store.showModulesControl = true;
--                if (data.error) {
-+
-+                if (resp.data.error) {
-                     $scope.updateOnExpand($scope.store.advanced);
--                    $scope.store.errorMessage = $sce.trustAsHtml(data.error);
-+                    $scope.store.errorMessage = $sce.trustAsHtml(resp.data.error);
-                 }
-             });
-         }
- 
--        $state.loadModules = function(){
-+        $state.loadModules = function () {
-             if(!$scope.store.loadedAllModules) {
-                 var allModules = $scope.$state.loadedModules.modules;
-                 for (var eachModule in allModules) {
-@@ -120,8 +123,9 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
-             var allParameters = {'allModules' : $scope.store.allModules, 'selectedModules' : $scope.store.selectedModules, 'module' : module, 'status' : moduleStatus};
- 
-             $http.post('index.php/modules/validate', allParameters)
--                .success(function (data) {
--                    $scope.checkModuleConstraints.result = data;
-+                .then(function successCallback(resp) {
-+                    $scope.checkModuleConstraints.result = resp.data;
-+
-                     if ((($scope.checkModuleConstraints.result.error !== undefined) && (!$scope.checkModuleConstraints.result.success))) {
-                         $scope.store.errorMessage = $sce.trustAsHtml($scope.checkModuleConstraints.result.error);
-                         if (moduleStatus) {
-@@ -130,7 +134,7 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
-                             $scope.store.selectedModules.push(module);
-                         }
-                     } else {
--                        $state.loadedModules = data;
-+                        $state.loadedModules = resp.data;
-                         $scope.store.errorMessage = false;
-                         $scope.store.showError = false;
-                         $scope.store.errorFlag = false;
-diff --git a/setup/pub/magento/setup/data-option.js b/setup/pub/magento/setup/data-option.js
-index 5eed528ec09..16bde5d32fd 100644
---- a/setup/pub/magento/setup/data-option.js
-+++ b/setup/pub/magento/setup/data-option.js
-@@ -13,9 +13,9 @@ angular.module('data-option', ['ngStorage'])
- 
-         if ($localStorage.componentType === 'magento2-module') {
-             $http.post('index.php/data-option/hasUninstall', {'moduleName' : $localStorage.moduleName})
--                .success(function(data) {
--                    $scope.component.hasUninstall = data.hasUninstall;
--            });
-+                .then(function successCallback(resp) {
-+                    $scope.component.hasUninstall = resp.data.hasUninstall;
-+                });
-         }
- 
-         if ($localStorage.dataOption) {
-diff --git a/setup/pub/magento/setup/extension-grid.js b/setup/pub/magento/setup/extension-grid.js
-index 4f73304282b..416a767a483 100644
---- a/setup/pub/magento/setup/extension-grid.js
-+++ b/setup/pub/magento/setup/extension-grid.js
-@@ -14,7 +14,9 @@ angular.module('extension-grid', ['ngStorage'])
-             $scope.syncError = false;
-             $scope.currentPage = 1;
- 
--            $http.get('index.php/extensionGrid/extensions').success(function (data) {
-+            $http.get('index.php/extensionGrid/extensions').then(function successCallback(resp) {
-+                var data = resp.data;
-+
-                 $scope.extensions = data.extensions;
-                 $scope.total = data.total;
- 
-@@ -37,7 +39,7 @@ angular.module('extension-grid', ['ngStorage'])
-                 }
-                 $scope.availableUpdatePackages = data.lastSyncData.packages;
-                 $scope.currentPage = 1;
--                $scope.rowLimit = 20;
-+                $scope.rowLimit = '20';
-                 $scope.numberOfPages = Math.ceil($scope.total / $scope.rowLimit);
-                 $rootScope.extensionsProcessed = true;
-             });
-@@ -78,7 +80,9 @@ angular.module('extension-grid', ['ngStorage'])
- 
-             $scope.sync = function() {
-                 $scope.isHiddenSpinner = false;
--                $http.get('index.php/extensionGrid/sync').success(function(data) {
-+                $http.get('index.php/extensionGrid/sync').then(function successCallback(resp) {
-+                    var data = resp.data;
-+
-                     if (typeof data.lastSyncData.lastSyncDate !== 'undefined') {
-                         $scope.lastSyncDate = data.lastSyncData.lastSyncDate.date;
-                         $scope.lastSyncTime = data.lastSyncData.lastSyncDate.time;
-diff --git a/setup/pub/magento/setup/install-extension-grid.js b/setup/pub/magento/setup/install-extension-grid.js
-index 46feae60aeb..6a94d99df37 100644
---- a/setup/pub/magento/setup/install-extension-grid.js
-+++ b/setup/pub/magento/setup/install-extension-grid.js
-@@ -8,7 +8,9 @@ angular.module('install-extension-grid', ['ngStorage', 'clickOut'])
-     .controller('installExtensionGridController', ['$scope', '$http', '$localStorage', 'authService', 'paginationService', 'multipleChoiceService',
-         function ($scope, $http, $localStorage, authService, paginationService, multipleChoiceService) {
- 
--            $http.get('index.php/installExtensionGrid/extensions').success(function(data) {
-+            $http.get('index.php/installExtensionGrid/extensions').then(function successCallback(resp) {
-+                var data = resp.data;
-+
-                 $scope.error = false;
-                 $scope.errorMessage = '';
-                 $scope.multipleChoiceService = multipleChoiceService;
-@@ -19,7 +21,7 @@ angular.module('install-extension-grid', ['ngStorage', 'clickOut'])
-                 $scope.extensions = data.extensions;
-                 $scope.total = data.total;
-                 $scope.currentPage = 1;
--                $scope.rowLimit = 20;
-+                $scope.rowLimit = '20';
-                 $scope.numberOfPages = Math.ceil($scope.total / $scope.rowLimit);
-             });
- 
-diff --git a/setup/pub/magento/setup/install.js b/setup/pub/magento/setup/install.js
-index 942e0a1d254..5b847761d2b 100644
---- a/setup/pub/magento/setup/install.js
-+++ b/setup/pub/magento/setup/install.js
-@@ -75,13 +75,16 @@ angular.module('install', ['ngStorage'])
-             $scope.isStarted = true;
-             $scope.isInProgress = true;
-             progress.post(data, function (response) {
-+                response = response.data;
-                 $scope.isInProgress = false;
-+
-                 if (response.success) {
-                     $localStorage.config.encrypt.key = response.key;
-                     $localStorage.messages = response.messages;
-                     $scope.nextState();
-                 } else {
-                     $scope.displayFailure();
-+
-                     if (response.isSampleDataError) {
-                         $scope.isSampleDataError = true;
-                     }
-@@ -105,10 +108,10 @@ angular.module('install', ['ngStorage'])
-     .service('progress', ['$http', function ($http) {
-         return {
-             get: function (callback) {
--                $http.post('index.php/install/progress').then(callback);
-+                $http.post('index.php/install/progress').then(callback, function errorCallback() {});
-             },
-             post: function (data, callback) {
--                $http.post('index.php/install/start', data).success(callback);
-+                $http.post('index.php/install/start', data).then(callback, function errorCallback() {});
-             }
-         };
-     }]);
-diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js
-index d9d8b514566..fa9291e9a85 100644
---- a/setup/pub/magento/setup/main.js
-+++ b/setup/pub/magento/setup/main.js
-@@ -40,11 +40,10 @@ main.controller('navigationController',
-     function ($scope, $state, navigationService, $localStorage, $interval, $http) {
-         $interval(
-             function () {
--                $http.post('index.php/session/prolong')
--                    .success(function (result) {
--                    })
--                    .error(function (result) {
--                    });
-+                $http.post('index.php/session/prolong').then(
-+                    function successCallback() {},
-+                    function errorCallback() {}
-+                );
-             },
-             25000
-         );
-@@ -117,9 +116,12 @@ main.controller('navigationController',
-         isLoadedStates: false,
-         load: function () {
-             var self = this;
--            return $http.get('index.php/navigation').success(function (data) {
--                var currentState = $location.path().replace('/', '');
--                var isCurrentStateFound = false;
-+
-+            return $http.get('index.php/navigation').then(function successCallback(resp) {
-+                var data = resp.data,
-+                    currentState = $location.path().replace('/', ''),
-+                    isCurrentStateFound = false;
-+
-                 self.states = data.nav;
-                 $localStorage.menu = data.menu;
-                 self.titlesWithModuleName.forEach(function (value) {
-@@ -184,34 +186,35 @@ main.controller('navigationController',
-             },
-             reset: function (context) {
-                 return $http.post('index.php/marketplace/remove-credentials', [])
--                    .success(function (response) {
--                        if (response.success) {
-+                    .then(function successCallback(response) {
-+                        if (response.data.success) {
-                             $localStorage.isMarketplaceAuthorized = $rootScope.isMarketplaceAuthorized = false;
-                             context.success();
-                         }
--                    })
--                    .error(function (data) {
-                     });
-             },
-             checkAuth: function(context) {
-                 return $http.post('index.php/marketplace/check-auth', [])
--                    .success(function (response) {
--                        if (response.success) {
-+                    .then(function successCallback(response) {
-+                        var data = response.data;
-+
-+                        if (data.success) {
-                             $rootScope.isMarketplaceAuthorized  = $localStorage.isMarketplaceAuthorized = true;
--                            $localStorage.marketplaceUsername = response.data.username;
--                            context.success(response);
-+                            $localStorage.marketplaceUsername = data.username;
-+                            context.success(data);
-                         } else {
-                             $rootScope.isMarketplaceAuthorized  = $localStorage.isMarketplaceAuthorized = false;
--                            context.fail(response);
-+                            context.fail(data);
-                         }
--                    })
--                    .error(function() {
-+                    }, function errorCallback() {
-                         $rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized = false;
-                         context.error();
-                     });
-             },
-             openAuthDialog: function(scope) {
--                return $http.get('index.php/marketplace/popup-auth').success(function (data) {
-+                return $http.get('index.php/marketplace/popup-auth').then(function successCallback(resp) {
-+                    var data = resp.data;
-+
-                     scope.isHiddenSpinner = true;
-                     ngDialog.open({
-                         scope: scope,
-@@ -227,21 +230,22 @@ main.controller('navigationController',
-             },
-             saveAuthJson: function (context) {
-                 return $http.post('index.php/marketplace/save-auth-json', context.user)
--                    .success(function (response) {
--                        $rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized = response.success;
-+                    .then(function successCallback(response) {
-+                        var data = response.data;
-+
-+                        $rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized = data.success;
-                         $localStorage.marketplaceUsername = context.user.username;
--                        if (response.success) {
--                            context.success(response);
-+                        if (data.success) {
-+                            context.success(data);
-                         } else {
--                            context.fail(response);
-+                            context.fail(data);
-                         }
--                    })
--                    .error(function (data) {
-+                    }, function errorCallback(resp) {
-                         $rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized = false;
--                        context.error(data);
-+                        context.error(resp.data);
-                     });
-             }
--    };
-+        };
-     }]
- )
- .service('titleService', ['$localStorage', '$rootScope',
-diff --git a/setup/pub/magento/setup/marketplace-credentials.js b/setup/pub/magento/setup/marketplace-credentials.js
-index c94fec1c563..a0d17c14d2a 100644
---- a/setup/pub/magento/setup/marketplace-credentials.js
-+++ b/setup/pub/magento/setup/marketplace-credentials.js
-@@ -41,16 +41,21 @@ angular.module('marketplace-credentials', ['ngStorage'])
- 
-             $scope.upgradeProcessError = false;
-             if ($state.current.type == 'upgrade') {
-+                $scope.isHiddenSpinner = false;
-                 $http.get('index.php/select-version/installedSystemPackage', {'responseType' : 'json'})
--                    .success(function (data) {
-+                    .then(function successCallback(resp) {
-+                        var data = resp.data;
-+
-+                        $scope.isHiddenSpinner = true;
-+
-                         if (data.responseType == 'error') {
-                             $scope.upgradeProcessError = true;
-                             $scope.upgradeProcessErrorMessage = $sce.trustAsHtml(data.error);
-                         } else {
-                             $scope.checkAuth();
-                         }
--                    })
--                    .error(function (data) {
-+                    }, function errorCallback() {
-+                        $scope.isHiddenSpinner = true;
-                         $scope.upgradeProcessError = true;
-                     });
-             } else {
-diff --git a/setup/pub/magento/setup/module-grid.js b/setup/pub/magento/setup/module-grid.js
-index 694781a3033..3866c41716a 100644
---- a/setup/pub/magento/setup/module-grid.js
-+++ b/setup/pub/magento/setup/module-grid.js
-@@ -8,11 +8,13 @@ angular.module('module-grid', ['ngStorage'])
-     .controller('moduleGridController', ['$rootScope', '$scope', '$http', '$localStorage', '$state', 'titleService', 'paginationService',
-         function ($rootScope, $scope, $http, $localStorage, $state, titleService, paginationService) {
-             $rootScope.modulesProcessed = false;
--            $http.get('index.php/moduleGrid/modules').success(function(data) {
-+            $http.get('index.php/moduleGrid/modules').then(function successCallback(resp) {
-+                var data = resp.data;
-+
-                 $scope.modules = data.modules;
-                 $scope.total = data.total;
-                 $scope.currentPage = 1;
--                $scope.rowLimit = 20;
-+                $scope.rowLimit = '20';
-                 $scope.numberOfPages = Math.ceil($scope.total/$scope.rowLimit);
-                 $rootScope.modulesProcessed = true;
-             });
-diff --git a/setup/pub/magento/setup/readiness-check.js b/setup/pub/magento/setup/readiness-check.js
-index 23b5dac650a..d32d640cab4 100644
---- a/setup/pub/magento/setup/readiness-check.js
-+++ b/setup/pub/magento/setup/readiness-check.js
-@@ -313,18 +313,18 @@ angular.module('readiness-check', ['remove-dialog'])
-                     item.url = item.url + '?type=' + item.params;
-                 } else {
-                     return $http.post(item.url, item.params)
--                        .success(function (data) {
--                            item.process(data)
--                        })
--                        .error(function (data, status) {
-+                        .then(function successCallback(resp) {
-+                            item.process(resp.data);
-+                        }, function successCallback() {
-                             item.fail();
-                         });
-                 }
-             }
-             // setting 1 minute timeout to prevent system from timing out
--            return $http.get(item.url, {timeout: 60000})
--                .success(function(data) { item.process(data) })
--                .error(function(data, status) {
-+            return $http.get(item.url, { timeout: 60000 })
-+                .then(function successCallback(resp) {
-+                    item.process(resp.data);
-+                }, function errorCallback() {
-                     item.fail();
-                 });
-         };
-diff --git a/setup/pub/magento/setup/select-version.js b/setup/pub/magento/setup/select-version.js
-index 32210d29dcb..52c1f4284a2 100644
---- a/setup/pub/magento/setup/select-version.js
-+++ b/setup/pub/magento/setup/select-version.js
-@@ -28,7 +28,9 @@ angular.module('select-version', ['ngStorage'])
-         };
- 
-         $http.get('index.php/select-version/systemPackage', {'responseType' : 'json'})
--            .success(function (data) {
-+            .then(function successCallback(resp) {
-+                var data = resp.data;
-+
-                 if (data.responseType != 'error') {
-                     $scope.upgradeProcessError = true;
- 
-@@ -70,8 +72,7 @@ angular.module('select-version', ['ngStorage'])
-                     $scope.upgradeProcessErrorMessage = $sce.trustAsHtml(data.error);
-                 }
-                 $scope.upgradeProcessed = true;
--            })
--            .error(function (data) {
-+            }, function errorCallback() {
-                 $scope.upgradeProcessError = true;
-             });
- 
-@@ -104,14 +105,16 @@ angular.module('select-version', ['ngStorage'])
-                 if (!$scope.componentsProcessed && !$scope.componentsProcessError) {
-                     $scope.componentsReadyForNext = false;
-                     $http.get('index.php/other-components-grid/components', {'responseType': 'json'}).
--                        success(function (data) {
-+                        then(function successCallback(resp) {
-+                            var data = resp.data;
-+
-                             if (data.responseType != 'error') {
-                                 $scope.components = data.components;
-                                 $scope.displayComponents = data.components;
-                                 $scope.totalForGrid = data.total;
-                                 $scope.total = data.total;
-                                 $scope.currentPage = 1;
--                                $scope.rowLimit = 20;
-+                                $scope.rowLimit = '20';
-                                 $scope.numberOfPages = Math.ceil(data.total/$scope.rowLimit);
-                                 for (var i = 0; i < $scope.totalForGrid; i++) {
-                                     $scope.packages.push({
-@@ -124,8 +127,7 @@ angular.module('select-version', ['ngStorage'])
-                                 $scope.componentsProcessError = true;
-                             }
-                             $scope.componentsProcessed = true;
--                        })
--                        .error(function (data) {
-+                        }, function errorCallback() {
-                             $scope.componentsProcessError = true;
-                         });
-                 }
-diff --git a/setup/pub/magento/setup/start-updater.js b/setup/pub/magento/setup/start-updater.js
-index 3633da06618..1b6e2e515bf 100644
---- a/setup/pub/magento/setup/start-updater.js
-+++ b/setup/pub/magento/setup/start-updater.js
-@@ -35,14 +35,15 @@ angular.module('start-updater', ['ngStorage'])
-                 'dataOption': $localStorage.dataOption
-             };
-             $http.post('index.php/start-updater/update', payLoad)
--                .success(function (data) {
--                    if (data['success']) {
-+                .then(function successCallback(resp) {
-+                    var data = resp.data;
-+
-+                    if (data.success) {
-                         $window.location.href = '../update/index.php';
-                     } else {
--                        $scope.errorMessage = data['message'];
-+                        $scope.errorMessage = data.message;
-                     }
--                })
--                .error(function (data) {
-+                }, function errorCallback() {
-                     $scope.errorMessage = 'Something went wrong. Please try again.';
-                 });
-         };
-diff --git a/setup/pub/magento/setup/system-config.js b/setup/pub/magento/setup/system-config.js
-index 2956c837ee5..40b155076bc 100644
---- a/setup/pub/magento/setup/system-config.js
-+++ b/setup/pub/magento/setup/system-config.js
-@@ -7,6 +7,7 @@
- angular.module('system-config', ['ngStorage'])
-     .controller('systemConfigController', ['$scope', '$state', '$http', '$localStorage', '$rootScope', 'authService',
-         function ($scope, $state, $http, $localStorage, $rootScope, authService) {
-+        $scope.isHiddenSpinner = false;
-         $scope.user = {
-             username : $localStorage.marketplaceUsername ? $localStorage.marketplaceUsername : '',
-             password : '',
-@@ -27,6 +28,8 @@ angular.module('system-config', ['ngStorage'])
-                     $scope.isHiddenSpinner = true;
-                 }
-             });
-+        } else {
-+            $scope.isHiddenSpinner = true;
-         }
- 
-         $scope.saveAuthJson = function () {
-diff --git a/setup/pub/magento/setup/update-extension-grid.js b/setup/pub/magento/setup/update-extension-grid.js
-index 71d8fbad5de..78af0d7faf3 100644
---- a/setup/pub/magento/setup/update-extension-grid.js
-+++ b/setup/pub/magento/setup/update-extension-grid.js
-@@ -9,7 +9,9 @@ angular.module('update-extension-grid', ['ngStorage', 'clickOut'])
-         function ($scope, $http, $localStorage, titleService, authService, paginationService, multipleChoiceService) {
-             $scope.isHiddenSpinner = false;
- 
--            $http.get('index.php/updateExtensionGrid/extensions').success(function(data) {
-+            $http.get('index.php/updateExtensionGrid/extensions').then(function successCallback(resp) {
-+                var data = resp.data;
-+
-                 $scope.error = false;
-                 $scope.errorMessage = '';
-                 $scope.extensionsVersions = {};
-@@ -26,7 +28,7 @@ angular.module('update-extension-grid', ['ngStorage', 'clickOut'])
-                 $scope.extensions = data.extensions;
-                 $scope.total = data.total;
-                 $scope.currentPage = 1;
--                $scope.rowLimit = 20;
-+                $scope.rowLimit = '20';
-                 $scope.numberOfPages = Math.ceil($scope.total / $scope.rowLimit);
-                 $scope.isHiddenSpinner = true;
-                 $localStorage.extensionsVersions = $scope.extensionsVersions;
-@@ -36,7 +38,7 @@ angular.module('update-extension-grid', ['ngStorage', 'clickOut'])
- 
-             $scope.predicate = 'name';
-             $scope.reverse = false;
--            $scope.order = function(predicate) {
-+            $scope.order = function (predicate) {
-                 $scope.reverse = ($scope.predicate === predicate) ? !$scope.reverse : false;
-                 $scope.predicate = predicate;
-             };
-diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
-index 1ad09ea9862..8464a5d615f 100644
---- a/setup/pub/magento/setup/web-configuration.js
-+++ b/setup/pub/magento/setup/web-configuration.js
-@@ -124,22 +124,24 @@ angular.module('web-configuration', ['ngStorage'])
-         $scope.validateUrl = function () {
-             if (!$scope.webconfig.submitted) {
-                 $http.post('index.php/url-check', $scope.config)
--                    .success(function (data) {
--                        $scope.validateUrl.result = data;
-+                    .then(function successCallback(resp) {
-+                        $scope.validateUrl.result = resp.data;
-+
-                         if ($scope.validateUrl.result.successUrl && $scope.validateUrl.result.successSecureUrl) {
-                             $scope.nextState();
-                         }
-+
-                         if (!$scope.validateUrl.result.successUrl) {
-                             $scope.webconfig.submitted = true;
-                             $scope.webconfig.base_url.$setValidity('url', false);
-                         }
-+
-                         if (!$scope.validateUrl.result.successSecureUrl) {
-                             $scope.webconfig.submitted = true;
-                             $scope.webconfig.https.$setValidity('url', false);
-                         }
--                    })
--                    .error(function (data) {
--                        $scope.validateUrl.failed = data;
-+                    }, function errorCallback(resp) {
-+                        $scope.validateUrl.failed = resp.data;
-                     });
-             }
-         };
-diff --git a/setup/pub/styles/setup.css b/setup/pub/styles/setup.css
-index f290b155fb5..fa7b2e1c51d 100644
---- a/setup/pub/styles/setup.css
-+++ b/setup/pub/styles/setup.css
-@@ -3,4 +3,4 @@
-  * See COPYING.txt for license details.
-  */
- 
--.abs-action-delete,.abs-icon,.action-close:before,.action-next:before,.action-previous:before,.admin-user .admin__action-dropdown:before,.admin__action-multiselect-dropdown:before,.admin__action-multiselect-search-label:before,.admin__control-checkbox+label:before,.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .action-delete:before,.admin__control-table .action-delete:before,.admin__current-filters-list .action-remove:before,.admin__data-grid-action-bookmarks .action-delete:before,.admin__data-grid-action-bookmarks .action-edit:before,.admin__data-grid-action-bookmarks .action-submit:before,.admin__data-grid-action-bookmarks .admin__action-dropdown:before,.admin__data-grid-action-columns .admin__action-dropdown:before,.admin__data-grid-action-export .admin__action-dropdown:before,.admin__field-fallback-reset:before,.admin__menu .level-0>a:before,.admin__page-nav-item-message .admin__page-nav-item-message-icon,.admin__page-nav-title._collapsible:after,.data-grid-filters-action-wrap .action-default:before,.data-grid-row-changed:after,.data-grid-row-parent>td .data-grid-checkbox-cell-inner:before,.data-grid-search-control-wrap .action-submit:before,.extensions-information .list .extension-delete,.icon-failed:before,.icon-success:before,.notifications-action:before,.notifications-close:before,.page-actions .page-actions-buttons>button.action-back:before,.page-actions .page-actions-buttons>button.back:before,.page-actions>button.action-back:before,.page-actions>button.back:before,.page-title-jumbo-success:before,.search-global-label:before,.selectmenu .action-delete:before,.selectmenu .action-edit:before,.selectmenu .action-save:before,.setup-home-item:before,.sticky-header .data-grid-search-control-wrap .data-grid-search-label:before,.store-switcher .dropdown-menu .dropdown-toolbar a:before,.tooltip .help a:before,.tooltip .help span:before{-webkit-font-smoothing:antialiased;font-family:Icons;font-style:normal;font-weight:400;line-height:1;speak:none}.validation-symbol:after{color:#e22626;content:'*';font-weight:400;margin-left:3px}.abs-modal-overlay,.modals-overlay{background:rgba(0,0,0,.35);bottom:0;left:0;position:fixed;right:0;top:0}.abs-action-delete>span,.abs-visually-hidden,.action-multicheck-wrap .action-multicheck-toggle>span,.admin__actions-switch-checkbox,.admin__control-fields .admin__field:nth-child(n+2):not(.admin__field-option):not(.admin__field-group-show-label)>.admin__field-label,.admin__field-tooltip .admin__field-tooltip-action span,.customize-your-store .customize-your-store-default .legend,.extensions-information .list .extension-delete>span,.form-el-checkbox,.form-el-radio,.selectmenu .action-delete>span,.selectmenu .action-edit>span,.selectmenu .action-save>span,.selectmenu-toggle span,.tooltip .help a span,.tooltip .help span span,[class*=admin__control-grouped]>.admin__field:nth-child(n+2):not(.admin__field-option):not(.admin__field-group-show-label):not(.admin__field-date)>.admin__field-label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.abs-visually-hidden-reset,.admin__field-group-columns>.admin__field:nth-child(n+2):not(.admin__field-option):not(.admin__field-group-show-label):not(.admin__field-date)>.admin__field-label[class]{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.abs-clearfix:after,.abs-clearfix:before,.action-multicheck-wrap:after,.action-multicheck-wrap:before,.actions-split:after,.actions-split:before,.admin__control-table-pagination:after,.admin__control-table-pagination:before,.admin__data-grid-action-columns-menu .admin__action-dropdown-menu-content:after,.admin__data-grid-action-columns-menu .admin__action-dropdown-menu-content:before,.admin__data-grid-filters-footer:after,.admin__data-grid-filters-footer:before,.admin__data-grid-filters:after,.admin__data-grid-filters:before,.admin__data-grid-header-row:after,.admin__data-grid-header-row:before,.admin__field-complex:after,.admin__field-complex:before,.modal-slide .magento-message .insert-title-inner:after,.modal-slide .magento-message .insert-title-inner:before,.modal-slide .main-col .insert-title-inner:after,.modal-slide .main-col .insert-title-inner:before,.page-actions._fixed:after,.page-actions._fixed:before,.page-content:after,.page-content:before,.page-header-actions:after,.page-header-actions:before,.page-main-actions:not(._hidden):after,.page-main-actions:not(._hidden):before{content:'';display:table}.abs-clearfix:after,.action-multicheck-wrap:after,.actions-split:after,.admin__control-table-pagination:after,.admin__data-grid-action-columns-menu .admin__action-dropdown-menu-content:after,.admin__data-grid-filters-footer:after,.admin__data-grid-filters:after,.admin__data-grid-header-row:after,.admin__field-complex:after,.modal-slide .magento-message .insert-title-inner:after,.modal-slide .main-col .insert-title-inner:after,.page-actions._fixed:after,.page-content:after,.page-header-actions:after,.page-main-actions:not(._hidden):after{clear:both}.abs-list-reset-styles{margin:0;padding:0;list-style:none}.abs-draggable-handle,.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .draggable-handle,.admin__control-table .draggable-handle,.data-grid .data-grid-draggable-row-cell .draggable-handle{cursor:-webkit-grab;cursor:move;font-size:0;margin-top:-4px;padding:0 1rem 0 0;vertical-align:middle;display:inline-block;text-decoration:none}.abs-draggable-handle:before,.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .draggable-handle:before,.admin__control-table .draggable-handle:before,.data-grid .data-grid-draggable-row-cell .draggable-handle:before{-webkit-font-smoothing:antialiased;font-size:1.8rem;line-height:inherit;color:#9e9e9e;content:'\e617';font-family:Icons;vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.abs-draggable-handle:hover:before,.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .draggable-handle:hover:before,.admin__control-table .draggable-handle:hover:before,.data-grid .data-grid-draggable-row-cell .draggable-handle:hover:before{color:#858585}.abs-config-scope-label,.admin__field:not(.admin__field-option)>.admin__field-label span[data-config-scope]:before{bottom:-1.3rem;color:gray;content:attr(data-config-scope);font-size:1.1rem;font-weight:400;min-width:15rem;position:absolute;right:0;text-transform:lowercase}.abs-word-wrap,.admin__field:not(.admin__field-option)>.admin__field-label{overflow-wrap:break-word;word-wrap:break-word;-ms-word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto}html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;box-sizing:border-box}*,:after,:before{box-sizing:inherit}:focus{box-shadow:none;outline:0}._keyfocus :focus{box-shadow:0 0 0 1px #008bdb}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}mark{background:#ff0;color:#000}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}embed,img,object,video{max-width:100%}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@font-face{font-family:'Open Sans';src:url(../fonts/opensans/light/opensans-300.eot);src:url(../fonts/opensans/light/opensans-300.eot?#iefix) format('embedded-opentype'),url(../fonts/opensans/light/opensans-300.woff2) format('woff2'),url(../fonts/opensans/light/opensans-300.woff) format('woff'),url(../fonts/opensans/light/opensans-300.ttf) format('truetype'),url('../fonts/opensans/light/opensans-300.svg#Open Sans') format('svg');font-weight:300;font-style:normal}@font-face{font-family:'Open Sans';src:url(../fonts/opensans/regular/opensans-400.eot);src:url(../fonts/opensans/regular/opensans-400.eot?#iefix) format('embedded-opentype'),url(../fonts/opensans/regular/opensans-400.woff2) format('woff2'),url(../fonts/opensans/regular/opensans-400.woff) format('woff'),url(../fonts/opensans/regular/opensans-400.ttf) format('truetype'),url('../fonts/opensans/regular/opensans-400.svg#Open Sans') format('svg');font-weight:400;font-style:normal}@font-face{font-family:'Open Sans';src:url(../fonts/opensans/semibold/opensans-600.eot);src:url(../fonts/opensans/semibold/opensans-600.eot?#iefix) format('embedded-opentype'),url(../fonts/opensans/semibold/opensans-600.woff2) format('woff2'),url(../fonts/opensans/semibold/opensans-600.woff) format('woff'),url(../fonts/opensans/semibold/opensans-600.ttf) format('truetype'),url('../fonts/opensans/semibold/opensans-600.svg#Open Sans') format('svg');font-weight:600;font-style:normal}@font-face{font-family:'Open Sans';src:url(../fonts/opensans/bold/opensans-700.eot);src:url(../fonts/opensans/bold/opensans-700.eot?#iefix) format('embedded-opentype'),url(../fonts/opensans/bold/opensans-700.woff2) format('woff2'),url(../fonts/opensans/bold/opensans-700.woff) format('woff'),url(../fonts/opensans/bold/opensans-700.ttf) format('truetype'),url('../fonts/opensans/bold/opensans-700.svg#Open Sans') format('svg');font-weight:700;font-style:normal}html{font-size:62.5%}body{color:#333;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1.36;font-size:1.4rem}h1{margin:0 0 2rem;color:#41362f;font-weight:400;line-height:1.2;font-size:2.8rem}h2{margin:0 0 2rem;color:#41362f;font-weight:400;line-height:1.2;font-size:2rem}h3{margin:0 0 2rem;color:#41362f;font-weight:600;line-height:1.2;font-size:1.7rem}h4,h5,h6{font-weight:600;margin-top:0}p{margin:0 0 1em}small{font-size:1.2rem}a{color:#008bdb;text-decoration:none}a:hover{color:#0fa7ff;text-decoration:underline}dl,ol,ul{padding-left:0}nav ol,nav ul{list-style:none;margin:0;padding:0}html{height:100%}body{background-color:#fff;min-height:100%;min-width:102.4rem}.page-wrapper{background-color:#fff;display:inline-block;margin-left:-4px;vertical-align:top;width:calc(100% - 8.8rem)}.page-content{padding-bottom:3rem;padding-left:3rem;padding-right:3rem}.notices-wrapper{margin:0 3rem}.notices-wrapper .messages{margin-bottom:0}.row{margin-left:0;margin-right:0}.row:after{clear:both;content:'';display:table}.col-l-1,.col-l-10,.col-l-11,.col-l-12,.col-l-2,.col-l-3,.col-l-4,.col-l-5,.col-l-6,.col-l-7,.col-l-8,.col-l-9,.col-m-1,.col-m-10,.col-m-11,.col-m-12,.col-m-2,.col-m-3,.col-m-4,.col-m-5,.col-m-6,.col-m-7,.col-m-8,.col-m-9,.col-xl-1,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{min-height:1px;padding-left:0;padding-right:0;position:relative}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}.row-gutter{margin-left:-1.5rem;margin-right:-1.5rem}.row-gutter>[class*=col-]{padding-left:1.5rem;padding-right:1.5rem}.abs-clearer:after,.extension-manager-content:after,.extension-manager-title:after,.form-row:after,.header:after,.nav:after,body:after{clear:both;content:'';display:table}.ng-cloak{display:none!important}.hide.hide{display:none}.show.show{display:block}.text-center{text-align:center}.text-right{text-align:right}@font-face{font-family:Icons;src:url(../fonts/icons/icons.eot);src:url(../fonts/icons/icons.eot?#iefix) format('embedded-opentype'),url(../fonts/icons/icons.woff2) format('woff2'),url(../fonts/icons/icons.woff) format('woff'),url(../fonts/icons/icons.ttf) format('truetype'),url(../fonts/icons/icons.svg#Icons) format('svg');font-weight:400;font-style:normal}[class*=icon-]{display:inline-block;line-height:1}.icon-failed:before,.icon-success:before,[class*=icon-]:after{font-family:Icons}.icon-success{color:#79a22e}.icon-success:before{content:'\e62d'}.icon-failed{color:#e22626}.icon-failed:before{content:'\e632'}.icon-success-thick:after{content:'\e62d'}.icon-collapse:after{content:'\e615'}.icon-failed-thick:after{content:'\e632'}.icon-expand:after{content:'\e616'}.icon-warning:after{content:'\e623'}.icon-failed-round,.icon-success-round{border-radius:100%;color:#fff;font-size:2.5rem;height:1em;position:relative;text-align:center;width:1em}.icon-failed-round:after,.icon-success-round:after{bottom:0;font-size:.5em;left:0;position:absolute;right:0;top:.45em}.icon-success-round{background-color:#79a22e}.icon-success-round:after{content:'\e62d'}.icon-failed-round{background-color:#e22626}.icon-failed-round:after{content:'\e632'}dl,ol,ul{margin-top:0}.list{padding-left:0}.list>li{display:block;margin-bottom:.75em;position:relative}.list>li>.icon-failed,.list>li>.icon-success{font-size:1.6em;left:-.1em;position:absolute;top:0}.list>li>.icon-success{color:#79a22e}.list>li>.icon-failed{color:#e22626}.list-item-failed,.list-item-icon,.list-item-success,.list-item-warning{padding-left:3.5rem}.list-item-failed:before,.list-item-success:before,.list-item-warning:before{left:-.1em;position:absolute}.list-item-success:before{color:#79a22e}.list-item-failed:before{color:#e22626}.list-item-warning:before{color:#ef672f}.list-definition{margin:0 0 3rem;padding:0}.list-definition>dt{clear:left;float:left}.list-definition>dd{margin-bottom:1em;margin-left:20rem}.btn-wrap{margin:0 auto}.btn-wrap .btn{width:100%}.btn{background:#e3e3e3;border:none;color:#514943;display:inline-block;font-size:1.6rem;font-weight:600;padding:.45em .9em;text-align:center}.btn:hover{background-color:#dbdbdb;color:#514943;text-decoration:none}.btn:active{background-color:#d6d6d6}.btn.disabled,.btn[disabled]{cursor:default;opacity:.5;pointer-events:none}.ie9 .btn.disabled,.ie9 .btn[disabled]{background-color:#f0f0f0;opacity:1;text-shadow:none}.btn-large{padding:.75em 1.25em}.btn-medium{font-size:1.4rem;padding:.5em 1.5em .6em}.btn-link{background-color:transparent;border:none;color:#008bdb;font-family:1.6rem;font-size:1.5rem}.btn-link:active,.btn-link:focus,.btn-link:hover{background-color:transparent;color:#0fa7ff}.btn-prime{background-color:#eb5202;color:#fff;text-shadow:1px 1px 0 rgba(0,0,0,.25)}.btn-prime:focus,.btn-prime:hover{background-color:#f65405;background-repeat:repeat-x;background-image:linear-gradient(to right,#e04f00 0,#f65405 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e04f00', endColorstr='#f65405', GradientType=1);color:#fff}.btn-prime:active{background-color:#e04f00;background-repeat:repeat-x;background-image:linear-gradient(to right,#f65405 0,#e04f00 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f65405', endColorstr='#e04f00', GradientType=1);color:#fff}.ie9 .btn-prime.disabled,.ie9 .btn-prime[disabled]{background-color:#fd6e23}.ie9 .btn-prime.disabled:active,.ie9 .btn-prime.disabled:hover,.ie9 .btn-prime[disabled]:active,.ie9 .btn-prime[disabled]:hover{background-color:#fd6e23;-webkit-filter:none;filter:none}.btn-secondary{background-color:#514943;color:#fff}.btn-secondary:hover{background-color:#5f564f;color:#fff}.btn-secondary:active,.btn-secondary:focus{background-color:#574e48;color:#fff}.ie9 .btn-secondary.disabled,.ie9 .btn-secondary[disabled]{background-color:#514943}.ie9 .btn-secondary.disabled:active,.ie9 .btn-secondary[disabled]:active{background-color:#514943;-webkit-filter:none;filter:none}[class*=btn-wrap-triangle]{overflow:hidden;position:relative}[class*=btn-wrap-triangle] .btn:after{border-style:solid;content:'';height:0;position:absolute;top:0;width:0}.btn-wrap-triangle-right{display:inline-block;padding-right:1.74rem;position:relative}.btn-wrap-triangle-right .btn{text-indent:.92rem}.btn-wrap-triangle-right .btn:after{border-color:transparent transparent transparent #e3e3e3;border-width:1.84rem 0 1.84rem 1.84rem;left:100%;margin-left:-1.74rem}.btn-wrap-triangle-right .btn:focus:after,.btn-wrap-triangle-right .btn:hover:after{border-left-color:#dbdbdb}.btn-wrap-triangle-right .btn:active:after{border-left-color:#d6d6d6}.btn-wrap-triangle-right .btn:not(.disabled):active,.btn-wrap-triangle-right .btn:not([disabled]):active{left:1px}.ie9 .btn-wrap-triangle-right .btn.disabled:after,.ie9 .btn-wrap-triangle-right .btn[disabled]:after{border-color:transparent transparent transparent #f0f0f0}.ie9 .btn-wrap-triangle-right .btn.disabled:active:after,.ie9 .btn-wrap-triangle-right .btn.disabled:focus:after,.ie9 .btn-wrap-triangle-right .btn.disabled:hover:after,.ie9 .btn-wrap-triangle-right .btn[disabled]:active:after,.ie9 .btn-wrap-triangle-right .btn[disabled]:focus:after,.ie9 .btn-wrap-triangle-right .btn[disabled]:hover:after{border-left-color:#f0f0f0}.btn-wrap-triangle-right .btn-prime:after{border-color:transparent transparent transparent #eb5202}.btn-wrap-triangle-right .btn-prime:focus:after,.btn-wrap-triangle-right .btn-prime:hover:after{border-left-color:#f65405}.btn-wrap-triangle-right .btn-prime:active:after{border-left-color:#e04f00}.btn-wrap-triangle-right .btn-prime:not(.disabled):active,.btn-wrap-triangle-right .btn-prime:not([disabled]):active{left:1px}.ie9 .btn-wrap-triangle-right .btn-prime.disabled:after,.ie9 .btn-wrap-triangle-right .btn-prime[disabled]:after{border-color:transparent transparent transparent #fd6e23}.ie9 .btn-wrap-triangle-right .btn-prime.disabled:active:after,.ie9 .btn-wrap-triangle-right .btn-prime.disabled:hover:after,.ie9 .btn-wrap-triangle-right .btn-prime[disabled]:active:after,.ie9 .btn-wrap-triangle-right .btn-prime[disabled]:hover:after{border-left-color:#fd6e23}.btn-wrap-triangle-left{display:inline-block;padding-left:1.74rem}.btn-wrap-triangle-left .btn{text-indent:-.92rem}.btn-wrap-triangle-left .btn:after{border-color:transparent #e3e3e3 transparent transparent;border-width:1.84rem 1.84rem 1.84rem 0;margin-right:-1.74rem;right:100%}.btn-wrap-triangle-left .btn:focus:after,.btn-wrap-triangle-left .btn:hover:after{border-right-color:#dbdbdb}.btn-wrap-triangle-left .btn:active:after{border-right-color:#d6d6d6}.btn-wrap-triangle-left .btn:not(.disabled):active,.btn-wrap-triangle-left .btn:not([disabled]):active{right:1px}.ie9 .btn-wrap-triangle-left .btn.disabled:after,.ie9 .btn-wrap-triangle-left .btn[disabled]:after{border-color:transparent #f0f0f0 transparent transparent}.ie9 .btn-wrap-triangle-left .btn.disabled:active:after,.ie9 .btn-wrap-triangle-left .btn.disabled:hover:after,.ie9 .btn-wrap-triangle-left .btn[disabled]:active:after,.ie9 .btn-wrap-triangle-left .btn[disabled]:hover:after{border-right-color:#f0f0f0}.btn-wrap-triangle-left .btn-prime:after{border-color:transparent #eb5202 transparent transparent}.btn-wrap-triangle-left .btn-prime:focus:after,.btn-wrap-triangle-left .btn-prime:hover:after{border-right-color:#e04f00}.btn-wrap-triangle-left .btn-prime:active:after{border-right-color:#f65405}.btn-wrap-triangle-left .btn-prime:not(.disabled):active,.btn-wrap-triangle-left .btn-prime:not([disabled]):active{right:1px}.ie9 .btn-wrap-triangle-left .btn-prime.disabled:after,.ie9 .btn-wrap-triangle-left .btn-prime[disabled]:after{border-color:transparent #fd6e23 transparent transparent}.ie9 .btn-wrap-triangle-left .btn-prime.disabled:active:after,.ie9 .btn-wrap-triangle-left .btn-prime.disabled:hover:after,.ie9 .btn-wrap-triangle-left .btn-prime[disabled]:active:after,.ie9 .btn-wrap-triangle-left .btn-prime[disabled]:hover:after{border-right-color:#fd6e23}.btn-expand{background-color:transparent;border:none;color:#303030;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;padding:0;position:relative}.btn-expand.expanded:after{border-color:transparent transparent #303030;border-width:0 .285em .36em}.btn-expand.expanded:hover:after{border-color:transparent transparent #3d3d3d}.btn-expand:hover{background-color:transparent;border:none;color:#3d3d3d}.btn-expand:hover:after{border-color:#3d3d3d transparent transparent}.btn-expand:after{border-color:#303030 transparent transparent;border-style:solid;border-width:.36em .285em 0;content:'';height:0;left:100%;margin-left:.5em;margin-top:-.18em;position:absolute;top:50%;width:0}[class*=col-] .form-el-input,[class*=col-] .form-el-select{width:100%}.form-fieldset{border:none;margin:0 0 1em;padding:0}.form-row{margin-bottom:2.2rem}.form-row .form-row{margin-bottom:.4rem}.form-row .form-label{display:block;font-weight:600;padding:.6rem 2.1em 0 0;text-align:right}.form-row .form-label.required{position:relative}.form-row .form-label.required:after{color:#eb5202;content:'*';font-size:1.15em;position:absolute;right:.7em;top:.5em}.form-row .form-el-checkbox+.form-label:before,.form-row .form-el-radio+.form-label:before{top:.7rem}.form-row .form-el-checkbox+.form-label:after,.form-row .form-el-radio+.form-label:after{top:1.1rem}.form-row.form-row-text{padding-top:.6rem}.form-row.form-row-text .action-sign-out{font-size:1.2rem;margin-left:1rem}.form-note{font-size:1.2rem;font-weight:600;margin-top:1rem}.form-el-dummy{display:none}.fieldset{border:0;margin:0;min-width:0;padding:0}input:not([disabled]):focus,textarea:not([disabled]):focus{box-shadow:none}.form-el-input{border:1px solid #adadad;color:#303030;padding:.35em .55em .5em}.form-el-input:hover{border-color:#949494}.form-el-input:focus{border-color:#008bdb}.form-el-input:required{box-shadow:none}.form-label{margin-bottom:.5em}[class*=form-label][for]{cursor:pointer}.form-el-insider-wrap{display:table;width:100%}.form-el-insider-input{display:table-cell;width:100%}.form-el-insider{border-radius:2px;display:table-cell;padding:.43em .55em .5em 0;vertical-align:top}.form-legend,.form-legend-expand,.form-legend-light{display:block;margin:0}.form-legend,.form-legend-expand{font-size:1.25em;font-weight:600;margin-bottom:2.5em;padding-top:1.5em}.form-legend{border-top:1px solid #ccc;width:100%}.form-legend-light{font-size:1em;margin-bottom:1.5em}.form-legend-expand{cursor:pointer;transition:opacity .2s linear}.form-legend-expand:hover{opacity:.85}.form-legend-expand.expanded:after{content:'\e615'}.form-legend-expand:after{content:'\e616';font-family:Icons;font-size:1.15em;font-weight:400;margin-left:.5em;vertical-align:sub}.form-el-checkbox.disabled+.form-label,.form-el-checkbox.disabled+.form-label:before,.form-el-checkbox[disabled]+.form-label,.form-el-checkbox[disabled]+.form-label:before,.form-el-radio.disabled+.form-label,.form-el-radio.disabled+.form-label:before,.form-el-radio[disabled]+.form-label,.form-el-radio[disabled]+.form-label:before{cursor:default;opacity:.5;pointer-events:none}.form-el-checkbox:not(.disabled)+.form-label:hover:before,.form-el-checkbox:not([disabled])+.form-label:hover:before,.form-el-radio:not(.disabled)+.form-label:hover:before,.form-el-radio:not([disabled])+.form-label:hover:before{border-color:#514943}.form-el-checkbox+.form-label,.form-el-radio+.form-label{font-weight:400;padding-left:2em;padding-right:0;position:relative;text-align:left;transition:border-color .1s linear}.form-el-checkbox+.form-label:before,.form-el-radio+.form-label:before{border:1px solid;content:'';left:0;position:absolute;top:.1rem;transition:border-color .1s linear}.form-el-checkbox+.form-label:before{background-color:#fff;border-color:#adadad;border-radius:2px;font-size:1.2rem;height:1.6rem;line-height:1.2;width:1.6rem}.form-el-checkbox:checked+.form-label::before{content:'\e62d';font-family:Icons}.form-el-radio+.form-label:before{background-color:#fff;border:1px solid #adadad;border-radius:100%;height:1.8rem;width:1.8rem}.form-el-radio+.form-label:after{background:0 0;border:.5rem solid transparent;border-radius:100%;content:'';height:0;left:.4rem;position:absolute;top:.5rem;transition:background .3s linear;width:0}.form-el-radio:checked+.form-label{cursor:default}.form-el-radio:checked+.form-label:after{border-color:#514943}.form-select-label{border:1px solid #adadad;color:#303030;cursor:pointer;display:block;overflow:hidden;position:relative;z-index:0}.form-select-label:hover,.form-select-label:hover:after{border-color:#949494}.form-select-label:active,.form-select-label:active:after,.form-select-label:focus,.form-select-label:focus:after{border-color:#008bdb}.form-select-label:after{background:#e3e3e3;border-left:1px solid #adadad;bottom:0;content:'';position:absolute;right:0;top:0;width:2.36em;z-index:-2}.ie9 .form-select-label:after{display:none}.form-select-label:before{border-color:#303030 transparent transparent;border-style:solid;border-width:5px 4px 0;content:'';height:0;margin-right:-4px;margin-top:-2.5px;position:absolute;right:1.18em;top:50%;width:0;z-index:-1}.ie9 .form-select-label:before{display:none}.form-select-label .form-el-select{background:0 0;border:none;border-radius:0;content:'';display:block;margin:0;padding:.35em calc(2.36em + 10%) .5em .55em;width:110%}.ie9 .form-select-label .form-el-select{padding-right:.55em;width:100%}.form-select-label .form-el-select::-ms-expand{display:none}.form-el-select{background:#fff;border:1px solid #adadad;border-radius:2px;color:#303030;display:block;padding:.35em .55em}.multiselect-custom{border:1px solid #adadad;height:45.2rem;margin:0 0 1.5rem;overflow:auto;position:relative}.multiselect-custom ul{margin:0;padding:0;list-style:none;min-width:29rem}.multiselect-custom .item{padding:1rem 1.4rem}.multiselect-custom .selected{background-color:#e0f6fe}.multiselect-custom .form-label{margin-bottom:0}[class*=form-el-].invalid{border-color:#e22626}[class*=form-el-].invalid+.error-container{display:block}.error-container{background-color:#fffbbb;border:1px solid #ee7d7d;color:#514943;display:none;font-size:1.19rem;margin-top:.2rem;padding:.8rem 1rem .9rem}.check-result-message{margin-left:.5em;min-height:3.68rem;-ms-align-items:center;-ms-flex-align:center;align-items:center;display:-ms-flexbox;display:flex}.check-result-text{margin-left:.5em}body:not([class]){min-width:0}.container{display:block;margin:0 auto 4rem;max-width:100rem;padding:0}.abs-action-delete,.action-close:before,.action-next:before,.action-previous:before,.admin-user .admin__action-dropdown:before,.admin__action-multiselect-dropdown:before,.admin__action-multiselect-search-label:before,.admin__control-checkbox+label:before,.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .action-delete:before,.admin__control-table .action-delete:before,.admin__current-filters-list .action-remove:before,.admin__data-grid-action-bookmarks .action-delete:before,.admin__data-grid-action-bookmarks .action-edit:before,.admin__data-grid-action-bookmarks .action-submit:before,.admin__data-grid-action-bookmarks .admin__action-dropdown:before,.admin__data-grid-action-columns .admin__action-dropdown:before,.admin__data-grid-action-export .admin__action-dropdown:before,.admin__field-fallback-reset:before,.admin__menu .level-0>a:before,.admin__page-nav-item-message .admin__page-nav-item-message-icon,.admin__page-nav-title._collapsible:after,.data-grid-filters-action-wrap .action-default:before,.data-grid-row-changed:after,.data-grid-row-parent>td .data-grid-checkbox-cell-inner:before,.data-grid-search-control-wrap .action-submit:before,.extensions-information .list .extension-delete,.icon-failed:before,.icon-success:before,.notifications-action:before,.notifications-close:before,.page-actions .page-actions-buttons>button.action-back:before,.page-actions .page-actions-buttons>button.back:before,.page-actions>button.action-back:before,.page-actions>button.back:before,.page-title-jumbo-success:before,.search-global-label:before,.selectmenu .action-delete:before,.selectmenu .action-edit:before,.selectmenu .action-save:before,.setup-home-item:before,.sticky-header .data-grid-search-control-wrap .data-grid-search-label:before,.store-switcher .dropdown-menu .dropdown-toolbar a:before,.tooltip .help a:before,.tooltip .help span:before{-webkit-font-smoothing:antialiased;font-family:Icons;font-style:normal;font-weight:400;line-height:1;speak:none}.text-stretch{margin-bottom:1.5em}.page-title-jumbo{font-size:4rem;font-weight:300;letter-spacing:-.05em;margin-bottom:2.9rem}.page-title-jumbo-success:before{color:#79a22e;content:'\e62d';font-size:3.9rem;margin-left:-.3rem;margin-right:2.4rem}.list{margin-bottom:3rem}.list-dot .list-item{display:list-item;list-style-position:inside;margin-bottom:1.2rem}.list-title{color:#333;font-size:1.4rem;font-weight:700;letter-spacing:.025em;margin-bottom:1.2rem}.list-item-failed:before,.list-item-success:before,.list-item-warning:before{font-family:Icons;font-size:1.6rem;top:0}.list-item-success:before{content:'\e62d';font-size:1.6rem}.list-item-failed:before{content:'\e632';font-size:1.4rem;left:.1rem;top:.2rem}.list-item-warning:before{content:'\e623';font-size:1.3rem;left:.2rem}.form-wrap{margin-bottom:3.6rem;padding-top:2.1rem}.form-el-label-horizontal{display:inline-block;font-size:1.3rem;font-weight:600;letter-spacing:.025em;margin-bottom:.4rem;margin-left:.4rem}.app-updater{min-width:768px}body._has-modal{height:100%;overflow:hidden;width:100%}.modals-overlay{z-index:899}.modal-popup,.modal-slide{bottom:0;min-width:0;position:fixed;right:0;top:0;visibility:hidden}.modal-popup._show,.modal-slide._show{visibility:visible}.modal-popup._show .modal-inner-wrap,.modal-slide._show .modal-inner-wrap{-ms-transform:translate(0,0);transform:translate(0,0)}.modal-popup .modal-inner-wrap,.modal-slide .modal-inner-wrap{background-color:#fff;box-shadow:0 0 12px 2px rgba(0,0,0,.35);opacity:1;pointer-events:auto}.modal-slide{left:14.8rem;z-index:900}.modal-slide._show .modal-inner-wrap{-ms-transform:translateX(0);transform:translateX(0)}.modal-slide .modal-inner-wrap{height:100%;overflow-y:auto;position:static;-ms-transform:translateX(100%);transform:translateX(100%);transition-duration:.3s;transition-property:transform,visibility;transition-timing-function:ease-in-out;width:auto}.modal-slide._inner-scroll .modal-inner-wrap{overflow-y:visible;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column}.modal-slide._inner-scroll .modal-footer,.modal-slide._inner-scroll .modal-header{-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-ms-flex-negative:0;flex-shrink:0}.modal-slide._inner-scroll .modal-content{overflow-y:auto}.modal-slide._inner-scroll .modal-footer{margin-top:auto}.modal-slide .modal-content,.modal-slide .modal-footer,.modal-slide .modal-header{padding:0 2.6rem 2.6rem}.modal-slide .modal-header{padding-bottom:2.1rem;padding-top:2.1rem}.modal-popup{z-index:900;left:0;overflow-y:auto}.modal-popup._show .modal-inner-wrap{-ms-transform:translateY(0);transform:translateY(0)}.modal-popup .modal-inner-wrap{margin:5rem auto;width:75%;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;box-sizing:border-box;height:auto;left:0;position:absolute;right:0;-ms-transform:translateY(-200%);transform:translateY(-200%);transition-duration:.2s;transition-property:transform,visibility;transition-timing-function:ease}.modal-popup._inner-scroll{overflow-y:visible}.ie10 .modal-popup._inner-scroll,.ie9 .modal-popup._inner-scroll{overflow-y:auto}.modal-popup._inner-scroll .modal-inner-wrap{max-height:90%}.ie10 .modal-popup._inner-scroll .modal-inner-wrap,.ie9 .modal-popup._inner-scroll .modal-inner-wrap{max-height:none}.modal-popup._inner-scroll .modal-content{overflow-y:auto}.modal-popup .modal-content,.modal-popup .modal-footer,.modal-popup .modal-header{padding-left:3rem;padding-right:3rem}.modal-popup .modal-footer,.modal-popup .modal-header{-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-ms-flex-negative:0;flex-shrink:0}.modal-popup .modal-header{padding-bottom:1.2rem;padding-top:3rem}.modal-popup .modal-footer{margin-top:auto;padding-bottom:3rem}.modal-popup .modal-footer-actions{text-align:right}.admin__action-dropdown-wrap{display:inline-block;position:relative}.admin__action-dropdown-wrap .admin__action-dropdown-text:after{left:-6px;right:0}.admin__action-dropdown-wrap .admin__action-dropdown-menu{left:auto;right:0}.admin__action-dropdown-wrap._active .admin__action-dropdown,.admin__action-dropdown-wrap.active .admin__action-dropdown{border-color:#007bdb;box-shadow:1px 1px 5px rgba(0,0,0,.5)}.admin__action-dropdown-wrap._active .admin__action-dropdown-text:after,.admin__action-dropdown-wrap.active .admin__action-dropdown-text:after{background-color:#fff;content:'';height:6px;position:absolute;top:100%}.admin__action-dropdown-wrap._active .admin__action-dropdown-menu,.admin__action-dropdown-wrap.active .admin__action-dropdown-menu{display:block}.admin__action-dropdown-wrap._disabled .admin__action-dropdown{cursor:default}.admin__action-dropdown-wrap._disabled:hover .admin__action-dropdown{color:#333}.admin__action-dropdown{background-color:#fff;border:1px solid transparent;border-bottom:none;border-radius:0;box-shadow:none;color:#333;display:inline-block;font-size:1.3rem;font-weight:400;letter-spacing:-.025em;padding:.7rem 3.3rem .8rem 1.5rem;position:relative;vertical-align:baseline;z-index:2}.admin__action-dropdown._active:after,.admin__action-dropdown.active:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.admin__action-dropdown:after{border-color:#000 transparent transparent;border-style:solid;border-width:.5rem .4rem 0;content:'';height:0;margin-top:-.2rem;position:absolute;top:50%;transition:all .2s linear;width:0}._active .admin__action-dropdown:after,.active .admin__action-dropdown:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.admin__action-dropdown:hover:after{border-color:#000 transparent transparent}.admin__action-dropdown:focus,.admin__action-dropdown:hover{background-color:#fff;color:#000;text-decoration:none}.admin__action-dropdown:after{right:1.5rem}.admin__action-dropdown:before{margin-right:1rem}.admin__action-dropdown-menu{background-color:#fff;border:1px solid #007bdb;box-shadow:1px 1px 5px rgba(0,0,0,.5);display:none;line-height:1.36;margin-top:-1px;min-width:120%;padding:.5rem 1rem;position:absolute;top:100%;transition:all .15s ease;z-index:1}.admin__action-dropdown-menu>li{display:block}.admin__action-dropdown-menu>li>a{color:#333;display:block;text-decoration:none;padding:.6rem .5rem}.selectmenu{display:inline-block;position:relative;text-align:left;z-index:1}.selectmenu._active{border-color:#007bdb;z-index:500}.selectmenu .action-delete,.selectmenu .action-edit,.selectmenu .action-save{background-color:transparent;border-color:transparent;box-shadow:none;padding:0 1rem}.selectmenu .action-delete:hover,.selectmenu .action-edit:hover,.selectmenu .action-save:hover{background-color:transparent;border-color:transparent;box-shadow:none}.selectmenu .action-delete:before,.selectmenu .action-edit:before,.selectmenu .action-save:before{content:'\e630'}.selectmenu .action-delete,.selectmenu .action-edit{border:0 solid #fff;border-left-width:1px;bottom:0;position:absolute;right:0;top:0;z-index:1}.selectmenu .action-delete:hover,.selectmenu .action-edit:hover{border:0 solid #fff;border-left-width:1px}.selectmenu .action-save:before{content:'\e625'}.selectmenu .action-edit:before{content:'\e631'}.selectmenu-value{display:inline-block}.selectmenu-value input[type=text]{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;appearance:none;border:0;display:inline;margin:0;width:6rem}body._keyfocus .selectmenu-value input[type=text]:focus{box-shadow:none}.selectmenu-toggle{padding-right:3rem;background:0 0;border-width:0;bottom:0;float:right;position:absolute;right:0;top:0;width:0}.selectmenu-toggle._active:after,.selectmenu-toggle.active:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.selectmenu-toggle:after{border-color:#000 transparent transparent;border-style:solid;border-width:.5rem .4rem 0;content:'';height:0;margin-top:-.2rem;position:absolute;right:1.1rem;top:50%;transition:all .2s linear;width:0}._active .selectmenu-toggle:after,.active .selectmenu-toggle:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.selectmenu-toggle:hover:after{border-color:#000 transparent transparent}.selectmenu-toggle:active,.selectmenu-toggle:focus,.selectmenu-toggle:hover{background:0 0}.selectmenu._active .selectmenu-toggle:before{border-color:#007bdb}body._keyfocus .selectmenu-toggle:focus{box-shadow:none}.selectmenu-toggle:before{background:#e3e3e3;border-left:1px solid #adadad;bottom:0;content:'';display:block;position:absolute;right:0;top:0;width:3.2rem}.selectmenu-items{background:#fff;border:1px solid #007bdb;box-shadow:1px 1px 5px rgba(0,0,0,.5);display:none;float:left;left:-1px;margin-top:3px;max-width:20rem;min-width:calc(100% + 2px);position:absolute;top:100%}.selectmenu-items._active{display:block}.selectmenu-items ul{float:left;list-style-type:none;margin:0;min-width:100%;padding:0}.selectmenu-items li{-webkit-flex-direction:row;display:flex;-ms-flex-direction:row;flex-direction:row;transition:background .2s linear}.selectmenu-items li:hover{background:#e3e3e3}.selectmenu-items li:last-child .selectmenu-item-action,.selectmenu-items li:last-child .selectmenu-item-action:visited{color:#008bdb;text-decoration:none}.selectmenu-items li:last-child .selectmenu-item-action:hover{color:#0fa7ff;text-decoration:underline}.selectmenu-items li:last-child .selectmenu-item-action:active{color:#ff5501;text-decoration:underline}.selectmenu-item{position:relative;width:100%;z-index:1}li._edit>.selectmenu-item{display:none}.selectmenu-item-edit{display:none;padding:.3rem 4rem .3rem .4rem;position:relative;white-space:nowrap;z-index:1}li:last-child .selectmenu-item-edit{padding-right:.4rem}.selectmenu-item-edit .admin__control-text{margin:0;width:5.4rem}li._edit .selectmenu-item-edit{display:block}.selectmenu-item-action{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;appearance:none;background:0 0;border:0;color:#333;display:block;font-size:1.4rem;font-weight:400;min-width:100%;padding:1rem 6rem 1rem 1.5rem;text-align:left;transition:background .2s linear;width:5rem}.selectmenu-item-action:focus,.selectmenu-item-action:hover{background:#e3e3e3}.abs-actions-split-xl .action-default,.page-actions .actions-split .action-default{margin-right:4rem}.abs-actions-split-xl .action-toggle,.page-actions .actions-split .action-toggle{padding-right:4rem}.abs-actions-split-xl .action-toggle:after,.page-actions .actions-split .action-toggle:after{border-width:.9rem .6rem 0;margin-top:-.3rem;right:1.4rem}.actions-split{position:relative;z-index:400}.actions-split._active,.actions-split.active,.actions-split:hover{box-shadow:0 0 0 1px #007bdb}.actions-split._active .action-toggle.action-primary,.actions-split._active .action-toggle.primary,.actions-split.active .action-toggle.action-primary,.actions-split.active .action-toggle.primary{background-color:#ba4000;border-color:#ba4000}.actions-split._active .dropdown-menu,.actions-split.active .dropdown-menu{opacity:1;visibility:visible;display:block}.actions-split .action-default,.actions-split .action-toggle{float:left;margin:0}.actions-split .action-default._active,.actions-split .action-default.active,.actions-split .action-default:hover,.actions-split .action-toggle._active,.actions-split .action-toggle.active,.actions-split .action-toggle:hover{box-shadow:none}.actions-split .action-default{margin-right:3.2rem;min-width:9.3rem}.actions-split .action-toggle{padding-right:3.2rem;border-left-color:rgba(0,0,0,.2);bottom:0;padding-left:0;position:absolute;right:0;top:0}.actions-split .action-toggle._active:after,.actions-split .action-toggle.active:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.actions-split .action-toggle:after{border-color:#000 transparent transparent;border-style:solid;border-width:.5rem .4rem 0;content:'';height:0;margin-top:-.2rem;position:absolute;right:1.2rem;top:50%;transition:all .2s linear;width:0}._active .actions-split .action-toggle:after,.active .actions-split .action-toggle:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.actions-split .action-toggle:hover:after{border-color:#000 transparent transparent}.actions-split .action-toggle.action-primary:after,.actions-split .action-toggle.action-secondary:after,.actions-split .action-toggle.primary:after,.actions-split .action-toggle.secondary:after{border-color:#fff transparent transparent}.actions-split .action-toggle>span{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.action-select-wrap{display:inline-block;position:relative}.action-select-wrap .action-select{padding-right:3.2rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;background-color:#fff;font-weight:400;text-align:left}.action-select-wrap .action-select._active:after,.action-select-wrap .action-select.active:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.action-select-wrap .action-select:after{border-color:#000 transparent transparent;border-style:solid;border-width:.5rem .4rem 0;content:'';height:0;margin-top:-.2rem;position:absolute;right:1.2rem;top:50%;transition:all .2s linear;width:0}._active .action-select-wrap .action-select:after,.active .action-select-wrap .action-select:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.action-select-wrap .action-select:hover:after{border-color:#000 transparent transparent}.action-select-wrap .action-select:hover,.action-select-wrap .action-select:hover:before{border-color:#878787}.action-select-wrap .action-select:before{background-color:#e3e3e3;border:1px solid #adadad;bottom:0;content:'';position:absolute;right:0;top:0;width:3.2rem}.action-select-wrap .action-select._active{border-color:#007bdb}.action-select-wrap .action-select._active:before{border-color:#007bdb #007bdb #007bdb #adadad}.action-select-wrap .action-select[disabled]{color:#333}.action-select-wrap .action-select[disabled]:after{border-color:#333 transparent transparent}.action-select-wrap._active{z-index:500}.action-select-wrap._active .action-select,.action-select-wrap._active .action-select:before{border-color:#007bdb}.action-select-wrap._active .action-select:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.action-select-wrap .abs-action-menu .action-submenu,.action-select-wrap .abs-action-menu .action-submenu .action-submenu,.action-select-wrap .action-menu,.action-select-wrap .action-menu .action-submenu,.action-select-wrap .actions-split .action-menu .action-submenu,.action-select-wrap .actions-split .action-menu .action-submenu .action-submenu,.action-select-wrap .actions-split .dropdown-menu .action-submenu,.action-select-wrap .actions-split .dropdown-menu .action-submenu .action-submenu{max-height:45rem;overflow-y:auto}.action-select-wrap .abs-action-menu .action-submenu ._disabled:hover,.action-select-wrap .abs-action-menu .action-submenu .action-submenu ._disabled:hover,.action-select-wrap .action-menu ._disabled:hover,.action-select-wrap .action-menu .action-submenu ._disabled:hover,.action-select-wrap .actions-split .action-menu .action-submenu ._disabled:hover,.action-select-wrap .actions-split .action-menu .action-submenu .action-submenu ._disabled:hover,.action-select-wrap .actions-split .dropdown-menu .action-submenu ._disabled:hover,.action-select-wrap .actions-split .dropdown-menu .action-submenu .action-submenu ._disabled:hover{background:#fff}.action-select-wrap .abs-action-menu .action-submenu ._disabled .action-menu-item,.action-select-wrap .abs-action-menu .action-submenu .action-submenu ._disabled .action-menu-item,.action-select-wrap .action-menu ._disabled .action-menu-item,.action-select-wrap .action-menu .action-submenu ._disabled .action-menu-item,.action-select-wrap .actions-split .action-menu .action-submenu ._disabled .action-menu-item,.action-select-wrap .actions-split .action-menu .action-submenu .action-submenu ._disabled .action-menu-item,.action-select-wrap .actions-split .dropdown-menu .action-submenu ._disabled .action-menu-item,.action-select-wrap .actions-split .dropdown-menu .action-submenu .action-submenu ._disabled .action-menu-item{cursor:default;opacity:.5}.action-select-wrap .action-menu-items{left:0;position:absolute;right:0;top:100%}.action-select-wrap .action-menu-items>.abs-action-menu .action-submenu,.action-select-wrap .action-menu-items>.abs-action-menu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.action-menu,.action-select-wrap .action-menu-items>.action-menu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .action-menu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .action-menu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .dropdown-menu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .dropdown-menu .action-submenu .action-submenu{min-width:100%;position:static}.action-select-wrap .action-menu-items>.abs-action-menu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.abs-action-menu .action-submenu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.action-menu .action-submenu,.action-select-wrap .action-menu-items>.action-menu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .action-menu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .action-menu .action-submenu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .dropdown-menu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .dropdown-menu .action-submenu .action-submenu .action-submenu{position:absolute}.action-multicheck-wrap{display:inline-block;height:1.6rem;padding-top:1px;position:relative;width:3.1rem;z-index:200}.action-multicheck-wrap:hover .action-multicheck-toggle,.action-multicheck-wrap:hover .admin__control-checkbox+label:before{border-color:#878787}.action-multicheck-wrap._active .action-multicheck-toggle,.action-multicheck-wrap._active .admin__control-checkbox+label:before{border-color:#007bdb}.action-multicheck-wrap._active .abs-action-menu .action-submenu,.action-multicheck-wrap._active .abs-action-menu .action-submenu .action-submenu,.action-multicheck-wrap._active .action-menu,.action-multicheck-wrap._active .action-menu .action-submenu,.action-multicheck-wrap._active .actions-split .action-menu .action-submenu,.action-multicheck-wrap._active .actions-split .action-menu .action-submenu .action-submenu,.action-multicheck-wrap._active .actions-split .dropdown-menu .action-submenu,.action-multicheck-wrap._active .actions-split .dropdown-menu .action-submenu .action-submenu{opacity:1;visibility:visible;display:block}.action-multicheck-wrap._disabled .admin__control-checkbox+label:before{background-color:#fff}.action-multicheck-wrap._disabled .action-multicheck-toggle,.action-multicheck-wrap._disabled .admin__control-checkbox+label:before{border-color:#adadad;opacity:1}.action-multicheck-wrap .action-multicheck-toggle,.action-multicheck-wrap .admin__control-checkbox,.action-multicheck-wrap .admin__control-checkbox+label{float:left}.action-multicheck-wrap .action-multicheck-toggle{border-radius:0 1px 1px 0;height:1.6rem;margin-left:-1px;padding:0;position:relative;transition:border-color .1s linear;width:1.6rem}.action-multicheck-wrap .action-multicheck-toggle._active:after,.action-multicheck-wrap .action-multicheck-toggle.active:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.action-multicheck-wrap .action-multicheck-toggle:after{border-color:#000 transparent transparent;border-style:solid;border-width:.5rem .4rem 0;content:'';height:0;margin-top:-.2rem;position:absolute;top:50%;transition:all .2s linear;width:0}._active .action-multicheck-wrap .action-multicheck-toggle:after,.active .action-multicheck-wrap .action-multicheck-toggle:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.action-multicheck-wrap .action-multicheck-toggle:hover:after{border-color:#000 transparent transparent}.action-multicheck-wrap .action-multicheck-toggle:focus{border-color:#007bdb}.action-multicheck-wrap .action-multicheck-toggle:after{right:.3rem}.action-multicheck-wrap .abs-action-menu .action-submenu,.action-multicheck-wrap .abs-action-menu .action-submenu .action-submenu,.action-multicheck-wrap .action-menu,.action-multicheck-wrap .action-menu .action-submenu,.action-multicheck-wrap .actions-split .action-menu .action-submenu,.action-multicheck-wrap .actions-split .action-menu .action-submenu .action-submenu,.action-multicheck-wrap .actions-split .dropdown-menu .action-submenu,.action-multicheck-wrap .actions-split .dropdown-menu .action-submenu .action-submenu{left:-1.1rem;margin-top:1px;right:auto;text-align:left}.action-multicheck-wrap .action-menu-item{white-space:nowrap}.admin__action-multiselect-wrap{display:block;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.admin__action-multiselect-wrap.action-select-wrap:focus{box-shadow:none}.admin__action-multiselect-wrap.action-select-wrap .abs-action-menu .action-submenu,.admin__action-multiselect-wrap.action-select-wrap .abs-action-menu .action-submenu .action-submenu,.admin__action-multiselect-wrap.action-select-wrap .action-menu,.admin__action-multiselect-wrap.action-select-wrap .action-menu .action-submenu,.admin__action-multiselect-wrap.action-select-wrap .actions-split .action-menu .action-submenu,.admin__action-multiselect-wrap.action-select-wrap .actions-split .action-menu .action-submenu .action-submenu,.admin__action-multiselect-wrap.action-select-wrap .actions-split .dropdown-menu .action-submenu,.admin__action-multiselect-wrap.action-select-wrap .actions-split .dropdown-menu .action-submenu .action-submenu{max-height:none;overflow-y:inherit}.admin__action-multiselect-wrap .action-menu-item{transition:background-color .1s linear}.admin__action-multiselect-wrap .action-menu-item._selected{background-color:#e0f6fe}.admin__action-multiselect-wrap .action-menu-item._hover{background-color:#e3e3e3}.admin__action-multiselect-wrap .action-menu-item._unclickable{cursor:default}.admin__action-multiselect-wrap .admin__action-multiselect{border:1px solid #adadad;cursor:pointer;display:block;min-height:3.2rem;padding-right:3.6rem;white-space:normal}.admin__action-multiselect-wrap .admin__action-multiselect:after{bottom:1.25rem;top:auto}.admin__action-multiselect-wrap .admin__action-multiselect:before{height:3.3rem;top:auto}.admin__control-table-wrapper .admin__action-multiselect-wrap{position:static}.admin__control-table-wrapper .admin__action-multiselect-wrap .admin__action-multiselect{position:relative}.admin__control-table-wrapper .admin__action-multiselect-wrap .admin__action-multiselect:before{right:-1px;top:-1px}.admin__control-table-wrapper .admin__action-multiselect-wrap .abs-action-menu .action-submenu,.admin__control-table-wrapper .admin__action-multiselect-wrap .abs-action-menu .action-submenu .action-submenu,.admin__control-table-wrapper .admin__action-multiselect-wrap .action-menu,.admin__control-table-wrapper .admin__action-multiselect-wrap .action-menu .action-submenu,.admin__control-table-wrapper .admin__action-multiselect-wrap .actions-split .action-menu .action-submenu,.admin__control-table-wrapper .admin__action-multiselect-wrap .actions-split .action-menu .action-submenu .action-submenu,.admin__control-table-wrapper .admin__action-multiselect-wrap .actions-split .dropdown-menu .action-submenu,.admin__control-table-wrapper .admin__action-multiselect-wrap .actions-split .dropdown-menu .action-submenu .action-submenu{left:auto;min-width:34rem;right:auto;top:auto;z-index:1}.admin__action-multiselect-wrap .admin__action-multiselect-item-path{color:#a79d95;font-size:1.2rem;font-weight:400;padding-left:1rem}.admin__action-multiselect-actions-wrap{border-top:1px solid #e3e3e3;margin:0 1rem;padding:1rem 0;text-align:center}.admin__action-multiselect-actions-wrap .action-default{font-size:1.3rem;min-width:13rem}.admin__action-multiselect-text{padding:.6rem 1rem}.abs-action-menu .action-submenu,.abs-action-menu .action-submenu .action-submenu,.action-menu,.action-menu .action-submenu,.actions-split .action-menu .action-submenu,.actions-split .action-menu .action-submenu .action-submenu,.actions-split .dropdown-menu .action-submenu,.actions-split .dropdown-menu .action-submenu .action-submenu{text-align:left}.admin__action-multiselect-label{cursor:pointer;position:relative;z-index:1}.admin__action-multiselect-label:before{margin-right:.5rem}._unclickable .admin__action-multiselect-label{cursor:default;font-weight:700}.admin__action-multiselect-search-wrap{border-bottom:1px solid #e3e3e3;margin:0 1rem;padding:1rem 0;position:relative}.admin__action-multiselect-search{padding-right:3rem;width:100%}.admin__action-multiselect-search-label{display:block;font-size:1.5rem;height:1em;overflow:hidden;position:absolute;right:2.2rem;top:1.7rem;width:1em}.admin__action-multiselect-search-label:before{content:'\e60c'}.admin__action-multiselect-search-count{color:#a79d95;margin-top:1rem}.admin__action-multiselect-menu-inner{margin-bottom:0;max-height:46rem;overflow-y:auto}.admin__action-multiselect-menu-inner .admin__action-multiselect-menu-inner{list-style:none;max-height:none;overflow:hidden;padding-left:2.2rem}.admin__action-multiselect-menu-inner ._hidden{display:none}.admin__action-multiselect-crumb{background-color:#f5f5f5;border:1px solid #a79d95;border-radius:1px;display:inline-block;font-size:1.2rem;margin:.3rem -4px .3rem .3rem;padding:.3rem 2.4rem .4rem 1rem;position:relative;transition:border-color .1s linear}.admin__action-multiselect-crumb:hover{border-color:#908379}.admin__action-multiselect-crumb .action-close{bottom:0;font-size:.5em;position:absolute;right:0;top:0;width:2rem}.admin__action-multiselect-crumb .action-close:hover{color:#000}.admin__action-multiselect-crumb .action-close:active,.admin__action-multiselect-crumb .action-close:focus{background-color:transparent}.admin__action-multiselect-crumb .action-close:active{-ms-transform:scale(0.9);transform:scale(0.9)}.admin__action-multiselect-tree .abs-action-menu .action-submenu,.admin__action-multiselect-tree .abs-action-menu .action-submenu .action-submenu,.admin__action-multiselect-tree .action-menu,.admin__action-multiselect-tree .action-menu .action-submenu,.admin__action-multiselect-tree .actions-split .action-menu .action-submenu,.admin__action-multiselect-tree .actions-split .action-menu .action-submenu .action-submenu,.admin__action-multiselect-tree .actions-split .dropdown-menu .action-submenu,.admin__action-multiselect-tree .actions-split .dropdown-menu .action-submenu .action-submenu{min-width:34.7rem}.admin__action-multiselect-tree .abs-action-menu .action-submenu .action-menu-item,.admin__action-multiselect-tree .abs-action-menu .action-submenu .action-submenu .action-menu-item,.admin__action-multiselect-tree .action-menu .action-menu-item,.admin__action-multiselect-tree .action-menu .action-submenu .action-menu-item,.admin__action-multiselect-tree .actions-split .action-menu .action-submenu .action-menu-item,.admin__action-multiselect-tree .actions-split .action-menu .action-submenu .action-submenu .action-menu-item,.admin__action-multiselect-tree .actions-split .dropdown-menu .action-submenu .action-menu-item,.admin__action-multiselect-tree .actions-split .dropdown-menu .action-submenu .action-submenu .action-menu-item{margin-top:.1rem}.admin__action-multiselect-tree .action-menu-item{margin-left:4.2rem;position:relative}.admin__action-multiselect-tree .action-menu-item._expended:before{border-left:1px dashed #a79d95;bottom:0;content:'';left:-1rem;position:absolute;top:1rem;width:1px}.admin__action-multiselect-tree .action-menu-item._expended .admin__action-multiselect-dropdown:before{content:'\e615'}.admin__action-multiselect-tree .action-menu-item._with-checkbox .admin__action-multiselect-label{padding-left:2.6rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner{position:relative}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner .admin__action-multiselect-menu-inner{padding-left:3.2rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner .admin__action-multiselect-menu-inner:before{left:4.3rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item{position:relative}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item:last-child:before{height:2.1rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item:after,.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item:before{content:'';left:0;position:absolute}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item:after{border-top:1px dashed #a79d95;height:1px;top:2.1rem;width:5.2rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item:before{border-left:1px dashed #a79d95;height:100%;top:0;width:1px}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._parent:after{width:4.2rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._root{margin-left:-1rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._root:after{left:3.2rem;width:2.2rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._root:before{left:3.2rem;top:1rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._root._parent:after{display:none}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._root:first-child:before{top:2.1rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._root:last-child:before{height:1rem}.admin__action-multiselect-tree .admin__action-multiselect-label{line-height:2.2rem;vertical-align:middle;word-break:break-all}.admin__action-multiselect-tree .admin__action-multiselect-label:before{left:0;position:absolute;top:.4rem}.admin__action-multiselect-dropdown{border-radius:50%;height:2.2rem;left:-2.2rem;position:absolute;top:1rem;width:2.2rem;z-index:1}.admin__action-multiselect-dropdown:before{background:#fff;color:#a79d95;content:'\e616';font-size:2.2rem}.admin__actions-switch{display:inline-block;position:relative;vertical-align:middle}.admin__field-control .admin__actions-switch{line-height:3.2rem}.admin__actions-switch+.admin__field-service{min-width:34rem}._disabled .admin__actions-switch-checkbox+.admin__actions-switch-label,.admin__actions-switch-checkbox.disabled+.admin__actions-switch-label{cursor:not-allowed;opacity:.5;pointer-events:none}.admin__actions-switch-checkbox:checked+.admin__actions-switch-label:before{left:15px}.admin__actions-switch-checkbox:checked+.admin__actions-switch-label:after{background:#79a22e}.admin__actions-switch-checkbox:checked+.admin__actions-switch-label .admin__actions-switch-text:before{content:attr(data-text-on)}.admin__actions-switch-checkbox:focus+.admin__actions-switch-label:after,.admin__actions-switch-checkbox:focus+.admin__actions-switch-label:before{border-color:#007bdb}._error .admin__actions-switch-checkbox+.admin__actions-switch-label:after,._error .admin__actions-switch-checkbox+.admin__actions-switch-label:before{border-color:#e22626}.admin__actions-switch-label{cursor:pointer;display:inline-block;height:22px;line-height:22px;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:middle}.admin__actions-switch-label:after,.admin__actions-switch-label:before{left:0;position:absolute;right:auto;top:0}.admin__actions-switch-label:before{background:#fff;border:1px solid #aaa6a0;border-radius:100%;content:'';display:block;height:22px;transition:left .2s ease-in 0s;width:22px;z-index:1}.admin__actions-switch-label:after{background:#e3e3e3;border:1px solid #aaa6a0;border-radius:12px;content:'';display:block;height:22px;transition:background .2s ease-in 0s;vertical-align:middle;width:37px;z-index:0}.admin__actions-switch-text:before{content:attr(data-text-off);padding-left:47px;white-space:nowrap}.abs-action-delete,.abs-action-reset,.action-close,.admin__field-fallback-reset,.extensions-information .list .extension-delete,.notifications-close,.search-global-field._active .search-global-action{background-color:transparent;border:none;border-radius:0;box-shadow:none;margin:0;padding:0}.abs-action-delete:hover,.abs-action-reset:hover,.action-close:hover,.admin__field-fallback-reset:hover,.extensions-information .list .extension-delete:hover,.notifications-close:hover,.search-global-field._active .search-global-action:hover{background-color:transparent;border:none;box-shadow:none}.abs-action-default,.abs-action-pattern,.abs-action-primary,.abs-action-quaternary,.abs-action-secondary,.abs-action-tertiary,.action-default,.action-primary,.action-quaternary,.action-secondary,.action-tertiary,.modal-popup .modal-footer .action-primary,.modal-popup .modal-footer .action-secondary,.page-actions .page-actions-buttons>button,.page-actions .page-actions-buttons>button.action-primary,.page-actions .page-actions-buttons>button.action-secondary,.page-actions .page-actions-buttons>button.primary,.page-actions>button,.page-actions>button.action-primary,.page-actions>button.action-secondary,.page-actions>button.primary,button,button.primary,button.secondary,button.tertiary{border:1px solid;border-radius:0;display:inline-block;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:600;line-height:1.36;padding:.6rem 1em;text-align:center;vertical-align:baseline}.abs-action-default.disabled,.abs-action-default[disabled],.abs-action-pattern.disabled,.abs-action-pattern[disabled],.abs-action-primary.disabled,.abs-action-primary[disabled],.abs-action-quaternary.disabled,.abs-action-quaternary[disabled],.abs-action-secondary.disabled,.abs-action-secondary[disabled],.abs-action-tertiary.disabled,.abs-action-tertiary[disabled],.action-default.disabled,.action-default[disabled],.action-primary.disabled,.action-primary[disabled],.action-quaternary.disabled,.action-quaternary[disabled],.action-secondary.disabled,.action-secondary[disabled],.action-tertiary.disabled,.action-tertiary[disabled],.modal-popup .modal-footer .action-primary.disabled,.modal-popup .modal-footer .action-primary[disabled],.modal-popup .modal-footer .action-secondary.disabled,.modal-popup .modal-footer .action-secondary[disabled],.page-actions .page-actions-buttons>button.action-primary.disabled,.page-actions .page-actions-buttons>button.action-primary[disabled],.page-actions .page-actions-buttons>button.action-secondary.disabled,.page-actions .page-actions-buttons>button.action-secondary[disabled],.page-actions .page-actions-buttons>button.disabled,.page-actions .page-actions-buttons>button.primary.disabled,.page-actions .page-actions-buttons>button.primary[disabled],.page-actions .page-actions-buttons>button[disabled],.page-actions>button.action-primary.disabled,.page-actions>button.action-primary[disabled],.page-actions>button.action-secondary.disabled,.page-actions>button.action-secondary[disabled],.page-actions>button.disabled,.page-actions>button.primary.disabled,.page-actions>button.primary[disabled],.page-actions>button[disabled],button.disabled,button.primary.disabled,button.primary[disabled],button.secondary.disabled,button.secondary[disabled],button.tertiary.disabled,button.tertiary[disabled],button[disabled]{cursor:default;opacity:.5;pointer-events:none}.abs-action-l,.modal-popup .modal-footer .action-primary,.modal-popup .modal-footer .action-secondary,.page-actions .page-actions-buttons>button,.page-actions .page-actions-buttons>button.action-primary,.page-actions .page-actions-buttons>button.action-secondary,.page-actions .page-actions-buttons>button.primary,.page-actions button,.page-actions>button.action-primary,.page-actions>button.action-secondary,.page-actions>button.primary{font-size:1.6rem;letter-spacing:.025em;padding-bottom:.6875em;padding-top:.6875em}.abs-action-delete,.extensions-information .list .extension-delete{display:inline-block;font-size:1.6rem;margin-left:1.2rem;padding-top:.7rem;text-decoration:none;vertical-align:middle}.abs-action-delete:after,.extensions-information .list .extension-delete:after{color:#666;content:'\e630'}.abs-action-delete:hover:after,.extensions-information .list .extension-delete:hover:after{color:#35302c}.abs-action-button-as-link,.action-advanced,.data-grid .action-delete{line-height:1.36;padding:0;color:#008bdb;text-decoration:none;background:0 0;border:0;display:inline;font-weight:400;border-radius:0}.abs-action-button-as-link:visited,.action-advanced:visited,.data-grid .action-delete:visited{color:#008bdb;text-decoration:none}.abs-action-button-as-link:hover,.action-advanced:hover,.data-grid .action-delete:hover{text-decoration:underline}.abs-action-button-as-link:active,.action-advanced:active,.data-grid .action-delete:active{color:#ff5501;text-decoration:underline}.abs-action-button-as-link:hover,.action-advanced:hover,.data-grid .action-delete:hover{color:#0fa7ff}.abs-action-button-as-link:active,.abs-action-button-as-link:focus,.abs-action-button-as-link:hover,.action-advanced:active,.action-advanced:focus,.action-advanced:hover,.data-grid .action-delete:active,.data-grid .action-delete:focus,.data-grid .action-delete:hover{background:0 0;border:0}.abs-action-button-as-link.disabled,.abs-action-button-as-link[disabled],.action-advanced.disabled,.action-advanced[disabled],.data-grid .action-delete.disabled,.data-grid .action-delete[disabled],fieldset[disabled] .abs-action-button-as-link,fieldset[disabled] .action-advanced,fieldset[disabled] .data-grid .action-delete{color:#008bdb;opacity:.5;cursor:default;pointer-events:none;text-decoration:underline}.abs-action-button-as-link:active,.abs-action-button-as-link:not(:focus),.action-advanced:active,.action-advanced:not(:focus),.data-grid .action-delete:active,.data-grid .action-delete:not(:focus){box-shadow:none}.abs-action-button-as-link:focus,.action-advanced:focus,.data-grid .action-delete:focus{color:#0fa7ff}.abs-action-default,button{background:#e3e3e3;border-color:#adadad;color:#514943}.abs-action-default:active,.abs-action-default:focus,.abs-action-default:hover,button:active,button:focus,button:hover{background-color:#dbdbdb;color:#514943;text-decoration:none}.abs-action-primary,.page-actions .page-actions-buttons>button.action-primary,.page-actions .page-actions-buttons>button.primary,.page-actions>button.action-primary,.page-actions>button.primary,button.primary{background-color:#eb5202;border-color:#eb5202;color:#fff;text-shadow:1px 1px 0 rgba(0,0,0,.25)}.abs-action-primary:active,.abs-action-primary:focus,.abs-action-primary:hover,.page-actions .page-actions-buttons>button.action-primary:active,.page-actions .page-actions-buttons>button.action-primary:focus,.page-actions .page-actions-buttons>button.action-primary:hover,.page-actions .page-actions-buttons>button.primary:active,.page-actions .page-actions-buttons>button.primary:focus,.page-actions .page-actions-buttons>button.primary:hover,.page-actions>button.action-primary:active,.page-actions>button.action-primary:focus,.page-actions>button.action-primary:hover,.page-actions>button.primary:active,.page-actions>button.primary:focus,.page-actions>button.primary:hover,button.primary:active,button.primary:focus,button.primary:hover{background-color:#ba4000;border-color:#b84002;box-shadow:0 0 0 1px #007bdb;color:#fff;text-decoration:none}.abs-action-primary.disabled,.abs-action-primary[disabled],.page-actions .page-actions-buttons>button.action-primary.disabled,.page-actions .page-actions-buttons>button.action-primary[disabled],.page-actions .page-actions-buttons>button.primary.disabled,.page-actions .page-actions-buttons>button.primary[disabled],.page-actions>button.action-primary.disabled,.page-actions>button.action-primary[disabled],.page-actions>button.primary.disabled,.page-actions>button.primary[disabled],button.primary.disabled,button.primary[disabled]{cursor:default;opacity:.5;pointer-events:none}.abs-action-secondary,.modal-popup .modal-footer .action-primary,.page-actions .page-actions-buttons>button.action-secondary,.page-actions>button.action-secondary,button.secondary{background-color:#514943;border-color:#514943;color:#fff;text-shadow:1px 1px 1px rgba(0,0,0,.3)}.abs-action-secondary:active,.abs-action-secondary:focus,.abs-action-secondary:hover,.modal-popup .modal-footer .action-primary:active,.modal-popup .modal-footer .action-primary:focus,.modal-popup .modal-footer .action-primary:hover,.page-actions .page-actions-buttons>button.action-secondary:active,.page-actions .page-actions-buttons>button.action-secondary:focus,.page-actions .page-actions-buttons>button.action-secondary:hover,.page-actions>button.action-secondary:active,.page-actions>button.action-secondary:focus,.page-actions>button.action-secondary:hover,button.secondary:active,button.secondary:focus,button.secondary:hover{background-color:#35302c;border-color:#35302c;box-shadow:0 0 0 1px #007bdb;color:#fff;text-decoration:none}.abs-action-secondary:active,.modal-popup .modal-footer .action-primary:active,.page-actions .page-actions-buttons>button.action-secondary:active,.page-actions>button.action-secondary:active,button.secondary:active{background-color:#35302c}.abs-action-tertiary,.modal-popup .modal-footer .action-secondary,button.tertiary{background-color:transparent;border-color:transparent;text-shadow:none;color:#008bdb}.abs-action-tertiary:active,.abs-action-tertiary:focus,.abs-action-tertiary:hover,.modal-popup .modal-footer .action-secondary:active,.modal-popup .modal-footer .action-secondary:focus,.modal-popup .modal-footer .action-secondary:hover,button.tertiary:active,button.tertiary:focus,button.tertiary:hover{background-color:transparent;border-color:transparent;box-shadow:none;color:#0fa7ff;text-decoration:underline}.abs-action-quaternary,.page-actions .page-actions-buttons>button,.page-actions>button{background-color:transparent;border-color:transparent;text-shadow:none;color:#333}.abs-action-quaternary:active,.abs-action-quaternary:focus,.abs-action-quaternary:hover,.page-actions .page-actions-buttons>button:active,.page-actions .page-actions-buttons>button:focus,.page-actions .page-actions-buttons>button:hover,.page-actions>button:active,.page-actions>button:focus,.page-actions>button:hover{background-color:transparent;border-color:transparent;box-shadow:none;color:#1a1a1a}.abs-action-menu,.actions-split .abs-action-menu .action-submenu,.actions-split .abs-action-menu .action-submenu .action-submenu,.actions-split .action-menu,.actions-split .action-menu .action-submenu,.actions-split .actions-split .dropdown-menu .action-submenu,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu,.actions-split .dropdown-menu{text-align:left;background-color:#fff;border:1px solid #007bdb;border-radius:1px;box-shadow:1px 1px 5px rgba(0,0,0,.5);color:#333;display:none;font-weight:400;left:0;list-style:none;margin:2px 0 0;min-width:0;padding:0;position:absolute;right:0;top:100%}.abs-action-menu._active,.actions-split .abs-action-menu .action-submenu .action-submenu._active,.actions-split .abs-action-menu .action-submenu._active,.actions-split .action-menu .action-submenu._active,.actions-split .action-menu._active,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu._active,.actions-split .actions-split .dropdown-menu .action-submenu._active,.actions-split .dropdown-menu._active{display:block}.abs-action-menu>li,.actions-split .abs-action-menu .action-submenu .action-submenu>li,.actions-split .abs-action-menu .action-submenu>li,.actions-split .action-menu .action-submenu>li,.actions-split .action-menu>li,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li,.actions-split .actions-split .dropdown-menu .action-submenu>li,.actions-split .dropdown-menu>li{border:none;display:block;padding:0;transition:background-color .1s linear}.abs-action-menu>li>a:hover,.actions-split .abs-action-menu .action-submenu .action-submenu>li>a:hover,.actions-split .abs-action-menu .action-submenu>li>a:hover,.actions-split .action-menu .action-submenu>li>a:hover,.actions-split .action-menu>li>a:hover,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li>a:hover,.actions-split .actions-split .dropdown-menu .action-submenu>li>a:hover,.actions-split .dropdown-menu>li>a:hover{text-decoration:none}.abs-action-menu>li._visible,.abs-action-menu>li:hover,.actions-split .abs-action-menu .action-submenu .action-submenu>li._visible,.actions-split .abs-action-menu .action-submenu .action-submenu>li:hover,.actions-split .abs-action-menu .action-submenu>li._visible,.actions-split .abs-action-menu .action-submenu>li:hover,.actions-split .action-menu .action-submenu>li._visible,.actions-split .action-menu .action-submenu>li:hover,.actions-split .action-menu>li._visible,.actions-split .action-menu>li:hover,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li._visible,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li:hover,.actions-split .actions-split .dropdown-menu .action-submenu>li._visible,.actions-split .actions-split .dropdown-menu .action-submenu>li:hover,.actions-split .dropdown-menu>li._visible,.actions-split .dropdown-menu>li:hover{background-color:#e3e3e3}.abs-action-menu>li:active,.actions-split .abs-action-menu .action-submenu .action-submenu>li:active,.actions-split .abs-action-menu .action-submenu>li:active,.actions-split .action-menu .action-submenu>li:active,.actions-split .action-menu>li:active,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li:active,.actions-split .actions-split .dropdown-menu .action-submenu>li:active,.actions-split .dropdown-menu>li:active{background-color:#cacaca}.abs-action-menu>li._parent,.actions-split .abs-action-menu .action-submenu .action-submenu>li._parent,.actions-split .abs-action-menu .action-submenu>li._parent,.actions-split .action-menu .action-submenu>li._parent,.actions-split .action-menu>li._parent,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li._parent,.actions-split .actions-split .dropdown-menu .action-submenu>li._parent,.actions-split .dropdown-menu>li._parent{-webkit-flex-direction:row;display:flex;-ms-flex-direction:row;flex-direction:row}.abs-action-menu>li._parent>.action-menu-item,.actions-split .abs-action-menu .action-submenu .action-submenu>li._parent>.action-menu-item,.actions-split .abs-action-menu .action-submenu>li._parent>.action-menu-item,.actions-split .action-menu .action-submenu>li._parent>.action-menu-item,.actions-split .action-menu>li._parent>.action-menu-item,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li._parent>.action-menu-item,.actions-split .actions-split .dropdown-menu .action-submenu>li._parent>.action-menu-item,.actions-split .dropdown-menu>li._parent>.action-menu-item{min-width:100%}.abs-action-menu .action-menu-item,.abs-action-menu .item,.actions-split .abs-action-menu .action-submenu .action-menu-item,.actions-split .abs-action-menu .action-submenu .action-submenu .action-menu-item,.actions-split .abs-action-menu .action-submenu .action-submenu .item,.actions-split .abs-action-menu .action-submenu .item,.actions-split .action-menu .action-menu-item,.actions-split .action-menu .action-submenu .action-menu-item,.actions-split .action-menu .action-submenu .item,.actions-split .action-menu .item,.actions-split .actions-split .dropdown-menu .action-submenu .action-menu-item,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu .action-menu-item,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu .item,.actions-split .actions-split .dropdown-menu .action-submenu .item,.actions-split .dropdown-menu .action-menu-item,.actions-split .dropdown-menu .item{cursor:pointer;display:block;padding:.6875em 1em}.abs-action-menu .action-submenu,.actions-split .action-menu .action-submenu,.actions-split .action-menu .action-submenu .action-submenu,.actions-split .dropdown-menu .action-submenu{bottom:auto;left:auto;margin-left:0;margin-top:-1px;position:absolute;right:auto;top:auto}.ie9 .abs-action-menu .action-submenu,.ie9 .actions-split .abs-action-menu .action-submenu .action-submenu,.ie9 .actions-split .abs-action-menu .action-submenu .action-submenu .action-submenu,.ie9 .actions-split .action-menu .action-submenu,.ie9 .actions-split .action-menu .action-submenu .action-submenu,.ie9 .actions-split .actions-split .dropdown-menu .action-submenu .action-submenu,.ie9 .actions-split .actions-split .dropdown-menu .action-submenu .action-submenu .action-submenu,.ie9 .actions-split .dropdown-menu .action-submenu{margin-left:99%;margin-top:-3.5rem}.abs-action-menu a.action-menu-item,.actions-split .abs-action-menu .action-submenu .action-submenu a.action-menu-item,.actions-split .abs-action-menu .action-submenu a.action-menu-item,.actions-split .action-menu .action-submenu a.action-menu-item,.actions-split .action-menu a.action-menu-item,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu a.action-menu-item,.actions-split .actions-split .dropdown-menu .action-submenu a.action-menu-item,.actions-split .dropdown-menu a.action-menu-item{color:#333}.abs-action-menu a.action-menu-item:focus,.actions-split .abs-action-menu .action-submenu .action-submenu a.action-menu-item:focus,.actions-split .abs-action-menu .action-submenu a.action-menu-item:focus,.actions-split .action-menu .action-submenu a.action-menu-item:focus,.actions-split .action-menu a.action-menu-item:focus,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu a.action-menu-item:focus,.actions-split .actions-split .dropdown-menu .action-submenu a.action-menu-item:focus,.actions-split .dropdown-menu a.action-menu-item:focus{background-color:#e3e3e3;box-shadow:none}.abs-action-wrap-triangle{position:relative}.abs-action-wrap-triangle .action-default{width:100%}.abs-action-wrap-triangle .action-default:after,.abs-action-wrap-triangle .action-default:before{border-style:solid;content:'';height:0;position:absolute;top:0;width:0}.abs-action-wrap-triangle .action-default:active,.abs-action-wrap-triangle .action-default:focus,.abs-action-wrap-triangle .action-default:hover{box-shadow:none}._keyfocus .abs-action-wrap-triangle .action-default:focus{box-shadow:0 0 0 1px #007bdb}.ie10 .abs-action-wrap-triangle .action-default.disabled,.ie10 .abs-action-wrap-triangle .action-default[disabled],.ie9 .abs-action-wrap-triangle .action-default.disabled,.ie9 .abs-action-wrap-triangle .action-default[disabled]{background-color:#fcfcfc;opacity:1;text-shadow:none}.abs-action-wrap-triangle-right{display:inline-block;padding-right:1.6rem;position:relative}.abs-action-wrap-triangle-right .action-default:after,.abs-action-wrap-triangle-right .action-default:before{border-color:transparent transparent transparent #e3e3e3;border-width:1.7rem 0 1.6rem 1.7rem;left:100%;margin-left:-1.7rem}.abs-action-wrap-triangle-right .action-default:before{border-left-color:#949494;right:-1px}.abs-action-wrap-triangle-right .action-default:active:after,.abs-action-wrap-triangle-right .action-default:focus:after,.abs-action-wrap-triangle-right .action-default:hover:after{border-left-color:#dbdbdb}.ie10 .abs-action-wrap-triangle-right .action-default.disabled:after,.ie10 .abs-action-wrap-triangle-right .action-default[disabled]:after,.ie9 .abs-action-wrap-triangle-right .action-default.disabled:after,.ie9 .abs-action-wrap-triangle-right .action-default[disabled]:after{border-color:transparent transparent transparent #fcfcfc}.abs-action-wrap-triangle-right .action-primary:after{border-color:transparent transparent transparent #eb5202}.abs-action-wrap-triangle-right .action-primary:active:after,.abs-action-wrap-triangle-right .action-primary:focus:after,.abs-action-wrap-triangle-right .action-primary:hover:after{border-left-color:#ba4000}.abs-action-wrap-triangle-left{display:inline-block;padding-left:1.6rem}.abs-action-wrap-triangle-left .action-default{text-indent:-.85rem}.abs-action-wrap-triangle-left .action-default:after,.abs-action-wrap-triangle-left .action-default:before{border-color:transparent #e3e3e3 transparent transparent;border-width:1.7rem 1.7rem 1.6rem 0;margin-right:-1.7rem;right:100%}.abs-action-wrap-triangle-left .action-default:before{border-right-color:#949494;left:-1px}.abs-action-wrap-triangle-left .action-default:active:after,.abs-action-wrap-triangle-left .action-default:focus:after,.abs-action-wrap-triangle-left .action-default:hover:after{border-right-color:#dbdbdb}.ie10 .abs-action-wrap-triangle-left .action-default.disabled:after,.ie10 .abs-action-wrap-triangle-left .action-default[disabled]:after,.ie9 .abs-action-wrap-triangle-left .action-default.disabled:after,.ie9 .abs-action-wrap-triangle-left .action-default[disabled]:after{border-color:transparent #fcfcfc transparent transparent}.abs-action-wrap-triangle-left .action-primary:after{border-color:transparent #eb5202 transparent transparent}.abs-action-wrap-triangle-left .action-primary:active:after,.abs-action-wrap-triangle-left .action-primary:focus:after,.abs-action-wrap-triangle-left .action-primary:hover:after{border-right-color:#ba4000}.action-default,button{background:#e3e3e3;border-color:#adadad;color:#514943}.action-default:active,.action-default:focus,.action-default:hover,button:active,button:focus,button:hover{background-color:#dbdbdb;color:#514943;text-decoration:none}.action-primary{background-color:#eb5202;border-color:#eb5202;color:#fff;text-shadow:1px 1px 0 rgba(0,0,0,.25)}.action-primary:active,.action-primary:focus,.action-primary:hover{background-color:#ba4000;border-color:#b84002;box-shadow:0 0 0 1px #007bdb;color:#fff;text-decoration:none}.action-primary.disabled,.action-primary[disabled]{cursor:default;opacity:.5;pointer-events:none}.action-secondary{background-color:#514943;border-color:#514943;color:#fff;text-shadow:1px 1px 1px rgba(0,0,0,.3)}.action-secondary:active,.action-secondary:focus,.action-secondary:hover{background-color:#35302c;border-color:#35302c;box-shadow:0 0 0 1px #007bdb;color:#fff;text-decoration:none}.action-secondary:active{background-color:#35302c}.action-quaternary,.action-tertiary{background-color:transparent;border-color:transparent;text-shadow:none}.action-quaternary:active,.action-quaternary:focus,.action-quaternary:hover,.action-tertiary:active,.action-tertiary:focus,.action-tertiary:hover{background-color:transparent;border-color:transparent;box-shadow:none}.action-tertiary{color:#008bdb}.action-tertiary:active,.action-tertiary:focus,.action-tertiary:hover{color:#0fa7ff;text-decoration:underline}.action-quaternary{color:#333}.action-quaternary:active,.action-quaternary:focus,.action-quaternary:hover{color:#1a1a1a}.action-close>span{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.action-close:active{-ms-transform:scale(0.9);transform:scale(0.9)}.action-close:before{content:'\e62f';transition:color .1s linear}.action-close:hover{cursor:pointer;text-decoration:none}.abs-action-menu .action-submenu,.abs-action-menu .action-submenu .action-submenu,.action-menu,.action-menu .action-submenu,.actions-split .action-menu .action-submenu,.actions-split .action-menu .action-submenu .action-submenu,.actions-split .dropdown-menu .action-submenu,.actions-split .dropdown-menu .action-submenu .action-submenu{background-color:#fff;border:1px solid #007bdb;border-radius:1px;box-shadow:1px 1px 5px rgba(0,0,0,.5);color:#333;display:none;font-weight:400;left:0;list-style:none;margin:2px 0 0;min-width:0;padding:0;position:absolute;right:0;top:100%}.abs-action-menu .action-submenu .action-submenu._active,.abs-action-menu .action-submenu._active,.action-menu .action-submenu._active,.action-menu._active,.actions-split .action-menu .action-submenu .action-submenu._active,.actions-split .action-menu .action-submenu._active,.actions-split .dropdown-menu .action-submenu .action-submenu._active,.actions-split .dropdown-menu .action-submenu._active{display:block}.abs-action-menu .action-submenu .action-submenu>li,.abs-action-menu .action-submenu>li,.action-menu .action-submenu>li,.action-menu>li,.actions-split .action-menu .action-submenu .action-submenu>li,.actions-split .action-menu .action-submenu>li,.actions-split .dropdown-menu .action-submenu .action-submenu>li,.actions-split .dropdown-menu .action-submenu>li{border:none;display:block;padding:0;transition:background-color .1s linear}.abs-action-menu .action-submenu .action-submenu>li>a:hover,.abs-action-menu .action-submenu>li>a:hover,.action-menu .action-submenu>li>a:hover,.action-menu>li>a:hover,.actions-split .action-menu .action-submenu .action-submenu>li>a:hover,.actions-split .action-menu .action-submenu>li>a:hover,.actions-split .dropdown-menu .action-submenu .action-submenu>li>a:hover,.actions-split .dropdown-menu .action-submenu>li>a:hover{text-decoration:none}.abs-action-menu .action-submenu .action-submenu>li._visible,.abs-action-menu .action-submenu .action-submenu>li:hover,.abs-action-menu .action-submenu>li._visible,.abs-action-menu .action-submenu>li:hover,.action-menu .action-submenu>li._visible,.action-menu .action-submenu>li:hover,.action-menu>li._visible,.action-menu>li:hover,.actions-split .action-menu .action-submenu .action-submenu>li._visible,.actions-split .action-menu .action-submenu .action-submenu>li:hover,.actions-split .action-menu .action-submenu>li._visible,.actions-split .action-menu .action-submenu>li:hover,.actions-split .dropdown-menu .action-submenu .action-submenu>li._visible,.actions-split .dropdown-menu .action-submenu .action-submenu>li:hover,.actions-split .dropdown-menu .action-submenu>li._visible,.actions-split .dropdown-menu .action-submenu>li:hover{background-color:#e3e3e3}.abs-action-menu .action-submenu .action-submenu>li:active,.abs-action-menu .action-submenu>li:active,.action-menu .action-submenu>li:active,.action-menu>li:active,.actions-split .action-menu .action-submenu .action-submenu>li:active,.actions-split .action-menu .action-submenu>li:active,.actions-split .dropdown-menu .action-submenu .action-submenu>li:active,.actions-split .dropdown-menu .action-submenu>li:active{background-color:#cacaca}.abs-action-menu .action-submenu .action-submenu>li._parent,.abs-action-menu .action-submenu>li._parent,.action-menu .action-submenu>li._parent,.action-menu>li._parent,.actions-split .action-menu .action-submenu .action-submenu>li._parent,.actions-split .action-menu .action-submenu>li._parent,.actions-split .dropdown-menu .action-submenu .action-submenu>li._parent,.actions-split .dropdown-menu .action-submenu>li._parent{-webkit-flex-direction:row;display:flex;-ms-flex-direction:row;flex-direction:row}.abs-action-menu .action-submenu .action-submenu>li._parent>.action-menu-item,.abs-action-menu .action-submenu>li._parent>.action-menu-item,.action-menu .action-submenu>li._parent>.action-menu-item,.action-menu>li._parent>.action-menu-item,.actions-split .action-menu .action-submenu .action-submenu>li._parent>.action-menu-item,.actions-split .action-menu .action-submenu>li._parent>.action-menu-item,.actions-split .dropdown-menu .action-submenu .action-submenu>li._parent>.action-menu-item,.actions-split .dropdown-menu .action-submenu>li._parent>.action-menu-item{min-width:100%}.abs-action-menu .action-submenu .action-menu-item,.abs-action-menu .action-submenu .action-submenu .action-menu-item,.abs-action-menu .action-submenu .action-submenu .item,.abs-action-menu .action-submenu .item,.action-menu .action-menu-item,.action-menu .action-submenu .action-menu-item,.action-menu .action-submenu .item,.action-menu .item,.actions-split .action-menu .action-submenu .action-menu-item,.actions-split .action-menu .action-submenu .action-submenu .action-menu-item,.actions-split .action-menu .action-submenu .action-submenu .item,.actions-split .action-menu .action-submenu .item,.actions-split .dropdown-menu .action-submenu .action-menu-item,.actions-split .dropdown-menu .action-submenu .action-submenu .action-menu-item,.actions-split .dropdown-menu .action-submenu .action-submenu .item,.actions-split .dropdown-menu .action-submenu .item{cursor:pointer;display:block;padding:.6875em 1em}.abs-action-menu .action-submenu .action-submenu,.action-menu .action-submenu,.actions-split .action-menu .action-submenu .action-submenu,.actions-split .dropdown-menu .action-submenu .action-submenu{bottom:auto;left:auto;margin-left:0;margin-top:-1px;position:absolute;right:auto;top:auto}.ie9 .abs-action-menu .action-submenu .action-submenu,.ie9 .abs-action-menu .action-submenu .action-submenu .action-submenu,.ie9 .action-menu .action-submenu,.ie9 .action-menu .action-submenu .action-submenu,.ie9 .actions-split .action-menu .action-submenu .action-submenu,.ie9 .actions-split .action-menu .action-submenu .action-submenu .action-submenu,.ie9 .actions-split .dropdown-menu .action-submenu .action-submenu,.ie9 .actions-split .dropdown-menu .action-submenu .action-submenu .action-submenu{margin-left:99%;margin-top:-3.5rem}.abs-action-menu .action-submenu .action-submenu a.action-menu-item,.abs-action-menu .action-submenu a.action-menu-item,.action-menu .action-submenu a.action-menu-item,.action-menu a.action-menu-item,.actions-split .action-menu .action-submenu .action-submenu a.action-menu-item,.actions-split .action-menu .action-submenu a.action-menu-item,.actions-split .dropdown-menu .action-submenu .action-submenu a.action-menu-item,.actions-split .dropdown-menu .action-submenu a.action-menu-item{color:#333}.abs-action-menu .action-submenu .action-submenu a.action-menu-item:focus,.abs-action-menu .action-submenu a.action-menu-item:focus,.action-menu .action-submenu a.action-menu-item:focus,.action-menu a.action-menu-item:focus,.actions-split .action-menu .action-submenu .action-submenu a.action-menu-item:focus,.actions-split .action-menu .action-submenu a.action-menu-item:focus,.actions-split .dropdown-menu .action-submenu .action-submenu a.action-menu-item:focus,.actions-split .dropdown-menu .action-submenu a.action-menu-item:focus{background-color:#e3e3e3;box-shadow:none}.messages .message:last-child{margin:0 0 2rem}.message{background:#fffbbb;border:none;border-radius:0;color:#333;font-size:1.4rem;margin:0 0 1px;padding:1.8rem 4rem 1.8rem 5.5rem;position:relative;text-shadow:none}.message:before{background:0 0;border:0;color:#007bdb;content:'\e61a';font-family:Icons;font-size:1.9rem;font-style:normal;font-weight:400;height:auto;left:1.9rem;line-height:inherit;margin-top:-1.3rem;position:absolute;speak:none;text-shadow:none;top:50%;width:auto}.message-notice:before{color:#007bdb;content:'\e61a'}.message-warning:before{color:#eb5202;content:'\e623'}.message-error{background:#fcc}.message-error:before{color:#e22626;content:'\e632';font-size:1.5rem;left:2.2rem;margin-top:-1rem}.message-success:before{color:#79a22e;content:'\e62d'}.message-spinner:before{display:none}.message-spinner .spinner{font-size:2.5rem;left:1.5rem;position:absolute;top:1.5rem}.message-in-rating-edit{margin-left:1.8rem;margin-right:1.8rem}.modal-popup .action-close,.modal-slide .action-close{color:#736963;position:absolute;right:0;top:0;z-index:1}.modal-popup .action-close:active,.modal-slide .action-close:active{-ms-transform:none;transform:none}.modal-popup .action-close:active:before,.modal-slide .action-close:active:before{font-size:1.8rem}.modal-popup .action-close:hover:before,.modal-slide .action-close:hover:before{color:#58504b}.modal-popup .action-close:before,.modal-slide .action-close:before{font-size:2rem}.modal-popup .action-close:focus,.modal-slide .action-close:focus{background-color:transparent}.modal-popup.prompt .prompt-message{padding:2rem 0}.modal-popup.prompt .prompt-message input{width:100%}.modal-popup.confirm .modal-inner-wrap .message,.modal-popup.prompt .modal-inner-wrap .message{background:#fff}.modal-popup.modal-system-messages .modal-inner-wrap{background:#fffbbb}.modal-popup._image-box .modal-inner-wrap{margin:5rem auto;max-width:78rem;position:static}.modal-popup._image-box .thumbnail-preview{padding-bottom:3rem;text-align:center}.modal-popup._image-box .thumbnail-preview .thumbnail-preview-image-block{border:1px solid #ccc;margin:0 auto 2rem;max-width:58rem;padding:2rem}.modal-popup._image-box .thumbnail-preview .thumbnail-preview-image{max-height:54rem}.modal-popup .modal-title{font-size:2.4rem;margin-right:6.4rem}.modal-popup .modal-footer{padding-top:2.6rem;text-align:right}.modal-popup .action-close{padding:3rem}.modal-popup .action-close:active,.modal-popup .action-close:focus{background:0 0;padding-right:3.1rem;padding-top:3.1rem}.modal-slide .modal-content-new-attribute{-webkit-overflow-scrolling:touch;overflow:auto;padding-bottom:0}.modal-slide .modal-content-new-attribute iframe{margin-bottom:-2.5rem}.modal-slide .modal-title{font-size:2.1rem;margin-right:5.7rem}.modal-slide .action-close{padding:2.1rem 2.6rem}.modal-slide .action-close:active{padding-right:2.7rem;padding-top:2.2rem}.modal-slide .page-main-actions{margin-bottom:.6rem;margin-top:2.1rem}.modal-slide .magento-message{padding:0 3rem 3rem;position:relative}.modal-slide .magento-message .insert-title-inner,.modal-slide .main-col .insert-title-inner{border-bottom:1px solid #adadad;margin:0 0 2rem;padding-bottom:.5rem}.modal-slide .magento-message .insert-actions,.modal-slide .main-col .insert-actions{float:right}.modal-slide .magento-message .title,.modal-slide .main-col .title{font-size:1.6rem;padding-top:.5rem}.modal-slide .main-col,.modal-slide .side-col{float:left;padding-bottom:0}.modal-slide .main-col:after,.modal-slide .side-col:after{display:none}.modal-slide .side-col{width:20%}.modal-slide .main-col{padding-right:0;width:80%}.modal-slide .content-footer .form-buttons{float:right}.modal-title{font-weight:400;margin-bottom:0;min-height:1em}.modal-title span{font-size:1.4rem;font-style:italic;margin-left:1rem}.spinner{display:inline-block;font-size:4rem;height:1em;margin-right:1.5rem;position:relative;width:1em}.spinner>span:nth-child(1){animation-delay:.27s;-ms-transform:rotate(-315deg);transform:rotate(-315deg)}.spinner>span:nth-child(2){animation-delay:.36s;-ms-transform:rotate(-270deg);transform:rotate(-270deg)}.spinner>span:nth-child(3){animation-delay:.45s;-ms-transform:rotate(-225deg);transform:rotate(-225deg)}.spinner>span:nth-child(4){animation-delay:.54s;-ms-transform:rotate(-180deg);transform:rotate(-180deg)}.spinner>span:nth-child(5){animation-delay:.63s;-ms-transform:rotate(-135deg);transform:rotate(-135deg)}.spinner>span:nth-child(6){animation-delay:.72s;-ms-transform:rotate(-90deg);transform:rotate(-90deg)}.spinner>span:nth-child(7){animation-delay:.81s;-ms-transform:rotate(-45deg);transform:rotate(-45deg)}.spinner>span:nth-child(8){animation-delay:.9;-ms-transform:rotate(0deg);transform:rotate(0deg)}@keyframes fade{0%{background-color:#514943}100%{background-color:#fff}}.spinner>span{-ms-transform:scale(0.4);transform:scale(0.4);animation-name:fade;animation-duration:.72s;animation-iteration-count:infinite;animation-direction:linear;background-color:#fff;border-radius:6px;clip:rect(0 .28571429em .1em 0);height:.1em;margin-top:.5em;position:absolute;width:1em}.ie9 .spinner{background:url(../images/ajax-loader.gif) center no-repeat}.ie9 .spinner>span{display:none}.popup-loading{background:rgba(255,255,255,.8);border-color:#ef672f;color:#ef672f;font-size:14px;font-weight:700;left:50%;margin-left:-100px;padding:100px 0 10px;position:fixed;text-align:center;top:40%;width:200px;z-index:1003}.popup-loading:after{background-image:url(../images/loader-1.gif);content:'';height:64px;left:50%;margin:-32px 0 0 -32px;position:absolute;top:40%;width:64px;z-index:2}.loading-mask,.loading-old{background:rgba(255,255,255,.4);bottom:0;left:0;position:fixed;right:0;top:0;z-index:2003}.loading-mask img,.loading-old img{display:none}.loading-mask p,.loading-old p{margin-top:118px}.loading-mask .loader,.loading-old .loader{background:url(../images/loader-1.gif) 50% 30% no-repeat #f7f3eb;border-radius:5px;bottom:0;color:#575757;font-size:14px;font-weight:700;height:160px;left:0;margin:auto;opacity:.95;position:absolute;right:0;text-align:center;top:0;width:160px}.admin-user{float:right;line-height:1.36;margin-left:.3rem;z-index:490}.admin-user._active .admin__action-dropdown,.admin-user.active .admin__action-dropdown{border-color:#007bdb;box-shadow:1px 1px 5px rgba(0,0,0,.5)}.admin-user .admin__action-dropdown{height:3.3rem;padding:.7rem 2.8rem .4rem 4rem}.admin-user .admin__action-dropdown._active:after,.admin-user .admin__action-dropdown.active:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.admin-user .admin__action-dropdown:after{border-color:#777 transparent transparent;border-style:solid;border-width:.5rem .4rem 0;content:'';height:0;margin-top:-.2rem;position:absolute;right:1.3rem;top:50%;transition:all .2s linear;width:0}._active .admin-user .admin__action-dropdown:after,.active .admin-user .admin__action-dropdown:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.admin-user .admin__action-dropdown:hover:after{border-color:#000 transparent transparent}.admin-user .admin__action-dropdown:before{color:#777;content:'\e600';font-size:2rem;left:1.1rem;margin-top:-1.1rem;position:absolute;top:50%}.admin-user .admin__action-dropdown:hover:before{color:#333}.admin-user .admin__action-dropdown-menu{min-width:20rem;padding-left:1rem;padding-right:1rem}.admin-user .admin__action-dropdown-menu>li>a{padding-left:.5em;padding-right:1.8rem;transition:background-color .1s linear;white-space:nowrap}.admin-user .admin__action-dropdown-menu>li>a:hover{background-color:#e0f6fe;color:#333}.admin-user .admin__action-dropdown-menu>li>a:active{background-color:#c7effd;bottom:-1px;position:relative}.admin-user .admin__action-dropdown-menu .admin-user-name{text-overflow:ellipsis;white-space:nowrap;display:inline-block;max-width:20rem;overflow:hidden;vertical-align:top}.admin-user-account-text{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:inline-block;max-width:11.2rem}.search-global{float:right;margin-right:-.3rem;position:relative;z-index:480}.search-global-field{min-width:5rem}.search-global-field._active .search-global-input{background-color:#fff;border-color:#007bdb;box-shadow:1px 1px 5px rgba(0,0,0,.5);padding-right:4rem;width:25rem}.search-global-field._active .search-global-action{display:block;height:3.3rem;position:absolute;right:0;text-indent:-100%;top:0;width:5rem;z-index:3}.search-global-field .autocomplete-results{height:3.3rem;position:absolute;right:0;top:0;width:25rem}.search-global-field .search-global-menu{border:1px solid #007bdb;border-top-color:transparent;box-shadow:1px 1px 5px rgba(0,0,0,.5);left:0;margin-top:-2px;padding:0;position:absolute;right:0;top:100%;z-index:2}.search-global-field .search-global-menu:after{background-color:#fff;content:'';height:5px;left:0;position:absolute;right:0;top:-5px}.search-global-field .search-global-menu>li{background-color:#fff;border-top:1px solid #ddd;display:block;font-size:1.2rem;padding:.75rem 1.4rem .55rem}.search-global-field .search-global-menu>li._active{background-color:#e0f6fe}.search-global-field .search-global-menu .title{display:block;font-size:1.4rem}.search-global-field .search-global-menu .type{color:#1a1a1a;display:block}.search-global-label{cursor:pointer;height:3.3rem;padding:.75rem 1.4rem .55rem;position:absolute;right:0;top:0;z-index:2}.search-global-label:active{-ms-transform:scale(0.9);transform:scale(0.9)}.search-global-label:hover:before{color:#000}.search-global-label:before{color:#777;content:'\e60c';font-size:2rem}.search-global-input{background-color:transparent;border:1px solid transparent;font-size:1.4rem;height:3.3rem;padding:.75rem 1.4rem .55rem;position:absolute;right:0;top:0;transition:all .1s linear,width .3s linear;width:5rem;z-index:1}.search-global-action{display:none}.notifications-wrapper{float:right;line-height:1;position:relative}.notifications-wrapper.active{z-index:500}.notifications-wrapper.active .notifications-action{border-color:#007bdb;box-shadow:1px 1px 5px rgba(0,0,0,.5)}.notifications-wrapper.active .notifications-action:after{background-color:#fff;border:none;content:'';display:block;height:6px;left:-6px;margin-top:0;position:absolute;right:0;top:100%;width:auto}.notifications-wrapper .admin__action-dropdown-menu{padding:1rem 0 0;width:32rem}.notifications-action{color:#777;height:3.3rem;padding:.75rem 2rem .65rem}.notifications-action:after{display:none}.notifications-action:before{content:'\e607';font-size:1.9rem;margin-right:0}.notifications-action:active:before{position:relative;top:1px}.notifications-action .notifications-counter{background-color:#e22626;border-radius:1em;color:#fff;display:inline-block;font-size:1.1rem;font-weight:700;left:50%;margin-left:.3em;margin-top:-1.1em;padding:.3em .5em;position:absolute;top:50%}.notifications-entry{line-height:1.36;padding:.6rem 2rem .8rem;position:relative;transition:background-color .1s linear}.notifications-entry:hover{background-color:#e0f6fe}.notifications-entry.notifications-entry-last{margin:0 2rem;padding:.3rem 0 1.3rem;text-align:center}.notifications-entry.notifications-entry-last:hover{background-color:transparent}.notifications-entry+.notifications-entry-last{border-top:1px solid #ddd;padding-bottom:.6rem}.notifications-entry ._cutted{cursor:pointer}.notifications-entry ._cutted .notifications-entry-description-start:after{content:'...'}.notifications-entry-title{color:#ef672f;display:block;font-size:1.1rem;font-weight:700;margin-bottom:.7rem;margin-right:1em}.notifications-entry-description{color:#333;font-size:1.1rem;margin-bottom:.8rem}.notifications-entry-description-end{display:none}.notifications-entry-description-end._show{display:inline}.notifications-entry-time{color:#777;font-size:1.1rem}.notifications-close{line-height:1;padding:1rem;position:absolute;right:0;top:.6rem}.notifications-close:before{color:#ccc;content:'\e620';transition:color .1s linear}.notifications-close:hover:before{color:#b3b3b3}.notifications-close:active{-ms-transform:scale(0.95);transform:scale(0.95)}.page-header-actions{padding-top:1.1rem}.page-header-hgroup{padding-right:1.5rem}.page-title{color:#333;font-size:2.8rem}.page-header{padding:1.5rem 3rem}.menu-wrapper{display:inline-block;position:relative;width:8.8rem;z-index:700}.menu-wrapper:before{background-color:#373330;bottom:0;content:'';left:0;position:fixed;top:0;width:8.8rem;z-index:699}.menu-wrapper._fixed{left:0;position:fixed;top:0}.menu-wrapper._fixed~.page-wrapper{margin-left:8.8rem}.menu-wrapper .logo{display:block;height:8.8rem;padding:2.4rem 0 2.2rem;position:relative;text-align:center;z-index:700}._keyfocus .menu-wrapper .logo:focus{background-color:#4a4542;box-shadow:none}._keyfocus .menu-wrapper .logo:focus+.admin__menu .level-0:first-child>a{background-color:#373330}._keyfocus .menu-wrapper .logo:focus+.admin__menu .level-0:first-child>a:after{display:none}.menu-wrapper .logo:hover .logo-img{-webkit-filter:brightness(1.1);filter:brightness(1.1)}.menu-wrapper .logo:active .logo-img{-ms-transform:scale(0.95);transform:scale(0.95)}.menu-wrapper .logo .logo-img{height:4.2rem;transition:-webkit-filter .2s linear,filter .2s linear,transform .1s linear;width:3.5rem}.abs-menu-separator,.admin__menu .item-partners>a:after,.admin__menu .level-0:first-child>a:after{background-color:#736963;content:'';display:block;height:1px;left:0;margin-left:16%;position:absolute;top:0;width:68%}.admin__menu li{display:block}.admin__menu .level-0:first-child>a{position:relative}.admin__menu .level-0._active>a,.admin__menu .level-0:hover>a{color:#f7f3eb}.admin__menu .level-0._active>a{background-color:#524d49}.admin__menu .level-0:hover>a{background-color:#4a4542}.admin__menu .level-0>a{color:#aaa6a0;display:block;font-size:1rem;letter-spacing:.025em;min-height:6.2rem;padding:1.2rem .5rem .5rem;position:relative;text-align:center;text-decoration:none;text-transform:uppercase;transition:background-color .1s linear;word-wrap:break-word;z-index:700}.admin__menu .level-0>a:focus{box-shadow:none}.admin__menu .level-0>a:before{content:'\e63a';display:block;font-size:2.2rem;height:2.2rem}.admin__menu .level-0>.submenu{background-color:#4a4542;box-shadow:0 0 3px #000;left:100%;min-height:calc(8.8rem + 2rem + 100%);padding:2rem 0 0;position:absolute;top:0;-ms-transform:translateX(-100%);transform:translateX(-100%);transition-duration:.3s;transition-property:transform,visibility;transition-timing-function:ease-in-out;visibility:hidden;z-index:697}.ie10 .admin__menu .level-0>.submenu,.ie11 .admin__menu .level-0>.submenu{height:100%}.admin__menu .level-0._show>.submenu{-ms-transform:translateX(0);transform:translateX(0);visibility:visible;z-index:698}.admin__menu .level-1{margin-left:1.5rem;margin-right:1.5rem}.admin__menu [class*=level-]:not(.level-0) a{display:block;padding:1.25rem 1.5rem}.admin__menu [class*=level-]:not(.level-0) a:hover{background-color:#403934}.admin__menu [class*=level-]:not(.level-0) a:active{background-color:#322c29;padding-bottom:1.15rem;padding-top:1.35rem}.admin__menu .submenu li{min-width:23.8rem}.admin__menu .submenu a{color:#fcfcfc;transition:background-color .1s linear}.admin__menu .submenu a:focus,.admin__menu .submenu a:hover{box-shadow:none;text-decoration:none}._keyfocus .admin__menu .submenu a:focus{background-color:#403934}._keyfocus .admin__menu .submenu a:active{background-color:#322c29}.admin__menu .submenu .parent{margin-bottom:4.5rem}.admin__menu .submenu .parent .submenu-group-title{color:#a79d95;display:block;font-size:1.6rem;font-weight:600;margin-bottom:.7rem;padding:1.25rem 1.5rem;pointer-events:none}.admin__menu .submenu .column{display:table-cell}.admin__menu .submenu-title{color:#fff;display:block;font-size:2.2rem;font-weight:600;margin-bottom:4.2rem;margin-left:3rem;margin-right:5.8rem}.admin__menu .submenu-sub-title{color:#fff;display:block;font-size:1.2rem;margin:-3.8rem 5.8rem 3.8rem 3rem}.admin__menu .action-close{padding:2.4rem 2.8rem;position:absolute;right:0;top:0}.admin__menu .action-close:before{color:#a79d95;font-size:1.7rem}.admin__menu .action-close:hover:before{color:#fff}.admin__menu .item-dashboard>a:before{content:'\e604';font-size:1.8rem;padding-top:.4rem}.admin__menu .item-sales>a:before{content:'\e60b'}.admin__menu .item-catalog>a:before{content:'\e608'}.admin__menu .item-customer>a:before{content:'\e603';font-size:2.6rem;position:relative;top:-.4rem}.admin__menu .item-marketing>a:before{content:'\e609';font-size:2rem;padding-top:.2rem}.admin__menu .item-content>a:before{content:'\e602';font-size:2.4rem;position:relative;top:-.2rem}.admin__menu .item-report>a:before{content:'\e60a'}.admin__menu .item-stores>a:before{content:'\e60d';font-size:1.9rem;padding-top:.3rem}.admin__menu .item-system>a:before{content:'\e610'}.admin__menu .item-partners._active>a:after,.admin__menu .item-system._current+.item-partners>a:after{display:none}.admin__menu .item-partners>a{padding-bottom:1rem}.admin__menu .item-partners>a:before{content:'\e612'}.admin__menu .level-0>.submenu>ul>.level-1:only-of-type>.submenu-group-title,.admin__menu .submenu .column:only-of-type .submenu-group-title{display:none}.admin__menu-overlay{bottom:0;left:0;position:fixed;right:0;top:0;z-index:697}.store-switcher{color:#333;float:left;font-size:1.3rem;margin-top:.7rem}.store-switcher .admin__action-dropdown{background-color:#f8f8f8;margin-left:.5em}.store-switcher .dropdown{display:inline-block;position:relative}.store-switcher .dropdown:after,.store-switcher .dropdown:before{content:'';display:table}.store-switcher .dropdown:after{clear:both}.store-switcher .dropdown .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.store-switcher .dropdown .action.toggle:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:2;color:#333;content:'\e607';font-family:icons-blank-theme;margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.store-switcher .dropdown .action.toggle:active:after,.store-switcher .dropdown .action.toggle:hover:after{color:#333}.store-switcher .dropdown .action.toggle.active{display:inline-block;text-decoration:none}.store-switcher .dropdown .action.toggle.active:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:2;color:#333;content:'\e618';font-family:icons-blank-theme;margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.store-switcher .dropdown .action.toggle.active:active:after,.store-switcher .dropdown .action.toggle.active:hover:after{color:#333}.store-switcher .dropdown .dropdown-menu{margin:4px 0 0;padding:0;list-style:none;background:#fff;border:1px solid #aaa6a0;min-width:19.5rem;z-index:100;box-sizing:border-box;display:none;position:absolute;top:100%;box-shadow:1px 1px 5px rgba(0,0,0,.5)}.store-switcher .dropdown .dropdown-menu li{margin:0;padding:0}.store-switcher .dropdown .dropdown-menu li:hover{background:0 0;cursor:pointer}.store-switcher .dropdown.active{overflow:visible}.store-switcher .dropdown.active .dropdown-menu{display:block}.store-switcher .dropdown-menu{left:0;margin-top:.5em;max-height:250px;overflow-y:auto;padding-top:.25em}.store-switcher .dropdown-menu li{border:0;cursor:default}.store-switcher .dropdown-menu li:hover{cursor:default}.store-switcher .dropdown-menu li a,.store-switcher .dropdown-menu li span{color:#333;display:block;padding:.5rem 1.3rem}.store-switcher .dropdown-menu li a{text-decoration:none}.store-switcher .dropdown-menu li a:hover{background:#e9e9e9}.store-switcher .dropdown-menu li span{color:#adadad;cursor:default}.store-switcher .dropdown-menu li.current span{background:#eee;color:#333}.store-switcher .dropdown-menu .store-switcher-store a,.store-switcher .dropdown-menu .store-switcher-store span{padding-left:2.6rem}.store-switcher .dropdown-menu .store-switcher-store-view a,.store-switcher .dropdown-menu .store-switcher-store-view span{padding-left:3.9rem}.store-switcher .dropdown-menu .dropdown-toolbar{border-top:1px solid #ebebeb;margin-top:1rem}.store-switcher .dropdown-menu .dropdown-toolbar a:before{content:'\e610';margin-right:.25em;position:relative;top:1px}.store-switcher-label{font-weight:700}.store-switcher-alt{display:inline-block;position:relative}.store-switcher-alt.active .dropdown-menu{display:block}.store-switcher-alt .dropdown-menu{margin-top:2px;white-space:nowrap}.store-switcher-alt .dropdown-menu ul{list-style:none;margin:0;padding:0}.store-switcher-alt strong{color:#a79d95;display:block;font-size:14px;font-weight:500;line-height:1.333;padding:5px 10px}.store-switcher-alt .store-selected{color:#676056;cursor:pointer;font-size:12px;font-weight:400;line-height:1.333}.store-switcher-alt .store-selected:after{-webkit-font-smoothing:antialiased;color:#afadac;content:'\e02c';font-style:normal;font-weight:400;margin:0 0 0 3px;speak:none;vertical-align:text-top}.store-switcher-alt .store-switcher-store,.store-switcher-alt .store-switcher-website{padding:0}.store-switcher-alt .store-switcher-store:hover,.store-switcher-alt .store-switcher-website:hover{background:0 0}.store-switcher-alt .manage-stores,.store-switcher-alt .store-switcher-all,.store-switcher-alt .store-switcher-store-view{padding:0}.store-switcher-alt .manage-stores>a,.store-switcher-alt .store-switcher-all>a{color:#676056;display:block;font-size:12px;padding:8px 15px;text-decoration:none}.store-switcher-website{margin:5px 0 0}.store-switcher-website>strong{padding-left:13px}.store-switcher-store{margin:1px 0 0}.store-switcher-store>strong{padding-left:20px}.store-switcher-store>ul{margin-top:1px}.store-switcher-store-view:first-child{border-top:1px solid #e5e5e5}.store-switcher-store-view>a{color:#333;display:block;font-size:13px;padding:5px 15px 5px 24px;text-decoration:none}.store-view:not(.store-switcher){float:left}.store-view .store-switcher-label{display:inline-block;margin-top:1rem}.tooltip{margin-left:.5em}.tooltip .help a,.tooltip .help span{cursor:pointer;display:inline-block;height:22px;position:relative;vertical-align:middle;width:22px;z-index:2}.tooltip .help a:before,.tooltip .help span:before{color:#333;content:'\e633';font-size:1.7rem}.tooltip .help a:hover{text-decoration:none}.tooltip .tooltip-content{background:#000;border-radius:3px;color:#fff;display:none;margin-left:-19px;margin-top:10px;max-width:200px;padding:4px 8px;position:absolute;text-shadow:none;z-index:20}.tooltip .tooltip-content:before{border-bottom:5px solid #000;border-left:5px solid transparent;border-right:5px solid transparent;content:'';height:0;left:20px;opacity:.8;position:absolute;top:-5px;width:0}.tooltip .tooltip-content.loading{position:absolute}.tooltip .tooltip-content.loading:before{border-bottom-color:rgba(0,0,0,.3)}.tooltip:hover>.tooltip-content{display:block}.page-actions._fixed,.page-main-actions:not(._hidden){background:#f8f8f8;border-bottom:1px solid #e3e3e3;border-top:1px solid #e3e3e3;padding:1.5rem}.page-main-actions{margin:0 0 3rem}.page-main-actions._hidden .store-switcher{display:none}.page-main-actions._hidden .page-actions-placeholder{min-height:50px}.page-actions{float:right}.page-main-actions .page-actions._fixed{left:8.8rem;position:fixed;right:0;top:0;z-index:501}.page-main-actions .page-actions._fixed .page-actions-inner:before{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:#333;content:attr(data-title);float:left;font-size:2.8rem;margin-top:.3rem;max-width:50%}.page-actions .page-actions-buttons>button,.page-actions>button{float:right;margin-left:1.3rem}.page-actions .page-actions-buttons>button.action-back,.page-actions .page-actions-buttons>button.back,.page-actions>button.action-back,.page-actions>button.back{float:left;-ms-flex-order:-1;order:-1}.page-actions .page-actions-buttons>button.action-back:before,.page-actions .page-actions-buttons>button.back:before,.page-actions>button.action-back:before,.page-actions>button.back:before{content:'\e626';margin-right:.5em;position:relative;top:1px}.page-actions .page-actions-buttons>button.action-primary,.page-actions .page-actions-buttons>button.primary,.page-actions>button.action-primary,.page-actions>button.primary{-ms-flex-order:2;order:2}.page-actions .page-actions-buttons>button.save:not(.primary),.page-actions>button.save:not(.primary){-ms-flex-order:1;order:1}.page-actions .page-actions-buttons>button.delete,.page-actions>button.delete{-ms-flex-order:-1;order:-1}.page-actions .actions-split{float:right;margin-left:1.3rem;-ms-flex-order:2;order:2}.page-actions .actions-split .dropdown-menu .item{display:block}.page-actions-buttons{float:right;-ms-flex-pack:end;justify-content:flex-end;display:-ms-flexbox;display:flex}.customer-index-edit .page-actions-buttons{background-color:transparent}.admin__page-nav{background:#f1f1f1;border:1px solid #e3e3e3}.admin__page-nav._collapsed:first-child{border-bottom:none}.admin__page-nav._collapsed._show{border-bottom:1px solid #e3e3e3}.admin__page-nav._collapsed._show ._collapsible{background:#f1f1f1}.admin__page-nav._collapsed._show ._collapsible:after{content:'\e62b'}.admin__page-nav._collapsed._show ._collapsible+.admin__page-nav-items{display:block}.admin__page-nav._collapsed._hide .admin__page-nav-title-messages,.admin__page-nav._collapsed._hide .admin__page-nav-title-messages ._active{display:inline-block}.admin__page-nav+._collapsed{border-bottom:none;border-top:none}.admin__page-nav-title{border-bottom:1px solid #e3e3e3;color:#303030;display:block;font-size:1.4rem;line-height:1.2;margin:0 0 -1px;padding:1.8rem 1.5rem;position:relative;text-transform:uppercase}.admin__page-nav-title._collapsible{background:#fff;cursor:pointer;margin:0;padding-right:3.5rem;transition:border-color .1s ease-out,background-color .1s ease-out}.admin__page-nav-title._collapsible+.admin__page-nav-items{display:none;margin-top:-1px}.admin__page-nav-title._collapsible:after{content:'\e628';font-size:1.3rem;font-weight:700;position:absolute;right:1.8rem;top:2rem}.admin__page-nav-title._collapsible:hover{background:#f1f1f1}.admin__page-nav-title._collapsible:last-child{margin:0 0 -1px}.admin__page-nav-title strong{font-weight:700}.admin__page-nav-title .admin__page-nav-title-messages{display:none}.admin__page-nav-items{list-style-type:none;margin:0;padding:1rem 0 1.3rem}.admin__page-nav-item{border-left:3px solid transparent;margin-left:.7rem;padding:0;position:relative;transition:border-color .1s ease-out,background-color .1s ease-out}.admin__page-nav-item:hover{border-color:#e4e4e4}.admin__page-nav-item:hover .admin__page-nav-link{background:#e4e4e4;color:#303030;text-decoration:none}.admin__page-nav-item._active,.admin__page-nav-item.ui-state-active{border-color:#eb5202}.admin__page-nav-item._active .admin__page-nav-link,.admin__page-nav-item.ui-state-active .admin__page-nav-link{background:#fff;border-color:#e3e3e3;border-right:1px solid #fff;color:#303030;margin-right:-1px;font-weight:600}.admin__page-nav-item._loading:before,.admin__page-nav-item.ui-tabs-loading:before{display:none}.admin__page-nav-item._loading .admin__page-nav-item-message-loader,.admin__page-nav-item.ui-tabs-loading .admin__page-nav-item-message-loader{display:inline-block}.admin__page-nav-link{border:1px solid transparent;border-width:1px 0;color:#303030;display:block;font-weight:500;line-height:1.2;margin:0 0 -1px;padding:2rem 4rem 2rem 1rem;transition:border-color .1s ease-out,background-color .1s ease-out;word-wrap:break-word}.admin__page-nav-item-messages{display:inline-block}.admin__page-nav-item-messages .admin__page-nav-item-message-tooltip{background:#f1f1f1;border:1px solid #f1f1f1;border-radius:1px;bottom:3.7rem;box-shadow:0 3px 9px 0 rgba(0,0,0,.3);display:none;font-size:1.4rem;font-weight:400;left:-1rem;line-height:1.36;padding:1.5rem;position:absolute;text-transform:none;width:27rem;word-break:normal;z-index:2}.admin__page-nav-item-messages .admin__page-nav-item-message-tooltip:after,.admin__page-nav-item-messages .admin__page-nav-item-message-tooltip:before{border:15px solid transparent;height:0;width:0;border-top-color:#f1f1f1;content:'';display:block;left:2rem;position:absolute;top:100%;z-index:3}.admin__page-nav-item-messages .admin__page-nav-item-message-tooltip:after{border-top-color:#f1f1f1;margin-top:-1px;z-index:4}.admin__page-nav-item-messages .admin__page-nav-item-message-tooltip:before{border-top-color:#bfbfbf;margin-top:1px}.admin__page-nav-item-message-loader{display:none;margin-top:-1rem;position:absolute;right:0;top:50%}.admin__page-nav-item-message-loader .spinner{font-size:2rem;margin-right:1.5rem}._loading>.admin__page-nav-item-messages .admin__page-nav-item-message-loader{display:inline-block}.admin__page-nav-item-message{position:relative}.admin__page-nav-item-message:hover{z-index:500}.admin__page-nav-item-message:hover .admin__page-nav-item-message-tooltip{display:block}.admin__page-nav-item-message._changed,.admin__page-nav-item-message._error{display:none}.admin__page-nav-item-message .admin__page-nav-item-message-icon{display:inline-block;font-size:1.4rem;padding-left:.8em;vertical-align:baseline}.admin__page-nav-item-message .admin__page-nav-item-message-icon:after{color:#666;content:'\e631'}._changed:not(._error)>.admin__page-nav-item-messages ._changed{display:inline-block}._error .admin__page-nav-item-message-icon:after{color:#eb5202;content:'\e623'}._error>.admin__page-nav-item-messages ._error{display:inline-block}._error>.admin__page-nav-item-messages ._error .spinner{font-size:2rem;margin-right:1.5rem}._error .admin__page-nav-item-message-tooltip{background:#f1f1f1;border:1px solid #f1f1f1;border-radius:1px;bottom:3.7rem;box-shadow:0 3px 9px 0 rgba(0,0,0,.3);display:none;font-weight:400;left:-1rem;line-height:1.36;padding:2rem;position:absolute;text-transform:none;width:27rem;word-break:normal;z-index:2}._error .admin__page-nav-item-message-tooltip:after,._error .admin__page-nav-item-message-tooltip:before{border:15px solid transparent;height:0;width:0;border-top-color:#f1f1f1;content:'';display:block;left:2rem;position:absolute;top:100%;z-index:3}._error .admin__page-nav-item-message-tooltip:after{border-top-color:#f1f1f1;margin-top:-1px;z-index:4}._error .admin__page-nav-item-message-tooltip:before{border-top-color:#bfbfbf}.admin__data-grid-wrap-static .data-grid{box-sizing:border-box}.admin__data-grid-wrap-static .data-grid thead{color:#333}.admin__data-grid-wrap-static .data-grid tr:nth-child(even) td{background-color:#f5f5f5}.admin__data-grid-wrap-static .data-grid tr:nth-child(even) td._dragging{background-color:rgba(245,245,245,.95)}.admin__data-grid-wrap-static .data-grid ul{margin-left:1rem;padding-left:1rem}.admin__data-grid-wrap-static .admin__data-grid-loading-mask{background:rgba(255,255,255,.5);bottom:0;left:0;position:absolute;right:0;top:0;z-index:399}.admin__data-grid-wrap-static .admin__data-grid-loading-mask .grid-loader{background:url(../images/loader-2.gif) 50% 50% no-repeat;bottom:0;height:149px;left:0;margin:auto;position:absolute;right:0;top:0;width:218px}.data-grid-filters-actions-wrap{float:right}.data-grid-search-control-wrap{float:left;max-width:45.5rem;position:relative;width:35%}.data-grid-search-control-wrap :-ms-input-placeholder{font-style:italic}.data-grid-search-control-wrap ::-webkit-input-placeholder{font-style:italic}.data-grid-search-control-wrap ::-moz-placeholder{font-style:italic}.data-grid-search-control-wrap .action-submit{background-color:transparent;border:none;border-radius:0;box-shadow:none;margin:0;padding:.6rem 2rem .2rem;position:absolute;right:0;top:1px}.data-grid-search-control-wrap .action-submit:hover{background-color:transparent;border:none;box-shadow:none}.data-grid-search-control-wrap .action-submit:active{-ms-transform:scale(0.9);transform:scale(0.9)}.data-grid-search-control-wrap .action-submit:hover:before{color:#1a1a1a}._keyfocus .data-grid-search-control-wrap .action-submit:focus{box-shadow:0 0 0 1px #008bdb}.data-grid-search-control-wrap .action-submit:before{content:'\e60c';font-size:2rem;transition:color .1s linear}.data-grid-search-control-wrap .action-submit>span{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.data-grid-search-control-wrap .abs-action-menu .action-submenu,.data-grid-search-control-wrap .abs-action-menu .action-submenu .action-submenu,.data-grid-search-control-wrap .action-menu,.data-grid-search-control-wrap .action-menu .action-submenu,.data-grid-search-control-wrap .actions-split .action-menu .action-submenu,.data-grid-search-control-wrap .actions-split .action-menu .action-submenu .action-submenu,.data-grid-search-control-wrap .actions-split .dropdown-menu .action-submenu,.data-grid-search-control-wrap .actions-split .dropdown-menu .action-submenu .action-submenu{max-height:19.25rem;overflow-y:auto;z-index:398}.data-grid-search-control-wrap .action-menu-item._selected{background-color:#e0f6fe}.data-grid-search-control-wrap .data-grid-search-label{display:none}.data-grid-search-control{padding-right:6rem;width:100%}.data-grid-filters-action-wrap{float:left;padding-left:2rem}.data-grid-filters-action-wrap .action-default{font-size:1.3rem;margin-bottom:1rem;padding-left:1.7rem;padding-right:2.1rem;padding-top:.7rem}.data-grid-filters-action-wrap .action-default._active{background-color:#fff;border-bottom-color:#fff;border-right-color:#ccc;font-weight:600;margin:-.1rem 0 0;padding-bottom:1.6rem;padding-top:.8rem;position:relative;z-index:281}.data-grid-filters-action-wrap .action-default._active:after{background-color:#eb5202;bottom:100%;content:'';height:3px;left:-1px;position:absolute;right:-1px}.data-grid-filters-action-wrap .action-default:before{color:#333;content:'\e605';font-size:1.8rem;margin-right:.4rem;position:relative;top:-1px;vertical-align:top}.data-grid-filters-action-wrap .filters-active{display:none}.admin__action-grid-select .admin__control-select{margin:-.5rem .5rem 0 0;padding-bottom:.6rem;padding-top:.6rem}.admin__data-grid-filters-wrap{opacity:0;visibility:hidden;clear:both;font-size:1.3rem;transition:opacity .3s ease}.admin__data-grid-filters-wrap._show{opacity:1;visibility:visible;border-bottom:1px solid #ccc;border-top:1px solid #ccc;margin-bottom:.7rem;padding:3.6rem 0 3rem;position:relative;top:-1px;z-index:280}.admin__data-grid-filters-wrap._show .admin__data-grid-filters,.admin__data-grid-filters-wrap._show .admin__data-grid-filters-footer{display:block}.admin__data-grid-filters-wrap .admin__form-field-label,.admin__data-grid-filters-wrap .admin__form-field-legend{display:block;font-weight:700;margin:0 0 .3rem;text-align:left}.admin__data-grid-filters-wrap .admin__form-field{display:inline-block;margin-bottom:2em;margin-left:0;padding-left:2rem;padding-right:2rem;vertical-align:top;width:calc(100% / 4 - 4px)}.admin__data-grid-filters-wrap .admin__form-field .admin__form-field{display:block;float:none;margin-bottom:1.5rem;padding-left:0;padding-right:0;width:auto}.admin__data-grid-filters-wrap .admin__form-field .admin__form-field:last-child{margin-bottom:0}.admin__data-grid-filters-wrap .admin__form-field .admin__form-field .admin__form-field-label{border:1px solid transparent;float:left;font-weight:400;line-height:1.36;margin-bottom:0;padding-bottom:.6rem;padding-right:1em;padding-top:.6rem;width:25%}.admin__data-grid-filters-wrap .admin__form-field .admin__form-field .admin__form-field-control{margin-left:25%}.admin__data-grid-filters-wrap .admin__action-multiselect,.admin__data-grid-filters-wrap .admin__control-select,.admin__data-grid-filters-wrap .admin__control-text,.admin__data-grid-filters-wrap .admin__form-field-label{font-size:1.3rem}.admin__data-grid-filters-wrap .admin__control-select{height:3.2rem;padding-top:.5rem}.admin__data-grid-filters-wrap .admin__action-multiselect:before{height:3.2rem;width:3.2rem}.admin__data-grid-filters-wrap .admin__control-select,.admin__data-grid-filters-wrap .admin__control-text._has-datepicker{width:100%}.admin__data-grid-filters{display:none;margin-left:-2rem;margin-right:-2rem}.admin__filters-legend{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.admin__data-grid-filters-footer{display:none;font-size:1.4rem}.admin__data-grid-filters-footer .admin__footer-main-actions{margin-left:25%;text-align:right}.admin__data-grid-filters-footer .admin__footer-secondary-actions{float:left;width:50%}.admin__data-grid-filters-current{border-bottom:.1rem solid #ccc;border-top:.1rem solid #ccc;display:none;font-size:1.3rem;margin-bottom:.9rem;padding-bottom:.8rem;padding-top:1.1rem;width:100%}.admin__data-grid-filters-current._show{display:table;position:relative;top:-1px;z-index:3}.admin__data-grid-filters-current._show+.admin__data-grid-filters-wrap._show{margin-top:-1rem}.admin__current-filters-actions-wrap,.admin__current-filters-list-wrap,.admin__current-filters-title-wrap{display:table-cell;vertical-align:top}.admin__current-filters-title{margin-right:1em;white-space:nowrap}.admin__current-filters-list-wrap{width:100%}.admin__current-filters-list{margin-bottom:0}.admin__current-filters-list>li{display:inline-block;font-weight:600;margin:0 1rem .5rem;padding-right:2.6rem;position:relative}.admin__current-filters-list .action-remove{background-color:transparent;border:none;border-radius:0;box-shadow:none;margin:0;padding:0;line-height:1;position:absolute;right:0;top:1px}.admin__current-filters-list .action-remove:hover{background-color:transparent;border:none;box-shadow:none}.admin__current-filters-list .action-remove:hover:before{color:#949494}.admin__current-filters-list .action-remove:active{-ms-transform:scale(0.9);transform:scale(0.9)}.admin__current-filters-list .action-remove:before{color:#adadad;content:'\e620';font-size:1.6rem;transition:color .1s linear}.admin__current-filters-list .action-remove>span{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.admin__current-filters-actions-wrap .action-clear{border:none;padding-bottom:0;padding-top:0;white-space:nowrap}.admin__data-grid-pager-wrap{float:right;text-align:right}.admin__data-grid-pager{display:inline-block;margin-left:3rem}.admin__data-grid-pager .admin__control-text::-webkit-inner-spin-button,.admin__data-grid-pager .admin__control-text::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.admin__data-grid-pager .admin__control-text{-moz-appearance:textfield;text-align:center;width:4.4rem}.action-next,.action-previous{width:4.4rem}.action-next:before,.action-previous:before{font-weight:700}.action-next>span,.action-previous>span{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.action-previous{margin-right:2.5rem;text-indent:-.25em}.action-previous:before{content:'\e629'}.action-next{margin-left:1.5rem;text-indent:.1em}.action-next:before{content:'\e62a'}.admin__data-grid-action-bookmarks{opacity:.98}.admin__data-grid-action-bookmarks .admin__action-dropdown-text:after{left:0;right:-6px}.admin__data-grid-action-bookmarks._active{z-index:290}.admin__data-grid-action-bookmarks .admin__action-dropdown .admin__action-dropdown-text{display:inline-block;max-width:15rem;min-width:4.9rem;vertical-align:top;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.admin__data-grid-action-bookmarks .admin__action-dropdown:before{content:'\e60f'}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu{font-size:1.3rem;left:0;padding:1rem 0;right:auto}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu>li{padding:0 5rem 0 0;position:relative;white-space:nowrap}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu>li:not(.action-dropdown-menu-action){transition:background-color .1s linear}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu>li:not(.action-dropdown-menu-action):hover{background-color:#e3e3e3}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-item{max-width:23rem;min-width:18rem;white-space:normal;word-break:break-all}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-item-edit{display:none;padding-bottom:1rem;padding-left:1rem;padding-top:1rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-item-edit .action-dropdown-menu-item-actions{padding-bottom:1rem;padding-top:1rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-action{padding-left:1rem;padding-top:1rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-action+.action-dropdown-menu-item-last{padding-top:.5rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-action>a{color:#008bdb;text-decoration:none;display:inline-block;padding-left:1.1rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-action>a:hover{color:#0fa7ff;text-decoration:underline}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-item-last{padding-bottom:0}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu ._edit .action-dropdown-menu-item{display:none}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu ._edit .action-dropdown-menu-item-edit{display:block}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu ._active .action-dropdown-menu-link{font-weight:600}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .admin__control-text{font-size:1.3rem;min-width:15rem;width:calc(100% - 4rem)}.ie9 .admin__data-grid-action-bookmarks .admin__action-dropdown-menu .admin__control-text{width:15rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-item-actions{border-left:1px solid #fff;bottom:0;position:absolute;right:0;top:0;width:5rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-link{color:#333;display:block;text-decoration:none;padding:1rem 1rem 1rem 2.1rem}.admin__data-grid-action-bookmarks .action-delete,.admin__data-grid-action-bookmarks .action-edit,.admin__data-grid-action-bookmarks .action-submit{background-color:transparent;border:none;border-radius:0;box-shadow:none;margin:0;vertical-align:top}.admin__data-grid-action-bookmarks .action-delete:hover,.admin__data-grid-action-bookmarks .action-edit:hover,.admin__data-grid-action-bookmarks .action-submit:hover{background-color:transparent;border:none;box-shadow:none}.admin__data-grid-action-bookmarks .action-delete:before,.admin__data-grid-action-bookmarks .action-edit:before,.admin__data-grid-action-bookmarks .action-submit:before{font-size:1.7rem}.admin__data-grid-action-bookmarks .action-delete>span,.admin__data-grid-action-bookmarks .action-edit>span,.admin__data-grid-action-bookmarks .action-submit>span{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.admin__data-grid-action-bookmarks .action-delete,.admin__data-grid-action-bookmarks .action-edit{padding:.6rem 1.4rem}.admin__data-grid-action-bookmarks .action-delete:active,.admin__data-grid-action-bookmarks .action-edit:active{-ms-transform:scale(0.9);transform:scale(0.9)}.admin__data-grid-action-bookmarks .action-submit{padding:.6rem 1rem .6rem .8rem}.admin__data-grid-action-bookmarks .action-submit:active{position:relative;right:-1px}.admin__data-grid-action-bookmarks .action-submit:before{content:'\e625'}.admin__data-grid-action-bookmarks .action-delete:before{content:'\e630'}.admin__data-grid-action-bookmarks .action-edit{padding-top:.8rem}.admin__data-grid-action-bookmarks .action-edit:before{content:'\e631'}.admin__data-grid-action-columns._active{opacity:.98;z-index:290}.admin__data-grid-action-columns .admin__action-dropdown:before{content:'\e610';font-size:1.8rem;margin-right:.7rem;vertical-align:top}.admin__data-grid-action-columns-menu{color:#303030;font-size:1.3rem;overflow:hidden;padding:2.2rem 3.5rem 1rem;z-index:1}.admin__data-grid-action-columns-menu._overflow .admin__action-dropdown-menu-header{border-bottom:1px solid #d1d1d1}.admin__data-grid-action-columns-menu._overflow .admin__action-dropdown-menu-content{width:49.2rem}.admin__data-grid-action-columns-menu._overflow .admin__action-dropdown-menu-footer{border-top:1px solid #d1d1d1;padding-top:2.5rem}.admin__data-grid-action-columns-menu .admin__action-dropdown-menu-content{max-height:22.85rem;overflow-y:auto;padding-top:1.5rem;position:relative;width:47.4rem}.admin__data-grid-action-columns-menu .admin__field-option{float:left;height:1.9rem;margin-bottom:1.5rem;padding:0 1rem 0 0;width:15.8rem}.admin__data-grid-action-columns-menu .admin__field-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block}.admin__data-grid-action-columns-menu .admin__action-dropdown-menu-header{padding-bottom:1.5rem}.admin__data-grid-action-columns-menu .admin__action-dropdown-menu-footer{padding:1rem 0 2rem}.admin__data-grid-action-columns-menu .admin__action-dropdown-footer-main-actions{margin-left:25%;text-align:right}.admin__data-grid-action-columns-menu .admin__action-dropdown-footer-secondary-actions{float:left;margin-left:-1em}.admin__data-grid-action-export._active{opacity:.98;z-index:290}.admin__data-grid-action-export .admin__action-dropdown:before{content:'\e635';font-size:1.7rem;left:.3rem;margin-right:.7rem;vertical-align:top}.admin__data-grid-action-export-menu{padding-left:2rem;padding-right:2rem;padding-top:1rem}.admin__data-grid-action-export-menu .admin__action-dropdown-footer-main-actions{padding-bottom:2rem;padding-top:2.5rem;white-space:nowrap}.sticky-header{background-color:#f8f8f8;border-bottom:1px solid #e3e3e3;box-shadow:0 5px 5px 0 rgba(0,0,0,.25);left:8.8rem;margin-top:-1px;padding:.5rem 3rem 0;position:fixed;right:0;top:77px;z-index:398}.sticky-header .admin__data-grid-wrap{margin-bottom:0;overflow-x:visible;padding-bottom:0}.sticky-header .admin__data-grid-header-row{position:relative;text-align:right}.sticky-header .admin__data-grid-header-row:last-child{margin:0}.sticky-header .admin__data-grid-actions-wrap,.sticky-header .admin__data-grid-filters-wrap,.sticky-header .admin__data-grid-pager-wrap,.sticky-header .data-grid-filters-actions-wrap,.sticky-header .data-grid-search-control-wrap{display:inline-block;float:none;vertical-align:top}.sticky-header .action-select-wrap{float:left;margin-right:1.5rem;width:16.66666667%}.sticky-header .admin__control-support-text{float:left}.sticky-header .data-grid-search-control-wrap{margin:-.5rem 0 0 1.1rem;width:auto}.sticky-header .data-grid-search-control-wrap .data-grid-search-label{box-sizing:border-box;cursor:pointer;display:block;min-width:3.8rem;padding:1.2rem .6rem 1.7rem;position:relative;text-align:center}.sticky-header .data-grid-search-control-wrap .data-grid-search-label:before{color:#333;content:'\e60c';font-size:2rem;transition:color .1s linear}.sticky-header .data-grid-search-control-wrap .data-grid-search-label:hover:before{color:#000}.sticky-header .data-grid-search-control-wrap .data-grid-search-label span{display:none}.sticky-header .data-grid-filters-actions-wrap{margin:-.5rem 0 0 1.1rem;padding-left:0;position:relative}.sticky-header .data-grid-filters-actions-wrap .action-default{background-color:transparent;border:1px solid transparent;box-sizing:border-box;min-width:3.8rem;padding:1.2rem .6rem 1.7rem;text-align:center;transition:all .15s ease}.sticky-header .data-grid-filters-actions-wrap .action-default span{display:none}.sticky-header .data-grid-filters-actions-wrap .action-default:before{margin:0}.sticky-header .data-grid-filters-actions-wrap .action-default._active{background-color:#fff;border-color:#adadad #adadad #fff;box-shadow:1px 1px 5px rgba(0,0,0,.5);z-index:210}.sticky-header .data-grid-filters-actions-wrap .action-default._active:after{background-color:#fff;content:'';height:6px;left:-2px;position:absolute;right:-6px;top:100%}.sticky-header .data-grid-filters-action-wrap{padding:0}.sticky-header .admin__data-grid-filters-wrap{background-color:#fff;border:1px solid #adadad;box-shadow:0 5px 5px 0 rgba(0,0,0,.25);left:0;padding-left:3.5rem;padding-right:3.5rem;position:absolute;top:100%;width:100%;z-index:209}.sticky-header .admin__data-grid-filters-current+.admin__data-grid-filters-wrap._show{margin-top:-6px}.sticky-header .filters-active{background-color:#e04f00;border-radius:10px;color:#fff;display:block;font-size:1.4rem;font-weight:700;padding:.1rem .7rem;position:absolute;right:-7px;top:0;z-index:211}.sticky-header .filters-active:empty{padding-bottom:0;padding-top:0}.sticky-header .admin__data-grid-actions-wrap{margin:-.5rem 0 0 1.1rem;padding-right:.3rem}.sticky-header .admin__data-grid-actions-wrap .admin__action-dropdown{background-color:transparent;box-sizing:border-box;min-width:3.8rem;padding-left:.6rem;padding-right:.6rem;text-align:center}.sticky-header .admin__data-grid-actions-wrap .admin__action-dropdown .admin__action-dropdown-text{display:inline-block;max-width:0;min-width:0;overflow:hidden}.sticky-header .admin__data-grid-actions-wrap .admin__action-dropdown:before{margin:0}.sticky-header .admin__data-grid-actions-wrap .admin__action-dropdown-wrap{margin-right:1.1rem}.sticky-header .admin__data-grid-actions-wrap .admin__action-dropdown-wrap:after,.sticky-header .admin__data-grid-actions-wrap .admin__action-dropdown:after{display:none}.sticky-header .admin__data-grid-actions-wrap ._active .admin__action-dropdown{background-color:#fff}.sticky-header .admin__data-grid-action-bookmarks .admin__action-dropdown:before{position:relative;top:-3px}.sticky-header .admin__data-grid-filters-current{border-bottom:0;border-top:0;margin-bottom:0;padding-bottom:0;padding-top:0}.sticky-header .admin__data-grid-pager .admin__control-text,.sticky-header .admin__data-grid-pager-wrap .admin__control-support-text,.sticky-header .data-grid-search-control-wrap .action-submit,.sticky-header .data-grid-search-control-wrap .data-grid-search-control{display:none}.sticky-header .action-next{margin:0}.sticky-header .data-grid{margin-bottom:-1px}.data-grid-cap-left,.data-grid-cap-right{background-color:#f8f8f8;bottom:-2px;position:absolute;top:6rem;width:3rem;z-index:201}.data-grid-cap-left{left:0}.admin__data-grid-header{font-size:1.4rem}.admin__data-grid-header-row+.admin__data-grid-header-row{margin-top:1.1rem}.admin__data-grid-header-row:last-child{margin-bottom:0}.admin__data-grid-header-row .action-select-wrap{display:block}.admin__data-grid-header-row .action-select{width:100%}.admin__data-grid-actions-wrap{float:right;margin-left:1.1rem;margin-top:-.5rem;text-align:right}.admin__data-grid-actions-wrap .admin__action-dropdown-wrap{position:relative;text-align:left;vertical-align:middle}.admin__data-grid-actions-wrap .admin__action-dropdown-wrap._active+.admin__action-dropdown-wrap:after,.admin__data-grid-actions-wrap .admin__action-dropdown-wrap._active:after,.admin__data-grid-actions-wrap .admin__action-dropdown-wrap._hide+.admin__action-dropdown-wrap:after,.admin__data-grid-actions-wrap .admin__action-dropdown-wrap:first-child:after{display:none}.admin__data-grid-actions-wrap .admin__action-dropdown-wrap._active .admin__action-dropdown,.admin__data-grid-actions-wrap .admin__action-dropdown-wrap._active .admin__action-dropdown-menu{border-color:#adadad}.admin__data-grid-actions-wrap .admin__action-dropdown-wrap:after{border-left:1px solid #ccc;content:'';height:3.2rem;left:0;position:absolute;top:.5rem;z-index:3}.admin__data-grid-actions-wrap .admin__action-dropdown{padding-bottom:1.7rem;padding-top:1.2rem}.admin__data-grid-actions-wrap .admin__action-dropdown:after{margin-top:-.4rem}.admin__data-grid-outer-wrap{min-height:8rem;position:relative}.admin__data-grid-wrap{margin-bottom:2rem;max-width:100%;overflow-x:auto;padding-bottom:1rem;padding-top:2rem}.admin__data-grid-loading-mask{background:rgba(255,255,255,.5);bottom:0;left:0;position:absolute;right:0;top:0;z-index:399}.admin__data-grid-loading-mask .spinner{font-size:4rem;left:50%;margin-left:-2rem;margin-top:-2rem;position:absolute;top:50%}.ie9 .admin__data-grid-loading-mask .spinner{background:url(../images/loader-2.gif) 50% 50% no-repeat;bottom:0;height:149px;left:0;margin:auto;position:absolute;right:0;top:0;width:218px}.data-grid-cell-content{display:inline-block;overflow:hidden;width:100%}body._in-resize{cursor:col-resize;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body._in-resize *,body._in-resize .data-grid-th,body._in-resize .data-grid-th._draggable,body._in-resize .data-grid-th._sortable{cursor:col-resize!important}._layout-fixed{table-layout:fixed}.data-grid{border:none;font-size:1.3rem;margin-bottom:0;width:100%}.data-grid:not(._dragging-copy) ._odd-row td._dragging{background-color:#d0d0d0}.data-grid:not(._dragging-copy) ._dragging{background-color:#d9d9d9;color:rgba(48,48,48,.95)}.data-grid:not(._dragging-copy) ._dragging a{color:rgba(0,139,219,.95)}.data-grid:not(._dragging-copy) ._dragging a:hover{color:rgba(15,167,255,.95)}.data-grid._dragged{outline:#007bdb solid 1px}.data-grid thead{background-color:transparent}.data-grid tfoot th{padding:1rem}.data-grid tr._odd-row td{background-color:#f5f5f5}.data-grid tr._odd-row td._update-status-active{background:#89e1ff}.data-grid tr._odd-row td._update-status-upcoming{background:#b7ee63}.data-grid tr:hover td._update-status-active,.data-grid tr:hover td._update-status-upcoming{background-color:#e5f7fe}.data-grid tr.data-grid-tr-no-data td{font-size:1.6rem;padding:3rem;text-align:center}.data-grid tr.data-grid-tr-no-data:hover td{background-color:#fff;cursor:default}.data-grid tr:active td{background-color:#e0f6fe}.data-grid tr:hover td{background-color:#e5f7fe}.data-grid tr._dragged td{background:#d0d0d0}.data-grid tr._dragover-top td{box-shadow:inset 0 3px 0 0 #008bdb}.data-grid tr._dragover-bottom td{box-shadow:inset 0 -3px 0 0 #008bdb}.data-grid tr:not(.data-grid-editable-row):last-child td{border-bottom:.1rem solid #d6d6d6}.data-grid tr ._clickable,.data-grid tr._clickable{cursor:pointer}.data-grid tr._disabled{pointer-events:none}.data-grid td,.data-grid th{font-size:1.3rem;line-height:1.36;transition:background-color .1s linear;vertical-align:top}.data-grid td._resizing,.data-grid th._resizing{border-left:1px solid #007bdb;border-right:1px solid #007bdb}.data-grid td._hidden,.data-grid th._hidden{display:none}.data-grid td._fit,.data-grid th._fit{width:1%}.data-grid td{background-color:#fff;border-left:.1rem dashed #d6d6d6;border-right:.1rem dashed #d6d6d6;color:#303030;padding:1rem}.data-grid td:first-child{border-left-style:solid}.data-grid td:last-child{border-right-style:solid}.data-grid td .action-select-wrap{position:static}.data-grid td .action-select{color:#008bdb;text-decoration:none;background-color:transparent;border:none;font-size:1.3rem;padding:0 3rem 0 0;position:relative}.data-grid td .action-select:hover{color:#0fa7ff;text-decoration:underline}.data-grid td .action-select:hover:after{border-color:#0fa7ff transparent transparent}.data-grid td .action-select:after{border-color:#008bdb transparent transparent;margin:.6rem 0 0 .7rem;right:auto;top:auto}.data-grid td .action-select:before{display:none}.data-grid td .abs-action-menu .action-submenu,.data-grid td .abs-action-menu .action-submenu .action-submenu,.data-grid td .action-menu,.data-grid td .action-menu .action-submenu,.data-grid td .actions-split .action-menu .action-submenu,.data-grid td .actions-split .action-menu .action-submenu .action-submenu,.data-grid td .actions-split .dropdown-menu .action-submenu,.data-grid td .actions-split .dropdown-menu .action-submenu .action-submenu{left:auto;min-width:10rem;right:0;text-align:left;top:auto;z-index:1}.data-grid td._update-status-active{background:#bceeff}.data-grid td._update-status-upcoming{background:#ccf391}.data-grid th{background-color:#514943;border:.1rem solid #8a837f;border-left-color:transparent;color:#fff;font-weight:600;padding:0;text-align:left}.data-grid th:first-child{border-left-color:#8a837f}.data-grid th._dragover-left{box-shadow:inset 3px 0 0 0 #fff;z-index:2}.data-grid th._dragover-right{box-shadow:inset -3px 0 0 0 #fff}.data-grid .shadow-div{cursor:col-resize;height:100%;margin-right:-5px;position:absolute;right:0;top:0;width:10px}.data-grid .data-grid-th{background-clip:padding-box;color:#fff;padding:1rem;position:relative;vertical-align:middle}.data-grid .data-grid-th._resize-visible .shadow-div{cursor:auto;display:none}.data-grid .data-grid-th._draggable{cursor:grab}.data-grid .data-grid-th._sortable{cursor:pointer;transition:background-color .1s linear;z-index:1}.data-grid .data-grid-th._sortable:focus,.data-grid .data-grid-th._sortable:hover{background-color:#5f564f}.data-grid .data-grid-th._sortable:active{padding-bottom:.9rem;padding-top:1.1rem}.data-grid .data-grid-th.required>span:after{color:#f38a5e;content:'*';margin-left:.3rem}.data-grid .data-grid-checkbox-cell{overflow:hidden;padding:0;vertical-align:top;width:5.2rem}.data-grid .data-grid-checkbox-cell:hover{cursor:default}.data-grid .data-grid-thumbnail-cell{text-align:center;width:7rem}.data-grid .data-grid-thumbnail-cell img{border:1px solid #d6d6d6;width:5rem}.data-grid .data-grid-multicheck-cell{padding:1rem 1rem .9rem;text-align:center;vertical-align:middle}.data-grid .data-grid-onoff-cell{text-align:center;width:12rem}.data-grid .data-grid-actions-cell{padding-left:2rem;padding-right:2rem;text-align:center;width:1%}.data-grid._hidden{display:none}.data-grid._dragging-copy{box-shadow:1px 1px 5px rgba(0,0,0,.5);left:0;opacity:.95;position:fixed;top:0;z-index:1000}.data-grid._dragging-copy .data-grid-th{border:1px solid #007bdb;border-bottom:none}.data-grid._dragging-copy .data-grid-th,.data-grid._dragging-copy .data-grid-th._sortable{cursor:grabbing}.data-grid._dragging-copy tr:last-child td{border-bottom:1px solid #007bdb}.data-grid._dragging-copy td{border-left:1px solid #007bdb;border-right:1px solid #007bdb}.data-grid._dragging-copy._in-edit .data-grid-editable-row.data-grid-bulk-edit-panel td,.data-grid._dragging-copy._in-edit .data-grid-editable-row.data-grid-bulk-edit-panel td:before,.data-grid._dragging-copy._in-edit .data-grid-editable-row.data-grid-bulk-edit-panel:hover td{background-color:rgba(255,251,230,.95)}.data-grid._dragging-copy._in-edit .data-grid-editable-row td,.data-grid._dragging-copy._in-edit .data-grid-editable-row:hover td{background-color:rgba(255,255,255,.95)}.data-grid._dragging-copy._in-edit .data-grid-editable-row td:after,.data-grid._dragging-copy._in-edit .data-grid-editable-row td:before{left:0;right:0}.data-grid._dragging-copy._in-edit .data-grid-editable-row td:before{background-color:rgba(255,255,255,.95)}.data-grid._dragging-copy._in-edit .data-grid-editable-row td:only-child{border-left:1px solid #007bdb;border-right:1px solid #007bdb;left:0}.data-grid._dragging-copy._in-edit .data-grid-editable-row .admin__control-select,.data-grid._dragging-copy._in-edit .data-grid-editable-row .admin__control-text{opacity:.5}.data-grid .data-grid-controls-row td{padding-top:1.6rem}.data-grid .data-grid-controls-row td.data-grid-checkbox-cell{padding-top:.6rem}.data-grid .data-grid-controls-row td [class*=admin__control-],.data-grid .data-grid-controls-row td button{margin-top:-1.7rem}.data-grid._in-edit tr:hover td{background-color:#e6e6e6}.data-grid._in-edit ._odd-row.data-grid-editable-row td,.data-grid._in-edit ._odd-row.data-grid-editable-row:hover td{background-color:#fff}.data-grid._in-edit ._odd-row td,.data-grid._in-edit ._odd-row:hover td{background-color:#dcdcdc}.data-grid._in-edit .data-grid-editable-row-actions td,.data-grid._in-edit .data-grid-editable-row-actions:hover td{background-color:#fff}.data-grid._in-edit td{background-color:#e6e6e6;pointer-events:none}.data-grid._in-edit .data-grid-checkbox-cell{pointer-events:auto}.data-grid._in-edit .data-grid-editable-row{border:.1rem solid #adadad;border-bottom-color:#c2c2c2}.data-grid._in-edit .data-grid-editable-row:hover td{background-color:#fff}.data-grid._in-edit .data-grid-editable-row td{background-color:#fff;border-bottom-color:#fff;border-left-style:hidden;border-right-style:hidden;border-top-color:#fff;pointer-events:auto;vertical-align:middle}.data-grid._in-edit .data-grid-editable-row td:first-child{border-left-color:#adadad;border-left-style:solid}.data-grid._in-edit .data-grid-editable-row td:first-child:after,.data-grid._in-edit .data-grid-editable-row td:first-child:before{left:0}.data-grid._in-edit .data-grid-editable-row td:last-child{border-right-color:#adadad;border-right-style:solid;left:-.1rem}.data-grid._in-edit .data-grid-editable-row td:last-child:after,.data-grid._in-edit .data-grid-editable-row td:last-child:before{right:0}.data-grid._in-edit .data-grid-editable-row .admin__control-select,.data-grid._in-edit .data-grid-editable-row .admin__control-text{width:100%}.data-grid._in-edit .data-grid-bulk-edit-panel td{vertical-align:bottom}.data-grid .data-grid-editable-row td{border-left-color:#fff;border-left-style:solid;position:relative;z-index:1}.data-grid .data-grid-editable-row td:after{bottom:0;box-shadow:0 5px 5px rgba(0,0,0,.25);content:'';height:.9rem;left:0;margin-top:-1rem;position:absolute;right:0}.data-grid .data-grid-editable-row td:before{background-color:#fff;bottom:0;content:'';height:1rem;left:-10px;position:absolute;right:-10px;z-index:1}.data-grid .data-grid-editable-row.data-grid-editable-row-actions td,.data-grid .data-grid-editable-row.data-grid-editable-row-actions:hover td{background-color:#fff}.data-grid .data-grid-editable-row.data-grid-editable-row-actions td:first-child{border-left-color:#fff;border-right-color:#fff}.data-grid .data-grid-editable-row.data-grid-editable-row-actions td:last-child{left:0}.data-grid .data-grid-editable-row.data-grid-bulk-edit-panel td,.data-grid .data-grid-editable-row.data-grid-bulk-edit-panel td:before,.data-grid .data-grid-editable-row.data-grid-bulk-edit-panel:hover td{background-color:#fffbe6}.data-grid .data-grid-editable-row-actions{left:50%;margin-left:-12.5rem;margin-top:-2px;position:absolute;text-align:center}.data-grid .data-grid-editable-row-actions td{width:25rem}.data-grid .data-grid-editable-row-actions [class*=action-]{min-width:9rem}.data-grid .data-grid-draggable-row-cell{width:1%}.data-grid .data-grid-draggable-row-cell .draggable-handle{padding:0}.data-grid-th._sortable._ascend,.data-grid-th._sortable._descend{padding-right:2.7rem}.data-grid-th._sortable._ascend:before,.data-grid-th._sortable._descend:before{margin-top:-1em;position:absolute;right:1rem;top:50%}.data-grid-th._sortable._ascend:before{content:'\2193'}.data-grid-th._sortable._descend:before{content:'\2191'}.data-grid-checkbox-cell-inner{display:block;padding:1.1rem 1.8rem .9rem;text-align:right}.data-grid-checkbox-cell-inner:hover{cursor:pointer}.data-grid-state-cell-inner{display:block;padding:1.1rem 1.8rem .9rem;text-align:center}.data-grid-state-cell-inner>span{display:inline-block;font-style:italic;padding:.6rem 0}.data-grid-row-parent._active>td .data-grid-checkbox-cell-inner:before{content:'\e62b'}.data-grid-row-parent>td .data-grid-checkbox-cell-inner{padding-left:3.7rem;position:relative}.data-grid-row-parent>td .data-grid-checkbox-cell-inner:before{content:'\e628';font-size:1rem;font-weight:700;left:1.35rem;position:absolute;top:1.6rem}.data-grid-th._col-xs{width:1%}.data-grid-info-panel{box-shadow:0 0 5px rgba(0,0,0,.5);margin:2rem .1rem -2rem}.data-grid-info-panel .messages{overflow:hidden}.data-grid-info-panel .messages .message{margin:1rem}.data-grid-info-panel .messages .message:last-child{margin-bottom:1rem}.data-grid-info-panel-actions{padding:1rem;text-align:right}.data-grid-editable-row .admin__field-control{position:relative}.data-grid-editable-row .admin__field-control._error:after{border-color:transparent #ee7d7d transparent transparent;border-style:solid;border-width:0 12px 12px 0;content:'';position:absolute;right:0;top:0}.data-grid-editable-row .admin__field-control._error .admin__control-text{border-color:#ee7d7d}.data-grid-editable-row .admin__field-control._focus:after{display:none}.data-grid-editable-row .admin__field-error{bottom:100%;box-shadow:1px 1px 5px rgba(0,0,0,.5);left:0;margin:0 auto 1.5rem;max-width:32rem;position:absolute;right:0}.data-grid-editable-row .admin__field-error:after,.data-grid-editable-row .admin__field-error:before{border-style:solid;content:'';left:50%;position:absolute;top:100%}.data-grid-editable-row .admin__field-error:after{border-color:#fffbbb transparent transparent;border-width:10px 10px 0;margin-left:-10px;z-index:1}.data-grid-editable-row .admin__field-error:before{border-color:#ee7d7d transparent transparent;border-width:11px 12px 0;margin-left:-12px}.data-grid-bulk-edit-panel .admin__field-label-vertical{display:block;font-size:1.2rem;margin-bottom:.5rem;text-align:left}.data-grid-row-changed{cursor:default;display:block;opacity:.5;position:relative;width:100%;z-index:1}.data-grid-row-changed:after{content:'\e631';display:inline-block}.data-grid-row-changed .data-grid-row-changed-tooltip{background:#f1f1f1;border:1px solid #f1f1f1;border-radius:1px;bottom:100%;box-shadow:0 3px 9px 0 rgba(0,0,0,.3);display:none;font-weight:400;line-height:1.36;margin-bottom:1.5rem;padding:1rem;position:absolute;right:-1rem;text-transform:none;width:27rem;word-break:normal;z-index:2}.data-grid-row-changed._changed{opacity:1;z-index:3}.data-grid-row-changed._changed:hover .data-grid-row-changed-tooltip{display:block}.data-grid-row-changed._changed:hover:before{background:#f1f1f1;border:1px solid #f1f1f1;bottom:100%;box-shadow:4px 4px 3px -1px rgba(0,0,0,.15);content:'';display:block;height:1.6rem;left:50%;margin:0 0 .7rem -.8rem;position:absolute;-ms-transform:rotate(45deg);transform:rotate(45deg);width:1.6rem;z-index:3}.ie9 .data-grid-row-changed._changed:hover:before{display:none}.admin__data-grid-outer-wrap .data-grid-checkbox-cell{overflow:hidden}.admin__data-grid-outer-wrap .data-grid-checkbox-cell-inner{position:relative}.admin__data-grid-outer-wrap .data-grid-checkbox-cell-inner:before{bottom:0;content:'';height:500%;left:0;position:absolute;right:0;top:0}.admin__data-grid-wrap-static .data-grid-checkbox-cell:hover{cursor:pointer}.admin__data-grid-wrap-static .data-grid-checkbox-cell-inner{margin:1.1rem 1.8rem .9rem;padding:0}.adminhtml-cms-hierarchy-index .admin__data-grid-wrap-static .data-grid-actions-cell:first-child{padding:0}.adminhtml-export-index .admin__data-grid-wrap-static .data-grid-checkbox-cell-inner{margin:0;padding:1.1rem 1.8rem 1.9rem}.admin__control-addon [class*=admin__control-][class]~[class*=admin__addon-]:last-child:before,.admin__control-file-label:before,.admin__control-multiselect,.admin__control-select,.admin__control-text,.admin__control-textarea,.selectmenu{-webkit-appearance:none;background-color:#fff;border:1px solid #adadad;border-radius:1px;box-shadow:none;color:#303030;font-size:1.4rem;font-weight:400;height:auto;line-height:1.36;padding:.6rem 1rem;transition:border-color .1s linear;vertical-align:baseline;width:auto}.admin__control-addon [class*=admin__control-][class]:hover~[class*=admin__addon-]:last-child:before,.admin__control-multiselect:hover,.admin__control-select:hover,.admin__control-text:hover,.admin__control-textarea:hover,.selectmenu:hover,.selectmenu:hover .selectmenu-toggle:before{border-color:#878787}.admin__control-addon [class*=admin__control-][class]:focus~[class*=admin__addon-]:last-child:before,.admin__control-file:active+.admin__control-file-label:before,.admin__control-file:focus+.admin__control-file-label:before,.admin__control-multiselect:focus,.admin__control-select:focus,.admin__control-text:focus,.admin__control-textarea:focus,.selectmenu._focus,.selectmenu._focus .selectmenu-toggle:before{border-color:#007bdb;box-shadow:none;outline:0}.admin__control-addon [class*=admin__control-][class][disabled]~[class*=admin__addon-]:last-child:before,.admin__control-file[disabled]+.admin__control-file-label:before,.admin__control-multiselect[disabled],.admin__control-select[disabled],.admin__control-text[disabled],.admin__control-textarea[disabled]{background-color:#e9e9e9;border-color:#adadad;color:#303030;cursor:not-allowed;opacity:.5}.admin__field-row[class]>.admin__field-control,.admin__fieldset>.admin__field.admin__field-wide[class]>.admin__field-control{clear:left;float:none;text-align:left;width:auto}.admin__field-row[class]:not(.admin__field-option)>.admin__field-label,.admin__fieldset>.admin__field.admin__field-wide[class]:not(.admin__field-option)>.admin__field-label{display:block;line-height:1.4rem;margin-bottom:.86rem;margin-top:-.14rem;text-align:left;width:auto}.admin__field-row[class]:not(.admin__field-option)>.admin__field-label:before,.admin__fieldset>.admin__field.admin__field-wide[class]:not(.admin__field-option)>.admin__field-label:before{display:none}.admin__field-row[class]:not(.admin__field-option)._required>.admin__field-label span,.admin__field-row[class]:not(.admin__field-option).required>.admin__field-label span,.admin__fieldset>.admin__field.admin__field-wide[class]:not(.admin__field-option)._required>.admin__field-label span,.admin__fieldset>.admin__field.admin__field-wide[class]:not(.admin__field-option).required>.admin__field-label span{padding-left:1.5rem}.admin__field-row[class]:not(.admin__field-option)._required>.admin__field-label span:after,.admin__field-row[class]:not(.admin__field-option).required>.admin__field-label span:after,.admin__fieldset>.admin__field.admin__field-wide[class]:not(.admin__field-option)._required>.admin__field-label span:after,.admin__fieldset>.admin__field.admin__field-wide[class]:not(.admin__field-option).required>.admin__field-label span:after{left:0;margin-left:30px}.admin__legend{font-size:1.8rem;font-weight:600;margin-bottom:3rem}.admin__control-checkbox,.admin__control-radio{cursor:pointer;opacity:.01;overflow:hidden;position:absolute;vertical-align:top}.admin__control-checkbox:after,.admin__control-radio:after{display:none}.admin__control-checkbox+label,.admin__control-radio+label{cursor:pointer;display:inline-block}.admin__control-checkbox+label:before,.admin__control-radio+label:before{background-color:#fff;border:1px solid #adadad;color:transparent;float:left;height:1.6rem;text-align:center;vertical-align:top;width:1.6rem}.admin__control-checkbox+.admin__field-label,.admin__control-radio+.admin__field-label{padding-left:2.6rem}.admin__control-checkbox+.admin__field-label:before,.admin__control-radio+.admin__field-label:before{margin:1px 1rem 0 -2.6rem}.admin__control-checkbox:checked+label:before,.admin__control-radio:checked+label:before{color:#514943}.admin__control-checkbox.disabled+label,.admin__control-checkbox[disabled]+label,.admin__control-radio.disabled+label,.admin__control-radio[disabled]+label{color:#303030;cursor:default;opacity:.5}.admin__control-checkbox.disabled+label:before,.admin__control-checkbox[disabled]+label:before,.admin__control-radio.disabled+label:before,.admin__control-radio[disabled]+label:before{background-color:#e9e9e9;border-color:#adadad;cursor:default}._keyfocus .admin__control-checkbox:not(.disabled):focus+label:before,._keyfocus .admin__control-checkbox:not([disabled]):focus+label:before,._keyfocus .admin__control-radio:not(.disabled):focus+label:before,._keyfocus .admin__control-radio:not([disabled]):focus+label:before{border-color:#007bdb}.admin__control-checkbox:not(.disabled):hover+label:before,.admin__control-checkbox:not([disabled]):hover+label:before,.admin__control-radio:not(.disabled):hover+label:before,.admin__control-radio:not([disabled]):hover+label:before{border-color:#878787}.admin__control-radio+label:before{border-radius:1.6rem;content:'';transition:border-color .1s linear,color .1s ease-in}.admin__control-radio.admin__control-radio+label:before{line-height:140%}.admin__control-radio:checked+label{position:relative}.admin__control-radio:checked+label:after{background-color:#514943;border-radius:50%;content:'';height:10px;left:3px;position:absolute;top:4px;width:10px}.admin__control-radio:checked:not(.disabled):hover,.admin__control-radio:checked:not(.disabled):hover+label,.admin__control-radio:checked:not([disabled]):hover,.admin__control-radio:checked:not([disabled]):hover+label{cursor:default}.admin__control-radio:checked:not(.disabled):hover+label:before,.admin__control-radio:checked:not([disabled]):hover+label:before{border-color:#adadad}.admin__control-checkbox+label:before{border-radius:1px;content:'';font-size:0;transition:font-size .1s ease-out,color .1s ease-out,border-color .1s linear}.admin__control-checkbox:checked+label:before{content:'\e62d';font-size:1.1rem;line-height:125%}.admin__control-checkbox:not(:checked)._indeterminate+label:before,.admin__control-checkbox:not(:checked):indeterminate+label:before{color:#514943;content:'-';font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700}input[type=checkbox].admin__control-checkbox,input[type=radio].admin__control-checkbox{margin:0;position:absolute}.admin__control-text{min-width:4rem}.admin__control-select{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;appearance:none;background-image:url(../images/arrows-bg.svg),linear-gradient(#e3e3e3,#e3e3e3),linear-gradient(#adadad,#adadad);background-position:calc(100% - 12px) -34px,100%,calc(100% - 3.2rem) 0;background-size:auto,3.2rem 100%,1px 100%;background-repeat:no-repeat;max-width:100%;min-width:8.5rem;padding-bottom:.5rem;padding-right:4.4rem;padding-top:.5rem;transition:border-color .1s linear}.admin__control-select:hover{border-color:#878787;cursor:pointer}.admin__control-select:focus{background-image:url(../images/arrows-bg.svg),linear-gradient(#e3e3e3,#e3e3e3),linear-gradient(#007bdb,#007bdb);background-position:calc(100% - 12px) 13px,100%,calc(100% - 3.2rem) 0;border-color:#007bdb}.admin__control-select::-ms-expand{display:none}.ie9 .admin__control-select{background-image:none;padding-right:1rem}option:empty{display:none}.admin__control-multiselect{height:auto;max-width:100%;min-width:15rem;overflow:auto;padding:0;resize:both}.admin__control-multiselect optgroup,.admin__control-multiselect option{padding:.5rem 1rem}.admin__control-file-wrapper{display:inline-block;padding:.5rem 1rem;position:relative;z-index:1}.admin__control-file-label:before{content:'';left:0;position:absolute;top:0;width:100%;z-index:0}.admin__control-file{background:0 0;border:0;padding-top:.7rem;position:relative;width:auto;z-index:1}.admin__control-support-text{border:1px solid transparent;display:inline-block;font-size:1.4rem;line-height:1.36;padding-bottom:.6rem;padding-top:.6rem}.admin__control-support-text+[class*=admin__control-],[class*=admin__control-]+.admin__control-support-text{margin-left:.7rem}.admin__control-service{float:left;margin:.8rem 0 0 3rem}.admin__control-textarea{height:8.48rem;line-height:1.18;padding-top:.8rem;resize:vertical}.admin__control-addon{-ms-flex-direction:row;flex-direction:row;display:inline-flex;-ms-flex-flow:row nowrap;flex-flow:row nowrap;position:relative;width:100%;z-index:1}.admin__control-addon>[class*=admin__addon-],.admin__control-addon>[class*=admin__control-]{-ms-flex-preferred-size:auto;flex-basis:auto;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-ms-flex-negative:0;flex-shrink:0;position:relative;z-index:1}.admin__control-addon .admin__control-select{width:auto}.admin__control-addon .admin__control-text{margin:.1rem;padding:.5rem .9rem;width:100%}.admin__control-addon [class*=admin__control-][class]{appearence:none;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;-ms-flex-order:1;order:1;-ms-flex-negative:1;flex-shrink:1;background-color:transparent;border-color:transparent;box-shadow:none;vertical-align:top}.admin__control-addon [class*=admin__control-][class]+[class*=admin__control-]{border-left-color:#adadad}.admin__control-addon [class*=admin__control-][class] :focus{box-shadow:0}.admin__control-addon [class*=admin__control-][class]~[class*=admin__addon-]:last-child{padding-left:1rem;position:static!important;z-index:0}.admin__control-addon [class*=admin__control-][class]~[class*=admin__addon-]:last-child>*{position:relative;vertical-align:top;z-index:1}.admin__control-addon [class*=admin__control-][class]~[class*=admin__addon-]:last-child:empty{padding:0}.admin__control-addon [class*=admin__control-][class]~[class*=admin__addon-]:last-child:before{bottom:0;box-sizing:border-box;content:'';left:0;position:absolute;top:0;width:100%;z-index:-1}.admin__addon-prefix,.admin__addon-suffix{border:0;box-sizing:border-box;color:#858585;display:inline-block;font-size:1.4rem;font-weight:400;height:3.2rem;line-height:3.2rem;padding:0}.admin__addon-suffix{-ms-flex-order:3;order:3}.admin__addon-suffix:last-child{padding-right:1rem}.admin__addon-prefix{-ms-flex-order:0;order:0}.ie9 .admin__control-addon:after{clear:both;content:'';display:block;height:0;overflow:hidden}.ie9 .admin__addon{min-width:0;overflow:hidden;text-align:right;white-space:nowrap;width:auto}.ie9 .admin__addon [class*=admin__control-]{display:inline}.ie9 .admin__addon-prefix{float:left}.ie9 .admin__addon-suffix{float:right}.admin__control-collapsible{width:100%}.admin__control-collapsible ._dragged .admin__collapsible-block-wrapper .admin__collapsible-title{background:#d0d0d0}.admin__control-collapsible ._dragover-bottom .admin__collapsible-block-wrapper:before,.admin__control-collapsible ._dragover-top .admin__collapsible-block-wrapper:before{background:#008bdb;content:'';display:block;height:3px;left:0;position:absolute;right:0}.admin__control-collapsible ._dragover-top .admin__collapsible-block-wrapper:before{top:-3px}.admin__control-collapsible ._dragover-bottom .admin__collapsible-block-wrapper:before{bottom:-3px}.admin__control-collapsible .admin__collapsible-block-wrapper.fieldset-wrapper{border:0;margin:0;position:relative}.admin__control-collapsible .admin__collapsible-block-wrapper.fieldset-wrapper .fieldset-wrapper-title{background:#f8f8f8;border:2px solid #ccc}.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .admin__collapsible-title{font-size:1.4rem;font-weight:400;line-height:1;padding:1.6rem 4rem 1.6rem 3.8rem}.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .admin__collapsible-title:before{left:1rem;right:auto;top:1.4rem}.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .action-delete{background-color:transparent;border-color:transparent;box-shadow:none;padding:0;position:absolute;right:1rem;top:1.4rem}.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .action-delete:hover{background-color:transparent;border-color:transparent;box-shadow:none}.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .action-delete:before{content:'\e630';font-size:2rem}.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .action-delete>span{display:none}.admin__control-collapsible .admin__collapsible-content{background-color:#fff;margin-bottom:1rem}.admin__control-collapsible .admin__collapsible-content>.fieldset-wrapper{border:1px solid #ccc;margin-top:-1px;padding:1rem}.admin__control-collapsible .admin__collapsible-content .admin__fieldset{padding:0}.admin__control-collapsible .admin__collapsible-content .admin__field:last-child{margin-bottom:0}.admin__control-table-wrapper{max-width:100%;overflow-x:auto;overflow-y:hidden}.admin__control-table{width:100%}.admin__control-table thead{background-color:transparent}.admin__control-table tbody td{vertical-align:top}.admin__control-table tfoot th{padding-bottom:1.3rem}.admin__control-table tfoot th.validation{padding-bottom:0;padding-top:0}.admin__control-table tfoot td{border-top:1px solid #fff}.admin__control-table tfoot .admin__control-table-pagination{float:right;padding-bottom:0}.admin__control-table tfoot .action-previous{margin-right:.5rem}.admin__control-table tfoot .action-next{margin-left:.9rem}.admin__control-table tr:last-child td{border-bottom:none}.admin__control-table tr._dragover-top td{box-shadow:inset 0 3px 0 0 #008bdb}.admin__control-table tr._dragover-bottom td{box-shadow:inset 0 -3px 0 0 #008bdb}.admin__control-table tr._dragged td,.admin__control-table tr._dragged th{background:#d0d0d0}.admin__control-table td,.admin__control-table th{background-color:#efefef;border:0;border-bottom:1px solid #fff;padding:1.3rem 1rem 1.3rem 0;text-align:left;vertical-align:top}.admin__control-table td:first-child,.admin__control-table th:first-child{padding-left:1rem}.admin__control-table td>.admin__control-select,.admin__control-table td>.admin__control-text,.admin__control-table th>.admin__control-select,.admin__control-table th>.admin__control-text{width:100%}.admin__control-table td._hidden,.admin__control-table th._hidden{display:none}.admin__control-table td._fit,.admin__control-table th._fit{width:1px}.admin__control-table th{color:#303030;font-size:1.4rem;font-weight:600;vertical-align:bottom}.admin__control-table th._required span:after{color:#eb5202;content:'*'}.admin__control-table .control-table-actions-th{white-space:nowrap}.admin__control-table .control-table-actions-cell{padding-top:1.8rem;text-align:center;width:1%}.admin__control-table .control-table-options-th{text-align:center;width:10rem}.admin__control-table .control-table-options-cell{text-align:center}.admin__control-table .control-table-text{line-height:3.2rem}.admin__control-table .col-draggable{padding-top:2.2rem;width:1%}.admin__control-table .action-delete{background-color:transparent;border-color:transparent;box-shadow:none;padding-left:0;padding-right:0}.admin__control-table .action-delete:hover{background-color:transparent;border-color:transparent;box-shadow:none}.admin__control-table .action-delete:before{content:'\e630';font-size:2rem}.admin__control-table .action-delete>span{display:none}.admin__control-table .draggable-handle{padding:0}.admin__control-table._dragged{outline:#007bdb solid 1px}.admin__control-table-action{background-color:#efefef;border-top:1px solid #fff;padding:1.3rem 1rem}.admin__dynamic-rows._dragged{opacity:.95;position:absolute;z-index:999}.admin__dynamic-rows.admin__control-table .admin__control-fields>.admin__field{border:0;padding:0}.admin__dynamic-rows td>.admin__field{border:0;margin:0;padding:0}.admin__control-table-pagination{padding-bottom:1rem}.admin__control-table-pagination .admin__data-grid-pager{float:right}.admin__field-tooltip{display:inline-block;margin-top:.5rem;max-width:45px;overflow:visible;vertical-align:top;width:0}.admin__field-tooltip:hover{position:relative;z-index:500}.admin__field-option .admin__field-tooltip{margin-top:.5rem}.admin__field-tooltip .admin__field-tooltip-action{margin-left:2rem;position:relative;z-index:2;display:inline-block;text-decoration:none}.admin__field-tooltip .admin__field-tooltip-action:before{-webkit-font-smoothing:antialiased;font-size:2.2rem;line-height:1;color:#514943;content:'\e633';font-family:Icons;vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.admin__field-tooltip .admin__control-text:focus+.admin__field-tooltip-content,.admin__field-tooltip:hover .admin__field-tooltip-content{display:block}.admin__field-tooltip .admin__field-tooltip-content{bottom:3.8rem;display:none;right:-2.3rem}.admin__field-tooltip .admin__field-tooltip-content:after,.admin__field-tooltip .admin__field-tooltip-content:before{border:1.6rem solid transparent;height:0;width:0;border-top-color:#afadac;content:'';display:block;position:absolute;right:2rem;top:100%;z-index:3}.admin__field-tooltip .admin__field-tooltip-content:after{border-top-color:#fffbbb;margin-top:-1px;z-index:4}.abs-admin__field-tooltip-content,.admin__field-tooltip .admin__field-tooltip-content{box-shadow:0 2px 8px 0 rgba(0,0,0,.3);background:#fffbbb;border:1px solid #afadac;border-radius:1px;padding:1.5rem 2.5rem;position:absolute;width:32rem;z-index:1}.admin__field-fallback-reset{font-size:1.25rem;white-space:nowrap;width:30px}.admin__field-fallback-reset>span{margin-left:.5rem;position:relative}.admin__field-fallback-reset:active{-ms-transform:scale(0.98);transform:scale(0.98)}.admin__field-fallback-reset:before{transition:color .1s linear;content:'\e642';font-size:1.3rem;margin-left:.5rem}.admin__field-fallback-reset:hover{cursor:pointer;text-decoration:none}.admin__field-fallback-reset:focus{background:0 0}.abs-field-size-x-small,.abs-field-sizes.admin__field-x-small>.admin__field-control,.admin__field.admin__field-x-small>.admin__field-control,.admin__fieldset>.admin__field.admin__field-x-small>.admin__field-control,[class*=admin__control-grouped]>.admin__field.admin__field-x-small>.admin__field-control{width:8rem}.abs-field-size-small,.abs-field-sizes.admin__field-small>.admin__field-control,.admin__control-grouped-date>.admin__field-date.admin__field>.admin__field-control,.admin__field.admin__field-small>.admin__field-control,.admin__fieldset>.admin__field.admin__field-small>.admin__field-control,[class*=admin__control-grouped]>.admin__field.admin__field-small>.admin__field-control{width:15rem}.abs-field-size-medium,.abs-field-sizes.admin__field-medium>.admin__field-control,.admin__field.admin__field-medium>.admin__field-control,.admin__fieldset>.admin__field.admin__field-medium>.admin__field-control,[class*=admin__control-grouped]>.admin__field.admin__field-medium>.admin__field-control{width:34rem}.abs-field-size-large,.abs-field-sizes.admin__field-large>.admin__field-control,.admin__field.admin__field-large>.admin__field-control,.admin__fieldset>.admin__field.admin__field-large>.admin__field-control,[class*=admin__control-grouped]>.admin__field.admin__field-large>.admin__field-control{width:64rem}.abs-field-no-label,.admin__field-group-additional,.admin__field-no-label,.admin__fieldset>.admin__field.admin__field-no-label>.admin__field-control{margin-left:calc((100%) * .25 + 30px)}.admin__fieldset{border:0;margin:0;min-width:0;padding:0}.admin__fieldset .fieldset-wrapper.admin__fieldset-section>.fieldset-wrapper-title{padding-left:1rem}.admin__fieldset .fieldset-wrapper.admin__fieldset-section>.fieldset-wrapper-title strong{font-size:1.7rem;font-weight:600}.admin__fieldset .fieldset-wrapper.admin__fieldset-section .admin__fieldset-wrapper-content>.admin__fieldset{padding-top:1rem}.admin__fieldset .fieldset-wrapper.admin__fieldset-section:last-child .admin__fieldset-wrapper-content>.admin__fieldset{padding-bottom:0}.admin__fieldset>.admin__field{border:0;margin:0 0 0 -30px;padding:0}.admin__fieldset>.admin__field:after{clear:both;content:'';display:table}.admin__fieldset>.admin__field>.admin__field-control{width:calc((100%) * .5 - 30px);float:left;margin-left:30px}.admin__fieldset>.admin__field>.admin__field-label{width:calc((100%) * .25 - 30px);float:left;margin-left:30px}.admin__fieldset>.admin__field.admin__field-no-label>.admin__field-label{display:none}.admin__fieldset>.admin__field+.admin__field._empty._no-header{margin-top:-3rem}.admin__fieldset-product-websites{position:relative;z-index:300}.admin__fieldset-note{margin-bottom:2rem}.admin__form-field{border:0;margin:0;padding:0}.admin__field-control .admin__control-text,.admin__field-control .admin__control-textarea,.admin__form-field-control .admin__control-text,.admin__form-field-control .admin__control-textarea{width:100%}.admin__field-label{color:#303030;cursor:pointer;margin:0;text-align:right}.admin__field-label+br{display:none}.admin__field:not(.admin__field-option)>.admin__field-label{font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:600;line-height:3.2rem;padding:0;white-space:nowrap}.admin__field:not(.admin__field-option)>.admin__field-label:before{opacity:0;visibility:hidden;content:'.';margin-left:-7px;overflow:hidden}.admin__field:not(.admin__field-option)>.admin__field-label span{display:inline-block;line-height:1.2;vertical-align:middle;white-space:normal}.admin__field:not(.admin__field-option)>.admin__field-label span[data-config-scope]{position:relative}._required>.admin__field-label>span:after,.required>.admin__field-label>span:after{color:#eb5202;content:'*';display:inline-block;font-size:1.6rem;font-weight:500;line-height:1;margin-left:10px;margin-top:.2rem;position:absolute;z-index:1}._disabled>.admin__field-label{color:#999;cursor:default}.admin__field{margin-bottom:0}.admin__field+.admin__field{margin-top:1.5rem}.admin__field:not(.admin__field-option)~.admin__field-option{margin-top:.5rem}.admin__field.admin__field-option~.admin__field-option{margin-top:.9rem}.admin__field~.admin__field-option:last-child{margin-bottom:.8rem}.admin__fieldset>.admin__field{margin-bottom:3rem;position:relative}.admin__field legend.admin__field-label{opacity:0}.admin__field[data-config-scope]:before{color:gray;content:attr(data-config-scope);display:inline-block;font-size:1.2rem;left:calc((100%) * .75 - 30px);line-height:3.2rem;margin-left:60px;position:absolute;width:calc((100%) * .25 - 30px)}.admin__field-control .admin__field[data-config-scope]:nth-child(n+2):before{content:''}.admin__field._error .admin__field-control [class*=admin__addon-]:before,.admin__field._error .admin__field-control [class*=admin__control-] [class*=admin__addon-]:before,.admin__field._error .admin__field-control>[class*=admin__control-]{border-color:#e22626}.admin__field._disabled,.admin__field._disabled:hover{box-shadow:inherit;cursor:inherit;opacity:1;outline:inherit}.admin__field._hidden{display:none}.admin__field-control+.admin__field-control{margin-top:1.5rem}.admin__field-control._with-tooltip>.admin__control-addon,.admin__field-control._with-tooltip>.admin__control-select,.admin__field-control._with-tooltip>.admin__control-text,.admin__field-control._with-tooltip>.admin__control-textarea,.admin__field-control._with-tooltip>.admin__field-option{max-width:calc(100% - 45px - 4px)}.admin__field-control._with-tooltip .admin__field-tooltip{width:auto}.admin__field-control._with-tooltip .admin__field-option{display:inline-block}.admin__field-control._with-reset>.admin__control-addon,.admin__field-control._with-reset>.admin__control-text,.admin__field-control._with-reset>.admin__control-textarea{width:calc(100% - 30px - .5rem - 4px)}.admin__field-control._with-reset .admin__field-fallback-reset{margin-left:.5rem;margin-top:1rem;vertical-align:top}.admin__field-control._with-reset._with-tooltip>.admin__control-addon,.admin__field-control._with-reset._with-tooltip>.admin__control-text,.admin__field-control._with-reset._with-tooltip>.admin__control-textarea{width:calc(100% - 30px - .5rem - 45px - 8px)}.admin__fieldset>.admin__field-collapsible{margin-bottom:0}.admin__fieldset>.admin__field-collapsible .admin__field-control{border-top:1px solid #ccc;display:block;font-size:1.7rem;font-weight:700;padding:1.7rem 0;width:calc(97%)}.admin__fieldset>.admin__field-collapsible .admin__field-option{padding-top:0}.admin__field-collapsible+div{margin-top:2.5rem}.admin__field-collapsible .admin__control-radio+label:before{height:1.8rem;width:1.8rem}.admin__field-collapsible .admin__control-radio:checked+label:after{left:4px;top:5px}.admin__field-error{background:#fffbbb;border:1px solid #ee7d7d;box-sizing:border-box;color:#555;display:block;font-size:1.2rem;font-weight:400;line-height:1.2;margin:.2rem 0 0;padding:.8rem 1rem .9rem}.admin__field-note{color:#303030;font-size:1.2rem;margin:10px 0 0;padding:0}.admin__additional-info{padding-top:1rem}.admin__field-option{padding-top:.7rem}.admin__field-option .admin__field-label{text-align:left}.admin__field-control>.admin__field-option:nth-child(1):nth-last-child(2),.admin__field-control>.admin__field-option:nth-child(2):nth-last-child(1){display:inline-block}.admin__field-control>.admin__field-option:nth-child(1):nth-last-child(2)+.admin__field-option,.admin__field-control>.admin__field-option:nth-child(2):nth-last-child(1)+.admin__field-option{display:inline-block;margin-left:41px;margin-top:0}.admin__field-control>.admin__field-option:nth-child(1):nth-last-child(2)+.admin__field-option:before,.admin__field-control>.admin__field-option:nth-child(2):nth-last-child(1)+.admin__field-option:before{background:#cacaca;content:'';display:inline-block;height:20px;margin-left:-20px;position:absolute;width:1px}.admin__field-value{display:inline-block;padding-top:.7rem}.admin__field-service{padding-top:1rem}.admin__control-fields>.admin__field:first-child,[class*=admin__control-grouped]>.admin__field:first-child{position:static}.admin__control-fields>.admin__field:first-child>.admin__field-label,[class*=admin__control-grouped]>.admin__field:first-child>.admin__field-label{width:calc((100%) * .25 - 30px);float:left;margin-left:30px;background:#fff;cursor:pointer;left:0;position:absolute;top:0}.admin__control-fields>.admin__field:first-child>.admin__field-label span:before,[class*=admin__control-grouped]>.admin__field:first-child>.admin__field-label span:before{display:block}.admin__control-fields>.admin__field._disabled>.admin__field-label,[class*=admin__control-grouped]>.admin__field._disabled>.admin__field-label{cursor:default}.admin__control-fields>.admin__field>.admin__field-label span:before,[class*=admin__control-grouped]>.admin__field>.admin__field-label span:before{display:none}.admin__control-fields .admin__field-label~.admin__field-control{width:100%}.admin__control-fields .admin__field-option{padding-top:0}[class*=admin__control-grouped]{box-sizing:border-box;display:table;width:100%}[class*=admin__control-grouped]>.admin__field{display:table-cell;vertical-align:top}[class*=admin__control-grouped]>.admin__field>.admin__field-control{float:none;width:100%}[class*=admin__control-grouped]>.admin__field.admin__field-default,[class*=admin__control-grouped]>.admin__field.admin__field-large,[class*=admin__control-grouped]>.admin__field.admin__field-medium,[class*=admin__control-grouped]>.admin__field.admin__field-small,[class*=admin__control-grouped]>.admin__field.admin__field-x-small{width:1px}[class*=admin__control-grouped]>.admin__field.admin__field-default+.admin__field:last-child,[class*=admin__control-grouped]>.admin__field.admin__field-large+.admin__field:last-child,[class*=admin__control-grouped]>.admin__field.admin__field-medium+.admin__field:last-child,[class*=admin__control-grouped]>.admin__field.admin__field-small+.admin__field:last-child,[class*=admin__control-grouped]>.admin__field.admin__field-x-small+.admin__field:last-child{width:auto}[class*=admin__control-grouped]>.admin__field:nth-child(n+2){padding-left:20px}.admin__control-group-equal{table-layout:fixed}.admin__control-group-equal>.admin__field{width:50%}.admin__field-control-group{margin-top:.8rem}.admin__field-control-group>.admin__field{padding:0}.admin__control-grouped-date>.admin__field-date{white-space:nowrap;width:1px}.admin__control-grouped-date>.admin__field-date.admin__field>.admin__field-control{float:left;position:relative}.admin__control-grouped-date>.admin__field-date+.admin__field:last-child{width:auto}.admin__control-grouped-date>.admin__field-date+.admin__field-date>.admin__field-label{float:left;padding-right:20px}.admin__control-grouped-date .ui-datepicker-trigger{left:100%;top:0}.admin__field-group-columns.admin__field-control.admin__control-grouped{width:calc((100%) * 1 - 30px);float:left;margin-left:30px}.admin__field-group-columns>.admin__field:first-child>.admin__field-label{float:none;margin:0;opacity:1;position:static;text-align:left}.admin__field-group-columns .admin__control-select{width:100%}.admin__field-group-additional{clear:both}.admin__field-group-additional .action-advanced{margin-top:1rem}.admin__field-group-additional .action-secondary{width:100%}.admin__field-group-show-label{white-space:nowrap}.admin__field-group-show-label>.admin__field-control,.admin__field-group-show-label>.admin__field-label{display:inline-block;vertical-align:top}.admin__field-group-show-label>.admin__field-label{margin-right:20px}.admin__field-complex{margin:1rem 0 3rem;padding-left:1rem}.admin__field:not(._hidden)+.admin__field-complex{margin-top:3rem}.admin__field-complex .admin__field-complex-title{clear:both;color:#303030;font-size:1.7rem;font-weight:600;letter-spacing:.025em;margin-bottom:1rem}.admin__field-complex .admin__field-complex-elements{float:right;max-width:40%}.admin__field-complex .admin__field-complex-elements button{margin-left:1rem}.admin__field-complex .admin__field-complex-content{max-width:60%;overflow:hidden}.admin__field-complex .admin__field-complex-text{margin-left:-1rem}.admin__field-complex+.admin__field._empty._no-header{margin-top:-3rem}.admin__legend{float:left;position:static;width:100%}.admin__legend+br{clear:left;display:block;height:0;overflow:hidden}.message{margin-bottom:3rem}.message-icon-top:before{margin-top:0;top:1.8rem}.nav{background-color:#f8f8f8;border-bottom:1px solid #e3e3e3;border-top:1px solid #e3e3e3;display:none;margin-bottom:3rem;padding:2.2rem 1.5rem 0 0}.nav .btn-group,.nav-bar-outer-actions{float:right;margin-bottom:1.7rem}.nav .btn-group .btn-wrap,.nav-bar-outer-actions .btn-wrap{float:right;margin-left:.5rem;margin-right:.5rem}.nav .btn-group .btn-wrap .btn,.nav-bar-outer-actions .btn-wrap .btn{padding-left:.5rem;padding-right:.5rem}.nav-bar-outer-actions{margin-top:-10.6rem;padding-right:1.5rem}.btn-wrap-try-again{width:9.5rem}.btn-wrap-next,.btn-wrap-prev{width:8.5rem}.nav-bar{counter-reset:i;float:left;margin:0 1rem 1.7rem 0;padding:0;position:relative;white-space:nowrap}.nav-bar:before{background-color:#d4d4d4;background-repeat:repeat-x;background-image:linear-gradient(to bottom,#d1d1d1 0,#d4d4d4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#d1d1d1', endColorstr='#d4d4d4', GradientType=0);border-bottom:1px solid #d9d9d9;border-top:1px solid #bfbfbf;content:'';height:1rem;left:5.15rem;position:absolute;right:5.15rem;top:.7rem}.nav-bar>li{display:inline-block;font-size:0;position:relative;vertical-align:top;width:10.3rem}.nav-bar>li:first-child:after{display:none}.nav-bar>li:after{background-color:#514943;content:'';height:.5rem;left:calc(-50% + .25rem);position:absolute;right:calc(50% + .7rem);top:.9rem}.nav-bar>li.disabled:before,.nav-bar>li.ui-state-disabled:before{bottom:0;content:'';left:0;position:absolute;right:0;top:0;z-index:1}.nav-bar>li.active~li:after,.nav-bar>li.ui-state-active~li:after{display:none}.nav-bar>li.active~li a:after,.nav-bar>li.ui-state-active~li a:after{background-color:transparent;border-color:transparent;color:#a6a6a6}.nav-bar>li.active a,.nav-bar>li.ui-state-active a{color:#000}.nav-bar>li.active a:hover,.nav-bar>li.ui-state-active a:hover{cursor:default}.nav-bar>li.active a:after,.nav-bar>li.ui-state-active a:after{background-color:#fff;content:''}.nav-bar a{color:#514943;display:block;font-size:1.2rem;font-weight:600;line-height:1.2;overflow:hidden;padding:3rem .5em 0;position:relative;text-align:center;text-overflow:ellipsis}.nav-bar a:hover{text-decoration:none}.nav-bar a:after{background-color:#514943;border:.4rem solid #514943;border-radius:100%;color:#fff;content:counter(i);counter-increment:i;height:1.5rem;left:50%;line-height:.6;margin-left:-.8rem;position:absolute;right:auto;text-align:center;top:.4rem;width:1.5rem}.nav-bar a:before{background-color:#d6d6d6;border:1px solid transparent;border-bottom-color:#d9d9d9;border-radius:100%;border-top-color:#bfbfbf;content:'';height:2.3rem;left:50%;line-height:1;margin-left:-1.2rem;position:absolute;top:0;width:2.3rem}.tooltip{display:block;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.19rem;font-weight:400;line-height:1.4;opacity:0;position:absolute;visibility:visible;z-index:10}.tooltip.in{opacity:.9}.tooltip.top{margin-top:-4px;padding:8px 0}.tooltip.right{margin-left:4px;padding:0 8px}.tooltip.bottom{margin-top:4px;padding:8px 0}.tooltip.left{margin-left:-4px;padding:0 8px}.tooltip p:last-child{margin-bottom:0}.tooltip-inner{background-color:#fff;border:1px solid #adadad;border-radius:0;box-shadow:1px 1px 1px #ccc;color:#41362f;max-width:31rem;padding:.5em 1em;text-decoration:none}.tooltip-arrow,.tooltip-arrow:after{border:solid transparent;height:0;position:absolute;width:0}.tooltip-arrow:after{content:'';position:absolute}.tooltip.top .tooltip-arrow,.tooltip.top .tooltip-arrow:after{border-top-color:#949494;border-width:8px 8px 0;bottom:0;left:50%;margin-left:-8px}.tooltip.top-left .tooltip-arrow,.tooltip.top-left .tooltip-arrow:after{border-top-color:#949494;border-width:8px 8px 0;bottom:0;margin-bottom:-8px;right:8px}.tooltip.top-right .tooltip-arrow,.tooltip.top-right .tooltip-arrow:after{border-top-color:#949494;border-width:8px 8px 0;bottom:0;left:8px;margin-bottom:-8px}.tooltip.right .tooltip-arrow,.tooltip.right .tooltip-arrow:after{border-right-color:#949494;border-width:8px 8px 8px 0;left:1px;margin-top:-8px;top:50%}.tooltip.right .tooltip-arrow:after{border-right-color:#fff;border-width:6px 7px 6px 0;margin-left:0;margin-top:-6px}.tooltip.left .tooltip-arrow,.tooltip.left .tooltip-arrow:after{border-left-color:#949494;border-width:8px 0 8px 8px;margin-top:-8px;right:0;top:50%}.tooltip.bottom .tooltip-arrow,.tooltip.bottom .tooltip-arrow:after{border-bottom-color:#949494;border-width:0 8px 8px;left:50%;margin-left:-8px;top:0}.tooltip.bottom-left .tooltip-arrow,.tooltip.bottom-left .tooltip-arrow:after{border-bottom-color:#949494;border-width:0 8px 8px;margin-top:-8px;right:8px;top:0}.tooltip.bottom-right .tooltip-arrow,.tooltip.bottom-right .tooltip-arrow:after{border-bottom-color:#949494;border-width:0 8px 8px;left:8px;margin-top:-8px;top:0}.password-strength{display:block;margin:0 -.3rem 1em;white-space:nowrap}.password-strength.password-strength-too-short .password-strength-item:first-child,.password-strength.password-strength-weak .password-strength-item:first-child,.password-strength.password-strength-weak .password-strength-item:first-child+.password-strength-item{background-color:#e22626}.password-strength.password-strength-fair .password-strength-item:first-child,.password-strength.password-strength-fair .password-strength-item:first-child+.password-strength-item,.password-strength.password-strength-fair .password-strength-item:first-child+.password-strength-item+.password-strength-item{background-color:#ef672f}.password-strength.password-strength-good .password-strength-item:first-child,.password-strength.password-strength-good .password-strength-item:first-child+.password-strength-item,.password-strength.password-strength-good .password-strength-item:first-child+.password-strength-item+.password-strength-item,.password-strength.password-strength-good .password-strength-item:first-child+.password-strength-item+.password-strength-item+.password-strength-item,.password-strength.password-strength-strong .password-strength-item{background-color:#79a22e}.password-strength .password-strength-item{background-color:#ccc;display:inline-block;font-size:0;height:1.4rem;margin-right:.3rem;width:calc(20% - .6rem)}@keyframes progress-bar-stripes{from{background-position:4rem 0}to{background-position:0 0}}.progress{background-color:#fafafa;border:1px solid #ccc;clear:left;height:3rem;margin-bottom:3rem;overflow:hidden}.progress-bar{background-color:#79a22e;color:#fff;float:left;font-size:1.19rem;height:100%;line-height:3rem;text-align:center;transition:width .6s ease;width:0}.progress-bar.active{animation:progress-bar-stripes 2s linear infinite}.progress-bar-text-description{margin-bottom:1.6rem}.progress-bar-text-progress{text-align:right}.page-columns .page-inner-sidebar{margin:0 0 3rem}.page-header{margin-bottom:2.7rem;padding-bottom:2rem;position:relative}.page-header:before{border-bottom:1px solid #e3e3e3;bottom:0;content:'';display:block;height:1px;left:3rem;position:absolute;right:3rem}.container .page-header:before{content:normal}.page-header .message{margin-bottom:1.8rem}.page-header .message+.message{margin-top:-1.5rem}.page-header .admin__action-dropdown,.page-header .search-global-input{transition:none}.container .page-header{margin-bottom:0}.page-title-wrapper{margin-top:1.1rem}.container .page-title-wrapper{background:url(../../pub/images/logo.svg) no-repeat;min-height:41px;padding:4px 0 0 45px}.admin__menu .level-0:first-child>a{margin-top:1.6rem}.admin__menu .level-0:first-child>a:after{top:-1.6rem}.admin__menu .level-0:first-child._active>a:after{display:block}.admin__menu .level-0>a{padding-bottom:1.3rem;padding-top:1.3rem}.admin__menu .level-0>a:before{margin-bottom:.7rem}.admin__menu .item-home>a:before{content:'\e611';font-size:2.3rem;padding-top:-.1rem}.admin__menu .item-component>a:before{content:'\e612'}.admin__menu .item-extension>a:before{content:'\e612'}.admin__menu .item-module>a:before{content:'\e647'}.admin__menu .item-upgrade>a:before{content:'\e614'}.admin__menu .item-system-config>a:before{content:'\e610'}.admin__menu .item-tools>a:before{content:'\e613'}.modal-sub-title{font-size:1.7rem;font-weight:600}.modal-connect-signin .modal-inner-wrap{max-width:80rem}@keyframes ngdialog-fadeout{0%{opacity:1}100%{opacity:0}}@keyframes ngdialog-fadein{0%{opacity:0}100%{opacity:1}}.ngdialog{-webkit-overflow-scrolling:touch;bottom:0;box-sizing:border-box;left:0;overflow:auto;position:fixed;right:0;top:0;z-index:999}.ngdialog *,.ngdialog:after,.ngdialog:before{box-sizing:inherit}.ngdialog.ngdialog-disabled-animation *{animation:none!important}.ngdialog.ngdialog-closing .ngdialog-content,.ngdialog.ngdialog-closing .ngdialog-overlay{-webkit-animation:ngdialog-fadeout .5s;-webkit-backface-visibility:hidden;animation:ngdialog-fadeout .5s}.ngdialog-overlay{-webkit-animation:ngdialog-fadein .5s;-webkit-backface-visibility:hidden;animation:ngdialog-fadein .5s;background:rgba(0,0,0,.4);bottom:0;left:0;position:fixed;right:0;top:0}.ngdialog-content{-webkit-animation:ngdialog-fadein .5s;-webkit-backface-visibility:hidden;animation:ngdialog-fadein .5s}body.ngdialog-open{overflow:hidden}.component-indicator{border-radius:50%;cursor:help;display:inline-block;height:16px;text-align:center;vertical-align:middle;width:16px}.component-indicator::after,.component-indicator::before{background:#fff;display:block;opacity:0;position:absolute;transition:opacity .2s linear .1s;visibility:hidden}.component-indicator::before{border:1px solid #adadad;border-radius:1px;box-shadow:0 0 2px rgba(0,0,0,.4);content:attr(data-label);font-size:1.2rem;margin:30px 0 0 -10px;min-width:50px;padding:4px 5px}.component-indicator::after{border-color:#999;border-style:solid;border-width:1px 0 0 1px;box-shadow:-1px -1px 1px rgba(0,0,0,.1);content:'';height:10px;margin:9px 0 0 5px;-ms-transform:rotate(45deg);transform:rotate(45deg);width:10px}.component-indicator:hover::after,.component-indicator:hover::before{opacity:1;transition:opacity .2s linear;visibility:visible}.component-indicator span{display:block;height:16px;overflow:hidden;width:16px}.component-indicator span:before{content:'';display:block;font-family:Icons;font-size:16px;height:100%;line-height:16px;width:100%}.component-indicator._on{background:#79a22e}.component-indicator._off{background:#e22626}.component-indicator._off span:before{background:#fff;height:4px;margin:8px auto 20px;width:12px}.component-indicator._info{background:0 0}.component-indicator._info span{width:21px}.component-indicator._info span:before{color:#008bdb;content:'\e648';font-family:Icons;font-size:16px}.component-indicator._tooltip{background:0 0;margin:0 0 8px 5px}.component-indicator._tooltip a{width:21px}.component-indicator._tooltip a:hover{text-decoration:none}.component-indicator._tooltip a:before{color:#514943;content:'\e633';font-family:Icons;font-size:16px}.col-manager-item-name .data-grid-data{padding-left:5px}.col-manager-item-name .ng-hide+.data-grid-data{padding-left:24px}.col-manager-item-name ._hide-dependencies,.col-manager-item-name ._show-dependencies{cursor:pointer;padding-left:24px;position:relative}.col-manager-item-name ._hide-dependencies:before,.col-manager-item-name ._show-dependencies:before{display:block;font-family:Icons;font-size:12px;left:0;position:absolute;top:1px}.col-manager-item-name ._show-dependencies:before{content:'\e62b'}.col-manager-item-name ._hide-dependencies:before{content:'\e628'}.col-manager-item-name ._no-dependencies{padding-left:24px}.product-modules-block{font-size:1.2rem;padding:15px 0 0}.col-manager-item-name .product-modules-block{padding-left:1rem}.product-modules-descriprion,.product-modules-title{font-weight:700;margin:0 0 7px}.product-modules-list{font-size:1.1rem;list-style:none;margin:0}.col-manager-item-name .product-modules-list{margin-left:15px}.col-manager-item-name .product-modules-list li{padding:0 0 0 15px;position:relative}.product-modules-list li{margin:0 0 .5rem}.product-modules-list .component-indicator{height:10px;left:0;position:absolute;top:3px;width:10px}.module-summary{white-space:nowrap}.module-summary-title{font-size:2.1rem;margin-right:1rem}.app-updater .nav{display:block;margin-bottom:3.1rem;margin-top:-2.8rem}.app-updater .nav-bar-outer-actions{margin-top:1rem;padding-right:0}.app-updater .nav-bar-outer-actions .btn-wrap-cancel{margin-right:2.6rem}.main{padding-bottom:2rem;padding-top:3rem}.header{display:none}.header .logo{float:left;height:4.1rem;width:3.5rem}.header-title{font-size:2.8rem;letter-spacing:.02em;line-height:1.4;margin:2.5rem 0 3.5rem 5rem}.page-title{margin-bottom:1rem}.page-sub-title{font-size:2rem}.accent-box{margin-bottom:2rem}.accent-box .btn-prime{margin-top:1.5rem}.spinner.side{float:left;font-size:2.4rem;margin-left:2rem;margin-top:-5px}.page-landing{margin:7.6% auto 0;max-width:44rem;text-align:center}.page-landing .logo{height:5.6rem;margin-bottom:2rem;width:19.2rem}.page-landing .text-version{margin-bottom:3rem}.page-landing .text-welcome{margin-bottom:6.5rem}.page-landing .text-terms{margin-bottom:2.5rem;text-align:center}.page-landing .btn-submit,.page-license .license-text{margin-bottom:2rem}.page-license .page-license-footer{text-align:right}.readiness-check-item{margin-bottom:4rem;min-height:2.5rem}.readiness-check-item .spinner{float:left;font-size:2.5rem;margin:-.4rem 0 0 1.7rem}.readiness-check-title{font-size:1.4rem;font-weight:700;margin-bottom:.1rem;margin-left:5.7rem}.readiness-check-content{margin-left:5.7rem;margin-right:22rem;position:relative}.readiness-check-content .readiness-check-title{margin-left:0}.readiness-check-content .list{margin-top:-.3rem}.readiness-check-side{left:100%;padding-left:2.4rem;position:absolute;top:0;width:22rem}.readiness-check-side .side-title{margin-bottom:0}.readiness-check-icon{float:left;margin-left:1.7rem;margin-top:.3rem}.extensions-information{margin-bottom:5rem}.extensions-information h3{font-size:1.4rem;margin-bottom:1.3rem}.extensions-information .message{margin-bottom:2.5rem}.extensions-information .message:before{margin-top:0;top:1.8rem}.extensions-information .extensions-container{padding:0 2rem}.extensions-information .list{margin-bottom:1rem}.extensions-information .list select{cursor:pointer}.extensions-information .list select:disabled{background:#ccc;cursor:default}.extensions-information .list .extension-delete{font-size:1.7rem;padding-top:0}.delete-modal-wrap{padding:0 4% 4rem}.delete-modal-wrap h3{font-size:3.4rem;display:inline-block;font-weight:300;margin:0 0 2rem;padding:.9rem 0 0;vertical-align:top}.delete-modal-wrap .actions{padding:3rem 0 0}.page-web-configuration .form-el-insider-wrap{width:auto}.page-web-configuration .form-el-insider{width:15.4rem}.page-web-configuration .form-el-insider-input .form-el-input{width:16.5rem}.customize-your-store .advanced-modules-count,.customize-your-store .advanced-modules-select{padding-left:1.5rem}.customize-your-store .customize-your-store-advanced{min-width:0}.customize-your-store .message-error:before{margin-top:0;top:1.8rem}.customize-your-store .message-error a{color:#333;text-decoration:underline}.customize-your-store .message-error .form-label:before{background:#fff}.customize-your-store .customize-database-clean p{margin-top:2.5rem}.content-install{margin-bottom:2rem}.console{border:1px solid #ccc;font-family:'Courier New',Courier,monospace;font-weight:300;height:20rem;margin:1rem 0 2rem;overflow-y:auto;padding:1.5rem 2rem 2rem;resize:vertical}.console .text-danger{color:#e22626}.console .text-success{color:#090}.console .hidden{display:none}.content-success .btn-prime{margin-top:1.5rem}.jumbo-title{font-size:3.6rem}.jumbo-title .jumbo-icon{font-size:3.8rem;margin-right:.25em;position:relative;top:.15em}.install-database-clean{margin-top:4rem}.install-database-clean .btn{margin-right:1rem}.page-sub-title{margin-bottom:2.1rem;margin-top:3rem}.multiselect-custom{max-width:71.1rem}.content-install{margin-top:3.7rem}.home-page-inner-wrap{margin:0 auto;max-width:91rem}.setup-home-title{margin-bottom:3.9rem;padding-top:1.8rem;text-align:center}.setup-home-item{background-color:#fafafa;border:1px solid #ccc;color:#333;display:block;margin-bottom:2rem;margin-left:1.3rem;margin-right:1.3rem;min-height:30rem;padding:2rem;text-align:center}.setup-home-item:hover{border-color:#8c8c8c;color:#333;text-decoration:none;transition:border-color .1s linear}.setup-home-item:active{-ms-transform:scale(0.99);transform:scale(0.99)}.setup-home-item:before{display:block;font-size:7rem;margin-bottom:3.3rem;margin-top:4rem}.setup-home-item-component:before,.setup-home-item-extension:before{content:'\e612'}.setup-home-item-module:before{content:'\e647'}.setup-home-item-upgrade:before{content:'\e614'}.setup-home-item-configuration:before{content:'\e610'}.setup-home-item-title{display:block;font-size:1.8rem;letter-spacing:.025em;margin-bottom:1rem}.setup-home-item-description{display:block}.extension-manager-wrap{border:1px solid #bbb;margin:0 0 4rem}.extension-manager-account{font-size:2.1rem;display:inline-block;font-weight:400}.extension-manager-title{font-size:3.2rem;background-color:#f8f8f8;border-bottom:1px solid #e3e3e3;color:#41362f;font-weight:600;line-height:1.2;padding:2rem}.extension-manager-content{padding:2.5rem 2rem 2rem}.extension-manager-items{list-style:none;margin:0;text-align:center}.extension-manager-items .btn{border:1px solid #adadad;display:block;margin:1rem auto 0}.extension-manager-items .item-title{font-size:2.1rem;display:inline-block;text-align:left}.extension-manager-items .item-number{font-size:4.1rem;display:inline-block;line-height:.8;margin:0 5px 1.5rem 0;vertical-align:top}.extension-manager-items .item-date{font-size:2.6rem;margin-top:1px}.extension-manager-items .item-date-title{font-size:1.5rem}.extension-manager-items .item-install{margin:0 0 2rem}.sync-login-wrap{padding:0 10% 4rem}.sync-login-wrap .legend{font-size:2.6rem;color:#eb5202;float:left;font-weight:300;line-height:1.2;margin:-1rem 0 2.5rem;position:static;width:100%}.sync-login-wrap .legend._hidden{display:none}.sync-login-wrap .login-header{font-size:3.4rem;font-weight:300;margin:0 0 2rem}.sync-login-wrap .login-header span{display:inline-block;padding:.9rem 0 0;vertical-align:top}.sync-login-wrap h4{font-size:1.4rem;margin:0 0 2rem}.sync-login-wrap .sync-login-steps{margin:0 0 2rem 1.5rem}.sync-login-wrap .sync-login-steps li{padding:0 0 0 1rem}.sync-login-wrap .form-row .form-label{display:inline-block}.sync-login-wrap .form-row .form-label.required{padding-left:1.5rem}.sync-login-wrap .form-row .form-label.required:after{left:0;position:absolute;right:auto}.sync-login-wrap .form-row{max-width:28rem}.sync-login-wrap .form-actions{display:table;margin-top:-1.3rem}.sync-login-wrap .form-actions .links{display:table-header-group}.sync-login-wrap .form-actions .actions{padding:3rem 0 0}@media all and (max-width:1047px){.admin__menu .submenu li{min-width:19.8rem}.nav{padding-bottom:5.38rem;padding-left:1.5rem;text-align:center}.nav-bar{display:inline-block;float:none;margin-right:0;vertical-align:top}.nav .btn-group,.nav-bar-outer-actions{display:inline-block;float:none;margin-top:-8.48rem;text-align:center;vertical-align:top;width:100%}.nav-bar-outer-actions{padding-right:0}.nav-bar-outer-actions .outer-actions-inner-wrap{display:inline-block}.app-updater .nav{padding-bottom:1.7rem}.app-updater .nav-bar-outer-actions{margin-top:2rem}}@media all and (min-width:768px){.page-layout-admin-2columns-left .page-columns{margin-left:-30px}.page-layout-admin-2columns-left .page-columns:after{clear:both;content:'';display:table}.page-layout-admin-2columns-left .page-columns .main-col{width:calc((100%) * .75 - 30px);float:right}.page-layout-admin-2columns-left .page-columns .side-col{width:calc((100%) * .25 - 30px);float:left;margin-left:30px}.col-m-1,.col-m-10,.col-m-11,.col-m-12,.col-m-2,.col-m-3,.col-m-4,.col-m-5,.col-m-6,.col-m-7,.col-m-8,.col-m-9{float:left}.col-m-12{width:100%}.col-m-11{width:91.66666667%}.col-m-10{width:83.33333333%}.col-m-9{width:75%}.col-m-8{width:66.66666667%}.col-m-7{width:58.33333333%}.col-m-6{width:50%}.col-m-5{width:41.66666667%}.col-m-4{width:33.33333333%}.col-m-3{width:25%}.col-m-2{width:16.66666667%}.col-m-1{width:8.33333333%}.col-m-pull-12{right:100%}.col-m-pull-11{right:91.66666667%}.col-m-pull-10{right:83.33333333%}.col-m-pull-9{right:75%}.col-m-pull-8{right:66.66666667%}.col-m-pull-7{right:58.33333333%}.col-m-pull-6{right:50%}.col-m-pull-5{right:41.66666667%}.col-m-pull-4{right:33.33333333%}.col-m-pull-3{right:25%}.col-m-pull-2{right:16.66666667%}.col-m-pull-1{right:8.33333333%}.col-m-pull-0{right:auto}.col-m-push-12{left:100%}.col-m-push-11{left:91.66666667%}.col-m-push-10{left:83.33333333%}.col-m-push-9{left:75%}.col-m-push-8{left:66.66666667%}.col-m-push-7{left:58.33333333%}.col-m-push-6{left:50%}.col-m-push-5{left:41.66666667%}.col-m-push-4{left:33.33333333%}.col-m-push-3{left:25%}.col-m-push-2{left:16.66666667%}.col-m-push-1{left:8.33333333%}.col-m-push-0{left:auto}.col-m-offset-12{margin-left:100%}.col-m-offset-11{margin-left:91.66666667%}.col-m-offset-10{margin-left:83.33333333%}.col-m-offset-9{margin-left:75%}.col-m-offset-8{margin-left:66.66666667%}.col-m-offset-7{margin-left:58.33333333%}.col-m-offset-6{margin-left:50%}.col-m-offset-5{margin-left:41.66666667%}.col-m-offset-4{margin-left:33.33333333%}.col-m-offset-3{margin-left:25%}.col-m-offset-2{margin-left:16.66666667%}.col-m-offset-1{margin-left:8.33333333%}.col-m-offset-0{margin-left:0}.page-columns{margin-left:-30px}.page-columns:after{clear:both;content:'';display:table}.page-columns .page-inner-content{width:calc((100%) * .75 - 30px);float:right}.page-columns .page-inner-sidebar{width:calc((100%) * .25 - 30px);float:left;margin-left:30px}}@media all and (min-width:1048px){.col-l-1,.col-l-10,.col-l-11,.col-l-12,.col-l-2,.col-l-3,.col-l-4,.col-l-5,.col-l-6,.col-l-7,.col-l-8,.col-l-9{float:left}.col-l-12{width:100%}.col-l-11{width:91.66666667%}.col-l-10{width:83.33333333%}.col-l-9{width:75%}.col-l-8{width:66.66666667%}.col-l-7{width:58.33333333%}.col-l-6{width:50%}.col-l-5{width:41.66666667%}.col-l-4{width:33.33333333%}.col-l-3{width:25%}.col-l-2{width:16.66666667%}.col-l-1{width:8.33333333%}.col-l-pull-12{right:100%}.col-l-pull-11{right:91.66666667%}.col-l-pull-10{right:83.33333333%}.col-l-pull-9{right:75%}.col-l-pull-8{right:66.66666667%}.col-l-pull-7{right:58.33333333%}.col-l-pull-6{right:50%}.col-l-pull-5{right:41.66666667%}.col-l-pull-4{right:33.33333333%}.col-l-pull-3{right:25%}.col-l-pull-2{right:16.66666667%}.col-l-pull-1{right:8.33333333%}.col-l-pull-0{right:auto}.col-l-push-12{left:100%}.col-l-push-11{left:91.66666667%}.col-l-push-10{left:83.33333333%}.col-l-push-9{left:75%}.col-l-push-8{left:66.66666667%}.col-l-push-7{left:58.33333333%}.col-l-push-6{left:50%}.col-l-push-5{left:41.66666667%}.col-l-push-4{left:33.33333333%}.col-l-push-3{left:25%}.col-l-push-2{left:16.66666667%}.col-l-push-1{left:8.33333333%}.col-l-push-0{left:auto}.col-l-offset-12{margin-left:100%}.col-l-offset-11{margin-left:91.66666667%}.col-l-offset-10{margin-left:83.33333333%}.col-l-offset-9{margin-left:75%}.col-l-offset-8{margin-left:66.66666667%}.col-l-offset-7{margin-left:58.33333333%}.col-l-offset-6{margin-left:50%}.col-l-offset-5{margin-left:41.66666667%}.col-l-offset-4{margin-left:33.33333333%}.col-l-offset-3{margin-left:25%}.col-l-offset-2{margin-left:16.66666667%}.col-l-offset-1{margin-left:8.33333333%}.col-l-offset-0{margin-left:0}}@media all and (min-width:1440px){.col-xl-1,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9{float:left}.col-xl-12{width:100%}.col-xl-11{width:91.66666667%}.col-xl-10{width:83.33333333%}.col-xl-9{width:75%}.col-xl-8{width:66.66666667%}.col-xl-7{width:58.33333333%}.col-xl-6{width:50%}.col-xl-5{width:41.66666667%}.col-xl-4{width:33.33333333%}.col-xl-3{width:25%}.col-xl-2{width:16.66666667%}.col-xl-1{width:8.33333333%}.col-xl-pull-12{right:100%}.col-xl-pull-11{right:91.66666667%}.col-xl-pull-10{right:83.33333333%}.col-xl-pull-9{right:75%}.col-xl-pull-8{right:66.66666667%}.col-xl-pull-7{right:58.33333333%}.col-xl-pull-6{right:50%}.col-xl-pull-5{right:41.66666667%}.col-xl-pull-4{right:33.33333333%}.col-xl-pull-3{right:25%}.col-xl-pull-2{right:16.66666667%}.col-xl-pull-1{right:8.33333333%}.col-xl-pull-0{right:auto}.col-xl-push-12{left:100%}.col-xl-push-11{left:91.66666667%}.col-xl-push-10{left:83.33333333%}.col-xl-push-9{left:75%}.col-xl-push-8{left:66.66666667%}.col-xl-push-7{left:58.33333333%}.col-xl-push-6{left:50%}.col-xl-push-5{left:41.66666667%}.col-xl-push-4{left:33.33333333%}.col-xl-push-3{left:25%}.col-xl-push-2{left:16.66666667%}.col-xl-push-1{left:8.33333333%}.col-xl-push-0{left:auto}.col-xl-offset-12{margin-left:100%}.col-xl-offset-11{margin-left:91.66666667%}.col-xl-offset-10{margin-left:83.33333333%}.col-xl-offset-9{margin-left:75%}.col-xl-offset-8{margin-left:66.66666667%}.col-xl-offset-7{margin-left:58.33333333%}.col-xl-offset-6{margin-left:50%}.col-xl-offset-5{margin-left:41.66666667%}.col-xl-offset-4{margin-left:33.33333333%}.col-xl-offset-3{margin-left:25%}.col-xl-offset-2{margin-left:16.66666667%}.col-xl-offset-1{margin-left:8.33333333%}.col-xl-offset-0{margin-left:0}}@media all and (max-width:767px){.abs-clearer-mobile:after,.nav-bar:after{clear:both;content:'';display:table}.list-definition>dt{float:none}.list-definition>dd{margin-left:0}.form-row .form-label{text-align:left}.form-row .form-label.required:after{position:static}.nav{padding-bottom:0;padding-left:0;padding-right:0}.nav-bar-outer-actions{margin-top:0}.nav-bar{display:block;margin-bottom:0;margin-left:auto;margin-right:auto;width:30.9rem}.nav-bar:before{display:none}.nav-bar>li{float:left;min-height:9rem}.nav-bar>li:after{display:none}.nav-bar>li:nth-child(4n){clear:both}.nav-bar a{line-height:1.4}.tooltip{display:none!important}.readiness-check-content{margin-right:2rem}.readiness-check-side{padding:2rem 0;position:static}.form-el-insider,.form-el-insider-wrap,.page-web-configuration .form-el-insider-input,.page-web-configuration .form-el-insider-input .form-el-input{display:block;width:100%}}@media all and (max-width:479px){.nav-bar{width:23.175rem}.nav-bar>li{width:7.725rem}.nav .btn-group .btn-wrap-try-again,.nav-bar-outer-actions .btn-wrap-try-again{clear:both;display:block;float:none;margin-left:auto;margin-right:auto;margin-top:1rem;padding-top:1rem}}
-+.abs-action-delete,.abs-icon,.action-close:before,.action-next:before,.action-previous:before,.admin-user .admin__action-dropdown:before,.admin__action-multiselect-dropdown:before,.admin__action-multiselect-search-label:before,.admin__control-checkbox+label:before,.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .action-delete:before,.admin__control-table .action-delete:before,.admin__current-filters-list .action-remove:before,.admin__data-grid-action-bookmarks .action-delete:before,.admin__data-grid-action-bookmarks .action-edit:before,.admin__data-grid-action-bookmarks .action-submit:before,.admin__data-grid-action-bookmarks .admin__action-dropdown:before,.admin__data-grid-action-columns .admin__action-dropdown:before,.admin__data-grid-action-export .admin__action-dropdown:before,.admin__field-fallback-reset:before,.admin__menu .level-0>a:before,.admin__page-nav-item-message .admin__page-nav-item-message-icon,.admin__page-nav-title._collapsible:after,.data-grid-filters-action-wrap .action-default:before,.data-grid-row-changed:after,.data-grid-row-parent>td .data-grid-checkbox-cell-inner:before,.data-grid-search-control-wrap .action-submit:before,.extensions-information .list .extension-delete,.icon-failed:before,.icon-success:before,.notifications-action:before,.notifications-close:before,.page-actions .page-actions-buttons>button.action-back:before,.page-actions .page-actions-buttons>button.back:before,.page-actions>button.action-back:before,.page-actions>button.back:before,.page-title-jumbo-success:before,.search-global-label:before,.selectmenu .action-delete:before,.selectmenu .action-edit:before,.selectmenu .action-save:before,.setup-home-item:before,.sticky-header .data-grid-search-control-wrap .data-grid-search-label:before,.store-switcher .dropdown-menu .dropdown-toolbar a:before,.tooltip .help a:before,.tooltip .help span:before{-webkit-font-smoothing:antialiased;font-family:Icons;font-style:normal;font-weight:400;line-height:1;speak:none}.validation-symbol:after{color:#e22626;content:'*';font-weight:400;margin-left:3px}.abs-modal-overlay,.modals-overlay{background:rgba(0,0,0,.35);bottom:0;left:0;position:fixed;right:0;top:0}.abs-action-delete>span,.abs-visually-hidden,.action-multicheck-wrap .action-multicheck-toggle>span,.admin__actions-switch-checkbox,.admin__control-fields .admin__field:nth-child(n+2):not(.admin__field-option):not(.admin__field-group-show-label)>.admin__field-label,.admin__field-tooltip .admin__field-tooltip-action span,.customize-your-store .customize-your-store-default .legend,.extensions-information .list .extension-delete>span,.form-el-checkbox,.form-el-radio,.selectmenu .action-delete>span,.selectmenu .action-edit>span,.selectmenu .action-save>span,.selectmenu-toggle span,.tooltip .help a span,.tooltip .help span span,[class*=admin__control-grouped]>.admin__field:nth-child(n+2):not(.admin__field-option):not(.admin__field-group-show-label):not(.admin__field-date)>.admin__field-label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.abs-visually-hidden-reset,.admin__field-group-columns>.admin__field:nth-child(n+2):not(.admin__field-option):not(.admin__field-group-show-label):not(.admin__field-date)>.admin__field-label[class]{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.abs-clearfix:after,.abs-clearfix:before,.action-multicheck-wrap:after,.action-multicheck-wrap:before,.actions-split:after,.actions-split:before,.admin__control-table-pagination:after,.admin__control-table-pagination:before,.admin__data-grid-action-columns-menu .admin__action-dropdown-menu-content:after,.admin__data-grid-action-columns-menu .admin__action-dropdown-menu-content:before,.admin__data-grid-filters-footer:after,.admin__data-grid-filters-footer:before,.admin__data-grid-filters:after,.admin__data-grid-filters:before,.admin__data-grid-header-row:after,.admin__data-grid-header-row:before,.admin__field-complex:after,.admin__field-complex:before,.modal-slide .magento-message .insert-title-inner:after,.modal-slide .magento-message .insert-title-inner:before,.modal-slide .main-col .insert-title-inner:after,.modal-slide .main-col .insert-title-inner:before,.page-actions._fixed:after,.page-actions._fixed:before,.page-content:after,.page-content:before,.page-header-actions:after,.page-header-actions:before,.page-main-actions:not(._hidden):after,.page-main-actions:not(._hidden):before{content:'';display:table}.abs-clearfix:after,.action-multicheck-wrap:after,.actions-split:after,.admin__control-table-pagination:after,.admin__data-grid-action-columns-menu .admin__action-dropdown-menu-content:after,.admin__data-grid-filters-footer:after,.admin__data-grid-filters:after,.admin__data-grid-header-row:after,.admin__field-complex:after,.modal-slide .magento-message .insert-title-inner:after,.modal-slide .main-col .insert-title-inner:after,.page-actions._fixed:after,.page-content:after,.page-header-actions:after,.page-main-actions:not(._hidden):after{clear:both}.abs-list-reset-styles{margin:0;padding:0;list-style:none}.abs-draggable-handle,.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .draggable-handle,.admin__control-table .draggable-handle,.data-grid .data-grid-draggable-row-cell .draggable-handle{cursor:-webkit-grab;cursor:move;font-size:0;margin-top:-4px;padding:0 1rem 0 0;vertical-align:middle;display:inline-block;text-decoration:none}.abs-draggable-handle:before,.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .draggable-handle:before,.admin__control-table .draggable-handle:before,.data-grid .data-grid-draggable-row-cell .draggable-handle:before{-webkit-font-smoothing:antialiased;font-size:1.8rem;line-height:inherit;color:#9e9e9e;content:'\e617';font-family:Icons;vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.abs-draggable-handle:hover:before,.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .draggable-handle:hover:before,.admin__control-table .draggable-handle:hover:before,.data-grid .data-grid-draggable-row-cell .draggable-handle:hover:before{color:#858585}.abs-config-scope-label,.admin__field:not(.admin__field-option)>.admin__field-label span[data-config-scope]:before{bottom:-1.3rem;color:gray;content:attr(data-config-scope);font-size:1.1rem;font-weight:400;min-width:15rem;position:absolute;right:0;text-transform:lowercase}.abs-word-wrap,.admin__field:not(.admin__field-option)>.admin__field-label{overflow-wrap:break-word;word-wrap:break-word;-ms-word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto}html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;box-sizing:border-box}*,:after,:before{box-sizing:inherit}:focus{box-shadow:none;outline:0}._keyfocus :focus{box-shadow:0 0 0 1px #008bdb}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}mark{background:#ff0;color:#000}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}embed,img,object,video{max-width:100%}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@font-face{font-family:'Open Sans';src:url(../fonts/opensans/light/opensans-300.eot);src:url(../fonts/opensans/light/opensans-300.eot?#iefix) format('embedded-opentype'),url(../fonts/opensans/light/opensans-300.woff2) format('woff2'),url(../fonts/opensans/light/opensans-300.woff) format('woff'),url(../fonts/opensans/light/opensans-300.ttf) format('truetype'),url('../fonts/opensans/light/opensans-300.svg#Open Sans') format('svg');font-weight:300;font-style:normal}@font-face{font-family:'Open Sans';src:url(../fonts/opensans/regular/opensans-400.eot);src:url(../fonts/opensans/regular/opensans-400.eot?#iefix) format('embedded-opentype'),url(../fonts/opensans/regular/opensans-400.woff2) format('woff2'),url(../fonts/opensans/regular/opensans-400.woff) format('woff'),url(../fonts/opensans/regular/opensans-400.ttf) format('truetype'),url('../fonts/opensans/regular/opensans-400.svg#Open Sans') format('svg');font-weight:400;font-style:normal}@font-face{font-family:'Open Sans';src:url(../fonts/opensans/semibold/opensans-600.eot);src:url(../fonts/opensans/semibold/opensans-600.eot?#iefix) format('embedded-opentype'),url(../fonts/opensans/semibold/opensans-600.woff2) format('woff2'),url(../fonts/opensans/semibold/opensans-600.woff) format('woff'),url(../fonts/opensans/semibold/opensans-600.ttf) format('truetype'),url('../fonts/opensans/semibold/opensans-600.svg#Open Sans') format('svg');font-weight:600;font-style:normal}@font-face{font-family:'Open Sans';src:url(../fonts/opensans/bold/opensans-700.eot);src:url(../fonts/opensans/bold/opensans-700.eot?#iefix) format('embedded-opentype'),url(../fonts/opensans/bold/opensans-700.woff2) format('woff2'),url(../fonts/opensans/bold/opensans-700.woff) format('woff'),url(../fonts/opensans/bold/opensans-700.ttf) format('truetype'),url('../fonts/opensans/bold/opensans-700.svg#Open Sans') format('svg');font-weight:700;font-style:normal}html{font-size:62.5%}body{color:#333;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1.36;font-size:1.4rem}h1{margin:0 0 2rem;color:#41362f;font-weight:400;line-height:1.2;font-size:2.8rem}h2{margin:0 0 2rem;color:#41362f;font-weight:400;line-height:1.2;font-size:2rem}h3{margin:0 0 2rem;color:#41362f;font-weight:600;line-height:1.2;font-size:1.7rem}h4,h5,h6{font-weight:600;margin-top:0}p{margin:0 0 1em}small{font-size:1.2rem}a{color:#008bdb;text-decoration:none}a:hover{color:#0fa7ff;text-decoration:underline}dl,ol,ul{padding-left:0}nav ol,nav ul{list-style:none;margin:0;padding:0}html{height:100%}body{background-color:#fff;min-height:100%;min-width:102.4rem}.page-wrapper{background-color:#fff;display:inline-block;margin-left:-4px;vertical-align:top;width:calc(100% - 8.8rem)}.page-content{padding-bottom:3rem;padding-left:3rem;padding-right:3rem}.notices-wrapper{margin:0 3rem}.notices-wrapper .messages{margin-bottom:0}.row{margin-left:0;margin-right:0}.row:after{clear:both;content:'';display:table}.col-l-1,.col-l-10,.col-l-11,.col-l-12,.col-l-2,.col-l-3,.col-l-4,.col-l-5,.col-l-6,.col-l-7,.col-l-8,.col-l-9,.col-m-1,.col-m-10,.col-m-11,.col-m-12,.col-m-2,.col-m-3,.col-m-4,.col-m-5,.col-m-6,.col-m-7,.col-m-8,.col-m-9,.col-xl-1,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{min-height:1px;padding-left:0;padding-right:0;position:relative}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}.row-gutter{margin-left:-1.5rem;margin-right:-1.5rem}.row-gutter>[class*=col-]{padding-left:1.5rem;padding-right:1.5rem}.abs-clearer:after,.extension-manager-content:after,.extension-manager-title:after,.form-row:after,.header:after,.nav:after,body:after{clear:both;content:'';display:table}.ng-cloak{display:none!important}.hide.hide{display:none}.show.show{display:block}.text-center{text-align:center}.text-right{text-align:right}@font-face{font-family:Icons;src:url(../fonts/icons/icons.eot);src:url(../fonts/icons/icons.eot?#iefix) format('embedded-opentype'),url(../fonts/icons/icons.woff2) format('woff2'),url(../fonts/icons/icons.woff) format('woff'),url(../fonts/icons/icons.ttf) format('truetype'),url(../fonts/icons/icons.svg#Icons) format('svg');font-weight:400;font-style:normal}[class*=icon-]{display:inline-block;line-height:1}.icon-failed:before,.icon-success:before,[class*=icon-]:after{font-family:Icons}.icon-success{color:#79a22e}.icon-success:before{content:'\e62d'}.icon-failed{color:#e22626}.icon-failed:before{content:'\e632'}.icon-success-thick:after{content:'\e62d'}.icon-collapse:after{content:'\e615'}.icon-failed-thick:after{content:'\e632'}.icon-expand:after{content:'\e616'}.icon-warning:after{content:'\e623'}.icon-failed-round,.icon-success-round{border-radius:100%;color:#fff;font-size:2.5rem;height:1em;position:relative;text-align:center;width:1em}.icon-failed-round:after,.icon-success-round:after{bottom:0;font-size:.5em;left:0;position:absolute;right:0;top:.45em}.icon-success-round{background-color:#79a22e}.icon-success-round:after{content:'\e62d'}.icon-failed-round{background-color:#e22626}.icon-failed-round:after{content:'\e632'}dl,ol,ul{margin-top:0}.list{padding-left:0}.list>li{display:block;margin-bottom:.75em;position:relative}.list>li>.icon-failed,.list>li>.icon-success{font-size:1.6em;left:-.1em;position:absolute;top:0}.list>li>.icon-success{color:#79a22e}.list>li>.icon-failed{color:#e22626}.list-item-failed,.list-item-icon,.list-item-success,.list-item-warning{padding-left:3.5rem}.list-item-failed:before,.list-item-success:before,.list-item-warning:before{left:-.1em;position:absolute}.list-item-success:before{color:#79a22e}.list-item-failed:before{color:#e22626}.list-item-warning:before{color:#ef672f}.list-definition{margin:0 0 3rem;padding:0}.list-definition>dt{clear:left;float:left}.list-definition>dd{margin-bottom:1em;margin-left:20rem}.btn-wrap{margin:0 auto}.btn-wrap .btn{width:100%}.btn{background:#e3e3e3;border:none;color:#514943;display:inline-block;font-size:1.6rem;font-weight:600;padding:.45em .9em;text-align:center}.btn:hover{background-color:#dbdbdb;color:#514943;text-decoration:none}.btn:active{background-color:#d6d6d6}.btn.disabled,.btn[disabled]{cursor:default;opacity:.5;pointer-events:none}.ie9 .btn.disabled,.ie9 .btn[disabled]{background-color:#f0f0f0;opacity:1;text-shadow:none}.btn-large{padding:.75em 1.25em}.btn-medium{font-size:1.4rem;padding:.5em 1.5em .6em}.btn-link{background-color:transparent;border:none;color:#008bdb;font-family:1.6rem;font-size:1.5rem}.btn-link:active,.btn-link:focus,.btn-link:hover{background-color:transparent;color:#0fa7ff}.btn-prime{background-color:#eb5202;color:#fff;text-shadow:1px 1px 0 rgba(0,0,0,.25)}.btn-prime:focus,.btn-prime:hover{background-color:#f65405;background-repeat:repeat-x;background-image:linear-gradient(to right,#e04f00 0,#f65405 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e04f00', endColorstr='#f65405', GradientType=1);color:#fff}.btn-prime:active{background-color:#e04f00;background-repeat:repeat-x;background-image:linear-gradient(to right,#f65405 0,#e04f00 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f65405', endColorstr='#e04f00', GradientType=1);color:#fff}.ie9 .btn-prime.disabled,.ie9 .btn-prime[disabled]{background-color:#fd6e23}.ie9 .btn-prime.disabled:active,.ie9 .btn-prime.disabled:hover,.ie9 .btn-prime[disabled]:active,.ie9 .btn-prime[disabled]:hover{background-color:#fd6e23;-webkit-filter:none;filter:none}.btn-secondary{background-color:#514943;color:#fff}.btn-secondary:hover{background-color:#5f564f;color:#fff}.btn-secondary:active,.btn-secondary:focus{background-color:#574e48;color:#fff}.ie9 .btn-secondary.disabled,.ie9 .btn-secondary[disabled]{background-color:#514943}.ie9 .btn-secondary.disabled:active,.ie9 .btn-secondary[disabled]:active{background-color:#514943;-webkit-filter:none;filter:none}[class*=btn-wrap-triangle]{overflow:hidden;position:relative}[class*=btn-wrap-triangle] .btn:after{border-style:solid;content:'';height:0;position:absolute;top:0;width:0}.btn-wrap-triangle-right{display:inline-block;padding-right:1.74rem;position:relative}.btn-wrap-triangle-right .btn{text-indent:.92rem}.btn-wrap-triangle-right .btn:after{border-color:transparent transparent transparent #e3e3e3;border-width:1.84rem 0 1.84rem 1.84rem;left:100%;margin-left:-1.74rem}.btn-wrap-triangle-right .btn:focus:after,.btn-wrap-triangle-right .btn:hover:after{border-left-color:#dbdbdb}.btn-wrap-triangle-right .btn:active:after{border-left-color:#d6d6d6}.btn-wrap-triangle-right .btn:not(.disabled):active,.btn-wrap-triangle-right .btn:not([disabled]):active{left:1px}.ie9 .btn-wrap-triangle-right .btn.disabled:after,.ie9 .btn-wrap-triangle-right .btn[disabled]:after{border-color:transparent transparent transparent #f0f0f0}.ie9 .btn-wrap-triangle-right .btn.disabled:active:after,.ie9 .btn-wrap-triangle-right .btn.disabled:focus:after,.ie9 .btn-wrap-triangle-right .btn.disabled:hover:after,.ie9 .btn-wrap-triangle-right .btn[disabled]:active:after,.ie9 .btn-wrap-triangle-right .btn[disabled]:focus:after,.ie9 .btn-wrap-triangle-right .btn[disabled]:hover:after{border-left-color:#f0f0f0}.btn-wrap-triangle-right .btn-prime:after{border-color:transparent transparent transparent #eb5202}.btn-wrap-triangle-right .btn-prime:focus:after,.btn-wrap-triangle-right .btn-prime:hover:after{border-left-color:#f65405}.btn-wrap-triangle-right .btn-prime:active:after{border-left-color:#e04f00}.btn-wrap-triangle-right .btn-prime:not(.disabled):active,.btn-wrap-triangle-right .btn-prime:not([disabled]):active{left:1px}.ie9 .btn-wrap-triangle-right .btn-prime.disabled:after,.ie9 .btn-wrap-triangle-right .btn-prime[disabled]:after{border-color:transparent transparent transparent #fd6e23}.ie9 .btn-wrap-triangle-right .btn-prime.disabled:active:after,.ie9 .btn-wrap-triangle-right .btn-prime.disabled:hover:after,.ie9 .btn-wrap-triangle-right .btn-prime[disabled]:active:after,.ie9 .btn-wrap-triangle-right .btn-prime[disabled]:hover:after{border-left-color:#fd6e23}.btn-wrap-triangle-left{display:inline-block;padding-left:1.74rem}.btn-wrap-triangle-left .btn{text-indent:-.92rem}.btn-wrap-triangle-left .btn:after{border-color:transparent #e3e3e3 transparent transparent;border-width:1.84rem 1.84rem 1.84rem 0;margin-right:-1.74rem;right:100%}.btn-wrap-triangle-left .btn:focus:after,.btn-wrap-triangle-left .btn:hover:after{border-right-color:#dbdbdb}.btn-wrap-triangle-left .btn:active:after{border-right-color:#d6d6d6}.btn-wrap-triangle-left .btn:not(.disabled):active,.btn-wrap-triangle-left .btn:not([disabled]):active{right:1px}.ie9 .btn-wrap-triangle-left .btn.disabled:after,.ie9 .btn-wrap-triangle-left .btn[disabled]:after{border-color:transparent #f0f0f0 transparent transparent}.ie9 .btn-wrap-triangle-left .btn.disabled:active:after,.ie9 .btn-wrap-triangle-left .btn.disabled:hover:after,.ie9 .btn-wrap-triangle-left .btn[disabled]:active:after,.ie9 .btn-wrap-triangle-left .btn[disabled]:hover:after{border-right-color:#f0f0f0}.btn-wrap-triangle-left .btn-prime:after{border-color:transparent #eb5202 transparent transparent}.btn-wrap-triangle-left .btn-prime:focus:after,.btn-wrap-triangle-left .btn-prime:hover:after{border-right-color:#e04f00}.btn-wrap-triangle-left .btn-prime:active:after{border-right-color:#f65405}.btn-wrap-triangle-left .btn-prime:not(.disabled):active,.btn-wrap-triangle-left .btn-prime:not([disabled]):active{right:1px}.ie9 .btn-wrap-triangle-left .btn-prime.disabled:after,.ie9 .btn-wrap-triangle-left .btn-prime[disabled]:after{border-color:transparent #fd6e23 transparent transparent}.ie9 .btn-wrap-triangle-left .btn-prime.disabled:active:after,.ie9 .btn-wrap-triangle-left .btn-prime.disabled:hover:after,.ie9 .btn-wrap-triangle-left .btn-prime[disabled]:active:after,.ie9 .btn-wrap-triangle-left .btn-prime[disabled]:hover:after{border-right-color:#fd6e23}.btn-expand{background-color:transparent;border:none;color:#303030;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;padding:0;position:relative}.btn-expand.expanded:after{border-color:transparent transparent #303030;border-width:0 .285em .36em}.btn-expand.expanded:hover:after{border-color:transparent transparent #3d3d3d}.btn-expand:hover{background-color:transparent;border:none;color:#3d3d3d}.btn-expand:hover:after{border-color:#3d3d3d transparent transparent}.btn-expand:after{border-color:#303030 transparent transparent;border-style:solid;border-width:.36em .285em 0;content:'';height:0;left:100%;margin-left:.5em;margin-top:-.18em;position:absolute;top:50%;width:0}[class*=col-] .form-el-input,[class*=col-] .form-el-select{width:100%}.form-fieldset{border:none;margin:0 0 1em;padding:0}.form-row{margin-bottom:2.2rem}.form-row .form-row{margin-bottom:.4rem}.form-row .form-label{display:block;font-weight:600;padding:.6rem 2.1em 0 0;text-align:right}.form-row .form-label.required{position:relative}.form-row .form-label.required:after{color:#eb5202;content:'*';font-size:1.15em;position:absolute;right:.7em;top:.5em}.form-row .form-el-checkbox+.form-label:before,.form-row .form-el-radio+.form-label:before{top:.7rem}.form-row .form-el-checkbox+.form-label:after,.form-row .form-el-radio+.form-label:after{top:1.1rem}.form-row.form-row-text{padding-top:.6rem}.form-row.form-row-text .action-sign-out{font-size:1.2rem;margin-left:1rem}.form-note{font-size:1.2rem;font-weight:600;margin-top:1rem}.form-el-dummy{display:none}.fieldset{border:0;margin:0;min-width:0;padding:0}input:not([disabled]):focus,textarea:not([disabled]):focus{box-shadow:none}.form-el-input{border:1px solid #adadad;color:#303030;padding:.35em .55em .5em}.form-el-input:hover{border-color:#949494}.form-el-input:focus{border-color:#008bdb}.form-el-input:required{box-shadow:none}.form-label{margin-bottom:.5em}[class*=form-label][for]{cursor:pointer}.form-el-insider-wrap{display:table;width:100%}.form-el-insider-input{display:table-cell;width:100%}.form-el-insider{border-radius:2px;display:table-cell;padding:.43em .55em .5em 0;vertical-align:top}.form-legend,.form-legend-expand,.form-legend-light{display:block;margin:0}.form-legend,.form-legend-expand{font-size:1.25em;font-weight:600;margin-bottom:2.5em;padding-top:1.5em}.form-legend{border-top:1px solid #ccc;width:100%}.form-legend-light{font-size:1em;margin-bottom:1.5em}.form-legend-expand{cursor:pointer;transition:opacity .2s linear}.form-legend-expand:hover{opacity:.85}.form-legend-expand.expanded:after{content:'\e615'}.form-legend-expand:after{content:'\e616';font-family:Icons;font-size:1.15em;font-weight:400;margin-left:.5em;vertical-align:sub}.form-el-checkbox.disabled+.form-label,.form-el-checkbox.disabled+.form-label:before,.form-el-checkbox[disabled]+.form-label,.form-el-checkbox[disabled]+.form-label:before,.form-el-radio.disabled+.form-label,.form-el-radio.disabled+.form-label:before,.form-el-radio[disabled]+.form-label,.form-el-radio[disabled]+.form-label:before{cursor:default;opacity:.5;pointer-events:none}.form-el-checkbox:not(.disabled)+.form-label:hover:before,.form-el-checkbox:not([disabled])+.form-label:hover:before,.form-el-radio:not(.disabled)+.form-label:hover:before,.form-el-radio:not([disabled])+.form-label:hover:before{border-color:#514943}.form-el-checkbox+.form-label,.form-el-radio+.form-label{font-weight:400;padding-left:2em;padding-right:0;position:relative;text-align:left;transition:border-color .1s linear}.form-el-checkbox+.form-label:before,.form-el-radio+.form-label:before{border:1px solid;content:'';left:0;position:absolute;top:.1rem;transition:border-color .1s linear}.form-el-checkbox+.form-label:before{background-color:#fff;border-color:#adadad;border-radius:2px;font-size:1.2rem;height:1.6rem;line-height:1.2;width:1.6rem}.form-el-checkbox:checked+.form-label::before{content:'\e62d';font-family:Icons}.form-el-radio+.form-label:before{background-color:#fff;border:1px solid #adadad;border-radius:100%;height:1.8rem;width:1.8rem}.form-el-radio+.form-label:after{background:0 0;border:.5rem solid transparent;border-radius:100%;content:'';height:0;left:.4rem;position:absolute;top:.5rem;transition:background .3s linear;width:0}.form-el-radio:checked+.form-label{cursor:default}.form-el-radio:checked+.form-label:after{border-color:#514943}.form-select-label{border:1px solid #adadad;color:#303030;cursor:pointer;display:block;overflow:hidden;position:relative;z-index:0}.form-select-label:hover,.form-select-label:hover:after{border-color:#949494}.form-select-label:active,.form-select-label:active:after,.form-select-label:focus,.form-select-label:focus:after{border-color:#008bdb}.form-select-label:after{background:#e3e3e3;border-left:1px solid #adadad;bottom:0;content:'';position:absolute;right:0;top:0;width:2.36em;z-index:-2}.ie9 .form-select-label:after{display:none}.form-select-label:before{border-color:#303030 transparent transparent;border-style:solid;border-width:5px 4px 0;content:'';height:0;margin-right:-4px;margin-top:-2.5px;position:absolute;right:1.18em;top:50%;width:0;z-index:-1}.ie9 .form-select-label:before{display:none}.form-select-label .form-el-select{background:0 0;border:none;border-radius:0;content:'';display:block;margin:0;padding:.35em calc(2.36em + 10%) .5em .55em;width:110%}.ie9 .form-select-label .form-el-select{padding-right:.55em;width:100%}.form-select-label .form-el-select::-ms-expand{display:none}.form-el-select{background:#fff;border:1px solid #adadad;border-radius:2px;color:#303030;display:block;padding:.35em .55em}.multiselect-custom{border:1px solid #adadad;height:45.2rem;margin:0 0 1.5rem;overflow:auto;position:relative}.multiselect-custom ul{margin:0;padding:0;list-style:none;min-width:29rem}.multiselect-custom .item{padding:1rem 1.4rem}.multiselect-custom .selected{background-color:#e0f6fe}.multiselect-custom .form-label{margin-bottom:0}[class*=form-el-].invalid{border-color:#e22626}[class*=form-el-].invalid+.error-container{display:block}.error-container{background-color:#fffbbb;border:1px solid #ee7d7d;color:#514943;display:none;font-size:1.19rem;margin-top:.2rem;padding:.8rem 1rem .9rem}.check-result-message{margin-left:.5em;min-height:3.68rem;-ms-align-items:center;-ms-flex-align:center;align-items:center;display:-ms-flexbox;display:flex}.check-result-text{margin-left:.5em}body:not([class]){min-width:0}.container{display:block;margin:0 auto 4rem;max-width:100rem;padding:0}.abs-action-delete,.action-close:before,.action-next:before,.action-previous:before,.admin-user .admin__action-dropdown:before,.admin__action-multiselect-dropdown:before,.admin__action-multiselect-search-label:before,.admin__control-checkbox+label:before,.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .action-delete:before,.admin__control-table .action-delete:before,.admin__current-filters-list .action-remove:before,.admin__data-grid-action-bookmarks .action-delete:before,.admin__data-grid-action-bookmarks .action-edit:before,.admin__data-grid-action-bookmarks .action-submit:before,.admin__data-grid-action-bookmarks .admin__action-dropdown:before,.admin__data-grid-action-columns .admin__action-dropdown:before,.admin__data-grid-action-export .admin__action-dropdown:before,.admin__field-fallback-reset:before,.admin__menu .level-0>a:before,.admin__page-nav-item-message .admin__page-nav-item-message-icon,.admin__page-nav-title._collapsible:after,.data-grid-filters-action-wrap .action-default:before,.data-grid-row-changed:after,.data-grid-row-parent>td .data-grid-checkbox-cell-inner:before,.data-grid-search-control-wrap .action-submit:before,.extensions-information .list .extension-delete,.icon-failed:before,.icon-success:before,.notifications-action:before,.notifications-close:before,.page-actions .page-actions-buttons>button.action-back:before,.page-actions .page-actions-buttons>button.back:before,.page-actions>button.action-back:before,.page-actions>button.back:before,.page-title-jumbo-success:before,.search-global-label:before,.selectmenu .action-delete:before,.selectmenu .action-edit:before,.selectmenu .action-save:before,.setup-home-item:before,.sticky-header .data-grid-search-control-wrap .data-grid-search-label:before,.store-switcher .dropdown-menu .dropdown-toolbar a:before,.tooltip .help a:before,.tooltip .help span:before{-webkit-font-smoothing:antialiased;font-family:Icons;font-style:normal;font-weight:400;line-height:1;speak:none}.text-stretch{margin-bottom:1.5em}.page-title-jumbo{font-size:4rem;font-weight:300;letter-spacing:-.05em;margin-bottom:2.9rem}.page-title-jumbo-success:before{color:#79a22e;content:'\e62d';font-size:3.9rem;margin-left:-.3rem;margin-right:2.4rem}.list{margin-bottom:3rem}.list-dot .list-item{display:list-item;list-style-position:inside;margin-bottom:1.2rem}.list-title{color:#333;font-size:1.4rem;font-weight:700;letter-spacing:.025em;margin-bottom:1.2rem}.list-item-failed:before,.list-item-success:before,.list-item-warning:before{font-family:Icons;font-size:1.6rem;top:0}.list-item-success:before{content:'\e62d';font-size:1.6rem}.list-item-failed:before{content:'\e632';font-size:1.4rem;left:.1rem;top:.2rem}.list-item-warning:before{content:'\e623';font-size:1.3rem;left:.2rem}.form-wrap{margin-bottom:3.6rem;padding-top:2.1rem}.form-el-label-horizontal{display:inline-block;font-size:1.3rem;font-weight:600;letter-spacing:.025em;margin-bottom:.4rem;margin-left:.4rem}.app-updater{min-width:768px}body._has-modal{height:100%;overflow:hidden;width:100%}.modals-overlay{z-index:899}.modal-popup,.modal-slide{bottom:0;min-width:0;position:fixed;right:0;top:0;visibility:hidden}.modal-popup._show,.modal-slide._show{visibility:visible}.modal-popup._show .modal-inner-wrap,.modal-slide._show .modal-inner-wrap{-ms-transform:translate(0,0);transform:translate(0,0)}.modal-popup .modal-inner-wrap,.modal-slide .modal-inner-wrap{background-color:#fff;box-shadow:0 0 12px 2px rgba(0,0,0,.35);opacity:1;pointer-events:auto}.modal-slide{left:14.8rem;z-index:900}.modal-slide._show .modal-inner-wrap{-ms-transform:translateX(0);transform:translateX(0)}.modal-slide .modal-inner-wrap{height:100%;overflow-y:auto;position:static;-ms-transform:translateX(100%);transform:translateX(100%);transition-duration:.3s;transition-property:transform,visibility;transition-timing-function:ease-in-out;width:auto}.modal-slide._inner-scroll .modal-inner-wrap{overflow-y:visible;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column}.modal-slide._inner-scroll .modal-footer,.modal-slide._inner-scroll .modal-header{-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-ms-flex-negative:0;flex-shrink:0}.modal-slide._inner-scroll .modal-content{overflow-y:auto}.modal-slide._inner-scroll .modal-footer{margin-top:auto}.modal-slide .modal-content,.modal-slide .modal-footer,.modal-slide .modal-header{padding:0 2.6rem 2.6rem}.modal-slide .modal-header{padding-bottom:2.1rem;padding-top:2.1rem}.modal-popup{z-index:900;left:0;overflow-y:auto}.modal-popup._show .modal-inner-wrap{-ms-transform:translateY(0);transform:translateY(0)}.modal-popup .modal-inner-wrap{margin:5rem auto;width:75%;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;box-sizing:border-box;height:auto;left:0;position:absolute;right:0;-ms-transform:translateY(-200%);transform:translateY(-200%);transition-duration:.2s;transition-property:transform,visibility;transition-timing-function:ease}.modal-popup._inner-scroll{overflow-y:visible}.ie10 .modal-popup._inner-scroll,.ie9 .modal-popup._inner-scroll{overflow-y:auto}.modal-popup._inner-scroll .modal-inner-wrap{max-height:90%}.ie10 .modal-popup._inner-scroll .modal-inner-wrap,.ie9 .modal-popup._inner-scroll .modal-inner-wrap{max-height:none}.modal-popup._inner-scroll .modal-content{overflow-y:auto}.modal-popup .modal-content,.modal-popup .modal-footer,.modal-popup .modal-header{padding-left:3rem;padding-right:3rem}.modal-popup .modal-footer,.modal-popup .modal-header{-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-ms-flex-negative:0;flex-shrink:0}.modal-popup .modal-header{padding-bottom:1.2rem;padding-top:3rem}.modal-popup .modal-footer{margin-top:auto;padding-bottom:3rem}.modal-popup .modal-footer-actions{text-align:right}.admin__action-dropdown-wrap{display:inline-block;position:relative}.admin__action-dropdown-wrap .admin__action-dropdown-text:after{left:-6px;right:0}.admin__action-dropdown-wrap .admin__action-dropdown-menu{left:auto;right:0}.admin__action-dropdown-wrap._active .admin__action-dropdown,.admin__action-dropdown-wrap.active .admin__action-dropdown{border-color:#007bdb;box-shadow:1px 1px 5px rgba(0,0,0,.5)}.admin__action-dropdown-wrap._active .admin__action-dropdown-text:after,.admin__action-dropdown-wrap.active .admin__action-dropdown-text:after{background-color:#fff;content:'';height:6px;position:absolute;top:100%}.admin__action-dropdown-wrap._active .admin__action-dropdown-menu,.admin__action-dropdown-wrap.active .admin__action-dropdown-menu{display:block}.admin__action-dropdown-wrap._disabled .admin__action-dropdown{cursor:default}.admin__action-dropdown-wrap._disabled:hover .admin__action-dropdown{color:#333}.admin__action-dropdown{background-color:#fff;border:1px solid transparent;border-bottom:none;border-radius:0;box-shadow:none;color:#333;display:inline-block;font-size:1.3rem;font-weight:400;letter-spacing:-.025em;padding:.7rem 3.3rem .8rem 1.5rem;position:relative;vertical-align:baseline;z-index:2}.admin__action-dropdown._active:after,.admin__action-dropdown.active:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.admin__action-dropdown:after{border-color:#000 transparent transparent;border-style:solid;border-width:.5rem .4rem 0;content:'';height:0;margin-top:-.2rem;position:absolute;top:50%;transition:all .2s linear;width:0}._active .admin__action-dropdown:after,.active .admin__action-dropdown:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.admin__action-dropdown:hover:after{border-color:#000 transparent transparent}.admin__action-dropdown:focus,.admin__action-dropdown:hover{background-color:#fff;color:#000;text-decoration:none}.admin__action-dropdown:after{right:1.5rem}.admin__action-dropdown:before{margin-right:1rem}.admin__action-dropdown-menu{background-color:#fff;border:1px solid #007bdb;box-shadow:1px 1px 5px rgba(0,0,0,.5);display:none;line-height:1.36;margin-top:-1px;min-width:120%;padding:.5rem 1rem;position:absolute;top:100%;transition:all .15s ease;z-index:1}.admin__action-dropdown-menu>li{display:block}.admin__action-dropdown-menu>li>a{color:#333;display:block;text-decoration:none;padding:.6rem .5rem}.selectmenu{display:inline-block;position:relative;text-align:left;z-index:1}.selectmenu._active{border-color:#007bdb;z-index:500}.selectmenu .action-delete,.selectmenu .action-edit,.selectmenu .action-save{background-color:transparent;border-color:transparent;box-shadow:none;padding:0 1rem}.selectmenu .action-delete:hover,.selectmenu .action-edit:hover,.selectmenu .action-save:hover{background-color:transparent;border-color:transparent;box-shadow:none}.selectmenu .action-delete:before,.selectmenu .action-edit:before,.selectmenu .action-save:before{content:'\e630'}.selectmenu .action-delete,.selectmenu .action-edit{border:0 solid #fff;border-left-width:1px;bottom:0;position:absolute;right:0;top:0;z-index:1}.selectmenu .action-delete:hover,.selectmenu .action-edit:hover{border:0 solid #fff;border-left-width:1px}.selectmenu .action-save:before{content:'\e625'}.selectmenu .action-edit:before{content:'\e631'}.selectmenu-value{display:inline-block}.selectmenu-value input[type=text]{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;appearance:none;border:0;display:inline;margin:0;width:6rem}body._keyfocus .selectmenu-value input[type=text]:focus{box-shadow:none}.selectmenu-toggle{padding-right:3rem;background:0 0;border-width:0;bottom:0;float:right;position:absolute;right:0;top:0;width:0}.selectmenu-toggle._active:after,.selectmenu-toggle.active:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.selectmenu-toggle:after{border-color:#000 transparent transparent;border-style:solid;border-width:.5rem .4rem 0;content:'';height:0;margin-top:-.2rem;position:absolute;right:1.1rem;top:50%;transition:all .2s linear;width:0}._active .selectmenu-toggle:after,.active .selectmenu-toggle:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.selectmenu-toggle:hover:after{border-color:#000 transparent transparent}.selectmenu-toggle:active,.selectmenu-toggle:focus,.selectmenu-toggle:hover{background:0 0}.selectmenu._active .selectmenu-toggle:before{border-color:#007bdb}body._keyfocus .selectmenu-toggle:focus{box-shadow:none}.selectmenu-toggle:before{background:#e3e3e3;border-left:1px solid #adadad;bottom:0;content:'';display:block;position:absolute;right:0;top:0;width:3.2rem}.selectmenu-items{background:#fff;border:1px solid #007bdb;box-shadow:1px 1px 5px rgba(0,0,0,.5);display:none;float:left;left:-1px;margin-top:3px;max-width:20rem;min-width:calc(100% + 2px);position:absolute;top:100%}.selectmenu-items._active{display:block}.selectmenu-items ul{float:left;list-style-type:none;margin:0;min-width:100%;padding:0}.selectmenu-items li{-webkit-flex-direction:row;display:flex;-ms-flex-direction:row;flex-direction:row;transition:background .2s linear}.selectmenu-items li:hover{background:#e3e3e3}.selectmenu-items li:last-child .selectmenu-item-action,.selectmenu-items li:last-child .selectmenu-item-action:visited{color:#008bdb;text-decoration:none}.selectmenu-items li:last-child .selectmenu-item-action:hover{color:#0fa7ff;text-decoration:underline}.selectmenu-items li:last-child .selectmenu-item-action:active{color:#ff5501;text-decoration:underline}.selectmenu-item{position:relative;width:100%;z-index:1}li._edit>.selectmenu-item{display:none}.selectmenu-item-edit{display:none;padding:.3rem 4rem .3rem .4rem;position:relative;white-space:nowrap;z-index:1}li:last-child .selectmenu-item-edit{padding-right:.4rem}.selectmenu-item-edit .admin__control-text{margin:0;width:5.4rem}li._edit .selectmenu-item-edit{display:block}.selectmenu-item-action{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;appearance:none;background:0 0;border:0;color:#333;display:block;font-size:1.4rem;font-weight:400;min-width:100%;padding:1rem 6rem 1rem 1.5rem;text-align:left;transition:background .2s linear;width:5rem}.selectmenu-item-action:focus,.selectmenu-item-action:hover{background:#e3e3e3}.abs-actions-split-xl .action-default,.page-actions .actions-split .action-default{margin-right:4rem}.abs-actions-split-xl .action-toggle,.page-actions .actions-split .action-toggle{padding-right:4rem}.abs-actions-split-xl .action-toggle:after,.page-actions .actions-split .action-toggle:after{border-width:.9rem .6rem 0;margin-top:-.3rem;right:1.4rem}.actions-split{position:relative;z-index:400}.actions-split._active,.actions-split.active,.actions-split:hover{box-shadow:0 0 0 1px #007bdb}.actions-split._active .action-toggle.action-primary,.actions-split._active .action-toggle.primary,.actions-split.active .action-toggle.action-primary,.actions-split.active .action-toggle.primary{background-color:#ba4000;border-color:#ba4000}.actions-split._active .dropdown-menu,.actions-split.active .dropdown-menu{opacity:1;visibility:visible;display:block}.actions-split .action-default,.actions-split .action-toggle{float:left;margin:0}.actions-split .action-default._active,.actions-split .action-default.active,.actions-split .action-default:hover,.actions-split .action-toggle._active,.actions-split .action-toggle.active,.actions-split .action-toggle:hover{box-shadow:none}.actions-split .action-default{margin-right:3.2rem;min-width:9.3rem}.actions-split .action-toggle{padding-right:3.2rem;border-left-color:rgba(0,0,0,.2);bottom:0;padding-left:0;position:absolute;right:0;top:0}.actions-split .action-toggle._active:after,.actions-split .action-toggle.active:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.actions-split .action-toggle:after{border-color:#000 transparent transparent;border-style:solid;border-width:.5rem .4rem 0;content:'';height:0;margin-top:-.2rem;position:absolute;right:1.2rem;top:50%;transition:all .2s linear;width:0}._active .actions-split .action-toggle:after,.active .actions-split .action-toggle:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.actions-split .action-toggle:hover:after{border-color:#000 transparent transparent}.actions-split .action-toggle.action-primary:after,.actions-split .action-toggle.action-secondary:after,.actions-split .action-toggle.primary:after,.actions-split .action-toggle.secondary:after{border-color:#fff transparent transparent}.actions-split .action-toggle>span{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.action-select-wrap{display:inline-block;position:relative}.action-select-wrap .action-select{padding-right:3.2rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;background-color:#fff;font-weight:400;text-align:left}.action-select-wrap .action-select._active:after,.action-select-wrap .action-select.active:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.action-select-wrap .action-select:after{border-color:#000 transparent transparent;border-style:solid;border-width:.5rem .4rem 0;content:'';height:0;margin-top:-.2rem;position:absolute;right:1.2rem;top:50%;transition:all .2s linear;width:0}._active .action-select-wrap .action-select:after,.active .action-select-wrap .action-select:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.action-select-wrap .action-select:hover:after{border-color:#000 transparent transparent}.action-select-wrap .action-select:hover,.action-select-wrap .action-select:hover:before{border-color:#878787}.action-select-wrap .action-select:before{background-color:#e3e3e3;border:1px solid #adadad;bottom:0;content:'';position:absolute;right:0;top:0;width:3.2rem}.action-select-wrap .action-select._active{border-color:#007bdb}.action-select-wrap .action-select._active:before{border-color:#007bdb #007bdb #007bdb #adadad}.action-select-wrap .action-select[disabled]{color:#333}.action-select-wrap .action-select[disabled]:after{border-color:#333 transparent transparent}.action-select-wrap._active{z-index:500}.action-select-wrap._active .action-select,.action-select-wrap._active .action-select:before{border-color:#007bdb}.action-select-wrap._active .action-select:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.action-select-wrap .abs-action-menu .action-submenu,.action-select-wrap .abs-action-menu .action-submenu .action-submenu,.action-select-wrap .action-menu,.action-select-wrap .action-menu .action-submenu,.action-select-wrap .actions-split .action-menu .action-submenu,.action-select-wrap .actions-split .action-menu .action-submenu .action-submenu,.action-select-wrap .actions-split .dropdown-menu .action-submenu,.action-select-wrap .actions-split .dropdown-menu .action-submenu .action-submenu{max-height:45rem;overflow-y:auto}.action-select-wrap .abs-action-menu .action-submenu ._disabled:hover,.action-select-wrap .abs-action-menu .action-submenu .action-submenu ._disabled:hover,.action-select-wrap .action-menu ._disabled:hover,.action-select-wrap .action-menu .action-submenu ._disabled:hover,.action-select-wrap .actions-split .action-menu .action-submenu ._disabled:hover,.action-select-wrap .actions-split .action-menu .action-submenu .action-submenu ._disabled:hover,.action-select-wrap .actions-split .dropdown-menu .action-submenu ._disabled:hover,.action-select-wrap .actions-split .dropdown-menu .action-submenu .action-submenu ._disabled:hover{background:#fff}.action-select-wrap .abs-action-menu .action-submenu ._disabled .action-menu-item,.action-select-wrap .abs-action-menu .action-submenu .action-submenu ._disabled .action-menu-item,.action-select-wrap .action-menu ._disabled .action-menu-item,.action-select-wrap .action-menu .action-submenu ._disabled .action-menu-item,.action-select-wrap .actions-split .action-menu .action-submenu ._disabled .action-menu-item,.action-select-wrap .actions-split .action-menu .action-submenu .action-submenu ._disabled .action-menu-item,.action-select-wrap .actions-split .dropdown-menu .action-submenu ._disabled .action-menu-item,.action-select-wrap .actions-split .dropdown-menu .action-submenu .action-submenu ._disabled .action-menu-item{cursor:default;opacity:.5}.action-select-wrap .action-menu-items{left:0;position:absolute;right:0;top:100%}.action-select-wrap .action-menu-items>.abs-action-menu .action-submenu,.action-select-wrap .action-menu-items>.abs-action-menu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.action-menu,.action-select-wrap .action-menu-items>.action-menu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .action-menu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .action-menu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .dropdown-menu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .dropdown-menu .action-submenu .action-submenu{min-width:100%;position:static}.action-select-wrap .action-menu-items>.abs-action-menu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.abs-action-menu .action-submenu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.action-menu .action-submenu,.action-select-wrap .action-menu-items>.action-menu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .action-menu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .action-menu .action-submenu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .dropdown-menu .action-submenu .action-submenu,.action-select-wrap .action-menu-items>.actions-split .dropdown-menu .action-submenu .action-submenu .action-submenu{position:absolute}.action-multicheck-wrap{display:inline-block;height:1.6rem;padding-top:1px;position:relative;width:3.1rem;z-index:200}.action-multicheck-wrap:hover .action-multicheck-toggle,.action-multicheck-wrap:hover .admin__control-checkbox+label:before{border-color:#878787}.action-multicheck-wrap._active .action-multicheck-toggle,.action-multicheck-wrap._active .admin__control-checkbox+label:before{border-color:#007bdb}.action-multicheck-wrap._active .abs-action-menu .action-submenu,.action-multicheck-wrap._active .abs-action-menu .action-submenu .action-submenu,.action-multicheck-wrap._active .action-menu,.action-multicheck-wrap._active .action-menu .action-submenu,.action-multicheck-wrap._active .actions-split .action-menu .action-submenu,.action-multicheck-wrap._active .actions-split .action-menu .action-submenu .action-submenu,.action-multicheck-wrap._active .actions-split .dropdown-menu .action-submenu,.action-multicheck-wrap._active .actions-split .dropdown-menu .action-submenu .action-submenu{opacity:1;visibility:visible;display:block}.action-multicheck-wrap._disabled .admin__control-checkbox+label:before{background-color:#fff}.action-multicheck-wrap._disabled .action-multicheck-toggle,.action-multicheck-wrap._disabled .admin__control-checkbox+label:before{border-color:#adadad;opacity:1}.action-multicheck-wrap .action-multicheck-toggle,.action-multicheck-wrap .admin__control-checkbox,.action-multicheck-wrap .admin__control-checkbox+label{float:left}.action-multicheck-wrap .action-multicheck-toggle{border-radius:0 1px 1px 0;height:1.6rem;margin-left:-1px;padding:0;position:relative;transition:border-color .1s linear;width:1.6rem}.action-multicheck-wrap .action-multicheck-toggle._active:after,.action-multicheck-wrap .action-multicheck-toggle.active:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.action-multicheck-wrap .action-multicheck-toggle:after{border-color:#000 transparent transparent;border-style:solid;border-width:.5rem .4rem 0;content:'';height:0;margin-top:-.2rem;position:absolute;top:50%;transition:all .2s linear;width:0}._active .action-multicheck-wrap .action-multicheck-toggle:after,.active .action-multicheck-wrap .action-multicheck-toggle:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.action-multicheck-wrap .action-multicheck-toggle:hover:after{border-color:#000 transparent transparent}.action-multicheck-wrap .action-multicheck-toggle:focus{border-color:#007bdb}.action-multicheck-wrap .action-multicheck-toggle:after{right:.3rem}.action-multicheck-wrap .abs-action-menu .action-submenu,.action-multicheck-wrap .abs-action-menu .action-submenu .action-submenu,.action-multicheck-wrap .action-menu,.action-multicheck-wrap .action-menu .action-submenu,.action-multicheck-wrap .actions-split .action-menu .action-submenu,.action-multicheck-wrap .actions-split .action-menu .action-submenu .action-submenu,.action-multicheck-wrap .actions-split .dropdown-menu .action-submenu,.action-multicheck-wrap .actions-split .dropdown-menu .action-submenu .action-submenu{left:-1.1rem;margin-top:1px;right:auto;text-align:left}.action-multicheck-wrap .action-menu-item{white-space:nowrap}.admin__action-multiselect-wrap{display:block;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.admin__action-multiselect-wrap.action-select-wrap:focus{box-shadow:none}.admin__action-multiselect-wrap.action-select-wrap .abs-action-menu .action-submenu,.admin__action-multiselect-wrap.action-select-wrap .abs-action-menu .action-submenu .action-submenu,.admin__action-multiselect-wrap.action-select-wrap .action-menu,.admin__action-multiselect-wrap.action-select-wrap .action-menu .action-submenu,.admin__action-multiselect-wrap.action-select-wrap .actions-split .action-menu .action-submenu,.admin__action-multiselect-wrap.action-select-wrap .actions-split .action-menu .action-submenu .action-submenu,.admin__action-multiselect-wrap.action-select-wrap .actions-split .dropdown-menu .action-submenu,.admin__action-multiselect-wrap.action-select-wrap .actions-split .dropdown-menu .action-submenu .action-submenu{max-height:none;overflow-y:inherit}.admin__action-multiselect-wrap .action-menu-item{transition:background-color .1s linear}.admin__action-multiselect-wrap .action-menu-item._selected{background-color:#e0f6fe}.admin__action-multiselect-wrap .action-menu-item._hover{background-color:#e3e3e3}.admin__action-multiselect-wrap .action-menu-item._unclickable{cursor:default}.admin__action-multiselect-wrap .admin__action-multiselect{border:1px solid #adadad;cursor:pointer;display:block;min-height:3.2rem;padding-right:3.6rem;white-space:normal}.admin__action-multiselect-wrap .admin__action-multiselect:after{bottom:1.25rem;top:auto}.admin__action-multiselect-wrap .admin__action-multiselect:before{height:3.3rem;top:auto}.admin__control-table-wrapper .admin__action-multiselect-wrap{position:static}.admin__control-table-wrapper .admin__action-multiselect-wrap .admin__action-multiselect{position:relative}.admin__control-table-wrapper .admin__action-multiselect-wrap .admin__action-multiselect:before{right:-1px;top:-1px}.admin__control-table-wrapper .admin__action-multiselect-wrap .abs-action-menu .action-submenu,.admin__control-table-wrapper .admin__action-multiselect-wrap .abs-action-menu .action-submenu .action-submenu,.admin__control-table-wrapper .admin__action-multiselect-wrap .action-menu,.admin__control-table-wrapper .admin__action-multiselect-wrap .action-menu .action-submenu,.admin__control-table-wrapper .admin__action-multiselect-wrap .actions-split .action-menu .action-submenu,.admin__control-table-wrapper .admin__action-multiselect-wrap .actions-split .action-menu .action-submenu .action-submenu,.admin__control-table-wrapper .admin__action-multiselect-wrap .actions-split .dropdown-menu .action-submenu,.admin__control-table-wrapper .admin__action-multiselect-wrap .actions-split .dropdown-menu .action-submenu .action-submenu{left:auto;min-width:34rem;right:auto;top:auto;z-index:1}.admin__action-multiselect-wrap .admin__action-multiselect-item-path{color:#a79d95;font-size:1.2rem;font-weight:400;padding-left:1rem}.admin__action-multiselect-actions-wrap{border-top:1px solid #e3e3e3;margin:0 1rem;padding:1rem 0;text-align:center}.admin__action-multiselect-actions-wrap .action-default{font-size:1.3rem;min-width:13rem}.admin__action-multiselect-text{padding:.6rem 1rem}.abs-action-menu .action-submenu,.abs-action-menu .action-submenu .action-submenu,.action-menu,.action-menu .action-submenu,.actions-split .action-menu .action-submenu,.actions-split .action-menu .action-submenu .action-submenu,.actions-split .dropdown-menu .action-submenu,.actions-split .dropdown-menu .action-submenu .action-submenu{text-align:left}.admin__action-multiselect-label{cursor:pointer;position:relative;z-index:1}.admin__action-multiselect-label:before{margin-right:.5rem}._unclickable .admin__action-multiselect-label{cursor:default;font-weight:700}.admin__action-multiselect-search-wrap{border-bottom:1px solid #e3e3e3;margin:0 1rem;padding:1rem 0;position:relative}.admin__action-multiselect-search{padding-right:3rem;width:100%}.admin__action-multiselect-search-label{display:block;font-size:1.5rem;height:1em;overflow:hidden;position:absolute;right:2.2rem;top:1.7rem;width:1em}.admin__action-multiselect-search-label:before{content:'\e60c'}.admin__action-multiselect-search-count{color:#a79d95;margin-top:1rem}.admin__action-multiselect-menu-inner{margin-bottom:0;max-height:46rem;overflow-y:auto}.admin__action-multiselect-menu-inner .admin__action-multiselect-menu-inner{list-style:none;max-height:none;overflow:hidden;padding-left:2.2rem}.admin__action-multiselect-menu-inner ._hidden{display:none}.admin__action-multiselect-crumb{background-color:#f5f5f5;border:1px solid #a79d95;border-radius:1px;display:inline-block;font-size:1.2rem;margin:.3rem -4px .3rem .3rem;padding:.3rem 2.4rem .4rem 1rem;position:relative;transition:border-color .1s linear}.admin__action-multiselect-crumb:hover{border-color:#908379}.admin__action-multiselect-crumb .action-close{bottom:0;font-size:.5em;position:absolute;right:0;top:0;width:2rem}.admin__action-multiselect-crumb .action-close:hover{color:#000}.admin__action-multiselect-crumb .action-close:active,.admin__action-multiselect-crumb .action-close:focus{background-color:transparent}.admin__action-multiselect-crumb .action-close:active{-ms-transform:scale(0.9);transform:scale(0.9)}.admin__action-multiselect-tree .abs-action-menu .action-submenu,.admin__action-multiselect-tree .abs-action-menu .action-submenu .action-submenu,.admin__action-multiselect-tree .action-menu,.admin__action-multiselect-tree .action-menu .action-submenu,.admin__action-multiselect-tree .actions-split .action-menu .action-submenu,.admin__action-multiselect-tree .actions-split .action-menu .action-submenu .action-submenu,.admin__action-multiselect-tree .actions-split .dropdown-menu .action-submenu,.admin__action-multiselect-tree .actions-split .dropdown-menu .action-submenu .action-submenu{min-width:34.7rem}.admin__action-multiselect-tree .abs-action-menu .action-submenu .action-menu-item,.admin__action-multiselect-tree .abs-action-menu .action-submenu .action-submenu .action-menu-item,.admin__action-multiselect-tree .action-menu .action-menu-item,.admin__action-multiselect-tree .action-menu .action-submenu .action-menu-item,.admin__action-multiselect-tree .actions-split .action-menu .action-submenu .action-menu-item,.admin__action-multiselect-tree .actions-split .action-menu .action-submenu .action-submenu .action-menu-item,.admin__action-multiselect-tree .actions-split .dropdown-menu .action-submenu .action-menu-item,.admin__action-multiselect-tree .actions-split .dropdown-menu .action-submenu .action-submenu .action-menu-item{margin-top:.1rem}.admin__action-multiselect-tree .action-menu-item{margin-left:4.2rem;position:relative}.admin__action-multiselect-tree .action-menu-item._expended:before{border-left:1px dashed #a79d95;bottom:0;content:'';left:-1rem;position:absolute;top:1rem;width:1px}.admin__action-multiselect-tree .action-menu-item._expended .admin__action-multiselect-dropdown:before{content:'\e615'}.admin__action-multiselect-tree .action-menu-item._with-checkbox .admin__action-multiselect-label{padding-left:2.6rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner{position:relative}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner .admin__action-multiselect-menu-inner{padding-left:3.2rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner .admin__action-multiselect-menu-inner:before{left:4.3rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item{position:relative}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item:last-child:before{height:2.1rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item:after,.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item:before{content:'';left:0;position:absolute}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item:after{border-top:1px dashed #a79d95;height:1px;top:2.1rem;width:5.2rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item:before{border-left:1px dashed #a79d95;height:100%;top:0;width:1px}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._parent:after{width:4.2rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._root{margin-left:-1rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._root:after{left:3.2rem;width:2.2rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._root:before{left:3.2rem;top:1rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._root._parent:after{display:none}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._root:first-child:before{top:2.1rem}.admin__action-multiselect-tree .admin__action-multiselect-menu-inner-item._root:last-child:before{height:1rem}.admin__action-multiselect-tree .admin__action-multiselect-label{line-height:2.2rem;vertical-align:middle;word-break:break-all}.admin__action-multiselect-tree .admin__action-multiselect-label:before{left:0;position:absolute;top:.4rem}.admin__action-multiselect-dropdown{border-radius:50%;height:2.2rem;left:-2.2rem;position:absolute;top:1rem;width:2.2rem;z-index:1}.admin__action-multiselect-dropdown:before{background:#fff;color:#a79d95;content:'\e616';font-size:2.2rem}.admin__actions-switch{display:inline-block;position:relative;vertical-align:middle}.admin__field-control .admin__actions-switch{line-height:3.2rem}.admin__actions-switch+.admin__field-service{min-width:34rem}._disabled .admin__actions-switch-checkbox+.admin__actions-switch-label,.admin__actions-switch-checkbox.disabled+.admin__actions-switch-label{cursor:not-allowed;opacity:.5;pointer-events:none}.admin__actions-switch-checkbox:checked+.admin__actions-switch-label:before{left:15px}.admin__actions-switch-checkbox:checked+.admin__actions-switch-label:after{background:#79a22e}.admin__actions-switch-checkbox:checked+.admin__actions-switch-label .admin__actions-switch-text:before{content:attr(data-text-on)}.admin__actions-switch-checkbox:focus+.admin__actions-switch-label:after,.admin__actions-switch-checkbox:focus+.admin__actions-switch-label:before{border-color:#007bdb}._error .admin__actions-switch-checkbox+.admin__actions-switch-label:after,._error .admin__actions-switch-checkbox+.admin__actions-switch-label:before{border-color:#e22626}.admin__actions-switch-label{cursor:pointer;display:inline-block;height:22px;line-height:22px;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:middle}.admin__actions-switch-label:after,.admin__actions-switch-label:before{left:0;position:absolute;right:auto;top:0}.admin__actions-switch-label:before{background:#fff;border:1px solid #aaa6a0;border-radius:100%;content:'';display:block;height:22px;transition:left .2s ease-in 0s;width:22px;z-index:1}.admin__actions-switch-label:after{background:#e3e3e3;border:1px solid #aaa6a0;border-radius:12px;content:'';display:block;height:22px;transition:background .2s ease-in 0s;vertical-align:middle;width:37px;z-index:0}.admin__actions-switch-text:before{content:attr(data-text-off);padding-left:47px;white-space:nowrap}.abs-action-delete,.abs-action-reset,.action-close,.admin__field-fallback-reset,.extensions-information .list .extension-delete,.notifications-close,.search-global-field._active .search-global-action{background-color:transparent;border:none;border-radius:0;box-shadow:none;margin:0;padding:0}.abs-action-delete:hover,.abs-action-reset:hover,.action-close:hover,.admin__field-fallback-reset:hover,.extensions-information .list .extension-delete:hover,.notifications-close:hover,.search-global-field._active .search-global-action:hover{background-color:transparent;border:none;box-shadow:none}.abs-action-default,.abs-action-pattern,.abs-action-primary,.abs-action-quaternary,.abs-action-secondary,.abs-action-tertiary,.action-default,.action-primary,.action-quaternary,.action-secondary,.action-tertiary,.modal-popup .modal-footer .action-primary,.modal-popup .modal-footer .action-secondary,.page-actions .page-actions-buttons>button,.page-actions .page-actions-buttons>button.action-primary,.page-actions .page-actions-buttons>button.action-secondary,.page-actions .page-actions-buttons>button.primary,.page-actions>button,.page-actions>button.action-primary,.page-actions>button.action-secondary,.page-actions>button.primary,button,button.primary,button.secondary,button.tertiary{border:1px solid;border-radius:0;display:inline-block;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:600;line-height:1.36;padding:.6rem 1em;text-align:center;vertical-align:baseline}.abs-action-default.disabled,.abs-action-default[disabled],.abs-action-pattern.disabled,.abs-action-pattern[disabled],.abs-action-primary.disabled,.abs-action-primary[disabled],.abs-action-quaternary.disabled,.abs-action-quaternary[disabled],.abs-action-secondary.disabled,.abs-action-secondary[disabled],.abs-action-tertiary.disabled,.abs-action-tertiary[disabled],.action-default.disabled,.action-default[disabled],.action-primary.disabled,.action-primary[disabled],.action-quaternary.disabled,.action-quaternary[disabled],.action-secondary.disabled,.action-secondary[disabled],.action-tertiary.disabled,.action-tertiary[disabled],.modal-popup .modal-footer .action-primary.disabled,.modal-popup .modal-footer .action-primary[disabled],.modal-popup .modal-footer .action-secondary.disabled,.modal-popup .modal-footer .action-secondary[disabled],.page-actions .page-actions-buttons>button.action-primary.disabled,.page-actions .page-actions-buttons>button.action-primary[disabled],.page-actions .page-actions-buttons>button.action-secondary.disabled,.page-actions .page-actions-buttons>button.action-secondary[disabled],.page-actions .page-actions-buttons>button.disabled,.page-actions .page-actions-buttons>button.primary.disabled,.page-actions .page-actions-buttons>button.primary[disabled],.page-actions .page-actions-buttons>button[disabled],.page-actions>button.action-primary.disabled,.page-actions>button.action-primary[disabled],.page-actions>button.action-secondary.disabled,.page-actions>button.action-secondary[disabled],.page-actions>button.disabled,.page-actions>button.primary.disabled,.page-actions>button.primary[disabled],.page-actions>button[disabled],button.disabled,button.primary.disabled,button.primary[disabled],button.secondary.disabled,button.secondary[disabled],button.tertiary.disabled,button.tertiary[disabled],button[disabled]{cursor:default;opacity:.5;pointer-events:none}.abs-action-l,.modal-popup .modal-footer .action-primary,.modal-popup .modal-footer .action-secondary,.page-actions .page-actions-buttons>button,.page-actions .page-actions-buttons>button.action-primary,.page-actions .page-actions-buttons>button.action-secondary,.page-actions .page-actions-buttons>button.primary,.page-actions button,.page-actions>button.action-primary,.page-actions>button.action-secondary,.page-actions>button.primary{font-size:1.6rem;letter-spacing:.025em;padding-bottom:.6875em;padding-top:.6875em}.abs-action-delete,.extensions-information .list .extension-delete{display:inline-block;font-size:1.6rem;margin-left:1.2rem;padding-top:.7rem;text-decoration:none;vertical-align:middle}.abs-action-delete:after,.extensions-information .list .extension-delete:after{color:#666;content:'\e630'}.abs-action-delete:hover:after,.extensions-information .list .extension-delete:hover:after{color:#35302c}.abs-action-button-as-link,.action-advanced,.data-grid .action-delete{line-height:1.36;padding:0;color:#008bdb;text-decoration:none;background:0 0;border:0;display:inline;font-weight:400;border-radius:0}.abs-action-button-as-link:visited,.action-advanced:visited,.data-grid .action-delete:visited{color:#008bdb;text-decoration:none}.abs-action-button-as-link:hover,.action-advanced:hover,.data-grid .action-delete:hover{text-decoration:underline}.abs-action-button-as-link:active,.action-advanced:active,.data-grid .action-delete:active{color:#ff5501;text-decoration:underline}.abs-action-button-as-link:hover,.action-advanced:hover,.data-grid .action-delete:hover{color:#0fa7ff}.abs-action-button-as-link:active,.abs-action-button-as-link:focus,.abs-action-button-as-link:hover,.action-advanced:active,.action-advanced:focus,.action-advanced:hover,.data-grid .action-delete:active,.data-grid .action-delete:focus,.data-grid .action-delete:hover{background:0 0;border:0}.abs-action-button-as-link.disabled,.abs-action-button-as-link[disabled],.action-advanced.disabled,.action-advanced[disabled],.data-grid .action-delete.disabled,.data-grid .action-delete[disabled],fieldset[disabled] .abs-action-button-as-link,fieldset[disabled] .action-advanced,fieldset[disabled] .data-grid .action-delete{color:#008bdb;opacity:.5;cursor:default;pointer-events:none;text-decoration:underline}.abs-action-button-as-link:active,.abs-action-button-as-link:not(:focus),.action-advanced:active,.action-advanced:not(:focus),.data-grid .action-delete:active,.data-grid .action-delete:not(:focus){box-shadow:none}.abs-action-button-as-link:focus,.action-advanced:focus,.data-grid .action-delete:focus{color:#0fa7ff}.abs-action-default,button{background:#e3e3e3;border-color:#adadad;color:#514943}.abs-action-default:active,.abs-action-default:focus,.abs-action-default:hover,button:active,button:focus,button:hover{background-color:#dbdbdb;color:#514943;text-decoration:none}.abs-action-primary,.page-actions .page-actions-buttons>button.action-primary,.page-actions .page-actions-buttons>button.primary,.page-actions>button.action-primary,.page-actions>button.primary,button.primary{background-color:#eb5202;border-color:#eb5202;color:#fff;text-shadow:1px 1px 0 rgba(0,0,0,.25)}.abs-action-primary:active,.abs-action-primary:focus,.abs-action-primary:hover,.page-actions .page-actions-buttons>button.action-primary:active,.page-actions .page-actions-buttons>button.action-primary:focus,.page-actions .page-actions-buttons>button.action-primary:hover,.page-actions .page-actions-buttons>button.primary:active,.page-actions .page-actions-buttons>button.primary:focus,.page-actions .page-actions-buttons>button.primary:hover,.page-actions>button.action-primary:active,.page-actions>button.action-primary:focus,.page-actions>button.action-primary:hover,.page-actions>button.primary:active,.page-actions>button.primary:focus,.page-actions>button.primary:hover,button.primary:active,button.primary:focus,button.primary:hover{background-color:#ba4000;border-color:#b84002;box-shadow:0 0 0 1px #007bdb;color:#fff;text-decoration:none}.abs-action-primary.disabled,.abs-action-primary[disabled],.page-actions .page-actions-buttons>button.action-primary.disabled,.page-actions .page-actions-buttons>button.action-primary[disabled],.page-actions .page-actions-buttons>button.primary.disabled,.page-actions .page-actions-buttons>button.primary[disabled],.page-actions>button.action-primary.disabled,.page-actions>button.action-primary[disabled],.page-actions>button.primary.disabled,.page-actions>button.primary[disabled],button.primary.disabled,button.primary[disabled]{cursor:default;opacity:.5;pointer-events:none}.abs-action-secondary,.modal-popup .modal-footer .action-primary,.page-actions .page-actions-buttons>button.action-secondary,.page-actions>button.action-secondary,button.secondary{background-color:#514943;border-color:#514943;color:#fff;text-shadow:1px 1px 1px rgba(0,0,0,.3)}.abs-action-secondary:active,.abs-action-secondary:focus,.abs-action-secondary:hover,.modal-popup .modal-footer .action-primary:active,.modal-popup .modal-footer .action-primary:focus,.modal-popup .modal-footer .action-primary:hover,.page-actions .page-actions-buttons>button.action-secondary:active,.page-actions .page-actions-buttons>button.action-secondary:focus,.page-actions .page-actions-buttons>button.action-secondary:hover,.page-actions>button.action-secondary:active,.page-actions>button.action-secondary:focus,.page-actions>button.action-secondary:hover,button.secondary:active,button.secondary:focus,button.secondary:hover{background-color:#35302c;border-color:#35302c;box-shadow:0 0 0 1px #007bdb;color:#fff;text-decoration:none}.abs-action-secondary:active,.modal-popup .modal-footer .action-primary:active,.page-actions .page-actions-buttons>button.action-secondary:active,.page-actions>button.action-secondary:active,button.secondary:active{background-color:#35302c}.abs-action-tertiary,.modal-popup .modal-footer .action-secondary,button.tertiary{background-color:transparent;border-color:transparent;text-shadow:none;color:#008bdb}.abs-action-tertiary:active,.abs-action-tertiary:focus,.abs-action-tertiary:hover,.modal-popup .modal-footer .action-secondary:active,.modal-popup .modal-footer .action-secondary:focus,.modal-popup .modal-footer .action-secondary:hover,button.tertiary:active,button.tertiary:focus,button.tertiary:hover{background-color:transparent;border-color:transparent;box-shadow:none;color:#0fa7ff;text-decoration:underline}.abs-action-quaternary,.page-actions .page-actions-buttons>button,.page-actions>button{background-color:transparent;border-color:transparent;text-shadow:none;color:#333}.abs-action-quaternary:active,.abs-action-quaternary:focus,.abs-action-quaternary:hover,.page-actions .page-actions-buttons>button:active,.page-actions .page-actions-buttons>button:focus,.page-actions .page-actions-buttons>button:hover,.page-actions>button:active,.page-actions>button:focus,.page-actions>button:hover{background-color:transparent;border-color:transparent;box-shadow:none;color:#1a1a1a}.abs-action-menu,.actions-split .abs-action-menu .action-submenu,.actions-split .abs-action-menu .action-submenu .action-submenu,.actions-split .action-menu,.actions-split .action-menu .action-submenu,.actions-split .actions-split .dropdown-menu .action-submenu,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu,.actions-split .dropdown-menu{text-align:left;background-color:#fff;border:1px solid #007bdb;border-radius:1px;box-shadow:1px 1px 5px rgba(0,0,0,.5);color:#333;display:none;font-weight:400;left:0;list-style:none;margin:2px 0 0;min-width:0;padding:0;position:absolute;right:0;top:100%}.abs-action-menu._active,.actions-split .abs-action-menu .action-submenu .action-submenu._active,.actions-split .abs-action-menu .action-submenu._active,.actions-split .action-menu .action-submenu._active,.actions-split .action-menu._active,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu._active,.actions-split .actions-split .dropdown-menu .action-submenu._active,.actions-split .dropdown-menu._active{display:block}.abs-action-menu>li,.actions-split .abs-action-menu .action-submenu .action-submenu>li,.actions-split .abs-action-menu .action-submenu>li,.actions-split .action-menu .action-submenu>li,.actions-split .action-menu>li,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li,.actions-split .actions-split .dropdown-menu .action-submenu>li,.actions-split .dropdown-menu>li{border:none;display:block;padding:0;transition:background-color .1s linear}.abs-action-menu>li>a:hover,.actions-split .abs-action-menu .action-submenu .action-submenu>li>a:hover,.actions-split .abs-action-menu .action-submenu>li>a:hover,.actions-split .action-menu .action-submenu>li>a:hover,.actions-split .action-menu>li>a:hover,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li>a:hover,.actions-split .actions-split .dropdown-menu .action-submenu>li>a:hover,.actions-split .dropdown-menu>li>a:hover{text-decoration:none}.abs-action-menu>li._visible,.abs-action-menu>li:hover,.actions-split .abs-action-menu .action-submenu .action-submenu>li._visible,.actions-split .abs-action-menu .action-submenu .action-submenu>li:hover,.actions-split .abs-action-menu .action-submenu>li._visible,.actions-split .abs-action-menu .action-submenu>li:hover,.actions-split .action-menu .action-submenu>li._visible,.actions-split .action-menu .action-submenu>li:hover,.actions-split .action-menu>li._visible,.actions-split .action-menu>li:hover,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li._visible,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li:hover,.actions-split .actions-split .dropdown-menu .action-submenu>li._visible,.actions-split .actions-split .dropdown-menu .action-submenu>li:hover,.actions-split .dropdown-menu>li._visible,.actions-split .dropdown-menu>li:hover{background-color:#e3e3e3}.abs-action-menu>li:active,.actions-split .abs-action-menu .action-submenu .action-submenu>li:active,.actions-split .abs-action-menu .action-submenu>li:active,.actions-split .action-menu .action-submenu>li:active,.actions-split .action-menu>li:active,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li:active,.actions-split .actions-split .dropdown-menu .action-submenu>li:active,.actions-split .dropdown-menu>li:active{background-color:#cacaca}.abs-action-menu>li._parent,.actions-split .abs-action-menu .action-submenu .action-submenu>li._parent,.actions-split .abs-action-menu .action-submenu>li._parent,.actions-split .action-menu .action-submenu>li._parent,.actions-split .action-menu>li._parent,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li._parent,.actions-split .actions-split .dropdown-menu .action-submenu>li._parent,.actions-split .dropdown-menu>li._parent{-webkit-flex-direction:row;display:flex;-ms-flex-direction:row;flex-direction:row}.abs-action-menu>li._parent>.action-menu-item,.actions-split .abs-action-menu .action-submenu .action-submenu>li._parent>.action-menu-item,.actions-split .abs-action-menu .action-submenu>li._parent>.action-menu-item,.actions-split .action-menu .action-submenu>li._parent>.action-menu-item,.actions-split .action-menu>li._parent>.action-menu-item,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu>li._parent>.action-menu-item,.actions-split .actions-split .dropdown-menu .action-submenu>li._parent>.action-menu-item,.actions-split .dropdown-menu>li._parent>.action-menu-item{min-width:100%}.abs-action-menu .action-menu-item,.abs-action-menu .item,.actions-split .abs-action-menu .action-submenu .action-menu-item,.actions-split .abs-action-menu .action-submenu .action-submenu .action-menu-item,.actions-split .abs-action-menu .action-submenu .action-submenu .item,.actions-split .abs-action-menu .action-submenu .item,.actions-split .action-menu .action-menu-item,.actions-split .action-menu .action-submenu .action-menu-item,.actions-split .action-menu .action-submenu .item,.actions-split .action-menu .item,.actions-split .actions-split .dropdown-menu .action-submenu .action-menu-item,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu .action-menu-item,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu .item,.actions-split .actions-split .dropdown-menu .action-submenu .item,.actions-split .dropdown-menu .action-menu-item,.actions-split .dropdown-menu .item{cursor:pointer;display:block;padding:.6875em 1em}.abs-action-menu .action-submenu,.actions-split .action-menu .action-submenu,.actions-split .action-menu .action-submenu .action-submenu,.actions-split .dropdown-menu .action-submenu{bottom:auto;left:auto;margin-left:0;margin-top:-1px;position:absolute;right:auto;top:auto}.ie9 .abs-action-menu .action-submenu,.ie9 .actions-split .abs-action-menu .action-submenu .action-submenu,.ie9 .actions-split .abs-action-menu .action-submenu .action-submenu .action-submenu,.ie9 .actions-split .action-menu .action-submenu,.ie9 .actions-split .action-menu .action-submenu .action-submenu,.ie9 .actions-split .actions-split .dropdown-menu .action-submenu .action-submenu,.ie9 .actions-split .actions-split .dropdown-menu .action-submenu .action-submenu .action-submenu,.ie9 .actions-split .dropdown-menu .action-submenu{margin-left:99%;margin-top:-3.5rem}.abs-action-menu a.action-menu-item,.actions-split .abs-action-menu .action-submenu .action-submenu a.action-menu-item,.actions-split .abs-action-menu .action-submenu a.action-menu-item,.actions-split .action-menu .action-submenu a.action-menu-item,.actions-split .action-menu a.action-menu-item,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu a.action-menu-item,.actions-split .actions-split .dropdown-menu .action-submenu a.action-menu-item,.actions-split .dropdown-menu a.action-menu-item{color:#333}.abs-action-menu a.action-menu-item:focus,.actions-split .abs-action-menu .action-submenu .action-submenu a.action-menu-item:focus,.actions-split .abs-action-menu .action-submenu a.action-menu-item:focus,.actions-split .action-menu .action-submenu a.action-menu-item:focus,.actions-split .action-menu a.action-menu-item:focus,.actions-split .actions-split .dropdown-menu .action-submenu .action-submenu a.action-menu-item:focus,.actions-split .actions-split .dropdown-menu .action-submenu a.action-menu-item:focus,.actions-split .dropdown-menu a.action-menu-item:focus{background-color:#e3e3e3;box-shadow:none}.abs-action-wrap-triangle{position:relative}.abs-action-wrap-triangle .action-default{width:100%}.abs-action-wrap-triangle .action-default:after,.abs-action-wrap-triangle .action-default:before{border-style:solid;content:'';height:0;position:absolute;top:0;width:0}.abs-action-wrap-triangle .action-default:active,.abs-action-wrap-triangle .action-default:focus,.abs-action-wrap-triangle .action-default:hover{box-shadow:none}._keyfocus .abs-action-wrap-triangle .action-default:focus{box-shadow:0 0 0 1px #007bdb}.ie10 .abs-action-wrap-triangle .action-default.disabled,.ie10 .abs-action-wrap-triangle .action-default[disabled],.ie9 .abs-action-wrap-triangle .action-default.disabled,.ie9 .abs-action-wrap-triangle .action-default[disabled]{background-color:#fcfcfc;opacity:1;text-shadow:none}.abs-action-wrap-triangle-right{display:inline-block;padding-right:1.6rem;position:relative}.abs-action-wrap-triangle-right .action-default:after,.abs-action-wrap-triangle-right .action-default:before{border-color:transparent transparent transparent #e3e3e3;border-width:1.7rem 0 1.6rem 1.7rem;left:100%;margin-left:-1.7rem}.abs-action-wrap-triangle-right .action-default:before{border-left-color:#949494;right:-1px}.abs-action-wrap-triangle-right .action-default:active:after,.abs-action-wrap-triangle-right .action-default:focus:after,.abs-action-wrap-triangle-right .action-default:hover:after{border-left-color:#dbdbdb}.ie10 .abs-action-wrap-triangle-right .action-default.disabled:after,.ie10 .abs-action-wrap-triangle-right .action-default[disabled]:after,.ie9 .abs-action-wrap-triangle-right .action-default.disabled:after,.ie9 .abs-action-wrap-triangle-right .action-default[disabled]:after{border-color:transparent transparent transparent #fcfcfc}.abs-action-wrap-triangle-right .action-primary:after{border-color:transparent transparent transparent #eb5202}.abs-action-wrap-triangle-right .action-primary:active:after,.abs-action-wrap-triangle-right .action-primary:focus:after,.abs-action-wrap-triangle-right .action-primary:hover:after{border-left-color:#ba4000}.abs-action-wrap-triangle-left{display:inline-block;padding-left:1.6rem}.abs-action-wrap-triangle-left .action-default{text-indent:-.85rem}.abs-action-wrap-triangle-left .action-default:after,.abs-action-wrap-triangle-left .action-default:before{border-color:transparent #e3e3e3 transparent transparent;border-width:1.7rem 1.7rem 1.6rem 0;margin-right:-1.7rem;right:100%}.abs-action-wrap-triangle-left .action-default:before{border-right-color:#949494;left:-1px}.abs-action-wrap-triangle-left .action-default:active:after,.abs-action-wrap-triangle-left .action-default:focus:after,.abs-action-wrap-triangle-left .action-default:hover:after{border-right-color:#dbdbdb}.ie10 .abs-action-wrap-triangle-left .action-default.disabled:after,.ie10 .abs-action-wrap-triangle-left .action-default[disabled]:after,.ie9 .abs-action-wrap-triangle-left .action-default.disabled:after,.ie9 .abs-action-wrap-triangle-left .action-default[disabled]:after{border-color:transparent #fcfcfc transparent transparent}.abs-action-wrap-triangle-left .action-primary:after{border-color:transparent #eb5202 transparent transparent}.abs-action-wrap-triangle-left .action-primary:active:after,.abs-action-wrap-triangle-left .action-primary:focus:after,.abs-action-wrap-triangle-left .action-primary:hover:after{border-right-color:#ba4000}.action-default,button{background:#e3e3e3;border-color:#adadad;color:#514943}.action-default:active,.action-default:focus,.action-default:hover,button:active,button:focus,button:hover{background-color:#dbdbdb;color:#514943;text-decoration:none}.action-primary{background-color:#eb5202;border-color:#eb5202;color:#fff;text-shadow:1px 1px 0 rgba(0,0,0,.25)}.action-primary:active,.action-primary:focus,.action-primary:hover{background-color:#ba4000;border-color:#b84002;box-shadow:0 0 0 1px #007bdb;color:#fff;text-decoration:none}.action-primary.disabled,.action-primary[disabled]{cursor:default;opacity:.5;pointer-events:none}.action-secondary{background-color:#514943;border-color:#514943;color:#fff;text-shadow:1px 1px 1px rgba(0,0,0,.3)}.action-secondary:active,.action-secondary:focus,.action-secondary:hover{background-color:#35302c;border-color:#35302c;box-shadow:0 0 0 1px #007bdb;color:#fff;text-decoration:none}.action-secondary:active{background-color:#35302c}.action-quaternary,.action-tertiary{background-color:transparent;border-color:transparent;text-shadow:none}.action-quaternary:active,.action-quaternary:focus,.action-quaternary:hover,.action-tertiary:active,.action-tertiary:focus,.action-tertiary:hover{background-color:transparent;border-color:transparent;box-shadow:none}.action-tertiary{color:#008bdb}.action-tertiary:active,.action-tertiary:focus,.action-tertiary:hover{color:#0fa7ff;text-decoration:underline}.action-quaternary{color:#333}.action-quaternary:active,.action-quaternary:focus,.action-quaternary:hover{color:#1a1a1a}.action-close>span{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.action-close:active{-ms-transform:scale(0.9);transform:scale(0.9)}.action-close:before{content:'\e62f';transition:color .1s linear}.action-close:hover{cursor:pointer;text-decoration:none}.abs-action-menu .action-submenu,.abs-action-menu .action-submenu .action-submenu,.action-menu,.action-menu .action-submenu,.actions-split .action-menu .action-submenu,.actions-split .action-menu .action-submenu .action-submenu,.actions-split .dropdown-menu .action-submenu,.actions-split .dropdown-menu .action-submenu .action-submenu{background-color:#fff;border:1px solid #007bdb;border-radius:1px;box-shadow:1px 1px 5px rgba(0,0,0,.5);color:#333;display:none;font-weight:400;left:0;list-style:none;margin:2px 0 0;min-width:0;padding:0;position:absolute;right:0;top:100%}.abs-action-menu .action-submenu .action-submenu._active,.abs-action-menu .action-submenu._active,.action-menu .action-submenu._active,.action-menu._active,.actions-split .action-menu .action-submenu .action-submenu._active,.actions-split .action-menu .action-submenu._active,.actions-split .dropdown-menu .action-submenu .action-submenu._active,.actions-split .dropdown-menu .action-submenu._active{display:block}.abs-action-menu .action-submenu .action-submenu>li,.abs-action-menu .action-submenu>li,.action-menu .action-submenu>li,.action-menu>li,.actions-split .action-menu .action-submenu .action-submenu>li,.actions-split .action-menu .action-submenu>li,.actions-split .dropdown-menu .action-submenu .action-submenu>li,.actions-split .dropdown-menu .action-submenu>li{border:none;display:block;padding:0;transition:background-color .1s linear}.abs-action-menu .action-submenu .action-submenu>li>a:hover,.abs-action-menu .action-submenu>li>a:hover,.action-menu .action-submenu>li>a:hover,.action-menu>li>a:hover,.actions-split .action-menu .action-submenu .action-submenu>li>a:hover,.actions-split .action-menu .action-submenu>li>a:hover,.actions-split .dropdown-menu .action-submenu .action-submenu>li>a:hover,.actions-split .dropdown-menu .action-submenu>li>a:hover{text-decoration:none}.abs-action-menu .action-submenu .action-submenu>li._visible,.abs-action-menu .action-submenu .action-submenu>li:hover,.abs-action-menu .action-submenu>li._visible,.abs-action-menu .action-submenu>li:hover,.action-menu .action-submenu>li._visible,.action-menu .action-submenu>li:hover,.action-menu>li._visible,.action-menu>li:hover,.actions-split .action-menu .action-submenu .action-submenu>li._visible,.actions-split .action-menu .action-submenu .action-submenu>li:hover,.actions-split .action-menu .action-submenu>li._visible,.actions-split .action-menu .action-submenu>li:hover,.actions-split .dropdown-menu .action-submenu .action-submenu>li._visible,.actions-split .dropdown-menu .action-submenu .action-submenu>li:hover,.actions-split .dropdown-menu .action-submenu>li._visible,.actions-split .dropdown-menu .action-submenu>li:hover{background-color:#e3e3e3}.abs-action-menu .action-submenu .action-submenu>li:active,.abs-action-menu .action-submenu>li:active,.action-menu .action-submenu>li:active,.action-menu>li:active,.actions-split .action-menu .action-submenu .action-submenu>li:active,.actions-split .action-menu .action-submenu>li:active,.actions-split .dropdown-menu .action-submenu .action-submenu>li:active,.actions-split .dropdown-menu .action-submenu>li:active{background-color:#cacaca}.abs-action-menu .action-submenu .action-submenu>li._parent,.abs-action-menu .action-submenu>li._parent,.action-menu .action-submenu>li._parent,.action-menu>li._parent,.actions-split .action-menu .action-submenu .action-submenu>li._parent,.actions-split .action-menu .action-submenu>li._parent,.actions-split .dropdown-menu .action-submenu .action-submenu>li._parent,.actions-split .dropdown-menu .action-submenu>li._parent{-webkit-flex-direction:row;display:flex;-ms-flex-direction:row;flex-direction:row}.abs-action-menu .action-submenu .action-submenu>li._parent>.action-menu-item,.abs-action-menu .action-submenu>li._parent>.action-menu-item,.action-menu .action-submenu>li._parent>.action-menu-item,.action-menu>li._parent>.action-menu-item,.actions-split .action-menu .action-submenu .action-submenu>li._parent>.action-menu-item,.actions-split .action-menu .action-submenu>li._parent>.action-menu-item,.actions-split .dropdown-menu .action-submenu .action-submenu>li._parent>.action-menu-item,.actions-split .dropdown-menu .action-submenu>li._parent>.action-menu-item{min-width:100%}.abs-action-menu .action-submenu .action-menu-item,.abs-action-menu .action-submenu .action-submenu .action-menu-item,.abs-action-menu .action-submenu .action-submenu .item,.abs-action-menu .action-submenu .item,.action-menu .action-menu-item,.action-menu .action-submenu .action-menu-item,.action-menu .action-submenu .item,.action-menu .item,.actions-split .action-menu .action-submenu .action-menu-item,.actions-split .action-menu .action-submenu .action-submenu .action-menu-item,.actions-split .action-menu .action-submenu .action-submenu .item,.actions-split .action-menu .action-submenu .item,.actions-split .dropdown-menu .action-submenu .action-menu-item,.actions-split .dropdown-menu .action-submenu .action-submenu .action-menu-item,.actions-split .dropdown-menu .action-submenu .action-submenu .item,.actions-split .dropdown-menu .action-submenu .item{cursor:pointer;display:block;padding:.6875em 1em}.abs-action-menu .action-submenu .action-submenu,.action-menu .action-submenu,.actions-split .action-menu .action-submenu .action-submenu,.actions-split .dropdown-menu .action-submenu .action-submenu{bottom:auto;left:auto;margin-left:0;margin-top:-1px;position:absolute;right:auto;top:auto}.ie9 .abs-action-menu .action-submenu .action-submenu,.ie9 .abs-action-menu .action-submenu .action-submenu .action-submenu,.ie9 .action-menu .action-submenu,.ie9 .action-menu .action-submenu .action-submenu,.ie9 .actions-split .action-menu .action-submenu .action-submenu,.ie9 .actions-split .action-menu .action-submenu .action-submenu .action-submenu,.ie9 .actions-split .dropdown-menu .action-submenu .action-submenu,.ie9 .actions-split .dropdown-menu .action-submenu .action-submenu .action-submenu{margin-left:99%;margin-top:-3.5rem}.abs-action-menu .action-submenu .action-submenu a.action-menu-item,.abs-action-menu .action-submenu a.action-menu-item,.action-menu .action-submenu a.action-menu-item,.action-menu a.action-menu-item,.actions-split .action-menu .action-submenu .action-submenu a.action-menu-item,.actions-split .action-menu .action-submenu a.action-menu-item,.actions-split .dropdown-menu .action-submenu .action-submenu a.action-menu-item,.actions-split .dropdown-menu .action-submenu a.action-menu-item{color:#333}.abs-action-menu .action-submenu .action-submenu a.action-menu-item:focus,.abs-action-menu .action-submenu a.action-menu-item:focus,.action-menu .action-submenu a.action-menu-item:focus,.action-menu a.action-menu-item:focus,.actions-split .action-menu .action-submenu .action-submenu a.action-menu-item:focus,.actions-split .action-menu .action-submenu a.action-menu-item:focus,.actions-split .dropdown-menu .action-submenu .action-submenu a.action-menu-item:focus,.actions-split .dropdown-menu .action-submenu a.action-menu-item:focus{background-color:#e3e3e3;box-shadow:none}.messages .message:last-child{margin:0 0 2rem}.message{background:#fffbbb;border:none;border-radius:0;color:#333;font-size:1.4rem;margin:0 0 1px;padding:1.8rem 4rem 1.8rem 5.5rem;position:relative;text-shadow:none}.message:before{background:0 0;border:0;color:#007bdb;content:'\e61a';font-family:Icons;font-size:1.9rem;font-style:normal;font-weight:400;height:auto;left:1.9rem;line-height:inherit;margin-top:-1.3rem;position:absolute;speak:none;text-shadow:none;top:50%;width:auto}.message-notice:before{color:#007bdb;content:'\e61a'}.message-warning:before{color:#eb5202;content:'\e623'}.message-error{background:#fcc}.message-error:before{color:#e22626;content:'\e632';font-size:1.5rem;left:2.2rem;margin-top:-1rem}.message-success:before{color:#79a22e;content:'\e62d'}.message-spinner:before{display:none}.message-spinner .spinner{font-size:2.5rem;left:1.5rem;position:absolute;top:1.5rem}.message-in-rating-edit{margin-left:1.8rem;margin-right:1.8rem}.modal-popup .action-close,.modal-slide .action-close{color:#736963;position:absolute;right:0;top:0;z-index:1}.modal-popup .action-close:active,.modal-slide .action-close:active{-ms-transform:none;transform:none}.modal-popup .action-close:active:before,.modal-slide .action-close:active:before{font-size:1.8rem}.modal-popup .action-close:hover:before,.modal-slide .action-close:hover:before{color:#58504b}.modal-popup .action-close:before,.modal-slide .action-close:before{font-size:2rem}.modal-popup .action-close:focus,.modal-slide .action-close:focus{background-color:transparent}.modal-popup.prompt .prompt-message{padding:2rem 0}.modal-popup.prompt .prompt-message input{width:100%}.modal-popup.confirm .modal-inner-wrap .message,.modal-popup.prompt .modal-inner-wrap .message{background:#fff}.modal-popup.modal-system-messages .modal-inner-wrap{background:#fffbbb}.modal-popup._image-box .modal-inner-wrap{margin:5rem auto;max-width:78rem;position:static}.modal-popup._image-box .thumbnail-preview{padding-bottom:3rem;text-align:center}.modal-popup._image-box .thumbnail-preview .thumbnail-preview-image-block{border:1px solid #ccc;margin:0 auto 2rem;max-width:58rem;padding:2rem}.modal-popup._image-box .thumbnail-preview .thumbnail-preview-image{max-height:54rem}.modal-popup .modal-title{font-size:2.4rem;margin-right:6.4rem}.modal-popup .modal-footer{padding-top:2.6rem;text-align:right}.modal-popup .action-close{padding:3rem}.modal-popup .action-close:active,.modal-popup .action-close:focus{background:0 0;padding-right:3.1rem;padding-top:3.1rem}.modal-slide .modal-content-new-attribute{-webkit-overflow-scrolling:touch;overflow:auto;padding-bottom:0}.modal-slide .modal-content-new-attribute iframe{margin-bottom:-2.5rem}.modal-slide .modal-title{font-size:2.1rem;margin-right:5.7rem}.modal-slide .action-close{padding:2.1rem 2.6rem}.modal-slide .action-close:active{padding-right:2.7rem;padding-top:2.2rem}.modal-slide .page-main-actions{margin-bottom:.6rem;margin-top:2.1rem}.modal-slide .magento-message{padding:0 3rem 3rem;position:relative}.modal-slide .magento-message .insert-title-inner,.modal-slide .main-col .insert-title-inner{border-bottom:1px solid #adadad;margin:0 0 2rem;padding-bottom:.5rem}.modal-slide .magento-message .insert-actions,.modal-slide .main-col .insert-actions{float:right}.modal-slide .magento-message .title,.modal-slide .main-col .title{font-size:1.6rem;padding-top:.5rem}.modal-slide .main-col,.modal-slide .side-col{float:left;padding-bottom:0}.modal-slide .main-col:after,.modal-slide .side-col:after{display:none}.modal-slide .side-col{width:20%}.modal-slide .main-col{padding-right:0;width:80%}.modal-slide .content-footer .form-buttons{float:right}.modal-title{font-weight:400;margin-bottom:0;min-height:1em}.modal-title span{font-size:1.4rem;font-style:italic;margin-left:1rem}.spinner{display:inline-block;font-size:4rem;height:1em;margin-right:1.5rem;position:relative;width:1em}.spinner>span:nth-child(1){animation-delay:.27s;-ms-transform:rotate(-315deg);transform:rotate(-315deg)}.spinner>span:nth-child(2){animation-delay:.36s;-ms-transform:rotate(-270deg);transform:rotate(-270deg)}.spinner>span:nth-child(3){animation-delay:.45s;-ms-transform:rotate(-225deg);transform:rotate(-225deg)}.spinner>span:nth-child(4){animation-delay:.54s;-ms-transform:rotate(-180deg);transform:rotate(-180deg)}.spinner>span:nth-child(5){animation-delay:.63s;-ms-transform:rotate(-135deg);transform:rotate(-135deg)}.spinner>span:nth-child(6){animation-delay:.72s;-ms-transform:rotate(-90deg);transform:rotate(-90deg)}.spinner>span:nth-child(7){animation-delay:.81s;-ms-transform:rotate(-45deg);transform:rotate(-45deg)}.spinner>span:nth-child(8){animation-delay:.9;-ms-transform:rotate(0deg);transform:rotate(0deg)}@keyframes fade{0%{background-color:#514943}100%{background-color:#fff}}.spinner>span{-ms-transform:scale(0.4);transform:scale(0.4);animation-name:fade;animation-duration:.72s;animation-iteration-count:infinite;animation-direction:linear;background-color:#fff;border-radius:6px;clip:rect(0 .28571429em .1em 0);height:.1em;margin-top:.5em;position:absolute;width:1em}.ie9 .spinner{background:url(../images/ajax-loader.gif) center no-repeat}.ie9 .spinner>span{display:none}.popup-loading{background:rgba(255,255,255,.8);border-color:#ef672f;color:#ef672f;font-size:14px;font-weight:700;left:50%;margin-left:-100px;padding:100px 0 10px;position:fixed;text-align:center;top:40%;width:200px;z-index:1003}.popup-loading:after{background-image:url(../images/loader-1.gif);content:'';height:64px;left:50%;margin:-32px 0 0 -32px;position:absolute;top:40%;width:64px;z-index:2}.loading-mask,.loading-old{background:rgba(255,255,255,.4);bottom:0;left:0;position:fixed;right:0;top:0;z-index:2003}.loading-mask img,.loading-old img{display:none}.loading-mask p,.loading-old p{margin-top:118px}.loading-mask .loader,.loading-old .loader{background:url(../images/loader-1.gif) 50% 30% no-repeat #f7f3eb;border-radius:5px;bottom:0;color:#575757;font-size:14px;font-weight:700;height:160px;left:0;margin:auto;opacity:.95;position:absolute;right:0;text-align:center;top:0;width:160px}.admin-user{float:right;line-height:1.36;margin-left:.3rem;z-index:490}.admin-user._active .admin__action-dropdown,.admin-user.active .admin__action-dropdown{border-color:#007bdb;box-shadow:1px 1px 5px rgba(0,0,0,.5)}.admin-user .admin__action-dropdown{height:3.3rem;padding:.7rem 2.8rem .4rem 4rem}.admin-user .admin__action-dropdown._active:after,.admin-user .admin__action-dropdown.active:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.admin-user .admin__action-dropdown:after{border-color:#777 transparent transparent;border-style:solid;border-width:.5rem .4rem 0;content:'';height:0;margin-top:-.2rem;position:absolute;right:1.3rem;top:50%;transition:all .2s linear;width:0}._active .admin-user .admin__action-dropdown:after,.active .admin-user .admin__action-dropdown:after{-ms-transform:rotate(180deg);transform:rotate(180deg)}.admin-user .admin__action-dropdown:hover:after{border-color:#000 transparent transparent}.admin-user .admin__action-dropdown:before{color:#777;content:'\e600';font-size:2rem;left:1.1rem;margin-top:-1.1rem;position:absolute;top:50%}.admin-user .admin__action-dropdown:hover:before{color:#333}.admin-user .admin__action-dropdown-menu{min-width:20rem;padding-left:1rem;padding-right:1rem}.admin-user .admin__action-dropdown-menu>li>a{padding-left:.5em;padding-right:1.8rem;transition:background-color .1s linear;white-space:nowrap}.admin-user .admin__action-dropdown-menu>li>a:hover{background-color:#e0f6fe;color:#333}.admin-user .admin__action-dropdown-menu>li>a:active{background-color:#c7effd;bottom:-1px;position:relative}.admin-user .admin__action-dropdown-menu .admin-user-name{text-overflow:ellipsis;white-space:nowrap;display:inline-block;max-width:20rem;overflow:hidden;vertical-align:top}.admin-user-account-text{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:inline-block;max-width:11.2rem}.search-global{float:right;margin-right:-.3rem;position:relative;z-index:480}.search-global-field{min-width:5rem}.search-global-field._active .search-global-input{background-color:#fff;border-color:#007bdb;box-shadow:1px 1px 5px rgba(0,0,0,.5);padding-right:4rem;width:25rem}.search-global-field._active .search-global-action{display:block;height:3.3rem;position:absolute;right:0;text-indent:-100%;top:0;width:5rem;z-index:3}.search-global-field .autocomplete-results{height:3.3rem;position:absolute;right:0;top:0;width:25rem}.search-global-field .search-global-menu{border:1px solid #007bdb;border-top-color:transparent;box-shadow:1px 1px 5px rgba(0,0,0,.5);left:0;margin-top:-2px;padding:0;position:absolute;right:0;top:100%;z-index:2}.search-global-field .search-global-menu:after{background-color:#fff;content:'';height:5px;left:0;position:absolute;right:0;top:-5px}.search-global-field .search-global-menu>li{background-color:#fff;border-top:1px solid #ddd;display:block;font-size:1.2rem;padding:.75rem 1.4rem .55rem}.search-global-field .search-global-menu>li._active{background-color:#e0f6fe}.search-global-field .search-global-menu .title{display:block;font-size:1.4rem}.search-global-field .search-global-menu .type{color:#1a1a1a;display:block}.search-global-label{cursor:pointer;height:3.3rem;padding:.75rem 1.4rem .55rem;position:absolute;right:0;top:0;z-index:2}.search-global-label:active{-ms-transform:scale(0.9);transform:scale(0.9)}.search-global-label:hover:before{color:#000}.search-global-label:before{color:#777;content:'\e60c';font-size:2rem}.search-global-input{background-color:transparent;border:1px solid transparent;font-size:1.4rem;height:3.3rem;padding:.75rem 1.4rem .55rem;position:absolute;right:0;top:0;transition:all .1s linear,width .3s linear;width:5rem;z-index:1}.search-global-action{display:none}.notifications-wrapper{float:right;line-height:1;position:relative}.notifications-wrapper.active{z-index:500}.notifications-wrapper.active .notifications-action{border-color:#007bdb;box-shadow:1px 1px 5px rgba(0,0,0,.5)}.notifications-wrapper.active .notifications-action:after{background-color:#fff;border:none;content:'';display:block;height:6px;left:-6px;margin-top:0;position:absolute;right:0;top:100%;width:auto}.notifications-wrapper .admin__action-dropdown-menu{padding:1rem 0 0;width:32rem}.notifications-action{color:#777;height:3.3rem;padding:.75rem 2rem .65rem}.notifications-action:after{display:none}.notifications-action:before{content:'\e607';font-size:1.9rem;margin-right:0}.notifications-action:active:before{position:relative;top:1px}.notifications-action .notifications-counter{background-color:#e22626;border-radius:1em;color:#fff;display:inline-block;font-size:1.1rem;font-weight:700;left:50%;margin-left:.3em;margin-top:-1.1em;padding:.3em .5em;position:absolute;top:50%}.notifications-entry{line-height:1.36;padding:.6rem 2rem .8rem;position:relative;transition:background-color .1s linear}.notifications-entry:hover{background-color:#e0f6fe}.notifications-entry.notifications-entry-last{margin:0 2rem;padding:.3rem 0 1.3rem;text-align:center}.notifications-entry.notifications-entry-last:hover{background-color:transparent}.notifications-entry+.notifications-entry-last{border-top:1px solid #ddd;padding-bottom:.6rem}.notifications-entry ._cutted{cursor:pointer}.notifications-entry ._cutted .notifications-entry-description-start:after{content:'...'}.notifications-entry-title{color:#ef672f;display:block;font-size:1.1rem;font-weight:700;margin-bottom:.7rem;margin-right:1em}.notifications-entry-description{color:#333;font-size:1.1rem;margin-bottom:.8rem}.notifications-entry-description-end{display:none}.notifications-entry-description-end._show{display:inline}.notifications-entry-time{color:#777;font-size:1.1rem}.notifications-close{line-height:1;padding:1rem;position:absolute;right:0;top:.6rem}.notifications-close:before{color:#ccc;content:'\e620';transition:color .1s linear}.notifications-close:hover:before{color:#b3b3b3}.notifications-close:active{-ms-transform:scale(0.95);transform:scale(0.95)}.page-header-actions{padding-top:1.1rem}.page-header-hgroup{padding-right:1.5rem}.page-title{color:#333;font-size:2.8rem}.page-header{padding:1.5rem 3rem}.menu-wrapper{display:inline-block;position:relative;width:8.8rem;z-index:700}.menu-wrapper:before{background-color:#373330;bottom:0;content:'';left:0;position:fixed;top:0;width:8.8rem;z-index:699}.menu-wrapper._fixed{left:0;position:fixed;top:0}.menu-wrapper._fixed~.page-wrapper{margin-left:8.8rem}.menu-wrapper .logo{display:block;height:8.8rem;padding:2.4rem 0 2.2rem;position:relative;text-align:center;z-index:700}._keyfocus .menu-wrapper .logo:focus{background-color:#4a4542;box-shadow:none}._keyfocus .menu-wrapper .logo:focus+.admin__menu .level-0:first-child>a{background-color:#373330}._keyfocus .menu-wrapper .logo:focus+.admin__menu .level-0:first-child>a:after{display:none}.menu-wrapper .logo:hover .logo-img{-webkit-filter:brightness(1.1);filter:brightness(1.1)}.menu-wrapper .logo:active .logo-img{-ms-transform:scale(0.95);transform:scale(0.95)}.menu-wrapper .logo .logo-img{height:4.2rem;transition:-webkit-filter .2s linear,filter .2s linear,transform .1s linear;width:3.5rem}.abs-menu-separator,.admin__menu .item-partners>a:after,.admin__menu .level-0:first-child>a:after{background-color:#736963;content:'';display:block;height:1px;left:0;margin-left:16%;position:absolute;top:0;width:68%}.admin__menu li{display:block}.admin__menu .level-0:first-child>a{position:relative}.admin__menu .level-0._active>a,.admin__menu .level-0:hover>a{color:#f7f3eb}.admin__menu .level-0._active>a{background-color:#524d49}.admin__menu .level-0:hover>a{background-color:#4a4542}.admin__menu .level-0>a{color:#aaa6a0;display:block;font-size:1rem;letter-spacing:.025em;min-height:6.2rem;padding:1.2rem .5rem .5rem;position:relative;text-align:center;text-decoration:none;text-transform:uppercase;transition:background-color .1s linear;word-wrap:break-word;z-index:700}.admin__menu .level-0>a:focus{box-shadow:none}.admin__menu .level-0>a:before{content:'\e63a';display:block;font-size:2.2rem;height:2.2rem}.admin__menu .level-0>.submenu{background-color:#4a4542;box-shadow:0 0 3px #000;left:100%;min-height:calc(8.8rem + 2rem + 100%);padding:2rem 0 0;position:absolute;top:0;-ms-transform:translateX(-100%);transform:translateX(-100%);transition-duration:.3s;transition-property:transform,visibility;transition-timing-function:ease-in-out;visibility:hidden;z-index:697}.ie10 .admin__menu .level-0>.submenu,.ie11 .admin__menu .level-0>.submenu{height:100%}.admin__menu .level-0._show>.submenu{-ms-transform:translateX(0);transform:translateX(0);visibility:visible;z-index:698}.admin__menu .level-1{margin-left:1.5rem;margin-right:1.5rem}.admin__menu [class*=level-]:not(.level-0) a{display:block;padding:1.25rem 1.5rem}.admin__menu [class*=level-]:not(.level-0) a:hover{background-color:#403934}.admin__menu [class*=level-]:not(.level-0) a:active{background-color:#322c29;padding-bottom:1.15rem;padding-top:1.35rem}.admin__menu .submenu li{min-width:23.8rem}.admin__menu .submenu a{color:#fcfcfc;transition:background-color .1s linear}.admin__menu .submenu a:focus,.admin__menu .submenu a:hover{box-shadow:none;text-decoration:none}._keyfocus .admin__menu .submenu a:focus{background-color:#403934}._keyfocus .admin__menu .submenu a:active{background-color:#322c29}.admin__menu .submenu .parent{margin-bottom:4.5rem}.admin__menu .submenu .parent .submenu-group-title{color:#a79d95;display:block;font-size:1.6rem;font-weight:600;margin-bottom:.7rem;padding:1.25rem 1.5rem;pointer-events:none}.admin__menu .submenu .column{display:table-cell}.admin__menu .submenu-title{color:#fff;display:block;font-size:2.2rem;font-weight:600;margin-bottom:4.2rem;margin-left:3rem;margin-right:5.8rem}.admin__menu .submenu-sub-title{color:#fff;display:block;font-size:1.2rem;margin:-3.8rem 5.8rem 3.8rem 3rem}.admin__menu .action-close{padding:2.4rem 2.8rem;position:absolute;right:0;top:0}.admin__menu .action-close:before{color:#a79d95;font-size:1.7rem}.admin__menu .action-close:hover:before{color:#fff}.admin__menu .item-dashboard>a:before{content:'\e604';font-size:1.8rem;padding-top:.4rem}.admin__menu .item-sales>a:before{content:'\e60b'}.admin__menu .item-catalog>a:before{content:'\e608'}.admin__menu .item-customer>a:before{content:'\e603';font-size:2.6rem;position:relative;top:-.4rem}.admin__menu .item-marketing>a:before{content:'\e609';font-size:2rem;padding-top:.2rem}.admin__menu .item-content>a:before{content:'\e602';font-size:2.4rem;position:relative;top:-.2rem}.admin__menu .item-report>a:before{content:'\e60a'}.admin__menu .item-stores>a:before{content:'\e60d';font-size:1.9rem;padding-top:.3rem}.admin__menu .item-system>a:before{content:'\e610'}.admin__menu .item-partners._active>a:after,.admin__menu .item-system._current+.item-partners>a:after{display:none}.admin__menu .item-partners>a{padding-bottom:1rem}.admin__menu .item-partners>a:before{content:'\e612'}.admin__menu .level-0>.submenu>ul>.level-1:only-of-type>.submenu-group-title,.admin__menu .submenu .column:only-of-type .submenu-group-title{display:none}.admin__menu-overlay{bottom:0;left:0;position:fixed;right:0;top:0;z-index:697}.store-switcher{color:#333;float:left;font-size:1.3rem;margin-top:.7rem}.store-switcher .admin__action-dropdown{background-color:#f8f8f8;margin-left:.5em}.store-switcher .dropdown{display:inline-block;position:relative}.store-switcher .dropdown:after,.store-switcher .dropdown:before{content:'';display:table}.store-switcher .dropdown:after{clear:both}.store-switcher .dropdown .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.store-switcher .dropdown .action.toggle:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:2;color:#333;content:'\e607';font-family:icons-blank-theme;margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.store-switcher .dropdown .action.toggle:active:after,.store-switcher .dropdown .action.toggle:hover:after{color:#333}.store-switcher .dropdown .action.toggle.active{display:inline-block;text-decoration:none}.store-switcher .dropdown .action.toggle.active:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:2;color:#333;content:'\e618';font-family:icons-blank-theme;margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.store-switcher .dropdown .action.toggle.active:active:after,.store-switcher .dropdown .action.toggle.active:hover:after{color:#333}.store-switcher .dropdown .dropdown-menu{margin:4px 0 0;padding:0;list-style:none;background:#fff;border:1px solid #aaa6a0;min-width:19.5rem;z-index:100;box-sizing:border-box;display:none;position:absolute;top:100%;box-shadow:1px 1px 5px rgba(0,0,0,.5)}.store-switcher .dropdown .dropdown-menu li{margin:0;padding:0}.store-switcher .dropdown .dropdown-menu li:hover{background:0 0;cursor:pointer}.store-switcher .dropdown.active{overflow:visible}.store-switcher .dropdown.active .dropdown-menu{display:block}.store-switcher .dropdown-menu{left:0;margin-top:.5em;max-height:250px;overflow-y:auto;padding-top:.25em}.store-switcher .dropdown-menu li{border:0;cursor:default}.store-switcher .dropdown-menu li:hover{cursor:default}.store-switcher .dropdown-menu li a,.store-switcher .dropdown-menu li span{color:#333;display:block;padding:.5rem 1.3rem}.store-switcher .dropdown-menu li a{text-decoration:none}.store-switcher .dropdown-menu li a:hover{background:#e9e9e9}.store-switcher .dropdown-menu li span{color:#adadad;cursor:default}.store-switcher .dropdown-menu li.current span{background:#eee;color:#333}.store-switcher .dropdown-menu .store-switcher-store a,.store-switcher .dropdown-menu .store-switcher-store span{padding-left:2.6rem}.store-switcher .dropdown-menu .store-switcher-store-view a,.store-switcher .dropdown-menu .store-switcher-store-view span{padding-left:3.9rem}.store-switcher .dropdown-menu .dropdown-toolbar{border-top:1px solid #ebebeb;margin-top:1rem}.store-switcher .dropdown-menu .dropdown-toolbar a:before{content:'\e610';margin-right:.25em;position:relative;top:1px}.store-switcher-label{font-weight:700}.store-switcher-alt{display:inline-block;position:relative}.store-switcher-alt.active .dropdown-menu{display:block}.store-switcher-alt .dropdown-menu{margin-top:2px;white-space:nowrap}.store-switcher-alt .dropdown-menu ul{list-style:none;margin:0;padding:0}.store-switcher-alt strong{color:#a79d95;display:block;font-size:14px;font-weight:500;line-height:1.333;padding:5px 10px}.store-switcher-alt .store-selected{color:#676056;cursor:pointer;font-size:12px;font-weight:400;line-height:1.333}.store-switcher-alt .store-selected:after{-webkit-font-smoothing:antialiased;color:#afadac;content:'\e02c';font-style:normal;font-weight:400;margin:0 0 0 3px;speak:none;vertical-align:text-top}.store-switcher-alt .store-switcher-store,.store-switcher-alt .store-switcher-website{padding:0}.store-switcher-alt .store-switcher-store:hover,.store-switcher-alt .store-switcher-website:hover{background:0 0}.store-switcher-alt .manage-stores,.store-switcher-alt .store-switcher-all,.store-switcher-alt .store-switcher-store-view{padding:0}.store-switcher-alt .manage-stores>a,.store-switcher-alt .store-switcher-all>a{color:#676056;display:block;font-size:12px;padding:8px 15px;text-decoration:none}.store-switcher-website{margin:5px 0 0}.store-switcher-website>strong{padding-left:13px}.store-switcher-store{margin:1px 0 0}.store-switcher-store>strong{padding-left:20px}.store-switcher-store>ul{margin-top:1px}.store-switcher-store-view:first-child{border-top:1px solid #e5e5e5}.store-switcher-store-view>a{color:#333;display:block;font-size:13px;padding:5px 15px 5px 24px;text-decoration:none}.store-view:not(.store-switcher){float:left}.store-view .store-switcher-label{display:inline-block;margin-top:1rem}.tooltip{margin-left:.5em}.tooltip .help a,.tooltip .help span{cursor:pointer;display:inline-block;height:22px;position:relative;vertical-align:middle;width:22px;z-index:2}.tooltip .help a:before,.tooltip .help span:before{color:#333;content:'\e633';font-size:1.7rem}.tooltip .help a:hover{text-decoration:none}.tooltip .tooltip-content{background:#000;border-radius:3px;color:#fff;display:none;margin-left:-19px;margin-top:10px;max-width:200px;padding:4px 8px;position:absolute;text-shadow:none;z-index:20}.tooltip .tooltip-content:before{border-bottom:5px solid #000;border-left:5px solid transparent;border-right:5px solid transparent;content:'';height:0;left:20px;opacity:.8;position:absolute;top:-5px;width:0}.tooltip .tooltip-content.loading{position:absolute}.tooltip .tooltip-content.loading:before{border-bottom-color:rgba(0,0,0,.3)}.tooltip:hover>.tooltip-content{display:block}.page-actions._fixed,.page-main-actions:not(._hidden){background:#f8f8f8;border-bottom:1px solid #e3e3e3;border-top:1px solid #e3e3e3;padding:1.5rem}.page-main-actions{margin:0 0 3rem}.page-main-actions._hidden .store-switcher{display:none}.page-main-actions._hidden .page-actions-placeholder{min-height:50px}.page-actions{float:right}.page-main-actions .page-actions._fixed{left:8.8rem;position:fixed;right:0;top:0;z-index:501}.page-main-actions .page-actions._fixed .page-actions-inner:before{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:#333;content:attr(data-title);float:left;font-size:2.8rem;margin-top:.3rem;max-width:50%}.page-actions .page-actions-buttons>button,.page-actions>button{float:right;margin-left:1.3rem}.page-actions .page-actions-buttons>button.action-back,.page-actions .page-actions-buttons>button.back,.page-actions>button.action-back,.page-actions>button.back{float:left;-ms-flex-order:-1;order:-1}.page-actions .page-actions-buttons>button.action-back:before,.page-actions .page-actions-buttons>button.back:before,.page-actions>button.action-back:before,.page-actions>button.back:before{content:'\e626';margin-right:.5em;position:relative;top:1px}.page-actions .page-actions-buttons>button.action-primary,.page-actions .page-actions-buttons>button.primary,.page-actions>button.action-primary,.page-actions>button.primary{-ms-flex-order:2;order:2}.page-actions .page-actions-buttons>button.save:not(.primary),.page-actions>button.save:not(.primary){-ms-flex-order:1;order:1}.page-actions .page-actions-buttons>button.delete,.page-actions>button.delete{-ms-flex-order:-1;order:-1}.page-actions .actions-split{float:right;margin-left:1.3rem;-ms-flex-order:2;order:2}.page-actions .actions-split .dropdown-menu .item{display:block}.page-actions-buttons{float:right;-ms-flex-pack:end;justify-content:flex-end;display:-ms-flexbox;display:flex}.customer-index-edit .page-actions-buttons{background-color:transparent}.admin__page-nav{background:#f1f1f1;border:1px solid #e3e3e3}.admin__page-nav._collapsed:first-child{border-bottom:none}.admin__page-nav._collapsed._show{border-bottom:1px solid #e3e3e3}.admin__page-nav._collapsed._show ._collapsible{background:#f1f1f1}.admin__page-nav._collapsed._show ._collapsible:after{content:'\e62b'}.admin__page-nav._collapsed._show ._collapsible+.admin__page-nav-items{display:block}.admin__page-nav._collapsed._hide .admin__page-nav-title-messages,.admin__page-nav._collapsed._hide .admin__page-nav-title-messages ._active{display:inline-block}.admin__page-nav+._collapsed{border-bottom:none;border-top:none}.admin__page-nav-title{border-bottom:1px solid #e3e3e3;color:#303030;display:block;font-size:1.4rem;line-height:1.2;margin:0 0 -1px;padding:1.8rem 1.5rem;position:relative;text-transform:uppercase}.admin__page-nav-title._collapsible{background:#fff;cursor:pointer;margin:0;padding-right:3.5rem;transition:border-color .1s ease-out,background-color .1s ease-out}.admin__page-nav-title._collapsible+.admin__page-nav-items{display:none;margin-top:-1px}.admin__page-nav-title._collapsible:after{content:'\e628';font-size:1.3rem;font-weight:700;position:absolute;right:1.8rem;top:2rem}.admin__page-nav-title._collapsible:hover{background:#f1f1f1}.admin__page-nav-title._collapsible:last-child{margin:0 0 -1px}.admin__page-nav-title strong{font-weight:700}.admin__page-nav-title .admin__page-nav-title-messages{display:none}.admin__page-nav-items{list-style-type:none;margin:0;padding:1rem 0 1.3rem}.admin__page-nav-item{border-left:3px solid transparent;margin-left:.7rem;padding:0;position:relative;transition:border-color .1s ease-out,background-color .1s ease-out}.admin__page-nav-item:hover{border-color:#e4e4e4}.admin__page-nav-item:hover .admin__page-nav-link{background:#e4e4e4;color:#303030;text-decoration:none}.admin__page-nav-item._active,.admin__page-nav-item.ui-state-active{border-color:#eb5202}.admin__page-nav-item._active .admin__page-nav-link,.admin__page-nav-item.ui-state-active .admin__page-nav-link{background:#fff;border-color:#e3e3e3;border-right:1px solid #fff;color:#303030;margin-right:-1px;font-weight:600}.admin__page-nav-item._loading:before,.admin__page-nav-item.ui-tabs-loading:before{display:none}.admin__page-nav-item._loading .admin__page-nav-item-message-loader,.admin__page-nav-item.ui-tabs-loading .admin__page-nav-item-message-loader{display:inline-block}.admin__page-nav-link{border:1px solid transparent;border-width:1px 0;color:#303030;display:block;font-weight:500;line-height:1.2;margin:0 0 -1px;padding:2rem 4rem 2rem 1rem;transition:border-color .1s ease-out,background-color .1s ease-out;word-wrap:break-word}.admin__page-nav-item-messages{display:inline-block}.admin__page-nav-item-messages .admin__page-nav-item-message-tooltip{background:#f1f1f1;border:1px solid #f1f1f1;border-radius:1px;bottom:3.7rem;box-shadow:0 3px 9px 0 rgba(0,0,0,.3);display:none;font-size:1.4rem;font-weight:400;left:-1rem;line-height:1.36;padding:1.5rem;position:absolute;text-transform:none;width:27rem;word-break:normal;z-index:2}.admin__page-nav-item-messages .admin__page-nav-item-message-tooltip:after,.admin__page-nav-item-messages .admin__page-nav-item-message-tooltip:before{border:15px solid transparent;height:0;width:0;border-top-color:#f1f1f1;content:'';display:block;left:2rem;position:absolute;top:100%;z-index:3}.admin__page-nav-item-messages .admin__page-nav-item-message-tooltip:after{border-top-color:#f1f1f1;margin-top:-1px;z-index:4}.admin__page-nav-item-messages .admin__page-nav-item-message-tooltip:before{border-top-color:#bfbfbf;margin-top:1px}.admin__page-nav-item-message-loader{display:none;margin-top:-1rem;position:absolute;right:0;top:50%}.admin__page-nav-item-message-loader .spinner{font-size:2rem;margin-right:1.5rem}._loading>.admin__page-nav-item-messages .admin__page-nav-item-message-loader{display:inline-block}.admin__page-nav-item-message{position:relative}.admin__page-nav-item-message:hover{z-index:500}.admin__page-nav-item-message:hover .admin__page-nav-item-message-tooltip{display:block}.admin__page-nav-item-message._changed,.admin__page-nav-item-message._error{display:none}.admin__page-nav-item-message .admin__page-nav-item-message-icon{display:inline-block;font-size:1.4rem;padding-left:.8em;vertical-align:baseline}.admin__page-nav-item-message .admin__page-nav-item-message-icon:after{color:#666;content:'\e631'}._changed:not(._error)>.admin__page-nav-item-messages ._changed{display:inline-block}._error .admin__page-nav-item-message-icon:after{color:#eb5202;content:'\e623'}._error>.admin__page-nav-item-messages ._error{display:inline-block}._error>.admin__page-nav-item-messages ._error .spinner{font-size:2rem;margin-right:1.5rem}._error .admin__page-nav-item-message-tooltip{background:#f1f1f1;border:1px solid #f1f1f1;border-radius:1px;bottom:3.7rem;box-shadow:0 3px 9px 0 rgba(0,0,0,.3);display:none;font-weight:400;left:-1rem;line-height:1.36;padding:2rem;position:absolute;text-transform:none;width:27rem;word-break:normal;z-index:2}._error .admin__page-nav-item-message-tooltip:after,._error .admin__page-nav-item-message-tooltip:before{border:15px solid transparent;height:0;width:0;border-top-color:#f1f1f1;content:'';display:block;left:2rem;position:absolute;top:100%;z-index:3}._error .admin__page-nav-item-message-tooltip:after{border-top-color:#f1f1f1;margin-top:-1px;z-index:4}._error .admin__page-nav-item-message-tooltip:before{border-top-color:#bfbfbf}.admin__data-grid-wrap-static .data-grid{box-sizing:border-box}.admin__data-grid-wrap-static .data-grid thead{color:#333}.admin__data-grid-wrap-static .data-grid tr:nth-child(even) td{background-color:#f5f5f5}.admin__data-grid-wrap-static .data-grid tr:nth-child(even) td._dragging{background-color:rgba(245,245,245,.95)}.admin__data-grid-wrap-static .data-grid ul{margin-left:1rem;padding-left:1rem}.admin__data-grid-wrap-static .admin__data-grid-loading-mask{background:rgba(255,255,255,.5);bottom:0;left:0;position:absolute;right:0;top:0;z-index:399}.admin__data-grid-wrap-static .admin__data-grid-loading-mask .grid-loader{background:url(../images/loader-2.gif) 50% 50% no-repeat;bottom:0;height:149px;left:0;margin:auto;position:absolute;right:0;top:0;width:218px}.data-grid-filters-actions-wrap{float:right}.data-grid-search-control-wrap{float:left;max-width:45.5rem;position:relative;width:35%}.data-grid-search-control-wrap :-ms-input-placeholder{font-style:italic}.data-grid-search-control-wrap ::-webkit-input-placeholder{font-style:italic}.data-grid-search-control-wrap ::-moz-placeholder{font-style:italic}.data-grid-search-control-wrap .action-submit{background-color:transparent;border:none;border-radius:0;box-shadow:none;margin:0;padding:.6rem 2rem .2rem;position:absolute;right:0;top:1px}.data-grid-search-control-wrap .action-submit:hover{background-color:transparent;border:none;box-shadow:none}.data-grid-search-control-wrap .action-submit:active{-ms-transform:scale(0.9);transform:scale(0.9)}.data-grid-search-control-wrap .action-submit:hover:before{color:#1a1a1a}._keyfocus .data-grid-search-control-wrap .action-submit:focus{box-shadow:0 0 0 1px #008bdb}.data-grid-search-control-wrap .action-submit:before{content:'\e60c';font-size:2rem;transition:color .1s linear}.data-grid-search-control-wrap .action-submit>span{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.data-grid-search-control-wrap .abs-action-menu .action-submenu,.data-grid-search-control-wrap .abs-action-menu .action-submenu .action-submenu,.data-grid-search-control-wrap .action-menu,.data-grid-search-control-wrap .action-menu .action-submenu,.data-grid-search-control-wrap .actions-split .action-menu .action-submenu,.data-grid-search-control-wrap .actions-split .action-menu .action-submenu .action-submenu,.data-grid-search-control-wrap .actions-split .dropdown-menu .action-submenu,.data-grid-search-control-wrap .actions-split .dropdown-menu .action-submenu .action-submenu{max-height:19.25rem;overflow-y:auto;z-index:398}.data-grid-search-control-wrap .action-menu-item._selected{background-color:#e0f6fe}.data-grid-search-control-wrap .data-grid-search-label{display:none}.data-grid-search-control{padding-right:6rem;width:100%}.data-grid-filters-action-wrap{float:left;padding-left:2rem}.data-grid-filters-action-wrap .action-default{font-size:1.3rem;margin-bottom:1rem;padding-left:1.7rem;padding-right:2.1rem;padding-top:.7rem}.data-grid-filters-action-wrap .action-default._active{background-color:#fff;border-bottom-color:#fff;border-right-color:#ccc;font-weight:600;margin:-.1rem 0 0;padding-bottom:1.6rem;padding-top:.8rem;position:relative;z-index:281}.data-grid-filters-action-wrap .action-default._active:after{background-color:#eb5202;bottom:100%;content:'';height:3px;left:-1px;position:absolute;right:-1px}.data-grid-filters-action-wrap .action-default:before{color:#333;content:'\e605';font-size:1.8rem;margin-right:.4rem;position:relative;top:-1px;vertical-align:top}.data-grid-filters-action-wrap .filters-active{display:none}.admin__action-grid-select .admin__control-select{margin:-.5rem .5rem 0 0;padding-bottom:.6rem;padding-top:.6rem}.admin__data-grid-filters-wrap{opacity:0;visibility:hidden;clear:both;font-size:1.3rem;transition:opacity .3s ease}.admin__data-grid-filters-wrap._show{opacity:1;visibility:visible;border-bottom:1px solid #ccc;border-top:1px solid #ccc;margin-bottom:.7rem;padding:3.6rem 0 3rem;position:relative;top:-1px;z-index:280}.admin__data-grid-filters-wrap._show .admin__data-grid-filters,.admin__data-grid-filters-wrap._show .admin__data-grid-filters-footer{display:block}.admin__data-grid-filters-wrap .admin__form-field-label,.admin__data-grid-filters-wrap .admin__form-field-legend{display:block;font-weight:700;margin:0 0 .3rem;text-align:left}.admin__data-grid-filters-wrap .admin__form-field{display:inline-block;margin-bottom:2em;margin-left:0;padding-left:2rem;padding-right:2rem;vertical-align:top;width:calc(100% / 4 - 4px)}.admin__data-grid-filters-wrap .admin__form-field .admin__form-field{display:block;float:none;margin-bottom:1.5rem;padding-left:0;padding-right:0;width:auto}.admin__data-grid-filters-wrap .admin__form-field .admin__form-field:last-child{margin-bottom:0}.admin__data-grid-filters-wrap .admin__form-field .admin__form-field .admin__form-field-label{border:1px solid transparent;float:left;font-weight:400;line-height:1.36;margin-bottom:0;padding-bottom:.6rem;padding-right:1em;padding-top:.6rem;width:25%}.admin__data-grid-filters-wrap .admin__form-field .admin__form-field .admin__form-field-control{margin-left:25%}.admin__data-grid-filters-wrap .admin__action-multiselect,.admin__data-grid-filters-wrap .admin__control-select,.admin__data-grid-filters-wrap .admin__control-text,.admin__data-grid-filters-wrap .admin__form-field-label{font-size:1.3rem}.admin__data-grid-filters-wrap .admin__control-select{height:3.2rem;padding-top:.5rem}.admin__data-grid-filters-wrap .admin__action-multiselect:before{height:3.2rem;width:3.2rem}.admin__data-grid-filters-wrap .admin__control-select,.admin__data-grid-filters-wrap .admin__control-text._has-datepicker{width:100%}.admin__data-grid-filters{display:none;margin-left:-2rem;margin-right:-2rem}.admin__filters-legend{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.admin__data-grid-filters-footer{display:none;font-size:1.4rem}.admin__data-grid-filters-footer .admin__footer-main-actions{margin-left:25%;text-align:right}.admin__data-grid-filters-footer .admin__footer-secondary-actions{float:left;width:50%}.admin__data-grid-filters-current{border-bottom:.1rem solid #ccc;border-top:.1rem solid #ccc;display:none;font-size:1.3rem;margin-bottom:.9rem;padding-bottom:.8rem;padding-top:1.1rem;width:100%}.admin__data-grid-filters-current._show{display:table;position:relative;top:-1px;z-index:3}.admin__data-grid-filters-current._show+.admin__data-grid-filters-wrap._show{margin-top:-1rem}.admin__current-filters-actions-wrap,.admin__current-filters-list-wrap,.admin__current-filters-title-wrap{display:table-cell;vertical-align:top}.admin__current-filters-title{margin-right:1em;white-space:nowrap}.admin__current-filters-list-wrap{width:100%}.admin__current-filters-list{margin-bottom:0}.admin__current-filters-list>li{display:inline-block;font-weight:600;margin:0 1rem .5rem;padding-right:2.6rem;position:relative}.admin__current-filters-list .action-remove{background-color:transparent;border:none;border-radius:0;box-shadow:none;margin:0;padding:0;line-height:1;position:absolute;right:0;top:1px}.admin__current-filters-list .action-remove:hover{background-color:transparent;border:none;box-shadow:none}.admin__current-filters-list .action-remove:hover:before{color:#949494}.admin__current-filters-list .action-remove:active{-ms-transform:scale(0.9);transform:scale(0.9)}.admin__current-filters-list .action-remove:before{color:#adadad;content:'\e620';font-size:1.6rem;transition:color .1s linear}.admin__current-filters-list .action-remove>span{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.admin__current-filters-actions-wrap .action-clear{border:none;padding-bottom:0;padding-top:0;white-space:nowrap}.admin__data-grid-pager-wrap{float:right;text-align:right}.admin__data-grid-pager{display:inline-block;margin-left:3rem}.admin__data-grid-pager .admin__control-text::-webkit-inner-spin-button,.admin__data-grid-pager .admin__control-text::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.admin__data-grid-pager .admin__control-text{-moz-appearance:textfield;text-align:center;width:4.4rem}.action-next,.action-previous{width:4.4rem}.action-next:before,.action-previous:before{font-weight:700}.action-next>span,.action-previous>span{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.action-previous{margin-right:2.5rem;text-indent:-.25em}.action-previous:before{content:'\e629'}.action-next{margin-left:1.5rem;text-indent:.1em}.action-next:before{content:'\e62a'}.admin__data-grid-action-bookmarks{opacity:.98}.admin__data-grid-action-bookmarks .admin__action-dropdown-text:after{left:0;right:-6px}.admin__data-grid-action-bookmarks._active{z-index:290}.admin__data-grid-action-bookmarks .admin__action-dropdown .admin__action-dropdown-text{display:inline-block;max-width:15rem;min-width:4.9rem;vertical-align:top;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.admin__data-grid-action-bookmarks .admin__action-dropdown:before{content:'\e60f'}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu{font-size:1.3rem;left:0;padding:1rem 0;right:auto}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu>li{padding:0 5rem 0 0;position:relative;white-space:nowrap}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu>li:not(.action-dropdown-menu-action){transition:background-color .1s linear}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu>li:not(.action-dropdown-menu-action):hover{background-color:#e3e3e3}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-item{max-width:23rem;min-width:18rem;white-space:normal;word-break:break-all}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-item-edit{display:none;padding-bottom:1rem;padding-left:1rem;padding-top:1rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-item-edit .action-dropdown-menu-item-actions{padding-bottom:1rem;padding-top:1rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-action{padding-left:1rem;padding-top:1rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-action+.action-dropdown-menu-item-last{padding-top:.5rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-action>a{color:#008bdb;text-decoration:none;display:inline-block;padding-left:1.1rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-action>a:hover{color:#0fa7ff;text-decoration:underline}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-item-last{padding-bottom:0}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu ._edit .action-dropdown-menu-item{display:none}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu ._edit .action-dropdown-menu-item-edit{display:block}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu ._active .action-dropdown-menu-link{font-weight:600}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .admin__control-text{font-size:1.3rem;min-width:15rem;width:calc(100% - 4rem)}.ie9 .admin__data-grid-action-bookmarks .admin__action-dropdown-menu .admin__control-text{width:15rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-item-actions{border-left:1px solid #fff;bottom:0;position:absolute;right:0;top:0;width:5rem}.admin__data-grid-action-bookmarks .admin__action-dropdown-menu .action-dropdown-menu-link{color:#333;display:block;text-decoration:none;padding:1rem 1rem 1rem 2.1rem}.admin__data-grid-action-bookmarks .action-delete,.admin__data-grid-action-bookmarks .action-edit,.admin__data-grid-action-bookmarks .action-submit{background-color:transparent;border:none;border-radius:0;box-shadow:none;margin:0;vertical-align:top}.admin__data-grid-action-bookmarks .action-delete:hover,.admin__data-grid-action-bookmarks .action-edit:hover,.admin__data-grid-action-bookmarks .action-submit:hover{background-color:transparent;border:none;box-shadow:none}.admin__data-grid-action-bookmarks .action-delete:before,.admin__data-grid-action-bookmarks .action-edit:before,.admin__data-grid-action-bookmarks .action-submit:before{font-size:1.7rem}.admin__data-grid-action-bookmarks .action-delete>span,.admin__data-grid-action-bookmarks .action-edit>span,.admin__data-grid-action-bookmarks .action-submit>span{clip:rect(0,0,0,0);overflow:hidden;position:absolute}.admin__data-grid-action-bookmarks .action-delete,.admin__data-grid-action-bookmarks .action-edit{padding:.6rem 1.4rem}.admin__data-grid-action-bookmarks .action-delete:active,.admin__data-grid-action-bookmarks .action-edit:active{-ms-transform:scale(0.9);transform:scale(0.9)}.admin__data-grid-action-bookmarks .action-submit{padding:.6rem 1rem .6rem .8rem}.admin__data-grid-action-bookmarks .action-submit:active{position:relative;right:-1px}.admin__data-grid-action-bookmarks .action-submit:before{content:'\e625'}.admin__data-grid-action-bookmarks .action-delete:before{content:'\e630'}.admin__data-grid-action-bookmarks .action-edit{padding-top:.8rem}.admin__data-grid-action-bookmarks .action-edit:before{content:'\e631'}.admin__data-grid-action-columns._active{opacity:.98;z-index:290}.admin__data-grid-action-columns .admin__action-dropdown:before{content:'\e610';font-size:1.8rem;margin-right:.7rem;vertical-align:top}.admin__data-grid-action-columns-menu{color:#303030;font-size:1.3rem;overflow:hidden;padding:2.2rem 3.5rem 1rem;z-index:1}.admin__data-grid-action-columns-menu._overflow .admin__action-dropdown-menu-header{border-bottom:1px solid #d1d1d1}.admin__data-grid-action-columns-menu._overflow .admin__action-dropdown-menu-content{width:49.2rem}.admin__data-grid-action-columns-menu._overflow .admin__action-dropdown-menu-footer{border-top:1px solid #d1d1d1;padding-top:2.5rem}.admin__data-grid-action-columns-menu .admin__action-dropdown-menu-content{max-height:22.85rem;overflow-y:auto;padding-top:1.5rem;position:relative;width:47.4rem}.admin__data-grid-action-columns-menu .admin__field-option{float:left;height:1.9rem;margin-bottom:1.5rem;padding:0 1rem 0 0;width:15.8rem}.admin__data-grid-action-columns-menu .admin__field-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block}.admin__data-grid-action-columns-menu .admin__action-dropdown-menu-header{padding-bottom:1.5rem}.admin__data-grid-action-columns-menu .admin__action-dropdown-menu-footer{padding:1rem 0 2rem}.admin__data-grid-action-columns-menu .admin__action-dropdown-footer-main-actions{margin-left:25%;text-align:right}.admin__data-grid-action-columns-menu .admin__action-dropdown-footer-secondary-actions{float:left;margin-left:-1em}.admin__data-grid-action-export._active{opacity:.98;z-index:290}.admin__data-grid-action-export .admin__action-dropdown:before{content:'\e635';font-size:1.7rem;left:.3rem;margin-right:.7rem;vertical-align:top}.admin__data-grid-action-export-menu{padding-left:2rem;padding-right:2rem;padding-top:1rem}.admin__data-grid-action-export-menu .admin__action-dropdown-footer-main-actions{padding-bottom:2rem;padding-top:2.5rem;white-space:nowrap}.sticky-header{background-color:#f8f8f8;border-bottom:1px solid #e3e3e3;box-shadow:0 5px 5px 0 rgba(0,0,0,.25);left:8.8rem;margin-top:-1px;padding:.5rem 3rem 0;position:fixed;right:0;top:77px;z-index:398}.sticky-header .admin__data-grid-wrap{margin-bottom:0;overflow-x:visible;padding-bottom:0}.sticky-header .admin__data-grid-header-row{position:relative;text-align:right}.sticky-header .admin__data-grid-header-row:last-child{margin:0}.sticky-header .admin__data-grid-actions-wrap,.sticky-header .admin__data-grid-filters-wrap,.sticky-header .admin__data-grid-pager-wrap,.sticky-header .data-grid-filters-actions-wrap,.sticky-header .data-grid-search-control-wrap{display:inline-block;float:none;vertical-align:top}.sticky-header .action-select-wrap{float:left;margin-right:1.5rem;width:16.66666667%}.sticky-header .admin__control-support-text{float:left}.sticky-header .data-grid-search-control-wrap{margin:-.5rem 0 0 1.1rem;width:auto}.sticky-header .data-grid-search-control-wrap .data-grid-search-label{box-sizing:border-box;cursor:pointer;display:block;min-width:3.8rem;padding:1.2rem .6rem 1.7rem;position:relative;text-align:center}.sticky-header .data-grid-search-control-wrap .data-grid-search-label:before{color:#333;content:'\e60c';font-size:2rem;transition:color .1s linear}.sticky-header .data-grid-search-control-wrap .data-grid-search-label:hover:before{color:#000}.sticky-header .data-grid-search-control-wrap .data-grid-search-label span{display:none}.sticky-header .data-grid-filters-actions-wrap{margin:-.5rem 0 0 1.1rem;padding-left:0;position:relative}.sticky-header .data-grid-filters-actions-wrap .action-default{background-color:transparent;border:1px solid transparent;box-sizing:border-box;min-width:3.8rem;padding:1.2rem .6rem 1.7rem;text-align:center;transition:all .15s ease}.sticky-header .data-grid-filters-actions-wrap .action-default span{display:none}.sticky-header .data-grid-filters-actions-wrap .action-default:before{margin:0}.sticky-header .data-grid-filters-actions-wrap .action-default._active{background-color:#fff;border-color:#adadad #adadad #fff;box-shadow:1px 1px 5px rgba(0,0,0,.5);z-index:210}.sticky-header .data-grid-filters-actions-wrap .action-default._active:after{background-color:#fff;content:'';height:6px;left:-2px;position:absolute;right:-6px;top:100%}.sticky-header .data-grid-filters-action-wrap{padding:0}.sticky-header .admin__data-grid-filters-wrap{background-color:#fff;border:1px solid #adadad;box-shadow:0 5px 5px 0 rgba(0,0,0,.25);left:0;padding-left:3.5rem;padding-right:3.5rem;position:absolute;top:100%;width:100%;z-index:209}.sticky-header .admin__data-grid-filters-current+.admin__data-grid-filters-wrap._show{margin-top:-6px}.sticky-header .filters-active{background-color:#e04f00;border-radius:10px;color:#fff;display:block;font-size:1.4rem;font-weight:700;padding:.1rem .7rem;position:absolute;right:-7px;top:0;z-index:211}.sticky-header .filters-active:empty{padding-bottom:0;padding-top:0}.sticky-header .admin__data-grid-actions-wrap{margin:-.5rem 0 0 1.1rem;padding-right:.3rem}.sticky-header .admin__data-grid-actions-wrap .admin__action-dropdown{background-color:transparent;box-sizing:border-box;min-width:3.8rem;padding-left:.6rem;padding-right:.6rem;text-align:center}.sticky-header .admin__data-grid-actions-wrap .admin__action-dropdown .admin__action-dropdown-text{display:inline-block;max-width:0;min-width:0;overflow:hidden}.sticky-header .admin__data-grid-actions-wrap .admin__action-dropdown:before{margin:0}.sticky-header .admin__data-grid-actions-wrap .admin__action-dropdown-wrap{margin-right:1.1rem}.sticky-header .admin__data-grid-actions-wrap .admin__action-dropdown-wrap:after,.sticky-header .admin__data-grid-actions-wrap .admin__action-dropdown:after{display:none}.sticky-header .admin__data-grid-actions-wrap ._active .admin__action-dropdown{background-color:#fff}.sticky-header .admin__data-grid-action-bookmarks .admin__action-dropdown:before{position:relative;top:-3px}.sticky-header .admin__data-grid-filters-current{border-bottom:0;border-top:0;margin-bottom:0;padding-bottom:0;padding-top:0}.sticky-header .admin__data-grid-pager .admin__control-text,.sticky-header .admin__data-grid-pager-wrap .admin__control-support-text,.sticky-header .data-grid-search-control-wrap .action-submit,.sticky-header .data-grid-search-control-wrap .data-grid-search-control{display:none}.sticky-header .action-next{margin:0}.sticky-header .data-grid{margin-bottom:-1px}.data-grid-cap-left,.data-grid-cap-right{background-color:#f8f8f8;bottom:-2px;position:absolute;top:6rem;width:3rem;z-index:201}.data-grid-cap-left{left:0}.admin__data-grid-header{font-size:1.4rem}.admin__data-grid-header-row+.admin__data-grid-header-row{margin-top:1.1rem}.admin__data-grid-header-row:last-child{margin-bottom:0}.admin__data-grid-header-row .action-select-wrap{display:block}.admin__data-grid-header-row .action-select{width:100%}.admin__data-grid-actions-wrap{float:right;margin-left:1.1rem;margin-top:-.5rem;text-align:right}.admin__data-grid-actions-wrap .admin__action-dropdown-wrap{position:relative;text-align:left;vertical-align:middle}.admin__data-grid-actions-wrap .admin__action-dropdown-wrap._active+.admin__action-dropdown-wrap:after,.admin__data-grid-actions-wrap .admin__action-dropdown-wrap._active:after,.admin__data-grid-actions-wrap .admin__action-dropdown-wrap._hide+.admin__action-dropdown-wrap:after,.admin__data-grid-actions-wrap .admin__action-dropdown-wrap:first-child:after{display:none}.admin__data-grid-actions-wrap .admin__action-dropdown-wrap._active .admin__action-dropdown,.admin__data-grid-actions-wrap .admin__action-dropdown-wrap._active .admin__action-dropdown-menu{border-color:#adadad}.admin__data-grid-actions-wrap .admin__action-dropdown-wrap:after{border-left:1px solid #ccc;content:'';height:3.2rem;left:0;position:absolute;top:.5rem;z-index:3}.admin__data-grid-actions-wrap .admin__action-dropdown{padding-bottom:1.7rem;padding-top:1.2rem}.admin__data-grid-actions-wrap .admin__action-dropdown:after{margin-top:-.4rem}.admin__data-grid-outer-wrap{min-height:8rem;position:relative}.admin__data-grid-wrap{margin-bottom:2rem;max-width:100%;overflow-x:auto;padding-bottom:1rem;padding-top:2rem}.admin__data-grid-loading-mask{background:rgba(255,255,255,.5);bottom:0;left:0;position:absolute;right:0;top:0;z-index:399}.admin__data-grid-loading-mask .spinner{font-size:4rem;left:50%;margin-left:-2rem;margin-top:-2rem;position:absolute;top:50%}.ie9 .admin__data-grid-loading-mask .spinner{background:url(../images/loader-2.gif) 50% 50% no-repeat;bottom:0;height:149px;left:0;margin:auto;position:absolute;right:0;top:0;width:218px}.data-grid-cell-content{display:inline-block;overflow:hidden;width:100%}body._in-resize{cursor:col-resize;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body._in-resize *,body._in-resize .data-grid-th,body._in-resize .data-grid-th._draggable,body._in-resize .data-grid-th._sortable{cursor:col-resize!important}._layout-fixed{table-layout:fixed}.data-grid{border:none;font-size:1.3rem;margin-bottom:0;width:100%}.data-grid:not(._dragging-copy) ._odd-row td._dragging{background-color:#d0d0d0}.data-grid:not(._dragging-copy) ._dragging{background-color:#d9d9d9;color:rgba(48,48,48,.95)}.data-grid:not(._dragging-copy) ._dragging a{color:rgba(0,139,219,.95)}.data-grid:not(._dragging-copy) ._dragging a:hover{color:rgba(15,167,255,.95)}.data-grid._dragged{outline:#007bdb solid 1px}.data-grid thead{background-color:transparent}.data-grid tfoot th{padding:1rem}.data-grid tr._odd-row td{background-color:#f5f5f5}.data-grid tr._odd-row td._update-status-active{background:#89e1ff}.data-grid tr._odd-row td._update-status-upcoming{background:#b7ee63}.data-grid tr:hover td._update-status-active,.data-grid tr:hover td._update-status-upcoming{background-color:#e5f7fe}.data-grid tr.data-grid-tr-no-data td{font-size:1.6rem;padding:3rem;text-align:center}.data-grid tr.data-grid-tr-no-data:hover td{background-color:#fff;cursor:default}.data-grid tr:active td{background-color:#e0f6fe}.data-grid tr:hover td{background-color:#e5f7fe}.data-grid tr._dragged td{background:#d0d0d0}.data-grid tr._dragover-top td{box-shadow:inset 0 3px 0 0 #008bdb}.data-grid tr._dragover-bottom td{box-shadow:inset 0 -3px 0 0 #008bdb}.data-grid tr:not(.data-grid-editable-row):last-child td{border-bottom:.1rem solid #d6d6d6}.data-grid tr ._clickable,.data-grid tr._clickable{cursor:pointer}.data-grid tr._disabled{pointer-events:none}.data-grid td,.data-grid th{font-size:1.3rem;line-height:1.36;transition:background-color .1s linear;vertical-align:top}.data-grid td._resizing,.data-grid th._resizing{border-left:1px solid #007bdb;border-right:1px solid #007bdb}.data-grid td._hidden,.data-grid th._hidden{display:none}.data-grid td._fit,.data-grid th._fit{width:1%}.data-grid td{background-color:#fff;border-left:.1rem dashed #d6d6d6;border-right:.1rem dashed #d6d6d6;color:#303030;padding:1rem}.data-grid td:first-child{border-left-style:solid}.data-grid td:last-child{border-right-style:solid}.data-grid td .action-select-wrap{position:static}.data-grid td .action-select{color:#008bdb;text-decoration:none;background-color:transparent;border:none;font-size:1.3rem;padding:0 3rem 0 0;position:relative}.data-grid td .action-select:hover{color:#0fa7ff;text-decoration:underline}.data-grid td .action-select:hover:after{border-color:#0fa7ff transparent transparent}.data-grid td .action-select:after{border-color:#008bdb transparent transparent;margin:.6rem 0 0 .7rem;right:auto;top:auto}.data-grid td .action-select:before{display:none}.data-grid td .abs-action-menu .action-submenu,.data-grid td .abs-action-menu .action-submenu .action-submenu,.data-grid td .action-menu,.data-grid td .action-menu .action-submenu,.data-grid td .actions-split .action-menu .action-submenu,.data-grid td .actions-split .action-menu .action-submenu .action-submenu,.data-grid td .actions-split .dropdown-menu .action-submenu,.data-grid td .actions-split .dropdown-menu .action-submenu .action-submenu{left:auto;min-width:10rem;right:0;text-align:left;top:auto;z-index:1}.data-grid td._update-status-active{background:#bceeff}.data-grid td._update-status-upcoming{background:#ccf391}.data-grid th{background-color:#514943;border:.1rem solid #8a837f;border-left-color:transparent;color:#fff;font-weight:600;padding:0;text-align:left}.data-grid th:first-child{border-left-color:#8a837f}.data-grid th._dragover-left{box-shadow:inset 3px 0 0 0 #fff;z-index:2}.data-grid th._dragover-right{box-shadow:inset -3px 0 0 0 #fff}.data-grid .shadow-div{cursor:col-resize;height:100%;margin-right:-5px;position:absolute;right:0;top:0;width:10px}.data-grid .data-grid-th{background-clip:padding-box;color:#fff;padding:1rem;position:relative;vertical-align:middle}.data-grid .data-grid-th._resize-visible .shadow-div{cursor:auto;display:none}.data-grid .data-grid-th._draggable{cursor:grab}.data-grid .data-grid-th._sortable{cursor:pointer;transition:background-color .1s linear;z-index:1}.data-grid .data-grid-th._sortable:focus,.data-grid .data-grid-th._sortable:hover{background-color:#5f564f}.data-grid .data-grid-th._sortable:active{padding-bottom:.9rem;padding-top:1.1rem}.data-grid .data-grid-th.required>span:after{color:#f38a5e;content:'*';margin-left:.3rem}.data-grid .data-grid-checkbox-cell{overflow:hidden;padding:0;vertical-align:top;width:5.2rem}.data-grid .data-grid-checkbox-cell:hover{cursor:default}.data-grid .data-grid-thumbnail-cell{text-align:center;width:7rem}.data-grid .data-grid-thumbnail-cell img{border:1px solid #d6d6d6;width:5rem}.data-grid .data-grid-multicheck-cell{padding:1rem 1rem .9rem;text-align:center;vertical-align:middle}.data-grid .data-grid-onoff-cell{text-align:center;width:12rem}.data-grid .data-grid-actions-cell{padding-left:2rem;padding-right:2rem;text-align:center;width:1%}.data-grid._hidden{display:none}.data-grid._dragging-copy{box-shadow:1px 1px 5px rgba(0,0,0,.5);left:0;opacity:.95;position:fixed;top:0;z-index:1000}.data-grid._dragging-copy .data-grid-th{border:1px solid #007bdb;border-bottom:none}.data-grid._dragging-copy .data-grid-th,.data-grid._dragging-copy .data-grid-th._sortable{cursor:grabbing}.data-grid._dragging-copy tr:last-child td{border-bottom:1px solid #007bdb}.data-grid._dragging-copy td{border-left:1px solid #007bdb;border-right:1px solid #007bdb}.data-grid._dragging-copy._in-edit .data-grid-editable-row.data-grid-bulk-edit-panel td,.data-grid._dragging-copy._in-edit .data-grid-editable-row.data-grid-bulk-edit-panel td:before,.data-grid._dragging-copy._in-edit .data-grid-editable-row.data-grid-bulk-edit-panel:hover td{background-color:rgba(255,251,230,.95)}.data-grid._dragging-copy._in-edit .data-grid-editable-row td,.data-grid._dragging-copy._in-edit .data-grid-editable-row:hover td{background-color:rgba(255,255,255,.95)}.data-grid._dragging-copy._in-edit .data-grid-editable-row td:after,.data-grid._dragging-copy._in-edit .data-grid-editable-row td:before{left:0;right:0}.data-grid._dragging-copy._in-edit .data-grid-editable-row td:before{background-color:rgba(255,255,255,.95)}.data-grid._dragging-copy._in-edit .data-grid-editable-row td:only-child{border-left:1px solid #007bdb;border-right:1px solid #007bdb;left:0}.data-grid._dragging-copy._in-edit .data-grid-editable-row .admin__control-select,.data-grid._dragging-copy._in-edit .data-grid-editable-row .admin__control-text{opacity:.5}.data-grid .data-grid-controls-row td{padding-top:1.6rem}.data-grid .data-grid-controls-row td.data-grid-checkbox-cell{padding-top:.6rem}.data-grid .data-grid-controls-row td [class*=admin__control-],.data-grid .data-grid-controls-row td button{margin-top:-1.7rem}.data-grid._in-edit tr:hover td{background-color:#e6e6e6}.data-grid._in-edit ._odd-row.data-grid-editable-row td,.data-grid._in-edit ._odd-row.data-grid-editable-row:hover td{background-color:#fff}.data-grid._in-edit ._odd-row td,.data-grid._in-edit ._odd-row:hover td{background-color:#dcdcdc}.data-grid._in-edit .data-grid-editable-row-actions td,.data-grid._in-edit .data-grid-editable-row-actions:hover td{background-color:#fff}.data-grid._in-edit td{background-color:#e6e6e6;pointer-events:none}.data-grid._in-edit .data-grid-checkbox-cell{pointer-events:auto}.data-grid._in-edit .data-grid-editable-row{border:.1rem solid #adadad;border-bottom-color:#c2c2c2}.data-grid._in-edit .data-grid-editable-row:hover td{background-color:#fff}.data-grid._in-edit .data-grid-editable-row td{background-color:#fff;border-bottom-color:#fff;border-left-style:hidden;border-right-style:hidden;border-top-color:#fff;pointer-events:auto;vertical-align:middle}.data-grid._in-edit .data-grid-editable-row td:first-child{border-left-color:#adadad;border-left-style:solid}.data-grid._in-edit .data-grid-editable-row td:first-child:after,.data-grid._in-edit .data-grid-editable-row td:first-child:before{left:0}.data-grid._in-edit .data-grid-editable-row td:last-child{border-right-color:#adadad;border-right-style:solid;left:-.1rem}.data-grid._in-edit .data-grid-editable-row td:last-child:after,.data-grid._in-edit .data-grid-editable-row td:last-child:before{right:0}.data-grid._in-edit .data-grid-editable-row .admin__control-select,.data-grid._in-edit .data-grid-editable-row .admin__control-text{width:100%}.data-grid._in-edit .data-grid-bulk-edit-panel td{vertical-align:bottom}.data-grid .data-grid-editable-row td{border-left-color:#fff;border-left-style:solid;position:relative;z-index:1}.data-grid .data-grid-editable-row td:after{bottom:0;box-shadow:0 5px 5px rgba(0,0,0,.25);content:'';height:.9rem;left:0;margin-top:-1rem;position:absolute;right:0}.data-grid .data-grid-editable-row td:before{background-color:#fff;bottom:0;content:'';height:1rem;left:-10px;position:absolute;right:-10px;z-index:1}.data-grid .data-grid-editable-row.data-grid-editable-row-actions td,.data-grid .data-grid-editable-row.data-grid-editable-row-actions:hover td{background-color:#fff}.data-grid .data-grid-editable-row.data-grid-editable-row-actions td:first-child{border-left-color:#fff;border-right-color:#fff}.data-grid .data-grid-editable-row.data-grid-editable-row-actions td:last-child{left:0}.data-grid .data-grid-editable-row.data-grid-bulk-edit-panel td,.data-grid .data-grid-editable-row.data-grid-bulk-edit-panel td:before,.data-grid .data-grid-editable-row.data-grid-bulk-edit-panel:hover td{background-color:#fffbe6}.data-grid .data-grid-editable-row-actions{left:50%;margin-left:-12.5rem;margin-top:-2px;position:absolute;text-align:center}.data-grid .data-grid-editable-row-actions td{width:25rem}.data-grid .data-grid-editable-row-actions [class*=action-]{min-width:9rem}.data-grid .data-grid-draggable-row-cell{width:1%}.data-grid .data-grid-draggable-row-cell .draggable-handle{padding:0}.data-grid-th._sortable._ascend,.data-grid-th._sortable._descend{padding-right:2.7rem}.data-grid-th._sortable._ascend:before,.data-grid-th._sortable._descend:before{margin-top:-1em;position:absolute;right:1rem;top:50%}.data-grid-th._sortable._ascend:before{content:'\2193'}.data-grid-th._sortable._descend:before{content:'\2191'}.data-grid-checkbox-cell-inner{display:block;padding:1.1rem 1.8rem .9rem;text-align:right}.data-grid-checkbox-cell-inner:hover{cursor:pointer}.data-grid-state-cell-inner{display:block;padding:1.1rem 1.8rem .9rem;text-align:center}.data-grid-state-cell-inner>span{display:inline-block;font-style:italic;padding:.6rem 0}.data-grid-row-parent._active>td .data-grid-checkbox-cell-inner:before{content:'\e62b'}.data-grid-row-parent>td .data-grid-checkbox-cell-inner{padding-left:3.7rem;position:relative}.data-grid-row-parent>td .data-grid-checkbox-cell-inner:before{content:'\e628';font-size:1rem;font-weight:700;left:1.35rem;position:absolute;top:1.6rem}.data-grid-th._col-xs{width:1%}.data-grid-info-panel{box-shadow:0 0 5px rgba(0,0,0,.5);margin:2rem .1rem -2rem}.data-grid-info-panel .messages{overflow:hidden}.data-grid-info-panel .messages .message{margin:1rem}.data-grid-info-panel .messages .message:last-child{margin-bottom:1rem}.data-grid-info-panel-actions{padding:1rem;text-align:right}.data-grid-editable-row .admin__field-control{position:relative}.data-grid-editable-row .admin__field-control._error:after{border-color:transparent #ee7d7d transparent transparent;border-style:solid;border-width:0 12px 12px 0;content:'';position:absolute;right:0;top:0}.data-grid-editable-row .admin__field-control._error .admin__control-text{border-color:#ee7d7d}.data-grid-editable-row .admin__field-control._focus:after{display:none}.data-grid-editable-row .admin__field-error{bottom:100%;box-shadow:1px 1px 5px rgba(0,0,0,.5);left:0;margin:0 auto 1.5rem;max-width:32rem;position:absolute;right:0}.data-grid-editable-row .admin__field-error:after,.data-grid-editable-row .admin__field-error:before{border-style:solid;content:'';left:50%;position:absolute;top:100%}.data-grid-editable-row .admin__field-error:after{border-color:#fffbbb transparent transparent;border-width:10px 10px 0;margin-left:-10px;z-index:1}.data-grid-editable-row .admin__field-error:before{border-color:#ee7d7d transparent transparent;border-width:11px 12px 0;margin-left:-12px}.data-grid-bulk-edit-panel .admin__field-label-vertical{display:block;font-size:1.2rem;margin-bottom:.5rem;text-align:left}.data-grid-row-changed{cursor:default;display:block;opacity:.5;position:relative;width:100%;z-index:1}.data-grid-row-changed:after{content:'\e631';display:inline-block}.data-grid-row-changed .data-grid-row-changed-tooltip{background:#f1f1f1;border:1px solid #f1f1f1;border-radius:1px;bottom:100%;box-shadow:0 3px 9px 0 rgba(0,0,0,.3);display:none;font-weight:400;line-height:1.36;margin-bottom:1.5rem;padding:1rem;position:absolute;right:-1rem;text-transform:none;width:27rem;word-break:normal;z-index:2}.data-grid-row-changed._changed{opacity:1;z-index:3}.data-grid-row-changed._changed:hover .data-grid-row-changed-tooltip{display:block}.data-grid-row-changed._changed:hover:before{background:#f1f1f1;border:1px solid #f1f1f1;bottom:100%;box-shadow:4px 4px 3px -1px rgba(0,0,0,.15);content:'';display:block;height:1.6rem;left:50%;margin:0 0 .7rem -.8rem;position:absolute;-ms-transform:rotate(45deg);transform:rotate(45deg);width:1.6rem;z-index:3}.ie9 .data-grid-row-changed._changed:hover:before{display:none}.admin__data-grid-outer-wrap .data-grid-checkbox-cell{overflow:hidden}.admin__data-grid-outer-wrap .data-grid-checkbox-cell-inner{position:relative}.admin__data-grid-outer-wrap .data-grid-checkbox-cell-inner:before{bottom:0;content:'';height:500%;left:0;position:absolute;right:0;top:0}.admin__data-grid-wrap-static .data-grid-checkbox-cell:hover{cursor:pointer}.admin__data-grid-wrap-static .data-grid-checkbox-cell-inner{margin:1.1rem 1.8rem .9rem;padding:0}.adminhtml-cms-hierarchy-index .admin__data-grid-wrap-static .data-grid-actions-cell:first-child{padding:0}.adminhtml-export-index .admin__data-grid-wrap-static .data-grid-checkbox-cell-inner{margin:0;padding:1.1rem 1.8rem 1.9rem}.admin__control-addon [class*=admin__control-][class]~[class*=admin__addon-]:last-child:before,.admin__control-file-label:before,.admin__control-multiselect,.admin__control-select,.admin__control-text,.admin__control-textarea,.selectmenu{-webkit-appearance:none;background-color:#fff;border:1px solid #adadad;border-radius:1px;box-shadow:none;color:#303030;font-size:1.4rem;font-weight:400;height:auto;line-height:1.36;padding:.6rem 1rem;transition:border-color .1s linear;vertical-align:baseline;width:auto}.admin__control-addon [class*=admin__control-][class]:hover~[class*=admin__addon-]:last-child:before,.admin__control-multiselect:hover,.admin__control-select:hover,.admin__control-text:hover,.admin__control-textarea:hover,.selectmenu:hover,.selectmenu:hover .selectmenu-toggle:before{border-color:#878787}.admin__control-addon [class*=admin__control-][class]:focus~[class*=admin__addon-]:last-child:before,.admin__control-file:active+.admin__control-file-label:before,.admin__control-file:focus+.admin__control-file-label:before,.admin__control-multiselect:focus,.admin__control-select:focus,.admin__control-text:focus,.admin__control-textarea:focus,.selectmenu._focus,.selectmenu._focus .selectmenu-toggle:before{border-color:#007bdb;box-shadow:none;outline:0}.admin__control-addon [class*=admin__control-][class][disabled]~[class*=admin__addon-]:last-child:before,.admin__control-file[disabled]+.admin__control-file-label:before,.admin__control-multiselect[disabled],.admin__control-select[disabled],.admin__control-text[disabled],.admin__control-textarea[disabled]{background-color:#e9e9e9;border-color:#adadad;color:#303030;cursor:not-allowed;opacity:.5}.admin__field-row[class]>.admin__field-control,.admin__fieldset>.admin__field.admin__field-wide[class]>.admin__field-control{clear:left;float:none;text-align:left;width:auto}.admin__field-row[class]:not(.admin__field-option)>.admin__field-label,.admin__fieldset>.admin__field.admin__field-wide[class]:not(.admin__field-option)>.admin__field-label{display:block;line-height:1.4rem;margin-bottom:.86rem;margin-top:-.14rem;text-align:left;width:auto}.admin__field-row[class]:not(.admin__field-option)>.admin__field-label:before,.admin__fieldset>.admin__field.admin__field-wide[class]:not(.admin__field-option)>.admin__field-label:before{display:none}.admin__field-row[class]:not(.admin__field-option)._required>.admin__field-label span,.admin__field-row[class]:not(.admin__field-option).required>.admin__field-label span,.admin__fieldset>.admin__field.admin__field-wide[class]:not(.admin__field-option)._required>.admin__field-label span,.admin__fieldset>.admin__field.admin__field-wide[class]:not(.admin__field-option).required>.admin__field-label span{padding-left:1.5rem}.admin__field-row[class]:not(.admin__field-option)._required>.admin__field-label span:after,.admin__field-row[class]:not(.admin__field-option).required>.admin__field-label span:after,.admin__fieldset>.admin__field.admin__field-wide[class]:not(.admin__field-option)._required>.admin__field-label span:after,.admin__fieldset>.admin__field.admin__field-wide[class]:not(.admin__field-option).required>.admin__field-label span:after{left:0;margin-left:30px}.admin__legend{font-size:1.8rem;font-weight:600;margin-bottom:3rem}.admin__control-checkbox,.admin__control-radio{cursor:pointer;opacity:.01;overflow:hidden;position:absolute;vertical-align:top}.admin__control-checkbox:after,.admin__control-radio:after{display:none}.admin__control-checkbox+label,.admin__control-radio+label{cursor:pointer;display:inline-block}.admin__control-checkbox+label:before,.admin__control-radio+label:before{background-color:#fff;border:1px solid #adadad;color:transparent;float:left;height:1.6rem;text-align:center;vertical-align:top;width:1.6rem}.admin__control-checkbox+.admin__field-label,.admin__control-radio+.admin__field-label{padding-left:2.6rem}.admin__control-checkbox+.admin__field-label:before,.admin__control-radio+.admin__field-label:before{margin:1px 1rem 0 -2.6rem}.admin__control-checkbox:checked+label:before,.admin__control-radio:checked+label:before{color:#514943}.admin__control-checkbox.disabled+label,.admin__control-checkbox[disabled]+label,.admin__control-radio.disabled+label,.admin__control-radio[disabled]+label{color:#303030;cursor:default;opacity:.5}.admin__control-checkbox.disabled+label:before,.admin__control-checkbox[disabled]+label:before,.admin__control-radio.disabled+label:before,.admin__control-radio[disabled]+label:before{background-color:#e9e9e9;border-color:#adadad;cursor:default}._keyfocus .admin__control-checkbox:not(.disabled):focus+label:before,._keyfocus .admin__control-checkbox:not([disabled]):focus+label:before,._keyfocus .admin__control-radio:not(.disabled):focus+label:before,._keyfocus .admin__control-radio:not([disabled]):focus+label:before{border-color:#007bdb}.admin__control-checkbox:not(.disabled):hover+label:before,.admin__control-checkbox:not([disabled]):hover+label:before,.admin__control-radio:not(.disabled):hover+label:before,.admin__control-radio:not([disabled]):hover+label:before{border-color:#878787}.admin__control-radio+label:before{border-radius:1.6rem;content:'';transition:border-color .1s linear,color .1s ease-in}.admin__control-radio.admin__control-radio+label:before{line-height:140%}.admin__control-radio:checked+label{position:relative}.admin__control-radio:checked+label:after{background-color:#514943;border-radius:50%;content:'';height:10px;left:3px;position:absolute;top:4px;width:10px}.admin__control-radio:checked:not(.disabled):hover,.admin__control-radio:checked:not(.disabled):hover+label,.admin__control-radio:checked:not([disabled]):hover,.admin__control-radio:checked:not([disabled]):hover+label{cursor:default}.admin__control-radio:checked:not(.disabled):hover+label:before,.admin__control-radio:checked:not([disabled]):hover+label:before{border-color:#adadad}.admin__control-checkbox+label:before{border-radius:1px;content:'';font-size:0;transition:font-size .1s ease-out,color .1s ease-out,border-color .1s linear}.admin__control-checkbox:checked+label:before{content:'\e62d';font-size:1.1rem;line-height:125%}.admin__control-checkbox:not(:checked)._indeterminate+label:before,.admin__control-checkbox:not(:checked):indeterminate+label:before{color:#514943;content:'-';font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700}input[type=checkbox].admin__control-checkbox,input[type=radio].admin__control-checkbox{margin:0;position:absolute}.admin__control-text{min-width:4rem}.admin__control-select{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;appearance:none;background-image:url(../images/arrows-bg.svg),linear-gradient(#e3e3e3,#e3e3e3),linear-gradient(#adadad,#adadad);background-position:calc(100% - 12px) -34px,100%,calc(100% - 3.2rem) 0;background-size:auto,3.2rem 100%,1px 100%;background-repeat:no-repeat;max-width:100%;min-width:8.5rem;padding-bottom:.5rem;padding-right:4.4rem;padding-top:.5rem;transition:border-color .1s linear}.admin__control-select:hover{border-color:#878787;cursor:pointer}.admin__control-select:focus{background-image:url(../images/arrows-bg.svg),linear-gradient(#e3e3e3,#e3e3e3),linear-gradient(#007bdb,#007bdb);background-position:calc(100% - 12px) 13px,100%,calc(100% - 3.2rem) 0;border-color:#007bdb}.admin__control-select::-ms-expand{display:none}.ie9 .admin__control-select{background-image:none;padding-right:1rem}option:empty{display:none}.admin__control-multiselect{height:auto;max-width:100%;min-width:15rem;overflow:auto;padding:0;resize:both}.admin__control-multiselect optgroup,.admin__control-multiselect option{padding:.5rem 1rem}.admin__control-file-wrapper{display:inline-block;padding:.5rem 1rem;position:relative;z-index:1}.admin__control-file-label:before{content:'';left:0;position:absolute;top:0;width:100%;z-index:0}.admin__control-file{background:0 0;border:0;padding-top:.7rem;position:relative;width:auto;z-index:1}.admin__control-support-text{border:1px solid transparent;display:inline-block;font-size:1.4rem;line-height:1.36;padding-bottom:.6rem;padding-top:.6rem}.admin__control-support-text+[class*=admin__control-],[class*=admin__control-]+.admin__control-support-text{margin-left:.7rem}.admin__control-service{float:left;margin:.8rem 0 0 3rem}.admin__control-textarea{height:8.48rem;line-height:1.18;padding-top:.8rem;resize:vertical}.admin__control-addon{-ms-flex-direction:row;flex-direction:row;display:inline-flex;-ms-flex-flow:row nowrap;flex-flow:row nowrap;position:relative;width:100%;z-index:1}.admin__control-addon>[class*=admin__addon-],.admin__control-addon>[class*=admin__control-]{-ms-flex-preferred-size:auto;flex-basis:auto;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-ms-flex-negative:0;flex-shrink:0;position:relative;z-index:1}.admin__control-addon .admin__control-select{width:auto}.admin__control-addon .admin__control-text{margin:.1rem;padding:.5rem .9rem;width:100%}.admin__control-addon [class*=admin__control-][class]{appearence:none;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;-ms-flex-order:1;order:1;-ms-flex-negative:1;flex-shrink:1;background-color:transparent;border-color:transparent;box-shadow:none;vertical-align:top}.admin__control-addon [class*=admin__control-][class]+[class*=admin__control-]{border-left-color:#adadad}.admin__control-addon [class*=admin__control-][class] :focus{box-shadow:0}.admin__control-addon [class*=admin__control-][class]~[class*=admin__addon-]:last-child{padding-left:1rem;position:static!important;z-index:0}.admin__control-addon [class*=admin__control-][class]~[class*=admin__addon-]:last-child>*{position:relative;vertical-align:top;z-index:1}.admin__control-addon [class*=admin__control-][class]~[class*=admin__addon-]:last-child:empty{padding:0}.admin__control-addon [class*=admin__control-][class]~[class*=admin__addon-]:last-child:before{bottom:0;box-sizing:border-box;content:'';left:0;position:absolute;top:0;width:100%;z-index:-1}.admin__addon-prefix,.admin__addon-suffix{border:0;box-sizing:border-box;color:#858585;display:inline-block;font-size:1.4rem;font-weight:400;height:3.2rem;line-height:3.2rem;padding:0}.admin__addon-suffix{-ms-flex-order:3;order:3}.admin__addon-suffix:last-child{padding-right:1rem}.admin__addon-prefix{-ms-flex-order:0;order:0}.ie9 .admin__control-addon:after{clear:both;content:'';display:block;height:0;overflow:hidden}.ie9 .admin__addon{min-width:0;overflow:hidden;text-align:right;white-space:nowrap;width:auto}.ie9 .admin__addon [class*=admin__control-]{display:inline}.ie9 .admin__addon-prefix{float:left}.ie9 .admin__addon-suffix{float:right}.admin__control-collapsible{width:100%}.admin__control-collapsible ._dragged .admin__collapsible-block-wrapper .admin__collapsible-title{background:#d0d0d0}.admin__control-collapsible ._dragover-bottom .admin__collapsible-block-wrapper:before,.admin__control-collapsible ._dragover-top .admin__collapsible-block-wrapper:before{background:#008bdb;content:'';display:block;height:3px;left:0;position:absolute;right:0}.admin__control-collapsible ._dragover-top .admin__collapsible-block-wrapper:before{top:-3px}.admin__control-collapsible ._dragover-bottom .admin__collapsible-block-wrapper:before{bottom:-3px}.admin__control-collapsible .admin__collapsible-block-wrapper.fieldset-wrapper{border:0;margin:0;position:relative}.admin__control-collapsible .admin__collapsible-block-wrapper.fieldset-wrapper .fieldset-wrapper-title{background:#f8f8f8;border:2px solid #ccc}.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .admin__collapsible-title{font-size:1.4rem;font-weight:400;line-height:1;padding:1.6rem 4rem 1.6rem 3.8rem}.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .admin__collapsible-title:before{left:1rem;right:auto;top:1.4rem}.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .action-delete{background-color:transparent;border-color:transparent;box-shadow:none;padding:0;position:absolute;right:1rem;top:1.4rem}.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .action-delete:hover{background-color:transparent;border-color:transparent;box-shadow:none}.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .action-delete:before{content:'\e630';font-size:2rem}.admin__control-collapsible .admin__collapsible-block-wrapper .fieldset-wrapper-title .action-delete>span{display:none}.admin__control-collapsible .admin__collapsible-content{background-color:#fff;margin-bottom:1rem}.admin__control-collapsible .admin__collapsible-content>.fieldset-wrapper{border:1px solid #ccc;margin-top:-1px;padding:1rem}.admin__control-collapsible .admin__collapsible-content .admin__fieldset{padding:0}.admin__control-collapsible .admin__collapsible-content .admin__field:last-child{margin-bottom:0}.admin__control-table-wrapper{max-width:100%;overflow-x:auto;overflow-y:hidden}.admin__control-table{width:100%}.admin__control-table thead{background-color:transparent}.admin__control-table tbody td{vertical-align:top}.admin__control-table tfoot th{padding-bottom:1.3rem}.admin__control-table tfoot th.validation{padding-bottom:0;padding-top:0}.admin__control-table tfoot td{border-top:1px solid #fff}.admin__control-table tfoot .admin__control-table-pagination{float:right;padding-bottom:0}.admin__control-table tfoot .action-previous{margin-right:.5rem}.admin__control-table tfoot .action-next{margin-left:.9rem}.admin__control-table tr:last-child td{border-bottom:none}.admin__control-table tr._dragover-top td{box-shadow:inset 0 3px 0 0 #008bdb}.admin__control-table tr._dragover-bottom td{box-shadow:inset 0 -3px 0 0 #008bdb}.admin__control-table tr._dragged td,.admin__control-table tr._dragged th{background:#d0d0d0}.admin__control-table td,.admin__control-table th{background-color:#efefef;border:0;border-bottom:1px solid #fff;padding:1.3rem 1rem 1.3rem 0;text-align:left;vertical-align:top}.admin__control-table td:first-child,.admin__control-table th:first-child{padding-left:1rem}.admin__control-table td>.admin__control-select,.admin__control-table td>.admin__control-text,.admin__control-table th>.admin__control-select,.admin__control-table th>.admin__control-text{width:100%}.admin__control-table td._hidden,.admin__control-table th._hidden{display:none}.admin__control-table td._fit,.admin__control-table th._fit{width:1px}.admin__control-table th{color:#303030;font-size:1.4rem;font-weight:600;vertical-align:bottom}.admin__control-table th._required span:after{color:#eb5202;content:'*'}.admin__control-table .control-table-actions-th{white-space:nowrap}.admin__control-table .control-table-actions-cell{padding-top:1.8rem;text-align:center;width:1%}.admin__control-table .control-table-options-th{text-align:center;width:10rem}.admin__control-table .control-table-options-cell{text-align:center}.admin__control-table .control-table-text{line-height:3.2rem}.admin__control-table .col-draggable{padding-top:2.2rem;width:1%}.admin__control-table .action-delete{background-color:transparent;border-color:transparent;box-shadow:none;padding-left:0;padding-right:0}.admin__control-table .action-delete:hover{background-color:transparent;border-color:transparent;box-shadow:none}.admin__control-table .action-delete:before{content:'\e630';font-size:2rem}.admin__control-table .action-delete>span{display:none}.admin__control-table .draggable-handle{padding:0}.admin__control-table._dragged{outline:#007bdb solid 1px}.admin__control-table-action{background-color:#efefef;border-top:1px solid #fff;padding:1.3rem 1rem}.admin__dynamic-rows._dragged{opacity:.95;position:absolute;z-index:999}.admin__dynamic-rows.admin__control-table .admin__control-fields>.admin__field{border:0;padding:0}.admin__dynamic-rows td>.admin__field{border:0;margin:0;padding:0}.admin__control-table-pagination{padding-bottom:1rem}.admin__control-table-pagination .admin__data-grid-pager{float:right}.admin__field-tooltip{display:inline-block;margin-top:.5rem;max-width:45px;overflow:visible;vertical-align:top;width:0}.admin__field-tooltip:hover{position:relative;z-index:500}.admin__field-option .admin__field-tooltip{margin-top:.5rem}.admin__field-tooltip .admin__field-tooltip-action{margin-left:2rem;position:relative;z-index:2;display:inline-block;text-decoration:none}.admin__field-tooltip .admin__field-tooltip-action:before{-webkit-font-smoothing:antialiased;font-size:2.2rem;line-height:1;color:#514943;content:'\e633';font-family:Icons;vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.admin__field-tooltip .admin__control-text:focus+.admin__field-tooltip-content,.admin__field-tooltip:hover .admin__field-tooltip-content{display:block}.admin__field-tooltip .admin__field-tooltip-content{bottom:3.8rem;display:none;right:-2.3rem}.admin__field-tooltip .admin__field-tooltip-content:after,.admin__field-tooltip .admin__field-tooltip-content:before{border:1.6rem solid transparent;height:0;width:0;border-top-color:#afadac;content:'';display:block;position:absolute;right:2rem;top:100%;z-index:3}.admin__field-tooltip .admin__field-tooltip-content:after{border-top-color:#fffbbb;margin-top:-1px;z-index:4}.abs-admin__field-tooltip-content,.admin__field-tooltip .admin__field-tooltip-content{box-shadow:0 2px 8px 0 rgba(0,0,0,.3);background:#fffbbb;border:1px solid #afadac;border-radius:1px;padding:1.5rem 2.5rem;position:absolute;width:32rem;z-index:1}.admin__field-fallback-reset{font-size:1.25rem;white-space:nowrap;width:30px}.admin__field-fallback-reset>span{margin-left:.5rem;position:relative}.admin__field-fallback-reset:active{-ms-transform:scale(0.98);transform:scale(0.98)}.admin__field-fallback-reset:before{transition:color .1s linear;content:'\e642';font-size:1.3rem;margin-left:.5rem}.admin__field-fallback-reset:hover{cursor:pointer;text-decoration:none}.admin__field-fallback-reset:focus{background:0 0}.abs-field-size-x-small,.abs-field-sizes.admin__field-x-small>.admin__field-control,.admin__field.admin__field-x-small>.admin__field-control,.admin__fieldset>.admin__field.admin__field-x-small>.admin__field-control,[class*=admin__control-grouped]>.admin__field.admin__field-x-small>.admin__field-control{width:8rem}.abs-field-size-small,.abs-field-sizes.admin__field-small>.admin__field-control,.admin__control-grouped-date>.admin__field-date.admin__field>.admin__field-control,.admin__field.admin__field-small>.admin__field-control,.admin__fieldset>.admin__field.admin__field-small>.admin__field-control,[class*=admin__control-grouped]>.admin__field.admin__field-small>.admin__field-control{width:15rem}.abs-field-size-medium,.abs-field-sizes.admin__field-medium>.admin__field-control,.admin__field.admin__field-medium>.admin__field-control,.admin__fieldset>.admin__field.admin__field-medium>.admin__field-control,[class*=admin__control-grouped]>.admin__field.admin__field-medium>.admin__field-control{width:34rem}.abs-field-size-large,.abs-field-sizes.admin__field-large>.admin__field-control,.admin__field.admin__field-large>.admin__field-control,.admin__fieldset>.admin__field.admin__field-large>.admin__field-control,[class*=admin__control-grouped]>.admin__field.admin__field-large>.admin__field-control{width:64rem}.abs-field-no-label,.admin__field-group-additional,.admin__field-no-label,.admin__fieldset>.admin__field.admin__field-no-label>.admin__field-control{margin-left:calc((100%) * .25 + 30px)}.admin__fieldset{border:0;margin:0;min-width:0;padding:0}.admin__fieldset .fieldset-wrapper.admin__fieldset-section>.fieldset-wrapper-title{padding-left:1rem}.admin__fieldset .fieldset-wrapper.admin__fieldset-section>.fieldset-wrapper-title strong{font-size:1.7rem;font-weight:600}.admin__fieldset .fieldset-wrapper.admin__fieldset-section .admin__fieldset-wrapper-content>.admin__fieldset{padding-top:1rem}.admin__fieldset .fieldset-wrapper.admin__fieldset-section:last-child .admin__fieldset-wrapper-content>.admin__fieldset{padding-bottom:0}.admin__fieldset>.admin__field{border:0;margin:0 0 0 -30px;padding:0}.admin__fieldset>.admin__field:after{clear:both;content:'';display:table}.admin__fieldset>.admin__field>.admin__field-control{width:calc((100%) * .5 - 30px);float:left;margin-left:30px}.admin__fieldset>.admin__field>.admin__field-label{width:calc((100%) * .25 - 30px);float:left;margin-left:30px}.admin__fieldset>.admin__field.admin__field-no-label>.admin__field-label{display:none}.admin__fieldset>.admin__field+.admin__field._empty._no-header{margin-top:-3rem}.admin__fieldset-product-websites{position:relative;z-index:300}.admin__fieldset-note{margin-bottom:2rem}.admin__form-field{border:0;margin:0;padding:0}.admin__field-control .admin__control-text,.admin__field-control .admin__control-textarea,.admin__form-field-control .admin__control-text,.admin__form-field-control .admin__control-textarea{width:100%}.admin__field-label{color:#303030;cursor:pointer;margin:0;text-align:right}.admin__field-label+br{display:none}.admin__field:not(.admin__field-option)>.admin__field-label{font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:600;line-height:3.2rem;padding:0;white-space:nowrap}.admin__field:not(.admin__field-option)>.admin__field-label:before{opacity:0;visibility:hidden;content:'.';margin-left:-7px;overflow:hidden}.admin__field:not(.admin__field-option)>.admin__field-label span{display:inline-block;line-height:1.2;vertical-align:middle;white-space:normal}.admin__field:not(.admin__field-option)>.admin__field-label span[data-config-scope]{position:relative}._required>.admin__field-label>span:after,.required>.admin__field-label>span:after{color:#eb5202;content:'*';display:inline-block;font-size:1.6rem;font-weight:500;line-height:1;margin-left:10px;margin-top:.2rem;position:absolute;z-index:1}._disabled>.admin__field-label{color:#999;cursor:default}.admin__field{margin-bottom:0}.admin__field+.admin__field{margin-top:1.5rem}.admin__field:not(.admin__field-option)~.admin__field-option{margin-top:.5rem}.admin__field.admin__field-option~.admin__field-option{margin-top:.9rem}.admin__field~.admin__field-option:last-child{margin-bottom:.8rem}.admin__fieldset>.admin__field{margin-bottom:3rem;position:relative}.admin__field legend.admin__field-label{opacity:0}.admin__field[data-config-scope]:before{color:gray;content:attr(data-config-scope);display:inline-block;font-size:1.2rem;left:calc((100%) * .75 - 30px);line-height:3.2rem;margin-left:60px;position:absolute;width:calc((100%) * .25 - 30px)}.admin__field-control .admin__field[data-config-scope]:nth-child(n+2):before{content:''}.admin__field._error .admin__field-control [class*=admin__addon-]:before,.admin__field._error .admin__field-control [class*=admin__control-] [class*=admin__addon-]:before,.admin__field._error .admin__field-control>[class*=admin__control-]{border-color:#e22626}.admin__field._disabled,.admin__field._disabled:hover{box-shadow:inherit;cursor:inherit;opacity:1;outline:inherit}.admin__field._hidden{display:none}.admin__field-control+.admin__field-control{margin-top:1.5rem}.admin__field-control._with-tooltip>.admin__control-addon,.admin__field-control._with-tooltip>.admin__control-select,.admin__field-control._with-tooltip>.admin__control-text,.admin__field-control._with-tooltip>.admin__control-textarea,.admin__field-control._with-tooltip>.admin__field-option{max-width:calc(100% - 45px - 4px)}.admin__field-control._with-tooltip .admin__field-tooltip{width:auto}.admin__field-control._with-tooltip .admin__field-option{display:inline-block}.admin__field-control._with-reset>.admin__control-addon,.admin__field-control._with-reset>.admin__control-text,.admin__field-control._with-reset>.admin__control-textarea{width:calc(100% - 30px - .5rem - 4px)}.admin__field-control._with-reset .admin__field-fallback-reset{margin-left:.5rem;margin-top:1rem;vertical-align:top}.admin__field-control._with-reset._with-tooltip>.admin__control-addon,.admin__field-control._with-reset._with-tooltip>.admin__control-text,.admin__field-control._with-reset._with-tooltip>.admin__control-textarea{width:calc(100% - 30px - .5rem - 45px - 8px)}.admin__fieldset>.admin__field-collapsible{margin-bottom:0}.admin__fieldset>.admin__field-collapsible .admin__field-control{border-top:1px solid #ccc;display:block;font-size:1.7rem;font-weight:700;padding:1.7rem 0;width:calc(97%)}.admin__fieldset>.admin__field-collapsible .admin__field-option{padding-top:0}.admin__field-collapsible+div{margin-top:2.5rem}.admin__field-collapsible .admin__control-radio+label:before{height:1.8rem;width:1.8rem}.admin__field-collapsible .admin__control-radio:checked+label:after{left:4px;top:5px}.admin__field-error{background:#fffbbb;border:1px solid #ee7d7d;box-sizing:border-box;color:#555;display:block;font-size:1.2rem;font-weight:400;line-height:1.2;margin:.2rem 0 0;padding:.8rem 1rem .9rem}.admin__field-note{color:#303030;font-size:1.2rem;margin:10px 0 0;padding:0}.admin__additional-info{padding-top:1rem}.admin__field-option{padding-top:.7rem}.admin__field-option .admin__field-label{text-align:left}.admin__field-control>.admin__field-option:nth-child(1):nth-last-child(2),.admin__field-control>.admin__field-option:nth-child(2):nth-last-child(1){display:inline-block}.admin__field-control>.admin__field-option:nth-child(1):nth-last-child(2)+.admin__field-option,.admin__field-control>.admin__field-option:nth-child(2):nth-last-child(1)+.admin__field-option{display:inline-block;margin-left:41px;margin-top:0}.admin__field-control>.admin__field-option:nth-child(1):nth-last-child(2)+.admin__field-option:before,.admin__field-control>.admin__field-option:nth-child(2):nth-last-child(1)+.admin__field-option:before{background:#cacaca;content:'';display:inline-block;height:20px;margin-left:-20px;position:absolute;width:1px}.admin__field-value{display:inline-block;padding-top:.7rem}.admin__field-service{padding-top:1rem}.admin__control-fields>.admin__field:first-child,[class*=admin__control-grouped]>.admin__field:first-child{position:static}.admin__control-fields>.admin__field:first-child>.admin__field-label,[class*=admin__control-grouped]>.admin__field:first-child>.admin__field-label{width:calc((100%) * .25 - 30px);float:left;margin-left:30px;background:#fff;cursor:pointer;left:0;position:absolute;top:0}.admin__control-fields>.admin__field:first-child>.admin__field-label span:before,[class*=admin__control-grouped]>.admin__field:first-child>.admin__field-label span:before{display:block}.admin__control-fields>.admin__field._disabled>.admin__field-label,[class*=admin__control-grouped]>.admin__field._disabled>.admin__field-label{cursor:default}.admin__control-fields>.admin__field>.admin__field-label span:before,[class*=admin__control-grouped]>.admin__field>.admin__field-label span:before{display:none}.admin__control-fields .admin__field-label~.admin__field-control{width:100%}.admin__control-fields .admin__field-option{padding-top:0}[class*=admin__control-grouped]{box-sizing:border-box;display:table;width:100%}[class*=admin__control-grouped]>.admin__field{display:table-cell;vertical-align:top}[class*=admin__control-grouped]>.admin__field>.admin__field-control{float:none;width:100%}[class*=admin__control-grouped]>.admin__field.admin__field-default,[class*=admin__control-grouped]>.admin__field.admin__field-large,[class*=admin__control-grouped]>.admin__field.admin__field-medium,[class*=admin__control-grouped]>.admin__field.admin__field-small,[class*=admin__control-grouped]>.admin__field.admin__field-x-small{width:1px}[class*=admin__control-grouped]>.admin__field.admin__field-default+.admin__field:last-child,[class*=admin__control-grouped]>.admin__field.admin__field-large+.admin__field:last-child,[class*=admin__control-grouped]>.admin__field.admin__field-medium+.admin__field:last-child,[class*=admin__control-grouped]>.admin__field.admin__field-small+.admin__field:last-child,[class*=admin__control-grouped]>.admin__field.admin__field-x-small+.admin__field:last-child{width:auto}[class*=admin__control-grouped]>.admin__field:nth-child(n+2){padding-left:20px}.admin__control-group-equal{table-layout:fixed}.admin__control-group-equal>.admin__field{width:50%}.admin__field-control-group{margin-top:.8rem}.admin__field-control-group>.admin__field{padding:0}.admin__control-grouped-date>.admin__field-date{white-space:nowrap;width:1px}.admin__control-grouped-date>.admin__field-date.admin__field>.admin__field-control{float:left;position:relative}.admin__control-grouped-date>.admin__field-date+.admin__field:last-child{width:auto}.admin__control-grouped-date>.admin__field-date+.admin__field-date>.admin__field-label{float:left;padding-right:20px}.admin__control-grouped-date .ui-datepicker-trigger{left:100%;top:0}.admin__field-group-columns.admin__field-control.admin__control-grouped{width:calc((100%) * 1 - 30px);float:left;margin-left:30px}.admin__field-group-columns>.admin__field:first-child>.admin__field-label{float:none;margin:0;opacity:1;position:static;text-align:left}.admin__field-group-columns .admin__control-select{width:100%}.admin__field-group-additional{clear:both}.admin__field-group-additional .action-advanced{margin-top:1rem}.admin__field-group-additional .action-secondary{width:100%}.admin__field-group-show-label{white-space:nowrap}.admin__field-group-show-label>.admin__field-control,.admin__field-group-show-label>.admin__field-label{display:inline-block;vertical-align:top}.admin__field-group-show-label>.admin__field-label{margin-right:20px}.admin__field-complex{margin:1rem 0 3rem;padding-left:1rem}.admin__field:not(._hidden)+.admin__field-complex{margin-top:3rem}.admin__field-complex .admin__field-complex-title{clear:both;color:#303030;font-size:1.7rem;font-weight:600;letter-spacing:.025em;margin-bottom:1rem}.admin__field-complex .admin__field-complex-elements{float:right;max-width:40%}.admin__field-complex .admin__field-complex-elements button{margin-left:1rem}.admin__field-complex .admin__field-complex-content{max-width:60%;overflow:hidden}.admin__field-complex .admin__field-complex-text{margin-left:-1rem}.admin__field-complex+.admin__field._empty._no-header{margin-top:-3rem}.admin__legend{float:left;position:static;width:100%}.admin__legend+br{clear:left;display:block;height:0;overflow:hidden}.message{margin-bottom:3rem}.message-icon-top:before{margin-top:0;top:1.8rem}.nav{background-color:#f8f8f8;border-bottom:1px solid #e3e3e3;border-top:1px solid #e3e3e3;display:none;margin-bottom:3rem;padding:2.2rem 1.5rem 0 0}.nav .btn-group,.nav-bar-outer-actions{float:right;margin-bottom:1.7rem}.nav .btn-group .btn-wrap,.nav-bar-outer-actions .btn-wrap{float:right;margin-left:.5rem;margin-right:.5rem}.nav .btn-group .btn-wrap .btn,.nav-bar-outer-actions .btn-wrap .btn{padding-left:.5rem;padding-right:.5rem}.nav-bar-outer-actions{margin-top:-10.6rem;padding-right:1.5rem}.btn-wrap-try-again{width:9.5rem}.btn-wrap-next,.btn-wrap-prev{width:8.5rem}.nav-bar{counter-reset:i;float:left;margin:0 1rem 1.7rem 0;padding:0;position:relative;white-space:nowrap}.nav-bar:before{background-color:#d4d4d4;background-repeat:repeat-x;background-image:linear-gradient(to bottom,#d1d1d1 0,#d4d4d4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#d1d1d1', endColorstr='#d4d4d4', GradientType=0);border-bottom:1px solid #d9d9d9;border-top:1px solid #bfbfbf;content:'';height:1rem;left:5.15rem;position:absolute;right:5.15rem;top:.7rem}.nav-bar>li{display:inline-block;font-size:0;position:relative;vertical-align:top;width:10.3rem}.nav-bar>li:first-child:after{display:none}.nav-bar>li:after{background-color:#514943;content:'';height:.5rem;left:calc(-50% + .25rem);position:absolute;right:calc(50% + .7rem);top:.9rem}.nav-bar>li.disabled:before,.nav-bar>li.ui-state-disabled:before{bottom:0;content:'';left:0;position:absolute;right:0;top:0;z-index:1}.nav-bar>li.active~li:after,.nav-bar>li.ui-state-active~li:after{display:none}.nav-bar>li.active~li a:after,.nav-bar>li.ui-state-active~li a:after{background-color:transparent;border-color:transparent;color:#a6a6a6}.nav-bar>li.active a,.nav-bar>li.ui-state-active a{color:#000}.nav-bar>li.active a:hover,.nav-bar>li.ui-state-active a:hover{cursor:default}.nav-bar>li.active a:after,.nav-bar>li.ui-state-active a:after{background-color:#fff;content:''}.nav-bar a{color:#514943;display:block;font-size:1.2rem;font-weight:600;line-height:1.2;overflow:hidden;padding:3rem .5em 0;position:relative;text-align:center;text-overflow:ellipsis}.nav-bar a:hover{text-decoration:none}.nav-bar a:after{background-color:#514943;border:.4rem solid #514943;border-radius:100%;color:#fff;content:counter(i);counter-increment:i;height:1.5rem;left:50%;line-height:.6;margin-left:-.8rem;position:absolute;right:auto;text-align:center;top:.4rem;width:1.5rem}.nav-bar a:before{background-color:#d6d6d6;border:1px solid transparent;border-bottom-color:#d9d9d9;border-radius:100%;border-top-color:#bfbfbf;content:'';height:2.3rem;left:50%;line-height:1;margin-left:-1.2rem;position:absolute;top:0;width:2.3rem}.tooltip{display:block;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.19rem;font-weight:400;line-height:1.4;opacity:0;position:absolute;visibility:visible;z-index:10}.tooltip.in{opacity:.9}.tooltip.top{margin-top:-4px;padding:8px 0}.tooltip.right{margin-left:4px;padding:0 8px}.tooltip.bottom{margin-top:4px;padding:8px 0}.tooltip.left{margin-left:-4px;padding:0 8px}.tooltip p:last-child{margin-bottom:0}.tooltip-inner{background-color:#fff;border:1px solid #adadad;border-radius:0;box-shadow:1px 1px 1px #ccc;color:#41362f;max-width:31rem;padding:.5em 1em;text-decoration:none}.tooltip-arrow,.tooltip-arrow:after{border:solid transparent;height:0;position:absolute;width:0}.tooltip-arrow:after{content:'';position:absolute}.tooltip.top .tooltip-arrow,.tooltip.top .tooltip-arrow:after{border-top-color:#949494;border-width:8px 8px 0;bottom:0;left:50%;margin-left:-8px}.tooltip.top-left .tooltip-arrow,.tooltip.top-left .tooltip-arrow:after{border-top-color:#949494;border-width:8px 8px 0;bottom:0;margin-bottom:-8px;right:8px}.tooltip.top-right .tooltip-arrow,.tooltip.top-right .tooltip-arrow:after{border-top-color:#949494;border-width:8px 8px 0;bottom:0;left:8px;margin-bottom:-8px}.tooltip.right .tooltip-arrow,.tooltip.right .tooltip-arrow:after{border-right-color:#949494;border-width:8px 8px 8px 0;left:1px;margin-top:-8px;top:50%}.tooltip.right .tooltip-arrow:after{border-right-color:#fff;border-width:6px 7px 6px 0;margin-left:0;margin-top:-6px}.tooltip.left .tooltip-arrow,.tooltip.left .tooltip-arrow:after{border-left-color:#949494;border-width:8px 0 8px 8px;margin-top:-8px;right:0;top:50%}.tooltip.bottom .tooltip-arrow,.tooltip.bottom .tooltip-arrow:after{border-bottom-color:#949494;border-width:0 8px 8px;left:50%;margin-left:-8px;top:0}.tooltip.bottom-left .tooltip-arrow,.tooltip.bottom-left .tooltip-arrow:after{border-bottom-color:#949494;border-width:0 8px 8px;margin-top:-8px;right:8px;top:0}.tooltip.bottom-right .tooltip-arrow,.tooltip.bottom-right .tooltip-arrow:after{border-bottom-color:#949494;border-width:0 8px 8px;left:8px;margin-top:-8px;top:0}.password-strength{display:block;margin:0 -.3rem 1em;white-space:nowrap}.password-strength.password-strength-too-short .password-strength-item:first-child,.password-strength.password-strength-weak .password-strength-item:first-child,.password-strength.password-strength-weak .password-strength-item:first-child+.password-strength-item{background-color:#e22626}.password-strength.password-strength-fair .password-strength-item:first-child,.password-strength.password-strength-fair .password-strength-item:first-child+.password-strength-item,.password-strength.password-strength-fair .password-strength-item:first-child+.password-strength-item+.password-strength-item{background-color:#ef672f}.password-strength.password-strength-good .password-strength-item:first-child,.password-strength.password-strength-good .password-strength-item:first-child+.password-strength-item,.password-strength.password-strength-good .password-strength-item:first-child+.password-strength-item+.password-strength-item,.password-strength.password-strength-good .password-strength-item:first-child+.password-strength-item+.password-strength-item+.password-strength-item,.password-strength.password-strength-strong .password-strength-item{background-color:#79a22e}.password-strength .password-strength-item{background-color:#ccc;display:inline-block;font-size:0;height:1.4rem;margin-right:.3rem;width:calc(20% - .6rem)}@keyframes progress-bar-stripes{from{background-position:4rem 0}to{background-position:0 0}}.progress{background-color:#fafafa;border:1px solid #ccc;clear:left;height:3rem;margin-bottom:3rem;overflow:hidden}.progress-bar{background-color:#79a22e;color:#fff;float:left;font-size:1.19rem;height:100%;line-height:3rem;text-align:center;transition:width .6s ease;width:0}.progress-bar.active{animation:progress-bar-stripes 2s linear infinite}.progress-bar-text-description{margin-bottom:1.6rem}.progress-bar-text-progress{text-align:right}.page-columns .page-inner-sidebar{margin:0 0 3rem}.page-header{margin-bottom:2.7rem;padding-bottom:2rem;position:relative}.page-header:before{border-bottom:1px solid #e3e3e3;bottom:0;content:'';display:block;height:1px;left:3rem;position:absolute;right:3rem}.container .page-header:before{content:normal}.page-header .message{margin-bottom:1.8rem}.page-header .message+.message{margin-top:-1.5rem}.page-header .admin__action-dropdown,.page-header .search-global-input{transition:none}.container .page-header{margin-bottom:0}.page-title-wrapper{margin-top:1.1rem}.container .page-title-wrapper{background:url(../../pub/images/logo.svg) no-repeat;min-height:41px;padding:4px 0 0 45px}.admin__menu .level-0:first-child>a{margin-top:1.6rem}.admin__menu .level-0:first-child>a:after{top:-1.6rem}.admin__menu .level-0:first-child._active>a:after{display:block}.admin__menu .level-0>a{padding-bottom:1.3rem;padding-top:1.3rem}.admin__menu .level-0>a:before{margin-bottom:.7rem}.admin__menu .item-home>a:before{content:'\e611';font-size:2.3rem;padding-top:-.1rem}.admin__menu .item-component>a:before{content:'\e612'}.admin__menu .item-extension>a:before{content:'\e612'}.admin__menu .item-module>a:before{content:'\e647'}.admin__menu .item-upgrade>a:before{content:'\e614'}.admin__menu .item-system-config>a:before{content:'\e610'}.admin__menu .item-tools>a:before{content:'\e613'}.modal-sub-title{font-size:1.7rem;font-weight:600}.modal-connect-signin .modal-inner-wrap{max-width:80rem}@keyframes ngdialog-fadeout{0%{opacity:1}100%{opacity:0}}@keyframes ngdialog-fadein{0%{opacity:0}100%{opacity:1}}.ngdialog{-webkit-overflow-scrolling:touch;bottom:0;box-sizing:border-box;left:0;overflow:auto;position:fixed;right:0;top:0;z-index:999}.ngdialog *,.ngdialog:after,.ngdialog:before{box-sizing:inherit}.ngdialog.ngdialog-disabled-animation *{animation:none!important}.ngdialog.ngdialog-closing .ngdialog-content,.ngdialog.ngdialog-closing .ngdialog-overlay{-webkit-animation:ngdialog-fadeout .5s;-webkit-backface-visibility:hidden;animation:ngdialog-fadeout .5s}.ngdialog-overlay{-webkit-animation:ngdialog-fadein .5s;-webkit-backface-visibility:hidden;animation:ngdialog-fadein .5s;background:rgba(0,0,0,.4);bottom:0;left:0;position:fixed;right:0;top:0}.ngdialog-content{-webkit-animation:ngdialog-fadein .5s;-webkit-backface-visibility:hidden;animation:ngdialog-fadein .5s}body.ngdialog-open{overflow:hidden}.component-indicator{border-radius:50%;cursor:help;display:inline-block;height:16px;text-align:center;vertical-align:middle;width:16px}.component-indicator::after,.component-indicator::before{background:#fff;display:block;opacity:0;position:absolute;transition:opacity .2s linear .1s;visibility:hidden}.component-indicator::before{border:1px solid #adadad;border-radius:1px;box-shadow:0 0 2px rgba(0,0,0,.4);content:attr(data-label);font-size:1.2rem;margin:30px 0 0 -10px;min-width:50px;padding:4px 5px}.component-indicator::after{border-color:#999;border-style:solid;border-width:1px 0 0 1px;box-shadow:-1px -1px 1px rgba(0,0,0,.1);content:'';height:10px;margin:9px 0 0 5px;-ms-transform:rotate(45deg);transform:rotate(45deg);width:10px}.component-indicator:hover::after,.component-indicator:hover::before{opacity:1;transition:opacity .2s linear;visibility:visible}.component-indicator span{display:block;height:16px;overflow:hidden;width:16px}.component-indicator span:before{content:'';display:block;font-family:Icons;font-size:16px;height:100%;line-height:16px;width:100%}.component-indicator._on{background:#79a22e}.component-indicator._off{background:#e22626}.component-indicator._off span:before{background:#fff;height:4px;margin:6px auto 20px;width:12px}.component-indicator._info{background:0 0}.component-indicator._info span{width:21px}.component-indicator._info span:before{color:#008bdb;content:'\e648';font-family:Icons;font-size:16px}.component-indicator._tooltip{background:0 0;margin:0 0 8px 5px}.component-indicator._tooltip a{width:21px}.component-indicator._tooltip a:hover{text-decoration:none}.component-indicator._tooltip a:before{color:#514943;content:'\e633';font-family:Icons;font-size:16px}.col-manager-item-name .data-grid-data{padding-left:5px}.col-manager-item-name .ng-hide+.data-grid-data{padding-left:24px}.col-manager-item-name ._hide-dependencies,.col-manager-item-name ._show-dependencies{cursor:pointer;padding-left:24px;position:relative}.col-manager-item-name ._hide-dependencies:before,.col-manager-item-name ._show-dependencies:before{display:block;font-family:Icons;font-size:12px;left:0;position:absolute;top:1px}.col-manager-item-name ._show-dependencies:before{content:'\e62b'}.col-manager-item-name ._hide-dependencies:before{content:'\e628'}.col-manager-item-name ._no-dependencies{padding-left:24px}.product-modules-block{font-size:1.2rem;padding:15px 0 0}.col-manager-item-name .product-modules-block{padding-left:1rem}.product-modules-descriprion,.product-modules-title{font-weight:700;margin:0 0 7px}.product-modules-list{font-size:1.1rem;list-style:none;margin:0}.col-manager-item-name .product-modules-list{margin-left:15px}.col-manager-item-name .product-modules-list li{padding:0 0 0 15px;position:relative}.product-modules-list li{margin:0 0 .5rem}.product-modules-list .component-indicator{height:10px;left:0;position:absolute;top:3px;width:10px}.module-summary{white-space:nowrap}.module-summary-title{font-size:2.1rem;margin-right:1rem}.app-updater .nav{display:block;margin-bottom:3.1rem;margin-top:-2.8rem}.app-updater .nav-bar-outer-actions{margin-top:1rem;padding-right:0}.app-updater .nav-bar-outer-actions .btn-wrap-cancel{margin-right:2.6rem}.main{padding-bottom:2rem;padding-top:3rem}.menu-wrapper .logo-static{pointer-events:none}.header{display:none}.header .logo{float:left;height:4.1rem;width:3.5rem}.header-title{font-size:2.8rem;letter-spacing:.02em;line-height:1.4;margin:2.5rem 0 3.5rem 5rem}.page-title{margin-bottom:1rem}.page-sub-title{font-size:2rem}.accent-box{margin-bottom:2rem}.accent-box .btn-prime{margin-top:1.5rem}.spinner.side{float:left;font-size:2.4rem;margin-left:2rem;margin-top:-5px}.page-landing{margin:7.6% auto 0;max-width:44rem;text-align:center}.page-landing .logo{height:5.6rem;margin-bottom:2rem;width:19.2rem}.page-landing .text-version{margin-bottom:3rem}.page-landing .text-welcome{margin-bottom:6.5rem}.page-landing .text-terms{margin-bottom:2.5rem;text-align:center}.page-landing .btn-submit,.page-license .license-text{margin-bottom:2rem}.page-license .page-license-footer{text-align:right}.readiness-check-item{margin-bottom:4rem;min-height:2.5rem}.readiness-check-item .spinner{float:left;font-size:2.5rem;margin:-.4rem 0 0 1.7rem}.readiness-check-title{font-size:1.4rem;font-weight:700;margin-bottom:.1rem;margin-left:5.7rem}.readiness-check-content{margin-left:5.7rem;margin-right:22rem;position:relative}.readiness-check-content .readiness-check-title{margin-left:0}.readiness-check-content .list{margin-top:-.3rem}.readiness-check-side{left:100%;padding-left:2.4rem;position:absolute;top:0;width:22rem}.readiness-check-side .side-title{margin-bottom:0}.readiness-check-icon{float:left;margin-left:1.7rem;margin-top:.3rem}.extensions-information{margin-bottom:5rem}.extensions-information h3{font-size:1.4rem;margin-bottom:1.3rem}.extensions-information .message{margin-bottom:2.5rem}.extensions-information .message:before{margin-top:0;top:1.8rem}.extensions-information .extensions-container{padding:0 2rem}.extensions-information .list{margin-bottom:1rem}.extensions-information .list select{cursor:pointer}.extensions-information .list select:disabled{background:#ccc;cursor:default}.extensions-information .list .extension-delete{font-size:1.7rem;padding-top:0}.delete-modal-wrap{padding:0 4% 4rem}.delete-modal-wrap h3{font-size:3.4rem;display:inline-block;font-weight:300;margin:0 0 2rem;padding:.9rem 0 0;vertical-align:top}.delete-modal-wrap .actions{padding:3rem 0 0}.page-web-configuration .form-el-insider-wrap{width:auto}.page-web-configuration .form-el-insider{width:15.4rem}.page-web-configuration .form-el-insider-input .form-el-input{width:16.5rem}.customize-your-store .advanced-modules-count,.customize-your-store .advanced-modules-select{padding-left:1.5rem}.customize-your-store .customize-your-store-advanced{min-width:0}.customize-your-store .message-error:before{margin-top:0;top:1.8rem}.customize-your-store .message-error a{color:#333;text-decoration:underline}.customize-your-store .message-error .form-label:before{background:#fff}.customize-your-store .customize-database-clean p{margin-top:2.5rem}.content-install{margin-bottom:2rem}.console{border:1px solid #ccc;font-family:'Courier New',Courier,monospace;font-weight:300;height:20rem;margin:1rem 0 2rem;overflow-y:auto;padding:1.5rem 2rem 2rem;resize:vertical}.console .text-danger{color:#e22626}.console .text-success{color:#090}.console .hidden{display:none}.content-success .btn-prime{margin-top:1.5rem}.jumbo-title{font-size:3.6rem}.jumbo-title .jumbo-icon{font-size:3.8rem;margin-right:.25em;position:relative;top:.15em}.install-database-clean{margin-top:4rem}.install-database-clean .btn{margin-right:1rem}.page-sub-title{margin-bottom:2.1rem;margin-top:3rem}.multiselect-custom{max-width:71.1rem}.content-install{margin-top:3.7rem}.home-page-inner-wrap{margin:0 auto;max-width:91rem}.setup-home-title{margin-bottom:3.9rem;padding-top:1.8rem;text-align:center}.setup-home-item{background-color:#fafafa;border:1px solid #ccc;color:#333;display:block;margin-bottom:2rem;margin-left:1.3rem;margin-right:1.3rem;min-height:30rem;padding:2rem;text-align:center}.setup-home-item:hover{border-color:#8c8c8c;color:#333;text-decoration:none;transition:border-color .1s linear}.setup-home-item:active{-ms-transform:scale(0.99);transform:scale(0.99)}.setup-home-item:before{display:block;font-size:7rem;margin-bottom:3.3rem;margin-top:4rem}.setup-home-item-component:before,.setup-home-item-extension:before{content:'\e612'}.setup-home-item-module:before{content:'\e647'}.setup-home-item-upgrade:before{content:'\e614'}.setup-home-item-configuration:before{content:'\e610'}.setup-home-item-title{display:block;font-size:1.8rem;letter-spacing:.025em;margin-bottom:1rem}.setup-home-item-description{display:block}.extension-manager-wrap{border:1px solid #bbb;margin:0 0 4rem}.extension-manager-account{font-size:2.1rem;display:inline-block;font-weight:400}.extension-manager-title{font-size:3.2rem;background-color:#f8f8f8;border-bottom:1px solid #e3e3e3;color:#41362f;font-weight:600;line-height:1.2;padding:2rem}.extension-manager-content{padding:2.5rem 2rem 2rem}.extension-manager-items{list-style:none;margin:0;text-align:center}.extension-manager-items .btn{border:1px solid #adadad;display:block;margin:1rem auto 0}.extension-manager-items .item-title{font-size:2.1rem;display:inline-block;text-align:left}.extension-manager-items .item-number{font-size:4.1rem;display:inline-block;line-height:.8;margin:0 5px 1.5rem 0;vertical-align:top}.extension-manager-items .item-date{font-size:2.6rem;margin-top:1px}.extension-manager-items .item-date-title{font-size:1.5rem}.extension-manager-items .item-install{margin:0 0 2rem}.sync-login-wrap{padding:0 10% 4rem}.sync-login-wrap .legend{font-size:2.6rem;color:#eb5202;float:left;font-weight:300;line-height:1.2;margin:-1rem 0 2.5rem;position:static;width:100%}.sync-login-wrap .legend._hidden{display:none}.sync-login-wrap .login-header{font-size:3.4rem;font-weight:300;margin:0 0 2rem}.sync-login-wrap .login-header span{display:inline-block;padding:.9rem 0 0;vertical-align:top}.sync-login-wrap h4{font-size:1.4rem;margin:0 0 2rem}.sync-login-wrap .sync-login-steps{margin:0 0 2rem 1.5rem}.sync-login-wrap .sync-login-steps li{padding:0 0 0 1rem}.sync-login-wrap .form-row .form-label{display:inline-block}.sync-login-wrap .form-row .form-label.required{padding-left:1.5rem}.sync-login-wrap .form-row .form-label.required:after{left:0;position:absolute;right:auto}.sync-login-wrap .form-row{max-width:28rem}.sync-login-wrap .form-actions{display:table;margin-top:-1.3rem}.sync-login-wrap .form-actions .links{display:table-header-group}.sync-login-wrap .form-actions .actions{padding:3rem 0 0}@media all and (max-width:1047px){.admin__menu .submenu li{min-width:19.8rem}.nav{padding-bottom:5.38rem;padding-left:1.5rem;text-align:center}.nav-bar{display:inline-block;float:none;margin-right:0;vertical-align:top}.nav .btn-group,.nav-bar-outer-actions{display:inline-block;float:none;margin-top:-8.48rem;text-align:center;vertical-align:top;width:100%}.nav-bar-outer-actions{padding-right:0}.nav-bar-outer-actions .outer-actions-inner-wrap{display:inline-block}.app-updater .nav{padding-bottom:1.7rem}.app-updater .nav-bar-outer-actions{margin-top:2rem}}@media all and (min-width:768px){.page-layout-admin-2columns-left .page-columns{margin-left:-30px}.page-layout-admin-2columns-left .page-columns:after{clear:both;content:'';display:table}.page-layout-admin-2columns-left .page-columns .main-col{width:calc((100%) * .75 - 30px);float:right}.page-layout-admin-2columns-left .page-columns .side-col{width:calc((100%) * .25 - 30px);float:left;margin-left:30px}.col-m-1,.col-m-10,.col-m-11,.col-m-12,.col-m-2,.col-m-3,.col-m-4,.col-m-5,.col-m-6,.col-m-7,.col-m-8,.col-m-9{float:left}.col-m-12{width:100%}.col-m-11{width:91.66666667%}.col-m-10{width:83.33333333%}.col-m-9{width:75%}.col-m-8{width:66.66666667%}.col-m-7{width:58.33333333%}.col-m-6{width:50%}.col-m-5{width:41.66666667%}.col-m-4{width:33.33333333%}.col-m-3{width:25%}.col-m-2{width:16.66666667%}.col-m-1{width:8.33333333%}.col-m-pull-12{right:100%}.col-m-pull-11{right:91.66666667%}.col-m-pull-10{right:83.33333333%}.col-m-pull-9{right:75%}.col-m-pull-8{right:66.66666667%}.col-m-pull-7{right:58.33333333%}.col-m-pull-6{right:50%}.col-m-pull-5{right:41.66666667%}.col-m-pull-4{right:33.33333333%}.col-m-pull-3{right:25%}.col-m-pull-2{right:16.66666667%}.col-m-pull-1{right:8.33333333%}.col-m-pull-0{right:auto}.col-m-push-12{left:100%}.col-m-push-11{left:91.66666667%}.col-m-push-10{left:83.33333333%}.col-m-push-9{left:75%}.col-m-push-8{left:66.66666667%}.col-m-push-7{left:58.33333333%}.col-m-push-6{left:50%}.col-m-push-5{left:41.66666667%}.col-m-push-4{left:33.33333333%}.col-m-push-3{left:25%}.col-m-push-2{left:16.66666667%}.col-m-push-1{left:8.33333333%}.col-m-push-0{left:auto}.col-m-offset-12{margin-left:100%}.col-m-offset-11{margin-left:91.66666667%}.col-m-offset-10{margin-left:83.33333333%}.col-m-offset-9{margin-left:75%}.col-m-offset-8{margin-left:66.66666667%}.col-m-offset-7{margin-left:58.33333333%}.col-m-offset-6{margin-left:50%}.col-m-offset-5{margin-left:41.66666667%}.col-m-offset-4{margin-left:33.33333333%}.col-m-offset-3{margin-left:25%}.col-m-offset-2{margin-left:16.66666667%}.col-m-offset-1{margin-left:8.33333333%}.col-m-offset-0{margin-left:0}.page-columns{margin-left:-30px}.page-columns:after{clear:both;content:'';display:table}.page-columns .page-inner-content{width:calc((100%) * .75 - 30px);float:right}.page-columns .page-inner-sidebar{width:calc((100%) * .25 - 30px);float:left;margin-left:30px}}@media all and (min-width:1048px){.col-l-1,.col-l-10,.col-l-11,.col-l-12,.col-l-2,.col-l-3,.col-l-4,.col-l-5,.col-l-6,.col-l-7,.col-l-8,.col-l-9{float:left}.col-l-12{width:100%}.col-l-11{width:91.66666667%}.col-l-10{width:83.33333333%}.col-l-9{width:75%}.col-l-8{width:66.66666667%}.col-l-7{width:58.33333333%}.col-l-6{width:50%}.col-l-5{width:41.66666667%}.col-l-4{width:33.33333333%}.col-l-3{width:25%}.col-l-2{width:16.66666667%}.col-l-1{width:8.33333333%}.col-l-pull-12{right:100%}.col-l-pull-11{right:91.66666667%}.col-l-pull-10{right:83.33333333%}.col-l-pull-9{right:75%}.col-l-pull-8{right:66.66666667%}.col-l-pull-7{right:58.33333333%}.col-l-pull-6{right:50%}.col-l-pull-5{right:41.66666667%}.col-l-pull-4{right:33.33333333%}.col-l-pull-3{right:25%}.col-l-pull-2{right:16.66666667%}.col-l-pull-1{right:8.33333333%}.col-l-pull-0{right:auto}.col-l-push-12{left:100%}.col-l-push-11{left:91.66666667%}.col-l-push-10{left:83.33333333%}.col-l-push-9{left:75%}.col-l-push-8{left:66.66666667%}.col-l-push-7{left:58.33333333%}.col-l-push-6{left:50%}.col-l-push-5{left:41.66666667%}.col-l-push-4{left:33.33333333%}.col-l-push-3{left:25%}.col-l-push-2{left:16.66666667%}.col-l-push-1{left:8.33333333%}.col-l-push-0{left:auto}.col-l-offset-12{margin-left:100%}.col-l-offset-11{margin-left:91.66666667%}.col-l-offset-10{margin-left:83.33333333%}.col-l-offset-9{margin-left:75%}.col-l-offset-8{margin-left:66.66666667%}.col-l-offset-7{margin-left:58.33333333%}.col-l-offset-6{margin-left:50%}.col-l-offset-5{margin-left:41.66666667%}.col-l-offset-4{margin-left:33.33333333%}.col-l-offset-3{margin-left:25%}.col-l-offset-2{margin-left:16.66666667%}.col-l-offset-1{margin-left:8.33333333%}.col-l-offset-0{margin-left:0}}@media all and (min-width:1440px){.col-xl-1,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9{float:left}.col-xl-12{width:100%}.col-xl-11{width:91.66666667%}.col-xl-10{width:83.33333333%}.col-xl-9{width:75%}.col-xl-8{width:66.66666667%}.col-xl-7{width:58.33333333%}.col-xl-6{width:50%}.col-xl-5{width:41.66666667%}.col-xl-4{width:33.33333333%}.col-xl-3{width:25%}.col-xl-2{width:16.66666667%}.col-xl-1{width:8.33333333%}.col-xl-pull-12{right:100%}.col-xl-pull-11{right:91.66666667%}.col-xl-pull-10{right:83.33333333%}.col-xl-pull-9{right:75%}.col-xl-pull-8{right:66.66666667%}.col-xl-pull-7{right:58.33333333%}.col-xl-pull-6{right:50%}.col-xl-pull-5{right:41.66666667%}.col-xl-pull-4{right:33.33333333%}.col-xl-pull-3{right:25%}.col-xl-pull-2{right:16.66666667%}.col-xl-pull-1{right:8.33333333%}.col-xl-pull-0{right:auto}.col-xl-push-12{left:100%}.col-xl-push-11{left:91.66666667%}.col-xl-push-10{left:83.33333333%}.col-xl-push-9{left:75%}.col-xl-push-8{left:66.66666667%}.col-xl-push-7{left:58.33333333%}.col-xl-push-6{left:50%}.col-xl-push-5{left:41.66666667%}.col-xl-push-4{left:33.33333333%}.col-xl-push-3{left:25%}.col-xl-push-2{left:16.66666667%}.col-xl-push-1{left:8.33333333%}.col-xl-push-0{left:auto}.col-xl-offset-12{margin-left:100%}.col-xl-offset-11{margin-left:91.66666667%}.col-xl-offset-10{margin-left:83.33333333%}.col-xl-offset-9{margin-left:75%}.col-xl-offset-8{margin-left:66.66666667%}.col-xl-offset-7{margin-left:58.33333333%}.col-xl-offset-6{margin-left:50%}.col-xl-offset-5{margin-left:41.66666667%}.col-xl-offset-4{margin-left:33.33333333%}.col-xl-offset-3{margin-left:25%}.col-xl-offset-2{margin-left:16.66666667%}.col-xl-offset-1{margin-left:8.33333333%}.col-xl-offset-0{margin-left:0}}@media all and (max-width:767px){.abs-clearer-mobile:after,.nav-bar:after{clear:both;content:'';display:table}.list-definition>dt{float:none}.list-definition>dd{margin-left:0}.form-row .form-label{text-align:left}.form-row .form-label.required:after{position:static}.nav{padding-bottom:0;padding-left:0;padding-right:0}.nav-bar-outer-actions{margin-top:0}.nav-bar{display:block;margin-bottom:0;margin-left:auto;margin-right:auto;width:30.9rem}.nav-bar:before{display:none}.nav-bar>li{float:left;min-height:9rem}.nav-bar>li:after{display:none}.nav-bar>li:nth-child(4n){clear:both}.nav-bar a{line-height:1.4}.tooltip{display:none!important}.readiness-check-content{margin-right:2rem}.readiness-check-side{padding:2rem 0;position:static}.form-el-insider,.form-el-insider-wrap,.page-web-configuration .form-el-insider-input,.page-web-configuration .form-el-insider-input .form-el-input{display:block;width:100%}}@media all and (max-width:479px){.nav-bar{width:23.175rem}.nav-bar>li{width:7.725rem}.nav .btn-group .btn-wrap-try-again,.nav-bar-outer-actions .btn-wrap-try-again{clear:both;display:block;float:none;margin-left:auto;margin-right:auto;margin-top:1rem;padding-top:1rem}}
-diff --git a/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php b/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
-index 00fa272e749..173ea9e49a8 100644
---- a/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
-+++ b/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
-@@ -15,6 +15,9 @@ use Symfony\Component\Console\Input\InputOption;
- use Symfony\Component\Console\Output\OutputInterface;
- use Symfony\Component\Console\Question\Question;
- 
-+/**
-+ * Command to create an admin user.
-+ */
- class AdminUserCreateCommand extends AbstractSetupCommand
- {
-     /**
-@@ -52,6 +55,8 @@ class AdminUserCreateCommand extends AbstractSetupCommand
-     }
- 
-     /**
-+     * Creation admin user in interaction mode.
-+     *
-      * @param \Symfony\Component\Console\Input\InputInterface $input
-      * @param \Symfony\Component\Console\Output\OutputInterface $output
-      *
-@@ -129,6 +134,8 @@ class AdminUserCreateCommand extends AbstractSetupCommand
-     }
- 
-     /**
-+     * Add not empty validator.
-+     *
-      * @param \Symfony\Component\Console\Question\Question $question
-      * @return void
-      */
-@@ -144,7 +151,7 @@ class AdminUserCreateCommand extends AbstractSetupCommand
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function execute(InputInterface $input, OutputInterface $output)
-     {
-@@ -165,25 +172,43 @@ class AdminUserCreateCommand extends AbstractSetupCommand
-     /**
-      * Get list of arguments for the command
-      *
-+     * @param int $mode The mode of options.
-      * @return InputOption[]
-      */
--    public function getOptionsList()
-+    public function getOptionsList($mode = InputOption::VALUE_REQUIRED)
-     {
-+        $requiredStr = ($mode === InputOption::VALUE_REQUIRED ? '(Required) ' : '');
-+
-         return [
--            new InputOption(AdminAccount::KEY_USER, null, InputOption::VALUE_REQUIRED, '(Required) Admin user'),
--            new InputOption(AdminAccount::KEY_PASSWORD, null, InputOption::VALUE_REQUIRED, '(Required) Admin password'),
--            new InputOption(AdminAccount::KEY_EMAIL, null, InputOption::VALUE_REQUIRED, '(Required) Admin email'),
-+            new InputOption(
-+                AdminAccount::KEY_USER,
-+                null,
-+                $mode,
-+                $requiredStr . 'Admin user'
-+            ),
-+            new InputOption(
-+                AdminAccount::KEY_PASSWORD,
-+                null,
-+                $mode,
-+                $requiredStr . 'Admin password'
-+            ),
-+            new InputOption(
-+                AdminAccount::KEY_EMAIL,
-+                null,
-+                $mode,
-+                $requiredStr . 'Admin email'
-+            ),
-             new InputOption(
-                 AdminAccount::KEY_FIRST_NAME,
-                 null,
--                InputOption::VALUE_REQUIRED,
--                '(Required) Admin first name'
-+                $mode,
-+                $requiredStr . 'Admin first name'
-             ),
-             new InputOption(
-                 AdminAccount::KEY_LAST_NAME,
-                 null,
--                InputOption::VALUE_REQUIRED,
--                '(Required) Admin last name'
-+                $mode,
-+                $requiredStr . 'Admin last name'
-             ),
-         ];
-     }
-diff --git a/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php b/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
-index 64b934061b6..e8ff8f09c34 100644
---- a/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
-+++ b/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
-@@ -14,6 +14,9 @@ use Symfony\Component\Console\Input\InputInterface;
- use Symfony\Component\Console\Output\OutputInterface;
- use Symfony\Component\Console\Question\Question;
- 
-+/**
-+ * Config Set Command
-+ */
- class ConfigSetCommand extends AbstractSetupCommand
- {
-     /**
-@@ -68,7 +71,7 @@ class ConfigSetCommand extends AbstractSetupCommand
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function execute(InputInterface $input, OutputInterface $output)
-     {
-@@ -84,7 +87,8 @@ class ConfigSetCommand extends AbstractSetupCommand
-             if (($currentValue !== null) && ($inputOptions[$option->getName()] !== null)) {
-                 $dialog = $this->getHelperSet()->get('question');
-                 $question = new Question(
--                    '<question>Overwrite the existing configuration for ' . $option->getName() . '?[Y/n]</question>'
-+                    '<question>Overwrite the existing configuration for ' . $option->getName() . '?[Y/n]</question>',
-+                    'y'
-                 );
-                 if (strtolower($dialog->ask($input, $output, $question)) !== 'y') {
-                     $inputOptions[$option->getName()] = null;
-@@ -131,7 +135,7 @@ class ConfigSetCommand extends AbstractSetupCommand
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function initialize(InputInterface $input, OutputInterface $output)
-     {
-diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
-index 68e26ec83c3..014d699cb23 100644
---- a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
-+++ b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
-@@ -103,7 +103,7 @@ class DiCompileCommand extends Command
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function configure()
-     {
-@@ -132,7 +132,7 @@ class DiCompileCommand extends Command
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function execute(InputInterface $input, OutputInterface $output)
-     {
-@@ -307,8 +307,8 @@ class DiCompileCommand extends Command
-     {
-         $this->objectManager->configure(
-             [
--                'preferences' => [\Magento\Setup\Module\Di\Compiler\Config\WriterInterface::class =>
--                    \Magento\Setup\Module\Di\Compiler\Config\Writer\Filesystem::class,
-+                'preferences' => [\Magento\Framework\App\ObjectManager\ConfigWriterInterface::class =>
-+                    \Magento\Framework\App\ObjectManager\ConfigWriter\Filesystem::class,
-                 ], \Magento\Setup\Module\Di\Compiler\Config\ModificationChain::class => [
-                     'arguments' => [
-                         'modificationsList' => [
-diff --git a/setup/src/Magento/Setup/Console/Command/InstallCommand.php b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
-index 65eb047a5c7..cc1cca74ed6 100644
---- a/setup/src/Magento/Setup/Console/Command/InstallCommand.php
-+++ b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
-@@ -3,12 +3,15 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
-+
- namespace Magento\Setup\Console\Command;
- 
- use Magento\Deploy\Console\Command\App\ConfigImportCommand;
- use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
- use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
- use Magento\Framework\Setup\Declaration\Schema\Request;
-+use Magento\Setup\Model\AdminAccount;
- use Magento\Setup\Model\ConfigModel;
- use Magento\Setup\Model\InstallerFactory;
- use Magento\Framework\Setup\ConsoleLogger;
-@@ -45,20 +48,20 @@ class InstallCommand extends AbstractSetupCommand
-      * List of comma-separated module names. That must be enabled during installation.
-      * Available magic param all.
-      */
--    const INPUT_KEY_ENABLE_MODULES = 'enable_modules';
-+    const INPUT_KEY_ENABLE_MODULES = 'enable-modules';
- 
-     /**
-      * List of comma-separated module names. That must be avoided during installation.
-      * List of comma-separated module names. That must be avoided during installation.
--     * Avaiable magic param all.
-+     * Available magic param all.
-      */
--    const INPUT_KEY_DISABLE_MODULES = 'disable_modules';
-+    const INPUT_KEY_DISABLE_MODULES = 'disable-modules';
- 
-     /**
-      * If this flag is enabled, than all your old scripts with format:
-      * InstallSchema, UpgradeSchema will be converted to new db_schema.xml format.
-      */
--    const CONVERT_OLD_SCRIPTS_KEY = 'convert_old_scripts';
-+    const CONVERT_OLD_SCRIPTS_KEY = 'convert-old-scripts';
- 
-     /**
-      * Parameter indicating command for interactive setup
-@@ -129,13 +132,13 @@ class InstallCommand extends AbstractSetupCommand
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function configure()
-     {
-         $inputOptions = $this->configModel->getAvailableOptions();
-         $inputOptions = array_merge($inputOptions, $this->userConfig->getOptionsList());
--        $inputOptions = array_merge($inputOptions, $this->adminUser->getOptionsList());
-+        $inputOptions = array_merge($inputOptions, $this->adminUser->getOptionsList(InputOption::VALUE_OPTIONAL));
-         $inputOptions = array_merge($inputOptions, [
-             new InputOption(
-                 self::INPUT_KEY_CLEANUP_DB,
-@@ -155,25 +158,19 @@ class InstallCommand extends AbstractSetupCommand
-                 InputOption::VALUE_NONE,
-                 'Use sample data'
-             ),
--            new InputOption(
--                Request::DUMP_ENABLE_OPTIONS,
--                null,
--                InputOption::VALUE_REQUIRED,
--                'Should removed columns be dumped or recovered columns data reverted.'
--            ),
-             new InputOption(
-                 self::INPUT_KEY_ENABLE_MODULES,
-                 null,
-                 InputOption::VALUE_OPTIONAL,
-                 'List of comma-separated module names. That must be included during installation. '
--                . 'Avaiable magic param "all".'
-+                . 'Available magic param "all".'
-             ),
-             new InputOption(
-                 self::INPUT_KEY_DISABLE_MODULES,
-                 null,
-                 InputOption::VALUE_OPTIONAL,
-                 'List of comma-separated module names. That must be avoided during installation. '
--                . 'Avaiable magic param "all".'
-+                . 'Available magic param "all".'
-             ),
-             new InputOption(
-                 self::CONVERT_OLD_SCRIPTS_KEY,
-@@ -186,7 +183,7 @@ class InstallCommand extends AbstractSetupCommand
-                 self::INPUT_KEY_INTERACTIVE_SETUP,
-                 self::INPUT_KEY_INTERACTIVE_SETUP_SHORTCUT,
-                 InputOption::VALUE_NONE,
--                'Interactive Magento instalation'
-+                'Interactive Magento installation'
-             ),
-             new InputOption(
-                 OperationsExecutor::KEY_SAFE_MODE,
-@@ -215,7 +212,7 @@ class InstallCommand extends AbstractSetupCommand
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function execute(InputInterface $input, OutputInterface $output)
-     {
-@@ -230,7 +227,7 @@ class InstallCommand extends AbstractSetupCommand
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function initialize(InputInterface $input, OutputInterface $output)
-     {
-@@ -256,7 +253,7 @@ class InstallCommand extends AbstractSetupCommand
-         }
- 
-         $errors = $this->configModel->validate($configOptionsToValidate);
--        $errors = array_merge($errors, $this->adminUser->validate($input));
-+        $errors = array_merge($errors, $this->validateAdmin($input));
-         $errors = array_merge($errors, $this->validate($input));
-         $errors = array_merge($errors, $this->userConfig->validate($input));
- 
-@@ -277,11 +274,11 @@ class InstallCommand extends AbstractSetupCommand
-      * @param InputInterface $input
-      * @return string[] Array of error messages
-      */
--    public function validate(InputInterface $input)
-+    public function validate(InputInterface $input) : array
-     {
-         $errors = [];
-         $value = $input->getOption(self::INPUT_KEY_SALES_ORDER_INCREMENT_PREFIX);
--        if (preg_match(self::SALES_ORDER_INCREMENT_PREFIX_RULE, $value) != 1) {
-+        if (preg_match(self::SALES_ORDER_INCREMENT_PREFIX_RULE, (string) $value) != 1) {
-             $errors[] = 'Validation failed, ' . self::INPUT_KEY_SALES_ORDER_INCREMENT_PREFIX
-                 . ' must be 20 characters or less';
-         }
-@@ -297,7 +294,7 @@ class InstallCommand extends AbstractSetupCommand
-      * @param OutputInterface $output
-      * @return string[] Array of inputs
-      */
--    private function interactiveQuestions(InputInterface $input, OutputInterface $output)
-+    private function interactiveQuestions(InputInterface $input, OutputInterface $output) : array
-     {
-         $helper = $this->getHelper('question');
-         $configOptionsToValidate = [];
-@@ -325,7 +322,7 @@ class InstallCommand extends AbstractSetupCommand
- 
-         $output->writeln("");
- 
--        foreach ($this->adminUser->getOptionsList() as $option) {
-+        foreach ($this->adminUser->getOptionsList(InputOption::VALUE_OPTIONAL) as $option) {
-             $configOptionsToValidate[$option->getName()] = $this->askQuestion(
-                 $input,
-                 $output,
-@@ -416,4 +413,24 @@ class InstallCommand extends AbstractSetupCommand
- 
-         return $value;
-     }
-+
-+    /**
-+     * Performs validation of admin options if at least one of them was set.
-+     *
-+     * @param InputInterface $input
-+     * @return array
-+     */
-+    private function validateAdmin(InputInterface $input): array
-+    {
-+        if ($input->getOption(AdminAccount::KEY_FIRST_NAME)
-+            || $input->getOption(AdminAccount::KEY_LAST_NAME)
-+            || $input->getOption(AdminAccount::KEY_EMAIL)
-+            || $input->getOption(AdminAccount::KEY_USER)
-+            || $input->getOption(AdminAccount::KEY_PASSWORD)
-+        ) {
-+            return $this->adminUser->validate($input);
-+        }
-+
-+        return [];
-+    }
- }
-diff --git a/setup/src/Magento/Setup/Console/Command/ModuleConfigStatusCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleConfigStatusCommand.php
-new file mode 100644
-index 00000000000..70dbf14728b
---- /dev/null
-+++ b/setup/src/Magento/Setup/Console/Command/ModuleConfigStatusCommand.php
-@@ -0,0 +1,109 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Setup\Console\Command;
-+
-+use Magento\Framework\App\DeploymentConfig\Reader as ConfigReader;
-+use Magento\Framework\Config\ConfigOptionsListConstants;
-+use Magento\Framework\Config\File\ConfigFilePool;
-+use Magento\Framework\Console\Cli;
-+use Magento\Framework\Setup\ConsoleLogger;
-+use Magento\Setup\Model\InstallerFactory;
-+use Symfony\Component\Console\Command\Command;
-+use Symfony\Component\Console\Input\InputInterface;
-+use Symfony\Component\Console\Output\OutputInterface;
-+
-+/**
-+ * Command to check if the modules config in app/etc/config.php matches with how Magento interprets it
-+ */
-+class ModuleConfigStatusCommand extends Command
-+{
-+    /**
-+     * Deployment config reader
-+     *
-+     * @var ConfigReader
-+     */
-+    private $configReader;
-+
-+    /**
-+     * Installer service factory.
-+     *
-+     * @var InstallerFactory
-+     */
-+    private $installerFactory;
-+
-+    /**
-+     * @param ConfigReader     $configReader
-+     * @param InstallerFactory $installerFactory
-+     */
-+    public function __construct(
-+        ConfigReader     $configReader,
-+        InstallerFactory $installerFactory
-+    ) {
-+        $this->configReader     = $configReader;
-+        $this->installerFactory = $installerFactory;
-+
-+        parent::__construct();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function configure()
-+    {
-+        $this
-+            ->setName('module:config:status')
-+            ->setDescription(
-+                'Checks the modules configuration in the \'app/etc/config.php\' file '
-+                . 'and reports if they are up to date or not'
-+            );
-+
-+        parent::configure();
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function execute(InputInterface $input, OutputInterface $output)
-+    {
-+        try {
-+            // the config as currently in app/etc/config.php
-+            $currentConfig = $this->configReader->load(ConfigFilePool::APP_CONFIG);
-+            if (!array_key_exists(ConfigOptionsListConstants::KEY_MODULES, $currentConfig)) {
-+                // phpcs:ignore Magento2.Exceptions.DirectThrow
-+                throw new \Exception('Can\'t find the modules configuration in the \'app/etc/config.php\' file.');
-+            }
-+
-+            $currentModuleConfig = $currentConfig[ConfigOptionsListConstants::KEY_MODULES];
-+
-+            $installer = $this->installerFactory->create(new ConsoleLogger($output));
-+
-+            // the module config as Magento calculated it
-+            $correctModuleConfig = $installer->getModulesConfig();
-+
-+            if ($currentModuleConfig !== $correctModuleConfig) {
-+                // phpcs:ignore Magento2.Exceptions.DirectThrow
-+                throw new \Exception(
-+                    'The modules configuration in the \'app/etc/config.php\' file is outdated. '
-+                    . 'Run \'setup:upgrade\' to fix it.'
-+                );
-+            }
-+
-+            $output->writeln(
-+                '<info>The modules configuration is up to date.</info>'
-+            );
-+            // phpcs:disable Magento2.Exceptions.ThrowCatch
-+        } catch (\Exception $e) {
-+            $output->writeln('<error>' . $e->getMessage() . '</error>');
-+
-+            return Cli::RETURN_FAILURE;
-+        }
-+
-+        return Cli::RETURN_SUCCESS;
-+    }
-+}
-diff --git a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
-index 85af8f3caeb..65fc265a64e 100644
---- a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
-+++ b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
-@@ -3,11 +3,18 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+declare(strict_types=1);
-+
- namespace Magento\Setup\Console\Command;
- 
-+use Magento\Framework\Module\FullModuleList;
-+use Magento\Framework\Module\ModuleList;
- use Magento\Setup\Model\ObjectManagerProvider;
-+use Magento\Framework\Console\Cli;
- use Symfony\Component\Console\Input\InputInterface;
- use Symfony\Component\Console\Output\OutputInterface;
-+use Symfony\Component\Console\Input\InputArgument;
- 
- /**
-  * Command for displaying status of modules
-@@ -38,7 +45,10 @@ class ModuleStatusCommand extends AbstractSetupCommand
-     protected function configure()
-     {
-         $this->setName('module:status')
--            ->setDescription('Displays status of modules');
-+            ->setDescription('Displays status of modules')
-+            ->addArgument('module', InputArgument::OPTIONAL, 'Optional module name')
-+            ->addOption('enabled', null, null, 'Print only enabled modules')
-+            ->addOption('disabled', null, null, 'Print only disabled modules');
-         parent::configure();
-     }
- 
-@@ -47,24 +57,106 @@ class ModuleStatusCommand extends AbstractSetupCommand
-      */
-     protected function execute(InputInterface $input, OutputInterface $output)
-     {
--        $moduleList = $this->objectManagerProvider->get()->create(\Magento\Framework\Module\ModuleList::class);
--        $output->writeln('<info>List of enabled modules:</info>');
--        $enabledModules = $moduleList->getNames();
--        if (count($enabledModules) === 0) {
--            $output->writeln('None');
--        } else {
--            $output->writeln(join("\n", $enabledModules));
-+        $moduleName = (string)$input->getArgument('module');
-+        if ($moduleName) {
-+            return $this->showSpecificModule($moduleName, $output);
-         }
-+
-+        $onlyEnabled = $input->getOption('enabled');
-+        if ($onlyEnabled) {
-+            return $this->showEnabledModules($output);
-+        }
-+
-+        $onlyDisabled = $input->getOption('disabled');
-+        if ($onlyDisabled) {
-+            return $this->showDisabledModules($output);
-+        }
-+
-+        $output->writeln('<info>List of enabled modules:</info>');
-+        $this->showEnabledModules($output);
-         $output->writeln('');
- 
--        $fullModuleList = $this->objectManagerProvider->get()->create(\Magento\Framework\Module\FullModuleList::class);
-         $output->writeln("<info>List of disabled modules:</info>");
--        $disabledModules = array_diff($fullModuleList->getNames(), $enabledModules);
--        if (count($disabledModules) === 0) {
-+        $this->showDisabledModules($output);
-+        $output->writeln('');
-+    }
-+
-+    /**
-+     * @param string $moduleName
-+     * @param OutputInterface $output
-+     */
-+    private function showSpecificModule(string $moduleName, OutputInterface $output)
-+    {
-+        $allModules = $this->getAllModules();
-+        if (!in_array($moduleName, $allModules->getNames())) {
-+            $output->writeln('<error>Module does not exist</error>');
-+            return Cli::RETURN_FAILURE;
-+        }
-+
-+        $enabledModules = $this->getEnabledModules();
-+        if (in_array($moduleName, $enabledModules->getNames())) {
-+            $output->writeln('<info>Module is enabled</info>');
-+            return Cli::RETURN_FAILURE;
-+        }
-+
-+        $output->writeln('<info>Module is disabled</info>');
-+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
-+    }
-+
-+    /**
-+     * @param OutputInterface $output
-+     */
-+    private function showEnabledModules(OutputInterface $output)
-+    {
-+        $enabledModules = $this->getEnabledModules();
-+        $enabledModuleNames = $enabledModules->getNames();
-+        if (count($enabledModuleNames) === 0) {
-             $output->writeln('None');
--        } else {
--            $output->writeln(join("\n", $disabledModules));
-+            return Cli::RETURN_FAILURE;
-         }
-+
-+        $output->writeln(join("\n", $enabledModuleNames));
-         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
-     }
-+
-+    /**
-+     * @param OutputInterface $output
-+     */
-+    private function showDisabledModules(OutputInterface $output)
-+    {
-+        $disabledModuleNames = $this->getDisabledModuleNames();
-+        if (count($disabledModuleNames) === 0) {
-+            $output->writeln('None');
-+            return Cli::RETURN_FAILURE;
-+        }
-+
-+        $output->writeln(join("\n", $disabledModuleNames));
-+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
-+    }
-+
-+    /**
-+     * @return FullModuleList
-+     */
-+    private function getAllModules(): FullModuleList
-+    {
-+        return $this->objectManagerProvider->get()->create(FullModuleList::class);
-+    }
-+
-+    /**
-+     * @return ModuleList
-+     */
-+    private function getEnabledModules(): ModuleList
-+    {
-+        return $this->objectManagerProvider->get()->create(ModuleList::class);
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    private function getDisabledModuleNames(): array
-+    {
-+        $fullModuleList = $this->getAllModules();
-+        $enabledModules = $this->getEnabledModules();
-+        return array_diff($fullModuleList->getNames(), $enabledModules->getNames());
-+    }
- }
-diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
-index bd7be01a0b2..55081c5a9c9 100644
---- a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
-+++ b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
-@@ -47,10 +47,9 @@ class UpgradeCommand extends AbstractSetupCommand
-     private $appState;
- 
-     /**
--     * Constructor.
--     *
-      * @param InstallerFactory $installerFactory
-      * @param DeploymentConfig $deploymentConfig
-+     * @param AppState|null $appState
-      */
-     public function __construct(
-         InstallerFactory $installerFactory,
-@@ -102,7 +101,7 @@ class UpgradeCommand extends AbstractSetupCommand
-                 InputOption::VALUE_OPTIONAL,
-                 'Magento Installation will be run in dry-run mode',
-                 false
--            ),
-+            )
-         ];
-         $this->setName('setup:upgrade')
-             ->setDescription('Upgrades the Magento application, DB data, and schema')
-@@ -127,7 +126,10 @@ class UpgradeCommand extends AbstractSetupCommand
-                 $importConfigCommand = $this->getApplication()->find(ConfigImportCommand::COMMAND_NAME);
-                 $arrayInput = new ArrayInput([]);
-                 $arrayInput->setInteractive($input->isInteractive());
--                $importConfigCommand->run($arrayInput, $output);
-+                $result = $importConfigCommand->run($arrayInput, $output);
-+                if ($result === \Magento\Framework\Console\Cli::RETURN_FAILURE) {
-+                    throw new \Magento\Framework\Exception\RuntimeException(__('%1 failed. See previous output.', ConfigImportCommand::COMMAND_NAME));
-+                }
-             }
- 
-             if (!$keepGenerated && $this->appState->getMode() === AppState::MODE_PRODUCTION) {
-diff --git a/setup/src/Magento/Setup/Console/CommandList.php b/setup/src/Magento/Setup/Console/CommandList.php
-index 08befdca222..f0dad6f4a74 100644
---- a/setup/src/Magento/Setup/Console/CommandList.php
-+++ b/setup/src/Magento/Setup/Console/CommandList.php
-@@ -66,6 +66,7 @@ class CommandList
-             \Magento\Setup\Console\Command\ModuleDisableCommand::class,
-             \Magento\Setup\Console\Command\ModuleStatusCommand::class,
-             \Magento\Setup\Console\Command\ModuleUninstallCommand::class,
-+            \Magento\Setup\Console\Command\ModuleConfigStatusCommand::class,
-             \Magento\Setup\Console\Command\MaintenanceAllowIpsCommand::class,
-             \Magento\Setup\Console\Command\MaintenanceDisableCommand::class,
-             \Magento\Setup\Console\Command\MaintenanceEnableCommand::class,
-@@ -91,6 +92,7 @@ class CommandList
-             if (class_exists($class)) {
-                 $commands[] = $this->serviceManager->get($class);
-             } else {
-+                // phpcs:ignore Magento2.Exceptions.DirectThrow
-                 throw new \Exception('Class ' . $class . ' does not exist');
-             }
-         }
-diff --git a/setup/src/Magento/Setup/Controller/DatabaseCheck.php b/setup/src/Magento/Setup/Controller/DatabaseCheck.php
-index ace9ef3294e..4b88a8732d2 100644
---- a/setup/src/Magento/Setup/Controller/DatabaseCheck.php
-+++ b/setup/src/Magento/Setup/Controller/DatabaseCheck.php
-@@ -5,11 +5,15 @@
-  */
- namespace Magento\Setup\Controller;
- 
-+use Magento\Framework\Config\ConfigOptionsListConstants;
- use Magento\Setup\Validator\DbValidator;
- use Zend\Json\Json;
- use Zend\Mvc\Controller\AbstractActionController;
- use Zend\View\Model\JsonModel;
- 
-+/**
-+ * Class DatabaseCheck
-+ */
- class DatabaseCheck extends AbstractActionController
- {
-     /**
-@@ -37,7 +41,25 @@ class DatabaseCheck extends AbstractActionController
-         try {
-             $params = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY);
-             $password = isset($params['password']) ? $params['password'] : '';
--            $this->dbValidator->checkDatabaseConnection($params['name'], $params['host'], $params['user'], $password);
-+            $driverOptions = [];
-+            if ($this->isDriverOptionsGiven($params)) {
-+                if (empty($params['driverOptionsSslVerify'])) {
-+                    $params['driverOptionsSslVerify'] = 0;
-+                }
-+                $driverOptions = [
-+                    ConfigOptionsListConstants::KEY_MYSQL_SSL_KEY => $params['driverOptionsSslKey'],
-+                    ConfigOptionsListConstants::KEY_MYSQL_SSL_CERT => $params['driverOptionsSslCert'],
-+                    ConfigOptionsListConstants::KEY_MYSQL_SSL_CA => $params['driverOptionsSslCa'],
-+                    ConfigOptionsListConstants::KEY_MYSQL_SSL_VERIFY => (int) $params['driverOptionsSslVerify'],
-+                ];
-+            }
-+            $this->dbValidator->checkDatabaseConnectionWithDriverOptions(
-+                $params['name'],
-+                $params['host'],
-+                $params['user'],
-+                $password,
-+                $driverOptions
-+            );
-             $tablePrefix = isset($params['tablePrefix']) ? $params['tablePrefix'] : '';
-             $this->dbValidator->checkDatabaseTablePrefix($tablePrefix);
-             return new JsonModel(['success' => true]);
-@@ -45,4 +67,19 @@ class DatabaseCheck extends AbstractActionController
-             return new JsonModel(['success' => false, 'error' => $e->getMessage()]);
-         }
-     }
-+
-+    /**
-+     * Is Driver Options Given
-+     *
-+     * @param array $params
-+     * @return bool
-+     */
-+    private function isDriverOptionsGiven($params)
-+    {
-+        return !(
-+            empty($params['driverOptionsSslKey']) ||
-+            empty($params['driverOptionsSslCert']) ||
-+            empty($params['driverOptionsSslCa'])
-+        );
-+    }
- }
-diff --git a/setup/src/Magento/Setup/Controller/LandingInstaller.php b/setup/src/Magento/Setup/Controller/LandingInstaller.php
-index 45579979b9f..49125c47fad 100644
---- a/setup/src/Magento/Setup/Controller/LandingInstaller.php
-+++ b/setup/src/Magento/Setup/Controller/LandingInstaller.php
-@@ -27,13 +27,15 @@ class LandingInstaller extends AbstractActionController
-     }
- 
-     /**
-+     * Setup index action.
-+     *
-      * @return array|ViewModel
-      */
-     public function indexAction()
-     {
-         $welcomeMsg = "Welcome to Magento Admin, your online store headquarters.<br>"
-             . "Click 'Agree and Set Up Magento' or read ";
--        $docRef = "http://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html";
-+        $docRef = "https://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html";
-         $agreeButtonText = "Agree and Setup Magento";
-         $view = new ViewModel;
-         $view->setTerminal(true);
-diff --git a/setup/src/Magento/Setup/Controller/LandingUpdater.php b/setup/src/Magento/Setup/Controller/LandingUpdater.php
-index e144cc40c37..6ae97eec42d 100644
---- a/setup/src/Magento/Setup/Controller/LandingUpdater.php
-+++ b/setup/src/Magento/Setup/Controller/LandingUpdater.php
-@@ -27,15 +27,17 @@ class LandingUpdater extends AbstractActionController
-     }
- 
-     /**
-+     * Updater index action.
-+     *
-      * @return array|ViewModel
-      */
-     public function indexAction()
-     {
-         $welcomeMsg = "Welcome to Magento Module Manager.<br>"
-             . "Click 'Agree and Update Magento' or read ";
--        $docRef = "http://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html";
-+        $docRef = "https://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html";
-         $agreeButtonText = "Agree and Update Magento";
--        $view = new ViewModel;
-+        $view = new ViewModel();
-         $view->setTerminal(true);
-         $view->setTemplate('/magento/setup/landing.phtml');
-         $view->setVariable('version', $this->productMetadata->getVersion());
-diff --git a/setup/src/Magento/Setup/Controller/Session.php b/setup/src/Magento/Setup/Controller/Session.php
-index e310dd485ac..c9caa5a8de7 100644
---- a/setup/src/Magento/Setup/Controller/Session.php
-+++ b/setup/src/Magento/Setup/Controller/Session.php
-@@ -5,6 +5,9 @@
-  */
- namespace Magento\Setup\Controller;
- 
-+/**
-+ * Sets up session for setup/index.php/session/prolong or redirects to error page
-+ */
- class Session extends \Zend\Mvc\Controller\AbstractActionController
- {
-     /**
-@@ -52,23 +55,28 @@ class Session extends \Zend\Mvc\Controller\AbstractActionController
-         try {
-             if ($this->serviceManager->get(\Magento\Framework\App\DeploymentConfig::class)->isAvailable()) {
-                 $objectManager = $this->objectManagerProvider->get();
--                /** @var \Magento\Framework\App\State $adminAppState */
--                $adminAppState = $objectManager->get(\Magento\Framework\App\State::class);
--                $adminAppState->setAreaCode(\Magento\Framework\App\Area::AREA_ADMINHTML);
--                $sessionConfig = $objectManager->get(\Magento\Backend\Model\Session\AdminConfig::class);
--                /** @var \Magento\Backend\Model\Url $backendUrl */
--                $backendUrl = $objectManager->get(\Magento\Backend\Model\Url::class);
--                $urlPath = parse_url($backendUrl->getBaseUrl(), PHP_URL_PATH);
--                $cookiePath = $urlPath . 'setup';
--                $sessionConfig->setCookiePath($cookiePath);
-                 /* @var \Magento\Backend\Model\Auth\Session $session */
--                $session = $objectManager->create(
--                    \Magento\Backend\Model\Auth\Session::class,
--                    [
--                        'sessionConfig' => $sessionConfig,
--                        'appState' => $adminAppState
--                    ]
--                );
-+                $session = $objectManager->get(\Magento\Backend\Model\Auth\Session::class);
-+                // check if session was already set in \Magento\Setup\Mvc\Bootstrap\InitParamListener::authPreDispatch
-+                if (!$session->isSessionExists()) {
-+                    /** @var \Magento\Framework\App\State $adminAppState */
-+                    $adminAppState = $objectManager->get(\Magento\Framework\App\State::class);
-+                    $adminAppState->setAreaCode(\Magento\Framework\App\Area::AREA_ADMINHTML);
-+                    $sessionConfig = $objectManager->get(\Magento\Backend\Model\Session\AdminConfig::class);
-+                    /** @var \Magento\Backend\Model\Url $backendUrl */
-+                    $backendUrl = $objectManager->get(\Magento\Backend\Model\Url::class);
-+                    $urlPath = parse_url($backendUrl->getBaseUrl(), PHP_URL_PATH);
-+                    $cookiePath = $urlPath . 'setup';
-+                    $sessionConfig->setCookiePath($cookiePath);
-+                    /* @var \Magento\Backend\Model\Auth\Session $session */
-+                    $session = $objectManager->create(
-+                        \Magento\Backend\Model\Auth\Session::class,
-+                        [
-+                            'sessionConfig' => $sessionConfig,
-+                            'appState' => $adminAppState
-+                        ]
-+                    );
-+                }
-                 $session->prolong();
-                 return new \Zend\View\Model\JsonModel(['success' => true]);
-             }
-@@ -78,6 +86,8 @@ class Session extends \Zend\Mvc\Controller\AbstractActionController
-     }
- 
-     /**
-+     * Unlogin action, return 401 error page
-+     *
-      * @return \Zend\View\Model\ViewModel|\Zend\Http\Response
-      */
-     public function unloginAction()
-diff --git a/setup/src/Magento/Setup/Fixtures/CouponCodesFixture.php b/setup/src/Magento/Setup/Fixtures/CouponCodesFixture.php
-new file mode 100644
-index 00000000000..4839fbd2dda
---- /dev/null
-+++ b/setup/src/Magento/Setup/Fixtures/CouponCodesFixture.php
-@@ -0,0 +1,149 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Setup\Fixtures;
-+
-+/**
-+ * Fixture for generating coupon codes
-+ *
-+ * Support the following format:
-+ * <!-- Number of coupon codes -->
-+ * <coupon_codes>{int}</coupon_codes>
-+ *
-+ * @see setup/performance-toolkit/profiles/ce/small.xml
-+ */
-+class CouponCodesFixture extends Fixture
-+{
-+    /**
-+     * @var int
-+     */
-+    protected $priority = 129;
-+
-+    /**
-+     * @var int
-+     */
-+    protected $couponCodesCount = 0;
-+
-+    /**
-+     * @var \Magento\SalesRule\Model\RuleFactory
-+     */
-+    private $ruleFactory;
-+
-+    /**
-+     * @var \Magento\SalesRule\Model\CouponFactory
-+     */
-+    private $couponCodeFactory;
-+
-+    /**
-+     * Constructor
-+     *
-+     * @param FixtureModel $fixtureModel
-+     * @param \Magento\SalesRule\Model\RuleFactory|null $ruleFactory
-+     * @param \Magento\SalesRule\Model\CouponFactory|null $couponCodeFactory
-+     */
-+    public function __construct(
-+        FixtureModel $fixtureModel,
-+        \Magento\SalesRule\Model\RuleFactory $ruleFactory = null,
-+        \Magento\SalesRule\Model\CouponFactory $couponCodeFactory = null
-+    ) {
-+        parent::__construct($fixtureModel);
-+        $this->ruleFactory = $ruleFactory ?: $this->fixtureModel->getObjectManager()
-+            ->get(\Magento\SalesRule\Model\RuleFactory::class);
-+        $this->couponCodeFactory = $couponCodeFactory ?: $this->fixtureModel->getObjectManager()
-+            ->get(\Magento\SalesRule\Model\CouponFactory::class);
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     *
-+     * @SuppressWarnings(PHPMD)
-+     */
-+    public function execute()
-+    {
-+        $this->fixtureModel->resetObjectManager();
-+        $this->couponCodesCount = $this->fixtureModel->getValue('coupon_codes', 0);
-+        if (!$this->couponCodesCount) {
-+            return;
-+        }
-+
-+        /** @var \Magento\Store\Model\StoreManager $storeManager */
-+        $storeManager = $this->fixtureModel->getObjectManager()->create(\Magento\Store\Model\StoreManager::class);
-+
-+        //Get all websites
-+        $websitesArray = [];
-+        $websites = $storeManager->getWebsites();
-+        foreach ($websites as $website) {
-+            $websitesArray[] = $website->getId();
-+        }
-+
-+        $this->generateCouponCodes($this->ruleFactory, $this->couponCodeFactory, $websitesArray);
-+    }
-+
-+    /**
-+     * Generate Coupon Codes
-+     *
-+     * @param \Magento\SalesRule\Model\RuleFactory $ruleFactory
-+     * @param \Magento\SalesRule\Model\CouponFactory $couponCodeFactory
-+     * @param array $websitesArray
-+     *
-+     * @return void
-+     */
-+    public function generateCouponCodes($ruleFactory, $couponCodeFactory, $websitesArray)
-+    {
-+        for ($i = 0; $i < $this->couponCodesCount; $i++) {
-+            $ruleName = sprintf('Coupon Code %1$d', $i);
-+            $data = [
-+                'rule_id'               => null,
-+                'name'                  => $ruleName,
-+                'is_active'             => '1',
-+                'website_ids'           => $websitesArray,
-+                'customer_group_ids'    => [
-+                    0 => '0',
-+                    1 => '1',
-+                    2 => '2',
-+                    3 => '3',
-+                ],
-+                'coupon_type'           => \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC,
-+                'conditions'            => [],
-+                'simple_action'         => \Magento\SalesRule\Model\Rule::BY_PERCENT_ACTION,
-+                'discount_amount'       => 5,
-+                'discount_step'         => 0,
-+                'stop_rules_processing' => 1,
-+            ];
-+
-+            $model = $ruleFactory->create();
-+            $model->loadPost($data);
-+            $useAutoGeneration = (int)!empty($data['use_auto_generation']);
-+            $model->setUseAutoGeneration($useAutoGeneration);
-+            $model->save();
-+
-+            $coupon = $couponCodeFactory->create();
-+            $coupon->setRuleId($model->getId())
-+                ->setCode('CouponCode' . $i)
-+                ->setIsPrimary(true)
-+                ->setType(0);
-+            $coupon->save();
-+        }
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getActionTitle()
-+    {
-+        return 'Generating coupon codes';
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function introduceParamLabels()
-+    {
-+        return [
-+            'coupon_codes' => 'Coupon Codes'
-+        ];
-+    }
-+}
-diff --git a/setup/src/Magento/Setup/Fixtures/ImagesFixture.php b/setup/src/Magento/Setup/Fixtures/ImagesFixture.php
-index 84081412335..1878a489771 100644
---- a/setup/src/Magento/Setup/Fixtures/ImagesFixture.php
-+++ b/setup/src/Magento/Setup/Fixtures/ImagesFixture.php
-@@ -417,7 +417,7 @@ class ImagesFixture extends Fixture
-     {
-         $config = $this->fixtureModel->getValue('product-images', []);
- 
--        return isset($config['images-count']) ? $config['images-count'] : null;
-+        return $config['images-count'] ?? null;
-     }
- 
-     /**
-@@ -429,7 +429,7 @@ class ImagesFixture extends Fixture
-     {
-         $config = $this->fixtureModel->getValue('product-images', []);
- 
--        return isset($config['images-per-product']) ? $config['images-per-product'] : null;
-+        return $config['images-per-product'] ?? null;
-     }
- 
-     /**
-diff --git a/setup/src/Magento/Setup/Model/ConfigGenerator.php b/setup/src/Magento/Setup/Model/ConfigGenerator.php
-index 7e5b0c162a3..88421797e59 100644
---- a/setup/src/Magento/Setup/Model/ConfigGenerator.php
-+++ b/setup/src/Magento/Setup/Model/ConfigGenerator.php
-@@ -14,10 +14,12 @@ use Magento\Framework\App\DeploymentConfig;
- use Magento\Framework\Config\ConfigOptionsListConstants;
- use Magento\Framework\App\State;
- use Magento\Framework\Math\Random;
-+use Magento\Setup\Model\ConfigOptionsList\DriverOptions;
- 
- /**
-  * Creates deployment config data based on user input array
-- * this class introduced to break down Magento\Setup\Model\ConfigOptionsList::createConfig
-+ *
-+ * This class introduced to break down {@see Magento\Setup\Model\ConfigOptionsList::createConfig}
-  */
- class ConfigGenerator
- {
-@@ -61,6 +63,11 @@ class ConfigGenerator
-      */
-     private $cryptKeyGenerator;
- 
-+    /**
-+     * @var DriverOptions
-+     */
-+    private $driverOptions;
-+
-     /**
-      * Constructor
-      *
-@@ -68,21 +75,25 @@ class ConfigGenerator
-      * @param DeploymentConfig $deploymentConfig
-      * @param ConfigDataFactory|null $configDataFactory
-      * @param CryptKeyGeneratorInterface|null $cryptKeyGenerator
-+     * @param DriverOptions|null $driverOptions
-      */
-     public function __construct(
-         Random $random,
-         DeploymentConfig $deploymentConfig,
-         ConfigDataFactory $configDataFactory = null,
--        CryptKeyGeneratorInterface $cryptKeyGenerator = null
-+        CryptKeyGeneratorInterface $cryptKeyGenerator = null,
-+        DriverOptions $driverOptions = null
-     ) {
-         $this->random = $random;
-         $this->deploymentConfig = $deploymentConfig;
-         $this->configDataFactory = $configDataFactory ?? ObjectManager::getInstance()->get(ConfigDataFactory::class);
-         $this->cryptKeyGenerator = $cryptKeyGenerator ?? ObjectManager::getInstance()->get(CryptKeyGenerator::class);
-+        $this->driverOptions = $driverOptions ?? ObjectManager::getInstance()->get(DriverOptions::class);
-     }
- 
-     /**
-      * Creates encryption key config data
-+     *
-      * @param array $data
-      * @return ConfigData
-      */
-@@ -179,6 +190,9 @@ class ConfigGenerator
-             $configData->set($dbConnectionPrefix . ConfigOptionsListConstants::KEY_ACTIVE, '1');
-         }
- 
-+        $driverOptions = $this->driverOptions->getDriverOptions($data);
-+        $configData->set($dbConnectionPrefix . ConfigOptionsListConstants::KEY_DRIVER_OPTIONS, $driverOptions);
-+
-         return $configData;
-     }
- 
-diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList.php b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
-index fa79139e733..313e08d6c92 100644
---- a/setup/src/Magento/Setup/Model/ConfigOptionsList.php
-+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
-@@ -8,10 +8,12 @@ namespace Magento\Setup\Model;
- 
- use Magento\Framework\App\DeploymentConfig;
- use Magento\Framework\Config\ConfigOptionsListConstants;
-+use Magento\Framework\Encryption\KeyValidator;
- use Magento\Framework\Setup\ConfigOptionsListInterface;
- use Magento\Framework\Setup\Option\FlagConfigOption;
- use Magento\Framework\Setup\Option\SelectConfigOption;
- use Magento\Framework\Setup\Option\TextConfigOption;
-+use Magento\Setup\Model\ConfigOptionsList\DriverOptions;
- use Magento\Setup\Validator\DbValidator;
- 
- /**
-@@ -38,32 +40,52 @@ class ConfigOptionsList implements ConfigOptionsListInterface
-      */
-     private $configOptionsCollection = [];
- 
-+    /**
-+     * @var KeyValidator
-+     */
-+    private $encryptionKeyValidator;
-+
-     /**
-      * @var array
-      */
-     private $configOptionsListClasses = [
-         \Magento\Setup\Model\ConfigOptionsList\Session::class,
-         \Magento\Setup\Model\ConfigOptionsList\Cache::class,
--        \Magento\Setup\Model\ConfigOptionsList\PageCache::class
-+        \Magento\Setup\Model\ConfigOptionsList\PageCache::class,
-+        \Magento\Setup\Model\ConfigOptionsList\Lock::class,
-     ];
- 
-+    /**
-+     * @var DriverOptions
-+     */
-+    private $driverOptions;
-+
-     /**
-      * Constructor
-      *
-      * @param ConfigGenerator $configGenerator
-      * @param DbValidator $dbValidator
-+     * @param KeyValidator|null $encryptionKeyValidator
-+     * @param DriverOptions|null $driverOptions
-      */
--    public function __construct(ConfigGenerator $configGenerator, DbValidator $dbValidator)
--    {
-+    public function __construct(
-+        ConfigGenerator $configGenerator,
-+        DbValidator $dbValidator,
-+        KeyValidator $encryptionKeyValidator = null,
-+        DriverOptions $driverOptions = null
-+    ) {
-         $this->configGenerator = $configGenerator;
-         $this->dbValidator = $dbValidator;
-+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-         foreach ($this->configOptionsListClasses as $className) {
--            $this->configOptionsCollection[] = \Magento\Framework\App\ObjectManager::getInstance()->get($className);
-+            $this->configOptionsCollection[] = $objectManager->get($className);
-         }
-+        $this->encryptionKeyValidator = $encryptionKeyValidator ?: $objectManager->get(KeyValidator::class);
-+        $this->driverOptions = $driverOptions ?? $objectManager->get(DriverOptions::class);
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-     public function getOptions()
-@@ -150,6 +172,36 @@ class ConfigOptionsList implements ConfigOptionsListInterface
-                 ConfigOptionsListConstants::CONFIG_PATH_CACHE_HOSTS,
-                 'http Cache hosts'
-             ),
-+            new TextConfigOption(
-+                ConfigOptionsListConstants::INPUT_KEY_DB_SSL_KEY,
-+                TextConfigOption::FRONTEND_WIZARD_TEXT,
-+                ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT_DRIVER_OPTIONS .
-+                '/' . ConfigOptionsListConstants::KEY_MYSQL_SSL_KEY,
-+                'Full path of client key file in order to establish db connection through SSL',
-+                null
-+            ),
-+            new TextConfigOption(
-+                ConfigOptionsListConstants::INPUT_KEY_DB_SSL_CERT,
-+                TextConfigOption::FRONTEND_WIZARD_TEXT,
-+                ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT_DRIVER_OPTIONS .
-+                '/' . ConfigOptionsListConstants::KEY_MYSQL_SSL_CERT,
-+                'Full path of client certificate file in order to establish db connection through SSL',
-+                null
-+            ),
-+            new TextConfigOption(
-+                ConfigOptionsListConstants::INPUT_KEY_DB_SSL_CA,
-+                TextConfigOption::FRONTEND_WIZARD_TEXT,
-+                ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT_DRIVER_OPTIONS .
-+                '/' . ConfigOptionsListConstants::KEY_MYSQL_SSL_CA,
-+                'Full path of server certificate file in order to establish db connection through SSL',
-+                null
-+            ),
-+            new FlagConfigOption(
-+                ConfigOptionsListConstants::INPUT_KEY_DB_SSL_VERIFY,
-+                ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT_DRIVER_OPTIONS .
-+                '/' . ConfigOptionsListConstants::KEY_MYSQL_SSL_VERIFY,
-+                'Verify server certification'
-+            ),
-         ];
- 
-         foreach ($this->configOptionsCollection as $configOptionsList) {
-@@ -160,7 +212,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function createConfig(array $data, DeploymentConfig $deploymentConfig)
-     {
-@@ -184,7 +236,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function validate(array $options, DeploymentConfig $deploymentConfig)
-     {
-@@ -276,8 +328,9 @@ class ConfigOptionsList implements ConfigOptionsListInterface
-         $errors = [];
- 
-         if (isset($options[ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY])
--            && !$options[ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY]) {
--            $errors[] = 'Invalid encryption key';
-+            && !$this->encryptionKeyValidator->isValid($options[ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY])
-+        ) {
-+            $errors[] = 'Invalid encryption key. Encryption key must be 32 character string without any white space.';
-         }
- 
-         return $errors;
-@@ -334,12 +387,14 @@ class ConfigOptionsList implements ConfigOptionsListInterface
-         ) {
-             try {
-                 $options = $this->getDbSettings($options, $deploymentConfig);
-+                $driverOptions = $this->driverOptions->getDriverOptions($options);
- 
--                $this->dbValidator->checkDatabaseConnection(
-+                $this->dbValidator->checkDatabaseConnectionWithDriverOptions(
-                     $options[ConfigOptionsListConstants::INPUT_KEY_DB_NAME],
-                     $options[ConfigOptionsListConstants::INPUT_KEY_DB_HOST],
-                     $options[ConfigOptionsListConstants::INPUT_KEY_DB_USER],
--                    $options[ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD]
-+                    $options[ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD],
-+                    $driverOptions
-                 );
-             } catch (\Exception $exception) {
-                 $errors[] = $exception->getMessage();
-diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
-index 2f19f010c17..89a37429c47 100644
---- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
-+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
-@@ -27,12 +27,18 @@ class Cache implements ConfigOptionsListInterface
-     const INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE = 'cache-backend-redis-db';
-     const INPUT_KEY_CACHE_BACKEND_REDIS_PORT = 'cache-backend-redis-port';
-     const INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD = 'cache-backend-redis-password';
-+    const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'cache-backend-redis-compress-data';
-+    const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB = 'cache-backend-redis-compression-lib';
-+    const INPUT_KEY_CACHE_ID_PREFIX = 'cache-id-prefix';
- 
-     const CONFIG_PATH_CACHE_BACKEND = 'cache/frontend/default/backend';
-     const CONFIG_PATH_CACHE_BACKEND_SERVER = 'cache/frontend/default/backend_options/server';
-     const CONFIG_PATH_CACHE_BACKEND_DATABASE = 'cache/frontend/default/backend_options/database';
-     const CONFIG_PATH_CACHE_BACKEND_PORT = 'cache/frontend/default/backend_options/port';
-     const CONFIG_PATH_CACHE_BACKEND_PASSWORD = 'cache/frontend/default/backend_options/password';
-+    const CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/default/backend_options/compress_data';
-+    const CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB = 'cache/frontend/default/backend_options/compression_lib';
-+    const CONFIG_PATH_CACHE_ID_PREFIX = 'cache/frontend/default/id_prefix';
- 
-     /**
-      * @var array
-@@ -41,7 +47,9 @@ class Cache implements ConfigOptionsListInterface
-         self::INPUT_KEY_CACHE_BACKEND_REDIS_SERVER => '127.0.0.1',
-         self::INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE => '0',
-         self::INPUT_KEY_CACHE_BACKEND_REDIS_PORT => '6379',
--        self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => ''
-+        self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => '',
-+        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA => '1',
-+        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB => '',
-     ];
- 
-     /**
-@@ -58,7 +66,9 @@ class Cache implements ConfigOptionsListInterface
-         self::INPUT_KEY_CACHE_BACKEND_REDIS_SERVER => self::CONFIG_PATH_CACHE_BACKEND_SERVER,
-         self::INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE => self::CONFIG_PATH_CACHE_BACKEND_DATABASE,
-         self::INPUT_KEY_CACHE_BACKEND_REDIS_PORT => self::CONFIG_PATH_CACHE_BACKEND_PORT,
--        self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_CACHE_BACKEND_PASSWORD
-+        self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_CACHE_BACKEND_PASSWORD,
-+        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA,
-+        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB => self::CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB,
-     ];
- 
-     /**
-@@ -77,7 +87,7 @@ class Cache implements ConfigOptionsListInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getOptions()
-     {
-@@ -112,7 +122,25 @@ class Cache implements ConfigOptionsListInterface
-                 TextConfigOption::FRONTEND_WIZARD_TEXT,
-                 self::CONFIG_PATH_CACHE_BACKEND_PASSWORD,
-                 'Redis server password'
--            )
-+            ),
-+            new TextConfigOption(
-+                self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA,
-+                TextConfigOption::FRONTEND_WIZARD_TEXT,
-+                self::CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA,
-+                'Set to 0 to disable compression (default is 1, enabled)'
-+            ),
-+            new TextConfigOption(
-+                self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB,
-+                TextConfigOption::FRONTEND_WIZARD_TEXT,
-+                self::CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB,
-+                'Compression lib to use [snappy,lzf,l4z,zstd,gzip] (leave blank to determine automatically)'
-+            ),
-+            new TextConfigOption(
-+                self::INPUT_KEY_CACHE_ID_PREFIX,
-+                TextConfigOption::FRONTEND_WIZARD_TEXT,
-+                self::CONFIG_PATH_CACHE_ID_PREFIX,
-+                'ID prefix for cache keys'
-+            ),
-         ];
-     }
- 
-@@ -122,6 +150,11 @@ class Cache implements ConfigOptionsListInterface
-     public function createConfig(array $options, DeploymentConfig $deploymentConfig)
-     {
-         $configData = new ConfigData(ConfigFilePool::APP_ENV);
-+        if (isset($options[self::INPUT_KEY_CACHE_ID_PREFIX])) {
-+            $configData->set(self::CONFIG_PATH_CACHE_ID_PREFIX, $options[self::INPUT_KEY_CACHE_ID_PREFIX]);
-+        } else {
-+            $configData->set(self::CONFIG_PATH_CACHE_ID_PREFIX, $this->generateCachePrefix());
-+        }
- 
-         if (isset($options[self::INPUT_KEY_CACHE_BACKEND])) {
-             if ($options[self::INPUT_KEY_CACHE_BACKEND] == self::INPUT_VALUE_CACHE_REDIS) {
-@@ -241,4 +274,14 @@ class Cache implements ConfigOptionsListInterface
-             return '';
-         }
-     }
-+
-+    /**
-+     * Generate default cache ID prefix based on installation dir
-+     *
-+     * @return string
-+     */
-+    private function generateCachePrefix(): string
-+    {
-+        return substr(\md5(dirname(__DIR__, 6)), 0, 3) . '_';
-+    }
- }
-diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/DriverOptions.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/DriverOptions.php
-new file mode 100644
-index 00000000000..59108993549
---- /dev/null
-+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/DriverOptions.php
-@@ -0,0 +1,72 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Setup\Model\ConfigOptionsList;
-+
-+use Magento\Framework\Config\ConfigOptionsListConstants;
-+
-+/**
-+ * MySql driver options
-+ */
-+class DriverOptions
-+{
-+    /**
-+     * Get driver options.
-+     *
-+     * @param array $options
-+     * @return array
-+     */
-+    public function getDriverOptions(array $options): array
-+    {
-+        $driverOptionKeys = [
-+            ConfigOptionsListConstants::KEY_MYSQL_SSL_KEY => ConfigOptionsListConstants::INPUT_KEY_DB_SSL_KEY,
-+            ConfigOptionsListConstants::KEY_MYSQL_SSL_CERT => ConfigOptionsListConstants::INPUT_KEY_DB_SSL_CERT,
-+            ConfigOptionsListConstants::KEY_MYSQL_SSL_CA => ConfigOptionsListConstants::INPUT_KEY_DB_SSL_CA,
-+        ];
-+        $booleanDriverOptionKeys = [
-+            ConfigOptionsListConstants::KEY_MYSQL_SSL_VERIFY => ConfigOptionsListConstants::INPUT_KEY_DB_SSL_VERIFY,
-+        ];
-+        $driverOptions = [];
-+        foreach ($driverOptionKeys as $configKey => $driverOptionKey) {
-+            if ($this->optionExists($options, $driverOptionKey)) {
-+                $driverOptions[$configKey] = $options[$driverOptionKey];
-+            }
-+        }
-+        foreach ($booleanDriverOptionKeys as $configKey => $driverOptionKey) {
-+            $driverOptions[$configKey] = $this->booleanValue($options, $driverOptionKey);
-+        }
-+
-+        return $driverOptions;
-+    }
-+
-+    /**
-+     * Check if provided option exists.
-+     *
-+     * @param array $options
-+     * @param string $driverOptionKey
-+     * @return bool
-+     */
-+    private function optionExists(array $options, string $driverOptionKey): bool
-+    {
-+        return isset($options[$driverOptionKey])
-+            && ($options[$driverOptionKey] === false || !empty($options[$driverOptionKey]));
-+    }
-+
-+    /**
-+     * Transforms checkbox flag value into boolean.
-+     *
-+     * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/checkbox#value
-+     *
-+     * @param array $options
-+     * @param string $driverOptionKey
-+     * @return bool
-+     */
-+    private function booleanValue(array $options, string $driverOptionKey): bool
-+    {
-+        return isset($options[$driverOptionKey]) && (bool)$options[$driverOptionKey];
-+    }
-+}
-diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
-new file mode 100644
-index 00000000000..66f41128c46
---- /dev/null
-+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
-@@ -0,0 +1,342 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Setup\Model\ConfigOptionsList;
-+
-+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
-+use Magento\Framework\Lock\LockBackendFactory;
-+use Magento\Framework\App\DeploymentConfig;
-+use Magento\Framework\Config\Data\ConfigData;
-+use Magento\Framework\Config\File\ConfigFilePool;
-+use Magento\Framework\Setup\ConfigOptionsListInterface;
-+use Magento\Framework\Setup\Option\SelectConfigOption;
-+use Magento\Framework\Setup\Option\TextConfigOption;
-+
-+/**
-+ * Deployment configuration options for locks
-+ */
-+class Lock implements ConfigOptionsListInterface
-+{
-+    /**
-+     * The name of an option to set lock provider
-+     *
-+     * @const string
-+     */
-+    const INPUT_KEY_LOCK_PROVIDER = 'lock-provider';
-+
-+    /**
-+     * The name of an option to set DB prefix
-+     *
-+     * @const string
-+     */
-+    const INPUT_KEY_LOCK_DB_PREFIX = 'lock-db-prefix';
-+
-+    /**
-+     * The name of an option to set Zookeeper host
-+     *
-+     * @const string
-+     */
-+    const INPUT_KEY_LOCK_ZOOKEEPER_HOST = 'lock-zookeeper-host';
-+
-+    /**
-+     * The name of an option to set Zookeeper path
-+     *
-+     * @const string
-+     */
-+    const INPUT_KEY_LOCK_ZOOKEEPER_PATH = 'lock-zookeeper-path';
-+
-+    /**
-+     * The name of an option to set File path
-+     *
-+     * @const string
-+     */
-+    const INPUT_KEY_LOCK_FILE_PATH = 'lock-file-path';
-+
-+    /**
-+     * The configuration path to save lock provider
-+     *
-+     * @const string
-+     */
-+    const CONFIG_PATH_LOCK_PROVIDER = 'lock/provider';
-+
-+    /**
-+     * The configuration path to save DB prefix
-+     *
-+     * @const string
-+     */
-+    const CONFIG_PATH_LOCK_DB_PREFIX = 'lock/config/prefix';
-+
-+    /**
-+     * The configuration path to save Zookeeper host
-+     *
-+     * @const string
-+     */
-+    const CONFIG_PATH_LOCK_ZOOKEEPER_HOST = 'lock/config/host';
-+
-+    /**
-+     * The configuration path to save Zookeeper path
-+     *
-+     * @const string
-+     */
-+    const CONFIG_PATH_LOCK_ZOOKEEPER_PATH = 'lock/config/path';
-+
-+    /**
-+     * The configuration path to save locks directory path
-+     *
-+     * @const string
-+     */
-+    const CONFIG_PATH_LOCK_FILE_PATH = 'lock/config/path';
-+
-+    /**
-+     * The list of lock providers
-+     *
-+     * @var array
-+     */
-+    private $validLockProviders = [
-+        LockBackendFactory::LOCK_DB,
-+        LockBackendFactory::LOCK_ZOOKEEPER,
-+        LockBackendFactory::LOCK_CACHE,
-+        LockBackendFactory::LOCK_FILE,
-+    ];
-+
-+    /**
-+     * The mapping input keys with their configuration paths
-+     *
-+     * @var array
-+     */
-+    private $mappingInputKeyToConfigPath = [
-+        LockBackendFactory::LOCK_DB => [
-+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
-+            self::INPUT_KEY_LOCK_DB_PREFIX => self::CONFIG_PATH_LOCK_DB_PREFIX,
-+        ],
-+        LockBackendFactory::LOCK_ZOOKEEPER => [
-+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
-+            self::INPUT_KEY_LOCK_ZOOKEEPER_HOST => self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
-+            self::INPUT_KEY_LOCK_ZOOKEEPER_PATH => self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
-+        ],
-+        LockBackendFactory::LOCK_CACHE => [
-+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
-+        ],
-+        LockBackendFactory::LOCK_FILE => [
-+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
-+            self::INPUT_KEY_LOCK_FILE_PATH => self::CONFIG_PATH_LOCK_FILE_PATH,
-+        ],
-+    ];
-+
-+    /**
-+     * The list of default values
-+     *
-+     * @var array
-+     */
-+    private $defaultConfigValues = [
-+        self::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_DB,
-+        self::INPUT_KEY_LOCK_DB_PREFIX => null,
-+        self::INPUT_KEY_LOCK_ZOOKEEPER_PATH => ZookeeperLock::DEFAULT_PATH,
-+    ];
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function getOptions()
-+    {
-+        return [
-+            new SelectConfigOption(
-+                self::INPUT_KEY_LOCK_PROVIDER,
-+                SelectConfigOption::FRONTEND_WIZARD_SELECT,
-+                $this->validLockProviders,
-+                self::CONFIG_PATH_LOCK_PROVIDER,
-+                'Lock provider name',
-+                LockBackendFactory::LOCK_DB
-+            ),
-+            new TextConfigOption(
-+                self::INPUT_KEY_LOCK_DB_PREFIX,
-+                TextConfigOption::FRONTEND_WIZARD_TEXT,
-+                self::CONFIG_PATH_LOCK_DB_PREFIX,
-+                'Installation specific lock prefix to avoid lock conflicts'
-+            ),
-+            new TextConfigOption(
-+                self::INPUT_KEY_LOCK_ZOOKEEPER_HOST,
-+                TextConfigOption::FRONTEND_WIZARD_TEXT,
-+                self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
-+                'Host and port to connect to Zookeeper cluster. For example: 127.0.0.1:2181'
-+            ),
-+            new TextConfigOption(
-+                self::INPUT_KEY_LOCK_ZOOKEEPER_PATH,
-+                TextConfigOption::FRONTEND_WIZARD_TEXT,
-+                self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
-+                'The path where Zookeeper will save locks. The default path is: ' . ZookeeperLock::DEFAULT_PATH
-+            ),
-+            new TextConfigOption(
-+                self::INPUT_KEY_LOCK_FILE_PATH,
-+                TextConfigOption::FRONTEND_WIZARD_TEXT,
-+                self::CONFIG_PATH_LOCK_FILE_PATH,
-+                'The path where file locks will be saved.'
-+            ),
-+        ];
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function createConfig(array $options, DeploymentConfig $deploymentConfig)
-+    {
-+        $configData = new ConfigData(ConfigFilePool::APP_ENV);
-+        $configData->setOverrideWhenSave(true);
-+        $lockProvider = $this->getLockProvider($options, $deploymentConfig);
-+
-+        $this->setDefaultConfiguration($configData, $deploymentConfig, $lockProvider);
-+
-+        foreach ($this->mappingInputKeyToConfigPath[$lockProvider] as $input => $path) {
-+            if (isset($options[$input])) {
-+                $configData->set($path, $options[$input]);
-+            }
-+        }
-+
-+        return $configData;
-+    }
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    public function validate(array $options, DeploymentConfig $deploymentConfig)
-+    {
-+        $lockProvider = $this->getLockProvider($options, $deploymentConfig);
-+        switch ($lockProvider) {
-+            case LockBackendFactory::LOCK_ZOOKEEPER:
-+                $errors = $this->validateZookeeperConfig($options, $deploymentConfig);
-+                break;
-+            case LockBackendFactory::LOCK_FILE:
-+                $errors = $this->validateFileConfig($options, $deploymentConfig);
-+                break;
-+            case LockBackendFactory::LOCK_CACHE:
-+            case LockBackendFactory::LOCK_DB:
-+                $errors = [];
-+                break;
-+            default:
-+                $errors[] = 'The lock provider ' . $lockProvider . ' does not exist.';
-+        }
-+
-+        return $errors;
-+    }
-+
-+    /**
-+     * Validates File locks configuration
-+     *
-+     * @param array $options
-+     * @param DeploymentConfig $deploymentConfig
-+     * @return array
-+     */
-+    private function validateFileConfig(array $options, DeploymentConfig $deploymentConfig): array
-+    {
-+        $errors = [];
-+
-+        $path = $options[self::INPUT_KEY_LOCK_FILE_PATH]
-+            ?? $deploymentConfig->get(
-+                self::CONFIG_PATH_LOCK_FILE_PATH,
-+                $this->getDefaultValue(self::INPUT_KEY_LOCK_FILE_PATH)
-+            );
-+
-+        if (!$path) {
-+            $errors[] = 'The path needs to be a non-empty string.';
-+        }
-+
-+        return $errors;
-+    }
-+
-+    /**
-+     * Validates Zookeeper configuration
-+     *
-+     * @param array $options
-+     * @param DeploymentConfig $deploymentConfig
-+     * @return array
-+     */
-+    private function validateZookeeperConfig(array $options, DeploymentConfig $deploymentConfig): array
-+    {
-+        $errors = [];
-+
-+        if (!extension_loaded(LockBackendFactory::LOCK_ZOOKEEPER)) {
-+            $errors[] = 'php extension Zookeeper is not installed.';
-+        }
-+
-+        $host = $options[self::INPUT_KEY_LOCK_ZOOKEEPER_HOST]
-+            ?? $deploymentConfig->get(
-+                self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
-+                $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_HOST)
-+            );
-+        $path = $options[self::INPUT_KEY_LOCK_ZOOKEEPER_PATH]
-+            ?? $deploymentConfig->get(
-+                self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
-+                $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_PATH)
-+            );
-+
-+        if (!$path) {
-+            $errors[] = 'Zookeeper path needs to be a non-empty string.';
-+        }
-+
-+        if (!$host) {
-+            $errors[] = 'Zookeeper host is should be set.';
-+        }
-+
-+        return $errors;
-+    }
-+
-+    /**
-+     * Returns the name of lock provider
-+     *
-+     * @param array $options
-+     * @param DeploymentConfig $deploymentConfig
-+     * @return string
-+     */
-+    private function getLockProvider(array $options, DeploymentConfig $deploymentConfig): string
-+    {
-+        if (!isset($options[self::INPUT_KEY_LOCK_PROVIDER])) {
-+            return (string) $deploymentConfig->get(
-+                self::CONFIG_PATH_LOCK_PROVIDER,
-+                $this->getDefaultValue(self::INPUT_KEY_LOCK_PROVIDER)
-+            );
-+        }
-+
-+        return (string) $options[self::INPUT_KEY_LOCK_PROVIDER];
-+    }
-+
-+    /**
-+     * Sets default configuration for locks
-+     *
-+     * @param ConfigData $configData
-+     * @param DeploymentConfig $deploymentConfig
-+     * @param string $lockProvider
-+     * @return ConfigData
-+     */
-+    private function setDefaultConfiguration(
-+        ConfigData $configData,
-+        DeploymentConfig $deploymentConfig,
-+        string $lockProvider
-+    ) {
-+        foreach ($this->mappingInputKeyToConfigPath[$lockProvider] as $input => $path) {
-+            $configData->set($path, $deploymentConfig->get($path, $this->getDefaultValue($input)));
-+        }
-+
-+        return $configData;
-+    }
-+
-+    /**
-+     * Returns default value by input key
-+     *
-+     * If default value is not set returns null
-+     *
-+     * @param string $inputKey
-+     * @return mixed|null
-+     */
-+    private function getDefaultValue(string $inputKey)
-+    {
-+        if (isset($this->defaultConfigValues[$inputKey])) {
-+            return $this->defaultConfigValues[$inputKey];
-+        } else {
-+            return null;
-+        }
-+    }
-+}
-diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
-index c288b4dd51d..65bfc650c02 100644
---- a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
-+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
-@@ -6,10 +6,10 @@
- 
- namespace Magento\Setup\Model\ConfigOptionsList;
- 
--use Magento\Framework\Setup\ConfigOptionsListInterface;
--use Magento\Framework\Config\File\ConfigFilePool;
- use Magento\Framework\App\DeploymentConfig;
- use Magento\Framework\Config\Data\ConfigData;
-+use Magento\Framework\Config\File\ConfigFilePool;
-+use Magento\Framework\Setup\ConfigOptionsListInterface;
- use Magento\Framework\Setup\Option\SelectConfigOption;
- use Magento\Framework\Setup\Option\TextConfigOption;
- use Magento\Setup\Validator\RedisConnectionValidator;
-@@ -26,15 +26,19 @@ class PageCache implements ConfigOptionsListInterface
-     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_SERVER = 'page-cache-redis-server';
-     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE = 'page-cache-redis-db';
-     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT = 'page-cache-redis-port';
--    const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'page-cache-redis-compress-data';
-     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD = 'page-cache-redis-password';
-+    const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'page-cache-redis-compress-data';
-+    const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB = 'page-cache-redis-compression-lib';
-+    const INPUT_KEY_PAGE_CACHE_ID_PREFIX = 'page-cache-id-prefix';
- 
-     const CONFIG_PATH_PAGE_CACHE_BACKEND = 'cache/frontend/page_cache/backend';
-     const CONFIG_PATH_PAGE_CACHE_BACKEND_SERVER = 'cache/frontend/page_cache/backend_options/server';
-     const CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE = 'cache/frontend/page_cache/backend_options/database';
-     const CONFIG_PATH_PAGE_CACHE_BACKEND_PORT = 'cache/frontend/page_cache/backend_options/port';
--    const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/page_cache/backend_options/compress_data';
-     const CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD = 'cache/frontend/page_cache/backend_options/password';
-+    const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/page_cache/backend_options/compress_data';
-+    const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIB = 'cache/frontend/page_cache/backend_options/compression_lib';
-+    const CONFIG_PATH_PAGE_CACHE_ID_PREFIX = 'cache/frontend/page_cache/id_prefix';
- 
-     /**
-      * @var array
-@@ -43,8 +47,9 @@ class PageCache implements ConfigOptionsListInterface
-         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_SERVER => '127.0.0.1',
-         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE => '1',
-         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT => '6379',
-+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => '',
-         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => '0',
--        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => ''
-+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB => '',
-     ];
- 
-     /**
-@@ -61,8 +66,10 @@ class PageCache implements ConfigOptionsListInterface
-         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_SERVER => self::CONFIG_PATH_PAGE_CACHE_BACKEND_SERVER,
-         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE => self::CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE,
-         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PORT,
-+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
-         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA,
--        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD
-+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB =>
-+            self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIB,
-     ];
- 
-     /**
-@@ -81,7 +88,7 @@ class PageCache implements ConfigOptionsListInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function getOptions()
-     {
-@@ -111,6 +118,12 @@ class PageCache implements ConfigOptionsListInterface
-                 self::CONFIG_PATH_PAGE_CACHE_BACKEND_PORT,
-                 'Redis server listen port'
-             ),
-+            new TextConfigOption(
-+                self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD,
-+                TextConfigOption::FRONTEND_WIZARD_TEXT,
-+                self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
-+                'Redis server password'
-+            ),
-             new TextConfigOption(
-                 self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA,
-                 TextConfigOption::FRONTEND_WIZARD_TEXT,
-@@ -118,11 +131,17 @@ class PageCache implements ConfigOptionsListInterface
-                 'Set to 1 to compress the full page cache (use 0 to disable)'
-             ),
-             new TextConfigOption(
--                self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD,
-+                self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB,
-                 TextConfigOption::FRONTEND_WIZARD_TEXT,
--                self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
--                'Redis server password'
--            )
-+                self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIB,
-+                'Compression library to use [snappy,lzf,l4z,zstd,gzip] (leave blank to determine automatically)'
-+            ),
-+            new TextConfigOption(
-+                self::INPUT_KEY_PAGE_CACHE_ID_PREFIX,
-+                TextConfigOption::FRONTEND_WIZARD_TEXT,
-+                self::CONFIG_PATH_PAGE_CACHE_ID_PREFIX,
-+                'ID prefix for cache keys'
-+            ),
-         ];
-     }
- 
-@@ -132,6 +151,11 @@ class PageCache implements ConfigOptionsListInterface
-     public function createConfig(array $options, DeploymentConfig $deploymentConfig)
-     {
-         $configData = new ConfigData(ConfigFilePool::APP_ENV);
-+        if (isset($options[self::INPUT_KEY_PAGE_CACHE_ID_PREFIX])) {
-+            $configData->set(self::CONFIG_PATH_PAGE_CACHE_ID_PREFIX, $options[self::INPUT_KEY_PAGE_CACHE_ID_PREFIX]);
-+        } else {
-+            $configData->set(self::CONFIG_PATH_PAGE_CACHE_ID_PREFIX, $this->generateCachePrefix());
-+        }
- 
-         if (isset($options[self::INPUT_KEY_PAGE_CACHE_BACKEND])) {
-             if ($options[self::INPUT_KEY_PAGE_CACHE_BACKEND] == self::INPUT_VALUE_PAGE_CACHE_REDIS) {
-@@ -211,7 +235,7 @@ class PageCache implements ConfigOptionsListInterface
-                 self::CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE,
-                 $this->getDefaultConfigValue(self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE)
-             );
--        
-+
-         $config['password'] = isset($options[self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD])
-             ? $options[self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD]
-             : $deploymentConfig->get(
-@@ -252,4 +276,14 @@ class PageCache implements ConfigOptionsListInterface
-             return '';
-         }
-     }
-+
-+    /**
-+     * Generate default cache ID prefix based on installation dir
-+     *
-+     * @return string
-+     */
-+    private function generateCachePrefix(): string
-+    {
-+        return substr(\md5(dirname(__DIR__, 6)), 0, 3) . '_';
-+    }
- }
-diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
-index c0ec78f046e..e864a81ffcc 100644
---- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
-+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
-@@ -139,7 +139,7 @@ class Session implements ConfigOptionsListInterface
-     ];
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-      */
-     public function getOptions()
-@@ -289,7 +289,7 @@ class Session implements ConfigOptionsListInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function createConfig(array $options, DeploymentConfig $deploymentConfig)
-     {
-@@ -320,7 +320,7 @@ class Session implements ConfigOptionsListInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function validate(array $options, DeploymentConfig $deploymentConfig)
-     {
-@@ -340,7 +340,7 @@ class Session implements ConfigOptionsListInterface
- 
-         if (isset($options[self::INPUT_KEY_SESSION_REDIS_LOG_LEVEL])) {
-             $level = $options[self::INPUT_KEY_SESSION_REDIS_LOG_LEVEL];
--            if (($level < 0) or ($level > 7)) {
-+            if (($level < 0) || ($level > 7)) {
-                 $errors[] = "Invalid Redis log level '{$level}'. Valid range is 0-7, inclusive.";
-             }
-         }
-diff --git a/setup/src/Magento/Setup/Model/CryptKeyGenerator.php b/setup/src/Magento/Setup/Model/CryptKeyGenerator.php
-index ec9d3f02812..df72dc4c6b8 100644
---- a/setup/src/Magento/Setup/Model/CryptKeyGenerator.php
-+++ b/setup/src/Magento/Setup/Model/CryptKeyGenerator.php
-@@ -31,10 +31,8 @@ class CryptKeyGenerator implements CryptKeyGeneratorInterface
- 
-     /**
-      * Generates & returns a string to be used as crypt key.
--     * The key length is not a parameter, but an implementation detail.
-      *
-      * @return string
--     *
-      * @throws \Magento\Framework\Exception\LocalizedException
-      */
-     public function generate()
-diff --git a/setup/src/Magento/Setup/Model/DeclarationInstaller.php b/setup/src/Magento/Setup/Model/DeclarationInstaller.php
-index 52c360251c2..4313b031a16 100644
---- a/setup/src/Magento/Setup/Model/DeclarationInstaller.php
-+++ b/setup/src/Magento/Setup/Model/DeclarationInstaller.php
-@@ -7,7 +7,6 @@ namespace Magento\Setup\Model;
- 
- use Magento\Framework\Setup\Declaration\Schema\Diff\SchemaDiff;
- use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
--use Magento\Framework\Setup\Declaration\Schema\RequestFactory;
- use Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface;
- 
- /**
-@@ -25,11 +24,6 @@ class DeclarationInstaller
-      */
-     private $schemaDiff;
- 
--    /**
--     * @var RequestFactory
--     */
--    private $requestFactory;
--
-     /**
-      * @var SchemaConfigInterface
-      */
-@@ -41,16 +35,13 @@ class DeclarationInstaller
-      * @param SchemaConfigInterface $schemaConfig
-      * @param SchemaDiff $schemaDiff
-      * @param OperationsExecutor $operationsExecutor
--     * @param RequestFactory $requestFactory
-      */
-     public function __construct(
-         SchemaConfigInterface $schemaConfig,
-         SchemaDiff $schemaDiff,
--        OperationsExecutor $operationsExecutor,
--        RequestFactory $requestFactory
-+        OperationsExecutor $operationsExecutor
-     ) {
-         $this->operationsExecutor = $operationsExecutor;
--        $this->requestFactory = $requestFactory;
-         $this->schemaConfig = $schemaConfig;
-         $this->schemaDiff = $schemaDiff;
-     }
-diff --git a/setup/src/Magento/Setup/Model/DependencyReadinessCheck.php b/setup/src/Magento/Setup/Model/DependencyReadinessCheck.php
-index 4adb3a6a49b..d9f8d154abd 100644
---- a/setup/src/Magento/Setup/Model/DependencyReadinessCheck.php
-+++ b/setup/src/Magento/Setup/Model/DependencyReadinessCheck.php
-@@ -10,6 +10,8 @@ use Magento\Composer\RequireUpdateDryRunCommand;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Framework\Composer\ComposerJsonFinder;
- use Magento\Framework\Composer\MagentoComposerApplicationFactory;
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Filesystem\Driver\File;
- 
- /**
-@@ -17,6 +19,11 @@ use Magento\Framework\Filesystem\Driver\File;
-  */
- class DependencyReadinessCheck
- {
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * @var ComposerJsonFinder
-      */
-@@ -49,18 +56,23 @@ class DependencyReadinessCheck
-      * @param DirectoryList $directoryList
-      * @param File $file
-      * @param MagentoComposerApplicationFactory $composerAppFactory
-+     * @param Escaper|null $escaper
-      */
-     public function __construct(
-         ComposerJsonFinder $composerJsonFinder,
-         DirectoryList $directoryList,
-         File $file,
--        MagentoComposerApplicationFactory $composerAppFactory
-+        MagentoComposerApplicationFactory $composerAppFactory,
-+        Escaper $escaper = null
-     ) {
-         $this->composerJsonFinder = $composerJsonFinder;
-         $this->directoryList = $directoryList;
-         $this->file = $file;
-         $this->requireUpdateDryRunCommand = $composerAppFactory->createRequireUpdateDryRunCommand();
-         $this->magentoComposerApplication = $composerAppFactory->create();
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-     }
- 
-     /**
-@@ -91,7 +103,7 @@ class DependencyReadinessCheck
-             $this->requireUpdateDryRunCommand->run($packages, $workingDir);
-             return ['success' => true];
-         } catch (\RuntimeException $e) {
--            $message = str_replace(PHP_EOL, '<br/>', htmlspecialchars($e->getMessage()));
-+            $message = str_replace(PHP_EOL, '<br/>', $this->escaper->escapeHtml($e->getMessage()));
-             return ['success' => false, 'error' => $message];
-         }
-     }
-diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php
-index 661d6bfc940..613572b8af0 100644
---- a/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php
-+++ b/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php
-@@ -8,8 +8,15 @@ namespace Magento\Setup\Model\FixtureGenerator;
- 
- use Magento\Catalog\Api\Data\ProductInterface;
- use Magento\Catalog\Model\Product\Attribute\Source\Status;
-+use Magento\Catalog\Model\ProductFactory;
-+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
- use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
-+use Magento\Framework\Exception\LocalizedException;
-+use Magento\Store\Model\ResourceModel\Store\CollectionFactory as StoreCollectionFactory;
- use Magento\Store\Model\ScopeInterface;
-+use Magento\Framework\App\Config\ScopeConfigInterface;
-+use Magento\Store\Model\StoreManagerInterface;
-+use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
- 
- /**
-  * Generate specified amount of products based on passed fixture
-@@ -39,22 +46,22 @@ use Magento\Store\Model\ScopeInterface;
- class ProductGenerator
- {
-     /**
--     * @var \Magento\Catalog\Model\ProductFactory
-+     * @var ProductFactory
-      */
-     private $productFactory;
- 
-     /**
--     * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
-+     * @var CategoryCollectionFactory
-      */
-     private $categoryCollectionFactory;
- 
-     /**
--     * @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory
-+     * @var UrlRewriteFactory
-      */
-     private $urlRewriteFactory;
- 
-     /**
--     * @var \Magento\Store\Model\ResourceModel\Store\CollectionFactory
-+     * @var StoreCollectionFactory
-      */
-     private $storeCollectionFactory;
- 
-@@ -74,7 +81,7 @@ class ProductGenerator
-     private $entityGeneratorFactory;
- 
-     /**
--     * @var \Magento\Store\Model\StoreManagerInterface
-+     * @var StoreManagerInterface
-      */
-     private $storeManager;
- 
-@@ -89,7 +96,7 @@ class ProductGenerator
-     private $productUrlSuffix = [];
- 
-     /**
--     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-+     * @var ScopeConfigInterface
-      */
-     private $scopeConfig;
- 
-@@ -99,25 +106,25 @@ class ProductGenerator
-     private $customTableMap;
- 
-     /**
--     * @param \Magento\Catalog\Model\ProductFactory $productFactory
--     * @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
--     * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory $urlRewriteFactory
--     * @param \Magento\Store\Model\ResourceModel\Store\CollectionFactory $storeCollectionFactory
-+     * @param ProductFactory $productFactory
-+     * @param CategoryCollectionFactory $categoryCollectionFactory
-+     * @param UrlRewriteFactory $urlRewriteFactory
-+     * @param StoreCollectionFactory $storeCollectionFactory
-      * @param EntityGeneratorFactory $entityGeneratorFactory
--     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-+     * @param StoreManagerInterface $storeManager
-      * @param ProductTemplateGeneratorFactory $productTemplateGeneratorFactory
--     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-+     * @param ScopeConfigInterface $scopeConfig
-      * @param array $customTableMap
-      */
-     public function __construct(
--        \Magento\Catalog\Model\ProductFactory $productFactory,
--        \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
--        \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory $urlRewriteFactory,
--        \Magento\Store\Model\ResourceModel\Store\CollectionFactory $storeCollectionFactory,
-+        ProductFactory $productFactory,
-+        CategoryCollectionFactory $categoryCollectionFactory,
-+        UrlRewriteFactory $urlRewriteFactory,
-+        StoreCollectionFactory $storeCollectionFactory,
-         EntityGeneratorFactory $entityGeneratorFactory,
--        \Magento\Store\Model\StoreManagerInterface $storeManager,
-+        StoreManagerInterface $storeManager,
-         ProductTemplateGeneratorFactory $productTemplateGeneratorFactory,
--        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-+        ScopeConfigInterface $scopeConfig,
-         $customTableMap = []
-     ) {
-         $this->productFactory = $productFactory;
-@@ -202,6 +209,8 @@ class ProductGenerator
-     }
- 
-     /**
-+     * Initialize fixture default values
-+     *
-      * @param array $fixture
-      * @return void
-      */
-@@ -230,6 +239,8 @@ class ProductGenerator
-     }
- 
-     /**
-+     * Get fixture value
-+     *
-      * @param string $fixtureKey
-      * @param int $productId
-      * @param int $entityNumber
-@@ -243,6 +254,8 @@ class ProductGenerator
-     }
- 
-     /**
-+     * Get bind value
-+     *
-      * @param callable|mixed $fixtureValue
-      * @param int $productId
-      * @param int $entityNumber
-@@ -251,7 +264,7 @@ class ProductGenerator
-     private function getBindValue($fixtureValue, $productId, $entityNumber)
-     {
-         return is_callable($fixtureValue)
--            ? call_user_func($fixtureValue, $productId, $entityNumber)
-+            ? $fixtureValue($productId, $entityNumber)
-             : $fixtureValue;
-     }
- 
-@@ -262,6 +275,7 @@ class ProductGenerator
-      * @param int $entityNumber
-      * @param array $fixtureMap
-      * @return array
-+     * @throws LocalizedException
-      */
-     private function urlRewriteHandler($productId, $entityNumber, $fixtureMap)
-     {
-@@ -280,7 +294,7 @@ class ProductGenerator
-             ->setEntityType('product');
-         $binds[] = $urlRewrite->toArray();
- 
--        if (isset($fixtureMap['category_ids'])) {
-+        if (isset($fixtureMap['category_ids']) && $this->isCategoryProductUrlRewriteGenerationEnabled()) {
-             $categoryId = $fixtureMap['category_ids']($productId, $entityNumber);
-             if (!isset($this->categories[$categoryId])) {
-                 $this->categories[$categoryId] = $this->categoryCollectionFactory
-@@ -333,4 +347,14 @@ class ProductGenerator
-         }
-         return $this->productUrlSuffix[$storeId];
-     }
-+
-+    /**
-+     * Check config value of generate_category_product_rewrites
-+     *
-+     * @return bool
-+     */
-+    private function isCategoryProductUrlRewriteGenerationEnabled()
-+    {
-+        return (bool)$this->scopeConfig->getValue('catalog/seo/generate_category_product_rewrites');
-+    }
- }
-diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
-index a1a62dc5946..f80a35937d5 100644
---- a/setup/src/Magento/Setup/Model/Installer.php
-+++ b/setup/src/Magento/Setup/Model/Installer.php
-@@ -28,7 +28,8 @@ use Magento\Framework\Setup\InstallDataInterface;
- use Magento\Framework\Setup\InstallSchemaInterface;
- use Magento\Framework\Setup\LoggerInterface;
- use Magento\Framework\Setup\ModuleDataSetupInterface;
--use Magento\Framework\Setup\PatchApplierInterface;
-+use Magento\Framework\Setup\Patch\PatchApplier;
-+use Magento\Framework\Setup\Patch\PatchApplierFactory;
- use Magento\Framework\Setup\SchemaPersistor;
- use Magento\Framework\Setup\SchemaSetupInterface;
- use Magento\Framework\Setup\UpgradeDataInterface;
-@@ -36,8 +37,6 @@ use Magento\Framework\Setup\UpgradeSchemaInterface;
- use Magento\Setup\Console\Command\InstallCommand;
- use Magento\Setup\Controller\ResponseTypeInterface;
- use Magento\Setup\Model\ConfigModel as SetupConfigModel;
--use Magento\Framework\Setup\Patch\PatchApplier;
--use Magento\Framework\Setup\Patch\PatchApplierFactory;
- use Magento\Setup\Module\ConnectionFactory;
- use Magento\Setup\Module\DataSetupFactory;
- use Magento\Setup\Module\SetupFactory;
-@@ -56,8 +55,8 @@ class Installer
-     /**#@+
-      * Parameters for enabling/disabling modules
-      */
--    const ENABLE_MODULES = 'enable_modules';
--    const DISABLE_MODULES = 'disable_modules';
-+    const ENABLE_MODULES = 'enable-modules';
-+    const DISABLE_MODULES = 'disable-modules';
-     /**#@- */
- 
-     /**#@+
-@@ -267,8 +266,7 @@ class Installer
-      * @param \Magento\Framework\Setup\SampleData\State $sampleDataState
-      * @param ComponentRegistrar $componentRegistrar
-      * @param PhpReadinessCheck $phpReadinessCheck
--     *
--     * @param DeclarationInstaller|null $declarationInstaller
-+     * @throws \Magento\Setup\Exception
-      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-      */
-     public function __construct(
-@@ -346,7 +344,9 @@ class Installer
-                 [$request[InstallCommand::INPUT_KEY_SALES_ORDER_INCREMENT_PREFIX]],
-             ];
-         }
--        $script[] = ['Installing admin user...', 'installAdminUser', [$request]];
-+        if ($this->isAdminDataSet($request)) {
-+            $script[] = ['Installing admin user...', 'installAdminUser', [$request]];
-+        }
- 
-         if (!$this->isDryRun($request)) {
-             $script[] = ['Caches clearing:', 'cleanCaches', [$request]];
-@@ -363,6 +363,7 @@ class Installer
-         foreach ($script as $item) {
-             list($message, $method, $params) = $item;
-             $this->log->log($message);
-+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-             call_user_func_array([$this, $method], $params);
-             $this->logProgress();
-         }
-@@ -410,7 +411,7 @@ class Installer
-     }
- 
-     /**
--     * Creates modules deployment configuration segment
-+     * Create modules deployment configuration segment
-      *
-      * @param \ArrayObject|array $request
-      * @param bool $dryRun
-@@ -423,8 +424,8 @@ class Installer
-         $deploymentConfig = $this->deploymentConfigReader->load();
-         $currentModules = isset($deploymentConfig[ConfigOptionsListConstants::KEY_MODULES])
-             ? $deploymentConfig[ConfigOptionsListConstants::KEY_MODULES] : [];
--        $enable = $this->readListOfModules($all, $request, self::ENABLE_MODULES);
--        $disable = $this->readListOfModules($all, $request, self::DISABLE_MODULES);
-+        $enable = $this->readListOfModules($all, $request, InstallCommand::INPUT_KEY_ENABLE_MODULES);
-+        $disable = $this->readListOfModules($all, $request, InstallCommand::INPUT_KEY_DISABLE_MODULES);
-         $result = [];
-         foreach ($all as $module) {
-             if ((isset($currentModules[$module]) && !$currentModules[$module])) {
-@@ -515,6 +516,7 @@ class Installer
-         ) {
-             $errorMsg = "Missing following extensions: '"
-                 . implode("' '", $phpExtensionsCheckResult['data']['missing']) . "'";
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception($errorMsg);
-         }
-     }
-@@ -899,17 +901,19 @@ class Installer
-     {
-         if ($paths) {
-             $errorMsg = "Missing write permissions to the following paths:" . PHP_EOL . implode(PHP_EOL, $paths);
-+            // phpcs:ignore Magento2.Exceptions.DirectThrow
-             throw new \Exception($errorMsg);
-         }
-     }
- 
-     /**
--     * Handles database schema and data (install/upgrade/backup/uninstall etc)
-+     * Handle database schema and data (install/upgrade/backup/uninstall etc)
-      *
--     * @param SchemaSetupInterface | ModuleDataSetupInterface $setup
-+     * @param SchemaSetupInterface|ModuleDataSetupInterface $setup
-      * @param string $type
-      * @param array $request
-      * @return void
-+     * @throws \Magento\Framework\Setup\Exception
-      * @throws \Magento\Setup\Exception
-      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-      * @SuppressWarnings(PHPMD.NPathComplexity)
-@@ -939,10 +943,12 @@ class Installer
-         if ($type === 'schema') {
-             $patchApplier = $this->patchApplierFactory->create(['schemaSetup' => $setup]);
-         } elseif ($type === 'data') {
--            $patchApplier = $this->patchApplierFactory->create([
--                'moduleDataSetup' => $setup,
--                'objectManager' => $this->objectManagerProvider->get()
--            ]);
-+            $patchApplier = $this->patchApplierFactory->create(
-+                [
-+                    'moduleDataSetup' => $setup,
-+                    'objectManager' => $this->objectManagerProvider->get()
-+                ]
-+            );
-         }
- 
-         foreach ($moduleNames as $moduleName) {
-@@ -1027,6 +1033,8 @@ class Installer
-     }
- 
-     /**
-+     * Assert DbConfigExists
-+     *
-      * @return void
-      * @throws \Magento\Setup\Exception
-      */
-@@ -1082,7 +1090,8 @@ class Installer
-     }
- 
-     /**
--     * Creates data handler
-+     * Create data handler
-+     *
-      * @param string $className
-      * @param string $interfaceName
-      * @return mixed|null
-@@ -1101,7 +1110,7 @@ class Installer
-     }
- 
-     /**
--     * Creates store order increment prefix configuration
-+     * Create store order increment prefix configuration
-      *
-      * @param string $orderIncrementPrefix Value to use for order increment prefix
-      * @return void
-@@ -1145,7 +1154,7 @@ class Installer
-     }
- 
-     /**
--     * Creates admin account
-+     * Create admin account
-      *
-      * @param \ArrayObject|array $data
-      * @return void
-@@ -1191,6 +1200,17 @@ class Installer
-         $this->createModulesConfig([]);
-     }
- 
-+    /**
-+     * Get the modules config as Magento sees it
-+     *
-+     * @return array
-+     * @throws \LogicException
-+     */
-+    public function getModulesConfig()
-+    {
-+        return $this->createModulesConfig([], true);
-+    }
-+
-     /**
-      * Uninstall Magento application
-      *
-@@ -1239,6 +1259,7 @@ class Installer
-         $cacheManager->clean($enabledTypes);
- 
-         $this->log->log('Current status:');
-+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-         $this->log->log(print_r($cacheManager->getStatus(), true));
-     }
- 
-@@ -1306,7 +1327,9 @@ class Installer
-             //If for different shards one database was specified - no need to clean it few times
-             if (!in_array($dbName, $cleanedUpDatabases)) {
-                 $this->log->log("Cleaning up database {$dbName}");
-+                // phpcs:ignore Magento2.SQL.RawQuery
-                 $connection->query("DROP DATABASE IF EXISTS {$dbName}");
-+                // phpcs:ignore Magento2.SQL.RawQuery
-                 $connection->query("CREATE DATABASE IF NOT EXISTS {$dbName}");
-                 $cleanedUpDatabases[] = $dbName;
-             }
-@@ -1348,7 +1371,32 @@ class Installer
-      */
-     private function assertDbAccessible()
-     {
--        $this->dbValidator->checkDatabaseConnection(
-+        $driverOptionKeys = [
-+            ConfigOptionsListConstants::KEY_MYSQL_SSL_KEY =>
-+                ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT_DRIVER_OPTIONS . '/' .
-+                ConfigOptionsListConstants::KEY_MYSQL_SSL_KEY,
-+
-+            ConfigOptionsListConstants::KEY_MYSQL_SSL_CERT =>
-+                ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT_DRIVER_OPTIONS . '/' .
-+                ConfigOptionsListConstants::KEY_MYSQL_SSL_CERT,
-+
-+            ConfigOptionsListConstants::KEY_MYSQL_SSL_CA =>
-+                ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT_DRIVER_OPTIONS . '/' .
-+                ConfigOptionsListConstants::KEY_MYSQL_SSL_CA,
-+
-+            ConfigOptionsListConstants::KEY_MYSQL_SSL_VERIFY =>
-+                ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT_DRIVER_OPTIONS . '/' .
-+                ConfigOptionsListConstants::KEY_MYSQL_SSL_VERIFY
-+        ];
-+        $driverOptions = [];
-+        foreach ($driverOptionKeys as $driverOptionKey => $driverOptionConfig) {
-+            $config = $this->deploymentConfig->get($driverOptionConfig);
-+            if ($config !== null) {
-+                $driverOptions[$driverOptionKey] = $config;
-+            }
-+        }
-+
-+        $this->dbValidator->checkDatabaseConnectionWithDriverOptions(
-             $this->deploymentConfig->get(
-                 ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT .
-                 '/' . ConfigOptionsListConstants::KEY_NAME
-@@ -1364,7 +1412,8 @@ class Installer
-             $this->deploymentConfig->get(
-                 ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT .
-                 '/' . ConfigOptionsListConstants::KEY_PASSWORD
--            )
-+            ),
-+            $driverOptions
-         );
-         $prefix = $this->deploymentConfig->get(
-             ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT .
-@@ -1471,4 +1520,32 @@ class Installer
-             $this->log->log($message);
-         }
-     }
-+
-+    /**
-+     * Checks that admin data is not empty in request array
-+     *
-+     * @param \ArrayObject|array $request
-+     * @return bool
-+     */
-+    private function isAdminDataSet($request)
-+    {
-+        $adminData = array_filter(
-+            $request,
-+            function ($value, $key) {
-+                return in_array(
-+                    $key,
-+                    [
-+                        AdminAccount::KEY_EMAIL,
-+                        AdminAccount::KEY_FIRST_NAME,
-+                        AdminAccount::KEY_LAST_NAME,
-+                        AdminAccount::KEY_USER,
-+                        AdminAccount::KEY_PASSWORD,
-+                    ]
-+                ) && $value !== null;
-+            },
-+            ARRAY_FILTER_USE_BOTH
-+        );
-+
-+        return !empty($adminData);
-+    }
- }
-diff --git a/setup/src/Magento/Setup/Model/PhpReadinessCheck.php b/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
-index 2c4967c4c2f..86a377c8edc 100644
---- a/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
-+++ b/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
-@@ -179,6 +179,7 @@ class PhpReadinessCheck
- 
-     /**
-      * Checks php memory limit
-+     *
-      * @return array
-      */
-     public function checkMemoryLimit()
-@@ -192,7 +193,7 @@ class PhpReadinessCheck
- 
-         $currentMemoryLimit = ini_get('memory_limit');
- 
--        $currentMemoryInteger = intval($currentMemoryLimit);
-+        $currentMemoryInteger = (int)$currentMemoryLimit;
- 
-         if ($currentMemoryInteger > 0
-             && $this->dataSize->convertSizeToBytes($currentMemoryLimit)
-@@ -235,6 +236,7 @@ class PhpReadinessCheck
- 
-     /**
-      * Checks if xdebug.max_nesting_level is set 200 or more
-+     *
-      * @return array
-      */
-     private function checkXDebugNestedLevel()
-@@ -244,7 +246,7 @@ class PhpReadinessCheck
- 
-         $currentExtensions = $this->phpInformation->getCurrent();
-         if (in_array('xdebug', $currentExtensions)) {
--            $currentXDebugNestingLevel = intval(ini_get('xdebug.max_nesting_level'));
-+            $currentXDebugNestingLevel = (int)ini_get('xdebug.max_nesting_level');
-             $minimumRequiredXDebugNestedLevel = $this->phpInformation->getRequiredMinimumXDebugNestedLevel();
- 
-             if ($minimumRequiredXDebugNestedLevel > $currentXDebugNestingLevel) {
-@@ -286,7 +288,7 @@ class PhpReadinessCheck
- 
-         $data = [];
-         $error = false;
--        $iniSetting = intval(ini_get('always_populate_raw_post_data'));
-+        $iniSetting = (int)ini_get('always_populate_raw_post_data');
- 
-         $checkVersionConstraint = $this->versionParser->parseConstraints('~5.6.0');
-         $normalizedPhpVersion = $this->getNormalizedCurrentPhpVersion(PHP_VERSION);
-@@ -302,7 +304,7 @@ class PhpReadinessCheck
- 	        Please open your php.ini file and set always_populate_raw_post_data to -1.
-  	        If you need more help please call your hosting provider.',
-             PHP_VERSION,
--            intval(ini_get('always_populate_raw_post_data'))
-+            (int)ini_get('always_populate_raw_post_data')
-         );
- 
-         $data['always_populate_raw_post_data'] = [
-diff --git a/setup/src/Magento/Setup/Model/RequestDataConverter.php b/setup/src/Magento/Setup/Model/RequestDataConverter.php
-index 0ed5dc669c9..4964dbe596d 100644
---- a/setup/src/Magento/Setup/Model/RequestDataConverter.php
-+++ b/setup/src/Magento/Setup/Model/RequestDataConverter.php
-@@ -51,6 +51,14 @@ class RequestDataConverter
-             isset($source['db']['tablePrefix']) ? $source['db']['tablePrefix'] : '';
-         $result[BackendConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME] = isset($source['config']['address']['admin'])
-             ? $source['config']['address']['admin'] : '';
-+        $result[SetupConfigOptionsList::INPUT_KEY_DB_SSL_KEY] = isset($source['db']['driverOptionsSslKey'])
-+            ? $source['db']['driverOptionsSslKey'] : '';
-+        $result[SetupConfigOptionsList::INPUT_KEY_DB_SSL_CERT] = isset($source['db']['driverOptionsSslCert'])
-+            ? $source['db']['driverOptionsSslCert'] : '';
-+        $result[SetupConfigOptionsList::INPUT_KEY_DB_SSL_CA] = isset($source['db']['driverOptionsSslCa'])
-+            ? $source['db']['driverOptionsSslCa'] : '';
-+        $result[SetupConfigOptionsList::INPUT_KEY_DB_SSL_VERIFY] = isset($source['db']['driverOptionsSslVerify'])
-+            ? $source['db']['driverOptionsSslVerify'] : '';
-         $result[SetupConfigOptionsList::INPUT_KEY_ENCRYPTION_KEY] = isset($source['config']['encrypt']['key'])
-             ? $source['config']['encrypt']['key'] : null;
-         $result[SetupConfigOptionsList::INPUT_KEY_SESSION_SAVE] = isset($source['config']['sessionSave']['type'])
-diff --git a/setup/src/Magento/Setup/Model/SystemPackage.php b/setup/src/Magento/Setup/Model/SystemPackage.php
-index 232ac1dd342..bc5f55c0b12 100755
---- a/setup/src/Magento/Setup/Model/SystemPackage.php
-+++ b/setup/src/Magento/Setup/Model/SystemPackage.php
-@@ -154,6 +154,8 @@ class SystemPackage
-     }
- 
-     /**
-+     * Get installed system packages.
-+     *
-      * @return array
-      * @throws \Exception
-      * @throws \RuntimeException
-@@ -179,7 +181,7 @@ class SystemPackage
-             throw new \RuntimeException(
-                 'We\'re sorry, no components are available because you cloned the Magento 2 GitHub repository. ' .
-                 'You must manually update components as discussed in the ' .
--                '<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/cli/dev_options.html">' .
-+                '<a href="https://devdocs.magento.com/guides/v2.0/install-gde/install/cli/dev_options.html">' .
-                 'Installation Guide</a>.'
-             );
-         }
-@@ -187,6 +189,8 @@ class SystemPackage
-     }
- 
-     /**
-+     * Sort versions.
-+     *
-      * @param array $enterpriseVersions
-      * @return array
-      */
-@@ -241,6 +245,8 @@ class SystemPackage
-     }
- 
-     /**
-+     * Filter enterprise versions.
-+     *
-      * @param string $currentCE
-      * @param array $enterpriseVersions
-      * @param string $maxVersion
-diff --git a/setup/src/Magento/Setup/Model/UninstallDependencyCheck.php b/setup/src/Magento/Setup/Model/UninstallDependencyCheck.php
-index 757ee99f7f1..3a2b6fda440 100644
---- a/setup/src/Magento/Setup/Model/UninstallDependencyCheck.php
-+++ b/setup/src/Magento/Setup/Model/UninstallDependencyCheck.php
-@@ -8,13 +8,21 @@ namespace Magento\Setup\Model;
- 
- use Magento\Framework\Composer\ComposerInformation;
- use Magento\Framework\Composer\DependencyChecker;
-+use Magento\Framework\Exception\RuntimeException;
- use Magento\Theme\Model\Theme\ThemeDependencyChecker;
-+use Magento\Framework\Escaper;
-+use Magento\Framework\App\ObjectManager;
- 
- /**
-  * Class checks components dependencies for uninstall flow
-  */
- class UninstallDependencyCheck
- {
-+    /**
-+     * @var Escaper
-+     */
-+    private $escaper;
-+
-     /**
-      * @var ComposerInformation
-      */
-@@ -38,15 +46,20 @@ class UninstallDependencyCheck
-      * @param ComposerInformation $composerInfo
-      * @param DependencyChecker $dependencyChecker
-      * @param ThemeDependencyCheckerFactory $themeDependencyCheckerFactory
-+     * @param Escaper|null $escaper
-      */
-     public function __construct(
-         ComposerInformation $composerInfo,
-         DependencyChecker $dependencyChecker,
--        ThemeDependencyCheckerFactory $themeDependencyCheckerFactory
-+        ThemeDependencyCheckerFactory $themeDependencyCheckerFactory,
-+        Escaper $escaper = null
-     ) {
-         $this->composerInfo = $composerInfo;
-         $this->packageDependencyChecker = $dependencyChecker;
-         $this->themeDependencyChecker = $themeDependencyCheckerFactory->create();
-+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
-+            Escaper::class
-+        );
-     }
- 
-     /**
-@@ -54,51 +67,62 @@ class UninstallDependencyCheck
-      *
-      * @param array $packages
-      * @return array
--     * @throws \RuntimeException
-      */
-     public function runUninstallReadinessCheck(array $packages)
-     {
-         try {
--            $packagesAndTypes = $this->composerInfo->getRootRequiredPackageTypesByName();
--            $dependencies = $this->packageDependencyChecker->checkDependencies($packages, true);
--            $messages = [];
--            $themes = [];
--
--            foreach ($packages as $package) {
--                if (!isset($packagesAndTypes[$package])) {
--                    throw new \RuntimeException('Package ' . $package . ' not found in the system.');
--                }
-+            return $this->checkForMissingDependencies($packages);
-+        } catch (\RuntimeException $e) {
-+            $message = str_replace(PHP_EOL, '<br/>', $this->escaper->escapeHtml($e->getMessage()));
-+            return ['success' => false, 'error' => $message];
-+        }
-+    }
- 
--                switch ($packagesAndTypes[$package]) {
--                    case ComposerInformation::METAPACKAGE_PACKAGE_TYPE:
--                        unset($dependencies[$package]);
--                        break;
--                    case ComposerInformation::THEME_PACKAGE_TYPE:
--                        $themes[] = $package;
--                        break;
--                }
-+    /**
-+     * Check for missing dependencies
-+     *
-+     * @param array $packages
-+     * @return array
-+     * @throws \RuntimeException
-+     */
-+    private function checkForMissingDependencies(array $packages)
-+    {
-+        $packagesAndTypes = $this->composerInfo->getRootRequiredPackageTypesByName();
-+        $dependencies = $this->packageDependencyChecker->checkDependencies($packages, true);
-+        $messages = [];
-+        $themes = [];
- 
--                if (!empty($dependencies[$package])) {
--                    $messages[] = $package . " has the following dependent package(s): "
--                        . implode(', ', $dependencies[$package]);
--                }
-+        foreach ($packages as $package) {
-+            if (!isset($packagesAndTypes[$package])) {
-+                throw new \RuntimeException('Package ' . $package . ' not found in the system.');
-             }
- 
--            if (!empty($themes)) {
--                $messages = array_merge(
--                    $messages,
--                    $this->themeDependencyChecker->checkChildThemeByPackagesName($themes)
--                );
-+            switch ($packagesAndTypes[$package]) {
-+                case ComposerInformation::METAPACKAGE_PACKAGE_TYPE:
-+                    unset($dependencies[$package]);
-+                    break;
-+                case ComposerInformation::THEME_PACKAGE_TYPE:
-+                    $themes[] = $package;
-+                    break;
-             }
- 
--            if (!empty($messages)) {
--                throw new \RuntimeException(implode(PHP_EOL, $messages));
-+            if (!empty($dependencies[$package])) {
-+                $messages[] = $package . " has the following dependent package(s): "
-+                    . implode(', ', $dependencies[$package]);
-             }
-+        }
- 
--            return ['success' => true];
--        } catch (\RuntimeException $e) {
--            $message = str_replace(PHP_EOL, '<br/>', htmlspecialchars($e->getMessage()));
--            return ['success' => false, 'error' => $message];
-+        if (!empty($themes)) {
-+            $messages = array_merge(
-+                $messages,
-+                $this->themeDependencyChecker->checkChildThemeByPackagesName($themes)
-+            );
-         }
-+
-+        if (!empty($messages)) {
-+            throw new \RuntimeException(implode(PHP_EOL, $messages));
-+        }
-+
-+        return ['success' => true];
-     }
- }
-diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Area.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Area.php
-index ec5fb3f94e4..edc2a485278 100644
---- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Area.php
-+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Area.php
-@@ -10,6 +10,9 @@ use Magento\Framework\App;
- use Magento\Setup\Module\Di\Compiler\Config;
- use Magento\Setup\Module\Di\Definition\Collection as DefinitionsCollection;
- 
-+/**
-+ * Area configuration aggregation
-+ */
- class Area implements OperationInterface
- {
-     /**
-@@ -28,7 +31,7 @@ class Area implements OperationInterface
-     private $configReader;
- 
-     /**
--     * @var Config\WriterInterface
-+     * @var \Magento\Framework\App\ObjectManager\ConfigWriterInterface
-      */
-     private $configWriter;
- 
-@@ -46,7 +49,7 @@ class Area implements OperationInterface
-      * @param App\AreaList $areaList
-      * @param \Magento\Setup\Module\Di\Code\Reader\Decorator\Area $areaInstancesNamesList
-      * @param Config\Reader $configReader
--     * @param Config\WriterInterface $configWriter
-+     * @param \Magento\Framework\App\ObjectManager\ConfigWriterInterface $configWriter
-      * @param \Magento\Setup\Module\Di\Compiler\Config\ModificationChain $modificationChain
-      * @param array $data
-      */
-@@ -54,7 +57,7 @@ class Area implements OperationInterface
-         App\AreaList $areaList,
-         \Magento\Setup\Module\Di\Code\Reader\Decorator\Area $areaInstancesNamesList,
-         Config\Reader $configReader,
--        Config\WriterInterface $configWriter,
-+        \Magento\Framework\App\ObjectManager\ConfigWriterInterface $configWriter,
-         Config\ModificationChain $modificationChain,
-         $data = []
-     ) {
-@@ -67,7 +70,7 @@ class Area implements OperationInterface
-     }
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     public function doOperation()
-     {
-diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php
-index b4601a970de..953dc04f4cd 100644
---- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php
-+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php
-@@ -10,6 +10,12 @@ namespace Magento\Setup\Module\Di\Compiler\Config\Writer;
- use Magento\Framework\App\Filesystem\DirectoryList;
- use Magento\Setup\Module\Di\Compiler\Config\WriterInterface;
- 
-+/**
-+ * Class for writing DI Compiler Configuration
-+ *
-+ * @deprecated Moved to Framework to allow broader reuse
-+ * @see \Magento\Framework\App\ObjectManager\ConfigWriter\Filesystem
-+ */
- class Filesystem implements WriterInterface
- {
-     /**
-diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/WriterInterface.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/WriterInterface.php
-index 9e6a3008283..1ff5524529c 100644
---- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/WriterInterface.php
-+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/WriterInterface.php
-@@ -9,7 +9,8 @@ namespace Magento\Setup\Module\Di\Compiler\Config;
- 
- /**
-  * Interface \Magento\Setup\Module\Di\Compiler\Config\WriterInterface
-- *
-+ * @deprecated Moved to Framework to allow broader reuse
-+ * @see \Magento\Framework\App\ObjectManager\ConfigWriterInterface
-  */
- interface WriterInterface
- {
-diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
-index a4e3063abec..cf38fd70884 100644
---- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
-+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
-@@ -20,7 +20,7 @@ class Html extends AbstractAdapter
-     const HTML_FILTER = "/i18n:\s?'(?<value>[^'\\\\]*(?:\\\\.[^'\\\\]*)*)'/i";
- 
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _parse()
-     {
-@@ -31,7 +31,7 @@ class Html extends AbstractAdapter
- 
-         $results = [];
-         preg_match_all(Filter::CONSTRUCTION_PATTERN, $data, $results, PREG_SET_ORDER);
--        for ($i = 0; $i < count($results); $i++) {
-+        for ($i = 0, $count = count($results); $i < $count; $i++) {
-             if ($results[$i][1] === Filter::TRANS_DIRECTIVE_NAME) {
-                 $directive = [];
-                 if (preg_match(Filter::TRANS_DIRECTIVE_REGEX, $results[$i][2], $directive) !== 1) {
-@@ -43,7 +43,7 @@ class Html extends AbstractAdapter
-         }
- 
-         preg_match_all(self::HTML_FILTER, $data, $results, PREG_SET_ORDER);
--        for ($i = 0; $i < count($results); $i++) {
-+        for ($i = 0, $count = count($results); $i < $count; $i++) {
-             if (!empty($results[$i]['value'])) {
-                 $this->_addPhrase($results[$i]['value']);
-             }
-diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php
-index 4095b12c9a6..4678af60d63 100644
---- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php
-+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php
-@@ -11,7 +11,7 @@ namespace Magento\Setup\Module\I18n\Parser\Adapter;
- class Js extends AbstractAdapter
- {
-     /**
--     * {@inheritdoc}
-+     * @inheritdoc
-      */
-     protected function _parse()
-     {
-@@ -22,7 +22,7 @@ class Js extends AbstractAdapter
-             $fileRow = fgets($fileHandle, 4096);
-             $results = [];
-             preg_match_all('/mage\.__\(\s*([\'"])(.*?[^\\\])\1.*?[),]/', $fileRow, $results, PREG_SET_ORDER);
--            for ($i = 0; $i < count($results); $i++) {
-+            for ($i = 0, $count = count($results); $i < $count; $i++) {
-                 if (isset($results[$i][2])) {
-                     $quote = $results[$i][1];
-                     $this->_addPhrase($quote . $results[$i][2] . $quote, $lineNumber);
-@@ -30,7 +30,7 @@ class Js extends AbstractAdapter
-             }
- 
-             preg_match_all('/\\$t\(\s*([\'"])(.*?[^\\\])\1.*?[),]/', $fileRow, $results, PREG_SET_ORDER);
--            for ($i = 0; $i < count($results); $i++) {
-+            for ($i = 0, $count = count($results); $i < $count; $i++) {
-                 if (isset($results[$i][2])) {
-                     $quote = $results[$i][1];
-                     $this->_addPhrase($quote . $results[$i][2] . $quote, $lineNumber);
-diff --git a/setup/src/Magento/Setup/Module/Setup/SetupCache.php b/setup/src/Magento/Setup/Module/Setup/SetupCache.php
-index 8de00c6cb6f..645290994b3 100644
---- a/setup/src/Magento/Setup/Module/Setup/SetupCache.php
-+++ b/setup/src/Magento/Setup/Module/Setup/SetupCache.php
-@@ -41,13 +41,9 @@ class SetupCache implements DataCacheInterface
-     public function get($table, $parentId, $rowId, $field = null)
-     {
-         if (null === $field) {
--            return isset($this->data[$table][$parentId][$rowId]) ?
--                $this->data[$table][$parentId][$rowId] :
--                false;
-+            return $this->data[$table][$parentId][$rowId] ?? false;
-         } else {
--            return isset($this->data[$table][$parentId][$rowId][$field]) ?
--                $this->data[$table][$parentId][$rowId][$field] :
--                false;
-+            return $this->data[$table][$parentId][$rowId][$field] ?? false;
-         }
-     }
- 
-diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php
-index a80302b40a6..b90fa66b3d4 100644
---- a/setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php
-+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php
-@@ -11,8 +11,12 @@ use Magento\Setup\Mvc\Bootstrap\InitParamListener;
- use Magento\User\Model\UserValidationRules;
- use Symfony\Component\Console\Application;
- use Symfony\Component\Console\Helper\QuestionHelper;
-+use Symfony\Component\Console\Input\InputOption;
- use Symfony\Component\Console\Tester\CommandTester;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class AdminUserCreateCommandTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -125,11 +129,34 @@ class AdminUserCreateCommandTest extends \PHPUnit\Framework\TestCase
-         );
-     }
- 
--    public function testGetOptionsList()
-+    /**
-+     * @param int $mode
-+     * @param string $description
-+     * @dataProvider getOptionListDataProvider
-+     */
-+    public function testGetOptionsList($mode, $description)
-     {
-         /* @var $argsList \Symfony\Component\Console\Input\InputArgument[] */
--        $argsList = $this->command->getOptionsList();
-+        $argsList = $this->command->getOptionsList($mode);
-         $this->assertEquals(AdminAccount::KEY_EMAIL, $argsList[2]->getName());
-+        $this->assertEquals($description, $argsList[2]->getDescription());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function getOptionListDataProvider()
-+    {
-+        return [
-+            [
-+                'mode' => InputOption::VALUE_REQUIRED,
-+                'description' => '(Required) Admin email',
-+            ],
-+            [
-+                'mode' => InputOption::VALUE_OPTIONAL,
-+                'description' => 'Admin email',
-+            ],
-+        ];
-     }
- 
-     /**
-diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/DbSchemaUpgradeCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DbSchemaUpgradeCommandTest.php
-index f36675e26fa..61c004c2e0b 100644
---- a/setup/src/Magento/Setup/Test/Unit/Console/Command/DbSchemaUpgradeCommandTest.php
-+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/DbSchemaUpgradeCommandTest.php
-@@ -3,10 +3,10 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+declare(strict_types=1);
- 
- namespace Magento\Setup\Test\Unit\Console\Command;
- 
--use Magento\Framework\Module\ModuleList;
- use Magento\Setup\Console\Command\DbSchemaUpgradeCommand;
- use Symfony\Component\Console\Tester\CommandTester;
- 
-@@ -58,10 +58,10 @@ class DbSchemaUpgradeCommandTest extends \PHPUnit\Framework\TestCase
-             [
-                 'options' => [
-                     '--magento-init-params' => '',
--                    '--convert_old_scripts' => false
-+                    '--convert-old-scripts' => false
-                 ],
-                 'expectedOptions' => [
--                    'convert_old_scripts' => false,
-+                    'convert-old-scripts' => false,
-                     'magento-init-params' => '',
-                 ]
-             ],
-diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php
-index 5b7b6c16269..3c3a875a278 100644
---- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php
-+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php
-@@ -16,6 +16,7 @@ use Magento\Setup\Model\AdminAccount;
- use Magento\Backend\Setup\ConfigOptionsList as BackendConfigOptionsList;
- use Magento\Framework\Config\ConfigOptionsListConstants as SetupConfigOptionsList;
- use Magento\Setup\Model\StoreConfigurationDataMapper;
-+use Magento\Setup\Console\Command\AdminUserCreateCommand;
- 
- /**
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -62,6 +63,11 @@ class InstallCommandTest extends \PHPUnit\Framework\TestCase
-      */
-     private $configImportMock;
- 
-+    /**
-+     * @var AdminUserCreateCommand|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $adminUserMock;
-+
-     public function setUp()
-     {
-         $this->input = [
-@@ -73,11 +79,6 @@ class InstallCommandTest extends \PHPUnit\Framework\TestCase
-             '--' . StoreConfigurationDataMapper::KEY_LANGUAGE => 'en_US',
-             '--' . StoreConfigurationDataMapper::KEY_TIMEZONE => 'America/Chicago',
-             '--' . StoreConfigurationDataMapper::KEY_CURRENCY => 'USD',
--            '--' . AdminAccount::KEY_USER => 'user',
--            '--' . AdminAccount::KEY_PASSWORD => '123123q',
--            '--' . AdminAccount::KEY_EMAIL => 'test@test.com',
--            '--' . AdminAccount::KEY_FIRST_NAME => 'John',
--            '--' . AdminAccount::KEY_LAST_NAME => 'Doe',
-         ];
- 
-         $configModel = $this->createMock(\Magento\Setup\Model\ConfigModel::class);
-@@ -100,15 +101,11 @@ class InstallCommandTest extends \PHPUnit\Framework\TestCase
-             ->method('validate')
-             ->will($this->returnValue([]));
- 
--        $adminUser = $this->createMock(\Magento\Setup\Console\Command\AdminUserCreateCommand::class);
--        $adminUser
-+        $this->adminUserMock = $this->createMock(AdminUserCreateCommand::class);
-+        $this->adminUserMock
-             ->expects($this->once())
-             ->method('getOptionsList')
-             ->will($this->returnValue($this->getOptionsListAdminUser()));
--        $adminUser
--            ->expects($this->once())
--            ->method('validate')
--            ->will($this->returnValue([]));
- 
-         $this->installerFactory = $this->createMock(\Magento\Setup\Model\InstallerFactory::class);
-         $this->installer = $this->createMock(\Magento\Setup\Model\Installer::class);
-@@ -143,7 +140,7 @@ class InstallCommandTest extends \PHPUnit\Framework\TestCase
-             $this->installerFactory,
-             $configModel,
-             $userConfig,
--            $adminUser
-+            $this->adminUserMock
-         );
-         $this->command->setApplication(
-             $this->applicationMock
-@@ -152,6 +149,16 @@ class InstallCommandTest extends \PHPUnit\Framework\TestCase
- 
-     public function testExecute()
-     {
-+        $this->input['--' . AdminAccount::KEY_USER] = 'user';
-+        $this->input['--' . AdminAccount::KEY_PASSWORD] = '123123q';
-+        $this->input['--' . AdminAccount::KEY_EMAIL] = 'test@test.com';
-+        $this->input['--' . AdminAccount::KEY_FIRST_NAME] = 'John';
-+        $this->input['--' . AdminAccount::KEY_LAST_NAME] = 'Doe';
-+
-+        $this->adminUserMock
-+            ->expects($this->once())
-+            ->method('validate')
-+            ->willReturn([]);
-         $this->installerFactory->expects($this->once())
-             ->method('create')
-             ->will($this->returnValue($this->installer));
-@@ -269,6 +276,9 @@ class InstallCommandTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testValidate($prefixValue)
-     {
-+        $this->adminUserMock
-+            ->expects($this->never())
-+            ->method('validate');
-         $this->installerFactory->expects($this->once())
-             ->method('create')
-             ->will($this->returnValue($this->installer));
-@@ -288,6 +298,9 @@ class InstallCommandTest extends \PHPUnit\Framework\TestCase
-      */
-     public function testValidateWithException($prefixValue)
-     {
-+        $this->adminUserMock
-+            ->expects($this->never())
-+            ->method('validate');
-         $this->installerFactory->expects($this->never())
-             ->method('create')
-             ->will($this->returnValue($this->installer));
-diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleConfigStatusCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleConfigStatusCommandTest.php
-new file mode 100644
-index 00000000000..16577ed2db7
---- /dev/null
-+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleConfigStatusCommandTest.php
-@@ -0,0 +1,91 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+declare(strict_types=1);
-+
-+namespace Magento\Setup\Test\Unit\Console\Command;
-+
-+use Magento\Framework\Config\ConfigOptionsListConstants;
-+use Magento\Setup\Console\Command\ModuleConfigStatusCommand;
-+use PHPUnit\Framework\TestCase;
-+use Symfony\Component\Console\Tester\CommandTester;
-+
-+/**
-+ * Tests for module config status command.
-+ */
-+class ModuleConfigStatusCommandTest extends TestCase
-+{
-+    /**
-+     * @param array $currentConfig
-+     * @param array $correctConfig
-+     * @param string $expectedOutput
-+     * @dataProvider executeDataProvider
-+     */
-+    public function testExecute(array $currentConfig, array $correctConfig, string $expectedOutput)
-+    {
-+        $configReader = $this->createMock(\Magento\Framework\App\DeploymentConfig\Reader::class);
-+        $configReader->expects($this->once())
-+                     ->method('load')
-+                     ->willReturn([ConfigOptionsListConstants::KEY_MODULES => $currentConfig]);
-+
-+        $installer = $this->createMock(\Magento\Setup\Model\Installer::class);
-+        $installer->expects($this->once())
-+                  ->method('getModulesConfig')
-+                  ->willReturn($correctConfig);
-+
-+        $installerFactory = $this->createMock(\Magento\Setup\Model\InstallerFactory::class);
-+        $installerFactory->expects($this->once())
-+                         ->method('create')
-+                         ->willReturn($installer);
-+
-+        $command = new ModuleConfigStatusCommand($configReader, $installerFactory);
-+
-+        $tester = new CommandTester($command);
-+        $tester->execute([]);
-+
-+        $this->assertEquals($expectedOutput, $tester->getDisplay());
-+    }
-+
-+    public function executeDataProvider()
-+    {
-+        $successMessage = 'The modules configuration is up to date.' . PHP_EOL;
-+        $failureMessage = 'The modules configuration in the \'app/etc/config.php\' '
-+            . 'file is outdated. Run \'setup:upgrade\' to fix it.' . PHP_EOL;
-+
-+        return [
-+            [
-+                ['Magento_ModuleA' => 1, 'Magento_ModuleB' => 1],
-+                ['Magento_ModuleA' => 1, 'Magento_ModuleB' => 1],
-+                $successMessage,
-+            ],
-+            [
-+                ['Magento_ModuleA' => 0, 'Magento_ModuleB' => 1],
-+                ['Magento_ModuleA' => 0, 'Magento_ModuleB' => 1],
-+                $successMessage,
-+            ],
-+            [
-+                ['Magento_ModuleA' => 1, 'Magento_ModuleB' => 1],
-+                ['Magento_ModuleB' => 1, 'Magento_ModuleA' => 1],
-+                $failureMessage,
-+            ],
-+            [
-+                ['Magento_ModuleA' => 0, 'Magento_ModuleB' => 1],
-+                ['Magento_ModuleB' => 1, 'Magento_ModuleA' => 0],
-+                $failureMessage,
-+            ],
-+            [
-+                ['Magento_ModuleA' => 1],
-+                ['Magento_ModuleB' => 1, 'Magento_ModuleA' => 1],
-+                $failureMessage,
-+            ],
-+            [
-+                ['Magento_ModuleA' => 1, 'Magento_ModuleB' => 1],
-+                ['Magento_ModuleB' => 1],
-+                $failureMessage,
-+            ],
-+        ];
-+    }
-+}
-diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php
-index 6f32a686826..3d46736e449 100644
---- a/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php
-+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php
-@@ -104,61 +104,61 @@ class UpgradeCommandTest extends \PHPUnit\Framework\TestCase
-             [
-                 'options' => [
-                     '--magento-init-params' => '',
--                    '--convert_old_scripts' => false,
-+                    '--convert-old-scripts' => false,
-                 ],
-                 'deployMode' => \Magento\Framework\App\State::MODE_PRODUCTION,
-                 'expectedString' => 'Please re-run Magento compile command. Use the command "setup:di:compile"'
-                     . PHP_EOL,
-                 'expectedOptions' => [
-                     'keep-generated' => false,
--                    'convert_old_scripts' => false,
--                    'magento-init-params' => '',
-+                    'convert-old-scripts' => false,
-                     'safe-mode' => false,
-                     'data-restore' => false,
-                     'dry-run' => false,
-+                    'magento-init-params' => '',
-                 ]
-             ],
-             [
-                 'options' => [
-                     '--magento-init-params' => '',
--                    '--convert_old_scripts' => false,
-+                    '--convert-old-scripts' => false,
-                     '--keep-generated' => true,
-                 ],
-                 'deployMode' => \Magento\Framework\App\State::MODE_PRODUCTION,
-                 'expectedString' => '',
-                 'expectedOptions' => [
-                     'keep-generated' => true,
--                    'convert_old_scripts' => false,
--                    'magento-init-params' => '',
-+                    'convert-old-scripts' => false,
-                     'safe-mode' => false,
-                     'data-restore' => false,
-                     'dry-run' => false,
-+                    'magento-init-params' => '',
-                 ]
-             ],
-             [
--                'options' => ['--magento-init-params' => '', '--convert_old_scripts' => false],
-+                'options' => ['--magento-init-params' => '', '--convert-old-scripts' => false],
-                 'deployMode' => \Magento\Framework\App\State::MODE_DEVELOPER,
-                 'expectedString' => '',
-                 'expectedOptions' => [
-                     'keep-generated' => false,
--                    'convert_old_scripts' => false,
--                    'magento-init-params' => '',
-+                    'convert-old-scripts' => false,
-                     'safe-mode' => false,
-                     'data-restore' => false,
-                     'dry-run' => false,
-+                    'magento-init-params' => '',
-                 ]
-             ],
-             [
--                'options' => ['--magento-init-params' => '', '--convert_old_scripts' => false],
-+                'options' => ['--magento-init-params' => '', '--convert-old-scripts' => false],
-                 'deployMode' => \Magento\Framework\App\State::MODE_DEFAULT,
-                 'expectedString' => '',
-                 'expectedOptions' => [
-                     'keep-generated' => false,
--                    'convert_old_scripts' => false,
--                    'magento-init-params' => '',
-+                    'convert-old-scripts' => false,
-                     'safe-mode' => false,
-                     'data-restore' => false,
-                     'dry-run' => false,
-+                    'magento-init-params' => '',
-                 ]
-             ],
-         ];
-diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php
-index f8e5e7cdc4d..216013ebfc8 100644
---- a/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php
-+++ b/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php
-@@ -48,6 +48,12 @@ class SessionTest extends \PHPUnit\Framework\TestCase
-             $this->createPartialMock(\Magento\Framework\App\DeploymentConfig::class, ['isAvailable']);
-         $deployConfigMock->expects($this->once())->method('isAvailable')->will($this->returnValue(true));
- 
-+        $sessionMock = $this->createPartialMock(
-+            \Magento\Backend\Model\Auth\Session::class,
-+            ['prolong', 'isSessionExists']
-+        );
-+        $sessionMock->expects($this->once())->method('isSessionExists')->will($this->returnValue(false));
-+
-         $stateMock = $this->createPartialMock(\Magento\Framework\App\State::class, ['setAreaCode']);
-         $stateMock->expects($this->once())->method('setAreaCode');
- 
-@@ -57,6 +63,7 @@ class SessionTest extends \PHPUnit\Framework\TestCase
-         $urlMock = $this->createMock(\Magento\Backend\Model\Url::class);
- 
-         $returnValueMap = [
-+            [\Magento\Backend\Model\Auth\Session::class, $sessionMock],
-             [\Magento\Framework\App\State::class, $stateMock],
-             [\Magento\Backend\Model\Session\AdminConfig::class, $sessionConfigMock],
-             [\Magento\Backend\Model\Url::class, $urlMock]
-@@ -68,7 +75,6 @@ class SessionTest extends \PHPUnit\Framework\TestCase
-             ->method('get')
-             ->will($this->returnValueMap($returnValueMap));
- 
--        $sessionMock = $this->createPartialMock(\Magento\Backend\Model\Auth\Session::class, ['prolong']);
-         $this->objectManager->expects($this->once())
-             ->method('create')
-             ->will($this->returnValue($sessionMock));
-@@ -87,4 +93,29 @@ class SessionTest extends \PHPUnit\Framework\TestCase
-         $viewModel = $controller->unloginAction();
-         $this->assertInstanceOf(\Zend\View\Model\ViewModel::class, $viewModel);
-     }
-+
-+    /**
-+     * @covers \Magento\Setup\Controller\SystemConfig::prolongAction
-+     */
-+    public function testProlongActionWithExistingSession()
-+    {
-+        $this->objectManagerProvider->expects($this->once())->method('get')->will(
-+            $this->returnValue($this->objectManager)
-+        );
-+        $deployConfigMock =
-+            $this->createPartialMock(\Magento\Framework\App\DeploymentConfig::class, ['isAvailable']);
-+        $deployConfigMock->expects($this->once())->method('isAvailable')->will($this->returnValue(true));
-+        $sessionMock = $this->createPartialMock(
-+            \Magento\Backend\Model\Auth\Session::class,
-+            ['prolong', 'isSessionExists']
-+        );
-+        $sessionMock->expects($this->once())->method('isSessionExists')->will($this->returnValue(true));
-+
-+        $this->serviceManager->expects($this->once())->method('get')->will($this->returnValue($deployConfigMock));
-+        $this->objectManager->expects($this->once())
-+            ->method('get')
-+            ->will($this->returnValue($sessionMock));
-+        $controller = new Session($this->serviceManager, $this->objectManagerProvider);
-+        $this->assertEquals(new \Zend\View\Model\JsonModel(['success' => true]), $controller->prolongAction());
-+    }
- }
-diff --git a/setup/src/Magento/Setup/Test/Unit/Fixtures/CouponCodesFixtureTest.php b/setup/src/Magento/Setup/Test/Unit/Fixtures/CouponCodesFixtureTest.php
-new file mode 100644
-index 00000000000..477e5c94f4c
---- /dev/null
-+++ b/setup/src/Magento/Setup/Test/Unit/Fixtures/CouponCodesFixtureTest.php
-@@ -0,0 +1,156 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+namespace Magento\Setup\Test\Unit\Fixtures;
-+
-+use \Magento\Setup\Fixtures\CouponCodesFixture;
-+
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
-+class CouponCodesFixtureTest extends \PHPUnit\Framework\TestCase
-+{
-+    /**
-+     * @var \Magento\Setup\Fixtures\CartPriceRulesFixture
-+     */
-+    private $model;
-+
-+    /**
-+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Setup\Fixtures\FixtureModel
-+     */
-+    private $fixtureModelMock;
-+
-+    /**
-+     * @var \Magento\SalesRule\Model\RuleFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $ruleFactoryMock;
-+
-+    /**
-+     * @var \Magento\SalesRule\Model\CouponFactory|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $couponCodeFactoryMock;
-+
-+    /**
-+     * setUp
-+     */
-+    public function setUp()
-+    {
-+        $this->fixtureModelMock = $this->createMock(\Magento\Setup\Fixtures\FixtureModel::class);
-+        $this->ruleFactoryMock = $this->createPartialMock(\Magento\SalesRule\Model\RuleFactory::class, ['create']);
-+        $this->couponCodeFactoryMock = $this->createPartialMock(
-+            \Magento\SalesRule\Model\CouponFactory::class,
-+            ['create']
-+        );
-+        $this->model = new CouponCodesFixture(
-+            $this->fixtureModelMock,
-+            $this->ruleFactoryMock,
-+            $this->couponCodeFactoryMock
-+        );
-+    }
-+
-+    /**
-+     * testExecute
-+     */
-+    public function testExecute()
-+    {
-+        $websiteMock = $this->createMock(\Magento\Store\Model\Website::class);
-+        $websiteMock->expects($this->once())
-+            ->method('getId')
-+            ->will($this->returnValue('website_id'));
-+
-+        $storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManager::class);
-+        $storeManagerMock->expects($this->once())
-+            ->method('getWebsites')
-+            ->will($this->returnValue([$websiteMock]));
-+
-+        $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManager\ObjectManager::class);
-+        $objectManagerMock->expects($this->once())
-+            ->method('create')
-+            ->will($this->returnValue($storeManagerMock));
-+
-+        $valueMap = [
-+            ['coupon_codes', 0, 1]
-+        ];
-+
-+        $this->fixtureModelMock
-+            ->expects($this->exactly(1))
-+            ->method('getValue')
-+            ->will($this->returnValueMap($valueMap));
-+        $this->fixtureModelMock
-+            ->expects($this->exactly(1))
-+            ->method('getObjectManager')
-+            ->will($this->returnValue($objectManagerMock));
-+
-+        $ruleMock = $this->createMock(\Magento\SalesRule\Model\Rule::class);
-+        $this->ruleFactoryMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($ruleMock);
-+
-+        $couponMock = $this->createMock(\Magento\SalesRule\Model\Coupon::class);
-+        $couponMock->expects($this->once())
-+            ->method('setRuleId')
-+            ->willReturnSelf();
-+        $couponMock->expects($this->once())
-+            ->method('setCode')
-+            ->willReturnSelf();
-+        $couponMock->expects($this->once())
-+            ->method('setIsPrimary')
-+            ->willReturnSelf();
-+        $couponMock->expects($this->once())
-+            ->method('setType')
-+            ->willReturnSelf();
-+        $couponMock->expects($this->once())
-+            ->method('save')
-+            ->willReturnSelf();
-+        $this->couponCodeFactoryMock->expects($this->once())
-+            ->method('create')
-+            ->willReturn($couponMock);
-+
-+        $this->model->execute();
-+    }
-+
-+    /**
-+     * testNoFixtureConfigValue
-+     */
-+    public function testNoFixtureConfigValue()
-+    {
-+        $ruleMock = $this->createMock(\Magento\SalesRule\Model\Rule::class);
-+        $ruleMock->expects($this->never())->method('save');
-+
-+        $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManager\ObjectManager::class);
-+        $objectManagerMock->expects($this->never())
-+            ->method('get')
-+            ->with($this->equalTo(\Magento\SalesRule\Model\Rule::class))
-+            ->willReturn($ruleMock);
-+
-+        $this->fixtureModelMock
-+            ->expects($this->never())
-+            ->method('getObjectManager')
-+            ->willReturn($objectManagerMock);
-+        $this->fixtureModelMock
-+            ->expects($this->once())
-+            ->method('getValue')
-+            ->willReturn(false);
-+
-+        $this->model->execute();
-+    }
-+
-+    /**
-+     * testGetActionTitle
-+     */
-+    public function testGetActionTitle()
-+    {
-+        $this->assertSame('Generating coupon codes', $this->model->getActionTitle());
-+    }
-+
-+    /**
-+     * testIntroduceParamLabels
-+     */
-+    public function testIntroduceParamLabels()
-+    {
-+        $this->assertSame(['coupon_codes' => 'Coupon Codes'], $this->model->introduceParamLabels());
-+    }
-+}
-diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php
-index be68be8bd8c..63a92bd4a19 100644
---- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php
-+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php
-@@ -11,7 +11,11 @@ use Magento\Framework\App\State;
- use Magento\Framework\Config\Data\ConfigData;
- use Magento\Framework\Config\Data\ConfigDataFactory;
- use Magento\Setup\Model\ConfigGenerator;
-+use Magento\Setup\Model\ConfigOptionsList\DriverOptions;
- 
-+/**
-+ * Test for Magento\Setup\Model\ConfigGenerator class.
-+ */
- class ConfigGeneratorTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -29,6 +33,11 @@ class ConfigGeneratorTest extends \PHPUnit\Framework\TestCase
-      */
-     private $configDataMock;
- 
-+    /**
-+     * @var DriverOptions
-+     */
-+    private $driverOptionsMock;
-+
-     public function setUp()
-     {
-         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-@@ -50,11 +59,17 @@ class ConfigGeneratorTest extends \PHPUnit\Framework\TestCase
-         $configDataFactoryMock->method('create')
-             ->willReturn($this->configDataMock);
- 
-+        $this->driverOptionsMock = $this->getMockBuilder(DriverOptions::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getDriverOptions'])
-+            ->getMock();
-+
-         $this->model = $objectManager->getObject(
-             ConfigGenerator::class,
-             [
-                 'deploymentConfig'  => $this->deploymentConfigMock,
-                 'configDataFactory' => $configDataFactoryMock,
-+                'driverOptions'     => $this->driverOptionsMock,
-             ]
-         );
-     }
-diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
-index 1bbd2e671e5..783c11e941e 100644
---- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
-+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
-@@ -45,7 +45,7 @@ class CacheTest extends \PHPUnit\Framework\TestCase
-     public function testGetOptions()
-     {
-         $options = $this->configOptionsList->getOptions();
--        $this->assertCount(5, $options);
-+        $this->assertCount(8, $options);
- 
-         $this->assertArrayHasKey(0, $options);
-         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
-@@ -66,6 +66,18 @@ class CacheTest extends \PHPUnit\Framework\TestCase
-         $this->assertArrayHasKey(4, $options);
-         $this->assertInstanceOf(TextConfigOption::class, $options[4]);
-         $this->assertEquals('cache-backend-redis-password', $options[4]->getName());
-+
-+        $this->assertArrayHasKey(5, $options);
-+        $this->assertInstanceOf(TextConfigOption::class, $options[5]);
-+        $this->assertEquals('cache-backend-redis-compress-data', $options[5]->getName());
-+
-+        $this->assertArrayHasKey(6, $options);
-+        $this->assertInstanceOf(TextConfigOption::class, $options[6]);
-+        $this->assertEquals('cache-backend-redis-compression-lib', $options[6]->getName());
-+
-+        $this->assertArrayHasKey(7, $options);
-+        $this->assertInstanceOf(TextConfigOption::class, $options[7]);
-+        $this->assertEquals('cache-id-prefix', $options[7]->getName());
-     }
- 
-     /**
-@@ -84,8 +96,11 @@ class CacheTest extends \PHPUnit\Framework\TestCase
-                             'server' => '',
-                             'port' => '',
-                             'database' => '',
--                            'password' => ''
--                        ]
-+                            'password' => '',
-+                            'compress_data' => '',
-+                            'compression_lib' => '',
-+                        ],
-+                        'id_prefix' => $this->expectedIdPrefix(),
-                     ]
-                 ]
-             ]
-@@ -110,17 +125,23 @@ class CacheTest extends \PHPUnit\Framework\TestCase
-                             'server' => 'localhost',
-                             'port' => '1234',
-                             'database' => '5',
--                            'password' => ''
--                        ]
-+                            'password' => '',
-+                            'compress_data' => '1',
-+                            'compression_lib' => 'gzip',
-+                        ],
-+                        'id_prefix' => $this->expectedIdPrefix(),
-                     ]
-                 ]
-             ]
-         ];
-+
-         $options = [
-             'cache-backend' => 'redis',
-             'cache-backend-redis-server' => 'localhost',
-             'cache-backend-redis-port' => '1234',
--            'cache-backend-redis-db' => '5'
-+            'cache-backend-redis-db' => '5',
-+            'cache-backend-redis-compress-data' => '1',
-+            'cache-backend-redis-compression-lib' => 'gzip'
-         ];
- 
-         $configData = $this->configOptionsList->createConfig($options, $this->deploymentConfigMock);
-@@ -128,6 +149,54 @@ class CacheTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($expectedConfigData, $configData->getData());
-     }
- 
-+    /**
-+     * testCreateConfigCacheRedis
-+     */
-+    public function testCreateConfigWithFileCache()
-+    {
-+        $this->deploymentConfigMock->method('get')->willReturn('');
-+
-+        $expectedConfigData = [
-+            'cache' => [
-+                'frontend' => [
-+                    'default' => [
-+                        'id_prefix' => $this->expectedIdPrefix(),
-+                    ]
-+                ]
-+            ]
-+        ];
-+
-+        $configData = $this->configOptionsList->createConfig([], $this->deploymentConfigMock);
-+
-+        $this->assertEquals($expectedConfigData, $configData->getData());
-+    }
-+
-+    /**
-+     * testCreateConfigCacheRedis
-+     */
-+    public function testCreateConfigWithIdPrefix()
-+    {
-+        $this->deploymentConfigMock->method('get')->willReturn('');
-+
-+        $explicitPrefix = 'XXX_';
-+        $expectedConfigData = [
-+            'cache' => [
-+                'frontend' => [
-+                    'default' => [
-+                        'id_prefix' => $explicitPrefix,
-+                    ]
-+                ]
-+            ]
-+        ];
-+
-+        $configData = $this->configOptionsList->createConfig(
-+            ['cache-id-prefix' => $explicitPrefix],
-+            $this->deploymentConfigMock
-+        );
-+
-+        $this->assertEquals($expectedConfigData, $configData->getData());
-+    }
-+
-     /**
-      * testValidateWithValidInput
-      */
-@@ -160,4 +229,14 @@ class CacheTest extends \PHPUnit\Framework\TestCase
-         $this->assertCount(1, $errors);
-         $this->assertEquals("Invalid cache handler 'clay-tablet'", $errors[0]);
-     }
-+
-+    /**
-+     * The default ID prefix, based on installation directory
-+     *
-+     * @return string
-+     */
-+    private function expectedIdPrefix(): string
-+    {
-+        return substr(\md5(dirname(__DIR__, 8)), 0, 3) . '_';
-+    }
- }
-diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
-new file mode 100644
-index 00000000000..1a46bddf5f2
---- /dev/null
-+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
-@@ -0,0 +1,232 @@
-+<?php
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+declare(strict_types=1);
-+
-+namespace Magento\Setup\Test\Unit\Model\ConfigOptionsList;
-+
-+use Magento\Setup\Model\ConfigOptionsList\Lock as LockConfigOptionsList;
-+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
-+use Magento\Framework\Lock\LockBackendFactory;
-+use Magento\Framework\Config\Data\ConfigData;
-+use Magento\Framework\App\DeploymentConfig;
-+use Magento\Framework\Setup\Option\SelectConfigOption;
-+use Magento\Framework\Setup\Option\TextConfigOption;
-+use PHPUnit\Framework\MockObject\MockObject;
-+use PHPUnit\Framework\TestCase;
-+
-+class LockTest extends TestCase
-+{
-+    /**
-+     * @var DeploymentConfig|MockObject
-+     */
-+    private $deploymentConfigMock;
-+
-+    /**
-+     * @var LockConfigOptionsList
-+     */
-+    private $lockConfigOptionsList;
-+
-+    /**
-+     * @inheritdoc
-+     */
-+    protected function setUp()
-+    {
-+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
-+        $this->lockConfigOptionsList = new LockConfigOptionsList();
-+    }
-+
-+    /**
-+     * @return void
-+     */
-+    public function testGetOptions()
-+    {
-+        $options = $this->lockConfigOptionsList->getOptions();
-+        $this->assertSame(5, count($options));
-+
-+        $this->assertArrayHasKey(0, $options);
-+        $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
-+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER, $options[0]->getName());
-+
-+        $this->assertArrayHasKey(1, $options);
-+        $this->assertInstanceOf(TextConfigOption::class, $options[1]);
-+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_DB_PREFIX, $options[1]->getName());
-+
-+        $this->assertArrayHasKey(2, $options);
-+        $this->assertInstanceOf(TextConfigOption::class, $options[2]);
-+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_HOST, $options[2]->getName());
-+
-+        $this->assertArrayHasKey(3, $options);
-+        $this->assertInstanceOf(TextConfigOption::class, $options[3]);
-+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH, $options[3]->getName());
-+
-+        $this->assertArrayHasKey(4, $options);
-+        $this->assertInstanceOf(TextConfigOption::class, $options[4]);
-+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_FILE_PATH, $options[4]->getName());
-+    }
-+
-+    /**
-+     * @param array $options
-+     * @param array $expectedResult
-+     * @dataProvider createConfigDataProvider
-+     */
-+    public function testCreateConfig(array $options, array $expectedResult)
-+    {
-+        $this->deploymentConfigMock->expects($this->any())
-+            ->method('get')
-+            ->willReturnArgument(1);
-+        $data = $this->lockConfigOptionsList->createConfig($options, $this->deploymentConfigMock);
-+        $this->assertInstanceOf(ConfigData::class, $data);
-+        $this->assertTrue($data->isOverrideWhenSave());
-+        $this->assertSame($expectedResult, $data->getData());
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function createConfigDataProvider(): array
-+    {
-+        return [
-+            'Check default values' => [
-+                'options' => [],
-+                'expectedResult' => [
-+                    'lock' => [
-+                        'provider' => LockBackendFactory::LOCK_DB,
-+                        'config' => [
-+                            'prefix' => null,
-+                        ],
-+                    ],
-+                ],
-+            ],
-+            'Check default value for cache lock' => [
-+                'options' => [
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_CACHE,
-+                ],
-+                'expectedResult' => [
-+                    'lock' => [
-+                        'provider' => LockBackendFactory::LOCK_CACHE,
-+                    ],
-+                ],
-+            ],
-+            'Check default value for zookeeper lock' => [
-+                'options' => [
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_ZOOKEEPER,
-+                ],
-+                'expectedResult' => [
-+                    'lock' => [
-+                        'provider' => LockBackendFactory::LOCK_ZOOKEEPER,
-+                        'config' => [
-+                            'host' => null,
-+                            'path' => ZookeeperLock::DEFAULT_PATH,
-+                        ],
-+                    ],
-+                ],
-+            ],
-+            'Check specific db lock options' => [
-+                'options' => [
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_DB,
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_DB_PREFIX => 'my_prefix'
-+                ],
-+                'expectedResult' => [
-+                    'lock' => [
-+                        'provider' => LockBackendFactory::LOCK_DB,
-+                        'config' => [
-+                            'prefix' => 'my_prefix',
-+                        ],
-+                    ],
-+                ],
-+            ],
-+            'Check specific zookeeper lock options' => [
-+                'options' => [
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_ZOOKEEPER,
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_HOST => '123.45.67.89:10',
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH => '/some/path',
-+                ],
-+                'expectedResult' => [
-+                    'lock' => [
-+                        'provider' => LockBackendFactory::LOCK_ZOOKEEPER,
-+                        'config' => [
-+                            'host' => '123.45.67.89:10',
-+                            'path' => '/some/path',
-+                        ],
-+                    ],
-+                ],
-+            ],
-+            'Check specific file lock options' => [
-+                'options' => [
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_FILE,
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_FILE_PATH => '/my/path'
-+                ],
-+                'expectedResult' => [
-+                    'lock' => [
-+                        'provider' => LockBackendFactory::LOCK_FILE,
-+                        'config' => [
-+                            'path' => '/my/path',
-+                        ],
-+                    ],
-+                ],
-+            ],
-+        ];
-+    }
-+
-+    /**
-+     * @param array $options
-+     * @param array $expectedResult
-+     * @dataProvider validateDataProvider
-+     */
-+    public function testValidate(array $options, array $expectedResult)
-+    {
-+        $this->deploymentConfigMock->expects($this->any())
-+            ->method('get')
-+            ->willReturnArgument(1);
-+        $this->assertSame(
-+            $expectedResult,
-+            $this->lockConfigOptionsList->validate($options, $this->deploymentConfigMock)
-+        );
-+    }
-+
-+    /**
-+     * @return array
-+     */
-+    public function validateDataProvider(): array
-+    {
-+        return [
-+            'Wrong lock provider' => [
-+                'options' => [
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => 'SomeProvider',
-+                ],
-+                'expectedResult' => [
-+                    'The lock provider SomeProvider does not exist.',
-+                ],
-+            ],
-+            'Empty host and path for Zookeeper' => [
-+                'options' => [
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_ZOOKEEPER,
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_HOST => '',
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH => '',
-+                ],
-+                'expectedResult' => extension_loaded('zookeeper')
-+                    ? [
-+                        'Zookeeper path needs to be a non-empty string.',
-+                        'Zookeeper host is should be set.',
-+                    ]
-+                    : [
-+                        'php extension Zookeeper is not installed.',
-+                        'Zookeeper path needs to be a non-empty string.',
-+                        'Zookeeper host is should be set.',
-+                    ],
-+            ],
-+            'Empty path for File lock' => [
-+                'options' => [
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_FILE,
-+                    LockConfigOptionsList::INPUT_KEY_LOCK_FILE_PATH => '',
-+                ],
-+                'expectedResult' => [
-+                    'The path needs to be a non-empty string.',
-+                ],
-+            ],
-+        ];
-+    }
-+}
-diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
-index 6f8e97cd5dd..673168fe2ff 100644
---- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
-+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
-@@ -45,7 +45,7 @@ class PageCacheTest extends \PHPUnit\Framework\TestCase
-     public function testGetOptions()
-     {
-         $options = $this->configList->getOptions();
--        $this->assertCount(6, $options);
-+        $this->assertCount(8, $options);
- 
-         $this->assertArrayHasKey(0, $options);
-         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
-@@ -65,11 +65,19 @@ class PageCacheTest extends \PHPUnit\Framework\TestCase
- 
-         $this->assertArrayHasKey(4, $options);
-         $this->assertInstanceOf(TextConfigOption::class, $options[4]);
--        $this->assertEquals('page-cache-redis-compress-data', $options[4]->getName());
-+        $this->assertEquals('page-cache-redis-password', $options[4]->getName());
- 
-         $this->assertArrayHasKey(5, $options);
-         $this->assertInstanceOf(TextConfigOption::class, $options[5]);
--        $this->assertEquals('page-cache-redis-password', $options[5]->getName());
-+        $this->assertEquals('page-cache-redis-compress-data', $options[5]->getName());
-+
-+        $this->assertArrayHasKey(6, $options);
-+        $this->assertInstanceOf(TextConfigOption::class, $options[6]);
-+        $this->assertEquals('page-cache-redis-compression-lib', $options[6]->getName());
-+
-+        $this->assertArrayHasKey(7, $options);
-+        $this->assertInstanceOf(TextConfigOption::class, $options[7]);
-+        $this->assertEquals('page-cache-id-prefix', $options[7]->getName());
-     }
- 
-     /**
-@@ -89,8 +97,10 @@ class PageCacheTest extends \PHPUnit\Framework\TestCase
-                             'port' => '',
-                             'database' => '',
-                             'compress_data' => '',
--                            'password' => ''
--                        ]
-+                            'password' => '',
-+                            'compression_lib' => '',
-+                        ],
-+                        'id_prefix' => $this->expectedIdPrefix(),
-                     ]
-                 ]
-             ]
-@@ -115,9 +125,11 @@ class PageCacheTest extends \PHPUnit\Framework\TestCase
-                             'server' => 'foo.bar',
-                             'port' => '9000',
-                             'database' => '6',
-+                            'password' => '',
-                             'compress_data' => '1',
--                            'password' => ''
--                        ]
-+                            'compression_lib' => 'gzip',
-+                        ],
-+                        'id_prefix' => $this->expectedIdPrefix(),
-                     ]
-                 ]
-             ]
-@@ -128,7 +140,8 @@ class PageCacheTest extends \PHPUnit\Framework\TestCase
-             'page-cache-redis-server' => 'foo.bar',
-             'page-cache-redis-port' => '9000',
-             'page-cache-redis-db' => '6',
--            'page-cache-redis-compress-data' => '1'
-+            'page-cache-redis-compress-data' => '1',
-+            'page-cache-redis-compression-lib' => 'gzip',
-         ];
- 
-         $configData = $this->configList->createConfig($options, $this->deploymentConfigMock);
-@@ -136,6 +149,54 @@ class PageCacheTest extends \PHPUnit\Framework\TestCase
-         $this->assertEquals($expectedConfigData, $configData->getData());
-     }
- 
-+    /**
-+     * testCreateConfigWithRedis
-+     */
-+    public function testCreateConfigWithFileCache()
-+    {
-+        $this->deploymentConfigMock->method('get')->willReturn('');
-+
-+        $expectedConfigData = [
-+            'cache' => [
-+                'frontend' => [
-+                    'page_cache' => [
-+                        'id_prefix' => $this->expectedIdPrefix(),
-+                    ]
-+                ]
-+            ]
-+        ];
-+
-+        $configData = $this->configList->createConfig([], $this->deploymentConfigMock);
-+
-+        $this->assertEquals($expectedConfigData, $configData->getData());
-+    }
-+
-+    /**
-+     * testCreateConfigCacheRedis
-+     */
-+    public function testCreateConfigWithIdPrefix()
-+    {
-+        $this->deploymentConfigMock->method('get')->willReturn('');
-+
-+        $explicitPrefix = 'XXX_';
-+        $expectedConfigData = [
-+            'cache' => [
-+                'frontend' => [
-+                    'page_cache' => [
-+                        'id_prefix' => $explicitPrefix,
-+                    ]
-+                ]
-+            ]
-+        ];
-+
-+        $configData = $this->configList->createConfig(
-+            ['page-cache-id-prefix' => $explicitPrefix],
-+            $this->deploymentConfigMock
-+        );
-+
-+        $this->assertEquals($expectedConfigData, $configData->getData());
-+    }
-+
-     /**
-      * testValidationWithValidData
-      */
-@@ -169,4 +230,14 @@ class PageCacheTest extends \PHPUnit\Framework\TestCase
-         $this->assertCount(1, $errors);
-         $this->assertEquals('Invalid cache handler \'foobar\'', $errors[0]);
-     }
-+
-+    /**
-+     * The default ID prefix, based on installation directory
-+     *
-+     * @return string
-+     */
-+    private function expectedIdPrefix(): string
-+    {
-+        return substr(\md5(dirname(__DIR__, 8)), 0, 3) . '_';
-+    }
- }
-diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
-index f342a114934..435f03f9de6 100644
---- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
-+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
-@@ -9,8 +9,12 @@ namespace Magento\Setup\Test\Unit\Model;
- use Magento\Framework\Config\ConfigOptionsListConstants;
- use Magento\Setup\Model\ConfigGenerator;
- use Magento\Setup\Model\ConfigOptionsList;
-+use Magento\Setup\Model\ConfigOptionsList\Lock;
- use Magento\Setup\Validator\DbValidator;
- 
-+/**
-+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-+ */
- class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
- {
-     /**
-@@ -33,12 +37,29 @@ class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
-      */
-     private $dbValidator;
- 
-+    /**
-+     * @var \Magento\Framework\Encryption\KeyValidator|\PHPUnit_Framework_MockObject_MockObject
-+     */
-+    private $encryptionKeyValidator;
-+
-+    /**
-+     * @var ConfigOptionsList\DriverOptions
-+     */
-+    private $driverOptionsMock;
-+
-     protected function setUp()
-     {
-         $this->generator = $this->createMock(\Magento\Setup\Model\ConfigGenerator::class);
-         $this->deploymentConfig = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-         $this->dbValidator = $this->createMock(\Magento\Setup\Validator\DbValidator::class);
--        $this->object = new ConfigOptionsList($this->generator, $this->dbValidator);
-+        $this->encryptionKeyValidator = $this->createMock(\Magento\Framework\Encryption\KeyValidator::class);
-+        $this->driverOptionsMock = $this->createMock(ConfigOptionsList\DriverOptions::class);
-+        $this->object = new ConfigOptionsList(
-+            $this->generator,
-+            $this->dbValidator,
-+            $this->encryptionKeyValidator,
-+            $this->driverOptionsMock
-+        );
-     }
- 
-     public function testGetOptions()
-@@ -82,7 +103,7 @@ class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
-         $this->generator->expects($this->once())->method('createXFrameConfig')->willReturn($configDataMock);
-         $this->generator->expects($this->once())->method('createCacheHostsConfig')->willReturn($configDataMock);
- 
--        $configData = $this->object->createConfig([], $this->deploymentConfig);
-+        $configData = $this->object->createConfig([Lock::INPUT_KEY_LOCK_PROVIDER => 'db'], $this->deploymentConfig);
-         $this->assertGreaterThanOrEqual(6, count($configData));
-     }
- 
-@@ -96,7 +117,7 @@ class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
-         $this->generator->expects($this->once())->method('createXFrameConfig')->willReturn($configDataMock);
-         $this->generator->expects($this->once())->method('createCacheHostsConfig')->willReturn($configDataMock);
- 
--        $configData = $this->object->createConfig([], $this->deploymentConfig);
-+        $configData = $this->object->createConfig([Lock::INPUT_KEY_LOCK_PROVIDER => 'db'], $this->deploymentConfig);
-         $this->assertGreaterThanOrEqual(6, count($configData));
-     }
- 
-@@ -109,7 +130,8 @@ class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
-             ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'name',
-             ConfigOptionsListConstants::INPUT_KEY_DB_HOST => 'host',
-             ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'user',
--            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass'
-+            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass',
-+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
-         ];
-         $this->prepareValidationMocks();
- 
-@@ -127,7 +149,8 @@ class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
-             ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'name',
-             ConfigOptionsListConstants::INPUT_KEY_DB_HOST => 'host',
-             ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'user',
--            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass'
-+            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass',
-+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
-         ];
-         $this->prepareValidationMocks();
- 
-@@ -141,10 +164,11 @@ class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
-     {
-         $options = [
-             ConfigOptionsListConstants::INPUT_KEY_SKIP_DB_VALIDATION => true,
--            ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => ''
-+            ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => '',
-+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
-         ];
-         $this->assertEquals(
--            ['Invalid encryption key'],
-+            ['Invalid encryption key. Encryption key must be 32 character string without any white space.'],
-             $this->object->validate($options, $this->deploymentConfig)
-         );
-     }
-@@ -155,7 +179,10 @@ class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->dbValidator->expects($this->once())->method('checkDatabaseTablePrefix')->willReturn($configDataMock);
--        $this->dbValidator->expects($this->once())->method('checkDatabaseConnection')->willReturn($configDataMock);
-+        $this->dbValidator
-+            ->expects($this->once())
-+            ->method('checkDatabaseConnectionWithDriverOptions')
-+            ->willReturn($configDataMock);
-     }
- 
-     /**
-@@ -167,7 +194,8 @@ class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
-     {
-         $options = [
-             ConfigOptionsListConstants::INPUT_KEY_SKIP_DB_VALIDATION => true,
--            ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS => $hosts
-+            ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS => $hosts,
-+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
-         ];
-         $result = $this->object->validate($options, $this->deploymentConfig);
-         if ($expectedError) {
-diff --git a/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php b/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
-index 8a4263be18e..e600002d535 100644
---- a/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
-+++ b/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
-@@ -9,6 +9,7 @@ namespace Magento\Setup\Test\Unit\Model {
-     use Magento\Backend\Setup\ConfigOptionsList;
-     use Magento\Framework\Config\ConfigOptionsListConstants;
-     use Magento\Framework\Setup\SchemaListener;
-+    use Magento\Setup\Model\AdminAccount;
-     use Magento\Setup\Model\DeclarationInstaller;
-     use Magento\Setup\Model\Installer;
-     use Magento\Framework\App\Filesystem\DirectoryList;
-@@ -268,17 +269,13 @@ namespace Magento\Setup\Test\Unit\Model {
-         }
- 
-         /**
-+         * @param array $request
-+         * @param array $logMessages
-+         * @dataProvider installDataProvider
-          * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-          */
--        public function testInstall()
-+        public function testInstall(array $request, array $logMessages)
-         {
--            $request = [
--                ConfigOptionsListConstants::INPUT_KEY_DB_HOST => '127.0.0.1',
--                ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'magento',
--                ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'magento',
--                ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => 'encryption_key',
--                ConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME => 'backend',
--            ];
-             $this->config->expects($this->atLeastOnce())
-                 ->method('get')
-                 ->willReturnMap(
-@@ -353,7 +350,7 @@ namespace Magento\Setup\Test\Unit\Model {
-                     [\Magento\Setup\Model\DeclarationInstaller::class, $this->declarationInstallerMock],
-                     [\Magento\Framework\Registry::class, $registry]
-                 ]));
--            $this->adminFactory->expects($this->once())->method('create')->willReturn(
-+            $this->adminFactory->expects($this->any())->method('create')->willReturn(
-                 $this->createMock(\Magento\Setup\Model\AdminAccount::class)
-             );
-             $this->sampleDataState->expects($this->once())->method('hasError')->willReturn(true);
-@@ -366,11 +363,119 @@ namespace Magento\Setup\Test\Unit\Model {
-             $this->filePermissions->expects($this->once())
-                 ->method('getMissingWritableDirectoriesForDbUpgrade')
-                 ->willReturn([]);
--            $this->setupLoggerExpectsForInstall();
-+            call_user_func_array(
-+                [
-+                    $this->logger->expects($this->exactly(count($logMessages)))->method('log'),
-+                    'withConsecutive'
-+                ],
-+                $logMessages
-+            );
-+            $this->logger->expects($this->exactly(2))
-+                ->method('logSuccess')
-+                ->withConsecutive(
-+                    ['Magento installation complete.'],
-+                    ['Magento Admin URI: /']
-+                );
- 
-             $this->object->install($request);
-         }
- 
-+        /**
-+         * @return array
-+         */
-+        public function installDataProvider()
-+        {
-+            return [
-+                [
-+                    'request' => [
-+                        ConfigOptionsListConstants::INPUT_KEY_DB_HOST => '127.0.0.1',
-+                        ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'magento',
-+                        ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'magento',
-+                        ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => 'encryption_key',
-+                        ConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME => 'backend',
-+                    ],
-+                    'logMessages' => [
-+                        ['Starting Magento installation:'],
-+                        ['File permissions check...'],
-+                        ['Required extensions check...'],
-+                        ['Enabling Maintenance Mode...'],
-+                        ['Installing deployment configuration...'],
-+                        ['Installing database schema:'],
-+                        ['Schema creation/updates:'],
-+                        ['Module \'Foo_One\':'],
-+                        ['Module \'Bar_Two\':'],
-+                        ['Schema post-updates:'],
-+                        ['Module \'Foo_One\':'],
-+                        ['Module \'Bar_Two\':'],
-+                        ['Installing user configuration...'],
-+                        ['Enabling caches:'],
-+                        ['Current status:'],
-+                        [''],
-+                        ['Installing data...'],
-+                        ['Data install/update:'],
-+                        ['Module \'Foo_One\':'],
-+                        ['Module \'Bar_Two\':'],
-+                        ['Data post-updates:'],
-+                        ['Module \'Foo_One\':'],
-+                        ['Module \'Bar_Two\':'],
-+                        //['Installing admin user...'],
-+                        ['Caches clearing:'],
-+                        ['Cache cleared successfully'],
-+                        ['Disabling Maintenance Mode:'],
-+                        ['Post installation file permissions check...'],
-+                        ['Write installation date...'],
-+                        ['Sample Data is installed with errors. See log file for details']
-+                    ],
-+                ],
-+                [
-+                    'request' => [
-+                        ConfigOptionsListConstants::INPUT_KEY_DB_HOST => '127.0.0.1',
-+                        ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'magento',
-+                        ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'magento',
-+                        ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => 'encryption_key',
-+                        ConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME => 'backend',
-+                        AdminAccount::KEY_USER => 'admin',
-+                        AdminAccount::KEY_PASSWORD => '123',
-+                        AdminAccount::KEY_EMAIL => 'admin@example.com',
-+                        AdminAccount::KEY_FIRST_NAME => 'John',
-+                        AdminAccount::KEY_LAST_NAME => 'Doe',
-+                    ],
-+                    'logMessages' => [
-+                        ['Starting Magento installation:'],
-+                        ['File permissions check...'],
-+                        ['Required extensions check...'],
-+                        ['Enabling Maintenance Mode...'],
-+                        ['Installing deployment configuration...'],
-+                        ['Installing database schema:'],
-+                        ['Schema creation/updates:'],
-+                        ['Module \'Foo_One\':'],
-+                        ['Module \'Bar_Two\':'],
-+                        ['Schema post-updates:'],
-+                        ['Module \'Foo_One\':'],
-+                        ['Module \'Bar_Two\':'],
-+                        ['Installing user configuration...'],
-+                        ['Enabling caches:'],
-+                        ['Current status:'],
-+                        [''],
-+                        ['Installing data...'],
-+                        ['Data install/update:'],
-+                        ['Module \'Foo_One\':'],
-+                        ['Module \'Bar_Two\':'],
-+                        ['Data post-updates:'],
-+                        ['Module \'Foo_One\':'],
-+                        ['Module \'Bar_Two\':'],
-+                        ['Installing admin user...'],
-+                        ['Caches clearing:'],
-+                        ['Cache cleared successfully'],
-+                        ['Disabling Maintenance Mode:'],
-+                        ['Post installation file permissions check...'],
-+                        ['Write installation date...'],
-+                        ['Sample Data is installed with errors. See log file for details']
-+                    ],
-+                ],
-+            ];
-+        }
-+
-         public function testCheckInstallationFilePermissions()
-         {
-             $this->filePermissions
-@@ -590,44 +695,6 @@ namespace Magento\Setup\Test\Unit\Model {
- 
-             return $newObject;
-         }
--
--        /**
--         * Set up logger expectations for install method
--         * @return void
--         */
--        private function setupLoggerExpectsForInstall()
--        {
--            $this->logger->expects($this->at(0))->method('log')->with('Starting Magento installation:');
--            $this->logger->expects($this->at(1))->method('log')->with('File permissions check...');
--            $this->logger->expects($this->at(3))->method('log')->with('Required extensions check...');
--            // at(2) invokes logMeta()
--            $this->logger->expects($this->at(5))->method('log')->with('Enabling Maintenance Mode...');
--            // at(4) - logMeta and so on...
--            $this->logger->expects($this->at(7))->method('log')->with('Installing deployment configuration...');
--            $this->logger->expects($this->at(9))->method('log')->with('Installing database schema:');
--            $this->logger->expects($this->at(11))->method('log')->with("Module 'Foo_One':");
--            $this->logger->expects($this->at(13))->method('log')->with("Module 'Bar_Two':");
--            $this->logger->expects($this->at(15))->method('log')->with('Schema post-updates:');
--            $this->logger->expects($this->at(16))->method('log')->with("Module 'Foo_One':");
--            $this->logger->expects($this->at(18))->method('log')->with("Module 'Bar_Two':");
--            $this->logger->expects($this->at(21))->method('log')->with('Installing user configuration...');
--            $this->logger->expects($this->at(23))->method('log')->with('Enabling caches:');
--            $this->logger->expects($this->at(27))->method('log')->with('Installing data...');
--            $this->logger->expects($this->at(28))->method('log')->with('Data install/update:');
--            $this->logger->expects($this->at(29))->method('log')->with("Module 'Foo_One':");
--            $this->logger->expects($this->at(31))->method('log')->with("Module 'Bar_Two':");
--            $this->logger->expects($this->at(33))->method('log')->with('Data post-updates:');
--            $this->logger->expects($this->at(34))->method('log')->with("Module 'Foo_One':");
--            $this->logger->expects($this->at(36))->method('log')->with("Module 'Bar_Two':");
--            $this->logger->expects($this->at(39))->method('log')->with('Installing admin user...');
--            $this->logger->expects($this->at(41))->method('log')->with('Caches clearing:');
--            $this->logger->expects($this->at(44))->method('log')->with('Disabling Maintenance Mode:');
--            $this->logger->expects($this->at(46))->method('log')->with('Post installation file permissions check...');
--            $this->logger->expects($this->at(48))->method('log')->with('Write installation date...');
--            $this->logger->expects($this->at(50))->method('logSuccess')->with('Magento installation complete.');
--            $this->logger->expects($this->at(52))->method('log')
--                ->with('Sample Data is installed with errors. See log file for details');
--        }
-     }
- }
- 
-diff --git a/setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php
-index 65fe4a5f477..ea4261b2715 100644
---- a/setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php
-+++ b/setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php
-@@ -15,7 +15,11 @@ use Magento\Setup\Model\ConfigGenerator;
- use Magento\Framework\Config\ConfigOptionsListConstants;
- use Magento\Setup\Model\CryptKeyGenerator;
- use PHPUnit\Framework\TestCase;
-+use Magento\Setup\Model\ConfigOptionsList\DriverOptions;
- 
-+/**
-+ * Test for Magento\Setup\Model\ConfigGenerator class.
-+ */
- class ConfigGeneratorTest extends TestCase
- {
-     /**
-@@ -44,11 +48,17 @@ class ConfigGeneratorTest extends TestCase
-         $configDataFactoryMock = (new ObjectManager($this))
-             ->getObject(ConfigDataFactory::class, ['objectManager' => $objectManagerMock]);
- 
-+        $driverOptions = $this->getMockBuilder(DriverOptions::class)
-+            ->disableOriginalConstructor()
-+            ->setMethods(['getDriverOptions'])
-+            ->getMock();
-+
-         $this->configGeneratorObject = new ConfigGenerator(
-             $randomMock,
-             $deployConfig,
-             $configDataFactoryMock,
--            $cryptKeyGenerator
-+            $cryptKeyGenerator,
-+            $driverOptions
-         );
-     }
- 
-@@ -64,6 +74,7 @@ class ConfigGeneratorTest extends TestCase
-     {
-         $returnValue = $this->configGeneratorObject->createCryptConfig([]);
-         $this->assertEquals(ConfigFilePool::APP_ENV, $returnValue->getFileKey());
-+        // phpcs:ignore Magento2.Security.InsecureFunction
-         $this->assertEquals(['crypt' => ['key' => md5('key')]], $returnValue->getData());
-     }
- 
-diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/AreaTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/AreaTest.php
-index 39e67401760..69de120cca4 100644
---- a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/AreaTest.php
-+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/AreaTest.php
-@@ -48,7 +48,8 @@ class AreaTest extends \PHPUnit\Framework\TestCase
-         $this->configReaderMock = $this->getMockBuilder(\Magento\Setup\Module\Di\Compiler\Config\Reader::class)
-             ->disableOriginalConstructor()
-             ->getMock();
--        $this->configWriterMock = $this->getMockBuilder(\Magento\Setup\Module\Di\Compiler\Config\WriterInterface::class)
-+        $this->configWriterMock =
-+            $this->getMockBuilder(\Magento\Framework\App\ObjectManager\ConfigWriterInterface::class)
-             ->disableOriginalConstructor()
-             ->getMock();
-         $this->configChain = $this->getMockBuilder(\Magento\Setup\Module\Di\Compiler\Config\ModificationChain::class)
-diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php
-index 76c5a6d0313..d429d0a0c99 100644
---- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php
-+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php
-@@ -39,7 +39,7 @@ class ParserTest extends \PHPUnit\Framework\TestCase
-      * @param array $jsFiles
-      * @param array $phpMap
-      * @param array $jsMap
--     * @paran array $phraseFactoryMap
-+     * @param array $phraseFactoryMap
-      * @param array $expectedResult
-      * @dataProvider addPhraseDataProvider
-      */
-diff --git a/setup/src/Magento/Setup/Validator/AdminCredentialsValidator.php b/setup/src/Magento/Setup/Validator/AdminCredentialsValidator.php
-index df061de2adb..23e41df900d 100644
---- a/setup/src/Magento/Setup/Validator/AdminCredentialsValidator.php
-+++ b/setup/src/Magento/Setup/Validator/AdminCredentialsValidator.php
-@@ -5,9 +5,11 @@
-  */
- namespace Magento\Setup\Validator;
- 
-+use Magento\Framework\App\ObjectManager;
- use Magento\Framework\Config\ConfigOptionsListConstants as ConfigOption;
- use Magento\Setup\Model\AdminAccount;
- use Magento\Setup\Model\Installer;
-+use Magento\Setup\Model\ConfigOptionsList\DriverOptions;
- 
- /**
-  * Admin user credentials validator
-@@ -29,21 +31,29 @@ class AdminCredentialsValidator
-      */
-     private $setupFactory;
- 
-+    /**
-+     * @var DriverOptions
-+     */
-+    private $driverOptions;
-+
-     /**
-      * Initialize dependencies.
-      *
-      * @param \Magento\Setup\Model\AdminAccountFactory $adminAccountFactory
-      * @param \Magento\Setup\Module\ConnectionFactory $connectionFactory
-      * @param \Magento\Setup\Module\SetupFactory $setupFactory
-+     * @param DriverOptions|null $driverOptions
-      */
-     public function __construct(
-         \Magento\Setup\Model\AdminAccountFactory $adminAccountFactory,
-         \Magento\Setup\Module\ConnectionFactory $connectionFactory,
--        \Magento\Setup\Module\SetupFactory $setupFactory
-+        \Magento\Setup\Module\SetupFactory $setupFactory,
-+        DriverOptions $driverOptions = null
-     ) {
-         $this->connectionFactory = $connectionFactory;
-         $this->adminAccountFactory = $adminAccountFactory;
-         $this->setupFactory = $setupFactory;
-+        $this->driverOptions = $driverOptions ?? ObjectManager::getInstance()->get(DriverOptions::class);
-     }
- 
-     /**
-@@ -55,13 +65,18 @@ class AdminCredentialsValidator
-      */
-     public function validate(array $data)
-     {
--        $dbConnection = $this->connectionFactory->create([
--            ConfigOption::KEY_NAME => $data[ConfigOption::INPUT_KEY_DB_NAME],
--            ConfigOption::KEY_HOST => $data[ConfigOption::INPUT_KEY_DB_HOST],
--            ConfigOption::KEY_USER => $data[ConfigOption::INPUT_KEY_DB_USER],
--            ConfigOption::KEY_PASSWORD => $data[ConfigOption::INPUT_KEY_DB_PASSWORD],
--            ConfigOption::KEY_PREFIX => $data[ConfigOption::INPUT_KEY_DB_PREFIX]
--        ]);
-+        $driverOptions = $this->driverOptions->getDriverOptions($data);
-+
-+        $dbConnection = $this->connectionFactory->create(
-+            [
-+                ConfigOption::KEY_NAME => $data[ConfigOption::INPUT_KEY_DB_NAME],
-+                ConfigOption::KEY_HOST => $data[ConfigOption::INPUT_KEY_DB_HOST],
-+                ConfigOption::KEY_USER => $data[ConfigOption::INPUT_KEY_DB_USER],
-+                ConfigOption::KEY_PASSWORD => $data[ConfigOption::INPUT_KEY_DB_PASSWORD],
-+                ConfigOption::KEY_PREFIX => $data[ConfigOption::INPUT_KEY_DB_PREFIX],
-+                ConfigOption::KEY_DRIVER_OPTIONS => $driverOptions
-+            ]
-+        );
- 
-         $adminAccount = $this->adminAccountFactory->create(
-             $dbConnection,
-diff --git a/setup/src/Magento/Setup/Validator/DbValidator.php b/setup/src/Magento/Setup/Validator/DbValidator.php
-index 1eae39160ff..01ed537f887 100644
---- a/setup/src/Magento/Setup/Validator/DbValidator.php
-+++ b/setup/src/Magento/Setup/Validator/DbValidator.php
-@@ -42,7 +42,7 @@ class DbValidator
-      * Check if database table prefix is valid
-      *
-      * @param string $prefix
--     * @return boolean
-+     * @return bool
-      * @throws \InvalidArgumentException
-      */
-     public function checkDatabaseTablePrefix($prefix)
-@@ -72,19 +72,44 @@ class DbValidator
-      * @param string $dbHost
-      * @param string $dbUser
-      * @param string $dbPass
--     * @return boolean
-+     * @return bool
-      * @throws \Magento\Setup\Exception
-+     * @deprecated
-      */
-     public function checkDatabaseConnection($dbName, $dbHost, $dbUser, $dbPass = '')
-     {
-+        return $this->checkDatabaseConnectionWithDriverOptions($dbName, $dbHost, $dbUser, $dbPass, []);
-+    }
-+
-+    /**
-+     * Checks Database Connection with Driver Options
-+     *
-+     * @param string $dbName
-+     * @param string $dbHost
-+     * @param string $dbUser
-+     * @param string $dbPass
-+     * @param array $driverOptions
-+     * @return bool
-+     * @throws \Magento\Setup\Exception
-+     */
-+    public function checkDatabaseConnectionWithDriverOptions(
-+        $dbName,
-+        $dbHost,
-+        $dbUser,
-+        $dbPass = '',
-+        $driverOptions = []
-+    ) {
-         // establish connection to information_schema view to retrieve information about user and table privileges
--        $connection = $this->connectionFactory->create([
--            ConfigOptionsListConstants::KEY_NAME => 'information_schema',
--            ConfigOptionsListConstants::KEY_HOST => $dbHost,
--            ConfigOptionsListConstants::KEY_USER => $dbUser,
--            ConfigOptionsListConstants::KEY_PASSWORD => $dbPass,
--            ConfigOptionsListConstants::KEY_ACTIVE => true,
--        ]);
-+        $connection = $this->connectionFactory->create(
-+            [
-+                ConfigOptionsListConstants::KEY_NAME => 'information_schema',
-+                ConfigOptionsListConstants::KEY_HOST => $dbHost,
-+                ConfigOptionsListConstants::KEY_USER => $dbUser,
-+                ConfigOptionsListConstants::KEY_PASSWORD => $dbPass,
-+                ConfigOptionsListConstants::KEY_ACTIVE => true,
-+                ConfigOptionsListConstants::KEY_DRIVER_OPTIONS => $driverOptions,
-+            ]
-+        );
- 
-         if (!$connection) {
-             throw new \Magento\Setup\Exception('Database connection failure.');
-@@ -159,6 +184,7 @@ class DbValidator
-         ];
- 
-         // check global privileges
-+        // phpcs:ignore Magento2.SQL.RawQuery
-         $userPrivilegesQuery = "SELECT PRIVILEGE_TYPE FROM USER_PRIVILEGES "
-             . "WHERE REPLACE(GRANTEE, '\'', '') = current_user()";
-         $grantInfo = $connection->query($userPrivilegesQuery)->fetchAll(\PDO::FETCH_NUM);
-@@ -166,7 +192,8 @@ class DbValidator
-             return true;
-         }
- 
--        // check table privileges
-+        // check database privileges
-+        // phpcs:ignore Magento2.SQL.RawQuery
-         $schemaPrivilegesQuery = "SELECT PRIVILEGE_TYPE FROM SCHEMA_PRIVILEGES " .
-             "WHERE '$dbName' LIKE TABLE_SCHEMA AND REPLACE(GRANTEE, '\'', '') = current_user()";
-         $grantInfo = $connection->query($schemaPrivilegesQuery)->fetchAll(\PDO::FETCH_NUM);
-@@ -175,7 +202,7 @@ class DbValidator
-         }
- 
-         $errorMessage = 'Database user does not have enough privileges. Please make sure '
--            . implode(', ', $requiredPrivileges) . " privileges are granted to table '{$dbName}'.";
-+            . implode(', ', $requiredPrivileges) . " privileges are granted to database '{$dbName}'.";
-         throw new \Magento\Setup\Exception($errorMessage);
-     }
- 
-diff --git a/setup/view/magento/setup/add-database.phtml b/setup/view/magento/setup/add-database.phtml
-index 18259c65fcf..c858d92cfef 100644
---- a/setup/view/magento/setup/add-database.phtml
-+++ b/setup/view/magento/setup/add-database.phtml
-@@ -476,6 +476,93 @@
- */
- ?>
- 
-+<div class="row form-row">
-+    <div class="col-m-3">
-+        <label class="form-label" for="dbDriverOptionsSslKey">
-+            Driver Options - SSL Key
-+        </label>
-+    </div>
-+    <div class="col-m-4">
-+        <input
-+                id="dbDriverOptionsSslKey"
-+                class="form-el-input"
-+                tooltip-placement="right"
-+                tooltip="File that contains X509 key"
-+                tooltip-trigger="focus"
-+                tooltip-append-to-body="true"
-+                type="text"
-+                name="dbDriverOptionsSslKey"
-+                ng-model="db.driverOptionsSslKey"
-+                placeholder="/path/to/client-key.pem"
-+        >
-+    </div>
-+</div>
-+
-+<div class="row form-row">
-+    <div class="col-m-3">
-+        <label class="form-label" for="dbDriverOptionsSslCert">
-+            Driver Options - SSL Certificate
-+        </label>
-+    </div>
-+    <div class="col-m-4">
-+        <input
-+                id="dbDriverOptionsSslCert"
-+                class="form-el-input"
-+                tooltip-placement="right"
-+                tooltip="File that contains X509 certificate"
-+                tooltip-trigger="focus"
-+                tooltip-append-to-body="true"
-+                type="text"
-+                name="dbDriverOptionsSslCert"
-+                ng-model="db.driverOptionsSslCert"
-+                placeholder="/path/to/client-cert.pem"
-+        >
-+    </div>
-+</div>
-+
-+<div class="row form-row">
-+    <div class="col-m-3">
-+        <label class="form-label" for="dbDriverOptionsSslCa">
-+            Driver Options - SSL Certificate Authorities
-+        </label>
-+    </div>
-+    <div class="col-m-4">
-+        <input
-+                id="dbDriverOptionsSslCa"
-+                class="form-el-input"
-+                tooltip-placement="right"
-+                tooltip="File that contains list of trusted SSL Certificate Authorities"
-+                tooltip-trigger="focus"
-+                tooltip-append-to-body="true"
-+                type="text"
-+                name="dbDriverOptionsSslCa"
-+                ng-model="db.driverOptionsSslCa"
-+                placeholder="/path/to/ca.pem"
-+        >
-+    </div>
-+</div>
-+
-+<div class="row form-row">
-+    <div class="col-m-3">
-+        <label class="form-label">
-+            Driver Options - SSL Verification
-+        </label>
-+    </div>
-+    <div class="col-m-4">
-+        <div class="form-row">
-+            <input
-+                    id="dbDriverOptionsSslVerify"
-+                    class="form-el-checkbox"
-+                    type="checkbox"
-+                    ng-model="db.driverOptionsSslVerify"
-+                    ng-checked="db.driverOptionsSslVerify"
-+            >
-+            <label class="form-label" for="dbDriverOptionsSslVerify">
-+                Perform verification against the server CA certificate and against the server host name in its certificate
-+            </label>
-+        </div>
-+    </div>
-+</div>
- </fieldset>
- 
- </form>
-diff --git a/setup/view/magento/setup/customize-your-store.phtml b/setup/view/magento/setup/customize-your-store.phtml
-index 15cd53ca26c..97ecf38d5f4 100644
---- a/setup/view/magento/setup/customize-your-store.phtml
-+++ b/setup/view/magento/setup/customize-your-store.phtml
-@@ -178,7 +178,7 @@
-             <p class="advanced-modules-select">
-                 <input id="selectAll" type="checkbox"
-                    class="form-el-checkbox"
--                   ng-model="store.selectAll"
-+                   ng-checked="store.selectAll"
-                    ng-click="toggleAllModules()">
-                 <label class="form-label" for="selectAll">
-                    Select All
-diff --git a/setup/view/magento/setup/data-option.phtml b/setup/view/magento/setup/data-option.phtml
-index cb31d96013f..656b04876c4 100644
---- a/setup/view/magento/setup/data-option.phtml
-+++ b/setup/view/magento/setup/data-option.phtml
-@@ -43,7 +43,7 @@
-                 value="false"
-                 >
-             <label class="form-label" for="keepData">
--                <b>Keep data</b>
-+                <strong>Keep data</strong>
-                 <br/><br/>
-                 Note: You can see the associated data in your database,
-                 however your customer will not see this in your online store.
-@@ -59,7 +59,7 @@
-                 value="true"
-                 >
-             <label class="form-label" for="removeData">
--                <b>Remove data</b>
-+                <strong>Remove data</strong>
-                 <br/><br/>
-                 Did you back up first? Choosing to remove data means the data is unavailable unless you
-                 recover it from a backup in the preceding step.
-diff --git a/setup/view/magento/setup/extension-grid.phtml b/setup/view/magento/setup/extension-grid.phtml
-index 47e5f7eec30..4800d45e12d 100644
---- a/setup/view/magento/setup/extension-grid.phtml
-+++ b/setup/view/magento/setup/extension-grid.phtml
-@@ -3,6 +3,9 @@
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-+
-+// @codingStandardsIgnoreFile
-+
- ?>
- <h2 class="page-title">{{$state.current.header}}</h2>
- 
-@@ -66,8 +69,8 @@
- 
- <div class="row" ng-show="$root.isMarketplaceAuthorized && extensionsProcessed && total == 0">
-     <label class="form-label not-found">
--        <b>You haven't purchased any extensions yet. Visit <a href="https://marketplace.magento.com">Marketplace</a> 
--            for purchasing extensions.</b><br/>
-+        <strong>You haven't purchased any extensions yet. Visit <a href="https://marketplace.magento.com">Marketplace</a> 
-+            for purchasing extensions.</strong><br/>
-     </label>
- </div>
- <div class="admin__data-grid-outer-wrap"
-diff --git a/setup/view/magento/setup/landing.phtml b/setup/view/magento/setup/landing.phtml
-index 581be20df93..645ae6ae9d6 100644
---- a/setup/view/magento/setup/landing.phtml
-+++ b/setup/view/magento/setup/landing.phtml
-@@ -15,7 +15,7 @@
-     <p class="text-welcome">
-         Welcome to Magento Admin, your online store headquarters.
-         <br>
--        Click 'Agree and Set Up Magento' or read <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/web/install-web.html" target="_blank">Getting Started</a> to learn more.
-+        Click 'Agree and Set Up Magento' or read <a href="https://devdocs.magento.com/guides/v2.0/install-gde/install/web/install-web.html" target="_blank">Getting Started</a> to learn more.
-     </p>
-     <p class="text-terms">
-         <a href="" ng-click="previousState()">Terms & Agreement</a>
-diff --git a/setup/view/magento/setup/marketplace-credentials.phtml b/setup/view/magento/setup/marketplace-credentials.phtml
-index 32ae5123136..8bd0bb0438d 100644
---- a/setup/view/magento/setup/marketplace-credentials.phtml
-+++ b/setup/view/magento/setup/marketplace-credentials.phtml
-@@ -7,7 +7,7 @@
-     <div class="sync-login-wrap">
-         <div class="login-header" ng-show="showCredsForm || upgradeProcessError">
-             <img class="logo-img"
--                 src="<?= $this->basePath() ?>/pub/images//magento-logo.svg" alt="Magento"/>
-+                 src="<?= $this->basePath() ?>/pub/images//magento-logo.svg" alt="Magento" width="214"/>
-             <span>Marketplace</span>
-         </div>
-         <div class="messages">
-diff --git a/setup/view/magento/setup/module-grid.phtml b/setup/view/magento/setup/module-grid.phtml
-index 5fe0447b7c7..3bf9377104d 100644
---- a/setup/view/magento/setup/module-grid.phtml
-+++ b/setup/view/magento/setup/module-grid.phtml
-@@ -8,7 +8,7 @@
- 
- <div class="row" ng-show="modulesProcessed && total == 0">
-     <label class="form-label">
--        <b>We didn't find any modules at this time. Please try later.</b><br/>
-+        <strong>We didn't find any modules at this time. Please try later.</strong><br/>
-     </label>
- </div>
- <div class="admin__data-grid-outer-wrap" ng-show="modulesProcessed && total > 0">
-diff --git a/setup/view/magento/setup/navigation/side-menu.phtml b/setup/view/magento/setup/navigation/side-menu.phtml
-index 6354af875ae..f34a6c7c72e 100644
---- a/setup/view/magento/setup/navigation/side-menu.phtml
-+++ b/setup/view/magento/setup/navigation/side-menu.phtml
-@@ -6,13 +6,6 @@
- 
- // @codingStandardsIgnoreFile
- 
--use Magento\Backend\Model\UrlInterface;
--use Magento\Framework\App\ObjectManager;
--
--$objectManager = ObjectManager::getInstance();
--/** @var Magento\Backend\Model\UrlInterface $backendUrl */
--$backendUrl = $objectManager->get(UrlInterface::class);
--
- ?>
- <?php $expressions = []; foreach ( $this->main as $item ): ?>
-     <?php $expressions[] = '!$state.is(\'' . $item['id'] . '\')';
-@@ -27,13 +20,9 @@ $backendUrl = $objectManager->get(UrlInterface::class);
-     ng-show="<?= implode( '&&', $expressions) ?>"
-     >
- <nav class="admin__menu" ng-controller="mainController">
--    <a href="<?= $backendUrl->getBaseUrl() . $backendUrl->getAreaFrontName(); ?>"
--        class="logo"
--        data-edition="Community Edition">
--        <img class="logo-img"
--             src="./pub/images/logo.svg"
--             alt="Magento Admin Panel">
--    </a>
-+    <span class="logo logo-static" data-edition="Community Edition">
-+        <img class="logo-img" src="<?= $this->basePath() ?>/pub/images/logo.svg" alt="Magento Admin Panel">
-+    </span>
-     <ul id="nav" role="menubar">
-         <li class="item-home level-0" ng-class="{_active: $state.current.name === 'root.home'}">
-             <a href="" ui-sref="root.home">
-diff --git a/setup/view/magento/setup/popupauth.phtml b/setup/view/magento/setup/popupauth.phtml
-index 8b074abaa5f..3ffca7ba49b 100644
---- a/setup/view/magento/setup/popupauth.phtml
-+++ b/setup/view/magento/setup/popupauth.phtml
-@@ -17,7 +17,9 @@
-                 <div class="sync-login-wrap">
-                     <div class="login-header">
-                         <img class="logo-img"
--                             src="<?= $this->basePath() ?>/pub/images//magento-logo.svg" alt="Magento"/>
-+                             src="<?= $this->basePath() ?>/pub/images//magento-logo.svg"
-+                             alt="Magento"
-+                             width="214"/>
-                         <span>Marketplace</span>
-                     </div>
-                     <div class="messages">
-diff --git a/setup/view/magento/setup/readiness-check/progress.phtml b/setup/view/magento/setup/readiness-check/progress.phtml
-index eb9dd0ce9d1..d8e519aa8ac 100755
---- a/setup/view/magento/setup/readiness-check/progress.phtml
-+++ b/setup/view/magento/setup/readiness-check/progress.phtml
-@@ -121,7 +121,7 @@
-                     Download and install the updater.
-                 </p>
-                 <p ng-show="updater.expanded">For additional assistance, see
--                    <a href="http://devdocs.magento.com/guides/v2.0/comp-mgr/trouble/cman/updater.html"
-+                    <a href="https://devdocs.magento.com/guides/v2.0/comp-mgr/trouble/cman/updater.html"
-                        target="_blank">updater application help</a>.
-                 </p>
-             </div>
-@@ -172,7 +172,7 @@
-                 <p ng-show="cronScript.expanded" ng-bind-html="cronScript.updaterErrorMessage">
-                 </p>
-                 <p ng-show="cronScript.expanded">For additional assistance, see
--                    <a href="http://devdocs.magento.com/guides/v2.0/comp-mgr/trouble/cman/cron.html"
-+                    <a href="https://devdocs.magento.com/guides/v2.0/comp-mgr/trouble/cman/cron.html"
-                        target="_blank">cron scripts help</a>.
-                 </p>
-             </div>
-@@ -214,7 +214,7 @@
-                 <p ng-show="componentDependency.expanded" ng-bind-html="componentDependency.errorMessage">
-                 </p>
-                 <p ng-show="componentDependency.expanded">For additional assistance, see
--                    <a href="http://devdocs.magento.com/guides/v2.0/comp-mgr/trouble/cman/component-depend.html"
-+                    <a href="https://devdocs.magento.com/guides/v2.0/comp-mgr/trouble/cman/component-depend.html"
-                        target="_blank">component dependency help
-                     </a>.
-                 </p>
-@@ -336,7 +336,7 @@
-                 </div>
- 
-                 <p ng-show="componentDependency.expanded">For additional assistance, see
--                    <a href="http://devdocs.magento.com/guides/v2.2/install-gde/trouble/php/tshoot_php-set.html"
-+                    <a href="https://devdocs.magento.com/guides/v2.2/install-gde/trouble/php/tshoot_php-set.html"
-                        target="_blank">PHP settings check help
-                     </a>.
-                 </p>
-@@ -392,7 +392,7 @@
- 
-                 <div class="readiness-check-side">
-                     <p class="side-title">Need Help?</p>
--                    <a href="http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html" target="_blank">PHP Extension Help</a>
-+                    <a href="https://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html" target="_blank">PHP Extension Help</a>
-                 </div>
- 
-                 <span class="readiness-check-icon icon-failed-round"></span>
-@@ -413,7 +413,7 @@
-                         <p>
-                             The best way to resolve this is to install the correct missing extensions. The exact fix depends on our server, your host, and other system variables.
-                             <br>
--                            Our <a href="http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html" target="_blank">PHP extension help</a> can get you started.
-+                            Our <a href="https://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html" target="_blank">PHP extension help</a> can get you started.
-                         </p>
-                         <p>
-                             For additional assistance, contact your hosting provider.
-@@ -477,7 +477,7 @@
- 
-             <div class="readiness-check-side">
-                 <p class="side-title">Need Help?</p>
--                <a href="http://devdocs.magento.com/guides/v2.2/install-gde/prereq/file-system-perms.html" target="_blank">File Permission Help</a>
-+                <a href="https://devdocs.magento.com/guides/v2.2/install-gde/prereq/file-system-perms.html" target="_blank">File Permission Help</a>
-             </div>
- 
-             <span class="readiness-check-icon icon-failed-round"></span>
-@@ -500,7 +500,7 @@
-                         The best way to resolve this is to allow write permissions for files in the following Magento directories and subdirectories. The exact fix depends on your server, your host,
-                         and other system variables.
-                         <br>
--                        For help, see our <a href="http://devdocs.magento.com/guides/v2.2/install-gde/prereq/file-system-perms.html" target="_blank">File Permission Help</a> or call your hosting provider.
-+                        For help, see our <a href="https://devdocs.magento.com/guides/v2.2/install-gde/prereq/file-system-perms.html" target="_blank">File Permission Help</a> or call your hosting provider.
-                     </p>
-                     <ul class="list" ng-show="permissions.expanded" ng-init="showDetails=false">
-                         <li
-diff --git a/setup/view/magento/setup/select-version.phtml b/setup/view/magento/setup/select-version.phtml
-index 920ab862525..66264e46d50 100644
---- a/setup/view/magento/setup/select-version.phtml
-+++ b/setup/view/magento/setup/select-version.phtml
-@@ -128,7 +128,7 @@
-     </div>
-     <div class="row" ng-show="componentsProcessed && total == 0">
-         <label class="form-label">
--            <b>We didn't find any components to upgrade. Click "Next" to continue.<br/>
-+            <strong>We didn't find any components to upgrade. Click "Next" to continue.</strong><br/>
-         </label>
-     </div>
-     <div class="admin__data-grid-outer-wrap" ng-show="componentsProcessed && total > 0">
-diff --git a/setup/view/magento/setup/start-updater.phtml b/setup/view/magento/setup/start-updater.phtml
-index b08407b30d4..9b2a6b5598a 100644
---- a/setup/view/magento/setup/start-updater.phtml
-+++ b/setup/view/magento/setup/start-updater.phtml
-@@ -26,7 +26,7 @@
-         </strong>
-         <div ng-show="type == 'upgrade'">
-             Before you start upgrade, you can optionally
--            <a href="http://devdocs.magento.com/guides/v2.1/comp-mgr/trouble/cman/maint-mode.html">
-+            <a href="https://devdocs.magento.com/guides/v2.1/comp-mgr/trouble/cman/maint-mode.html">
-             configure a custom maintenance page</a> that informs shoppers the store is offline.
-             (Magento provides a default page.)
-         </div>
-diff --git a/setup/view/magento/setup/web-configuration.phtml b/setup/view/magento/setup/web-configuration.phtml
-index d0307a71e4a..4018694dfd0 100644
---- a/setup/view/magento/setup/web-configuration.phtml
-+++ b/setup/view/magento/setup/web-configuration.phtml
-@@ -282,15 +282,20 @@ $hints = [
-                         tooltip-html-unsafe="<?= $hints['encrypt_key'] ?>"
-                         tooltip-trigger="focus"
-                         tooltip-append-to-body="true"
--                        ng-minlength="4"
-+                        ng-minlength="32"
-+                        ng-maxlength="32"
-+                        ng-pattern="/^\S+$/"
-                         required
-                         >
-                     <div class="error-container">
-                         <span ng-show="webconfig.key.$error.required">
-                             You must enter an encryption key.
-                         </span>
--                        <span ng-show="webconfig.key.$error.minlength">
--                            Your encryption key must be longer and stronger.
-+                        <span ng-show="webconfig.key.$error.minlength
-+                                        || webconfig.key.$error.maxlength
-+                                        || webconfig.key.$error.pattern"
-+                        >
-+                            Encryption key must be 32 character string without any white space.
-                         </span>
-                     </div>
-                 </div>
-diff --git a/setup/view/styles/lib/variables/_colors.less b/setup/view/styles/lib/variables/_colors.less
-index 638490ac867..a72dc69ac76 100644
---- a/setup/view/styles/lib/variables/_colors.less
-+++ b/setup/view/styles/lib/variables/_colors.less
-@@ -24,7 +24,7 @@
- @color-green-apple: #79a22e;
- @color-green-islamic: #090;
- @color-dark-brownie: #41362f;
--@color-brown-darkie: #41362f;
-+@color-brown-darker: #41362f;
- @color-phoenix-down: #e04f00;
- @color-phoenix: #eb5202;
- @color-phoenix-almost-rise: #ef672f;
-diff --git a/vendor/.htaccess b/vendor/.htaccess
-index 707c26b075e..b97408bad3f 100644
---- a/vendor/.htaccess
-+++ b/vendor/.htaccess
-@@ -5,4 +5,3 @@
- <IfVersion >= 2.4>
-     Require all denied
- </IfVersion>
--

From 96645597234ce4dcb24dce3d096e3039d9911a95 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <44254165+XxXgeoXxX@users.noreply.github.com>
Date: Wed, 31 Jul 2019 13:07:26 +0300
Subject: [PATCH 07/19] Delete Fix_the_special_price_expression.patch

---
 Fix_the_special_price_expression.patch | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 Fix_the_special_price_expression.patch

diff --git a/Fix_the_special_price_expression.patch b/Fix_the_special_price_expression.patch
deleted file mode 100644
index 51117a92366e..000000000000
--- a/Fix_the_special_price_expression.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
---- app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php	(date 1535143244000)
-+++ app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php	(date 1535221613000)
-@@ -190,7 +190,7 @@
-         $specialFromExpr = "{$specialFrom} IS NULL OR {$specialFromDate} <= {$currentDate}";
-         $specialToExpr = "{$specialTo} IS NULL OR {$specialToDate} >= {$currentDate}";
-         $specialPriceExpr = $connection->getCheckSql(
--            "{$specialPrice} IS NOT NULL AND {$specialFromExpr} AND {$specialToExpr}",
-+            "{$specialPrice} IS NOT NULL AND ({$specialFromExpr}) AND ({$specialToExpr})",
-             $specialPrice,
-             $maxUnsignedBigint
-         );

From 74ddb92d7254003c91449a1b117fa2799c4f35cb Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <44254165+XxXgeoXxX@users.noreply.github.com>
Date: Wed, 31 Jul 2019 13:08:52 +0300
Subject: [PATCH 08/19] Delete AddProductToCartTest.php

---
 .../CatalogInventory/AddProductToCartTest.php | 157 ------------------
 1 file changed, 157 deletions(-)
 delete mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
deleted file mode 100644
index 70cb64b1e059..000000000000
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl\CatalogInventory;
-
-use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\TestCase\GraphQlAbstract;
-
-/**
- * Add simple product to cart testcases related to inventory
- */
-class AddProductToCartTest extends GraphQlAbstract
-{
-    /**
-     * @var GetMaskedQuoteIdByReservedOrderId
-     */
-    private $getMaskedQuoteIdByReservedOrderId;
-
-    /**
-     * @inheritdoc
-     */
-    protected function setUp()
-    {
-        $objectManager = Bootstrap::getObjectManager();
-        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage The requested qty is not available
-     */
-    public function testAddProductIfQuantityIsNotAvailable()
-    {
-        $sku = 'simple';
-        $quantity = 200;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-
-        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-        $this->graphQlMutation($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage Some of the products are out of stock.
-     */
-    public function testUpdateProductOutOfStockInCart()
-    {
-        $sku = 'simple';
-        $qty = 1;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-
-        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-        $this->graphQlMutation($query);
-
-        $product = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-        $productId = $product->getIdBySku($sku);
-        $product->load($productId);
-        $product->setStockData(['is_in_stock' => 0]);
-        $product->save();
-
-        $this->graphQlMutation($query);
-    }
-    /**
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @magentoConfigFixture default cataloginventory/item_options/max_sale_qty 5
-     */
-    public function testAddMoreProductsThatAllowed()
-    {
-        $sku = 'custom-design-simple-product';
-        $quantity = 7;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-
-        $this->expectExceptionMessageRegExp(
-            '/The most you may purchase is 5|The requested qty exceeds the maximum qty allowed in shopping cart/'
-        );
-
-        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-        $this->graphQlMutation($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage Please enter a number greater than 0 in this field.
-     */
-    public function testAddSimpleProductToCartWithNegativeQuantity()
-    {
-        $sku = 'simple';
-        $quantity = -2;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-
-        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-        $this->graphQlMutation($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-     */
-    public function testAddProductIfQuantityIsDecimal()
-    {
-        $sku = 'simple_product';
-        $quantity = 0.2;
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-        $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
-
-        $this->expectExceptionMessage(
-            "Could not add the product with SKU {$sku} to the shopping cart: The fewest you may purchase is 1"
-        );
-        $this->graphQlMutation($query);
-    }
-
-    /**
-     * @param string $maskedQuoteId
-     * @param string $sku
-     * @param float $quantity
-     * @return string
-     */
-    private function getQuery(string $maskedQuoteId, string $sku, float $quantity) : string
-    {
-        return <<<QUERY
-mutation {  
-  addSimpleProductsToCart(
-    input: {
-      cart_id: "{$maskedQuoteId}", 
-      cart_items: [
-        {
-          data: {
-            quantity: $quantity
-            sku: "$sku"
-          }
-        }
-      ]
-    }
-  ) {
-    cart {
-      items {
-        quantity
-      }
-    }
-  }
-}
-QUERY;
-    }
-}

From 24b0339513b28b9fa1a91c994241f09cd04c385c Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 31 Jul 2019 13:16:33 +0300
Subject: [PATCH 09/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock. Revert changes

---
 .../CatalogInventory/AddProductToCartTest.php | 27 ++-----------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
index 70cb64b1e059..6c246af48126 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
@@ -49,30 +49,7 @@ public function testAddProductIfQuantityIsNotAvailable()
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/products.php
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage Some of the products are out of stock.
-     */
-    public function testUpdateProductOutOfStockInCart()
-    {
-        $sku = 'simple';
-        $qty = 1;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-
-        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-        $this->graphQlMutation($query);
-
-        $product = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-        $productId = $product->getIdBySku($sku);
-        $product->load($productId);
-        $product->setStockData(['is_in_stock' => 0]);
-        $product->save();
-
-        $this->graphQlMutation($query);
-    }
-    /**
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @magentoConfigFixture default cataloginventory/item_options/max_sale_qty 5
+     * @magentoConfigFixture default_store cataloginventory/item_options/max_sale_qty 5
      */
     public function testAddMoreProductsThatAllowed()
     {
@@ -154,4 +131,4 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity) :
 }
 QUERY;
     }
-}
+}
\ No newline at end of file

From 0431ed2a273a2503a0cbbbdd76bec90b3fe86995 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 31 Jul 2019 13:50:27 +0300
Subject: [PATCH 10/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock

---
 .../Magento/GraphQl/CatalogInventory/AddProductToCartTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
index 6c246af48126..36f5d7028fb0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
@@ -131,4 +131,4 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity) :
 }
 QUERY;
     }
-}
\ No newline at end of file
+}

From 198ba5366db6376fb59acba2a55198cf0309d5b7 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Thu, 1 Aug 2019 09:10:04 +0300
Subject: [PATCH 11/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock

---
 .../testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
index 7b6d95f6bcb3..1bb380fd9022 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
@@ -70,6 +70,7 @@ public function testGetCartMessages()
         self::assertEquals('Some of the products are out of stock.', $response['getCartMessages']['messages'][0]);
     }
     /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      * @expectedException \Exception
      * @expectedExceptionMessage Required parameter "cart_id" is missing.
      */
@@ -82,6 +83,7 @@ public function testRequiredParamMissing()
     }
 
     /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      * @expectedException \Exception
      * @expectedExceptionMessage Requested cart hasn't errors.
      */
@@ -140,7 +142,7 @@ public function getAddSimpleProductQuery(string $maskedQuoteId, string $sku, int
       cartItems: [
         {
           data: {
-            qty: $qty
+            quantity: $qty
             sku: "$sku"
           }
         }
@@ -149,7 +151,7 @@ public function getAddSimpleProductQuery(string $maskedQuoteId, string $sku, int
   ) {
     cart {
       items {
-        qty
+        quantity
       }
     }
   }

From fcfc435dea3845b25a28377d2c51f8729c8bca97 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Thu, 1 Aug 2019 12:51:41 +0300
Subject: [PATCH 12/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock

---
 .../Model/Resolver/GetCartMessages.php        |  3 ++-
 .../GraphQl/Quote/GetCartMessagesTest.php     | 25 +------------------
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php
index fd1beec0de46..ba08de9751e6 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php
@@ -45,7 +45,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
         }
         $currentUserId = $context->getUserId();
-        $cart = $this->getCartForUser->execute($cartId, $currentUserId);
+        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
+        $cart = $this->getCartForUser->execute($cartId, $currentUserId, $storeId);
         if (empty($cart->getData('has_error'))) {
             throw new GraphQlNoSuchEntityException(__('Requested cart hasn\'t errors.'));
         }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
index 1bb380fd9022..0a926e90311d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
@@ -46,29 +46,6 @@ protected function setUp()
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     */
-    public function testGetCartMessages()
-    {
-        $sku = 'simple';
-        $qty = 1;
-        $maskedQuoteId = $this->getMaskedQuoteId();
-
-        $queryAddProduct = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
-        $this->graphQlMutation($queryAddProduct);
-
-        $product = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-        $productId = $product->getIdBySku($sku);
-        $product->load($productId);
-        $product->setStockData(['is_in_stock' => 0]);
-        $product->save();
-
-        $queryGetMessages = $this->getCartMessagesQuery($maskedQuoteId);
-        $response = $this->graphQlMutation($queryGetMessages);
-        self::assertEquals('Some of the products are out of stock.', $response['getCartMessages']['messages'][0]);
-    }
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      * @expectedException \Exception
@@ -85,7 +62,7 @@ public function testRequiredParamMissing()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Requested cart hasn't errors.
+     * @expectedExceptionMessage GraphQL response contains errors: Requested cart hasn't errors.
      */
     public function testCartWithoutErrors()
     {

From 1a5675b9892c6865626752a7f189c852938014f1 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 4 Sep 2019 13:29:40 +0300
Subject: [PATCH 13/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock #475

---
 .../{GetCartMessages.php => CartMessages.php} | 33 ++-------
 .../Magento/QuoteGraphQl/etc/schema.graphqls  | 10 +--
 .../GraphQl/Quote/GetCartMessagesTest.php     | 72 +++++++------------
 3 files changed, 32 insertions(+), 83 deletions(-)
 rename app/code/Magento/QuoteGraphQl/Model/Resolver/{GetCartMessages.php => CartMessages.php} (55%)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartMessages.php
similarity index 55%
rename from app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php
rename to app/code/Magento/QuoteGraphQl/Model/Resolver/CartMessages.php
index ba08de9751e6..4b9eae3a619e 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/GetCartMessages.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartMessages.php
@@ -7,50 +7,31 @@
 
 namespace Magento\QuoteGraphQl\Model\Resolver;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-use Magento\Framework\Message\AbstractMessage;
 use Magento\Quote\Model\Quote;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 
 /**
  * @inheritdoc
  */
-class GetCartMessages implements ResolverInterface
+class CartMessages implements ResolverInterface
 {
-    /**
-     * @var GetCartForUser
-     */
-    private $getCartForUser;
-
-    /**
-     * @param GetCartForUser $getCartForUser
-     */
-    public function __construct(
-        GetCartForUser $getCartForUser
-    ) {
-        $this->getCartForUser = $getCartForUser;
-    }
-
     /**
      * @inheritdoc
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
-        $cartId = $args['input']['cart_id'];
-        if (isset($cartId) === false || empty($cartId)) {
-            throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
         }
-        $currentUserId = $context->getUserId();
-        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
-        $cart = $this->getCartForUser->execute($cartId, $currentUserId, $storeId);
+        $cart = $value['model'];
         if (empty($cart->getData('has_error'))) {
             throw new GraphQlNoSuchEntityException(__('Requested cart hasn\'t errors.'));
         }
-        return ['messages' => $this->getCartErrors($cart)];
+        return $this->getCartErrors($cart);
     }
 
     /**
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 6ae893542b62..16870bad4a0e 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -20,7 +20,6 @@ type Mutation {
     setGuestEmailOnCart(input: SetGuestEmailOnCartInput): SetGuestEmailOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetGuestEmailOnCart")
     setPaymentMethodAndPlaceOrder(input: SetPaymentMethodAndPlaceOrderInput): PlaceOrderOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentAndPlaceOrder")
     placeOrder(input: PlaceOrderInput): PlaceOrderOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\PlaceOrder")
-    getCartMessages(input: GetCartMessagesInput): GetCartMessagesOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\GetCartMessages") @doc(description:"Return all shopping cart messages for a guest or logged in user")
 }
 
 input createEmptyCartInput {
@@ -165,10 +164,6 @@ type CartDiscount {
     label: [String!]!
 }
 
-input GetCartMessagesInput {
-    cart_id: String!
-}
-
 type SetPaymentMethodOnCartOutput {
     cart: Cart!
 }
@@ -193,10 +188,6 @@ type PlaceOrderOutput {
     order: Order!
 }
 
-type GetCartMessagesOutput {
-     messages: [String]!
-}
-
 type Cart {
     items: [CartItemInterface] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartItems")
     applied_coupon: AppliedCoupon @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\AppliedCoupon")
@@ -207,6 +198,7 @@ type Cart {
     selected_payment_method: SelectedPaymentMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SelectedPaymentMethod")
     prices: CartPrices @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartPrices")
     total_quantity: Float! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartTotalQuantity")
+    messages: [String] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartMessages") @doc(description:"Return all shopping cart messages for a guest or logged in user")
 }
 
 interface CartAddressInterface @typeResolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartAddressTypeResolver") {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
index 0a926e90311d..fb106d87a6f7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
@@ -12,6 +12,7 @@
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 
 /**
  * Class GetCartMessagesTest
@@ -35,6 +36,11 @@ class GetCartMessagesTest extends GraphQlAbstract
      */
     private $quoteIdToMaskedId;
 
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
     /**
      * @inheritdoc
      */
@@ -44,31 +50,38 @@ protected function setUp()
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Required parameter "cart_id" is missing.
+     * @expectedExceptionMessage GraphQL response contains errors: Requested cart hasn't errors.
      */
-    public function testRequiredParamMissing()
+    public function testCartWithoutErrors()
     {
-        $maskedQuoteId = '';
+        $maskedQuoteId = $this->getMaskedQuoteId();
 
         $query = $this->getCartMessagesQuery($maskedQuoteId);
         $this->graphQlMutation($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
      * @expectedException \Exception
-     * @expectedExceptionMessage GraphQL response contains errors: Requested cart hasn't errors.
+     * @expectedExceptionMessage GraphQL response contains errors: Some of the products are out of stock.
      */
-    public function testCartWithoutErrors()
+    public function testCartWithOutOfStockProduct()
     {
-        $maskedQuoteId = $this->getMaskedQuoteId();
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
 
         $query = $this->getCartMessagesQuery($maskedQuoteId);
+
         $this->graphQlMutation($query);
     }
 
@@ -91,48 +104,11 @@ public function getMaskedQuoteId() : string
     public function getCartMessagesQuery(string $maskedQuoteId): string
     {
         return <<<QUERY
-mutation {  
-  getCartMessages(
-    input: {
-      cart_id: "{$maskedQuoteId}"
-    }
-  ){
-      messages
-  }
-}  
-QUERY;
-    }
-
-    /**
-     * @param string $maskedQuoteId
-     * @param string $sku
-     * @param int $qty
-     * @return string
-     */
-    public function getAddSimpleProductQuery(string $maskedQuoteId, string $sku, int $qty) : string
-    {
-        return <<<QUERY
-mutation {  
-  addSimpleProductsToCart(
-    input: {
-      cart_id: "{$maskedQuoteId}", 
-      cartItems: [
-        {
-          data: {
-            quantity: $qty
-            sku: "$sku"
-          }
-        }
-      ]
-    }
-  ) {
-    cart {
-      items {
-        quantity
-      }
-    }
+{
+    cart(cart_id:"{$maskedQuoteId}"){
+    messages
   }
-}
+} 
 QUERY;
     }
 }

From 66f42b02d841efce303f796e1543921faf6fe009 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 4 Sep 2019 14:51:06 +0300
Subject: [PATCH 14/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock #475

---
 .../GraphQl/Quote/GetCartMessagesTest.php     | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
index fb106d87a6f7..9d3c0a51bf38 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
@@ -13,6 +13,7 @@
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
 
 /**
  * Class GetCartMessagesTest
@@ -41,6 +42,11 @@ class GetCartMessagesTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
     /**
      * @inheritdoc
      */
@@ -51,6 +57,7 @@ protected function setUp()
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
     /**
@@ -80,7 +87,7 @@ public function testCartWithOutOfStockProduct()
         $reservedOrderId = 'test_quote';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
 
-        $query = $this->getCartMessagesQuery($maskedQuoteId);
+        $query = $this->getCartMessagesQuery($maskedQuoteId, [], '', $this->getHeaderMap());
 
         $this->graphQlMutation($query);
     }
@@ -111,4 +118,19 @@ public function getCartMessagesQuery(string $maskedQuoteId): string
 } 
 QUERY;
     }
+
+    /**
+     * Retrieve customer authorization headers
+     *
+     * @param string $username
+     * @param string $password
+     * @return array
+     * @throws AuthenticationException
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
 }

From 304eae3c9bff72a55855da1d946c77c78913e18f Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 4 Sep 2019 15:49:35 +0300
Subject: [PATCH 15/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock #475

---
 .../testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
index 9d3c0a51bf38..d77079e598c7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
@@ -87,9 +87,9 @@ public function testCartWithOutOfStockProduct()
         $reservedOrderId = 'test_quote';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
 
-        $query = $this->getCartMessagesQuery($maskedQuoteId, [], '', $this->getHeaderMap());
+        $query = $this->getCartMessagesQuery($maskedQuoteId);
 
-        $this->graphQlMutation($query);
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**

From 5f38deffbd98d4b813846cc9ab9b0fa5e61d9350 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 4 Sep 2019 16:43:42 +0300
Subject: [PATCH 16/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock #475

---
 .../testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
index d77079e598c7..ad807d6ad4fe 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
@@ -79,8 +79,6 @@ public function testCartWithoutErrors()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage GraphQL response contains errors: Some of the products are out of stock.
      */
     public function testCartWithOutOfStockProduct()
     {
@@ -89,7 +87,8 @@ public function testCartWithOutOfStockProduct()
 
         $query = $this->getCartMessagesQuery($maskedQuoteId);
 
-        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        self::assertEquals('Some of the products are out of stock.', $response['cart']['messages'][0]);
     }
 
     /**

From d4419da3fe21c99abd15f919aea06da92b7eaeae Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Thu, 5 Sep 2019 08:28:49 +0300
Subject: [PATCH 17/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock #475

---
 .../Magento/QuoteGraphQl/Model/Resolver/CartMessages.php | 9 ++++++---
 app/code/Magento/QuoteGraphQl/etc/schema.graphqls        | 7 ++++++-
 .../Magento/GraphQl/Quote/GetCartMessagesTest.php        | 7 +++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartMessages.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartMessages.php
index 4b9eae3a619e..df6ab78eac20 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartMessages.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartMessages.php
@@ -29,7 +29,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         }
         $cart = $value['model'];
         if (empty($cart->getData('has_error'))) {
-            throw new GraphQlNoSuchEntityException(__('Requested cart hasn\'t errors.'));
+            return [];
         }
         return $this->getCartErrors($cart);
     }
@@ -45,8 +45,11 @@ private function getCartErrors(Quote $cart): array
         $errorMessages = [];
 
         /** @var AbstractMessage $error */
-        foreach ($cart->getErrors() as $error) {
-            $errorMessages[] = $error->getText();
+        foreach ($cart->getMessages() as $idettifier => $error) {
+            $errorMessages[] = [
+                'identifier' => $idettifier,
+                'text' => $error->getText()
+            ];
         }
 
         return $errorMessages;
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 16870bad4a0e..1f30025a30d1 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -198,7 +198,7 @@ type Cart {
     selected_payment_method: SelectedPaymentMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SelectedPaymentMethod")
     prices: CartPrices @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartPrices")
     total_quantity: Float! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartTotalQuantity")
-    messages: [String] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartMessages") @doc(description:"Return all shopping cart messages for a guest or logged in user")
+    messages: [Messages] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartMessages") @doc(description:"Return all shopping cart messages for a guest or logged in user")
 }
 
 interface CartAddressInterface @typeResolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartAddressTypeResolver") {
@@ -349,3 +349,8 @@ type CartItemSelectedOptionValuePrice {
 type Order {
     order_id: String
 }
+
+type Messages {
+    identifier: String
+    text: String
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
index ad807d6ad4fe..6a4d8d4345ed 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
@@ -62,15 +62,14 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage GraphQL response contains errors: Requested cart hasn't errors.
      */
     public function testCartWithoutErrors()
     {
         $maskedQuoteId = $this->getMaskedQuoteId();
 
         $query = $this->getCartMessagesQuery($maskedQuoteId);
-        $this->graphQlMutation($query);
+        $response = $this->graphQlMutation($query);
+        self::assertCount(0, count($response['cart']['messages']));
     }
 
     /**
@@ -88,7 +87,7 @@ public function testCartWithOutOfStockProduct()
         $query = $this->getCartMessagesQuery($maskedQuoteId);
 
         $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-        self::assertEquals('Some of the products are out of stock.', $response['cart']['messages'][0]);
+        self::assertEquals('Some of the products are out of stock.', $response['cart']['messages'][0]['text']);
     }
 
     /**

From a98f4e2832861056b1ed18dab747e68fe71ac280 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Thu, 5 Sep 2019 09:19:37 +0300
Subject: [PATCH 18/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock #475

---
 app/code/Magento/QuoteGraphQl/etc/schema.graphqls             | 4 ++--
 .../testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 1f30025a30d1..65351a06f03c 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -198,7 +198,7 @@ type Cart {
     selected_payment_method: SelectedPaymentMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SelectedPaymentMethod")
     prices: CartPrices @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartPrices")
     total_quantity: Float! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartTotalQuantity")
-    messages: [Messages] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartMessages") @doc(description:"Return all shopping cart messages for a guest or logged in user")
+    messages: [Message] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartMessages") @doc(description:"Return all shopping cart messages for a guest or logged in user")
 }
 
 interface CartAddressInterface @typeResolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartAddressTypeResolver") {
@@ -350,7 +350,7 @@ type Order {
     order_id: String
 }
 
-type Messages {
+type Message {
     identifier: String
     text: String
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
index 6a4d8d4345ed..475fc04b0e40 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
@@ -111,7 +111,9 @@ public function getCartMessagesQuery(string $maskedQuoteId): string
         return <<<QUERY
 {
     cart(cart_id:"{$maskedQuoteId}"){
-    messages
+    messages{
+        text
+    }
   }
 } 
 QUERY;

From 24697ea3351622230a8ebe21aea70441e9d720c3 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Thu, 5 Sep 2019 10:18:01 +0300
Subject: [PATCH 19/19] Improve coverage for mutation addSimpleProductToCart or
 Cart contains a product after product got status Out of Stock #475

---
 .../Quote/{GetCartMessagesTest.php => CartMessagesTest.php}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/{GetCartMessagesTest.php => CartMessagesTest.php} (97%)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CartMessagesTest.php
similarity index 97%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CartMessagesTest.php
index 475fc04b0e40..5faff232edaa 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartMessagesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CartMessagesTest.php
@@ -20,7 +20,7 @@
  *
  * @package Magento\GraphQl\Quote
  */
-class GetCartMessagesTest extends GraphQlAbstract
+class CartMessagesTest extends GraphQlAbstract
 {
     /**
      * @var QuoteResource
@@ -69,7 +69,7 @@ public function testCartWithoutErrors()
 
         $query = $this->getCartMessagesQuery($maskedQuoteId);
         $response = $this->graphQlMutation($query);
-        self::assertCount(0, count($response['cart']['messages']));
+        self::assertEquals([], $response['cart']['messages']);
     }
 
     /**